diff --git a/engine/.clang-format b/engine/.clang-format
index 59d01583..22966e2d 100644
--- a/engine/.clang-format
+++ b/engine/.clang-format
@@ -1,6 +1,3 @@
-# If you change this file, please format all files of the codebase as part of your PR:
-# pre-commit run clang-format --all
-
 # Commented out parameters are those with the same value as base LLVM style.
 # We can uncomment them if we want to change their value, or enforce the
 # chosen value in case the base style changes (last sync: Clang 18.1.8).
@@ -41,7 +38,7 @@ AlignAfterOpenBracket: DontAlign
 #   AcrossEmptyLines: false
 #   AcrossComments: false
 #   AlignCaseColons: false
-AlignEscapedNewlines: DontAlign # Aligning leads to long diffs
+# AlignEscapedNewlines: Right
 AlignOperands: DontAlign
 AlignTrailingComments:
   Kind: Never
@@ -117,25 +114,14 @@ Cpp11BracedListStyle: false
 #   - BOOST_FOREACH
 # IfMacros:
 #   - KJ_IF_MAYBE
-IncludeBlocks: Regroup
+# IncludeBlocks: Preserve
 IncludeCategories:
-  - Regex: ^"(core|drivers|editor|main|scene|servers|tests)/.*"$
-    Priority: 20
-  - Regex: ^"(modules|platform)/.*"$
-    Priority: 30
-  - Regex: ^<thirdparty/.*>$
-    Priority: 40
-  - Regex: ^<(windows|Jolt/Jolt|platform_gl)\.h>$
-    Priority: 50
-  - Regex: ^<.*\.(h|hpp)>$
-    Priority: 60
-  - Regex: ^<.*>$
-    Priority: 70
-  - Regex: ^".*\.compat\.inc"$
-    Priority: 0
-    SortPriority: 1
   - Regex: ^".*"$
-    Priority: 10
+    Priority: 1
+  - Regex: ^<.*\.h>$
+    Priority: 2
+  - Regex: ^<.*>$
+    Priority: 3
 # IncludeIsMainRegex: (Test)?$
 # IncludeIsMainSourceRegex: ""
 # IndentAccessModifiers: false
diff --git a/engine/.clang-tidy b/engine/.clang-tidy
index 19965f3e..05b2f61a 100644
--- a/engine/.clang-tidy
+++ b/engine/.clang-tidy
@@ -1,26 +1,21 @@
-# If you change this file, please format all files of the codebase as part of your PR:
-# pre-commit run --hook-stage manual clang-tidy --all
-
 Checks:
   - -*
-  - performance-move-const-arg
-  - bugprone-use-after-move
+  - cppcoreguidelines-pro-type-member-init
   - modernize-deprecated-headers
   - modernize-redundant-void-arg
   - modernize-use-bool-literals
-#  - modernize-use-default-member-init # TODO Re-activate
+  - modernize-use-default-member-init
   - modernize-use-nullptr
   - readability-braces-around-statements
   - readability-redundant-member-init
-  - readability-operators-representation
 HeaderFileExtensions: ["", h, hh, hpp, hxx, inc, glsl]
 ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
 HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
 FormatStyle: file
 CheckOptions:
+  cppcoreguidelines-pro-type-member-init.IgnoreArrays: true
+  cppcoreguidelines-pro-type-member-init.UseAssignment: true
   modernize-deprecated-headers.CheckHeaderFile: true
   modernize-use-bool-literals.IgnoreMacros: false
   modernize-use-default-member-init.IgnoreMacros: false
   modernize-use-default-member-init.UseAssignment: true
-  readability-operators-representation.BinaryOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="
-  readability-operators-representation.OverloadedOperators: "&&;&=;&;|;~;!;!=;||;|=;^;^="
diff --git a/engine/.clangd b/engine/.clangd
index ebe084f8..3c9792ea 100644
--- a/engine/.clangd
+++ b/engine/.clangd
@@ -1,21 +1,12 @@
 # https://clangd.llvm.org/config
-
 ---
-
 # Default conditions, apply everywhere.
 
-CompileFlags:
-  Add:
-    # Some thirdparty includes seem to require a high -ferror-limit to pass checks.
-    - -ferror-limit=100
-
 Diagnostics:
   Includes:
     IgnoreHeader:
       - \.compat\.inc
-
 ---
-
 # Header-specific conditions.
 
 If:
@@ -29,19 +20,11 @@ CompileFlags:
     - -Wno-unused-const-variable
     - -Wno-unused-function
     - -Wno-unused-variable
-
 ---
-
-# Suppress warnings for third-party or partial code.
+# Suppress all third-party warnings.
 
 If:
-  PathMatch:
-    - bin/build_deps/.*
-    - misc/dist/apple_embedded_xcode/.*
-    - tests/compatibility_test/.*
-    - thirdparty/.*
-    - .*/thirdparty/.*
-    - .*-so_wrap.[ch]
+  PathMatch: thirdparty/.*
 
 Diagnostics:
   Suppress: "*"
diff --git a/engine/.git-blame-ignore-revs b/engine/.git-blame-ignore-revs
index 35c68147..3203caf8 100644
--- a/engine/.git-blame-ignore-revs
+++ b/engine/.git-blame-ignore-revs
@@ -72,18 +72,3 @@ e06d83860d798b6766b23d6eae48557387a7db85
 
 # Style: Replace header guards with `#pragma once`
 324512e11c1b7663c3cf47bec6ddbe65c6b8db2b
-
-# Style: Don't right-align escaped newlines
-c5df0cb82bc539eff7dcfb2add99d60771fc50c5
-
-# Style: Convert `*.gen.inc` to `*.gen.h`
-7dae5da1982f4a55ba91557814905faef9ce461b
-
-# Move RenderingServer enums to a dedicated RenderingServerEnums (`RSE`) namespace
-f5a290ac462765afca34e64dd39f883511510147
-
-# Style: Add `class_db.h` includes explicitly
-e380a417526c11f15a9ddb3997292409b10da2af
-
-# Move DisplayServer enums and typedefs to DisplayServerEnums
-a447ac95ec170ee117c2eae55f1bfff0d0cf0dce
diff --git a/engine/.github/PULL_REQUEST_TEMPLATE.md b/engine/.github/PULL_REQUEST_TEMPLATE.md
index cccaf8ac..fbc45b89 100644
--- a/engine/.github/PULL_REQUEST_TEMPLATE.md
+++ b/engine/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,8 @@
 <!--
-Please target the `master` branch. We will take care of backporting relevant fixes to older versions.
+Please target the `master` branch in priority.
 
-Before submitting, please read our checklist for new contributors:
-https://contributing.godotengine.org/en/latest/engine/introduction.html#checklist-for-new-contributors
+Relevant fixes are cherry-picked for stable branches as needed by maintainers.
+
+To speed up the contribution process and avoid CI errors, please set up pre-commit hooks locally:
+https://contributing.godotengine.org/en/latest/engine/guidelines/code_style.html
 -->
diff --git a/engine/.github/actions/clangd-tidy/action.yml b/engine/.github/actions/clangd-tidy/action.yml
deleted file mode 100644
index 06f2a945..00000000
--- a/engine/.github/actions/clangd-tidy/action.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: clangd-tidy
-description: Setup and run clangd-tidy on relevant files
-
-inputs:
-  changed-files:
-    description: A pre-filtered list of changed files.
-    required: true
-    type: string
-
-runs:
-  using: composite
-  steps:
-    - name: Setup clangd-tidy
-      shell: sh
-      run: |
-        echo "::group::Prerequisite checks"
-        if [ ! -f "compile_commands.json" ]; then
-          echo "::error::clangd-tidy checker requires a compilation database to function"
-          exit 1
-        fi
-        echo "::endgroup::"
-
-        echo "::group::Installing clangd-tidy"
-        # Don't know which python we're using, so just access the global scope.
-        python -m pip install clangd clangd-tidy clang-tidy==22.1.0
-        echo "::endgroup::"
-
-        echo "::group::Running clangd-tidy"
-        clangd-tidy ${{ inputs.changed-files }}
-        echo "::endgroup::"
diff --git a/engine/.github/actions/godot-compat-test/action.yml b/engine/.github/actions/godot-compat-test/action.yml
deleted file mode 100644
index 09e10519..00000000
--- a/engine/.github/actions/godot-compat-test/action.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Godot hash compatibility test
-description: Check if methods with given hashes used by the older GDExtensions still can be loaded with given Godot version.
-
-inputs:
-  bin:
-    description: Path to the Godot binary.
-    required: true
-    type: string
-  reftags:
-    description: Reference tags of Godot versions to check (comma separated).
-    required: true
-    type: string
-
-runs:
-  using: composite
-  steps:
-    - name: Extract GDExtension interface
-      shell: sh
-      run: |
-        ${{ inputs.bin }} --headless --dump-gdextension-interface
-        mkdir tests/compatibility_test/src/deps/
-        mv gdextension_interface.h tests/compatibility_test/src/deps/
-
-    - name: Build minimal GDExtension
-      shell: sh
-      run: scons --directory=./tests/compatibility_test
-
-    - name: Download reference GDExtension API JSON and try to load it
-      shell: sh
-      env:
-        GODOT4_BIN: ${{ inputs.bin }}
-        REFTAGS: ${{ inputs.reftags }}
-      run: ./tests/compatibility_test/run_compatibility_test.py
diff --git a/engine/.github/actions/godot-project-export/action.yml b/engine/.github/actions/godot-project-export/action.yml
deleted file mode 100644
index 76212234..00000000
--- a/engine/.github/actions/godot-project-export/action.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Export Godot project
-description: Export a test Godot project.
-
-inputs:
-  bin:
-    description: The path to the Godot executable
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Import resources and export project
-      shell: sh
-      run: |
-        git clone --depth=1 https://github.com/godotengine/godot-tests.git /tmp/godot-tests
-
-        echo "Exporting project for Linux (PCK)"
-        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux" /tmp/test_project.pck 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        echo "Exporting project for Linux (ZIP)"
-        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux" /tmp/test_project.zip 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        echo "Exporting project for Linux as dedicated server (PCK)"
-        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --export-pack "Linux Server" /tmp/test_project_server.pck 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-    - name: Run project files from folder
-      shell: sh
-      run: |
-        xvfb-run ${{ inputs.bin }} --path /tmp/godot-tests/tests/test_project/ --language fr --resolution 64x64 --write-movie /tmp/test_project_folder.png --quit 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        ${{ inputs.bin }} --headless --path /tmp/godot-tests/tests/test_project/ --quit 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-    - name: Run exported project PCK/ZIP
-      shell: sh
-      run: |
-        xvfb-run ${{ inputs.bin }} --main-pack /tmp/test_project.pck --language fr --resolution 64x64 --write-movie /tmp/test_project_pck.png --quit 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        xvfb-run ${{ inputs.bin }} --main-pack /tmp/test_project.zip --language fr --resolution 64x64 --write-movie /tmp/test_project_zip.png --quit 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        # Headless mode is implied for dedicated server PCKs.
-        ${{ inputs.bin }} --main-pack /tmp/test_project_server.pck --quit 2>&1 | tee log.txt || true
-        GODOT_CHECK_CI_LOG_ALL_ERRORS=1 misc/scripts/check_ci_log.py log.txt
-
-        echo "Checking whether video output from project folder and exported project match..."
-        md5sum /tmp/test_project*.png | md5sum --check
-
-        echo "Checking whether audio output from project folder and exported project match..."
-        md5sum /tmp/test_project*.wav | md5sum --check
diff --git a/engine/.github/changed_files.yml b/engine/.github/changed_files.yml
deleted file mode 100644
index 892ac77f..00000000
--- a/engine/.github/changed_files.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# We lack a convenient means of gathering *all* the changes when specializations are passed, so
-#  a catch-all variable is the easiest workaround.
-everything:
-  - "**"
-
-# Determines if build actions should occur after static checks are ran. Broadly speaking, these
-#  files changing would result in SCons rebuilding the engine, or are otherwise pertinent to the
-#  buildsystem itself.
-sources:
-  - .github/{actions/*,workflows}/*.yml
-  - "**/{SConstruct,SCsub,*.py}"
-  - "**/*.{h,hpp,hh,hxx,c,cpp,cc,cxx,m,mm,inc,glsl}"
-  - modules/mono/**/*.{cs,csproj,sln,props,targets}
-  - platform/android/java/{gradle*,**/*.{jar,java,kt,gradle}}
-  - platform/web/{package{,-lock}.json,js/**/*.js}
-  - tests/**
-
-# Determines which files are appropriate for running clangd-tidy checks on. This is a subset out
-#  of necessity, as we're only evaluating a Linux runner.
-clangd:
-  - "**/*.{h,hpp,hxx,hh,c,cpp,cxx,cc}"
-  - "!**/thirdparty/**"
-  - "!**/*-so_wrap.{h,c}"
-  - "!drivers/{apple*,core*,d3d12,metal,wasapi,windows,winmidi,xaudio2}/**"
-  - "!editor/shader/shader_baker/shader_baker_export_plugin_platform_{d3d12,metal}.{h,cpp}"
-  - "!modules/camera/camera_{android,macos,win}.{h,cpp}"
-  - "!modules/openxr/extensions/platform/openxr_{android,metal}_extension.{h,cpp}"
-  - "!platform/{android,ios,macos,visionos,web,windows}/**"
-  - "platform/{android,ios,macos,visionos,web,windows}/{api,export}/*.{h,hpp,hxx,hh,c,cpp,cxx,cc}"
diff --git a/engine/.github/workflows/android_builds.yml b/engine/.github/workflows/android_builds.yml
index c4b0f910..346aaf71 100644
--- a/engine/.github/workflows/android_builds.yml
+++ b/engine/.github/workflows/android_builds.yml
@@ -1,10 +1,6 @@
 name: 🤖 Android Builds
 on:
   workflow_call:
-    secrets:
-      SERVICE_ACCOUNT_KEY:
-        required: true
-
   workflow_dispatch:
 
 # Global Settings
@@ -12,6 +8,7 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
+    tests=no
     swappy=yes
 
 jobs:
@@ -26,7 +23,6 @@ jobs:
           - name: Editor (target=editor)
             cache-name: android-editor
             target: editor
-            instrumented_tests: true
             scons-flags: >-
               arch=arm64
               production=yes
@@ -34,23 +30,21 @@ jobs:
           - name: Template arm32 (target=template_debug, arch=arm32)
             cache-name: android-template-arm32
             target: template_debug
-            instrumented_tests: false
             scons-flags: arch=arm32
 
           - name: Template arm64 (target=template_debug, arch=arm64)
             cache-name: android-template-arm64
             target: template_debug
-            instrumented_tests: true
             scons-flags: arch=arm64
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Java 17
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
@@ -122,54 +116,3 @@ jobs:
         with:
           name: ${{ matrix.cache-name }}-picoos
           path: picoos
-
-      - name: Generate Instrumented test APKs
-        if: matrix.instrumented_tests && github.repository == 'godotengine/godot' && github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        run: |
-          cd platform/android/java
-          if [ "${{ matrix.target }}" = "editor" ]; then
-            ./gradlew :editor:assembleAndroidAndroidTest :editor:assembleAndroidDebug -Pperform_signing=true
-          else
-            ./gradlew :app:assembleAndroidTest :app:assembleInstrumentedDebug -Pperform_signing=true
-          fi
-          cd ../../..
-
-      - name: Create credentials file
-        if: matrix.instrumented_tests && github.repository == 'godotengine/godot' && github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        uses: google-github-actions/auth@v3
-        with:
-          credentials_json: ${{ secrets.SERVICE_ACCOUNT_KEY }}
-
-      - name: Set up gcloud CLI
-        if: matrix.instrumented_tests && github.repository == 'godotengine/godot' && github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        uses: google-github-actions/setup-gcloud@v3
-
-      - name: Run tests on Firebase Test Lab
-        if: matrix.instrumented_tests && github.repository == 'godotengine/godot' && github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        run: |
-          set +e
-
-          if [ "${{ matrix.target }}" = "editor" ]; then
-            APP_APK="platform/android/java/editor/build/outputs/apk/android/debug/android_editor-android-debug.apk"
-            TEST_APK="platform/android/java/editor/build/outputs/apk/androidTest/android/debug/android_editor-android-debug-androidTest.apk"
-          else
-            APP_APK="platform/android/java/app/build/outputs/apk/instrumented/debug/android_debug.apk"
-            TEST_APK="platform/android/java/app/build/outputs/apk/androidTest/instrumented/debug/app-instrumented-debug-androidTest.apk"
-          fi
-
-          output=$(gcloud firebase test android run \
-            --type instrumentation \
-            --app "$APP_APK" \
-            --test "$TEST_APK" \
-            --device model=pa3q,version=35,orientation=landscape \
-            --device model=java,version=30,orientation=landscape \
-            --device model=MediumPhone.arm,version=26,orientation=landscape \
-            --use-orchestrator \
-            --timeout 2m 2>&1)
-          exit_code=$?
-          echo "$output"
-          if [[ $exit_code -eq 1 && "$output" == *"TEST_QUOTA_EXCEEDED"* ]]; then
-            echo "::warning title=Firebase Test Lab::Test quota exceeded."
-            exit_code=0
-          fi
-          exit "$exit_code"
diff --git a/engine/.github/workflows/ios_builds.yml b/engine/.github/workflows/ios_builds.yml
index 6ba63caa..831ed640 100644
--- a/engine/.github/workflows/ios_builds.yml
+++ b/engine/.github/workflows/ios_builds.yml
@@ -8,21 +8,26 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
+    tests=no
     debug_symbols=no
 
 jobs:
   ios-template:
     # From https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#choosing-github-hosted-runners
-    runs-on: macos-26
+    runs-on: macos-latest
     name: Template (target=template_release)
     timeout-minutes: 60
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      # From https://github.com/actions/runner-images/blob/main/images/macos
+      - name: Select Xcode 26
+        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
+
       - name: Restore Godot build cache
         uses: ./.github/actions/godot-cache-restore
         continue-on-error: true
diff --git a/engine/.github/workflows/linux_builds.yml b/engine/.github/workflows/linux_builds.yml
index abababa6..388ce528 100644
--- a/engine/.github/workflows/linux_builds.yml
+++ b/engine/.github/workflows/linux_builds.yml
@@ -1,11 +1,6 @@
 name: 🐧 Linux Builds
 on:
   workflow_call:
-    inputs:
-      changed-files:
-        description: A list of changed files, pre-filtered for parsing by clangd-tidy.
-        required: true
-        type: string
   workflow_dispatch:
 
 # Global Settings
@@ -13,6 +8,7 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
+    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
   GODOT_CPP_BRANCH: 4.5
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -34,17 +30,15 @@ jobs:
           - name: Editor w/ Mono (target=editor)
             cache-name: linux-editor-mono
             target: editor
-            scons-flags: module_mono_enabled=yes compiledb=yes
+            scons-flags: module_mono_enabled=yes
             bin: ./bin/godot.linuxbsd.editor.x86_64.mono
             build-mono: true
             doc-test: true
             proj-conv: true
-            proj-export: true
             api-compat: true
             artifact: true
             # Validate godot-cpp compatibility on one arbitrary editor build.
             godot-cpp: true
-            clangd-tidy: true
 
           - name: Editor with doubles and GCC sanitizers (target=editor, dev_build=yes, scu_build=yes, precision=double, use_asan=yes, use_ubsan=yes, linker=mold)
             cache-name: linux-editor-double-sanitizers
@@ -116,7 +110,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -124,7 +118,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install libwayland-bin  # TODO: Figure out somehow how to embed this one.
-          if [ "${{ matrix.proj-test }}" == "true" -o "${{ matrix.proj-export }}" == "true" ]; then
+          if [ "${{ matrix.proj-test }}" == "true" ]; then
             sudo apt-get install mesa-vulkan-drivers
           fi
 
@@ -149,7 +143,7 @@ jobs:
         uses: ./.github/actions/godot-deps
         with:
           # Sync with Ensure*Version in SConstruct.
-          python-version: 3.9
+          python-version: 3.8
           scons-version: 4.0
 
       - name: Force remove preinstalled .NET SDKs
@@ -165,15 +159,15 @@ jobs:
           dotnet-version: 8.0.100
 
       - name: Download pre-built AccessKit
-        shell: sh
-        id: accesskit-sdk
-        run: |
-          if python ./misc/scripts/install_accesskit.py; then
-            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
-            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
-          fi
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
+        with:
+          repo: godotengine/godot-accesskit-c-static
+          version: tags/0.21.2
+          file: accesskit-c-0.21.2.zip
+          target: accesskit-c-0.21.2/accesskit_c.zip
+
+      - name: Extract pre-built AccessKit
+        run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
 
       - name: Install mold linker
         if: matrix.proj-test
@@ -182,16 +176,10 @@ jobs:
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }}
           platform: linuxbsd
           target: ${{ matrix.target }}
 
-      - name: Style checks via clangd-tidy
-        if: matrix.clangd-tidy
-        uses: ./.github/actions/clangd-tidy
-        with:
-          changed-files: ${{ inputs.changed-files }}
-
       - name: Compilation (godot-cpp)
         uses: ./.github/actions/godot-cpp-build
         if: matrix.godot-cpp
@@ -220,7 +208,6 @@ jobs:
       - name: Prepare artifact
         if: matrix.artifact
         run: |
-          rm -rf ./bin/build_deps
           strip bin/godot.*
           chmod +x bin/godot.*
 
@@ -251,18 +238,11 @@ jobs:
           git diff --color --exit-code && ! git ls-files --others --exclude-standard | sed -e 's/^/New doc file missing in PR: /' | grep 'xml$'
 
       # Check API backwards compatibility
-      - name: Check for GDExtension compatibility – JSON check
+      - name: Check for GDExtension compatibility
         if: matrix.api-compat
         run: |
           ./misc/scripts/validate_extension_api.sh "${{ matrix.bin }}"
 
-      - name: Test GDExtension compatibility – load methods
-        uses: ./.github/actions/godot-compat-test
-        if: matrix.api-compat
-        with:
-          bin: ${{ matrix.bin }}
-          reftags: "4.5-stable,4.4-stable"
-
       # Download and run the test project
       - name: Test Godot project
         uses: ./.github/actions/godot-project-test
@@ -270,13 +250,6 @@ jobs:
         with:
           bin: ${{ matrix.bin }}
 
-      # Test project export
-      - name: Test project export
-        uses: ./.github/actions/godot-project-export
-        if: matrix.proj-export
-        with:
-          bin: ${{ matrix.bin }}
-
       # Test the project converter
       - name: Test project converter
         uses: ./.github/actions/godot-converter-test
diff --git a/engine/.github/workflows/macos_builds.yml b/engine/.github/workflows/macos_builds.yml
index 5e7d3553..82478fb6 100644
--- a/engine/.github/workflows/macos_builds.yml
+++ b/engine/.github/workflows/macos_builds.yml
@@ -8,11 +8,12 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
+    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
 
 jobs:
   build-macos:
     # From https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#choosing-github-hosted-runners
-    runs-on: macos-26
+    runs-on: macos-latest
     name: ${{ matrix.name }}
     timeout-minutes: 120
     strategy:
@@ -32,10 +33,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      # From https://github.com/actions/runner-images/blob/main/images/macos
+      - name: Select Xcode 26
+        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
+
       - name: Restore Godot build cache
         uses: ./.github/actions/godot-cache-restore
         with:
@@ -45,27 +50,16 @@ jobs:
       - name: Setup Python and SCons
         uses: ./.github/actions/godot-deps
 
-      - name: Download pre-built ANGLE
-        shell: sh
-        id: angle-sdk
-        run: |
-          if python ./misc/scripts/install_angle.py; then
-            echo "ANGLE_ENABLED=yes" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::ANGLE SDK installation failed, building without ANGLE support."
-            echo "ANGLE_ENABLED=no" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Download pre-built AccessKit
-        shell: sh
-        id: accesskit-sdk
-        run: |
-          if python3 ./misc/scripts/install_accesskit.py; then
-            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
-            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
-          fi
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
+        with:
+          repo: godotengine/godot-accesskit-c-static
+          version: tags/0.21.2
+          file: accesskit-c-0.21.2.zip
+          target: accesskit-c-0.21.2/accesskit_c.zip
+
+      - name: Extract pre-built AccessKit
+        run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
 
       - name: Setup Vulkan SDK
         id: vulkan-sdk
@@ -81,14 +75,14 @@ jobs:
       - name: Compilation (x86_64)
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=x86_64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }} angle=${{ steps.angle-sdk.outputs.ANGLE_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=x86_64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }}
           platform: macos
           target: ${{ matrix.target }}
 
       - name: Compilation (arm64)
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=arm64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }} angle=${{ steps.angle-sdk.outputs.ANGLE_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=arm64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }}
           platform: macos
           target: ${{ matrix.target }}
 
@@ -102,7 +96,6 @@ jobs:
         run: |
           lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
           rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
-          rm -rf ./bin/build_deps
           strip bin/godot.*
           chmod +x bin/godot.*
 
diff --git a/engine/.github/workflows/runner.yml b/engine/.github/workflows/runner.yml
index 4a12bd5c..cbe3d576 100644
--- a/engine/.github/workflows/runner.yml
+++ b/engine/.github/workflows/runner.yml
@@ -18,39 +18,29 @@ jobs:
   android-build:
     name: 🤖 Android
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/android_builds.yml
-    secrets:
-      SERVICE_ACCOUNT_KEY: ${{ secrets.SERVICE_ACCOUNT_KEY }}
 
   ios-build:
     name: 🍏 iOS
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/ios_builds.yml
 
   linux-build:
     name: 🐧 Linux
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/linux_builds.yml
-    with:
-      changed-files: ${{ needs.static-checks.outputs.changed-files }}
 
   macos-build:
     name: 🍎 macOS
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/macos_builds.yml
 
   windows-build:
     name: 🏁 Windows
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/windows_builds.yml
 
   web-build:
     name: 🌐 Web
     needs: static-checks
-    if: needs.static-checks.outputs.sources-changed == 'true' || github.event_name != 'pull_request'
     uses: ./.github/workflows/web_builds.yml
diff --git a/engine/.github/workflows/static_checks.yml b/engine/.github/workflows/static_checks.yml
index 4585155e..7ab79b86 100644
--- a/engine/.github/workflows/static_checks.yml
+++ b/engine/.github/workflows/static_checks.yml
@@ -1,13 +1,6 @@
 name: 📊 Static Checks
 on:
   workflow_call:
-    outputs:
-      changed-files:
-        description: A list of changed files, pre-filtered for parsing by clangd-tidy.
-        value: ${{ jobs.static-checks.outputs.changed-files }}
-      sources-changed:
-        description: Determines if any source files were changed.
-        value: ${{ jobs.static-checks.outputs.sources-changed }}
   workflow_dispatch:
 
 jobs:
@@ -15,15 +8,11 @@ jobs:
     name: Code style, file formatting, and docs
     runs-on: ubuntu-24.04
     timeout-minutes: 30
-    outputs:
-      changed-files: '"${{ steps.changed-files.outputs.clangd_all_changed_files }}"' # Wrap with quotes to bookend internal quote separators.
-      sources-changed: ${{ steps.changed-files.outputs.sources_any_changed }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Treeless clone. Slightly less performant than a shallow clone, but makes finding diffs instantaneous.
-          filter: tree:0 # See: https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/
+          fetch-depth: 2
 
       # This needs to happen before Python and npm execution; it must happen before any extra files are written.
       - name: .gitignore checks (gitignore_check.sh)
@@ -31,17 +20,18 @@ jobs:
           bash ./misc/scripts/gitignore_check.sh
 
       - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v47
-        with:
-          safe_output: false # Output passed to environment variable to avoid command injection.
-          separator: '" "' # To account for paths with spaces, ensure our items are split by quotes internally.
-          skip_initial_fetch: true
-          files_yaml_from_source_file: .github/changed_files.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            files=$(git diff-tree --no-commit-id --name-only -r HEAD^1..HEAD 2> /dev/null || true)
+          elif [ "${{ github.event_name }}" == "push" -a "${{ github.event.forced }}" == "false" -a "${{ github.event.created }}" == "false" ]; then
+            files=$(git diff-tree --no-commit-id --name-only -r ${{ github.event.before }}..${{ github.event.after }} 2> /dev/null || true)
+          fi
+          files=$(echo "$files" | xargs -I {} sh -c 'echo "\"./{}\""' | tr '\n' ' ')
+          echo "CHANGED_FILES=$files" >> $GITHUB_ENV
 
       - name: Style checks via pre-commit
         uses: pre-commit/action@v3.0.1
-        env:
-          CHANGED_FILES: '"${{ steps.changed-files.outputs.everything_all_changed_files }}"' # Wrap with quotes to bookend internal quote separators.
         with:
           extra_args: --files ${{ env.CHANGED_FILES }}
diff --git a/engine/.github/workflows/web_builds.yml b/engine/.github/workflows/web_builds.yml
index dba7896b..04d60ab5 100644
--- a/engine/.github/workflows/web_builds.yml
+++ b/engine/.github/workflows/web_builds.yml
@@ -7,6 +7,7 @@ on:
 env:
   SCONS_FLAGS: >-
     dev_mode=yes
+    tests=no
     debug_symbols=no
     use_closure_compiler=yes
   EM_VERSION: 4.0.11
@@ -20,21 +21,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Template w/ threads, 64-bit (target=template_release, threads=yes, arch=wasm64)
+          - name: Template w/ threads (target=template_release, threads=yes)
             cache-name: web-template
             target: template_release
-            scons-flags: threads=yes arch=wasm64
+            scons-flags: threads=yes
             artifact: true
 
-          - name: Template w/o threads, 32-bit (target=template_release, threads=no, arch=wasm32)
+          - name: Template w/o threads (target=template_release, threads=no)
             cache-name: web-nothreads-template
             target: template_release
-            scons-flags: threads=no arch=wasm32
+            scons-flags: threads=no
             artifact: true
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/engine/.github/workflows/windows_builds.yml b/engine/.github/workflows/windows_builds.yml
index f8776b4c..b57637c0 100644
--- a/engine/.github/workflows/windows_builds.yml
+++ b/engine/.github/workflows/windows_builds.yml
@@ -9,6 +9,8 @@ env:
     dev_mode=yes
     module_text_server_fb_enabled=yes
     debug_symbols=no
+    "angle_libs=${{ github.workspace }}/"
+    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
   SCONS_CACHE_MSVC_CONFIG: true
   PYTHONIOENCODING: utf8
 
@@ -57,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -82,37 +84,32 @@ jobs:
           fi
         continue-on-error: true
 
-      - name: Download pre-built ANGLE
-        shell: sh
-        id: angle-sdk
-        run: |
-          if python ./misc/scripts/install_angle.py; then
-            echo "ANGLE_ENABLED=yes" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::ANGLE SDK installation failed, building without ANGLE support."
-            echo "ANGLE_ENABLED=no" >> "$GITHUB_OUTPUT"
-          fi
+      - name: Download pre-built ANGLE static libraries
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
+        with:
+          repo: godotengine/godot-angle-static
+          version: tags/chromium/6601.2
+          file: godot-angle-static-x86_64-${{ matrix.compiler == 'gcc' && 'gcc' || 'msvc' }}-release.zip
+          target: angle/angle.zip
 
-      - name: Download WinRT components
-        shell: sh
-        run: python ./misc/scripts/install_winrt.py
-        continue-on-error: true
+      - name: Extract pre-built ANGLE static libraries
+        run: Expand-Archive -Force angle/angle.zip ${{ github.workspace }}/
 
       - name: Download pre-built AccessKit
-        shell: sh
-        id: accesskit-sdk
-        run: |
-          if python ./misc/scripts/install_accesskit.py; then
-            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
-            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
-          fi
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
+        with:
+          repo: godotengine/godot-accesskit-c-static
+          version: tags/0.21.2
+          file: accesskit-c-0.21.2.zip
+          target: accesskit-c-0.21.2/accesskit_c.zip
+
+      - name: Extract pre-built AccessKit
+        run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
 
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} d3d12=${{ steps.d3d12-sdk.outputs.D3D12_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }} angle=${{ steps.angle-sdk.outputs.ANGLE_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} d3d12=${{ steps.d3d12-sdk.outputs.D3D12_ENABLED }}
           platform: windows
           target: ${{ matrix.target }}
 
diff --git a/engine/.pre-commit-config.yaml b/engine/.pre-commit-config.yaml
index 1825d34f..15119dc3 100644
--- a/engine/.pre-commit-config.yaml
+++ b/engine/.pre-commit-config.yaml
@@ -29,36 +29,30 @@ repos:
         types_or: [text]
         args: [-style=file:misc/utility/clang_format_glsl.yml]
 
-  # Not automatically triggered (because it requires compile_commands.json to be up-to-date).
-  # Invoke it manually via `pre-commit run --hook-stage manual clang-tidy`
   - repo: https://github.com/pocc/pre-commit-hooks
     rev: v1.3.5
     hooks:
       - id: clang-tidy
-        # TODO .inc ignored for now because they don't include their parent header.
-        # TODO Platform-specific subfolders currently fail, we should try to include them
-        files: ^(core|main|scene)/.*\.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|java)$
-        # No unknown warning suppression used for easier compatibility with gcc
-        args: [--fix, --quiet, --use-color, -p=compile_commands.json, -extra-arg=-Wno-unknown-warning-option]
+        files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
+        args: [--fix, --quiet, --use-color]
         types_or: [text]
         additional_dependencies: [clang-tidy==21.1.6]
-        require_serial: false
-        stages: [manual]
+        require_serial: true
+        stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.8
+    rev: v0.14.7
     hooks:
       - id: ruff-check
-        args: [--color=always]
+        args: [--fix]
         files: (\.py|SConstruct|SCsub)$
         types_or: [text]
       - id: ruff-format
-        args: [--color=always]
         files: (\.py|SConstruct|SCsub)$
         types_or: [text]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.19.1
+    rev: v1.14.1 # Latest version that supports Python 3.8
     hooks:
       - id: mypy
         files: \.py$
@@ -109,18 +103,6 @@ repos:
         files: ^(doc/classes|.*/doc_classes)/.*\.xml$
         additional_dependencies: [xmlschema]
 
-      - id: validate-codeowners
-        name: validate-codeowners
-        language: python
-        entry: python misc/scripts/validate_codeowners.py
-        args: [--unowned]
-
-      - id: validate-includes
-        name: validate-includes
-        language: python
-        entry: python misc/scripts/validate_includes.py
-        files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc)$
-
       - id: eslint
         name: eslint
         language: node
diff --git a/engine/CHANGELOG.md b/engine/CHANGELOG.md
index 72394127..08e753e0 100644
--- a/engine/CHANGELOG.md
+++ b/engine/CHANGELOG.md
@@ -7,6 +7,289 @@ previous feature release. It is equivalent to the listings on our
 Changelogs for earlier feature releases are available in their respective Git
 branches, and linked at the [end of this file](#Past-releases).
 
+## 4.6.2 - 2026-04-01
+
+- [Release announcement](https://godotengine.org/article/maintenance-release-godot-4-6-2)
+- [Interactive changelog](https://godotengine.github.io/godot-interactive-changelog/#4.6.2)
+
+#### 3D
+
+- Fix `GridMap` editor pasting when orbiting using the "Alt" key ([GH-116778](https://github.com/godotengine/godot/pull/116778)).
+- Fix 3D editor camera not updating correctly ([GH-106219](https://github.com/godotengine/godot/pull/106219)).
+- Fix 3D focus selection for subgizmos ([GH-116972](https://github.com/godotengine/godot/pull/116972)).
+- Fix collision repositioning for child nodes ([GH-115353](https://github.com/godotengine/godot/pull/115353)).
+- Fix DirectionalLight3D property list ([GH-117189](https://github.com/godotengine/godot/pull/117189)).
+- Fix some UI issues with the `GridMap` editor ([GH-116555](https://github.com/godotengine/godot/pull/116555)).
+- Remove unneeded checks for undo-redo history from Skeleton3DEditor ([GH-115784](https://github.com/godotengine/godot/pull/115784)).
+
+#### Animation
+
+- Account for the current section when processing AnimationTracks ([GH-116046](https://github.com/godotengine/godot/pull/116046)).
+- Check `playback_queue` existence after emit `animation_finished` signal ([GH-116676](https://github.com/godotengine/godot/pull/116676)).
+- Clear fade-out on request firing in AnimationNodeOneShot ([GH-115125](https://github.com/godotengine/godot/pull/115125)).
+- Deselect bezier keyframes when switching animations ([GH-116953](https://github.com/godotengine/godot/pull/116953)).
+- Fix animation player crash when setting current animation to stop ([GH-116264](https://github.com/godotengine/godot/pull/116264)).
+- Fix icon size in AnimationPlayer tracks ([GH-115576](https://github.com/godotengine/godot/pull/115576)).
+- Fix visual shift of animation editor keys during selection ([GH-117290](https://github.com/godotengine/godot/pull/117290)).
+- Fix timeline cursor following mouse during marker selection ([GH-117634](https://github.com/godotengine/godot/pull/117634)).
+
+#### Assetlib
+
+- Fix TLS handshake fail preventing AssetLib use with `builtin_certs=no` ([GH-115450](https://github.com/godotengine/godot/pull/115450)).
+
+#### Audio
+
+- AudioStreamWAV: Check for `eof_reached` when reading LIST INFO tags ([GH-116719](https://github.com/godotengine/godot/pull/116719)).
+- Fix `AudioStreamPlaybackMicrophone` shutdown crash ([GH-116299](https://github.com/godotengine/godot/pull/116299)).
+
+#### Buildsystem
+
+- Add UTF-8 encoding to svg file open in `platform_builders.py` ([GH-117454](https://github.com/godotengine/godot/pull/117454)).
+- CI: Bump JavaScript actions to Node 24 ([GH-117428](https://github.com/godotengine/godot/pull/117428)).
+- CI: Restore godot-cpp caching ([GH-116586](https://github.com/godotengine/godot/pull/116586)).
+- Fix Metal driver build with Xcode 26.4 ([GH-117989](https://github.com/godotengine/godot/pull/117989)).
+- ScrollBar: Fix compilation with `precision=double` ([GH-117224](https://github.com/godotengine/godot/pull/117224)).
+- Update CODEOWNERS ([GH-117674](https://github.com/godotengine/godot/pull/117674)).
+
+#### C#
+
+- Revert "[.NET] Remove EFS update on reloading assemblies" but with deferred call ([GH-117617](https://github.com/godotengine/godot/pull/117617)).
+
+#### Core
+
+- Fix `String::split_` crash on empty string ([GH-117353](https://github.com/godotengine/godot/pull/117353)).
+- Fix editable children state when duplicating instantiated nodes ([GH-117041](https://github.com/godotengine/godot/pull/117041)).
+- Make sure `ScriptLanguage` is initialized even after `init_languages` call ([GH-114131](https://github.com/godotengine/godot/pull/114131)).
+- RingBuffer: Fix `T read()` method reading empty buffer ([GH-117388](https://github.com/godotengine/godot/pull/117388)).
+- RingBuffer: Fix overreading on methods that take an offset as an argument ([GH-117151](https://github.com/godotengine/godot/pull/117151)).
+
+#### Documentation
+
+- Editor Settings: Prevent crash when viewing `filesystem/import/blender/blender_path` ([GH-115895](https://github.com/godotengine/godot/pull/115895)).
+- Fix UPNP code sample using `OK` constant incorrectly ([GH-115549](https://github.com/godotengine/godot/pull/115549)).
+
+#### Editor
+
+- Add support for `--ignore-error-breaks` to `LocalDebugger` ([GH-116823](https://github.com/godotengine/godot/pull/116823)).
+- Check if a resource from a snapshot exists before loading it ([GH-115194](https://github.com/godotengine/godot/pull/115194)).
+- Create EditorHelpHighlighter in Project Manager ([GH-116014](https://github.com/godotengine/godot/pull/116014)).
+- Don't tint the preview camera icon ([GH-116525](https://github.com/godotengine/godot/pull/116525)).
+- Ensure debug features get cleared after use ([GH-115116](https://github.com/godotengine/godot/pull/115116)).
+- Fix build profile generator always enabling 2D navigation ([GH-115412](https://github.com/godotengine/godot/pull/115412)).
+- Fix build profile generator creating bogus profiles ([GH-115410](https://github.com/godotengine/godot/pull/115410)).
+- Fix Change version link in web editor shell ([GH-117763](https://github.com/godotengine/godot/pull/117763)).
+- Fix code completion popup colors not being updated properly ([GH-115315](https://github.com/godotengine/godot/pull/115315)).
+- Fix detection of some features in Engine Compilation Configuration Editor ([GH-115230](https://github.com/godotengine/godot/pull/115230)).
+- Fix editor not handling unsaved changes on restart from settings ([GH-116218](https://github.com/godotengine/godot/pull/116218)).
+- Fix EditorSettings error due to `android_sdk_path` when exporting a project ([GH-116515](https://github.com/godotengine/godot/pull/116515)).
+- Fix extend script button styling in scene tree dock ([GH-115045](https://github.com/godotengine/godot/pull/115045)).
+- Fix hidden `Import` tab height ([GH-115172](https://github.com/godotengine/godot/pull/115172)).
+- Fix mute button after pausing and stopping ([GH-116537](https://github.com/godotengine/godot/pull/116537)).
+- Fix theme item inspector tooltips for Window subclasses ([GH-115245](https://github.com/godotengine/godot/pull/115245)).
+- Hide property groups from the "Members" section in Debugger ([GH-116790](https://github.com/godotengine/godot/pull/116790)).
+- macOS: Set apple menu node name to non empty value ([GH-115726](https://github.com/godotengine/godot/pull/115726)).
+- Properly update region editor window when undoing changes to `region_rect` ([GH-108875](https://github.com/godotengine/godot/pull/108875)).
+- Scene tree dock: Don't log error if there is no selection upon handling `item_icon_double_clicked` signal ([GH-115347](https://github.com/godotengine/godot/pull/115347)).
+- Set accessibility name on Tree inline cell editor when editing ([GH-117135](https://github.com/godotengine/godot/pull/117135)).
+- Stop autocomplete from eating words by default ([GH-117464](https://github.com/godotengine/godot/pull/117464)).
+
+#### Export
+
+- Android Editor: Copy keystore to temp file during export ([GH-116161](https://github.com/godotengine/godot/pull/116161)).
+- Linux: Handle debug symbols with renamed executable ([GH-114947](https://github.com/godotengine/godot/pull/114947)).
+
+#### GDExtension
+
+- Add missing `GDVIRTUAL_BIND(_get_supported_extensions)` on `MovieWriter` ([GH-117479](https://github.com/godotengine/godot/pull/117479)).
+
+#### GDScript
+
+- Stop `RemoteDebugger` from improperly flushing messages during break ([GH-115532](https://github.com/godotengine/godot/pull/115532)).
+
+#### GUI
+
+- Fix "Custom" anchor preset being ignored if the parent isn't a `Control` ([GH-117488](https://github.com/godotengine/godot/pull/117488)).
+- Fix `SplitContainerDragger` dragging with enabled screen reader, allow resizing with keyboard shortcuts ([GH-116628](https://github.com/godotengine/godot/pull/116628)).
+- Fix `TabContainer` accessibility sub-element cleanup ([GH-116617](https://github.com/godotengine/godot/pull/116617)).
+- Fix camera focus triggered by double-clicking Tree buttons ([GH-114519](https://github.com/godotengine/godot/pull/114519)).
+- Fix crash on removing Windows PopupMenu submenu ([GH-115373](https://github.com/godotengine/godot/pull/115373)).
+- Fix drag-resizing `Control` with non-zero `pivot_offset_ratio` ([GH-116057](https://github.com/godotengine/godot/pull/116057)).
+- Fix error after setting native PopupMenu item ID ([GH-115378](https://github.com/godotengine/godot/pull/115378)).
+- Fix LCD batching flag for StyleBoxTexture ([GH-116647](https://github.com/godotengine/godot/pull/116647)).
+- Fix RichTextLabel drag selection not working after double-click ([GH-117201](https://github.com/godotengine/godot/pull/117201)).
+- Fix soft hyphen not working with small (or zero) line breaking width ([GH-116196](https://github.com/godotengine/godot/pull/116196)).
+- Fix SplitContainer accessibility errors ([GH-116601](https://github.com/godotengine/godot/pull/116601)).
+- Fix wrong normal icon color in FileDialog ([GH-115917](https://github.com/godotengine/godot/pull/115917)).
+- PopupMenu: Use parent `GraphEdit` scale for popups inside `GraphElement` instead of completely disabling it ([GH-115620](https://github.com/godotengine/godot/pull/115620)).
+- RTL: Fix `%` handling in `[img=WxH]` tags ([GH-116928](https://github.com/godotengine/godot/pull/116928)).
+- Stop exposing external theme item properties ([GH-115392](https://github.com/godotengine/godot/pull/115392)).
+- TextEdit: Fix clipping of last character due to right margin rounding ([GH-116850](https://github.com/godotengine/godot/pull/116850)).
+- TextServer: Fix numeric keycap emoji sequence rendering ([GH-115687](https://github.com/godotengine/godot/pull/115687)).
+- TextServer: Ignore language of embedded object replacement spans when updating line breaks ([GH-116197](https://github.com/godotengine/godot/pull/116197)).
+
+#### Import
+
+- Blender attempts should be incremented to avoid endless loop ([GH-116589](https://github.com/godotengine/godot/pull/116589)).
+
+#### Input
+
+- Fix issues with `InputMap::load_from_project_settings()` when called in tool script ([GH-105045](https://github.com/godotengine/godot/pull/105045)).
+- macOS: Hide input accessory popups when no text control selected ([GH-115619](https://github.com/godotengine/godot/pull/115619)).
+- Sync controller mappings DB with SDL community repo ([GH-115752](https://github.com/godotengine/godot/pull/115752)).
+
+#### Physics
+
+- Jolt Physics: Make MoveKinematic more accurate when rotating a body by a very small angle ([GH-115327](https://github.com/godotengine/godot/pull/115327)).
+- Jolt Physics: Rework how gravity is applied to dynamic bodies to prevent energy increase on elastic collisions ([GH-115305](https://github.com/godotengine/godot/pull/115305)).
+- Jolt Physics: Swapping vertices of triangle if it is scaled inside out ([GH-115089](https://github.com/godotengine/godot/pull/115089)).
+
+#### Platforms
+
+- Android: Enable native file picker support on all devices ([GH-115257](https://github.com/godotengine/godot/pull/115257)).
+- Android: Fix FileAccess crash when using treeUri in Gradle-built apps ([GH-117131](https://github.com/godotengine/godot/pull/117131)).
+- Android: Fix JavaClassWrapper test crashes on API 26 and lower ([GH-115800](https://github.com/godotengine/godot/pull/115800)).
+- Android: Remove version check for `FEATURE_NATIVE_DIALOG_FILE` support ([GH-116584](https://github.com/godotengine/godot/pull/116584)).
+- Apple Embedded: Fix static .a/.xcframework library loading in `open_dynamic_library` ([GH-117469](https://github.com/godotengine/godot/pull/117469)).
+- Fix macOS Steam time tracking lost when opening a project ([GH-117335](https://github.com/godotengine/godot/pull/117335)).
+- Fix startup errors/warnings on X11 when the Prefer Wayland editor setting is enabled ([GH-116366](https://github.com/godotengine/godot/pull/116366)).
+- iOS: Add UIScene lifecycle events ([GH-116395](https://github.com/godotengine/godot/pull/116395)).
+- iOS: Propagate VC UI preferences to SwiftUI hosting controller ([GH-116633](https://github.com/godotengine/godot/pull/116633)).
+- LinuxBSD: Fix UI freeze when opening file manager ([GH-114521](https://github.com/godotengine/godot/pull/114521)).
+- macOS: Add `nullptr` checks of `script_debugger` in `LayerHost::gui_input` ([GH-116724](https://github.com/godotengine/godot/pull/116724)).
+- macOS: Add null check to `get_framework_executable` ([GH-116354](https://github.com/godotengine/godot/pull/116354)).
+- macOS: Enable wake for events if `Magnet` is running ([GH-116524](https://github.com/godotengine/godot/pull/116524)).
+- macOS: Fix confined mouse movement getting out of sync ([GH-116242](https://github.com/godotengine/godot/pull/116242)).
+- Wayland: Improve mapping robustness and synchronization ([GH-117385](https://github.com/godotengine/godot/pull/117385)).
+- Wayland: Only handle the current output mode ([GH-116236](https://github.com/godotengine/godot/pull/116236)).
+- Wayland: Skip resize request when the size is the same ([GH-116376](https://github.com/godotengine/godot/pull/116376)).
+- Windows: Set current driver when ANGLE init fails ([GH-117253](https://github.com/godotengine/godot/pull/117253)).
+- Windows: Use executable icon as default for the window ([GH-115294](https://github.com/godotengine/godot/pull/115294)).
+
+#### Plugin
+
+- Android: Fix java.util.HashMap handling ([GH-114941](https://github.com/godotengine/godot/pull/114941)).
+- Fix EditorDock not reopening ([GH-117340](https://github.com/godotengine/godot/pull/117340)).
+
+#### Rendering
+
+- Add compatibility fallback to `textureLod` when reading from `RADIANCE` ([GH-116155](https://github.com/godotengine/godot/pull/116155)).
+- Apply fixed size properly for mono/stereo rendering ([GH-115147](https://github.com/godotengine/godot/pull/115147)).
+- Fix accidental write-combined memory reads in canvas renderer ([GH-115757](https://github.com/godotengine/godot/pull/115757)).
+- Fix shader compilation error when writing to `FOG` when `render_mode fog_disabled` ([GH-115026](https://github.com/godotengine/godot/pull/115026)).
+- Fix Tangent decoding detection when computing vertex skinning ([GH-117401](https://github.com/godotengine/godot/pull/117401)).
+- Fix viewport debanding not working with spatial scalers ([GH-114890](https://github.com/godotengine/godot/pull/114890)).
+- Handle nearest filtering modes in D3D12 driver when anisotropy is enabled ([GH-115504](https://github.com/godotengine/godot/pull/115504)).
+- macOS: Force ANGLE (GL over Metal) when running in VM ([GH-117371](https://github.com/godotengine/godot/pull/117371)).
+- Restore default sky roughness levels to 8 ([GH-116154](https://github.com/godotengine/godot/pull/116154)).
+
+#### Shaders
+
+- Fix UTF-8 handling in GLES3 shaders ([GH-116756](https://github.com/godotengine/godot/pull/116756)).
+- Fixes for completion of shader preprocessor defines ([GH-116413](https://github.com/godotengine/godot/pull/116413)).
+- VisualShader: Fix nodes not attaching to new Frame on duplication ([GH-115193](https://github.com/godotengine/godot/pull/115193)).
+
+#### Tests
+
+- Android: Fail instrumented tests when test function doesn't complete ([GH-115713](https://github.com/godotengine/godot/pull/115713)).
+- Fix file access tests failing on older Android devices ([GH-115718](https://github.com/godotengine/godot/pull/115718)).
+
+#### Thirdparty
+
+- Accessibility: Handle adapter activation/deactivation ([GH-115565](https://github.com/godotengine/godot/pull/115565)).
+- Add missing patch files to `thirdparty/jolt_physics` ([GH-115884](https://github.com/godotengine/godot/pull/115884)).
+- libpng: Update to 1.6.55 ([GH-117564](https://github.com/godotengine/godot/pull/117564)).
+- Update access-kit to 0.21.2 ([GH-117433](https://github.com/godotengine/godot/pull/117433)).
+
+## 4.6.1 - 2026-02-16
+
+- [Release announcement](https://godotengine.org/article/maintenance-release-godot-4-6-1)
+- [Interactive changelog](https://godotengine.github.io/godot-interactive-changelog/#4.6.1)
+
+#### 3D
+
+- Change orbit snap shortcut with navigation scheme ([GH-115298](https://github.com/godotengine/godot/pull/115298)).
+- Fix `Skeleton3D` Edit Mode bone buttons have priority over transform gizmo ([GH-115608](https://github.com/godotengine/godot/pull/115608)).
+- Fix viewport orbit snap defaulting to always snapping when shortcut(s) are set to none ([GH-115002](https://github.com/godotengine/godot/pull/115002)).
+- Increase float precision in the editor inspector for Quaternions ([GH-106352](https://github.com/godotengine/godot/pull/106352)).
+- Register zoom shortcuts to match preset `Godot` navigation scheme ([GH-115290](https://github.com/godotengine/godot/pull/115290)).
+
+#### Animation
+
+- Fix double memdelete of `dummy_player` ([GH-115968](https://github.com/godotengine/godot/pull/115968)).
+- Fix LookAtModifier3D / AimModifier3D forward vector ([GH-115689](https://github.com/godotengine/godot/pull/115689)).
+- Fix use-after-free in Animation Blend Tree ([GH-115919](https://github.com/godotengine/godot/pull/115919)).
+- Fix use-after-free in AnimationTree (AHashMap realloc) ([GH-115931](https://github.com/godotengine/godot/pull/115931)).
+
+#### Buildsystem
+
+- Fix missing lib with `builtin_glslang=false` ([GH-93478](https://github.com/godotengine/godot/pull/93478)).
+
+#### C#
+
+- Revert "Improve performance of `CSharpLanguage::reload_assemblies`" ([GH-115759](https://github.com/godotengine/godot/pull/115759)).
+
+#### Core
+
+- Fix ClassDB class list sorting regression ([GH-115923](https://github.com/godotengine/godot/pull/115923)).
+- Fix the `NodePath` hash function to not yield the same value for similar paths ([GH-115473](https://github.com/godotengine/godot/pull/115473)).
+
+#### Editor
+
+- Fix `NodePath` `EditorProperty` using the wrong scene root ([GH-115422](https://github.com/godotengine/godot/pull/115422)).
+- Fix create dialog recents ([GH-115314](https://github.com/godotengine/godot/pull/115314)).
+- Fix Rename option for instance roots ([GH-115575](https://github.com/godotengine/godot/pull/115575)).
+- Fix Unique Resources from Inherited Scenes ([GH-115862](https://github.com/godotengine/godot/pull/115862)).
+- Fix wrong base type when creating script ([GH-115778](https://github.com/godotengine/godot/pull/115778)).
+
+#### Export
+
+- Load translation files to check locale for ICU data export ([GH-115827](https://github.com/godotengine/godot/pull/115827)).
+
+#### GDScript
+
+- LSP: Add `godot` to known language ids ([GH-115671](https://github.com/godotengine/godot/pull/115671)).
+- LSP: Handle clients that do not support `CompletionContext` ([GH-115672](https://github.com/godotengine/godot/pull/115672)).
+
+#### GUI
+
+- Fix current line highlight not extending into gutter ([GH-115729](https://github.com/godotengine/godot/pull/115729)).
+
+#### Input
+
+- Update editor shortcuts when changing 3D navigation scheme ([GH-115289](https://github.com/godotengine/godot/pull/115289)).
+
+#### Particles
+
+- Revert "Change curve range for particle multipliers" ([GH-116140](https://github.com/godotengine/godot/pull/116140)).
+
+#### Physics
+
+- Fix transform updates sometimes being discarded when using Jolt ([GH-115364](https://github.com/godotengine/godot/pull/115364)).
+
+#### Platforms
+
+- Android: Fix `Bad file descriptor` in SAF/MediaStore in long term access ([GH-115751](https://github.com/godotengine/godot/pull/115751)).
+- Fix crash in `StorageScope.kt` on Android ([GH-115515](https://github.com/godotengine/godot/pull/115515)).
+- Wayland Embedder: Fix FD leak with inert objects ([GH-115823](https://github.com/godotengine/godot/pull/115823)).
+- Windows: Disable MSVC control flow check on IAT hooks ([GH-115430](https://github.com/godotengine/godot/pull/115430)).
+
+#### Plugin
+
+- Android: Fix plugin type mismatch regression ([GH-115685](https://github.com/godotengine/godot/pull/115685)).
+
+#### Rendering
+
+- Avoid reading from sky pointer when rendering background without sky ([GH-115874](https://github.com/godotengine/godot/pull/115874)).
+- Ensure that uv border size is passed in to sky rendering functions ([GH-115606](https://github.com/godotengine/godot/pull/115606)).
+- Pick the sample closer to the camera when resolving 2x MSAA ([GH-115124](https://github.com/godotengine/godot/pull/115124)).
+- Update re-spirv with more derivative operations ([GH-115921](https://github.com/godotengine/godot/pull/115921)).
+- Use sky's corrected camera projection for `combined_reprojection` ([GH-115292](https://github.com/godotengine/godot/pull/115292)).
+- Use transmittance instead of opacity in the early-out branch when calculating volumetric fog ([GH-116107](https://github.com/godotengine/godot/pull/116107)).
+
+#### Thirdparty
+
+- libpng: Update to 1.6.54 ([GH-115714](https://github.com/godotengine/godot/pull/115714)).
+
 ## 4.6 - 2026-01-26
 
 - [Release announcement](https://godotengine.org/releases/4.6/)
diff --git a/engine/CONTRIBUTING.md b/engine/CONTRIBUTING.md
index 613aa7ac..02829178 100644
--- a/engine/CONTRIBUTING.md
+++ b/engine/CONTRIBUTING.md
@@ -65,7 +65,7 @@ for an introduction to developing on Godot.
 
 The [Contributing docs](https://contributing.godotengine.org/en/latest/organization/how_to_contribute.html)
 also have important information on the [PR workflow](https://contributing.godotengine.org/en/latest/organization/pull_requests/creating_pull_requests.html)
-(with a helpful guide for Git usage), and our [Code style guidelines](https://contributing.godotengine.org/en/latest/engine/guidelines/cpp_usage_guidelines.html)
+(with a helpful guide for Git usage), and our [Code style guidelines](https://contributing.godotengine.org/en/latest/engine/guidelines/code_style.html)
 which all contributions need to follow.
 
 ### Be mindful of your commits
diff --git a/engine/COPYRIGHT.txt b/engine/COPYRIGHT.txt
index 2d65970b..ce3cdd2c 100644
--- a/engine/COPYRIGHT.txt
+++ b/engine/COPYRIGHT.txt
@@ -310,11 +310,6 @@ Comment: The FreeType Project
 Copyright: 1996-2025, David Turner, Robert Wilhelm, and Werner Lemberg.
 License: FTL
 
-Files: thirdparty/gamepadmotionhelpers/*
-Comment: GamepadMotionHelpers
-Copyright: 2020-2023, Julian "Jibb" Smart
-License: Expat
-
 Files: thirdparty/glad/*
 Comment: glad
 Copyright: 2013-2022, David Herberth
@@ -432,11 +427,6 @@ Comment: meshoptimizer
 Copyright: 2016-2024, Arseny Kapoulkine
 License: Expat
 
-Files: thirdparty/metal-cpp/*
-Comment: metal-cpp
-Copyright: 2024, Apple Inc.
-License: Apache-2.0
-
 Files: thirdparty/mingw-std-threads/*
 Comment: mingw-std-threads
 Copyright: 2016, Mega Limited
@@ -584,11 +574,6 @@ Comment: SPIRV-Cross
 Copyright: 2015-2021, Arm Limited
 License: Apache-2.0 or Expat
 
-Files: thirdparty/spirv-headers/*
-Comment: SPIRV-Headers
-Copyright: 2015-2024, The Khronos Group Inc.
-License: Expat
-
 Files: thirdparty/spirv-reflect/*
 Comment: SPIRV-Reflect
 Copyright: 2017-2022, Google Inc.
@@ -601,7 +586,7 @@ License: Apache-2.0
 
 Files: thirdparty/thorvg/*
 Comment: ThorVG
-Copyright: 2020-2026, The ThorVG Project
+Copyright: 2020-2024, The ThorVG Project
 License: Expat
 
 Files: thirdparty/tinyexr/*
@@ -623,19 +608,19 @@ License: BSD-3-clause
 
 Files: thirdparty/volk/*
 Comment: volk
-Copyright: 2018-2025, Arseny Kapoulkine
+Copyright: 2018-2024, Arseny Kapoulkine
 License: Expat
 
 Files: thirdparty/vulkan/*
 Comment: Vulkan Headers
-Copyright: 2015-2025, The Khronos Group Inc.
-  2015-2025, Valve Corporation
-  2015-2025, LunarG, Inc.
+Copyright: 2014-2024, The Khronos Group Inc.
+  2014-2024, Valve Corporation
+  2014-2024, LunarG, Inc.
 License: Apache-2.0
 
 Files: thirdparty/vulkan/vk_mem_alloc.h
 Comment: Vulkan Memory Allocator
-Copyright: 2017-2025, Advanced Micro Devices, Inc.
+Copyright: 2017-2024, Advanced Micro Devices, Inc.
 License: Expat
 
 Files: thirdparty/wayland/*
diff --git a/engine/SConstruct b/engine/SConstruct
index b45d6b11..52e37b9b 100644
--- a/engine/SConstruct
+++ b/engine/SConstruct
@@ -2,7 +2,7 @@
 from misc.utility.scons_hints import *
 
 EnsureSConsVersion(4, 0)
-EnsurePythonVersion(3, 9)
+EnsurePythonVersion(3, 8)
 
 # System
 import glob
@@ -199,8 +199,8 @@ opts.Add(BoolVariable("opengl3", "Enable the OpenGL/GLES3 rendering driver", Tru
 opts.Add(BoolVariable("d3d12", "Enable the Direct3D 12 rendering driver on supported platforms", False))
 opts.Add(BoolVariable("metal", "Enable the Metal rendering driver on supported platforms (Apple arm64 only)", False))
 opts.Add(BoolVariable("use_volk", "Use the volk library to load the Vulkan loader dynamically", True))
-opts.Add(BoolVariable("accesskit", "Enable the AccessKit driver for screen reader support", True))
-opts.Add(BoolVariable("angle", "Enable the ANGLE rendering driver for OpenGL ES 3.0 on supported platforms", True))
+opts.Add(BoolVariable("accesskit", "Use AccessKit C SDK", True))
+opts.Add(("accesskit_sdk_path", "Path to the AccessKit C SDK", ""))
 opts.Add(BoolVariable("sdl", "Enable the SDL3 input driver", True))
 opts.Add(
     EnumVariable(
@@ -222,13 +222,6 @@ opts.Add(
         False,
     )
 )
-opts.Add(
-    BoolVariable(
-        "profiler_record_on_demand",
-        "Record only when the profiler is connected, if the profiler supports it. In Tracy, this configures TRACY_ON_DEMAND, which has a performance impact if enabled.",
-        True,
-    )
-)
 
 
 # Advanced options
@@ -243,7 +236,6 @@ opts.Add(BoolVariable("ninja", "Use the ninja backend for faster rebuilds", Fals
 opts.Add(BoolVariable("ninja_auto_run", "Run ninja automatically after generating the ninja file", True))
 opts.Add("ninja_file", "Path to the generated ninja file", "build.ninja")
 opts.Add(BoolVariable("compiledb", "Generate compilation DB (`compile_commands.json`) for external tools", False))
-opts.Add(BoolVariable("compiledb_gen_only", "Exit after building the compilation database", False))
 opts.Add(
     "num_jobs",
     "Use up to N jobs when compiling (equivalent to `-j N`). Defaults to max jobs - 1. Ignored if -j is used.",
@@ -656,11 +648,8 @@ if env["build_profile"] != "":
             dbo = ft["disabled_build_options"]
             for c in dbo:
                 env[c] = dbo[c]
-    except json.JSONDecodeError as err:
-        print_error(f'Failed to open feature build profile due to JSON decoding error: "{env["build_profile"]}"\n{err}')
-        Exit(255)
-    except FileNotFoundError:
-        print_error(f'Feature build profile not found at: "{env["build_profile"]}"')
+    except json.JSONDecodeError:
+        print_error(f'Failed to open feature build profile: "{env["build_profile"]}"')
         Exit(255)
 
 # 'dev_mode' and 'production' are aliases to set default options if they haven't been
@@ -1180,6 +1169,7 @@ env.Append(BUILDERS=GLSL_BUILDERS)
 
 if env["compiledb"]:
     env.Tool("compilation_db")
+    env.Alias("compiledb", env.CompilationDatabase())
     env.NoCache(env.CompilationDatabase())
     if not env["verbose"]:
         env["COMPILATIONDB_COMSTR"] = "$GENCOMSTR"
@@ -1239,12 +1229,6 @@ if env["vsproj"]:
 
 # Miscellaneous & post-build methods.
 if not env.GetOption("clean") and not env.GetOption("help"):
-    if env["compiledb"] and env["compiledb_gen_only"]:
-        from SCons.Tool.compilation_db import write_compilation_db
-
-        write_compilation_db([env.File("compile_commands.json")], [], env)
-        env.Exit()
-
     methods.dump(env)
     methods.show_progress(env)
     methods.prepare_purge(env)
diff --git a/engine/core/config/engine.cpp b/engine/core/config/engine.cpp
index 9a2c9318..154fed8f 100644
--- a/engine/core/config/engine.cpp
+++ b/engine/core/config/engine.cpp
@@ -34,7 +34,6 @@
 #include "core/config/project_settings.h"
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
-#include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_device.h"
diff --git a/engine/core/config/project_settings.cpp b/engine/core/config/project_settings.cpp
index 5992b462..8f293a30 100644
--- a/engine/core/config/project_settings.cpp
+++ b/engine/core/config/project_settings.cpp
@@ -30,28 +30,23 @@
 
 #include "project_settings.h"
 
+#include "core/core_bind.h" // For Compression enum.
 #include "core/input/input_map.h"
-#include "core/io/compression.h"
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "core/object/script_language.h"
-#include "core/os/os.h"
 #include "core/templates/rb_set.h"
 #include "core/variant/typed_array.h"
 #include "core/variant/variant_parser.h"
 #include "core/version.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
-#include "core/config/engine.h"
-
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 #endif // TOOLS_ENABLED
 
 ProjectSettings *ProjectSettings::get_singleton() {
@@ -640,8 +635,7 @@ void ProjectSettings::_convert_to_last_version(int p_from_version) {
 	} else if (p_from_version <= 6) {
 		// Check if we still have legacy boot splash (removed in 4.6), map it to new project setting, then remove legacy setting.
 		if (has_setting("application/boot_splash/fullsize")) {
-			// See RenderingServerEnums::SplashStretchMode.
-			set_setting("application/boot_splash/stretch_mode", get_setting("application/boot_splash/fullsize") ? 1 : 0);
+			set_setting("application/boot_splash/stretch_mode", RenderingServer::map_scaling_option_to_stretch_mode(get_setting("application/boot_splash/fullsize")));
 			set_setting("application/boot_splash/fullsize", Variant());
 		}
 	}
@@ -1063,7 +1057,6 @@ bool ProjectSettings::is_builtin_setting(const String &p_name) const {
 void ProjectSettings::clear(const String &p_name) {
 	ERR_FAIL_COND_MSG(!props.has(p_name), vformat("Request for nonexistent project setting: '%s'.", p_name));
 	props.erase(p_name);
-	_queue_changed(p_name);
 }
 
 Error ProjectSettings::save() {
@@ -1647,7 +1640,7 @@ void ProjectSettings::_bind_methods() {
 
 void ProjectSettings::_add_builtin_input_map() {
 	if (InputMap::get_singleton()) {
-		HashMap<String, List<Ref<InputEvent>>> builtins(InputMap::get_singleton()->get_builtins());
+		HashMap<String, List<Ref<InputEvent>>> builtins = InputMap::get_singleton()->get_builtins();
 
 		for (KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
 			Array events;
@@ -1710,7 +1703,6 @@ ProjectSettings::ProjectSettings() {
 
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "accessibility/general/accessibility_support", PROPERTY_HINT_ENUM, "Auto (When Screen Reader is Running),Always Active,Disabled"), 0);
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "accessibility/general/updates_per_second", PROPERTY_HINT_RANGE, "1,100,1"), 60);
-	GLOBAL_DEF(PropertyInfo(Variant::STRING, "accessibility/general/accessibility_driver", PROPERTY_HINT_ENUM, "accesskit,dummy"), "accesskit");
 
 	// The default window size is tuned to:
 	// - Have a 16:9 aspect ratio,
@@ -1740,10 +1732,7 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "display/window/size/window_width_override", PROPERTY_HINT_RANGE, "0,7680,1,or_greater"), 0); // 8K resolution
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "display/window/size/window_height_override", PROPERTY_HINT_RANGE, "0,4320,1,or_greater"), 0); // 8K resolution
 
-	GLOBAL_DEF("display/window/hdr/request_hdr_output", false);
-
 	GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true);
-	GLOBAL_DEF("animation/warnings/check_invalid_skeleton_modifier_node_paths", true);
 	GLOBAL_DEF("animation/warnings/check_invalid_track_paths", true);
 	GLOBAL_DEF("animation/warnings/check_angle_interpolation_type_conflicting", true);
 #ifndef DISABLE_DEPRECATED
@@ -1762,10 +1751,10 @@ ProjectSettings::ProjectSettings() {
 
 	_add_builtin_input_map();
 
-	// Keep the enum values in sync with the `DisplayServerEnums::ScreenOrientation` enum.
+	// Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum.
 	custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::INT, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait,Reverse Landscape,Reverse Portrait,Sensor Landscape,Sensor Portrait,Sensor");
 	GLOBAL_DEF("display/window/subwindows/embed_subwindows", true);
-	// Keep the enum values in sync with the `DisplayServerEnums::VSyncMode` enum.
+	// Keep the enum values in sync with the `DisplayServer::VSyncMode` enum.
 	custom_prop_info["display/window/vsync/vsync_mode"] = PropertyInfo(Variant::INT, "display/window/vsync/vsync_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Adaptive,Mailbox");
 
 	GLOBAL_DEF("display/window/frame_pacing/android/enable_frame_pacing", true);
@@ -1817,7 +1806,7 @@ ProjectSettings::ProjectSettings() {
 
 	GLOBAL_DEF("gui/common/drag_threshold", 10);
 	GLOBAL_DEF_BASIC("gui/common/snap_controls_to_pixels", true);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/common/show_focus_state_on_pointer_event", PROPERTY_HINT_ENUM, "Never,Text Input Controls,Always"), 1);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/common/show_focus_state_on_pointer_event", PROPERTY_HINT_ENUM, "Never,Control Supports Keyboard Input,Always"), 1);
 	GLOBAL_DEF_BASIC("gui/fonts/dynamic_fonts/use_oversampling", true);
 
 	GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/rendering_device/vsync/frame_queue_size", PROPERTY_HINT_RANGE, "2,3,1"), 2);
diff --git a/engine/core/config/project_settings.h b/engine/core/config/project_settings.h
index e197a8d9..a861f49f 100644
--- a/engine/core/config/project_settings.h
+++ b/engine/core/config/project_settings.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/object.h"
-#include "core/os/thread_safe.h"
 #include "core/templates/rb_map.h"
 
 template <typename T>
@@ -205,7 +204,7 @@ public:
 	const HashMap<StringName, PropertyInfo> &get_custom_property_info() const;
 	uint64_t get_last_saved_time() { return last_save_time; }
 
-	List<String> get_input_presets() const { return List<String>(input_presets); }
+	List<String> get_input_presets() const { return input_presets; }
 
 	Variant get_setting_with_override(const StringName &p_name) const;
 	Variant get_setting_with_override_and_custom_features(const StringName &p_name, const Vector<String> &p_features) const;
diff --git a/engine/core/core_bind.compat.inc b/engine/core/core_bind.compat.inc
index 26086522..8bfa66e4 100644
--- a/engine/core/core_bind.compat.inc
+++ b/engine/core/core_bind.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "core_bind.h"
-
-#include "core/object/class_db.h"
-
 namespace CoreBind {
 
 // Semaphore
diff --git a/engine/core/core_bind.cpp b/engine/core/core_bind.cpp
index e78b5a56..2fd854f4 100644
--- a/engine/core/core_bind.cpp
+++ b/engine/core/core_bind.cpp
@@ -31,7 +31,6 @@
 #include "core_bind.h"
 #include "core_bind.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
@@ -40,11 +39,8 @@
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
-#include "core/os/process_id.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/typed_array.h"
 
@@ -429,7 +425,7 @@ int OS::create_instance(const Vector<String> &p_arguments) {
 	for (const String &arg : p_arguments) {
 		args.push_back(arg);
 	}
-	ProcessID pid = 0;
+	::OS::ProcessID pid = 0;
 	Error err = ::OS::get_singleton()->create_instance(args, &pid);
 	if (err != OK) {
 		return -1;
@@ -450,7 +446,7 @@ int OS::create_process(const String &p_path, const Vector<String> &p_arguments,
 	for (const String &arg : p_arguments) {
 		args.push_back(arg);
 	}
-	ProcessID pid = 0;
+	::OS::ProcessID pid = 0;
 	Error err = ::OS::get_singleton()->create_process(p_path, args, &pid, p_open_console);
 	if (err != OK) {
 		return -1;
diff --git a/engine/core/core_bind.h b/engine/core/core_bind.h
index 547c1f0b..9848393e 100644
--- a/engine/core/core_bind.h
+++ b/engine/core/core_bind.h
@@ -31,10 +31,8 @@
 #pragma once
 
 #include "core/debugger/engine_profiler.h"
-#include "core/io/logger.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "core/object/script_backtrace.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
diff --git a/engine/core/core_builders.py b/engine/core/core_builders.py
index c9d76eb0..d6b1a2b7 100644
--- a/engine/core/core_builders.py
+++ b/engine/core/core_builders.py
@@ -41,7 +41,7 @@ def version_hash_builder(target, source, env):
 #include "core/version.h"
 
 const char *const GODOT_VERSION_HASH = "{git_hash}";
-const unsigned long long GODOT_VERSION_TIMESTAMP = {git_timestamp};
+const uint64_t GODOT_VERSION_TIMESTAMP = {git_timestamp};
 """.format(**source[0].read())
         )
 
@@ -63,7 +63,7 @@ def encryption_key_builder(target, source, env):
     with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
-#include <cstdint>
+#include "core/config/project_settings.h"
 
 uint8_t script_encryption_key[32] = {{
 	{methods.format_buffer(buffer, 1)}
diff --git a/engine/core/core_constants.cpp b/engine/core/core_constants.cpp
index 3a43ea01..b3251295 100644
--- a/engine/core/core_constants.cpp
+++ b/engine/core/core_constants.cpp
@@ -30,12 +30,10 @@
 
 #include "core_constants.h"
 
-#include "core/input/input_enums.h"
-#include "core/object/method_bind_common.h" // IWYU pragma: keep. For `VARIANT_BITFIELD_CAST(MethodFlags)`.
+#include "core/input/input_event.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/variant/type_info.h"
 #include "core/variant/variant.h"
-#include "core/variant/variant_caster.h"
 
 struct _CoreConstant {
 #ifdef DEBUG_ENABLED
@@ -71,183 +69,183 @@ static HashMap<StringName, Vector<_CoreConstant>> _global_enums;
 
 #ifdef DEBUG_ENABLED
 
-#define BIND_CORE_CONSTANT(m_constant) \
+#define BIND_CORE_CONSTANT(m_constant)                                                 \
 	_global_constants.push_back(_CoreConstant(StringName(), #m_constant, m_constant)); \
 	_global_constants_map[#m_constant] = _global_constants.size() - 1;
 
-#define BIND_CORE_ENUM_CONSTANT(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT(m_constant)                                                          \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant));              \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_BITFIELD_FLAG(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_constant); \
+#define BIND_CORE_BITFIELD_FLAG(m_constant)                                                          \
+	{                                                                                                \
+		StringName enum_name = __constant_get_bitfield_name(m_constant);                             \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant, false, true)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
 // This just binds enum classes as if they were regular enum constants.
-#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
+#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member)                                                  \
+	{                                                                                                              \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                                         \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                             \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);               \
 	}
 
-#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
+#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member)                                                               \
+	{                                                                                                                           \
+		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member);                                                  \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member, false, true)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                                          \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);                            \
+	}
+
+#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member)                               \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                           \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member));   \
+		_global_constants_map[#m_name] = _global_constants.size() - 1;                               \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_name] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
-	}
-
-#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
+#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member)                                          \
+	{                                                                                                           \
+		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member);                                  \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member, false, true)); \
-		_global_constants_map[#m_name] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
+		_global_constants_map[#m_name] = _global_constants.size() - 1;                                          \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);            \
 	}
 
-#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
+#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member)                                                 \
+	{                                                                                                                    \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                                               \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member, true)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                                   \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);                     \
+	}
+
+#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant)                                    \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant));            \
+		_global_constants_map[m_custom_name] = _global_constants.size() - 1;                         \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
-		_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
-	}
-
-#define BIND_CORE_CONSTANT_NO_VAL(m_constant) \
+#define BIND_CORE_CONSTANT_NO_VAL(m_constant)                                                \
 	_global_constants.push_back(_CoreConstant(StringName(), #m_constant, m_constant, true)); \
 	_global_constants_map[#m_constant] = _global_constants.size() - 1;
 
-#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant, true)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant)                                                   \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant, true));        \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant, true)); \
-		_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant)                             \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant, true));      \
+		_global_constants_map[m_custom_name] = _global_constants.size() - 1;                         \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
 #else
 
-#define BIND_CORE_CONSTANT(m_constant) \
+#define BIND_CORE_CONSTANT(m_constant)                                                 \
 	_global_constants.push_back(_CoreConstant(StringName(), #m_constant, m_constant)); \
 	_global_constants_map[#m_constant] = _global_constants.size() - 1;
 
-#define BIND_CORE_ENUM_CONSTANT(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT(m_constant)                                                          \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant));              \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_BITFIELD_FLAG(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+#define BIND_CORE_BITFIELD_FLAG(m_constant)                                                          \
+	{                                                                                                \
+		StringName enum_name = __constant_get_bitfield_name(m_constant);                             \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant));              \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
 // This just binds enum classes as if they were regular enum constants.
-#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
+#define BIND_CORE_ENUM_CLASS_CONSTANT(m_enum, m_prefix, m_member)                                                  \
+	{                                                                                                              \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                                         \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                             \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);               \
 	}
 
-#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
+#define BIND_CORE_BITFIELD_CLASS_FLAG(m_enum, m_prefix, m_member)                                                  \
+	{                                                                                                              \
+		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member);                                     \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                             \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);               \
+	}
+
+#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member)                               \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                           \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member));   \
+		_global_constants_map[#m_name] = _global_constants.size() - 1;                               \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CLASS_CONSTANT_CUSTOM(m_enum, m_name, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_name] = _global_constants.size() - 1; \
+#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member)                               \
+	{                                                                                                \
+		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member);                       \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member));   \
+		_global_constants_map[#m_name] = _global_constants.size() - 1;                               \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_BITFIELD_CLASS_FLAG_CUSTOM(m_enum, m_name, m_member) \
-	{ \
-		StringName enum_name = __constant_get_bitfield_name(m_enum::m_member); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_name, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_name] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
-	}
-
-#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_enum::m_member); \
+#define BIND_CORE_ENUM_CLASS_CONSTANT_NO_VAL(m_enum, m_prefix, m_member)                                           \
+	{                                                                                                              \
+		StringName enum_name = __constant_get_enum_name(m_enum::m_member);                                         \
 		_global_constants.push_back(_CoreConstant(enum_name, #m_prefix "_" #m_member, (int64_t)m_enum::m_member)); \
-		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1; \
+		_global_constants_map[#m_prefix "_" #m_member] = _global_constants.size() - 1;                             \
+		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]);               \
+	}
+
+#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant)                                    \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant));            \
+		_global_constants_map[m_custom_name] = _global_constants.size() - 1;                         \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CONSTANT_CUSTOM(m_custom_name, m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
-		_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
-		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
-	}
-
-#define BIND_CORE_CONSTANT_NO_VAL(m_constant) \
+#define BIND_CORE_CONSTANT_NO_VAL(m_constant)                                          \
 	_global_constants.push_back(_CoreConstant(StringName(), #m_constant, m_constant)); \
 	_global_constants_map[#m_constant] = _global_constants.size() - 1;
 
-#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant)); \
-		_global_constants_map[#m_constant] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT_NO_VAL(m_constant)                                                   \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, #m_constant, m_constant));              \
+		_global_constants_map[#m_constant] = _global_constants.size() - 1;                           \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
-#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant) \
-	{ \
-		StringName enum_name = __constant_get_enum_name(m_constant); \
-		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant)); \
-		_global_constants_map[m_custom_name] = _global_constants.size() - 1; \
+#define BIND_CORE_ENUM_CONSTANT_CUSTOM_NO_VAL(m_custom_name, m_constant)                             \
+	{                                                                                                \
+		StringName enum_name = __constant_get_enum_name(m_constant);                                 \
+		_global_constants.push_back(_CoreConstant(enum_name, m_custom_name, m_constant));            \
+		_global_constants_map[m_custom_name] = _global_constants.size() - 1;                         \
 		_global_enums[enum_name].push_back((_global_constants.ptr())[_global_constants.size() - 1]); \
 	}
 
@@ -551,11 +549,6 @@ void register_global_constants() {
 	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, PADDLE3);
 	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, PADDLE4);
 	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, TOUCHPAD);
-	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MISC2);
-	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MISC3);
-	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MISC4);
-	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MISC5);
-	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MISC6);
 	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, SDL_MAX);
 	BIND_CORE_ENUM_CLASS_CONSTANT(JoyButton, JOY_BUTTON, MAX);
 
@@ -736,18 +729,6 @@ void register_global_constants() {
 	BIND_CORE_BITFIELD_FLAG(METHOD_FLAG_VIRTUAL_REQUIRED);
 	BIND_CORE_BITFIELD_FLAG(METHOD_FLAGS_DEFAULT);
 
-	BIND_CORE_CONSTANT(UINT8_MAX);
-	BIND_CORE_CONSTANT(UINT16_MAX);
-	BIND_CORE_CONSTANT(UINT32_MAX);
-	BIND_CORE_CONSTANT(INT8_MIN);
-	BIND_CORE_CONSTANT(INT8_MAX);
-	BIND_CORE_CONSTANT(INT16_MIN);
-	BIND_CORE_CONSTANT(INT16_MAX);
-	BIND_CORE_CONSTANT(INT32_MIN);
-	BIND_CORE_CONSTANT(INT32_MAX);
-	BIND_CORE_CONSTANT(INT64_MIN);
-	BIND_CORE_CONSTANT(INT64_MAX);
-
 	BIND_CORE_ENUM_CONSTANT_CUSTOM("TYPE_NIL", Variant::NIL);
 	BIND_CORE_ENUM_CONSTANT_CUSTOM("TYPE_BOOL", Variant::BOOL);
 	BIND_CORE_ENUM_CONSTANT_CUSTOM("TYPE_INT", Variant::INT);
diff --git a/engine/core/core_globals.h b/engine/core/core_globals.h
index fa095daf..a5aae961 100644
--- a/engine/core/core_globals.h
+++ b/engine/core/core_globals.h
@@ -38,5 +38,4 @@ public:
 	static inline bool leak_reporting_enabled = true;
 	static inline bool print_line_enabled = true;
 	static inline bool print_error_enabled = true;
-	static inline bool print_ready = false;
 };
diff --git a/engine/core/crypto/aes_context.cpp b/engine/core/crypto/aes_context.cpp
index a1fa4397..53ca6502 100644
--- a/engine/core/crypto/aes_context.cpp
+++ b/engine/core/crypto/aes_context.cpp
@@ -28,9 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "aes_context.h"
-
-#include "core/object/class_db.h"
+#include "core/crypto/aes_context.h"
 
 Error AESContext::start(Mode p_mode, const PackedByteArray &p_key, const PackedByteArray &p_iv) {
 	ERR_FAIL_COND_V_MSG(mode != MODE_MAX, ERR_ALREADY_IN_USE, "AESContext already started. Call 'finish' before starting a new one.");
diff --git a/engine/core/crypto/aes_context.h b/engine/core/crypto/aes_context.h
index 51d5d4cd..bc13485e 100644
--- a/engine/core/crypto/aes_context.h
+++ b/engine/core/crypto/aes_context.h
@@ -32,7 +32,6 @@
 
 #include "core/crypto/crypto_core.h"
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class AESContext : public RefCounted {
 	GDCLASS(AESContext, RefCounted);
diff --git a/engine/core/crypto/crypto.cpp b/engine/core/crypto/crypto.cpp
index edbfae32..2f0c5476 100644
--- a/engine/core/crypto/crypto.cpp
+++ b/engine/core/crypto/crypto.cpp
@@ -30,8 +30,6 @@
 
 #include "crypto.h"
 
-#include "core/object/class_db.h"
-
 /// Resources
 
 CryptoKey *(*CryptoKey::_create)(bool p_notify_postinitialize) = nullptr;
@@ -179,3 +177,82 @@ void Crypto::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("hmac_digest", "hash_type", "key", "msg"), &Crypto::hmac_digest);
 	ClassDB::bind_method(D_METHOD("constant_time_compare", "trusted", "received"), &Crypto::constant_time_compare);
 }
+
+/// Resource loader/saver
+
+Ref<Resource> ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	String el = p_path.get_extension().to_lower();
+	if (el == "crt") {
+		X509Certificate *cert = X509Certificate::create();
+		if (cert) {
+			cert->load(p_path);
+		}
+		return cert;
+	} else if (el == "key") {
+		CryptoKey *key = CryptoKey::create();
+		if (key) {
+			key->load(p_path, false);
+		}
+		return key;
+	} else if (el == "pub") {
+		CryptoKey *key = CryptoKey::create();
+		if (key) {
+			key->load(p_path, true);
+		}
+		return key;
+	}
+	return nullptr;
+}
+
+void ResourceFormatLoaderCrypto::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("crt");
+	p_extensions->push_back("key");
+	p_extensions->push_back("pub");
+}
+
+bool ResourceFormatLoaderCrypto::handles_type(const String &p_type) const {
+	return p_type == "X509Certificate" || p_type == "CryptoKey";
+}
+
+String ResourceFormatLoaderCrypto::get_resource_type(const String &p_path) const {
+	String el = p_path.get_extension().to_lower();
+	if (el == "crt") {
+		return "X509Certificate";
+	} else if (el == "key" || el == "pub") {
+		return "CryptoKey";
+	}
+	return "";
+}
+
+Error ResourceFormatSaverCrypto::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Error err;
+	Ref<X509Certificate> cert = p_resource;
+	Ref<CryptoKey> key = p_resource;
+	if (cert.is_valid()) {
+		err = cert->save(p_path);
+	} else if (key.is_valid()) {
+		err = key->save(p_path, p_path.has_extension("pub"));
+	} else {
+		ERR_FAIL_V(ERR_INVALID_PARAMETER);
+	}
+	ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Cannot save Crypto resource to file '%s'.", p_path));
+	return OK;
+}
+
+void ResourceFormatSaverCrypto::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	const X509Certificate *cert = Object::cast_to<X509Certificate>(*p_resource);
+	const CryptoKey *key = Object::cast_to<CryptoKey>(*p_resource);
+	if (cert) {
+		p_extensions->push_back("crt");
+	}
+	if (key) {
+		if (!key->is_public_only()) {
+			p_extensions->push_back("key");
+		}
+		p_extensions->push_back("pub");
+	}
+}
+
+bool ResourceFormatSaverCrypto::recognize(const Ref<Resource> &p_resource) const {
+	return Object::cast_to<X509Certificate>(*p_resource) || Object::cast_to<CryptoKey>(*p_resource);
+}
diff --git a/engine/core/crypto/crypto.h b/engine/core/crypto/crypto.h
index 53393219..48bf589a 100644
--- a/engine/core/crypto/crypto.h
+++ b/engine/core/crypto/crypto.h
@@ -32,6 +32,8 @@
 
 #include "core/crypto/hashing_context.h"
 #include "core/io/resource.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "core/object/ref_counted.h"
 
 class CryptoKey : public Resource {
@@ -142,3 +144,26 @@ public:
 	// @see: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy
 	bool constant_time_compare(const PackedByteArray &p_trusted, const PackedByteArray &p_received);
 };
+
+class ResourceFormatLoaderCrypto : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderCrypto, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+
+	// Treat certificates as text files, do not generate a `*.{crt,key,pub}.uid` file.
+	virtual ResourceUID::ID get_resource_uid(const String &p_path) const override { return ResourceUID::INVALID_ID; }
+	virtual bool has_custom_uid_support() const override { return true; }
+};
+
+class ResourceFormatSaverCrypto : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverCrypto, ResourceFormatSaver);
+
+public:
+	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	virtual bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/core/crypto/crypto_core.cpp b/engine/core/crypto/crypto_core.cpp
index 1c7d5d07..9d2c346e 100644
--- a/engine/core/crypto/crypto_core.cpp
+++ b/engine/core/crypto/crypto_core.cpp
@@ -31,7 +31,6 @@
 #include "crypto_core.h"
 
 #include "core/os/os.h"
-#include "core/string/ustring.h"
 
 #include <mbedtls/aes.h>
 #include <mbedtls/base64.h>
diff --git a/engine/core/crypto/crypto_core.h b/engine/core/crypto/crypto_core.h
index a061a743..8ef50fbc 100644
--- a/engine/core/crypto/crypto_core.h
+++ b/engine/core/crypto/crypto_core.h
@@ -30,12 +30,7 @@
 
 #pragma once
 
-#include "core/error/error_list.h"
-
-#include <cstddef>
-#include <cstdint>
-
-class String;
+#include "core/object/ref_counted.h"
 
 class CryptoCore {
 public:
diff --git a/engine/core/crypto/crypto_resource_format.cpp b/engine/core/crypto/crypto_resource_format.cpp
deleted file mode 100644
index 09fc2bed..00000000
--- a/engine/core/crypto/crypto_resource_format.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/**************************************************************************/
-/*  crypto_resource_format.cpp                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "crypto_resource_format.h"
-
-#include "core/crypto/crypto.h"
-
-Ref<Resource> ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	String el = p_path.get_extension().to_lower();
-	if (el == "crt") {
-		X509Certificate *cert = X509Certificate::create();
-		if (cert) {
-			cert->load(p_path);
-		}
-		return cert;
-	} else if (el == "key") {
-		CryptoKey *key = CryptoKey::create();
-		if (key) {
-			key->load(p_path, false);
-		}
-		return key;
-	} else if (el == "pub") {
-		CryptoKey *key = CryptoKey::create();
-		if (key) {
-			key->load(p_path, true);
-		}
-		return key;
-	}
-	return nullptr;
-}
-
-void ResourceFormatLoaderCrypto::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("crt");
-	p_extensions->push_back("key");
-	p_extensions->push_back("pub");
-}
-
-bool ResourceFormatLoaderCrypto::handles_type(const String &p_type) const {
-	return p_type == "X509Certificate" || p_type == "CryptoKey";
-}
-
-String ResourceFormatLoaderCrypto::get_resource_type(const String &p_path) const {
-	String el = p_path.get_extension().to_lower();
-	if (el == "crt") {
-		return "X509Certificate";
-	} else if (el == "key" || el == "pub") {
-		return "CryptoKey";
-	}
-	return "";
-}
-
-Error ResourceFormatSaverCrypto::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Error err;
-	Ref<X509Certificate> cert = p_resource;
-	Ref<CryptoKey> key = p_resource;
-	if (cert.is_valid()) {
-		err = cert->save(p_path);
-	} else if (key.is_valid()) {
-		err = key->save(p_path, p_path.has_extension("pub"));
-	} else {
-		ERR_FAIL_V(ERR_INVALID_PARAMETER);
-	}
-	ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Cannot save Crypto resource to file '%s'.", p_path));
-	return OK;
-}
-
-void ResourceFormatSaverCrypto::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	const X509Certificate *cert = Object::cast_to<X509Certificate>(*p_resource);
-	const CryptoKey *key = Object::cast_to<CryptoKey>(*p_resource);
-	if (cert) {
-		p_extensions->push_back("crt");
-	}
-	if (key) {
-		if (!key->is_public_only()) {
-			p_extensions->push_back("key");
-		}
-		p_extensions->push_back("pub");
-	}
-}
-
-bool ResourceFormatSaverCrypto::recognize(const Ref<Resource> &p_resource) const {
-	return Object::cast_to<X509Certificate>(*p_resource) || Object::cast_to<CryptoKey>(*p_resource);
-}
diff --git a/engine/core/crypto/crypto_resource_format.h b/engine/core/crypto/crypto_resource_format.h
deleted file mode 100644
index 128e9751..00000000
--- a/engine/core/crypto/crypto_resource_format.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**************************************************************************/
-/*  crypto_resource_format.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/io/resource_uid.h"
-
-class ResourceFormatLoaderCrypto : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderCrypto, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-
-	// Treat certificates as text files, do not generate a `*.{crt,key,pub}.uid` file.
-	virtual ResourceUID::ID get_resource_uid(const String &p_path) const override { return ResourceUID::INVALID_ID; }
-	virtual bool has_custom_uid_support() const override { return true; }
-};
-
-class ResourceFormatSaverCrypto : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverCrypto, ResourceFormatSaver);
-
-public:
-	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	virtual bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/core/crypto/hashing_context.cpp b/engine/core/crypto/hashing_context.cpp
index d852b474..01acbdbc 100644
--- a/engine/core/crypto/hashing_context.cpp
+++ b/engine/core/crypto/hashing_context.cpp
@@ -31,7 +31,6 @@
 #include "hashing_context.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/object/class_db.h"
 
 Error HashingContext::start(HashType p_type) {
 	ERR_FAIL_COND_V(ctx != nullptr, ERR_ALREADY_IN_USE);
diff --git a/engine/core/crypto/hashing_context.h b/engine/core/crypto/hashing_context.h
index a6318c99..c441da50 100644
--- a/engine/core/crypto/hashing_context.h
+++ b/engine/core/crypto/hashing_context.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class HashingContext : public RefCounted {
 	GDCLASS(HashingContext, RefCounted);
diff --git a/engine/core/debugger/debugger_marshalls.cpp b/engine/core/debugger/debugger_marshalls.cpp
index d66f92b2..55b61f1c 100644
--- a/engine/core/debugger/debugger_marshalls.cpp
+++ b/engine/core/debugger/debugger_marshalls.cpp
@@ -81,20 +81,16 @@ Array DebuggerMarshalls::ScriptStackVariable::serialize(int max_size) {
 	} else {
 		arr.push_back(var);
 	}
-
-	arr.push_back(type_hint);
-
 	return arr;
 }
 
 bool DebuggerMarshalls::ScriptStackVariable::deserialize(const Array &p_arr) {
-	CHECK_SIZE(p_arr, 5, "ScriptStackVariable");
+	CHECK_SIZE(p_arr, 4, "ScriptStackVariable");
 	name = p_arr[0];
 	type = p_arr[1];
 	var_type = p_arr[2];
 	value = p_arr[3];
-	type_hint = p_arr[4];
-	CHECK_END(p_arr, 5, "ScriptStackVariable");
+	CHECK_END(p_arr, 4, "ScriptStackVariable");
 	return true;
 }
 
@@ -181,27 +177,3 @@ Ref<Shortcut> DebuggerMarshalls::deserialize_key_shortcut(const Array &p_keys) {
 	shortcut->set_events(key_events);
 	return shortcut;
 }
-
-String DebuggerMarshalls::parse_type_from_variant(const Variant &p_variant) {
-	String name;
-
-	if (p_variant.get_type() == Variant::OBJECT) {
-		const Object *obj = p_variant.get_validated_object();
-		if (obj) {
-			const ScriptInstance *script_instance = obj->get_script_instance();
-
-			if (script_instance) {
-				Ref<Script> script = script_instance->get_script();
-				if (script.is_valid()) {
-					name = script->get_global_name();
-				}
-			}
-
-			if (name.is_empty()) {
-				return obj->get_class();
-			}
-		}
-	}
-
-	return name;
-}
diff --git a/engine/core/debugger/debugger_marshalls.h b/engine/core/debugger/debugger_marshalls.h
index e0ed5c3c..c0f604d4 100644
--- a/engine/core/debugger/debugger_marshalls.h
+++ b/engine/core/debugger/debugger_marshalls.h
@@ -39,7 +39,6 @@ struct DebuggerMarshalls {
 		Variant value;
 		int type = -1;
 		int var_type = -1;
-		String type_hint;
 
 		Array serialize(int max_size = 1 << 20); // 1 MiB default.
 		bool deserialize(const Array &p_arr);
@@ -71,6 +70,4 @@ struct DebuggerMarshalls {
 
 	static Array serialize_key_shortcut(const Ref<Shortcut> &p_shortcut);
 	static Ref<Shortcut> deserialize_key_shortcut(const Array &p_keys);
-
-	static String parse_type_from_variant(const Variant &p_variant);
 };
diff --git a/engine/core/debugger/engine_debugger.cpp b/engine/core/debugger/engine_debugger.cpp
index c5190310..ee0a06a0 100644
--- a/engine/core/debugger/engine_debugger.cpp
+++ b/engine/core/debugger/engine_debugger.cpp
@@ -138,8 +138,8 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, bo
 		CreatePeerFunc *create_fn = protocols.getptr(proto);
 		ERR_FAIL_NULL_MSG(create_fn, vformat("Invalid protocol: %s.", proto));
 
-		Ref<RemoteDebuggerPeer> peer = (*create_fn)(p_uri);
-		if (peer.is_null()) {
+		RemoteDebuggerPeer *peer = (*create_fn)(p_uri);
+		if (!peer) {
 			return;
 		}
 		singleton = memnew(RemoteDebugger(Ref<RemoteDebuggerPeer>(peer)));
diff --git a/engine/core/debugger/engine_debugger.h b/engine/core/debugger/engine_debugger.h
index 80deb1f4..95b64458 100644
--- a/engine/core/debugger/engine_debugger.h
+++ b/engine/core/debugger/engine_debugger.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/ref_counted.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -48,7 +47,7 @@ public:
 
 	typedef Error (*CaptureFunc)(void *p_user, const String &p_msg, const Array &p_args, bool &r_captured);
 
-	typedef Ref<RemoteDebuggerPeer> (*CreatePeerFunc)(const String &p_uri);
+	typedef RemoteDebuggerPeer *(*CreatePeerFunc)(const String &p_uri);
 
 	class Profiler {
 		friend class EngineDebugger;
diff --git a/engine/core/debugger/engine_profiler.cpp b/engine/core/debugger/engine_profiler.cpp
index d93a367f..abe0a4df 100644
--- a/engine/core/debugger/engine_profiler.cpp
+++ b/engine/core/debugger/engine_profiler.cpp
@@ -31,7 +31,6 @@
 #include "engine_profiler.h"
 
 #include "core/debugger/engine_debugger.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 
 void EngineProfiler::_bind_methods() {
 	GDVIRTUAL_BIND(_toggle, "enable", "options");
diff --git a/engine/core/debugger/engine_profiler.h b/engine/core/debugger/engine_profiler.h
index 42d4452f..ae6ddc48 100644
--- a/engine/core/debugger/engine_profiler.h
+++ b/engine/core/debugger/engine_profiler.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 
 class EngineProfiler : public RefCounted {
diff --git a/engine/core/debugger/local_debugger.cpp b/engine/core/debugger/local_debugger.cpp
index 42e6c323..cd9d5538 100644
--- a/engine/core/debugger/local_debugger.cpp
+++ b/engine/core/debugger/local_debugger.cpp
@@ -34,8 +34,6 @@
 #include "core/os/main_loop.h"
 #include "core/os/os.h"
 
-#include <cstdio>
-
 struct LocalDebugger::ScriptsProfiler {
 	struct ProfileInfoSort {
 		bool operator()(const ScriptLanguage::ProfilingInfo &A, const ScriptLanguage::ProfilingInfo &B) const {
diff --git a/engine/core/debugger/local_debugger.h b/engine/core/debugger/local_debugger.h
index 91c8d8be..5c603e5f 100644
--- a/engine/core/debugger/local_debugger.h
+++ b/engine/core/debugger/local_debugger.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/debugger/engine_debugger.h"
+#include "core/object/script_language.h"
 #include "core/templates/list.h"
 
 class LocalDebugger : public EngineDebugger {
diff --git a/engine/core/debugger/remote_debugger.cpp b/engine/core/debugger/remote_debugger.cpp
index 4764bbce..bb0271e7 100644
--- a/engine/core/debugger/remote_debugger.cpp
+++ b/engine/core/debugger/remote_debugger.cpp
@@ -30,7 +30,6 @@
 
 #include "remote_debugger.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
@@ -39,7 +38,6 @@
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
 #include "core/math/expression.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "servers/display/display_server.h"
@@ -329,7 +327,6 @@ void RemoteDebugger::_send_stack_vars(List<String> &p_names, List<Variant> &p_va
 		stvar.name = E->get();
 		stvar.value = F->get();
 		stvar.type = p_type;
-		stvar.type_hint = DebuggerMarshalls::parse_type_from_variant(F->get());
 		send_message("stack_frame_var", stvar.serialize());
 		E = E->next();
 		F = F->next();
@@ -429,12 +426,12 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
 	}
 	send_message("debug_enter", msg);
 
-	Input::MouseMode mouse_mode = Input::MouseMode::MOUSE_MODE_VISIBLE;
+	Input::MouseMode mouse_mode = Input::MOUSE_MODE_VISIBLE;
 
 	if (Thread::is_main_thread()) {
 		mouse_mode = Input::get_singleton()->get_mouse_mode();
-		if (mouse_mode != Input::MouseMode::MOUSE_MODE_VISIBLE) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		if (mouse_mode != Input::MOUSE_MODE_VISIBLE) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 		}
 	} else {
 		MutexLock mutex_lock(mutex);
diff --git a/engine/core/debugger/remote_debugger.h b/engine/core/debugger/remote_debugger.h
index 9c64342a..8dfc3cec 100644
--- a/engine/core/debugger/remote_debugger.h
+++ b/engine/core/debugger/remote_debugger.h
@@ -33,6 +33,8 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/remote_debugger_peer.h"
+#include "core/object/class_db.h"
+#include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/variant/array.h"
 
diff --git a/engine/core/debugger/remote_debugger_peer.cpp b/engine/core/debugger/remote_debugger_peer.cpp
index bb791044..759394a2 100644
--- a/engine/core/debugger/remote_debugger_peer.cpp
+++ b/engine/core/debugger/remote_debugger_peer.cpp
@@ -32,9 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
-#include "core/io/stream_peer_socket.h"
-#include "core/io/stream_peer_tcp.h"
-#include "core/io/stream_peer_uds.h"
 #include "core/os/os.h"
 
 bool RemoteDebuggerPeerTCP::is_peer_connected() {
@@ -211,7 +208,7 @@ void RemoteDebuggerPeerTCP::_poll() {
 	}
 }
 
-Ref<RemoteDebuggerPeer> RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
+RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
 	ERR_FAIL_COND_V(!p_uri.begins_with("tcp://"), nullptr);
 
 	String debug_host = p_uri.replace("tcp://", "");
@@ -237,7 +234,7 @@ Ref<RemoteDebuggerPeer> RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
 	return memnew(RemoteDebuggerPeerTCP(stream));
 }
 
-Ref<RemoteDebuggerPeer> RemoteDebuggerPeerTCP::create_unix(const String &p_uri) {
+RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create_unix(const String &p_uri) {
 	ERR_FAIL_COND_V(!p_uri.begins_with("unix://"), nullptr);
 
 	String debug_path = p_uri.replace("unix://", "");
diff --git a/engine/core/debugger/remote_debugger_peer.h b/engine/core/debugger/remote_debugger_peer.h
index cf7adfbf..6942c09b 100644
--- a/engine/core/debugger/remote_debugger_peer.h
+++ b/engine/core/debugger/remote_debugger_peer.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
+#include "core/io/stream_peer_tcp.h"
+#include "core/io/stream_peer_uds.h"
 #include "core/object/ref_counted.h"
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/string/ustring.h"
 
-class StreamPeerSocket;
-
 class RemoteDebuggerPeer : public RefCounted {
 	GDSOFTCLASS(RemoteDebuggerPeer, RefCounted);
 
@@ -82,8 +82,8 @@ private:
 	static Error _try_connect(Ref<StreamPeerSocket> p_stream);
 
 public:
-	static Ref<RemoteDebuggerPeer> create_tcp(const String &p_uri);
-	static Ref<RemoteDebuggerPeer> create_unix(const String &p_uri);
+	static RemoteDebuggerPeer *create_tcp(const String &p_uri);
+	static RemoteDebuggerPeer *create_unix(const String &p_uri);
 
 	bool is_peer_connected() override;
 	int get_max_message_size() const override;
diff --git a/engine/core/doc_data.cpp b/engine/core/doc_data.cpp
index 0632fbd9..92de0a80 100644
--- a/engine/core/doc_data.cpp
+++ b/engine/core/doc_data.cpp
@@ -30,9 +30,6 @@
 
 #include "doc_data.h"
 
-#include "core/object/method_info.h"
-#include "core/object/property_info.h"
-
 String DocData::get_default_value_string(const Variant &p_value) {
 	const Variant::Type type = p_value.get_type();
 	if (type == Variant::ARRAY) {
diff --git a/engine/core/doc_data.h b/engine/core/doc_data.h
index 95b47907..80b7fa23 100644
--- a/engine/core/doc_data.h
+++ b/engine/core/doc_data.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/xml_parser.h"
 #include "core/variant/variant.h"
 
 class DocData {
@@ -698,7 +699,6 @@ public:
 	struct ClassDoc {
 		String name;
 		String inherits;
-		String api_type;
 		String brief_description;
 		String description;
 		String keywords;
@@ -732,10 +732,6 @@ public:
 				doc.inherits = p_dict["inherits"];
 			}
 
-			if (p_dict.has("api_type")) {
-				doc.api_type = p_dict["api_type"];
-			}
-
 			if (p_dict.has("brief_description")) {
 				doc.brief_description = p_dict["brief_description"];
 			}
@@ -869,10 +865,6 @@ public:
 				dict["inherits"] = p_doc.inherits;
 			}
 
-			if (!p_doc.api_type.is_empty()) {
-				dict["api_type"] = p_doc.api_type;
-			}
-
 			if (!p_doc.brief_description.is_empty()) {
 				dict["brief_description"] = p_doc.brief_description;
 			}
diff --git a/engine/core/error/error_macros.cpp b/engine/core/error/error_macros.cpp
index 98628518..9734c797 100644
--- a/engine/core/error/error_macros.cpp
+++ b/engine/core/error/error_macros.cpp
@@ -30,15 +30,12 @@
 
 #include "error_macros.h"
 
-#include "core/core_globals.h"
 #include "core/io/logger.h"
 #include "core/object/object_id.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
 
-#include <cstdio>
-
 // Optional physics interpolation warnings try to include the path to the relevant node.
 #if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
 #include "core/config/project_settings.h"
@@ -107,12 +104,6 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co
 
 // Main error printing function.
 void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, bool p_editor_notify, ErrorHandlerType p_type) {
-	if (!CoreGlobals::print_ready) {
-		const char *err_details = (p_message && *p_message) ? p_message : p_error;
-		_err_print_fallback(p_function, p_file, p_line, err_details, p_type, false);
-		return;
-	}
-
 	if (is_printing_error) {
 		// Fallback if we're already printing an error, to prevent infinite recursion.
 		const char *err_details = (p_message && *p_message) ? p_message : p_error;
@@ -149,11 +140,6 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co
 void _err_print_error_asap(const String &p_error, ErrorHandlerType p_type) {
 	const char *err_details = p_error.utf8().get_data();
 
-	if (!CoreGlobals::print_ready) {
-		_err_print_fallback(nullptr, nullptr, 0, err_details, p_type, false);
-		return;
-	}
-
 	if (is_printing_error) {
 		// Fallback if we're already printing an error, to prevent infinite recursion.
 		_err_print_fallback(nullptr, nullptr, 0, err_details, p_type, true);
diff --git a/engine/core/error/error_macros.h b/engine/core/error/error_macros.h
index e4c34a26..034f16f2 100644
--- a/engine/core/error/error_macros.h
+++ b/engine/core/error/error_macros.h
@@ -32,6 +32,10 @@
 
 #include "core/typedefs.h"
 
+#ifdef _MSC_VER
+#include <intrin.h> // `__fastfail()`.
+#endif
+
 class String;
 class ObjectID;
 
@@ -91,11 +95,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
 #define FUNCTION_STR __FUNCTION__
 #endif
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#ifdef _MSC_VER
 /**
  * Don't use GENERATE_TRAP() directly, should only be used be the macros below.
  */
-#define GENERATE_TRAP() __debugbreak()
+#define GENERATE_TRAP() __fastfail(7 /* FAST_FAIL_FATAL_APP_EXIT */)
 #else
 /**
  * Don't use GENERATE_TRAP() directly, should only be used be the macros below.
@@ -131,32 +135,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, the current function returns.
  */
-#define ERR_FAIL_INDEX(m_index, m_size) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX(m_index, m_size)                                                                         \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                     \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size)); \
-		return; \
-	} else \
+		return;                                                                                                 \
+	} else                                                                                                      \
 		((void)0)
 
 /**
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, prints `m_msg` and the current function returns.
  */
-#define ERR_FAIL_INDEX_MSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX_MSG(m_index, m_size, m_msg)                                                                     \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                            \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg); \
-		return; \
-	} else \
+		return;                                                                                                        \
+	} else                                                                                                             \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_INDEX_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_INDEX_EDMSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX_EDMSG(m_index, m_size, m_msg)                                                                         \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                                  \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, true); \
-		return; \
-	} else \
+		return;                                                                                                              \
+	} else                                                                                                                   \
 		((void)0)
 
 /**
@@ -166,32 +170,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, the current function returns `m_retval`.
  */
-#define ERR_FAIL_INDEX_V(m_index, m_size, m_retval) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX_V(m_index, m_size, m_retval)                                                             \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                     \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size)); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                        \
+	} else                                                                                                      \
 		((void)0)
 
 /**
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, prints `m_msg` and the current function returns `m_retval`.
  */
-#define ERR_FAIL_INDEX_V_MSG(m_index, m_size, m_retval, m_msg) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX_V_MSG(m_index, m_size, m_retval, m_msg)                                                         \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                            \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                               \
+	} else                                                                                                             \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_INDEX_V_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_INDEX_V_EDMSG(m_index, m_size, m_retval, m_msg) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define ERR_FAIL_INDEX_V_EDMSG(m_index, m_size, m_retval, m_msg)                                                             \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                                  \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, true); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                     \
+	} else                                                                                                                   \
 		((void)0)
 
 /**
@@ -202,12 +206,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, the application crashes.
  */
-#define CRASH_BAD_INDEX(m_index, m_size) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define CRASH_BAD_INDEX(m_index, m_size)                                                                                         \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                                      \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), "", false, true); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                                     \
+		GENERATE_TRAP();                                                                                                         \
+	} else                                                                                                                       \
 		((void)0)
 
 /**
@@ -217,12 +221,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an integer index `m_index` is less than `m_size` and greater than or equal to 0.
  * If not, prints `m_msg` and the application crashes.
  */
-#define CRASH_BAD_INDEX_MSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) { \
+#define CRASH_BAD_INDEX_MSG(m_index, m_size, m_msg)                                                                                 \
+	if (unlikely((m_index) < 0 || (m_index) >= (m_size))) {                                                                         \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, false, true); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                                        \
+		GENERATE_TRAP();                                                                                                            \
+	} else                                                                                                                          \
 		((void)0)
 
 // Unsigned integer index out of bounds error macros.
@@ -234,32 +238,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, the current function returns.
  */
-#define ERR_FAIL_UNSIGNED_INDEX(m_index, m_size) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX(m_index, m_size)                                                                \
+	if (unlikely((m_index) >= (m_size))) {                                                                      \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size)); \
-		return; \
-	} else \
+		return;                                                                                                 \
+	} else                                                                                                      \
 		((void)0)
 
 /**
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, prints `m_msg` and the current function returns.
  */
-#define ERR_FAIL_UNSIGNED_INDEX_MSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX_MSG(m_index, m_size, m_msg)                                                            \
+	if (unlikely((m_index) >= (m_size))) {                                                                             \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg); \
-		return; \
-	} else \
+		return;                                                                                                        \
+	} else                                                                                                             \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_UNSIGNED_INDEX_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_UNSIGNED_INDEX_EDMSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX_EDMSG(m_index, m_size, m_msg)                                                                \
+	if (unlikely((m_index) >= (m_size))) {                                                                                   \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, true); \
-		return; \
-	} else \
+		return;                                                                                                              \
+	} else                                                                                                                   \
 		((void)0)
 
 /**
@@ -269,32 +273,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, the current function returns `m_retval`.
  */
-#define ERR_FAIL_UNSIGNED_INDEX_V(m_index, m_size, m_retval) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX_V(m_index, m_size, m_retval)                                                    \
+	if (unlikely((m_index) >= (m_size))) {                                                                      \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size)); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                        \
+	} else                                                                                                      \
 		((void)0)
 
 /**
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, prints `m_msg` and the current function returns `m_retval`.
  */
-#define ERR_FAIL_UNSIGNED_INDEX_V_MSG(m_index, m_size, m_retval, m_msg) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX_V_MSG(m_index, m_size, m_retval, m_msg)                                                \
+	if (unlikely((m_index) >= (m_size))) {                                                                             \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                               \
+	} else                                                                                                             \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_UNSIGNED_INDEX_V_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_UNSIGNED_INDEX_V_EDMSG(m_index, m_size, m_retval, m_msg) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define ERR_FAIL_UNSIGNED_INDEX_V_EDMSG(m_index, m_size, m_retval, m_msg)                                                    \
+	if (unlikely((m_index) >= (m_size))) {                                                                                   \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, true); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                     \
+	} else                                                                                                                   \
 		((void)0)
 
 /**
@@ -305,12 +309,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, the application crashes.
  */
-#define CRASH_BAD_UNSIGNED_INDEX(m_index, m_size) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define CRASH_BAD_UNSIGNED_INDEX(m_index, m_size)                                                                                \
+	if (unlikely((m_index) >= (m_size))) {                                                                                       \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), "", false, true); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                                     \
+		GENERATE_TRAP();                                                                                                         \
+	} else                                                                                                                       \
 		((void)0)
 
 /**
@@ -320,12 +324,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures an unsigned integer index `m_index` is less than `m_size`.
  * If not, prints `m_msg` and the application crashes.
  */
-#define CRASH_BAD_UNSIGNED_INDEX_MSG(m_index, m_size, m_msg) \
-	if (unlikely((m_index) >= (m_size))) { \
+#define CRASH_BAD_UNSIGNED_INDEX_MSG(m_index, m_size, m_msg)                                                                        \
+	if (unlikely((m_index) >= (m_size))) {                                                                                          \
 		_err_print_index_error(FUNCTION_STR, __FILE__, __LINE__, m_index, m_size, _STR(m_index), _STR(m_size), m_msg, false, true); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                                        \
+		GENERATE_TRAP();                                                                                                            \
+	} else                                                                                                                          \
 		((void)0)
 
 // Null reference error macros.
@@ -337,32 +341,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures a pointer `m_param` is not null.
  * If it is null, the current function returns.
  */
-#define ERR_FAIL_NULL(m_param) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL(m_param)                                                                          \
+	if (unlikely(m_param == nullptr)) {                                                                 \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null."); \
-		return; \
-	} else \
+		return;                                                                                         \
+	} else                                                                                              \
 		((void)0)
 
 /**
  * Ensures a pointer `m_param` is not null.
  * If it is null, prints `m_msg` and the current function returns.
  */
-#define ERR_FAIL_NULL_MSG(m_param, m_msg) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL_MSG(m_param, m_msg)                                                                      \
+	if (unlikely(m_param == nullptr)) {                                                                        \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null.", m_msg); \
-		return; \
-	} else \
+		return;                                                                                                \
+	} else                                                                                                     \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_NULL_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_NULL_EDMSG(m_param, m_msg) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL_EDMSG(m_param, m_msg)                                                                          \
+	if (unlikely(m_param == nullptr)) {                                                                              \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null.", m_msg, true); \
-		return; \
-	} else \
+		return;                                                                                                      \
+	} else                                                                                                           \
 		((void)0)
 
 /**
@@ -372,32 +376,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures a pointer `m_param` is not null.
  * If it is null, the current function returns `m_retval`.
  */
-#define ERR_FAIL_NULL_V(m_param, m_retval) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL_V(m_param, m_retval)                                                              \
+	if (unlikely(m_param == nullptr)) {                                                                 \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null."); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                \
+	} else                                                                                              \
 		((void)0)
 
 /**
  * Ensures a pointer `m_param` is not null.
  * If it is null, prints `m_msg` and the current function returns `m_retval`.
  */
-#define ERR_FAIL_NULL_V_MSG(m_param, m_retval, m_msg) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL_V_MSG(m_param, m_retval, m_msg)                                                          \
+	if (unlikely(m_param == nullptr)) {                                                                        \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null.", m_msg); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                       \
+	} else                                                                                                     \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_NULL_V_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_NULL_V_EDMSG(m_param, m_retval, m_msg) \
-	if (unlikely(m_param == nullptr)) { \
+#define ERR_FAIL_NULL_V_EDMSG(m_param, m_retval, m_msg)                                                              \
+	if (unlikely(m_param == nullptr)) {                                                                              \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Parameter \"" _STR(m_param) "\" is null.", m_msg, true); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                             \
+	} else                                                                                                           \
 		((void)0)
 
 /**
@@ -409,11 +413,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, the current function returns.
  */
-#define ERR_FAIL_COND(m_cond) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND(m_cond)                                                                          \
+	if (unlikely(m_cond)) {                                                                            \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true."); \
-		return; \
-	} else \
+		return;                                                                                        \
+	} else                                                                                             \
 		((void)0)
 
 /**
@@ -423,21 +427,21 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * If checking for null use ERR_FAIL_NULL_MSG instead.
  * If checking index bounds use ERR_FAIL_INDEX_MSG instead.
  */
-#define ERR_FAIL_COND_MSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND_MSG(m_cond, m_msg)                                                                      \
+	if (unlikely(m_cond)) {                                                                                   \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true.", m_msg); \
-		return; \
-	} else \
+		return;                                                                                               \
+	} else                                                                                                    \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_COND_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_COND_EDMSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND_EDMSG(m_cond, m_msg)                                                                          \
+	if (unlikely(m_cond)) {                                                                                         \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true.", m_msg, true); \
-		return; \
-	} else \
+		return;                                                                                                     \
+	} else                                                                                                          \
 		((void)0)
 
 /**
@@ -449,11 +453,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, the current function returns `m_retval`.
  */
-#define ERR_FAIL_COND_V(m_cond, m_retval) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND_V(m_cond, m_retval)                                                                                         \
+	if (unlikely(m_cond)) {                                                                                                       \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Returning: " _STR(m_retval)); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                          \
+	} else                                                                                                                        \
 		((void)0)
 
 /**
@@ -463,21 +467,21 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * If checking for null use ERR_FAIL_NULL_V_MSG instead.
  * If checking index bounds use ERR_FAIL_INDEX_V_MSG instead.
  */
-#define ERR_FAIL_COND_V_MSG(m_cond, m_retval, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND_V_MSG(m_cond, m_retval, m_msg)                                                                                     \
+	if (unlikely(m_cond)) {                                                                                                              \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Returning: " _STR(m_retval), m_msg); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                                 \
+	} else                                                                                                                               \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_COND_V_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_COND_V_EDMSG(m_cond, m_retval, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_FAIL_COND_V_EDMSG(m_cond, m_retval, m_msg)                                                                                         \
+	if (unlikely(m_cond)) {                                                                                                                    \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Returning: " _STR(m_retval), m_msg, true); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                                       \
+	} else                                                                                                                                     \
 		((void)0)
 
 /**
@@ -487,32 +491,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, the current loop continues.
  */
-#define ERR_CONTINUE(m_cond) \
-	if (unlikely(m_cond)) { \
+#define ERR_CONTINUE(m_cond)                                                                                       \
+	if (unlikely(m_cond)) {                                                                                        \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Continuing."); \
-		continue; \
-	} else \
+		continue;                                                                                                  \
+	} else                                                                                                         \
 		((void)0)
 
 /**
  * Ensures `m_cond` is false.
  * If `m_cond` is true, prints `m_msg` and the current loop continues.
  */
-#define ERR_CONTINUE_MSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_CONTINUE_MSG(m_cond, m_msg)                                                                                   \
+	if (unlikely(m_cond)) {                                                                                               \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Continuing.", m_msg); \
-		continue; \
-	} else \
+		continue;                                                                                                         \
+	} else                                                                                                                \
 		((void)0)
 
 /**
  * Same as `ERR_CONTINUE_MSG` but also notifies the editor.
  */
-#define ERR_CONTINUE_EDMSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_CONTINUE_EDMSG(m_cond, m_msg)                                                                                       \
+	if (unlikely(m_cond)) {                                                                                                     \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Continuing.", m_msg, true); \
-		continue; \
-	} else \
+		continue;                                                                                                               \
+	} else                                                                                                                      \
 		((void)0)
 
 /**
@@ -522,32 +526,32 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, the current loop breaks.
  */
-#define ERR_BREAK(m_cond) \
-	if (unlikely(m_cond)) { \
+#define ERR_BREAK(m_cond)                                                                                        \
+	if (unlikely(m_cond)) {                                                                                      \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Breaking."); \
-		break; \
-	} else \
+		break;                                                                                                   \
+	} else                                                                                                       \
 		((void)0)
 
 /**
  * Ensures `m_cond` is false.
  * If `m_cond` is true, prints `m_msg` and the current loop breaks.
  */
-#define ERR_BREAK_MSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_BREAK_MSG(m_cond, m_msg)                                                                                    \
+	if (unlikely(m_cond)) {                                                                                             \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Breaking.", m_msg); \
-		break; \
-	} else \
+		break;                                                                                                          \
+	} else                                                                                                              \
 		((void)0)
 
 /**
  * Same as `ERR_BREAK_MSG` but also notifies the editor.
  */
-#define ERR_BREAK_EDMSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define ERR_BREAK_EDMSG(m_cond, m_msg)                                                                                        \
+	if (unlikely(m_cond)) {                                                                                                   \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition \"" _STR(m_cond) "\" is true. Breaking.", m_msg, true); \
-		break; \
-	} else \
+		break;                                                                                                                \
+	} else                                                                                                                    \
 		((void)0)
 
 /**
@@ -558,12 +562,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, the application crashes.
  */
-#define CRASH_COND(m_cond) \
-	if (unlikely(m_cond)) { \
+#define CRASH_COND(m_cond)                                                                                    \
+	if (unlikely(m_cond)) {                                                                                   \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: Condition \"" _STR(m_cond) "\" is true."); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                  \
+		GENERATE_TRAP();                                                                                      \
+	} else                                                                                                    \
 		((void)0)
 
 /**
@@ -573,12 +577,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  * Ensures `m_cond` is false.
  * If `m_cond` is true, prints `m_msg` and the application crashes.
  */
-#define CRASH_COND_MSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
+#define CRASH_COND_MSG(m_cond, m_msg)                                                                                \
+	if (unlikely(m_cond)) {                                                                                          \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: Condition \"" _STR(m_cond) "\" is true.", m_msg); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                         \
+		GENERATE_TRAP();                                                                                             \
+	} else                                                                                                           \
 		((void)0)
 
 // Generic error macros.
@@ -590,11 +594,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * The current function returns.
  */
-#define ERR_FAIL() \
-	if (true) { \
+#define ERR_FAIL()                                                                     \
+	if (true) {                                                                        \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed."); \
-		return; \
-	} else \
+		return;                                                                        \
+	} else                                                                             \
 		((void)0)
 
 /**
@@ -603,21 +607,21 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * Prints `m_msg`, and the current function returns.
  */
-#define ERR_FAIL_MSG(m_msg) \
-	if (true) { \
+#define ERR_FAIL_MSG(m_msg)                                                                   \
+	if (true) {                                                                               \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed.", m_msg); \
-		return; \
-	} else \
+		return;                                                                               \
+	} else                                                                                    \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_EDMSG(m_msg) \
-	if (true) { \
+#define ERR_FAIL_EDMSG(m_msg)                                                                       \
+	if (true) {                                                                                     \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed.", m_msg, true); \
-		return; \
-	} else \
+		return;                                                                                     \
+	} else                                                                                          \
 		((void)0)
 
 /**
@@ -627,11 +631,11 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * The current function returns `m_retval`.
  */
-#define ERR_FAIL_V(m_retval) \
-	if (true) { \
+#define ERR_FAIL_V(m_retval)                                                                                      \
+	if (true) {                                                                                                   \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed. Returning: " _STR(m_retval)); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                          \
+	} else                                                                                                        \
 		((void)0)
 
 /**
@@ -640,21 +644,21 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * Prints `m_msg`, and the current function returns `m_retval`.
  */
-#define ERR_FAIL_V_MSG(m_retval, m_msg) \
-	if (true) { \
+#define ERR_FAIL_V_MSG(m_retval, m_msg)                                                                                  \
+	if (true) {                                                                                                          \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed. Returning: " _STR(m_retval), m_msg); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                 \
+	} else                                                                                                               \
 		((void)0)
 
 /**
  * Same as `ERR_FAIL_V_MSG` but also notifies the editor.
  */
-#define ERR_FAIL_V_EDMSG(m_retval, m_msg) \
-	if (true) { \
+#define ERR_FAIL_V_EDMSG(m_retval, m_msg)                                                                                      \
+	if (true) {                                                                                                                \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Method/function failed. Returning: " _STR(m_retval), m_msg, true); \
-		return m_retval; \
-	} else \
+		return m_retval;                                                                                                       \
+	} else                                                                                                                     \
 		((void)0)
 
 /**
@@ -676,27 +680,27 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
 /**
  * Prints `m_msg` once during the application lifetime.
  */
-#define ERR_PRINT_ONCE(m_msg) \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define ERR_PRINT_ONCE(m_msg)                                          \
+	if (true) {                                                        \
+		static bool warning_shown = false;                             \
+		if (unlikely(!warning_shown)) {                                \
+			warning_shown = true;                                      \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_msg); \
-		} \
-	} else \
+		}                                                              \
+	} else                                                             \
 		((void)0)
 
 /**
  * Same as `ERR_PRINT_ONCE` but also notifies the editor.
  */
-#define ERR_PRINT_ONCE_ED(m_msg) \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define ERR_PRINT_ONCE_ED(m_msg)                                             \
+	if (true) {                                                              \
+		static bool warning_shown = false;                                   \
+		if (unlikely(!warning_shown)) {                                      \
+			warning_shown = true;                                            \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_msg, true); \
-		} \
-	} else \
+		}                                                                    \
+	} else                                                                   \
 		((void)0)
 
 // Print warning message macros.
@@ -720,37 +724,37 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * If warning about deprecated usage, use `WARN_DEPRECATED` or `WARN_DEPRECATED_MSG` instead.
  */
-#define WARN_PRINT_ONCE(m_msg) \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define WARN_PRINT_ONCE(m_msg)                                                                     \
+	if (true) {                                                                                    \
+		static bool warning_shown = false;                                                         \
+		if (unlikely(!warning_shown)) {                                                            \
+			warning_shown = true;                                                                  \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_msg, false, ERR_HANDLER_WARNING); \
-		} \
-	} else \
+		}                                                                                          \
+	} else                                                                                         \
 		((void)0)
 
 /**
  * Same as `WARN_PRINT_ONCE` but also notifies the editor.
  */
-#define WARN_PRINT_ONCE_ED(m_msg) \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define WARN_PRINT_ONCE_ED(m_msg)                                                                 \
+	if (true) {                                                                                   \
+		static bool warning_shown = false;                                                        \
+		if (unlikely(!warning_shown)) {                                                           \
+			warning_shown = true;                                                                 \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_msg, true, ERR_HANDLER_WARNING); \
-		} \
-	} else \
+		}                                                                                         \
+	} else                                                                                        \
 		((void)0)
 
 /**
  * Warns about `m_msg` only when verbose mode is enabled.
  */
-#define WARN_VERBOSE(m_msg) \
-	{ \
+#define WARN_VERBOSE(m_msg)               \
+	{                                     \
 		if (is_print_verbose_enabled()) { \
-			WARN_PRINT(m_msg); \
-		} \
+			WARN_PRINT(m_msg);            \
+		}                                 \
 	}
 
 // Print deprecated warning message macros.
@@ -758,27 +762,27 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
 /**
  * Warns that the current function is deprecated.
  */
-#define WARN_DEPRECATED \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define WARN_DEPRECATED                                                                                                                                           \
+	if (true) {                                                                                                                                                   \
+		static bool warning_shown = false;                                                                                                                        \
+		if (unlikely(!warning_shown)) {                                                                                                                           \
+			warning_shown = true;                                                                                                                                 \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "This method has been deprecated and will be removed in the future.", false, ERR_HANDLER_WARNING); \
-		} \
-	} else \
+		}                                                                                                                                                         \
+	} else                                                                                                                                                        \
 		((void)0)
 
 /**
  * Warns that the current function is deprecated and prints `m_msg`.
  */
-#define WARN_DEPRECATED_MSG(m_msg) \
-	if (true) { \
-		static bool warning_shown = false; \
-		if (unlikely(!warning_shown)) { \
-			warning_shown = true; \
+#define WARN_DEPRECATED_MSG(m_msg)                                                                                                                                       \
+	if (true) {                                                                                                                                                          \
+		static bool warning_shown = false;                                                                                                                               \
+		if (unlikely(!warning_shown)) {                                                                                                                                  \
+			warning_shown = true;                                                                                                                                        \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "This method has been deprecated and will be removed in the future.", m_msg, false, ERR_HANDLER_WARNING); \
-		} \
-	} else \
+		}                                                                                                                                                                \
+	} else                                                                                                                                                               \
 		((void)0)
 
 /**
@@ -787,12 +791,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * The application crashes.
  */
-#define CRASH_NOW() \
-	if (true) { \
+#define CRASH_NOW()                                                                           \
+	if (true) {                                                                               \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: Method/function failed."); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                  \
+		GENERATE_TRAP();                                                                      \
+	} else                                                                                    \
 		((void)0)
 
 /**
@@ -800,12 +804,12 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *
  * Prints `m_msg`, and then the application crashes.
  */
-#define CRASH_NOW_MSG(m_msg) \
-	if (true) { \
+#define CRASH_NOW_MSG(m_msg)                                                                         \
+	if (true) {                                                                                      \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: Method/function failed.", m_msg); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                         \
+		GENERATE_TRAP();                                                                             \
+	} else                                                                                           \
 		((void)0)
 
 /**
@@ -824,26 +828,26 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
  *    and that can't fail for other contributors once the code is finished and merged.
  */
 #ifdef DEV_ENABLED
-#define DEV_ASSERT(m_cond) \
-	if (unlikely(!(m_cond))) { \
+#define DEV_ASSERT(m_cond)                                                                                              \
+	if (unlikely(!(m_cond))) {                                                                                          \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: DEV_ASSERT failed  \"" _STR(m_cond) "\" is false."); \
-		_err_flush_stdout(); \
-		GENERATE_TRAP(); \
-	} else \
+		_err_flush_stdout();                                                                                            \
+		GENERATE_TRAP();                                                                                                \
+	} else                                                                                                              \
 		((void)0)
 #else
 #define DEV_ASSERT(m_cond)
 #endif
 
 #ifdef DEV_ENABLED
-#define DEV_CHECK_ONCE(m_cond) \
-	if (true) { \
-		static bool first_print = true; \
-		if (first_print && unlikely(!(m_cond))) { \
+#define DEV_CHECK_ONCE(m_cond)                                                                                           \
+	if (true) {                                                                                                          \
+		static bool first_print = true;                                                                                  \
+		if (first_print && unlikely(!(m_cond))) {                                                                        \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "DEV_CHECK_ONCE failed  \"" _STR(m_cond) "\" is false."); \
-			first_print = false; \
-		} \
-	} else \
+			first_print = false;                                                                                         \
+		}                                                                                                                \
+	} else                                                                                                               \
 		((void)0)
 #else
 #define DEV_CHECK_ONCE(m_cond)
diff --git a/engine/core/extension/SCsub b/engine/core/extension/SCsub
index 4690234f..e4017022 100644
--- a/engine/core/extension/SCsub
+++ b/engine/core/extension/SCsub
@@ -7,7 +7,7 @@ import make_interface_dumper
 import make_interface_header
 import make_wrappers
 
-env.CommandNoCache("ext_wrappers.gen.h", "make_wrappers.py", env.Run(make_wrappers.run))
+env.CommandNoCache(["ext_wrappers.gen.inc"], "make_wrappers.py", env.Run(make_wrappers.run))
 env.CommandNoCache(
     "gdextension_interface_dump.gen.h",
     ["gdextension_interface.json", "make_interface_dumper.py"],
diff --git a/engine/core/extension/extension_api_dump.cpp b/engine/core/extension/extension_api_dump.cpp
index 9094c26f..06e7a990 100644
--- a/engine/core/extension/extension_api_dump.cpp
+++ b/engine/core/extension/extension_api_dump.cpp
@@ -35,7 +35,6 @@
 #include "core/extension/gdextension_special_compat_hashes.h"
 #include "core/io/file_access.h"
 #include "core/io/json.h"
-#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "core/version.h"
 
@@ -282,59 +281,59 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 		// Member offsets, meta types and sizes.
 
 #define REAL_MEMBER_OFFSET(type, member) \
-	{ \
-		type, \
-		member, \
-		"float", \
-		sizeof(float), \
-		"float", \
-		sizeof(float), \
-		"double", \
-		sizeof(double), \
-		"double", \
-		sizeof(double), \
+	{                                    \
+		type,                            \
+		member,                          \
+		"float",                         \
+		sizeof(float),                   \
+		"float",                         \
+		sizeof(float),                   \
+		"double",                        \
+		sizeof(double),                  \
+		"double",                        \
+		sizeof(double),                  \
 	}
 
 #define INT32_MEMBER_OFFSET(type, member) \
-	{ \
-		type, \
-		member, \
-		"int32", \
-		sizeof(int32_t), \
-		"int32", \
-		sizeof(int32_t), \
-		"int32", \
-		sizeof(int32_t), \
-		"int32", \
-		sizeof(int32_t), \
+	{                                     \
+		type,                             \
+		member,                           \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
 	}
 
 #define INT32_BASED_BUILTIN_MEMBER_OFFSET(type, member, member_type, member_elems) \
-	{ \
-		type, \
-		member, \
-		member_type, \
-		sizeof(int32_t) * member_elems, \
-		member_type, \
-		sizeof(int32_t) * member_elems, \
-		member_type, \
-		sizeof(int32_t) * member_elems, \
-		member_type, \
-		sizeof(int32_t) * member_elems, \
+	{                                                                              \
+		type,                                                                      \
+		member,                                                                    \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
 	}
 
 #define REAL_BASED_BUILTIN_MEMBER_OFFSET(type, member, member_type, member_elems) \
-	{ \
-		type, \
-				member, \
-				member_type, \
-				sizeof(float) * member_elems, \
-				member_type, \
-				sizeof(float) * member_elems, \
-				member_type, \
-				sizeof(double) * member_elems, \
-				member_type, \
-				sizeof(double) * member_elems, \
+	{                                                                             \
+		type,                                                                     \
+				member,                                                           \
+				member_type,                                                      \
+				sizeof(float) * member_elems,                                     \
+				member_type,                                                      \
+				sizeof(float) * member_elems,                                     \
+				member_type,                                                      \
+				sizeof(double) * member_elems,                                    \
+				member_type,                                                      \
+				sizeof(double) * member_elems,                                    \
 	}
 
 		struct {
diff --git a/engine/core/extension/extension_api_dump.h b/engine/core/extension/extension_api_dump.h
index 1f6e1de4..027a8d91 100644
--- a/engine/core/extension/extension_api_dump.h
+++ b/engine/core/extension/extension_api_dump.h
@@ -30,11 +30,9 @@
 
 #pragma once
 
-#ifdef TOOLS_ENABLED
+#include "core/extension/gdextension.h"
 
-#include "core/error/error_list.h"
-#include "core/string/ustring.h"
-#include "core/variant/dictionary.h"
+#ifdef TOOLS_ENABLED
 
 class GDExtensionAPIDump {
 public:
@@ -42,5 +40,4 @@ public:
 	static void generate_extension_json_file(const String &p_path, bool p_include_docs = false);
 	static Error validate_extension_json_file(const String &p_path);
 };
-
 #endif
diff --git a/engine/core/extension/gdextension.compat.inc b/engine/core/extension/gdextension.compat.inc
index 454f2c5d..9dea865d 100644
--- a/engine/core/extension/gdextension.compat.inc
+++ b/engine/core/extension/gdextension.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gdextension.h"
-
-#include "core/object/class_db.h"
-
 Error GDExtension::_open_library_bind_compat_88418(const String &p_path, const String &p_entry_symbol) {
 	return ERR_UNAVAILABLE;
 }
@@ -50,4 +46,4 @@ void GDExtension::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("initialize_library", "level"), &GDExtension::_initialize_library_bind_compat_88418);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/core/extension/gdextension.cpp b/engine/core/extension/gdextension.cpp
index 7b991b99..254095e9 100644
--- a/engine/core/extension/gdextension.cpp
+++ b/engine/core/extension/gdextension.cpp
@@ -32,10 +32,10 @@
 #include "gdextension.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/extension/gdextension_library_loader.h"
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/method_bind.h"
+#include "gdextension_library_loader.h"
+#include "gdextension_manager.h"
 
 extern void gdextension_setup_interface();
 extern GDExtensionInterfaceFunctionPtr gdextension_get_proc_address(const char *p_name);
@@ -844,7 +844,68 @@ void GDExtension::finalize_gdextensions() {
 	gdextension_interface_functions.clear();
 }
 
+Error GDExtensionResourceLoader::load_gdextension_resource(const String &p_path, Ref<GDExtension> &p_extension) {
+	ERR_FAIL_COND_V_MSG(p_extension.is_valid() && p_extension->is_library_open(), ERR_ALREADY_IN_USE, "Cannot load GDExtension resource into already opened library.");
+
+	GDExtensionManager *extension_manager = GDExtensionManager::get_singleton();
+
+	GDExtensionManager::LoadStatus status = extension_manager->load_extension(p_path);
+	if (status != GDExtensionManager::LOAD_STATUS_OK && status != GDExtensionManager::LOAD_STATUS_ALREADY_LOADED) {
+		// Errors already logged in load_extension().
+		return FAILED;
+	}
+
+	p_extension = extension_manager->get_extension(p_path);
+	return OK;
+}
+
+Ref<Resource> GDExtensionResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	// We can't have two GDExtension resource object representing the same library, because
+	// loading (or unloading) a GDExtension affects global data. So, we need reuse the same
+	// object if one has already been loaded (even if caching is disabled at the resource
+	// loader level).
+	GDExtensionManager *manager = GDExtensionManager::get_singleton();
+	if (manager->is_extension_loaded(p_path)) {
+		return manager->get_extension(p_path);
+	}
+
+	Ref<GDExtension> lib;
+	Error err = load_gdextension_resource(p_path, lib);
+	if (err != OK && r_error) {
+		// Errors already logged in load_gdextension_resource().
+		*r_error = err;
+	}
+	return lib;
+}
+
+void GDExtensionResourceLoader::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("gdextension");
+}
+
+bool GDExtensionResourceLoader::handles_type(const String &p_type) const {
+	return p_type == "GDExtension";
+}
+
+String GDExtensionResourceLoader::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("gdextension")) {
+		return "GDExtension";
+	}
+	return "";
+}
+
 #ifdef TOOLS_ENABLED
+void GDExtensionResourceLoader::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
+	Ref<GDExtension> gdext = ResourceLoader::load(p_path);
+	if (gdext.is_null()) {
+		return;
+	}
+
+	for (const StringName class_name : gdext->get_classes_used()) {
+		if (ClassDB::class_exists(class_name)) {
+			r_classes->insert(class_name);
+		}
+	}
+}
 
 bool GDExtension::has_library_changed() const {
 	return loader->has_library_changed();
@@ -889,7 +950,7 @@ void GDExtension::prepare_reload() {
 				state.push_back(Pair<String, Variant>(P.name, value));
 			}
 			E.value.instance_state[obj_id] = {
-				std::move(state), // List<Pair<String, Variant>> properties;
+				state, // List<Pair<String, Variant>> properties;
 				obj->is_extension_placeholder(), // bool is_placeholder;
 			};
 		}
diff --git a/engine/core/extension/gdextension.h b/engine/core/extension/gdextension.h
index 78b30ac9..2f0835a0 100644
--- a/engine/core/extension/gdextension.h
+++ b/engine/core/extension/gdextension.h
@@ -32,7 +32,9 @@
 
 #include "core/extension/gdextension_interface.gen.h"
 #include "core/extension/gdextension_loader.h"
-#include "core/io/resource.h"
+#include "core/io/config_file.h"
+#include "core/io/resource_loader.h"
+#include "core/object/ref_counted.h"
 
 class GDExtensionMethodBind;
 
@@ -180,6 +182,21 @@ public:
 
 VARIANT_ENUM_CAST(GDExtension::InitializationLevel)
 
+class GDExtensionResourceLoader : public ResourceFormatLoader {
+	GDSOFTCLASS(GDExtensionResourceLoader, ResourceFormatLoader);
+
+public:
+	static Error load_gdextension_resource(const String &p_path, Ref<GDExtension> &p_extension);
+
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+#ifdef TOOLS_ENABLED
+	virtual void get_classes_used(const String &p_path, HashSet<StringName> *r_classes) override;
+#endif // TOOLS_ENABLED
+};
+
 #ifdef TOOLS_ENABLED
 class GDExtensionEditorPlugins {
 private:
diff --git a/engine/core/extension/gdextension_function_loader.cpp b/engine/core/extension/gdextension_function_loader.cpp
index 978fd501..afe55eb9 100644
--- a/engine/core/extension/gdextension_function_loader.cpp
+++ b/engine/core/extension/gdextension_function_loader.cpp
@@ -30,7 +30,7 @@
 
 #include "gdextension_function_loader.h"
 
-#include "core/extension/gdextension.h"
+#include "gdextension.h"
 
 Error GDExtensionFunctionLoader::open_library(const String &p_path) {
 	ERR_FAIL_COND_V_MSG(!p_path.begins_with("libgodot://"), ERR_FILE_NOT_FOUND, "Function based GDExtensions should have a path starting with libgodot://");
diff --git a/engine/core/extension/gdextension_function_loader.h b/engine/core/extension/gdextension_function_loader.h
index 5635a24d..febda097 100644
--- a/engine/core/extension/gdextension_function_loader.h
+++ b/engine/core/extension/gdextension_function_loader.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/extension/gdextension_loader.h"
+#include "core/os/shared_object.h"
 
 class GDExtension;
 
diff --git a/engine/core/extension/gdextension_interface.cpp b/engine/core/extension/gdextension_interface.cpp
index a5bb0dbb..539e52ef 100644
--- a/engine/core/extension/gdextension_interface.cpp
+++ b/engine/core/extension/gdextension_interface.cpp
@@ -77,7 +77,7 @@ class CallableCustomExtension : public CallableCustom {
 		const CallableCustomExtension *b = static_cast<const CallableCustomExtension *>(p_b);
 
 		if (a->call_func != b->call_func) {
-			return (uintptr_t)a->call_func < (uintptr_t)b->call_func;
+			return a->call_func < b->call_func;
 		}
 		return a->userdata < b->userdata;
 	}
diff --git a/engine/core/extension/gdextension_interface.json b/engine/core/extension/gdextension_interface.json
index b9a6aa56..04c38794 100644
--- a/engine/core/extension/gdextension_interface.json
+++ b/engine/core/extension/gdextension_interface.json
@@ -5859,7 +5859,7 @@
             "return_value": {
                 "type": "GDExtensionInt",
                 "description": [
-                    "The resulting encoded string length in characters, not including a null terminator. Characters that cannot be converted to Latin-1 are replaced with a space."
+                    "The resulting encoded string length in characters (not bytes), not including a null terminator."
                 ]
             },
             "arguments": [
@@ -5896,7 +5896,7 @@
             "return_value": {
                 "type": "GDExtensionInt",
                 "description": [
-                    "The resulting encoded string length in bytes (not characters), not including a null terminator."
+                    "The resulting encoded string length in characters (not bytes), not including a null terminator."
                 ]
             },
             "arguments": [
@@ -5933,7 +5933,7 @@
             "return_value": {
                 "type": "GDExtensionInt",
                 "description": [
-                    "The resulting encoded string length in 16-bit code units (not bytes or characters), not including a null terminator."
+                    "The resulting encoded string length in characters (not bytes), not including a null terminator."
                 ]
             },
             "arguments": [
@@ -6007,7 +6007,7 @@
             "return_value": {
                 "type": "GDExtensionInt",
                 "description": [
-                    "The resulting encoded string length in characters (for UTF-32) or 16-bit code units (for UTF-16), depending on the wchar_t representation. Does not include a null terminator."
+                    "The resulting encoded string length in characters (not bytes), not including a null terminator."
                 ]
             },
             "arguments": [
diff --git a/engine/core/extension/gdextension_interface_header_generator.cpp b/engine/core/extension/gdextension_interface_header_generator.cpp
index 84d26773..31f1150c 100644
--- a/engine/core/extension/gdextension_interface_header_generator.cpp
+++ b/engine/core/extension/gdextension_interface_header_generator.cpp
@@ -32,8 +32,8 @@
 
 #include "gdextension_interface_header_generator.h"
 
-#include "core/extension/gdextension_interface_dump.gen.h"
 #include "core/io/json.h"
+#include "gdextension_interface_dump.gen.h"
 
 static const char *FILE_HEADER =
 		"/**************************************************************************/\n"
diff --git a/engine/core/extension/gdextension_library_loader.cpp b/engine/core/extension/gdextension_library_loader.cpp
index b3556730..8db6ef39 100644
--- a/engine/core/extension/gdextension_library_loader.cpp
+++ b/engine/core/extension/gdextension_library_loader.cpp
@@ -30,12 +30,10 @@
 
 #include "gdextension_library_loader.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/extension/gdextension.h"
 #include "core/io/dir_access.h"
-#include "core/os/os.h"
 #include "core/version.h"
+#include "gdextension.h"
 
 Vector<SharedObject> GDExtensionLibraryLoader::find_extension_dependencies(const String &p_path, Ref<ConfigFile> p_config, std::function<bool(String)> p_has_feature) {
 	Vector<SharedObject> dependencies_shared_objects;
diff --git a/engine/core/extension/gdextension_library_loader.h b/engine/core/extension/gdextension_library_loader.h
index 88aadf2a..d416c83d 100644
--- a/engine/core/extension/gdextension_library_loader.h
+++ b/engine/core/extension/gdextension_library_loader.h
@@ -30,12 +30,12 @@
 
 #pragma once
 
+#include <functional>
+
 #include "core/extension/gdextension_loader.h"
 #include "core/io/config_file.h"
 #include "core/os/shared_object.h"
 
-#include <functional>
-
 class GDExtensionLibraryLoader : public GDExtensionLoader {
 	GDSOFTCLASS(GDExtensionLibraryLoader, GDExtensionLoader);
 
diff --git a/engine/core/extension/gdextension_manager.cpp b/engine/core/extension/gdextension_manager.cpp
index 86aacfd6..166e522c 100644
--- a/engine/core/extension/gdextension_manager.cpp
+++ b/engine/core/extension/gdextension_manager.cpp
@@ -30,16 +30,12 @@
 
 #include "gdextension_manager.h"
 
-#include "core/config/engine.h"
 #include "core/extension/gdextension_function_loader.h"
 #include "core/extension/gdextension_library_loader.h"
 #include "core/extension/gdextension_special_compat_hashes.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
-#include "core/os/os.h"
 
 GDExtensionManager::LoadStatus GDExtensionManager::_load_extension_internal(const Ref<GDExtension> &p_extension, bool p_first_load) {
 	if (level >= 0) { // Already initialized up to some level.
@@ -481,8 +477,8 @@ void GDExtensionManager::_bind_methods() {
 	BIND_ENUM_CONSTANT(LOAD_STATUS_NEEDS_RESTART);
 
 	ADD_SIGNAL(MethodInfo("extensions_reloaded"));
-	ADD_SIGNAL(MethodInfo("extension_loaded", PropertyInfo(Variant::OBJECT, "extension", PROPERTY_HINT_RESOURCE_TYPE, GDExtension::get_class_static())));
-	ADD_SIGNAL(MethodInfo("extension_unloading", PropertyInfo(Variant::OBJECT, "extension", PROPERTY_HINT_RESOURCE_TYPE, GDExtension::get_class_static())));
+	ADD_SIGNAL(MethodInfo("extension_loaded", PropertyInfo(Variant::OBJECT, "extension", PROPERTY_HINT_RESOURCE_TYPE, "GDExtension")));
+	ADD_SIGNAL(MethodInfo("extension_unloading", PropertyInfo(Variant::OBJECT, "extension", PROPERTY_HINT_RESOURCE_TYPE, "GDExtension")));
 }
 
 GDExtensionManager::GDExtensionManager() {
diff --git a/engine/core/extension/gdextension_resource_format.cpp b/engine/core/extension/gdextension_resource_format.cpp
deleted file mode 100644
index f8b71be1..00000000
--- a/engine/core/extension/gdextension_resource_format.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/**************************************************************************/
-/*  gdextension_resource_format.cpp                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "gdextension_resource_format.h"
-
-#include "core/extension/gdextension_manager.h"
-#include "core/object/class_db.h"
-
-Ref<Resource> GDExtensionResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	// We can't have two GDExtension resource object representing the same library, because
-	// loading (or unloading) a GDExtension affects global data. So, we need reuse the same
-	// object if one has already been loaded (even if caching is disabled at the resource
-	// loader level).
-	GDExtensionManager *manager = GDExtensionManager::get_singleton();
-	if (manager->is_extension_loaded(p_path)) {
-		return manager->get_extension(p_path);
-	}
-
-	Ref<GDExtension> lib;
-	Error err = load_gdextension_resource(p_path, lib);
-	if (err != OK && r_error) {
-		// Errors already logged in load_gdextension_resource().
-		*r_error = err;
-	}
-	return lib;
-}
-
-void GDExtensionResourceLoader::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("gdextension");
-}
-
-bool GDExtensionResourceLoader::handles_type(const String &p_type) const {
-	return p_type == "GDExtension";
-}
-
-String GDExtensionResourceLoader::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("gdextension")) {
-		return "GDExtension";
-	}
-	return "";
-}
-
-Error GDExtensionResourceLoader::load_gdextension_resource(const String &p_path, Ref<GDExtension> &p_extension) {
-	ERR_FAIL_COND_V_MSG(p_extension.is_valid() && p_extension->is_library_open(), ERR_ALREADY_IN_USE, "Cannot load GDExtension resource into already opened library.");
-
-	GDExtensionManager *extension_manager = GDExtensionManager::get_singleton();
-
-	GDExtensionManager::LoadStatus status = extension_manager->load_extension(p_path);
-	if (status != GDExtensionManager::LOAD_STATUS_OK && status != GDExtensionManager::LOAD_STATUS_ALREADY_LOADED) {
-		// Errors already logged in load_extension().
-		return FAILED;
-	}
-
-	p_extension = extension_manager->get_extension(p_path);
-	return OK;
-}
-
-#ifdef TOOLS_ENABLED
-void GDExtensionResourceLoader::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
-	Ref<GDExtension> gdext = ResourceLoader::load(p_path);
-	if (gdext.is_null()) {
-		return;
-	}
-
-	for (const StringName class_name : gdext->get_classes_used()) {
-		if (ClassDB::class_exists(class_name)) {
-			r_classes->insert(class_name);
-		}
-	}
-}
-#endif // TOOLS_ENABLED
diff --git a/engine/core/extension/gdextension_resource_format.h b/engine/core/extension/gdextension_resource_format.h
deleted file mode 100644
index 1bd867fd..00000000
--- a/engine/core/extension/gdextension_resource_format.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*  gdextension_resource_format.h                                         */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/extension/gdextension.h"
-#include "core/io/resource_loader.h"
-
-class GDExtensionResourceLoader : public ResourceFormatLoader {
-	GDSOFTCLASS(GDExtensionResourceLoader, ResourceFormatLoader);
-
-public:
-	static Error load_gdextension_resource(const String &p_path, Ref<GDExtension> &p_extension);
-
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-#ifdef TOOLS_ENABLED
-	virtual void get_classes_used(const String &p_path, HashSet<StringName> *r_classes) override;
-#endif // TOOLS_ENABLED
-};
diff --git a/engine/core/extension/godot_instance.cpp b/engine/core/extension/godot_instance.cpp
index 7825006a..343c4eb0 100644
--- a/engine/core/extension/godot_instance.cpp
+++ b/engine/core/extension/godot_instance.cpp
@@ -31,9 +31,7 @@
 #include "godot_instance.h"
 
 #include "core/extension/gdextension_manager.h"
-#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "main/main.h"
 #include "servers/display/display_server.h"
 
diff --git a/engine/core/extension/godot_instance.h b/engine/core/extension/godot_instance.h
index 5014f68a..8d1ecf45 100644
--- a/engine/core/extension/godot_instance.h
+++ b/engine/core/extension/godot_instance.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/extension/gdextension_interface.gen.h"
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 
 class GodotInstance : public Object {
 	GDCLASS(GodotInstance, Object);
diff --git a/engine/core/extension/libgodot.h b/engine/core/extension/libgodot.h
index 17d0753f..5b6f39dc 100644
--- a/engine/core/extension/libgodot.h
+++ b/engine/core/extension/libgodot.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/extension/gdextension_interface.gen.h"
+#include "gdextension_interface.gen.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/engine/core/input/input.compat.inc b/engine/core/input/input.compat.inc
index 7f77baab..cbc8b1df 100644
--- a/engine/core/input/input.compat.inc
+++ b/engine/core/input/input.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "input.h"
-
-#include "core/object/class_db.h"
-
 void Input::_vibrate_handheld_bind_compat_91143(int p_duration_ms) {
 	vibrate_handheld(p_duration_ms, -1.0);
 }
diff --git a/engine/core/input/input.cpp b/engine/core/input/input.cpp
index 38da1c6e..c7507920 100644
--- a/engine/core/input/input.cpp
+++ b/engine/core/input/input.cpp
@@ -31,21 +31,15 @@
 #include "input.h"
 #include "input.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/default_controller_mappings.h"
 #include "core/input/input_map.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #ifdef DEV_ENABLED
 #include "core/os/thread.h"
 #endif
 
-#include <thirdparty/gamepadmotionhelpers/GamepadMotion.hpp>
-
-#define STANDARD_GRAVITY 9.80665f
-
 static const char *_joy_buttons[(size_t)JoyButton::SDL_MAX] = {
 	"a",
 	"b",
@@ -68,11 +62,6 @@ static const char *_joy_buttons[(size_t)JoyButton::SDL_MAX] = {
 	"paddle3",
 	"paddle4",
 	"touchpad",
-	"misc2",
-	"misc3",
-	"misc4",
-	"misc5",
-	"misc6",
 };
 
 static const char *_joy_axes[(size_t)JoyAxis::SDL_MAX] = {
@@ -125,8 +114,6 @@ bool Input::is_mouse_mode_override_enabled() {
 }
 
 void Input::_bind_methods() {
-	using namespace InputClassEnums;
-
 	ClassDB::bind_method(D_METHOD("is_anything_pressed"), &Input::is_anything_pressed);
 	ClassDB::bind_method(D_METHOD("is_key_pressed", "keycode"), &Input::is_key_pressed);
 	ClassDB::bind_method(D_METHOD("is_physical_key_pressed", "keycode"), &Input::is_physical_key_pressed);
@@ -153,32 +140,13 @@ void Input::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_connected_joypads"), &Input::get_connected_joypads);
 	ClassDB::bind_method(D_METHOD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength);
 	ClassDB::bind_method(D_METHOD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration);
-	ClassDB::bind_method(D_METHOD("get_joy_vibration_remaining_duration", "device"), &Input::get_joy_vibration_remaining_duration);
-	ClassDB::bind_method(D_METHOD("is_joy_vibrating", "device"), &Input::is_joy_vibrating);
-	ClassDB::bind_method(D_METHOD("has_joy_vibration", "device"), &Input::has_joy_vibration);
 	ClassDB::bind_method(D_METHOD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("stop_joy_vibration", "device"), &Input::stop_joy_vibration);
 	ClassDB::bind_method(D_METHOD("vibrate_handheld", "duration_ms", "amplitude"), &Input::vibrate_handheld, DEFVAL(500), DEFVAL(-1.0));
-	ClassDB::bind_method(D_METHOD("set_ignore_joypad_on_unfocused_application", "enable"), &Input::set_ignore_joypad_on_unfocused_application);
-	ClassDB::bind_method(D_METHOD("is_ignoring_joypad_on_unfocused_application"), &Input::is_ignoring_joypad_on_unfocused_application);
 	ClassDB::bind_method(D_METHOD("get_gravity"), &Input::get_gravity);
 	ClassDB::bind_method(D_METHOD("get_accelerometer"), &Input::get_accelerometer);
 	ClassDB::bind_method(D_METHOD("get_magnetometer"), &Input::get_magnetometer);
 	ClassDB::bind_method(D_METHOD("get_gyroscope"), &Input::get_gyroscope);
-	ClassDB::bind_method(D_METHOD("get_joy_accelerometer", "device"), &Input::get_joy_accelerometer);
-	ClassDB::bind_method(D_METHOD("get_joy_gravity", "device"), &Input::get_joy_gravity);
-	ClassDB::bind_method(D_METHOD("get_joy_gyroscope", "device"), &Input::get_joy_gyroscope);
-	ClassDB::bind_method(D_METHOD("get_joy_motion_sensors_rate", "device"), &Input::get_joy_motion_sensors_rate);
-	ClassDB::bind_method(D_METHOD("is_joy_motion_sensors_enabled", "device"), &Input::is_joy_motion_sensors_enabled);
-	ClassDB::bind_method(D_METHOD("set_joy_motion_sensors_enabled", "device", "enable"), &Input::set_joy_motion_sensors_enabled);
-	ClassDB::bind_method(D_METHOD("has_joy_motion_sensors", "device"), &Input::has_joy_motion_sensors);
-	ClassDB::bind_method(D_METHOD("start_joy_motion_sensors_calibration", "device"), &Input::start_joy_motion_sensors_calibration);
-	ClassDB::bind_method(D_METHOD("stop_joy_motion_sensors_calibration", "device"), &Input::stop_joy_motion_sensors_calibration);
-	ClassDB::bind_method(D_METHOD("clear_joy_motion_sensors_calibration", "device"), &Input::clear_joy_motion_sensors_calibration);
-	ClassDB::bind_method(D_METHOD("get_joy_motion_sensors_calibration", "device"), &Input::get_joy_motion_sensors_calibration);
-	ClassDB::bind_method(D_METHOD("set_joy_motion_sensors_calibration", "device", "calibration_info"), &Input::set_joy_motion_sensors_calibration);
-	ClassDB::bind_method(D_METHOD("is_joy_motion_sensors_calibrated", "device"), &Input::is_joy_motion_sensors_calibrated);
-	ClassDB::bind_method(D_METHOD("is_joy_motion_sensors_calibrating", "device"), &Input::is_joy_motion_sensors_calibrating);
 	ClassDB::bind_method(D_METHOD("set_gravity", "value"), &Input::set_gravity);
 	ClassDB::bind_method(D_METHOD("set_accelerometer", "value"), &Input::set_accelerometer);
 	ClassDB::bind_method(D_METHOD("set_magnetometer", "value"), &Input::set_magnetometer);
@@ -209,7 +177,6 @@ void Input::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_accumulated_input"), "set_use_accumulated_input", "is_using_accumulated_input");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "emulate_mouse_from_touch"), "set_emulate_mouse_from_touch", "is_emulating_mouse_from_touch");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "emulate_touch_from_mouse"), "set_emulate_touch_from_mouse", "is_emulating_touch_from_mouse");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ignore_joypad_on_unfocused_application"), "set_ignore_joypad_on_unfocused_application", "is_ignoring_joypad_on_unfocused_application");
 
 	BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE);
 	BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN);
@@ -329,14 +296,24 @@ bool Input::is_anything_pressed() const {
 	return false;
 }
 
-bool Input::is_any_key_pressed() const {
+bool Input::is_anything_pressed_except_mouse() const {
 	_THREAD_SAFE_METHOD_
 
 	if (disable_input) {
 		return false;
 	}
 
-	return !keys_pressed.is_empty();
+	if (!keys_pressed.is_empty() || !joy_buttons_pressed.is_empty()) {
+		return true;
+	}
+
+	for (const KeyValue<StringName, Input::ActionState> &E : action_states) {
+		if (E.value.cache.pressed) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 bool Input::is_key_pressed(Key p_keycode) const {
@@ -379,10 +356,6 @@ bool Input::is_mouse_button_pressed(MouseButton p_button) const {
 	return mouse_button_mask.has_flag(mouse_button_to_mask(p_button));
 }
 
-bool Input::_should_ignore_joypad_events() const {
-	return ignore_joypad_on_unfocused_application && !application_focused && !embedder_focused;
-}
-
 static JoyAxis _combine_device(JoyAxis p_value, int p_device) {
 	return JoyAxis((int)p_value | (p_device << 20));
 }
@@ -642,33 +615,6 @@ float Input::get_joy_vibration_duration(int p_device) {
 	}
 }
 
-float Input::get_joy_vibration_remaining_duration(int p_device) {
-	_THREAD_SAFE_METHOD_
-	const Joypad *joypad = joy_names.getptr(p_device);
-	if (joypad == nullptr || !joypad->has_vibration) {
-		return 0.f;
-	}
-	const VibrationInfo *vibration = joy_vibration.getptr(p_device);
-	if (vibration == nullptr || (vibration->weak_magnitude == 0.f && vibration->strong_magnitude == 0.f) || vibration->duration < 0.f) {
-		return 0.f;
-	}
-	float vibration_duration = vibration->duration;
-	if (vibration_duration > 0xFFFF / 1000.f || vibration_duration == 0.f) {
-		vibration_duration = 0xFFFF / 1000.f; // SDL_MAX_RUMBLE_DURATION_MS / 1000.f
-	}
-	return MAX(vibration_duration - (OS::get_singleton()->get_ticks_usec() - vibration->timestamp) / 1e6, 0.f);
-}
-
-bool Input::is_joy_vibrating(int p_device) {
-	return get_joy_vibration_remaining_duration(p_device) > 0.0f;
-}
-
-bool Input::has_joy_vibration(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const Joypad *joypad = joy_names.getptr(p_device);
-	return joypad != nullptr && joypad->has_vibration;
-}
-
 static String _hex_str(uint8_t p_byte) {
 	static const char *dict = "0123456789abcdef";
 	char ret[3];
@@ -738,11 +684,6 @@ void Input::joy_connection_changed(int p_idx, bool p_connected, const String &p_
 		for (int i = 0; i < (int)JoyAxis::MAX; i++) {
 			set_joy_axis(p_idx, (JoyAxis)i, 0.0f);
 		}
-		MotionInfo *motion = joy_motion.getptr(p_idx);
-		if (motion != nullptr && motion->gamepad_motion != nullptr) {
-			delete motion->gamepad_motion;
-		}
-		joy_motion.erase(p_idx);
 	}
 	joy_names[p_idx] = js;
 
@@ -1018,7 +959,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
 		device_state.pressed[event_index] = is_pressed;
 		device_state.strength[event_index] = p_event->get_action_strength(E.key);
 		device_state.raw_strength[event_index] = p_event->get_action_raw_strength(E.key);
-		device_state.event_type[event_index] = p_event->get_type();
 
 		// Update the action's global state and cache.
 		if (!is_pressed) {
@@ -1065,12 +1005,6 @@ void Input::set_joy_features(int p_device, JoypadFeatures *p_features) {
 }
 
 void Input::set_joy_light(int p_device, const Color &p_color) {
-	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
 	Joypad *joypad = joy_names.getptr(p_device);
 	if (!joypad || !joypad->has_light || joypad->features == nullptr) {
 		return;
@@ -1084,218 +1018,8 @@ bool Input::has_joy_light(int p_device) const {
 	return joypad && joypad->has_light;
 }
 
-Vector3 Input::get_joy_accelerometer(int p_device) const {
-	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return Vector3();
-	}
-
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return Vector3();
-	}
-
-	float joy_acceleration_data[3];
-	motion->gamepad_motion->GetProcessedAcceleration(joy_acceleration_data[0], joy_acceleration_data[1], joy_acceleration_data[2]);
-	Vector3 joy_acceleration(joy_acceleration_data[0], joy_acceleration_data[1], joy_acceleration_data[2]);
-
-	float joy_gravity_data[3];
-	motion->gamepad_motion->GetGravity(joy_gravity_data[0], joy_gravity_data[1], joy_gravity_data[2]);
-	Vector3 joy_gravity(joy_gravity_data[0], joy_gravity_data[1], joy_gravity_data[2]);
-
-	return (-joy_acceleration + joy_gravity) * STANDARD_GRAVITY;
-}
-
-Vector3 Input::get_joy_gravity(int p_device) const {
-	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return Vector3();
-	}
-
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return Vector3();
-	}
-
-	float joy_gravity_data[3];
-	motion->gamepad_motion->GetGravity(joy_gravity_data[0], joy_gravity_data[1], joy_gravity_data[2]);
-	Vector3 joy_gravity(joy_gravity_data[0], joy_gravity_data[1], joy_gravity_data[2]);
-
-	return joy_gravity.normalized() * STANDARD_GRAVITY;
-}
-
-Vector3 Input::get_joy_gyroscope(int p_device) const {
-	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return Vector3();
-	}
-
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return Vector3();
-	}
-
-	float joy_gyro_data[3];
-	motion->gamepad_motion->GetCalibratedGyro(joy_gyro_data[0], joy_gyro_data[1], joy_gyro_data[2]);
-	Vector3 joy_gyro(joy_gyro_data[0], joy_gyro_data[1], joy_gyro_data[2]);
-
-	return joy_gyro * M_PI / 180.0;
-}
-
-void Input::set_joy_motion_sensors_enabled(int p_device, bool p_enable) {
-	_THREAD_SAFE_METHOD_
-	Joypad *joypad = joy_names.getptr(p_device);
-	if (joypad == nullptr || joypad->features == nullptr) {
-		return;
-	}
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-	joypad->features->set_joy_motion_sensors_enabled(p_enable);
-	motion->sensors_enabled = p_enable;
-}
-
-bool Input::is_joy_motion_sensors_enabled(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	return motion != nullptr && motion->sensors_enabled;
-}
-
-bool Input::has_joy_motion_sensors(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	return joy_motion.has(p_device);
-}
-
-float Input::get_joy_motion_sensors_rate(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return 0.0f;
-	}
-	return motion->sensor_data_rate;
-}
-
-void Input::start_joy_motion_sensors_calibration(int p_device) {
-	_THREAD_SAFE_METHOD_
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	ERR_FAIL_COND_MSG(!motion->sensors_enabled, "Motion sensors are not enabled on the joypad.");
-	ERR_FAIL_COND_MSG(motion->calibrating, "Calibration already in progress.");
-
-	motion->gamepad_motion->ResetContinuousCalibration();
-	motion->gamepad_motion->StartContinuousCalibration();
-
-	motion->calibrating = true;
-	motion->calibrated = false;
-}
-
-void Input::stop_joy_motion_sensors_calibration(int p_device) {
-	_THREAD_SAFE_METHOD_
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	ERR_FAIL_COND_MSG(!motion->sensors_enabled, "Motion sensors are not enabled on the joypad.");
-	ERR_FAIL_COND_MSG(!motion->calibrating, "Calibration hasn't been started.");
-
-	motion->gamepad_motion->PauseContinuousCalibration();
-
-	motion->calibrating = false;
-	motion->calibrated = true;
-}
-
-void Input::clear_joy_motion_sensors_calibration(int p_device) {
-	_THREAD_SAFE_METHOD_
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	// Calibration might be in progress and the developer or the user might want to reset it,
-	// so no need to stop the calibration.
-
-	motion->gamepad_motion->ResetContinuousCalibration();
-}
-
-Dictionary Input::get_joy_motion_sensors_calibration(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return Dictionary();
-	}
-
-	if (!motion->calibrated) {
-		return Dictionary();
-	}
-
-	float joy_gyro_offset_data[3];
-	motion->gamepad_motion->GetCalibrationOffset(joy_gyro_offset_data[0], joy_gyro_offset_data[1], joy_gyro_offset_data[2]);
-	Vector3 joy_gyro_offset(joy_gyro_offset_data[0], joy_gyro_offset_data[1], joy_gyro_offset_data[2]);
-
-	Dictionary result;
-	result["gyroscope_offset"] = joy_gyro_offset * M_PI / 180.0;
-	return result;
-}
-
-void Input::set_joy_motion_sensors_calibration(int p_device, const Dictionary &p_calibration_info) {
-	_THREAD_SAFE_METHOD_
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	ERR_FAIL_COND_MSG(motion->calibrating, "Calibration is currently in progress.");
-
-	Vector3 gyro_offset = p_calibration_info.get("gyroscope_offset", Vector3()).operator Vector3() * 180.0 / M_PI;
-
-	motion->gamepad_motion->SetCalibrationOffset(gyro_offset.x, gyro_offset.y, gyro_offset.z, 1);
-	motion->calibrating = false;
-	motion->calibrated = true;
-}
-
-bool Input::is_joy_motion_sensors_calibrating(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return false;
-	}
-	return motion->calibrating;
-}
-
-bool Input::is_joy_motion_sensors_calibrated(int p_device) const {
-	_THREAD_SAFE_METHOD_
-	const MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return false;
-	}
-	return motion->calibrated;
-}
-
-void Input::set_joy_motion_sensors_rate(int p_device, float p_rate) {
-	_THREAD_SAFE_METHOD_
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	motion->sensor_data_rate = p_rate;
-}
-
 void Input::start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration) {
 	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
 	if (p_weak_magnitude < 0.f || p_weak_magnitude > 1.f || p_strong_magnitude < 0.f || p_strong_magnitude > 1.f) {
 		return;
 	}
@@ -1321,17 +1045,6 @@ void Input::vibrate_handheld(int p_duration_ms, float p_amplitude) {
 	OS::get_singleton()->vibrate_handheld(p_duration_ms, p_amplitude);
 }
 
-void Input::set_ignore_joypad_on_unfocused_application(bool p_ignore) {
-	ignore_joypad_on_unfocused_application = p_ignore;
-	if (_should_ignore_joypad_events()) {
-		release_pressed_events();
-	}
-}
-
-bool Input::is_ignoring_joypad_on_unfocused_application() const {
-	return ignore_joypad_on_unfocused_application;
-}
-
 void Input::set_gravity(const Vector3 &p_gravity) {
 	_THREAD_SAFE_METHOD_
 
@@ -1598,49 +1311,17 @@ bool Input::is_using_accumulated_input() {
 }
 
 void Input::release_pressed_events() {
-	// Don't release the events if the application (or the window it's embedded in) is still focused.
-	if (application_focused || embedder_focused) {
-		return;
-	}
-
 	flush_buffered_events(); // this is needed to release actions strengths
 
 	keys_pressed.clear();
 	physical_keys_pressed.clear();
 	key_label_pressed.clear();
-	if (ignore_joypad_on_unfocused_application) {
-		joy_buttons_pressed.clear();
-		_joy_axis.clear();
+	joy_buttons_pressed.clear();
+	_joy_axis.clear();
 
-		for (KeyValue<StringName, Input::ActionState> &E : action_states) {
-			if (E.value.cache.pressed) {
-				action_release(E.key);
-			}
-		}
-
-		for (int device : get_connected_joypads()) {
-			stop_joy_vibration(device);
-		}
-	} else {
-		for (KeyValue<StringName, Input::ActionState> &E : action_states) {
-			if (E.value.cache.pressed) {
-				bool is_only_joypad_pressed = true;
-				int max_event = InputMap::get_singleton()->action_get_events(E.key)->size() + 1; // +1 comes from InputEventAction.
-
-				for (const KeyValue<int, ActionState::DeviceState> &kv : E.value.device_states) {
-					const ActionState::DeviceState &device_state = kv.value;
-					for (int i = 0; i < max_event; i++) {
-						if (device_state.event_type[i] != InputEventType::JOY_MOTION && device_state.event_type[i] != InputEventType::JOY_BUTTON && device_state.strength[i] > 0.0f) {
-							is_only_joypad_pressed = false;
-							action_release(E.key);
-							break;
-						}
-					}
-					if (!is_only_joypad_pressed) {
-						break;
-					}
-				}
-			}
+	for (KeyValue<StringName, Input::ActionState> &E : action_states) {
+		if (E.value.cache.pressed) {
+			action_release(E.key);
 		}
 	}
 }
@@ -1651,11 +1332,6 @@ void Input::set_event_dispatch_function(EventDispatchFunc p_function) {
 
 void Input::joy_button(int p_device, JoyButton p_button, bool p_pressed) {
 	_THREAD_SAFE_METHOD_;
-
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
 	Joypad &joy = joy_names[p_device];
 	ERR_FAIL_INDEX((int)p_button, (int)JoyButton::MAX);
 
@@ -1684,10 +1360,6 @@ void Input::joy_button(int p_device, JoyButton p_button, bool p_pressed) {
 void Input::joy_axis(int p_device, JoyAxis p_axis, float p_value) {
 	_THREAD_SAFE_METHOD_;
 
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
 	ERR_FAIL_INDEX((int)p_axis, (int)JoyAxis::MAX);
 
 	Joypad &joy = joy_names[p_device];
@@ -1757,11 +1429,6 @@ void Input::joy_axis(int p_device, JoyAxis p_axis, float p_value) {
 
 void Input::joy_hat(int p_device, BitField<HatMask> p_val) {
 	_THREAD_SAFE_METHOD_;
-
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
 	const Joypad &joy = joy_names[p_device];
 
 	JoyEvent map[(size_t)HatDir::MAX];
@@ -1802,27 +1469,6 @@ void Input::joy_hat(int p_device, BitField<HatMask> p_val) {
 	joy_names[p_device].hat_current = (int)p_val;
 }
 
-void Input::joy_motion_sensors(int p_device, const Vector3 &p_accelerometer, const Vector3 &p_gyroscope) {
-	_THREAD_SAFE_METHOD_
-
-	if (_should_ignore_joypad_events()) {
-		return;
-	}
-
-	// TODO: events
-	MotionInfo *motion = joy_motion.getptr(p_device);
-	if (motion == nullptr) {
-		return;
-	}
-
-	Vector3 gyro_degrees = p_gyroscope * 180.0 / M_PI;
-	Vector3 accel_g = -p_accelerometer / STANDARD_GRAVITY;
-	uint64_t new_timestamp = OS::get_singleton()->get_ticks_msec();
-	float delta_time = (new_timestamp - motion->last_timestamp) / 1000.0f;
-	motion->last_timestamp = new_timestamp;
-	motion->gamepad_motion->ProcessMotion(gyro_degrees.x, gyro_degrees.y, gyro_degrees.z, accel_g.x, accel_g.y, accel_g.z, delta_time);
-}
-
 void Input::_button_event(int p_device, JoyButton p_index, bool p_pressed) {
 	Ref<InputEventJoypadButton> ievent;
 	ievent.instantiate();
@@ -1871,22 +1517,9 @@ void Input::_update_joypad_features(int p_device) {
 	if (!joypad || joypad->features == nullptr) {
 		return;
 	}
-	if (joypad->features->has_joy_vibration()) {
-		joypad->has_vibration = true;
-	}
 	if (joypad->features->has_joy_light()) {
 		joypad->has_light = true;
 	}
-	if (joypad->features->has_joy_motion_sensors()) {
-		MotionInfo &motion = joy_motion[p_device];
-
-		if (!motion.gamepad_motion) {
-			motion.gamepad_motion = new GamepadMotion();
-		} else {
-			motion.gamepad_motion->Reset();
-		}
-		motion.last_timestamp = OS::get_singleton()->get_ticks_msec();
-	}
 }
 
 Input::JoyEvent Input::_get_mapped_button_event(const JoyDeviceMapping &mapping, JoyButton p_button) {
@@ -2371,7 +2004,6 @@ Input::Input() {
 	gravity_enabled = GLOBAL_DEF_RST_BASIC("input_devices/sensors/enable_gravity", false);
 	gyroscope_enabled = GLOBAL_DEF_RST_BASIC("input_devices/sensors/enable_gyroscope", false);
 	magnetometer_enabled = GLOBAL_DEF_RST_BASIC("input_devices/sensors/enable_magnetometer", false);
-	ignore_joypad_on_unfocused_application = GLOBAL_DEF_RST_BASIC("input_devices/joypads/ignore_joypad_on_unfocused_application", false);
 }
 
 Input::~Input() {
diff --git a/engine/core/input/input.h b/engine/core/input/input.h
index 6d732877..c912cb34 100644
--- a/engine/core/input/input.h
+++ b/engine/core/input/input.h
@@ -38,43 +38,6 @@
 #include "core/templates/rb_set.h"
 #include "core/variant/typed_array.h"
 
-class GamepadMotion;
-
-namespace InputClassEnums {
-// Keep synced with DisplayServerEnums::MouseMode enum.
-enum MouseMode : int {
-	MOUSE_MODE_VISIBLE,
-	MOUSE_MODE_HIDDEN,
-	MOUSE_MODE_CAPTURED,
-	MOUSE_MODE_CONFINED,
-	MOUSE_MODE_CONFINED_HIDDEN,
-	MOUSE_MODE_MAX,
-};
-
-// Keep synced with DisplayServerEnums and Control enums.
-#undef CursorShape
-enum CursorShape : int {
-	CURSOR_ARROW,
-	CURSOR_IBEAM,
-	CURSOR_POINTING_HAND,
-	CURSOR_CROSS,
-	CURSOR_WAIT,
-	CURSOR_BUSY,
-	CURSOR_DRAG,
-	CURSOR_CAN_DROP,
-	CURSOR_FORBIDDEN,
-	CURSOR_VSIZE,
-	CURSOR_HSIZE,
-	CURSOR_BDIAGSIZE,
-	CURSOR_FDIAGSIZE,
-	CURSOR_MOVE,
-	CURSOR_VSPLIT,
-	CURSOR_HSPLIT,
-	CURSOR_HELP,
-	CURSOR_MAX
-};
-} //namespace InputClassEnums
-
 class Input : public Object {
 	GDCLASS(Input, Object);
 	_THREAD_SAFE_CLASS_
@@ -84,21 +47,44 @@ class Input : public Object {
 	static constexpr uint64_t MAX_EVENT = 32;
 
 public:
-	// TODO: When we migrate to C++20, replace these with "using enum" and skip prefixing MouseMode and CursorShape in other files.
-	using MouseMode = InputClassEnums::MouseMode;
-	using CursorShape = InputClassEnums::CursorShape;
+	// Keep synced with "DisplayServer::MouseMode" enum.
+	enum MouseMode {
+		MOUSE_MODE_VISIBLE,
+		MOUSE_MODE_HIDDEN,
+		MOUSE_MODE_CAPTURED,
+		MOUSE_MODE_CONFINED,
+		MOUSE_MODE_CONFINED_HIDDEN,
+		MOUSE_MODE_MAX,
+	};
+
+#undef CursorShape
+	enum CursorShape {
+		CURSOR_ARROW,
+		CURSOR_IBEAM,
+		CURSOR_POINTING_HAND,
+		CURSOR_CROSS,
+		CURSOR_WAIT,
+		CURSOR_BUSY,
+		CURSOR_DRAG,
+		CURSOR_CAN_DROP,
+		CURSOR_FORBIDDEN,
+		CURSOR_VSIZE,
+		CURSOR_HSIZE,
+		CURSOR_BDIAGSIZE,
+		CURSOR_FDIAGSIZE,
+		CURSOR_MOVE,
+		CURSOR_VSPLIT,
+		CURSOR_HSPLIT,
+		CURSOR_HELP,
+		CURSOR_MAX
+	};
 
 	class JoypadFeatures {
 	public:
 		virtual ~JoypadFeatures() {}
 
-		virtual bool has_joy_vibration() const { return false; }
-
 		virtual bool has_joy_light() const { return false; }
 		virtual void set_joy_light(const Color &p_color) {}
-
-		virtual bool has_joy_motion_sensors() const { return false; }
-		virtual void set_joy_motion_sensors_enabled(bool p_enable) {}
 	};
 
 	static constexpr int32_t JOYPADS_MAX = 16;
@@ -126,9 +112,6 @@ private:
 	int64_t mouse_window = 0;
 	bool legacy_just_pressed_behavior = false;
 	bool disable_input = false;
-	bool ignore_joypad_on_unfocused_application = false;
-	bool application_focused = true;
-	bool embedder_focused = false;
 
 	struct ActionState {
 		uint64_t pressed_physics_frame = UINT64_MAX;
@@ -143,7 +126,6 @@ private:
 			bool pressed[MAX_EVENT] = { false };
 			float strength[MAX_EVENT] = { 0.0 };
 			float raw_strength[MAX_EVENT] = { 0.0 };
-			InputEventType event_type[MAX_EVENT] = { InputEventType::INVALID };
 		};
 		bool api_pressed = false;
 		float api_strength = 0.0;
@@ -175,23 +157,6 @@ private:
 
 	HashMap<int, VibrationInfo> joy_vibration;
 
-	struct MotionInfo {
-		bool sensors_enabled : 1;
-		bool calibrating : 1;
-		bool calibrated : 1;
-		float sensor_data_rate = 0.0f;
-		uint64_t last_timestamp = 0;
-		GamepadMotion *gamepad_motion = nullptr;
-
-		MotionInfo() {
-			sensors_enabled = false;
-			calibrating = false;
-			calibrated = false;
-		}
-	};
-
-	HashMap<int, MotionInfo> joy_motion;
-
 	struct VelocityTrack {
 		uint64_t last_tick = 0;
 		Vector2 velocity;
@@ -219,7 +184,6 @@ private:
 		int hat_current = 0;
 		Dictionary info;
 		bool has_light = false;
-		bool has_vibration = false;
 		Input::JoypadFeatures *features = nullptr;
 	};
 
@@ -231,7 +195,7 @@ private:
 
 	int fallback_mapping = -1; // Index of the guid in map_db.
 
-	CursorShape default_shape = CursorShape::CURSOR_ARROW;
+	CursorShape default_shape = CURSOR_ARROW;
 
 	enum JoyType {
 		TYPE_BUTTON,
@@ -311,8 +275,6 @@ private:
 #endif
 
 	friend class DisplayServer;
-	friend class SceneTree;
-	friend class SceneDebugger;
 
 	static void (*set_mouse_mode_func)(MouseMode);
 	static MouseMode (*get_mouse_mode_func)();
@@ -327,8 +289,6 @@ private:
 
 	EventDispatchFunc event_dispatch_function = nullptr;
 
-	bool _should_ignore_joypad_events() const;
-
 #ifndef DISABLE_DEPRECATED
 	void _vibrate_handheld_bind_compat_91143(int p_duration_ms = 500);
 	static void _bind_compatibility_methods();
@@ -352,7 +312,7 @@ public:
 	static Input *get_singleton();
 
 	bool is_anything_pressed() const;
-	bool is_any_key_pressed() const;
+	bool is_anything_pressed_except_mouse() const;
 	bool is_key_pressed(Key p_keycode) const;
 	bool is_physical_key_pressed(Key p_keycode) const;
 	bool is_key_label_pressed(Key p_keycode) const;
@@ -374,10 +334,7 @@ public:
 	TypedArray<int> get_connected_joypads();
 	Vector2 get_joy_vibration_strength(int p_device);
 	float get_joy_vibration_duration(int p_device);
-	float get_joy_vibration_remaining_duration(int p_device);
 	uint64_t get_joy_vibration_timestamp(int p_device);
-	bool is_joy_vibrating(int p_device);
-	bool has_joy_vibration(int p_device) const;
 	void joy_connection_changed(int p_idx, bool p_connected, const String &p_name, const String &p_guid = "", const Dictionary &p_joypad_info = Dictionary());
 
 	Vector3 get_gravity() const;
@@ -406,35 +363,10 @@ public:
 	void set_joy_light(int p_device, const Color &p_color);
 	bool has_joy_light(int p_device) const;
 
-	Vector3 get_joy_accelerometer(int p_device) const;
-	Vector3 get_joy_gravity(int p_device) const;
-	Vector3 get_joy_gyroscope(int p_device) const;
-
-	void set_joy_motion_sensors_enabled(int p_device, bool p_enable);
-	bool is_joy_motion_sensors_enabled(int p_device) const;
-
-	bool has_joy_motion_sensors(int p_device) const;
-	float get_joy_motion_sensors_rate(int p_device) const;
-
-	void start_joy_motion_sensors_calibration(int p_device);
-	void stop_joy_motion_sensors_calibration(int p_device);
-	void clear_joy_motion_sensors_calibration(int p_device);
-
-	Dictionary get_joy_motion_sensors_calibration(int p_device) const;
-	void set_joy_motion_sensors_calibration(int p_device, const Dictionary &p_calibration_info);
-
-	bool is_joy_motion_sensors_calibrating(int p_device) const;
-	bool is_joy_motion_sensors_calibrated(int p_device) const;
-
-	void set_joy_motion_sensors_rate(int p_device, float p_rate);
-
 	void start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration = 0);
 	void stop_joy_vibration(int p_device);
 	void vibrate_handheld(int p_duration_ms = 500, float p_amplitude = -1.0);
 
-	void set_ignore_joypad_on_unfocused_application(bool p_ignore);
-	bool is_ignoring_joypad_on_unfocused_application() const;
-
 	void set_mouse_position(const Point2 &p_posf);
 
 	void action_press(const StringName &p_action, float p_strength = 1.f);
@@ -450,13 +382,12 @@ public:
 	CursorShape get_default_cursor_shape() const;
 	void set_default_cursor_shape(CursorShape p_shape);
 	CursorShape get_current_cursor_shape() const;
-	void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CursorShape::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
+	void set_custom_mouse_cursor(const Ref<Resource> &p_cursor, CursorShape p_shape = Input::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
 
 	void parse_mapping(const String &p_mapping);
 	void joy_button(int p_device, JoyButton p_button, bool p_pressed);
 	void joy_axis(int p_device, JoyAxis p_axis, float p_value);
 	void joy_hat(int p_device, BitField<HatMask> p_val);
-	void joy_motion_sensors(int p_device, const Vector3 &p_accelerometer, const Vector3 &p_gyroscope);
 
 	void add_joy_mapping(const String &p_mapping, bool p_update_existing = false);
 	void remove_joy_mapping(const String &p_guid);
diff --git a/engine/core/input/input_enums.h b/engine/core/input/input_enums.h
index b0bd1540..27508cce 100644
--- a/engine/core/input/input_enums.h
+++ b/engine/core/input/input_enums.h
@@ -100,12 +100,7 @@ enum class JoyButton {
 	PADDLE3 = 18,
 	PADDLE4 = 19,
 	TOUCHPAD = 20,
-	MISC2 = 21,
-	MISC3 = 22,
-	MISC4 = 23,
-	MISC5 = 24,
-	MISC6 = 25,
-	SDL_MAX = 26,
+	SDL_MAX = 21,
 	MAX = 128, // Android supports up to 36 buttons. DirectInput supports up to 128 buttons.
 };
 
diff --git a/engine/core/input/input_event.cpp b/engine/core/input/input_event.cpp
index 2d6c293c..a3424c34 100644
--- a/engine/core/input/input_event.cpp
+++ b/engine/core/input/input_event.cpp
@@ -32,11 +32,8 @@
 
 #include "core/input/input_map.h"
 #include "core/input/shortcut.h"
-#include "core/math/transform_2d.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/ustring.h"
 
 void InputEvent::set_device(int p_device) {
 	device = p_device;
@@ -134,8 +131,6 @@ void InputEvent::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "device"), "set_device", "get_device");
 
 	BIND_CONSTANT(DEVICE_ID_EMULATION);
-	BIND_CONSTANT(DEVICE_ID_KEYBOARD);
-	BIND_CONSTANT(DEVICE_ID_MOUSE);
 }
 
 ///////////////////////////////////
@@ -319,7 +314,8 @@ void InputEventWithModifiers::_validate_property(PropertyInfo &p_property) const
 		if (p_property.name == "meta_pressed") {
 			p_property.usage ^= PROPERTY_USAGE_STORAGE;
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
-		} else if (p_property.name == "ctrl_pressed") {
+		}
+		if (p_property.name == "ctrl_pressed") {
 			p_property.usage ^= PROPERTY_USAGE_STORAGE;
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 		}
@@ -666,10 +662,6 @@ void InputEventKey::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "echo"), "set_echo", "is_echo");
 }
 
-InputEventKey::InputEventKey() {
-	set_device(DEVICE_ID_KEYBOARD);
-}
-
 ///////////////////////////////////
 
 void InputEventMouse::set_button_mask(BitField<MouseButtonMask> p_mask) {
@@ -712,10 +704,6 @@ void InputEventMouse::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "global_position", PROPERTY_HINT_NONE, "suffix:px"), "set_global_position", "get_global_position");
 }
 
-InputEventMouse::InputEventMouse() {
-	set_device(DEVICE_ID_MOUSE);
-}
-
 ///////////////////////////////////
 
 void InputEventMouseButton::set_factor(float p_factor) {
@@ -1932,7 +1920,7 @@ void InputEventShortcut::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_shortcut", "shortcut"), &InputEventShortcut::set_shortcut);
 	ClassDB::bind_method(D_METHOD("get_shortcut"), &InputEventShortcut::get_shortcut);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, Shortcut::get_class_static()), "set_shortcut", "get_shortcut");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "Shortcut"), "set_shortcut", "get_shortcut");
 }
 
 String InputEventShortcut::as_text() const {
diff --git a/engine/core/input/input_event.h b/engine/core/input/input_event.h
index ec00dfdc..ea163230 100644
--- a/engine/core/input/input_event.h
+++ b/engine/core/input/input_event.h
@@ -32,7 +32,9 @@
 
 #include "core/input/input_enums.h"
 #include "core/io/resource.h"
+#include "core/math/transform_2d.h"
 #include "core/os/keyboard.h"
+#include "core/string/ustring.h"
 #include "core/typedefs.h"
 
 /**
@@ -41,8 +43,6 @@
  */
 
 class Shortcut;
-class String;
-struct Transform2D;
 
 /**
  * Input Modifier Status
@@ -63,8 +63,6 @@ protected:
 public:
 	static constexpr int DEVICE_ID_EMULATION = -1;
 	static constexpr int DEVICE_ID_INTERNAL = -2;
-	static constexpr int DEVICE_ID_KEYBOARD = 16; // IDs 0-15 are reserved for joypads.
-	static constexpr int DEVICE_ID_MOUSE = 32; // IDs 17-31 are reserved for multiple keyboard support in the future.
 
 	void set_device(int p_device);
 	int get_device() const;
@@ -201,8 +199,6 @@ public:
 	static Ref<InputEventKey> create_reference(Key p_keycode_with_modifier_masks, bool p_physical = false);
 
 	InputEventType get_type() const final override { return InputEventType::KEY; }
-
-	InputEventKey();
 };
 
 class InputEventMouse : public InputEventWithModifiers {
@@ -225,8 +221,6 @@ public:
 
 	void set_global_position(const Vector2 &p_global_pos);
 	Vector2 get_global_position() const;
-
-	InputEventMouse();
 };
 
 class InputEventMouseButton : public InputEventMouse {
diff --git a/engine/core/input/input_event_codec.cpp b/engine/core/input/input_event_codec.cpp
index ac24eb45..85c0416a 100644
--- a/engine/core/input/input_event_codec.cpp
+++ b/engine/core/input/input_event_codec.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
 
 enum class BoolShift : uint8_t {
 	SHIFT = 0,
diff --git a/engine/core/input/input_map.compat.inc b/engine/core/input/input_map.compat.inc
index f54e9c9b..da4bd962 100644
--- a/engine/core/input/input_map.compat.inc
+++ b/engine/core/input/input_map.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "input_map.h"
-
-#include "core/object/class_db.h"
-
 void InputMap::_add_action_bind_compat_97281(const StringName &p_action, float p_deadzone) {
 	add_action(p_action, p_deadzone);
 }
diff --git a/engine/core/input/input_map.cpp b/engine/core/input/input_map.cpp
index 7d484f41..d1f2aad9 100644
--- a/engine/core/input/input_map.cpp
+++ b/engine/core/input/input_map.cpp
@@ -33,7 +33,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/variant/typed_array.h"
@@ -206,22 +205,6 @@ void InputMap::action_add_event(const StringName &p_action, RequiredParam<InputE
 		return; // Already added.
 	}
 
-	// Normalize legacy device IDs: before the device ID change,
-	// keyboard and mouse events defaulted to device=0.
-	if (p_event->get_device() == 0) {
-		switch (p_event->get_type()) {
-			case InputEventType::KEY:
-				p_event->set_device(InputEvent::DEVICE_ID_KEYBOARD);
-				break;
-			case InputEventType::MOUSE_BUTTON:
-			case InputEventType::MOUSE_MOTION:
-				p_event->set_device(InputEvent::DEVICE_ID_MOUSE);
-				break;
-			default:
-				break;
-		}
-	}
-
 	input_map[p_action].inputs.push_back(p_event);
 }
 
@@ -336,11 +319,6 @@ void InputMap::load_from_project_settings() {
 		String name = pi.name.substr(pi.name.find_char('/') + 1);
 
 		Dictionary action = GLOBAL_GET(pi.name);
-
-		if (!action.has("events")) {
-			continue;
-		}
-
 		float deadzone = action.has("deadzone") ? (float)action["deadzone"] : DEFAULT_DEADZONE;
 		Array events = action["events"];
 
@@ -926,7 +904,7 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins_with_featur
 }
 
 void InputMap::load_default() {
-	HashMap<String, List<Ref<InputEvent>>> builtins(get_builtins_with_feature_overrides_applied());
+	HashMap<String, List<Ref<InputEvent>>> builtins = get_builtins_with_feature_overrides_applied();
 
 	for (const KeyValue<String, List<Ref<InputEvent>>> &E : builtins) {
 		String name = E.key;
diff --git a/engine/core/input/shortcut.cpp b/engine/core/input/shortcut.cpp
index 36a4e876..72646262 100644
--- a/engine/core/input/shortcut.cpp
+++ b/engine/core/input/shortcut.cpp
@@ -30,8 +30,6 @@
 
 #include "shortcut.h"
 
-#include "core/object/class_db.h"
-
 void Shortcut::set_events(const Array &p_events) {
 	for (int i = 0; i < p_events.size(); i++) {
 		Ref<InputEventShortcut> ies = p_events[i];
diff --git a/engine/core/io/compression.cpp b/engine/core/io/compression.cpp
index 76663d9c..aeed0d27 100644
--- a/engine/core/io/compression.cpp
+++ b/engine/core/io/compression.cpp
@@ -30,9 +30,10 @@
 
 #include "compression.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/zip_io.h"
 
-#include <thirdparty/misc/fastlz.h>
+#include "thirdparty/misc/fastlz.h"
 
 #include <zstd.h>
 
diff --git a/engine/core/io/config_file.cpp b/engine/core/io/config_file.cpp
index dd5c0686..79328707 100644
--- a/engine/core/io/config_file.cpp
+++ b/engine/core/io/config_file.cpp
@@ -31,7 +31,6 @@
 #include "config_file.h"
 
 #include "core/io/file_access_encrypted.h"
-#include "core/object/class_db.h"
 #include "core/string/string_builder.h"
 #include "core/variant/variant_parser.h"
 
diff --git a/engine/core/io/delta_encoding.cpp b/engine/core/io/delta_encoding.cpp
index d4db12a4..9b5242a6 100644
--- a/engine/core/io/delta_encoding.cpp
+++ b/engine/core/io/delta_encoding.cpp
@@ -30,10 +30,6 @@
 
 #include "delta_encoding.h"
 
-#include "core/error/error_list.h"
-#include "core/templates/vector.h"
-#include "core/variant/variant.h" // vformat
-
 #include <zstd.h>
 
 #define ERR_FAIL_ZSTD_V_MSG(m_result, m_retval, m_msg) \
diff --git a/engine/core/io/delta_encoding.h b/engine/core/io/delta_encoding.h
index 7d225305..835f1e84 100644
--- a/engine/core/io/delta_encoding.h
+++ b/engine/core/io/delta_encoding.h
@@ -30,12 +30,7 @@
 
 #pragma once
 
-#include "core/templates/span.h"
-
-#include <cstdint>
-
-template <typename T>
-class Vector;
+#include "core/io/file_access.h"
 
 class DeltaEncoding {
 public:
diff --git a/engine/core/io/dir_access.cpp b/engine/core/io/dir_access.cpp
index dcd24db7..fde1fbb7 100644
--- a/engine/core/io/dir_access.cpp
+++ b/engine/core/io/dir_access.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/templates/local_vector.h"
@@ -265,16 +264,11 @@ int DirAccess::_get_drive_count() {
 	return d->get_drive_count();
 }
 
-String DirAccess::_get_drive_name(int p_idx) {
+String DirAccess::get_drive_name(int p_idx) {
 	Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 	return d->get_drive(p_idx);
 }
 
-String DirAccess::_get_drive_label(int p_idx) {
-	Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	return d->get_drive_label(p_idx);
-}
-
 Error DirAccess::make_dir_absolute(const String &p_dir) {
 	Ref<DirAccess> d = DirAccess::create_for_path(p_dir);
 	return d->make_dir(p_dir);
@@ -651,8 +645,7 @@ void DirAccess::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_directories"), &DirAccess::get_directories);
 	ClassDB::bind_static_method("DirAccess", D_METHOD("get_directories_at", "path"), &DirAccess::get_directories_at);
 	ClassDB::bind_static_method("DirAccess", D_METHOD("get_drive_count"), &DirAccess::_get_drive_count);
-	ClassDB::bind_static_method("DirAccess", D_METHOD("get_drive_name", "idx"), &DirAccess::_get_drive_name);
-	ClassDB::bind_static_method("DirAccess", D_METHOD("get_drive_label", "idx"), &DirAccess::_get_drive_label);
+	ClassDB::bind_static_method("DirAccess", D_METHOD("get_drive_name", "idx"), &DirAccess::get_drive_name);
 	ClassDB::bind_method(D_METHOD("get_current_drive"), &DirAccess::get_current_drive);
 	ClassDB::bind_method(D_METHOD("change_dir", "to_dir"), &DirAccess::change_dir);
 	ClassDB::bind_method(D_METHOD("get_current_dir", "include_drive"), &DirAccess::get_current_dir, DEFVAL(true));
diff --git a/engine/core/io/dir_access.h b/engine/core/io/dir_access.h
index d3dbf030..8d9ee95c 100644
--- a/engine/core/io/dir_access.h
+++ b/engine/core/io/dir_access.h
@@ -91,7 +91,6 @@ public:
 
 	virtual int get_drive_count() = 0;
 	virtual String get_drive(int p_drive) = 0;
-	virtual String get_drive_label(int p_drive) { return String(); }
 	virtual int get_current_drive();
 	virtual bool drives_are_shortcuts();
 
@@ -146,8 +145,7 @@ public:
 	static Ref<DirAccess> create_temp(const String &p_prefix = "", bool p_keep = false, Error *r_error = nullptr);
 
 	static int _get_drive_count();
-	static String _get_drive_name(int p_idx);
-	static String _get_drive_label(int p_idx);
+	static String get_drive_name(int p_idx);
 
 	static Error make_dir_absolute(const String &p_dir);
 	static Error make_dir_recursive_absolute(const String &p_dir);
diff --git a/engine/core/io/dtls_server.cpp b/engine/core/io/dtls_server.cpp
index cbb8bcf0..cdb2235b 100644
--- a/engine/core/io/dtls_server.cpp
+++ b/engine/core/io/dtls_server.cpp
@@ -30,8 +30,6 @@
 
 #include "dtls_server.h"
 
-#include "core/object/class_db.h"
-
 DTLSServer *DTLSServer::create(bool p_notify_postinitialize) {
 	if (_create) {
 		return _create(p_notify_postinitialize);
diff --git a/engine/core/io/dtls_server.h b/engine/core/io/dtls_server.h
index 416a76a0..10965b3b 100644
--- a/engine/core/io/dtls_server.h
+++ b/engine/core/io/dtls_server.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/net_socket.h"
 #include "core/io/packet_peer_dtls.h"
 
 class DTLSServer : public RefCounted {
diff --git a/engine/core/io/file_access.compat.inc b/engine/core/io/file_access.compat.inc
index 933c108f..d340100f 100644
--- a/engine/core/io/file_access.compat.inc
+++ b/engine/core/io/file_access.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "file_access.h"
-
-#include "core/object/class_db.h"
-
 Ref<FileAccess> FileAccess::_open_encrypted_bind_compat_98918(const String &p_path, ModeFlags p_mode_flags, const Vector<uint8_t> &p_key) {
 	return open_encrypted(p_path, p_mode_flags, p_key, Vector<uint8_t>());
 }
@@ -127,4 +123,4 @@ void FileAccess::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_as_text", "skip_cr"), &FileAccess::get_as_text_bind_compat_110867, DEFVAL(false));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/core/io/file_access.cpp b/engine/core/io/file_access.cpp
index 853c764f..caae8ee0 100644
--- a/engine/core/io/file_access.cpp
+++ b/engine/core/io/file_access.cpp
@@ -38,7 +38,6 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 
@@ -426,7 +425,7 @@ class CharBuffer {
 	int64_t written = 0;
 
 	bool grow() {
-		if (vector.resize(Math::next_power_of_2((uint64_t)1 + (uint64_t)written)) != OK) {
+		if (vector.resize(next_power_of_2((uint64_t)1 + (uint64_t)written)) != OK) {
 			return false;
 		}
 
diff --git a/engine/core/io/file_access.h b/engine/core/io/file_access.h
index 2d57e0c3..77fbc999 100644
--- a/engine/core/io/file_access.h
+++ b/engine/core/io/file_access.h
@@ -36,7 +36,6 @@
 #include "core/os/memory.h"
 #include "core/string/ustring.h"
 #include "core/typedefs.h"
-#include "core/variant/type_info.h"
 
 /**
  * Multi-Platform abstraction for accessing to files.
diff --git a/engine/core/io/file_access_compressed.cpp b/engine/core/io/file_access_compressed.cpp
index 1ba926de..8062d97b 100644
--- a/engine/core/io/file_access_compressed.cpp
+++ b/engine/core/io/file_access_compressed.cpp
@@ -30,8 +30,6 @@
 
 #include "file_access_compressed.h"
 
-#include "core/math/math_funcs_binary.h"
-
 void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, uint32_t p_block_size) {
 	magic = p_magic.ascii().get_data();
 	magic = (magic + "    ").substr(0, 4);
@@ -322,7 +320,7 @@ bool FileAccessCompressed::store_buffer(const uint8_t *p_src, uint64_t p_length)
 		write_max = write_pos + (p_length);
 	}
 	if (write_max > write_buffer_size) {
-		write_buffer_size = Math::next_power_of_2(write_max);
+		write_buffer_size = next_power_of_2(write_max);
 		ERR_FAIL_COND_V(buffer.resize(write_buffer_size) != OK, false);
 		write_ptr = buffer.ptrw();
 	}
diff --git a/engine/core/io/file_access_pack.cpp b/engine/core/io/file_access_pack.cpp
index f1124fd5..89967c15 100644
--- a/engine/core/io/file_access_pack.cpp
+++ b/engine/core/io/file_access_pack.cpp
@@ -36,9 +36,9 @@
 #include "core/os/os.h"
 #include "core/version.h"
 
-Error PackedData::add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key) {
+Error PackedData::add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) {
 	for (int i = 0; i < sources.size(); i++) {
-		if (sources[i]->try_open_pack(p_path, p_replace_files, p_offset, p_decryption_key)) {
+		if (sources[i]->try_open_pack(p_path, p_replace_files, p_offset)) {
 			return OK;
 		}
 	}
@@ -46,7 +46,7 @@ Error PackedData::add_pack(const String &p_path, bool p_replace_files, uint64_t
 	return ERR_FILE_UNRECOGNIZED;
 }
 
-void PackedData::add_path(const String &p_pkg_path, const String &p_path, uint64_t p_ofs, uint64_t p_size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files, bool p_encrypted, bool p_bundle, bool p_delta, const String &p_salt) {
+void PackedData::add_path(const String &p_pkg_path, const String &p_path, uint64_t p_ofs, uint64_t p_size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files, bool p_encrypted, bool p_bundle, bool p_delta) {
 	String simplified_path = p_path.simplify_path().trim_prefix("res://");
 	PathMD5 pmd5(simplified_path.md5_buffer());
 
@@ -57,7 +57,6 @@ void PackedData::add_path(const String &p_pkg_path, const String &p_path, uint64
 	pf.bundle = p_bundle;
 	pf.delta = p_delta;
 	pf.pack = p_pkg_path;
-	pf.salt = p_salt;
 	pf.offset = p_ofs;
 	pf.size = p_size;
 	for (int i = 0; i < 16; i++) {
@@ -215,7 +214,7 @@ PackedData::~PackedData() {
 
 //////////////////////////////////////////////////////////////////
 
-bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key) {
+bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) {
 	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
 	if (f.is_null()) {
 		return false;
@@ -292,28 +291,22 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 	uint32_t ver_minor = f->get_32();
 	uint32_t ver_patch = f->get_32(); // Not used for validation.
 
-	ERR_FAIL_COND_V_MSG(version != PACK_FORMAT_VERSION_V4 && version != PACK_FORMAT_VERSION_V3 && version != PACK_FORMAT_VERSION_V2, false, vformat("Pack version unsupported: %d.", version));
+	ERR_FAIL_COND_V_MSG(version != PACK_FORMAT_VERSION_V3 && version != PACK_FORMAT_VERSION_V2, false, vformat("Pack version unsupported: %d.", version));
 	ERR_FAIL_COND_V_MSG(ver_major > GODOT_VERSION_MAJOR || (ver_major == GODOT_VERSION_MAJOR && ver_minor > GODOT_VERSION_MINOR), false, vformat("Pack created with a newer version of the engine: %d.%d.%d.", ver_major, ver_minor, ver_patch));
 
 	uint32_t pack_flags = f->get_32();
 	bool enc_directory = (pack_flags & PACK_DIR_ENCRYPTED);
 	bool rel_filebase = (pack_flags & PACK_REL_FILEBASE); // Note: Always enabled for V3.
 	bool sparse_bundle = (pack_flags & PACK_SPARSE_BUNDLE);
-	String salt;
 
 	uint64_t file_base = f->get_64();
-	if ((version == PACK_FORMAT_VERSION_V4) || (version == PACK_FORMAT_VERSION_V3) || (version == PACK_FORMAT_VERSION_V2 && rel_filebase)) {
+	if ((version == PACK_FORMAT_VERSION_V3) || (version == PACK_FORMAT_VERSION_V2 && rel_filebase)) {
 		file_base += pck_start_pos;
 	}
 
-	if (version == PACK_FORMAT_VERSION_V3 || version == PACK_FORMAT_VERSION_V4) {
-		// V3/V4: Read directory offset and skip reserved part of the header.
+	if (version == PACK_FORMAT_VERSION_V3) {
+		// V3: Read directory offset and skip reserved part of the header.
 		uint64_t dir_offset = f->get_64() + pck_start_pos;
-		if (sparse_bundle && enc_directory && version == PACK_FORMAT_VERSION_V4) {
-			// V4: Read encrypted directory salt.
-			Vector<uint8_t> salt_data = f->get_buffer(32);
-			salt.append_latin1(Span((const char *)salt_data.ptr(), salt_data.size()));
-		}
 		f->seek(dir_offset);
 	} else if (version == PACK_FORMAT_VERSION_V2) {
 		// V2: Directory directly after the header.
@@ -330,18 +323,9 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 		ERR_FAIL_COND_V_MSG(fae.is_null(), false, "Can't open encrypted pack directory.");
 
 		Vector<uint8_t> key;
-#ifdef TOOLS_ENABLED
-		if (!p_decryption_key.is_empty()) {
-			ERR_FAIL_COND_V_MSG(p_decryption_key.size() != 32, false, "Decryption key must be 256-bit.");
-			constexpr uint8_t empty_key[32] = {};
-			if (memcmp(script_encryption_key, empty_key, sizeof(empty_key)) == 0) {
-				key = p_decryption_key;
-			}
-		} else
-#endif
-		{
-			key.resize(32);
-			memcpy(key.ptrw(), script_encryption_key, 32);
+		key.resize(32);
+		for (int i = 0; i < key.size(); i++) {
+			key.write[i] = script_encryption_key[i];
 		}
 
 		Error err = fae->open_and_parse(f, key, FileAccessEncrypted::MODE_READ, false);
@@ -366,15 +350,15 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 		if (flags & PACK_FILE_REMOVAL) { // The file was removed.
 			PackedData::get_singleton()->remove_path(path);
 		} else {
-			PackedData::get_singleton()->add_path(p_path, path, file_base + ofs, size, md5, this, p_replace_files, (flags & PACK_FILE_ENCRYPTED), sparse_bundle, (flags & PACK_FILE_DELTA), salt);
+			PackedData::get_singleton()->add_path(p_path, path, file_base + ofs, size, md5, this, p_replace_files, (flags & PACK_FILE_ENCRYPTED), sparse_bundle, (flags & PACK_FILE_DELTA));
 		}
 	}
 
 	return true;
 }
 
-Ref<FileAccess> PackedSourcePCK::get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key) {
-	Ref<FileAccess> file(memnew(FileAccessPack(p_path, *p_file, p_decryption_key)));
+Ref<FileAccess> PackedSourcePCK::get_file(const String &p_path, PackedData::PackedFile *p_file) {
+	Ref<FileAccess> file(memnew(FileAccessPack(p_path, *p_file)));
 
 	if (PackedData::get_singleton()->has_delta_patches(p_path)) {
 		Ref<FileAccessPatched> file_patched;
@@ -389,7 +373,7 @@ Ref<FileAccess> PackedSourcePCK::get_file(const String &p_path, PackedData::Pack
 
 //////////////////////////////////////////////////////////////////
 
-bool PackedSourceDirectory::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key) {
+bool PackedSourceDirectory::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) {
 	// Load with offset feature only supported for PCK files.
 	ERR_FAIL_COND_V_MSG(p_offset != 0, false, "Invalid PCK data. Note that loading files with a non-zero offset isn't supported with directories.");
 
@@ -400,7 +384,7 @@ bool PackedSourceDirectory::try_open_pack(const String &p_path, bool p_replace_f
 	return true;
 }
 
-Ref<FileAccess> PackedSourceDirectory::get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key) {
+Ref<FileAccess> PackedSourceDirectory::get_file(const String &p_path, PackedData::PackedFile *p_file) {
 	Ref<FileAccess> ret = FileAccess::create_for_path(p_path);
 	ret->reopen(p_path, FileAccess::READ);
 	return ret;
@@ -523,24 +507,12 @@ void FileAccessPack::close() {
 	f = Ref<FileAccess>();
 }
 
-FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file, const Vector<uint8_t> &p_decryption_key) {
+FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file) {
 	path = p_path;
 	pf = p_file;
 	if (pf.bundle) {
 		String simplified_path = p_path.simplify_path();
-		String path_to_load = simplified_path;
-#ifdef TOOLS_ENABLED
-		if (!pf.salt.is_empty()) {
-			path_to_load = pf.pack.get_base_dir().path_join((simplified_path + pf.salt).sha256_text());
-		} else {
-			path_to_load = pf.pack.get_base_dir().path_join(simplified_path.replace("res://", ""));
-		}
-#else
-		if (!pf.salt.is_empty()) {
-			path_to_load = "res://" + (simplified_path + pf.salt).sha256_text();
-		}
-#endif
-		f = FileAccess::open(path_to_load, FileAccess::READ | FileAccess::SKIP_PACK);
+		f = FileAccess::open(simplified_path, FileAccess::READ | FileAccess::SKIP_PACK);
 		ERR_FAIL_COND_MSG(f.is_null(), vformat(R"(Can't open pack-referenced file "%s" from sparse pack "%s".)", simplified_path, pf.pack));
 		off = 0; // For the sparse pack offset is always zero.
 	} else {
@@ -556,18 +528,9 @@ FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFil
 		ERR_FAIL_COND_MSG(fae.is_null(), vformat(R"(Can't open encrypted pack-referenced file "%s" from pack "%s".)", p_path, pf.pack));
 
 		Vector<uint8_t> key;
-#ifdef TOOLS_ENABLED
-		if (!p_decryption_key.is_empty()) {
-			ERR_FAIL_COND_MSG(p_decryption_key.size() != 32, "Decryption key must be 256-bit.");
-			constexpr uint8_t empty_key[32] = {};
-			if (memcmp(script_encryption_key, empty_key, sizeof(empty_key)) == 0) {
-				key = p_decryption_key;
-			}
-		} else
-#endif
-		{
-			key.resize(32);
-			memcpy(key.ptrw(), script_encryption_key, 32);
+		key.resize(32);
+		for (int i = 0; i < key.size(); i++) {
+			key.write[i] = script_encryption_key[i];
 		}
 
 		Error err = fae->open_and_parse(f, key, FileAccessEncrypted::MODE_READ, false);
diff --git a/engine/core/io/file_access_pack.h b/engine/core/io/file_access_pack.h
index 490778f2..121372b5 100644
--- a/engine/core/io/file_access_pack.h
+++ b/engine/core/io/file_access_pack.h
@@ -32,7 +32,6 @@
 
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_uid.h"
 #include "core/string/print_string.h"
 #include "core/templates/hash_set.h"
 #include "core/templates/list.h"
@@ -42,10 +41,9 @@
 
 #define PACK_FORMAT_VERSION_V2 2
 #define PACK_FORMAT_VERSION_V3 3
-#define PACK_FORMAT_VERSION_V4 4
 
 // The current packed file format version number.
-#define PACK_FORMAT_VERSION PACK_FORMAT_VERSION_V4
+#define PACK_FORMAT_VERSION PACK_FORMAT_VERSION_V3
 
 enum PackFlags {
 	PACK_DIR_ENCRYPTED = 1 << 0,
@@ -76,7 +74,6 @@ public:
 		bool encrypted;
 		bool bundle;
 		bool delta;
-		String salt;
 	};
 
 private:
@@ -120,18 +117,9 @@ private:
 	void _free_packed_dirs(PackedDir *p_dir);
 	void _get_file_paths(PackedDir *p_dir, const String &p_parent_dir, HashSet<String> &r_paths) const;
 
-	_FORCE_INLINE_ PathMD5 _get_simplified_path(const String &p_path) {
-		String simplified_path = p_path;
-		if (simplified_path.begins_with("uid://")) {
-			simplified_path = ResourceUID::uid_to_path(simplified_path);
-		}
-		simplified_path = simplified_path.simplify_path().trim_prefix("res://");
-		return PathMD5(simplified_path.md5_buffer());
-	}
-
 public:
 	void add_pack_source(PackSource *p_source);
-	void add_path(const String &p_pkg_path, const String &p_path, uint64_t p_ofs, uint64_t p_size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files, bool p_encrypted = false, bool p_bundle = false, bool p_delta = false, const String &p_salt = String()); // for PackSource
+	void add_path(const String &p_pkg_path, const String &p_path, uint64_t p_ofs, uint64_t p_size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files, bool p_encrypted = false, bool p_bundle = false, bool p_delta = false); // for PackSource
 	void remove_path(const String &p_path);
 	uint8_t *get_file_hash(const String &p_path);
 	Vector<PackedFile> get_delta_patches(const String &p_path) const;
@@ -142,11 +130,11 @@ public:
 	_FORCE_INLINE_ bool is_disabled() const { return disabled; }
 
 	static PackedData *get_singleton() { return singleton; }
-	Error add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>());
+	Error add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset);
 
 	void clear();
 
-	_FORCE_INLINE_ Ref<FileAccess> try_open_path(const String &p_path, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>());
+	_FORCE_INLINE_ Ref<FileAccess> try_open_path(const String &p_path);
 	_FORCE_INLINE_ bool has_path(const String &p_path);
 
 	_FORCE_INLINE_ int64_t get_size(const String &p_path);
@@ -160,23 +148,23 @@ public:
 
 class PackSource {
 public:
-	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) = 0;
-	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) = 0;
+	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) = 0;
+	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) = 0;
 	virtual ~PackSource() {}
 };
 
 class PackedSourcePCK : public PackSource {
 public:
-	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
-	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
+	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
+	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;
 };
 
 class PackedSourceDirectory : public PackSource {
 	void add_directory(const String &p_path, bool p_replace_files);
 
 public:
-	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
-	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
+	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
+	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;
 };
 
 class FileAccessPack : public FileAccess {
@@ -228,11 +216,13 @@ public:
 
 	virtual void close() override;
 
-	FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>());
+	FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file);
 };
 
 int64_t PackedData::get_size(const String &p_path) {
-	HashMap<PathMD5, PackedFile, PathMD5>::Iterator E = files.find(_get_simplified_path(p_path));
+	String simplified_path = p_path.simplify_path();
+	PathMD5 pmd5(simplified_path.md5_buffer());
+	HashMap<PathMD5, PackedFile, PathMD5>::Iterator E = files.find(pmd5);
 	if (!E) {
 		return -1; // File not found.
 	}
@@ -242,17 +232,19 @@ int64_t PackedData::get_size(const String &p_path) {
 	return E->value.size;
 }
 
-Ref<FileAccess> PackedData::try_open_path(const String &p_path, const Vector<uint8_t> &p_decryption_key) {
-	HashMap<PathMD5, PackedFile, PathMD5>::Iterator E = files.find(_get_simplified_path(p_path));
+Ref<FileAccess> PackedData::try_open_path(const String &p_path) {
+	String simplified_path = p_path.simplify_path().trim_prefix("res://");
+	PathMD5 pmd5(simplified_path.md5_buffer());
+	HashMap<PathMD5, PackedFile, PathMD5>::Iterator E = files.find(pmd5);
 	if (!E) {
 		return nullptr; // Not found.
 	}
 
-	return E->value.src->get_file(p_path, &E->value, p_decryption_key);
+	return E->value.src->get_file(p_path, &E->value);
 }
 
 bool PackedData::has_path(const String &p_path) {
-	return files.has(_get_simplified_path(p_path));
+	return files.has(PathMD5(p_path.simplify_path().trim_prefix("res://").md5_buffer()));
 }
 
 bool PackedData::has_directory(const String &p_path) {
diff --git a/engine/core/io/file_access_patched.cpp b/engine/core/io/file_access_patched.cpp
index 4657491a..8c520b68 100644
--- a/engine/core/io/file_access_patched.cpp
+++ b/engine/core/io/file_access_patched.cpp
@@ -30,8 +30,9 @@
 
 #include "file_access_patched.h"
 
+#include "file_access_pack.h"
+
 #include "core/io/delta_encoding.h"
-#include "core/io/file_access_pack.h"
 #include "core/os/os.h"
 
 Error FileAccessPatched::_apply_patch() const {
diff --git a/engine/core/io/file_access_patched.h b/engine/core/io/file_access_patched.h
index 6e6fd99f..62cfb7b8 100644
--- a/engine/core/io/file_access_patched.h
+++ b/engine/core/io/file_access_patched.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/io/file_access.h"
-#include "core/io/file_access_memory.h"
+#include "file_access.h"
+#include "file_access_memory.h"
 
 class FileAccessPatched : public FileAccess {
 	GDSOFTCLASS(FileAccessPatched, FileAccess);
diff --git a/engine/core/io/file_access_zip.cpp b/engine/core/io/file_access_zip.cpp
index 2bb9db76..33bceee5 100644
--- a/engine/core/io/file_access_zip.cpp
+++ b/engine/core/io/file_access_zip.cpp
@@ -144,7 +144,7 @@ unzFile ZipArchive::get_file_handle(const String &p_file) const {
 	return pkg;
 }
 
-bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key) {
+bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset = 0) {
 	// load with offset feature only supported for PCK files
 	ERR_FAIL_COND_V_MSG(p_offset != 0, false, "Invalid PCK data. Note that loading files with a non-zero offset isn't supported with ZIP archives.");
 
@@ -209,7 +209,7 @@ bool ZipArchive::file_exists(const String &p_name) const {
 	return files.has(p_name);
 }
 
-Ref<FileAccess> ZipArchive::get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key) {
+Ref<FileAccess> ZipArchive::get_file(const String &p_path, PackedData::PackedFile *p_file) {
 	return memnew(FileAccessZip(p_path, *p_file));
 }
 
diff --git a/engine/core/io/file_access_zip.h b/engine/core/io/file_access_zip.h
index 53f10444..a3523228 100644
--- a/engine/core/io/file_access_zip.h
+++ b/engine/core/io/file_access_zip.h
@@ -34,7 +34,7 @@
 
 #include "core/io/file_access_pack.h"
 
-#include <thirdparty/minizip/unzip.h>
+#include "thirdparty/minizip/unzip.h"
 
 class ZipArchive : public PackSource {
 public:
@@ -61,8 +61,8 @@ public:
 
 	bool file_exists(const String &p_name) const;
 
-	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
-	Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file, const Vector<uint8_t> &p_decryption_key = Vector<uint8_t>()) override;
+	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
+	Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;
 
 	static ZipArchive *get_singleton();
 
diff --git a/engine/core/io/http_client.cpp b/engine/core/io/http_client.cpp
index d0a2bd01..c452faf1 100644
--- a/engine/core/io/http_client.cpp
+++ b/engine/core/io/http_client.cpp
@@ -30,8 +30,6 @@
 
 #include "http_client.h"
 
-#include "core/object/class_db.h"
-
 const char *HTTPClient::_methods[METHOD_MAX] = {
 	"GET",
 	"HEAD",
@@ -169,7 +167,7 @@ void HTTPClient::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("query_string_from_dict", "fields"), &HTTPClient::query_string_from_dict);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "blocking_mode_enabled"), "set_blocking_mode", "is_blocking_mode_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "connection", PROPERTY_HINT_RESOURCE_TYPE, StreamPeer::get_class_static(), PROPERTY_USAGE_NONE), "set_connection", "get_connection");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "connection", PROPERTY_HINT_RESOURCE_TYPE, "StreamPeer", PROPERTY_USAGE_NONE), "set_connection", "get_connection");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "read_chunk_size", PROPERTY_HINT_RANGE, "256,16777216"), "set_read_chunk_size", "get_read_chunk_size");
 
 	BIND_ENUM_CONSTANT(METHOD_GET);
diff --git a/engine/core/io/http_client.h b/engine/core/io/http_client.h
index d2da1e6a..54a3d9c4 100644
--- a/engine/core/io/http_client.h
+++ b/engine/core/io/http_client.h
@@ -31,7 +31,9 @@
 #pragma once
 
 #include "core/crypto/crypto.h"
+#include "core/io/ip.h"
 #include "core/io/stream_peer.h"
+#include "core/io/stream_peer_tcp.h"
 #include "core/object/ref_counted.h"
 
 class HTTPClient : public RefCounted {
diff --git a/engine/core/io/http_client_tcp.cpp b/engine/core/io/http_client_tcp.cpp
index 13f487e1..f6495585 100644
--- a/engine/core/io/http_client_tcp.cpp
+++ b/engine/core/io/http_client_tcp.cpp
@@ -32,10 +32,7 @@
 
 #include "http_client_tcp.h"
 
-#include "core/io/stream_peer_tcp.h"
 #include "core/io/stream_peer_tls.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/version.h"
 
 HTTPClient *HTTPClientTCP::_create_func(bool p_notify_postinitialize) {
diff --git a/engine/core/io/http_client_tcp.h b/engine/core/io/http_client_tcp.h
index 80dd7043..84f9bcc1 100644
--- a/engine/core/io/http_client_tcp.h
+++ b/engine/core/io/http_client_tcp.h
@@ -30,11 +30,9 @@
 
 #pragma once
 
-#include "core/crypto/crypto.h"
-#include "core/io/http_client.h"
-#include "core/io/ip.h"
+#include "http_client.h"
 
-class StreamPeerTCP;
+#include "core/crypto/crypto.h"
 
 class HTTPClientTCP : public HTTPClient {
 	GDSOFTCLASS(HTTPClientTCP, HTTPClient);
diff --git a/engine/core/io/image.compat.inc b/engine/core/io/image.compat.inc
deleted file mode 100644
index c60ff938..00000000
--- a/engine/core/io/image.compat.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-/**************************************************************************/
-/*  image.compat.inc                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "core/object/class_db.h"
-
-Vector<uint8_t> Image::_save_exr_to_buffer_bind_compat_117800(bool p_grayscale) const {
-	return save_exr_to_buffer(p_grayscale);
-}
-
-Error Image::_save_exr_bind_compat_117800(const String &p_path, bool p_grayscale) const {
-	return save_exr(p_path, p_grayscale);
-}
-
-void Image::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("save_exr", "path", "grayscale"), &Image::_save_exr_bind_compat_117800, DEFVAL(false));
-	ClassDB::bind_compatibility_method(D_METHOD("save_exr_to_buffer", "grayscale"), &Image::_save_exr_to_buffer_bind_compat_117800, DEFVAL(false));
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/core/io/image.cpp b/engine/core/io/image.cpp
index 55d138b9..47e7342e 100644
--- a/engine/core/io/image.cpp
+++ b/engine/core/io/image.cpp
@@ -29,14 +29,12 @@
 /**************************************************************************/
 
 #include "image.h"
-#include "image.compat.inc"
 
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/dictionary.h"
 
@@ -1233,14 +1231,14 @@ static void _overlay(const uint8_t *__restrict p_src, uint8_t *__restrict p_dst,
 }
 
 bool Image::is_size_po2() const {
-	return Math::is_power_of_2(width) && Math::is_power_of_2(height);
+	return is_power_of_2(width) && is_power_of_2(height);
 }
 
 void Image::resize_to_po2(bool p_square, Interpolation p_interpolation) {
 	ERR_FAIL_COND_MSG(is_compressed(), "Cannot resize in compressed image formats.");
 
-	int w = Math::next_power_of_2((uint32_t)width);
-	int h = Math::next_power_of_2((uint32_t)height);
+	int w = next_power_of_2((uint32_t)width);
+	int h = next_power_of_2((uint32_t)height);
 	if (p_square) {
 		w = h = MAX(w, h);
 	}
@@ -1257,6 +1255,9 @@ void Image::resize_to_po2(bool p_square, Interpolation p_interpolation) {
 void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
 	ERR_FAIL_COND_MSG(data.is_empty(), "Cannot resize image before creating it, use set_data() first.");
 	ERR_FAIL_COND_MSG(is_compressed(), "Cannot resize in compressed image formats.");
+
+	bool mipmap_aware = p_interpolation == INTERPOLATE_TRILINEAR /* || p_interpolation == INTERPOLATE_TRICUBIC */;
+
 	ERR_FAIL_COND_MSG(p_width <= 0, "Image width must be greater than 0.");
 	ERR_FAIL_COND_MSG(p_height <= 0, "Image height must be greater than 0.");
 	ERR_FAIL_COND_MSG(p_width > MAX_WIDTH, vformat("Image width cannot be greater than %d pixels.", MAX_WIDTH));
@@ -1267,19 +1268,9 @@ void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
 		return;
 	}
 
-	// Convert the image to 'standard' RGB(A) formats that may be resized.
-	Format original_format = format;
-	if (original_format == FORMAT_RGB565 || original_format == FORMAT_RGBA4444) {
-		convert(FORMAT_RGBA8);
-	} else if (original_format == FORMAT_RGBE9995) {
-		convert(FORMAT_RGBH);
-	}
-
 	Image dst(p_width, p_height, false, format);
 
 	// Setup mipmap-aware scaling
-	bool mipmap_aware = p_interpolation == INTERPOLATE_TRILINEAR /* || p_interpolation == INTERPOLATE_TRICUBIC */;
-
 	Image dst2;
 	int mip1 = 0;
 	int mip2 = 0;
@@ -1623,11 +1614,6 @@ void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
 	}
 
 	_copy_internals_from(dst);
-
-	// Reconvert the image to its original format.
-	if (original_format != format) {
-		convert(original_format);
-	}
 }
 
 void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) {
@@ -2614,24 +2600,24 @@ void Image::initialize_data(const char **p_xpm) {
 #define DETECT_ALPHA_MAX_THRESHOLD 254
 #define DETECT_ALPHA_MIN_THRESHOLD 2
 
-#define DETECT_ALPHA(m_value) \
-	{ \
-		uint8_t value = m_value; \
-		if (value < DETECT_ALPHA_MIN_THRESHOLD) \
-			bit = true; \
+#define DETECT_ALPHA(m_value)                          \
+	{                                                  \
+		uint8_t value = m_value;                       \
+		if (value < DETECT_ALPHA_MIN_THRESHOLD)        \
+			bit = true;                                \
 		else if (value < DETECT_ALPHA_MAX_THRESHOLD) { \
-			detected = true; \
-			break; \
-		} \
+			detected = true;                           \
+			break;                                     \
+		}                                              \
 	}
 
 #define DETECT_NON_ALPHA(m_value) \
-	{ \
-		uint8_t value = m_value; \
-		if (value > 0) { \
-			detected = true; \
-			break; \
-		} \
+	{                             \
+		uint8_t value = m_value;  \
+		if (value > 0) {          \
+			detected = true;      \
+			break;                \
+		}                         \
 	}
 
 bool Image::is_invisible() const {
@@ -2821,18 +2807,19 @@ Vector<uint8_t> Image::save_jpg_to_buffer(float p_quality) const {
 	return save_jpg_buffer_func(Ref<Image>((Image *)this), p_quality);
 }
 
-Error Image::save_exr(const String &p_path, bool p_grayscale, bool p_color_image, float p_max_value) const {
+Error Image::save_exr(const String &p_path, bool p_grayscale) const {
 	if (save_exr_func == nullptr) {
 		return ERR_UNAVAILABLE;
 	}
-	return save_exr_func(p_path, Ref<Image>((Image *)this), p_grayscale, p_color_image, p_max_value);
+
+	return save_exr_func(p_path, Ref<Image>((Image *)this), p_grayscale);
 }
 
-Vector<uint8_t> Image::save_exr_to_buffer(bool p_grayscale, bool p_color_image, float p_max_value) const {
+Vector<uint8_t> Image::save_exr_to_buffer(bool p_grayscale) const {
 	if (save_exr_buffer_func == nullptr) {
 		return Vector<uint8_t>();
 	}
-	return save_exr_buffer_func(Ref<Image>((Image *)this), p_grayscale, p_color_image, p_max_value);
+	return save_exr_buffer_func(Ref<Image>((Image *)this), p_grayscale);
 }
 
 Error Image::save_dds(const String &p_path) const {
@@ -3879,8 +3866,8 @@ void Image::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("save_png_to_buffer"), &Image::save_png_to_buffer);
 	ClassDB::bind_method(D_METHOD("save_jpg", "path", "quality"), &Image::save_jpg, DEFVAL(0.75));
 	ClassDB::bind_method(D_METHOD("save_jpg_to_buffer", "quality"), &Image::save_jpg_to_buffer, DEFVAL(0.75));
-	ClassDB::bind_method(D_METHOD("save_exr", "path", "grayscale", "color_image", "max_linear_value"), &Image::save_exr, DEFVAL(false), DEFVAL(false), DEFVAL(-1.0));
-	ClassDB::bind_method(D_METHOD("save_exr_to_buffer", "grayscale", "color_image", "max_linear_value"), &Image::save_exr_to_buffer, DEFVAL(false), DEFVAL(false), DEFVAL(-1.0));
+	ClassDB::bind_method(D_METHOD("save_exr", "path", "grayscale"), &Image::save_exr, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("save_exr_to_buffer", "grayscale"), &Image::save_exr_to_buffer, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("save_dds", "path"), &Image::save_dds);
 	ClassDB::bind_method(D_METHOD("save_dds_to_buffer"), &Image::save_dds_to_buffer);
 
diff --git a/engine/core/io/image.h b/engine/core/io/image.h
index 30d64e30..933478e4 100644
--- a/engine/core/io/image.h
+++ b/engine/core/io/image.h
@@ -55,8 +55,8 @@ typedef Ref<Image> (*ScalableImageMemLoadFunc)(const uint8_t *p_data, int p_size
 typedef Error (*SaveWebPFunc)(const String &p_path, const Ref<Image> &p_img, const bool p_lossy, const float p_quality);
 typedef Vector<uint8_t> (*SaveWebPBufferFunc)(const Ref<Image> &p_img, const bool p_lossy, const float p_quality);
 
-typedef Error (*SaveEXRFunc)(const String &p_path, const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value);
-typedef Vector<uint8_t> (*SaveEXRBufferFunc)(const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value);
+typedef Error (*SaveEXRFunc)(const String &p_path, const Ref<Image> &p_img, bool p_grayscale);
+typedef Vector<uint8_t> (*SaveEXRBufferFunc)(const Ref<Image> &p_img, bool p_grayscale);
 
 typedef Error (*SaveDDSFunc)(const String &p_path, const Ref<Image> &p_img);
 typedef Vector<uint8_t> (*SaveDDSBufferFunc)(const Ref<Image> &p_img);
@@ -257,12 +257,6 @@ protected:
 
 	static void _bind_methods();
 
-#ifndef DISABLE_DEPRECATED
-	Vector<uint8_t> _save_exr_to_buffer_bind_compat_117800(bool p_grayscale = false) const;
-	Error _save_exr_bind_compat_117800(const String &p_path, bool p_grayscale = false) const;
-	static void _bind_compatibility_methods();
-#endif
-
 private:
 	Format format = FORMAT_L8;
 	Vector<uint8_t> data;
@@ -367,9 +361,9 @@ public:
 	Error save_dds(const String &p_path) const;
 	Vector<uint8_t> save_png_to_buffer() const;
 	Vector<uint8_t> save_jpg_to_buffer(float p_quality = 0.75) const;
-	Vector<uint8_t> save_exr_to_buffer(bool p_grayscale = false, bool p_color_image = false, float p_max_value = -1.0f) const;
+	Vector<uint8_t> save_exr_to_buffer(bool p_grayscale = false) const;
 	Vector<uint8_t> save_dds_to_buffer() const;
-	Error save_exr(const String &p_path, bool p_grayscale = false, bool p_color_image = false, float p_max_value = -1.0f) const;
+	Error save_exr(const String &p_path, bool p_grayscale = false) const;
 	Error save_webp(const String &p_path, const bool p_lossy = false, const float p_quality = 0.75f) const;
 	Vector<uint8_t> save_webp_to_buffer(const bool p_lossy = false, const float p_quality = 0.75f) const;
 
diff --git a/engine/core/io/image_loader.cpp b/engine/core/io/image_loader.cpp
index 83298371..df36c515 100644
--- a/engine/core/io/image_loader.cpp
+++ b/engine/core/io/image_loader.cpp
@@ -30,8 +30,6 @@
 
 #include "image_loader.h"
 
-#include "core/object/class_db.h"
-
 void ImageFormatLoader::_bind_methods() {
 	BIND_BITFIELD_FLAG(FLAG_NONE);
 	BIND_BITFIELD_FLAG(FLAG_FORCE_LINEAR);
@@ -139,3 +137,74 @@ void ImageLoader::cleanup() {
 		remove_image_format_loader(loader[0]);
 	}
 }
+
+/////////////////
+
+Ref<Resource> ResourceFormatLoaderImage::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
+	if (f.is_null()) {
+		if (r_error) {
+			*r_error = ERR_CANT_OPEN;
+		}
+		return Ref<Resource>();
+	}
+
+	uint8_t header[4] = { 0, 0, 0, 0 };
+	f->get_buffer(header, 4);
+
+	bool unrecognized = header[0] != 'G' || header[1] != 'D' || header[2] != 'I' || header[3] != 'M';
+	if (unrecognized) {
+		if (r_error) {
+			*r_error = ERR_FILE_UNRECOGNIZED;
+		}
+		ERR_FAIL_V(Ref<Resource>());
+	}
+
+	String extension = f->get_pascal_string();
+
+	int idx = -1;
+
+	for (int i = 0; i < ImageLoader::loader.size(); i++) {
+		if (ImageLoader::loader[i]->recognize(extension)) {
+			idx = i;
+			break;
+		}
+	}
+
+	if (idx == -1) {
+		if (r_error) {
+			*r_error = ERR_FILE_UNRECOGNIZED;
+		}
+		ERR_FAIL_V(Ref<Resource>());
+	}
+
+	Ref<Image> image;
+	image.instantiate();
+
+	Error err = ImageLoader::loader.write[idx]->load_image(image, f);
+
+	if (err != OK) {
+		if (r_error) {
+			*r_error = err;
+		}
+		return Ref<Resource>();
+	}
+
+	if (r_error) {
+		*r_error = OK;
+	}
+
+	return image;
+}
+
+void ResourceFormatLoaderImage::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("image");
+}
+
+bool ResourceFormatLoaderImage::handles_type(const String &p_type) const {
+	return p_type == "Image";
+}
+
+String ResourceFormatLoaderImage::get_resource_type(const String &p_path) const {
+	return p_path.get_extension().to_lower() == "image" ? "Image" : String();
+}
diff --git a/engine/core/io/image_loader.h b/engine/core/io/image_loader.h
index 12441cca..3ae09c5f 100644
--- a/engine/core/io/image_loader.h
+++ b/engine/core/io/image_loader.h
@@ -30,12 +30,14 @@
 
 #pragma once
 
+#include "core/core_bind.h"
 #include "core/io/file_access.h"
 #include "core/io/image.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/io/resource_loader.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
-#include "core/variant/type_info.h"
+#include "core/variant/binder_common.h"
 
 class ImageLoader;
 
@@ -97,3 +99,13 @@ public:
 
 	static void cleanup();
 };
+
+class ResourceFormatLoaderImage : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderImage, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
diff --git a/engine/core/io/image_resource_format.cpp b/engine/core/io/image_resource_format.cpp
deleted file mode 100644
index 244350f6..00000000
--- a/engine/core/io/image_resource_format.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/**************************************************************************/
-/*  image_resource_format.cpp                                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "image_resource_format.h"
-
-Ref<Resource> ResourceFormatLoaderImage::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ);
-	if (f.is_null()) {
-		if (r_error) {
-			*r_error = ERR_CANT_OPEN;
-		}
-		return Ref<Resource>();
-	}
-
-	uint8_t header[4] = { 0, 0, 0, 0 };
-	f->get_buffer(header, 4);
-
-	bool unrecognized = header[0] != 'G' || header[1] != 'D' || header[2] != 'I' || header[3] != 'M';
-	if (unrecognized) {
-		if (r_error) {
-			*r_error = ERR_FILE_UNRECOGNIZED;
-		}
-		ERR_FAIL_V(Ref<Resource>());
-	}
-
-	String extension = f->get_pascal_string();
-
-	int idx = -1;
-
-	for (int i = 0; i < ImageLoader::loader.size(); i++) {
-		if (ImageLoader::loader[i]->recognize(extension)) {
-			idx = i;
-			break;
-		}
-	}
-
-	if (idx == -1) {
-		if (r_error) {
-			*r_error = ERR_FILE_UNRECOGNIZED;
-		}
-		ERR_FAIL_V(Ref<Resource>());
-	}
-
-	Ref<Image> image;
-	image.instantiate();
-
-	Error err = ImageLoader::loader.write[idx]->load_image(image, f);
-
-	if (err != OK) {
-		if (r_error) {
-			*r_error = err;
-		}
-		return Ref<Resource>();
-	}
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return image;
-}
-
-void ResourceFormatLoaderImage::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("image");
-}
-
-bool ResourceFormatLoaderImage::handles_type(const String &p_type) const {
-	return p_type == "Image";
-}
-
-String ResourceFormatLoaderImage::get_resource_type(const String &p_path) const {
-	return p_path.get_extension().to_lower() == "image" ? "Image" : String();
-}
diff --git a/engine/core/io/image_resource_format.h b/engine/core/io/image_resource_format.h
deleted file mode 100644
index 7d76de0a..00000000
--- a/engine/core/io/image_resource_format.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**************************************************************************/
-/*  image_resource_format.h                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/image_loader.h"
-#include "core/io/resource_loader.h"
-
-class ResourceFormatLoaderImage : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderImage, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
diff --git a/engine/core/io/ip.cpp b/engine/core/io/ip.cpp
index ec7c72d2..94256a7b 100644
--- a/engine/core/io/ip.cpp
+++ b/engine/core/io/ip.cpp
@@ -30,7 +30,6 @@
 
 #include "ip.h"
 
-#include "core/object/class_db.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/templates/hash_map.h"
@@ -206,7 +205,7 @@ IPAddress IP::get_resolve_item_address(ResolverID p_id) const {
 		return IPAddress();
 	}
 
-	List<IPAddress> res(resolver->queue[p_id].response);
+	List<IPAddress> res = resolver->queue[p_id].response;
 
 	for (const IPAddress &E : res) {
 		if (E.is_valid()) {
@@ -225,7 +224,7 @@ Array IP::get_resolve_item_addresses(ResolverID p_id) const {
 		return Array();
 	}
 
-	List<IPAddress> res(resolver->queue[p_id].response);
+	List<IPAddress> res = resolver->queue[p_id].response;
 
 	Array result;
 	for (const IPAddress &E : res) {
diff --git a/engine/core/io/ip.h b/engine/core/io/ip.h
index f9de6316..bab9625c 100644
--- a/engine/core/io/ip.h
+++ b/engine/core/io/ip.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/ip_address.h"
-#include "core/variant/type_info.h"
+#include "core/os/os.h"
 
 template <typename T>
 class TypedArray;
diff --git a/engine/core/io/json.cpp b/engine/core/io/json.cpp
index e055346c..857695e2 100644
--- a/engine/core/io/json.cpp
+++ b/engine/core/io/json.cpp
@@ -30,8 +30,8 @@
 
 #include "json.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
+#include "core/config/engine.h"
+#include "core/io/file_access.h"
 #include "core/object/script_language.h"
 #include "core/variant/container_type_validate.h"
 
@@ -155,11 +155,6 @@ void JSON::_stringify(String &r_result, const Variant &p_var, const String &p_in
 				ERR_FAIL_MSG("Converting circular structure to JSON.");
 			}
 
-			if (d.is_empty()) {
-				r_result += "{}";
-				return;
-			}
-
 			r_result += '{';
 			r_result += end_statement;
 			p_markers.insert(d.id());
@@ -673,10 +668,10 @@ static bool _encode_container_type(Dictionary &r_dict, const String &p_key, cons
 }
 
 Variant JSON::_from_native(const Variant &p_variant, bool p_full_objects, int p_depth) {
-#define RETURN_ARGS \
-	Dictionary ret; \
+#define RETURN_ARGS                                           \
+	Dictionary ret;                                           \
 	ret[TYPE] = Variant::get_type_name(p_variant.get_type()); \
-	ret[ARGS] = args; \
+	ret[ARGS] = args;                                         \
 	return ret
 
 	switch (p_variant.get_type()) {
@@ -1098,18 +1093,18 @@ Variant JSON::_to_native(const Variant &p_json, bool p_allow_objects, int p_dept
 
 			ERR_FAIL_COND_V(!dict.has(TYPE), Variant());
 
-#define LOAD_ARGS() \
+#define LOAD_ARGS()                              \
 	ERR_FAIL_COND_V(!dict.has(ARGS), Variant()); \
 	const Array args = dict[ARGS]
 
-#define LOAD_ARGS_CHECK_SIZE(m_size) \
+#define LOAD_ARGS_CHECK_SIZE(m_size)             \
 	ERR_FAIL_COND_V(!dict.has(ARGS), Variant()); \
-	const Array args = dict[ARGS]; \
+	const Array args = dict[ARGS];               \
 	ERR_FAIL_COND_V(args.size() != (m_size), Variant())
 
-#define LOAD_ARGS_CHECK_FACTOR(m_factor) \
+#define LOAD_ARGS_CHECK_FACTOR(m_factor)         \
 	ERR_FAIL_COND_V(!dict.has(ARGS), Variant()); \
-	const Array args = dict[ARGS]; \
+	const Array args = dict[ARGS];               \
 	ERR_FAIL_COND_V(args.size() % (m_factor) != 0, Variant())
 
 			switch (Variant::get_type_by_name(dict[TYPE])) {
@@ -1550,3 +1545,88 @@ Variant JSON::_to_native(const Variant &p_json, bool p_allow_objects, int p_dept
 #undef VALUE_TYPE
 #undef ARGS
 #undef PROPS
+
+////////////
+
+Ref<Resource> ResourceFormatLoaderJSON::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	if (r_error) {
+		*r_error = ERR_FILE_CANT_OPEN;
+	}
+
+	if (!FileAccess::exists(p_path)) {
+		if (r_error) {
+			*r_error = ERR_FILE_NOT_FOUND;
+		}
+		return Ref<Resource>();
+	}
+
+	Ref<JSON> json;
+	json.instantiate();
+
+	Error err = json->parse(FileAccess::get_file_as_string(p_path), Engine::get_singleton()->is_editor_hint());
+	if (err != OK) {
+		String err_text = "Error parsing JSON file at '" + p_path + "', on line " + itos(json->get_error_line()) + ": " + json->get_error_message();
+
+		if (Engine::get_singleton()->is_editor_hint()) {
+			// If running on editor, still allow opening the JSON so the code editor can edit it.
+			WARN_PRINT(err_text);
+		} else {
+			if (r_error) {
+				*r_error = err;
+			}
+			ERR_PRINT(err_text);
+			return Ref<Resource>();
+		}
+	}
+
+	if (r_error) {
+		*r_error = OK;
+	}
+
+	return json;
+}
+
+void ResourceFormatLoaderJSON::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("json");
+}
+
+bool ResourceFormatLoaderJSON::handles_type(const String &p_type) const {
+	return (p_type == "JSON");
+}
+
+String ResourceFormatLoaderJSON::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("json")) {
+		return "JSON";
+	}
+	return "";
+}
+
+Error ResourceFormatSaverJSON::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Ref<JSON> json = p_resource;
+	ERR_FAIL_COND_V(json.is_null(), ERR_INVALID_PARAMETER);
+
+	String source = json->get_parsed_text().is_empty() ? JSON::stringify(json->get_data(), "\t", false, true) : json->get_parsed_text();
+
+	Error err;
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
+
+	ERR_FAIL_COND_V_MSG(err, err, vformat("Cannot save json '%s'.", p_path));
+
+	file->store_string(source);
+	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
+		return ERR_CANT_CREATE;
+	}
+
+	return OK;
+}
+
+void ResourceFormatSaverJSON::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	Ref<JSON> json = p_resource;
+	if (json.is_valid()) {
+		p_extensions->push_back("json");
+	}
+}
+
+bool ResourceFormatSaverJSON::recognize(const Ref<Resource> &p_resource) const {
+	return p_resource->get_class_name() == "JSON"; //only json, not inherited
+}
diff --git a/engine/core/io/json.h b/engine/core/io/json.h
index 9346a75b..34a27f30 100644
--- a/engine/core/io/json.h
+++ b/engine/core/io/json.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "core/variant/variant.h"
 
 class JSON : public Resource {
@@ -103,3 +105,26 @@ public:
 	_FORCE_INLINE_ int get_error_line() const { return err_line; }
 	_FORCE_INLINE_ String get_error_message() const { return err_str; }
 };
+
+class ResourceFormatLoaderJSON : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderJSON, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+
+	// Treat JSON as a text file, do not generate a `*.json.uid` file.
+	virtual ResourceUID::ID get_resource_uid(const String &p_path) const override { return ResourceUID::INVALID_ID; }
+	virtual bool has_custom_uid_support() const override { return true; }
+};
+
+class ResourceFormatSaverJSON : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverJSON, ResourceFormatSaver);
+
+public:
+	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	virtual bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/core/io/json_resource_format.cpp b/engine/core/io/json_resource_format.cpp
deleted file mode 100644
index 7955fbf9..00000000
--- a/engine/core/io/json_resource_format.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/**************************************************************************/
-/*  json_resource_format.cpp                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "json_resource_format.h"
-
-#include "core/config/engine.h"
-#include "core/io/file_access.h"
-#include "core/io/json.h"
-
-Ref<Resource> ResourceFormatLoaderJSON::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	if (!FileAccess::exists(p_path)) {
-		if (r_error) {
-			*r_error = ERR_FILE_NOT_FOUND;
-		}
-		return Ref<Resource>();
-	}
-
-	Ref<JSON> json;
-	json.instantiate();
-
-	Error err = json->parse(FileAccess::get_file_as_string(p_path), Engine::get_singleton()->is_editor_hint());
-	if (err != OK) {
-		String err_text = "Error parsing JSON file at '" + p_path + "', on line " + itos(json->get_error_line()) + ": " + json->get_error_message();
-
-		if (Engine::get_singleton()->is_editor_hint()) {
-			// If running on editor, still allow opening the JSON so the code editor can edit it.
-			WARN_PRINT(err_text);
-		} else {
-			if (r_error) {
-				*r_error = err;
-			}
-			ERR_PRINT(err_text);
-			return Ref<Resource>();
-		}
-	}
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return json;
-}
-
-void ResourceFormatLoaderJSON::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("json");
-}
-
-bool ResourceFormatLoaderJSON::handles_type(const String &p_type) const {
-	return (p_type == "JSON");
-}
-
-String ResourceFormatLoaderJSON::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("json")) {
-		return "JSON";
-	}
-	return "";
-}
-
-Error ResourceFormatSaverJSON::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Ref<JSON> json = p_resource;
-	ERR_FAIL_COND_V(json.is_null(), ERR_INVALID_PARAMETER);
-
-	String source = json->get_parsed_text().is_empty() ? JSON::stringify(json->get_data(), "\t", false, true) : json->get_parsed_text();
-
-	Error err;
-	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
-
-	ERR_FAIL_COND_V_MSG(err, err, vformat("Cannot save json '%s'.", p_path));
-
-	file->store_string(source);
-	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
-		return ERR_CANT_CREATE;
-	}
-
-	return OK;
-}
-
-void ResourceFormatSaverJSON::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	Ref<JSON> json = p_resource;
-	if (json.is_valid()) {
-		p_extensions->push_back("json");
-	}
-}
-
-bool ResourceFormatSaverJSON::recognize(const Ref<Resource> &p_resource) const {
-	return p_resource->get_class_name() == "JSON"; //only json, not inherited
-}
diff --git a/engine/core/io/json_resource_format.h b/engine/core/io/json_resource_format.h
deleted file mode 100644
index 3867a92b..00000000
--- a/engine/core/io/json_resource_format.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**************************************************************************/
-/*  json_resource_format.h                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/io/resource_uid.h"
-
-class ResourceFormatLoaderJSON : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderJSON, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-
-	// Treat JSON as a text file, do not generate a `*.json.uid` file.
-	virtual ResourceUID::ID get_resource_uid(const String &p_path) const override { return ResourceUID::INVALID_ID; }
-	virtual bool has_custom_uid_support() const override { return true; }
-};
-
-class ResourceFormatSaverJSON : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverJSON, ResourceFormatSaver);
-
-public:
-	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	virtual bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/core/io/logger.cpp b/engine/core/io/logger.cpp
index feab968a..c9625354 100644
--- a/engine/core/io/logger.cpp
+++ b/engine/core/io/logger.cpp
@@ -39,8 +39,6 @@
 
 #include "modules/modules_enabled.gen.h" // For regex.
 
-#include <cstdio>
-
 #ifdef MODULE_REGEX_ENABLED
 #include "modules/regex/regex.h"
 #endif // MODULE_REGEX_ENABLED
diff --git a/engine/core/io/marshalls.cpp b/engine/core/io/marshalls.cpp
index 4579fb93..6eb7e2db 100644
--- a/engine/core/io/marshalls.cpp
+++ b/engine/core/io/marshalls.cpp
@@ -31,7 +31,6 @@
 #include "marshalls.h"
 
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 #include "core/variant/container_type_validate.h"
@@ -1520,9 +1519,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
 					encode_uint32(utf8.length(), buf);
 					buf += 4;
 					memcpy(buf, utf8.get_data(), utf8.length());
-					buf += utf8.length();
-					memset(buf, 0, pad);
-					buf += pad;
+					buf += pad + utf8.length();
 				}
 
 				r_len += 4 + utf8.length() + pad;
diff --git a/engine/core/io/missing_resource.cpp b/engine/core/io/missing_resource.cpp
index e7b598d3..3bb7c8e9 100644
--- a/engine/core/io/missing_resource.cpp
+++ b/engine/core/io/missing_resource.cpp
@@ -30,8 +30,6 @@
 
 #include "missing_resource.h"
 
-#include "core/object/class_db.h"
-
 bool MissingResource::_set(const StringName &p_name, const Variant &p_value) {
 	if (is_recording_properties()) {
 		properties.insert(p_name, p_value);
diff --git a/engine/core/io/net_socket.cpp b/engine/core/io/net_socket.cpp
index e5bdc4d1..f7a2c5e3 100644
--- a/engine/core/io/net_socket.cpp
+++ b/engine/core/io/net_socket.cpp
@@ -30,9 +30,9 @@
 
 #include "net_socket.h"
 
-Ref<NetSocket> (*NetSocket::_create)() = nullptr;
+NetSocket *(*NetSocket::_create)() = nullptr;
 
-Ref<NetSocket> NetSocket::create() {
+NetSocket *NetSocket::create() {
 	if (_create) {
 		return _create();
 	}
diff --git a/engine/core/io/net_socket.h b/engine/core/io/net_socket.h
index 40a28169..3ee3d284 100644
--- a/engine/core/io/net_socket.h
+++ b/engine/core/io/net_socket.h
@@ -37,10 +37,10 @@ class NetSocket : public RefCounted {
 	GDSOFTCLASS(NetSocket, RefCounted);
 
 protected:
-	static Ref<NetSocket> (*_create)();
+	static NetSocket *(*_create)();
 
 public:
-	static Ref<NetSocket> create();
+	static NetSocket *create();
 
 	enum PollType : int32_t {
 		POLL_TYPE_IN,
diff --git a/engine/core/io/packed_data_container.cpp b/engine/core/io/packed_data_container.cpp
index 701bb9c1..222e1679 100644
--- a/engine/core/io/packed_data_container.cpp
+++ b/engine/core/io/packed_data_container.cpp
@@ -31,7 +31,6 @@
 #include "packed_data_container.h"
 
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 
 Variant PackedDataContainer::getvar(const Variant &p_key, bool *r_valid) const {
 	bool err = false;
diff --git a/engine/core/io/packet_peer.cpp b/engine/core/io/packet_peer.cpp
index f5e6b8d5..d4b9cdb7 100644
--- a/engine/core/io/packet_peer.cpp
+++ b/engine/core/io/packet_peer.cpp
@@ -32,14 +32,13 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 
 /* helpers / binders */
 
 void PacketPeer::set_encode_buffer_max_size(int p_max_size) {
 	ERR_FAIL_COND_MSG(p_max_size < 1024, "Max encode buffer must be at least 1024 bytes");
 	ERR_FAIL_COND_MSG(p_max_size > 256 * 1024 * 1024, "Max encode buffer cannot exceed 256 MiB");
-	encode_buffer_max_size = Math::next_power_of_2((uint32_t)p_max_size);
+	encode_buffer_max_size = next_power_of_2((uint32_t)p_max_size);
 	encode_buffer.clear();
 }
 
@@ -104,7 +103,7 @@ Error PacketPeer::put_var(const Variant &p_packet, bool p_full_objects) {
 
 	if (unlikely(encode_buffer.size() < len)) {
 		encode_buffer.resize(0); // Avoid realloc
-		encode_buffer.resize(Math::next_power_of_2((uint32_t)len));
+		encode_buffer.resize(next_power_of_2((uint32_t)len));
 	}
 
 	uint8_t *w = encode_buffer.ptrw();
@@ -190,7 +189,7 @@ void PacketPeerStream::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "input_buffer_max_size"), "set_input_buffer_max_size", "get_input_buffer_max_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "output_buffer_max_size"), "set_output_buffer_max_size", "get_output_buffer_max_size");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream_peer", PROPERTY_HINT_RESOURCE_TYPE, StreamPeer::get_class_static(), PROPERTY_USAGE_NONE), "set_stream_peer", "get_stream_peer");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream_peer", PROPERTY_HINT_RESOURCE_TYPE, "StreamPeer", PROPERTY_USAGE_NONE), "set_stream_peer", "get_stream_peer");
 }
 
 Error PacketPeerStream::_poll_buffer() const {
@@ -302,8 +301,8 @@ void PacketPeerStream::set_input_buffer_max_size(int p_max_size) {
 	ERR_FAIL_COND_MSG(p_max_size < 0, "Max size of input buffer size cannot be smaller than 0.");
 	// WARNING: May lose packets.
 	ERR_FAIL_COND_MSG(ring_buffer.data_left(), "Buffer in use, resizing would cause loss of data.");
-	ring_buffer.resize(Math::nearest_shift(Math::next_power_of_2((uint32_t)p_max_size + (uint32_t)4)) - 1);
-	input_buffer.resize(Math::next_power_of_2((uint32_t)p_max_size + (uint32_t)4));
+	ring_buffer.resize(nearest_shift(next_power_of_2((uint32_t)p_max_size + (uint32_t)4)) - 1);
+	input_buffer.resize(next_power_of_2((uint32_t)p_max_size + (uint32_t)4));
 }
 
 int PacketPeerStream::get_input_buffer_max_size() const {
@@ -311,7 +310,7 @@ int PacketPeerStream::get_input_buffer_max_size() const {
 }
 
 void PacketPeerStream::set_output_buffer_max_size(int p_max_size) {
-	output_buffer.resize(Math::next_power_of_2((uint32_t)p_max_size + (uint32_t)4));
+	output_buffer.resize(next_power_of_2((uint32_t)p_max_size + (uint32_t)4));
 }
 
 int PacketPeerStream::get_output_buffer_max_size() const {
diff --git a/engine/core/io/packet_peer.h b/engine/core/io/packet_peer.h
index 63a0df4c..85526dae 100644
--- a/engine/core/io/packet_peer.h
+++ b/engine/core/io/packet_peer.h
@@ -30,10 +30,12 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
 #include "core/io/stream_peer.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/class_db.h"
 #include "core/templates/ring_buffer.h"
+
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 
 class PacketPeer : public RefCounted {
diff --git a/engine/core/io/packet_peer_dtls.cpp b/engine/core/io/packet_peer_dtls.cpp
index c8ad201e..b37b7991 100644
--- a/engine/core/io/packet_peer_dtls.cpp
+++ b/engine/core/io/packet_peer_dtls.cpp
@@ -30,8 +30,6 @@
 
 #include "packet_peer_dtls.h"
 
-#include "core/object/class_db.h"
-
 PacketPeerDTLS *PacketPeerDTLS::create(bool p_notify_postinitialize) {
 	if (_create) {
 		return _create(p_notify_postinitialize);
diff --git a/engine/core/io/packet_peer_udp.cpp b/engine/core/io/packet_peer_udp.cpp
index 86076044..478c2d76 100644
--- a/engine/core/io/packet_peer_udp.cpp
+++ b/engine/core/io/packet_peer_udp.cpp
@@ -32,7 +32,6 @@
 
 #include "core/io/ip.h"
 #include "core/io/udp_server.h"
-#include "core/object/class_db.h"
 
 void PacketPeerUDP::set_blocking_mode(bool p_enable) {
 	blocking = p_enable;
@@ -202,7 +201,7 @@ Error PacketPeerUDP::bind(int p_port, const IPAddress &p_bind_address, int p_rec
 		_sock->close();
 		return err;
 	}
-	rb.resize(Math::nearest_shift((uint32_t)p_recv_buffer_size));
+	rb.resize(nearest_shift((uint32_t)p_recv_buffer_size));
 	return OK;
 }
 
diff --git a/engine/core/io/packet_peer_udp.h b/engine/core/io/packet_peer_udp.h
index ef005b08..1c909860 100644
--- a/engine/core/io/packet_peer_udp.h
+++ b/engine/core/io/packet_peer_udp.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/io/ip_address.h"
+#include "core/io/ip.h"
 #include "core/io/net_socket.h"
 #include "core/io/packet_peer.h"
 
diff --git a/engine/core/io/pck_packer.cpp b/engine/core/io/pck_packer.cpp
index b9670ddf..ee7bb15b 100644
--- a/engine/core/io/pck_packer.cpp
+++ b/engine/core/io/pck_packer.cpp
@@ -34,7 +34,6 @@
 #include "core/io/file_access.h"
 #include "core/io/file_access_encrypted.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
-#include "core/object/class_db.h"
 #include "core/version.h"
 
 static int _get_pad(int p_alignment, int p_n) {
@@ -50,7 +49,6 @@ static int _get_pad(int p_alignment, int p_n) {
 void PCKPacker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("pck_start", "pck_path", "alignment", "key", "encrypt_directory"), &PCKPacker::pck_start, DEFVAL(32), DEFVAL("0000000000000000000000000000000000000000000000000000000000000000"), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("add_file", "target_path", "source_path", "encrypt"), &PCKPacker::add_file, DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("add_file_from_buffer", "target_path", "data", "encrypt"), &PCKPacker::add_file_from_buffer, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("add_file_removal", "target_path"), &PCKPacker::add_file_removal);
 	ClassDB::bind_method(D_METHOD("flush", "verbose"), &PCKPacker::flush, DEFVAL(false));
 }
@@ -154,17 +152,6 @@ Error PCKPacker::add_file(const String &p_target_path, const String &p_source_pa
 	if (f.is_null()) {
 		return ERR_FILE_CANT_OPEN;
 	}
-	Vector<uint8_t> data = FileAccess::get_file_as_bytes(p_source_path);
-
-	return _add_file(p_target_path, p_source_path, data, p_encrypt);
-}
-
-Error PCKPacker::add_file_from_buffer(const String &p_target_path, const Vector<uint8_t> &p_data, bool p_encrypt) {
-	return _add_file(p_target_path, "<PackedByteArray>", p_data, p_encrypt);
-}
-
-Error PCKPacker::_add_file(const String &p_target_path, const String &p_source_path, const Vector<uint8_t> &p_data, bool p_encrypt) {
-	ERR_FAIL_COND_V_MSG(file.is_null(), ERR_INVALID_PARAMETER, "File must be opened before use.");
 
 	File pf;
 	// Simplify path here and on every 'files' access so that paths that have extra '/'
@@ -172,11 +159,12 @@ Error PCKPacker::_add_file(const String &p_target_path, const String &p_source_p
 	pf.path = p_target_path.simplify_path().trim_prefix("res://");
 	pf.src_path = p_source_path;
 	pf.ofs = file->get_position();
-	pf.size = p_data.size();
+	pf.size = f->get_length();
 
+	Vector<uint8_t> data = FileAccess::get_file_as_bytes(p_source_path);
 	{
 		unsigned char hash[16];
-		CryptoCore::md5(p_data.ptr(), p_data.size(), hash);
+		CryptoCore::md5(data.ptr(), data.size(), hash);
 		pf.md5.resize(16);
 		for (int i = 0; i < 16; i++) {
 			pf.md5.write[i] = hash[i];
@@ -196,7 +184,7 @@ Error PCKPacker::_add_file(const String &p_target_path, const String &p_source_p
 		ftmp = fae;
 	}
 
-	ftmp->store_buffer(p_data);
+	ftmp->store_buffer(data);
 
 	if (fae.is_valid()) {
 		ftmp.unref();
@@ -268,7 +256,7 @@ Error PCKPacker::flush(bool p_verbose) {
 		fhead->store_32(flags);
 
 		if (p_verbose) {
-			print_line(vformat("[%d/%d - %d%%] PCKPacker flush: %s -> %s", i + 1, file_num, float(i + 1) / file_num * 100, files[i].src_path, files[i].path));
+			print_line(vformat("[%d/%d - %d%%] PCKPacker flush: %s -> %s", i, file_num, float(i) / file_num * 100, files[i].src_path, files[i].path));
 		}
 	}
 
diff --git a/engine/core/io/pck_packer.h b/engine/core/io/pck_packer.h
index a2726bde..65f88397 100644
--- a/engine/core/io/pck_packer.h
+++ b/engine/core/io/pck_packer.h
@@ -60,12 +60,9 @@ class PCKPacker : public RefCounted {
 	};
 	Vector<File> files;
 
-	Error _add_file(const String &p_target_path, const String &p_source_path, const Vector<uint8_t> &p_data, bool p_encrypt = false);
-
 public:
 	Error pck_start(const String &p_pck_path, int p_alignment = 32, const String &p_key = "0000000000000000000000000000000000000000000000000000000000000000", bool p_encrypt_directory = false);
 	Error add_file(const String &p_target_path, const String &p_source_path, bool p_encrypt = false);
-	Error add_file_from_buffer(const String &p_target_path, const Vector<uint8_t> &p_data, bool p_encrypt = false);
 	Error add_file_removal(const String &p_target_path);
 	Error flush(bool p_verbose = false);
 
diff --git a/engine/core/io/remote_filesystem_client.cpp b/engine/core/io/remote_filesystem_client.cpp
index f637fb67..e5421115 100644
--- a/engine/core/io/remote_filesystem_client.cpp
+++ b/engine/core/io/remote_filesystem_client.cpp
@@ -33,7 +33,6 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/stream_peer_tcp.h"
-#include "core/os/os.h"
 #include "core/string/string_builder.h"
 
 #define FILESYSTEM_CACHE_VERSION 1
diff --git a/engine/core/io/resource.cpp b/engine/core/io/resource.cpp
index 6c245e32..50d399db 100644
--- a/engine/core/io/resource.cpp
+++ b/engine/core/io/resource.cpp
@@ -33,19 +33,10 @@
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
 #include "core/math/random_pcg.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
-#include "core/variant/container_type_validate.h" // IWYU pragma: keep.
+#include "core/variant/container_type_validate.h"
 #include "scene/main/node.h" //only so casting works
 
-void Resource::register_custom_data_to_otdb() {
-	ClassDB::add_resource_base_extension("res", get_class_static());
-}
-
-void Resource::_add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class) {
-	ClassDB::add_resource_base_extension(p_extension, p_class);
-}
-
 void Resource::emit_changed() {
 	if (emit_changed_state != EMIT_CHANGED_UNBLOCKED) {
 		emit_changed_state = EMIT_CHANGED_BLOCKED_PENDING_EMIT;
@@ -382,7 +373,7 @@ Ref<Resource> Resource::_duplicate(const DuplicateParams &p_params) const {
 // These are for avoiding potential duplicates that can happen in custom code
 // from participating in the same duplication session (remap cache).
 #define BEFORE_USER_CODE thread_duplicate_remap_cache = nullptr;
-#define AFTER_USER_CODE \
+#define AFTER_USER_CODE                                \
 	thread_duplicate_remap_cache = remap_cache_backup; \
 	thread_duplicate_remap_cache_needs_deallocation = remap_cache_needs_deallocation_backup;
 
@@ -758,14 +749,11 @@ void Resource::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("duplicate", "deep"), &Resource::duplicate, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("duplicate_deep", "deep_subresources_mode"), &Resource::_duplicate_deep_bind, DEFVAL(RESOURCE_DEEP_DUPLICATE_INTERNAL));
 
-	// TODO: Once we can break compatibility, change the binding to "copy_from". For now, we have to avoid clashing with the method from `Image`.
-	ClassDB::bind_method(D_METHOD("copy_from_resource", "resource"), &Resource::copy_from);
-
 	// For the bindings, it's much more natural to expose this enum from the Variant realm via Resource.
 	// Therefore, we can't use BIND_ENUM_CONSTANT here because we need some customization.
-	get_gdtype_static_mutable().bind_integer_constant(StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_NONE", RESOURCE_DEEP_DUPLICATE_NONE);
-	get_gdtype_static_mutable().bind_integer_constant(StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_INTERNAL", RESOURCE_DEEP_DUPLICATE_INTERNAL);
-	get_gdtype_static_mutable().bind_integer_constant(StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_ALL", RESOURCE_DEEP_DUPLICATE_ALL);
+	ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_NONE", RESOURCE_DEEP_DUPLICATE_NONE);
+	ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_INTERNAL", RESOURCE_DEEP_DUPLICATE_INTERNAL);
+	ClassDB::bind_integer_constant(get_class_static(), StringName("DeepDuplicateMode"), "DEEP_DUPLICATE_ALL", RESOURCE_DEEP_DUPLICATE_ALL);
 
 	ADD_SIGNAL(MethodInfo("changed"));
 	ADD_SIGNAL(MethodInfo("setup_local_to_scene_requested"));
diff --git a/engine/core/io/resource.h b/engine/core/io/resource.h
index dd432b9d..7feffb74 100644
--- a/engine/core/io/resource.h
+++ b/engine/core/io/resource.h
@@ -30,23 +30,24 @@
 
 #pragma once
 
-#include "core/io/resource_uid.h" // IWYU pragma: export. Make available to all resources.
-#include "core/object/gdvirtual.gen.h"
+#include "core/io/resource_uid.h"
+#include "core/object/class_db.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
+#include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
 
 class Node;
-class RWLock;
 
-#define RES_BASE_EXTENSION(m_ext) \
-public: \
-	static void register_custom_data_to_otdb() { \
-		Resource::_add_resource_base_extension_to_classdb(m_ext, get_class_static()); \
-	} \
-	virtual String get_base_extension() const override { \
-		return m_ext; \
-	} \
-\
+#define RES_BASE_EXTENSION(m_ext)                                        \
+public:                                                                  \
+	static void register_custom_data_to_otdb() {                         \
+		ClassDB::add_resource_base_extension(m_ext, get_class_static()); \
+	}                                                                    \
+	virtual String get_base_extension() const override {                 \
+		return m_ext;                                                    \
+	}                                                                    \
+                                                                         \
 private:
 
 class Resource : public RefCounted {
@@ -55,11 +56,10 @@ class Resource : public RefCounted {
 public:
 	static constexpr AncestralClass static_ancestral_class = AncestralClass::RESOURCE;
 
-	static void register_custom_data_to_otdb();
+	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension("res", get_class_static()); }
 	virtual String get_base_extension() const { return "res"; }
 
 protected:
-	static void _add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class);
 	struct DuplicateParams {
 		bool deep = false;
 		ResourceDeepDuplicateMode subres_mode = RESOURCE_DEEP_DUPLICATE_MAX;
@@ -67,6 +67,7 @@ protected:
 	};
 
 private:
+	friend class ResBase;
 	friend class ResourceCache;
 
 	String name;
diff --git a/engine/core/io/resource_format_binary.cpp b/engine/core/io/resource_format_binary.cpp
index 53c26b9f..8446e104 100644
--- a/engine/core/io/resource_format_binary.cpp
+++ b/engine/core/io/resource_format_binary.cpp
@@ -34,7 +34,6 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/missing_resource.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/version.h"
 #include "scene/property_utils.h"
@@ -750,7 +749,7 @@ Error ResourceLoaderBinary::load() {
 		Ref<Resource> res;
 		Resource *r = nullptr;
 
-		Ref<MissingResource> missing_resource;
+		MissingResource *missing_resource = nullptr;
 
 		if (main) {
 			res = ResourceLoader::get_resource_ref_override(local_path);
@@ -776,7 +775,7 @@ Error ResourceLoaderBinary::load() {
 						missing_resource = memnew(MissingResource);
 						missing_resource->set_original_class(t);
 						missing_resource->set_recording_properties(true);
-						obj = missing_resource.ptr();
+						obj = missing_resource;
 					} else {
 						error = ERR_FILE_CORRUPT;
 						ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, vformat("'%s': Resource of unrecognized type in file: '%s'.", local_path, t));
@@ -832,7 +831,7 @@ Error ResourceLoaderBinary::load() {
 			}
 
 			bool set_valid = true;
-			if (value.get_type() == Variant::OBJECT && missing_resource.is_null() && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
+			if (value.get_type() == Variant::OBJECT && missing_resource == nullptr && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
 				// If the property being set is a missing resource (and the parent is not),
 				// then setting it will most likely not work.
 				// Instead, save it as metadata.
@@ -874,7 +873,7 @@ Error ResourceLoaderBinary::load() {
 			}
 		}
 
-		if (missing_resource.is_valid()) {
+		if (missing_resource) {
 			missing_resource->set_recording_properties(false);
 		}
 
diff --git a/engine/core/io/resource_importer.cpp b/engine/core/io/resource_importer.cpp
index 636dc743..fc36e5e1 100644
--- a/engine/core/io/resource_importer.cpp
+++ b/engine/core/io/resource_importer.cpp
@@ -33,7 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/image.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
 
diff --git a/engine/core/io/resource_loader.cpp b/engine/core/io/resource_loader.cpp
index a2085cdd..952a7e93 100644
--- a/engine/core/io/resource_loader.cpp
+++ b/engine/core/io/resource_loader.cpp
@@ -30,15 +30,11 @@
 
 #include "resource_loader.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_bind.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_importer.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/os/condition_variable.h"
 #include "core/os/os.h"
@@ -222,6 +218,26 @@ void ResourceFormatLoader::_bind_methods() {
 	GDVIRTUAL_BIND(_load, "path", "original_path", "use_sub_threads", "cache_mode");
 }
 
+///////////////////////////////////
+
+// These are used before and after a wait for a WorkerThreadPool task
+// because that can lead to another load started in the same thread,
+// something we must treat as a different stack for the purposes
+// of tracking nesting.
+
+#define PREPARE_FOR_WTP_WAIT                                                   \
+	int load_nesting_backup = ResourceLoader::load_nesting;                    \
+	Vector<String> load_paths_stack_backup = ResourceLoader::load_paths_stack; \
+	ResourceLoader::load_nesting = 0;                                          \
+	ResourceLoader::load_paths_stack.clear();
+
+#define RESTORE_AFTER_WTP_WAIT                                  \
+	DEV_ASSERT(ResourceLoader::load_nesting == 0);              \
+	DEV_ASSERT(ResourceLoader::load_paths_stack.is_empty());    \
+	ResourceLoader::load_nesting = load_nesting_backup;         \
+	ResourceLoader::load_paths_stack = load_paths_stack_backup; \
+	load_paths_stack_backup.clear();
+
 // This should be robust enough to be called redundantly without issues.
 void ResourceLoader::LoadToken::clear() {
 	WorkerThreadPool::TaskID task_to_await = 0;
@@ -260,11 +276,9 @@ void ResourceLoader::LoadToken::clear() {
 
 	// If task is unused, await it here, locally, now the token data is consistent.
 	if (task_to_await) {
-		int load_nesting_backup = load_nesting;
-		load_nesting = 0;
+		PREPARE_FOR_WTP_WAIT
 		WorkerThreadPool::get_singleton()->wait_for_task_completion(task_to_await);
-		DEV_ASSERT(load_nesting == 0);
-		load_nesting = load_nesting_backup;
+		RESTORE_AFTER_WTP_WAIT
 	}
 }
 
@@ -272,9 +286,20 @@ ResourceLoader::LoadToken::~LoadToken() {
 	clear();
 }
 
-Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_original_path, const String &p_type_hint, CacheMode p_cache_mode, Error *r_error, bool p_use_sub_threads, float *r_progress) {
+Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_original_path, const String &p_type_hint, ResourceFormatLoader::CacheMode p_cache_mode, Error *r_error, bool p_use_sub_threads, float *r_progress) {
 	const String &original_path = p_original_path.is_empty() ? p_path : p_original_path;
 	load_nesting++;
+	if (load_paths_stack.size()) {
+		MutexLock thread_load_lock(thread_load_mutex);
+		const String &parent_task_path = load_paths_stack.get(load_paths_stack.size() - 1);
+		HashMap<String, ThreadLoadTask>::Iterator E = thread_load_tasks.find(parent_task_path);
+		// Avoid double-tracking, for progress reporting, resources that boil down to a remapped path containing the real payload (e.g., imported resources).
+		bool is_remapped_load = original_path == parent_task_path;
+		if (E && !is_remapped_load) {
+			E->value.sub_tasks.insert(original_path);
+		}
+	}
+	load_paths_stack.push_back(original_path);
 
 	print_verbose(vformat("Loading resource: %s", p_path));
 
@@ -292,6 +317,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
 		}
 	}
 
+	load_paths_stack.resize(load_paths_stack.size() - 1);
 	res_ref_overrides.erase(load_nesting);
 	load_nesting--;
 
@@ -351,6 +377,7 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
 	// Thread-safe either if it's the current thread or a brand new one.
 	CallQueue *own_mq_override = nullptr;
 	if (load_nesting == 0) {
+		DEV_ASSERT(load_paths_stack.is_empty());
 		if (!Thread::is_main_thread()) {
 			// Let the caller thread use its own, for added flexibility. Provide one otherwise.
 			if (MessageQueue::get_singleton() == MessageQueue::get_main_singleton()) {
@@ -388,8 +415,8 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
 	}
 	load_task.need_wait = false;
 
-	bool ignoring = load_task.cache_mode == CACHE_MODE_IGNORE || load_task.cache_mode == CACHE_MODE_IGNORE_DEEP;
-	bool replacing = load_task.cache_mode == CACHE_MODE_REPLACE || load_task.cache_mode == CACHE_MODE_REPLACE_DEEP;
+	bool ignoring = load_task.cache_mode == ResourceFormatLoader::CACHE_MODE_IGNORE || load_task.cache_mode == ResourceFormatLoader::CACHE_MODE_IGNORE_DEEP;
+	bool replacing = load_task.cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE || load_task.cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE_DEEP;
 	bool unlock_pending = true;
 	if (load_task.resource.is_valid()) {
 		// From now on, no critical section needed as no one will write to the task anymore.
@@ -469,6 +496,7 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
 			MessageQueue::set_thread_singleton_override(nullptr);
 			memdelete(own_mq_override);
 		}
+		DEV_ASSERT(load_paths_stack.is_empty());
 	}
 
 	curr_load_task = curr_load_task_backup;
@@ -485,7 +513,7 @@ String ResourceLoader::_validate_local_path(const String &p_path) {
 	}
 }
 
-Error ResourceLoader::load_threaded_request(const String &p_path, const String &p_type_hint, bool p_use_sub_threads, CacheMode p_cache_mode) {
+Error ResourceLoader::load_threaded_request(const String &p_path, const String &p_type_hint, bool p_use_sub_threads, ResourceFormatLoader::CacheMode p_cache_mode) {
 	Ref<ResourceLoader::LoadToken> token = _load_start(p_path, p_type_hint, p_use_sub_threads ? LOAD_THREAD_DISTRIBUTE : LOAD_THREAD_SPAWN_SINGLE, p_cache_mode, true);
 	return token.is_valid() ? OK : FAILED;
 }
@@ -510,7 +538,7 @@ void ResourceLoader::_load_threaded_request_setup_user_token(LoadToken *p_token,
 	print_lt("REQUEST: user load tokens: " + itos(user_load_tokens.size()));
 }
 
-Ref<Resource> ResourceLoader::load(const String &p_path, const String &p_type_hint, CacheMode p_cache_mode, Error *r_error) {
+Ref<Resource> ResourceLoader::load(const String &p_path, const String &p_type_hint, ResourceFormatLoader::CacheMode p_cache_mode, Error *r_error) {
 	if (r_error) {
 		*r_error = OK;
 	}
@@ -535,11 +563,11 @@ Ref<Resource> ResourceLoader::load(const String &p_path, const String &p_type_hi
 	return res;
 }
 
-Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path, const String &p_type_hint, LoadThreadMode p_thread_mode, CacheMode p_cache_mode, bool p_for_user) {
+Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path, const String &p_type_hint, LoadThreadMode p_thread_mode, ResourceFormatLoader::CacheMode p_cache_mode, bool p_for_user) {
 	String local_path = _validate_local_path(p_path);
 	ERR_FAIL_COND_V(local_path.is_empty(), Ref<ResourceLoader::LoadToken>());
 
-	bool ignoring_cache = p_cache_mode == CACHE_MODE_IGNORE || p_cache_mode == CACHE_MODE_IGNORE_DEEP;
+	bool ignoring_cache = p_cache_mode == ResourceFormatLoader::CACHE_MODE_IGNORE || p_cache_mode == ResourceFormatLoader::CACHE_MODE_IGNORE_DEEP;
 
 	Ref<LoadToken> load_token;
 	bool must_not_register = false;
@@ -585,7 +613,7 @@ Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path,
 			load_task.type_hint = p_type_hint;
 			load_task.cache_mode = p_cache_mode;
 			load_task.use_sub_threads = p_thread_mode == LOAD_THREAD_DISTRIBUTE;
-			if (p_cache_mode == CACHE_MODE_REUSE) {
+			if (p_cache_mode == ResourceFormatLoader::CACHE_MODE_REUSE) {
 				Ref<Resource> existing = ResourceCache::get_ref(local_path);
 				if (existing.is_valid()) {
 					//referencing is fine
@@ -598,12 +626,6 @@ Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path,
 				}
 			}
 
-			// Task hierarchy
-			if (curr_load_task) {
-				load_task.parent_task = curr_load_task;
-				curr_load_task->sub_tasks.insert(load_task.local_path);
-			}
-
 			// If we want to ignore cache, but there's another task loading it, we can't add this one to the map.
 			must_not_register = ignoring_cache && thread_load_tasks.has(local_path);
 			if (must_not_register) {
@@ -793,22 +815,6 @@ void ResourceLoader::set_is_import_thread(bool p_import_thread) {
 	import_thread = p_import_thread;
 }
 
-void ResourceLoader::notify_load_error(const String &p_err) {
-	if (err_notify) {
-		MessageQueue::get_main_singleton()->push_callable(callable_mp_static(err_notify).bind(p_err));
-	}
-}
-
-void ResourceLoader::notify_dependency_error(const String &p_path, const String &p_dependency, const String &p_type) {
-	if (dep_err_notify) {
-		if (Thread::get_caller_id() == Thread::get_main_id()) {
-			dep_err_notify(p_path, p_dependency, p_type);
-		} else {
-			MessageQueue::get_main_singleton()->push_callable(callable_mp_static(dep_err_notify).bind(p_path, p_dependency, p_type));
-		}
-	}
-}
-
 Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Error *r_error, MutexLock<SafeBinaryMutex<BINARY_MUTEX_TAG>> &p_thread_load_lock) {
 	if (r_error) {
 		*r_error = OK;
@@ -845,11 +851,9 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
 				// Loading thread is in the worker pool.
 				p_thread_load_lock.temp_unlock();
 
-				int load_nesting_backup = load_nesting;
-				load_nesting = 0;
+				PREPARE_FOR_WTP_WAIT
 				Error wait_err = WorkerThreadPool::get_singleton()->wait_for_task_completion(load_task.task_id);
-				DEV_ASSERT(load_nesting == 0);
-				load_nesting = load_nesting_backup;
+				RESTORE_AFTER_WTP_WAIT
 
 				DEV_ASSERT(!wait_err || wait_err == ERR_BUSY);
 				if (wait_err == ERR_BUSY) {
@@ -900,21 +904,21 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
 		load_task_ptr = &load_task;
 	}
 
+	p_thread_load_lock.temp_unlock();
+
 	Ref<Resource> resource = load_task_ptr->resource;
 	if (r_error) {
 		*r_error = load_task_ptr->error;
 	}
 
 	if (resource.is_valid()) {
-		if (load_task_ptr->parent_task) {
+		if (curr_load_task) {
 			// A task awaiting another => Let the awaiter accumulate the resource changed connections.
-			DEV_ASSERT(load_task_ptr->parent_task != load_task_ptr);
+			DEV_ASSERT(curr_load_task != load_task_ptr);
 			for (const ThreadLoadTask::ResourceChangedConnection &rcc : load_task_ptr->resource_changed_connections) {
-				load_task_ptr->parent_task->resource_changed_connections.push_back(rcc);
+				curr_load_task->resource_changed_connections.push_back(rcc);
 			}
 		} else {
-			p_thread_load_lock.temp_unlock();
-
 			// A leaf task being awaited => Propagate the resource changed connections.
 			if (Thread::is_main_thread()) {
 				// On the main thread it's safe to migrate the connections to the standard signal mechanism.
@@ -938,11 +942,11 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
 					}
 				}
 			}
-
-			p_thread_load_lock.temp_relock();
 		}
 	}
 
+	p_thread_load_lock.temp_relock();
+
 	return resource;
 }
 
@@ -1564,6 +1568,7 @@ bool ResourceLoader::timestamp_on_load = false;
 
 thread_local bool ResourceLoader::import_thread = false;
 thread_local int ResourceLoader::load_nesting = 0;
+thread_local Vector<String> ResourceLoader::load_paths_stack;
 thread_local HashMap<int, HashMap<String, Ref<Resource>>> ResourceLoader::res_ref_overrides;
 thread_local ResourceLoader::ThreadLoadTask *ResourceLoader::curr_load_task = nullptr;
 
diff --git a/engine/core/io/resource_loader.h b/engine/core/io/resource_loader.h
index ec738adc..33b79b5a 100644
--- a/engine/core/io/resource_loader.h
+++ b/engine/core/io/resource_loader.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/io/resource_loader_constants.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 
@@ -49,12 +48,13 @@ class ResourceFormatLoader : public RefCounted {
 	GDCLASS(ResourceFormatLoader, RefCounted);
 
 public:
-	using CacheMode = ResourceLoaderConstants::CacheMode;
-	static constexpr CacheMode CACHE_MODE_IGNORE = ResourceLoaderConstants::CACHE_MODE_IGNORE;
-	static constexpr CacheMode CACHE_MODE_REUSE = ResourceLoaderConstants::CACHE_MODE_REUSE;
-	static constexpr CacheMode CACHE_MODE_REPLACE = ResourceLoaderConstants::CACHE_MODE_REPLACE;
-	static constexpr CacheMode CACHE_MODE_IGNORE_DEEP = ResourceLoaderConstants::CACHE_MODE_IGNORE_DEEP;
-	static constexpr CacheMode CACHE_MODE_REPLACE_DEEP = ResourceLoaderConstants::CACHE_MODE_REPLACE_DEEP;
+	enum CacheMode {
+		CACHE_MODE_IGNORE,
+		CACHE_MODE_REUSE,
+		CACHE_MODE_REPLACE,
+		CACHE_MODE_IGNORE_DEEP,
+		CACHE_MODE_REPLACE_DEEP,
+	};
 
 protected:
 	static void _bind_methods();
@@ -94,6 +94,8 @@ public:
 	virtual ~ResourceFormatLoader() {}
 };
 
+VARIANT_ENUM_CAST(ResourceFormatLoader::CacheMode)
+
 typedef void (*ResourceLoadErrorNotify)(const String &p_text);
 typedef void (*DependencyErrorNotify)(const String &p_loading, const String &p_which, const String &p_type);
 
@@ -111,13 +113,6 @@ class ResourceLoader {
 	struct ThreadLoadTask;
 
 public:
-	using CacheMode = ResourceLoaderConstants::CacheMode;
-	static constexpr CacheMode CACHE_MODE_IGNORE = ResourceLoaderConstants::CACHE_MODE_IGNORE;
-	static constexpr CacheMode CACHE_MODE_REUSE = ResourceLoaderConstants::CACHE_MODE_REUSE;
-	static constexpr CacheMode CACHE_MODE_REPLACE = ResourceLoaderConstants::CACHE_MODE_REPLACE;
-	static constexpr CacheMode CACHE_MODE_IGNORE_DEEP = ResourceLoaderConstants::CACHE_MODE_IGNORE_DEEP;
-	static constexpr CacheMode CACHE_MODE_REPLACE_DEEP = ResourceLoaderConstants::CACHE_MODE_REPLACE_DEEP;
-
 	enum ThreadLoadStatus {
 		THREAD_LOAD_INVALID_RESOURCE,
 		THREAD_LOAD_IN_PROGRESS,
@@ -144,7 +139,7 @@ public:
 
 	static const int BINARY_MUTEX_TAG = 1;
 
-	static Ref<LoadToken> _load_start(const String &p_path, const String &p_type_hint, LoadThreadMode p_thread_mode, CacheMode p_cache_mode, bool p_for_user = false);
+	static Ref<LoadToken> _load_start(const String &p_path, const String &p_type_hint, LoadThreadMode p_thread_mode, ResourceFormatLoader::CacheMode p_cache_mode, bool p_for_user = false);
 	static Ref<Resource> _load_complete(LoadToken &p_load_token, Error *r_error);
 
 private:
@@ -172,7 +167,7 @@ private:
 
 	friend class ResourceFormatImporter;
 
-	static Ref<Resource> _load(const String &p_path, const String &p_original_path, const String &p_type_hint, CacheMode p_cache_mode, Error *r_error, bool p_use_sub_threads, float *r_progress);
+	static Ref<Resource> _load(const String &p_path, const String &p_original_path, const String &p_type_hint, ResourceFormatLoader::CacheMode p_cache_mode, Error *r_error, bool p_use_sub_threads, float *r_progress);
 
 	static ResourceLoadedCallback _loaded_callback;
 
@@ -190,10 +185,9 @@ private:
 		float max_reported_progress = 0.0f;
 		uint64_t last_progress_check_main_thread_frame = UINT64_MAX;
 		ThreadLoadStatus status = THREAD_LOAD_IN_PROGRESS;
-		CacheMode cache_mode = CACHE_MODE_REUSE;
+		ResourceFormatLoader::CacheMode cache_mode = ResourceFormatLoader::CACHE_MODE_REUSE;
 		Error error = OK;
 		Ref<Resource> resource;
-		ThreadLoadTask *parent_task = nullptr;
 		HashSet<String> sub_tasks;
 
 		bool awaited : 1; // If it's in the pool, this helps not awaiting from more than one dependent thread.
@@ -219,6 +213,7 @@ private:
 	static thread_local bool import_thread;
 	static thread_local int load_nesting;
 	static thread_local HashMap<int, HashMap<String, Ref<Resource>>> res_ref_overrides; // Outermost key is nesting level.
+	static thread_local Vector<String> load_paths_stack;
 	static thread_local ThreadLoadTask *curr_load_task;
 
 	static SafeBinaryMutex<BINARY_MUTEX_TAG> thread_load_mutex;
@@ -236,7 +231,7 @@ private:
 	static String _validate_local_path(const String &p_path);
 
 public:
-	static Error load_threaded_request(const String &p_path, const String &p_type_hint = "", bool p_use_sub_threads = false, CacheMode p_cache_mode = CACHE_MODE_REUSE);
+	static Error load_threaded_request(const String &p_path, const String &p_type_hint = "", bool p_use_sub_threads = false, ResourceFormatLoader::CacheMode p_cache_mode = ResourceFormatLoader::CACHE_MODE_REUSE);
 	static ThreadLoadStatus load_threaded_get_status(const String &p_path, float *r_progress = nullptr);
 	static Ref<Resource> load_threaded_get(const String &p_path, Error *r_error = nullptr);
 
@@ -246,7 +241,7 @@ public:
 	static void resource_changed_disconnect(Resource *p_source, const Callable &p_callable);
 	static void resource_changed_emit(Resource *p_source);
 
-	static Ref<Resource> load(const String &p_path, const String &p_type_hint = "", CacheMode p_cache_mode = CACHE_MODE_REUSE, Error *r_error = nullptr);
+	static Ref<Resource> load(const String &p_path, const String &p_type_hint = "", ResourceFormatLoader::CacheMode p_cache_mode = ResourceFormatLoader::CACHE_MODE_REUSE, Error *r_error = nullptr);
 	static bool exists(const String &p_path, const String &p_type_hint = "");
 
 	static void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions);
@@ -269,15 +264,25 @@ public:
 	static bool get_timestamp_on_load() { return timestamp_on_load; }
 
 	// Loaders can safely use this regardless which thread they are running on.
-	static void notify_load_error(const String &p_err);
-
+	static void notify_load_error(const String &p_err) {
+		if (err_notify) {
+			MessageQueue::get_main_singleton()->push_callable(callable_mp_static(err_notify).bind(p_err));
+		}
+	}
 	static void set_error_notify_func(ResourceLoadErrorNotify p_err_notify) {
 		err_notify = p_err_notify;
 	}
 
 	// Loaders can safely use this regardless which thread they are running on.
-	static void notify_dependency_error(const String &p_path, const String &p_dependency, const String &p_type);
-
+	static void notify_dependency_error(const String &p_path, const String &p_dependency, const String &p_type) {
+		if (dep_err_notify) {
+			if (Thread::get_caller_id() == Thread::get_main_id()) {
+				dep_err_notify(p_path, p_dependency, p_type);
+			} else {
+				MessageQueue::get_main_singleton()->push_callable(callable_mp_static(dep_err_notify).bind(p_path, p_dependency, p_type));
+			}
+		}
+	}
 	static void set_dependency_error_notify_func(DependencyErrorNotify p_err_notify) {
 		dep_err_notify = p_err_notify;
 	}
diff --git a/engine/core/io/resource_loader_constants.h b/engine/core/io/resource_loader_constants.h
deleted file mode 100644
index c84a8f01..00000000
--- a/engine/core/io/resource_loader_constants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************/
-/*  resource_loader_constants.h                                           */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/variant/type_info.h"
-
-namespace ResourceLoaderConstants {
-
-enum CacheMode {
-	CACHE_MODE_IGNORE,
-	CACHE_MODE_REUSE,
-	CACHE_MODE_REPLACE,
-	CACHE_MODE_IGNORE_DEEP,
-	CACHE_MODE_REPLACE_DEEP,
-};
-
-} // namespace ResourceLoaderConstants
-
-VARIANT_ENUM_CAST(ResourceLoaderConstants::CacheMode)
diff --git a/engine/core/io/resource_saver.cpp b/engine/core/io/resource_saver.cpp
index 3cc7fc2a..be58564a 100644
--- a/engine/core/io/resource_saver.cpp
+++ b/engine/core/io/resource_saver.cpp
@@ -29,11 +29,9 @@
 /**************************************************************************/
 
 #include "resource_saver.h"
-
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 Ref<ResourceFormatSaver> ResourceSaver::saver[MAX_SAVERS];
diff --git a/engine/core/io/resource_saver.h b/engine/core/io/resource_saver.h
index 9a4a3587..0fc660c1 100644
--- a/engine/core/io/resource_saver.h
+++ b/engine/core/io/resource_saver.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 class ResourceFormatSaver : public RefCounted {
 	GDCLASS(ResourceFormatSaver, RefCounted);
diff --git a/engine/core/io/resource_uid.cpp b/engine/core/io/resource_uid.cpp
index 1f6b98f8..5a0f1f72 100644
--- a/engine/core/io/resource_uid.cpp
+++ b/engine/core/io/resource_uid.cpp
@@ -35,9 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/io/stream_peer.h"
 #include "core/math/random_pcg.h"
-#include "core/object/class_db.h"
 
 // These constants are off by 1, causing the 'z' and '9' characters never to be used.
 // This cannot be fixed without breaking compatibility; see GH-83843.
@@ -249,21 +247,6 @@ String ResourceUID::ensure_path(const String &p_uid_or_path) {
 	return p_uid_or_path;
 }
 
-Vector<uint8_t> ResourceUID::encode_binary_cache(const Vector<Pair<ID, String>> &p_entries) {
-	Ref<StreamPeerBuffer> buffer;
-	buffer.instantiate();
-	buffer->put_u32(p_entries.size());
-
-	for (const Pair<ID, String> &entry : p_entries) {
-		buffer->put_u64(uint64_t(entry.first));
-		CharString cs = entry.second.utf8();
-		buffer->put_u32(cs.length());
-		buffer->put_data((const uint8_t *)cs.ptr(), cs.length());
-	}
-
-	return buffer->get_data_array();
-}
-
 Error ResourceUID::save_to_cache() {
 	String cache_file = get_cache_file();
 	if (!FileAccess::exists(cache_file)) {
@@ -277,20 +260,19 @@ Error ResourceUID::save_to_cache() {
 	}
 
 	MutexLock l(mutex);
+	f->store_32(unique_ids.size());
 
-	Vector<Pair<ID, String>> entries;
-	entries.reserve(unique_ids.size());
 	cache_entries = 0;
 
 	for (KeyValue<ID, Cache> &E : unique_ids) {
-		entries.push_back(Pair<ID, String>(E.key, String::utf8(E.value.cs.ptr(), E.value.cs.length())));
+		f->store_64(uint64_t(E.key));
+		uint32_t s = E.value.cs.length();
+		f->store_32(s);
+		f->store_buffer((const uint8_t *)E.value.cs.ptr(), s);
 		E.value.saved_to_cache = true;
 		cache_entries++;
 	}
 
-	Vector<uint8_t> data = encode_binary_cache(entries);
-	f->store_buffer(data.ptr(), data.size());
-
 	changed = false;
 	return OK;
 }
@@ -375,21 +357,18 @@ String ResourceUID::get_path_from_cache(Ref<FileAccess> &p_cache_file, const Str
 	const int64_t uid_from_string = singleton->text_to_id(p_uid_string);
 	if (uid_from_string != INVALID_ID) {
 		const uint32_t entry_count = p_cache_file->get_32();
+		CharString cs;
 		for (uint32_t i = 0; i < entry_count; i++) {
 			int64_t id = p_cache_file->get_64();
 			int32_t len = p_cache_file->get_32();
+			cs.resize_uninitialized(len + 1);
+			ERR_FAIL_COND_V(cs.size() != len + 1, String());
+			cs[len] = 0;
+			int32_t rl = p_cache_file->get_buffer((uint8_t *)cs.ptrw(), len);
+			ERR_FAIL_COND_V(rl != len, String());
 
 			if (id == uid_from_string) {
-				CharString cs;
-				cs.resize_uninitialized(len + 1);
-				ERR_FAIL_COND_V(cs.size() != len + 1, String());
-				cs[len] = 0;
-				int32_t rl = p_cache_file->get_buffer((uint8_t *)cs.ptrw(), len);
-				ERR_FAIL_COND_V(rl != len, String());
 				return String::utf8(cs.get_data());
-			} else {
-				p_cache_file->seek(p_cache_file->get_position() + len);
-				ERR_FAIL_COND_V(p_cache_file->eof_reached(), String());
 			}
 		}
 	}
diff --git a/engine/core/io/resource_uid.h b/engine/core/io/resource_uid.h
index 840021b5..3832d25d 100644
--- a/engine/core/io/resource_uid.h
+++ b/engine/core/io/resource_uid.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/string/ustring.h"
+#include "core/object/ref_counted.h"
+#include "core/string/string_name.h"
 #include "core/templates/hash_map.h"
 
 class FileAccess;
@@ -88,7 +88,6 @@ public:
 	Error save_to_cache();
 	Error update_cache();
 	static String get_path_from_cache(Ref<FileAccess> &p_cache_file, const String &p_uid_string);
-	static Vector<uint8_t> encode_binary_cache(const Vector<Pair<ID, String>> &p_entries);
 
 	void enable_reverse_cache() { use_reverse_cache = true; }
 	void clear();
diff --git a/engine/core/io/socket_server.cpp b/engine/core/io/socket_server.cpp
index 31abc2c8..6929f675 100644
--- a/engine/core/io/socket_server.cpp
+++ b/engine/core/io/socket_server.cpp
@@ -30,8 +30,6 @@
 
 #include "socket_server.h"
 
-#include "core/object/class_db.h"
-
 void SocketServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_connection_available"), &SocketServer::is_connection_available);
 	ClassDB::bind_method(D_METHOD("is_listening"), &SocketServer::is_listening);
diff --git a/engine/core/io/stream_peer.cpp b/engine/core/io/stream_peer.cpp
index 3ab5a284..2f2c1d30 100644
--- a/engine/core/io/stream_peer.cpp
+++ b/engine/core/io/stream_peer.cpp
@@ -31,7 +31,6 @@
 #include "stream_peer.h"
 
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 
 Error StreamPeer::_put_data(const Vector<uint8_t> &p_data) {
 	int len = p_data.size();
diff --git a/engine/core/io/stream_peer.h b/engine/core/io/stream_peer.h
index 017afbf5..7efebcfc 100644
--- a/engine/core/io/stream_peer.h
+++ b/engine/core/io/stream_peer.h
@@ -30,9 +30,10 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
-#include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
+
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 
 class StreamPeer : public RefCounted {
diff --git a/engine/core/io/stream_peer_gzip.cpp b/engine/core/io/stream_peer_gzip.cpp
index 52c920da..bfd6b7bd 100644
--- a/engine/core/io/stream_peer_gzip.cpp
+++ b/engine/core/io/stream_peer_gzip.cpp
@@ -31,8 +31,6 @@
 #include "core/io/stream_peer_gzip.h"
 
 #include "core/io/zip_io.h"
-#include "core/object/class_db.h"
-
 #include <zlib.h>
 
 void StreamPeerGZIP::_bind_methods() {
@@ -78,7 +76,7 @@ Error StreamPeerGZIP::_start(bool p_compress, bool p_is_deflate, int buffer_size
 	ERR_FAIL_COND_V_MSG(buffer_size <= 0, ERR_INVALID_PARAMETER, "Invalid buffer size. It should be a positive integer.");
 	clear();
 	compressing = p_compress;
-	rb.resize(Math::nearest_shift(uint32_t(buffer_size - 1)));
+	rb.resize(nearest_shift(uint32_t(buffer_size - 1)));
 	buffer.resize(1024);
 
 	// Create ctx.
diff --git a/engine/core/io/stream_peer_gzip.h b/engine/core/io/stream_peer_gzip.h
index b9186bc9..e712253c 100644
--- a/engine/core/io/stream_peer_gzip.h
+++ b/engine/core/io/stream_peer_gzip.h
@@ -31,6 +31,9 @@
 #pragma once
 
 #include "core/io/stream_peer.h"
+
+#include "core/core_bind.h"
+#include "core/io/compression.h"
 #include "core/templates/ring_buffer.h"
 
 class StreamPeerGZIP : public StreamPeer {
diff --git a/engine/core/io/stream_peer_socket.compat.inc b/engine/core/io/stream_peer_socket.compat.inc
index e7f6ee11..65bd92f1 100644
--- a/engine/core/io/stream_peer_socket.compat.inc
+++ b/engine/core/io/stream_peer_socket.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "stream_peer_socket.h"
-
-#include "core/object/class_db.h"
-
 namespace compat::StreamPeerTCP {
 enum class Status {
 	STATUS_NONE = StreamPeerSocket::STATUS_NONE,
@@ -53,4 +49,4 @@ void StreamPeerSocket::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_status"), &StreamPeerSocket::_get_status_compat_107954);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/core/io/stream_peer_socket.cpp b/engine/core/io/stream_peer_socket.cpp
index 1fa0b3ec..a60ea118 100644
--- a/engine/core/io/stream_peer_socket.cpp
+++ b/engine/core/io/stream_peer_socket.cpp
@@ -31,9 +31,6 @@
 #include "stream_peer_socket.h"
 #include "stream_peer_socket.compat.inc"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-
 Error StreamPeerSocket::poll() {
 	if (status == STATUS_CONNECTED) {
 		Error err;
diff --git a/engine/core/io/stream_peer_tcp.cpp b/engine/core/io/stream_peer_tcp.cpp
index e3b6dfb2..d5b5f34c 100644
--- a/engine/core/io/stream_peer_tcp.cpp
+++ b/engine/core/io/stream_peer_tcp.cpp
@@ -31,8 +31,6 @@
 #include "stream_peer_tcp.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 
 void StreamPeerTCP::accept_socket(Ref<NetSocket> p_sock, const NetSocket::Address &p_addr) {
 	_sock = p_sock;
diff --git a/engine/core/io/stream_peer_tcp.h b/engine/core/io/stream_peer_tcp.h
index 62f0f99e..e472a46c 100644
--- a/engine/core/io/stream_peer_tcp.h
+++ b/engine/core/io/stream_peer_tcp.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/ip.h"
 #include "core/io/ip_address.h"
 #include "core/io/stream_peer_socket.h"
 
diff --git a/engine/core/io/stream_peer_tls.cpp b/engine/core/io/stream_peer_tls.cpp
index 3eb51c9b..f04e217a 100644
--- a/engine/core/io/stream_peer_tls.cpp
+++ b/engine/core/io/stream_peer_tls.cpp
@@ -30,7 +30,7 @@
 
 #include "stream_peer_tls.h"
 
-#include "core/object/class_db.h"
+#include "core/config/engine.h"
 
 StreamPeerTLS *(*StreamPeerTLS::_create)(bool p_notify_postinitialize) = nullptr;
 
diff --git a/engine/core/io/stream_peer_uds.cpp b/engine/core/io/stream_peer_uds.cpp
index ec70a78d..70e3220d 100644
--- a/engine/core/io/stream_peer_uds.cpp
+++ b/engine/core/io/stream_peer_uds.cpp
@@ -31,8 +31,6 @@
 #include "stream_peer_uds.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 
 void StreamPeerUDS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("bind", "path"), &StreamPeerUDS::bind);
diff --git a/engine/core/io/tcp_server.cpp b/engine/core/io/tcp_server.cpp
index cf0943ef..e8728bd9 100644
--- a/engine/core/io/tcp_server.cpp
+++ b/engine/core/io/tcp_server.cpp
@@ -30,8 +30,6 @@
 
 #include "tcp_server.h"
 
-#include "core/object/class_db.h"
-
 void TCPServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "port", "bind_address"), &TCPServer::listen, DEFVAL("*"));
 	ClassDB::bind_method(D_METHOD("get_local_port"), &TCPServer::get_local_port);
diff --git a/engine/core/io/tcp_server.h b/engine/core/io/tcp_server.h
index c1967b92..4e3248a8 100644
--- a/engine/core/io/tcp_server.h
+++ b/engine/core/io/tcp_server.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/io/ip_address.h"
+#include "core/io/ip.h"
 #include "core/io/socket_server.h"
 #include "core/io/stream_peer_tcp.h"
 
diff --git a/engine/core/io/udp_server.cpp b/engine/core/io/udp_server.cpp
index a4a53b39..ada0e09a 100644
--- a/engine/core/io/udp_server.cpp
+++ b/engine/core/io/udp_server.cpp
@@ -30,8 +30,6 @@
 
 #include "udp_server.h"
 
-#include "core/object/class_db.h"
-
 void UDPServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "port", "bind_address"), &UDPServer::listen, DEFVAL("*"));
 	ClassDB::bind_method(D_METHOD("poll"), &UDPServer::poll);
@@ -149,6 +147,7 @@ void UDPServer::set_max_pending_connections(int p_max) {
 		if (!E) {
 			break;
 		}
+		memdelete(E->get().peer);
 		pending.erase(E);
 	}
 }
@@ -191,6 +190,7 @@ void UDPServer::stop() {
 	E = pending.front();
 	while (E) {
 		E->get().peer->disconnect_shared_socket();
+		memdelete(E->get().peer);
 		E = E->next();
 	}
 	peers.clear();
diff --git a/engine/core/io/udp_server.h b/engine/core/io/udp_server.h
index f2226b64..9edf4318 100644
--- a/engine/core/io/udp_server.h
+++ b/engine/core/io/udp_server.h
@@ -42,7 +42,7 @@ protected:
 	};
 
 	struct Peer {
-		Ref<PacketPeerUDP> peer;
+		PacketPeerUDP *peer = nullptr;
 		IPAddress ip;
 		uint16_t port = 0;
 
diff --git a/engine/core/io/uds_server.cpp b/engine/core/io/uds_server.cpp
index 8249c80f..e93262a0 100644
--- a/engine/core/io/uds_server.cpp
+++ b/engine/core/io/uds_server.cpp
@@ -30,8 +30,6 @@
 
 #include "uds_server.h"
 
-#include "core/object/class_db.h"
-
 void UDSServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "path"), &UDSServer::listen);
 	ClassDB::bind_method(D_METHOD("take_connection"), &UDSServer::take_connection);
diff --git a/engine/core/io/xml_parser.cpp b/engine/core/io/xml_parser.cpp
index 40f0e48e..a50a1723 100644
--- a/engine/core/io/xml_parser.cpp
+++ b/engine/core/io/xml_parser.cpp
@@ -31,7 +31,6 @@
 #include "xml_parser.h"
 
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 
 //#define DEBUG_XML
 
diff --git a/engine/core/io/xml_parser.h b/engine/core/io/xml_parser.h
index 01d763cd..911d2b11 100644
--- a/engine/core/io/xml_parser.h
+++ b/engine/core/io/xml_parser.h
@@ -33,7 +33,6 @@
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
-#include "core/variant/type_info.h"
 
 /*
   Based on irrXML (see their zlib license). Added mainly for compatibility with their Collada loader.
diff --git a/engine/core/io/zip_io.h b/engine/core/io/zip_io.h
index f925a1f5..82004d9c 100644
--- a/engine/core/io/zip_io.h
+++ b/engine/core/io/zip_io.h
@@ -32,9 +32,11 @@
 
 #include "core/io/file_access.h"
 
-// This file serves as the Godot interface to minizip.
-#include <thirdparty/minizip/unzip.h> // IWYU pragma: export
-#include <thirdparty/minizip/zip.h> // IWYU pragma: export
+// Not directly used in this header, but assumed available in downstream users
+// like platform/*/export/export.cpp. Could be fixed, but probably better to have
+// thirdparty includes in as little headers as possible.
+#include "thirdparty/minizip/unzip.h"
+#include "thirdparty/minizip/zip.h"
 
 // Get the current file info and safely convert the full filepath to a String.
 int godot_unzip_get_current_file_info(unzFile p_zip_file, unz_file_info64 &r_file_info, String &r_filepath);
diff --git a/engine/core/math/a_star.compat.inc b/engine/core/math/a_star.compat.inc
index b2077d02..664d7ffd 100644
--- a/engine/core/math/a_star.compat.inc
+++ b/engine/core/math/a_star.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "a_star.h"
-
-#include "core/object/class_db.h"
-
 Vector<int64_t> AStar3D::_get_id_path_bind_compat_88047(int64_t p_from_id, int64_t p_to_id) {
 	return get_id_path(p_from_id, p_to_id, false);
 }
diff --git a/engine/core/math/a_star.cpp b/engine/core/math/a_star.cpp
index bbd5be86..df0db9a1 100644
--- a/engine/core/math/a_star.cpp
+++ b/engine/core/math/a_star.cpp
@@ -32,7 +32,6 @@
 #include "a_star.compat.inc"
 
 #include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
 
 int64_t AStar3D::get_available_point_id() const {
 	if (points.has(last_free_id)) {
diff --git a/engine/core/math/a_star.h b/engine/core/math/a_star.h
index 8e643f45..048ead78 100644
--- a/engine/core/math/a_star.h
+++ b/engine/core/math/a_star.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/templates/a_hash_map.h"
 
diff --git a/engine/core/math/a_star_grid_2d.compat.inc b/engine/core/math/a_star_grid_2d.compat.inc
index 5871d0b0..e7124c24 100644
--- a/engine/core/math/a_star_grid_2d.compat.inc
+++ b/engine/core/math/a_star_grid_2d.compat.inc
@@ -30,9 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "a_star_grid_2d.h"
-
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 TypedArray<Vector2i> AStarGrid2D::_get_id_path_bind_compat_88047(const Vector2i &p_from_id, const Vector2i &p_to_id) {
diff --git a/engine/core/math/a_star_grid_2d.cpp b/engine/core/math/a_star_grid_2d.cpp
index 4f6d6051..9a6e804a 100644
--- a/engine/core/math/a_star_grid_2d.cpp
+++ b/engine/core/math/a_star_grid_2d.cpp
@@ -31,7 +31,6 @@
 #include "a_star_grid_2d.h"
 #include "a_star_grid_2d.compat.inc"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 static real_t heuristic_euclidean(const Vector2i &p_from, const Vector2i &p_to) {
@@ -159,7 +158,7 @@ void AStarGrid2D::update() {
 			solid_mask.push_back(false);
 		}
 		solid_mask.push_back(true);
-		points.push_back(std::move(line));
+		points.push_back(line);
 	}
 
 	for (int32_t x = region.position.x; x < end_x + 2; x++) {
diff --git a/engine/core/math/a_star_grid_2d.h b/engine/core/math/a_star_grid_2d.h
index 14f8ccc8..4883c092 100644
--- a/engine/core/math/a_star_grid_2d.h
+++ b/engine/core/math/a_star_grid_2d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/templates/local_vector.h"
 
diff --git a/engine/core/math/basis.cpp b/engine/core/math/basis.cpp
index 48bba25d..5931ecb2 100644
--- a/engine/core/math/basis.cpp
+++ b/engine/core/math/basis.cpp
@@ -54,8 +54,7 @@ void Basis::invert() {
 }
 
 void Basis::orthonormalize() {
-	// Orthonormalizable check is done in Vector3 class below.
-	// Gram-Schmidt Process:
+	// Gram-Schmidt Process
 
 	Vector3 x = get_column(0);
 	Vector3 y = get_column(1);
diff --git a/engine/core/math/bvh.h b/engine/core/math/bvh.h
index 3208c552..5f0bf23f 100644
--- a/engine/core/math/bvh.h
+++ b/engine/core/math/bvh.h
@@ -50,12 +50,11 @@
 // TYPE_BODY
 // and pairable_mask is either 0 if static, or set to all if non static
 
-#include "core/math/bvh_tree.h"
+#include "bvh_tree.h"
+
 #include "core/math/geometry_3d.h"
 #include "core/os/mutex.h"
 
-#include <climits> // INT_MAX
-
 #define BVHTREE_CLASS BVH_Tree<T, NUM_TREES, 2, MAX_ITEMS, USER_PAIR_TEST_FUNCTION, USER_CULL_TEST_FUNCTION, USE_PAIRS, BOUNDS, POINT>
 #define BVH_LOCKED_FUNCTION BVHLockedFunction _lock_guard(&_mutex, BVH_THREAD_SAFE &&_thread_safe);
 
diff --git a/engine/core/math/bvh_abb.h b/engine/core/math/bvh_abb.h
index cfb5ebd4..b96ea085 100644
--- a/engine/core/math/bvh_abb.h
+++ b/engine/core/math/bvh_abb.h
@@ -32,8 +32,6 @@
 
 #include "core/math/aabb.h"
 
-#include <cfloat> // FLT_MAX
-
 // special optimized version of axis aligned bounding box
 template <typename BOUNDS = AABB, typename POINT = Vector3>
 struct BVH_ABB {
diff --git a/engine/core/math/bvh_tree.h b/engine/core/math/bvh_tree.h
index 7c76a329..d33b8608 100644
--- a/engine/core/math/bvh_tree.h
+++ b/engine/core/math/bvh_tree.h
@@ -44,6 +44,8 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/pooled_list.h"
 
+#include <climits>
+
 #define BVHABB_CLASS BVH_ABB<BOUNDS, POINT>
 
 // not sure if this is better yet so making optional
@@ -169,8 +171,8 @@ template <typename T, int NUM_TREES, int MAX_CHILDREN, int MAX_ITEMS, typename U
 class BVH_Tree {
 	friend class BVH;
 
-#include "core/math/bvh_pair.inc"
-#include "core/math/bvh_structs.inc"
+#include "bvh_pair.inc"
+#include "bvh_structs.inc"
 
 public:
 	BVH_Tree() {
@@ -440,14 +442,14 @@ private:
 		return child_node_id;
 	}
 
-#include "core/math/bvh_cull.inc"
-#include "core/math/bvh_debug.inc"
-#include "core/math/bvh_integrity.inc"
-#include "core/math/bvh_logic.inc"
-#include "core/math/bvh_misc.inc"
-#include "core/math/bvh_public.inc"
-#include "core/math/bvh_refit.inc"
-#include "core/math/bvh_split.inc"
+#include "bvh_cull.inc"
+#include "bvh_debug.inc"
+#include "bvh_integrity.inc"
+#include "bvh_logic.inc"
+#include "bvh_misc.inc"
+#include "bvh_public.inc"
+#include "bvh_refit.inc"
+#include "bvh_split.inc"
 };
 
 #undef VERBOSE_PRINT
diff --git a/engine/core/math/color.cpp b/engine/core/math/color.cpp
index ca82489b..bda3e2f9 100644
--- a/engine/core/math/color.cpp
+++ b/engine/core/math/color.cpp
@@ -30,12 +30,12 @@
 
 #include "color.h"
 
-#include "core/math/color_names.inc"
+#include "color_names.inc"
 #include "core/math/math_funcs.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 
-#include <thirdparty/misc/ok_color.h>
+#include "thirdparty/misc/ok_color.h"
 
 uint32_t Color::to_argb32() const {
 	uint32_t c = (uint8_t)Math::round(a * 255.0f);
diff --git a/engine/core/math/convex_hull.cpp b/engine/core/math/convex_hull.cpp
index e72515c9..87f0652c 100644
--- a/engine/core/math/convex_hull.cpp
+++ b/engine/core/math/convex_hull.cpp
@@ -64,8 +64,6 @@ subject to the following restrictions:
 #include "core/templates/a_hash_map.h"
 #include "core/templates/paged_allocator.h"
 
-#include <cfloat> // FLT_MAX
-
 //#define DEBUG_CONVEX_HULL
 //#define SHOW_ITERATIONS
 
@@ -75,17 +73,17 @@ subject to the following restrictions:
 // -- GODOT end --
 
 #ifdef DEBUG_ENABLED
-#define CHULL_ASSERT(m_cond) \
-	if constexpr (true) { \
-		if (unlikely(!(m_cond))) { \
+#define CHULL_ASSERT(m_cond)                                     \
+	if constexpr (true) {                                        \
+		if (unlikely(!(m_cond))) {                               \
 			ERR_PRINT("Assertion \"" _STR(m_cond) "\" failed."); \
-		} \
-	} else \
+		}                                                        \
+	} else                                                       \
 		((void)0)
 #else
 #define CHULL_ASSERT(m_cond) \
-	if constexpr (true) { \
-	} else \
+	if constexpr (true) {    \
+	} else                   \
 		((void)0)
 #endif
 
diff --git a/engine/core/math/delaunay_3d.h b/engine/core/math/delaunay_3d.h
index 2d2ad84d..7acf8cbc 100644
--- a/engine/core/math/delaunay_3d.h
+++ b/engine/core/math/delaunay_3d.h
@@ -39,7 +39,7 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/vector.h"
 
-#include <thirdparty/misc/r128.h>
+#include "thirdparty/misc/r128.h"
 
 class Delaunay3D {
 	struct Simplex;
diff --git a/engine/core/math/expression.h b/engine/core/math/expression.h
index 704eee0e..c2310405 100644
--- a/engine/core/math/expression.h
+++ b/engine/core/math/expression.h
@@ -35,7 +35,7 @@
 class Expression : public RefCounted {
 	GDCLASS(Expression, RefCounted);
 
-protected:
+private:
 	String expression;
 
 	int str_ofs = 0;
@@ -100,7 +100,7 @@ protected:
 		error_set = true;
 	}
 
-	virtual Error _get_token(Token &r_token);
+	Error _get_token(Token &r_token);
 
 	String error_str;
 	bool error_set = true;
diff --git a/engine/core/math/face3.cpp b/engine/core/math/face3.cpp
index 6a210560..5972f429 100644
--- a/engine/core/math/face3.cpp
+++ b/engine/core/math/face3.cpp
@@ -144,22 +144,22 @@ bool Face3::intersects_aabb(const AABB &p_aabb) const {
 		return false;
 	}
 
-#define TEST_AXIS(m_ax) \
-	/** TEST FACE AXIS */ \
-	{ \
-		real_t aabb_min = p_aabb.position.m_ax; \
+#define TEST_AXIS(m_ax)                                            \
+	/** TEST FACE AXIS */                                          \
+	{                                                              \
+		real_t aabb_min = p_aabb.position.m_ax;                    \
 		real_t aabb_max = p_aabb.position.m_ax + p_aabb.size.m_ax; \
-		real_t tri_min = vertex[0].m_ax; \
-		real_t tri_max = vertex[0].m_ax; \
-		for (int i = 1; i < 3; i++) { \
-			if (vertex[i].m_ax > tri_max) \
-				tri_max = vertex[i].m_ax; \
-			if (vertex[i].m_ax < tri_min) \
-				tri_min = vertex[i].m_ax; \
-		} \
-\
-		if (tri_max < aabb_min || aabb_max < tri_min) \
-			return false; \
+		real_t tri_min = vertex[0].m_ax;                           \
+		real_t tri_max = vertex[0].m_ax;                           \
+		for (int i = 1; i < 3; i++) {                              \
+			if (vertex[i].m_ax > tri_max)                          \
+				tri_max = vertex[i].m_ax;                          \
+			if (vertex[i].m_ax < tri_min)                          \
+				tri_min = vertex[i].m_ax;                          \
+		}                                                          \
+                                                                   \
+		if (tri_max < aabb_min || aabb_max < tri_min)              \
+			return false;                                          \
 	}
 
 	TEST_AXIS(x);
diff --git a/engine/core/math/face3.h b/engine/core/math/face3.h
index 0ae5efc4..96e4584c 100644
--- a/engine/core/math/face3.h
+++ b/engine/core/math/face3.h
@@ -102,20 +102,20 @@ bool Face3::intersects_aabb2(const AABB &p_aabb) const {
 		return false; //does not intersect the plane
 	}
 
-#define TEST_AXIS(m_ax) \
-	{ \
-		real_t aabb_min = p_aabb.position.m_ax; \
+#define TEST_AXIS(m_ax)                                            \
+	{                                                              \
+		real_t aabb_min = p_aabb.position.m_ax;                    \
 		real_t aabb_max = p_aabb.position.m_ax + p_aabb.size.m_ax; \
-		real_t tri_min, tri_max; \
-		for (int i = 0; i < 3; i++) { \
-			if (i == 0 || vertex[i].m_ax > tri_max) \
-				tri_max = vertex[i].m_ax; \
-			if (i == 0 || vertex[i].m_ax < tri_min) \
-				tri_min = vertex[i].m_ax; \
-		} \
-\
-		if (tri_max < aabb_min || aabb_max < tri_min) \
-			return false; \
+		real_t tri_min, tri_max;                                   \
+		for (int i = 0; i < 3; i++) {                              \
+			if (i == 0 || vertex[i].m_ax > tri_max)                \
+				tri_max = vertex[i].m_ax;                          \
+			if (i == 0 || vertex[i].m_ax < tri_min)                \
+				tri_min = vertex[i].m_ax;                          \
+		}                                                          \
+                                                                   \
+		if (tri_max < aabb_min || aabb_max < tri_min)              \
+			return false;                                          \
 	}
 
 	TEST_AXIS(x);
diff --git a/engine/core/math/geometry_2d.cpp b/engine/core/math/geometry_2d.cpp
index 5ac8b516..f6d0ed74 100644
--- a/engine/core/math/geometry_2d.cpp
+++ b/engine/core/math/geometry_2d.cpp
@@ -30,14 +30,12 @@
 
 #include "geometry_2d.h"
 
-#include "core/math/math_funcs_binary.h"
-
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Walloc-zero")
-#include <thirdparty/clipper2/include/clipper2/clipper.h>
+#include "thirdparty/clipper2/include/clipper2/clipper.h"
 GODOT_GCC_WARNING_POP
-#include <thirdparty/misc/polypartition.h>
+#include "thirdparty/misc/polypartition.h"
 #define STB_RECT_PACK_IMPLEMENTATION
-#include <thirdparty/misc/stb_rect_pack.h>
+#include "thirdparty/misc/stb_rect_pack.h"
 
 const int clipper_precision = 5; // Based on CMP_EPSILON.
 
@@ -229,8 +227,8 @@ void Geometry2D::make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_re
 	real_t best_aspect = 1e20;
 
 	for (int i = 0; i < results.size(); i++) {
-		real_t h = Math::next_power_of_2((uint32_t)results[i].max_h);
-		real_t w = Math::next_power_of_2((uint32_t)results[i].max_w);
+		real_t h = next_power_of_2((uint32_t)results[i].max_h);
+		real_t w = next_power_of_2((uint32_t)results[i].max_w);
 		real_t aspect = h > w ? h / w : w / h;
 		if (aspect < best_aspect) {
 			best = i;
diff --git a/engine/core/math/geometry_3d.cpp b/engine/core/math/geometry_3d.cpp
index 987e0c23..15799cdb 100644
--- a/engine/core/math/geometry_3d.cpp
+++ b/engine/core/math/geometry_3d.cpp
@@ -237,15 +237,15 @@ static inline void _plot_face(uint8_t ***p_cell_status, int x, int y, int z, int
 	int div_z = len_z > 1 ? 2 : 1;
 
 #define SPLIT_DIV(m_i, m_div, m_v, m_len_v, m_new_v, m_new_len_v) \
-	if (m_div == 1) { \
-		m_new_v = m_v; \
-		m_new_len_v = 1; \
-	} else if (m_i == 0) { \
-		m_new_v = m_v; \
-		m_new_len_v = m_len_v / 2; \
-	} else { \
-		m_new_v = m_v + m_len_v / 2; \
-		m_new_len_v = m_len_v - m_len_v / 2; \
+	if (m_div == 1) {                                             \
+		m_new_v = m_v;                                            \
+		m_new_len_v = 1;                                          \
+	} else if (m_i == 0) {                                        \
+		m_new_v = m_v;                                            \
+		m_new_len_v = m_len_v / 2;                                \
+	} else {                                                      \
+		m_new_v = m_v + m_len_v / 2;                              \
+		m_new_len_v = m_len_v - m_len_v / 2;                      \
 	}
 
 	int new_x;
diff --git a/engine/core/math/geometry_3d.h b/engine/core/math/geometry_3d.h
index ec98bd9f..6af902b2 100644
--- a/engine/core/math/geometry_3d.h
+++ b/engine/core/math/geometry_3d.h
@@ -37,827 +37,828 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/vector.h"
 
-namespace Geometry3D {
-void get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt);
-real_t get_closest_distance_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1);
+class Geometry3D {
+public:
+	static void get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt);
+	static real_t get_closest_distance_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1);
 
-inline bool ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2, Vector3 *r_res = nullptr) {
-	Vector3 e1 = p_v1 - p_v0;
-	Vector3 e2 = p_v2 - p_v0;
-	Vector3 h = p_dir.cross(e2);
-	real_t a = e1.dot(h);
-	if (Math::is_zero_approx(a)) { // Parallel test.
-		return false;
-	}
-
-	real_t f = 1.0f / a;
-
-	Vector3 s = p_from - p_v0;
-	real_t u = f * s.dot(h);
-
-	if ((u < 0.0f) || (u > 1.0f)) {
-		return false;
-	}
-
-	Vector3 q = s.cross(e1);
-
-	real_t v = f * p_dir.dot(q);
-
-	if ((v < 0.0f) || (u + v > 1.0f)) {
-		return false;
-	}
-
-	// At this stage we can compute t to find out where
-	// the intersection point is on the line.
-	real_t t = f * e2.dot(q);
-
-	if (t > 0.00001f) { // ray intersection
-		if (r_res) {
-			*r_res = p_from + p_dir * t;
+	static inline bool ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2, Vector3 *r_res = nullptr) {
+		Vector3 e1 = p_v1 - p_v0;
+		Vector3 e2 = p_v2 - p_v0;
+		Vector3 h = p_dir.cross(e2);
+		real_t a = e1.dot(h);
+		if (Math::is_zero_approx(a)) { // Parallel test.
+			return false;
 		}
-		return true;
-	} else { // This means that there is a line intersection but not a ray intersection.
-		return false;
-	}
-}
 
-inline bool segment_intersects_triangle(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2, Vector3 *r_res = nullptr) {
-	Vector3 rel = p_to - p_from;
-	Vector3 e1 = p_v1 - p_v0;
-	Vector3 e2 = p_v2 - p_v0;
-	Vector3 h = rel.cross(e2);
-	real_t a = e1.dot(h);
-	if (Math::is_zero_approx(a)) { // Parallel test.
-		return false;
-	}
+		real_t f = 1.0f / a;
 
-	real_t f = 1.0f / a;
+		Vector3 s = p_from - p_v0;
+		real_t u = f * s.dot(h);
 
-	Vector3 s = p_from - p_v0;
-	real_t u = f * s.dot(h);
-
-	if ((u < 0.0f) || (u > 1.0f)) {
-		return false;
-	}
-
-	Vector3 q = s.cross(e1);
-
-	real_t v = f * rel.dot(q);
-
-	if ((v < 0.0f) || (u + v > 1.0f)) {
-		return false;
-	}
-
-	// At this stage we can compute t to find out where
-	// the intersection point is on the line.
-	real_t t = f * e2.dot(q);
-
-	if (t > (real_t)CMP_EPSILON && t <= 1.0f) { // Ray intersection.
-		if (r_res) {
-			*r_res = p_from + rel * t;
+		if ((u < 0.0f) || (u > 1.0f)) {
+			return false;
 		}
-		return true;
-	} else { // This means that there is a line intersection but not a ray intersection.
-		return false;
-	}
-}
 
-inline bool segment_intersects_sphere(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 *r_res = nullptr, Vector3 *r_norm = nullptr) {
-	Vector3 sphere_pos = p_sphere_pos - p_from;
-	Vector3 rel = (p_to - p_from);
-	real_t rel_l = rel.length();
-	if (rel_l < (real_t)CMP_EPSILON) {
-		return false; // Both points are the same.
-	}
-	Vector3 normal = rel / rel_l;
+		Vector3 q = s.cross(e1);
 
-	real_t sphere_d = normal.dot(sphere_pos);
+		real_t v = f * p_dir.dot(q);
 
-	real_t ray_distance = sphere_pos.distance_to(normal * sphere_d);
+		if ((v < 0.0f) || (u + v > 1.0f)) {
+			return false;
+		}
 
-	if (ray_distance >= p_sphere_radius) {
-		return false;
-	}
+		// At this stage we can compute t to find out where
+		// the intersection point is on the line.
+		real_t t = f * e2.dot(q);
 
-	real_t inters_d2 = p_sphere_radius * p_sphere_radius - ray_distance * ray_distance;
-	real_t inters_d = sphere_d;
-
-	if (inters_d2 >= (real_t)CMP_EPSILON) {
-		inters_d -= Math::sqrt(inters_d2);
-	}
-
-	// Check in segment.
-	if (inters_d < 0 || inters_d > rel_l) {
-		return false;
-	}
-
-	Vector3 result = p_from + normal * inters_d;
-
-	if (r_res) {
-		*r_res = result;
-	}
-	if (r_norm) {
-		*r_norm = (result - p_sphere_pos).normalized();
-	}
-
-	return true;
-}
-
-inline bool segment_intersects_cylinder(const Vector3 &p_from, const Vector3 &p_to, real_t p_height, real_t p_radius, Vector3 *r_res = nullptr, Vector3 *r_norm = nullptr, int p_cylinder_axis = 2) {
-	Vector3 rel = (p_to - p_from);
-	real_t rel_l = rel.length();
-	if (rel_l < (real_t)CMP_EPSILON) {
-		return false; // Both points are the same.
-	}
-
-	ERR_FAIL_COND_V(p_cylinder_axis < 0, false);
-	ERR_FAIL_COND_V(p_cylinder_axis > 2, false);
-	Vector3 cylinder_axis;
-	cylinder_axis[p_cylinder_axis] = 1.0f;
-
-	// First check if they are parallel.
-	Vector3 normal = (rel / rel_l);
-	Vector3 crs = normal.cross(cylinder_axis);
-	real_t crs_l = crs.length();
-
-	Vector3 axis_dir;
-
-	if (crs_l < (real_t)CMP_EPSILON) {
-		Vector3 side_axis;
-		side_axis[(p_cylinder_axis + 1) % 3] = 1.0f; // Any side axis OK.
-		axis_dir = side_axis;
-	} else {
-		axis_dir = crs / crs_l;
-	}
-
-	real_t dist = axis_dir.dot(p_from);
-
-	if (dist >= p_radius) {
-		return false; // Too far away.
-	}
-
-	// Convert to 2D.
-	real_t w2 = p_radius * p_radius - dist * dist;
-	if (w2 < (real_t)CMP_EPSILON) {
-		return false; // Avoid numerical error.
-	}
-	Size2 size(Math::sqrt(w2), p_height * 0.5f);
-
-	Vector3 side_dir = axis_dir.cross(cylinder_axis).normalized();
-
-	Vector2 from2D(side_dir.dot(p_from), p_from[p_cylinder_axis]);
-	Vector2 to2D(side_dir.dot(p_to), p_to[p_cylinder_axis]);
-
-	real_t min = 0, max = 1;
-
-	int axis = -1;
-
-	for (int i = 0; i < 2; i++) {
-		real_t seg_from = from2D[i];
-		real_t seg_to = to2D[i];
-		real_t box_begin = -size[i];
-		real_t box_end = size[i];
-		real_t cmin, cmax;
-
-		if (seg_from < seg_to) {
-			if (seg_from > box_end || seg_to < box_begin) {
-				return false;
+		if (t > 0.00001f) { // ray intersection
+			if (r_res) {
+				*r_res = p_from + p_dir * t;
 			}
-			real_t length = seg_to - seg_from;
-			cmin = (seg_from < box_begin) ? ((box_begin - seg_from) / length) : 0;
-			cmax = (seg_to > box_end) ? ((box_end - seg_from) / length) : 1;
-
-		} else {
-			if (seg_to > box_end || seg_from < box_begin) {
-				return false;
-			}
-			real_t length = seg_to - seg_from;
-			cmin = (seg_from > box_end) ? (box_end - seg_from) / length : 0;
-			cmax = (seg_to < box_begin) ? (box_begin - seg_from) / length : 1;
-		}
-
-		if (cmin > min) {
-			min = cmin;
-			axis = i;
-		}
-		if (cmax < max) {
-			max = cmax;
-		}
-		if (max < min) {
+			return true;
+		} else { // This means that there is a line intersection but not a ray intersection.
 			return false;
 		}
 	}
 
-	// Convert to 3D again.
-	Vector3 result = p_from + (rel * min);
-	Vector3 res_normal = result;
+	static inline bool segment_intersects_triangle(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2, Vector3 *r_res = nullptr) {
+		Vector3 rel = p_to - p_from;
+		Vector3 e1 = p_v1 - p_v0;
+		Vector3 e2 = p_v2 - p_v0;
+		Vector3 h = rel.cross(e2);
+		real_t a = e1.dot(h);
+		if (Math::is_zero_approx(a)) { // Parallel test.
+			return false;
+		}
 
-	if (axis == 0) {
-		res_normal[p_cylinder_axis] = 0;
-	} else {
-		int axis_side = (p_cylinder_axis + 1) % 3;
-		res_normal[axis_side] = 0;
-		axis_side = (axis_side + 1) % 3;
-		res_normal[axis_side] = 0;
+		real_t f = 1.0f / a;
+
+		Vector3 s = p_from - p_v0;
+		real_t u = f * s.dot(h);
+
+		if ((u < 0.0f) || (u > 1.0f)) {
+			return false;
+		}
+
+		Vector3 q = s.cross(e1);
+
+		real_t v = f * rel.dot(q);
+
+		if ((v < 0.0f) || (u + v > 1.0f)) {
+			return false;
+		}
+
+		// At this stage we can compute t to find out where
+		// the intersection point is on the line.
+		real_t t = f * e2.dot(q);
+
+		if (t > (real_t)CMP_EPSILON && t <= 1.0f) { // Ray intersection.
+			if (r_res) {
+				*r_res = p_from + rel * t;
+			}
+			return true;
+		} else { // This means that there is a line intersection but not a ray intersection.
+			return false;
+		}
 	}
 
-	res_normal.normalize();
+	static inline bool segment_intersects_sphere(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 *r_res = nullptr, Vector3 *r_norm = nullptr) {
+		Vector3 sphere_pos = p_sphere_pos - p_from;
+		Vector3 rel = (p_to - p_from);
+		real_t rel_l = rel.length();
+		if (rel_l < (real_t)CMP_EPSILON) {
+			return false; // Both points are the same.
+		}
+		Vector3 normal = rel / rel_l;
 
-	if (r_res) {
-		*r_res = result;
-	}
-	if (r_norm) {
-		*r_norm = res_normal;
+		real_t sphere_d = normal.dot(sphere_pos);
+
+		real_t ray_distance = sphere_pos.distance_to(normal * sphere_d);
+
+		if (ray_distance >= p_sphere_radius) {
+			return false;
+		}
+
+		real_t inters_d2 = p_sphere_radius * p_sphere_radius - ray_distance * ray_distance;
+		real_t inters_d = sphere_d;
+
+		if (inters_d2 >= (real_t)CMP_EPSILON) {
+			inters_d -= Math::sqrt(inters_d2);
+		}
+
+		// Check in segment.
+		if (inters_d < 0 || inters_d > rel_l) {
+			return false;
+		}
+
+		Vector3 result = p_from + normal * inters_d;
+
+		if (r_res) {
+			*r_res = result;
+		}
+		if (r_norm) {
+			*r_norm = (result - p_sphere_pos).normalized();
+		}
+
+		return true;
 	}
 
-	return true;
-}
+	static inline bool segment_intersects_cylinder(const Vector3 &p_from, const Vector3 &p_to, real_t p_height, real_t p_radius, Vector3 *r_res = nullptr, Vector3 *r_norm = nullptr, int p_cylinder_axis = 2) {
+		Vector3 rel = (p_to - p_from);
+		real_t rel_l = rel.length();
+		if (rel_l < (real_t)CMP_EPSILON) {
+			return false; // Both points are the same.
+		}
 
-inline bool segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Plane *p_planes, int p_plane_count, Vector3 *r_res, Vector3 *r_norm) {
-	real_t min = -1e20, max = 1e20;
+		ERR_FAIL_COND_V(p_cylinder_axis < 0, false);
+		ERR_FAIL_COND_V(p_cylinder_axis > 2, false);
+		Vector3 cylinder_axis;
+		cylinder_axis[p_cylinder_axis] = 1.0f;
 
-	Vector3 rel = p_to - p_from;
-	real_t rel_l = rel.length();
+		// First check if they are parallel.
+		Vector3 normal = (rel / rel_l);
+		Vector3 crs = normal.cross(cylinder_axis);
+		real_t crs_l = crs.length();
 
-	if (rel_l < (real_t)CMP_EPSILON) {
-		return false;
-	}
+		Vector3 axis_dir;
 
-	Vector3 dir = rel / rel_l;
+		if (crs_l < (real_t)CMP_EPSILON) {
+			Vector3 side_axis;
+			side_axis[(p_cylinder_axis + 1) % 3] = 1.0f; // Any side axis OK.
+			axis_dir = side_axis;
+		} else {
+			axis_dir = crs / crs_l;
+		}
 
-	int min_index = -1;
+		real_t dist = axis_dir.dot(p_from);
 
-	for (int i = 0; i < p_plane_count; i++) {
-		const Plane &p = p_planes[i];
+		if (dist >= p_radius) {
+			return false; // Too far away.
+		}
 
-		real_t den = p.normal.dot(dir);
+		// Convert to 2D.
+		real_t w2 = p_radius * p_radius - dist * dist;
+		if (w2 < (real_t)CMP_EPSILON) {
+			return false; // Avoid numerical error.
+		}
+		Size2 size(Math::sqrt(w2), p_height * 0.5f);
 
-		if (Math::abs(den) <= (real_t)CMP_EPSILON) {
-			if (p.is_point_over(p_from)) {
-				// Separating plane.
+		Vector3 side_dir = axis_dir.cross(cylinder_axis).normalized();
+
+		Vector2 from2D(side_dir.dot(p_from), p_from[p_cylinder_axis]);
+		Vector2 to2D(side_dir.dot(p_to), p_to[p_cylinder_axis]);
+
+		real_t min = 0, max = 1;
+
+		int axis = -1;
+
+		for (int i = 0; i < 2; i++) {
+			real_t seg_from = from2D[i];
+			real_t seg_to = to2D[i];
+			real_t box_begin = -size[i];
+			real_t box_end = size[i];
+			real_t cmin, cmax;
+
+			if (seg_from < seg_to) {
+				if (seg_from > box_end || seg_to < box_begin) {
+					return false;
+				}
+				real_t length = seg_to - seg_from;
+				cmin = (seg_from < box_begin) ? ((box_begin - seg_from) / length) : 0;
+				cmax = (seg_to > box_end) ? ((box_end - seg_from) / length) : 1;
+
+			} else {
+				if (seg_to > box_end || seg_from < box_begin) {
+					return false;
+				}
+				real_t length = seg_to - seg_from;
+				cmin = (seg_from > box_end) ? (box_end - seg_from) / length : 0;
+				cmax = (seg_to < box_begin) ? (box_begin - seg_from) / length : 1;
+			}
+
+			if (cmin > min) {
+				min = cmin;
+				axis = i;
+			}
+			if (cmax < max) {
+				max = cmax;
+			}
+			if (max < min) {
 				return false;
 			}
-			continue; // Ignore parallel plane.
 		}
 
-		real_t dist = -p.distance_to(p_from) / den;
+		// Convert to 3D again.
+		Vector3 result = p_from + (rel * min);
+		Vector3 res_normal = result;
 
-		if (den > 0) {
-			// Backwards facing plane.
-			if (dist < max) {
-				max = dist;
-			}
+		if (axis == 0) {
+			res_normal[p_cylinder_axis] = 0;
 		} else {
-			// Front facing plane.
-			if (dist > min) {
-				min = dist;
-				min_index = i;
+			int axis_side = (p_cylinder_axis + 1) % 3;
+			res_normal[axis_side] = 0;
+			axis_side = (axis_side + 1) % 3;
+			res_normal[axis_side] = 0;
+		}
+
+		res_normal.normalize();
+
+		if (r_res) {
+			*r_res = result;
+		}
+		if (r_norm) {
+			*r_norm = res_normal;
+		}
+
+		return true;
+	}
+
+	static bool segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Plane *p_planes, int p_plane_count, Vector3 *r_res, Vector3 *r_norm) {
+		real_t min = -1e20, max = 1e20;
+
+		Vector3 rel = p_to - p_from;
+		real_t rel_l = rel.length();
+
+		if (rel_l < (real_t)CMP_EPSILON) {
+			return false;
+		}
+
+		Vector3 dir = rel / rel_l;
+
+		int min_index = -1;
+
+		for (int i = 0; i < p_plane_count; i++) {
+			const Plane &p = p_planes[i];
+
+			real_t den = p.normal.dot(dir);
+
+			if (Math::abs(den) <= (real_t)CMP_EPSILON) {
+				if (p.is_point_over(p_from)) {
+					// Separating plane.
+					return false;
+				}
+				continue; // Ignore parallel plane.
 			}
+
+			real_t dist = -p.distance_to(p_from) / den;
+
+			if (den > 0) {
+				// Backwards facing plane.
+				if (dist < max) {
+					max = dist;
+				}
+			} else {
+				// Front facing plane.
+				if (dist > min) {
+					min = dist;
+					min_index = i;
+				}
+			}
+		}
+
+		if (max <= min || min < 0 || min > rel_l || min_index == -1) { // Exit conditions.
+			return false; // No intersection.
+		}
+
+		if (r_res) {
+			*r_res = p_from + dir * min;
+		}
+		if (r_norm) {
+			*r_norm = p_planes[min_index].normal;
+		}
+
+		return true;
+	}
+
+#ifndef DISABLE_DEPRECATED
+	static Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 *p_segment) {
+		return get_closest_point_to_segment(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
+		Vector3 p = p_point - p_segment_a;
+		Vector3 n = p_segment_b - p_segment_a;
+		real_t l2 = n.length_squared();
+		if (l2 < 1e-20f) {
+			return p_segment_a; // Both points are the same, just give any.
+		}
+
+		real_t d = n.dot(p) / l2;
+
+		if (d <= 0.0f) {
+			return p_segment_a; // Before first point.
+		} else if (d >= 1.0f) {
+			return p_segment_b; // After first point.
+		} else {
+			return p_segment_a + n * d; // Inside.
 		}
 	}
 
-	if (max <= min || min < 0 || min > rel_l || min_index == -1) { // Exit conditions.
-		return false; // No intersection.
+#ifndef DISABLE_DEPRECATED
+	static Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 *p_segment) {
+		return get_closest_point_to_segment_uncapped(p_point, p_segment[0], p_segment[1]);
 	}
+#endif // DISABLE_DEPRECATED
 
-	if (r_res) {
-		*r_res = p_from + dir * min;
-	}
-	if (r_norm) {
-		*r_norm = p_planes[min_index].normal;
-	}
+	static Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
+		Vector3 p = p_point - p_segment_a;
+		Vector3 n = p_segment_b - p_segment_a;
+		real_t l2 = n.length_squared();
+		if (l2 < 1e-20f) {
+			return p_segment_a; // Both points are the same, just give any.
+		}
 
-	return true;
-}
+		real_t d = n.dot(p) / l2;
 
-inline Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
-	Vector3 p = p_point - p_segment_a;
-	Vector3 n = p_segment_b - p_segment_a;
-	real_t l2 = n.length_squared();
-	if (l2 < 1e-20f) {
-		return p_segment_a; // Both points are the same, just give any.
-	}
-
-	real_t d = n.dot(p) / l2;
-
-	if (d <= 0.0f) {
-		return p_segment_a; // Before first point.
-	} else if (d >= 1.0f) {
-		return p_segment_b; // After first point.
-	} else {
 		return p_segment_a + n * d; // Inside.
 	}
-}
 
-#ifndef DISABLE_DEPRECATED
-inline Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 *p_segment) {
-	return get_closest_point_to_segment(p_point, p_segment[0], p_segment[1]);
-}
-#endif // DISABLE_DEPRECATED
+	static inline bool point_in_projected_triangle(const Vector3 &p_point, const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) {
+		Vector3 face_n = (p_v1 - p_v3).cross(p_v1 - p_v2);
 
-inline Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
-	Vector3 p = p_point - p_segment_a;
-	Vector3 n = p_segment_b - p_segment_a;
-	real_t l2 = n.length_squared();
-	if (l2 < 1e-20f) {
-		return p_segment_a; // Both points are the same, just give any.
-	}
+		Vector3 n1 = (p_point - p_v3).cross(p_point - p_v2);
 
-	real_t d = n.dot(p) / l2;
+		if (face_n.dot(n1) < 0) {
+			return false;
+		}
 
-	return p_segment_a + n * d; // Inside.
-}
+		Vector3 n2 = (p_v1 - p_v3).cross(p_v1 - p_point);
 
-#ifndef DISABLE_DEPRECATED
-inline Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 *p_segment) {
-	return get_closest_point_to_segment_uncapped(p_point, p_segment[0], p_segment[1]);
-}
-#endif // DISABLE_DEPRECATED
+		if (face_n.dot(n2) < 0) {
+			return false;
+		}
 
-inline bool point_in_projected_triangle(const Vector3 &p_point, const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) {
-	Vector3 face_n = (p_v1 - p_v3).cross(p_v1 - p_v2);
+		Vector3 n3 = (p_v1 - p_point).cross(p_v1 - p_v2);
 
-	Vector3 n1 = (p_point - p_v3).cross(p_point - p_v2);
+		if (face_n.dot(n3) < 0) {
+			return false;
+		}
 
-	if (face_n.dot(n1) < 0) {
-		return false;
-	}
-
-	Vector3 n2 = (p_v1 - p_v3).cross(p_v1 - p_point);
-
-	if (face_n.dot(n2) < 0) {
-		return false;
-	}
-
-	Vector3 n3 = (p_v1 - p_point).cross(p_v1 - p_v2);
-
-	if (face_n.dot(n3) < 0) {
-		return false;
-	}
-
-	return true;
-}
-
-inline bool triangle_sphere_intersection_test(const Vector3 &p_triangle_a, const Vector3 &p_triangle_b, const Vector3 &p_triangle_c, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
-	real_t d = p_normal.dot(p_sphere_pos) - p_normal.dot(p_triangle_a);
-
-	if (d > p_sphere_radius || d < -p_sphere_radius) {
-		// Not touching the plane of the face, return.
-		return false;
-	}
-
-	Vector3 contact = p_sphere_pos - (p_normal * d);
-
-	/** 2nd) TEST INSIDE TRIANGLE **/
-
-	if (Geometry3D::point_in_projected_triangle(contact, p_triangle_a, p_triangle_b, p_triangle_c)) {
-		r_triangle_contact = contact;
-		r_sphere_contact = p_sphere_pos - p_normal * p_sphere_radius;
-		//printf("solved inside triangle\n");
 		return true;
 	}
 
-	/** 3rd TEST INSIDE EDGE CYLINDERS **/
-
-	const Vector3 verts[4] = { p_triangle_a, p_triangle_b, p_triangle_c, p_triangle_a }; // for() friendly
-
-	for (int i = 0; i < 3; i++) {
-		// Check edge cylinder.
-
-		Vector3 n1 = verts[i] - verts[i + 1];
-		Vector3 n2 = p_sphere_pos - verts[i + 1];
-
-		///@TODO Maybe discard by range here to make the algorithm quicker.
-
-		// Check point within cylinder radius.
-		Vector3 axis = n1.cross(n2).cross(n1);
-		axis.normalize();
-
-		real_t ad = axis.dot(n2);
-
-		if (Math::abs(ad) > p_sphere_radius) {
-			// No chance with this edge, too far away.
-			continue;
-		}
-
-		// Check point within edge capsule cylinder.
-		/** 4th TEST INSIDE EDGE POINTS **/
-
-		real_t sphere_at = n1.dot(n2);
-
-		if (sphere_at >= 0 && sphere_at < n1.dot(n1)) {
-			r_triangle_contact = p_sphere_pos - axis * (axis.dot(n2));
-			r_sphere_contact = p_sphere_pos - axis * p_sphere_radius;
-			// Point inside here.
-			return true;
-		}
-
-		real_t r2 = p_sphere_radius * p_sphere_radius;
-
-		if (n2.length_squared() < r2) {
-			Vector3 n = (p_sphere_pos - verts[i + 1]).normalized();
-
-			r_triangle_contact = verts[i + 1];
-			r_sphere_contact = p_sphere_pos - n * p_sphere_radius;
-			return true;
-		}
-
-		if (n2.distance_squared_to(n1) < r2) {
-			Vector3 n = (p_sphere_pos - verts[i]).normalized();
-
-			r_triangle_contact = verts[i];
-			r_sphere_contact = p_sphere_pos - n * p_sphere_radius;
-			return true;
-		}
-
-		break; // It's pointless to continue at this point, so save some CPU cycles.
-	}
-
-	return false;
-}
-
 #ifndef DISABLE_DEPRECATED
-inline bool triangle_sphere_intersection_test(const Vector3 *p_triangle, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
-	return triangle_sphere_intersection_test(p_triangle[0], p_triangle[1], p_triangle[2], p_normal, p_sphere_pos, p_sphere_radius, r_triangle_contact, r_sphere_contact);
-}
+	static inline bool triangle_sphere_intersection_test(const Vector3 *p_triangle, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
+		return triangle_sphere_intersection_test(p_triangle[0], p_triangle[1], p_triangle[2], p_normal, p_sphere_pos, p_sphere_radius, r_triangle_contact, r_sphere_contact);
+	}
 #endif // DISABLE_DEPRECATED
 
-inline Vector<Vector3> clip_polygon(const Vector<Vector3> &polygon, const Plane &p_plane) {
-	enum LocationCache {
-		LOC_INSIDE = 1,
-		LOC_BOUNDARY = 0,
-		LOC_OUTSIDE = -1
-	};
+	static inline bool triangle_sphere_intersection_test(const Vector3 &p_triangle_a, const Vector3 &p_triangle_b, const Vector3 &p_triangle_c, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
+		real_t d = p_normal.dot(p_sphere_pos) - p_normal.dot(p_triangle_a);
 
-	if (polygon.is_empty()) {
-		return polygon;
+		if (d > p_sphere_radius || d < -p_sphere_radius) {
+			// Not touching the plane of the face, return.
+			return false;
+		}
+
+		Vector3 contact = p_sphere_pos - (p_normal * d);
+
+		/** 2nd) TEST INSIDE TRIANGLE **/
+
+		if (Geometry3D::point_in_projected_triangle(contact, p_triangle_a, p_triangle_b, p_triangle_c)) {
+			r_triangle_contact = contact;
+			r_sphere_contact = p_sphere_pos - p_normal * p_sphere_radius;
+			//printf("solved inside triangle\n");
+			return true;
+		}
+
+		/** 3rd TEST INSIDE EDGE CYLINDERS **/
+
+		const Vector3 verts[4] = { p_triangle_a, p_triangle_b, p_triangle_c, p_triangle_a }; // for() friendly
+
+		for (int i = 0; i < 3; i++) {
+			// Check edge cylinder.
+
+			Vector3 n1 = verts[i] - verts[i + 1];
+			Vector3 n2 = p_sphere_pos - verts[i + 1];
+
+			///@TODO Maybe discard by range here to make the algorithm quicker.
+
+			// Check point within cylinder radius.
+			Vector3 axis = n1.cross(n2).cross(n1);
+			axis.normalize();
+
+			real_t ad = axis.dot(n2);
+
+			if (Math::abs(ad) > p_sphere_radius) {
+				// No chance with this edge, too far away.
+				continue;
+			}
+
+			// Check point within edge capsule cylinder.
+			/** 4th TEST INSIDE EDGE POINTS **/
+
+			real_t sphere_at = n1.dot(n2);
+
+			if (sphere_at >= 0 && sphere_at < n1.dot(n1)) {
+				r_triangle_contact = p_sphere_pos - axis * (axis.dot(n2));
+				r_sphere_contact = p_sphere_pos - axis * p_sphere_radius;
+				// Point inside here.
+				return true;
+			}
+
+			real_t r2 = p_sphere_radius * p_sphere_radius;
+
+			if (n2.length_squared() < r2) {
+				Vector3 n = (p_sphere_pos - verts[i + 1]).normalized();
+
+				r_triangle_contact = verts[i + 1];
+				r_sphere_contact = p_sphere_pos - n * p_sphere_radius;
+				return true;
+			}
+
+			if (n2.distance_squared_to(n1) < r2) {
+				Vector3 n = (p_sphere_pos - verts[i]).normalized();
+
+				r_triangle_contact = verts[i];
+				r_sphere_contact = p_sphere_pos - n * p_sphere_radius;
+				return true;
+			}
+
+			break; // It's pointless to continue at this point, so save some CPU cycles.
+		}
+
+		return false;
 	}
 
-	int *location_cache = (int *)alloca(sizeof(int) * polygon.size());
-	int inside_count = 0;
-	int outside_count = 0;
+	static inline Vector<Vector3> clip_polygon(const Vector<Vector3> &polygon, const Plane &p_plane) {
+		enum LocationCache {
+			LOC_INSIDE = 1,
+			LOC_BOUNDARY = 0,
+			LOC_OUTSIDE = -1
+		};
 
-	for (int a = 0; a < polygon.size(); a++) {
-		real_t dist = p_plane.distance_to(polygon[a]);
-		if (dist < (real_t)-CMP_POINT_IN_PLANE_EPSILON) {
-			location_cache[a] = LOC_INSIDE;
-			inside_count++;
-		} else {
-			if (dist > (real_t)CMP_POINT_IN_PLANE_EPSILON) {
-				location_cache[a] = LOC_OUTSIDE;
-				outside_count++;
+		if (polygon.is_empty()) {
+			return polygon;
+		}
+
+		int *location_cache = (int *)alloca(sizeof(int) * polygon.size());
+		int inside_count = 0;
+		int outside_count = 0;
+
+		for (int a = 0; a < polygon.size(); a++) {
+			real_t dist = p_plane.distance_to(polygon[a]);
+			if (dist < (real_t)-CMP_POINT_IN_PLANE_EPSILON) {
+				location_cache[a] = LOC_INSIDE;
+				inside_count++;
 			} else {
-				location_cache[a] = LOC_BOUNDARY;
+				if (dist > (real_t)CMP_POINT_IN_PLANE_EPSILON) {
+					location_cache[a] = LOC_OUTSIDE;
+					outside_count++;
+				} else {
+					location_cache[a] = LOC_BOUNDARY;
+				}
 			}
 		}
-	}
 
-	if (outside_count == 0) {
-		return polygon; // No changes.
-	} else if (inside_count == 0) {
-		return Vector<Vector3>(); // Empty.
-	}
-
-	long previous = polygon.size() - 1;
-	Vector<Vector3> clipped;
-
-	for (int index = 0; index < polygon.size(); index++) {
-		int loc = location_cache[index];
-		if (loc == LOC_OUTSIDE) {
-			if (location_cache[previous] == LOC_INSIDE) {
-				const Vector3 &v1 = polygon[previous];
-				const Vector3 &v2 = polygon[index];
-
-				Vector3 segment = v1 - v2;
-				real_t den = p_plane.normal.dot(segment);
-				real_t dist = p_plane.distance_to(v1) / den;
-				dist = -dist;
-				clipped.push_back(v1 + segment * dist);
-			}
-		} else {
-			const Vector3 &v1 = polygon[index];
-			if ((loc == LOC_INSIDE) && (location_cache[previous] == LOC_OUTSIDE)) {
-				const Vector3 &v2 = polygon[previous];
-				Vector3 segment = v1 - v2;
-				real_t den = p_plane.normal.dot(segment);
-				real_t dist = p_plane.distance_to(v1) / den;
-				dist = -dist;
-				clipped.push_back(v1 + segment * dist);
-			}
-
-			clipped.push_back(v1);
+		if (outside_count == 0) {
+			return polygon; // No changes.
+		} else if (inside_count == 0) {
+			return Vector<Vector3>(); // Empty.
 		}
 
-		previous = index;
+		long previous = polygon.size() - 1;
+		Vector<Vector3> clipped;
+
+		for (int index = 0; index < polygon.size(); index++) {
+			int loc = location_cache[index];
+			if (loc == LOC_OUTSIDE) {
+				if (location_cache[previous] == LOC_INSIDE) {
+					const Vector3 &v1 = polygon[previous];
+					const Vector3 &v2 = polygon[index];
+
+					Vector3 segment = v1 - v2;
+					real_t den = p_plane.normal.dot(segment);
+					real_t dist = p_plane.distance_to(v1) / den;
+					dist = -dist;
+					clipped.push_back(v1 + segment * dist);
+				}
+			} else {
+				const Vector3 &v1 = polygon[index];
+				if ((loc == LOC_INSIDE) && (location_cache[previous] == LOC_OUTSIDE)) {
+					const Vector3 &v2 = polygon[previous];
+					Vector3 segment = v1 - v2;
+					real_t den = p_plane.normal.dot(segment);
+					real_t dist = p_plane.distance_to(v1) / den;
+					dist = -dist;
+					clipped.push_back(v1 + segment * dist);
+				}
+
+				clipped.push_back(v1);
+			}
+
+			previous = index;
+		}
+
+		return clipped;
 	}
 
-	return clipped;
-}
+	static Vector<int32_t> tetrahedralize_delaunay(const Vector<Vector3> &p_points) {
+		Vector<Delaunay3D::OutputSimplex> tetr = Delaunay3D::tetrahedralize(p_points);
+		Vector<int32_t> tetrahedrons;
 
-inline Vector<int32_t> tetrahedralize_delaunay(const Vector<Vector3> &p_points) {
-	Vector<Delaunay3D::OutputSimplex> tetr = Delaunay3D::tetrahedralize(p_points);
-	Vector<int32_t> tetrahedrons;
-
-	tetrahedrons.resize(4 * tetr.size());
-	int32_t *ptr = tetrahedrons.ptrw();
-	for (int i = 0; i < tetr.size(); i++) {
-		*ptr++ = tetr[i].points[0];
-		*ptr++ = tetr[i].points[1];
-		*ptr++ = tetr[i].points[2];
-		*ptr++ = tetr[i].points[3];
+		tetrahedrons.resize(4 * tetr.size());
+		int32_t *ptr = tetrahedrons.ptrw();
+		for (int i = 0; i < tetr.size(); i++) {
+			*ptr++ = tetr[i].points[0];
+			*ptr++ = tetr[i].points[1];
+			*ptr++ = tetr[i].points[2];
+			*ptr++ = tetr[i].points[3];
+		}
+		return tetrahedrons;
 	}
-	return tetrahedrons;
-}
 
-// Create a "wrap" that encloses the given geometry.
-Vector<Face3> wrap_geometry(const Vector<Face3> &p_array, real_t *p_error = nullptr);
+	// Create a "wrap" that encloses the given geometry.
+	static Vector<Face3> wrap_geometry(const Vector<Face3> &p_array, real_t *p_error = nullptr);
 
-struct MeshData {
-	struct Face {
-		Plane plane;
-		LocalVector<int> indices;
+	struct MeshData {
+		struct Face {
+			Plane plane;
+			LocalVector<int> indices;
+		};
+
+		LocalVector<Face> faces;
+
+		struct Edge {
+			int vertex_a, vertex_b;
+			int face_a, face_b;
+		};
+
+		LocalVector<Edge> edges;
+
+		LocalVector<Vector3> vertices;
+
+		void optimize_vertices();
 	};
 
-	LocalVector<Face> faces;
+	static MeshData build_convex_mesh(const Vector<Plane> &p_planes);
+	static Vector<Plane> build_sphere_planes(real_t p_radius, int p_lats, int p_lons, Vector3::Axis p_axis = Vector3::AXIS_Z);
+	static Vector<Plane> build_box_planes(const Vector3 &p_extents);
+	static Vector<Plane> build_cylinder_planes(real_t p_radius, real_t p_height, int p_sides, Vector3::Axis p_axis = Vector3::AXIS_Z);
+	static Vector<Plane> build_capsule_planes(real_t p_radius, real_t p_height, int p_sides, int p_lats, Vector3::Axis p_axis = Vector3::AXIS_Z);
 
-	struct Edge {
-		int vertex_a, vertex_b;
-		int face_a, face_b;
-	};
-
-	LocalVector<Edge> edges;
-
-	LocalVector<Vector3> vertices;
-
-	void optimize_vertices();
-};
-
-MeshData build_convex_mesh(const Vector<Plane> &p_planes);
-Vector<Plane> build_sphere_planes(real_t p_radius, int p_lats, int p_lons, Vector3::Axis p_axis = Vector3::AXIS_Z);
-Vector<Plane> build_box_planes(const Vector3 &p_extents);
-Vector<Plane> build_cylinder_planes(real_t p_radius, real_t p_height, int p_sides, Vector3::Axis p_axis = Vector3::AXIS_Z);
-Vector<Plane> build_capsule_planes(real_t p_radius, real_t p_height, int p_sides, int p_lats, Vector3::Axis p_axis = Vector3::AXIS_Z);
-
-Vector<Vector3> compute_convex_mesh_points(const Plane *p_planes, int p_plane_count);
+	static Vector<Vector3> compute_convex_mesh_points(const Plane *p_planes, int p_plane_count);
 
 #define FINDMINMAX(x0, x1, x2, min, max) \
-	min = max = x0; \
-	if (x1 < min) { \
-		min = x1; \
-	} \
-	if (x1 > max) { \
-		max = x1; \
-	} \
-	if (x2 < min) { \
-		min = x2; \
-	} \
-	if (x2 > max) { \
-		max = x2; \
+	min = max = x0;                      \
+	if (x1 < min) {                      \
+		min = x1;                        \
+	}                                    \
+	if (x1 > max) {                      \
+		max = x1;                        \
+	}                                    \
+	if (x2 < min) {                      \
+		min = x2;                        \
+	}                                    \
+	if (x2 > max) {                      \
+		max = x2;                        \
 	}
 
-_FORCE_INLINE_ bool planeBoxOverlap(Vector3 normal, real_t d, Vector3 maxbox) {
-	int q;
-	Vector3 vmin, vmax;
-	for (q = 0; q <= 2; q++) {
-		if (normal[q] > 0.0f) {
-			vmin[q] = -maxbox[q];
-			vmax[q] = maxbox[q];
-		} else {
-			vmin[q] = maxbox[q];
-			vmax[q] = -maxbox[q];
+	_FORCE_INLINE_ static bool planeBoxOverlap(Vector3 normal, real_t d, Vector3 maxbox) {
+		int q;
+		Vector3 vmin, vmax;
+		for (q = 0; q <= 2; q++) {
+			if (normal[q] > 0.0f) {
+				vmin[q] = -maxbox[q];
+				vmax[q] = maxbox[q];
+			} else {
+				vmin[q] = maxbox[q];
+				vmax[q] = -maxbox[q];
+			}
 		}
-	}
-	if (normal.dot(vmin) + d > 0.0f) {
+		if (normal.dot(vmin) + d > 0.0f) {
+			return false;
+		}
+		if (normal.dot(vmax) + d >= 0.0f) {
+			return true;
+		}
+
 		return false;
 	}
-	if (normal.dot(vmax) + d >= 0.0f) {
-		return true;
-	}
-
-	return false;
-}
 
 /*======================== X-tests ========================*/
-#define AXISTEST_X01(a, b, fa, fb) \
-	p0 = a * v0.y - b * v0.z; \
-	p2 = a * v2.y - b * v2.z; \
-	if (p0 < p2) { \
-		min = p0; \
-		max = p2; \
-	} else { \
-		min = p2; \
-		max = p0; \
-	} \
+#define AXISTEST_X01(a, b, fa, fb)                 \
+	p0 = a * v0.y - b * v0.z;                      \
+	p2 = a * v2.y - b * v2.z;                      \
+	if (p0 < p2) {                                 \
+		min = p0;                                  \
+		max = p2;                                  \
+	} else {                                       \
+		min = p2;                                  \
+		max = p0;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.y + fb * boxhalfsize.z; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
-#define AXISTEST_X2(a, b, fa, fb) \
-	p0 = a * v0.y - b * v0.z; \
-	p1 = a * v1.y - b * v1.z; \
-	if (p0 < p1) { \
-		min = p0; \
-		max = p1; \
-	} else { \
-		min = p1; \
-		max = p0; \
-	} \
+#define AXISTEST_X2(a, b, fa, fb)                  \
+	p0 = a * v0.y - b * v0.z;                      \
+	p1 = a * v1.y - b * v1.z;                      \
+	if (p0 < p1) {                                 \
+		min = p0;                                  \
+		max = p1;                                  \
+	} else {                                       \
+		min = p1;                                  \
+		max = p0;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.y + fb * boxhalfsize.z; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
 /*======================== Y-tests ========================*/
-#define AXISTEST_Y02(a, b, fa, fb) \
-	p0 = -a * v0.x + b * v0.z; \
-	p2 = -a * v2.x + b * v2.z; \
-	if (p0 < p2) { \
-		min = p0; \
-		max = p2; \
-	} else { \
-		min = p2; \
-		max = p0; \
-	} \
+#define AXISTEST_Y02(a, b, fa, fb)                 \
+	p0 = -a * v0.x + b * v0.z;                     \
+	p2 = -a * v2.x + b * v2.z;                     \
+	if (p0 < p2) {                                 \
+		min = p0;                                  \
+		max = p2;                                  \
+	} else {                                       \
+		min = p2;                                  \
+		max = p0;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.x + fb * boxhalfsize.z; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
-#define AXISTEST_Y1(a, b, fa, fb) \
-	p0 = -a * v0.x + b * v0.z; \
-	p1 = -a * v1.x + b * v1.z; \
-	if (p0 < p1) { \
-		min = p0; \
-		max = p1; \
-	} else { \
-		min = p1; \
-		max = p0; \
-	} \
+#define AXISTEST_Y1(a, b, fa, fb)                  \
+	p0 = -a * v0.x + b * v0.z;                     \
+	p1 = -a * v1.x + b * v1.z;                     \
+	if (p0 < p1) {                                 \
+		min = p0;                                  \
+		max = p1;                                  \
+	} else {                                       \
+		min = p1;                                  \
+		max = p0;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.x + fb * boxhalfsize.z; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
 /*======================== Z-tests ========================*/
-#define AXISTEST_Z12(a, b, fa, fb) \
-	p1 = a * v1.x - b * v1.y; \
-	p2 = a * v2.x - b * v2.y; \
-	if (p2 < p1) { \
-		min = p2; \
-		max = p1; \
-	} else { \
-		min = p1; \
-		max = p2; \
-	} \
+#define AXISTEST_Z12(a, b, fa, fb)                 \
+	p1 = a * v1.x - b * v1.y;                      \
+	p2 = a * v2.x - b * v2.y;                      \
+	if (p2 < p1) {                                 \
+		min = p2;                                  \
+		max = p1;                                  \
+	} else {                                       \
+		min = p1;                                  \
+		max = p2;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.x + fb * boxhalfsize.y; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
-#define AXISTEST_Z0(a, b, fa, fb) \
-	p0 = a * v0.x - b * v0.y; \
-	p1 = a * v1.x - b * v1.y; \
-	if (p0 < p1) { \
-		min = p0; \
-		max = p1; \
-	} else { \
-		min = p1; \
-		max = p0; \
-	} \
+#define AXISTEST_Z0(a, b, fa, fb)                  \
+	p0 = a * v0.x - b * v0.y;                      \
+	p1 = a * v1.x - b * v1.y;                      \
+	if (p0 < p1) {                                 \
+		min = p0;                                  \
+		max = p1;                                  \
+	} else {                                       \
+		min = p1;                                  \
+		max = p0;                                  \
+	}                                              \
 	rad = fa * boxhalfsize.x + fb * boxhalfsize.y; \
-	if (min > rad || max < -rad) { \
-		return false; \
+	if (min > rad || max < -rad) {                 \
+		return false;                              \
 	}
 
-_FORCE_INLINE_ bool triangle_box_overlap(const Vector3 &boxcenter, const Vector3 boxhalfsize, const Vector3 *triverts) {
-	/*    use separating axis theorem to test overlap between triangle and box */
-	/*    need to test for overlap in these directions: */
-	/*    1) the {x,y,z}-directions (actually, since we use the AABB of the triangle */
-	/*       we do not even need to test these) */
-	/*    2) normal of the triangle */
-	/*    3) crossproduct(edge from tri, {x,y,z}-directin) */
-	/*       this gives 3x3=9 more tests */
-	real_t min, max, p0, p1, p2, rad, fex, fey, fez;
+	_FORCE_INLINE_ static bool triangle_box_overlap(const Vector3 &boxcenter, const Vector3 boxhalfsize, const Vector3 *triverts) {
+		/*    use separating axis theorem to test overlap between triangle and box */
+		/*    need to test for overlap in these directions: */
+		/*    1) the {x,y,z}-directions (actually, since we use the AABB of the triangle */
+		/*       we do not even need to test these) */
+		/*    2) normal of the triangle */
+		/*    3) crossproduct(edge from tri, {x,y,z}-directin) */
+		/*       this gives 3x3=9 more tests */
+		real_t min, max, p0, p1, p2, rad, fex, fey, fez;
 
-	/* This is the fastest branch on Sun */
-	/* move everything so that the boxcenter is in (0,0,0) */
+		/* This is the fastest branch on Sun */
+		/* move everything so that the boxcenter is in (0,0,0) */
 
-	const Vector3 v0 = triverts[0] - boxcenter;
-	const Vector3 v1 = triverts[1] - boxcenter;
-	const Vector3 v2 = triverts[2] - boxcenter;
+		const Vector3 v0 = triverts[0] - boxcenter;
+		const Vector3 v1 = triverts[1] - boxcenter;
+		const Vector3 v2 = triverts[2] - boxcenter;
 
-	/* compute triangle edges */
-	const Vector3 e0 = v1 - v0; /* tri edge 0 */
-	const Vector3 e1 = v2 - v1; /* tri edge 1 */
-	const Vector3 e2 = v0 - v2; /* tri edge 2 */
+		/* compute triangle edges */
+		const Vector3 e0 = v1 - v0; /* tri edge 0 */
+		const Vector3 e1 = v2 - v1; /* tri edge 1 */
+		const Vector3 e2 = v0 - v2; /* tri edge 2 */
 
-	/* Bullet 3:  */
-	/*  test the 9 tests first (this was faster) */
-	fex = Math::abs(e0.x);
-	fey = Math::abs(e0.y);
-	fez = Math::abs(e0.z);
-	AXISTEST_X01(e0.z, e0.y, fez, fey);
-	AXISTEST_Y02(e0.z, e0.x, fez, fex);
-	AXISTEST_Z12(e0.y, e0.x, fey, fex);
+		/* Bullet 3:  */
+		/*  test the 9 tests first (this was faster) */
+		fex = Math::abs(e0.x);
+		fey = Math::abs(e0.y);
+		fez = Math::abs(e0.z);
+		AXISTEST_X01(e0.z, e0.y, fez, fey);
+		AXISTEST_Y02(e0.z, e0.x, fez, fex);
+		AXISTEST_Z12(e0.y, e0.x, fey, fex);
 
-	fex = Math::abs(e1.x);
-	fey = Math::abs(e1.y);
-	fez = Math::abs(e1.z);
-	AXISTEST_X01(e1.z, e1.y, fez, fey);
-	AXISTEST_Y02(e1.z, e1.x, fez, fex);
-	AXISTEST_Z0(e1.y, e1.x, fey, fex);
+		fex = Math::abs(e1.x);
+		fey = Math::abs(e1.y);
+		fez = Math::abs(e1.z);
+		AXISTEST_X01(e1.z, e1.y, fez, fey);
+		AXISTEST_Y02(e1.z, e1.x, fez, fex);
+		AXISTEST_Z0(e1.y, e1.x, fey, fex);
 
-	fex = Math::abs(e2.x);
-	fey = Math::abs(e2.y);
-	fez = Math::abs(e2.z);
-	AXISTEST_X2(e2.z, e2.y, fez, fey);
-	AXISTEST_Y1(e2.z, e2.x, fez, fex);
-	AXISTEST_Z12(e2.y, e2.x, fey, fex);
+		fex = Math::abs(e2.x);
+		fey = Math::abs(e2.y);
+		fez = Math::abs(e2.z);
+		AXISTEST_X2(e2.z, e2.y, fez, fey);
+		AXISTEST_Y1(e2.z, e2.x, fez, fex);
+		AXISTEST_Z12(e2.y, e2.x, fey, fex);
 
-	/* Bullet 1: */
-	/*  first test overlap in the {x,y,z}-directions */
-	/*  find min, max of the triangle each direction, and test for overlap in */
-	/*  that direction -- this is equivalent to testing a minimal AABB around */
-	/*  the triangle against the AABB */
+		/* Bullet 1: */
+		/*  first test overlap in the {x,y,z}-directions */
+		/*  find min, max of the triangle each direction, and test for overlap in */
+		/*  that direction -- this is equivalent to testing a minimal AABB around */
+		/*  the triangle against the AABB */
 
-	/* test in X-direction */
-	FINDMINMAX(v0.x, v1.x, v2.x, min, max);
-	if (min > boxhalfsize.x || max < -boxhalfsize.x) {
-		return false;
+		/* test in X-direction */
+		FINDMINMAX(v0.x, v1.x, v2.x, min, max);
+		if (min > boxhalfsize.x || max < -boxhalfsize.x) {
+			return false;
+		}
+
+		/* test in Y-direction */
+		FINDMINMAX(v0.y, v1.y, v2.y, min, max);
+		if (min > boxhalfsize.y || max < -boxhalfsize.y) {
+			return false;
+		}
+
+		/* test in Z-direction */
+		FINDMINMAX(v0.z, v1.z, v2.z, min, max);
+		if (min > boxhalfsize.z || max < -boxhalfsize.z) {
+			return false;
+		}
+
+		/* Bullet 2: */
+		/*  test if the box intersects the plane of the triangle */
+		/*  compute plane equation of triangle: normal*x+d=0 */
+		const Vector3 normal = e0.cross(e1);
+		const real_t d = -normal.dot(v0); /* plane eq: normal.x+d=0 */
+		return planeBoxOverlap(normal, d, boxhalfsize); /* if true, box and triangle overlaps */
 	}
 
-	/* test in Y-direction */
-	FINDMINMAX(v0.y, v1.y, v2.y, min, max);
-	if (min > boxhalfsize.y || max < -boxhalfsize.y) {
-		return false;
+	static Vector<uint32_t> generate_edf(const Vector<bool> &p_voxels, const Vector3i &p_size, bool p_negative);
+	static Vector<int8_t> generate_sdf8(const Vector<uint32_t> &p_positive, const Vector<uint32_t> &p_negative);
+
+	static Vector3 triangle_get_barycentric_coords(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector3 &p_pos) {
+		const Vector3 v0 = p_b - p_a;
+		const Vector3 v1 = p_c - p_a;
+		const Vector3 v2 = p_pos - p_a;
+
+		const real_t d00 = v0.dot(v0);
+		const real_t d01 = v0.dot(v1);
+		const real_t d11 = v1.dot(v1);
+		const real_t d20 = v2.dot(v0);
+		const real_t d21 = v2.dot(v1);
+		const real_t denom = (d00 * d11 - d01 * d01);
+		if (denom == 0) {
+			return Vector3(); //invalid triangle, return empty
+		}
+		const real_t v = (d11 * d20 - d01 * d21) / denom;
+		const real_t w = (d00 * d21 - d01 * d20) / denom;
+		const real_t u = 1.0f - v - w;
+		return Vector3(u, v, w);
 	}
 
-	/* test in Z-direction */
-	FINDMINMAX(v0.z, v1.z, v2.z, min, max);
-	if (min > boxhalfsize.z || max < -boxhalfsize.z) {
-		return false;
-	}
+	static Color tetrahedron_get_barycentric_coords(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector3 &p_d, const Vector3 &p_pos) {
+		const Vector3 vap = p_pos - p_a;
+		const Vector3 vbp = p_pos - p_b;
 
-	/* Bullet 2: */
-	/*  test if the box intersects the plane of the triangle */
-	/*  compute plane equation of triangle: normal*x+d=0 */
-	const Vector3 normal = e0.cross(e1);
-	const real_t d = -normal.dot(v0); /* plane eq: normal.x+d=0 */
-	return planeBoxOverlap(normal, d, boxhalfsize); /* if true, box and triangle overlaps */
-}
+		const Vector3 vab = p_b - p_a;
+		const Vector3 vac = p_c - p_a;
+		const Vector3 vad = p_d - p_a;
 
-Vector<uint32_t> generate_edf(const Vector<bool> &p_voxels, const Vector3i &p_size, bool p_negative);
-Vector<int8_t> generate_sdf8(const Vector<uint32_t> &p_positive, const Vector<uint32_t> &p_negative);
-
-inline Vector3 triangle_get_barycentric_coords(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector3 &p_pos) {
-	const Vector3 v0 = p_b - p_a;
-	const Vector3 v1 = p_c - p_a;
-	const Vector3 v2 = p_pos - p_a;
-
-	const real_t d00 = v0.dot(v0);
-	const real_t d01 = v0.dot(v1);
-	const real_t d11 = v1.dot(v1);
-	const real_t d20 = v2.dot(v0);
-	const real_t d21 = v2.dot(v1);
-	const real_t denom = (d00 * d11 - d01 * d01);
-	if (denom == 0) {
-		return Vector3(); //invalid triangle, return empty
-	}
-	const real_t v = (d11 * d20 - d01 * d21) / denom;
-	const real_t w = (d00 * d21 - d01 * d20) / denom;
-	const real_t u = 1.0f - v - w;
-	return Vector3(u, v, w);
-}
-
-inline Color tetrahedron_get_barycentric_coords(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector3 &p_d, const Vector3 &p_pos) {
-	const Vector3 vap = p_pos - p_a;
-	const Vector3 vbp = p_pos - p_b;
-
-	const Vector3 vab = p_b - p_a;
-	const Vector3 vac = p_c - p_a;
-	const Vector3 vad = p_d - p_a;
-
-	const Vector3 vbc = p_c - p_b;
-	const Vector3 vbd = p_d - p_b;
-	// ScTP computes the scalar triple product
+		const Vector3 vbc = p_c - p_b;
+		const Vector3 vbd = p_d - p_b;
+		// ScTP computes the scalar triple product
 #define STP(m_a, m_b, m_c) ((m_a).dot((m_b).cross((m_c))))
-	const real_t va6 = STP(vbp, vbd, vbc);
-	const real_t vb6 = STP(vap, vac, vad);
-	const real_t vc6 = STP(vap, vad, vab);
-	const real_t vd6 = STP(vap, vab, vac);
-	const real_t v6 = 1 / STP(vab, vac, vad);
-	return Color(va6 * v6, vb6 * v6, vc6 * v6, vd6 * v6);
+		const real_t va6 = STP(vbp, vbd, vbc);
+		const real_t vb6 = STP(vap, vac, vad);
+		const real_t vc6 = STP(vap, vad, vab);
+		const real_t vd6 = STP(vap, vab, vac);
+		const real_t v6 = 1 / STP(vab, vac, vad);
+		return Color(va6 * v6, vb6 * v6, vc6 * v6, vd6 * v6);
 #undef STP
-}
+	}
 
-_FORCE_INLINE_ Vector3 octahedron_map_decode(const Vector2 &p_uv) {
-	// https://twitter.com/Stubbesaurus/status/937994790553227264
-	const Vector2 f = p_uv * 2.0f - Vector2(1.0f, 1.0f);
-	Vector3 n = Vector3(f.x, f.y, 1.0f - Math::abs(f.x) - Math::abs(f.y));
-	const real_t t = CLAMP(-n.z, 0.0f, 1.0f);
-	n.x += n.x >= 0 ? -t : t;
-	n.y += n.y >= 0 ? -t : t;
-	return n.normalized();
-}
-} //namespace Geometry3D
+	_FORCE_INLINE_ static Vector3 octahedron_map_decode(const Vector2 &p_uv) {
+		// https://twitter.com/Stubbesaurus/status/937994790553227264
+		const Vector2 f = p_uv * 2.0f - Vector2(1.0f, 1.0f);
+		Vector3 n = Vector3(f.x, f.y, 1.0f - Math::abs(f.x) - Math::abs(f.y));
+		const real_t t = CLAMP(-n.z, 0.0f, 1.0f);
+		n.x += n.x >= 0 ? -t : t;
+		n.y += n.y >= 0 ? -t : t;
+		return n.normalized();
+	}
+};
diff --git a/engine/core/math/math_defs.h b/engine/core/math/math_defs.h
index 4213b810..5a9be58c 100644
--- a/engine/core/math/math_defs.h
+++ b/engine/core/math/math_defs.h
@@ -145,16 +145,3 @@ typedef double real_t;
 #else
 typedef float real_t;
 #endif
-
-/**
- * Rarely, there will be a scenario where a function/variable expects one of the builtin integral
- *  types that do NOT utilize the fixed-width constants. In practice, the only discrepancies are
- *  with `long` or `long long` (and their unsigned equivalents) not being declared when most/all
- *  other integral constants are. We'll account for this with `int_alt_t` and `uint_alt_t`,
- *  which assign to the unused fixed-width slot. As this will only be used rarely, keep the types
- *  scoped to `Math` instead of the global namespace.
- */
-namespace Math {
-using int_alt_t = std::conditional_t<std::is_same_v<int64_t, long>, long long, long>;
-using uint_alt_t = std::conditional_t<std::is_same_v<uint64_t, unsigned long>, unsigned long long, unsigned long>;
-} //namespace Math
diff --git a/engine/core/math/math_fieldwise.cpp b/engine/core/math/math_fieldwise.cpp
index 36cccfc6..8e81e4cc 100644
--- a/engine/core/math/math_fieldwise.cpp
+++ b/engine/core/math/math_fieldwise.cpp
@@ -32,12 +32,12 @@
 
 #include "math_fieldwise.h"
 
-#define SETUP_TYPE(m_type) \
+#define SETUP_TYPE(m_type)    \
 	m_type source = p_source; \
 	m_type target = p_target;
 #define TRY_TRANSFER_FIELD(m_name, m_member) \
-	if (p_field == m_name) { \
-		target.m_member = source.m_member; \
+	if (p_field == m_name) {                 \
+		target.m_member = source.m_member;   \
 	}
 
 Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field) {
diff --git a/engine/core/math/math_funcs.h b/engine/core/math/math_funcs.h
index 43e4aac4..971ecd5a 100644
--- a/engine/core/math/math_funcs.h
+++ b/engine/core/math/math_funcs.h
@@ -34,6 +34,7 @@
 #include "core/math/math_defs.h"
 #include "core/typedefs.h"
 
+#include <cfloat>
 #include <cmath>
 
 namespace Math {
diff --git a/engine/core/math/math_funcs_binary.h b/engine/core/math/math_funcs_binary.h
deleted file mode 100644
index f4da5097..00000000
--- a/engine/core/math/math_funcs_binary.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/**************************************************************************/
-/*  math_funcs_binary.h                                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/typedefs.h"
-
-namespace Math {
-
-/* Functions to handle powers of 2 and shifting. */
-
-// Returns `true` if a positive integer is a power of 2, `false` otherwise.
-template <typename T>
-constexpr bool is_power_of_2(const T x) {
-	return x && ((x & (x - 1)) == 0);
-}
-
-// Function to find the next power of 2 to an integer.
-constexpr uint64_t next_power_of_2(uint64_t p_number) {
-	if (p_number == 0) {
-		return 0;
-	}
-
-	--p_number;
-	p_number |= p_number >> 1;
-	p_number |= p_number >> 2;
-	p_number |= p_number >> 4;
-	p_number |= p_number >> 8;
-	p_number |= p_number >> 16;
-	p_number |= p_number >> 32;
-
-	return ++p_number;
-}
-
-constexpr uint32_t next_power_of_2(uint32_t p_number) {
-	if (p_number == 0) {
-		return 0;
-	}
-
-	--p_number;
-	p_number |= p_number >> 1;
-	p_number |= p_number >> 2;
-	p_number |= p_number >> 4;
-	p_number |= p_number >> 8;
-	p_number |= p_number >> 16;
-
-	return ++p_number;
-}
-
-// Function to find the previous power of 2 to an integer.
-constexpr uint64_t previous_power_of_2(uint64_t p_number) {
-	p_number |= p_number >> 1;
-	p_number |= p_number >> 2;
-	p_number |= p_number >> 4;
-	p_number |= p_number >> 8;
-	p_number |= p_number >> 16;
-	p_number |= p_number >> 32;
-	return p_number - (p_number >> 1);
-}
-
-constexpr uint32_t previous_power_of_2(uint32_t p_number) {
-	p_number |= p_number >> 1;
-	p_number |= p_number >> 2;
-	p_number |= p_number >> 4;
-	p_number |= p_number >> 8;
-	p_number |= p_number >> 16;
-	return p_number - (p_number >> 1);
-}
-
-// Function to find the closest power of 2 to an integer.
-constexpr uint64_t closest_power_of_2(uint64_t p_number) {
-	uint64_t nx = next_power_of_2(p_number);
-	uint64_t px = previous_power_of_2(p_number);
-	return (nx - p_number) > (p_number - px) ? px : nx;
-}
-
-constexpr uint32_t closest_power_of_2(uint32_t p_number) {
-	uint32_t nx = next_power_of_2(p_number);
-	uint32_t px = previous_power_of_2(p_number);
-	return (nx - p_number) > (p_number - px) ? px : nx;
-}
-
-// Get a shift value from a power of 2.
-constexpr int32_t get_shift_from_power_of_2(uint64_t p_bits) {
-	for (uint64_t i = 0; i < (uint64_t)64; i++) {
-		if (p_bits == (uint64_t)((uint64_t)1 << i)) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-constexpr int32_t get_shift_from_power_of_2(uint32_t p_bits) {
-	for (uint32_t i = 0; i < (uint32_t)32; i++) {
-		if (p_bits == (uint32_t)((uint32_t)1 << i)) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-template <typename T>
-constexpr T nearest_power_of_2_templated(T p_number) {
-	--p_number;
-
-	// The number of operations on x is the base two logarithm
-	// of the number of bits in the type. Add three to account
-	// for sizeof(T) being in bytes.
-	constexpr size_t shift_steps = get_shift_from_power_of_2((uint64_t)sizeof(T)) + 3;
-
-	// If the compiler is smart, it unrolls this loop.
-	// If it's dumb, this is a bit slow.
-	for (size_t i = 0; i < shift_steps; i++) {
-		p_number |= p_number >> (1 << i);
-	}
-
-	return ++p_number;
-}
-
-// Function to find the nearest (bigger) power of 2 to an integer.
-constexpr uint64_t nearest_shift(uint64_t p_number) {
-	uint64_t i = 63;
-	do {
-		i--;
-		if (p_number & ((uint64_t)1 << i)) {
-			return i + (uint64_t)1;
-		}
-	} while (i != 0);
-
-	return 0;
-}
-
-constexpr uint32_t nearest_shift(uint32_t p_number) {
-	uint32_t i = 31;
-	do {
-		i--;
-		if (p_number & ((uint32_t)1 << i)) {
-			return i + (uint32_t)1;
-		}
-	} while (i != 0);
-
-	return 0;
-}
-
-// constexpr function to find the floored log2 of a number
-template <typename T>
-constexpr T floor_log2(T x) {
-	return x < 2 ? x : 1 + floor_log2(x >> 1);
-}
-
-// Get the number of bits needed to represent the number.
-// IE, if you pass in 8, you will get 4.
-// If you want to know how many bits are needed to store 8 values however, pass in (8 - 1).
-template <typename T>
-constexpr T get_num_bits(T x) {
-	return floor_log2(x);
-}
-
-} //namespace Math
diff --git a/engine/core/math/plane.cpp b/engine/core/math/plane.cpp
index b23514f0..74783b2a 100644
--- a/engine/core/math/plane.cpp
+++ b/engine/core/math/plane.cpp
@@ -38,15 +38,9 @@ void Plane::set_normal(const Vector3 &p_normal) {
 }
 
 void Plane::normalize() {
-#ifdef MATH_CHECKS
-	if (!is_finite()) {
-		WARN_PRINT("Plane cannot be normalized, the distance and the normal should be finite.");
-	}
-#endif // MATH_CHECKS
-
 	real_t l = normal.length();
 	if (l == 0) {
-		zero();
+		*this = Plane(0, 0, 0, 0);
 		return;
 	}
 	normal /= l;
diff --git a/engine/core/math/plane.h b/engine/core/math/plane.h
index a440e8c4..6bce4e77 100644
--- a/engine/core/math/plane.h
+++ b/engine/core/math/plane.h
@@ -45,11 +45,6 @@ struct [[nodiscard]] Plane {
 	void set_normal(const Vector3 &p_normal);
 	_FORCE_INLINE_ Vector3 get_normal() const { return normal; }
 
-	void zero() {
-		normal.zero();
-		d = 0;
-	}
-
 	void normalize();
 	Plane normalized() const;
 
diff --git a/engine/core/math/quaternion.cpp b/engine/core/math/quaternion.cpp
index e4ae4027..536682de 100644
--- a/engine/core/math/quaternion.cpp
+++ b/engine/core/math/quaternion.cpp
@@ -63,11 +63,6 @@ real_t Quaternion::length() const {
 }
 
 void Quaternion::normalize() {
-#ifdef MATH_CHECKS
-	if (!is_finite()) {
-		WARN_PRINT("Quaternion cannot be normalized, the elements should be finite.");
-	}
-#endif // MATH_CHECKS
 	*this /= length();
 }
 
diff --git a/engine/core/math/random_number_generator.cpp b/engine/core/math/random_number_generator.cpp
index 52d06fba..226d748c 100644
--- a/engine/core/math/random_number_generator.cpp
+++ b/engine/core/math/random_number_generator.cpp
@@ -30,8 +30,6 @@
 
 #include "random_number_generator.h"
 
-#include "core/object/class_db.h"
-
 void RandomNumberGenerator::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_seed", "seed"), &RandomNumberGenerator::set_seed);
 	ClassDB::bind_method(D_METHOD("get_seed"), &RandomNumberGenerator::get_seed);
diff --git a/engine/core/math/random_pcg.h b/engine/core/math/random_pcg.h
index a9eb3db6..bfcd3eee 100644
--- a/engine/core/math/random_pcg.h
+++ b/engine/core/math/random_pcg.h
@@ -32,9 +32,7 @@
 
 #include "core/math/math_funcs.h"
 
-#include <thirdparty/misc/pcg.h>
-
-#include <cmath> // ldexp
+#include "thirdparty/misc/pcg.h"
 
 #if defined(__GNUC__)
 #define CLZ32(x) __builtin_clz(x)
@@ -124,14 +122,14 @@ public:
 		if (temp < CMP_EPSILON) {
 			temp += CMP_EPSILON; // To prevent generating of INF value in log function, resulting to return NaN value from this function.
 		}
-		return p_mean + p_deviation * (Math::cos(Math::TAU * randd()) * Math::sqrt(-2.0 * Math::log(temp))); // Box-Muller transform.
+		return p_mean + p_deviation * (std::cos(Math::TAU * randd()) * std::sqrt(-2.0 * std::log(temp))); // Box-Muller transform.
 	}
 	_FORCE_INLINE_ float randfn(float p_mean, float p_deviation) {
 		float temp = randf();
 		if (temp < CMP_EPSILON) {
 			temp += CMP_EPSILON; // To prevent generating of INF value in log function, resulting to return NaN value from this function.
 		}
-		return p_mean + p_deviation * (Math::cos((float)Math::TAU * randf()) * Math::sqrt(-2.0 * Math::log(temp))); // Box-Muller transform.
+		return p_mean + p_deviation * (std::cos((float)Math::TAU * randf()) * std::sqrt(-2.0 * std::log(temp))); // Box-Muller transform.
 	}
 
 	double random(double p_from, double p_to);
diff --git a/engine/core/math/static_raycaster.cpp b/engine/core/math/static_raycaster.cpp
index 619efe45..9fa89a5f 100644
--- a/engine/core/math/static_raycaster.cpp
+++ b/engine/core/math/static_raycaster.cpp
@@ -30,7 +30,7 @@
 
 #include "static_raycaster.h"
 
-Ref<StaticRaycaster> (*StaticRaycaster::create_function)() = nullptr;
+StaticRaycaster *(*StaticRaycaster::create_function)() = nullptr;
 
 Ref<StaticRaycaster> StaticRaycaster::create() {
 	if (create_function) {
diff --git a/engine/core/math/static_raycaster.h b/engine/core/math/static_raycaster.h
index e5d013cd..fbb5194c 100644
--- a/engine/core/math/static_raycaster.h
+++ b/engine/core/math/static_raycaster.h
@@ -35,7 +35,7 @@
 class StaticRaycaster : public RefCounted {
 	GDCLASS(StaticRaycaster, RefCounted)
 protected:
-	static Ref<StaticRaycaster> (*create_function)();
+	static StaticRaycaster *(*create_function)();
 
 public:
 	// Compatible with embree4 rays.
diff --git a/engine/core/math/transform_2d.cpp b/engine/core/math/transform_2d.cpp
index 611b6f08..b5a971e7 100644
--- a/engine/core/math/transform_2d.cpp
+++ b/engine/core/math/transform_2d.cpp
@@ -145,8 +145,7 @@ void Transform2D::translate_local(const Vector2 &p_translation) {
 }
 
 void Transform2D::orthonormalize() {
-	// Orthonormalizable check is done in Vector2 class below.
-	// Gram-Schmidt Process:
+	// Gram-Schmidt Process
 
 	Vector2 x = columns[0];
 	Vector2 y = columns[1];
diff --git a/engine/core/math/transform_3d.cpp b/engine/core/math/transform_3d.cpp
index a5b825be..b4d02408 100644
--- a/engine/core/math/transform_3d.cpp
+++ b/engine/core/math/transform_3d.cpp
@@ -150,7 +150,6 @@ Transform3D Transform3D::translated_local(const Vector3 &p_translation) const {
 }
 
 void Transform3D::orthonormalize() {
-	// Orthonormalizable check is done in Basis class below.
 	basis.orthonormalize();
 }
 
diff --git a/engine/core/math/triangle_mesh.cpp b/engine/core/math/triangle_mesh.cpp
index c9916998..3b24b351 100644
--- a/engine/core/math/triangle_mesh.cpp
+++ b/engine/core/math/triangle_mesh.cpp
@@ -30,7 +30,6 @@
 
 #include "triangle_mesh.h"
 
-#include "core/object/class_db.h"
 #include "core/templates/sort_array.h"
 
 int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &r_max_depth, int &r_max_alloc) {
diff --git a/engine/core/math/triangle_mesh.h b/engine/core/math/triangle_mesh.h
index c3c77794..65fd0ff9 100644
--- a/engine/core/math/triangle_mesh.h
+++ b/engine/core/math/triangle_mesh.h
@@ -43,14 +43,6 @@ public:
 		int32_t surface_index = 0;
 	};
 
-	struct BVH {
-		AABB aabb;
-		Vector3 center; //used for sorting
-		int left = -1;
-		int right = -1;
-		int32_t face_index = -1;
-	};
-
 protected:
 	static void _bind_methods();
 
@@ -58,6 +50,15 @@ private:
 	Vector<Triangle> triangles;
 	Vector<Vector3> vertices;
 
+	struct BVH {
+		AABB aabb;
+		Vector3 center; //used for sorting
+		int left = -1;
+		int right = -1;
+
+		int32_t face_index = -1;
+	};
+
 	struct BVHCmpX {
 		bool operator()(const BVH *p_left, const BVH *p_right) const {
 			return p_left->center.x < p_right->center.x;
@@ -90,7 +91,6 @@ public:
 
 	const Vector<Triangle> &get_triangles() const { return triangles; }
 	const Vector<Vector3> &get_vertices() const { return vertices; }
-	const Vector<BVH> &get_bvh() const { return bvh; }
 	void get_indices(Vector<int> *r_triangles_indices) const;
 
 	void create(const Vector<Vector3> &p_faces, const Vector<int32_t> &p_surface_indices = Vector<int32_t>());
diff --git a/engine/core/math/vector2.cpp b/engine/core/math/vector2.cpp
index 581214e6..7a51c139 100644
--- a/engine/core/math/vector2.cpp
+++ b/engine/core/math/vector2.cpp
@@ -50,18 +50,8 @@ real_t Vector2::length_squared() const {
 }
 
 void Vector2::normalize() {
-	if (!is_finite()) {
-#ifdef MATH_CHECKS
-		WARN_PRINT("Vector2 cannot be normalized, the elements must be finite. Making (0, 0) as a fallback.");
-#endif // MATH_CHECKS
-		zero();
-		return;
-	}
-
-	real_t l = length_squared();
-	if (l == 0) {
-		zero();
-	} else {
+	real_t l = x * x + y * y;
+	if (l != 0) {
 		l = Math::sqrt(l);
 		x /= l;
 		y /= l;
diff --git a/engine/core/math/vector2.h b/engine/core/math/vector2.h
index 5bb06452..98207474 100644
--- a/engine/core/math/vector2.h
+++ b/engine/core/math/vector2.h
@@ -91,8 +91,6 @@ struct [[nodiscard]] Vector2 {
 	real_t length_squared() const;
 	Vector2 limit_length(real_t p_len = 1.0) const;
 
-	void zero() { x = y = 0; }
-
 	Vector2 min(const Vector2 &p_vector2) const {
 		return Vector2(MIN(x, p_vector2.x), MIN(y, p_vector2.y));
 	}
diff --git a/engine/core/math/vector3.h b/engine/core/math/vector3.h
index f83431b5..b0f29e0d 100644
--- a/engine/core/math/vector3.h
+++ b/engine/core/math/vector3.h
@@ -546,22 +546,14 @@ real_t Vector3::length_squared() const {
 }
 
 void Vector3::normalize() {
-	if (!is_finite()) {
-#ifdef MATH_CHECKS
-		WARN_PRINT("Vector3 cannot be normalized, the elements must be finite. Making (0, 0, 0) as a fallback.");
-#endif // MATH_CHECKS
-		zero();
-		return;
-	}
-
-	real_t l = length_squared();
-	if (l == 0) {
-		zero();
+	real_t lengthsq = length_squared();
+	if (lengthsq == 0) {
+		x = y = z = 0;
 	} else {
-		l = Math::sqrt(l);
-		x /= l;
-		y /= l;
-		z /= l;
+		real_t length = Math::sqrt(lengthsq);
+		x /= length;
+		y /= length;
+		z /= length;
 	}
 }
 
diff --git a/engine/core/math/vector4.cpp b/engine/core/math/vector4.cpp
index adf60537..e4fa1769 100644
--- a/engine/core/math/vector4.cpp
+++ b/engine/core/math/vector4.cpp
@@ -79,23 +79,15 @@ real_t Vector4::length() const {
 }
 
 void Vector4::normalize() {
-	if (!is_finite()) {
-#ifdef MATH_CHECKS
-		WARN_PRINT("Vector4 cannot be normalized, the elements must be finite. Making (0, 0, 0, 0) as a fallback.");
-#endif // MATH_CHECKS
-		zero();
-		return;
-	}
-
-	real_t l = length_squared();
-	if (l == 0) {
-		zero();
+	real_t lengthsq = length_squared();
+	if (lengthsq == 0) {
+		x = y = z = w = 0;
 	} else {
-		l = Math::sqrt(l);
-		x /= l;
-		y /= l;
-		z /= l;
-		w /= l;
+		real_t length = Math::sqrt(lengthsq);
+		x /= length;
+		y /= length;
+		z /= length;
+		w /= length;
 	}
 }
 
diff --git a/engine/core/math/vector4.h b/engine/core/math/vector4.h
index 6b2fe706..edfe28b0 100644
--- a/engine/core/math/vector4.h
+++ b/engine/core/math/vector4.h
@@ -98,8 +98,6 @@ struct [[nodiscard]] Vector4 {
 	Vector4 normalized() const;
 	bool is_normalized() const;
 
-	void zero() { x = y = z = w = 0; }
-
 	real_t distance_to(const Vector4 &p_to) const;
 	real_t distance_squared_to(const Vector4 &p_to) const;
 	Vector4 direction_to(const Vector4 &p_to) const;
diff --git a/engine/core/object/SCsub b/engine/core/object/SCsub
index eeb59324..3d0d2c14 100644
--- a/engine/core/object/SCsub
+++ b/engine/core/object/SCsub
@@ -5,7 +5,7 @@ Import("env")
 
 import make_virtuals
 
-env.CommandNoCache("gdvirtual.gen.h", "make_virtuals.py", env.Run(make_virtuals.run))
+env.CommandNoCache(["gdvirtual.gen.inc"], "make_virtuals.py", env.Run(make_virtuals.run))
 
 env_object = env.Clone()
 
diff --git a/engine/core/object/callable_mp.cpp b/engine/core/object/callable_method_pointer.cpp
similarity index 97%
rename from engine/core/object/callable_mp.cpp
rename to engine/core/object/callable_method_pointer.cpp
index 6506643f..ed400788 100644
--- a/engine/core/object/callable_mp.cpp
+++ b/engine/core/object/callable_method_pointer.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  callable_mp.cpp                                                       */
+/*  callable_method_pointer.cpp                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "callable_mp.h"
+#include "callable_method_pointer.h"
 
 bool CallableCustomMethodPointerBase::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
 	const CallableCustomMethodPointerBase *a = static_cast<const CallableCustomMethodPointerBase *>(p_a);
diff --git a/engine/core/object/callable_mp.h b/engine/core/object/callable_method_pointer.h
similarity index 99%
rename from engine/core/object/callable_mp.h
rename to engine/core/object/callable_method_pointer.h
index aad45a00..21879993 100644
--- a/engine/core/object/callable_mp.h
+++ b/engine/core/object/callable_method_pointer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  callable_mp.h                                                         */
+/*  callable_method_pointer.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
diff --git a/engine/core/object/class_db.cpp b/engine/core/object/class_db.cpp
index 8dec40a6..2a97d2b9 100644
--- a/engine/core/object/class_db.cpp
+++ b/engine/core/object/class_db.cpp
@@ -193,8 +193,8 @@ public:
 		// We need need to make sure that all the things it would have done (even if
 		// done in a different way to support placeholders) will also be done here.
 
-		obj->_extension = ClassDB::get_placeholder_extension(ti->gdtype->get_name());
-		obj->_extension_instance = memnew(PlaceholderExtensionInstance(ti->gdtype->get_name()));
+		obj->_extension = ClassDB::get_placeholder_extension(ti->name);
+		obj->_extension_instance = memnew(PlaceholderExtensionInstance(ti->name));
 
 		obj->_reset_gdtype();
 
@@ -209,7 +209,7 @@ public:
 
 	static GDExtensionObjectPtr placeholder_class_recreate_instance(void *p_class_userdata, GDExtensionObjectPtr p_object) {
 		ClassDB::ClassInfo *ti = (ClassDB::ClassInfo *)p_class_userdata;
-		return memnew(PlaceholderExtensionInstance(ti->gdtype->get_name()));
+		return memnew(PlaceholderExtensionInstance(ti->name));
 	}
 
 	static void placeholder_class_free_instance(void *p_class_userdata, GDExtensionClassInstancePtr p_instance) {
@@ -224,8 +224,15 @@ public:
 #endif
 
 bool ClassDB::_is_parent_class(const StringName &p_class, const StringName &p_inherits) {
-	const ClassInfo *c = classes.getptr(p_class);
-	return c ? c->gdtype->get_name_hierarchy().has(p_inherits) : false;
+	ClassInfo *c = classes.getptr(p_class);
+	while (c) {
+		if (c->name == p_inherits) {
+			return true;
+		}
+		c = c->inherits_ptr;
+	}
+
+	return false;
 }
 
 bool ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) {
@@ -307,7 +314,7 @@ void ClassDB::get_direct_inheriters_from_class(const StringName &p_class, List<S
 	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
-		if (E.value.gdtype->get_super_type_name() == p_class) {
+		if (E.value.inherits == p_class) {
 			p_classes->push_back(E.key);
 		}
 	}
@@ -317,18 +324,31 @@ StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
-	return ti ? ti->gdtype->get_super_type_name() : StringName();
+	if (!ti) {
+		return StringName();
+	}
+	return ti->inherits;
 }
 
 bool ClassDB::get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result) {
 	Locker::Lock lock(Locker::STATE_READ);
 
-	ClassInfo *ti = classes.getptr(p_class);
-	if (!ti) {
+	ClassInfo *start = classes.getptr(p_class);
+	if (!start) {
 		return false;
 	}
 
-	r_result.append_array(ti->gdtype->get_name_hierarchy());
+	int classes_to_add = 0;
+	for (ClassInfo *ti = start; ti; ti = ti->inherits_ptr) {
+		classes_to_add++;
+	}
+
+	int64_t old_size = r_result.size();
+	r_result.resize(old_size + classes_to_add);
+	StringName *w = r_result.ptrw() + old_size;
+	for (ClassInfo *ti = start; ti; ti = ti->inherits_ptr) {
+		*w++ = ti->name;
+	}
 
 	return true;
 }
@@ -348,7 +368,7 @@ StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class)
 StringName ClassDB::_get_parent_class(const StringName &p_class) {
 	ClassInfo *ti = classes.getptr(p_class);
 	ERR_FAIL_NULL_V_MSG(ti, StringName(), vformat("Cannot get class '%s'.", String(p_class)));
-	return ti->gdtype->get_super_type_name();
+	return ti->inherits;
 }
 
 StringName ClassDB::get_parent_class(const StringName &p_class) {
@@ -389,8 +409,8 @@ uint32_t ClassDB::get_api_hash(APIType p_api) {
 		if (t->api != p_api || !t->exposed) {
 			continue;
 		}
-		hash = hash_murmur3_one_64(t->gdtype->get_name().hash(), hash);
-		hash = hash_murmur3_one_64(t->gdtype->get_super_type_name().hash(), hash);
+		hash = hash_murmur3_one_64(t->name.hash(), hash);
+		hash = hash_murmur3_one_64(t->inherits.hash(), hash);
 
 		{ //methods
 
@@ -441,7 +461,7 @@ uint32_t ClassDB::get_api_hash(APIType p_api) {
 
 			List<StringName> snames;
 
-			for (const KeyValue<StringName, int64_t> &F : t->gdtype->get_integer_constant_map(true)) {
+			for (const KeyValue<StringName, int64_t> &F : t->constant_map) {
 				snames.push_back(F.key);
 			}
 
@@ -449,7 +469,7 @@ uint32_t ClassDB::get_api_hash(APIType p_api) {
 
 			for (const StringName &F : snames) {
 				hash = hash_murmur3_one_64(F.hash(), hash);
-				hash = hash_murmur3_one_64(uint64_t(t->gdtype->get_integer_constant_map(true)[F]), hash);
+				hash = hash_murmur3_one_64(uint64_t(t->constant_map[F]), hash);
 			}
 		}
 
@@ -457,14 +477,14 @@ uint32_t ClassDB::get_api_hash(APIType p_api) {
 
 			List<StringName> snames;
 
-			for (const KeyValue<StringName, const MethodInfo *> &F : t->gdtype->get_signal_map(true)) {
+			for (const KeyValue<StringName, MethodInfo> &F : t->signal_map) {
 				snames.push_back(F.key);
 			}
 
 			snames.sort_custom<StringName::AlphCompare>();
 
 			for (const StringName &F : snames) {
-				const MethodInfo &mi = *t->gdtype->get_signal_map(true)[F];
+				MethodInfo &mi = t->signal_map[F];
 				hash = hash_murmur3_one_64(F.hash(), hash);
 				for (const PropertyInfo &pi : mi.arguments) {
 					hash = hash_murmur3_one_64(pi.type, hash);
@@ -577,13 +597,13 @@ Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require
 			}
 #endif // DISABLE_DEPRECATED
 		} else if (!ti->inherits_ptr || !ti->inherits_ptr->creation_func) {
-			ERR_PRINT(vformat("Cannot make a placeholder instance of runtime class %s because its parent cannot be constructed.", ti->gdtype->get_name()));
+			ERR_PRINT(vformat("Cannot make a placeholder instance of runtime class %s because its parent cannot be constructed.", ti->name));
 		} else {
 			can_create_placeholder = true;
 		}
 
 		if (can_create_placeholder) {
-			ObjectGDExtension *extension = get_placeholder_extension(ti->gdtype->get_name());
+			ObjectGDExtension *extension = get_placeholder_extension(ti->name);
 			return (Object *)extension->create_instance2(extension->class_userdata, p_notify_postinitialize);
 		}
 	}
@@ -697,8 +717,8 @@ ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class)
 	} else {
 		placeholder_extension->library = nullptr;
 		placeholder_extension->parent = nullptr;
-		placeholder_extension->parent_class_name = ti->gdtype->get_super_type_name();
-		placeholder_extension->class_name = ti->gdtype->get_name();
+		placeholder_extension->parent_class_name = ti->inherits;
+		placeholder_extension->class_name = ti->name;
 		placeholder_extension->editor_class = ti->api == API_EDITOR;
 		placeholder_extension->reloadable = false;
 		placeholder_extension->is_virtual = ti->is_virtual;
@@ -863,16 +883,7 @@ use_script:
 	return scr.is_valid() && scr->is_valid() && scr->is_abstract();
 }
 
-bool ClassDB::is_gdextension(const StringName &p_class) {
-	Locker::Lock lock(Locker::STATE_READ);
-	ClassInfo *ti = classes.getptr(p_class);
-	if (ti) {
-		return ti->gdextension;
-	}
-	return false;
-}
-
-void ClassDB::_add_class(GDType &p_class, const GDType *p_inherits) {
+void ClassDB::_add_class(const GDType &p_class, const GDType *p_inherits) {
 	Locker::Lock lock(Locker::STATE_WRITE);
 
 	const StringName &name = p_class.get_name();
@@ -881,12 +892,17 @@ void ClassDB::_add_class(GDType &p_class, const GDType *p_inherits) {
 
 	classes[name] = ClassInfo();
 	ClassInfo &ti = classes[name];
+	ti.name = name;
 	ti.gdtype = &p_class;
+	if (p_inherits) {
+		ti.inherits = p_inherits->get_name();
+	}
 	ti.api = current_api;
 
-	if (p_inherits) {
-		ERR_FAIL_COND(!classes.has(ti.gdtype->get_super_type_name())); //it MUST be registered.
-		ti.inherits_ptr = &classes[ti.gdtype->get_super_type_name()];
+	if (ti.inherits) {
+		ERR_FAIL_COND(!classes.has(ti.inherits)); //it MUST be registered.
+		ti.inherits_ptr = &classes[ti.inherits];
+
 	} else {
 		ti.inherits_ptr = nullptr;
 	}
@@ -1002,7 +1018,7 @@ void ClassDB::get_method_list_with_compatibility(const StringName &p_class, List
 #endif // DEBUG_ENABLED
 
 		for (const KeyValue<StringName, LocalVector<MethodBind *, unsigned int, false, false>> &E : type->method_map_compatibility) {
-			LocalVector<MethodBind *> compat(E.value);
+			LocalVector<MethodBind *> compat = E.value;
 			for (MethodBind *method : compat) {
 				MethodInfo minfo = info_from_bind(method);
 
@@ -1142,19 +1158,61 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
 	Locker::Lock lock(Locker::STATE_WRITE);
 
 	ClassInfo *type = classes.getptr(p_class);
+
 	ERR_FAIL_NULL(type);
 
-	type->gdtype->bind_integer_constant(p_enum, p_name, p_constant, p_is_bitfield);
+	if (type->constant_map.has(p_name)) {
+		ERR_FAIL();
+	}
+
+	type->constant_map[p_name] = p_constant;
+
+	String enum_name = p_enum;
+	if (!enum_name.is_empty()) {
+		if (enum_name.contains_char('.')) {
+			enum_name = enum_name.get_slicec('.', 1);
+		}
+
+		ClassInfo::EnumInfo *constants_list = type->enum_map.getptr(enum_name);
+
+		if (constants_list) {
+			constants_list->constants.push_back(p_name);
+			constants_list->is_bitfield = p_is_bitfield;
+		} else {
+			ClassInfo::EnumInfo new_list;
+			new_list.is_bitfield = p_is_bitfield;
+			new_list.constants.push_back(p_name);
+			type->enum_map[enum_name] = new_list;
+		}
+	}
+
+#ifdef DEBUG_ENABLED
+	type->constant_order.push_back(p_name);
+#endif // DEBUG_ENABLED
 }
 
 void ClassDB::get_integer_constant_list(const StringName &p_class, List<String> *p_constants, bool p_no_inheritance) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL(type);
 
-	for (const KeyValue<StringName, int64_t> &E : type->gdtype->get_integer_constant_map(p_no_inheritance)) {
-		p_constants->push_back(E.key);
+	while (type) {
+#ifdef DEBUG_ENABLED
+		for (const StringName &E : type->constant_order) {
+			p_constants->push_back(E);
+		}
+#else
+
+		for (const KeyValue<StringName, int64_t> &E : type->constant_map) {
+			p_constants->push_back(E.key);
+		}
+
+#endif // DEBUG_ENABLED
+		if (p_no_inheritance) {
+			break;
+		}
+
+		type = type->inherits_ptr;
 	}
 }
 
@@ -1162,19 +1220,23 @@ int64_t ClassDB::get_integer_constant(const StringName &p_class, const StringNam
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	if (type) {
-		const int64_t *constant = type->gdtype->get_integer_constant_map(false).getptr(p_name);
+
+	while (type) {
+		int64_t *constant = type->constant_map.getptr(p_name);
 		if (constant) {
 			if (p_success) {
 				*p_success = true;
 			}
 			return *constant;
 		}
+
+		type = type->inherits_ptr;
 	}
 
 	if (p_success) {
 		*p_success = false;
 	}
+
 	return 0;
 }
 
@@ -1182,33 +1244,60 @@ bool ClassDB::has_integer_constant(const StringName &p_class, const StringName &
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL_V(type, false);
 
-	return type->gdtype->get_integer_constant_map(p_no_inheritance).has(p_name);
+	while (type) {
+		if (type->constant_map.has(p_name)) {
+			return true;
+		}
+		if (p_no_inheritance) {
+			return false;
+		}
+
+		type = type->inherits_ptr;
+	}
+
+	return false;
 }
 
 StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL_V(type, StringName());
 
-	const GDType::EnumInfo *enum_info = type->gdtype->get_integer_constant_enum(p_name, p_no_inheritance);
-	return enum_info ? enum_info->name : StringName();
+	while (type) {
+		for (KeyValue<StringName, ClassInfo::EnumInfo> &E : type->enum_map) {
+			List<StringName> &constants_list = E.value.constants;
+			const List<StringName>::Element *found = constants_list.find(p_name);
+			if (found) {
+				return E.key;
+			}
+		}
+
+		if (p_no_inheritance) {
+			break;
+		}
+
+		type = type->inherits_ptr;
+	}
+
+	return StringName();
 }
 
 void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	if (!type) {
-		// TODO This should probably error, but didn't previously.
-		// Making this error leads to a few prints during unit tests.
-		return;
-	}
 
-	for (const KeyValue<StringName, const GDType::EnumInfo *> &E : type->gdtype->get_enum_map(p_no_inheritance)) {
-		p_enums->push_back(E.key);
+	while (type) {
+		for (KeyValue<StringName, ClassInfo::EnumInfo> &E : type->enum_map) {
+			p_enums->push_back(E.key);
+		}
+
+		if (p_no_inheritance) {
+			break;
+		}
+
+		type = type->inherits_ptr;
 	}
 }
 
@@ -1216,13 +1305,21 @@ void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL(type);
 
-	const GDType::EnumInfo *const *enum_info = type->gdtype->get_enum_map(p_no_inheritance).getptr(p_enum);
-	ERR_FAIL_NULL(enum_info);
+	while (type) {
+		const ClassInfo::EnumInfo *constants = type->enum_map.getptr(p_enum);
 
-	for (const KeyValue<StringName, int64_t> &kv : (*enum_info)->values) {
-		p_constants->push_back(kv.key);
+		if (constants) {
+			for (const List<StringName>::Element *E = constants->constants.front(); E; E = E->next()) {
+				p_constants->push_back(E->get());
+			}
+		}
+
+		if (p_no_inheritance) {
+			break;
+		}
+
+		type = type->inherits_ptr;
 	}
 }
 
@@ -1257,25 +1354,38 @@ bool ClassDB::has_enum(const StringName &p_class, const StringName &p_name, bool
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL_V(type, false);
 
-	return type->gdtype->get_enum_map(p_no_inheritance).has(p_name);
+	while (type) {
+		if (type->enum_map.has(p_name)) {
+			return true;
+		}
+		if (p_no_inheritance) {
+			return false;
+		}
+
+		type = type->inherits_ptr;
+	}
+
+	return false;
 }
 
 bool ClassDB::is_enum_bitfield(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
-	ERR_FAIL_NULL_V(type, false);
 
-	const GDType::EnumInfo *const *enum_info = type->gdtype->get_enum_map(p_no_inheritance).getptr(p_name);
-	// FIXME This fails unexpectedly often. Keeping legacy behavior to silently fail for now.
-	//ERR_FAIL_NULL_V(enum_info, false);
-	if (!enum_info) {
-		return false;
+	while (type) {
+		if (type->enum_map.has(p_name) && type->enum_map[p_name].is_bitfield) {
+			return true;
+		}
+		if (p_no_inheritance) {
+			return false;
+		}
+
+		type = type->inherits_ptr;
 	}
 
-	return (*enum_info)->is_bitfield;
+	return false;
 }
 
 void ClassDB::add_signal(const StringName &p_class, const MethodInfo &p_signal) {
@@ -1284,7 +1394,17 @@ void ClassDB::add_signal(const StringName &p_class, const MethodInfo &p_signal)
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
-	type->gdtype->add_signal(p_signal);
+	StringName sname = p_signal.name;
+
+#ifdef DEBUG_ENABLED
+	ClassInfo *check = type;
+	while (check) {
+		ERR_FAIL_COND_MSG(check->signal_map.has(sname), vformat("Class '%s' already has signal '%s'.", String(p_class), String(sname)));
+		check = check->inherits_ptr;
+	}
+#endif // DEBUG_ENABLED
+
+	type->signal_map[sname] = p_signal;
 }
 
 void ClassDB::get_signal_list(const StringName &p_class, List<MethodInfo> *p_signals, bool p_no_inheritance) {
@@ -1293,31 +1413,52 @@ void ClassDB::get_signal_list(const StringName &p_class, List<MethodInfo> *p_sig
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
-	for (const KeyValue<StringName, const MethodInfo *> &kv : type->gdtype->get_signal_map(p_no_inheritance)) {
-		p_signals->push_back(*kv.value);
+	ClassInfo *check = type;
+
+	while (check) {
+		for (KeyValue<StringName, MethodInfo> &E : check->signal_map) {
+			p_signals->push_back(E.value);
+		}
+
+		if (p_no_inheritance) {
+			return;
+		}
+
+		check = check->inherits_ptr;
 	}
 }
 
 bool ClassDB::has_signal(const StringName &p_class, const StringName &p_signal, bool p_no_inheritance) {
 	Locker::Lock lock(Locker::STATE_READ);
 	ClassInfo *type = classes.getptr(p_class);
-	if (!type) {
-		return false;
+	ClassInfo *check = type;
+	while (check) {
+		if (check->signal_map.has(p_signal)) {
+			return true;
+		}
+		if (p_no_inheritance) {
+			return false;
+		}
+		check = check->inherits_ptr;
 	}
-	return type->gdtype->get_signal_map(p_no_inheritance).has(p_signal);
+
+	return false;
 }
 
 bool ClassDB::get_signal(const StringName &p_class, const StringName &p_signal, MethodInfo *r_signal) {
 	Locker::Lock lock(Locker::STATE_READ);
 	ClassInfo *type = classes.getptr(p_class);
-	if (!type) {
-		return false;
-	}
-	const MethodInfo *const *method_info = type->gdtype->get_signal_map(false).getptr(p_signal);
-	if (method_info) {
-		*r_signal = **method_info;
-		return true;
+	ClassInfo *check = type;
+	while (check) {
+		if (check->signal_map.has(p_signal)) {
+			if (r_signal) {
+				*r_signal = check->signal_map[p_signal];
+			}
+			return true;
+		}
+		check = check->inherits_ptr;
 	}
+
 	return false;
 }
 
@@ -1398,14 +1539,11 @@ void ClassDB::add_property(const StringName &p_class, const PropertyInfo &p_pinf
 	type->property_list.push_back(p_pinfo);
 	type->property_map[p_pinfo.name] = p_pinfo;
 #ifdef DEBUG_ENABLED
-	// Used to filter out setters and getters in the editor (e.g. autocomplete) to not clutter menus. We only want to filter methods from properties that are easily available to users.
-	if (p_index == -1 && !(p_pinfo.usage & PropertyUsageFlags::PROPERTY_USAGE_INTERNAL)) {
-		if (mb_get) {
-			type->methods_in_properties.insert(p_getter);
-		}
-		if (mb_set) {
-			type->methods_in_properties.insert(p_setter);
-		}
+	if (mb_get) {
+		type->methods_in_properties.insert(p_getter);
+	}
+	if (mb_set) {
+		type->methods_in_properties.insert(p_setter);
 	}
 #endif // DEBUG_ENABLED
 	PropertySetGet psg;
@@ -1586,7 +1724,7 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
 			return true;
 		}
 
-		const int64_t *c = check->gdtype->get_integer_constant_map(true).getptr(p_property); //constants count
+		const int64_t *c = check->constant_map.getptr(p_property); //constants count
 		if (c) {
 			r_value = *c;
 			return true;
@@ -1597,7 +1735,7 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
 			return true;
 		}
 
-		if (check->gdtype->get_signal_map(true).has(p_property)) { //signals count
+		if (check->signal_map.has(p_property)) { //signals count
 			r_value = Signal(p_object, p_property);
 			return true;
 		}
@@ -2193,12 +2331,13 @@ void ClassDB::register_extension_class(ObjectGDExtension *p_extension) {
 
 #ifdef TOOLS_ENABLED
 	// @todo This is a limitation of the current implementation, but it should be possible to remove.
-	ERR_FAIL_COND_MSG(p_extension->is_runtime && parent->gdextension && !parent->is_runtime, vformat("Extension runtime class '%s' cannot descend from '%s' which isn't also a runtime class.", String(p_extension->class_name), parent->gdtype->get_name()));
+	ERR_FAIL_COND_MSG(p_extension->is_runtime && parent->gdextension && !parent->is_runtime, vformat("Extension runtime class '%s' cannot descend from '%s' which isn't also a runtime class.", String(p_extension->class_name), parent->name));
 #endif
 
 	ClassInfo c;
 	c.api = p_extension->editor_class ? API_EDITOR_EXTENSION : API_EXTENSION;
 	c.gdextension = p_extension;
+	c.name = p_extension->class_name;
 	c.is_virtual = p_extension->is_virtual;
 	if (!p_extension->is_abstract) {
 		// Find the closest ancestor which is either non-abstract or native (or both).
@@ -2208,9 +2347,10 @@ void ClassDB::register_extension_class(ObjectGDExtension *p_extension) {
 				concrete_ancestor->gdextension != nullptr) {
 			concrete_ancestor = concrete_ancestor->inherits_ptr;
 		}
-		ERR_FAIL_NULL_MSG(concrete_ancestor->creation_func, vformat("Extension class '%s' cannot extend native abstract class '%s'.", String(p_extension->class_name), String(concrete_ancestor->gdtype->get_name())));
+		ERR_FAIL_NULL_MSG(concrete_ancestor->creation_func, vformat("Extension class '%s' cannot extend native abstract class '%s'.", String(p_extension->class_name), String(concrete_ancestor->name)));
 		c.creation_func = concrete_ancestor->creation_func;
 	}
+	c.inherits = parent->name;
 	c.class_ptr = parent->class_ptr;
 	c.inherits_ptr = parent;
 	c.exposed = p_extension->is_exposed;
@@ -2218,7 +2358,7 @@ void ClassDB::register_extension_class(ObjectGDExtension *p_extension) {
 		// The parent classes should be exposed if it has an exposed child class.
 		while (parent && !parent->exposed) {
 			parent->exposed = true;
-			parent = classes.getptr(parent->gdtype->get_name());
+			parent = classes.getptr(parent->name);
 		}
 	}
 	c.reloadable = p_extension->reloadable;
@@ -2303,9 +2443,8 @@ void ClassDB::cleanup() {
 	native_structs.clear();
 
 	for (GDType **type : gdtype_autorelease_pool) {
-		if (!*type) {
+		if (!type) {
 			WARN_PRINT("GDType in autorelease pool was cleaned up before being auto-released. Ignoring.");
-			continue;
 		}
 		memdelete(*type);
 		*type = nullptr;
diff --git a/engine/core/object/class_db.h b/engine/core/object/class_db.h
index b0266f9f..9516f655 100644
--- a/engine/core/object/class_db.h
+++ b/engine/core/object/class_db.h
@@ -31,10 +31,13 @@
 #pragma once
 
 #include "core/object/method_bind.h"
-#include "core/object/method_bind_common.h"
 #include "core/object/object.h"
 #include "core/os/rw_lock.h"
 #include "core/string/print_string.h"
+
+// Makes callable_mp readily available in all classes connecting signals.
+// Needs to come after method_bind and object have been included.
+#include "core/object/callable_method_pointer.h"
 #include "core/templates/a_hash_map.h"
 #include "core/templates/hash_set.h"
 
@@ -56,7 +59,7 @@ inline constexpr bool is_class_enabled_v = is_class_enabled<T>::value;
 
 #define GD_IS_CLASS_ENABLED(m_class) is_class_enabled_v<m_class>
 
-#include "core/disabled_classes.gen.h" // IWYU pragma: keep.
+#include "core/disabled_classes.gen.h"
 
 #define DEFVAL(m_defval) (m_defval)
 #define DEFVAL_ARRAY DEFVAL(ClassDB::default_array_arg)
@@ -96,7 +99,6 @@ MethodDefinition D_METHOD(const char *p_name, const VarArgs... p_args) {
 
 class ClassDB {
 	friend class Object;
-	friend class GDType;
 
 public:
 	enum APIType {
@@ -121,17 +123,25 @@ public:
 		APIType api = API_NONE;
 		ClassInfo *inherits_ptr = nullptr;
 		void *class_ptr = nullptr;
-		GDType *gdtype = nullptr;
+		const GDType *gdtype = nullptr;
 
 		ObjectGDExtension *gdextension = nullptr;
 
 		HashMap<StringName, MethodBind *> method_map;
 		HashMap<StringName, LocalVector<MethodBind *>> method_map_compatibility;
+		AHashMap<StringName, int64_t> constant_map;
+		struct EnumInfo {
+			List<StringName> constants;
+			bool is_bitfield = false;
+		};
 
+		HashMap<StringName, EnumInfo> enum_map;
+		AHashMap<StringName, MethodInfo> signal_map;
 		List<PropertyInfo> property_list;
 		HashMap<StringName, PropertyInfo> property_map;
 
 #ifdef DEBUG_ENABLED
+		List<StringName> constant_order;
 		List<StringName> method_order;
 		HashSet<StringName> methods_in_properties;
 		List<MethodInfo> virtual_methods;
@@ -147,6 +157,8 @@ public:
 		AHashMap<StringName, PropertySetGet> property_setget;
 		HashMap<StringName, Vector<uint32_t>> virtual_methods_compat;
 
+		StringName inherits;
+		StringName name;
 		bool disabled = false;
 		bool exposed = false;
 		bool reloadable = false;
@@ -207,7 +219,7 @@ public:
 	static APIType current_api;
 	static HashMap<APIType, uint32_t> api_hashes_cache;
 
-	static void _add_class(GDType &p_class, const GDType *p_inherits);
+	static void _add_class(const GDType &p_class, const GDType *p_inherits);
 
 	static HashMap<StringName, HashMap<StringName, Variant>> default_values;
 	static HashSet<StringName> default_values_cached;
@@ -339,7 +351,6 @@ public:
 	static bool can_instantiate(const StringName &p_class);
 	static bool is_abstract(const StringName &p_class);
 	static bool is_virtual(const StringName &p_class);
-	static bool is_gdextension(const StringName &p_class);
 	static Object *instantiate(const StringName &p_class);
 	static Object *instantiate_no_placeholders(const StringName &p_class);
 	static Object *instantiate_without_postinitialization(const StringName &p_class);
@@ -500,6 +511,7 @@ public:
 	static bool has_integer_constant(const StringName &p_class, const StringName &p_name, bool p_no_inheritance = false);
 
 	static StringName get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance = false);
+	static StringName get_integer_constant_bitfield(const StringName &p_class, const StringName &p_name, bool p_no_inheritance = false);
 	static void get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance = false);
 	static void get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance = false);
 	static bool has_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance = false);
@@ -543,13 +555,13 @@ public:
 };
 
 #define BIND_ENUM_CONSTANT(m_constant) \
-	get_gdtype_static_mutable().bind_integer_constant(__constant_get_enum_name(m_constant), __constant_get_enum_value_name(#m_constant), m_constant);
+	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant), #m_constant, m_constant);
 
 #define BIND_BITFIELD_FLAG(m_constant) \
-	get_gdtype_static_mutable().bind_integer_constant(__constant_get_bitfield_name(m_constant), __constant_get_enum_value_name(#m_constant), m_constant, true);
+	::ClassDB::bind_integer_constant(get_class_static(), __constant_get_bitfield_name(m_constant), #m_constant, m_constant, true);
 
 #define BIND_CONSTANT(m_constant) \
-	get_gdtype_static_mutable().bind_integer_constant(StringName(), __constant_get_enum_value_name(#m_constant), m_constant);
+	::ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
 
 #ifdef DEBUG_ENABLED
 
@@ -562,24 +574,24 @@ public:
 
 #endif // DEBUG_ENABLED
 
-#define GDREGISTER_CLASS(m_class) \
+#define GDREGISTER_CLASS(m_class)                 \
 	if constexpr (GD_IS_CLASS_ENABLED(m_class)) { \
-		::ClassDB::register_class<m_class>(); \
+		::ClassDB::register_class<m_class>();     \
 	}
-#define GDREGISTER_VIRTUAL_CLASS(m_class) \
+#define GDREGISTER_VIRTUAL_CLASS(m_class)         \
 	if constexpr (GD_IS_CLASS_ENABLED(m_class)) { \
 		::ClassDB::register_class<m_class>(true); \
 	}
-#define GDREGISTER_ABSTRACT_CLASS(m_class) \
-	if constexpr (GD_IS_CLASS_ENABLED(m_class)) { \
+#define GDREGISTER_ABSTRACT_CLASS(m_class)             \
+	if constexpr (GD_IS_CLASS_ENABLED(m_class)) {      \
 		::ClassDB::register_abstract_class<m_class>(); \
 	}
-#define GDREGISTER_INTERNAL_CLASS(m_class) \
-	if constexpr (GD_IS_CLASS_ENABLED(m_class)) { \
+#define GDREGISTER_INTERNAL_CLASS(m_class)             \
+	if constexpr (GD_IS_CLASS_ENABLED(m_class)) {      \
 		::ClassDB::register_internal_class<m_class>(); \
 	}
-#define GDREGISTER_RUNTIME_CLASS(m_class) \
-	if constexpr (GD_IS_CLASS_ENABLED(m_class)) { \
+#define GDREGISTER_RUNTIME_CLASS(m_class)             \
+	if constexpr (GD_IS_CLASS_ENABLED(m_class)) {     \
 		::ClassDB::register_runtime_class<m_class>(); \
 	}
 
diff --git a/engine/core/object/gdtype.cpp b/engine/core/object/gdtype.cpp
index 1efac1b8..389a110f 100644
--- a/engine/core/object/gdtype.cpp
+++ b/engine/core/object/gdtype.cpp
@@ -30,9 +30,6 @@
 
 #include "gdtype.h"
 
-#include "core/os/memory.h"
-#include "core/os/thread.h"
-
 GDType::GDType(const GDType *p_super_type, StringName p_name) :
 		super_type(p_super_type), name(std::move(p_name)) {
 	name_hierarchy.push_back(name);
@@ -43,84 +40,3 @@ GDType::GDType(const GDType *p_super_type, StringName p_name) :
 		}
 	}
 }
-
-GDType::~GDType() {
-	for (const KeyValue<StringName, const EnumInfo *> &kv : self_enum_map) {
-		memdelete(const_cast<EnumInfo *>(kv.value));
-	}
-	for (const KeyValue<StringName, const MethodInfo *> &kv : self_signal_map) {
-		memdelete(const_cast<MethodInfo *>(kv.value));
-	}
-}
-
-void GDType::initialize() {
-	ERR_FAIL_COND(init_state != InitState::UNINITIALIZED);
-
-	if (super_type) {
-		// Now that a subtype is registered, the supertype cannot change anymore.
-		// Otherwise, our caches would become invalid.
-		// This shouldn't be a problem, since classes should register all their
-		// parts in _bind_methods, which is called on registration.
-		super_type->init_state = InitState::FINALIZED;
-
-		constant_map = super_type->constant_map;
-		enum_map = super_type->enum_map;
-		signal_map = super_type->signal_map;
-	}
-
-	init_state = InitState::MUTABLE;
-}
-
-void GDType::bind_integer_constant(const StringName &p_enum, const StringName &p_name, int64_t p_constant, bool p_is_bitfield) {
-	ERR_FAIL_COND(!Thread::is_main_thread());
-	ERR_FAIL_COND(init_state != InitState::MUTABLE);
-	ERR_FAIL_COND_MSG(self_constant_map.has(p_name), vformat("Class '%s' already has constant '%s'.", String(name), String(p_name)));
-
-	constant_map[p_name] = p_constant;
-	self_constant_map[p_name] = p_constant;
-
-	String enum_name = p_enum;
-	if (!enum_name.is_empty()) {
-		if (enum_name.contains_char('.')) {
-			enum_name = enum_name.get_slicec('.', 1);
-		}
-
-		const EnumInfo **_enum_info = self_enum_map.getptr(enum_name);
-
-		if (_enum_info != nullptr) {
-			EnumInfo *enum_info = const_cast<EnumInfo *>(*_enum_info);
-			enum_info->values.insert(p_name, p_constant);
-			enum_info->is_bitfield = p_is_bitfield;
-		} else {
-			EnumInfo *enum_info = memnew(EnumInfo);
-			enum_info->name = enum_name;
-			enum_info->is_bitfield = p_is_bitfield;
-			enum_info->values.insert(p_name, p_constant);
-			self_enum_map[enum_name] = enum_info;
-			enum_map[enum_name] = enum_info;
-		}
-	}
-}
-
-const GDType::EnumInfo *GDType::get_integer_constant_enum(const StringName &p_name, bool p_no_inheritance) const {
-	for (const KeyValue<StringName, const EnumInfo *> &kv : get_enum_map(p_no_inheritance)) {
-		if (kv.value->values.has(p_name)) {
-			return kv.value;
-		}
-	}
-
-	return nullptr;
-}
-
-void GDType::add_signal(MethodInfo p_signal) {
-	ERR_FAIL_COND(!Thread::is_main_thread());
-	ERR_FAIL_COND(init_state != InitState::MUTABLE);
-
-	const StringName signal_name(p_signal.name);
-	ERR_FAIL_COND_MSG(signal_map.has(signal_name), vformat("Class '%s' already has signal '%s'.", String(name), String(signal_name)));
-
-	const MethodInfo *ptr = memnew(MethodInfo(std::move(p_signal)));
-
-	signal_map[signal_name] = ptr;
-	self_signal_map[signal_name] = ptr;
-}
diff --git a/engine/core/object/gdtype.h b/engine/core/object/gdtype.h
index 2080142a..a4384459 100644
--- a/engine/core/object/gdtype.h
+++ b/engine/core/object/gdtype.h
@@ -30,63 +30,21 @@
 
 #pragma once
 
-#include "core/object/method_info.h"
 #include "core/string/string_name.h"
-#include "core/templates/a_hash_map.h"
 #include "core/templates/vector.h"
 
 class GDType {
-public:
-	enum class InitState {
-		UNINITIALIZED,
-		MUTABLE,
-		FINALIZED,
-	};
-
-	struct EnumInfo {
-		StringName name;
-		AHashMap<StringName, int64_t> values;
-		bool is_bitfield = false;
-	};
-
-protected:
 	const GDType *super_type;
-	mutable InitState init_state = InitState::UNINITIALIZED;
 
 	StringName name;
 	/// Contains all the class names in order:
 	/// `name` is the first element and `Object` is the last.
 	Vector<StringName> name_hierarchy;
 
-	AHashMap<StringName, int64_t> constant_map;
-	AHashMap<StringName, int64_t> self_constant_map;
-
-	AHashMap<StringName, const EnumInfo *> enum_map;
-	AHashMap<StringName, const EnumInfo *> self_enum_map;
-
-	AHashMap<StringName, const MethodInfo *> signal_map;
-	AHashMap<StringName, const MethodInfo *> self_signal_map;
-
 public:
 	GDType(const GDType *p_super_type, StringName p_name);
-	~GDType();
-
-	InitState get_init_state() const { return init_state; }
-	void initialize();
 
 	const GDType *get_super_type() const { return super_type; }
 	const StringName &get_name() const { return name; }
-	const StringName &get_super_type_name() const {
-		static const StringName EMPTY;
-		return super_type ? super_type->name : EMPTY;
-	}
 	const Vector<StringName> &get_name_hierarchy() const { return name_hierarchy; }
-
-	void bind_integer_constant(const StringName &p_enum, const StringName &p_name, int64_t p_constant, bool p_is_bitfield = false);
-	const AHashMap<StringName, int64_t> &get_integer_constant_map(bool p_no_inheritance = false) const { return p_no_inheritance ? self_constant_map : constant_map; }
-	const AHashMap<StringName, const EnumInfo *> &get_enum_map(bool p_no_inheritance = false) const { return p_no_inheritance ? self_enum_map : enum_map; }
-	const EnumInfo *get_integer_constant_enum(const StringName &p_name, bool p_no_inheritance = false) const;
-
-	void add_signal(MethodInfo p_signal);
-	const AHashMap<StringName, const MethodInfo *> &get_signal_map(bool p_no_inheritance = false) const { return p_no_inheritance ? self_signal_map : signal_map; }
 };
diff --git a/engine/core/object/make_virtuals.py b/engine/core/object/make_virtuals.py
index 7ba4c31e..9ba6330c 100644
--- a/engine/core/object/make_virtuals.py
+++ b/engine/core/object/make_virtuals.py
@@ -196,12 +196,7 @@ def run(target, source, env):
     txt = """/* THIS FILE IS GENERATED DO NOT EDIT */
 #pragma once
 
-// IWYU pragma: begin_keep
 #include "core/object/script_instance.h"
-#include "core/variant/method_ptrcall.h"
-#include "core/variant/variant_caster.h"
-#include "core/variant/variant_internal.h"
-// IWYU pragma: end_keep
 
 inline constexpr uintptr_t _INVALID_GDVIRTUAL_FUNC_ADDR = static_cast<uintptr_t>(-1);
 
diff --git a/engine/core/object/message_queue.cpp b/engine/core/object/message_queue.cpp
index 5b97eb5f..eb2066ec 100644
--- a/engine/core/object/message_queue.cpp
+++ b/engine/core/object/message_queue.cpp
@@ -31,29 +31,31 @@
 #include "message_queue.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
+#include "core/object/script_language.h"
 
 #include <cstdio>
 
 #ifdef DEV_ENABLED
 // Includes safety checks to ensure that a queue set as a thread singleton override
 // is only ever called from the thread it was set for.
-#define LOCK_MUTEX \
+#define LOCK_MUTEX                                \
 	if (this != MessageQueue::thread_singleton) { \
-		DEV_ASSERT(!is_current_thread_override); \
-		mutex.lock(); \
-	} else { \
-		DEV_ASSERT(is_current_thread_override); \
+		DEV_ASSERT(!is_current_thread_override);  \
+		mutex.lock();                             \
+	} else {                                      \
+		DEV_ASSERT(is_current_thread_override);   \
 	}
 #else
-#define LOCK_MUTEX \
+#define LOCK_MUTEX                                \
 	if (this != MessageQueue::thread_singleton) { \
-		mutex.lock(); \
+		mutex.lock();                             \
 	}
 #endif
 
-#define UNLOCK_MUTEX \
+#define UNLOCK_MUTEX                              \
 	if (this != MessageQueue::thread_singleton) { \
-		mutex.unlock(); \
+		mutex.unlock();                           \
 	}
 
 void CallQueue::_add_page() {
diff --git a/engine/core/object/message_queue.h b/engine/core/object/message_queue.h
index 2722a1ed..8a66d0c1 100644
--- a/engine/core/object/message_queue.h
+++ b/engine/core/object/message_queue.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/object_id.h"
-#include "core/os/mutex.h"
+#include "core/os/thread_safe.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "core/variant/variant.h"
@@ -130,6 +130,15 @@ public:
 	}
 
 	Error push_callp(Object *p_object, const StringName &p_method, const Variant **p_args, int p_argcount, bool p_show_error = false);
+	template <typename... VarArgs>
+	Error push_call(Object *p_object, const StringName &p_method, VarArgs... p_args) {
+		Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
+		const Variant *argptrs[sizeof...(p_args) + 1];
+		for (uint32_t i = 0; i < sizeof...(p_args); i++) {
+			argptrs[i] = &args[i];
+		}
+		return push_callp(p_object, p_method, sizeof...(p_args) == 0 ? nullptr : (const Variant **)argptrs, sizeof...(p_args));
+	}
 
 	Error push_notification(Object *p_object, int p_notification);
 	Error push_set(Object *p_object, const StringName &p_prop, const Variant &p_value);
diff --git a/engine/core/object/method_bind.cpp b/engine/core/object/method_bind.cpp
index e3824112..42e76834 100644
--- a/engine/core/object/method_bind.cpp
+++ b/engine/core/object/method_bind.cpp
@@ -28,10 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "method_bind.h"
-
+// object.h needs to be the first include *before* method_bind.h
+// FIXME: Find out why and fix potential cyclical dependencies.
 #include "core/object/object.h"
 
+#include "method_bind.h"
+
 uint32_t MethodBind::get_hash() const {
 	MethodInfo mi;
 	mi.return_val = get_return_info();
diff --git a/engine/core/object/method_bind.h b/engine/core/object/method_bind.h
index 0843a32c..3a217719 100644
--- a/engine/core/object/method_bind.h
+++ b/engine/core/object/method_bind.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "core/variant/type_info.h"
-#include "core/variant/variant.h"
+#include "core/variant/binder_common.h"
+
+VARIANT_BITFIELD_CAST(MethodFlags)
 
 // some helpers
 
@@ -285,3 +286,496 @@ MethodBind *create_vararg_method_bind(R (T::*p_method)(const Variant **, int, Ca
 	a->set_instance_class(T::get_class_static());
 	return a;
 }
+
+/**** VARIADIC TEMPLATES ****/
+
+#ifndef TYPED_METHOD_BIND
+class __UnexistingClass;
+#define MB_T __UnexistingClass
+#else
+#define MB_T T
+#endif
+
+// no return, not const
+#ifdef TYPED_METHOD_BIND
+template <typename T, typename... P>
+#else
+template <typename... P>
+#endif
+class MethodBindT : public MethodBind {
+	void (MB_T::*method)(P...);
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return Variant::NIL;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		PropertyInfo pi;
+		call_get_argument_type_info<P...>(p_arg, pi);
+		return pi;
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		return call_get_argument_metadata<P...>(p_arg);
+	}
+
+#endif // DEBUG_ENABLED
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_variant_args_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
+#else
+		call_with_variant_args_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
+#endif
+		return Variant();
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_validated_object_instance_args(static_cast<T *>(p_object), method, p_args);
+#else
+		call_with_validated_object_instance_args(reinterpret_cast<MB_T *>(p_object), method, p_args);
+#endif
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_ptr_args<T, P...>(static_cast<T *>(p_object), method, p_args);
+#else
+		call_with_ptr_args<MB_T, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args);
+#endif
+	}
+
+	MethodBindT(void (MB_T::*p_method)(P...)) {
+		method = p_method;
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+	}
+};
+
+template <typename T, typename... P>
+MethodBind *create_method_bind(void (T::*p_method)(P...)) {
+#ifdef TYPED_METHOD_BIND
+	MethodBind *a = memnew((MethodBindT<T, P...>)(p_method));
+#else
+	MethodBind *a = memnew((MethodBindT<P...>)(reinterpret_cast<void (MB_T::*)(P...)>(p_method)));
+#endif
+	a->set_instance_class(T::get_class_static());
+	return a;
+}
+
+// no return, const
+
+#ifdef TYPED_METHOD_BIND
+template <typename T, typename... P>
+#else
+template <typename... P>
+#endif
+class MethodBindTC : public MethodBind {
+	void (MB_T::*method)(P...) const;
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return Variant::NIL;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		PropertyInfo pi;
+		call_get_argument_type_info<P...>(p_arg, pi);
+		return pi;
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		return call_get_argument_metadata<P...>(p_arg);
+	}
+
+#endif // DEBUG_ENABLED
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_variant_argsc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
+#else
+		call_with_variant_argsc_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
+#endif
+		return Variant();
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_validated_object_instance_argsc(static_cast<T *>(p_object), method, p_args);
+#else
+		call_with_validated_object_instance_argsc(reinterpret_cast<MB_T *>(p_object), method, p_args);
+#endif
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_ptr_argsc<T, P...>(static_cast<T *>(p_object), method, p_args);
+#else
+		call_with_ptr_argsc<MB_T, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args);
+#endif
+	}
+
+	MethodBindTC(void (MB_T::*p_method)(P...) const) {
+		method = p_method;
+		_set_const(true);
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+	}
+};
+
+template <typename T, typename... P>
+MethodBind *create_method_bind(void (T::*p_method)(P...) const) {
+#ifdef TYPED_METHOD_BIND
+	MethodBind *a = memnew((MethodBindTC<T, P...>)(p_method));
+#else
+	MethodBind *a = memnew((MethodBindTC<P...>)(reinterpret_cast<void (MB_T::*)(P...) const>(p_method)));
+#endif
+	a->set_instance_class(T::get_class_static());
+	return a;
+}
+
+// return, not const
+
+#ifdef TYPED_METHOD_BIND
+template <typename T, typename R, typename... P>
+#else
+template <typename R, typename... P>
+#endif
+class MethodBindTR : public MethodBind {
+	R (MB_T::*method)(P...);
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::VARIANT_TYPE;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			PropertyInfo pi;
+			call_get_argument_type_info<P...>(p_arg, pi);
+			return pi;
+		} else {
+			return GetTypeInfo<R>::get_class_info();
+		}
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		if (p_arg >= 0) {
+			return call_get_argument_metadata<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::METADATA;
+		}
+	}
+#endif // DEBUG_ENABLED
+
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+		Variant ret;
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_variant_args_ret_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
+#else
+		call_with_variant_args_ret_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
+#endif
+		return ret;
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_validated_object_instance_args_ret(static_cast<T *>(p_object), method, p_args, r_ret);
+#else
+		call_with_validated_object_instance_args_ret(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
+#endif
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_ptr_args_ret<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
+#else
+		call_with_ptr_args_ret<MB_T, R, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
+#endif
+	}
+
+	MethodBindTR(R (MB_T::*p_method)(P...)) {
+		method = p_method;
+		_set_returns(true);
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+	}
+};
+
+template <typename T, typename R, typename... P>
+MethodBind *create_method_bind(R (T::*p_method)(P...)) {
+#ifdef TYPED_METHOD_BIND
+	MethodBind *a = memnew((MethodBindTR<T, R, P...>)(p_method));
+#else
+	MethodBind *a = memnew((MethodBindTR<R, P...>)(reinterpret_cast<R (MB_T::*)(P...)>(p_method)));
+#endif
+
+	a->set_instance_class(T::get_class_static());
+	return a;
+}
+
+// return, const
+
+#ifdef TYPED_METHOD_BIND
+template <typename T, typename R, typename... P>
+#else
+template <typename R, typename... P>
+#endif
+class MethodBindTRC : public MethodBind {
+	R (MB_T::*method)(P...) const;
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::VARIANT_TYPE;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			PropertyInfo pi;
+			call_get_argument_type_info<P...>(p_arg, pi);
+			return pi;
+		} else {
+			return GetTypeInfo<R>::get_class_info();
+		}
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		if (p_arg >= 0) {
+			return call_get_argument_metadata<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::METADATA;
+		}
+	}
+#endif // DEBUG_ENABLED
+
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+		Variant ret;
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_variant_args_retc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
+#else
+		call_with_variant_args_retc_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
+#endif
+		return ret;
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_validated_object_instance_args_retc(static_cast<T *>(p_object), method, p_args, r_ret);
+#else
+		call_with_validated_object_instance_args_retc(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
+#endif
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+#ifdef TOOLS_ENABLED
+		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
+#endif
+#ifdef TYPED_METHOD_BIND
+		call_with_ptr_args_retc<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
+#else
+		call_with_ptr_args_retc<MB_T, R, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
+#endif
+	}
+
+	MethodBindTRC(R (MB_T::*p_method)(P...) const) {
+		method = p_method;
+		_set_returns(true);
+		_set_const(true);
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+	}
+};
+
+template <typename T, typename R, typename... P>
+MethodBind *create_method_bind(R (T::*p_method)(P...) const) {
+#ifdef TYPED_METHOD_BIND
+	MethodBind *a = memnew((MethodBindTRC<T, R, P...>)(p_method));
+#else
+	MethodBind *a = memnew((MethodBindTRC<R, P...>)(reinterpret_cast<R (MB_T::*)(P...) const>(p_method)));
+#endif
+	a->set_instance_class(T::get_class_static());
+	return a;
+}
+
+/* STATIC BINDS */
+
+// no return
+
+template <typename... P>
+class MethodBindTS : public MethodBind {
+	void (*function)(P...);
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return Variant::NIL;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		PropertyInfo pi;
+		call_get_argument_type_info<P...>(p_arg, pi);
+		return pi;
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		return call_get_argument_metadata<P...>(p_arg);
+	}
+
+#endif // DEBUG_ENABLED
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+		(void)p_object; // unused
+		call_with_variant_args_static_dv(function, p_args, p_arg_count, r_error, get_default_arguments());
+		return Variant();
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+		call_with_validated_variant_args_static_method(function, p_args);
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+		(void)p_object;
+		(void)r_ret;
+		call_with_ptr_args_static_method(function, p_args);
+	}
+
+	MethodBindTS(void (*p_function)(P...)) {
+		function = p_function;
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+		_set_static(true);
+	}
+};
+
+template <typename... P>
+MethodBind *create_static_method_bind(void (*p_method)(P...)) {
+	MethodBind *a = memnew((MethodBindTS<P...>)(p_method));
+	return a;
+}
+
+// return
+
+template <typename R, typename... P>
+class MethodBindTRS : public MethodBind {
+	R (*function)(P...);
+
+protected:
+	virtual Variant::Type _gen_argument_type(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			return call_get_argument_type<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::VARIANT_TYPE;
+		}
+	}
+
+	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
+		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
+			PropertyInfo pi;
+			call_get_argument_type_info<P...>(p_arg, pi);
+			return pi;
+		} else {
+			return GetTypeInfo<R>::get_class_info();
+		}
+	}
+
+public:
+#ifdef DEBUG_ENABLED
+	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
+		if (p_arg >= 0) {
+			return call_get_argument_metadata<P...>(p_arg);
+		} else {
+			return GetTypeInfo<R>::METADATA;
+		}
+	}
+
+#endif // DEBUG_ENABLED
+	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
+		Variant ret;
+		call_with_variant_args_static_ret_dv(function, p_args, p_arg_count, ret, r_error, get_default_arguments());
+		return ret;
+	}
+
+	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
+		call_with_validated_variant_args_static_method_ret(function, p_args, r_ret);
+	}
+
+	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
+		(void)p_object;
+		call_with_ptr_args_static_method_ret(function, p_args, r_ret);
+	}
+
+	MethodBindTRS(R (*p_function)(P...)) {
+		function = p_function;
+		_generate_argument_types(sizeof...(P));
+		set_argument_count(sizeof...(P));
+		_set_static(true);
+		_set_returns(true);
+	}
+};
+
+template <typename R, typename... P>
+MethodBind *create_static_method_bind(R (*p_method)(P...)) {
+	MethodBind *a = memnew((MethodBindTRS<R, P...>)(p_method));
+	return a;
+}
diff --git a/engine/core/object/method_bind_common.h b/engine/core/object/method_bind_common.h
deleted file mode 100644
index b90656f8..00000000
--- a/engine/core/object/method_bind_common.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/**************************************************************************/
-/*  method_bind_common.h                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/method_bind.h"
-#include "core/variant/binder_common.h"
-
-VARIANT_BITFIELD_CAST(MethodFlags)
-
-/**** VARIADIC TEMPLATES ****/
-
-#ifndef TYPED_METHOD_BIND
-class __UnexistingClass;
-#define MB_T __UnexistingClass
-#else
-#define MB_T T
-#endif
-
-// no return, not const
-#ifdef TYPED_METHOD_BIND
-template <typename T, typename... P>
-#else
-template <typename... P>
-#endif
-class MethodBindT : public MethodBind {
-	void (MB_T::*method)(P...);
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return Variant::NIL;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		PropertyInfo pi;
-		call_get_argument_type_info<P...>(p_arg, pi);
-		return pi;
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		return call_get_argument_metadata<P...>(p_arg);
-	}
-
-#endif // DEBUG_ENABLED
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_variant_args_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
-#else
-		call_with_variant_args_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
-#endif
-		return Variant();
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_validated_object_instance_args(static_cast<T *>(p_object), method, p_args);
-#else
-		call_with_validated_object_instance_args(reinterpret_cast<MB_T *>(p_object), method, p_args);
-#endif
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_ptr_args<T, P...>(static_cast<T *>(p_object), method, p_args);
-#else
-		call_with_ptr_args<MB_T, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args);
-#endif
-	}
-
-	MethodBindT(void (MB_T::*p_method)(P...)) {
-		method = p_method;
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-	}
-};
-
-template <typename T, typename... P>
-MethodBind *create_method_bind(void (T::*p_method)(P...)) {
-#ifdef TYPED_METHOD_BIND
-	MethodBind *a = memnew((MethodBindT<T, P...>)(p_method));
-#else
-	MethodBind *a = memnew((MethodBindT<P...>)(reinterpret_cast<void (MB_T::*)(P...)>(p_method)));
-#endif
-	a->set_instance_class(T::get_class_static());
-	return a;
-}
-
-// no return, const
-
-#ifdef TYPED_METHOD_BIND
-template <typename T, typename... P>
-#else
-template <typename... P>
-#endif
-class MethodBindTC : public MethodBind {
-	void (MB_T::*method)(P...) const;
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return Variant::NIL;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		PropertyInfo pi;
-		call_get_argument_type_info<P...>(p_arg, pi);
-		return pi;
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		return call_get_argument_metadata<P...>(p_arg);
-	}
-
-#endif // DEBUG_ENABLED
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_variant_argsc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
-#else
-		call_with_variant_argsc_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, r_error, get_default_arguments());
-#endif
-		return Variant();
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_validated_object_instance_argsc(static_cast<T *>(p_object), method, p_args);
-#else
-		call_with_validated_object_instance_argsc(reinterpret_cast<MB_T *>(p_object), method, p_args);
-#endif
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_ptr_argsc<T, P...>(static_cast<T *>(p_object), method, p_args);
-#else
-		call_with_ptr_argsc<MB_T, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args);
-#endif
-	}
-
-	MethodBindTC(void (MB_T::*p_method)(P...) const) {
-		method = p_method;
-		_set_const(true);
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-	}
-};
-
-template <typename T, typename... P>
-MethodBind *create_method_bind(void (T::*p_method)(P...) const) {
-#ifdef TYPED_METHOD_BIND
-	MethodBind *a = memnew((MethodBindTC<T, P...>)(p_method));
-#else
-	MethodBind *a = memnew((MethodBindTC<P...>)(reinterpret_cast<void (MB_T::*)(P...) const>(p_method)));
-#endif
-	a->set_instance_class(T::get_class_static());
-	return a;
-}
-
-// return, not const
-
-#ifdef TYPED_METHOD_BIND
-template <typename T, typename R, typename... P>
-#else
-template <typename R, typename... P>
-#endif
-class MethodBindTR : public MethodBind {
-	R (MB_T::*method)(P...);
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::VARIANT_TYPE;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			PropertyInfo pi;
-			call_get_argument_type_info<P...>(p_arg, pi);
-			return pi;
-		} else {
-			return GetTypeInfo<R>::get_class_info();
-		}
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		if (p_arg >= 0) {
-			return call_get_argument_metadata<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::METADATA;
-		}
-	}
-#endif // DEBUG_ENABLED
-
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-		Variant ret;
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_variant_args_ret_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
-#else
-		call_with_variant_args_ret_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
-#endif
-		return ret;
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_validated_object_instance_args_ret(static_cast<T *>(p_object), method, p_args, r_ret);
-#else
-		call_with_validated_object_instance_args_ret(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
-#endif
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_ptr_args_ret<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
-#else
-		call_with_ptr_args_ret<MB_T, R, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
-#endif
-	}
-
-	MethodBindTR(R (MB_T::*p_method)(P...)) {
-		method = p_method;
-		_set_returns(true);
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-	}
-};
-
-template <typename T, typename R, typename... P>
-MethodBind *create_method_bind(R (T::*p_method)(P...)) {
-#ifdef TYPED_METHOD_BIND
-	MethodBind *a = memnew((MethodBindTR<T, R, P...>)(p_method));
-#else
-	MethodBind *a = memnew((MethodBindTR<R, P...>)(reinterpret_cast<R (MB_T::*)(P...)>(p_method)));
-#endif
-
-	a->set_instance_class(T::get_class_static());
-	return a;
-}
-
-// return, const
-
-#ifdef TYPED_METHOD_BIND
-template <typename T, typename R, typename... P>
-#else
-template <typename R, typename... P>
-#endif
-class MethodBindTRC : public MethodBind {
-	R (MB_T::*method)(P...) const;
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::VARIANT_TYPE;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			PropertyInfo pi;
-			call_get_argument_type_info<P...>(p_arg, pi);
-			return pi;
-		} else {
-			return GetTypeInfo<R>::get_class_info();
-		}
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		if (p_arg >= 0) {
-			return call_get_argument_metadata<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::METADATA;
-		}
-	}
-#endif // DEBUG_ENABLED
-
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-		Variant ret;
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), ret, vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_variant_args_retc_dv(static_cast<T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
-#else
-		call_with_variant_args_retc_dv(reinterpret_cast<MB_T *>(p_object), method, p_args, p_arg_count, ret, r_error, get_default_arguments());
-#endif
-		return ret;
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_validated_object_instance_args_retc(static_cast<T *>(p_object), method, p_args, r_ret);
-#else
-		call_with_validated_object_instance_args_retc(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
-#endif
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-#ifdef TOOLS_ENABLED
-		ERR_FAIL_COND_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == get_instance_class(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
-#endif
-#ifdef TYPED_METHOD_BIND
-		call_with_ptr_args_retc<T, R, P...>(static_cast<T *>(p_object), method, p_args, r_ret);
-#else
-		call_with_ptr_args_retc<MB_T, R, P...>(reinterpret_cast<MB_T *>(p_object), method, p_args, r_ret);
-#endif
-	}
-
-	MethodBindTRC(R (MB_T::*p_method)(P...) const) {
-		method = p_method;
-		_set_returns(true);
-		_set_const(true);
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-	}
-};
-
-template <typename T, typename R, typename... P>
-MethodBind *create_method_bind(R (T::*p_method)(P...) const) {
-#ifdef TYPED_METHOD_BIND
-	MethodBind *a = memnew((MethodBindTRC<T, R, P...>)(p_method));
-#else
-	MethodBind *a = memnew((MethodBindTRC<R, P...>)(reinterpret_cast<R (MB_T::*)(P...) const>(p_method)));
-#endif
-	a->set_instance_class(T::get_class_static());
-	return a;
-}
-
-/* STATIC BINDS */
-
-// no return
-
-template <typename... P>
-class MethodBindTS : public MethodBind {
-	void (*function)(P...);
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return Variant::NIL;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		PropertyInfo pi;
-		call_get_argument_type_info<P...>(p_arg, pi);
-		return pi;
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		return call_get_argument_metadata<P...>(p_arg);
-	}
-
-#endif // DEBUG_ENABLED
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-		(void)p_object; // unused
-		call_with_variant_args_static_dv(function, p_args, p_arg_count, r_error, get_default_arguments());
-		return Variant();
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-		call_with_validated_variant_args_static_method(function, p_args);
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-		(void)p_object;
-		(void)r_ret;
-		call_with_ptr_args_static_method(function, p_args);
-	}
-
-	MethodBindTS(void (*p_function)(P...)) {
-		function = p_function;
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-		_set_static(true);
-	}
-};
-
-template <typename... P>
-MethodBind *create_static_method_bind(void (*p_method)(P...)) {
-	MethodBind *a = memnew((MethodBindTS<P...>)(p_method));
-	return a;
-}
-
-// return
-
-template <typename R, typename... P>
-class MethodBindTRS : public MethodBind {
-	R (*function)(P...);
-
-protected:
-	virtual Variant::Type _gen_argument_type(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			return call_get_argument_type<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::VARIANT_TYPE;
-		}
-	}
-
-	virtual PropertyInfo _gen_argument_type_info(int p_arg) const override {
-		if (p_arg >= 0 && p_arg < (int)sizeof...(P)) {
-			PropertyInfo pi;
-			call_get_argument_type_info<P...>(p_arg, pi);
-			return pi;
-		} else {
-			return GetTypeInfo<R>::get_class_info();
-		}
-	}
-
-public:
-#ifdef DEBUG_ENABLED
-	virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const override {
-		if (p_arg >= 0) {
-			return call_get_argument_metadata<P...>(p_arg);
-		} else {
-			return GetTypeInfo<R>::METADATA;
-		}
-	}
-
-#endif // DEBUG_ENABLED
-	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
-		Variant ret;
-		call_with_variant_args_static_ret_dv(function, p_args, p_arg_count, ret, r_error, get_default_arguments());
-		return ret;
-	}
-
-	virtual void validated_call(Object *p_object, const Variant **p_args, Variant *r_ret) const override {
-		call_with_validated_variant_args_static_method_ret(function, p_args, r_ret);
-	}
-
-	virtual void ptrcall(Object *p_object, const void **p_args, void *r_ret) const override {
-		(void)p_object;
-		call_with_ptr_args_static_method_ret(function, p_args, r_ret);
-	}
-
-	MethodBindTRS(R (*p_function)(P...)) {
-		function = p_function;
-		_generate_argument_types(sizeof...(P));
-		set_argument_count(sizeof...(P));
-		_set_static(true);
-		_set_returns(true);
-	}
-};
-
-template <typename R, typename... P>
-MethodBind *create_static_method_bind(R (*p_method)(P...)) {
-	MethodBind *a = memnew((MethodBindTRS<R, P...>)(p_method));
-	return a;
-}
diff --git a/engine/core/object/method_info.cpp b/engine/core/object/method_info.cpp
deleted file mode 100644
index e53a747c..00000000
--- a/engine/core/object/method_info.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/**************************************************************************/
-/*  method_info.cpp                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "method_info.h"
-
-#include "core/variant/array.h"
-#include "core/variant/dictionary.h"
-#include "core/variant/typed_array.h" // IWYU pragma: keep. `convert_property_list` return type.
-
-MethodInfo::operator Dictionary() const {
-	Dictionary d;
-	d["name"] = name;
-	d["args"] = convert_property_list(arguments);
-	Array da;
-	for (int i = 0; i < default_arguments.size(); i++) {
-		da.push_back(default_arguments[i]);
-	}
-	d["default_args"] = da;
-	d["flags"] = flags;
-	d["id"] = id;
-	Dictionary r = return_val;
-	d["return"] = r;
-	return d;
-}
-
-MethodInfo MethodInfo::from_dict(const Dictionary &p_dict) {
-	MethodInfo mi;
-
-	if (p_dict.has("name")) {
-		mi.name = p_dict["name"];
-	}
-	Array args;
-	if (p_dict.has("args")) {
-		args = p_dict["args"];
-	}
-
-	for (const Variant &arg : args) {
-		Dictionary d = arg;
-		mi.arguments.push_back(PropertyInfo::from_dict(d));
-	}
-	Array defargs;
-	if (p_dict.has("default_args")) {
-		defargs = p_dict["default_args"];
-	}
-	for (const Variant &defarg : defargs) {
-		mi.default_arguments.push_back(defarg);
-	}
-
-	if (p_dict.has("return")) {
-		mi.return_val = PropertyInfo::from_dict(p_dict["return"]);
-	}
-
-	if (p_dict.has("flags")) {
-		mi.flags = p_dict["flags"];
-	}
-
-	return mi;
-}
-
-uint32_t MethodInfo::get_compatibility_hash() const {
-	bool has_return = (return_val.type != Variant::NIL) || (return_val.usage & PROPERTY_USAGE_NIL_IS_VARIANT);
-
-	uint32_t hash = hash_murmur3_one_32(has_return);
-	hash = hash_murmur3_one_32(arguments.size(), hash);
-
-	if (has_return) {
-		hash = hash_murmur3_one_32(return_val.type, hash);
-		if (return_val.class_name != StringName()) {
-			hash = hash_murmur3_one_32(return_val.class_name.hash(), hash);
-		}
-	}
-
-	for (const PropertyInfo &arg : arguments) {
-		hash = hash_murmur3_one_32(arg.type, hash);
-		if (arg.class_name != StringName()) {
-			hash = hash_murmur3_one_32(arg.class_name.hash(), hash);
-		}
-	}
-
-	hash = hash_murmur3_one_32(default_arguments.size(), hash);
-	for (const Variant &v : default_arguments) {
-		hash = hash_murmur3_one_32(v.hash(), hash);
-	}
-
-	hash = hash_murmur3_one_32(flags & METHOD_FLAG_CONST ? 1 : 0, hash);
-	hash = hash_murmur3_one_32(flags & METHOD_FLAG_VARARG ? 1 : 0, hash);
-
-	return hash_fmix32(hash);
-}
diff --git a/engine/core/object/method_info.h b/engine/core/object/method_info.h
deleted file mode 100644
index e8e30dee..00000000
--- a/engine/core/object/method_info.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/**************************************************************************/
-/*  method_info.h                                                         */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/property_info.h"
-#include "core/variant/variant.h"
-
-enum MethodFlags {
-	METHOD_FLAG_NORMAL = 1,
-	METHOD_FLAG_EDITOR = 2,
-	METHOD_FLAG_CONST = 4,
-	METHOD_FLAG_VIRTUAL = 8,
-	METHOD_FLAG_VARARG = 16,
-	METHOD_FLAG_STATIC = 32,
-	METHOD_FLAG_OBJECT_CORE = 64,
-	METHOD_FLAG_VIRTUAL_REQUIRED = 128,
-	METHOD_FLAGS_DEFAULT = METHOD_FLAG_NORMAL,
-};
-
-struct MethodInfo {
-	String name;
-	PropertyInfo return_val;
-	uint32_t flags = METHOD_FLAGS_DEFAULT;
-	int id = 0;
-	Vector<PropertyInfo> arguments;
-	Vector<Variant> default_arguments;
-	int return_val_metadata = 0;
-	Vector<int> arguments_metadata;
-
-	int get_argument_meta(int p_arg) const {
-		ERR_FAIL_COND_V(p_arg < -1 || p_arg > arguments.size(), 0);
-		if (p_arg == -1) {
-			return return_val_metadata;
-		}
-		return arguments_metadata.size() > p_arg ? arguments_metadata[p_arg] : 0;
-	}
-
-	inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id && name == p_method.name; }
-	inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); }
-
-	operator Dictionary() const;
-
-	static MethodInfo from_dict(const Dictionary &p_dict);
-
-	uint32_t get_compatibility_hash() const;
-
-	MethodInfo() {}
-
-	explicit MethodInfo(const GDExtensionMethodInfo &pinfo) :
-			name(*reinterpret_cast<StringName *>(pinfo.name)),
-			return_val(PropertyInfo(pinfo.return_value)),
-			flags(pinfo.flags),
-			id(pinfo.id) {
-		for (uint32_t i = 0; i < pinfo.argument_count; i++) {
-			arguments.push_back(PropertyInfo(pinfo.arguments[i]));
-		}
-		const Variant *def_values = (const Variant *)pinfo.default_arguments;
-		for (uint32_t j = 0; j < pinfo.default_argument_count; j++) {
-			default_arguments.push_back(def_values[j]);
-		}
-	}
-
-	MethodInfo(const String &p_name) { name = p_name; }
-
-	template <typename... VarArgs>
-	MethodInfo(const String &p_name, VarArgs... p_params) {
-		name = p_name;
-		arguments = Vector<PropertyInfo>{ p_params... };
-	}
-
-	MethodInfo(Variant::Type ret) { return_val.type = ret; }
-	MethodInfo(Variant::Type ret, const String &p_name) {
-		return_val.type = ret;
-		name = p_name;
-	}
-
-	template <typename... VarArgs>
-	MethodInfo(Variant::Type ret, const String &p_name, VarArgs... p_params) {
-		name = p_name;
-		return_val.type = ret;
-		arguments = Vector<PropertyInfo>{ p_params... };
-	}
-
-	MethodInfo(const PropertyInfo &p_ret, const String &p_name) {
-		return_val = p_ret;
-		name = p_name;
-	}
-
-	template <typename... VarArgs>
-	MethodInfo(const PropertyInfo &p_ret, const String &p_name, VarArgs... p_params) {
-		return_val = p_ret;
-		name = p_name;
-		arguments = Vector<PropertyInfo>{ p_params... };
-	}
-};
diff --git a/engine/core/object/object.cpp b/engine/core/object/object.cpp
index 7438cb8e..c49962c7 100644
--- a/engine/core/object/object.cpp
+++ b/engine/core/object/object.cpp
@@ -30,7 +30,6 @@
 
 #include "object.h"
 
-#include "core/config/engine.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/io/resource.h"
 #include "core/object/class_db.h"
@@ -66,45 +65,163 @@ struct _ObjectDebugLock {
 
 #endif
 
-struct ObjectSignalLock {
-	Mutex *mutex1 = nullptr;
-	Mutex *mutex2 = nullptr;
-
-	ObjectSignalLock(const Object *p_obj1, const Object *p_obj2 = nullptr) {
-		mutex1 = p_obj1->signal_mutex;
-
-		if (p_obj2 != nullptr) {
-			mutex2 = p_obj2->signal_mutex;
-
-			if (mutex2 < mutex1) {
-				// We must always lock two locks in the same order.
-				SWAP(mutex1, mutex2);
-			} else if (unlikely(mutex2 == mutex1)) {
-				// No point locking the same lock twice.
-				mutex2 = nullptr;
-			}
-		}
-
-		if (mutex1) {
-			mutex1->lock();
-		}
-
-		if (mutex2) {
-			mutex2->lock();
+struct _ObjectSignalLock {
+	Mutex *mutex;
+	_ObjectSignalLock(const Object *const p_obj) {
+		mutex = p_obj->signal_mutex;
+		if (mutex) {
+			mutex->lock();
 		}
 	}
-
-	~ObjectSignalLock() {
-		if (mutex2) {
-			mutex2->unlock();
-		}
-
-		if (mutex1) {
-			mutex1->unlock();
+	~_ObjectSignalLock() {
+		if (mutex) {
+			mutex->unlock();
 		}
 	}
 };
 
+#define OBJ_SIGNAL_LOCK _ObjectSignalLock _signal_lock(this);
+
+PropertyInfo::operator Dictionary() const {
+	Dictionary d;
+	d["name"] = name;
+	d["class_name"] = class_name;
+	d["type"] = type;
+	d["hint"] = hint;
+	d["hint_string"] = hint_string;
+	d["usage"] = usage;
+	return d;
+}
+
+PropertyInfo PropertyInfo::from_dict(const Dictionary &p_dict) {
+	PropertyInfo pi;
+
+	if (p_dict.has("type")) {
+		pi.type = Variant::Type(int(p_dict["type"]));
+	}
+
+	if (p_dict.has("name")) {
+		pi.name = p_dict["name"];
+	}
+
+	if (p_dict.has("class_name")) {
+		pi.class_name = p_dict["class_name"];
+	}
+
+	if (p_dict.has("hint")) {
+		pi.hint = PropertyHint(int(p_dict["hint"]));
+	}
+
+	if (p_dict.has("hint_string")) {
+		pi.hint_string = p_dict["hint_string"];
+	}
+
+	if (p_dict.has("usage")) {
+		pi.usage = p_dict["usage"];
+	}
+
+	return pi;
+}
+
+TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list) {
+	TypedArray<Dictionary> va;
+	for (const List<PropertyInfo>::Element *E = p_list->front(); E; E = E->next()) {
+		va.push_back(Dictionary(E->get()));
+	}
+
+	return va;
+}
+
+TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector) {
+	TypedArray<Dictionary> va;
+	for (const PropertyInfo &E : p_vector) {
+		va.push_back(Dictionary(E));
+	}
+
+	return va;
+}
+
+MethodInfo::operator Dictionary() const {
+	Dictionary d;
+	d["name"] = name;
+	d["args"] = convert_property_list(arguments);
+	Array da;
+	for (int i = 0; i < default_arguments.size(); i++) {
+		da.push_back(default_arguments[i]);
+	}
+	d["default_args"] = da;
+	d["flags"] = flags;
+	d["id"] = id;
+	Dictionary r = return_val;
+	d["return"] = r;
+	return d;
+}
+
+MethodInfo MethodInfo::from_dict(const Dictionary &p_dict) {
+	MethodInfo mi;
+
+	if (p_dict.has("name")) {
+		mi.name = p_dict["name"];
+	}
+	Array args;
+	if (p_dict.has("args")) {
+		args = p_dict["args"];
+	}
+
+	for (const Variant &arg : args) {
+		Dictionary d = arg;
+		mi.arguments.push_back(PropertyInfo::from_dict(d));
+	}
+	Array defargs;
+	if (p_dict.has("default_args")) {
+		defargs = p_dict["default_args"];
+	}
+	for (const Variant &defarg : defargs) {
+		mi.default_arguments.push_back(defarg);
+	}
+
+	if (p_dict.has("return")) {
+		mi.return_val = PropertyInfo::from_dict(p_dict["return"]);
+	}
+
+	if (p_dict.has("flags")) {
+		mi.flags = p_dict["flags"];
+	}
+
+	return mi;
+}
+
+uint32_t MethodInfo::get_compatibility_hash() const {
+	bool has_return = (return_val.type != Variant::NIL) || (return_val.usage & PROPERTY_USAGE_NIL_IS_VARIANT);
+
+	uint32_t hash = hash_murmur3_one_32(has_return);
+	hash = hash_murmur3_one_32(arguments.size(), hash);
+
+	if (has_return) {
+		hash = hash_murmur3_one_32(return_val.type, hash);
+		if (return_val.class_name != StringName()) {
+			hash = hash_murmur3_one_32(return_val.class_name.hash(), hash);
+		}
+	}
+
+	for (const PropertyInfo &arg : arguments) {
+		hash = hash_murmur3_one_32(arg.type, hash);
+		if (arg.class_name != StringName()) {
+			hash = hash_murmur3_one_32(arg.class_name.hash(), hash);
+		}
+	}
+
+	hash = hash_murmur3_one_32(default_arguments.size(), hash);
+	for (const Variant &v : default_arguments) {
+		hash = hash_murmur3_one_32(v.hash(), hash);
+	}
+
+	hash = hash_murmur3_one_32(flags & METHOD_FLAG_CONST ? 1 : 0, hash);
+	hash = hash_murmur3_one_32(flags & METHOD_FLAG_VARARG ? 1 : 0, hash);
+
+	return hash_fmix32(hash);
+}
+
 Object::Connection::operator Variant() const {
 	Dictionary d;
 	d["signal"] = signal;
@@ -117,7 +234,6 @@ void ObjectGDExtension::create_gdtype() {
 	ERR_FAIL_COND(gdtype);
 
 	gdtype = memnew(GDType(ClassDB::get_gdtype(parent_class_name), class_name));
-	gdtype->initialize();
 }
 
 void ObjectGDExtension::destroy_gdtype() {
@@ -500,8 +616,9 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
 
 	_get_property_listv(p_list, p_reversed);
 
-	const uint32_t base_script_usage = is_class(Script::get_class_static()) ? PROPERTY_USAGE_NO_EDITOR : PROPERTY_USAGE_DEFAULT;
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static(), base_script_usage | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_NEVER_DUPLICATE));
+	if (!is_class("Script")) { // can still be set, but this is for user-friendliness
+		p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NEVER_DUPLICATE));
+	}
 
 	if (script_instance && !p_reversed) {
 		script_instance->get_property_list(p_list);
@@ -513,10 +630,10 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
 			pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
 			Object *obj = K.value;
 			if (Object::cast_to<Script>(obj)) {
-				pi.hint_string = Script::get_class_static();
+				pi.hint_string = "Script";
 				pi.usage |= PROPERTY_USAGE_NEVER_DUPLICATE;
 			} else {
-				pi.hint_string = Resource::get_class_static();
+				pi.hint_string = "Resource";
 			}
 		}
 		p_list->push_back(pi);
@@ -1093,7 +1210,7 @@ void Object::add_user_signal(const MethodInfo &p_signal) {
 	ERR_FAIL_COND_MSG(p_signal.name.is_empty(), "Signal name cannot be empty.");
 	ERR_FAIL_COND_MSG(ClassDB::has_signal(get_class_name(), p_signal.name), vformat("User signal's name conflicts with a built-in signal of '%s'.", get_class_name()));
 
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	ERR_FAIL_COND_MSG(signal_map.has(p_signal.name), vformat("Trying to add already existing signal '%s'.", p_signal.name));
 	SignalData s;
@@ -1102,7 +1219,7 @@ void Object::add_user_signal(const MethodInfo &p_signal) {
 }
 
 bool Object::_has_user_signal(const StringName &p_name) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	if (!signal_map.has(p_name)) {
 		return false;
@@ -1111,26 +1228,19 @@ bool Object::_has_user_signal(const StringName &p_name) const {
 }
 
 void Object::_remove_user_signal(const StringName &p_name) {
-	HashMap<Callable, Object::SignalData::Slot> slots_to_disconnect;
+	OBJ_SIGNAL_LOCK
 
-	{
-		ObjectSignalLock signal_lock(this);
-
-		SignalData *s = signal_map.getptr(p_name);
-		ERR_FAIL_NULL_MSG(s, "Provided signal does not exist.");
-		ERR_FAIL_COND_MSG(!s->removable, "Signal is not removable (not added with add_user_signal).");
-
-		slots_to_disconnect = std::move(s->slot_map);
-		signal_map.erase(p_name);
-	}
-
-	for (const KeyValue<Callable, SignalData::Slot> &slot_kv : slots_to_disconnect) {
+	SignalData *s = signal_map.getptr(p_name);
+	ERR_FAIL_NULL_MSG(s, "Provided signal does not exist.");
+	ERR_FAIL_COND_MSG(!s->removable, "Signal is not removable (not added with add_user_signal).");
+	for (const KeyValue<Callable, SignalData::Slot> &slot_kv : s->slot_map) {
 		Object *target = slot_kv.key.get_object();
 		if (likely(target)) {
-			ObjectSignalLock signal_lock(target);
 			target->connections.erase(slot_kv.value.cE);
 		}
 	}
+
+	signal_map.erase(p_name);
 }
 
 Error Object::_emit_signal(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
@@ -1176,7 +1286,7 @@ Error Object::emit_signalp(const StringName &p_name, const Variant **p_args, int
 	uint32_t slot_count = 0;
 
 	{
-		ObjectSignalLock signal_lock(this);
+		OBJ_SIGNAL_LOCK
 
 		SignalData *s = signal_map.getptr(p_name);
 		if (!s) {
@@ -1203,19 +1313,19 @@ Error Object::emit_signalp(const StringName &p_name, const Variant **p_args, int
 		}
 
 		DEV_ASSERT(slot_count == s->slot_map.size());
-	}
 
-	// Disconnect all one-shot connections before emitting to prevent recursion.
-	for (uint32_t i = 0; i < slot_count; ++i) {
-		bool disconnect = slot_flags[i] & CONNECT_ONE_SHOT;
+		// Disconnect all one-shot connections before emitting to prevent recursion.
+		for (uint32_t i = 0; i < slot_count; ++i) {
+			bool disconnect = slot_flags[i] & CONNECT_ONE_SHOT;
 #ifdef TOOLS_ENABLED
-		if (disconnect && (slot_flags[i] & CONNECT_PERSIST) && Engine::get_singleton()->is_editor_hint()) {
-			// This signal was connected from the editor, and is being edited. Just don't disconnect for now.
-			disconnect = false;
-		}
+			if (disconnect && (slot_flags[i] & CONNECT_PERSIST) && Engine::get_singleton()->is_editor_hint()) {
+				// This signal was connected from the editor, and is being edited. Just don't disconnect for now.
+				disconnect = false;
+			}
 #endif
-		if (disconnect) {
-			_disconnect(p_name, slot_callables[i]);
+			if (disconnect) {
+				_disconnect(p_name, slot_callables[i]);
+			}
 		}
 	}
 
@@ -1331,16 +1441,12 @@ void Object::_reset_gdtype() const {
 	}
 }
 
-void Object::autorelease_gdtype(GDType **r_type) {
-	ClassDB::gdtype_autorelease_pool.push_back(r_type);
-}
-
 void Object::_add_user_signal(const String &p_name, const Array &p_args) {
 	// this version of add_user_signal is meant to be used from scripts or external apis
 	// without access to ADD_SIGNAL in bind_methods
 	// added events are per instance, as opposed to the other ones, which are global
 
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	MethodInfo mi;
 	mi.name = p_name;
@@ -1394,8 +1500,6 @@ TypedArray<Dictionary> Object::_get_signal_connection_list(const StringName &p_s
 }
 
 TypedArray<Dictionary> Object::_get_incoming_connections() const {
-	ObjectSignalLock signal_lock(this);
-
 	TypedArray<Dictionary> ret;
 	for (const Object::Connection &connection : connections) {
 		ret.push_back(connection);
@@ -1421,7 +1525,7 @@ bool Object::has_signal(const StringName &p_name) const {
 }
 
 void Object::get_signal_list(List<MethodInfo> *p_signals) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	if (script_instance) {
 		script_instance->get_script()->get_script_signal_list(p_signals);
@@ -1439,7 +1543,7 @@ void Object::get_signal_list(List<MethodInfo> *p_signals) const {
 }
 
 void Object::get_all_signal_connections(List<Connection> *p_connections) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	for (const KeyValue<StringName, SignalData> &E : signal_map) {
 		const SignalData *s = &E.value;
@@ -1451,7 +1555,7 @@ void Object::get_all_signal_connections(List<Connection> *p_connections) const {
 }
 
 void Object::get_signal_connection_list(const StringName &p_signal, List<Connection> *p_connections) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	const SignalData *s = signal_map.getptr(p_signal);
 	if (!s) {
@@ -1464,7 +1568,7 @@ void Object::get_signal_connection_list(const StringName &p_signal, List<Connect
 }
 
 int Object::get_persistent_signal_connection_count() const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 	int count = 0;
 
 	for (const KeyValue<StringName, SignalData> &E : signal_map) {
@@ -1481,7 +1585,7 @@ int Object::get_persistent_signal_connection_count() const {
 }
 
 uint32_t Object::get_signal_connection_flags(const StringName &p_name, const Callable &p_callable) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 	const SignalData *signal_data = signal_map.getptr(p_name);
 	if (signal_data) {
 		const SignalData::Slot *slot = signal_data->slot_map.getptr(p_callable);
@@ -1493,7 +1597,7 @@ uint32_t Object::get_signal_connection_flags(const StringName &p_name, const Cal
 }
 
 void Object::get_signals_connected_to_this(List<Connection> *p_connections) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	for (const Connection &E : connections) {
 		p_connections->push_back(E);
@@ -1502,14 +1606,13 @@ void Object::get_signals_connected_to_this(List<Connection> *p_connections) cons
 
 Error Object::connect(const StringName &p_signal, const Callable &p_callable, uint32_t p_flags) {
 	ERR_FAIL_COND_V_MSG(p_callable.is_null(), ERR_INVALID_PARAMETER, vformat("Cannot connect to '%s': the provided callable is null.", p_signal));
-	Object *target_object = p_callable.get_object();
-	ObjectSignalLock signal_lock(this, target_object);
+	OBJ_SIGNAL_LOCK
 
 	if (p_callable.is_standard()) {
 		// FIXME: This branch should probably removed in favor of the `is_valid()` branch, but there exist some classes
 		// that call `connect()` before they are fully registered with ClassDB. Until all such classes can be found
 		// and registered soon enough this branch is needed to allow `connect()` to succeed.
-		ERR_FAIL_NULL_V_MSG(target_object, ERR_INVALID_PARAMETER, vformat("Cannot connect to '%s' to callable '%s': the callable object is null.", p_signal, p_callable));
+		ERR_FAIL_NULL_V_MSG(p_callable.get_object(), ERR_INVALID_PARAMETER, vformat("Cannot connect to '%s' to callable '%s': the callable object is null.", p_signal, p_callable));
 	} else {
 		ERR_FAIL_COND_V_MSG(!p_callable.is_valid(), ERR_INVALID_PARAMETER, vformat("Cannot connect to '%s': the provided callable is not valid: '%s'.", p_signal, p_callable));
 	}
@@ -1548,6 +1651,8 @@ Error Object::connect(const StringName &p_signal, const Callable &p_callable, ui
 		}
 	}
 
+	Object *target_object = p_callable.get_object();
+
 	SignalData::Slot slot;
 
 	Connection conn;
@@ -1570,7 +1675,7 @@ Error Object::connect(const StringName &p_signal, const Callable &p_callable, ui
 
 bool Object::is_connected(const StringName &p_signal, const Callable &p_callable) const {
 	ERR_FAIL_COND_V_MSG(p_callable.is_null(), false, vformat("Cannot determine if connected to '%s': the provided callable is null.", p_signal)); // Should use `is_null`, see note in `connect` about the use of `is_valid`.
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	const SignalData *s = signal_map.getptr(p_signal);
 	if (!s) {
@@ -1590,7 +1695,7 @@ bool Object::is_connected(const StringName &p_signal, const Callable &p_callable
 }
 
 bool Object::has_connections(const StringName &p_signal) const {
-	ObjectSignalLock signal_lock(this);
+	OBJ_SIGNAL_LOCK
 
 	const SignalData *s = signal_map.getptr(p_signal);
 	if (!s) {
@@ -1615,8 +1720,7 @@ void Object::disconnect(const StringName &p_signal, const Callable &p_callable)
 
 bool Object::_disconnect(const StringName &p_signal, const Callable &p_callable, bool p_force) {
 	ERR_FAIL_COND_V_MSG(p_callable.is_null(), false, vformat("Cannot disconnect from '%s': the provided callable is null.", p_signal)); // Should use `is_null`, see note in `connect` about the use of `is_valid`.
-	Object *target_object = p_callable.get_object();
-	ObjectSignalLock signal_lock(this, target_object);
+	OBJ_SIGNAL_LOCK
 
 	SignalData *s = signal_map.getptr(p_signal);
 	if (!s) {
@@ -1637,8 +1741,11 @@ bool Object::_disconnect(const StringName &p_signal, const Callable &p_callable,
 		}
 	}
 
-	if (likely(target_object)) {
-		target_object->connections.erase(slot->cE);
+	if (slot->cE) {
+		Object *target_object = p_callable.get_object();
+		if (target_object) {
+			target_object->connections.erase(slot->cE);
+		}
 	}
 
 	s->slot_map.erase(*p_callable.get_base_comparator());
@@ -1686,18 +1793,10 @@ Variant Object::_get_indexed_bind(const NodePath &p_name) const {
 
 void Object::initialize_class() {
 	static bool initialized = false;
-	if (likely(initialized)) {
-		return;
-	}
-
-	static BinaryMutex __init_mutex;
-	MutexLock lock(__init_mutex);
 	if (initialized) {
-		// Initialized on another thread while we were waiting.
 		return;
 	}
-	_add_class_to_classdb(get_gdtype_static_mutable(), nullptr);
-	get_gdtype_static_mutable().initialize();
+	_add_class_to_classdb(get_gdtype_static(), nullptr);
 	_bind_methods();
 	_bind_compatibility_methods();
 	initialized = true;
@@ -1773,7 +1872,7 @@ void Object::_clear_internal_resource_paths(const Variant &p_var) {
 	}
 }
 
-void Object::_add_class_to_classdb(GDType &p_type, const GDType *p_inherits) {
+void Object::_add_class_to_classdb(const GDType &p_type, const GDType *p_inherits) {
 	ClassDB::_add_class(p_type, p_inherits);
 }
 
@@ -1974,15 +2073,11 @@ void Object::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_PREDELETE);
 	BIND_CONSTANT(NOTIFICATION_EXTENSION_RELOADED);
 
-	BIND_BITFIELD_FLAG(CONNECT_DEFERRED);
-	BIND_BITFIELD_FLAG(CONNECT_PERSIST);
-	BIND_BITFIELD_FLAG(CONNECT_ONE_SHOT);
-	BIND_BITFIELD_FLAG(CONNECT_REFERENCE_COUNTED);
-	BIND_BITFIELD_FLAG(CONNECT_APPEND_SOURCE_OBJECT);
-}
-
-void Object::call_deferredp(const StringName &p_method, const Variant **p_args, int p_argcount, bool p_show_error) {
-	MessageQueue::get_singleton()->push_callp(this, p_method, p_args, p_argcount);
+	BIND_ENUM_CONSTANT(CONNECT_DEFERRED);
+	BIND_ENUM_CONSTANT(CONNECT_PERSIST);
+	BIND_ENUM_CONSTANT(CONNECT_ONE_SHOT);
+	BIND_ENUM_CONSTANT(CONNECT_REFERENCE_COUNTED);
+	BIND_ENUM_CONSTANT(CONNECT_APPEND_SOURCE_OBJECT);
 }
 
 void Object::set_deferred(const StringName &p_property, const Variant &p_value) {
@@ -2164,8 +2259,8 @@ void *Object::get_instance_binding(void *p_token, const GDExtensionInstanceBindi
 		}
 	}
 	if (unlikely(!binding && p_callbacks)) {
-		uint32_t current_size = Math::next_power_of_2(_instance_binding_count);
-		uint32_t new_size = Math::next_power_of_2(_instance_binding_count + 1);
+		uint32_t current_size = next_power_of_2(_instance_binding_count);
+		uint32_t new_size = next_power_of_2(_instance_binding_count + 1);
 
 		if (current_size == 0 || new_size > current_size) {
 			_instance_bindings = (InstanceBinding *)memrealloc(_instance_bindings, new_size * sizeof(InstanceBinding));
@@ -2308,36 +2403,56 @@ void Object::detach_from_objectdb() {
 	}
 }
 
+void Object::assign_type_static(GDType **type_ptr, const char *p_name, const GDType *super_type) {
+	static BinaryMutex _mutex;
+	MutexLock lock(_mutex);
+	GDType *type = *type_ptr;
+	if (type) {
+		// Assigned while we were waiting.
+		return;
+	}
+	type = memnew(GDType(super_type, StringName(p_name)));
+	*type_ptr = type;
+
+	ClassDB::gdtype_autorelease_pool.push_back(type_ptr);
+}
+
 Object::~Object() {
 	if (_emitting) {
 		//@todo this may need to actually reach the debugger prioritarily somehow because it may crash before
 		ERR_PRINT(vformat("Object '%s' was freed or unreferenced while a signal is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes.", to_string()));
 	}
 
-	// Drop all connections to the signals of this object.
-	while (signal_map.size()) {
-		// Avoid regular iteration so erasing is safe.
-		KeyValue<StringName, SignalData> &E = *signal_map.begin();
-		SignalData *s = &E.value;
+	{
+		OBJ_SIGNAL_LOCK
+		// Drop all connections to the signals of this object.
+		while (signal_map.size()) {
+			// Avoid regular iteration so erasing is safe.
+			KeyValue<StringName, SignalData> &E = *signal_map.begin();
+			SignalData *s = &E.value;
 
-		for (const KeyValue<Callable, SignalData::Slot> &slot_kv : s->slot_map) {
-			Object *target = slot_kv.value.conn.callable.get_object();
-			if (likely(target)) {
-				ObjectSignalLock signal_lock(this, target);
-				target->connections.erase(slot_kv.value.cE);
+			for (const KeyValue<Callable, SignalData::Slot> &slot_kv : s->slot_map) {
+				Object *target = slot_kv.value.conn.callable.get_object();
+				if (likely(target)) {
+					target->connections.erase(slot_kv.value.cE);
+				}
 			}
+
+			signal_map.erase(E.key);
 		}
 
-		signal_map.erase(E.key);
-	}
-
-	// Disconnect signals that connect to this object.
-	while (connections.size()) {
-		Connection c = connections.front()->get();
-		bool disconnected = c.signal.get_object()->_disconnect(c.signal.get_name(), c.callable, true);
-		if (unlikely(!disconnected)) {
-			// If the disconnect has failed, abandon the connection to avoid getting trapped in an infinite loop here.
-			connections.pop_front();
+		// Disconnect signals that connect to this object.
+		while (connections.size()) {
+			Connection c = connections.front()->get();
+			Object *obj = c.callable.get_object();
+			bool disconnected = false;
+			if (likely(obj)) {
+				disconnected = c.signal.get_object()->_disconnect(c.signal.get_name(), c.callable, true);
+			}
+			if (unlikely(!disconnected)) {
+				// If the disconnect has failed, abandon the connection to avoid getting trapped in an infinite loop here.
+				connections.pop_front();
+			}
 		}
 	}
 
@@ -2523,7 +2638,7 @@ void ObjectDB::cleanup() {
 	spin_lock.lock();
 
 	if (slot_count > 0) {
-		WARN_PRINT(vformat("%d ObjectDB %s leaked at exit (run with `--verbose` for details).", slot_count, slot_count == 1 ? "instance was" : "instances were"));
+		WARN_PRINT("ObjectDB instances leaked at exit (run with --verbose for details).");
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			// Ensure calling the native classes because if a leaked instance has a script
 			// that overrides any of those methods, it'd not be OK to call them at this point,
diff --git a/engine/core/object/object.h b/engine/core/object/object.h
index 0b88aa2f..0d270759 100644
--- a/engine/core/object/object.h
+++ b/engine/core/object/object.h
@@ -32,10 +32,8 @@
 
 #include "core/extension/gdextension_interface.gen.h"
 #include "core/object/gdtype.h"
-#include "core/object/method_info.h"
+#include "core/object/message_queue.h"
 #include "core/object/object_id.h"
-#include "core/object/property_info.h"
-#include "core/os/mutex.h"
 #include "core/os/spin_lock.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
@@ -43,7 +41,98 @@
 #include "core/templates/safe_refcount.h"
 #include "core/variant/variant.h"
 
-#define ADD_SIGNAL(m_signal) get_gdtype_static_mutable().add_signal(m_signal)
+template <typename T>
+class TypedArray;
+
+template <typename T>
+class Ref;
+
+enum PropertyHint {
+	PROPERTY_HINT_NONE, ///< no hint provided.
+	PROPERTY_HINT_RANGE, ///< hint_text = "min,max[,step][,or_greater][,or_less][,prefer_slider][,hide_control][,radians_as_degrees][,degrees][,exp][,suffix:<keyword>] range.
+	PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc"
+	PROPERTY_HINT_ENUM_SUGGESTION, ///< hint_text= "val1,val2,val3,etc"
+	PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) use "attenuation" hint string to revert (flip h), "positive_only" to exclude in-out and out-in. (ie: "attenuation,positive_only")
+	PROPERTY_HINT_LINK,
+	PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags)
+	PROPERTY_HINT_LAYERS_2D_RENDER,
+	PROPERTY_HINT_LAYERS_2D_PHYSICS,
+	PROPERTY_HINT_LAYERS_2D_NAVIGATION,
+	PROPERTY_HINT_LAYERS_3D_RENDER,
+	PROPERTY_HINT_LAYERS_3D_PHYSICS,
+	PROPERTY_HINT_LAYERS_3D_NAVIGATION,
+	PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
+	PROPERTY_HINT_DIR, ///< a directory path must be passed
+	PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
+	PROPERTY_HINT_GLOBAL_DIR, ///< a directory path must be passed
+	PROPERTY_HINT_RESOURCE_TYPE, ///< a comma-separated resource object type, e.g. "NoiseTexture,GradientTexture2D". Subclasses can be excluded with a "-" prefix if placed *after* the base class, e.g. "Texture2D,-MeshTexture".
+	PROPERTY_HINT_MULTILINE_TEXT, ///< used for string properties that can contain multiple lines
+	PROPERTY_HINT_EXPRESSION, ///< used for string properties that can contain multiple lines
+	PROPERTY_HINT_PLACEHOLDER_TEXT, ///< used to set a placeholder text for string properties
+	PROPERTY_HINT_COLOR_NO_ALPHA, ///< used for ignoring alpha component when editing a color
+	PROPERTY_HINT_OBJECT_ID,
+	PROPERTY_HINT_TYPE_STRING, ///< a type string, the hint is the base type to choose
+	PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE, // Deprecated.
+	PROPERTY_HINT_OBJECT_TOO_BIG, ///< object is too big to send
+	PROPERTY_HINT_NODE_PATH_VALID_TYPES,
+	PROPERTY_HINT_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
+	PROPERTY_HINT_GLOBAL_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
+	PROPERTY_HINT_INT_IS_OBJECTID, // Deprecated.
+	PROPERTY_HINT_INT_IS_POINTER,
+	PROPERTY_HINT_ARRAY_TYPE,
+	PROPERTY_HINT_LOCALE_ID,
+	PROPERTY_HINT_LOCALIZABLE_STRING,
+	PROPERTY_HINT_NODE_TYPE, ///< a node object type
+	PROPERTY_HINT_HIDE_QUATERNION_EDIT, /// Only Node3D::transform should hide the quaternion editor.
+	PROPERTY_HINT_PASSWORD,
+	PROPERTY_HINT_LAYERS_AVOIDANCE,
+	PROPERTY_HINT_DICTIONARY_TYPE,
+	PROPERTY_HINT_TOOL_BUTTON,
+	PROPERTY_HINT_ONESHOT, ///< the property will be changed by self after setting, such as AudioStreamPlayer.playing, Particles.emitting.
+	PROPERTY_HINT_NO_NODEPATH, /// < this property will not contain a NodePath, regardless of type (Array, Dictionary, List, etc.). Needed for SceneTreeDock.
+	PROPERTY_HINT_GROUP_ENABLE, ///< used to make the property's group checkable. Only use for boolean types.
+	PROPERTY_HINT_INPUT_NAME,
+	PROPERTY_HINT_FILE_PATH,
+	PROPERTY_HINT_MAX,
+};
+
+enum PropertyUsageFlags {
+	PROPERTY_USAGE_NONE = 0,
+	PROPERTY_USAGE_STORAGE = 1 << 1,
+	PROPERTY_USAGE_EDITOR = 1 << 2,
+	PROPERTY_USAGE_INTERNAL = 1 << 3,
+	PROPERTY_USAGE_CHECKABLE = 1 << 4, // Used for editing global variables.
+	PROPERTY_USAGE_CHECKED = 1 << 5, // Used for editing global variables.
+	PROPERTY_USAGE_GROUP = 1 << 6, // Used for grouping props in the editor.
+	PROPERTY_USAGE_CATEGORY = 1 << 7,
+	PROPERTY_USAGE_SUBGROUP = 1 << 8,
+	PROPERTY_USAGE_CLASS_IS_BITFIELD = 1 << 9,
+	PROPERTY_USAGE_NO_INSTANCE_STATE = 1 << 10,
+	PROPERTY_USAGE_RESTART_IF_CHANGED = 1 << 11,
+	PROPERTY_USAGE_SCRIPT_VARIABLE = 1 << 12,
+	PROPERTY_USAGE_STORE_IF_NULL = 1 << 13,
+	PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED = 1 << 14,
+	PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE = 1 << 15, // Deprecated.
+	PROPERTY_USAGE_CLASS_IS_ENUM = 1 << 16,
+	PROPERTY_USAGE_NIL_IS_VARIANT = 1 << 17,
+	PROPERTY_USAGE_ARRAY = 1 << 18, // Used in the inspector to group properties as elements of an array.
+	PROPERTY_USAGE_ALWAYS_DUPLICATE = 1 << 19, // When duplicating a resource, always duplicate, even with subresource duplication disabled.
+	PROPERTY_USAGE_NEVER_DUPLICATE = 1 << 20, // When duplicating a resource, never duplicate, even with subresource duplication enabled.
+	PROPERTY_USAGE_HIGH_END_GFX = 1 << 21,
+	PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT = 1 << 22,
+	PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT = 1 << 23,
+	PROPERTY_USAGE_KEYING_INCREMENTS = 1 << 24, // Used in inspector to increment property when keyed in animation player.
+	PROPERTY_USAGE_DEFERRED_SET_RESOURCE = 1 << 25, // Deprecated.
+	PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT = 1 << 26, // For Object properties, instantiate them when creating in editor.
+	PROPERTY_USAGE_EDITOR_BASIC_SETTING = 1 << 27, //for project or editor settings, show when basic settings are selected.
+	PROPERTY_USAGE_READ_ONLY = 1 << 28, // Mark a property as read-only in the inspector.
+	PROPERTY_USAGE_SECRET = 1 << 29, // Export preset credentials that should be stored separately from the rest of the export config.
+
+	PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR,
+	PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE,
+};
+
+#define ADD_SIGNAL(m_signal) ::ClassDB::add_signal(get_class_static(), m_signal)
 #define ADD_PROPERTY(m_property, m_setter, m_getter) ::ClassDB::add_property(get_class_static(), m_property, StringName(m_setter), StringName(m_getter))
 #define ADD_PROPERTYI(m_property, m_setter, m_getter, m_index) ::ClassDB::add_property(get_class_static(), m_property, StringName(m_setter), StringName(m_getter), m_index)
 #define ADD_PROPERTY_DEFAULT(m_property, m_default) ::ClassDB::set_property_default_value(get_class_static(), m_property, m_default)
@@ -67,6 +156,159 @@
 // PropertyInfo(Variant::ARRAY, "fallbacks", PROPERTY_HINT_ARRAY_TYPE, MAKE_RESOURCE_TYPE_HINT("Font")
 #define MAKE_RESOURCE_TYPE_HINT(m_type) vformat("%s/%s:%s", Variant::OBJECT, PROPERTY_HINT_RESOURCE_TYPE, m_type)
 
+struct PropertyInfo {
+	Variant::Type type = Variant::NIL;
+	String name;
+	StringName class_name; // For classes
+	PropertyHint hint = PROPERTY_HINT_NONE;
+	String hint_string;
+	uint32_t usage = PROPERTY_USAGE_DEFAULT;
+
+	// If you are thinking about adding another member to this class, ask the maintainer (Juan) first.
+
+	_FORCE_INLINE_ PropertyInfo added_usage(uint32_t p_fl) const {
+		PropertyInfo pi = *this;
+		pi.usage |= p_fl;
+		return pi;
+	}
+
+	operator Dictionary() const;
+
+	static PropertyInfo from_dict(const Dictionary &p_dict);
+
+	PropertyInfo() {}
+
+	PropertyInfo(const Variant::Type p_type, const String &p_name, const PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", const uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName()) :
+			type(p_type),
+			name(p_name),
+			hint(p_hint),
+			hint_string(p_hint_string),
+			usage(p_usage) {
+		if (hint == PROPERTY_HINT_RESOURCE_TYPE) {
+			class_name = hint_string;
+		} else {
+			class_name = p_class_name;
+		}
+	}
+
+	PropertyInfo(const StringName &p_class_name) :
+			type(Variant::OBJECT),
+			class_name(p_class_name) {}
+
+	explicit PropertyInfo(const GDExtensionPropertyInfo &pinfo) :
+			type((Variant::Type)pinfo.type),
+			name(*reinterpret_cast<StringName *>(pinfo.name)),
+			class_name(*reinterpret_cast<StringName *>(pinfo.class_name)),
+			hint((PropertyHint)pinfo.hint),
+			hint_string(*reinterpret_cast<String *>(pinfo.hint_string)),
+			usage(pinfo.usage) {}
+
+	bool operator==(const PropertyInfo &p_info) const {
+		return ((type == p_info.type) &&
+				(name == p_info.name) &&
+				(class_name == p_info.class_name) &&
+				(hint == p_info.hint) &&
+				(hint_string == p_info.hint_string) &&
+				(usage == p_info.usage));
+	}
+
+	bool operator<(const PropertyInfo &p_info) const {
+		return name < p_info.name;
+	}
+};
+
+TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list);
+TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector);
+
+enum MethodFlags {
+	METHOD_FLAG_NORMAL = 1,
+	METHOD_FLAG_EDITOR = 2,
+	METHOD_FLAG_CONST = 4,
+	METHOD_FLAG_VIRTUAL = 8,
+	METHOD_FLAG_VARARG = 16,
+	METHOD_FLAG_STATIC = 32,
+	METHOD_FLAG_OBJECT_CORE = 64,
+	METHOD_FLAG_VIRTUAL_REQUIRED = 128,
+	METHOD_FLAGS_DEFAULT = METHOD_FLAG_NORMAL,
+};
+
+struct MethodInfo {
+	String name;
+	PropertyInfo return_val;
+	uint32_t flags = METHOD_FLAGS_DEFAULT;
+	int id = 0;
+	Vector<PropertyInfo> arguments;
+	Vector<Variant> default_arguments;
+	int return_val_metadata = 0;
+	Vector<int> arguments_metadata;
+
+	int get_argument_meta(int p_arg) const {
+		ERR_FAIL_COND_V(p_arg < -1 || p_arg > arguments.size(), 0);
+		if (p_arg == -1) {
+			return return_val_metadata;
+		}
+		return arguments_metadata.size() > p_arg ? arguments_metadata[p_arg] : 0;
+	}
+
+	inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id && name == p_method.name; }
+	inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); }
+
+	operator Dictionary() const;
+
+	static MethodInfo from_dict(const Dictionary &p_dict);
+
+	uint32_t get_compatibility_hash() const;
+
+	MethodInfo() {}
+
+	explicit MethodInfo(const GDExtensionMethodInfo &pinfo) :
+			name(*reinterpret_cast<StringName *>(pinfo.name)),
+			return_val(PropertyInfo(pinfo.return_value)),
+			flags(pinfo.flags),
+			id(pinfo.id) {
+		for (uint32_t i = 0; i < pinfo.argument_count; i++) {
+			arguments.push_back(PropertyInfo(pinfo.arguments[i]));
+		}
+		const Variant *def_values = (const Variant *)pinfo.default_arguments;
+		for (uint32_t j = 0; j < pinfo.default_argument_count; j++) {
+			default_arguments.push_back(def_values[j]);
+		}
+	}
+
+	MethodInfo(const String &p_name) { name = p_name; }
+
+	template <typename... VarArgs>
+	MethodInfo(const String &p_name, VarArgs... p_params) {
+		name = p_name;
+		arguments = Vector<PropertyInfo>{ p_params... };
+	}
+
+	MethodInfo(Variant::Type ret) { return_val.type = ret; }
+	MethodInfo(Variant::Type ret, const String &p_name) {
+		return_val.type = ret;
+		name = p_name;
+	}
+
+	template <typename... VarArgs>
+	MethodInfo(Variant::Type ret, const String &p_name, VarArgs... p_params) {
+		name = p_name;
+		return_val.type = ret;
+		arguments = Vector<PropertyInfo>{ p_params... };
+	}
+
+	MethodInfo(const PropertyInfo &p_ret, const String &p_name) {
+		return_val = p_ret;
+		name = p_name;
+	}
+
+	template <typename... VarArgs>
+	MethodInfo(const PropertyInfo &p_ret, const String &p_name, VarArgs... p_params) {
+		return_val = p_ret;
+		name = p_name;
+		arguments = Vector<PropertyInfo>{ p_params... };
+	}
+};
+
 // API used to extend in GDExtension and other C compatible compiled languages.
 class MethodBind;
 class GDExtension;
@@ -130,7 +372,7 @@ struct ObjectGDExtension {
 
 	/// A type for this Object extension.
 	/// This is not exposed through the GDExtension API (yet) so it is inferred from above parameters.
-	GDType *gdtype;
+	const GDType *gdtype;
 	void create_gdtype();
 	void destroy_gdtype();
 
@@ -157,189 +399,168 @@ struct ObjectGDExtension {
 
 /// `GDSOFTCLASS` provides `Object` functionality, such as being able to use `Object::cast_to()`.
 /// Use this for `Object` subclasses that are not registered in `ClassDB` (use `GDCLASS` otherwise).
-#define GDSOFTCLASS(m_class, m_inherits) \
-public: \
-	using self_type = m_class; \
-	using super_type = m_inherits; \
-	static _FORCE_INLINE_ void *get_class_ptr_static() { \
-		static int ptr; \
-		return &ptr; \
-	} \
-	virtual bool is_class_ptr(void *p_ptr) const override { \
-		return (p_ptr == get_class_ptr_static()) || m_inherits::is_class_ptr(p_ptr); \
-	} \
-\
-protected: \
-	_FORCE_INLINE_ bool (Object::*_get_get() const)(const StringName &p_name, Variant &) const { \
-		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_get; \
-	} \
-	virtual bool _getv(const StringName &p_name, Variant &r_ret) const override { \
-		if (m_class::_get_get() != m_inherits::_get_get()) { \
-			if (_get(p_name, r_ret)) { \
-				return true; \
-			} \
-		} \
-		return m_inherits::_getv(p_name, r_ret); \
-	} \
-	_FORCE_INLINE_ bool (Object::*_get_set() const)(const StringName &p_name, const Variant &p_property) { \
-		return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set; \
-	} \
-	virtual bool _setv(const StringName &p_name, const Variant &p_property) override { \
-		if (m_inherits::_setv(p_name, p_property)) { \
-			return true; \
-		} \
-		if (m_class::_get_set() != m_inherits::_get_set()) { \
-			return _set(p_name, p_property); \
-		} \
-		return false; \
-	} \
-	_FORCE_INLINE_ void (Object::*_get_validate_property() const)(PropertyInfo & p_property) const { \
-		return (void (Object::*)(PropertyInfo &) const) & m_class::_validate_property; \
-	} \
-	virtual void _validate_propertyv(PropertyInfo &p_property) const override { \
-		m_inherits::_validate_propertyv(p_property); \
-		if (m_class::_get_validate_property() != m_inherits::_get_validate_property()) { \
-			_validate_property(p_property); \
-		} \
-	} \
-	_FORCE_INLINE_ bool (Object::*_get_property_can_revert() const)(const StringName &p_name) const { \
-		return (bool (Object::*)(const StringName &) const) & m_class::_property_can_revert; \
-	} \
-	virtual bool _property_can_revertv(const StringName &p_name) const override { \
-		if (m_class::_get_property_can_revert() != m_inherits::_get_property_can_revert()) { \
-			if (_property_can_revert(p_name)) { \
-				return true; \
-			} \
-		} \
-		return m_inherits::_property_can_revertv(p_name); \
-	} \
+#define GDSOFTCLASS(m_class, m_inherits)                                                                         \
+public:                                                                                                          \
+	using self_type = m_class;                                                                                   \
+	using super_type = m_inherits;                                                                               \
+	static _FORCE_INLINE_ void *get_class_ptr_static() {                                                         \
+		static int ptr;                                                                                          \
+		return &ptr;                                                                                             \
+	}                                                                                                            \
+	virtual bool is_class_ptr(void *p_ptr) const override {                                                      \
+		return (p_ptr == get_class_ptr_static()) || m_inherits::is_class_ptr(p_ptr);                             \
+	}                                                                                                            \
+                                                                                                                 \
+protected:                                                                                                       \
+	_FORCE_INLINE_ bool (Object::*_get_get() const)(const StringName &p_name, Variant &) const {                 \
+		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_get;                          \
+	}                                                                                                            \
+	virtual bool _getv(const StringName &p_name, Variant &r_ret) const override {                                \
+		if (m_class::_get_get() != m_inherits::_get_get()) {                                                     \
+			if (_get(p_name, r_ret)) {                                                                           \
+				return true;                                                                                     \
+			}                                                                                                    \
+		}                                                                                                        \
+		return m_inherits::_getv(p_name, r_ret);                                                                 \
+	}                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_set() const)(const StringName &p_name, const Variant &p_property) {       \
+		return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set;                          \
+	}                                                                                                            \
+	virtual bool _setv(const StringName &p_name, const Variant &p_property) override {                           \
+		if (m_inherits::_setv(p_name, p_property)) {                                                             \
+			return true;                                                                                         \
+		}                                                                                                        \
+		if (m_class::_get_set() != m_inherits::_get_set()) {                                                     \
+			return _set(p_name, p_property);                                                                     \
+		}                                                                                                        \
+		return false;                                                                                            \
+	}                                                                                                            \
+	_FORCE_INLINE_ void (Object::*_get_validate_property() const)(PropertyInfo & p_property) const {             \
+		return (void (Object::*)(PropertyInfo &) const) & m_class::_validate_property;                           \
+	}                                                                                                            \
+	virtual void _validate_propertyv(PropertyInfo &p_property) const override {                                  \
+		m_inherits::_validate_propertyv(p_property);                                                             \
+		if (m_class::_get_validate_property() != m_inherits::_get_validate_property()) {                         \
+			_validate_property(p_property);                                                                      \
+		}                                                                                                        \
+	}                                                                                                            \
+	_FORCE_INLINE_ bool (Object::*_get_property_can_revert() const)(const StringName &p_name) const {            \
+		return (bool (Object::*)(const StringName &) const) & m_class::_property_can_revert;                     \
+	}                                                                                                            \
+	virtual bool _property_can_revertv(const StringName &p_name) const override {                                \
+		if (m_class::_get_property_can_revert() != m_inherits::_get_property_can_revert()) {                     \
+			if (_property_can_revert(p_name)) {                                                                  \
+				return true;                                                                                     \
+			}                                                                                                    \
+		}                                                                                                        \
+		return m_inherits::_property_can_revertv(p_name);                                                        \
+	}                                                                                                            \
 	_FORCE_INLINE_ bool (Object::*_get_property_get_revert() const)(const StringName &p_name, Variant &) const { \
-		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_property_get_revert; \
-	} \
-	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_ret) const override { \
-		if (m_class::_get_property_get_revert() != m_inherits::_get_property_get_revert()) { \
-			if (_property_get_revert(p_name, r_ret)) { \
-				return true; \
-			} \
-		} \
-		return m_inherits::_property_get_revertv(p_name, r_ret); \
-	} \
-	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) { \
-		return (void (Object::*)(int)) & m_class::_notification; \
-	} \
-	virtual void _notification_forwardv(int p_notification) override { \
-		m_inherits::_notification_forwardv(p_notification); \
-		if (m_class::_get_notification() != m_inherits::_get_notification()) { \
-			_notification(p_notification); \
-		} \
-	} \
-	virtual void _notification_backwardv(int p_notification) override { \
-		if (m_class::_get_notification() != m_inherits::_get_notification()) { \
-			_notification(p_notification); \
-		} \
-		m_inherits::_notification_backwardv(p_notification); \
-	} \
-\
+		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_property_get_revert;          \
+	}                                                                                                            \
+	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_ret) const override {                \
+		if (m_class::_get_property_get_revert() != m_inherits::_get_property_get_revert()) {                     \
+			if (_property_get_revert(p_name, r_ret)) {                                                           \
+				return true;                                                                                     \
+			}                                                                                                    \
+		}                                                                                                        \
+		return m_inherits::_property_get_revertv(p_name, r_ret);                                                 \
+	}                                                                                                            \
+	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {                                              \
+		return (void (Object::*)(int)) & m_class::_notification;                                                 \
+	}                                                                                                            \
+	virtual void _notification_forwardv(int p_notification) override {                                           \
+		m_inherits::_notification_forwardv(p_notification);                                                      \
+		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                   \
+			_notification(p_notification);                                                                       \
+		}                                                                                                        \
+	}                                                                                                            \
+	virtual void _notification_backwardv(int p_notification) override {                                          \
+		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                   \
+			_notification(p_notification);                                                                       \
+		}                                                                                                        \
+		m_inherits::_notification_backwardv(p_notification);                                                     \
+	}                                                                                                            \
+                                                                                                                 \
 private:
 
 /// `GDSOFTCLASS` provides `Object` functionality, such as being able to use `Object::cast_to()`.
 /// Use this for `Object` subclasses that are registered in `ObjectDB` (use `GDSOFTCLASS` otherwise).
-#define GDCLASS(m_class, m_inherits) \
-	GDSOFTCLASS(m_class, m_inherits) \
-private: \
-	void operator=(const m_class &p_rval) {} \
-	friend class ::ClassDB; \
-\
-	static GDType &get_gdtype_static_mutable() { \
-		static GDType *gdtype = nullptr; \
-		static bool initialized = false; \
-		if (likely(initialized)) { \
-			return *gdtype; \
-		} \
-\
-		static BinaryMutex __init_mutex; \
-		MutexLock lock(__init_mutex); \
-		if (initialized) { \
-			return *gdtype; \
-		} \
-		gdtype = memnew(GDType(&super_type::get_gdtype_static(), StringName(#m_class))); \
-		m_class::autorelease_gdtype(&gdtype); \
-		initialized = true; \
-		return *gdtype; \
-	} \
-\
-public: \
-	virtual const GDType &_get_typev() const override { \
-		return get_gdtype_static(); \
-	} \
-	static const GDType &get_gdtype_static() { \
-		return get_gdtype_static_mutable(); \
-	} \
-	static const StringName &get_class_static() { \
-		return get_gdtype_static().get_name(); \
-	} \
-\
-protected: \
-	_FORCE_INLINE_ static void (*_get_bind_methods())() { \
-		return &m_class::_bind_methods; \
-	} \
-	_FORCE_INLINE_ static void (*_get_bind_compatibility_methods())() { \
-		return &m_class::_bind_compatibility_methods; \
-	} \
-\
-public: \
-	static void initialize_class() { \
-		static bool initialized = false; \
-		if (likely(initialized)) { \
-			return; \
-		} \
-\
-		static BinaryMutex __init_mutex; \
-		MutexLock lock(__init_mutex); \
-		if (initialized) { \
-			return; \
-		} \
-		m_inherits::initialize_class(); \
-		_add_class_to_classdb(get_gdtype_static_mutable(), &super_type::get_gdtype_static()); \
-		get_gdtype_static_mutable().initialize(); \
-		if (m_class::_get_bind_methods() != m_inherits::_get_bind_methods()) { \
-			_bind_methods(); \
-		} \
-		if (m_class::_get_bind_compatibility_methods() != m_inherits::_get_bind_compatibility_methods()) { \
-			_bind_compatibility_methods(); \
-		} \
-		initialized = true; \
-	} \
-\
-protected: \
-	virtual void _initialize_classv() override { \
-		initialize_class(); \
-	} \
-	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> * p_list) const { \
-		return (void (Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list; \
-	} \
-	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const override { \
-		if (!p_reversed) { \
-			m_inherits::_get_property_listv(p_list, p_reversed); \
-		} \
+#define GDCLASS(m_class, m_inherits)                                                                                                        \
+	GDSOFTCLASS(m_class, m_inherits)                                                                                                        \
+private:                                                                                                                                    \
+	void operator=(const m_class &p_rval) {}                                                                                                \
+	friend class ::ClassDB;                                                                                                                 \
+                                                                                                                                            \
+public:                                                                                                                                     \
+	virtual const GDType &_get_typev() const override {                                                                                     \
+		return get_gdtype_static();                                                                                                         \
+	}                                                                                                                                       \
+	static const GDType &get_gdtype_static() {                                                                                              \
+		static GDType *_class_static;                                                                                                       \
+		if (unlikely(!_class_static)) {                                                                                                     \
+			assign_type_static(&_class_static, #m_class, &super_type::get_gdtype_static());                                                 \
+		}                                                                                                                                   \
+		return *_class_static;                                                                                                              \
+	}                                                                                                                                       \
+	static const StringName &get_class_static() {                                                                                           \
+		return get_gdtype_static().get_name();                                                                                              \
+	}                                                                                                                                       \
+                                                                                                                                            \
+protected:                                                                                                                                  \
+	_FORCE_INLINE_ static void (*_get_bind_methods())() {                                                                                   \
+		return &m_class::_bind_methods;                                                                                                     \
+	}                                                                                                                                       \
+	_FORCE_INLINE_ static void (*_get_bind_compatibility_methods())() {                                                                     \
+		return &m_class::_bind_compatibility_methods;                                                                                       \
+	}                                                                                                                                       \
+                                                                                                                                            \
+public:                                                                                                                                     \
+	static void initialize_class() {                                                                                                        \
+		static bool initialized = false;                                                                                                    \
+		if (initialized) {                                                                                                                  \
+			return;                                                                                                                         \
+		}                                                                                                                                   \
+		m_inherits::initialize_class();                                                                                                     \
+		_add_class_to_classdb(get_gdtype_static(), &super_type::get_gdtype_static());                                                       \
+		if (m_class::_get_bind_methods() != m_inherits::_get_bind_methods()) {                                                              \
+			_bind_methods();                                                                                                                \
+		}                                                                                                                                   \
+		if (m_class::_get_bind_compatibility_methods() != m_inherits::_get_bind_compatibility_methods()) {                                  \
+			_bind_compatibility_methods();                                                                                                  \
+		}                                                                                                                                   \
+		initialized = true;                                                                                                                 \
+	}                                                                                                                                       \
+                                                                                                                                            \
+protected:                                                                                                                                  \
+	virtual void _initialize_classv() override {                                                                                            \
+		initialize_class();                                                                                                                 \
+	}                                                                                                                                       \
+	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> * p_list) const {                                      \
+		return (void (Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list;                                                \
+	}                                                                                                                                       \
+	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const override {                                          \
+		if (!p_reversed) {                                                                                                                  \
+			m_inherits::_get_property_listv(p_list, p_reversed);                                                                            \
+		}                                                                                                                                   \
 		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, get_class_static(), PROPERTY_USAGE_CATEGORY)); \
-		_get_property_list_from_classdb(#m_class, p_list, true, this); \
-		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) { \
-			_get_property_list(p_list); \
-		} \
-		if (p_reversed) { \
-			m_inherits::_get_property_listv(p_list, p_reversed); \
-		} \
-	} \
-\
+		_get_property_list_from_classdb(#m_class, p_list, true, this);                                                                      \
+		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                    \
+			_get_property_list(p_list);                                                                                                     \
+		}                                                                                                                                   \
+		if (p_reversed) {                                                                                                                   \
+			m_inherits::_get_property_listv(p_list, p_reversed);                                                                            \
+		}                                                                                                                                   \
+	}                                                                                                                                       \
+                                                                                                                                            \
 private:
 
-#define OBJ_SAVE_TYPE(m_class) \
-public: \
+#define OBJ_SAVE_TYPE(m_class)                       \
+public:                                              \
 	virtual String get_save_class() const override { \
-		return #m_class; \
-	} \
-\
+		return #m_class;                             \
+	}                                                \
+                                                     \
 private:
 
 class ClassDB;
@@ -400,7 +621,6 @@ private:
 #ifdef DEBUG_ENABLED
 	friend struct _ObjectDebugLock;
 #endif // DEBUG_ENABLED
-	friend struct ObjectSignalLock;
 	friend bool predelete_handler(Object *);
 	friend void postinitialize_handler(Object *);
 
@@ -418,6 +638,7 @@ private:
 		HashMap<Callable, Slot> slot_map;
 		bool removable = false;
 	};
+	friend struct _ObjectSignalLock;
 	mutable Mutex *signal_mutex = nullptr;
 	HashMap<StringName, SignalData> signal_map;
 	List<Connection> connections;
@@ -451,24 +672,6 @@ private:
 	mutable const GDType *_gdtype_ptr = nullptr;
 	void _reset_gdtype() const;
 
-	static GDType &get_gdtype_static_mutable() {
-		static GDType *gdtype = nullptr;
-		static bool initialized = false;
-		if (likely(initialized)) {
-			return *gdtype;
-		}
-
-		static BinaryMutex __init_mutex;
-		MutexLock lock(__init_mutex);
-		if (initialized) {
-			return *gdtype;
-		}
-		gdtype = memnew(GDType(nullptr, StringName("Object")));
-		autorelease_gdtype(&gdtype);
-		initialized = true;
-		return *gdtype;
-	}
-
 	void _add_user_signal(const String &p_name, const Array &p_args = Array());
 	bool _has_user_signal(const StringName &p_name) const;
 	void _remove_user_signal(const StringName &p_name);
@@ -516,7 +719,7 @@ protected:
 		return can_die;
 	}
 
-	// Used in gdvirtual.gen.h
+	// Used in gdvirtual.gen.inc
 	void _gdvirtual_init_method_ptr(uint32_t p_compat_hash, void *&r_fn_ptr, const StringName &p_fn_name, bool p_compat) const;
 
 	friend class GDExtensionMethodBind;
@@ -577,8 +780,6 @@ protected:
 	Variant _call_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 	Variant _call_deferred_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
-	static void autorelease_gdtype(GDType **r_type);
-
 	virtual const GDType &_get_typev() const { return get_gdtype_static(); }
 
 	TypedArray<StringName> _get_meta_list_bind() const;
@@ -590,7 +791,7 @@ protected:
 	friend class ::ClassDB;
 	friend class PlaceholderExtensionInstance;
 
-	static void _add_class_to_classdb(GDType &p_class, const GDType *p_inherits);
+	static void _add_class_to_classdb(const GDType &p_class, const GDType *p_inherits);
 	static void _get_property_list_from_classdb(const StringName &p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator);
 
 	bool _disconnect(const StringName &p_signal, const Callable &p_callable, bool p_force = false);
@@ -659,7 +860,15 @@ public:
 	};
 
 	/* TYPE API */
-	static const GDType &get_gdtype_static() { return get_gdtype_static_mutable(); }
+	static void assign_type_static(GDType **type_ptr, const char *p_name, const GDType *super_type);
+
+	static const GDType &get_gdtype_static() {
+		static GDType *_class_static;
+		if (unlikely(!_class_static)) {
+			assign_type_static(&_class_static, "Object", nullptr);
+		}
+		return *_class_static;
+	}
 
 	const GDType &get_gdtype() const;
 
@@ -782,15 +991,9 @@ public:
 	DEBUG_VIRTUAL bool is_connected(const StringName &p_signal, const Callable &p_callable) const;
 	DEBUG_VIRTUAL bool has_connections(const StringName &p_signal) const;
 
-	void call_deferredp(const StringName &p_method, const Variant **p_args, int p_argcount, bool p_show_error = false);
 	template <typename... VarArgs>
 	void call_deferred(const StringName &p_name, VarArgs... p_args) {
-		Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
-		const Variant *argptrs[sizeof...(p_args) + 1];
-		for (uint32_t i = 0; i < sizeof...(p_args); i++) {
-			argptrs[i] = &args[i];
-		}
-		return call_deferredp(p_name, sizeof...(p_args) == 0 ? nullptr : (const Variant **)argptrs, sizeof...(p_args));
+		MessageQueue::get_singleton()->push_call(this, p_name, p_args...);
 	}
 
 	void set_deferred(const StringName &p_property, const Variant &p_value);
@@ -1137,12 +1340,12 @@ public:
 	}
 };
 
-#define TMPL_EXTRACT_PARAM_OR_FAIL(m_name, m_param, m_retval, m_msg, m_editor) \
-	if (unlikely(m_param._is_null_dont_use())) { \
+#define TMPL_EXTRACT_PARAM_OR_FAIL(m_name, m_param, m_retval, m_msg, m_editor)                                                 \
+	if (unlikely(m_param._is_null_dont_use())) {                                                                               \
 		_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Required object \"" _STR(m_param) "\" is null.", m_msg, m_editor); \
-		return m_retval; \
-	} \
-	typename std::decay_t<decltype(m_param)>::extracted_type m_name = m_param._internal_ptr_dont_use(); \
+		return m_retval;                                                                                                       \
+	}                                                                                                                          \
+	typename std::decay_t<decltype(m_param)>::extracted_type m_name = m_param._internal_ptr_dont_use();                        \
 	static_assert(true)
 
 // These macros are equivalent to the ERR_FAIL_NULL*() family of macros, only for RequiredParam<T> instead of raw pointers.
diff --git a/engine/core/object/property_info.cpp b/engine/core/object/property_info.cpp
deleted file mode 100644
index b4909275..00000000
--- a/engine/core/object/property_info.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/**************************************************************************/
-/*  property_info.cpp                                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "property_info.h"
-
-#include "core/variant/dictionary.h"
-#include "core/variant/typed_array.h"
-
-PropertyInfo::operator Dictionary() const {
-	Dictionary d;
-	d["name"] = name;
-	d["class_name"] = class_name;
-	d["type"] = type;
-	d["hint"] = hint;
-	d["hint_string"] = hint_string;
-	d["usage"] = usage;
-	return d;
-}
-
-PropertyInfo PropertyInfo::from_dict(const Dictionary &p_dict) {
-	PropertyInfo pi;
-
-	if (p_dict.has("type")) {
-		pi.type = Variant::Type(int(p_dict["type"]));
-	}
-
-	if (p_dict.has("name")) {
-		pi.name = p_dict["name"];
-	}
-
-	if (p_dict.has("class_name")) {
-		pi.class_name = p_dict["class_name"];
-	}
-
-	if (p_dict.has("hint")) {
-		pi.hint = PropertyHint(int(p_dict["hint"]));
-	}
-
-	if (p_dict.has("hint_string")) {
-		pi.hint_string = p_dict["hint_string"];
-	}
-
-	if (p_dict.has("usage")) {
-		pi.usage = p_dict["usage"];
-	}
-
-	return pi;
-}
-
-TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list) {
-	TypedArray<Dictionary> va;
-	for (const List<PropertyInfo>::Element *E = p_list->front(); E; E = E->next()) {
-		va.push_back(Dictionary(E->get()));
-	}
-
-	return va;
-}
-
-TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector) {
-	TypedArray<Dictionary> va;
-	for (const PropertyInfo &E : p_vector) {
-		va.push_back(Dictionary(E));
-	}
-
-	return va;
-}
diff --git a/engine/core/object/property_info.h b/engine/core/object/property_info.h
deleted file mode 100644
index 19a44075..00000000
--- a/engine/core/object/property_info.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************/
-/*  property_info.h                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/extension/gdextension_interface.gen.h"
-#include "core/variant/variant.h"
-
-template <typename T>
-class TypedArray;
-
-enum PropertyHint {
-	PROPERTY_HINT_NONE, ///< no hint provided.
-	PROPERTY_HINT_RANGE, ///< hint_text = "min,max[,step][,or_greater][,or_less][,prefer_slider][,hide_control][,radians_as_degrees][,degrees][,exp][,suffix:<keyword>] range.
-	PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc"
-	PROPERTY_HINT_ENUM_SUGGESTION, ///< hint_text= "val1,val2,val3,etc"
-	PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease) use "attenuation" hint string to revert (flip h), "positive_only" to exclude in-out and out-in. (ie: "attenuation,positive_only")
-	PROPERTY_HINT_LINK,
-	PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags)
-	PROPERTY_HINT_LAYERS_2D_RENDER,
-	PROPERTY_HINT_LAYERS_2D_PHYSICS,
-	PROPERTY_HINT_LAYERS_2D_NAVIGATION,
-	PROPERTY_HINT_LAYERS_3D_RENDER,
-	PROPERTY_HINT_LAYERS_3D_PHYSICS,
-	PROPERTY_HINT_LAYERS_3D_NAVIGATION,
-	PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
-	PROPERTY_HINT_DIR, ///< a directory path must be passed
-	PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
-	PROPERTY_HINT_GLOBAL_DIR, ///< a directory path must be passed
-	PROPERTY_HINT_RESOURCE_TYPE, ///< a comma-separated resource object type, e.g. "NoiseTexture,GradientTexture2D". Subclasses can be excluded with a "-" prefix if placed *after* the base class, e.g. "Texture2D,-MeshTexture".
-	PROPERTY_HINT_MULTILINE_TEXT, ///< used for string properties that can contain multiple lines
-	PROPERTY_HINT_EXPRESSION, ///< used for string properties that can contain multiple lines
-	PROPERTY_HINT_PLACEHOLDER_TEXT, ///< used to set a placeholder text for string properties
-	PROPERTY_HINT_COLOR_NO_ALPHA, ///< used for ignoring alpha component when editing a color
-	PROPERTY_HINT_OBJECT_ID,
-	PROPERTY_HINT_TYPE_STRING, ///< a type string, the hint is the base type to choose
-	PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE, // Deprecated.
-	PROPERTY_HINT_OBJECT_TOO_BIG, ///< object is too big to send
-	PROPERTY_HINT_NODE_PATH_VALID_TYPES,
-	PROPERTY_HINT_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
-	PROPERTY_HINT_GLOBAL_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
-	PROPERTY_HINT_INT_IS_OBJECTID, // Deprecated.
-	PROPERTY_HINT_INT_IS_POINTER,
-	PROPERTY_HINT_ARRAY_TYPE,
-	PROPERTY_HINT_LOCALE_ID,
-	PROPERTY_HINT_LOCALIZABLE_STRING,
-	PROPERTY_HINT_NODE_TYPE, ///< a node object type
-	PROPERTY_HINT_HIDE_QUATERNION_EDIT, /// Only Node3D::transform should hide the quaternion editor.
-	PROPERTY_HINT_PASSWORD,
-	PROPERTY_HINT_LAYERS_AVOIDANCE,
-	PROPERTY_HINT_DICTIONARY_TYPE,
-	PROPERTY_HINT_TOOL_BUTTON,
-	PROPERTY_HINT_ONESHOT, ///< the property will be changed by self after setting, such as AudioStreamPlayer.playing, Particles.emitting.
-	PROPERTY_HINT_NO_NODEPATH, /// < this property will not contain a NodePath, regardless of type (Array, Dictionary, List, etc.). Needed for SceneTreeDock.
-	PROPERTY_HINT_GROUP_ENABLE, ///< used to make the property's group checkable. Only use for boolean types.
-	PROPERTY_HINT_INPUT_NAME,
-	PROPERTY_HINT_FILE_PATH,
-	PROPERTY_HINT_MAX,
-};
-
-enum PropertyUsageFlags {
-	PROPERTY_USAGE_NONE = 0,
-	PROPERTY_USAGE_STORAGE = 1 << 1,
-	PROPERTY_USAGE_EDITOR = 1 << 2,
-	PROPERTY_USAGE_INTERNAL = 1 << 3,
-	PROPERTY_USAGE_CHECKABLE = 1 << 4, // Used for editing global variables.
-	PROPERTY_USAGE_CHECKED = 1 << 5, // Used for editing global variables.
-	PROPERTY_USAGE_GROUP = 1 << 6, // Used for grouping props in the editor.
-	PROPERTY_USAGE_CATEGORY = 1 << 7,
-	PROPERTY_USAGE_SUBGROUP = 1 << 8,
-	PROPERTY_USAGE_CLASS_IS_BITFIELD = 1 << 9,
-	PROPERTY_USAGE_NO_INSTANCE_STATE = 1 << 10,
-	PROPERTY_USAGE_RESTART_IF_CHANGED = 1 << 11,
-	PROPERTY_USAGE_SCRIPT_VARIABLE = 1 << 12,
-	PROPERTY_USAGE_STORE_IF_NULL = 1 << 13,
-	PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED = 1 << 14,
-	PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE = 1 << 15, // Deprecated.
-	PROPERTY_USAGE_CLASS_IS_ENUM = 1 << 16,
-	PROPERTY_USAGE_NIL_IS_VARIANT = 1 << 17,
-	PROPERTY_USAGE_ARRAY = 1 << 18, // Used in the inspector to group properties as elements of an array.
-	PROPERTY_USAGE_ALWAYS_DUPLICATE = 1 << 19, // When duplicating a resource, always duplicate, even with subresource duplication disabled.
-	PROPERTY_USAGE_NEVER_DUPLICATE = 1 << 20, // When duplicating a resource, never duplicate, even with subresource duplication enabled.
-	PROPERTY_USAGE_HIGH_END_GFX = 1 << 21,
-	PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT = 1 << 22,
-	PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT = 1 << 23,
-	PROPERTY_USAGE_KEYING_INCREMENTS = 1 << 24, // Used in inspector to increment property when keyed in animation player.
-	PROPERTY_USAGE_DEFERRED_SET_RESOURCE = 1 << 25, // Deprecated.
-	PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT = 1 << 26, // For Object properties, instantiate them when creating in editor.
-	PROPERTY_USAGE_EDITOR_BASIC_SETTING = 1 << 27, //for project or editor settings, show when basic settings are selected.
-	PROPERTY_USAGE_READ_ONLY = 1 << 28, // Mark a property as read-only in the inspector.
-	PROPERTY_USAGE_SECRET = 1 << 29, // Export preset credentials that should be stored separately from the rest of the export config.
-
-	PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR,
-	PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE,
-};
-
-struct PropertyInfo {
-	Variant::Type type = Variant::NIL;
-	String name;
-	StringName class_name; // For classes
-	PropertyHint hint = PROPERTY_HINT_NONE;
-	String hint_string;
-	uint32_t usage = PROPERTY_USAGE_DEFAULT;
-
-	// If you are thinking about adding another member to this class, ask the maintainer (Juan) first.
-
-	_FORCE_INLINE_ PropertyInfo added_usage(uint32_t p_fl) const {
-		PropertyInfo pi = *this;
-		pi.usage |= p_fl;
-		return pi;
-	}
-
-	operator Dictionary() const;
-
-	static PropertyInfo from_dict(const Dictionary &p_dict);
-
-	PropertyInfo() {}
-
-	PropertyInfo(const Variant::Type p_type, const String &p_name, const PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", const uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = StringName()) :
-			type(p_type),
-			name(p_name),
-			hint(p_hint),
-			hint_string(p_hint_string),
-			usage(p_usage) {
-		if (hint == PROPERTY_HINT_RESOURCE_TYPE) {
-			class_name = hint_string;
-		} else {
-			class_name = p_class_name;
-		}
-	}
-
-	PropertyInfo(const StringName &p_class_name) :
-			type(Variant::OBJECT),
-			class_name(p_class_name) {}
-
-	explicit PropertyInfo(const GDExtensionPropertyInfo &pinfo) :
-			type((Variant::Type)pinfo.type),
-			name(*reinterpret_cast<StringName *>(pinfo.name)),
-			class_name(*reinterpret_cast<StringName *>(pinfo.class_name)),
-			hint((PropertyHint)pinfo.hint),
-			hint_string(*reinterpret_cast<String *>(pinfo.hint_string)),
-			usage(pinfo.usage) {}
-
-	bool operator==(const PropertyInfo &p_info) const {
-		return ((type == p_info.type) &&
-				(name == p_info.name) &&
-				(class_name == p_info.class_name) &&
-				(hint == p_info.hint) &&
-				(hint_string == p_info.hint_string) &&
-				(usage == p_info.usage));
-	}
-
-	bool operator<(const PropertyInfo &p_info) const {
-		return name < p_info.name;
-	}
-};
-
-TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list);
-TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector);
diff --git a/engine/core/object/ref_counted.cpp b/engine/core/object/ref_counted.cpp
index 5980adfb..3f1fb4ff 100644
--- a/engine/core/object/ref_counted.cpp
+++ b/engine/core/object/ref_counted.cpp
@@ -30,8 +30,7 @@
 
 #include "ref_counted.h"
 
-#include "core/object/class_db.h"
-#include "core/object/script_instance.h"
+#include "core/object/script_language.h"
 
 bool RefCounted::init_ref() {
 	if (reference()) {
diff --git a/engine/core/object/ref_counted.h b/engine/core/object/ref_counted.h
index 258306b1..ea2eb49f 100644
--- a/engine/core/object/ref_counted.h
+++ b/engine/core/object/ref_counted.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 #include "core/templates/safe_refcount.h"
 
 class RefCounted : public Object {
@@ -212,9 +212,7 @@ public:
 
 	template <typename... VarArgs>
 	void instantiate(VarArgs... p_params) {
-		Ref<T> ref = memnew(T(p_params...));
-		// Appropriate the new Ref, and if the previous one was set, free it.
-		SWAP(reference, ref.reference);
+		ref(memnew(T(p_params...)));
 	}
 
 	uint32_t hash() const { return HashMapHasherDefault::hash(reference); }
@@ -226,16 +224,6 @@ public:
 	}
 };
 
-template <typename T>
-struct memnew_result<T, std::enable_if_t<std::is_base_of_v<RefCounted, T>>> {
-	using class_name = Ref<T>;
-};
-
-template <typename T>
-void postinitialize_handler(Ref<T> &p_object) {
-	postinitialize_handler(p_object.ptr());
-}
-
 class WeakRef : public RefCounted {
 	GDCLASS(WeakRef, RefCounted);
 
@@ -250,6 +238,40 @@ public:
 	void set_ref(const Ref<RefCounted> &p_ref);
 };
 
+template <typename T>
+struct PtrToArg<Ref<T>> {
+	_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
+		if (p_ptr == nullptr) {
+			return Ref<T>();
+		}
+		// p_ptr points to a RefCounted object
+		return Ref<T>(*reinterpret_cast<T *const *>(p_ptr));
+	}
+
+	typedef Ref<T> EncodeT;
+
+	_FORCE_INLINE_ static void encode(Ref<T> p_val, const void *p_ptr) {
+		// p_ptr points to an EncodeT object which is a Ref<T> object.
+		*(const_cast<Ref<RefCounted> *>(reinterpret_cast<const Ref<RefCounted> *>(p_ptr))) = p_val;
+	}
+};
+
+template <typename T>
+struct GetTypeInfo<Ref<T>> {
+	static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
+	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
+
+	static inline PropertyInfo get_class_info() {
+		return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, T::get_class_static());
+	}
+};
+
+template <typename T>
+struct VariantInternalAccessor<Ref<T>> {
+	static _FORCE_INLINE_ Ref<T> get(const Variant *v) { return Ref<T>(*VariantInternal::get_object(v)); }
+	static _FORCE_INLINE_ void set(Variant *v, const Ref<T> &p_ref) { VariantInternal::object_assign(v, p_ref); }
+};
+
 // Zero-constructing Ref initializes reference to nullptr (and thus empty).
 template <typename T>
 struct is_zero_constructible<Ref<T>> : std::true_type {};
diff --git a/engine/core/object/script_backtrace.cpp b/engine/core/object/script_backtrace.cpp
index 82faffe9..b7ff9c38 100644
--- a/engine/core/object/script_backtrace.cpp
+++ b/engine/core/object/script_backtrace.cpp
@@ -30,7 +30,6 @@
 
 #include "script_backtrace.h"
 
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 void ScriptBacktrace::_store_variables(const List<String> &p_names, const List<Variant> &p_values, LocalVector<StackVariable> &r_variables) {
diff --git a/engine/core/object/script_instance.h b/engine/core/object/script_instance.h
index a3b64d8c..c3107b8d 100644
--- a/engine/core/object/script_instance.h
+++ b/engine/core/object/script_instance.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/variant/variant.h"
+#include "core/object/ref_counted.h"
 
 class Script;
 class ScriptLanguage;
diff --git a/engine/core/object/script_language.cpp b/engine/core/object/script_language.cpp
index 9f35e19b..8aea8a5f 100644
--- a/engine/core/object/script_language.cpp
+++ b/engine/core/object/script_language.cpp
@@ -30,13 +30,11 @@
 
 #include "script_language.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_bind.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/io/resource_loader.h"
 #include "core/templates/sort_array.h"
 
 ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
@@ -47,6 +45,7 @@ thread_local bool ScriptServer::thread_entered = false;
 
 bool ScriptServer::scripting_enabled = true;
 bool ScriptServer::reload_scripts_on_save = false;
+ScriptEditRequestFunction ScriptServer::edit_request_func = nullptr;
 
 // These need to be the last static variables in this file, since we're exploiting the reverse-order destruction of static variables.
 static bool is_program_exiting = false;
@@ -173,7 +172,6 @@ void Script::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_global_name"), &Script::get_global_name);
 
-	ClassDB::bind_method(D_METHOD("has_script_method", "method_name"), &Script::has_method);
 	ClassDB::bind_method(D_METHOD("has_script_signal", "signal_name"), &Script::has_script_signal);
 
 	ClassDB::bind_method(D_METHOD("get_script_property_list"), &Script::_get_script_property_list);
@@ -192,12 +190,27 @@ void Script::_bind_methods() {
 
 void Script::reload_from_file() {
 #ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint() && is_tool()) {
-		get_language()->reload_tool_script(this, true);
-	} else {
-		Array scripts = { this };
-		get_language()->reload_scripts(scripts, true);
+	// Replicates how the ScriptEditor reloads script resources, which generally handles it.
+	// However, when scripts are to be reloaded but aren't open in the internal editor, we go through here instead.
+	const Ref<Script> rel = ResourceLoader::load(ResourceLoader::path_remap(get_path()), get_class(), ResourceFormatLoader::CACHE_MODE_IGNORE);
+	if (rel.is_null()) {
+		return;
 	}
+
+	set_source_code(rel->get_source_code());
+	set_last_modified_time(rel->get_last_modified_time());
+
+	// Only reload the script when there are no compilation errors to prevent printing the error messages twice.
+	if (rel->is_valid()) {
+		if (Engine::get_singleton()->is_editor_hint() && is_tool()) {
+			get_language()->reload_tool_script(this, true);
+		} else {
+			// It's important to set p_keep_state to true in order to manage reloading scripts
+			// that are currently instantiated.
+			reload(true);
+		}
+	}
+
 #else
 	Resource::reload_from_file();
 #endif
diff --git a/engine/core/object/script_language.h b/engine/core/object/script_language.h
index 10d8716c..9b2612a3 100644
--- a/engine/core/object/script_language.h
+++ b/engine/core/object/script_language.h
@@ -35,6 +35,7 @@
 #include "core/object/script_backtrace.h"
 #include "core/object/script_instance.h"
 #include "core/templates/pair.h"
+#include "core/templates/safe_refcount.h"
 #include "core/variant/typed_array.h"
 
 class ScriptLanguage;
@@ -70,6 +71,8 @@ class ScriptServer {
 	static bool inheriters_cache_dirty;
 
 public:
+	static ScriptEditRequestFunction edit_request_func;
+
 	static void set_scripting_enabled(bool p_enabled);
 	static bool is_scripting_enabled();
 	_FORCE_INLINE_ static int get_language_count() { return _language_count; }
@@ -219,8 +222,7 @@ public:
 
 	/* EDITOR FUNCTIONS */
 	struct Warning {
-		int start_line = 0;
-		int end_line = 0;
+		int start_line = -1, end_line = -1;
 		int code;
 		String string_code;
 		String message;
@@ -271,6 +273,7 @@ public:
 	virtual bool is_using_templates() { return false; }
 	virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const = 0;
 	virtual String validate_path(const String &p_path) const { return ""; }
+	virtual Script *create_script() const = 0;
 	virtual bool supports_builtin_mode() const = 0;
 	virtual bool supports_documentation() const { return false; }
 	virtual bool can_inherit_from_file() const { return false; }
diff --git a/engine/core/object/script_language_extension.cpp b/engine/core/object/script_language_extension.cpp
index 8773b364..336f980d 100644
--- a/engine/core/object/script_language_extension.cpp
+++ b/engine/core/object/script_language_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "script_language_extension.h"
 
-#include "core/object/class_db.h"
-
 void ScriptExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_editor_can_reload_from_file);
 	GDVIRTUAL_BIND(_placeholder_erased, "placeholder");
@@ -106,8 +104,8 @@ void ScriptLanguageExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_validate, "script", "path", "validate_functions", "validate_errors", "validate_warnings", "validate_safe_lines");
 
 	GDVIRTUAL_BIND(_validate_path, "path");
-#ifndef DISABLE_DEPRECATED
 	GDVIRTUAL_BIND(_create_script);
+#ifndef DISABLE_DEPRECATED
 	GDVIRTUAL_BIND(_has_named_classes);
 #endif
 	GDVIRTUAL_BIND(_supports_builtin_mode);
diff --git a/engine/core/object/script_language_extension.h b/engine/core/object/script_language_extension.h
index 52142d8e..b74261e9 100644
--- a/engine/core/object/script_language_extension.h
+++ b/engine/core/object/script_language_extension.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
@@ -361,8 +361,13 @@ public:
 	}
 
 	EXBIND1RC(String, validate_path, const String &)
+	GDVIRTUAL0RC_REQUIRED(Object *, _create_script)
+	Script *create_script() const override {
+		Object *ret = nullptr;
+		GDVIRTUAL_CALL(_create_script, ret);
+		return Object::cast_to<Script>(ret);
+	}
 #ifndef DISABLE_DEPRECATED
-	GDVIRTUAL0RC(Object *, _create_script)
 	GDVIRTUAL0RC(bool, _has_named_classes)
 #endif
 	EXBIND0RC(bool, supports_builtin_mode)
diff --git a/engine/core/object/undo_redo.cpp b/engine/core/object/undo_redo.cpp
index 29963b47..1bde25f5 100644
--- a/engine/core/object/undo_redo.cpp
+++ b/engine/core/object/undo_redo.cpp
@@ -31,7 +31,6 @@
 #include "undo_redo.h"
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "core/variant/callable_bind.h"
diff --git a/engine/core/object/undo_redo.h b/engine/core/object/undo_redo.h
index 4359db4d..8ba10882 100644
--- a/engine/core/object/undo_redo.h
+++ b/engine/core/object/undo_redo.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class UndoRedo : public Object {
 	GDCLASS(UndoRedo, Object);
diff --git a/engine/core/object/worker_thread_pool.cpp b/engine/core/object/worker_thread_pool.cpp
index f5574c47..383e6c78 100644
--- a/engine/core/object/worker_thread_pool.cpp
+++ b/engine/core/object/worker_thread_pool.cpp
@@ -30,8 +30,6 @@
 
 #include "worker_thread_pool.h"
 
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "core/os/safe_binary_mutex.h"
diff --git a/engine/core/object/worker_thread_pool.h b/engine/core/object/worker_thread_pool.h
index 808be67a..293a5cdc 100644
--- a/engine/core/object/worker_thread_pool.h
+++ b/engine/core/object/worker_thread_pool.h
@@ -30,16 +30,16 @@
 
 #pragma once
 
-#include "core/object/object.h"
 #include "core/os/condition_variable.h"
 #include "core/os/memory.h"
+#include "core/os/os.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
+#include "core/templates/rid.h"
 #include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
-#include "core/variant/callable.h"
 
 class WorkerThreadPool : public Object {
 	GDCLASS(WorkerThreadPool, Object)
diff --git a/engine/core/os/condition_variable.h b/engine/core/os/condition_variable.h
index 9cd63811..4fbd55e8 100644
--- a/engine/core/os/condition_variable.h
+++ b/engine/core/os/condition_variable.h
@@ -37,7 +37,7 @@
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.condition_variable.h>
+#include "thirdparty/mingw-std-threads/mingw.condition_variable.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <condition_variable>
diff --git a/engine/core/os/keyboard.cpp b/engine/core/os/keyboard.cpp
index 87bb2967..c76744cd 100644
--- a/engine/core/os/keyboard.cpp
+++ b/engine/core/os/keyboard.cpp
@@ -31,7 +31,6 @@
 #include "keyboard.h"
 
 #include "core/os/os.h"
-#include "core/string/ustring.h"
 
 struct _KeyCodeText {
 	Key code;
diff --git a/engine/core/os/keyboard.h b/engine/core/os/keyboard.h
index 8c64522a..40f1c886 100644
--- a/engine/core/os/keyboard.h
+++ b/engine/core/os/keyboard.h
@@ -30,9 +30,7 @@
 
 #pragma once
 
-class String;
-
-#include <cstdint>
+#include "core/string/ustring.h"
 
 // Keep the values in this enum in sync with `_keycodes` in `keyboard.cpp`,
 // and the bindings in `core_constants.cpp`.
diff --git a/engine/core/os/main_loop.cpp b/engine/core/os/main_loop.cpp
index c4a3a848..9e3c82f4 100644
--- a/engine/core/os/main_loop.cpp
+++ b/engine/core/os/main_loop.cpp
@@ -30,8 +30,6 @@
 
 #include "main_loop.h"
 
-#include "core/object/class_db.h"
-
 void MainLoop::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
@@ -43,8 +41,6 @@ void MainLoop::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_APPLICATION_FOCUS_IN);
 	BIND_CONSTANT(NOTIFICATION_APPLICATION_FOCUS_OUT);
 	BIND_CONSTANT(NOTIFICATION_TEXT_SERVER_CHANGED);
-	BIND_CONSTANT(NOTIFICATION_APPLICATION_PIP_MODE_ENTERED);
-	BIND_CONSTANT(NOTIFICATION_APPLICATION_PIP_MODE_EXITED);
 
 	ADD_SIGNAL(MethodInfo("on_request_permissions_result", PropertyInfo(Variant::STRING, "permission"), PropertyInfo(Variant::BOOL, "granted")));
 
diff --git a/engine/core/os/main_loop.h b/engine/core/os/main_loop.h
index fdd0c2cf..f17865eb 100644
--- a/engine/core/os/main_loop.h
+++ b/engine/core/os/main_loop.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/object.h"
 
 class MainLoop : public Object {
@@ -57,8 +57,6 @@ public:
 		NOTIFICATION_APPLICATION_FOCUS_IN = 2016,
 		NOTIFICATION_APPLICATION_FOCUS_OUT = 2017,
 		NOTIFICATION_TEXT_SERVER_CHANGED = 2018,
-		NOTIFICATION_APPLICATION_PIP_MODE_ENTERED = 2019,
-		NOTIFICATION_APPLICATION_PIP_MODE_EXITED = 2020,
 	};
 
 	virtual void initialize();
diff --git a/engine/core/os/memory.cpp b/engine/core/os/memory.cpp
index 420ef22f..71d68058 100644
--- a/engine/core/os/memory.cpp
+++ b/engine/core/os/memory.cpp
@@ -33,10 +33,6 @@
 #include "core/profiling/profiling.h"
 #include "core/templates/safe_refcount.h"
 
-#ifdef DEV_ENABLED
-#include "core/math/math_funcs_binary.h"
-#endif
-
 #include <cstdlib>
 
 void *operator new(size_t p_size, const char *p_description) {
@@ -67,7 +63,7 @@ static SafeNumeric<uint64_t> _max_mem_usage;
 #endif
 
 void *Memory::alloc_aligned_static(size_t p_bytes, size_t p_alignment) {
-	DEV_ASSERT(Math::is_power_of_2(p_alignment));
+	DEV_ASSERT(is_power_of_2(p_alignment));
 
 	void *p1, *p2;
 	if ((p1 = (void *)malloc(p_bytes + p_alignment - 1 + sizeof(uint32_t))) == nullptr) {
diff --git a/engine/core/os/memory.h b/engine/core/os/memory.h
index 602f8aae..f7d9d5c1 100644
--- a/engine/core/os/memory.h
+++ b/engine/core/os/memory.h
@@ -126,21 +126,12 @@ void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_d
 #define memrealloc(m_mem, m_size) Memory::realloc_static(m_mem, m_size)
 #define memfree(m_mem) Memory::free_static(m_mem)
 
-template <typename T, typename Enable = void>
-struct memnew_result {
-	using class_name = T *;
-};
-
-template <typename T>
-using memnew_result_t = typename memnew_result<T>::class_name;
-
 _ALWAYS_INLINE_ void postinitialize_handler(void *) {}
 
 template <typename T>
-_ALWAYS_INLINE_ memnew_result_t<T> _post_initialize(T *p_obj) {
-	memnew_result_t<T> result{ p_obj };
-	postinitialize_handler(result);
-	return result;
+_ALWAYS_INLINE_ T *_post_initialize(T *p_obj) {
+	postinitialize_handler(p_obj);
+	return p_obj;
 }
 
 #define memnew(m_class) _post_initialize(::new ("") m_class)
@@ -177,10 +168,10 @@ void memdelete_allocator(T *p_class) {
 }
 
 #define memdelete_notnull(m_v) \
-	{ \
-		if (m_v) { \
-			memdelete(m_v); \
-		} \
+	{                          \
+		if (m_v) {             \
+			memdelete(m_v);    \
+		}                      \
 	}
 
 #define memnew_arr(m_class, m_count) memnew_arr_template<m_class>(m_count)
diff --git a/engine/core/os/midi_driver.h b/engine/core/os/midi_driver.h
index 77ecccc1..9ac37147 100644
--- a/engine/core/os/midi_driver.h
+++ b/engine/core/os/midi_driver.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/input/input_enums.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
 
diff --git a/engine/core/os/mutex.h b/engine/core/os/mutex.h
index 5c33cdfc..4b0d81e0 100644
--- a/engine/core/os/mutex.h
+++ b/engine/core/os/mutex.h
@@ -34,7 +34,7 @@
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.mutex.h>
+#include "thirdparty/mingw-std-threads/mingw.mutex.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <mutex>
@@ -69,7 +69,7 @@ public:
 };
 
 template <typename MutexT>
-class [[nodiscard]] MutexLock {
+class MutexLock {
 	mutable THREADING_NAMESPACE::unique_lock<typename MutexT::StdMutexType> lock;
 
 public:
@@ -114,7 +114,7 @@ public:
 };
 
 template <typename MutexT>
-class [[nodiscard]] MutexLock {
+class MutexLock {
 public:
 	MutexLock(const MutexT &p_mutex) {}
 
diff --git a/engine/core/os/os.cpp b/engine/core/os/os.cpp
index ffc0dff1..1d6561a7 100644
--- a/engine/core/os/os.cpp
+++ b/engine/core/os/os.cpp
@@ -38,11 +38,10 @@
 #include "core/version_generated.gen.h"
 
 #include <cstdarg>
-#include <cstdio>
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.thread.h>
+#include "thirdparty/mingw-std-threads/mingw.thread.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <thread>
@@ -363,10 +362,6 @@ String OS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
 	return ".";
 }
 
-String OS::expand_path(const String &p_path) const {
-	return p_path;
-}
-
 void OS::create_lock_file() {
 	if (Engine::get_singleton()->is_recovery_mode_hint()) {
 		return;
@@ -659,7 +654,7 @@ bool OS::is_restart_on_exit_set() const {
 }
 
 List<String> OS::get_restart_on_exit_arguments() const {
-	return List<String>(restart_commandline);
+	return restart_commandline;
 }
 
 PackedStringArray OS::get_connected_midi_inputs() {
diff --git a/engine/core/os/os.h b/engine/core/os/os.h
index fd7b0c89..5275a30c 100644
--- a/engine/core/os/os.h
+++ b/engine/core/os/os.h
@@ -33,7 +33,6 @@
 #include "core/config/engine.h"
 #include "core/io/logger.h"
 #include "core/io/remote_filesystem_client.h"
-#include "core/os/process_id.h"
 #include "core/os/time_enums.h"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
@@ -44,37 +43,6 @@
 class MainLoop;
 
 class OS {
-public:
-	typedef void (*ImeCallback)(void *p_inp, const String &p_text, Point2 p_selection);
-	typedef bool (*HasServerFeatureCallback)(const String &p_feature);
-
-	enum RenderThreadMode {
-		RENDER_THREAD_UNSAFE,
-		RENDER_THREAD_SAFE,
-		RENDER_SEPARATE_THREAD,
-	};
-
-	enum StdHandleType {
-		STD_HANDLE_INVALID,
-		STD_HANDLE_CONSOLE,
-		STD_HANDLE_FILE,
-		STD_HANDLE_PIPE,
-		STD_HANDLE_UNKNOWN,
-	};
-
-	enum RenderingSource {
-		RENDERING_SOURCE_DEFAULT,
-		RENDERING_SOURCE_PROJECT_SETTING,
-		RENDERING_SOURCE_COMMANDLINE,
-		RENDERING_SOURCE_FALLBACK
-	};
-
-	enum PlatformString {
-		PLATFORM_STRING_FILE_MANAGER_OPEN,
-		PLATFORM_STRING_FILE_MANAGER_SHOW,
-	};
-
-private:
 	static OS *singleton;
 	static uint64_t target_ticks;
 	String _execpath;
@@ -103,9 +71,7 @@ private:
 	List<String> restart_commandline;
 
 	String _current_rendering_driver_name;
-	RenderingSource _current_rendering_driver_name_source = RENDERING_SOURCE_DEFAULT;
 	String _current_rendering_method;
-	RenderingSource _current_rendering_method_source = RENDERING_SOURCE_DEFAULT;
 	bool _is_gles_over_gl = false;
 
 	RemoteFilesystemClient default_rfs;
@@ -119,6 +85,25 @@ private:
 protected:
 	void _set_logger(CompositeLogger *p_logger);
 
+public:
+	typedef void (*ImeCallback)(void *p_inp, const String &p_text, Point2 p_selection);
+	typedef bool (*HasServerFeatureCallback)(const String &p_feature);
+
+	enum RenderThreadMode {
+		RENDER_THREAD_UNSAFE,
+		RENDER_THREAD_SAFE,
+		RENDER_SEPARATE_THREAD,
+	};
+
+	enum StdHandleType {
+		STD_HANDLE_INVALID,
+		STD_HANDLE_CONSOLE,
+		STD_HANDLE_FILE,
+		STD_HANDLE_PIPE,
+		STD_HANDLE_UNKNOWN,
+	};
+
+protected:
 	friend class Main;
 	// Needed by tests to setup command-line args.
 	friend int test_main(int argc, char *argv[]);
@@ -143,24 +128,18 @@ protected:
 	virtual bool _check_internal_feature_support(const String &p_feature) = 0;
 
 public:
+	typedef int64_t ProcessID;
+
 	static OS *get_singleton();
 
 	static bool prefer_meta_over_ctrl();
 
-	void set_current_rendering_driver_name(const String &p_driver_name, RenderingSource p_source) {
-		_current_rendering_driver_name = p_driver_name;
-		_current_rendering_driver_name_source = p_source;
-	}
-	void set_current_rendering_method(const String &p_name, RenderingSource p_source) {
-		_current_rendering_method = p_name;
-		_current_rendering_method_source = p_source;
-	}
+	void set_current_rendering_driver_name(const String &p_driver_name) { _current_rendering_driver_name = p_driver_name; }
+	void set_current_rendering_method(const String &p_name) { _current_rendering_method = p_name; }
 	void set_gles_over_gl(bool p_enabled) { _is_gles_over_gl = p_enabled; }
 
 	String get_current_rendering_driver_name() const { return _current_rendering_driver_name; }
 	String get_current_rendering_method() const { return _current_rendering_method; }
-	RenderingSource get_current_rendering_driver_name_source() const { return _current_rendering_driver_name_source; }
-	RenderingSource get_current_rendering_method_source() const { return _current_rendering_method_source; }
 	bool get_gles_over_gl() const { return _is_gles_over_gl; }
 
 	virtual Vector<String> get_video_adapter_driver_info() const = 0;
@@ -239,8 +218,8 @@ public:
 	virtual String get_distribution_name() const = 0;
 	virtual String get_version() const = 0;
 	virtual String get_version_alias() const { return get_version(); }
-	virtual List<String> get_cmdline_args() const { return List<String>(_cmdline); }
-	virtual List<String> get_cmdline_user_args() const { return List<String>(_user_args); }
+	virtual List<String> get_cmdline_args() const { return _cmdline; }
+	virtual List<String> get_cmdline_user_args() const { return _user_args; }
 	virtual List<String> get_cmdline_platform_args() const { return List<String>(); }
 	virtual String get_model_name() const;
 
@@ -340,8 +319,6 @@ public:
 
 	virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const;
 
-	virtual String expand_path(const String &p_path) const;
-
 	virtual Error move_to_trash(const String &p_path) { return FAILED; }
 
 	void create_lock_file();
@@ -398,17 +375,6 @@ public:
 	// This is invoked by the GDExtensionManager after loading GDExtensions specified by the project.
 	virtual void load_platform_gdextensions() const {}
 
-	virtual String get_platform_string(PlatformString p_platform_string) const {
-		switch (p_platform_string) {
-			case PlatformString::PLATFORM_STRING_FILE_MANAGER_OPEN:
-				return ETR("Open in File Manager");
-			case PlatformString::PLATFORM_STRING_FILE_MANAGER_SHOW:
-				return ETR("Show in File Manager");
-			default:
-				ERR_FAIL_V_MSG("", vformat("Couldn't find a string for platform string: %d.", p_platform_string));
-		}
-	}
-
 #ifdef TOOLS_ENABLED
 	// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
 	virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const { return true; }
diff --git a/engine/core/os/process_id.h b/engine/core/os/process_id.h
deleted file mode 100644
index 9f2dc43c..00000000
--- a/engine/core/os/process_id.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************/
-/*  process_id.h                                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include <cstdint>
-
-typedef int64_t ProcessID;
diff --git a/engine/core/os/rw_lock.h b/engine/core/os/rw_lock.h
index cc24614a..521c1dea 100644
--- a/engine/core/os/rw_lock.h
+++ b/engine/core/os/rw_lock.h
@@ -34,7 +34,7 @@
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.shared_mutex.h>
+#include "thirdparty/mingw-std-threads/mingw.shared_mutex.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <shared_mutex>
@@ -42,7 +42,7 @@
 #endif
 
 class RWLock {
-	mutable THREADING_NAMESPACE::shared_mutex mutex;
+	mutable THREADING_NAMESPACE::shared_timed_mutex mutex;
 
 public:
 	// Lock the RWLock, block if locked by someone else.
diff --git a/engine/core/os/semaphore.h b/engine/core/os/semaphore.h
index 44499d88..aae5d427 100644
--- a/engine/core/os/semaphore.h
+++ b/engine/core/os/semaphore.h
@@ -40,8 +40,8 @@
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.condition_variable.h>
-#include <thirdparty/mingw-std-threads/mingw.mutex.h>
+#include "thirdparty/mingw-std-threads/mingw.condition_variable.h"
+#include "thirdparty/mingw-std-threads/mingw.mutex.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <condition_variable>
diff --git a/engine/core/os/spin_lock.h b/engine/core/os/spin_lock.h
index e8e7833f..7a505103 100644
--- a/engine/core/os/spin_lock.h
+++ b/engine/core/os/spin_lock.h
@@ -93,11 +93,7 @@ static_assert(std::atomic_bool::is_always_lock_free);
 
 class SpinLock {
 	union {
-#if __cplusplus >= 202002L
-		mutable std::atomic<bool> locked = false;
-#else
 		mutable std::atomic<bool> locked = ATOMIC_VAR_INIT(false);
-#endif
 		char aligner[Thread::CACHE_LINE_BYTES];
 	};
 
diff --git a/engine/core/os/thread.cpp b/engine/core/os/thread.cpp
index 860f2218..4b0390ce 100644
--- a/engine/core/os/thread.cpp
+++ b/engine/core/os/thread.cpp
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "platform_config.h" // IWYU pragma: keep. Can override the implementation.
+#include "platform_config.h"
 
 #ifndef PLATFORM_THREAD_OVERRIDE // See details in thread.h.
 
diff --git a/engine/core/os/thread.h b/engine/core/os/thread.h
index b4faf89c..4e4a27ec 100644
--- a/engine/core/os/thread.h
+++ b/engine/core/os/thread.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "platform_config.h" // IWYU pragma: keep. Can override the implementation.
+#include "platform_config.h"
 
 // Define PLATFORM_THREAD_OVERRIDE in your platform's `platform_config.h`
 // to use a custom Thread implementation defined in `platform/[your_platform]/platform_thread.h`.
@@ -52,7 +52,7 @@
 
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
-#include <thirdparty/mingw-std-threads/mingw.thread.h>
+#include "thirdparty/mingw-std-threads/mingw.thread.h"
 #define THREADING_NAMESPACE mingw_stdthread
 #else
 #include <thread>
diff --git a/engine/core/os/time.cpp b/engine/core/os/time.cpp
index 5c4b4cbf..e930d9ae 100644
--- a/engine/core/os/time.cpp
+++ b/engine/core/os/time.cpp
@@ -30,7 +30,6 @@
 
 #include "time.h" // NOLINT(modernize-deprecated-headers) False positive with C-Header of the same name.
 
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #define UNIX_EPOCH_YEAR_AD 1970 // 1970
@@ -80,125 +79,125 @@ static const uint8_t MONTH_DAYS_TABLE[2][12] = {
 	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 };
 
-#define UNIX_TIME_TO_HMS \
-	uint8_t hour, minute, second; \
-	{ \
-		/* The time of the day (in seconds since start of day). */ \
+#define UNIX_TIME_TO_HMS                                                     \
+	uint8_t hour, minute, second;                                            \
+	{                                                                        \
+		/* The time of the day (in seconds since start of day). */           \
 		uint32_t day_clock = Math::posmod(p_unix_time_val, SECONDS_PER_DAY); \
-		/* On x86 these 4 lines can be optimized to only 2 divisions. */ \
-		second = day_clock % 60; \
-		day_clock /= 60; \
-		minute = day_clock % 60; \
-		hour = day_clock / 60; \
+		/* On x86 these 4 lines can be optimized to only 2 divisions. */     \
+		second = day_clock % 60;                                             \
+		day_clock /= 60;                                                     \
+		minute = day_clock % 60;                                             \
+		hour = day_clock / 60;                                               \
 	}
 
-#define UNIX_TIME_TO_YMD \
-	int64_t year; \
-	Month month; \
-	uint8_t day; \
-	/* The day number since Unix epoch (0-index). Days before 1970 are negative. */ \
-	int64_t day_number = Math::floor(p_unix_time_val / (double)SECONDS_PER_DAY); \
-	{ \
-		int64_t day_number_copy = day_number; \
-		day_number_copy += year_to_days(UNIX_EPOCH_YEAR_AD); \
-		year = days_to_year(day_number_copy); \
-		day_number_copy -= year_to_days(year); \
-		uint8_t month_zero_index = 0; \
-		/* After the above, day_number now represents the day of the year (0-index). */ \
+#define UNIX_TIME_TO_YMD                                                                    \
+	int64_t year;                                                                           \
+	Month month;                                                                            \
+	uint8_t day;                                                                            \
+	/* The day number since Unix epoch (0-index). Days before 1970 are negative. */         \
+	int64_t day_number = Math::floor(p_unix_time_val / (double)SECONDS_PER_DAY);            \
+	{                                                                                       \
+		int64_t day_number_copy = day_number;                                               \
+		day_number_copy += year_to_days(UNIX_EPOCH_YEAR_AD);                                \
+		year = days_to_year(day_number_copy);                                               \
+		day_number_copy -= year_to_days(year);                                              \
+		uint8_t month_zero_index = 0;                                                       \
+		/* After the above, day_number now represents the day of the year (0-index). */     \
 		while (day_number_copy >= MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][month_zero_index]) { \
-			day_number_copy -= MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][month_zero_index]; \
-			month_zero_index++; \
-		} \
-		/* After the above, day_number now represents the day of the month (0-index). */ \
-		month = (Month)(month_zero_index + 1); \
-		day = day_number_copy + 1; \
+			day_number_copy -= MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][month_zero_index];      \
+			month_zero_index++;                                                             \
+		}                                                                                   \
+		/* After the above, day_number now represents the day of the month (0-index). */    \
+		month = (Month)(month_zero_index + 1);                                              \
+		day = day_number_copy + 1;                                                          \
 	}
 
-#define VALIDATE_YMDHMS(ret) \
+#define VALIDATE_YMDHMS(ret)                                                                                                                                              \
 	ERR_FAIL_COND_V_MSG(month == 0, ret, "Invalid month value of: " + itos(month) + ", months are 1-indexed and cannot be 0. See the Time.Month enum for valid values."); \
-	ERR_FAIL_COND_V_MSG(month < 0, ret, "Invalid month value of: " + itos(month) + "."); \
-	ERR_FAIL_COND_V_MSG(month > 12, ret, "Invalid month value of: " + itos(month) + ". See the Time.Month enum for valid values."); \
-	ERR_FAIL_COND_V_MSG(hour > 23, ret, "Invalid hour value of: " + itos(hour) + "."); \
-	ERR_FAIL_COND_V_MSG(hour < 0, ret, "Invalid hour value of: " + itos(hour) + "."); \
-	ERR_FAIL_COND_V_MSG(minute > 59, ret, "Invalid minute value of: " + itos(minute) + "."); \
-	ERR_FAIL_COND_V_MSG(minute < 0, ret, "Invalid minute value of: " + itos(minute) + "."); \
-	ERR_FAIL_COND_V_MSG(second > 59, ret, "Invalid second value of: " + itos(second) + " (leap seconds are not supported)."); \
-	ERR_FAIL_COND_V_MSG(second < 0, ret, "Invalid second value of: " + itos(second) + "."); \
-	ERR_FAIL_COND_V_MSG(day == 0, ret, "Invalid day value of: " + itos(day) + ", days are 1-indexed and cannot be 0."); \
-	ERR_FAIL_COND_V_MSG(day < 0, ret, "Invalid day value of: " + itos(day) + "."); \
-	/* Do this check after month is tested as valid. */ \
-	uint8_t days_in_this_month = MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][month - 1]; \
+	ERR_FAIL_COND_V_MSG(month < 0, ret, "Invalid month value of: " + itos(month) + ".");                                                                                  \
+	ERR_FAIL_COND_V_MSG(month > 12, ret, "Invalid month value of: " + itos(month) + ". See the Time.Month enum for valid values.");                                       \
+	ERR_FAIL_COND_V_MSG(hour > 23, ret, "Invalid hour value of: " + itos(hour) + ".");                                                                                    \
+	ERR_FAIL_COND_V_MSG(hour < 0, ret, "Invalid hour value of: " + itos(hour) + ".");                                                                                     \
+	ERR_FAIL_COND_V_MSG(minute > 59, ret, "Invalid minute value of: " + itos(minute) + ".");                                                                              \
+	ERR_FAIL_COND_V_MSG(minute < 0, ret, "Invalid minute value of: " + itos(minute) + ".");                                                                               \
+	ERR_FAIL_COND_V_MSG(second > 59, ret, "Invalid second value of: " + itos(second) + " (leap seconds are not supported).");                                             \
+	ERR_FAIL_COND_V_MSG(second < 0, ret, "Invalid second value of: " + itos(second) + ".");                                                                               \
+	ERR_FAIL_COND_V_MSG(day == 0, ret, "Invalid day value of: " + itos(day) + ", days are 1-indexed and cannot be 0.");                                                   \
+	ERR_FAIL_COND_V_MSG(day < 0, ret, "Invalid day value of: " + itos(day) + ".");                                                                                        \
+	/* Do this check after month is tested as valid. */                                                                                                                   \
+	uint8_t days_in_this_month = MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][month - 1];                                                                                         \
 	ERR_FAIL_COND_V_MSG(day > days_in_this_month, ret, "Invalid day value of: " + itos(day) + " which is larger than the maximum for this month, " + itos(days_in_this_month) + ".");
 
-#define YMD_TO_DAY_NUMBER \
+#define YMD_TO_DAY_NUMBER                                                           \
 	/* The day number since Unix epoch (0-index). Days before 1970 are negative. */ \
-	int64_t day_number = day - 1; \
-	/* Add the days in the months to day_number. */ \
-	for (int i = 0; i < month - 1; i++) { \
-		day_number += MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][i]; \
-	} \
-	/* Add the days in the years to day_number. */ \
-	day_number += year_to_days(year); \
+	int64_t day_number = day - 1;                                                   \
+	/* Add the days in the months to day_number. */                                 \
+	for (int i = 0; i < month - 1; i++) {                                           \
+		day_number += MONTH_DAYS_TABLE[IS_LEAP_YEAR(year)][i];                      \
+	}                                                                               \
+	/* Add the days in the years to day_number. */                                  \
+	day_number += year_to_days(year);                                               \
 	day_number -= year_to_days(UNIX_EPOCH_YEAR_AD);
 
-#define PARSE_ISO8601_STRING(ret) \
-	int64_t year = UNIX_EPOCH_YEAR_AD; \
-	Month month = MONTH_JANUARY; \
-	int day = 1; \
-	int hour = 0; \
-	int minute = 0; \
-	int second = 0; \
-	{ \
-		bool has_date = false, has_time = false; \
-		String date, time; \
-		if (p_datetime.find_char('T') > 0) { \
-			has_date = has_time = true; \
-			PackedStringArray array = p_datetime.split("T"); \
+#define PARSE_ISO8601_STRING(ret)                                                             \
+	int64_t year = UNIX_EPOCH_YEAR_AD;                                                        \
+	Month month = MONTH_JANUARY;                                                              \
+	int day = 1;                                                                              \
+	int hour = 0;                                                                             \
+	int minute = 0;                                                                           \
+	int second = 0;                                                                           \
+	{                                                                                         \
+		bool has_date = false, has_time = false;                                              \
+		String date, time;                                                                    \
+		if (p_datetime.find_char('T') > 0) {                                                  \
+			has_date = has_time = true;                                                       \
+			PackedStringArray array = p_datetime.split("T");                                  \
 			ERR_FAIL_COND_V_MSG(array.size() < 2, ret, "Invalid ISO 8601 date/time string."); \
-			date = array[0]; \
-			time = array[1]; \
-		} else if (p_datetime.find_char(' ') > 0) { \
-			has_date = has_time = true; \
-			PackedStringArray array = p_datetime.split(" "); \
+			date = array[0];                                                                  \
+			time = array[1];                                                                  \
+		} else if (p_datetime.find_char(' ') > 0) {                                           \
+			has_date = has_time = true;                                                       \
+			PackedStringArray array = p_datetime.split(" ");                                  \
 			ERR_FAIL_COND_V_MSG(array.size() < 2, ret, "Invalid ISO 8601 date/time string."); \
-			date = array[0]; \
-			time = array[1]; \
-		} else if (p_datetime.find_char('-', 1) > 0) { \
-			has_date = true; \
-			date = p_datetime; \
-		} else if (p_datetime.find_char(':') > 0) { \
-			has_time = true; \
-			time = p_datetime; \
-		} \
-		/* Set the variables from the contents of the string. */ \
-		if (has_date) { \
-			PackedInt32Array array = date.split_ints("-", false); \
-			ERR_FAIL_COND_V_MSG(array.size() < 3, ret, "Invalid ISO 8601 date string."); \
-			year = array[0]; \
-			month = (Month)array[1]; \
-			day = array[2]; \
-			/* Handle negative years. */ \
-			if (p_datetime.find_char('-') == 0) { \
-				year *= -1; \
-			} \
-		} \
-		if (has_time) { \
-			PackedInt32Array array = time.split_ints(":", false); \
-			ERR_FAIL_COND_V_MSG(array.size() < 3, ret, "Invalid ISO 8601 time string."); \
-			hour = array[0]; \
-			minute = array[1]; \
-			second = array[2]; \
-		} \
+			date = array[0];                                                                  \
+			time = array[1];                                                                  \
+		} else if (p_datetime.find_char('-', 1) > 0) {                                        \
+			has_date = true;                                                                  \
+			date = p_datetime;                                                                \
+		} else if (p_datetime.find_char(':') > 0) {                                           \
+			has_time = true;                                                                  \
+			time = p_datetime;                                                                \
+		}                                                                                     \
+		/* Set the variables from the contents of the string. */                              \
+		if (has_date) {                                                                       \
+			PackedInt32Array array = date.split_ints("-", false);                             \
+			ERR_FAIL_COND_V_MSG(array.size() < 3, ret, "Invalid ISO 8601 date string.");      \
+			year = array[0];                                                                  \
+			month = (Month)array[1];                                                          \
+			day = array[2];                                                                   \
+			/* Handle negative years. */                                                      \
+			if (p_datetime.find_char('-') == 0) {                                             \
+				year *= -1;                                                                   \
+			}                                                                                 \
+		}                                                                                     \
+		if (has_time) {                                                                       \
+			PackedInt32Array array = time.split_ints(":", false);                             \
+			ERR_FAIL_COND_V_MSG(array.size() < 3, ret, "Invalid ISO 8601 time string.");      \
+			hour = array[0];                                                                  \
+			minute = array[1];                                                                \
+			second = array[2];                                                                \
+		}                                                                                     \
 	}
 
-#define EXTRACT_FROM_DICTIONARY \
-	/* Get all time values from the dictionary. If it doesn't exist, set the */ \
-	/* values to the default values for Unix epoch (1970-01-01 00:00:00). */ \
+#define EXTRACT_FROM_DICTIONARY                                                                   \
+	/* Get all time values from the dictionary. If it doesn't exist, set the */                   \
+	/* values to the default values for Unix epoch (1970-01-01 00:00:00). */                      \
 	int64_t year = p_datetime.has(YEAR_KEY) ? int64_t(p_datetime[YEAR_KEY]) : UNIX_EPOCH_YEAR_AD; \
-	Month month = Month((p_datetime.has(MONTH_KEY)) ? int(p_datetime[MONTH_KEY]) : 1); \
-	int day = p_datetime.has(DAY_KEY) ? int(p_datetime[DAY_KEY]) : 1; \
-	int hour = p_datetime.has(HOUR_KEY) ? int(p_datetime[HOUR_KEY]) : 0; \
-	int minute = p_datetime.has(MINUTE_KEY) ? int(p_datetime[MINUTE_KEY]) : 0; \
+	Month month = Month((p_datetime.has(MONTH_KEY)) ? int(p_datetime[MONTH_KEY]) : 1);            \
+	int day = p_datetime.has(DAY_KEY) ? int(p_datetime[DAY_KEY]) : 1;                             \
+	int hour = p_datetime.has(HOUR_KEY) ? int(p_datetime[HOUR_KEY]) : 0;                          \
+	int minute = p_datetime.has(MINUTE_KEY) ? int(p_datetime[MINUTE_KEY]) : 0;                    \
 	int second = p_datetime.has(SECOND_KEY) ? int(p_datetime[SECOND_KEY]) : 0;
 
 Time *Time::singleton = nullptr;
diff --git a/engine/core/os/time.h b/engine/core/os/time.h
index 1d2708db..3d1958dc 100644
--- a/engine/core/os/time.h
+++ b/engine/core/os/time.h
@@ -30,9 +30,8 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/os/time_enums.h"
-#include "core/variant/type_info.h"
+#include "core/object/class_db.h"
+#include "time_enums.h"
 
 // This Time class conforms with as many of the ISO 8601 standards as possible.
 // * As per ISO 8601:2004 4.3.2.1, all dates follow the Proleptic Gregorian
diff --git a/engine/core/profiling/SCsub b/engine/core/profiling/SCsub
index ac81fd67..bc2b114c 100644
--- a/engine/core/profiling/SCsub
+++ b/engine/core/profiling/SCsub
@@ -50,8 +50,6 @@ if env["profiler"]:
             print("profiler_sample_callstack ignored. Please configure callstack sampling in Instruments instead.")
         if env["profiler_track_memory"]:
             print("profiler_track_memory ignored. Please configure memory tracking in Instruments instead.")
-        if env["profiler_record_on_demand"]:
-            print("profiler_record_on_demand ignored. Instruments is always recording.")
     elif env["profiler"] == "tracy":
         if not env["profiler_path"]:
             print("profiler_path must be set when using the tracy profiler. Aborting.")
@@ -71,8 +69,6 @@ if env["profiler"]:
             env_tracy.Append(CPPDEFINES=[("TRACY_CALLSTACK", 62)])
         if env["profiler_track_memory"]:
             env_tracy.Append(CPPDEFINES=["GODOT_PROFILER_TRACK_MEMORY"])
-        if env["profiler_record_on_demand"]:
-            env_tracy.Append(CPPDEFINES=["TRACY_ON_DEMAND"])
         env_tracy.disable_warnings()
         env_tracy.add_source_files(env.core_sources, str((profiler_path / "TracyClient.cpp").absolute()))
     elif env["profiler"] == "perfetto":
@@ -89,8 +85,6 @@ if env["profiler"]:
         if env["profiler_track_memory"]:
             print("Perfetto does not support memory tracking. Aborting.")
             Exit(255)
-        if env["profiler_record_on_demand"]:
-            print("profiler_record_on_demand ignored. Perfetto is always recording.")
         env_perfetto.disable_warnings()
         env_perfetto.Prepend(CPPPATH=[str(profiler_path.absolute())])
         env_perfetto.add_source_files(env.core_sources, str((profiler_path / "perfetto.cc").absolute()))
@@ -100,11 +94,6 @@ elif env["profiler_path"]:
 
 env.CommandNoCache(
     "profiling.gen.h",
-    [
-        env.Value(env["profiler"]),
-        env.Value(env["profiler_sample_callstack"]),
-        env.Value(env["profiler_track_memory"]),
-        env.Value(env["profiler_record_on_demand"]),
-    ],
+    [env.Value(env["profiler"]), env.Value(env["profiler_sample_callstack"]), env.Value(env["profiler_track_memory"])],
     env.Run(profiling_builders.profiler_gen_builder),
 )
diff --git a/engine/core/profiling/profiling.h b/engine/core/profiling/profiling.h
index 00b4022c..a18d0c28 100644
--- a/engine/core/profiling/profiling.h
+++ b/engine/core/profiling/profiling.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "profiling.gen.h" // IWYU pragma: keep.
+#include "profiling.gen.h"
 
 // This header provides profiling primitives (implemented as macros) for various backends.
 // See the "No profiling" branch at the bottom for a short description of the functions.
@@ -62,13 +62,13 @@ const SourceLocationData *intern_source_location(const void *p_function_ptr, con
 #define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name) ZoneNamedN(__godot_tracy_zone_##m_group_name, m_zone_name, true)
 #define GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name) __godot_tracy_zone_##m_group_name.~ScopedZone();
 #ifndef TRACY_CALLSTACK
-#define GodotProfileZoneGrouped(m_group_name, m_zone_name) \
-	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name); \
+#define GodotProfileZoneGrouped(m_group_name, m_zone_name)                                                                                                       \
+	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name);                                                                                                  \
 	static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location, TracyLine){ m_zone_name, TracyFunction, TracyFile, (uint32_t)TracyLine, 0 }; \
 	new (&__godot_tracy_zone_##m_group_name) tracy::ScopedZone(&TracyConcat(__tracy_source_location, TracyLine), true)
 #else
-#define GodotProfileZoneGrouped(m_group_name, m_zone_name) \
-	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name); \
+#define GodotProfileZoneGrouped(m_group_name, m_zone_name)                                                                                                       \
+	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name);                                                                                                  \
 	static constexpr tracy::SourceLocationData TracyConcat(__tracy_source_location, TracyLine){ m_zone_name, TracyFunction, TracyFile, (uint32_t)TracyLine, 0 }; \
 	new (&__godot_tracy_zone_##m_group_name) tracy::ScopedZone(&TracyConcat(__tracy_source_location, TracyLine), TRACY_CALLSTACK, true)
 #endif
@@ -80,9 +80,9 @@ const SourceLocationData *intern_source_location(const void *p_function_ptr, con
 
 // Memory allocation
 #ifdef GODOT_PROFILER_TRACK_MEMORY
-#define GodotProfileAlloc(m_ptr, m_size) \
+#define GodotProfileAlloc(m_ptr, m_size)                       \
 	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wmaybe-uninitialized") \
-	TracyAlloc(m_ptr, m_size); \
+	TracyAlloc(m_ptr, m_size);                                 \
 	GODOT_GCC_WARNING_POP
 #define GodotProfileFree(m_ptr) TracyFree(m_ptr)
 #else
@@ -96,10 +96,10 @@ void godot_cleanup_profiler();
 #elif defined(GODOT_USE_PERFETTO)
 // Use the perfetto profiler.
 
-#include "core/typedefs.h"
-
 #include <perfetto.h>
 
+#include "core/typedefs.h"
+
 PERFETTO_DEFINE_CATEGORIES(
 		perfetto::Category("godot")
 				.SetDescription("All Godot Events"), );
@@ -118,11 +118,11 @@ struct PerfettoGroupedEventEnder {
 #define GodotProfileFrameMark // TODO
 #define GodotProfileZone(m_zone_name) TRACE_EVENT("godot", m_zone_name);
 #define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name) \
-	TRACE_EVENT_BEGIN("godot", m_zone_name); \
+	TRACE_EVENT_BEGIN("godot", m_zone_name);                    \
 	PerfettoGroupedEventEnder __godot_perfetto_zone_##m_group_name
 #define GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name) __godot_perfetto_zone_##m_group_name.~PerfettoGroupedEventEnder()
 #define GodotProfileZoneGrouped(m_group_name, m_zone_name) \
-	__godot_perfetto_zone_##m_group_name._end_now(); \
+	__godot_perfetto_zone_##m_group_name._end_now();       \
 	TRACE_EVENT_BEGIN("godot", m_zone_name);
 
 #define GodotProfileZoneScript(m_ptr, m_file, m_function, m_name, m_line)
@@ -163,22 +163,22 @@ private:
 #define GodotProfileFrameMark \
 	os_signpost_event_emit(apple::instruments::LOG, OS_SIGNPOST_ID_EXCLUSIVE, "Frame");
 
-#define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name) \
-	os_signpost_interval_begin(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name); \
-	apple::instruments::DeferFunc _GD_VARNAME_CONCAT_(defer__fn, _, m_group_name) = []() { \
+#define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name)                                           \
+	os_signpost_interval_begin(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name);   \
+	apple::instruments::DeferFunc _GD_VARNAME_CONCAT_(defer__fn, _, m_group_name) = []() {                \
 		os_signpost_interval_end(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name); \
-	}; \
+	};                                                                                                    \
 	apple::instruments::Defer _GD_VARNAME_CONCAT_(__instruments_defer_zone_end__, _, m_group_name)(_GD_VARNAME_CONCAT_(defer__fn, _, m_group_name));
 
 #define GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name) \
 	_GD_VARNAME_CONCAT_(__instruments_defer_zone_end__, _, m_group_name).~Defer();
 
-#define GodotProfileZoneGrouped(m_group_name, m_zone_name) \
-	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name); \
-	os_signpost_interval_begin(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name); \
-	_GD_VARNAME_CONCAT_(defer__fn, _, m_group_name) = []() { \
+#define GodotProfileZoneGrouped(m_group_name, m_zone_name)                                                \
+	GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name);                                           \
+	os_signpost_interval_begin(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name);   \
+	_GD_VARNAME_CONCAT_(defer__fn, _, m_group_name) = []() {                                              \
 		os_signpost_interval_end(apple::instruments::LOG_TRACING, OS_SIGNPOST_ID_EXCLUSIVE, m_zone_name); \
-	}; \
+	};                                                                                                    \
 	new (&_GD_VARNAME_CONCAT_(__instruments_defer_zone_end__, _, m_group_name)) apple::instruments::Defer(_GD_VARNAME_CONCAT_(defer__fn, _, m_group_name));
 
 #define GodotProfileZone(m_zone_name) \
diff --git a/engine/core/profiling/profiling_builders.py b/engine/core/profiling/profiling_builders.py
index 81126486..81a71070 100644
--- a/engine/core/profiling/profiling_builders.py
+++ b/engine/core/profiling/profiling_builders.py
@@ -11,8 +11,6 @@ def profiler_gen_builder(target, source, env):
                 file.write("#define TRACY_CALLSTACK 62\n")
             if env["profiler_track_memory"]:
                 file.write("#define GODOT_PROFILER_TRACK_MEMORY\n")
-            if env["profiler_record_on_demand"]:
-                file.write("#define TRACY_ON_DEMAND\n")
         if env["profiler"] == "perfetto":
             file.write("#define GODOT_USE_PERFETTO\n")
         if env["profiler"] == "instruments":
diff --git a/engine/core/register_core_types.cpp b/engine/core/register_core_types.cpp
index 80696814..5e21e69c 100644
--- a/engine/core/register_core_types.cpp
+++ b/engine/core/register_core_types.cpp
@@ -35,12 +35,10 @@
 #include "core/core_bind.h"
 #include "core/crypto/aes_context.h"
 #include "core/crypto/crypto.h"
-#include "core/crypto/crypto_resource_format.h"
 #include "core/crypto/hashing_context.h"
 #include "core/debugger/engine_profiler.h"
 #include "core/extension/gdextension.h"
 #include "core/extension/gdextension_manager.h"
-#include "core/extension/gdextension_resource_format.h"
 #include "core/extension/godot_instance.h"
 #include "core/input/input.h"
 #include "core/input/input_map.h"
@@ -51,9 +49,7 @@
 #include "core/io/file_access_encrypted.h"
 #include "core/io/http_client.h"
 #include "core/io/image_loader.h"
-#include "core/io/image_resource_format.h"
 #include "core/io/json.h"
-#include "core/io/json_resource_format.h"
 #include "core/io/marshalls.h"
 #include "core/io/missing_resource.h"
 #include "core/io/packet_peer.h"
@@ -62,8 +58,6 @@
 #include "core/io/pck_packer.h"
 #include "core/io/resource_format_binary.h"
 #include "core/io/resource_importer.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/io/resource_uid.h"
 #include "core/io/stream_peer_gzip.h"
 #include "core/io/stream_peer_tls.h"
@@ -83,7 +77,6 @@
 #include "core/object/undo_redo.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/string/optimized_translation.h"
 #include "core/string/translation.h"
@@ -366,7 +359,6 @@ void register_early_core_singletons() {
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("OS", CoreBind::OS::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Time", Time::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("ClassDB", _classdb));
 }
 
 void register_core_singletons() {
@@ -377,6 +369,7 @@ void register_core_singletons() {
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Geometry3D", CoreBind::Geometry3D::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceLoader", CoreBind::ResourceLoader::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceSaver", CoreBind::ResourceSaver::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("ClassDB", _classdb));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Marshalls", CoreBind::Marshalls::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("TranslationServer", TranslationServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Input", Input::get_singleton()));
diff --git a/engine/core/string/char_range.cpp b/engine/core/string/char_range.inc
similarity index 97%
rename from engine/core/string/char_range.cpp
rename to engine/core/string/char_range.inc
index 23822ad2..3e473cf7 100644
--- a/engine/core/string/char_range.cpp
+++ b/engine/core/string/char_range.inc
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  char_range.cpp                                                        */
+/*  char_range.inc                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,13 +30,19 @@
 
 // This file was generated using the `misc/scripts/char_range_fetch.py` script.
 
-#include "core/string/char_utils.h"
+#pragma once
+
+#include "core/typedefs.h"
 
 // Unicode Derived Core Properties
-// Source: https://www.unicode.org/Public/17.0.0/ucd/DerivedCoreProperties.txt
+// Source: https://www.unicode.org/Public/16.0.0/ucd/DerivedCoreProperties.txt
 
-const int xid_start_size = 692;
-const CharRange xid_start[xid_start_size] = {
+struct CharRange {
+	char32_t start;
+	char32_t end;
+};
+
+constexpr inline CharRange xid_start[] = {
 	{ 0x41, 0x5a },
 	{ 0x5f, 0x5f },
 	{ 0x61, 0x7a },
@@ -88,7 +94,7 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x840, 0x858 },
 	{ 0x860, 0x86a },
 	{ 0x870, 0x887 },
-	{ 0x889, 0x88f },
+	{ 0x889, 0x88e },
 	{ 0x8a0, 0x8c9 },
 	{ 0x904, 0x939 },
 	{ 0x93d, 0x93d },
@@ -154,7 +160,7 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0xc2a, 0xc39 },
 	{ 0xc3d, 0xc3d },
 	{ 0xc58, 0xc5a },
-	{ 0xc5c, 0xc5d },
+	{ 0xc5d, 0xc5d },
 	{ 0xc60, 0xc61 },
 	{ 0xc80, 0xc80 },
 	{ 0xc85, 0xc8c },
@@ -163,7 +169,7 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0xcaa, 0xcb3 },
 	{ 0xcb5, 0xcb9 },
 	{ 0xcbd, 0xcbd },
-	{ 0xcdc, 0xcde },
+	{ 0xcdd, 0xcde },
 	{ 0xce0, 0xce1 },
 	{ 0xcf1, 0xcf2 },
 	{ 0xd04, 0xd0c },
@@ -345,8 +351,11 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0xa6a0, 0xa6ef },
 	{ 0xa717, 0xa71f },
 	{ 0xa722, 0xa788 },
-	{ 0xa78b, 0xa7dc },
-	{ 0xa7f1, 0xa801 },
+	{ 0xa78b, 0xa7cd },
+	{ 0xa7d0, 0xa7d1 },
+	{ 0xa7d3, 0xa7d3 },
+	{ 0xa7d5, 0xa7dc },
+	{ 0xa7f2, 0xa801 },
 	{ 0xa803, 0xa805 },
 	{ 0xa807, 0xa80a },
 	{ 0xa80c, 0xa822 },
@@ -469,7 +478,6 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x108f4, 0x108f5 },
 	{ 0x10900, 0x10915 },
 	{ 0x10920, 0x10939 },
-	{ 0x10940, 0x10959 },
 	{ 0x10980, 0x109b7 },
 	{ 0x109be, 0x109bf },
 	{ 0x10a00, 0x10a00 },
@@ -492,7 +500,7 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x10d6f, 0x10d85 },
 	{ 0x10e80, 0x10ea9 },
 	{ 0x10eb0, 0x10eb1 },
-	{ 0x10ec2, 0x10ec7 },
+	{ 0x10ec2, 0x10ec4 },
 	{ 0x10f00, 0x10f1c },
 	{ 0x10f27, 0x10f27 },
 	{ 0x10f30, 0x10f45 },
@@ -585,7 +593,6 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x11d67, 0x11d68 },
 	{ 0x11d6a, 0x11d89 },
 	{ 0x11d98, 0x11d98 },
-	{ 0x11db0, 0x11ddb },
 	{ 0x11ee0, 0x11ef2 },
 	{ 0x11f02, 0x11f02 },
 	{ 0x11f04, 0x11f10 },
@@ -610,17 +617,14 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x16b7d, 0x16b8f },
 	{ 0x16d40, 0x16d6c },
 	{ 0x16e40, 0x16e7f },
-	{ 0x16ea0, 0x16eb8 },
-	{ 0x16ebb, 0x16ed3 },
 	{ 0x16f00, 0x16f4a },
 	{ 0x16f50, 0x16f50 },
 	{ 0x16f93, 0x16f9f },
 	{ 0x16fe0, 0x16fe1 },
 	{ 0x16fe3, 0x16fe3 },
-	{ 0x16ff2, 0x16ff6 },
-	{ 0x17000, 0x18cd5 },
-	{ 0x18cff, 0x18d1e },
-	{ 0x18d80, 0x18df2 },
+	{ 0x17000, 0x187f7 },
+	{ 0x18800, 0x18cd5 },
+	{ 0x18cff, 0x18d08 },
 	{ 0x1aff0, 0x1aff3 },
 	{ 0x1aff5, 0x1affb },
 	{ 0x1affd, 0x1affe },
@@ -675,12 +679,6 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x1e4d0, 0x1e4eb },
 	{ 0x1e5d0, 0x1e5ed },
 	{ 0x1e5f0, 0x1e5f0 },
-	{ 0x1e6c0, 0x1e6de },
-	{ 0x1e6e0, 0x1e6e2 },
-	{ 0x1e6e4, 0x1e6e5 },
-	{ 0x1e6e7, 0x1e6ed },
-	{ 0x1e6f0, 0x1e6f4 },
-	{ 0x1e6fe, 0x1e6ff },
 	{ 0x1e7e0, 0x1e7e6 },
 	{ 0x1e7e8, 0x1e7eb },
 	{ 0x1e7ed, 0x1e7ee },
@@ -722,17 +720,17 @@ const CharRange xid_start[xid_start_size] = {
 	{ 0x1eea5, 0x1eea9 },
 	{ 0x1eeab, 0x1eebb },
 	{ 0x20000, 0x2a6df },
-	{ 0x2a700, 0x2b81d },
-	{ 0x2b820, 0x2cead },
+	{ 0x2a700, 0x2b739 },
+	{ 0x2b740, 0x2b81d },
+	{ 0x2b820, 0x2cea1 },
 	{ 0x2ceb0, 0x2ebe0 },
 	{ 0x2ebf0, 0x2ee5d },
 	{ 0x2f800, 0x2fa1d },
 	{ 0x30000, 0x3134a },
-	{ 0x31350, 0x33479 },
+	{ 0x31350, 0x323af },
 };
 
-const int xid_continue_size = 806;
-const CharRange xid_continue[xid_continue_size] = {
+constexpr inline CharRange xid_continue[] = {
 	{ 0x30, 0x39 },
 	{ 0x41, 0x5a },
 	{ 0x5f, 0x5f },
@@ -785,7 +783,7 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x840, 0x85b },
 	{ 0x860, 0x86a },
 	{ 0x870, 0x887 },
-	{ 0x889, 0x88f },
+	{ 0x889, 0x88e },
 	{ 0x897, 0x8e1 },
 	{ 0x8e3, 0x963 },
 	{ 0x966, 0x96f },
@@ -875,7 +873,7 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0xc4a, 0xc4d },
 	{ 0xc55, 0xc56 },
 	{ 0xc58, 0xc5a },
-	{ 0xc5c, 0xc5d },
+	{ 0xc5d, 0xc5d },
 	{ 0xc60, 0xc63 },
 	{ 0xc66, 0xc6f },
 	{ 0xc80, 0xc83 },
@@ -888,7 +886,7 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0xcc6, 0xcc8 },
 	{ 0xcca, 0xccd },
 	{ 0xcd5, 0xcd6 },
-	{ 0xcdc, 0xcde },
+	{ 0xcdd, 0xcde },
 	{ 0xce0, 0xce3 },
 	{ 0xce6, 0xcef },
 	{ 0xcf1, 0xcf3 },
@@ -1001,8 +999,7 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x1a90, 0x1a99 },
 	{ 0x1aa7, 0x1aa7 },
 	{ 0x1ab0, 0x1abd },
-	{ 0x1abf, 0x1add },
-	{ 0x1ae0, 0x1aeb },
+	{ 0x1abf, 0x1ace },
 	{ 0x1b00, 0x1b4c },
 	{ 0x1b50, 0x1b59 },
 	{ 0x1b6b, 0x1b73 },
@@ -1095,8 +1092,11 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0xa67f, 0xa6f1 },
 	{ 0xa717, 0xa71f },
 	{ 0xa722, 0xa788 },
-	{ 0xa78b, 0xa7dc },
-	{ 0xa7f1, 0xa827 },
+	{ 0xa78b, 0xa7cd },
+	{ 0xa7d0, 0xa7d1 },
+	{ 0xa7d3, 0xa7d3 },
+	{ 0xa7d5, 0xa7dc },
+	{ 0xa7f2, 0xa827 },
 	{ 0xa82c, 0xa82c },
 	{ 0xa840, 0xa873 },
 	{ 0xa880, 0xa8c5 },
@@ -1218,7 +1218,6 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x108f4, 0x108f5 },
 	{ 0x10900, 0x10915 },
 	{ 0x10920, 0x10939 },
-	{ 0x10940, 0x10959 },
 	{ 0x10980, 0x109b7 },
 	{ 0x109be, 0x109bf },
 	{ 0x10a00, 0x10a03 },
@@ -1247,8 +1246,8 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x10e80, 0x10ea9 },
 	{ 0x10eab, 0x10eac },
 	{ 0x10eb0, 0x10eb1 },
-	{ 0x10ec2, 0x10ec7 },
-	{ 0x10efa, 0x10f1c },
+	{ 0x10ec2, 0x10ec4 },
+	{ 0x10efc, 0x10f1c },
 	{ 0x10f27, 0x10f27 },
 	{ 0x10f30, 0x10f50 },
 	{ 0x10f70, 0x10f85 },
@@ -1342,7 +1341,6 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x11a50, 0x11a99 },
 	{ 0x11a9d, 0x11a9d },
 	{ 0x11ab0, 0x11af8 },
-	{ 0x11b60, 0x11b67 },
 	{ 0x11bc0, 0x11be0 },
 	{ 0x11bf0, 0x11bf9 },
 	{ 0x11c00, 0x11c08 },
@@ -1365,8 +1363,6 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x11d90, 0x11d91 },
 	{ 0x11d93, 0x11d98 },
 	{ 0x11da0, 0x11da9 },
-	{ 0x11db0, 0x11ddb },
-	{ 0x11de0, 0x11de9 },
 	{ 0x11ee0, 0x11ef6 },
 	{ 0x11f00, 0x11f10 },
 	{ 0x11f12, 0x11f3a },
@@ -1397,17 +1393,15 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x16d40, 0x16d6c },
 	{ 0x16d70, 0x16d79 },
 	{ 0x16e40, 0x16e7f },
-	{ 0x16ea0, 0x16eb8 },
-	{ 0x16ebb, 0x16ed3 },
 	{ 0x16f00, 0x16f4a },
 	{ 0x16f4f, 0x16f87 },
 	{ 0x16f8f, 0x16f9f },
 	{ 0x16fe0, 0x16fe1 },
 	{ 0x16fe3, 0x16fe4 },
-	{ 0x16ff0, 0x16ff6 },
-	{ 0x17000, 0x18cd5 },
-	{ 0x18cff, 0x18d1e },
-	{ 0x18d80, 0x18df2 },
+	{ 0x16ff0, 0x16ff1 },
+	{ 0x17000, 0x187f7 },
+	{ 0x18800, 0x18cd5 },
+	{ 0x18cff, 0x18d08 },
 	{ 0x1aff0, 0x1aff3 },
 	{ 0x1aff5, 0x1affb },
 	{ 0x1affd, 0x1affe },
@@ -1485,9 +1479,6 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x1e2c0, 0x1e2f9 },
 	{ 0x1e4d0, 0x1e4f9 },
 	{ 0x1e5d0, 0x1e5fa },
-	{ 0x1e6c0, 0x1e6de },
-	{ 0x1e6e0, 0x1e6f5 },
-	{ 0x1e6fe, 0x1e6ff },
 	{ 0x1e7e0, 0x1e7e6 },
 	{ 0x1e7e8, 0x1e7eb },
 	{ 0x1e7ed, 0x1e7ee },
@@ -1531,18 +1522,18 @@ const CharRange xid_continue[xid_continue_size] = {
 	{ 0x1eeab, 0x1eebb },
 	{ 0x1fbf0, 0x1fbf9 },
 	{ 0x20000, 0x2a6df },
-	{ 0x2a700, 0x2b81d },
-	{ 0x2b820, 0x2cead },
+	{ 0x2a700, 0x2b739 },
+	{ 0x2b740, 0x2b81d },
+	{ 0x2b820, 0x2cea1 },
 	{ 0x2ceb0, 0x2ebe0 },
 	{ 0x2ebf0, 0x2ee5d },
 	{ 0x2f800, 0x2fa1d },
 	{ 0x30000, 0x3134a },
-	{ 0x31350, 0x33479 },
+	{ 0x31350, 0x323af },
 	{ 0xe0100, 0xe01ef },
 };
 
-const int uppercase_letter_size = 660;
-const CharRange uppercase_letter[uppercase_letter_size] = {
+constexpr inline CharRange uppercase_letter[] = {
 	{ 0x41, 0x5a },
 	{ 0xc0, 0xd6 },
 	{ 0xd8, 0xde },
@@ -2147,10 +2138,7 @@ const CharRange uppercase_letter[uppercase_letter_size] = {
 	{ 0xa7c4, 0xa7c7 },
 	{ 0xa7c9, 0xa7c9 },
 	{ 0xa7cb, 0xa7cc },
-	{ 0xa7ce, 0xa7ce },
 	{ 0xa7d0, 0xa7d0 },
-	{ 0xa7d2, 0xa7d2 },
-	{ 0xa7d4, 0xa7d4 },
 	{ 0xa7d6, 0xa7d6 },
 	{ 0xa7d8, 0xa7d8 },
 	{ 0xa7da, 0xa7da },
@@ -2167,7 +2155,6 @@ const CharRange uppercase_letter[uppercase_letter_size] = {
 	{ 0x10d50, 0x10d65 },
 	{ 0x118a0, 0x118bf },
 	{ 0x16e40, 0x16e5f },
-	{ 0x16ea0, 0x16eb8 },
 	{ 0x1d400, 0x1d419 },
 	{ 0x1d434, 0x1d44d },
 	{ 0x1d468, 0x1d481 },
@@ -2205,8 +2192,7 @@ const CharRange uppercase_letter[uppercase_letter_size] = {
 	{ 0x1f170, 0x1f189 },
 };
 
-const int lowercase_letter_size = 677;
-const CharRange lowercase_letter[lowercase_letter_size] = {
+constexpr inline CharRange lowercase_letter[] = {
 	{ 0x61, 0x7a },
 	{ 0xaa, 0xaa },
 	{ 0xb5, 0xb5 },
@@ -2354,7 +2340,7 @@ const CharRange lowercase_letter[lowercase_letter_size] = {
 	{ 0x24b, 0x24b },
 	{ 0x24d, 0x24d },
 	{ 0x24f, 0x293 },
-	{ 0x296, 0x2b8 },
+	{ 0x295, 0x2b8 },
 	{ 0x2c0, 0x2c1 },
 	{ 0x2e0, 0x2e4 },
 	{ 0x345, 0x345 },
@@ -2820,14 +2806,13 @@ const CharRange lowercase_letter[lowercase_letter_size] = {
 	{ 0xa7c8, 0xa7c8 },
 	{ 0xa7ca, 0xa7ca },
 	{ 0xa7cd, 0xa7cd },
-	{ 0xa7cf, 0xa7cf },
 	{ 0xa7d1, 0xa7d1 },
 	{ 0xa7d3, 0xa7d3 },
 	{ 0xa7d5, 0xa7d5 },
 	{ 0xa7d7, 0xa7d7 },
 	{ 0xa7d9, 0xa7d9 },
 	{ 0xa7db, 0xa7db },
-	{ 0xa7f1, 0xa7f4 },
+	{ 0xa7f2, 0xa7f4 },
 	{ 0xa7f6, 0xa7f6 },
 	{ 0xa7f8, 0xa7fa },
 	{ 0xab30, 0xab5a },
@@ -2850,7 +2835,6 @@ const CharRange lowercase_letter[lowercase_letter_size] = {
 	{ 0x10d70, 0x10d85 },
 	{ 0x118c0, 0x118df },
 	{ 0x16e60, 0x16e7f },
-	{ 0x16ebb, 0x16ed3 },
 	{ 0x1d41a, 0x1d433 },
 	{ 0x1d44e, 0x1d454 },
 	{ 0x1d456, 0x1d467 },
@@ -2886,8 +2870,7 @@ const CharRange lowercase_letter[lowercase_letter_size] = {
 	{ 0x1e922, 0x1e943 },
 };
 
-const int unicode_letter_size = 761;
-const CharRange unicode_letter[unicode_letter_size] = {
+constexpr inline CharRange unicode_letter[] = {
 	{ 0x41, 0x5a },
 	{ 0x61, 0x7a },
 	{ 0xaa, 0xaa },
@@ -2941,7 +2924,7 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x840, 0x858 },
 	{ 0x860, 0x86a },
 	{ 0x870, 0x887 },
-	{ 0x889, 0x88f },
+	{ 0x889, 0x88e },
 	{ 0x897, 0x897 },
 	{ 0x8a0, 0x8c9 },
 	{ 0x8d4, 0x8df },
@@ -3032,7 +3015,7 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0xc4a, 0xc4c },
 	{ 0xc55, 0xc56 },
 	{ 0xc58, 0xc5a },
-	{ 0xc5c, 0xc5d },
+	{ 0xc5d, 0xc5d },
 	{ 0xc60, 0xc63 },
 	{ 0xc80, 0xc83 },
 	{ 0xc85, 0xc8c },
@@ -3044,7 +3027,7 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0xcc6, 0xcc8 },
 	{ 0xcca, 0xccc },
 	{ 0xcd5, 0xcd6 },
-	{ 0xcdc, 0xcde },
+	{ 0xcdd, 0xcde },
 	{ 0xce0, 0xce3 },
 	{ 0xcf1, 0xcf3 },
 	{ 0xd00, 0xd0c },
@@ -3244,8 +3227,11 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0xa67f, 0xa6ef },
 	{ 0xa717, 0xa71f },
 	{ 0xa722, 0xa788 },
-	{ 0xa78b, 0xa7dc },
-	{ 0xa7f1, 0xa805 },
+	{ 0xa78b, 0xa7cd },
+	{ 0xa7d0, 0xa7d1 },
+	{ 0xa7d3, 0xa7d3 },
+	{ 0xa7d5, 0xa7dc },
+	{ 0xa7f2, 0xa805 },
 	{ 0xa807, 0xa827 },
 	{ 0xa840, 0xa873 },
 	{ 0xa880, 0xa8c3 },
@@ -3354,7 +3340,6 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x108f4, 0x108f5 },
 	{ 0x10900, 0x10915 },
 	{ 0x10920, 0x10939 },
-	{ 0x10940, 0x10959 },
 	{ 0x10980, 0x109b7 },
 	{ 0x109be, 0x109bf },
 	{ 0x10a00, 0x10a03 },
@@ -3380,8 +3365,8 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x10e80, 0x10ea9 },
 	{ 0x10eab, 0x10eac },
 	{ 0x10eb0, 0x10eb1 },
-	{ 0x10ec2, 0x10ec7 },
-	{ 0x10efa, 0x10efc },
+	{ 0x10ec2, 0x10ec4 },
+	{ 0x10efc, 0x10efc },
 	{ 0x10f00, 0x10f1c },
 	{ 0x10f27, 0x10f27 },
 	{ 0x10f30, 0x10f45 },
@@ -3474,7 +3459,6 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x11a50, 0x11a97 },
 	{ 0x11a9d, 0x11a9d },
 	{ 0x11ab0, 0x11af8 },
-	{ 0x11b60, 0x11b67 },
 	{ 0x11bc0, 0x11be0 },
 	{ 0x11c00, 0x11c08 },
 	{ 0x11c0a, 0x11c36 },
@@ -3497,7 +3481,6 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x11d90, 0x11d91 },
 	{ 0x11d93, 0x11d96 },
 	{ 0x11d98, 0x11d98 },
-	{ 0x11db0, 0x11ddb },
 	{ 0x11ee0, 0x11ef6 },
 	{ 0x11f00, 0x11f10 },
 	{ 0x11f12, 0x11f3a },
@@ -3522,17 +3505,15 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x16b7d, 0x16b8f },
 	{ 0x16d40, 0x16d6c },
 	{ 0x16e40, 0x16e7f },
-	{ 0x16ea0, 0x16eb8 },
-	{ 0x16ebb, 0x16ed3 },
 	{ 0x16f00, 0x16f4a },
 	{ 0x16f4f, 0x16f87 },
 	{ 0x16f8f, 0x16f9f },
 	{ 0x16fe0, 0x16fe1 },
 	{ 0x16fe3, 0x16fe3 },
-	{ 0x16ff0, 0x16ff6 },
-	{ 0x17000, 0x18cd5 },
-	{ 0x18cff, 0x18d1e },
-	{ 0x18d80, 0x18df2 },
+	{ 0x16ff0, 0x16ff1 },
+	{ 0x17000, 0x187f7 },
+	{ 0x18800, 0x18cd5 },
+	{ 0x18cff, 0x18d08 },
 	{ 0x1aff0, 0x1aff3 },
 	{ 0x1aff5, 0x1affb },
 	{ 0x1affd, 0x1affe },
@@ -3594,9 +3575,6 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x1e4d0, 0x1e4eb },
 	{ 0x1e5d0, 0x1e5ed },
 	{ 0x1e5f0, 0x1e5f0 },
-	{ 0x1e6c0, 0x1e6de },
-	{ 0x1e6e0, 0x1e6f5 },
-	{ 0x1e6fe, 0x1e6ff },
 	{ 0x1e7e0, 0x1e7e6 },
 	{ 0x1e7e8, 0x1e7eb },
 	{ 0x1e7ed, 0x1e7ee },
@@ -3642,11 +3620,12 @@ const CharRange unicode_letter[unicode_letter_size] = {
 	{ 0x1f150, 0x1f169 },
 	{ 0x1f170, 0x1f189 },
 	{ 0x20000, 0x2a6df },
-	{ 0x2a700, 0x2b81d },
-	{ 0x2b820, 0x2cead },
+	{ 0x2a700, 0x2b739 },
+	{ 0x2b740, 0x2b81d },
+	{ 0x2b820, 0x2cea1 },
 	{ 0x2ceb0, 0x2ebe0 },
 	{ 0x2ebf0, 0x2ee5d },
 	{ 0x2f800, 0x2fa1d },
 	{ 0x30000, 0x3134a },
-	{ 0x31350, 0x33479 },
+	{ 0x31350, 0x323af },
 };
diff --git a/engine/core/string/char_utils.h b/engine/core/string/char_utils.h
index 270371d1..db5f7a9e 100644
--- a/engine/core/string/char_utils.h
+++ b/engine/core/string/char_utils.h
@@ -32,62 +32,48 @@
 
 #include "core/typedefs.h"
 
+#include "char_range.inc"
+
 static constexpr char hex_char_table_upper[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 static constexpr char hex_char_table_lower[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
 
-struct CharRange {
-	char32_t start;
-	char32_t end;
-};
-
-extern const CharRange xid_start[];
-extern const int xid_start_size;
-extern const CharRange xid_continue[];
-extern const int xid_continue_size;
-extern const CharRange uppercase_letter[];
-extern const int uppercase_letter_size;
-extern const CharRange lowercase_letter[];
-extern const int lowercase_letter_size;
-extern const CharRange unicode_letter[];
-extern const int unicode_letter_size;
-
-#define BSEARCH_CHAR_RANGE(m_array, m_size) \
-	int low = 0; \
-	int high = m_size - 1; \
-	int middle = (low + high) / 2; \
-\
-	while (low <= high) { \
-		if (p_char < m_array[middle].start) { \
-			high = middle - 1; \
+#define BSEARCH_CHAR_RANGE(m_array)                \
+	int low = 0;                                   \
+	int high = std_size(m_array) - 1;              \
+	int middle = (low + high) / 2;                 \
+                                                   \
+	while (low <= high) {                          \
+		if (p_char < m_array[middle].start) {      \
+			high = middle - 1;                     \
 		} else if (p_char > m_array[middle].end) { \
-			low = middle + 1; \
-		} else { \
-			return true; \
-		} \
-\
-		middle = (low + high) / 2; \
-	} \
-\
+			low = middle + 1;                      \
+		} else {                                   \
+			return true;                           \
+		}                                          \
+                                                   \
+		middle = (low + high) / 2;                 \
+	}                                              \
+                                                   \
 	return false
 
-inline bool is_unicode_identifier_start(char32_t p_char) {
-	BSEARCH_CHAR_RANGE(xid_start, xid_start_size);
+constexpr bool is_unicode_identifier_start(char32_t p_char) {
+	BSEARCH_CHAR_RANGE(xid_start);
 }
 
-inline bool is_unicode_identifier_continue(char32_t p_char) {
-	BSEARCH_CHAR_RANGE(xid_continue, xid_continue_size);
+constexpr bool is_unicode_identifier_continue(char32_t p_char) {
+	BSEARCH_CHAR_RANGE(xid_continue);
 }
 
-inline bool is_unicode_upper_case(char32_t p_char) {
-	BSEARCH_CHAR_RANGE(uppercase_letter, uppercase_letter_size);
+constexpr bool is_unicode_upper_case(char32_t p_char) {
+	BSEARCH_CHAR_RANGE(uppercase_letter);
 }
 
-inline bool is_unicode_lower_case(char32_t p_char) {
-	BSEARCH_CHAR_RANGE(lowercase_letter, lowercase_letter_size);
+constexpr bool is_unicode_lower_case(char32_t p_char) {
+	BSEARCH_CHAR_RANGE(lowercase_letter);
 }
 
-inline bool is_unicode_letter(char32_t p_char) {
-	BSEARCH_CHAR_RANGE(unicode_letter, unicode_letter_size);
+constexpr bool is_unicode_letter(char32_t p_char) {
+	BSEARCH_CHAR_RANGE(unicode_letter);
 }
 
 #undef BSEARCH_CHAR_RANGE
diff --git a/engine/core/string/locales.h b/engine/core/string/locales.h
index 148aee8f..e66a1079 100644
--- a/engine/core/string/locales.h
+++ b/engine/core/string/locales.h
@@ -913,7 +913,6 @@ static const char *language_list[][2] = {
 	{ "tmh", "Tamashek" },
 	{ "tn", "Tswana" },
 	{ "to", "Tongan" },
-	{ "tok", "Toki Pona" },
 	{ "tog", "Nyasa Tonga" },
 	{ "tpi", "Tok Pisin" },
 	{ "tr", "Turkish" },
diff --git a/engine/core/string/optimized_translation.cpp b/engine/core/string/optimized_translation.cpp
index 3fc934b5..d9e154c4 100644
--- a/engine/core/string/optimized_translation.cpp
+++ b/engine/core/string/optimized_translation.cpp
@@ -30,11 +30,10 @@
 
 #include "optimized_translation.h"
 
-#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 
 extern "C" {
-#include <thirdparty/misc/smaz.h>
+#include "thirdparty/misc/smaz.h"
 }
 
 struct CompressedString {
@@ -333,7 +332,7 @@ void OptimizedTranslation::_get_property_list(List<PropertyInfo> *p_list) const
 	p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "hash_table", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 	p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "bucket_table", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 	p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "strings", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "load_from", PROPERTY_HINT_RESOURCE_TYPE, Translation::get_class_static(), PROPERTY_USAGE_EDITOR));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, "load_from", PROPERTY_HINT_RESOURCE_TYPE, "Translation", PROPERTY_USAGE_EDITOR));
 }
 
 void OptimizedTranslation::_bind_methods() {
diff --git a/engine/core/string/print_string.cpp b/engine/core/string/print_string.cpp
index bae0e26e..7f2607b0 100644
--- a/engine/core/string/print_string.cpp
+++ b/engine/core/string/print_string.cpp
@@ -33,17 +33,11 @@
 #include "core/core_globals.h"
 #include "core/os/os.h"
 
-#include <cstdio>
-
 static PrintHandlerList *print_handler_list = nullptr;
 static thread_local bool is_printing = false;
 
-static void __print_fallback(const String &p_string, bool p_err, bool p_reentrance) {
-	if (p_reentrance) {
-		fprintf(p_err ? stderr : stdout, "While attempting to print an error, another error was printed:\n");
-	}
-
-	fprintf(p_err ? stderr : stdout, "%s\n", p_string.utf8().get_data());
+static void __print_fallback(const String &p_string, bool p_err) {
+	fprintf(p_err ? stderr : stdout, "While attempting to print a message, another message was printed:\n%s\n", p_string.utf8().get_data());
 }
 
 void add_print_handler(PrintHandlerList *p_handler) {
@@ -82,13 +76,8 @@ void __print_line(const String &p_string) {
 		return;
 	}
 
-	if (!CoreGlobals::print_ready) {
-		__print_fallback(p_string, false, false);
-		return;
-	}
-
 	if (is_printing) {
-		__print_fallback(p_string, false, true);
+		__print_fallback(p_string, false);
 		return;
 	}
 
@@ -288,13 +277,8 @@ void __print_line_rich(const String &p_string) {
 	}
 	output += "\u001b[0m"; // Reset.
 
-	if (!CoreGlobals::print_ready) {
-		__print_fallback(output, false, false);
-		return;
-	}
-
 	if (is_printing) {
-		__print_fallback(output, false, true);
+		__print_fallback(output, false);
 		return;
 	}
 
@@ -315,13 +299,8 @@ void __print_line_rich(const String &p_string) {
 }
 
 void print_raw(const String &p_string) {
-	if (!CoreGlobals::print_ready) {
-		__print_fallback(p_string, false, false);
-		return;
-	}
-
 	if (is_printing) {
-		__print_fallback(p_string, true, true);
+		__print_fallback(p_string, true);
 		return;
 	}
 
@@ -337,13 +316,8 @@ void print_error(const String &p_string) {
 		return;
 	}
 
-	if (!CoreGlobals::print_ready) {
-		__print_fallback(p_string, false, false);
-		return;
-	}
-
 	if (is_printing) {
-		__print_fallback(p_string, true, true);
+		__print_fallback(p_string, true);
 		return;
 	}
 
diff --git a/engine/core/string/print_string.h b/engine/core/string/print_string.h
index 673e2d70..43b358a0 100644
--- a/engine/core/string/print_string.h
+++ b/engine/core/string/print_string.h
@@ -58,11 +58,11 @@ extern void print_error(const String &p_string);
 extern bool is_print_verbose_enabled();
 
 // This version avoids processing the text to be printed until it actually has to be printed, saving some CPU usage.
-#define print_verbose(m_text) \
-	{ \
+#define print_verbose(m_text)             \
+	{                                     \
 		if (is_print_verbose_enabled()) { \
-			print_line(m_text); \
-		} \
+			print_line(m_text);           \
+		}                                 \
 	}
 
 template <typename... Args>
diff --git a/engine/core/string/string_buffer.h b/engine/core/string/string_buffer.h
index d2a11f11..e707a3ad 100644
--- a/engine/core/string/string_buffer.h
+++ b/engine/core/string/string_buffer.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/math/math_funcs_binary.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
 
@@ -127,7 +126,7 @@ StringBuffer<SHORT_BUFFER_SIZE> &StringBuffer<SHORT_BUFFER_SIZE>::reserve(int p_
 	}
 
 	bool need_copy = string_length > 0 && buffer.is_empty();
-	buffer.resize_uninitialized(Math::next_power_of_2((uint32_t)p_size));
+	buffer.resize_uninitialized(next_power_of_2((uint32_t)p_size));
 	if (need_copy) {
 		memcpy(buffer.ptrw(), short_buffer, string_length * sizeof(char32_t));
 	}
diff --git a/engine/core/string/string_name.cpp b/engine/core/string/string_name.cpp
index 5fc70a4c..00a79d4d 100644
--- a/engine/core/string/string_name.cpp
+++ b/engine/core/string/string_name.cpp
@@ -33,7 +33,6 @@
 #include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "core/templates/paged_allocator.h"
 
 struct StringName::Table {
 	constexpr static uint32_t TABLE_BITS = 16;
diff --git a/engine/core/string/translation.cpp b/engine/core/string/translation.cpp
index 88161c40..bf48529e 100644
--- a/engine/core/string/translation.cpp
+++ b/engine/core/string/translation.cpp
@@ -30,7 +30,6 @@
 
 #include "translation.h"
 
-#include "core/object/class_db.h"
 #include "core/os/thread.h"
 #include "core/string/plural_rules.h"
 #include "core/string/translation_server.h"
diff --git a/engine/core/string/translation.h b/engine/core/string/translation.h
index 83bcadb3..549ff7ca 100644
--- a/engine/core/string/translation.h
+++ b/engine/core/string/translation.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 class PluralRules;
 
diff --git a/engine/core/string/translation_domain.cpp b/engine/core/string/translation_domain.cpp
index 48e6fcfb..e7b713d4 100644
--- a/engine/core/string/translation_domain.cpp
+++ b/engine/core/string/translation_domain.cpp
@@ -30,7 +30,6 @@
 
 #include "translation_domain.h"
 
-#include "core/object/class_db.h"
 #include "core/string/translation.h"
 #include "core/string/translation_server.h"
 #include "core/variant/typed_array.h"
@@ -287,7 +286,7 @@ void TranslationDomain::clear() {
 }
 
 const HashSet<Ref<Translation>> TranslationDomain::get_translations() const {
-	return HashSet<Ref<Translation>>(translations);
+	return translations;
 }
 
 HashSet<Ref<Translation>> TranslationDomain::find_translations(const String &p_locale, bool p_exact) const {
diff --git a/engine/core/string/translation_server.compat.inc b/engine/core/string/translation_server.compat.inc
index df24f5b7..11f508c6 100644
--- a/engine/core/string/translation_server.compat.inc
+++ b/engine/core/string/translation_server.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "translation_server.h"
-
-#include "core/object/class_db.h"
-
 String TranslationServer::_standardize_locale_bind_compat_98972(const String &p_locale) const {
 	return standardize_locale(p_locale, false);
 }
diff --git a/engine/core/string/translation_server.cpp b/engine/core/string/translation_server.cpp
index 069e53ff..d33bad67 100644
--- a/engine/core/string/translation_server.cpp
+++ b/engine/core/string/translation_server.cpp
@@ -31,10 +31,8 @@
 #include "translation_server.h"
 #include "translation_server.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/string/locales.h"
diff --git a/engine/core/string/ucaps.h b/engine/core/string/ucaps.h
index 43443747..6cda79e0 100644
--- a/engine/core/string/ucaps.h
+++ b/engine/core/string/ucaps.h
@@ -32,8 +32,8 @@
 
 // This file was generated using the `misc/scripts/ucaps_fetch.py` script.
 
-#define LTU_LEN 1505
-#define UTL_LEN 1488
+#define LTU_LEN 1477
+#define UTL_LEN 1460
 
 static const int caps_table[LTU_LEN][2] = {
 	{ 0x0061, 0x0041 },
@@ -1119,10 +1119,7 @@ static const int caps_table[LTU_LEN][2] = {
 	{ 0xA7C8, 0xA7C7 },
 	{ 0xA7CA, 0xA7C9 },
 	{ 0xA7CD, 0xA7CC },
-	{ 0xA7CF, 0xA7CE },
 	{ 0xA7D1, 0xA7D0 },
-	{ 0xA7D3, 0xA7D2 },
-	{ 0xA7D5, 0xA7D4 },
 	{ 0xA7D7, 0xA7D6 },
 	{ 0xA7D9, 0xA7D8 },
 	{ 0xA7DB, 0xA7DA },
@@ -1482,31 +1479,6 @@ static const int caps_table[LTU_LEN][2] = {
 	{ 0x16E7D, 0x16E5D },
 	{ 0x16E7E, 0x16E5E },
 	{ 0x16E7F, 0x16E5F },
-	{ 0x16EBB, 0x16EA0 },
-	{ 0x16EBC, 0x16EA1 },
-	{ 0x16EBD, 0x16EA2 },
-	{ 0x16EBE, 0x16EA3 },
-	{ 0x16EBF, 0x16EA4 },
-	{ 0x16EC0, 0x16EA5 },
-	{ 0x16EC1, 0x16EA6 },
-	{ 0x16EC2, 0x16EA7 },
-	{ 0x16EC3, 0x16EA8 },
-	{ 0x16EC4, 0x16EA9 },
-	{ 0x16EC5, 0x16EAA },
-	{ 0x16EC6, 0x16EAB },
-	{ 0x16EC7, 0x16EAC },
-	{ 0x16EC8, 0x16EAD },
-	{ 0x16EC9, 0x16EAE },
-	{ 0x16ECA, 0x16EAF },
-	{ 0x16ECB, 0x16EB0 },
-	{ 0x16ECC, 0x16EB1 },
-	{ 0x16ECD, 0x16EB2 },
-	{ 0x16ECE, 0x16EB3 },
-	{ 0x16ECF, 0x16EB4 },
-	{ 0x16ED0, 0x16EB5 },
-	{ 0x16ED1, 0x16EB6 },
-	{ 0x16ED2, 0x16EB7 },
-	{ 0x16ED3, 0x16EB8 },
 	{ 0x1E922, 0x1E900 },
 	{ 0x1E923, 0x1E901 },
 	{ 0x1E924, 0x1E902 },
@@ -2690,10 +2662,7 @@ static const int reverse_caps_table[UTL_LEN][2] = {
 	{ 0xA7C9, 0xA7CA },
 	{ 0xA7CB, 0x0264 },
 	{ 0xA7CC, 0xA7CD },
-	{ 0xA7CE, 0xA7CF },
 	{ 0xA7D0, 0xA7D1 },
-	{ 0xA7D2, 0xA7D3 },
-	{ 0xA7D4, 0xA7D5 },
 	{ 0xA7D6, 0xA7D7 },
 	{ 0xA7D8, 0xA7D9 },
 	{ 0xA7DA, 0xA7DB },
@@ -2973,31 +2942,6 @@ static const int reverse_caps_table[UTL_LEN][2] = {
 	{ 0x16E5D, 0x16E7D },
 	{ 0x16E5E, 0x16E7E },
 	{ 0x16E5F, 0x16E7F },
-	{ 0x16EA0, 0x16EBB },
-	{ 0x16EA1, 0x16EBC },
-	{ 0x16EA2, 0x16EBD },
-	{ 0x16EA3, 0x16EBE },
-	{ 0x16EA4, 0x16EBF },
-	{ 0x16EA5, 0x16EC0 },
-	{ 0x16EA6, 0x16EC1 },
-	{ 0x16EA7, 0x16EC2 },
-	{ 0x16EA8, 0x16EC3 },
-	{ 0x16EA9, 0x16EC4 },
-	{ 0x16EAA, 0x16EC5 },
-	{ 0x16EAB, 0x16EC6 },
-	{ 0x16EAC, 0x16EC7 },
-	{ 0x16EAD, 0x16EC8 },
-	{ 0x16EAE, 0x16EC9 },
-	{ 0x16EAF, 0x16ECA },
-	{ 0x16EB0, 0x16ECB },
-	{ 0x16EB1, 0x16ECC },
-	{ 0x16EB2, 0x16ECD },
-	{ 0x16EB3, 0x16ECE },
-	{ 0x16EB4, 0x16ECF },
-	{ 0x16EB5, 0x16ED0 },
-	{ 0x16EB6, 0x16ED1 },
-	{ 0x16EB7, 0x16ED2 },
-	{ 0x16EB8, 0x16ED3 },
 	{ 0x1E900, 0x1E922 },
 	{ 0x1E901, 0x1E923 },
 	{ 0x1E902, 0x1E924 },
@@ -3034,7 +2978,7 @@ static const int reverse_caps_table[UTL_LEN][2] = {
 	{ 0x1E921, 0x1E943 },
 };
 
-inline int _find_upper(int ch) {
+static int _find_upper(int ch) {
 	int low = 0;
 	int high = LTU_LEN - 1;
 	int middle;
@@ -3054,7 +2998,7 @@ inline int _find_upper(int ch) {
 	return ch;
 }
 
-inline int _find_lower(int ch) {
+static int _find_lower(int ch) {
 	int low = 0;
 	int high = UTL_LEN - 1;
 	int middle;
diff --git a/engine/core/string/ustring.cpp b/engine/core/string/ustring.cpp
index 37f4d8c7..8db8e859 100644
--- a/engine/core/string/ustring.cpp
+++ b/engine/core/string/ustring.cpp
@@ -39,6 +39,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
 #include "core/math/color.h"
 #include "core/math/math_funcs.h"
 #include "core/object/object.h"
+#include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/string_name.h"
@@ -47,9 +48,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
 #include "core/variant/variant.h"
 #include "core/version_generated.gen.h"
 
-#include <thirdparty/grisu2/grisu2.h>
-
-#include <cstdio>
+#include "thirdparty/grisu2/grisu2.h"
 
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS // to disable build-time warning which suggested to use strcpy_s instead strcpy
@@ -352,7 +351,7 @@ bool operator==(const wchar_t *p_chr, const String &p_str) {
 	// wchar_t is 16-bit
 	return p_str == String::utf16((const char16_t *)p_chr);
 #else
-	// wchar_t is 32-bit
+	// wchar_t is 32-bi
 	return p_str == (const char32_t *)p_chr;
 #endif
 }
@@ -366,7 +365,7 @@ bool operator!=(const wchar_t *p_chr, const String &p_str) {
 	// wchar_t is 16-bit
 	return !(p_str == String::utf16((const char16_t *)p_chr));
 #else
-	// wchar_t is 32-bit
+	// wchar_t is 32-bi
 	return !(p_str == String((const char32_t *)p_chr));
 #endif
 }
@@ -1658,16 +1657,16 @@ String String::hex_encode_buffer(const uint8_t *p_buffer, int p_len) {
 Vector<uint8_t> String::hex_decode() const {
 	ERR_FAIL_COND_V_MSG(length() % 2 != 0, Vector<uint8_t>(), "Hexadecimal string of uneven length.");
 
-#define HEX_TO_BYTE(m_output, m_index) \
-	uint8_t m_output; \
-	c = operator[](m_index); \
-	if (is_digit(c)) { \
-		m_output = c - '0'; \
-	} else if (c >= 'a' && c <= 'f') { \
-		m_output = c - 'a' + 10; \
-	} else if (c >= 'A' && c <= 'F') { \
-		m_output = c - 'A' + 10; \
-	} else { \
+#define HEX_TO_BYTE(m_output, m_index)                                                                                   \
+	uint8_t m_output;                                                                                                    \
+	c = operator[](m_index);                                                                                             \
+	if (is_digit(c)) {                                                                                                   \
+		m_output = c - '0';                                                                                              \
+	} else if (c >= 'a' && c <= 'f') {                                                                                   \
+		m_output = c - 'a' + 10;                                                                                         \
+	} else if (c >= 'A' && c <= 'F') {                                                                                   \
+		m_output = c - 'A' + 10;                                                                                         \
+	} else {                                                                                                             \
 		ERR_FAIL_V_MSG(Vector<uint8_t>(), "Invalid hexadecimal character \"" + chr(c) + "\" at index " + m_index + "."); \
 	}
 
@@ -5189,13 +5188,10 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 	static const String MINUS("-");
 	static const String PLUS("+");
 
-	LocalVector<bool> used_args;
-	used_args.resize_initialized(values.size());
 	String formatted;
 	char32_t *self = (char32_t *)get_data();
 	bool in_format = false;
 	uint64_t value_index = 0;
-	int selected_index = -1;
 	int min_chars = 0;
 	int min_decimals = 0;
 	bool in_decimals = false;
@@ -5222,16 +5218,15 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 				case 'o': // Octal
 				case 'x': // Hexadecimal (lowercase)
 				case 'X': { // Hexadecimal (uppercase)
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
-					if (!values[index].is_num()) {
+					if (!values[value_index].is_num()) {
 						return "a number is required";
 					}
 
-					int64_t value = values[index];
+					int64_t value = values[value_index];
 					int base = 16;
 					bool capitalize = false;
 					switch (c) {
@@ -5287,25 +5282,21 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					}
 
 					formatted += str;
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+					++value_index;
 					in_format = false;
 
 					break;
 				}
 				case 'f': { // Float
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
-					if (!values[index].is_num()) {
+					if (!values[value_index].is_num()) {
 						return "a number is required";
 					}
 
-					double value = values[index];
+					double value = values[value_index];
 					bool is_negative = std::signbit(value);
 					String str = String::num(Math::abs(value), min_decimals);
 					const bool is_finite = Math::is_finite(value);
@@ -5337,21 +5328,17 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					}
 
 					formatted += str;
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+					++value_index;
 					in_format = false;
 					break;
 				}
 				case 'v': { // Vector2/3/4/2i/3i/4i
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
 					int count;
-					switch (values[index].get_type()) {
+					switch (values[value_index].get_type()) {
 						case Variant::VECTOR2:
 						case Variant::VECTOR2I: {
 							count = 2;
@@ -5369,7 +5356,7 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 						}
 					}
 
-					Vector4 vec = values[index];
+					Vector4 vec = values[value_index];
 					String str = "(";
 					for (int i = 0; i < count; i++) {
 						double val = vec[i];
@@ -5411,20 +5398,16 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					str += ")";
 
 					formatted += str;
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+					++value_index;
 					in_format = false;
 					break;
 				}
 				case 's': { // String
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
-					String str = values[index];
+					String str = values[value_index];
 					// Padding.
 					if (left_justified) {
 						str = str.rpad(min_chars);
@@ -5433,23 +5416,19 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					}
 
 					formatted += str;
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+					++value_index;
 					in_format = false;
 					break;
 				}
 				case 'c': {
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
 					// Convert to character.
 					String str;
-					if (values[index].is_num()) {
-						int value = values[index];
+					if (values[value_index].is_num()) {
+						int value = values[value_index];
 						if (value < 0) {
 							return "unsigned integer is lower than minimum";
 						} else if (value >= 0xd800 && value <= 0xdfff) {
@@ -5457,9 +5436,9 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 						} else if (value > 0x10ffff) {
 							return "unsigned integer is greater than maximum";
 						}
-						str = chr(values[index]);
-					} else if (values[index].get_type() == Variant::STRING) {
-						str = values[index];
+						str = chr(values[value_index]);
+					} else if (values[value_index].get_type() == Variant::STRING) {
+						str = values[value_index];
 						if (str.length() != 1) {
 							return "%c requires number or single-character string";
 						}
@@ -5475,10 +5454,7 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					}
 
 					formatted += str;
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+					++value_index;
 					in_format = false;
 					break;
 				}
@@ -5522,14 +5498,6 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					}
 					break;
 				}
-				case '$': {
-					if (min_chars > 0) {
-						selected_index = min_chars - 1;
-					}
-					min_chars = 0;
-					pad_with_zeros = false;
-					break;
-				}
 				case '.': { // Float/Vector separator.
 					if (in_decimals) {
 						return "too many decimal points in format";
@@ -5540,30 +5508,27 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 				}
 
 				case '*': { // Dynamic width, based on value.
-					uint64_t index = (selected_index >= 0 ? selected_index : value_index);
-					if (index >= values.size()) {
+					if (value_index >= values.size()) {
 						return "not enough arguments for format string";
 					}
 
-					Variant::Type value_type = values[index].get_type();
-					if (!values[index].is_num() &&
+					Variant::Type value_type = values[value_index].get_type();
+					if (!values[value_index].is_num() &&
 							value_type != Variant::VECTOR2 && value_type != Variant::VECTOR2I &&
 							value_type != Variant::VECTOR3 && value_type != Variant::VECTOR3I &&
 							value_type != Variant::VECTOR4 && value_type != Variant::VECTOR4I) {
 						return "* wants number or vector";
 					}
 
-					int size = values[index];
+					int size = values[value_index];
 
 					if (in_decimals) {
 						min_decimals = size;
 					} else {
 						min_chars = size;
 					}
-					if (selected_index == -1) {
-						++value_index;
-					}
-					used_args[index] = true;
+
+					++value_index;
 					break;
 				}
 
@@ -5582,7 +5547,6 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 					left_justified = false;
 					show_sign = false;
 					in_decimals = false;
-					selected_index = -1;
 					break;
 				default:
 					formatted += c;
@@ -5594,10 +5558,8 @@ String String::sprintf(const Span<Variant> &values, bool *error) const {
 		return "incomplete format";
 	}
 
-	for (const bool &b : used_args) {
-		if (!b) {
-			return "not all arguments converted during string formatting";
-		}
+	if (value_index != values.size()) {
+		return "not all arguments converted during string formatting";
 	}
 
 	if (error) {
diff --git a/engine/core/templates/a_hash_map.cpp b/engine/core/templates/a_hash_map.cpp
index ac217973..04a14c26 100644
--- a/engine/core/templates/a_hash_map.cpp
+++ b/engine/core/templates/a_hash_map.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "a_hash_map.h"
-
 #include "core/variant/variant.h"
 
 // Explicit instantiation.
diff --git a/engine/core/templates/a_hash_map.h b/engine/core/templates/a_hash_map.h
index e8c0b0cf..079cf1b1 100644
--- a/engine/core/templates/a_hash_map.h
+++ b/engine/core/templates/a_hash_map.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/math/math_funcs_binary.h"
 #include "core/os/memory.h"
 #include "core/string/print_string.h"
 #include "core/templates/hashfuncs.h"
@@ -211,7 +210,7 @@ private:
 		uint32_t real_old_capacity = _capacity_mask + 1;
 		// Capacity can't be 0 and must be 2^n - 1.
 		_capacity_mask = MAX(4u, p_new_capacity);
-		uint32_t real_capacity = Math::next_power_of_2(_capacity_mask);
+		uint32_t real_capacity = next_power_of_2(_capacity_mask);
 		_capacity_mask = real_capacity - 1;
 
 		Metadata *old_map_data = _metadata;
@@ -413,7 +412,7 @@ public:
 	void reserve(uint32_t p_new_capacity) {
 		if (_elements == nullptr) {
 			_capacity_mask = MAX(4u, p_new_capacity);
-			_capacity_mask = Math::next_power_of_2(_capacity_mask) - 1;
+			_capacity_mask = next_power_of_2(_capacity_mask) - 1;
 			return; // Unallocated yet.
 		}
 		if (p_new_capacity <= get_capacity()) {
@@ -674,7 +673,7 @@ public:
 		p_other._size = 0;
 	}
 
-	explicit AHashMap(const AHashMap &p_other) {
+	AHashMap(const AHashMap &p_other) {
 		_init_from(p_other);
 	}
 
@@ -691,7 +690,7 @@ public:
 	AHashMap(uint32_t p_initial_capacity) {
 		// Capacity can't be 0 and must be 2^n - 1.
 		_capacity_mask = MAX(4u, p_initial_capacity);
-		_capacity_mask = Math::next_power_of_2(_capacity_mask) - 1;
+		_capacity_mask = next_power_of_2(_capacity_mask) - 1;
 	}
 	AHashMap() :
 			_capacity_mask(INITIAL_CAPACITY - 1) {
diff --git a/engine/core/templates/cowdata.h b/engine/core/templates/cowdata.h
index ec0aa48d..9be5aa32 100644
--- a/engine/core/templates/cowdata.h
+++ b/engine/core/templates/cowdata.h
@@ -32,17 +32,13 @@
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/string/print_string.h" // IWYU pragma: keep. `WARN_VERBOSE` macro.
+#include "core/string/print_string.h"
 #include "core/templates/safe_refcount.h"
 #include "core/templates/span.h"
 
 #include <initializer_list>
 #include <type_traits>
 
-#ifdef ASAN_ENABLED
-#include <sanitizer/asan_interface.h>
-#endif
-
 static_assert(std::is_trivially_destructible_v<std::atomic<uint64_t>>);
 
 // Silences false-positive warnings.
@@ -250,21 +246,17 @@ void CowData<T>::_unref() {
 	T *prev_ptr = _ptr;
 	_ptr = nullptr;
 
-#ifdef ASAN_ENABLED
-	// Access during destruction is illegal in C++, and results in undefined behavior.
-	// In address sanitizer builds, we can poison ourselves (_ptr) to catch this.
-	__asan_poison_memory_region(this, sizeof(CowData));
-#endif
-
 	destruct_arr_placement(prev_ptr, current_size);
 
+	// Safety check; none of the destructors should have added elements during destruction.
+	DEV_ASSERT(!_ptr);
+
 	// Free Memory.
 	Memory::free_static((uint8_t *)prev_ptr - DATA_OFFSET, false);
 
-#ifdef ASAN_ENABLED
-	__asan_unpoison_memory_region(this, sizeof(CowData));
-#elif defined(DEBUG_ENABLED)
-	// In a non-asan build, the best we can do is catch if elements were added during destruction.
+#ifdef DEBUG_ENABLED
+	// If any destructors access us through pointers, it is a bug.
+	// We can't really test for that, but we can at least check no items have been added.
 	ERR_FAIL_COND_MSG(_ptr != nullptr, "Internal bug, please report: CowData was modified during destruction.");
 #endif
 }
diff --git a/engine/core/templates/fixed_vector.h b/engine/core/templates/fixed_vector.h
index 18e61d8d..e56f9fdf 100644
--- a/engine/core/templates/fixed_vector.h
+++ b/engine/core/templates/fixed_vector.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/os/memory.h"
 #include "core/templates/span.h"
 
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Warray-bounds")
diff --git a/engine/core/templates/hash_map.h b/engine/core/templates/hash_map.h
index 62d6eb89..7cb23dd6 100644
--- a/engine/core/templates/hash_map.h
+++ b/engine/core/templates/hash_map.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/os/memory.h"
-#include "core/string/print_string.h" // IWYU pragma: keep. `WARN_VERBOSE` macro.
+#include "core/string/print_string.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/pair.h"
 #include "core/templates/sort_list.h"
@@ -582,7 +582,7 @@ public:
 
 	/* Constructors */
 
-	explicit HashMap(const HashMap &p_other) {
+	HashMap(const HashMap &p_other) {
 		reserve(hash_table_size_primes[p_other._capacity_idx]);
 
 		if (p_other._size == 0) {
diff --git a/engine/core/templates/hash_set.h b/engine/core/templates/hash_set.h
index 03bbce6c..048ebc7b 100644
--- a/engine/core/templates/hash_set.h
+++ b/engine/core/templates/hash_set.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/os/memory.h"
-#include "core/string/print_string.h" // IWYU pragma: keep. `WARN_VERBOSE` macro.
+#include "core/string/print_string.h"
 #include "core/templates/hashfuncs.h"
 
 /**
@@ -417,28 +417,10 @@ public:
 
 	/* Constructors */
 
-	explicit HashSet(const HashSet &p_other) {
+	HashSet(const HashSet &p_other) {
 		_init_from(p_other);
 	}
 
-	HashSet(HashSet &&p_other) {
-		_keys = p_other._keys;
-		_hash_idx_to_key_idx = p_other._hash_idx_to_key_idx;
-		_key_idx_to_hash_idx = p_other._key_idx_to_hash_idx;
-		_hashes = p_other._hashes;
-
-		_capacity_idx = p_other._capacity_idx;
-		_size = p_other._size;
-
-		p_other._keys = nullptr;
-		p_other._hash_idx_to_key_idx = nullptr;
-		p_other._hashes = nullptr;
-		p_other._key_idx_to_hash_idx = nullptr;
-
-		p_other._capacity_idx = 0;
-		p_other._size = 0;
-	}
-
 	void operator=(const HashSet &p_other) {
 		if (this == &p_other) {
 			return; // Ignore self assignment.
@@ -460,20 +442,6 @@ public:
 		_init_from(p_other);
 	}
 
-	void operator=(HashSet &&p_other) {
-		if (this == &p_other) {
-			return; // Ignore self assignment.
-		}
-
-		SWAP(_keys, p_other._keys);
-		SWAP(_hash_idx_to_key_idx, p_other._hash_idx_to_key_idx);
-		SWAP(_key_idx_to_hash_idx, p_other._key_idx_to_hash_idx);
-		SWAP(_hashes, p_other._hashes);
-
-		SWAP(_capacity_idx, p_other._capacity_idx);
-		SWAP(_size, p_other._size);
-	}
-
 	bool operator==(const HashSet &p_other) const {
 		if (_size != p_other._size) {
 			return false;
@@ -497,6 +465,7 @@ public:
 	HashSet() {
 		_capacity_idx = MIN_CAPACITY_INDEX;
 	}
+
 	HashSet(std::initializer_list<TKey> p_init) {
 		reserve(p_init.size());
 		for (const TKey &E : p_init) {
diff --git a/engine/core/templates/iterable.h b/engine/core/templates/iterable.h
index f531976a..44c9b4d1 100644
--- a/engine/core/templates/iterable.h
+++ b/engine/core/templates/iterable.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <utility>
+#include <type_traits>
 
 template <typename I>
 class Iterable {
diff --git a/engine/core/templates/list.h b/engine/core/templates/list.h
index cc6f4b59..c9ef1358 100644
--- a/engine/core/templates/list.h
+++ b/engine/core/templates/list.h
@@ -685,7 +685,10 @@ public:
 		return (void *)_data;
 	}
 
-	explicit List(const List &p_list) {
+	/**
+	 * copy constructor for the list
+	 */
+	List(const List &p_list) {
 		const Element *it = p_list.front();
 		while (it) {
 			push_back(it->get());
diff --git a/engine/core/templates/local_vector.h b/engine/core/templates/local_vector.h
index 13aea6fd..1feaa3f6 100644
--- a/engine/core/templates/local_vector.h
+++ b/engine/core/templates/local_vector.h
@@ -32,7 +32,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/string/print_string.h" // IWYU pragma: keep. `WARN_VERBOSE` macro.
+#include "core/string/print_string.h"
 #include "core/templates/sort_array.h"
 #include "core/templates/vector.h"
 
@@ -350,7 +350,7 @@ public:
 			push_back(element);
 		}
 	}
-	_FORCE_INLINE_ explicit LocalVector(const LocalVector &p_from) {
+	_FORCE_INLINE_ LocalVector(const LocalVector &p_from) {
 		resize(p_from.size());
 		for (U i = 0; i < p_from.count; i++) {
 			data[i] = p_from.data[i];
diff --git a/engine/core/templates/lru.h b/engine/core/templates/lru.h
index e605affc..df15d4b6 100644
--- a/engine/core/templates/lru.h
+++ b/engine/core/templates/lru.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/templates/hash_map.h"
-#include "core/templates/list.h"
+#include "hash_map.h"
+#include "list.h"
 
 template <typename TKey, typename TData, typename Hasher = HashMapHasherDefault, typename Comparator = HashMapComparatorDefault<TKey>, void (*BeforeEvict)(TKey &, TData &) = nullptr>
 class LRUCache {
diff --git a/engine/core/templates/paged_allocator.h b/engine/core/templates/paged_allocator.h
index cbf04670..697dc1e9 100644
--- a/engine/core/templates/paged_allocator.h
+++ b/engine/core/templates/paged_allocator.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/core_globals.h"
-#include "core/math/math_funcs_binary.h"
 #include "core/os/memory.h"
 #include "core/os/spin_lock.h"
 #include "core/string/ustring.h"
@@ -146,9 +145,9 @@ public:
 		}
 		ERR_FAIL_COND(page_pool != nullptr); // Safety check.
 		ERR_FAIL_COND(p_page_size == 0);
-		page_size = Math::nearest_power_of_2_templated(p_page_size);
+		page_size = nearest_power_of_2_templated(p_page_size);
 		page_mask = page_size - 1;
-		page_shift = Math::get_shift_from_power_of_2(page_size);
+		page_shift = get_shift_from_power_of_2(page_size);
 		if constexpr (thread_safe) {
 			spin_lock.unlock();
 		}
diff --git a/engine/core/templates/paged_array.h b/engine/core/templates/paged_array.h
index fff19312..060c5a58 100644
--- a/engine/core/templates/paged_array.h
+++ b/engine/core/templates/paged_array.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/math/math_funcs_binary.h"
 #include "core/os/memory.h"
 #include "core/os/spin_lock.h"
 #include "core/typedefs.h"
@@ -89,7 +88,7 @@ public:
 	}
 
 	uint32_t get_page_size_shift() const {
-		return Math::get_shift_from_power_of_2(page_size);
+		return get_shift_from_power_of_2(page_size);
 	}
 
 	uint32_t get_page_size_mask() const {
@@ -117,7 +116,7 @@ public:
 	void configure(uint32_t p_page_size) {
 		ERR_FAIL_COND(page_pool != nullptr); // Safety check.
 		ERR_FAIL_COND(p_page_size == 0);
-		page_size = Math::nearest_power_of_2_templated(p_page_size);
+		page_size = nearest_power_of_2_templated(p_page_size);
 	}
 
 	PagedArrayPool(uint32_t p_page_size = 4096) { // power of 2 recommended because of alignment with OS page sizes. Even if element is bigger, its still a multiple and get rounded amount of pages
diff --git a/engine/core/templates/pass_func.h b/engine/core/templates/pass_func.h
index 091cb186..118011d5 100644
--- a/engine/core/templates/pass_func.h
+++ b/engine/core/templates/pass_func.h
@@ -30,132 +30,132 @@
 
 #pragma once
 
-#define PASS0R(m_r, m_name) \
-	m_r m_name() { \
+#define PASS0R(m_r, m_name)        \
+	m_r m_name() {                 \
 		return PASSBASE->m_name(); \
 	}
-#define PASS0RC(m_r, m_name) \
-	m_r m_name() const { \
+#define PASS0RC(m_r, m_name)       \
+	m_r m_name() const {           \
 		return PASSBASE->m_name(); \
 	}
-#define PASS1R(m_r, m_name, m_type1) \
-	m_r m_name(m_type1 arg1) { \
+#define PASS1R(m_r, m_name, m_type1)   \
+	m_r m_name(m_type1 arg1) {         \
 		return PASSBASE->m_name(arg1); \
 	}
-#define PASS1RC(m_r, m_name, m_type1) \
-	m_r m_name(m_type1 arg1) const { \
+#define PASS1RC(m_r, m_name, m_type1)  \
+	m_r m_name(m_type1 arg1) const {   \
 		return PASSBASE->m_name(arg1); \
 	}
 #define PASS2R(m_r, m_name, m_type1, m_type2) \
-	m_r m_name(m_type1 arg1, m_type2 arg2) { \
-		return PASSBASE->m_name(arg1, arg2); \
+	m_r m_name(m_type1 arg1, m_type2 arg2) {  \
+		return PASSBASE->m_name(arg1, arg2);  \
 	}
-#define PASS2RC(m_r, m_name, m_type1, m_type2) \
+#define PASS2RC(m_r, m_name, m_type1, m_type2)     \
 	m_r m_name(m_type1 arg1, m_type2 arg2) const { \
-		return PASSBASE->m_name(arg1, arg2); \
+		return PASSBASE->m_name(arg1, arg2);       \
 	}
-#define PASS3R(m_r, m_name, m_type1, m_type2, m_type3) \
+#define PASS3R(m_r, m_name, m_type1, m_type2, m_type3)     \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3) { \
-		return PASSBASE->m_name(arg1, arg2, arg3); \
+		return PASSBASE->m_name(arg1, arg2, arg3);         \
 	}
-#define PASS3RC(m_r, m_name, m_type1, m_type2, m_type3) \
+#define PASS3RC(m_r, m_name, m_type1, m_type2, m_type3)          \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3) const { \
-		return PASSBASE->m_name(arg1, arg2, arg3); \
+		return PASSBASE->m_name(arg1, arg2, arg3);               \
 	}
-#define PASS4R(m_r, m_name, m_type1, m_type2, m_type3, m_type4) \
+#define PASS4R(m_r, m_name, m_type1, m_type2, m_type3, m_type4)          \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4) { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4);                 \
 	}
-#define PASS4RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4) \
+#define PASS4RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4)               \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4) const { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4);                       \
 	}
-#define PASS5R(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5) \
+#define PASS5R(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5)               \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5) { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5);                         \
 	}
-#define PASS5RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5) \
+#define PASS5RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5)                    \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5) const { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5);                               \
 	}
-#define PASS6R(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6) \
+#define PASS6R(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6)                    \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6) { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6);                                 \
 	}
-#define PASS6RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6) \
+#define PASS6RC(m_r, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6)                         \
 	m_r m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6) const { \
-		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6); \
+		return PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6);                                       \
 	}
 
-#define PASS0(m_name) \
-	void m_name() { \
+#define PASS0(m_name)       \
+	void m_name() {         \
 		PASSBASE->m_name(); \
 	}
-#define PASS1(m_name, m_type1) \
+#define PASS1(m_name, m_type1)  \
 	void m_name(m_type1 arg1) { \
 		PASSBASE->m_name(arg1); \
 	}
-#define PASS1C(m_name, m_type1) \
+#define PASS1C(m_name, m_type1)       \
 	void m_name(m_type1 arg1) const { \
-		PASSBASE->m_name(arg1); \
+		PASSBASE->m_name(arg1);       \
 	}
-#define PASS2(m_name, m_type1, m_type2) \
+#define PASS2(m_name, m_type1, m_type2)       \
 	void m_name(m_type1 arg1, m_type2 arg2) { \
-		PASSBASE->m_name(arg1, arg2); \
+		PASSBASE->m_name(arg1, arg2);         \
 	}
-#define PASS2C(m_name, m_type1, m_type2) \
+#define PASS2C(m_name, m_type1, m_type2)            \
 	void m_name(m_type1 arg1, m_type2 arg2) const { \
-		PASSBASE->m_name(arg1, arg2); \
+		PASSBASE->m_name(arg1, arg2);               \
 	}
-#define PASS3(m_name, m_type1, m_type2, m_type3) \
+#define PASS3(m_name, m_type1, m_type2, m_type3)            \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3) { \
-		PASSBASE->m_name(arg1, arg2, arg3); \
+		PASSBASE->m_name(arg1, arg2, arg3);                 \
 	}
-#define PASS4(m_name, m_type1, m_type2, m_type3, m_type4) \
+#define PASS4(m_name, m_type1, m_type2, m_type3, m_type4)                 \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4);                         \
 	}
-#define PASS5(m_name, m_type1, m_type2, m_type3, m_type4, m_type5) \
+#define PASS5(m_name, m_type1, m_type2, m_type3, m_type4, m_type5)                      \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5);                                 \
 	}
-#define PASS6(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6) \
+#define PASS6(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6)                           \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6);                                         \
 	}
-#define PASS7(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7) \
+#define PASS7(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7)                                \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7);                                                 \
 	}
-#define PASS8(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8) \
+#define PASS8(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8)                                     \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);                                                         \
 	}
-#define PASS9(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9) \
+#define PASS9(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9)                                          \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);                                                                 \
 	}
-#define PASS10(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10) \
+#define PASS10(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10)                                               \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);                                                                          \
 	}
-#define PASS11(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11) \
+#define PASS11(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11)                                                     \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);                                                                                   \
 	}
-#define PASS12(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12) \
+#define PASS12(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12)                                                           \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11, m_type12 arg12) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);                                                                                            \
 	}
-#define PASS13(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13) \
+#define PASS13(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13)                                                                 \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11, m_type12 arg12, m_type13 arg13) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);                                                                                                     \
 	}
-#define PASS14(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13, m_type14) \
+#define PASS14(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13, m_type14)                                                                       \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11, m_type12 arg12, m_type13 arg13, m_type14 arg14) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);                                                                                                              \
 	}
-#define PASS15(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13, m_type14, m_type15) \
+#define PASS15(m_name, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6, m_type7, m_type8, m_type9, m_type10, m_type11, m_type12, m_type13, m_type14, m_type15)                                                                             \
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11, m_type12 arg12, m_type13 arg13, m_type14 arg14, m_type15 arg15) { \
-		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15); \
+		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);                                                                                                                       \
 	}
diff --git a/engine/core/templates/rb_map.h b/engine/core/templates/rb_map.h
index 105b5283..7c207928 100644
--- a/engine/core/templates/rb_map.h
+++ b/engine/core/templates/rb_map.h
@@ -757,34 +757,13 @@ public:
 	}
 
 	void operator=(const RBMap &p_map) {
-		if (this == &p_map) {
-			return;
-		}
-
 		_copy_from(p_map);
 	}
 
-	void operator=(RBMap &&p_map) {
-		if (this == &p_map) {
-			return;
-		}
-
-		SWAP(_data._root, p_map._data._root);
-		SWAP(_data.size_cache, p_map._data.size_cache);
-	}
-
-	explicit RBMap(const RBMap &p_map) {
+	RBMap(const RBMap &p_map) {
 		_copy_from(p_map);
 	}
 
-	RBMap(RBMap &&p_map) {
-		_data._root = p_map._data._root;
-		_data.size_cache = p_map._data.size_cache;
-
-		p_map._data._root = nullptr;
-		p_map._data.size_cache = 0;
-	}
-
 	RBMap(std::initializer_list<KeyValue<K, V>> p_init) {
 		for (const KeyValue<K, V> &E : p_init) {
 			insert(E.key, E.value);
diff --git a/engine/core/templates/rb_set.h b/engine/core/templates/rb_set.h
index 98c879cc..e0a3cf54 100644
--- a/engine/core/templates/rb_set.h
+++ b/engine/core/templates/rb_set.h
@@ -694,34 +694,13 @@ public:
 	}
 
 	void operator=(const RBSet &p_set) {
-		if (this == &p_set) {
-			return;
-		}
-
 		_copy_from(p_set);
 	}
 
-	void operator=(RBSet &&p_set) {
-		if (this == &p_set) {
-			return;
-		}
-
-		SWAP(_data._root, p_set._data._root);
-		SWAP(_data.size_cache, p_set._data.size_cache);
-	}
-
-	explicit RBSet(const RBSet &p_set) {
+	RBSet(const RBSet &p_set) {
 		_copy_from(p_set);
 	}
 
-	RBSet(RBSet &&p_set) {
-		_data._root = p_set._data._root;
-		_data.size_cache = p_set._data.size_cache;
-
-		p_set._data._root = nullptr;
-		p_set._data.size_cache = 0;
-	}
-
 	RBSet(std::initializer_list<T> p_init) {
 		for (const T &E : p_init) {
 			insert(E);
diff --git a/engine/core/templates/rid_owner.h b/engine/core/templates/rid_owner.h
index f97a905b..c5e2b058 100644
--- a/engine/core/templates/rid_owner.h
+++ b/engine/core/templates/rid_owner.h
@@ -40,6 +40,16 @@
 #include <cstdio>
 #include <typeinfo> // IWYU pragma: keep // Used in macro.
 
+#ifdef SANITIZERS_ENABLED
+#ifdef __has_feature
+#if __has_feature(thread_sanitizer)
+#define TSAN_ENABLED
+#endif
+#elif defined(__SANITIZE_THREAD__)
+#define TSAN_ENABLED
+#endif
+#endif
+
 #ifdef TSAN_ENABLED
 #include <sanitizer/tsan_interface.h>
 #endif
diff --git a/engine/core/templates/safe_refcount.h b/engine/core/templates/safe_refcount.h
index df243409..4173f756 100644
--- a/engine/core/templates/safe_refcount.h
+++ b/engine/core/templates/safe_refcount.h
@@ -50,11 +50,11 @@
 //   even with threads that are already running.
 
 // These are used in very specific areas of the engine where it's critical that these guarantees are held
-#define SAFE_NUMERIC_TYPE_PUN_GUARANTEES(m_type) \
-	static_assert(sizeof(SafeNumeric<m_type>) == sizeof(m_type)); \
+#define SAFE_NUMERIC_TYPE_PUN_GUARANTEES(m_type)                    \
+	static_assert(sizeof(SafeNumeric<m_type>) == sizeof(m_type));   \
 	static_assert(alignof(SafeNumeric<m_type>) == alignof(m_type)); \
 	static_assert(std::is_trivially_destructible_v<std::atomic<m_type>>);
-#define SAFE_FLAG_TYPE_PUN_GUARANTEES \
+#define SAFE_FLAG_TYPE_PUN_GUARANTEES                \
 	static_assert(sizeof(SafeFlag) == sizeof(bool)); \
 	static_assert(alignof(SafeFlag) == alignof(bool));
 
diff --git a/engine/core/templates/sort_array.h b/engine/core/templates/sort_array.h
index 8ccc96c1..9bfee299 100644
--- a/engine/core/templates/sort_array.h
+++ b/engine/core/templates/sort_array.h
@@ -33,10 +33,10 @@
 #include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
-#define ERR_BAD_COMPARE(cond) \
-	if (unlikely(cond)) { \
+#define ERR_BAD_COMPARE(cond)                                         \
+	if (unlikely(cond)) {                                             \
 		ERR_PRINT("bad comparison function; sorting will be broken"); \
-		break; \
+		break;                                                        \
 	}
 
 #ifdef DEBUG_ENABLED
diff --git a/engine/core/templates/span.h b/engine/core/templates/span.h
index ad3bb479..f61eb74a 100644
--- a/engine/core/templates/span.h
+++ b/engine/core/templates/span.h
@@ -38,9 +38,7 @@ bool are_spans_equal(const LHS *p_lhs, const RHS *p_rhs, size_t p_size) {
 	if constexpr (std::is_same_v<LHS, RHS> && std::is_fundamental_v<LHS>) {
 		// Optimize trivial type comparison.
 		// is_trivially_equality_comparable would help, but it doesn't exist.
-		// memcmp requires pointer argument to be valid even on size = 0 (C11 §7.24.1(2)).
-		// Span allows ptr arguments to be invalid as long as size = 0, so only call when p_size > 0.
-		return p_size == 0 || memcmp(p_lhs, p_rhs, p_size * sizeof(LHS)) == 0;
+		return memcmp(p_lhs, p_rhs, p_size * sizeof(LHS)) == 0;
 	} else {
 		// Normal case: Need to iterate the array manually.
 		for (size_t j = 0; j < p_size; j++) {
diff --git a/engine/core/typedefs.h b/engine/core/typedefs.h
index ab7f873d..0928f8aa 100644
--- a/engine/core/typedefs.h
+++ b/engine/core/typedefs.h
@@ -56,32 +56,6 @@ static_assert(__cplusplus >= 201703L, "Minimum of C++17 required.");
 
 // IWYU pragma: end_exports
 
-#if defined(__has_feature)
-#define GD_HAS_FEATURE(m_feature) __has_feature(m_feature)
-#else
-#define GD_HAS_FEATURE(m_feature) 0
-#endif
-
-#if (GD_HAS_FEATURE(address_sanitizer) || defined(__SANITIZE_ADDRESS__)) && !defined(ASAN_ENABLED)
-#error Address sanitizer was enabled without defining `ASAN_ENABLED`
-#endif
-
-#if (GD_HAS_FEATURE(leak_sanitizer) || defined(__SANITIZE_LEAKS__)) && !defined(LSAN_ENABLED)
-#error Leak sanitizer was enabled without defining `LSAN_ENABLED`
-#endif
-
-#if (GD_HAS_FEATURE(memory_sanitizer) || defined(__SANITIZE_MEMORY__)) && !defined(MSAN_ENABLED)
-#error Memory sanitizer was enabled without defining `MSAN_ENABLED`
-#endif
-
-#if (GD_HAS_FEATURE(thread_sanitizer) || defined(__SANITIZE_THREAD__)) && !defined(TSAN_ENABLED)
-#error Thread sanitizer was enabled without defining `TSAN_ENABLED`
-#endif
-
-#if (GD_HAS_FEATURE(undefined_behavior_sanitizer) || defined(__UNDEFINED_SANITIZER__)) && !defined(UBSAN_ENABLED)
-#error Undefined behavior sanitizer was enabled without defining `UBSAN_ENABLED`
-#endif
-
 // Turn argument to string constant:
 // https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html#Stringizing
 #ifndef _STR
@@ -127,6 +101,19 @@ static_assert(__cplusplus >= 201703L, "Minimum of C++17 required.");
 #define _ALLOW_DISCARD_ (void)
 #endif
 
+// Windows badly defines a lot of stuff we'll never use. Undefine it.
+#ifdef _WIN32
+#undef min // override standard definition
+#undef max // override standard definition
+#undef ERROR // override (really stupid) wingdi.h standard definition
+#undef DELETE // override (another really stupid) winnt.h standard definition
+#undef MessageBox // override winuser.h standard definition
+#undef Error
+#undef OK
+#undef CONNECT_DEFERRED // override from Windows SDK, clashes with Object enum
+#undef MONO_FONT
+#endif
+
 // Make room for our constexpr's below by overriding potential system-specific macros.
 #undef SIGN
 #undef MIN
@@ -153,16 +140,167 @@ constexpr auto CLAMP(const T m_a, const T2 m_min, const T3 m_max) {
 	return m_a < m_min ? m_min : (m_a > m_max ? m_max : m_a);
 }
 
+// Generic swap template.
+#ifndef SWAP
+#define SWAP(m_x, m_y) std::swap((m_x), (m_y))
+#endif // SWAP
+
 // Like std::size, but without requiring any additional includes.
 template <typename T, size_t SIZE>
 constexpr size_t std_size(const T (&)[SIZE]) {
 	return SIZE;
 }
 
-// Generic swap template.
-#ifndef SWAP
-#define SWAP(m_x, m_y) std::swap((m_x), (m_y))
-#endif // SWAP
+/* Functions to handle powers of 2 and shifting. */
+
+// Returns `true` if a positive integer is a power of 2, `false` otherwise.
+template <typename T>
+inline bool is_power_of_2(const T x) {
+	return x && ((x & (x - 1)) == 0);
+}
+
+// Function to find the next power of 2 to an integer.
+constexpr uint64_t next_power_of_2(uint64_t p_number) {
+	if (p_number == 0) {
+		return 0;
+	}
+
+	--p_number;
+	p_number |= p_number >> 1;
+	p_number |= p_number >> 2;
+	p_number |= p_number >> 4;
+	p_number |= p_number >> 8;
+	p_number |= p_number >> 16;
+	p_number |= p_number >> 32;
+
+	return ++p_number;
+}
+
+constexpr uint32_t next_power_of_2(uint32_t p_number) {
+	if (p_number == 0) {
+		return 0;
+	}
+
+	--p_number;
+	p_number |= p_number >> 1;
+	p_number |= p_number >> 2;
+	p_number |= p_number >> 4;
+	p_number |= p_number >> 8;
+	p_number |= p_number >> 16;
+
+	return ++p_number;
+}
+
+// Function to find the previous power of 2 to an integer.
+constexpr uint64_t previous_power_of_2(uint64_t p_number) {
+	p_number |= p_number >> 1;
+	p_number |= p_number >> 2;
+	p_number |= p_number >> 4;
+	p_number |= p_number >> 8;
+	p_number |= p_number >> 16;
+	p_number |= p_number >> 32;
+	return p_number - (p_number >> 1);
+}
+
+constexpr uint32_t previous_power_of_2(uint32_t p_number) {
+	p_number |= p_number >> 1;
+	p_number |= p_number >> 2;
+	p_number |= p_number >> 4;
+	p_number |= p_number >> 8;
+	p_number |= p_number >> 16;
+	return p_number - (p_number >> 1);
+}
+
+// Function to find the closest power of 2 to an integer.
+constexpr uint64_t closest_power_of_2(uint64_t p_number) {
+	uint64_t nx = next_power_of_2(p_number);
+	uint64_t px = previous_power_of_2(p_number);
+	return (nx - p_number) > (p_number - px) ? px : nx;
+}
+
+constexpr uint32_t closest_power_of_2(uint32_t p_number) {
+	uint32_t nx = next_power_of_2(p_number);
+	uint32_t px = previous_power_of_2(p_number);
+	return (nx - p_number) > (p_number - px) ? px : nx;
+}
+
+// Get a shift value from a power of 2.
+constexpr int32_t get_shift_from_power_of_2(uint64_t p_bits) {
+	for (uint64_t i = 0; i < (uint64_t)64; i++) {
+		if (p_bits == (uint64_t)((uint64_t)1 << i)) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+constexpr int32_t get_shift_from_power_of_2(uint32_t p_bits) {
+	for (uint32_t i = 0; i < (uint32_t)32; i++) {
+		if (p_bits == (uint32_t)((uint32_t)1 << i)) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+template <typename T>
+static _FORCE_INLINE_ T nearest_power_of_2_templated(T p_number) {
+	--p_number;
+
+	// The number of operations on x is the base two logarithm
+	// of the number of bits in the type. Add three to account
+	// for sizeof(T) being in bytes.
+	constexpr size_t shift_steps = get_shift_from_power_of_2((uint64_t)sizeof(T)) + 3;
+
+	// If the compiler is smart, it unrolls this loop.
+	// If it's dumb, this is a bit slow.
+	for (size_t i = 0; i < shift_steps; i++) {
+		p_number |= p_number >> (1 << i);
+	}
+
+	return ++p_number;
+}
+
+// Function to find the nearest (bigger) power of 2 to an integer.
+constexpr uint64_t nearest_shift(uint64_t p_number) {
+	uint64_t i = 63;
+	do {
+		i--;
+		if (p_number & ((uint64_t)1 << i)) {
+			return i + (uint64_t)1;
+		}
+	} while (i != 0);
+
+	return 0;
+}
+
+constexpr uint32_t nearest_shift(uint32_t p_number) {
+	uint32_t i = 31;
+	do {
+		i--;
+		if (p_number & ((uint32_t)1 << i)) {
+			return i + (uint32_t)1;
+		}
+	} while (i != 0);
+
+	return 0;
+}
+
+// constexpr function to find the floored log2 of a number
+template <typename T>
+constexpr T floor_log2(T x) {
+	return x < 2 ? x : 1 + floor_log2(x >> 1);
+}
+
+// Get the number of bits needed to represent the number.
+// IE, if you pass in 8, you will get 4.
+// If you want to know how many bits are needed to store 8 values however, pass in (8 - 1).
+template <typename T>
+constexpr T get_num_bits(T x) {
+	return floor_log2(x);
+}
 
 // Swap 16, 32 and 64 bits value for endianness.
 #if defined(__GNUC__)
@@ -323,7 +461,7 @@ constexpr bool is_fully_defined_v = is_fully_defined<T>::value;
 /// This can be used to reduce include coupling and keep compile times low.
 /// The check must be made at the top of the corresponding .cpp file of a header.
 #define STATIC_ASSERT_INCOMPLETE_TYPE(m_keyword, m_type) \
-	m_keyword m_type; \
+	m_keyword m_type;                                    \
 	static_assert(!is_fully_defined_v<m_type>, #m_type " was unexpectedly fully defined. Please check the include hierarchy of '" __FILE__ "' and remove includes that resolve the " #m_keyword ".");
 #else
 #define STATIC_ASSERT_INCOMPLETE_TYPE(m_keyword, m_type)
diff --git a/engine/core/variant/array.cpp b/engine/core/variant/array.cpp
index 111241a1..56354107 100644
--- a/engine/core/variant/array.cpp
+++ b/engine/core/variant/array.cpp
@@ -34,12 +34,12 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, String);
 
+#include "container_type_validate.h"
 #include "core/math/math_funcs.h"
 #include "core/object/script_language.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/vector.h"
 #include "core/variant/callable.h"
-#include "core/variant/container_type_validate.h"
 #include "core/variant/dictionary.h"
 
 struct ArrayPrivate {
diff --git a/engine/core/variant/binder_common.h b/engine/core/variant/binder_common.h
index 1a1e0148..ab488986 100644
--- a/engine/core/variant/binder_common.h
+++ b/engine/core/variant/binder_common.h
@@ -30,16 +30,106 @@
 
 #pragma once
 
+#include "core/input/input_enums.h"
+#include "core/object/object.h"
+#include "core/os/keyboard.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
 #include "core/variant/method_ptrcall.h"
 #include "core/variant/type_info.h"
 #include "core/variant/variant.h"
-#include "core/variant/variant_caster.h"
 #include "core/variant/variant_internal.h"
 
 #include <cstdio>
 
+// Variant cannot define an implicit cast operator for every Object subclass, so the
+// casting is done here, to allow binding methods with parameters more specific than Object *
+
+template <typename T>
+struct VariantCaster {
+	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
+		using TStripped = std::remove_pointer_t<T>;
+		if constexpr (std::is_base_of_v<Object, TStripped>) {
+			return Object::cast_to<TStripped>(p_variant);
+		} else {
+			return p_variant;
+		}
+	}
+};
+
+template <typename T>
+struct VariantCaster<T &> {
+	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
+		using TStripped = std::remove_pointer_t<T>;
+		if constexpr (std::is_base_of_v<Object, TStripped>) {
+			return Object::cast_to<TStripped>(p_variant);
+		} else {
+			return p_variant;
+		}
+	}
+};
+
+template <typename T>
+struct VariantCaster<const T &> {
+	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
+		using TStripped = std::remove_pointer_t<T>;
+		if constexpr (std::is_base_of_v<Object, TStripped>) {
+			return Object::cast_to<TStripped>(p_variant);
+		} else {
+			return p_variant;
+		}
+	}
+};
+
+#define VARIANT_ENUM_CAST(m_enum) MAKE_ENUM_TYPE_INFO(m_enum)
+#define VARIANT_BITFIELD_CAST(m_enum) MAKE_BITFIELD_TYPE_INFO(m_enum)
+
+// Object enum casts must go here
+VARIANT_ENUM_CAST(Object::ConnectFlags);
+
+VARIANT_ENUM_CAST(Vector2::Axis);
+VARIANT_ENUM_CAST(Vector2i::Axis);
+VARIANT_ENUM_CAST(Vector3::Axis);
+VARIANT_ENUM_CAST(Vector3i::Axis);
+VARIANT_ENUM_CAST(Vector4::Axis);
+VARIANT_ENUM_CAST(Vector4i::Axis);
+VARIANT_ENUM_CAST(EulerOrder);
+VARIANT_ENUM_CAST(Projection::Planes);
+
+VARIANT_ENUM_CAST(Error);
+VARIANT_ENUM_CAST(Side);
+VARIANT_ENUM_CAST(ClockDirection);
+VARIANT_ENUM_CAST(Corner);
+VARIANT_ENUM_CAST(HatDir);
+VARIANT_BITFIELD_CAST(HatMask);
+VARIANT_ENUM_CAST(JoyAxis);
+VARIANT_ENUM_CAST(JoyButton);
+
+VARIANT_ENUM_CAST(MIDIMessage);
+VARIANT_ENUM_CAST(MouseButton);
+VARIANT_BITFIELD_CAST(MouseButtonMask);
+VARIANT_ENUM_CAST(Orientation);
+VARIANT_ENUM_CAST(HorizontalAlignment);
+VARIANT_ENUM_CAST(VerticalAlignment);
+VARIANT_ENUM_CAST(InlineAlignment);
+VARIANT_ENUM_CAST(PropertyHint);
+VARIANT_BITFIELD_CAST(PropertyUsageFlags);
+VARIANT_ENUM_CAST(Variant::Type);
+VARIANT_ENUM_CAST(Variant::Operator);
+
+// Key
+
+VARIANT_ENUM_CAST(Key);
+VARIANT_BITFIELD_CAST(KeyModifierMask);
+VARIANT_ENUM_CAST(KeyLocation);
+
+template <>
+struct VariantCaster<char32_t> {
+	static _FORCE_INLINE_ char32_t cast(const Variant &p_variant) {
+		return (char32_t)p_variant.operator int();
+	}
+};
+
 template <>
 struct PtrToArg<char32_t> {
 	_FORCE_INLINE_ static char32_t convert(const void *p_ptr) {
@@ -51,6 +141,80 @@ struct PtrToArg<char32_t> {
 	}
 };
 
+template <typename T>
+struct VariantObjectClassChecker {
+	static _FORCE_INLINE_ bool check(const Variant &p_variant) {
+		using TStripped = std::remove_pointer_t<T>;
+		if constexpr (std::is_base_of_v<Object, TStripped>) {
+			Object *obj = p_variant;
+			return Object::cast_to<TStripped>(p_variant) || !obj;
+		} else {
+			return true;
+		}
+	}
+};
+
+template <typename T>
+class Ref;
+
+template <typename T>
+struct VariantObjectClassChecker<const Ref<T> &> {
+	static _FORCE_INLINE_ bool check(const Variant &p_variant) {
+		Object *obj = p_variant;
+		const Ref<T> node = p_variant;
+		return node.ptr() || !obj;
+	}
+};
+
+#ifdef DEBUG_ENABLED
+
+template <typename T>
+struct VariantCasterAndValidate {
+	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
+		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
+		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
+				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			r_error.argument = p_arg_idx;
+			r_error.expected = argtype;
+		}
+
+		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
+	}
+};
+
+template <typename T>
+struct VariantCasterAndValidate<T &> {
+	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
+		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
+		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
+				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			r_error.argument = p_arg_idx;
+			r_error.expected = argtype;
+		}
+
+		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
+	}
+};
+
+template <typename T>
+struct VariantCasterAndValidate<const T &> {
+	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
+		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
+		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
+				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			r_error.argument = p_arg_idx;
+			r_error.expected = argtype;
+		}
+
+		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
+	}
+};
+
+#endif // DEBUG_ENABLED
+
 template <typename T, typename... P, size_t... Is>
 void call_with_variant_args_helper(T *p_instance, void (T::*p_method)(P...), const Variant **p_args, Callable::CallError &r_error, IndexSequence<Is...>) {
 	r_error.error = Callable::CallError::CALL_OK;
diff --git a/engine/core/variant/callable.cpp b/engine/core/variant/callable.cpp
index 0594b6cc..0603ea27 100644
--- a/engine/core/variant/callable.cpp
+++ b/engine/core/variant/callable.cpp
@@ -30,7 +30,6 @@
 
 #include "callable.h"
 
-#include "core/object/message_queue.h"
 #include "core/object/object.h"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
@@ -306,7 +305,7 @@ bool Callable::operator<(const Callable &p_callable) const {
 			if (less_a == less_b) {
 				return less_a(custom, p_callable.custom);
 			} else {
-				return (uintptr_t)less_a < (uintptr_t)less_b; //it's something..
+				return less_a < less_b; //it's something..
 			}
 
 		} else {
diff --git a/engine/core/variant/container_type_validate.h b/engine/core/variant/container_type_validate.h
index e76d1724..369205dd 100644
--- a/engine/core/variant/container_type_validate.h
+++ b/engine/core/variant/container_type_validate.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/variant/variant.h"
 
diff --git a/engine/core/variant/dictionary.cpp b/engine/core/variant/dictionary.cpp
index 9ca4ba2a..b9ab0324 100644
--- a/engine/core/variant/dictionary.cpp
+++ b/engine/core/variant/dictionary.cpp
@@ -38,6 +38,10 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, String);
 #include "core/templates/safe_refcount.h"
 #include "core/variant/container_type_validate.h"
 #include "core/variant/variant.h"
+// required in this order by VariantInternal, do not remove this comment.
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/type_info.h"
 #include "core/variant/variant_internal.h"
 
 struct DictionaryPrivate {
diff --git a/engine/core/variant/method_ptrcall.h b/engine/core/variant/method_ptrcall.h
index 3aa15e30..c108e1a2 100644
--- a/engine/core/variant/method_ptrcall.h
+++ b/engine/core/variant/method_ptrcall.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/object.h"
 #include "core/object/object_id.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
@@ -270,32 +269,9 @@ struct PtrToArg<const T *> {
 	}
 };
 
-// This is for Ref.
-
-template <typename T>
-struct PtrToArg<Ref<T>> {
-	_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
-		if (p_ptr == nullptr) {
-			return Ref<T>();
-		}
-		// p_ptr points to a RefCounted object
-		return Ref<T>(*reinterpret_cast<T *const *>(p_ptr));
-	}
-
-	typedef Ref<T> EncodeT;
-
-	_FORCE_INLINE_ static void encode(Ref<T> p_val, const void *p_ptr) {
-		// p_ptr points to an EncodeT object which is a Ref<T> object.
-		*(const_cast<Ref<T> *>(reinterpret_cast<const Ref<T> *>(p_ptr))) = p_val;
-	}
-};
-
 // This is for RequiredParam.
 
-template <typename T>
-class RequiredParam;
-
-template <typename T>
+template <class T>
 struct PtrToArg<RequiredParam<T>> {
 	typedef typename RequiredParam<T>::persistent_type EncodeT;
 
@@ -313,10 +289,7 @@ struct PtrToArg<RequiredParam<T>> {
 
 // This is for RequiredResult.
 
-template <typename T>
-class RequiredResult;
-
-template <typename T>
+template <class T>
 struct PtrToArg<RequiredResult<T>> {
 	typedef typename RequiredResult<T>::ptr_type EncodeT;
 
diff --git a/engine/core/variant/native_ptr.h b/engine/core/variant/native_ptr.h
index 59ee6ef4..a0715e28 100644
--- a/engine/core/variant/native_ptr.h
+++ b/engine/core/variant/native_ptr.h
@@ -31,10 +31,9 @@
 #pragma once
 
 #include "core/math/audio_frame.h"
+#include "core/variant/binder_common.h"
 #include "core/variant/method_ptrcall.h"
 #include "core/variant/type_info.h"
-#include "core/variant/variant_caster.h"
-#include "core/variant/variant_internal.h"
 
 template <typename T>
 struct GDExtensionConstPtr {
@@ -54,70 +53,70 @@ struct GDExtensionPtr {
 	operator Variant() const { return uint64_t(data); }
 };
 
-#define GDVIRTUAL_NATIVE_PTR(m_type) \
-	template <> \
-	struct GDExtensionConstPtr<const m_type> { \
-		const m_type *data = nullptr; \
-		GDExtensionConstPtr() {} \
-		GDExtensionConstPtr(const m_type *p_assign) { \
-			data = p_assign; \
-		} \
-		static const char *get_name() { \
-			return "const " #m_type; \
-		} \
-		operator const m_type *() const { \
-			return data; \
-		} \
-		operator Variant() const { \
-			return uint64_t(data); \
-		} \
-	}; \
-	template <> \
-	struct VariantCaster<GDExtensionConstPtr<const m_type>> { \
-		static _FORCE_INLINE_ GDExtensionConstPtr<const m_type> cast(const Variant &p_variant) { \
-			return GDExtensionConstPtr<const m_type>((const m_type *)p_variant.operator uint64_t()); \
-		} \
-	}; \
-	template <> \
-	struct VariantInternalAccessor<GDExtensionConstPtr<const m_type>> { \
-		static _FORCE_INLINE_ const GDExtensionConstPtr<const m_type> &get(const Variant *v) { \
+#define GDVIRTUAL_NATIVE_PTR(m_type)                                                                          \
+	template <>                                                                                               \
+	struct GDExtensionConstPtr<const m_type> {                                                                \
+		const m_type *data = nullptr;                                                                         \
+		GDExtensionConstPtr() {}                                                                              \
+		GDExtensionConstPtr(const m_type *p_assign) {                                                         \
+			data = p_assign;                                                                                  \
+		}                                                                                                     \
+		static const char *get_name() {                                                                       \
+			return "const " #m_type;                                                                          \
+		}                                                                                                     \
+		operator const m_type *() const {                                                                     \
+			return data;                                                                                      \
+		}                                                                                                     \
+		operator Variant() const {                                                                            \
+			return uint64_t(data);                                                                            \
+		}                                                                                                     \
+	};                                                                                                        \
+	template <>                                                                                               \
+	struct VariantCaster<GDExtensionConstPtr<const m_type>> {                                                 \
+		static _FORCE_INLINE_ GDExtensionConstPtr<const m_type> cast(const Variant &p_variant) {              \
+			return GDExtensionConstPtr<const m_type>((const m_type *)p_variant.operator uint64_t());          \
+		}                                                                                                     \
+	};                                                                                                        \
+	template <>                                                                                               \
+	struct VariantInternalAccessor<GDExtensionConstPtr<const m_type>> {                                       \
+		static _FORCE_INLINE_ const GDExtensionConstPtr<const m_type> &get(const Variant *v) {                \
 			return *reinterpret_cast<const GDExtensionConstPtr<const m_type> *>(VariantInternal::get_int(v)); \
-		} \
-		static _FORCE_INLINE_ void set(Variant *v, const GDExtensionConstPtr<const m_type> &p_value) { \
-			*VariantInternal::get_int(v) = uint64_t(p_value.data); \
-		} \
-	}; \
-	template <> \
-	struct GDExtensionPtr<m_type> { \
-		m_type *data = nullptr; \
-		GDExtensionPtr() {} \
-		GDExtensionPtr(m_type *p_assign) { \
-			data = p_assign; \
-		} \
-		static const char *get_name() { \
-			return #m_type; \
-		} \
-		operator m_type *() const { \
-			return data; \
-		} \
-		operator Variant() const { \
-			return uint64_t(data); \
-		} \
-	}; \
-	template <> \
-	struct VariantCaster<GDExtensionPtr<m_type>> { \
-		static _FORCE_INLINE_ GDExtensionPtr<m_type> cast(const Variant &p_variant) { \
-			return GDExtensionPtr<m_type>((m_type *)p_variant.operator uint64_t()); \
-		} \
-	}; \
-	template <> \
-	struct VariantInternalAccessor<GDExtensionPtr<m_type>> { \
-		static _FORCE_INLINE_ const GDExtensionPtr<m_type> &get(const Variant *v) { \
-			return *reinterpret_cast<const GDExtensionPtr<m_type> *>(VariantInternal::get_int(v)); \
-		} \
-		static _FORCE_INLINE_ void set(Variant *v, const GDExtensionPtr<m_type> &p_value) { \
-			*VariantInternal::get_int(v) = uint64_t(p_value.data); \
-		} \
+		}                                                                                                     \
+		static _FORCE_INLINE_ void set(Variant *v, const GDExtensionConstPtr<const m_type> &p_value) {        \
+			*VariantInternal::get_int(v) = uint64_t(p_value.data);                                            \
+		}                                                                                                     \
+	};                                                                                                        \
+	template <>                                                                                               \
+	struct GDExtensionPtr<m_type> {                                                                           \
+		m_type *data = nullptr;                                                                               \
+		GDExtensionPtr() {}                                                                                   \
+		GDExtensionPtr(m_type *p_assign) {                                                                    \
+			data = p_assign;                                                                                  \
+		}                                                                                                     \
+		static const char *get_name() {                                                                       \
+			return #m_type;                                                                                   \
+		}                                                                                                     \
+		operator m_type *() const {                                                                           \
+			return data;                                                                                      \
+		}                                                                                                     \
+		operator Variant() const {                                                                            \
+			return uint64_t(data);                                                                            \
+		}                                                                                                     \
+	};                                                                                                        \
+	template <>                                                                                               \
+	struct VariantCaster<GDExtensionPtr<m_type>> {                                                            \
+		static _FORCE_INLINE_ GDExtensionPtr<m_type> cast(const Variant &p_variant) {                         \
+			return GDExtensionPtr<m_type>((m_type *)p_variant.operator uint64_t());                           \
+		}                                                                                                     \
+	};                                                                                                        \
+	template <>                                                                                               \
+	struct VariantInternalAccessor<GDExtensionPtr<m_type>> {                                                  \
+		static _FORCE_INLINE_ const GDExtensionPtr<m_type> &get(const Variant *v) {                           \
+			return *reinterpret_cast<const GDExtensionPtr<m_type> *>(VariantInternal::get_int(v));            \
+		}                                                                                                     \
+		static _FORCE_INLINE_ void set(Variant *v, const GDExtensionPtr<m_type> &p_value) {                   \
+			*VariantInternal::get_int(v) = uint64_t(p_value.data);                                            \
+		}                                                                                                     \
 	};
 
 template <typename T>
diff --git a/engine/core/variant/type_info.h b/engine/core/variant/type_info.h
index ba254e9d..f137ee23 100644
--- a/engine/core/variant/type_info.h
+++ b/engine/core/variant/type_info.h
@@ -67,24 +67,24 @@ struct GetTypeInfo;
 template <typename T>
 struct GetTypeInfo<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : GetTypeInfo<GetSimpleTypeT<T>> {};
 
-#define MAKE_TYPE_INFO(m_type, m_var_type) \
-	template <> \
-	struct GetTypeInfo<m_type> { \
-		static const Variant::Type VARIANT_TYPE = m_var_type; \
+#define MAKE_TYPE_INFO(m_type, m_var_type)                                            \
+	template <>                                                                       \
+	struct GetTypeInfo<m_type> {                                                      \
+		static const Variant::Type VARIANT_TYPE = m_var_type;                         \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() { \
-			return PropertyInfo(VARIANT_TYPE, String()); \
-		} \
+		static inline PropertyInfo get_class_info() {                                 \
+			return PropertyInfo(VARIANT_TYPE, String());                              \
+		}                                                                             \
 	};
 
-#define MAKE_TYPE_INFO_WITH_META(m_type, m_var_type, m_metadata) \
-	template <> \
-	struct GetTypeInfo<m_type> { \
-		static const Variant::Type VARIANT_TYPE = m_var_type; \
+#define MAKE_TYPE_INFO_WITH_META(m_type, m_var_type, m_metadata)    \
+	template <>                                                     \
+	struct GetTypeInfo<m_type> {                                    \
+		static const Variant::Type VARIANT_TYPE = m_var_type;       \
 		static const GodotTypeInfo::Metadata METADATA = m_metadata; \
-		static inline PropertyInfo get_class_info() { \
-			return PropertyInfo(VARIANT_TYPE, String()); \
-		} \
+		static inline PropertyInfo get_class_info() {               \
+			return PropertyInfo(VARIANT_TYPE, String());            \
+		}                                                           \
 	};
 
 MAKE_TYPE_INFO(bool, Variant::BOOL)
@@ -158,14 +158,14 @@ struct GetTypeInfo<Variant> {
 	}
 };
 
-#define MAKE_TEMPLATE_TYPE_INFO(m_template, m_type, m_var_type) \
-	template <> \
-	struct GetTypeInfo<m_template<m_type>> { \
-		static const Variant::Type VARIANT_TYPE = m_var_type; \
+#define MAKE_TEMPLATE_TYPE_INFO(m_template, m_type, m_var_type)                       \
+	template <>                                                                       \
+	struct GetTypeInfo<m_template<m_type>> {                                          \
+		static const Variant::Type VARIANT_TYPE = m_var_type;                         \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() { \
-			return PropertyInfo(VARIANT_TYPE, String()); \
-		} \
+		static inline PropertyInfo get_class_info() {                                 \
+			return PropertyInfo(VARIANT_TYPE, String());                              \
+		}                                                                             \
 	};
 
 MAKE_TEMPLATE_TYPE_INFO(Vector, Variant, Variant::ARRAY)
@@ -183,20 +183,10 @@ struct GetTypeInfo<T *, std::enable_if_t<std::is_base_of_v<Object, T>>> {
 	}
 };
 
-template <typename T>
-struct GetTypeInfo<Ref<T>> {
-	static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
-	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
-
-	static inline PropertyInfo get_class_info() {
-		return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, T::get_class_static());
-	}
-};
-
-template <typename T>
+template <class T>
 class RequiredParam;
 
-template <typename T>
+template <class T>
 class RequiredResult;
 
 template <typename T>
@@ -244,15 +234,15 @@ inline String enum_qualified_name_to_class_info_name(const String &p_qualified_n
 } // namespace Internal
 } // namespace GodotTypeInfo
 
-#define MAKE_ENUM_TYPE_INFO(m_enum, m_bound_name) \
-	template <> \
-	struct GetTypeInfo<m_enum> { \
-		static const Variant::Type VARIANT_TYPE = Variant::INT; \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() { \
+#define MAKE_ENUM_TYPE_INFO(m_enum)                                                                                                          \
+	template <>                                                                                                                              \
+	struct GetTypeInfo<m_enum> {                                                                                                             \
+		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                              \
+		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                        \
+		static inline PropertyInfo get_class_info() {                                                                                        \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_ENUM, \
-					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_bound_name))); \
-		} \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                       \
+		}                                                                                                                                    \
 	};
 
 template <typename T>
@@ -260,28 +250,24 @@ inline StringName __constant_get_enum_name(T param) {
 	return GetTypeInfo<T>::get_class_info().class_name;
 }
 
-inline StringName __constant_get_enum_value_name(const char *p_name) {
-	return String(p_name).get_slice("::", 1);
-}
-
-#define MAKE_BITFIELD_TYPE_INFO(m_enum, m_bound_name) \
-	template <> \
-	struct GetTypeInfo<m_enum> { \
-		static const Variant::Type VARIANT_TYPE = Variant::INT; \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() { \
+#define MAKE_BITFIELD_TYPE_INFO(m_enum)                                                                                                          \
+	template <>                                                                                                                                  \
+	struct GetTypeInfo<m_enum> {                                                                                                                 \
+		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                                  \
+		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                            \
+		static inline PropertyInfo get_class_info() {                                                                                            \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \
-					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_bound_name))); \
-		} \
-	}; \
-	template <> \
-	struct GetTypeInfo<BitField<m_enum>> { \
-		static const Variant::Type VARIANT_TYPE = Variant::INT; \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() { \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                           \
+		}                                                                                                                                        \
+	};                                                                                                                                           \
+	template <>                                                                                                                                  \
+	struct GetTypeInfo<BitField<m_enum>> {                                                                                                       \
+		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                                  \
+		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                            \
+		static inline PropertyInfo get_class_info() {                                                                                            \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \
-					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_bound_name))); \
-		} \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                           \
+		}                                                                                                                                        \
 	};
 
 template <typename T>
@@ -290,13 +276,6 @@ inline StringName __constant_get_bitfield_name(T param) {
 }
 #define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())
 
-#define VARIANT_ENUM_CAST(m_enum) MAKE_ENUM_TYPE_INFO(m_enum, m_enum)
-#define VARIANT_BITFIELD_CAST(m_enum) MAKE_BITFIELD_TYPE_INFO(m_enum, m_enum)
-
-// Use only for backwards compatibility when the location of an enum changes.
-#define VARIANT_ENUM_CAST_EXT(m_enum, m_bound_name) MAKE_ENUM_TYPE_INFO(m_enum, m_bound_name)
-#define VARIANT_BITFIELD_CAST_EXT(m_enum, m_bound_name) MAKE_BITFIELD_TYPE_INFO(m_enum, m_bound_name)
-
 // No initialization by default, except for scalar types.
 template <typename T>
 struct ZeroInitializer {
diff --git a/engine/core/variant/variant.cpp b/engine/core/variant/variant.cpp
index d8b503ca..2b05c84c 100644
--- a/engine/core/variant/variant.cpp
+++ b/engine/core/variant/variant.cpp
@@ -35,7 +35,10 @@
 #include "core/io/resource.h"
 #include "core/math/math_funcs.h"
 #include "core/variant/variant_parser.h"
-#include "core/variant/variant_pools.h"
+
+PagedAllocator<Variant::Pools::BucketSmall, true> Variant::Pools::_bucket_small;
+PagedAllocator<Variant::Pools::BucketMedium, true> Variant::Pools::_bucket_medium;
+PagedAllocator<Variant::Pools::BucketLarge, true> Variant::Pools::_bucket_large;
 
 String Variant::get_type_name(Variant::Type p_type) {
 	switch (p_type) {
@@ -865,6 +868,17 @@ bool Variant::operator==(const Variant &p_variant) const {
 	return hash_compare(p_variant);
 }
 
+bool Variant::operator!=(const Variant &p_variant) const {
+	// Don't use `!hash_compare(p_variant)` given it makes use of OP_EQUAL
+	if (type != p_variant.type) { //evaluation of operator== needs to be more strict
+		return true;
+	}
+	bool v;
+	Variant r;
+	evaluate(OP_NOT_EQUAL, *this, p_variant, r, v);
+	return r;
+}
+
 bool Variant::operator<(const Variant &p_variant) const {
 	if (type != p_variant.type) { //if types differ, then order by type first
 		return type < p_variant.type;
@@ -1169,7 +1183,7 @@ void Variant::reference(const Variant &p_variant) {
 			memnew_placement(_data._mem, Rect2i(*reinterpret_cast<const Rect2i *>(p_variant._data._mem)));
 		} break;
 		case TRANSFORM2D: {
-			_data._transform2d = VariantPools::alloc<Transform2D>();
+			_data._transform2d = (Transform2D *)Pools::_bucket_small.alloc();
 			memnew_placement(_data._transform2d, Transform2D(*p_variant._data._transform2d));
 		} break;
 		case VECTOR3: {
@@ -1188,22 +1202,22 @@ void Variant::reference(const Variant &p_variant) {
 			memnew_placement(_data._mem, Plane(*reinterpret_cast<const Plane *>(p_variant._data._mem)));
 		} break;
 		case AABB: {
-			_data._aabb = VariantPools::alloc<::AABB>();
+			_data._aabb = (::AABB *)Pools::_bucket_small.alloc();
 			memnew_placement(_data._aabb, ::AABB(*p_variant._data._aabb));
 		} break;
 		case QUATERNION: {
 			memnew_placement(_data._mem, Quaternion(*reinterpret_cast<const Quaternion *>(p_variant._data._mem)));
 		} break;
 		case BASIS: {
-			_data._ptr = VariantPools::alloc<Basis>();
+			_data._basis = (Basis *)Pools::_bucket_medium.alloc();
 			memnew_placement(_data._basis, Basis(*p_variant._data._basis));
 		} break;
 		case TRANSFORM3D: {
-			_data._ptr = VariantPools::alloc<Transform3D>();
+			_data._transform3d = (Transform3D *)Pools::_bucket_medium.alloc();
 			memnew_placement(_data._transform3d, Transform3D(*p_variant._data._transform3d));
 		} break;
 		case PROJECTION: {
-			_data._ptr = VariantPools::alloc<Projection>();
+			_data._projection = (Projection *)Pools::_bucket_large.alloc();
 			memnew_placement(_data._projection, Projection(*p_variant._data._projection));
 		} break;
 
@@ -1374,35 +1388,35 @@ void Variant::_clear_internal() {
 		case TRANSFORM2D: {
 			if (_data._transform2d) {
 				_data._transform2d->~Transform2D();
-				VariantPools::free(_data._transform2d);
+				Pools::_bucket_small.free((Pools::BucketSmall *)_data._transform2d);
 				_data._transform2d = nullptr;
 			}
 		} break;
 		case AABB: {
 			if (_data._aabb) {
 				_data._aabb->~AABB();
-				VariantPools::free(_data._aabb);
+				Pools::_bucket_small.free((Pools::BucketSmall *)_data._aabb);
 				_data._aabb = nullptr;
 			}
 		} break;
 		case BASIS: {
 			if (_data._basis) {
 				_data._basis->~Basis();
-				VariantPools::free(_data._basis);
+				Pools::_bucket_medium.free((Pools::BucketMedium *)_data._basis);
 				_data._basis = nullptr;
 			}
 		} break;
 		case TRANSFORM3D: {
 			if (_data._transform3d) {
 				_data._transform3d->~Transform3D();
-				VariantPools::free(_data._transform3d);
+				Pools::_bucket_medium.free((Pools::BucketMedium *)_data._transform3d);
 				_data._transform3d = nullptr;
 			}
 		} break;
 		case PROJECTION: {
 			if (_data._projection) {
 				_data._projection->~Projection();
-				VariantPools::free(_data._projection);
+				Pools::_bucket_large.free((Pools::BucketLarge *)_data._projection);
 				_data._projection = nullptr;
 			}
 		} break;
@@ -1490,10 +1504,6 @@ Variant::operator int8_t() const {
 	return _to_int<int8_t>();
 }
 
-Variant::operator Math::int_alt_t() const {
-	return _to_int<Math::int_alt_t>();
-}
-
 Variant::operator uint64_t() const {
 	return _to_int<uint64_t>();
 }
@@ -1510,10 +1520,6 @@ Variant::operator uint8_t() const {
 	return _to_int<uint8_t>();
 }
 
-Variant::operator Math::uint_alt_t() const {
-	return _to_int<Math::uint_alt_t>();
-}
-
 Variant::operator ObjectID() const {
 	if (type == INT) {
 		return ObjectID(_data._int);
@@ -2327,11 +2333,6 @@ Variant::Variant(int8_t p_int8) :
 	_data._int = p_int8;
 }
 
-Variant::Variant(Math::int_alt_t p_int_alt) :
-		type(INT) {
-	_data._int = p_int_alt;
-}
-
 Variant::Variant(uint64_t p_uint64) :
 		type(INT) {
 	_data._int = int64_t(p_uint64);
@@ -2352,11 +2353,6 @@ Variant::Variant(uint8_t p_uint8) :
 	_data._int = int64_t(p_uint8);
 }
 
-Variant::Variant(Math::uint_alt_t p_uint_alt) :
-		type(INT) {
-	_data._int = p_uint_alt;
-}
-
 Variant::Variant(float p_float) :
 		type(FLOAT) {
 	_data._float = p_float;
@@ -2452,13 +2448,13 @@ Variant::Variant(const Plane &p_plane) :
 
 Variant::Variant(const ::AABB &p_aabb) :
 		type(AABB) {
-	_data._aabb = VariantPools::alloc<::AABB>();
+	_data._aabb = (::AABB *)Pools::_bucket_small.alloc();
 	memnew_placement(_data._aabb, ::AABB(p_aabb));
 }
 
 Variant::Variant(const Basis &p_matrix) :
 		type(BASIS) {
-	_data._basis = VariantPools::alloc<Basis>();
+	_data._basis = (Basis *)Pools::_bucket_medium.alloc();
 	memnew_placement(_data._basis, Basis(p_matrix));
 }
 
@@ -2470,19 +2466,19 @@ Variant::Variant(const Quaternion &p_quaternion) :
 
 Variant::Variant(const Transform3D &p_transform) :
 		type(TRANSFORM3D) {
-	_data._transform3d = VariantPools::alloc<Transform3D>();
+	_data._transform3d = (Transform3D *)Pools::_bucket_medium.alloc();
 	memnew_placement(_data._transform3d, Transform3D(p_transform));
 }
 
 Variant::Variant(const Projection &pp_projection) :
 		type(PROJECTION) {
-	_data._projection = VariantPools::alloc<Projection>();
+	_data._projection = (Projection *)Pools::_bucket_large.alloc();
 	memnew_placement(_data._projection, Projection(pp_projection));
 }
 
 Variant::Variant(const Transform2D &p_transform) :
 		type(TRANSFORM2D) {
-	_data._transform2d = VariantPools::alloc<Transform2D>();
+	_data._transform2d = (Transform2D *)Pools::_bucket_small.alloc();
 	memnew_placement(_data._transform2d, Transform2D(p_transform));
 }
 
@@ -3159,18 +3155,18 @@ uint32_t Variant::recursive_hash(int recursion_count) const {
 #define hash_compare_packed_array(p_lhs, p_rhs, p_type, p_compare_func) \
 	const Vector<p_type> &l = PackedArrayRef<p_type>::get_array(p_lhs); \
 	const Vector<p_type> &r = PackedArrayRef<p_type>::get_array(p_rhs); \
-\
-	if (l.size() != r.size()) \
-		return false; \
-\
-	const p_type *lr = l.ptr(); \
-	const p_type *rr = r.ptr(); \
-\
-	for (int i = 0; i < l.size(); ++i) { \
-		if (!p_compare_func((lr[i]), (rr[i]))) \
-			return false; \
-	} \
-\
+                                                                        \
+	if (l.size() != r.size())                                           \
+		return false;                                                   \
+                                                                        \
+	const p_type *lr = l.ptr();                                         \
+	const p_type *rr = r.ptr();                                         \
+                                                                        \
+	for (int i = 0; i < l.size(); ++i) {                                \
+		if (!p_compare_func((lr[i]), (rr[i])))                          \
+			return false;                                               \
+	}                                                                   \
+                                                                        \
 	return true
 
 bool Variant::hash_compare(const Variant &p_variant, int recursion_count, bool semantic_comparison) const {
@@ -3437,24 +3433,14 @@ bool Variant::is_ref_counted() const {
 bool Variant::is_type_shared(Variant::Type p_type) {
 	switch (p_type) {
 		case OBJECT:
-		case DICTIONARY:
 		case ARRAY:
-		// NOTE: Packed array constructors **do** copies (unlike `Array()` and `Dictionary()`),
-		// whereas they pass by reference when inside a `Variant`.
-		case PACKED_BYTE_ARRAY:
-		case PACKED_INT32_ARRAY:
-		case PACKED_INT64_ARRAY:
-		case PACKED_FLOAT32_ARRAY:
-		case PACKED_FLOAT64_ARRAY:
-		case PACKED_STRING_ARRAY:
-		case PACKED_VECTOR2_ARRAY:
-		case PACKED_VECTOR3_ARRAY:
-		case PACKED_COLOR_ARRAY:
-		case PACKED_VECTOR4_ARRAY:
+		case DICTIONARY:
 			return true;
-		default:
-			return false;
+		default: {
+		}
 	}
+
+	return false;
 }
 
 bool Variant::is_shared() const {
diff --git a/engine/core/variant/variant.h b/engine/core/variant/variant.h
index ed7d195f..e6635efd 100644
--- a/engine/core/variant/variant.h
+++ b/engine/core/variant/variant.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/core_string_names.h" // IWYU pragma: export. Make available everywhere.
-#include "core/error/error_macros.h"
+#include "core/core_string_names.h"
+#include "core/input/input_enums.h"
 #include "core/io/ip_address.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
@@ -51,13 +51,13 @@
 #include "core/math/vector4.h"
 #include "core/math/vector4i.h"
 #include "core/object/object_id.h"
+#include "core/os/keyboard.h"
 #include "core/string/node_path.h"
 #include "core/string/ustring.h"
 #include "core/templates/bit_field.h"
-#include "core/templates/hashfuncs.h"
 #include "core/templates/list.h"
+#include "core/templates/paged_allocator.h"
 #include "core/templates/rid.h"
-#include "core/typedefs.h"
 #include "core/variant/array.h"
 #include "core/variant/callable.h"
 #include "core/variant/dictionary.h"
@@ -151,6 +151,30 @@ public:
 	};
 
 private:
+	struct Pools {
+		union BucketSmall {
+			BucketSmall() {}
+			~BucketSmall() {}
+			Transform2D _transform2d;
+			::AABB _aabb;
+		};
+		union BucketMedium {
+			BucketMedium() {}
+			~BucketMedium() {}
+			Basis _basis;
+			Transform3D _transform3d;
+		};
+		union BucketLarge {
+			BucketLarge() {}
+			~BucketLarge() {}
+			Projection _projection;
+		};
+
+		static PagedAllocator<BucketSmall, true> _bucket_small;
+		static PagedAllocator<BucketMedium, true> _bucket_medium;
+		static PagedAllocator<BucketLarge, true> _bucket_large;
+	};
+
 	friend struct _VariantCall;
 	friend class VariantInternal;
 	template <typename>
@@ -412,12 +436,10 @@ public:
 	operator int32_t() const;
 	operator int16_t() const;
 	operator int8_t() const;
-	operator Math::int_alt_t() const;
 	operator uint64_t() const;
 	operator uint32_t() const;
 	operator uint16_t() const;
 	operator uint8_t() const;
-	operator Math::uint_alt_t() const;
 
 	operator ObjectID() const;
 
@@ -490,12 +512,10 @@ public:
 	Variant(int32_t p_int32);
 	Variant(int16_t p_int16);
 	Variant(int8_t p_int8);
-	Variant(Math::int_alt_t p_int_alt);
 	Variant(uint64_t p_uint64);
 	Variant(uint32_t p_uint32);
 	Variant(uint16_t p_uint16);
 	Variant(uint8_t p_uint8);
-	Variant(Math::uint_alt_t p_uint_alt);
 	Variant(float p_float);
 	Variant(double p_double);
 	Variant(const ObjectID &p_id);
@@ -815,13 +835,11 @@ public:
 	static void get_utility_function_list(List<StringName> *r_functions);
 	static int get_utility_function_count();
 
-	[[nodiscard]] bool operator==(const Variant &p_variant) const;
-	[[nodiscard]] bool operator<(const Variant &p_variant) const;
-	[[nodiscard]] _ALWAYS_INLINE_ bool operator!=(const Variant &p_variant) const { return !(*this == p_variant); }
-	[[nodiscard]] _ALWAYS_INLINE_ bool operator<=(const Variant &p_variant) const { return !(p_variant < *this); }
-	[[nodiscard]] _ALWAYS_INLINE_ bool operator>(const Variant &p_variant) const { return p_variant < *this; }
-	[[nodiscard]] _ALWAYS_INLINE_ bool operator>=(const Variant &p_variant) const { return !(*this < p_variant); }
+	//argsVariant call()
 
+	bool operator==(const Variant &p_variant) const;
+	bool operator!=(const Variant &p_variant) const;
+	bool operator<(const Variant &p_variant) const;
 	uint32_t hash() const;
 	uint32_t recursive_hash(int recursion_count) const;
 
diff --git a/engine/core/variant/variant_call.cpp b/engine/core/variant/variant_call.cpp
index 7320a361..b4d9e8c3 100644
--- a/engine/core/variant/variant_call.cpp
+++ b/engine/core/variant/variant_call.cpp
@@ -28,16 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "variant.h"
+
+#include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/compression.h"
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/templates/a_hash_map.h"
 #include "core/templates/local_vector.h"
-#include "core/variant/binder_common.h"
-#include "core/variant/method_ptrcall.h"
-#include "core/variant/variant.h"
-#include "core/variant/variant_internal.h"
 
 typedef void (*VariantFunc)(Variant &r_ret, Variant &p_self, const Variant **p_args);
 typedef void (*VariantConstructFunc)(Variant &r_ret, const Variant **p_args);
@@ -369,84 +369,84 @@ static _FORCE_INLINE_ Variant::Type vc_get_base_type(void (T::*method)(P...) con
 	return GetTypeInfo<T>::VARIANT_TYPE;
 }
 
-#define METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr) \
-	struct Method_##m_class##_##m_method_name { \
+#define METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr)                                                                                        \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			vc_method_call(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			vc_validated_call(m_method_ptr, base, p_args, r_ret); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			vc_ptrcall(m_method_ptr, p_base, p_args, r_ret); \
-		} \
-		static int get_argument_count() { \
-			return vc_get_argument_count(m_method_ptr); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return vc_get_argument_type(m_method_ptr, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return vc_get_return_type(m_method_ptr); \
-		} \
-		static bool has_return_type() { \
-			return vc_has_return_type(m_method_ptr); \
-		} \
-		static bool is_const() { \
-			return vc_is_const(m_method_ptr); \
-		} \
-		static bool is_static() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::Type get_base_type() { \
-			return vc_get_base_type(m_method_ptr); \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			vc_method_call(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error);                                                                    \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			vc_validated_call(m_method_ptr, base, p_args, r_ret);                                                                                                 \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			vc_ptrcall(m_method_ptr, p_base, p_args, r_ret);                                                                                                      \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return vc_get_argument_count(m_method_ptr);                                                                                                           \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return vc_get_argument_type(m_method_ptr, p_arg);                                                                                                     \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return vc_get_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return vc_has_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return vc_is_const(m_method_ptr);                                                                                                                     \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return vc_get_base_type(m_method_ptr);                                                                                                                \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
-#define CONVERT_METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr) \
-	struct Method_##m_class##_##m_method_name { \
+#define CONVERT_METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr)                                                                                \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			vc_convert_method_call<m_class>(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			vc_convert_validated_call<m_class>(m_method_ptr, base, p_args, r_ret); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			vc_convert_ptrcall<m_class>(m_method_ptr, p_base, p_args, r_ret); \
-		} \
-		static int get_argument_count() { \
-			return vc_get_argument_count(m_method_ptr); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return vc_get_argument_type(m_method_ptr, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return vc_get_return_type(m_method_ptr); \
-		} \
-		static bool has_return_type() { \
-			return vc_has_return_type(m_method_ptr); \
-		} \
-		static bool is_const() { \
-			return vc_is_const(m_method_ptr); \
-		} \
-		static bool is_static() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_class>::VARIANT_TYPE; \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			vc_convert_method_call<m_class>(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error);                                                   \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			vc_convert_validated_call<m_class>(m_method_ptr, base, p_args, r_ret);                                                                                \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			vc_convert_ptrcall<m_class>(m_method_ptr, p_base, p_args, r_ret);                                                                                     \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return vc_get_argument_count(m_method_ptr);                                                                                                           \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return vc_get_argument_type(m_method_ptr, p_arg);                                                                                                     \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return vc_get_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return vc_has_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return vc_is_const(m_method_ptr);                                                                                                                     \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return GetTypeInfo<m_class>::VARIANT_TYPE;                                                                                                            \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
 template <typename R, typename... P>
@@ -459,44 +459,44 @@ static _FORCE_INLINE_ void vc_static_ptrcall(void (*method)(P...), const void **
 	call_with_ptr_args_static_method<P...>(method, p_args);
 }
 
-#define STATIC_METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr) \
-	struct Method_##m_class##_##m_method_name { \
+#define STATIC_METHOD_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr)                                                                                 \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			vc_static_method_call(m_method_ptr, p_args, p_argcount, r_ret, p_defvals, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			vc_validated_static_call(m_method_ptr, p_args, r_ret); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			vc_static_ptrcall(m_method_ptr, p_args, r_ret); \
-		} \
-		static int get_argument_count() { \
-			return vc_get_argument_count_static(m_method_ptr); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return vc_get_argument_type_static(m_method_ptr, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return vc_get_return_type(m_method_ptr); \
-		} \
-		static bool has_return_type() { \
-			return vc_has_return_type_static(m_method_ptr); \
-		} \
-		static bool is_const() { \
-			return false; \
-		} \
-		static bool is_static() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_class>::VARIANT_TYPE; \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			vc_static_method_call(m_method_ptr, p_args, p_argcount, r_ret, p_defvals, r_error);                                                                   \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			vc_validated_static_call(m_method_ptr, p_args, r_ret);                                                                                                \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			vc_static_ptrcall(m_method_ptr, p_args, r_ret);                                                                                                       \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return vc_get_argument_count_static(m_method_ptr);                                                                                                    \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return vc_get_argument_type_static(m_method_ptr, p_arg);                                                                                              \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return vc_get_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return vc_has_return_type_static(m_method_ptr);                                                                                                       \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return true;                                                                                                                                          \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return GetTypeInfo<m_class>::VARIANT_TYPE;                                                                                                            \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
 template <typename R, typename T, typename... P>
@@ -509,162 +509,162 @@ static _FORCE_INLINE_ void vc_ptrcall(void (*method)(T *, P...), void *p_base, c
 	call_with_ptr_args_static<T, P...>(reinterpret_cast<T *>(p_base), method, p_args);
 }
 
-#define FUNCTION_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr, m_const) \
-	struct Method_##m_class##_##m_method_name { \
+#define FUNCTION_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr, m_const)                                                                             \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			vc_method_call_static(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			vc_validated_call_static(m_method_ptr, base, p_args, r_ret); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			vc_ptrcall(m_method_ptr, p_base, p_args, r_ret); \
-		} \
-		static int get_argument_count() { \
-			return vc_get_argument_count(m_method_ptr); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return vc_get_argument_type(m_method_ptr, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return vc_get_return_type(m_method_ptr); \
-		} \
-		static bool has_return_type() { \
-			return vc_has_return_type_static(m_method_ptr); \
-		} \
-		static bool is_const() { \
-			return m_const; \
-		} \
-		static bool is_static() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_class>::VARIANT_TYPE; \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			vc_method_call_static(m_method_ptr, base, p_args, p_argcount, r_ret, p_defvals, r_error);                                                             \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			vc_validated_call_static(m_method_ptr, base, p_args, r_ret);                                                                                          \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			vc_ptrcall(m_method_ptr, p_base, p_args, r_ret);                                                                                                      \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return vc_get_argument_count(m_method_ptr);                                                                                                           \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return vc_get_argument_type(m_method_ptr, p_arg);                                                                                                     \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return vc_get_return_type(m_method_ptr);                                                                                                              \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return vc_has_return_type_static(m_method_ptr);                                                                                                       \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return m_const;                                                                                                                                       \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return GetTypeInfo<m_class>::VARIANT_TYPE;                                                                                                            \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
-#define VARARG_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr, m_has_return, m_return_type) \
-	struct Method_##m_class##_##m_method_name { \
+#define VARARG_CLASS(m_class, m_exposed_name, m_method_name, m_method_ptr, m_has_return, m_return_type)                                                           \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			m_method_ptr(base, p_args, p_argcount, r_ret, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			Callable::CallError ce; \
-			m_method_ptr(base, p_args, p_argcount, *r_ret, ce); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			LocalVector<Variant> vars; \
-			LocalVector<const Variant *> vars_ptrs; \
-			vars.resize(p_argcount); \
-			vars_ptrs.resize(p_argcount); \
-			for (int i = 0; i < p_argcount; i++) { \
-				vars[i] = PtrToArg<Variant>::convert(p_args[i]); \
-				vars_ptrs[i] = &vars[i]; \
-			} \
-			Variant base = PtrToArg<m_class>::convert(p_base); \
-			Variant ret; \
-			Callable::CallError ce; \
-			m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce); \
-			if (m_has_return) { \
-				m_return_type r = ret; \
-				PtrToArg<m_return_type>::encode(ret, r_ret); \
-			} \
-		} \
-		static int get_argument_count() { \
-			return 0; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return GetTypeInfo<m_return_type>::VARIANT_TYPE; \
-		} \
-		static bool has_return_type() { \
-			return m_has_return; \
-		} \
-		static bool is_const() { \
-			return true; \
-		} \
-		static bool is_static() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return true; \
-		} \
-		static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_class>::VARIANT_TYPE; \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			m_method_ptr(base, p_args, p_argcount, r_ret, r_error);                                                                                               \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			Callable::CallError ce;                                                                                                                               \
+			m_method_ptr(base, p_args, p_argcount, *r_ret, ce);                                                                                                   \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			LocalVector<Variant> vars;                                                                                                                            \
+			LocalVector<const Variant *> vars_ptrs;                                                                                                               \
+			vars.resize(p_argcount);                                                                                                                              \
+			vars_ptrs.resize(p_argcount);                                                                                                                         \
+			for (int i = 0; i < p_argcount; i++) {                                                                                                                \
+				vars[i] = PtrToArg<Variant>::convert(p_args[i]);                                                                                                  \
+				vars_ptrs[i] = &vars[i];                                                                                                                          \
+			}                                                                                                                                                     \
+			Variant base = PtrToArg<m_class>::convert(p_base);                                                                                                    \
+			Variant ret;                                                                                                                                          \
+			Callable::CallError ce;                                                                                                                               \
+			m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce);                                                                                            \
+			if (m_has_return) {                                                                                                                                   \
+				m_return_type r = ret;                                                                                                                            \
+				PtrToArg<m_return_type>::encode(ret, r_ret);                                                                                                      \
+			}                                                                                                                                                     \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return 0;                                                                                                                                             \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return Variant::NIL;                                                                                                                                  \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return GetTypeInfo<m_return_type>::VARIANT_TYPE;                                                                                                      \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return m_has_return;                                                                                                                                  \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return true;                                                                                                                                          \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return true;                                                                                                                                          \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return GetTypeInfo<m_class>::VARIANT_TYPE;                                                                                                            \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
-#define VARARG_CLASS1(m_class, m_exposed_name, m_method_name, m_method_ptr, m_arg_type) \
-	struct Method_##m_class##_##m_method_name { \
+#define VARARG_CLASS1(m_class, m_exposed_name, m_method_name, m_method_ptr, m_arg_type)                                                                           \
+	struct Method_##m_class##_##m_method_name {                                                                                                                   \
 		static void call(Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { \
-			m_method_ptr(base, p_args, p_argcount, r_ret, r_error); \
-		} \
-		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) { \
-			Callable::CallError ce; \
-			m_method_ptr(base, p_args, p_argcount, *r_ret, ce); \
-		} \
-		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
-			LocalVector<Variant> vars; \
-			LocalVector<const Variant *> vars_ptrs; \
-			vars.resize(p_argcount); \
-			vars_ptrs.resize(p_argcount); \
-			for (int i = 0; i < p_argcount; i++) { \
-				vars[i] = PtrToArg<Variant>::convert(p_args[i]); \
-				vars_ptrs[i] = &vars[i]; \
-			} \
-			Variant base = PtrToArg<m_class>::convert(p_base); \
-			Variant ret; \
-			Callable::CallError ce; \
-			m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce); \
-		} \
-		static int get_argument_count() { \
-			return 1; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return m_arg_type; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return false; \
-		} \
-		static bool is_const() { \
-			return true; \
-		} \
-		static bool is_static() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return true; \
-		} \
-		static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_class>::VARIANT_TYPE; \
-		} \
-		static StringName get_name() { \
-			return #m_exposed_name; \
-		} \
+			m_method_ptr(base, p_args, p_argcount, r_ret, r_error);                                                                                               \
+		}                                                                                                                                                         \
+		static void validated_call(Variant *base, const Variant **p_args, int p_argcount, Variant *r_ret) {                                                       \
+			Callable::CallError ce;                                                                                                                               \
+			m_method_ptr(base, p_args, p_argcount, *r_ret, ce);                                                                                                   \
+		}                                                                                                                                                         \
+		static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) {                                                                     \
+			LocalVector<Variant> vars;                                                                                                                            \
+			LocalVector<const Variant *> vars_ptrs;                                                                                                               \
+			vars.resize(p_argcount);                                                                                                                              \
+			vars_ptrs.resize(p_argcount);                                                                                                                         \
+			for (int i = 0; i < p_argcount; i++) {                                                                                                                \
+				vars[i] = PtrToArg<Variant>::convert(p_args[i]);                                                                                                  \
+				vars_ptrs[i] = &vars[i];                                                                                                                          \
+			}                                                                                                                                                     \
+			Variant base = PtrToArg<m_class>::convert(p_base);                                                                                                    \
+			Variant ret;                                                                                                                                          \
+			Callable::CallError ce;                                                                                                                               \
+			m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce);                                                                                            \
+		}                                                                                                                                                         \
+		static int get_argument_count() {                                                                                                                         \
+			return 1;                                                                                                                                             \
+		}                                                                                                                                                         \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                       \
+			return m_arg_type;                                                                                                                                    \
+		}                                                                                                                                                         \
+		static Variant::Type get_return_type() {                                                                                                                  \
+			return Variant::NIL;                                                                                                                                  \
+		}                                                                                                                                                         \
+		static bool has_return_type() {                                                                                                                           \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_const() {                                                                                                                                  \
+			return true;                                                                                                                                          \
+		}                                                                                                                                                         \
+		static bool is_static() {                                                                                                                                 \
+			return false;                                                                                                                                         \
+		}                                                                                                                                                         \
+		static bool is_vararg() {                                                                                                                                 \
+			return true;                                                                                                                                          \
+		}                                                                                                                                                         \
+		static Variant::Type get_base_type() {                                                                                                                    \
+			return GetTypeInfo<m_class>::VARIANT_TYPE;                                                                                                            \
+		}                                                                                                                                                         \
+		static StringName get_name() {                                                                                                                            \
+			return #m_exposed_name;                                                                                                                               \
+		}                                                                                                                                                         \
 	};
 
-#define VARCALL_ARRAY_GETTER_SETTER(m_packed_type, m_type) \
-	static m_type func_##m_packed_type##_get(m_packed_type *p_instance, int64_t p_index) { \
-		ERR_FAIL_INDEX_V(p_index, p_instance->size(), m_type()); \
-		return p_instance->get(p_index); \
-	} \
+#define VARCALL_ARRAY_GETTER_SETTER(m_packed_type, m_type)                                                      \
+	static m_type func_##m_packed_type##_get(m_packed_type *p_instance, int64_t p_index) {                      \
+		ERR_FAIL_INDEX_V(p_index, p_instance->size(), m_type());                                                \
+		return p_instance->get(p_index);                                                                        \
+	}                                                                                                           \
 	static void func_##m_packed_type##_set(m_packed_type *p_instance, int64_t p_index, const m_type &p_value) { \
-		ERR_FAIL_INDEX(p_index, p_instance->size()); \
-		p_instance->set(p_index, p_value); \
+		ERR_FAIL_INDEX(p_index, p_instance->size());                                                            \
+		p_instance->set(p_index, p_value);                                                                      \
 	}
 
 struct _VariantCall {
@@ -1808,194 +1808,194 @@ StringName Variant::get_enum_for_enumeration(Variant::Type p_type, const StringN
 
 #ifdef DEBUG_ENABLED
 #define bind_method(m_type, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_method, m_method, &m_type::m_method); \
+	METHOD_CLASS(m_type, m_method, m_method, &m_type::m_method);   \
 	register_builtin_method<Method_##m_type##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_method(m_type, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_method, m_method, &m_type ::m_method); \
+	METHOD_CLASS(m_type, m_method, m_method, &m_type ::m_method);  \
 	register_builtin_method<Method_##m_type##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_compat_method(m_type, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_exposed_method, m_method, &m_type::m_method); \
+	METHOD_CLASS(m_type, m_exposed_method, m_method, &m_type::m_method);                    \
 	register_builtin_compat_method<Method_##m_type##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_compat_method(m_type, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_exposed_method, m_method, &m_type ::m_method); \
+	METHOD_CLASS(m_type, m_exposed_method, m_method, &m_type ::m_method);                   \
 	register_builtin_compat_method<Method_##m_type##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_convert_method(m_type_from, m_type_to, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_method, m_method, &m_type_to::m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_method, m_method, &m_type_to::m_method);           \
 	register_builtin_method<Method_##m_type_from##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_convert_method(m_type_from, m_type_to, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_method, m_method, &m_type_to ::m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_method, m_method, &m_type_to ::m_method);          \
 	register_builtin_method<Method_##m_type_from##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_convert_compat_method(m_type_from, m_type_to, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_exposed_method, m_method, &m_type_to::m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_exposed_method, m_method, &m_type_to::m_method);                            \
 	register_builtin_compat_method<Method_##m_type_from##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_convert_compat_method(m_type_from, m_type_to, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_exposed_method, m_method, &m_type_to ::m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_exposed_method, m_method, &m_type_to ::m_method);                           \
 	register_builtin_compat_method<Method_##m_type_from##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_static_method(m_type, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_method, m_method, m_type::m_method); \
+	STATIC_METHOD_CLASS(m_type, m_method, m_method, m_type::m_method);    \
 	register_builtin_method<Method_##m_type##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_static_method(m_type, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_method, m_method, m_type ::m_method); \
+	STATIC_METHOD_CLASS(m_type, m_method, m_method, m_type ::m_method);   \
 	register_builtin_method<Method_##m_type##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_static_compat_method(m_type, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_exposed_method, m_method, m_type::m_method); \
+	STATIC_METHOD_CLASS(m_type, m_exposed_method, m_method, m_type::m_method);                     \
 	register_builtin_compat_method<Method_##m_type##_##m_method>(m_arg_names, m_default_args);
 #else
 #define bind_static_compat_method(m_type, m_exposed_method, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_exposed_method, m_method, m_type ::m_method); \
+	STATIC_METHOD_CLASS(m_type, m_exposed_method, m_method, m_type ::m_method);                    \
 	register_builtin_compat_method<Method_##m_type##_##m_method>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_static_methodv(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_name, m_name, m_method); \
+	STATIC_METHOD_CLASS(m_type, m_name, m_name, m_method);                         \
 	register_builtin_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_static_methodv(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_name, m_name, m_method); \
+	STATIC_METHOD_CLASS(m_type, m_name, m_name, m_method);                         \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif
 
 #ifdef DEBUG_ENABLED
 #define bind_static_compat_methodv(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_exposed_name, m_name, m_method); \
+	STATIC_METHOD_CLASS(m_type, m_exposed_name, m_name, m_method);                                        \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_static_compat_methodv(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	STATIC_METHOD_CLASS(m_type, m_exposed_name, m_name, m_method); \
+	STATIC_METHOD_CLASS(m_type, m_exposed_name, m_name, m_method);                                        \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif
 
 #ifdef DEBUG_ENABLED
 #define bind_methodv(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_name, m_name, m_method); \
+	METHOD_CLASS(m_type, m_name, m_name, m_method);                         \
 	register_builtin_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_methodv(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_name, m_name, m_method); \
+	METHOD_CLASS(m_type, m_name, m_name, m_method);                         \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_compat_methodv(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_exposed_name, m_name, m_method); \
+	METHOD_CLASS(m_type, m_exposed_name, m_name, m_method);                                        \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_compat_methodv(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	METHOD_CLASS(m_type, m_exposed_name, m_name, m_method); \
+	METHOD_CLASS(m_type, m_exposed_name, m_name, m_method);                                        \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_convert_methodv(m_type_from, m_type_to, m_name, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_name, m_name, m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_name, m_name, m_method);                                    \
 	register_builtin_method<Method_##m_type_from##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_convert_methodv(m_type_from, m_type_to, m_name, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_name, m_name, m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_name, m_name, m_method);                                    \
 	register_builtin_method<Method_##m_type_from##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_convert_compat_methodv(m_type_from, m_type_to, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_exposed_name, m_name, m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_exposed_name, m_name, m_method);                                                   \
 	register_builtin_compat_method<Method_##m_type_from##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_convert_compat_methodv(m_type_from, m_type_to, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	CONVERT_METHOD_CLASS(m_type_from, m_exposed_name, m_name, m_method); \
+	CONVERT_METHOD_CLASS(m_type_from, m_exposed_name, m_name, m_method);                                                   \
 	register_builtin_compat_method<Method_##m_type_from##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_function(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_name, m_name, m_method, true); \
+	FUNCTION_CLASS(m_type, m_name, m_name, m_method, true);                  \
 	register_builtin_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_function(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_name, m_name, m_method, true); \
+	FUNCTION_CLASS(m_type, m_name, m_name, m_method, true);                  \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_compat_function(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, true); \
+	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, true);                                 \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_compat_function(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, true); \
+	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, true);                                 \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_functionnc(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_name, m_name, m_method, false); \
+	FUNCTION_CLASS(m_type, m_name, m_name, m_method, false);                   \
 	register_builtin_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_functionnc(m_type, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_name, m_name, m_method, false); \
+	FUNCTION_CLASS(m_type, m_name, m_name, m_method, false);                   \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #ifdef DEBUG_ENABLED
 #define bind_compat_functionnc(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, false); \
+	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, false);                                  \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(m_arg_names, m_default_args);
 #else
 #define bind_compat_functionnc(m_type, m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, false); \
+	FUNCTION_CLASS(m_type, m_exposed_name, m_name, m_method, false);                                  \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(), m_default_args);
 #endif // DEBUG_ENABLED
 
 #define bind_string_method(m_method, m_arg_names, m_default_args) \
-	bind_method(String, m_method, m_arg_names, m_default_args); \
+	bind_method(String, m_method, m_arg_names, m_default_args);   \
 	bind_convert_method(StringName, String, m_method, m_arg_names, m_default_args);
 
 #define bind_string_methodv(m_name, m_method, m_arg_names, m_default_args) \
-	bind_methodv(String, m_name, m_method, m_arg_names, m_default_args); \
+	bind_methodv(String, m_name, m_method, m_arg_names, m_default_args);   \
 	bind_convert_methodv(StringName, String, m_name, m_method, m_arg_names, m_default_args);
 
 #define bind_string_compat_method(m_exposed_name, m_method, m_arg_names, m_default_args) \
-	bind_compat_method(String, m_exposed_name, m_method, m_arg_names, m_default_args); \
+	bind_compat_method(String, m_exposed_name, m_method, m_arg_names, m_default_args);   \
 	bind_convert_compat_method(StringName, String, m_exposed_name, m_method, m_arg_names, m_default_args);
 
 #define bind_string_compat_methodv(m_exposed_name, m_name, m_method, m_arg_names, m_default_args) \
-	bind_compat_methodv(String, m_exposed_name, m_name, m_method, m_arg_names, m_default_args); \
+	bind_compat_methodv(String, m_exposed_name, m_name, m_method, m_arg_names, m_default_args);   \
 	bind_convert_compat_methodv(StringName, String, m_exposed_name, m_name, m_method, m_arg_names, m_default_args);
 
-#define bind_custom(m_type, m_name, m_method, m_has_return, m_ret_type) \
+#define bind_custom(m_type, m_name, m_method, m_has_return, m_ret_type)      \
 	VARARG_CLASS(m_type, m_name, m_name, m_method, m_has_return, m_ret_type) \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(), Vector<Variant>());
 
 #define bind_custom1(m_type, m_name, m_method, m_arg_type, m_arg_name) \
-	VARARG_CLASS1(m_type, m_name, m_name, m_method, m_arg_type) \
+	VARARG_CLASS1(m_type, m_name, m_name, m_method, m_arg_type)        \
 	register_builtin_method<Method_##m_type##_##m_name>(sarray(m_arg_name), Vector<Variant>());
 
 #define bind_compat_custom(m_type, m_exposed_name, m_name, m_method, m_has_return, m_ret_type) \
-	VARARG_CLASS(m_type, m_exposed_name, m_name, m_method, m_has_return, m_ret_type) \
+	VARARG_CLASS(m_type, m_exposed_name, m_name, m_method, m_has_return, m_ret_type)           \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(), Vector<Variant>());
 
 #define bind_compat_custom1(m_type, m_exposed_name, m_name, m_method, m_arg_type, m_arg_name) \
-	VARARG_CLASS1(m_type, m_exposed_name, m_name, m_method, m_arg_type) \
+	VARARG_CLASS1(m_type, m_exposed_name, m_name, m_method, m_arg_type)                       \
 	register_builtin_compat_method<Method_##m_type##_##m_name>(sarray(m_arg_name), Vector<Variant>());
 
 static void _register_variant_builtin_methods_string() {
@@ -2549,7 +2549,6 @@ static void _register_variant_builtin_methods_misc() {
 	bind_method(Basis, is_conformal, sarray(), varray());
 	bind_method(Basis, is_equal_approx, sarray("b"), varray());
 	bind_method(Basis, is_finite, sarray(), varray());
-	bind_method(Basis, is_orthonormal, sarray(), varray());
 	bind_method(Basis, get_rotation_quaternion, sarray(), varray());
 	bind_static_method(Basis, looking_at, sarray("target", "up", "use_model_front"), varray(Vector3::UP, false));
 	bind_static_method(Basis, from_scale, sarray("scale"), varray());
diff --git a/engine/core/variant/variant_caster.h b/engine/core/variant/variant_caster.h
deleted file mode 100644
index 992e719b..00000000
--- a/engine/core/variant/variant_caster.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/**************************************************************************/
-/*  variant_caster.h                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/object.h"
-#include "core/variant/type_info.h"
-
-enum class HatDir;
-enum class HatMask;
-enum class JoyAxis;
-enum class JoyButton;
-
-enum class MIDIMessage;
-enum class MouseButton;
-enum class MouseButtonMask;
-
-enum class Key;
-enum class KeyModifierMask;
-enum class KeyLocation;
-
-// Variant cannot define an implicit cast operator for every Object subclass, so the
-// casting is done here, to allow binding methods with parameters more specific than Object *
-
-template <typename T>
-struct VariantCaster {
-	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
-		using TStripped = std::remove_pointer_t<T>;
-		if constexpr (std::is_base_of_v<Object, TStripped>) {
-			return Object::cast_to<TStripped>(p_variant);
-		} else {
-			return p_variant;
-		}
-	}
-};
-
-template <typename T>
-struct VariantCaster<T &> {
-	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
-		using TStripped = std::remove_pointer_t<T>;
-		if constexpr (std::is_base_of_v<Object, TStripped>) {
-			return Object::cast_to<TStripped>(p_variant);
-		} else {
-			return p_variant;
-		}
-	}
-};
-
-template <typename T>
-struct VariantCaster<const T &> {
-	static _FORCE_INLINE_ T cast(const Variant &p_variant) {
-		using TStripped = std::remove_pointer_t<T>;
-		if constexpr (std::is_base_of_v<Object, TStripped>) {
-			return Object::cast_to<TStripped>(p_variant);
-		} else {
-			return p_variant;
-		}
-	}
-};
-
-// Object enum casts must go here
-VARIANT_BITFIELD_CAST(Object::ConnectFlags);
-
-VARIANT_ENUM_CAST(Vector2::Axis);
-VARIANT_ENUM_CAST(Vector2i::Axis);
-VARIANT_ENUM_CAST(Vector3::Axis);
-VARIANT_ENUM_CAST(Vector3i::Axis);
-VARIANT_ENUM_CAST(Vector4::Axis);
-VARIANT_ENUM_CAST(Vector4i::Axis);
-VARIANT_ENUM_CAST(EulerOrder);
-VARIANT_ENUM_CAST(Projection::Planes);
-
-VARIANT_ENUM_CAST(Error);
-VARIANT_ENUM_CAST(Side);
-VARIANT_ENUM_CAST(ClockDirection);
-VARIANT_ENUM_CAST(Corner);
-VARIANT_ENUM_CAST(HatDir);
-VARIANT_BITFIELD_CAST(HatMask);
-VARIANT_ENUM_CAST(JoyAxis);
-VARIANT_ENUM_CAST(JoyButton);
-
-VARIANT_ENUM_CAST(MIDIMessage);
-VARIANT_ENUM_CAST(MouseButton);
-VARIANT_BITFIELD_CAST(MouseButtonMask);
-VARIANT_ENUM_CAST(Orientation);
-VARIANT_ENUM_CAST(HorizontalAlignment);
-VARIANT_ENUM_CAST(VerticalAlignment);
-VARIANT_ENUM_CAST(InlineAlignment);
-VARIANT_ENUM_CAST(PropertyHint);
-VARIANT_BITFIELD_CAST(PropertyUsageFlags);
-VARIANT_ENUM_CAST(Variant::Type);
-VARIANT_ENUM_CAST(Variant::Operator);
-
-// Key
-
-VARIANT_ENUM_CAST(Key);
-VARIANT_BITFIELD_CAST(KeyModifierMask);
-VARIANT_ENUM_CAST(KeyLocation);
-
-template <>
-struct VariantCaster<char32_t> {
-	static _FORCE_INLINE_ char32_t cast(const Variant &p_variant) {
-		return (char32_t)p_variant.operator int();
-	}
-};
-
-template <typename T>
-struct VariantObjectClassChecker {
-	static _FORCE_INLINE_ bool check(const Variant &p_variant) {
-		using TStripped = std::remove_pointer_t<T>;
-		if constexpr (std::is_base_of_v<Object, TStripped>) {
-			Object *obj = p_variant;
-			return Object::cast_to<TStripped>(p_variant) || !obj;
-		} else {
-			return true;
-		}
-	}
-};
-
-template <typename T>
-class Ref;
-
-template <typename T>
-struct VariantObjectClassChecker<const Ref<T> &> {
-	static _FORCE_INLINE_ bool check(const Variant &p_variant) {
-		Object *obj = p_variant;
-		const Ref<T> node = p_variant;
-		return node.ptr() || !obj;
-	}
-};
-
-#ifdef DEBUG_ENABLED
-
-template <typename T>
-struct VariantCasterAndValidate {
-	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
-		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
-		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
-				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
-			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
-			r_error.argument = p_arg_idx;
-			r_error.expected = argtype;
-		}
-
-		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
-	}
-};
-
-template <typename T>
-struct VariantCasterAndValidate<T &> {
-	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
-		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
-		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
-				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
-			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
-			r_error.argument = p_arg_idx;
-			r_error.expected = argtype;
-		}
-
-		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
-	}
-};
-
-template <typename T>
-struct VariantCasterAndValidate<const T &> {
-	static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
-		Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
-		if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype) ||
-				!VariantObjectClassChecker<T>::check(*p_args[p_arg_idx])) {
-			r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
-			r_error.argument = p_arg_idx;
-			r_error.expected = argtype;
-		}
-
-		return VariantCaster<T>::cast(*p_args[p_arg_idx]);
-	}
-};
-
-#endif // DEBUG_ENABLED
diff --git a/engine/core/variant/variant_construct.h b/engine/core/variant/variant_construct.h
index a906e1a3..bd2f48da 100644
--- a/engine/core/variant/variant_construct.h
+++ b/engine/core/variant/variant_construct.h
@@ -30,20 +30,25 @@
 
 #pragma once
 
+#include "variant.h"
+
+#include "core/crypto/crypto_core.h"
+#include "core/debugger/engine_debugger.h"
+#include "core/io/compression.h"
+#include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/templates/a_hash_map.h"
-#include "core/variant/binder_common.h"
-#include "core/variant/variant.h"
-#include "core/variant/variant_internal.h"
+#include "core/templates/local_vector.h"
 
 template <typename T>
 struct PtrConstruct {};
 
-#define MAKE_PTRCONSTRUCT(m_type) \
-	template <> \
-	struct PtrConstruct<m_type> { \
+#define MAKE_PTRCONSTRUCT(m_type)                                                  \
+	template <>                                                                    \
+	struct PtrConstruct<m_type> {                                                  \
 		_FORCE_INLINE_ static void construct(const m_type &p_value, void *p_ptr) { \
-			memnew_placement(p_ptr, m_type(p_value)); \
-		} \
+			memnew_placement(p_ptr, m_type(p_value));                              \
+		}                                                                          \
 	};
 
 MAKE_PTRCONSTRUCT(bool);
diff --git a/engine/core/variant/variant_destruct.h b/engine/core/variant/variant_destruct.h
index 9ad3fb96..730bcc82 100644
--- a/engine/core/variant/variant_destruct.h
+++ b/engine/core/variant/variant_destruct.h
@@ -30,21 +30,22 @@
 
 #pragma once
 
-#include "core/variant/type_info.h"
 #include "core/variant/variant.h"
 
+#include "core/object/class_db.h"
+
 template <typename T>
 struct VariantDestruct {};
 
-#define MAKE_PTRDESTRUCT(m_type) \
-	template <> \
-	struct VariantDestruct<m_type> { \
+#define MAKE_PTRDESTRUCT(m_type)                               \
+	template <>                                                \
+	struct VariantDestruct<m_type> {                           \
 		_FORCE_INLINE_ static void ptr_destruct(void *p_ptr) { \
-			reinterpret_cast<m_type *>(p_ptr)->~m_type(); \
-		} \
-		_FORCE_INLINE_ static Variant::Type get_base_type() { \
-			return GetTypeInfo<m_type>::VARIANT_TYPE; \
-		} \
+			reinterpret_cast<m_type *>(p_ptr)->~m_type();      \
+		}                                                      \
+		_FORCE_INLINE_ static Variant::Type get_base_type() {  \
+			return GetTypeInfo<m_type>::VARIANT_TYPE;          \
+		}                                                      \
 	}
 
 MAKE_PTRDESTRUCT(String);
diff --git a/engine/core/variant/variant_internal.h b/engine/core/variant/variant_internal.h
index 37fdd8f5..50205dcb 100644
--- a/engine/core/variant/variant_internal.h
+++ b/engine/core/variant/variant_internal.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
+#include "type_info.h"
+#include "variant.h"
+
 #include "core/templates/simple_type.h"
-#include "core/variant/type_info.h"
-#include "core/variant/variant.h"
-#include "core/variant/variant_pools.h"
 
 // For use when you want to access the internal pointer of a Variant directly.
 // Use with caution. You need to be sure that the type is correct.
@@ -241,7 +241,7 @@ public:
 		v->type = Variant::STRING;
 	}
 	_FORCE_INLINE_ static void init_transform2d(Variant *v) {
-		v->_data._transform2d = VariantPools::alloc<Transform2D>();
+		v->_data._transform2d = (Transform2D *)Variant::Pools::_bucket_small.alloc();
 		memnew_placement(v->_data._transform2d, Transform2D);
 		v->type = Variant::TRANSFORM2D;
 	}
@@ -250,22 +250,22 @@ public:
 		v->type = Variant::QUATERNION;
 	}
 	_FORCE_INLINE_ static void init_aabb(Variant *v) {
-		v->_data._aabb = VariantPools::alloc<AABB>();
+		v->_data._aabb = (AABB *)Variant::Pools::_bucket_small.alloc();
 		memnew_placement(v->_data._aabb, AABB);
 		v->type = Variant::AABB;
 	}
 	_FORCE_INLINE_ static void init_basis(Variant *v) {
-		v->_data._basis = VariantPools::alloc<Basis>();
+		v->_data._basis = (Basis *)Variant::Pools::_bucket_medium.alloc();
 		memnew_placement(v->_data._basis, Basis);
 		v->type = Variant::BASIS;
 	}
 	_FORCE_INLINE_ static void init_transform3d(Variant *v) {
-		v->_data._transform3d = VariantPools::alloc<Transform3D>();
+		v->_data._transform3d = (Transform3D *)Variant::Pools::_bucket_medium.alloc();
 		memnew_placement(v->_data._transform3d, Transform3D);
 		v->type = Variant::TRANSFORM3D;
 	}
 	_FORCE_INLINE_ static void init_projection(Variant *v) {
-		v->_data._projection = VariantPools::alloc<Projection>();
+		v->_data._projection = (Projection *)Variant::Pools::_bucket_large.alloc();
 		memnew_placement(v->_data._projection, Projection);
 		v->type = Variant::PROJECTION;
 	}
@@ -363,16 +363,6 @@ public:
 		v->_get_obj().ref(r);
 	}
 
-	// This should be used with extreme caution, as it does not increment the reference count in the
-	// case where the object is `RefCounted`. You *must* ensure that the destructor of this
-	// `Variant` is never called, and that the assigned object always outlives the `Variant`.
-	_FORCE_INLINE_ static void object_assign_without_ref_unsafe(Variant *v, Object *o) {
-		v->type = Variant::OBJECT;
-		Variant::ObjData &obj_data = v->_get_obj();
-		obj_data.id = o->get_instance_id();
-		obj_data.obj = o;
-	}
-
 	_FORCE_INLINE_ static void object_reset_data(Variant *v) {
 		v->_get_obj() = Variant::ObjData();
 	}
@@ -647,12 +637,6 @@ struct VariantInternalAccessor<Object *> {
 	static _FORCE_INLINE_ void set(Variant *v, const Object *p_value) { VariantInternal::object_assign(v, p_value); }
 };
 
-template <typename T>
-struct VariantInternalAccessor<Ref<T>> {
-	static _FORCE_INLINE_ Ref<T> get(const Variant *v) { return Ref<T>(const_cast<Object *>(*VariantInternal::get_object(v))); }
-	static _FORCE_INLINE_ void set(Variant *v, const Ref<T> &p_ref) { VariantInternal::object_assign(v, p_ref); }
-};
-
 template <class T>
 struct VariantInternalAccessor<RequiredParam<T>> {
 	static _FORCE_INLINE_ RequiredParam<T> get(const Variant *v) { return RequiredParam<T>(Object::cast_to<T>(const_cast<Object *>(*VariantInternal::get_object(v)))); }
diff --git a/engine/core/variant/variant_op.cpp b/engine/core/variant/variant_op.cpp
index 430eff74..b25556a9 100644
--- a/engine/core/variant/variant_op.cpp
+++ b/engine/core/variant/variant_op.cpp
@@ -193,20 +193,20 @@ public:
 	static Variant::Type get_return_type() { return GetTypeInfo<Vector4>::VARIANT_TYPE; }
 };
 
-#define register_string_op(m_op_type, m_op_code) \
-	if constexpr (true) { \
-		register_op<m_op_type<String, String>>(m_op_code, Variant::STRING, Variant::STRING); \
-		register_op<m_op_type<String, StringName>>(m_op_code, Variant::STRING, Variant::STRING_NAME); \
-		register_op<m_op_type<StringName, String>>(m_op_code, Variant::STRING_NAME, Variant::STRING); \
+#define register_string_op(m_op_type, m_op_code)                                                               \
+	if constexpr (true) {                                                                                      \
+		register_op<m_op_type<String, String>>(m_op_code, Variant::STRING, Variant::STRING);                   \
+		register_op<m_op_type<String, StringName>>(m_op_code, Variant::STRING, Variant::STRING_NAME);          \
+		register_op<m_op_type<StringName, String>>(m_op_code, Variant::STRING_NAME, Variant::STRING);          \
 		register_op<m_op_type<StringName, StringName>>(m_op_code, Variant::STRING_NAME, Variant::STRING_NAME); \
-	} else \
+	} else                                                                                                     \
 		((void)0)
 
-#define register_string_modulo_op(m_class, m_type) \
-	if constexpr (true) { \
-		register_op<OperatorEvaluatorStringFormat<String, m_class>>(Variant::OP_MODULE, Variant::STRING, m_type); \
+#define register_string_modulo_op(m_class, m_type)                                                                         \
+	if constexpr (true) {                                                                                                  \
+		register_op<OperatorEvaluatorStringFormat<String, m_class>>(Variant::OP_MODULE, Variant::STRING, m_type);          \
 		register_op<OperatorEvaluatorStringFormat<StringName, m_class>>(Variant::OP_MODULE, Variant::STRING_NAME, m_type); \
-	} else \
+	} else                                                                                                                 \
 		((void)0)
 
 void Variant::_register_variant_operators() {
diff --git a/engine/core/variant/variant_op.h b/engine/core/variant/variant_op.h
index db63e2c5..e9eb66f9 100644
--- a/engine/core/variant/variant_op.h
+++ b/engine/core/variant/variant_op.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "core/variant/method_ptrcall.h"
-#include "core/variant/type_info.h"
-#include "core/variant/variant.h"
-#include "core/variant/variant_internal.h"
+#include "variant.h"
+
+#include "core/debugger/engine_debugger.h"
+#include "core/object/class_db.h"
 
 template <typename Evaluator>
 class CommonEvaluate {
@@ -912,18 +912,18 @@ _FORCE_INLINE_ static bool _operate_get_ptr_object(const void *p_ptr) {
 	return PtrToArg<Object *>::convert(p_ptr) != nullptr;
 }
 
-#define OP_EVALUATOR(m_class_name, m_left, m_right, m_op) \
-	class m_class_name : public CommonEvaluate<m_class_name> { \
-	public: \
-		static inline void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) { \
+#define OP_EVALUATOR(m_class_name, m_left, m_right, m_op)                                                                 \
+	class m_class_name : public CommonEvaluate<m_class_name> {                                                            \
+	public:                                                                                                               \
+		static inline void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) {                \
 			VariantInternalAccessor<bool>::get(r_ret) = m_op(_operate_get_##m_left(left), _operate_get_##m_right(right)); \
-		} \
-\
-		static void ptr_evaluate(const void *left, const void *right, void *r_ret) { \
-			PtrToArg<bool>::encode(m_op(_operate_get_ptr_##m_left(left), _operate_get_ptr_##m_right(right)), r_ret); \
-		} \
-\
-		using ReturnType = bool; \
+		}                                                                                                                 \
+                                                                                                                          \
+		static void ptr_evaluate(const void *left, const void *right, void *r_ret) {                                      \
+			PtrToArg<bool>::encode(m_op(_operate_get_ptr_##m_left(left), _operate_get_ptr_##m_right(right)), r_ret);      \
+		}                                                                                                                 \
+                                                                                                                          \
+		using ReturnType = bool;                                                                                          \
 	};
 
 // OR
diff --git a/engine/core/variant/variant_parser.cpp b/engine/core/variant/variant_parser.cpp
index b4cc58b8..ccb73872 100644
--- a/engine/core/variant/variant_parser.cpp
+++ b/engine/core/variant/variant_parser.cpp
@@ -33,7 +33,6 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_uid.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/string/string_buffer.h"
 
diff --git a/engine/core/variant/variant_pools.cpp b/engine/core/variant/variant_pools.cpp
deleted file mode 100644
index 7178a0d0..00000000
--- a/engine/core/variant/variant_pools.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/**************************************************************************/
-/*  variant_pools.cpp                                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "core/variant/variant_pools.h"
-
-#include "core/math/aabb.h"
-#include "core/math/projection.h"
-#include "core/math/transform_2d.h"
-#include "core/math/transform_3d.h"
-#include "core/templates/paged_allocator.h"
-
-namespace VariantPools {
-union BucketSmall {
-	BucketSmall() {}
-	~BucketSmall() {}
-	Transform2D _transform2d;
-	::AABB _aabb;
-};
-static_assert(sizeof(BucketSmall) == VariantPools::BUCKET_SMALL);
-static_assert(alignof(BucketSmall) == alignof(real_t));
-
-union BucketMedium {
-	BucketMedium() {}
-	~BucketMedium() {}
-	Basis _basis;
-	Transform3D _transform3d;
-};
-static_assert(sizeof(BucketMedium) == VariantPools::BUCKET_MEDIUM);
-static_assert(alignof(BucketMedium) == alignof(real_t));
-
-union BucketLarge {
-	BucketLarge() {}
-	~BucketLarge() {}
-	Projection _projection;
-};
-static_assert(sizeof(BucketLarge) == VariantPools::BUCKET_LARGE);
-static_assert(alignof(BucketLarge) == alignof(real_t));
-} //namespace VariantPools
-
-static PagedAllocator<VariantPools::BucketSmall, true> _bucket_small;
-static PagedAllocator<VariantPools::BucketMedium, true> _bucket_medium;
-static PagedAllocator<VariantPools::BucketLarge, true> _bucket_large;
-
-void *VariantPools::alloc_small() {
-	return _bucket_small.alloc();
-}
-
-void *VariantPools::alloc_medium() {
-	return _bucket_medium.alloc();
-}
-
-void *VariantPools::alloc_large() {
-	return _bucket_large.alloc();
-}
-
-void VariantPools::free_small(void *p_ptr) {
-	_bucket_small.free(static_cast<BucketSmall *>(p_ptr));
-}
-
-void VariantPools::free_medium(void *p_ptr) {
-	_bucket_medium.free(static_cast<BucketMedium *>(p_ptr));
-}
-
-void VariantPools::free_large(void *p_ptr) {
-	_bucket_large.free(static_cast<BucketLarge *>(p_ptr));
-}
diff --git a/engine/core/variant/variant_pools.h b/engine/core/variant/variant_pools.h
deleted file mode 100644
index 56139f45..00000000
--- a/engine/core/variant/variant_pools.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**************************************************************************/
-/*  variant_pools.h                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/math/math_defs.h"
-#include "core/os/memory.h"
-
-namespace VariantPools {
-inline constexpr size_t BUCKET_SMALL = 2 * 3 * sizeof(real_t);
-inline constexpr size_t BUCKET_MEDIUM = 4 * 3 * sizeof(real_t);
-inline constexpr size_t BUCKET_LARGE = 4 * 4 * sizeof(real_t);
-
-void *alloc_small();
-void *alloc_medium();
-void *alloc_large();
-
-template <typename T>
-_FORCE_INLINE_ T *alloc() {
-	if constexpr (sizeof(T) <= BUCKET_SMALL && alignof(real_t) % alignof(T) == 0) {
-		return static_cast<T *>(alloc_small());
-	} else if constexpr (sizeof(T) <= BUCKET_MEDIUM && alignof(real_t) % alignof(T) == 0) {
-		return static_cast<T *>(alloc_medium());
-	} else if constexpr (sizeof(T) <= BUCKET_LARGE && alignof(real_t) % alignof(T) == 0) {
-		return static_cast<T *>(alloc_large());
-	} else {
-		return memnew(T);
-	}
-}
-
-void free_small(void *p_ptr);
-void free_medium(void *p_ptr);
-void free_large(void *p_ptr);
-
-template <typename T>
-_FORCE_INLINE_ void free(T *p_ptr) {
-	if constexpr (sizeof(T) <= BUCKET_SMALL && alignof(real_t) % alignof(T) == 0) {
-		free_small(p_ptr);
-	} else if constexpr (sizeof(T) <= BUCKET_MEDIUM && alignof(real_t) % alignof(T) == 0) {
-		free_medium(p_ptr);
-	} else if constexpr (sizeof(T) <= BUCKET_LARGE && alignof(real_t) % alignof(T) == 0) {
-		free_large(p_ptr);
-	} else {
-		memdelete(p_ptr);
-	}
-}
-}; //namespace VariantPools
diff --git a/engine/core/variant/variant_setget.cpp b/engine/core/variant/variant_setget.cpp
index 91f92dda..90c976d6 100644
--- a/engine/core/variant/variant_setget.cpp
+++ b/engine/core/variant/variant_setget.cpp
@@ -29,10 +29,9 @@
 /**************************************************************************/
 
 #include "variant_setget.h"
+#include "variant_callable.h"
 
-#include "core/debugger/engine_debugger.h"
 #include "core/io/resource.h"
-#include "core/variant/variant_callable.h"
 
 struct VariantSetterGetterInfo {
 	void (*setter)(Variant *base, const Variant *value, bool &valid);
@@ -330,329 +329,329 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
 
 #endif
 
-#define INDEXED_SETGET_STRUCT_TYPED(m_base_type, m_elem_type) \
-	struct VariantIndexedSetGet_##m_base_type { \
-		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) { \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantTypeAdjust<m_elem_type>::adjust(value); \
-			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))[index]; \
-			*oob = false; \
-		} \
-		static void ptr_get(const void *base, int64_t index, void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
-			if (index < 0) \
-				index += v.size(); \
-			OOB_TEST(index, v.size()); \
-			PtrToArg<m_elem_type>::encode(v[index], member); \
-		} \
-		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) { \
-			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) { \
-				*oob = false; \
-				*valid = false; \
-				return; \
-			} \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				*valid = false; \
-				return; \
-			} \
+#define INDEXED_SETGET_STRUCT_TYPED(m_base_type, m_elem_type)                                                                  \
+	struct VariantIndexedSetGet_##m_base_type {                                                                                \
+		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) {                                       \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				return;                                                                                                        \
+			}                                                                                                                  \
+			VariantTypeAdjust<m_elem_type>::adjust(value);                                                                     \
+			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))[index];       \
+			*oob = false;                                                                                                      \
+		}                                                                                                                      \
+		static void ptr_get(const void *base, int64_t index, void *member) {                                                   \
+			/* avoid ptrconvert for performance*/                                                                              \
+			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base);                                               \
+			if (index < 0)                                                                                                     \
+				index += v.size();                                                                                             \
+			OOB_TEST(index, v.size());                                                                                         \
+			PtrToArg<m_elem_type>::encode(v[index], member);                                                                   \
+		}                                                                                                                      \
+		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {                          \
+			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) {                                                 \
+				*oob = false;                                                                                                  \
+				*valid = false;                                                                                                \
+				return;                                                                                                        \
+			}                                                                                                                  \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				*valid = false;                                                                                                \
+				return;                                                                                                        \
+			}                                                                                                                  \
 			(VariantInternalAccessor<m_base_type>::get(base)).write[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-			*valid = true; \
-		} \
-		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) { \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				return; \
-			} \
+			*oob = false;                                                                                                      \
+			*valid = true;                                                                                                     \
+		}                                                                                                                      \
+		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) {                             \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				return;                                                                                                        \
+			}                                                                                                                  \
 			(VariantInternalAccessor<m_base_type>::get(base)).write[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-		} \
-		static void ptr_set(void *base, int64_t index, const void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			m_base_type &v = *reinterpret_cast<m_base_type *>(base); \
-			if (index < 0) \
-				index += v.size(); \
-			OOB_TEST(index, v.size()); \
-			v.write[index] = PtrToArg<m_elem_type>::convert(member); \
-		} \
-		static Variant::Type get_index_type() { \
-			return GetTypeInfo<m_elem_type>::VARIANT_TYPE; \
-		} \
-		static uint32_t get_index_usage() { \
-			return GetTypeInfo<m_elem_type>::get_class_info().usage; \
-		} \
-		static uint64_t get_indexed_size(const Variant *base) { \
-			return VariantInternalAccessor<m_base_type>::get(base).size(); \
-		} \
+			*oob = false;                                                                                                      \
+		}                                                                                                                      \
+		static void ptr_set(void *base, int64_t index, const void *member) {                                                   \
+			/* avoid ptrconvert for performance*/                                                                              \
+			m_base_type &v = *reinterpret_cast<m_base_type *>(base);                                                           \
+			if (index < 0)                                                                                                     \
+				index += v.size();                                                                                             \
+			OOB_TEST(index, v.size());                                                                                         \
+			v.write[index] = PtrToArg<m_elem_type>::convert(member);                                                           \
+		}                                                                                                                      \
+		static Variant::Type get_index_type() {                                                                                \
+			return GetTypeInfo<m_elem_type>::VARIANT_TYPE;                                                                     \
+		}                                                                                                                      \
+		static uint32_t get_index_usage() {                                                                                    \
+			return GetTypeInfo<m_elem_type>::get_class_info().usage;                                                           \
+		}                                                                                                                      \
+		static uint64_t get_indexed_size(const Variant *base) {                                                                \
+			return VariantInternalAccessor<m_base_type>::get(base).size();                                                     \
+		}                                                                                                                      \
 	};
 
-#define INDEXED_SETGET_STRUCT_TYPED_NUMERIC(m_base_type, m_elem_type, m_assign_type) \
-	struct VariantIndexedSetGet_##m_base_type { \
-		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) { \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantTypeAdjust<m_elem_type>::adjust(value); \
-			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))[index]; \
-			*oob = false; \
-		} \
-		static void ptr_get(const void *base, int64_t index, void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
-			if (index < 0) \
-				index += v.size(); \
-			OOB_TEST(index, v.size()); \
-			PtrToArg<m_elem_type>::encode(v[index], member); \
-		} \
-		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) { \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				*valid = false; \
-				return; \
-			} \
-			m_assign_type num; \
-			if (value->get_type() == Variant::INT) { \
-				num = (m_assign_type) * &VariantInternalAccessor<int64_t>::get(value); \
-			} else if (value->get_type() == Variant::FLOAT) { \
-				num = (m_assign_type) * &VariantInternalAccessor<double>::get(value); \
-			} else { \
-				*oob = false; \
-				*valid = false; \
-				return; \
-			} \
-			(VariantInternalAccessor<m_base_type>::get(base)).write[index] = num; \
-			*oob = false; \
-			*valid = true; \
-		} \
-		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) { \
-			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size(); \
-			if (index < 0) { \
-				index += size; \
-			} \
-			if (index < 0 || index >= size) { \
-				*oob = true; \
-				return; \
-			} \
+#define INDEXED_SETGET_STRUCT_TYPED_NUMERIC(m_base_type, m_elem_type, m_assign_type)                                           \
+	struct VariantIndexedSetGet_##m_base_type {                                                                                \
+		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) {                                       \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				return;                                                                                                        \
+			}                                                                                                                  \
+			VariantTypeAdjust<m_elem_type>::adjust(value);                                                                     \
+			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))[index];       \
+			*oob = false;                                                                                                      \
+		}                                                                                                                      \
+		static void ptr_get(const void *base, int64_t index, void *member) {                                                   \
+			/* avoid ptrconvert for performance*/                                                                              \
+			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base);                                               \
+			if (index < 0)                                                                                                     \
+				index += v.size();                                                                                             \
+			OOB_TEST(index, v.size());                                                                                         \
+			PtrToArg<m_elem_type>::encode(v[index], member);                                                                   \
+		}                                                                                                                      \
+		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {                          \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				*valid = false;                                                                                                \
+				return;                                                                                                        \
+			}                                                                                                                  \
+			m_assign_type num;                                                                                                 \
+			if (value->get_type() == Variant::INT) {                                                                           \
+				num = (m_assign_type) * &VariantInternalAccessor<int64_t>::get(value);                                         \
+			} else if (value->get_type() == Variant::FLOAT) {                                                                  \
+				num = (m_assign_type) * &VariantInternalAccessor<double>::get(value);                                          \
+			} else {                                                                                                           \
+				*oob = false;                                                                                                  \
+				*valid = false;                                                                                                \
+				return;                                                                                                        \
+			}                                                                                                                  \
+			(VariantInternalAccessor<m_base_type>::get(base)).write[index] = num;                                              \
+			*oob = false;                                                                                                      \
+			*valid = true;                                                                                                     \
+		}                                                                                                                      \
+		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) {                             \
+			int64_t size = VariantInternalAccessor<m_base_type>::get(base).size();                                             \
+			if (index < 0) {                                                                                                   \
+				index += size;                                                                                                 \
+			}                                                                                                                  \
+			if (index < 0 || index >= size) {                                                                                  \
+				*oob = true;                                                                                                   \
+				return;                                                                                                        \
+			}                                                                                                                  \
 			(VariantInternalAccessor<m_base_type>::get(base)).write[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-		} \
-		static void ptr_set(void *base, int64_t index, const void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			m_base_type &v = *reinterpret_cast<m_base_type *>(base); \
-			if (index < 0) \
-				index += v.size(); \
-			OOB_TEST(index, v.size()); \
-			v.write[index] = PtrToArg<m_elem_type>::convert(member); \
-		} \
-		static Variant::Type get_index_type() { \
-			return GetTypeInfo<m_elem_type>::VARIANT_TYPE; \
-		} \
-		static uint32_t get_index_usage() { \
-			return GetTypeInfo<m_elem_type>::get_class_info().usage; \
-		} \
-		static uint64_t get_indexed_size(const Variant *base) { \
-			return VariantInternalAccessor<m_base_type>::get(base).size(); \
-		} \
+			*oob = false;                                                                                                      \
+		}                                                                                                                      \
+		static void ptr_set(void *base, int64_t index, const void *member) {                                                   \
+			/* avoid ptrconvert for performance*/                                                                              \
+			m_base_type &v = *reinterpret_cast<m_base_type *>(base);                                                           \
+			if (index < 0)                                                                                                     \
+				index += v.size();                                                                                             \
+			OOB_TEST(index, v.size());                                                                                         \
+			v.write[index] = PtrToArg<m_elem_type>::convert(member);                                                           \
+		}                                                                                                                      \
+		static Variant::Type get_index_type() {                                                                                \
+			return GetTypeInfo<m_elem_type>::VARIANT_TYPE;                                                                     \
+		}                                                                                                                      \
+		static uint32_t get_index_usage() {                                                                                    \
+			return GetTypeInfo<m_elem_type>::get_class_info().usage;                                                           \
+		}                                                                                                                      \
+		static uint64_t get_indexed_size(const Variant *base) {                                                                \
+			return VariantInternalAccessor<m_base_type>::get(base).size();                                                     \
+		}                                                                                                                      \
 	};
 
-#define INDEXED_SETGET_STRUCT_BUILTIN_NUMERIC(m_base_type, m_elem_type, m_assign_type, m_max) \
-	struct VariantIndexedSetGet_##m_base_type { \
-		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantTypeAdjust<m_elem_type>::adjust(value); \
+#define INDEXED_SETGET_STRUCT_BUILTIN_NUMERIC(m_base_type, m_elem_type, m_assign_type, m_max)                            \
+	struct VariantIndexedSetGet_##m_base_type {                                                                          \
+		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) {                                 \
+			if (index < 0 || index >= m_max) {                                                                           \
+				*oob = true;                                                                                             \
+				return;                                                                                                  \
+			}                                                                                                            \
+			VariantTypeAdjust<m_elem_type>::adjust(value);                                                               \
 			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))[index]; \
-			*oob = false; \
-		} \
-		static void ptr_get(const void *base, int64_t index, void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			PtrToArg<m_elem_type>::encode(v[index], member); \
-		} \
-		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				*valid = false; \
-				return; \
-			} \
-			m_assign_type num; \
-			if (value->get_type() == Variant::INT) { \
-				num = (m_assign_type) * &VariantInternalAccessor<int64_t>::get(value); \
-			} else if (value->get_type() == Variant::FLOAT) { \
-				num = (m_assign_type) * &VariantInternalAccessor<double>::get(value); \
-			} else { \
-				*oob = false; \
-				*valid = false; \
-				return; \
-			} \
-			(VariantInternalAccessor<m_base_type>::get(base))[index] = num; \
-			*oob = false; \
-			*valid = true; \
-		} \
-		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
+			*oob = false;                                                                                                \
+		}                                                                                                                \
+		static void ptr_get(const void *base, int64_t index, void *member) {                                             \
+			/* avoid ptrconvert for performance*/                                                                        \
+			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base);                                         \
+			OOB_TEST(index, m_max);                                                                                      \
+			PtrToArg<m_elem_type>::encode(v[index], member);                                                             \
+		}                                                                                                                \
+		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {                    \
+			if (index < 0 || index >= m_max) {                                                                           \
+				*oob = true;                                                                                             \
+				*valid = false;                                                                                          \
+				return;                                                                                                  \
+			}                                                                                                            \
+			m_assign_type num;                                                                                           \
+			if (value->get_type() == Variant::INT) {                                                                     \
+				num = (m_assign_type) * &VariantInternalAccessor<int64_t>::get(value);                                   \
+			} else if (value->get_type() == Variant::FLOAT) {                                                            \
+				num = (m_assign_type) * &VariantInternalAccessor<double>::get(value);                                    \
+			} else {                                                                                                     \
+				*oob = false;                                                                                            \
+				*valid = false;                                                                                          \
+				return;                                                                                                  \
+			}                                                                                                            \
+			(VariantInternalAccessor<m_base_type>::get(base))[index] = num;                                              \
+			*oob = false;                                                                                                \
+			*valid = true;                                                                                               \
+		}                                                                                                                \
+		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) {                       \
+			if (index < 0 || index >= m_max) {                                                                           \
+				*oob = true;                                                                                             \
+				return;                                                                                                  \
+			}                                                                                                            \
 			(VariantInternalAccessor<m_base_type>::get(base))[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-		} \
-		static void ptr_set(void *base, int64_t index, const void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			m_base_type &v = *reinterpret_cast<m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			v[index] = PtrToArg<m_elem_type>::convert(member); \
-		} \
-		static Variant::Type get_index_type() { \
-			return GetTypeInfo<m_elem_type>::VARIANT_TYPE; \
-		} \
-		static uint32_t get_index_usage() { \
-			return GetTypeInfo<m_elem_type>::get_class_info().usage; \
-		} \
-		static uint64_t get_indexed_size(const Variant *base) { \
-			return m_max; \
-		} \
+			*oob = false;                                                                                                \
+		}                                                                                                                \
+		static void ptr_set(void *base, int64_t index, const void *member) {                                             \
+			/* avoid ptrconvert for performance*/                                                                        \
+			m_base_type &v = *reinterpret_cast<m_base_type *>(base);                                                     \
+			OOB_TEST(index, m_max);                                                                                      \
+			v[index] = PtrToArg<m_elem_type>::convert(member);                                                           \
+		}                                                                                                                \
+		static Variant::Type get_index_type() {                                                                          \
+			return GetTypeInfo<m_elem_type>::VARIANT_TYPE;                                                               \
+		}                                                                                                                \
+		static uint32_t get_index_usage() {                                                                              \
+			return GetTypeInfo<m_elem_type>::get_class_info().usage;                                                     \
+		}                                                                                                                \
+		static uint64_t get_indexed_size(const Variant *base) {                                                          \
+			return m_max;                                                                                                \
+		}                                                                                                                \
 	};
 
-#define INDEXED_SETGET_STRUCT_BUILTIN_ACCESSOR(m_base_type, m_elem_type, m_accessor, m_max) \
-	struct VariantIndexedSetGet_##m_base_type { \
-		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantTypeAdjust<m_elem_type>::adjust(value); \
-			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))m_accessor[index]; \
-			*oob = false; \
-		} \
-		static void ptr_get(const void *base, int64_t index, void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			PtrToArg<m_elem_type>::encode(v m_accessor[index], member); \
-		} \
-		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) { \
-			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) { \
-				*oob = false; \
-				*valid = false; \
-			} \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				*valid = false; \
-				return; \
-			} \
+#define INDEXED_SETGET_STRUCT_BUILTIN_ACCESSOR(m_base_type, m_elem_type, m_accessor, m_max)                                         \
+	struct VariantIndexedSetGet_##m_base_type {                                                                                     \
+		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) {                                            \
+			if (index < 0 || index >= m_max) {                                                                                      \
+				*oob = true;                                                                                                        \
+				return;                                                                                                             \
+			}                                                                                                                       \
+			VariantTypeAdjust<m_elem_type>::adjust(value);                                                                          \
+			VariantInternalAccessor<m_elem_type>::get(value) = (VariantInternalAccessor<m_base_type>::get(base))m_accessor[index];  \
+			*oob = false;                                                                                                           \
+		}                                                                                                                           \
+		static void ptr_get(const void *base, int64_t index, void *member) {                                                        \
+			/* avoid ptrconvert for performance*/                                                                                   \
+			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base);                                                    \
+			OOB_TEST(index, m_max);                                                                                                 \
+			PtrToArg<m_elem_type>::encode(v m_accessor[index], member);                                                             \
+		}                                                                                                                           \
+		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {                               \
+			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) {                                                      \
+				*oob = false;                                                                                                       \
+				*valid = false;                                                                                                     \
+			}                                                                                                                       \
+			if (index < 0 || index >= m_max) {                                                                                      \
+				*oob = true;                                                                                                        \
+				*valid = false;                                                                                                     \
+				return;                                                                                                             \
+			}                                                                                                                       \
 			(VariantInternalAccessor<m_base_type>::get(base)) m_accessor[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-			*valid = true; \
-		} \
-		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
+			*oob = false;                                                                                                           \
+			*valid = true;                                                                                                          \
+		}                                                                                                                           \
+		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) {                                  \
+			if (index < 0 || index >= m_max) {                                                                                      \
+				*oob = true;                                                                                                        \
+				return;                                                                                                             \
+			}                                                                                                                       \
 			(VariantInternalAccessor<m_base_type>::get(base)) m_accessor[index] = VariantInternalAccessor<m_elem_type>::get(value); \
-			*oob = false; \
-		} \
-		static void ptr_set(void *base, int64_t index, const void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			m_base_type &v = *reinterpret_cast<m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			v m_accessor[index] = PtrToArg<m_elem_type>::convert(member); \
-		} \
-		static Variant::Type get_index_type() { \
-			return GetTypeInfo<m_elem_type>::VARIANT_TYPE; \
-		} \
-		static uint32_t get_index_usage() { \
-			return GetTypeInfo<m_elem_type>::get_class_info().usage; \
-		} \
-		static uint64_t get_indexed_size(const Variant *base) { \
-			return m_max; \
-		} \
+			*oob = false;                                                                                                           \
+		}                                                                                                                           \
+		static void ptr_set(void *base, int64_t index, const void *member) {                                                        \
+			/* avoid ptrconvert for performance*/                                                                                   \
+			m_base_type &v = *reinterpret_cast<m_base_type *>(base);                                                                \
+			OOB_TEST(index, m_max);                                                                                                 \
+			v m_accessor[index] = PtrToArg<m_elem_type>::convert(member);                                                           \
+		}                                                                                                                           \
+		static Variant::Type get_index_type() {                                                                                     \
+			return GetTypeInfo<m_elem_type>::VARIANT_TYPE;                                                                          \
+		}                                                                                                                           \
+		static uint32_t get_index_usage() {                                                                                         \
+			return GetTypeInfo<m_elem_type>::get_class_info().usage;                                                                \
+		}                                                                                                                           \
+		static uint64_t get_indexed_size(const Variant *base) {                                                                     \
+			return m_max;                                                                                                           \
+		}                                                                                                                           \
 	};
 
-#define INDEXED_SETGET_STRUCT_BUILTIN_FUNC(m_base_type, m_elem_type, m_set, m_get, m_max) \
-	struct VariantIndexedSetGet_##m_base_type { \
-		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantTypeAdjust<m_elem_type>::adjust(value); \
+#define INDEXED_SETGET_STRUCT_BUILTIN_FUNC(m_base_type, m_elem_type, m_set, m_get, m_max)                                    \
+	struct VariantIndexedSetGet_##m_base_type {                                                                              \
+		static void get(const Variant *base, int64_t index, Variant *value, bool *oob) {                                     \
+			if (index < 0 || index >= m_max) {                                                                               \
+				*oob = true;                                                                                                 \
+				return;                                                                                                      \
+			}                                                                                                                \
+			VariantTypeAdjust<m_elem_type>::adjust(value);                                                                   \
 			VariantInternalAccessor<m_elem_type>::get(value) = VariantInternalAccessor<m_base_type>::get(base).m_get(index); \
-			*oob = false; \
-		} \
-		static void ptr_get(const void *base, int64_t index, void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			PtrToArg<m_elem_type>::encode(v.m_get(index), member); \
-		} \
-		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) { \
-			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) { \
-				*oob = false; \
-				*valid = false; \
-			} \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				*valid = false; \
-				return; \
-			} \
-			VariantInternalAccessor<m_base_type>::get(base).m_set(index, VariantInternalAccessor<m_elem_type>::get(value)); \
-			*oob = false; \
-			*valid = true; \
-		} \
-		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) { \
-			if (index < 0 || index >= m_max) { \
-				*oob = true; \
-				return; \
-			} \
-			VariantInternalAccessor<m_base_type>::get(base).m_set(index, VariantInternalAccessor<m_elem_type>::get(value)); \
-			*oob = false; \
-		} \
-		static void ptr_set(void *base, int64_t index, const void *member) { \
-			/* avoid ptrconvert for performance*/ \
-			m_base_type &v = *reinterpret_cast<m_base_type *>(base); \
-			OOB_TEST(index, m_max); \
-			v.m_set(index, PtrToArg<m_elem_type>::convert(member)); \
-		} \
-		static Variant::Type get_index_type() { \
-			return GetTypeInfo<m_elem_type>::VARIANT_TYPE; \
-		} \
-		static uint32_t get_index_usage() { \
-			return GetTypeInfo<m_elem_type>::get_class_info().usage; \
-		} \
-		static uint64_t get_indexed_size(const Variant *base) { \
-			return m_max; \
-		} \
+			*oob = false;                                                                                                    \
+		}                                                                                                                    \
+		static void ptr_get(const void *base, int64_t index, void *member) {                                                 \
+			/* avoid ptrconvert for performance*/                                                                            \
+			const m_base_type &v = *reinterpret_cast<const m_base_type *>(base);                                             \
+			OOB_TEST(index, m_max);                                                                                          \
+			PtrToArg<m_elem_type>::encode(v.m_get(index), member);                                                           \
+		}                                                                                                                    \
+		static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {                        \
+			if (value->get_type() != GetTypeInfo<m_elem_type>::VARIANT_TYPE) {                                               \
+				*oob = false;                                                                                                \
+				*valid = false;                                                                                              \
+			}                                                                                                                \
+			if (index < 0 || index >= m_max) {                                                                               \
+				*oob = true;                                                                                                 \
+				*valid = false;                                                                                              \
+				return;                                                                                                      \
+			}                                                                                                                \
+			VariantInternalAccessor<m_base_type>::get(base).m_set(index, VariantInternalAccessor<m_elem_type>::get(value));  \
+			*oob = false;                                                                                                    \
+			*valid = true;                                                                                                   \
+		}                                                                                                                    \
+		static void validated_set(Variant *base, int64_t index, const Variant *value, bool *oob) {                           \
+			if (index < 0 || index >= m_max) {                                                                               \
+				*oob = true;                                                                                                 \
+				return;                                                                                                      \
+			}                                                                                                                \
+			VariantInternalAccessor<m_base_type>::get(base).m_set(index, VariantInternalAccessor<m_elem_type>::get(value));  \
+			*oob = false;                                                                                                    \
+		}                                                                                                                    \
+		static void ptr_set(void *base, int64_t index, const void *member) {                                                 \
+			/* avoid ptrconvert for performance*/                                                                            \
+			m_base_type &v = *reinterpret_cast<m_base_type *>(base);                                                         \
+			OOB_TEST(index, m_max);                                                                                          \
+			v.m_set(index, PtrToArg<m_elem_type>::convert(member));                                                          \
+		}                                                                                                                    \
+		static Variant::Type get_index_type() {                                                                              \
+			return GetTypeInfo<m_elem_type>::VARIANT_TYPE;                                                                   \
+		}                                                                                                                    \
+		static uint32_t get_index_usage() {                                                                                  \
+			return GetTypeInfo<m_elem_type>::get_class_info().usage;                                                         \
+		}                                                                                                                    \
+		static uint64_t get_indexed_size(const Variant *base) {                                                              \
+			return m_max;                                                                                                    \
+		}                                                                                                                    \
 	};
 
 struct VariantIndexedSetGet_Array {
diff --git a/engine/core/variant/variant_setget.h b/engine/core/variant/variant_setget.h
index 7c9017b2..470184b8 100644
--- a/engine/core/variant/variant_setget.h
+++ b/engine/core/variant/variant_setget.h
@@ -30,250 +30,252 @@
 
 #pragma once
 
-#include "core/variant/method_ptrcall.h"
-#include "core/variant/variant.h"
+#include "variant.h"
+
+#include "core/debugger/engine_debugger.h"
+#include "core/object/class_db.h"
 #include "core/variant/variant_internal.h"
 
 /**** NAMED SETTERS AND GETTERS ****/
 
-#define SETGET_STRUCT(m_base_type, m_member_type, m_member) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member; \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member; \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
+#define SETGET_STRUCT(m_base_type, m_member_type, m_member)                                                                    \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                          \
+		static void get(const Variant *base, Variant *member) {                                                                \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                                  \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member;    \
+		}                                                                                                                      \
+		static inline void validated_get(const Variant *base, Variant *member) {                                               \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member;    \
+		}                                                                                                                      \
+		static void ptr_get(const void *base, void *member) {                                                                  \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member);                            \
+		}                                                                                                                      \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                    \
+			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) {                                               \
 				VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<m_member_type>::get(value); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<m_member_type>::get(value); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_member = PtrToArg<m_member_type>::convert(member); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+				valid = true;                                                                                                  \
+			} else {                                                                                                           \
+				valid = false;                                                                                                 \
+			}                                                                                                                  \
+		}                                                                                                                      \
+		static inline void validated_set(Variant *base, const Variant *value) {                                                \
+			VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<m_member_type>::get(value);     \
+		}                                                                                                                      \
+		static void ptr_set(void *base, const void *member) {                                                                  \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                              \
+			b.m_member = PtrToArg<m_member_type>::convert(member);                                                             \
+			PtrToArg<m_base_type>::encode(b, base);                                                                            \
+		}                                                                                                                      \
+		static Variant::Type get_type() {                                                                                      \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                   \
+		}                                                                                                                      \
 	};
 
-#define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
+#define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member)                                                          \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                       \
+		static void get(const Variant *base, Variant *member) {                                                             \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                               \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member; \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
+		}                                                                                                                   \
+		static inline void validated_get(const Variant *base, Variant *member) {                                            \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_member; \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == Variant::FLOAT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<double>::get(value); \
-				valid = true; \
-			} else if (value->get_type() == Variant::INT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<int64_t>::get(value); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<m_member_type>::get(value); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_member = PtrToArg<m_member_type>::convert(member); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+		}                                                                                                                   \
+		static void ptr_get(const void *base, void *member) {                                                               \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member);                         \
+		}                                                                                                                   \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                 \
+			if (value->get_type() == Variant::FLOAT) {                                                                      \
+				VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<double>::get(value);     \
+				valid = true;                                                                                               \
+			} else if (value->get_type() == Variant::INT) {                                                                 \
+				VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<int64_t>::get(value);    \
+				valid = true;                                                                                               \
+			} else {                                                                                                        \
+				valid = false;                                                                                              \
+			}                                                                                                               \
+		}                                                                                                                   \
+		static inline void validated_set(Variant *base, const Variant *value) {                                             \
+			VariantInternalAccessor<m_base_type>::get(base).m_member = VariantInternalAccessor<m_member_type>::get(value);  \
+		}                                                                                                                   \
+		static void ptr_set(void *base, const void *member) {                                                               \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                           \
+			b.m_member = PtrToArg<m_member_type>::convert(member);                                                          \
+			PtrToArg<m_base_type>::encode(b, base);                                                                         \
+		}                                                                                                                   \
+		static Variant::Type get_type() {                                                                                   \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                \
+		}                                                                                                                   \
 	};
 
-#define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom; \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom; \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
+#define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom)                                                   \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                          \
+		static void get(const Variant *base, Variant *member) {                                                                \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                                  \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom;    \
+		}                                                                                                                      \
+		static inline void validated_get(const Variant *base, Variant *member) {                                               \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom;    \
+		}                                                                                                                      \
+		static void ptr_get(const void *base, void *member) {                                                                  \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member);                            \
+		}                                                                                                                      \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                    \
+			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) {                                               \
 				VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<m_member_type>::get(value); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<m_member_type>::get(value); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_custom = PtrToArg<m_member_type>::convert(member); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+				valid = true;                                                                                                  \
+			} else {                                                                                                           \
+				valid = false;                                                                                                 \
+			}                                                                                                                  \
+		}                                                                                                                      \
+		static inline void validated_set(Variant *base, const Variant *value) {                                                \
+			VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<m_member_type>::get(value);     \
+		}                                                                                                                      \
+		static void ptr_set(void *base, const void *member) {                                                                  \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                              \
+			b.m_custom = PtrToArg<m_member_type>::convert(member);                                                             \
+			PtrToArg<m_base_type>::encode(b, base);                                                                            \
+		}                                                                                                                      \
+		static Variant::Type get_type() {                                                                                      \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                   \
+		}                                                                                                                      \
 	};
 
-#define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
+#define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom)                                         \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                       \
+		static void get(const Variant *base, Variant *member) {                                                             \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                               \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom; \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
+		}                                                                                                                   \
+		static inline void validated_get(const Variant *base, Variant *member) {                                            \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_custom; \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == Variant::FLOAT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<double>::get(value); \
-				valid = true; \
-			} else if (value->get_type() == Variant::INT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<int64_t>::get(value); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<m_member_type>::get(value); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_custom = PtrToArg<m_member_type>::convert(member); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+		}                                                                                                                   \
+		static void ptr_get(const void *base, void *member) {                                                               \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member);                         \
+		}                                                                                                                   \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                 \
+			if (value->get_type() == Variant::FLOAT) {                                                                      \
+				VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<double>::get(value);     \
+				valid = true;                                                                                               \
+			} else if (value->get_type() == Variant::INT) {                                                                 \
+				VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<int64_t>::get(value);    \
+				valid = true;                                                                                               \
+			} else {                                                                                                        \
+				valid = false;                                                                                              \
+			}                                                                                                               \
+		}                                                                                                                   \
+		static inline void validated_set(Variant *base, const Variant *value) {                                             \
+			VariantInternalAccessor<m_base_type>::get(base).m_custom = VariantInternalAccessor<m_member_type>::get(value);  \
+		}                                                                                                                   \
+		static void ptr_set(void *base, const void *member) {                                                               \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                           \
+			b.m_custom = PtrToArg<m_member_type>::convert(member);                                                          \
+			PtrToArg<m_base_type>::encode(b, base);                                                                         \
+		}                                                                                                                   \
+		static Variant::Type get_type() {                                                                                   \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                \
+		}                                                                                                                   \
 	};
 
-#define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
+#define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter)                                          \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                         \
+		static void get(const Variant *base, Variant *member) {                                                               \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                                 \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(); \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
+		}                                                                                                                     \
+		static inline void validated_get(const Variant *base, Variant *member) {                                              \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(); \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
+		}                                                                                                                     \
+		static void ptr_get(const void *base, void *member) {                                                                 \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member);                         \
+		}                                                                                                                     \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                   \
+			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) {                                              \
 				VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<m_member_type>::get(value)); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<m_member_type>::get(value)); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_setter(PtrToArg<m_member_type>::convert(member)); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+				valid = true;                                                                                                 \
+			} else {                                                                                                          \
+				valid = false;                                                                                                \
+			}                                                                                                                 \
+		}                                                                                                                     \
+		static inline void validated_set(Variant *base, const Variant *value) {                                               \
+			VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<m_member_type>::get(value));     \
+		}                                                                                                                     \
+		static void ptr_set(void *base, const void *member) {                                                                 \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                             \
+			b.m_setter(PtrToArg<m_member_type>::convert(member));                                                             \
+			PtrToArg<m_base_type>::encode(b, base);                                                                           \
+		}                                                                                                                     \
+		static Variant::Type get_type() {                                                                                     \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                  \
+		}                                                                                                                     \
 	};
 
-#define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
+#define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter)                                   \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                         \
+		static void get(const Variant *base, Variant *member) {                                                               \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                                 \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(); \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
+		}                                                                                                                     \
+		static inline void validated_get(const Variant *base, Variant *member) {                                              \
 			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(); \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == Variant::FLOAT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<double>::get(value)); \
-				valid = true; \
-			} else if (value->get_type() == Variant::INT) { \
-				VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<int64_t>::get(value)); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<m_member_type>::get(value)); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_setter(PtrToArg<m_member_type>::convert(member)); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+		}                                                                                                                     \
+		static void ptr_get(const void *base, void *member) {                                                                 \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member);                         \
+		}                                                                                                                     \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                   \
+			if (value->get_type() == Variant::FLOAT) {                                                                        \
+				VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<double>::get(value));        \
+				valid = true;                                                                                                 \
+			} else if (value->get_type() == Variant::INT) {                                                                   \
+				VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<int64_t>::get(value));       \
+				valid = true;                                                                                                 \
+			} else {                                                                                                          \
+				valid = false;                                                                                                \
+			}                                                                                                                 \
+		}                                                                                                                     \
+		static inline void validated_set(Variant *base, const Variant *value) {                                               \
+			VariantInternalAccessor<m_base_type>::get(base).m_setter(VariantInternalAccessor<m_member_type>::get(value));     \
+		}                                                                                                                     \
+		static void ptr_set(void *base, const void *member) {                                                                 \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                             \
+			b.m_setter(PtrToArg<m_member_type>::convert(member));                                                             \
+			PtrToArg<m_base_type>::encode(b, base);                                                                           \
+		}                                                                                                                     \
+		static Variant::Type get_type() {                                                                                     \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                  \
+		}                                                                                                                     \
 	};
 
-#define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index) \
-	struct VariantSetGet_##m_base_type##_##m_member { \
-		static void get(const Variant *base, Variant *member) { \
-			VariantTypeAdjust<m_member_type>::adjust(member); \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(m_index); \
-		} \
-		static inline void validated_get(const Variant *base, Variant *member) { \
-			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(m_index); \
-		} \
-		static void ptr_get(const void *base, void *member) { \
-			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(m_index), member); \
-		} \
-		static void set(Variant *base, const Variant *value, bool &valid) { \
-			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
+#define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index)                                    \
+	struct VariantSetGet_##m_base_type##_##m_member {                                                                                  \
+		static void get(const Variant *base, Variant *member) {                                                                        \
+			VariantTypeAdjust<m_member_type>::adjust(member);                                                                          \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(m_index);   \
+		}                                                                                                                              \
+		static inline void validated_get(const Variant *base, Variant *member) {                                                       \
+			VariantInternalAccessor<m_member_type>::get(member) = VariantInternalAccessor<m_base_type>::get(base).m_getter(m_index);   \
+		}                                                                                                                              \
+		static void ptr_get(const void *base, void *member) {                                                                          \
+			PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(m_index), member);                           \
+		}                                                                                                                              \
+		static void set(Variant *base, const Variant *value, bool &valid) {                                                            \
+			if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) {                                                       \
 				VariantInternalAccessor<m_base_type>::get(base).m_setter(m_index, VariantInternalAccessor<m_member_type>::get(value)); \
-				valid = true; \
-			} else { \
-				valid = false; \
-			} \
-		} \
-		static inline void validated_set(Variant *base, const Variant *value) { \
-			VariantInternalAccessor<m_base_type>::get(base).m_setter(m_index, VariantInternalAccessor<m_member_type>::get(value)); \
-		} \
-		static void ptr_set(void *base, const void *member) { \
-			m_base_type b = PtrToArg<m_base_type>::convert(base); \
-			b.m_setter(m_index, PtrToArg<m_member_type>::convert(member)); \
-			PtrToArg<m_base_type>::encode(b, base); \
-		} \
-		static Variant::Type get_type() { \
-			return GetTypeInfo<m_member_type>::VARIANT_TYPE; \
-		} \
+				valid = true;                                                                                                          \
+			} else {                                                                                                                   \
+				valid = false;                                                                                                         \
+			}                                                                                                                          \
+		}                                                                                                                              \
+		static inline void validated_set(Variant *base, const Variant *value) {                                                        \
+			VariantInternalAccessor<m_base_type>::get(base).m_setter(m_index, VariantInternalAccessor<m_member_type>::get(value));     \
+		}                                                                                                                              \
+		static void ptr_set(void *base, const void *member) {                                                                          \
+			m_base_type b = PtrToArg<m_base_type>::convert(base);                                                                      \
+			b.m_setter(m_index, PtrToArg<m_member_type>::convert(member));                                                             \
+			PtrToArg<m_base_type>::encode(b, base);                                                                                    \
+		}                                                                                                                              \
+		static Variant::Type get_type() {                                                                                              \
+			return GetTypeInfo<m_member_type>::VARIANT_TYPE;                                                                           \
+		}                                                                                                                              \
 	};
 
 SETGET_NUMBER_STRUCT(Vector2, double, x)
diff --git a/engine/core/variant/variant_utility.cpp b/engine/core/variant/variant_utility.cpp
index 5f048ed4..6e95fe80 100644
--- a/engine/core/variant/variant_utility.cpp
+++ b/engine/core/variant/variant_utility.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/marshalls.h"
 #include "core/object/ref_counted.h"
+#include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "core/templates/a_hash_map.h"
 #include "core/templates/rid.h"
@@ -360,11 +361,11 @@ bool VariantUtilityFunctions::is_finite(double x) {
 	return Math::is_finite(x);
 }
 
-double VariantUtilityFunctions::ease(double x, double curve) {
+double VariantUtilityFunctions::ease(float x, float curve) {
 	return Math::ease(x, curve);
 }
 
-int VariantUtilityFunctions::step_decimals(double step) {
+int VariantUtilityFunctions::step_decimals(float step) {
 	return Math::step_decimals(step);
 }
 
@@ -768,7 +769,7 @@ int64_t VariantUtilityFunctions::clampi(int64_t x, int64_t min, int64_t max) {
 }
 
 int64_t VariantUtilityFunctions::nearest_po2(int64_t x) {
-	return Math::nearest_power_of_2_templated(uint64_t(x));
+	return nearest_power_of_2_templated(uint64_t(x));
 }
 
 // Random
@@ -1268,318 +1269,318 @@ static _FORCE_INLINE_ Variant::Type get_ret_type_helper(void (*p_func)(P...)) {
 	return Variant::NIL;
 }
 
-#define FUNCBINDR(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
+#define FUNCBINDR(m_func, m_args, m_category)                                                                    \
+	class Func_##m_func {                                                                                        \
+	public:                                                                                                      \
 		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			call_helperr(VariantUtilityFunctions::m_func, r_ret, p_args, r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			validated_call_helperr(VariantUtilityFunctions::m_func, r_ret, p_args); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			ptr_call_helperr(VariantUtilityFunctions::m_func, ret, p_args); \
-		} \
-		static int get_argument_count() { \
-			return get_arg_count_helperr(VariantUtilityFunctions::m_func); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return get_arg_type_helperr(VariantUtilityFunctions::m_func, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return get_ret_type_helperr(VariantUtilityFunctions::m_func); \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			call_helperr(VariantUtilityFunctions::m_func, r_ret, p_args, r_error);                               \
+		}                                                                                                        \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                     \
+			validated_call_helperr(VariantUtilityFunctions::m_func, r_ret, p_args);                              \
+		}                                                                                                        \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                    \
+			ptr_call_helperr(VariantUtilityFunctions::m_func, ret, p_args);                                      \
+		}                                                                                                        \
+		static int get_argument_count() {                                                                        \
+			return get_arg_count_helperr(VariantUtilityFunctions::m_func);                                       \
+		}                                                                                                        \
+		static Variant::Type get_argument_type(int p_arg) {                                                      \
+			return get_arg_type_helperr(VariantUtilityFunctions::m_func, p_arg);                                 \
+		}                                                                                                        \
+		static Variant::Type get_return_type() {                                                                 \
+			return get_ret_type_helperr(VariantUtilityFunctions::m_func);                                        \
+		}                                                                                                        \
+		static bool has_return_type() {                                                                          \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static bool is_vararg() {                                                                                \
+			return false;                                                                                        \
+		}                                                                                                        \
+		static Variant::UtilityFunctionType get_type() {                                                         \
+			return m_category;                                                                                   \
+		}                                                                                                        \
+	};                                                                                                           \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVR(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
-		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError ce; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], ce); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Callable::CallError ce; \
+#define FUNCBINDVR(m_func, m_args, m_category)                                                                          \
+	class Func_##m_func {                                                                                               \
+	public:                                                                                                             \
+		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {        \
+			r_error.error = Callable::CallError::CALL_OK;                                                               \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], r_error);                                              \
+		}                                                                                                               \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                            \
+			Callable::CallError ce;                                                                                     \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], ce);                                                   \
+		}                                                                                                               \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                           \
+			Callable::CallError ce;                                                                                     \
 			PtrToArg<Variant>::encode(VariantUtilityFunctions::m_func(PtrToArg<Variant>::convert(p_args[0]), ce), ret); \
-		} \
-		static int get_argument_count() { \
-			return 1; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+		}                                                                                                               \
+		static int get_argument_count() {                                                                               \
+			return 1;                                                                                                   \
+		}                                                                                                               \
+		static Variant::Type get_argument_type(int p_arg) {                                                             \
+			return Variant::NIL;                                                                                        \
+		}                                                                                                               \
+		static Variant::Type get_return_type() {                                                                        \
+			return Variant::NIL;                                                                                        \
+		}                                                                                                               \
+		static bool has_return_type() {                                                                                 \
+			return true;                                                                                                \
+		}                                                                                                               \
+		static bool is_vararg() {                                                                                       \
+			return false;                                                                                               \
+		}                                                                                                               \
+		static Variant::UtilityFunctionType get_type() {                                                                \
+			return m_category;                                                                                          \
+		}                                                                                                               \
+	};                                                                                                                  \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVR2(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
-		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError ce; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], ce); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Callable::CallError ce; \
-			Variant r; \
+#define FUNCBINDVR2(m_func, m_args, m_category)                                                                                    \
+	class Func_##m_func {                                                                                                          \
+	public:                                                                                                                        \
+		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {                   \
+			r_error.error = Callable::CallError::CALL_OK;                                                                          \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], r_error);                                             \
+		}                                                                                                                          \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                                       \
+			Callable::CallError ce;                                                                                                \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], ce);                                                  \
+		}                                                                                                                          \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                                      \
+			Callable::CallError ce;                                                                                                \
+			Variant r;                                                                                                             \
 			r = VariantUtilityFunctions::m_func(PtrToArg<Variant>::convert(p_args[0]), PtrToArg<Variant>::convert(p_args[1]), ce); \
-			PtrToArg<Variant>::encode(r, ret); \
-		} \
-		static int get_argument_count() { \
-			return 2; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			PtrToArg<Variant>::encode(r, ret);                                                                                     \
+		}                                                                                                                          \
+		static int get_argument_count() {                                                                                          \
+			return 2;                                                                                                              \
+		}                                                                                                                          \
+		static Variant::Type get_argument_type(int p_arg) {                                                                        \
+			return Variant::NIL;                                                                                                   \
+		}                                                                                                                          \
+		static Variant::Type get_return_type() {                                                                                   \
+			return Variant::NIL;                                                                                                   \
+		}                                                                                                                          \
+		static bool has_return_type() {                                                                                            \
+			return true;                                                                                                           \
+		}                                                                                                                          \
+		static bool is_vararg() {                                                                                                  \
+			return false;                                                                                                          \
+		}                                                                                                                          \
+		static Variant::UtilityFunctionType get_type() {                                                                           \
+			return m_category;                                                                                                     \
+		}                                                                                                                          \
+	};                                                                                                                             \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVR3(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
-		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], *p_args[2], r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError ce; \
-			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], *p_args[2], ce); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Callable::CallError ce; \
-			Variant r; \
+#define FUNCBINDVR3(m_func, m_args, m_category)                                                                                                                           \
+	class Func_##m_func {                                                                                                                                                 \
+	public:                                                                                                                                                               \
+		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {                                                          \
+			r_error.error = Callable::CallError::CALL_OK;                                                                                                                 \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], *p_args[2], r_error);                                                                        \
+		}                                                                                                                                                                 \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                                                                              \
+			Callable::CallError ce;                                                                                                                                       \
+			*r_ret = VariantUtilityFunctions::m_func(*p_args[0], *p_args[1], *p_args[2], ce);                                                                             \
+		}                                                                                                                                                                 \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                                                                             \
+			Callable::CallError ce;                                                                                                                                       \
+			Variant r;                                                                                                                                                    \
 			r = VariantUtilityFunctions::m_func(PtrToArg<Variant>::convert(p_args[0]), PtrToArg<Variant>::convert(p_args[1]), PtrToArg<Variant>::convert(p_args[2]), ce); \
-			PtrToArg<Variant>::encode(r, ret); \
-		} \
-		static int get_argument_count() { \
-			return 3; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			PtrToArg<Variant>::encode(r, ret);                                                                                                                            \
+		}                                                                                                                                                                 \
+		static int get_argument_count() {                                                                                                                                 \
+			return 3;                                                                                                                                                     \
+		}                                                                                                                                                                 \
+		static Variant::Type get_argument_type(int p_arg) {                                                                                                               \
+			return Variant::NIL;                                                                                                                                          \
+		}                                                                                                                                                                 \
+		static Variant::Type get_return_type() {                                                                                                                          \
+			return Variant::NIL;                                                                                                                                          \
+		}                                                                                                                                                                 \
+		static bool has_return_type() {                                                                                                                                   \
+			return true;                                                                                                                                                  \
+		}                                                                                                                                                                 \
+		static bool is_vararg() {                                                                                                                                         \
+			return false;                                                                                                                                                 \
+		}                                                                                                                                                                 \
+		static Variant::UtilityFunctionType get_type() {                                                                                                                  \
+			return m_category;                                                                                                                                            \
+		}                                                                                                                                                                 \
+	};                                                                                                                                                                    \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVARARG(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
+#define FUNCBINDVARARG(m_func, m_args, m_category)                                                               \
+	class Func_##m_func {                                                                                        \
+	public:                                                                                                      \
 		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError c; \
-			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, c); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Vector<Variant> args; \
-			for (int i = 0; i < p_argcount; i++) { \
-				args.push_back(PtrToArg<Variant>::convert(p_args[i])); \
-			} \
-			Vector<const Variant *> argsp; \
-			for (int i = 0; i < p_argcount; i++) { \
-				argsp.push_back(&args[i]); \
-			} \
-			Variant r; \
-			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount); \
-			PtrToArg<Variant>::encode(r, ret); \
-		} \
-		static int get_argument_count() { \
-			return 2; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return true; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			r_error.error = Callable::CallError::CALL_OK;                                                        \
+			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, r_error);                               \
+		}                                                                                                        \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                     \
+			Callable::CallError c;                                                                               \
+			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, c);                                     \
+		}                                                                                                        \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                    \
+			Vector<Variant> args;                                                                                \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				args.push_back(PtrToArg<Variant>::convert(p_args[i]));                                           \
+			}                                                                                                    \
+			Vector<const Variant *> argsp;                                                                       \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				argsp.push_back(&args[i]);                                                                       \
+			}                                                                                                    \
+			Variant r;                                                                                           \
+			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount);                                       \
+			PtrToArg<Variant>::encode(r, ret);                                                                   \
+		}                                                                                                        \
+		static int get_argument_count() {                                                                        \
+			return 2;                                                                                            \
+		}                                                                                                        \
+		static Variant::Type get_argument_type(int p_arg) {                                                      \
+			return Variant::NIL;                                                                                 \
+		}                                                                                                        \
+		static Variant::Type get_return_type() {                                                                 \
+			return Variant::NIL;                                                                                 \
+		}                                                                                                        \
+		static bool has_return_type() {                                                                          \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static bool is_vararg() {                                                                                \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static Variant::UtilityFunctionType get_type() {                                                         \
+			return m_category;                                                                                   \
+		}                                                                                                        \
+	};                                                                                                           \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVARARGS(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
+#define FUNCBINDVARARGS(m_func, m_args, m_category)                                                              \
+	class Func_##m_func {                                                                                        \
+	public:                                                                                                      \
 		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError c; \
-			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, c); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Vector<Variant> args; \
-			for (int i = 0; i < p_argcount; i++) { \
-				args.push_back(PtrToArg<Variant>::convert(p_args[i])); \
-			} \
-			Vector<const Variant *> argsp; \
-			for (int i = 0; i < p_argcount; i++) { \
-				argsp.push_back(&args[i]); \
-			} \
-			Variant r; \
-			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount); \
-			PtrToArg<String>::encode(r.operator String(), ret); \
-		} \
-		static int get_argument_count() { \
-			return 1; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::STRING; \
-		} \
-		static bool has_return_type() { \
-			return true; \
-		} \
-		static bool is_vararg() { \
-			return true; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			r_error.error = Callable::CallError::CALL_OK;                                                        \
+			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, r_error);                               \
+		}                                                                                                        \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                     \
+			Callable::CallError c;                                                                               \
+			*r_ret = VariantUtilityFunctions::m_func(p_args, p_argcount, c);                                     \
+		}                                                                                                        \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                    \
+			Vector<Variant> args;                                                                                \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				args.push_back(PtrToArg<Variant>::convert(p_args[i]));                                           \
+			}                                                                                                    \
+			Vector<const Variant *> argsp;                                                                       \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				argsp.push_back(&args[i]);                                                                       \
+			}                                                                                                    \
+			Variant r;                                                                                           \
+			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount);                                       \
+			PtrToArg<String>::encode(r.operator String(), ret);                                                  \
+		}                                                                                                        \
+		static int get_argument_count() {                                                                        \
+			return 1;                                                                                            \
+		}                                                                                                        \
+		static Variant::Type get_argument_type(int p_arg) {                                                      \
+			return Variant::NIL;                                                                                 \
+		}                                                                                                        \
+		static Variant::Type get_return_type() {                                                                 \
+			return Variant::STRING;                                                                              \
+		}                                                                                                        \
+		static bool has_return_type() {                                                                          \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static bool is_vararg() {                                                                                \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static Variant::UtilityFunctionType get_type() {                                                         \
+			return m_category;                                                                                   \
+		}                                                                                                        \
+	};                                                                                                           \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
-#define FUNCBINDVARARGV_CNAME(m_func, m_func_cname, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
+#define FUNCBINDVARARGV_CNAME(m_func, m_func_cname, m_args, m_category)                                          \
+	class Func_##m_func {                                                                                        \
+	public:                                                                                                      \
 		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			r_error.error = Callable::CallError::CALL_OK; \
-			VariantUtilityFunctions::m_func_cname(p_args, p_argcount, r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			Callable::CallError c; \
-			VariantUtilityFunctions::m_func_cname(p_args, p_argcount, c); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			Vector<Variant> args; \
-			for (int i = 0; i < p_argcount; i++) { \
-				args.push_back(PtrToArg<Variant>::convert(p_args[i])); \
-			} \
-			Vector<const Variant *> argsp; \
-			for (int i = 0; i < p_argcount; i++) { \
-				argsp.push_back(&args[i]); \
-			} \
-			Variant r; \
-			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount); \
-		} \
-		static int get_argument_count() { \
-			return 1; \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return Variant::NIL; \
-		} \
-		static Variant::Type get_return_type() { \
-			return Variant::NIL; \
-		} \
-		static bool has_return_type() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return true; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			r_error.error = Callable::CallError::CALL_OK;                                                        \
+			VariantUtilityFunctions::m_func_cname(p_args, p_argcount, r_error);                                  \
+		}                                                                                                        \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                     \
+			Callable::CallError c;                                                                               \
+			VariantUtilityFunctions::m_func_cname(p_args, p_argcount, c);                                        \
+		}                                                                                                        \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                    \
+			Vector<Variant> args;                                                                                \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				args.push_back(PtrToArg<Variant>::convert(p_args[i]));                                           \
+			}                                                                                                    \
+			Vector<const Variant *> argsp;                                                                       \
+			for (int i = 0; i < p_argcount; i++) {                                                               \
+				argsp.push_back(&args[i]);                                                                       \
+			}                                                                                                    \
+			Variant r;                                                                                           \
+			validated_call(&r, (const Variant **)argsp.ptr(), p_argcount);                                       \
+		}                                                                                                        \
+		static int get_argument_count() {                                                                        \
+			return 1;                                                                                            \
+		}                                                                                                        \
+		static Variant::Type get_argument_type(int p_arg) {                                                      \
+			return Variant::NIL;                                                                                 \
+		}                                                                                                        \
+		static Variant::Type get_return_type() {                                                                 \
+			return Variant::NIL;                                                                                 \
+		}                                                                                                        \
+		static bool has_return_type() {                                                                          \
+			return false;                                                                                        \
+		}                                                                                                        \
+		static bool is_vararg() {                                                                                \
+			return true;                                                                                         \
+		}                                                                                                        \
+		static Variant::UtilityFunctionType get_type() {                                                         \
+			return m_category;                                                                                   \
+		}                                                                                                        \
+	};                                                                                                           \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
 #define FUNCBINDVARARGV(m_func, m_args, m_category) FUNCBINDVARARGV_CNAME(m_func, m_func, m_args, m_category)
 
-#define FUNCBIND(m_func, m_args, m_category) \
-	class Func_##m_func { \
-	public: \
+#define FUNCBIND(m_func, m_args, m_category)                                                                     \
+	class Func_##m_func {                                                                                        \
+	public:                                                                                                      \
 		static void call(Variant *r_ret, const Variant **p_args, int p_argcount, Callable::CallError &r_error) { \
-			call_helper(VariantUtilityFunctions::m_func, p_args, r_error); \
-		} \
-		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) { \
-			validated_call_helper(VariantUtilityFunctions::m_func, p_args); \
-		} \
-		static void ptrcall(void *ret, const void **p_args, int p_argcount) { \
-			ptr_call_helper(VariantUtilityFunctions::m_func, p_args); \
-		} \
-		static int get_argument_count() { \
-			return get_arg_count_helper(VariantUtilityFunctions::m_func); \
-		} \
-		static Variant::Type get_argument_type(int p_arg) { \
-			return get_arg_type_helper(VariantUtilityFunctions::m_func, p_arg); \
-		} \
-		static Variant::Type get_return_type() { \
-			return get_ret_type_helper(VariantUtilityFunctions::m_func); \
-		} \
-		static bool has_return_type() { \
-			return false; \
-		} \
-		static bool is_vararg() { \
-			return false; \
-		} \
-		static Variant::UtilityFunctionType get_type() { \
-			return m_category; \
-		} \
-	}; \
+			call_helper(VariantUtilityFunctions::m_func, p_args, r_error);                                       \
+		}                                                                                                        \
+		static void validated_call(Variant *r_ret, const Variant **p_args, int p_argcount) {                     \
+			validated_call_helper(VariantUtilityFunctions::m_func, p_args);                                      \
+		}                                                                                                        \
+		static void ptrcall(void *ret, const void **p_args, int p_argcount) {                                    \
+			ptr_call_helper(VariantUtilityFunctions::m_func, p_args);                                            \
+		}                                                                                                        \
+		static int get_argument_count() {                                                                        \
+			return get_arg_count_helper(VariantUtilityFunctions::m_func);                                        \
+		}                                                                                                        \
+		static Variant::Type get_argument_type(int p_arg) {                                                      \
+			return get_arg_type_helper(VariantUtilityFunctions::m_func, p_arg);                                  \
+		}                                                                                                        \
+		static Variant::Type get_return_type() {                                                                 \
+			return get_ret_type_helper(VariantUtilityFunctions::m_func);                                         \
+		}                                                                                                        \
+		static bool has_return_type() {                                                                          \
+			return false;                                                                                        \
+		}                                                                                                        \
+		static bool is_vararg() {                                                                                \
+			return false;                                                                                        \
+		}                                                                                                        \
+		static Variant::UtilityFunctionType get_type() {                                                         \
+			return m_category;                                                                                   \
+		}                                                                                                        \
+	};                                                                                                           \
 	register_utility_function<Func_##m_func>(#m_func, m_args)
 
 struct VariantUtilityFunctionInfo {
diff --git a/engine/core/variant/variant_utility.h b/engine/core/variant/variant_utility.h
index d8a6fafd..a76e1b90 100644
--- a/engine/core/variant/variant_utility.h
+++ b/engine/core/variant/variant_utility.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/variant/variant.h"
+#include "variant.h"
 
 struct VariantUtilityFunctions {
 	// Math
@@ -74,8 +74,8 @@ struct VariantUtilityFunctions {
 	static bool is_equal_approx(double x, double y);
 	static bool is_zero_approx(double x);
 	static bool is_finite(double x);
-	static double ease(double x, double curve);
-	static int step_decimals(double step);
+	static double ease(float x, float curve);
+	static int step_decimals(float step);
 	static Variant snapped(const Variant &x, const Variant &step, Callable::CallError &r_error);
 	static double snappedf(double x, double step);
 	static int64_t snappedi(double x, int64_t step);
diff --git a/engine/core/version.h b/engine/core/version.h
index e34870d1..3b75052f 100644
--- a/engine/core/version.h
+++ b/engine/core/version.h
@@ -32,6 +32,8 @@
 
 #include "core/version_generated.gen.h" // IWYU pragma: export
 
+#include <stdint.h> // NOLINT(modernize-deprecated-headers) FIXME: MinGW compilation fails when changing to C++ Header.
+
 // Copied from typedefs.h to stay lean.
 #ifndef _STR
 #define _STR(m_x) #m_x
@@ -83,7 +85,7 @@ extern const char *const GODOT_VERSION_HASH;
 
 // Git commit date UNIX timestamp (in seconds), generated at build time in `core/version_hash.gen.cpp`.
 // Set to 0 if unknown.
-extern const unsigned long long GODOT_VERSION_TIMESTAMP;
+extern const uint64_t GODOT_VERSION_TIMESTAMP;
 
 #ifndef DISABLE_DEPRECATED
 // Compatibility with pre-4.5 modules.
diff --git a/engine/doc/class.xsd b/engine/doc/class.xsd
index 7eaddb06..28e02e87 100644
--- a/engine/doc/class.xsd
+++ b/engine/doc/class.xsd
@@ -296,8 +296,7 @@
 				</xs:element>
 			</xs:sequence>
 			<xs:attribute type="xs:string" name="name" />
-			<xs:attribute type="xs:string" name="inherits" use="optional" />
-			<xs:attribute type="xs:string" name="api_type" use="optional" />
+			<xs:attribute type="xs:string" name="inherits" />
 			<!-- deprecated -->
 			<xs:attribute type="xs:float" name="version" use="optional" />
 			<xs:attribute type="xs:boolean" name="is_deprecated" use="optional" />
diff --git a/engine/doc/classes/@GlobalScope.xml b/engine/doc/classes/@GlobalScope.xml
index a3e6914e..c3a35e6a 100644
--- a/engine/doc/classes/@GlobalScope.xml
+++ b/engine/doc/classes/@GlobalScope.xml
@@ -678,7 +678,7 @@
 			<return type="float" />
 			<param index="0" name="x" type="float" />
 			<description>
-				Returns the [url=https://en.wikipedia.org/wiki/Natural_logarithm]natural logarithm[/url] of [param x] (base [url=https://en.wikipedia.org/wiki/E_(mathematical_constant)]e[/url], with [i]e[/i] being approximately 2.71828). This is the amount of time needed to reach a certain level of continuous growth.
+				Returns the [url=https://en.wikipedia.org/wiki/Natural_logarithm]natural logarithm[/url] of [param x] (base [url=https://en.wikipedia.org/wiki/E_(mathematical_constant)][i]e[/i][/url], with [i]e[/i] being approximately 2.71828). This is the amount of time needed to reach a certain level of continuous growth.
 				[b]Note:[/b] This is not the same as the "log" function on most calculators, which uses a base 10 logarithm. To use base 10 logarithm, use [code]log(x) / log(10)[/code].
 				[codeblock]
 				log(10) # Returns 2.302585
@@ -1547,9 +1547,6 @@
 		</method>
 	</methods>
 	<members>
-		<member name="AccessibilityServer" type="AccessibilityServer" setter="" getter="">
-			The [AccessibilityServer] singleton.
-		</member>
 		<member name="AudioServer" type="AudioServer" setter="" getter="">
 			The [AudioServer] singleton.
 		</member>
@@ -1575,10 +1572,6 @@
 		<member name="GDExtensionManager" type="GDExtensionManager" setter="" getter="">
 			The [GDExtensionManager] singleton.
 		</member>
-		<member name="GDScriptLanguageProtocol" type="GDScriptLanguageProtocol" setter="" getter="">
-			The [GDScriptLanguageProtocol] singleton.
-			[b]Note:[/b] Only available in editor builds.
-		</member>
 		<member name="Geometry2D" type="Geometry2D" setter="" getter="">
 			The [Geometry2D] singleton.
 		</member>
@@ -2374,20 +2367,10 @@
 			Section sign ([code]§[/code]) key.
 		</constant>
 		<constant name="KEY_CODE_MASK" value="8388607" enum="KeyModifierMask" is_bitfield="true">
-			Bit mask with all bits enabled except for modifier keys. Apply it to remove modifiers.
-			[codeblock]
-			var keycode = KEY_A | KEY_MASK_SHIFT
-			keycode = keycode &amp; KEY_CODE_MASK
-			print(keycode) # KEY_A
-			[/codeblock]
+			Key Code mask.
 		</constant>
 		<constant name="KEY_MODIFIER_MASK" value="2130706432" enum="KeyModifierMask" is_bitfield="true">
-			Bit mask with all modifier bits enabled. Apply it to isolate modifiers.
-			[codeblock]
-			var keycode = KEY_A | KEY_MASK_SHIFT
-			keycode = keycode &amp; KEY_MODIFIER_MASK
-			print(keycode) # KEY_MASK_SHIFT
-			[/codeblock]
+			Modifier key mask.
 		</constant>
 		<constant name="KEY_MASK_CMD_OR_CTRL" value="16777216" enum="KeyModifierMask" is_bitfield="true">
 			Automatically remapped to [constant KEY_META] on macOS and [constant KEY_CTRL] on other platforms, this mask is never set in the actual events, and should be used for key mapping only.
@@ -2531,22 +2514,7 @@
 		<constant name="JOY_BUTTON_TOUCHPAD" value="20" enum="JoyButton">
 			Game controller SDL touchpad button.
 		</constant>
-		<constant name="JOY_BUTTON_MISC2" value="21" enum="JoyButton">
-			Game controller SDL miscellaneous button. Used by Nintendo Switch 2 Pro Controller and Horipad Steam controllers.
-		</constant>
-		<constant name="JOY_BUTTON_MISC3" value="22" enum="JoyButton">
-			Game controller SDL miscellaneous button.
-		</constant>
-		<constant name="JOY_BUTTON_MISC4" value="23" enum="JoyButton">
-			Game controller SDL miscellaneous button.
-		</constant>
-		<constant name="JOY_BUTTON_MISC5" value="24" enum="JoyButton">
-			Game controller SDL miscellaneous button.
-		</constant>
-		<constant name="JOY_BUTTON_MISC6" value="25" enum="JoyButton">
-			Game controller SDL miscellaneous button.
-		</constant>
-		<constant name="JOY_BUTTON_SDL_MAX" value="26" enum="JoyButton">
+		<constant name="JOY_BUTTON_SDL_MAX" value="21" enum="JoyButton">
 			The number of SDL game controller buttons.
 		</constant>
 		<constant name="JOY_BUTTON_MAX" value="128" enum="JoyButton">
@@ -2801,13 +2769,13 @@
 			[b]Note:[/b] If a built-in method returns this code, please open an issue on [url=https://github.com/godotengine/godot/issues]the GitHub Issue Tracker[/url].
 		</constant>
 		<constant name="ERR_PRINTER_ON_FIRE" value="48" enum="Error">
-			Printer on fire error (this is an easter egg, no built-in methods return this error code).
+			Printer on fire error (This is an easter egg, no built-in methods return this error code).
 		</constant>
 		<constant name="PROPERTY_HINT_NONE" value="0" enum="PropertyHint">
-			The property has no hint for the editor. However, the hint string is still read, which can be used to specify a suffix for a property that has no range limit (see [constant PROPERTY_HINT_RANGE]'s description).
+			The property has no hint for the editor.
 		</constant>
 		<constant name="PROPERTY_HINT_RANGE" value="1" enum="PropertyHint">
-			Hints that an [int], [float], or packed/typed [Array] property containing [int] or [float] types should be within a range specified via the hint string [code]"min,max"[/code] or [code]"min,max,step"[/code]. The hint string can optionally include [code]"or_greater"[/code] and/or [code]"or_less"[/code] to allow manual input going respectively above the max or below the min values.
+			Hints that an [int] or [float] property should be within a range specified via the hint string [code]"min,max"[/code] or [code]"min,max,step"[/code]. The hint string can optionally include [code]"or_greater"[/code] and/or [code]"or_less"[/code] to allow manual input going respectively above the max or below the min values.
 			[b]Example:[/b] [code]"-360,360,1,or_greater,or_less"[/code].
 			Additionally, other keywords can be included: [code]"exp"[/code] for exponential range editing, [code]"radians_as_degrees"[/code] for editing radian angles in degrees (the range values are also in degrees), [code]"degrees"[/code] to hint at an angle, [code]"prefer_slider"[/code] to show the slider for integers, [code]"hide_control"[/code] to hide the slider or up-down arrows, and [code]"suffix:px/s"[/code] to display a suffix indicating the value's unit (e.g. [code]px/s[/code] for pixels per second).
 		</constant>
@@ -2820,10 +2788,10 @@
 			Unlike [constant PROPERTY_HINT_ENUM], a property with this hint still accepts arbitrary values and can be empty. The list of values serves to suggest possible values.
 		</constant>
 		<constant name="PROPERTY_HINT_EXP_EASING" value="4" enum="PropertyHint">
-			Hints that a [float] property should be edited using a curve editor showing an exponential easing function. The hint string can include [code]"attenuation"[/code] to flip the curve horizontally and/or [code]"positive_only"[/code] to exclude in/out easing and limit values to be greater than or equal to zero. This displays differently to a property that uses [constant PROPERTY_HINT_RANGE] with the [code]"exp"[/code] keyword, as it's edited with a slider instead of a curve editor.
+			Hints that a [float] property should be edited via an exponential easing function. The hint string can include [code]"attenuation"[/code] to flip the curve horizontally and/or [code]"positive_only"[/code] to exclude in/out easing and limit values to be greater than or equal to zero.
 		</constant>
 		<constant name="PROPERTY_HINT_LINK" value="5" enum="PropertyHint">
-			Hints that a vector property should allow its components to be linked. For example, this allows [member Vector2.x] and [member Vector2.y] to be edited together. This hint is supported on [Vector2], [Vector2i], [Vector3], [Vector3i], [Vector4], and [Vector4i]. The hint string can be used to specify a suffix indicating each value's unit with the [code]"suffix:px/s"[/code] syntax.
+			Hints that a vector property should allow its components to be linked. For example, this allows [member Vector2.x] and [member Vector2.y] to be edited together.
 		</constant>
 		<constant name="PROPERTY_HINT_FLAGS" value="6" enum="PropertyHint">
 			Hints that an [int] property is a bitmask with named bit flags.
@@ -3139,39 +3107,6 @@
 		<constant name="METHOD_FLAGS_DEFAULT" value="1" enum="MethodFlags" is_bitfield="true">
 			Default method flags (normal).
 		</constant>
-		<constant name="UINT8_MAX" value="255">
-			Maximum value of an 8-bit unsigned integer.
-		</constant>
-		<constant name="UINT16_MAX" value="65535">
-			Maximum value of a 16-bit unsigned integer.
-		</constant>
-		<constant name="UINT32_MAX" value="4294967295">
-			Maximum value of a 32-bit unsigned integer.
-		</constant>
-		<constant name="INT8_MIN" value="-128">
-			Minimum value of an 8-bit signed integer.
-		</constant>
-		<constant name="INT8_MAX" value="127">
-			Maximum value of an 8-bit signed integer.
-		</constant>
-		<constant name="INT16_MIN" value="-32768">
-			Minimum value of a 16-bit signed integer.
-		</constant>
-		<constant name="INT16_MAX" value="32767">
-			Maximum value of a 16-bit signed integer.
-		</constant>
-		<constant name="INT32_MIN" value="-2147483648">
-			Minimum value of a 32-bit signed integer.
-		</constant>
-		<constant name="INT32_MAX" value="2147483647">
-			Maximum value of a 32-bit signed integer.
-		</constant>
-		<constant name="INT64_MIN" value="-9223372036854775808">
-			Minimum value of a 64-bit signed integer.
-		</constant>
-		<constant name="INT64_MAX" value="9223372036854775807">
-			Maximum value of a 64-bit signed integer.
-		</constant>
 		<constant name="TYPE_NIL" value="0" enum="Variant.Type">
 			Variable is [code]null[/code].
 		</constant>
diff --git a/engine/doc/classes/AESContext.xml b/engine/doc/classes/AESContext.xml
index 6a04d2dd..1ee376b6 100644
--- a/engine/doc/classes/AESContext.xml
+++ b/engine/doc/classes/AESContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AESContext" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AESContext" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to AES encryption/decryption of raw data.
 	</brief_description>
diff --git a/engine/doc/classes/AStar2D.xml b/engine/doc/classes/AStar2D.xml
index 73d93e1a..31df1c7b 100644
--- a/engine/doc/classes/AStar2D.xml
+++ b/engine/doc/classes/AStar2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AStar2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AStar2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An implementation of A* for finding the shortest path between two vertices on a connected graph in 2D space.
 	</brief_description>
diff --git a/engine/doc/classes/AStar3D.xml b/engine/doc/classes/AStar3D.xml
index 5edc3789..27a459a8 100644
--- a/engine/doc/classes/AStar3D.xml
+++ b/engine/doc/classes/AStar3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AStar3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AStar3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An implementation of A* for finding the shortest path between two vertices on a connected graph in 3D space.
 	</brief_description>
diff --git a/engine/doc/classes/AStarGrid2D.xml b/engine/doc/classes/AStarGrid2D.xml
index 2b5fce7a..1a62c2b6 100644
--- a/engine/doc/classes/AStarGrid2D.xml
+++ b/engine/doc/classes/AStarGrid2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AStarGrid2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AStarGrid2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An implementation of A* for finding the shortest path between two points on a partial 2D grid.
 	</brief_description>
diff --git a/engine/doc/classes/AcceptDialog.xml b/engine/doc/classes/AcceptDialog.xml
index 9468bab6..1fc85cf7 100644
--- a/engine/doc/classes/AcceptDialog.xml
+++ b/engine/doc/classes/AcceptDialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AcceptDialog" inherits="Window" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AcceptDialog" inherits="Window" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base dialog used for user notification.
 	</brief_description>
diff --git a/engine/doc/classes/AccessibilityServer.xml b/engine/doc/classes/AccessibilityServer.xml
deleted file mode 100644
index fad0c2ab..00000000
--- a/engine/doc/classes/AccessibilityServer.xml
+++ /dev/null
@@ -1,927 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="AccessibilityServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		A server interface for screen reader support.
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="create_element">
-			<return type="RID" />
-			<param index="0" name="window_id" type="int" />
-			<param index="1" name="role" type="int" enum="AccessibilityServer.AccessibilityRole" />
-			<description>
-				Creates a new, empty accessibility element resource.
-				[b]Note:[/b] An accessibility element is created and freed automatically for each [Node]. In general, this function should not be called manually.
-			</description>
-		</method>
-		<method name="create_sub_element">
-			<return type="RID" />
-			<param index="0" name="parent_rid" type="RID" />
-			<param index="1" name="role" type="int" enum="AccessibilityServer.AccessibilityRole" />
-			<param index="2" name="insert_pos" type="int" default="-1" />
-			<description>
-				Creates a new, empty accessibility sub-element resource. Sub-elements can be used to provide accessibility information for objects which are not [Node]s, such as list items, table cells, or menu items. Sub-elements are freed automatically when the parent element is freed, or can be freed early using the [method free_element] method.
-			</description>
-		</method>
-		<method name="create_sub_text_edit_elements">
-			<return type="RID" />
-			<param index="0" name="parent_rid" type="RID" />
-			<param index="1" name="shaped_text" type="RID" />
-			<param index="2" name="min_height" type="float" />
-			<param index="3" name="insert_pos" type="int" default="-1" />
-			<param index="4" name="is_last_line" type="bool" default="false" />
-			<description>
-				Creates a new, empty accessibility sub-element from the shaped text buffer. Sub-elements are freed automatically when the parent element is freed, or can be freed early using the [method free_element] method.
-				If [param is_last_line] is [code]true[/code], no trailing newline is appended to the text content. Set to [code]true[/code] for the last line in multi-line text fields and for single-line text fields.
-			</description>
-		</method>
-		<method name="element_get_meta" qualifiers="const">
-			<return type="Variant" />
-			<param index="0" name="id" type="RID" />
-			<description>
-				Returns the metadata of the accessibility element [param id].
-			</description>
-		</method>
-		<method name="element_set_meta">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="meta" type="Variant" />
-			<description>
-				Sets the metadata of the accessibility element [param id] to [param meta].
-			</description>
-		</method>
-		<method name="free_element">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<description>
-				Frees the accessibility element [param id] created by [method create_element], [method create_sub_element], or [method create_sub_text_edit_elements].
-			</description>
-		</method>
-		<method name="get_window_root" qualifiers="const">
-			<return type="RID" />
-			<param index="0" name="window_id" type="int" />
-			<description>
-				Returns the main accessibility element of the OS native window.
-			</description>
-		</method>
-		<method name="has_element" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="id" type="RID" />
-			<description>
-				Returns [code]true[/code] if [param id] is a valid accessibility element.
-			</description>
-		</method>
-		<method name="is_supported" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if screen reader is support by this implementation.
-			</description>
-		</method>
-		<method name="set_window_focused">
-			<return type="void" />
-			<param index="0" name="window_id" type="int" />
-			<param index="1" name="focused" type="bool" />
-			<description>
-				Sets the window focused state for assistive apps.
-				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
-				[b]Note:[/b] Advanced users only! [Window] objects call this method automatically.
-			</description>
-		</method>
-		<method name="set_window_rect">
-			<return type="void" />
-			<param index="0" name="window_id" type="int" />
-			<param index="1" name="rect_out" type="Rect2" />
-			<param index="2" name="rect_in" type="Rect2" />
-			<description>
-				Sets window outer (with decorations) and inner (without decorations) bounds for assistive apps.
-				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
-				[b]Note:[/b] Advanced users only! [Window] objects call this method automatically.
-			</description>
-		</method>
-		<method name="update_add_action">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="action" type="int" enum="AccessibilityServer.AccessibilityAction" />
-			<param index="2" name="callable" type="Callable" />
-			<description>
-				Adds a callback for the accessibility action (action which can be performed by using a special screen reader command or buttons on the Braille display), and marks this action as supported. The action callback receives one [Variant] argument, which value depends on action type.
-			</description>
-		</method>
-		<method name="update_add_child">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="child_id" type="RID" />
-			<description>
-				Adds a child accessibility element.
-				[b]Note:[/b] [Node] children and sub-elements are added to the child list automatically.
-			</description>
-		</method>
-		<method name="update_add_custom_action">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="action_id" type="int" />
-			<param index="2" name="action_description" type="String" />
-			<description>
-				Adds support for a custom accessibility action. [param action_id] is passed as an argument to the callback of [constant ACTION_CUSTOM] action.
-			</description>
-		</method>
-		<method name="update_add_related_controls">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that is controlled by this element.
-			</description>
-		</method>
-		<method name="update_add_related_described_by">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that describes this element.
-			</description>
-		</method>
-		<method name="update_add_related_details">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that details this element.
-			</description>
-		</method>
-		<method name="update_add_related_flow_to">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that this element flow into.
-			</description>
-		</method>
-		<method name="update_add_related_labeled_by">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that labels this element.
-			</description>
-		</method>
-		<method name="update_add_related_radio_group">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="related_id" type="RID" />
-			<description>
-				Adds an element that is part of the same radio group.
-				[b]Note:[/b] This method should be called on each element of the group, using all other elements as [param related_id].
-			</description>
-		</method>
-		<method name="update_set_active_descendant">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="other_id" type="RID" />
-			<description>
-				Adds an element that is an active descendant of this element.
-			</description>
-		</method>
-		<method name="update_set_background_color">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="color" type="Color" />
-			<description>
-				Sets element background color.
-			</description>
-		</method>
-		<method name="update_set_bounds">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="p_rect" type="Rect2" />
-			<description>
-				Sets element bounding box, relative to the node position.
-			</description>
-		</method>
-		<method name="update_set_braille_label">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="name" type="String" />
-			<description>
-				Sets element accessibility label for Braille display.
-			</description>
-		</method>
-		<method name="update_set_braille_role_description">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="description" type="String" />
-			<description>
-				Sets element accessibility role description for Braille display.
-			</description>
-		</method>
-		<method name="update_set_checked">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="checekd" type="bool" />
-			<description>
-				Sets element checked state.
-			</description>
-		</method>
-		<method name="update_set_classname">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="classname" type="String" />
-			<description>
-				Sets element class name.
-			</description>
-		</method>
-		<method name="update_set_color_value">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="color" type="Color" />
-			<description>
-				Sets element color value.
-			</description>
-		</method>
-		<method name="update_set_description">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="description" type="String" />
-			<description>
-				Sets element accessibility description.
-			</description>
-		</method>
-		<method name="update_set_error_message">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="other_id" type="RID" />
-			<description>
-				Sets an element which contains an error message for this element.
-			</description>
-		</method>
-		<method name="update_set_extra_info">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="name" type="String" />
-			<description>
-				Sets element accessibility extra information added to the element name.
-			</description>
-		</method>
-		<method name="update_set_flag">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="flag" type="int" enum="AccessibilityServer.AccessibilityFlags" />
-			<param index="2" name="value" type="bool" />
-			<description>
-				Sets element flag.
-			</description>
-		</method>
-		<method name="update_set_focus">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<description>
-				Sets currently focused element.
-			</description>
-		</method>
-		<method name="update_set_foreground_color">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="color" type="Color" />
-			<description>
-				Sets element foreground color.
-			</description>
-		</method>
-		<method name="update_set_in_page_link_target">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="other_id" type="RID" />
-			<description>
-				Sets target element for the link.
-			</description>
-		</method>
-		<method name="update_set_language">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="language" type="String" />
-			<description>
-				Sets element text language.
-			</description>
-		</method>
-		<method name="update_set_list_item_count">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="size" type="int" />
-			<description>
-				Sets number of items in the list.
-			</description>
-		</method>
-		<method name="update_set_list_item_expanded">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="expanded" type="bool" />
-			<description>
-				Sets list/tree item expanded status.
-			</description>
-		</method>
-		<method name="update_set_list_item_index">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Sets the position of the element in the list.
-			</description>
-		</method>
-		<method name="update_set_list_item_level">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="level" type="int" />
-			<description>
-				Sets the hierarchical level of the element in the list.
-			</description>
-		</method>
-		<method name="update_set_list_item_selected">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="selected" type="bool" />
-			<description>
-				Sets list/tree item selected status.
-			</description>
-		</method>
-		<method name="update_set_list_orientation">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="vertical" type="bool" />
-			<description>
-				Sets the orientation of the list elements.
-			</description>
-		</method>
-		<method name="update_set_live">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="live" type="int" enum="AccessibilityServer.AccessibilityLiveMode" />
-			<description>
-				Sets the priority of the live region updates.
-			</description>
-		</method>
-		<method name="update_set_member_of">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="group_id" type="RID" />
-			<description>
-				Sets the element to be a member of the group.
-			</description>
-		</method>
-		<method name="update_set_name">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="name" type="String" />
-			<description>
-				Sets element accessibility name.
-			</description>
-		</method>
-		<method name="update_set_next_on_line">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="other_id" type="RID" />
-			<description>
-				Sets next element on the line.
-			</description>
-		</method>
-		<method name="update_set_num_jump">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="jump" type="float" />
-			<description>
-				Sets numeric value jump.
-			</description>
-		</method>
-		<method name="update_set_num_range">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="min" type="float" />
-			<param index="2" name="max" type="float" />
-			<description>
-				Sets numeric value range.
-			</description>
-		</method>
-		<method name="update_set_num_step">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="step" type="float" />
-			<description>
-				Sets numeric value step.
-			</description>
-		</method>
-		<method name="update_set_num_value">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="position" type="float" />
-			<description>
-				Sets numeric value.
-			</description>
-		</method>
-		<method name="update_set_placeholder">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="placeholder" type="String" />
-			<description>
-				Sets placeholder text.
-			</description>
-		</method>
-		<method name="update_set_popup_type">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="popup" type="int" enum="AccessibilityServer.AccessibilityPopupType" />
-			<description>
-				Sets popup type for popup buttons.
-			</description>
-		</method>
-		<method name="update_set_previous_on_line">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="other_id" type="RID" />
-			<description>
-				Sets previous element on the line.
-			</description>
-		</method>
-		<method name="update_set_role">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="role" type="int" enum="AccessibilityServer.AccessibilityRole" />
-			<description>
-				Sets element accessibility role.
-			</description>
-		</method>
-		<method name="update_set_role_description">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="description" type="String" />
-			<description>
-				Sets element accessibility role description text.
-			</description>
-		</method>
-		<method name="update_set_scroll_x">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="position" type="float" />
-			<description>
-				Sets scroll bar x position.
-			</description>
-		</method>
-		<method name="update_set_scroll_x_range">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="min" type="float" />
-			<param index="2" name="max" type="float" />
-			<description>
-				Sets scroll bar x range.
-			</description>
-		</method>
-		<method name="update_set_scroll_y">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="position" type="float" />
-			<description>
-				Sets scroll bar y position.
-			</description>
-		</method>
-		<method name="update_set_scroll_y_range">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="min" type="float" />
-			<param index="2" name="max" type="float" />
-			<description>
-				Sets scroll bar y range.
-			</description>
-		</method>
-		<method name="update_set_shortcut">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="shortcut" type="String" />
-			<description>
-				Sets the list of keyboard shortcuts used by element.
-			</description>
-		</method>
-		<method name="update_set_state_description">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="description" type="String" />
-			<description>
-				Sets human-readable description of the current checked state.
-			</description>
-		</method>
-		<method name="update_set_table_cell_position">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="row_index" type="int" />
-			<param index="2" name="column_index" type="int" />
-			<description>
-				Sets cell position in the table.
-			</description>
-		</method>
-		<method name="update_set_table_cell_span">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="row_span" type="int" />
-			<param index="2" name="column_span" type="int" />
-			<description>
-				Sets cell row/column span.
-			</description>
-		</method>
-		<method name="update_set_table_column_count">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="count" type="int" />
-			<description>
-				Sets number of columns in the table.
-			</description>
-		</method>
-		<method name="update_set_table_column_index">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Sets position of the column.
-			</description>
-		</method>
-		<method name="update_set_table_row_count">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="count" type="int" />
-			<description>
-				Sets number of rows in the table.
-			</description>
-		</method>
-		<method name="update_set_table_row_index">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Sets position of the row in the table.
-			</description>
-		</method>
-		<method name="update_set_text_align">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="align" type="int" enum="HorizontalAlignment" />
-			<description>
-				Sets element text alignment.
-			</description>
-		</method>
-		<method name="update_set_text_decorations">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="underline" type="bool" />
-			<param index="2" name="strikethrough" type="bool" />
-			<param index="3" name="overline" type="bool" />
-			<param index="4" name="color" type="Color" default="Color(0, 0, 0, 1)" />
-			<description>
-				Sets text underline/overline/strikethrough.
-			</description>
-		</method>
-		<method name="update_set_text_orientation">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="vertical" type="bool" />
-			<description>
-				Sets text orientation.
-			</description>
-		</method>
-		<method name="update_set_text_selection">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="text_start_id" type="RID" />
-			<param index="2" name="start_char" type="int" />
-			<param index="3" name="text_end_id" type="RID" />
-			<param index="4" name="end_char" type="int" />
-			<description>
-				Sets text selection to the text field. [param text_start_id] and [param text_end_id] should be elements created by [method create_sub_text_edit_elements]. Character offsets are relative to the corresponding element.
-			</description>
-		</method>
-		<method name="update_set_tooltip">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="tooltip" type="String" />
-			<description>
-				Sets tooltip text.
-			</description>
-		</method>
-		<method name="update_set_transform">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="transform" type="Transform2D" />
-			<description>
-				Sets element 2D transform.
-			</description>
-		</method>
-		<method name="update_set_url">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="url" type="String" />
-			<description>
-				Sets link URL.
-			</description>
-		</method>
-		<method name="update_set_value">
-			<return type="void" />
-			<param index="0" name="id" type="RID" />
-			<param index="1" name="value" type="String" />
-			<description>
-				Sets element text value.
-			</description>
-		</method>
-	</methods>
-	<constants>
-		<constant name="ROLE_UNKNOWN" value="0" enum="AccessibilityRole">
-			Unknown or custom role.
-		</constant>
-		<constant name="ROLE_DEFAULT_BUTTON" value="1" enum="AccessibilityRole">
-			Default dialog button element.
-		</constant>
-		<constant name="ROLE_AUDIO" value="2" enum="AccessibilityRole">
-			Audio player element.
-		</constant>
-		<constant name="ROLE_VIDEO" value="3" enum="AccessibilityRole">
-			Video player element.
-		</constant>
-		<constant name="ROLE_STATIC_TEXT" value="4" enum="AccessibilityRole">
-			Non-editable text label.
-		</constant>
-		<constant name="ROLE_CONTAINER" value="5" enum="AccessibilityRole">
-			Container element. Elements with this role are used for internal structure and ignored by screen readers.
-		</constant>
-		<constant name="ROLE_PANEL" value="6" enum="AccessibilityRole">
-			Panel container element.
-		</constant>
-		<constant name="ROLE_BUTTON" value="7" enum="AccessibilityRole">
-			Button element.
-		</constant>
-		<constant name="ROLE_LINK" value="8" enum="AccessibilityRole">
-			Link element.
-		</constant>
-		<constant name="ROLE_CHECK_BOX" value="9" enum="AccessibilityRole">
-			Check box element.
-		</constant>
-		<constant name="ROLE_RADIO_BUTTON" value="10" enum="AccessibilityRole">
-			Radio button element.
-		</constant>
-		<constant name="ROLE_CHECK_BUTTON" value="11" enum="AccessibilityRole">
-			Check button element.
-		</constant>
-		<constant name="ROLE_SCROLL_BAR" value="12" enum="AccessibilityRole">
-			Scroll bar element.
-		</constant>
-		<constant name="ROLE_SCROLL_VIEW" value="13" enum="AccessibilityRole">
-			Scroll container element.
-		</constant>
-		<constant name="ROLE_SPLITTER" value="14" enum="AccessibilityRole">
-			Container splitter handle element.
-		</constant>
-		<constant name="ROLE_SLIDER" value="15" enum="AccessibilityRole">
-			Slider element.
-		</constant>
-		<constant name="ROLE_SPIN_BUTTON" value="16" enum="AccessibilityRole">
-			Spin box element.
-		</constant>
-		<constant name="ROLE_PROGRESS_INDICATOR" value="17" enum="AccessibilityRole">
-			Progress indicator element.
-		</constant>
-		<constant name="ROLE_TEXT_FIELD" value="18" enum="AccessibilityRole">
-			Editable text field element.
-		</constant>
-		<constant name="ROLE_MULTILINE_TEXT_FIELD" value="19" enum="AccessibilityRole">
-			Multiline editable text field element.
-		</constant>
-		<constant name="ROLE_COLOR_PICKER" value="20" enum="AccessibilityRole">
-			Color picker element.
-		</constant>
-		<constant name="ROLE_TABLE" value="21" enum="AccessibilityRole">
-			Table element.
-		</constant>
-		<constant name="ROLE_CELL" value="22" enum="AccessibilityRole">
-			Table/tree cell element.
-		</constant>
-		<constant name="ROLE_ROW" value="23" enum="AccessibilityRole">
-			Table/tree row element.
-		</constant>
-		<constant name="ROLE_ROW_GROUP" value="24" enum="AccessibilityRole">
-			Table/tree row group element.
-		</constant>
-		<constant name="ROLE_ROW_HEADER" value="25" enum="AccessibilityRole">
-			Table/tree row header element.
-		</constant>
-		<constant name="ROLE_COLUMN_HEADER" value="26" enum="AccessibilityRole">
-			Table/tree column header element.
-		</constant>
-		<constant name="ROLE_TREE" value="27" enum="AccessibilityRole">
-			Tree view element.
-		</constant>
-		<constant name="ROLE_TREE_ITEM" value="28" enum="AccessibilityRole">
-			Tree view item element.
-		</constant>
-		<constant name="ROLE_LIST" value="29" enum="AccessibilityRole">
-			List element.
-		</constant>
-		<constant name="ROLE_LIST_ITEM" value="30" enum="AccessibilityRole">
-			List item element.
-		</constant>
-		<constant name="ROLE_LIST_BOX" value="31" enum="AccessibilityRole">
-			List view element.
-		</constant>
-		<constant name="ROLE_LIST_BOX_OPTION" value="32" enum="AccessibilityRole">
-			List view item element.
-		</constant>
-		<constant name="ROLE_TAB_BAR" value="33" enum="AccessibilityRole">
-			Tab bar element.
-		</constant>
-		<constant name="ROLE_TAB" value="34" enum="AccessibilityRole">
-			Tab bar item element.
-		</constant>
-		<constant name="ROLE_TAB_PANEL" value="35" enum="AccessibilityRole">
-			Tab panel element.
-		</constant>
-		<constant name="ROLE_MENU_BAR" value="36" enum="AccessibilityRole">
-			Menu bar element.
-		</constant>
-		<constant name="ROLE_MENU" value="37" enum="AccessibilityRole">
-			Popup menu element.
-		</constant>
-		<constant name="ROLE_MENU_ITEM" value="38" enum="AccessibilityRole">
-			Popup menu item element.
-		</constant>
-		<constant name="ROLE_MENU_ITEM_CHECK_BOX" value="39" enum="AccessibilityRole">
-			Popup menu check button item element.
-		</constant>
-		<constant name="ROLE_MENU_ITEM_RADIO" value="40" enum="AccessibilityRole">
-			Popup menu radio button item element.
-		</constant>
-		<constant name="ROLE_IMAGE" value="41" enum="AccessibilityRole">
-			Image element.
-		</constant>
-		<constant name="ROLE_WINDOW" value="42" enum="AccessibilityRole">
-			Window element.
-		</constant>
-		<constant name="ROLE_TITLE_BAR" value="43" enum="AccessibilityRole">
-			Embedded window title bar element.
-		</constant>
-		<constant name="ROLE_DIALOG" value="44" enum="AccessibilityRole">
-			Dialog window element.
-		</constant>
-		<constant name="ROLE_TOOLTIP" value="45" enum="AccessibilityRole">
-			Tooltip element.
-		</constant>
-		<constant name="ROLE_REGION" value="46" enum="AccessibilityRole">
-			Region/landmark element. Screen readers can navigate between regions using landmark navigation.
-		</constant>
-		<constant name="ROLE_TEXT_RUN" value="47" enum="AccessibilityRole">
-			Unifor text run.
-			Note: This role is used for internal text elements, and should not be assigned to nodes.
-		</constant>
-		<constant name="POPUP_MENU" value="0" enum="AccessibilityPopupType">
-			Popup menu.
-		</constant>
-		<constant name="POPUP_LIST" value="1" enum="AccessibilityPopupType">
-			Popup list.
-		</constant>
-		<constant name="POPUP_TREE" value="2" enum="AccessibilityPopupType">
-			Popup tree view.
-		</constant>
-		<constant name="POPUP_DIALOG" value="3" enum="AccessibilityPopupType">
-			Popup dialog.
-		</constant>
-		<constant name="FLAG_HIDDEN" value="0" enum="AccessibilityFlags">
-			Element is hidden for accessibility tools.
-		</constant>
-		<constant name="FLAG_MULTISELECTABLE" value="1" enum="AccessibilityFlags">
-			Element supports multiple item selection.
-		</constant>
-		<constant name="FLAG_REQUIRED" value="2" enum="AccessibilityFlags">
-			Element require user input.
-		</constant>
-		<constant name="FLAG_VISITED" value="3" enum="AccessibilityFlags">
-			Element is a visited link.
-		</constant>
-		<constant name="FLAG_BUSY" value="4" enum="AccessibilityFlags">
-			Element content is not ready (e.g. loading).
-		</constant>
-		<constant name="FLAG_MODAL" value="5" enum="AccessibilityFlags">
-			Element is modal window.
-		</constant>
-		<constant name="FLAG_TOUCH_PASSTHROUGH" value="6" enum="AccessibilityFlags">
-			Element allows touches to be passed through when a screen reader is in touch exploration mode.
-		</constant>
-		<constant name="FLAG_READONLY" value="7" enum="AccessibilityFlags">
-			Element is text field with selectable but read-only text.
-		</constant>
-		<constant name="FLAG_DISABLED" value="8" enum="AccessibilityFlags">
-			Element is disabled.
-		</constant>
-		<constant name="FLAG_CLIPS_CHILDREN" value="9" enum="AccessibilityFlags">
-			Element clips children.
-		</constant>
-		<constant name="ACTION_CLICK" value="0" enum="AccessibilityAction">
-			Single click action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_FOCUS" value="1" enum="AccessibilityAction">
-			Focus action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_BLUR" value="2" enum="AccessibilityAction">
-			Blur action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_COLLAPSE" value="3" enum="AccessibilityAction">
-			Collapse action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_EXPAND" value="4" enum="AccessibilityAction">
-			Expand action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_DECREMENT" value="5" enum="AccessibilityAction">
-			Decrement action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_INCREMENT" value="6" enum="AccessibilityAction">
-			Increment action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_HIDE_TOOLTIP" value="7" enum="AccessibilityAction">
-			Hide tooltip action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_SHOW_TOOLTIP" value="8" enum="AccessibilityAction">
-			Show tooltip action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_SET_TEXT_SELECTION" value="9" enum="AccessibilityAction">
-			Set text selection action, callback argument is set to [Dictionary] with the following keys:
-			- [code]"start_element"[/code] accessibility element of the selection start.
-			- [code]"start_char"[/code] character offset relative to the accessibility element of the selection start.
-			- [code]"end_element"[/code] accessibility element of the selection end.
-			- [code]"end_char"[/code] character offset relative to the accessibility element of the selection end.
-		</constant>
-		<constant name="ACTION_REPLACE_SELECTED_TEXT" value="10" enum="AccessibilityAction">
-			Replace text action, callback argument is set to [String] with the replacement text.
-		</constant>
-		<constant name="ACTION_SCROLL_BACKWARD" value="11" enum="AccessibilityAction">
-			Scroll backward action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_SCROLL_DOWN" value="12" enum="AccessibilityAction">
-			Scroll down action, callback argument is set to [enum AccessibilityScrollUnit].
-		</constant>
-		<constant name="ACTION_SCROLL_FORWARD" value="13" enum="AccessibilityAction">
-			Scroll forward action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_SCROLL_LEFT" value="14" enum="AccessibilityAction">
-			Scroll left action, callback argument is set to [enum AccessibilityScrollUnit].
-		</constant>
-		<constant name="ACTION_SCROLL_RIGHT" value="15" enum="AccessibilityAction">
-			Scroll right action, callback argument is set to [enum AccessibilityScrollUnit].
-		</constant>
-		<constant name="ACTION_SCROLL_UP" value="16" enum="AccessibilityAction">
-			Scroll up action, callback argument is set to [enum AccessibilityScrollUnit].
-		</constant>
-		<constant name="ACTION_SCROLL_INTO_VIEW" value="17" enum="AccessibilityAction">
-			Scroll into view action, callback argument is set to [enum AccessibilityScrollHint].
-		</constant>
-		<constant name="ACTION_SCROLL_TO_POINT" value="18" enum="AccessibilityAction">
-			Scroll to point action, callback argument is set to [Vector2] with the relative point coordinates.
-		</constant>
-		<constant name="ACTION_SET_SCROLL_OFFSET" value="19" enum="AccessibilityAction">
-			Set scroll offset action, callback argument is set to [Vector2] with the scroll offset.
-		</constant>
-		<constant name="ACTION_SET_VALUE" value="20" enum="AccessibilityAction">
-			Set value action, callback argument is set to [String] or number with the new value.
-		</constant>
-		<constant name="ACTION_SHOW_CONTEXT_MENU" value="21" enum="AccessibilityAction">
-			Show context menu action, callback argument is not set.
-		</constant>
-		<constant name="ACTION_CUSTOM" value="22" enum="AccessibilityAction">
-			Custom action, callback argument is set to the integer action ID.
-		</constant>
-		<constant name="LIVE_OFF" value="0" enum="AccessibilityLiveMode">
-			Indicates that updates to the live region should not be presented.
-		</constant>
-		<constant name="LIVE_POLITE" value="1" enum="AccessibilityLiveMode">
-			Indicates that updates to the live region should be presented at the next opportunity (for example at the end of speaking the current sentence).
-		</constant>
-		<constant name="LIVE_ASSERTIVE" value="2" enum="AccessibilityLiveMode">
-			Indicates that updates to the live region have the highest priority and should be presented immediately.
-		</constant>
-		<constant name="SCROLL_UNIT_ITEM" value="0" enum="AccessibilityScrollUnit">
-			The amount by which to scroll. A single item of a list, line of text.
-		</constant>
-		<constant name="SCROLL_UNIT_PAGE" value="1" enum="AccessibilityScrollUnit">
-			The amount by which to scroll. A single page.
-		</constant>
-		<constant name="SCROLL_HINT_TOP_LEFT" value="0" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Top-left edge of the scroll container.
-		</constant>
-		<constant name="SCROLL_HINT_BOTTOM_RIGHT" value="1" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Bottom-right edge of the scroll container.
-		</constant>
-		<constant name="SCROLL_HINT_TOP_EDGE" value="2" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Top edge of the scroll container.
-		</constant>
-		<constant name="SCROLL_HINT_BOTTOM_EDGE" value="3" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Bottom edge of the scroll container.
-		</constant>
-		<constant name="SCROLL_HINT_LEFT_EDGE" value="4" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Left edge of the scroll container.
-		</constant>
-		<constant name="SCROLL_HINT_RIGHT_EDGE" value="5" enum="AccessibilityScrollHint">
-			A preferred position for the node scrolled into view. Right edge of the scroll container.
-		</constant>
-	</constants>
-</class>
diff --git a/engine/doc/classes/AimModifier3D.xml b/engine/doc/classes/AimModifier3D.xml
index c3601125..b0fb7d52 100644
--- a/engine/doc/classes/AimModifier3D.xml
+++ b/engine/doc/classes/AimModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AimModifier3D" inherits="BoneConstraint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AimModifier3D" inherits="BoneConstraint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The [AimModifier3D] rotates a bone to look at a reference bone.
 	</brief_description>
diff --git a/engine/doc/classes/AnimatableBody2D.xml b/engine/doc/classes/AnimatableBody2D.xml
index 810893e5..0218325f 100644
--- a/engine/doc/classes/AnimatableBody2D.xml
+++ b/engine/doc/classes/AnimatableBody2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatableBody2D" inherits="StaticBody2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimatableBody2D" inherits="StaticBody2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D physics body that can't be moved by external forces. When moved manually, it affects other bodies in its path.
 	</brief_description>
diff --git a/engine/doc/classes/AnimatableBody3D.xml b/engine/doc/classes/AnimatableBody3D.xml
index ab316890..b18b8538 100644
--- a/engine/doc/classes/AnimatableBody3D.xml
+++ b/engine/doc/classes/AnimatableBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatableBody3D" inherits="StaticBody3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimatableBody3D" inherits="StaticBody3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body that can't be moved by external forces. When moved manually, it affects other bodies in its path.
 	</brief_description>
diff --git a/engine/doc/classes/AnimatedSprite2D.xml b/engine/doc/classes/AnimatedSprite2D.xml
index b2693f2d..487124c9 100644
--- a/engine/doc/classes/AnimatedSprite2D.xml
+++ b/engine/doc/classes/AnimatedSprite2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatedSprite2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimatedSprite2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Sprite node that contains multiple textures as frames to play for animation.
 	</brief_description>
diff --git a/engine/doc/classes/AnimatedSprite3D.xml b/engine/doc/classes/AnimatedSprite3D.xml
index 4f2f08be..9484a082 100644
--- a/engine/doc/classes/AnimatedSprite3D.xml
+++ b/engine/doc/classes/AnimatedSprite3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatedSprite3D" inherits="SpriteBase3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimatedSprite3D" inherits="SpriteBase3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		2D sprite node in 3D world, that can use multiple 2D textures for animation.
 	</brief_description>
diff --git a/engine/doc/classes/AnimatedTexture.xml b/engine/doc/classes/AnimatedTexture.xml
index 20e0ca62..d443541e 100644
--- a/engine/doc/classes/AnimatedTexture.xml
+++ b/engine/doc/classes/AnimatedTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimatedTexture" inherits="Texture2D" api_type="core" deprecated="This class does not work properly in current versions and may be removed in the future. There is currently no equivalent workaround." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimatedTexture" inherits="Texture2D" deprecated="This class does not work properly in current versions and may be removed in the future. There is currently no equivalent workaround." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Proxy texture for simple frame-based animations.
 	</brief_description>
diff --git a/engine/doc/classes/Animation.xml b/engine/doc/classes/Animation.xml
index 97c62053..bc83de1b 100644
--- a/engine/doc/classes/Animation.xml
+++ b/engine/doc/classes/Animation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Animation" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Animation" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds data that can be used to animate anything in the engine.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationLibrary.xml b/engine/doc/classes/AnimationLibrary.xml
index bfd3e837..51588a60 100644
--- a/engine/doc/classes/AnimationLibrary.xml
+++ b/engine/doc/classes/AnimationLibrary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationLibrary" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationLibrary" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Container for [Animation] resources.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationMixer.xml b/engine/doc/classes/AnimationMixer.xml
index 71ef4a64..1c5ffec3 100644
--- a/engine/doc/classes/AnimationMixer.xml
+++ b/engine/doc/classes/AnimationMixer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationMixer" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationMixer" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [AnimationPlayer] and [AnimationTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNode.xml b/engine/doc/classes/AnimationNode.xml
index 332c8ba3..5a264242 100644
--- a/engine/doc/classes/AnimationNode.xml
+++ b/engine/doc/classes/AnimationNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNode" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNode" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [AnimationTree] nodes. Not related to scene nodes.
 	</brief_description>
@@ -225,12 +225,6 @@
 				Emitted by nodes that inherit from this class and that have an internal tree when one of their animation node names changes. The animation nodes that emit this signal are [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], [AnimationNodeStateMachine], and [AnimationNodeBlendTree].
 			</description>
 		</signal>
-		<signal name="node_updated" experimental="">
-			<param index="0" name="object_id" type="int" />
-			<description>
-				Emitted by [AnimationNodeAnimation] when its [member AnimationNodeAnimation.animation] resource is changed, or by [AnimationNodeBlendTree] when its connections change.
-			</description>
-		</signal>
 		<signal name="tree_changed">
 			<description>
 				Emitted by nodes that inherit from this class and that have an internal tree when one of their animation nodes changes. The animation nodes that emit this signal are [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], [AnimationNodeStateMachine], [AnimationNodeBlendTree] and [AnimationNodeTransition].
diff --git a/engine/doc/classes/AnimationNodeAdd2.xml b/engine/doc/classes/AnimationNodeAdd2.xml
index bcff7e08..af7e18bd 100644
--- a/engine/doc/classes/AnimationNodeAdd2.xml
+++ b/engine/doc/classes/AnimationNodeAdd2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeAdd2" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeAdd2" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Blends two animations additively inside of an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeAdd3.xml b/engine/doc/classes/AnimationNodeAdd3.xml
index fd578b78..edd733ad 100644
--- a/engine/doc/classes/AnimationNodeAdd3.xml
+++ b/engine/doc/classes/AnimationNodeAdd3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeAdd3" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeAdd3" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Blends two of three animations additively inside of an [AnimationNodeBlendTree].
 	</brief_description>
@@ -10,7 +10,6 @@
 		- A "-add" animation to blend with when the blend amount is negative
 		- A "+add" animation to blend with when the blend amount is positive
 		If the absolute value of the amount is greater than [code]1.0[/code], the animation connected to "in" port is blended with the amplified animation connected to "-add"/"+add" port.
-		[b]Note:[/b] The signs are only used to distinguish ports, and additive blending occurs based on absolute values always, meaning the animation of a "-add" port does not subtract from the animation of an "in" port.
 	</description>
 	<tutorials>
 		<link title="Using AnimationTree">$DOCS_URL/tutorials/animation/animation_tree.html</link>
diff --git a/engine/doc/classes/AnimationNodeAnimation.xml b/engine/doc/classes/AnimationNodeAnimation.xml
index 0435c61c..b7e06147 100644
--- a/engine/doc/classes/AnimationNodeAnimation.xml
+++ b/engine/doc/classes/AnimationNodeAnimation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeAnimation" inherits="AnimationRootNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeAnimation" inherits="AnimationRootNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An input animation for an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeBlend2.xml b/engine/doc/classes/AnimationNodeBlend2.xml
index 9b14bc86..50d785fe 100644
--- a/engine/doc/classes/AnimationNodeBlend2.xml
+++ b/engine/doc/classes/AnimationNodeBlend2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeBlend2" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeBlend2" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Blends two animations linearly inside of an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeBlend3.xml b/engine/doc/classes/AnimationNodeBlend3.xml
index 619e5644..2efe628c 100644
--- a/engine/doc/classes/AnimationNodeBlend3.xml
+++ b/engine/doc/classes/AnimationNodeBlend3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeBlend3" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeBlend3" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Blends two of three animations linearly inside of an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeBlendSpace1D.xml b/engine/doc/classes/AnimationNodeBlendSpace1D.xml
index 24f05213..792eb652 100644
--- a/engine/doc/classes/AnimationNodeBlendSpace1D.xml
+++ b/engine/doc/classes/AnimationNodeBlendSpace1D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeBlendSpace1D" inherits="AnimationRootNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeBlendSpace1D" inherits="AnimationRootNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A set of [AnimationRootNode]s placed on a virtual axis, crossfading between the two adjacent ones. Used by [AnimationTree].
 	</brief_description>
@@ -17,17 +17,8 @@
 			<param index="0" name="node" type="AnimationRootNode" />
 			<param index="1" name="pos" type="float" />
 			<param index="2" name="at_index" type="int" default="-1" />
-			<param index="3" name="name" type="StringName" default="&amp;&quot;&quot;" />
 			<description>
-				Adds a new point with [param name] that represents a [param node] on the virtual axis at a given position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
-				[b]Note:[/b] If no name is provided, safe index is used as reference. In the future, empty names will be deprecated, so explicitly passing a name is recommended.
-			</description>
-		</method>
-		<method name="find_blend_point_by_name" qualifiers="const">
-			<return type="int" />
-			<param index="0" name="name" type="StringName" />
-			<description>
-				Returns the index of the blend point with the given [param name]. Returns [code]-1[/code] if no blend point with that name is found.
+				Adds a new point that represents a [param node] on the virtual axis at a given position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
 		<method name="get_blend_point_count" qualifiers="const">
@@ -36,13 +27,6 @@
 				Returns the number of points on the blend axis.
 			</description>
 		</method>
-		<method name="get_blend_point_name" qualifiers="const">
-			<return type="StringName" />
-			<param index="0" name="point" type="int" />
-			<description>
-				Returns the name of the blend point at index [param point].
-			</description>
-		</method>
 		<method name="get_blend_point_node" qualifiers="const">
 			<return type="AnimationRootNode" />
 			<param index="0" name="point" type="int" />
@@ -64,22 +48,6 @@
 				Removes the point at index [param point] from the blend axis.
 			</description>
 		</method>
-		<method name="reorder_blend_point">
-			<return type="void" />
-			<param index="0" name="from_index" type="int" />
-			<param index="1" name="to_index" type="int" />
-			<description>
-				Swaps the blend points at indices [param from_index] and [param to_index], exchanging their positions and properties.
-			</description>
-		</method>
-		<method name="set_blend_point_name">
-			<return type="void" />
-			<param index="0" name="point" type="int" />
-			<param index="1" name="name" type="StringName" />
-			<description>
-				Sets the name of the blend point at index [param point]. If the name conflicts with an existing point, a unique name will be generated automatically.
-			</description>
-		</method>
 		<method name="set_blend_point_node">
 			<return type="void" />
 			<param index="0" name="point" type="int" />
diff --git a/engine/doc/classes/AnimationNodeBlendSpace2D.xml b/engine/doc/classes/AnimationNodeBlendSpace2D.xml
index 77a4c96c..36588738 100644
--- a/engine/doc/classes/AnimationNodeBlendSpace2D.xml
+++ b/engine/doc/classes/AnimationNodeBlendSpace2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeBlendSpace2D" inherits="AnimationRootNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeBlendSpace2D" inherits="AnimationRootNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A set of [AnimationRootNode]s placed on 2D coordinates, crossfading between the three adjacent ones. Used by [AnimationTree].
 	</brief_description>
@@ -18,10 +18,8 @@
 			<param index="0" name="node" type="AnimationRootNode" />
 			<param index="1" name="pos" type="Vector2" />
 			<param index="2" name="at_index" type="int" default="-1" />
-			<param index="3" name="name" type="StringName" default="&amp;&quot;&quot;" />
 			<description>
-				Adds a new point with [param name] that represents a [param node] at the position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
-				[b]Note:[/b] If no name is provided, safe index is used as reference. In the future, empty names will be deprecated, so explicitly passing a name is recommended.
+				Adds a new point that represents a [param node] at the position set by [param pos]. You can insert it at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
 		<method name="add_triangle">
@@ -34,26 +32,12 @@
 				Creates a new triangle using three points [param x], [param y], and [param z]. Triangles can overlap. You can insert the triangle at a specific index using the [param at_index] argument. If you use the default value for [param at_index], the point is inserted at the end of the blend points array.
 			</description>
 		</method>
-		<method name="find_blend_point_by_name" qualifiers="const">
-			<return type="int" />
-			<param index="0" name="name" type="StringName" />
-			<description>
-				Returns the index of the blend point with the given [param name]. Returns [code]-1[/code] if no blend point with that name is found.
-			</description>
-		</method>
 		<method name="get_blend_point_count" qualifiers="const">
 			<return type="int" />
 			<description>
 				Returns the number of points in the blend space.
 			</description>
 		</method>
-		<method name="get_blend_point_name" qualifiers="const">
-			<return type="StringName" />
-			<param index="0" name="point" type="int" />
-			<description>
-				Returns the name of the blend point at index [param point].
-			</description>
-		</method>
 		<method name="get_blend_point_node" qualifiers="const">
 			<return type="AnimationRootNode" />
 			<param index="0" name="point" type="int" />
@@ -96,22 +80,6 @@
 				Removes the triangle at index [param triangle] from the blend space.
 			</description>
 		</method>
-		<method name="reorder_blend_point">
-			<return type="void" />
-			<param index="0" name="from_index" type="int" />
-			<param index="1" name="to_index" type="int" />
-			<description>
-				Swaps the blend points at indices [param from_index] and [param to_index], exchanging their positions and properties.
-			</description>
-		</method>
-		<method name="set_blend_point_name">
-			<return type="void" />
-			<param index="0" name="point" type="int" />
-			<param index="1" name="name" type="StringName" />
-			<description>
-				Sets the name of the blend point at index [param point]. If the name conflicts with an existing point, a unique name will be generated automatically.
-			</description>
-		</method>
 		<method name="set_blend_point_node">
 			<return type="void" />
 			<param index="0" name="point" type="int" />
diff --git a/engine/doc/classes/AnimationNodeBlendTree.xml b/engine/doc/classes/AnimationNodeBlendTree.xml
index 9135ca8a..3764909b 100644
--- a/engine/doc/classes/AnimationNodeBlendTree.xml
+++ b/engine/doc/classes/AnimationNodeBlendTree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeBlendTree" inherits="AnimationRootNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeBlendTree" inherits="AnimationRootNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A sub-tree of many type [AnimationNode]s used for complex animations. Used by [AnimationTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeExtension.xml b/engine/doc/classes/AnimationNodeExtension.xml
index c9b9d7f8..c7cb411f 100644
--- a/engine/doc/classes/AnimationNodeExtension.xml
+++ b/engine/doc/classes/AnimationNodeExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeExtension" inherits="AnimationNode" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeExtension" inherits="AnimationNode" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for extending [AnimationRootNode]s from GDScript, C#, or C++.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeOneShot.xml b/engine/doc/classes/AnimationNodeOneShot.xml
index 57bb75a5..2931206f 100644
--- a/engine/doc/classes/AnimationNodeOneShot.xml
+++ b/engine/doc/classes/AnimationNodeOneShot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeOneShot" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeOneShot" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plays an animation once in an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeOutput.xml b/engine/doc/classes/AnimationNodeOutput.xml
index 3cd29549..6186fdd8 100644
--- a/engine/doc/classes/AnimationNodeOutput.xml
+++ b/engine/doc/classes/AnimationNodeOutput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeOutput" inherits="AnimationNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeOutput" inherits="AnimationNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The animation output node of an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeStateMachine.xml b/engine/doc/classes/AnimationNodeStateMachine.xml
index f8b4a3ce..3f8c77d6 100644
--- a/engine/doc/classes/AnimationNodeStateMachine.xml
+++ b/engine/doc/classes/AnimationNodeStateMachine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeStateMachine" inherits="AnimationRootNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeStateMachine" inherits="AnimationRootNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A state machine with multiple [AnimationRootNode]s, used by [AnimationTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeStateMachinePlayback.xml b/engine/doc/classes/AnimationNodeStateMachinePlayback.xml
index 175254b2..c7087aa7 100644
--- a/engine/doc/classes/AnimationNodeStateMachinePlayback.xml
+++ b/engine/doc/classes/AnimationNodeStateMachinePlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeStateMachinePlayback" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeStateMachinePlayback" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides playback control for an [AnimationNodeStateMachine].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeStateMachineTransition.xml b/engine/doc/classes/AnimationNodeStateMachineTransition.xml
index 18af0f58..d7dffa69 100644
--- a/engine/doc/classes/AnimationNodeStateMachineTransition.xml
+++ b/engine/doc/classes/AnimationNodeStateMachineTransition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeStateMachineTransition" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeStateMachineTransition" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A transition within an [AnimationNodeStateMachine] connecting two [AnimationRootNode]s.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeSub2.xml b/engine/doc/classes/AnimationNodeSub2.xml
index 049d7ad9..6aac3280 100644
--- a/engine/doc/classes/AnimationNodeSub2.xml
+++ b/engine/doc/classes/AnimationNodeSub2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeSub2" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeSub2" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Blends two animations subtractively inside of an [AnimationNodeBlendTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeSync.xml b/engine/doc/classes/AnimationNodeSync.xml
index 0cc09902..57c79378 100644
--- a/engine/doc/classes/AnimationNodeSync.xml
+++ b/engine/doc/classes/AnimationNodeSync.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeSync" inherits="AnimationNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeSync" inherits="AnimationNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [AnimationNode]s with multiple input ports that must be synchronized.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeTimeScale.xml b/engine/doc/classes/AnimationNodeTimeScale.xml
index 67b5ad2e..9bf75291 100644
--- a/engine/doc/classes/AnimationNodeTimeScale.xml
+++ b/engine/doc/classes/AnimationNodeTimeScale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeTimeScale" inherits="AnimationNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeTimeScale" inherits="AnimationNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A time-scaling animation node used in [AnimationTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeTimeSeek.xml b/engine/doc/classes/AnimationNodeTimeSeek.xml
index 56cfbe87..865e94ec 100644
--- a/engine/doc/classes/AnimationNodeTimeSeek.xml
+++ b/engine/doc/classes/AnimationNodeTimeSeek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeTimeSeek" inherits="AnimationNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeTimeSeek" inherits="AnimationNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A time-seeking animation node used in [AnimationTree].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationNodeTransition.xml b/engine/doc/classes/AnimationNodeTransition.xml
index ee230b6c..af80fef7 100644
--- a/engine/doc/classes/AnimationNodeTransition.xml
+++ b/engine/doc/classes/AnimationNodeTransition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationNodeTransition" inherits="AnimationNodeSync" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationNodeTransition" inherits="AnimationNodeSync" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A transition within an [AnimationTree] connecting two [AnimationNode]s.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationPlayer.xml b/engine/doc/classes/AnimationPlayer.xml
index d02c3f8f..db5433e4 100644
--- a/engine/doc/classes/AnimationPlayer.xml
+++ b/engine/doc/classes/AnimationPlayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationPlayer" inherits="AnimationMixer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationPlayer" inherits="AnimationMixer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used for animation playback.
 	</brief_description>
diff --git a/engine/doc/classes/AnimationRootNode.xml b/engine/doc/classes/AnimationRootNode.xml
index 0dc8e1a1..b24f2acd 100644
--- a/engine/doc/classes/AnimationRootNode.xml
+++ b/engine/doc/classes/AnimationRootNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationRootNode" inherits="AnimationNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationRootNode" inherits="AnimationNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [AnimationNode]s that hold one or multiple composite animations. Usually used for [member AnimationTree.tree_root].
 	</brief_description>
diff --git a/engine/doc/classes/AnimationTree.xml b/engine/doc/classes/AnimationTree.xml
index 86d73df2..4a63b35b 100644
--- a/engine/doc/classes/AnimationTree.xml
+++ b/engine/doc/classes/AnimationTree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AnimationTree" inherits="AnimationMixer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AnimationTree" inherits="AnimationMixer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used for advanced animation transitions in an [AnimationPlayer].
 	</brief_description>
diff --git a/engine/doc/classes/Area2D.xml b/engine/doc/classes/Area2D.xml
index 01633960..a89d8f75 100644
--- a/engine/doc/classes/Area2D.xml
+++ b/engine/doc/classes/Area2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Area2D" inherits="CollisionObject2D" api_type="core" keywords="trigger" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Area2D" inherits="CollisionObject2D" keywords="trigger" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A region of 2D space that detects other [CollisionObject2D]s entering or exiting it.
 	</brief_description>
diff --git a/engine/doc/classes/Area3D.xml b/engine/doc/classes/Area3D.xml
index dce17e19..58c7e738 100644
--- a/engine/doc/classes/Area3D.xml
+++ b/engine/doc/classes/Area3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Area3D" inherits="CollisionObject3D" api_type="core" keywords="trigger" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Area3D" inherits="CollisionObject3D" keywords="trigger" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A region of 3D space that detects other [CollisionObject3D]s entering or exiting it.
 	</brief_description>
@@ -25,9 +25,8 @@
 		<method name="get_overlapping_bodies" qualifiers="const">
 			<return type="Node3D[]" />
 			<description>
-				Returns a list of intersecting [PhysicsBody3D]s, [SoftBody3D]s, and [GridMap]s. The overlapping body's [member CollisionObject3D.collision_layer] must be part of this area's [member CollisionObject3D.collision_mask] in order to be detected.
+				Returns a list of intersecting [PhysicsBody3D]s and [GridMap]s. The overlapping body's [member CollisionObject3D.collision_layer] must be part of this area's [member CollisionObject3D.collision_mask] in order to be detected.
 				For performance reasons (collisions are all processed at the same time) this list is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not return any such bodies.
 			</description>
 		</method>
 		<method name="has_overlapping_areas" qualifiers="const">
@@ -40,9 +39,8 @@
 		<method name="has_overlapping_bodies" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if intersecting any [PhysicsBody3D]s, [SoftBody3D]s, or [GridMap]s, otherwise returns [code]false[/code]. The overlapping body's [member CollisionObject3D.collision_layer] must be part of this area's [member CollisionObject3D.collision_mask] in order to be detected.
+				Returns [code]true[/code] if intersecting any [PhysicsBody3D]s or [GridMap]s, otherwise returns [code]false[/code]. The overlapping body's [member CollisionObject3D.collision_layer] must be part of this area's [member CollisionObject3D.collision_mask] in order to be detected.
 				For performance reasons (collisions are all processed at the same time) the list of overlapping bodies is modified once during the physics step, not immediately after objects are moved. Consider using signals instead.
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not consider such bodies.
 			</description>
 		</method>
 		<method name="overlaps_area" qualifiers="const">
@@ -58,9 +56,8 @@
 			<param index="0" name="body" type="Node" />
 			<description>
 				Returns [code]true[/code] if the given physics body intersects or overlaps this [Area3D], [code]false[/code] otherwise.
-				[param body] argument can either be a [PhysicsBody3D], [SoftBody3D], or a [GridMap] instance. While GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body.
 				[b]Note:[/b] The result of this test is not immediate after moving objects. For performance, list of overlaps is updated once per frame and before the physics step. Consider using signals instead.
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will return [code]false[/code] in such cases.
+				The [param body] argument can either be a [PhysicsBody3D] or a [GridMap] instance. While GridMaps are not physics body themselves, they register their tiles with collision shapes as a virtual physics body.
 			</description>
 		</method>
 	</methods>
@@ -184,15 +181,13 @@
 		<signal name="body_entered">
 			<param index="0" name="body" type="Node3D" />
 			<description>
-				Emitted when the received [param body] enters this area. [param body] can be a [PhysicsBody3D], [SoftBody3D] or [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not emit this signal in such cases.
+				Emitted when the received [param body] enters this area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
 			</description>
 		</signal>
 		<signal name="body_exited">
 			<param index="0" name="body" type="Node3D" />
 			<description>
-				Emitted when the received [param body] exits this area. [param body] can be a [PhysicsBody3D], [SoftBody3D] or [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not emit this signal in such cases.
+				Emitted when the received [param body] exits this area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
 			</description>
 		</signal>
 		<signal name="body_shape_entered">
@@ -201,9 +196,8 @@
 			<param index="2" name="body_shape_index" type="int" />
 			<param index="3" name="local_shape_index" type="int" />
 			<description>
-				Emitted when a [Shape3D] of the received [param body] enters a shape of this area. [param body] can be a [PhysicsBody3D], [SoftBody3D] or [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
+				Emitted when a [Shape3D] of the received [param body] enters a shape of this area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
 				[param local_shape_index] and [param body_shape_index] contain indices of the interacting shapes from this area and the interacting body, respectively. [param body_rid] contains the [RID] of the body. These values can be used with the [PhysicsServer3D].
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not emit this signal in such cases.
 				[b]Example:[/b] Get the [CollisionShape3D] node from the shape index:
 				[codeblocks]
 				[gdscript]
@@ -222,9 +216,8 @@
 			<param index="2" name="body_shape_index" type="int" />
 			<param index="3" name="local_shape_index" type="int" />
 			<description>
-				Emitted when a [Shape3D] of the received [param body] exits a shape of this area. [param body] can be a [PhysicsBody3D], [SoftBody3D] or [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
+				Emitted when a [Shape3D] of the received [param body] exits a shape of this area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured. Requires [member monitoring] to be set to [code]true[/code].
 				See also [signal body_shape_entered].
-				[b]Note:[/b] Godot Physics does not support reporting overlaps with [SoftBody3D], so will not emit this signal in such cases.
 			</description>
 		</signal>
 	</signals>
diff --git a/engine/doc/classes/Array.xml b/engine/doc/classes/Array.xml
index 6f597e83..3302e746 100644
--- a/engine/doc/classes/Array.xml
+++ b/engine/doc/classes/Array.xml
@@ -37,7 +37,6 @@
 		[/codeblocks]
 		[b]Note:[/b] Arrays are always passed by [b]reference[/b]. To get a copy of an array that can be modified independently of the original array, use [method duplicate].
 		[b]Note:[/b] Erasing elements while iterating over arrays is [b]not[/b] supported and will result in unpredictable behavior.
-		[b]Note:[/b] In a boolean context, an array will evaluate to [code]false[/code] if it's empty ([code][][/code]). Otherwise, an array will always evaluate to [code]true[/code].
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedInt64Array] versus [code]Array[int][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 	</description>
 	<tutorials>
@@ -429,13 +428,6 @@
 
 				func _ready():
 					print([1, 3, 4, 7].find_custom(is_even.bind())) # Prints 2
-
-				# Another example using `bind()` to pass an additional parameter:
-				func is_specific_number(number, expected):
-					return number == expected
-
-				func _ready():
-					print([1, 3, 4, 7].find_custom(is_specific_number.bind(4))) # Prints 2
 				[/gdscript]
 				[/codeblocks]
 			</description>
diff --git a/engine/doc/classes/ArrayMesh.xml b/engine/doc/classes/ArrayMesh.xml
index a782a9e4..36185dbe 100644
--- a/engine/doc/classes/ArrayMesh.xml
+++ b/engine/doc/classes/ArrayMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ArrayMesh" inherits="Mesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ArrayMesh" inherits="Mesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		[Mesh] type that provides utility for constructing a surface from arrays.
 	</brief_description>
@@ -186,9 +186,6 @@
 			<param index="1" name="offset" type="int" />
 			<param index="2" name="data" type="PackedByteArray" />
 			<description>
-				Updates the attribute buffer of this mesh's surface with the given [param data]. The expected data per attribute is 12 or 8 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector3] or [Vector2] vertices. This value can be determined with [method RenderingServer.mesh_surface_get_format_attribute_stride].
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each attribute.
-				A [PackedVector3Array] of attribute locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 		<method name="surface_update_skin_region">
@@ -197,9 +194,6 @@
 			<param index="1" name="offset" type="int" />
 			<param index="2" name="data" type="PackedByteArray" />
 			<description>
-				Updates the skin buffer of this mesh's surface with the given [param data]. The expected data per skin is 12 or 8 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector3] or [Vector2] vertices. This value can be determined with [method RenderingServer.mesh_surface_get_format_skin_stride].
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each skin.
-				A [PackedVector3Array] of skin locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 		<method name="surface_update_vertex_region">
@@ -208,9 +202,6 @@
 			<param index="1" name="offset" type="int" />
 			<param index="2" name="data" type="PackedByteArray" />
 			<description>
-				Updates the vertex buffer of this mesh's surface with the given [param data]. The expected data per vertex is 12 or 8 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector3] or [Vector2] vertices. This value can be determined with [method RenderingServer.mesh_surface_get_format_vertex_stride].
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each vertex.
-				A [PackedVector3Array] of vertex locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/ArrayOccluder3D.xml b/engine/doc/classes/ArrayOccluder3D.xml
index 3f90e23a..7c7b440c 100644
--- a/engine/doc/classes/ArrayOccluder3D.xml
+++ b/engine/doc/classes/ArrayOccluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ArrayOccluder3D" inherits="Occluder3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ArrayOccluder3D" inherits="Occluder3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		3D polygon shape for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/AspectRatioContainer.xml b/engine/doc/classes/AspectRatioContainer.xml
index 34db3363..b2cc6082 100644
--- a/engine/doc/classes/AspectRatioContainer.xml
+++ b/engine/doc/classes/AspectRatioContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AspectRatioContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AspectRatioContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that preserves the proportions of its child controls.
 	</brief_description>
diff --git a/engine/doc/classes/AtlasTexture.xml b/engine/doc/classes/AtlasTexture.xml
index c6f70b67..d4a39b91 100644
--- a/engine/doc/classes/AtlasTexture.xml
+++ b/engine/doc/classes/AtlasTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AtlasTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AtlasTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A texture that crops out part of another Texture2D.
 	</brief_description>
diff --git a/engine/doc/classes/AudioBusLayout.xml b/engine/doc/classes/AudioBusLayout.xml
index 0badcb68..73c893e5 100644
--- a/engine/doc/classes/AudioBusLayout.xml
+++ b/engine/doc/classes/AudioBusLayout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioBusLayout" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioBusLayout" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Stores information about the audio buses.
 	</brief_description>
diff --git a/engine/doc/classes/AudioEffect.xml b/engine/doc/classes/AudioEffect.xml
index 567251b6..626bb137 100644
--- a/engine/doc/classes/AudioEffect.xml
+++ b/engine/doc/classes/AudioEffect.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffect" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffect" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for audio effect resources.
 	</brief_description>
 	<description>
 		The base [Resource] for every audio effect. In the editor, an audio effect can be added to the current bus layout through the Audio panel. At run-time, it is also possible to manipulate audio effects through [method AudioServer.add_bus_effect], [method AudioServer.remove_bus_effect], and [method AudioServer.get_bus_effect].
-		When applied on a bus, an audio effect creates a corresponding [AudioEffectInstance]. The instance is directly responsible for manipulating sound, based on the original audio effect's properties.
+		When applied on a bus, an audio effect creates a corresponding [AudioEffectInstance]. The instance is directly responsible for manipulating the sound, based on the original audio effect's properties.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 		<link title="Audio Microphone Record Demo">https://godotengine.org/asset-library/asset/2760</link>
 	</tutorials>
 	<methods>
diff --git a/engine/doc/classes/AudioEffectAmplify.xml b/engine/doc/classes/AudioEffectAmplify.xml
index e9f81c57..ae12b6c1 100644
--- a/engine/doc/classes/AudioEffectAmplify.xml
+++ b/engine/doc/classes/AudioEffectAmplify.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectAmplify" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectAmplify" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a volume manipulation audio effect to an audio bus.
+		Adds an amplifying audio effect to an audio bus.
 	</brief_description>
 	<description>
 		Increases or decreases the volume being routed through the audio bus.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="volume_db" type="float" setter="set_volume_db" getter="get_volume_db" default="0.0">
-			Amount of amplification in dB. Positive values make the sound louder, negative values make it quieter. Value can range from -80 to 24.
+			Amount of amplification in decibels. Positive values make the sound louder, negative values make it quieter. Value can range from -80 to 24.
 		</member>
 		<member name="volume_linear" type="float" setter="set_volume_linear" getter="get_volume_linear">
 			Amount of amplification as a linear value.
diff --git a/engine/doc/classes/AudioEffectBandLimitFilter.xml b/engine/doc/classes/AudioEffectBandLimitFilter.xml
index 4151c28a..c8667818 100644
--- a/engine/doc/classes/AudioEffectBandLimitFilter.xml
+++ b/engine/doc/classes/AudioEffectBandLimitFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectBandLimitFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectBandLimitFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a band-limit filter to an audio bus.
+		Adds a band limit filter to the audio bus.
 	</brief_description>
 	<description>
-		A "band-limit" filter attenuates the frequencies at [member AudioEffectFilter.cutoff_hz], and allows frequencies outside the frequency threshold to pass unchanged. It is a wider and weaker version of [AudioEffectNotchFilter], and is the opposite of [AudioEffectBandPassFilter].
-		This filter can be used to give more room for other sounds to play at that frequency.
+		Limits the frequencies in a range around the [member AudioEffectFilter.cutoff_hz] and allows frequencies outside of this range to pass.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectBandPassFilter.xml b/engine/doc/classes/AudioEffectBandPassFilter.xml
index 4427e8a0..64bff534 100644
--- a/engine/doc/classes/AudioEffectBandPassFilter.xml
+++ b/engine/doc/classes/AudioEffectBandPassFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectBandPassFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectBandPassFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a band-pass filter to an audio bus.
+		Adds a band pass filter to the audio bus.
 	</brief_description>
 	<description>
-		A "band-pass" filter allows the frequencies at [member AudioEffectFilter.cutoff_hz] to pass unchanged, and attenuates frequencies outside the frequency threshold. It is the opposite of [AudioEffectBandLimitFilter] and [AudioEffectNotchFilter].
-		This filter can be used to emulate sounds coming from weak speakers.
+		Attenuates the frequencies inside of a range around the [member AudioEffectFilter.cutoff_hz] and cuts frequencies outside of this band.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectCapture.xml b/engine/doc/classes/AudioEffectCapture.xml
index dea4e4eb..ce516be5 100644
--- a/engine/doc/classes/AudioEffectCapture.xml
+++ b/engine/doc/classes/AudioEffectCapture.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectCapture" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectCapture" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Exposes audio samples from an audio bus in real-time, such that it can be accessed as data.
+		Captures audio from an audio bus in real-time.
 	</brief_description>
 	<description>
-		Copies all audio frames, also known as "samples" or "audio samples", from the attached audio bus into its internal ring buffer. This effect does not alter the audio. Can be used for storing real-time audio data for playback, and for creating real-time audio visualizations, like an oscilloscope.
+		AudioEffectCapture is an AudioEffect which copies all audio frames from the attached audio effect bus into its internal ring buffer.
 		Application code should consume these audio frames from this ring buffer using [method get_buffer] and process it as needed, for example to capture data from an [AudioStreamMicrophone], implement application-defined effects, or to transmit audio over the network. When capturing audio data from a microphone, the format of the samples will be stereo 32-bit floating-point PCM.
 		Unlike [AudioEffectRecord], this effect only returns the raw audio samples instead of encoding them into an [AudioStream].
 	</description>
@@ -16,7 +16,7 @@
 			<return type="bool" />
 			<param index="0" name="frames" type="int" />
 			<description>
-				Returns [code]true[/code] if at least [param frames] samples are available to read in the internal ring buffer.
+				Returns [code]true[/code] if at least [param frames] audio frames are available to read in the internal ring buffer.
 			</description>
 		</method>
 		<method name="clear_buffer">
@@ -30,40 +30,39 @@
 			<return type="PackedVector2Array" />
 			<param index="0" name="frames" type="int" />
 			<description>
-				Gets the next [param frames] samples from the internal ring buffer.
-				Returns a [PackedVector2Array] containing exactly [param frames] samples if available, or an empty [PackedVector2Array] if insufficient data was available.
+				Gets the next [param frames] audio samples from the internal ring buffer.
+				Returns a [PackedVector2Array] containing exactly [param frames] audio samples if available, or an empty [PackedVector2Array] if insufficient data was available.
 				The samples are signed floating-point PCM between [code]-1[/code] and [code]1[/code]. You will have to scale them if you want to use them as 8 or 16-bit integer samples. ([code]v = 0x7fff * samples[0].x[/code])
 			</description>
 		</method>
 		<method name="get_buffer_length_frames" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the total size of the internal ring buffer in number of samples.
+				Returns the total size of the internal ring buffer in frames.
 			</description>
 		</method>
 		<method name="get_discarded_frames" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the number of samples discarded from the audio bus due to full buffer.
+				Returns the number of audio frames discarded from the audio bus due to full buffer.
 			</description>
 		</method>
 		<method name="get_frames_available" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the number of samples available to read using [method get_buffer].
+				Returns the number of frames available to read using [method get_buffer].
 			</description>
 		</method>
 		<method name="get_pushed_frames" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns the number of samples inserted from the audio bus.
+				Returns the number of audio frames inserted from the audio bus.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="buffer_length" type="float" setter="set_buffer_length" getter="get_buffer_length" default="0.1">
-			Length of the internal ring buffer, in seconds. Higher values keep data around for longer, but require more memory. Value can range from 0.01 to 10.
-			[b]Note:[/b] Setting the buffer length will have no effect if already initialized.
+			Length of the internal ring buffer, in seconds. Setting the buffer length will have no effect if already initialized.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectChorus.xml b/engine/doc/classes/AudioEffectChorus.xml
index b84cc9b3..f0c1d7c1 100644
--- a/engine/doc/classes/AudioEffectChorus.xml
+++ b/engine/doc/classes/AudioEffectChorus.xml
@@ -1,60 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectChorus" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectChorus" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a chorus audio effect to an audio bus.
-		Gives the impression of multiple audio sources.
+		Adds a chorus audio effect.
 	</brief_description>
 	<description>
-		A "chorus" effect creates multiple copies of the original audio (called "voices") with variations in pitch, and layers on top of the original, giving the impression that the sound comes from multiple sources. This creates spectral and spatial movement.
-		Each voice is played a short period of time after the original audio, controlled by [code]delay[/code]. An internal low-frequency oscillator (LFO) controls their pitch, and [code]depth[/code] controls the LFO's maximum amount.
-		In the real world, this kind of effect is found in pianos, choirs, and instrument ensembles.
-		This effect can also be used to widen mono audio and make digital sounds have a more natural or analog quality.
+		Adds a chorus audio effect. The effect applies a filter with voices to duplicate the audio source and manipulate it through the filter.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_voice_cutoff_hz" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the frequency threshold of a given [param voice_idx]'s low-pass filter in Hz. Frequencies above this value are removed from the voice.
 			</description>
 		</method>
 		<method name="get_voice_delay_ms" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the delay of a given [param voice_idx] in milliseconds, compared to the original audio.
 			</description>
 		</method>
 		<method name="get_voice_depth_ms" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the depth of a given [param voice_idx]'s low-frequency oscillator in milliseconds.
 			</description>
 		</method>
 		<method name="get_voice_level_db" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the gain of a given [param voice_idx] in dB.
 			</description>
 		</method>
 		<method name="get_voice_pan" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the pan position of a given [param voice_idx]. Negative values mean the left channel, positive mean the right.
 			</description>
 		</method>
 		<method name="get_voice_rate_hz" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="voice_idx" type="int" />
 			<description>
-				Returns the rate of a given [param voice_idx]'s low-frequency oscillator in Hz.
 			</description>
 		</method>
 		<method name="set_voice_cutoff_hz">
@@ -62,7 +51,6 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="cutoff_hz" type="float" />
 			<description>
-				Sets the frequency threshold of a given [param voice_idx]'s low-pass filter in Hz. Frequencies above [param cutoff_hz] are removed from [param voice_idx]. Value can range from 1 to 20500.
 			</description>
 		</method>
 		<method name="set_voice_delay_ms">
@@ -70,7 +58,6 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="delay_ms" type="float" />
 			<description>
-				Sets the delay of a given [param voice_idx] in milliseconds, compared to the original audio. Value can range from 0 to 50.
 			</description>
 		</method>
 		<method name="set_voice_depth_ms">
@@ -78,7 +65,6 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="depth_ms" type="float" />
 			<description>
-				Sets the depth of a given [param voice_idx]'s low-frequency oscillator in milliseconds. Value can range from 0 to 20.
 			</description>
 		</method>
 		<method name="set_voice_level_db">
@@ -86,7 +72,6 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="level_db" type="float" />
 			<description>
-				Sets the gain of a given [param voice_idx] in dB. Value can range from -60 to 24.
 			</description>
 		</method>
 		<method name="set_voice_pan">
@@ -94,7 +79,6 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="pan" type="float" />
 			<description>
-				Sets the pan position of a given [param voice_idx]. Negative values pan the sound to the left, positive pan to the right. Value can range from -1 to 1.
 			</description>
 		</method>
 		<method name="set_voice_rate_hz">
@@ -102,91 +86,90 @@
 			<param index="0" name="voice_idx" type="int" />
 			<param index="1" name="rate_hz" type="float" />
 			<description>
-				Sets the rate of a given [param voice_idx]'s low-frequency oscillator in Hz. Value can range from 0.1 to 20.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="dry" type="float" setter="set_dry" getter="get_dry" default="1.0">
-			The volume ratio of the original audio. Value can range from 0 to 1.
+			The effect's raw signal.
 		</member>
 		<member name="voice/1/cutoff_hz" type="float" setter="set_voice_cutoff_hz" getter="get_voice_cutoff_hz" default="8000.0">
-			The frequency threshold of the voice's low-pass filter in Hz.
+			The voice's cutoff frequency.
 		</member>
 		<member name="voice/1/delay_ms" type="float" setter="set_voice_delay_ms" getter="get_voice_delay_ms" default="15.0">
-			The delay of the voice in milliseconds, compared to the original audio.
+			The voice's signal delay.
 		</member>
 		<member name="voice/1/depth_ms" type="float" setter="set_voice_depth_ms" getter="get_voice_depth_ms" default="2.0">
-			The depth of the voice's low-frequency oscillator in milliseconds.
+			The voice filter's depth.
 		</member>
 		<member name="voice/1/level_db" type="float" setter="set_voice_level_db" getter="get_voice_level_db" default="0.0">
-			The gain of the voice in dB.
+			The voice's volume.
 		</member>
 		<member name="voice/1/pan" type="float" setter="set_voice_pan" getter="get_voice_pan" default="-0.5">
-			The pan position of the voice.
+			The voice's pan level.
 		</member>
 		<member name="voice/1/rate_hz" type="float" setter="set_voice_rate_hz" getter="get_voice_rate_hz" default="0.8">
-			The rate of the voice's low-frequency oscillator in Hz.
+			The voice's filter rate.
 		</member>
 		<member name="voice/2/cutoff_hz" type="float" setter="set_voice_cutoff_hz" getter="get_voice_cutoff_hz" default="8000.0">
-			The frequency threshold of the voice's low-pass filter in Hz.
+			The voice's cutoff frequency.
 		</member>
 		<member name="voice/2/delay_ms" type="float" setter="set_voice_delay_ms" getter="get_voice_delay_ms" default="20.0">
-			The delay of the voice in milliseconds, compared to the original audio.
+			The voice's signal delay.
 		</member>
 		<member name="voice/2/depth_ms" type="float" setter="set_voice_depth_ms" getter="get_voice_depth_ms" default="3.0">
-			The depth of the voice's low-frequency oscillator in milliseconds.
+			The voice filter's depth.
 		</member>
 		<member name="voice/2/level_db" type="float" setter="set_voice_level_db" getter="get_voice_level_db" default="0.0">
-			The gain of the voice in dB.
+			The voice's volume.
 		</member>
 		<member name="voice/2/pan" type="float" setter="set_voice_pan" getter="get_voice_pan" default="0.5">
-			The pan position of the voice.
+			The voice's pan level.
 		</member>
 		<member name="voice/2/rate_hz" type="float" setter="set_voice_rate_hz" getter="get_voice_rate_hz" default="1.2">
-			The rate of the voice's low-frequency oscillator in Hz.
+			The voice's filter rate.
 		</member>
 		<member name="voice/3/cutoff_hz" type="float" setter="set_voice_cutoff_hz" getter="get_voice_cutoff_hz">
-			The frequency threshold of the voice's low-pass filter in Hz.
+			The voice's cutoff frequency.
 		</member>
 		<member name="voice/3/delay_ms" type="float" setter="set_voice_delay_ms" getter="get_voice_delay_ms">
-			The delay of the voice in milliseconds, compared to the original audio.
+			The voice's signal delay.
 		</member>
 		<member name="voice/3/depth_ms" type="float" setter="set_voice_depth_ms" getter="get_voice_depth_ms">
-			The depth of the voice's low-frequency oscillator in milliseconds.
+			The voice filter's depth.
 		</member>
 		<member name="voice/3/level_db" type="float" setter="set_voice_level_db" getter="get_voice_level_db">
-			The gain of the voice in dB.
+			The voice's volume.
 		</member>
 		<member name="voice/3/pan" type="float" setter="set_voice_pan" getter="get_voice_pan">
-			The pan position of the voice.
+			The voice's pan level.
 		</member>
 		<member name="voice/3/rate_hz" type="float" setter="set_voice_rate_hz" getter="get_voice_rate_hz">
-			The rate of the voice's low-frequency oscillator in Hz.
+			The voice's filter rate.
 		</member>
 		<member name="voice/4/cutoff_hz" type="float" setter="set_voice_cutoff_hz" getter="get_voice_cutoff_hz">
-			The frequency threshold of the voice's low-pass filter in Hz.
+			The voice's cutoff frequency.
 		</member>
 		<member name="voice/4/delay_ms" type="float" setter="set_voice_delay_ms" getter="get_voice_delay_ms">
-			The delay of the voice in milliseconds, compared to the original audio.
+			The voice's signal delay.
 		</member>
 		<member name="voice/4/depth_ms" type="float" setter="set_voice_depth_ms" getter="get_voice_depth_ms">
-			The depth of the voice's low-frequency oscillator in milliseconds.
+			The voice filter's depth.
 		</member>
 		<member name="voice/4/level_db" type="float" setter="set_voice_level_db" getter="get_voice_level_db">
-			The gain of the voice in dB.
+			The voice's volume.
 		</member>
 		<member name="voice/4/pan" type="float" setter="set_voice_pan" getter="get_voice_pan">
-			The pan position of the voice.
+			The voice's pan level.
 		</member>
 		<member name="voice/4/rate_hz" type="float" setter="set_voice_rate_hz" getter="get_voice_rate_hz">
-			The rate of the voice's low-frequency oscillator in Hz.
+			The voice's filter rate.
 		</member>
 		<member name="voice_count" type="int" setter="set_voice_count" getter="get_voice_count" default="2">
-			The number of voices in the effect. Value can range from 1 to 4.
+			The number of voices in the effect.
 		</member>
 		<member name="wet" type="float" setter="set_wet" getter="get_wet" default="0.5">
-			The volume ratio of all voices. Value can range from 0 to 1.
+			The effect's processed signal.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectCompressor.xml b/engine/doc/classes/AudioEffectCompressor.xml
index 6064e98a..f6d94e0c 100644
--- a/engine/doc/classes/AudioEffectCompressor.xml
+++ b/engine/doc/classes/AudioEffectCompressor.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectCompressor" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectCompressor" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a downward compressor audio effect to an audio bus.
-		Allows control of the dynamic range via a volume threshold and timing controls.
+		Adds a compressor audio effect to an audio bus.
+		Reduces sounds that exceed a certain threshold level, smooths out the dynamics and increases the overall volume.
 	</brief_description>
 	<description>
-		A "compressor" decreases the volume of sounds when it exceeds a certain volume threshold level.
-		A compressor can have many uses in a mix:
-		- To compress the whole volume in the Master bus (although an [AudioEffectHardLimiter] is probably better).
-		- To ensure balance of voice audio clips.
-		- To sidechain, using another bus as a trigger. This decreases the volume of the bus it is attached to, by using the volume from another audio bus for threshold detection. This technique is common in video game mixing to decrease the volume of music and SFX while voices are being heard. This effect is also known as "ducking".
-		- To accentuate transients by using a long attack, letting sounds exceed the volume threshold level for a short period before compressing them. This can be used to make SFX more punchy.
+		Dynamic range compressor reduces the level of the sound when the amplitude goes over a certain threshold in Decibels. One of the main uses of a compressor is to increase the dynamic range by clipping as little as possible (when sound goes over 0dB).
+		Compressor has many uses in the mix:
+		- In the Master bus to compress the whole output (although an [AudioEffectHardLimiter] is probably better).
+		- In voice channels to ensure they sound as balanced as possible.
+		- Sidechained. This can reduce the sound level sidechained with another audio bus for threshold detection. This technique is common in video game mixing to the level of music and SFX while voices are being heard.
+		- Accentuates transients by using a wider attack, making effects sound more punchy.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="attack_us" type="float" setter="set_attack_us" getter="get_attack_us" default="20.0">
-			Compressor's reaction time when the audio exceeds the volume threshold level, in microseconds. Value can range from 20 to 2000.
+			Compressor's reaction time when the signal exceeds the threshold, in microseconds. Value can range from 20 to 2000.
 		</member>
 		<member name="gain" type="float" setter="set_gain" getter="get_gain" default="0.0">
-			Gain of the audio signal, in dB. Value can range from -20 to 20.
+			Gain applied to the output signal.
 		</member>
 		<member name="mix" type="float" setter="set_mix" getter="get_mix" default="1.0">
-			Balance between the original audio and the compressed audio. Value can range from 0 (totally dry) to 1 (totally wet).
+			Balance between original signal and effect signal. Value can range from 0 (totally dry) to 1 (totally wet).
 		</member>
 		<member name="ratio" type="float" setter="set_ratio" getter="get_ratio" default="4.0">
-			Amount of compression applied to the audio once it passes the volume threshold level. The higher the ratio, the stronger the compression applied to audio signals that pass the volume threshold level. Value can range from 1 to 48.
+			Amount of compression applied to the audio once it passes the threshold level. The higher the ratio, the more the loud parts of the audio will be compressed. Value can range from 1 to 48.
 		</member>
 		<member name="release_ms" type="float" setter="set_release_ms" getter="get_release_ms" default="250.0">
-			Compressor's delay time to stop decreasing the volume after the it falls below the volume threshold level, in milliseconds. Value can range from 20 to 2000.
+			Compressor's delay time to stop reducing the signal after the signal level falls below the threshold, in milliseconds. Value can range from 20 to 2000.
 		</member>
 		<member name="sidechain" type="StringName" setter="set_sidechain" getter="get_sidechain" default="&amp;&quot;&quot;">
-			Audio bus to use for the volume threshold detection.
+			Reduce the sound level using another audio bus for threshold detection.
 		</member>
 		<member name="threshold" type="float" setter="set_threshold" getter="get_threshold" default="0.0">
-			The volume level above which compression is applied to the audio, in dB. Value can range from -60 to 0.
+			The level above which compression is applied to the audio. Value can range from -60 to 0.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectDelay.xml b/engine/doc/classes/AudioEffectDelay.xml
index 99312f8f..eae49f6a 100644
--- a/engine/doc/classes/AudioEffectDelay.xml
+++ b/engine/doc/classes/AudioEffectDelay.xml
@@ -1,56 +1,54 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectDelay" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectDelay" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a delay audio effect to an audio bus.
-		Emulates an echo by playing the input audio back after a period of time.
+		Adds a delay audio effect to an audio bus. Plays input signal back after a period of time.
+		Two tap delay and feedback options.
 	</brief_description>
 	<description>
-		A "delay" effect plays the input audio signal back after a period of time. Each repetition is called a "delay tap" or simply "tap". Delay taps may be played back multiple times to create the sound of a repeating, decaying echo. Delay effects range from a subtle echo to a pronounced blending of previous sounds with new sounds.
-		See also [AudioEffectReverb] for a blurry, continuous echo.
+		Plays input signal back after a period of time. The delayed signal may be played back multiple times to create the sound of a repeating, decaying echo. Delay effects range from a subtle echo effect to a pronounced blending of previous sounds with new sounds.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="dry" type="float" setter="set_dry" getter="get_dry" default="1.0">
-			The volume ratio of the original audio. Value can range from 0 to 1.
+			Output percent of original sound. At 0, only delayed sounds are output. Value can range from 0 to 1.
 		</member>
 		<member name="feedback_active" type="bool" setter="set_feedback_active" getter="is_feedback_active" default="false">
-			If [code]true[/code], feedback is enabled, repeating taps after they are played.
+			If [code]true[/code], feedback is enabled.
 		</member>
 		<member name="feedback_delay_ms" type="float" setter="set_feedback_delay_ms" getter="get_feedback_delay_ms" default="340.0">
-			Feedback delay time in milliseconds. Value can range from 0 to 1500.
+			Feedback delay time in milliseconds.
 		</member>
 		<member name="feedback_level_db" type="float" setter="set_feedback_level_db" getter="get_feedback_level_db" default="-6.0">
-			Gain for feedback, in dB. Value can range from -60 to 0.
+			Sound level for feedback.
 		</member>
 		<member name="feedback_lowpass" type="float" setter="set_feedback_lowpass" getter="get_feedback_lowpass" default="16000.0">
-			Low-pass filter for feedback, in Hz. Frequencies above this value are filtered out. Value can range from 1 to 16000.
+			Low-pass filter for feedback, in Hz. Frequencies below this value are filtered out of the source signal.
 		</member>
 		<member name="tap1_active" type="bool" setter="set_tap1_active" getter="is_tap1_active" default="true">
 			If [code]true[/code], the first tap will be enabled.
 		</member>
 		<member name="tap1_delay_ms" type="float" setter="set_tap1_delay_ms" getter="get_tap1_delay_ms" default="250.0">
-			First tap delay time in milliseconds, compared to the original audio. Value can range from 0 to 1500.
+			First tap delay time in milliseconds.
 		</member>
 		<member name="tap1_level_db" type="float" setter="set_tap1_level_db" getter="get_tap1_level_db" default="-6.0">
-			Gain for the first tap, in dB. Value can range from -60 to 0.
+			Sound level for the first tap.
 		</member>
 		<member name="tap1_pan" type="float" setter="set_tap1_pan" getter="get_tap1_pan" default="0.2">
-			Pan position for the first tap. Negative values pan the sound to the left, positive pan to the right. Value can range from -1 to 1.
+			Pan position for the first tap. Value can range from -1 (fully left) to 1 (fully right).
 		</member>
 		<member name="tap2_active" type="bool" setter="set_tap2_active" getter="is_tap2_active" default="true">
 			If [code]true[/code], the second tap will be enabled.
 		</member>
 		<member name="tap2_delay_ms" type="float" setter="set_tap2_delay_ms" getter="get_tap2_delay_ms" default="500.0">
-			Second tap delay time in milliseconds, compared to the original audio. Value can range from 0 to 1500.
+			Second tap delay time in milliseconds.
 		</member>
 		<member name="tap2_level_db" type="float" setter="set_tap2_level_db" getter="get_tap2_level_db" default="-12.0">
-			Gain for the second tap, in dB. Value can range from -60 to 0.
+			Sound level for the second tap.
 		</member>
 		<member name="tap2_pan" type="float" setter="set_tap2_pan" getter="get_tap2_pan" default="-0.4">
-			Pan position for the second tap. Negative values pan the sound to the left, positive pan to the right. Value can range from -1 to 1.
+			Pan position for the second tap. Value can range from -1 (fully left) to 1 (fully right).
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectDistortion.xml b/engine/doc/classes/AudioEffectDistortion.xml
index aba54514..f8c68047 100644
--- a/engine/doc/classes/AudioEffectDistortion.xml
+++ b/engine/doc/classes/AudioEffectDistortion.xml
@@ -1,53 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectDistortion" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectDistortion" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a distortion audio effect to an audio bus.
-		Remaps audio samples using a nonlinear function to achieve a distorted sound.
+		Adds a distortion audio effect to an Audio bus.
+		Modifies the sound to make it distorted.
 	</brief_description>
 	<description>
-		A "distortion" effect modifies the waveform via a nonlinear mathematical function (see available ones in [enum Mode]), based on the amplitude of the waveform's samples.
-		[b]Note:[/b] In a nonlinear function, an input sample at [i]x[/i] amplitude value, will either have its amplitude increased or decreased to a [i]y[/i] value, based on the function value at [i]x[/i], which is why even at the same [member drive], the output sound will vary depending on the input's volume. To change the volume while maintaining the output waveform, use [member post_gain].
-		In this effect, each type is a different nonlinear function. The different types available are: clip, atan, lofi (bitcrush), overdrive, and waveshape. Every distortion type available here is symmetric: negative amplitude values are affected the same way as positive ones.
-		Although distortion will always change frequency content, usually by introducing high harmonics, different distortion types offer a range of sound qualities; from "soft" and "warm", to "crunchy" and "abrasive".
-		For games, it can help simulate sound coming from some saturated device or speaker very efficiently. It can also help the audio stand out in a mix, by introducing higher frequencies and increasing the volume.
-		[b]Note:[/b] Although usually imperceptible, an enabled distortion effect still changes the sound even when [member drive] is set to 0. This is not a bug. If this behavior is undesirable, consider disabling the effect using [method AudioServer.set_bus_effect_enabled].
+		Different types are available: clip, tan, lo-fi (bit crushing), overdrive, or waveshape.
+		By distorting the waveform the frequency content changes, which will often make the sound "crunchy" or "abrasive". For games, it can simulate sound coming from some saturated device or speaker very efficiently.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="drive" type="float" setter="set_drive" getter="get_drive" default="0.0">
-			Distortion intensity. Controls how much of the input audio is affected by the distortion curve by moving from a linear function to a nonlinear one. Value can range from 0 to 1.
+			Distortion power. Value can range from 0 to 1.
 		</member>
 		<member name="keep_hf_hz" type="float" setter="set_keep_hf_hz" getter="get_keep_hf_hz" default="16000.0">
 			High-pass filter, in Hz. Frequencies higher than this value will not be affected by the distortion. Value can range from 1 to 20000.
 		</member>
 		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="AudioEffectDistortion.Mode" default="0">
-			Distortion type. Changes the nonlinear function used to distort the waveform. See [enum Mode].
+			Distortion type.
 		</member>
 		<member name="post_gain" type="float" setter="set_post_gain" getter="get_post_gain" default="0.0">
-			Gain after the effect, in dB. Value can range from -80 to 24.
+			Increases or decreases the volume after the effect, in decibels. Value can range from -80 to 24.
 		</member>
 		<member name="pre_gain" type="float" setter="set_pre_gain" getter="get_pre_gain" default="0.0">
-			Gain before the effect, in dB. Value can range from -60 to 60.
+			Increases or decreases the volume before the effect, in decibels. Value can range from -60 to 60.
 		</member>
 	</members>
 	<constants>
 		<constant name="MODE_CLIP" value="0" enum="Mode">
-			Flattens the waveform at 0 dB in a sharp manner. [member drive] increases amplitude of samples exponentially. This mode functions as a hard clipper if [member drive] is set to 0, and is the only mode that clips audio signals at 0 dB.
+			Digital distortion effect which cuts off peaks at the top and bottom of the waveform.
 		</constant>
 		<constant name="MODE_ATAN" value="1" enum="Mode">
-			Flattens the waveform in a smooth manner, following an arctangent curve. The audio decreases in volume, before flattening peaks to [code]PI * 4.0[/code] (linear value), if it was normalized beforehand.
 		</constant>
 		<constant name="MODE_LOFI" value="2" enum="Mode">
-			Decreases audio bit depth to achieve a low-resolution audio signal, going from 16-bit to 2-bit. Can be used to emulate the sound of early digital audio devices.
+			Low-resolution digital distortion effect (bit depth reduction). You can use it to emulate the sound of early digital audio devices.
 		</constant>
 		<constant name="MODE_OVERDRIVE" value="3" enum="Mode">
-			Emulates the warm distortion produced by a field effect transistor, which is commonly used in solid-state musical instrument amplifiers. [member drive] has no effect in this mode.
+			Emulates the warm distortion produced by a field effect transistor, which is commonly used in solid-state musical instrument amplifiers. The [member drive] property has no effect in this mode.
 		</constant>
 		<constant name="MODE_WAVESHAPE" value="4" enum="Mode">
-			Flattens the waveform in a smooth manner, until it reaches a sharp peak at [code]drive = 1[/code], following a generic absolute sigmoid function.
+			Waveshaper distortions are used mainly by electronic musicians to achieve an extra-abrasive sound.
 		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/AudioEffectEQ.xml b/engine/doc/classes/AudioEffectEQ.xml
index 6ff162a0..fb06ee2a 100644
--- a/engine/doc/classes/AudioEffectEQ.xml
+++ b/engine/doc/classes/AudioEffectEQ.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectEQ" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectEQ" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Base class for audio equalizers (EQ). Gives you control over frequencies.
-		Use it to create a custom equalizer if [AudioEffectEQ6], [AudioEffectEQ10], or [AudioEffectEQ21] don't fit your needs.
+		Base class for audio equalizers. Gives you control over frequencies.
+		Use it to create a custom equalizer if [AudioEffectEQ6], [AudioEffectEQ10] or [AudioEffectEQ21] don't fit your needs.
 	</brief_description>
 	<description>
-		An "equalizer" gives you control over the gain of frequencies in the entire spectrum, by allowing their adjustment through bands. A band is a point in the frequency spectrum, and each band means a division of the spectrum that can be adjusted.
-		Use equalizers to compensate for existing deficiencies in the audio, make room for other elements, or remove undesirable frequencies. AudioEffectEQs are useful on the Master bus to balance the entire mix or give it more character. They are also useful when a game is run on a mobile device, to adjust the mix to that kind of speakers (it can be disabled when headphones are plugged in).
+		AudioEffectEQ gives you control over frequencies. Use it to compensate for existing deficiencies in audio. AudioEffectEQs are useful on the Master bus to completely master a mix and give it more character. They are also useful when a game is run on a mobile device, to adjust the mix to that kind of speakers (it can be added but disabled when headphones are plugged).
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_band_count" qualifiers="const">
diff --git a/engine/doc/classes/AudioEffectEQ10.xml b/engine/doc/classes/AudioEffectEQ10.xml
index c3b4cf9c..b236ba7b 100644
--- a/engine/doc/classes/AudioEffectEQ10.xml
+++ b/engine/doc/classes/AudioEffectEQ10.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectEQ10" inherits="AudioEffectEQ" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectEQ10" inherits="AudioEffectEQ" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a 10-band equalizer audio effect to an audio bus.
-		Gives you control over frequencies from 31 Hz to 16000 Hz. Each frequency can be modulated between -60/+24 dB.
+		Adds a 10-band equalizer audio effect to an Audio bus. Gives you control over frequencies from 31 Hz to 16000 Hz.
+		Each frequency can be modulated between -60/+24 dB.
 	</brief_description>
 	<description>
 		Frequency bands:
@@ -20,6 +20,5 @@
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectEQ21.xml b/engine/doc/classes/AudioEffectEQ21.xml
index 01de18a4..41ceed17 100644
--- a/engine/doc/classes/AudioEffectEQ21.xml
+++ b/engine/doc/classes/AudioEffectEQ21.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectEQ21" inherits="AudioEffectEQ" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectEQ21" inherits="AudioEffectEQ" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a 21-band equalizer audio effect to an audio bus.
-		Gives you control over frequencies from 22 Hz to 22000 Hz. Each frequency can be modulated between -60/+24 dB.
+		Adds a 21-band equalizer audio effect to an Audio bus. Gives you control over frequencies from 22 Hz to 22000 Hz.
+		Each frequency can be modulated between -60/+24 dB.
 	</brief_description>
 	<description>
 		Frequency bands:
@@ -31,6 +31,5 @@
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectEQ6.xml b/engine/doc/classes/AudioEffectEQ6.xml
index 5c4f9395..6e4a16dd 100644
--- a/engine/doc/classes/AudioEffectEQ6.xml
+++ b/engine/doc/classes/AudioEffectEQ6.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectEQ6" inherits="AudioEffectEQ" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectEQ6" inherits="AudioEffectEQ" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a 6-band equalizer audio effect to an audio bus.
-		Gives you control over frequencies from 32 Hz to 10000 Hz. Each frequency can be modulated between -60/+24 dB.
+		Adds a 6-band equalizer audio effect to an audio bus. Gives you control over frequencies from 32 Hz to 10000 Hz.
+		Each frequency can be modulated between -60/+24 dB.
 	</brief_description>
 	<description>
 		Frequency bands:
@@ -16,6 +16,5 @@
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectFilter.xml b/engine/doc/classes/AudioEffectFilter.xml
index 6725f2de..18540de7 100644
--- a/engine/doc/classes/AudioEffectFilter.xml
+++ b/engine/doc/classes/AudioEffectFilter.xml
@@ -1,49 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectFilter" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectFilter" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Base class for filters. Use effects that inherit this class instead of using it directly.
+		Adds a filter to the audio bus.
 	</brief_description>
 	<description>
-		A "filter" controls the gain of frequencies, using [member cutoff_hz] as a frequency threshold. Filters can help to give room for each sound, and create interesting effects.
-		There are different types of filter that inherit this class:
-		Shelf filters: [AudioEffectLowShelfFilter] and [AudioEffectHighShelfFilter]
-		Band-pass and notch filters: [AudioEffectBandPassFilter], [AudioEffectBandLimitFilter], and [AudioEffectNotchFilter]
-		Low/high-pass filters: [AudioEffectLowPassFilter] and [AudioEffectHighPassFilter]
+		Allows frequencies other than the [member cutoff_hz] to pass.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="cutoff_hz" type="float" setter="set_cutoff" getter="get_cutoff" default="2000.0">
-			Frequency threshold for the filter, in Hz. Value can range from 1 to 20500.
+			Threshold frequency for the filter, in Hz.
 		</member>
 		<member name="db" type="int" setter="set_db" getter="get_db" enum="AudioEffectFilter.FilterDB" default="0">
-			Steepness of the cutoff curve in dB per octave (twice the frequency above [member cutoff_hz], or half the frequency below [member cutoff_hz]), also known as the "order" of the filter. Higher orders have a more aggressive cutoff.
+			Steepness of the cutoff curve in dB per octave, also known as the order of the filter. Higher orders have a more aggressive cutoff.
 		</member>
 		<member name="gain" type="float" setter="set_gain" getter="get_gain" default="1.0">
-			Gain of the frequencies affected by the filter. This property is only available for [AudioEffectLowShelfFilter] and [AudioEffectHighShelfFilter]. Value can range from 0 to 4.
+			Gain amount of the frequencies after the filter.
 		</member>
 		<member name="resonance" type="float" setter="set_resonance" getter="get_resonance" default="0.5">
-			Gain at or directly next to the [member cutoff_hz] frequency threshold. Value can range from 0 to 1.
-			Its exact behavior depends on the selected filter type:
-			- For shelf filters, it accentuates or masks the order by increasing frequencies right next to the [member cutoff_hz] frequency and decreasing frequencies on the opposite side.
-			- For the band-pass and notch filters, it widens or narrows the filter at the [member cutoff_hz] frequency threshold.
-			- For low/high-pass filters, it increases or decreases frequencies at the [member cutoff_hz] frequency threshold.
+			Amount of boost in the frequency range near the cutoff frequency.
 		</member>
 	</members>
 	<constants>
 		<constant name="FILTER_6DB" value="0" enum="FilterDB">
-			Cutting off at 6 dB per octave. One octave is twice the frequency above [member cutoff_hz], or half the frequency below [member cutoff_hz].
+			Cutting off at 6dB per octave.
 		</constant>
 		<constant name="FILTER_12DB" value="1" enum="FilterDB">
-			Cutting off at 12 dB per octave. One octave is twice the frequency above [member cutoff_hz], or half the frequency below [member cutoff_hz].
+			Cutting off at 12dB per octave.
 		</constant>
 		<constant name="FILTER_18DB" value="2" enum="FilterDB">
-			Cutting off at 18 dB per octave. One octave is twice the frequency above [member cutoff_hz], or half the frequency below [member cutoff_hz].
+			Cutting off at 18dB per octave.
 		</constant>
 		<constant name="FILTER_24DB" value="3" enum="FilterDB">
-			Cutting off at 24 dB per octave. One octave is twice the frequency above [member cutoff_hz], or half the frequency below [member cutoff_hz].
+			Cutting off at 24dB per octave.
 		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/AudioEffectHardLimiter.xml b/engine/doc/classes/AudioEffectHardLimiter.xml
index 0b8983c3..7616b91f 100644
--- a/engine/doc/classes/AudioEffectHardLimiter.xml
+++ b/engine/doc/classes/AudioEffectHardLimiter.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectHardLimiter" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectHardLimiter" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a limiter audio effect to an audio bus.
-		Prevents audio signals from exceeding a specified volume level.
+		Adds a hard limiter audio effect to an Audio bus.
 	</brief_description>
 	<description>
-		A "limiter" disallows audio signals from exceeding a given volume threshold level in dB. Hard limiters predict volume peaks, and will smoothly apply gain reduction when a peak crosses the ceiling threshold level to prevent clipping. It preserves the waveform and prevents it from crossing the ceiling threshold level. Adding one in the Master bus is recommended as a safety measure to prevent sudden volume peaks from occurring, and to prevent distortion caused by clipping, when the volume exceeds 0 dB.
-		If clipping is desired, consider [constant AudioEffectDistortion.MODE_CLIP].
+		A limiter is an effect designed to disallow sound from going over a given dB threshold. Hard limiters predict volume peaks, and will smoothly apply gain reduction when a peak crosses the ceiling threshold to prevent clipping and distortion. It preserves the waveform and prevents it from crossing the ceiling threshold. Adding one in the Master bus is recommended as a safety measure to prevent sudden volume peaks from occurring, and to prevent distortion caused by clipping.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="ceiling_db" type="float" setter="set_ceiling_db" getter="get_ceiling_db" default="-0.3">
-			The waveform's maximum allowed value, in dB. This value can range from -24 to 0.
-			The default value of -0.3 prevents potential inter-sample peaks (ISP) from crossing over 0 dB, which can cause slight distortion on some older hardware.
+			The waveform's maximum allowed value, in decibels. This value can range from [code]-24.0[/code] to [code]0.0[/code].
+			The default value of [code]-0.3[/code] prevents potential inter-sample peaks (ISP) from crossing over 0 dB, which can cause slight distortion on some older hardware.
 		</member>
 		<member name="pre_gain_db" type="float" setter="set_pre_gain_db" getter="get_pre_gain_db" default="0.0">
-			Gain before limiting, in dB. Value can range from -24 to 24.
+			Gain to apply before limiting, in decibels.
 		</member>
 		<member name="release" type="float" setter="set_release" getter="get_release" default="0.1">
-			Time it takes in seconds for the gain reduction to fully release. Value can range from 0.01 to 3.
+			Time it takes in seconds for the gain reduction to fully release.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectHighPassFilter.xml b/engine/doc/classes/AudioEffectHighPassFilter.xml
index fc3641f0..285b4c74 100644
--- a/engine/doc/classes/AudioEffectHighPassFilter.xml
+++ b/engine/doc/classes/AudioEffectHighPassFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectHighPassFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectHighPassFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a high-pass filter to an audio bus.
+		Adds a high-pass filter to the audio bus.
 	</brief_description>
 	<description>
-		A "high-pass" filter attenuates frequencies lower than [member AudioEffectFilter.cutoff_hz] and allows higher frequencies to pass unchanged.
-		This filter can be used to remove "strength" from a sound, and give low-end space for basses and impact sounds.
+		Cuts frequencies lower than the [member AudioEffectFilter.cutoff_hz] and allows higher frequencies to pass.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectHighShelfFilter.xml b/engine/doc/classes/AudioEffectHighShelfFilter.xml
index 57be96e9..4645bf95 100644
--- a/engine/doc/classes/AudioEffectHighShelfFilter.xml
+++ b/engine/doc/classes/AudioEffectHighShelfFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectHighShelfFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectHighShelfFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a high-shelf filter to an audio bus.
+		Adds a high-shelf filter to the audio bus.
 	</brief_description>
 	<description>
-		A "high-shelf" filter controls the gain of all frequencies above [member AudioEffectFilter.cutoff_hz].
-		This filter can be used to increase or decrease clarity of a sound.
+		Reduces all frequencies above the [member AudioEffectFilter.cutoff_hz].
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectInstance.xml b/engine/doc/classes/AudioEffectInstance.xml
index 77191c10..058a4510 100644
--- a/engine/doc/classes/AudioEffectInstance.xml
+++ b/engine/doc/classes/AudioEffectInstance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectInstance" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectInstance" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Manipulates the audio it receives for a given effect.
 	</brief_description>
@@ -8,7 +8,6 @@
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<methods>
 		<method name="_process" qualifiers="virtual required">
diff --git a/engine/doc/classes/AudioEffectLimiter.xml b/engine/doc/classes/AudioEffectLimiter.xml
index fa482fdc..b1a80cd9 100644
--- a/engine/doc/classes/AudioEffectLimiter.xml
+++ b/engine/doc/classes/AudioEffectLimiter.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectLimiter" inherits="AudioEffect" api_type="core" deprecated="Use [AudioEffectHardLimiter] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectLimiter" inherits="AudioEffect" deprecated="Use [AudioEffectHardLimiter] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a soft-clip limiter audio effect to an audio bus.
+		Adds a soft-clip limiter audio effect to an Audio bus.
 	</brief_description>
 	<description>
-		A "limiter" is an audio effect designed to stop audio signals from exceeding a specified volume threshold level, and usually works by decreasing the volume or soft-clipping the audio. Adding one in the Master bus is always recommended to prevent clipping when the volume goes above 0 dB.
-		Soft clipping starts to decrease the peaks a little below the volume threshold level and progressively increases its effect as the input volume increases such that the threshold level is never exceeded.
-		If hard clipping is desired, consider [constant AudioEffectDistortion.MODE_CLIP].
+		A limiter is similar to a compressor, but it's less flexible and designed to disallow sound going over a given dB threshold. Adding one in the Master bus is always recommended to reduce the effects of clipping.
+		Soft clipping starts to reduce the peaks a little below the threshold level and progressively increases its effect as the input level increases such that the threshold is never exceeded.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="ceiling_db" type="float" setter="set_ceiling_db" getter="get_ceiling_db" default="-0.1">
-			The waveform's maximum allowed value, in dB. Value can range from -20 to -0.1.
+			The waveform's maximum allowed value, in decibels. Value can range from -20 to -0.1.
 		</member>
 		<member name="soft_clip_db" type="float" setter="set_soft_clip_db" getter="get_soft_clip_db" default="2.0">
-			Modifies the volume of the limited waves, in dB. Value can range from 0 to 6.
+			Applies a gain to the limited waves, in decibels. Value can range from 0 to 6.
 		</member>
 		<member name="soft_clip_ratio" type="float" setter="set_soft_clip_ratio" getter="get_soft_clip_ratio" default="10.0">
-			This property has no effect on the audio. Use [AudioEffectHardLimiter] instead, as this Limiter effect is deprecated.
 		</member>
 		<member name="threshold_db" type="float" setter="set_threshold_db" getter="get_threshold_db" default="0.0">
-			The volume threshold level from which the limiter begins to be active, in dB. Value can range from -30 to 0.
+			Threshold from which the limiter begins to be active, in decibels. Value can range from -30 to 0.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectLowPassFilter.xml b/engine/doc/classes/AudioEffectLowPassFilter.xml
index 29924767..eab5a04c 100644
--- a/engine/doc/classes/AudioEffectLowPassFilter.xml
+++ b/engine/doc/classes/AudioEffectLowPassFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectLowPassFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectLowPassFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a low-pass filter to an audio bus.
+		Adds a low-pass filter to the audio bus.
 	</brief_description>
 	<description>
-		A "low-pass" filter attenuates frequencies higher than [member AudioEffectFilter.cutoff_hz] and allows lower frequencies to pass unchanged.
-		This filter can be used to muffle sounds.
+		Cuts frequencies higher than the [member AudioEffectFilter.cutoff_hz] and allows lower frequencies to pass.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectLowShelfFilter.xml b/engine/doc/classes/AudioEffectLowShelfFilter.xml
index f980c382..1afc9ce3 100644
--- a/engine/doc/classes/AudioEffectLowShelfFilter.xml
+++ b/engine/doc/classes/AudioEffectLowShelfFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectLowShelfFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectLowShelfFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a low-shelf filter to an audio bus.
+		Adds a low-shelf filter to the audio bus.
 	</brief_description>
 	<description>
-		A "low-shelf" filter controls the gain of all frequencies below [member AudioEffectFilter.cutoff_hz].
-		This filter can be used to adjust the "strength" of a sound, by increasing or decreasing its low-end.
+		Reduces all frequencies below the [member AudioEffectFilter.cutoff_hz].
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectNotchFilter.xml b/engine/doc/classes/AudioEffectNotchFilter.xml
index e5e9569d..de8edb34 100644
--- a/engine/doc/classes/AudioEffectNotchFilter.xml
+++ b/engine/doc/classes/AudioEffectNotchFilter.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectNotchFilter" inherits="AudioEffectFilter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectNotchFilter" inherits="AudioEffectFilter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a notch filter to an audio bus.
+		Adds a notch filter to the Audio bus.
 	</brief_description>
 	<description>
-		A "notch" filter attenuates frequencies at [member AudioEffectFilter.cutoff_hz] and allows frequencies outside the frequency threshold to pass unchanged. It is a narrower and stronger version of [AudioEffectBandLimitFilter], and is the opposite of [AudioEffectBandPassFilter].
-		This filter can be used to give more room for other sounds to play at that frequency. Because of how much it attenuates frequencies, it can also be used to completely remove undesired frequencies.
+		Attenuates frequencies in a narrow band around the [member AudioEffectFilter.cutoff_hz] and cuts frequencies outside of this range.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 </class>
diff --git a/engine/doc/classes/AudioEffectPanner.xml b/engine/doc/classes/AudioEffectPanner.xml
index 2fd417e3..22286dbf 100644
--- a/engine/doc/classes/AudioEffectPanner.xml
+++ b/engine/doc/classes/AudioEffectPanner.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectPanner" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectPanner" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a panner audio effect to an audio bus.
-		Pans the sound left or right.
+		Adds a panner audio effect to an audio bus. Pans sound left or right.
 	</brief_description>
 	<description>
-		Determines how much of the audio signal is sent to the left and right channels. This helps with audio spatialization, giving sounds distinct places in a mix.
-		[AudioStreamPlayer2D] and [AudioStreamPlayer3D] handle panning automatically, following where the source of the sound is on the screen.
+		Determines how much of an audio signal is sent to the left and right buses.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="pan" type="float" setter="set_pan" getter="get_pan" default="0.0">
-			Pan position. Negative values pan the sound to the left, positive pan to the right. Value can range from -1 to 1.
+			Pan position. Value can range from -1 (fully left) to 1 (fully right).
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectPhaser.xml b/engine/doc/classes/AudioEffectPhaser.xml
index fd4a2c4e..6e845ff3 100644
--- a/engine/doc/classes/AudioEffectPhaser.xml
+++ b/engine/doc/classes/AudioEffectPhaser.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectPhaser" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectPhaser" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Adds a phaser audio effect to an audio bus.
-		Creates several notch and peak filters that sweep across the spectrum.
+		Combines the original signal with a copy that is slightly out of phase with the original.
 	</brief_description>
 	<description>
-		A "phaser" effect creates a copy of the original audio that phase-rotates differently across the entire frequency spectrum, with the use of a series of all-pass filter stages (6 in this effect). This copy modulates with a low-frequency oscillator and combines with the original audio, resulting in peaks and troughs that sweep across the spectrum.
-		This effect can be used to create a "glassy" or "bubbly" sound.
+		Combines phase-shifted signals with the original signal. The movement of the phase-shifted signals is controlled using a low-frequency oscillator.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="depth" type="float" setter="set_depth" getter="get_depth" default="1.0">
-			Intensity of the effect. Value can range from 0.1 to 4.0.
+			Determines how high the filter frequencies sweep. Low value will primarily affect bass frequencies. High value can sweep high into the treble. Value can range from [code]0.1[/code] to [code]4.0[/code].
 		</member>
 		<member name="feedback" type="float" setter="set_feedback" getter="get_feedback" default="0.7">
-			The volume ratio of the filtered audio that is fed back to the all-pass filters. The higher the value, the sharper and louder the peak filters created by the effect. Value can range from 0.1 to 0.9.
+			Output percent of modified sound. Value can range from 0.1 to 0.9.
 		</member>
 		<member name="range_max_hz" type="float" setter="set_range_max_hz" getter="get_range_max_hz" default="1600.0">
-			Determines the maximum frequency affected by the low-frequency oscillator modulations, in Hz. Value can range from 10 to 10000.
+			Determines the maximum frequency affected by the LFO modulations, in Hz. Value can range from 10 to 10000.
 		</member>
 		<member name="range_min_hz" type="float" setter="set_range_min_hz" getter="get_range_min_hz" default="440.0">
-			Determines the minimum frequency affected by the low-frequency oscillator modulations, in Hz. Value can range from 10 to 10000.
+			Determines the minimum frequency affected by the LFO modulations, in Hz. Value can range from 10 to 10000.
 		</member>
 		<member name="rate_hz" type="float" setter="set_rate_hz" getter="get_rate_hz" default="0.5">
-			Adjusts the rate in Hz at which the effect sweeps up and down across the frequency range. Value can range from 0.01 to 20.
+			Adjusts the rate in Hz at which the effect sweeps up and down across the frequency range.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectPitchShift.xml b/engine/doc/classes/AudioEffectPitchShift.xml
index f7408219..4d4baa34 100644
--- a/engine/doc/classes/AudioEffectPitchShift.xml
+++ b/engine/doc/classes/AudioEffectPitchShift.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectPitchShift" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectPitchShift" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Adds a pitch-shifting audio effect to an audio bus.
-		Raises or lowers the pitch of the input audio.
+		Raises or lowers the pitch of original sound.
 	</brief_description>
 	<description>
-		Allows modulation of pitch without modifying speed. All frequencies can be raised or lowered with minimal effect on transients.
+		Allows modulation of pitch independently of tempo. All frequencies can be increased/decreased with minimal effect on transients.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectPitchShift.FFTSize" default="3">
-			The size of the [url=https://en.wikipedia.org/wiki/Fast_Fourier_transform]Fast Fourier transform[/url] buffer. Higher values smooth out the effect over time, but have greater latency. The effects of this higher latency are especially noticeable on audio signals that have sudden amplitude changes.
+			The size of the [url=https://en.wikipedia.org/wiki/Fast_Fourier_transform]Fast Fourier transform[/url] buffer. Higher values smooth out the effect over time, but have greater latency. The effects of this higher latency are especially noticeable on sounds that have sudden amplitude changes.
 		</member>
 		<member name="oversampling" type="int" setter="set_oversampling" getter="get_oversampling" default="4">
 			The oversampling factor to use. Higher values result in better quality, but are more demanding on the CPU and may cause audio cracking if the CPU can't keep up.
 		</member>
 		<member name="pitch_scale" type="float" setter="set_pitch_scale" getter="get_pitch_scale" default="1.0">
-			The pitch scale to use. [code]1.0[/code] is the default pitch and plays sounds unaffected. [member pitch_scale] can range from 0 (infinitely low pitch, inaudible) to 16 (16 times higher than the initial pitch).
+			The pitch scale to use. [code]1.0[/code] is the default pitch and plays sounds unaffected. [member pitch_scale] can range from [code]0.0[/code] (infinitely low pitch, inaudible) to [code]16[/code] (16 times higher than the initial pitch).
 		</member>
 	</members>
 	<constants>
diff --git a/engine/doc/classes/AudioEffectRecord.xml b/engine/doc/classes/AudioEffectRecord.xml
index d77905f3..6db9fac2 100644
--- a/engine/doc/classes/AudioEffectRecord.xml
+++ b/engine/doc/classes/AudioEffectRecord.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectRecord" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectRecord" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Audio effect used for recording the sound from an audio bus.
 	</brief_description>
 	<description>
-		Allows the user to record the sound from an audio bus into an [AudioStreamWAV]. When used on the Master audio bus, this includes all audio output by Godot.
+		Allows the user to record the sound from an audio bus into an [AudioStreamWAV]. When used on the "Master" audio bus, this includes all audio output by Godot.
 		Unlike [AudioEffectCapture], this effect encodes the recording with the given format (8-bit, 16-bit, or compressed) instead of giving access to the raw audio samples.
 		Can be used (with an [AudioStreamMicrophone]) to record from a microphone.
 		[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings.
diff --git a/engine/doc/classes/AudioEffectReverb.xml b/engine/doc/classes/AudioEffectReverb.xml
index 5d63377e..4ac9672a 100644
--- a/engine/doc/classes/AudioEffectReverb.xml
+++ b/engine/doc/classes/AudioEffectReverb.xml
@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectReverb" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectReverb" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a reverberation audio effect to an audio bus.
-		Emulates an echo by playing a blurred version of the input audio.
+		Adds a reverberation audio effect to an Audio bus.
 	</brief_description>
 	<description>
-		A "reverb" effect plays the input audio back continuously, decaying over a period of time. It simulates sounds in different kinds of spaces, ranging from small rooms, to big caverns.
-		See also [AudioEffectDelay] for a non-blurry type of echo.
+		Simulates the sound of acoustic environments such as rooms, concert halls, caverns, or an open spaces.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 		<link title="Third Person Shooter (TPS) Demo">https://godotengine.org/asset-library/asset/2710</link>
 	</tutorials>
 	<members>
 		<member name="damping" type="float" setter="set_damping" getter="get_damping" default="0.5">
-			Defines how reflective the imaginary room's walls are. The more reflective, the more high frequency content the reverb has. Value can range from 0 to 1.
+			Defines how reflective the imaginary room's walls are. Value can range from 0 to 1.
 		</member>
 		<member name="dry" type="float" setter="set_dry" getter="get_dry" default="1.0">
-			The volume ratio of the original audio. At 0, only the modified audio is outputted. Value can range from 0 to 1.
+			Output percent of original sound. At 0, only modified sound is outputted. Value can range from 0 to 1.
 		</member>
 		<member name="hipass" type="float" setter="set_hpf" getter="get_hpf" default="0.0">
-			High-pass filter allows frequencies higher than a certain cutoff threshold and attenuates frequencies lower than the cutoff threshold. Value can range from 0 to 1.
+			High-pass filter passes signals with a frequency higher than a certain cutoff frequency and attenuates signals with frequencies lower than the cutoff frequency. Value can range from 0 to 1.
 		</member>
 		<member name="predelay_feedback" type="float" setter="set_predelay_feedback" getter="get_predelay_feedback" default="0.4">
-			Gain of early reflection copies. At higher values, early reflection copies are louder and ring out for longer. Value can range from 0 to 1.
+			Output percent of predelay. Value can range from 0 to 1.
 		</member>
 		<member name="predelay_msec" type="float" setter="set_predelay_msec" getter="get_predelay_msec" default="150.0">
-			Time between the original audio and the early reflections of the reverb signal, in milliseconds. Value can range from 20 to 500.
+			Time between the original signal and the early reflections of the reverb signal, in milliseconds.
 		</member>
 		<member name="room_size" type="float" setter="set_room_size" getter="get_room_size" default="0.8">
 			Dimensions of simulated room. Bigger means more echoes. Value can range from 0 to 1.
 		</member>
 		<member name="spread" type="float" setter="set_spread" getter="get_spread" default="1.0">
-			Widens or narrows the stereo image of the reverb tail. At 1, it fully widens. Value can range from 0 to 1.
+			Widens or narrows the stereo image of the reverb tail. 1 means fully widens. Value can range from 0 to 1.
 		</member>
 		<member name="wet" type="float" setter="set_wet" getter="get_wet" default="0.5">
-			The volume ratio of the modified audio. At 0, only the original audio is outputted. Value can range from 0 to 1.
+			Output percent of modified sound. At 0, only original sound is outputted. Value can range from 0 to 1.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioEffectSpectrumAnalyzer.xml b/engine/doc/classes/AudioEffectSpectrumAnalyzer.xml
index 3d4f3f9b..5cbf3fb1 100644
--- a/engine/doc/classes/AudioEffectSpectrumAnalyzer.xml
+++ b/engine/doc/classes/AudioEffectSpectrumAnalyzer.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectSpectrumAnalyzer" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectSpectrumAnalyzer" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Creates an [AudioEffectInstance] which performs frequency analysis and exposes results to be accessed in real-time.
+		Audio effect that can be used for real-time audio visualizations.
 	</brief_description>
 	<description>
-		Calculates a Fourier Transform of the audio signal. This effect does not alter the audio. Can be used for creating real-time audio visualizations, like a spectrogram.
-		This resource configures an [AudioEffectSpectrumAnalyzerInstance], which performs the actual analysis at runtime. An instance should be obtained with [method AudioServer.get_bus_effect_instance] to make use of this effect.
+		This audio effect does not affect sound output, but can be used for real-time audio visualizations.
+		This resource configures an [AudioEffectSpectrumAnalyzerInstance], which performs the actual analysis at runtime. An instance can be obtained with [method AudioServer.get_bus_effect_instance].
+		See also [AudioStreamGenerator] for procedurally generating sounds.
 	</description>
 	<tutorials>
-		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 		<link title="Audio Spectrum Visualizer Demo">https://godotengine.org/asset-library/asset/2762</link>
 	</tutorials>
 	<members>
 		<member name="buffer_length" type="float" setter="set_buffer_length" getter="get_buffer_length" default="2.0">
-			The length of the buffer to keep, in seconds. Higher values keep data around for longer, but require more memory. Value can range from 0.1 to 4.
+			The length of the buffer to keep (in seconds). Higher values keep data around for longer, but require more memory.
 		</member>
 		<member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectSpectrumAnalyzer.FFTSize" default="2">
 			The size of the [url=https://en.wikipedia.org/wiki/Fast_Fourier_transform]Fast Fourier transform[/url] buffer. Higher values smooth out the spectrum analysis over time, but have greater latency. The effects of this higher latency are especially noticeable with sudden amplitude changes.
 		</member>
+		<member name="tap_back_pos" type="float" setter="set_tap_back_pos" getter="get_tap_back_pos" default="0.01">
+		</member>
 	</members>
 	<constants>
 		<constant name="FFT_SIZE_256" value="0" enum="FFTSize">
diff --git a/engine/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml b/engine/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
index b3ff35a9..ab9106f5 100644
--- a/engine/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
+++ b/engine/doc/classes/AudioEffectSpectrumAnalyzerInstance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectSpectrumAnalyzerInstance" inherits="AudioEffectInstance" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectSpectrumAnalyzerInstance" inherits="AudioEffectInstance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Queryable instance of an [AudioEffectSpectrumAnalyzer].
 	</brief_description>
@@ -8,8 +8,6 @@
 		An instance of this class can be obtained with [method AudioServer.get_bus_effect_instance].
 	</description>
 	<tutorials>
-		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 		<link title="Audio Spectrum Visualizer Demo">https://godotengine.org/asset-library/asset/2762</link>
 	</tutorials>
 	<methods>
diff --git a/engine/doc/classes/AudioEffectStereoEnhance.xml b/engine/doc/classes/AudioEffectStereoEnhance.xml
index 221d82b2..459ae3eb 100644
--- a/engine/doc/classes/AudioEffectStereoEnhance.xml
+++ b/engine/doc/classes/AudioEffectStereoEnhance.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioEffectStereoEnhance" inherits="AudioEffect" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioEffectStereoEnhance" inherits="AudioEffect" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Adds a stereo manipulation audio effect to an audio bus.
-		Controls gain of the side channels, and widens the stereo image.
+		An audio effect that can be used to adjust the intensity of stereo panning.
 	</brief_description>
 	<description>
-		Adjusts gain of the left and right channels, and makes mono sounds stereo through phase shifting.
+		An audio effect that can be used to adjust the intensity of stereo panning.
 	</description>
 	<tutorials>
 		<link title="Audio buses">$DOCS_URL/tutorials/audio/audio_buses.html</link>
-		<link title="Audio effects">$DOCS_URL/tutorials/audio/audio_effects.html</link>
 	</tutorials>
 	<members>
 		<member name="pan_pullout" type="float" setter="set_pan_pullout" getter="get_pan_pullout" default="1.0">
-			Gain of the side channels, if they exist. A value of 0 will downmix stereo to mono. Value can range from 0 to 4.
+			Amplifies the difference between stereo channels, increasing or decreasing existing panning. A value of 0.0 will downmix stereo to mono. Does not affect a mono signal.
 		</member>
 		<member name="surround" type="float" setter="set_surround" getter="get_surround" default="0.0">
-			Widens the stereo image through phase shifting in conjunction with [member time_pullout_ms]. Just pans sound to the left channel if [member time_pullout_ms] is 0. Value can range from 0 to 1.
+			Widens sound stage through phase shifting in conjunction with [member time_pullout_ms]. Just pans sound to the left channel if [member time_pullout_ms] is 0.
 		</member>
 		<member name="time_pullout_ms" type="float" setter="set_time_pullout" getter="get_time_pullout" default="0.0">
-			Widens the stereo image through phase shifting in conjunction with [member surround]. Just delays the right channel if [member surround] is 0. Value is in milliseconds, and can range from 0 to 50.
+			Widens sound stage through phase shifting in conjunction with [member surround]. Just delays the right channel if [member surround] is 0.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/AudioListener2D.xml b/engine/doc/classes/AudioListener2D.xml
index 48c06e03..85505438 100644
--- a/engine/doc/classes/AudioListener2D.xml
+++ b/engine/doc/classes/AudioListener2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioListener2D" inherits="Node2D" api_type="core" keywords="sound" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioListener2D" inherits="Node2D" keywords="sound" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Overrides the location sounds are heard from.
 	</brief_description>
diff --git a/engine/doc/classes/AudioListener3D.xml b/engine/doc/classes/AudioListener3D.xml
index 2b35ef28..b764b9aa 100644
--- a/engine/doc/classes/AudioListener3D.xml
+++ b/engine/doc/classes/AudioListener3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioListener3D" inherits="Node3D" api_type="core" keywords="sound" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioListener3D" inherits="Node3D" keywords="sound" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Overrides the location sounds are heard from.
 	</brief_description>
diff --git a/engine/doc/classes/AudioSample.xml b/engine/doc/classes/AudioSample.xml
index 17eea0f3..e3820c11 100644
--- a/engine/doc/classes/AudioSample.xml
+++ b/engine/doc/classes/AudioSample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioSample" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioSample" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for audio samples.
 	</brief_description>
diff --git a/engine/doc/classes/AudioSamplePlayback.xml b/engine/doc/classes/AudioSamplePlayback.xml
index c2139694..74a2d5e6 100644
--- a/engine/doc/classes/AudioSamplePlayback.xml
+++ b/engine/doc/classes/AudioSamplePlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioSamplePlayback" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioSamplePlayback" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Meta class for playing back audio samples.
 	</brief_description>
diff --git a/engine/doc/classes/AudioServer.xml b/engine/doc/classes/AudioServer.xml
index 13839fc8..16437fd7 100644
--- a/engine/doc/classes/AudioServer.xml
+++ b/engine/doc/classes/AudioServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Server interface for low-level audio access.
 	</brief_description>
@@ -186,13 +186,13 @@
 		<method name="get_time_since_last_mix" qualifiers="const">
 			<return type="float" />
 			<description>
-				Returns the relative time since the last mix occurred, in seconds.
+				Returns the relative time since the last mix occurred.
 			</description>
 		</method>
 		<method name="get_time_to_next_mix" qualifiers="const">
 			<return type="float" />
 			<description>
-				Returns the relative time until the next mix occurs, in seconds.
+				Returns the relative time until the next mix occurs.
 			</description>
 		</method>
 		<method name="is_bus_bypassing_effects" qualifiers="const">
diff --git a/engine/doc/classes/AudioStream.xml b/engine/doc/classes/AudioStream.xml
index 8d0da01a..9a4c2b2a 100644
--- a/engine/doc/classes/AudioStream.xml
+++ b/engine/doc/classes/AudioStream.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStream" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStream" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for audio streams.
 	</brief_description>
 	<description>
-		Base class for audio streams. Audio streams are used for sound effects and music playback, and support WAV (via [AudioStreamWAV]), Ogg (via [AudioStreamOggVorbis]), and MP3 (via [AudioStreamMP3]) file formats.
+		Base class for audio streams. Audio streams are used for sound effects and music playback, and support WAV (via [AudioStreamWAV]) and Ogg (via [AudioStreamOggVorbis]) file formats.
 	</description>
 	<tutorials>
 		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
diff --git a/engine/doc/classes/AudioStreamGenerator.xml b/engine/doc/classes/AudioStreamGenerator.xml
index edc8a239..13d0ff4b 100644
--- a/engine/doc/classes/AudioStreamGenerator.xml
+++ b/engine/doc/classes/AudioStreamGenerator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamGenerator" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamGenerator" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An audio stream with utilities for procedural sound generation.
 	</brief_description>
@@ -63,7 +63,6 @@
 		[b]Note:[/b] Due to performance constraints, this class is best used from C# or from a compiled language via GDExtension. If you still want to use this class from GDScript, consider using a lower [member mix_rate] such as 11,025 Hz or 22,050 Hz.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 		<link title="Audio Generator Demo">https://godotengine.org/asset-library/asset/2759</link>
 	</tutorials>
 	<members>
diff --git a/engine/doc/classes/AudioStreamGeneratorPlayback.xml b/engine/doc/classes/AudioStreamGeneratorPlayback.xml
index 037912fc..2f86eaf9 100644
--- a/engine/doc/classes/AudioStreamGeneratorPlayback.xml
+++ b/engine/doc/classes/AudioStreamGeneratorPlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamGeneratorPlayback" inherits="AudioStreamPlaybackResampled" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamGeneratorPlayback" inherits="AudioStreamPlaybackResampled" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plays back audio generated using [AudioStreamGenerator].
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamMicrophone.xml b/engine/doc/classes/AudioStreamMicrophone.xml
index 9a616f4f..2225ad2d 100644
--- a/engine/doc/classes/AudioStreamMicrophone.xml
+++ b/engine/doc/classes/AudioStreamMicrophone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamMicrophone" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamMicrophone" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plays real-time audio input data.
 	</brief_description>
@@ -8,7 +8,6 @@
 		[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 		<link title="Recording with microphone">$DOCS_URL/tutorials/audio/recording_with_microphone.html</link>
 		<link title="Audio Mic Record Demo">https://github.com/godotengine/godot-demo-projects/tree/master/audio/mic_record</link>
 	</tutorials>
diff --git a/engine/doc/classes/AudioStreamPlayback.xml b/engine/doc/classes/AudioStreamPlayback.xml
index fd298e27..24fdaa3b 100644
--- a/engine/doc/classes/AudioStreamPlayback.xml
+++ b/engine/doc/classes/AudioStreamPlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlayback" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlayback" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Meta class for playing back audio.
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamPlaybackPolyphonic.xml b/engine/doc/classes/AudioStreamPlaybackPolyphonic.xml
index cee2bdc3..894c9b22 100644
--- a/engine/doc/classes/AudioStreamPlaybackPolyphonic.xml
+++ b/engine/doc/classes/AudioStreamPlaybackPolyphonic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackPolyphonic" inherits="AudioStreamPlayback" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlaybackPolyphonic" inherits="AudioStreamPlayback" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Playback instance for [AudioStreamPolyphonic].
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamPlaybackResampled.xml b/engine/doc/classes/AudioStreamPlaybackResampled.xml
index bc3636a0..61715c03 100644
--- a/engine/doc/classes/AudioStreamPlaybackResampled.xml
+++ b/engine/doc/classes/AudioStreamPlaybackResampled.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackResampled" inherits="AudioStreamPlayback" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlaybackResampled" inherits="AudioStreamPlayback" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Playback class used for resampled [AudioStream]s.
 	</brief_description>
 	<description>
-		Playback class used to mix an [AudioStream]'s audio samples to [method AudioServer.get_mix_rate] using cubic interpolation.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -12,7 +10,6 @@
 		<method name="_get_stream_sampling_rate" qualifiers="virtual required const">
 			<return type="float" />
 			<description>
-				Returns an [AudioStream]'s sample rate, in Hz. Used to perform resampling.
 			</description>
 		</method>
 		<method name="_mix_resampled" qualifiers="virtual required">
@@ -20,13 +17,11 @@
 			<param index="0" name="dst_buffer" type="AudioFrame*" />
 			<param index="1" name="frame_count" type="int" />
 			<description>
-				Called by [method begin_resample] to mix an [AudioStream] to [method AudioServer.get_mix_rate]. Uses [method _get_stream_sampling_rate] as the source sample rate. Returns the number of mixed frames.
 			</description>
 		</method>
 		<method name="begin_resample">
 			<return type="void" />
 			<description>
-				Called when an [AudioStream] is played. Clears the cubic interpolation history and starts mixing by calling [method _mix_resampled].
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/AudioStreamPlayer.xml b/engine/doc/classes/AudioStreamPlayer.xml
index 3964b6b0..dae089ea 100644
--- a/engine/doc/classes/AudioStreamPlayer.xml
+++ b/engine/doc/classes/AudioStreamPlayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlayer" inherits="Node" api_type="core" keywords="sound, music, song" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlayer" inherits="Node" keywords="sound, music, song" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for audio playback.
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamPlayer2D.xml b/engine/doc/classes/AudioStreamPlayer2D.xml
index 76e8ee02..a87be223 100644
--- a/engine/doc/classes/AudioStreamPlayer2D.xml
+++ b/engine/doc/classes/AudioStreamPlayer2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlayer2D" inherits="Node2D" api_type="core" keywords="sound, sfx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlayer2D" inherits="Node2D" keywords="sound, sfx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plays positional sound in 2D space.
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamPlayer3D.xml b/engine/doc/classes/AudioStreamPlayer3D.xml
index 408c5510..51e5f6c5 100644
--- a/engine/doc/classes/AudioStreamPlayer3D.xml
+++ b/engine/doc/classes/AudioStreamPlayer3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlayer3D" inherits="Node3D" api_type="core" keywords="sound, sfx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPlayer3D" inherits="Node3D" keywords="sound, sfx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plays positional sound in 3D space.
 	</brief_description>
diff --git a/engine/doc/classes/AudioStreamPolyphonic.xml b/engine/doc/classes/AudioStreamPolyphonic.xml
index 3f0a2e7c..49c6aeba 100644
--- a/engine/doc/classes/AudioStreamPolyphonic.xml
+++ b/engine/doc/classes/AudioStreamPolyphonic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPolyphonic" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamPolyphonic" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		AudioStream that lets the user play custom streams at any time from code, simultaneously using a single player.
 	</brief_description>
@@ -8,7 +8,6 @@
 		Playback control is done via the [AudioStreamPlaybackPolyphonic] instance set inside the player, which can be obtained via [method AudioStreamPlayer.get_stream_playback], [method AudioStreamPlayer2D.get_stream_playback] or [method AudioStreamPlayer3D.get_stream_playback] methods. Obtaining the playback instance is only valid after the [code]stream[/code] property is set as an [AudioStreamPolyphonic] in those players.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 	</tutorials>
 	<members>
 		<member name="polyphony" type="int" setter="set_polyphony" getter="get_polyphony" default="32">
diff --git a/engine/doc/classes/AudioStreamRandomizer.xml b/engine/doc/classes/AudioStreamRandomizer.xml
index 5484ab0d..91b6c4df 100644
--- a/engine/doc/classes/AudioStreamRandomizer.xml
+++ b/engine/doc/classes/AudioStreamRandomizer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamRandomizer" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamRandomizer" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Wraps a pool of audio streams with pitch and volume shifting.
 	</brief_description>
@@ -7,7 +7,6 @@
 		Picks a random AudioStream from the pool, depending on the playback mode, and applies random pitch shifting and volume shifting during playback.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_stream">
@@ -80,14 +79,6 @@
 		<member name="random_volume_offset_db" type="float" setter="set_random_volume_offset_db" getter="get_random_volume_offset_db" default="0.0">
 			The intensity of random volume variation. Volume will be increased or decreased by a random value up to [code skip-lint]random_volume_offset_db[/code]. A value of [code]0.0[/code] means no variation. A value of [code]3.0[/code] means volume will be randomized between [code]-3.0 dB[/code] and [code]+3.0 dB[/code].
 		</member>
-		<member name="stream_{index}/stream" type="AudioStream" setter="" getter="">
-			The [AudioStream] at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. streams_count - 1[/code] range.
-		</member>
-		<member name="stream_{index}/weight" type="float" setter="" getter="" default="1.0">
-			The probability weight of the [AudioStream] at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. streams_count - 1[/code] range.
-		</member>
 		<member name="streams_count" type="int" setter="set_streams_count" getter="get_streams_count" default="0">
 			The number of streams in the stream pool.
 		</member>
diff --git a/engine/doc/classes/AudioStreamWAV.xml b/engine/doc/classes/AudioStreamWAV.xml
index 7742dfc3..e3685ce9 100644
--- a/engine/doc/classes/AudioStreamWAV.xml
+++ b/engine/doc/classes/AudioStreamWAV.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamWAV" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="AudioStreamWAV" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Stores audio data loaded from WAV files.
 	</brief_description>
@@ -8,7 +8,6 @@
 		This class can also be used to store dynamically-generated PCM audio data. See also [AudioStreamGenerator] for procedural audio generation.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 		<link title="Runtime file loading and saving">$DOCS_URL/tutorials/io/runtime_file_loading_and_saving.html</link>
 	</tutorials>
 	<methods>
diff --git a/engine/doc/classes/AwaitTweener.xml b/engine/doc/classes/AwaitTweener.xml
deleted file mode 100644
index 19e2c55e..00000000
--- a/engine/doc/classes/AwaitTweener.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="AwaitTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		Awaits a specified signal.
-	</brief_description>
-	<description>
-		[AwaitTweener] is used to await a specified signal, allowing asynchronous steps in [Tween] animation. See [method Tween.tween_await] for more usage information.
-		The [signal Tweener.finished] signal is emitted when either the awaited signal is received, when timeout is reached, or when the target object is freed.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="set_timeout">
-			<return type="AwaitTweener" />
-			<param index="0" name="timeout" type="float" />
-			<description>
-				Sets the maximum time an [AwaitTweener] can wait for the signal. Can be used as a safeguard for signals that may never be emitted. If not specified, the tweener will wait indefinitely.
-			</description>
-		</method>
-	</methods>
-</class>
diff --git a/engine/doc/classes/BackBufferCopy.xml b/engine/doc/classes/BackBufferCopy.xml
index e78f89c8..991569f7 100644
--- a/engine/doc/classes/BackBufferCopy.xml
+++ b/engine/doc/classes/BackBufferCopy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BackBufferCopy" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BackBufferCopy" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that copies a region of the screen to a buffer for access in shader code.
 	</brief_description>
diff --git a/engine/doc/classes/BaseButton.xml b/engine/doc/classes/BaseButton.xml
index b274c34d..2554528b 100644
--- a/engine/doc/classes/BaseButton.xml
+++ b/engine/doc/classes/BaseButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BaseButton" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BaseButton" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for GUI buttons.
 	</brief_description>
@@ -75,7 +75,7 @@
 			If [code]true[/code], the button will highlight for a short amount of time when its shortcut is activated. If [code]false[/code] and [member toggle_mode] is [code]false[/code], the shortcut will activate without any visual feedback.
 		</member>
 		<member name="shortcut_in_tooltip" type="bool" setter="set_shortcut_in_tooltip" getter="is_shortcut_in_tooltip_enabled" default="true">
-			If [code]true[/code], the button will add information about its shortcut in the tooltip. This includes the shortcut's events and its [member Resource.resource_name]. If both events and name are empty, the shortcut will not be included.
+			If [code]true[/code], the button will add information about its shortcut in the tooltip.
 			[b]Note:[/b] This property does nothing when the tooltip control is customized using [method Control._make_custom_tooltip].
 		</member>
 		<member name="toggle_mode" type="bool" setter="set_toggle_mode" getter="is_toggle_mode" default="false">
diff --git a/engine/doc/classes/BaseMaterial3D.xml b/engine/doc/classes/BaseMaterial3D.xml
index c255382f..20cea106 100644
--- a/engine/doc/classes/BaseMaterial3D.xml
+++ b/engine/doc/classes/BaseMaterial3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BaseMaterial3D" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BaseMaterial3D" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for defining the 3D rendering properties of meshes.
 	</brief_description>
diff --git a/engine/doc/classes/Basis.xml b/engine/doc/classes/Basis.xml
index 38a736c2..55aa6ffc 100644
--- a/engine/doc/classes/Basis.xml
+++ b/engine/doc/classes/Basis.xml
@@ -15,7 +15,6 @@
 		For a general introduction, see the [url=$DOCS_URL/tutorials/math/matrices_and_transforms.html]Matrices and transforms[/url] tutorial.
 		[b]Note:[/b] Godot uses a [url=https://en.wikipedia.org/wiki/Right-hand_rule]right-handed coordinate system[/url], which is a common standard. For directions, the convention for built-in types like [Camera3D] is for -Z to point forward (+X is right, +Y is up, and +Z is back). Other objects may use different direction conventions. For more information, see the [url=$DOCS_URL/tutorials/assets_pipeline/importing_3d_scenes/model_export_considerations.html#d-asset-direction-conventions]3D asset direction conventions[/url] tutorial.
 		[b]Note:[/b] The basis matrices are exposed as [url=https://www.mindcontrol.org/~hplus/graphics/matrix-layout.html]column-major[/url] order, which is the same as OpenGL. However, they are stored internally in row-major order, which is the same as DirectX.
-		[b]Note:[/b] In a boolean context, a basis will evaluate to [code]false[/code] if it's equal to [constant IDENTITY]. Otherwise, a basis will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Math documentation index">$DOCS_URL/tutorials/math/index.html</link>
@@ -207,12 +206,6 @@
 				Returns [code]true[/code] if this basis is finite, by calling [method @GlobalScope.is_finite] on all vector components.
 			</description>
 		</method>
-		<method name="is_orthonormal" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if this basis is orthonormal. An orthonormal basis is both [i]orthogonal[/i] (the axes are perpendicular to each other) and [i]normalized[/i] (the length of every axis is [code]1.0[/code]). This method can be especially useful during physics calculations.
-			</description>
-		</method>
 		<method name="looking_at" qualifiers="static">
 			<return type="Basis" />
 			<param index="0" name="target" type="Vector3" />
diff --git a/engine/doc/classes/BitMap.xml b/engine/doc/classes/BitMap.xml
index 9dd7428e..39e59154 100644
--- a/engine/doc/classes/BitMap.xml
+++ b/engine/doc/classes/BitMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BitMap" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BitMap" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Boolean matrix.
 	</brief_description>
diff --git a/engine/doc/classes/BlitMaterial.xml b/engine/doc/classes/BlitMaterial.xml
deleted file mode 100644
index 95347b26..00000000
--- a/engine/doc/classes/BlitMaterial.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="BlitMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		A material that processes blit calls to a DrawableTexture.
-	</brief_description>
-	<description>
-		A material resource that can be used by DrawableTextures when processing blit calls to draw.
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="blend_mode" type="int" setter="set_blend_mode" getter="get_blend_mode" enum="BlitMaterial.BlendMode" default="0">
-			The manner in which the newly blitted texture is blended with the original DrawableTexture.
-		</member>
-	</members>
-	<constants>
-		<constant name="BLEND_MODE_MIX" value="0" enum="BlendMode">
-			Mix blending mode. Colors are assumed to be independent of the alpha (opacity) value.
-		</constant>
-		<constant name="BLEND_MODE_ADD" value="1" enum="BlendMode">
-			Additive blending mode.
-		</constant>
-		<constant name="BLEND_MODE_SUB" value="2" enum="BlendMode">
-			Subtractive blending mode.
-		</constant>
-		<constant name="BLEND_MODE_MUL" value="3" enum="BlendMode">
-			Multiplicative blending mode.
-		</constant>
-		<constant name="BLEND_MODE_DISABLED" value="4" enum="BlendMode">
-			No blending mode, direct color copy.
-		</constant>
-	</constants>
-</class>
diff --git a/engine/doc/classes/Bone2D.xml b/engine/doc/classes/Bone2D.xml
index 3eb4fe1b..da7f08e5 100644
--- a/engine/doc/classes/Bone2D.xml
+++ b/engine/doc/classes/Bone2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Bone2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Bone2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A joint used with [Skeleton2D] to control and animate other nodes.
 	</brief_description>
diff --git a/engine/doc/classes/BoneAttachment3D.xml b/engine/doc/classes/BoneAttachment3D.xml
index 97d1a902..7cda0b2e 100644
--- a/engine/doc/classes/BoneAttachment3D.xml
+++ b/engine/doc/classes/BoneAttachment3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoneAttachment3D" inherits="Node3D" api_type="core" keywords="tag" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoneAttachment3D" inherits="Node3D" keywords="tag" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		А node that dynamically copies or overrides the 3D transform of a bone in its parent [Skeleton3D].
 	</brief_description>
diff --git a/engine/doc/classes/BoneConstraint3D.xml b/engine/doc/classes/BoneConstraint3D.xml
index 0d4a7701..3dba9e0e 100644
--- a/engine/doc/classes/BoneConstraint3D.xml
+++ b/engine/doc/classes/BoneConstraint3D.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoneConstraint3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoneConstraint3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that may modify Skeleton3D's bone with associating the two bones.
 	</brief_description>
 	<description>
 		Base class of [SkeletonModifier3D] that modifies the bone set in [method set_apply_bone] based on the transform of the bone retrieved by [method get_reference_bone].
-		[b]Note:[/b] Most methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/amount[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/BoneMap.xml b/engine/doc/classes/BoneMap.xml
index de8ea5b2..447d3406 100644
--- a/engine/doc/classes/BoneMap.xml
+++ b/engine/doc/classes/BoneMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoneMap" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoneMap" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Describes a mapping of bone names for retargeting [Skeleton3D] into common names defined by a [SkeletonProfile].
 	</brief_description>
diff --git a/engine/doc/classes/BoneTwistDisperser3D.xml b/engine/doc/classes/BoneTwistDisperser3D.xml
index 77b08b7d..15319c06 100644
--- a/engine/doc/classes/BoneTwistDisperser3D.xml
+++ b/engine/doc/classes/BoneTwistDisperser3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoneTwistDisperser3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoneTwistDisperser3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that propagates and disperses the child bone's twist to the parent bones.
 	</brief_description>
@@ -7,7 +7,6 @@
 		This [BoneTwistDisperser3D] allows for smooth twist interpolation between multiple bones by dispersing the end bone's twist to the parents. This only changes the twist without changing the global position of each joint.
 		This is useful for smoothly twisting bones in combination with [CopyTransformModifier3D] and IK.
 		[b]Note:[/b] If an extracted twist is greater than 180 degrees, flipping occurs. This is similar to [ConvertTransformModifier3D].
-		[b]Note:[/b] Most methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/BoxContainer.xml b/engine/doc/classes/BoxContainer.xml
index a219abf2..926bd8f0 100644
--- a/engine/doc/classes/BoxContainer.xml
+++ b/engine/doc/classes/BoxContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoxContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoxContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls horizontally or vertically.
 	</brief_description>
diff --git a/engine/doc/classes/BoxMesh.xml b/engine/doc/classes/BoxMesh.xml
index 7a005329..7df874cc 100644
--- a/engine/doc/classes/BoxMesh.xml
+++ b/engine/doc/classes/BoxMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoxMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoxMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Generate an axis-aligned box [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/BoxOccluder3D.xml b/engine/doc/classes/BoxOccluder3D.xml
index cea27233..ac9770fd 100644
--- a/engine/doc/classes/BoxOccluder3D.xml
+++ b/engine/doc/classes/BoxOccluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoxOccluder3D" inherits="Occluder3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoxOccluder3D" inherits="Occluder3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Cuboid shape for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/BoxShape3D.xml b/engine/doc/classes/BoxShape3D.xml
index 8430c279..ead5afd8 100644
--- a/engine/doc/classes/BoxShape3D.xml
+++ b/engine/doc/classes/BoxShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="BoxShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="BoxShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D box shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/Button.xml b/engine/doc/classes/Button.xml
index 54528077..7fe23672 100644
--- a/engine/doc/classes/Button.xml
+++ b/engine/doc/classes/Button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Button" inherits="BaseButton" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Button" inherits="BaseButton" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A themed button that can contain text and an icon.
 	</brief_description>
diff --git a/engine/doc/classes/ButtonGroup.xml b/engine/doc/classes/ButtonGroup.xml
index 1ff8af88..c5d30607 100644
--- a/engine/doc/classes/ButtonGroup.xml
+++ b/engine/doc/classes/ButtonGroup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ButtonGroup" inherits="Resource" api_type="core" keywords="radio" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ButtonGroup" inherits="Resource" keywords="radio" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A group of buttons that doesn't allow more than one button to be pressed at a time.
 	</brief_description>
diff --git a/engine/doc/classes/CCDIK3D.xml b/engine/doc/classes/CCDIK3D.xml
index 988b4d58..5db4ef2e 100644
--- a/engine/doc/classes/CCDIK3D.xml
+++ b/engine/doc/classes/CCDIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CCDIK3D" inherits="IterateIK3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CCDIK3D" inherits="IterateIK3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Rotation based cyclic coordinate descent inverse kinematics solver.
 	</brief_description>
diff --git a/engine/doc/classes/CPUParticles2D.xml b/engine/doc/classes/CPUParticles2D.xml
index c45b9e1b..dcf533d8 100644
--- a/engine/doc/classes/CPUParticles2D.xml
+++ b/engine/doc/classes/CPUParticles2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CPUParticles2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CPUParticles2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A CPU-based 2D particle emitter.
 	</brief_description>
@@ -49,10 +49,9 @@
 		<method name="request_particles_process">
 			<return type="void" />
 			<param index="0" name="process_time" type="float" />
-			<param index="1" name="process_time_residual" type="float" default="0.0" />
 			<description>
 				Requests the particles to process for extra process time during a single frame.
-				[param process_time] defines the time that the particles will process while emitting is on. [param process_time_residual] defines the time that particles will process with emitting turned off for the simulation. When combined with [member speed_scale] set to [code]0.0[/code], this is useful to be able to seek a particle system timeline.
+				Useful for particle playback, if used in combination with [member use_fixed_seed] or by calling [method restart] with parameter [code]keep_seed[/code] set to [code]true[/code].
 			</description>
 		</method>
 		<method name="restart">
diff --git a/engine/doc/classes/CPUParticles3D.xml b/engine/doc/classes/CPUParticles3D.xml
index 91f40452..61b4911d 100644
--- a/engine/doc/classes/CPUParticles3D.xml
+++ b/engine/doc/classes/CPUParticles3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CPUParticles3D" inherits="GeometryInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CPUParticles3D" inherits="GeometryInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A CPU-based 3D particle emitter.
 	</brief_description>
@@ -55,10 +55,9 @@
 		<method name="request_particles_process">
 			<return type="void" />
 			<param index="0" name="process_time" type="float" />
-			<param index="1" name="process_time_residual" type="float" default="0.0" />
 			<description>
 				Requests the particles to process for extra process time during a single frame.
-				[param process_time] defines the time that the particles will process while emitting is on. [param process_time_residual] defines the time that particles will process with emitting turned off for the simulation. When combined with [member speed_scale] set to [code]0.0[/code], this is useful to be able to seek a particle system timeline.
+				Useful for particle playback, if used in combination with [member use_fixed_seed] or by calling [method restart] with parameter [code]keep_seed[/code] set to [code]true[/code].
 			</description>
 		</method>
 		<method name="restart">
diff --git a/engine/doc/classes/Callable.xml b/engine/doc/classes/Callable.xml
index 7356d9f2..f52a403d 100644
--- a/engine/doc/classes/Callable.xml
+++ b/engine/doc/classes/Callable.xml
@@ -61,7 +61,6 @@
 		# This will work.
 		tween.tween_callback(Callable.create(dictionary, "clear"))
 		[/codeblock]
-		[b]Note:[/b] In a boolean context, a callable will evaluate to [code]false[/code] if it's null (see [method is_null]). Otherwise, a callable will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/CallbackTweener.xml b/engine/doc/classes/CallbackTweener.xml
index aa3b6ee4..3a617d2a 100644
--- a/engine/doc/classes/CallbackTweener.xml
+++ b/engine/doc/classes/CallbackTweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CallbackTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CallbackTweener" inherits="Tweener" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calls the specified method after optional delay.
 	</brief_description>
diff --git a/engine/doc/classes/Camera2D.xml b/engine/doc/classes/Camera2D.xml
index f1a72cf3..fa26ab1f 100644
--- a/engine/doc/classes/Camera2D.xml
+++ b/engine/doc/classes/Camera2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Camera2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Camera2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Camera node for 2D scenes.
 	</brief_description>
diff --git a/engine/doc/classes/Camera3D.xml b/engine/doc/classes/Camera3D.xml
index 58aa5d3f..d7ef4320 100644
--- a/engine/doc/classes/Camera3D.xml
+++ b/engine/doc/classes/Camera3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Camera3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Camera3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Camera node, displays from a point of view.
 	</brief_description>
@@ -119,7 +119,7 @@
 			<param index="2" name="z_near" type="float" />
 			<param index="3" name="z_far" type="float" />
 			<description>
-				Sets the camera projection to frustum mode (see [constant PROJECTION_FRUSTUM]), by specifying a [param size], an [param offset], and the [param z_near] and [param z_far] clip planes in world space units. The [param size] parameter represents the size of the near plane, either its width or height depending on the value of [member keep_aspect]. See also [member frustum_offset].
+				Sets the camera projection to frustum mode (see [constant PROJECTION_FRUSTUM]), by specifying a [param size], an [param offset], and the [param z_near] and [param z_far] clip planes in world space units. See also [member frustum_offset].
 			</description>
 		</method>
 		<method name="set_orthogonal">
diff --git a/engine/doc/classes/CameraAttributes.xml b/engine/doc/classes/CameraAttributes.xml
index 917345f1..cb5a7778 100644
--- a/engine/doc/classes/CameraAttributes.xml
+++ b/engine/doc/classes/CameraAttributes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraAttributes" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraAttributes" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Parent class for camera settings.
 	</brief_description>
@@ -14,7 +14,6 @@
 	<members>
 		<member name="auto_exposure_enabled" type="bool" setter="set_auto_exposure_enabled" getter="is_auto_exposure_enabled" default="false">
 			If [code]true[/code], enables the tonemapping auto exposure mode of the scene renderer. If [code]true[/code], the renderer will automatically determine the exposure setting to adapt to the scene's illumination and the observed light.
-			[b]Note:[/b] Auto-exposure is only supported in the Forward+ rendering method, not Mobile or Compatibility.
 		</member>
 		<member name="auto_exposure_scale" type="float" setter="set_auto_exposure_scale" getter="get_auto_exposure_scale" default="0.4">
 			The scale of the auto exposure effect. Affects the intensity of auto exposure.
diff --git a/engine/doc/classes/CameraAttributesPhysical.xml b/engine/doc/classes/CameraAttributesPhysical.xml
index c6e49e25..e2036162 100644
--- a/engine/doc/classes/CameraAttributesPhysical.xml
+++ b/engine/doc/classes/CameraAttributesPhysical.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraAttributesPhysical" inherits="CameraAttributes" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraAttributesPhysical" inherits="CameraAttributes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Physically-based camera settings.
 	</brief_description>
@@ -8,7 +8,6 @@
 		When used in a [WorldEnvironment] it provides default settings for exposure, auto-exposure, and depth of field that will be used by all cameras without their own [CameraAttributes], including the editor camera. When used in a [Camera3D] it will override any [CameraAttributes] set in the [WorldEnvironment] and will override the [Camera3D]s [member Camera3D.far], [member Camera3D.near], [member Camera3D.fov], and [member Camera3D.keep_aspect] properties. When used in [VoxelGI] or [LightmapGI], only the exposure settings will be used.
 		The default settings are intended for use in an outdoor environment, tips for settings for use in an indoor environment can be found in each setting's documentation.
 		[b]Note:[/b] Depth of field blur is only supported in the Forward+ and Mobile rendering methods, not Compatibility.
-		[b]Note:[/b] Auto-exposure is only supported in the Forward+ rendering method, not Mobile or Compatibility.
 	</description>
 	<tutorials>
 		<link title="Physical light and camera units">$DOCS_URL/tutorials/3d/physical_light_and_camera_units.html</link>
diff --git a/engine/doc/classes/CameraAttributesPractical.xml b/engine/doc/classes/CameraAttributesPractical.xml
index d352950b..ecf755f6 100644
--- a/engine/doc/classes/CameraAttributesPractical.xml
+++ b/engine/doc/classes/CameraAttributesPractical.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraAttributesPractical" inherits="CameraAttributes" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraAttributesPractical" inherits="CameraAttributes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Camera settings in an easy to use format.
 	</brief_description>
 	<description>
 		Controls camera-specific attributes such as auto-exposure, depth of field, and exposure override.
 		When used in a [WorldEnvironment] it provides default settings for exposure, auto-exposure, and depth of field that will be used by all cameras without their own [CameraAttributes], including the editor camera. When used in a [Camera3D] it will override any [CameraAttributes] set in the [WorldEnvironment]. When used in [VoxelGI] or [LightmapGI], only the exposure settings will be used.
-		[b]Note:[/b] Depth of field blur is only supported in the Forward+ and Mobile rendering methods, not Compatibility.
-		[b]Note:[/b] Auto-exposure is only supported in the Forward+ rendering method, not Mobile or Compatibility.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/CameraFeed.xml b/engine/doc/classes/CameraFeed.xml
index 72b7635e..7623ae3e 100644
--- a/engine/doc/classes/CameraFeed.xml
+++ b/engine/doc/classes/CameraFeed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraFeed" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraFeed" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A camera feed gives you access to a single physical camera attached to your device.
 	</brief_description>
@@ -23,20 +23,6 @@
 				Called when the camera feed is deactivated.
 			</description>
 		</method>
-		<method name="_get_formats" qualifiers="virtual const">
-			<return type="Array" />
-			<description>
-				Override this method to define supported formats of the camera feed.
-			</description>
-		</method>
-		<method name="_set_format" qualifiers="virtual">
-			<return type="bool" />
-			<param index="0" name="index" type="int" />
-			<param index="1" name="parameters" type="Dictionary" />
-			<description>
-				Override this method to set the format of the camera feed.
-			</description>
-		</method>
 		<method name="get_datatype" qualifiers="const">
 			<return type="int" enum="CameraFeed.FeedDataType" />
 			<description>
diff --git a/engine/doc/classes/CameraServer.xml b/engine/doc/classes/CameraServer.xml
index c454b8a6..3b16768a 100644
--- a/engine/doc/classes/CameraServer.xml
+++ b/engine/doc/classes/CameraServer.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Server keeping track of different cameras accessible in Godot.
 	</brief_description>
 	<description>
 		The [CameraServer] keeps track of different cameras accessible in Godot. These are external cameras such as webcams or the cameras on your phone.
 		It is notably used to provide AR modules with a video feed from the camera.
-		[b]Note:[/b] This class is currently only implemented on Linux, Android, macOS, and iOS. On other platforms no [CameraFeed]s will be available. To get a [CameraFeed] on iOS, enable [member EditorExportPlatformIOS.modules/camera].
+		[b]Note:[/b] This class is currently only implemented on Linux, Android, macOS, and iOS. On other platforms no [CameraFeed]s will be available. To get a [CameraFeed] on iOS, the camera plugin from [url=https://github.com/godotengine/godot-ios-plugins]godot-ios-plugins[/url] is required.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/CameraTexture.xml b/engine/doc/classes/CameraTexture.xml
index bcc61563..faaf9b55 100644
--- a/engine/doc/classes/CameraTexture.xml
+++ b/engine/doc/classes/CameraTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CameraTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CameraTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture provided by a [CameraFeed].
 	</brief_description>
diff --git a/engine/doc/classes/CanvasGroup.xml b/engine/doc/classes/CanvasGroup.xml
index 14bd1b07..14921a23 100644
--- a/engine/doc/classes/CanvasGroup.xml
+++ b/engine/doc/classes/CanvasGroup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasGroup" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasGroup" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Merges several 2D nodes into a single draw operation.
 	</brief_description>
diff --git a/engine/doc/classes/CanvasItem.xml b/engine/doc/classes/CanvasItem.xml
index 430cdbee..d5f2135a 100644
--- a/engine/doc/classes/CanvasItem.xml
+++ b/engine/doc/classes/CanvasItem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasItem" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasItem" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for everything in 2D space.
 	</brief_description>
@@ -789,7 +789,7 @@
 			Represents the size of the [enum TextureFilter] enum.
 		</constant>
 		<constant name="TEXTURE_REPEAT_PARENT_NODE" value="0" enum="TextureRepeat">
-			The [CanvasItem] will inherit the repeat mode from its parent.
+			The [CanvasItem] will inherit the filter from its parent.
 		</constant>
 		<constant name="TEXTURE_REPEAT_DISABLED" value="1" enum="TextureRepeat">
 			The texture does not repeat. Sampling the texture outside its extents will result in "stretching" of the edge pixels. You can avoid this by ensuring a 1-pixel fully transparent border on each side of the texture.
diff --git a/engine/doc/classes/CanvasItemMaterial.xml b/engine/doc/classes/CanvasItemMaterial.xml
index 258a536e..3ba122d7 100644
--- a/engine/doc/classes/CanvasItemMaterial.xml
+++ b/engine/doc/classes/CanvasItemMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasItemMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasItemMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material for [CanvasItem]s.
 	</brief_description>
diff --git a/engine/doc/classes/CanvasLayer.xml b/engine/doc/classes/CanvasLayer.xml
index 89650727..4b5cda0c 100644
--- a/engine/doc/classes/CanvasLayer.xml
+++ b/engine/doc/classes/CanvasLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasLayer" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasLayer" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used for independent rendering of objects within a 2D scene.
 	</brief_description>
diff --git a/engine/doc/classes/CanvasModulate.xml b/engine/doc/classes/CanvasModulate.xml
index dd45bb1e..43505498 100644
--- a/engine/doc/classes/CanvasModulate.xml
+++ b/engine/doc/classes/CanvasModulate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasModulate" inherits="Node2D" api_type="core" keywords="color" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasModulate" inherits="Node2D" keywords="color" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that applies a color tint to a canvas.
 	</brief_description>
diff --git a/engine/doc/classes/CanvasTexture.xml b/engine/doc/classes/CanvasTexture.xml
index e37de453..a14f71cc 100644
--- a/engine/doc/classes/CanvasTexture.xml
+++ b/engine/doc/classes/CanvasTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CanvasTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CanvasTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture with optional normal and specular maps for use in 2D rendering.
 	</brief_description>
diff --git a/engine/doc/classes/CapsuleMesh.xml b/engine/doc/classes/CapsuleMesh.xml
index 33d566b7..105261d7 100644
--- a/engine/doc/classes/CapsuleMesh.xml
+++ b/engine/doc/classes/CapsuleMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CapsuleMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CapsuleMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a capsule-shaped [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/CapsuleShape2D.xml b/engine/doc/classes/CapsuleShape2D.xml
index 932a7109..49f03c2c 100644
--- a/engine/doc/classes/CapsuleShape2D.xml
+++ b/engine/doc/classes/CapsuleShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CapsuleShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CapsuleShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D capsule shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/CapsuleShape3D.xml b/engine/doc/classes/CapsuleShape3D.xml
index 5cca1189..4930093d 100644
--- a/engine/doc/classes/CapsuleShape3D.xml
+++ b/engine/doc/classes/CapsuleShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CapsuleShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CapsuleShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D capsule shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/CenterContainer.xml b/engine/doc/classes/CenterContainer.xml
index e77ab569..cf4207b8 100644
--- a/engine/doc/classes/CenterContainer.xml
+++ b/engine/doc/classes/CenterContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CenterContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CenterContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that keeps child controls in its center.
 	</brief_description>
diff --git a/engine/doc/classes/ChainIK3D.xml b/engine/doc/classes/ChainIK3D.xml
index e4303081..a36886fd 100644
--- a/engine/doc/classes/ChainIK3D.xml
+++ b/engine/doc/classes/ChainIK3D.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ChainIK3D" inherits="IKModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ChainIK3D" inherits="IKModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] to apply inverse kinematics to bone chains containing an arbitrary number of bones.
 	</brief_description>
 	<description>
 		Base class of [SkeletonModifier3D] that automatically generates a joint list from the bones between the root bone and the end bone.
-		[b]Note:[/b] All the methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/CharFXTransform.xml b/engine/doc/classes/CharFXTransform.xml
index 12c4cf55..d8700b3c 100644
--- a/engine/doc/classes/CharFXTransform.xml
+++ b/engine/doc/classes/CharFXTransform.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharFXTransform" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CharFXTransform" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Controls how an individual character will be displayed in a [RichTextEffect].
 	</brief_description>
diff --git a/engine/doc/classes/CharacterBody2D.xml b/engine/doc/classes/CharacterBody2D.xml
index c30efbf4..42088022 100644
--- a/engine/doc/classes/CharacterBody2D.xml
+++ b/engine/doc/classes/CharacterBody2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterBody2D" inherits="PhysicsBody2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CharacterBody2D" inherits="PhysicsBody2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D physics body specialized for characters moved by script.
 	</brief_description>
diff --git a/engine/doc/classes/CharacterBody3D.xml b/engine/doc/classes/CharacterBody3D.xml
index 35c87703..3dec9ab2 100644
--- a/engine/doc/classes/CharacterBody3D.xml
+++ b/engine/doc/classes/CharacterBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterBody3D" inherits="PhysicsBody3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CharacterBody3D" inherits="PhysicsBody3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body specialized for characters moved by script.
 	</brief_description>
diff --git a/engine/doc/classes/CheckBox.xml b/engine/doc/classes/CheckBox.xml
index d1665f56..4dd3724a 100644
--- a/engine/doc/classes/CheckBox.xml
+++ b/engine/doc/classes/CheckBox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CheckBox" inherits="Button" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CheckBox" inherits="Button" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that represents a binary choice.
 	</brief_description>
diff --git a/engine/doc/classes/CheckButton.xml b/engine/doc/classes/CheckButton.xml
index 667e8de0..a5615678 100644
--- a/engine/doc/classes/CheckButton.xml
+++ b/engine/doc/classes/CheckButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CheckButton" inherits="Button" api_type="core" keywords="switch, toggle" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CheckButton" inherits="Button" keywords="switch, toggle" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that represents a binary choice.
 	</brief_description>
diff --git a/engine/doc/classes/CircleShape2D.xml b/engine/doc/classes/CircleShape2D.xml
index 4bd53c76..3d0864b0 100644
--- a/engine/doc/classes/CircleShape2D.xml
+++ b/engine/doc/classes/CircleShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CircleShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CircleShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D circle shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/ClassDB.xml b/engine/doc/classes/ClassDB.xml
index aa0f776f..f8ec7086 100644
--- a/engine/doc/classes/ClassDB.xml
+++ b/engine/doc/classes/ClassDB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ClassDB" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ClassDB" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class information repository.
 	</brief_description>
diff --git a/engine/doc/classes/CodeEdit.xml b/engine/doc/classes/CodeEdit.xml
index ee2bf180..7074ba9e 100644
--- a/engine/doc/classes/CodeEdit.xml
+++ b/engine/doc/classes/CodeEdit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CodeEdit" inherits="TextEdit" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CodeEdit" inherits="TextEdit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A multiline text editor designed for editing code.
 	</brief_description>
@@ -391,13 +391,6 @@
 				Returns [code]true[/code] if the given line is folded. See [method fold_line].
 			</description>
 		</method>
-		<method name="join_lines">
-			<return type="void" />
-			<param index="0" name="line_ending" type="String" default="&quot; &quot;" />
-			<description>
-				Joins all selected lines or lines containing a caret with their next line. Whitespace in between will be removed. If the next line has content, the [param line_ending] will be inserted in between.
-			</description>
-		</method>
 		<method name="move_lines_down">
 			<return type="void" />
 			<description>
diff --git a/engine/doc/classes/CodeHighlighter.xml b/engine/doc/classes/CodeHighlighter.xml
index 7170fbb3..ca2caf6b 100644
--- a/engine/doc/classes/CodeHighlighter.xml
+++ b/engine/doc/classes/CodeHighlighter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CodeHighlighter" inherits="SyntaxHighlighter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CodeHighlighter" inherits="SyntaxHighlighter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A syntax highlighter intended for code.
 	</brief_description>
diff --git a/engine/doc/classes/CollisionObject2D.xml b/engine/doc/classes/CollisionObject2D.xml
index ff634d96..9daac969 100644
--- a/engine/doc/classes/CollisionObject2D.xml
+++ b/engine/doc/classes/CollisionObject2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionObject2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionObject2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 2D physics objects.
 	</brief_description>
@@ -73,13 +73,6 @@
 				Returns the object's [RID].
 			</description>
 		</method>
-		<method name="get_shape_owner_one_way_collision_direction" qualifiers="const">
-			<return type="Vector2" />
-			<param index="0" name="owner_id" type="int" />
-			<description>
-				Returns the [code]one_way_collision_direction[/code] of the shape owner identified by the given [param owner_id].
-			</description>
-		</method>
 		<method name="get_shape_owner_one_way_collision_margin" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="owner_id" type="int" />
@@ -213,14 +206,6 @@
 				If [param enable] is [code]true[/code], collisions for the shape owner originating from this [CollisionObject2D] will not be reported to collided with [CollisionObject2D]s.
 			</description>
 		</method>
-		<method name="shape_owner_set_one_way_collision_direction">
-			<return type="void" />
-			<param index="0" name="owner_id" type="int" />
-			<param index="1" name="p_direction" type="Vector2" />
-			<description>
-				Sets the [code]one_way_collision_direction[/code] of the shape owner identified by the given [param owner_id] to [param p_direction].
-			</description>
-		</method>
 		<method name="shape_owner_set_one_way_collision_margin">
 			<return type="void" />
 			<param index="0" name="owner_id" type="int" />
diff --git a/engine/doc/classes/CollisionObject3D.xml b/engine/doc/classes/CollisionObject3D.xml
index 977fdd58..d93f6a70 100644
--- a/engine/doc/classes/CollisionObject3D.xml
+++ b/engine/doc/classes/CollisionObject3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionObject3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionObject3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 3D physics objects.
 	</brief_description>
diff --git a/engine/doc/classes/CollisionPolygon2D.xml b/engine/doc/classes/CollisionPolygon2D.xml
index b1afc699..5dda4536 100644
--- a/engine/doc/classes/CollisionPolygon2D.xml
+++ b/engine/doc/classes/CollisionPolygon2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionPolygon2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionPolygon2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that provides a polygon shape to a [CollisionObject2D] parent.
 	</brief_description>
@@ -19,10 +19,6 @@
 		<member name="one_way_collision" type="bool" setter="set_one_way_collision" getter="is_one_way_collision_enabled" default="false">
 			If [code]true[/code], only edges that face up, relative to [CollisionPolygon2D]'s rotation, will collide with other objects.
 			[b]Note:[/b] This property has no effect if this [CollisionPolygon2D] is a child of an [Area2D] node.
-			[b]Note:[/b] The one way collision direction can be configured by setting [member one_way_collision_direction].
-		</member>
-		<member name="one_way_collision_direction" type="Vector2" setter="set_one_way_collision_direction" getter="get_one_way_collision_direction" default="Vector2(0, 1)">
-			The direction used for one-way collision.
 		</member>
 		<member name="one_way_collision_margin" type="float" setter="set_one_way_collision_margin" getter="get_one_way_collision_margin" default="1.0">
 			The margin used for one-way collision (in pixels). Higher values will make the shape thicker, and work better for colliders that enter the polygon at a high velocity.
diff --git a/engine/doc/classes/CollisionPolygon3D.xml b/engine/doc/classes/CollisionPolygon3D.xml
index b4be9a04..af1c0e55 100644
--- a/engine/doc/classes/CollisionPolygon3D.xml
+++ b/engine/doc/classes/CollisionPolygon3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionPolygon3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionPolygon3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that provides a thickened polygon shape (a prism) to a [CollisionObject3D] parent.
 	</brief_description>
diff --git a/engine/doc/classes/CollisionShape2D.xml b/engine/doc/classes/CollisionShape2D.xml
index c4a72b83..35049e4b 100644
--- a/engine/doc/classes/CollisionShape2D.xml
+++ b/engine/doc/classes/CollisionShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionShape2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionShape2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that provides a [Shape2D] to a [CollisionObject2D] parent.
 	</brief_description>
@@ -23,10 +23,6 @@
 		<member name="one_way_collision" type="bool" setter="set_one_way_collision" getter="is_one_way_collision_enabled" default="false">
 			Sets whether this collision shape should only detect collision on one side (top or bottom).
 			[b]Note:[/b] This property has no effect if this [CollisionShape2D] is a child of an [Area2D] node.
-			[b]Note:[/b] The one way collision direction can be configured by setting [member one_way_collision_direction].
-		</member>
-		<member name="one_way_collision_direction" type="Vector2" setter="set_one_way_collision_direction" getter="get_one_way_collision_direction" default="Vector2(0, 1)">
-			The direction used for one-way collision.
 		</member>
 		<member name="one_way_collision_margin" type="float" setter="set_one_way_collision_margin" getter="get_one_way_collision_margin" default="1.0">
 			The margin used for one-way collision (in pixels). Higher values will make the shape thicker, and work better for colliders that enter the shape at a high velocity.
diff --git a/engine/doc/classes/CollisionShape3D.xml b/engine/doc/classes/CollisionShape3D.xml
index e8016f9e..4ba0a049 100644
--- a/engine/doc/classes/CollisionShape3D.xml
+++ b/engine/doc/classes/CollisionShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CollisionShape3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CollisionShape3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that provides a [Shape3D] to a [CollisionObject3D] parent.
 	</brief_description>
diff --git a/engine/doc/classes/ColorPalette.xml b/engine/doc/classes/ColorPalette.xml
index fb79e93a..045d0137 100644
--- a/engine/doc/classes/ColorPalette.xml
+++ b/engine/doc/classes/ColorPalette.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ColorPalette" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ColorPalette" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A resource class for managing a palette of colors, which can be loaded and saved using [ColorPicker].
 	</brief_description>
diff --git a/engine/doc/classes/ColorPicker.xml b/engine/doc/classes/ColorPicker.xml
index 99ea7a8e..3af8df48 100644
--- a/engine/doc/classes/ColorPicker.xml
+++ b/engine/doc/classes/ColorPicker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ColorPicker" inherits="VBoxContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ColorPicker" inherits="VBoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A widget that provides an interface for selecting or modifying a color.
 	</brief_description>
@@ -179,9 +179,6 @@
 		<theme_item name="bar_arrow" data_type="icon" type="Texture2D">
 			The texture for the arrow grabber.
 		</theme_item>
-		<theme_item name="color_copy" data_type="icon" type="Texture2D">
-			The icon for the button that copies the color in text format to the clipboard.
-		</theme_item>
 		<theme_item name="color_hue" data_type="icon" type="Texture2D">
 			Custom texture for the hue selection slider on the right.
 		</theme_item>
diff --git a/engine/doc/classes/ColorPickerButton.xml b/engine/doc/classes/ColorPickerButton.xml
index 18ad710d..0852929f 100644
--- a/engine/doc/classes/ColorPickerButton.xml
+++ b/engine/doc/classes/ColorPickerButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ColorPickerButton" inherits="Button" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ColorPickerButton" inherits="Button" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that brings up a [ColorPicker] when pressed.
 	</brief_description>
diff --git a/engine/doc/classes/ColorRect.xml b/engine/doc/classes/ColorRect.xml
index 58160b32..6b2ddd74 100644
--- a/engine/doc/classes/ColorRect.xml
+++ b/engine/doc/classes/ColorRect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ColorRect" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ColorRect" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control that displays a solid color rectangle.
 	</brief_description>
diff --git a/engine/doc/classes/Compositor.xml b/engine/doc/classes/Compositor.xml
index f322fa87..07325269 100644
--- a/engine/doc/classes/Compositor.xml
+++ b/engine/doc/classes/Compositor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Compositor" inherits="Resource" api_type="core" experimental="More customization of the rendering pipeline will be added in the future." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Compositor" inherits="Resource" experimental="More customization of the rendering pipeline will be added in the future." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Stores attributes used to customize how a Viewport is rendered.
 	</brief_description>
diff --git a/engine/doc/classes/CompositorEffect.xml b/engine/doc/classes/CompositorEffect.xml
index a2b5f0fe..a3fd6e35 100644
--- a/engine/doc/classes/CompositorEffect.xml
+++ b/engine/doc/classes/CompositorEffect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompositorEffect" inherits="Resource" api_type="core" experimental="The implementation may change as more of the rendering internals are exposed over time." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompositorEffect" inherits="Resource" experimental="The implementation may change as more of the rendering internals are exposed over time." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		This resource allows for creating a custom rendering effect.
 	</brief_description>
diff --git a/engine/doc/classes/CompressedCubemap.xml b/engine/doc/classes/CompressedCubemap.xml
index 33879bdf..406ab490 100644
--- a/engine/doc/classes/CompressedCubemap.xml
+++ b/engine/doc/classes/CompressedCubemap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedCubemap" inherits="CompressedTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedCubemap" inherits="CompressedTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An optionally compressed [Cubemap].
 	</brief_description>
diff --git a/engine/doc/classes/CompressedCubemapArray.xml b/engine/doc/classes/CompressedCubemapArray.xml
index 692bfad9..195449ee 100644
--- a/engine/doc/classes/CompressedCubemapArray.xml
+++ b/engine/doc/classes/CompressedCubemapArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedCubemapArray" inherits="CompressedTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedCubemapArray" inherits="CompressedTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An optionally compressed [CubemapArray].
 	</brief_description>
diff --git a/engine/doc/classes/CompressedTexture2D.xml b/engine/doc/classes/CompressedTexture2D.xml
index 21d2900b..cc4c4c81 100644
--- a/engine/doc/classes/CompressedTexture2D.xml
+++ b/engine/doc/classes/CompressedTexture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedTexture2D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture with 2 dimensions, optionally compressed.
 	</brief_description>
diff --git a/engine/doc/classes/CompressedTexture2DArray.xml b/engine/doc/classes/CompressedTexture2DArray.xml
index 34a6cbda..6570e8f9 100644
--- a/engine/doc/classes/CompressedTexture2DArray.xml
+++ b/engine/doc/classes/CompressedTexture2DArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedTexture2DArray" inherits="CompressedTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedTexture2DArray" inherits="CompressedTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Array of 2-dimensional textures, optionally compressed.
 	</brief_description>
diff --git a/engine/doc/classes/CompressedTexture3D.xml b/engine/doc/classes/CompressedTexture3D.xml
index 7ee9dc09..797fbc9d 100644
--- a/engine/doc/classes/CompressedTexture3D.xml
+++ b/engine/doc/classes/CompressedTexture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedTexture3D" inherits="Texture3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedTexture3D" inherits="Texture3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture with 3 dimensions, optionally compressed.
 	</brief_description>
diff --git a/engine/doc/classes/CompressedTextureLayered.xml b/engine/doc/classes/CompressedTextureLayered.xml
index f126dccc..e661055f 100644
--- a/engine/doc/classes/CompressedTextureLayered.xml
+++ b/engine/doc/classes/CompressedTextureLayered.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CompressedTextureLayered" inherits="TextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CompressedTextureLayered" inherits="TextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for texture arrays that can optionally be compressed.
 	</brief_description>
diff --git a/engine/doc/classes/ConcavePolygonShape2D.xml b/engine/doc/classes/ConcavePolygonShape2D.xml
index 44a1752a..6baf0f38 100644
--- a/engine/doc/classes/ConcavePolygonShape2D.xml
+++ b/engine/doc/classes/ConcavePolygonShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConcavePolygonShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConcavePolygonShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D polyline shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/ConcavePolygonShape3D.xml b/engine/doc/classes/ConcavePolygonShape3D.xml
index c4495fdd..5c93325b 100644
--- a/engine/doc/classes/ConcavePolygonShape3D.xml
+++ b/engine/doc/classes/ConcavePolygonShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConcavePolygonShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConcavePolygonShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D trimesh shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/ConeTwistJoint3D.xml b/engine/doc/classes/ConeTwistJoint3D.xml
index d843dcd0..d95c9eb1 100644
--- a/engine/doc/classes/ConeTwistJoint3D.xml
+++ b/engine/doc/classes/ConeTwistJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConeTwistJoint3D" inherits="Joint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConeTwistJoint3D" inherits="Joint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that connects two 3D physics bodies in a way that simulates a ball-and-socket joint.
 	</brief_description>
diff --git a/engine/doc/classes/ConfigFile.xml b/engine/doc/classes/ConfigFile.xml
index a8723343..8ec65c36 100644
--- a/engine/doc/classes/ConfigFile.xml
+++ b/engine/doc/classes/ConfigFile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConfigFile" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConfigFile" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class to handle INI-style files.
 	</brief_description>
diff --git a/engine/doc/classes/ConfirmationDialog.xml b/engine/doc/classes/ConfirmationDialog.xml
index 51ce46d1..d50504f8 100644
--- a/engine/doc/classes/ConfirmationDialog.xml
+++ b/engine/doc/classes/ConfirmationDialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConfirmationDialog" inherits="AcceptDialog" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConfirmationDialog" inherits="AcceptDialog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A dialog used for confirmation of actions.
 	</brief_description>
diff --git a/engine/doc/classes/Container.xml b/engine/doc/classes/Container.xml
index 335b41cc..6ac02e2d 100644
--- a/engine/doc/classes/Container.xml
+++ b/engine/doc/classes/Container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Container" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Container" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all GUI containers.
 	</brief_description>
@@ -40,9 +40,6 @@
 		</method>
 	</methods>
 	<members>
-		<member name="accessibility_region" type="bool" setter="set_accessibility_region" getter="is_accessibility_region" default="false">
-			If [code]true[/code], this container is marked as a region for accessibility. Use [member Control.accessibility_name] to give the region a descriptive name. Screen readers can navigate between regions using landmark navigation.
-		</member>
 		<member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" overrides="Control" enum="Control.MouseFilter" default="1" />
 	</members>
 	<signals>
diff --git a/engine/doc/classes/Control.xml b/engine/doc/classes/Control.xml
index 88824278..55111898 100644
--- a/engine/doc/classes/Control.xml
+++ b/engine/doc/classes/Control.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Control" inherits="CanvasItem" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Control" inherits="CanvasItem" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all GUI controls. Adapts its position and size based on its parent control.
 	</brief_description>
@@ -92,14 +92,6 @@
 				Override this method to return a human-readable description of the position of the child [param node] in the custom container, added to the [member accessibility_name].
 			</description>
 		</method>
-		<method name="_get_cursor_shape" qualifiers="virtual const">
-			<return type="int" />
-			<param index="0" name="at_position" type="Vector2" />
-			<description>
-				Virtual method to be implemented by the user. Returns the cursor shape for the position [param at_position] in the control's local coordinates, which will typically be used while hovering over this control. See [method get_cursor_shape].
-				If not overridden, defaults to [member mouse_default_cursor_shape].
-			</description>
-		</method>
 		<method name="_get_drag_data" qualifiers="virtual">
 			<return type="Variant" />
 			<param index="0" name="at_position" type="Vector2" />
@@ -137,17 +129,10 @@
 			<return type="String" />
 			<param index="0" name="at_position" type="Vector2" />
 			<description>
-				Virtual method to be implemented by the user. Returns the tooltip text for the position [param at_position] in the control's local coordinates, which will typically appear when the cursor is resting over this control. See [method get_tooltip].
+				Virtual method to be implemented by the user. Returns the tooltip text for the position [param at_position] in control's local coordinates, which will typically appear when the cursor is resting over this control. See [method get_tooltip].
 				[b]Note:[/b] If this method returns an empty [String] and [method _make_custom_tooltip] is not overridden, no tooltip is displayed.
 			</description>
 		</method>
-		<method name="_get_tooltip_auto_translate_mode_at" qualifiers="virtual const">
-			<return type="int" enum="Node.AutoTranslateMode" />
-			<param index="0" name="at_position" type="Vector2" />
-			<description>
-				Return the auto-translation mode at the given [param at_position]. If not implemented, the [member tooltip_auto_translate_mode] property will be used instead.
-			</description>
-		</method>
 		<method name="_gui_input" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="event" type="InputEvent" />
@@ -188,7 +173,7 @@
 			<param index="0" name="point" type="Vector2" />
 			<description>
 				Virtual method to be implemented by the user. Returns whether the given [param point] is inside this control.
-				If not overridden, default behavior is checking if the point is within the control's Rect.
+				If not overridden, default behavior is checking if the point is within control's Rect.
 				[b]Note:[/b] If you want to check if a point is inside the control, you can use [code]Rect2(Vector2.ZERO, size).has_point(point)[/code].
 			</description>
 		</method>
@@ -432,10 +417,9 @@
 		</method>
 		<method name="get_cursor_shape" qualifiers="const">
 			<return type="int" enum="Control.CursorShape" />
-			<param index="0" name="at_position" type="Vector2" default="Vector2(0, 0)" />
+			<param index="0" name="position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Returns the mouse cursor shape for this control when hovered over [param at_position] in local coordinates. For most controls, this is the same as [member mouse_default_cursor_shape], but some built-in controls implement more complex logic.
-				You can override [method _get_cursor_shape] to implement custom behavior for this method.
+				Returns the mouse cursor shape for this control when hovered over [param position] in local coordinates. For most controls, this is the same as [member mouse_default_cursor_shape], but some built-in controls implement more complex logic.
 			</description>
 		</method>
 		<method name="get_end" qualifiers="const">
@@ -619,8 +603,8 @@
 			<return type="String" />
 			<param index="0" name="at_position" type="Vector2" default="Vector2(0, 0)" />
 			<description>
-				Returns the tooltip text for the position [param at_position] in the control's local coordinates, which will typically appear when the cursor is resting over this control. By default, it returns [member tooltip_text].
-				You can override [method _get_tooltip] to implement custom behavior for this method.
+				Returns the tooltip text for the position [param at_position] in control's local coordinates, which will typically appear when the cursor is resting over this control. By default, it returns [member tooltip_text].
+				This method can be overridden to customize its behavior. See [method _get_tooltip].
 				[b]Note:[/b] If this method returns an empty [String] and [method _make_custom_tooltip] is not overridden, no tooltip is displayed.
 			</description>
 		</method>
@@ -647,7 +631,7 @@
 			<param index="0" name="hide_focus" type="bool" default="false" />
 			<description>
 				Steal the focus from another control and become the focused control (see [member focus_mode]).
-				If [param hide_focus] is [code]true[/code], the control will not visually show its focused state. Has no effect for [LineEdit] and [TextEdit] when [member ProjectSettings.gui/common/show_focus_state_on_pointer_event] is set to [code]Text Input Controls[/code], or for any control when it is set to [code]Always[/code].
+				If [param hide_focus] is [code]true[/code], the control will not visually show its focused state. Has no effect for [LineEdit] and [TextEdit] when [member ProjectSettings.gui/common/show_focus_state_on_pointer_event] is set to [code]Control Supports Keyboard Input[/code], or for any control when it is set to [code]Always[/code].
 				[b]Note:[/b] Using this method together with [method Callable.call_deferred] makes it more reliable, especially when called inside [method Node._ready].
 			</description>
 		</method>
@@ -1014,7 +998,7 @@
 		<member name="accessibility_labeled_by_nodes" type="NodePath[]" setter="set_accessibility_labeled_by_nodes" getter="get_accessibility_labeled_by_nodes" default="[]">
 			The paths to the nodes which label this node.
 		</member>
-		<member name="accessibility_live" type="int" setter="set_accessibility_live" getter="get_accessibility_live" enum="AccessibilityServer.AccessibilityLiveMode" default="0">
+		<member name="accessibility_live" type="int" setter="set_accessibility_live" getter="get_accessibility_live" enum="DisplayServer.AccessibilityLiveMode" default="0">
 			The mode with which a live region updates. A live region is a [Node] that is updated as a result of an external event when the user's focus may be elsewhere.
 		</member>
 		<member name="accessibility_name" type="String" setter="set_accessibility_name" getter="get_accessibility_name" default="&quot;&quot;">
@@ -1114,41 +1098,6 @@
 			Distance between the node's top edge and its parent control, based on [member anchor_top].
 			Offsets are often controlled by one or multiple parent [Container] nodes, so you should not modify them manually if your node is a direct child of a [Container]. Offsets update automatically when you move or resize the node.
 		</member>
-		<member name="offset_transform_enabled" type="bool" setter="set_offset_transform_enabled" getter="is_offset_transform_enabled" default="false">
-			If [code]true[/code], applies all offset transform properties. Otherwise, no offset transform is applied and the properties have no effect.
-		</member>
-		<member name="offset_transform_pivot" type="Vector2" setter="set_offset_transform_pivot" getter="get_offset_transform_pivot" default="Vector2(0, 0)">
-			Pivot used by [member offset_transform_rotation] and [member offset_transform_scale] in absolute units.
-			The final pivot position is the combined value of this property and [member offset_transform_pivot_ratio].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_pivot_ratio" type="Vector2" setter="set_offset_transform_pivot_ratio" getter="get_offset_transform_pivot_ratio" default="Vector2(0.5, 0.5)">
-			Same as [member offset_transform_pivot] but expressed in units relative to the [Control] [member size] where [code]Vector2(0, 0)[/code] is the top-left corner of this control, and [code]Vector2(1, 1)[/code] is its bottom-right corner.
-			The final pivot position is the combined value of this property and [member offset_transform_pivot].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_position" type="Vector2" setter="set_offset_transform_position" getter="get_offset_transform_position" default="Vector2(0, 0)">
-			Position offset in absolute units. The final offset is the combined value of this property and [member offset_transform_position_ratio].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_position_ratio" type="Vector2" setter="set_offset_transform_position_ratio" getter="get_offset_transform_position_ratio" default="Vector2(0, 0)">
-			Same as [member offset_transform_position] but expressed in units relative to the [Control] [member size] where [code]Vector2(0, 0)[/code] is the top-left corner of this control, and [code]Vector2(1, 1)[/code] is its bottom-right corner.
-			The final offset is the combined value of this property and [member offset_transform_position].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_rotation" type="float" setter="set_offset_transform_rotation" getter="get_offset_transform_rotation" default="0.0">
-			Rotation offset. The rotation pivot is defined by [member offset_transform_pivot] and [member offset_transform_pivot_ratio].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_scale" type="Vector2" setter="set_offset_transform_scale" getter="get_offset_transform_scale" default="Vector2(1, 1)">
-			Scale offset. The scale pivot is defined by [member offset_transform_pivot] and [member offset_transform_pivot_ratio].
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
-		<member name="offset_transform_visual_only" type="bool" setter="set_offset_transform_visual_only" getter="is_offset_transform_visual_only" default="true">
-			If [code]true[/code], the offset transforms is only applied visually and does not affect input. In other words, this Control will still receive input events at its original location before the offset transform is applied.
-			If [code]false[/code], the entire transform of this Control is affected and input events will register where the Control is visually.
-			Has no effect unless [member offset_transform_enabled] is [code]true[/code].
-		</member>
 		<member name="physics_interpolation_mode" type="int" setter="set_physics_interpolation_mode" getter="get_physics_interpolation_mode" overrides="Node" enum="Node.PhysicsInterpolationMode" default="2" />
 		<member name="pivot_offset" type="Vector2" setter="set_pivot_offset" getter="get_pivot_offset" default="Vector2(0, 0)">
 			By default, the node's pivot is its top-left corner. When you change its [member rotation] or [member scale], it will rotate or scale around this pivot.
diff --git a/engine/doc/classes/ConvertTransformModifier3D.xml b/engine/doc/classes/ConvertTransformModifier3D.xml
index 6df3187d..0c8b2858 100644
--- a/engine/doc/classes/ConvertTransformModifier3D.xml
+++ b/engine/doc/classes/ConvertTransformModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConvertTransformModifier3D" inherits="BoneConstraint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConvertTransformModifier3D" inherits="BoneConstraint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] that apply transform to the bone which converted from reference.
 	</brief_description>
diff --git a/engine/doc/classes/ConvexPolygonShape2D.xml b/engine/doc/classes/ConvexPolygonShape2D.xml
index 8a6c1857..984787d3 100644
--- a/engine/doc/classes/ConvexPolygonShape2D.xml
+++ b/engine/doc/classes/ConvexPolygonShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConvexPolygonShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConvexPolygonShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D convex polygon shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/ConvexPolygonShape3D.xml b/engine/doc/classes/ConvexPolygonShape3D.xml
index 45a0148e..98c34592 100644
--- a/engine/doc/classes/ConvexPolygonShape3D.xml
+++ b/engine/doc/classes/ConvexPolygonShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ConvexPolygonShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ConvexPolygonShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D convex polyhedron shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/CopyTransformModifier3D.xml b/engine/doc/classes/CopyTransformModifier3D.xml
index 1825bea8..1c5c3947 100644
--- a/engine/doc/classes/CopyTransformModifier3D.xml
+++ b/engine/doc/classes/CopyTransformModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CopyTransformModifier3D" inherits="BoneConstraint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CopyTransformModifier3D" inherits="BoneConstraint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] that apply transform to the bone which copied from reference.
 	</brief_description>
diff --git a/engine/doc/classes/Crypto.xml b/engine/doc/classes/Crypto.xml
index 2781a5da..0effd54f 100644
--- a/engine/doc/classes/Crypto.xml
+++ b/engine/doc/classes/Crypto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Crypto" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Crypto" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to advanced cryptographic functionalities.
 	</brief_description>
diff --git a/engine/doc/classes/CryptoKey.xml b/engine/doc/classes/CryptoKey.xml
index c69ed5ad..dd128b68 100644
--- a/engine/doc/classes/CryptoKey.xml
+++ b/engine/doc/classes/CryptoKey.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CryptoKey" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CryptoKey" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A cryptographic key (RSA or elliptic-curve).
 	</brief_description>
diff --git a/engine/doc/classes/Cubemap.xml b/engine/doc/classes/Cubemap.xml
index 7009e229..acfb8a02 100644
--- a/engine/doc/classes/Cubemap.xml
+++ b/engine/doc/classes/Cubemap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Cubemap" inherits="ImageTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Cubemap" inherits="ImageTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Six square textures representing the faces of a cube. Commonly used as a skybox.
 	</brief_description>
diff --git a/engine/doc/classes/CubemapArray.xml b/engine/doc/classes/CubemapArray.xml
index 7aa17acb..47786611 100644
--- a/engine/doc/classes/CubemapArray.xml
+++ b/engine/doc/classes/CubemapArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CubemapArray" inherits="ImageTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CubemapArray" inherits="ImageTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An array of [Cubemap]s, stored together and with a single reference.
 	</brief_description>
diff --git a/engine/doc/classes/Curve.xml b/engine/doc/classes/Curve.xml
index a21ecaa5..5246e0ba 100644
--- a/engine/doc/classes/Curve.xml
+++ b/engine/doc/classes/Curve.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Curve" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Curve" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A mathematical curve.
 	</brief_description>
@@ -175,26 +175,6 @@
 		<member name="point_count" type="int" setter="set_point_count" getter="get_point_count" default="0">
 			The number of points describing the curve.
 		</member>
-		<member name="point_{index}/left_mode" type="int" setter="" getter="" default="0">
-			The left [enum TangentMode] for the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/left_tangent" type="float" setter="" getter="" default="0.0">
-			The left tangent angle (in degrees) for the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/position" type="Vector2" setter="" getter="" default="Vector2(0, 0)">
-			The position of the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/right_mode" type="int" setter="" getter="" default="0">
-			The right [enum TangentMode] for the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/right_tangent" type="float" setter="" getter="" default="0.0">
-			The right tangent angle (in degrees) for the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
 	</members>
 	<signals>
 		<signal name="domain_changed">
diff --git a/engine/doc/classes/Curve2D.xml b/engine/doc/classes/Curve2D.xml
index db9135f0..6ce9616f 100644
--- a/engine/doc/classes/Curve2D.xml
+++ b/engine/doc/classes/Curve2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Curve2D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Curve2D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Describes a Bézier curve in 2D space.
 	</brief_description>
@@ -177,17 +177,5 @@
 		<member name="point_count" type="int" setter="set_point_count" getter="get_point_count" default="0">
 			The number of points describing the curve.
 		</member>
-		<member name="point_{index}/in" type="Vector2" setter="" getter="" default="Vector2(0, 0)">
-			The position of the control point leading to the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/out" type="Vector2" setter="" getter="" default="Vector2(0, 0)">
-			The position of the control point leading out of the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/position" type="Vector2" setter="" getter="" default="Vector2(0, 0)">
-			The position of for the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/Curve3D.xml b/engine/doc/classes/Curve3D.xml
index 2c0f7a4d..f8386b73 100644
--- a/engine/doc/classes/Curve3D.xml
+++ b/engine/doc/classes/Curve3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Curve3D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Curve3D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Describes a Bézier curve in 3D space.
 	</brief_description>
@@ -210,22 +210,6 @@
 		<member name="point_count" type="int" setter="set_point_count" getter="get_point_count" default="0">
 			The number of points describing the curve.
 		</member>
-		<member name="point_{index}/in" type="Vector3" setter="" getter="" default="Vector3(0, 0, 0)">
-			The position of the control point leading to the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/out" type="Vector3" setter="" getter="" default="Vector3(0, 0, 0)">
-			The position of the control point leading out of the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/position" type="Vector3" setter="" getter="" default="Vector3(0, 0, 0)">
-			The position of for the vertex at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
-		<member name="point_{index}/tilt" type="float" setter="" getter="" default="0.0">
-			The tilt angle in radians for the point at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. point_count - 1[/code] range.
-		</member>
 		<member name="up_vector_enabled" type="bool" setter="set_up_vector_enabled" getter="is_up_vector_enabled" default="true">
 			If [code]true[/code], the curve will bake up vectors used for orientation. This is used when [member PathFollow3D.rotation_mode] is set to [constant PathFollow3D.ROTATION_ORIENTED]. Changing it forces the cache to be recomputed.
 		</member>
diff --git a/engine/doc/classes/CurveTexture.xml b/engine/doc/classes/CurveTexture.xml
index ae4d6c40..ed4a2f2d 100644
--- a/engine/doc/classes/CurveTexture.xml
+++ b/engine/doc/classes/CurveTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CurveTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CurveTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 1D texture where pixel brightness corresponds to points on a curve.
 	</brief_description>
diff --git a/engine/doc/classes/CurveXYZTexture.xml b/engine/doc/classes/CurveXYZTexture.xml
index 7c2ab88d..472ce7bb 100644
--- a/engine/doc/classes/CurveXYZTexture.xml
+++ b/engine/doc/classes/CurveXYZTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CurveXYZTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CurveXYZTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 1D texture where the red, green, and blue color channels correspond to points on 3 curves.
 	</brief_description>
diff --git a/engine/doc/classes/CylinderMesh.xml b/engine/doc/classes/CylinderMesh.xml
index 1b9a31d6..34c192e4 100644
--- a/engine/doc/classes/CylinderMesh.xml
+++ b/engine/doc/classes/CylinderMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CylinderMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CylinderMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a cylindrical [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/CylinderShape3D.xml b/engine/doc/classes/CylinderShape3D.xml
index 20bdaa78..db98cac6 100644
--- a/engine/doc/classes/CylinderShape3D.xml
+++ b/engine/doc/classes/CylinderShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CylinderShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="CylinderShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D cylinder shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/DPITexture.xml b/engine/doc/classes/DPITexture.xml
index 053a25a4..dbbc7542 100644
--- a/engine/doc/classes/DPITexture.xml
+++ b/engine/doc/classes/DPITexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DPITexture" inherits="Texture2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DPITexture" inherits="Texture2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An automatically scalable [Texture2D] based on an SVG image.
 	</brief_description>
@@ -53,14 +53,6 @@
 		<member name="color_map" type="Dictionary" setter="set_color_map" getter="get_color_map" default="{}">
 			If set, remaps texture colors according to [Color]-[Color] map.
 		</member>
-		<member name="fix_alpha_border" type="bool" setter="set_fix_alpha_border" getter="get_fix_alpha_border" default="false">
-			If [code]true[/code], puts pixels of the same surrounding color in transition from transparent to opaque areas. For textures displayed with bilinear filtering, this helps to reduce the outline effect when exporting images from an image editor.
-		</member>
-		<member name="premult_alpha" type="bool" setter="set_premult_alpha" getter="get_premult_alpha" default="false">
-			An alternative to fixing darkened borders with [member fix_alpha_border] is to use premultiplied alpha. By enabling this option, the texture will be converted to this format. A premultiplied alpha texture requires specific materials to be displayed correctly:
-			- In 2D, a [CanvasItemMaterial] will need to be created and configured to use the [constant CanvasItemMaterial.BLEND_MODE_PREMULT_ALPHA] blend mode on [CanvasItem]s that use this texture. In custom [code]canvas_item[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
-			- In 3D, a [BaseMaterial3D] will need to be created and configured to use the [constant BaseMaterial3D.BLEND_MODE_PREMULT_ALPHA] blend mode on materials that use this texture. In custom [code]spatial[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
-		</member>
 		<member name="resource_local_to_scene" type="bool" setter="set_local_to_scene" getter="is_local_to_scene" overrides="Resource" default="false" />
 		<member name="saturation" type="float" setter="set_saturation" getter="get_saturation" default="1.0">
 			Overrides texture saturation.
diff --git a/engine/doc/classes/DTLSServer.xml b/engine/doc/classes/DTLSServer.xml
index 115d5cc4..f44a8e01 100644
--- a/engine/doc/classes/DTLSServer.xml
+++ b/engine/doc/classes/DTLSServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DTLSServer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DTLSServer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class to implement a DTLS server.
 	</brief_description>
diff --git a/engine/doc/classes/DampedSpringJoint2D.xml b/engine/doc/classes/DampedSpringJoint2D.xml
index d38a149c..c1ddebdc 100644
--- a/engine/doc/classes/DampedSpringJoint2D.xml
+++ b/engine/doc/classes/DampedSpringJoint2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DampedSpringJoint2D" inherits="Joint2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DampedSpringJoint2D" inherits="Joint2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that connects two 2D physics bodies with a spring-like force.
 	</brief_description>
diff --git a/engine/doc/classes/Decal.xml b/engine/doc/classes/Decal.xml
index 1e502278..108c928c 100644
--- a/engine/doc/classes/Decal.xml
+++ b/engine/doc/classes/Decal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Decal" inherits="VisualInstance3D" api_type="core" keywords="stain" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Decal" inherits="VisualInstance3D" keywords="stain" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node that projects a texture onto a [MeshInstance3D].
 	</brief_description>
@@ -108,7 +108,6 @@
 			[Texture2D] storing ambient occlusion, roughness, and metallic for the decal. Use this to add extra detail to decals.
 			[b]Note:[/b] Unlike [BaseMaterial3D] whose filter mode can be adjusted on a per-material basis, the filter mode for [Decal] textures is set globally with [member ProjectSettings.rendering/textures/decals/filter].
 			[b]Note:[/b] Setting this texture alone will not result in a visible decal, as [member texture_albedo] must also be set. To create an ORM-only decal, load an albedo texture into [member texture_albedo] and set [member albedo_mix] to [code]0.0[/code]. The albedo texture's alpha channel will be used to determine where the underlying surface's ORM map should be overridden (and its intensity).
-			[b]Note:[/b] Due to technical limitations, modifying the underlying surface's roughness using [member texture_orm] does [i]not[/i] affect screen-space reflections ([member Environment.ssr_enabled]), reflections from [VoxelGI], and reflections from SDFGI ([member Environment.sdfgi_enabled]). Only reflections from [ReflectionProbe]s are affected.
 		</member>
 		<member name="upper_fade" type="float" setter="set_upper_fade" getter="get_upper_fade" default="0.3">
 			Sets the curve over which the decal will fade as the surface gets further from the center of the [AABB]. Only positive values are valid (negative values will be clamped to [code]0.0[/code]). See also [member lower_fade].
diff --git a/engine/doc/classes/Dictionary.xml b/engine/doc/classes/Dictionary.xml
index e5363d73..b8c077a2 100644
--- a/engine/doc/classes/Dictionary.xml
+++ b/engine/doc/classes/Dictionary.xml
@@ -168,7 +168,6 @@
 		[/codeblocks]
 		[b]Note:[/b] Dictionaries are always passed by reference. To get a copy of a dictionary which can be modified independently of the original dictionary, use [method duplicate].
 		[b]Note:[/b] Erasing elements while iterating over dictionaries is [b]not[/b] supported and will result in unpredictable behavior.
-		[b]Note:[/b] In a boolean context, a dictionary will evaluate to [code]false[/code] if it's empty ([code]{}[/code]). Otherwise, a dictionary will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="GDScript basics: Dictionary">$DOCS_URL/tutorials/scripting/gdscript/gdscript_basics.html#dictionary</link>
@@ -256,13 +255,6 @@
 			<param index="1" name="default" type="Variant" default="null" />
 			<description>
 				Returns the corresponding value for the given [param key] in the dictionary. If the [param key] does not exist, returns [param default], or [code]null[/code] if the parameter is omitted.
-				[b]Note:[/b] If the [param default] argument is computationally expensive or has unwanted side effects, consider using the [method has] method instead:
-				[codeblock]
-				# Always calls `expensive_function()`.
-				dict.get("key", expensive_function())
-				# Calls `expensive_function()` only if the key does not exist.
-				dict.get("key") if dict.has("key") else expensive_function()
-				[/codeblock]
 			</description>
 		</method>
 		<method name="get_or_add">
diff --git a/engine/doc/classes/DirAccess.xml b/engine/doc/classes/DirAccess.xml
index 584dc41c..b21b507a 100644
--- a/engine/doc/classes/DirAccess.xml
+++ b/engine/doc/classes/DirAccess.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DirAccess" inherits="RefCounted" api_type="core" keywords="directory, path, folder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DirAccess" inherits="RefCounted" keywords="directory, path, folder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides methods for managing directories and their content.
 	</brief_description>
@@ -186,14 +186,6 @@
 				On other platforms, the method returns 0.
 			</description>
 		</method>
-		<method name="get_drive_label" qualifiers="static">
-			<return type="String" />
-			<param index="0" name="idx" type="int" />
-			<description>
-				On Windows, returns the label of the drive (partition) passed as an argument.
-				On other platforms, or if the requested drive does not exist, returns an empty String.
-			</description>
-		</method>
 		<method name="get_drive_name" qualifiers="static">
 			<return type="String" />
 			<param index="0" name="idx" type="int" />
@@ -202,7 +194,7 @@
 				On macOS, returns the path to the mounted volume passed as an argument.
 				On Linux, returns the path to the mounted volume or GTK 3 bookmark passed as an argument.
 				On Android (API level 30+), returns the path to the mounted volume as an argument.
-				On other platforms, or if the requested drive does not exist, returns an empty String.
+				On other platforms, or if the requested drive does not exist, the method returns an empty String.
 			</description>
 		</method>
 		<method name="get_files">
diff --git a/engine/doc/classes/DirectionalLight2D.xml b/engine/doc/classes/DirectionalLight2D.xml
index f161311b..b4a389e6 100644
--- a/engine/doc/classes/DirectionalLight2D.xml
+++ b/engine/doc/classes/DirectionalLight2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DirectionalLight2D" inherits="Light2D" api_type="core" keywords="sun" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DirectionalLight2D" inherits="Light2D" keywords="sun" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Directional 2D light from a distance.
 	</brief_description>
diff --git a/engine/doc/classes/DirectionalLight3D.xml b/engine/doc/classes/DirectionalLight3D.xml
index a08ac195..faeed289 100644
--- a/engine/doc/classes/DirectionalLight3D.xml
+++ b/engine/doc/classes/DirectionalLight3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DirectionalLight3D" inherits="Light3D" api_type="core" keywords="sun" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DirectionalLight3D" inherits="Light3D" keywords="sun" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Directional light from a distance, as from the Sun.
 	</brief_description>
diff --git a/engine/doc/classes/DisplayServer.xml b/engine/doc/classes/DisplayServer.xml
index e9a1b13d..d568c966 100644
--- a/engine/doc/classes/DisplayServer.xml
+++ b/engine/doc/classes/DisplayServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="DisplayServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="DisplayServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for low-level window management.
 	</brief_description>
@@ -10,7 +10,7 @@
 	<tutorials>
 	</tutorials>
 	<methods>
-		<method name="accessibility_create_element" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_create_element">
 			<return type="RID" />
 			<param index="0" name="window_id" type="int" />
 			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
@@ -19,7 +19,7 @@
 				[b]Note:[/b] An accessibility element is created and freed automatically for each [Node]. In general, this function should not be called manually.
 			</description>
 		</method>
-		<method name="accessibility_create_sub_element" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_create_sub_element">
 			<return type="RID" />
 			<param index="0" name="parent_rid" type="RID" />
 			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
@@ -28,7 +28,7 @@
 				Creates a new, empty accessibility sub-element resource. Sub-elements can be used to provide accessibility information for objects which are not [Node]s, such as list items, table cells, or menu items. Sub-elements are freed automatically when the parent element is freed, or can be freed early using the [method accessibility_free_element] method.
 			</description>
 		</method>
-		<method name="accessibility_create_sub_text_edit_elements" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_create_sub_text_edit_elements">
 			<return type="RID" />
 			<param index="0" name="parent_rid" type="RID" />
 			<param index="1" name="shaped_text" type="RID" />
@@ -40,14 +40,14 @@
 				If [param is_last_line] is [code]true[/code], no trailing newline is appended to the text content. Set to [code]true[/code] for the last line in multi-line text fields and for single-line text fields.
 			</description>
 		</method>
-		<method name="accessibility_element_get_meta" qualifiers="const" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_element_get_meta" qualifiers="const">
 			<return type="Variant" />
 			<param index="0" name="id" type="RID" />
 			<description>
 				Returns the metadata of the accessibility element [param id].
 			</description>
 		</method>
-		<method name="accessibility_element_set_meta" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_element_set_meta">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="meta" type="Variant" />
@@ -55,21 +55,21 @@
 				Sets the metadata of the accessibility element [param id] to [param meta].
 			</description>
 		</method>
-		<method name="accessibility_free_element" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_free_element">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<description>
 				Frees the accessibility element [param id] created by [method accessibility_create_element], [method accessibility_create_sub_element], or [method accessibility_create_sub_text_edit_elements].
 			</description>
 		</method>
-		<method name="accessibility_get_window_root" qualifiers="const" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_get_window_root" qualifiers="const">
 			<return type="RID" />
 			<param index="0" name="window_id" type="int" />
 			<description>
 				Returns the main accessibility element of the OS native window.
 			</description>
 		</method>
-		<method name="accessibility_has_element" qualifiers="const" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_has_element" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="id" type="RID" />
 			<description>
@@ -84,7 +84,7 @@
 				[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights for Windows, Accessibility Inspector (macOS), or AT-SPI Browser (Linux/BSD), do not count as assistive apps and will not affect this value. To test your project with these tools, set [member ProjectSettings.accessibility/general/accessibility_support] to [code]1[/code].
 			</description>
 		</method>
-		<method name="accessibility_set_window_focused" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_set_window_focused">
 			<return type="void" />
 			<param index="0" name="window_id" type="int" />
 			<param index="1" name="focused" type="bool" />
@@ -94,7 +94,7 @@
 				[b]Note:[/b] Advanced users only! [Window] objects call this method automatically.
 			</description>
 		</method>
-		<method name="accessibility_set_window_rect" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_set_window_rect">
 			<return type="void" />
 			<param index="0" name="window_id" type="int" />
 			<param index="1" name="rect_out" type="Rect2" />
@@ -126,7 +126,7 @@
 				[b]Note:[/b] This method is implemented on macOS and Windows.
 			</description>
 		</method>
-		<method name="accessibility_update_add_action" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_action">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="action" type="int" enum="DisplayServer.AccessibilityAction" />
@@ -135,7 +135,7 @@
 				Adds a callback for the accessibility action (action which can be performed by using a special screen reader command or buttons on the Braille display), and marks this action as supported. The action callback receives one [Variant] argument, which value depends on action type.
 			</description>
 		</method>
-		<method name="accessibility_update_add_child" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_child">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="child_id" type="RID" />
@@ -144,7 +144,7 @@
 				[b]Note:[/b] [Node] children and sub-elements are added to the child list automatically.
 			</description>
 		</method>
-		<method name="accessibility_update_add_custom_action" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_custom_action">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="action_id" type="int" />
@@ -153,7 +153,7 @@
 				Adds support for a custom accessibility action. [param action_id] is passed as an argument to the callback of [constant ACTION_CUSTOM] action.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_controls" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_controls">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -161,7 +161,7 @@
 				Adds an element that is controlled by this element.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_described_by" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_described_by">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -169,7 +169,7 @@
 				Adds an element that describes this element.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_details" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_details">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -177,7 +177,7 @@
 				Adds an element that details this element.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_flow_to" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_flow_to">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -185,7 +185,7 @@
 				Adds an element that this element flow into.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_labeled_by" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_labeled_by">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -193,7 +193,7 @@
 				Adds an element that labels this element.
 			</description>
 		</method>
-		<method name="accessibility_update_add_related_radio_group" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_add_related_radio_group">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="related_id" type="RID" />
@@ -202,7 +202,7 @@
 				[b]Note:[/b] This method should be called on each element of the group, using all other elements as [param related_id].
 			</description>
 		</method>
-		<method name="accessibility_update_set_active_descendant" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_active_descendant">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="other_id" type="RID" />
@@ -210,7 +210,7 @@
 				Adds an element that is an active descendant of this element.
 			</description>
 		</method>
-		<method name="accessibility_update_set_background_color" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_background_color">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="color" type="Color" />
@@ -218,7 +218,7 @@
 				Sets element background color.
 			</description>
 		</method>
-		<method name="accessibility_update_set_bounds" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_bounds">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="p_rect" type="Rect2" />
@@ -226,7 +226,7 @@
 				Sets element bounding box, relative to the node position.
 			</description>
 		</method>
-		<method name="accessibility_update_set_checked" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_checked">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="checekd" type="bool" />
@@ -234,7 +234,7 @@
 				Sets element checked state.
 			</description>
 		</method>
-		<method name="accessibility_update_set_classname" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_classname">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="classname" type="String" />
@@ -242,7 +242,7 @@
 				Sets element class name.
 			</description>
 		</method>
-		<method name="accessibility_update_set_color_value" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_color_value">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="color" type="Color" />
@@ -250,7 +250,7 @@
 				Sets element color value.
 			</description>
 		</method>
-		<method name="accessibility_update_set_description" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_description">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="description" type="String" />
@@ -258,7 +258,7 @@
 				Sets element accessibility description.
 			</description>
 		</method>
-		<method name="accessibility_update_set_error_message" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_error_message">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="other_id" type="RID" />
@@ -266,7 +266,7 @@
 				Sets an element which contains an error message for this element.
 			</description>
 		</method>
-		<method name="accessibility_update_set_extra_info" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_extra_info">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="name" type="String" />
@@ -274,7 +274,7 @@
 				Sets element accessibility extra information added to the element name.
 			</description>
 		</method>
-		<method name="accessibility_update_set_flag" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_flag">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="flag" type="int" enum="DisplayServer.AccessibilityFlags" />
@@ -283,14 +283,14 @@
 				Sets element flag.
 			</description>
 		</method>
-		<method name="accessibility_update_set_focus" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_focus">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<description>
 				Sets currently focused element.
 			</description>
 		</method>
-		<method name="accessibility_update_set_foreground_color" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_foreground_color">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="color" type="Color" />
@@ -298,7 +298,7 @@
 				Sets element foreground color.
 			</description>
 		</method>
-		<method name="accessibility_update_set_in_page_link_target" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_in_page_link_target">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="other_id" type="RID" />
@@ -306,7 +306,7 @@
 				Sets target element for the link.
 			</description>
 		</method>
-		<method name="accessibility_update_set_language" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_language">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="language" type="String" />
@@ -314,7 +314,7 @@
 				Sets element text language.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_item_count" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_item_count">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="size" type="int" />
@@ -322,7 +322,7 @@
 				Sets number of items in the list.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_item_expanded" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_item_expanded">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="expanded" type="bool" />
@@ -330,7 +330,7 @@
 				Sets list/tree item expanded status.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_item_index" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_item_index">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="index" type="int" />
@@ -338,7 +338,7 @@
 				Sets the position of the element in the list.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_item_level" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_item_level">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="level" type="int" />
@@ -346,7 +346,7 @@
 				Sets the hierarchical level of the element in the list.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_item_selected" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_item_selected">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="selected" type="bool" />
@@ -354,7 +354,7 @@
 				Sets list/tree item selected status.
 			</description>
 		</method>
-		<method name="accessibility_update_set_list_orientation" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_list_orientation">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="vertical" type="bool" />
@@ -362,7 +362,7 @@
 				Sets the orientation of the list elements.
 			</description>
 		</method>
-		<method name="accessibility_update_set_live" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_live">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="live" type="int" enum="DisplayServer.AccessibilityLiveMode" />
@@ -370,7 +370,7 @@
 				Sets the priority of the live region updates.
 			</description>
 		</method>
-		<method name="accessibility_update_set_member_of" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_member_of">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="group_id" type="RID" />
@@ -378,7 +378,7 @@
 				Sets the element to be a member of the group.
 			</description>
 		</method>
-		<method name="accessibility_update_set_name" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_name">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="name" type="String" />
@@ -386,7 +386,7 @@
 				Sets element accessibility name.
 			</description>
 		</method>
-		<method name="accessibility_update_set_next_on_line" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_next_on_line">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="other_id" type="RID" />
@@ -394,7 +394,7 @@
 				Sets next element on the line.
 			</description>
 		</method>
-		<method name="accessibility_update_set_num_jump" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_num_jump">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="jump" type="float" />
@@ -402,7 +402,7 @@
 				Sets numeric value jump.
 			</description>
 		</method>
-		<method name="accessibility_update_set_num_range" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_num_range">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="min" type="float" />
@@ -411,7 +411,7 @@
 				Sets numeric value range.
 			</description>
 		</method>
-		<method name="accessibility_update_set_num_step" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_num_step">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="step" type="float" />
@@ -419,7 +419,7 @@
 				Sets numeric value step.
 			</description>
 		</method>
-		<method name="accessibility_update_set_num_value" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_num_value">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="position" type="float" />
@@ -427,7 +427,7 @@
 				Sets numeric value.
 			</description>
 		</method>
-		<method name="accessibility_update_set_placeholder" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_placeholder">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="placeholder" type="String" />
@@ -435,7 +435,7 @@
 				Sets placeholder text.
 			</description>
 		</method>
-		<method name="accessibility_update_set_popup_type" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_popup_type">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="popup" type="int" enum="DisplayServer.AccessibilityPopupType" />
@@ -443,7 +443,7 @@
 				Sets popup type for popup buttons.
 			</description>
 		</method>
-		<method name="accessibility_update_set_previous_on_line" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_previous_on_line">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="other_id" type="RID" />
@@ -451,7 +451,7 @@
 				Sets previous element on the line.
 			</description>
 		</method>
-		<method name="accessibility_update_set_role" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_role">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
@@ -459,7 +459,7 @@
 				Sets element accessibility role.
 			</description>
 		</method>
-		<method name="accessibility_update_set_role_description" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_role_description">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="description" type="String" />
@@ -467,7 +467,7 @@
 				Sets element accessibility role description text.
 			</description>
 		</method>
-		<method name="accessibility_update_set_scroll_x" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_scroll_x">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="position" type="float" />
@@ -475,7 +475,7 @@
 				Sets scroll bar x position.
 			</description>
 		</method>
-		<method name="accessibility_update_set_scroll_x_range" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_scroll_x_range">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="min" type="float" />
@@ -484,7 +484,7 @@
 				Sets scroll bar x range.
 			</description>
 		</method>
-		<method name="accessibility_update_set_scroll_y" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_scroll_y">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="position" type="float" />
@@ -492,7 +492,7 @@
 				Sets scroll bar y position.
 			</description>
 		</method>
-		<method name="accessibility_update_set_scroll_y_range" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_scroll_y_range">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="min" type="float" />
@@ -501,7 +501,7 @@
 				Sets scroll bar y range.
 			</description>
 		</method>
-		<method name="accessibility_update_set_shortcut" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_shortcut">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="shortcut" type="String" />
@@ -509,7 +509,7 @@
 				Sets the list of keyboard shortcuts used by element.
 			</description>
 		</method>
-		<method name="accessibility_update_set_state_description" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_state_description">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="description" type="String" />
@@ -517,7 +517,7 @@
 				Sets human-readable description of the current checked state.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_cell_position" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_cell_position">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="row_index" type="int" />
@@ -526,7 +526,7 @@
 				Sets cell position in the table.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_cell_span" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_cell_span">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="row_span" type="int" />
@@ -535,7 +535,7 @@
 				Sets cell row/column span.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_column_count" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_column_count">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="count" type="int" />
@@ -543,7 +543,7 @@
 				Sets number of columns in the table.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_column_index" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_column_index">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="index" type="int" />
@@ -551,7 +551,7 @@
 				Sets position of the column.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_row_count" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_row_count">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="count" type="int" />
@@ -559,7 +559,7 @@
 				Sets number of rows in the table.
 			</description>
 		</method>
-		<method name="accessibility_update_set_table_row_index" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_table_row_index">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="index" type="int" />
@@ -567,7 +567,7 @@
 				Sets position of the row in the table.
 			</description>
 		</method>
-		<method name="accessibility_update_set_text_align" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_text_align">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="align" type="int" enum="HorizontalAlignment" />
@@ -575,7 +575,7 @@
 				Sets element text alignment.
 			</description>
 		</method>
-		<method name="accessibility_update_set_text_decorations" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_text_decorations">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="underline" type="bool" />
@@ -585,7 +585,7 @@
 				Sets text underline/overline/strikethrough.
 			</description>
 		</method>
-		<method name="accessibility_update_set_text_orientation" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_text_orientation">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="vertical" type="bool" />
@@ -593,7 +593,7 @@
 				Sets text orientation.
 			</description>
 		</method>
-		<method name="accessibility_update_set_text_selection" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_text_selection">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="text_start_id" type="RID" />
@@ -604,7 +604,7 @@
 				Sets text selection to the text field. [param text_start_id] and [param text_end_id] should be elements created by [method accessibility_create_sub_text_edit_elements]. Character offsets are relative to the corresponding element.
 			</description>
 		</method>
-		<method name="accessibility_update_set_tooltip" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_tooltip">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="tooltip" type="String" />
@@ -612,7 +612,7 @@
 				Sets tooltip text.
 			</description>
 		</method>
-		<method name="accessibility_update_set_transform" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_transform">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="transform" type="Transform2D" />
@@ -620,7 +620,7 @@
 				Sets element 2D transform.
 			</description>
 		</method>
-		<method name="accessibility_update_set_url" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_url">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="url" type="String" />
@@ -628,7 +628,7 @@
 				Sets link URL.
 			</description>
 		</method>
-		<method name="accessibility_update_set_value" deprecated="Use [AccessibilityServer] instead.">
+		<method name="accessibility_update_set_value">
 			<return type="void" />
 			<param index="0" name="id" type="RID" />
 			<param index="1" name="value" type="String" />
@@ -1604,14 +1604,6 @@
 				[b]Note:[/b] This method is implemented on Android, iOS, macOS, Windows, and Linux (X11/Wayland).
 			</description>
 		</method>
-		<method name="is_in_pip_mode">
-			<return type="bool" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns [code]true[/code] if the application is in picture-in-picture mode.
-				[b]Note:[/b] This method is implemented on Android.
-			</description>
-		</method>
 		<method name="is_touchscreen_available" qualifiers="const">
 			<return type="bool" />
 			<description>
@@ -1703,33 +1695,6 @@
 				Sets the current mouse mode. See also [method mouse_get_mode].
 			</description>
 		</method>
-		<method name="pip_mode_enter">
-			<return type="void" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Enters picture-in-picture mode.
-				[b]Note:[/b] This method is implemented on Android.
-			</description>
-		</method>
-		<method name="pip_mode_set_aspect_ratio">
-			<return type="void" />
-			<param index="0" name="numerator" type="int" />
-			<param index="1" name="denominator" type="int" />
-			<param index="2" name="window_id" type="int" default="0" />
-			<description>
-				Specifies the aspect ratio for picture-in-picture mode.
-				[b]Note:[/b] This method is implemented on Android.
-			</description>
-		</method>
-		<method name="pip_mode_set_auto_enter_on_background">
-			<return type="void" />
-			<param index="0" name="auto_enter_on_background" type="bool" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Specifies whether picture-in-picture mode should be entered automatically when the application goes in the background.
-				[b]Note:[/b] This method is implemented on Android.
-			</description>
-		</method>
 		<method name="process_events">
 			<return type="void" />
 			<description>
@@ -1904,7 +1869,7 @@
 			<return type="void" />
 			<param index="0" name="image" type="Image" />
 			<description>
-				Sets the application icon and icons of all windows with an [Image]. To use icons in the operating system's native format, use [method set_native_icon] instead.
+				Sets the window icon (usually displayed in the top-left corner) with an [Image]. To use icons in the operating system's native format, use [method set_native_icon] instead.
 				[b]Note:[/b] Requires support for [constant FEATURE_ICON].
 			</description>
 		</method>
@@ -2182,36 +2147,6 @@
 				Returns the current value of the given window's [param flag].
 			</description>
 		</method>
-		<method name="window_get_hdr_output_current_max_luminance" qualifiers="const" experimental="">
-			<return type="float" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				When [method window_is_hdr_output_enabled] returns [code]true[/code], this returns the current maximum luminance in nits (cd/m²) for HDR output by the window specified by [param window_id]. If the maximum luminance is being automatically adjusted based on the screen's capabilities, this method will return that value. Otherwise, it will return the value set by [method window_set_hdr_output_max_luminance]. This maximum luminance value is used when calculating [method window_get_output_max_linear_value].
-				[b]Note:[/b] This maximum luminance may not match the physical behavior of the screen, but will always be proportionally correct relative to [method window_get_hdr_output_current_reference_luminance].
-			</description>
-		</method>
-		<method name="window_get_hdr_output_current_reference_luminance" qualifiers="const">
-			<return type="float" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				When [method window_is_hdr_output_enabled] returns [code]true[/code], this returns the current reference white luminance in nits (cd/m²) for HDR output by the window specified by [param window_id]. If the reference luminance is being automatically adjusted to match the operating system brightness, this will return that value. Otherwise, it will return the value set by [method window_set_hdr_output_reference_luminance]. This reference luminance value is used when calculating [method window_get_output_max_linear_value].
-				[b]Note:[/b] This reference white luminance may not match the physical behavior of the screen, but will always be proportionally correct relative to [method window_get_hdr_output_current_max_luminance].
-			</description>
-		</method>
-		<method name="window_get_hdr_output_max_luminance" qualifiers="const" experimental="">
-			<return type="float" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns the maximum luminance in nits (cd/m²) set for HDR output by the window specified by [param window_id]. Negative values indicate that the value is being automatically adjusted based on the screen's capabilities. See also [method window_get_hdr_output_current_max_luminance].
-			</description>
-		</method>
-		<method name="window_get_hdr_output_reference_luminance" qualifiers="const">
-			<return type="float" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns the reference white luminance in nits (cd/m²) set for HDR output by the window specified by [param window_id]. Negative values indicate that the value is being automatically adjusted to match the operating system brightness. See also [method window_get_hdr_output_current_reference_luminance].
-			</description>
-		</method>
 		<method name="window_get_max_size" qualifiers="const">
 			<return type="Vector2i" />
 			<param index="0" name="window_id" type="int" default="0" />
@@ -2242,13 +2177,6 @@
 				[b]Note:[/b] This method is implemented on Android, Linux (X11/Wayland), macOS, and Windows.
 			</description>
 		</method>
-		<method name="window_get_output_max_linear_value" qualifiers="const">
-			<return type="float" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns the maximum value for linear color components that can be displayed for the window specified by [param window_id], regardless of SDR or HDR output. Returns [code]1.0[/code] if HDR is not enabled or not supported. When HDR output is enabled, this is calculated based on [method window_get_hdr_output_current_reference_luminance] and [method window_get_hdr_output_current_max_luminance]. This value is used by tonemapping and other [Environment] effects to ensure that bright colors are presented in the range that can be displayed by this window. Corresponds to [method Window.get_output_max_linear_value].
-			</description>
-		</method>
 		<method name="window_get_popup_safe_rect" qualifiers="const">
 			<return type="Rect2i" />
 			<param index="0" name="window" type="int" />
@@ -2314,27 +2242,6 @@
 				Returns [code]true[/code] if the window specified by [param window_id] is focused.
 			</description>
 		</method>
-		<method name="window_is_hdr_output_enabled" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns [code]true[/code] if HDR output is currently enabled for the window specified by [param window_id]. The returned value may change dynamically based on system settings, screen capabilities, and which screen the window is currently on.
-			</description>
-		</method>
-		<method name="window_is_hdr_output_requested" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns [code]true[/code] if HDR output is requested for the window specified by [param window_id]. Corresponds to [member Window.hdr_output_requested].
-			</description>
-		</method>
-		<method name="window_is_hdr_output_supported" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="window_id" type="int" default="0" />
-			<description>
-				Returns [code]true[/code] if the window specified by [param window_id] supports HDR output. This depends on the platform, screen capabilities, system settings, and the screen the window is currently on.
-			</description>
-		</method>
 		<method name="window_is_maximize_allowed" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="window_id" type="int" default="0" />
@@ -2370,14 +2277,6 @@
 				Makes the window specified by [param window_id] request attention, which is materialized by the window title and taskbar entry blinking until the window is focused. This usually has no visible effect if the window is currently focused. The exact behavior varies depending on the operating system.
 			</description>
 		</method>
-		<method name="window_request_hdr_output">
-			<return type="void" />
-			<param index="0" name="enable" type="bool" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				If [param enable] is [code]true[/code], HDR output is requested for the window specified by [param window_id]. The window will automatically switch between HDR and SDR if it is moved between screens, screen capabilities change, or system settings are modified. This will internally force [member Viewport.use_hdr_2d] to be enabled on the main [Viewport]. All other [SubViewport] of the [Window] must have their [member Viewport.use_hdr_2d] property enabled to produce HDR output. Corresponds to [member Window.hdr_output_requested].
-			</description>
-		</method>
 		<method name="window_set_color">
 			<return type="void" />
 			<param index="0" name="color" type="Color" />
@@ -2425,31 +2324,6 @@
 				Enables or disables the given window's given [param flag].
 			</description>
 		</method>
-		<method name="window_set_hdr_output_max_luminance" experimental="">
-			<return type="void" />
-			<param index="0" name="max_luminance" type="float" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Sets the maximum luminance in nits (cd/m²) for HDR output by the window specified by [param window_id]. If [param max_luminance] is negative, the window uses the screen's maximum luminance that is reported by the operating system. By default, this luminance is set to [code]-1.0[/code] for every window. Typically this property should be left at this default value, but may optionally be exposed through in-game settings to allow the player to correct an inaccurate maximum luminance reported by the operating system. See also [method window_get_hdr_output_current_max_luminance] and [method window_get_hdr_output_max_luminance].
-			</description>
-		</method>
-		<method name="window_set_hdr_output_reference_luminance">
-			<return type="void" />
-			<param index="0" name="reference_luminance" type="float" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Sets the reference white luminance in nits (cd/m²) for HDR output by the window specified by [param window_id]. If [param reference_luminance] is negative, the window automatically adjusts to the brightness set by the operating system. By default, this luminance is set to [code]-1.0[/code] for every window. Typically this property should be left at this default value, but may optionally be exposed as an "HDR Brightness" in-game setting to allow the player to adjust the brightness of their game, independently of their device settings. See also [method window_get_hdr_output_current_reference_luminance] and [method window_get_hdr_output_reference_luminance].
-			</description>
-		</method>
-		<method name="window_set_icon">
-			<return type="void" />
-			<param index="0" name="icon" type="Image" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Sets the window icon (usually displayed in the top-left corner) for the window specified by [param window_id].
-				[b]Note:[/b] This method is implemented on Linux and Windows.
-			</description>
-		</method>
 		<method name="window_set_ime_active">
 			<return type="void" />
 			<param index="0" name="active" type="bool" />
@@ -2593,27 +2467,6 @@
 				[b]Note:[/b] It's recommended to change this value using [member Window.size] instead.
 			</description>
 		</method>
-		<method name="window_set_taskbar_progress_state">
-			<return type="void" />
-			<param index="0" name="state" type="int" enum="DisplayServer.ProgressState" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Sets the type and state of the progress bar on the taskbar/dock icon of the window specified by [param window_id]. See [enum ProgressState] for possible values and how each mode behaves.
-				[b]Note:[/b] This method is implemented only on Windows and macOS.
-				[b]Note:[/b] On macOS, the progress bar is displayed only for the main window.
-			</description>
-		</method>
-		<method name="window_set_taskbar_progress_value">
-			<return type="void" />
-			<param index="0" name="value" type="float" />
-			<param index="1" name="window_id" type="int" default="0" />
-			<description>
-				Creates a progress bar on the taskbar/dock icon of the window specified by [param window_id] if it does not exist, sets the progress of the icon.
-				[param value] acts as a relative percentage value, ranges from [code]0.0[/code] (lowest) to [code]1.0[/code] (highest).
-				[b]Note:[/b] This method is implemented only on Windows and macOS.
-				[b]Note:[/b] On macOS, the progress bar is displayed only for the main window.
-			</description>
-		</method>
 		<method name="window_set_title">
 			<return type="void" />
 			<param index="0" name="title" type="String" />
@@ -2680,16 +2533,6 @@
 			</description>
 		</method>
 	</methods>
-	<signals>
-		<signal name="orientation_changed">
-			<param index="0" name="orientation" type="int" />
-			<description>
-				Emitted when the device orientation changes. [param orientation] is the new orientation.
-				Returns [code]1[/code] for portrait, [code]2[/code] for landscape, and [code]0[/code] if the orientation is undefined.
-				[b]Note:[/b] This method is implemented on Android and iOS.
-			</description>
-		</signal>
-	</signals>
 	<constants>
 		<constant name="FEATURE_GLOBAL_MENU" value="0" enum="Feature" deprecated="Use [NativeMenu] or [PopupMenu] instead.">
 			Display server supports global menu. This allows the application to display its menu items in the operating system's top bar. [b]macOS[/b]
@@ -2794,303 +2637,290 @@
 		<constant name="FEATURE_ACCESSIBILITY_SCREEN_READER" value="34" enum="Feature">
 			Display server supports interaction with screen reader or Braille display. [b]Linux (X11/Wayland), macOS, Windows[/b]
 		</constant>
-		<constant name="FEATURE_HDR_OUTPUT" value="35" enum="Feature">
-			Display server supports HDR output. [b]Linux (Wayland), macOS, iOS, visionOS, Windows[/b]
-		</constant>
-		<constant name="FEATURE_PIP_MODE" value="36" enum="Feature">
-			Display server supports putting the application in picture-in-picture mode. [b]Android[/b]
-		</constant>
-		<constant name="ROLE_UNKNOWN" value="0" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_UNKNOWN" value="0" enum="AccessibilityRole">
 			Unknown or custom role.
 		</constant>
-		<constant name="ROLE_DEFAULT_BUTTON" value="1" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_DEFAULT_BUTTON" value="1" enum="AccessibilityRole">
 			Default dialog button element.
 		</constant>
-		<constant name="ROLE_AUDIO" value="2" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_AUDIO" value="2" enum="AccessibilityRole">
 			Audio player element.
 		</constant>
-		<constant name="ROLE_VIDEO" value="3" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_VIDEO" value="3" enum="AccessibilityRole">
 			Video player element.
 		</constant>
-		<constant name="ROLE_STATIC_TEXT" value="4" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_STATIC_TEXT" value="4" enum="AccessibilityRole">
 			Non-editable text label.
 		</constant>
-		<constant name="ROLE_CONTAINER" value="5" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_CONTAINER" value="5" enum="AccessibilityRole">
 			Container element. Elements with this role are used for internal structure and ignored by screen readers.
 		</constant>
-		<constant name="ROLE_PANEL" value="6" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_PANEL" value="6" enum="AccessibilityRole">
 			Panel container element.
 		</constant>
-		<constant name="ROLE_BUTTON" value="7" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_BUTTON" value="7" enum="AccessibilityRole">
 			Button element.
 		</constant>
-		<constant name="ROLE_LINK" value="8" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_LINK" value="8" enum="AccessibilityRole">
 			Link element.
 		</constant>
-		<constant name="ROLE_CHECK_BOX" value="9" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_CHECK_BOX" value="9" enum="AccessibilityRole">
 			Check box element.
 		</constant>
-		<constant name="ROLE_RADIO_BUTTON" value="10" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_RADIO_BUTTON" value="10" enum="AccessibilityRole">
 			Radio button element.
 		</constant>
-		<constant name="ROLE_CHECK_BUTTON" value="11" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_CHECK_BUTTON" value="11" enum="AccessibilityRole">
 			Check button element.
 		</constant>
-		<constant name="ROLE_SCROLL_BAR" value="12" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_SCROLL_BAR" value="12" enum="AccessibilityRole">
 			Scroll bar element.
 		</constant>
-		<constant name="ROLE_SCROLL_VIEW" value="13" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_SCROLL_VIEW" value="13" enum="AccessibilityRole">
 			Scroll container element.
 		</constant>
-		<constant name="ROLE_SPLITTER" value="14" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_SPLITTER" value="14" enum="AccessibilityRole">
 			Container splitter handle element.
 		</constant>
-		<constant name="ROLE_SLIDER" value="15" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_SLIDER" value="15" enum="AccessibilityRole">
 			Slider element.
 		</constant>
-		<constant name="ROLE_SPIN_BUTTON" value="16" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_SPIN_BUTTON" value="16" enum="AccessibilityRole">
 			Spin box element.
 		</constant>
-		<constant name="ROLE_PROGRESS_INDICATOR" value="17" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_PROGRESS_INDICATOR" value="17" enum="AccessibilityRole">
 			Progress indicator element.
 		</constant>
-		<constant name="ROLE_TEXT_FIELD" value="18" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TEXT_FIELD" value="18" enum="AccessibilityRole">
 			Editable text field element.
 		</constant>
-		<constant name="ROLE_MULTILINE_TEXT_FIELD" value="19" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MULTILINE_TEXT_FIELD" value="19" enum="AccessibilityRole">
 			Multiline editable text field element.
 		</constant>
-		<constant name="ROLE_COLOR_PICKER" value="20" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_COLOR_PICKER" value="20" enum="AccessibilityRole">
 			Color picker element.
 		</constant>
-		<constant name="ROLE_TABLE" value="21" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TABLE" value="21" enum="AccessibilityRole">
 			Table element.
 		</constant>
-		<constant name="ROLE_CELL" value="22" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_CELL" value="22" enum="AccessibilityRole">
 			Table/tree cell element.
 		</constant>
-		<constant name="ROLE_ROW" value="23" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_ROW" value="23" enum="AccessibilityRole">
 			Table/tree row element.
 		</constant>
-		<constant name="ROLE_ROW_GROUP" value="24" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_ROW_GROUP" value="24" enum="AccessibilityRole">
 			Table/tree row group element.
 		</constant>
-		<constant name="ROLE_ROW_HEADER" value="25" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_ROW_HEADER" value="25" enum="AccessibilityRole">
 			Table/tree row header element.
 		</constant>
-		<constant name="ROLE_COLUMN_HEADER" value="26" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_COLUMN_HEADER" value="26" enum="AccessibilityRole">
 			Table/tree column header element.
 		</constant>
-		<constant name="ROLE_TREE" value="27" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TREE" value="27" enum="AccessibilityRole">
 			Tree view element.
 		</constant>
-		<constant name="ROLE_TREE_ITEM" value="28" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TREE_ITEM" value="28" enum="AccessibilityRole">
 			Tree view item element.
 		</constant>
-		<constant name="ROLE_LIST" value="29" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_LIST" value="29" enum="AccessibilityRole">
 			List element.
 		</constant>
-		<constant name="ROLE_LIST_ITEM" value="30" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_LIST_ITEM" value="30" enum="AccessibilityRole">
 			List item element.
 		</constant>
-		<constant name="ROLE_LIST_BOX" value="31" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_LIST_BOX" value="31" enum="AccessibilityRole">
 			List view element.
 		</constant>
-		<constant name="ROLE_LIST_BOX_OPTION" value="32" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_LIST_BOX_OPTION" value="32" enum="AccessibilityRole">
 			List view item element.
 		</constant>
-		<constant name="ROLE_TAB_BAR" value="33" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TAB_BAR" value="33" enum="AccessibilityRole">
 			Tab bar element.
 		</constant>
-		<constant name="ROLE_TAB" value="34" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TAB" value="34" enum="AccessibilityRole">
 			Tab bar item element.
 		</constant>
-		<constant name="ROLE_TAB_PANEL" value="35" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TAB_PANEL" value="35" enum="AccessibilityRole">
 			Tab panel element.
 		</constant>
-		<constant name="ROLE_MENU_BAR" value="36" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MENU_BAR" value="36" enum="AccessibilityRole">
 			Menu bar element.
 		</constant>
-		<constant name="ROLE_MENU" value="37" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MENU" value="37" enum="AccessibilityRole">
 			Popup menu element.
 		</constant>
-		<constant name="ROLE_MENU_ITEM" value="38" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MENU_ITEM" value="38" enum="AccessibilityRole">
 			Popup menu item element.
 		</constant>
-		<constant name="ROLE_MENU_ITEM_CHECK_BOX" value="39" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MENU_ITEM_CHECK_BOX" value="39" enum="AccessibilityRole">
 			Popup menu check button item element.
 		</constant>
-		<constant name="ROLE_MENU_ITEM_RADIO" value="40" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_MENU_ITEM_RADIO" value="40" enum="AccessibilityRole">
 			Popup menu radio button item element.
 		</constant>
-		<constant name="ROLE_IMAGE" value="41" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_IMAGE" value="41" enum="AccessibilityRole">
 			Image element.
 		</constant>
-		<constant name="ROLE_WINDOW" value="42" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_WINDOW" value="42" enum="AccessibilityRole">
 			Window element.
 		</constant>
-		<constant name="ROLE_TITLE_BAR" value="43" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TITLE_BAR" value="43" enum="AccessibilityRole">
 			Embedded window title bar element.
 		</constant>
-		<constant name="ROLE_DIALOG" value="44" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_DIALOG" value="44" enum="AccessibilityRole">
 			Dialog window element.
 		</constant>
-		<constant name="ROLE_TOOLTIP" value="45" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ROLE_TOOLTIP" value="45" enum="AccessibilityRole">
 			Tooltip element.
 		</constant>
-		<constant name="ROLE_REGION" value="46" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
-			Region/landmark element. Screen readers can navigate between regions using landmark navigation.
-		</constant>
-		<constant name="ROLE_TEXT_RUN" value="47" enum="AccessibilityRole" deprecated="Use [AccessibilityServer] instead.">
-			Unifor text run.
-			Note: This role is used for internal text elements, and should not be assigned to nodes.
-		</constant>
-		<constant name="POPUP_MENU" value="0" enum="AccessibilityPopupType" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="POPUP_MENU" value="0" enum="AccessibilityPopupType">
 			Popup menu.
 		</constant>
-		<constant name="POPUP_LIST" value="1" enum="AccessibilityPopupType" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="POPUP_LIST" value="1" enum="AccessibilityPopupType">
 			Popup list.
 		</constant>
-		<constant name="POPUP_TREE" value="2" enum="AccessibilityPopupType" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="POPUP_TREE" value="2" enum="AccessibilityPopupType">
 			Popup tree view.
 		</constant>
-		<constant name="POPUP_DIALOG" value="3" enum="AccessibilityPopupType" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="POPUP_DIALOG" value="3" enum="AccessibilityPopupType">
 			Popup dialog.
 		</constant>
-		<constant name="FLAG_HIDDEN" value="0" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_HIDDEN" value="0" enum="AccessibilityFlags">
 			Element is hidden for accessibility tools.
 		</constant>
-		<constant name="FLAG_MULTISELECTABLE" value="1" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_MULTISELECTABLE" value="1" enum="AccessibilityFlags">
 			Element supports multiple item selection.
 		</constant>
-		<constant name="FLAG_REQUIRED" value="2" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_REQUIRED" value="2" enum="AccessibilityFlags">
 			Element require user input.
 		</constant>
-		<constant name="FLAG_VISITED" value="3" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_VISITED" value="3" enum="AccessibilityFlags">
 			Element is a visited link.
 		</constant>
-		<constant name="FLAG_BUSY" value="4" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_BUSY" value="4" enum="AccessibilityFlags">
 			Element content is not ready (e.g. loading).
 		</constant>
-		<constant name="FLAG_MODAL" value="5" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_MODAL" value="5" enum="AccessibilityFlags">
 			Element is modal window.
 		</constant>
-		<constant name="FLAG_TOUCH_PASSTHROUGH" value="6" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_TOUCH_PASSTHROUGH" value="6" enum="AccessibilityFlags">
 			Element allows touches to be passed through when a screen reader is in touch exploration mode.
 		</constant>
-		<constant name="FLAG_READONLY" value="7" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_READONLY" value="7" enum="AccessibilityFlags">
 			Element is text field with selectable but read-only text.
 		</constant>
-		<constant name="FLAG_DISABLED" value="8" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_DISABLED" value="8" enum="AccessibilityFlags">
 			Element is disabled.
 		</constant>
-		<constant name="FLAG_CLIPS_CHILDREN" value="9" enum="AccessibilityFlags" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="FLAG_CLIPS_CHILDREN" value="9" enum="AccessibilityFlags">
 			Element clips children.
 		</constant>
-		<constant name="ACTION_CLICK" value="0" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_CLICK" value="0" enum="AccessibilityAction">
 			Single click action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_FOCUS" value="1" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_FOCUS" value="1" enum="AccessibilityAction">
 			Focus action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_BLUR" value="2" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_BLUR" value="2" enum="AccessibilityAction">
 			Blur action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_COLLAPSE" value="3" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_COLLAPSE" value="3" enum="AccessibilityAction">
 			Collapse action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_EXPAND" value="4" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_EXPAND" value="4" enum="AccessibilityAction">
 			Expand action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_DECREMENT" value="5" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_DECREMENT" value="5" enum="AccessibilityAction">
 			Decrement action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_INCREMENT" value="6" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_INCREMENT" value="6" enum="AccessibilityAction">
 			Increment action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_HIDE_TOOLTIP" value="7" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_HIDE_TOOLTIP" value="7" enum="AccessibilityAction">
 			Hide tooltip action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_SHOW_TOOLTIP" value="8" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SHOW_TOOLTIP" value="8" enum="AccessibilityAction">
 			Show tooltip action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_SET_TEXT_SELECTION" value="9" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SET_TEXT_SELECTION" value="9" enum="AccessibilityAction">
 			Set text selection action, callback argument is set to [Dictionary] with the following keys:
 			- [code]"start_element"[/code] accessibility element of the selection start.
 			- [code]"start_char"[/code] character offset relative to the accessibility element of the selection start.
 			- [code]"end_element"[/code] accessibility element of the selection end.
 			- [code]"end_char"[/code] character offset relative to the accessibility element of the selection end.
 		</constant>
-		<constant name="ACTION_REPLACE_SELECTED_TEXT" value="10" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_REPLACE_SELECTED_TEXT" value="10" enum="AccessibilityAction">
 			Replace text action, callback argument is set to [String] with the replacement text.
 		</constant>
-		<constant name="ACTION_SCROLL_BACKWARD" value="11" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_BACKWARD" value="11" enum="AccessibilityAction">
 			Scroll backward action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_SCROLL_DOWN" value="12" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_DOWN" value="12" enum="AccessibilityAction">
 			Scroll down action, callback argument is set to [enum AccessibilityScrollUnit].
 		</constant>
-		<constant name="ACTION_SCROLL_FORWARD" value="13" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_FORWARD" value="13" enum="AccessibilityAction">
 			Scroll forward action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_SCROLL_LEFT" value="14" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_LEFT" value="14" enum="AccessibilityAction">
 			Scroll left action, callback argument is set to [enum AccessibilityScrollUnit].
 		</constant>
-		<constant name="ACTION_SCROLL_RIGHT" value="15" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_RIGHT" value="15" enum="AccessibilityAction">
 			Scroll right action, callback argument is set to [enum AccessibilityScrollUnit].
 		</constant>
-		<constant name="ACTION_SCROLL_UP" value="16" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_UP" value="16" enum="AccessibilityAction">
 			Scroll up action, callback argument is set to [enum AccessibilityScrollUnit].
 		</constant>
-		<constant name="ACTION_SCROLL_INTO_VIEW" value="17" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_INTO_VIEW" value="17" enum="AccessibilityAction">
 			Scroll into view action, callback argument is set to [enum AccessibilityScrollHint].
 		</constant>
-		<constant name="ACTION_SCROLL_TO_POINT" value="18" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SCROLL_TO_POINT" value="18" enum="AccessibilityAction">
 			Scroll to point action, callback argument is set to [Vector2] with the relative point coordinates.
 		</constant>
-		<constant name="ACTION_SET_SCROLL_OFFSET" value="19" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SET_SCROLL_OFFSET" value="19" enum="AccessibilityAction">
 			Set scroll offset action, callback argument is set to [Vector2] with the scroll offset.
 		</constant>
-		<constant name="ACTION_SET_VALUE" value="20" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SET_VALUE" value="20" enum="AccessibilityAction">
 			Set value action, callback argument is set to [String] or number with the new value.
 		</constant>
-		<constant name="ACTION_SHOW_CONTEXT_MENU" value="21" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_SHOW_CONTEXT_MENU" value="21" enum="AccessibilityAction">
 			Show context menu action, callback argument is not set.
 		</constant>
-		<constant name="ACTION_CUSTOM" value="22" enum="AccessibilityAction" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="ACTION_CUSTOM" value="22" enum="AccessibilityAction">
 			Custom action, callback argument is set to the integer action ID.
 		</constant>
-		<constant name="LIVE_OFF" value="0" enum="AccessibilityLiveMode" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="LIVE_OFF" value="0" enum="AccessibilityLiveMode">
 			Indicates that updates to the live region should not be presented.
 		</constant>
-		<constant name="LIVE_POLITE" value="1" enum="AccessibilityLiveMode" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="LIVE_POLITE" value="1" enum="AccessibilityLiveMode">
 			Indicates that updates to the live region should be presented at the next opportunity (for example at the end of speaking the current sentence).
 		</constant>
-		<constant name="LIVE_ASSERTIVE" value="2" enum="AccessibilityLiveMode" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="LIVE_ASSERTIVE" value="2" enum="AccessibilityLiveMode">
 			Indicates that updates to the live region have the highest priority and should be presented immediately.
 		</constant>
-		<constant name="SCROLL_UNIT_ITEM" value="0" enum="AccessibilityScrollUnit" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_UNIT_ITEM" value="0" enum="AccessibilityScrollUnit">
 			The amount by which to scroll. A single item of a list, line of text.
 		</constant>
-		<constant name="SCROLL_UNIT_PAGE" value="1" enum="AccessibilityScrollUnit" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_UNIT_PAGE" value="1" enum="AccessibilityScrollUnit">
 			The amount by which to scroll. A single page.
 		</constant>
-		<constant name="SCROLL_HINT_TOP_LEFT" value="0" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_TOP_LEFT" value="0" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Top-left edge of the scroll container.
 		</constant>
-		<constant name="SCROLL_HINT_BOTTOM_RIGHT" value="1" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_BOTTOM_RIGHT" value="1" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Bottom-right edge of the scroll container.
 		</constant>
-		<constant name="SCROLL_HINT_TOP_EDGE" value="2" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_TOP_EDGE" value="2" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Top edge of the scroll container.
 		</constant>
-		<constant name="SCROLL_HINT_BOTTOM_EDGE" value="3" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_BOTTOM_EDGE" value="3" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Bottom edge of the scroll container.
 		</constant>
-		<constant name="SCROLL_HINT_LEFT_EDGE" value="4" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_LEFT_EDGE" value="4" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Left edge of the scroll container.
 		</constant>
-		<constant name="SCROLL_HINT_RIGHT_EDGE" value="5" enum="AccessibilityScrollHint" deprecated="Use [AccessibilityServer] instead.">
+		<constant name="SCROLL_HINT_RIGHT_EDGE" value="5" enum="AccessibilityScrollHint">
 			A preferred position for the node scrolled into view. Right edge of the scroll container.
 		</constant>
 		<constant name="MOUSE_MODE_VISIBLE" value="0" enum="MouseMode">
@@ -3282,24 +3112,6 @@
 			[b]On Linux (Wayland):[/b] Equivalent to [constant WINDOW_MODE_FULLSCREEN].
 			[b]Note:[/b] Regardless of the platform, enabling full screen will change the window size to match the monitor's size. Therefore, make sure your project supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]multiple resolutions[/url] when enabling full screen mode.
 		</constant>
-		<constant name="PROGRESS_STATE_NOPROGRESS" value="0" enum="ProgressState">
-			Stops displaying progress and returns the button to its normal state.
-		</constant>
-		<constant name="PROGRESS_STATE_INDETERMINATE" value="1" enum="ProgressState">
-			The progress indicator shows an indeterminate progress.
-			On Windows, the progress indicator does not grow in size, but cycles repeatedly along the length of the taskbar button by default.
-		</constant>
-		<constant name="PROGRESS_STATE_NORMAL" value="2" enum="ProgressState">
-			The progress indicator shows progress normally.
-		</constant>
-		<constant name="PROGRESS_STATE_ERROR" value="3" enum="ProgressState">
-			The progress indicator shows that an error has occurred.
-			On Windows, the progress indicator turns red by default to show that an error has occurred in one of the windows that is broadcasting progress.
-		</constant>
-		<constant name="PROGRESS_STATE_PAUSED" value="4" enum="ProgressState">
-			The progress indicator shows it was paused.
-			On Windows, the progress indicator turns yellow by default to show that progress is currently stopped in one of the windows but can be resumed by the user.
-		</constant>
 		<constant name="WINDOW_FLAG_RESIZE_DISABLED" value="0" enum="WindowFlags">
 			The window can't be resized by dragging its resize grip. It's still possible to resize the window using [method window_set_size]. This flag is ignored for full screen windows.
 		</constant>
@@ -3384,10 +3196,6 @@
 			Sent when the window has been forcibly closed by the display server. The window will immediately hide and clean any internal rendering references.
 			[b]Note:[/b] This flag is implemented only on Linux (Wayland).
 		</constant>
-		<constant name="WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED" value="9" enum="WindowEvent">
-			Sent when the output max linear value returned by [method Window.get_output_max_linear_value] has changed.
-			This occurs when HDR output is enabled or disabled and when any HDR output luminance values of the window have changed, such as when the player adjusts their screen brightness setting or moves the window to a different screen.
-		</constant>
 		<constant name="WINDOW_EDGE_TOP_LEFT" value="0" enum="WindowResizeEdge">
 			Top-left edge of a window.
 		</constant>
@@ -3467,14 +3275,6 @@
 			- macOS: [code]EGLConfig[/code] for the window (ANGLE).
 			- Linux (Wayland): [code]EGLConfig[/code] for the window.
 		</constant>
-		<constant name="GLX_VISUALID" value="6" enum="HandleType">
-			The GLX [code]VisualID[/code] for the window.
-			[b]Note:[/b] Only available on Linux when using X11.
-		</constant>
-		<constant name="GLX_FBCONFIG" value="7" enum="HandleType">
-			The [code]GLXFBConfig[/code] for the window.
-			[b]Note:[/b] Only available on Linux when using X11.
-		</constant>
 		<constant name="TTS_UTTERANCE_STARTED" value="0" enum="TTSUtteranceEvent">
 			Utterance has begun to be spoken.
 		</constant>
diff --git a/engine/doc/classes/DrawableTexture2D.xml b/engine/doc/classes/DrawableTexture2D.xml
deleted file mode 100644
index 6d3cfb5c..00000000
--- a/engine/doc/classes/DrawableTexture2D.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="DrawableTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		A 2D texture that supports drawing to itself via Blit calls.
-	</brief_description>
-	<description>
-		A 2D texture that can be modified via blit calls, copying from a target texture to itself. Primarily intended to be managed in code, a user must call [method setup] to initialize the state before drawing. Each [method blit_rect] call takes at least a rectangle, the area to draw to, and another texture, what to be drawn. The draw calls use a Texture_Blit Shader to process and calculate the result, pixel by pixel. Users can supply their own ShaderMaterial with custom Texture_Blit shaders for more complex behaviors.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="blit_rect" experimental="This function and its parameters are likely to change in the 4.7 Dev Cycle">
-			<return type="void" />
-			<param index="0" name="rect" type="Rect2i" />
-			<param index="1" name="source" type="Texture2D" />
-			<param index="2" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<param index="3" name="mipmap" type="int" default="0" />
-			<param index="4" name="material" type="Material" default="null" />
-			<description>
-				Draws to given [param rect] on this texture by copying from the given [param source]. A [param modulate] color can be passed in for the shader to use, but defaults to White. The [param mipmap] value can specify a draw to a lower mipmap level. The [param material] parameter can take a ShaderMaterial with a TextureBlit Shader for custom drawing behavior.
-			</description>
-		</method>
-		<method name="blit_rect_multi" experimental="This function and its parameters are likely to change in the 4.7 Dev Cycle">
-			<return type="void" />
-			<param index="0" name="rect" type="Rect2i" />
-			<param index="1" name="sources" type="Texture2D[]" />
-			<param index="2" name="extra_targets" type="DrawableTexture2D[]" />
-			<param index="3" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<param index="4" name="mipmap" type="int" default="0" />
-			<param index="5" name="material" type="Material" default="null" />
-			<description>
-				Draws to the given [param rect] on this texture, as well as on up to 3 DrawableTexture [param extra_targets]. All [param extra_targets] must be the same size and DrawableFormat as the original target, otherwise the Shader may fail. Expects up to 4 Texture [param sources], but will replace missing [param sources] with default Black Textures.
-			</description>
-		</method>
-		<method name="generate_mipmaps">
-			<return type="void" />
-			<description>
-				Re-calculates the mipmaps for this texture on demand.
-			</description>
-		</method>
-		<method name="get_use_mipmaps" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if mipmaps are set to be used on this DrawableTexture.
-			</description>
-		</method>
-		<method name="set_format">
-			<return type="void" />
-			<param index="0" name="format" type="int" enum="DrawableTexture2D.DrawableFormat" />
-			<description>
-				Sets the format of this DrawableTexture.
-			</description>
-		</method>
-		<method name="set_height">
-			<return type="void" />
-			<param index="0" name="height" type="int" />
-			<description>
-				Sets the height of this DrawableTexture.
-			</description>
-		</method>
-		<method name="set_use_mipmaps">
-			<return type="void" />
-			<param index="0" name="mipmaps" type="bool" />
-			<description>
-				Sets if mipmaps should be used on this DrawableTexture.
-			</description>
-		</method>
-		<method name="set_width">
-			<return type="void" />
-			<param index="0" name="width" type="int" />
-			<description>
-				Sets the width of this DrawableTexture.
-			</description>
-		</method>
-		<method name="setup" experimental="This function and its parameters are likely to change in the 4.7 Dev Cycle">
-			<return type="void" />
-			<param index="0" name="width" type="int" />
-			<param index="1" name="height" type="int" />
-			<param index="2" name="format" type="int" enum="DrawableTexture2D.DrawableFormat" />
-			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<param index="4" name="use_mipmaps" type="bool" default="false" />
-			<description>
-				Initializes the DrawableTexture to a White texture of the given [param width], [param height], and [param format].
-			</description>
-		</method>
-	</methods>
-	<members>
-		<member name="resource_local_to_scene" type="bool" setter="set_local_to_scene" getter="is_local_to_scene" overrides="Resource" default="false" />
-	</members>
-	<constants>
-		<constant name="DRAWABLE_FORMAT_RGBA8" value="0" enum="DrawableFormat">
-			OpenGL texture format RGBA with four components, each with a bitdepth of 8.
-		</constant>
-		<constant name="DRAWABLE_FORMAT_RGBA8_SRGB" value="1" enum="DrawableFormat">
-			OpenGL texture format RGBA with four components, each with a bitdepth of 8.
-			When drawn to, an sRGB to linear color space conversion is performed.
-		</constant>
-		<constant name="DRAWABLE_FORMAT_RGBAH" value="2" enum="DrawableFormat">
-			OpenGL texture format GL_RGBA16F where there are four components, each a 16-bit "half-precision" floating-point value.
-		</constant>
-		<constant name="DRAWABLE_FORMAT_RGBAF" value="3" enum="DrawableFormat">
-			OpenGL texture format GL_RGBA32F where there are four components, each a 32-bit floating-point value.
-		</constant>
-	</constants>
-</class>
diff --git a/engine/doc/classes/EditorCommandPalette.xml b/engine/doc/classes/EditorCommandPalette.xml
index 6f7d5db1..e6af82b1 100644
--- a/engine/doc/classes/EditorCommandPalette.xml
+++ b/engine/doc/classes/EditorCommandPalette.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorCommandPalette" inherits="ConfirmationDialog" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorCommandPalette" inherits="ConfirmationDialog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's command palette.
 	</brief_description>
@@ -48,4 +48,7 @@
 			</description>
 		</method>
 	</methods>
+	<members>
+		<member name="dialog_hide_on_ok" type="bool" setter="set_hide_on_ok" getter="get_hide_on_ok" overrides="AcceptDialog" default="false" />
+	</members>
 </class>
diff --git a/engine/doc/classes/EditorContextMenuPlugin.xml b/engine/doc/classes/EditorContextMenuPlugin.xml
index c85fde3d..07d7a8e5 100644
--- a/engine/doc/classes/EditorContextMenuPlugin.xml
+++ b/engine/doc/classes/EditorContextMenuPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorContextMenuPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorContextMenuPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plugin for adding custom context menus in the editor.
 	</brief_description>
diff --git a/engine/doc/classes/EditorDebuggerPlugin.xml b/engine/doc/classes/EditorDebuggerPlugin.xml
index 2c23a20e..0b1640c9 100644
--- a/engine/doc/classes/EditorDebuggerPlugin.xml
+++ b/engine/doc/classes/EditorDebuggerPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorDebuggerPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorDebuggerPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base class to implement debugger plugins.
 	</brief_description>
diff --git a/engine/doc/classes/EditorDebuggerSession.xml b/engine/doc/classes/EditorDebuggerSession.xml
index e96ce6ed..4bd52f9d 100644
--- a/engine/doc/classes/EditorDebuggerSession.xml
+++ b/engine/doc/classes/EditorDebuggerSession.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorDebuggerSession" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorDebuggerSession" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class to interact with the editor debugger.
 	</brief_description>
diff --git a/engine/doc/classes/EditorDock.xml b/engine/doc/classes/EditorDock.xml
index 88dedff9..2afdd707 100644
--- a/engine/doc/classes/EditorDock.xml
+++ b/engine/doc/classes/EditorDock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorDock" inherits="MarginContainer" api_type="editor" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorDock" inherits="MarginContainer" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Dockable container for the editor.
 	</brief_description>
@@ -99,7 +99,7 @@
 			The shortcut used to open the dock.
 		</member>
 		<member name="force_show_icon" type="bool" setter="set_force_show_icon" getter="get_force_show_icon" default="false">
-			If [code]true[/code], the dock will always display an icon, regardless of [member EditorSettings.interface/editor/docks/dock_tab_style] or [member EditorSettings.interface/editor/docks/bottom_dock_tab_style].
+			If [code]true[/code], the dock will always display an icon, regardless of [member EditorSettings.interface/editor/dock_tab_style] or [member EditorSettings.interface/editor/bottom_dock_tab_style].
 		</member>
 		<member name="global" type="bool" setter="set_global" getter="is_global" default="true">
 			If [code]true[/code], the dock appears in the [b]Editor &gt; Editor Docks[/b] menu and can be closed. Non-global docks can still be closed using [method close] or when [member closable] is [code]true[/code].
@@ -126,18 +126,13 @@
 				Emitted when the dock is closed with the Close button in the context popup, before it's removed from its parent. See [member closable].
 			</description>
 		</signal>
-		<signal name="opened">
-			<description>
-				Emitted when the dock is opened via the Editor &gt; Editor Docks menu, before it's made visible.
-			</description>
-		</signal>
 	</signals>
 	<constants>
 		<constant name="DOCK_LAYOUT_VERTICAL" value="1" enum="DockLayout" is_bitfield="true">
 			Allows placing the dock in the vertical dock slots on either side of the editor.
 		</constant>
 		<constant name="DOCK_LAYOUT_HORIZONTAL" value="2" enum="DockLayout" is_bitfield="true">
-			Allows placing the dock in the horizontal dock slots at the bottom.
+			Allows placing the dock in the editor's bottom panel.
 		</constant>
 		<constant name="DOCK_LAYOUT_FLOATING" value="4" enum="DockLayout" is_bitfield="true">
 			Allows making the dock floating (opened as a separate window).
@@ -175,13 +170,7 @@
 		<constant name="DOCK_SLOT_BOTTOM" value="8" enum="DockSlot">
 			Bottom panel.
 		</constant>
-		<constant name="DOCK_SLOT_BOTTOM_L" value="9" enum="DockSlot">
-			Dock slot at the bottom, below bottom panel, on the left side.
-		</constant>
-		<constant name="DOCK_SLOT_BOTTOM_R" value="10" enum="DockSlot">
-			Dock slot at the bottom, below bottom panel, on the right side.
-		</constant>
-		<constant name="DOCK_SLOT_MAX" value="11" enum="DockSlot">
+		<constant name="DOCK_SLOT_MAX" value="9" enum="DockSlot">
 			Represents the size of the [enum DockSlot] enum.
 		</constant>
 	</constants>
diff --git a/engine/doc/classes/EditorExportPlatform.xml b/engine/doc/classes/EditorExportPlatform.xml
index 07b18cf1..c4f044d6 100644
--- a/engine/doc/classes/EditorExportPlatform.xml
+++ b/engine/doc/classes/EditorExportPlatform.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatform" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatform" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Identifies a supported export platform, and internally provides the functionality of exporting to that platform.
 	</brief_description>
diff --git a/engine/doc/classes/EditorExportPlatformAppleEmbedded.xml b/engine/doc/classes/EditorExportPlatformAppleEmbedded.xml
index 507302d2..790ef3a8 100644
--- a/engine/doc/classes/EditorExportPlatformAppleEmbedded.xml
+++ b/engine/doc/classes/EditorExportPlatformAppleEmbedded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformAppleEmbedded" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformAppleEmbedded" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for the Apple embedded platform exporters (iOS and visionOS).
 	</brief_description>
diff --git a/engine/doc/classes/EditorExportPlatformExtension.xml b/engine/doc/classes/EditorExportPlatformExtension.xml
index 4107a325..33f67ce0 100644
--- a/engine/doc/classes/EditorExportPlatformExtension.xml
+++ b/engine/doc/classes/EditorExportPlatformExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformExtension" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformExtension" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for custom [EditorExportPlatform] implementations (plugins).
 	</brief_description>
diff --git a/engine/doc/classes/EditorExportPlatformPC.xml b/engine/doc/classes/EditorExportPlatformPC.xml
index 5722aa9f..07e46c85 100644
--- a/engine/doc/classes/EditorExportPlatformPC.xml
+++ b/engine/doc/classes/EditorExportPlatformPC.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformPC" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformPC" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for the desktop platform exporter (Windows and Linux/BSD).
 	</brief_description>
diff --git a/engine/doc/classes/EditorExportPlugin.xml b/engine/doc/classes/EditorExportPlugin.xml
index 5eccda57..5de1b5f6 100644
--- a/engine/doc/classes/EditorExportPlugin.xml
+++ b/engine/doc/classes/EditorExportPlugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A script that is executed when exporting the project.
 	</brief_description>
 	<description>
-		[EditorExportPlugin]s are automatically invoked whenever the user exports the project. They can be used to modify scenes and resources during project export based on what [url=$DOCS_URL/tutorials/export/feature_tags.html]Feature Tags[/url] are set. For each plugin, [method _export_begin] is called at the beginning of the export process and then [method _export_file] is called for each exported file.
-		Register a [EditorExportPlugin] by creating a new [EditorPlugin] and calling its [method EditorPlugin.add_export_plugin] method.
+		[EditorExportPlugin]s are automatically invoked whenever the user exports the project. Their most common use is to determine what files are being included in the exported project. For each plugin, [method _export_begin] is called at the beginning of the export process and then [method _export_file] is called for each exported file.
+		To use [EditorExportPlugin], register it using the [method EditorPlugin.add_export_plugin] method first.
 	</description>
 	<tutorials>
 		<link title="Export Android plugins">$DOCS_URL/tutorials/platform/android/android_plugin.html</link>
@@ -54,7 +54,6 @@
 			<description>
 				Customize a scene. If changes are made to it, return the same or a new scene. Otherwise, return [code]null[/code]. If a new scene is returned, it is up to you to dispose of the old one.
 				Implementing this method is required if [method _begin_customize_scenes] returns [code]true[/code].
-				[b]Note:[/b] To change a variable in your scene, use the [code]@export[/code] annotation when declaring it.
 			</description>
 		</method>
 		<method name="_end_customize_resources" qualifiers="virtual">
@@ -69,15 +68,6 @@
 				This is called when the customization process for scenes ends.
 			</description>
 		</method>
-		<method name="_end_generate_apple_embedded_project" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="path" type="String" />
-			<param index="1" name="will_build_archive" type="bool" />
-			<description>
-				This is called after Xcode project generation, but before it is built.
-				[b]Note:[/b] Only supported on iOS and visionOS.
-			</description>
-		</method>
 		<method name="_export_begin" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="features" type="PackedStringArray" />
@@ -167,7 +157,6 @@
 			<description>
 				Return a hash based on the configuration passed (for both scenes and resources). This helps keep separate caches for separate export configurations.
 				Implementing this method is required if [method _begin_customize_resources] returns [code]true[/code].
-				[b]Note:[/b] [method _customize_resource] and [method _customize_scene] will not be called when the [EditorExportPlugin] script is modified unless this hash changes too.
 			</description>
 		</method>
 		<method name="_get_export_features" qualifiers="virtual const">
diff --git a/engine/doc/classes/EditorExportPreset.xml b/engine/doc/classes/EditorExportPreset.xml
index 15cd4f6d..c2e9c293 100644
--- a/engine/doc/classes/EditorExportPreset.xml
+++ b/engine/doc/classes/EditorExportPreset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPreset" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPreset" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Export preset configuration.
 	</brief_description>
diff --git a/engine/doc/classes/EditorFeatureProfile.xml b/engine/doc/classes/EditorFeatureProfile.xml
index 4a807d34..33d9d4cf 100644
--- a/engine/doc/classes/EditorFeatureProfile.xml
+++ b/engine/doc/classes/EditorFeatureProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorFeatureProfile" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorFeatureProfile" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An editor feature profile which can be used to disable specific features.
 	</brief_description>
diff --git a/engine/doc/classes/EditorFileDialog.xml b/engine/doc/classes/EditorFileDialog.xml
index 6bd03b37..713044e9 100644
--- a/engine/doc/classes/EditorFileDialog.xml
+++ b/engine/doc/classes/EditorFileDialog.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorFileDialog" inherits="FileDialog" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorFileDialog" inherits="FileDialog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modified version of [FileDialog] used by the editor.
 	</brief_description>
 	<description>
 		[EditorFileDialog] is a [FileDialog] tweaked to work in the editor. It automatically handles favorite and recent directory lists, and synchronizes some properties with their corresponding editor settings.
-		[EditorFileDialog] will automatically show a native dialog based on the [member EditorSettings.interface/editor/appearance/use_native_file_dialogs] editor setting and ignores [member FileDialog.use_native_dialog].
+		[EditorFileDialog] will automatically show a native dialog based on the [member EditorSettings.interface/editor/use_native_file_dialogs] editor setting and ignores [member FileDialog.use_native_dialog].
 		[b]Note:[/b] [EditorFileDialog] is invisible by default. To make it visible, call one of the [code]popup_*[/code] methods from [Window] on the node, such as [method Window.popup_centered_clamped].
-		[b]Note:[/b] On Linux and macOS, sandboxed apps always use native dialogs to access the host file system.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/EditorFileSystem.xml b/engine/doc/classes/EditorFileSystem.xml
index 9aa3109e..06fa4be2 100644
--- a/engine/doc/classes/EditorFileSystem.xml
+++ b/engine/doc/classes/EditorFileSystem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorFileSystem" inherits="Node" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorFileSystem" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Resource filesystem, as the editor sees it.
 	</brief_description>
@@ -36,12 +36,6 @@
 				Returns the scan progress for 0 to 1 if the FS is being scanned.
 			</description>
 		</method>
-		<method name="is_importing" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if resources are currently being imported.
-			</description>
-		</method>
 		<method name="is_scanning" qualifiers="const">
 			<return type="bool" />
 			<description>
diff --git a/engine/doc/classes/EditorFileSystemDirectory.xml b/engine/doc/classes/EditorFileSystemDirectory.xml
index 50d29aa9..e271b315 100644
--- a/engine/doc/classes/EditorFileSystemDirectory.xml
+++ b/engine/doc/classes/EditorFileSystemDirectory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorFileSystemDirectory" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorFileSystemDirectory" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A directory for the resource filesystem.
 	</brief_description>
diff --git a/engine/doc/classes/EditorFileSystemImportFormatSupportQuery.xml b/engine/doc/classes/EditorFileSystemImportFormatSupportQuery.xml
index 920f1b32..98f2cc5f 100644
--- a/engine/doc/classes/EditorFileSystemImportFormatSupportQuery.xml
+++ b/engine/doc/classes/EditorFileSystemImportFormatSupportQuery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorFileSystemImportFormatSupportQuery" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorFileSystemImportFormatSupportQuery" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Used to query and configure import format support.
 	</brief_description>
diff --git a/engine/doc/classes/EditorImportPlugin.xml b/engine/doc/classes/EditorImportPlugin.xml
index 472d2a50..7e1ca609 100644
--- a/engine/doc/classes/EditorImportPlugin.xml
+++ b/engine/doc/classes/EditorImportPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorImportPlugin" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorImportPlugin" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Registers a custom resource importer in the editor. Use the class to parse any file and import it as a new resource type.
 	</brief_description>
diff --git a/engine/doc/classes/EditorInspector.xml b/engine/doc/classes/EditorInspector.xml
index f88b9a92..0bbd55f0 100644
--- a/engine/doc/classes/EditorInspector.xml
+++ b/engine/doc/classes/EditorInspector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorInspector" inherits="ScrollContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorInspector" inherits="ScrollContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control used to edit properties of an object.
 	</brief_description>
diff --git a/engine/doc/classes/EditorInspectorPlugin.xml b/engine/doc/classes/EditorInspectorPlugin.xml
index a127c2dd..4f6ef76c 100644
--- a/engine/doc/classes/EditorInspectorPlugin.xml
+++ b/engine/doc/classes/EditorInspectorPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorInspectorPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorInspectorPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plugin for adding custom property editors on the inspector.
 	</brief_description>
diff --git a/engine/doc/classes/EditorInterface.xml b/engine/doc/classes/EditorInterface.xml
index 1211578c..b805aa06 100644
--- a/engine/doc/classes/EditorInterface.xml
+++ b/engine/doc/classes/EditorInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorInterface" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorInterface" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's interface.
 	</brief_description>
@@ -120,7 +120,7 @@
 			<return type="float" />
 			<description>
 				Returns the actual scale of the editor UI ([code]1.0[/code] being 100% scale). This can be used to adjust position and dimensions of the UI added by plugins.
-				[b]Note:[/b] This value is set via the [member EditorSettings.interface/editor/appearance/display_scale] and [member EditorSettings.interface/editor/appearance/custom_display_scale] settings. The editor must be restarted for changes to be properly applied.
+				[b]Note:[/b] This value is set via the [member EditorSettings.interface/editor/display_scale] and [member EditorSettings.interface/editor/custom_display_scale] settings. The editor must be restarted for changes to be properly applied.
 			</description>
 		</method>
 		<method name="get_editor_settings" qualifiers="const">
@@ -242,12 +242,6 @@
 				Returns the editor's [EditorSelection] instance.
 			</description>
 		</method>
-		<method name="get_unsaved_scenes" qualifiers="const">
-			<return type="PackedStringArray" />
-			<description>
-				Returns an array of file paths of currently unsaved scenes.
-			</description>
-		</method>
 		<method name="inspect_object">
 			<return type="void" />
 			<param index="0" name="object" type="Object" />
@@ -262,7 +256,7 @@
 			<description>
 				Returns [code]true[/code] if multiple window support is enabled in the editor. Multiple window support is enabled if [i]all[/i] of these statements are true:
 				- [member EditorSettings.interface/multi_window/enable] is [code]true[/code].
-				- [member EditorSettings.interface/editor/display/single_window_mode] is [code]false[/code].
+				- [member EditorSettings.interface/editor/single_window_mode] is [code]false[/code].
 				- [member Viewport.gui_embed_subwindows] is [code]false[/code]. This is forced to [code]true[/code] on platforms that don't support multiple windows such as Web, or when the [code]--single-window[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url] is used.
 			</description>
 		</method>
diff --git a/engine/doc/classes/EditorNode3DGizmo.xml b/engine/doc/classes/EditorNode3DGizmo.xml
index ce8cfdf9..febff1bd 100644
--- a/engine/doc/classes/EditorNode3DGizmo.xml
+++ b/engine/doc/classes/EditorNode3DGizmo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorNode3DGizmo" inherits="Node3DGizmo" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorNode3DGizmo" inherits="Node3DGizmo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Gizmo for editing [Node3D] objects.
 	</brief_description>
diff --git a/engine/doc/classes/EditorNode3DGizmoPlugin.xml b/engine/doc/classes/EditorNode3DGizmoPlugin.xml
index f53559cd..6a91e355 100644
--- a/engine/doc/classes/EditorNode3DGizmoPlugin.xml
+++ b/engine/doc/classes/EditorNode3DGizmoPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorNode3DGizmoPlugin" inherits="Resource" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorNode3DGizmoPlugin" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class used by the editor to define Node3D gizmo types.
 	</brief_description>
diff --git a/engine/doc/classes/EditorPaths.xml b/engine/doc/classes/EditorPaths.xml
index 2a6306a9..c355f06a 100644
--- a/engine/doc/classes/EditorPaths.xml
+++ b/engine/doc/classes/EditorPaths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorPaths" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorPaths" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Editor-only singleton that returns paths to various OS-specific data folders and files.
 	</brief_description>
diff --git a/engine/doc/classes/EditorPlugin.xml b/engine/doc/classes/EditorPlugin.xml
index d215732a..f0ea1b12 100644
--- a/engine/doc/classes/EditorPlugin.xml
+++ b/engine/doc/classes/EditorPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorPlugin" inherits="Node" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorPlugin" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Used by the editor to extend its functionality.
 	</brief_description>
diff --git a/engine/doc/classes/EditorProperty.xml b/engine/doc/classes/EditorProperty.xml
index e304f273..e34d613e 100644
--- a/engine/doc/classes/EditorProperty.xml
+++ b/engine/doc/classes/EditorProperty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorProperty" inherits="Container" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorProperty" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Custom control for editing properties that can be added to the [EditorInspector].
 	</brief_description>
diff --git a/engine/doc/classes/EditorResourceConversionPlugin.xml b/engine/doc/classes/EditorResourceConversionPlugin.xml
index 0c8064ac..c56c4adc 100644
--- a/engine/doc/classes/EditorResourceConversionPlugin.xml
+++ b/engine/doc/classes/EditorResourceConversionPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorResourceConversionPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorResourceConversionPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plugin for adding custom converters from one resource format to another in the editor resource picker context menu; for example, converting a [StandardMaterial3D] to a [ShaderMaterial].
 	</brief_description>
diff --git a/engine/doc/classes/EditorResourcePicker.xml b/engine/doc/classes/EditorResourcePicker.xml
index fbbc68c6..4649e26e 100644
--- a/engine/doc/classes/EditorResourcePicker.xml
+++ b/engine/doc/classes/EditorResourcePicker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorResourcePicker" inherits="HBoxContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorResourcePicker" inherits="HBoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's control for selecting [Resource] type properties.
 	</brief_description>
diff --git a/engine/doc/classes/EditorResourcePreview.xml b/engine/doc/classes/EditorResourcePreview.xml
index e4ff89f9..a0c1a43f 100644
--- a/engine/doc/classes/EditorResourcePreview.xml
+++ b/engine/doc/classes/EditorResourcePreview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorResourcePreview" inherits="Node" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorResourcePreview" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to generate previews of resources or files.
 	</brief_description>
diff --git a/engine/doc/classes/EditorResourcePreviewGenerator.xml b/engine/doc/classes/EditorResourcePreviewGenerator.xml
index fe8f126c..e94f658c 100644
--- a/engine/doc/classes/EditorResourcePreviewGenerator.xml
+++ b/engine/doc/classes/EditorResourcePreviewGenerator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorResourcePreviewGenerator" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorResourcePreviewGenerator" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Custom generator of previews.
 	</brief_description>
diff --git a/engine/doc/classes/EditorResourceTooltipPlugin.xml b/engine/doc/classes/EditorResourceTooltipPlugin.xml
index 38328156..517d1449 100644
--- a/engine/doc/classes/EditorResourceTooltipPlugin.xml
+++ b/engine/doc/classes/EditorResourceTooltipPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorResourceTooltipPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorResourceTooltipPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A plugin that advanced tooltip for its handled resource type.
 	</brief_description>
diff --git a/engine/doc/classes/EditorSceneFormatImporter.xml b/engine/doc/classes/EditorSceneFormatImporter.xml
index a0b07f1d..e89d4571 100644
--- a/engine/doc/classes/EditorSceneFormatImporter.xml
+++ b/engine/doc/classes/EditorSceneFormatImporter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneFormatImporter" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorSceneFormatImporter" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports scenes from third-parties' 3D files.
 	</brief_description>
diff --git a/engine/doc/classes/EditorScenePostImport.xml b/engine/doc/classes/EditorScenePostImport.xml
index 7ea59f5a..55e1d5b1 100644
--- a/engine/doc/classes/EditorScenePostImport.xml
+++ b/engine/doc/classes/EditorScenePostImport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorScenePostImport" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorScenePostImport" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Post-processes scenes after import.
 	</brief_description>
diff --git a/engine/doc/classes/EditorScenePostImportPlugin.xml b/engine/doc/classes/EditorScenePostImportPlugin.xml
index 309ba9b5..d901d7c5 100644
--- a/engine/doc/classes/EditorScenePostImportPlugin.xml
+++ b/engine/doc/classes/EditorScenePostImportPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorScenePostImportPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorScenePostImportPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plugin to control and modifying the process of importing a scene.
 	</brief_description>
diff --git a/engine/doc/classes/EditorScript.xml b/engine/doc/classes/EditorScript.xml
index 4dccc412..3acd99a7 100644
--- a/engine/doc/classes/EditorScript.xml
+++ b/engine/doc/classes/EditorScript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorScript" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorScript" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base script that can be used to add extension functions to the editor.
 	</brief_description>
diff --git a/engine/doc/classes/EditorScriptPicker.xml b/engine/doc/classes/EditorScriptPicker.xml
index 09100aff..31a1c503 100644
--- a/engine/doc/classes/EditorScriptPicker.xml
+++ b/engine/doc/classes/EditorScriptPicker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorScriptPicker" inherits="EditorResourcePicker" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorScriptPicker" inherits="EditorResourcePicker" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's control for selecting the [code]script[/code] property of a [Node].
 	</brief_description>
diff --git a/engine/doc/classes/EditorSelection.xml b/engine/doc/classes/EditorSelection.xml
index bb36c012..40dc1a24 100644
--- a/engine/doc/classes/EditorSelection.xml
+++ b/engine/doc/classes/EditorSelection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSelection" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorSelection" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Manages the SceneTree selection in the editor.
 	</brief_description>
diff --git a/engine/doc/classes/EditorSettings.xml b/engine/doc/classes/EditorSettings.xml
index a2c9b9c8..d62b7345 100644
--- a/engine/doc/classes/EditorSettings.xml
+++ b/engine/doc/classes/EditorSettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSettings" inherits="Resource" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorSettings" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Object that holds the project-independent editor settings.
 	</brief_description>
@@ -281,12 +281,6 @@
 			If [code]true[/code], displays folders in the FileSystem dock's bottom pane when split mode is enabled. If [code]false[/code], only files will be displayed in the bottom pane. Split mode can be toggled by pressing the icon next to the [code]res://[/code] folder path.
 			[b]Note:[/b] This setting has no effect when split mode is disabled (which is the default).
 		</member>
-		<member name="docks/filesystem/ask_before_moving_files" type="bool" setter="" getter="">
-			If [code]true[/code], displays a confirmation dialog when moving or duplicating items in the FileSystem dock. This dialog can also be bypassed by holding [kbd]Shift[/kbd].
-		</member>
-		<member name="docks/filesystem/automatically_open_created_scripts" type="bool" setter="" getter="">
-			If [code]true[/code], scripts created in FileSystem dock will be automatically edited.
-		</member>
 		<member name="docks/filesystem/other_file_extensions" type="String" setter="" getter="">
 			A comma separated list of unsupported file extensions to show in the FileSystem dock, e.g. [code]"ico,icns"[/code].
 		</member>
@@ -355,15 +349,9 @@
 		<member name="editors/2d/guides_color" type="Color" setter="" getter="">
 			The guides color to use in the 2D editor. Guides can be created by dragging the mouse cursor from the rulers.
 		</member>
-		<member name="editors/2d/locked_selection_rectangle_color" type="Color" setter="" getter="">
-			The color to use for the selection rectangle that surrounds selected locked nodes in the 2D editor viewport.
-		</member>
 		<member name="editors/2d/ruler_width" type="float" setter="" getter="">
 			The thickness of the coordinate ruler in the 2D editor. Increasing this will also increase the size of the ruler font, improving readability when using a lower editor scale. The editor may force a minimum size to keep the ruler numbers legible.
 		</member>
-		<member name="editors/2d/selection_rectangle_color" type="Color" setter="" getter="">
-			The color to use for the selection rectangle outlines that surrounds selected nodes in the 2D editor viewport.
-		</member>
 		<member name="editors/2d/smart_snapping_line_color" type="Color" setter="" getter="">
 			The color to use when drawing smart snapping lines in the 2D editor. The smart snapping lines will automatically display when moving 2D nodes if smart snapping is enabled in the Snapping Options menu at the top of the 2D editor viewport.
 		</member>
@@ -377,7 +365,7 @@
 			The factor to use when zooming in or out in the 2D editor. For example, [code]1.1[/code] will zoom in by 10% with every step. If set to [code]2.0[/code], zooming will only cycle through powers of two.
 		</member>
 		<member name="editors/3d/active_selection_box_color" type="Color" setter="" getter="">
-			The color to use for the active selection box that surrounds selected nodes in the 3D editor viewport.
+			The color to use for the active selection box that surrounds selected nodes in the 3D editor viewport. The color's alpha channel influences the selection box's opacity.
 			[b]Note:[/b] The term "active" indicates that this object is the primary selection used as the basis for certain operations. This is the last selected [Node3D], which can be reordered with [kbd]Shift + Left mouse button[/kbd].
 		</member>
 		<member name="editors/3d/default_fov" type="float" setter="" getter="">
@@ -401,9 +389,6 @@
 		<member name="editors/3d/freelook/freelook_inertia" type="float" setter="" getter="">
 			The inertia of the 3D freelook camera. Higher values make the camera start and stop slower, which looks smoother but adds latency.
 		</member>
-		<member name="editors/3d/freelook/freelook_invert_y_axis" type="bool" setter="" getter="">
-			If [code]true[/code], invert the vertical mouse axis when using freelook mode in the 3D editor.
-		</member>
 		<member name="editors/3d/freelook/freelook_navigation_scheme" type="int" setter="" getter="">
 			The navigation scheme to use when freelook is enabled in the 3D editor. Some of the navigation schemes below may be more convenient when designing specific levels in the 3D editor.
 			- [b]Default:[/b] The "Freelook Forward", "Freelook Backward", "Freelook Up" and "Freelook Down" keys will move relative to the camera, taking its pitch angle into account for the movement.
@@ -455,7 +440,7 @@
 			If [code]true[/code], invert the horizontal mouse axis when panning or orbiting in the 3D editor. This setting does [i]not[/i] apply to freelook mode.
 		</member>
 		<member name="editors/3d/navigation/invert_y_axis" type="bool" setter="" getter="">
-			If [code]true[/code], invert the vertical mouse axis when panning or orbiting in the 3D editor.
+			If [code]true[/code], invert the vertical mouse axis when panning, orbiting, or using freelook mode in the 3D editor.
 		</member>
 		<member name="editors/3d/navigation/navigation_scheme" type="int" setter="" getter="">
 			The navigation scheme preset to use in the 3D editor. Changing this setting will affect the mouse button and modifier keys used to navigate the 3D editor viewport.
@@ -516,14 +501,11 @@
 			The color to use for the secondary 3D grid. This is generally a less visible color than [member editors/3d/primary_grid_color]. The color's alpha channel affects the grid's opacity.
 		</member>
 		<member name="editors/3d/selection_box_color" type="Color" setter="" getter="">
-			The color to use for the selection box that surrounds selected nodes in the 3D editor viewport.
+			The color to use for the selection box that surrounds selected nodes in the 3D editor viewport. The color's alpha channel influences the selection box's opacity.
 		</member>
 		<member name="editors/3d/show_gizmo_during_rotation" type="int" setter="" getter="">
 			If checked, the transform gizmo remains visible during rotation in that transform mode.
 		</member>
-		<member name="editors/3d/view_plane_rotation_gizmo_scale" type="float" setter="" getter="">
-			The scale of the outer circle of the rotation gizmo as view plane rotation in the 3D editor. If set to [code]2.0[/code], the outer circle has twice the radius of the XYZ rotation gizmo sphere.
-		</member>
 		<member name="editors/3d_gizmos/gizmo_colors/aabb" type="Color" setter="" getter="">
 			The color to use for the AABB gizmo that displays the [GeometryInstance3D]'s custom [AABB].
 		</member>
@@ -617,9 +599,6 @@
 		<member name="editors/3d_gizmos/gizmo_settings/path3d_tilt_disk_size" type="float" setter="" getter="">
 			Size of the disk gizmo displayed when editing [Path3D]'s tilt handles.
 		</member>
-		<member name="editors/3d_gizmos/gizmo_settings/show_collision_shapes_only_when_selected" type="bool" setter="" getter="">
-			If [code]true[/code], collision shapes in the 3D editor are visible only when selected. If [code]false[/code], collision shapes are always visible.
-		</member>
 		<member name="editors/animation/autorename_animation_tracks" type="bool" setter="" getter="">
 			If [code]true[/code], automatically updates animation tracks' target paths when renaming or reparenting nodes in the Scene tree dock.
 		</member>
@@ -928,181 +907,181 @@
 			- [b]Disabled[/b] ([code]2[/code]): Accessibility support is fully disabled.
 			[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights for Windows, Accessibility Inspector (macOS), or AT-SPI Browser (Linux/BSD), do not count as assistive apps. To test the editor with these tools, use [b]Always Active[/b].
 		</member>
-		<member name="interface/accessibility/property_descriptions" type="bool" setter="" getter="">
-			If [code]true[/code], editor inspector uses property documentation as an accessible description of the property.
-		</member>
-		<member name="interface/editor/appearance/accept_dialog_cancel_ok_buttons" type="int" setter="" getter="">
+		<member name="interface/editor/accept_dialog_cancel_ok_buttons" type="int" setter="" getter="">
 			How to position the Cancel and OK buttons in the editor's [AcceptDialog] windows. Different platforms have different conventions for this, which can be overridden through this setting to avoid accidental clicks when using Godot on multiple platforms.
 			- [b]Auto[/b] follows the platform convention: OK first on Windows, KDE, and LXQt; Cancel first on macOS and other Linux desktop environments.
 			- [b]Cancel First[/b] forces the Cancel/OK ordering.
 			- [b]OK First[/b] forces the OK/Cancel ordering.
 			To check if these buttons are swapped at runtime, use [method DisplayServer.get_swap_cancel_ok].
 		</member>
-		<member name="interface/editor/appearance/collapse_main_menu" type="bool" setter="" getter="">
-			If [code]true[/code], the main menu collapses into a [MenuButton].
-			[b]Note:[/b] This setting is only applicable on macOS when [member interface/editor/appearance/use_embedded_menu] is [code]true[/code].
-			[b]Note:[/b] Defaults to [code]true[/code] on the Android editor.
-		</member>
-		<member name="interface/editor/appearance/custom_display_scale" type="float" setter="" getter="">
-			The custom editor scale factor to use. This can be used for displays with very high DPI where a scale factor of 200% is not sufficient.
-			[b]Note:[/b] Only effective if [member interface/editor/appearance/display_scale] is set to [b]Custom[/b].
-		</member>
-		<member name="interface/editor/appearance/display_scale" type="int" setter="" getter="">
-			The display scale factor to use for the editor interface. Higher values are more suited to hiDPI/Retina displays.
-			If set to [b]Auto[/b], the editor scale is automatically determined based on the screen resolution and reported display DPI. This heuristic is not always ideal, which means you can get better results by setting the editor scale manually.
-			If set to [b]Custom[/b], the scaling value in [member interface/editor/appearance/custom_display_scale] will be used.
-		</member>
-		<member name="interface/editor/appearance/editor_screen" type="int" setter="" getter="">
-			The preferred monitor to display the editor. If [b]Auto[/b], the editor will remember the last screen it was displayed on across multiple sessions.
-		</member>
-		<member name="interface/editor/appearance/expand_to_title" type="bool" setter="" getter="">
-			Expanding main editor window content to the title, if supported by [DisplayServer]. See [constant DisplayServer.WINDOW_FLAG_EXTEND_TO_TITLE].
-			Specific to the macOS platform.
-		</member>
-		<member name="interface/editor/appearance/project_manager_screen" type="int" setter="" getter="">
-			The preferred monitor to display the project manager.
-		</member>
-		<member name="interface/editor/appearance/show_update_spinner" type="int" setter="" getter="">
-			If enabled, displays an icon in the top-right corner of the editor that spins when the editor redraws a frame. This can be used to diagnose situations where the engine is constantly redrawing, which should be avoided as this increases CPU and GPU utilization for no good reason. To further troubleshoot these situations, start the editor with the [code]--debug-canvas-item-redraw[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
-			Consider enabling this if you are developing editor plugins to ensure they only make the editor redraw when required.
-			The default [b]Auto[/b] value will only enable this if the editor was compiled with the [code]dev_build=yes[/code] SCons option (the default is [code]dev_build=no[/code]).
-			[b]Note:[/b] If [member interface/editor/display/update_continuously] is [code]true[/code], the spinner icon displays in red.
-			[b]Note:[/b] If the editor was started with the [code]--debug-canvas-item-redraw[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url], the update spinner will [i]never[/i] display regardless of this setting's value. This is to avoid confusion with what would cause redrawing in real world scenarios.
-		</member>
-		<member name="interface/editor/appearance/use_embedded_menu" type="bool" setter="" getter="">
-			If [code]true[/code], editor main menu is using embedded [MenuBar] instead of system global menu.
-			Specific to the macOS platform.
-		</member>
-		<member name="interface/editor/appearance/use_native_file_dialogs" type="bool" setter="" getter="">
-			If [code]true[/code], editor UI uses OS native file/directory selection dialogs.
-		</member>
-		<member name="interface/editor/behavior/automatically_open_screenshots" type="bool" setter="" getter="">
+		<member name="interface/editor/automatically_open_screenshots" type="bool" setter="" getter="">
 			If [code]true[/code], automatically opens screenshots with the default program associated to [code].png[/code] files after a screenshot is taken using the [b]Editor &gt; Take Screenshot[/b] action.
 		</member>
-		<member name="interface/editor/behavior/import_resources_when_unfocused" type="bool" setter="" getter="">
-			If [code]true[/code], (re)imports resources even if the editor window is unfocused or minimized. If [code]false[/code], resources are only (re)imported when the editor window is focused. This can be set to [code]true[/code] to speed up iteration by starting the import process earlier when saving files in the project folder. This also allows getting visual feedback on changes without having to click the editor window, which is useful with multi-monitor setups. The downside of setting this to [code]true[/code] is that it increases idle CPU usage and may steal CPU time from other applications when importing resources.
-		</member>
-		<member name="interface/editor/behavior/save_each_scene_on_quit" type="bool" setter="" getter="">
-			If [code]false[/code], the editor will save all scenes when confirming the [b]Save[/b] action when quitting the editor or quitting to the project list. If [code]true[/code], the editor will ask to save each scene individually.
-		</member>
-		<member name="interface/editor/behavior/save_on_focus_loss" type="bool" setter="" getter="">
-			If [code]true[/code], scenes and scripts are saved when the editor loses focus. Depending on the work flow, this behavior can be less intrusive than [member text_editor/behavior/files/autosave_interval_secs] or remembering to save manually.
-		</member>
-		<member name="interface/editor/behavior/separate_distraction_mode" type="bool" setter="" getter="">
-			If [code]true[/code], the editor's Script tab will have a separate distraction mode setting from the 2D/3D/Game/AssetLib tabs. If [code]false[/code], the distraction-free mode toggle is shared between all tabs.
-		</member>
-		<member name="interface/editor/behavior/show_internal_errors_in_toast_notifications" type="int" setter="" getter="">
-			If enabled, displays internal engine errors in toast notifications (toggleable by clicking the "bell" icon at the bottom of the editor). No matter the value of this setting, non-internal engine errors will always be visible in toast notifications.
-			The default [b]Auto[/b] value will only enable this if the editor was compiled with the [code]dev_build=yes[/code] SCons option (the default is [code]dev_build=no[/code]).
-		</member>
-		<member name="interface/editor/display/keep_screen_on" type="bool" setter="" getter="">
-			If [code]true[/code], keeps the screen on (even in case of inactivity), so the screensaver does not take over. Works on desktop and mobile platforms.
-		</member>
-		<member name="interface/editor/display/single_window_mode" type="bool" setter="" getter="">
-			If [code]true[/code], embed modal windows such as docks inside the main editor window. When single-window mode is enabled, tooltips will also be embedded inside the main editor window, which means they can't be displayed outside of the editor window. Single-window mode can be faster as it does not need to create a separate window for every popup and tooltip, which can be a slow operation depending on the operating system and rendering method in use.
-			This is equivalent to [member ProjectSettings.display/window/subwindows/embed_subwindows] in the running project, except the setting's value is inverted.
-			[b]Note:[/b] To query whether the editor can use multiple windows in an editor plugin, use [method EditorInterface.is_multi_window_enabled] instead of querying the value of this editor setting.
-			[b]Note:[/b] If [code]true[/code], game embedding is disabled.
-		</member>
-		<member name="interface/editor/display/update_continuously" type="bool" setter="" getter="">
-			If [code]true[/code], redraws the editor every frame even if nothing has changed on screen. When this setting is enabled, the update spinner displays in red (see [member interface/editor/appearance/show_update_spinner]).
-			[b]Warning:[/b] This greatly increases CPU and GPU utilization, leading to increased power usage. This should only be enabled for troubleshooting purposes.
-		</member>
-		<member name="interface/editor/display/vsync_mode" type="int" setter="" getter="">
-			Sets the V-Sync mode for the editor. Does not affect the project when run from the editor (this is controlled by [member ProjectSettings.display/window/vsync/vsync_mode]).
-			Depending on the platform and used renderer, the engine will fall back to [b]Enabled[/b] if the desired mode is not supported.
-			[b]Note:[/b] V-Sync modes other than [b]Enabled[/b] are only supported in the Forward+ and Mobile rendering methods, not Compatibility.
-		</member>
-		<member name="interface/editor/docks/bottom_dock_tab_style" type="int" setter="" getter="">
+		<member name="interface/editor/bottom_dock_tab_style" type="int" setter="" getter="">
 			Tab style of editor docks located at the bottom.
 		</member>
-		<member name="interface/editor/docks/dock_tab_style" type="int" setter="" getter="">
-			Tab style of editor docks, except bottom docks.
-		</member>
-		<member name="interface/editor/fonts/code_font" type="String" setter="" getter="">
+		<member name="interface/editor/code_font" type="String" setter="" getter="">
 			The font to use for the script editor. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
-		<member name="interface/editor/fonts/code_font_contextual_ligatures" type="int" setter="" getter="">
+		<member name="interface/editor/code_font_contextual_ligatures" type="int" setter="" getter="">
 			The font ligatures to enable for the currently configured code font. Not all fonts include support for ligatures.
 			[b]Note:[/b] The default editor code font ([url=https://www.jetbrains.com/lp/mono/]JetBrains Mono[/url]) has contextual ligatures in its font file.
 		</member>
-		<member name="interface/editor/fonts/code_font_custom_opentype_features" type="String" setter="" getter="">
+		<member name="interface/editor/code_font_custom_opentype_features" type="String" setter="" getter="">
 			List of custom OpenType features to use, if supported by the currently configured code font. Not all fonts include support for custom OpenType features. The string should follow the OpenType specification.
 			[b]Note:[/b] The default editor code font ([url=https://www.jetbrains.com/lp/mono/]JetBrains Mono[/url]) has custom OpenType features in its font file, but there is no documented list yet.
 		</member>
-		<member name="interface/editor/fonts/code_font_custom_variations" type="String" setter="" getter="">
+		<member name="interface/editor/code_font_custom_variations" type="String" setter="" getter="">
 			List of alternative characters to use, if supported by the currently configured code font. Not all fonts include support for custom variations. The string should follow the OpenType specification.
 			[b]Note:[/b] The default editor code font ([url=https://www.jetbrains.com/lp/mono/]JetBrains Mono[/url]) has alternate characters in its font file, but there is no documented list yet.
 		</member>
-		<member name="interface/editor/fonts/code_font_size" type="int" setter="" getter="">
+		<member name="interface/editor/code_font_size" type="int" setter="" getter="">
 			The size of the font in the script editor. This setting does not impact the font size of the Output panel (see [member run/output/font_size]).
 		</member>
-		<member name="interface/editor/fonts/font_allow_msdf" type="bool" setter="" getter="">
+		<member name="interface/editor/collapse_main_menu" type="bool" setter="" getter="">
+			If [code]true[/code], the main menu collapses into a [MenuButton].
+			[b]Note:[/b] This setting is only applicable on macOS when [member interface/editor/use_embedded_menu] is [code]true[/code].
+			[b]Note:[/b] Defaults to [code]true[/code] on the Android editor.
+		</member>
+		<member name="interface/editor/custom_display_scale" type="float" setter="" getter="">
+			The custom editor scale factor to use. This can be used for displays with very high DPI where a scale factor of 200% is not sufficient.
+			[b]Note:[/b] Only effective if [member interface/editor/display_scale] is set to [b]Custom[/b].
+		</member>
+		<member name="interface/editor/display_scale" type="int" setter="" getter="">
+			The display scale factor to use for the editor interface. Higher values are more suited to hiDPI/Retina displays.
+			If set to [b]Auto[/b], the editor scale is automatically determined based on the screen resolution and reported display DPI. This heuristic is not always ideal, which means you can get better results by setting the editor scale manually.
+			If set to [b]Custom[/b], the scaling value in [member interface/editor/custom_display_scale] will be used.
+		</member>
+		<member name="interface/editor/dock_tab_style" type="int" setter="" getter="">
+			Tab style of editor docks, except bottom docks.
+		</member>
+		<member name="interface/editor/dragging_hover_wait_seconds" type="float" setter="" getter="">
+			During a drag-and-drop, this is how long to wait over a UI element before it triggers a reaction (e.g. a section unfolds to show nested items).
+		</member>
+		<member name="interface/editor/editor_language" type="String" setter="" getter="">
+			The language to use for the editor interface. If set to [b]Auto[/b], the language is automatically determined based on the system locale. See also [method EditorInterface.get_editor_language].
+			Translations are provided by the community. If you spot a mistake, [url=https://contributing.godotengine.org/en/latest/documentation/translation/index.html]contribute to editor translations on Weblate![/url]
+		</member>
+		<member name="interface/editor/editor_screen" type="int" setter="" getter="">
+			The preferred monitor to display the editor. If [b]Auto[/b], the editor will remember the last screen it was displayed on across multiple sessions.
+		</member>
+		<member name="interface/editor/expand_to_title" type="bool" setter="" getter="">
+			Expanding main editor window content to the title, if supported by [DisplayServer]. See [constant DisplayServer.WINDOW_FLAG_EXTEND_TO_TITLE].
+			Specific to the macOS platform.
+		</member>
+		<member name="interface/editor/font_allow_msdf" type="bool" setter="" getter="">
 			If set to [code]true[/code], MSDF font rendering will be used for the visual shader graph editor. You may need to set this to [code]false[/code] when using a custom main font, as some fonts will look broken due to the use of self-intersecting outlines in their font data. Downloading the font from the font maker's official website as opposed to a service like Google Fonts can help resolve this issue.
 		</member>
-		<member name="interface/editor/fonts/font_antialiasing" type="int" setter="" getter="">
+		<member name="interface/editor/font_antialiasing" type="int" setter="" getter="">
 			FreeType's font anti-aliasing mode used to render the editor fonts. Most fonts are not designed to look good with anti-aliasing disabled, so it's recommended to leave this enabled unless you're using a pixel art font.
 		</member>
-		<member name="interface/editor/fonts/font_disable_embedded_bitmaps" type="bool" setter="" getter="">
+		<member name="interface/editor/font_disable_embedded_bitmaps" type="bool" setter="" getter="">
 			If set to [code]true[/code], embedded font bitmap loading is disabled (bitmap-only and color fonts ignore this property).
 		</member>
-		<member name="interface/editor/fonts/font_hinting" type="int" setter="" getter="">
+		<member name="interface/editor/font_hinting" type="int" setter="" getter="">
 			The font hinting mode to use for the editor fonts. FreeType supports the following font hinting modes:
 			- [b]None:[/b] Don't use font hinting when rasterizing the font. This results in a smooth font, but it can look blurry.
 			- [b]Light:[/b] Use hinting on the X axis only. This is a compromise between font sharpness and smoothness.
 			- [b]Normal:[/b] Use hinting on both X and Y axes. This results in a sharp font, but it doesn't look very smooth.
 			If set to [b]Auto[/b], the font hinting mode will be set to match the current operating system in use. This means the [b]Light[/b] hinting mode will be used on Windows and Linux, and the [b]None[/b] hinting mode will be used on macOS.
 		</member>
-		<member name="interface/editor/fonts/font_subpixel_positioning" type="int" setter="" getter="">
+		<member name="interface/editor/font_subpixel_positioning" type="int" setter="" getter="">
 			The subpixel positioning mode to use when rendering editor font glyphs. This affects both the main and code fonts. [b]Disabled[/b] is the fastest to render and uses the least memory. [b]Auto[/b] only uses subpixel positioning for small font sizes (where the benefit is the most noticeable). [b]One Half of a Pixel[/b] and [b]One Quarter of a Pixel[/b] force the same subpixel positioning mode for all editor fonts, regardless of their size (with [b]One Quarter of a Pixel[/b] being the highest-quality option).
 		</member>
-		<member name="interface/editor/fonts/main_font" type="String" setter="" getter="">
+		<member name="interface/editor/import_resources_when_unfocused" type="bool" setter="" getter="">
+			If [code]true[/code], (re)imports resources even if the editor window is unfocused or minimized. If [code]false[/code], resources are only (re)imported when the editor window is focused. This can be set to [code]true[/code] to speed up iteration by starting the import process earlier when saving files in the project folder. This also allows getting visual feedback on changes without having to click the editor window, which is useful with multi-monitor setups. The downside of setting this to [code]true[/code] is that it increases idle CPU usage and may steal CPU time from other applications when importing resources.
+		</member>
+		<member name="interface/editor/keep_screen_on" type="bool" setter="" getter="">
+			If [code]true[/code], keeps the screen on (even in case of inactivity), so the screensaver does not take over. Works on desktop and mobile platforms.
+		</member>
+		<member name="interface/editor/localize_settings" type="bool" setter="" getter="">
+			If [code]true[/code], setting names in the editor are localized when possible.
+			[b]Note:[/b] This setting affects most [EditorInspector]s in the editor UI, primarily Project Settings and Editor Settings. To control names displayed in the Inspector dock, use [member interface/inspector/default_property_name_style] instead.
+		</member>
+		<member name="interface/editor/low_processor_mode_sleep_usec" type="int" setter="" getter="">
+			The amount of sleeping between frames in the editor (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops. However, higher values will result in a less responsive editor. The default value is set to allow for maximum smoothness on monitors up to 144 Hz. See also [member interface/editor/unfocused_low_processor_mode_sleep_usec].
+			[b]Note:[/b] This setting is ignored if [member interface/editor/update_continuously] is [code]true[/code], as enabling that setting disables low-processor mode.
+		</member>
+		<member name="interface/editor/main_font" type="String" setter="" getter="">
 			The font to use for the editor interface. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 			[b]Note:[/b] If the provided font is variable, a weight of 400 (normal) will be used.
 		</member>
-		<member name="interface/editor/fonts/main_font_bold" type="String" setter="" getter="">
+		<member name="interface/editor/main_font_bold" type="String" setter="" getter="">
 			The font to use for bold text in the editor interface. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 			[b]Note:[/b] If the provided font is variable, a weight of 700 (bold) will be used.
 		</member>
-		<member name="interface/editor/fonts/main_font_custom_opentype_features" type="String" setter="" getter="">
+		<member name="interface/editor/main_font_custom_opentype_features" type="String" setter="" getter="">
 			List of custom OpenType features to use, if supported by the currently configured main font. Check what OpenType features are supported by your font first.
 			The string should follow the OpenType specification, e.g. [code]ss01,tnum,calt=false[/code]. Microsoft's documentation contains a list of [url=https://learn.microsoft.com/en-us/typography/opentype/spec/featurelist]all registered features[/url].
 			[b]Note:[/b] The default editor main font ([url=https://rsms.me/inter]Inter[/url]) has custom OpenType features in its font file, with [code]ss04[/code] and [code]tnum[/code] enabled and [code]calt[/code] disabled by default. Supported features can be found at its website.
 		</member>
-		<member name="interface/editor/fonts/main_font_size" type="int" setter="" getter="">
+		<member name="interface/editor/main_font_size" type="int" setter="" getter="">
 			The size of the font in the editor interface.
 		</member>
-		<member name="interface/editor/input/mouse_extra_buttons_navigate_history" type="bool" setter="" getter="">
+		<member name="interface/editor/mouse_extra_buttons_navigate_history" type="bool" setter="" getter="">
 			If [code]true[/code], the mouse's additional side buttons will be usable to navigate in the script editor's file history. Set this to [code]false[/code] if you're using the side buttons for other purposes (such as a push-to-talk button in a VoIP program).
 		</member>
-		<member name="interface/editor/input/tablet_driver" type="int" setter="" getter="">
+		<member name="interface/editor/project_manager_screen" type="int" setter="" getter="">
+			The preferred monitor to display the project manager.
+		</member>
+		<member name="interface/editor/save_each_scene_on_quit" type="bool" setter="" getter="">
+			If [code]false[/code], the editor will save all scenes when confirming the [b]Save[/b] action when quitting the editor or quitting to the project list. If [code]true[/code], the editor will ask to save each scene individually.
+		</member>
+		<member name="interface/editor/save_on_focus_loss" type="bool" setter="" getter="">
+			If [code]true[/code], scenes and scripts are saved when the editor loses focus. Depending on the work flow, this behavior can be less intrusive than [member text_editor/behavior/files/autosave_interval_secs] or remembering to save manually.
+		</member>
+		<member name="interface/editor/separate_distraction_mode" type="bool" setter="" getter="">
+			If [code]true[/code], the editor's Script tab will have a separate distraction mode setting from the 2D/3D/Game/AssetLib tabs. If [code]false[/code], the distraction-free mode toggle is shared between all tabs.
+		</member>
+		<member name="interface/editor/show_internal_errors_in_toast_notifications" type="int" setter="" getter="">
+			If enabled, displays internal engine errors in toast notifications (toggleable by clicking the "bell" icon at the bottom of the editor). No matter the value of this setting, non-internal engine errors will always be visible in toast notifications.
+			The default [b]Auto[/b] value will only enable this if the editor was compiled with the [code]dev_build=yes[/code] SCons option (the default is [code]dev_build=no[/code]).
+		</member>
+		<member name="interface/editor/show_update_spinner" type="int" setter="" getter="">
+			If enabled, displays an icon in the top-right corner of the editor that spins when the editor redraws a frame. This can be used to diagnose situations where the engine is constantly redrawing, which should be avoided as this increases CPU and GPU utilization for no good reason. To further troubleshoot these situations, start the editor with the [code]--debug-canvas-item-redraw[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
+			Consider enabling this if you are developing editor plugins to ensure they only make the editor redraw when required.
+			The default [b]Auto[/b] value will only enable this if the editor was compiled with the [code]dev_build=yes[/code] SCons option (the default is [code]dev_build=no[/code]).
+			[b]Note:[/b] If [member interface/editor/update_continuously] is [code]true[/code], the spinner icon displays in red.
+			[b]Note:[/b] If the editor was started with the [code]--debug-canvas-item-redraw[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url], the update spinner will [i]never[/i] display regardless of this setting's value. This is to avoid confusion with what would cause redrawing in real world scenarios.
+		</member>
+		<member name="interface/editor/single_window_mode" type="bool" setter="" getter="">
+			If [code]true[/code], embed modal windows such as docks inside the main editor window. When single-window mode is enabled, tooltips will also be embedded inside the main editor window, which means they can't be displayed outside of the editor window. Single-window mode can be faster as it does not need to create a separate window for every popup and tooltip, which can be a slow operation depending on the operating system and rendering method in use.
+			This is equivalent to [member ProjectSettings.display/window/subwindows/embed_subwindows] in the running project, except the setting's value is inverted.
+			[b]Note:[/b] To query whether the editor can use multiple windows in an editor plugin, use [method EditorInterface.is_multi_window_enabled] instead of querying the value of this editor setting.
+			[b]Note:[/b] If [code]true[/code], game embedding is disabled.
+		</member>
+		<member name="interface/editor/tablet_driver" type="int" setter="" getter="">
 			Overrides the tablet driver used by the editor.
 		</member>
-		<member name="interface/editor/localization/editor_language" type="String" setter="" getter="">
-			The language to use for the editor interface. If set to [b]Auto[/b], the language is automatically determined based on the system locale. See also [method EditorInterface.get_editor_language].
-			Translations are provided by the community. If you spot a mistake, [url=https://contributing.godotengine.org/en/latest/documentation/translation/index.html]contribute to editor translations on Weblate![/url]
-		</member>
-		<member name="interface/editor/localization/localize_settings" type="bool" setter="" getter="">
-			If [code]true[/code], setting names in the editor are localized when possible.
-			[b]Note:[/b] This setting affects most [EditorInspector]s in the editor UI, primarily Project Settings and Editor Settings. To control names displayed in the Inspector dock, use [member interface/inspector/default_property_name_style] instead.
-		</member>
-		<member name="interface/editor/localization/ui_layout_direction" type="int" setter="" getter="">
+		<member name="interface/editor/ui_layout_direction" type="int" setter="" getter="">
 			Editor UI default layout direction.
 		</member>
-		<member name="interface/editor/timers/dragging_hover_wait_seconds" type="float" setter="" getter="">
-			During a drag-and-drop, this is how long to wait over a UI element before it triggers a reaction (e.g. a section unfolds to show nested items).
+		<member name="interface/editor/unfocused_low_processor_mode_sleep_usec" type="int" setter="" getter="">
+			When the editor window is unfocused, the amount of sleeping between frames when the low-processor usage mode is enabled (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops (in addition to improving the running project's performance if the editor has to redraw continuously). However, higher values will result in a less responsive editor. The default value is set to limit the editor to 10 FPS when the editor window is unfocused. See also [member interface/editor/low_processor_mode_sleep_usec].
+			[b]Note:[/b] This setting is ignored if [member interface/editor/update_continuously] is [code]true[/code], as enabling that setting disables low-processor mode.
 		</member>
-		<member name="interface/editor/timers/low_processor_mode_sleep_usec" type="int" setter="" getter="">
-			The amount of sleeping between frames in the editor (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops. However, higher values will result in a less responsive editor. The default value is set to allow for maximum smoothness on monitors up to 144 Hz. See also [member interface/editor/timers/unfocused_low_processor_mode_sleep_usec].
-			[b]Note:[/b] This setting is ignored if [member interface/editor/display/update_continuously] is [code]true[/code], as enabling that setting disables low-processor mode.
+		<member name="interface/editor/update_continuously" type="bool" setter="" getter="">
+			If [code]true[/code], redraws the editor every frame even if nothing has changed on screen. When this setting is enabled, the update spinner displays in red (see [member interface/editor/show_update_spinner]).
+			[b]Warning:[/b] This greatly increases CPU and GPU utilization, leading to increased power usage. This should only be enabled for troubleshooting purposes.
 		</member>
-		<member name="interface/editor/timers/unfocused_low_processor_mode_sleep_usec" type="int" setter="" getter="">
-			When the editor window is unfocused, the amount of sleeping between frames when the low-processor usage mode is enabled (in microseconds). Higher values will result in lower CPU/GPU usage, which can improve battery life on laptops (in addition to improving the running project's performance if the editor has to redraw continuously). However, higher values will result in a less responsive editor. The default value is set to limit the editor to 10 FPS when the editor window is unfocused. See also [member interface/editor/timers/low_processor_mode_sleep_usec].
-			[b]Note:[/b] This setting is ignored if [member interface/editor/display/update_continuously] is [code]true[/code], as enabling that setting disables low-processor mode.
+		<member name="interface/editor/use_embedded_menu" type="bool" setter="" getter="">
+			If [code]true[/code], editor main menu is using embedded [MenuBar] instead of system global menu.
+			Specific to the macOS platform.
+		</member>
+		<member name="interface/editor/use_native_file_dialogs" type="bool" setter="" getter="">
+			If [code]true[/code], editor UI uses OS native file/directory selection dialogs.
+		</member>
+		<member name="interface/editor/vsync_mode" type="int" setter="" getter="">
+			Sets the V-Sync mode for the editor. Does not affect the project when run from the editor (this is controlled by [member ProjectSettings.display/window/vsync/vsync_mode]).
+			Depending on the platform and used renderer, the engine will fall back to [b]Enabled[/b] if the desired mode is not supported.
+			[b]Note:[/b] V-Sync modes other than [b]Enabled[/b] are only supported in the Forward+ and Mobile rendering methods, not Compatibility.
 		</member>
 		<member name="interface/editors/derive_script_globals_by_name" type="bool" setter="" getter="">
 			If [code]true[/code], when extending a script, the global class name of the script is inserted in the script creation dialog, if it exists. If [code]false[/code], the script's file path is always inserted.
 		</member>
+		<member name="interface/editors/show_scene_tree_root_selection" type="bool" setter="" getter="">
+			If [code]true[/code], the Scene dock will display buttons to quickly add a root node to a newly created scene.
+		</member>
 		<member name="interface/inspector/auto_unfold_foreign_scenes" type="bool" setter="" getter="">
 			If [code]true[/code], automatically unfolds Inspector property groups containing modified values when opening a scene for the first time. Only affects scenes without saved folding preferences and only unfolds groups with properties that have been changed from their default values.
 			[b]Note:[/b] This setting only works in specific scenarios: when opening a scene brought in from another project, or when opening a new scene that already has modified properties (e.g., from version control). Duplicated scenes are not considered foreign, so this setting will not affect them.
@@ -1124,7 +1103,7 @@
 			- [b]Raw:[/b] Displays properties in [code]snake_case[/code].
 			- [b]Capitalized:[/b] Displays properties capitalized.
 			- [b]Localized:[/b] Displays the localized string for the current editor language if a translation is available for the given property. If no translation is available, falls back to [b]Capitalized[/b].
-			[b]Note:[/b] To display translated setting names in Project Settings and Editor Settings, use [member interface/editor/localization/localize_settings] instead.
+			[b]Note:[/b] To display translated setting names in Project Settings and Editor Settings, use [member interface/editor/localize_settings] instead.
 		</member>
 		<member name="interface/inspector/delimitate_all_container_and_resources" type="bool" setter="" getter="">
 			If [code]true[/code], add a margin around Array, Dictionary, and Resource Editors that are not already colored.
@@ -1165,7 +1144,7 @@
 		</member>
 		<member name="interface/multi_window/enable" type="bool" setter="" getter="">
 			If [code]true[/code], multiple window support in editor is enabled. The following panels can become dedicated windows (i.e. made floating): Docks, Script editor, Shader editor, and Game Workspace.
-			[b]Note:[/b] When [member interface/editor/display/single_window_mode] is [code]true[/code], the multi window support is always disabled.
+			[b]Note:[/b] When [member interface/editor/single_window_mode] is [code]true[/code], the multi window support is always disabled.
 			[b]Note:[/b] To query whether the editor can use multiple windows in an editor plugin, use [method EditorInterface.is_multi_window_enabled] instead of querying the value of this editor setting.
 		</member>
 		<member name="interface/multi_window/maximize_window" type="bool" setter="" getter="">
@@ -1253,12 +1232,9 @@
 		<member name="interface/theme/style" type="String" setter="" getter="">
 			The editor theme style to use.
 		</member>
-		<member name="interface/theme/use_monospace_font_for_editor_symbols" type="bool" setter="" getter="">
-			If [code]true[/code], use the monospace font for some labels in the editor that display code symbols, such as signals, properties, and methods.
-		</member>
 		<member name="interface/theme/use_system_accent_color" type="bool" setter="" getter="">
 			If [code]true[/code], set accent color based on system settings.
-			[b]Note:[/b] This setting is effective on Windows, macOS, Linux, and Android.
+			[b]Note:[/b] This setting is only effective on Windows, MacOS, and Android.
 		</member>
 		<member name="interface/touchscreen/enable_long_press_as_right_click" type="bool" setter="" getter="">
 			If [code]true[/code], long press on touchscreen is treated as right click.
@@ -1272,10 +1248,6 @@
 			If [code]true[/code], increases the scrollbar touch area, enables a larger dragger for split containers, and increases PopupMenu vertical separation to improve usability on touchscreen devices.
 			[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices.
 		</member>
-		<member name="interface/touchscreen/haptic_on_long_press" type="bool" setter="" getter="">
-			If [code]true[/code], the device will vibrate when a long-press gesture triggers a right-click context menu in the editor.
-			[b]Note:[/b] Only has an effect on devices with haptic feedback hardware. Defaults to [code]true[/code] on touchscreen devices.
-		</member>
 		<member name="interface/touchscreen/scale_gizmo_handles" type="float" setter="" getter="">
 			Specify the multiplier to apply to the scale for the editor gizmo handles to improve usability on touchscreen devices.
 			[b]Note:[/b] Defaults to [code]1[/code] on non-touchscreen devices.
@@ -1287,9 +1259,8 @@
 		<member name="network/connection/check_for_updates" type="int" setter="" getter="">
 			Specifies how the engine should check for updates.
 			- [b]Disable Update Checks[/b] will block the engine from checking updates (see also [member network/connection/network_mode]).
-			- [b]Auto[/b] (default) will check for newest stable or unstable version, depending on which version are you currently using. Switch to another option if you want to lock in.
-			- [b]Check Newest Preview[/b] will check for the newest available development snapshot.
-			- [b]Check Newest Stable[/b] will check for the newest available stable version.
+			- [b]Check Newest Preview[/b] (default for preview versions) will check for the newest available development snapshot.
+			- [b]Check Newest Stable[/b] (default for stable versions) will check for the newest available stable version.
 			- [b]Check Newest Patch[/b] will check for the latest available stable version, but only within the same minor version. E.g. if your version is [code]4.3.stable[/code], you will be notified about [code]4.3.1.stable[/code], but not [code]4.4.stable[/code].
 			All update modes will ignore builds with different major versions (e.g. Godot 4 -&gt; Godot 5).
 		</member>
@@ -1311,33 +1282,6 @@
 			The port number to use to contact the HTTP and HTTPS proxy in the editor (for the asset library and export template downloads). See also [member network/http_proxy/host].
 			[b]Note:[/b] Godot currently doesn't automatically use system proxy settings, so you have to enter them manually here if needed.
 		</member>
-		<member name="network/language_server/enable_smart_resolve" type="bool" setter="" getter="">
-			If [code]true[/code] the language server will try to provide additional results when resolving symbols at the cost of showing wrong results. All symbols in the project are checked and resolved just based on their name, without taking context into account.
-			[codeblock]
-			func untyped(param):
-				param.print() # Will resolve to the global print method for e.g. hover hints.
-			[/codeblock]
-			When using static typing it is recommended to disable this setting, since it will mostly add false positives for typed code.
-			[b]Note:[/b] This setting also influences how symbols are resolved when using renaming capabilities.
-			[b]Note:[/b] The default value of this setting might change in future versions.
-		</member>
-		<member name="network/language_server/poll_limit_usec" type="int" setter="" getter="">
-			The upper limit of time, that the language server spends for IO each poll.
-		</member>
-		<member name="network/language_server/remote_host" type="String" setter="" getter="">
-			The host used to listen for language server clients.
-		</member>
-		<member name="network/language_server/remote_port" type="int" setter="" getter="">
-			The port used to listen for language server clients.
-			[b]Note:[/b] A port configured with command-line options will take priority over this setting: [code]--lsp-port &lt;port&gt;[/code].
-		</member>
-		<member name="network/language_server/show_native_symbols_in_editor" type="bool" setter="" getter="">
-			The declaration of native symbols can't be resolved to a position in the file system. If [code]true[/code] the language server will instead open the documentation for native symbols in the editor.
-			[b]Note:[/b] The VSCode plugin adds additional functionality which allows viewing Godot documentation directly in VSCode, so this option is usually not needed in VSCode.
-		</member>
-		<member name="network/language_server/use_thread" type="bool" setter="" getter="">
-			If [code]true[/code] the language server will run in a separate thread, if [code]false[/code] it will run on the main thread.
-		</member>
 		<member name="network/tls/editor_tls_certificates" type="String" setter="" getter="">
 			The TLS certificate bundle to use for HTTP requests made within the editor (e.g. from the AssetLib tab). If left empty, the [url=https://github.com/godotengine/godot/blob/master/thirdparty/certs/ca-bundle.crt]included Mozilla certificate bundle[/url] will be used.
 		</member>
@@ -1369,7 +1313,7 @@
 			If [code]true[/code], the editor will clear the Output panel when running the project.
 		</member>
 		<member name="run/output/font_size" type="int" setter="" getter="">
-			The size of the font in the [b]Output[/b] panel at the bottom of the editor. This setting does not impact the font size of the script editor (see [member interface/editor/fonts/code_font_size]).
+			The size of the font in the [b]Output[/b] panel at the bottom of the editor. This setting does not impact the font size of the script editor (see [member interface/editor/code_font_size]).
 		</member>
 		<member name="run/output/max_lines" type="int" setter="" getter="">
 			Maximum number of lines to show at any one time in the Output panel.
@@ -1412,9 +1356,6 @@
 		<member name="text_editor/appearance/caret/type" type="int" setter="" getter="">
 			The shape of the caret to use in the script editor. [b]Line[/b] displays a vertical line to the left of the current character, whereas [b]Block[/b] displays an outline over the current character.
 		</member>
-		<member name="text_editor/appearance/drag_and_drop_info/show_drag_and_drop_info" type="bool" setter="" getter="">
-			If [code]true[/code], shows an info label listing available drop options when dragging an object into the script text editor.
-		</member>
 		<member name="text_editor/appearance/enable_inline_color_picker" type="bool" setter="" getter="">
 			If [code]true[/code], displays a colored button before any [Color] constructor in the script editor. Clicking on them allows the color to be modified through a color picker.
 		</member>
@@ -1461,7 +1402,7 @@
 			If [code]true[/code], draws tab characters as chevrons.
 		</member>
 		<member name="text_editor/appearance/whitespace/line_spacing" type="int" setter="" getter="">
-			The space to add between lines (in pixels). Greater line spacing can help improve readability at the cost of displaying fewer lines on screen. Negative values allow for even more compact text, but may look broken with certain fonts.
+			The space to add between lines (in pixels). Greater line spacing can help improve readability at the cost of displaying fewer lines on screen.
 		</member>
 		<member name="text_editor/behavior/documentation/enable_tooltips" type="bool" setter="" getter="">
 			If [code]true[/code], documentation tooltips will appear when hovering over a symbol.
diff --git a/engine/doc/classes/EditorSpinSlider.xml b/engine/doc/classes/EditorSpinSlider.xml
index cd3a5b54..c9762c40 100644
--- a/engine/doc/classes/EditorSpinSlider.xml
+++ b/engine/doc/classes/EditorSpinSlider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSpinSlider" inherits="Range" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorSpinSlider" inherits="Range" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's control for editing numeric values.
 	</brief_description>
@@ -13,9 +13,6 @@
 		<member name="control_state" type="int" setter="set_control_state" getter="get_control_state" enum="EditorSpinSlider.ControlState" default="0">
 			The state in which the control used to manipulate the value will be.
 		</member>
-		<member name="deferred_drag_mode" type="bool" setter="set_deferred_drag_mode_enabled" getter="is_deferred_drag_mode_enabled" default="false">
-			If [code]true[/code], changing via dragging is applied only at the end of the input (for example, when the user releases a mouse button).
-		</member>
 		<member name="editing_integer" type="bool" setter="set_editing_integer" getter="is_editing_integer" default="false">
 			If [code]true[/code], the [EditorSpinSlider] is considered to be editing an integer value. If [code]false[/code], the [EditorSpinSlider] is considered to be editing a floating-point value. This is used to determine whether a slider should be drawn by default. The slider is only drawn for floats; integers use up-down arrows similar to [SpinBox] instead, unless [member control_state] is set to [constant CONTROL_STATE_PREFER_SLIDER]. It will also use [member EditorSettings.interface/inspector/integer_drag_speed] instead of [member EditorSettings.interface/inspector/float_drag_speed] if the slider is available.
 		</member>
diff --git a/engine/doc/classes/EditorSyntaxHighlighter.xml b/engine/doc/classes/EditorSyntaxHighlighter.xml
index 78627a2f..1e67dbd8 100644
--- a/engine/doc/classes/EditorSyntaxHighlighter.xml
+++ b/engine/doc/classes/EditorSyntaxHighlighter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSyntaxHighlighter" inherits="SyntaxHighlighter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorSyntaxHighlighter" inherits="SyntaxHighlighter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [SyntaxHighlighter] used by the [ScriptEditor].
 	</brief_description>
diff --git a/engine/doc/classes/EditorToaster.xml b/engine/doc/classes/EditorToaster.xml
index 7baa71db..402e18d3 100644
--- a/engine/doc/classes/EditorToaster.xml
+++ b/engine/doc/classes/EditorToaster.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorToaster" inherits="HBoxContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorToaster" inherits="HBoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Manages toast notifications within the editor.
 	</brief_description>
diff --git a/engine/doc/classes/EditorTranslationParserPlugin.xml b/engine/doc/classes/EditorTranslationParserPlugin.xml
index f2449038..41b66ef9 100644
--- a/engine/doc/classes/EditorTranslationParserPlugin.xml
+++ b/engine/doc/classes/EditorTranslationParserPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorTranslationParserPlugin" inherits="RefCounted" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorTranslationParserPlugin" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Plugin for adding custom parsers to extract strings that are to be translated from custom files (.csv, .json etc.).
 	</brief_description>
@@ -98,32 +98,11 @@
 		}
 		[/csharp]
 		[/codeblocks]
-		Alternatively, the plugin can directly modify the final list of strings, by implementing [method _customize_strings].
 		To use [EditorTranslationParserPlugin], register it using the [method EditorPlugin.add_translation_parser_plugin] method first.
 	</description>
 	<tutorials>
 	</tutorials>
 	<methods>
-		<method name="_customize_strings" qualifiers="virtual const">
-			<return type="PackedStringArray[]" />
-			<param index="0" name="strings" type="PackedStringArray[]" />
-			<description>
-				Called after parsing all files. You can modify the [param strings] array to add or remove entries from the final list of strings, then return it after modifications. Each entry is a [PackedStringArray] like explained in the [EditorTranslationParserPlugin]'s description.
-				[codeblock]
-				@tool
-				extends EditorTranslationParserPlugin
-
-				func _customize_strings(strings):
-					# Add new string.
-					strings.append(["Test 1", "context", "test 1 plurals", "test 1 comment"])
-
-					# Remove all strings that begin with $.
-					strings = strings.filter(func(s): return not s[0].begins_with("$"))
-
-					return strings
-				[/codeblock]
-			</description>
-		</method>
 		<method name="_get_recognized_extensions" qualifiers="virtual const">
 			<return type="PackedStringArray" />
 			<description>
diff --git a/engine/doc/classes/EditorUndoRedoManager.xml b/engine/doc/classes/EditorUndoRedoManager.xml
index 4410f033..fe539869 100644
--- a/engine/doc/classes/EditorUndoRedoManager.xml
+++ b/engine/doc/classes/EditorUndoRedoManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorUndoRedoManager" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorUndoRedoManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Manages undo history of scenes opened in the editor.
 	</brief_description>
diff --git a/engine/doc/classes/EditorVCSInterface.xml b/engine/doc/classes/EditorVCSInterface.xml
index 9b3259ba..bfd312a9 100644
--- a/engine/doc/classes/EditorVCSInterface.xml
+++ b/engine/doc/classes/EditorVCSInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorVCSInterface" inherits="Object" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorVCSInterface" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Version Control System (VCS) interface, which reads and writes to the local VCS in use.
 	</brief_description>
@@ -10,12 +10,6 @@
 		<link title="Version control systems">$DOCS_URL/tutorials/best_practices/version_control_systems.html</link>
 	</tutorials>
 	<methods>
-		<method name="_allow_amends" qualifiers="virtual">
-			<return type="bool" />
-			<description>
-				Returns whether or not the plugin allows commit amends.
-			</description>
-		</method>
 		<method name="_checkout_branch" qualifiers="virtual required">
 			<return type="bool" />
 			<param index="0" name="branch_name" type="String" />
@@ -23,12 +17,11 @@
 				Checks out a [param branch_name] in the VCS.
 			</description>
 		</method>
-		<method name="_commit" qualifiers="virtual">
+		<method name="_commit" qualifiers="virtual required">
 			<return type="void" />
 			<param index="0" name="msg" type="String" />
-			<param index="1" name="amend" type="bool" />
 			<description>
-				Commits the currently staged changes and applies the commit [param msg] to the resulting commit. If [param amend] is [code]true[/code] the commit will modify the most recent commit instead.
+				Commits the currently staged changes and applies the commit [param msg] to the resulting commit.
 			</description>
 		</method>
 		<method name="_create_branch" qualifiers="virtual required">
diff --git a/engine/doc/classes/EncodedObjectAsID.xml b/engine/doc/classes/EncodedObjectAsID.xml
index 50745469..c930e6f5 100644
--- a/engine/doc/classes/EncodedObjectAsID.xml
+++ b/engine/doc/classes/EncodedObjectAsID.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EncodedObjectAsID" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EncodedObjectAsID" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds a reference to an [Object]'s instance ID.
 	</brief_description>
diff --git a/engine/doc/classes/Engine.xml b/engine/doc/classes/Engine.xml
index 450197e8..48981a36 100644
--- a/engine/doc/classes/Engine.xml
+++ b/engine/doc/classes/Engine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Engine" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Engine" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to engine properties.
 	</brief_description>
diff --git a/engine/doc/classes/EngineDebugger.xml b/engine/doc/classes/EngineDebugger.xml
index e0eb589c..3540f098 100644
--- a/engine/doc/classes/EngineDebugger.xml
+++ b/engine/doc/classes/EngineDebugger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EngineDebugger" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EngineDebugger" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exposes the internal debugger.
 	</brief_description>
diff --git a/engine/doc/classes/EngineProfiler.xml b/engine/doc/classes/EngineProfiler.xml
index dbaabc22..a974a3af 100644
--- a/engine/doc/classes/EngineProfiler.xml
+++ b/engine/doc/classes/EngineProfiler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EngineProfiler" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EngineProfiler" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for creating custom profilers.
 	</brief_description>
diff --git a/engine/doc/classes/Environment.xml b/engine/doc/classes/Environment.xml
index ca9d1407..cb77390c 100644
--- a/engine/doc/classes/Environment.xml
+++ b/engine/doc/classes/Environment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Environment" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Environment" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Resource for environment nodes (like [WorldEnvironment]) that define multiple rendering options.
 	</brief_description>
@@ -40,7 +40,6 @@
 		</member>
 		<member name="adjustment_color_correction" type="Texture" setter="set_adjustment_color_correction" getter="get_adjustment_color_correction">
 			The [Texture2D] or [Texture3D] lookup table (LUT) to use for the built-in post-process color grading. Can use a [GradientTexture1D] for a 1-dimensional LUT, or a [Texture3D] for a more complex LUT. Effective only if [member adjustment_enabled] is [code]true[/code].
-			[b]Note:[/b] Color correction does not currently support HDR output due to only supporting values in the SDR (0.0 to 1.0) range.
 		</member>
 		<member name="adjustment_contrast" type="float" setter="set_adjustment_contrast" getter="get_adjustment_contrast" default="1.0">
 			Increasing [member adjustment_contrast] will make dark values darker and bright values brighter. This simple adjustment is applied to the rendered image after tonemaping. When set to a value greater than [code]1.0[/code], [member adjustment_contrast] is prone to clipping colors that become too bright or too dark. Effective only if [member adjustment_enabled] is [code]true[/code].
@@ -321,7 +320,7 @@
 		</member>
 		<member name="tonemap_agx_white" type="float" setter="set_tonemap_agx_white" getter="get_tonemap_agx_white" default="16.29">
 			The white reference value for tonemapping, which indicates where bright white is located in the scale of values provided to the tonemapper. For photorealistic lighting, it is recommended to set [member tonemap_agx_white] to at least [code]6.0[/code]. Higher values result in less blown out highlights, but may make the scene appear lower contrast. [member tonemap_agx_white] is the same as [member tonemap_white], but is only effective with the [constant TONE_MAPPER_AGX] tonemapper. See also [member tonemap_exposure].
-			[b]Note:[/b] When using the Mobile renderer with [member Viewport.use_hdr_2d] disabled, [member tonemap_agx_white] is ignored and a white value of [code]2.0[/code] will always be used instead. Otherwise, [member tonemap_agx_white] will be dynamically adjusted at runtime by multiplying it by the parent window's [method Window.get_output_max_linear_value] when using [member Viewport.use_hdr_2d] to ensure good behavior with both SDR and HDR output.
+			[b]Note:[/b] When using the Mobile renderer with [member Viewport.use_hdr_2d] disabled, [member tonemap_agx_white] is ignored and a white value of [code]2.0[/code] will always be used instead.
 		</member>
 		<member name="tonemap_exposure" type="float" setter="set_tonemap_exposure" getter="get_tonemap_exposure" default="1.0">
 			Adjusts the brightness of values before they are provided to the tonemapper. Higher [member tonemap_exposure] values result in a brighter image. See also [member tonemap_white].
@@ -333,7 +332,6 @@
 		<member name="tonemap_white" type="float" setter="set_tonemap_white" getter="get_tonemap_white" default="1.0">
 			The white reference value for tonemapping, which indicates where bright white is located in the scale of values provided to the tonemapper. For photorealistic lighting, it is recommended to set [member tonemap_white] to at least [code]6.0[/code]. Higher values result in less blown out highlights, but may make the scene appear lower contrast. [member tonemap_agx_white] will be used instead when using the [constant TONE_MAPPER_AGX] tonemapper. See also [member tonemap_exposure].
 			[b]Note:[/b] [member tonemap_white] must be set to [code]2.0[/code] or lower on the Mobile renderer to produce bright images.
-			[b]Note:[/b] [member tonemap_white] is ignored when using [constant TONE_MAPPER_LINEAR] and will be dynamically adjusted at runtime to never be less than the parent window's [method Window.get_output_max_linear_value] when using [constant TONE_MAPPER_REINHARDT] with [member Viewport.use_hdr_2d].
 		</member>
 		<member name="volumetric_fog_albedo" type="Color" setter="set_volumetric_fog_albedo" getter="get_volumetric_fog_albedo" default="Color(1, 1, 1, 1)">
 			The [Color] of the volumetric fog when interacting with lights. Mist and fog have an albedo close to [code]Color(1, 1, 1, 1)[/code] while smoke has a darker albedo.
@@ -434,12 +432,10 @@
 		</constant>
 		<constant name="TONE_MAPPER_FILMIC" value="2" enum="ToneMapper">
 			Uses a film-like tonemapping curve to prevent clipping of bright values and provide better contrast than [constant TONE_MAPPER_REINHARDT]. Slightly slower than [constant TONE_MAPPER_REINHARDT].
-			[b]Note:[/b] This tonemapper does not support HDR output because it produces output in the SDR range. It is recommended to use a different tonemapper when rendering to an HDR screen.
 		</constant>
 		<constant name="TONE_MAPPER_ACES" value="3" enum="ToneMapper">
 			Uses a high-contrast film-like tonemapping curve and desaturates bright values for a more realistic appearance. Slightly slower than [constant TONE_MAPPER_FILMIC].
 			[b]Note:[/b] This tonemapping operator is called "ACES Fitted" in Godot 3.x.
-			[b]Note:[/b] This tonemapper does not support HDR output because it produces output in the SDR range. It is recommended to use a different tonemapper when rendering to an HDR screen.
 		</constant>
 		<constant name="TONE_MAPPER_AGX" value="4" enum="ToneMapper">
 			Uses an adjustable film-like tonemapping curve and desaturates bright values for a more realistic appearance. Better than other tonemappers at maintaining the hue of colors as they become brighter. The slowest tonemapping option.
@@ -448,11 +444,10 @@
 			Adds the glow effect to the scene.
 		</constant>
 		<constant name="GLOW_BLEND_MODE_SCREEN" value="1" enum="GlowBlendMode">
-			Adds the glow effect to the scene after modifying the glow influence based on the scene value; dark values will be highly influenced by glow and bright values will not be influenced by glow. This approach avoids bright values becoming overly bright from the glow effect. [member tonemap_white] is used to determine the maximum scene value where the glow should have no influence. When [member tonemap_mode] is set to [constant TONE_MAPPER_LINEAR] and [member Viewport.use_hdr_2d] is [code]true[/code], the parent window's [method Window.get_output_max_linear_value] will be used as the maximum scene value.
+			Adds the glow effect to the scene after modifying the glow influence based on the scene value; dark values will be highly influenced by glow and bright values will not be influenced by glow. This approach avoids bright values becoming overly bright from the glow effect. [member tonemap_white] is used to determine the maximum scene value where the glow should have no influence. When [member tonemap_mode] is set to [constant TONE_MAPPER_LINEAR], a value of [code]1.0[/code] will be used as the maximum scene value.
 		</constant>
 		<constant name="GLOW_BLEND_MODE_SOFTLIGHT" value="2" enum="GlowBlendMode">
 			Adds the glow effect to the tonemapped image after modifying the glow influence based on the image value; dark values and bright values will not be influenced by glow and mid-range values will be highly influenced by glow. This approach avoids bright values becoming overly bright from the glow effect. The glow will have the largest influence on image values of [code]0.25[/code] and will have no influence when applied to image values greater than [code]1.0[/code].
-			[b]Note:[/b] This blend mode does not support HDR output because expects a maximum output value of [code]1.0[/code]. It is recommended to use a different blend mode when rendering to an HDR screen.
 		</constant>
 		<constant name="GLOW_BLEND_MODE_REPLACE" value="3" enum="GlowBlendMode">
 			Replaces all pixels' color by the glow effect. This can be used to simulate a full-screen blur effect by tweaking the glow parameters to match the original image's brightness or to preview glow configuration in the editor.
diff --git a/engine/doc/classes/Expression.xml b/engine/doc/classes/Expression.xml
index 233bbd01..f2adb7d5 100644
--- a/engine/doc/classes/Expression.xml
+++ b/engine/doc/classes/Expression.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Expression" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Expression" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class that stores an expression you can execute.
 	</brief_description>
diff --git a/engine/doc/classes/ExternalTexture.xml b/engine/doc/classes/ExternalTexture.xml
index 3facc356..6f27b62f 100644
--- a/engine/doc/classes/ExternalTexture.xml
+++ b/engine/doc/classes/ExternalTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ExternalTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ExternalTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture which displays the content of an external buffer.
 	</brief_description>
diff --git a/engine/doc/classes/FABRIK3D.xml b/engine/doc/classes/FABRIK3D.xml
index 28d784a6..2e4a15ad 100644
--- a/engine/doc/classes/FABRIK3D.xml
+++ b/engine/doc/classes/FABRIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FABRIK3D" inherits="IterateIK3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FABRIK3D" inherits="IterateIK3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Position based forward and backward reaching inverse kinematics solver.
 	</brief_description>
diff --git a/engine/doc/classes/FileAccess.xml b/engine/doc/classes/FileAccess.xml
index 01f25880..cdfdb365 100644
--- a/engine/doc/classes/FileAccess.xml
+++ b/engine/doc/classes/FileAccess.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FileAccess" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FileAccess" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides methods for file reading and writing operations.
 	</brief_description>
@@ -425,7 +425,7 @@
 			<param index="0" name="position" type="int" default="0" />
 			<description>
 				Sets the file cursor to the specified position in bytes, from the end of the file. This changes the value returned by [method get_position].
-				[b]Note:[/b] This is an offset, so you should use negative numbers otherwise the file cursor will move past the end of the file.
+				[b]Note:[/b] This is an offset, so you should use negative numbers otherwise the file cursor will be at the end of the file.
 			</description>
 		</method>
 		<method name="set_extended_attribute" qualifiers="static">
diff --git a/engine/doc/classes/FileDialog.xml b/engine/doc/classes/FileDialog.xml
index dc8ffac2..20cc433c 100644
--- a/engine/doc/classes/FileDialog.xml
+++ b/engine/doc/classes/FileDialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FileDialog" inherits="ConfirmationDialog" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FileDialog" inherits="ConfirmationDialog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A dialog for selecting files or directories in the filesystem.
 	</brief_description>
@@ -258,18 +258,6 @@
 		<member name="option_count" type="int" setter="set_option_count" getter="get_option_count" default="0">
 			The number of additional [OptionButton]s and [CheckBox]es in the dialog.
 		</member>
-		<member name="option_{index}/default" type="int" setter="" getter="" default="0">
-			The default value for the option at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. option_count - 1[/code] range.
-		</member>
-		<member name="option_{index}/name" type="String" setter="" getter="" default="&quot;&quot;">
-			The name of the option at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. option_count - 1[/code] range.
-		</member>
-		<member name="option_{index}/values" type="PackedStringArray" setter="" getter="" default="PackedStringArray()">
-			The list of values for the option at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. option_count - 1[/code] range.
-		</member>
 		<member name="overwrite_warning_enabled" type="bool" setter="set_customization_flag_enabled" getter="is_customization_flag_enabled" default="true">
 			If [code]true[/code], the [FileDialog] will warn the user before overwriting files in save mode.
 		</member>
@@ -435,24 +423,6 @@
 		<theme_item name="list_mode" data_type="icon" type="Texture2D">
 			Icon for the button that enables list mode.
 		</theme_item>
-		<theme_item name="menu_copy_path" data_type="icon" type="Texture2D">
-			Icon for the "Copy Path" context menu option.
-		</theme_item>
-		<theme_item name="menu_delete" data_type="icon" type="Texture2D">
-			Icon for the "Delete" context menu option.
-		</theme_item>
-		<theme_item name="menu_new_folder" data_type="icon" type="Texture2D">
-			Icon for the "New Folder..." context menu option. Usually it should be the same as [theme_item create_folder]; leave it empty if you want the context menu to show no icons.
-		</theme_item>
-		<theme_item name="menu_open_bundle" data_type="icon" type="Texture2D">
-			Icon for the "Show Package Contents" context menu option. The option only appears for macOS bundles.
-		</theme_item>
-		<theme_item name="menu_refresh" data_type="icon" type="Texture2D">
-			Icon for the "Refresh" context menu option. Usually it should be the same as [theme_item reload]; leave it empty if you want the context menu to show no icons.
-		</theme_item>
-		<theme_item name="menu_show_in_file_manager" data_type="icon" type="Texture2D">
-			Icon for the "Show in File Manager" context menu option.
-		</theme_item>
 		<theme_item name="parent_folder" data_type="icon" type="Texture2D">
 			Custom icon for the parent folder arrow.
 		</theme_item>
diff --git a/engine/doc/classes/FileSystemDock.xml b/engine/doc/classes/FileSystemDock.xml
index 5603f47d..9ea38709 100644
--- a/engine/doc/classes/FileSystemDock.xml
+++ b/engine/doc/classes/FileSystemDock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FileSystemDock" inherits="EditorDock" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FileSystemDock" inherits="EditorDock" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's dock for managing files in the project.
 	</brief_description>
diff --git a/engine/doc/classes/FlowContainer.xml b/engine/doc/classes/FlowContainer.xml
index 9daa6735..28391439 100644
--- a/engine/doc/classes/FlowContainer.xml
+++ b/engine/doc/classes/FlowContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FlowContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FlowContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls horizontally or vertically and wraps them around at the borders.
 	</brief_description>
diff --git a/engine/doc/classes/FogMaterial.xml b/engine/doc/classes/FogMaterial.xml
index 4bfd5b93..f256555d 100644
--- a/engine/doc/classes/FogMaterial.xml
+++ b/engine/doc/classes/FogMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FogMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FogMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material that controls how volumetric fog is rendered, to be assigned to a [FogVolume].
 	</brief_description>
diff --git a/engine/doc/classes/FogVolume.xml b/engine/doc/classes/FogVolume.xml
index 05deffa8..74ccf569 100644
--- a/engine/doc/classes/FogVolume.xml
+++ b/engine/doc/classes/FogVolume.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FogVolume" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FogVolume" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A region that contributes to the default volumetric fog from the world environment.
 	</brief_description>
diff --git a/engine/doc/classes/FoldableContainer.xml b/engine/doc/classes/FoldableContainer.xml
index 10ac6c90..be3a5a47 100644
--- a/engine/doc/classes/FoldableContainer.xml
+++ b/engine/doc/classes/FoldableContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FoldableContainer" inherits="Container" api_type="core" keywords="expandable, collapsible, collapse, accordion, details" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FoldableContainer" inherits="Container" keywords="expandable, collapsible, collapse, accordion, details" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that can be expanded/collapsed.
 	</brief_description>
@@ -45,7 +45,7 @@
 			The [FoldableGroup] associated with the container. When multiple [FoldableContainer] nodes share the same group, only one of them is allowed to be unfolded.
 		</member>
 		<member name="folded" type="bool" setter="set_folded" getter="is_folded" default="false">
-			If [code]true[/code], the container will become folded and will hide all its children.
+			If [code]true[/code], the container will becomes folded and will hide all its children.
 		</member>
 		<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
 			Language code used for text shaping algorithms. If left empty, the current locale is used instead.
diff --git a/engine/doc/classes/FoldableGroup.xml b/engine/doc/classes/FoldableGroup.xml
index 636277ec..f803f0e8 100644
--- a/engine/doc/classes/FoldableGroup.xml
+++ b/engine/doc/classes/FoldableGroup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FoldableGroup" inherits="Resource" api_type="core" keywords="expandable, collapsible, collapse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FoldableGroup" inherits="Resource" keywords="expandable, collapsible, collapse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A group of foldable containers that doesn't allow more than one container to be expanded at a time.
 	</brief_description>
diff --git a/engine/doc/classes/Font.xml b/engine/doc/classes/Font.xml
index 91cb967c..df06cde5 100644
--- a/engine/doc/classes/Font.xml
+++ b/engine/doc/classes/Font.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Font" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Font" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for fonts and font variations.
 	</brief_description>
@@ -125,8 +125,6 @@
 			<param index="6" name="spacing_space" type="int" default="0" />
 			<param index="7" name="spacing_glyph" type="int" default="0" />
 			<param index="8" name="baseline_offset" type="float" default="0.0" />
-			<param index="9" name="palette_index" type="int" default="0" />
-			<param index="10" name="custom_colors" type="PackedColorArray" default="PackedColorArray()" />
 			<description>
 				Returns [TextServer] RID of the font cache for specific variation.
 			</description>
@@ -135,7 +133,7 @@
 			<return type="float" />
 			<param index="0" name="font_size" type="int" default="16" />
 			<description>
-				Returns the maximum font ascent (number of pixels above the baseline) of this font and all fallback fonts.
+				Returns the average font ascent (number of pixels above the baseline).
 				[b]Note:[/b] Real ascent of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate (e.g. as the ascent of empty line).
 			</description>
 		</method>
@@ -152,7 +150,7 @@
 			<return type="float" />
 			<param index="0" name="font_size" type="int" default="16" />
 			<description>
-				Returns the maximum font descent (number of pixels below the baseline) of this font and all fallback fonts.
+				Returns the average font descent (number of pixels below the baseline).
 				[b]Note:[/b] Real descent of the string is context-dependent and can be significantly different from the value returned by this function. Use it only as rough estimate (e.g. as the descent of empty line).
 			</description>
 		</method>
@@ -228,26 +226,6 @@
 				Returns [Dictionary] with OpenType font name strings (localized font names, version, description, license information, sample text, etc.).
 			</description>
 		</method>
-		<method name="get_palette_colors" qualifiers="const">
-			<return type="PackedColorArray" />
-			<param index="0" name="index" type="int" />
-			<description>
-				Returns the array in the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors. Colors can be overridden using [FontVariation].
-			</description>
-		</method>
-		<method name="get_palette_count" qualifiers="const">
-			<return type="int" />
-			<description>
-				Returns the number of predefined color palettes. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
-		<method name="get_palette_name" qualifiers="const">
-			<return type="String" />
-			<param index="0" name="index" type="int" />
-			<description>
-				Returns the name of the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
 		<method name="get_rids" qualifiers="const">
 			<return type="RID[]" />
 			<description>
diff --git a/engine/doc/classes/FontFile.xml b/engine/doc/classes/FontFile.xml
index f9d981e1..d3f5b520 100644
--- a/engine/doc/classes/FontFile.xml
+++ b/engine/doc/classes/FontFile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FontFile" inherits="Font" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FontFile" inherits="Font" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds font source data and prerendered glyph cache, imported from a dynamic or a bitmap font.
 	</brief_description>
diff --git a/engine/doc/classes/FontVariation.xml b/engine/doc/classes/FontVariation.xml
index c7928e85..08c2ec9a 100644
--- a/engine/doc/classes/FontVariation.xml
+++ b/engine/doc/classes/FontVariation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FontVariation" inherits="Font" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FontVariation" inherits="Font" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A variation of a font with additional settings.
 	</brief_description>
@@ -52,12 +52,6 @@
 		<member name="opentype_features" type="Dictionary" setter="set_opentype_features" getter="get_opentype_features" default="{}">
 			A set of OpenType feature tags. More info: [url=https://docs.microsoft.com/en-us/typography/opentype/spec/featuretags]OpenType feature tags[/url].
 		</member>
-		<member name="palette_custom_colors" type="PackedColorArray" setter="set_palette_custom_colors" getter="get_palette_custom_colors" default="PackedColorArray()">
-			An array of colors to override predefined palette. Use [code]Color(0, 0, 0, 0)[/code], to keep predefined palette color at specific position.
-		</member>
-		<member name="palette_index" type="int" setter="set_palette_index" getter="get_palette_index" default="0">
-			A palette index.
-		</member>
 		<member name="spacing_bottom" type="int" setter="set_spacing" getter="get_spacing" default="0">
 			Extra spacing at the bottom of the line in pixels.
 		</member>
diff --git a/engine/doc/classes/FramebufferCacheRD.xml b/engine/doc/classes/FramebufferCacheRD.xml
index 8197e065..63d512eb 100644
--- a/engine/doc/classes/FramebufferCacheRD.xml
+++ b/engine/doc/classes/FramebufferCacheRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FramebufferCacheRD" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="FramebufferCacheRD" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Framebuffer cache manager for Rendering Device based renderers.
 	</brief_description>
diff --git a/engine/doc/classes/GDExtension.xml b/engine/doc/classes/GDExtension.xml
index 87689eca..c78cd3a5 100644
--- a/engine/doc/classes/GDExtension.xml
+++ b/engine/doc/classes/GDExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDExtension" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GDExtension" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A native library for GDExtension.
 	</brief_description>
diff --git a/engine/doc/classes/GDExtensionManager.xml b/engine/doc/classes/GDExtensionManager.xml
index a2c60b1c..93d79c86 100644
--- a/engine/doc/classes/GDExtensionManager.xml
+++ b/engine/doc/classes/GDExtensionManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDExtensionManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GDExtensionManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to GDExtension functionality.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticles2D.xml b/engine/doc/classes/GPUParticles2D.xml
index 45d90eda..e211584f 100644
--- a/engine/doc/classes/GPUParticles2D.xml
+++ b/engine/doc/classes/GPUParticles2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticles2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticles2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D particle emitter.
 	</brief_description>
@@ -44,10 +44,9 @@
 		<method name="request_particles_process">
 			<return type="void" />
 			<param index="0" name="process_time" type="float" />
-			<param index="1" name="process_time_residual" type="float" default="0" />
 			<description>
 				Requests the particles to process for extra process time during a single frame.
-				[param process_time] defines the time that the particles will process while emitting is on. [param process_time_residual] defines the time that particles will process with emitting turned off for the simulation. When combined with [member speed_scale] set to [code]0.0[/code], this is useful to be able to seek a particle system timeline.
+				Useful for particle playback, if used in combination with [member use_fixed_seed] or by calling [method restart] with parameter [code]keep_seed[/code] set to [code]true[/code].
 			</description>
 		</method>
 		<method name="restart">
diff --git a/engine/doc/classes/GPUParticles3D.xml b/engine/doc/classes/GPUParticles3D.xml
index fcc5f06f..1dc64c7f 100644
--- a/engine/doc/classes/GPUParticles3D.xml
+++ b/engine/doc/classes/GPUParticles3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticles3D" inherits="GeometryInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticles3D" inherits="GeometryInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D particle emitter.
 	</brief_description>
@@ -49,10 +49,9 @@
 		<method name="request_particles_process">
 			<return type="void" />
 			<param index="0" name="process_time" type="float" />
-			<param index="1" name="process_time_residual" type="float" default="0.0" />
 			<description>
 				Requests the particles to process for extra process time during a single frame.
-				[param process_time] defines the time that the particles will process while emitting is on. [param process_time_residual] defines the time that particles will process with emitting turned off for the simulation. When combined with [member speed_scale] set to [code]0.0[/code], this is useful to be able to seek a particle system timeline.
+				Useful for particle playback, if used in combination with [member use_fixed_seed] or by calling [method restart] with parameter [code]keep_seed[/code] set to [code]true[/code].
 			</description>
 		</method>
 		<method name="restart">
@@ -166,13 +165,6 @@
 			The amount of time the particle's trail should represent (in seconds). Only effective if [member trail_enabled] is [code]true[/code].
 		</member>
 		<member name="transform_align" type="int" setter="set_transform_align" getter="get_transform_align" enum="GPUParticles3D.TransformAlign" default="0">
-			The alignment of particles. Use this for billboarding and aligning to velocity.
-		</member>
-		<member name="transform_align_axis" type="int" setter="set_transform_align_axis" getter="get_transform_align_axis" enum="RenderingServer.ParticlesTransformAlignAxis">
-			When using transform align local billboard, which axis to use for the billboarding. Supports only X or Y.
-		</member>
-		<member name="transform_align_channel_filter" type="int" setter="set_transform_align_channel_filter" getter="get_transform_align_channel_filter" enum="RenderingServer.ParticlesTransformAlignCustomSrc">
-			In the case of billboarded particles, which custom channel to read from to calculate their angle.
 		</member>
 		<member name="use_fixed_seed" type="bool" setter="set_use_fixed_seed" getter="get_use_fixed_seed" default="false">
 			If [code]true[/code], particles will use the same seed for every simulation using the seed defined in [member seed]. This is useful for situations where the visual outcome should be consistent across replays, for example when using Movie Maker mode.
@@ -224,19 +216,12 @@
 			Maximum number of draw passes supported.
 		</constant>
 		<constant name="TRANSFORM_ALIGN_DISABLED" value="0" enum="TransformAlign">
-			Do not align particle transforms relative to the camera or velocity.
 		</constant>
 		<constant name="TRANSFORM_ALIGN_Z_BILLBOARD" value="1" enum="TransformAlign">
-			Align each particle's Z axis to face the camera.
 		</constant>
 		<constant name="TRANSFORM_ALIGN_Y_TO_VELOCITY" value="2" enum="TransformAlign">
-			Align each particle's Y axis to the velocity vector.
 		</constant>
 		<constant name="TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY" value="3" enum="TransformAlign">
-			Align each particle's Z axis to face the camera and Y axis to the velocity vector.
-		</constant>
-		<constant name="TRANSFORM_ALIGN_LOCAL_BILLBOARD" value="4" enum="TransformAlign">
-			Align each particle's Z axis to face the camera, while preserving a given axis (X or Y).
 		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/GPUParticlesAttractor3D.xml b/engine/doc/classes/GPUParticlesAttractor3D.xml
index 90a4fe7d..0d219e4b 100644
--- a/engine/doc/classes/GPUParticlesAttractor3D.xml
+++ b/engine/doc/classes/GPUParticlesAttractor3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesAttractor3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesAttractor3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 3D particle attractors.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesAttractorBox3D.xml b/engine/doc/classes/GPUParticlesAttractorBox3D.xml
index d3d26bb9..410d5044 100644
--- a/engine/doc/classes/GPUParticlesAttractorBox3D.xml
+++ b/engine/doc/classes/GPUParticlesAttractorBox3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesAttractorBox3D" inherits="GPUParticlesAttractor3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesAttractorBox3D" inherits="GPUParticlesAttractor3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A box-shaped attractor that influences particles from [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesAttractorSphere3D.xml b/engine/doc/classes/GPUParticlesAttractorSphere3D.xml
index b289db59..599d7e4e 100644
--- a/engine/doc/classes/GPUParticlesAttractorSphere3D.xml
+++ b/engine/doc/classes/GPUParticlesAttractorSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesAttractorSphere3D" inherits="GPUParticlesAttractor3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesAttractorSphere3D" inherits="GPUParticlesAttractor3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A spheroid-shaped attractor that influences particles from [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesAttractorVectorField3D.xml b/engine/doc/classes/GPUParticlesAttractorVectorField3D.xml
index 354d0b7d..7cb5524a 100644
--- a/engine/doc/classes/GPUParticlesAttractorVectorField3D.xml
+++ b/engine/doc/classes/GPUParticlesAttractorVectorField3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesAttractorVectorField3D" inherits="GPUParticlesAttractor3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesAttractorVectorField3D" inherits="GPUParticlesAttractor3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A box-shaped attractor with varying directions and strengths defined in it that influences particles from [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesCollision3D.xml b/engine/doc/classes/GPUParticlesCollision3D.xml
index f4e4a0f9..2d398edd 100644
--- a/engine/doc/classes/GPUParticlesCollision3D.xml
+++ b/engine/doc/classes/GPUParticlesCollision3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesCollision3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesCollision3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 3D particle collision shapes affecting [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesCollisionBox3D.xml b/engine/doc/classes/GPUParticlesCollisionBox3D.xml
index 666dabb3..fc225e46 100644
--- a/engine/doc/classes/GPUParticlesCollisionBox3D.xml
+++ b/engine/doc/classes/GPUParticlesCollisionBox3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesCollisionBox3D" inherits="GPUParticlesCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesCollisionBox3D" inherits="GPUParticlesCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A box-shaped 3D particle collision shape affecting [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesCollisionHeightField3D.xml b/engine/doc/classes/GPUParticlesCollisionHeightField3D.xml
index 998fd517..04bfbdb6 100644
--- a/engine/doc/classes/GPUParticlesCollisionHeightField3D.xml
+++ b/engine/doc/classes/GPUParticlesCollisionHeightField3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesCollisionHeightField3D" inherits="GPUParticlesCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesCollisionHeightField3D" inherits="GPUParticlesCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A real-time heightmap-shaped 3D particle collision shape affecting [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesCollisionSDF3D.xml b/engine/doc/classes/GPUParticlesCollisionSDF3D.xml
index 6cacaaf7..11978e07 100644
--- a/engine/doc/classes/GPUParticlesCollisionSDF3D.xml
+++ b/engine/doc/classes/GPUParticlesCollisionSDF3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesCollisionSDF3D" inherits="GPUParticlesCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesCollisionSDF3D" inherits="GPUParticlesCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A baked signed distance field 3D particle collision shape affecting [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/GPUParticlesCollisionSphere3D.xml b/engine/doc/classes/GPUParticlesCollisionSphere3D.xml
index fd75abb3..fe2fe3d4 100644
--- a/engine/doc/classes/GPUParticlesCollisionSphere3D.xml
+++ b/engine/doc/classes/GPUParticlesCollisionSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GPUParticlesCollisionSphere3D" inherits="GPUParticlesCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GPUParticlesCollisionSphere3D" inherits="GPUParticlesCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A sphere-shaped 3D particle collision shape affecting [GPUParticles3D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/Generic6DOFJoint3D.xml b/engine/doc/classes/Generic6DOFJoint3D.xml
index 0b6a805b..2482defd 100644
--- a/engine/doc/classes/Generic6DOFJoint3D.xml
+++ b/engine/doc/classes/Generic6DOFJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Generic6DOFJoint3D" inherits="Joint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Generic6DOFJoint3D" inherits="Joint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that allows for complex movement and rotation between two 3D physics bodies.
 	</brief_description>
diff --git a/engine/doc/classes/Geometry2D.xml b/engine/doc/classes/Geometry2D.xml
index c2d0fdc4..774bff61 100644
--- a/engine/doc/classes/Geometry2D.xml
+++ b/engine/doc/classes/Geometry2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Geometry2D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Geometry2D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides methods for some common 2D geometric operations.
 	</brief_description>
diff --git a/engine/doc/classes/Geometry3D.xml b/engine/doc/classes/Geometry3D.xml
index a17ceeb9..9f876829 100644
--- a/engine/doc/classes/Geometry3D.xml
+++ b/engine/doc/classes/Geometry3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Geometry3D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Geometry3D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides methods for some common 3D geometric operations.
 	</brief_description>
diff --git a/engine/doc/classes/GeometryInstance3D.xml b/engine/doc/classes/GeometryInstance3D.xml
index abf87c8d..d55a8c6c 100644
--- a/engine/doc/classes/GeometryInstance3D.xml
+++ b/engine/doc/classes/GeometryInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GeometryInstance3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GeometryInstance3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base node for geometry-based visual instances.
 	</brief_description>
@@ -34,7 +34,7 @@
 			The mode used to cast shadows from this instance.
 		</member>
 		<member name="custom_aabb" type="AABB" setter="set_custom_aabb" getter="get_custom_aabb" default="AABB(0, 0, 0, 0, 0, 0)">
-			Overrides the bounding box of this node with a custom one. This can be used to avoid the expensive [AABB] recalculation that happens when a skeleton is used with a [MeshInstance3D] or to have precise control over the [MeshInstance3D]'s bounding box. To use the default AABB, set value to an [AABB] with all fields set to [code]0.0[/code]. To avoid frustum culling, set [member custom_aabb] to a very large AABB that covers your entire game world such as [code]AABB(-10000, -10000, -10000, 20000, 20000, 20000)[/code]. To disable all forms of culling (including occlusion and layer culling), call [method RenderingServer.instance_set_ignore_culling] on the [GeometryInstance3D]'s [RID].
+			Overrides the bounding box of this node with a custom one. This can be used to avoid the expensive [AABB] recalculation that happens when a skeleton is used with a [MeshInstance3D] or to have precise control over the [MeshInstance3D]'s bounding box. To use the default AABB, set value to an [AABB] with all fields set to [code]0.0[/code]. To avoid frustum culling, set [member custom_aabb] to a very large AABB that covers your entire game world such as [code]AABB(-10000, -10000, -10000, 20000, 20000, 20000)[/code]. To disable all forms of culling (including occlusion culling), call [method RenderingServer.instance_set_ignore_culling] on the [GeometryInstance3D]'s [RID].
 		</member>
 		<member name="extra_cull_margin" type="float" setter="set_extra_cull_margin" getter="get_extra_cull_margin" default="0.0">
 			The extra distance added to the GeometryInstance3D's bounding box ([AABB]) to increase its cull box.
diff --git a/engine/doc/classes/GodotInstance.xml b/engine/doc/classes/GodotInstance.xml
index f8778f51..a071cb0a 100644
--- a/engine/doc/classes/GodotInstance.xml
+++ b/engine/doc/classes/GodotInstance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GodotInstance" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GodotInstance" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to an embedded Godot instance.
 	</brief_description>
diff --git a/engine/doc/classes/Gradient.xml b/engine/doc/classes/Gradient.xml
index dbe1a5f2..c5c74ebc 100644
--- a/engine/doc/classes/Gradient.xml
+++ b/engine/doc/classes/Gradient.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Gradient" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Gradient" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A color transition.
 	</brief_description>
diff --git a/engine/doc/classes/GradientTexture1D.xml b/engine/doc/classes/GradientTexture1D.xml
index 9583118b..4e6b76c0 100644
--- a/engine/doc/classes/GradientTexture1D.xml
+++ b/engine/doc/classes/GradientTexture1D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GradientTexture1D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GradientTexture1D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 1D texture that uses colors obtained from a [Gradient].
 	</brief_description>
diff --git a/engine/doc/classes/GradientTexture2D.xml b/engine/doc/classes/GradientTexture2D.xml
index bb93310e..f11b2a60 100644
--- a/engine/doc/classes/GradientTexture2D.xml
+++ b/engine/doc/classes/GradientTexture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GradientTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GradientTexture2D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D texture that creates a pattern with colors obtained from a [Gradient].
 	</brief_description>
@@ -46,9 +46,6 @@
 		<constant name="FILL_SQUARE" value="2" enum="Fill">
 			The colors are linearly interpolated in a square pattern.
 		</constant>
-		<constant name="FILL_CONIC" value="3" enum="Fill">
-			The colors are linearly interpolated in a cone pattern.
-		</constant>
 		<constant name="REPEAT_NONE" value="0" enum="Repeat">
 			The gradient fill is restricted to the range defined by [member fill_from] to [member fill_to] offsets.
 		</constant>
diff --git a/engine/doc/classes/GraphEdit.xml b/engine/doc/classes/GraphEdit.xml
index 60d2a4ec..c73b4e29 100644
--- a/engine/doc/classes/GraphEdit.xml
+++ b/engine/doc/classes/GraphEdit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GraphEdit" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GraphEdit" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An editor for graph-like structures, using [GraphNode]s.
 	</brief_description>
diff --git a/engine/doc/classes/GraphElement.xml b/engine/doc/classes/GraphElement.xml
index 41cb5afc..7aac150b 100644
--- a/engine/doc/classes/GraphElement.xml
+++ b/engine/doc/classes/GraphElement.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GraphElement" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GraphElement" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that represents a basic element that can be placed inside a [GraphEdit] control.
 	</brief_description>
diff --git a/engine/doc/classes/GraphFrame.xml b/engine/doc/classes/GraphFrame.xml
index 53bf9cc5..ce8d3e97 100644
--- a/engine/doc/classes/GraphFrame.xml
+++ b/engine/doc/classes/GraphFrame.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GraphFrame" inherits="GraphElement" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GraphFrame" inherits="GraphElement" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		GraphFrame is a special [GraphElement] that can be used to organize other [GraphElement]s inside a [GraphEdit].
 	</brief_description>
diff --git a/engine/doc/classes/GraphNode.xml b/engine/doc/classes/GraphNode.xml
index 0df18879..6ea454f3 100644
--- a/engine/doc/classes/GraphNode.xml
+++ b/engine/doc/classes/GraphNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GraphNode" inherits="GraphElement" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GraphNode" inherits="GraphElement" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container with connection ports, representing a node in a [GraphEdit].
 	</brief_description>
diff --git a/engine/doc/classes/GridContainer.xml b/engine/doc/classes/GridContainer.xml
index 31707779..76f789a0 100644
--- a/engine/doc/classes/GridContainer.xml
+++ b/engine/doc/classes/GridContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GridContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GridContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls in a grid layout.
 	</brief_description>
diff --git a/engine/doc/classes/GrooveJoint2D.xml b/engine/doc/classes/GrooveJoint2D.xml
index 3e9f6a99..a9c4f19c 100644
--- a/engine/doc/classes/GrooveJoint2D.xml
+++ b/engine/doc/classes/GrooveJoint2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GrooveJoint2D" inherits="Joint2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="GrooveJoint2D" inherits="Joint2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that restricts the movement of two 2D physics bodies to a fixed axis.
 	</brief_description>
diff --git a/engine/doc/classes/HBoxContainer.xml b/engine/doc/classes/HBoxContainer.xml
index a9d9b03a..f531f3f9 100644
--- a/engine/doc/classes/HBoxContainer.xml
+++ b/engine/doc/classes/HBoxContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HBoxContainer" inherits="BoxContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HBoxContainer" inherits="BoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls horizontally.
 	</brief_description>
diff --git a/engine/doc/classes/HFlowContainer.xml b/engine/doc/classes/HFlowContainer.xml
index 75fec3d0..36a87376 100644
--- a/engine/doc/classes/HFlowContainer.xml
+++ b/engine/doc/classes/HFlowContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HFlowContainer" inherits="FlowContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HFlowContainer" inherits="FlowContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls horizontally and wraps them around at the borders.
 	</brief_description>
diff --git a/engine/doc/classes/HMACContext.xml b/engine/doc/classes/HMACContext.xml
index fec7aa19..a5d3cea5 100644
--- a/engine/doc/classes/HMACContext.xml
+++ b/engine/doc/classes/HMACContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HMACContext" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HMACContext" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Used to create an HMAC for a message using a key.
 	</brief_description>
diff --git a/engine/doc/classes/HScrollBar.xml b/engine/doc/classes/HScrollBar.xml
index 7196053a..a07f00f8 100644
--- a/engine/doc/classes/HScrollBar.xml
+++ b/engine/doc/classes/HScrollBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HScrollBar" inherits="ScrollBar" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HScrollBar" inherits="ScrollBar" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A horizontal scrollbar that goes from left (min) to right (max).
 	</brief_description>
diff --git a/engine/doc/classes/HSeparator.xml b/engine/doc/classes/HSeparator.xml
index 546ae240..ffba571f 100644
--- a/engine/doc/classes/HSeparator.xml
+++ b/engine/doc/classes/HSeparator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HSeparator" inherits="Separator" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HSeparator" inherits="Separator" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A horizontal line used for separating other controls.
 	</brief_description>
diff --git a/engine/doc/classes/HSlider.xml b/engine/doc/classes/HSlider.xml
index 1a7b5585..40ec408f 100644
--- a/engine/doc/classes/HSlider.xml
+++ b/engine/doc/classes/HSlider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HSlider" inherits="Slider" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HSlider" inherits="Slider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A horizontal slider that goes from left (min) to right (max).
 	</brief_description>
diff --git a/engine/doc/classes/HSplitContainer.xml b/engine/doc/classes/HSplitContainer.xml
index 4dadeee2..1d8dbcb1 100644
--- a/engine/doc/classes/HSplitContainer.xml
+++ b/engine/doc/classes/HSplitContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HSplitContainer" inherits="SplitContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HSplitContainer" inherits="SplitContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that splits two child controls horizontally and provides a grabber for adjusting the split ratio.
 	</brief_description>
diff --git a/engine/doc/classes/HTTPClient.xml b/engine/doc/classes/HTTPClient.xml
index e7f04cec..08dc5fef 100644
--- a/engine/doc/classes/HTTPClient.xml
+++ b/engine/doc/classes/HTTPClient.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HTTPClient" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HTTPClient" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Low-level hyper-text transfer protocol client.
 	</brief_description>
diff --git a/engine/doc/classes/HTTPRequest.xml b/engine/doc/classes/HTTPRequest.xml
index a0208da6..ff87a3eb 100644
--- a/engine/doc/classes/HTTPRequest.xml
+++ b/engine/doc/classes/HTTPRequest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HTTPRequest" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HTTPRequest" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node with the ability to send HTTP(S) requests.
 	</brief_description>
diff --git a/engine/doc/classes/HashingContext.xml b/engine/doc/classes/HashingContext.xml
index f1f2dea8..b3be3494 100644
--- a/engine/doc/classes/HashingContext.xml
+++ b/engine/doc/classes/HashingContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HashingContext" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HashingContext" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides functionality for computing cryptographic hashes chunk by chunk.
 	</brief_description>
diff --git a/engine/doc/classes/HeightMapShape3D.xml b/engine/doc/classes/HeightMapShape3D.xml
index 1040b06f..77c857f6 100644
--- a/engine/doc/classes/HeightMapShape3D.xml
+++ b/engine/doc/classes/HeightMapShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HeightMapShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HeightMapShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D heightmap shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/HingeJoint3D.xml b/engine/doc/classes/HingeJoint3D.xml
index 4de1973a..72594713 100644
--- a/engine/doc/classes/HingeJoint3D.xml
+++ b/engine/doc/classes/HingeJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="HingeJoint3D" inherits="Joint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="HingeJoint3D" inherits="Joint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that restricts the rotation of a 3D physics body around an axis relative to another physics body.
 	</brief_description>
diff --git a/engine/doc/classes/IKModifier3D.xml b/engine/doc/classes/IKModifier3D.xml
index dfc58690..cf698efa 100644
--- a/engine/doc/classes/IKModifier3D.xml
+++ b/engine/doc/classes/IKModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="IKModifier3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="IKModifier3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for inverse kinematics which may modify more than one bone.
 	</brief_description>
diff --git a/engine/doc/classes/IP.xml b/engine/doc/classes/IP.xml
index 14714b72..00f6e3af 100644
--- a/engine/doc/classes/IP.xml
+++ b/engine/doc/classes/IP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="IP" inherits="Object" api_type="core" keywords="dns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="IP" inherits="Object" keywords="dns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Internet protocol (IP) support functions such as DNS resolution.
 	</brief_description>
diff --git a/engine/doc/classes/Image.xml b/engine/doc/classes/Image.xml
index fed764b8..23ee287f 100644
--- a/engine/doc/classes/Image.xml
+++ b/engine/doc/classes/Image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Image" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Image" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Image datatype.
 	</brief_description>
@@ -446,7 +446,6 @@
 			<param index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1" />
 			<description>
 				Resizes the image to the given [param width] and [param height]. New pixels are calculated using the [param interpolation] mode defined via [enum Interpolation] constants.
-				[b]Note:[/b] If the image's format is [constant FORMAT_RGBA4444], [constant FORMAT_RGB565], or [constant FORMAT_RGBE9995], it will be temporarily converted to either [constant FORMAT_RGBA8] or [constant FORMAT_RGBAH]. This can affect the quality of the resized image.
 			</description>
 		</method>
 		<method name="resize_to_po2">
@@ -495,21 +494,15 @@
 			<return type="int" enum="Error" />
 			<param index="0" name="path" type="String" />
 			<param index="1" name="grayscale" type="bool" default="false" />
-			<param index="2" name="color_image" type="bool" default="false" />
-			<param index="3" name="max_linear_value" type="float" default="-1.0" />
 			<description>
-				Saves the image as an EXR file to [param path]. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. Set [param color_image] to [code]true[/code] when saving a color image, such as a screenshot. Negative values will be included when [param color_image] is [code]false[/code], which may be useful for saving raw floating point data such as a lightmap that includes negative light information. Color component values in the resulting EXR file will not exceed [param max_linear_value] if [param max_linear_value] is not negative. This function will return [constant ERR_UNAVAILABLE] if Godot was compiled without the TinyEXR module.
-				When saving screenshots of a project that uses HDR output, use [method Window.get_output_max_linear_value] for [param max_linear_value].
+				Saves the image as an EXR file to [param path]. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return [constant ERR_UNAVAILABLE] if Godot was compiled without the TinyEXR module.
 			</description>
 		</method>
 		<method name="save_exr_to_buffer" qualifiers="const">
 			<return type="PackedByteArray" />
 			<param index="0" name="grayscale" type="bool" default="false" />
-			<param index="1" name="color_image" type="bool" default="false" />
-			<param index="2" name="max_linear_value" type="float" default="-1.0" />
 			<description>
-				Saves the image as an EXR file to a byte array. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. Set [param color_image] to [code]true[/code] when saving a color image, such as a screenshot. Negative values will be included when [param color_image] is [code]false[/code], which may be useful for saving raw floating point data such as a lightmap that includes negative light information. Color component values in the resulting EXR file will not exceed [param max_linear_value] if [param max_linear_value] is not negative. This function will return an empty byte array if Godot was compiled without the TinyEXR module.
-				When saving screenshots of a project that uses HDR output, use [method Window.get_output_max_linear_value] for [param max_linear_value].
+				Saves the image as an EXR file to a byte array. If [param grayscale] is [code]true[/code] and the image has only one channel, it will be saved explicitly as monochrome rather than one red channel. This function will return an empty byte array if Godot was compiled without the TinyEXR module.
 			</description>
 		</method>
 		<method name="save_jpg" qualifiers="const">
diff --git a/engine/doc/classes/ImageFormatLoader.xml b/engine/doc/classes/ImageFormatLoader.xml
index 07484224..a2276675 100644
--- a/engine/doc/classes/ImageFormatLoader.xml
+++ b/engine/doc/classes/ImageFormatLoader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImageFormatLoader" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImageFormatLoader" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class to add support for specific image formats.
 	</brief_description>
diff --git a/engine/doc/classes/ImageFormatLoaderExtension.xml b/engine/doc/classes/ImageFormatLoaderExtension.xml
index 1d1d88d4..a7556695 100644
--- a/engine/doc/classes/ImageFormatLoaderExtension.xml
+++ b/engine/doc/classes/ImageFormatLoaderExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImageFormatLoaderExtension" inherits="ImageFormatLoader" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImageFormatLoaderExtension" inherits="ImageFormatLoader" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for creating [ImageFormatLoader] extensions (adding support for extra image formats).
 	</brief_description>
diff --git a/engine/doc/classes/ImageTexture.xml b/engine/doc/classes/ImageTexture.xml
index 842dcb17..e1ab8458 100644
--- a/engine/doc/classes/ImageTexture.xml
+++ b/engine/doc/classes/ImageTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImageTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImageTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Texture2D] based on an [Image].
 	</brief_description>
@@ -36,6 +36,12 @@
 				Creates a new [ImageTexture] and initializes it by allocating and setting the data from an [Image].
 			</description>
 		</method>
+		<method name="get_format" qualifiers="const">
+			<return type="int" enum="Image.Format" />
+			<description>
+				Returns the format of the texture.
+			</description>
+		</method>
 		<method name="set_image">
 			<return type="void" />
 			<param index="0" name="image" type="Image" />
diff --git a/engine/doc/classes/ImageTexture3D.xml b/engine/doc/classes/ImageTexture3D.xml
index 655dc014..3d2aec1c 100644
--- a/engine/doc/classes/ImageTexture3D.xml
+++ b/engine/doc/classes/ImageTexture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImageTexture3D" inherits="Texture3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImageTexture3D" inherits="Texture3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture with 3 dimensions.
 	</brief_description>
diff --git a/engine/doc/classes/ImageTextureLayered.xml b/engine/doc/classes/ImageTextureLayered.xml
index ae31d424..5ced4bf7 100644
--- a/engine/doc/classes/ImageTextureLayered.xml
+++ b/engine/doc/classes/ImageTextureLayered.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImageTextureLayered" inherits="TextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImageTextureLayered" inherits="TextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for texture types which contain the data of multiple [ImageTexture]s. Each image is of the same size and format.
 	</brief_description>
diff --git a/engine/doc/classes/ImmediateMesh.xml b/engine/doc/classes/ImmediateMesh.xml
index 3bf008e6..d5228b54 100644
--- a/engine/doc/classes/ImmediateMesh.xml
+++ b/engine/doc/classes/ImmediateMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImmediateMesh" inherits="Mesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImmediateMesh" inherits="Mesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Mesh optimized for creating geometry manually.
 	</brief_description>
diff --git a/engine/doc/classes/ImporterMesh.xml b/engine/doc/classes/ImporterMesh.xml
index da7ca355..8d4bc028 100644
--- a/engine/doc/classes/ImporterMesh.xml
+++ b/engine/doc/classes/ImporterMesh.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImporterMesh" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImporterMesh" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Resource] that contains vertex array-based geometry during the import process.
 	</brief_description>
 	<description>
 		ImporterMesh is a type of [Resource] analogous to [ArrayMesh]. It contains vertex array-based geometry, divided in [i]surfaces[/i]. Each surface contains a completely separate array and a material used to draw it. Design wise, a mesh with multiple surfaces is preferred to a single surface, because objects created in 3D editing software commonly contain multiple materials.
-		Unlike its runtime counterpart, [ImporterMesh] contains mesh data before various import steps, such as LOD and shadow mesh generation, have taken place. Modify surface data by calling [method clear], followed by [method add_surface] for each surface.
+		Unlike its runtime counterpart, [ImporterMesh] contains mesh data before various import steps, such as lod and shadow mesh generation, have taken place. Modify surface data by calling [method clear], followed by [method add_surface] for each surface.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -168,17 +168,6 @@
 				Returns the primitive type of the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="merge_importer_meshes" qualifiers="static">
-			<return type="ImporterMesh" />
-			<param index="0" name="importer_meshes" type="ImporterMesh[]" />
-			<param index="1" name="relative_transforms" type="Transform3D[]" />
-			<param index="2" name="deduplicate_surfaces" type="bool" default="true" />
-			<description>
-				Merges multiple [ImporterMesh]es into a single [ImporterMesh]. Each input mesh is transformed by the corresponding [Transform3D] in the [param relative_transforms] array, which must be the same size as [param importer_meshes]. Negative scales are supported, and the winding order in the mesh data will be corrected to account for this.
-				If [param deduplicate_surfaces] is [code]true[/code] and multiple meshes have surfaces with the same names and formats, the surfaces will be merged together when the meshes are merged, and will use the material from the first matching surface. This is useful for reducing the number of surfaces in the resulting mesh, and avoids duplicating materials. Surfaces with bone weights will never be deduplicated. If [param deduplicate_surfaces] is [code]false[/code], the surfaces will always be kept separate, and will be given unique names.
-				[b]Warning:[/b] Blend shapes and LODs are not supported and will be discarded. Do not use this function to discard blend shapes and LODs, as support for these may be added in the future.
-			</description>
-		</method>
 		<method name="set_blend_shape_mode">
 			<return type="void" />
 			<param index="0" name="mode" type="int" enum="Mesh.BlendShapeMode" />
diff --git a/engine/doc/classes/ImporterMeshInstance3D.xml b/engine/doc/classes/ImporterMeshInstance3D.xml
index 510c854d..9ace4540 100644
--- a/engine/doc/classes/ImporterMeshInstance3D.xml
+++ b/engine/doc/classes/ImporterMeshInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ImporterMeshInstance3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ImporterMeshInstance3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/Input.xml b/engine/doc/classes/Input.xml
index e26640a4..b593b3a6 100644
--- a/engine/doc/classes/Input.xml
+++ b/engine/doc/classes/Input.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Input" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Input" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for handling inputs.
 	</brief_description>
@@ -38,15 +38,6 @@
 				Adds a new mapping entry (in SDL2 format) to the mapping database. Optionally update already connected devices.
 			</description>
 		</method>
-		<method name="clear_joy_motion_sensors_calibration" experimental="">
-			<return type="void" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Clears the calibration information for the specified joypad's motion sensors, if it has any and if they were calibrated.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
 		<method name="flush_buffered_events">
 			<return type="void" />
 			<description>
@@ -94,7 +85,6 @@
 			<return type="int[]" />
 			<description>
 				Returns an [Array] containing the device IDs of all currently connected joypads.
-				[b]Note:[/b] The order of connected joypads can not be guaranteed to be the same after a project and/or the editor is restarted, because Godot doesn't save the order of joypad connections. Joypads are registered in the order they are discovered by Godot.
 			</description>
 		</method>
 		<method name="get_current_cursor_shape" qualifiers="const">
@@ -119,19 +109,6 @@
 				[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/enable_gyroscope] must be enabled.
 			</description>
 		</method>
-		<method name="get_joy_accelerometer" qualifiers="const" experimental="">
-			<return type="Vector3" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the acceleration, including the force of gravity, in m/s² of the joypad's accelerometer sensor, if the joypad has one and it's currently enabled. Otherwise, the method returns [constant Vector3.ZERO]. See also [method get_joy_gravity] and [method set_joy_motion_sensors_enabled].
-				For a joypad held in front of you, the returned axes are defined as follows:
-				+X ... -X: left ... right;
-				+Y ... -Y: bottom ... top;
-				+Z ... -Z: farther ... closer.
-				The gravity part value is measured as a vector with length of [code]9.8[/code] away from the center of the Earth, which is a negative Y value.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS. On iOS, joypad accelerometer sensor reading is not supported due to OS limitations.
-			</description>
-		</method>
 		<method name="get_joy_axis" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="device" type="int" />
@@ -140,19 +117,6 @@
 				Returns the current value of the joypad axis at index [param axis].
 			</description>
 		</method>
-		<method name="get_joy_gravity" qualifiers="const" experimental="">
-			<return type="Vector3" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the gravity in m/s² of the joypad's accelerometer sensor, if the joypad has one and it's currently enabled. Otherwise, the method returns [constant Vector3.ZERO]. See also [method get_joy_accelerometer] and [method set_joy_motion_sensors_enabled].
-				For a joypad held in front of you, the returned axes are defined as follows:
-				+X ... -X: left ... right;
-				+Y ... -Y: bottom ... top;
-				+Z ... -Z: farther ... closer.
-				The gravity part value is measured as a vector with length of [code]9.8[/code] away from the center of the Earth, which is a negative Y value.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS. On iOS, joypad accelerometer sensor reading is not supported due to OS limitations.
-			</description>
-		</method>
 		<method name="get_joy_guid" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="device" type="int" />
@@ -161,53 +125,19 @@
 				On Windows, all XInput joypad GUIDs will be overridden by Godot to [code]__XINPUT_DEVICE__[/code], because their mappings are the same.
 			</description>
 		</method>
-		<method name="get_joy_gyroscope" qualifiers="const" experimental="">
-			<return type="Vector3" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the rotation rate in rad/s around a joypad's X, Y, and Z axes of the gyroscope sensor, if the joypad has one and it's currently enabled. Otherwise, the method returns [constant Vector3.ZERO]. See also [method set_joy_motion_sensors_enabled].
-				The rotation is positive in the counter-clockwise direction.
-				For a joypad held in front of you, the returned axes are defined as follows:
-				X: Angular speed around the X axis (pitch);
-				Y: Angular speed around the Y axis (yaw);
-				Z: Angular speed around the Z axis (roll).
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad gyroscope and gyroscope calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
 		<method name="get_joy_info" qualifiers="const">
 			<return type="Dictionary" />
 			<param index="0" name="device" type="int" />
 			<description>
 				Returns a dictionary with extra platform-specific information about the device, e.g. the raw gamepad name from the OS or the Steam Input index.
-				On Windows, Linux, macOS, and iOS, the dictionary contains the following fields:
+				On Windows, Linux, and macOS, the dictionary contains the following fields:
 				[code]raw_name[/code]: The name of the controller as it came from the OS, before getting renamed by the controller database.
 				[code]vendor_id[/code]: The USB vendor ID of the device.
 				[code]product_id[/code]: The USB product ID of the device.
-				[code]serial_number[/code]: The serial number of the device. This key won't be present if the serial number is unavailable.
-				The dictionary can also include the following fields under selected platforms:
-				[code]steam_input_index[/code]: The Steam Input gamepad index (Windows, Linux, and macOS only). If the device is not a Steam Input device this key won't be present.
-				[code]xinput_index[/code]: The index of the controller in the XInput system (Windows only). This key won't be present for devices not handled by XInput.
-				[b]Note:[/b] The returned dictionary is always empty on Android and Web.
-			</description>
-		</method>
-		<method name="get_joy_motion_sensors_calibration" qualifiers="const" experimental="">
-			<return type="Dictionary" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the calibration information about the specified joypad's motion sensors in the form of a [Dictionary], if it has any and if they have been calibrated, otherwise returns an empty [Dictionary].
-				The dictionary contains the following fields:
-				[code]gyroscope_offset[/code]: average offset in gyroscope values from [constant Vector2.ZERO] in rad/s.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="get_joy_motion_sensors_rate" qualifiers="const" experimental="">
-			<return type="float" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the joypad's motion sensor rate in Hz, if the joypad has motion sensors and they're currently enabled. See also [method set_joy_motion_sensors_enabled].
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
+				[code]steam_input_index[/code]: The Steam Input gamepad index, if the device is not a Steam Input device this key won't be present.
+				On Windows, the dictionary can have an additional field:
+				[code]xinput_index[/code]: The index of the controller in the XInput system. This key won't be present for devices not handled by XInput.
+				[b]Note:[/b] The returned dictionary is always empty on Android, iOS, visionOS, and Web.
 			</description>
 		</method>
 		<method name="get_joy_name">
@@ -222,15 +152,6 @@
 			<param index="0" name="device" type="int" />
 			<description>
 				Returns the duration of the current vibration effect in seconds.
-				[b]Note:[/b] This method returns the same value that was passed to [method start_joy_vibration], and this value does [b]not[/b] change when the joypad's vibration runs out, it only gets reset after a call to [method stop_joy_vibration].
-				If you want to check if a joypad is still vibrating, use [method is_joy_vibrating] instead.
-			</description>
-		</method>
-		<method name="get_joy_vibration_remaining_duration" experimental="">
-			<return type="float" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns the remaining duration of the current vibration effect in seconds.
 			</description>
 		</method>
 		<method name="get_joy_vibration_strength">
@@ -238,8 +159,6 @@
 			<param index="0" name="device" type="int" />
 			<description>
 				Returns the strength of the joypad vibration: x is the strength of the weak motor, and y is the strength of the strong motor.
-				[b]Note:[/b] This method returns the same values that were passed to [method start_joy_vibration], and these values do [b]not[/b] change when the joypad's vibration runs out, they only get reset after a call to [method stop_joy_vibration].
-				If you want to check if a joypad is still vibrating, use [method is_joy_vibrating] instead.
 			</description>
 		</method>
 		<method name="get_last_mouse_screen_velocity">
@@ -286,24 +205,7 @@
 			<param index="0" name="device" type="int" />
 			<description>
 				Returns [code]true[/code] if the joypad has an LED light that can change colors and/or brightness. See also [method set_joy_light].
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="has_joy_motion_sensors" qualifiers="const" experimental="">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the joypad has motion sensors (accelerometer and gyroscope).
-				[b]Note:[/b] On iOS, joypad accelerometer sensor reading is not supported due to OS limitations.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="has_joy_vibration" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the joypad supports vibration. See also [method start_joy_vibration].
-				[b]Note:[/b] For macOS, vibration is only supported in macOS 11 and later. When connected via USB, vibration is only supported for major brand controllers (except Xbox One and Xbox Series X/S controllers) due to macOS limitations.
+				[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS.
 			</description>
 		</method>
 		<method name="is_action_just_pressed" qualifiers="const">
@@ -386,41 +288,6 @@
 				Returns [code]true[/code] if the system knows the specified device. This means that it sets all button and axis indices. Unknown joypads are not expected to match these constants, but you can still retrieve events from them.
 			</description>
 		</method>
-		<method name="is_joy_motion_sensors_calibrated" qualifiers="const" experimental="">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the joypad's motion sensors have been calibrated.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="is_joy_motion_sensors_calibrating" qualifiers="const" experimental="">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the joypad's motion sensors are currently being calibrated.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="is_joy_motion_sensors_enabled" qualifiers="const" experimental="">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the requested joypad has motion sensors (accelerometer and gyroscope) and they are currently enabled. See also [method set_joy_motion_sensors_enabled] and [method has_joy_motion_sensors].
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="is_joy_vibrating" experimental="">
-			<return type="bool" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Returns [code]true[/code] if the joypad is still vibrating after a call to [method start_joy_vibration].
-				Unlike [method get_joy_vibration_strength] and [method get_joy_vibration_duration], this method returns [code]false[/code] after the joypad's vibration runs out.
-			</description>
-		</method>
 		<method name="is_key_label_pressed" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="keycode" type="int" enum="Key" />
@@ -537,28 +404,7 @@
 			<description>
 				Sets the joypad's LED light, if available, to the specified color. See also [method has_joy_light].
 				[b]Note:[/b] There is no way to get the color of the light from a joypad. If you need to know the assigned color, store it separately.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="set_joy_motion_sensors_calibration" experimental="">
-			<return type="void" />
-			<param index="0" name="device" type="int" />
-			<param index="1" name="calibration_info" type="Dictionary" />
-			<description>
-				Sets the specified joypad's calibration information. See also [method get_joy_motion_sensors_calibration].
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
-		<method name="set_joy_motion_sensors_enabled" experimental="">
-			<return type="void" />
-			<param index="0" name="device" type="int" />
-			<param index="1" name="enable" type="bool" />
-			<description>
-				Enables or disables the motion sensors (accelerometer and gyroscope), if available, on the specified joypad.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				It's recommended to disable the motion sensors when they're no longer being used, because otherwise it might drain the controller battery faster.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
+				[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS.
 			</description>
 		</method>
 		<method name="set_magnetometer">
@@ -578,114 +424,6 @@
 				[b]Note:[/b] Some 3rd party tools can contribute to the list of ignored devices. For example, [i]SteamInput[/i] creates virtual devices from physical devices for remapping purposes. To avoid handling the same input device twice, the original device is added to the ignore list.
 			</description>
 		</method>
-		<method name="start_joy_motion_sensors_calibration" experimental="">
-			<return type="void" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Starts the process of calibrating the specified joypad's gyroscope, if it has one.
-				Once a joypad's gyroscope has been calibrated correctly (e.g. laying still on a table without being rotated), [method get_joy_gyroscope] will return values close or equal to [constant Vector3.ZERO] when the joypad is not being rotated.
-				Here's an example of how to use joypad gyroscope and gyroscope calibration in your games:
-				[codeblocks]
-				[gdscript]
-				const GYRO_SENSITIVITY = 10.0
-
-				func _ready():
-					# In this example we only use the first connected joypad (id 0).
-					if 0 not in Input.get_connected_joypads():
-						return
-
-					if not Input.has_joy_motion_sensors(0):
-						return
-
-					# We must enable the motion sensors before using them.
-					Input.set_joy_motion_sensors_enabled(0, true)
-
-					# (Tell the users here that they need to put their joypads on a flat surface and wait for confirmation.)
-
-					# Start the calibration process.
-					calibrate_motion()
-
-				func _process(delta):
-					# Only move the object if the joypad motion sensors are calibrated.
-					if Input.is_joy_motion_sensors_calibrated(0):
-						move_object(delta)
-
-				func calibrate_motion():
-					Input.start_joy_motion_sensors_calibration(0)
-
-					# Wait for some time.
-					await get_tree().create_timer(1.0).timeout
-
-					Input.stop_joy_motion_sensors_calibration(0)
-					# The joypad is now calibrated.
-
-				func move_object(delta):
-					var node: Node3D = ... # Put your node here.
-
-					var gyro := Input.get_joy_gyroscope(0)
-					node.rotation.x -= -gyro.y * GYRO_SENSITIVITY * delta # Use rotation around the Y axis (yaw) here.
-					node.rotation.y += -gyro.x * GYRO_SENSITIVITY * delta # Use rotation around the X axis (pitch) here.
-				[/gdscript]
-				[csharp]
-				private const float GyroSensitivity = 10.0;
-
-				public override void _Ready()
-				{
-					// In this example we only use the first connected joypad (id 0).
-					if (!Input.GetConnectedJoypads().Contains(0))
-					{
-						return;
-					}
-
-					if (!Input.HasJoyMotionSensors(0))
-					{
-						return;
-					}
-
-					// We must enable the accelerometer and the gyroscope before using them.
-					Input.SetJoyMotionSensorsEnabled(0, true);
-
-					// (Tell the users here that they need to put their joypads on a flat surface and wait for confirmation.)
-
-					// Start the calibration process.
-					CalibrateMotion();
-				}
-
-				public override void _Process(double delta)
-				{
-					// Only move the object if the joypad motion sensors are calibrated.
-					if (Input.IsJoyMotionSensorsCalibrated(0))
-					{
-						MoveObject(delta);
-					}
-				}
-
-				private async Task CalibrateMotion()
-				{
-					Input.StartJoyMotionSensorsCalibration(0);
-
-					// Wait for some time.
-					await ToSignal(GetTree().CreateTimer(1.0), SceneTreeTimer.SignalName.Timeout);
-
-					Input.StopJoyMotionSensorsCalibration(0);
-					// The joypad is now calibrated.
-				}
-
-				private void MoveObject(double delta)
-				{
-					Node3D node = ... ; // Put your object here.
-					Vector3 gyro = Input.GetJoyGyroscope(0);
-					Vector3 rotation = node.Rotation;
-					rotation.X -= -gyro.Y * GyroSensitivity * (float)delta; // Use rotation around the Y axis (yaw) here.
-					rotation.Y += -gyro.X * GyroSensitivity * (float)delta; // Use rotation around the X axis (pitch) here.
-					node.Rotation = rotation;
-				}
-				[/csharp]
-				[/codeblocks]
-				[b]Note:[/b] Accelerometer sensor doesn't usually require calibration.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
-			</description>
-		</method>
 		<method name="start_joy_vibration">
 			<return type="void" />
 			<param index="0" name="device" type="int" />
@@ -693,23 +431,9 @@
 			<param index="2" name="strong_magnitude" type="float" />
 			<param index="3" name="duration" type="float" default="0" />
 			<description>
-				Starts to vibrate the joypad. See also [method has_joy_vibration] and [method is_joy_vibrating].
-				Joypads usually come with two rumble motors, a strong and a weak one.
-				[param weak_magnitude] is the strength of the weak motor (between [code]0.0[/code] and [code]1.0[/code]).
-				[param strong_magnitude] is the strength of the strong motor (between [code]0.0[/code] and [code]1.0[/code]).
-				[param duration] is the duration of the effect in seconds (a duration of [code]0.0[/code] will try to play the vibration as long as possible, which is about 65 seconds).
-				The vibration can be stopped early by calling [method stop_joy_vibration].
-				See also [method get_joy_vibration_strength] and [method get_joy_vibration_duration].
-				[b]Note:[/b] For macOS, vibration is only supported in macOS 11 and later. When connected via USB, vibration is only supported for major brand controllers (except Xbox One and Xbox Series X/S controllers) due to macOS limitations.
-			</description>
-		</method>
-		<method name="stop_joy_motion_sensors_calibration" experimental="">
-			<return type="void" />
-			<param index="0" name="device" type="int" />
-			<description>
-				Stops the calibration process of the specified joypad's motion sensors.
-				See [method start_joy_motion_sensors_calibration] for an example on how to use joypad motion sensors and calibration in your games.
-				[b]Note:[/b] This feature is only supported on Windows, Linux, macOS, and iOS.
+				Starts to vibrate the joypad. Joypads usually come with two rumble motors, a strong and a weak one. [param weak_magnitude] is the strength of the weak motor (between 0 and 1) and [param strong_magnitude] is the strength of the strong motor (between 0 and 1). [param duration] is the duration of the effect in seconds (a duration of 0 will try to play the vibration indefinitely). The vibration can be stopped early by calling [method stop_joy_vibration].
+				[b]Note:[/b] Not every hardware is compatible with long effect durations; it is recommended to restart an effect if it has to be played for more than a few seconds.
+				[b]Note:[/b] For macOS, vibration is only supported in macOS 11 and later.
 			</description>
 		</method>
 		<method name="stop_joy_vibration">
@@ -731,7 +455,6 @@
 				[b]Note:[/b] For iOS, specifying the duration is only supported in iOS 13 and later.
 				[b]Note:[/b] For Web, the amplitude cannot be changed.
 				[b]Note:[/b] Some web browsers such as Safari and Firefox for Android do not support [method vibrate_handheld].
-				[b]Note:[/b] Device settings such as vibration on/off, "do not disturb" mode or specific haptic feedback on/off may prevent [method vibrate_handheld] effects.
 			</description>
 		</method>
 		<method name="warp_mouse">
@@ -751,9 +474,6 @@
 		<member name="emulate_touch_from_mouse" type="bool" setter="set_emulate_touch_from_mouse" getter="is_emulating_touch_from_mouse">
 			If [code]true[/code], sends touch input events when clicking or dragging the mouse. See also [member ProjectSettings.input_devices/pointing/emulate_touch_from_mouse].
 		</member>
-		<member name="ignore_joypad_on_unfocused_application" type="bool" setter="set_ignore_joypad_on_unfocused_application" getter="is_ignoring_joypad_on_unfocused_application">
-			If [code]true[/code], joypad input (including motion sensors) and LED light changes will be ignored and joypad vibration will be stopped when the application is not focused.
-		</member>
 		<member name="mouse_mode" type="int" setter="set_mouse_mode" getter="get_mouse_mode" enum="Input.MouseMode">
 			Controls the mouse mode.
 		</member>
diff --git a/engine/doc/classes/InputEvent.xml b/engine/doc/classes/InputEvent.xml
index 13057b81..e4ead0e8 100644
--- a/engine/doc/classes/InputEvent.xml
+++ b/engine/doc/classes/InputEvent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEvent" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEvent" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for input events.
 	</brief_description>
@@ -126,11 +126,5 @@
 		<constant name="DEVICE_ID_EMULATION" value="-1">
 			Device ID used for emulated mouse input from a touchscreen, or for emulated touch input from a mouse. This can be used to distinguish emulated mouse input from physical mouse input, or emulated touch input from physical touch input.
 		</constant>
-		<constant name="DEVICE_ID_KEYBOARD" value="16">
-			Device ID used for input from a keyboard. This can be used to distinguish keyboard input events from joypad input events.
-		</constant>
-		<constant name="DEVICE_ID_MOUSE" value="32">
-			Device ID used for input from a mouse. This can be used to distinguish mouse input events from joypad input events.
-		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/InputEventAction.xml b/engine/doc/classes/InputEventAction.xml
index 78682520..85cb85bd 100644
--- a/engine/doc/classes/InputEventAction.xml
+++ b/engine/doc/classes/InputEventAction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventAction" inherits="InputEvent" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventAction" inherits="InputEvent" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An input event type for actions.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventFromWindow.xml b/engine/doc/classes/InputEventFromWindow.xml
index 91da8aaa..df2a7c4f 100644
--- a/engine/doc/classes/InputEventFromWindow.xml
+++ b/engine/doc/classes/InputEventFromWindow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventFromWindow" inherits="InputEvent" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventFromWindow" inherits="InputEvent" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for [Viewport]-based input events.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventGesture.xml b/engine/doc/classes/InputEventGesture.xml
index ea61a894..2cf13391 100644
--- a/engine/doc/classes/InputEventGesture.xml
+++ b/engine/doc/classes/InputEventGesture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventGesture" inherits="InputEventWithModifiers" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventGesture" inherits="InputEventWithModifiers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for touch gestures.
 	</brief_description>
@@ -10,7 +10,6 @@
 		<link title="Using InputEvent">$DOCS_URL/tutorials/inputs/inputevent.html</link>
 	</tutorials>
 	<members>
-		<member name="device" type="int" setter="set_device" getter="get_device" overrides="InputEvent" default="0" />
 		<member name="position" type="Vector2" setter="set_position" getter="get_position" default="Vector2(0, 0)">
 			The local gesture position relative to the [Viewport]. If used in [method Control._gui_input], the position is relative to the current [Control] that received this gesture.
 		</member>
diff --git a/engine/doc/classes/InputEventJoypadButton.xml b/engine/doc/classes/InputEventJoypadButton.xml
index 385b1b6b..3d1842fa 100644
--- a/engine/doc/classes/InputEventJoypadButton.xml
+++ b/engine/doc/classes/InputEventJoypadButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventJoypadButton" inherits="InputEvent" api_type="core" keywords="gamepad, controller" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventJoypadButton" inherits="InputEvent" keywords="gamepad, controller" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a gamepad button being pressed or released.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventJoypadMotion.xml b/engine/doc/classes/InputEventJoypadMotion.xml
index c6ea9172..2107c4ba 100644
--- a/engine/doc/classes/InputEventJoypadMotion.xml
+++ b/engine/doc/classes/InputEventJoypadMotion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventJoypadMotion" inherits="InputEvent" api_type="core" keywords="gamepad, controller" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventJoypadMotion" inherits="InputEvent" keywords="gamepad, controller" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents axis motions (such as joystick or analog triggers) from a gamepad.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventKey.xml b/engine/doc/classes/InputEventKey.xml
index dbda8ca0..7c70e5c7 100644
--- a/engine/doc/classes/InputEventKey.xml
+++ b/engine/doc/classes/InputEventKey.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventKey" inherits="InputEventWithModifiers" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventKey" inherits="InputEventWithModifiers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a key on a keyboard being pressed or released.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventMIDI.xml b/engine/doc/classes/InputEventMIDI.xml
index f0e2e0b0..9c05bcb1 100644
--- a/engine/doc/classes/InputEventMIDI.xml
+++ b/engine/doc/classes/InputEventMIDI.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventMIDI" inherits="InputEvent" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventMIDI" inherits="InputEvent" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a MIDI message from a MIDI device, such as a musical keyboard.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventMagnifyGesture.xml b/engine/doc/classes/InputEventMagnifyGesture.xml
index b199e13e..627344a1 100644
--- a/engine/doc/classes/InputEventMagnifyGesture.xml
+++ b/engine/doc/classes/InputEventMagnifyGesture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventMagnifyGesture" inherits="InputEventGesture" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventMagnifyGesture" inherits="InputEventGesture" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a magnifying touch gesture.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventMouse.xml b/engine/doc/classes/InputEventMouse.xml
index d5a1627f..b6f77b4f 100644
--- a/engine/doc/classes/InputEventMouse.xml
+++ b/engine/doc/classes/InputEventMouse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventMouse" inherits="InputEventWithModifiers" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventMouse" inherits="InputEventWithModifiers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base input event type for mouse events.
 	</brief_description>
@@ -13,7 +13,6 @@
 		<member name="button_mask" type="int" setter="set_button_mask" getter="get_button_mask" enum="MouseButtonMask" is_bitfield="true" default="0">
 			The mouse button mask identifier, one of or a bitwise combination of the [enum MouseButton] button masks.
 		</member>
-		<member name="device" type="int" setter="set_device" getter="get_device" overrides="InputEvent" default="32" />
 		<member name="global_position" type="Vector2" setter="set_global_position" getter="get_global_position" default="Vector2(0, 0)">
 			When received in [method Node._input] or [method Node._unhandled_input], returns the mouse's position in the root [Viewport] using the coordinate system of the root [Viewport].
 			When received in [method Control._gui_input], returns the mouse's position in the [CanvasLayer] that the [Control] is in using the coordinate system of the [CanvasLayer].
diff --git a/engine/doc/classes/InputEventMouseButton.xml b/engine/doc/classes/InputEventMouseButton.xml
index a6cc7129..9bcd1fc7 100644
--- a/engine/doc/classes/InputEventMouseButton.xml
+++ b/engine/doc/classes/InputEventMouseButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventMouseButton" inherits="InputEventMouse" api_type="core" keywords="click, press" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventMouseButton" inherits="InputEventMouse" keywords="click, press" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a mouse button being pressed or released.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventMouseMotion.xml b/engine/doc/classes/InputEventMouseMotion.xml
index c99056fb..561038f7 100644
--- a/engine/doc/classes/InputEventMouseMotion.xml
+++ b/engine/doc/classes/InputEventMouseMotion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventMouseMotion" inherits="InputEventMouse" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventMouseMotion" inherits="InputEventMouse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a mouse or a pen movement.
 	</brief_description>
@@ -33,7 +33,7 @@
 		</member>
 		<member name="screen_velocity" type="Vector2" setter="set_screen_velocity" getter="get_screen_velocity" default="Vector2(0, 0)">
 			The unscaled mouse velocity in pixels per second in screen coordinates. This velocity is [i]not[/i] scaled according to the content scale factor or calls to [method InputEvent.xformed_by].
-			[b]Note:[/b] In [constant Input.MOUSE_MODE_CAPTURED] mode, [member screen_velocity] returns [code](0, 0)[/code] because the mouse cursor is hidden and locked. Use [member screen_relative] for mouse aiming using the [constant Input.MOUSE_MODE_CAPTURED] mouse mode.
+			[b]Note:[/b] Use [member screen_relative] for mouse aiming using the [constant Input.MOUSE_MODE_CAPTURED] mouse mode.
 		</member>
 		<member name="tilt" type="Vector2" setter="set_tilt" getter="get_tilt" default="Vector2(0, 0)">
 			Represents the angles of tilt of the pen. Positive X-coordinate value indicates a tilt to the right. Positive Y-coordinate value indicates a tilt toward the user. Ranges from [code]-1.0[/code] to [code]1.0[/code] for both axes.
@@ -41,7 +41,7 @@
 		<member name="velocity" type="Vector2" setter="set_velocity" getter="get_velocity" default="Vector2(0, 0)">
 			The mouse velocity in pixels per second.
 			[b]Note:[/b] [member velocity] is automatically scaled according to the content scale factor, which is defined by the project's stretch mode settings. That means mouse sensitivity may appear different depending on resolution.
-			[b]Note:[/b] In [constant Input.MOUSE_MODE_CAPTURED] mode, [member velocity] returns [code](0, 0)[/code] because the mouse cursor is hidden and locked. Use [member screen_relative] for mouse aiming using the [constant Input.MOUSE_MODE_CAPTURED] mouse mode.
+			[b]Note:[/b] Use [member screen_relative] for mouse aiming using the [constant Input.MOUSE_MODE_CAPTURED] mouse mode.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/InputEventPanGesture.xml b/engine/doc/classes/InputEventPanGesture.xml
index 157a0a9e..512b2cce 100644
--- a/engine/doc/classes/InputEventPanGesture.xml
+++ b/engine/doc/classes/InputEventPanGesture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventPanGesture" inherits="InputEventGesture" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventPanGesture" inherits="InputEventGesture" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a panning touch gesture.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventScreenDrag.xml b/engine/doc/classes/InputEventScreenDrag.xml
index b3b3ca67..e7704020 100644
--- a/engine/doc/classes/InputEventScreenDrag.xml
+++ b/engine/doc/classes/InputEventScreenDrag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventScreenDrag" inherits="InputEventFromWindow" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventScreenDrag" inherits="InputEventFromWindow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a screen drag event.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventScreenTouch.xml b/engine/doc/classes/InputEventScreenTouch.xml
index 76a2d99f..a42b122e 100644
--- a/engine/doc/classes/InputEventScreenTouch.xml
+++ b/engine/doc/classes/InputEventScreenTouch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventScreenTouch" inherits="InputEventFromWindow" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventScreenTouch" inherits="InputEventFromWindow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a screen touch event.
 	</brief_description>
diff --git a/engine/doc/classes/InputEventShortcut.xml b/engine/doc/classes/InputEventShortcut.xml
index 467efbd3..414dd7e8 100644
--- a/engine/doc/classes/InputEventShortcut.xml
+++ b/engine/doc/classes/InputEventShortcut.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventShortcut" inherits="InputEvent" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventShortcut" inherits="InputEvent" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a triggered keyboard [Shortcut].
 	</brief_description>
diff --git a/engine/doc/classes/InputEventWithModifiers.xml b/engine/doc/classes/InputEventWithModifiers.xml
index 9184c69e..1434f341 100644
--- a/engine/doc/classes/InputEventWithModifiers.xml
+++ b/engine/doc/classes/InputEventWithModifiers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputEventWithModifiers" inherits="InputEventFromWindow" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputEventWithModifiers" inherits="InputEventFromWindow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for input events affected by modifier keys like [kbd]Shift[/kbd] and [kbd]Alt[/kbd].
 	</brief_description>
@@ -35,7 +35,6 @@
 		<member name="ctrl_pressed" type="bool" setter="set_ctrl_pressed" getter="is_ctrl_pressed" default="false">
 			State of the [kbd]Ctrl[/kbd] modifier.
 		</member>
-		<member name="device" type="int" setter="set_device" getter="get_device" overrides="InputEvent" default="16" />
 		<member name="meta_pressed" type="bool" setter="set_meta_pressed" getter="is_meta_pressed" default="false">
 			State of the [kbd]Meta[/kbd] modifier. On Windows and Linux, this represents the Windows key (sometimes called "meta" or "super" on Linux). On macOS, this represents the Command key.
 		</member>
diff --git a/engine/doc/classes/InputMap.xml b/engine/doc/classes/InputMap.xml
index bff94ca0..34c773a2 100644
--- a/engine/doc/classes/InputMap.xml
+++ b/engine/doc/classes/InputMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputMap" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InputMap" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton that manages all [InputEventAction]s.
 	</brief_description>
diff --git a/engine/doc/classes/InstancePlaceholder.xml b/engine/doc/classes/InstancePlaceholder.xml
index c3765e02..b390d5d9 100644
--- a/engine/doc/classes/InstancePlaceholder.xml
+++ b/engine/doc/classes/InstancePlaceholder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InstancePlaceholder" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="InstancePlaceholder" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder for the root [Node] of a [PackedScene].
 	</brief_description>
diff --git a/engine/doc/classes/IntervalTweener.xml b/engine/doc/classes/IntervalTweener.xml
index e323af0e..13f48c65 100644
--- a/engine/doc/classes/IntervalTweener.xml
+++ b/engine/doc/classes/IntervalTweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="IntervalTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="IntervalTweener" inherits="Tweener" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Creates an idle interval in a [Tween] animation.
 	</brief_description>
diff --git a/engine/doc/classes/ItemList.xml b/engine/doc/classes/ItemList.xml
index 99e682a1..f3459a21 100644
--- a/engine/doc/classes/ItemList.xml
+++ b/engine/doc/classes/ItemList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemList" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ItemList" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vertical list of selectable items with one or multiple columns.
 	</brief_description>
@@ -32,15 +32,6 @@
 				If [param selectable] is [code]true[/code], the list item will be selectable.
 			</description>
 		</method>
-		<method name="center_on_current">
-			<return type="void" />
-			<param index="0" name="center_verically" type="bool" default="true" />
-			<param index="1" name="center_horizontally" type="bool" default="true" />
-			<description>
-				Ensures the currently selected item (the first selected item if multiple selection is enabled) is visible, adjusting the scroll position as necessary to place the item at the center of the list if possible. See also [method ensure_current_is_visible].
-				Fails and prints an error if both arguments are [code]false[/code].
-			</description>
-		</method>
 		<method name="clear">
 			<return type="void" />
 			<description>
@@ -63,7 +54,7 @@
 		<method name="ensure_current_is_visible">
 			<return type="void" />
 			<description>
-				Ensures the currently selected item (the first selected item if multiple selection is enabled) is visible, adjusting the scroll position as necessary. See also [method center_on_current].
+				Ensure current selection is visible, adjusting the scroll position as necessary.
 			</description>
 		</method>
 		<method name="force_update_list_size">
@@ -249,7 +240,7 @@
 			<param index="0" name="idx" type="int" />
 			<param index="1" name="single" type="bool" default="true" />
 			<description>
-				Selects the item at the specified index.
+				Select the item at the specified index.
 				[b]Note:[/b] This method does not trigger the item selection signal.
 			</description>
 		</method>
@@ -417,22 +408,6 @@
 		<member name="item_count" type="int" setter="set_item_count" getter="get_item_count" default="0">
 			The number of items currently in the list.
 		</member>
-		<member name="item_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/icon" type="Texture2D" setter="" getter="">
-			The icon of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/selectable" type="bool" setter="" getter="" default="true">
-			If [code]true[/code], the item at [code]index[/code] is selectable.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/text" type="String" setter="" getter="" default="&quot;&quot;">
-			The text of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
 		<member name="max_columns" type="int" setter="set_max_columns" getter="get_max_columns" default="1">
 			Maximum columns the list will have.
 			If greater than zero, the content will be split among the specified columns.
diff --git a/engine/doc/classes/IterateIK3D.xml b/engine/doc/classes/IterateIK3D.xml
index e4c19ee2..1b380704 100644
--- a/engine/doc/classes/IterateIK3D.xml
+++ b/engine/doc/classes/IterateIK3D.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="IterateIK3D" inherits="ChainIK3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="IterateIK3D" inherits="ChainIK3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] to approach the goal by repeating small rotations.
 	</brief_description>
 	<description>
 		Base class of [SkeletonModifier3D] to approach the goal by repeating small rotations.
 		Each bone chain (setting) has one effector, which is processed in order of the setting list. You can set some limitations for each joint.
-		[b]Note:[/b] All the methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/target_node[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/JNISingleton.xml b/engine/doc/classes/JNISingleton.xml
index bb777f29..50271ac1 100644
--- a/engine/doc/classes/JNISingleton.xml
+++ b/engine/doc/classes/JNISingleton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JNISingleton" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JNISingleton" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Singleton that connects the engine with Android plugins to interface with native Android code.
 	</brief_description>
diff --git a/engine/doc/classes/JSON.xml b/engine/doc/classes/JSON.xml
index eae3c54f..b13b5b45 100644
--- a/engine/doc/classes/JSON.xml
+++ b/engine/doc/classes/JSON.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JSON" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JSON" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class for creating and parsing JSON data.
 	</brief_description>
diff --git a/engine/doc/classes/JSONRPC.xml b/engine/doc/classes/JSONRPC.xml
index 0c224b5b..d4efe213 100644
--- a/engine/doc/classes/JSONRPC.xml
+++ b/engine/doc/classes/JSONRPC.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JSONRPC" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JSONRPC" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A helper to handle dictionaries which look like JSONRPC documents.
 	</brief_description>
diff --git a/engine/doc/classes/JacobianIK3D.xml b/engine/doc/classes/JacobianIK3D.xml
index 0544a516..d78cc3a5 100644
--- a/engine/doc/classes/JacobianIK3D.xml
+++ b/engine/doc/classes/JacobianIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JacobianIK3D" inherits="IterateIK3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JacobianIK3D" inherits="IterateIK3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Jacobian transpose based inverse kinematics solver.
 	</brief_description>
diff --git a/engine/doc/classes/JavaClass.xml b/engine/doc/classes/JavaClass.xml
index d885218e..0fea241a 100644
--- a/engine/doc/classes/JavaClass.xml
+++ b/engine/doc/classes/JavaClass.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JavaClass" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JavaClass" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a class from the Java Native Interface.
 	</brief_description>
diff --git a/engine/doc/classes/JavaClassWrapper.xml b/engine/doc/classes/JavaClassWrapper.xml
index 9bc45528..a988cccd 100644
--- a/engine/doc/classes/JavaClassWrapper.xml
+++ b/engine/doc/classes/JavaClassWrapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JavaClassWrapper" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JavaClassWrapper" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to the Java Native Interface.
 	</brief_description>
@@ -21,42 +21,6 @@
 		<link title="Integrating with Android APIs">$DOCS_URL/tutorials/platform/android/javaclasswrapper_and_androidruntimeplugin.html</link>
 	</tutorials>
 	<methods>
-		<method name="create_proxy">
-			<return type="JavaObject" />
-			<param index="0" name="object" type="Object" />
-			<param index="1" name="interfaces" type="PackedStringArray" />
-			<description>
-				Creates a [JavaObject] implementing the given Java interfaces using the given [Object] as the implementation.
-				The [param object] must contain methods signatures matching the methods signatures from the passed Java [param interfaces]. Invoking methods from the Java [param interfaces] will route to the matching [param object] method.
-				[codeblock]
-				class PrintProxy:
-					func println(content: String) -&gt; void:
-						print(content)
-
-				var print_proxy = PrintProxy.new()
-				var printer_object = JavaClassWrapper.create_proxy(print_proxy, ["android.util.Printer"])
-				printer_object.println("Hello Godot World!")
-				[/codeblock]
-				[b]Note:[/b] This method only works on Android. On every other platform, this method will always return [code]null[/code].
-			</description>
-		</method>
-		<method name="create_sam_callback">
-			<return type="JavaObject" />
-			<param index="0" name="sam_interface" type="String" />
-			<param index="1" name="callable" type="Callable" />
-			<description>
-				Creates a [JavaObject] implementing the Java Single Abstract Method (SAM) interface using the Godot [Callable] as the implementation.
-				The [param sam_interface] [b]must be[/b] a Java SAM interface, meaning it must only have a single abstract method to implement.
-				The [param callable] must be able to handle the same parameter types as the SAM interface method, and must provide the same return type. The [param callable] will be invoked as a callback, passing the arguments from the Java SAM interface method.
-				[codeblock]
-				var cb = func (content: String) -&gt; void:
-					print(content)
-				var callback = JavaClassWrapper.create_sam_callback("android.util.Printer", cb)
-				callback.println("Hello Godot World!")
-				[/codeblock]
-				[b]Note:[/b] This method only works on Android. On every other platform, this method will always return [code]null[/code].
-			</description>
-		</method>
 		<method name="get_exception">
 			<return type="JavaObject" />
 			<description>
diff --git a/engine/doc/classes/JavaObject.xml b/engine/doc/classes/JavaObject.xml
index a4036b42..aa090a80 100644
--- a/engine/doc/classes/JavaObject.xml
+++ b/engine/doc/classes/JavaObject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JavaObject" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JavaObject" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents an object from the Java Native Interface.
 	</brief_description>
diff --git a/engine/doc/classes/JavaScriptBridge.xml b/engine/doc/classes/JavaScriptBridge.xml
index d6cc6e44..8f54f8b8 100644
--- a/engine/doc/classes/JavaScriptBridge.xml
+++ b/engine/doc/classes/JavaScriptBridge.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JavaScriptBridge" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JavaScriptBridge" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Singleton that connects the engine with the browser's JavaScript context in Web export.
 	</brief_description>
@@ -65,7 +65,7 @@
 			<return type="bool" />
 			<param index="0" name="javascript_object" type="JavaScriptObject" />
 			<description>
-				Returns [code]true[/code] if the given [param javascript_object] is of type [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer]ArrayBuffer[/url], [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView]DataView[/url], or one of the many [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray]typed array objects[/url].
+				Returns [code]true[/code] if the given [param javascript_object] is of type [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer][code]ArrayBuffer[/code][/url], [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView][code]DataView[/code][/url], or one of the many [url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray]typed array objects[/url].
 			</description>
 		</method>
 		<method name="js_buffer_to_packed_byte_array">
diff --git a/engine/doc/classes/JavaScriptObject.xml b/engine/doc/classes/JavaScriptObject.xml
index 7b4778b2..24d0008c 100644
--- a/engine/doc/classes/JavaScriptObject.xml
+++ b/engine/doc/classes/JavaScriptObject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JavaScriptObject" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JavaScriptObject" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A wrapper class for web native JavaScript objects.
 	</brief_description>
diff --git a/engine/doc/classes/Joint2D.xml b/engine/doc/classes/Joint2D.xml
index d1922ce7..0099c76d 100644
--- a/engine/doc/classes/Joint2D.xml
+++ b/engine/doc/classes/Joint2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Joint2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Joint2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for all 2D physics joints.
 	</brief_description>
diff --git a/engine/doc/classes/Joint3D.xml b/engine/doc/classes/Joint3D.xml
index 1078d348..95012980 100644
--- a/engine/doc/classes/Joint3D.xml
+++ b/engine/doc/classes/Joint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Joint3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Joint3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for all 3D physics joints.
 	</brief_description>
@@ -31,7 +31,6 @@
 		</member>
 		<member name="solver_priority" type="int" setter="set_solver_priority" getter="get_solver_priority" default="1">
 			The priority used to define which solver is executed first for multiple joints. The lower the value, the higher the priority.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This property is ignored when using Jolt Physics.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/JointLimitation3D.xml b/engine/doc/classes/JointLimitation3D.xml
index 48a103b8..98a08ac6 100644
--- a/engine/doc/classes/JointLimitation3D.xml
+++ b/engine/doc/classes/JointLimitation3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JointLimitation3D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JointLimitation3D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base class of the limitation that interacts with [ChainIK3D].
 	</brief_description>
diff --git a/engine/doc/classes/JointLimitationCone3D.xml b/engine/doc/classes/JointLimitationCone3D.xml
index 74a7c07a..85ae1eb5 100644
--- a/engine/doc/classes/JointLimitationCone3D.xml
+++ b/engine/doc/classes/JointLimitationCone3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="JointLimitationCone3D" inherits="JointLimitation3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="JointLimitationCone3D" inherits="JointLimitation3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A cone shape limitation that interacts with [ChainIK3D].
 	</brief_description>
diff --git a/engine/doc/classes/KinematicCollision2D.xml b/engine/doc/classes/KinematicCollision2D.xml
index 4b526d82..ab805bf4 100644
--- a/engine/doc/classes/KinematicCollision2D.xml
+++ b/engine/doc/classes/KinematicCollision2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="KinematicCollision2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="KinematicCollision2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds collision data from the movement of a [PhysicsBody2D].
 	</brief_description>
diff --git a/engine/doc/classes/KinematicCollision3D.xml b/engine/doc/classes/KinematicCollision3D.xml
index 6fffe1a8..2e319676 100644
--- a/engine/doc/classes/KinematicCollision3D.xml
+++ b/engine/doc/classes/KinematicCollision3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="KinematicCollision3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="KinematicCollision3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds collision data from the movement of a [PhysicsBody3D].
 	</brief_description>
diff --git a/engine/doc/classes/Label.xml b/engine/doc/classes/Label.xml
index c2761618..bf79b517 100644
--- a/engine/doc/classes/Label.xml
+++ b/engine/doc/classes/Label.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Label" inherits="Control" api_type="core" keywords="text" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Label" inherits="Control" keywords="text" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control for displaying plain text.
 	</brief_description>
diff --git a/engine/doc/classes/Label3D.xml b/engine/doc/classes/Label3D.xml
index 96a0fa59..d30f1fde 100644
--- a/engine/doc/classes/Label3D.xml
+++ b/engine/doc/classes/Label3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Label3D" inherits="GeometryInstance3D" api_type="core" keywords="text" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Label3D" inherits="GeometryInstance3D" keywords="text" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for displaying plain text in 3D space.
 	</brief_description>
diff --git a/engine/doc/classes/LabelSettings.xml b/engine/doc/classes/LabelSettings.xml
index a1fbc0b4..620a2563 100644
--- a/engine/doc/classes/LabelSettings.xml
+++ b/engine/doc/classes/LabelSettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LabelSettings" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LabelSettings" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides common settings to customize the text in a [Label].
 	</brief_description>
@@ -163,28 +163,8 @@
 		<member name="stacked_outline_count" type="int" setter="set_stacked_outline_count" getter="get_stacked_outline_count" default="0">
 			The number of stacked outlines.
 		</member>
-		<member name="stacked_outline_{index}/color" type="Color" setter="" getter="" default="Color(0, 0, 0, 1)">
-			The color of the outline at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. stacked_outline_count - 1[/code] range.
-		</member>
-		<member name="stacked_outline_{index}/size" type="int" setter="" getter="" default="0">
-			The size of the outline at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. stacked_outline_count - 1[/code] range.
-		</member>
 		<member name="stacked_shadow_count" type="int" setter="set_stacked_shadow_count" getter="get_stacked_shadow_count" default="0">
 			The number of stacked shadows.
 		</member>
-		<member name="stacked_shadow_{index}/color" type="Color" setter="" getter="" default="Color(0, 0, 0, 1)">
-			The color of the shadow at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. stacked_shadow_count - 1[/code] range.
-		</member>
-		<member name="stacked_shadow_{index}/offset" type="Vector2" setter="" getter="" default="Vector2i(1, 1)">
-			The offset of the shadow at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. stacked_shadow_count - 1[/code] range.
-		</member>
-		<member name="stacked_shadow_{index}/outline_size" type="int" setter="" getter="" default="0">
-			The size of the shadow outline at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. stacked_shadow_count - 1[/code] range.
-		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/Light2D.xml b/engine/doc/classes/Light2D.xml
index 852de15b..e9d4c735 100644
--- a/engine/doc/classes/Light2D.xml
+++ b/engine/doc/classes/Light2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Light2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Light2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Casts light in a 2D environment.
 	</brief_description>
diff --git a/engine/doc/classes/Light3D.xml b/engine/doc/classes/Light3D.xml
index 22fa968f..648bb9c2 100644
--- a/engine/doc/classes/Light3D.xml
+++ b/engine/doc/classes/Light3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Light3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Light3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a base class for different kinds of light nodes.
 	</brief_description>
diff --git a/engine/doc/classes/LightOccluder2D.xml b/engine/doc/classes/LightOccluder2D.xml
index 2d8ad2db..e42ecd1c 100644
--- a/engine/doc/classes/LightOccluder2D.xml
+++ b/engine/doc/classes/LightOccluder2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LightOccluder2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LightOccluder2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Occludes light cast by a Light2D, casting shadows.
 	</brief_description>
diff --git a/engine/doc/classes/LightmapGI.xml b/engine/doc/classes/LightmapGI.xml
index 0f45f80b..16604aab 100644
--- a/engine/doc/classes/LightmapGI.xml
+++ b/engine/doc/classes/LightmapGI.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LightmapGI" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LightmapGI" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Computes and stores baked lightmaps for fast global illumination.
 	</brief_description>
diff --git a/engine/doc/classes/LightmapGIData.xml b/engine/doc/classes/LightmapGIData.xml
index 5086814c..e7454f4e 100644
--- a/engine/doc/classes/LightmapGIData.xml
+++ b/engine/doc/classes/LightmapGIData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LightmapGIData" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LightmapGIData" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Contains baked lightmap and dynamic object probe data for [LightmapGI].
 	</brief_description>
diff --git a/engine/doc/classes/LightmapProbe.xml b/engine/doc/classes/LightmapProbe.xml
index f2cebf24..f1b99878 100644
--- a/engine/doc/classes/LightmapProbe.xml
+++ b/engine/doc/classes/LightmapProbe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LightmapProbe" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LightmapProbe" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a single manually placed probe for dynamic object lighting with [LightmapGI].
 	</brief_description>
diff --git a/engine/doc/classes/Lightmapper.xml b/engine/doc/classes/Lightmapper.xml
index 983337af..1febd398 100644
--- a/engine/doc/classes/Lightmapper.xml
+++ b/engine/doc/classes/Lightmapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Lightmapper" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Lightmapper" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract class extended by lightmappers, for use in [LightmapGI].
 	</brief_description>
diff --git a/engine/doc/classes/LightmapperRD.xml b/engine/doc/classes/LightmapperRD.xml
index e201a27d..da3baac0 100644
--- a/engine/doc/classes/LightmapperRD.xml
+++ b/engine/doc/classes/LightmapperRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LightmapperRD" inherits="Lightmapper" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LightmapperRD" inherits="Lightmapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The built-in GPU-based lightmapper for use with [LightmapGI].
 	</brief_description>
diff --git a/engine/doc/classes/LimitAngularVelocityModifier3D.xml b/engine/doc/classes/LimitAngularVelocityModifier3D.xml
index eea19d5c..32b83d58 100644
--- a/engine/doc/classes/LimitAngularVelocityModifier3D.xml
+++ b/engine/doc/classes/LimitAngularVelocityModifier3D.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LimitAngularVelocityModifier3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LimitAngularVelocityModifier3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Limit bone rotation angular velocity.
 	</brief_description>
 	<description>
 		This modifier limits bone rotation angular velocity by comparing poses between previous and current frame.
 		You can add bone chains by specifying their root and end bones, then add the bones between them to a list. Modifier processes either that list or the bones excluding those in the list depending on the option [member exclude].
-		[b]Note:[/b] Most methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/Line2D.xml b/engine/doc/classes/Line2D.xml
index 473aa0e3..9b52c77a 100644
--- a/engine/doc/classes/Line2D.xml
+++ b/engine/doc/classes/Line2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Line2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Line2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D polyline that can optionally be textured.
 	</brief_description>
diff --git a/engine/doc/classes/LineEdit.xml b/engine/doc/classes/LineEdit.xml
index 27ea91ca..3c38a662 100644
--- a/engine/doc/classes/LineEdit.xml
+++ b/engine/doc/classes/LineEdit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LineEdit" inherits="Control" api_type="core" keywords="text, input" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LineEdit" inherits="Control" keywords="text, input" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An input field for single-line text.
 	</brief_description>
diff --git a/engine/doc/classes/LinkButton.xml b/engine/doc/classes/LinkButton.xml
index a119aec5..28b13a7d 100644
--- a/engine/doc/classes/LinkButton.xml
+++ b/engine/doc/classes/LinkButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LinkButton" inherits="BaseButton" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LinkButton" inherits="BaseButton" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that represents a link.
 	</brief_description>
diff --git a/engine/doc/classes/Logger.xml b/engine/doc/classes/Logger.xml
index db32f167..53ad34db 100644
--- a/engine/doc/classes/Logger.xml
+++ b/engine/doc/classes/Logger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Logger" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Logger" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Custom logger to receive messages from the internal error/warning stream.
 	</brief_description>
@@ -7,7 +7,6 @@
 		Custom logger to receive messages from the internal error/warning stream. Loggers are registered via [method OS.add_logger].
 	</description>
 	<tutorials>
-		<link title="Logging">$DOCS_URL/tutorials/scripting/logging.html</link>
 	</tutorials>
 	<methods>
 		<method name="_log_error" qualifiers="virtual">
@@ -25,7 +24,7 @@
 				The type of error provided by [param error_type] is described in the [enum ErrorType] enumeration.
 				Additionally, [param script_backtraces] provides backtraces for each of the script languages. These will only contain stack frames in editor builds and debug builds by default. To enable them for release builds as well, you need to enable [member ProjectSettings.debug/settings/gdscript/always_track_call_stacks].
 				[b]Warning:[/b] This method will be called from threads other than the main thread, possibly at the same time, so you will need to have some kind of thread-safety in your implementation of it, like a [Mutex].
-				[b]Note:[/b] [param script_backtraces] will not contain any captured variables, due to its prohibitively high cost. To get those, you will need to capture the backtraces yourself, from within the [Logger] virtual methods, using [method Engine.capture_script_backtraces].
+				[b]Note:[/b] [param script_backtraces] will not contain any captured variables, due to its prohibitively high cost. To get those you will need to capture the backtraces yourself, from within the [Logger] virtual methods, using [method Engine.capture_script_backtraces].
 				[b]Note:[/b] Logging errors from this method using functions like [method @GlobalScope.push_error] or [method @GlobalScope.push_warning] is not supported, as it could cause infinite recursion. These errors will only show up in the console output.
 			</description>
 		</method>
diff --git a/engine/doc/classes/LookAtModifier3D.xml b/engine/doc/classes/LookAtModifier3D.xml
index cedd90a1..1d458ef2 100644
--- a/engine/doc/classes/LookAtModifier3D.xml
+++ b/engine/doc/classes/LookAtModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LookAtModifier3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="LookAtModifier3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The [LookAtModifier3D] rotates a bone to look at a target.
 	</brief_description>
diff --git a/engine/doc/classes/MainLoop.xml b/engine/doc/classes/MainLoop.xml
index 43203abd..227e1ad4 100644
--- a/engine/doc/classes/MainLoop.xml
+++ b/engine/doc/classes/MainLoop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MainLoop" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MainLoop" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for the game's main loop.
 	</brief_description>
@@ -143,11 +143,5 @@
 		<constant name="NOTIFICATION_TEXT_SERVER_CHANGED" value="2018">
 			Notification received when text server is changed.
 		</constant>
-		<constant name="NOTIFICATION_APPLICATION_PIP_MODE_ENTERED" value="2019">
-			Notification received when the application enters picture-in-picture mode.
-		</constant>
-		<constant name="NOTIFICATION_APPLICATION_PIP_MODE_EXITED" value="2020">
-			Notification received when the application exits picture-in-picture mode.
-		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/MarginContainer.xml b/engine/doc/classes/MarginContainer.xml
index 143f1b13..e3dd6464 100644
--- a/engine/doc/classes/MarginContainer.xml
+++ b/engine/doc/classes/MarginContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MarginContainer" inherits="Container" api_type="core" keywords="padding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MarginContainer" inherits="Container" keywords="padding" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that keeps a margin around its child controls.
 	</brief_description>
diff --git a/engine/doc/classes/Marker2D.xml b/engine/doc/classes/Marker2D.xml
index 9c10709f..d6239484 100644
--- a/engine/doc/classes/Marker2D.xml
+++ b/engine/doc/classes/Marker2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Marker2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Marker2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Generic 2D position hint for editing.
 	</brief_description>
diff --git a/engine/doc/classes/Marker3D.xml b/engine/doc/classes/Marker3D.xml
index c14735da..1728f7e5 100644
--- a/engine/doc/classes/Marker3D.xml
+++ b/engine/doc/classes/Marker3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Marker3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Marker3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Generic 3D position hint for editing.
 	</brief_description>
diff --git a/engine/doc/classes/Marshalls.xml b/engine/doc/classes/Marshalls.xml
index 0f9dea40..5dc77fe1 100644
--- a/engine/doc/classes/Marshalls.xml
+++ b/engine/doc/classes/Marshalls.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Marshalls" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Marshalls" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Data transformation (marshaling) and encoding helpers.
 	</brief_description>
diff --git a/engine/doc/classes/Material.xml b/engine/doc/classes/Material.xml
index e03682ac..1dab52aa 100644
--- a/engine/doc/classes/Material.xml
+++ b/engine/doc/classes/Material.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Material" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Material" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Virtual base class for applying visual properties to an object, such as color and roughness.
 	</brief_description>
diff --git a/engine/doc/classes/MenuBar.xml b/engine/doc/classes/MenuBar.xml
index f3362def..044cbd44 100644
--- a/engine/doc/classes/MenuBar.xml
+++ b/engine/doc/classes/MenuBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MenuBar" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MenuBar" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A horizontal menu bar that creates a menu for each [PopupMenu] child.
 	</brief_description>
diff --git a/engine/doc/classes/MenuButton.xml b/engine/doc/classes/MenuButton.xml
index 8cb160ee..af26e2ff 100644
--- a/engine/doc/classes/MenuButton.xml
+++ b/engine/doc/classes/MenuButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MenuButton" inherits="Button" api_type="core" keywords="dropdown" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MenuButton" inherits="Button" keywords="dropdown" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that brings up a [PopupMenu] when clicked.
 	</brief_description>
@@ -38,34 +38,6 @@
 		<member name="item_count" type="int" setter="set_item_count" getter="get_item_count" default="0">
 			The number of items currently in the list.
 		</member>
-		<member name="popup/item_{index}/checkable" type="int" setter="" getter="" default="0">
-			The checkable item type of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/checked" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is checked.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/icon" type="Texture2D" setter="" getter="">
-			The icon of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/id" type="int" setter="" getter="" default="0">
-			The ID of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/separator" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is a separator.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/text" type="String" setter="" getter="" default="&quot;&quot;">
-			The text of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
 		<member name="switch_on_hover" type="bool" setter="set_switch_on_hover" getter="is_switch_on_hover" default="false">
 			If [code]true[/code], when the cursor hovers above another [MenuButton] within the same parent which also has [member switch_on_hover] enabled, it will close the current [MenuButton] and open the other one.
 		</member>
diff --git a/engine/doc/classes/Mesh.xml b/engine/doc/classes/Mesh.xml
index bb9fbef5..048f9710 100644
--- a/engine/doc/classes/Mesh.xml
+++ b/engine/doc/classes/Mesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Mesh" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Mesh" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Resource] that contains vertex array-based geometry.
 	</brief_description>
diff --git a/engine/doc/classes/MeshConvexDecompositionSettings.xml b/engine/doc/classes/MeshConvexDecompositionSettings.xml
index 780b6834..38f1ff3f 100644
--- a/engine/doc/classes/MeshConvexDecompositionSettings.xml
+++ b/engine/doc/classes/MeshConvexDecompositionSettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshConvexDecompositionSettings" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshConvexDecompositionSettings" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Parameters to be used with a [Mesh] convex decomposition operation.
 	</brief_description>
diff --git a/engine/doc/classes/MeshDataTool.xml b/engine/doc/classes/MeshDataTool.xml
index 91f94467..83c88eae 100644
--- a/engine/doc/classes/MeshDataTool.xml
+++ b/engine/doc/classes/MeshDataTool.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshDataTool" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshDataTool" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper tool to access and edit [Mesh] data.
 	</brief_description>
diff --git a/engine/doc/classes/MeshInstance2D.xml b/engine/doc/classes/MeshInstance2D.xml
index f6a21069..100385d8 100644
--- a/engine/doc/classes/MeshInstance2D.xml
+++ b/engine/doc/classes/MeshInstance2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshInstance2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshInstance2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node used for displaying a [Mesh] in 2D.
 	</brief_description>
diff --git a/engine/doc/classes/MeshInstance3D.xml b/engine/doc/classes/MeshInstance3D.xml
index fb063f55..edf6f0dd 100644
--- a/engine/doc/classes/MeshInstance3D.xml
+++ b/engine/doc/classes/MeshInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshInstance3D" inherits="GeometryInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshInstance3D" inherits="GeometryInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node that instances meshes into a scenario.
 	</brief_description>
diff --git a/engine/doc/classes/MeshLibrary.xml b/engine/doc/classes/MeshLibrary.xml
index 0f7de0eb..2c0131c4 100644
--- a/engine/doc/classes/MeshLibrary.xml
+++ b/engine/doc/classes/MeshLibrary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshLibrary" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshLibrary" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Library of meshes.
 	</brief_description>
@@ -32,12 +32,6 @@
 				Returns the first item with the given name, or [code]-1[/code] if no item is found.
 			</description>
 		</method>
-		<method name="get_item_count" qualifiers="const">
-			<return type="int" />
-			<description>
-				Returns the number of items present in the library.
-			</description>
-		</method>
 		<method name="get_item_list" qualifiers="const">
 			<return type="PackedInt32Array" />
 			<description>
diff --git a/engine/doc/classes/MeshTexture.xml b/engine/doc/classes/MeshTexture.xml
index 55db0f4b..bea99a4d 100644
--- a/engine/doc/classes/MeshTexture.xml
+++ b/engine/doc/classes/MeshTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MeshTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MeshTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Simple texture that uses a mesh to draw itself.
 	</brief_description>
diff --git a/engine/doc/classes/MethodTweener.xml b/engine/doc/classes/MethodTweener.xml
index 97e16f78..6f606763 100644
--- a/engine/doc/classes/MethodTweener.xml
+++ b/engine/doc/classes/MethodTweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MethodTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MethodTweener" inherits="Tweener" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Interpolates an abstract value and supplies it to a method called over time.
 	</brief_description>
diff --git a/engine/doc/classes/MissingNode.xml b/engine/doc/classes/MissingNode.xml
index af1623a8..d6d1ac0f 100644
--- a/engine/doc/classes/MissingNode.xml
+++ b/engine/doc/classes/MissingNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MissingNode" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MissingNode" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An internal editor class intended for keeping the data of unrecognized nodes.
 	</brief_description>
diff --git a/engine/doc/classes/MissingResource.xml b/engine/doc/classes/MissingResource.xml
index caca3bac..442b0abd 100644
--- a/engine/doc/classes/MissingResource.xml
+++ b/engine/doc/classes/MissingResource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MissingResource" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MissingResource" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An internal editor class intended for keeping the data of unrecognized resources.
 	</brief_description>
diff --git a/engine/doc/classes/ModifierBoneTarget3D.xml b/engine/doc/classes/ModifierBoneTarget3D.xml
index debb335a..9201ad93 100644
--- a/engine/doc/classes/ModifierBoneTarget3D.xml
+++ b/engine/doc/classes/ModifierBoneTarget3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ModifierBoneTarget3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ModifierBoneTarget3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		А node that dynamically copies the 3D transform of a bone in its parent [Skeleton3D].
 	</brief_description>
diff --git a/engine/doc/classes/MovieWriter.xml b/engine/doc/classes/MovieWriter.xml
index 69aa770e..39111d2f 100644
--- a/engine/doc/classes/MovieWriter.xml
+++ b/engine/doc/classes/MovieWriter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MovieWriter" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MovieWriter" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract class for non-real-time video recording encoders.
 	</brief_description>
diff --git a/engine/doc/classes/MultiMesh.xml b/engine/doc/classes/MultiMesh.xml
index 4786457e..ae3963d8 100644
--- a/engine/doc/classes/MultiMesh.xml
+++ b/engine/doc/classes/MultiMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiMesh" inherits="Resource" api_type="core" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiMesh" inherits="Resource" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides high-performance drawing of a mesh multiple times using GPU instancing.
 	</brief_description>
diff --git a/engine/doc/classes/MultiMeshInstance2D.xml b/engine/doc/classes/MultiMeshInstance2D.xml
index aec24dd4..40ae215b 100644
--- a/engine/doc/classes/MultiMeshInstance2D.xml
+++ b/engine/doc/classes/MultiMeshInstance2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiMeshInstance2D" inherits="Node2D" api_type="core" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiMeshInstance2D" inherits="Node2D" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node that instances a [MultiMesh] in 2D.
 	</brief_description>
diff --git a/engine/doc/classes/MultiMeshInstance3D.xml b/engine/doc/classes/MultiMeshInstance3D.xml
index cee683d1..5b6fd92d 100644
--- a/engine/doc/classes/MultiMeshInstance3D.xml
+++ b/engine/doc/classes/MultiMeshInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiMeshInstance3D" inherits="GeometryInstance3D" api_type="core" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiMeshInstance3D" inherits="GeometryInstance3D" keywords="batch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node that instances a [MultiMesh].
 	</brief_description>
diff --git a/engine/doc/classes/MultiplayerAPI.xml b/engine/doc/classes/MultiplayerAPI.xml
index 1bcf557e..75cb13d2 100644
--- a/engine/doc/classes/MultiplayerAPI.xml
+++ b/engine/doc/classes/MultiplayerAPI.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerAPI" inherits="RefCounted" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiplayerAPI" inherits="RefCounted" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		High-level multiplayer API interface.
 	</brief_description>
diff --git a/engine/doc/classes/MultiplayerAPIExtension.xml b/engine/doc/classes/MultiplayerAPIExtension.xml
index 00acf29c..25686d56 100644
--- a/engine/doc/classes/MultiplayerAPIExtension.xml
+++ b/engine/doc/classes/MultiplayerAPIExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerAPIExtension" inherits="MultiplayerAPI" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiplayerAPIExtension" inherits="MultiplayerAPI" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class used for extending the [MultiplayerAPI].
 	</brief_description>
diff --git a/engine/doc/classes/MultiplayerPeer.xml b/engine/doc/classes/MultiplayerPeer.xml
index 04c56f3a..038a3e63 100644
--- a/engine/doc/classes/MultiplayerPeer.xml
+++ b/engine/doc/classes/MultiplayerPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerPeer" inherits="PacketPeer" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiplayerPeer" inherits="PacketPeer" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract class for specialized [PacketPeer]s used by the [MultiplayerAPI].
 	</brief_description>
diff --git a/engine/doc/classes/MultiplayerPeerExtension.xml b/engine/doc/classes/MultiplayerPeerExtension.xml
index 9ee14dcb..a987b3b5 100644
--- a/engine/doc/classes/MultiplayerPeerExtension.xml
+++ b/engine/doc/classes/MultiplayerPeerExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerPeerExtension" inherits="MultiplayerPeer" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="MultiplayerPeerExtension" inherits="MultiplayerPeer" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class that can be inherited to implement custom multiplayer API networking layers via GDExtension.
 	</brief_description>
diff --git a/engine/doc/classes/Mutex.xml b/engine/doc/classes/Mutex.xml
index d92128fb..962c55cc 100644
--- a/engine/doc/classes/Mutex.xml
+++ b/engine/doc/classes/Mutex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Mutex" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Mutex" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A binary [Semaphore] for synchronization of multiple [Thread]s.
 	</brief_description>
diff --git a/engine/doc/classes/NativeMenu.xml b/engine/doc/classes/NativeMenu.xml
index 078d4bad..499be957 100644
--- a/engine/doc/classes/NativeMenu.xml
+++ b/engine/doc/classes/NativeMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NativeMenu" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NativeMenu" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for OS native menus.
 	</brief_description>
@@ -216,7 +216,7 @@
 			<param index="0" name="rid" type="RID" />
 			<param index="1" name="submenu_rid" type="RID" />
 			<description>
-				Returns the index of the item with the submenu specified by [param submenu_rid]. Indices are automatically assigned to each item by the engine.
+				Returns the index of the item with the submenu specified by [param submenu_rid]. Indices are automatically assigned to each item by the engine, and cannot be set manually.
 				[b]Note:[/b] This method is implemented on macOS and Windows.
 			</description>
 		</method>
@@ -225,7 +225,7 @@
 			<param index="0" name="rid" type="RID" />
 			<param index="1" name="tag" type="Variant" />
 			<description>
-				Returns the index of the item with the specified [param tag]. Indices are automatically assigned to each item by the engine.
+				Returns the index of the item with the specified [param tag]. Indices are automatically assigned to each item by the engine, and cannot be set manually.
 				[b]Note:[/b] This method is implemented on macOS and Windows.
 			</description>
 		</method>
@@ -234,7 +234,7 @@
 			<param index="0" name="rid" type="RID" />
 			<param index="1" name="text" type="String" />
 			<description>
-				Returns the index of the item with the specified [param text]. Indices are automatically assigned to each item by the engine.
+				Returns the index of the item with the specified [param text]. Indices are automatically assigned to each item by the engine, and cannot be set manually.
 				[b]Note:[/b] This method is implemented on macOS and Windows.
 			</description>
 		</method>
@@ -618,18 +618,6 @@
 				[b]Note:[/b] This method is implemented only on macOS.
 			</description>
 		</method>
-		<method name="set_item_index">
-			<return type="int" />
-			<param index="0" name="rid" type="RID" />
-			<param index="1" name="idx" type="int" />
-			<param index="2" name="target_idx" type="int" />
-			<description>
-				Changes the index of the item at index [param idx] to be at index [param target_idx]. This can be used to move an item above other items.
-				Returns the new index of the moved item, it's not guaranteed to be the same as [param target_idx].
-				[b]Note:[/b] The indices of any items between index [param idx] and index [param target_idx] will be shifted by one.
-				[b]Note:[/b] This method is implemented on macOS and Windows.
-			</description>
-		</method>
 		<method name="set_item_key_callback">
 			<return type="void" />
 			<param index="0" name="rid" type="RID" />
diff --git a/engine/doc/classes/NavigationAgent2D.xml b/engine/doc/classes/NavigationAgent2D.xml
index f58caf47..bb12b421 100644
--- a/engine/doc/classes/NavigationAgent2D.xml
+++ b/engine/doc/classes/NavigationAgent2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationAgent2D" inherits="Node" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationAgent2D" inherits="Node" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D agent used to pathfind to a position while avoiding obstacles.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationAgent3D.xml b/engine/doc/classes/NavigationAgent3D.xml
index 8e4fe310..8b496693 100644
--- a/engine/doc/classes/NavigationAgent3D.xml
+++ b/engine/doc/classes/NavigationAgent3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationAgent3D" inherits="Node" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationAgent3D" inherits="Node" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D agent used to pathfind to a position while avoiding obstacles.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationLink2D.xml b/engine/doc/classes/NavigationLink2D.xml
index 7a19da64..2e1c962d 100644
--- a/engine/doc/classes/NavigationLink2D.xml
+++ b/engine/doc/classes/NavigationLink2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationLink2D" inherits="Node2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationLink2D" inherits="Node2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A link between two positions on [NavigationRegion2D]s that agents can be routed through.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationLink3D.xml b/engine/doc/classes/NavigationLink3D.xml
index 0d5c5b2e..174228ea 100644
--- a/engine/doc/classes/NavigationLink3D.xml
+++ b/engine/doc/classes/NavigationLink3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationLink3D" inherits="Node3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationLink3D" inherits="Node3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A link between two positions on [NavigationRegion3D]s that agents can be routed through.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationMesh.xml b/engine/doc/classes/NavigationMesh.xml
index 7420818f..c410fb80 100644
--- a/engine/doc/classes/NavigationMesh.xml
+++ b/engine/doc/classes/NavigationMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationMesh" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationMesh" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A navigation mesh that defines traversable areas and obstacles.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationMeshGenerator.xml b/engine/doc/classes/NavigationMeshGenerator.xml
index 526d5b6e..2ff791d5 100644
--- a/engine/doc/classes/NavigationMeshGenerator.xml
+++ b/engine/doc/classes/NavigationMeshGenerator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationMeshGenerator" inherits="Object" api_type="core" deprecated="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationMeshGenerator" inherits="Object" deprecated="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class for creating and clearing navigation meshes.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationMeshSourceGeometryData2D.xml b/engine/doc/classes/NavigationMeshSourceGeometryData2D.xml
index e819b90d..82b6e077 100644
--- a/engine/doc/classes/NavigationMeshSourceGeometryData2D.xml
+++ b/engine/doc/classes/NavigationMeshSourceGeometryData2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationMeshSourceGeometryData2D" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationMeshSourceGeometryData2D" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Container for parsed source geometry data used in navigation mesh baking.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationMeshSourceGeometryData3D.xml b/engine/doc/classes/NavigationMeshSourceGeometryData3D.xml
index ce060b86..8245ec88 100644
--- a/engine/doc/classes/NavigationMeshSourceGeometryData3D.xml
+++ b/engine/doc/classes/NavigationMeshSourceGeometryData3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationMeshSourceGeometryData3D" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationMeshSourceGeometryData3D" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Container for parsed source geometry data used in navigation mesh baking.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationObstacle2D.xml b/engine/doc/classes/NavigationObstacle2D.xml
index 18bfe02e..12205e2a 100644
--- a/engine/doc/classes/NavigationObstacle2D.xml
+++ b/engine/doc/classes/NavigationObstacle2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationObstacle2D" inherits="Node2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationObstacle2D" inherits="Node2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		2D obstacle used to affect navigation mesh baking or constrain velocities of avoidance controlled agents.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationObstacle3D.xml b/engine/doc/classes/NavigationObstacle3D.xml
index 2043c291..bc6dbabc 100644
--- a/engine/doc/classes/NavigationObstacle3D.xml
+++ b/engine/doc/classes/NavigationObstacle3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationObstacle3D" inherits="Node3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationObstacle3D" inherits="Node3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		3D obstacle used to affect navigation mesh baking or constrain velocities of avoidance controlled agents.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationPathQueryParameters2D.xml b/engine/doc/classes/NavigationPathQueryParameters2D.xml
index fe057b40..15b94f0d 100644
--- a/engine/doc/classes/NavigationPathQueryParameters2D.xml
+++ b/engine/doc/classes/NavigationPathQueryParameters2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationPathQueryParameters2D" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationPathQueryParameters2D" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for 2D navigation path queries.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationPathQueryParameters3D.xml b/engine/doc/classes/NavigationPathQueryParameters3D.xml
index b466e2d5..b5fef6e4 100644
--- a/engine/doc/classes/NavigationPathQueryParameters3D.xml
+++ b/engine/doc/classes/NavigationPathQueryParameters3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationPathQueryParameters3D" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationPathQueryParameters3D" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for 3D navigation path queries.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationPathQueryResult2D.xml b/engine/doc/classes/NavigationPathQueryResult2D.xml
index 6a06883c..94d6b6e3 100644
--- a/engine/doc/classes/NavigationPathQueryResult2D.xml
+++ b/engine/doc/classes/NavigationPathQueryResult2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationPathQueryResult2D" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationPathQueryResult2D" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents the result of a 2D pathfinding query.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationPathQueryResult3D.xml b/engine/doc/classes/NavigationPathQueryResult3D.xml
index 1d9d40f8..84a9f7d1 100644
--- a/engine/doc/classes/NavigationPathQueryResult3D.xml
+++ b/engine/doc/classes/NavigationPathQueryResult3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationPathQueryResult3D" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationPathQueryResult3D" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents the result of a 3D pathfinding query.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationPolygon.xml b/engine/doc/classes/NavigationPolygon.xml
index c8769eac..cfc513ed 100644
--- a/engine/doc/classes/NavigationPolygon.xml
+++ b/engine/doc/classes/NavigationPolygon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationPolygon" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationPolygon" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D navigation mesh that describes a traversable surface for pathfinding.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationRegion2D.xml b/engine/doc/classes/NavigationRegion2D.xml
index a2607705..731245fb 100644
--- a/engine/doc/classes/NavigationRegion2D.xml
+++ b/engine/doc/classes/NavigationRegion2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationRegion2D" inherits="Node2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationRegion2D" inherits="Node2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A traversable 2D region that [NavigationAgent2D]s can use for pathfinding.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationRegion3D.xml b/engine/doc/classes/NavigationRegion3D.xml
index a028e015..019afce3 100644
--- a/engine/doc/classes/NavigationRegion3D.xml
+++ b/engine/doc/classes/NavigationRegion3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationRegion3D" inherits="Node3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationRegion3D" inherits="Node3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A traversable 3D region that [NavigationAgent3D]s can use for pathfinding.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationServer2D.xml b/engine/doc/classes/NavigationServer2D.xml
index ebe01896..a72e3f39 100644
--- a/engine/doc/classes/NavigationServer2D.xml
+++ b/engine/doc/classes/NavigationServer2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationServer2D" inherits="Object" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationServer2D" inherits="Object" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for low-level 2D navigation access.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationServer2DManager.xml b/engine/doc/classes/NavigationServer2DManager.xml
index 853ea7b3..7b62e9b7 100644
--- a/engine/doc/classes/NavigationServer2DManager.xml
+++ b/engine/doc/classes/NavigationServer2DManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationServer2DManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationServer2DManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for managing [NavigationServer2D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationServer3D.xml b/engine/doc/classes/NavigationServer3D.xml
index 16b41493..2c9ffdb1 100644
--- a/engine/doc/classes/NavigationServer3D.xml
+++ b/engine/doc/classes/NavigationServer3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationServer3D" inherits="Object" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationServer3D" inherits="Object" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for low-level 3D navigation access.
 	</brief_description>
diff --git a/engine/doc/classes/NavigationServer3DManager.xml b/engine/doc/classes/NavigationServer3DManager.xml
index bd4546e5..7e853f9f 100644
--- a/engine/doc/classes/NavigationServer3DManager.xml
+++ b/engine/doc/classes/NavigationServer3DManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NavigationServer3DManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NavigationServer3DManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for managing [NavigationServer3D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/NinePatchRect.xml b/engine/doc/classes/NinePatchRect.xml
index cf47b68a..9a3d17e0 100644
--- a/engine/doc/classes/NinePatchRect.xml
+++ b/engine/doc/classes/NinePatchRect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NinePatchRect" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="NinePatchRect" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control that displays a texture by keeping its corners intact, but tiling its edges and center.
 	</brief_description>
diff --git a/engine/doc/classes/Node.xml b/engine/doc/classes/Node.xml
index cf5f001a..186fc4af 100644
--- a/engine/doc/classes/Node.xml
+++ b/engine/doc/classes/Node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Node" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Node" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all scene objects.
 	</brief_description>
@@ -306,7 +306,7 @@
 			<param index="3" name="owned" type="bool" default="true" />
 			<description>
 				Finds all descendants of this node whose names match [param pattern], returning an empty [Array] if no match is found. The matching is done against node names, [i]not[/i] their paths, through [method String.match]. As such, it is case-sensitive, [code]"*"[/code] matches zero or more characters, and [code]"?"[/code] matches any single character.
-				If [param type] is not empty, only descendants inheriting from [param type] are included (see [method Object.is_class]).
+				If [param type] is not empty, only ancestors inheriting from [param type] are included (see [method Object.is_class]).
 				If [param recursive] is [code]false[/code], only this node's direct children are checked. Nodes are checked in tree order, so this node's first direct child is checked first, then its own direct children, etc., before moving to the second direct child, and so on. Internal children are also included in the search (see [code]internal[/code] parameter in [method add_child]).
 				If [param owned] is [code]true[/code], only descendants with a valid [member owner] node are checked.
 				[b]Note:[/b] This method can be very slow. Consider storing references to the found nodes in a variable.
@@ -1276,10 +1276,6 @@
 		<constant name="NOTIFICATION_WM_POSITION_CHANGED" value="1012">
 			Notification received when the window is moved.
 		</constant>
-		<constant name="NOTIFICATION_WM_OUTPUT_MAX_LINEAR_VALUE_CHANGED" value="1013">
-			Notification received when the output max linear value returned by [method Window.get_output_max_linear_value] has changed.
-			This occurs when HDR output is enabled or disabled and when any HDR output luminance values of the window have changed, such as when the player adjusts their screen brightness setting or moves the window to a different screen.
-		</constant>
 		<constant name="NOTIFICATION_OS_MEMORY_WARNING" value="2009">
 			Notification received from the OS when the application is exceeding its allocated memory.
 			Implemented only on iOS.
@@ -1327,12 +1323,6 @@
 		<constant name="NOTIFICATION_TEXT_SERVER_CHANGED" value="2018">
 			Notification received when the [TextServer] is changed.
 		</constant>
-		<constant name="NOTIFICATION_APPLICATION_PIP_MODE_ENTERED" value="2019">
-			Notification received when the application enters picture-in-picture mode.
-		</constant>
-		<constant name="NOTIFICATION_APPLICATION_PIP_MODE_EXITED" value="2020">
-			Notification received when the application exits picture-in-picture mode.
-		</constant>
 		<constant name="NOTIFICATION_ACCESSIBILITY_UPDATE" value="3000">
 			Notification received when an accessibility information update is required.
 		</constant>
@@ -1343,16 +1333,16 @@
 			Inherits [member process_mode] from the node's parent. This is the default for any newly created node.
 		</constant>
 		<constant name="PROCESS_MODE_PAUSABLE" value="1" enum="ProcessMode">
-			Processes when [member SceneTree.paused] is [code]false[/code]. This is the inverse of [constant PROCESS_MODE_WHEN_PAUSED], and the default for the root node.
+			Stops processing when [member SceneTree.paused] is [code]true[/code]. This is the inverse of [constant PROCESS_MODE_WHEN_PAUSED], and the default for the root node.
 		</constant>
 		<constant name="PROCESS_MODE_WHEN_PAUSED" value="2" enum="ProcessMode">
-			Processes [b]only[/b] when [member SceneTree.paused] is [code]true[/code]. This is the inverse of [constant PROCESS_MODE_PAUSABLE].
+			Process [b]only[/b] when [member SceneTree.paused] is [code]true[/code]. This is the inverse of [constant PROCESS_MODE_PAUSABLE].
 		</constant>
 		<constant name="PROCESS_MODE_ALWAYS" value="3" enum="ProcessMode">
-			Always processes. Keeps processing, ignoring [member SceneTree.paused]. This is the inverse of [constant PROCESS_MODE_DISABLED].
+			Always process. Keeps processing, ignoring [member SceneTree.paused]. This is the inverse of [constant PROCESS_MODE_DISABLED].
 		</constant>
 		<constant name="PROCESS_MODE_DISABLED" value="4" enum="ProcessMode">
-			Never processes. Completely disables processing, ignoring [member SceneTree.paused]. This is the inverse of [constant PROCESS_MODE_ALWAYS].
+			Never process. Completely disables processing, ignoring [member SceneTree.paused]. This is the inverse of [constant PROCESS_MODE_ALWAYS].
 		</constant>
 		<constant name="PROCESS_THREAD_GROUP_INHERIT" value="0" enum="ProcessThreadGroup">
 			Process this node based on the thread group mode of the first parent (or grandparent) node that has a thread group mode that is not inherit. See [member process_thread_group] for more information.
diff --git a/engine/doc/classes/Node2D.xml b/engine/doc/classes/Node2D.xml
index 7aebfdca..4b56f582 100644
--- a/engine/doc/classes/Node2D.xml
+++ b/engine/doc/classes/Node2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Node2D" inherits="CanvasItem" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Node2D" inherits="CanvasItem" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D game object, inherited by all 2D-related nodes. Has a position, rotation, scale, and skew.
 	</brief_description>
diff --git a/engine/doc/classes/Node3D.xml b/engine/doc/classes/Node3D.xml
index 03a8efdd..a3f0ee97 100644
--- a/engine/doc/classes/Node3D.xml
+++ b/engine/doc/classes/Node3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Node3D" inherits="Node" api_type="core" keywords="spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Node3D" inherits="Node" keywords="spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base object in 3D space, inherited by all 3D nodes.
 	</brief_description>
diff --git a/engine/doc/classes/Node3DGizmo.xml b/engine/doc/classes/Node3DGizmo.xml
index cfb07c65..844aafae 100644
--- a/engine/doc/classes/Node3DGizmo.xml
+++ b/engine/doc/classes/Node3DGizmo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Node3DGizmo" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Node3DGizmo" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract class to expose editor gizmos for [Node3D].
 	</brief_description>
diff --git a/engine/doc/classes/ORMMaterial3D.xml b/engine/doc/classes/ORMMaterial3D.xml
index 4a082516..72620573 100644
--- a/engine/doc/classes/ORMMaterial3D.xml
+++ b/engine/doc/classes/ORMMaterial3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ORMMaterial3D" inherits="BaseMaterial3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ORMMaterial3D" inherits="BaseMaterial3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A PBR (Physically Based Rendering) material to be used on 3D objects. Uses an ORM texture.
 	</brief_description>
diff --git a/engine/doc/classes/OS.xml b/engine/doc/classes/OS.xml
index ba8a14b0..ec935fb9 100644
--- a/engine/doc/classes/OS.xml
+++ b/engine/doc/classes/OS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OS" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OS" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to common operating system functionalities.
 	</brief_description>
@@ -868,7 +868,7 @@
 				- [code]OS.shell_open("C:\\Users\\name\\Downloads")[/code] on Windows opens the file explorer at the user's Downloads folder.
 				- [code]OS.shell_open("C:/Users/name/Downloads")[/code] also works on Windows and opens the file explorer at the user's Downloads folder.
 				- [code]OS.shell_open("https://godotengine.org")[/code] opens the default web browser on the official Godot website.
-				- [code]OS.shell_open("mailto:example@example.com")[/code] opens the default email client with the "To" field set to [code]example@example.com[/code]. See [url=https://datatracker.ietf.org/doc/html/rfc2368]RFC 2368 - The mailto URL scheme[/url] for a list of fields that can be added.
+				- [code]OS.shell_open("mailto:example@example.com")[/code] opens the default email client with the "To" field set to [code]example@example.com[/code]. See [url=https://datatracker.ietf.org/doc/html/rfc2368]RFC 2368 - The [code]mailto[/code] URL scheme[/url] for a list of fields that can be added.
 				Use [method ProjectSettings.globalize_path] to convert a [code]res://[/code] or [code]user://[/code] project path into a system path for use with this method.
 				[b]Note:[/b] Use [method String.uri_encode] to encode characters within URLs in a URL-safe, portable way. This is especially required for line breaks. Otherwise, [method shell_open] may not work correctly in a project exported to the Web platform.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux, macOS and Windows.
@@ -910,13 +910,13 @@
 	</members>
 	<constants>
 		<constant name="RENDERING_DRIVER_VULKAN" value="0" enum="RenderingDriver">
-			The Vulkan rendering driver. It requires Vulkan 1.0 support and automatically uses features from Vulkan 1.1, 1.2, and 1.3 if available.
+			The Vulkan rendering driver. It requires Vulkan 1.0 support and automatically uses features from Vulkan 1.1 and 1.2 if available.
 		</constant>
 		<constant name="RENDERING_DRIVER_OPENGL3" value="1" enum="RenderingDriver">
 			The OpenGL 3 rendering driver. It uses OpenGL 3.3 Core Profile on desktop platforms, OpenGL ES 3.0 on mobile devices, and WebGL 2.0 on Web.
 		</constant>
 		<constant name="RENDERING_DRIVER_D3D12" value="2" enum="RenderingDriver">
-			The Direct3D 12 rendering driver. It requires the 12_0 feature level and Shader Model 6.0 support.
+			The Direct3D 12 rendering driver.
 		</constant>
 		<constant name="RENDERING_DRIVER_METAL" value="3" enum="RenderingDriver">
 			The Metal rendering driver.
diff --git a/engine/doc/classes/Object.xml b/engine/doc/classes/Object.xml
index 7063d881..c50afa39 100644
--- a/engine/doc/classes/Object.xml
+++ b/engine/doc/classes/Object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all other classes in the engine.
 	</brief_description>
@@ -1037,20 +1037,20 @@
 		<constant name="NOTIFICATION_EXTENSION_RELOADED" value="2">
 			Notification received when the object finishes hot reloading. This notification is only sent for extensions classes and derived.
 		</constant>
-		<constant name="CONNECT_DEFERRED" value="1" enum="ConnectFlags" is_bitfield="true">
+		<constant name="CONNECT_DEFERRED" value="1" enum="ConnectFlags">
 			Deferred connections trigger their [Callable]s on idle time (at the end of the frame), rather than instantly.
 		</constant>
-		<constant name="CONNECT_PERSIST" value="2" enum="ConnectFlags" is_bitfield="true">
+		<constant name="CONNECT_PERSIST" value="2" enum="ConnectFlags">
 			Persisting connections are stored when the object is serialized (such as when using [method PackedScene.pack]). In the editor, connections created through the Signals dock are always persisting.
 			[b]Note:[/b] Connections to lambda functions (that is, when the function code is embedded in the [method connect] call) cannot be made persistent.
 		</constant>
-		<constant name="CONNECT_ONE_SHOT" value="4" enum="ConnectFlags" is_bitfield="true">
+		<constant name="CONNECT_ONE_SHOT" value="4" enum="ConnectFlags">
 			One-shot connections disconnect themselves after emission.
 		</constant>
-		<constant name="CONNECT_REFERENCE_COUNTED" value="8" enum="ConnectFlags" is_bitfield="true">
+		<constant name="CONNECT_REFERENCE_COUNTED" value="8" enum="ConnectFlags">
 			Reference-counted connections can be assigned to the same [Callable] multiple times. Each disconnection decreases the internal counter. The signal fully disconnects only when the counter reaches 0.
 		</constant>
-		<constant name="CONNECT_APPEND_SOURCE_OBJECT" value="16" enum="ConnectFlags" is_bitfield="true">
+		<constant name="CONNECT_APPEND_SOURCE_OBJECT" value="16" enum="ConnectFlags">
 			On signal emission, the source object is automatically appended after the original arguments of the signal, regardless of the connected [Callable]'s unbinds which affect only the original arguments of the signal (see [method Callable.unbind], [method Callable.get_unbound_arguments_count]).
 			[codeblock]
 			extends Object
diff --git a/engine/doc/classes/Occluder3D.xml b/engine/doc/classes/Occluder3D.xml
index a4014198..56124cb0 100644
--- a/engine/doc/classes/Occluder3D.xml
+++ b/engine/doc/classes/Occluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Occluder3D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Occluder3D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Occluder shape resource for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/OccluderInstance3D.xml b/engine/doc/classes/OccluderInstance3D.xml
index e3d38ae3..b3e6366c 100644
--- a/engine/doc/classes/OccluderInstance3D.xml
+++ b/engine/doc/classes/OccluderInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OccluderInstance3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OccluderInstance3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides occlusion culling for 3D nodes, which improves performance in closed areas.
 	</brief_description>
diff --git a/engine/doc/classes/OccluderPolygon2D.xml b/engine/doc/classes/OccluderPolygon2D.xml
index 3642bfa2..36e1540b 100644
--- a/engine/doc/classes/OccluderPolygon2D.xml
+++ b/engine/doc/classes/OccluderPolygon2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OccluderPolygon2D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OccluderPolygon2D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Defines a 2D polygon for LightOccluder2D.
 	</brief_description>
diff --git a/engine/doc/classes/OmniLight3D.xml b/engine/doc/classes/OmniLight3D.xml
index d3e42232..8d91663e 100644
--- a/engine/doc/classes/OmniLight3D.xml
+++ b/engine/doc/classes/OmniLight3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OmniLight3D" inherits="Light3D" api_type="core" keywords="point" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OmniLight3D" inherits="Light3D" keywords="point" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Omnidirectional light, such as a light bulb or a candle.
 	</brief_description>
diff --git a/engine/doc/classes/OptimizedTranslation.xml b/engine/doc/classes/OptimizedTranslation.xml
index 09a04299..e7a12401 100644
--- a/engine/doc/classes/OptimizedTranslation.xml
+++ b/engine/doc/classes/OptimizedTranslation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OptimizedTranslation" inherits="Translation" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OptimizedTranslation" inherits="Translation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An optimized translation.
 	</brief_description>
diff --git a/engine/doc/classes/OptionButton.xml b/engine/doc/classes/OptionButton.xml
index 5bb9d0d1..728bc23c 100644
--- a/engine/doc/classes/OptionButton.xml
+++ b/engine/doc/classes/OptionButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OptionButton" inherits="Button" api_type="core" keywords="select, dropdown" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="OptionButton" inherits="Button" keywords="select, dropdown" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A button that brings up a dropdown with selectable options when pressed.
 	</brief_description>
@@ -140,12 +140,6 @@
 				Returns [code]true[/code] if the item at index [param idx] is marked as a separator.
 			</description>
 		</method>
-		<method name="is_search_bar_enabled" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if the search bar is enabled.
-			</description>
-		</method>
 		<method name="remove_item">
 			<return type="void" />
 			<param index="0" name="idx" type="int" />
@@ -239,9 +233,6 @@
 		<member name="allow_reselect" type="bool" setter="set_allow_reselect" getter="get_allow_reselect" default="false">
 			If [code]true[/code], the currently selected item can be selected again.
 		</member>
-		<member name="enable_search_bar_on_item_count" type="int" setter="set_search_bar_enabled_on_item_count" getter="get_search_bar_enabled_on_item_count" default="0">
-			Enables the [PopupMenu] search bar if the item count is greater than [code]0[/code].
-		</member>
 		<member name="fit_to_longest_item" type="bool" setter="set_fit_to_longest_item" getter="is_fit_to_longest_item" default="true">
 			If [code]true[/code], minimum size will be determined by the longest item's text, instead of the currently selected one's.
 			[b]Note:[/b] For performance reasons, the minimum size doesn't update immediately when adding, removing or modifying items.
@@ -249,26 +240,6 @@
 		<member name="item_count" type="int" setter="set_item_count" getter="get_item_count" default="0">
 			The number of items to select from.
 		</member>
-		<member name="popup/item_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/icon" type="Texture2D" setter="" getter="">
-			The icon of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/id" type="int" setter="" getter="" default="0">
-			The ID of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/separator" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is a separator.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="popup/item_{index}/text" type="String" setter="" getter="" default="&quot;&quot;">
-			The text of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
 		<member name="selected" type="int" setter="_select_int" getter="get_selected" default="-1">
 			The index of the currently selected item, or [code]-1[/code] if no item is selected.
 		</member>
diff --git a/engine/doc/classes/PCKPacker.xml b/engine/doc/classes/PCKPacker.xml
index c7e1d02e..90b9be6c 100644
--- a/engine/doc/classes/PCKPacker.xml
+++ b/engine/doc/classes/PCKPacker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PCKPacker" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PCKPacker" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Creates packages that can be loaded into a running project.
 	</brief_description>
@@ -34,15 +34,6 @@
 				Adds the [param source_path] file to the current PCK package at the [param target_path] internal path. The [code]res://[/code] prefix for [param target_path] is optional and stripped internally. File content is immediately written to the PCK.
 			</description>
 		</method>
-		<method name="add_file_from_buffer">
-			<return type="int" enum="Error" />
-			<param index="0" name="target_path" type="String" />
-			<param index="1" name="data" type="PackedByteArray" />
-			<param index="2" name="encrypt" type="bool" default="false" />
-			<description>
-				Adds the [param data] to the current PCK package at the [param target_path] internal path. The [code]res://[/code] prefix for [param target_path] is optional and stripped internally. File content is immediately written to the PCK.
-			</description>
-		</method>
 		<method name="add_file_removal">
 			<return type="int" enum="Error" />
 			<param index="0" name="target_path" type="String" />
diff --git a/engine/doc/classes/PackedByteArray.xml b/engine/doc/classes/PackedByteArray.xml
index 7c0fcd06..f373e982 100644
--- a/engine/doc/classes/PackedByteArray.xml
+++ b/engine/doc/classes/PackedByteArray.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold bytes. Packs data tightly, so it saves memory for large array sizes.
 		[PackedByteArray] also provides methods to encode/decode various types to/from bytes. The way values are encoded is an implementation detail and shouldn't be relied upon when interacting with external apps.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedColorArray.xml b/engine/doc/classes/PackedColorArray.xml
index df999456..19a620ab 100644
--- a/engine/doc/classes/PackedColorArray.xml
+++ b/engine/doc/classes/PackedColorArray.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold [Color]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedColorArray] versus [code]Array[Color][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedDataContainer.xml b/engine/doc/classes/PackedDataContainer.xml
index 72bc7570..55512ad9 100644
--- a/engine/doc/classes/PackedDataContainer.xml
+++ b/engine/doc/classes/PackedDataContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PackedDataContainer" inherits="Resource" api_type="core" deprecated="Use [method @GlobalScope.var_to_bytes] or [method FileAccess.store_var] instead. To enable data compression, use [method PackedByteArray.compress] or [method FileAccess.open_compressed]." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PackedDataContainer" inherits="Resource" deprecated="Use [method @GlobalScope.var_to_bytes] or [method FileAccess.store_var] instead. To enable data compression, use [method PackedByteArray.compress] or [method FileAccess.open_compressed]." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Efficiently packs and serializes [Array] or [Dictionary].
 	</brief_description>
diff --git a/engine/doc/classes/PackedDataContainerRef.xml b/engine/doc/classes/PackedDataContainerRef.xml
index 54e88c21..bd1dbbea 100644
--- a/engine/doc/classes/PackedDataContainerRef.xml
+++ b/engine/doc/classes/PackedDataContainerRef.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PackedDataContainerRef" inherits="RefCounted" api_type="core" deprecated="Use [method @GlobalScope.var_to_bytes] or [method FileAccess.store_var] instead. To enable data compression, use [method PackedByteArray.compress] or [method FileAccess.open_compressed]." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PackedDataContainerRef" inherits="RefCounted" deprecated="Use [method @GlobalScope.var_to_bytes] or [method FileAccess.store_var] instead. To enable data compression, use [method PackedByteArray.compress] or [method FileAccess.open_compressed]." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An internal class used by [PackedDataContainer] to pack nested arrays and dictionaries.
 	</brief_description>
diff --git a/engine/doc/classes/PackedFloat32Array.xml b/engine/doc/classes/PackedFloat32Array.xml
index 21e32285..4b0b330d 100644
--- a/engine/doc/classes/PackedFloat32Array.xml
+++ b/engine/doc/classes/PackedFloat32Array.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold 32-bit floating-point values (float). Packs data tightly, so it saves memory for large array sizes.
 		If you need to pack 64-bit floats tightly, see [PackedFloat64Array].
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedFloat64Array.xml b/engine/doc/classes/PackedFloat64Array.xml
index c171825e..e92502a6 100644
--- a/engine/doc/classes/PackedFloat64Array.xml
+++ b/engine/doc/classes/PackedFloat64Array.xml
@@ -8,7 +8,6 @@
 		If you only need to pack 32-bit floats tightly, see [PackedFloat32Array] for a more memory-friendly alternative.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedFloat64Array] versus [code]Array[float][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedInt32Array.xml b/engine/doc/classes/PackedInt32Array.xml
index f2b1e639..73c6f3e7 100644
--- a/engine/doc/classes/PackedInt32Array.xml
+++ b/engine/doc/classes/PackedInt32Array.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold 32-bit integer values. Packs data tightly, so it saves memory for large array sizes.
 		[b]Note:[/b] This type stores signed 32-bit integers, which means it can take values in the interval [code][-2^31, 2^31 - 1][/code], i.e. [code][-2147483648, 2147483647][/code]. Exceeding those bounds will wrap around. In comparison, [int] uses signed 64-bit integers which can hold much larger values. If you need to pack 64-bit integers tightly, see [PackedInt64Array].
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedInt64Array.xml b/engine/doc/classes/PackedInt64Array.xml
index 9d256881..f3a725f5 100644
--- a/engine/doc/classes/PackedInt64Array.xml
+++ b/engine/doc/classes/PackedInt64Array.xml
@@ -8,7 +8,6 @@
 		[b]Note:[/b] This type stores signed 64-bit integers, which means it can take values in the interval [code][-2^63, 2^63 - 1][/code], i.e. [code][-9223372036854775808, 9223372036854775807][/code]. Exceeding those bounds will wrap around. If you only need to pack 32-bit integers tightly, see [PackedInt32Array] for a more memory-friendly alternative.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedInt64Array] versus [code]Array[int][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedScene.xml b/engine/doc/classes/PackedScene.xml
index ffa795f0..588c0593 100644
--- a/engine/doc/classes/PackedScene.xml
+++ b/engine/doc/classes/PackedScene.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PackedScene" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PackedScene" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An abstraction of a serialized scene.
 	</brief_description>
diff --git a/engine/doc/classes/PackedStringArray.xml b/engine/doc/classes/PackedStringArray.xml
index 509f5dee..62828d8e 100644
--- a/engine/doc/classes/PackedStringArray.xml
+++ b/engine/doc/classes/PackedStringArray.xml
@@ -13,7 +13,6 @@
 		[/codeblock]
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedStringArray] versus [code]Array[String][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Operating System Testing Demo">https://godotengine.org/asset-library/asset/2789</link>
diff --git a/engine/doc/classes/PackedVector2Array.xml b/engine/doc/classes/PackedVector2Array.xml
index c60243a7..6afa7e8b 100644
--- a/engine/doc/classes/PackedVector2Array.xml
+++ b/engine/doc/classes/PackedVector2Array.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold [Vector2]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector2Array] versus [code]Array[Vector2][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Grid-based Navigation with AStarGrid2D Demo">https://godotengine.org/asset-library/asset/2723</link>
diff --git a/engine/doc/classes/PackedVector3Array.xml b/engine/doc/classes/PackedVector3Array.xml
index 3ffe8e7d..e3c8c24d 100644
--- a/engine/doc/classes/PackedVector3Array.xml
+++ b/engine/doc/classes/PackedVector3Array.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold [Vector3]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector3Array] versus [code]Array[Vector3][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PackedVector4Array.xml b/engine/doc/classes/PackedVector4Array.xml
index 825022b1..995ab553 100644
--- a/engine/doc/classes/PackedVector4Array.xml
+++ b/engine/doc/classes/PackedVector4Array.xml
@@ -7,7 +7,6 @@
 		An array specifically designed to hold [Vector4]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector4Array] versus [code]Array[Vector4][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
 		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
-		[b]Note:[/b] In a boolean context, a packed array will evaluate to [code]false[/code] if it's empty. Otherwise, a packed array will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PacketPeer.xml b/engine/doc/classes/PacketPeer.xml
index 8254065d..9a2a23c9 100644
--- a/engine/doc/classes/PacketPeer.xml
+++ b/engine/doc/classes/PacketPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PacketPeer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PacketPeer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstraction and base class for packet-based protocols.
 	</brief_description>
diff --git a/engine/doc/classes/PacketPeerDTLS.xml b/engine/doc/classes/PacketPeerDTLS.xml
index 83a284d1..6598c33d 100644
--- a/engine/doc/classes/PacketPeerDTLS.xml
+++ b/engine/doc/classes/PacketPeerDTLS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PacketPeerDTLS" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PacketPeerDTLS" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		DTLS packet peer.
 	</brief_description>
diff --git a/engine/doc/classes/PacketPeerExtension.xml b/engine/doc/classes/PacketPeerExtension.xml
index bc6ddb00..23d95ecf 100644
--- a/engine/doc/classes/PacketPeerExtension.xml
+++ b/engine/doc/classes/PacketPeerExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PacketPeerExtension" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PacketPeerExtension" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/PacketPeerStream.xml b/engine/doc/classes/PacketPeerStream.xml
index f2dac43d..57bd4e00 100644
--- a/engine/doc/classes/PacketPeerStream.xml
+++ b/engine/doc/classes/PacketPeerStream.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PacketPeerStream" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PacketPeerStream" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Wrapper to use a PacketPeer over a StreamPeer.
 	</brief_description>
diff --git a/engine/doc/classes/PacketPeerUDP.xml b/engine/doc/classes/PacketPeerUDP.xml
index 37873ed0..0f173570 100644
--- a/engine/doc/classes/PacketPeerUDP.xml
+++ b/engine/doc/classes/PacketPeerUDP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PacketPeerUDP" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PacketPeerUDP" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		UDP packet peer.
 	</brief_description>
diff --git a/engine/doc/classes/Panel.xml b/engine/doc/classes/Panel.xml
index ad96a79a..993c383c 100644
--- a/engine/doc/classes/Panel.xml
+++ b/engine/doc/classes/Panel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Panel" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Panel" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A GUI control that displays a [StyleBox].
 	</brief_description>
diff --git a/engine/doc/classes/PanelContainer.xml b/engine/doc/classes/PanelContainer.xml
index 483f4c50..c2972abc 100644
--- a/engine/doc/classes/PanelContainer.xml
+++ b/engine/doc/classes/PanelContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PanelContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PanelContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that keeps its child controls within the area of a [StyleBox].
 	</brief_description>
diff --git a/engine/doc/classes/PanoramaSkyMaterial.xml b/engine/doc/classes/PanoramaSkyMaterial.xml
index d355bfab..9e579cc7 100644
--- a/engine/doc/classes/PanoramaSkyMaterial.xml
+++ b/engine/doc/classes/PanoramaSkyMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PanoramaSkyMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PanoramaSkyMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material that provides a special texture to a [Sky], usually an HDR panorama.
 	</brief_description>
diff --git a/engine/doc/classes/Parallax2D.xml b/engine/doc/classes/Parallax2D.xml
index be6d721e..18953521 100644
--- a/engine/doc/classes/Parallax2D.xml
+++ b/engine/doc/classes/Parallax2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Parallax2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Parallax2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to create a parallax scrolling background.
 	</brief_description>
diff --git a/engine/doc/classes/ParallaxBackground.xml b/engine/doc/classes/ParallaxBackground.xml
index 280f7183..3b495d0d 100644
--- a/engine/doc/classes/ParallaxBackground.xml
+++ b/engine/doc/classes/ParallaxBackground.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ParallaxBackground" inherits="CanvasLayer" api_type="core" deprecated="Use the [Parallax2D] node instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ParallaxBackground" inherits="CanvasLayer" deprecated="Use the [Parallax2D] node instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to create a parallax scrolling background.
 	</brief_description>
diff --git a/engine/doc/classes/ParallaxLayer.xml b/engine/doc/classes/ParallaxLayer.xml
index 6c4ea917..f469260b 100644
--- a/engine/doc/classes/ParallaxLayer.xml
+++ b/engine/doc/classes/ParallaxLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ParallaxLayer" inherits="Node2D" api_type="core" deprecated="Use the [Parallax2D] node instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ParallaxLayer" inherits="Node2D" deprecated="Use the [Parallax2D] node instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A parallax scrolling layer to be used with [ParallaxBackground].
 	</brief_description>
diff --git a/engine/doc/classes/ParticleProcessMaterial.xml b/engine/doc/classes/ParticleProcessMaterial.xml
index d0faf0af..245982bb 100644
--- a/engine/doc/classes/ParticleProcessMaterial.xml
+++ b/engine/doc/classes/ParticleProcessMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ParticleProcessMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ParticleProcessMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds a particle configuration for [GPUParticles2D] or [GPUParticles3D] nodes.
 	</brief_description>
@@ -291,10 +291,6 @@
 		<member name="particle_flag_disable_z" type="bool" setter="set_particle_flag" getter="get_particle_flag" default="false">
 			If [code]true[/code], particles will not move on the z axis.
 		</member>
-		<member name="particle_flag_inherit_emitter_scale" type="bool" setter="set_particle_flag" getter="get_particle_flag" default="false">
-			If [code]true[/code], particles will inherit the scale of the emitter.
-			[b]Note:[/b] This has no effect when [member GPUParticles3D.local_coords] is [code]true[/code], since particles in local space are already affected by the emitter's scale.
-		</member>
 		<member name="particle_flag_rotate_y" type="bool" setter="set_particle_flag" getter="get_particle_flag" default="false">
 			If [code]true[/code], particles rotate around Y axis by [member angle_min].
 		</member>
@@ -319,29 +315,6 @@
 			Minimum radial velocity applied to each particle. Makes particles move away from the [member velocity_pivot], or toward it if negative.
 			[b]Note:[/b] Animated velocities will not be affected by damping, use [member velocity_limit_curve] instead.
 		</member>
-		<member name="rotation_3d_max" type="Vector3" setter="set_rotation_3d_max" getter="get_rotation_3d_max">
-			The maximum 3D orientation, in degrees. Works only in 3D and if [member use_rotation_3d] is enabled.
-		</member>
-		<member name="rotation_3d_min" type="Vector3" setter="set_rotation_3d_min" getter="get_rotation_3d_min">
-			The minimum 3D orientation, in degrees. Works only in 3D and if [member use_rotation_3d] is enabled.
-		</member>
-		<member name="rotation_velocity_3d_curve" type="Texture2D" setter="set_rotation_velocity_3d_curve" getter="get_rotation_velocity_3d_curve">
-			Rotation velocity curve over lifetime, per-axis. Enable [member use_rotation_velocity_3d] to use this.
-		</member>
-		<member name="rotation_velocity_3d_max" type="Vector3" setter="set_rotation_velocity_3d_max" getter="get_rotation_velocity_3d_max">
-			Maximum 3D rotation velocity on the particle's local axis. Enable [member use_rotation_velocity_3d] to use this.
-		</member>
-		<member name="rotation_velocity_3d_min" type="Vector3" setter="set_rotation_velocity_3d_min" getter="get_rotation_velocity_3d_min">
-			Minimum 3D rotation velocity on the particle's local axis. Enable [member use_rotation_velocity_3d] to use this.
-		</member>
-		<member name="scale_3d_max" type="Vector3" setter="set_scale_3d_max" getter="get_scale_3d_max">
-			The maximum value of the random scale vector for each particle.
-			Works only if [member use_scale_3d] is enabled.
-		</member>
-		<member name="scale_3d_min" type="Vector3" setter="set_scale_3d_min" getter="get_scale_3d_min">
-			The minimum value of the random scale vector for each particle.
-			Works only if [member use_scale_3d] is enabled.
-		</member>
 		<member name="scale_curve" type="Texture2D" setter="set_param_texture" getter="get_param_texture">
 			Each particle's scale will vary along this [CurveTexture] over its lifetime. If a [CurveXYZTexture] is supplied instead, the scale will be separated per-axis.
 		</member>
@@ -434,15 +407,6 @@
 		<member name="turbulence_noise_strength" type="float" setter="set_turbulence_noise_strength" getter="get_turbulence_noise_strength" default="1.0">
 			The turbulence noise strength. Increasing this will result in a stronger, more contrasting, flow pattern.
 		</member>
-		<member name="use_rotation_3d" type="bool" setter="set_use_rotation_3d" getter="is_using_rotation_3d" default="false">
-			Enable the usage of [member rotation_3d_min] and [member rotation_3d_max].
-		</member>
-		<member name="use_rotation_velocity_3d" type="bool" setter="set_using_rotation_velocity_3d" getter="is_using_rotation_velocity_3d" default="false">
-			Enable 3D rotation velocity.
-		</member>
-		<member name="use_scale_3d" type="bool" setter="set_use_scale_3d" getter="is_using_scale_3d" default="false">
-			Enable the usage of [member scale_3d_min] and [member scale_3d_max].
-		</member>
 		<member name="velocity_limit_curve" type="Texture2D" setter="set_velocity_limit_curve" getter="get_velocity_limit_curve">
 			A [CurveTexture] that defines the maximum velocity of a particle during its lifetime.
 		</member>
@@ -518,9 +482,7 @@
 		</constant>
 		<constant name="PARTICLE_FLAG_DAMPING_AS_FRICTION" value="3" enum="ParticleFlags">
 		</constant>
-		<constant name="PARTICLE_FLAG_INHERIT_EMITTER_SCALE" value="4" enum="ParticleFlags">
-		</constant>
-		<constant name="PARTICLE_FLAG_MAX" value="5" enum="ParticleFlags">
+		<constant name="PARTICLE_FLAG_MAX" value="4" enum="ParticleFlags">
 			Represents the size of the [enum ParticleFlags] enum.
 		</constant>
 		<constant name="EMISSION_SHAPE_POINT" value="0" enum="EmissionShape">
@@ -557,19 +519,14 @@
 			Use with [method set_param_texture] to set the turbulence influence over the particles life time.
 		</constant>
 		<constant name="SUB_EMITTER_DISABLED" value="0" enum="SubEmitterMode">
-			The subemitter is disabled.
 		</constant>
 		<constant name="SUB_EMITTER_CONSTANT" value="1" enum="SubEmitterMode">
-			The submitter is emitted on the constant interval defined by [member sub_emitter_frequency].
 		</constant>
 		<constant name="SUB_EMITTER_AT_END" value="2" enum="SubEmitterMode">
-			The subemitter is emitted at the end of the particle's lifetime.
 		</constant>
 		<constant name="SUB_EMITTER_AT_COLLISION" value="3" enum="SubEmitterMode">
-			The subemitter is emitted when the particle collides.
 		</constant>
 		<constant name="SUB_EMITTER_AT_START" value="4" enum="SubEmitterMode">
-			The subemitter is emitted when the particle spawns.
 		</constant>
 		<constant name="SUB_EMITTER_MAX" value="5" enum="SubEmitterMode">
 			Represents the size of the [enum SubEmitterMode] enum.
diff --git a/engine/doc/classes/Path2D.xml b/engine/doc/classes/Path2D.xml
index 234fc34c..7c4b1822 100644
--- a/engine/doc/classes/Path2D.xml
+++ b/engine/doc/classes/Path2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Path2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Path2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Contains a [Curve2D] path for [PathFollow2D] nodes to follow.
 	</brief_description>
diff --git a/engine/doc/classes/Path3D.xml b/engine/doc/classes/Path3D.xml
index f04232b9..d2696526 100644
--- a/engine/doc/classes/Path3D.xml
+++ b/engine/doc/classes/Path3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Path3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Path3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Contains a [Curve3D] path for [PathFollow3D] nodes to follow.
 	</brief_description>
diff --git a/engine/doc/classes/PathFollow2D.xml b/engine/doc/classes/PathFollow2D.xml
index 0290e798..7444bfc2 100644
--- a/engine/doc/classes/PathFollow2D.xml
+++ b/engine/doc/classes/PathFollow2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PathFollow2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PathFollow2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Point sampler for a [Path2D].
 	</brief_description>
diff --git a/engine/doc/classes/PathFollow3D.xml b/engine/doc/classes/PathFollow3D.xml
index b0d90846..bcd04d51 100644
--- a/engine/doc/classes/PathFollow3D.xml
+++ b/engine/doc/classes/PathFollow3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PathFollow3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PathFollow3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Point sampler for a [Path3D].
 	</brief_description>
diff --git a/engine/doc/classes/Performance.xml b/engine/doc/classes/Performance.xml
index 851832ed..d204b435 100644
--- a/engine/doc/classes/Performance.xml
+++ b/engine/doc/classes/Performance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Performance" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Performance" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exposes performance-related data.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicalBone2D.xml b/engine/doc/classes/PhysicalBone2D.xml
index cdce32f0..db8c61ed 100644
--- a/engine/doc/classes/PhysicalBone2D.xml
+++ b/engine/doc/classes/PhysicalBone2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicalBone2D" inherits="RigidBody2D" api_type="core" keywords="ragdoll" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicalBone2D" inherits="RigidBody2D" keywords="ragdoll" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [RigidBody2D]-derived node used to make [Bone2D]s in a [Skeleton2D] react to physics.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicalBone3D.xml b/engine/doc/classes/PhysicalBone3D.xml
index 079dc728..35952e24 100644
--- a/engine/doc/classes/PhysicalBone3D.xml
+++ b/engine/doc/classes/PhysicalBone3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicalBone3D" inherits="PhysicsBody3D" api_type="core" keywords="ragdoll" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicalBone3D" inherits="PhysicsBody3D" keywords="ragdoll" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics body used to make bones in a [Skeleton3D] react to physics.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicalBoneSimulator3D.xml b/engine/doc/classes/PhysicalBoneSimulator3D.xml
index 4906cbf9..149993e1 100644
--- a/engine/doc/classes/PhysicalBoneSimulator3D.xml
+++ b/engine/doc/classes/PhysicalBoneSimulator3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicalBoneSimulator3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicalBoneSimulator3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node that can be the parent of [PhysicalBone3D] and can apply the simulation results to [Skeleton3D].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicalSkyMaterial.xml b/engine/doc/classes/PhysicalSkyMaterial.xml
index 945b3951..460134e5 100644
--- a/engine/doc/classes/PhysicalSkyMaterial.xml
+++ b/engine/doc/classes/PhysicalSkyMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicalSkyMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicalSkyMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material that defines a sky for a [Sky] resource by a set of physical properties.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsBody2D.xml b/engine/doc/classes/PhysicsBody2D.xml
index 0782266e..ca064db0 100644
--- a/engine/doc/classes/PhysicsBody2D.xml
+++ b/engine/doc/classes/PhysicsBody2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsBody2D" inherits="CollisionObject2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsBody2D" inherits="CollisionObject2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 2D game objects affected by physics.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsBody3D.xml b/engine/doc/classes/PhysicsBody3D.xml
index b05ead18..6da20afa 100644
--- a/engine/doc/classes/PhysicsBody3D.xml
+++ b/engine/doc/classes/PhysicsBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsBody3D" inherits="CollisionObject3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsBody3D" inherits="CollisionObject3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 3D game objects affected by physics.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectBodyState2D.xml b/engine/doc/classes/PhysicsDirectBodyState2D.xml
index 61117ae5..c7cca7d7 100644
--- a/engine/doc/classes/PhysicsDirectBodyState2D.xml
+++ b/engine/doc/classes/PhysicsDirectBodyState2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectBodyState2D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectBodyState2D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides direct access to a physics body in the [PhysicsServer2D].
 	</brief_description>
@@ -196,8 +196,7 @@
 			<return type="Vector2" />
 			<param index="0" name="local_position" type="Vector2" />
 			<description>
-				Returns the body's velocity at the given relative position.
-				[param local_position] is the offset from the body origin in global coordinates.
+				Returns the body's velocity at the given relative position, including both translation and rotation.
 			</description>
 		</method>
 		<method name="integrate_forces">
diff --git a/engine/doc/classes/PhysicsDirectBodyState2DExtension.xml b/engine/doc/classes/PhysicsDirectBodyState2DExtension.xml
index 31400cd7..25ad7e23 100644
--- a/engine/doc/classes/PhysicsDirectBodyState2DExtension.xml
+++ b/engine/doc/classes/PhysicsDirectBodyState2DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectBodyState2DExtension" inherits="PhysicsDirectBodyState2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectBodyState2DExtension" inherits="PhysicsDirectBodyState2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsDirectBodyState2D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectBodyState3D.xml b/engine/doc/classes/PhysicsDirectBodyState3D.xml
index 53b4c590..76a5bdb5 100644
--- a/engine/doc/classes/PhysicsDirectBodyState3D.xml
+++ b/engine/doc/classes/PhysicsDirectBodyState3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectBodyState3D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectBodyState3D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides direct access to a physics body in the [PhysicsServer3D].
 	</brief_description>
@@ -196,8 +196,7 @@
 			<return type="Vector3" />
 			<param index="0" name="local_position" type="Vector3" />
 			<description>
-				Returns the body's velocity at the given relative position.
-				[param local_position] is the offset from the body origin in global coordinates.
+				Returns the body's velocity at the given relative position, including both translation and rotation.
 			</description>
 		</method>
 		<method name="integrate_forces">
diff --git a/engine/doc/classes/PhysicsDirectBodyState3DExtension.xml b/engine/doc/classes/PhysicsDirectBodyState3DExtension.xml
index 3dba6688..cecc37e3 100644
--- a/engine/doc/classes/PhysicsDirectBodyState3DExtension.xml
+++ b/engine/doc/classes/PhysicsDirectBodyState3DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectBodyState3DExtension" inherits="PhysicsDirectBodyState3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectBodyState3DExtension" inherits="PhysicsDirectBodyState3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsDirectBodyState3D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectSpaceState2D.xml b/engine/doc/classes/PhysicsDirectSpaceState2D.xml
index d6f08ceb..ed7f6d29 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState2D.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectSpaceState2D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectSpaceState2D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides direct access to a physics space in the [PhysicsServer2D].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectSpaceState2DExtension.xml b/engine/doc/classes/PhysicsDirectSpaceState2DExtension.xml
index c5985c58..a551ab15 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState2DExtension.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState2DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectSpaceState2DExtension" inherits="PhysicsDirectSpaceState2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectSpaceState2DExtension" inherits="PhysicsDirectSpaceState2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsDirectSpaceState2D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectSpaceState3D.xml b/engine/doc/classes/PhysicsDirectSpaceState3D.xml
index b13abb04..76433a7d 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState3D.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectSpaceState3D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectSpaceState3D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides direct access to a physics space in the [PhysicsServer3D].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsDirectSpaceState3DExtension.xml b/engine/doc/classes/PhysicsDirectSpaceState3DExtension.xml
index 07cf424e..f97f60a8 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState3DExtension.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState3DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsDirectSpaceState3DExtension" inherits="PhysicsDirectSpaceState3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsDirectSpaceState3DExtension" inherits="PhysicsDirectSpaceState3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsDirectSpaceState3D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsMaterial.xml b/engine/doc/classes/PhysicsMaterial.xml
index aa98ca00..03cbfb4c 100644
--- a/engine/doc/classes/PhysicsMaterial.xml
+++ b/engine/doc/classes/PhysicsMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsMaterial" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsMaterial" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds physics-related properties of a surface, namely its roughness and bounciness.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsPointQueryParameters2D.xml b/engine/doc/classes/PhysicsPointQueryParameters2D.xml
index 88d03a42..642e8794 100644
--- a/engine/doc/classes/PhysicsPointQueryParameters2D.xml
+++ b/engine/doc/classes/PhysicsPointQueryParameters2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsPointQueryParameters2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsPointQueryParameters2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsDirectSpaceState2D.intersect_point].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsPointQueryParameters3D.xml b/engine/doc/classes/PhysicsPointQueryParameters3D.xml
index 133afe25..a53300c7 100644
--- a/engine/doc/classes/PhysicsPointQueryParameters3D.xml
+++ b/engine/doc/classes/PhysicsPointQueryParameters3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsPointQueryParameters3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsPointQueryParameters3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsDirectSpaceState3D.intersect_point].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsRayQueryParameters2D.xml b/engine/doc/classes/PhysicsRayQueryParameters2D.xml
index e7366261..a9738b46 100644
--- a/engine/doc/classes/PhysicsRayQueryParameters2D.xml
+++ b/engine/doc/classes/PhysicsRayQueryParameters2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsRayQueryParameters2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsRayQueryParameters2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsDirectSpaceState2D.intersect_ray].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsRayQueryParameters3D.xml b/engine/doc/classes/PhysicsRayQueryParameters3D.xml
index 88611445..175b594f 100644
--- a/engine/doc/classes/PhysicsRayQueryParameters3D.xml
+++ b/engine/doc/classes/PhysicsRayQueryParameters3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsRayQueryParameters3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsRayQueryParameters3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsDirectSpaceState3D.intersect_ray].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsServer2D.xml b/engine/doc/classes/PhysicsServer2D.xml
index b16b1551..75a492fb 100644
--- a/engine/doc/classes/PhysicsServer2D.xml
+++ b/engine/doc/classes/PhysicsServer2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer2D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer2D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for low-level 2D physics access.
 	</brief_description>
@@ -651,9 +651,8 @@
 			<param index="1" name="shape_idx" type="int" />
 			<param index="2" name="enable" type="bool" />
 			<param index="3" name="margin" type="float" />
-			<param index="4" name="direction" type="Vector2" default="Vector2(0, 1)" />
 			<description>
-				Sets the one-way collision properties of the body's shape with the given index. If [param enable] is [code]true[/code], the one-way collision direction given by [param direction] in the shape's local space (that is [code]body_get_shape_transform(body, shape_idx).basis_xform(direction).normalized()[/code] in the body's local space) will be used to ignore collisions with the shape in the opposite direction, and to ensure depenetration of kinematic bodies happens in this direction.
+				Sets the one-way collision properties of the body's shape with the given index. If [param enable] is [code]true[/code], the one-way collision direction given by the shape's local upward axis [code]body_get_shape_transform(body, shape_idx).y[/code] will be used to ignore collisions with the shape in the opposite direction, and to ensure depenetration of kinematic bodies happens in this direction.
 			</description>
 		</method>
 		<method name="body_set_shape_disabled">
diff --git a/engine/doc/classes/PhysicsServer2DExtension.xml b/engine/doc/classes/PhysicsServer2DExtension.xml
index a1f22ed1..f1a12d6d 100644
--- a/engine/doc/classes/PhysicsServer2DExtension.xml
+++ b/engine/doc/classes/PhysicsServer2DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer2DExtension" inherits="PhysicsServer2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer2DExtension" inherits="PhysicsServer2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsServer2D] implementations.
 	</brief_description>
@@ -668,7 +668,6 @@
 			<param index="1" name="shape_idx" type="int" />
 			<param index="2" name="enable" type="bool" />
 			<param index="3" name="margin" type="float" />
-			<param index="4" name="direction" type="Vector2" />
 			<description>
 				Overridable version of [method PhysicsServer2D.body_set_shape_as_one_way_collision].
 			</description>
diff --git a/engine/doc/classes/PhysicsServer2DManager.xml b/engine/doc/classes/PhysicsServer2DManager.xml
index af00d0d8..5b6e9812 100644
--- a/engine/doc/classes/PhysicsServer2DManager.xml
+++ b/engine/doc/classes/PhysicsServer2DManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer2DManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer2DManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for managing [PhysicsServer2D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsServer3D.xml b/engine/doc/classes/PhysicsServer3D.xml
index 54eb85f4..b603161e 100644
--- a/engine/doc/classes/PhysicsServer3D.xml
+++ b/engine/doc/classes/PhysicsServer3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer3D" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer3D" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for low-level 3D physics access.
 	</brief_description>
@@ -868,7 +868,6 @@
 			<param index="0" name="joint" type="RID" />
 			<description>
 				Gets the priority value of the Joint3D.
-				[b]Note:[/b] Only supported when using GodotPhysics3D. This method always returns [code]1[/code] when using Jolt Physics, as it does not support joint solver priority.
 			</description>
 		</method>
 		<method name="joint_get_type" qualifiers="const">
@@ -942,7 +941,6 @@
 			<param index="1" name="priority" type="int" />
 			<description>
 				Sets the priority value of the Joint3D.
-				[b]Note:[/b] Only supported when using GodotPhysics3D. This method has no effect when using Jolt Physics, as it does not support joint solver priority.
 			</description>
 		</method>
 		<method name="pin_joint_get_local_a" qualifiers="const">
@@ -1459,20 +1457,18 @@
 			Represents the size of the [enum JointType] enum.
 		</constant>
 		<constant name="PIN_JOINT_BIAS" value="0" enum="PinJointParam">
-			The strength with which the pinned objects try to stay in positional relation to each other. The higher, the stronger.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
+			The strength with which the pinned objects try to stay in positional relation to each other.
+			The higher, the stronger.
 		</constant>
 		<constant name="PIN_JOINT_DAMPING" value="1" enum="PinJointParam">
-			The strength with which the pinned objects try to stay in velocity relation to each other. The higher, the stronger.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
+			The strength with which the pinned objects try to stay in velocity relation to each other.
+			The higher, the stronger.
 		</constant>
 		<constant name="PIN_JOINT_IMPULSE_CLAMP" value="2" enum="PinJointParam">
 			If above 0, this value is the maximum value for an impulse that this Joint3D puts on its ends.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="HINGE_JOINT_BIAS" value="0" enum="HingeJointParam">
 			The speed with which the two bodies get pulled together when they move in different directions.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="HINGE_JOINT_LIMIT_UPPER" value="1" enum="HingeJointParam">
 			The maximum rotation across the Hinge.
@@ -1482,14 +1478,11 @@
 		</constant>
 		<constant name="HINGE_JOINT_LIMIT_BIAS" value="3" enum="HingeJointParam">
 			The speed with which the rotation across the axis perpendicular to the hinge gets corrected.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="HINGE_JOINT_LIMIT_SOFTNESS" value="4" enum="HingeJointParam">
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="HINGE_JOINT_LIMIT_RELAXATION" value="5" enum="HingeJointParam">
 			The lower this value, the more the rotation gets slowed down.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="HINGE_JOINT_MOTOR_TARGET_VELOCITY" value="6" enum="HingeJointParam">
 			Target speed for the motor.
@@ -1511,83 +1504,63 @@
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS" value="2" enum="SliderJointParam">
 			A factor applied to the movement across the slider axis once the limits get surpassed. The lower, the slower the movement.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION" value="3" enum="SliderJointParam">
 			The amount of restitution once the limits are surpassed. The lower, the more velocity-energy gets lost.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_LIMIT_DAMPING" value="4" enum="SliderJointParam">
 			The amount of damping once the slider limits are surpassed.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_MOTION_SOFTNESS" value="5" enum="SliderJointParam">
 			A factor applied to the movement across the slider axis as long as the slider is in the limits. The lower, the slower the movement.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_MOTION_RESTITUTION" value="6" enum="SliderJointParam">
 			The amount of restitution inside the slider limits.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_MOTION_DAMPING" value="7" enum="SliderJointParam">
 			The amount of damping inside the slider limits.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS" value="8" enum="SliderJointParam">
 			A factor applied to the movement across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION" value="9" enum="SliderJointParam">
 			The amount of restitution when movement is across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING" value="10" enum="SliderJointParam">
 			The amount of damping when movement is across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_LIMIT_UPPER" value="11" enum="SliderJointParam">
 			The upper limit of rotation in the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_LIMIT_LOWER" value="12" enum="SliderJointParam">
 			The lower limit of rotation in the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS" value="13" enum="SliderJointParam">
 			A factor applied to the all rotation once the limit is surpassed.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_LIMIT_RESTITUTION" value="14" enum="SliderJointParam">
 			The amount of restitution of the rotation when the limit is surpassed.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_LIMIT_DAMPING" value="15" enum="SliderJointParam">
 			The amount of damping of the rotation when the limit is surpassed.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_MOTION_SOFTNESS" value="16" enum="SliderJointParam">
 			A factor that gets applied to the all rotation in the limits.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_MOTION_RESTITUTION" value="17" enum="SliderJointParam">
 			The amount of restitution of the rotation in the limits.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_MOTION_DAMPING" value="18" enum="SliderJointParam">
 			The amount of damping of the rotation in the limits.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_ORTHOGONAL_SOFTNESS" value="19" enum="SliderJointParam">
 			A factor that gets applied to the all rotation across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_ORTHOGONAL_RESTITUTION" value="20" enum="SliderJointParam">
 			The amount of restitution of the rotation across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_ANGULAR_ORTHOGONAL_DAMPING" value="21" enum="SliderJointParam">
 			The amount of damping of the rotation across axes orthogonal to the slider.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SLIDER_JOINT_MAX" value="22" enum="SliderJointParam">
 			Represents the size of the [enum SliderJointParam] enum.
@@ -1595,22 +1568,22 @@
 		<constant name="CONE_TWIST_JOINT_SWING_SPAN" value="0" enum="ConeTwistJointParam">
 			Swing is rotation from side to side, around the axis perpendicular to the twist axis.
 			The swing span defines, how much rotation will not get corrected along the swing axis.
-			Could be defined as looseness in the [ConeTwistJoint3D]. If below 0.05, this behavior is locked.
+			Could be defined as looseness in the [ConeTwistJoint3D].
+			If below 0.05, this behavior is locked.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_TWIST_SPAN" value="1" enum="ConeTwistJointParam">
-			Twist is the rotation around the twist axis, this value defined how far the joint can twist. Twist is locked if below 0.05.
+			Twist is the rotation around the twist axis, this value defined how far the joint can twist.
+			Twist is locked if below 0.05.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_BIAS" value="2" enum="ConeTwistJointParam">
-			The speed with which the swing or twist will take place. The higher, the faster.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
+			The speed with which the swing or twist will take place.
+			The higher, the faster.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_SOFTNESS" value="3" enum="ConeTwistJointParam">
 			The ease with which the Joint3D twists, if it's too low, it takes more force to twist the joint.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="CONE_TWIST_JOINT_RELAXATION" value="4" enum="ConeTwistJointParam">
 			Defines, how fast the swing- and twist-speed-difference on both sides gets synced.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_LINEAR_LOWER_LIMIT" value="0" enum="G6DOFJointAxisParam">
 			The minimum difference between the pivot points' axes.
@@ -1620,15 +1593,12 @@
 		</constant>
 		<constant name="G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS" value="2" enum="G6DOFJointAxisParam">
 			A factor that gets applied to the movement across the axes. The lower, the slower the movement.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_LINEAR_RESTITUTION" value="3" enum="G6DOFJointAxisParam">
 			The amount of restitution on the axes movement. The lower, the more velocity-energy gets lost.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_LINEAR_DAMPING" value="4" enum="G6DOFJointAxisParam">
 			The amount of damping that happens at the linear motion across the axes.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_LINEAR_MOTOR_TARGET_VELOCITY" value="5" enum="G6DOFJointAxisParam">
 			The velocity that the joint's linear motor will attempt to reach.
@@ -1650,23 +1620,18 @@
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS" value="12" enum="G6DOFJointAxisParam">
 			A factor that gets multiplied onto all rotations across the axes.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_DAMPING" value="13" enum="G6DOFJointAxisParam">
 			The amount of rotational damping across the axes. The lower, the more damping occurs.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_RESTITUTION" value="14" enum="G6DOFJointAxisParam">
 			The amount of rotational restitution across the axes. The lower, the more restitution occurs.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_FORCE_LIMIT" value="15" enum="G6DOFJointAxisParam">
 			The maximum amount of force that can occur, when rotating around the axes.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_ERP" value="16" enum="G6DOFJointAxisParam">
 			When correcting the crossing of limits in rotation across the axes, this error tolerance factor defines how much the correction gets slowed down. The lower, the slower.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY" value="17" enum="G6DOFJointAxisParam">
 			Target speed for the motor at the axes.
@@ -1888,11 +1853,9 @@
 		</constant>
 		<constant name="SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD" value="4" enum="SpaceParameter">
 			Constant to set/get the threshold linear velocity of activity. A body marked as potentially inactive for both linear and angular velocity will be put to sleep after the time given.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD" value="5" enum="SpaceParameter">
 			Constant to set/get the threshold angular velocity of activity. A body marked as potentially inactive for both linear and angular velocity will be put to sleep after the time given.
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This parameter is ignored when using Jolt Physics.
 		</constant>
 		<constant name="SPACE_PARAM_BODY_TIME_TO_SLEEP" value="6" enum="SpaceParameter">
 			Constant to set/get the maximum time of activity. A body marked as potentially inactive for both linear and angular velocity will be put to sleep after this time.
diff --git a/engine/doc/classes/PhysicsServer3DExtension.xml b/engine/doc/classes/PhysicsServer3DExtension.xml
index 5a4e6ab2..3e283fb2 100644
--- a/engine/doc/classes/PhysicsServer3DExtension.xml
+++ b/engine/doc/classes/PhysicsServer3DExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer3DExtension" inherits="PhysicsServer3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer3DExtension" inherits="PhysicsServer3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides virtual methods that can be overridden to create custom [PhysicsServer3D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsServer3DManager.xml b/engine/doc/classes/PhysicsServer3DManager.xml
index aafc48ec..a187f3c3 100644
--- a/engine/doc/classes/PhysicsServer3DManager.xml
+++ b/engine/doc/classes/PhysicsServer3DManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer3DManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer3DManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for managing [PhysicsServer3D] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsServer3DRenderingServerHandler.xml b/engine/doc/classes/PhysicsServer3DRenderingServerHandler.xml
index 6c3c3bc3..e266a1c8 100644
--- a/engine/doc/classes/PhysicsServer3DRenderingServerHandler.xml
+++ b/engine/doc/classes/PhysicsServer3DRenderingServerHandler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsServer3DRenderingServerHandler" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsServer3DRenderingServerHandler" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class used to provide [method PhysicsServer3DExtension._soft_body_update_rendering_server] with a rendering handler for soft bodies.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsShapeQueryParameters2D.xml b/engine/doc/classes/PhysicsShapeQueryParameters2D.xml
index 32a67647..d4b9722d 100644
--- a/engine/doc/classes/PhysicsShapeQueryParameters2D.xml
+++ b/engine/doc/classes/PhysicsShapeQueryParameters2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsShapeQueryParameters2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsShapeQueryParameters2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [PhysicsDirectSpaceState2D]'s methods.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsShapeQueryParameters3D.xml b/engine/doc/classes/PhysicsShapeQueryParameters3D.xml
index b51842bc..06271e96 100644
--- a/engine/doc/classes/PhysicsShapeQueryParameters3D.xml
+++ b/engine/doc/classes/PhysicsShapeQueryParameters3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsShapeQueryParameters3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsShapeQueryParameters3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [PhysicsDirectSpaceState3D]'s methods.
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsTestMotionParameters2D.xml b/engine/doc/classes/PhysicsTestMotionParameters2D.xml
index b410cd66..1288bfaf 100644
--- a/engine/doc/classes/PhysicsTestMotionParameters2D.xml
+++ b/engine/doc/classes/PhysicsTestMotionParameters2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsTestMotionParameters2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsTestMotionParameters2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsServer2D.body_test_motion].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsTestMotionParameters3D.xml b/engine/doc/classes/PhysicsTestMotionParameters3D.xml
index a1e854be..9995f0cb 100644
--- a/engine/doc/classes/PhysicsTestMotionParameters3D.xml
+++ b/engine/doc/classes/PhysicsTestMotionParameters3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsTestMotionParameters3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsTestMotionParameters3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides parameters for [method PhysicsServer3D.body_test_motion].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsTestMotionResult2D.xml b/engine/doc/classes/PhysicsTestMotionResult2D.xml
index 404b727e..1b12431f 100644
--- a/engine/doc/classes/PhysicsTestMotionResult2D.xml
+++ b/engine/doc/classes/PhysicsTestMotionResult2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsTestMotionResult2D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsTestMotionResult2D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Describes the motion and collision result from [method PhysicsServer2D.body_test_motion].
 	</brief_description>
diff --git a/engine/doc/classes/PhysicsTestMotionResult3D.xml b/engine/doc/classes/PhysicsTestMotionResult3D.xml
index e1f771d0..0dac6115 100644
--- a/engine/doc/classes/PhysicsTestMotionResult3D.xml
+++ b/engine/doc/classes/PhysicsTestMotionResult3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PhysicsTestMotionResult3D" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PhysicsTestMotionResult3D" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Describes the motion and collision result from [method PhysicsServer3D.body_test_motion].
 	</brief_description>
diff --git a/engine/doc/classes/PinJoint2D.xml b/engine/doc/classes/PinJoint2D.xml
index 25981f08..a252f603 100644
--- a/engine/doc/classes/PinJoint2D.xml
+++ b/engine/doc/classes/PinJoint2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PinJoint2D" inherits="Joint2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PinJoint2D" inherits="Joint2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that attaches two 2D physics bodies at a single point, allowing them to freely rotate.
 	</brief_description>
diff --git a/engine/doc/classes/PinJoint3D.xml b/engine/doc/classes/PinJoint3D.xml
index c263f93f..9009f0b6 100644
--- a/engine/doc/classes/PinJoint3D.xml
+++ b/engine/doc/classes/PinJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PinJoint3D" inherits="Joint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PinJoint3D" inherits="Joint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that attaches two 3D physics bodies at a single point, allowing them to freely rotate.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderCubemap.xml b/engine/doc/classes/PlaceholderCubemap.xml
index 1c4160eb..9cd0c269 100644
--- a/engine/doc/classes/PlaceholderCubemap.xml
+++ b/engine/doc/classes/PlaceholderCubemap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderCubemap" inherits="PlaceholderTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderCubemap" inherits="PlaceholderTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Cubemap] without image data.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderCubemapArray.xml b/engine/doc/classes/PlaceholderCubemapArray.xml
index 071f5fad..9ffbc316 100644
--- a/engine/doc/classes/PlaceholderCubemapArray.xml
+++ b/engine/doc/classes/PlaceholderCubemapArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderCubemapArray" inherits="PlaceholderTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderCubemapArray" inherits="PlaceholderTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [CubemapArray] without image data.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderMaterial.xml b/engine/doc/classes/PlaceholderMaterial.xml
index f7c2fa26..25957f5f 100644
--- a/engine/doc/classes/PlaceholderMaterial.xml
+++ b/engine/doc/classes/PlaceholderMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a material.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderMesh.xml b/engine/doc/classes/PlaceholderMesh.xml
index cda06c49..30234dbe 100644
--- a/engine/doc/classes/PlaceholderMesh.xml
+++ b/engine/doc/classes/PlaceholderMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderMesh" inherits="Mesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderMesh" inherits="Mesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a mesh.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderTexture2D.xml b/engine/doc/classes/PlaceholderTexture2D.xml
index 5a1e8437..c48a9ee5 100644
--- a/engine/doc/classes/PlaceholderTexture2D.xml
+++ b/engine/doc/classes/PlaceholderTexture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderTexture2D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a 2-dimensional texture.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderTexture2DArray.xml b/engine/doc/classes/PlaceholderTexture2DArray.xml
index f8a50510..3dcd5786 100644
--- a/engine/doc/classes/PlaceholderTexture2DArray.xml
+++ b/engine/doc/classes/PlaceholderTexture2DArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderTexture2DArray" inherits="PlaceholderTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderTexture2DArray" inherits="PlaceholderTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a 2-dimensional texture array.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderTexture3D.xml b/engine/doc/classes/PlaceholderTexture3D.xml
index ae068670..d290799f 100644
--- a/engine/doc/classes/PlaceholderTexture3D.xml
+++ b/engine/doc/classes/PlaceholderTexture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderTexture3D" inherits="Texture3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderTexture3D" inherits="Texture3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a 3-dimensional texture.
 	</brief_description>
diff --git a/engine/doc/classes/PlaceholderTextureLayered.xml b/engine/doc/classes/PlaceholderTextureLayered.xml
index 1df0004a..a0385b27 100644
--- a/engine/doc/classes/PlaceholderTextureLayered.xml
+++ b/engine/doc/classes/PlaceholderTextureLayered.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaceholderTextureLayered" inherits="TextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaceholderTextureLayered" inherits="TextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Placeholder class for a 2-dimensional texture array.
 	</brief_description>
diff --git a/engine/doc/classes/Plane.xml b/engine/doc/classes/Plane.xml
index ba313c4c..254557b9 100644
--- a/engine/doc/classes/Plane.xml
+++ b/engine/doc/classes/Plane.xml
@@ -5,7 +5,6 @@
 	</brief_description>
 	<description>
 		Represents a normalized plane equation. [member normal] is the normal of the plane (a, b, c normalized), and [member d] is the distance from the origin to the plane (in the direction of "normal"). "Over" or "Above" the plane is considered the side of the plane towards where the normal is pointing.
-		[b]Note:[/b] In a boolean context, a plane will evaluate to [code]false[/code] if all its components equal [code]0[/code]. Otherwise, a plane will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Math documentation index">$DOCS_URL/tutorials/math/index.html</link>
diff --git a/engine/doc/classes/PlaneMesh.xml b/engine/doc/classes/PlaneMesh.xml
index 4780366b..575ae01a 100644
--- a/engine/doc/classes/PlaneMesh.xml
+++ b/engine/doc/classes/PlaneMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlaneMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PlaneMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a planar [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/PointLight2D.xml b/engine/doc/classes/PointLight2D.xml
index 45f14531..9af36671 100644
--- a/engine/doc/classes/PointLight2D.xml
+++ b/engine/doc/classes/PointLight2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PointLight2D" inherits="Light2D" api_type="core" keywords="omni, spot" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PointLight2D" inherits="Light2D" keywords="omni, spot" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Positional 2D light source.
 	</brief_description>
diff --git a/engine/doc/classes/PointMesh.xml b/engine/doc/classes/PointMesh.xml
index 280ed179..87ca4777 100644
--- a/engine/doc/classes/PointMesh.xml
+++ b/engine/doc/classes/PointMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PointMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PointMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Mesh with a single point primitive.
 	</brief_description>
diff --git a/engine/doc/classes/Polygon2D.xml b/engine/doc/classes/Polygon2D.xml
index b52ed088..4e9208d9 100644
--- a/engine/doc/classes/Polygon2D.xml
+++ b/engine/doc/classes/Polygon2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Polygon2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Polygon2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D polygon.
 	</brief_description>
diff --git a/engine/doc/classes/PolygonOccluder3D.xml b/engine/doc/classes/PolygonOccluder3D.xml
index 0e16ea63..227f986f 100644
--- a/engine/doc/classes/PolygonOccluder3D.xml
+++ b/engine/doc/classes/PolygonOccluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PolygonOccluder3D" inherits="Occluder3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PolygonOccluder3D" inherits="Occluder3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Flat 2D polygon shape for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/PolygonPathFinder.xml b/engine/doc/classes/PolygonPathFinder.xml
index 3ce0a484..1c8d158c 100644
--- a/engine/doc/classes/PolygonPathFinder.xml
+++ b/engine/doc/classes/PolygonPathFinder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PolygonPathFinder" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PolygonPathFinder" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/Popup.xml b/engine/doc/classes/Popup.xml
index 59091396..2d945440 100644
--- a/engine/doc/classes/Popup.xml
+++ b/engine/doc/classes/Popup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Popup" inherits="Window" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Popup" inherits="Window" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for contextual windows and panels with fixed position.
 	</brief_description>
diff --git a/engine/doc/classes/PopupMenu.xml b/engine/doc/classes/PopupMenu.xml
index ddcb40c9..036e45da 100644
--- a/engine/doc/classes/PopupMenu.xml
+++ b/engine/doc/classes/PopupMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PopupMenu" inherits="Popup" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PopupMenu" inherits="Popup" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modal window used to display a list of options.
 	</brief_description>
@@ -270,7 +270,7 @@
 			<return type="int" />
 			<param index="0" name="index" type="int" />
 			<description>
-				Returns the ID of the item at the given [param index].
+				Returns the ID of the item at the given [param index]. [code]id[/code] can be manually assigned, while index can not.
 			</description>
 		</method>
 		<method name="get_item_indent" qualifiers="const">
@@ -284,7 +284,7 @@
 			<return type="int" />
 			<param index="0" name="id" type="int" />
 			<description>
-				Returns the index of the item containing the specified [param id]. The index is automatically assigned to each item by the engine when added and represents the order items will be displayed.
+				Returns the index of the item containing the specified [param id]. Index is automatically assigned to each item by the engine and can not be set manually.
 			</description>
 		</method>
 		<method name="get_item_language" qualifiers="const">
@@ -408,12 +408,6 @@
 				Returns [code]true[/code] if the system native menu is supported and currently used by this [PopupMenu].
 			</description>
 		</method>
-		<method name="is_search_bar_enabled" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if search bar is currently enabled.
-			</description>
-		</method>
 		<method name="is_system_menu" qualifiers="const">
 			<return type="bool" />
 			<description>
@@ -542,15 +536,6 @@
 				Sets the horizontal offset of the item at the given [param index].
 			</description>
 		</method>
-		<method name="set_item_index">
-			<return type="void" />
-			<param index="0" name="index" type="int" />
-			<param index="1" name="target_index" type="int" />
-			<description>
-				Changes the index of the item at index [param index] to be at index [param target_index]. This can be used to move an item above other items. The moved item will keep the same ID, even if it was generated from the original index.
-				[b]Note:[/b] The indices of any items between index [param index] and index [param target_index] will be shifted by one.
-			</description>
-		</method>
 		<method name="set_item_language">
 			<return type="void" />
 			<param index="0" name="index" type="int" />
@@ -659,8 +644,6 @@
 		<member name="allow_search" type="bool" setter="set_allow_search" getter="get_allow_search" default="true">
 			If [code]true[/code], allows navigating [PopupMenu] with letter keys.
 		</member>
-		<member name="canvas_item_default_texture_filter" type="int" setter="set_default_canvas_item_texture_filter" getter="get_default_canvas_item_texture_filter" overrides="Viewport" enum="Viewport.DefaultCanvasItemTextureFilter" default="4" />
-		<member name="canvas_item_default_texture_repeat" type="int" setter="set_default_canvas_item_texture_repeat" getter="get_default_canvas_item_texture_repeat" overrides="Viewport" enum="Viewport.DefaultCanvasItemTextureRepeat" default="3" />
 		<member name="hide_on_checkable_item_selection" type="bool" setter="set_hide_on_checkable_item_selection" getter="is_hide_on_checkable_item_selection" default="true">
 			If [code]true[/code], hides the [PopupMenu] when a checkbox or radio button is selected.
 		</member>
@@ -673,42 +656,10 @@
 		<member name="item_count" type="int" setter="set_item_count" getter="get_item_count" default="0">
 			The number of items currently in the list.
 		</member>
-		<member name="item_{index}/checkable" type="int" setter="" getter="" default="0">
-			The checkable item type of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/checked" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is checked.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/icon" type="Texture2D" setter="" getter="">
-			The icon of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/id" type="int" setter="" getter="" default="0">
-			The ID of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/separator" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the item at [code]index[/code] is a separator.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
-		<member name="item_{index}/text" type="String" setter="" getter="" default="&quot;&quot;">
-			The text of the item at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. item_count - 1[/code] range.
-		</member>
 		<member name="prefer_native_menu" type="bool" setter="set_prefer_native_menu" getter="is_prefer_native_menu" default="false">
 			If [code]true[/code], [MenuBar] will use native menu when supported.
 			[b]Note:[/b] If [PopupMenu] is linked to [StatusIndicator], [MenuBar], or another [PopupMenu] item it can use native menu regardless of this property, use [method is_native_menu] to check it.
 		</member>
-		<member name="search_bar_enabled_on_item_count" type="int" setter="set_search_bar_enabled_on_item_count" getter="get_search_bar_enabled_on_item_count" default="0">
-			Enables the [PopupMenu] search bar if the item count is greater than [code]0[/code].
-			[b]Note:[/b] When enabled, [member allow_search] is ignored.
-		</member>
 		<member name="shrink_height" type="bool" setter="set_shrink_height" getter="get_shrink_height" default="true">
 			If [code]true[/code], shrinks [PopupMenu] to minimum height when it's shown.
 		</member>
@@ -795,9 +746,6 @@
 			The size of the item text outline.
 			[b]Note:[/b] If using a font with [member FontFile.multichannel_signed_distance_field] enabled, its [member FontFile.msdf_pixel_range] must be set to at least [i]twice[/i] the value of [theme_item outline_size] for outline rendering to look correct. Otherwise, the outline may appear to be cut off earlier than intended.
 		</theme_item>
-		<theme_item name="search_bar_separation" data_type="constant" type="int" default="4">
-			The vertical space between search bar and menu items.
-		</theme_item>
 		<theme_item name="separator_outline_size" data_type="constant" type="int" default="0">
 			The size of the labeled separator text outline.
 		</theme_item>
@@ -834,9 +782,6 @@
 		<theme_item name="radio_unchecked_disabled" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the unchecked radio button items when they are disabled.
 		</theme_item>
-		<theme_item name="search" data_type="icon" type="Texture2D">
-			[Texture2D] icon for the search bar's search icon.
-		</theme_item>
 		<theme_item name="submenu" data_type="icon" type="Texture2D">
 			[Texture2D] icon for the submenu arrow (for left-to-right layouts).
 		</theme_item>
diff --git a/engine/doc/classes/PopupPanel.xml b/engine/doc/classes/PopupPanel.xml
index 50b2486f..6967ed88 100644
--- a/engine/doc/classes/PopupPanel.xml
+++ b/engine/doc/classes/PopupPanel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PopupPanel" inherits="Popup" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PopupPanel" inherits="Popup" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A popup with a panel background.
 	</brief_description>
@@ -9,8 +9,6 @@
 	<tutorials>
 	</tutorials>
 	<members>
-		<member name="canvas_item_default_texture_filter" type="int" setter="set_default_canvas_item_texture_filter" getter="get_default_canvas_item_texture_filter" overrides="Viewport" enum="Viewport.DefaultCanvasItemTextureFilter" default="4" />
-		<member name="canvas_item_default_texture_repeat" type="int" setter="set_default_canvas_item_texture_repeat" getter="get_default_canvas_item_texture_repeat" overrides="Viewport" enum="Viewport.DefaultCanvasItemTextureRepeat" default="3" />
 		<member name="transparent" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
 		<member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" overrides="Viewport" default="true" />
 	</members>
diff --git a/engine/doc/classes/PortableCompressedTexture2D.xml b/engine/doc/classes/PortableCompressedTexture2D.xml
index c6212ecc..37445bf4 100644
--- a/engine/doc/classes/PortableCompressedTexture2D.xml
+++ b/engine/doc/classes/PortableCompressedTexture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PortableCompressedTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PortableCompressedTexture2D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a compressed texture for disk and/or VRAM in a way that is portable.
 	</brief_description>
@@ -31,6 +31,12 @@
 				Return the compression mode used (valid after initialized).
 			</description>
 		</method>
+		<method name="get_format" qualifiers="const">
+			<return type="int" enum="Image.Format" />
+			<description>
+				Return the image format used (valid after initialized).
+			</description>
+		</method>
 		<method name="is_keeping_all_compressed_buffers" qualifiers="static">
 			<return type="bool" />
 			<description>
diff --git a/engine/doc/classes/PrimitiveMesh.xml b/engine/doc/classes/PrimitiveMesh.xml
index 9554b5fe..fdbbd767 100644
--- a/engine/doc/classes/PrimitiveMesh.xml
+++ b/engine/doc/classes/PrimitiveMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PrimitiveMesh" inherits="Mesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PrimitiveMesh" inherits="Mesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all primitive meshes. Handles applying a [Material] to a primitive mesh.
 	</brief_description>
diff --git a/engine/doc/classes/PrismMesh.xml b/engine/doc/classes/PrismMesh.xml
index 70da4437..862994e9 100644
--- a/engine/doc/classes/PrismMesh.xml
+++ b/engine/doc/classes/PrismMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PrismMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PrismMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a prism-shaped [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/ProceduralSkyMaterial.xml b/engine/doc/classes/ProceduralSkyMaterial.xml
index 9eafb3cc..1503bb2e 100644
--- a/engine/doc/classes/ProceduralSkyMaterial.xml
+++ b/engine/doc/classes/ProceduralSkyMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProceduralSkyMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ProceduralSkyMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material that defines a simple sky for a [Sky] resource.
 	</brief_description>
diff --git a/engine/doc/classes/ProgressBar.xml b/engine/doc/classes/ProgressBar.xml
index 8f948b67..fcfd9950 100644
--- a/engine/doc/classes/ProgressBar.xml
+++ b/engine/doc/classes/ProgressBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProgressBar" inherits="Range" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ProgressBar" inherits="Range" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control used for visual representation of a percentage.
 	</brief_description>
diff --git a/engine/doc/classes/ProjectSettings.xml b/engine/doc/classes/ProjectSettings.xml
index 23b263a2..aa7dc73a 100644
--- a/engine/doc/classes/ProjectSettings.xml
+++ b/engine/doc/classes/ProjectSettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProjectSettings" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ProjectSettings" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Stores globally-accessible variables.
 	</brief_description>
@@ -272,11 +272,6 @@
 		</method>
 	</methods>
 	<members>
-		<member name="accessibility/general/accessibility_driver" type="String" setter="" getter="" default="&quot;accesskit&quot;">
-			Accessibility driver:
-			-[b]accesskit[/b] (default): AccessKit driver.
-			-[b]dummy[/b]: Dummy driver, screen reader support is disabled.
-		</member>
 		<member name="accessibility/general/accessibility_support" type="int" setter="" getter="" default="0" keywords="screen reader">
 			Accessibility support mode:
 			- [b]Auto[/b] ([code]0[/code]): Accessibility support is enabled, but updates to the accessibility information are processed only if an assistive app (such as a screen reader or a Braille display) is active (default).
@@ -294,9 +289,6 @@
 		<member name="animation/warnings/check_angle_interpolation_type_conflicting" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], [AnimationMixer] prints the warning of interpolation being forced to choose the shortest rotation path due to multiple angle interpolation types being mixed in the [AnimationMixer] cache.
 		</member>
-		<member name="animation/warnings/check_invalid_skeleton_modifier_node_paths" type="bool" setter="" getter="" default="true">
-			If [code]true[/code], [SkeletonModifier3D] prints a warning if there's no matching object for the track path in the scene when assigning.
-		</member>
 		<member name="animation/warnings/check_invalid_track_paths" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], [AnimationMixer] prints the warning of no matching object of the track path in the scene.
 		</member>
@@ -981,10 +973,6 @@
 			The default screen orientation to use on mobile devices. See [enum DisplayServer.ScreenOrientation] for possible values.
 			[b]Note:[/b] When set to a portrait orientation, this project setting does not flip the project resolution's width and height automatically. Instead, you have to set [member display/window/size/viewport_width] and [member display/window/size/viewport_height] accordingly.
 		</member>
-		<member name="display/window/hdr/request_hdr_output" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], HDR output is requested for the main window and the editor. The main window and editor will automatically switch between HDR and SDR if it is moved between screens, screen capabilities change, or system settings are modified. This will internally force [member Viewport.use_hdr_2d] to be enabled on the main [Viewport]. All other [SubViewport] of the [Window] must have their [member Viewport.use_hdr_2d] property enabled to produce HDR output.
-			[b]Note:[/b] This property is only read when the project starts. To change this property at runtime, set [member Window.hdr_output_requested].
-		</member>
 		<member name="display/window/ios/allow_high_refresh_rate" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], iOS devices that support high refresh rate/"ProMotion" will be allowed to render at up to 120 frames per second.
 		</member>
@@ -1099,10 +1087,10 @@
 		<member name="display/window/subwindows/embed_subwindows" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], subwindows are embedded in the main window (this is also called single-window mode). Single-window mode can be faster as it does not need to create a separate window for every popup and tooltip, which can be a slow operation depending on the operating system and rendering method in use.
 			If [code]false[/code], subwindows are created as separate windows (this is also called multi-window mode). This allows them to be moved outside the main window and use native operating system window decorations.
-			This is equivalent to [member EditorSettings.interface/editor/display/single_window_mode] in the editor.
+			This is equivalent to [member EditorSettings.interface/editor/single_window_mode] in the editor.
 		</member>
 		<member name="display/window/vsync/vsync_mode" type="int" setter="" getter="" default="1" keywords="adaptive, mailbox">
-			Sets the V-Sync mode for the main game window. The editor's own V-Sync mode can be set using [member EditorSettings.interface/editor/display/vsync_mode].
+			Sets the V-Sync mode for the main game window. The editor's own V-Sync mode can be set using [member EditorSettings.interface/editor/vsync_mode].
 			See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
 			Depending on the platform and rendering method, the engine will fall back to [b]Enabled[/b] if the desired mode is not supported.
 			V-Sync can be disabled on the command line using the [code]--disable-vsync[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
@@ -1234,10 +1222,10 @@
 			The minimum distance the mouse cursor must move while pressed before a drag operation begins in the default viewport. For custom viewports see [member Viewport.gui_drag_threshold].
 		</member>
 		<member name="gui/common/show_focus_state_on_pointer_event" type="int" setter="" getter="" default="1">
-			Determines whether a [Control] should visually indicate focus when that focus is gained using a mouse or touch input.
+			Determines whether a [Control] should visually indicate focus when said focus is gained using a mouse or touch input.
 			- [b]Never[/b] ([code]0[/code]) show the focused state for mouse/touch input.
-			- [b]Text Input Controls[/b] ([code]1[/code]) show the focused state even if that focus was gained via mouse/touch input (similar to browser behavior).
-			- [b]Always[/b] ([code]2[/code]) show the focused state, even if that focus was gained via mouse/touch input.
+			- [b]Control Supports Keyboard Input[/b] ([code]1[/code]) shows the focused state even when gained via mouse/touch input (similar to how browsers handle focus).
+			- [b]Always[/b] ([code]2[/code]) show the focused state, even if said focus was gained via mouse/touch input.
 		</member>
 		<member name="gui/common/snap_controls_to_pixels" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], snaps [Control] node vertices to the nearest pixel to ensure they remain crisp even when the camera moves or zooms.
@@ -1665,9 +1653,6 @@
 			If [code]false[/code], no input will be lost.
 			[b]Note:[/b] You should in nearly all cases prefer the [code]false[/code] setting. The legacy behavior is to enable supporting old projects that rely on the old logic, without changes to script.
 		</member>
-		<member name="input_devices/joypads/ignore_joypad_on_unfocused_application" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], joypad input (including motion sensors) and LED light changes will be ignored and joypad vibration will be stopped when the application is not focused.
-		</member>
 		<member name="input_devices/pen_tablet/driver" type="String" setter="" getter="">
 			Specifies the tablet driver to use. If left empty, the default driver will be used.
 			[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--tablet-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
@@ -2556,11 +2541,9 @@
 		</member>
 		<member name="physics/2d/sleep_threshold_linear" type="float" setter="" getter="" default="2.0">
 			Threshold linear velocity under which a 2D physics body will be considered inactive. See [constant PhysicsServer2D.SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD].
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This project setting is ignored when using Jolt Physics.
 		</member>
 		<member name="physics/2d/solver/contact_max_allowed_penetration" type="float" setter="" getter="" default="0.3">
 			Maximum distance a shape can penetrate another shape before it is considered a collision. See [constant PhysicsServer2D.SPACE_PARAM_CONTACT_MAX_ALLOWED_PENETRATION].
-			[b]Note:[/b] Only supported when using GodotPhysics3D. This project setting is ignored when using Jolt Physics.
 		</member>
 		<member name="physics/2d/solver/contact_max_separation" type="float" setter="" getter="" default="1.5">
 			Maximum distance a shape can be from another before they are considered separated and the contact is discarded. See [constant PhysicsServer2D.SPACE_PARAM_CONTACT_MAX_SEPARATION].
@@ -2644,36 +2627,28 @@
 		</member>
 		<member name="physics/3d/sleep_threshold_angular" type="float" setter="" getter="" default="0.13962634">
 			Threshold angular velocity under which a 3D physics body will be considered inactive. See [constant PhysicsServer3D.SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/sleep_threshold_linear" type="float" setter="" getter="" default="0.1">
 			Threshold linear velocity under which a 3D physics body will be considered inactive. See [constant PhysicsServer3D.SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/solver/contact_max_allowed_penetration" type="float" setter="" getter="" default="0.01">
 			Maximum distance a shape can penetrate another shape before it is considered a collision. See [constant PhysicsServer3D.SPACE_PARAM_CONTACT_MAX_ALLOWED_PENETRATION].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/solver/contact_max_separation" type="float" setter="" getter="" default="0.05">
 			Maximum distance a shape can be from another before they are considered separated and the contact is discarded. See [constant PhysicsServer3D.SPACE_PARAM_CONTACT_MAX_SEPARATION].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/solver/contact_recycle_radius" type="float" setter="" getter="" default="0.01">
 			Maximum distance a pair of bodies has to move before their collision status has to be recalculated. See [constant PhysicsServer3D.SPACE_PARAM_CONTACT_RECYCLE_RADIUS].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/solver/default_contact_bias" type="float" setter="" getter="" default="0.8">
 			Default solver bias for all physics contacts. Defines how much bodies react to enforce contact separation. See [constant PhysicsServer3D.SPACE_PARAM_CONTACT_DEFAULT_BIAS].
 			Individual shapes can have a specific bias value (see [member Shape3D.custom_solver_bias]).
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/solver/solver_iterations" type="int" setter="" getter="" default="16">
 			Number of solver iterations for all contacts and constraints. The greater the number of iterations, the more accurate the collisions will be. However, a greater number of iterations requires more CPU power, which can decrease performance. See [constant PhysicsServer3D.SPACE_PARAM_SOLVER_ITERATIONS].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/3d/time_before_sleep" type="float" setter="" getter="" default="0.5">
 			Time (in seconds) of inactivity before which a 3D physics body will put to sleep. See [constant PhysicsServer3D.SPACE_PARAM_BODY_TIME_TO_SLEEP].
-			[b]Note:[/b] This project setting is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="physics/common/enable_object_picking" type="bool" setter="" getter="" default="true">
 			Enables [member Viewport.physics_object_picking] on the root viewport.
@@ -3132,7 +3107,6 @@
 		</member>
 		<member name="rendering/lightmapping/probe_capture/update_speed" type="float" setter="" getter="" default="15">
 			The framerate-independent update speed when representing dynamic object lighting from [LightmapProbe]s. Higher values make dynamic object lighting update faster. Higher values can prevent fast-moving objects from having "outdated" indirect lighting displayed on them, at the cost of possible flickering when an object moves from a bright area to a shaded area.
-			[b]Note:[/b] This property is only read when the project starts. To adjust the BVH build quality at runtime, use [method RenderingServer.lightmap_set_probe_capture_update_speed].
 		</member>
 		<member name="rendering/lights_and_shadows/directional_shadow/16_bits" type="bool" setter="" getter="" default="true">
 			Use 16 bits for the directional shadow depth map. Enabling this results in shadows having less precision and may result in shadow acne, but can lead to performance improvements on some devices.
@@ -3219,7 +3193,6 @@
 		</member>
 		<member name="rendering/mesh_lod/lod_change/threshold_pixels" type="float" setter="" getter="" default="1.0">
 			The automatic LOD bias to use for meshes rendered within the [ReflectionProbe]. Higher values will use less detailed versions of meshes that have LOD variations generated. If set to [code]0.0[/code], automatic LOD is disabled. Increase [member rendering/mesh_lod/lod_change/threshold_pixels] to improve performance at the cost of geometry detail.
-			[b]Note:[/b] Depending on the mesh's attributes (vertex colors, blend shapes, ...), a mesh may have fewer levels of LOD generated to avoid visible distortion of the mesh once it is affected by vertex colors or blend shapes. Meshes with a very low vertex count will also not have any LODs generated, which means this setting will not affect them at all. In general, this setting makes the largest impact on static meshes with a high vertex count.
 			[b]Note:[/b] [member rendering/mesh_lod/lod_change/threshold_pixels] does not affect [GeometryInstance3D] visibility ranges (also known as "manual" LOD or hierarchical LOD).
 			[b]Note:[/b] This property is only read when the project starts. To adjust the automatic LOD threshold at runtime, set [member Viewport.mesh_lod_threshold] on the root [Viewport].
 		</member>
@@ -3413,7 +3386,6 @@
 		</member>
 		<member name="rendering/scaling_3d/scale" type="float" setter="" getter="" default="1.0">
 			Scales the 3D render buffer based on the viewport size uses an image filter specified in [member rendering/scaling_3d/mode] to scale the output image to the full viewport size. Values lower than [code]1.0[/code] can be used to speed up 3D rendering at the cost of quality (undersampling). Values greater than [code]1.0[/code] are only valid for bilinear mode and can be used to improve 3D rendering quality at a high performance cost (supersampling). See also [member rendering/anti_aliasing/quality/msaa_3d] for multi-sample antialiasing, which is significantly cheaper but only smooths the edges of polygons.
-			[b]Note:[/b] When using the [b]Nearest[/b] scaling mode, to avoid uneven pixel scaling, it's highly recommended to use a value equal to an integer divisor with a dividend of [code]1[/code]. For example, it's best to use a scale of [code]0.5[/code] (1/2), [code]0.3333[/code] (1/3), [code]0.25[/code] (1/4), [code]0.2[/code] (1/5), and so on.
 		</member>
 		<member name="rendering/shader_compiler/shader_cache/compress" type="bool" setter="" getter="" default="true">
 		</member>
@@ -3619,26 +3591,16 @@
 			If [code]true[/code], support for the spatial entity extension is requested. If supported, you will be able to access spatial information about the real environment around you. What information is available is dependent on additional extensions.
 			[b]Note:[/b] This requires that the OpenXR spatial entities extension is supported by the XR runtime. If not supported this setting will be ignored.
 		</member>
-		<member name="xr/openxr/extensions/user_presence" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the user presence extension is enabled if available.
-		</member>
 		<member name="xr/openxr/form_factor" type="int" setter="" getter="" default="&quot;0&quot;">
 			Specify whether OpenXR should be configured for an HMD or a hand held device.
 		</member>
 		<member name="xr/openxr/foveation_dynamic" type="bool" setter="" getter="" default="false">
 			If [code]true[/code] and foveation is supported, will automatically adjust foveation level based on framerate up to the level set on [member xr/openxr/foveation_level].
 		</member>
-		<member name="xr/openxr/foveation_eye_tracked" type="bool" setter="" getter="" default="true">
-			If [code]true[/code] and foveation level is set to anything other than "Disabled", eye-tracked foveation will be used, so long as it's supported by the headset.
-		</member>
 		<member name="xr/openxr/foveation_level" type="int" setter="" getter="" default="&quot;0&quot;">
 			Applied foveation level if supported.
 			[b]Note:[/b] On platforms other than Android, if [member rendering/anti_aliasing/quality/msaa_3d] is enabled, this feature will be disabled.
 		</member>
-		<member name="xr/openxr/foveation_with_subsampled_images" type="bool" setter="" getter="" default="true">
-			If [code]true[/code] and foveation is also enabled, subsampled images will be used on Vulkan. This can improve the performance gain from foveated rendering, especially when using high foveation levels.
-			[b]Note:[/b]: Using subsampled images is incompatible with many screen-space rendering features or post-processing effects like FXAA or glow. If any such effects are enabled, subsampled images will automatically be disabled and a warning shown in the log.
-		</member>
 		<member name="xr/openxr/reference_space" type="int" setter="" getter="" default="&quot;1&quot;">
 			Specify the default reference space.
 		</member>
diff --git a/engine/doc/classes/Projection.xml b/engine/doc/classes/Projection.xml
index 2dfeedf7..fd9dd744 100644
--- a/engine/doc/classes/Projection.xml
+++ b/engine/doc/classes/Projection.xml
@@ -7,7 +7,6 @@
 		A 4×4 matrix used for 3D projective transformations. It can represent transformations such as translation, rotation, scaling, shearing, and perspective division. It consists of four [Vector4] columns.
 		For purely linear transformations (translation, rotation, and scale), it is recommended to use [Transform3D], as it is more performant and requires less memory.
 		Used internally as [Camera3D]'s projection matrix.
-		[b]Note:[/b] In a boolean context, a projection will evaluate to [code]false[/code] if it's equal to [constant IDENTITY]. Otherwise, a projection will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/PropertyTweener.xml b/engine/doc/classes/PropertyTweener.xml
index e6d24524..825a2c70 100644
--- a/engine/doc/classes/PropertyTweener.xml
+++ b/engine/doc/classes/PropertyTweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PropertyTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="PropertyTweener" inherits="Tweener" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Interpolates an [Object]'s property over time.
 	</brief_description>
diff --git a/engine/doc/classes/QuadMesh.xml b/engine/doc/classes/QuadMesh.xml
index a23cfd0d..d840616f 100644
--- a/engine/doc/classes/QuadMesh.xml
+++ b/engine/doc/classes/QuadMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="QuadMesh" inherits="PlaneMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="QuadMesh" inherits="PlaneMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a square mesh facing the camera.
 	</brief_description>
diff --git a/engine/doc/classes/QuadOccluder3D.xml b/engine/doc/classes/QuadOccluder3D.xml
index 947a8293..fd28cbba 100644
--- a/engine/doc/classes/QuadOccluder3D.xml
+++ b/engine/doc/classes/QuadOccluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="QuadOccluder3D" inherits="Occluder3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="QuadOccluder3D" inherits="Occluder3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Flat plane shape for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/Quaternion.xml b/engine/doc/classes/Quaternion.xml
index eebf0b57..88262fd4 100644
--- a/engine/doc/classes/Quaternion.xml
+++ b/engine/doc/classes/Quaternion.xml
@@ -9,7 +9,6 @@
 		For a great introduction to quaternions, see [url=https://www.youtube.com/watch?v=d4EgbgTm0Bg]this video by 3Blue1Brown[/url]. You do not need to know the math behind quaternions, as Godot provides several helper methods that handle it for you. These include [method slerp] and [method spherical_cubic_interpolate], as well as the [code]*[/code] operator.
 		[b]Note:[/b] Quaternions must be normalized before being used for rotation (see [method normalized]).
 		[b]Note:[/b] Similarly to [Vector2] and [Vector3], the components of a quaternion use 32-bit precision by default, unlike [float] which is always 64-bit. If double precision is needed, compile the engine with the option [code]precision=double[/code].
-		[b]Note:[/b] In a boolean context, a quaternion will evaluate to [code]false[/code] if it's equal to [constant IDENTITY]. Otherwise, a quaternion will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="3Blue1Brown&apos;s video on Quaternions">https://www.youtube.com/watch?v=d4EgbgTm0Bg</link>
diff --git a/engine/doc/classes/RDAccelerationStructureGeometry.xml b/engine/doc/classes/RDAccelerationStructureGeometry.xml
deleted file mode 100644
index 2e3adcb7..00000000
--- a/engine/doc/classes/RDAccelerationStructureGeometry.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDAccelerationStructureGeometry" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		Acceleration structure geometry (used by [RenderingDevice]).
-	</brief_description>
-	<description>
-		[RDAccelerationStructureGeometry] describes a set of triangles used as raytracing geometry in the [method RenderingDevice.blas_create] method.
-		The geometry is always in triangle list form, either indexed or non-indexed. Triangle strips are not supported.
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="flags" type="int" setter="set_flags" getter="get_flags" enum="RenderingDevice.AccelerationStructureGeometryFlagBits" is_bitfield="true" default="0">
-			Flags for the geometry.
-		</member>
-		<member name="index_buffer" type="RID" setter="set_index_buffer" getter="get_index_buffer" default="RID()">
-			Buffer containing vertex indices. If [code]null[/code], triangles are non-indexed.
-		</member>
-		<member name="index_count" type="int" setter="set_index_count" getter="get_index_count" default="0">
-			Number of indices used by this geometry in [member index_buffer].
-		</member>
-		<member name="index_offset" type="int" setter="set_index_offset" getter="get_index_offset" default="0">
-			Byte offset of the first index in [member index_buffer].
-		</member>
-		<member name="vertex_buffer" type="RID" setter="set_vertex_buffer" getter="get_vertex_buffer" default="RID()">
-			Buffer containing vertices.
-		</member>
-		<member name="vertex_count" type="int" setter="set_vertex_count" getter="get_vertex_count" default="0">
-			Number of vertices used by this geometry in [member vertex_buffer].
-		</member>
-		<member name="vertex_format" type="int" setter="set_vertex_format" getter="get_vertex_format" enum="RenderingDevice.DataFormat" default="232">
-			Format of the vertices in [member vertex_buffer].
-		</member>
-		<member name="vertex_offset" type="int" setter="set_vertex_offset" getter="get_vertex_offset" default="0">
-			Byte offset of the first vertex in [member vertex_buffer].
-		</member>
-		<member name="vertex_stride" type="int" setter="set_vertex_stride" getter="get_vertex_stride" default="0">
-			Number of bytes between each vertex in [member vertex_buffer].
-		</member>
-	</members>
-</class>
diff --git a/engine/doc/classes/RDAttachmentFormat.xml b/engine/doc/classes/RDAttachmentFormat.xml
index 5d6e0f07..876162b8 100644
--- a/engine/doc/classes/RDAttachmentFormat.xml
+++ b/engine/doc/classes/RDAttachmentFormat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDAttachmentFormat" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDAttachmentFormat" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Attachment format (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDFramebufferPass.xml b/engine/doc/classes/RDFramebufferPass.xml
index 4a953f90..5ebe656a 100644
--- a/engine/doc/classes/RDFramebufferPass.xml
+++ b/engine/doc/classes/RDFramebufferPass.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDFramebufferPass" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDFramebufferPass" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Framebuffer pass attachment description (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineColorBlendState.xml b/engine/doc/classes/RDPipelineColorBlendState.xml
index d02fb99d..550d1ab9 100644
--- a/engine/doc/classes/RDPipelineColorBlendState.xml
+++ b/engine/doc/classes/RDPipelineColorBlendState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineColorBlendState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineColorBlendState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline color blend state (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineColorBlendStateAttachment.xml b/engine/doc/classes/RDPipelineColorBlendStateAttachment.xml
index c526f470..616e6343 100644
--- a/engine/doc/classes/RDPipelineColorBlendStateAttachment.xml
+++ b/engine/doc/classes/RDPipelineColorBlendStateAttachment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineColorBlendStateAttachment" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineColorBlendStateAttachment" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline color blend state attachment (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineDepthStencilState.xml b/engine/doc/classes/RDPipelineDepthStencilState.xml
index 162d6b08..425890bb 100644
--- a/engine/doc/classes/RDPipelineDepthStencilState.xml
+++ b/engine/doc/classes/RDPipelineDepthStencilState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineDepthStencilState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineDepthStencilState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline depth/stencil state (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineMultisampleState.xml b/engine/doc/classes/RDPipelineMultisampleState.xml
index 2286e5f2..94b8e3d1 100644
--- a/engine/doc/classes/RDPipelineMultisampleState.xml
+++ b/engine/doc/classes/RDPipelineMultisampleState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineMultisampleState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineMultisampleState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline multisample state (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineRasterizationState.xml b/engine/doc/classes/RDPipelineRasterizationState.xml
index ecca296c..034abc68 100644
--- a/engine/doc/classes/RDPipelineRasterizationState.xml
+++ b/engine/doc/classes/RDPipelineRasterizationState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineRasterizationState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineRasterizationState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline rasterization state (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDPipelineSpecializationConstant.xml b/engine/doc/classes/RDPipelineSpecializationConstant.xml
index c3e6f0d6..3a45465c 100644
--- a/engine/doc/classes/RDPipelineSpecializationConstant.xml
+++ b/engine/doc/classes/RDPipelineSpecializationConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDPipelineSpecializationConstant" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDPipelineSpecializationConstant" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Pipeline specialization constant (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDSamplerState.xml b/engine/doc/classes/RDSamplerState.xml
index 16589d29..f1ba6302 100644
--- a/engine/doc/classes/RDSamplerState.xml
+++ b/engine/doc/classes/RDSamplerState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDSamplerState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDSamplerState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Sampler state (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDShaderFile.xml b/engine/doc/classes/RDShaderFile.xml
index 54746f88..62e2b02e 100644
--- a/engine/doc/classes/RDShaderFile.xml
+++ b/engine/doc/classes/RDShaderFile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDShaderFile" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDShaderFile" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Compiled shader file in SPIR-V form (used by [RenderingDevice]). Not to be confused with Godot's own [Shader].
 	</brief_description>
diff --git a/engine/doc/classes/RDShaderSPIRV.xml b/engine/doc/classes/RDShaderSPIRV.xml
index 7430e9ea..f3de9407 100644
--- a/engine/doc/classes/RDShaderSPIRV.xml
+++ b/engine/doc/classes/RDShaderSPIRV.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDShaderSPIRV" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDShaderSPIRV" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		SPIR-V intermediate representation as part of an [RDShaderFile] (used by [RenderingDevice]).
 	</brief_description>
@@ -42,27 +42,12 @@
 		</method>
 	</methods>
 	<members>
-		<member name="bytecode_any_hit" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
-			The SPIR-V bytecode for the any hit shader stage.
-		</member>
-		<member name="bytecode_closest_hit" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
-			The SPIR-V bytecode for the closest hit shader stage.
-		</member>
 		<member name="bytecode_compute" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
 			The SPIR-V bytecode for the compute shader stage.
 		</member>
 		<member name="bytecode_fragment" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
 			The SPIR-V bytecode for the fragment shader stage.
 		</member>
-		<member name="bytecode_intersection" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
-			The SPIR-V bytecode for the intersection shader stage.
-		</member>
-		<member name="bytecode_miss" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
-			The SPIR-V bytecode for the miss shader stage.
-		</member>
-		<member name="bytecode_raygen" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
-			The SPIR-V bytecode for the ray generation shader stage.
-		</member>
 		<member name="bytecode_tesselation_control" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
 			The SPIR-V bytecode for the tessellation control shader stage.
 		</member>
@@ -72,27 +57,12 @@
 		<member name="bytecode_vertex" type="PackedByteArray" setter="set_stage_bytecode" getter="get_stage_bytecode" default="PackedByteArray()">
 			The SPIR-V bytecode for the vertex shader stage.
 		</member>
-		<member name="compile_error_any_hit" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
-			The compilation error message for the any hit shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
-		</member>
-		<member name="compile_error_closest_hit" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
-			The compilation error message for the closest hit shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
-		</member>
 		<member name="compile_error_compute" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
 			The compilation error message for the compute shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
 		</member>
 		<member name="compile_error_fragment" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
 			The compilation error message for the fragment shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
 		</member>
-		<member name="compile_error_intersection" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
-			The compilation error message for the intersection shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
-		</member>
-		<member name="compile_error_miss" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
-			The compilation error message for the miss shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
-		</member>
-		<member name="compile_error_raygen" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
-			The compilation error message for the ray generation shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
-		</member>
 		<member name="compile_error_tesselation_control" type="String" setter="set_stage_compile_error" getter="get_stage_compile_error" default="&quot;&quot;">
 			The compilation error message for the tessellation control shader stage (set by the SPIR-V compiler and Godot). If empty, shader compilation was successful.
 		</member>
diff --git a/engine/doc/classes/RDShaderSource.xml b/engine/doc/classes/RDShaderSource.xml
index 1172d8de..a7b897d5 100644
--- a/engine/doc/classes/RDShaderSource.xml
+++ b/engine/doc/classes/RDShaderSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDShaderSource" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDShaderSource" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Shader source code (used by [RenderingDevice]).
 	</brief_description>
@@ -31,27 +31,12 @@
 		<member name="language" type="int" setter="set_language" getter="get_language" enum="RenderingDevice.ShaderLanguage" default="0">
 			The language the shader is written in.
 		</member>
-		<member name="source_any_hit" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
-			Source code for the shader's any hit stage.
-		</member>
-		<member name="source_closest_hit" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
-			Source code for the shader's closest hit stage.
-		</member>
 		<member name="source_compute" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
 			Source code for the shader's compute stage.
 		</member>
 		<member name="source_fragment" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
 			Source code for the shader's fragment stage.
 		</member>
-		<member name="source_intersection" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
-			Source code for the shader's intersection stage.
-		</member>
-		<member name="source_miss" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
-			Source code for the shader's miss stage.
-		</member>
-		<member name="source_raygen" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
-			Source code for the shader's ray generation stage.
-		</member>
 		<member name="source_tesselation_control" type="String" setter="set_stage_source" getter="get_stage_source" default="&quot;&quot;">
 			Source code for the shader's tessellation control stage.
 		</member>
diff --git a/engine/doc/classes/RDTextureFormat.xml b/engine/doc/classes/RDTextureFormat.xml
index cf0c03d7..617ed954 100644
--- a/engine/doc/classes/RDTextureFormat.xml
+++ b/engine/doc/classes/RDTextureFormat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDTextureFormat" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDTextureFormat" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture format (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDTextureView.xml b/engine/doc/classes/RDTextureView.xml
index e763a337..2e03ee44 100644
--- a/engine/doc/classes/RDTextureView.xml
+++ b/engine/doc/classes/RDTextureView.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDTextureView" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDTextureView" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture view (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDUniform.xml b/engine/doc/classes/RDUniform.xml
index d1591c22..77aaf0aa 100644
--- a/engine/doc/classes/RDUniform.xml
+++ b/engine/doc/classes/RDUniform.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDUniform" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDUniform" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Shader uniform (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RDVertexAttribute.xml b/engine/doc/classes/RDVertexAttribute.xml
index 7bc98ca0..ef5e8f8c 100644
--- a/engine/doc/classes/RDVertexAttribute.xml
+++ b/engine/doc/classes/RDVertexAttribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RDVertexAttribute" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RDVertexAttribute" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Vertex attribute (used by [RenderingDevice]).
 	</brief_description>
diff --git a/engine/doc/classes/RID.xml b/engine/doc/classes/RID.xml
index a6b11bc6..a5c3ddb4 100644
--- a/engine/doc/classes/RID.xml
+++ b/engine/doc/classes/RID.xml
@@ -7,7 +7,6 @@
 		The RID [Variant] type is used to access a low-level resource by its unique ID. RIDs are opaque, which means they do not grant access to the resource by themselves. They are used by the low-level server classes, such as [DisplayServer], [RenderingServer], [TextServer], etc.
 		A low-level resource may correspond to a high-level [Resource], such as [Texture] or [Mesh].
 		[b]Note:[/b] RIDs are only useful during the current session. It won't correspond to a similar resource if sent over a network, or loaded from a file at a later time.
-		[b]Note:[/b] In a boolean context, an RID will evaluate to [code]false[/code] if it has the invalid ID [code]0[/code]. Otherwise, an RID will always evaluate to [code]true[/code]. This is equivalent to calling [method is_valid].
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/RandomNumberGenerator.xml b/engine/doc/classes/RandomNumberGenerator.xml
index 2d873a77..88b46398 100644
--- a/engine/doc/classes/RandomNumberGenerator.xml
+++ b/engine/doc/classes/RandomNumberGenerator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RandomNumberGenerator" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RandomNumberGenerator" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides methods for generating pseudo-random numbers.
 	</brief_description>
diff --git a/engine/doc/classes/Range.xml b/engine/doc/classes/Range.xml
index 81daabb1..4ee7d19c 100644
--- a/engine/doc/classes/Range.xml
+++ b/engine/doc/classes/Range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Range" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Range" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for controls that represent a number within a range.
 	</brief_description>
diff --git a/engine/doc/classes/RayCast2D.xml b/engine/doc/classes/RayCast2D.xml
index 0886d52f..bbb96045 100644
--- a/engine/doc/classes/RayCast2D.xml
+++ b/engine/doc/classes/RayCast2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RayCast2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RayCast2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A ray in 2D space, used to find the first collision object it intersects.
 	</brief_description>
diff --git a/engine/doc/classes/RayCast3D.xml b/engine/doc/classes/RayCast3D.xml
index cc7c1140..1040975c 100644
--- a/engine/doc/classes/RayCast3D.xml
+++ b/engine/doc/classes/RayCast3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RayCast3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RayCast3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A ray in 3D space, used to find the first collision object it intersects.
 	</brief_description>
diff --git a/engine/doc/classes/RectangleShape2D.xml b/engine/doc/classes/RectangleShape2D.xml
index 7379591e..a62b997a 100644
--- a/engine/doc/classes/RectangleShape2D.xml
+++ b/engine/doc/classes/RectangleShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RectangleShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RectangleShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D rectangle shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/RefCounted.xml b/engine/doc/classes/RefCounted.xml
index 654bafe3..6811170a 100644
--- a/engine/doc/classes/RefCounted.xml
+++ b/engine/doc/classes/RefCounted.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RefCounted" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RefCounted" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for reference-counted objects.
 	</brief_description>
diff --git a/engine/doc/classes/ReferenceRect.xml b/engine/doc/classes/ReferenceRect.xml
index 940a7ec0..257bdcad 100644
--- a/engine/doc/classes/ReferenceRect.xml
+++ b/engine/doc/classes/ReferenceRect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ReferenceRect" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ReferenceRect" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A rectangular box for designing UIs.
 	</brief_description>
diff --git a/engine/doc/classes/ReflectionProbe.xml b/engine/doc/classes/ReflectionProbe.xml
index 123fc3e3..1bd7dae6 100644
--- a/engine/doc/classes/ReflectionProbe.xml
+++ b/engine/doc/classes/ReflectionProbe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ReflectionProbe" inherits="VisualInstance3D" api_type="core" keywords="environment, envmap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ReflectionProbe" inherits="VisualInstance3D" keywords="environment, envmap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Captures its surroundings to create fast, accurate reflections from a given point.
 	</brief_description>
diff --git a/engine/doc/classes/RemoteTransform2D.xml b/engine/doc/classes/RemoteTransform2D.xml
index c736da9c..d1f0e7cd 100644
--- a/engine/doc/classes/RemoteTransform2D.xml
+++ b/engine/doc/classes/RemoteTransform2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RemoteTransform2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RemoteTransform2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		RemoteTransform2D pushes its own [Transform2D] to another [Node2D] derived node in the scene.
 	</brief_description>
diff --git a/engine/doc/classes/RemoteTransform3D.xml b/engine/doc/classes/RemoteTransform3D.xml
index b12ea8e0..a89e666d 100644
--- a/engine/doc/classes/RemoteTransform3D.xml
+++ b/engine/doc/classes/RemoteTransform3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RemoteTransform3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RemoteTransform3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		RemoteTransform3D pushes its own [Transform3D] to another [Node3D] derived Node in the scene.
 	</brief_description>
diff --git a/engine/doc/classes/RenderData.xml b/engine/doc/classes/RenderData.xml
index bb66cab9..a0cc56a9 100644
--- a/engine/doc/classes/RenderData.xml
+++ b/engine/doc/classes/RenderData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderData" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderData" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract render data object, holds frame data related to rendering a single frame of a viewport.
 	</brief_description>
diff --git a/engine/doc/classes/RenderDataExtension.xml b/engine/doc/classes/RenderDataExtension.xml
index b34aa2f1..5c2b75ed 100644
--- a/engine/doc/classes/RenderDataExtension.xml
+++ b/engine/doc/classes/RenderDataExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderDataExtension" inherits="RenderData" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderDataExtension" inherits="RenderData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		This class allows for a RenderData implementation to be made in GDExtension.
 	</brief_description>
diff --git a/engine/doc/classes/RenderDataRD.xml b/engine/doc/classes/RenderDataRD.xml
index 8395440f..11d195da 100644
--- a/engine/doc/classes/RenderDataRD.xml
+++ b/engine/doc/classes/RenderDataRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderDataRD" inherits="RenderData" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderDataRD" inherits="RenderData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Render data implementation for the RenderingDevice based renderers.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneBuffers.xml b/engine/doc/classes/RenderSceneBuffers.xml
index d3a67e34..8dc09a76 100644
--- a/engine/doc/classes/RenderSceneBuffers.xml
+++ b/engine/doc/classes/RenderSceneBuffers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneBuffers" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneBuffers" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract scene buffers object, created for each viewport for which 3D rendering is done.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneBuffersConfiguration.xml b/engine/doc/classes/RenderSceneBuffersConfiguration.xml
index 6ca8f8e1..b5c37f32 100644
--- a/engine/doc/classes/RenderSceneBuffersConfiguration.xml
+++ b/engine/doc/classes/RenderSceneBuffersConfiguration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneBuffersConfiguration" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneBuffersConfiguration" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Configuration object used to setup a [RenderSceneBuffers] object.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneBuffersExtension.xml b/engine/doc/classes/RenderSceneBuffersExtension.xml
index 5fb3711e..fa3efbca 100644
--- a/engine/doc/classes/RenderSceneBuffersExtension.xml
+++ b/engine/doc/classes/RenderSceneBuffersExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneBuffersExtension" inherits="RenderSceneBuffers" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneBuffersExtension" inherits="RenderSceneBuffers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		This class allows for a RenderSceneBuffer implementation to be made in GDExtension.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneBuffersRD.xml b/engine/doc/classes/RenderSceneBuffersRD.xml
index 1d6ebc88..2cf51910 100644
--- a/engine/doc/classes/RenderSceneBuffersRD.xml
+++ b/engine/doc/classes/RenderSceneBuffersRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneBuffersRD" inherits="RenderSceneBuffers" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneBuffersRD" inherits="RenderSceneBuffers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Render scene buffer implementation for the RenderingDevice based renderers.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneData.xml b/engine/doc/classes/RenderSceneData.xml
index b412b832..57abfeb3 100644
--- a/engine/doc/classes/RenderSceneData.xml
+++ b/engine/doc/classes/RenderSceneData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneData" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneData" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract render data object, holds scene data related to rendering a single frame of a viewport.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneDataExtension.xml b/engine/doc/classes/RenderSceneDataExtension.xml
index a5c067a2..72eb7fc5 100644
--- a/engine/doc/classes/RenderSceneDataExtension.xml
+++ b/engine/doc/classes/RenderSceneDataExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneDataExtension" inherits="RenderSceneData" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneDataExtension" inherits="RenderSceneData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		This class allows for a RenderSceneData implementation to be made in GDExtension.
 	</brief_description>
diff --git a/engine/doc/classes/RenderSceneDataRD.xml b/engine/doc/classes/RenderSceneDataRD.xml
index f56e231d..28042841 100644
--- a/engine/doc/classes/RenderSceneDataRD.xml
+++ b/engine/doc/classes/RenderSceneDataRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderSceneDataRD" inherits="RenderSceneData" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderSceneDataRD" inherits="RenderSceneData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Render scene data implementation for the RenderingDevice based renderers.
 	</brief_description>
diff --git a/engine/doc/classes/RenderingDevice.xml b/engine/doc/classes/RenderingDevice.xml
index d50a3270..66dbd087 100644
--- a/engine/doc/classes/RenderingDevice.xml
+++ b/engine/doc/classes/RenderingDevice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderingDevice" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderingDevice" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstraction for working with modern low-level graphics APIs.
 	</brief_description>
@@ -14,13 +14,6 @@
 		<link title="Using compute shaders">$DOCS_URL/tutorials/shaders/compute_shaders.html</link>
 	</tutorials>
 	<methods>
-		<method name="acceleration_structure_build">
-			<return type="int" enum="Error" />
-			<param index="0" name="acceleration_structure" type="RID" />
-			<description>
-				Builds the [param acceleration_structure].
-			</description>
-		</method>
 		<method name="barrier" deprecated="Barriers are automatically inserted by RenderingDevice.">
 			<return type="void" />
 			<param index="0" name="from" type="int" enum="RenderingDevice.BarrierMask" is_bitfield="true" default="32767" />
@@ -29,14 +22,6 @@
 				This method does nothing.
 			</description>
 		</method>
-		<method name="blas_create">
-			<return type="RID" />
-			<param index="0" name="geometries" type="RDAccelerationStructureGeometry[]" />
-			<description>
-				Creates a new Bottom Level Acceleration Structure. It can be accessed with the RID that is returned.
-				Once finished with your RID, you will want to free the RID using the RenderingDevice's [method free_rid] method.
-			</description>
-		</method>
 		<method name="buffer_clear">
 			<return type="int" enum="Error" />
 			<param index="0" name="buffer" type="RID" />
@@ -747,102 +732,6 @@
 				Limits for various graphics hardware can be found in the [url=https://vulkan.gpuinfo.org/]Vulkan Hardware Database[/url].
 			</description>
 		</method>
-		<method name="raytracing_list_begin">
-			<return type="int" />
-			<description>
-				Starts a list of raytracing commands. The returned value should be passed to other [code]raytracing_list_*[/code] functions.
-				Multiple raytracing lists cannot be created at the same time; you must finish the previous raytracing list first using [method raytracing_list_end].
-				A simple raytracing operation might look like this (code is not a complete example):
-				[codeblocks]
-				[gdscript]
-				var rd = RenderingDevice.new()
-				assert(rd.has_feature(RenderingDevice.SUPPORTS_RAYTRACING_PIPELINE))
-
-				# Create a BLAS for a mesh.
-				blas = rd.blas_create(geometries)
-				# Create TLAS with BLASs.
-				instances_buffer = rd.tlas_instances_buffer_create(1)
-				rd.tlas_instances_buffer_fill(instances_buffer, [blas], [Transform3D()])
-				tlas = rd.tlas_create(instances_buffer)
-
-				# Build acceleration structures.
-				rd.acceleration_structure_build(blas)
-				rd.acceleration_structure_build(tlas)
-
-				var raylist = rd.raytracing_list_begin()
-
-				# Bind pipeline and uniforms.
-				rd.raytracing_list_bind_raytracing_pipeline(raylist, raytracing_pipeline)
-				rd.raytracing_list_bind_uniform_set(raylist, uniform_set, 0)
-
-				# Trace rays.
-				var width = get_viewport().size.x
-				var height = get_viewport().size.y
-				rd.raytracing_list_trace_rays(raylist, width, height)
-
-				rd.raytracing_list_end()
-				[/gdscript]
-				[/codeblocks]
-			</description>
-		</method>
-		<method name="raytracing_list_bind_raytracing_pipeline">
-			<return type="void" />
-			<param index="0" name="raytracing_list" type="int" />
-			<param index="1" name="raytracing_pipeline" type="RID" />
-			<description>
-				Binds [param raytracing_pipeline] to the specified [param raytracing_list].
-			</description>
-		</method>
-		<method name="raytracing_list_bind_uniform_set">
-			<return type="void" />
-			<param index="0" name="raytracing_list" type="int" />
-			<param index="1" name="uniform_set" type="RID" />
-			<param index="2" name="set_index" type="int" />
-			<description>
-				Binds the [param uniform_set] to this [param raytracing_list].
-			</description>
-		</method>
-		<method name="raytracing_list_end">
-			<return type="void" />
-			<description>
-				Finishes a list of raytracing commands created with the [code]raytracing_*[/code] methods.
-			</description>
-		</method>
-		<method name="raytracing_list_set_push_constant">
-			<return type="void" />
-			<param index="0" name="raytracing_list" type="int" />
-			<param index="1" name="buffer" type="PackedByteArray" />
-			<param index="2" name="size_bytes" type="int" />
-			<description>
-				Sets the push constant data to [param buffer] for the specified [param raytracing_list]. The shader determines how this binary data is used. The buffer's size in bytes must also be specified in [param size_bytes] (this can be obtained by calling the [method PackedByteArray.size] method on the passed [param buffer]).
-			</description>
-		</method>
-		<method name="raytracing_list_trace_rays">
-			<return type="void" />
-			<param index="0" name="raytracing_list" type="int" />
-			<param index="1" name="width" type="int" />
-			<param index="2" name="height" type="int" />
-			<description>
-				Initializes a ray tracing dispatch for the specified [param raytracing_list] assembling a group of [param width] x [param height] rays.
-			</description>
-		</method>
-		<method name="raytracing_pipeline_create">
-			<return type="RID" />
-			<param index="0" name="shader" type="RID" />
-			<param index="1" name="specialization_constants" type="RDPipelineSpecializationConstant[]" default="[]" />
-			<description>
-				Creates a new raytracing pipeline. It can be accessed with the RID that is returned.
-				Once finished with your RID, you will want to free the RID using the RenderingDevice's [method free_rid] method.
-				[b]Note:[/b]: Recursive raytracing is not permitted.
-			</description>
-		</method>
-		<method name="raytracing_pipeline_is_valid">
-			<return type="bool" />
-			<param index="0" name="raytracing_pipeline" type="RID" />
-			<description>
-				Returns [code]true[/code] if the raytracing pipeline specified by the [param raytracing_pipeline] RID is valid, [code]false[/code] otherwise.
-			</description>
-		</method>
 		<method name="render_pipeline_create">
 			<return type="RID" />
 			<param index="0" name="shader" type="RID" />
@@ -1200,33 +1089,6 @@
 				[b]Note:[/b] The existing [param texture] requires the [constant TEXTURE_USAGE_CAN_UPDATE_BIT] to be updatable.
 			</description>
 		</method>
-		<method name="tlas_create">
-			<return type="RID" />
-			<param index="0" name="instances_buffer" type="RID" />
-			<description>
-				Creates a new Top Level Acceleration Structure. It can be accessed with the RID that is returned.
-				The instances buffer passed as input is expected to be filled before building the TLAS.
-				Once finished with your RID, you will want to free the RID using the RenderingDevice's [method free_rid] method.
-			</description>
-		</method>
-		<method name="tlas_instances_buffer_create">
-			<return type="RID" />
-			<param index="0" name="instance_count" type="int" />
-			<param index="1" name="creation_bits" type="int" enum="RenderingDevice.BufferCreationBits" is_bitfield="true" default="0" />
-			<description>
-				Creates a new instances buffer which can be used to create a TLAS. It can be accessed with the RID that is returned.
-				Once finished with your RID, you will want to free the RID using the RenderingDevice's [method free_rid] method.
-			</description>
-		</method>
-		<method name="tlas_instances_buffer_fill">
-			<return type="void" />
-			<param index="0" name="instances_buffer" type="RID" />
-			<param index="1" name="blases" type="RID[]" />
-			<param index="2" name="transforms" type="Transform3D[]" />
-			<description>
-				Fills the content of an instances buffer. The number of BLASes and transforms passed as input should be the same and should equal the instance count used at instance buffer creation time.
-			</description>
-		</method>
 		<method name="uniform_buffer_create">
 			<return type="RID" />
 			<param index="0" name="size_bytes" type="int" />
@@ -2283,23 +2145,6 @@
 		<constant name="BUFFER_CREATION_AS_STORAGE_BIT" value="2" enum="BufferCreationBits" is_bitfield="true">
 			Set this flag so that it is created as storage. This is useful if Compute Shaders need access (for reading or writing) to the buffer, e.g. skeletal animations are processed in Compute Shaders which need access to vertex buffers, to be later consumed by vertex shaders as part of the regular rasterization pipeline.
 		</constant>
-		<constant name="BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT" value="8" enum="BufferCreationBits" is_bitfield="true">
-			Allows usage of this buffer as input data for an acceleration structure build operation. You must first check that the GPU supports it:
-			[codeblocks]
-			[gdscript]
-			rd = RenderingServer.get_rendering_device()
-
-			if rd.has_feature(RenderingDevice.SUPPORTS_RAYTRACING_PIPELINE):
-			    storage_buffer = rd.storage_buffer_create(bytes.size(), bytes, RenderingDevice.BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT)
-			[/gdscript]
-			[/codeblocks]
-		</constant>
-		<constant name="ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT" value="1" enum="AccelerationStructureGeometryFlagBits" is_bitfield="true">
-			An opaque geometry does not invoke the any hit shaders.
-		</constant>
-		<constant name="ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT" value="2" enum="AccelerationStructureGeometryFlagBits" is_bitfield="true">
-			This geometry only calls the any hit shader a single time for each primitive.
-		</constant>
 		<constant name="UNIFORM_TYPE_SAMPLER" value="0" enum="UniformType">
 			Sampler uniform.
 		</constant>
@@ -2340,10 +2185,7 @@
 			[b]Note:[/b] This flag is not available to GD users due to being too dangerous (i.e. wrong usage can result in visual glitches).
 			It's exposed in case GD users receive a buffer created with such flag from Godot.
 		</constant>
-		<constant name="UNIFORM_TYPE_ACCELERATION_STRUCTURE" value="12" enum="UniformType">
-			Acceleration structure uniform.
-		</constant>
-		<constant name="UNIFORM_TYPE_MAX" value="13" enum="UniformType">
+		<constant name="UNIFORM_TYPE_MAX" value="12" enum="UniformType">
 			Represents the size of the [enum UniformType] enum.
 		</constant>
 		<constant name="RENDER_PRIMITIVE_POINTS" value="0" enum="RenderPrimitive">
@@ -2651,22 +2493,7 @@
 		<constant name="SHADER_STAGE_COMPUTE" value="4" enum="ShaderStage">
 			Compute shader stage. This can be used to run arbitrary computing tasks in a shader, performing them on the GPU instead of the CPU.
 		</constant>
-		<constant name="SHADER_STAGE_RAYGEN" value="5" enum="ShaderStage">
-			Ray generation shader stage. This can be used to generate primary rays.
-		</constant>
-		<constant name="SHADER_STAGE_ANY_HIT" value="6" enum="ShaderStage">
-			Any hit shader stage. Invoked when ray intersections are not opaque. This can be used to specify what happens when a ray hits any of the geometry in the scene.
-		</constant>
-		<constant name="SHADER_STAGE_CLOSEST_HIT" value="7" enum="ShaderStage">
-			Closest hit shader stage. This can be used to specify what happens when a ray hits the closest geometry in the scene.
-		</constant>
-		<constant name="SHADER_STAGE_MISS" value="8" enum="ShaderStage">
-			Miss shader stage. This can be used to specify what happens if a ray does not hit anything in the scene.
-		</constant>
-		<constant name="SHADER_STAGE_INTERSECTION" value="9" enum="ShaderStage">
-			Intersection shader stage. The intersection shader for triangles is built-in. This can be used to compute ray intersections with primitives that are not triangles.
-		</constant>
-		<constant name="SHADER_STAGE_MAX" value="10" enum="ShaderStage">
+		<constant name="SHADER_STAGE_MAX" value="5" enum="ShaderStage">
 			Represents the size of the [enum ShaderStage] enum.
 		</constant>
 		<constant name="SHADER_STAGE_VERTEX_BIT" value="1" enum="ShaderStage">
@@ -2684,21 +2511,6 @@
 		<constant name="SHADER_STAGE_COMPUTE_BIT" value="16" enum="ShaderStage">
 			Compute shader stage bit (see also [constant SHADER_STAGE_COMPUTE]).
 		</constant>
-		<constant name="SHADER_STAGE_RAYGEN_BIT" value="32" enum="ShaderStage">
-			Ray generation shader stage bit (see also [constant SHADER_STAGE_RAYGEN]).
-		</constant>
-		<constant name="SHADER_STAGE_ANY_HIT_BIT" value="64" enum="ShaderStage">
-			Any hit shader stage bit (see also [constant SHADER_STAGE_ANY_HIT]).
-		</constant>
-		<constant name="SHADER_STAGE_CLOSEST_HIT_BIT" value="128" enum="ShaderStage">
-			Closest hit shader stage bit (see also [constant SHADER_STAGE_CLOSEST_HIT]).
-		</constant>
-		<constant name="SHADER_STAGE_MISS_BIT" value="256" enum="ShaderStage">
-			Miss shader stage bit (see also [constant SHADER_STAGE_MISS]).
-		</constant>
-		<constant name="SHADER_STAGE_INTERSECTION_BIT" value="512" enum="ShaderStage">
-			Intersection shader stage bit (see also [constant SHADER_STAGE_INTERSECTION]).
-		</constant>
 		<constant name="SHADER_LANGUAGE_GLSL" value="0" enum="ShaderLanguage">
 			Khronos' GLSL shading language (used natively by OpenGL and Vulkan). This is the language used for core Godot shaders.
 		</constant>
@@ -2726,19 +2538,6 @@
 		<constant name="SUPPORTS_IMAGE_ATOMIC_32_BIT" value="7" enum="Features">
 			Support for 32-bit image atomic operations.
 		</constant>
-		<constant name="SUPPORTS_RAY_QUERY" value="11" enum="Features">
-			Support for ray query extension.
-
-			[b]Note:[/b] This is currently only supported when using Vulkan. This is not supported on macOS and iOS (even on hardware supporting raytracing) due to MoltenVK limitations.
-		</constant>
-		<constant name="SUPPORTS_RAYTRACING_PIPELINE" value="12" enum="Features">
-			Support for raytracing pipeline extension.
-
-			[b]Note:[/b] This is currently only supported when using Vulkan. This is not supported on macOS and iOS (even on hardware supporting raytracing) due to MoltenVK limitations.
-		</constant>
-		<constant name="SUPPORTS_HDR_OUTPUT" value="13" enum="Features">
-			Support for high dynamic range (HDR) output.
-		</constant>
 		<constant name="LIMIT_MAX_BOUND_UNIFORM_SETS" value="0" enum="Limit">
 			Maximum number of uniform sets that can be bound at a given time.
 		</constant>
diff --git a/engine/doc/classes/RenderingServer.xml b/engine/doc/classes/RenderingServer.xml
index 4513e2e1..50dbb325 100644
--- a/engine/doc/classes/RenderingServer.xml
+++ b/engine/doc/classes/RenderingServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RenderingServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RenderingServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Server for anything visible.
 	</brief_description>
@@ -739,7 +739,6 @@
 			<param index="0" name="occluder" type="RID" />
 			<param index="1" name="enable" type="bool" />
 			<description>
-				Enables or disables using the light occluder as a signed distance field for 2D particle collision.
 			</description>
 		</method>
 		<method name="canvas_light_occluder_set_enabled">
@@ -991,9 +990,6 @@
 			<return type="void" />
 			<param index="0" name="disable" type="bool" />
 			<description>
-				If [param disable] is [code]true[/code], makes 2D rendering ignore the canvas scale defined for each canvas layer. This affects [CanvasLayer]s with the [member CanvasLayer.follow_viewport_enabled] property set to [code]true[/code].
-				In the editor, this is set to [code]true[/code] by default, and set to [code]false[/code] when [b]View &gt; Preview Canvas Scale[/b] is enabled at the top of the 2D editor viewport.
-				[b]Note:[/b] Setting this to [code]true[/code] does not impact the behavior of [member CanvasLayer.scale], [member Node2D.scale], or [member Control.scale].
 			</description>
 		</method>
 		<method name="canvas_set_item_mirroring">
@@ -2002,7 +1998,7 @@
 			<param index="0" name="instance" type="RID" />
 			<param index="1" name="enabled" type="bool" />
 			<description>
-				If [code]true[/code], ignores all culling on the specified 3D geometry instance, including frustum culling, occlusion culling, and layer culling. This is not the same as [member GeometryInstance3D.ignore_occlusion_culling], which only ignores occlusion culling but leaves frustum and layer culling intact.
+				If [code]true[/code], ignores both frustum and occlusion culling on the specified 3D geometry instance. This is not the same as [member GeometryInstance3D.ignore_occlusion_culling], which only ignores occlusion culling and leaves frustum culling intact.
 			</description>
 		</method>
 		<method name="instance_set_layer_mask">
@@ -2247,28 +2243,24 @@
 			<return type="PackedInt32Array" />
 			<param index="0" name="lightmap" type="RID" />
 			<description>
-				Returns the BSP tree data used for accelerating probe lookups. The BSP data is structured as a series of six signed 32-bit values per BSP node in this order: [code]float plane_x[/code], [code]float plane_y[/code], [code]float plane_z[/code], [code]float plane_distance[/code], [code]int32_t over[/code], [code]int32_t under[/code]. An empty leaf is denoted by the value [code]-2147483648[/code] (the minimum 32-bit signed integer). See also [method lightmap_set_probe_capture_data].
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_points" qualifiers="const">
 			<return type="PackedVector3Array" />
 			<param index="0" name="lightmap" type="RID" />
 			<description>
-				Returns the [i]local space[/i] positions of each lightmap probe capture point. Keep in mind the lightmap instance may have a non-zero transform, which will affect the position of the probe capture points. See also [method lightmap_set_probe_capture_data].
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_sh" qualifiers="const">
 			<return type="PackedColorArray" />
 			<param index="0" name="lightmap" type="RID" />
 			<description>
-				Returns the L0, L1, and L2 [url=https://en.wikipedia.org/wiki/Spherical_harmonics]spherical harmonics[/url] data for each lightmap probe capture point. This is specified as 9 [Color] values per probe, which means the size of the returned data is always 9 times the number of probe points. See also [method lightmap_set_probe_capture_data].
 			</description>
 		</method>
 		<method name="lightmap_get_probe_capture_tetrahedra" qualifiers="const">
 			<return type="PackedInt32Array" />
 			<param index="0" name="lightmap" type="RID" />
 			<description>
-				Returns the tetrahedralization data used for interpolating between lightmap probe capture points. Each tetrahedron is specified as a series of 4 numbers, each being an index into the probe capture points array returned by [method lightmap_get_probe_capture_points]. See also [method lightmap_set_probe_capture_data].
 			</description>
 		</method>
 		<method name="lightmap_set_baked_exposure_normalization">
@@ -2284,7 +2276,6 @@
 			<param index="0" name="lightmap" type="RID" />
 			<param index="1" name="bounds" type="AABB" />
 			<description>
-				Sets the bounds that this lightmap instance should visually affect, both in terms of static lightmap baking and probe-based global illumination.
 			</description>
 		</method>
 		<method name="lightmap_set_probe_capture_data">
@@ -2295,14 +2286,12 @@
 			<param index="3" name="tetrahedra" type="PackedInt32Array" />
 			<param index="4" name="bsp_tree" type="PackedInt32Array" />
 			<description>
-				Sets the probe capture data for the given lightmap instance. See [method lightmap_get_probe_capture_points], [method lightmap_get_probe_capture_sh], [method lightmap_get_probe_capture_tetrahedra], and [method lightmap_get_probe_capture_bsp_tree] for the expected data formats.
 			</description>
 		</method>
 		<method name="lightmap_set_probe_capture_update_speed">
 			<return type="void" />
 			<param index="0" name="speed" type="float" />
 			<description>
-				The framerate-independent update speed when representing dynamic object lighting from [LightmapProbe]s. Higher values make dynamic object lighting update faster. Higher values can prevent fast-moving objects from having "outdated" indirect lighting displayed on them, at the cost of possible flickering when an object moves from a bright area to a shaded area. See also [member ProjectSettings.rendering/lightmapping/probe_capture/update_speed].
 			</description>
 		</method>
 		<method name="lightmap_set_probe_interior">
@@ -2310,7 +2299,6 @@
 			<param index="0" name="lightmap" type="RID" />
 			<param index="1" name="interior" type="bool" />
 			<description>
-				Sets whether the lightmap instance should be considered as interior (when [param interior] is [code]true[/code]). If the lightmap is marked as interior, environment lighting is ignored when baking lightmaps.
 			</description>
 		</method>
 		<method name="lightmap_set_textures">
@@ -2401,35 +2389,6 @@
 			<param index="0" name="mesh" type="RID" />
 			<param index="1" name="surface" type="Dictionary" />
 			<description>
-				Creates a new surface on the given [param mesh]. Equivalent to [method mesh_add_surface_from_arrays], but takes a single [Dictionary] argument instead of separate arguments. The dictionary must follow this structure:
-				[codeblock]
-				{
-					# Required:
-				    "primitive": RenderingServer.PrimitiveType,
-				    "format": RenderingServer.ArrayFormat,
-				    "vertex_data": PackedByteArray,
-				    "vertex_count": int,
-				    "aabb": AABB,
-
-					# Optional:
-					"attribute_data": PackedByteArray,
-					"skin_data": PackedByteArray,
-					"index_data": PackedByteArray,
-					"index_count": int, # Required if `index_data` is specified.
-					"uv_scale": Vector4,
-					"lods": [
-						# Both values are required for each LOD level.
-						{
-							"edge_length": float,
-							"index_data": PackedByteArray,
-						},
-					],
-					"bone_aabbs": Array[AABB],
-					"blend_shape_data": PackedByteArray,
-					"material": Material,
-				}
-				[/codeblock]
-				See also [method mesh_get_surface], which returns data in the same structure defined above.
 			</description>
 		</method>
 		<method name="mesh_add_surface_from_arrays">
@@ -2441,14 +2400,6 @@
 			<param index="4" name="lods" type="Dictionary" default="{}" />
 			<param index="5" name="compress_format" type="int" enum="RenderingServer.ArrayFormat" is_bitfield="true" default="0" />
 			<description>
-				Creates a new surface on the given [param mesh]. [method mesh_get_surface_count] will become the surface index for this new surface.
-				Surfaces are created to be rendered using a [param primitive], which may be any of the values defined in [enum Mesh.PrimitiveType].
-				The [param arrays] argument is an array of arrays. Each of the [constant Mesh.ARRAY_MAX] elements contains an array with some of the mesh data for this surface as described by the corresponding member of [enum Mesh.ArrayType] or [code]null[/code] if it is not used by the surface. For example, [code]arrays[0][/code] is the array of vertices. That first vertex sub-array is always required; the others are optional. Adding an index array puts this surface into "index mode" where the vertex and other arrays become the sources of data and the index array defines the vertex order. All sub-arrays must have the same length as the vertex array (or be an exact multiple of the vertex array's length, when multiple elements of a sub-array correspond to a single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is used.
-				The [param blend_shapes] argument is an array of vertex data for each blend shape. Each element is an array of the same structure as [param arrays], but [constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL], and [constant Mesh.ARRAY_TANGENT] are set if and only if they are set in [param arrays] and all other entries are [code]null[/code].
-				The [param lods] argument is a dictionary with [float] keys and [PackedInt32Array] values. Each entry in the dictionary represents an LOD level of the surface, where the value is the [constant Mesh.ARRAY_INDEX] array to use for the LOD level and the key is roughly proportional to the distance at which the LOD stats being used. I.e., increasing the key of an LOD also increases the distance that the objects has to be from the camera before the LOD is used.
-				The [param compress_format] argument is the bitwise OR of, as required: One value of [enum ArrayFormat] left shifted by [code]ARRAY_FORMAT_CUSTOMn_SHIFT[/code] for each custom channel in use, [constant ARRAY_FLAG_USE_DYNAMIC_UPDATE], [constant ARRAY_FLAG_USE_8_BONE_WEIGHTS], or [constant ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY].
-				See [method ArrayMesh.add_surface_from_arrays] and [method ImporterMesh.add_surface] for higher-level equivalents of this method.
-				[b]Note:[/b] When using indices, it is recommended to only use points, lines, or triangles.
 			</description>
 		</method>
 		<method name="mesh_clear">
@@ -2472,11 +2423,6 @@
 			<param index="0" name="surfaces" type="Dictionary[]" />
 			<param index="1" name="blend_shape_count" type="int" default="0" />
 			<description>
-				Creates a new mesh with predefined surfaces for it and adds the mesh to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]mesh_*[/code] RenderingServer functions. This method is more efficient for creating meshes with multiple surfaces compared to creating an empty mesh with [method mesh_create] and adding surfaces one by one with [method mesh_add_surface].
-				Each element in the [param surfaces] array must follow the same structure as described in [method mesh_add_surface]. The [param blend_shape_count] parameter must match the blend shape data defined in all surfaces.
-				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] method.
-				To place in a scene, attach this mesh to an instance using [method instance_set_base] using the returned RID.
-				[b]Note:[/b] The equivalent resource is [Mesh].
 			</description>
 		</method>
 		<method name="mesh_get_blend_shape_count" qualifiers="const">
@@ -2505,7 +2451,6 @@
 			<param index="0" name="mesh" type="RID" />
 			<param index="1" name="surface" type="int" />
 			<description>
-				Returns a mesh's surface as a dictionary following the same structure as described in [method mesh_add_surface].
 			</description>
 		</method>
 		<method name="mesh_get_surface_count" qualifiers="const">
@@ -2536,8 +2481,6 @@
 			<param index="0" name="mesh" type="RID" />
 			<param index="1" name="shadow_mesh" type="RID" />
 			<description>
-				Sets an optional second mesh which can be used for rendering shadows and the depth prepass. Can be used to increase performance by supplying a mesh with fused vertices and only vertex position data (without normals, UVs, colors, etc.).
-				[b]Note:[/b] This mesh must have exactly the same vertex positions as the source mesh (including the source mesh's LODs, if present). If vertex positions differ, then the mesh will not draw correctly.
 			</description>
 		</method>
 		<method name="mesh_surface_get_arrays" qualifiers="const">
@@ -2637,9 +2580,6 @@
 			<param index="2" name="offset" type="int" />
 			<param index="3" name="data" type="PackedByteArray" />
 			<description>
-				Updates the attribute buffer of the mesh surface with the given [param data]. The expected data per attribute is 8 or 12 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector2] or [Vector3] vertices. This value can be determined with [method mesh_surface_get_format_attribute_stride] instead.
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each attribute.
-				A [PackedVector3Array] of attribute locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 		<method name="mesh_surface_update_index_region">
@@ -2659,9 +2599,6 @@
 			<param index="2" name="offset" type="int" />
 			<param index="3" name="data" type="PackedByteArray" />
 			<description>
-				Updates the skin buffer of the mesh surface with the given [param data]. The expected data per skin is 8 or 12 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector2] or [Vector3] vertices. This value can be determined with [method mesh_surface_get_format_skin_stride] instead.
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each skin.
-				A [PackedVector3Array] of skin locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 		<method name="mesh_surface_update_vertex_region">
@@ -2671,9 +2608,6 @@
 			<param index="2" name="offset" type="int" />
 			<param index="3" name="data" type="PackedByteArray" />
 			<description>
-				Updates the vertex buffer of the mesh surface with the given [param data]. The expected data per vertex is 8 or 12 bytes (4 bytes per float, 2 floats per [Vector2], and 3 floats per [Vector3]) depending on if the mesh is using [Vector2] or [Vector3] vertices. This value can be determined with [method mesh_surface_get_format_vertex_stride] instead.
-				The starting point of the updates can be changed with [param offset]. The value of [param offset] should be a multiple of 12 bytes in most cases to align to each vertex.
-				A [PackedVector3Array] of vertex locations can be converted into a [PackedByteArray] using [method PackedVector3Array.to_byte_array] for use in [param data].
 			</description>
 		</method>
 		<method name="multimesh_allocate_data">
@@ -2685,7 +2619,6 @@
 			<param index="4" name="custom_data_format" type="bool" default="false" />
 			<param index="5" name="use_indirect" type="bool" default="false" />
 			<description>
-				Sets up the multimesh using the specified data. The number of instances is set by [param instances]. The format of the instance transforms is set by [param transform_format], which should be set according to whether the multimesh is meant to be rendered in 2D or 3D. If [param color_format] is [code]true[/code], each instance will have a color associated with it. If [param custom_data_format] is [code]true[/code], each instance will have a custom data vector associated with it. If [param use_indirect] is [code]true[/code], an indirect command buffer will be created for this multimesh, allowing the instance count to be modified directly on the GPU. See also [method multimesh_get_command_buffer_rd_rid].
 			</description>
 		</method>
 		<method name="multimesh_create">
@@ -2733,7 +2666,7 @@
 				  2 - firstIndex;
 				  3 - vertexOffset;
 				  4 - firstInstance;
-				Non-indexed:
+				Non Indexed:
 				  0 - vertexCount;
 				  1 - instanceCount;
 				  2 - firstVertex;
@@ -3103,11 +3036,9 @@
 		<method name="particles_request_process_time">
 			<return type="void" />
 			<param index="0" name="particles" type="RID" />
-			<param index="1" name="process_time" type="float" />
-			<param index="2" name="process_time_residual" type="float" default="0.0" />
+			<param index="1" name="time" type="float" />
 			<description>
-				Requests the particles to process for extra process time during a single frame.
-				[param process_time] defines the time that the particles will process while emitting is on. [param process_time_residual] defines the time that particles will process with emitting turned off for the simulation. When combined with the particles' speed scale set to [code]0.0[/code], this is useful to be able to seek a particle system timeline.
+				Requests particles to process for extra process time during a single frame.
 			</description>
 		</method>
 		<method name="particles_restart">
@@ -3138,7 +3069,6 @@
 			<param index="0" name="particles" type="RID" />
 			<param index="1" name="size" type="float" />
 			<description>
-				Sets the base size for particle collision. Equivalent to [member GPUParticles3D.collision_base_size].
 			</description>
 		</method>
 		<method name="particles_set_custom_aabb">
@@ -3235,7 +3165,6 @@
 			<param index="0" name="particles" type="RID" />
 			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets whether particles should use interpolation between fixed steps. Equivalent to [member GPUParticles3D.interpolate].
 			</description>
 		</method>
 		<method name="particles_set_lifetime">
@@ -3300,7 +3229,6 @@
 			<param index="0" name="particles" type="RID" />
 			<param index="1" name="subemitter_particles" type="RID" />
 			<description>
-				Sets the subemitter particles for the particle system. Equivalent to [member GPUParticles3D.sub_emitter].
 			</description>
 		</method>
 		<method name="particles_set_trail_bind_poses">
@@ -3308,7 +3236,6 @@
 			<param index="0" name="particles" type="RID" />
 			<param index="1" name="bind_poses" type="Transform3D[]" />
 			<description>
-				Sets the trail bind poses for the particle system. This specified as an array of [Transform3D]s representing the bind pose for each draw pass. See [member GPUParticles3D.draw_skin], [method Skin.get_bind_count], and [method Skin.get_bind_pose]. Set the value for each draw pass to [constant Transform3D.IDENTITY] to use the default behavior, which is what built-in trails use ([RibbonTrailMesh] and [TubeTrailMesh]).
 			</description>
 		</method>
 		<method name="particles_set_trails">
@@ -3325,23 +3252,6 @@
 			<param index="0" name="particles" type="RID" />
 			<param index="1" name="align" type="int" enum="RenderingServer.ParticlesTransformAlign" />
 			<description>
-				Sets the transform alignment for the particle system. Equivalent to [member GPUParticles3D.transform_align].
-			</description>
-		</method>
-		<method name="particles_set_transform_align_axis">
-			<return type="void" />
-			<param index="0" name="particles" type="RID" />
-			<param index="1" name="p_rotation_axis" type="int" enum="RenderingServer.ParticlesTransformAlignAxis" />
-			<description>
-				Sets which axis to use for transform alignment.
-			</description>
-		</method>
-		<method name="particles_set_transform_align_channel_filter">
-			<return type="void" />
-			<param index="0" name="particles" type="RID" />
-			<param index="1" name="channel_filter" type="int" enum="RenderingServer.ParticlesTransformAlignCustomSrc" />
-			<description>
-				When using Z-Billboarding, which CUSTOM channel to read from.
 			</description>
 		</method>
 		<method name="particles_set_use_local_coordinates">
@@ -3577,7 +3487,7 @@
 			<param index="0" name="generate" type="bool" />
 			<description>
 				If [param generate] is [code]true[/code], generates debug wireframes for all meshes that are loaded when using the Compatibility renderer. By default, the engine does not generate debug wireframes at runtime, since they slow down loading of assets and take up VRAM.
-				[b]Note:[/b] You must call this method before loading any meshes when using the Compatibility renderer. Otherwise, wireframes will not be used.
+				[b]Note:[/b] You must call this method before loading any meshes when using the Compatibility renderer, otherwise wireframes will not be used.
 			</description>
 		</method>
 		<method name="set_default_clear_color">
@@ -3653,7 +3563,6 @@
 			<param index="1" name="bones" type="int" />
 			<param index="2" name="is_2d_skeleton" type="bool" default="false" />
 			<description>
-				Allocates data for this skeleton using the number of bones specified in [param bones]. If [param is_2d_skeleton] is [code]true[/code], the skeleton will be treated as a 2D skeleton instead of a 3D skeleton. See also [method skeleton_get_bone_count].
 			</description>
 		</method>
 		<method name="skeleton_bone_get_transform" qualifiers="const">
@@ -3701,7 +3610,7 @@
 			<return type="int" />
 			<param index="0" name="skeleton" type="RID" />
 			<description>
-				Returns the number of bones allocated for this skeleton. See also [method skeleton_allocate_data].
+				Returns the number of bones allocated for this skeleton.
 			</description>
 		</method>
 		<method name="skeleton_set_base_transform_2d">
@@ -3709,7 +3618,6 @@
 			<param index="0" name="skeleton" type="RID" />
 			<param index="1" name="base_transform" type="Transform2D" />
 			<description>
-				Sets the base [Transform2D] to use for the specified skeleton.
 			</description>
 		</method>
 		<method name="sky_bake_panorama">
@@ -3896,45 +3804,6 @@
 				[b]Note:[/b] If using only the rendering device renderer, it's recommend to use [method RenderingDevice.texture_create_from_extension] together with [method RenderingServer.texture_rd_create], rather than this method. This way, the texture's format and usage can be controlled more effectively.
 			</description>
 		</method>
-		<method name="texture_drawable_blit_rect">
-			<return type="void" />
-			<param index="0" name="textures" type="RID[]" />
-			<param index="1" name="rect" type="Rect2i" />
-			<param index="2" name="material" type="RID" />
-			<param index="3" name="modulate" type="Color" />
-			<param index="4" name="source_textures" type="RID[]" />
-			<param index="5" name="to_mipmap" type="int" default="0" />
-			<description>
-				Draws to [param rect] on up to 4 given Drawable [param textures], using a TextureBlit Shader from [param material]. [param modulate] and up to 4 [param source_textures] are uniforms for the Shader to process with. [param to_mipmap] can specify to perform this draw to a lower mipmap level.
-				[b]Note:[/b] All [param textures] must be the same size and format.
-			</description>
-		</method>
-		<method name="texture_drawable_create">
-			<return type="RID" />
-			<param index="0" name="width" type="int" />
-			<param index="1" name="height" type="int" />
-			<param index="2" name="format" type="int" enum="RenderingServer.TextureDrawableFormat" />
-			<param index="3" name="color" type="Color" default="Color(1, 1, 1, 1)" />
-			<param index="4" name="with_mipmaps" type="bool" default="false" />
-			<description>
-				Creates a 2-dimensional texture and adds it to the RenderingServer. It can be accessed with the RID that is returned. This RID will be used in all [code]texture_drawable*[/code] RenderingServer functions.
-				Once finished with your RID, you will want to free the RID using the RenderingServer's [method free_rid] method.
-				[b]Note:[/b] The equivalent resource is [DrawableTexture2D].
-			</description>
-		</method>
-		<method name="texture_drawable_generate_mipmaps">
-			<return type="void" />
-			<param index="0" name="texture" type="RID" />
-			<description>
-				Calculates new MipMaps for the given Drawable [param texture].
-			</description>
-		</method>
-		<method name="texture_drawable_get_default_material" qualifiers="const">
-			<return type="RID" />
-			<description>
-				Returns a ShaderMaterial with the default texture_blit Shader.
-			</description>
-		</method>
 		<method name="texture_get_format" qualifiers="const">
 			<return type="int" enum="Image.Format" />
 			<param index="0" name="texture" type="RID" />
@@ -3956,7 +3825,6 @@
 			<return type="String" />
 			<param index="0" name="texture" type="RID" />
 			<description>
-				Returns the resource path (starting with [code]res://[/code] or [code]uid://[/code]) for the specified texture RID. Returns an empty [String] if the resource is built-in. See also [method texture_set_path].
 			</description>
 		</method>
 		<method name="texture_get_rd_texture" qualifiers="const">
@@ -4006,7 +3874,6 @@
 			<param index="0" name="texture" type="RID" />
 			<param index="1" name="enable" type="bool" />
 			<description>
-				Sets whether the texture RID should force redrawing when it's visible on screen when [member OS.low_processor_usage_mode] is [code]true[/code]. This is used by [AnimatedTexture] to force redrawing.
 			</description>
 		</method>
 		<method name="texture_set_path">
@@ -4014,8 +3881,6 @@
 			<param index="0" name="texture" type="RID" />
 			<param index="1" name="path" type="String" />
 			<description>
-				Sets the resource path for this texture RID. See also [method texture_get_path].
-				[b]Note:[/b] This is purely a hint and does not cause the texture to be automatically saved when set to a [code]res://[/code] path.
 			</description>
 		</method>
 		<method name="texture_set_size_override">
@@ -4024,7 +3889,6 @@
 			<param index="1" name="width" type="int" />
 			<param index="2" name="height" type="int" />
 			<description>
-				Sets the size at which the texture should be [i]displayed[/i] in 2D, ignoring its original size. This does not rescale the texture data itself, only how it is drawn in 2D. Set [param width] and [param height] to 0 to disable the size override.
 			</description>
 		</method>
 		<method name="viewport_attach_camera">
@@ -4378,9 +4242,8 @@
 			<param index="0" name="viewport" type="RID" />
 			<param index="1" name="width" type="int" />
 			<param index="2" name="height" type="int" />
-			<param index="3" name="view_count" type="int" default="1" />
 			<description>
-				Sets the viewport's [param width] and [param height] in pixels. Optionally the [param view_count] can be set to increase the number of view layers for stereo rendering.
+				Sets the viewport's width and height in pixels.
 			</description>
 		</method>
 		<method name="viewport_set_snap_2d_transforms_to_pixel">
@@ -4504,7 +4367,6 @@
 			<param index="0" name="notifier" type="RID" />
 			<param index="1" name="aabb" type="AABB" />
 			<description>
-				Sets the AABB of the specified visibility notifier.
 			</description>
 		</method>
 		<method name="visibility_notifier_set_callbacks">
@@ -4513,7 +4375,6 @@
 			<param index="1" name="enter_callable" type="Callable" />
 			<param index="2" name="exit_callable" type="Callable" />
 			<description>
-				Sets the methods to be called when the notifier enters or exits the view.
 			</description>
 		</method>
 		<method name="voxel_gi_allocate_data">
@@ -4527,7 +4388,6 @@
 			<param index="6" name="distance_field" type="PackedByteArray" />
 			<param index="7" name="level_counts" type="PackedInt32Array" />
 			<description>
-				Allocates and initializes the voxel GI data for the specified [param voxel_gi] RID. [param octree_cells] must be a multiple of 32. [param octree_cells] must be double the size of [param data_cells]. The allocated data can be retrieved later using the various [code]voxel_gi_get_*[/code] methods.
 			</description>
 		</method>
 		<method name="voxel_gi_create">
@@ -4542,42 +4402,36 @@
 			<return type="PackedByteArray" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the data cells for the specified voxel GI data instance. See also [method voxel_gi_allocate_data].
 			</description>
 		</method>
 		<method name="voxel_gi_get_distance_field" qualifiers="const">
 			<return type="PackedByteArray" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the distance field data for the specified voxel GI data instance. See also [method voxel_gi_allocate_data].
 			</description>
 		</method>
 		<method name="voxel_gi_get_level_counts" qualifiers="const">
 			<return type="PackedInt32Array" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the level counts for the specified voxel GI data instance. See also [method voxel_gi_allocate_data].
 			</description>
 		</method>
 		<method name="voxel_gi_get_octree_cells" qualifiers="const">
 			<return type="PackedByteArray" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the octree cell data for the specified voxel GI data instance. See also [method voxel_gi_allocate_data].
 			</description>
 		</method>
 		<method name="voxel_gi_get_octree_size" qualifiers="const">
 			<return type="Vector3i" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the octree size for the specified voxel GI data instance, which corresponds to the number of subdivisions per axis. This can be viewed in the editor by hovering the [b]Bake VoxelGI[/b] button at the top of the 3D editor viewport when a [VoxelGI] node is selected and looking at the [b]Subdivisions[/b] field in the tooltip.
 			</description>
 		</method>
 		<method name="voxel_gi_get_to_cell_xform" qualifiers="const">
 			<return type="Transform3D" />
 			<param index="0" name="voxel_gi" type="RID" />
 			<description>
-				Returns the transform to cell space for the specified voxel GI data instance. See also [method voxel_gi_allocate_data].
 			</description>
 		</method>
 		<method name="voxel_gi_set_baked_exposure_normalization">
@@ -4735,19 +4589,6 @@
 		<constant name="CUBEMAP_LAYER_BACK" value="5" enum="CubeMapLayer">
 			Back face of a [Cubemap].
 		</constant>
-		<constant name="TEXTURE_DRAWABLE_FORMAT_RGBA8" value="0" enum="TextureDrawableFormat">
-			OpenGL texture format RGBA with four components, each with a bitdepth of 8.
-		</constant>
-		<constant name="TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB" value="1" enum="TextureDrawableFormat">
-			OpenGL texture format RGBA with four components, each with a bitdepth of 8.
-			When drawn to, an sRGB to linear color space conversion is performed.
-		</constant>
-		<constant name="TEXTURE_DRAWABLE_FORMAT_RGBAH" value="2" enum="TextureDrawableFormat">
-			OpenGL texture format GL_RGBA16F where there are four components, each a 16-bit "half-precision" floating-point value.
-		</constant>
-		<constant name="TEXTURE_DRAWABLE_FORMAT_RGBAF" value="3" enum="TextureDrawableFormat">
-			OpenGL texture format GL_RGBA32F where there are four components, each a 32-bit floating-point value.
-		</constant>
 		<constant name="SHADER_SPATIAL" value="0" enum="ShaderMode">
 			Shader is a 3D shader.
 		</constant>
@@ -4763,10 +4604,7 @@
 		<constant name="SHADER_FOG" value="4" enum="ShaderMode">
 			Shader is a 3D fog shader.
 		</constant>
-		<constant name="SHADER_TEXTURE_BLIT" value="5" enum="ShaderMode">
-			Shader is a texture_blit shader.
-		</constant>
-		<constant name="SHADER_MAX" value="6" enum="ShaderMode">
+		<constant name="SHADER_MAX" value="5" enum="ShaderMode">
 			Represents the size of the [enum ShaderMode] enum.
 		</constant>
 		<constant name="MATERIAL_RENDER_PRIORITY_MIN" value="-128">
@@ -5190,55 +5028,22 @@
 			3D particles.
 		</constant>
 		<constant name="PARTICLES_TRANSFORM_ALIGN_DISABLED" value="0" enum="ParticlesTransformAlign">
-			Do not align particle transforms relative to the camera or velocity.
 		</constant>
 		<constant name="PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD" value="1" enum="ParticlesTransformAlign">
-			Align each particle's Z axis to face the camera.
 		</constant>
 		<constant name="PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY" value="2" enum="ParticlesTransformAlign">
-			Align each particle's Y axis to the velocity vector.
 		</constant>
 		<constant name="PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY" value="3" enum="ParticlesTransformAlign">
-			Align each particle's Z axis to face the camera and Y axis to the velocity vector.
-		</constant>
-		<constant name="PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD" value="4" enum="ParticlesTransformAlign">
-			Billboard each particles around a local axis.
-		</constant>
-		<constant name="PARTICLES_ALIGN_CHANNEL_FILTER_DISABLED" value="0" enum="ParticlesTransformAlignCustomSrc">
-			Do not read from CUSTOM when performing billboarding.
-		</constant>
-		<constant name="PARTICLES_ALIGN_CHANNEL_FILTER_X" value="1" enum="ParticlesTransformAlignCustomSrc">
-			Read from [code]CUSTOM.x[/code] when performing billboarding and use it as an angle, in radians.
-		</constant>
-		<constant name="PARTICLES_ALIGN_CHANNEL_FILTER_Y" value="2" enum="ParticlesTransformAlignCustomSrc">
-			Read from [code]CUSTOM.y[/code] when performing billboarding and use it as an angle, in radians.
-		</constant>
-		<constant name="PARTICLES_ALIGN_CHANNEL_FILTER_Z" value="3" enum="ParticlesTransformAlignCustomSrc">
-			Read from [code]CUSTOM.z[/code] when performing billboarding and use it as an angle, in radians.
-		</constant>
-		<constant name="PARTICLES_ALIGN_CHANNEL_FILTER_W" value="4" enum="ParticlesTransformAlignCustomSrc">
-			Read from [code]CUSTOM.w[/code] when performing billboarding and use it as an angle, in radians.
-		</constant>
-		<constant name="PARTICLES_ALIGN_AXIS_X" value="0" enum="ParticlesTransformAlignAxis">
-			Use the X axis for local billboarding.
-		</constant>
-		<constant name="PARTICLES_ALIGN_AXIS_Y" value="1" enum="ParticlesTransformAlignAxis">
-			Use the Y axis for local billboarding.
 		</constant>
 		<constant name="PARTICLES_EMIT_FLAG_POSITION" value="1">
-			Particle starts at the specified position.
 		</constant>
 		<constant name="PARTICLES_EMIT_FLAG_ROTATION_SCALE" value="2">
-			Particle starts with specified rotation and scale.
 		</constant>
 		<constant name="PARTICLES_EMIT_FLAG_VELOCITY" value="4">
-			Particle starts with the specified velocity vector, which defines the emission direction and speed.
 		</constant>
 		<constant name="PARTICLES_EMIT_FLAG_COLOR" value="8">
-			Particle starts with specified color.
 		</constant>
 		<constant name="PARTICLES_EMIT_FLAG_CUSTOM" value="16">
-			Particle starts with specified [code]CUSTOM[/code] data.
 		</constant>
 		<constant name="PARTICLES_DRAW_ORDER_INDEX" value="0" enum="ParticlesDrawOrder">
 			Draw particles in the order that they appear in the particles array.
@@ -5253,43 +5058,30 @@
 			Sort particles based on their distance to the camera.
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT" value="0" enum="ParticlesCollisionType">
-			Sphere attractor type for [GPUParticles3D] (see [GPUParticlesAttractorSphere3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_BOX_ATTRACT" value="1" enum="ParticlesCollisionType">
-			Box attractor type for [GPUParticles3D] (see [GPUParticlesAttractorBox3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT" value="2" enum="ParticlesCollisionType">
-			Vector field attractor type for [GPUParticles3D] (see [GPUParticlesAttractorVectorField3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE" value="3" enum="ParticlesCollisionType">
-			Sphere collision type for [GPUParticles3D] (see [GPUParticlesCollisionSphere3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_BOX_COLLIDE" value="4" enum="ParticlesCollisionType">
-			Box collision type for [GPUParticles3D] (see [GPUParticlesCollisionBox3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_SDF_COLLIDE" value="5" enum="ParticlesCollisionType">
-			Signed distance field collision type for [GPUParticles3D] (see [GPUParticlesCollisionSDF3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE" value="6" enum="ParticlesCollisionType">
-			Heightfield collision type for [GPUParticles3D] (see [GPUParticlesCollisionHeightField3D]).
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_256" value="0" enum="ParticlesCollisionHeightfieldResolution">
-			256×256 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_512" value="1" enum="ParticlesCollisionHeightfieldResolution">
-			512×512 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024" value="2" enum="ParticlesCollisionHeightfieldResolution">
-			1024×1024 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_2048" value="3" enum="ParticlesCollisionHeightfieldResolution">
-			2048×2048 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_4096" value="4" enum="ParticlesCollisionHeightfieldResolution">
-			4096×4096 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_8192" value="5" enum="ParticlesCollisionHeightfieldResolution">
-			8192×8192 heightfield resolution for [GPUParticlesCollisionHeightField3D].
 		</constant>
 		<constant name="PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX" value="6" enum="ParticlesCollisionHeightfieldResolution">
 			Represents the size of the [enum ParticlesCollisionHeightfieldResolution] enum.
@@ -5329,11 +5121,7 @@
 			Use MetalFX temporal upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use MetalFX at native resolution as a TAA solution.
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
-		<constant name="VIEWPORT_SCALING_3D_MODE_NEAREST" value="5" enum="ViewportScaling3DMode">
-			Use nearest-neighbor filtering for the viewport's 3D buffer. This looks crisper than [constant VIEWPORT_SCALING_3D_MODE_BILINEAR] and has no additional rendering cost. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
-			[b]Note:[/b] When using the [b]Nearest[/b] scaling mode, to avoid uneven pixel scaling, it's highly recommended to use a value equal to an integer divisor with a dividend of [code]1[/code]. For example, it's best to use a scale of [code]0.5[/code] (1/2), [code]0.3333[/code] (1/3), [code]0.25[/code] (1/4), [code]0.2[/code] (1/5), and so on.
-		</constant>
-		<constant name="VIEWPORT_SCALING_3D_MODE_MAX" value="6" enum="ViewportScaling3DMode">
+		<constant name="VIEWPORT_SCALING_3D_MODE_MAX" value="5" enum="ViewportScaling3DMode">
 			Represents the size of the [enum ViewportScaling3DMode] enum.
 		</constant>
 		<constant name="VIEWPORT_UPDATE_DISABLED" value="0" enum="ViewportUpdateMode">
@@ -5494,7 +5282,6 @@
 		<constant name="VIEWPORT_DEBUG_DRAW_WIREFRAME" value="4" enum="ViewportDebugDraw">
 			Debug draw draws objects in wireframe.
 			[b]Note:[/b] [method set_debug_generate_wireframes] must be called before loading any meshes for wireframes to be visible when using the Compatibility renderer.
-			[b]Note:[/b] In the Compatibility renderer, backfaces are always visible when using wireframe rendering. In the Forward+ and Mobile renderers, wireframes follow the material's backface culling properties instead.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER" value="5" enum="ViewportDebugDraw">
 			Normal buffer is drawn instead of regular scene so you can see the per-pixel normals that will be used by post-processing effects.
@@ -5696,20 +5483,19 @@
 			Use the [Sky] for reflections regardless of what the background is.
 		</constant>
 		<constant name="ENV_GLOW_BLEND_MODE_ADDITIVE" value="0" enum="EnvironmentGlowBlendMode">
-			Adds the glow effect to the scene.
+			Additive glow blending mode. Mostly used for particles, glows (bloom), lens flare, bright sources.
 		</constant>
 		<constant name="ENV_GLOW_BLEND_MODE_SCREEN" value="1" enum="EnvironmentGlowBlendMode">
-			Adds the glow effect to the scene after modifying the glow influence based on the scene value; dark values will be highly influenced by glow and bright values will not be influenced by glow. This approach avoids bright values becoming overly bright from the glow effect. [member Environment.tonemap_white] is used to determine the maximum scene value where the glow should have no influence. When [member Environment.tonemap_mode] is set to [constant Environment.TONE_MAPPER_LINEAR] and [member Viewport.use_hdr_2d] is [code]true[/code], the parent window's [method Window.get_output_max_linear_value] will be used as the maximum scene value.
+			Screen glow blending mode. Increases brightness, used frequently with bloom.
 		</constant>
 		<constant name="ENV_GLOW_BLEND_MODE_SOFTLIGHT" value="2" enum="EnvironmentGlowBlendMode">
-			Adds the glow effect to the tonemapped image after modifying the glow influence based on the image value; dark values and bright values will not be influenced by glow and mid-range values will be highly influenced by glow. This approach avoids bright values becoming overly bright from the glow effect. The glow will have the largest influence on image values of [code]0.25[/code] and will have no influence when applied to image values greater than [code]1.0[/code].
-			[b]Note:[/b] This blend mode does not support HDR output because expects a maximum output value of [code]1.0[/code]. It is recommended to use a different blend mode when rendering to an HDR screen.
+			Soft light glow blending mode. Modifies contrast, exposes shadows and highlights (vivid bloom).
 		</constant>
 		<constant name="ENV_GLOW_BLEND_MODE_REPLACE" value="3" enum="EnvironmentGlowBlendMode">
-			Replaces all pixels' color by the glow effect. This can be used to simulate a full-screen blur effect by tweaking the glow parameters to match the original image's brightness or to preview glow configuration in the editor.
+			Replace glow blending mode. Replaces all pixels' color by the glow value. This can be used to simulate a full-screen blur effect by tweaking the glow parameters to match the original image's brightness.
 		</constant>
 		<constant name="ENV_GLOW_BLEND_MODE_MIX" value="4" enum="EnvironmentGlowBlendMode">
-			Mixes the glow image with the scene image. Best used with [member Environment.glow_bloom] to avoid darkening the scene.
+			Mixes the glow with the underlying color to avoid increasing brightness as much while still maintaining a glow effect.
 		</constant>
 		<constant name="ENV_FOG_MODE_EXPONENTIAL" value="0" enum="EnvironmentFogMode">
 			Use a physically-based fog model defined primarily by fog density.
@@ -5726,12 +5512,10 @@
 		</constant>
 		<constant name="ENV_TONE_MAPPER_FILMIC" value="2" enum="EnvironmentToneMapper">
 			Uses a film-like tonemapping curve to prevent clipping of bright values and provide better contrast than [constant ENV_TONE_MAPPER_REINHARD]. Slightly slower than [constant ENV_TONE_MAPPER_REINHARD].
-			[b]Note:[/b] This tonemapper does not support HDR output because it produces output in the SDR range. It is recommended to use a different tonemapper when rendering to an HDR screen.
 		</constant>
 		<constant name="ENV_TONE_MAPPER_ACES" value="3" enum="EnvironmentToneMapper">
 			Uses a high-contrast film-like tonemapping curve and desaturates bright values for a more realistic appearance. Slightly slower than [constant ENV_TONE_MAPPER_FILMIC].
 			[b]Note:[/b] This tonemapping operator is called "ACES Fitted" in Godot 3.x.
-			[b]Note:[/b] This tonemapper does not support HDR output because it produces output in the SDR range. It is recommended to use a different tonemapper when rendering to an HDR screen.
 		</constant>
 		<constant name="ENV_TONE_MAPPER_AGX" value="4" enum="EnvironmentToneMapper">
 			Uses an adjustable film-like tonemapping curve and desaturates bright values for a more realistic appearance. Better than other tonemappers at maintaining the hue of colors as they become brighter. The slowest tonemapping option.
diff --git a/engine/doc/classes/Resource.xml b/engine/doc/classes/Resource.xml
index e48611ce..14c5ec9c 100644
--- a/engine/doc/classes/Resource.xml
+++ b/engine/doc/classes/Resource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Resource" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Resource" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for serializable objects.
 	</brief_description>
@@ -48,13 +48,6 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="copy_from_resource">
-			<return type="int" enum="Error" />
-			<param index="0" name="resource" type="Resource" />
-			<description>
-				Copies the data from [param resource] into this resource. Both resources must share the same class.
-			</description>
-		</method>
 		<method name="duplicate" qualifiers="const">
 			<return type="Resource" />
 			<param index="0" name="deep" type="bool" default="false" />
@@ -172,7 +165,7 @@
 			[b]Note:[/b] Setting this property manually may fail if a resource with the same path has already been previously loaded. If necessary, use [method take_over_path].
 		</member>
 		<member name="resource_scene_unique_id" type="String" setter="set_scene_unique_id" getter="get_scene_unique_id">
-			A unique identifier relative to this resource's scene. If left empty, the ID is automatically generated when this resource is saved inside a [PackedScene]. If the resource is not inside a scene, this property is empty by default.
+			A unique identifier relative to the this resource's scene. If left empty, the ID is automatically generated when this resource is saved inside a [PackedScene]. If the resource is not inside a scene, this property is empty by default.
 			[b]Note:[/b] When the [PackedScene] is saved, if multiple resources in the same scene use the same ID, only the earliest resource in the scene hierarchy keeps the original ID. The other resources are assigned new IDs from [method generate_scene_unique_id].
 			[b]Note:[/b] Setting this property does not emit the [signal changed] signal.
 			[b]Warning:[/b] When setting, the ID must only consist of letters, numbers, and underscores. Otherwise, it will fail and default to a randomly generated ID.
@@ -193,7 +186,7 @@
 	</signals>
 	<constants>
 		<constant name="DEEP_DUPLICATE_NONE" value="0" enum="DeepDuplicateMode">
-			No subresources at all are duplicated. This is useful even in a deep duplication to have all the arrays and dictionaries duplicated but still pointing to the original resources.
+			No subresorces at all are duplicated. This is useful even in a deep duplication to have all the arrays and dictionaries duplicated but still pointing to the original resources.
 		</constant>
 		<constant name="DEEP_DUPLICATE_INTERNAL" value="1" enum="DeepDuplicateMode">
 			Only subresources without a path or with a scene-local path will be duplicated.
diff --git a/engine/doc/classes/ResourceFormatLoader.xml b/engine/doc/classes/ResourceFormatLoader.xml
index 4a718e0a..c6a4d24f 100644
--- a/engine/doc/classes/ResourceFormatLoader.xml
+++ b/engine/doc/classes/ResourceFormatLoader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceFormatLoader" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceFormatLoader" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Loads a specific resource type from a file.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceFormatSaver.xml b/engine/doc/classes/ResourceFormatSaver.xml
index e34c1e58..ae5a6b57 100644
--- a/engine/doc/classes/ResourceFormatSaver.xml
+++ b/engine/doc/classes/ResourceFormatSaver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceFormatSaver" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceFormatSaver" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Saves a specific resource type to a file.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporter.xml b/engine/doc/classes/ResourceImporter.xml
index 85907d6b..ff069a15 100644
--- a/engine/doc/classes/ResourceImporter.xml
+++ b/engine/doc/classes/ResourceImporter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporter" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporter" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for resource importers.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterBMFont.xml b/engine/doc/classes/ResourceImporterBMFont.xml
index 451f69a8..321359b6 100644
--- a/engine/doc/classes/ResourceImporterBMFont.xml
+++ b/engine/doc/classes/ResourceImporterBMFont.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterBMFont" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterBMFont" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a bitmap font in the BMFont ([code].fnt[/code]) format.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterBitMap.xml b/engine/doc/classes/ResourceImporterBitMap.xml
index 66b03e90..e54947eb 100644
--- a/engine/doc/classes/ResourceImporterBitMap.xml
+++ b/engine/doc/classes/ResourceImporterBitMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterBitMap" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterBitMap" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a [BitMap] resource (2D array of boolean values).
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterCSVTranslation.xml b/engine/doc/classes/ResourceImporterCSVTranslation.xml
index a49f62b2..331379fd 100644
--- a/engine/doc/classes/ResourceImporterCSVTranslation.xml
+++ b/engine/doc/classes/ResourceImporterCSVTranslation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterCSVTranslation" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterCSVTranslation" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports comma-separated values as [Translation]s.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterDynamicFont.xml b/engine/doc/classes/ResourceImporterDynamicFont.xml
index 9ab7b63e..b9f2b480 100644
--- a/engine/doc/classes/ResourceImporterDynamicFont.xml
+++ b/engine/doc/classes/ResourceImporterDynamicFont.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterDynamicFont" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterDynamicFont" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a TTF, TTC, OTF, OTC, WOFF or WOFF2 font file for font rendering that adapts to any size.
 	</brief_description>
@@ -38,13 +38,11 @@
 			If [code]true[/code], this font will have mipmaps generated. This prevents text from looking grainy when a [Control] is scaled down, or when a [Label3D] is viewed from a long distance (if [member Label3D.texture_filter] is set to a mode that displays mipmaps).
 			Enabling [member generate_mipmaps] increases font generation time and memory usage. Only enable this setting if you actually need it.
 		</member>
-		<member name="hinting" type="int" setter="" getter="" default="3">
+		<member name="hinting" type="int" setter="" getter="" default="1">
 			The hinting mode to use. This controls how aggressively glyph edges should be snapped to pixels when rasterizing the font. Depending on personal preference, you may prefer using one hinting mode over the other. Hinting modes other than [b]None[/b] are only effective if the font contains hinting data (see [member force_autohinter]).
 			[b]None:[/b] Smoothest appearance, which can make the font look blurry at small sizes.
 			[b]Light:[/b] Sharp result by snapping glyph edges to pixels on the Y axis only.
 			[b]Normal:[/b] Sharpest by snapping glyph edges to pixels on both X and Y axes.
-			[b]Light (Except Pixel Fonts):[/b] [b]Disabled[/b] for pixel style fonts (each glyph's contours contain only straight horizontal and vertical lines), [b]Light[/b] for other fonts.
-			[b]Normal (Except Pixel Fonts):[/b] [b]Disabled[/b] for pixel style fonts (each glyph's contours contain only straight horizontal and vertical lines), [b]Normal[/b] for other fonts.
 		</member>
 		<member name="keep_rounding_remainders" type="bool" setter="" getter="" default="true">
 			If set to [code]true[/code], when aligning glyphs to the pixel boundaries rounding remainders are accumulated to ensure more uniform glyph distribution. This setting has no effect if subpixel positioning is enabled.
@@ -83,7 +81,7 @@
 			[b]Auto:[/b] Use subpixel positioning at small font sizes (the chosen quality varies depending on font size). Large fonts will not use subpixel positioning. This is a good tradeoff between performance and quality.
 			[b]One Half of a Pixel:[/b] Always perform intermediate subpixel positioning regardless of font size. High quality, slow rendering.
 			[b]One Quarter of a Pixel:[/b] Always perform precise subpixel positioning regardless of font size. Highest quality, slowest rendering.
-			[b]Auto (Except Pixel Fonts):[/b] [b]Disabled[/b] for pixel style fonts (each glyph's contours contain only straight horizontal and vertical lines), [b]Auto[/b] for other fonts.
+			[b]Auto (Except Pixel Fonts):[/b] [b]Disabled[/b] for the pixel style fonts (each glyph contours contain only straight horizontal and vertical lines), [b]Auto[/b] for the other fonts.
 		</member>
 	</members>
 </class>
diff --git a/engine/doc/classes/ResourceImporterImage.xml b/engine/doc/classes/ResourceImporterImage.xml
index 495f3834..eb7219cc 100644
--- a/engine/doc/classes/ResourceImporterImage.xml
+++ b/engine/doc/classes/ResourceImporterImage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterImage" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterImage" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports an image for use in scripting, with no rendering capabilities.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterImageFont.xml b/engine/doc/classes/ResourceImporterImageFont.xml
index 32d95ba0..199e79b6 100644
--- a/engine/doc/classes/ResourceImporterImageFont.xml
+++ b/engine/doc/classes/ResourceImporterImageFont.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterImageFont" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterImageFont" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a bitmap font where all glyphs have the same width and height.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterLayeredTexture.xml b/engine/doc/classes/ResourceImporterLayeredTexture.xml
index d4938ecc..fa59a246 100644
--- a/engine/doc/classes/ResourceImporterLayeredTexture.xml
+++ b/engine/doc/classes/ResourceImporterLayeredTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterLayeredTexture" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterLayeredTexture" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a 3-dimensional texture ([Texture3D]), a [Texture2DArray], a [Cubemap] or a [CubemapArray].
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterOBJ.xml b/engine/doc/classes/ResourceImporterOBJ.xml
index bc845cb3..084638f6 100644
--- a/engine/doc/classes/ResourceImporterOBJ.xml
+++ b/engine/doc/classes/ResourceImporterOBJ.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterOBJ" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterOBJ" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports an OBJ 3D model as an independent [Mesh] or scene.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterSVG.xml b/engine/doc/classes/ResourceImporterSVG.xml
index 86c7ad9b..0eb87330 100644
--- a/engine/doc/classes/ResourceImporterSVG.xml
+++ b/engine/doc/classes/ResourceImporterSVG.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterSVG" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterSVG" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports an SVG file as an automatically scalable texture for use in UI elements and 2D rendering.
 	</brief_description>
@@ -18,14 +18,6 @@
 		<member name="compress" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], uses lossless compression for the SVG source.
 		</member>
-		<member name="fix_alpha_border" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], puts pixels of the same surrounding color in transition from transparent to opaque areas. For textures displayed with bilinear filtering, this helps to reduce the outline effect when exporting images from an image editor.
-		</member>
-		<member name="premult_alpha" type="bool" setter="" getter="" default="false">
-			An alternative to fixing darkened borders with [member fix_alpha_border] is to use premultiplied alpha. By enabling this option, the texture will be converted to this format. A premultiplied alpha texture requires specific materials to be displayed correctly:
-			- In 2D, a [CanvasItemMaterial] will need to be created and configured to use the [constant CanvasItemMaterial.BLEND_MODE_PREMULT_ALPHA] blend mode on [CanvasItem]s that use this texture. In custom [code]canvas_item[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
-			- In 3D, a [BaseMaterial3D] will need to be created and configured to use the [constant BaseMaterial3D.BLEND_MODE_PREMULT_ALPHA] blend mode on materials that use this texture. In custom [code]spatial[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
-		</member>
 		<member name="saturation" type="float" setter="" getter="" default="1.0">
 			Overrides texture saturation.
 		</member>
diff --git a/engine/doc/classes/ResourceImporterScene.xml b/engine/doc/classes/ResourceImporterScene.xml
index 517df871..4364cdc2 100644
--- a/engine/doc/classes/ResourceImporterScene.xml
+++ b/engine/doc/classes/ResourceImporterScene.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterScene" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterScene" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a glTF, FBX, COLLADA, or Blender 3D scene.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterShaderFile.xml b/engine/doc/classes/ResourceImporterShaderFile.xml
index a4354b3a..35f2ebc3 100644
--- a/engine/doc/classes/ResourceImporterShaderFile.xml
+++ b/engine/doc/classes/ResourceImporterShaderFile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterShaderFile" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterShaderFile" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports native GLSL shaders (not Godot shaders) as an [RDShaderFile].
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterTexture.xml b/engine/doc/classes/ResourceImporterTexture.xml
index d9b5dc34..3a7d3a02 100644
--- a/engine/doc/classes/ResourceImporterTexture.xml
+++ b/engine/doc/classes/ResourceImporterTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterTexture" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterTexture" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports an image for use in 2D or 3D rendering.
 	</brief_description>
@@ -60,7 +60,7 @@
 			[b]Note:[/b] Only available for SVG images.
 		</member>
 		<member name="editor/scale_with_editor_scale" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], scales the imported image to match [member EditorSettings.interface/editor/appearance/custom_display_scale]. This should be enabled for editor plugin icons and custom class icons, but should be left disabled otherwise.
+			If [code]true[/code], scales the imported image to match [member EditorSettings.interface/editor/custom_display_scale]. This should be enabled for editor plugin icons and custom class icons, but should be left disabled otherwise.
 			[b]Note:[/b] Only available for SVG images.
 		</member>
 		<member name="mipmaps/generate" type="bool" setter="" getter="" default="false">
@@ -148,7 +148,7 @@
 		</member>
 		<member name="process/premult_alpha" type="bool" setter="" getter="" default="false">
 			An alternative to fixing darkened borders with [member process/fix_alpha_border] is to use premultiplied alpha. By enabling this option, the texture will be converted to this format. A premultiplied alpha texture requires specific materials to be displayed correctly:
-			- In 2D, a [CanvasItemMaterial] will need to be created and configured to use the [constant CanvasItemMaterial.BLEND_MODE_PREMULT_ALPHA] blend mode on [CanvasItem]s that use this texture. In custom [code]canvas_item[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
+			- In 2D, a [CanvasItemMaterial] will need to be created and configured to use the [constant CanvasItemMaterial.BLEND_MODE_PREMULT_ALPHA] blend mode on [CanvasItem]s that use this texture. In custom [code]@canvas_item[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
 			- In 3D, a [BaseMaterial3D] will need to be created and configured to use the [constant BaseMaterial3D.BLEND_MODE_PREMULT_ALPHA] blend mode on materials that use this texture. In custom [code]spatial[/code] shaders, [code]render_mode blend_premul_alpha;[/code] should be used.
 		</member>
 		<member name="process/size_limit" type="int" setter="" getter="" default="0">
diff --git a/engine/doc/classes/ResourceImporterTextureAtlas.xml b/engine/doc/classes/ResourceImporterTextureAtlas.xml
index f65eb5bb..b4890218 100644
--- a/engine/doc/classes/ResourceImporterTextureAtlas.xml
+++ b/engine/doc/classes/ResourceImporterTextureAtlas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterTextureAtlas" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterTextureAtlas" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a collection of textures from a PNG image into an optimized [AtlasTexture] for 2D rendering.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceImporterWAV.xml b/engine/doc/classes/ResourceImporterWAV.xml
index cd57fd65..3caa66d2 100644
--- a/engine/doc/classes/ResourceImporterWAV.xml
+++ b/engine/doc/classes/ResourceImporterWAV.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterWAV" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceImporterWAV" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Imports a WAV audio file for playback.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceLoader.xml b/engine/doc/classes/ResourceLoader.xml
index c3f9de48..9444caf4 100644
--- a/engine/doc/classes/ResourceLoader.xml
+++ b/engine/doc/classes/ResourceLoader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceLoader" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceLoader" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for loading resource files.
 	</brief_description>
diff --git a/engine/doc/classes/ResourcePreloader.xml b/engine/doc/classes/ResourcePreloader.xml
index b9673f73..2d4dcf09 100644
--- a/engine/doc/classes/ResourcePreloader.xml
+++ b/engine/doc/classes/ResourcePreloader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourcePreloader" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourcePreloader" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to preload sub-resources inside a scene.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceSaver.xml b/engine/doc/classes/ResourceSaver.xml
index c65e4e20..35e9fc14 100644
--- a/engine/doc/classes/ResourceSaver.xml
+++ b/engine/doc/classes/ResourceSaver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceSaver" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceSaver" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for saving [Resource]s to the filesystem.
 	</brief_description>
diff --git a/engine/doc/classes/ResourceUID.xml b/engine/doc/classes/ResourceUID.xml
index c5f8a477..0838fc1e 100644
--- a/engine/doc/classes/ResourceUID.xml
+++ b/engine/doc/classes/ResourceUID.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceUID" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ResourceUID" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton that manages the unique identifiers of all resources within a project.
 	</brief_description>
diff --git a/engine/doc/classes/RetargetModifier3D.xml b/engine/doc/classes/RetargetModifier3D.xml
index cc6e15a6..7f89b66a 100644
--- a/engine/doc/classes/RetargetModifier3D.xml
+++ b/engine/doc/classes/RetargetModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RetargetModifier3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RetargetModifier3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modifier to transfer parent skeleton poses (or global poses) to child skeletons in model space with different rests.
 	</brief_description>
diff --git a/engine/doc/classes/RibbonTrailMesh.xml b/engine/doc/classes/RibbonTrailMesh.xml
index adcd0708..113787d3 100644
--- a/engine/doc/classes/RibbonTrailMesh.xml
+++ b/engine/doc/classes/RibbonTrailMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RibbonTrailMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RibbonTrailMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a straight ribbon-shaped [PrimitiveMesh] with variable width.
 	</brief_description>
diff --git a/engine/doc/classes/RichTextEffect.xml b/engine/doc/classes/RichTextEffect.xml
index 40517e3d..774fa2bf 100644
--- a/engine/doc/classes/RichTextEffect.xml
+++ b/engine/doc/classes/RichTextEffect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RichTextEffect" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RichTextEffect" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A custom effect for a [RichTextLabel].
 	</brief_description>
diff --git a/engine/doc/classes/RichTextLabel.xml b/engine/doc/classes/RichTextLabel.xml
index 1765a0cb..48ba7a55 100644
--- a/engine/doc/classes/RichTextLabel.xml
+++ b/engine/doc/classes/RichTextLabel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RichTextLabel" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RichTextLabel" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control for displaying text that can contain different font styles, images, and basic formatting.
 	</brief_description>
diff --git a/engine/doc/classes/RigidBody2D.xml b/engine/doc/classes/RigidBody2D.xml
index 843fe5ae..d2987eee 100644
--- a/engine/doc/classes/RigidBody2D.xml
+++ b/engine/doc/classes/RigidBody2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RigidBody2D" inherits="PhysicsBody2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RigidBody2D" inherits="PhysicsBody2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D physics body that is moved by a physics simulation.
 	</brief_description>
diff --git a/engine/doc/classes/RigidBody3D.xml b/engine/doc/classes/RigidBody3D.xml
index 0935c992..4f27d22d 100644
--- a/engine/doc/classes/RigidBody3D.xml
+++ b/engine/doc/classes/RigidBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RigidBody3D" inherits="PhysicsBody3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RigidBody3D" inherits="PhysicsBody3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body that is moved by a physics simulation.
 	</brief_description>
diff --git a/engine/doc/classes/RootMotionView.xml b/engine/doc/classes/RootMotionView.xml
index 2cfb26ce..d7fbb2d8 100644
--- a/engine/doc/classes/RootMotionView.xml
+++ b/engine/doc/classes/RootMotionView.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RootMotionView" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="RootMotionView" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Editor-only helper for setting up root motion in [AnimationMixer].
 	</brief_description>
diff --git a/engine/doc/classes/SceneState.xml b/engine/doc/classes/SceneState.xml
index 2e25302a..e7dfc65e 100644
--- a/engine/doc/classes/SceneState.xml
+++ b/engine/doc/classes/SceneState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SceneState" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SceneState" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides access to a scene file's information.
 	</brief_description>
diff --git a/engine/doc/classes/SceneTree.xml b/engine/doc/classes/SceneTree.xml
index 4ef591ae..2a653084 100644
--- a/engine/doc/classes/SceneTree.xml
+++ b/engine/doc/classes/SceneTree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SceneTree" inherits="MainLoop" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SceneTree" inherits="MainLoop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Manages the game loop via a hierarchy of nodes.
 	</brief_description>
diff --git a/engine/doc/classes/SceneTreeTimer.xml b/engine/doc/classes/SceneTreeTimer.xml
index 30a91ece..bae02793 100644
--- a/engine/doc/classes/SceneTreeTimer.xml
+++ b/engine/doc/classes/SceneTreeTimer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SceneTreeTimer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SceneTreeTimer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		One-shot timer.
 	</brief_description>
diff --git a/engine/doc/classes/Script.xml b/engine/doc/classes/Script.xml
index 307e8572..388802e9 100644
--- a/engine/doc/classes/Script.xml
+++ b/engine/doc/classes/Script.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Script" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Script" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A class stored as a resource.
 	</brief_description>
@@ -91,13 +91,6 @@
 				[b]Note:[/b] The dictionaries returned by this method are formatted identically to those returned by [method Object.get_signal_list].
 			</description>
 		</method>
-		<method name="has_script_method" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="method_name" type="StringName" />
-			<description>
-				Returns [code]true[/code] if the script, or a base class, defines a method with the given name.
-			</description>
-		</method>
 		<method name="has_script_signal" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="signal_name" type="StringName" />
diff --git a/engine/doc/classes/ScriptBacktrace.xml b/engine/doc/classes/ScriptBacktrace.xml
index ac98552b..ad4aa7cc 100644
--- a/engine/doc/classes/ScriptBacktrace.xml
+++ b/engine/doc/classes/ScriptBacktrace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptBacktrace" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptBacktrace" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A captured backtrace of a specific script language.
 	</brief_description>
diff --git a/engine/doc/classes/ScriptCreateDialog.xml b/engine/doc/classes/ScriptCreateDialog.xml
index f20f5fd7..1a13c325 100644
--- a/engine/doc/classes/ScriptCreateDialog.xml
+++ b/engine/doc/classes/ScriptCreateDialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptCreateDialog" inherits="ConfirmationDialog" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptCreateDialog" inherits="ConfirmationDialog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's popup dialog for creating new [Script] files.
 	</brief_description>
diff --git a/engine/doc/classes/ScriptEditor.xml b/engine/doc/classes/ScriptEditor.xml
index 4f26f1cf..b6d07517 100644
--- a/engine/doc/classes/ScriptEditor.xml
+++ b/engine/doc/classes/ScriptEditor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptEditor" inherits="PanelContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptEditor" inherits="PanelContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Godot editor's script editor.
 	</brief_description>
@@ -18,14 +18,6 @@
 				[b]Note:[/b] This should be called whenever the script is changed to keep the open documentation state up to date.
 			</description>
 		</method>
-		<method name="close_file">
-			<return type="int" enum="Error" />
-			<param index="0" name="path" type="String" />
-			<description>
-				Closes the file at the given [param path], discarding any unsaved changes.
-				Returns [constant OK] on success or [constant ERR_FILE_NOT_FOUND] if the file is not found.
-			</description>
-		</method>
 		<method name="get_breakpoints">
 			<return type="PackedStringArray" />
 			<description>
@@ -56,12 +48,6 @@
 				Returns an array with all [Script] objects which are currently open in editor.
 			</description>
 		</method>
-		<method name="get_unsaved_files" qualifiers="const">
-			<return type="PackedStringArray" />
-			<description>
-				Returns an array of file paths of scripts with unsaved changes open in the editor.
-			</description>
-		</method>
 		<method name="goto_help">
 			<return type="void" />
 			<param index="0" name="topic" type="String" />
@@ -113,18 +99,6 @@
 				[b]Note:[/b] Does not apply to scripts that are already opened.
 			</description>
 		</method>
-		<method name="reload_open_files">
-			<return type="void" />
-			<description>
-				Reloads all currently opened files. This should be used when opened files are changed outside of the script editor. The user may be prompted to resolve file conflicts, see [member EditorSettings.text_editor/behavior/files/auto_reload_scripts_on_external_change].
-			</description>
-		</method>
-		<method name="save_all_scripts">
-			<return type="void" />
-			<description>
-				Saves all open scripts.
-			</description>
-		</method>
 		<method name="unregister_syntax_highlighter">
 			<return type="void" />
 			<param index="0" name="syntax_highlighter" type="EditorSyntaxHighlighter" />
diff --git a/engine/doc/classes/ScriptEditorBase.xml b/engine/doc/classes/ScriptEditorBase.xml
index 50ee8110..1b0084d6 100644
--- a/engine/doc/classes/ScriptEditorBase.xml
+++ b/engine/doc/classes/ScriptEditorBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptEditorBase" inherits="VBoxContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptEditorBase" inherits="VBoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base editor for editing scripts in the [ScriptEditor].
 	</brief_description>
diff --git a/engine/doc/classes/ScriptExtension.xml b/engine/doc/classes/ScriptExtension.xml
index 9b7149aa..a9a1d704 100644
--- a/engine/doc/classes/ScriptExtension.xml
+++ b/engine/doc/classes/ScriptExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptExtension" inherits="Script" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptExtension" inherits="Script" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/ScriptLanguage.xml b/engine/doc/classes/ScriptLanguage.xml
index 4997e933..30ee98e6 100644
--- a/engine/doc/classes/ScriptLanguage.xml
+++ b/engine/doc/classes/ScriptLanguage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptLanguage" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptLanguage" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/ScriptLanguageExtension.xml b/engine/doc/classes/ScriptLanguageExtension.xml
index b4058816..74aea17a 100644
--- a/engine/doc/classes/ScriptLanguageExtension.xml
+++ b/engine/doc/classes/ScriptLanguageExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScriptLanguageExtension" inherits="ScriptLanguage" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScriptLanguageExtension" inherits="ScriptLanguage" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -47,7 +47,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_create_script" qualifiers="virtual const" deprecated="This method is not called by the engine.">
+		<method name="_create_script" qualifiers="virtual required const">
 			<return type="Object" />
 			<description>
 			</description>
@@ -319,7 +319,6 @@
 			<param index="0" name="scripts" type="Array" />
 			<param index="1" name="soft_reload" type="bool" />
 			<description>
-				Reloads all [param scripts] from disk and the specifics of how that happens is [ScriptLanguageExtension] specific.
 			</description>
 		</method>
 		<method name="_reload_tool_script" qualifiers="virtual required">
@@ -327,7 +326,6 @@
 			<param index="0" name="script" type="Script" />
 			<param index="1" name="soft_reload" type="bool" />
 			<description>
-				Reloads the given [param script] from disk and the specifics of how that happens is [ScriptLanguageExtension] specific.
 			</description>
 		</method>
 		<method name="_remove_named_global_constant" qualifiers="virtual required">
diff --git a/engine/doc/classes/ScrollBar.xml b/engine/doc/classes/ScrollBar.xml
index b6728597..d9f02176 100644
--- a/engine/doc/classes/ScrollBar.xml
+++ b/engine/doc/classes/ScrollBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScrollBar" inherits="Range" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScrollBar" inherits="Range" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for scrollbars.
 	</brief_description>
diff --git a/engine/doc/classes/ScrollContainer.xml b/engine/doc/classes/ScrollContainer.xml
index 93022293..515cf300 100644
--- a/engine/doc/classes/ScrollContainer.xml
+++ b/engine/doc/classes/ScrollContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ScrollContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ScrollContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container used to provide scrollbars to a child control when needed.
 	</brief_description>
@@ -64,10 +64,6 @@
 				set_deferred("scroll_horizontal", 600)
 			[/codeblock]
 		</member>
-		<member name="scroll_horizontal_by_default" type="bool" setter="set_scroll_horizontal_by_default" getter="is_scroll_horizontal_by_default" default="false">
-			If [code]true[/code], the mouse wheel scrolls the view horizontally, and holding [kbd]Shift[/kbd] scrolls vertically.
-			If [code]false[/code] (default), the mouse wheel scrolls the view vertically, and holding [kbd]Shift[/kbd] scrolls horizontally.
-		</member>
 		<member name="scroll_horizontal_custom_step" type="float" setter="set_horizontal_custom_step" getter="get_horizontal_custom_step" default="-1.0">
 			Overrides the [member ScrollBar.custom_step] used when clicking the internal scroll bar's horizontal increment and decrement buttons or when using arrow keys when the [ScrollBar] is focused.
 		</member>
diff --git a/engine/doc/classes/SegmentShape2D.xml b/engine/doc/classes/SegmentShape2D.xml
index c824586b..51c9f3b4 100644
--- a/engine/doc/classes/SegmentShape2D.xml
+++ b/engine/doc/classes/SegmentShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SegmentShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SegmentShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D line segment shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/Semaphore.xml b/engine/doc/classes/Semaphore.xml
index 9c9707b3..3ecb5c23 100644
--- a/engine/doc/classes/Semaphore.xml
+++ b/engine/doc/classes/Semaphore.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Semaphore" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Semaphore" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A synchronization mechanism used to control access to a shared resource by [Thread]s.
 	</brief_description>
diff --git a/engine/doc/classes/SeparationRayShape2D.xml b/engine/doc/classes/SeparationRayShape2D.xml
index 538c0b8f..9c805d4e 100644
--- a/engine/doc/classes/SeparationRayShape2D.xml
+++ b/engine/doc/classes/SeparationRayShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SeparationRayShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SeparationRayShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D ray shape used for physics collision that tries to separate itself from any collider.
 	</brief_description>
diff --git a/engine/doc/classes/SeparationRayShape3D.xml b/engine/doc/classes/SeparationRayShape3D.xml
index 82daa165..afb030ad 100644
--- a/engine/doc/classes/SeparationRayShape3D.xml
+++ b/engine/doc/classes/SeparationRayShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SeparationRayShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SeparationRayShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D ray shape used for physics collision that tries to separate itself from any collider.
 	</brief_description>
diff --git a/engine/doc/classes/Separator.xml b/engine/doc/classes/Separator.xml
index ce6453f1..d0535d45 100644
--- a/engine/doc/classes/Separator.xml
+++ b/engine/doc/classes/Separator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Separator" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Separator" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for separators.
 	</brief_description>
diff --git a/engine/doc/classes/Shader.xml b/engine/doc/classes/Shader.xml
index 6011b814..3fbe1da6 100644
--- a/engine/doc/classes/Shader.xml
+++ b/engine/doc/classes/Shader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Shader" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Shader" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A shader implemented in the Godot shading language.
 	</brief_description>
@@ -74,8 +74,5 @@
 		<constant name="MODE_FOG" value="4" enum="Mode">
 			Mode used for setting the color and density of volumetric fog effect.
 		</constant>
-		<constant name="MODE_TEXTURE_BLIT" value="5" enum="Mode">
-			Mode used for drawing to DrawableTexture resources via blit calls.
-		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/ShaderGlobalsOverride.xml b/engine/doc/classes/ShaderGlobalsOverride.xml
index 894df5be..c5fe2a3e 100644
--- a/engine/doc/classes/ShaderGlobalsOverride.xml
+++ b/engine/doc/classes/ShaderGlobalsOverride.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShaderGlobalsOverride" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShaderGlobalsOverride" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to override global shader parameters' values in a scene.
 	</brief_description>
diff --git a/engine/doc/classes/ShaderInclude.xml b/engine/doc/classes/ShaderInclude.xml
index aa8f2187..ec9f1459 100644
--- a/engine/doc/classes/ShaderInclude.xml
+++ b/engine/doc/classes/ShaderInclude.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShaderInclude" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShaderInclude" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A snippet of shader code to be included in a [Shader] with [code]#include[/code].
 	</brief_description>
diff --git a/engine/doc/classes/ShaderIncludeDB.xml b/engine/doc/classes/ShaderIncludeDB.xml
index 893bcd4e..a431eabf 100644
--- a/engine/doc/classes/ShaderIncludeDB.xml
+++ b/engine/doc/classes/ShaderIncludeDB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShaderIncludeDB" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShaderIncludeDB" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Internal database of built in shader include files.
 	</brief_description>
diff --git a/engine/doc/classes/ShaderMaterial.xml b/engine/doc/classes/ShaderMaterial.xml
index 6ab9b9a5..9cff6e34 100644
--- a/engine/doc/classes/ShaderMaterial.xml
+++ b/engine/doc/classes/ShaderMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShaderMaterial" inherits="Material" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShaderMaterial" inherits="Material" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A material defined by a custom [Shader] program and the values of its shader parameters.
 	</brief_description>
diff --git a/engine/doc/classes/Shape2D.xml b/engine/doc/classes/Shape2D.xml
index 1dd96c89..07c014f2 100644
--- a/engine/doc/classes/Shape2D.xml
+++ b/engine/doc/classes/Shape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Shape2D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Shape2D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 2D shapes used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/Shape3D.xml b/engine/doc/classes/Shape3D.xml
index c757fca1..b8262013 100644
--- a/engine/doc/classes/Shape3D.xml
+++ b/engine/doc/classes/Shape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Shape3D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Shape3D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for 3D shapes used for physics collision.
 	</brief_description>
@@ -22,7 +22,6 @@
 		<member name="custom_solver_bias" type="float" setter="set_custom_solver_bias" getter="get_custom_solver_bias" default="0.0">
 			The shape's custom solver bias. Defines how much bodies react to enforce contact separation when this shape is involved.
 			When set to [code]0[/code], the default value from [member ProjectSettings.physics/3d/solver/default_contact_bias] is used.
-			[b]Note:[/b] [member custom_solver_bias] is only effective when using GodotPhysics3D. It has no effect when using Jolt Physics.
 		</member>
 		<member name="margin" type="float" setter="set_margin" getter="get_margin" default="0.04">
 			The collision margin for the shape. This is not used in Godot Physics.
diff --git a/engine/doc/classes/ShapeCast2D.xml b/engine/doc/classes/ShapeCast2D.xml
index b8e25e49..6f5da288 100644
--- a/engine/doc/classes/ShapeCast2D.xml
+++ b/engine/doc/classes/ShapeCast2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShapeCast2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShapeCast2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D shape that sweeps a region of space to detect [CollisionObject2D]s.
 	</brief_description>
diff --git a/engine/doc/classes/ShapeCast3D.xml b/engine/doc/classes/ShapeCast3D.xml
index fc8b8de5..ba0b021b 100644
--- a/engine/doc/classes/ShapeCast3D.xml
+++ b/engine/doc/classes/ShapeCast3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ShapeCast3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ShapeCast3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D shape that sweeps a region of space to detect [CollisionObject3D]s.
 	</brief_description>
diff --git a/engine/doc/classes/Shortcut.xml b/engine/doc/classes/Shortcut.xml
index a64e308d..3aa77f6f 100644
--- a/engine/doc/classes/Shortcut.xml
+++ b/engine/doc/classes/Shortcut.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Shortcut" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Shortcut" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A shortcut for binding input.
 	</brief_description>
diff --git a/engine/doc/classes/Signal.xml b/engine/doc/classes/Signal.xml
index d9fdb310..41c67761 100644
--- a/engine/doc/classes/Signal.xml
+++ b/engine/doc/classes/Signal.xml
@@ -69,7 +69,7 @@
 		}
 		[/csharp]
 		[/codeblocks]
-		[code skip-lint]Object.connect()[/code] [b]or[/b] [code skip-lint]Signal.connect()[/code][b]?[/b]
+		[b][code skip-lint]Object.connect()[/code] or [code skip-lint]Signal.connect()[/code]?[/b]
 		As seen above, the recommended method to connect signals is not [method Object.connect]. The code block below shows the four options for connecting signals, using either this legacy method or the recommended [method Signal.connect], and using either an implicit [Callable] or a manually defined one.
 		[codeblocks]
 		[gdscript]
@@ -146,7 +146,6 @@
 		}
 		[/csharp]
 		[/codeblocks]
-		[b]Note:[/b] In a boolean context, a signal will evaluate to [code]false[/code] if it's null (see [method is_null]). Otherwise, a signal will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Using Signals">$DOCS_URL/getting_started/step_by_step/signals.html</link>
diff --git a/engine/doc/classes/Skeleton2D.xml b/engine/doc/classes/Skeleton2D.xml
index 549f4402..7ff55dfc 100644
--- a/engine/doc/classes/Skeleton2D.xml
+++ b/engine/doc/classes/Skeleton2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Skeleton2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Skeleton2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The parent of a hierarchy of [Bone2D]s, used to create a 2D skeletal animation.
 	</brief_description>
diff --git a/engine/doc/classes/Skeleton3D.xml b/engine/doc/classes/Skeleton3D.xml
index c6c87544..fecfc0a0 100644
--- a/engine/doc/classes/Skeleton3D.xml
+++ b/engine/doc/classes/Skeleton3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Skeleton3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Skeleton3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node containing a bone hierarchy, used to create a 3D skeletal animation.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonIK3D.xml b/engine/doc/classes/SkeletonIK3D.xml
index 68f9f88f..dbb099a2 100644
--- a/engine/doc/classes/SkeletonIK3D.xml
+++ b/engine/doc/classes/SkeletonIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonIK3D" inherits="SkeletonModifier3D" api_type="core" deprecated="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonIK3D" inherits="SkeletonModifier3D" deprecated="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node used to rotate all bones of a [Skeleton3D] bone chain a way that places the end bone at a desired 3D position.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2D.xml b/engine/doc/classes/SkeletonModification2D.xml
index 80f2cf14..c09e63be 100644
--- a/engine/doc/classes/SkeletonModification2D.xml
+++ b/engine/doc/classes/SkeletonModification2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2D" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2D" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for resources that operate on [Bone2D]s in a [Skeleton2D].
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DCCDIK.xml b/engine/doc/classes/SkeletonModification2DCCDIK.xml
index ba89e4e2..e20cbd89 100644
--- a/engine/doc/classes/SkeletonModification2DCCDIK.xml
+++ b/engine/doc/classes/SkeletonModification2DCCDIK.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DCCDIK" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DCCDIK" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that uses CCDIK to manipulate a series of bones to reach a target in 2D.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DFABRIK.xml b/engine/doc/classes/SkeletonModification2DFABRIK.xml
index 3d395b92..e4aee899 100644
--- a/engine/doc/classes/SkeletonModification2DFABRIK.xml
+++ b/engine/doc/classes/SkeletonModification2DFABRIK.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DFABRIK" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DFABRIK" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that uses FABRIK to manipulate a series of [Bone2D] nodes to reach a target.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DJiggle.xml b/engine/doc/classes/SkeletonModification2DJiggle.xml
index ed6b9a97..4a09806b 100644
--- a/engine/doc/classes/SkeletonModification2DJiggle.xml
+++ b/engine/doc/classes/SkeletonModification2DJiggle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DJiggle" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DJiggle" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that jiggles [Bone2D] nodes as they move towards a target.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DLookAt.xml b/engine/doc/classes/SkeletonModification2DLookAt.xml
index 4bfda1de..232104f6 100644
--- a/engine/doc/classes/SkeletonModification2DLookAt.xml
+++ b/engine/doc/classes/SkeletonModification2DLookAt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DLookAt" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DLookAt" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that rotates a [Bone2D] node to look at a target.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DPhysicalBones.xml b/engine/doc/classes/SkeletonModification2DPhysicalBones.xml
index 6741ffa9..af9e982f 100644
--- a/engine/doc/classes/SkeletonModification2DPhysicalBones.xml
+++ b/engine/doc/classes/SkeletonModification2DPhysicalBones.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DPhysicalBones" inherits="SkeletonModification2D" api_type="core" experimental="Physical bones may be changed in the future to perform the position update of [Bone2D] on their own, without needing this resource." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DPhysicalBones" inherits="SkeletonModification2D" experimental="Physical bones may be changed in the future to perform the position update of [Bone2D] on their own, without needing this resource." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that applies the transforms of [PhysicalBone2D] nodes to [Bone2D] nodes.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DStackHolder.xml b/engine/doc/classes/SkeletonModification2DStackHolder.xml
index 05eeb6b3..5b9f6f27 100644
--- a/engine/doc/classes/SkeletonModification2DStackHolder.xml
+++ b/engine/doc/classes/SkeletonModification2DStackHolder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DStackHolder" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DStackHolder" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that holds and executes a [SkeletonModificationStack2D].
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModification2DTwoBoneIK.xml b/engine/doc/classes/SkeletonModification2DTwoBoneIK.xml
index 6438e9cf..d2417ba7 100644
--- a/engine/doc/classes/SkeletonModification2DTwoBoneIK.xml
+++ b/engine/doc/classes/SkeletonModification2DTwoBoneIK.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModification2DTwoBoneIK" inherits="SkeletonModification2D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModification2DTwoBoneIK" inherits="SkeletonModification2D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A modification that rotates two bones using the law of cosines to reach the target.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModificationStack2D.xml b/engine/doc/classes/SkeletonModificationStack2D.xml
index 0af1084c..a006f727 100644
--- a/engine/doc/classes/SkeletonModificationStack2D.xml
+++ b/engine/doc/classes/SkeletonModificationStack2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModificationStack2D" inherits="Resource" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModificationStack2D" inherits="Resource" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A resource that holds a stack of [SkeletonModification2D]s.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonModifier3D.xml b/engine/doc/classes/SkeletonModifier3D.xml
index 2de54c16..03a8bf6b 100644
--- a/engine/doc/classes/SkeletonModifier3D.xml
+++ b/engine/doc/classes/SkeletonModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModifier3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonModifier3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that may modify a Skeleton3D's bones.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonProfile.xml b/engine/doc/classes/SkeletonProfile.xml
index d18d2e17..b5bb4e36 100644
--- a/engine/doc/classes/SkeletonProfile.xml
+++ b/engine/doc/classes/SkeletonProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonProfile" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonProfile" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for a profile of a virtual skeleton used as a target for retargeting.
 	</brief_description>
diff --git a/engine/doc/classes/SkeletonProfileHumanoid.xml b/engine/doc/classes/SkeletonProfileHumanoid.xml
index 051a7531..575bf87d 100644
--- a/engine/doc/classes/SkeletonProfileHumanoid.xml
+++ b/engine/doc/classes/SkeletonProfileHumanoid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonProfileHumanoid" inherits="SkeletonProfile" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkeletonProfileHumanoid" inherits="SkeletonProfile" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A humanoid [SkeletonProfile] preset.
 	</brief_description>
diff --git a/engine/doc/classes/Skin.xml b/engine/doc/classes/Skin.xml
index cb4a766b..0e801de8 100644
--- a/engine/doc/classes/Skin.xml
+++ b/engine/doc/classes/Skin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Skin" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Skin" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/SkinReference.xml b/engine/doc/classes/SkinReference.xml
index cb5fce60..cb0c44ce 100644
--- a/engine/doc/classes/SkinReference.xml
+++ b/engine/doc/classes/SkinReference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkinReference" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SkinReference" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A reference-counted holder object for a skeleton RID used in the [RenderingServer].
 	</brief_description>
diff --git a/engine/doc/classes/Sky.xml b/engine/doc/classes/Sky.xml
index 350d231f..3d657261 100644
--- a/engine/doc/classes/Sky.xml
+++ b/engine/doc/classes/Sky.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Sky" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Sky" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Defines a 3D environment's background by using a [Material].
 	</brief_description>
diff --git a/engine/doc/classes/Slider.xml b/engine/doc/classes/Slider.xml
index f63c0d36..1545c612 100644
--- a/engine/doc/classes/Slider.xml
+++ b/engine/doc/classes/Slider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Slider" inherits="Range" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Slider" inherits="Range" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for sliders.
 	</brief_description>
diff --git a/engine/doc/classes/SliderJoint3D.xml b/engine/doc/classes/SliderJoint3D.xml
index b7d342e6..1ed86cb9 100644
--- a/engine/doc/classes/SliderJoint3D.xml
+++ b/engine/doc/classes/SliderJoint3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SliderJoint3D" inherits="Joint3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SliderJoint3D" inherits="Joint3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A physics joint that restricts the movement of a 3D physics body along an axis relative to another physics body.
 	</brief_description>
diff --git a/engine/doc/classes/SocketServer.xml b/engine/doc/classes/SocketServer.xml
index 154a9909..2142cee8 100644
--- a/engine/doc/classes/SocketServer.xml
+++ b/engine/doc/classes/SocketServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SocketServer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SocketServer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An abstract class for servers based on sockets.
 	</brief_description>
diff --git a/engine/doc/classes/SoftBody3D.xml b/engine/doc/classes/SoftBody3D.xml
index 33561b28..5502a0ed 100644
--- a/engine/doc/classes/SoftBody3D.xml
+++ b/engine/doc/classes/SoftBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SoftBody3D" inherits="MeshInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SoftBody3D" inherits="MeshInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A deformable 3D physics mesh.
 	</brief_description>
@@ -165,6 +165,7 @@
 		</member>
 		<member name="total_mass" type="float" setter="set_total_mass" getter="get_total_mass" default="1.0">
 			The SoftBody3D's mass.
+			[b]Note:[/b] When using Jolt Physics, the default value of this property will instead be [code]0.0[/code], which will cause the body to automatically calculate the mass to 1 kg per point. This is a bug, which will be fixed in Godot 4.7.
 		</member>
 	</members>
 	<constants>
diff --git a/engine/doc/classes/SphereMesh.xml b/engine/doc/classes/SphereMesh.xml
index df8a69fb..8f815beb 100644
--- a/engine/doc/classes/SphereMesh.xml
+++ b/engine/doc/classes/SphereMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SphereMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SphereMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a spherical [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/SphereOccluder3D.xml b/engine/doc/classes/SphereOccluder3D.xml
index fdd006ac..bda8f4c9 100644
--- a/engine/doc/classes/SphereOccluder3D.xml
+++ b/engine/doc/classes/SphereOccluder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SphereOccluder3D" inherits="Occluder3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SphereOccluder3D" inherits="Occluder3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Spherical shape for use with occlusion culling in [OccluderInstance3D].
 	</brief_description>
diff --git a/engine/doc/classes/SphereShape3D.xml b/engine/doc/classes/SphereShape3D.xml
index 0ca8039c..4b14c535 100644
--- a/engine/doc/classes/SphereShape3D.xml
+++ b/engine/doc/classes/SphereShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SphereShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SphereShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D sphere shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/SpinBox.xml b/engine/doc/classes/SpinBox.xml
index 3e39e9eb..6f8f3815 100644
--- a/engine/doc/classes/SpinBox.xml
+++ b/engine/doc/classes/SpinBox.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpinBox" inherits="Range" api_type="core" keywords="number, numeric, input" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpinBox" inherits="Range" keywords="number, numeric, input" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An input field for numbers.
 	</brief_description>
 	<description>
-		[SpinBox] is a numerical input text field. It allows entering integers and floating-point numbers. The [SpinBox] also has up and down buttons that can be clicked to increase or decrease the value. The value can also be changed by dragging the mouse up or down over the [SpinBox]'s arrows.
+		[SpinBox] is a numerical input text field. It allows entering integers and floating-point numbers. The [SpinBox] also has up and down buttons that can be clicked increase or decrease the value. The value can also be changed by dragging the mouse up or down over the [SpinBox]'s arrows.
 		Additionally, mathematical expressions can be entered. These are evaluated when the user presses [kbd]Enter[/kbd] while editing the [SpinBox]'s text field. This uses the [Expression] class to parse and evaluate the expression. The result of the expression is then set as the value of the [SpinBox]. Some examples of valid expressions are [code]5 + 2 * 3[/code], [code]pow(2, 4)[/code], and [code]PI + sin(0.5)[/code]. Expressions are case-sensitive.
 		[b]Example:[/b] Create a [SpinBox], disable its context menu and set its text alignment to right.
 		[codeblocks]
diff --git a/engine/doc/classes/SplineIK3D.xml b/engine/doc/classes/SplineIK3D.xml
index a67a2be4..579bc9a2 100644
--- a/engine/doc/classes/SplineIK3D.xml
+++ b/engine/doc/classes/SplineIK3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SplineIK3D" inherits="ChainIK3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SplineIK3D" inherits="ChainIK3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] for aligning bones along a [Path3D].
 	</brief_description>
@@ -9,7 +9,6 @@
 		Bone twist is determined based on the [method Curve3D.get_point_tilt].
 		If the root bone joint and the start point of the [Curve3D] are separated, it assumes that there is a linear line segment between them. This means that the vector pointing toward the start point of the [Curve3D] takes precedence over the shortest intersection point along the [Curve3D].
 		If the end bone joint exceeds the path length, it is bent as close as possible to the end point of the [Curve3D].
-		[b]Note:[/b] All the methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/SplitContainer.xml b/engine/doc/classes/SplitContainer.xml
index c1d26f7b..8f243abb 100644
--- a/engine/doc/classes/SplitContainer.xml
+++ b/engine/doc/classes/SplitContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SplitContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SplitContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges child controls horizontally or vertically and provides grabbers for adjusting the split ratios between them.
 	</brief_description>
@@ -56,9 +56,6 @@
 		<member name="drag_area_offset" type="int" setter="set_drag_area_offset" getter="get_drag_area_offset" default="0">
 			Shifts the drag area in the axis of the container to prevent the drag area from overlapping the [ScrollBar] or other selectable [Control] of a child node.
 		</member>
-		<member name="drag_nested_intersections" type="bool" setter="set_drag_nested_intersections" getter="is_dragging_nested_intersections" default="false">
-			Adds extra draggers at the intersection of the draggers of two SplitContainers to allow dragging both at once. This must be set to [code]true[/code] for both SplitContainers, and one needs to be a descendant of the other. They also must be orthogonal (their [member vertical] are different) and the descendant must be next to at least one of the ancestor's draggers (within [theme_item minimum_grab_thickness]).
-		</member>
 		<member name="dragger_visibility" type="int" setter="set_dragger_visibility" getter="get_dragger_visibility" enum="SplitContainer.DraggerVisibility" default="0">
 			Determines the dragger's visibility. This property does not determine whether dragging is enabled or not. Use [member dragging_enabled] for that.
 		</member>
diff --git a/engine/doc/classes/SpotLight3D.xml b/engine/doc/classes/SpotLight3D.xml
index 81d47e37..30056b99 100644
--- a/engine/doc/classes/SpotLight3D.xml
+++ b/engine/doc/classes/SpotLight3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpotLight3D" inherits="Light3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpotLight3D" inherits="Light3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A spotlight, such as a reflector spotlight or a lantern.
 	</brief_description>
diff --git a/engine/doc/classes/SpringArm3D.xml b/engine/doc/classes/SpringArm3D.xml
index ba4e4451..891e80b2 100644
--- a/engine/doc/classes/SpringArm3D.xml
+++ b/engine/doc/classes/SpringArm3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringArm3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringArm3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D raycast that dynamically moves its children near the collision point.
 	</brief_description>
diff --git a/engine/doc/classes/SpringBoneCollision3D.xml b/engine/doc/classes/SpringBoneCollision3D.xml
index e99807ba..85738b66 100644
--- a/engine/doc/classes/SpringBoneCollision3D.xml
+++ b/engine/doc/classes/SpringBoneCollision3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringBoneCollision3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringBoneCollision3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base class of the collision that interacts with [SpringBoneSimulator3D].
 	</brief_description>
diff --git a/engine/doc/classes/SpringBoneCollisionCapsule3D.xml b/engine/doc/classes/SpringBoneCollisionCapsule3D.xml
index b45049e5..b48f8d3c 100644
--- a/engine/doc/classes/SpringBoneCollisionCapsule3D.xml
+++ b/engine/doc/classes/SpringBoneCollisionCapsule3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringBoneCollisionCapsule3D" inherits="SpringBoneCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringBoneCollisionCapsule3D" inherits="SpringBoneCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A capsule shape collision that interacts with [SpringBoneSimulator3D].
 	</brief_description>
diff --git a/engine/doc/classes/SpringBoneCollisionPlane3D.xml b/engine/doc/classes/SpringBoneCollisionPlane3D.xml
index 83a92b32..6a6507ff 100644
--- a/engine/doc/classes/SpringBoneCollisionPlane3D.xml
+++ b/engine/doc/classes/SpringBoneCollisionPlane3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringBoneCollisionPlane3D" inherits="SpringBoneCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringBoneCollisionPlane3D" inherits="SpringBoneCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An infinite plane collision that interacts with [SpringBoneSimulator3D].
 	</brief_description>
diff --git a/engine/doc/classes/SpringBoneCollisionSphere3D.xml b/engine/doc/classes/SpringBoneCollisionSphere3D.xml
index 52f5e3a5..3ccb42a9 100644
--- a/engine/doc/classes/SpringBoneCollisionSphere3D.xml
+++ b/engine/doc/classes/SpringBoneCollisionSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringBoneCollisionSphere3D" inherits="SpringBoneCollision3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringBoneCollisionSphere3D" inherits="SpringBoneCollision3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A sphere shape collision that interacts with [SpringBoneSimulator3D].
 	</brief_description>
diff --git a/engine/doc/classes/SpringBoneSimulator3D.xml b/engine/doc/classes/SpringBoneSimulator3D.xml
index 2c7b3b07..f1cbc63b 100644
--- a/engine/doc/classes/SpringBoneSimulator3D.xml
+++ b/engine/doc/classes/SpringBoneSimulator3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpringBoneSimulator3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpringBoneSimulator3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [SkeletonModifier3D] to apply inertial wavering to bone chains.
 	</brief_description>
@@ -11,7 +11,6 @@
 		For simplicity, you can set values to all joints at the same time by using a [Curve]. If you want to specify detailed values individually, set [method set_individual_config] to [code]true[/code].
 		For physical simulation, [SpringBoneSimulator3D] can have children as self-standing collisions that are not related to [PhysicsServer3D], see also [SpringBoneCollision3D].
 		[b]Warning:[/b] A scaled [SpringBoneSimulator3D] will likely not behave as expected. Make sure that the parent [Skeleton3D] and its bones are not scaled.
-		[b]Note:[/b] Most methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/Sprite2D.xml b/engine/doc/classes/Sprite2D.xml
index f722c6a2..482965e3 100644
--- a/engine/doc/classes/Sprite2D.xml
+++ b/engine/doc/classes/Sprite2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Sprite2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Sprite2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		General-purpose sprite node.
 	</brief_description>
diff --git a/engine/doc/classes/Sprite3D.xml b/engine/doc/classes/Sprite3D.xml
index 24a5d107..4b4421ae 100644
--- a/engine/doc/classes/Sprite3D.xml
+++ b/engine/doc/classes/Sprite3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Sprite3D" inherits="SpriteBase3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Sprite3D" inherits="SpriteBase3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		2D sprite node in a 3D world.
 	</brief_description>
diff --git a/engine/doc/classes/SpriteBase3D.xml b/engine/doc/classes/SpriteBase3D.xml
index c02226db..c473a626 100644
--- a/engine/doc/classes/SpriteBase3D.xml
+++ b/engine/doc/classes/SpriteBase3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpriteBase3D" inherits="GeometryInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpriteBase3D" inherits="GeometryInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		2D sprite node in 3D environment.
 	</brief_description>
diff --git a/engine/doc/classes/SpriteFrames.xml b/engine/doc/classes/SpriteFrames.xml
index b32be8f8..b891f4ad 100644
--- a/engine/doc/classes/SpriteFrames.xml
+++ b/engine/doc/classes/SpriteFrames.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpriteFrames" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SpriteFrames" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Sprite frame library for AnimatedSprite2D and AnimatedSprite3D.
 	</brief_description>
diff --git a/engine/doc/classes/StandardMaterial3D.xml b/engine/doc/classes/StandardMaterial3D.xml
index be820b62..55247678 100644
--- a/engine/doc/classes/StandardMaterial3D.xml
+++ b/engine/doc/classes/StandardMaterial3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StandardMaterial3D" inherits="BaseMaterial3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StandardMaterial3D" inherits="BaseMaterial3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A PBR (Physically Based Rendering) material to be used on 3D objects.
 	</brief_description>
diff --git a/engine/doc/classes/StaticBody2D.xml b/engine/doc/classes/StaticBody2D.xml
index 7f3b122a..d94ead0f 100644
--- a/engine/doc/classes/StaticBody2D.xml
+++ b/engine/doc/classes/StaticBody2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StaticBody2D" inherits="PhysicsBody2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StaticBody2D" inherits="PhysicsBody2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D physics body that can't be moved by external forces. When moved manually, it doesn't affect other bodies in its path.
 	</brief_description>
diff --git a/engine/doc/classes/StaticBody3D.xml b/engine/doc/classes/StaticBody3D.xml
index 0e0e7b58..bb61e6e4 100644
--- a/engine/doc/classes/StaticBody3D.xml
+++ b/engine/doc/classes/StaticBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StaticBody3D" inherits="PhysicsBody3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StaticBody3D" inherits="PhysicsBody3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body that can't be moved by external forces. When moved manually, it doesn't affect other bodies in its path.
 	</brief_description>
diff --git a/engine/doc/classes/StatusIndicator.xml b/engine/doc/classes/StatusIndicator.xml
index 360febc1..688840b1 100644
--- a/engine/doc/classes/StatusIndicator.xml
+++ b/engine/doc/classes/StatusIndicator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StatusIndicator" inherits="Node" api_type="core" keywords="tray" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StatusIndicator" inherits="Node" keywords="tray" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Application status indicator (aka notification area icon).
 		[b]Note:[/b] Status indicator is implemented on macOS and Windows.
diff --git a/engine/doc/classes/StreamPeer.xml b/engine/doc/classes/StreamPeer.xml
index 8935d587..c887c37d 100644
--- a/engine/doc/classes/StreamPeer.xml
+++ b/engine/doc/classes/StreamPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for interacting with streams.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerBuffer.xml b/engine/doc/classes/StreamPeerBuffer.xml
index 6a3bfaa6..3fd0642b 100644
--- a/engine/doc/classes/StreamPeerBuffer.xml
+++ b/engine/doc/classes/StreamPeerBuffer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerBuffer" inherits="StreamPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerBuffer" inherits="StreamPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A stream peer used to handle binary data streams.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerExtension.xml b/engine/doc/classes/StreamPeerExtension.xml
index 2772ba75..05c967ee 100644
--- a/engine/doc/classes/StreamPeerExtension.xml
+++ b/engine/doc/classes/StreamPeerExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerExtension" inherits="StreamPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerExtension" inherits="StreamPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/doc/classes/StreamPeerGZIP.xml b/engine/doc/classes/StreamPeerGZIP.xml
index c8f03d7d..01ca7d90 100644
--- a/engine/doc/classes/StreamPeerGZIP.xml
+++ b/engine/doc/classes/StreamPeerGZIP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerGZIP" inherits="StreamPeer" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerGZIP" inherits="StreamPeer" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A stream peer that handles GZIP and deflate compression/decompression.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerSocket.xml b/engine/doc/classes/StreamPeerSocket.xml
index e2485446..5fb59278 100644
--- a/engine/doc/classes/StreamPeerSocket.xml
+++ b/engine/doc/classes/StreamPeerSocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerSocket" inherits="StreamPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerSocket" inherits="StreamPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for interacting with socket streams.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerTCP.xml b/engine/doc/classes/StreamPeerTCP.xml
index 5a0e69bd..2199d06b 100644
--- a/engine/doc/classes/StreamPeerTCP.xml
+++ b/engine/doc/classes/StreamPeerTCP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerTCP" inherits="StreamPeerSocket" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerTCP" inherits="StreamPeerSocket" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A stream peer that handles TCP connections.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerTLS.xml b/engine/doc/classes/StreamPeerTLS.xml
index 66d90291..8f19ca4d 100644
--- a/engine/doc/classes/StreamPeerTLS.xml
+++ b/engine/doc/classes/StreamPeerTLS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerTLS" inherits="StreamPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerTLS" inherits="StreamPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A stream peer that handles TLS connections.
 	</brief_description>
diff --git a/engine/doc/classes/StreamPeerUDS.xml b/engine/doc/classes/StreamPeerUDS.xml
index 63ab84b9..cb606341 100644
--- a/engine/doc/classes/StreamPeerUDS.xml
+++ b/engine/doc/classes/StreamPeerUDS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StreamPeerUDS" inherits="StreamPeerSocket" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StreamPeerUDS" inherits="StreamPeerSocket" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A stream peer that handles UNIX Domain Socket (UDS) connections.
 	</brief_description>
diff --git a/engine/doc/classes/String.xml b/engine/doc/classes/String.xml
index 8994f7b7..3a750203 100644
--- a/engine/doc/classes/String.xml
+++ b/engine/doc/classes/String.xml
@@ -92,19 +92,17 @@
 		<method name="capitalize" qualifiers="const">
 			<return type="String" />
 			<description>
-				Returns a copy of the string with changed appearance. Replaces underscores ([code]_[/code]) and hyphens ([code]-[/code]) with spaces, adds spaces before uppercase letters in the middle of a word, converts all letters to lowercase, then converts the first one and each one following a space to uppercase.
+				Changes the appearance of the string: replaces underscores ([code]_[/code]) with spaces, adds spaces before uppercase letters in the middle of a word, converts all letters to lowercase, then converts the first one and each one following a space to uppercase.
 				[codeblocks]
 				[gdscript]
 				"move_local_x".capitalize()   # Returns "Move Local X"
 				"sceneFile_path".capitalize() # Returns "Scene File Path"
 				"2D, FPS, PNG".capitalize()   # Returns "2d, Fps, Png"
-				"example-name".capitalize()   # Returns "Example Name"
 				[/gdscript]
 				[csharp]
 				"move_local_x".Capitalize();   // Returns "Move Local X"
 				"sceneFile_path".Capitalize(); // Returns "Scene File Path"
 				"2D, FPS, PNG".Capitalize();   // Returns "2d, Fps, Png"
-				"example-name".Capitalize();   // Returns "Example Name"
 				[/csharp]
 				[/codeblocks]
 			</description>
diff --git a/engine/doc/classes/StyleBox.xml b/engine/doc/classes/StyleBox.xml
index 83c1e806..07a31336 100644
--- a/engine/doc/classes/StyleBox.xml
+++ b/engine/doc/classes/StyleBox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StyleBox" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StyleBox" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for defining stylized boxes for UI elements.
 	</brief_description>
diff --git a/engine/doc/classes/StyleBoxEmpty.xml b/engine/doc/classes/StyleBoxEmpty.xml
index fad4ff02..bd04ca56 100644
--- a/engine/doc/classes/StyleBoxEmpty.xml
+++ b/engine/doc/classes/StyleBoxEmpty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StyleBoxEmpty" inherits="StyleBox" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StyleBoxEmpty" inherits="StyleBox" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An empty [StyleBox] (does not display anything).
 	</brief_description>
diff --git a/engine/doc/classes/StyleBoxFlat.xml b/engine/doc/classes/StyleBoxFlat.xml
index 8c484f22..cf09043b 100644
--- a/engine/doc/classes/StyleBoxFlat.xml
+++ b/engine/doc/classes/StyleBoxFlat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StyleBoxFlat" inherits="StyleBox" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StyleBoxFlat" inherits="StyleBox" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A customizable [StyleBox] that doesn't use a texture.
 	</brief_description>
diff --git a/engine/doc/classes/StyleBoxLine.xml b/engine/doc/classes/StyleBoxLine.xml
index 3db14500..5f9d3332 100644
--- a/engine/doc/classes/StyleBoxLine.xml
+++ b/engine/doc/classes/StyleBoxLine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StyleBoxLine" inherits="StyleBox" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StyleBoxLine" inherits="StyleBox" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [StyleBox] that displays a single line of a given color and thickness.
 	</brief_description>
diff --git a/engine/doc/classes/StyleBoxTexture.xml b/engine/doc/classes/StyleBoxTexture.xml
index 5f0af950..109b5da9 100644
--- a/engine/doc/classes/StyleBoxTexture.xml
+++ b/engine/doc/classes/StyleBoxTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StyleBoxTexture" inherits="StyleBox" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="StyleBoxTexture" inherits="StyleBox" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A texture-based nine-patch [StyleBox].
 	</brief_description>
diff --git a/engine/doc/classes/SubViewport.xml b/engine/doc/classes/SubViewport.xml
index ced4b14e..9d41a5e3 100644
--- a/engine/doc/classes/SubViewport.xml
+++ b/engine/doc/classes/SubViewport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SubViewport" inherits="Viewport" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SubViewport" inherits="Viewport" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An interface to a game world that doesn't create a window or draw to the screen directly.
 	</brief_description>
@@ -36,9 +36,6 @@
 		<member name="size_2d_override_stretch" type="bool" setter="set_size_2d_override_stretch" getter="is_size_2d_override_stretch_enabled" default="false">
 			If [code]true[/code], the 2D size override affects stretch as well.
 		</member>
-		<member name="view_count" type="int" setter="set_view_count" getter="get_view_count" default="1">
-			The number of view layers we are rendering to. Set this to [code]2[/code] to enable stereo rendering.
-		</member>
 	</members>
 	<constants>
 		<constant name="CLEAR_MODE_ALWAYS" value="0" enum="ClearMode">
diff --git a/engine/doc/classes/SubViewportContainer.xml b/engine/doc/classes/SubViewportContainer.xml
index 7f172444..b01a81a6 100644
--- a/engine/doc/classes/SubViewportContainer.xml
+++ b/engine/doc/classes/SubViewportContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SubViewportContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SubViewportContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container used for displaying the contents of a [SubViewport].
 	</brief_description>
diff --git a/engine/doc/classes/SubtweenTweener.xml b/engine/doc/classes/SubtweenTweener.xml
index 31088d37..c8999ac4 100644
--- a/engine/doc/classes/SubtweenTweener.xml
+++ b/engine/doc/classes/SubtweenTweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SubtweenTweener" inherits="Tweener" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SubtweenTweener" inherits="Tweener" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Runs a [Tween] nested within another [Tween].
 	</brief_description>
diff --git a/engine/doc/classes/SurfaceTool.xml b/engine/doc/classes/SurfaceTool.xml
index 1fe191aa..7952898d 100644
--- a/engine/doc/classes/SurfaceTool.xml
+++ b/engine/doc/classes/SurfaceTool.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SurfaceTool" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SurfaceTool" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper tool to create geometry.
 	</brief_description>
diff --git a/engine/doc/classes/SyntaxHighlighter.xml b/engine/doc/classes/SyntaxHighlighter.xml
index 1dbc3749..574fa084 100644
--- a/engine/doc/classes/SyntaxHighlighter.xml
+++ b/engine/doc/classes/SyntaxHighlighter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SyntaxHighlighter" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SyntaxHighlighter" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for syntax highlighters. Provides syntax highlighting data to a [TextEdit].
 	</brief_description>
diff --git a/engine/doc/classes/SystemFont.xml b/engine/doc/classes/SystemFont.xml
index e7336ce2..3488a2c6 100644
--- a/engine/doc/classes/SystemFont.xml
+++ b/engine/doc/classes/SystemFont.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SystemFont" inherits="Font" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="SystemFont" inherits="Font" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A font loaded from a system font. Falls back to a default theme font if not implemented on the host OS.
 	</brief_description>
diff --git a/engine/doc/classes/TCPServer.xml b/engine/doc/classes/TCPServer.xml
index e44b6faf..83c7e85c 100644
--- a/engine/doc/classes/TCPServer.xml
+++ b/engine/doc/classes/TCPServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TCPServer" inherits="SocketServer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TCPServer" inherits="SocketServer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A TCP server.
 	</brief_description>
diff --git a/engine/doc/classes/TLSOptions.xml b/engine/doc/classes/TLSOptions.xml
index 1ab8ca85..3bc0bb7e 100644
--- a/engine/doc/classes/TLSOptions.xml
+++ b/engine/doc/classes/TLSOptions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TLSOptions" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TLSOptions" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		TLS configuration for clients and servers.
 	</brief_description>
diff --git a/engine/doc/classes/TabBar.xml b/engine/doc/classes/TabBar.xml
index af25bce3..fca06cce 100644
--- a/engine/doc/classes/TabBar.xml
+++ b/engine/doc/classes/TabBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TabBar" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TabBar" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control that provides a horizontal bar with tabs.
 	</brief_description>
@@ -282,22 +282,6 @@
 		<member name="tab_count" type="int" setter="set_tab_count" getter="get_tab_count" default="0">
 			The number of tabs currently in the bar.
 		</member>
-		<member name="tab_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the tab at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. tab_count - 1[/code] range.
-		</member>
-		<member name="tab_{index}/icon" type="Texture2D" setter="" getter="">
-			If [code]true[/code], the tab at [code]index[/code] is hidden.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. tab_count - 1[/code] range.
-		</member>
-		<member name="tab_{index}/title" type="String" setter="" getter="" default="&quot;&quot;">
-			The title text of the tab at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. tab_count - 1[/code] range.
-		</member>
-		<member name="tab_{index}/tooltip" type="String" setter="" getter="" default="&quot;&quot;">
-			The tooltip text of the tab at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. tab_count - 1[/code] range.
-		</member>
 		<member name="tabs_rearrange_group" type="int" setter="set_tabs_rearrange_group" getter="get_tabs_rearrange_group" default="-1">
 			[TabBar]s with the same rearrange group ID will allow dragging the tabs between them. Enable drag with [member drag_to_rearrange_enabled].
 			Setting this to [code]-1[/code] will disable rearranging between [TabBar]s.
@@ -451,7 +435,7 @@
 			Icon for the left arrow button that appears when there are too many tabs to fit in the container width. Used when the button is being hovered with the cursor.
 		</theme_item>
 		<theme_item name="drop_mark" data_type="icon" type="Texture2D">
-			Icon shown to indicate where a dragged tab will be dropped (see [member drag_to_rearrange_enabled]).
+			Icon shown to indicate where a dragged tab is gonna be dropped (see [member drag_to_rearrange_enabled]).
 		</theme_item>
 		<theme_item name="increment" data_type="icon" type="Texture2D">
 			Icon for the right arrow button that appears when there are too many tabs to fit in the container width. When the button is disabled (i.e. the last tab is visible) it appears semi-transparent.
diff --git a/engine/doc/classes/TabContainer.xml b/engine/doc/classes/TabContainer.xml
index bc2a173a..87ab4d93 100644
--- a/engine/doc/classes/TabContainer.xml
+++ b/engine/doc/classes/TabContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TabContainer" inherits="Container" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TabContainer" inherits="Container" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that creates a tab for each child control, displaying only the active tab's control.
 	</brief_description>
@@ -232,22 +232,6 @@
 		<member name="tab_focus_mode" type="int" setter="set_tab_focus_mode" getter="get_tab_focus_mode" enum="Control.FocusMode" default="2">
 			The focus access mode for the internal [TabBar] node.
 		</member>
-		<member name="tab_{index}/disabled" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the tab at [code]index[/code] is disabled.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. get_tab_count() - 1[/code] range.
-		</member>
-		<member name="tab_{index}/hidden" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the tab at [code]index[/code] is hidden.
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. get_tab_count() - 1[/code] range.
-		</member>
-		<member name="tab_{index}/icon" type="Texture2D" setter="" getter="">
-			The title text of the tab at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. get_tab_count() - 1[/code] range.
-		</member>
-		<member name="tab_{index}/title" type="String" setter="" getter="" default="&quot;&quot;">
-			The tooltip text of the tab at [code]index[/code].
-			[b]Note:[/b] [code]index[/code] is a value in the [code]0 .. get_tab_count() - 1[/code] range.
-		</member>
 		<member name="tabs_position" type="int" setter="set_tabs_position" getter="get_tabs_position" enum="TabContainer.TabPosition" default="0">
 			The horizontal alignment of the tabs.
 		</member>
@@ -377,7 +361,7 @@
 			Icon for the left arrow button that appears when there are too many tabs to fit in the container width. Used when the button is being hovered with the cursor.
 		</theme_item>
 		<theme_item name="drop_mark" data_type="icon" type="Texture2D">
-			Icon shown to indicate where a dragged tab will be dropped (see [member drag_to_rearrange_enabled]).
+			Icon shown to indicate where a dragged tab is gonna be dropped (see [member drag_to_rearrange_enabled]).
 		</theme_item>
 		<theme_item name="increment" data_type="icon" type="Texture2D">
 			Icon for the right arrow button that appears when there are too many tabs to fit in the container width. When the button is disabled (i.e. the last tab is visible) it appears semi-transparent.
diff --git a/engine/doc/classes/TextEdit.xml b/engine/doc/classes/TextEdit.xml
index f1ed3a7c..0d4b5571 100644
--- a/engine/doc/classes/TextEdit.xml
+++ b/engine/doc/classes/TextEdit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextEdit" inherits="Control" api_type="core" keywords="textarea" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextEdit" inherits="Control" keywords="textarea" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A multiline text editor.
 	</brief_description>
@@ -797,7 +797,6 @@
 			<description>
 				Returns [code]true[/code] if the caret is visible, [code]false[/code] otherwise. A caret will be considered hidden if it is outside the scrollable area when scrolling is enabled.
 				[b]Note:[/b] [method is_caret_visible] does not account for a caret being off-screen if it is still within the scrollable area. It will return [code]true[/code] even if the caret is off-screen as long as it meets [TextEdit]'s own conditions for being visible. This includes uses of [member scroll_fit_content_width] and [member scroll_fit_content_height] that cause the [TextEdit] to expand beyond the viewport's bounds.
-				[b]Note:[/b] This method does [i]not[/i] guarantee an accurate visibility check immediately after setting the caret position. The correct value may only be available in the next frame after the [TextEdit] has finished drawing. This also applies to any operation that causes the [TextEdit] to change in size.
 			</description>
 		</method>
 		<method name="is_dragging_cursor" qualifiers="const">
@@ -841,13 +840,6 @@
 				Returns [code]true[/code] if the gutter at the given index on the given line is clickable. See [method set_line_gutter_clickable].
 			</description>
 		</method>
-		<method name="is_line_in_viewport" qualifiers="const">
-			<return type="bool" />
-			<param index="0" name="line" type="int" />
-			<description>
-				Returns [code]true[/code] if the given line is within the scope of the scrollable area of the viewport.
-			</description>
-		</method>
 		<method name="is_line_wrapped" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="line" type="int" />
diff --git a/engine/doc/classes/TextLine.xml b/engine/doc/classes/TextLine.xml
index e7007b6a..c52552f7 100644
--- a/engine/doc/classes/TextLine.xml
+++ b/engine/doc/classes/TextLine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextLine" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextLine" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds a line of text.
 	</brief_description>
diff --git a/engine/doc/classes/TextMesh.xml b/engine/doc/classes/TextMesh.xml
index 79c09eb6..184eeece 100644
--- a/engine/doc/classes/TextMesh.xml
+++ b/engine/doc/classes/TextMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Generate a [PrimitiveMesh] from the text.
 	</brief_description>
diff --git a/engine/doc/classes/TextParagraph.xml b/engine/doc/classes/TextParagraph.xml
index 77a5c974..756efa05 100644
--- a/engine/doc/classes/TextParagraph.xml
+++ b/engine/doc/classes/TextParagraph.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextParagraph" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextParagraph" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds a paragraph of text.
 	</brief_description>
diff --git a/engine/doc/classes/TextServer.xml b/engine/doc/classes/TextServer.xml
index 633c2670..4d66c198 100644
--- a/engine/doc/classes/TextServer.xml
+++ b/engine/doc/classes/TextServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextServer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A server interface for font management and text rendering.
 	</brief_description>
@@ -406,36 +406,6 @@
 				Returns oversampling factor override. If set to a positive value, overrides the oversampling factor of the viewport this font is used in. See [member Viewport.oversampling]. This value doesn't override the [code skip-lint]oversampling[/code] parameter of [code skip-lint]draw_*[/code] methods. Used by dynamic fonts only.
 			</description>
 		</method>
-		<method name="font_get_palette_colors" qualifiers="const">
-			<return type="PackedColorArray" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Returns the array in the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors. Colors can be overridden using [method font_set_palette_custom_colors].
-			</description>
-		</method>
-		<method name="font_get_palette_count" qualifiers="const">
-			<return type="int" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns the number of predefined color palettes. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
-		<method name="font_get_palette_custom_colors" qualifiers="const">
-			<return type="PackedColorArray" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns array of custom colors to override predefined palette.
-			</description>
-		</method>
-		<method name="font_get_palette_name" qualifiers="const">
-			<return type="String" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Returns the name of the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
 		<method name="font_get_scale" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="font_rid" type="RID" />
@@ -572,13 +542,6 @@
 				Returns thickness of the underline in pixels.
 			</description>
 		</method>
-		<method name="font_get_used_palette" qualifiers="const">
-			<return type="int" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns used palette index.
-			</description>
-		</method>
 		<method name="font_get_variation_coordinates" qualifiers="const">
 			<return type="Dictionary" />
 			<param index="0" name="font_rid" type="RID" />
@@ -919,7 +882,7 @@
 		<method name="font_set_modulate_color_glyphs">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="modulate" type="bool" />
+			<param index="1" name="force_autohinter" type="bool" />
 			<description>
 				If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
 			</description>
@@ -973,14 +936,6 @@
 				If set to a positive value, overrides the oversampling factor of the viewport this font is used in. See [member Viewport.oversampling]. This value doesn't override the [code skip-lint]oversampling[/code] parameter of [code skip-lint]draw_*[/code] methods. Used by dynamic fonts only.
 			</description>
 		</method>
-		<method name="font_set_palette_custom_colors">
-			<return type="void" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="colors" type="PackedColorArray" />
-			<description>
-				Sets array of custom colors to override predefined palette. Set to empty array to reset overrides. Use [code]Color(0, 0, 0, 0)[/code], to keep predefined palette color at specific position.
-			</description>
-		</method>
 		<method name="font_set_scale">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
@@ -1089,14 +1044,6 @@
 				Sets thickness of the underline in pixels.
 			</description>
 		</method>
-		<method name="font_set_used_palette">
-			<return type="void" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Sets used palette index.
-			</description>
-		</method>
 		<method name="font_set_variation_coordinates">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
diff --git a/engine/doc/classes/TextServerDummy.xml b/engine/doc/classes/TextServerDummy.xml
index 3c3415c1..bf867008 100644
--- a/engine/doc/classes/TextServerDummy.xml
+++ b/engine/doc/classes/TextServerDummy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServerDummy" inherits="TextServerExtension" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextServerDummy" inherits="TextServerExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A dummy text server that can't render text or manage fonts.
 	</brief_description>
diff --git a/engine/doc/classes/TextServerExtension.xml b/engine/doc/classes/TextServerExtension.xml
index df038ba1..92bc8170 100644
--- a/engine/doc/classes/TextServerExtension.xml
+++ b/engine/doc/classes/TextServerExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServerExtension" inherits="TextServer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextServerExtension" inherits="TextServer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for custom [TextServer] implementations (plugins).
 	</brief_description>
@@ -384,36 +384,6 @@
 				Returns oversampling factor override. If set to a positive value, overrides the oversampling factor of the viewport this font is used in. See [member Viewport.oversampling]. This value doesn't override the [code skip-lint]oversampling[/code] parameter of [code skip-lint]draw_*[/code] methods. Used by dynamic fonts only.
 			</description>
 		</method>
-		<method name="_font_get_palette_colors" qualifiers="virtual const">
-			<return type="PackedColorArray" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Returns the array in the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors. Colors can be overridden using [method _font_set_palette_custom_colors].
-			</description>
-		</method>
-		<method name="_font_get_palette_count" qualifiers="virtual const">
-			<return type="int" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns the number of predefined color palettes. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
-		<method name="_font_get_palette_custom_colors" qualifiers="virtual const">
-			<return type="PackedColorArray" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns array of custom colors to override predefined palette.
-			</description>
-		</method>
-		<method name="_font_get_palette_name" qualifiers="virtual const">
-			<return type="String" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Returns the name of the predefined color palette at [param index]. Palette contains all colors used to render font glyphs. Each palette has the same number of colors.
-			</description>
-		</method>
 		<method name="_font_get_scale" qualifiers="virtual required const">
 			<return type="float" />
 			<param index="0" name="font_rid" type="RID" />
@@ -550,13 +520,6 @@
 				Returns thickness of the underline in pixels.
 			</description>
 		</method>
-		<method name="_font_get_used_palette" qualifiers="virtual const">
-			<return type="int" />
-			<param index="0" name="font_rid" type="RID" />
-			<description>
-				Returns used palette index.
-			</description>
-		</method>
 		<method name="_font_get_variation_coordinates" qualifiers="virtual const">
 			<return type="Dictionary" />
 			<param index="0" name="font_rid" type="RID" />
@@ -956,14 +919,6 @@
 				If set to a positive value, overrides the oversampling factor of the viewport this font is used in. See [member Viewport.oversampling]. This value doesn't override the [code skip-lint]oversampling[/code] parameter of [code skip-lint]draw_*[/code] methods. Used by dynamic fonts only.
 			</description>
 		</method>
-		<method name="_font_set_palette_custom_colors" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="colors" type="PackedColorArray" />
-			<description>
-				Sets array of custom colors to override predefined palette. Set to empty array to reset overrides. Use [code]Color(0, 0, 0, 0)[/code], to keep predefined palette color at specific position.
-			</description>
-		</method>
 		<method name="_font_set_scale" qualifiers="virtual required">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
@@ -1069,14 +1024,6 @@
 				Sets thickness of the underline in pixels.
 			</description>
 		</method>
-		<method name="_font_set_used_palette" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="font_rid" type="RID" />
-			<param index="1" name="index" type="int" />
-			<description>
-				Sets used palette index.
-			</description>
-		</method>
 		<method name="_font_set_variation_coordinates" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
diff --git a/engine/doc/classes/TextServerManager.xml b/engine/doc/classes/TextServerManager.xml
index 4d1ece0c..c0194655 100644
--- a/engine/doc/classes/TextServerManager.xml
+++ b/engine/doc/classes/TextServerManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServerManager" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextServerManager" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for managing [TextServer] implementations.
 	</brief_description>
diff --git a/engine/doc/classes/Texture.xml b/engine/doc/classes/Texture.xml
index 8616e398..ae282319 100644
--- a/engine/doc/classes/Texture.xml
+++ b/engine/doc/classes/Texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all texture types.
 	</brief_description>
diff --git a/engine/doc/classes/Texture2D.xml b/engine/doc/classes/Texture2D.xml
index 1cb6ea94..d8b32f2c 100644
--- a/engine/doc/classes/Texture2D.xml
+++ b/engine/doc/classes/Texture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture2D" inherits="Texture" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture2D" inherits="Texture" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture for 2D and 3D.
 	</brief_description>
@@ -48,30 +48,12 @@
 				[b]Note:[/b] This is only used in 2D rendering, not 3D.
 			</description>
 		</method>
-		<method name="_get_format" qualifiers="virtual const">
-			<return type="int" enum="Image.Format" />
-			<description>
-				Called when [method get_format] is called.
-			</description>
-		</method>
 		<method name="_get_height" qualifiers="virtual required const">
 			<return type="int" />
 			<description>
 				Called when the [Texture2D]'s height is queried.
 			</description>
 		</method>
-		<method name="_get_image" qualifiers="virtual const">
-			<return type="Image" />
-			<description>
-				Called when [method get_image] is called.
-			</description>
-		</method>
-		<method name="_get_mipmap_count" qualifiers="virtual const">
-			<return type="int" />
-			<description>
-				Called when [method get_mipmap_count] is called.
-			</description>
-		</method>
 		<method name="_get_width" qualifiers="virtual required const">
 			<return type="int" />
 			<description>
@@ -84,12 +66,6 @@
 				Called when the presence of an alpha channel in the [Texture2D] is queried.
 			</description>
 		</method>
-		<method name="_has_mipmaps" qualifiers="virtual const">
-			<return type="bool" />
-			<description>
-				Called when [method has_mipmaps] is called.
-			</description>
-		</method>
 		<method name="_is_pixel_opaque" qualifiers="virtual const">
 			<return type="bool" />
 			<param index="0" name="x" type="int" />
@@ -137,12 +113,6 @@
 				Draws a part of the texture using a [CanvasItem] with the [RenderingServer] API.
 			</description>
 		</method>
-		<method name="get_format" qualifiers="const">
-			<return type="int" enum="Image.Format" />
-			<description>
-				Returns the image format of the texture.
-			</description>
-		</method>
 		<method name="get_height" qualifiers="const">
 			<return type="int" />
 			<description>
@@ -157,12 +127,6 @@
 				[b]Note:[/b] This will fetch the texture data from the GPU, which might cause performance problems when overused. Avoid calling [method get_image] every frame, especially on large textures.
 			</description>
 		</method>
-		<method name="get_mipmap_count" qualifiers="const">
-			<return type="int" />
-			<description>
-				Returns the number of mipmaps of the texture.
-			</description>
-		</method>
 		<method name="get_size" qualifiers="const">
 			<return type="Vector2" />
 			<description>
@@ -181,11 +145,5 @@
 				Returns [code]true[/code] if this [Texture2D] has an alpha channel.
 			</description>
 		</method>
-		<method name="has_mipmaps" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if the texture has mipmaps.
-			</description>
-		</method>
 	</methods>
 </class>
diff --git a/engine/doc/classes/Texture2DArray.xml b/engine/doc/classes/Texture2DArray.xml
index 7f9af51b..b5f8b683 100644
--- a/engine/doc/classes/Texture2DArray.xml
+++ b/engine/doc/classes/Texture2DArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture2DArray" inherits="ImageTextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture2DArray" inherits="ImageTextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A single texture resource which consists of multiple, separate images. Each image has the same dimensions and number of mipmap levels.
 	</brief_description>
diff --git a/engine/doc/classes/Texture2DArrayRD.xml b/engine/doc/classes/Texture2DArrayRD.xml
index 6549c4f9..72759c8e 100644
--- a/engine/doc/classes/Texture2DArrayRD.xml
+++ b/engine/doc/classes/Texture2DArrayRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture2DArrayRD" inherits="TextureLayeredRD" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture2DArrayRD" inherits="TextureLayeredRD" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture Array for 2D that is bound to a texture created on the [RenderingDevice].
 	</brief_description>
diff --git a/engine/doc/classes/Texture2DRD.xml b/engine/doc/classes/Texture2DRD.xml
index 5519e419..9832bcfc 100644
--- a/engine/doc/classes/Texture2DRD.xml
+++ b/engine/doc/classes/Texture2DRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture2DRD" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture2DRD" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture for 2D that is bound to a texture created on the [RenderingDevice].
 	</brief_description>
diff --git a/engine/doc/classes/Texture3D.xml b/engine/doc/classes/Texture3D.xml
index bc0b88a4..5c335aeb 100644
--- a/engine/doc/classes/Texture3D.xml
+++ b/engine/doc/classes/Texture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture3D" inherits="Texture" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture3D" inherits="Texture" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for 3-dimensional textures.
 	</brief_description>
diff --git a/engine/doc/classes/Texture3DRD.xml b/engine/doc/classes/Texture3DRD.xml
index b26d4138..10e7f7ca 100644
--- a/engine/doc/classes/Texture3DRD.xml
+++ b/engine/doc/classes/Texture3DRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Texture3DRD" inherits="Texture3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Texture3DRD" inherits="Texture3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture for 3D that is bound to a texture created on the [RenderingDevice].
 	</brief_description>
diff --git a/engine/doc/classes/TextureButton.xml b/engine/doc/classes/TextureButton.xml
index 46734eef..fcab0719 100644
--- a/engine/doc/classes/TextureButton.xml
+++ b/engine/doc/classes/TextureButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureButton" inherits="BaseButton" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureButton" inherits="BaseButton" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture-based button. Supports Pressed, Hover, Disabled and Focused states.
 	</brief_description>
diff --git a/engine/doc/classes/TextureCubemapArrayRD.xml b/engine/doc/classes/TextureCubemapArrayRD.xml
index 3c70efc1..3d7112d4 100644
--- a/engine/doc/classes/TextureCubemapArrayRD.xml
+++ b/engine/doc/classes/TextureCubemapArrayRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureCubemapArrayRD" inherits="TextureLayeredRD" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureCubemapArrayRD" inherits="TextureLayeredRD" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture Array for Cubemaps that is bound to a texture created on the [RenderingDevice].
 	</brief_description>
diff --git a/engine/doc/classes/TextureCubemapRD.xml b/engine/doc/classes/TextureCubemapRD.xml
index 7149bfa3..7a96bd3e 100644
--- a/engine/doc/classes/TextureCubemapRD.xml
+++ b/engine/doc/classes/TextureCubemapRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureCubemapRD" inherits="TextureLayeredRD" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureCubemapRD" inherits="TextureLayeredRD" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture for Cubemap that is bound to a texture created on the [RenderingDevice].
 	</brief_description>
diff --git a/engine/doc/classes/TextureLayered.xml b/engine/doc/classes/TextureLayered.xml
index b4649eda..d7c830da 100644
--- a/engine/doc/classes/TextureLayered.xml
+++ b/engine/doc/classes/TextureLayered.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureLayered" inherits="Texture" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureLayered" inherits="Texture" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for texture types which contain the data of multiple [Image]s. Each image is of the same size and format.
 	</brief_description>
diff --git a/engine/doc/classes/TextureLayeredRD.xml b/engine/doc/classes/TextureLayeredRD.xml
index 6f1ad3b5..e1a2971b 100644
--- a/engine/doc/classes/TextureLayeredRD.xml
+++ b/engine/doc/classes/TextureLayeredRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureLayeredRD" inherits="TextureLayered" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureLayeredRD" inherits="TextureLayered" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for layered texture RD types.
 	</brief_description>
diff --git a/engine/doc/classes/TextureProgressBar.xml b/engine/doc/classes/TextureProgressBar.xml
index 346eb80e..ee26b765 100644
--- a/engine/doc/classes/TextureProgressBar.xml
+++ b/engine/doc/classes/TextureProgressBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureProgressBar" inherits="Range" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureProgressBar" inherits="Range" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Texture-based progress bar. Useful for loading screens and life or stamina bars.
 	</brief_description>
diff --git a/engine/doc/classes/TextureRect.xml b/engine/doc/classes/TextureRect.xml
index 818433fa..d7fcd1c7 100644
--- a/engine/doc/classes/TextureRect.xml
+++ b/engine/doc/classes/TextureRect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextureRect" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TextureRect" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control that displays a texture.
 	</brief_description>
@@ -51,7 +51,6 @@
 		</constant>
 		<constant name="STRETCH_TILE" value="1" enum="StretchMode">
 			Tile inside the node's bounding rectangle.
-			[b]Note:[/b] [constant STRETCH_TILE] mode is not supported for [member texture] set to an [AtlasTexture] with non-zero [member AtlasTexture.margin].
 		</constant>
 		<constant name="STRETCH_KEEP" value="2" enum="StretchMode">
 			The texture keeps its original size and stays in the bounding rectangle's top-left corner.
diff --git a/engine/doc/classes/Theme.xml b/engine/doc/classes/Theme.xml
index e4325dac..6dbc671c 100644
--- a/engine/doc/classes/Theme.xml
+++ b/engine/doc/classes/Theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Theme" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Theme" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A resource used for styling/skinning [Control]s and [Window]s.
 	</brief_description>
diff --git a/engine/doc/classes/ThemeDB.xml b/engine/doc/classes/ThemeDB.xml
index 76e9bcf9..106d011c 100644
--- a/engine/doc/classes/ThemeDB.xml
+++ b/engine/doc/classes/ThemeDB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ThemeDB" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ThemeDB" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton that provides access to static information about [Theme] resources used by the engine and by your project.
 	</brief_description>
diff --git a/engine/doc/classes/Thread.xml b/engine/doc/classes/Thread.xml
index 20979002..5004c420 100644
--- a/engine/doc/classes/Thread.xml
+++ b/engine/doc/classes/Thread.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Thread" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Thread" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A unit of execution in a process.
 	</brief_description>
diff --git a/engine/doc/classes/TileData.xml b/engine/doc/classes/TileData.xml
index 911af205..7537e18c 100644
--- a/engine/doc/classes/TileData.xml
+++ b/engine/doc/classes/TileData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileData" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileData" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Settings for a single tile in a [TileSet].
 	</brief_description>
diff --git a/engine/doc/classes/TileMap.xml b/engine/doc/classes/TileMap.xml
index 9c9ec181..1cd28254 100644
--- a/engine/doc/classes/TileMap.xml
+++ b/engine/doc/classes/TileMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileMap" inherits="Node2D" api_type="core" deprecated="Use multiple [TileMapLayer] nodes instead. To convert a TileMap to a set of TileMapLayer nodes, open the TileMap bottom panel with the node selected, click the toolbox icon in the top-right corner and choose &apos;Extract TileMap layers as individual TileMapLayer nodes&apos;." keywords="gridmap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileMap" inherits="Node2D" deprecated="Use multiple [TileMapLayer] nodes instead. To convert a TileMap to a set of TileMapLayer nodes, open the TileMap bottom panel with the node selected, click the toolbox icon in the top-right corner and choose &apos;Extract TileMap layers as individual TileMapLayer nodes&apos;." keywords="gridmap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node for 2D tile-based maps.
 	</brief_description>
diff --git a/engine/doc/classes/TileMapLayer.xml b/engine/doc/classes/TileMapLayer.xml
index 7a7ec48d..2e3913be 100644
--- a/engine/doc/classes/TileMapLayer.xml
+++ b/engine/doc/classes/TileMapLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileMapLayer" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileMapLayer" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Node for 2D tile-based maps.
 	</brief_description>
diff --git a/engine/doc/classes/TileMapPattern.xml b/engine/doc/classes/TileMapPattern.xml
index e01a8bad..f3fce248 100644
--- a/engine/doc/classes/TileMapPattern.xml
+++ b/engine/doc/classes/TileMapPattern.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileMapPattern" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileMapPattern" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds a pattern to be copied from or pasted into [TileMap]s.
 	</brief_description>
diff --git a/engine/doc/classes/TileSet.xml b/engine/doc/classes/TileSet.xml
index 37e28ac9..650151f5 100644
--- a/engine/doc/classes/TileSet.xml
+++ b/engine/doc/classes/TileSet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileSet" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileSet" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Tile library for tilemaps.
 	</brief_description>
@@ -92,13 +92,6 @@
 				Clears tile proxies pointing to invalid tiles.
 			</description>
 		</method>
-		<method name="clear_terrains">
-			<return type="void" />
-			<param index="0" name="terrain_set" type="int" />
-			<description>
-				Clears all terrain properties for the given terrain set.
-			</description>
-		</method>
 		<method name="clear_tile_proxies">
 			<return type="void" />
 			<description>
diff --git a/engine/doc/classes/TileSetAtlasSource.xml b/engine/doc/classes/TileSetAtlasSource.xml
index dc5de8f4..767868d1 100644
--- a/engine/doc/classes/TileSetAtlasSource.xml
+++ b/engine/doc/classes/TileSetAtlasSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileSetAtlasSource" inherits="TileSetSource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileSetAtlasSource" inherits="TileSetSource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exposes a 2D atlas texture as a set of tiles for a [TileSet] resource.
 	</brief_description>
diff --git a/engine/doc/classes/TileSetScenesCollectionSource.xml b/engine/doc/classes/TileSetScenesCollectionSource.xml
index 6c29c209..a3a0efd9 100644
--- a/engine/doc/classes/TileSetScenesCollectionSource.xml
+++ b/engine/doc/classes/TileSetScenesCollectionSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileSetScenesCollectionSource" inherits="TileSetSource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileSetScenesCollectionSource" inherits="TileSetSource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exposes a set of scenes as tiles for a [TileSet] resource.
 	</brief_description>
diff --git a/engine/doc/classes/TileSetSource.xml b/engine/doc/classes/TileSetSource.xml
index 5dcc74f1..70df2332 100644
--- a/engine/doc/classes/TileSetSource.xml
+++ b/engine/doc/classes/TileSetSource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TileSetSource" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TileSetSource" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exposes a set of tiles for a [TileSet] resource.
 	</brief_description>
diff --git a/engine/doc/classes/Time.xml b/engine/doc/classes/Time.xml
index 2540d945..bf002ec6 100644
--- a/engine/doc/classes/Time.xml
+++ b/engine/doc/classes/Time.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Time" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Time" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton for working with time data.
 	</brief_description>
diff --git a/engine/doc/classes/Timer.xml b/engine/doc/classes/Timer.xml
index cedf6b65..e6562523 100644
--- a/engine/doc/classes/Timer.xml
+++ b/engine/doc/classes/Timer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Timer" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Timer" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A countdown timer.
 	</brief_description>
diff --git a/engine/doc/classes/TorusMesh.xml b/engine/doc/classes/TorusMesh.xml
index 325886da..77aee1e0 100644
--- a/engine/doc/classes/TorusMesh.xml
+++ b/engine/doc/classes/TorusMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TorusMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TorusMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Class representing a torus [PrimitiveMesh].
 	</brief_description>
diff --git a/engine/doc/classes/TouchScreenButton.xml b/engine/doc/classes/TouchScreenButton.xml
index acc3fe30..1715ea6e 100644
--- a/engine/doc/classes/TouchScreenButton.xml
+++ b/engine/doc/classes/TouchScreenButton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TouchScreenButton" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TouchScreenButton" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Button for touch screen devices for gameplay use.
 	</brief_description>
diff --git a/engine/doc/classes/Transform2D.xml b/engine/doc/classes/Transform2D.xml
index 2d76180b..f6ad5054 100644
--- a/engine/doc/classes/Transform2D.xml
+++ b/engine/doc/classes/Transform2D.xml
@@ -8,7 +8,6 @@
 		The [member x] and [member y] axes form a 2×2 matrix, known as the transform's [b]basis[/b]. The length of each axis ([method Vector2.length]) influences the transform's scale, while the direction of all axes influence the rotation. Usually, both axes are perpendicular to one another. However, when you rotate one axis individually, the transform becomes skewed. Applying a skewed transform to a 2D sprite will make the sprite appear distorted.
 		For a general introduction, see the [url=$DOCS_URL/tutorials/math/matrices_and_transforms.html]Matrices and transforms[/url] tutorial.
 		[b]Note:[/b] Unlike [Transform3D], there is no 2D equivalent to the [Basis] type. All mentions of "basis" refer to the [member x] and [member y] components of [Transform2D].
-		[b]Note:[/b] In a boolean context, a Transform2D will evaluate to [code]false[/code] if it's equal to [constant IDENTITY]. Otherwise, a Transform2D will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Math documentation index">$DOCS_URL/tutorials/math/index.html</link>
diff --git a/engine/doc/classes/Transform3D.xml b/engine/doc/classes/Transform3D.xml
index c898645d..702509b0 100644
--- a/engine/doc/classes/Transform3D.xml
+++ b/engine/doc/classes/Transform3D.xml
@@ -7,7 +7,6 @@
 		The [Transform3D] built-in [Variant] type is a 3×4 matrix representing a transformation in 3D space. It contains a [Basis], which on its own can represent rotation, scale, and shear. Additionally, combined with its own [member origin], the transform can also represent a translation.
 		For a general introduction, see the [url=$DOCS_URL/tutorials/math/matrices_and_transforms.html]Matrices and transforms[/url] tutorial.
 		[b]Note:[/b] Godot uses a [url=https://en.wikipedia.org/wiki/Right-hand_rule]right-handed coordinate system[/url], which is a common standard. For directions, the convention for built-in types like [Camera3D] is for -Z to point forward (+X is right, +Y is up, and +Z is back). Other objects may use different direction conventions. For more information, see the [url=$DOCS_URL/tutorials/assets_pipeline/importing_3d_scenes/model_export_considerations.html#d-asset-direction-conventions]3D asset direction conventions[/url] tutorial.
-		[b]Note:[/b] In a boolean context, a Transform3D will evaluate to [code]false[/code] if it's equal to [constant IDENTITY]. Otherwise, a Transform3D will always evaluate to [code]true[/code].
 	</description>
 	<tutorials>
 		<link title="Math documentation index">$DOCS_URL/tutorials/math/index.html</link>
diff --git a/engine/doc/classes/Translation.xml b/engine/doc/classes/Translation.xml
index 8aef8294..af183960 100644
--- a/engine/doc/classes/Translation.xml
+++ b/engine/doc/classes/Translation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Translation" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Translation" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A language translation that maps a collection of strings to their individual translations.
 	</brief_description>
diff --git a/engine/doc/classes/TranslationDomain.xml b/engine/doc/classes/TranslationDomain.xml
index b126cbe3..aac39e3f 100644
--- a/engine/doc/classes/TranslationDomain.xml
+++ b/engine/doc/classes/TranslationDomain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TranslationDomain" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TranslationDomain" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A self-contained collection of [Translation] resources.
 	</brief_description>
diff --git a/engine/doc/classes/TranslationServer.xml b/engine/doc/classes/TranslationServer.xml
index 4ab7588c..fb2622cd 100644
--- a/engine/doc/classes/TranslationServer.xml
+++ b/engine/doc/classes/TranslationServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TranslationServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TranslationServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The server responsible for language translations.
 	</brief_description>
diff --git a/engine/doc/classes/Tree.xml b/engine/doc/classes/Tree.xml
index 354ad413..122ba1de 100644
--- a/engine/doc/classes/Tree.xml
+++ b/engine/doc/classes/Tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Tree" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Tree" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control used to show a set of internal [TreeItem]s in a hierarchical structure.
 	</brief_description>
@@ -40,7 +40,6 @@
 			<return type="void" />
 			<description>
 				Clears the tree. This removes all items.
-				Prints an error and does not allow clearing the tree if called during mouse selection.
 			</description>
 		</method>
 		<method name="create_item">
@@ -51,7 +50,6 @@
 				Creates an item in the tree and adds it as a child of [param parent], which can be either a valid [TreeItem] or [code]null[/code].
 				If [param parent] is [code]null[/code], the root item will be the parent, or the new item will be the root itself if the tree is empty.
 				The new item will be the [param index]-th child of parent, or it will be the last child if there are not enough siblings.
-				Prints an error and returns [code]null[/code] if called during mouse selection, or if the [param parent] does not belong to this tree.
 			</description>
 		</method>
 		<method name="deselect_all">
@@ -367,7 +365,6 @@
 		</member>
 		<member name="columns" type="int" setter="set_columns" getter="get_columns" default="1">
 			The number of columns.
-			Prints an error and does not allow setting the columns during mouse selection.
 		</member>
 		<member name="drop_mode_flags" type="int" setter="set_drop_mode_flags" getter="get_drop_mode_flags" default="0">
 			The drop mode as an OR combination of flags. See [enum DropModeFlags] constants. Once dropping is done, reverts to [constant DROP_MODE_DISABLED]. Setting this during [method Control._can_drop_data] is recommended.
@@ -543,9 +540,6 @@
 		<theme_item name="custom_button_font_highlight" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
 			Text [Color] for a [constant TreeItem.CELL_MODE_CUSTOM] mode cell when it's hovered.
 		</theme_item>
-		<theme_item name="drop_on_item_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
-			[Color] used to draw the highlight outline when dragging items that can only be dropped "on" other items.
-		</theme_item>
 		<theme_item name="drop_position_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
 			[Color] used to draw possible drop locations. See [enum DropModeFlags] constants for further description of drop locations.
 		</theme_item>
diff --git a/engine/doc/classes/TreeItem.xml b/engine/doc/classes/TreeItem.xml
index 0fc9275e..f0c20fae 100644
--- a/engine/doc/classes/TreeItem.xml
+++ b/engine/doc/classes/TreeItem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TreeItem" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TreeItem" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An internal control for a single item inside [Tree].
 	</brief_description>
@@ -94,13 +94,6 @@
 				Returns the text autowrap mode in the given [param column]. By default it is [constant TextServer.AUTOWRAP_OFF].
 			</description>
 		</method>
-		<method name="get_autowrap_trim_flags" qualifiers="const">
-			<return type="int" enum="TextServer.LineBreakFlag" is_bitfield="true" />
-			<param index="0" name="column" type="int" />
-			<description>
-				Returns the autowrap trim flags for the given [param column]. By default, both [constant TextServer.BREAK_TRIM_START_EDGE_SPACES] and [constant TextServer.BREAK_TRIM_END_EDGE_SPACES] are enabled.
-			</description>
-		</method>
 		<method name="get_button" qualifiers="const">
 			<return type="Texture2D" />
 			<param index="0" name="column" type="int" />
@@ -418,12 +411,6 @@
 				Returns the [Tree] that owns this TreeItem.
 			</description>
 		</method>
-		<method name="is_accepting_children" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if this [TreeItem] is allowed to accept children.
-			</description>
-		</method>
 		<method name="is_any_collapsed">
 			<return type="bool" />
 			<param index="0" name="only_visible" type="bool" default="false" />
@@ -534,13 +521,6 @@
 				Selects the given [param column].
 			</description>
 		</method>
-		<method name="set_accept_children">
-			<return type="void" />
-			<param index="0" name="allowed" type="bool" />
-			<description>
-				Sets [TreeItem]'s ability to accept children.
-			</description>
-		</method>
 		<method name="set_auto_translate_mode">
 			<return type="void" />
 			<param index="0" name="column" type="int" />
@@ -558,14 +538,6 @@
 				Sets the autowrap mode in the given [param column]. If set to something other than [constant TextServer.AUTOWRAP_OFF], the text gets wrapped inside the cell's bounding rectangle.
 			</description>
 		</method>
-		<method name="set_autowrap_trim_flags">
-			<return type="void" />
-			<param index="0" name="column" type="int" />
-			<param index="1" name="flags" type="int" enum="TextServer.LineBreakFlag" is_bitfield="true" />
-			<description>
-				Sets the autowrap trim flags for the given [param column]. These flags control whether leading and trailing spaces are trimmed on wrapped lines. Set to [code]0[/code] to disable all trimming.
-			</description>
-		</method>
 		<method name="set_button">
 			<return type="void" />
 			<param index="0" name="column" type="int" />
diff --git a/engine/doc/classes/TriangleMesh.xml b/engine/doc/classes/TriangleMesh.xml
index 8d15e033..dc4e688b 100644
--- a/engine/doc/classes/TriangleMesh.xml
+++ b/engine/doc/classes/TriangleMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TriangleMesh" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TriangleMesh" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Triangle geometry for efficient, physicsless intersection queries.
 	</brief_description>
diff --git a/engine/doc/classes/TubeTrailMesh.xml b/engine/doc/classes/TubeTrailMesh.xml
index 4717b823..4408280f 100644
--- a/engine/doc/classes/TubeTrailMesh.xml
+++ b/engine/doc/classes/TubeTrailMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TubeTrailMesh" inherits="PrimitiveMesh" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TubeTrailMesh" inherits="PrimitiveMesh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents a straight tube-shaped [PrimitiveMesh] with variable width.
 	</brief_description>
diff --git a/engine/doc/classes/Tween.xml b/engine/doc/classes/Tween.xml
index 91b04858..f7084898 100644
--- a/engine/doc/classes/Tween.xml
+++ b/engine/doc/classes/Tween.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Tween" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Tween" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Lightweight object used for general-purpose animation via script, using [Tweener]s.
 	</brief_description>
@@ -7,7 +7,7 @@
 		Tweens are mostly useful for animations requiring a numerical property to be interpolated over a range of values. The name [i]tween[/i] comes from [i]in-betweening[/i], an animation technique where you specify [i]keyframes[/i] and the computer interpolates the frames that appear between them. Animating something with a [Tween] is called tweening.
 		[Tween] is more suited than [AnimationPlayer] for animations where you don't know the final values in advance. For example, interpolating a dynamically-chosen camera zoom value is best done with a [Tween]; it would be difficult to do the same thing with an [AnimationPlayer] node. Tweens are also more light-weight than [AnimationPlayer], so they are very much suited for simple animations or general tasks that don't require visual tweaking provided by the editor. They can be used in a "fire-and-forget" manner for some logic that normally would be done by code. You can e.g. make something shoot periodically by using a looped [CallbackTweener] with a delay.
 		A [Tween] can be created by using either [method SceneTree.create_tween] or [method Node.create_tween]. [Tween]s created manually (i.e. by using [code]Tween.new()[/code]) are invalid and can't be used for tweening values.
-		A tween animation is created by adding [Tweener]s to the [Tween] object, using [method tween_property], [method tween_interval], [method tween_callback], [method tween_method], [method tween_subtween], or [method tween_await]:
+		A tween animation is created by adding [Tweener]s to the [Tween] object, using [method tween_property], [method tween_interval], [method tween_callback] or [method tween_method]:
 		[codeblocks]
 		[gdscript]
 		var tween = get_tree().create_tween()
@@ -144,12 +144,6 @@
 				[b]Note:[/b] As it results from accumulating frame deltas, the time returned after the [Tween] has finished animating will be slightly greater than the actual [Tween] duration.
 			</description>
 		</method>
-		<method name="has_tweeners" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if any [Tweener] has been added to the [Tween] and the [Tween] is valid. Useful when tweeners are added dynamically and the tween can end up empty. Killing an empty tween before it starts will prevent errors.
-			</description>
-		</method>
 		<method name="interpolate_value" qualifiers="static">
 			<return type="Variant" />
 			<param index="0" name="initial_value" type="Variant" />
@@ -323,37 +317,6 @@
 				[b]Note:[/b] If a Tween is stopped and not bound to any node, it will exist indefinitely until manually started or invalidated. If you lose a reference to such Tween, you can retrieve it using [method SceneTree.get_processed_tweens].
 			</description>
 		</method>
-		<method name="tween_await">
-			<return type="AwaitTweener" />
-			<param index="0" name="signal" type="Signal" />
-			<description>
-				Creates and appends an [AwaitTweener]. This method can be used to await a signal to be emitted and create asynchronous animations or cutscenes.
-				The animation will not progress to the next step until the awaited signal is emitted or the connection becomes invalid (e.g. as a result of freeing the target object). If you know that the emission may not happen, use [method AwaitTweener.set_timeout].
-				[b]Note:[/b] The awaited signal should be emitted during the step when [AwaitTweener] is active.
-				[b]Example:[/b] An object launches itself and explodes upon collision or after 4 seconds.
-				[codeblock]
-				var tween = create_tween()
-				tween.tween_callback(launch)
-				tween.tween_await(collided).set_timeout(4.0)
-				tween.tween_callback(explode)
-				[/codeblock]
-				[b]Example:[/b] A character walks to a specific point, says some lines and walks back when the player closes the message box.
-				[codeblock]
-				var tween = create_tween()
-				tween.tween_callback(walk_to.bind(600.0))
-				tween.tween_await(destination_reached)
-				tween.tween_callback(say_dialogue.bind("Good day, sir!"))
-				tween.tween_await(dialogue_closed)
-				tween.tween_callback(walk_to.bind(0.0))
-				[/codeblock]
-				[b]Note:[/b] If you are awaiting a signal from a callback called in the same [Tween], make sure the signal is emitted [i]after[/i] the await starts. If it can't be reasonably guaranteed, you can await and emit in the same step:
-				[codeblock]
-				var tween = create_tween()
-				tween.tween_await(signal)
-				tween.parallel().tween_callback(method_that_emits_signal)
-				[/codeblock]
-			</description>
-		</method>
 		<method name="tween_callback">
 			<return type="CallbackTweener" />
 			<param index="0" name="callback" type="Callable" />
diff --git a/engine/doc/classes/Tweener.xml b/engine/doc/classes/Tweener.xml
index af8d7535..88f5f997 100644
--- a/engine/doc/classes/Tweener.xml
+++ b/engine/doc/classes/Tweener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Tweener" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Tweener" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract class for all Tweeners used by [Tween].
 	</brief_description>
diff --git a/engine/doc/classes/TwoBoneIK3D.xml b/engine/doc/classes/TwoBoneIK3D.xml
index d951466b..6beed28d 100644
--- a/engine/doc/classes/TwoBoneIK3D.xml
+++ b/engine/doc/classes/TwoBoneIK3D.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TwoBoneIK3D" inherits="IKModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="TwoBoneIK3D" inherits="IKModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Rotation based intersection of two circles inverse kinematics solver.
 	</brief_description>
 	<description>
 		This [IKModifier3D] requires a pole target. It provides deterministic results by constructing a plane from each joint and pole target and finding the intersection of two circles (disks in 3D).
 		This IK can handle twist by setting the pole direction. If there are more than one bone between each set bone, their rotations are ignored, and the straight line connecting the root-middle and middle-end joints are treated as virtual bones.
-		[b]Note:[/b] All the methods in this class take an [code]index[/code] parameter. This parameter specifies which setting list entry to return if the IK has multiple entries (e.g. [code]settings/&lt;index&gt;/root_bone_name[/code]).
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/doc/classes/UDPServer.xml b/engine/doc/classes/UDPServer.xml
index b2967742..48afa344 100644
--- a/engine/doc/classes/UDPServer.xml
+++ b/engine/doc/classes/UDPServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UDPServer" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="UDPServer" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class to implement a UDP server.
 	</brief_description>
diff --git a/engine/doc/classes/UDSServer.xml b/engine/doc/classes/UDSServer.xml
index 6b63cb66..f22b3820 100644
--- a/engine/doc/classes/UDSServer.xml
+++ b/engine/doc/classes/UDSServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UDSServer" inherits="SocketServer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="UDSServer" inherits="SocketServer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A Unix Domain Socket (UDS) server.
 	</brief_description>
diff --git a/engine/doc/classes/UndoRedo.xml b/engine/doc/classes/UndoRedo.xml
index 42125f8c..c5651c1e 100644
--- a/engine/doc/classes/UndoRedo.xml
+++ b/engine/doc/classes/UndoRedo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UndoRedo" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="UndoRedo" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a high-level interface for implementing undo and redo operations.
 	</brief_description>
@@ -241,7 +241,7 @@
 		<method name="redo">
 			<return type="bool" />
 			<description>
-				Redo the last action. Returns [code]false[/code] if there was no action to redo.
+				Redo the last action.
 			</description>
 		</method>
 		<method name="start_force_keep_in_merge_ends">
@@ -253,7 +253,7 @@
 		<method name="undo">
 			<return type="bool" />
 			<description>
-				Undo the last action. Returns [code]false[/code] if there was no action to undo.
+				Undo the last action.
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/UniformSetCacheRD.xml b/engine/doc/classes/UniformSetCacheRD.xml
index 8a20de10..2a67e97e 100644
--- a/engine/doc/classes/UniformSetCacheRD.xml
+++ b/engine/doc/classes/UniformSetCacheRD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UniformSetCacheRD" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="UniformSetCacheRD" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Uniform set cache manager for Rendering Device based renderers.
 	</brief_description>
diff --git a/engine/doc/classes/VBoxContainer.xml b/engine/doc/classes/VBoxContainer.xml
index a0716532..62484ecd 100644
--- a/engine/doc/classes/VBoxContainer.xml
+++ b/engine/doc/classes/VBoxContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VBoxContainer" inherits="BoxContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VBoxContainer" inherits="BoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls vertically.
 	</brief_description>
diff --git a/engine/doc/classes/VFlowContainer.xml b/engine/doc/classes/VFlowContainer.xml
index 11778eb8..5c896da7 100644
--- a/engine/doc/classes/VFlowContainer.xml
+++ b/engine/doc/classes/VFlowContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VFlowContainer" inherits="FlowContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VFlowContainer" inherits="FlowContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that arranges its child controls vertically and wraps them around at the borders.
 	</brief_description>
diff --git a/engine/doc/classes/VScrollBar.xml b/engine/doc/classes/VScrollBar.xml
index f332696e..b726b059 100644
--- a/engine/doc/classes/VScrollBar.xml
+++ b/engine/doc/classes/VScrollBar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VScrollBar" inherits="ScrollBar" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VScrollBar" inherits="ScrollBar" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vertical scrollbar that goes from top (min) to bottom (max).
 	</brief_description>
diff --git a/engine/doc/classes/VSeparator.xml b/engine/doc/classes/VSeparator.xml
index 47adf2c3..57d1c9e7 100644
--- a/engine/doc/classes/VSeparator.xml
+++ b/engine/doc/classes/VSeparator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VSeparator" inherits="Separator" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VSeparator" inherits="Separator" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vertical line used for separating other controls.
 	</brief_description>
diff --git a/engine/doc/classes/VSlider.xml b/engine/doc/classes/VSlider.xml
index 7314fe79..eea5ba50 100644
--- a/engine/doc/classes/VSlider.xml
+++ b/engine/doc/classes/VSlider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VSlider" inherits="Slider" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VSlider" inherits="Slider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vertical slider that goes from bottom (min) to top (max).
 	</brief_description>
diff --git a/engine/doc/classes/VSplitContainer.xml b/engine/doc/classes/VSplitContainer.xml
index 53b49c3f..5932ca73 100644
--- a/engine/doc/classes/VSplitContainer.xml
+++ b/engine/doc/classes/VSplitContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VSplitContainer" inherits="SplitContainer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VSplitContainer" inherits="SplitContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A container that splits two child controls vertically and provides a grabber for adjusting the split ratio.
 	</brief_description>
diff --git a/engine/doc/classes/VehicleBody3D.xml b/engine/doc/classes/VehicleBody3D.xml
index 8191b46f..968acab2 100644
--- a/engine/doc/classes/VehicleBody3D.xml
+++ b/engine/doc/classes/VehicleBody3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VehicleBody3D" inherits="RigidBody3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VehicleBody3D" inherits="RigidBody3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body that simulates the behavior of a car.
 	</brief_description>
diff --git a/engine/doc/classes/VehicleWheel3D.xml b/engine/doc/classes/VehicleWheel3D.xml
index 84ec28f6..dee096a5 100644
--- a/engine/doc/classes/VehicleWheel3D.xml
+++ b/engine/doc/classes/VehicleWheel3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VehicleWheel3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VehicleWheel3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D physics body for a [VehicleBody3D] that simulates the behavior of a wheel.
 	</brief_description>
diff --git a/engine/doc/classes/VideoStream.xml b/engine/doc/classes/VideoStream.xml
index f86b75f4..c7974dc2 100644
--- a/engine/doc/classes/VideoStream.xml
+++ b/engine/doc/classes/VideoStream.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VideoStream" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VideoStream" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base resource for video streams.
 	</brief_description>
diff --git a/engine/doc/classes/VideoStreamPlayback.xml b/engine/doc/classes/VideoStreamPlayback.xml
index 825f9b9e..05f641e7 100644
--- a/engine/doc/classes/VideoStreamPlayback.xml
+++ b/engine/doc/classes/VideoStreamPlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VideoStreamPlayback" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VideoStreamPlayback" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Internal class used by [VideoStream] to manage playback state when played from a [VideoStreamPlayer].
 	</brief_description>
diff --git a/engine/doc/classes/VideoStreamPlayer.xml b/engine/doc/classes/VideoStreamPlayer.xml
index 27864807..01bcca35 100644
--- a/engine/doc/classes/VideoStreamPlayer.xml
+++ b/engine/doc/classes/VideoStreamPlayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VideoStreamPlayer" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VideoStreamPlayer" inherits="Control" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A control used for video playback.
 	</brief_description>
diff --git a/engine/doc/classes/Viewport.xml b/engine/doc/classes/Viewport.xml
index e8641ada..e2449515 100644
--- a/engine/doc/classes/Viewport.xml
+++ b/engine/doc/classes/Viewport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Viewport" inherits="Node" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Viewport" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Abstract base class for viewports. Encapsulates drawing and interaction with a game world.
 	</brief_description>
@@ -371,7 +371,6 @@
 		<member name="mesh_lod_threshold" type="float" setter="set_mesh_lod_threshold" getter="get_mesh_lod_threshold" default="1.0">
 			The automatic LOD bias to use for meshes rendered within the [Viewport] (this is analogous to [member ReflectionProbe.mesh_lod_threshold]). Higher values will use less detailed versions of meshes that have LOD variations generated. If set to [code]0.0[/code], automatic LOD is disabled. Increase [member mesh_lod_threshold] to improve performance at the cost of geometry detail.
 			To control this property on the root viewport, set the [member ProjectSettings.rendering/mesh_lod/lod_change/threshold_pixels] project setting.
-			[b]Note:[/b] Depending on the mesh's attributes (vertex colors, blend shapes, ...), a mesh may have fewer levels of LOD generated to avoid visible distortion of the mesh once it is affected by vertex colors or blend shapes. Meshes with a very low vertex count will also not have any LODs generated, which means this setting will not affect them at all. In general, this setting makes the largest impact on static meshes with a high vertex count.
 			[b]Note:[/b] [member mesh_lod_threshold] does not affect [GeometryInstance3D] visibility ranges (also known as "manual" LOD or hierarchical LOD).
 		</member>
 		<member name="msaa_2d" type="int" setter="set_msaa_2d" getter="get_msaa_2d" enum="Viewport.MSAA" default="0">
@@ -574,11 +573,7 @@
 			More information: [url=https://developer.apple.com/documentation/metalfx]MetalFX[/url].
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
-		<constant name="SCALING_3D_MODE_NEAREST" value="5" enum="Scaling3DMode">
-			Use nearest-neighbor filtering for the viewport's 3D buffer. This looks crisper than [constant SCALING_3D_MODE_BILINEAR] and has no additional rendering cost. The amount of scaling can be set using [member scaling_3d_scale]. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
-			[b]Note:[/b] When using the [b]Nearest[/b] scaling mode, to avoid uneven pixel scaling, it's highly recommended to use a value equal to an integer divisor with a dividend of [code]1[/code]. For example, it's best to use a scale of [code]0.5[/code] (1/2), [code]0.3333[/code] (1/3), [code]0.25[/code] (1/4), [code]0.2[/code] (1/5), and so on.
-		</constant>
-		<constant name="SCALING_3D_MODE_MAX" value="6" enum="Scaling3DMode">
+		<constant name="SCALING_3D_MODE_MAX" value="5" enum="Scaling3DMode">
 			Represents the size of the [enum Scaling3DMode] enum.
 		</constant>
 		<constant name="MSAA_DISABLED" value="0" enum="MSAA">
@@ -667,7 +662,6 @@
 		<constant name="DEBUG_DRAW_WIREFRAME" value="4" enum="DebugDraw">
 			Objects are displayed as wireframe models.
 			[b]Note:[/b] [method RenderingServer.set_debug_generate_wireframes] must be called before loading any meshes for wireframes to be visible when using the Compatibility renderer.
-			[b]Note:[/b] In the Compatibility renderer, backfaces are always visible when using wireframe rendering. In the Forward+ and Mobile renderers, wireframes follow the material's backface culling properties instead.
 		</constant>
 		<constant name="DEBUG_DRAW_NORMAL_BUFFER" value="5" enum="DebugDraw">
 			Objects are displayed without lighting information and their textures replaced by normal mapping.
@@ -772,10 +766,7 @@
 			The texture filter reads from the nearest pixel and blends between the nearest 2 mipmaps (or uses the nearest mipmap if [member ProjectSettings.rendering/textures/default_filters/use_nearest_mipmap_filter] is [code]true[/code]). This makes the texture look pixelated from up close, and smooth from a distance.
 			Use this for non-pixel art textures that may be viewed at a low scale (e.g. due to [Camera2D] zoom or sprite scaling), as mipmaps are important to smooth out pixels that are smaller than on-screen pixels.
 		</constant>
-		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE" value="4" enum="DefaultCanvasItemTextureFilter">
-			The [Viewport] will inherit the filter from its parent [CanvasItem] or [Viewport].
-		</constant>
-		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_MAX" value="5" enum="DefaultCanvasItemTextureFilter">
+		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_MAX" value="4" enum="DefaultCanvasItemTextureFilter">
 			Represents the size of the [enum DefaultCanvasItemTextureFilter] enum.
 		</constant>
 		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED" value="0" enum="DefaultCanvasItemTextureRepeat">
@@ -787,10 +778,7 @@
 		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR" value="2" enum="DefaultCanvasItemTextureRepeat">
 			Flip the texture when repeating so that the edge lines up instead of abruptly changing.
 		</constant>
-		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE" value="3" enum="DefaultCanvasItemTextureRepeat">
-			The [Viewport] will inherit the repeat mode from its parent [CanvasItem] or [Viewport].
-		</constant>
-		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MAX" value="4" enum="DefaultCanvasItemTextureRepeat">
+		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MAX" value="3" enum="DefaultCanvasItemTextureRepeat">
 			Represents the size of the [enum DefaultCanvasItemTextureRepeat] enum.
 		</constant>
 		<constant name="SDF_OVERSIZE_100_PERCENT" value="0" enum="SDFOversize">
diff --git a/engine/doc/classes/ViewportTexture.xml b/engine/doc/classes/ViewportTexture.xml
index 135b1375..0b6963b0 100644
--- a/engine/doc/classes/ViewportTexture.xml
+++ b/engine/doc/classes/ViewportTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ViewportTexture" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="ViewportTexture" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides the content of a [Viewport] as a dynamic texture.
 	</brief_description>
diff --git a/engine/doc/classes/VirtualJoystick.xml b/engine/doc/classes/VirtualJoystick.xml
deleted file mode 100644
index 4538c0ac..00000000
--- a/engine/doc/classes/VirtualJoystick.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="VirtualJoystick" inherits="Control" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
-	<brief_description>
-		A virtual joystick control for touchscreen devices.
-	</brief_description>
-	<description>
-		A customizable on-screen joystick control designed for touchscreen devices. It allows users to provide directional input by dragging a virtual tip within a defined circular area.
-		This control can simulate directional actions (see [member action_up], [member action_down], [member action_left], and [member action_right]), which are triggered when the joystick is moved in the corresponding directions.
-	</description>
-	<tutorials>
-	</tutorials>
-	<members>
-		<member name="action_down" type="StringName" setter="set_action_down" getter="get_action_down" default="&amp;&quot;ui_down&quot;">
-			The action to trigger when the joystick is moved down.
-		</member>
-		<member name="action_left" type="StringName" setter="set_action_left" getter="get_action_left" default="&amp;&quot;ui_left&quot;">
-			The action to trigger when the joystick is moved left.
-		</member>
-		<member name="action_right" type="StringName" setter="set_action_right" getter="get_action_right" default="&amp;&quot;ui_right&quot;">
-			The action to trigger when the joystick is moved right.
-		</member>
-		<member name="action_up" type="StringName" setter="set_action_up" getter="get_action_up" default="&amp;&quot;ui_up&quot;">
-			The action to trigger when the joystick is moved up.
-		</member>
-		<member name="clampzone_ratio" type="float" setter="set_clampzone_ratio" getter="get_clampzone_ratio" default="1.0">
-			The multiplier applied to the joystick's radius that defines the clamp zone.
-			This zone limits how far the joystick tip can move from its center before being clamped.
-			A value of [code]1.0[/code] means the tip can move up to the edge of the joystick's visual size.
-			In [constant JOYSTICK_FOLLOWING] mode, this radius also determines how far the finger can move before the joystick base starts following the touch input.
-		</member>
-		<member name="deadzone_ratio" type="float" setter="set_deadzone_ratio" getter="get_deadzone_ratio" default="0.0">
-			The ratio of the joystick size that defines the joystick deadzone. The joystick tip must move beyond this ratio before being considered active.
-			This deadzone is applied before triggering input actions and affects the joystick's input vector and all related signals.
-			Note that input actions may also define their own deadzones in the InputMap. If both are set, the joystick deadzone is applied first, followed by the action's deadzone.
-			By default, this value is [code]0.0[/code], meaning the joystick does not apply its own deadzone and relies entirely on the InputMap action deadzones.
-		</member>
-		<member name="initial_offset_ratio" type="Vector2" setter="set_initial_offset_ratio" getter="get_initial_offset_ratio" default="Vector2(0.5, 0.5)">
-			The initial position of the joystick as a ratio of the control's size. [code](0, 0)[/code] is top-left and [code](1, 1)[/code] is bottom-right.
-		</member>
-		<member name="joystick_mode" type="int" setter="set_joystick_mode" getter="get_joystick_mode" enum="VirtualJoystick.JoystickMode" default="0">
-			The joystick mode to use.
-		</member>
-		<member name="joystick_size" type="float" setter="set_joystick_size" getter="get_joystick_size" default="100.0">
-			The size of the joystick in pixels.
-		</member>
-		<member name="tip_size" type="float" setter="set_tip_size" getter="get_tip_size" default="50.0">
-			The size of the joystick tip in pixels.
-		</member>
-		<member name="visibility_mode" type="int" setter="set_visibility_mode" getter="get_visibility_mode" enum="VirtualJoystick.VisibilityMode" default="0">
-			The visibility mode to use.
-		</member>
-	</members>
-	<signals>
-		<signal name="flick_canceled">
-			<description>
-				Emitted when the tip enters the deadzone after being outside of it.
-			</description>
-		</signal>
-		<signal name="flicked">
-			<param index="0" name="input_vector" type="Vector2" />
-			<description>
-				Emitted when the tip moved outside the deadzone and the joystick is released. The [param input_vector] contains the last input direction and strength before release. Its length is between [code]0.0[/code] and [code]1.0[/code].
-			</description>
-		</signal>
-		<signal name="pressed">
-			<description>
-				Emitted when the joystick is pressed.
-			</description>
-		</signal>
-		<signal name="released">
-			<param index="0" name="input_vector" type="Vector2" />
-			<description>
-				Emitted when the joystick is released. The [param input_vector] is the final input direction and strength, with a length between [code]0.0[/code] and [code]1.0[/code].
-			</description>
-		</signal>
-		<signal name="tapped">
-			<description>
-				Emitted when the joystick is released without moving the tip.
-			</description>
-		</signal>
-	</signals>
-	<constants>
-		<constant name="JOYSTICK_FIXED" value="0" enum="JoystickMode">
-			The joystick doesn't move.
-		</constant>
-		<constant name="JOYSTICK_DYNAMIC" value="1" enum="JoystickMode">
-			The joystick is moved to the initial touch position as long as it's within the joystick's bounds. It moves back to its original position when released.
-		</constant>
-		<constant name="JOYSTICK_FOLLOWING" value="2" enum="JoystickMode">
-			The joystick is moved to the initial touch position as long as it's within the joystick's bounds. It will follow the touch input if it goes outside the joystick's range. It moves back to its original position when released.
-		</constant>
-		<constant name="VISIBILITY_ALWAYS" value="0" enum="VisibilityMode">
-			The joystick is always visible.
-		</constant>
-		<constant name="VISIBILITY_WHEN_TOUCHED" value="1" enum="VisibilityMode">
-			The joystick is only visible when being touched.
-		</constant>
-	</constants>
-	<theme_items>
-		<theme_item name="normal_joystick" data_type="style" type="StyleBox">
-			Base joystick [StyleBox].
-		</theme_item>
-		<theme_item name="normal_tip" data_type="style" type="StyleBox">
-			Tip joystick [StyleBox].
-		</theme_item>
-		<theme_item name="pressed_joystick" data_type="style" type="StyleBox">
-			Base joystick [StyleBox] when pressed.
-		</theme_item>
-		<theme_item name="pressed_tip" data_type="style" type="StyleBox">
-			Tip joystick [StyleBox] when pressed.
-		</theme_item>
-	</theme_items>
-</class>
diff --git a/engine/doc/classes/VisibleOnScreenEnabler2D.xml b/engine/doc/classes/VisibleOnScreenEnabler2D.xml
index 7e2a5bdf..75987fa2 100644
--- a/engine/doc/classes/VisibleOnScreenEnabler2D.xml
+++ b/engine/doc/classes/VisibleOnScreenEnabler2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibleOnScreenEnabler2D" inherits="VisibleOnScreenNotifier2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisibleOnScreenEnabler2D" inherits="VisibleOnScreenNotifier2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A rectangular region of 2D space that, when visible on screen, enables a target node.
 	</brief_description>
diff --git a/engine/doc/classes/VisibleOnScreenEnabler3D.xml b/engine/doc/classes/VisibleOnScreenEnabler3D.xml
index 93c6892a..ff7547f7 100644
--- a/engine/doc/classes/VisibleOnScreenEnabler3D.xml
+++ b/engine/doc/classes/VisibleOnScreenEnabler3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibleOnScreenEnabler3D" inherits="VisibleOnScreenNotifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisibleOnScreenEnabler3D" inherits="VisibleOnScreenNotifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A box-shaped region of 3D space that, when visible on screen, enables a target node.
 	</brief_description>
diff --git a/engine/doc/classes/VisibleOnScreenNotifier2D.xml b/engine/doc/classes/VisibleOnScreenNotifier2D.xml
index aa3e97bc..01ab440d 100644
--- a/engine/doc/classes/VisibleOnScreenNotifier2D.xml
+++ b/engine/doc/classes/VisibleOnScreenNotifier2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibleOnScreenNotifier2D" inherits="Node2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisibleOnScreenNotifier2D" inherits="Node2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A rectangular region of 2D space that detects whether it is visible on screen.
 	</brief_description>
diff --git a/engine/doc/classes/VisibleOnScreenNotifier3D.xml b/engine/doc/classes/VisibleOnScreenNotifier3D.xml
index 581adc46..ce8a4b39 100644
--- a/engine/doc/classes/VisibleOnScreenNotifier3D.xml
+++ b/engine/doc/classes/VisibleOnScreenNotifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibleOnScreenNotifier3D" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisibleOnScreenNotifier3D" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A box-shaped region of 3D space that detects whether it is visible on screen.
 	</brief_description>
diff --git a/engine/doc/classes/VisualInstance3D.xml b/engine/doc/classes/VisualInstance3D.xml
index fa6f2212..e67934f5 100644
--- a/engine/doc/classes/VisualInstance3D.xml
+++ b/engine/doc/classes/VisualInstance3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualInstance3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualInstance3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Parent of all visual 3D nodes.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShader.xml b/engine/doc/classes/VisualShader.xml
index dae8019e..745a7aa6 100644
--- a/engine/doc/classes/VisualShader.xml
+++ b/engine/doc/classes/VisualShader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShader" inherits="Shader" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShader" inherits="Shader" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A custom shader program with a visual editor.
 	</brief_description>
@@ -222,10 +222,7 @@
 		<constant name="TYPE_FOG" value="9" enum="Type">
 			A compute shader that runs for each froxel of the volumetric fog map.
 		</constant>
-		<constant name="TYPE_TEXTURE_BLIT" value="10" enum="Type">
-			A shader used to process blit calls to a DrawableTexture.
-		</constant>
-		<constant name="TYPE_MAX" value="11" enum="Type">
+		<constant name="TYPE_MAX" value="10" enum="Type">
 			Represents the size of the [enum Type] enum.
 		</constant>
 		<constant name="VARYING_MODE_VERTEX_TO_FRAG_LIGHT" value="0" enum="VaryingMode">
diff --git a/engine/doc/classes/VisualShaderNode.xml b/engine/doc/classes/VisualShaderNode.xml
index 75a024ee..5b82d202 100644
--- a/engine/doc/classes/VisualShaderNode.xml
+++ b/engine/doc/classes/VisualShaderNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNode" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNode" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for [VisualShader] nodes. Not related to scene nodes.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeBillboard.xml b/engine/doc/classes/VisualShaderNodeBillboard.xml
index c38f8b89..a81b09e9 100644
--- a/engine/doc/classes/VisualShaderNodeBillboard.xml
+++ b/engine/doc/classes/VisualShaderNodeBillboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeBillboard" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeBillboard" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that controls how the object faces the camera to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeBooleanConstant.xml b/engine/doc/classes/VisualShaderNodeBooleanConstant.xml
index fd536c8a..d2a7ff3d 100644
--- a/engine/doc/classes/VisualShaderNodeBooleanConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeBooleanConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeBooleanConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeBooleanConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A boolean constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeBooleanParameter.xml b/engine/doc/classes/VisualShaderNodeBooleanParameter.xml
index ff19c294..ef64c094 100644
--- a/engine/doc/classes/VisualShaderNodeBooleanParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeBooleanParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeBooleanParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeBooleanParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A boolean parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeClamp.xml b/engine/doc/classes/VisualShaderNodeClamp.xml
index ed8f9b5f..56100f17 100644
--- a/engine/doc/classes/VisualShaderNodeClamp.xml
+++ b/engine/doc/classes/VisualShaderNodeClamp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeClamp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeClamp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Clamps a value within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeColorConstant.xml b/engine/doc/classes/VisualShaderNodeColorConstant.xml
index 51a9f52f..3ed754cc 100644
--- a/engine/doc/classes/VisualShaderNodeColorConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeColorConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeColorConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeColorConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Color] constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeColorFunc.xml b/engine/doc/classes/VisualShaderNodeColorFunc.xml
index 21947ac6..e1f66387 100644
--- a/engine/doc/classes/VisualShaderNodeColorFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeColorFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeColorFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeColorFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Color] function to be used within the visual shader graph.
 	</brief_description>
@@ -43,10 +43,11 @@
 		<constant name="FUNC_LINEAR_TO_SRGB" value="4" enum="Function">
 			Converts color from linear encoding to nonlinear sRGB encoding using the following formula:
 			[codeblock]
+			vec3 c = clamp(c, vec3(0.0), vec3(1.0));
 			const vec3 a = vec3(0.055f);
 			return mix((vec3(1.0f) + a) * pow(c.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * c.rgb, lessThan(c.rgb, vec3(0.0031308f)));
 			[/codeblock]
-			The Compatibility renderer uses a simpler formula that may produce undefined behavior with negative input values:
+			The Compatibility renderer uses a simpler formula:
 			[codeblock]
 			vec3 c = input;
 			return max(vec3(1.055) * pow(c, vec3(0.416666667)) - vec3(0.055), vec3(0.0));
@@ -58,7 +59,7 @@
 			vec3 c = input;
 			return mix(pow((c.rgb + vec3(0.055)) * (1.0 / (1.0 + 0.055)), vec3(2.4)), c.rgb * (1.0 / 12.92), lessThan(c.rgb, vec3(0.04045)));
 			[/codeblock]
-			The Compatibility renderer uses a simpler formula that behaves poorly with negative input values:
+			The Compatibility renderer uses a simpler formula:
 			[codeblock]
 			vec3 c = input;
 			return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878);
diff --git a/engine/doc/classes/VisualShaderNodeColorOp.xml b/engine/doc/classes/VisualShaderNodeColorOp.xml
index eba02845..bb7f9d68 100644
--- a/engine/doc/classes/VisualShaderNodeColorOp.xml
+++ b/engine/doc/classes/VisualShaderNodeColorOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeColorOp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeColorOp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Color] operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeColorParameter.xml b/engine/doc/classes/VisualShaderNodeColorParameter.xml
index 545eb983..49ceec26 100644
--- a/engine/doc/classes/VisualShaderNodeColorParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeColorParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeColorParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeColorParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Color] parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeComment.xml b/engine/doc/classes/VisualShaderNodeComment.xml
index 9e65a521..28496a71 100644
--- a/engine/doc/classes/VisualShaderNodeComment.xml
+++ b/engine/doc/classes/VisualShaderNodeComment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeComment" inherits="VisualShaderNodeFrame" api_type="core" deprecated="This class has no function anymore and only exists for compatibility." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeComment" inherits="VisualShaderNodeFrame" deprecated="This class has no function anymore and only exists for compatibility." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Only exists for compatibility. Use [VisualShaderNodeFrame] as a replacement.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCompare.xml b/engine/doc/classes/VisualShaderNodeCompare.xml
index 489dbb82..63f51f2f 100644
--- a/engine/doc/classes/VisualShaderNodeCompare.xml
+++ b/engine/doc/classes/VisualShaderNodeCompare.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCompare" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCompare" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A comparison function for common types within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeConstant.xml b/engine/doc/classes/VisualShaderNodeConstant.xml
index 868489f5..1fa6a53f 100644
--- a/engine/doc/classes/VisualShaderNodeConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeConstant" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeConstant" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base type for the constants within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCubemap.xml b/engine/doc/classes/VisualShaderNodeCubemap.xml
index 06b183d9..fe1e4c1c 100644
--- a/engine/doc/classes/VisualShaderNodeCubemap.xml
+++ b/engine/doc/classes/VisualShaderNodeCubemap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCubemap" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCubemap" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Cubemap] sampling node to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCubemapParameter.xml b/engine/doc/classes/VisualShaderNodeCubemapParameter.xml
index 47f2fd94..0b2d87c1 100644
--- a/engine/doc/classes/VisualShaderNodeCubemapParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeCubemapParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCubemapParameter" inherits="VisualShaderNodeTextureParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCubemapParameter" inherits="VisualShaderNodeTextureParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Cubemap] parameter node to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCurveTexture.xml b/engine/doc/classes/VisualShaderNodeCurveTexture.xml
index dacdf796..d2012750 100644
--- a/engine/doc/classes/VisualShaderNodeCurveTexture.xml
+++ b/engine/doc/classes/VisualShaderNodeCurveTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCurveTexture" inherits="VisualShaderNodeResizableBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCurveTexture" inherits="VisualShaderNodeResizableBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a [CurveTexture] lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCurveXYZTexture.xml b/engine/doc/classes/VisualShaderNodeCurveXYZTexture.xml
index 78b54c7e..83e3240d 100644
--- a/engine/doc/classes/VisualShaderNodeCurveXYZTexture.xml
+++ b/engine/doc/classes/VisualShaderNodeCurveXYZTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCurveXYZTexture" inherits="VisualShaderNodeResizableBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCurveXYZTexture" inherits="VisualShaderNodeResizableBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a [CurveXYZTexture] lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeCustom.xml b/engine/doc/classes/VisualShaderNodeCustom.xml
index a3257039..a03372fb 100644
--- a/engine/doc/classes/VisualShaderNodeCustom.xml
+++ b/engine/doc/classes/VisualShaderNodeCustom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeCustom" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeCustom" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Virtual class to define custom [VisualShaderNode]s for use in the Visual Shader Editor.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeDerivativeFunc.xml b/engine/doc/classes/VisualShaderNodeDerivativeFunc.xml
index fa34ea23..49a18999 100644
--- a/engine/doc/classes/VisualShaderNodeDerivativeFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeDerivativeFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeDerivativeFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeDerivativeFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates a derivative within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeDeterminant.xml b/engine/doc/classes/VisualShaderNodeDeterminant.xml
index a32490f4..cbb43edf 100644
--- a/engine/doc/classes/VisualShaderNodeDeterminant.xml
+++ b/engine/doc/classes/VisualShaderNodeDeterminant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeDeterminant" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeDeterminant" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates the determinant of a [Transform3D] within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeDistanceFade.xml b/engine/doc/classes/VisualShaderNodeDistanceFade.xml
index 9a905bfb..69381c0f 100644
--- a/engine/doc/classes/VisualShaderNodeDistanceFade.xml
+++ b/engine/doc/classes/VisualShaderNodeDistanceFade.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeDistanceFade" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeDistanceFade" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node representing distance fade effect.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeDotProduct.xml b/engine/doc/classes/VisualShaderNodeDotProduct.xml
index e7367c91..f9c93831 100644
--- a/engine/doc/classes/VisualShaderNodeDotProduct.xml
+++ b/engine/doc/classes/VisualShaderNodeDotProduct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeDotProduct" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeDotProduct" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates a dot product of two vectors within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeExpression.xml b/engine/doc/classes/VisualShaderNodeExpression.xml
index e8862fbc..c916aecc 100644
--- a/engine/doc/classes/VisualShaderNodeExpression.xml
+++ b/engine/doc/classes/VisualShaderNodeExpression.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeExpression" inherits="VisualShaderNodeGroupBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeExpression" inherits="VisualShaderNodeGroupBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A custom visual shader graph expression written in Godot Shading Language.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFaceForward.xml b/engine/doc/classes/VisualShaderNodeFaceForward.xml
index ae56d24b..b63602e3 100644
--- a/engine/doc/classes/VisualShaderNodeFaceForward.xml
+++ b/engine/doc/classes/VisualShaderNodeFaceForward.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFaceForward" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFaceForward" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Returns the vector that points in the same direction as a reference vector within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFloatConstant.xml b/engine/doc/classes/VisualShaderNodeFloatConstant.xml
index 96c3cc92..2436663f 100644
--- a/engine/doc/classes/VisualShaderNodeFloatConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeFloatConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFloatConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFloatConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A scalar floating-point constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFloatFunc.xml b/engine/doc/classes/VisualShaderNodeFloatFunc.xml
index 2825fc27..79abbf1a 100644
--- a/engine/doc/classes/VisualShaderNodeFloatFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeFloatFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFloatFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFloatFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A scalar floating-point function to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFloatOp.xml b/engine/doc/classes/VisualShaderNodeFloatOp.xml
index 61c25092..6e97dd77 100644
--- a/engine/doc/classes/VisualShaderNodeFloatOp.xml
+++ b/engine/doc/classes/VisualShaderNodeFloatOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFloatOp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFloatOp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A floating-point scalar operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFloatParameter.xml b/engine/doc/classes/VisualShaderNodeFloatParameter.xml
index 67b8495a..a4a76644 100644
--- a/engine/doc/classes/VisualShaderNodeFloatParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeFloatParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFloatParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFloatParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A scalar float parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFrame.xml b/engine/doc/classes/VisualShaderNodeFrame.xml
index 85e042d5..a86587f1 100644
--- a/engine/doc/classes/VisualShaderNodeFrame.xml
+++ b/engine/doc/classes/VisualShaderNodeFrame.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFrame" inherits="VisualShaderNodeResizableBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFrame" inherits="VisualShaderNodeResizableBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A frame other visual shader nodes can be attached to for better organization.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeFresnel.xml b/engine/doc/classes/VisualShaderNodeFresnel.xml
index 40614092..4d050fae 100644
--- a/engine/doc/classes/VisualShaderNodeFresnel.xml
+++ b/engine/doc/classes/VisualShaderNodeFresnel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeFresnel" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeFresnel" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A Fresnel effect to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeGlobalExpression.xml b/engine/doc/classes/VisualShaderNodeGlobalExpression.xml
index 35dc368b..69204373 100644
--- a/engine/doc/classes/VisualShaderNodeGlobalExpression.xml
+++ b/engine/doc/classes/VisualShaderNodeGlobalExpression.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeGlobalExpression" inherits="VisualShaderNodeExpression" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeGlobalExpression" inherits="VisualShaderNodeExpression" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A custom global visual shader graph expression written in Godot Shading Language.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeGroupBase.xml b/engine/doc/classes/VisualShaderNodeGroupBase.xml
index 83859219..a1cee719 100644
--- a/engine/doc/classes/VisualShaderNodeGroupBase.xml
+++ b/engine/doc/classes/VisualShaderNodeGroupBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeGroupBase" inherits="VisualShaderNodeResizableBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeGroupBase" inherits="VisualShaderNodeResizableBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for a family of nodes with variable number of input and output ports within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIf.xml b/engine/doc/classes/VisualShaderNodeIf.xml
index dc628c60..f3d76a4a 100644
--- a/engine/doc/classes/VisualShaderNodeIf.xml
+++ b/engine/doc/classes/VisualShaderNodeIf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIf" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIf" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Outputs a 3D vector based on the result of a floating-point comparison within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeInput.xml b/engine/doc/classes/VisualShaderNodeInput.xml
index 055f5d91..79ed8dde 100644
--- a/engine/doc/classes/VisualShaderNodeInput.xml
+++ b/engine/doc/classes/VisualShaderNodeInput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeInput" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeInput" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents the input shader parameter within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIntConstant.xml b/engine/doc/classes/VisualShaderNodeIntConstant.xml
index d2d9e06b..f942bf29 100644
--- a/engine/doc/classes/VisualShaderNodeIntConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeIntConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIntConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIntConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A scalar integer constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIntFunc.xml b/engine/doc/classes/VisualShaderNodeIntFunc.xml
index 4919237b..aade8be0 100644
--- a/engine/doc/classes/VisualShaderNodeIntFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeIntFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIntFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIntFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A scalar integer function to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIntOp.xml b/engine/doc/classes/VisualShaderNodeIntOp.xml
index 66ff83ac..539f6b7c 100644
--- a/engine/doc/classes/VisualShaderNodeIntOp.xml
+++ b/engine/doc/classes/VisualShaderNodeIntOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIntOp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIntOp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An integer scalar operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIntParameter.xml b/engine/doc/classes/VisualShaderNodeIntParameter.xml
index d0ee8f1e..ba17da49 100644
--- a/engine/doc/classes/VisualShaderNodeIntParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeIntParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIntParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIntParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node for shader parameter (uniform) of type [int].
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeIs.xml b/engine/doc/classes/VisualShaderNodeIs.xml
index 208924ed..45df5852 100644
--- a/engine/doc/classes/VisualShaderNodeIs.xml
+++ b/engine/doc/classes/VisualShaderNodeIs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeIs" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeIs" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A boolean comparison operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeLinearSceneDepth.xml b/engine/doc/classes/VisualShaderNodeLinearSceneDepth.xml
index 0f7cdfa3..f035ba78 100644
--- a/engine/doc/classes/VisualShaderNodeLinearSceneDepth.xml
+++ b/engine/doc/classes/VisualShaderNodeLinearSceneDepth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeLinearSceneDepth" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeLinearSceneDepth" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that returns the depth value of the DEPTH_TEXTURE node in a linear space.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeMix.xml b/engine/doc/classes/VisualShaderNodeMix.xml
index 5b8a70f4..d4444c88 100644
--- a/engine/doc/classes/VisualShaderNodeMix.xml
+++ b/engine/doc/classes/VisualShaderNodeMix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeMix" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeMix" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Linearly interpolates between two values within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeMultiplyAdd.xml b/engine/doc/classes/VisualShaderNodeMultiplyAdd.xml
index a539c5a1..9f622acb 100644
--- a/engine/doc/classes/VisualShaderNodeMultiplyAdd.xml
+++ b/engine/doc/classes/VisualShaderNodeMultiplyAdd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeMultiplyAdd" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeMultiplyAdd" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a fused multiply-add operation within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeOuterProduct.xml b/engine/doc/classes/VisualShaderNodeOuterProduct.xml
index f9bdc88f..1e8d2579 100644
--- a/engine/doc/classes/VisualShaderNodeOuterProduct.xml
+++ b/engine/doc/classes/VisualShaderNodeOuterProduct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeOuterProduct" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeOuterProduct" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates an outer product of two vectors within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeOutput.xml b/engine/doc/classes/VisualShaderNodeOutput.xml
index 915100de..6730f96d 100644
--- a/engine/doc/classes/VisualShaderNodeOutput.xml
+++ b/engine/doc/classes/VisualShaderNodeOutput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeOutput" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeOutput" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Represents the output shader parameters within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParameter.xml b/engine/doc/classes/VisualShaderNodeParameter.xml
index ef84792c..2072ec49 100644
--- a/engine/doc/classes/VisualShaderNodeParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParameter" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParameter" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base type for the parameters within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParameterRef.xml b/engine/doc/classes/VisualShaderNodeParameterRef.xml
index 7f2b323b..ffd8ce68 100644
--- a/engine/doc/classes/VisualShaderNodeParameterRef.xml
+++ b/engine/doc/classes/VisualShaderNodeParameterRef.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParameterRef" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParameterRef" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A reference to an existing [VisualShaderNodeParameter].
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleAccelerator.xml b/engine/doc/classes/VisualShaderNodeParticleAccelerator.xml
index b5dad463..09075255 100644
--- a/engine/doc/classes/VisualShaderNodeParticleAccelerator.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleAccelerator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleAccelerator" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleAccelerator" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that accelerates particles.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleBoxEmitter.xml b/engine/doc/classes/VisualShaderNodeParticleBoxEmitter.xml
index d0d0028e..8d986969 100644
--- a/engine/doc/classes/VisualShaderNodeParticleBoxEmitter.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleBoxEmitter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleBoxEmitter" inherits="VisualShaderNodeParticleEmitter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleBoxEmitter" inherits="VisualShaderNodeParticleEmitter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that makes particles emitted in a box shape.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleConeVelocity.xml b/engine/doc/classes/VisualShaderNodeParticleConeVelocity.xml
index 23aa4f57..a49316e3 100644
--- a/engine/doc/classes/VisualShaderNodeParticleConeVelocity.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleConeVelocity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleConeVelocity" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleConeVelocity" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that makes particles move in a cone shape.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleEmit.xml b/engine/doc/classes/VisualShaderNodeParticleEmit.xml
index 9be62bb0..c8ad6427 100644
--- a/engine/doc/classes/VisualShaderNodeParticleEmit.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleEmit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleEmit" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleEmit" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that forces to emit a particle from a sub-emitter.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleEmitter.xml b/engine/doc/classes/VisualShaderNodeParticleEmitter.xml
index 9771b554..a56e1507 100644
--- a/engine/doc/classes/VisualShaderNodeParticleEmitter.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleEmitter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleEmitter" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleEmitter" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base class for particle emitters.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleMeshEmitter.xml b/engine/doc/classes/VisualShaderNodeParticleMeshEmitter.xml
index 0203ce03..e5f34bbc 100644
--- a/engine/doc/classes/VisualShaderNodeParticleMeshEmitter.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleMeshEmitter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleMeshEmitter" inherits="VisualShaderNodeParticleEmitter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleMeshEmitter" inherits="VisualShaderNodeParticleEmitter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that makes particles emitted in a shape defined by a [Mesh].
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml b/engine/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml
index 035f2944..5e7d3f3d 100644
--- a/engine/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleMultiplyByAxisAngle" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleMultiplyByAxisAngle" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader helper node for multiplying position and rotation of particles.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleOutput.xml b/engine/doc/classes/VisualShaderNodeParticleOutput.xml
index 93ea204d..d6dc88ba 100644
--- a/engine/doc/classes/VisualShaderNodeParticleOutput.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleOutput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleOutput" inherits="VisualShaderNodeOutput" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleOutput" inherits="VisualShaderNodeOutput" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Visual shader node that defines output values for particle emitting.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleRandomness.xml b/engine/doc/classes/VisualShaderNodeParticleRandomness.xml
index 97bb8704..406b1944 100644
--- a/engine/doc/classes/VisualShaderNodeParticleRandomness.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleRandomness.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleRandomness" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleRandomness" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Visual shader node for randomizing particle values.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleRingEmitter.xml b/engine/doc/classes/VisualShaderNodeParticleRingEmitter.xml
index fbe8dc29..623f153f 100644
--- a/engine/doc/classes/VisualShaderNodeParticleRingEmitter.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleRingEmitter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleRingEmitter" inherits="VisualShaderNodeParticleEmitter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleRingEmitter" inherits="VisualShaderNodeParticleEmitter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that makes particles emitted in a ring shape.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeParticleSphereEmitter.xml b/engine/doc/classes/VisualShaderNodeParticleSphereEmitter.xml
index 4903e059..dea99a13 100644
--- a/engine/doc/classes/VisualShaderNodeParticleSphereEmitter.xml
+++ b/engine/doc/classes/VisualShaderNodeParticleSphereEmitter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeParticleSphereEmitter" inherits="VisualShaderNodeParticleEmitter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeParticleSphereEmitter" inherits="VisualShaderNodeParticleEmitter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that makes particles emitted in a sphere shape.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeProximityFade.xml b/engine/doc/classes/VisualShaderNodeProximityFade.xml
index dd07ba47..70ae8e7e 100644
--- a/engine/doc/classes/VisualShaderNodeProximityFade.xml
+++ b/engine/doc/classes/VisualShaderNodeProximityFade.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeProximityFade" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeProximityFade" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node representing proximity fade effect.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeRandomRange.xml b/engine/doc/classes/VisualShaderNodeRandomRange.xml
index fb87c9ee..c848d9ba 100644
--- a/engine/doc/classes/VisualShaderNodeRandomRange.xml
+++ b/engine/doc/classes/VisualShaderNodeRandomRange.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeRandomRange" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeRandomRange" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that generates a pseudo-random scalar.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeRemap.xml b/engine/doc/classes/VisualShaderNodeRemap.xml
index 370adf5c..d4ecb2dd 100644
--- a/engine/doc/classes/VisualShaderNodeRemap.xml
+++ b/engine/doc/classes/VisualShaderNodeRemap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeRemap" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeRemap" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node for remap function.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeReroute.xml b/engine/doc/classes/VisualShaderNodeReroute.xml
index c11aefc4..1baaa7bb 100644
--- a/engine/doc/classes/VisualShaderNodeReroute.xml
+++ b/engine/doc/classes/VisualShaderNodeReroute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeReroute" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeReroute" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node that allows rerouting a connection within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeResizableBase.xml b/engine/doc/classes/VisualShaderNodeResizableBase.xml
index 9259736c..14058d1a 100644
--- a/engine/doc/classes/VisualShaderNodeResizableBase.xml
+++ b/engine/doc/classes/VisualShaderNodeResizableBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeResizableBase" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeResizableBase" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for resizable nodes in a visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeRotationByAxis.xml b/engine/doc/classes/VisualShaderNodeRotationByAxis.xml
index ff714f98..8a4fbc89 100644
--- a/engine/doc/classes/VisualShaderNodeRotationByAxis.xml
+++ b/engine/doc/classes/VisualShaderNodeRotationByAxis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeRotationByAxis" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeRotationByAxis" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that modifies the rotation of the object using a rotation matrix.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeSDFRaymarch.xml b/engine/doc/classes/VisualShaderNodeSDFRaymarch.xml
index 1b90ea28..ad202320 100644
--- a/engine/doc/classes/VisualShaderNodeSDFRaymarch.xml
+++ b/engine/doc/classes/VisualShaderNodeSDFRaymarch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeSDFRaymarch" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeSDFRaymarch" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		SDF raymarching algorithm to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeSDFToScreenUV.xml b/engine/doc/classes/VisualShaderNodeSDFToScreenUV.xml
index 24da65d7..54df82ef 100644
--- a/engine/doc/classes/VisualShaderNodeSDFToScreenUV.xml
+++ b/engine/doc/classes/VisualShaderNodeSDFToScreenUV.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeSDFToScreenUV" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeSDFToScreenUV" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A function to convert an SDF (signed-distance field) to screen UV, to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeSample3D.xml b/engine/doc/classes/VisualShaderNodeSample3D.xml
index e51abbf4..de76b025 100644
--- a/engine/doc/classes/VisualShaderNodeSample3D.xml
+++ b/engine/doc/classes/VisualShaderNodeSample3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeSample3D" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeSample3D" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base node for nodes which samples 3D textures in the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml b/engine/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml
index 30e29856..ccffb621 100644
--- a/engine/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml
+++ b/engine/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeScreenNormalWorldSpace" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeScreenNormalWorldSpace" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that unpacks the screen normal texture in World Space.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeScreenUVToSDF.xml b/engine/doc/classes/VisualShaderNodeScreenUVToSDF.xml
index 99c1bd6e..81be7717 100644
--- a/engine/doc/classes/VisualShaderNodeScreenUVToSDF.xml
+++ b/engine/doc/classes/VisualShaderNodeScreenUVToSDF.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeScreenUVToSDF" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeScreenUVToSDF" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A function to convert screen UV to an SDF (signed-distance field), to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeSmoothStep.xml b/engine/doc/classes/VisualShaderNodeSmoothStep.xml
index e5c27095..ec1303ce 100644
--- a/engine/doc/classes/VisualShaderNodeSmoothStep.xml
+++ b/engine/doc/classes/VisualShaderNodeSmoothStep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeSmoothStep" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeSmoothStep" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates a SmoothStep function within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeStep.xml b/engine/doc/classes/VisualShaderNodeStep.xml
index b35b8c8f..febc960b 100644
--- a/engine/doc/classes/VisualShaderNodeStep.xml
+++ b/engine/doc/classes/VisualShaderNodeStep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeStep" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeStep" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Calculates a Step function within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeSwitch.xml b/engine/doc/classes/VisualShaderNodeSwitch.xml
index 9fc04906..a44ca3f0 100644
--- a/engine/doc/classes/VisualShaderNodeSwitch.xml
+++ b/engine/doc/classes/VisualShaderNodeSwitch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeSwitch" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeSwitch" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A selector function for use within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture.xml b/engine/doc/classes/VisualShaderNodeTexture.xml
index ccb93062..66b2e859 100644
--- a/engine/doc/classes/VisualShaderNodeTexture.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a 2D texture lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture2DArray.xml b/engine/doc/classes/VisualShaderNodeTexture2DArray.xml
index 88347ff4..bdf5a428 100644
--- a/engine/doc/classes/VisualShaderNodeTexture2DArray.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture2DArray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture2DArray" inherits="VisualShaderNodeSample3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture2DArray" inherits="VisualShaderNodeSample3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D texture uniform array to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml b/engine/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml
index d74151ef..8da85995 100644
--- a/engine/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture2DArrayParameter" inherits="VisualShaderNodeTextureParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture2DArrayParameter" inherits="VisualShaderNodeTextureParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node for shader parameter (uniform) of type [Texture2DArray].
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture2DParameter.xml b/engine/doc/classes/VisualShaderNodeTexture2DParameter.xml
index 71ff1979..39290e6b 100644
--- a/engine/doc/classes/VisualShaderNodeTexture2DParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture2DParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture2DParameter" inherits="VisualShaderNodeTextureParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture2DParameter" inherits="VisualShaderNodeTextureParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a 2D texture parameter within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture3D.xml b/engine/doc/classes/VisualShaderNodeTexture3D.xml
index 248a32f3..b6cf18e8 100644
--- a/engine/doc/classes/VisualShaderNodeTexture3D.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture3D" inherits="VisualShaderNodeSample3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture3D" inherits="VisualShaderNodeSample3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a 3D texture lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTexture3DParameter.xml b/engine/doc/classes/VisualShaderNodeTexture3DParameter.xml
index 35c44cee..ceab1834 100644
--- a/engine/doc/classes/VisualShaderNodeTexture3DParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeTexture3DParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTexture3DParameter" inherits="VisualShaderNodeTextureParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTexture3DParameter" inherits="VisualShaderNodeTextureParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a 3D texture parameter within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTextureParameter.xml b/engine/doc/classes/VisualShaderNodeTextureParameter.xml
index 7467dc48..f425444a 100644
--- a/engine/doc/classes/VisualShaderNodeTextureParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeTextureParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTextureParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTextureParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a uniform texture lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml b/engine/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml
index b94723d0..95f2f016 100644
--- a/engine/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml
+++ b/engine/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTextureParameterTriplanar" inherits="VisualShaderNodeTextureParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTextureParameterTriplanar" inherits="VisualShaderNodeTextureParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs a uniform texture lookup with triplanar within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTextureSDF.xml b/engine/doc/classes/VisualShaderNodeTextureSDF.xml
index 89c7a842..ead987e1 100644
--- a/engine/doc/classes/VisualShaderNodeTextureSDF.xml
+++ b/engine/doc/classes/VisualShaderNodeTextureSDF.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTextureSDF" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTextureSDF" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs an SDF (signed-distance field) texture lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTextureSDFNormal.xml b/engine/doc/classes/VisualShaderNodeTextureSDFNormal.xml
index 99ef619e..70ce525d 100644
--- a/engine/doc/classes/VisualShaderNodeTextureSDFNormal.xml
+++ b/engine/doc/classes/VisualShaderNodeTextureSDFNormal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTextureSDFNormal" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTextureSDFNormal" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Performs an SDF (signed-distance field) normal texture lookup within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformCompose.xml b/engine/doc/classes/VisualShaderNodeTransformCompose.xml
index 00ac7cc0..6418d2a7 100644
--- a/engine/doc/classes/VisualShaderNodeTransformCompose.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformCompose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformCompose" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformCompose" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Composes a [Transform3D] from four [Vector3]s within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformConstant.xml b/engine/doc/classes/VisualShaderNodeTransformConstant.xml
index 4d5fe487..ed3f039a 100644
--- a/engine/doc/classes/VisualShaderNodeTransformConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Transform3D] constant for use within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformDecompose.xml b/engine/doc/classes/VisualShaderNodeTransformDecompose.xml
index 9d8034a7..0d1403ea 100644
--- a/engine/doc/classes/VisualShaderNodeTransformDecompose.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformDecompose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformDecompose" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformDecompose" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Decomposes a [Transform3D] into four [Vector3]s within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformFunc.xml b/engine/doc/classes/VisualShaderNodeTransformFunc.xml
index 6f14e221..a753c77e 100644
--- a/engine/doc/classes/VisualShaderNodeTransformFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Computes a [Transform3D] function within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformOp.xml b/engine/doc/classes/VisualShaderNodeTransformOp.xml
index 10fea606..9261e9ad 100644
--- a/engine/doc/classes/VisualShaderNodeTransformOp.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformOp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformOp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Transform3D] operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformParameter.xml b/engine/doc/classes/VisualShaderNodeTransformParameter.xml
index c5b06155..9927ec30 100644
--- a/engine/doc/classes/VisualShaderNodeTransformParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Transform3D] parameter for use within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeTransformVecMult.xml b/engine/doc/classes/VisualShaderNodeTransformVecMult.xml
index b8fd8ea5..c461b798 100644
--- a/engine/doc/classes/VisualShaderNodeTransformVecMult.xml
+++ b/engine/doc/classes/VisualShaderNodeTransformVecMult.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeTransformVecMult" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeTransformVecMult" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Multiplies a [Transform3D] and a [Vector3] within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUIntConstant.xml b/engine/doc/classes/VisualShaderNodeUIntConstant.xml
index 10be47ab..a5b82ea5 100644
--- a/engine/doc/classes/VisualShaderNodeUIntConstant.xml
+++ b/engine/doc/classes/VisualShaderNodeUIntConstant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUIntConstant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUIntConstant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An unsigned scalar integer constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUIntFunc.xml b/engine/doc/classes/VisualShaderNodeUIntFunc.xml
index 432c604f..dee14c60 100644
--- a/engine/doc/classes/VisualShaderNodeUIntFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeUIntFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUIntFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUIntFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An unsigned scalar integer function to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUIntOp.xml b/engine/doc/classes/VisualShaderNodeUIntOp.xml
index 4d2e66f2..5dd2d54e 100644
--- a/engine/doc/classes/VisualShaderNodeUIntOp.xml
+++ b/engine/doc/classes/VisualShaderNodeUIntOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUIntOp" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUIntOp" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An unsigned integer scalar operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUIntParameter.xml b/engine/doc/classes/VisualShaderNodeUIntParameter.xml
index 387479c1..ebdfe032 100644
--- a/engine/doc/classes/VisualShaderNodeUIntParameter.xml
+++ b/engine/doc/classes/VisualShaderNodeUIntParameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUIntParameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUIntParameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node for shader parameter (uniform) of type unsigned [int].
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUVFunc.xml b/engine/doc/classes/VisualShaderNodeUVFunc.xml
index ab5b447c..c4bb8b60 100644
--- a/engine/doc/classes/VisualShaderNodeUVFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeUVFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUVFunc" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUVFunc" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Contains functions to modify texture coordinates ([code]uv[/code]) to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeUVPolarCoord.xml b/engine/doc/classes/VisualShaderNodeUVPolarCoord.xml
index 4330d31c..8edb3ec5 100644
--- a/engine/doc/classes/VisualShaderNodeUVPolarCoord.xml
+++ b/engine/doc/classes/VisualShaderNodeUVPolarCoord.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeUVPolarCoord" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeUVPolarCoord" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that modifies the texture UV using polar coordinates.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVarying.xml b/engine/doc/classes/VisualShaderNodeVarying.xml
index 36067455..20f15b41 100644
--- a/engine/doc/classes/VisualShaderNodeVarying.xml
+++ b/engine/doc/classes/VisualShaderNodeVarying.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVarying" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVarying" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that represents a "varying" shader value.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVaryingGetter.xml b/engine/doc/classes/VisualShaderNodeVaryingGetter.xml
index 0cb27866..5e050fb0 100644
--- a/engine/doc/classes/VisualShaderNodeVaryingGetter.xml
+++ b/engine/doc/classes/VisualShaderNodeVaryingGetter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVaryingGetter" inherits="VisualShaderNodeVarying" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVaryingGetter" inherits="VisualShaderNodeVarying" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that gets a value of a varying.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVaryingSetter.xml b/engine/doc/classes/VisualShaderNodeVaryingSetter.xml
index cc06da3d..fbb620cc 100644
--- a/engine/doc/classes/VisualShaderNodeVaryingSetter.xml
+++ b/engine/doc/classes/VisualShaderNodeVaryingSetter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVaryingSetter" inherits="VisualShaderNodeVarying" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVaryingSetter" inherits="VisualShaderNodeVarying" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that sets a value of a varying.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec2Constant.xml b/engine/doc/classes/VisualShaderNodeVec2Constant.xml
index 5c6dd11a..d2e7dc9c 100644
--- a/engine/doc/classes/VisualShaderNodeVec2Constant.xml
+++ b/engine/doc/classes/VisualShaderNodeVec2Constant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec2Constant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec2Constant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Vector2] constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec2Parameter.xml b/engine/doc/classes/VisualShaderNodeVec2Parameter.xml
index 14a5e52e..2e939d38 100644
--- a/engine/doc/classes/VisualShaderNodeVec2Parameter.xml
+++ b/engine/doc/classes/VisualShaderNodeVec2Parameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec2Parameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec2Parameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Vector2] parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec3Constant.xml b/engine/doc/classes/VisualShaderNodeVec3Constant.xml
index dc09353a..d8e0c3f6 100644
--- a/engine/doc/classes/VisualShaderNodeVec3Constant.xml
+++ b/engine/doc/classes/VisualShaderNodeVec3Constant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec3Constant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec3Constant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Vector3] constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec3Parameter.xml b/engine/doc/classes/VisualShaderNodeVec3Parameter.xml
index 3f5419bf..f94ce329 100644
--- a/engine/doc/classes/VisualShaderNodeVec3Parameter.xml
+++ b/engine/doc/classes/VisualShaderNodeVec3Parameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec3Parameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec3Parameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A [Vector3] parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec4Constant.xml b/engine/doc/classes/VisualShaderNodeVec4Constant.xml
index abcd4a4d..93d8c89b 100644
--- a/engine/doc/classes/VisualShaderNodeVec4Constant.xml
+++ b/engine/doc/classes/VisualShaderNodeVec4Constant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec4Constant" inherits="VisualShaderNodeConstant" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec4Constant" inherits="VisualShaderNodeConstant" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 4D vector constant to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVec4Parameter.xml b/engine/doc/classes/VisualShaderNodeVec4Parameter.xml
index fe42b960..e4153bea 100644
--- a/engine/doc/classes/VisualShaderNodeVec4Parameter.xml
+++ b/engine/doc/classes/VisualShaderNodeVec4Parameter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVec4Parameter" inherits="VisualShaderNodeParameter" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVec4Parameter" inherits="VisualShaderNodeParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 4D vector parameter to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorBase.xml b/engine/doc/classes/VisualShaderNodeVectorBase.xml
index 90db9127..dee05a97 100644
--- a/engine/doc/classes/VisualShaderNodeVectorBase.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorBase" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorBase" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A base type for the nodes that perform vector operations within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorCompose.xml b/engine/doc/classes/VisualShaderNodeVectorCompose.xml
index 60ea8493..8f25c8f3 100644
--- a/engine/doc/classes/VisualShaderNodeVectorCompose.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorCompose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorCompose" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorCompose" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Composes a [Vector2], [Vector3] or 4D vector (represented as a [Quaternion]) from scalars within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorDecompose.xml b/engine/doc/classes/VisualShaderNodeVectorDecompose.xml
index e8aaeb2d..7a9e9771 100644
--- a/engine/doc/classes/VisualShaderNodeVectorDecompose.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorDecompose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorDecompose" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorDecompose" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Decomposes a [Vector2], [Vector3] or 4D vector (represented as a [Quaternion]) into scalars within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorDistance.xml b/engine/doc/classes/VisualShaderNodeVectorDistance.xml
index bfa27767..dad2e036 100644
--- a/engine/doc/classes/VisualShaderNodeVectorDistance.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorDistance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorDistance" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorDistance" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Returns the distance between two points. To be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorFunc.xml b/engine/doc/classes/VisualShaderNodeVectorFunc.xml
index acf47f0b..6215d60b 100644
--- a/engine/doc/classes/VisualShaderNodeVectorFunc.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorFunc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorFunc" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorFunc" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vector function to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorLen.xml b/engine/doc/classes/VisualShaderNodeVectorLen.xml
index 9ac56395..a458b0b6 100644
--- a/engine/doc/classes/VisualShaderNodeVectorLen.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorLen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorLen" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorLen" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Returns the length of a [Vector3] within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorOp.xml b/engine/doc/classes/VisualShaderNodeVectorOp.xml
index 76566c57..7a4b68c1 100644
--- a/engine/doc/classes/VisualShaderNodeVectorOp.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorOp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorOp" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorOp" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A vector operator to be used within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeVectorRefract.xml b/engine/doc/classes/VisualShaderNodeVectorRefract.xml
index 7581e372..384175e8 100644
--- a/engine/doc/classes/VisualShaderNodeVectorRefract.xml
+++ b/engine/doc/classes/VisualShaderNodeVectorRefract.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeVectorRefract" inherits="VisualShaderNodeVectorBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeVectorRefract" inherits="VisualShaderNodeVectorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Returns the vector that points in the direction of refraction. For use within the visual shader graph.
 	</brief_description>
diff --git a/engine/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml b/engine/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml
index 94c2bf8a..9c9016e8 100644
--- a/engine/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml
+++ b/engine/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisualShaderNodeWorldPositionFromDepth" inherits="VisualShaderNode" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VisualShaderNodeWorldPositionFromDepth" inherits="VisualShaderNode" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A visual shader node that calculates the position of the pixel in world space using the depth texture.
 	</brief_description>
diff --git a/engine/doc/classes/VoxelGI.xml b/engine/doc/classes/VoxelGI.xml
index 278d9f03..c92501a4 100644
--- a/engine/doc/classes/VoxelGI.xml
+++ b/engine/doc/classes/VoxelGI.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VoxelGI" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VoxelGI" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Real-time global illumination (GI) probe.
 	</brief_description>
diff --git a/engine/doc/classes/VoxelGIData.xml b/engine/doc/classes/VoxelGIData.xml
index 4679e0a4..43bf04b1 100644
--- a/engine/doc/classes/VoxelGIData.xml
+++ b/engine/doc/classes/VoxelGIData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VoxelGIData" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="VoxelGIData" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Contains baked voxel global illumination data for use in a [VoxelGI] node.
 	</brief_description>
@@ -21,7 +21,6 @@
 			<param index="5" name="distance_field" type="PackedByteArray" />
 			<param index="6" name="level_counts" type="PackedInt32Array" />
 			<description>
-				Initializes this [VoxelGIData] with the specified data. [param octree_cells] must be a multiple of 32. [param octree_cells] must be double the size of [param data_cells]. The allocated data can be retrieved later using the various getter methods.
 			</description>
 		</method>
 		<method name="get_bounds" qualifiers="const">
@@ -34,31 +33,26 @@
 		<method name="get_data_cells" qualifiers="const">
 			<return type="PackedByteArray" />
 			<description>
-				Returns the baked cell data for this [VoxelGIData].
 			</description>
 		</method>
 		<method name="get_level_counts" qualifiers="const">
 			<return type="PackedInt32Array" />
 			<description>
-				Returns the baked level counts for this [VoxelGIData].
 			</description>
 		</method>
 		<method name="get_octree_cells" qualifiers="const">
 			<return type="PackedByteArray" />
 			<description>
-				Returns the baked octree cell data for this [VoxelGIData].
 			</description>
 		</method>
 		<method name="get_octree_size" qualifiers="const">
 			<return type="Vector3" />
 			<description>
-				Returns the baked octree size for this [VoxelGIData], which corresponds to the number of subdivisions per axis. This can be viewed in the editor by hovering the [b]Bake VoxelGI[/b] button at the top of the 3D editor viewport when a [VoxelGI] node is selected and looking at the [b]Subdivisions[/b] field in the tooltip.
 			</description>
 		</method>
 		<method name="get_to_cell_xform" qualifiers="const">
 			<return type="Transform3D" />
 			<description>
-				Returns the baked cell transform for this [VoxelGIData].
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/WeakRef.xml b/engine/doc/classes/WeakRef.xml
index 7465c107..c775dbe6 100644
--- a/engine/doc/classes/WeakRef.xml
+++ b/engine/doc/classes/WeakRef.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WeakRef" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="WeakRef" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Holds an [Object]. If the object is [RefCounted], it doesn't update the reference count.
 	</brief_description>
diff --git a/engine/doc/classes/Window.xml b/engine/doc/classes/Window.xml
index 6b684f3f..26943d19 100644
--- a/engine/doc/classes/Window.xml
+++ b/engine/doc/classes/Window.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Window" inherits="Viewport" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Window" inherits="Viewport" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for all windows, dialogs, and popups.
 	</brief_description>
@@ -120,39 +120,6 @@
 				Returns layout direction and text writing direction.
 			</description>
 		</method>
-		<method name="get_output_max_linear_value" qualifiers="const">
-			<return type="float" />
-			<description>
-				Returns the maximum value for linear color components that can be displayed in this window, regardless of SDR or HDR output. Returns [code]1.0[/code] if HDR is not enabled or not supported. The [signal output_max_linear_value_changed] signal will be emitted whenever this value changes.
-				This value is used by tonemapping and other [Environment] effects to ensure that bright colors are presented in the range that can be displayed by this window. When using the Linear tonemapper without [Environment] effects or no [WorldEnvironment], use the returned value to scale content to maximize the screen's brightness, such as for lasers or other bright effects. The following is an example that produces the brightest purple color that the screen can produce:
-				[codeblocks]
-				[gdscript]
-				func _process(_delta):
-					# output_max_linear_value may change often, so do this every frame.
-					var max_linear_value = get_window().get_output_max_linear_value()
-					# Replace this with your color:
-					var original_color = Color.PURPLE
-					# Normalize to max_linear_value to produce the brightest color possible,
-					# regardless of SDR or HDR output:
-					var bright_color = normalize_color(original_color, max_linear_value)
-
-
-				func normalize_color(srgb_color, max_linear_value = 1.0):
-					# Color must be linear-encoded to use math operations.
-					var linear_color = srgb_color.srgb_to_linear()
-					var max_rgb_value = maxf(linear_color.r, maxf(linear_color.g, linear_color.b))
-					var brightness_scale = max_linear_value / max_rgb_value
-					linear_color *= brightness_scale
-					# Undo changes to the alpha channel, which should not be modified.
-					linear_color.a = srgb_color.a
-					# Convert back to nonlinear sRGB encoding, which is required for Color in
-					# Godot unless stated otherwise.
-					return linear_color.linear_to_srgb()
-				[/gdscript]
-				[/codeblocks]
-				[b]Note:[/b] You will need to convert sRGB colors to linear before multiplying by this value to get correct results.
-			</description>
-		</method>
 		<method name="get_position_with_decorations" qualifiers="const">
 			<return type="Vector2i" />
 			<description>
@@ -575,23 +542,6 @@
 				Sets layout direction and text writing direction. Right-to-left layouts are necessary for certain languages (e.g. Arabic and Hebrew).
 			</description>
 		</method>
-		<method name="set_taskbar_progress_state">
-			<return type="void" />
-			<param index="0" name="state" type="int" enum="DisplayServer.ProgressState" />
-			<description>
-				Sets the type and state of the progress bar on the taskbar/dock icon of the [Window]. See [enum DisplayServer.ProgressState] for possible values and how each mode behaves.
-				[b]Note:[/b] This method is implemented only on Windows and macOS.
-			</description>
-		</method>
-		<method name="set_taskbar_progress_value">
-			<return type="void" />
-			<param index="0" name="value" type="float" />
-			<description>
-				Creates a progress bar on the taskbar/dock icon of the [Window] if it does not exist, sets the progress of the icon.
-				[param value] acts as a relative percentage value, ranges from [code]0.0[/code] (lowest) to [code]1.0[/code] (highest).
-				[b]Note:[/b] This method is implemented only on Windows and macOS.
-			</description>
-		</method>
 		<method name="set_unparent_when_invisible">
 			<return type="void" />
 			<param index="0" name="unparent" type="bool" />
@@ -680,9 +630,6 @@
 		<member name="force_native" type="bool" setter="set_force_native" getter="get_force_native" default="false">
 			If [code]true[/code], native window will be used regardless of parent viewport and project settings.
 		</member>
-		<member name="hdr_output_requested" type="bool" setter="set_hdr_output_requested" getter="is_hdr_output_requested" default="false">
-			If [code]true[/code], requests HDR output for the [Window], falling back to SDR if not supported, and automatically switching between HDR and SDR as the window moves between screens, screen capabilities change, or system settings are modified. This will internally force [member Viewport.use_hdr_2d] to be enabled on the main [Viewport]. All other [SubViewport] of this [Window] must have their [member Viewport.use_hdr_2d] property enabled to produce HDR output.
-		</member>
 		<member name="initial_position" type="int" setter="set_initial_position" getter="get_initial_position" enum="Window.WindowInitialPosition" default="0">
 			Specifies the initial type of position for the [Window].
 		</member>
@@ -867,12 +814,6 @@
 				Emitted when the mouse event is received by the custom decoration area defined by [member nonclient_area], and normal input to the window is blocked (such as when it has an exclusive child opened). [param event]'s position is in the embedder's coordinate system.
 			</description>
 		</signal>
-		<signal name="output_max_linear_value_changed">
-			<param index="0" name="output_max_linear_value" type="float" />
-			<description>
-				Emitted when the output max linear value returned by [method Window.get_output_max_linear_value] has changed. This occurs when HDR output is enabled or disabled and when any HDR output luminance values of the window have changed, such as when the player adjusts their screen brightness setting or moves the window to a different screen. [param output_max_linear_value] is the new value.
-			</description>
-		</signal>
 		<signal name="theme_changed">
 			<description>
 				Emitted when the [constant NOTIFICATION_THEME_CHANGED] notification is sent.
diff --git a/engine/doc/classes/WorkerThreadPool.xml b/engine/doc/classes/WorkerThreadPool.xml
index 34d5a7d5..24fe91be 100644
--- a/engine/doc/classes/WorkerThreadPool.xml
+++ b/engine/doc/classes/WorkerThreadPool.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WorkerThreadPool" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="WorkerThreadPool" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A singleton that allocates some [Thread]s on startup, used to offload tasks to these threads.
 	</brief_description>
diff --git a/engine/doc/classes/World2D.xml b/engine/doc/classes/World2D.xml
index daea618d..c2e617d6 100644
--- a/engine/doc/classes/World2D.xml
+++ b/engine/doc/classes/World2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="World2D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="World2D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A resource that holds all components of a 2D world, such as a canvas and a physics space.
 	</brief_description>
diff --git a/engine/doc/classes/World3D.xml b/engine/doc/classes/World3D.xml
index 41aa7f91..8cdc2c35 100644
--- a/engine/doc/classes/World3D.xml
+++ b/engine/doc/classes/World3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="World3D" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="World3D" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A resource that holds all components of a 3D world, such as a visual scenario and a physics space.
 	</brief_description>
diff --git a/engine/doc/classes/WorldBoundaryShape2D.xml b/engine/doc/classes/WorldBoundaryShape2D.xml
index 55f869cb..ee1aa8d2 100644
--- a/engine/doc/classes/WorldBoundaryShape2D.xml
+++ b/engine/doc/classes/WorldBoundaryShape2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WorldBoundaryShape2D" inherits="Shape2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="WorldBoundaryShape2D" inherits="Shape2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 2D world boundary (half-plane) shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/WorldBoundaryShape3D.xml b/engine/doc/classes/WorldBoundaryShape3D.xml
index 9889aeb7..0770dd51 100644
--- a/engine/doc/classes/WorldBoundaryShape3D.xml
+++ b/engine/doc/classes/WorldBoundaryShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WorldBoundaryShape3D" inherits="Shape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="WorldBoundaryShape3D" inherits="Shape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D world boundary (half-space) shape used for physics collision.
 	</brief_description>
diff --git a/engine/doc/classes/WorldEnvironment.xml b/engine/doc/classes/WorldEnvironment.xml
index 6983d40f..80dc46ae 100644
--- a/engine/doc/classes/WorldEnvironment.xml
+++ b/engine/doc/classes/WorldEnvironment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WorldEnvironment" inherits="Node" api_type="core" keywords="background, sky" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="WorldEnvironment" inherits="Node" keywords="background, sky" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Default environment properties for the entire scene (post-processing effects, lighting and background settings).
 	</brief_description>
diff --git a/engine/doc/classes/X509Certificate.xml b/engine/doc/classes/X509Certificate.xml
index e759f4e2..a4148792 100644
--- a/engine/doc/classes/X509Certificate.xml
+++ b/engine/doc/classes/X509Certificate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="X509Certificate" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="X509Certificate" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An X509 certificate (e.g. for TLS).
 	</brief_description>
diff --git a/engine/doc/classes/XMLParser.xml b/engine/doc/classes/XMLParser.xml
index 09ccf39a..1767ebc0 100644
--- a/engine/doc/classes/XMLParser.xml
+++ b/engine/doc/classes/XMLParser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XMLParser" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XMLParser" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Provides a low-level interface for creating parsers for XML files.
 	</brief_description>
diff --git a/engine/doc/classes/XRAnchor3D.xml b/engine/doc/classes/XRAnchor3D.xml
index 3ef06815..4b5e90c5 100644
--- a/engine/doc/classes/XRAnchor3D.xml
+++ b/engine/doc/classes/XRAnchor3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRAnchor3D" inherits="XRNode3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRAnchor3D" inherits="XRNode3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		An anchor point in AR space.
 	</brief_description>
diff --git a/engine/doc/classes/XRBodyModifier3D.xml b/engine/doc/classes/XRBodyModifier3D.xml
index 4fdc4c14..d08b92a5 100644
--- a/engine/doc/classes/XRBodyModifier3D.xml
+++ b/engine/doc/classes/XRBodyModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRBodyModifier3D" inherits="SkeletonModifier3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRBodyModifier3D" inherits="SkeletonModifier3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for driving body meshes from [XRBodyTracker] data.
 	</brief_description>
diff --git a/engine/doc/classes/XRBodyTracker.xml b/engine/doc/classes/XRBodyTracker.xml
index a125c946..4945fada 100644
--- a/engine/doc/classes/XRBodyTracker.xml
+++ b/engine/doc/classes/XRBodyTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRBodyTracker" inherits="XRPositionalTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRBodyTracker" inherits="XRPositionalTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked body in XR.
 	</brief_description>
diff --git a/engine/doc/classes/XRCamera3D.xml b/engine/doc/classes/XRCamera3D.xml
index 01c68185..ca1cd431 100644
--- a/engine/doc/classes/XRCamera3D.xml
+++ b/engine/doc/classes/XRCamera3D.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRCamera3D" inherits="Camera3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRCamera3D" inherits="Camera3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		A camera node which automatically positions itself based on XR tracking data.
+		A camera node with a few overrules for AR/VR applied, such as location tracking.
 	</brief_description>
 	<description>
-		A camera node which automatically positions itself based on XR tracking data.
-		In contrast to [XRController3D], the render thread has access to more up-to-date tracking data, and the location of the [XRCamera3D] node can lag a few milliseconds behind what is used for rendering.
-		[b]Note:[/b] If [member Viewport.use_xr] is [code]true[/code], most of the camera properties are overridden by the active [XRInterface]. The only properties that can be trusted are the near and far planes.
+		This is a helper 3D node for our camera. Note that, if stereoscopic rendering is applicable (VR-HMD), most of the camera properties are ignored, as the HMD information overrides them. The only properties that can be trusted are the near and far planes.
+		The position and orientation of this node is automatically updated by the XR Server to represent the location of the HMD if such tracking is available and can thus be used by game logic. Note that, in contrast to the XR Controller, the render thread has access to the most up-to-date tracking data of the HMD and the location of the XRCamera3D can lag a few milliseconds behind what is used for rendering as a result.
 	</description>
 	<tutorials>
 		<link title="XR documentation index">$DOCS_URL/tutorials/xr/index.html</link>
diff --git a/engine/doc/classes/XRController3D.xml b/engine/doc/classes/XRController3D.xml
index bd49f10b..f37c69f9 100644
--- a/engine/doc/classes/XRController3D.xml
+++ b/engine/doc/classes/XRController3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRController3D" inherits="XRNode3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRController3D" inherits="XRNode3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D node representing a spatially-tracked controller.
 	</brief_description>
diff --git a/engine/doc/classes/XRControllerTracker.xml b/engine/doc/classes/XRControllerTracker.xml
index c5589d67..50727a76 100644
--- a/engine/doc/classes/XRControllerTracker.xml
+++ b/engine/doc/classes/XRControllerTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRControllerTracker" inherits="XRPositionalTracker" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRControllerTracker" inherits="XRPositionalTracker" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked controller.
 	</brief_description>
diff --git a/engine/doc/classes/XRFaceModifier3D.xml b/engine/doc/classes/XRFaceModifier3D.xml
index 96fe85aa..9fb51575 100644
--- a/engine/doc/classes/XRFaceModifier3D.xml
+++ b/engine/doc/classes/XRFaceModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRFaceModifier3D" inherits="Node3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRFaceModifier3D" inherits="Node3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for driving standard face meshes from [XRFaceTracker] weights.
 	</brief_description>
diff --git a/engine/doc/classes/XRFaceTracker.xml b/engine/doc/classes/XRFaceTracker.xml
index 590aa4e4..23a9a9cb 100644
--- a/engine/doc/classes/XRFaceTracker.xml
+++ b/engine/doc/classes/XRFaceTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRFaceTracker" inherits="XRTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRFaceTracker" inherits="XRTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked face.
 	</brief_description>
diff --git a/engine/doc/classes/XRHandModifier3D.xml b/engine/doc/classes/XRHandModifier3D.xml
index 2178e997..09ff3210 100644
--- a/engine/doc/classes/XRHandModifier3D.xml
+++ b/engine/doc/classes/XRHandModifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRHandModifier3D" inherits="SkeletonModifier3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRHandModifier3D" inherits="SkeletonModifier3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A node for driving hand meshes from [XRHandTracker] data.
 	</brief_description>
diff --git a/engine/doc/classes/XRHandTracker.xml b/engine/doc/classes/XRHandTracker.xml
index 101b1ac6..cba010ce 100644
--- a/engine/doc/classes/XRHandTracker.xml
+++ b/engine/doc/classes/XRHandTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRHandTracker" inherits="XRPositionalTracker" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRHandTracker" inherits="XRPositionalTracker" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked hand in XR.
 	</brief_description>
diff --git a/engine/doc/classes/XRInterface.xml b/engine/doc/classes/XRInterface.xml
index 3b19e2fe..ede1ce31 100644
--- a/engine/doc/classes/XRInterface.xml
+++ b/engine/doc/classes/XRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRInterface" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRInterface" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for an XR interface implementation.
 	</brief_description>
diff --git a/engine/doc/classes/XRInterfaceExtension.xml b/engine/doc/classes/XRInterfaceExtension.xml
index 3220d70b..4e1e248e 100644
--- a/engine/doc/classes/XRInterfaceExtension.xml
+++ b/engine/doc/classes/XRInterfaceExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRInterfaceExtension" inherits="XRInterface" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRInterfaceExtension" inherits="XRInterface" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Base class for XR interface extensions (plugins).
 	</brief_description>
diff --git a/engine/doc/classes/XRNode3D.xml b/engine/doc/classes/XRNode3D.xml
index 1f186169..1ab4adaf 100644
--- a/engine/doc/classes/XRNode3D.xml
+++ b/engine/doc/classes/XRNode3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRNode3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRNode3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A 3D node that has its position automatically updated by the [XRServer].
 	</brief_description>
diff --git a/engine/doc/classes/XROrigin3D.xml b/engine/doc/classes/XROrigin3D.xml
index b8500094..041e8cd7 100644
--- a/engine/doc/classes/XROrigin3D.xml
+++ b/engine/doc/classes/XROrigin3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XROrigin3D" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XROrigin3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		The origin point in AR/VR.
 	</brief_description>
diff --git a/engine/doc/classes/XRPose.xml b/engine/doc/classes/XRPose.xml
index c15b4f91..76c1ced3 100644
--- a/engine/doc/classes/XRPose.xml
+++ b/engine/doc/classes/XRPose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRPose" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRPose" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		This object contains all data related to a pose on a tracked object.
 	</brief_description>
diff --git a/engine/doc/classes/XRPositionalTracker.xml b/engine/doc/classes/XRPositionalTracker.xml
index 78a8fad5..75b28f39 100644
--- a/engine/doc/classes/XRPositionalTracker.xml
+++ b/engine/doc/classes/XRPositionalTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRPositionalTracker" inherits="XRTracker" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRPositionalTracker" inherits="XRTracker" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked object.
 	</brief_description>
diff --git a/engine/doc/classes/XRServer.xml b/engine/doc/classes/XRServer.xml
index 9d5c2b1c..27c4ed9a 100644
--- a/engine/doc/classes/XRServer.xml
+++ b/engine/doc/classes/XRServer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRServer" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRServer" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Server for AR and VR features.
 	</brief_description>
@@ -165,11 +165,6 @@
 				Emitted when an existing tracker has been updated. This can happen if the user switches controllers.
 			</description>
 		</signal>
-		<signal name="world_origin_changed">
-			<description>
-				Emitted when the world origin transform changes.
-			</description>
-		</signal>
 	</signals>
 	<constants>
 		<constant name="TRACKER_HEAD" value="1" enum="TrackerType">
diff --git a/engine/doc/classes/XRTracker.xml b/engine/doc/classes/XRTracker.xml
index 0f82da60..78ff6825 100644
--- a/engine/doc/classes/XRTracker.xml
+++ b/engine/doc/classes/XRTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRTracker" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRTracker" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		A tracked object.
 	</brief_description>
diff --git a/engine/doc/classes/XRVRS.xml b/engine/doc/classes/XRVRS.xml
index 67dcbda3..ec92d4a6 100644
--- a/engine/doc/classes/XRVRS.xml
+++ b/engine/doc/classes/XRVRS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="XRVRS" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="XRVRS" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Helper class for XR interfaces that generates VRS images.
 	</brief_description>
diff --git a/engine/doc/classes/float.xml b/engine/doc/classes/float.xml
index 78976962..324a7756 100644
--- a/engine/doc/classes/float.xml
+++ b/engine/doc/classes/float.xml
@@ -7,7 +7,6 @@
 		The [float] built-in type is a 64-bit double-precision floating-point number, equivalent to [code]double[/code] in C++. This type has 14 reliable decimal digits of precision. The maximum value of [float] is approximately [code]1.79769e308[/code], and the minimum is approximately [code]-1.79769e308[/code].
 		Many methods and properties in the engine use 32-bit single-precision floating-point numbers instead, equivalent to [code skip-lint]float[/code] in C++, which have 6 reliable decimal digits of precision. For data structures such as [Vector2] and [Vector3], Godot uses 32-bit floating-point numbers by default, but it can be changed to use 64-bit doubles if Godot is compiled with the [code]precision=double[/code] option.
 		Math done using the [float] type is not guaranteed to be exact and will often result in small errors. You should usually use the [method @GlobalScope.is_equal_approx] and [method @GlobalScope.is_zero_approx] methods instead of [code]==[/code] to compare [float] values for equality.
-		[b]Note:[/b] In a boolean context, a [float] will evaluate to [code]false[/code] if it's exactly equal to [code]0.0[/code], and to [code]true[/code] otherwise.
 	</description>
 	<tutorials>
 		<link title="Wikipedia: Double-precision floating-point format">https://en.wikipedia.org/wiki/Double-precision_floating-point_format</link>
diff --git a/engine/doc/tools/make_rst.py b/engine/doc/tools/make_rst.py
index f95a9784..3f704bdd 100755
--- a/engine/doc/tools/make_rst.py
+++ b/engine/doc/tools/make_rst.py
@@ -102,14 +102,19 @@ CLASS_GROUPS: dict[str, str] = {
     "editor": "Editor-only",
     "variant": "Variant types",
 }
-
 CLASS_GROUPS_BASE: dict[str, str] = {
     "node": "Node",
     "resource": "Resource",
     "object": "Object",
     "variant": "Variant",
 }
-
+# Sync with editor\register_editor_types.cpp
+EDITOR_CLASSES: list[str] = [
+    "FileSystemDock",
+    "ScriptCreateDialog",
+    "ScriptEditor",
+    "ScriptEditorBase",
+]
 # Sync with the types mentioned in https://docs.godotengine.org/en/stable/tutorials/scripting/c_sharp/c_sharp_differences.html
 CLASSES_WITH_CSHARP_DIFFERENCES: list[str] = [
     "@GlobalScope",
@@ -179,8 +184,6 @@ class State:
         if inherits is not None:
             class_def.inherits = inherits
 
-        class_def.api_type = class_root.get("api_type")
-
         class_def.deprecated = class_root.get("deprecated")
         class_def.experimental = class_root.get("experimental")
 
@@ -592,8 +595,8 @@ class ClassDef(DefinitionBase):
     def __init__(self, name: str) -> None:
         super().__init__("class", name)
 
-        self.class_group: str = "variant"
-        self.api_type: str | None = None
+        self.class_group = "variant"
+        self.editor_class = self._is_editor_class()
 
         self.constants: OrderedDict[str, ConstantDef] = OrderedDict()
         self.enums: OrderedDict[str, EnumDef] = OrderedDict()
@@ -613,6 +616,14 @@ class ClassDef(DefinitionBase):
         # Used to match the class with XML source for output filtering purposes.
         self.filepath: str = ""
 
+    def _is_editor_class(self) -> bool:
+        if self.name.startswith("Editor"):
+            return True
+        if self.name in EDITOR_CLASSES:
+            return True
+
+        return False
+
     def update_class_group(self, state: State) -> None:
         group_name = "variant"
 
@@ -788,7 +799,7 @@ def main() -> None:
             grouped_classes[class_def.class_group] = []
         grouped_classes[class_def.class_group].append(class_name)
 
-        if class_def.api_type == "editor":
+        if class_def.editor_class:
             if "editor" not in grouped_classes:
                 grouped_classes["editor"] = []
             grouped_classes["editor"].append(class_name)
@@ -1858,20 +1869,7 @@ def format_text_block(
 
     pos = 0
     tag_depth = 0
-    debug_tag_stack: list[str] = []
     while True:
-        if tag_depth > 2 or (
-            tag_depth == 2
-            and not (
-                debug_tag_stack[0] == "codeblocks"
-                and (debug_tag_stack[1] == "gdscript" or debug_tag_stack[1] == "csharp")
-            )
-        ):
-            print_warning(
-                f"{state.current_class}.xml: Found nested tags [{']['.join(debug_tag_stack)}] in {context_name} (online doc will contain invalid RST markup).",
-                state,
-            )
-
         pos = text.find("[", pos)
         if pos == -1:
             break
@@ -1910,7 +1908,6 @@ def format_text_block(
                     if is_in_tagset(tag_state.name, RESERVED_CODEBLOCK_TAGS):
                         tag_text = ""
                         tag_depth -= 1
-                        debug_tag_stack.pop()
                         inside_code = False
                         ignore_code_warnings = False
                         # Strip newline if the tag was alone on one
@@ -1920,7 +1917,6 @@ def format_text_block(
                     elif is_in_tagset(tag_state.name, ["code"]):
                         tag_text = "``"
                         tag_depth -= 1
-                        debug_tag_stack.pop()
                         inside_code = False
                         ignore_code_warnings = False
                         escape_post = True
@@ -1950,18 +1946,15 @@ def format_text_block(
                     has_codeblocks_csharp = False
 
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                     tag_text = ""
                     inside_code_tabs = False
                 else:
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                     tag_text = "\n.. tabs::"
                     inside_code_tabs = True
 
             elif is_in_tagset(tag_state.name, RESERVED_CODEBLOCK_TAGS):
                 tag_depth += 1
-                debug_tag_stack.append(tag_state.name)
 
                 if tag_state.name == "gdscript":
                     if not inside_code_tabs:
@@ -2001,7 +1994,6 @@ def format_text_block(
             elif is_in_tagset(tag_state.name, ["code"]):
                 tag_text = "``"
                 tag_depth += 1
-                debug_tag_stack.append(tag_state.name)
 
                 inside_code = True
                 inside_code_tag = "code"
@@ -2288,12 +2280,6 @@ def format_text_block(
                         )
                         break
                     link_title = text[endq_pos + 1 : endurl_pos]
-                    for rft in RESERVED_FORMATTING_TAGS:
-                        if link_title.find(f"[{rft}]") != -1:
-                            print_warning(
-                                f"{state.current_class}.xml: Found nested tags [url][{rft}] in {context_name} (online doc will contain invalid RST markup).",
-                                state,
-                            )
                     tag_text = make_link(url_target, link_title)
 
                     pre_text = text[:pos]
@@ -2318,42 +2304,34 @@ def format_text_block(
             elif tag_state.name == "center":
                 if tag_state.closing:
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                 else:
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                 tag_text = ""
 
             elif tag_state.name == "i":
                 if tag_state.closing:
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                     escape_post = True
                 else:
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                     escape_pre = True
                 tag_text = "*"
 
             elif tag_state.name == "b":
                 if tag_state.closing:
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                     escape_post = True
                 else:
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                     escape_pre = True
                 tag_text = "**"
 
             elif tag_state.name == "u":
                 if tag_state.closing:
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                     escape_post = True
                 else:
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                     escape_pre = True
                 tag_text = ""
 
@@ -2367,12 +2345,10 @@ def format_text_block(
                 tag_text = "`"
                 if tag_state.closing:
                     tag_depth -= 1
-                    debug_tag_stack.pop()
                     escape_post = True
                 else:
                     tag_text = ":kbd:" + tag_text
                     tag_depth += 1
-                    debug_tag_stack.append(tag_state.name)
                     escape_pre = True
 
             # Invalid syntax.
diff --git a/engine/doc/translations/de.po b/engine/doc/translations/de.po
index 8d46f3b4..8ddec8b0 100644
--- a/engine/doc/translations/de.po
+++ b/engine/doc/translations/de.po
@@ -114,12 +114,13 @@
 # Albert Sobral <albertsobral610@gmail.com>, 2025.
 # Dragon7 <nopenope@gmx.ch>, 2025.
 # asdad <zabooz1988@gmail.com>, 2026.
+# Alexander Klaus <alexander-klaus@outlook.de>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-20 09:04+0000\n"
-"Last-Translator: Rémi Verschelde <remi@godotengine.org>\n"
+"PO-Revision-Date: 2026-02-03 14:02+0000\n"
+"Last-Translator: Alexander Klaus <alexander-klaus@outlook.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/godot-"
 "class-reference/de/>\n"
 "Language: de\n"
@@ -14142,6 +14143,9 @@ msgstr ""
 "wenn [constant BILLBOARD_PARTICLES] verwendet wird. Siehe auch [member "
 "billboard_mode]."
 
+msgid "The point size in pixels. See [member use_point_size]."
+msgstr "Die Punktgröße in Pixeln. Siehe [member use_point_size]."
+
 msgid ""
 "Distance over which the fade effect takes place. The larger the distance the "
 "longer it takes for an object to fade."
@@ -14174,6 +14178,50 @@ msgstr ""
 "Textur, die verwendet wird, um die Stärke des Randbeleuchtungseffekts pro "
 "Pixel festzulegen. Multipliziert mit [member rim]."
 
+msgid ""
+"The amount of to blend light and albedo color when rendering rim effect. If "
+"[code]0[/code] the light color is used, while [code]1[/code] means albedo "
+"color is used. An intermediate value generally works best."
+msgstr ""
+"Die Stärke, mit der Licht- und Albedo-Farbe beim Rendern des Rim-Effekts "
+"gemischt werden. Bei [code]0[/code] wird die Lichtfarbe verwendet, bei "
+"[code]1[/code] die Albedo-Farbe. Ein Zwischenwert funktioniert in der Regel "
+"am besten."
+
+msgid ""
+"Surface reflection. A value of [code]0[/code] represents a perfect mirror "
+"while a value of [code]1[/code] completely blurs the reflection. See also "
+"[member metallic]."
+msgstr ""
+"Oberflächenreflexion. Ein Wert von [code]0[/code] entspricht einem perfekten "
+"Spiegel, während ein Wert von [code]1[/code] die Reflexion vollständig "
+"weichzeichnet. Siehe auch [member metallic]."
+
+msgid ""
+"Texture used to control the roughness per-pixel. Multiplied by [member "
+"roughness]."
+msgstr ""
+"Textur, mit der die Rauheit pro Pixel gesteuert wird. Wird mit [member "
+"roughness] multipliziert."
+
+msgid ""
+"If [code]true[/code], enables the \"shadow to opacity\" render mode where "
+"lighting modifies the alpha so shadowed areas are opaque and non-shadowed "
+"areas are transparent. Useful for overlaying shadows onto a camera feed in AR."
+msgstr ""
+"Wenn [code]true[/code], wird der Rendermodus „shadow to opacity“ aktiviert, "
+"bei dem die Beleuchtung den Alpha-Wert so verändert, sodass im Schatten "
+"liegende Bereiche deckend und beleuchtete Bereiche transparent sind. "
+"Nützlich, um Schatten in AR über ein Kamerabild zu legen."
+
+msgid ""
+"Texture used to control the subsurface scattering strength. Stored in the red "
+"texture channel. Multiplied by [member subsurf_scatter_strength]."
+msgstr ""
+"Textur, mit der die Stärke des Subsurface-Scatterings gesteuert wird. Im "
+"roten Texturkanal gespeichert. Wird mit [member subsurf_scatter_strength] "
+"multipliziert."
+
 msgid ""
 "If [code]true[/code], triplanar mapping for [code]UV[/code] is calculated in "
 "world space rather than object local space. See also [member uv1_triplanar]."
diff --git a/engine/doc/translations/es.po b/engine/doc/translations/es.po
index c66ed332..2bdb4721 100644
--- a/engine/doc/translations/es.po
+++ b/engine/doc/translations/es.po
@@ -115,7 +115,7 @@
 # Antonio SysPro <am6386771@gmail.com>, 2025.
 # 🍁 <cardenasjairods@gmail.com>, 2025.
 # Julián Lacomba <julian_alberto93@yahoo.com.ar>, 2025.
-# Nadie <ef.dal.1200@gmail.com>, 2025.
+# Nadie <ef.dal.1200@gmail.com>, 2025, 2026.
 # Chen Romero Juárez <mireyaromeroj@gmail.com>, 2025.
 # "Santiago Leonardo L." <pixelerito@gmail.com>, 2025.
 # iker-sr <saiz.iker12@gmail.com>, 2025.
@@ -124,7 +124,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-20 09:04+0000\n"
+"PO-Revision-Date: 2026-02-12 03:10+0000\n"
 "Last-Translator: Alejandro Moctezuma <moctezumaalejandro25@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/es/>\n"
@@ -5293,7 +5293,7 @@ msgid "Media play key."
 msgstr "Tecla de reproducción multimedia."
 
 msgid "Previous song key."
-msgstr "Tecla de Canción previa."
+msgstr "Tecla de Canción anterior."
 
 msgid "Next song key."
 msgstr "Tecla de Siguiente canción."
@@ -15607,6 +15607,35 @@ msgstr ""
 "Devuelve el objeto [AudioStreamPlayback] asociado a este "
 "[AudioStreamPlayer3D]."
 
+msgid ""
+"Determines which [Area3D] layers affect the sound for reverb and audio bus "
+"effects. Areas can be used to redirect [AudioStream]s so that they play in a "
+"certain audio bus. An example of how you might use this is making a \"water\" "
+"area so that sounds played in the water are redirected through an audio bus "
+"to make them sound like they are being played underwater."
+msgstr ""
+"Determina qué capas de [Area3D] afectan el sonido para la reverberación y los "
+"efectos del bus de audio. Las áreas pueden usarse para redirigir "
+"[AudioStream]s para que se reproduzcan en un bus de audio determinado. Un "
+"ejemplo de cómo podrías usar esto es creando un área de \"agua\" para que los "
+"sonidos reproducidos en el agua sean redirigidos a través de un bus de audio "
+"para hacer que suenen como si se estuvieran reproduciendo bajo el agua."
+
+msgid ""
+"The cutoff frequency of the attenuation low-pass filter, in Hz. A sound above "
+"this frequency is attenuated more than a sound below this frequency. To "
+"disable this effect, set this to [code]20500[/code] as this frequency is "
+"above the human hearing limit."
+msgstr ""
+"La frecuencia de corte del filtro de paso bajo de atenuación, en Hz. Un "
+"sonido por encima de esta frecuencia se atenúa más que un sonido por debajo "
+"de esta frecuencia. Para deshabilitar este efecto, establece esto en "
+"[code]20500[/code], ya que esta frecuencia está por encima del límite de "
+"audición humana."
+
+msgid "Amount how much the filter affects the loudness, in decibels."
+msgstr "Cantidad en que el filtro afecta el volumen, en decibelios."
+
 msgid ""
 "Decides if audio should get quieter with distance linearly, quadratically, "
 "logarithmically, or not be affected by distance, effectively disabling "
@@ -15616,6 +15645,46 @@ msgstr ""
 "cuadrática, logarítmica, o no ser afectado por la distancia, desactivando "
 "efectivamente la atenuación."
 
+msgid ""
+"If [code]true[/code], audio plays when the AudioStreamPlayer3D node is added "
+"to scene tree."
+msgstr ""
+"Si es [code]true[/code], el audio se reproduce cuando el nodo "
+"AudioStreamPlayer3D se añade al árbol de escenas."
+
+msgid ""
+"The bus on which this audio is playing.\n"
+"[b]Note:[/b] When setting this property, keep in mind that no validation is "
+"performed to see if the given name matches an existing bus. This is because "
+"audio bus layouts might be loaded after this property is set. If this given "
+"name can't be resolved at runtime, it will fall back to [code]\"Master\"[/"
+"code]."
+msgstr ""
+"El bus en el que se está reproduciendo este audio.\n"
+"[b]Nota:[/b] Al establecer esta propiedad, ten en cuenta que no se realiza "
+"ninguna validación para comprobar si el nombre dado coincide con un bus "
+"existente. Esto se debe a que las configuraciones de los buses de audio "
+"podrían cargarse después de que se establezca esta propiedad. Si este nombre "
+"dado no puede resolverse en tiempo de ejecución, se recurrirá a [code]"
+"\"Master\"[/code]."
+
+msgid ""
+"Decides in which step the Doppler effect should be calculated.\n"
+"[b]Note:[/b] If [member doppler_tracking] is not [constant "
+"DOPPLER_TRACKING_DISABLED] but the current [Camera3D]/[AudioListener3D] has "
+"doppler tracking disabled, the Doppler effect will be heard but will not take "
+"the movement of the current listener into account. If accurate Doppler effect "
+"is desired, doppler tracking should be enabled on both the "
+"[AudioStreamPlayer3D] and the current [Camera3D]/[AudioListener3D]."
+msgstr ""
+"Decide en qué paso se debe calcular el efecto Doppler.\n"
+"[b]Nota:[/b] Si [member doppler_tracking] no es [constant "
+"DOPPLER_TRACKING_DISABLED] pero el [Camera3D]/[AudioListener3D] actual tiene "
+"el seguimiento Doppler deshabilitado, el efecto Doppler se escuchará pero no "
+"tendrá en cuenta el movimiento del oyente actual. Si se desea un efecto "
+"Doppler preciso, el seguimiento Doppler debe estar habilitado tanto en el "
+"[AudioStreamPlayer3D] como en el [Camera3D]/[AudioListener3D] actual."
+
 msgid "The angle in which the audio reaches a listener unattenuated."
 msgstr "El ángulo en el que el audio llega a un oyente sin atenuarse."
 
@@ -15682,6 +15751,9 @@ msgstr ""
 "Para otras disposiciones de altavoces, como el 5.1 y el 7.1, se implementa el "
 "algoritmo SPCAP (Speaker-Placement Correction Amplitude)."
 
+msgid "The [AudioStream] resource to be played."
+msgstr "El recurso [AudioStream] que se va a reproducir."
+
 msgid ""
 "The factor for the attenuation effect. Higher values make the sound audible "
 "over a larger distance."
@@ -15866,6 +15938,46 @@ msgstr ""
 "Controla cómo este AudioStreamRandomizer elige qué AudioStream reproducir a "
 "continuación."
 
+msgid ""
+"The largest possible frequency multiplier of the random pitch variation. "
+"Pitch will be randomly chosen within a range of [code skip-lint]1.0 / "
+"random_pitch[/code] and [code skip-lint]random_pitch[/code]. A value of "
+"[code]1.0[/code] means no variation. A value of [code]2.0[/code] means pitch "
+"will be randomized between double and half.\n"
+"[b]Note:[/b] Setting this property also sets [member random_pitch_semitones]."
+msgstr ""
+"El mayor multiplicador de frecuencia posible de la variación de tono "
+"aleatoria. El tono se elegirá aleatoriamente dentro de un rango de [code skip-"
+"lint]1.0 / random_pitch[/code] y [code skip-lint]random_pitch[/code]. Un "
+"valor de [code]1.0[/code] significa que no hay variación. Un valor de "
+"[code]2.0[/code] significa que el tono se aleatorizará entre el doble y la "
+"mitad.\n"
+"[b]Nota:[/b] Establecer esta propiedad también establece [member "
+"random_pitch_semitones]."
+
+msgid ""
+"The largest possible distance, in semitones, of the random pitch variation. A "
+"value of [code]0.0[/code] means no variation.\n"
+"[b]Note:[/b] Setting this property also sets [member random_pitch]."
+msgstr ""
+"La mayor distancia posible, en semitonos, de la variación de tono aleatoria. "
+"Un valor de [code]0.0[/code] significa que no hay variación.\n"
+"[b]Nota:[/b] Establecer esta propiedad también establece [member "
+"random_pitch]."
+
+msgid ""
+"The intensity of random volume variation. Volume will be increased or "
+"decreased by a random value up to [code skip-lint]random_volume_offset_db[/"
+"code]. A value of [code]0.0[/code] means no variation. A value of [code]3.0[/"
+"code] means volume will be randomized between [code]-3.0 dB[/code] and [code]"
+"+3.0 dB[/code]."
+msgstr ""
+"La intensidad de la variación de volumen aleatoria. El volumen se aumentará o "
+"disminuirá en un valor aleatorio hasta [code skip-"
+"lint]random_volume_offset_db[/code]. Un valor de [code]0.0[/code] significa "
+"que no hay variación. Un valor de [code]3.0[/code] significa que el volumen "
+"se aleatorizará entre [code]-3.0 dB[/code] y [code]+3.0 dB[/code]."
+
 msgid "Get one of the synchronized streams, by index."
 msgstr "Obtener una de las transmisiones sincronizadas, por índice."
 
@@ -35579,9 +35691,161 @@ msgid "Copyright notice for the bundle visible to the user (localized)."
 msgstr ""
 "Aviso de derechos de autor del paquete visible para el usuario (localizado)."
 
+msgid ""
+"Application icon file. If left empty, it will fallback to [member "
+"ProjectSettings.application/config/macos_native_icon], and then to [member "
+"ProjectSettings.application/config/icon]."
+msgstr ""
+"Archivo del icono de la aplicación. Si se deja vacío, regresará a [member "
+"ProjectSettings.application/config/macos_native_icon] y, a continuación, a "
+"[member ProjectSettings.application/config/icon]."
+
+msgid ""
+"Minimum version of macOS required for this application to run on Apple "
+"Silicon Macs, in the [code]major.minor.patch[/code] or [code]major.minor[/"
+"code] format, can only contain numeric characters ([code]0-9[/code]) and "
+"periods ([code].[/code])."
+msgstr ""
+"Versión mínima de macOS requerida para que esta aplicación se ejecute en Macs "
+"con Apple Silicon, en formato [code]mayor.menor.parche[/code] o "
+"[code]mayor.menor[/code], solo puede contener caracteres numéricos "
+"([code]0-9[/code]) y puntos ([code].[/code])."
+
+msgid ""
+"Minimum version of macOS required for this application to run on Intel Macs, "
+"in the [code]major.minor.patch[/code] or [code]major.minor[/code] format, can "
+"only contain numeric characters ([code]0-9[/code]) and periods ([code].[/"
+"code])."
+msgstr ""
+"Versión mínima de macOS requerida para que esta aplicación se ejecute en Macs "
+"con Intel, en formato [code]mayor.menor.parche[/code] o [code]mayor.menor[/"
+"code], solo puede contener caracteres numéricos ([code]0-9[/code]) y puntos "
+"([code].[/code])."
+
+msgid ""
+"Application executable architecture.\n"
+"Supported architectures: [code]x86_64[/code], [code]arm64[/code], and "
+"[code]universal[/code] ([code]x86_64 + arm64[/code]).\n"
+"Official export templates include [code]universal[/code] binaries only."
+msgstr ""
+"Arquitectura del ejecutable de la aplicación.\n"
+"Arquitecturas soportadas: [code]x86_64[/code], [code]arm64[/code] y "
+"[code]universal[/code] ([code]x86_64 + arm64[/code]).\n"
+"Las plantillas de exportación oficiales solo incluyen binarios "
+"[code]universal[/code]."
+
+msgid ""
+"PKCS #12 certificate file used to sign [code].app[/code] bundle.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_MACOS_CODESIGN_CERTIFICATE_FILE[/code]."
+msgstr ""
+"Archivo de certificado PKCS #12 usado para firmar el paquete [code].app[/"
+"code].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_MACOS_CODESIGN_CERTIFICATE_FILE[/code]."
+
+msgid ""
+"Password for the certificate file used to sign [code].app[/code] bundle.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_MACOS_CODESIGN_CERTIFICATE_PASSWORD[/code]."
+msgstr ""
+"Contraseña del archivo de certificado usado para firmar el paquete "
+"[code].app[/code].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_MACOS_CODESIGN_CERTIFICATE_PASSWORD[/code]."
+
 msgid "Tool to use for code signing."
 msgstr "Herramienta a utilizar para la firma de código."
 
+msgid ""
+"Array of the additional command line arguments passed to the code signing "
+"tool."
+msgstr ""
+"Array de argumentos adicionales de la línea de comandos pasados a la "
+"herramienta de firma de código."
+
+msgid ""
+"Enable to allow access to contacts in the user's address book, if it's "
+"enabled you should also provide usage message in the [member privacy/"
+"address_book_usage_description] option. See [url=https://developer.apple.com/"
+"documentation/bundleresources/entitlements/com_apple_security_personal-"
+"information_addressbook]com.apple.security.personal-information.addressbook[/"
+"url]."
+msgstr ""
+"Habilita para permitir el acceso a los contactos en la libreta de direcciones "
+"del usuario; si está habilitado, también debes proporcionar un mensaje de uso "
+"en la opción [member privacy/address_book_usage_description]. Véase "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_security_personal-"
+"information_addressbook]com.apple.security.personal-information.addressbook[/"
+"url]."
+
+msgid ""
+"Allows app to use dynamic linker environment variables to inject code. If you "
+"are using add-ons with dynamic or self-modifying native code, enable them "
+"according to the add-on documentation. See [url=https://developer.apple.com/"
+"documentation/bundleresources/entitlements/com_apple_security_cs_allow-dyld-"
+"environment-variables]com.apple.security.cs.allow-dyld-environment-variables[/"
+"url]."
+msgstr ""
+"Permite que la aplicación use variables de entorno del enlazador dinámico "
+"para inyectar código. Si estás usando complementos con código nativo dinámico "
+"o auto-modificable, habilítalos según la documentación del complemento. Véase "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_security_cs_allow-dyld-environment-"
+"variables]com.apple.security.cs.allow-dyld-environment-variables[/url]."
+
+msgid ""
+"Allows creating writable and executable memory for JIT code. If you are using "
+"add-ons with dynamic or self-modifying native code, enable them according to "
+"the add-on documentation. See [url=https://developer.apple.com/documentation/"
+"bundleresources/entitlements/com_apple_security_cs_allow-"
+"jit]com.apple.security.cs.allow-jit[/url]."
+msgstr ""
+"Permite crear memoria escribible y ejecutable para código JIT. Si estás "
+"usando complementos con código nativo dinámico o auto-modificable, "
+"habilítalos según la documentación del complemento. Véase [url=https://"
+"developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_security_cs_allow-jit]com.apple.security.cs.allow-jit[/url]."
+
+msgid ""
+"Allows creating writable and executable memory without JIT restrictions. If "
+"you are using add-ons with dynamic or self-modifying native code, enable them "
+"according to the add-on documentation. See [url=https://developer.apple.com/"
+"documentation/bundleresources/entitlements/com_apple_security_cs_allow-"
+"unsigned-executable-memory]com.apple.security.cs.allow-unsigned-executable-"
+"memory[/url]."
+msgstr ""
+"Permite crear memoria escribible y ejecutable sin restricciones JIT. Si estás "
+"usando complementos con código nativo dinámico o auto-modificable, "
+"habilítalos según la documentación del complemento. Véase [url=https://"
+"developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_security_cs_allow-unsigned-executable-"
+"memory]com.apple.security.cs.allow-unsigned-executable-memory[/url]."
+
+msgid ""
+"Enable to allow app to interact with Bluetooth devices. This entitlement is "
+"required to use wireless controllers. See [url=https://developer.apple.com/"
+"documentation/bundleresources/entitlements/"
+"com_apple_security_device_bluetooth]com.apple.security.device.bluetooth[/url]."
+msgstr ""
+"Habilítalo para permitir que la aplicación interactúe con dispositivos "
+"Bluetooth. Este derecho es necesario para usar controladores inalámbricos. "
+"Véase [url=https://developer.apple.com/documentation/bundleresources/"
+"entitlements/"
+"com_apple_security_device_bluetooth]com.apple.security.device.bluetooth[/url]."
+
+msgid ""
+"Enable to allow app to interact with USB devices. This entitlement is "
+"required to use wired controllers. See [url=https://developer.apple.com/"
+"documentation/bundleresources/entitlements/"
+"com_apple_security_device_usb]com.apple.security.device.usb[/url]."
+msgstr ""
+"Habilítalo para permitir que la aplicación interactúe con dispositivos USB. "
+"Este derecho es necesario para usar controladores cableados. Véase "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_security_device_usb]com.apple.security.device.usb[/url]."
+
 msgid ""
 "Enable to allow app to establish outgoing network connections. See "
 "[url=https://developer.apple.com/documentation/bundleresources/entitlements/"
@@ -35633,38 +35897,818 @@ msgstr "Destino de distribución de aplicaciones."
 msgid "Tool to use for notarization."
 msgstr "Herramienta a utilizar para notarización."
 
+msgid ""
+"A message displayed when requesting access to the user's contacts (in "
+"English)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a los contactos del usuario (en "
+"inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's contacts (localized)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a los contactos del usuario "
+"(localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's calendar data (in "
+"English)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a los datos del calendario del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's calendar data "
+"(localized)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a los datos del calendario del "
+"usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Desktop\" folder "
+"(in English)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a la carpeta \"Escritorio\" del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Desktop\" folder "
+"(localized)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a la carpeta \"Escritorio\" del "
+"usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Documents\" folder "
+"(in English)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a la carpeta \"Documentos\" del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Documents\" folder "
+"(localized)."
+msgstr ""
+"Un mensaje mostrado al solicitar acceso a la carpeta \"Documentos\" del "
+"usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Downloads\" folder "
+"(in English)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a la carpeta \"Descargas\" del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's \"Downloads\" folder "
+"(localized)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a la carpeta \"Descargas\" del "
+"usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's location information "
+"(in English)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a la información de ubicación "
+"del usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's location information "
+"(localized)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a la información de ubicación "
+"del usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's network drives (in "
+"English)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a las unidades de red del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's network drives "
+"(localized)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a las unidades de red del "
+"usuario (localizado)."
+
+msgid ""
+"A message displayed when requesting access to the user's removable drives (in "
+"English)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a las unidades extraíbles del "
+"usuario (en inglés)."
+
+msgid ""
+"A message displayed when requesting access to the user's removable drives "
+"(localized)."
+msgstr ""
+"Un mensaje que se muestra al solicitar acceso a las unidades extraíbles del "
+"usuario (localizado)."
+
+msgid "macOS build number used to build application executable."
+msgstr ""
+"Número de compilación de macOS utilizado para construir el ejecutable de la "
+"aplicación."
+
+msgid "macOS SDK build number used to build application executable."
+msgstr ""
+"Número de compilación del SDK de macOS utilizado para construir el ejecutable "
+"de la aplicación."
+
+msgid "macOS SDK name used to build application executable."
+msgstr ""
+"Nombre del SDK de macOS utilizado para construir el ejecutable de la "
+"aplicación."
+
+msgid ""
+"macOS SDK version used to build application executable in the "
+"[code]major.minor[/code] format."
+msgstr ""
+"Versión del SDK de macOS utilizada para construir el ejecutable de la "
+"aplicación en el formato [code]major.minor[/code]."
+
+msgid "Xcode build number used to build application executable."
+msgstr ""
+"Número de compilación de Xcode usado para construir el ejecutable de la "
+"aplicación."
+
+msgid "Xcode version used to build application executable."
+msgstr "Versión de Xcode usada para construir el ejecutable de la aplicación."
+
+msgid "Base class for the desktop platform exporter (Windows and Linux/BSD)."
+msgstr ""
+"Clase base para el exportador de plataformas de escritorio (Windows y Linux/"
+"BSD)."
+
+msgid ""
+"The base class for the desktop platform exporters. These include Windows and "
+"Linux/BSD, but not macOS. See the classes inheriting from this one for more "
+"details."
+msgstr ""
+"La clase base para los exportadores de plataformas de escritorio. Estos "
+"incluyen Windows y Linux/BSD, pero no macOS. Véase las clases que heredan de "
+"esta para más detalles."
+
 msgid "Exporting for Windows"
 msgstr "Exportar a Windows"
 
 msgid "Exporter for visionOS."
 msgstr "Exportador de visionOS."
 
+msgid ""
+"The \"Full Name\", \"Common Name\" or SHA-1 hash of the signing identity used "
+"for debug export."
+msgstr ""
+"El \"nombre completo\", \"nombre común\" o hash SHA-1 de la identidad de "
+"firma usada para la exportación de depuración."
+
+msgid ""
+"The \"Full Name\", \"Common Name\" or SHA-1 hash of the signing identity used "
+"for release export."
+msgstr ""
+"El \"nombre completo\", \"nombre común\" o hash SHA-1 de la identidad de "
+"firma usada para la exportación de lanzamiento."
+
+msgid ""
+"Name of the provisioning profile. Sets XCode PROVISIONING_PROFILE_SPECIFIER "
+"for debug. [url=https://developer.apple.com/documentation/xcode/build-"
+"settings-reference#Provisioning-Profile]Used for manual provisioning[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_APPLE_PLATFORM_PROFILE_SPECIFIER_DEBUG[/code]."
+msgstr ""
+"Nombre del perfil de aprovisionamiento. Establece XCode "
+"PROVISIONING_PROFILE_SPECIFIER para depuración. [url=https://"
+"developer.apple.com/documentation/xcode/build-settings-reference#Provisioning-"
+"Profile]Usado para aprovisionamiento manual[/url].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_APPLE_PLATFORM_PROFILE_SPECIFIER_DEBUG[/code]."
+
+msgid ""
+"Name of the provisioning profile. Sets XCode PROVISIONING_PROFILE_SPECIFIER "
+"for release. [url=https://developer.apple.com/documentation/xcode/build-"
+"settings-reference#Provisioning-Profile]Used for manual provisioning[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_APPLE_PLATFORM_PROFILE_SPECIFIER_RELEASE[/code]."
+msgstr ""
+"Nombre del perfil de aprovisionamiento. Establece XCode "
+"PROVISIONING_PROFILE_SPECIFIER para lanzamiento. [url=https://"
+"developer.apple.com/documentation/xcode/build-settings-reference#Provisioning-"
+"Profile]Usado para aprovisionamiento manual[/url].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_APPLE_PLATFORM_PROFILE_SPECIFIER_RELEASE[/code]."
+
+msgid ""
+"Requires the graphics performance and features of the A12 Bionic and later "
+"chips (devices supporting all Vulkan renderer features).\n"
+"Enabling this option limits supported devices to: iPhone XS, iPhone XR, iPad "
+"Mini (5th gen.), iPad Air (3rd gen.), iPad (8th gen) and newer."
+msgstr ""
+"Requiere el rendimiento gráfico y las características de los chips A12 Bionic "
+"y posteriores (dispositivos compatibles con todas las características del "
+"renderizador Vulkan).\n"
+"Habilitar esta opción limita los dispositivos compatibles a: iPhone XS, "
+"iPhone XR, iPad Mini (5ª gen.), iPad Air (3ª gen.), iPad (8ª gen) y "
+"posteriores."
+
+msgid ""
+"If [code]true[/code], shaders will be compiled and embedded in the "
+"application. This option is only supported when using the Forward+ and Mobile "
+"renderers.\n"
+"[b]Note:[/b] When exporting as a dedicated server, the shader baker is always "
+"disabled since no rendering is performed."
+msgstr ""
+"Si es [code]true[/code], los shaders se compilarán e incrustarán en la "
+"aplicación. Esta opción sólo es compatible cuando se utilizan los "
+"renderizadores Forward+ y Mobile.\n"
+"[b]Nota:[/b] Al exportar como servidor dedicado, el compilador de shaders "
+"siempre está deshabilitado, ya que no se realiza ninguna renderización."
+
 msgid "Exporter for the Web."
 msgstr "Exportador para la Web."
 
+msgid ""
+"The Web exporter customizes how a web build is handled. In the editor's "
+"\"Export\" window, it is created when adding a new \"Web\" preset.\n"
+"[b]Note:[/b] Godot on Web is rendered inside a [code]<canvas>[/code] tag. "
+"Normally, the canvas cannot be positioned or resized manually, but otherwise "
+"acts as the main [Window] of the application."
+msgstr ""
+"El exportador web personaliza cómo se gestiona una compilación web. En la "
+"ventana \"Exportar\" del editor, se crea al añadir un nuevo preset \"Web\".\n"
+"[b]Nota:[/b] Godot en la Web se renderiza dentro de una etiqueta "
+"[code]<canvas>[/code]. Normalmente, el canvas no puede posicionarse o "
+"redimensionarse manualmente, pero por lo demás actúa como la [Window] "
+"principal de la aplicación."
+
+msgid "Exporting for the Web"
+msgstr "Exportar para la Web"
+
 msgid "Web documentation index"
 msgstr "Índice de documentación web"
 
+msgid ""
+"File path to the custom export template used for debug builds. If left empty, "
+"the default template is used."
+msgstr ""
+"Ruta del archivo de la plantilla de exportación personalizada utilizada para "
+"las compilaciones de depuración. Si se deja vacío, se utiliza la plantilla "
+"predeterminada."
+
+msgid ""
+"File path to the custom export template used for release builds. If left "
+"empty, the default template is used."
+msgstr ""
+"Ruta del archivo de la plantilla de exportación personalizada utilizada para "
+"las compilaciones de lanzamiento. Si se deja vacío, se utiliza la plantilla "
+"predeterminada."
+
+msgid ""
+"Determines how the canvas should be resized by Godot.\n"
+"- [b]None:[/b] The canvas is not automatically resized.\n"
+"- [b]Project:[/b] The size of the canvas is dependent on the "
+"[ProjectSettings].\n"
+"- [b]Adaptive:[/b] The canvas is automatically resized to fit as much of the "
+"web page as possible."
+msgstr ""
+"Determina cómo debe ser redimensionado el canvas por Godot.\n"
+"- [b]Ninguno:[/b] El canvas no se redimensiona automáticamente.\n"
+"- [b]Proyecto:[/b] El tamaño del canvas depende de la [ProjectSettings].\n"
+"- [b]Adaptativo:[/b] El canvas se redimensiona automáticamente para ajustarse "
+"a la mayor parte posible de la página web."
+
+msgid ""
+"The custom HTML page that wraps the exported web build. If left empty, the "
+"default HTML shell is used.\n"
+"For more information, see the [url=$DOCS_URL/tutorials/platform/web/"
+"customizing_html5_shell.html]Customizing HTML5 Shell[/url] tutorial."
+msgstr ""
+"La página HTML personalizada que envuelve la compilación web exportada. Si se "
+"deja vacío, se utiliza el shell de HTML predeterminado.\n"
+"Para más información, consulta el tutorial [url=$DOCS_URL/tutorials/platform/"
+"web/customizing_html5_shell.html]Customizing HTML5 Shell[/url]."
+
+msgid ""
+"If [code]true[/code], embeds support for a virtual keyboard into the web "
+"page, which is shown when necessary on touchscreen devices."
+msgstr ""
+"Si es [code]true[/code], se incrusta soporte para un teclado virtual en la "
+"página web, el cual se muestra cuando es necesario en dispositivos con "
+"pantalla táctil."
+
+msgid ""
+"If [code]true[/code], the project icon will be used as the favicon for this "
+"application's web page."
+msgstr ""
+"Si es [code]true[/code], el icono del proyecto se utilizará como favicon para "
+"la página web de esta aplicación."
+
+msgid ""
+"If [code]true[/code], the canvas will be focused as soon as the application "
+"is loaded, if the browser window is already in focus."
+msgstr ""
+"Si es [code]true[/code], el canvas se enfocará tan pronto como la aplicación "
+"se cargue, si la ventana del navegador ya está enfocada."
+
+msgid ""
+"Additional HTML tags to include inside the [code]<head>[/code], such as "
+"[code]<meta>[/code] tags.\n"
+"[b]Note:[/b] You do not need to add a [code]<title>[/code] tag, as it is "
+"automatically included based on the project's name."
+msgstr ""
+"Etiquetas HTML adicionales para incluir dentro de [code]<head>[/code], como "
+"etiquetas [code]<meta>[/code].\n"
+"[b]Nota:[/b] No necesitas añadir una etiqueta [code]<title>[/code], ya que se "
+"incluye automáticamente basándose en el nombre del proyecto."
+
 msgid "The background color used behind the web application."
 msgstr "El color de fondo utilizado detrás de la aplicación web."
 
+msgid ""
+"The [url=https://developer.mozilla.org/en-US/docs/Web/Manifest/"
+"display/]display mode[/url] to use for this progressive web application. "
+"Different browsers and platforms may not behave the same.\n"
+"- [b]Fullscreen:[/b] Displays the app in fullscreen and hides all of the "
+"browser's UI elements.\n"
+"- [b]Standalone:[/b] Displays the app in a separate window and hides all of "
+"the browser's UI elements.\n"
+"- [b]Minimal UI:[/b] Displays the app in a separate window and only shows the "
+"browser's UI elements for navigation.\n"
+"- [b]Browser:[/b] Displays the app as a normal web page."
+msgstr ""
+"El [url=https://developer.mozilla.org/en-US/docs/Web/Manifest/display/]modo "
+"de visualización[/url] a utilizar para esta aplicación web progresiva. "
+"Diferentes navegadores y plataformas pueden no comportarse de la misma "
+"manera.\n"
+"- [b]Pantalla completa:[/b] Muestra la aplicación en pantalla completa y "
+"oculta todos los elementos de la interfaz de usuario del navegador.\n"
+"- [b]Independiente:[/b] Muestra la aplicación en una ventana separada y "
+"oculta todos los elementos de la interfaz de usuario del navegador.\n"
+"- [b]Interfaz de usuario mínima:[/b] Muestra la aplicación en una ventana "
+"separada y solo muestra los elementos de la interfaz de usuario del navegador "
+"para la navegación.\n"
+"- [b]Navegador:[/b] Muestra la aplicación como una página web normal."
+
+msgid ""
+"If [code]true[/code], turns this web build into a [url=https://"
+"en.wikipedia.org/wiki/Progressive_web_app]progressive web application[/url] "
+"(PWA)."
+msgstr ""
+"Si es [code]true[/code], convierte esta compilación web en una [url=https://"
+"en.wikipedia.org/wiki/Progressive_web_app]aplicación web progresiva[/url] "
+"(PWA)."
+
+msgid ""
+"When enabled, the progressive web app will make sure that each request has "
+"cross-origin isolation headers (COEP/COOP).\n"
+"This can simplify the setup to serve the exported game."
+msgstr ""
+"Cuando está habilitada, la aplicación web progresiva se asegurará de que cada "
+"solicitud tenga cabeceras de aislamiento de origen cruzado (COEP/COOP).\n"
+"Esto puede simplificar la configuración para servir el juego exportado."
+
+msgid ""
+"File path to the smallest icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 144×144, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Ruta del archivo al icono más pequeño para esta aplicación web. Si no se "
+"define, se usará el icono del proyecto por defecto.\n"
+"[b]Nota:[/b] Si el icono no es de 144×144, se redimensionará automáticamente "
+"para la compilación final."
+
+msgid ""
+"File path to the small icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 180×180, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Ruta del archivo al icono pequeño para esta aplicación web. Si no se define, "
+"se usa el icono del proyecto por defecto.\n"
+"[b]Nota:[/b] Si el icono no es de 180×180, se redimensionará automáticamente "
+"para la compilación final."
+
+msgid ""
+"File path to the largest icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 512×512, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Ruta del archivo al icono más grande para esta aplicación web. Si no se "
+"define, se usa el icono del proyecto por defecto.\n"
+"[b]Nota:[/b] Si el icono no es de 512×512, se redimensionará automáticamente "
+"para la compilación final."
+
+msgid ""
+"The page to display, should the server hosting the page not be available. "
+"This page is saved in the client's machine."
+msgstr ""
+"La página a mostrar si el servidor que aloja la página no está disponible. "
+"Esta página se guarda en la máquina del cliente."
+
+msgid ""
+"The orientation to use when the web application is run through a mobile "
+"device.\n"
+"- [b]Any:[/b] No orientation is forced.\n"
+"- [b]Landscape:[/b] Forces a horizontal layout (wider than it is taller).\n"
+"- [b]Portrait:[/b] Forces a vertical layout (taller than it is wider)."
+msgstr ""
+"La orientación a usar cuando la aplicación web se ejecuta en un dispositivo "
+"móvil.\n"
+"- [b]Cualquiera:[/b] No se fuerza ninguna orientación.\n"
+"- [b]Horizontal:[/b] Fuerza un diseño horizontal (más ancho que alto).\n"
+"- [b]Vertical:[/b] Fuerza un diseño vertical (más alto que ancho)."
+
+msgid ""
+"The number of threads that emscripten will allocate at startup. A smaller "
+"value will allocate fewer threads and consume fewer system resources, but you "
+"may run the risk of running out of threads in the pool and needing to "
+"allocate more threads at run time which may cause a deadlock.\n"
+"[b]Note:[/b] Some browsers have a hard cap on the number of threads that can "
+"be allocated, so it is best to be cautious and keep this number low."
+msgstr ""
+"El número de hilos que Emscripten asignará al inicio. Un valor más pequeño "
+"asignará menos hilos y consumirá menos recursos del sistema, pero puedes "
+"correr el riesgo de quedarte sin hilos en el pool y necesitar asignar más "
+"hilos en tiempo de ejecución, lo que podría causar un interbloqueo.\n"
+"[b]Nota:[/b] Algunos navegadores tienen un límite estricto en el número de "
+"hilos que se pueden asignar, por lo que es mejor ser cauteloso y mantener "
+"este número bajo."
+
+msgid ""
+"Override for the default size of the [WorkerThreadPool]. This setting is used "
+"when [member ProjectSettings.threading/worker_pool/max_threads] size is set "
+"to [code]-1[/code] (which it is by default). This size must be smaller than "
+"[member threads/emscripten_pool_size] otherwise deadlocks may occur.\n"
+"When using threads, this size needs to be large enough to accommodate "
+"features that rely on having a dedicated thread like [member "
+"ProjectSettings.physics/2d/run_on_separate_thread] or [member "
+"ProjectSettings.rendering/driver/threads/thread_model]. In general, it is "
+"best to ensure that this is at least [code]4[/code] and is at least [code]2[/"
+"code] or [code]3[/code] less than [member threads/emscripten_pool_size]."
+msgstr ""
+"Sobrescritura del tamaño predeterminado de [WorkerThreadPool]. Esta "
+"configuración se utiliza cuando el tamaño de [member "
+"ProjectSettings.threading/worker_pool/max_threads] se establece en [code]-1[/"
+"code] (que es el valor por defecto). Este tamaño debe ser menor que [member "
+"threads/emscripten_pool_size], de lo contrario podrían producirse "
+"interbloqueos.\n"
+"Cuando se usan hilos, este tamaño debe ser lo suficientemente grande para "
+"acomodar características que dependen de tener un hilo dedicado, como [member "
+"ProjectSettings.physics/2d/run_on_separate_thread] o [member "
+"ProjectSettings.rendering/driver/threads/thread_model]. En general, es mejor "
+"asegurarse de que sea al menos [code]4[/code] y al menos [code]2[/code] o "
+"[code]3[/code] menos que [member threads/emscripten_pool_size]."
+
 msgid "If [code]true[/code] enables [GDExtension] support for this web build."
 msgstr ""
 "Si es [code]true[/code], habilita la compatibilidad con [GDExtension] para "
 "esta compilación web."
 
+msgid ""
+"If [code]true[/code], the exported game will support threads. It requires "
+"[url=https://web.dev/articles/coop-coep]a \"cross-origin isolated\" website[/"
+"url], which may be difficult to set up and is limited for security reasons "
+"(such as not being able to communicate with third-party websites).\n"
+"If [code]false[/code], the exported game will not support threads. As a "
+"result, it is more prone to performance and audio issues, but will only "
+"require to be run on an HTTPS website."
+msgstr ""
+"Si es [code]true[/code], el juego exportado soportará hilos. Requiere "
+"[url=https://web.dev/articles/coop-coep]un sitio web \"cross-origin "
+"isolated\"[/url], lo cual puede ser difícil de configurar y está limitado por "
+"razones de seguridad (como no poder comunicarse con sitios web de terceros).\n"
+"Si es [code]false[/code], el juego exportado no soportará hilos. Como "
+"resultado, es más propenso a problemas de rendimiento y audio, pero solo "
+"requerirá ejecutarse en un sitio web HTTPS."
+
+msgid ""
+"If [code]true[/code], allows textures to be optimized for desktop through the "
+"S3TC/BPTC algorithm."
+msgstr ""
+"Si es [code]true[/code], permite que las texturas se optimicen para "
+"escritorio mediante el algoritmo S3TC/BPTC."
+
+msgid ""
+"If [code]true[/code] allows textures to be optimized for mobile through the "
+"ETC2/ASTC algorithm."
+msgstr ""
+"Si es [code]true[/code], permite que las texturas se optimicen para móviles "
+"mediante el algoritmo ETC2/ASTC."
+
 msgid "Exporter for Windows."
 msgstr "Exportador para Windows."
 
+msgid ""
+"The Windows exporter customizes how a Windows build is handled. In the "
+"editor's \"Export\" window, it is created when adding a new \"Windows\" "
+"preset."
+msgstr ""
+"El exportador de Windows personaliza cómo se maneja una compilación de "
+"Windows. En la ventana \"Exportar\" del editor, se crea al añadir un nuevo "
+"preajuste de \"Windows\"."
+
+msgid ""
+"Company that produced the application. Required. See [url=https://"
+"learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+msgstr ""
+"Compañía que produjo la aplicación. Requerido. Véase [url=https://"
+"learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+
+msgid ""
+"Console wrapper icon file. If left empty, it will fallback to [member "
+"application/icon], then to [member ProjectSettings.application/config/"
+"windows_native_icon], and lastly, [member ProjectSettings.application/config/"
+"icon]."
+msgstr ""
+"Archivo de icono del envoltorio de la consola. Si se deja vacío, se recurrirá "
+"a [member application/icon], luego a [member ProjectSettings.application/"
+"config/windows_native_icon], y finalmente, a [member "
+"ProjectSettings.application/config/icon]."
+
+msgid ""
+"Copyright notice for the bundle visible to the user. Optional. See "
+"[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+msgstr ""
+"Aviso de copyright para el paquete visible para el usuario. Opcional. Véase "
+"[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+
+msgid ""
+"If [code]true[/code], and [member application/export_d3d12] is set, the "
+"Agility SDK DLLs will be stored in arch-specific subdirectories."
+msgstr ""
+"Si es [code]true[/code], y se establece [member application/export_d3d12], "
+"las DLL de Agility SDK se almacenarán en subdirectorios específicos de la "
+"arquitectura."
+
+msgid ""
+"If set to [code]1[/code], the Direct3D 12 runtime libraries (Agility SDK, "
+"PIX) are exported with the exported application. If set to [code]0[/code], "
+"Direct3D 12 libraries are exported only if [member ProjectSettings.rendering/"
+"rendering_device/driver] is set to [code]\"d3d12\"[/code]."
+msgstr ""
+"Si se establece en [code]1[/code], las bibliotecas de tiempo de ejecución de "
+"Direct3D 12 (Agility SDK, PIX) se exportan con la aplicación exportada. Si se "
+"establece en [code]0[/code], las bibliotecas de Direct3D 12 se exportan solo "
+"si [member ProjectSettings.rendering/rendering_device/driver] se establece en "
+"[code]\"d3d12\"[/code]."
+
+msgid ""
+"File description to be presented to users. Required. See [url=https://"
+"learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+msgstr ""
+"Descripción del archivo a presentar a los usuarios. Requerido. Véase "
+"[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+
+msgid ""
+"Version number of the file. Falls back to [member ProjectSettings.application/"
+"config/version] if left empty. See [url=https://learn.microsoft.com/en-us/"
+"windows/win32/menurc/stringfileinfo-block]StringFileInfo[/url]."
+msgstr ""
+"Número de versión del archivo. Vuelve a [member ProjectSettings.application/"
+"config/version] si se deja vacío. Véase [url=https://learn.microsoft.com/en-"
+"us/windows/win32/menurc/stringfileinfo-block]StringFileInfo[/url]."
+
+msgid ""
+"Application icon file. If left empty, it will fallback to [member "
+"ProjectSettings.application/config/windows_native_icon], and then to [member "
+"ProjectSettings.application/config/icon]."
+msgstr ""
+"Archivo de icono de la aplicación. Si se deja vacío, volverá a [member "
+"ProjectSettings.application/config/windows_native_icon], y luego a [member "
+"ProjectSettings.application/config/icon]."
+
+msgid ""
+"If enabled, icon and metadata of the exported executable is set according to "
+"the other [code]application/*[/code] values."
+msgstr ""
+"Si está habilitado, el icono y los metadatos del ejecutable exportado se "
+"establecen según los demás valores de [code]application/*[/code]."
+
+msgid ""
+"Name of the application. Required. See [url=https://learn.microsoft.com/en-us/"
+"windows/win32/menurc/stringfileinfo-block]StringFileInfo[/url]."
+msgstr ""
+"Nombre de la aplicación. Requerido. Véase [url=https://learn.microsoft.com/en-"
+"us/windows/win32/menurc/stringfileinfo-block]StringFileInfo[/url]."
+
+msgid ""
+"Application version visible to the user. Falls back to [member "
+"ProjectSettings.application/config/version] if left empty. See [url=https://"
+"learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+msgstr ""
+"Versión de la aplicación visible para el usuario. Vuelve a [member "
+"ProjectSettings.application/config/version] si se deja vacío. Véase "
+"[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+
+msgid ""
+"Trademarks and registered trademarks that apply to the file. Optional. See "
+"[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
+"block]StringFileInfo[/url]."
+msgstr ""
+"Marcas comerciales y marcas registradas que se aplican al archivo. Opcional. "
+"Véase [url=https://learn.microsoft.com/en-us/windows/win32/menurc/"
+"stringfileinfo-block]StringFileInfo[/url]."
+
+msgid ""
+"Application executable architecture.\n"
+"Supported architectures: [code]x86_32[/code], [code]x86_64[/code], and "
+"[code]arm64[/code]."
+msgstr ""
+"Arquitectura del ejecutable de la aplicación.\n"
+"Arquitecturas soportadas: [code]x86_32[/code], [code]x86_64[/code] y "
+"[code]arm64[/code]."
+
+msgid ""
+"Array of the additional command line arguments passed to the code signing "
+"tool. See [url=https://learn.microsoft.com/en-us/dotnet/framework/tools/"
+"signtool-exe]Sign Tool[/url]."
+msgstr ""
+"Array de los argumentos adicionales de línea de comandos pasados a la "
+"herramienta de firma de código. Véase [url=https://learn.microsoft.com/en-us/"
+"dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+
+msgid ""
+"Description of the signed content. See [url=https://learn.microsoft.com/en-us/"
+"dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+msgstr ""
+"Descripción del contenido firmado. Véase [url=https://learn.microsoft.com/en-"
+"us/dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+
+msgid ""
+"Digest algorithm to use for creating signature. See [url=https://"
+"learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+msgstr ""
+"Algoritmo de resumen a utilizar para crear la firma. Véase [url=https://"
+"learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+
 msgid "If [code]true[/code], executable signing is enabled."
 msgstr "Si es [code]true[/code], la firma ejecutable está habilitada."
 
+msgid ""
+"PKCS #12 certificate file used to sign executable or certificate SHA-1 hash "
+"(if [member codesign/identity_type] is set to \"Use certificate store\"). See "
+"[url=https://learn.microsoft.com/en-us/dotnet/framework/tools/signtool-"
+"exe]Sign Tool[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_WINDOWS_CODESIGN_IDENTITY[/code]."
+msgstr ""
+"Archivo de certificado PKCS #12 utilizado para firmar el ejecutable o hash "
+"SHA-1 del certificado (si [member codesign/identity_type] está configurado "
+"como \"Usar almacén de certificados\"). Véase [url=https://"
+"learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe]Sign Tool[/"
+"url].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_WINDOWS_CODESIGN_IDENTITY[/code]."
+
+msgid ""
+"Type of identity to use. See [url=https://learn.microsoft.com/en-us/dotnet/"
+"framework/tools/signtool-exe]Sign Tool[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_WINDOWS_CODESIGN_IDENTITY_TYPE[/code]."
+msgstr ""
+"Tipo de identidad a utilizar. Véase [url=https://learn.microsoft.com/en-us/"
+"dotnet/framework/tools/signtool-exe]Sign Tool[/url].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_WINDOWS_CODESIGN_IDENTITY_TYPE[/code]."
+
+msgid ""
+"Password for the certificate file used to sign executable. See [url=https://"
+"learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe]Sign Tool[/"
+"url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_WINDOWS_CODESIGN_PASSWORD[/code]."
+msgstr ""
+"Contraseña para el archivo de certificado utilizado para firmar el "
+"ejecutable. Véase [url=https://learn.microsoft.com/en-us/dotnet/framework/"
+"tools/signtool-exe]Sign Tool[/url].\n"
+"Puede ser sobrescrito con la variable de entorno "
+"[code]GODOT_WINDOWS_CODESIGN_PASSWORD[/code]."
+
+msgid ""
+"If [code]true[/code], time-stamp is added to the signature. See [url=https://"
+"learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe]Sign Tool[/url]."
+msgstr ""
+"Si [code]true[/code], se añade una marca de tiempo a la firma. Véase "
+"[url=https://learn.microsoft.com/en-us/dotnet/framework/tools/signtool-"
+"exe]Sign Tool[/url]."
+
+msgid ""
+"URL of the time stamp server. If left empty, the default server is used. See "
+"[url=https://learn.microsoft.com/en-us/dotnet/framework/tools/signtool-"
+"exe]Sign Tool[/url]."
+msgstr ""
+"URL del servidor de marcas de tiempo. Si se deja vacío, se utiliza el "
+"servidor predeterminado. Véase [url=https://learn.microsoft.com/en-us/dotnet/"
+"framework/tools/signtool-exe]Sign Tool[/url]."
+
+msgid ""
+"If [code]true[/code], a console wrapper executable is exported alongside the "
+"main executable, which allows running the project with enabled console output."
+msgstr ""
+"Si [code]true[/code], se exporta un ejecutable contenedor de consola junto "
+"con el ejecutable principal, lo que permite ejecutar el proyecto con la "
+"salida de consola habilitada."
+
 msgid "A script that is executed when exporting the project."
 msgstr "Un script que se ejecuta al exportar el proyecto."
 
+msgid ""
+"[EditorExportPlugin]s are automatically invoked whenever the user exports the "
+"project. Their most common use is to determine what files are being included "
+"in the exported project. For each plugin, [method _export_begin] is called at "
+"the beginning of the export process and then [method _export_file] is called "
+"for each exported file.\n"
+"To use [EditorExportPlugin], register it using the [method "
+"EditorPlugin.add_export_plugin] method first."
+msgstr ""
+"Los [EditorExportPlugin]s se invocan automáticamente cada vez que el usuario "
+"exporta el proyecto. Su uso más común es determinar qué archivos se incluyen "
+"en el proyecto exportado. Para cada plugin, se llama a [method _export_begin] "
+"al comienzo del proceso de exportación y luego se llama a [method "
+"_export_file] para cada archivo exportado.\n"
+"Para usar [EditorExportPlugin], regístralo primero usando el método [method "
+"EditorPlugin.add_export_plugin]."
+
 msgid "Export Android plugins"
 msgstr "Exportar plugins de Android"
 
+msgid ""
+"Return [code]true[/code] if this plugin will customize resources based on the "
+"platform and features used.\n"
+"When enabled, [method _get_customization_configuration_hash] and [method "
+"_customize_resource] will be called and must be implemented."
+msgstr ""
+"Devuelve [code]true[/code] si este plugin personalizará los recursos "
+"basándose en la plataforma y las características usadas.\n"
+"Cuando está habilitado, se llamará a [method "
+"_get_customization_configuration_hash] y [method _customize_resource] y deben "
+"ser implementados."
+
+msgid ""
+"Return [code]true[/code] if this plugin will customize scenes based on the "
+"platform and features used.\n"
+"When enabled, [method _get_customization_configuration_hash] and [method "
+"_customize_scene] will be called and must be implemented.\n"
+"[b]Note:[/b] [method _customize_scene] will only be called for scenes that "
+"have been modified since the last export."
+msgstr ""
+"Devuelve [code]true[/code] si este plugin personalizará las escenas basándose "
+"en la plataforma y las características usadas.\n"
+"Cuando está habilitado, se llamará a [method "
+"_get_customization_configuration_hash] y [method _customize_scene] y deben "
+"ser implementados.\n"
+"[b]Nota:[/b] Se llamará a [method _customize_scene] solo para las escenas que "
+"han sido modificadas desde la última exportación."
+
+msgid ""
+"Customize a resource. If changes are made to it, return the same or a new "
+"resource. Otherwise, return [code]null[/code]. When a new resource is "
+"returned, [param resource] will be replaced by a copy of the new resource.\n"
+"The [param path] argument is only used when customizing an actual file, "
+"otherwise this means that this resource is part of another one and it will be "
+"empty.\n"
+"Implementing this method is required if [method _begin_customize_resources] "
+"returns [code]true[/code].\n"
+"[b]Note:[/b] When customizing any of the following types and returning "
+"another resource, the other resource should not be skipped using [method "
+"skip] in [method _export_file]:\n"
+"- [AtlasTexture]\n"
+"- [CompressedCubemap]\n"
+"- [CompressedCubemapArray]\n"
+"- [CompressedTexture2D]\n"
+"- [CompressedTexture2DArray]\n"
+"- [CompressedTexture3D]"
+msgstr ""
+"Personaliza un recurso. Si se le hacen cambios, devuelve el mismo o un nuevo "
+"recurso. De lo contrario, devuelve [code]null[/code]. Cuando se devuelve un "
+"nuevo recurso, [param resource] será reemplazado por una copia del nuevo "
+"recurso.\n"
+"El argumento [param path] solo se usa al personalizar un archivo real, de lo "
+"contrario esto significa que este recurso es parte de otro y estará vacío.\n"
+"Es obligatorio implementar este método si [method _begin_customize_resources] "
+"devuelve [code]true[/code].\n"
+"[b]Nota:[/b] Al personalizar cualquiera de los siguientes tipos y devolver "
+"otro recurso, el otro recurso no debe omitirse usando [method skip] en "
+"[method _export_file]:\n"
+"- [AtlasTexture]\n"
+"- [CompressedCubemap]\n"
+"- [CompressedCubemapArray]\n"
+"- [CompressedTexture2D]\n"
+"- [CompressedTexture2DArray]\n"
+"- [CompressedTexture3D]"
+
 msgid ""
 "Customize a scene. If changes are made to it, return the same or a new scene. "
 "Otherwise, return [code]null[/code]. If a new scene is returned, it is up to "
@@ -35709,6 +36753,145 @@ msgstr ""
 "Método virtual que debe ser sobrescrito por el usuario. Llamado cuando la "
 "exportación esté terminada."
 
+msgid ""
+"Virtual method to be overridden by the user. Called for each exported file "
+"before [method _customize_resource] and [method _customize_scene]. The "
+"arguments can be used to identify the file. [param path] is the path of the "
+"file, [param type] is the [Resource] represented by the file (e.g. "
+"[PackedScene]), and [param features] is the list of features for the export.\n"
+"Calling [method skip] inside this callback will make the file not included in "
+"the export."
+msgstr ""
+"Método virtual que debe ser sobrescrito por el usuario. Se llama para cada "
+"archivo exportado antes de [method _customize_resource] y [method "
+"_customize_scene]. Los argumentos se pueden usar para identificar el archivo. "
+"[param path] es la ruta del archivo, [param type] es el [Resource] "
+"representado por el archivo (por ejemplo, [PackedScene]), y [param features] "
+"es la lista de características para la exportación.\n"
+"Llamar a [method skip] dentro de esta función de retorno de llamada hará que "
+"el archivo no se incluya en la exportación."
+
+msgid ""
+"Virtual method to be overridden by the user. This is called to retrieve the "
+"set of Android dependencies provided by this plugin. Each returned Android "
+"dependency should have the format of an Android remote binary dependency: "
+"[code]org.godot.example:my-plugin:0.0.0[/code]\n"
+"For more information see [url=https://developer.android.com/build/"
+"dependencies?agpversion=4.1#dependency-types]Android documentation on "
+"dependencies[/url].\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se llama para obtener el "
+"conjunto de dependencias de Android proporcionadas por este plugin. Cada "
+"dependencia de Android devuelta debe tener el formato de una dependencia "
+"binaria remota de Android: [code]org.godot.example:my-plugin:0.0.0[/code]\n"
+"Para más información, véase la [url=https://developer.android.com/build/"
+"dependencies?agpversion=4.1#dependency-types]documentación de Android sobre "
+"dependencias[/url].\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Virtual method to be overridden by the user. This is called to retrieve the "
+"URLs of Maven repositories for the set of Android dependencies provided by "
+"this plugin.\n"
+"For more information see [url=https://docs.gradle.org/current/userguide/"
+"dependency_management.html#sec:maven_repo]Gradle documentation on dependency "
+"management[/url].\n"
+"[b]Note:[/b] Google's Maven repo and the Maven Central repo are already "
+"included by default.\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se llama para obtener las "
+"URLs de los repositorios Maven para el conjunto de dependencias de Android "
+"proporcionadas por este plugin.\n"
+"Para más información, véase la [url=https://docs.gradle.org/current/userguide/"
+"dependency_management.html#sec:maven_repo]documentación de Gradle sobre "
+"gestión de dependencias[/url].\n"
+"[b]Nota:[/b] El repositorio Maven de Google y el repositorio Maven Central ya "
+"están incluidos por defecto.\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Virtual method to be overridden by the user. This is called to retrieve the "
+"local paths of the Android libraries archive (AAR) files provided by this "
+"plugin.\n"
+"[b]Note:[/b] Relative paths [b]must[/b] be relative to Godot's [code]res://"
+"addons/[/code] directory. For example, an AAR file located under [code]res://"
+"addons/hello_world_plugin/HelloWorld.release.aar[/code] can be returned as an "
+"absolute path using [code]res://addons/hello_world_plugin/"
+"HelloWorld.release.aar[/code] or a relative path using "
+"[code]hello_world_plugin/HelloWorld.release.aar[/code].\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se llama para obtener las "
+"rutas locales de los archivos de archivo de bibliotecas de Android (AAR) "
+"proporcionados por este plugin.\n"
+"[b]Nota:[/b] Las rutas relativas [b]deben[/b] ser relativas al directorio "
+"[code]res://addons/[/code] de Godot. Por ejemplo, un archivo AAR ubicado en "
+"[code]res://addons/hello_world_plugin/HelloWorld.release.aar[/code] se puede "
+"devolver como una ruta absoluta usando [code]res://addons/hello_world_plugin/"
+"HelloWorld.release.aar[/code] o una ruta relativa usando "
+"[code]hello_world_plugin/HelloWorld.release.aar[/code].\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Virtual method to be overridden by the user. This is used at export time to "
+"update the contents of the [code]activity[/code] element in the generated "
+"Android manifest.\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se utiliza en tiempo de "
+"exportación para actualizar el contenido del elemento [code]activity[/code] "
+"en el manifiesto de Android generado.\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Virtual method to be overridden by the user. This is used at export time to "
+"update the contents of the [code]application[/code] element in the generated "
+"Android manifest.\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se utiliza en tiempo de "
+"exportación para actualizar el contenido del elemento [code]application[/"
+"code] en el manifiesto de Android generado.\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Virtual method to be overridden by the user. This is used at export time to "
+"update the contents of the [code]manifest[/code] element in the generated "
+"Android manifest.\n"
+"[b]Note:[/b] Only supported on Android and requires [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] to be enabled."
+msgstr ""
+"Método virtual a ser sobrescrito por el usuario. Se utiliza en tiempo de "
+"exportación para actualizar el contenido del elemento [code]manifest[/code] "
+"en el manifiesto de Android generado.\n"
+"[b]Nota:[/b] Solo es compatible con Android y requiere que [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build] esté habilitado."
+
+msgid ""
+"Return a hash based on the configuration passed (for both scenes and "
+"resources). This helps keep separate caches for separate export "
+"configurations.\n"
+"Implementing this method is required if [method _begin_customize_resources] "
+"returns [code]true[/code]."
+msgstr ""
+"Devuelve un hash basado en la configuración pasada (tanto para escenas como "
+"para recursos). Esto ayuda a mantener cachés separadas para configuraciones "
+"de exportación separadas.\n"
+"Implementar este método es necesario si [method _begin_customize_resources] "
+"devuelve [code]true[/code]."
+
 msgid ""
 "Return a [PackedStringArray] of additional features this preset, for the "
 "given [param platform], should have."
@@ -39006,10 +40189,10 @@ msgid ""
 "clicking the \"eye\" icon next to an output). The value is defined in pixels "
 "at 100% zoom, and will scale with zoom automatically."
 msgstr ""
-"El tamaño a usar para las previsualizaciones de puertos en los uniformes del "
-"shader visual (se activa haciendo clic en el icono del \"ojo\" junto a una "
-"salida). El valor se define en píxeles con un zoom del 100% y se escalará "
-"automáticamente con el zoom."
+"El tamaño a usar para las previsualizaciones de puertos en las variables "
+"uniformes del shader visual (se activa haciendo clic en el icono del \"ojo\" "
+"junto a una salida). El valor se define en píxeles con un zoom del 100% y se "
+"escalará automáticamente con el zoom."
 
 msgid ""
 "Path to the SCP (secure copy) executable (used for remote deploy to desktop "
@@ -43109,7 +44292,7 @@ msgid ""
 "code] for an even grid."
 msgstr ""
 "Distancia máxima que un punto puede moverse fuera de su posición en la "
-"cuadrícula. Establecer en [code]0[/code] para una cuadrícula uniforme."
+"cuadrícula. Establécela como [code]0[/code] para una cuadrícula uniforme."
 
 msgid "Return type from cellular noise calculations."
 msgstr "Tipo de retorno de los cálculos de ruido celular."
@@ -54614,9 +55797,77 @@ msgstr "Lista de frecuencias de teclas de piano de Wikipedia"
 msgid "Base input event type for mouse events."
 msgstr "Tipo de evento de entrada base para eventos de ratón."
 
+msgid "Stores general information about mouse events."
+msgstr "Almacena información general sobre los eventos del ratón."
+
+msgid ""
+"The mouse button mask identifier, one of or a bitwise combination of the "
+"[enum MouseButton] button masks."
+msgstr ""
+"El identificador de la máscara del botón del ratón, una de las máscaras de "
+"botón de [enum MouseButton] o una combinación bit a bit de ellas."
+
+msgid ""
+"When received in [method Node._input] or [method Node._unhandled_input], "
+"returns the mouse's position in the root [Viewport] using the coordinate "
+"system of the root [Viewport].\n"
+"When received in [method Control._gui_input], returns the mouse's position in "
+"the [CanvasLayer] that the [Control] is in using the coordinate system of the "
+"[CanvasLayer]."
+msgstr ""
+"Cuando se recibe en [method Node._input] o [method Node._unhandled_input], "
+"devuelve la posición del ratón en el [Viewport] raíz usando el sistema de "
+"coordenadas del [Viewport] raíz.\n"
+"Cuando se recibe en [method Control._gui_input], devuelve la posición del "
+"ratón en el [CanvasLayer] en el que se encuentra el [Control] usando el "
+"sistema de coordenadas del [CanvasLayer]."
+
+msgid ""
+"When received in [method Node._input] or [method Node._unhandled_input], "
+"returns the mouse's position in the [Viewport] this [Node] is in using the "
+"coordinate system of this [Viewport].\n"
+"When received in [method Control._gui_input], returns the mouse's position in "
+"the [Control] using the local coordinate system of the [Control]."
+msgstr ""
+"Cuando se recibe en [method Node._input] o [method Node._unhandled_input], "
+"devuelve la posición del ratón en el [Viewport] en el que se encuentra este "
+"[Node] usando el sistema de coordenadas de este [Viewport].\n"
+"Cuando se recibe en [method Control._gui_input], devuelve la posición del "
+"ratón en el [Control] usando el sistema de coordenadas local del [Control]."
+
+msgid "Represents a mouse button being pressed or released."
+msgstr "Representa un botón del ratón siendo pulsado o soltado."
+
+msgid ""
+"Stores information about mouse click events. See [method Node._input].\n"
+"[b]Note:[/b] On Wear OS devices, rotary input is mapped to [constant "
+"MOUSE_BUTTON_WHEEL_UP] and [constant MOUSE_BUTTON_WHEEL_DOWN]. This can be "
+"changed to [constant MOUSE_BUTTON_WHEEL_LEFT] and [constant "
+"MOUSE_BUTTON_WHEEL_RIGHT] with the [member ProjectSettings.input_devices/"
+"pointing/android/rotary_input_scroll_axis] setting."
+msgstr ""
+"Almacena información sobre los eventos de clic del ratón. Véase [method "
+"Node._input].\n"
+"[b]Nota:[/b] En dispositivos con Wear OS, la entrada rotatoria se mapea a "
+"[constant MOUSE_BUTTON_WHEEL_UP] y [constant MOUSE_BUTTON_WHEEL_DOWN]. Esto "
+"se puede cambiar a [constant MOUSE_BUTTON_WHEEL_LEFT] y [constant "
+"MOUSE_BUTTON_WHEEL_RIGHT] con la configuración [member "
+"ProjectSettings.input_devices/pointing/android/rotary_input_scroll_axis]."
+
 msgid "Mouse and input coordinates"
 msgstr "Coordenadas del ratón y de entrada"
 
+msgid ""
+"The mouse button identifier, one of the [enum MouseButton] button or button "
+"wheel constants."
+msgstr ""
+"El identificador del botón del ratón, una de las constantes de botón o rueda "
+"de botón de [enum MouseButton]."
+
+msgid "If [code]true[/code], the mouse button event has been canceled."
+msgstr ""
+"Si es [code]true[/code], el evento del botón del ratón ha sido cancelado."
+
 msgid "If [code]true[/code], the mouse button's state is a double-click."
 msgstr ""
 "Si es [code]true[/code], el estado del botón del ratón es un doble clic."
@@ -54643,6 +55894,44 @@ msgstr ""
 msgid "Represents a mouse or a pen movement."
 msgstr "Representa un movimiento de ratón o de lápiz."
 
+msgid ""
+"Stores information about a mouse or a pen motion. This includes relative "
+"position, absolute position, and velocity. See [method Node._input].\n"
+"[b]Note:[/b] By default, this event is only emitted once per frame rendered "
+"at most. If you need more precise input reporting, set [member "
+"Input.use_accumulated_input] to [code]false[/code] to make events emitted as "
+"often as possible. If you use InputEventMouseMotion to draw lines, consider "
+"using [method Geometry2D.bresenham_line] as well to avoid visible gaps in "
+"lines if the user is moving the mouse quickly.\n"
+"[b]Note:[/b] This event may be emitted even when the mouse hasn't moved, "
+"either by the operating system or by Godot itself. If you really need to know "
+"if the mouse has moved (e.g. to suppress displaying a tooltip), you should "
+"check that [code]relative.is_zero_approx()[/code] is [code]false[/code]."
+msgstr ""
+"Almacena información sobre el movimiento de un ratón o un lápiz. Esto incluye "
+"posición relativa, posición absoluta y velocidad. Véase [method "
+"Node._input].\n"
+"[b]Nota:[/b] Por defecto, este evento solo se emite una vez por fotograma "
+"renderizado como máximo. Si necesitas un informe de entrada más preciso, "
+"establece [member Input.use_accumulated_input] a [code]false[/code] para que "
+"los eventos se emitan tan a menudo como sea posible. Si usas "
+"InputEventMouseMotion para dibujar líneas, considera usar [method "
+"Geometry2D.bresenham_line] también para evitar huecos visibles en las líneas "
+"si el usuario mueve el ratón rápidamente.\n"
+"[b]Nota:[/b] Este evento puede emitirse incluso cuando el ratón no se ha "
+"movido, ya sea por el sistema operativo o por el propio Godot. Si realmente "
+"necesitas saber si el ratón se ha movido (por ejemplo, para suprimir la "
+"visualización de una sugerencia), deberías comprobar que "
+"[code]relative.is_zero_approx()[/code] es [code]false[/code]."
+
+msgid ""
+"Returns [code]true[/code] when using the eraser end of a stylus pen.\n"
+"[b]Note:[/b] This property is implemented on Linux, macOS and Windows."
+msgstr ""
+"Devuelve [code]true[/code] cuando se usa el extremo de borrador de un lápiz "
+"óptico.\n"
+"[b]Nota:[/b] Esta propiedad está implementada en Linux, macOS y Windows."
+
 msgid ""
 "Represents the pressure the user puts on the pen. Ranges from [code]0.0[/"
 "code] to [code]1.0[/code]."
@@ -54650,6 +55939,70 @@ msgstr ""
 "Representa la presión que el usuario ejerce sobre el bolígrafo. Va desde "
 "[code]0.0[/code] hasta [code]1.0[/code]."
 
+msgid ""
+"The mouse position relative to the previous position (position at the last "
+"frame).\n"
+"[b]Note:[/b] Since [InputEventMouseMotion] may only be emitted when the mouse "
+"moves, it is not possible to reliably detect when the mouse has stopped "
+"moving by checking this property. A separate, short timer may be necessary.\n"
+"[b]Note:[/b] [member relative] is automatically scaled according to the "
+"content scale factor, which is defined by the project's stretch mode "
+"settings. This means mouse sensitivity will appear different depending on "
+"resolution when using [member relative] in a script that handles mouse aiming "
+"with the [constant Input.MOUSE_MODE_CAPTURED] mouse mode. To avoid this, use "
+"[member screen_relative] instead."
+msgstr ""
+"La posición del ratón relativa a la posición anterior (posición en el último "
+"fotograma).\n"
+"[b]Nota:[/b] Dado que [InputEventMouseMotion] solo se emite cuando el ratón "
+"se mueve, no es posible detectar de forma fiable cuándo el ratón ha dejado de "
+"moverse comprobando esta propiedad. Puede ser necesario un temporizador corto "
+"separado.\n"
+"[b]Nota:[/b] [member relative] se escala automáticamente según el factor de "
+"escala de contenido, que se define por la configuración del modo de "
+"estiramiento del proyecto. Esto significa que la sensibilidad del ratón "
+"parecerá diferente dependiendo de la resolución cuando se use [member "
+"relative] en un script que maneje el apuntado del ratón con el modo de ratón "
+"[constant Input.MOUSE_MODE_CAPTURED]. Para evitar esto, usa [member "
+"screen_relative] en su lugar."
+
+msgid ""
+"The unscaled mouse position relative to the previous position in the "
+"coordinate system of the screen (position at the last frame).\n"
+"[b]Note:[/b] Since [InputEventMouseMotion] may only be emitted when the mouse "
+"moves, it is not possible to reliably detect when the mouse has stopped "
+"moving by checking this property. A separate, short timer may be necessary.\n"
+"[b]Note:[/b] This coordinate is [i]not[/i] scaled according to the content "
+"scale factor or calls to [method InputEvent.xformed_by]. This should be "
+"preferred over [member relative] for mouse aiming when using the [constant "
+"Input.MOUSE_MODE_CAPTURED] mouse mode, regardless of the project's stretch "
+"mode."
+msgstr ""
+"La posición del ratón sin escalar relativa a la posición anterior en el "
+"sistema de coordenadas de la pantalla (posición en el último cuadro).\n"
+"[b]Nota:[/b] Dado que [InputEventMouseMotion] solo se emite cuando el ratón "
+"se mueve, no es posible detectar de forma fiable cuándo el ratón ha dejado de "
+"moverse comprobando esta propiedad. Puede ser necesario un temporizador corto "
+"y separado.\n"
+"[b]Nota:[/b] Esta coordenada [i]no[/i] se escala según el factor de escala "
+"del contenido o las llamadas a [method InputEvent.xformed_by]. Esto debería "
+"preferirse sobre [member relative] para la puntería del ratón cuando se usa "
+"el modo de ratón [constant Input.MOUSE_MODE_CAPTURED], independientemente del "
+"modo de estiramiento del proyecto."
+
+msgid ""
+"The unscaled mouse velocity in pixels per second in screen coordinates. This "
+"velocity is [i]not[/i] scaled according to the content scale factor or calls "
+"to [method InputEvent.xformed_by].\n"
+"[b]Note:[/b] Use [member screen_relative] for mouse aiming using the "
+"[constant Input.MOUSE_MODE_CAPTURED] mouse mode."
+msgstr ""
+"La velocidad del ratón sin escalar en píxeles por segundo en coordenadas de "
+"pantalla. Esta velocidad [i]no[/i] se escala según el factor de escala del "
+"contenido o las llamadas a [method InputEvent.xformed_by].\n"
+"[b]Nota:[/b] Usa [member screen_relative] para la puntería del ratón usando "
+"el modo de ratón [constant Input.MOUSE_MODE_CAPTURED]."
+
 msgid ""
 "Represents the angles of tilt of the pen. Positive X-coordinate value "
 "indicates a tilt to the right. Positive Y-coordinate value indicates a tilt "
@@ -54661,6 +56014,32 @@ msgstr ""
 "coordenada Y indica una inclinación hacia el usuario. Va de [code]-1.0[/code] "
 "a [code]1.0[/code] para ambos ejes."
 
+msgid ""
+"The mouse velocity in pixels per second.\n"
+"[b]Note:[/b] [member velocity] is automatically scaled according to the "
+"content scale factor, which is defined by the project's stretch mode "
+"settings. That means mouse sensitivity may appear different depending on "
+"resolution.\n"
+"[b]Note:[/b] Use [member screen_relative] for mouse aiming using the "
+"[constant Input.MOUSE_MODE_CAPTURED] mouse mode."
+msgstr ""
+"La velocidad del ratón en píxeles por segundo.\n"
+"[b]Nota:[/b] [member velocity] se escala automáticamente según el factor de "
+"escala del contenido, que se define por la configuración del modo de "
+"estiramiento del proyecto. Eso significa que la sensibilidad del ratón puede "
+"parecer diferente dependiendo de la resolución.\n"
+"[b]Nota:[/b] Usa [member screen_relative] para la puntería del ratón usando "
+"el modo de ratón [constant Input.MOUSE_MODE_CAPTURED]."
+
+msgid "Represents a panning touch gesture."
+msgstr "Representa un gesto táctil de desplazamiento."
+
+msgid "Panning amount since last pan event."
+msgstr "Cantidad de desplazamiento desde el último evento de desplazamiento."
+
+msgid "Represents a screen drag event."
+msgstr "Representa un evento de arrastre en pantalla."
+
 msgid "Stores information about screen drag events. See [method Node._input]."
 msgstr ""
 "Almacena información sobre los eventos de arrastre de pantalla. Véase [method "
@@ -54670,11 +56049,107 @@ msgid "The drag event index in the case of a multi-drag event."
 msgstr ""
 "El índice de eventos de arrastre en el caso de un evento de arrastre múltiple."
 
+msgid "Returns [code]true[/code] when using the eraser end of a stylus pen."
+msgstr ""
+"Devuelve [code]true[/code] cuando se usa el extremo de borrador de un lápiz "
+"óptico."
+
+msgid ""
+"The drag position in the viewport the node is in, using the coordinate system "
+"of this viewport."
+msgstr ""
+"La posición de arrastre en la ventana gráfica en la que se encuentra el nodo, "
+"usando el sistema de coordenadas de esta ventana gráfica."
+
+msgid ""
+"The drag position relative to the previous position (position at the last "
+"frame).\n"
+"[b]Note:[/b] [member relative] is automatically scaled according to the "
+"content scale factor, which is defined by the project's stretch mode "
+"settings. This means touch sensitivity will appear different depending on "
+"resolution when using [member relative] in a script that handles touch "
+"aiming. To avoid this, use [member screen_relative] instead."
+msgstr ""
+"La posición de arrastre relativa a la posición anterior (posición en el "
+"último fotograma).\n"
+"[b]Nota:[/b] [member relative] se escala automáticamente según el factor de "
+"escala de contenido, que se define por la configuración del modo de "
+"estiramiento del proyecto. Esto significa que la sensibilidad táctil "
+"aparecerá diferente dependiendo de la resolución al usar [member relative] en "
+"un script que maneja el apuntado táctil. Para evitar esto, usa [member "
+"screen_relative] en su lugar."
+
+msgid ""
+"The unscaled drag position relative to the previous position in screen "
+"coordinates (position at the last frame). This position is [i]not[/i] scaled "
+"according to the content scale factor or calls to [method "
+"InputEvent.xformed_by]. This should be preferred over [member relative] for "
+"touch aiming regardless of the project's stretch mode."
+msgstr ""
+"La posición de arrastre sin escalar relativa a la posición anterior en "
+"coordenadas de pantalla (posición en el último fotograma). Esta posición "
+"[i]no[/i] se escala según el factor de escala de contenido o las llamadas a "
+"[method InputEvent.xformed_by]. Esto debería preferirse sobre [member "
+"relative] para el apuntado táctil, independientemente del modo de "
+"estiramiento del proyecto."
+
+msgid ""
+"The unscaled drag velocity in pixels per second in screen coordinates. This "
+"velocity is [i]not[/i] scaled according to the content scale factor or calls "
+"to [method InputEvent.xformed_by]. This should be preferred over [member "
+"velocity] for touch aiming regardless of the project's stretch mode."
+msgstr ""
+"La velocidad de arrastre sin escalar en píxeles por segundo en coordenadas de "
+"pantalla. Esta velocidad [i]no[/i] se escala según el factor de escala de "
+"contenido o las llamadas a [method InputEvent.xformed_by]. Esto debería "
+"preferirse sobre [member velocity] para el apuntado táctil, "
+"independientemente del modo de estiramiento del proyecto."
+
+msgid ""
+"The drag velocity.\n"
+"[b]Note:[/b] [member velocity] is automatically scaled according to the "
+"content scale factor, which is defined by the project's stretch mode "
+"settings. This means touch sensitivity will appear different depending on "
+"resolution when using [member velocity] in a script that handles touch "
+"aiming. To avoid this, use [member screen_velocity] instead."
+msgstr ""
+"La velocidad de arrastre.\n"
+"[b]Nota:[/b] [member velocity] se escala automáticamente según el factor de "
+"escala de contenido, que se define por la configuración del modo de "
+"estiramiento del proyecto. Esto significa que la sensibilidad táctil "
+"aparecerá diferente dependiendo de la resolución al usar [member velocity] en "
+"un script que maneja el apuntado táctil. Para evitar esto, usa [member "
+"screen_velocity] en su lugar."
+
+msgid "Represents a screen touch event."
+msgstr "Representa un evento de toque de pantalla."
+
+msgid ""
+"Stores information about multi-touch press/release input events. Supports "
+"touch press, touch release and [member index] for multi-touch count and order."
+msgstr ""
+"Almacena información de presión/liberación multitáctil. Soporta presión "
+"táctil, liberación táctil y [member index] para el conteo y el orden "
+"multitáctil."
+
+msgid "If [code]true[/code], the touch event has been canceled."
+msgstr "Si es [code]true[/code], el evento táctil ha sido cancelado."
+
+msgid "If [code]true[/code], the touch's state is a double tap."
+msgstr "Si es [code]true[/code], el estado del toque es un doble toque."
+
 msgid ""
 "The touch index in the case of a multi-touch event. One index = one finger."
 msgstr ""
 "El índice táctil en el caso de un evento multitáctil. Un índice = un dedo."
 
+msgid ""
+"The touch position in the viewport the node is in, using the coordinate "
+"system of this viewport."
+msgstr ""
+"La posición del toque en la ventanilla donde se encuentra el nodo, usando el "
+"sistema de coordenadas de esta ventanilla."
+
 msgid ""
 "If [code]true[/code], the touch's state is pressed. If [code]false[/code], "
 "the touch's state is released."
@@ -54682,6 +56157,98 @@ msgstr ""
 "Si es [code]true[/code], el estado del toque se pulsa. Si es [code]false[/"
 "code], el estado del toque se libera."
 
+msgid "Represents a triggered keyboard [Shortcut]."
+msgstr "Representa un [Shortcut] de teclado invocado."
+
+msgid ""
+"InputEventShortcut is a special event that can be received in [method "
+"Node._input], [method Node._shortcut_input], and [method "
+"Node._unhandled_input]. It is typically sent by the editor's Command Palette "
+"to trigger actions, but can also be sent manually using [method "
+"Viewport.push_input]."
+msgstr ""
+"InputEventShortcut es un evento especial que puede ser recibido en [method "
+"Node._input], [method Node._shortcut_input], y [method "
+"Node._unhandled_input]. Típicamente es enviado por la paleta de comandos del "
+"editor para activar acciones, pero también puede ser enviado manualmente "
+"usando [method Viewport.push_input]."
+
+msgid ""
+"The [Shortcut] represented by this event. Its [method Shortcut.matches_event] "
+"method will always return [code]true[/code] for this event."
+msgstr ""
+"El [Shortcut] representado por este evento. Su método [method "
+"Shortcut.matches_event] siempre devolverá [code]true[/code] para este evento."
+
+msgid ""
+"Abstract base class for input events affected by modifier keys like "
+"[kbd]Shift[/kbd] and [kbd]Alt[/kbd]."
+msgstr ""
+"Clase base abstracta para eventos de entrada afectados por teclas "
+"modificadoras como [kbd]Shift[/kbd] y [kbd]Alt[/kbd]."
+
+msgid ""
+"Stores information about mouse, keyboard, and touch gesture input events. "
+"This includes information about which modifier keys are pressed, such as "
+"[kbd]Shift[/kbd] or [kbd]Alt[/kbd]. See [method Node._input].\n"
+"[b]Note:[/b] Modifier keys are considered modifiers only when used in "
+"combination with another key. As a result, their corresponding member "
+"variables, such as [member ctrl_pressed], will return [code]false[/code] if "
+"the key is pressed on its own."
+msgstr ""
+"Almacena información sobre eventos de entrada de ratón, teclado y gestos "
+"táctiles. Esto incluye información sobre qué teclas modificadoras están "
+"pulsadas, como [kbd]Shift[/kbd] o [kbd]Alt[/kbd]. Véase [method "
+"Node._input].\n"
+"[b]Nota:[/b] Las teclas modificadoras se consideran modificadoras solo cuando "
+"se usan en combinación con otra tecla. Como resultado, sus variables miembro "
+"correspondientes, como [member ctrl_pressed], devolverán [code]false[/code] "
+"si la tecla se pulsa por sí sola."
+
+msgid "Returns the keycode combination of modifier keys."
+msgstr ""
+"Devuelve la combinación de códigos de tecla de las teclas modificadoras."
+
+msgid ""
+"On macOS, returns [code]true[/code] if [kbd]Meta[/kbd] ([kbd]Cmd[/kbd]) is "
+"pressed.\n"
+"On other platforms, returns [code]true[/code] if [kbd]Ctrl[/kbd] is pressed."
+msgstr ""
+"En macOS, devuelve [code]true[/code] si [kbd]Meta[/kbd] ([kbd]Cmd[/kbd]) está "
+"pulsada.\n"
+"En otras plataformas, devuelve [code]true[/code] si [kbd]Ctrl[/kbd] está "
+"pulsada."
+
+msgid "State of the [kbd]Alt[/kbd] modifier."
+msgstr "Estado del modificador [kbd]Alt[/kbd]."
+
+msgid ""
+"Automatically use [kbd]Meta[/kbd] ([kbd]Cmd[/kbd]) on macOS and [kbd]Ctrl[/"
+"kbd] on other platforms. If [code]true[/code], [member ctrl_pressed] and "
+"[member meta_pressed] cannot be set."
+msgstr ""
+"Usa automáticamente [kbd]Meta[/kbd] ([kbd]Cmd[/kbd]) en macOS y [kbd]Ctrl[/"
+"kbd] en otras plataformas. Si [code]true[/code], [member ctrl_pressed] y "
+"[member meta_pressed] no se pueden establecer."
+
+msgid "State of the [kbd]Ctrl[/kbd] modifier."
+msgstr "Estado del modificador [kbd]Ctrl[/kbd]."
+
+msgid ""
+"State of the [kbd]Meta[/kbd] modifier. On Windows and Linux, this represents "
+"the Windows key (sometimes called \"meta\" or \"super\" on Linux). On macOS, "
+"this represents the Command key."
+msgstr ""
+"Estado del modificador [kbd]Meta[/kbd]. En Windows y Linux, esto representa "
+"la tecla Windows (a veces llamada \"meta\" o \"super\" en Linux). En macOS, "
+"esto representa la tecla Comando."
+
+msgid "State of the [kbd]Shift[/kbd] modifier."
+msgstr "Estado del modificador [kbd]Shift[/kbd]."
+
+msgid "A singleton that manages all [InputEventAction]s."
+msgstr "Un singleton que gestiona todas las [InputEventAction]s."
+
 msgid ""
 "Manages all [InputEventAction] which can be created/modified from the project "
 "settings menu [b]Project > Project Settings > Input Map[/b] or in code with "
@@ -54706,6 +56273,22 @@ msgstr "Elimina un [InputEvent] de una acción."
 msgid "Removes all events from an action."
 msgstr "Elimina todos los eventos de una acción."
 
+msgid "Returns a deadzone value for the action."
+msgstr "Devuelve un valor de zona muerta para la acción."
+
+msgid ""
+"Returns an array of [InputEvent]s associated with a given action.\n"
+"[b]Note:[/b] When used in the editor (e.g. a tool script or [EditorPlugin]), "
+"this method will return events for the editor action. If you want to access "
+"your project's input binds from the editor, read the [code]input/*[/code] "
+"settings from [ProjectSettings]."
+msgstr ""
+"Devuelve un array de [InputEvent]s asociados a una acción dada.\n"
+"[b]Nota:[/b] Cuando se usa en el editor (por ejemplo, un script de "
+"herramienta o [EditorPlugin]), este método devolverá eventos para la acción "
+"del editor. Si quieres acceder a los enlaces de entrada de tu proyecto desde "
+"el editor, lee la configuración [code]input/*[/code] de [ProjectSettings]."
+
 msgid ""
 "Returns [code]true[/code] if the action has the given [InputEvent] associated "
 "with it."
@@ -54715,9 +56298,38 @@ msgstr ""
 msgid "Sets a deadzone value for the action."
 msgstr "Establece un valor de zona muerta para la acción."
 
+msgid ""
+"Adds an empty action to the [InputMap] with a configurable [param deadzone].\n"
+"An [InputEvent] can then be added to this action with [method "
+"action_add_event]."
+msgstr ""
+"Añade una acción vacía al [InputMap] con una [param deadzone] configurable.\n"
+"Se puede añadir un [InputEvent] a esta acción con [method action_add_event]."
+
 msgid "Removes an action from the [InputMap]."
 msgstr "Elimina una acción del [InputMap]."
 
+msgid ""
+"Returns [code]true[/code] if the given event is part of an existing action. "
+"This method ignores keyboard modifiers if the given [InputEvent] is not "
+"pressed (for proper release detection). See [method action_has_event] if you "
+"don't want this behavior.\n"
+"If [param exact_match] is [code]false[/code], it ignores additional input "
+"modifiers for [InputEventKey] and [InputEventMouseButton] events, and the "
+"direction for [InputEventJoypadMotion] events."
+msgstr ""
+"Devuelve [code]true[/code] si el evento dado es parte de una acción "
+"existente. Este método ignora los modificadores de teclado si el [InputEvent] "
+"dado no está pulsado (para una detección de liberación adecuada). Véase "
+"[method action_has_event] si no deseas este comportamiento.\n"
+"Si [param exact_match] es [code]false[/code], ignora los modificadores de "
+"entrada adicionales para los eventos [InputEventKey] y "
+"[InputEventMouseButton], y la dirección para los eventos "
+"[InputEventJoypadMotion]."
+
+msgid "Returns the human-readable description of the given action."
+msgstr "Devuelve la descripción legible por humanos de la acción dada."
+
 msgid "Returns an array of all actions in the [InputMap]."
 msgstr "Devuelve un conjunto de todas las acciones en el [InputMap]."
 
@@ -54738,6 +56350,31 @@ msgstr ""
 msgid "Placeholder for the root [Node] of a [PackedScene]."
 msgstr "Marcador de posición para la raíz [Node] de una [PackedScene]."
 
+msgid ""
+"Turning on the option [b]Load As Placeholder[/b] for an instantiated scene in "
+"the editor causes it to be replaced by an [InstancePlaceholder] when running "
+"the game, this will not replace the node in the editor. This makes it "
+"possible to delay actually loading the scene until calling [method "
+"create_instance]. This is useful to avoid loading large scenes all at once by "
+"loading parts of it selectively.\n"
+"[b]Note:[/b] Like [Node], [InstancePlaceholder] does not have a transform. "
+"This causes any child nodes to be positioned relatively to the [Viewport] "
+"origin, rather than their parent as displayed in the editor. Replacing the "
+"placeholder with a scene with a transform will transform children relatively "
+"to their parent again."
+msgstr ""
+"Activar la opción [b]Carga como marcador de posición[/b] para una escena "
+"instanciada en el editor hace que se sustituya por un [InstancePlaceholder] "
+"al ejecutar el juego. Esto no reemplazará el nodo en el editor. Esto hace "
+"posible retrasar la carga real de la escena hasta que se llame a [method "
+"create_instance]. Esto es útil para evitar cargar grandes escenas de una sola "
+"vez, cargando partes de ellas de forma selectiva.\n"
+"[b]Nota:[/b] Al igual que [Node], [InstancePlaceholder] no tiene una "
+"transformación. Esto hace que cualquier nodo hijo se posicione de forma "
+"relativa al origen del [Viewport], en lugar de su padre como se muestra en el "
+"editor. Reemplazar el marcador de posición por una escena con una "
+"transformación transformará a los hijos de forma relativa a su padre de nuevo."
+
 msgid ""
 "Call this method to actually load in the node. The created node will be "
 "placed as a sibling [i]above[/i] the [InstancePlaceholder] in the scene tree. "
@@ -54776,6 +56413,111 @@ msgstr ""
 "las propiedades, especificando el orden en que se aplicarán (siendo el índice "
 "0 el primero)."
 
+msgid "A built-in type for integers."
+msgstr "Un tipo incorporado para enteros."
+
+msgid ""
+"Signed 64-bit integer type. This means that it can take values from "
+"[code]-2^63[/code] to [code]2^63 - 1[/code], i.e. from "
+"[code]-9223372036854775808[/code] to [code]9223372036854775807[/code]. When "
+"it exceeds these bounds, it will wrap around.\n"
+"[int]s can be automatically converted to [float]s when necessary, for example "
+"when passing them as arguments in functions. The [float] will be as close to "
+"the original integer as possible.\n"
+"Likewise, [float]s can be automatically converted into [int]s. This will "
+"truncate the [float], discarding anything after the floating-point.\n"
+"[b]Note:[/b] In a boolean context, an [int] will evaluate to [code]false[/"
+"code] if it equals [code]0[/code], and to [code]true[/code] otherwise.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var x: int = 1 # x is 1\n"
+"x = 4.2 # x is 4, because 4.2 gets truncated\n"
+"var max_int = 9223372036854775807 # Biggest value an int can store\n"
+"max_int += 1 # max_int is -9223372036854775808, because it wrapped around\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int x = 1; // x is 1\n"
+"x = (int)4.2; // x is 4, because 4.2 gets truncated\n"
+"// We use long below, because GDScript's int is 64-bit while C#'s int is 32-"
+"bit.\n"
+"long maxLong = 9223372036854775807; // Biggest value a long can store\n"
+"maxLong++; // maxLong is now -9223372036854775808, because it wrapped "
+"around.\n"
+"\n"
+"// Alternatively with C#'s 32-bit int type, which has a smaller maximum "
+"value.\n"
+"int maxInt = 2147483647; // Biggest value an int can store\n"
+"maxInt++; // maxInt is now -2147483648, because it wrapped around\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"You can use the [code]0b[/code] literal for binary representation, the "
+"[code]0x[/code] literal for hexadecimal representation, and the [code]_[/"
+"code] symbol to separate long numbers and improve readability.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var x = 0b1001 # x is 9\n"
+"var y = 0xF5 # y is 245\n"
+"var z = 10_000_000 # z is 10000000\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int x = 0b1001; // x is 9\n"
+"int y = 0xF5; // y is 245\n"
+"int z = 10_000_000; // z is 10000000\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Tipo de entero con signo de 64 bits. Esto significa que puede tomar valores "
+"desde [code]-2^63[/code] hasta [code]2^63 - 1[/code], es decir, desde "
+"[code]-9223372036854775808[/code] hasta [code]9223372036854775807[/code]. "
+"Cuando excede estos límites, se ajustará (wrapping around).\n"
+"Los [int] se pueden convertir automáticamente a [float]s cuando sea "
+"necesario, por ejemplo, al pasarlos como argumentos en funciones. El [float] "
+"será lo más cercano posible al entero original.\n"
+"Del mismo modo, los [float] se pueden convertir automáticamente en [int]s. "
+"Esto truncará el [float], descartando cualquier cosa después del punto "
+"decimal.\n"
+"[b]Nota:[/b] En un contexto booleano, un [int] se evaluará como [code]false[/"
+"code] si es igual a [code]0[/code], y como [code]true[/code] en caso "
+"contrario.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var x: int = 1 # x es 1\n"
+"x = 4.2 # x es 4, porque 4.2 se trunca\n"
+"var max_int = 9223372036854775807 # El valor más grande que un int puede "
+"almacenar\n"
+"max_int += 1 # max_int es -9223372036854775808, porque se ajustó\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int x = 1; // x es 1\n"
+"x = (int)4.2; // x es 4, porque 4.2 se trunca\n"
+"// Usamos long a continuación, porque el int de GDScript es de 64 bits "
+"mientras que el int de C# es de 32 bits.\n"
+"long maxLong = 9223372036854775807; // El valor más grande que un long puede "
+"almacenar\n"
+"maxLong++; // maxLong es ahora -9223372036854775808, porque se ajustó.\n"
+"\n"
+"// Alternativamente con el tipo int de 32 bits de C#, que tiene un valor "
+"máximo más pequeño.\n"
+"int maxInt = 2147483647; // El valor más grande que un int puede almacenar\n"
+"maxInt++; // maxInt es ahora -2147483648, porque se ajustó\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Puedes usar el literal [code]0b[/code] para la representación binaria, el "
+"literal [code]0x[/code] para la representación hexadecimal, y el símbolo "
+"[code]_[/code] para separar números largos y mejorar la legibilidad.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var x = 0b1001 # x es 9\n"
+"var y = 0xF5 # y es 245\n"
+"var z = 10_000_000 # z es 10000000\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int x = 0b1001; // x es 9\n"
+"int y = 0xF5; // y es 245\n"
+"int z = 10_000_000; // z es 10000000\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Constructs an [int] set to [code]0[/code]."
 msgstr "Construye un [int] con un valor de [code]0[/code]."
 
@@ -55053,6 +56795,44 @@ msgstr ""
 "Devuelve el valor negado del [int]. Si es positivo, lo vuelve negativo. Si es "
 "negativo, lo vuelve positivo. Si es cero, no hace nada."
 
+msgid ""
+"Performs the bitwise [code]OR[/code] operation.\n"
+"[codeblock]\n"
+"print(0b1100 | 0b1010) # Prints 14 (binary 1110)\n"
+"[/codeblock]\n"
+"This is useful for storing binary flags in a variable.\n"
+"[codeblock]\n"
+"var flags = 0\n"
+"flags |= 0b101 # Turn the first and third bits on.\n"
+"[/codeblock]"
+msgstr ""
+"Realiza la operación [code]OR[/code] bit a bit.\n"
+"[codeblock]\n"
+"print(0b1100 | 0b1010) # Imprime 14 (binario 1110)\n"
+"[/codeblock]\n"
+"Esto es útil para almacenar indicadores binarios en una variable.\n"
+"[codeblock]\n"
+"var flags = 0\n"
+"flags |= 0b101 # Activa el primer y tercer bit.\n"
+"[/codeblock]"
+
+msgid ""
+"Performs the bitwise [code]NOT[/code] operation on the [int]. Due to "
+"[url=https://en.wikipedia.org/wiki/Two%27s_complement]2's complement[/url], "
+"it's effectively equal to [code]-(int + 1)[/code].\n"
+"[codeblock]\n"
+"print(~4) # Prints -5\n"
+"print(~(-7)) # Prints 6\n"
+"[/codeblock]"
+msgstr ""
+"Realiza la operación [code]NOT[/code] bit a bit sobre el [int]. Debido al "
+"[url=https://en.wikipedia.org/wiki/Two%27s_complement]complemento a 2[/url], "
+"es efectivamente igual a [code]-(int + 1)[/code].\n"
+"[codeblock]\n"
+"print(~4) # Imprime -5\n"
+"print(~(-7)) # Imprime 6\n"
+"[/codeblock]"
+
 msgid "Creates an idle interval in a [Tween] animation."
 msgstr "Crea un intervalo de inactividad en una animación de [Tween]."
 
@@ -58866,6 +60646,40 @@ msgstr ""
 msgid "Clears the current selection."
 msgstr "Borra la selección actual."
 
+msgid ""
+"Returns the correct column at the end of a composite character like ❤️‍🩹 "
+"(mending heart; Unicode: [code]U+2764 U+FE0F U+200D U+1FA79[/code]) which is "
+"comprised of more than one Unicode code point, if the caret is at the start "
+"of the composite character. Also returns the correct column with the caret at "
+"mid grapheme and for non-composite characters.\n"
+"[b]Note:[/b] To check at caret location use "
+"[code]get_next_composite_character_column(get_caret_column())[/code]"
+msgstr ""
+"Devuelve la columna correcta al final de un carácter compuesto como ❤️‍🩹 "
+"(corazón reparador; Unicode: [code]U+2764 U+FE0F U+200D U+1FA79[/code]) que "
+"está compuesto por más de un punto de código Unicode, si el cursor está al "
+"principio del carácter compuesto. También devuelve la columna correcta con el "
+"cursor a mitad de grafema y para caracteres no compuestos.\n"
+"[b]Nota:[/b] Para comprobar la ubicación del cursor, usa "
+"[code]get_next_composite_character_column(get_caret_column())[/code]"
+
+msgid ""
+"Returns the correct column at the start of a composite character like ❤️‍🩹 "
+"(mending heart; Unicode: [code]U+2764 U+FE0F U+200D U+1FA79[/code]) which is "
+"comprised of more than one Unicode code point, if the caret is at the end of "
+"the composite character. Also returns the correct column with the caret at "
+"mid grapheme and for non-composite characters.\n"
+"[b]Note:[/b] To check at caret location use "
+"[code]get_previous_composite_character_column(get_caret_column())[/code]"
+msgstr ""
+"Devuelve la columna correcta al principio de un carácter compuesto como ❤️‍🩹 "
+"(corazón reparador; Unicode: [code]U+2764 U+FE0F U+200D U+1FA79[/code]) que "
+"está compuesto por más de un punto de código Unicode, si el cursor está al "
+"final del carácter compuesto. También devuelve la columna correcta con el "
+"cursor a mitad de grafema y para caracteres no compuestos.\n"
+"[b]Nota:[/b] Para comprobar la ubicación del cursor, usa "
+"[code]get_previous_composite_character_column(get_caret_column())[/code]"
+
 msgid ""
 "Returns the scroll offset due to [member caret_column], as a number of "
 "characters."
@@ -58921,12 +60735,50 @@ msgid "Executes a given action as defined in the [enum MenuItems] enum."
 msgstr ""
 "Ejecuta una acción determinada según se define en el enum [enum MenuItems]."
 
+msgid ""
+"Selects characters inside [LineEdit] between [param from] and [param to]. By "
+"default, [param from] is at the beginning and [param to] at the end.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"text = \"Welcome\"\n"
+"select() # Will select \"Welcome\".\n"
+"select(4) # Will select \"ome\".\n"
+"select(2, 5) # Will select \"lco\".\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Text = \"Welcome\";\n"
+"Select(); // Will select \"Welcome\".\n"
+"Select(4); // Will select \"ome\".\n"
+"Select(2, 5); // Will select \"lco\".\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Selecciona los caracteres dentro de [LineEdit] entre [param from] y [param "
+"to]. Por defecto, [param from] está al principio y [param to] al final.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"text = \"Bienvenido\"\n"
+"select() # Seleccionará \"Bienvenido\".\n"
+"select(4) # Seleccionará \"venido\".\n"
+"select(2, 5) # Seleccionará \"env\".\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Text = \"Bienvenido\";\n"
+"Select(); // Seleccionará \"Bienvenido\".\n"
+"Select(4); // Seleccionará \"venido\".\n"
+"Select(2, 5); // Seleccionará \"env\".\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Selects the whole [String]."
 msgstr "Selecciona toda la [String]."
 
 msgid "Allows exiting edit mode while preserving focus."
 msgstr "Permite salir del modo de edición conservando el foco."
 
+msgid "The text's horizontal alignment."
+msgstr "Alineación horizontal del texto."
+
 msgid ""
 "If [code]true[/code] and [member caret_mid_grapheme] is [code]false[/code], "
 "backspace deletes an entire composite character such as ❤️‍🩹, instead of "
@@ -59015,6 +60867,9 @@ msgstr ""
 msgid "If [code]true[/code], the [LineEdit] doesn't display decoration."
 msgstr "Si es [code]true[/code], [LineEdit] no muestra la decoración."
 
+msgid "Define the scaling behavior of the [member right_icon]."
+msgstr "Define el comportamiento de escalado del [member right_icon]."
+
 msgid ""
 "If [code]true[/code], the [LineEdit] will not exit edit mode when text is "
 "submitted by pressing [code]ui_text_submit[/code] action (by default: "
@@ -59049,6 +60904,13 @@ msgstr ""
 "hay [member text], o siempre, si [member clear_button_enabled] está "
 "establecido en [code]false[/code]."
 
+msgid ""
+"Scale ratio of the icon when [member icon_expand_mode] is set to [constant "
+"EXPAND_MODE_FIT_TO_LINE_EDIT]."
+msgstr ""
+"Relación de escala del icono cuando [member icon_expand_mode] está "
+"configurado a [constant EXPAND_MODE_FIT_TO_LINE_EDIT]."
+
 msgid ""
 "If [code]true[/code], every character is replaced with the secret character "
 "(see [member secret_character])."
@@ -59143,6 +61005,17 @@ msgstr "Corta (copia y borra) el texto seleccionado."
 msgid "Copies the selected text."
 msgstr "Copia el texto seleccionado."
 
+msgid ""
+"Pastes the clipboard text over the selected text (or at the caret's "
+"position).\n"
+"Non-printable escape characters are automatically stripped from the OS "
+"clipboard via [method String.strip_escapes]."
+msgstr ""
+"Pega el texto del portapapeles sobre el texto seleccionado (o en la posición "
+"del cursor).\n"
+"Los caracteres de escape no imprimibles se eliminan automáticamente del "
+"portapapeles del sistema operativo a través del [method String.strip_escapes]."
+
 msgid "Erases the whole [LineEdit] text."
 msgstr "Borra todo el texto [LineEdit]."
 
@@ -59234,6 +61107,16 @@ msgstr "Abre el selector de emojis y símbolos del sistema."
 msgid "Represents the size of the [enum MenuItems] enum."
 msgstr "Representa el tamaño del enum [enum MenuItems]."
 
+msgid "Use the original size for the right icon."
+msgstr "Usa el tamaño original para el icono derecho."
+
+msgid "Scale the right icon's size to match the size of the text."
+msgstr ""
+"Escala el tamaño del icono derecho para que coincida con el tamaño del texto."
+
+msgid "Scale the right icon to fit the LineEdit."
+msgstr "Escala el icono derecho para que se ajuste al LineEdit."
+
 msgid ""
 "Color of the [LineEdit]'s caret (text cursor). This can be set to a fully "
 "transparent color to hide the caret entirely."
@@ -59276,6 +61159,15 @@ msgstr ""
 "la accesibilidad, asegurando que el cursor sea fácilmente visible, o para "
 "asegurar la consistencia con un tamaño de fuente grande."
 
+msgid ""
+"Minimum horizontal space for the text (not counting the clear button and "
+"content margins). This value is measured in count of 'M' characters (i.e. "
+"this number of 'M' characters can be displayed without scrolling)."
+msgstr ""
+"Espacio horizontal mínimo para el texto (sin contar el botón de borrar y los "
+"márgenes de contenido). Este valor se mide en el conteo de caracteres 'M' (es "
+"decir, esta cantidad de caracteres 'M' puede mostrarse sin desplazamiento)."
+
 msgid "Font used for the text."
 msgstr "Fuente usada para el texto."
 
@@ -59286,6 +61178,26 @@ msgid "Texture for the clear button. See [member clear_button_enabled]."
 msgstr ""
 "La textura para el botón de despejar. Véase [member clear_button_enabled]."
 
+msgid ""
+"Background used when [LineEdit] has GUI focus. The [theme_item focus] "
+"[StyleBox] is displayed [i]over[/i] the base [StyleBox], so a partially "
+"transparent [StyleBox] should be used to ensure the base [StyleBox] remains "
+"visible. A [StyleBox] that represents an outline or an underline works well "
+"for this purpose. To disable the focus visual effect, assign a "
+"[StyleBoxEmpty] resource. Note that disabling the focus visual effect will "
+"harm keyboard/controller navigation usability, so this is not recommended for "
+"accessibility reasons."
+msgstr ""
+"Fondo utilizado cuando [LineEdit] tiene el foco de la GUI. El [StyleBox] de "
+"[theme_item focus] se muestra [i]sobre[/i] el [StyleBox] base, por lo que se "
+"debe usar un [StyleBox] parcialmente transparente para asegurar que el "
+"[StyleBox] base permanezca visible. Un [StyleBox] que representa un contorno "
+"o un subrayado funciona bien para este propósito. Para desactivar el efecto "
+"visual de foco, asigna un recurso [StyleBoxEmpty]. Ten en cuenta que "
+"desactivar el efecto visual de foco perjudicará la usabilidad de la "
+"navegación con teclado/controlador, por lo que no se recomienda por razones "
+"de accesibilidad."
+
 msgid "Default background for the [LineEdit]."
 msgstr "Fondo predeterminado para la [LineEdit]."
 
@@ -59299,9 +61211,65 @@ msgstr ""
 msgid "A button that represents a link."
 msgstr "Un botón que representa un enlace."
 
+msgid ""
+"A button that represents a link. This type of button is primarily used for "
+"interactions that cause a context change (like linking to a web page).\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node."
+msgstr ""
+"Un botón que representa un enlace. Este tipo de botón se utiliza "
+"principalmente para interacciones que causan un cambio de contexto (como "
+"enlazar a una página web).\n"
+"Véase también [BaseButton], que contiene propiedades y métodos comunes "
+"asociados con este nodo."
+
 msgid "The underline mode to use for the text."
 msgstr "El modo de subrayado a utilizar para el texto."
 
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/Uniform_Resource_Identifier]URI[/url] "
+"for this [LinkButton]. If set to a valid URI, pressing the button opens the "
+"URI using the operating system's default program for the protocol (via "
+"[method OS.shell_open]). HTTP and HTTPS URLs open the default web browser.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"uri = \"https://godotengine.org\"  # Opens the URL in the default web "
+"browser.\n"
+"uri = \"C:\\SomeFolder\"  # Opens the file explorer at the given path.\n"
+"uri = \"C:\\SomeImage.png\"  # Opens the given image in the default viewing "
+"app.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Uri = \"https://godotengine.org\"; // Opens the URL in the default web "
+"browser.\n"
+"Uri = \"C:\\SomeFolder\"; // Opens the file explorer at the given path.\n"
+"Uri = \"C:\\SomeImage.png\"; // Opens the given image in the default viewing "
+"app.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"El [url=https://en.wikipedia.org/wiki/Uniform_Resource_Identifier]URI[/url] "
+"para este [LinkButton]. Si se establece en un URI válido, al presionar el "
+"botón se abre el URI utilizando el programa predeterminado del sistema "
+"operativo para el protocolo (a través de [method OS.shell_open]). Las URL "
+"HTTP y HTTPS abren el navegador web predeterminado.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"uri = \"https://godotengine.org\"  # Abre la URL en el navegador web "
+"predeterminado.\n"
+"uri = \"C:\\SomeFolder\"  # Abre el explorador de archivos en la ruta dada.\n"
+"uri = \"C:\\SomeImage.png\"  # Abre la imagen dada en la aplicación de "
+"visualización predeterminada.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Uri = \"https://godotengine.org\"; // Abre la URL en el navegador web "
+"predeterminado.\n"
+"Uri = \"C:\\SomeFolder\"; // Abre el explorador de archivos en la ruta dada.\n"
+"Uri = \"C:\\SomeImage.png\"; // Abre la imagen dada en la aplicación de "
+"visualización predeterminada.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "The LinkButton will always show an underline at the bottom of its text."
 msgstr ""
 "El LinkButton siempre mostrará un subrayado en la parte inferior de su texto."
@@ -59320,9 +61288,29 @@ msgstr ""
 msgid "Default text [Color] of the [LinkButton]."
 msgstr "[Color] del texto predeterminado del [LinkButton]."
 
+msgid "Text [Color] used when the [LinkButton] is disabled."
+msgstr "[Color] del texto utilizado cuando el [LinkButton] está desactivado."
+
+msgid ""
+"Text [Color] used when the [LinkButton] is focused. Only replaces the normal "
+"text color of the button. Disabled, hovered, and pressed states take "
+"precedence over this color."
+msgstr ""
+"Color de texto usado cuando el [LinkButton] está enfocado. Solo reemplaza el "
+"color de texto normal del botón. Los estados deshabilitado, al pasar el "
+"cursor y presionado tienen precedencia sobre este color."
+
 msgid "Text [Color] used when the [LinkButton] is being hovered."
 msgstr "[Color] del texto usado cuando el [LinkButton] está siendo movido."
 
+msgid "Text [Color] used when the [LinkButton] is being hovered and pressed."
+msgstr ""
+"[Color] del texto usado cuando el [LinkButton] es pasado con el cursor y "
+"presionado."
+
+msgid "The tint of text outline of the [LinkButton]."
+msgstr "El tinte del contorno del texto del [LinkButton]."
+
 msgid "Text [Color] used when the [LinkButton] is being pressed."
 msgstr "[Color] del texto utilizado cuando se pulsa el [LinkButton]."
 
@@ -59332,6 +61320,106 @@ msgstr "El espacio vertical entre la línea de base del texto y el subrayado."
 msgid "[Font] of the [LinkButton]'s text."
 msgstr "[Font] del texto del [LinkButton]."
 
+msgid "Font size of the [LinkButton]'s text."
+msgstr "Tamaño de fuente del texto del [LinkButton]."
+
+msgid ""
+"[StyleBox] used when the [LinkButton] is focused. The [theme_item focus] "
+"[StyleBox] is displayed [i]over[/i] the base [StyleBox], so a partially "
+"transparent [StyleBox] should be used to ensure the base [StyleBox] remains "
+"visible. A [StyleBox] that represents an outline or an underline works well "
+"for this purpose. To disable the focus visual effect, assign a "
+"[StyleBoxEmpty] resource. Note that disabling the focus visual effect will "
+"harm keyboard/controller navigation usability, so this is not recommended for "
+"accessibility reasons."
+msgstr ""
+"[StyleBox] usado cuando el [LinkButton] está enfocado. El [StyleBox] de "
+"[theme_item focus] se muestra [i]sobre[/i] el [StyleBox] base, por lo que se "
+"debe usar un [StyleBox] parcialmente transparente para asegurar que el "
+"[StyleBox] base permanezca visible. Un [StyleBox] que representa un contorno "
+"o un subrayado funciona bien para este propósito. Para deshabilitar el efecto "
+"visual de enfoque, asigna un recurso [StyleBoxEmpty]. Ten en cuenta que "
+"deshabilitar el efecto visual de enfoque perjudicará la usabilidad de la "
+"navegación con teclado/controlador, por lo que esto no se recomienda por "
+"razones de accesibilidad."
+
+msgid ""
+"Custom logger to receive messages from the internal error/warning stream."
+msgstr ""
+"Logger personalizado para recibir mensajes del flujo interno de errores/"
+"advertencias."
+
+msgid ""
+"Custom logger to receive messages from the internal error/warning stream. "
+"Loggers are registered via [method OS.add_logger]."
+msgstr ""
+"Logger personalizado para recibir mensajes del flujo interno de errores/"
+"advertencias. Los loggers se registran a través de [method OS.add_logger]."
+
+msgid ""
+"Called when an error is logged. The error provides the [param function], "
+"[param file], and [param line] that it originated from, as well as either the "
+"[param code] that generated the error or a [param rationale].\n"
+"The type of error provided by [param error_type] is described in the [enum "
+"ErrorType] enumeration.\n"
+"Additionally, [param script_backtraces] provides backtraces for each of the "
+"script languages. These will only contain stack frames in editor builds and "
+"debug builds by default. To enable them for release builds as well, you need "
+"to enable [member ProjectSettings.debug/settings/gdscript/"
+"always_track_call_stacks].\n"
+"[b]Warning:[/b] This method will be called from threads other than the main "
+"thread, possibly at the same time, so you will need to have some kind of "
+"thread-safety in your implementation of it, like a [Mutex].\n"
+"[b]Note:[/b] [param script_backtraces] will not contain any captured "
+"variables, due to its prohibitively high cost. To get those you will need to "
+"capture the backtraces yourself, from within the [Logger] virtual methods, "
+"using [method Engine.capture_script_backtraces].\n"
+"[b]Note:[/b] Logging errors from this method using functions like [method "
+"@GlobalScope.push_error] or [method @GlobalScope.push_warning] is not "
+"supported, as it could cause infinite recursion. These errors will only show "
+"up in the console output."
+msgstr ""
+"Llamado cuando se registra un error. El error proporciona la [param "
+"function], el [param file] y la [param line] de donde se originó, así como el "
+"[param code] que generó el error o una [param rationale].\n"
+"El tipo de error proporcionado por [param error_type] se describe en la "
+"enumeración [enum ErrorType].\n"
+"Además, [param script_backtraces] proporciona rastreos de pila para cada uno "
+"de los lenguajes de script. Estos solo contendrán marcos de pila en las "
+"compilaciones del editor y las compilaciones de depuración por defecto. Para "
+"habilitarlos también para las compilaciones de lanzamiento, debes habilitar "
+"[member ProjectSettings.debug/settings/gdscript/always_track_call_stacks].\n"
+"[b]Advertencia:[/b] Este método será llamado desde hilos distintos al hilo "
+"principal, posiblemente al mismo tiempo, por lo que necesitarás tener algún "
+"tipo de seguridad de hilos en tu implementación, como un [Mutex].\n"
+"[b]Nota:[/b] [param script_backtraces] no contendrá ninguna variable "
+"capturada, debido a su costo prohibitivo. Para obtenerlas, deberás capturar "
+"los rastreos de pila tú mismo, desde dentro de los métodos virtuales de "
+"[Logger], usando [method Engine.capture_script_backtraces].\n"
+"[b]Nota:[/b] No se admite el registro de errores desde este método usando "
+"funciones como [method @GlobalScope.push_error] o [method "
+"@GlobalScope.push_warning], ya que podría causar una recursión infinita. "
+"Estos errores solo aparecerán en la salida de la consola."
+
+msgid ""
+"Called when a message is logged. If [param error] is [code]true[/code], then "
+"this message was meant to be sent to [code]stderr[/code].\n"
+"[b]Warning:[/b] This method will be called from threads other than the main "
+"thread, possibly at the same time, so you will need to have some kind of "
+"thread-safety in your implementation of it, like a [Mutex].\n"
+"[b]Note:[/b] Logging another message from this method using functions like "
+"[method @GlobalScope.print] is not supported, as it could cause infinite "
+"recursion. These messages will only show up in the console output."
+msgstr ""
+"Llamado cuando se registra un mensaje. Si [param error] es [code]true[/code], "
+"entonces este mensaje estaba destinado a ser enviado a [code]stderr[/code].\n"
+"[b]Advertencia:[/b] Este método será llamado desde hilos distintos al hilo "
+"principal, posiblemente al mismo tiempo, por lo que necesitarás tener algún "
+"tipo de seguridad de hilos en tu implementación, como un [Mutex].\n"
+"[b]Nota:[/b] No se admite el registro de otro mensaje desde este método "
+"usando funciones como [method @GlobalScope.print], ya que podría causar una "
+"recursión infinita. Estos mensajes solo aparecerán en la salida de la consola."
+
 msgid "The message received is an error."
 msgstr "El mensaje recibido es un error."
 
@@ -59502,18 +61590,39 @@ msgstr ""
 "Si es [code]1.0[/code], no se realiza ninguna amortiguación. Si es [code]0.0[/"
 "code], la amortiguación se realiza siempre."
 
+msgid ""
+"The limit angle of the primary rotation when [member symmetry_limitation] is "
+"[code]true[/code], in radians."
+msgstr ""
+"El ángulo límite de la rotación primaria cuando [member symmetry_limitation] "
+"es [code]true[/code], en radianes."
+
 msgid ""
 "The threshold to start damping for [member primary_negative_limit_angle]."
 msgstr ""
 "El umbral para empezar a amortiguar para [member "
 "primary_negative_limit_angle]."
 
+msgid ""
+"The limit angle of negative side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"El ángulo límite del lado negativo de la rotación primaria cuando [member "
+"symmetry_limitation] es [code]false[/code], en radianes."
+
 msgid ""
 "The threshold to start damping for [member primary_positive_limit_angle]."
 msgstr ""
 "El umbral para empezar a amortiguar para [member "
 "primary_positive_limit_angle]."
 
+msgid ""
+"The limit angle of positive side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"El ángulo límite del lado positivo de la rotación primaria cuando [member "
+"symmetry_limitation] es [code]false[/code], en radianes."
+
 msgid ""
 "The axis of the first rotation. This [SkeletonModifier3D] works by "
 "compositing the rotation by Euler angles to prevent to rotate the [member "
@@ -59564,30 +61673,6 @@ msgstr ""
 "El tipo de transición de la interpolación basada en el tiempo. Véase también "
 "[enum Tween.TransitionType]."
 
-msgid ""
-"If [code]true[/code], limits the amount of rotation. For example, this helps "
-"to prevent a character's neck from rotating 360 degrees.\n"
-"[b]Note:[/b] As with [AnimationTree] blending, interpolation is provided that "
-"favors [method Skeleton3D.get_bone_rest]. This means that interpolation does "
-"not select the shortest path in some cases.\n"
-"[b]Note:[/b] Some values for [member transition_type] (such as [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC], and [constant "
-"Tween.TRANS_SPRING]) may exceed the limitations. If interpolation occurs "
-"while overshooting the limitations, the result might not respect the bone "
-"rest."
-msgstr ""
-"Si es [code]true[/code], limita la cantidad de rotación. Por ejemplo, esto "
-"ayuda a evitar que el cuello de un personaje rote 360 grados.\n"
-"[b]Nota:[/b] Al igual que con la mezcla de [AnimationTree], se proporciona "
-"una interpolación que favorece a [method Skeleton3D.get_bone_rest]. Esto "
-"significa que la interpolación no selecciona el camino más corto en algunos "
-"casos.\n"
-"[b]Nota:[/b] Algunos valores para [member transition_type] (como [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC] y [constant "
-"Tween.TRANS_SPRING]) pueden exceder las limitaciones. Si la interpolación se "
-"produce mientras se sobrepasan las limitaciones, es posible que el resultado "
-"no respete el reposo del hueso."
-
 msgid "If [code]true[/code], provides rotation by two axes."
 msgstr "Si es [code]true[/code], proporciona rotación en dos ejes."
 
@@ -62350,6 +64435,346 @@ msgstr "La velocidad máxima a la que un agente se puede mover."
 msgid "The distance to search for other agents."
 msgstr "La distancia para buscar otros agentes."
 
+msgid ""
+"If [code]true[/code] a simplified version of the path will be returned with "
+"less critical path points removed. The simplification amount is controlled by "
+"[member simplify_epsilon]. The simplification uses a variant of Ramer-Douglas-"
+"Peucker algorithm for curve point decimation.\n"
+"Path simplification can be helpful to mitigate various path following issues "
+"that can arise with certain agent types and script behaviors. E.g. "
+"\"steering\" agents or avoidance in \"open fields\"."
+msgstr ""
+"Si es [code]true[/code], se devolverá una versión simplificada del trayecto "
+"con menos puntos críticos de trayectos eliminados. La cantidad de "
+"simplificación se controla mediante [member simplify_epsilon]. La "
+"simplificación utiliza una variante del algoritmo Ramer-Douglas-Peucker para "
+"la diezma de puntos de curva.\n"
+"La simplificación de trayectos puede ser útil para mitigar varios problemas "
+"de seguimiento de trayectos que pueden surgir con ciertos tipos de agentes y "
+"comportamientos de script. Por ejemplo, agentes de \"dirección\" o evitación "
+"en \"campos abiertos\"."
+
+msgid ""
+"The distance threshold before the target is considered to be reached. On "
+"reaching the target, [signal target_reached] is emitted and navigation ends "
+"(see [method is_navigation_finished] and [signal navigation_finished]).\n"
+"You can make navigation end early by setting this property to a value greater "
+"than [member path_desired_distance] (navigation will end before reaching the "
+"last waypoint).\n"
+"You can also make navigation end closer to the target than each individual "
+"path position by setting this property to a value lower than [member "
+"path_desired_distance] (navigation won't immediately end when reaching the "
+"last waypoint). However, if the value set is too low, the agent will be stuck "
+"in a repath loop because it will constantly overshoot the distance to the "
+"target on each physics frame update."
+msgstr ""
+"El umbral de distancia antes de que se considere alcanzado el objetivo. Al "
+"alcanzar el objetivo, se emite [signal target_reached] y la navegación "
+"termina (véase [method is_navigation_finished] y [signal "
+"navigation_finished]).\n"
+"Puedes hacer que la navegación termine antes estableciendo esta propiedad a "
+"un valor mayor que [member path_desired_distance] (la navegación terminará "
+"antes de alcanzar el último punto de paso).\n"
+"También puedes hacer que la navegación termine más cerca del objetivo que "
+"cada posición de trayecto individual estableciendo esta propiedad a un valor "
+"menor que [member path_desired_distance] (la navegación no terminará "
+"inmediatamente al alcanzar el último punto de paso). Sin embargo, si el valor "
+"establecido es demasiado bajo, el agente se quedará atascado en un bucle de "
+"repath porque constantemente superará la distancia al objetivo en cada "
+"actualización del frame de física."
+
+msgid ""
+"If set, a new navigation path from the current agent position to the [member "
+"target_position] is requested from the NavigationServer."
+msgstr ""
+"Si se establece, se solicita un nuevo camino de navegación desde la posición "
+"actual del agente hasta la [member target_position] al NavigationServer."
+
+msgid ""
+"The minimal amount of time for which this agent's velocities, that are "
+"computed with the collision avoidance algorithm, are safe with respect to "
+"other agents. The larger the number, the sooner the agent will respond to "
+"other agents, but less freedom in choosing its velocities. A too high value "
+"will slow down agents movement considerably. Must be positive."
+msgstr ""
+"La cantidad mínima de tiempo durante la cual las velocidades de este agente, "
+"que se calculan con el algoritmo de evitación de colisiones, son seguras con "
+"respecto a otros agentes. Cuanto mayor sea el número, antes responderá el "
+"agente a otros agentes, pero tendrá menos libertad para elegir sus "
+"velocidades. Un valor demasiado alto ralentizará considerablemente el "
+"movimiento de los agentes. Debe ser positivo."
+
+msgid ""
+"The minimal amount of time for which this agent's velocities, that are "
+"computed with the collision avoidance algorithm, are safe with respect to "
+"static avoidance obstacles. The larger the number, the sooner the agent will "
+"respond to static avoidance obstacles, but less freedom in choosing its "
+"velocities. A too high value will slow down agents movement considerably. "
+"Must be positive."
+msgstr ""
+"La cantidad mínima de tiempo durante la cual las velocidades de este agente, "
+"calculadas con el algoritmo de evitación de colisiones, son seguras con "
+"respecto a los obstáculos de evitación estáticos. Cuanto mayor sea el número, "
+"antes responderá el agente a los obstáculos de evitación estáticos, pero "
+"tendrá menos libertad para elegir sus velocidades. Un valor demasiado alto "
+"ralentizará considerablemente el movimiento de los agentes. Debe ser positivo."
+
+msgid ""
+"Sets the new wanted velocity for the agent. The avoidance simulation will try "
+"to fulfill this velocity if possible but will modify it to avoid collision "
+"with other agents and obstacles. When an agent is teleported to a new "
+"position, use [method set_velocity_forced] as well to reset the internal "
+"simulation velocity."
+msgstr ""
+"Establece la nueva velocidad deseada para el agente. La simulación de "
+"evitación intentará cumplir esta velocidad si es posible, pero la modificará "
+"para evitar colisiones con otros agentes y obstáculos. Cuando un agente es "
+"teletransportado a una nueva posición, usa también [method "
+"set_velocity_forced] para restablecer la velocidad de simulación interna."
+
+msgid ""
+"Signals that the agent reached a navigation link. Emitted when the agent "
+"moves within [member path_desired_distance] of the next position of the path "
+"when that position is a navigation link.\n"
+"The details dictionary may contain the following keys depending on the value "
+"of [member path_metadata_flags]:\n"
+"- [code]position[/code]: The start position of the link that was reached.\n"
+"- [code]type[/code]: Always [constant "
+"NavigationPathQueryResult2D.PATH_SEGMENT_TYPE_LINK].\n"
+"- [code]rid[/code]: The [RID] of the link.\n"
+"- [code]owner[/code]: The object which manages the link (usually "
+"[NavigationLink2D]).\n"
+"- [code]link_entry_position[/code]: If [code]owner[/code] is available and "
+"the owner is a [NavigationLink2D], it will contain the global position of the "
+"link's point the agent is entering.\n"
+"- [code]link_exit_position[/code]: If [code]owner[/code] is available and the "
+"owner is a [NavigationLink2D], it will contain the global position of the "
+"link's point which the agent is exiting."
+msgstr ""
+"Señala que el agente alcanzó un enlace de navegación. Se emite cuando el "
+"agente se mueve dentro de [member path_desired_distance] de la siguiente "
+"posición del trayecto cuando esa posición es un enlace de navegación.\n"
+"El diccionario de detalles puede contener las siguientes claves dependiendo "
+"del valor de [member path_metadata_flags]:\n"
+"- [code]position[/code]: La posición inicial del enlace que se alcanzó.\n"
+"- [code]type[/code]: Siempre [constant "
+"NavigationPathQueryResult2D.PATH_SEGMENT_TYPE_LINK].\n"
+"- [code]rid[/code]: El [RID] del enlace.\n"
+"- [code]owner[/code]: El objeto que gestiona el enlace (normalmente "
+"[NavigationLink2D]).\n"
+"- [code]link_entry_position[/code]: Si [code]owner[/code] está disponible y "
+"el propietario es un [NavigationLink2D], contendrá la posición global del "
+"punto del enlace al que entra el agente.\n"
+"- [code]link_exit_position[/code]: Si [code]owner[/code] está disponible y el "
+"propietario es un [NavigationLink2D], contendrá la posición global del punto "
+"del enlace por el que sale el agente."
+
+msgid ""
+"Signals that the agent's navigation has finished. If the target is reachable, "
+"navigation ends when the target is reached. If the target is unreachable, "
+"navigation ends when the last waypoint of the path is reached. This signal is "
+"emitted only once per loaded path.\n"
+"This signal will be emitted just after [signal target_reached] when the "
+"target is reachable."
+msgstr ""
+"Señala que la navegación del agente ha terminado. Si el objetivo es "
+"alcanzable, la navegación termina cuando se alcanza el objetivo. Si el "
+"objetivo es inalcanzable, la navegación termina cuando se alcanza el último "
+"punto de trayecto de la trayectoria. Esta señal se emite solo una vez por "
+"trayectoria cargada.\n"
+"Esta señal se emitirá justo después de [signal target_reached] cuando el "
+"objetivo sea alcanzable."
+
+msgid ""
+"Emitted when the agent had to update the loaded path:\n"
+"- because path was previously empty.\n"
+"- because navigation map has changed.\n"
+"- because agent pushed further away from the current path segment than the "
+"[member path_max_distance]."
+msgstr ""
+"Se emite cuando el agente tuvo que actualizar la trayectoria cargada:\n"
+"- porque la trayectoria estaba previamente vacía.\n"
+"- porque el mapa de navegación ha cambiado.\n"
+"- porque el agente se alejó más del segmento de trayectoria actual de lo que "
+"permite [member path_max_distance]."
+
+msgid ""
+"Signals that the agent reached the target, i.e. the agent moved within "
+"[member target_desired_distance] of the [member target_position]. This signal "
+"is emitted only once per loaded path.\n"
+"This signal will be emitted just before [signal navigation_finished] when the "
+"target is reachable.\n"
+"It may not always be possible to reach the target but it should always be "
+"possible to reach the final position. See [method get_final_position]."
+msgstr ""
+"Señala que el agente alcanzó el objetivo, es decir, el agente se movió dentro "
+"de [member target_desired_distance] de la [member target_position]. Esta "
+"señal se emite solo una vez por trayectoria cargada.\n"
+"Esta señal se emitirá justo antes de [signal navigation_finished] cuando el "
+"objetivo sea alcanzable.\n"
+"Puede que no siempre sea posible alcanzar el objetivo, pero siempre debería "
+"ser posible alcanzar la posición final. Véase [method get_final_position]."
+
+msgid ""
+"Notifies when the collision avoidance velocity is calculated. Emitted every "
+"update as long as [member avoidance_enabled] is [code]true[/code] and the "
+"agent has a navigation map."
+msgstr ""
+"Notifica cuando se calcula la velocidad de evitación de colisiones. Se emite "
+"en cada actualización siempre que [member avoidance_enabled] sea [code]true[/"
+"code] y el agente tenga un mapa de navegación."
+
+msgid ""
+"Signals that the agent reached a waypoint. Emitted when the agent moves "
+"within [member path_desired_distance] of the next position of the path.\n"
+"The details dictionary may contain the following keys depending on the value "
+"of [member path_metadata_flags]:\n"
+"- [code]position[/code]: The position of the waypoint that was reached.\n"
+"- [code]type[/code]: The type of navigation primitive (region or link) that "
+"contains this waypoint.\n"
+"- [code]rid[/code]: The [RID] of the containing navigation primitive (region "
+"or link).\n"
+"- [code]owner[/code]: The object which manages the containing navigation "
+"primitive (region or link)."
+msgstr ""
+"Señala que el agente alcanzó un punto de trayecto. Se emite cuando el agente "
+"se mueve dentro de [member path_desired_distance] de la siguiente posición "
+"del trayecto.\n"
+"El diccionario de detalles puede contener las siguientes claves dependiendo "
+"del valor de [member path_metadata_flags]:\n"
+"- [code]position[/code]: La posición del punto de trayecto que se alcanzó.\n"
+"- [code]type[/code]: El tipo de primitiva de navegación (región o enlace) que "
+"contiene este punto de trayecto.\n"
+"- [code]rid[/code]: El [RID] de la primitiva de navegación contenedora "
+"(región o enlace).\n"
+"- [code]owner[/code]: El objeto que gestiona la primitiva de navegación "
+"contenedora (región o enlace)."
+
+msgid "A 3D agent used to pathfind to a position while avoiding obstacles."
+msgstr ""
+"Un agente 3D utilizado para encontrar un trayecto a una posición mientras "
+"evita obstáculos."
+
+msgid ""
+"A 3D agent used to pathfind to a position while avoiding static and dynamic "
+"obstacles. The calculation can be used by the parent node to dynamically move "
+"it along the path. Requires navigation data to work correctly.\n"
+"Dynamic obstacles are avoided using RVO collision avoidance. Avoidance is "
+"computed before physics, so the pathfinding information can be used safely in "
+"the physics step.\n"
+"[b]Note:[/b] After setting the [member target_position] property, the [method "
+"get_next_path_position] method must be used once every physics frame to "
+"update the internal path logic of the navigation agent. The vector position "
+"it returns should be used as the next movement position for the agent's "
+"parent node.\n"
+"[b]Note:[/b] Several methods of this class, such as [method "
+"get_next_path_position], can trigger a new path calculation. Calling these in "
+"your callback to an agent's signal, such as [signal waypoint_reached], can "
+"cause infinite recursion. It is recommended to call these methods in the "
+"physics step or, alternatively, delay their call until the end of the frame "
+"(see [method Object.call_deferred] or [constant Object.CONNECT_DEFERRED])."
+msgstr ""
+"Un agente 3D utilizado para encontrar un trayecto a una posición mientras "
+"evita obstáculos estáticos y dinámicos. El cálculo puede ser utilizado por el "
+"nodo padre para moverlo dinámicamente a lo largo del trayecto. Requiere datos "
+"de navegación para funcionar correctamente.\n"
+"Los obstáculos dinámicos se evitan usando la evitación de colisiones RVO. La "
+"evitación se calcula antes de la física, por lo que la información de "
+"pathfinding puede ser usada de forma segura en el paso de física.\n"
+"[b]Nota:[/b] Después de establecer la propiedad [member target_position], el "
+"método [method get_next_path_position] debe usarse una vez en cada frame de "
+"física para actualizar la lógica de trayecto interna del agente de "
+"navegación. La posición del vector que devuelve debe usarse como la siguiente "
+"posición de movimiento para el nodo padre del agente.\n"
+"[b]Nota:[/b] Varios métodos de esta clase, como [method "
+"get_next_path_position], pueden desencadenar un nuevo cálculo de trayecto. "
+"Llamar a estos en tu callback a una señal del agente, como [signal "
+"waypoint_reached], puede causar una recursión infinita. Se recomienda llamar "
+"a estos métodos en el paso de física o, alternativamente, retrasar su llamada "
+"hasta el final del frame (véase [method Object.call_deferred] o [constant "
+"Object.CONNECT_DEFERRED])."
+
+msgid ""
+"Returns which index the agent is currently on in the navigation path's "
+"[PackedVector3Array]."
+msgstr ""
+"Devuelve el índice en el que se encuentra actualmente el agente en el "
+"[PackedVector3Array] del trayecto de navegación."
+
+msgid "Returns the [RID] of this agent on the [NavigationServer3D]."
+msgstr "Devuelve el [RID] de este agente en el [NavigationServer3D]."
+
+msgid ""
+"If [code]true[/code] the agent is registered for an RVO avoidance callback on "
+"the [NavigationServer3D]. When [member velocity] is set and the processing is "
+"completed a [code]safe_velocity[/code] Vector3 is received with a signal "
+"connection to [signal velocity_computed]. Avoidance processing with many "
+"registered agents has a significant performance cost and should only be "
+"enabled on agents that currently require it."
+msgstr ""
+"Si [code]true[/code], el agente se registra para una llamada de retorno de "
+"evitación RVO en el [NavigationServer3D]. Cuando se establece [member "
+"velocity] y se completa el procesamiento, se recibe un Vector3 "
+"[code]safe_velocity[/code] con una conexión de señal a [signal "
+"velocity_computed]. El procesamiento de evitación con muchos agentes "
+"registrados tiene un costo de rendimiento significativo y solo debe "
+"habilitarse en agentes que actualmente lo requieran."
+
+msgid ""
+"The height of the avoidance agent. Agents will ignore other agents or "
+"obstacles that are above or below their current position + height in 2D "
+"avoidance. Does nothing in 3D avoidance which uses radius spheres alone."
+msgstr ""
+"La altura del agente de evitación. Los agentes ignorarán a otros agentes u "
+"obstáculos que estén por encima o por debajo de su posición actual + altura "
+"en la evitación 2D. No hace nada en la evitación 3D, que usa solo esferas de "
+"radio."
+
+msgid ""
+"If [code]true[/code], and the agent uses 2D avoidance, it will remember the "
+"set y-axis velocity and reapply it after the avoidance step. While 2D "
+"avoidance has no y-axis and simulates on a flat plane this setting can help "
+"to soften the most obvious clipping on uneven 3D geometry."
+msgstr ""
+"Si [code]true[/code], y el agente usa evitación 2D, recordará la velocidad "
+"establecida en el eje Y y la volverá a aplicar después del paso de evitación. "
+"Aunque la evitación 2D no tiene eje Y y simula en un plano plano, esta "
+"configuración puede ayudar a suavizar el recorte más obvio en geometría 3D "
+"irregular."
+
+msgid ""
+"The height offset is subtracted from the y-axis value of any vector path "
+"position for this NavigationAgent. The NavigationAgent height offset does not "
+"change or influence the navigation mesh or pathfinding query result. "
+"Additional navigation maps that use regions with navigation meshes that the "
+"developer baked with appropriate agent radius or height values are required "
+"to support different-sized agents."
+msgstr ""
+"El desplazamiento de altura se resta del valor del eje Y de cualquier "
+"posición de trayecto vectorial para este NavigationAgent. El desplazamiento "
+"de altura del NavigationAgent no cambia ni influye en la malla de navegación "
+"ni en el resultado de la consulta de búsqueda de rutas. Se requieren mapas de "
+"navegación adicionales que utilicen regiones con mallas de navegación que el "
+"desarrollador haya horneado con los valores de radio o altura del agente "
+"apropiados para admitir agentes de diferentes tamaños."
+
+msgid ""
+"The radius of the avoidance agent. This is the \"body\" of the avoidance "
+"agent and not the avoidance maneuver starting radius (which is controlled by "
+"[member neighbor_distance]).\n"
+"Does not affect normal pathfinding. To change an actor's pathfinding radius "
+"bake [NavigationMesh] resources with a different [member "
+"NavigationMesh.agent_radius] property and use different navigation maps for "
+"each actor size."
+msgstr ""
+"El radio del agente de evitación. Este es el \"cuerpo\" del agente de "
+"evitación y no el radio de inicio de la maniobra de evitación (que se "
+"controla mediante [member neighbor_distance]).\n"
+"No afecta la búsqueda normal de trayectos. Para cambiar el radio de búsqueda "
+"de trayectos de un actor, hornea recursos [NavigationMesh] con una propiedad "
+"[member NavigationMesh.agent_radius] diferente y usa diferentes mapas de "
+"navegación para cada tamaño de actor."
+
 msgid ""
 "If [code]true[/code], the agent calculates avoidance velocities in 3D "
 "omnidirectionally, e.g. for games that take place in air, underwater or "
@@ -62582,6 +65007,48 @@ msgstr ""
 "predeterminado de [World3D], por lo que esta función solo es necesaria para "
 "sobrescribir el mapa predeterminado."
 
+msgid ""
+"Whether this link is currently active. If [code]false[/code], [method "
+"NavigationServer3D.map_get_path] will ignore this link."
+msgstr ""
+"Está este enlace activo actualmente? Si es [code]false[/code], [method "
+"NavigationServer3D.map_get_path] ignorará este enlace."
+
+msgid ""
+"Ending position of the link.\n"
+"This position will search out the nearest polygon in the navigation mesh to "
+"attach to.\n"
+"The distance the link will search is controlled by [method "
+"NavigationServer3D.map_set_link_connection_radius]."
+msgstr ""
+"Posición final del enlace.\n"
+"Esta posición buscará el polígono más cercano en la malla de navegación para "
+"adjuntarse.\n"
+"La distancia que buscará el enlace está controlada por [method "
+"NavigationServer3D.map_set_link_connection_radius]."
+
+msgid ""
+"A bitfield determining all navigation layers the link belongs to. These "
+"navigation layers will be checked when requesting a path with [method "
+"NavigationServer3D.map_get_path]."
+msgstr ""
+"Un campo de bits que determina todas las capas de navegación a las que "
+"pertenece el enlace. Estas capas de navegación se comprobarán al solicitar un "
+"trayecto con [method NavigationServer3D.map_get_path]."
+
+msgid ""
+"Starting position of the link.\n"
+"This position will search out the nearest polygon in the navigation mesh to "
+"attach to.\n"
+"The distance the link will search is controlled by [method "
+"NavigationServer3D.map_set_link_connection_radius]."
+msgstr ""
+"Posición inicial del enlace.\n"
+"Esta posición buscará el polígono más cercano en la malla de navegación para "
+"adjuntarse.\n"
+"La distancia que buscará el enlace está controlada por [method "
+"NavigationServer3D.map_set_link_connection_radius]."
+
 msgid "A navigation mesh that defines traversable areas and obstacles."
 msgstr ""
 "Una malla de navegación que define las áreas transitables y los obstáculos."
@@ -62677,6 +65144,174 @@ msgstr ""
 "[b]Nota:[/b] Al hornear, este valor se redondeará al múltiplo más cercano de "
 "[member cell_height]."
 
+msgid ""
+"The minimum ledge height that is considered to still be traversable.\n"
+"[b]Note:[/b] While baking, this value will be rounded down to the nearest "
+"multiple of [member cell_height]."
+msgstr ""
+"La altura mínima del borde que se considera aún transitable.\n"
+"[b]Nota:[/b] Durante el horneado, este valor se redondeará al múltiplo más "
+"cercano de [member cell_height]."
+
+msgid "The maximum slope that is considered walkable, in degrees."
+msgstr "La pendiente máxima que se considera transitable, en grados."
+
+msgid ""
+"The size of the non-navigable border around the bake bounding area.\n"
+"In conjunction with the [member filter_baking_aabb] and a [member "
+"edge_max_error] value at [code]1.0[/code] or below the border size can be "
+"used to bake tile aligned navigation meshes without the tile edges being "
+"shrunk by [member agent_radius].\n"
+"[b]Note:[/b] If this value is not [code]0.0[/code], it will be rounded up to "
+"the nearest multiple of [member cell_size] during baking."
+msgstr ""
+"El tamaño del borde no navegable alrededor del área de delimitación de "
+"horneado.\n"
+"En conjunto con el [member filter_baking_aabb] y un valor [member "
+"edge_max_error] de [code]1.0[/code] o inferior, el tamaño del borde se puede "
+"usar para hornear mallas de navegación alineadas con tiles sin que los bordes "
+"de los tiles se encojan por [member agent_radius].\n"
+"[b]Nota:[/b] Si este valor no es [code]0.0[/code], se redondeará al múltiplo "
+"más cercano de [member cell_size] durante el horneado."
+
+msgid ""
+"The cell height used to rasterize the navigation mesh vertices on the Y axis. "
+"Must match with the cell height on the navigation map."
+msgstr ""
+"La altura de celda utilizada para rasterizar los vértices de la malla de "
+"navegación en el eje Y. Debe coincidir con la altura de celda en el mapa de "
+"navegación."
+
+msgid ""
+"The cell size used to rasterize the navigation mesh vertices on the XZ plane. "
+"Must match with the cell size on the navigation map."
+msgstr ""
+"El tamaño de celda utilizado para rasterizar los vértices de la malla de "
+"navegación en el plano XZ. Debe coincidir con el tamaño de celda en el mapa "
+"de navegación."
+
+msgid ""
+"The sampling distance to use when generating the detail mesh, in cell unit."
+msgstr ""
+"La distancia de muestreo a usar al generar la malla de detalle, en unidades "
+"de celda."
+
+msgid ""
+"The maximum distance the detail mesh surface should deviate from heightfield, "
+"in cell unit."
+msgstr ""
+"La distancia máxima que la superficie de la malla de detalle debe desviarse "
+"del campo de altura, en unidades de celda."
+
+msgid ""
+"The maximum distance a simplified contour's border edges should deviate the "
+"original raw contour."
+msgstr ""
+"La distancia máxima que los bordes del contorno simplificado deben desviarse "
+"del contorno original sin procesar."
+
+msgid ""
+"The maximum allowed length for contour edges along the border of the mesh. A "
+"value of [code]0.0[/code] disables this feature.\n"
+"[b]Note:[/b] While baking, this value will be rounded up to the nearest "
+"multiple of [member cell_size]."
+msgstr ""
+"La longitud máxima permitida para los bordes del contorno a lo largo del "
+"borde de la malla. Un valor de [code]0.0[/code] desactiva esta "
+"característica. \n"
+"[b]Nota:[/b] Durante el horneado, este valor se redondeará al múltiplo más "
+"cercano de [member cell_size]."
+
+msgid ""
+"If the baking [AABB] has a volume the navigation mesh baking will be "
+"restricted to its enclosing area."
+msgstr ""
+"Si el volumen del [AABB] de horneado es el de una caja, el horneado de la "
+"malla de navegación estará restringido a su área contenida."
+
+msgid "The position offset applied to the [member filter_baking_aabb] [AABB]."
+msgstr ""
+"El desplazamiento de posición aplicado al [member filter_baking_aabb] [AABB]."
+
+msgid ""
+"If [code]true[/code], marks non-walkable spans as walkable if their maximum "
+"is within [member agent_max_climb] of a walkable neighbor."
+msgstr ""
+"Si es [code]true[/code], marca los span no transitables como transitables si "
+"sus máximos están dentro de [member agent_max_climb] de un vecino transitable."
+
+msgid ""
+"The physics layers to scan for static colliders.\n"
+"Only used when [member geometry_parsed_geometry_type] is [constant "
+"PARSED_GEOMETRY_STATIC_COLLIDERS] or [constant PARSED_GEOMETRY_BOTH]."
+msgstr ""
+"Las capas físicas a escanear en busca de colliders estáticos.\n"
+"Solo se usa cuando [member geometry_parsed_geometry_type] es [constant "
+"PARSED_GEOMETRY_STATIC_COLLIDERS] o [constant PARSED_GEOMETRY_BOTH]."
+
+msgid "Determines which type of nodes will be parsed as geometry."
+msgstr "Determina qué tipo de nodos se analizarán como geometría."
+
+msgid "The source of the geometry used when baking."
+msgstr "La fuente de la geometría utilizada al hornear."
+
+msgid ""
+"The name of the group to scan for geometry.\n"
+"Only used when [member geometry_source_geometry_mode] is [constant "
+"SOURCE_GEOMETRY_GROUPS_WITH_CHILDREN] or [constant "
+"SOURCE_GEOMETRY_GROUPS_EXPLICIT]."
+msgstr ""
+"El nombre del grupo a escanear en busca de geometría.\n"
+"Solo se usa cuando [member geometry_source_geometry_mode] es [constant "
+"SOURCE_GEOMETRY_GROUPS_WITH_CHILDREN] o [constant "
+"SOURCE_GEOMETRY_GROUPS_EXPLICIT]."
+
+msgid ""
+"Any regions with a size smaller than this will be merged with larger regions "
+"if possible.\n"
+"[b]Note:[/b] This value will be squared to calculate the number of cells. For "
+"example, a value of 20 will set the number of cells to 400."
+msgstr ""
+"Cualquier región con un tamaño menor que este se fusionará con regiones más "
+"grandes si es posible.\n"
+"[b]Nota:[/b] Este valor se elevará al cuadrado para calcular el número de "
+"celdas. Por ejemplo, un valor de 20 establecerá el número de celdas en 400."
+
+msgid ""
+"The minimum size of a region for it to be created.\n"
+"[b]Note:[/b] This value will be squared to calculate the minimum number of "
+"cells allowed to form isolated island areas. For example, a value of 8 will "
+"set the number of cells to 64."
+msgstr ""
+"El tamaño mínimo de una región para que sea creada.\n"
+"[b]Nota:[/b] Este valor se elevará al cuadrado para calcular el número mínimo "
+"de celdas permitidas para formar áreas de islas aisladas. Por ejemplo, un "
+"valor de 8 establecerá el número de celdas en 64."
+
+msgid "Partitioning algorithm for creating the navigation mesh polys."
+msgstr ""
+"Algoritmo de partición para crear los polígonos de la malla de navegación."
+
+msgid ""
+"The maximum number of vertices allowed for polygons generated during the "
+"contour to polygon conversion process."
+msgstr ""
+"El número máximo de vértices permitidos para los polígonos generados durante "
+"el proceso de conversión de contorno a polígono."
+
+msgid ""
+"Monotone partitioning. Use this if you want fast navigation mesh generation."
+msgstr ""
+"Partición monótona. Usa esta si quieres una generación rápida de la malla de "
+"navegación."
+
+msgid ""
+"Layer partitioning. Good choice to use for tiled navigation mesh with medium "
+"and small sized tiles."
+msgstr ""
+"Partición por capas. Buena opción para usar en mallas de navegación con tiles "
+"de tamaño mediano y pequeño."
+
 msgid "Represents the size of the [enum SamplePartitionType] enum."
 msgstr "Representa el tamaño del enum [enum SamplePartitionType]."
 
@@ -65814,6 +68449,65 @@ msgstr ""
 "Notificación recibida cuando el nodo está deshabilitado. Véase [constant "
 "PROCESS_MODE_DISABLED]."
 
+msgid ""
+"Notification received from the OS when a go back request is sent (e.g. "
+"pressing the \"Back\" button on Android).\n"
+"Implemented only on Android."
+msgstr ""
+"Notificación recibida del sistema operativo cuando se envía una solicitud de "
+"retroceso (por ejemplo, al pulsar el botón \"Atrás\" en Android).\n"
+"Implementado solo en Android."
+
+msgid ""
+"Notification received when the window is resized.\n"
+"[b]Note:[/b] Only the resized [Window] node receives this notification, and "
+"it's not propagated to the child nodes."
+msgstr ""
+"Notificación recibida cuando la ventana es redimensionada.\n"
+"[b]Nota:[/b] Solo el nodo [Window] redimensionado recibe esta notificación, y "
+"no se propaga a los nodos hijos."
+
+msgid ""
+"Notification received from the OS when the screen's dots per inch (DPI) scale "
+"is changed. Only implemented on macOS."
+msgstr ""
+"Notificación recibida del sistema operativo cuando la escala de puntos por "
+"pulgada (DPI) de la pantalla cambia. Solo implementado en macOS."
+
+msgid ""
+"Notification received when the mouse cursor enters the [Viewport]'s visible "
+"area, that is not occluded behind other [Control]s or [Window]s, provided its "
+"[member Viewport.gui_disable_input] is [code]false[/code] and regardless if "
+"it's currently focused or not."
+msgstr ""
+"Notificación recibida cuando el cursor del ratón entra en el área visible del "
+"[Viewport], que no está ocluida detrás de otros [Control]s o [Window]s, "
+"siempre que su [member Viewport.gui_disable_input] sea [code]false[/code] e "
+"independientemente de si está actualmente enfocado o no."
+
+msgid ""
+"Notification received when the mouse cursor leaves the [Viewport]'s visible "
+"area, that is not occluded behind other [Control]s or [Window]s, provided its "
+"[member Viewport.gui_disable_input] is [code]false[/code] and regardless if "
+"it's currently focused or not."
+msgstr ""
+"Notificación recibida cuando el cursor del ratón abandona el área visible del "
+"[Viewport], que no está ocluida detrás de otros [Control]s o [Window]s, "
+"siempre que su [member Viewport.gui_disable_input] sea [code]false[/code] e "
+"independientemente de si está actualmente enfocado o no."
+
+msgid "Notification received when the window is moved."
+msgstr "Notificación recibida cuando la ventana es movida."
+
+msgid ""
+"Notification received from the OS when the application is exceeding its "
+"allocated memory.\n"
+"Implemented only on iOS."
+msgstr ""
+"Notificación recibida del sistema operativo cuando la aplicación supera su "
+"memoria asignada.\n"
+"Implementado solo en iOS."
+
 msgid ""
 "Notification received when translations may have changed. Can be triggered by "
 "the user changing the locale, changing [member auto_translate_mode] or when "
@@ -66078,6 +68772,25 @@ msgstr ""
 "Siempre traducir automáticamente. Esta es la inversa de [constant "
 "AUTO_TRANSLATE_MODE_DISABLED], y el valor por defecto para el nodo raíz."
 
+msgid ""
+"Never automatically translate. This is the inverse of [constant "
+"AUTO_TRANSLATE_MODE_ALWAYS].\n"
+"String parsing for translation template generation will be skipped for this "
+"node and children that are set to [constant AUTO_TRANSLATE_MODE_INHERIT]."
+msgstr ""
+"Nunca traducir automáticamente. Esto es lo inverso de [constant "
+"AUTO_TRANSLATE_MODE_ALWAYS].\n"
+"El análisis de strings para la generación de plantillas de traducción se "
+"omitirá para este nodo y los hijos que estén configurados como [constant "
+"AUTO_TRANSLATE_MODE_INHERIT]."
+
+msgid ""
+"A 2D game object, inherited by all 2D-related nodes. Has a position, "
+"rotation, scale, and skew."
+msgstr ""
+"Un objeto de juego en 2D, heredado por todos los nodos relacionados con el "
+"2D. Tiene una posición, rotación, escala y deformación."
+
 msgid ""
 "A 2D game object, with a transform (position, rotation, and scale). All 2D "
 "nodes, including physics objects and sprites, inherit from Node2D. Use Node2D "
@@ -66102,12 +68815,61 @@ msgstr "Todos los Demos 2D"
 msgid "Multiplies the current scale by the [param ratio] vector."
 msgstr "Multiplica la escala actual por el vector [param ratio]."
 
+msgid ""
+"Returns the angle between the node and the [param point] in radians. See also "
+"[method look_at].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"node2d_get_angle_to.png]Illustration of the returned angle.[/url]"
+msgstr ""
+"Devuelve el ángulo entre el nodo y el [param point] en radianes. Véase "
+"también [method look_at].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"node2d_get_angle_to.png]Ilustración del ángulo devuelto.[/url]"
+
 msgid "Returns the [Transform2D] relative to this node's parent."
 msgstr "Devuelve el [Transform2D] relativo al padre de este nodo."
 
 msgid "Adds the [param offset] vector to the node's global position."
 msgstr "Añade el vector [param offset] a la posición global del nodo."
 
+msgid ""
+"Rotates the node so that its local +X axis points towards the [param point], "
+"which is expected to use global coordinates. This method is a combination of "
+"both [method rotate] and [method get_angle_to].\n"
+"[param point] should not be the same as the node's position, otherwise the "
+"node always looks to the right."
+msgstr ""
+"Rota el nodo para que su eje +X local apunte hacia el [param point], que se "
+"espera que use coordenadas globales. Este método es una combinación de "
+"[method rotate] y [method get_angle_to].\n"
+"[param point] no debe ser el mismo que la posición del nodo, de lo contrario "
+"el nodo siempre mirará hacia la derecha."
+
+msgid ""
+"Applies a local translation on the node's X axis with the amount specified in "
+"[param delta]. If [param scaled] is [code]false[/code], normalizes the "
+"movement to occur independently of the node's [member scale]."
+msgstr ""
+"Aplica una traslación local en el eje X del nodo con la cantidad especificada "
+"en [param delta]. Si [param scaled] es [code]false[/code], normaliza el "
+"movimiento para que ocurra independientemente de la [member scale] del nodo."
+
+msgid ""
+"Applies a local translation on the node's Y axis with the amount specified in "
+"[param delta]. If [param scaled] is [code]false[/code], normalizes the "
+"movement to occur independently of the node's [member scale]."
+msgstr ""
+"Aplica una traslación local en el eje Y del nodo con la cantidad especificada "
+"en [param delta]. Si [param scaled] es [code]false[/code], normaliza el "
+"movimiento para que ocurra independientemente de la [member scale] del nodo."
+
+msgid ""
+"Applies a rotation to the node, in radians, starting from its current "
+"rotation. This is equivalent to [code]rotation += radians[/code]."
+msgstr ""
+"Aplica una rotación al nodo, en radianes, a partir de su rotación actual. "
+"Esto es equivalente a [code]rotation += radians[/code]."
+
 msgid ""
 "Transforms the provided local position into a position in global coordinate "
 "space. The input is expected to be local relative to the [Node2D] it is "
@@ -66136,6 +68898,13 @@ msgstr ""
 "nodos hijos, pero no es apropiado para determinar su propia posición en "
 "relación con su padre."
 
+msgid ""
+"Translates the node by the given [param offset] in local coordinates. This is "
+"equivalent to [code]position += offset[/code]."
+msgstr ""
+"Traslada el nodo por el [param offset] dado en coordenadas locales. Esto es "
+"equivalente a [code]position += offset[/code]."
+
 msgid "Global position. See also [member position]."
 msgstr "Posición global. Véase también [member position]."
 
@@ -66152,6 +68921,70 @@ msgstr ""
 msgid "Global scale. See also [member scale]."
 msgstr "Escala global. Véase también [member scale]."
 
+msgid "Global skew in radians. See also [member skew]."
+msgstr "Sesgo global en radianes. Véase también [member skew]."
+
+msgid "Global [Transform2D]. See also [member transform]."
+msgstr "[Transform2D] global. Véase también [member transform]."
+
+msgid ""
+"Position, relative to the node's parent. See also [member global_position]."
+msgstr ""
+"Posición, relativa al padre del nodo. Véase también [member global_position]."
+
+msgid ""
+"Rotation in radians, relative to the node's parent. See also [member "
+"global_rotation].\n"
+"[b]Note:[/b] This property is edited in the inspector in degrees. If you want "
+"to use degrees in a script, use [member rotation_degrees]."
+msgstr ""
+"Rotación en radianes, relativa al padre del nodo. Véase también [member "
+"global_rotation].\n"
+"[b]Nota:[/b] Esta propiedad se edita en el inspector en grados. Si quieres "
+"usar grados en un script, usa [member rotation_degrees]."
+
+msgid ""
+"Helper property to access [member rotation] in degrees instead of radians. "
+"See also [member global_rotation_degrees]."
+msgstr ""
+"Propiedad de ayuda para acceder a [member rotation] en grados en lugar de "
+"radianes. Véase también [member global_rotation_degrees]."
+
+msgid ""
+"The node's scale, relative to the node's parent. Unscaled value: [code](1, 1)"
+"[/code]. See also [member global_scale].\n"
+"[b]Note:[/b] Negative X scales in 2D are not decomposable from the "
+"transformation matrix. Due to the way scale is represented with "
+"transformation matrices in Godot, negative scales on the X axis will be "
+"changed to negative scales on the Y axis and a rotation of 180 degrees when "
+"decomposed."
+msgstr ""
+"La escala del nodo, relativa al padre del nodo. Valor sin escalar: [code](1, "
+"1)[/code]. Véase también [member global_scale].\n"
+"[b]Nota:[/b] Las escalas X negativas en 2D no son descomponibles de la matriz "
+"de transformación. Debido a la forma en que se representa la escala con las "
+"matrices de transformación en Godot, las escalas negativas en el eje X se "
+"cambiarán a escalas negativas en el eje Y y una rotación de 180 grados al "
+"descomponerse."
+
+msgid ""
+"If set to a non-zero value, slants the node in one direction or another. This "
+"can be used for pseudo-3D effects. See also [member global_skew].\n"
+"[b]Note:[/b] Skew is performed on the X axis only, and [i]between[/i] "
+"rotation and scaling.\n"
+"[b]Note:[/b] This property is edited in the inspector in degrees. If you want "
+"to use degrees in a script, use [code]skew = deg_to_rad(value_in_degrees)[/"
+"code]."
+msgstr ""
+"Si se establece en un valor distinto de cero, inclina el nodo en una "
+"dirección u otra. Esto puede usarse para efectos pseudo-3D. Véase también "
+"[member global_skew].\n"
+"[b]Nota:[/b] El sesgo se realiza solo en el eje X, y [i]entre[/i] la rotación "
+"y el escalado.\n"
+"[b]Nota:[/b] Esta propiedad se edita en el inspector en grados. Si quieres "
+"usar grados en un script, usa [code]skew = deg_to_rad(value_in_degrees)[/"
+"code]."
+
 msgid ""
 "The node's [Transform2D], relative to the node's parent. See also [member "
 "global_transform]."
@@ -66162,6 +68995,36 @@ msgstr ""
 msgid "Base object in 3D space, inherited by all 3D nodes."
 msgstr "Objeto base en el espacio 3D, del que heredan todos los nodos 3D."
 
+msgid ""
+"The [Node3D] node is the base representation of a node in 3D space. All other "
+"3D nodes inherit from this class.\n"
+"Affine operations (translation, rotation, scale) are calculated in the "
+"coordinate system relative to the parent, unless the [Node3D]'s [member "
+"top_level] is [code]true[/code]. In this coordinate system, affine operations "
+"correspond to direct affine operations on the [Node3D]'s [member transform]. "
+"The term [i]parent space[/i] refers to this coordinate system. The coordinate "
+"system that is attached to the [Node3D] itself is referred to as object-local "
+"coordinate system, or [i]local space[/i].\n"
+"[b]Note:[/b] Unless otherwise specified, all methods that need angle "
+"parameters must receive angles in [i]radians[/i]. To convert degrees to "
+"radians, use [method @GlobalScope.deg_to_rad].\n"
+"[b]Note:[/b] In Godot 3 and older, [Node3D] was named [i]Spatial[/i]."
+msgstr ""
+"El nodo [Node3D] es la representación base de un nodo en el espacio 3D. Todos "
+"los demás nodos 3D heredan de esta clase.\n"
+"Las operaciones afines (traslación, rotación, escala) se calculan en el "
+"sistema de coordenadas relativo al padre, a menos que el [member top_level] "
+"del [Node3D] sea [code]true[/code]. En este sistema de coordenadas, las "
+"operaciones afines corresponden a operaciones afines directas sobre el "
+"[member transform] del [Node3D]. El término [i]espacio del padre[/i] se "
+"refiere a este sistema de coordenadas. El sistema de coordenadas que está "
+"asociado al propio [Node3D] se conoce como sistema de coordenadas objeto-"
+"local, o [i]espacio local[/i].\n"
+"[b]Nota:[/b] A menos que se especifique lo contrario, todos los métodos que "
+"necesiten parámetros de ángulo deben recibir los ángulos en [i]radianes[/i]. "
+"Para convertir grados a radianes, usa [method @GlobalScope.deg_to_rad].\n"
+"[b]Nota:[/b] En Godot 3 y anteriores, [Node3D] se llamaba [i]Spatial[/i]."
+
 msgid "Introduction to 3D"
 msgstr "Introducción al 3D"
 
@@ -66194,6 +69057,62 @@ msgstr ""
 "subgizmo seleccionado puede que ya no exista después de un cambio de "
 "propiedad. Solo funciona en el editor."
 
+msgid ""
+"Forces the node's [member global_transform] to update, by sending [constant "
+"NOTIFICATION_TRANSFORM_CHANGED]. Fails if the node is not inside the tree.\n"
+"[b]Note:[/b] For performance reasons, transform changes are usually "
+"accumulated and applied [i]once[/i] at the end of the frame. The update "
+"propagates through [Node3D] children, as well. Therefore, use this method "
+"only when you need an up-to-date transform (such as during physics "
+"operations)."
+msgstr ""
+"Fuerza la actualización del [member global_transform] del nodo, enviando "
+"[constant NOTIFICATION_TRANSFORM_CHANGED]. Falla si el nodo no está dentro "
+"del árbol.\n"
+"[b]Nota:[/b] Por razones de rendimiento, los cambios de transformación se "
+"suelen acumular y aplicar [i]una sola vez[/i] al final del fotograma. La "
+"actualización se propaga también a través de los hijos [Node3D]. Por lo "
+"tanto, usa este método solo cuando necesites una transformación actualizada "
+"(como durante las operaciones de física)."
+
+msgid ""
+"Returns all the [EditorNode3DGizmo] objects attached to this node. Only works "
+"in the editor."
+msgstr ""
+"Devuelve todos los objetos [EditorNode3DGizmo] adjuntos a este nodo. Solo "
+"funciona en el editor."
+
+msgid ""
+"When using physics interpolation, there will be circumstances in which you "
+"want to know the interpolated (displayed) transform of a node rather than the "
+"standard transform (which may only be accurate to the most recent physics "
+"tick).\n"
+"This is particularly important for frame-based operations that take place in "
+"[method Node._process], rather than [method Node._physics_process]. Examples "
+"include [Camera3D]s focusing on a node, or finding where to fire lasers from "
+"on a frame rather than physics tick.\n"
+"[b]Note:[/b] This function creates an interpolation pump on the [Node3D] the "
+"first time it is called, which can respond to physics interpolation resets. "
+"If you get problems with \"streaking\" when initially following a [Node3D], "
+"be sure to call [method get_global_transform_interpolated] at least once "
+"[i]before[/i] resetting the [Node3D] physics interpolation."
+msgstr ""
+"Al usar la interpolación física, habrá circunstancias en las que querrás "
+"saber la transformación interpolada (mostrada) de un nodo en lugar de la "
+"transformación estándar (que puede ser precisa solo hasta el tick de física "
+"más reciente).\n"
+"Esto es particularmente importante para operaciones basadas en fotogramas que "
+"tienen lugar en [method Node._process], en lugar de [method "
+"Node._physics_process]. Los ejemplos incluyen [Camera3D]s enfocándose en un "
+"nodo, o encontrar desde dónde disparar láseres en un fotograma en lugar de en "
+"un tick de física.\n"
+"[b]Nota:[/b] Esta función crea una 'bomba de interpolación' en el [Node3D] la "
+"primera vez que se llama, la cual puede responder a los reinicios de "
+"interpolación física. Si tienes problemas de \"rayas\" al seguir inicialmente "
+"un [Node3D], asegúrate de llamar a [method get_global_transform_interpolated] "
+"al menos una vez [i]antes[/i] de reiniciar la interpolación física del "
+"[Node3D]."
+
 msgid ""
 "Returns the parent [Node3D] that directly affects this node's [member "
 "global_transform]. Returns [code]null[/code] if no parent exists, the parent "
@@ -66500,6 +69419,25 @@ msgstr ""
 "Devuelve el [param global_point] convertido del espacio global al espacio "
 "local de este nodo. Esto es lo opuesto a [method to_global]."
 
+msgid ""
+"Adds the given translation [param offset] to the node's position, in local "
+"space (relative to this node).\n"
+"[b]Note:[/b] Prefer using [method translate_object_local], instead, as this "
+"method may be changed in a future release.\n"
+"[b]Note:[/b] Despite the naming convention, this operation is [b]not[/b] "
+"calculated in parent space for compatibility reasons. To translate in parent "
+"space, add [param offset] to the [member position] ([code]node_3d.position += "
+"offset[/code])."
+msgstr ""
+"Añade la traslación dada [param offset] a la posición del nodo, en espacio "
+"local (relativo a este nodo).\n"
+"[b]Nota:[/b] Es preferible usar [method translate_object_local], en su lugar, "
+"ya que este método podría cambiar en una futura versión.\n"
+"[b]Nota:[/b] A pesar de la convención de nombres, esta operación [b]no[/b] se "
+"calcula en el espacio del padre por razones de compatibilidad. Para trasladar "
+"en el espacio del padre, añade [param offset] a la [member position] "
+"([code]node_3d.position += offset[/code])."
+
 msgid ""
 "Adds the given translation [param offset] to the node's position, in local "
 "space (relative to this node)."
@@ -66596,6 +69534,42 @@ msgstr ""
 "3D, pero son menos intuitivos. Establecer esta propiedad puede ser útil para "
 "la interpolación (véase [method Quaternion.slerp])."
 
+msgid ""
+"Rotation of this node as [url=https://en.wikipedia.org/wiki/"
+"Euler_angles]Euler angles[/url], in radians and in parent space (relative to "
+"the parent node). This value is obtained from [member basis]'s rotation.\n"
+"- The [member Vector3.x] is the angle around the local X axis (pitch);\n"
+"- The [member Vector3.y] is the angle around the local Y axis (yaw);\n"
+"- The [member Vector3.z] is the angle around the local Z axis (roll).\n"
+"The order of each consecutive rotation can be changed with [member "
+"rotation_order] (see [enum EulerOrder] constants). By default, the YXZ "
+"convention is used ([constant EULER_ORDER_YXZ]).\n"
+"[b]Note:[/b] This property is edited in degrees in the inspector. If you want "
+"to use degrees in a script, use [member rotation_degrees]."
+msgstr ""
+"Rotación de este nodo como [url=https://en.wikipedia.org/wiki/"
+"Euler_angles]ángulos de Euler[/url], en radianes y en espacio padre (relativo "
+"al nodo padre). Este valor se obtiene de la rotación de la [member basis].\n"
+"- [member Vector3.x] es el ángulo alrededor del eje X local (cabeceo);\n"
+"- [member Vector3.y] es el ángulo alrededor del eje Y local (guiñada);\n"
+"- [member Vector3.z] es el ángulo alrededor del eje Z local (alabeo).\n"
+"El orden de cada rotación consecutiva puede cambiarse con [member "
+"rotation_order] (ver las constantes [enum EulerOrder]). Por defecto, se usa "
+"la convención YXZ ([constant EULER_ORDER_YXZ]).\n"
+"[b]Nota:[/b] Esta propiedad se edita en grados en el inspector. Si quieres "
+"usar grados en un script, usa [member rotation_degrees]."
+
+msgid ""
+"The [member rotation] of this node, in degrees instead of radians.\n"
+"[b]Note:[/b] This is [b]not[/b] the property available in the Inspector dock."
+msgstr ""
+"La [member rotation] de este nodo, en grados en lugar de radianes.\n"
+"[b]Nota:[/b] Esta [b]no[/b] es la propiedad disponible en el dock Inspector."
+
+msgid "How this node's rotation and scale are displayed in the Inspector dock."
+msgstr ""
+"Cómo se muestran la rotación y la escala de este nodo en el dock Inspector."
+
 msgid ""
 "The axis rotation order of the [member rotation] property. The final "
 "orientation is calculated by rotating around the local X, Y, and Z axis in "
@@ -66605,6 +69579,40 @@ msgstr ""
 "orientación final se calcula girando alrededor de los ejes X, Y y Z locales "
 "en este orden."
 
+msgid ""
+"Scale of this node in local space (relative to this node). This value is "
+"obtained from [member basis]'s scale.\n"
+"[b]Note:[/b] The behavior of some 3D node types is not affected by this "
+"property. These include [Light3D], [Camera3D], [AudioStreamPlayer3D], and "
+"more.\n"
+"[b]Warning:[/b] The scale's components must either be all positive or all "
+"negative, and [b]not[/b] exactly [code]0.0[/code]. Otherwise, it won't be "
+"possible to obtain the scale from the [member basis]. This may cause the "
+"intended scale to be lost when reloaded from disk, and potentially other "
+"unstable behavior."
+msgstr ""
+"Escala de este nodo en el espacio local (relativa a este nodo). Este valor se "
+"obtiene de la escala de [member basis].\n"
+"[b]Nota:[/b] El comportamiento de algunos tipos de nodo 3D no se ve afectado "
+"por esta propiedad. Estos incluyen [Light3D], [Camera3D], "
+"[AudioStreamPlayer3D] y más.\n"
+"[b]Advertencia:[/b] Los componentes de la escala deben ser todos positivos o "
+"todos negativos, y [b]no[/b] exactamente [code]0.0[/code]. De lo contrario, "
+"no será posible obtener la escala de la [member basis]. Esto puede causar que "
+"la escala prevista se pierda al recargarla del disco, y potencialmente otros "
+"comportamientos inestables."
+
+msgid ""
+"If [code]true[/code], the node does not inherit its transformations from its "
+"parent. As such, node transformations will only be in global space, which "
+"also means that [member global_transform] and [member transform] will be "
+"identical."
+msgstr ""
+"Si es [code]true[/code], el nodo no hereda sus transformaciones de su padre. "
+"Como tal, las transformaciones del nodo solo estarán en el espacio global, lo "
+"que también significa que [member global_transform] y [member transform] "
+"serán idénticas."
+
 msgid ""
 "The local transformation of this node, in parent space (relative to the "
 "parent node). Contains and represents this node's [member position], [member "
@@ -66679,6 +69687,15 @@ msgstr ""
 "Notificación recibida cuando este nodo se registra en un nuevo [World3D] "
 "(véase [method get_world_3d])."
 
+msgid ""
+"Notification received when this node is unregistered from the current "
+"[World3D] (see [method get_world_3d]).\n"
+"This notification is sent in reversed order."
+msgstr ""
+"Notificación recibida cuando este nodo se da de baja del [World3D] actual "
+"(véase [method get_world_3d]).\n"
+"Esta notificación se envía en orden inverso."
+
 msgid ""
 "Notification received when this node's [member transform] changes, if [method "
 "is_local_transform_notification_enabled] is [code]true[/code]. This is not "
@@ -66716,6 +69733,17 @@ msgstr ""
 msgid "Abstract class to expose editor gizmos for [Node3D]."
 msgstr "Clase abstracta para exponer gizmos de editor para [Node3D]."
 
+msgid ""
+"This abstract class helps connect the [Node3D] scene with the editor-specific "
+"[EditorNode3DGizmo] class.\n"
+"[Node3DGizmo] by itself has no exposed API, refer to [method "
+"Node3D.add_gizmo] and pass it an [EditorNode3DGizmo] instance."
+msgstr ""
+"Esta clase abstracta ayuda a conectar la escena [Node3D] con la clase "
+"[EditorNode3DGizmo] específica del editor.\n"
+"[Node3DGizmo] por sí misma no tiene API expuesta, véase [method "
+"Node3D.add_gizmo] y pásale una instancia de [EditorNode3DGizmo]."
+
 msgid ""
 "The [NodePath] built-in [Variant] type represents a path to a node or "
 "property in a hierarchy of nodes. It is designed to be efficiently passed "
@@ -66837,6 +69865,77 @@ msgstr "Construye un [NodePath] vacío."
 msgid "Constructs a [NodePath] as a copy of the given [NodePath]."
 msgstr "Construye un [NodePath] como copia del [NodePath] dado."
 
+msgid ""
+"Returns the number of property names (\"subnames\") in the path. Each subname "
+"in the node path is listed after a colon character ([code]:[/code]).\n"
+"For example, [code]\"Level/RigidBody2D/Sprite2D:texture:resource_name\"[/"
+"code] contains 2 subnames."
+msgstr ""
+"Devuelve el número de nombres de propiedades (\"subnombres\") en la ruta. "
+"Cada subnombre en la ruta del nodo se lista después de un carácter de dos "
+"puntos ([code]:[/code]).\n"
+"Por ejemplo, [code]\"Level/RigidBody2D/Sprite2D:texture:resource_name\"[/"
+"code] contiene 2 subnombres."
+
+msgid ""
+"Returns the 32-bit hash value representing the node path's contents.\n"
+"[b]Note:[/b] Node paths with equal hash values are [i]not[/i] guaranteed to "
+"be the same, as a result of hash collisions. Node paths with different hash "
+"values are guaranteed to be different."
+msgstr ""
+"Devuelve el valor hash de 32 bits que representa el contenido de la ruta del "
+"nodo.\n"
+"[b]Nota:[/b] Las rutas de nodo con valores hash iguales [i]no[/i] garantizan "
+"ser las mismas, como resultado de colisiones de hash. Las rutas de nodo con "
+"valores hash diferentes garantizan ser diferentes."
+
+msgid ""
+"Returns [code]true[/code] if the node path is absolute. Unlike a relative "
+"path, an absolute path is represented by a leading slash character ([code]/[/"
+"code]) and always begins from the [SceneTree]. It can be used to reliably "
+"access nodes from the root node (e.g. [code]\"/root/Global\"[/code] if an "
+"autoload named \"Global\" exists)."
+msgstr ""
+"Devuelve [code]true[/code] si la ruta del nodo es absoluta. A diferencia de "
+"una ruta relativa, una ruta absoluta se representa con un carácter de barra "
+"inicial ([code]/[/code]) y siempre comienza desde el [SceneTree]. Se puede "
+"utilizar para acceder de forma fiable a los nodos desde el nodo raíz (por "
+"ejemplo, [code]\"/root/Global\"[/code] si existe una autocarga llamada "
+"\"Global\")."
+
+msgid ""
+"Returns [code]true[/code] if the node path has been constructed from an empty "
+"[String] ([code]\"\"[/code])."
+msgstr ""
+"Devuelve [code]true[/code] si la ruta del nodo ha sido construida a partir de "
+"una [String] vacía ([code]\"\"[/code])."
+
+msgid ""
+"Returns the slice of the [NodePath], from [param begin] (inclusive) to [param "
+"end] (exclusive), as a new [NodePath].\n"
+"The absolute value of [param begin] and [param end] will be clamped to the "
+"sum of [method get_name_count] and [method get_subname_count], so the default "
+"value for [param end] makes it slice to the end of the [NodePath] by default "
+"(i.e. [code]path.slice(1)[/code] is a shorthand for [code]path.slice(1, "
+"path.get_name_count() + path.get_subname_count())[/code]).\n"
+"If either [param begin] or [param end] are negative, they will be relative to "
+"the end of the [NodePath] (i.e. [code]path.slice(0, -2)[/code] is a shorthand "
+"for [code]path.slice(0, path.get_name_count() + path.get_subname_count() - 2)"
+"[/code])."
+msgstr ""
+"Devuelve una porción de la [NodePath], desde [param begin] (inclusive) hasta "
+"[param end] (exclusive), como una nueva [NodePath].\n"
+"El valor absoluto de [param begin] y [param end] se ajustará a la suma de "
+"[method get_name_count] y [method get_subname_count], por lo que el valor "
+"predeterminado de [param end] hace que la porción vaya hasta el final de la "
+"[NodePath] por defecto (es decir, [code]path.slice(1)[/code] es una "
+"abreviatura de [code]path.slice(1, path.get_name_count() + "
+"path.get_subname_count())[/code]).\n"
+"Si [param begin] o [param end] son negativos, serán relativos al final de la "
+"[NodePath] (es decir, [code]path.slice(0, -2)[/code] es una abreviatura de "
+"[code]path.slice(0, path.get_name_count() + path.get_subname_count() - 2)[/"
+"code])."
+
 msgid "Returns [code]true[/code] if two node paths are not equal."
 msgstr "Devuelve [code]true[/code] si dos rutas de nodo no son iguales."
 
@@ -70849,6 +73948,84 @@ msgstr "Un array empaquetado de enteros de 64 bits."
 msgid "Constructs an empty [PackedInt64Array]."
 msgstr "Construye un [PackedInt64Array] vacío."
 
+msgid ""
+"Constructs a [PackedInt64Array] as a copy of the given [PackedInt64Array]."
+msgstr ""
+"Construye un [PackedInt64Array] como una copia del [PackedInt64Array] dado."
+
+msgid ""
+"Constructs a new [PackedInt64Array]. Optionally, you can pass in a generic "
+"[Array] that will be converted."
+msgstr ""
+"Construye un nuevo [PackedInt64Array]. Opcionalmente, puedes pasar un [Array] "
+"genérico que será convertido."
+
+msgid "Appends a [PackedInt64Array] at the end of this array."
+msgstr "Añade un [PackedInt64Array] al final de este array."
+
+msgid ""
+"Returns the 64-bit integer at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns [code]0[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"Devuelve el entero de 64 bits en el [param index] dado en el array. Si [param "
+"index] está fuera de los límites o es negativo, este método falla y devuelve "
+"[code]0[/code].\n"
+"Este método es similar (pero no idéntico) al operador [code][][/code]. Lo más "
+"notable es que, cuando este método falla, no pausa la ejecución del proyecto "
+"si se ejecuta desde el editor."
+
+msgid ""
+"Returns the slice of the [PackedInt64Array], from [param begin] (inclusive) "
+"to [param end] (exclusive), as a new [PackedInt64Array].\n"
+"The absolute value of [param begin] and [param end] will be clamped to the "
+"array size, so the default value for [param end] makes it slice to the size "
+"of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for "
+"[code]arr.slice(1, arr.size())[/code]).\n"
+"If either [param begin] or [param end] are negative, they will be relative to "
+"the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+msgstr ""
+"Devuelve una porción del [PackedInt64Array], desde [param begin] (inclusive) "
+"hasta [param end] (exclusivo), como un nuevo [PackedInt64Array].\n"
+"El valor absoluto de [param begin] y [param end] se ajustará al tamaño del "
+"array, por lo que el valor predeterminado para [param end] hace que se corte "
+"al tamaño del array por defecto (es decir, [code]arr.slice(1)[/code] es una "
+"abreviatura de [code]arr.slice(1, arr.size())[/code]).\n"
+"Si [param begin] o [param end] son negativos, serán relativos al final del "
+"array (es decir, [code]arr.slice(0, -2)[/code] es una abreviatura de "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+
+msgid ""
+"Returns a copy of the data converted to a [PackedByteArray], where each "
+"element has been encoded as 8 bytes.\n"
+"The size of the new array will be [code]int64_array.size() * 8[/code]."
+msgstr ""
+"Devuelve una copia de los datos convertidos a un [PackedByteArray], donde "
+"cada elemento ha sido codificado como 8 bytes.\n"
+"El tamaño del nuevo array será [code]int64_array.size() * 8[/code]."
+
+msgid ""
+"Returns a new [PackedInt64Array] with contents of [param right] added at the "
+"end of this array. For better performance, consider using [method "
+"append_array] instead."
+msgstr ""
+"Devuelve un nuevo [PackedInt64Array] con el contenido de [param right] "
+"añadido al final de este array. Para un mejor rendimiento, considera usar "
+"[method append_array] en su lugar."
+
+msgid ""
+"Returns the [int] at index [param index]. Negative indices can be used to "
+"access the elements starting from the end. Using index out of array's bounds "
+"will result in an error."
+msgstr ""
+"Devuelve el [int] en el índice [param index]. Se pueden usar índices "
+"negativos para acceder a los elementos desde el final. Usar un índice fuera "
+"de los límites del array resultará en un error."
+
 msgid "An abstraction of a serialized scene."
 msgstr "Una abstracción de una escena serializada."
 
@@ -70859,24 +74036,236 @@ msgid "Returns the [SceneState] representing the scene file contents."
 msgstr ""
 "Devuelve el [SceneState] que representa el contenido del archivo de la escena."
 
+msgid ""
+"Instantiates the scene's node hierarchy. Triggers child scene "
+"instantiation(s). Triggers a [constant Node.NOTIFICATION_SCENE_INSTANTIATED] "
+"notification on the root node."
+msgstr ""
+"Instancia la jerarquía de nodos de la escena. Desencadena la(s) instanciación "
+"de la(s) escena(s) hija(s). Dispara una notificación [constant "
+"Node.NOTIFICATION_SCENE_INSTANTIATED] en el nodo raíz."
+
+msgid ""
+"Packs the [param path] node, and all owned sub-nodes, into this "
+"[PackedScene]. Any existing data will be cleared. See [member Node.owner]."
+msgstr ""
+"Empaqueta el nodo [param path], y todos los subnodos propios, en esta "
+"[PackedScene]. Cualquier dato existente será borrado. Véase [member "
+"Node.owner]."
+
+msgid "If passed to [method instantiate], blocks edits to the scene state."
+msgstr ""
+"Si se pasa a [method instantiate], bloquea las ediciones al estado de la "
+"escena."
+
+msgid ""
+"If passed to [method instantiate], provides local scene resources to the "
+"local scene.\n"
+"[b]Note:[/b] Only available in editor builds."
+msgstr ""
+"Si se pasa a [method instantiate], proporciona recursos de escena locales a "
+"la escena local.\n"
+"[b]Nota:[/b] Solo disponible en compilaciones de editor."
+
+msgid ""
+"If passed to [method instantiate], provides local scene resources to the "
+"local scene. Only the main scene should receive the main edit state.\n"
+"[b]Note:[/b] Only available in editor builds."
+msgstr ""
+"Si se pasa a [method instantiate], proporciona recursos de la escena local a "
+"la escena local. Solo la escena principal debe recibir el estado de edición "
+"principal.\n"
+"[b]Nota:[/b] Solo disponible en las builds del editor."
+
+msgid ""
+"It's similar to [constant GEN_EDIT_STATE_MAIN], but for the case where the "
+"scene is being instantiated to be the base of another one.\n"
+"[b]Note:[/b] Only available in editor builds."
+msgstr ""
+"Es similar a [constant GEN_EDIT_STATE_MAIN], pero para el caso en que la "
+"escena se está instanciando para ser la base de otra.\n"
+"[b]Nota:[/b] Solo disponible en las builds del editor."
+
 msgid "A packed array of [String]s."
 msgstr "Un array empaquetado de [String]s."
 
+msgid ""
+"An array specifically designed to hold [String]s. Packs data tightly, so it "
+"saves memory for large array sizes.\n"
+"If you want to join the strings in the array, use [method String.join].\n"
+"[codeblock]\n"
+"var string_array = PackedStringArray([\"hello\", \"world\"])\n"
+"var string = \" \".join(string_array)\n"
+"print(string) # \"hello world\"\n"
+"[/codeblock]\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedStringArray] versus "
+"[code]Array[String][/code]). Also, packed arrays consume less memory. As a "
+"downside, packed arrays are less flexible as they don't offer as many "
+"convenience methods such as [method Array.map]. Typed arrays are in turn "
+"faster to iterate on and modify than untyped arrays.\n"
+"[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate]. This is [i]not[/i] the case for built-in properties and "
+"methods. In these cases the returned packed array is a copy, and changing it "
+"will [i]not[/i] affect the original value. To update a built-in property of "
+"this type, modify the returned array and then assign it to the property again."
+msgstr ""
+"Un array diseñado específicamente para contener [String]s. Empaqueta los "
+"datos de forma compacta, lo que ahorra memoria para arrays de gran tamaño.\n"
+"Si quieres unir las strings en el array, usa [method String.join].\n"
+"[codeblock]\n"
+"var string_array = PackedStringArray([\"hola\", \"mundo\"])\n"
+"var string = \" \".join(string_array)\n"
+"print(string) # \"hola mundo\"\n"
+"[/codeblock]\n"
+"[b]Diferencias entre arrays empaquetados, arrays tipados y arrays sin tipo:[/"
+"b] Los arrays empaquetados son generalmente más rápidos de iterar y modificar "
+"en comparación con un array tipado del mismo tipo (por ejemplo, "
+"[PackedStringArray] versus [code]Array[String][/code]). Además, los arrays "
+"empaquetados consumen menos memoria. Como desventaja, los arrays empaquetados "
+"son menos flexibles ya que no ofrecen tantos métodos de conveniencia como "
+"[method Array.map]. Los arrays tipados, a su vez, son más rápidos de iterar y "
+"modificar que los arrays sin tipo.\n"
+"[b]Nota:[/b] Los arrays empaquetados siempre se pasan por referencia. Para "
+"obtener una copia de un array que pueda ser modificado independientemente del "
+"array original, usa [method duplicate]. Este [i]no[/i] es el caso para "
+"propiedades y métodos integrados. En estos casos, el array empaquetado "
+"devuelto es una copia, y modificarlo [i]no[/i] afectará al valor original. "
+"Para actualizar una propiedad integrada de este tipo, modifica el array "
+"devuelto y luego asígnalo a la propiedad de nuevo."
+
 msgid "Constructs an empty [PackedStringArray]."
 msgstr "Construye un [PackedStringArray] vacío."
 
+msgid ""
+"Constructs a [PackedStringArray] as a copy of the given [PackedStringArray]."
+msgstr ""
+"Construye un [PackedStringArray] como una copia del [PackedStringArray] dado."
+
+msgid ""
+"Constructs a new [PackedStringArray]. Optionally, you can pass in a generic "
+"[Array] that will be converted."
+msgstr ""
+"Construye un nuevo [PackedStringArray]. Opcionalmente, puedes pasar un "
+"[Array] genérico que será convertido."
+
 msgid "Appends a [PackedStringArray] at the end of this array."
 msgstr "Añade un [PackedStringArray] al final de este array."
 
+msgid ""
+"Returns the [String] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns an empty "
+"string.\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"Devuelve la [String] en el [param index] dado en el array. Si [param index] "
+"está fuera de los límites o es negativo, este método falla y devuelve una "
+"cadena vacía.\n"
+"Este método es similar (pero no idéntico) al operador [code][][/code]. Lo más "
+"notable es que, cuando este método falla, no pausa la ejecución del proyecto "
+"si se ejecuta desde el editor."
+
 msgid "Appends a string element at end of the array."
 msgstr "Añade un elemento de string al final de la array."
 
 msgid "Changes the [String] at the given index."
 msgstr "Cambia la [String] en el índice dado."
 
+msgid ""
+"Returns the slice of the [PackedStringArray], from [param begin] (inclusive) "
+"to [param end] (exclusive), as a new [PackedStringArray].\n"
+"The absolute value of [param begin] and [param end] will be clamped to the "
+"array size, so the default value for [param end] makes it slice to the size "
+"of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for "
+"[code]arr.slice(1, arr.size())[/code]).\n"
+"If either [param begin] or [param end] are negative, they will be relative to "
+"the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+msgstr ""
+"Devuelve una porción del [PackedStringArray], desde [param begin] (inclusive) "
+"hasta [param end] (exclusive), como un nuevo [PackedStringArray].\n"
+"El valor absoluto de [param begin] y [param end] se ajustará al tamaño del "
+"array, de modo que el valor predeterminado para [param end] hace que se corte "
+"al tamaño del array por defecto (es decir, [code]arr.slice(1)[/code] es una "
+"abreviatura de [code]arr.slice(1, arr.size())[/code]).\n"
+"Si [param begin] o [param end] son negativos, serán relativos al final del "
+"array (es decir, [code]arr.slice(0, -2)[/code] es una abreviatura de "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+
+msgid ""
+"Returns a [PackedByteArray] with each string encoded as UTF-8. Strings are "
+"[code]null[/code] terminated."
+msgstr ""
+"Devuelve un [PackedByteArray] con cada strings codificada como UTF-8. Las "
+"cadenas están terminadas en [code]null[/code]."
+
+msgid ""
+"Returns a new [PackedStringArray] with contents of [param right] added at the "
+"end of this array. For better performance, consider using [method "
+"append_array] instead."
+msgstr ""
+"Devuelve un nuevo [PackedStringArray] con el contenido de [param right] "
+"añadido al final de este array. Para un mejor rendimiento, considera usar "
+"[method append_array] en su lugar."
+
+msgid ""
+"Returns [code]true[/code] if contents of both arrays are the same, i.e. they "
+"have all equal [String]s at the corresponding indices."
+msgstr ""
+"Devuelve [code]true[/code] si el contenido de ambos arrays es el mismo, es "
+"decir, tienen todas las [String]s iguales en los índices correspondientes."
+
+msgid ""
+"Returns the [String] at index [param index]. Negative indices can be used to "
+"access the elements starting from the end. Using index out of array's bounds "
+"will result in an error."
+msgstr ""
+"Devuelve la [String] en el índice [param index]. Se pueden usar índices "
+"negativos para acceder a los elementos desde el final. Usar un índice fuera "
+"de los límites del array resultará en un error."
+
 msgid "A packed array of [Vector2]s."
 msgstr "Un array empaquetado de [Vector2]s."
 
+msgid ""
+"An array specifically designed to hold [Vector2]. Packs data tightly, so it "
+"saves memory for large array sizes.\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedVector2Array] versus "
+"[code]Array[Vector2][/code]). Also, packed arrays consume less memory. As a "
+"downside, packed arrays are less flexible as they don't offer as many "
+"convenience methods such as [method Array.map]. Typed arrays are in turn "
+"faster to iterate on and modify than untyped arrays.\n"
+"[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate]. This is [i]not[/i] the case for built-in properties and "
+"methods. In these cases the returned packed array is a copy, and changing it "
+"will [i]not[/i] affect the original value. To update a built-in property of "
+"this type, modify the returned array and then assign it to the property again."
+msgstr ""
+"Un array específicamente diseñado para contener [Vector2]. Empaqueta los "
+"datos de forma compacta, lo que ahorra memoria para arrays de gran tamaño.\n"
+"[b]Diferencias entre arrays empaquetados, arrays tipados y arrays sin tipar:[/"
+"b] Los arrays empaquetados son generalmente más rápidos de iterar y modificar "
+"en comparación con un array tipado del mismo tipo (ej. [PackedVector2Array] "
+"versus [code]Array[Vector2][/code]). Además, los arrays empaquetados consumen "
+"menos memoria. Como desventaja, los arrays empaquetados son menos flexibles "
+"ya que no ofrecen tantos métodos de conveniencia como [method Array.map]. Los "
+"arrays tipados son a su vez más rápidos de iterar y modificar que los arrays "
+"sin tipar.\n"
+"[b]Nota:[/b] Los arrays empaquetados siempre se pasan por referencia. Para "
+"obtener una copia de un array que pueda ser modificado independientemente del "
+"array original, usa [method duplicate]. Este [i]no[/i] es el caso de las "
+"propiedades y métodos incorporados. En estos casos, el array empaquetado "
+"devuelto es una copia, y modificarlo [i]no[/i] afectará al valor original. "
+"Para actualizar una propiedad incorporada de este tipo, modifica el array "
+"devuelto y luego asígnalo de nuevo a la propiedad."
+
 msgid "Constructs an empty [PackedVector2Array]."
 msgstr "Construye un [PackedVector2Array] vacío."
 
@@ -70886,15 +74275,194 @@ msgstr ""
 "Construye un [PackedVector2Array] como una copia del [PackedVector2Array] "
 "dado."
 
+msgid ""
+"Constructs a new [PackedVector2Array]. Optionally, you can pass in a generic "
+"[Array] that will be converted.\n"
+"[b]Note:[/b] When initializing a [PackedVector2Array] with elements, it must "
+"be initialized with an [Array] of [Vector2] values:\n"
+"[codeblock]\n"
+"var array = PackedVector2Array([Vector2(12, 34), Vector2(56, 78)])\n"
+"[/codeblock]"
+msgstr ""
+"Construye un nuevo [PackedVector2Array]. Opcionalmente, puedes pasar un "
+"[Array] genérico que será convertido.\n"
+"[b]Nota:[/b] Al inicializar un [PackedVector2Array] con elementos, debe ser "
+"inicializado con un [Array] de valores [Vector2]:\n"
+"[codeblock]\n"
+"var array = PackedVector2Array([Vector2(12, 34), Vector2(56, 78)])\n"
+"[/codeblock]"
+
 msgid "Appends a [PackedVector2Array] at the end of this array."
 msgstr "Añade un [PackedVector2Array] al final de este array."
 
+msgid ""
+"Finds the index of an existing value (or the insertion index that maintains "
+"sorting order, if the value is not yet present in the array) using binary "
+"search. Optionally, a [param before] specifier can be passed. If [code]false[/"
+"code], the returned index comes after all existing entries of the value in "
+"the array.\n"
+"[b]Note:[/b] Calling [method bsearch] on an unsorted array results in "
+"unexpected behavior.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Encuentra el índice de un valor existente (o el índice de inserción que "
+"mantiene el orden, si el valor aún no está presente en el array) usando "
+"búsqueda binaria. Opcionalmente, se puede pasar un especificador [param "
+"before]. Si es [code]false[/code], el índice devuelto vendrá después de todas "
+"las entradas existentes del valor en el array.\n"
+"[b]Nota:[/b] Llamar a [method bsearch] en un array sin ordenar resultará en "
+"un comportamiento inesperado.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
+msgid ""
+"Returns the number of times an element is in the array.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Devuelve el número de veces que un elemento se encuentra en el array.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
+msgid ""
+"Removes the first occurrence of a value from the array and returns "
+"[code]true[/code]. If the value does not exist in the array, nothing happens "
+"and [code]false[/code] is returned. To remove an element by index, use "
+"[method remove_at] instead.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Elimina la primera ocurrencia de un valor del array y devuelve [code]true[/"
+"code]. Si el valor no existe en el array, no ocurre nada y se devuelve "
+"[code]false[/code]. Para eliminar un elemento por índice, usa [method "
+"remove_at] en su lugar.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
+msgid ""
+"Searches the array for a value and returns its index or [code]-1[/code] if "
+"not found. Optionally, the initial search index can be passed.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Busca el array por un valor y devuelve su índice o [code]-1[/code] si no se "
+"encuentra. Opcionalmente, se puede pasar el índice de búsqueda inicial.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método podrían no ser precisos si se incluyen NaNs."
+
+msgid ""
+"Returns the [Vector2] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector2(0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"Devuelve el [Vector2] en el [param index] dado en el array. Si [param index] "
+"está fuera de los límites o es negativo, este método falla y devuelve "
+"[code]Vector2(0, 0)[/code].\n"
+"Este método es similar (pero no idéntico) al operador [code][][/code]. Cabe "
+"destacar que, cuando este método falla, no pausa la ejecución del proyecto si "
+"se ejecuta desde el editor."
+
+msgid ""
+"Returns [code]true[/code] if the array contains [param value].\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Devuelve [code]true[/code] si el array contiene [param value].\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
 msgid "Inserts a [Vector2] at the end."
 msgstr "Inserta un [Vector2] al final."
 
+msgid ""
+"Searches the array in reverse order. Optionally, a start search index can be "
+"passed. If negative, the start index is considered relative to the end of the "
+"array.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Busca el array en orden inverso. Opcionalmente, se puede pasar un índice de "
+"búsqueda inicial. Si es negativo, el índice inicial se considera relativo al "
+"final del array.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
 msgid "Changes the [Vector2] at the given index."
 msgstr "Cambia el [Vector2] en el índice dado."
 
+msgid ""
+"Returns the slice of the [PackedVector2Array], from [param begin] (inclusive) "
+"to [param end] (exclusive), as a new [PackedVector2Array].\n"
+"The absolute value of [param begin] and [param end] will be clamped to the "
+"array size, so the default value for [param end] makes it slice to the size "
+"of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for "
+"[code]arr.slice(1, arr.size())[/code]).\n"
+"If either [param begin] or [param end] are negative, they will be relative to "
+"the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+msgstr ""
+"Devuelve la porción del [PackedVector2Array], desde [param begin] (inclusive) "
+"hasta [param end] (exclusive), como un nuevo [PackedVector2Array].\n"
+"El valor absoluto de [param begin] y [param end] se ajustará al tamaño del "
+"array, por lo que el valor predeterminado para [param end] hace que se corte "
+"al tamaño del array por defecto (es decir, [code]arr.slice(1)[/code] es una "
+"abreviatura de [code]arr.slice(1, arr.size())[/code]).\n"
+"Si [param begin] o [param end] son negativos, serán relativos al final del "
+"array (es decir, [code]arr.slice(0, -2)[/code] es una abreviatura de "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+
+msgid ""
+"Sorts the elements of the array in ascending order.\n"
+"[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
+"same as other vectors. Therefore, the results from this method may not be "
+"accurate if NaNs are included."
+msgstr ""
+"Ordena los elementos del array en orden ascendente.\n"
+"[b]Nota:[/b] Los vectores con elementos [constant @GDScript.NAN] no se "
+"comportan igual que otros vectores. Por lo tanto, los resultados de este "
+"método pueden no ser precisos si se incluyen NaNs."
+
+msgid "Returns a [PackedByteArray] with each vector encoded as bytes."
+msgstr "Devuelve un [PackedByteArray] con cada vector codificado como bytes."
+
+msgid ""
+"Returns a new [PackedVector2Array] with all vectors in this array inversely "
+"transformed (multiplied) by the given [Transform2D] transformation matrix, "
+"under the assumption that the transformation basis is orthonormal (i.e. "
+"rotation/reflection is fine, scaling/skew is not).\n"
+"[code]array * transform[/code] is equivalent to [code]transform.inverse() * "
+"array[/code]. See [method Transform2D.inverse].\n"
+"For transforming by inverse of an affine transformation (e.g. with scaling) "
+"[code]transform.affine_inverse() * array[/code] can be used instead. See "
+"[method Transform2D.affine_inverse]."
+msgstr ""
+"Devuelve un nuevo [PackedVector2Array] con todos los vectores de este array "
+"transformados inversamente (multiplicados) por la matriz de transformación "
+"[Transform2D] dada, bajo la suposición de que la base de la transformación es "
+"ortonormal (es decir, la rotación/reflexión está bien, el escalado/sesgado no "
+"lo está).\n"
+"[code]array * transform[/code] es equivalente a [code]transform.inverse() * "
+"array[/code]. Véase [method Transform2D.inverse].\n"
+"Para transformar por la inversa de una transformación afín (por ejemplo, con "
+"escalado) se puede usar [code]transform.affine_inverse() * array[/code] en su "
+"lugar. Véase [method Transform2D.affine_inverse]."
+
 msgid ""
 "Returns a new [PackedVector2Array] with contents of [param right] added at "
 "the end of this array. For better performance, consider using [method "
@@ -70988,6 +74556,21 @@ msgstr ""
 msgid "Appends a [PackedVector3Array] at the end of this array."
 msgstr "Añade un [PackedVector3Array] al final de este array."
 
+msgid ""
+"Returns the [Vector3] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector3(0, 0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"Devuelve el [Vector3] en el [param index] dado en el array. Si [param index] "
+"está fuera de los límites o es negativo, este método falla y devuelve "
+"[code]Vector3(0, 0, 0)[/code].\n"
+"Este método es similar (pero no idéntico) al operador [code][][/code]. En "
+"particular, cuando este método falla, no pausa la ejecución del proyecto si "
+"se ejecuta desde el editor."
+
 msgid "Inserts a [Vector3] at the end."
 msgstr "Inserta un [Vector3] al final."
 
@@ -71132,15 +74715,97 @@ msgstr ""
 msgid "Appends a [PackedVector4Array] at the end of this array."
 msgstr "Añade un [PackedVector4Array] al final de este array."
 
+msgid ""
+"Returns the [Vector4] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector4(0, 0, 0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"Devuelve el [Vector4] en el [param index] dado en el array. Si [param index] "
+"está fuera de los límites o es negativo, este método falla y devuelve "
+"[code]Vector4(0, 0, 0, 0)[/code].\n"
+"Este método es similar (pero no idéntico) al operador [code][][/code]. En "
+"particular, cuando este método falla, no pausa la ejecución del proyecto si "
+"se ejecuta desde el editor."
+
 msgid "Inserts a [Vector4] at the end."
 msgstr "Inserta un [Vector4] al final."
 
 msgid "Changes the [Vector4] at the given index."
 msgstr "Cambia el [Vector4] en el índice dado."
 
+msgid ""
+"Returns the slice of the [PackedVector4Array], from [param begin] (inclusive) "
+"to [param end] (exclusive), as a new [PackedVector4Array].\n"
+"The absolute value of [param begin] and [param end] will be clamped to the "
+"array size, so the default value for [param end] makes it slice to the size "
+"of the array by default (i.e. [code]arr.slice(1)[/code] is a shorthand for "
+"[code]arr.slice(1, arr.size())[/code]).\n"
+"If either [param begin] or [param end] are negative, they will be relative to "
+"the end of the array (i.e. [code]arr.slice(0, -2)[/code] is a shorthand for "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+msgstr ""
+"Devuelve la porción del [PackedVector4Array], desde [param begin] (inclusive) "
+"hasta [param end] (exclusive), como un nuevo [PackedVector4Array].\n"
+"El valor absoluto de [param begin] y [param end] se ajustará al tamaño del "
+"array, por lo que el valor predeterminado para [param end] hace que se corte "
+"al tamaño del array por defecto (es decir, [code]arr.slice(1)[/code] es una "
+"abreviatura de [code]arr.slice(1, arr.size())[/code]).\n"
+"Si [param begin] o [param end] son negativos, serán relativos al final del "
+"array (es decir, [code]arr.slice(0, -2)[/code] es una abreviatura de "
+"[code]arr.slice(0, arr.size() - 2)[/code])."
+
+msgid ""
+"Returns a new [PackedVector4Array] with contents of [param right] added at "
+"the end of this array. For better performance, consider using [method "
+"append_array] instead."
+msgstr ""
+"Devuelve un nuevo [PackedVector4Array] con el contenido de [param right] "
+"añadido al final de este array. Para un mejor rendimiento, considera usar "
+"[method append_array] en su lugar."
+
+msgid ""
+"Returns [code]true[/code] if contents of both arrays are the same, i.e. they "
+"have all equal [Vector4]s at the corresponding indices."
+msgstr ""
+"Devuelve [code]true[/code] si los contenidos de ambos arrays son iguales, es "
+"decir, si tienen todos los [Vector4]s iguales en los índices correspondientes."
+
+msgid ""
+"Returns the [Vector4] at index [param index]. Negative indices can be used to "
+"access the elements starting from the end. Using index out of array's bounds "
+"will result in an error."
+msgstr ""
+"Devuelve el [Vector4] en el índice [param index]. Se pueden usar índices "
+"negativos para acceder a los elementos empezando por el final. Usar un índice "
+"fuera de los límites del array resultará en un error."
+
 msgid "Abstraction and base class for packet-based protocols."
 msgstr "Abstracción y clase base para protocolos basados en paquetes."
 
+msgid ""
+"PacketPeer is an abstraction and base class for packet-based protocols (such "
+"as UDP). It provides an API for sending and receiving packets both as raw "
+"data or variables. This makes it easy to transfer data over a protocol, "
+"without having to encode data as low-level bytes or having to worry about "
+"network ordering.\n"
+"[b]Note:[/b] When exporting to Android, make sure to enable the "
+"[code]INTERNET[/code] permission in the Android export preset before "
+"exporting the project or using one-click deploy. Otherwise, network "
+"communication of any kind will be blocked by Android."
+msgstr ""
+"PacketPeer es una abstracción y clase base para protocolos basados en "
+"paquetes (como UDP). Proporciona una API para enviar y recibir paquetes tanto "
+"como datos en bruto o variables. Esto facilita la transferencia de datos a "
+"través de un protocolo, sin tener que codificar los datos como bytes de bajo "
+"nivel o tener que preocuparse por el ordenamiento de la red.\n"
+"[b]Nota:[/b] Al exportar a Android, asegúrate de habilitar el permiso "
+"[code]INTERNET[/code] en el preajuste de exportación de Android antes de "
+"exportar el proyecto o usar la implementación con un clic. De lo contrario, "
+"Android bloqueará cualquier tipo de comunicación de red."
+
 msgid "Returns the number of packets currently available in the ring-buffer."
 msgstr ""
 "Devuelve el número de paquetes actualmente disponibles en el ring-buffer."
@@ -71155,12 +74820,71 @@ msgstr ""
 "Devuelve el estado de error del último paquete recibido (a través de [method "
 "get_packet] y [method get_var])."
 
+msgid ""
+"Gets a Variant. If [param allow_objects] is [code]true[/code], decoding "
+"objects is allowed.\n"
+"Internally, this uses the same decoding mechanism as the [method "
+"@GlobalScope.bytes_to_var] method.\n"
+"[b]Warning:[/b] Deserialized objects can contain code which gets executed. Do "
+"not use this option if the serialized object comes from untrusted sources to "
+"avoid potential security threats such as remote code execution."
+msgstr ""
+"Obtiene una Variant. Si [param allow_objects] es [code]true[/code], se "
+"permite la decodificación de objetos.\n"
+"Internamente, esto usa el mismo mecanismo de decodificación que el método "
+"[method @GlobalScope.bytes_to_var].\n"
+"[b]Advertencia:[/b] Los objetos deserializados pueden contener código que se "
+"ejecuta. No utilices esta opción si el objeto serializado proviene de fuentes "
+"no fiables para evitar posibles amenazas de seguridad, como la ejecución "
+"remota de código."
+
 msgid "Sends a raw packet."
 msgstr "Envía un paquete crudo."
 
+msgid ""
+"Sends a [Variant] as a packet. If [param full_objects] is [code]true[/code], "
+"encoding objects is allowed (and can potentially include code).\n"
+"Internally, this uses the same encoding mechanism as the [method "
+"@GlobalScope.var_to_bytes] method."
+msgstr ""
+"Envía una [Variant] como un paquete. Si [param full_objects] es [code]true[/"
+"code], se permite la codificación de objetos (y esto puede incluir código).\n"
+"Internamente, utiliza el mismo mecanismo de codificación que el método "
+"[method @GlobalScope.var_to_bytes]."
+
+msgid ""
+"Maximum buffer size allowed when encoding [Variant]s. Raise this value to "
+"support heavier memory allocations.\n"
+"The [method put_var] method allocates memory on the stack, and the buffer "
+"used will grow automatically to the closest power of two to match the size of "
+"the [Variant]. If the [Variant] is bigger than [member "
+"encode_buffer_max_size], the method will error out with [constant "
+"ERR_OUT_OF_MEMORY]."
+msgstr ""
+"Tamaño máximo del búfer permitido al codificar [Variant]s. Aumenta este valor "
+"para soportar asignaciones de memoria más pesadas.\n"
+"El método [method put_var] asigna memoria en la pila, y el búfer utilizado "
+"crecerá automáticamente hasta la potencia de dos más cercana para igualar el "
+"tamaño de la [Variant]. Si la [Variant] es más grande que [member "
+"encode_buffer_max_size], el método devolverá un error con [constant "
+"ERR_OUT_OF_MEMORY]."
+
 msgid "DTLS packet peer."
 msgstr "Paquete de pares DTLS."
 
+msgid ""
+"Connects a [param packet_peer] beginning the DTLS handshake using the "
+"underlying [PacketPeerUDP] which must be connected (see [method "
+"PacketPeerUDP.connect_to_host]). You can optionally specify the [param "
+"client_options] to be used while verifying the TLS connections. See [method "
+"TLSOptions.client] and [method TLSOptions.client_unsafe]."
+msgstr ""
+"Conecta un [param packet_peer] comenzando el handshake DTLS usando el "
+"[PacketPeerUDP] subyacente, el cual debe estar conectado (véase [method "
+"PacketPeerUDP.connect_to_host]). Opcionalmente, puedes especificar las [param "
+"client_options] a usar mientras verificas las conexiones TLS. Véase [method "
+"TLSOptions.client] y [method TLSOptions.client_unsafe]."
+
 msgid "Disconnects this peer, terminating the DTLS session."
 msgstr "Desconecta este par, terminando la sesión de DTLS."
 
@@ -71205,12 +74929,60 @@ msgstr ""
 msgid "Wrapper to use a PacketPeer over a StreamPeer."
 msgstr "Envoltura para usar un PacketPeer sobre un StreamPeer."
 
+msgid ""
+"PacketStreamPeer provides a wrapper for working using packets over a stream. "
+"This allows for using packet based code with StreamPeers. PacketPeerStream "
+"implements a custom protocol over the StreamPeer, so the user should not read "
+"or write to the wrapped StreamPeer directly.\n"
+"[b]Note:[/b] When exporting to Android, make sure to enable the "
+"[code]INTERNET[/code] permission in the Android export preset before "
+"exporting the project or using one-click deploy. Otherwise, network "
+"communication of any kind will be blocked by Android."
+msgstr ""
+"PacketStreamPeer proporciona un envoltorio para trabajar usando paquetes "
+"sobre un flujo. Esto permite usar código basado en paquetes con StreamPeers. "
+"PacketPeerStream implementa un protocolo personalizado sobre el StreamPeer, "
+"por lo que no debes leer o escribir directamente en el StreamPeer envuelto.\n"
+"[b]Nota:[/b] Al exportar a Android, asegúrate de habilitar el permiso "
+"[code]INTERNET[/code] en el ajuste preestablecido de exportación de Android "
+"antes de exportar el proyecto o usar el despliegue con un solo clic. De lo "
+"contrario, Android bloqueará cualquier tipo de comunicación de red."
+
 msgid "The wrapped [StreamPeer] object."
 msgstr "El objeto envoltorio [StreamPeer]."
 
 msgid "UDP packet peer."
 msgstr "Paquete de pares UDP."
 
+msgid "Closes the [PacketPeerUDP]'s underlying UDP socket."
+msgstr "Cierra el socket UDP subyacente del [PacketPeerUDP]."
+
+msgid ""
+"Calling this method connects this UDP peer to the given [param host]/[param "
+"port] pair. UDP is in reality connectionless, so this option only means that "
+"incoming packets from different addresses are automatically discarded, and "
+"that outgoing packets are always sent to the connected address (future calls "
+"to [method set_dest_address] are not allowed). This method does not send any "
+"data to the remote peer, to do that, use [method PacketPeer.put_var] or "
+"[method PacketPeer.put_packet] as usual. See also [UDPServer].\n"
+"[b]Note:[/b] Connecting to the remote peer does not help to protect from "
+"malicious attacks like IP spoofing, etc. Think about using an encryption "
+"technique like TLS or DTLS if you feel like your application is transferring "
+"sensitive information."
+msgstr ""
+"Llamar a este método conecta este peer UDP al par [param host]/[param port] "
+"dado. UDP es en realidad sin conexión, por lo que esta opción solo significa "
+"que los paquetes entrantes de diferentes direcciones son automáticamente "
+"descartados, y que los paquetes salientes son siempre enviados a la dirección "
+"conectada (no se permiten futuras llamadas a [method set_dest_address]). Este "
+"método no envía ningún dato al peer remoto; para ello, utiliza [method "
+"PacketPeer.put_var] o [method PacketPeer.put_packet] como es habitual. Véase "
+"también [UDPServer].\n"
+"[b]Nota:[/b] Conectarse al peer remoto no ayuda a protegerte de ataques "
+"maliciosos como el spoofing de IP, etc. Piensa en utilizar una técnica de "
+"encriptación como TLS o DTLS si crees que tu aplicación está transfiriendo "
+"información sensible."
+
 msgid ""
 "Returns the IP of the remote peer that sent the last packet(that was received "
 "with [method PacketPeer.get_packet] or [method PacketPeer.get_var])."
@@ -71225,6 +74997,13 @@ msgstr ""
 "Devuelve el puerto del par remoto que envió el último paquete (que fue "
 "recibido con [method PacketPeer.get_packet] o [method PacketPeer.get_var])."
 
+msgid ""
+"Returns whether this [PacketPeerUDP] is bound to an address and can receive "
+"packets."
+msgstr ""
+"Devuelve si este [PacketPeerUDP] está enlazado a una dirección y puede "
+"recibir paquetes."
+
 msgid ""
 "Returns [code]true[/code] if the UDP socket is open and has been connected to "
 "a remote address. See [method connect_to_host]."
@@ -71232,9 +75011,52 @@ msgstr ""
 "Devuelve [code]true[/code] si el enchufe UDP está abierto y se ha conectado a "
 "una dirección remota. Véase [method connect_to_host]."
 
+msgid ""
+"Enable or disable sending of broadcast packets (e.g. "
+"[code]set_dest_address(\"255.255.255.255\", 4343)[/code]. This option is "
+"disabled by default.\n"
+"[b]Note:[/b] Some Android devices might require the "
+"[code]CHANGE_WIFI_MULTICAST_STATE[/code] permission and this option to be "
+"enabled to receive broadcast packets too."
+msgstr ""
+"Habilita o deshabilita el envío de paquetes de emisión (por ejemplo, "
+"[code]set_dest_address(\"255.255.255.255\", 4343)[/code]). Esta opción está "
+"deshabilitada por defecto.\n"
+"[b]Nota:[/b] Algunos dispositivos Android pueden requerir el permiso "
+"[code]CHANGE_WIFI_MULTICAST_STATE[/code] y que esta opción esté habilitada "
+"para recibir también paquetes de emisión."
+
+msgid ""
+"Sets the destination address and port for sending packets and variables. A "
+"hostname will be resolved using DNS if needed.\n"
+"[b]Note:[/b] [method set_broadcast_enabled] must be enabled before sending "
+"packets to a broadcast address (e.g. [code]255.255.255.255[/code])."
+msgstr ""
+"Establece la dirección y el puerto de destino para el envío de paquetes y "
+"variables. Un nombre de host será resuelto usando DNS si es necesario.\n"
+"[b]Nota:[/b] [method set_broadcast_enabled] debe estar habilitado antes de "
+"enviar paquetes a una dirección de difusión (por ejemplo, "
+"[code]255.255.255.255[/code])."
+
+msgid "A GUI control that displays a [StyleBox]."
+msgstr "Un control GUI que muestra un [StyleBox]."
+
+msgid ""
+"[Panel] is a GUI control that displays a [StyleBox]. See also "
+"[PanelContainer]."
+msgstr ""
+"[Panel] es un control GUI que muestra un [StyleBox]. Véase también "
+"[PanelContainer]."
+
 msgid "The [StyleBox] of this control."
 msgstr "El [StyleBox] de este control."
 
+msgid ""
+"A container that keeps its child controls within the area of a [StyleBox]."
+msgstr ""
+"Un container que mantiene sus controles hijos dentro del área de un "
+"[StyleBox]."
+
 msgid ""
 "A container that keeps its child controls within the area of a [StyleBox]. "
 "Useful for giving controls an outline."
@@ -71245,12 +75067,53 @@ msgstr ""
 msgid "The style of [PanelContainer]'s background."
 msgstr "El estilo del fondo de [PanelContainer]."
 
+msgid ""
+"A material that provides a special texture to a [Sky], usually an HDR "
+"panorama."
+msgstr ""
+"Un material que proporciona una textura especial a un [Sky], normalmente un "
+"panorama HDR."
+
+msgid ""
+"The sky's overall brightness multiplier. Higher values result in a brighter "
+"sky."
+msgstr ""
+"El multiplicador de brillo general del cielo. Valores más altos resultan en "
+"un cielo más brillante."
+
+msgid ""
+"A boolean value to determine if the background texture should be filtered or "
+"not."
+msgstr ""
+"Un valor booleano para determinar si la textura de fondo debe ser filtrada o "
+"no."
+
 msgid "[Texture2D] to be applied to the [PanoramaSkyMaterial]."
 msgstr "[Texture2D] para aplicar al [PanoramaSkyMaterial]."
 
 msgid "A node used to create a parallax scrolling background."
 msgstr "Un nodo usado para crear un fondo de desplazamiento de paralaje."
 
+msgid ""
+"A [Parallax2D] is used to create a parallax effect. It can move at a "
+"different speed relative to the camera movement using [member scroll_scale]. "
+"This creates an illusion of depth in a 2D game. If manual scrolling is "
+"desired, the [Camera2D] position can be ignored with [member "
+"ignore_camera_scroll].\n"
+"[b]Note:[/b] Any changes to this node's position made after it enters the "
+"scene tree will be overridden if [member ignore_camera_scroll] is "
+"[code]false[/code] or [member screen_offset] is modified."
+msgstr ""
+"Un [Parallax2D] se utiliza para crear un efecto de paralaje. Puede moverse a "
+"una velocidad diferente en relación con el movimiento de la cámara usando "
+"[member scroll_scale]. Esto crea una ilusión de profundidad en un juego 2D. "
+"Si se desea un desplazamiento manual, la posición de la [Camera2D] puede ser "
+"ignorada con [member ignore_camera_scroll].\n"
+"[b]Nota:[/b] Cualquier cambio en la posición de este nodo realizado después "
+"de que entre en el árbol de la escena será anulado si [member "
+"ignore_camera_scroll] es [code]false[/code] o si [member screen_offset] es "
+"modificado."
+
 msgid "2D Parallax"
 msgstr "Parallax 2D"
 
@@ -71335,6 +75198,33 @@ msgstr ""
 "más lento, haciendo que los objetos parezcan más lejanos, y un valor de "
 "[code]0[/code] detiene los objetos por completo."
 
+msgid "Use the [Parallax2D] node instead."
+msgstr "Usa el nodo [Parallax2D] en su lugar."
+
+msgid ""
+"A ParallaxBackground uses one or more [ParallaxLayer] child nodes to create a "
+"parallax effect. Each [ParallaxLayer] can move at a different speed using "
+"[member ParallaxLayer.motion_offset]. This creates an illusion of depth in a "
+"2D game. If not used with a [Camera2D], you must manually calculate the "
+"[member scroll_offset].\n"
+"[b]Note:[/b] Each [ParallaxBackground] is drawn on one specific [Viewport] "
+"and cannot be shared between multiple [Viewport]s, see [member "
+"CanvasLayer.custom_viewport]. When using multiple [Viewport]s, for example in "
+"a split-screen game, you need create an individual [ParallaxBackground] for "
+"each [Viewport] you want it to be drawn on."
+msgstr ""
+"Un ParallaxBackground utiliza uno o más nodos hijos [ParallaxLayer] para "
+"crear un efecto de paralaje. Cada [ParallaxLayer] puede moverse a una "
+"velocidad diferente usando [member ParallaxLayer.motion_offset]. Esto crea "
+"una ilusión de profundidad en un juego 2D. Si no se usa con una [Camera2D], "
+"debes calcular manualmente [member scroll_offset].\n"
+"[b]Nota:[/b] Cada [ParallaxBackground] se dibuja en un [Viewport] específico "
+"y no se puede compartir entre múltiples [Viewport]s, consulta [member "
+"CanvasLayer.custom_viewport]. Cuando se utilizan múltiples [Viewport]s, por "
+"ejemplo, en un juego de pantalla dividida, debes crear un "
+"[ParallaxBackground] individual para cada [Viewport] en el que quieras que se "
+"dibuje."
+
 msgid "The base position offset for all [ParallaxLayer] children."
 msgstr ""
 "El dezplazamiento de la posición base para todos los [ParallaxLayer] hijos."
@@ -71396,6 +75286,49 @@ msgstr ""
 "[b]Nota:[/b] Cualquier cambio en la posición y escala de este nodo realizado "
 "después de que entre en la escena será ignorado."
 
+msgid ""
+"The interval, in pixels, at which the [ParallaxLayer] is drawn repeatedly. "
+"Useful for creating an infinitely scrolling background. If an axis is set to "
+"[code]0[/code], the [ParallaxLayer] will be drawn only once along that "
+"direction.\n"
+"[b]Note:[/b] If you want the repetition to pixel-perfect match a [Texture2D] "
+"displayed by a child node, you should account for any scale applied to the "
+"texture when defining this interval. For example, if you use a child "
+"[Sprite2D] scaled to [code]0.5[/code] to display a 600x600 texture, and want "
+"this sprite to be repeated continuously horizontally, you should set the "
+"mirroring to [code]Vector2(300, 0)[/code].\n"
+"[b]Note:[/b] If the length of the viewport axis is bigger than twice the "
+"repeated axis size, it will not repeat infinitely, as the parallax layer only "
+"draws 2 instances of the layer at any given time. The visibility window is "
+"calculated from the parent [ParallaxBackground]'s position, not the layer's "
+"own position. So, if you use mirroring, [b]do not[/b] change the "
+"[ParallaxLayer] position relative to its parent. Instead, if you need to "
+"adjust the background's position, set the [member CanvasLayer.offset] "
+"property in the parent [ParallaxBackground].\n"
+"[b]Note:[/b] Despite the name, the layer will not be mirrored, it will only "
+"be repeated."
+msgstr ""
+"El intervalo, en píxeles, en el que el [ParallaxLayer] se dibuja "
+"repetidamente. Útil para crear un fondo de desplazamiento infinito. Si un eje "
+"se establece en [code]0[/code], el [ParallaxLayer] se dibujará solo una vez "
+"en esa dirección.\n"
+"[b]Nota:[/b] Si deseas que la repetición coincida píxel a píxel con una "
+"[Texture2D] mostrada por un nodo hijo, debes tener en cuenta cualquier escala "
+"aplicada a la textura al definir este intervalo. Por ejemplo, si utilizas un "
+"[Sprite2D] hijo escalado a [code]0.5[/code] para mostrar una textura de "
+"600x600, y quieres que este sprite se repita continuamente horizontalmente, "
+"debes establecer el efecto espejo en [code]Vector2(300, 0)[/code].\n"
+"[b]Nota:[/b] Si la longitud del eje del viewport es mayor que el doble del "
+"tamaño del eje repetido, no se repetirá infinitamente, ya que la capa de "
+"paralaje solo dibuja 2 instancias de la capa en un momento dado. La ventana "
+"de visibilidad se calcula a partir de la posición del [ParallaxBackground] "
+"padre, no de la posición propia de la capa. Por lo tanto, si utilizas el "
+"efecto espejo, [b]no[/b] cambies la posición del [ParallaxLayer] con respecto "
+"a su padre. En su lugar, si necesitas ajustar la posición del fondo, "
+"establece la propiedad [member CanvasLayer.offset] en el [ParallaxBackground] "
+"padre.\n"
+"[b]Nota:[/b] A pesar del nombre, la capa no se reflejará, solo se repetirá."
+
 msgid ""
 "The ParallaxLayer's offset relative to the parent ParallaxBackground's "
 "[member ParallaxBackground.scroll_offset]."
@@ -71410,6 +75343,12 @@ msgstr ""
 "Multiplica el movimiento de la ParallaxLayer. Si un eje se establece en "
 "[code]0[/code], no se hará scroll."
 
+msgid ""
+"Holds a particle configuration for [GPUParticles2D] or [GPUParticles3D] nodes."
+msgstr ""
+"Mantiene una configuración de partículas para los nodos [GPUParticles2D] o "
+"[GPUParticles3D]."
+
 msgid ""
 "Returns the minimum and maximum values of the given [param param] as a "
 "vector.\n"
@@ -79490,8 +83429,8 @@ msgid ""
 msgstr ""
 "Cuando se establece en [code]true[/code], produce una advertencia cuando el "
 "shader excede ciertos límites del dispositivo. Actualmente, el único límite "
-"del dispositivo que se comprueba es el límite en el tamaño del búfer "
-"uniforme. Se agregarán más límites de dispositivo en el futuro."
+"del dispositivo que se comprueba es el límite en el tamaño del búfer de la "
+"variable uniforme. Se agregarán más límites de dispositivo en el futuro."
 
 msgid ""
 "If [code]true[/code], enables specific shader warnings (see [code]debug/"
@@ -82372,8 +86311,8 @@ msgid ""
 "[b]Note:[/b] Increasing this value can improve performance if the project "
 "renders many unique sprite textures every frame."
 msgstr ""
-"Número máximo de conjuntos uniformes que la renderización 2D almacenará en "
-"caché al procesar llamadas de dibujo por lotes.\n"
+"Número máximo de conjuntos de variables uniformes que la renderización 2D "
+"almacenará en caché al procesar llamadas de dibujo por lotes.\n"
 "[b]Nota:[/b] Aumentar este valor puede mejorar el rendimiento si el proyecto "
 "renderiza muchas texturas de sprite únicas cada fotograma."
 
@@ -83725,7 +87664,8 @@ msgid ""
 msgstr ""
 "Utilizado para búferes de fotogramas multipase (más de un pase de "
 "renderizado). Convierte un adjunto en una entrada. Asegúrate de suministrarlo "
-"también correctamente en el [RDUniform] para el conjunto uniforme."
+"también correctamente en el [RDUniform] para el conjunto de variables "
+"uniformes."
 
 msgid "Attachments to preserve in this pass (otherwise they are erased)."
 msgstr "Adjuntos a preservar en este pase (de lo contrario, se borran)."
@@ -84448,8 +88388,23 @@ msgstr "El canal para muestrear cuando se muestrea el canal de color rojo."
 msgid "Shader uniform (used by [RenderingDevice])."
 msgstr "Uniforme de shader (utilizada por [RenderingDevice])."
 
+msgid ""
+"Binds the given id to the uniform. The data associated with the id is then "
+"used when the uniform is passed to a shader."
+msgstr ""
+"Enlaza el ID dado a la variable uniforme. Los datos asociados con el ID se "
+"utilizan cuando la variable uniforme se pasa a un shader."
+
+msgid "Unbinds all ids currently bound to the uniform."
+msgstr "Desenlaza todos los ID actualmente enlazados a la variable uniforme."
+
+msgid "Returns an array of all ids currently bound to the uniform."
+msgstr ""
+"Devuelve un array de todos los ID actualmente enlazados a la variable "
+"uniforme."
+
 msgid "The uniform's binding."
-msgstr "El enlace del uniforme."
+msgstr "El enlace de la variable uniforme."
 
 msgid "Vertex attribute (used by [RenderingDevice])."
 msgstr "Atributo de vértice (utilizado por [RenderingDevice])."
@@ -85668,9 +89623,9 @@ msgid ""
 "memory barrier."
 msgstr ""
 "Vincula el [param uniform_set] a esta [param compute_list]. Godot se asegura "
-"de que todas las texturas en el conjunto uniforme tengan las máscaras de "
-"acceso Vulkan correctas. Si Godot tuvo que cambiar las máscaras de acceso de "
-"las texturas, elevará una barrera de memoria de imagen Vulkan."
+"de que todas las texturas en el conjunto de variables uniformes tengan las "
+"máscaras de acceso Vulkan correctas. Si Godot tuvo que cambiar las máscaras "
+"de acceso de las texturas, elevará una barrera de memoria de imagen Vulkan."
 
 msgid ""
 "Submits the compute list for processing on the GPU. This is the compute "
@@ -88392,7 +92347,7 @@ msgid "Image buffer uniform."
 msgstr "Uniforme de búfer de imagen."
 
 msgid "Uniform buffer uniform."
-msgstr "Uniforme de búfer de uniformes."
+msgstr "Uniforme de búfer de variables uniformes."
 
 msgid ""
 "[url=https://vkguide.dev/docs/chapter-4/storage_buffers/]Storage buffer[/url] "
@@ -88628,10 +92583,14 @@ msgid "Support for 32-bit image atomic operations."
 msgstr "Soporte para operaciones atómicas de imágenes de 32 bits."
 
 msgid "Maximum number of storage images per uniform set."
-msgstr "Número máximo de imágenes de almacenamiento por conjunto de uniformes."
+msgstr ""
+"Número máximo de imágenes de almacenamiento por conjunto de variables "
+"uniformes."
 
 msgid "Maximum number of uniform buffers per uniform set."
-msgstr "Número máximo de búferes de uniformes por conjunto de uniformes."
+msgstr ""
+"Número máximo de búferes de variables uniformes por conjunto de variables "
+"uniformes."
 
 msgid "Maximum index for an indexed draw command."
 msgstr "Índice máximo para un comando de dibujado indexado."
@@ -88693,7 +92652,7 @@ msgstr ""
 "para asegurar la compatibilidad incluso si tu GPU reporta un valor más alto."
 
 msgid "Maximum size of a uniform buffer."
-msgstr "Tamaño máximo de un búfer de uniformes."
+msgstr "Tamaño máximo de un búfer de variables uniformes."
 
 msgid "Maximum vertex input attribute offset."
 msgstr "Desplazamiento máximo del atributo de entrada de vértice."
@@ -88708,7 +92667,7 @@ msgid "Maximum vertex input binding stride."
 msgstr "Paso máximo del enlace de entrada de vértice."
 
 msgid "Minimum uniform buffer offset alignment."
-msgstr "Alineación mínima del desplazamiento del búfer uniforme."
+msgstr "Alineación mínima del desplazamiento del búfer de variables uniforme."
 
 msgid "Maximum shared memory size for compute shaders."
 msgstr "Tamaño máximo de la memoria compartida para los shaders de cómputo."
@@ -90731,7 +94690,7 @@ msgid ""
 "autoload where you store the values you need to query at the same time you're "
 "setting them as global parameters."
 msgstr ""
-"Devuelve la lista de nombres de uniformes de shader globales.\n"
+"Devuelve la lista de nombres de variables uniformes de shader globales.\n"
 "[b]Nota:[/b] [method global_shader_parameter_get] tiene una gran penalización "
 "de rendimiento ya que el hilo de renderizado necesita sincronizarse con el "
 "hilo que lo llama, lo cual es lento. No uses este método durante el juego "
@@ -90880,8 +94839,8 @@ msgid ""
 "[code]hint_string[/code] and [code]usage[/code]. Equivalent to [method "
 "GeometryInstance3D.get_instance_shader_parameter]."
 msgstr ""
-"Devuelve un diccionario con los nombres de los uniformes de shader por "
-"instancia de la instancia de geometría 3D especificada. El diccionario "
+"Devuelve un diccionario con los nombres de las variables uniformes de shader "
+"por instancia de la instancia de geometría 3D especificada. El diccionario "
 "devuelto está en formato PropertyInfo, con las claves [code]name[/code], "
 "[code]class_name[/code], [code]type[/code], [code]hint[/code], "
 "[code]hint_string[/code] y [code]usage[/code]. Equivalente a [method "
@@ -91635,8 +95594,9 @@ msgid ""
 "Returns the default value for the specified shader uniform. This is usually "
 "the value written in the shader source code."
 msgstr ""
-"Devuelve el valor por defecto para el shader uniforme especificado. Este es "
-"usualmente el valor escrito en el código fuente del shader."
+"Devuelve el valor por defecto para la variable uniforme del shader "
+"especificado. Este es usualmente el valor escrito en el código fuente del "
+"shader."
 
 msgid ""
 "Sets the shader's source code (which triggers recompilation after being "
@@ -91823,9 +95783,37 @@ msgstr ""
 "Si es [code]true[/code], activa la ventana de visualización, si no, la "
 "desactiva."
 
+msgid ""
+"Sets the rendering mask associated with this [Viewport]. Only [CanvasItem] "
+"nodes with a matching rendering visibility layer will be rendered by this "
+"[Viewport]."
+msgstr ""
+"Establece la máscara de renderizado asociada con este [Viewport]. Solo los "
+"nodos [CanvasItem] con una capa de visibilidad de renderizado coincidente "
+"serán renderizados por este [Viewport]."
+
+msgid ""
+"Sets the stacking order for a viewport's canvas.\n"
+"[param layer] is the actual canvas layer, while [param sublayer] specifies "
+"the stacking order of the canvas among those in the same layer.\n"
+"[b]Note:[/b] [param layer] should be between [constant CANVAS_LAYER_MIN] and "
+"[constant CANVAS_LAYER_MAX] (inclusive). Any other value will wrap around."
+msgstr ""
+"Establece el orden de apilamiento para el canvas de un viewport.\n"
+"[param layer] es la capa real del canvas, mientras que [param sublayer] "
+"especifica el orden de apilamiento del canvas entre los de la misma capa.\n"
+"[b]Nota:[/b] [param layer] debe estar entre [constant CANVAS_LAYER_MIN] y "
+"[constant CANVAS_LAYER_MAX] (inclusivo). Cualquier otro valor se ajustará."
+
 msgid "Sets the transformation of a viewport's canvas."
 msgstr "Establece la transformación del canvas de un viewport."
 
+msgid "Sets the clear mode of a viewport."
+msgstr "Establece el modo de limpieza de un viewport."
+
+msgid "Sets the debug draw mode of a viewport."
+msgstr "Establece el modo de dibujo de depuración de un viewport."
+
 msgid ""
 "Sets the default texture filtering mode for the specified [param viewport] "
 "RID."
@@ -93493,9 +97481,9 @@ msgstr ""
 "Selecciona automáticamente el modo de proceso apropiado según tu shader de "
 "cielo. Si tu shader usa [code]TIME[/code] o [code]POSITION[/code], esto usará "
 "[constant SKY_MODE_REALTIME]. Si tu shader usa cualquiera de las variables "
-"[code]LIGHT_*[/code] o cualquier uniforme personalizado, esto usa [constant "
-"SKY_MODE_INCREMENTAL]. De lo contrario, esto regresa por defecto a [constant "
-"SKY_MODE_QUALITY]."
+"[code]LIGHT_*[/code] o cualquier variable uniforme personalizada, esto usa "
+"[constant SKY_MODE_INCREMENTAL]. De lo contrario, esto regresa por defecto a "
+"[constant SKY_MODE_QUALITY]."
 
 msgid ""
 "Uses high quality importance sampling to process the radiance map. In "
@@ -94459,8 +98447,8 @@ msgid ""
 "and many miscellaneous buffer types used internally."
 msgstr ""
 "Memoria de búfer utilizada (en bytes). Esto incluye datos de vértices, "
-"búferes uniformes y muchos tipos de búferes misceláneos utilizados "
-"internamente."
+"búferes de variables uniformes y muchos tipos de búferes misceláneos "
+"utilizados internamente."
 
 msgid ""
 "Video memory used (in bytes). When using the Forward+ or Mobile renderers, "
@@ -94771,8 +98759,8 @@ msgstr ""
 msgid ""
 "Return the [RID] of the uniform buffer containing the scene data as a UBO."
 msgstr ""
-"Devuelve el [RID] del búfer uniforme que contiene los datos de la escena como "
-"un UBO."
+"Devuelve el [RID] del búfer de variable uniforme que contiene los datos de la "
+"escena como un UBO."
 
 msgid "Returns the number of views being rendered."
 msgstr "Devuelve el número de vistas que se están renderizando."
@@ -94816,8 +98804,8 @@ msgid ""
 "Implement this in GDExtension to return the [RID] of the uniform buffer "
 "containing the scene data as a UBO."
 msgstr ""
-"Implementa esto en GDExtension para devolver el [RID] del búfer uniforme que "
-"contiene los datos de la escena como un UBO."
+"Implementa esto en GDExtension para devolver el [RID] del búfer de variable "
+"uniforme que contiene los datos de la escena como un UBO."
 
 msgid "Implement this in GDExtension to return the view count."
 msgstr "Implementa esto en GDExtension para devolver el conteo de vistas."
@@ -100760,8 +104748,8 @@ msgstr ""
 msgid ""
 "Returns the current value set for this material of a uniform in the shader."
 msgstr ""
-"Devuelve el valor actual establecido para este material de un uniforme en el "
-"shader."
+"Devuelve el valor actual establecido para este material de una variable "
+"uniforme en el shader."
 
 msgid "The [Shader] program used to render this material."
 msgstr "El programa [Shader] utilizado para renderizar este material."
@@ -101546,6 +105534,57 @@ msgstr ""
 "[param max] pasados. [param invert] invertirá la limitación del ángulo, "
 "limitándolo al rango fuera de los límites dados."
 
+msgid "Sets the maximum angle constraint for the joint at [param joint_idx]."
+msgstr ""
+"Establece la restricción de ángulo máximo para la articulación en [param "
+"joint_idx]."
+
+msgid "Sets the minimum angle constraint for the joint at [param joint_idx]."
+msgstr ""
+"Establece la restricción de ángulo mínimo para la articulación en [param "
+"joint_idx]."
+
+msgid ""
+"Determines whether angle constraints on the CCDIK joint at [param joint_idx] "
+"are enabled. When [code]true[/code], constraints will be enabled and taken "
+"into account when solving."
+msgstr ""
+"Determina si las restricciones de ángulo en la articulación CCDIK en [param "
+"joint_idx] están habilitadas. Cuando es [code]true[/code], las restricciones "
+"estarán habilitadas y se tendrán en cuenta al resolver."
+
+msgid ""
+"Sets whether the joint at [param joint_idx] is set to rotate from the joint, "
+"[code]true[/code], or to rotate from the tip, [code]false[/code]."
+msgstr ""
+"Establece si la articulación en [param joint_idx] está configurada para rotar "
+"desde la articulación, [code]true[/code], o para rotar desde la punta, "
+"[code]false[/code]."
+
+msgid "The number of CCDIK joints in the CCDIK modification."
+msgstr "El número de articulaciones CCDIK en la modificación CCDIK."
+
+msgid ""
+"The NodePath to the node that is the target for the CCDIK modification. This "
+"node is what the CCDIK chain will attempt to rotate the bone chain to."
+msgstr ""
+"La NodePath al nodo que es el objetivo de la modificación CCDIK. Este nodo es "
+"hacia donde la cadena CCDIK intentará rotar la cadena de huesos."
+
+msgid ""
+"The end position of the CCDIK chain. Typically, this should be a child of a "
+"[Bone2D] node attached to the final [Bone2D] in the CCDIK chain."
+msgstr ""
+"La posición final de la cadena CCDIK. Típicamente, este debería ser un hijo "
+"de un nodo [Bone2D] adjunto al [Bone2D] final en la cadena CCDIK."
+
+msgid ""
+"A modification that uses FABRIK to manipulate a series of [Bone2D] nodes to "
+"reach a target."
+msgstr ""
+"Una modificación que utiliza FABRIK para manipular una serie de nodos "
+"[Bone2D] para alcanzar un objetivo."
+
 msgid ""
 "Returns the [Bone2D] node assigned to the FABRIK joint at [param joint_idx]."
 msgstr ""
@@ -101608,6 +105647,12 @@ msgstr ""
 msgid "The number of FABRIK joints in the FABRIK modification."
 msgstr "El número de articulaciones FABRIK en la modificación FABRIK."
 
+msgid ""
+"A modification that jiggles [Bone2D] nodes as they move towards a target."
+msgstr ""
+"Una modificación que sacude los nodos [Bone2D] mientras se mueven hacia un "
+"objetivo."
+
 msgid "A modification that rotates a [Bone2D] node to look at a target."
 msgstr "Una modificación que rota un nodo [Bone2D] para mirar a un objetivo."
 
@@ -102819,9 +106864,6 @@ msgstr ""
 "Aumentar este valor mejorará la simulación resultante, pero puede afectar al "
 "rendimiento. Usar con cuidado."
 
-msgid "The SoftBody3D's mass."
-msgstr "La masa del SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
@@ -104955,6 +108997,142 @@ msgstr ""
 msgid "Use [method is_valid_ascii_identifier] instead."
 msgstr "Utiliza [method is_valid_ascii_identifier] en su lugar."
 
+msgid ""
+"Returns [code]true[/code] if this string is a valid identifier. A valid "
+"identifier may contain only letters, digits and underscores ([code]_[/code]), "
+"and the first character may not be a digit.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_identifier())    # Prints true\n"
+"print(\"TYPE_FLOAT\".is_valid_identifier()) # Prints true\n"
+"print(\"1st_method\".is_valid_identifier()) # Prints false\n"
+"print(\"MyMethod#2\".is_valid_identifier()) # Prints false\n"
+"[/codeblock]"
+msgstr ""
+"Devuelve [code]true[/code] si esta string es un identificador válido. Un "
+"identificador válido solo puede contener letras, dígitos y guiones bajos "
+"([code]_[/code]), y el primer carácter no puede ser un dígito.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_identifier())    # Imprime true\n"
+"print(\"TYPE_FLOAT\".is_valid_identifier()) # Imprime true\n"
+"print(\"1st_method\".is_valid_identifier()) # Imprime false\n"
+"print(\"MyMethod#2\".is_valid_identifier()) # Imprime false\n"
+"[/codeblock]"
+
+msgid ""
+"Returns [code]true[/code] if this string represents a valid integer. A valid "
+"integer only contains digits, and may be prefixed with a positive ([code]+[/"
+"code]) or negative ([code]-[/code]) sign. See also [method to_int].\n"
+"[codeblock]\n"
+"print(\"7\".is_valid_int())    # Prints true\n"
+"print(\"1.65\".is_valid_int()) # Prints false\n"
+"print(\"Hi\".is_valid_int())   # Prints false\n"
+"print(\"+3\".is_valid_int())   # Prints true\n"
+"print(\"-12\".is_valid_int())  # Prints true\n"
+"[/codeblock]"
+msgstr ""
+"Devuelve [code]true[/code] si esta string representa un entero válido. Un "
+"entero válido solo contiene dígitos y puede ir prefijado con un signo "
+"positivo ([code]+[/code]) o negativo ([code]-[/code]). Véase también [method "
+"to_int].\n"
+"[codeblock]\n"
+"print(\"7\".is_valid_int())    # Imprime true\n"
+"print(\"1.65\".is_valid_int()) # Imprime false\n"
+"print(\"Hi\".is_valid_int())   # Imprime false\n"
+"print(\"+3\".is_valid_int())   # Imprime true\n"
+"print(\"-12\".is_valid_int())  # Imprime true\n"
+"[/codeblock]"
+
+msgid ""
+"Returns [code]true[/code] if this string represents a well-formatted IPv4 or "
+"IPv6 address. This method considers [url=https://en.wikipedia.org/wiki/"
+"Reserved_IP_addresses]reserved IP addresses[/url] such as [code]\"0.0.0.0\"[/"
+"code] and [code]\"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\"[/code] as valid."
+msgstr ""
+"Devuelve [code]true[/code] si esta string representa una dirección IPv4 o "
+"IPv6 bien formateada. Este método considera válidas las [url=https://"
+"en.wikipedia.org/wiki/Reserved_IP_addresses]direcciones IP reservadas[/url] "
+"como [code]\"0.0.0.0\"[/code] y [code]"
+"\"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\"[/code]."
+
+msgid ""
+"Returns [code]true[/code] if this string is a valid Unicode identifier.\n"
+"A valid Unicode identifier must begin with a Unicode character of class "
+"[code]XID_Start[/code] or [code]\"_\"[/code], and may contain Unicode "
+"characters of class [code]XID_Continue[/code] in the other positions.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_unicode_identifier())      # Prints true\n"
+"print(\"1st_method\".is_valid_unicode_identifier())   # Prints false\n"
+"print(\"MyMethod#2\".is_valid_unicode_identifier())   # Prints false\n"
+"print(\"állóképesség\".is_valid_unicode_identifier()) # Prints true\n"
+"print(\"выносливость\".is_valid_unicode_identifier()) # Prints true\n"
+"print(\"体力\".is_valid_unicode_identifier())         # Prints true\n"
+"[/codeblock]\n"
+"See also [method is_valid_ascii_identifier].\n"
+"[b]Note:[/b] This method checks identifiers the same way as GDScript. See "
+"[method TextServer.is_valid_identifier] for more advanced checks."
+msgstr ""
+"Devuelve [code]true[/code] si esta string es un identificador Unicode "
+"válido.\n"
+"Un identificador Unicode válido debe comenzar con un carácter Unicode de "
+"clase [code]XID_Start[/code] o [code]\"_\"[/code], y puede contener "
+"caracteres Unicode de clase [code]XID_Continue[/code] en las otras "
+"posiciones.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_unicode_identifier())      # Imprime true\n"
+"print(\"1st_method\".is_valid_unicode_identifier())   # Imprime false\n"
+"print(\"MyMethod#2\".is_valid_unicode_identifier())   # Imprime false\n"
+"print(\"állóképesség\".is_valid_unicode_identifier()) # Imprime true\n"
+"print(\"выносливость\".is_valid_unicode_identifier()) # Imprime true\n"
+"print(\"体力\".is_valid_unicode_identifier())         # Imprime true\n"
+"[/codeblock]\n"
+"Véase también [method is_valid_ascii_identifier].\n"
+"[b]Nota:[/b] Este método verifica identificadores de la misma manera que "
+"GDScript. Consulta [method TextServer.is_valid_identifier] para "
+"comprobaciones más avanzadas."
+
+msgid ""
+"Returns the concatenation of [param parts]' elements, with each element "
+"separated by the string calling this method. This method is the opposite of "
+"[method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var fruits = [\"Apple\", \"Orange\", \"Pear\", \"Kiwi\"]\n"
+"\n"
+"print(\", \".join(fruits))  # Prints \"Apple, Orange, Pear, Kiwi\"\n"
+"print(\"---\".join(fruits)) # Prints \"Apple---Orange---Pear---Kiwi\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"string[] fruits = [\"Apple\", \"Orange\", \"Pear\", \"Kiwi\"];\n"
+"\n"
+"// In C#, this method is static.\n"
+"GD.Print(string.Join(\", \", fruits));  // Prints \"Apple, Orange, Pear, "
+"Kiwi\"\n"
+"GD.Print(string.Join(\"---\", fruits)); // Prints \"Apple---Orange---Pear---"
+"Kiwi\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Devuelve la concatenación de los elementos de [param parts], con cada "
+"elemento separado por la string que llama a este método. Este método es lo "
+"opuesto a [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var fruits = [\"Manzana\", \"Naranja\", \"Pera\", \"Kiwi\"]\n"
+"\n"
+"print(\", \".join(fruits))  # Imprime \"Manzana, Naranja, Pera, Kiwi\"\n"
+"print(\"---\".join(fruits)) # Imprime \"Manzana---Naranja---Pera---Kiwi\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"string[] fruits = [\"Manzana\", \"Naranja\", \"Pera\", \"Kiwi\"];\n"
+"\n"
+"// En C#, este método es estático.\n"
+"GD.Print(string.Join(\", \", fruits));  // Imprime \"Manzana, Naranja, Pera, "
+"Kiwi\"\n"
+"GD.Print(string.Join(\"---\", fruits)); // Imprime \"Manzana---Naranja---"
+"Pera---Kiwi\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns a copy of the string with special characters escaped using the JSON "
 "standard. Because it closely matches the C standard, it is possible to use "
@@ -104965,6 +109143,23 @@ msgstr ""
 "C, es posible usar [method c_unescape] para desencapsular la string, si es "
 "necesario."
 
+msgid ""
+"Returns the first [param length] characters from the beginning of the string. "
+"If [param length] is negative, strips the last [param length] characters from "
+"the string's end.\n"
+"[codeblock]\n"
+"print(\"Hello World!\".left(3))  # Prints \"Hel\"\n"
+"print(\"Hello World!\".left(-4)) # Prints \"Hello Wo\"\n"
+"[/codeblock]"
+msgstr ""
+"Devuelve los primeros [param length] caracteres desde el principio de la "
+"string. Si [param length] es negativo, elimina los últimos [param length] "
+"caracteres del final de la string.\n"
+"[codeblock]\n"
+"print(\"¡Hola mundo!\".left(3))  # Imprime \"¡Ho\"\n"
+"print(\"¡Hola mundo!\".left(-4)) # Imprime \"¡Hola mu\"\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the number of characters in the string. Empty strings ([code]\"\"[/"
 "code]) always return [code]0[/code]. See also [method is_empty]."
@@ -105016,6 +109211,277 @@ msgstr ""
 "excepto un punto ([code].[/code]). Una string vacía o una expresión vacía "
 "siempre se evalúa como [code]false[/code]."
 
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/MD5]MD5 hash[/url] of the "
+"string as a [PackedByteArray]."
+msgstr ""
+"Devuelve el [url=https://en.wikipedia.org/wiki/MD5]hash MD5[/url] de la "
+"string como un [PackedByteArray]."
+
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/MD5]MD5 hash[/url] of the "
+"string as another [String]."
+msgstr ""
+"Devuelve el [url=https://en.wikipedia.org/wiki/MD5]hash MD5[/url] de la "
+"string como otra [String]."
+
+msgid ""
+"Performs a [b]case-sensitive[/b], [i]natural order[/i] comparison to another "
+"string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, "
+"or [code]0[/code] if equal. \"Less than\" or \"greater than\" are determined "
+"by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode "
+"code points[/url] of each string, which roughly matches the alphabetical "
+"order.\n"
+"When used for sorting, natural order comparison orders sequences of numbers "
+"by the combined value of each digit as is often expected, instead of the "
+"single digit's value. A sorted sequence of numbered strings will be [code]"
+"[\"1\", \"2\", \"3\", ...][/code], not [code][\"1\", \"10\", \"2\", "
+"\"3\", ...][/code].\n"
+"If the character comparison reaches the end of one string, but the other "
+"string contains more characters, then it will use length as the deciding "
+"factor: [code]1[/code] will be returned if this string is longer than the "
+"[param to] string, or [code]-1[/code] if shorter. Note that the length of "
+"empty strings is always [code]0[/code].\n"
+"To get a [bool] result from a string comparison, use the [code]==[/code] "
+"operator instead. See also [method naturalnocasecmp_to], [method "
+"filecasecmp_to], and [method nocasecmp_to]."
+msgstr ""
+"Realiza una comparación de [b]sensible a mayúsculas y minúsculas[/b] y "
+"[i]orden natural[/i] con otra cadena. Devuelve [code]-1[/code] si es menor, "
+"[code]1[/code] si es mayor, o [code]0[/code] si es igual. \"Menor que\" o "
+"\"mayor que\" se determinan por los [url=https://en.wikipedia.org/wiki/"
+"List_of_Unicode_characters]puntos de código Unicode[/url] de cada cadena, lo "
+"que coincide aproximadamente con el orden alfabético.\n"
+"Cuando se usa para ordenar, la comparación de orden natural ordena las "
+"secuencias de números por el valor combinado de cada dígito como se espera a "
+"menudo, en lugar del valor de un solo dígito. Una secuencia ordenada de "
+"strings numeradas será [code][\"1\", \"2\", \"3\", ...][/code], no [code]"
+"[\"1\", \"10\", \"2\", \"3\", ...][/code].\n"
+"Si la comparación de caracteres llega al final de una cadena, pero la otra "
+"cadena contiene más caracteres, entonces usará la longitud como factor "
+"decisivo: se devolverá [code]1[/code] si esta cadena es más larga que la "
+"cadena [param to], o [code]-1[/code] si es más corta. Ten en cuenta que la "
+"longitud de las strings vacías es siempre [code]0[/code].\n"
+"Para obtener un resultado [bool] de una comparación de strings, usa el "
+"operador [code]==[/code] en su lugar. Consulta también [method "
+"naturalnocasecmp_to], [method filecasecmp_to] y [method nocasecmp_to]."
+
+msgid ""
+"Performs a [b]case-insensitive[/b], [i]natural order[/i] comparison to "
+"another string. Returns [code]-1[/code] if less than, [code]1[/code] if "
+"greater than, or [code]0[/code] if equal. \"Less than\" or \"greater than\" "
+"are determined by the [url=https://en.wikipedia.org/wiki/"
+"List_of_Unicode_characters]Unicode code points[/url] of each string, which "
+"roughly matches the alphabetical order. Internally, lowercase characters are "
+"converted to uppercase for the comparison.\n"
+"When used for sorting, natural order comparison orders sequences of numbers "
+"by the combined value of each digit as is often expected, instead of the "
+"single digit's value. A sorted sequence of numbered strings will be [code]"
+"[\"1\", \"2\", \"3\", ...][/code], not [code][\"1\", \"10\", \"2\", "
+"\"3\", ...][/code].\n"
+"If the character comparison reaches the end of one string, but the other "
+"string contains more characters, then it will use length as the deciding "
+"factor: [code]1[/code] will be returned if this string is longer than the "
+"[param to] string, or [code]-1[/code] if shorter. Note that the length of "
+"empty strings is always [code]0[/code].\n"
+"To get a [bool] result from a string comparison, use the [code]==[/code] "
+"operator instead. See also [method naturalcasecmp_to], [method "
+"filenocasecmp_to], and [method casecmp_to]."
+msgstr ""
+"Realiza una comparación de [b]no sensible a mayúsculas y minúsculas[/b] y "
+"[i]orden natural[/i] con otra string. Devuelve [code]-1[/code] si es menor, "
+"[code]1[/code] si es mayor, o [code]0[/code] si es igual. \"Menor que\" o "
+"\"mayor que\" se determinan por los [url=https://en.wikipedia.org/wiki/"
+"List_of_Unicode_characters]puntos de código Unicode[/url] de cada string, lo "
+"que coincide aproximadamente con el orden alfabético. Internamente, los "
+"caracteres en minúscula se convierten a mayúscula para la comparación.\n"
+"Cuando se usa para ordenar, la comparación de orden natural ordena las "
+"secuencias de números por el valor combinado de cada dígito como se espera a "
+"menudo, en lugar del valor de un solo dígito. Una secuencia ordenada de "
+"strings numeradas será [code][\"1\", \"2\", \"3\", ...][/code], no [code]"
+"[\"1\", \"10\", \"2\", \"3\", ...][/code].\n"
+"Si la comparación de caracteres llega al final de una string, pero la otra "
+"string contiene más caracteres, entonces usará la longitud como factor "
+"decisivo: se devolverá [code]1[/code] si esta string es más larga que la "
+"string [param to], o [code]-1[/code] si es más corta. Ten en cuenta que la "
+"longitud de las strings vacías es siempre [code]0[/code].\n"
+"Para obtener un resultado [bool] de una comparación de strings, usa el "
+"operador [code]==[/code] en su lugar. Véase también [method "
+"naturalcasecmp_to], [method filenocasecmp_to] y [method casecmp_to]."
+
+msgid ""
+"Performs a [b]case-insensitive[/b] comparison to another string. Returns "
+"[code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/"
+"code] if equal. \"Less than\" or \"greater than\" are determined by the "
+"[url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code "
+"points[/url] of each string, which roughly matches the alphabetical order. "
+"Internally, lowercase characters are converted to uppercase for the "
+"comparison.\n"
+"If the character comparison reaches the end of one string, but the other "
+"string contains more characters, then it will use length as the deciding "
+"factor: [code]1[/code] will be returned if this string is longer than the "
+"[param to] string, or [code]-1[/code] if shorter. Note that the length of "
+"empty strings is always [code]0[/code].\n"
+"To get a [bool] result from a string comparison, use the [code]==[/code] "
+"operator instead. See also [method casecmp_to], [method filenocasecmp_to], "
+"and [method naturalnocasecmp_to]."
+msgstr ""
+"Realiza una comparación [b]no sensible a mayúsculas y minúsculas[/b] con otra "
+"string. Devuelve [code]-1[/code] si es menor, [code]1[/code] si es mayor, o "
+"[code]0[/code] si es igual. \"Menor que\" o \"mayor que\" se determinan por "
+"los [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]puntos de "
+"código Unicode[/url] de cada string, lo que coincide aproximadamente con el "
+"orden alfabético. Internamente, los caracteres en minúscula se convierten a "
+"mayúscula para la comparación.\n"
+"Si la comparación de caracteres llega al final de una string, pero la otra "
+"string contiene más caracteres, entonces usará la longitud como factor "
+"decisivo: se devolverá [code]1[/code] si esta string es más larga que la "
+"string [param to], o [code]-1[/code] si es más corta. Ten en cuenta que la "
+"longitud de las strings vacías es siempre [code]0[/code].\n"
+"Para obtener un resultado [bool] de una comparación de strings, usa el "
+"operador [code]==[/code] en su lugar. Véase también [method casecmp_to], "
+"[method filenocasecmp_to] y [method naturalnocasecmp_to]."
+
+msgid ""
+"Converts a [float] to a string representation of a decimal number, with the "
+"number of decimal places specified in [param decimals].\n"
+"If [param decimals] is [code]-1[/code] as by default, the string "
+"representation may only have up to 14 significant digits, with digits before "
+"the decimal point having priority over digits after.\n"
+"Trailing zeros are not included in the string. The last digit is rounded, not "
+"truncated.\n"
+"[codeblock]\n"
+"String.num(3.141593)     # Returns \"3.141593\"\n"
+"String.num(3.141593, 3)  # Returns \"3.142\"\n"
+"String.num(3.14159300)   # Returns \"3.141593\"\n"
+"\n"
+"# Here, the last digit will be rounded up,\n"
+"# which reduces the total digit count, since trailing zeros are removed:\n"
+"String.num(42.129999, 5) # Returns \"42.13\"\n"
+"\n"
+"# If `decimals` is not specified, the maximum number of significant digits is "
+"14:\n"
+"String.num(-0.0000012345432123454321)     # Returns \"-0.00000123454321\"\n"
+"String.num(-10000.0000012345432123454321) # Returns \"-10000.0000012345\"\n"
+"[/codeblock]"
+msgstr ""
+"Convierte un [float] a una representación de string de un número decimal, con "
+"el número de decimales especificado en [param decimals].\n"
+"Si [param decimals] es [code]-1[/code] como por defecto, la representación de "
+"string puede tener solo hasta 14 dígitos significativos, con los dígitos "
+"antes del punto decimal teniendo prioridad sobre los dígitos después.\n"
+"Los ceros finales no se incluyen en la string. El último dígito se redondea, "
+"no se trunca.\n"
+"[codeblock]\n"
+"String.num(3.141593)     # Devuelve \"3.141593\"\n"
+"String.num(3.141593, 3)  # Devuelve \"3.142\"\n"
+"String.num(3.14159300)   # Devuelve \"3.141593\"\n"
+"\n"
+"# Aquí, el último dígito se redondeará hacia arriba,\n"
+"# lo que reduce el conteo total de dígitos, ya que los ceros finales se "
+"eliminan:\n"
+"String.num(42.129999, 5) # Returns \"42.13\"\n"
+"\n"
+"# Si `decimals` no se especifica, el número máximo de dígitos significativos "
+"es 14:\n"
+"String.num(-0.0000012345432123454321)     # Devuelve \"-0.00000123454321\"\n"
+"String.num(-10000.0000012345432123454321) # Devuelve \"-10000.0000012345\"\n"
+"[/codeblock]"
+
+msgid ""
+"Converts the given [param number] to a string representation, with the given "
+"[param base].\n"
+"By default, [param base] is set to decimal ([code]10[/code]). Other common "
+"bases in programming include binary ([code]2[/code]), [url=https://"
+"en.wikipedia.org/wiki/Octal]octal[/url] ([code]8[/code]), hexadecimal "
+"([code]16[/code]).\n"
+"If [param capitalize_hex] is [code]true[/code], digits higher than 9 are "
+"represented in uppercase."
+msgstr ""
+"Convierte el [param number] dado a una representación de string, con la "
+"[param base] dada.\n"
+"Por defecto, [param base] se establece en decimal ([code]10[/code]). Otras "
+"bases comunes en programación incluyen binario ([code]2[/code]), [url=https://"
+"en.wikipedia.org/wiki/Octal]octal[/url] ([code]8[/code]), hexadecimal "
+"([code]16[/code]).\n"
+"Si [param capitalize_hex] es [code]true[/code], los dígitos mayores que 9 se "
+"representan en mayúsculas."
+
+msgid ""
+"Converts the given [param number] to a string representation, in scientific "
+"notation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var n = -5.2e8\n"
+"print(n)                        # Prints -520000000\n"
+"print(String.num_scientific(n)) # Prints -5.2e+08\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This method is not implemented in C#.\n"
+"// Use `string.ToString()` with \"e\" to achieve similar results.\n"
+"var n = -5.2e8f;\n"
+"GD.Print(n);                // Prints -520000000\n"
+"GD.Print(n.ToString(\"e1\")); // Prints -5.2e+008\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In C#, this method is not implemented. To achieve similar "
+"results, see C#'s [url=https://learn.microsoft.com/en-us/dotnet/standard/base-"
+"types/standard-numeric-format-strings]Standard numeric format strings[/url]."
+msgstr ""
+"Convierte el [param number] dado a una representación de string, en notación "
+"científica.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var n = -5.2e8\n"
+"print(n)                        # Imprime -520000000\n"
+"print(String.num_scientific(n)) # Imprime -5.2e+08\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Este método no está implementado en C#.\n"
+"// Usa `string.ToString()` con \"e\" para obtener resultados similares.\n"
+"var n = -5.2e8f;\n"
+"GD.Print(n);                // Imprime -520000000\n"
+"GD.Print(n.ToString(\"e1\")); // Imprime -5.2e+008\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] En C#, este método no está implementado. Para obtener resultados "
+"similares, véanse las [url=https://learn.microsoft.com/en-us/dotnet/standard/"
+"base-types/standard-numeric-format-strings]strings de formato numérico "
+"estándar[/url] de C#."
+
+msgid ""
+"Converts the given unsigned [int] to a string representation, with the given "
+"[param base].\n"
+"By default, [param base] is set to decimal ([code]10[/code]). Other common "
+"bases in programming include binary ([code]2[/code]), [url=https://"
+"en.wikipedia.org/wiki/Octal]octal[/url] ([code]8[/code]), hexadecimal "
+"([code]16[/code]).\n"
+"If [param capitalize_hex] is [code]true[/code], digits higher than 9 are "
+"represented in uppercase."
+msgstr ""
+"Convierte el [int] sin signo dado a una representación de string, con la "
+"[param base] dada.\n"
+"Por defecto, [param base] se establece en decimal ([code]10[/code]). Otras "
+"bases comunes en programación incluyen binario ([code]2[/code]), [url=https://"
+"en.wikipedia.org/wiki/Octal]octal[/url] ([code]8[/code]), hexadecimal "
+"([code]16[/code]).\n"
+"Si [param capitalize_hex] es [code]true[/code], los dígitos mayores que 9 se "
+"representan en mayúsculas."
+
+msgid ""
+"Formats the string representing a number to have an exact number of [param "
+"digits] [i]after[/i] the decimal point."
+msgstr ""
+"Formatea la string que representa un número para que tenga exactamente [param "
+"digits] dígitos [i]después[/i] del punto decimal."
+
+msgid ""
+"Formats the string representing a number to have an exact number of [param "
+"digits] [i]before[/i] the decimal point."
+msgstr ""
+"Formatea la string que representa un número para que tenga exactamente [param "
+"digits] dígitos [i]antes[/i] del punto decimal."
+
 msgid ""
 "Removes all occurrences of the Unicode character with code [param what]. "
 "Faster version of [method replace] when the key is only one character long "
@@ -105025,6 +109491,13 @@ msgstr ""
 "what]. Versión más rápida de [method replace] cuando la clave tiene solo un "
 "carácter de longitud y el reemplazo es [code]\"\"[/code]."
 
+msgid ""
+"Removes all occurrences of the characters in [param chars]. See also [method "
+"remove_char]."
+msgstr ""
+"Elimina cualquier ocurrencia de los caracteres en [param chars]. Véase "
+"también [method remove_char]."
+
 msgid ""
 "Repeats this string a number of times. [param count] needs to be greater than "
 "[code]0[/code]. Otherwise, returns an empty string."
@@ -105039,6 +109512,22 @@ msgstr ""
 "Reemplaza todas las instancias de [param what] dentro de la string con el "
 "[param forwhat] dado."
 
+msgid ""
+"Replaces all occurrences of the Unicode character with code [param key] with "
+"the Unicode character with code [param with]. Faster version of [method "
+"replace] when the key is only one character long. To get a single character "
+"use [code]\"X\".unicode_at(0)[/code] (note that some strings, like compound "
+"letters and emoji, can be composed of multiple unicode codepoints, and will "
+"not work with this method, use [method length] to make sure)."
+msgstr ""
+"Reemplaza todas las ocurrencias del carácter Unicode con el código [param "
+"key] con el carácter Unicode con el código [param with]. Versión más rápida "
+"de [method replace] cuando la clave tiene solo un carácter de longitud. Para "
+"obtener un solo carácter, usa [code]\"X\".unicode_at(0)[/code] (ten en cuenta "
+"que algunas strings, como las letras compuestas y los emojis, pueden estar "
+"compuestas de múltiples puntos de código Unicode, y no funcionarán con este "
+"método; usa [method length] para asegurarte)."
+
 msgid ""
 "Replaces any occurrence of the characters in [param keys] with the Unicode "
 "character with code [param with]. See also [method replace_char]."
@@ -105063,6 +109552,29 @@ msgstr ""
 "puntos de código Unicode, en lugar de secuencias de puntos de código, y puede "
 "romper cosas como letras compuestas o emojis."
 
+msgid ""
+"Returns the index of the [b]last[/b] occurrence of [param what] in this "
+"string, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the beginning of the string. This "
+"method is the reverse of [method find].\n"
+"[b]Note:[/b] A negative value of [param from] is converted to a starting "
+"index by counting back from the last possible index with enough space to find "
+"[param what].\n"
+"[b]Note:[/b] A value of [param from] that is greater than the last possible "
+"index with enough space to find [param what] is considered out-of-bounds, and "
+"returns [code]-1[/code]."
+msgstr ""
+"Devuelve el índice de la [b]última[/b] ocurrencia de [param what] en esta "
+"string, o [code]-1[/code] si no hay ninguna. El inicio de la búsqueda se "
+"puede especificar con [param from], continuando hacia el principio de la "
+"string. Este método es el inverso de [method find].\n"
+"[b]Nota:[/b] Un valor negativo de [param from] se convierte en un índice de "
+"inicio contando hacia atrás desde el último índice posible con espacio "
+"suficiente para encontrar [param what].\n"
+"[b]Nota:[/b] Un valor de [param from] mayor que el último índice posible con "
+"espacio suficiente para encontrar [param what] se considera fuera de límites "
+"y devuelve [code]-1[/code]."
+
 msgid ""
 "Returns the index of the [b]last[/b] [b]case-insensitive[/b] occurrence of "
 "[param what] in this string, or [code]-1[/code] if there are none. The "
@@ -105083,6 +109595,53 @@ msgstr ""
 "añadiendo [param character]s a la derecha de la string, si es necesario. "
 "Véase también [method lpad]."
 
+msgid ""
+"Splits the string using a [param delimiter] and returns an array of the "
+"substrings, starting from the end of the string. The splits in the returned "
+"array appear in the same order as the original string. If [param delimiter] "
+"is an empty string, each substring will be a single character.\n"
+"If [param allow_empty] is [code]false[/code], empty strings between adjacent "
+"delimiters are excluded from the array.\n"
+"If [param maxsplit] is greater than [code]0[/code], the number of splits may "
+"not exceed [param maxsplit]. By default, the entire string is split, which is "
+"mostly identical to [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_string = \"One,Two,Three,Four\"\n"
+"var some_array = some_string.rsplit(\",\", true, 1)\n"
+"\n"
+"print(some_array.size()) # Prints 2\n"
+"print(some_array[0])     # Prints \"One,Two,Three\"\n"
+"print(some_array[1])     # Prints \"Four\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// In C#, there is no String.RSplit() method.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Divide la string usando un [param delimiter] y devuelve un array de las "
+"subcadenas, empezando desde el final de la string. Las divisiones en el array "
+"devuelto aparecen en el mismo orden que la string original. Si [param "
+"delimiter] es una string vacía, cada subcadena será un solo carácter.\n"
+"Si [param allow_empty] es [code]false[/code], las strings vacías entre "
+"delimitadores adyacentes se excluyen del array.\n"
+"Si [param maxsplit] es mayor que [code]0[/code], el número de divisiones no "
+"puede exceder [param maxsplit]. Por defecto, la string completa se divide, lo "
+"que es casi idéntico a [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_string = \"Uno,Dos,Tres,Cuatro\"\n"
+"var some_array = some_string.rsplit(\",\", true, 1)\n"
+"\n"
+"print(some_array.size()) # Imprime 2\n"
+"print(some_array[0])     # Imprime \"Uno,Dos,Tres\"\n"
+"print(some_array[1])     # Imprime \"Cuatro\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// En C#, no existe el método String.RSplit().\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Removes a set of characters defined in [param chars] from the string's end. "
 "See also [method lstrip].\n"
@@ -108900,7 +113459,8 @@ msgstr ""
 "para incluir la base de datos de TextServer."
 
 msgid "Returns the number of uniform text runs in the buffer."
-msgstr "Devuelve el número de secuencias de texto uniformes en el búfer."
+msgstr ""
+"Devuelve el número de secuencias de texto de variables uniformes en el búfer."
 
 msgid "Returns the direction of the [param index] text run (in visual order)."
 msgstr ""
@@ -126134,8 +130694,9 @@ msgid ""
 "Sampler type. Translated to reference of sampler uniform in shader code. Can "
 "only be used for input ports in non-uniform nodes."
 msgstr ""
-"Tipo Sampler. Traducido a referencia del uniforme del muestras en el código "
-"shader. Solo puede utilizarse para puertos de entrada en nodos no uniformes."
+"Tipo Sampler. Traducido a referencia de la variable uniforme del muestras en "
+"el código de shader. Solo puede utilizarse para puertos de entrada en nodos "
+"no uniformes."
 
 msgid "Represents the size of the [enum PortType] enum."
 msgstr "Representa el tamaño del enum [enum PortType]."
@@ -126199,8 +130760,7 @@ msgstr ""
 "Un parámetro booleano para ser usado dentro del gráfico de shader visual."
 
 msgid "Translated to [code]uniform bool[/code] in the shader language."
-msgstr ""
-"Traducido a [code]uniform bool[/code] uniforme en el lenguaje de los shaders."
+msgstr "Traducido a [code]uniform bool[/code] en el lenguaje de los shaders."
 
 msgid "A default value to be assigned within the shader."
 msgstr "Un valor por defecto para ser asignado dentro del shader."
@@ -126657,14 +131217,16 @@ msgid "Represents the size of the [enum Source] enum."
 msgstr "Representa el tamaño del enum [enum Source]."
 
 msgid "No hints are added to the uniform declaration."
-msgstr "No se añade ninguna sugerencia a la declaración del uniforme."
+msgstr ""
+"No se añade ninguna sugerencia a la declaración de la variable uniforme."
 
 msgid ""
 "Adds [code]hint_normal[/code] as hint to the uniform declaration, which "
 "internally converts the texture for proper usage as normal map."
 msgstr ""
-"Añade [code]hint_normal[/code] como sugerencia a la declaración uniforme, lo "
-"que internamente convierte la textura para su uso adecuado como mapa normal."
+"Añade [code]hint_normal[/code] como sugerencia a la declaración de la "
+"variable uniforme uniforme, lo que internamente convierte la textura para su "
+"uso adecuado como mapa normal."
 
 msgid "A [Cubemap] parameter node to be used within the visual shader graph."
 msgstr ""
@@ -126828,9 +131390,10 @@ msgid ""
 msgstr ""
 "Sobrescribe este método para agregar código de shader en la parte superior "
 "del shader global, para definir tu propia biblioteca estándar de métodos "
-"reutilizables, variables, constantes, uniformes, etc. El código shader debe "
-"devolverse como una string, que puede tener varias líneas (la construcción de "
-"string multilínea [code]\"\"\"[/code] se puede usar para mayor comodidad).\n"
+"reutilizables, variables, constantes, variables uniformes, etc. El código "
+"shader debe devolverse como una string, que puede tener varias líneas (la "
+"construcción de string multilínea [code]\"\"\"[/code] se puede usar para "
+"mayor comodidad).\n"
 "Ten cuidado con esta funcionalidad, ya que puede causar conflictos de nombres "
 "con otros nodos personalizados, así que asegúrate de dar a las entidades "
 "definidas nombres únicos.\n"
@@ -127124,7 +131687,7 @@ msgstr ""
 "El código proporcionado se inyecta directamente en la función shader "
 "correspondiente del gráfico ([code]vertex[/code], [code]fragment[/code] o "
 "[code]light[/code]), por lo que no se puede utilizar para declarar funciones, "
-"variables, uniformes o constantes globales. Consulta "
+"variables, variables uniformes o constantes globales. Consulta "
 "[VisualShaderNodeGlobalExpression] para tales definiciones globales."
 
 msgid ""
@@ -127136,8 +131699,8 @@ msgstr ""
 "Una expresión del Lenguaje de Sombreado Godot, que se inyectará al comienzo "
 "de la función shader correspondiente del gráfico ([code]vertex[/code], "
 "[code]fragment[/code], o [code]light[/code]), y por lo tanto no puede "
-"utilizarse para declarar funciones, variaciones, uniformes o constantes "
-"globales."
+"utilizarse para declarar funciones, variaciones, variables uniformes o "
+"constantes globales."
 
 msgid ""
 "Returns the vector that points in the same direction as a reference vector "
@@ -127490,8 +132053,8 @@ msgid ""
 "A hint applied to the uniform, which controls the values it can take when set "
 "through the Inspector."
 msgstr ""
-"Una sugerencia aplicada al uniforme, que controla los valores que puede tomar "
-"cuando se establece a través del Inspector."
+"Una sugerencia aplicada a la variable uniforme, que controla los valores que "
+"puede tomar cuando se establece a través del Inspector."
 
 msgid ""
 "Minimum value for range hints. Used if [member hint] is set to [constant "
@@ -127623,7 +132186,7 @@ msgstr ""
 "el shader generado. Puedes colocar varias definiciones de funciones dentro "
 "para llamarlas más tarde en [VisualShaderNodeExpression]s (que se inyectan en "
 "las principales funciones shader). También puedes declarar variaciones, "
-"uniformes y constantes globales."
+"variables uniformes y constantes globales."
 
 msgid ""
 "Base class for a family of nodes with variable number of input and output "
@@ -127902,7 +132465,8 @@ msgstr ""
 
 msgid "A visual shader node for shader parameter (uniform) of type [int]."
 msgstr ""
-"Un nodo de shader visual para el parámetro de shader (uniforme) de tipo [int]."
+"Un nodo de shader visual para el parámetro de shader (variable uniforme) de "
+"tipo [int]."
 
 msgid ""
 "A [VisualShaderNodeParameter] of type [int]. Offers additional customization "
@@ -128497,7 +133061,7 @@ msgstr ""
 "dentro del nodo."
 
 msgid "Use the uniform texture from sampler port."
-msgstr "Usar la textura uniforme del puerto de muestreo."
+msgstr "Usar la textura de variable uniforme del puerto de muestreo."
 
 msgid ""
 "A visual shader node that unpacks the screen normal texture in World Space."
@@ -128618,7 +133182,7 @@ msgid "A transform type."
 msgstr "Un tipo de transformación."
 
 msgid "Performs a 2D texture lookup within the visual shader graph."
-msgstr "Realiza una búsqueda de textura 2D dentro del grafo de shader visual."
+msgstr "Realiza una búsqueda de texturas 2D dentro del grafo de shader visual."
 
 msgid ""
 "Performs a lookup operation on the provided texture, with support for "
@@ -128690,7 +133254,8 @@ msgstr ""
 
 msgid "A 2D texture uniform array to be used within the visual shader graph."
 msgstr ""
-"Un array uniforme de texturas 2D para usar dentro del grafo de shader visual."
+"Un array de variables uniformes de texturas 2D para usar dentro del grafo de "
+"shader visual."
 
 msgid ""
 "Translated to [code]uniform sampler2DArray[/code] in the shader language."
@@ -128746,17 +133311,20 @@ msgstr "Traducido a [code]uniform sampler3D[/code] en el lenguaje de shaders."
 
 msgid "Performs a uniform texture lookup within the visual shader graph."
 msgstr ""
-"Realiza una búsqueda de texturas uniformes dentro del gráfico shader visual."
+"Realiza una búsqueda de texturas de variables uniformes dentro del gráfico "
+"shader visual."
 
 msgid ""
 "Performs a lookup operation on the texture provided as a uniform for the "
 "shader."
 msgstr ""
-"Realiza una operación de búsqueda en la textura proporcionada como un "
-"uniforme para el shader."
+"Realiza una operación de búsqueda en la textura proporcionada como una "
+"variable uniforme para el shader."
 
 msgid "Sets the default color if no texture is assigned to the uniform."
-msgstr "Establece el color por defecto si no se asigna una textura al uniforme."
+msgstr ""
+"Establece el color por defecto si no se asigna una textura a la variable "
+"uniforme."
 
 msgid "Sets the texture filtering mode."
 msgstr "Establece el modo de filtrado de textura."
@@ -128775,8 +133343,8 @@ msgid ""
 "Adds [code]hint_anisotropy[/code] as hint to the uniform declaration to use "
 "for a flowmap."
 msgstr ""
-"Agrega [code]hint_anisotropy[/code] como sugerencia a la declaración uniforme "
-"para usar en un mapa de flujo."
+"Agrega [code]hint_anisotropy[/code] como sugerencia a la declaración de "
+"variable uniforme para usar en un mapa de flujo."
 
 msgid "Defaults to fully opaque white color."
 msgstr "Regresa por defecto a color blanco completamente opaco."
@@ -128888,15 +133456,15 @@ msgid ""
 "Performs a uniform texture lookup with triplanar within the visual shader "
 "graph."
 msgstr ""
-"Realiza una búsqueda de textura uniforme con triplanar dentro del gráfico "
-"shader visual."
+"Realiza una búsqueda de textura de variables uniformes con triplanar dentro "
+"del gráfico shader visual."
 
 msgid ""
 "Performs a lookup operation on the texture provided as a uniform for the "
 "shader, with support for triplanar mapping."
 msgstr ""
-"Realiza una operación de búsqueda en la textura proporcionada como un "
-"uniforme para el shader, con soporte para el mapeo triplanar."
+"Realiza una operación de búsqueda en la textura proporcionada como una "
+"variable uniforme para el shader, con soporte para el mapeo triplanar."
 
 msgid ""
 "Performs an SDF (signed-distance field) texture lookup within the visual "
diff --git a/engine/doc/translations/fr.po b/engine/doc/translations/fr.po
index bbbb0fce..f52d4972 100644
--- a/engine/doc/translations/fr.po
+++ b/engine/doc/translations/fr.po
@@ -3,7 +3,7 @@
 # Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.
 # This file is distributed under the same license as the Godot source code.
 #
-# Rémi Verschelde <remi@godotengine.org>, 2020, 2021, 2025.
+# Rémi Verschelde <remi@godotengine.org>, 2020, 2021, 2025, 2026.
 # Freyja <aerandil@gmail.com>, 2020, 2023.
 # Gol.D.eNI <eniolamy1@gmail.com>, 2020.
 # Anonymous <noreply@weblate.org>, 2020.
@@ -135,13 +135,15 @@
 # MERCRED <augustinseroul@gmail.com>, 2026.
 # Posemartonis <weblate.drainage895@passmail.net>, 2026.
 # Le cathogeek <etienne.pacault@gmail.com>, 2026.
+# Nausicaa <nausicaa@ondin.es>, 2026.
+# Atomys <contact@atomys.fr>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-25 00:40+0000\n"
-"Last-Translator: aioshiro <aioshiro57@proton.me>\n"
+"PO-Revision-Date: 2026-02-02 01:01+0000\n"
+"Last-Translator: Rémi Verschelde <remi@godotengine.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/godot-"
 "class-reference/fr/>\n"
 "Language: fr\n"
@@ -13545,11 +13547,11 @@ msgstr ""
 "forme :\n"
 "[codeblocks]\n"
 "[gdscript]\n"
-"var autre_proprietaire_forme = zone.shape_find_owner(area_shape_index)\n"
-"var autre_noeud_forme = zone.shape_owner_get_owner(autre_proprietaire_forme)\n"
+"var proprietaire_autre_forme = area.shape_find_owner(area_shape_index)\n"
+"var noeud_autre_forme = area.shape_owner_get_owner(proprietaire_autre_forme)\n"
 "\n"
-"var proprietaire_forme_local = shape_find_owner(local_shape_index)\n"
-"var noeud_forme_local = shape_owner_get_owner(proprietaire_forme_local)\n"
+"var proprietaire_forme_locale = shape_find_owner(local_shape_index)\n"
+"var noeud_forme_locale = shape_owner_get_owner(proprietaire_forme_locale)\n"
 "[/gdscript]\n"
 "[/codeblocks]"
 
@@ -13618,11 +13620,12 @@ msgstr ""
 "forme :\n"
 "[codeblocks]\n"
 "[gdscript]\n"
-"var autre_proprietaire_forme = zone.shape_find_owner(body_shape_index)\n"
-"var autre_noeud_forme = zone.shape_owner_get_owner(autre_proprietaire_forme)\n"
+"var proprietaire_forme_du_corps = body.shape_find_owner(body_shape_index)\n"
+"var noeud_forme_du_corps = "
+"body.shape_owner_get_owner(proprietaire_forme_du_corps)\n"
 "\n"
-"var proprietaire_forme_local = shape_find_owner(local_shape_index)\n"
-"var noeud_forme_local = shape_owner_get_owner(proprietaire_forme_local)\n"
+"var proprietaire_forme_locale = shape_find_owner(local_shape_index)\n"
+"var noeud_forme_locale = shape_owner_get_owner(proprietaire_forme_locale)\n"
 "[/gdscript]\n"
 "[/codeblocks]"
 
@@ -13976,11 +13979,11 @@ msgstr ""
 "forme :\n"
 "[codeblocks]\n"
 "[gdscript]\n"
-"var autre_proprietaire_forme = zone.shape_find_owner(area_shape_index)\n"
-"var autre_noeud_forme = zone.shape_owner_get_owner(autre_proprietaire_forme)\n"
+"var proprietaire_autre_forme = area.shape_find_owner(area_shape_index)\n"
+"var noeud_autre_forme = area.shape_owner_get_owner(proprietaire_autre_forme)\n"
 "\n"
-"var proprietaire_forme_local = shape_find_owner(local_shape_index)\n"
-"var noeud_forme_local = shape_owner_get_owner(proprietaire_forme_local)\n"
+"var proprietaire_forme_locale = shape_find_owner(local_shape_index)\n"
+"var noeud_forme_locale = shape_owner_get_owner(proprietaire_forme_locale)\n"
 "[/gdscript]\n"
 "[/codeblocks]"
 
@@ -14049,11 +14052,12 @@ msgstr ""
 "forme :\n"
 "[codeblocks]\n"
 "[gdscript]\n"
-"var autre_proprietaire_forme = zone.shape_find_owner(body_shape_index)\n"
-"var autre_noeud_forme = zone.shape_owner_get_owner(autre_proprietaire_forme)\n"
+"var proprietaire_forme_du_corps = body.shape_find_owner(body_shape_index)\n"
+"var noeud_forme_du_corps = "
+"body.shape_owner_get_owner(proprietaire_forme_du_corps)\n"
 "\n"
-"var proprietaire_forme_local = shape_find_owner(local_shape_index)\n"
-"var noeud_forme_local = shape_owner_get_owner(proprietaire_forme_local)\n"
+"var proprietaire_forme_locale = shape_find_owner(local_shape_index)\n"
+"var noeud_forme_locale = shape_owner_get_owner(proprietaire_forme_locale)\n"
 "[/gdscript]\n"
 "[/codeblocks]"
 
@@ -25540,6 +25544,13 @@ msgid "Returns [code]true[/code] if the end bone is extended to have a tail."
 msgstr ""
 "Renvoie [code]true[/code] si l'os final est prolongé pour avoir une queue."
 
+msgid ""
+"Sets the damping curve when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_CUSTOM]."
+msgstr ""
+"Définit la courbe d'amortissement quand [method get_disperse_mode] est "
+"[constant DISPERSE_MODE_CUSTOM]."
+
 msgid "Sets the end bone index of the bone chain."
 msgstr "Définit l'index de l'os de fin de la chaîne d'os."
 
@@ -25577,9 +25588,95 @@ msgstr "Définit l'index de l'os racine de la chaîne d'os."
 msgid "Sets the root bone name of the bone chain."
 msgstr "Définit le nom de l'os racine de la chaîne d'os."
 
+msgid ""
+"Sets the rotation to an arbitrary state before twisting for the current bone "
+"pose to extract the twist when [method is_twist_from_rest] is [code]false[/"
+"code].\n"
+"In other words, by calling [method set_twist_from] by [signal "
+"SkeletonModifier3D.modification_processed] of a specific "
+"[SkeletonModifier3D], you can extract only the twists generated by modifiers "
+"processed after that but before this [BoneTwistDisperser3D]."
+msgstr ""
+"Définit la rotation dans un état arbitraire avant la torsion pour la pose "
+"actuelle de l’os afin d’extraire la torsion lorsque [method "
+"is_twist_from_rest] est [code]false[/code].\n"
+"Autrement dit, en appelant [method set_twist_from] depuis le signal [signal "
+"SkeletonModifier3D.modification_processed] d’un [SkeletonModifier3D] "
+"spécifique, vous pouvez extraire uniquement les torsions générées par les "
+"modificateurs traités après celui-ci mais avant ce [BoneTwistDisperser3D]."
+
+msgid ""
+"If [param enabled] is [code]true[/code], it extracts the twist amount from "
+"the difference between the bone rest and the current bone pose.\n"
+"If [param enabled] is [code]false[/code], it extracts the twist amount from "
+"the difference between [method get_twist_from] and the current bone pose. See "
+"also [method set_twist_from]."
+msgstr ""
+"Si [param enabled] est [code]true[/code], la quantité de torsion est extraite "
+"à partir de la différence entre la pose de repos de l’os et la pose actuelle "
+"de l’os.\n"
+"Si [param enabled] est [code]false[/code], la quantité de torsion est "
+"extraite à partir de la différence entre [method get_twist_from] et la pose "
+"actuelle de l’os. Voir également [method set_twist_from]."
+
+msgid ""
+"Sets the position at which to divide the segment between joints for weight "
+"assignment when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_WEIGHTED].\n"
+"For example, when [param weight_position] is [code]0.5[/code], if two bone "
+"segments with a length of [code]1.0[/code] exist between three joints, "
+"weights are assigned to each joint from root to end at ratios of [code]0.5[/"
+"code], [code]1.0[/code], and [code]0.5[/code]. Then amounts become "
+"[code]0.25[/code], [code]0.75[/code], and [code]1.0[/code] respectively."
+msgstr ""
+"Définit la position à laquelle diviser le segment entre les articulations "
+"pour l’attribution des poids lorsque [method get_disperse_mode] est [constant "
+"DISPERSE_MODE_WEIGHTED].\n"
+"Par exemple, lorsque [param weight_position] est [code]0.5[/code], si deux "
+"segments d’os d’une longueur de [code]1.0[/code] existent entre trois "
+"articulations, les poids sont attribués à chaque articulation de la racine "
+"vers l’extrémité avec des ratios de [code]0.5[/code], [code]1.0[/code] et "
+"[code]0.5[/code]. Les valeurs deviennent alors respectivement [code]0.25[/"
+"code], [code]0.75[/code] et [code]1.0[/code]."
+
 msgid "The number of settings."
 msgstr "Le nombre de paramètres."
 
+msgid ""
+"Assign amounts so that they monotonically increase from [code]0.0[/code] to "
+"[code]1.0[/code], ensuring all weights are equal. For example, with five "
+"joints, the amounts would be [code]0.2[/code], [code]0.4[/code], [code]0.6[/"
+"code], [code]0.8[/code], and [code]1.0[/code] starting from the root bone."
+msgstr ""
+"Attribue des valeurs de sorte qu’elles augmentent de manière monotone de "
+"[code]0.0[/code] à [code]1.0[/code], en garantissant que tous les poids "
+"soient égaux. Par exemple, avec cinq articulations, les valeurs seraient "
+"[code]0.2[/code], [code]0.4[/code], [code]0.6[/code], [code]0.8[/code] et "
+"[code]1.0[/code] en partant de l’os racine."
+
+msgid ""
+"Assign amounts so that they monotonically increase from [code]0.0[/code] to "
+"[code]1.0[/code], based on the length of the bones between joint segments. "
+"See also [method set_weight_position]."
+msgstr ""
+"Attribue des valeurs de sorte qu’elles augmentent de manière monotone de "
+"[code]0.0[/code] à [code]1.0[/code], en se basant sur la longueur des os "
+"entre les segments d’articulations. Voir également [method "
+"set_weight_position]."
+
+msgid ""
+"You can assign arbitrary amounts to the joint list. See also [method "
+"set_joint_twist_amount].\n"
+"When [method is_end_bone_extended] is [code]false[/code], a child of the "
+"reference bone exists solely to determine the twist axis, so its custom "
+"amount has absolutely no effect at all."
+msgstr ""
+"Vous pouvez attribuer des valeurs arbitraires à la liste des articulations. "
+"Voir également [method set_joint_twist_amount].\n"
+"Lorsque [method is_end_bone_extended] est [code]false[/code], un enfant de "
+"l’os de référence existe uniquement pour déterminer l’axe de torsion, donc sa "
+"valeur personnalisée n’a absolument aucun effet."
+
 msgid "A built-in boolean type."
 msgstr "Un type booléen intégré."
 
@@ -26888,6 +26985,15 @@ msgstr ""
 msgid "2D Isometric Demo"
 msgstr "Démo 2D isométrique"
 
+msgid ""
+"Aligns the camera to the tracked node.\n"
+"[b]Note:[/b] Calling [method force_update_scroll] after this method is not "
+"required."
+msgstr ""
+"Aligne la caméra sur le nœud suivi.\n"
+"[b]Note :[/b] Il n’est pas nécessaire d’appeler [method force_update_scroll] "
+"après cette méthode."
+
 msgid "Forces the camera to update scroll immediately."
 msgstr "Force la caméra à mettre à jour le défilement immédiatement."
 
@@ -28740,6 +28846,25 @@ msgstr ""
 "n'est pas souhaité, passez une largeur [param width] positive comme "
 "[code]1.0[/code]."
 
+msgid ""
+"Draws a [Mesh] in 2D, using the provided texture. See [MeshInstance2D] for "
+"related documentation. The [param transform] is defined in local space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"Dessine un [Mesh] en 2D en utilisant la texture fournie. Voir "
+"[MeshInstance2D] pour une documentation associée. Le [param transform] est "
+"défini dans l’espace local.\n"
+"[b]Note :[/b] Les styleboxes, textures et meshes stockés uniquement dans des "
+"variables locales ne doivent [b]pas[/b] être utilisés avec cette méthode en "
+"GDScript, car l’opération de dessin ne commence pas immédiatement lorsque "
+"cette méthode est appelée. En GDScript, lorsque la fonction contenant les "
+"variables locales se termine, celles-ci sont détruites avant que le rendu "
+"n’ait lieu."
+
 msgid ""
 "Draws a textured rectangle region of the multichannel signed distance field "
 "texture at a given position, optionally modulated by a color. The [param "
@@ -28867,6 +28992,24 @@ msgstr ""
 "est utilisé comme facteur de sur-échantillonnage de la police, sinon les "
 "paramètres de sur-échantillonnage du viewport sont utilisés."
 
+msgid ""
+"Draws a [MultiMesh] in 2D with the provided texture. See "
+"[MultiMeshInstance2D] for related documentation.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"Dessine un [MultiMesh] en 2D avec la texture fournie. Voir "
+"[MultiMeshInstance2D] pour une documentation associée.\n"
+"[b]Note :[/b] Les styleboxes, textures et meshes stockés uniquement dans des "
+"variables locales ne doivent [b]pas[/b] être utilisés avec cette méthode en "
+"GDScript, car l’opération de dessin ne commence pas immédiatement lorsque "
+"cette méthode est appelée. En GDScript, lorsque la fonction contenant les "
+"variables locales se termine, celles-ci sont détruites avant que le rendu "
+"n’ait lieu."
+
 msgid ""
 "Draws a solid polygon of any number of points, convex or concave. Unlike "
 "[method draw_colored_polygon], each point's color can be changed "
@@ -29076,6 +29219,41 @@ msgstr ""
 "échantillonnage de la police, sinon les paramètres de sur-échantillonnage du "
 "viewport sont utilisés."
 
+msgid ""
+"Draws a styled rectangle. The [param rect] is defined in local space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"Dessine un rectangle stylisé. Le [param rect] est défini dans l’espace "
+"local.\n"
+"[b]Note :[/b] Les styleboxes, textures et meshes stockés uniquement dans des "
+"variables locales ne doivent [b]pas[/b] être utilisés avec cette méthode en "
+"GDScript, car l’opération de dessin ne commence pas immédiatement lorsque "
+"cette méthode est appelée. En GDScript, lorsque la fonction contenant les "
+"variables locales se termine, celles-ci sont détruites avant que le rendu "
+"n’ait lieu."
+
+msgid ""
+"Draws a texture at a given position. The [param position] is defined in local "
+"space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"Dessine une texture à une position donnée. La [param position] est définie "
+"dans l’espace local.\n"
+"[b]Note :[/b] Les styleboxes, textures et meshes stockés uniquement dans des "
+"variables locales ne doivent [b]pas[/b] être utilisés avec cette méthode en "
+"GDScript, car l’opération de dessin ne commence pas immédiatement lorsque "
+"cette méthode est appelée. En GDScript, lorsque la fonction contenant les "
+"variables locales se termine, celles-ci sont détruites avant que le rendu "
+"n’ait lieu."
+
 msgid ""
 "Draws a textured rectangle at a given position, optionally modulated by a "
 "color. The [param rect] is defined in local space. If [param transpose] is "
@@ -29488,6 +29666,35 @@ msgstr ""
 "Si [code]true[/code], le matériau [member material] du [CanvasItem] parent "
 "est utilisé comme matériau de ce nœud."
 
+msgid ""
+"The rendering layer in which this [CanvasItem] is rendered by [Viewport] "
+"nodes. A [Viewport] will render a [CanvasItem] if it and all its parents "
+"share a layer with the [Viewport]'s canvas cull mask.\n"
+"[b]Note:[/b] A [CanvasItem] does not inherit its parents' visibility layers. "
+"This means that if a parent [CanvasItem] does not have all the same layers as "
+"its child, the child may not be visible even if both the parent and child "
+"have [member visible] set to [code]true[/code]. For example, if a parent has "
+"layer 1 and a child has layer 2, the child will not be visible in a "
+"[Viewport] with the canvas cull mask set to layer 1 or 2 (see [member "
+"Viewport.canvas_cull_mask]). To ensure that both the parent and child are "
+"visible, the parent must have both layers 1 and 2, or the child must have "
+"[member top_level] set to [code]true[/code]."
+msgstr ""
+"La couche de rendu dans laquelle ce [CanvasItem] est rendu par les nœuds "
+"[Viewport]. Un [Viewport] rendra un [CanvasItem] si celui-ci et tous ses "
+"parents partagent une couche avec le masque de culling du canvas du "
+"[Viewport].\n"
+"[b]Note :[/b] Un [CanvasItem] n’hérite pas des couches de visibilité de ses "
+"parents. Cela signifie que si un [CanvasItem] parent ne possède pas toutes "
+"les mêmes couches que son enfant, l’enfant peut ne pas être visible même si "
+"le parent et l’enfant ont tous deux [member visible] défini sur [code]true[/"
+"code]. Par exemple, si un parent est sur la couche 1 et un enfant sur la "
+"couche 2, l’enfant ne sera pas visible dans un [Viewport] dont le masque de "
+"culling du canvas est réglé sur la couche 1 ou 2 (voir [member "
+"Viewport.canvas_cull_mask]). Pour garantir que le parent et l’enfant soient "
+"visibles, le parent doit avoir à la fois les couches 1 et 2, ou l’enfant doit "
+"avoir [member top_level] défini sur [code]true[/code]."
+
 msgid ""
 "If [code]true[/code], this [CanvasItem] may be drawn. Whether this "
 "[CanvasItem] is actually drawn depends on the visibility of all of its "
@@ -30257,6 +30464,31 @@ msgstr ""
 "[member height] est inférieure à deux fois [member radius], les propriétés "
 "s'adaptent à une valeur valide."
 
+msgid "Rotation based cyclic coordinate descent inverse kinematics solver."
+msgstr ""
+"Solveur de cinématique inverse par descente cyclique des coordonnées, basé "
+"sur la rotation."
+
+msgid ""
+"[CCDIK3D] is rotation based IK, enabling fast and effective tracking even "
+"with large joint rotations. It's especially suitable for chains with "
+"limitations, providing smoother and more stable target tracking compared to "
+"[FABRIK3D].\n"
+"The resulting twist around the forward vector will always be kept from the "
+"previous pose.\n"
+"[b]Note:[/b] When the target is close to the root, it can cause unnatural "
+"movement, including joint flips and oscillations."
+msgstr ""
+"[CCDIK3D] est une IK basée sur la rotation, permettant un suivi rapide et "
+"efficace même avec de grandes rotations d’articulations. Elle est "
+"particulièrement adaptée aux chaînes avec des limitations, offrant un suivi "
+"de cible plus fluide et plus stable que [FABRIK3D].\n"
+"La torsion résultante autour du vecteur avant est toujours conservée à partir "
+"de la pose précédente.\n"
+"[b]Note :[/b] Lorsque la cible est proche de la racine, cela peut provoquer "
+"des mouvements non naturels, incluant des inversions d’articulations et des "
+"oscillations."
+
 msgid "A container that keeps child controls in its center."
 msgstr "Un conteneur qui maintient les contrôles enfants en son centre."
 
@@ -111955,9 +112187,6 @@ msgstr ""
 "Augmenter cette valeur améliorera la simulation résultante, mais peut "
 "affecter les performances. Utilisez avec parcimonie."
 
-msgid "The SoftBody3D's mass."
-msgstr "La masse du SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/doc/translations/ga.po b/engine/doc/translations/ga.po
index 7c282b81..327f1852 100644
--- a/engine/doc/translations/ga.po
+++ b/engine/doc/translations/ga.po
@@ -119766,9 +119766,6 @@ msgstr ""
 "Feabhsóidh an luach seo a mhéadú an insamhalta mar thoradh air, ach is féidir "
 "leis tionchar a imirt ar fheidhmíocht. Bain úsáid as go cúramach."
 
-msgid "The SoftBody3D's mass."
-msgstr "mais an SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/doc/translations/it.po b/engine/doc/translations/it.po
index 28abe57f..e92da44b 100644
--- a/engine/doc/translations/it.po
+++ b/engine/doc/translations/it.po
@@ -45,12 +45,13 @@
 # Daniel Colciaghi <danielcolciaghi@gmail.com>, 2025.
 # Rémi Verschelde <remi@godotengine.org>, 2026.
 # Alex B <alexius.barresi@gmail.com>, 2026.
+# Cristian Zerbinati <cristian.zerbinati@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-18 16:02+0000\n"
-"Last-Translator: Alex B <alexius.barresi@gmail.com>\n"
+"PO-Revision-Date: 2026-02-03 14:01+0000\n"
+"Last-Translator: Cristian Zerbinati <cristian.zerbinati@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/it/>\n"
 "Language: it\n"
@@ -58,7 +59,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "All classes"
 msgstr "Tutte le classi"
@@ -1663,6 +1664,30 @@ msgstr ""
 "@export var ungrouped_number = 3\n"
 "[/codeblock]"
 
+msgid ""
+"Export a [String], [Array][lb][String][rb], [PackedStringArray], [Dictionary] "
+"or [Array][lb][Dictionary][rb] property with a large [TextEdit] widget "
+"instead of a [LineEdit]. This adds support for multiline content and makes it "
+"easier to edit large amount of text stored in the property.\n"
+"See also [constant PROPERTY_HINT_MULTILINE_TEXT].\n"
+"[codeblock]\n"
+"@export_multiline var character_biography\n"
+"@export_multiline var npc_dialogs: Array[String]\n"
+"@export_multiline(\"monospace\", \"no_wrap\") var favorite_ascii_art: String\n"
+"[/codeblock]"
+msgstr ""
+"Esporta una proprietà [String], [Array][lb][String][rb], [PackedStringArray], "
+"[Dictionary] o [Array][lb][Dictionary][rb] con un widget [TextEdit] di grandi "
+"dimensioni invece che con un [LineEdit]. Ciò aggiunge il supporto per i "
+"contenuti su più righe e semplifica la modifica di grandi quantità di testo "
+"memorizzate nella proprietà.\n"
+"Vedi anche [constant PROPERTY_HINT_MULTILINE_TEXT].\n"
+"[codeblock]\n"
+"@export_multiline var character_biography\n"
+"@export_multiline var npc_dialogs: Array[String]\n"
+"@export_multiline(“monospace”, “no_wrap”) var favorite_ascii_art: String\n"
+"[/codeblock]"
+
 msgid ""
 "Export a [NodePath] or [Array][lb][NodePath][rb] property with a filter for "
 "allowed node types.\n"
@@ -1706,6 +1731,82 @@ msgstr ""
 "@export_placeholder(\"Name in lowercase\") var friend_ids: Array[String]\n"
 "[/codeblock]"
 
+msgid ""
+"Export an [int], [float], [Array][lb][int][rb], [Array][lb][float][rb], "
+"[PackedByteArray], [PackedInt32Array], [PackedInt64Array], "
+"[PackedFloat32Array], or [PackedFloat64Array] property as a range value. The "
+"range must be defined by [param min] and [param max], as well as an optional "
+"[param step] and a variety of extra hints. The [param step] defaults to "
+"[code]1[/code] for integer properties. For floating-point numbers this value "
+"depends on your [member EditorSettings.interface/inspector/"
+"default_float_step] setting.\n"
+"If hints [code]\"or_greater\"[/code] and [code]\"or_less\"[/code] are "
+"provided, the editor widget will not cap the value at range boundaries. The "
+"[code]\"exp\"[/code] hint will make the edited values on range to change "
+"exponentially. The [code]\"prefer_slider\"[/code] hint will make integer "
+"values use the slider instead of arrows for editing, while [code]"
+"\"hide_control\"[/code] will hide the element controlling the value of the "
+"editor widget.\n"
+"Hints also allow to indicate the units for the edited value. Using [code]"
+"\"radians_as_degrees\"[/code] you can specify that the actual value is in "
+"radians, but should be displayed in degrees in the Inspector dock (the range "
+"values are also in degrees). [code]\"degrees\"[/code] allows to add a degree "
+"sign as a unit suffix (the value is unchanged). Finally, a custom suffix can "
+"be provided using [code]\"suffix:unit\"[/code], where \"unit\" can be any "
+"string.\n"
+"See also [constant PROPERTY_HINT_RANGE].\n"
+"[codeblock]\n"
+"@export_range(0, 20) var number\n"
+"@export_range(-10, 20) var number\n"
+"@export_range(-10, 20, 0.2) var number: float\n"
+"@export_range(0, 20) var numbers: Array[float]\n"
+"\n"
+"@export_range(0, 100, 1, \"or_greater\") var power_percent\n"
+"@export_range(0, 100, 1, \"or_greater\", \"or_less\") var health_delta\n"
+"\n"
+"@export_range(-180, 180, 0.001, \"radians_as_degrees\") var angle_radians\n"
+"@export_range(0, 360, 1, \"degrees\") var angle_degrees\n"
+"@export_range(-8, 8, 2, \"suffix:px\") var target_offset\n"
+"[/codeblock]"
+msgstr ""
+"Esporta una proprietà [int], [float], [Array][lb][int][rb], [Array] [lb]"
+"[float][rb], [PackedByteArray], [PackedInt32Array], [PackedInt64Array], "
+"[PackedFloat32Array] o [PackedFloat64Array] come valore di intervallo. "
+"L'intervallo deve essere definito da [param min] e [param max], oltre che da "
+"un [param step] opzionale e da una serie di suggerimenti aggiuntivi. Il "
+"valore predefinito di [param step] è [code]1[/code] per le proprietà intere. "
+"Per i numeri in virgola mobile, questo valore dipende dall'impostazione "
+"[member EditorSettings.interface/inspector/default_float_step].\n"
+"Se vengono forniti i suggerimenti [code]\"or_greater\"[/code] e [code]"
+"\"or_less\"[/code], il widget dell'editor non limiterà il valore ai confini "
+"dell'intervallo. Il suggerimento [code]\"exp\"[/code] farà sì che i valori "
+"modificati nell'intervallo cambino in modo esponenziale. Il suggerimento "
+"[code]\"prefer_slider\"[/code] farà sì che i valori interi utilizzino il "
+"cursore invece delle frecce per la modifica, mentre [code]\"hide_control\"[/"
+"code] nasconderà l'elemento che controlla il valore del widget dell'editor.\n"
+"I suggerimenti consentono anche di indicare le unità di misura del valore "
+"modificato. Utilizzando [code]\"radians_as_degrees\"[/code] è possibile "
+"specificare che il valore effettivo è in radianti, ma deve essere "
+"visualizzato in gradi nel dock Inspector (anche i valori dell'intervallo sono "
+"in gradi). [code]\"degrees\"[/code] consente di aggiungere il simbolo dei "
+"gradi come suffisso dell'unità di misura (il valore rimane invariato). "
+"Infine, è possibile fornire un suffisso personalizzato utilizzando [code]"
+"\"suffix:unit\"[/code], dove \"unit\" può essere qualsiasi stringa.\n"
+"Vedi anche [constant PROPERTY_HINT_RANGE].\n"
+"[codeblock]\n"
+"@export_range(0, 20) var number\n"
+"@export_range(-10, 20) var number\n"
+"@export_range(-10, 20, 0.2) var number: float\n"
+"@export_range(0, 20) var numbers: Array[float]\n"
+"\n"
+"@export_range(0, 100, 1, \"or_greater\") var power_percent\n"
+"@export_range(0, 100, 1, \"or_greater\",\"or_less\") var health_delta\n"
+"\n"
+"@export_range(-180, 180, 0.001, \"radians_as_degrees\") var angle_radians\n"
+"@export_range(0, 360, 1, \"degrees\") var angle_degrees\n"
+"@export_range(-8, 8, 2, \"suffix:px\") var target_offset\n"
+"[/codeblock]"
+
 msgid ""
 "Export a property with [constant PROPERTY_USAGE_STORAGE] flag. The property "
 "is not displayed in the editor, but it is serialized and stored in the scene "
@@ -166006,9 +166107,6 @@ msgstr ""
 "Aumentare questo valore migliorerà la simulazione risultante, ma può influire "
 "sulle prestazioni. Usare con cautela."
 
-msgid "The SoftBody3D's mass."
-msgstr "La massa del SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/doc/translations/ko.po b/engine/doc/translations/ko.po
index 8b4a809e..b4a7df81 100644
--- a/engine/doc/translations/ko.po
+++ b/engine/doc/translations/ko.po
@@ -49,8 +49,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-24 03:31+0000\n"
-"Last-Translator: yoohyeon <yoohyeon0526@naver.com>\n"
+"PO-Revision-Date: 2026-02-04 18:02+0000\n"
+"Last-Translator: Myeongjin <aranet100@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/godot-"
 "class-reference/ko/>\n"
 "Language: ko\n"
@@ -734,7 +734,7 @@ msgstr ""
 "var diamond = preload(\"res://diamond.tscn\").instantiate()\n"
 "[/codeblock]\n"
 "[b]참고:[/b] [method preload]는 키워드이며 함수가 아닙니다. 따라서 [Callable]"
-"로 액세스할 수 없습니다."
+"로 접근할 수 없습니다."
 
 msgid ""
 "Like [method @GlobalScope.print], but includes the current stack frame when "
@@ -5744,13 +5744,13 @@ msgid "Generic error."
 msgstr "통용 오류."
 
 msgid "Unavailable error."
-msgstr "사용할 수 없음 오류."
+msgstr "사용 가능하지 않음 오류."
 
 msgid "Unconfigured error."
 msgstr "구성되지 않음 오류."
 
 msgid "Unauthorized error."
-msgstr "승인되지 않음 오류."
+msgstr "권한 없음 오류."
 
 msgid "Parameter range error."
 msgstr "매개변수 범위 오류."
@@ -5768,7 +5768,7 @@ msgid "File: Bad path error."
 msgstr "파일: 잘못된 경로 오류."
 
 msgid "File: No permission error."
-msgstr "파일: 권한이 없음 오류."
+msgstr "파일: 권한 없음 오류."
 
 msgid "File: Already in use error."
 msgstr "파일: 이미 사용 중 오류."
@@ -5789,16 +5789,16 @@ msgid "File: Corrupt error."
 msgstr "파일: 손상 오류."
 
 msgid "File: Missing dependencies error."
-msgstr "파일: 종속 관계 누락 오류."
+msgstr "파일: 종속성 누락 오류."
 
 msgid "File: End of file (EOF) error."
-msgstr "파일: End of file (EOF) 오류."
+msgstr "파일: 파일의 끝 (EOF) 오류."
 
 msgid "Can't open error."
 msgstr "열 수 없음 오류."
 
 msgid "Can't create error."
-msgstr "생성할 수 없음 오류."
+msgstr "만들 수 없음 오류."
 
 msgid "Query failed error."
 msgstr "쿼리 실패 오류."
@@ -5807,7 +5807,7 @@ msgid "Already in use error."
 msgstr "이미 사용 중 오류."
 
 msgid "Locked error."
-msgstr "잠금 오류."
+msgstr "잠김 오류."
 
 msgid "Timeout error."
 msgstr "시간 초과 오류."
@@ -5861,13 +5861,13 @@ msgid "Cycling link (import cycle) error."
 msgstr "순환 링크 (가져오기 순환) 오류."
 
 msgid "Invalid declaration error."
-msgstr "선언이 잘못됨 오류."
+msgstr "잘못된 선언 오류."
 
 msgid "Duplicate symbol error."
 msgstr "중복 기호 오류."
 
 msgid "Parse error."
-msgstr "파서 오류."
+msgstr "구문 분석 오류."
 
 msgid "Busy error."
 msgstr "바쁨 오류."
@@ -5880,7 +5880,7 @@ msgid ""
 "help[/code] as executable options."
 msgstr ""
 "도움말 오류. 실행 가능한 옵션으로 [code]--version[/code] 또는 [code]--help[/"
-"code]를 넘기기 위해 내부적으로 사용됩니다."
+"code]를 전달할 때 내부적으로 사용됩니다."
 
 msgid ""
 "Bug error, caused by an implementation issue in the method.\n"
@@ -5888,16 +5888,16 @@ msgid ""
 "[url=https://github.com/godotengine/godot/issues]the GitHub Issue Tracker[/"
 "url]."
 msgstr ""
-"메서드의 구현 이슈로 발생하는 버그 오류입니다.\n"
+"메서드에서 구현 이슈로 발생하는 버그 오류입니다.\n"
 "[b]참고:[/b] 내장 메서드가 이 코드를 반환한다면, [url=https://github.com/"
-"godotengine/godot/issues]GitHHub 이슈 추적기[/url]에서 이슈를 열어주세요."
+"godotengine/godot/issues]GitHub 이슈 트래커[/url]에서 이슈를 열어 주세요."
 
 msgid ""
 "Printer on fire error (This is an easter egg, no built-in methods return this "
 "error code)."
 msgstr ""
-"프린터에 불이 붙음 오류 (이것은 이스터 에그이며, 내장 메서드는 이 오류 코드를 "
-"반환하지 않습니다)."
+"프린터에 불이 붙음 오류 (이것은 이스터 에그이며, 이 오류 코드를 반환하는 내장 "
+"메서드는 없습니다)."
 
 msgid "The property has no hint for the editor."
 msgstr "속성이 편집기에 어떠한 힌트도 주지 않습니다."
@@ -5925,49 +5925,49 @@ msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 2D "
 "render layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 2D render 레이어를 사용한 비트 마스크라는 힌"
-"트를 줍니다."
+"[int] 속성이 선택적으로 이름 붙은 2D 렌더 레이어를 사용한 비트마스크라는 힌트"
+"를 줍니다."
 
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 2D "
 "physics layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 2D physics 레이어를 사용한 비트 마스크라는 "
-"힌트를 줍니다."
+"[int] 속성이 선택적으로 이름 붙은 2D 물리 레이어를 사용한 비트마스크라는 힌트"
+"를 줍니다."
 
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 2D "
 "navigation layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 2D navigation 레이어를 사용한 비트 마스크라"
+"[int] 속성이 선택적으로 이름 붙은 2D 내비게이션 레이어를 사용한 비트마스크라"
 "는 힌트를 줍니다."
 
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 3D "
 "render layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 3D render 레이어를 사용한 비트 마스크라는 힌"
-"트를 줍니다."
+"[int] 속성이 선택적으로 이름 붙은 3D 렌더 레이어를 사용한 비트마스크라는 힌트"
+"를 줍니다."
 
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 3D "
 "physics layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 3D physics 레이어를 사용한 비트 마스크라는 "
-"힌트를 줍니다."
+"[int] 속성이 선택적으로 이름 붙은 3D 물리 레이어를 사용한 비트마스크라는 힌트"
+"를 줍니다."
 
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 3D "
 "navigation layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 3D navigation 레이어를 사용한 비트 마스크라"
+"[int] 속성이 선택적으로 이름 붙은 3D 내비게이션 레이어를 사용한 비트마스크라"
 "는 힌트를 줍니다."
 
 msgid ""
 "Hints that an integer property is a bitmask using the optionally named "
 "avoidance layers."
 msgstr ""
-"[int] 속성이 선택적으로 이름 붙은 avoidance 레이어를 사용한 비트 마스크라는 힌"
+"[int] 속성이 선택적으로 이름 붙은 어보이던스 레이어를 사용한 비트마스크라는 힌"
 "트를 줍니다."
 
 msgid ""
@@ -10857,8 +10857,8 @@ msgid ""
 "Low-pass filter for feedback, in Hz. Frequencies below this value are "
 "filtered out of the source signal."
 msgstr ""
-"피드백에 대한 로우패스 필터 (Hz). 이 값 이하의 주파수는 원본 신호에서 필터링됩"
-"니다."
+"피드백에 대한 로우패스 필터, Hz 단위. 이 값 이하의 주파수는 원본 신호에서 필터"
+"링됩니다."
 
 msgid "If [code]true[/code], the first tap will be enabled."
 msgstr "[code]true[/code]이면 첫번째 탭이 활성화됩니다."
@@ -11358,7 +11358,7 @@ msgid ""
 "that the [BoneAttachment3D] node will either dynamically copy or override the "
 "3D transform of the selected bone."
 msgstr ""
-"이 노드는 [Skeleton3D]에서 본을 선택하여 첨부합니다. 이는 [BoneAttachment3D] "
+"이 노드는 [Skeleton3D]에서 본을 선택하여 부착합니다. 이는 [BoneAttachment3D] "
 "노드가 선택된 본의 3D 변형을 동적으로 복사하거나 오버라이드할 수 있다는 것을 "
 "뜻합니다."
 
@@ -11562,7 +11562,7 @@ msgid "The tint color to apply."
 msgstr "적용할 틴트 색상."
 
 msgid "A container that keeps child controls in its center."
-msgstr "자식 컨트롤을 중앙에 유지하는 컨테이너."
+msgstr "자식 컨트롤을 가운데에 유지하는 컨테이너."
 
 msgid "Kinematic character (2D)"
 msgstr "키네마틱 캐릭터 (2D)"
@@ -12392,6 +12392,9 @@ msgstr "2D 스켈레톤 편집기에서 역운동학이 활성화된 본에 사
 msgid "Maximum number of matches to show in dialog."
 msgstr "대화 상자에 보여줄 최대 일치 수."
 
+msgid "Tab style of editor docks, except bottom docks."
+msgstr "아래 독을 제외한 편집기 독의 탭 스타일."
+
 msgid ""
 "The language to use for the editor interface. If set to [b]Auto[/b], the "
 "language is automatically determined based on the system locale. See also "
@@ -12535,6 +12538,9 @@ msgstr "외부 텍스처 크기."
 msgid "Position based forward and backward reaching inverse kinematics solver."
 msgstr "위치 기반 전진 및 후진 도달 역운동학 솔버."
 
+msgid "Inverse Kinematics Returns to Godot 4.6 - IKModifier3D"
+msgstr "역운동학이 Godot 4.6에 돌아왔습니다 - IKModifier3D"
+
 msgid "Translate the noise input coordinates by the given [Vector3]."
 msgstr "주어진 [Vector3]로 노이즈 입력 좌표를 옮깁니다."
 
@@ -12772,6 +12778,17 @@ msgstr "[code]true[/code]이면 파일 필터 토글 버튼을 보여줍니다."
 msgid "If [code]true[/code], shows the file sorting options button."
 msgstr "[code]true[/code]이면 파일 정렬 옵션 버튼을 보여줍니다."
 
+msgid ""
+"If [code]true[/code], shows the button for creating new directories (when "
+"using [constant FILE_MODE_OPEN_DIR], [constant FILE_MODE_OPEN_ANY], or "
+"[constant FILE_MODE_SAVE_FILE]), and the context menu will have the \"New "
+"Folder...\" option."
+msgstr ""
+"[code]true[/code]이면 ([constant FILE_MODE_OPEN_DIR], [constant "
+"FILE_MODE_OPEN_ANY], 또는 [constant FILE_MODE_SAVE_FILE]을 사용할 때) 새로운 "
+"디렉터리를 만들기 위한 버튼을 보여주고 컨텍스트 메뉴에 \"새 폴더...\" 옵션을 "
+"가집니다."
+
 msgid "If [code]true[/code], shows the toggle hidden files button."
 msgstr "[code]true[/code]이면 숨긴 파일 토글 버튼을 보여줍니다."
 
@@ -12799,7 +12816,7 @@ msgid ""
 "[b]Note:[/b] This property is ignored by native file dialogs."
 msgstr ""
 "비어 있지 않으면 주어진 하위 폴더가 [FileDialog]의 \"루트\"가 됩니다. 즉, 사용"
-"자는 상위 디렉토리로 이동할 수 없습니다.\n"
+"자는 상위 디렉터리로 이동할 수 없습니다.\n"
 "[b]참고:[/b] 이 속성은 네이티브 파일 대화 상자에서는 무시됩니다."
 
 msgid ""
@@ -15279,28 +15296,28 @@ msgid "If [code]true[/code], collisions with [PhysicsBody3D]s will be reported."
 msgstr "[code]true[/code]이면 [PhysicsBody3D]와의 콜리전이 보고됩니다."
 
 msgid "Attachment format (used by [RenderingDevice])."
-msgstr "첨부 형식 ([RenderingDevice]에 의해 사용됨)."
+msgstr "부착 형식 ([RenderingDevice]에 의해 사용됨)."
 
 msgid "The attachment's data format."
-msgstr "첨부의 데이터 헝식."
+msgstr "부착의 데이터 헝식."
 
 msgid "The number of samples used when sampling the attachment."
-msgstr "첨부를 샘플링할 때 사용되는 샘플의 수."
+msgstr "부착을 샘플링할 때 사용되는 샘플의 수."
 
 msgid "The attachment's usage flags, which determine what can be done with it."
-msgstr "첨부로 무엇을 할 수 있는지를 결정하는 첨부의 사용 플래그."
+msgstr "부착으로 무엇을 할 수 있는지를 결정하는 부착의 사용 플래그."
 
 msgid "Framebuffer pass attachment description (used by [RenderingDevice])."
-msgstr "프레임버퍼 패스 첨부 설명 ([RenderingDevice]에 의해 사용됨)."
+msgstr "프레임버퍼 패스 부착 설명 ([RenderingDevice]에 의해 사용됨)."
 
 msgid "Attachment is unused."
-msgstr "첨부가 사용되지 않습니다."
+msgstr "부착이 사용되지 않습니다."
 
 msgid "The attachments that are blended together."
-msgstr "함께 블렌딩된 첨부."
+msgstr "함께 블렌딩된 부착."
 
 msgid "Pipeline color blend state attachment (used by [RenderingDevice])."
-msgstr "파이프라인 색상 블렌드 상태 첨부 ([RenderingDevice]에 의해 사용됨)."
+msgstr "파이프라인 색상 블렌드 상태 부착 ([RenderingDevice]에 의해 사용됨)."
 
 msgid ""
 "The cull mode to use when drawing polygons, which determines whether front "
@@ -15593,13 +15610,17 @@ msgid "Represents the size of the [enum TextureSamples] enum."
 msgstr "[enum TextureSamples] 열거형의 크기를 나타냅니다."
 
 msgid "Texture can be sampled."
-msgstr "텍스처를 샘플링할 수 있습니다."
+msgstr "텍스처는 샘플링될 수 있습니다."
 
 msgid "Texture can be used as a color attachment in a framebuffer."
-msgstr "텍스처는 프레임버퍼에서 색상 첨부로 사용될 수 있습니다."
+msgstr "텍스처는 프레임버퍼에서 색상 부착으로 사용될 수 있습니다."
 
 msgid "Texture can be used as a depth/stencil attachment in a framebuffer."
-msgstr "텍스처는 프레임버퍼에서 깊이/스텐실 첨부로 사용될 수 있습니다."
+msgstr "텍스처는 프레임버퍼에서 깊이/스텐실 부착으로 사용될 수 있습니다."
+
+msgid ""
+"Texture can be used as a depth/stencil resolve attachment in a framebuffer."
+msgstr "텍스처는 프레임버퍼에서 깊이/스텐실 해결 부착으로 사용될 수 있습니다."
 
 msgid ""
 "Texture can be used as a [url=https://registry.khronos.org/vulkan/specs/1.3-"
@@ -15618,6 +15639,13 @@ msgstr ""
 "1.3-extensions/html/vkspec.html#descriptorsets-storageimage]저장공간 이미지[/"
 "url]로 사용될 수 있습니다."
 
+msgid ""
+"Texture can be read back on the CPU using [method texture_get_data] faster "
+"than without this bit, since it is always kept in the system memory."
+msgstr ""
+"텍스처는 항상 시스템 메모리에 유지되므로, 이 비트가 없을 때보다 CPU에서 "
+"[method texture_get_data]를 사용하여 더 빠르게 읽어올 수 있습니다."
+
 msgid "Texture can be updated using [method texture_update]."
 msgstr "텍스처는 [method texture_update]를 사용하여 업데이트될 수 있습니다."
 
@@ -15633,8 +15661,8 @@ msgid ""
 "url] in a framebuffer."
 msgstr ""
 "텍스처는 프레임버퍼에서 [url=https://registry.khronos.org/vulkan/specs/1.3-"
-"extensions/html/vkspec.html#descriptorsets-inputattachment]입력 첨부[/url]로 "
-"사용될 수 있습니다."
+"extensions/html/vkspec.html#descriptorsets-inputattachment]입력 부착[/url]으"
+"로 사용될 수 있습니다."
 
 msgid "Return the sampled value as-is."
 msgstr "샘플링된 값을 그대로 반환합니다."
@@ -15676,7 +15704,7 @@ msgid "Represents the size of the [enum SamplerBorderColor] enum."
 msgstr "[enum SamplerBorderColor] 열거형의 크기를 나타냅니다."
 
 msgid "Input attachment uniform."
-msgstr "입력 첨부 유니폼."
+msgstr "입력 부착 유니폼."
 
 msgid "Represents the size of the [enum UniformType] enum."
 msgstr "[enum UniformType] 열거형의 크기를 나타냅니다."
@@ -15741,7 +15769,7 @@ msgstr "MetalFX 공간 업스케일링에 대한 지원."
 msgid ""
 "Maximum number of color framebuffer attachments that can be used at a given "
 "time."
-msgstr "주어진 시간에 사용할 수 있는 컬러 프레임버퍼 첨부의 최대 수."
+msgstr "주어진 시간에 사용할 수 있는 컬러 프레임버퍼 부착의 최대 수."
 
 msgid "Maximum number of texture array layers."
 msgstr "텍스처 배열 레이어의 최대 수."
@@ -15789,79 +15817,79 @@ msgid "Memory taken by buffers."
 msgstr "버퍼가 차지하는 메모리."
 
 msgid "Do not clear or ignore any attachments."
-msgstr "첨부를 비우거나 무시하지 않습니다."
+msgstr "부착을 비우거나 무시하지 않습니다."
 
 msgid "Clear the first color attachment."
-msgstr "첫 번째 색상 첨부를 비웁니다."
+msgstr "첫 번째 색상 부착을 비웁니다."
 
 msgid "Clear the second color attachment."
-msgstr "두 번째 색상 첨부를 비웁니다."
+msgstr "두 번째 색상 부착을 비웁니다."
 
 msgid "Clear the third color attachment."
-msgstr "세 번째 색상 첨부를 비웁니다."
+msgstr "세 번째 색상 부착을 비웁니다."
 
 msgid "Clear the fourth color attachment."
-msgstr "네 번째 색상 첨부를 비웁니다."
+msgstr "네 번째 색상 부착을 비웁니다."
 
 msgid "Clear the fifth color attachment."
-msgstr "다섯 번째 색상 첨부를 비웁니다."
+msgstr "다섯 번째 색상 부착을 비웁니다."
 
 msgid "Clear the sixth color attachment."
-msgstr "여섯 번째 색상 첨부를 비웁니다."
+msgstr "여섯 번째 색상 부착을 비웁니다."
 
 msgid "Clear the seventh color attachment."
-msgstr "일곱 번째 색상 첨부를 비웁니다."
+msgstr "일곱 번째 색상 부착을 비웁니다."
 
 msgid "Clear the eighth color attachment."
-msgstr "여덟 번째 색상 첨부를 비웁니다."
+msgstr "여덟 번째 색상 부착을 비웁니다."
 
 msgid "Mask for clearing all color attachments."
-msgstr "모든 색상 첨부를 비우기 위한 마스크."
+msgstr "모든 색상 부착을 비우기 위한 마스크."
 
 msgid "Clear all color attachments."
-msgstr "모든 색상 첨부를 비웁니다."
+msgstr "모든 색상 부착을 비웁니다."
 
 msgid "Ignore the previous contents of the first color attachment."
-msgstr "첫 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "첫 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the second color attachment."
-msgstr "두 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "두 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the third color attachment."
-msgstr "세 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "세 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the fourth color attachment."
-msgstr "네 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "네 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the fifth color attachment."
-msgstr "다섯 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "다섯 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the sixth color attachment."
-msgstr "여섯 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "여섯 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the seventh color attachment."
-msgstr "일곱 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "일곱 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Ignore the previous contents of the eighth color attachment."
-msgstr "여덟 번째 색상 첨부의 이전 내용을 무시합니다."
+msgstr "여덟 번째 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Mask for ignoring all the previous contents of the color attachments."
-msgstr "모든 색상 첨부의 이전 내용을 무시하기 위한 마스크."
+msgstr "모든 색상 부착의 이전 내용을 무시하기 위한 마스크."
 
 msgid "Ignore the previous contents of all color attachments."
-msgstr "모든 색상 첨부의 이전 내용을 무시합니다."
+msgstr "모든 색상 부착의 이전 내용을 무시합니다."
 
 msgid "Clear the depth attachment."
-msgstr "깊이 첨부를 비웁니다."
+msgstr "깊이 부착을 비웁니다."
 
 msgid "Ignore the previous contents of the depth attachment."
-msgstr "깊이 첨부의 이전 내용을 무시합니다."
+msgstr "깊이 부착의 이전 내용을 무시합니다."
 
 msgid "Clear all attachments."
-msgstr "모든 첨부를 비웁니다."
+msgstr "모든 부착을 비웁니다."
 
 msgid "Ignore the previous contents of all attachments."
-msgstr "모든 첨부의 이전 내용을 무시합니다."
+msgstr "모든 부착의 이전 내용을 무시합니다."
 
 msgid "Sets the visibility of the [CanvasItem]."
 msgstr "[CanvasItem]의 가시성을 지정합니다."
@@ -16477,7 +16505,7 @@ msgid ""
 "be attached to."
 msgstr ""
 "표면 버텍스의 고정된 상태를 설정합니다. [code]true[/code]로 설정할 때, 선택적 "
-"[param attachment_path]는 고정된 버텍스가 첨부될 [Node3D]를 정의할 수 있습니"
+"[param attachment_path]는 고정된 버텍스가 부착될 [Node3D]를 정의할 수 있습니"
 "다."
 
 msgid "Full height of the sphere."
diff --git a/engine/doc/translations/ru.po b/engine/doc/translations/ru.po
index f3b1d04f..4b3f55ed 100644
--- a/engine/doc/translations/ru.po
+++ b/engine/doc/translations/ru.po
@@ -144,7 +144,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-19 09:52+0000\n"
+"PO-Revision-Date: 2026-02-05 19:02+0000\n"
 "Last-Translator: JekSun97 <jeksun2022@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/ru/>\n"
@@ -68848,6 +68848,250 @@ msgstr ""
 "Плагин для добавления пользовательских парсеров для извлечения строк, которые "
 "необходимо перевести, из пользовательских файлов (.csv, .json и т. д.)."
 
+msgid ""
+"[EditorTranslationParserPlugin] is invoked when a file is being parsed to "
+"extract strings that require translation. To define the parsing and string "
+"extraction logic, override the [method _parse_file] method in script.\n"
+"The return value should be an [Array] of [PackedStringArray]s, one for each "
+"extracted translatable string. Each entry should contain [code][msgid, "
+"msgctxt, msgid_plural, comment, source_line][/code], where all except "
+"[code]msgid[/code] are optional. Empty strings will be ignored.\n"
+"The extracted strings will be written into a translation template file "
+"selected by user under \"Template Generation\" in \"Localization\" tab in "
+"\"Project Settings\" menu.\n"
+"Below shows an example of a custom parser that extracts strings from a CSV "
+"file to write into a template.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"\tvar ret: Array[PackedStringArray] = []\n"
+"\tvar file = FileAccess.open(path, FileAccess.READ)\n"
+"\tvar text = file.get_as_text()\n"
+"\tvar split_strs = text.split(\",\", false)\n"
+"\tfor s in split_strs:\n"
+"\t\tret.append(PackedStringArray([s]))\n"
+"\t\t#print(\"Extracted string: \" + s)\n"
+"\n"
+"\treturn ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"\tpublic override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<string[]> ret;\n"
+"\t\tusing var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"\t\tstring text = file.GetAsText();\n"
+"\t\tstring[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"\t\tforeach (string s in splitStrs)\n"
+"\t\t{\n"
+"\t\t\tret.Add([s]);\n"
+"\t\t\t//GD.Print($\"Extracted string: {s}\");\n"
+"\t\t}\n"
+"\t\treturn ret;\n"
+"\t}\n"
+"\n"
+"\tpublic override string[] _GetRecognizedExtensions()\n"
+"\t{\n"
+"\t\treturn [\"csv\"];\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To add a translatable string associated with a context, plural, comment, or "
+"source line:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", comment \"test 1 comment\", and source line "
+"\"7\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\", \"7\"]))\n"
+"# This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", comment \"test 1 comment\", and source line "
+"\"7\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\", "
+"\"7\"]);\n"
+"// This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you override parsing logic for standard script types "
+"(GDScript, C#, etc.), it would be better to load the [code]path[/code] "
+"argument using [method ResourceLoader.load]. This is because built-in scripts "
+"are loaded as [Resource] type, not [FileAccess] type. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"\tvar res = ResourceLoader.load(path, \"Script\")\n"
+"\tvar text = res.source_code\n"
+"\t# Parsing logic.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"\tvar res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"\tstring text = res.SourceCode;\n"
+"\t// Parsing logic.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"\treturn [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To use [EditorTranslationParserPlugin], register it using the [method "
+"EditorPlugin.add_translation_parser_plugin] method first."
+msgstr ""
+"[EditorTranslationParserPlugin] вызывается при разборе файла для извлечения "
+"строк, требующих перевода. Для определения логики разбора и извлечения строк "
+"переопределите метод [method _parse_file] в скрипте.\n"
+"Возвращаемое значение должно представлять собой массив [Array] из "
+"[PackedStringArray], по одному для каждой извлеченной переводимой строки. "
+"Каждая запись должна содержать [code][msgid, msgctxt, msgid_plural, comment, "
+"source_line][/code], где все, кроме [code]msgid[/code], являются "
+"необязательными. Пустые строки будут игнорироваться.\n"
+"Извлеченные строки будут записаны в файл шаблона перевода, выбранный "
+"пользователем в разделе «Генерация шаблонов» на вкладке «Локализация» в меню "
+"«Настройки проекта».\n"
+"Ниже приведен пример пользовательского парсера, который извлекает строки из "
+"CSV-файла для записи в шаблон.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"\tvar ret: Array[PackedStringArray] = []\n"
+"\tvar file = FileAccess.open(path, FileAccess.READ)\n"
+"\tvar text = file.get_as_text()\n"
+"\tvar split_strs = text.split(\",\", false)\n"
+"\tfor s in split_strs:\n"
+"\t\tret.append(PackedStringArray([s]))\n"
+"\t\t#print(\"Извлеченная строка: \" + s)\n"
+"\n"
+"\treturn ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"\tpublic override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<string[]> ret;\n"
+"\t\tusing var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"\t\tstring text = file.GetAsText();\n"
+"\t\tstring[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"\t\tforeach (string s in splitStrs)\n"
+"\t\t{\n"
+"\t\t\tret.Add([s]);\n"
+"\t\t\t//GD.Print($\"Извлеченная строка: {s}\");\n"
+"\t\t}\n"
+"\t\treturn ret;\n"
+"\t}\n"
+"\n"
+"\tpublic override string[] _GetRecognizedExtensions()\n"
+"\t{\n"
+"\t\treturn [\"csv\"];\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Чтобы добавить переводимую строку, связанную с контекстом, множественным "
+"числом, комментарием или исходной строкой:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Это добавит сообщение с msgid \"Test 1\", msgctxt \"context\", msgid_plural "
+"\"test 1 plurals\", comment \"test 1 comment\" и строкой источника \"7\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\", \"7\"]))\n"
+"# Это добавит сообщение с идентификатором msgid \"Тест без контекста\" и "
+"значением msgid_plural \"множественное число\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# Это добавит сообщение с идентификатором msgid \"Только с контекстом\" и "
+"текстом msgctxt \"дружественный контекст\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Это добавит сообщение с msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", comment \"test 1 comment\" и строкой "
+"источника \"7\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\", "
+"\"7\"]);\n"
+"// Это добавит сообщение с идентификатором msgid \"Тест без контекста\" и "
+"значением msgid_plural \"множественное число\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// Это добавит сообщение с идентификатором msgid \"Только с контекстом\" и "
+"текстом msgctxt \"дружественный контекст\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Если вы переопределяете логику парсинга для стандартных "
+"типов скриптов (GDScript, C# и т. д.), лучше загружать аргумент [code]path[/"
+"code] с помощью [method ResourceLoader.load]. Это связано с тем, что "
+"встроенные скрипты загружаются как тип [Resource], а не [FileAccess]. "
+"Например:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"\tvar res = ResourceLoader.load(path, \"Script\")\n"
+"\tvar text = res.source_code\n"
+"\t# Логика синтаксического анализа.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"\tvar res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"\tstring text = res.SourceCode;\n"
+"\t// Логика синтаксического анализа.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"\treturn [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Чтобы использовать [EditorTranslationParserPlugin], сначала зарегистрируйте "
+"его с помощью [method EditorPlugin.add_translation_parser_plugin]."
+
 msgid ""
 "Gets the list of file extensions to associate with this parser, e.g. [code]"
 "[\"csv\"][/code]."
@@ -71001,6 +71245,59 @@ msgstr ""
 "интерполяции физики или в сетевой игре рекомендуется отключить исправление "
 "физического дрожания, установив это свойство в [code]0[/code]."
 
+msgid ""
+"The number of fixed iterations per second. This controls how often physics "
+"simulation and the [method Node._physics_process] method are run.\n"
+"CPU usage scales approximately with the physics tick rate. However, at very "
+"low tick rates (usually below 30), physics behavior can break down. Input can "
+"also become less responsive at low tick rates as there can be a gap between "
+"input being registered, and the response on the next physics tick. High tick "
+"rates give more accurate physics simulation, particularly for fast moving "
+"objects. For example, racing games may benefit from increasing the tick rate "
+"above the default 60.\n"
+"See also [member max_fps] and [member ProjectSettings.physics/common/"
+"physics_ticks_per_second].\n"
+"[b]Note:[/b] Only [member max_physics_steps_per_frame] physics ticks may be "
+"simulated per rendered frame at most. If more physics ticks have to be "
+"simulated per rendered frame to keep up with rendering, the project will "
+"appear to slow down (even if [code]delta[/code] is used consistently in "
+"physics calculations). Therefore, it is recommended to also increase [member "
+"max_physics_steps_per_frame] if increasing [member physics_ticks_per_second] "
+"significantly above its default value.\n"
+"[b]Note:[/b] Consider enabling [url=$DOCS_URL/tutorials/physics/interpolation/"
+"index.html]physics interpolation[/url] if you change [member "
+"physics_ticks_per_second] to a value that is not a multiple of [code]60[/"
+"code]. Using physics interpolation will avoid jittering when the monitor "
+"refresh rate and physics update rate don't exactly match."
+msgstr ""
+"Количество фиксированных итераций в секунду. Этот параметр определяет, как "
+"часто запускаются моделирование физики и метод [method "
+"Node._physics_process].\n"
+"Использование ЦП приблизительно зависит от частоты обновления физики. Однако "
+"при очень низкой частоте обновления (обычно ниже 30) поведение физики может "
+"нарушаться. При низкой частоте обновления ввод также может стать менее "
+"отзывчивым, поскольку может возникнуть разрыв между регистрацией ввода и "
+"ответом на следующий такт обновления физики. Высокая частота обновления "
+"обеспечивает более точное моделирование физики, особенно для быстро "
+"движущихся объектов. Например, в гоночных играх может быть полезно увеличить "
+"частоту обновления выше значения по умолчанию (60).\n"
+"См. также [member max_fps] и [member ProjectSettings.physics/common/"
+"physics_ticks_per_second].\n"
+"[b]Примечание:[/b] За один отрендеренный кадр может быть смоделировано "
+"максимум [member max_physics_steps_per_frame] тактов физики. Если для "
+"обеспечения корректной работы рендеринга требуется больше физических тиков на "
+"каждый отрендеренный кадр, проект будет казаться замедленным (даже если "
+"[code]delta[/code] постоянно используется в физических расчетах). Поэтому "
+"рекомендуется также увеличить [member max_physics_steps_per_frame], если "
+"[member physics_ticks_per_second] значительно превышает значение по "
+"умолчанию.\n"
+"[b]Примечание:[/b] Рекомендуется включить [url=$DOCS_URL/tutorials/physics/"
+"interpolation/index.html]интерполяцию физики[/url], если вы изменяете [member "
+"physics_ticks_per_second] на значение, не кратное [code]60[/code]. "
+"Использование интерполяции физики позволит избежать дрожания изображения, "
+"когда частота обновления монитора и частота обновления физики не совпадают "
+"точно."
+
 msgid ""
 "If [code]false[/code], stops printing error and warning messages to the "
 "console and editor Output log. This can be used to hide error and warning "
@@ -72991,6 +73288,9 @@ msgstr ""
 "создает зигзагообразные узоры, что приводит к неестественному визуальному "
 "движению."
 
+msgid "Inverse Kinematics Returns to Godot 4.6 - IKModifier3D"
+msgstr "Обратная кинематика возвращается в Godot 4.6 - IKModifier3D"
+
 msgid "Generates noise using the FastNoiseLite library."
 msgstr "Генерирует шум с помощью библиотеки FastNoiseLite."
 
@@ -98734,17 +99034,6 @@ msgstr ""
 "Ось первого вращения. Этот [SkeletonModifier3D] работает, компонуя вращение "
 "по углам Эйлера, чтобы предотвратить вращение [member forward_axis]."
 
-msgid ""
-"The relative option. If [code]true[/code], the rotation is applied relative "
-"to the pose. If [code]false[/code], the rotation is applied relative to the "
-"rest. It means to replace the current pose with the [LookAtModifier3D]'s "
-"result."
-msgstr ""
-"Относительная опция. Если [code]true[/code], вращение применяется "
-"относительно позы. Если [code]false[/code], вращение применяется относительно "
-"всего остального. Это означает замену текущей позы результатом "
-"[LookAtModifier3D]."
-
 msgid "The threshold to start damping for [member secondary_limit_angle]."
 msgstr ""
 "Пороговое значение для начала демпфирования [member secondary_limit_angle]."
@@ -98805,30 +99094,6 @@ msgid ""
 msgstr ""
 "Тип перехода временной интерполяции. См. также [enum Tween.TransitionType]."
 
-msgid ""
-"If [code]true[/code], limits the amount of rotation. For example, this helps "
-"to prevent a character's neck from rotating 360 degrees.\n"
-"[b]Note:[/b] As with [AnimationTree] blending, interpolation is provided that "
-"favors [method Skeleton3D.get_bone_rest]. This means that interpolation does "
-"not select the shortest path in some cases.\n"
-"[b]Note:[/b] Some values for [member transition_type] (such as [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC], and [constant "
-"Tween.TRANS_SPRING]) may exceed the limitations. If interpolation occurs "
-"while overshooting the limitations, the result might not respect the bone "
-"rest."
-msgstr ""
-"Если [code]true[/code], ограничивается величина вращения. Например, это "
-"помогает предотвратить вращение шеи персонажа на 360 градусов.\n"
-"[b]Примечание:[/b] Как и в случае смешивания [AnimationTree], предоставляется "
-"интерполяция, которая отдаёт предпочтение [method Skeleton3D.get_bone_rest]. "
-"Это означает, что в некоторых случаях интерполяция не выбирает кратчайший "
-"путь.\n"
-"[b]Примечание:[/b] Некоторые значения [member transition_type] (например, "
-"[constant Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC] и [constant "
-"Tween.TRANS_SPRING]) могут превышать ограничения. Если интерполяция "
-"происходит с превышением ограничений, результат может не учитывать опору "
-"кости."
-
 msgid "If [code]true[/code], provides rotation by two axes."
 msgstr "Если [code]true[/code], обеспечивает вращение по двум осям."
 
@@ -101904,6 +102169,25 @@ msgstr ""
 msgid "Node that instances a [MultiMesh] in 2D."
 msgstr "Узел, который создает экземпляр [MultiMesh] в 2D."
 
+msgid ""
+"[MultiMeshInstance2D] is a specialized node to instance a [MultiMesh] "
+"resource in 2D. This can be faster to render compared to displaying many "
+"[Sprite2D] nodes with large transparent areas, especially if the nodes take "
+"up a lot of space on screen at high viewport resolutions. This is because "
+"using a mesh designed to fit the sprites' opaque areas will reduce GPU fill "
+"rate utilization (at the cost of increased vertex processing utilization).\n"
+"Usage is the same as [MultiMeshInstance3D]."
+msgstr ""
+"[MultiMeshInstance2D] — это специализированный узел для создания экземпляра "
+"ресурса [MultiMesh] в 2D. Это может ускорить рендеринг по сравнению с "
+"отображением множества узлов [Sprite2D] с большими прозрачными областями, "
+"особенно если узлы занимают много места на экране при высоком разрешении "
+"области просмотра. Это связано с тем, что использование сетки, разработанной "
+"для соответствия непрозрачным областям спрайтов, снизит использование "
+"коэффициента заполнения GPU (за счет увеличения использования вершинной "
+"обработки).\n"
+"Использование аналогично [MultiMeshInstance3D]."
+
 msgid "The [MultiMesh] that will be drawn by the [MultiMeshInstance2D]."
 msgstr "[MultiMesh], который будет отрисован [MultiMeshInstance2D]."
 
@@ -110809,6 +111093,28 @@ msgstr ""
 "зарезервирован для автоматически сгенерированных имен. См. также [method "
 "String.validate_node_name]."
 
+msgid ""
+"The owner of this node. The owner must be an ancestor of this node. When "
+"packing the owner node in a [PackedScene], all the nodes it owns are also "
+"saved with it. See also [member unique_name_in_owner].\n"
+"[b]Note:[/b] In the editor, nodes not owned by the scene root are usually not "
+"displayed in the Scene dock, and will [b]not[/b] be saved. To prevent this, "
+"remember to set the owner after calling [method add_child].\n"
+"[b]Note:[/b] The owner needs to be the current scene root. See [url=$DOCS_URL/"
+"tutorials/plugins/running_code_in_the_editor.html#instancing-"
+"scenes]Instancing scenes[/url] in the documentation for more information."
+msgstr ""
+"Владелец этого узла. Владелец должен быть предком этого узла. При упаковке "
+"узла-владельца в [PackedScene] все принадлежащие ему узлы также сохраняются "
+"вместе с ним. См. также [member unique_name_in_owner].\n"
+"[b]Примечание:[/b] В редакторе узлы, не принадлежащие корневому узлу сцены, "
+"обычно не отображаются в панели сцен и не будут [b]сохранены[/b]. Чтобы этого "
+"избежать, не забудьте установить владельца после вызова [method add_child].\n"
+"[b]Примечание:[/b] Владельцем должен быть текущий корневой узел сцены. См. "
+"[url=$DOCS_URL/tutorials/plugins/running_code_in_the_editor.html#instancing-"
+"scenes]Создание экземпляров сцен[/url] в документации для получения "
+"дополнительной информации."
+
 msgid ""
 "The physics interpolation mode to use for this node. Only effective if "
 "[member ProjectSettings.physics/common/physics_interpolation] or [member "
@@ -114099,6 +114405,135 @@ msgstr ""
 "Цепочка вызовов остановится на первом классе, который вернет значение, "
 "отличное от [code]null[/code]."
 
+msgid ""
+"Override this method to customize the behavior of [method set]. Should set "
+"the [param property] to [param value] and return [code]true[/code], or "
+"[code]false[/code] if the [param property] should be handled normally. The "
+"[i]exact[/i] way to set the [param property] is up to this method's "
+"implementation.\n"
+"Combined with [method _get] and [method _get_property_list], this method "
+"allows defining custom properties, which is particularly useful for editor "
+"plugins.\n"
+"[b]Note:[/b] This method is not called when setting built-in properties of an "
+"object, including properties defined with [annotation @GDScript.@export].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var internal_data = {}\n"
+"\n"
+"func _set(property, value):\n"
+"\tif property == \"fake_property\":\n"
+"\t\t# Storing the value in the fake property.\n"
+"\t\tinternal_data[\"fake_property\"] = value\n"
+"\t\treturn true\n"
+"\treturn false\n"
+"\n"
+"func _get_property_list():\n"
+"\treturn [\n"
+"\t\t{ \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"\t]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Godot.Collections.Dictionary _internalData = new "
+"Godot.Collections.Dictionary();\n"
+"\n"
+"public override bool _Set(StringName property, Variant value)\n"
+"{\n"
+"\tif (property == \"FakeProperty\")\n"
+"\t{\n"
+"\t\t// Storing the value in the fake property.\n"
+"\t\t_internalData[\"FakeProperty\"] = value;\n"
+"\t\treturn true;\n"
+"\t}\n"
+"\n"
+"\treturn false;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"\treturn\n"
+"\t[\n"
+"\t\tnew Godot.Collections.Dictionary()\n"
+"\t\t{\n"
+"\t\t\t{ \"name\", \"FakeProperty\" },\n"
+"\t\t\t{ \"type\", (int)Variant.Type.Int },\n"
+"\t\t},\n"
+"\t];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Unlike other virtual methods, this method is called "
+"automatically for every script that overrides it. This means that the base "
+"implementation should not be called via [code]super[/code] in GDScript or its "
+"equivalents in other languages. The bottom-most sub-class will be called "
+"first, with subsequent calls ascending the class hierarchy. The call chain "
+"will stop on the first class that returns [code]true[/code]."
+msgstr ""
+"Переопределите этот метод, чтобы настроить поведение [method set]. Он должен "
+"устанавливать [param property] в [param value] и возвращать [code]true[/code] "
+"или [code]false[/code], если [param property] должен обрабатываться обычным "
+"образом. [i]Точный[/i] способ установки [param property] зависит от "
+"реализации этого метода.\n"
+"В сочетании с [method _get] и [method _get_property_list] этот метод "
+"позволяет определять пользовательские свойства, что особенно полезно для "
+"плагинов редактора.\n"
+"[b]Примечание:[/b] Этот метод не вызывается при установке встроенных свойств "
+"объекта, включая свойства, определенные с помощью [annotation "
+"@GDScript.@export].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var internal_data = {}\n"
+"\n"
+"func _set(property, value):\n"
+"\tif property == \"fake_property\":\n"
+"\t\t# Сохранение значения в fake_property.\n"
+"\t\tinternal_data[\"fake_property\"] = value\n"
+"\t\treturn true\n"
+"\treturn false\n"
+"\n"
+"func _get_property_list():\n"
+"\treturn [\n"
+"\t\t{ \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"\t]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Godot.Collections.Dictionary _internalData = new "
+"Godot.Collections.Dictionary();\n"
+"\n"
+"public override bool _Set(StringName property, Variant value)\n"
+"{\n"
+"\tif (property == \"FakeProperty\")\n"
+"\t{\n"
+"\t\t// Сохранение значения в FakeProperty.\n"
+"\t\t_internalData[\"FakeProperty\"] = value;\n"
+"\t\treturn true;\n"
+"\t}\n"
+"\n"
+"\treturn false;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"\treturn\n"
+"\t[\n"
+"\t\tnew Godot.Collections.Dictionary()\n"
+"\t\t{\n"
+"\t\t\t{ \"name\", \"FakeProperty\" },\n"
+"\t\t\t{ \"type\", (int)Variant.Type.Int },\n"
+"\t\t},\n"
+"\t];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] В отличие от других виртуальных методов, этот метод "
+"вызывается автоматически для каждого скрипта, который его переопределяет. Это "
+"означает, что базовую реализацию не следует вызывать через [code]super[/code] "
+"в GDScript или его эквивалентах в других языках. Первым будет вызван самый "
+"нижний подкласс, а последующие вызовы будут происходить по иерархии классов. "
+"Цепочка вызовов остановится на первом классе, который вернет [code]true[/"
+"code]."
+
 msgid ""
 "Override this method to customize the return value of [method to_string], and "
 "therefore the object's representation as a [String].\n"
@@ -114327,6 +114762,95 @@ msgstr ""
 "классе [code]MethodName[/code], чтобы избежать выделения нового [StringName] "
 "при каждом вызове."
 
+msgid ""
+"Calls the [param method] on the object during idle time. Always returns "
+"[code]null[/code], [b]not[/b] the method's result.\n"
+"Idle time happens mainly at the end of process and physics frames. In it, "
+"deferred calls will be run until there are none left, which means you can "
+"defer calls from other deferred calls and they'll still be run in the current "
+"idle time cycle. This means you should not call a method deferred from itself "
+"(or from a method called by it), as this causes infinite recursion the same "
+"way as if you had called the method directly.\n"
+"This method supports a variable number of arguments, so parameters can be "
+"passed as a comma separated list.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"For methods that are deferred from the same thread, the order of execution at "
+"idle time is identical to the order in which [code skip-lint]call_deferred[/"
+"code] was called.\n"
+"See also [method Callable.call_deferred].\n"
+"[b]Note:[/b] In C#, [param method] must be in snake_case when referring to "
+"built-in Godot methods. Prefer using the names exposed in the "
+"[code]MethodName[/code] class to avoid allocating a new [StringName] on each "
+"call.\n"
+"[b]Note:[/b] If you're looking to delay the function call by a frame, refer "
+"to the [signal SceneTree.process_frame] and [signal SceneTree.physics_frame] "
+"signals.\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# Make a Callable and bind the arguments to the node's rotate() call.\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# Connect the callable to the process_frame signal, so it gets called in the "
+"next process frame.\n"
+"# CONNECT_ONE_SHOT makes sure it only gets called once instead of every "
+"frame.\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+msgstr ""
+"Вызывает метод [param method] объекта во время простоя. Всегда возвращает "
+"[code]null[/code], [b]не[/b] результат метода.\n"
+"Простой происходит в основном в конце кадров процесса и физики. В это время "
+"отложенные вызовы будут выполняться до тех пор, пока их не останется, что "
+"означает, что вы можете откладывать вызовы из других отложенных вызовов, и "
+"они все равно будут выполняться в текущем цикле простоя. Это означает, что вы "
+"не должны вызывать отложенный метод из самого себя (или из метода, "
+"вызываемого им), так как это вызывает бесконечную рекурсию так же, как если "
+"бы вы вызвали метод напрямую.\n"
+"Этот метод поддерживает переменное количество аргументов, поэтому параметры "
+"можно передавать в виде списка, разделенного запятыми.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Для методов, отложенных из одного и того же потока, порядок выполнения в "
+"свободное время идентично порядку вызова [code skip-lint]call_deferred[/"
+"code].\n"
+"См. также [method Callable.call_deferred].\n"
+"[b]Примечание:[/b] В C# [param method] должен быть в формате snake_case при "
+"обращении к встроенным методам Godot. Предпочтительнее использовать имена, "
+"предоставляемые классом [code]MethodName[/code], чтобы избежать выделения "
+"нового [StringName] при каждом вызове.\n"
+"[b]Примечание:[/b] Если вы хотите отложить вызов функции на кадр, обратитесь "
+"к сигналам [signal SceneTree.process_frame] и [signal "
+"SceneTree.physics_frame].\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# Создайте вызываемый Callable объект и привяжите его аргументы к вызову "
+"функции rotate() узла.\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# Свяжите вызываемую функцию с сигналом process_frame, чтобы она вызывалась в "
+"следующем кадре процесса.\n"
+"# CONNECT_ONE_SHOT гарантирует, что она будет вызвана только один раз, а не в "
+"каждом кадре.\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+
 msgid ""
 "Calls the [param method] on the object and returns the result. Unlike [method "
 "call], this method expects all parameters to be contained inside [param "
@@ -115377,6 +115901,39 @@ msgstr ""
 "несколько раз. Каждое отключение уменьшает внутренний счетчик. Сигнал "
 "полностью отключается только тогда, когда счетчик достигает 0."
 
+msgid ""
+"On signal emission, the source object is automatically appended after the "
+"original arguments of the signal, regardless of the connected [Callable]'s "
+"unbinds which affect only the original arguments of the signal (see [method "
+"Callable.unbind], [method Callable.get_unbound_arguments_count]).\n"
+"[codeblock]\n"
+"extends Object\n"
+"\n"
+"signal test_signal\n"
+"\n"
+"func test():\n"
+"\tprint(self) # Prints e.g. <Object#35332818393>\n"
+"\ttest_signal.connect(prints.unbind(1), CONNECT_APPEND_SOURCE_OBJECT)\n"
+"\ttest_signal.emit(\"emit_arg_1\", \"emit_arg_2\") # Prints emit_arg_1 "
+"<Object#35332818393>\n"
+"[/codeblock]"
+msgstr ""
+"При отправке сигнала исходный объект автоматически добавляется после исходных "
+"аргументов сигнала, независимо от отвязок подключенного [Callable], которые "
+"влияют только на исходные аргументы сигнала (см. [method Callable.unbind], "
+"[method Callable.get_unbound_arguments_count]).\n"
+"[codeblock]\n"
+"extends Object\n"
+"\n"
+"signal test_signal\n"
+"\n"
+"func test():\n"
+"\tprint(self) # Выводит <Object#35332818393> итд.\n"
+"\ttest_signal.connect(prints.unbind(1), CONNECT_APPEND_SOURCE_OBJECT)\n"
+"\ttest_signal.emit(\"emit_arg_1\", \"emit_arg_2\") # Выводит emit_arg_1 "
+"<Object#35332818393>\n"
+"[/codeblock]"
+
 msgid ""
 "Occluder shape resource for use with occlusion culling in "
 "[OccluderInstance3D]."
@@ -119505,6 +120062,54 @@ msgstr ""
 "пространственных объектов. Буферы должны быть инициализированы правильным "
 "объемом памяти."
 
+msgid "Object for storing the queries marker result data."
+msgstr "Объект для хранения данных результатов поиска по маркерам запросов."
+
+msgid ""
+"Object for storing the queries marker result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"Объект для хранения данных результатов маркера запроса при вызове [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+
+msgid ""
+"Returns either a [String] or a [PackedByteArray] buffer with data for the "
+"marker at this [param index]. Only applicable for QR code markers."
+msgstr ""
+"Возвращает буфер типа [String] или [PackedByteArray] с данными для маркера по "
+"этому индексу [param index]. Применимо только для маркеров QR-кодов."
+
+msgid ""
+"Returns the marker ID for the marker at this [param index]. Only applicable "
+"for Aruco or April Tag markers."
+msgstr ""
+"Возвращает ID маркера по этому адресу [param index]. Применимо только для "
+"маркеров Aruco или April Tag."
+
+msgid "Returns the marker type for the marker at this [param index]."
+msgstr "Возвращает тип маркера для маркера по этому адресу [param index]."
+
+msgid "Unknown or unset marker type."
+msgstr "Неизвестный или неуказанный тип маркера."
+
+msgid "Marker based on a QR code."
+msgstr "Маркер на основе QR-кода."
+
+msgid "Marker based on a micro QR code."
+msgstr "Маркер на основе микро-QR-кода."
+
+msgid "Marker based on an Aruco code."
+msgstr "Маркер, основанный на коде Aruco."
+
+msgid "Marker based on an April Tag."
+msgstr "Маркер основанный на April Tag."
+
+msgid "Maximum value for this enum."
+msgstr "Максимальное значение для этого перечисления."
+
+msgid "Object for storing the queries mesh2d result data."
+msgstr "Объект для хранения данных результатов запросов mesh2d."
+
 msgid ""
 "Object for storing the queries 2D mesh result data when calling [method "
 "OpenXRSpatialEntityExtension.query_snapshot]."
@@ -119583,6 +120188,79 @@ msgstr ""
 "Объект для хранения данных о результатах выравнивания плоскости запроса при "
 "вызове метода [method OpenXRSpatialEntityExtension.query_snapshot]."
 
+msgid "Returns the plane alignment for the parent entity at this [param index]."
+msgstr ""
+"Возвращает выравнивание плоскости для родительского объекта по этому [param "
+"index]."
+
+msgid "Plane is facing upward."
+msgstr "Плоскость обращена вверх."
+
+msgid "Plane is facing downwards."
+msgstr "Плоскость обращена вниз."
+
+msgid "Plane is vertically aligned."
+msgstr "Плоскость выровнена вертикально."
+
+msgid "Plane has an arbitrary alignment."
+msgstr "Плоскость имеет произвольное выравнивание."
+
+msgid "Object for storing the queries plane semantic label result data."
+msgstr ""
+"Объект для хранения данных результатов семантических меток плоскости запросов."
+
+msgid ""
+"Object for storing the queries plane semantic label result data when calling "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"Объект для хранения данных результатов семантической метки плоскости запросов "
+"при вызове [method OpenXRSpatialEntityExtension.query_snapshot]."
+
+msgid ""
+"Returns the plane semantic label for the parent entity at this [param index]."
+msgstr ""
+"Возвращает семантическую метку плоскости для родительского объекта по этому "
+"адресу [param index]."
+
+msgid "Uncategorized plane."
+msgstr "Некатегоризированная плоскость."
+
+msgid "Plane represents a floor."
+msgstr "Плоскость представляет собой пол."
+
+msgid "Plane represents a wall."
+msgstr "Плоскость представляет собой стену."
+
+msgid "Plane represents a ceiling."
+msgstr "Плоскость представляет собой потолок."
+
+msgid "Plane represents the surface of a table."
+msgstr "Плоскость представляет собой поверхность стола."
+
+msgid "Object for storing the queries polygon2d result data."
+msgstr "Объект для хранения данных результатов запросов polygon2d."
+
+msgid ""
+"Object for storing the queries 2D polygon result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"Объект для хранения данных результатов запроса в виде 2D полигонов при вызове "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+
+msgid ""
+"Returns the transform for positioning our polygon for the entity at this "
+"[param index]."
+msgstr ""
+"Возвращает преобразование для позиционирования полигона относительно объекта "
+"в точке с [param index]."
+
+msgid "Returns the polygon vertices for the entity at this [param index]."
+msgstr ""
+"Возвращает вершины полигона для объекта, находящегося по этому [param index]."
+
+msgid "Configuration header for spatial persistence."
+msgstr "Заголовок конфигурации для пространственного сохранения данных."
+
 msgid ""
 "Returns [code]true[/code] if micro QR code marker tracking is supported by "
 "the current device."
@@ -138389,6 +139067,23 @@ msgstr ""
 "настройки [code]debug/gdscript/warnings/*[/code]). Если [code]false[/code], "
 "отключает все предупреждения GDScript."
 
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a function that is not a coroutine is called with await."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при вызове "
+"функции, не являющейся сопрограммой, с помощью await выдается предупреждение "
+"или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when the [code]@static_unload[/code] annotation is used in a "
+"script without any static variables."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при использовании "
+"аннотации [code]@static_unload[/code] в скрипте без статических переменных "
+"выдается предупреждение или ошибка соответственно."
+
 msgid ""
 "When enabled, using a property, enum, or function that was renamed since "
 "Godot 3 will produce a hint if an error occurs."
@@ -138397,6 +139092,215 @@ msgstr ""
 "которые были переименованы с момента выхода Godot 3, приведет к появлению "
 "подсказки в случае возникновения ошибки."
 
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a function without using its return value (by "
+"assigning it to a variable or using it as a function argument). These return "
+"values are sometimes used to indicate possible errors using the [enum Error] "
+"enum."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], это приводит к "
+"появлению предупреждения или ошибки соответственно при вызове функции без "
+"использования её возвращаемого значения (путём присвоения его переменной или "
+"использования в качестве аргумента функции). Эти возвращаемые значения иногда "
+"используются для обозначения возможных ошибок с помощью перечисления [enum "
+"Error]."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when defining a local or member variable, signal, or enum that "
+"would have the same name as a built-in function or global class name, thus "
+"shadowing it."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при определении "
+"локальной переменной, члена класса, сигнала или перечисления, имеющего то же "
+"имя, что и встроенная функция или имя глобального класса, будет выдаваться "
+"предупреждение или ошибка соответственно, тем самым перекрывая их."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable or local constant shadows a member "
+"declared in the current class."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при возникновении "
+"ситуации, когда локальная переменная или локальная константа перекрывает "
+"член, объявленный в текущем классе, выдается предупреждение или ошибка "
+"соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable or local constant shadows a member "
+"declared in a base class."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при возникновении "
+"ситуации, когда локальная переменная или локальная константа перекрывает "
+"член, объявленный в базовом классе, выдается предупреждение или ошибка "
+"соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling an expression that may have no effect on the "
+"surrounding code, such as writing [code]2 + 2[/code] as a statement."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при вызове "
+"выражения, которое может не оказывать никакого влияния на окружающий код, "
+"например, при записи [code]2 + 2[/code] в виде оператора, выдается "
+"предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a ternary expression that may have no effect on the "
+"surrounding code, such as writing [code]42 if active else 0[/code] as a "
+"statement."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при вызове "
+"тернарного выражения, которое может не оказывать никакого влияния на "
+"окружающий код, например, при записи [code]42 if active else 0[/code] в "
+"качестве оператора, выдается предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a static method from an instance of a class instead "
+"of from the class directly."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при вызове "
+"статического метода из экземпляра класса вместо прямого вызова из самого "
+"класса будет выдаваться предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when using a variable that wasn't previously assigned."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при использовании "
+"переменной, которой ранее не было присвоено значение, выдается предупреждение "
+"или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when assigning a variable using an assignment operator like "
+"[code]+=[/code] if the variable wasn't previously assigned."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при присваивании "
+"переменной значения с помощью оператора присваивания, например [code]+=[/"
+"code], если переменной ранее не было присвоено значение, выдается "
+"предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when unreachable code is detected (such as after a [code]return[/"
+"code] statement that will always be executed)."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при обнаружении "
+"недостижимого кода (например, после оператора [code]return[/code], который "
+"всегда будет выполняться) выдается предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an unreachable [code]match[/code] pattern is detected."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при обнаружении "
+"недоступного шаблона [code]match[/code] выдается предупреждение или ошибка "
+"соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when using an expression whose type may not be compatible with "
+"the function parameter expected."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при использовании "
+"выражения, тип которого может быть несовместим с ожидаемым параметром "
+"функции, выдается соответственно предупреждение или ошибка."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a [Variant] value is cast to a non-Variant."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при преобразовании "
+"значения [Variant] в значение, отличное от [Variant], выдается предупреждение "
+"или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a method whose presence is not guaranteed at "
+"compile-time in the class."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при вызове метода, "
+"наличие которого не гарантируется на этапе компиляции в классе, выдается "
+"предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when accessing a property whose presence is not guaranteed at "
+"compile-time in the class."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при обращении к "
+"свойству, наличие которого не гарантируется на этапе компиляции в классе, "
+"выдается предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when returning a call from a [code]void[/code] function when "
+"such call cannot be guaranteed to be also [code]void[/code]."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при возврате "
+"вызова из функции типа [code]void[/code], не гарантируется, что такой вызов "
+"также будет функцией типа [code]void[/code], выдается предупреждение или "
+"ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a variable or parameter has no static type, or if a "
+"function has no static return type.\n"
+"[b]Note:[/b] This warning is recommended together with [member "
+"EditorSettings.text_editor/completion/add_type_hints] to help achieve type "
+"safety."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то выдается "
+"предупреждение или ошибка соответственно, если переменная или параметр не "
+"имеют статического типа, или если функция не имеет статического типа "
+"возвращаемого значения.\n"
+"[b]Примечание:[/b] Рекомендуется использовать это предупреждение вместе с "
+"[member EditorSettings.text_editor/completion/add_type_hints] для обеспечения "
+"типобезопасности."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local constant is never used."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при отсутствии "
+"использования локальной константы выдается предупреждение или ошибка "
+"соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a function parameter is never used."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при отсутствии "
+"параметра функции будет выдано предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a private member variable is never used."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при использовании "
+"приватной переменной-члена выдается предупреждение или ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a signal is declared but never explicitly used in the class."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при объявлении "
+"сигнала, и его явном использовании в классе, выдается предупреждение или "
+"ошибка соответственно."
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable is unused."
+msgstr ""
+"Если установлено значение [b]Warn[/b] или [b]Error[/b], то при "
+"неиспользовании локальной переменной выдается предупреждение или ошибка "
+"соответственно."
+
 msgid ""
 "Message to be displayed before the backtrace when the engine crashes. By "
 "default, this message is only used in exported projects due to the editor-"
@@ -139046,6 +139950,31 @@ msgstr ""
 "используется значение [member EditorSettings.run/window_placement/"
 "rect_custom_position]."
 
+msgid ""
+"Main window initial position.\n"
+"[code]0[/code] - \"Absolute\", [member display/window/size/initial_position] "
+"is used to set window position.\n"
+"[code]1[/code] - \"Primary Screen Center\".\n"
+"[code]3[/code] - \"Other Screen Center\", [member display/window/size/"
+"initial_screen] is used to set the screen.\n"
+"[code]4[/code] - \"Center of Screen With Mouse Pointer\".\n"
+"[code]5[/code] - \"Center of Screen With Keyboard Focus\".\n"
+"[b]Note:[/b] This setting only affects the exported project, or when the "
+"project is run from the command line. In the editor, the value of [member "
+"EditorSettings.run/window_placement/rect] is used instead."
+msgstr ""
+"Начальное положение главного окна.\n"
+"[code]0[/code] - \"Абсолютное\", [member display/window/size/"
+"initial_position] используется для установки положения окна.\n"
+"[code]1[/code] - \"Центр основного экрана\".\n"
+"[code]3[/code] - \"Другой центр экрана\", [member display/window/size/"
+"initial_screen] используется для установки экрана.\n"
+"[code]4[/code] - \"Центр экрана с указателем мыши\".\n"
+"[code]5[/code] - \"Центр экрана с фокусом клавиатуры\".\n"
+"[b]Примечание:[/b] Этот параметр влияет только на экспортированный проект или "
+"при запуске проекта из командной строки. В редакторе вместо него используется "
+"значение [member EditorSettings.run/window_placement/rect]."
+
 msgid ""
 "Main window initial screen, this setting is used only if [member display/"
 "window/size/initial_position_type] is set to \"Other Screen Center\" "
@@ -139206,6 +140135,105 @@ msgstr ""
 "ширина окна равна [member display/window/size/viewport_width]. Этот параметр "
 "игнорируется на iOS, Android и в Web."
 
+msgid ""
+"Defines how the aspect ratio of the base size is preserved when stretching to "
+"fit the resolution of the window or screen.\n"
+"[code]\"ignore\"[/code]: Ignore the aspect ratio when stretching the screen. "
+"This means that the original resolution will be stretched to exactly fill the "
+"screen, even if it's wider or narrower. This may result in non-uniform "
+"stretching: things looking wider or taller than designed.\n"
+"[code]\"keep\"[/code]: Keep aspect ratio when stretching the screen. This "
+"means that the viewport retains its original size regardless of the screen "
+"resolution, and black bars will be added to the top/bottom of the screen "
+"(\"letterboxing\") or the sides (\"pillarboxing\").\n"
+"[code]\"keep_width\"[/code]: Keep aspect ratio when stretching the screen. If "
+"the screen is wider than the base size, black bars are added at the left and "
+"right (pillarboxing). But if the screen is taller than the base resolution, "
+"the viewport will be grown in the vertical direction (and more content will "
+"be visible at the bottom). You can also think of this as \"Expand "
+"Vertically\".\n"
+"[code]\"keep_height\"[/code]: Keep aspect ratio when stretching the screen. "
+"If the screen is taller than the base size, black bars are added at the top "
+"and bottom (letterboxing). But if the screen is wider than the base "
+"resolution, the viewport will be grown in the horizontal direction (and more "
+"content will be visible to the right). You can also think of this as \"Expand "
+"Horizontally\".\n"
+"[code]\"expand\"[/code]: Keep aspect ratio when stretching the screen, but "
+"keep neither the base width nor height. Depending on the screen aspect ratio, "
+"the viewport will either be larger in the horizontal direction (if the screen "
+"is wider than the base size) or in the vertical direction (if the screen is "
+"taller than the original size)."
+msgstr ""
+"Определяет, как сохраняется соотношение сторон базового размера при "
+"растягивании для соответствия разрешению окна или экрана.\n"
+"[code]\"ignore\"[/code]: Игнорировать соотношение сторон при растягивании "
+"экрана. Это означает, что исходное разрешение будет растянуто точно, чтобы "
+"заполнить экран, даже если он шире или уже. Это может привести к "
+"неравномерному растягиванию: элементы будут выглядеть шире или выше, чем "
+"задумано.\n"
+"[code]\"keep\"[/code]: Сохранять соотношение сторон при растягивании экрана. "
+"Это означает, что область просмотра сохраняет свой исходный размер независимо "
+"от разрешения экрана, а черные полосы будут добавлены сверху/снизу экрана "
+"(\"letterboxing\") или по бокам (\"pillarboxing\").\n"
+"[code]\"keep_width\"[/code]: Сохранять соотношение сторон при растягивании "
+"экрана. Если экран шире базового размера, черные полосы добавляются слева и "
+"справа (pillarboxing). Но если высота экрана превышает базовое разрешение, "
+"область просмотра будет увеличиваться по вертикали (и внизу будет видно "
+"больше контента). Это также можно рассматривать как «Вертикальное "
+"расширение».\n"
+"[code]\"keep_height\"[/code]: Сохраняет соотношение сторон при растягивании "
+"экрана. Если высота экрана превышает базовый размер, сверху и снизу "
+"добавляются черные полосы (letterboxing). Но если ширина экрана превышает "
+"базовое разрешение, область просмотра будет увеличиваться по горизонтали (и "
+"справа будет видно больше контента). Это также можно рассматривать как "
+"«Горизонтальное расширение».\n"
+"[code]\"expand\"[/code]: Сохраняет соотношение сторон при растягивании "
+"экрана, но не сохраняет ни базовую ширину, ни высоту. В зависимости от "
+"соотношения сторон экрана, область просмотра будет либо больше по горизонтали "
+"(если ширина экрана превышает базовый размер), либо по вертикали (если высота "
+"экрана превышает исходный размер)."
+
+msgid ""
+"Defines how the base size is stretched to fit the resolution of the window or "
+"screen.\n"
+"[code]\"disabled\"[/code]: No stretching happens. One unit in the scene "
+"corresponds to one pixel on the screen. In this mode, [member display/window/"
+"stretch/aspect] has no effect. Recommended for non-game applications.\n"
+"[code]\"canvas_items\"[/code]: The base size specified in width and height in "
+"the project settings is stretched to cover the whole screen (taking [member "
+"display/window/stretch/aspect] into account). This means that everything is "
+"rendered directly at the target resolution. 3D is unaffected, while in 2D, "
+"there is no longer a 1:1 correspondence between sprite pixels and screen "
+"pixels, which may result in scaling artifacts. Recommended for most games "
+"that don't use a pixel art aesthetic, although it is possible to use this "
+"stretch mode for pixel art games too (especially in 3D).\n"
+"[code]\"viewport\"[/code]: The size of the root [Viewport] is set precisely "
+"to the base size specified in the Project Settings' Display section. The "
+"scene is rendered to this viewport first. Finally, this viewport is scaled to "
+"fit the screen (taking [member display/window/stretch/aspect] into account). "
+"Recommended for games that use a pixel art aesthetic."
+msgstr ""
+"Определяет, как базовый размер растягивается, чтобы соответствовать "
+"разрешению окна или экрана.\n"
+"[code]\"disabled\"[/code]: Растягивание не происходит. Одна единица в сцене "
+"соответствует одному пикселю на экране. В этом режиме [member display/window/"
+"stretch/aspect] не оказывает никакого эффекта. Рекомендуется для приложений, "
+"не являющихся играми.\n"
+"[code]\"canvas_items\"[/code]: Базовый размер, указанный в параметрах width и "
+"height в настройках проекта, растягивается, чтобы покрыть весь экран (с "
+"учетом [member display/window/stretch/aspect]). Это означает, что все "
+"отображается непосредственно в целевом разрешении. 3D-графика остается "
+"неизменной, в то время как в 2D-графике больше нет соответствия 1:1 между "
+"пикселями спрайта и пикселями экрана, что может привести к артефактам "
+"масштабирования. Рекомендуется для большинства игр, не использующих "
+"пиксельную графику, хотя этот режим растягивания можно использовать и для "
+"пиксельных игр (особенно в 3D).\n"
+"[code]\"viewport\"[/code]: Размер корневого [Viewport] устанавливается точно "
+"в соответствии с базовым размером, указанным в разделе «Display» настроек "
+"проекта. Сначала сцена отрисовывается в этом окне просмотра. Затем это окно "
+"просмотра масштабируется под размер экрана (с учетом [member display/window/"
+"stretch/aspect]). Рекомендуется для игр, использующих пиксельную графику."
+
 msgid ""
 "The scale factor multiplier to use for 2D elements. This multiplies the final "
 "scale factor determined by [member display/window/stretch/mode]. If using the "
@@ -139219,6 +140247,62 @@ msgstr ""
 "сделать пользовательский интерфейс более удобным для чтения на определенных "
 "дисплеях."
 
+msgid ""
+"The policy to use to determine the final scale factor for 2D elements. This "
+"affects how [member display/window/stretch/scale] is applied, in addition to "
+"the automatic scale factor determined by [member display/window/stretch/"
+"mode].\n"
+"[code]\"fractional\"[/code]: The scale factor will not be modified.\n"
+"[code]\"integer\"[/code]: The scale factor will be floored to an integer "
+"value, which means that the screen size will always be an integer multiple of "
+"the base viewport size. This provides a crisp pixel art appearance.\n"
+"[b]Note:[/b] When using integer scaling with a stretch mode, resizing the "
+"window to be smaller than the base viewport size will clip the contents. "
+"Consider preventing that by setting [member Window.min_size] to the same "
+"value as the base viewport size defined in [member display/window/size/"
+"viewport_width] and [member display/window/size/viewport_height]."
+msgstr ""
+"Политика, используемая для определения окончательного коэффициента "
+"масштабирования для 2D-элементов. Это влияет на то, как применяется [member "
+"display/window/stretch/scale], в дополнение к автоматическому коэффициенту "
+"масштабирования, определяемому [member display/window/stretch/mode].\n"
+"[code]\"fractional\"[/code]: Коэффициент масштабирования не будет "
+"изменяться.\n"
+"[code]\"integer\"[/code]: Коэффициент масштабирования будет округлен до "
+"целого значения, что означает, что размер экрана всегда будет кратным целому "
+"числу базового размера области просмотра. Это обеспечивает четкое изображение "
+"в стиле пиксельной графики.\n"
+"[b]Примечание:[/b] При использовании целочисленного масштабирования в режиме "
+"растяжения изменение размера окна до размера меньше базового размера области "
+"просмотра приведет к обрезке содержимого. Рекомендуется предотвратить это, "
+"установив [member Window.min_size] равным значению базового размера области "
+"просмотра, определенного в [member display/window/size/viewport_width] и "
+"[member display/window/size/viewport_height]."
+
+msgid ""
+"If [code]true[/code], subwindows are embedded in the main window (this is "
+"also called single-window mode). Single-window mode can be faster as it does "
+"not need to create a separate window for every popup and tooltip, which can "
+"be a slow operation depending on the operating system and rendering method in "
+"use.\n"
+"If [code]false[/code], subwindows are created as separate windows (this is "
+"also called multi-window mode). This allows them to be moved outside the main "
+"window and use native operating system window decorations.\n"
+"This is equivalent to [member EditorSettings.interface/editor/"
+"single_window_mode] in the editor."
+msgstr ""
+"Если [code]true[/code], дочерние окна встраиваются в главное окно (это также "
+"называется однооконным режимом). Однооконный режим может быть быстрее, "
+"поскольку не требует создания отдельного окна для каждого всплывающего окна и "
+"подсказки, что может быть медленной операцией в зависимости от операционной "
+"системы и используемого метода рендеринга.\n"
+"Если [code]false[/code], дочерние окна создаются как отдельные окна (это "
+"также называется многооконным режимом). Это позволяет перемещать их за "
+"пределы главного окна и использовать стандартные элементы оформления окон "
+"операционной системы.\n"
+"Это эквивалентно [member EditorSettings.interface/editor/single_window_mode] "
+"в редакторе."
+
 msgid ""
 "Sets the V-Sync mode for the main game window. The editor's own V-Sync mode "
 "can be set using [member EditorSettings.interface/editor/vsync_mode].\n"
@@ -139327,6 +140411,13 @@ msgid "If [code]true[/code] importing of resources is run on multiple threads."
 msgstr ""
 "Если [code]true[/code], импорт ресурсов выполняется в несколько потоков."
 
+msgid ""
+"Number of bits per audio sample written to the [code].avi[/code] file. Only "
+"16 and 32-bit are supported."
+msgstr ""
+"Количество бит на аудиосэмпл, записываемое в файл [code].avi[/code]. "
+"Поддерживаются только 16- и 32-битные форматы."
+
 msgid ""
 "If [code]true[/code], requests V-Sync to be disabled when writing a movie "
 "(similar to setting [member display/window/vsync/vsync_mode] to [b]Disabled[/"
@@ -139665,6 +140756,37 @@ msgstr ""
 "Значение по умолчанию для [member ScrollContainer.scroll_deadzone], которое "
 "будет использоваться для всех [ScrollContainer], если не будет переопределено."
 
+msgid ""
+"The minimum distance the mouse cursor must move while pressed before a drag "
+"operation begins in the default viewport. For custom viewports see [member "
+"Viewport.gui_drag_threshold]."
+msgstr ""
+"Минимальное расстояние, на которое должен переместиться курсор мыши при "
+"нажатии, прежде чем начнется операция перетаскивания в окне просмотра по "
+"умолчанию. Для пользовательских окон просмотра см. [member "
+"Viewport.gui_drag_threshold]."
+
+msgid ""
+"Determines whether a [Control] should visually indicate focus when said focus "
+"is gained using a mouse or touch input.\n"
+"- [b]Never[/b] ([code]0[/code]) show the focused state for mouse/touch "
+"input.\n"
+"- [b]Control Supports Keyboard Input[/b] ([code]1[/code]) shows the focused "
+"state even when gained via mouse/touch input (similar to how browsers handle "
+"focus).\n"
+"- [b]Always[/b] ([code]2[/code]) show the focused state, even if said focus "
+"was gained via mouse/touch input."
+msgstr ""
+"Определяет, должен ли элемент управления [Control] визуально отображать "
+"состояние фокуса, когда фокус получен с помощью мыши или сенсорного ввода.\n"
+"- [b]Никогда[/b] ([code]0[/code]) отображать состояние фокуса для ввода с "
+"помощью мыши/сенсорного ввода.\n"
+"- [b]Элемент управления поддерживает ввод с клавиатуры[/b] ([code]1[/code]) "
+"отображать состояние фокуса, даже если фокус был получен с помощью мыши/"
+"сенсорного ввода (аналогично тому, как браузеры обрабатывают фокус).\n"
+"- [b]Всегда[/b] ([code]2[/code]) отображать состояние фокуса, даже если фокус "
+"был получен с помощью мыши/сенсорного ввода."
+
 msgid ""
 "If [code]true[/code], snaps [Control] node vertices to the nearest pixel to "
 "ensure they remain crisp even when the camera moves or zooms."
@@ -139673,9 +140795,46 @@ msgstr ""
 "пикселю, чтобы они оставались четкими даже при перемещении или "
 "масштабировании камеры."
 
+msgid ""
+"How to position the Cancel and OK buttons in the project's [AcceptDialog] "
+"windows. Different platforms have different conventions for this, which can "
+"be overridden through this setting.\n"
+"- [b]Auto[/b] follows the platform convention: OK first on Windows, KDE, and "
+"LXQt; Cancel first on macOS and other Linux desktop environments.\n"
+"- [b]Cancel First[/b] forces the Cancel/OK ordering.\n"
+"- [b]OK First[/b] forces the OK/Cancel ordering.\n"
+"To check if these buttons are swapped at runtime, use [method "
+"DisplayServer.get_swap_cancel_ok].\n"
+"[b]Note:[/b] This doesn't affect native dialogs such as the ones spawned by "
+"[method DisplayServer.dialog_show]."
+msgstr ""
+"Как расположить кнопки «Отмена» и «ОК» в окнах [AcceptDialog] проекта. На "
+"разных платформах действуют разные правила, которые можно переопределить с "
+"помощью этой настройки.\n"
+"- [b]Авто[/b] следует правилам платформы: сначала «ОК» в Windows, KDE и LXQt; "
+"сначала «Отмена» в macOS и других средах рабочего стола Linux.\n"
+"- [b]Сначала «Отмена»[/b] принудительно устанавливает порядок «Отмена/ОК».\n"
+"- [b]Сначала «ОК»[/b] принудительно устанавливает порядок «ОК/Отмена».\n"
+"Чтобы проверить, поменяны ли эти кнопки местами во время выполнения, "
+"используйте [метод DisplayServer.get_swap_cancel_ok].\n"
+"[b]Примечание:[/b] Это не влияет на нативные диалоги, такие как те, которые "
+"создаются [method DisplayServer.dialog_show]."
+
 msgid "Maximum undo/redo history size for [TextEdit] fields."
 msgstr "Максимальный размер истории отмен/повторов для полей [TextEdit]."
 
+msgid ""
+"If set to [code]true[/code] and [member display/window/stretch/mode] is set "
+"to [code]\"canvas_items\"[/code], font and [DPITexture] oversampling is "
+"enabled in the main window. Use [member Viewport.oversampling] to control "
+"oversampling in other viewports and windows."
+msgstr ""
+"Если установлено значение [code]true[/code] и параметр [member display/window/"
+"stretch/mode] установлен на [code]\"canvas_items\"[/code], то в главном окне "
+"включается передискретизация шрифтов и [DPITexture]. Используйте [member "
+"Viewport.oversampling] для управления передискретизацией в других окнах "
+"просмотра и окнах."
+
 msgid ""
 "Path to a custom [Theme] resource file to use for the project ([code].theme[/"
 "code] or generic [code].tres[/code]/[code].res[/code] extension)."
@@ -139783,6 +140942,26 @@ msgstr ""
 "используемые в проекте. Вместо этого используйте док-станцию [b]Import[/b] "
 "(см. [member ResourceImporterDynamicFont.subpixel_positioning])."
 
+msgid ""
+"The default scale factor for [Control]s, when not overridden by a [Theme].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the default theme scale at runtime, set [member ThemeDB.fallback_base_scale] "
+"instead. However, to adjust the scale of all 2D elements at runtime, it's "
+"preferable to use [member Window.content_scale_factor] on the root [Window] "
+"node instead (as this also affects overridden [Theme]s). See [url=$DOCS_URL/"
+"tutorials/rendering/multiple_resolutions.html]Multiple resolutions[/url] in "
+"the documentation for details."
+msgstr ""
+"Коэффициент масштабирования по умолчанию для элементов [Control], если он не "
+"переопределен в [Theme].\n"
+"[b]Примечание:[/b] Это свойство считывается только при запуске проекта. Чтобы "
+"изменить масштаб темы по умолчанию во время выполнения, установите вместо "
+"этого [member ThemeDB.fallback_base_scale]. Однако, чтобы настроить масштаб "
+"всех 2D-элементов во время выполнения, предпочтительнее использовать [member "
+"Window.content_scale_factor] на корневом узле [Window] (поскольку это также "
+"влияет на переопределенные [Theme]). Подробнее см. [url=$DOCS_URL/tutorials/"
+"rendering/multiple_resolutions.html]Несколько разрешений[/url] в документации."
+
 msgid ""
 "LCD subpixel layout used for font anti-aliasing. See [enum "
 "TextServer.FontLCDSubpixelLayout]."
@@ -139851,6 +141030,22 @@ msgstr ""
 "так как они необходимы для внутренней логики нескольких [Control]-ов. Однако "
 "события, назначенные действию, можно изменить."
 
+msgid ""
+"Default [InputEventAction] to close a dialog window.\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"Действие по умолчанию [InputEventAction] закрывает диалоговое окно.\n"
+"[b]Примечание:[/b] Действия по умолчанию [code]ui_*[/code] нельзя удалить, "
+"поскольку они необходимы для внутренней логики нескольких [Control]. Однако "
+"события, назначенные действию, можно изменить."
+
+msgid "macOS specific override for the shortcut to close a dialog window."
+msgstr ""
+"Специфическая для macOS настройка сочетания клавиш для закрытия диалогового "
+"окна."
+
 msgid ""
 "Default [InputEventAction] to delete a color preset in a [ColorPicker].\n"
 "[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
@@ -139913,6 +141108,49 @@ msgstr ""
 "так как они необходимы для внутренней логики нескольких [Control]-ов. Однако "
 "события, назначенные действию, можно изменить."
 
+msgid ""
+"Default [InputEventAction] to delete the selected file in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"Действие по умолчанию [InputEventAction] используется для удаления выбранного "
+"файла в [FileDialog].\n"
+"[b]Примечание:[/b] Действия по умолчанию [code]ui_*[/code] нельзя удалить, "
+"поскольку они необходимы для внутренней логики нескольких [Control]. Однако "
+"события, назначенные действию, можно изменить."
+
+msgid ""
+"Default [InputEventAction] to open file filter in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"Действие по умолчанию [InputEventAction] открывает фильтр файлов в "
+"[FileDialog].\n"
+"[b]Примечание:[/b] Действия по умолчанию [code]ui_*[/code] нельзя удалить, "
+"поскольку они необходимы для внутренней логики нескольких [Control]. Однако "
+"события, назначенные действию, можно изменить."
+
+msgid ""
+"Default [InputEventAction] to focus path edit field in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"По умолчанию [InputEventAction] фокусирует поле редактирования пути в "
+"[FileDialog].\n"
+"[b]Примечание:[/b] Действия [code]ui_*[/code] по умолчанию нельзя удалить, "
+"поскольку они необходимы для внутренней логики нескольких [Control]. Однако "
+"события, назначенные действию, можно изменить."
+
+msgid ""
+"macOS specific override for the shortcut to focus path edit field in "
+"[FileDialog]."
+msgstr ""
+"Специфическая для macOS настройка сочетания клавиш для поля редактирования "
+"пути фокуса в [FileDialog]."
+
 msgid ""
 "Default [InputEventAction] to refresh the contents of the current directory "
 "of a [FileDialog].\n"
@@ -142583,6 +143821,28 @@ msgstr ""
 "Масштаб ячеек растеризатора слияния по умолчанию, для 2D-навигационных карт. "
 "См. [method NavigationServer2D.map_set_merge_rasterizer_cell_scale]."
 
+msgid ""
+"Sets which navigation engine to use for 2D navigation.\n"
+"[b]DEFAULT[/b] is equivalent to [b]GodotNavigation2D[/b], but may change in "
+"future releases. Select an explicit implementation if you want to ensure that "
+"your project stays on the same engine.\n"
+"[b]GodotNavigation2D[/b] is Godot's internal 2D navigation engine.\n"
+"[b]Dummy[/b] is a 2D navigation server that does nothing and returns only "
+"dummy values, effectively disabling all 2D navigation functionality.\n"
+"Third-party modules can add other navigation engines to select with this "
+"setting."
+msgstr ""
+"Задает, какой движок навигации использовать для 2D-навигации.\n"
+"[b]DEFAULT[/b] эквивалентно [b]GodotNavigation2D[/b], но может измениться в "
+"будущих релизах. Выберите явную реализацию, если хотите гарантировать, что "
+"ваш проект останется на том же движке.\n"
+"[b]GodotNavigation2D[/b] — это внутренний движок 2D-навигации Godot.\n"
+"[b]Dummy[/b] — это сервер 2D-навигации, который ничего не делает и возвращает "
+"только фиктивные значения, фактически отключая всю функциональность 2D-"
+"навигации.\n"
+"Сторонние модули могут добавлять другие движки навигации для выбора с помощью "
+"этой настройки."
+
 msgid ""
 "If enabled 2D navigation regions will use edge connections to connect with "
 "other navigation regions within proximity of the navigation map edge "
@@ -142652,6 +143912,28 @@ msgstr ""
 "Масштаб ячеек слияния растеризатора по умолчанию для 3D-карт навигации. См. "
 "[method NavigationServer3D.map_set_merge_rasterizer_cell_scale]."
 
+msgid ""
+"Sets which navigation engine to use for 3D navigation.\n"
+"[b]DEFAULT[/b] is equivalent to [b]GodotNavigation3D[/b], but may change in "
+"future releases. Select an explicit implementation if you want to ensure that "
+"your project stays on the same engine.\n"
+"[b]GodotNavigation3D[/b] is Godot's internal 3D navigation engine.\n"
+"[b]Dummy[/b] is a 3D navigation server that does nothing and returns only "
+"dummy values, effectively disabling all 3D navigation functionality.\n"
+"Third-party modules can add other navigation engines to select with this "
+"setting."
+msgstr ""
+"Задает, какой движок навигации использовать для 3D-навигации.\n"
+"[b]DEFAULT[/b] эквивалентно [b]GodotNavigation3D[/b], но может измениться в "
+"будущих релизах. Выберите явную реализацию, если хотите гарантировать, что "
+"ваш проект останется на том же движке.\n"
+"[b]GodotNavigation3D[/b] — это внутренний движок 3D-навигации Godot.\n"
+"[b]Dummy[/b] — это сервер 3D-навигации, который ничего не делает и возвращает "
+"только фиктивные значения, фактически отключая всю функциональность 3D-"
+"навигации.\n"
+"Сторонние модули могут добавлять другие движки навигации для выбора с помощью "
+"этой настройки."
+
 msgid ""
 "If enabled 3D navigation regions will use edge connections to connect with "
 "other navigation regions within proximity of the navigation map edge "
@@ -142783,9 +144065,29 @@ msgstr ""
 msgid "Timeout (in seconds) for connection attempts using TCP."
 msgstr "Тайм-аут (в секундах) для попыток подключения по протоколу TCP."
 
+msgid "Timeout (in seconds) for connection attempts using UNIX domain socket."
+msgstr ""
+"Время ожидания (в секундах) для попыток подключения с использованием сокета "
+"домена UNIX."
+
 msgid "Maximum size (in kiB) for the [WebRTCDataChannel] input buffer."
 msgstr "Максимальный размер (в КБ) для входного буфера [WebRTCDataChannel]."
 
+msgid ""
+"The CA certificates bundle to use for TLS connections. If this is set to a "
+"non-empty value, this will [i]override[/i] Godot's default [url=https://"
+"github.com/godotengine/godot/blob/master/thirdparty/certs/ca-"
+"bundle.crt]Mozilla certificate bundle[/url]. If left empty, the default "
+"certificate bundle will be used.\n"
+"If in doubt, leave this setting empty."
+msgstr ""
+"Пакет сертификатов CA, используемый для TLS-соединений. Если значение "
+"параметра не пустое, он [i]переопределит[/i] стандартный пакет сертификатов "
+"Mozilla [url=https://github.com/godotengine/godot/blob/master/thirdparty/"
+"certs/ca-bundle.crt]Godot[/url]. Если оставить поле пустым, будет "
+"использоваться стандартный пакет сертификатов.\n"
+"Если сомневаетесь, оставьте этот параметр пустым."
+
 msgid ""
 "The default rotational motion damping in 2D. Damping is used to gradually "
 "slow down physical objects over time. RigidBodies will fall back to this "
@@ -143260,6 +144562,34 @@ msgstr ""
 "к похожим ощущениям, вам также нужно изменить значения амортизации. Это "
 "необходимое изменение не пропорционально и отличается от случая к случаю."
 
+msgid ""
+"Sets which physics engine to use for 3D physics.\n"
+"[b]DEFAULT[/b] is currently equivalent to [b]GodotPhysics3D[/b], but may "
+"change in future releases. Select an explicit implementation if you want to "
+"ensure that your project stays on the same engine.\n"
+"[b]GodotPhysics3D[/b] is Godot's internal 3D physics engine.\n"
+"[b]Jolt Physics[/b] is an alternative physics engine that is generally faster "
+"and more reliable than [b]GodotPhysics3D[/b]. Jolt Physics is the default for "
+"projects created starting in Godot 4.6.\n"
+"[b]Dummy[/b] is a 3D physics server that does nothing and returns only dummy "
+"values, effectively disabling all 3D physics functionality.\n"
+"Third-party extensions and modules can add other physics engines to select "
+"with this setting."
+msgstr ""
+"Задает, какой физический движок использовать для 3D-физики.\n"
+"[b]DEFAULT[/b] в настоящее время эквивалентен [b]GodotPhysics3D[/b], но может "
+"измениться в будущих релизах. Выберите явную реализацию, если хотите "
+"гарантировать, что ваш проект останется на том же движке.\n"
+"[b]GodotPhysics3D[/b] — это внутренний 3D-физический движок Godot.\n"
+"[b]Jolt Physics[/b] — это альтернативный физический движок, который, как "
+"правило, быстрее и надежнее, чем [b]GodotPhysics3D[/b]. Jolt Physics "
+"используется по умолчанию для проектов, созданных начиная с Godot 4.6.\n"
+"[b]Dummy[/b] — это 3D-физический сервер, который ничего не делает и "
+"возвращает только фиктивные значения, фактически отключая всю "
+"функциональность 3D-физики.\n"
+"Сторонние расширения и модули могут добавлять другие физические движки для "
+"выбора с помощью этой настройки."
+
 msgid ""
 "The approach used for 3D scene traversal when physics interpolation is "
 "enabled.\n"
@@ -143488,6 +144818,63 @@ msgstr ""
 "изменить исправление дрожания физики во время выполнения, вместо этого "
 "установите [member Engine.physics_jitter_fix]."
 
+msgid ""
+"The number of fixed iterations per second. This controls how often physics "
+"simulation and the [method Node._physics_process] method are run.\n"
+"CPU usage scales approximately with the physics tick rate. However, at very "
+"low tick rates (usually below 30), physics behavior can break down. Input can "
+"also become less responsive at low tick rates as there can be a gap between "
+"input being registered, and the response on the next physics tick. High tick "
+"rates give more accurate physics simulation, particularly for fast moving "
+"objects. For example, racing games may benefit from increasing the tick rate "
+"above the default 60.\n"
+"See also [member application/run/max_fps].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the physics FPS at runtime, set [member Engine.physics_ticks_per_second] "
+"instead.\n"
+"[b]Note:[/b] Only [member physics/common/max_physics_steps_per_frame] physics "
+"ticks may be simulated per rendered frame at most. If more physics ticks have "
+"to be simulated per rendered frame to keep up with rendering, the project "
+"will appear to slow down (even if [code]delta[/code] is used consistently in "
+"physics calculations). Therefore, it is recommended to also increase [member "
+"physics/common/max_physics_steps_per_frame] if increasing [member physics/"
+"common/physics_ticks_per_second] significantly above its default value.\n"
+"[b]Note:[/b] Consider enabling [url=$DOCS_URL/tutorials/physics/interpolation/"
+"index.html]physics interpolation[/url] if you change [member physics/common/"
+"physics_ticks_per_second] to a value that is not a multiple of [code]60[/"
+"code]. Using physics interpolation will avoid jittering when the monitor "
+"refresh rate and physics update rate don't exactly match."
+msgstr ""
+"Количество фиксированных итераций в секунду. Это определяет, как часто "
+"запускаются моделирование физики и метод [method Node._physics_process].\n"
+"Использование CPU приблизительно зависит от частоты обновления физики. Однако "
+"при очень низкой частоте обновления (обычно ниже 30) поведение физики может "
+"нарушаться. Ввод также может стать менее отзывчивым при низкой частоте "
+"обновления, поскольку может возникнуть разрыв между регистрацией ввода и "
+"ответом на следующем обновлении физики. Высокая частота обновления "
+"обеспечивает более точное моделирование физики, особенно для быстро "
+"движущихся объектов. Например, в гоночных играх может быть полезно увеличить "
+"частоту обновления выше значения по умолчанию (60).\n"
+"См. также [member application/run/max_fps].\n"
+"[b]Примечание:[/b] Это свойство считывается только при запуске проекта. Чтобы "
+"изменить частоту обновления физики во время выполнения, установите вместо "
+"этого [member Engine.physics_ticks_per_second].\n"
+"[b]Примечание:[/b] Максимальное количество физических тактов, которое может "
+"быть смоделировано за один отрендеренный кадр, составляет [member physics/"
+"common/max_physics_steps_per_frame]. Если для обеспечения корректной работы "
+"рендеринга необходимо смоделировать больше физических тактов за один "
+"отрендеренный кадр, проект будет казаться медленнее (даже если [code]delta[/"
+"code] постоянно используется в физических расчетах). Поэтому рекомендуется "
+"также увеличить [member physics/common/max_physics_steps_per_frame], если вы "
+"значительно увеличиваете [member physics/common/physics_ticks_per_second] по "
+"сравнению с его значением по умолчанию.\n"
+"[b]Примечание:[/b] Рассмотрите возможность включения [url=$DOCS_URL/tutorials/"
+"physics/interpolation/index.html]интерполяции физики[/url], если вы изменяете "
+"[member physics/common/physics_ticks_per_second] на значение, не кратное "
+"[code]60[/code]. Использование интерполяции физических процессов позволит "
+"избежать дрожания изображения, когда частота обновления монитора и частота "
+"обновления физических данных не совпадают точно."
+
 msgid ""
 "The maximum angle, in radians, between two adjacent triangles in a "
 "[ConcavePolygonShape3D] or [HeightMapShape3D] for which the edge between "
@@ -144171,6 +145558,45 @@ msgstr ""
 "[b]Примечание:[/b] Это свойство считывается только при запуске проекта. В "
 "настоящее время нет возможности изменить эту настройку во время выполнения."
 
+msgid ""
+"If [code]true[/code], uses a fast dithering filter just before transforming "
+"floating point color values to integer color values to make banding "
+"significantly less visible. Debanding is applied at different steps of the "
+"rendering process depending on the rendering method and [member rendering/"
+"viewport/hdr_2d] setting.\n"
+"In some cases, debanding may introduce a slightly noticeable dithering "
+"pattern. It's recommended to enable debanding only when actually needed since "
+"the dithering pattern will make lossless-compressed screenshots larger.\n"
+"[b]Note:[/b] This property is only read when the project starts and "
+"configures [method RenderingServer.material_set_use_debanding] and [member "
+"Viewport.use_debanding] of the root [Viewport]. When [member rendering/"
+"viewport/hdr_2d] is disabled, you should additionally set the [member "
+"Viewport.use_debanding] of other viewports in your project. To set debanding "
+"at run-time, the property that should be set depends on the renderer: "
+"Forward+ only uses [member Viewport.use_debanding] and Mobile uses both "
+"[method RenderingServer.material_set_use_debanding] and [member "
+"Viewport.use_debanding]."
+msgstr ""
+"Если [code]true[/code], используется фильтр быстрого дизеринга "
+"непосредственно перед преобразованием значений цвета с плавающей запятой в "
+"целочисленные значения цвета, чтобы значительно уменьшить видимость полос. "
+"Удаление полос применяется на разных этапах процесса рендеринга в зависимости "
+"от метода рендеринга и настройки [члена rendering/viewport/hdr_2d].\n"
+"В некоторых случаях удаление полос может привести к появлению слегка "
+"заметного рисунка дизеринга. Рекомендуется включать удаление полос только "
+"тогда, когда это действительно необходимо, поскольку рисунок дизеринга "
+"увеличит размер скриншотов, сжатых без потерь.\n"
+"[b]Примечание:[/b] Это свойство считывается только при запуске проекта и "
+"настройке [method RenderingServer.material_set_use_debanding] и [member "
+"Viewport.use_debanding] корневого [Viewport]. Если [member rendering/viewport/"
+"hdr_2d] отключен, следует дополнительно установить [member "
+"Viewport.use_debanding] для других видовых окон в вашем проекте. Для "
+"установки эффекта сглаживания полос во время выполнения параметр, который "
+"следует задать, зависит от используемого рендерера: Forward+ использует "
+"только [member Viewport.use_debanding], а Mobile использует как [method "
+"RenderingServer.material_set_use_debanding], так и [member "
+"Viewport.use_debanding]."
+
 msgid ""
 "Enables temporal antialiasing for the default screen [Viewport]. TAA works by "
 "jittering the camera and accumulating the images of the last rendered frames, "
@@ -144365,6 +145791,18 @@ msgstr ""
 "upscale_mode] на мобильных устройствах из-за проблем с производительностью "
 "или поддержкой драйверов."
 
+msgid ""
+"If [code]true[/code], screen-space reflections will be rendered at half size "
+"and then upscaled before being added to the scene. This is faster but may "
+"look pixelated or cause flickering. If [code]false[/code], screen-space "
+"reflections will be rendered at full size."
+msgstr ""
+"Если [code]true[/code], отражения в экранном пространстве будут отображаться "
+"в половинном размере, а затем масштабироваться перед добавлением в сцену. Это "
+"быстрее, но может выглядеть пикселизированным или вызывать мерцание. Если "
+"[code]false[/code], отражения в экранном пространстве будут отображаться в "
+"полном размере."
+
 msgid ""
 "Quality target to use when [member rendering/environment/ssao/quality] is set "
 "to [code]Ultra[/code]. A value of [code]0.0[/code] provides a quality and "
@@ -145662,6 +147100,49 @@ msgstr ""
 "Если [code]true[/code], то уменьшаются отражения в зависимости от окружающего "
 "освещения."
 
+msgid ""
+"Sets the renderer that will be used by the project. Options are:\n"
+"[b]forward_plus[/b] (Forward+): High-end renderer designed for desktop "
+"devices. Has a higher base overhead, but scales well with complex scenes. Not "
+"suitable for older devices or mobile.\n"
+"[b]mobile[/b] (Mobile): Modern renderer designed for mobile devices. Has a "
+"lower base overhead than Forward+, but does not scale as well to large scenes "
+"with many elements.\n"
+"[b]gl_compatibility[/b] (Compatibility): Low-end renderer designed for older "
+"devices. Based on the limitations of the OpenGL 3.3 / OpenGL ES 3.0 / WebGL 2 "
+"APIs. Lighting calculations are performed on nonlinear sRGB-encoded color "
+"data, which produces inaccurate results that may look acceptable for some "
+"games.\n"
+"This can be overridden using the [code]--rendering-method <method>[/code] "
+"command line argument.\n"
+"[b]Note:[/b] The actual rendering method may be automatically changed by the "
+"engine as a result of a fallback, or a user-specified command line argument. "
+"To get the actual rendering method that is used at runtime, use [method "
+"RenderingServer.get_current_rendering_method] instead of reading this project "
+"setting's value."
+msgstr ""
+"Задает рендерер, который будет использоваться проектом. Варианты:\n"
+"[b]forward_plus[/b] (Forward+): Высокопроизводительный рендерер, "
+"разработанный для настольных устройств. Имеет более высокие базовые накладные "
+"расходы, но хорошо масштабируется для сложных сцен. Не подходит для старых "
+"устройств или мобильных устройств.\n"
+"[b]mobile[/b] (Mobile): Современный рендерер, разработанный для мобильных "
+"устройств. Имеет более низкие базовые накладные расходы, чем Forward+, но "
+"хуже масштабируется для больших сцен с большим количеством элементов.\n"
+"[b]gl_compatibility[/b] (Compatibility): Низкопроизводительный рендерер, "
+"разработанный для старых устройств. Основан на ограничениях API OpenGL 3.3 / "
+"OpenGL ES 3.0 / WebGL 2. Расчеты освещения выполняются на нелинейных данных "
+"цвета, закодированных в sRGB, что приводит к неточным результатам, которые "
+"могут выглядеть приемлемо для некоторых игр.\n"
+"Это можно переопределить с помощью аргумента командной строки [code]--"
+"rendering-method <method>[/code].\n"
+"[b]Примечание:[/b] Фактический метод рендеринга может быть автоматически "
+"изменен движком в результате резервного варианта или указанного пользователем "
+"аргумента командной строки. Чтобы получить фактический метод рендеринга, "
+"используемый во время выполнения, используйте [method "
+"RenderingServer.get_current_rendering_method] вместо чтения значения этого "
+"параметра проекта."
+
 msgid ""
 "Override for [member rendering/renderer/rendering_method] on mobile devices."
 msgstr ""
@@ -145672,6 +147153,43 @@ msgid "Override for [member rendering/renderer/rendering_method] on web."
 msgstr ""
 "Переопределение для [member rendering/renderer/rendering_method] на веб-сайте."
 
+msgid ""
+"Version code of the [url=https://devblogs.microsoft.com/directx/"
+"directx12agility/]Direct3D 12 Agility SDK[/url] to use "
+"([code]D3D12SDKVersion[/code]). This must match the [i]minor[/i] version that "
+"is installed next to the editor binary and in the export templates directory "
+"for the current editor version. For example, if you have [code]1.618.5[/code] "
+"installed, you need to input [code]618[/code] here."
+msgstr ""
+"Код версии [url=https://devblogs.microsoft.com/directx/"
+"directx12agility/]Direct3D 12 Agility SDK[/url] для использования "
+"([code]D3D12SDKVersion[/code]). Он должен соответствовать [i]дополнительной[/"
+"i] версии, установленной рядом с исполняемым файлом редактора и в каталоге "
+"шаблонов экспорта для текущей версии редактора. Например, если у вас "
+"установлена [code]1.618.5[/code], вам нужно ввести [code]618[/code] здесь."
+
+msgid ""
+"The number of entries in the resource descriptor heap the Direct3D 12 "
+"rendering driver uses for most rendering operations.\n"
+"Depending on the complexity of scenes, this value may be lowered or may need "
+"to be raised."
+msgstr ""
+"Количество записей в куче дескрипторов ресурсов, используемых драйвером "
+"рендеринга Direct3D 12 для большинства операций рендеринга.\n"
+"В зависимости от сложности сцен это значение может быть уменьшено или, "
+"наоборот, увеличено."
+
+msgid ""
+"The number of entries in the sampler descriptor heap the Direct3D 12 "
+"rendering driver uses for most rendering operations.\n"
+"Depending on the complexity of scenes, this value may be lowered or may need "
+"to be raised."
+msgstr ""
+"Количество записей в куче дескрипторов сэмплера, используемых драйвером "
+"рендеринга Direct3D 12 для большинства операций рендеринга.\n"
+"В зависимости от сложности сцен это значение может быть уменьшено или, "
+"наоборот, увеличено."
+
 msgid ""
 "Sets the driver to be used by the renderer when using a RenderingDevice-based "
 "renderer like the Forward+ or Mobile renderers. Editing this property has no "
@@ -145791,6 +147309,71 @@ msgstr ""
 "Поддерживается только один параметр:\n"
 "- [code]metal[/code] (по умолчанию), Metal из собственных драйверов."
 
+msgid ""
+"Windows override for [member rendering/rendering_device/driver].\n"
+"Two options are supported:\n"
+"- [code]vulkan[/code] (default), Vulkan from native drivers. If [member "
+"rendering/rendering_device/fallback_to_vulkan] is enabled, this is used as a "
+"fallback if Direct3D 12 is not supported.\n"
+"- [code]d3d12[/code], Direct3D 12 from native drivers. If [member rendering/"
+"rendering_device/fallback_to_d3d12] is enabled, this is used as a fallback if "
+"Vulkan is not supported.\n"
+"[b]Note:[/b] Starting with Godot 4.6, new projects are configured by default "
+"to use [code]d3d12[/code] on Windows. Projects created before Godot 4.6 keep "
+"[code]vulkan[/code] for compatibility reasons, but it is recommended to "
+"switch them manually to [code]d3d12[/code]."
+msgstr ""
+"Переопределение Windows для [member rendering/rendering_device/driver].\n"
+"Поддерживаются два варианта:\n"
+"- [code]vulkan[/code] (по умолчанию), Vulkan из нативных драйверов. Если "
+"[member rendering/rendering_device/fallback_to_vulkan] включен, это "
+"используется в качестве резервного варианта, если Direct3D 12 не "
+"поддерживается.\n"
+"- [code]d3d12[/code], Direct3D 12 из нативных драйверов. Если [member "
+"rendering/rendering_device/fallback_to_d3d12] включен, это используется в "
+"качестве резервного варианта, если Vulkan не поддерживается.\n"
+"[b]Примечание:[/b] Начиная с Godot 4.6, новые проекты по умолчанию настроены "
+"на использование [code]d3d12[/code] в Windows. В проектах, созданных до Godot "
+"4.6, по соображениям совместимости сохраняется [code]vulkan[/code], но "
+"рекомендуется вручную переключить их на [code]d3d12[/code]."
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to Direct3D 12 if "
+"Vulkan is not supported. The fallback is always attempted regardless of this "
+"setting if Vulkan driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows."
+msgstr ""
+"Если [code]true[/code], рендерер Forward+ будет переключаться на Direct3D 12, "
+"если Vulkan не поддерживается. Переключение всегда предпринимается независимо "
+"от этой настройки, если поддержка драйвера Vulkan была отключена во время "
+"компиляции.\n"
+"[b]Примечание:[/b] Эта настройка реализована только в Windows."
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to OpenGL 3 if "
+"Direct3D 12, Metal, and Vulkan are not supported.\n"
+"[b]Note:[/b] This setting is implemented on Windows, Android, macOS, iOS, and "
+"Linux/X11."
+msgstr ""
+"Если [code]true[/code], рендерер Forward+ будет переключаться на OpenGL 3, "
+"если Direct3D 12, Metal и Vulkan не поддерживаются.\n"
+"[b]Примечание:[/b] Этот параметр реализован в Windows, Android, macOS, iOS и "
+"Linux/X11."
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to Vulkan if "
+"Direct3D 12 (on Windows) or Metal (on macOS x86_64) are not supported. The "
+"fallback is always attempted regardless of this setting if Direct3D 12 "
+"(Windows) or Metal (macOS) driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented on Windows and macOS."
+msgstr ""
+"Если [code]true[/code], рендерер Forward+ будет переключаться на Vulkan, если "
+"Direct3D 12 (в Windows) или Metal (в macOS x86_64) не поддерживаются. "
+"Переключение всегда предпринимается независимо от этой настройки, если "
+"поддержка драйверов Direct3D 12 (Windows) или Metal (macOS) была отключена во "
+"время компиляции.\n"
+"[b]Примечание:[/b] Эта настройка реализована в Windows и macOS."
+
 msgid ""
 "Enable the pipeline cache that is saved to disk if the graphics API supports "
 "it.\n"
@@ -145904,6 +147487,49 @@ msgstr ""
 "[b]Примечание:[/b] Это свойство считывается только при запуске проекта. В "
 "настоящее время нет способа изменить это значение во время выполнения."
 
+msgid ""
+"The number of images the swapchain will consist of (back buffers + front "
+"buffer).\n"
+"[code]2[/code] corresponds to double-buffering and [code]3[/code] to triple-"
+"buffering.\n"
+"Double-buffering may give you the lowest lag/latency but if V-Sync is on and "
+"the system can't render at 60 fps, the framerate will go down in multiples of "
+"it (e.g. 30 fps, 15, 7.5, etc.). Triple buffering gives you higher framerate "
+"(specially if the system can't reach a constant 60 fps) at the cost of up to "
+"1 frame of latency, with [constant DisplayServer.VSYNC_ENABLED] (FIFO).\n"
+"Use double-buffering with [constant DisplayServer.VSYNC_ENABLED]. Triple-"
+"buffering is a must if you plan on using [constant "
+"DisplayServer.VSYNC_MAILBOX] mode.\n"
+"Try the [url=https://darksylinc.github.io/vsync_simulator/]V-Sync Simulator[/"
+"url], an interactive interface that simulates presentation to better "
+"understand how it is affected by different variables under various "
+"conditions.\n"
+"[b]Note:[/b] Changes to this setting will only be applied on startup or when "
+"the swapchain is recreated (e.g. when setting the V-Sync mode).\n"
+"[b]Note:[/b] Some platforms may restrict the actual value."
+msgstr ""
+"Количество изображений, из которых будет состоять цепочка обмена (задние "
+"буферы + передний буфер).\n"
+"[code]2[/code] соответствует двойной буферизации, а [code]3[/code] — тройной "
+"буферизации.\n"
+"Двойная буферизация может обеспечить наименьшую задержку, но если V-Sync "
+"включен и система не может рендерить со скоростью 60 кадров в секунду, "
+"частота кадров снизится в несколько раз (например, до 30, 15, 7,5 и т. д.). "
+"Тройная буферизация обеспечивает более высокую частоту кадров (особенно если "
+"система не может достичь постоянных 60 кадров в секунду) за счет задержки до "
+"1 кадра, с [constant DisplayServer.VSYNC_ENABLED] (FIFO).\n"
+"Используйте двойную буферизацию с [constant DisplayServer.VSYNC_ENABLED]. "
+"Тройная буферизация обязательна, если вы планируете использовать режим "
+"[constant DisplayServer.VSYNC_MAILBOX].\n"
+"Попробуйте [url=https://darksylinc.github.io/vsync_simulator/]симулятор V-"
+"Sync[/url] — интерактивный интерфейс, имитирующий отображение, чтобы лучше "
+"понять, как на него влияют различные переменные в разных условиях.\n"
+"[b]Примечание:[/b] Изменения этого параметра будут применяться только при "
+"запуске или при пересоздании цепочки обмена (например, при установке режима V-"
+"Sync).\n"
+"[b]Примечание:[/b] На некоторых платформах фактическое значение может быть "
+"ограничено."
+
 msgid ""
 "The number of descriptors per pool. Godot's Vulkan backend uses linear pools "
 "for descriptors that will be created and destroyed within a single frame. "
@@ -146225,6 +147851,16 @@ msgstr ""
 "потерь, используя формат PNG. В противном случае он будет по умолчанию "
 "использовать WebP."
 
+msgid ""
+"If [code]true[/code], the GPU texture compressor will cache the local "
+"RenderingDevice and its resources (shaders and pipelines), making subsequent "
+"imports faster at the cost of increased memory usage."
+msgstr ""
+"Если [code]true[/code], то компрессор текстур на графическом процессоре будет "
+"кэшировать локальное устройство рендеринга (RenderingDevice) и его ресурсы "
+"(шейдеры и конвейеры), что ускорит последующий импорт за счет увеличения "
+"использования памяти."
+
 msgid ""
 "If [code]true[/code], the texture importer will utilize the GPU for "
 "compressing textures, improving the import time of large images.\n"
@@ -146320,6 +147956,37 @@ msgstr ""
 "основном не зависит от коэффициента сжатия. Поддерживаемые значения от 0 до "
 "100."
 
+msgid ""
+"If [code]true[/code], enables [member Viewport.use_hdr_2d] on the root "
+"Viewport. 2D rendering will use a high dynamic range (HDR) [code]RGBA16[/"
+"code] format framebuffer. Additionally, 2D rendering will be performed on "
+"linear values and will be converted using the appropriate transfer function "
+"immediately before blitting to the screen.\n"
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped to the [code]0-1[/code] range and can be used in 3D rendering "
+"without color encoding adjustments. This allows 2D rendering to take "
+"advantage of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients.\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"HDR 2D at runtime, set [member Viewport.use_hdr_2d] on the root [Viewport]."
+msgstr ""
+"Если [code]true[/code], включается [member Viewport.use_hdr_2d] для корневого "
+"Viewport. 2D-рендеринг будет использовать буфер кадров в формате RGBA16 с "
+"высоким динамическим диапазоном (HDR). Кроме того, 2D-рендеринг будет "
+"выполняться на линейных значениях и будет преобразован с использованием "
+"соответствующей функции преобразования непосредственно перед выводом на "
+"экран.\n"
+"На практике это означает, что конечный результат Viewport не будет ограничен "
+"диапазоном [code]0-1[/code] и может использоваться в 3D-рендеринге без "
+"корректировки цветового кодирования. Это позволяет 2D-рендерингу использовать "
+"эффекты, требующие высокого динамического диапазона (например, 2D-свечение), "
+"а также существенно улучшает внешний вид эффектов, требующих "
+"высокодетализированных градиентов.\n"
+"[b]Примечание:[/b] Это свойство считывается только при запуске проекта. Чтобы "
+"включить/выключить HDR 2D во время выполнения, установите [member "
+"Viewport.use_hdr_2d] для корневого [Viewport]."
+
 msgid ""
 "If [code]true[/code], enables [member Viewport.transparent_bg] on the root "
 "viewport. This allows per-pixel transparency to be effective after also "
@@ -146397,6 +148064,15 @@ msgstr ""
 "ядер ЦП минус один, и, если возможно, по крайней мере один рабочий поток "
 "будет выделен для низкоприоритетных задач."
 
+msgid ""
+"Maximum number of threads to be used by [WorkerThreadPool]. On Web, a value "
+"of [code]-1[/code] means [code]1[/code]. On other platforms, it means all "
+"[i]logical[/i] CPU cores available (see [method OS.get_processor_count])."
+msgstr ""
+"Максимальное количество потоков, используемых [WorkerThreadPool]. В веб-среде "
+"значение [code]-1[/code] означает [code]1[/code]. На других платформах это "
+"означает все [i]логические[/i] ядра CPU (см. [method OS.get_processor_count])."
+
 msgid ""
 "If [code]true[/code], enables the analog threshold binding modifier if "
 "supported by the XR runtime."
@@ -146454,6 +148130,17 @@ msgstr ""
 "зависимости от платформы может потребоваться дополнительная конфигурация "
 "экспорта."
 
+msgid ""
+"If [code]true[/code] the frame synthesis extension will be activated if "
+"supported by the platform.\n"
+"[b]Note:[/b] This feature should not be enabled in conjunction with "
+"Application Space Warp, if supported this replaces ASW."
+msgstr ""
+"Если [code]true[/code], расширение синтеза кадров будет активировано, если "
+"оно поддерживается платформой.\n"
+"[b]Примечание:[/b] Эту функцию не следует включать одновременно с Application "
+"Space Warp; если она поддерживается, она заменяет ASW."
+
 msgid ""
 "If [code]true[/code] the hand interaction profile extension will be activated "
 "if supported by the platform."
@@ -146535,6 +148222,163 @@ msgstr ""
 "OpenXR и не имеет отношения к расширениям модели рендеринга других "
 "поставщиков."
 
+msgid ""
+"The April Tag marker types the built-in marker tracking is set to recognize "
+"(if April Tag marker tracking is available and enabled)."
+msgstr ""
+"Типы маркеров April Tag, которые встроенная система отслеживания маркеров "
+"должна распознавать (если отслеживание маркеров April Tag доступно и "
+"включено)."
+
+msgid ""
+"The ArUco marker types the built-in marker tracking is set to recognize (if "
+"ArUco marker tracking is available and enabled)."
+msgstr ""
+"Типы маркеров ArUco, которые встроенная система отслеживания маркеров должна "
+"распознавать (если отслеживание маркеров ArUco доступно и включено)."
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling anchors. "
+"Godot will query (persistent) anchors and manage [OpenXRAnchorTracker] "
+"instances for you. If disabled you'll need to create your own spatial and "
+"persistence context and perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that spatial anchors are supported "
+"and enabled."
+msgstr ""
+"Если [code]true[/code], мы включаем встроенную логику обработки якорей. Godot "
+"будет запрашивать (постоянные) якоря и управлять экземплярами "
+"[OpenXRAnchorTracker] за вас. Если отключено, вам потребуется создать "
+"собственный пространственный и постоянный контекст и выполнять собственные "
+"запросы обнаружения.\n"
+"[b]Примечание:[/b] Для работы этой функции требуется поддержка и включение "
+"пространственных якорей."
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling marker "
+"tracking. Godot will query markers and manage [OpenXRMarkerTracker] instances "
+"for you. If disabled you'll need to create your own spatial context and "
+"perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that marker tracking is supported "
+"and enabled."
+msgstr ""
+"Если [code]true[/code], мы включаем встроенную логику для обработки "
+"отслеживания маркеров. Godot будет запрашивать маркеры и управлять "
+"экземплярами [OpenXRMarkerTracker] за вас. Если отключено, вам потребуется "
+"создать собственный пространственный контекст и выполнять собственные запросы "
+"обнаружения.\n"
+"[b]Примечание:[/b] Для работы этой функции требуется поддержка и включение "
+"отслеживания маркеров."
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling plane "
+"detection. Godot will query detected planes (walls, floors, ceilings, etc.) "
+"and manage [OpenXRPlaneTracker] instances for you. If disabled you'll need to "
+"create your own spatial context and perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that plane tracking is supported and "
+"enabled."
+msgstr ""
+"Если [code]true[/code], мы включаем встроенную логику обработки обнаружения "
+"плоскостей. Godot будет запрашивать обнаруженные плоскости (стены, полы, "
+"потолки и т. д.) и управлять экземплярами [OpenXRPlaneTracker] за вас. Если "
+"отключено, вам потребуется создать собственный пространственный контекст и "
+"выполнять собственные запросы обнаружения.\n"
+"[b]Примечание:[/b] Для работы этой функции требуется поддержка и включение "
+"отслеживания плоскостей."
+
+msgid ""
+"If [code]true[/code], support for the marker tracking extension is requested. "
+"If supported, you will be able to query information about markers detected by "
+"the XR runtime, e.g. QR codes, aruca markers and april tags.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and marker "
+"tracking extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"Если [code]true[/code], запрашивается поддержка расширения отслеживания "
+"маркеров. Если поддержка есть, вы сможете запрашивать информацию о маркерах, "
+"обнаруженных средой выполнения XR, например, QR-кодах, маркерах Aruca и тегах "
+"April.\n"
+"[b]Примечание:[/b] Для этого требуется, чтобы среда выполнения XR "
+"поддерживала пространственные объекты OpenXR и расширения отслеживания "
+"маркеров. Если поддержка отсутствует, этот параметр будет проигнорирован. Для "
+"использования этого параметра необходимо включить параметр [member xr/openxr/"
+"extensions/spatial_entity/enabled]."
+
+msgid ""
+"If [code]true[/code], support for the persistent anchors extension is "
+"requested. If supported, you will be able to store spatial anchors and they "
+"will be restored on application startup.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities, spatial anchors, "
+"and spatial persistence extensions are supported by the XR runtime. If not "
+"supported this setting will be ignored. [member xr/openxr/extensions/"
+"spatial_entity/enabled] and [member xr/openxr/extensions/spatial_entity/"
+"enable_spatial_anchors] must be enabled for this setting to be used."
+msgstr ""
+"Если [code]true[/code], запрашивается поддержка расширения постоянных "
+"привязок. Если поддерживается, вы сможете сохранять пространственные "
+"привязки, и они будут восстанавливаться при запуске приложения.\n"
+"[b]Примечание:[/b] Для этого требуется, чтобы пространственные сущности "
+"OpenXR, пространственные привязки и расширения сохранения пространственных "
+"данных поддерживались средой выполнения XR. Если не поддерживается, этот "
+"параметр будет проигнорирован. Для использования этого параметра необходимо "
+"включить [member xr/openxr/extensions/spatial_entity/enabled] и [member xr/"
+"openxr/extensions/spatial_entity/enable_spatial_anchors]."
+
+msgid ""
+"If [code]true[/code], support for the plane tracking extension is requested. "
+"If supported, you will be able to query information about planes detected by "
+"the XR runtime, e.g. walls, floors, etc.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and plane "
+"tracking extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"Если [code]true[/code], запрашивается поддержка расширения отслеживания "
+"плоскостей. Если поддержка есть, вы сможете запрашивать информацию о "
+"плоскостях, обнаруженных средой выполнения XR, например, о стенах, полах и т. "
+"д.\n"
+"[b]Примечание:[/b] Для этого требуется, чтобы среда выполнения XR "
+"поддерживала пространственные объекты OpenXR и расширения отслеживания "
+"плоскостей. Если поддержка отсутствует, этот параметр будет проигнорирован. "
+"Для использования этого параметра необходимо включить параметр [member xr/"
+"openxr/extensions/spatial_entity/enabled]."
+
+msgid ""
+"If [code]true[/code], support for the spatial anchors extension is requested. "
+"If supported, you will be able to register anchor locations in the real world "
+"that the XR runtime will adjust as needed and/or potentially share with other "
+"headsets.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and spatial "
+"anchors extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"Если [code]true[/code], запрашивается поддержка расширения пространственных "
+"якорей. Если поддерживается, вы сможете регистрировать местоположения якорей "
+"в реальном мире, которые среда выполнения XR будет корректировать по мере "
+"необходимости и/или потенциально передавать другим гарнитурам.\n"
+"[b]Примечание:[/b] Для этого требуется, чтобы среда выполнения XR "
+"поддерживала пространственные сущности OpenXR и расширения пространственных "
+"якорей. Если это не поддерживается, этот параметр будет проигнорирован. Для "
+"использования этого параметра необходимо включить параметр [member xr/openxr/"
+"extensions/spatial_entity/enabled]."
+
+msgid ""
+"If [code]true[/code], support for the spatial entity extension is requested. "
+"If supported, you will be able to access spatial information about the real "
+"environment around you. What information is available is dependent on "
+"additional extensions.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities extension is "
+"supported by the XR runtime. If not supported this setting will be ignored."
+msgstr ""
+"Если [code]true[/code], запрашивается поддержка расширения пространственных "
+"сущностей. Если поддержка есть, вы сможете получить доступ к пространственной "
+"информации об окружающей вас среде. Доступная информация зависит от "
+"дополнительных расширений.\n"
+"[b]Примечание:[/b] Для этого требуется, чтобы расширение пространственных "
+"сущностей OpenXR поддерживалось средой выполнения XR. Если поддержка "
+"отсутствует, этот параметр будет проигнорирован."
+
 msgid ""
 "Specify whether OpenXR should be configured for an HMD or a hand held device."
 msgstr ""
@@ -146549,6 +148393,15 @@ msgstr ""
 "регулироваться уровень фовеации на основе частоты кадров до уровня, "
 "установленного в [member xr/openxr/foveation_level]."
 
+msgid ""
+"Applied foveation level if supported.\n"
+"[b]Note:[/b] On platforms other than Android, if [member rendering/"
+"anti_aliasing/quality/msaa_3d] is enabled, this feature will be disabled."
+msgstr ""
+"Применяется уровень фовеации, если поддерживается.\n"
+"[b]Примечание:[/b] На платформах, отличных от Android, если включен параметр "
+"[member rendering/anti_aliasing/quality/msaa_3d], эта функция будет отключена."
+
 msgid "Specify the default reference space."
 msgstr "Укажите ссылочное пространство по умолчанию."
 
@@ -146570,6 +148423,16 @@ msgstr ""
 "поддерживается средой выполнения XR. Обратите внимание, что некоторые функции "
 "рендеринга в Godot не могут использоваться с этой функцией."
 
+msgid ""
+"Optionally sets a specific API version of OpenXR to initialize in "
+"[code]major.minor.patch[/code] notation. Some XR runtimes gate old behavior "
+"behind version checks. This is non-standard OpenXR behavior."
+msgstr ""
+"При необходимости задается конкретная версия API OpenXR для инициализации в "
+"формате [code]major.minor.patch[/code]. Некоторые среды выполнения XR "
+"ограничивают старое поведение проверкой версии. Это нестандартное поведение "
+"OpenXR."
+
 msgid ""
 "Specify the view configuration with which to configure OpenXR setting up "
 "either Mono or Stereo rendering."
@@ -147565,6 +149428,24 @@ msgstr ""
 "Если [code]true[/code], [member value] всегда будет округляться до ближайшего "
 "целого числа."
 
+msgid ""
+"If greater than [code]0.0[/code], [member value] will always be rounded to a "
+"multiple of this property's value above [member min_value]. For example, if "
+"[member min_value] is [code]0.1[/code] and step is [code]0.2[/code], then "
+"[member value] is limited to [code]0.1[/code], [code]0.3[/code], [code]0.5[/"
+"code], and so on. If [member rounded] is also [code]true[/code], [member "
+"value] will first be rounded to a multiple of this property's value, then "
+"rounded to the nearest integer."
+msgstr ""
+"Если значение параметра [member value] больше [code]0.0[/code], оно всегда "
+"будет округляться до кратного значения этого свойства, превышающего [member "
+"min_value]. Например, если [member min_value] равно [code]0.1[/code], а step "
+"равно [code]0.2[/code], то значение параметра [member value] будет ограничено "
+"значениями [code]0.1[/code], [code]0.3[/code], [code]0.5[/code] и так далее. "
+"Если [member rounded] также равно [code]true[/code], значение параметра "
+"[member value] сначала будет округляться до кратного значения этого свойства, "
+"а затем до ближайшего целого числа."
+
 msgid ""
 "Range's current value. Changing this property (even via code) will trigger "
 "[signal value_changed] signal. Use [method set_value_no_signal] if you want "
@@ -149190,6 +151071,22 @@ msgstr "Тип данных униформы."
 msgid "Vertex attribute (used by [RenderingDevice])."
 msgstr "Атрибут вершины (используется [RenderingDevice])."
 
+msgid ""
+"The index of the buffer in the vertex buffer array to bind this vertex "
+"attribute. When set to [code]-1[/code], it defaults to the index of the "
+"attribute.\n"
+"[b]Note:[/b] You cannot mix binding explicitly assigned attributes with "
+"implicitly assigned ones (i.e. [code]-1[/code]). Either all attributes must "
+"have their binding set to [code]-1[/code], or all must have explicit bindings."
+msgstr ""
+"Индекс буфера в массиве вершинных буферов для привязки этого атрибута "
+"вершины. Если установлено значение [code]-1[/code], по умолчанию используется "
+"индекс атрибута.\n"
+"[b]Примечание:[/b] Нельзя смешивать привязку явно назначенных атрибутов с "
+"неявно назначенными (т.е. [code]-1[/code]). Либо все атрибуты должны иметь "
+"привязку, установленную на [code]-1[/code], либо все должны иметь явную "
+"привязку."
+
 msgid "The way that this attribute's data is interpreted when sent to a shader."
 msgstr "Способ интерпретации данных этого атрибута при отправке в шейдер."
 
@@ -150271,6 +152168,151 @@ msgid "Class for searching text for patterns using regular expressions."
 msgstr ""
 "Класс для поиска в тексте шаблонов с использованием регулярных выражений."
 
+msgid ""
+"A regular expression (or regex) is a compact language that can be used to "
+"recognize strings that follow a specific pattern, such as URLs, email "
+"addresses, complete sentences, etc. For example, a regex of [code]ab[0-9][/"
+"code] would find any string that is [code]ab[/code] followed by any number "
+"from [code]0[/code] to [code]9[/code]. For a more in-depth look, you can "
+"easily find various tutorials and detailed explanations on the Internet.\n"
+"To begin, the RegEx object needs to be compiled with the search pattern using "
+"[method compile] before it can be used. Alternatively, the static method "
+"[method create_from_string] can be used to create and compile a RegEx object "
+"in a single method call.\n"
+"[codeblock]\n"
+"var regex = RegEx.new()\n"
+"regex.compile(\"\\\\w-(\\\\d+)\")\n"
+"# Shorthand to create and compile a regex (used in the examples below):\n"
+"var regex2 = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"[/codeblock]\n"
+"The search pattern must be escaped first for GDScript before it is escaped "
+"for the expression. For example, [code]compile(\"\\\\d+\")[/code] would be "
+"read by RegEx as [code]\\d+[/code]. Similarly, [code]compile(\"\\\"(?:\\\\\\"
+"\\.|[^\\\"])*\\\"\")[/code] would be read as [code]\"(?:\\\\.|[^\"])*\"[/"
+"code]. In GDScript, you can also use raw string literals (r-strings). For "
+"example, [code]compile(r'\"(?:\\\\.|[^\"])*\"')[/code] would be read the "
+"same.\n"
+"Using [method search], you can find the pattern within the given text. If a "
+"pattern is found, [RegExMatch] is returned and you can retrieve details of "
+"the results using methods such as [method RegExMatch.get_string] and [method "
+"RegExMatch.get_start].\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"var result = regex.search(\"abc n-0123\")\n"
+"if result:\n"
+"\tprint(result.get_string()) # Prints \"n-0123\"\n"
+"[/codeblock]\n"
+"The results of capturing groups [code]()[/code] can be retrieved by passing "
+"the group number to the various methods in [RegExMatch]. Group 0 is the "
+"default and will always refer to the entire pattern. In the above example, "
+"calling [code]result.get_string(1)[/code] would give you [code]0123[/code].\n"
+"This version of RegEx also supports named capturing groups, and the names can "
+"be used to retrieve the results. If two or more groups have the same name, "
+"the name would only refer to the first one with a match.\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"d(?<digit>[0-9]+)|x(?<digit>[0-9a-f]+)"
+"\")\n"
+"var result = regex.search(\"the number is x2f\")\n"
+"if result:\n"
+"\tprint(result.get_string(\"digit\")) # Prints \"2f\"\n"
+"[/codeblock]\n"
+"If you need to process multiple results, [method search_all] generates a list "
+"of all non-overlapping results. This can be combined with a [code]for[/code] "
+"loop for convenience.\n"
+"[codeblock]\n"
+"# Prints \"01 03 0 3f 42\"\n"
+"for result in regex.search_all(\"d01, d03, d0c, x3f and x42\"):\n"
+"\tprint(result.get_string(\"digit\"))\n"
+"[/codeblock]\n"
+"[b]Example:[/b] Split a string using a RegEx:\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\S+\") # Negated whitespace "
+"character class.\n"
+"var results = []\n"
+"for result in regex.search_all(\"One  Two \\n\\tThree\"):\n"
+"\tresults.push_back(result.get_string())\n"
+"print(results) # Prints [\"One\", \"Two\", \"Three\"]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Godot's regex implementation is based on the [url=https://"
+"www.pcre.org/]PCRE2[/url] library. You can view the full pattern reference "
+"[url=https://www.pcre.org/current/doc/html/pcre2pattern.html]here[/url].\n"
+"[b]Tip:[/b] You can use [url=https://regexr.com/]Regexr[/url] to test regular "
+"expressions online."
+msgstr ""
+"Регулярное выражение (или regex) — это компактный язык, который можно "
+"использовать для распознавания строк, следующих определенному шаблону, "
+"например, URL-адресов, адресов электронной почты, целых предложений и т. д. "
+"Например, регулярное выражение [code]ab[0-9][/code] найдет любую строку, "
+"которая представляет собой [code]ab[/code], за которой следует любое число от "
+"[code]0[/code] до [code]9[/code]. Для более подробного изучения вы легко "
+"найдете различные руководства и подробные объяснения в Интернете.\n"
+"Для начала необходимо скомпилировать объект RegEx с шаблоном поиска с помощью "
+"метода [method compile]. В качестве альтернативы, для создания и компиляции "
+"объекта RegEx за один вызов метода можно использовать статический метод "
+"[method create_from_string].\n"
+"[codeblock]\n"
+"var regex = RegEx.new()\n"
+"regex.compile(\"\\\\w-(\\\\d+)\")\n"
+"# Сокращенная запись для создания и компиляции регулярного выражения "
+"(используется в примерах ниже):\n"
+"var regex2 = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"[/codeblock]\n"
+"В GDScript шаблон поиска необходимо сначала экранировать, прежде чем "
+"экранировать его для выражения. Например, [code]compile(\"\\\\d+\")[/code] "
+"будет прочитано регулярным выражением как [code]\\d+[/code]. Аналогично, "
+"[code]compile(\"\\\"(?:\\\\\\\\.|[^\\\"])*\\\"\")[/code] будет прочитано как "
+"[code]\"(?:\\\\.|[^\"])*\"[/code]. В GDScript также можно использовать "
+"строковые литералы (r-строки). Например, [code]compile(r'\"(?:\\\\.|"
+"[^\"])*\"')[/code] будет прочитано так же.\n"
+"Используя [method search], вы можете найти шаблон в заданном тексте. Если "
+"шаблон найден, возвращается [RegExMatch], и вы можете получить подробную "
+"информацию о результатах, используя такие методы, как [method "
+"RegExMatch.get_string] и [method RegExMatch.get_start].\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"var result = regex.search(\"abc n-0123\")\n"
+"if result:\n"
+"\tprint(result.get_string()) # Выводит \"n-0123\"\n"
+"[/codeblock]\n"
+"Результаты захвата групп [code]()[/code] можно получить, передав номер группы "
+"различным методам в [RegExMatch]. Группа 0 является группой по умолчанию и "
+"всегда будет ссылаться на весь шаблон. В приведенном выше примере вызов "
+"[code]result.get_string(1)[/code] даст вам [code]0123[/code].\n"
+"Эта версия RegEx также поддерживает именованные группы захвата, и имена можно "
+"использовать для получения результатов. Если две или более групп имеют "
+"одинаковое имя, имя будет ссылаться только на первую группу, в которой есть "
+"совпадение.\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"d(?<digit>[0-9]+)|x(?<digit>[0-9a-f]+)"
+"\")\n"
+"var result = regex.search(\"the number is x2f\")\n"
+"if result:\n"
+"\tprint(result.get_string(\"digit\")) # Выводит \"2f\"\n"
+"[/codeblock]\n"
+"Если вам нужно обработать несколько результатов, метод [method search_all] "
+"генерирует список всех непересекающихся результатов. Для удобства его можно "
+"комбинировать с циклом [code]for[/code].\n"
+"[codeblock]\n"
+"# Выводит \"01 03 0 3f 42\"\n"
+"for result in regex.search_all(\"d01, d03, d0c, x3f and x42\"):\n"
+"\tprint(result.get_string(\"digit\"))\n"
+"[/codeblock]\n"
+"[b]Пример:[/b] Разделение строки с помощью регулярного выражения:\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\S+\") # Класс символов "
+"отрицательных пробелов.\n"
+"var results = []\n"
+"for result in regex.search_all(\"One  Two \\n\\tThree\"):\n"
+"\tresults.push_back(result.get_string())\n"
+"print(results) # Выводит [\"One\", \"Two\", \"Three\"]\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Реализация регулярных выражений в Godot основана на "
+"библиотеке [url=https://www.pcre.org/]PCRE2[/url]. Полный справочник шаблонов "
+"можно посмотреть здесь [url=https://www.pcre.org/current/doc/html/"
+"pcre2pattern.html].\n"
+"[b]Совет:[/b] Вы можете использовать [url=https://regexr.com/]Regexr[/url] "
+"для тестирования регулярных выражений онлайн."
+
 msgid ""
 "This method resets the state of the object, as if it was freshly created. "
 "Namely, it unassigns the regular expression of this object."
@@ -150543,6 +152585,19 @@ msgstr ""
 "Абстрактный объект данных рендеринга, содержит данные кадра, относящиеся к "
 "рендерингу одного кадра области просмотра."
 
+msgid ""
+"Abstract render data object, exists for the duration of rendering a single "
+"viewport. See also [RenderDataRD], [RenderSceneData], and "
+"[RenderSceneDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Абстрактный объект данных рендеринга, существующий в течение всего времени "
+"рендеринга одного видового окна. См. также [RenderDataRD], [RenderSceneData] "
+"и [RenderSceneDataRD].\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid ""
 "Returns the [RID] of the camera attributes object in the [RenderingServer] "
 "being used to render this viewport."
@@ -150599,6 +152654,23 @@ msgstr ""
 "Реализуйте это в GDExtension, чтобы вернуть объект реализации "
 "[RenderSceneDataExtension]."
 
+msgid "Render data implementation for the RenderingDevice based renderers."
+msgstr ""
+"Реализация данных для рендеринга в рендерерах на основе RenderingDevice."
+
+msgid ""
+"This object manages all render data for the [RenderingDevice]-based "
+"renderers. See also [RenderData], [RenderSceneData], and "
+"[RenderSceneDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Этот объект управляет всеми данными рендеринга для рендереров на основе "
+"[RenderingDevice]. См. также [RenderData], [RenderSceneData] и "
+"[RenderSceneDataRD].\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid "Abstraction for working with modern low-level graphics APIs."
 msgstr "Абстракция для работы с современными низкоуровневыми графическими API."
 
@@ -150919,6 +152991,19 @@ msgstr ""
 "можно получить, вызвав метод [method PackedByteArray.size] для переданного "
 "[param buffer])."
 
+msgid ""
+"Creates a new compute pipeline. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] is freed."
+msgstr ""
+"Создает новый вычислительный конвейер. Доступ к нему осуществляется по "
+"возвращаемому RID.\n"
+"После завершения работы с RID вам потребуется освободить его, используя "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобожден автоматически при освобождении [param shader]."
+
 msgid ""
 "Returns [code]true[/code] if the compute pipeline specified by the [param "
 "compute_pipeline] RID is valid, [code]false[/code] otherwise."
@@ -151115,6 +153200,17 @@ msgstr ""
 msgid "Binds [param vertex_array] to the specified [param draw_list]."
 msgstr "Связывает [param vertex_array] с указанным [param draw_list]."
 
+msgid ""
+"Binds a set of [param vertex_buffers] directly to the specified [param "
+"draw_list] using [param vertex_format] without creating a vertex array RID. "
+"Provide the number of vertices in [param vertex_count]; optional per-buffer "
+"byte [param offsets] may also be supplied."
+msgstr ""
+"Привязывает набор из [param vertex_buffers] непосредственно к указанному "
+"[param draw_list] с использованием [param vertex_format] без создания RID "
+"массива вершин. Укажите количество вершин в [param vertex_count]; также могут "
+"быть указаны необязательные байты для каждого буфера [param offsets]."
+
 msgid ""
 "Removes and disables the scissor rectangle for the specified [param "
 "draw_list]. See also [method draw_list_enable_scissor]."
@@ -151193,6 +153289,18 @@ msgstr ""
 msgid "Switches to the next draw pass."
 msgstr "Переключается на следующий проход розыгрыша."
 
+msgid ""
+"Creates a new framebuffer. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param textures] is freed."
+msgstr ""
+"Создаёт новый буфер кадров. Доступ к нему осуществляется по возвращаемому "
+"RID.\n"
+"После завершения работы с RID вам потребуется освободить его с помощью "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобождён автоматически при освобождении любого из [param textures]."
+
 msgid ""
 "Creates a new empty framebuffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -151204,6 +153312,19 @@ msgstr ""
 "После завершения работы с RID вам нужно будет освободить RID с помощью метода "
 "[method free_rid] RenderingDevice."
 
+msgid ""
+"Creates a new multipass framebuffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param textures] is freed."
+msgstr ""
+"Создаёт новый многопроходный буфер кадров. Доступ к нему осуществляется по "
+"возвращаемому RID.\n"
+"После завершения работы с RID вам потребуется освободить его с помощью "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобождён автоматически при освобождении любого из [param textures]."
+
 msgid ""
 "Creates a new framebuffer format with the specified [param attachments] and "
 "[param view_count]. Returns the new framebuffer's unique framebuffer format "
@@ -151580,6 +153701,18 @@ msgstr ""
 "Возвращает [code]true[/code], если [param feature] поддерживается графическим "
 "процессором."
 
+msgid ""
+"Creates a new index array. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param index_buffer] is freed."
+msgstr ""
+"Создает новый массив индексов. Доступ к нему осуществляется по возвращаемому "
+"RID.\n"
+"После завершения работы с RID вам потребуется освободить его с помощью "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобожден автоматически при освобождении [param index_buffer]."
+
 msgid ""
 "Creates a new index buffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -151604,6 +153737,19 @@ msgstr ""
 "Ограничения для различного графического оборудования можно найти в "
 "[url=https://vulkan.gpuinfo.org/]База данных оборудования Vulkan[/url]."
 
+msgid ""
+"Creates a new render pipeline. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] is freed."
+msgstr ""
+"Создает новый конвейер рендеринга. Доступ к нему осуществляется по "
+"возвращаемому RID.\n"
+"После завершения работы с вашим RID вам потребуется освободить его, используя "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобожден автоматически при освобождении [param shader]."
+
 msgid ""
 "Returns [code]true[/code] if the render pipeline specified by the [param "
 "render_pipeline] RID is valid, [code]false[/code] otherwise."
@@ -151955,6 +154101,43 @@ msgstr ""
 "mipmaps]. Это можно использовать, чтобы разрешить Godot выполнять рендеринг "
 "на сторонних изображениях."
 
+msgid ""
+"Creates a shared texture using the specified [param view] and the texture "
+"information from [param with_texture].\n"
+"This will be freed automatically when the [param with_texture] is freed."
+msgstr ""
+"Создаёт общую текстуру, используя указанный параметр [param view] и "
+"информацию о текстуре из параметра [param with_texture].\n"
+"Этот параметр будет автоматически освобождён при освобождении параметра "
+"[param with_texture]."
+
+msgid ""
+"Creates a shared texture using the specified [param view] and the texture "
+"information from [param with_texture]'s [param layer] and [param mipmap]. The "
+"number of included mipmaps from the original texture can be controlled using "
+"the [param mipmaps] parameter. Only relevant for textures with multiple "
+"layers, such as 3D textures, texture arrays and cubemaps. For single-layer "
+"textures, use [method texture_create_shared].\n"
+"For 2D textures (which only have one layer), [param layer] must be [code]0[/"
+"code].\n"
+"[b]Note:[/b] Layer slicing is only supported for 2D texture arrays, not 3D "
+"textures or cubemaps.\n"
+"This will be freed automatically when the [param with_texture] is freed."
+msgstr ""
+"Создает общую текстуру, используя указанный параметр [param view] и "
+"информацию о текстуре из параметров [param layer] и [param mipmap] параметра "
+"[param with_texture]. Количество включенных мипмапов из исходной текстуры "
+"можно контролировать с помощью параметра [param mipmaps]. Актуально только "
+"для текстур с несколькими слоями, таких как 3D-текстуры, массивы текстур и "
+"кубические карты. Для однослойных текстур используйте [method "
+"texture_create_shared].\n"
+"Для 2D-текстур (которые имеют только один слой) параметр [param layer] должен "
+"быть равен [code]0[/code].\n"
+"[b]Примечание:[/b] Разделение на слои поддерживается только для 2D-массивов "
+"текстур, а не для 3D-текстур или кубических карт.\n"
+"Этот параметр будет автоматически освобожден при освобождении параметра "
+"[param with_texture]."
+
 msgid ""
 "Returns the [param texture] data for the specified [param layer] as raw "
 "binary data. For 2D textures (which only have one layer), [param layer] must "
@@ -152191,11 +154374,39 @@ msgstr ""
 "После завершения работы с RID вам нужно будет освободить RID с помощью метода "
 "[method free_rid] RenderingDevice."
 
+msgid ""
+"Creates a new uniform set. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] or any of the RIDs "
+"in the [param uniforms] is freed."
+msgstr ""
+"Создает новый набор униформ. Доступ к нему осуществляется по возвращаемому "
+"RID.\n"
+"После завершения работы с RID вам потребуется освободить его с помощью "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобожден автоматически при освобождении [param shader] или любого "
+"из RID в [param uniforms]."
+
 msgid "Checks if the [param uniform_set] is valid, i.e. is owned."
 msgstr ""
 "Проверяет, является ли [param uniform_set] допустимым, т.е. принадлежит ли он "
 "кому-либо."
 
+msgid ""
+"Creates a vertex array based on the specified buffers. Optionally, [param "
+"offsets] (in bytes) may be defined for each buffer.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param src_buffers] is freed."
+msgstr ""
+"Создает вершинный массив на основе указанных буферов. При желании для каждого "
+"буфера можно определить [param offsets] (в байтах).\n"
+"После завершения работы с RID вам потребуется освободить его, используя метод "
+"[method free_rid] объекта RenderingDevice.\n"
+"Он будет освобожден автоматически при освобождении любого из [param "
+"src_buffers]."
+
 msgid ""
 "Creates a new vertex buffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -152305,6 +154516,19 @@ msgstr ""
 "игнорируется).\n"
 "- Vulkan: [code]VkInstance[/code]."
 
+msgid ""
+"The main graphics-compute command queue ([code]rid[/code] parameter is "
+"ignored).\n"
+"- Vulkan: [code]VkQueue[/code].\n"
+"- D3D12: [code]ID3D12CommandQueue[/code].\n"
+"- Metal: [code]MTLCommandQueue[/code]."
+msgstr ""
+"Основная очередь команд для графических вычислений (параметр [code]rid[/code] "
+"игнорируется).\n"
+"- Vulkan: [code]VkQueue[/code].\n"
+"- D3D12: [code]ID3D12CommandQueue[/code].\n"
+"- Metal: [code]MTLCommandQueue[/code]."
+
 msgid ""
 "The specific family the main queue belongs to ([code]rid[/code] parameter is "
 "ignored).\n"
@@ -152314,6 +154538,13 @@ msgstr ""
 "[code]rid[/code] игнорируется).\n"
 "- Vulkan: Индекс семейства очереди, [code]uint32_t[/code]."
 
+msgid ""
+"- Vulkan: [code]VkImage[/code].\n"
+"- D3D12: [code]ID3D12Resource[/code]."
+msgstr ""
+"- Vulkan: [code]VkImage[/code].\n"
+"- D3D12: [code]ID3D12Resource[/code]."
+
 msgid ""
 "The view of an owned or shared texture.\n"
 "- Vulkan: [code]VkImageView[/code].\n"
@@ -152527,6 +154758,15 @@ msgstr ""
 "Формат данных красного канала со знаком 8 бит на канал. Значения находятся в "
 "диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"8-битный формат данных красного канала с плавающей запятой без знака на "
+"канал, с нормализованным значением и нелинейным кодированием sRGB. Значения "
+"находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -152577,6 +154817,15 @@ msgstr ""
 "Формат данных красного/зеленого канала со знаком 8 бит на канал. Значения "
 "находятся в диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"8-битный формат данных красного/зеленого канала с плавающей запятой без знака "
+"на канал, с нормализованным значением и нелинейным кодированием sRGB. "
+"Значения находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green/blue channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -152627,6 +154876,15 @@ msgstr ""
 "Формат данных канала красного/зеленого/синего цвета со знаком 8 бит на канал. "
 "Значения находятся в диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green/blue channel data format "
+"with normalized value and nonlinear sRGB encoding. Values are in the [code]"
+"[0.0, 1.0][/code] range."
+msgstr ""
+"8-битный формат данных каналов красного/зеленого/синего цвета с плавающей "
+"запятой без знака на канал, с нормализованным значением и нелинейным "
+"кодированием sRGB. Значения находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point blue/green/red channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -152677,6 +154935,15 @@ msgstr ""
 "Формат данных 8-битного на канал знакового целого числа синего/зеленого/"
 "красного канала. Значения находятся в диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point blue/green/red data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"8-битный формат данных синего/зеленого/красного цвета с плавающей запятой без "
+"знака на канал, с нормализованным значением и нелинейным кодированием sRGB. "
+"Значения находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green/blue/alpha channel data "
 "format with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -152728,6 +154995,15 @@ msgstr ""
 "Формат данных канала красного/зеленого/синего/альфа со знаком 8 бит на канал. "
 "Значения находятся в диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green/blue/alpha channel data "
+"format with normalized value and nonlinear sRGB encoding. Values are in the "
+"[code][0.0, 1.0][/code] range."
+msgstr ""
+"8-битный формат данных с плавающей запятой без знака для каждого канала: "
+"красный/зеленый/синий/альфа-канал, нормализованное значение и нелинейное "
+"кодирование sRGB. Значения находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point blue/green/red/alpha channel data "
 "format with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -152780,6 +155056,15 @@ msgstr ""
 "красного/альфа-канала. Значения находятся в диапазоне [code][-127, 127][/"
 "code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point blue/green/red/alpha channel data "
+"format with normalized value and nonlinear sRGB encoding. Values are in the "
+"[code][0.0, 1.0][/code] range."
+msgstr ""
+"8-битный формат данных с плавающей запятой без знака для каждого канала: "
+"синий/зеленый/красный/альфа-канал, с нормализованным значением и нелинейным "
+"кодированием sRGB. Значения находятся в диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point alpha/red/green/blue channel data "
 "format with normalized value, packed in 32 bits. Values are in the [code]"
@@ -152833,6 +155118,16 @@ msgstr ""
 "зеленого/синего каналов, упакованный в 32 бита. Значения находятся в "
 "диапазоне [code][-127, 127][/code]."
 
+msgid ""
+"8-bit-per-channel unsigned floating-point alpha/red/green/blue channel data "
+"format with normalized value and nonlinear sRGB encoding, packed in 32 bits. "
+"Values are in the [code][0.0, 1.0][/code] range."
+msgstr ""
+"8-битный формат данных для каждого канала в формате беззнаковых чисел с "
+"плавающей запятой (альфа/красный/зеленый/синий), с нормализованным значением "
+"и нелинейным кодированием sRGB, упакованный в 32 бита. Значения находятся в "
+"диапазоне [code][0.0, 1.0][/code]."
+
 msgid ""
 "Unsigned floating-point alpha/red/green/blue channel data format with "
 "normalized value, packed in 32 bits. Format contains 2 bits of alpha, 10 bits "
@@ -153466,6 +155761,19 @@ msgstr ""
 "канала и 5 бит синего канала. Используется сжатие текстур BC1 (также "
 "известное как S3TC DXT1)."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue channel data format with normalized "
+"value and nonlinear sRGB encoding. Values are in the [code][0.0, 1.0][/code] "
+"range. The format's precision is 5 bits of red channel, 6 bits of green "
+"channel, and 5 bits of blue channel. Using BC1 texture compression (also "
+"known as S3TC DXT1)."
+msgstr ""
+"Формат данных красного/зеленого/синего каналов, сжатый в видеопамяти, с "
+"нормализованным значением и нелинейным кодированием sRGB. Значения находятся "
+"в диапазоне [code][0.0, 1.0][/code]. Точность формата составляет 5 бит для "
+"красного канала, 6 бит для зеленого канала и 5 бит для синего канала. "
+"Используется сжатие текстур BC1 (также известное как S3TC DXT1)."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -153479,6 +155787,20 @@ msgstr ""
 "канала, 5 бит синего канала и 1 бит альфа-канала. Используется сжатие текстур "
 "BC1 (также известное как S3TC DXT1)."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 1 bit of alpha channel. Using BC1 "
+"texture compression (also known as S3TC DXT1)."
+msgstr ""
+"Формат данных красного/зеленого/синего/альфа-канала, сжатый в видеопамяти, с "
+"нормализованными значениями и нелинейным кодированием sRGB. Значения "
+"находятся в диапазоне [code][0.0, 1.0][/code]. Точность формата составляет 5 "
+"бит для красного канала, 6 бит для зеленого канала, 5 бит для синего канала и "
+"1 бит для альфа-канала. Используется сжатие текстур BC1 (также известное как "
+"S3TC DXT1)."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -153492,6 +155814,20 @@ msgstr ""
 "канала, 5 бит синего канала и 4 бита альфа-канала. Используется сжатие "
 "текстур BC2 (также известное как S3TC DXT3)."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 4 bits of alpha channel. Using BC2 "
+"texture compression (also known as S3TC DXT3)."
+msgstr ""
+"Сжатый в видеопамяти формат данных беззнаковых каналов красного/зеленого/"
+"синего/альфа-канала с нормализованным значением и нелинейным кодированием "
+"sRGB. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Точность "
+"формата составляет 5 бит для красного канала, 6 бит для зеленого канала, 5 "
+"бит для синего канала и 4 бита для альфа-канала. Используется сжатие текстур "
+"BC2 (также известное как S3TC DXT3)."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -153505,6 +155841,20 @@ msgstr ""
 "канала, 5 бит синего канала и 8 бит альфа-канала. Используется сжатие текстур "
 "BC3 (также известное как S3TC DXT5)."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 8 bits of alpha channel. Using BC3 "
+"texture compression (also known as S3TC DXT5)."
+msgstr ""
+"Формат данных красного/зеленого/синего/альфа-канала, сжатый в видеопамяти, с "
+"нормализованными значениями и нелинейным кодированием sRGB. Значения "
+"находятся в диапазоне [code][0.0, 1.0][/code]. Точность формата составляет 5 "
+"бит для красного канала, 6 бит для зеленого канала, 5 бит для синего канала и "
+"8 бит для альфа-канала. Используется сжатие текстур BC3 (также известное как "
+"S3TC DXT5)."
+
 msgid ""
 "VRAM-compressed unsigned red channel data format with normalized value. "
 "Values are in the [code][0.0, 1.0][/code] range. The format's precision is 8 "
@@ -153578,6 +155928,19 @@ msgstr ""
 "code]. Точность формата составляет от 4 до 7 бит для красного/зеленого/синего "
 "каналов и от 0 до 8 бит для альфа-канала. Также известен как BPTC LDR."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is between 4 and 7 bits for the red/"
+"green/blue channels and between 0 and 8 bits for the alpha channel. Also "
+"known as BPTC LDR."
+msgstr ""
+"Формат данных красного/зеленого/синего/альфа-канала, сжатый в видеопамяти, с "
+"нормализованным значением и нелинейным кодированием sRGB. Значения находятся "
+"в диапазоне [code][0.0, 1.0][/code]. Точность формата составляет от 4 до 7 "
+"бит для красного/зеленого/синего каналов и от 0 до 8 бит для альфа-канала. "
+"Также известен как BPTC LDR."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue channel data format with normalized "
 "value. Values are in the [code][0.0, 1.0][/code] range. Using ETC2 texture "
@@ -153587,6 +155950,16 @@ msgstr ""
 "нормализованным значением. Значения находятся в диапазоне [code][0.0, 1.0][/"
 "code]. Используется сжатие текстур ETC2."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue channel data format with normalized "
+"value and nonlinear sRGB encoding. Values are in the [code][0.0, 1.0][/code] "
+"range. Using ETC2 texture compression."
+msgstr ""
+"Сжатые в видеопамяти данные каналов красного/зеленого/синего цвета без знака, "
+"с нормализованным значением и нелинейным кодированием sRGB. Значения "
+"находятся в диапазоне [code][0.0, 1.0][/code]. Используется текстурное сжатие "
+"ETC2."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. Red/green/"
@@ -153598,6 +155971,18 @@ msgstr ""
 "code]. Красный/зеленый/синий используют 8-битную точность каждый, а альфа "
 "использует 1-битную точность. Используется сжатие текстур ETC2."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. Red/green/blue use 8 bit of precision each, with alpha "
+"using 1 bit of precision. Using ETC2 texture compression."
+msgstr ""
+"Сжатые в видеопамяти данные беззнаковых каналов красного/зеленого/синего/"
+"альфа-канала с нормализованным значением и нелинейным кодированием sRGB. "
+"Значения находятся в диапазоне [code][0.0, 1.0][/code]. Красный/зеленый/синий "
+"каналы используют 8-битную точность каждый, а альфа-канал — 1-битную "
+"точность. Используется текстурное сжатие ETC2."
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. Red/green/"
@@ -153609,6 +155994,18 @@ msgstr ""
 "code]. Красный/зеленый/синий используют 8 бит точности каждый, а альфа "
 "использует 8 бит точности. Используется сжатие текстур ETC2."
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. Red/green/blue use 8 bits of precision each, with alpha "
+"using 8 bits of precision. Using ETC2 texture compression."
+msgstr ""
+"Сжатые в видеопамяти данные беззнаковых каналов красного/зеленого/синего/"
+"альфа-канала с нормализованным значением и нелинейным кодированием sRGB. "
+"Значения находятся в диапазоне [code][0.0, 1.0][/code]. Красный/зеленый/синий "
+"каналы используют по 8 бит точности каждый, а альфа-канал — также 8 бит "
+"точности. Используется текстурное сжатие ETC2."
+
 msgid ""
 "11-bit VRAM-compressed unsigned red channel data format with normalized "
 "value. Values are in the [code][0.0, 1.0][/code] range. Using ETC2 texture "
@@ -153654,6 +156051,16 @@ msgstr ""
 "значением, упакованный в блоки 4×4 (наивысшее качество). Значения находятся в "
 "диапазоне [code][0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 4×4 blocks (highest quality). Values are "
+"in the [code][0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"4×4 (наивысшее качество). Значения находятся в диапазоне [code][0.0, 1.0][/"
+"code]. Используется сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 5×4 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153663,6 +156070,16 @@ msgstr ""
 "значением, упакованный в блоки 5×4. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 5×4 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"5×4. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 5×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153672,6 +156089,16 @@ msgstr ""
 "значением, упакованный в блоки 5×5. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 5×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"5×5. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 6×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153681,6 +156108,16 @@ msgstr ""
 "значением, упакованный в блоки 6×5. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 6×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"6×5. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 6×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153690,6 +156127,16 @@ msgstr ""
 "значением, упакованный в блоки 6×6. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 6×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"6×6. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153699,6 +156146,16 @@ msgstr ""
 "значением, упакованный в блоки 8×5. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"8×5. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153708,6 +156165,16 @@ msgstr ""
 "значением, упакованный в блоки 8×6. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"8×6. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×8 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153717,6 +156184,16 @@ msgstr ""
 "значением, упакованный в блоки 8×8. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×8 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"8×8. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153726,6 +156203,16 @@ msgstr ""
 "значением, упакованный в блоки 10×5. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"10×5. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153735,6 +156222,16 @@ msgstr ""
 "значением, упакованный в блоки 10×6. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"10×6. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×8 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -153744,6 +156241,16 @@ msgstr ""
 "значением, упакованный в блоки 10×8. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×8 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"10×8. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×10 blocks. Values are in the [code][0.0, 1.0][/code] range. "
@@ -153753,6 +156260,16 @@ msgstr ""
 "значением, упакованный в блоки 10×10. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×10 blocks. Values are in the [code]"
+"[0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"10×10. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 12×10 blocks. Values are in the [code][0.0, 1.0][/code] range. "
@@ -153762,6 +156279,16 @@ msgstr ""
 "значением, упакованный в блоки 12×10. Значения находятся в диапазоне [code]"
 "[0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 12×10 blocks. Values are in the [code]"
+"[0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в блоки "
+"12×10. Значения находятся в диапазоне [code][0.0, 1.0][/code]. Используется "
+"сжатие ASTC."
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 12 blocks (lowest quality). Values are in the [code][0.0, 1.0][/"
@@ -153771,6 +156298,16 @@ msgstr ""
 "значением, упакованный в 12 блоков (самое низкое качество). Значения "
 "находятся в диапазоне [code][0.0, 1.0][/code]. Используется сжатие ASTC."
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 12 blocks (lowest quality). Values are in "
+"the [code][0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"Сжатые в видеопамяти данные в формате беззнаковых чисел с плавающей запятой, "
+"нормализованные значения и нелинейное кодирование sRGB, упакованные в 12 "
+"блоков (наименьшее качество). Значения находятся в диапазоне [code][0.0, 1.0]"
+"[/code]. Используется сжатие ASTC."
+
 msgid ""
 "8-bit-per-channel unsigned floating-point green/blue/red channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range. Blue "
@@ -154353,6 +156890,12 @@ msgstr ""
 "Текстуру можно использовать в качестве глубинного/трафаретного приложения в "
 "буфере кадра."
 
+msgid ""
+"Texture can be used as a depth/stencil resolve attachment in a framebuffer."
+msgstr ""
+"Текстуру можно использовать в качестве параметра разрешения глубины/трафарета "
+"в буфере кадров."
+
 msgid ""
 "Texture can be used as a [url=https://registry.khronos.org/vulkan/specs/1.3-"
 "extensions/html/vkspec.html#descriptorsets-storageimage]storage image[/url]."
@@ -154649,6 +157192,38 @@ msgstr ""
 msgid "Input attachment uniform."
 msgstr "вставка для ввода униформы."
 
+msgid ""
+"Same as UNIFORM_TYPE_UNIFORM_BUFFER but for buffers created with "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Note:[/b] This flag is not available to GD users due to being too "
+"dangerous (i.e. wrong usage can result in visual glitches).\n"
+"It's exposed in case GD users receive a buffer created with such flag from "
+"Godot."
+msgstr ""
+"Аналогично UNIFORM_TYPE_UNIFORM_BUFFER, но для буферов, созданных с помощью "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Примечание:[/b] Этот флаг недоступен пользователям GD из-за его чрезмерной "
+"опасности (т.е. неправильное использование может привести к визуальным "
+"сбоям).\n"
+"Он доступен в случае, если пользователи GD получают от Godot буфер, созданный "
+"с таким флагом."
+
+msgid ""
+"Same as UNIFORM_TYPE_STORAGE_BUFFER but for buffers created with "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Note:[/b] This flag is not available to GD users due to being too "
+"dangerous (i.e. wrong usage can result in visual glitches).\n"
+"It's exposed in case GD users receive a buffer created with such flag from "
+"Godot."
+msgstr ""
+"Аналогично UNIFORM_TYPE_STORAGE_BUFFER, но для буферов, созданных с помощью "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Примечание:[/b] Этот флаг недоступен пользователям GD из-за его чрезмерной "
+"опасности (т.е. неправильное использование может привести к визуальным "
+"сбоям).\n"
+"Он отображается в случае, если пользователи GD получают от Godot буфер, "
+"созданный с таким флагом."
+
 msgid "Represents the size of the [enum UniformType] enum."
 msgstr "Представляет размер перечисления [enum UniformType]."
 
@@ -155956,6 +158531,15 @@ msgstr ""
 "элементов, нарисованных с помощью этого элемента холста, пока это не будет "
 "вызвано снова с [param ignore], установленным на [code]false[/code]."
 
+msgid ""
+"Draws an ellipse with semi-major axis [param major] and semi-minor axis "
+"[param minor] on the [CanvasItem] pointed to by the [param item] [RID]. See "
+"also [method CanvasItem.draw_ellipse]."
+msgstr ""
+"Рисует эллипс с большой полуосью [param major] и малой полуосью [param minor] "
+"на объекте [CanvasItem], на который указывает [param item] [RID]. См. также "
+"[method CanvasItem.draw_ellipse]."
+
 msgid "See also [method CanvasItem.draw_lcd_texture_rect_region]."
 msgstr "См. также [method CanvasItem.draw_lcd_texture_rect_region]."
 
@@ -157060,6 +159644,17 @@ msgstr ""
 "Устанавливает переменные, которые будут использоваться с эффектом "
 "постобработки screen-space reflections (SSR). Подробнее см. [Environment]."
 
+msgid ""
+"Sets whether screen-space reflections will be rendered at full or half size. "
+"Half size is faster, but may look pixelated or cause flickering."
+msgstr ""
+"Определяет, будут ли отражения в экранном пространстве отображаться в полном "
+"или половинном размере. Отображение в половинном размере происходит быстрее, "
+"но может выглядеть пикселизированным или вызывать мерцание."
+
+msgid "This option no longer does anything."
+msgstr "Эта опция больше не работает."
+
 msgid ""
 "Sets the variables to be used with the \"tonemap\" post-process effect. See "
 "[Environment] for more details."
@@ -157067,6 +159662,10 @@ msgstr ""
 "Устанавливает переменные, которые будут использоваться с эффектом "
 "постобработки \"tonemap\". Подробнее см. [Environment]."
 
+msgid "See [member Environment.tonemap_agx_contrast] for more details."
+msgstr ""
+"Более подробную информацию см. в [member Environment.tonemap_agx_contrast]."
+
 msgid ""
 "Sets the variables to be used with the volumetric fog post-process effect. "
 "See [Environment] for more details."
@@ -158102,6 +160701,25 @@ msgstr "Устанавливает приоритет рендеринга ма
 msgid "Sets a shader material's shader."
 msgstr "Устанавливает шейдер материала шейдера."
 
+msgid ""
+"When using the Mobile renderer, [method material_set_use_debanding] can be "
+"used to enable or disable the debanding feature of 3D materials "
+"([BaseMaterial3D] and [ShaderMaterial]).\n"
+"[method material_set_use_debanding] has no effect when using the "
+"Compatibility or Forward+ renderer. In Forward+, [Viewport] debanding can be "
+"used instead.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] and [method RenderingServer.viewport_set_use_debanding]."
+msgstr ""
+"При использовании рендерера Mobile метод [method material_set_use_debanding] "
+"можно использовать для включения или отключения функции устранения полос в 3D-"
+"материалах ([BaseMaterial3D] и [ShaderMaterial]).\n"
+"Метод [method material_set_use_debanding] не оказывает никакого эффекта при "
+"использовании рендерера Compatibility или Forward+. В Forward+ вместо этого "
+"можно использовать устранение полос в [Viewport].\n"
+"См. также [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] и [method RenderingServer.viewport_set_use_debanding]."
+
 msgid "Removes all surfaces from a mesh."
 msgstr "Удаляет все поверхности из сетки."
 
@@ -158374,6 +160992,17 @@ msgstr ""
 "multimesh используется в 2D. Эквивалентно [method "
 "MultiMesh.set_instance_transform_2d]."
 
+msgid ""
+"Prevents physics interpolation for all instances during the current physics "
+"tick.\n"
+"This is useful when moving all instances to new locations, to give "
+"instantaneous changes rather than interpolation from the previous locations."
+msgstr ""
+"Предотвращает интерполяцию физических параметров для всех экземпляров во "
+"время текущего физического цикла.\n"
+"Это полезно при перемещении всех экземпляров в новые места, чтобы обеспечить "
+"мгновенные изменения, а не интерполяцию от предыдущих местоположений."
+
 msgid ""
 "Set the entire data to use for drawing the [param multimesh] at once to "
 "[param buffer] (such as instance transforms and colors). [param buffer]'s "
@@ -159038,6 +161667,9 @@ msgstr ""
 "экземпляры с соответствующим слоем будут иметь отражения, примененные от "
 "этого зонда. Эквивалентно [member ReflectionProbe.reflection_mask]."
 
+msgid "This method has not done anything since Godot 3."
+msgstr "Этот метод перестал работать со времён Godot 3."
+
 msgid "Deprecated. This method does nothing."
 msgstr "Устарело. Этот метод ничего не делает."
 
@@ -159119,6 +161751,39 @@ msgstr ""
 "anti_aliasing/screen_space_roughness_limiter/amount] и [member "
 "ProjectSettings.rendering/anti_aliasing/screen_space_roughness_limiter/limit]."
 
+msgid "Use [method set_boot_image_with_stretch] instead."
+msgstr "Вместо этого используйте [method set_boot_image_with_stretch]."
+
+msgid ""
+"Sets a boot image. The [param color] defines the background color. The value "
+"of [param scale] indicates if the image will be scaled to fit the screen "
+"size. If [param use_filter] is [code]true[/code], the image will be scaled "
+"with linear interpolation. If [param use_filter] is [code]false[/code], the "
+"image will be scaled with nearest-neighbor interpolation."
+msgstr ""
+"Задает загрузочное изображение. Параметр [param color] определяет цвет фона. "
+"Значение параметра [param scale] указывает, будет ли изображение "
+"масштабироваться под размер экрана. Если [param use_filter] равно [code]true[/"
+"code], изображение будет масштабироваться с помощью линейной интерполяции. "
+"Если [param use_filter] равно [code]false[/code], изображение будет "
+"масштабироваться с помощью интерполяции методом ближайшего соседа."
+
+msgid ""
+"Sets a boot image. The [param color] defines the background color. The value "
+"of [param stretch_mode] indicates how the image will be stretched (see [enum "
+"SplashStretchMode] for possible values). If [param use_filter] is [code]true[/"
+"code], the image will be scaled with linear interpolation. If [param "
+"use_filter] is [code]false[/code], the image will be scaled with nearest-"
+"neighbor interpolation."
+msgstr ""
+"Задает загрузочное изображение. Параметр [param color] определяет цвет фона. "
+"Значение параметра [param stretch_mode] указывает, как будет растягиваться "
+"изображение (см. [enum SplashStretchMode] для возможных значений). Если "
+"[param use_filter] равно [code]true[/code], изображение будет "
+"масштабироваться с помощью линейной интерполяции. Если [param use_filter] "
+"равно [code]false[/code], изображение будет масштабироваться с помощью "
+"интерполяции методом ближайшего соседа."
+
 msgid ""
 "If [param generate] is [code]true[/code], generates debug wireframes for all "
 "meshes that are loaded when using the Compatibility renderer. By default, the "
@@ -159459,15 +162124,78 @@ msgstr ""
 "другую ширину, высоту, глубину или формат, используйте вместо этого [method "
 "texture_replace]."
 
+msgid ""
+"Creates a texture based on a native handle that was created outside of "
+"Godot's renderer.\n"
+"[b]Note:[/b] If using only the rendering device renderer, it's recommend to "
+"use [method RenderingDevice.texture_create_from_extension] together with "
+"[method RenderingServer.texture_rd_create], rather than this method. This "
+"way, the texture's format and usage can be controlled more effectively."
+msgstr ""
+"Создает текстуру на основе собственного дескриптора, созданного вне рендерера "
+"Godot.\n"
+"[b]Примечание:[/b] Если используется только рендерер устройства рендеринга, "
+"рекомендуется использовать [method "
+"RenderingDevice.texture_create_from_extension] вместе с [method "
+"RenderingServer.texture_rd_create], а не этот метод. Таким образом, формат и "
+"использование текстуры можно контролировать более эффективно."
+
 msgid "Returns the format for the texture."
 msgstr "Возвращает формат текстуры."
 
+msgid ""
+"Returns the internal graphics handle for this texture object. For use when "
+"communicating with third-party APIs mostly with GDExtension.\n"
+"[param srgb] should be [code]true[/code] when the texture uses nonlinear sRGB "
+"encoding and [code]false[/code] when the texture uses linear encoding.\n"
+"[b]Note:[/b] This function returns a [code]uint64_t[/code] which internally "
+"maps to a [code]GLuint[/code] (OpenGL) or [code]VkImage[/code] (Vulkan)."
+msgstr ""
+"Возвращает внутренний графический дескриптор для этого объекта текстуры. "
+"Используется при взаимодействии со сторонними API, в основном с помощью "
+"GDExtension.\n"
+"[param srgb] должен быть [code]true[/code], если текстура использует "
+"нелинейное кодирование sRGB, и [code]false[/code], если текстура использует "
+"линейное кодирование.\n"
+"[b]Примечание:[/b] Эта функция возвращает [code]uint64_t[/code], который "
+"внутренне сопоставляется с [code]GLuint[/code] (OpenGL) или [code]VkImage[/"
+"code] (Vulkan)."
+
+msgid ""
+"Returns a texture [RID] that can be used with [RenderingDevice].\n"
+"[param srgb] should be [code]true[/code] when the texture uses nonlinear sRGB "
+"encoding and [code]false[/code] when the texture uses linear encoding."
+msgstr ""
+"Возвращает текстуру [RID], которую можно использовать с [RenderingDevice].\n"
+"[param srgb] должно быть [code]true[/code], если текстура использует "
+"нелинейное кодирование sRGB, и [code]false[/code], если текстура использует "
+"линейное кодирование."
+
 msgid "ProxyTexture was removed in Godot 4."
 msgstr "ProxyTexture был удален в Godot 4."
 
 msgid "This method does nothing and always returns an invalid [RID]."
 msgstr "Этот метод ничего не делает и всегда возвращает недействительный [RID]."
 
+msgid ""
+"Creates a new texture object based on a texture created directly on the "
+"[RenderingDevice]. If the texture contains layers, [param layer_type] is used "
+"to define the layer type.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingServer's [method free_rid] method.\n"
+"[b]Note:[/b] The RenderingServer's [method free_rid] won't free the "
+"underlying [param rd_texture], you will want to free the [param rd_texture] "
+"using [method RenderingDevice.free_rid]."
+msgstr ""
+"Создает новый объект текстуры на основе текстуры, созданной непосредственно "
+"на [RenderingDevice]. Если текстура содержит слои, для определения типа слоя "
+"используется [param layer_type].\n"
+"После завершения работы с RID вам потребуется освободить RID, используя метод "
+"[method free_rid] RenderingServer.\n"
+"[b]Примечание:[/b] Метод [method free_rid] RenderingServer не освобождает "
+"базовый [param rd_texture], вам потребуется освободить [param rd_texture] с "
+"помощью [method RenderingDevice.free_rid]."
+
 msgid ""
 "Replaces [param texture]'s texture data by the texture specified by the "
 "[param by_texture] RID, without changing [param texture]'s RID."
@@ -160066,6 +162794,32 @@ msgstr ""
 "Эквивалентно [member Viewport.use_debanding]. См. также [member "
 "ProjectSettings.rendering/anti_aliasing/quality/use_debanding]."
 
+msgid ""
+"If [code]true[/code], 2D rendering will use a high dynamic range (HDR) "
+"[code]RGBA16[/code] format framebuffer. Additionally, 2D rendering will be "
+"performed on linear values and will be converted using the appropriate "
+"transfer function immediately before blitting to the screen (if the Viewport "
+"is attached to the screen).\n"
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped to the [code]0-1[/code] range and can be used in 3D rendering "
+"without color encoding adjustments. This allows 2D rendering to take "
+"advantage of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients. This setting has the same effect as [member Viewport.use_hdr_2d]."
+msgstr ""
+"Если [code]true[/code], 2D-рендеринг будет использовать буфер кадров в "
+"формате RGBA16 с высоким динамическим диапазоном (HDR). Кроме того, 2D-"
+"рендеринг будет выполняться на линейных значениях и будет преобразован с "
+"использованием соответствующей функции преобразования непосредственно перед "
+"выводом на экран (если Viewport подключен к экрану).\n"
+"На практике это означает, что конечный результат Viewport не будет ограничен "
+"диапазоном [code]0-1[/code] и может использоваться в 3D-рендеринге без "
+"корректировки цветового кодирования. Это позволяет 2D-рендерингу использовать "
+"преимущества эффектов, требующих высокого динамического диапазона (например, "
+"2D-свечение), а также существенно улучшает внешний вид эффектов, требующих "
+"высокодетализированных градиентов. Этот параметр имеет тот же эффект, что и "
+"[member Viewport.use_hdr_2d]."
+
 msgid ""
 "If [code]true[/code], enables occlusion culling on the specified viewport. "
 "Equivalent to [member ProjectSettings.rendering/occlusion_culling/"
@@ -161715,6 +164469,24 @@ msgstr ""
 "[b]Примечание:[/b] Поддерживается только при использовании метода рендеринга "
 "Forward+."
 
+msgid ""
+"Draws SDFGI probe data. This is the data structure that is used to give "
+"indirect lighting dynamic objects moving within the scene.\n"
+"When in the editor, left-clicking a probe will display additional bright dots "
+"that show its occlusion information. A white dot means the light is not "
+"occluded at all at the dot's position, while a red dot means the light is "
+"fully occluded. Intermediate values are possible.\n"
+"[b]Note:[/b] Only supported when using the Forward+ rendering method."
+msgstr ""
+"Отображает данные зонда SDFGI. Это структура данных, используемая для "
+"динамического освещения движущихся объектов в сцене.\n"
+"В редакторе, щелчок левой кнопкой мыши по зонду отобразит дополнительные "
+"яркие точки, показывающие информацию о его окклюзии. Белая точка означает, "
+"что источник света в точке не перекрыт, а красная точка означает, что "
+"источник света полностью перекрыт. Возможны промежуточные значения.\n"
+"[b]Примечание:[/b] Поддерживается только при использовании метода рендеринга "
+"Forward+."
+
 msgid ""
 "Draws the global illumination buffer from [VoxelGI] or SDFGI. Requires "
 "[VoxelGI] (at least one visible baked VoxelGI node) or SDFGI ([member "
@@ -162876,6 +165648,31 @@ msgstr "Конвейерная компиляция, запущенная для
 msgid "Represents the size of the [enum PipelineSource] enum."
 msgstr "Представляет размер перечисления [enum PipelineSource]."
 
+msgid "No stretching is applied."
+msgstr "Растяжение не применяется."
+
+msgid "Stretches image to fullscreen while preserving aspect ratio."
+msgstr ""
+"Растягивает изображение на весь экран, сохраняя при этом соотношение сторон."
+
+msgid "Stretches the height of the image based on the width of the screen."
+msgstr "Растягивает высоту изображения в соответствии с шириной экрана."
+
+msgid "Stretches the width of the image based on the height of the screen."
+msgstr "Растягивает ширину изображения в соответствии с высотой экрана."
+
+msgid ""
+"Stretches the image to cover the entire screen while preserving aspect ratio."
+msgstr ""
+"Растягивает изображение, чтобы оно покрывало весь экран, сохраняя при этом "
+"соотношение сторон."
+
+msgid ""
+"Stretches the image to cover the entire screen but doesn't preserve aspect "
+"ratio."
+msgstr ""
+"Растягивает изображение на весь экран, но не сохраняет соотношение сторон."
+
 msgid "This constant has not been used since Godot 3.0."
 msgstr "Эта константа не использовалась с версии Godot 3.0."
 
@@ -162886,6 +165683,21 @@ msgstr ""
 "Объект буфера абстрактной сцены, созданный для каждого окна просмотра, для "
 "которого выполняется 3D-рендеринг."
 
+msgid ""
+"Abstract scene buffers object, created for each viewport for which 3D "
+"rendering is done. It manages any additional buffers used during rendering "
+"and will discard buffers when the viewport is resized. See also "
+"[RenderSceneBuffersRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Абстрактный объект буферов сцены, создаваемый для каждого видового окна, для "
+"которого выполняется 3D-рендеринг. Он управляет любыми дополнительными "
+"буферами, используемыми во время рендеринга, и будет отбрасывать буферы при "
+"изменении размера видового окна. См. также [RenderSceneBuffersRD].\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid ""
 "This method is called by the rendering server when the associated viewport's "
 "configuration is changed. It will discard the old buffers and recreate the "
@@ -162973,6 +165785,30 @@ msgid ""
 msgstr ""
 "Реализация буфера рендеринга сцены для рендереров на основе RenderingDevice."
 
+msgid ""
+"This object manages all 3D rendering buffers for the rendering device based "
+"renderers. An instance of this object is created for every viewport that has "
+"3D rendering enabled. See also [RenderSceneBuffers].\n"
+"All buffers are organized in [b]contexts[/b]. The default context is called "
+"[b]render_buffers[/b] and can contain amongst others the color buffer, depth "
+"buffer, velocity buffers, VRS density map and MSAA variants of these "
+"buffers.\n"
+"Buffers are only guaranteed to exist during rendering of the viewport.\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Этот объект управляет всеми буферами 3D-рендеринга для рендереров, "
+"использующих устройства рендеринга. Экземпляр этого объекта создается для "
+"каждого видового окна, в котором включен 3D-рендеринг. См. также "
+"[RenderSceneBuffers].\n"
+"Все буферы организованы в [b]контексты[/b]. Контекст по умолчанию называется "
+"[b]render_buffers[/b] и может содержать, помимо прочего, буфер цвета, буфер "
+"глубины, буферы скорости, карту плотности VRS и варианты MSAA этих буферов.\n"
+"Существование буферов гарантируется только во время рендеринга видового "
+"окна.\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid "Frees all buffers related to this context."
 msgstr "Освобождает все буферы, связанные с этим контекстом."
 
@@ -163140,6 +165976,18 @@ msgstr ""
 "Абстрактный объект данных рендеринга, содержит данные сцены, связанные с "
 "рендерингом одного кадра области просмотра."
 
+msgid ""
+"Abstract scene data object, exists for the duration of rendering a single "
+"viewport. See also [RenderSceneDataRD], [RenderData], and [RenderDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Абстрактный объект данных сцены, существующий в течение всего времени "
+"рендеринга одного видового окна. См. также [RenderSceneDataRD], [RenderData] "
+"и [RenderDataRD].\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid ""
 "Returns the camera projection used to render this frame.\n"
 "[b]Note:[/b] If more than one view is rendered, this will return a combined "
@@ -163223,6 +166071,17 @@ msgid ""
 msgstr ""
 "Реализация данных рендеринга сцены для рендереров на основе RenderingDevice."
 
+msgid ""
+"Object holds scene data related to rendering a single frame of a viewport. "
+"See also [RenderSceneData], [RenderData], and [RenderDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"Объект содержит данные сцены, относящиеся к рендерингу одного кадра в окне "
+"просмотра. См. также [RenderSceneData], [RenderData] и [RenderDataRD].\n"
+"[b]Примечание:[/b] Это внутренний объект сервера рендеринга. Не создавайте "
+"экземпляр этого класса из скрипта."
+
 msgid "Base class for serializable objects."
 msgstr "Базовый класс для сериализуемых объектов."
 
@@ -163370,6 +166229,14 @@ msgstr ""
 "ссылается ресурс B, вы получите новый ресурс A', дважды ссылающийся на новый "
 "ресурс B'."
 
+msgid ""
+"Duplicates this resource, deeply, like [method duplicate] when passing "
+"[code]true[/code], with extra control over how subresources are handled."
+msgstr ""
+"Создает глубокую копию этого ресурса, подобно [method duplicate], при "
+"передаче параметра [code]true[/code], с дополнительным контролем над "
+"обработкой подресурсов."
+
 msgid ""
 "Emits the [signal changed] signal. This method is called automatically for "
 "some built-in resources.\n"
@@ -164075,9 +166942,24 @@ msgstr ""
 msgid "Font scaling mode."
 msgstr "Режим масштабирования шрифта."
 
+msgid "Imports comma-separated values as [Translation]s."
+msgstr "Импортирует значения, разделённые запятыми, в виде [Translation]."
+
 msgid "Importing translations"
 msgstr "Импорт переводов"
 
+msgid ""
+"- [b]Disabled[/b]: Creates a [Translation].\n"
+"- [b]Auto[/b]: Creates an [OptimizedTranslation] when possible. This makes "
+"the resulting file smaller at the cost of a small CPU overhead. Falls back to "
+"[Translation] for translations with context or plural forms."
+msgstr ""
+"- [b]Disabled[/b]: Создает [Translation].\n"
+"- [b]Auto[/b]: Создает [OptimizedTranslation], если это возможно. Это "
+"уменьшает размер результирующего файла за счет небольшого увеличения нагрузки "
+"на процессор. В случае переводов с контекстом или во множественном числе "
+"используется [Translation]."
+
 msgid ""
 "The delimiter to use in the CSV file. The default value matches the common "
 "CSV convention. Tab-separated values are sometimes called TSV files."
@@ -164086,6 +166968,20 @@ msgstr ""
 "соответствует общепринятому соглашению CSV. Значения, разделенные табуляцией, "
 "иногда называются файлами TSV."
 
+msgid ""
+"If [code]true[/code], message keys in the CSV file are unescaped using "
+"[method String.c_unescape] during the import process."
+msgstr ""
+"Если [code]true[/code], ключи сообщений в CSV-файле деэкранируются с помощью "
+"[method String.c_unescape] в процессе импорта."
+
+msgid ""
+"If [code]true[/code], message translations in the CSV file are unescaped "
+"using [method String.c_unescape] during the import process."
+msgstr ""
+"Если [code]true[/code], перевод сообщений в CSV-файле деэкранируется с "
+"помощью [method String.c_unescape] в процессе импорта."
+
 msgid ""
 "Imports a TTF, TTC, OTF, OTC, WOFF or WOFF2 font file for font rendering that "
 "adapts to any size."
@@ -164208,6 +167104,31 @@ msgstr ""
 "использование памяти. Включайте этот параметр только в том случае, если он "
 "вам действительно нужен."
 
+msgid ""
+"The hinting mode to use. This controls how aggressively glyph edges should be "
+"snapped to pixels when rasterizing the font. Depending on personal "
+"preference, you may prefer using one hinting mode over the other. Hinting "
+"modes other than [b]None[/b] are only effective if the font contains hinting "
+"data (see [member force_autohinter]).\n"
+"[b]None:[/b] Smoothest appearance, which can make the font look blurry at "
+"small sizes.\n"
+"[b]Light:[/b] Sharp result by snapping glyph edges to pixels on the Y axis "
+"only.\n"
+"[b]Normal:[/b] Sharpest by snapping glyph edges to pixels on both X and Y "
+"axes."
+msgstr ""
+"Режим хинтинга. Этот параметр определяет, насколько агрессивно края глифов "
+"должны привязываться к пикселям при растеризации шрифта. В зависимости от "
+"личных предпочтений, вы можете предпочесть один режим хинтинга другому. "
+"Режимы хинтинга, отличные от [b]None[/b], эффективны только в том случае, "
+"если шрифт содержит данные хинтинга (см. [member force_autohinter]).\n"
+"[b]None:[/b] Наиболее плавный вид, который может сделать шрифт размытым при "
+"малых размерах.\n"
+"[b]Light:[/b] Резкий результат за счет привязки краев глифов к пикселям "
+"только по оси Y.\n"
+"[b]Normal:[/b] Наиболее резкий результат за счет привязки краев глифов к "
+"пикселям как по оси X, так и по оси Y."
+
 msgid ""
 "Override the list of languages supported by this font. If left empty, this is "
 "supplied by the font metadata. There is usually no need to change this. See "
@@ -164385,6 +167306,46 @@ msgstr ""
 "между символами выглядит неправильным, попробуйте настроить [member "
 "character_margin]."
 
+msgid ""
+"The character ranges to import from the font image. This is an array that "
+"maps each position on the image (in tile coordinates, not pixels). The font "
+"atlas is traversed from left to right and top to bottom. Characters can be "
+"specified with decimal numbers (126), hexadecimal numbers ([code]0x007e[/"
+"code] or [code]U+007e[/code]), or between single quotes ([code]'~'[/code]). "
+"Ranges can be specified with a hyphen between characters.\n"
+"For example, [code]0-127[/code] represents the full ASCII range. It can also "
+"be written as [code]0x0000-0x007f[/code] (or [code]U+0000-U+007f[/code]). As "
+"another example, [code]' '-'~'[/code] is equivalent to [code]32-126[/code] "
+"and represents the range of printable (visible) ASCII characters.\n"
+"For any range, the character advance and offset can be customized by "
+"appending three space-separated integer values (additional advance, x offset, "
+"y offset) to the end. For example [code]'a'-'b' 4 5 2[/code] sets the advance "
+"to [code]char_width + 4[/code] and offset to [code]Vector2(5, 2)[/code] for "
+"both `a` and `b` characters.\n"
+"[b]Note:[/b] The overall number of characters must not exceed the number of "
+"[member columns] multiplied by [member rows]. Otherwise, the font will fail "
+"to import."
+msgstr ""
+"Диапазоны символов для импорта из изображения шрифта. Это массив, который "
+"отображает каждую позицию на изображении (в координатах тайлов, а не "
+"пикселей). Атлас шрифта обходится слева направо и сверху вниз. Символы могут "
+"быть указаны десятичными числами (126), шестнадцатеричными числами "
+"([code]0x007e[/code] или [code]U+007e[/code]) или в одинарных кавычках "
+"([code]'~'[/code]). Диапазоны могут быть указаны с дефисом между символами.\n"
+"Например, [code]0-127[/code] представляет полный диапазон ASCII. Его также "
+"можно записать как [code]0x0000-0x007f[/code] (или [code]U+0000-U+007f[/"
+"code]). В качестве еще одного примера, [code]' '-'~'[/code] эквивалентно "
+"[code]32-126[/code] и представляет собой диапазон печатных (видимых) символов "
+"ASCII.\n"
+"Для любого диапазона можно настроить смещение и продвижение символа, добавив "
+"в конец три разделенных пробелами целочисленных значения (дополнительное "
+"смещение, смещение по оси x, смещение по оси y). Например, [code]'a'-'b' 4 5 "
+"2[/code] устанавливает смещение равным [code]ширине_символа + 4[/code] и "
+"смещение равным [code]Vector2(5, 2)[/code] для символов `a` и `b`.\n"
+"[b]Примечание:[/b] Общее количество символов не должно превышать количество "
+"[member columns], умноженное на [member rows]. В противном случае импорт "
+"шрифта завершится неудачей."
+
 msgid "Number of columns in the font image. See also [member rows]."
 msgstr "Количество столбцов в изображении шрифта. См. также [member rows]."
 
@@ -164443,6 +167404,39 @@ msgstr ""
 "[GPUParticlesAttractorVectorField3D]. См. также [ResourceImporterTexture] и "
 "[ResourceImporterTextureAtlas]."
 
+msgid ""
+"Controls how color channels should be used in the imported texture.\n"
+"[b]sRGB Friendly:[/b], prevents the R and RG color formats from being used, "
+"as they do not support nonlinear sRGB encoding.\n"
+"[b]Optimized:[/b], allows the RG color format to be used if the texture does "
+"not use the blue channel. This reduces memory usage if the texture's blue "
+"channel can be discarded (all pixels must have a blue value of [code]0[/"
+"code]).\n"
+"[b]Normal Map (RG Channels):[/b] This forces all layers from the texture to "
+"be imported with the RG color format, with only the red and green channels "
+"preserved. RGTC (Red-Green Texture Compression) compression is able to "
+"preserve its detail much better, while using the same amount of memory as a "
+"standard RGBA VRAM-compressed texture. This only has an effect on textures "
+"with the VRAM Compressed or Basis Universal compression modes. This mode is "
+"only available in layered textures ([Cubemap], [CubemapArray], "
+"[Texture2DArray] and [Texture3D])."
+msgstr ""
+"Управляет использованием цветовых каналов в импортируемой текстуре.\n"
+"[b]sRGB Friendly:[/b] предотвращает использование цветовых форматов R и RG, "
+"поскольку они не поддерживают нелинейное кодирование sRGB.\n"
+"[b]Optimized:[/b] позволяет использовать цветовой формат RG, если текстура не "
+"использует синий канал. Это снижает потребление памяти, если синий канал "
+"текстуры можно отбросить (все пиксели должны иметь значение синего цвета "
+"[code]0[/code]).\n"
+"[b]Normal Map (RG Channels):[/b] Это заставляет все слои текстуры "
+"импортироваться с цветовым форматом RG, сохраняя только красный и зеленый "
+"каналы. Сжатие RGTC (Red-Green Texture Compression) позволяет гораздо лучше "
+"сохранять детали, используя при этом тот же объем памяти, что и стандартная "
+"текстура RGBA, сжатая в VRAM. Это влияет только на текстуры с режимами сжатия "
+"VRAM Compressed или Basis Universal. Этот режим доступен только для "
+"многослойных текстур ([Cubemap], [CubemapArray], [Texture2DArray] и "
+"[Texture3D])."
+
 msgid ""
 "Controls how VRAM compression should be performed for HDR images.\n"
 "[b]Disabled:[/b] Never use VRAM compression for HDR textures, regardless of "
@@ -165247,6 +168241,23 @@ msgstr ""
 "обработать изображение в скриптах более удобным способом, используйте вместо "
 "этого [ResourceImporterImage]. См. также [ResourceImporterLayeredTexture]."
 
+msgid ""
+"Controls how color channels should be used in the imported texture.\n"
+"[b]sRGB Friendly:[/b] Prevents the R and RG color formats from being used, as "
+"they do not support nonlinear sRGB encoding.\n"
+"[b]Optimized:[/b] Allows the RG color format to be used if the texture does "
+"not use the blue channel. This reduces memory usage if the texture's blue "
+"channel can be discarded (all pixels must have a blue value of [code]0[/"
+"code])."
+msgstr ""
+"Управляет использованием цветовых каналов в импортируемой текстуре.\n"
+"[b]sRGB Friendly:[/b] Предотвращает использование цветовых форматов R и RG, "
+"поскольку они не поддерживают нелинейное кодирование sRGB.\n"
+"[b]Optimized:[/b] Позволяет использовать цветовой формат RG, если текстура не "
+"использует синий канал. Это снижает потребление памяти, если синий канал "
+"текстуры можно отбросить (все пиксели должны иметь значение синего цвета "
+"[code]0[/code])."
+
 msgid ""
 "When using a texture as normal map, only the red and green channels are "
 "required. Given regular texture compression algorithms produce artifacts that "
@@ -165521,6 +168532,25 @@ msgstr ""
 "Рекомендуется оставить это включенным (как по умолчанию), если только это не "
 "вызывает проблем для конкретного изображения."
 
+msgid ""
+"Some HDR images you can find online may be broken and contain data that is "
+"encoded using the nonlinear sRGB transfer function (instead of using linear "
+"encoding). It is advised not to use those files. If you absolutely have to, "
+"enabling [member process/hdr_as_srgb] will make them look correct.\n"
+"[b]Warning:[/b] Enabling [member process/hdr_as_srgb] on well-formatted HDR "
+"images will cause the resulting image to look too dark, so leave this on "
+"[code]false[/code] if unsure."
+msgstr ""
+"Некоторые HDR-изображения, которые можно найти в интернете, могут быть "
+"повреждены и содержать данные, закодированные с использованием нелинейной "
+"функции преобразования sRGB (вместо линейного кодирования). Не рекомендуется "
+"использовать такие файлы. Если это абсолютно необходимо, включение [member "
+"process/hdr_as_srgb] позволит им выглядеть правильно.\n"
+"[b]Предупреждение:[/b] Включение [member process/hdr_as_srgb] для правильно "
+"отформатированных HDR-изображений приведет к тому, что результирующее "
+"изображение будет выглядеть слишком темным, поэтому, если вы не уверены, "
+"оставьте это значение [code]false[/code]."
+
 msgid ""
 "If [code]true[/code], clamps exposure in the imported high dynamic range "
 "images using a smart clamping formula (without introducing [i]visible[/i] "
@@ -165942,6 +168972,9 @@ msgstr ""
 "экспортируются (см. примечания в описании класса [FileAccess] для получения "
 "инструкций по их экспорту)."
 
+msgid "Threaded Loading Demo"
+msgstr "Демонстрация многопоточной загрузки"
+
 msgid ""
 "Registers a new [ResourceFormatLoader]. The ResourceLoader will use the "
 "ResourceFormatLoader as described in [method load].\n"
@@ -166412,6 +169445,13 @@ msgstr ""
 "именем проекта. UID сгенерированные для этого пути, всегда будут одинаковыми "
 "в текущем проекте."
 
+msgid ""
+"Returns a path, converting [param path_or_uid] if necessary. Fails and "
+"returns an empty string if an invalid UID is provided."
+msgstr ""
+"Возвращает путь, при необходимости преобразуя [param path_or_uid]. В случае "
+"предоставления недопустимого UID возвращает пустую строку."
+
 msgid ""
 "Returns the path that the given UID value refers to.\n"
 "Fails with an error if the UID does not exist, so be sure to check [method "
@@ -167524,6 +170564,15 @@ msgstr ""
 msgid "Adds a [code skip-lint][p][/code] tag to the tag stack."
 msgstr "Добавляет тег [code skip-lint][p][/code] в стек тегов."
 
+msgid ""
+"Adds a [code skip-lint][s][/code] tag to the tag stack. If [param color]'s "
+"alpha value is [code]0.0[/code], the current font's color with its alpha "
+"multiplied by [theme_item strikethrough_alpha] is used."
+msgstr ""
+"Добавляет тег [code skip-lint][s][/code] в стек тегов. Если значение альфа-"
+"канала [param color] равно [code]0.0[/code], используется цвет текущего "
+"шрифта с альфа-каналом, умноженным на [theme_item strikethrough_alpha]."
+
 msgid ""
 "Adds a [code skip-lint][table=columns,inline_align][/code] tag to the tag "
 "stack. Use [method set_table_column_expand] to set column expansion ratio. "
@@ -167536,6 +170585,15 @@ msgstr ""
 "добавления ячеек. [param name] используется в качестве имени таблицы для "
 "вспомогательных приложений."
 
+msgid ""
+"Adds a [code skip-lint][u][/code] tag to the tag stack. If [param color]'s "
+"alpha value is [code]0.0[/code], the current font's color with its alpha "
+"multiplied by [theme_item underline_alpha] is used."
+msgstr ""
+"Добавляет тег [code skip-lint][u][/code] в стек тегов. Если значение альфа-"
+"канала [param color] равно [code]0.0[/code], используется цвет текущего "
+"шрифта с альфа-каналом, умноженным на [theme_item underline_alpha]."
+
 msgid ""
 "Reloads custom effects. Useful when [member custom_effects] is modified "
 "manually."
@@ -168335,6 +171393,31 @@ msgstr ""
 "Установка этого свойства вызовет метод [method "
 "PhysicsServer2D.body_set_omit_force_integration] внутренне."
 
+msgid ""
+"If [code]true[/code], the body is frozen. Gravity and forces are not applied "
+"anymore.\n"
+"See [member freeze_mode] to set the body's behavior when frozen.\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody2D] or "
+"[AnimatableBody2D] instead."
+msgstr ""
+"Если [code]true[/code], тело заморожено. Гравитация и силы больше не "
+"применяются.\n"
+"См. [member freeze_mode], чтобы настроить поведение тела в замороженном "
+"состоянии.\n"
+"[b]Примечание:[/b] Для тела, которое всегда заморожено, используйте "
+"[StaticBody2D] или [AnimatableBody2D] вместо этого."
+
+msgid ""
+"The body's freeze mode. Determines the body's behavior when [member freeze] "
+"is [code]true[/code].\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody2D] or "
+"[AnimatableBody2D] instead."
+msgstr ""
+"Режим заморозки тела. Определяет поведение тела, когда [member freeze] имеет "
+"значение [code]true[/code].\n"
+"[b]Примечание:[/b] Для тела, которое всегда заморожено, используйте "
+"[StaticBody2D] или [AnimatableBody2D] вместо этого."
+
 msgid ""
 "Multiplies the gravity applied to the body. The body's gravity is calculated "
 "from the [member ProjectSettings.physics/2d/default_gravity] project setting "
@@ -168786,6 +171869,31 @@ msgstr ""
 "использовать непрерывное обнаружение столкновений, вычисления выполняются "
 "быстрее, но можно пропустить небольшие быстро движущиеся объекты."
 
+msgid ""
+"If [code]true[/code], the body is frozen. Gravity and forces are not applied "
+"anymore.\n"
+"See [member freeze_mode] to set the body's behavior when frozen.\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody3D] or "
+"[AnimatableBody3D] instead."
+msgstr ""
+"Если [code]true[/code], тело заморожено. Гравитация и силы больше не "
+"применяются.\n"
+"См. [member freeze_mode], чтобы настроить поведение тела в замороженном "
+"состоянии.\n"
+"[b]Примечание:[/b] Для тела, которое всегда заморожено, используйте "
+"[StaticBody3D] или [AnimatableBody3D] вместо этого."
+
+msgid ""
+"The body's freeze mode. Determines the body's behavior when [member freeze] "
+"is [code]true[/code].\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody3D] or "
+"[AnimatableBody3D] instead."
+msgstr ""
+"Режим заморозки тела. Определяет поведение тела, когда [member freeze] имеет "
+"значение [code]true[/code].\n"
+"[b]Примечание:[/b] Для тела, которое всегда заморожено, используйте "
+"[StaticBody3D] или [AnimatableBody3D] вместо этого."
+
 msgid ""
 "The body's moment of inertia. This is like mass, but for rotation: it "
 "determines how much torque it takes to rotate the body on each axis. The "
@@ -169697,6 +172805,89 @@ msgstr ""
 "классе [code]MethodName[/code], чтобы избежать выделения нового [StringName] "
 "при каждом вызове."
 
+msgid ""
+"Changes the running scene to the one at the given [param path], after loading "
+"it into a [PackedScene] and creating a new instance.\n"
+"Returns [constant OK] on success, [constant ERR_CANT_OPEN] if the [param "
+"path] cannot be loaded into a [PackedScene], or [constant ERR_CANT_CREATE] if "
+"that scene cannot be instantiated.\n"
+"[b]Note:[/b] See [method change_scene_to_node] for details on the order of "
+"operations."
+msgstr ""
+"Изменяет текущую сцену на ту, что находится по указанному пути [param path], "
+"после загрузки её в [PackedScene] и создания нового экземпляра.\n"
+"Возвращает [constant OK] в случае успеха, [constant ERR_CANT_OPEN], если путь "
+"[param path] не может быть загружен в [PackedScene], или [constant "
+"ERR_CANT_CREATE], если сцена не может быть создана.\n"
+"[b]Примечание:[/b] Подробности о порядке операций см. в [method "
+"change_scene_to_node]."
+
+msgid ""
+"Changes the running scene to the provided [Node]. Useful when you want to set "
+"up the new scene before changing.\n"
+"Returns [constant OK] on success, [constant ERR_INVALID_PARAMETER] if the "
+"[param node] is [code]null[/code], or [constant ERR_UNCONFIGURED] if the "
+"[param node] is already inside the scene tree.\n"
+"[b]Note:[/b] Operations happen in the following order when [method "
+"change_scene_to_node] is called:\n"
+"1. The current scene node is immediately removed from the tree. From that "
+"point, [method Node.get_tree] called on the current (outgoing) scene will "
+"return [code]null[/code]. [member current_scene] will be [code]null[/code] "
+"too, because the new scene is not available yet.\n"
+"2. At the end of the frame, the formerly current scene, already removed from "
+"the tree, will be deleted (freed from memory) and then the new scene node "
+"will be added to the tree. [method Node.get_tree] and [member current_scene] "
+"will be back to working as usual.\n"
+"This ensures that both scenes aren't running at the same time, while still "
+"freeing the previous scene in a safe way similar to [method "
+"Node.queue_free].\n"
+"If you want to reliably access the new scene, await the [signal "
+"scene_changed] signal.\n"
+"[b]Warning:[/b] After using this method, the [SceneTree] will take ownership "
+"of the node and will free it automatically when changing scene again. Any "
+"references you had to that node will become invalid."
+msgstr ""
+"Изменяет текущую сцену на указанный [Node]. Полезно, если вы хотите настроить "
+"новую сцену перед изменением.\n"
+"Возвращает [constant OK] в случае успеха, [constant ERR_INVALID_PARAMETER], "
+"если [param node] равен [code]null[/code], или [constant ERR_UNCONFIGURED], "
+"если [param node] уже находится в дереве сцен.\n"
+"[b]Примечание:[/b] Операции выполняются в следующем порядке при вызове "
+"[method change_scene_to_node]:\n"
+"1. Текущий узел сцены немедленно удаляется из дерева. С этого момента [method "
+"Node.get_tree], вызванный для текущей (исходящей) сцены, вернет [code]null[/"
+"code]. [member current_scene] также будет равен [code]null[/code], поскольку "
+"новая сцена еще недоступна.\n"
+"2. В конце кадра предыдущая текущая сцена, уже удаленная из дерева, будет "
+"удалена (освобождена из памяти), а затем новый узел сцены будет добавлен в "
+"дерево. [method Node.get_tree] и [member current_scene] снова будут работать "
+"как обычно.\n"
+"Это гарантирует, что обе сцены не будут выполняться одновременно, при этом "
+"предыдущая сцена будет освобождена безопасным способом, аналогичным [method "
+"Node.queue_free].\n"
+"Если вы хотите надежно получить доступ к новой сцене, дождитесь сигнала "
+"[signal scene_changed].\n"
+"[b]Предупреждение:[/b] После использования этого метода [SceneTree] возьмет "
+"на себя управление узлом и автоматически освободит его при повторной смене "
+"сцены. Все ссылки на этот узел станут недействительными."
+
+msgid ""
+"Changes the running scene to a new instance of the given [PackedScene] (which "
+"must be valid).\n"
+"Returns [constant OK] on success, [constant ERR_CANT_CREATE] if the scene "
+"cannot be instantiated, or [constant ERR_INVALID_PARAMETER] if the scene is "
+"invalid.\n"
+"[b]Note:[/b] See [method change_scene_to_node] for details on the order of "
+"operations."
+msgstr ""
+"Изменяет текущую сцену на новый экземпляр заданной [PackedScene] (которая "
+"должна быть допустимой).\n"
+"Возвращает [constant OK] в случае успеха, [constant ERR_CANT_CREATE], если "
+"сцена не может быть создана, или [constant ERR_INVALID_PARAMETER], если сцена "
+"недопустима.\n"
+"[b]Примечание:[/b] Подробности о порядке операций см. в [method "
+"change_scene_to_node]."
+
 msgid ""
 "Returns a new [SceneTreeTimer]. After [param time_sec] in seconds have "
 "passed, the timer will emit [signal SceneTreeTimer.timeout] and will be "
@@ -170417,6 +173608,15 @@ msgstr ""
 "[b]Примечание:[/b] Словари, возвращаемые этим методом, отформатированы так "
 "же, как и возвращаемые [method Object.get_property_list]."
 
+msgid ""
+"Returns the list of signals defined in this [Script].\n"
+"[b]Note:[/b] The dictionaries returned by this method are formatted "
+"identically to those returned by [method Object.get_signal_list]."
+msgstr ""
+"Возвращает список сигналов, определенных в этом [Script].\n"
+"[b]Примечание:[/b] Словари, возвращаемые этим методом, имеют тот же формат, "
+"что и словари, возвращаемые [method Object.get_signal_list]."
+
 msgid ""
 "Returns [code]true[/code] if the script, or a base class, defines a signal "
 "with the given name."
@@ -171151,6 +174351,17 @@ msgstr ""
 "Мертвая зона для сенсорной прокрутки. Меньшая мертвая зона делает прокрутку "
 "более чувствительной."
 
+msgid ""
+"The way which scroll hints (indicators that show that the content can still "
+"be scrolled in a certain direction) will be shown.\n"
+"[b]Note:[/b] Hints won't be shown if the content can be scrolled both "
+"vertically and horizontally."
+msgstr ""
+"Будут отображаться подсказки о прокрутке (индикаторы, показывающие, что "
+"контент все еще можно прокручивать в определенном направлении).\n"
+"[b]Примечание:[/b] Подсказки не будут отображаться, если контент можно "
+"прокручивать как вертикально, так и горизонтально."
+
 msgid ""
 "The current horizontal scroll value.\n"
 "[b]Note:[/b] If you are setting this value in the [method Node._ready] "
@@ -171276,6 +174487,69 @@ msgstr ""
 "обеспечения того, чтобы размер контента оставался неизменным независимо от "
 "того, видна ли полоса прокрутки."
 
+msgid ""
+"Scroll hints will be shown at the top and bottom (if vertical), or left and "
+"right (if horizontal)."
+msgstr ""
+"Подсказки при прокрутке будут отображаться вверху и внизу (при вертикальной "
+"прокрутке) или слева и справа (при горизонтальной прокрутке)."
+
+msgid ""
+"Scroll hints will be shown at the top (if vertical), or the left (if "
+"horizontal)."
+msgstr ""
+"Подсказки при прокрутке будут отображаться вверху (если прокрутка "
+"вертикальная) или слева (если прокрутка горизонтальная)."
+
+msgid ""
+"Scroll hints will be shown at the bottom (if horizontal), or the right (if "
+"horizontal)."
+msgstr ""
+"Подсказки при прокрутке будут отображаться внизу (если горизонтальная "
+"прокрутка) или справа (если горизонтальная прокрутка)."
+
+msgid ""
+"[Color] used to modulate the [theme_item scroll_hint_horizontal] texture."
+msgstr ""
+"[Color] используется для модуляции текстуры [theme_item "
+"scroll_hint_horizontal]."
+
+msgid "[Color] used to modulate the [theme_item scroll_hint_vertical] texture."
+msgstr ""
+"[Color] используется для модуляции текстуры [theme_item scroll_hint_vertical]."
+
+msgid ""
+"The space between the ScrollContainer's vertical scroll bar and its content, "
+"in pixels. No space will be added when the content's minimum size is larger "
+"than the ScrollContainer's size."
+msgstr ""
+"Расстояние между вертикальной полосой прокрутки ScrollContainer и его "
+"содержимым, в пикселях. Если минимальный размер содержимого превышает размер "
+"ScrollContainer, расстояние не добавляется."
+
+msgid ""
+"The space between the ScrollContainer's horizontal scroll bar and its "
+"content, in pixels. No space will be added when the content's minimum size is "
+"larger than the ScrollContainer's size."
+msgstr ""
+"Расстояние между горизонтальной полосой прокрутки ScrollContainer и его "
+"содержимым, в пикселях. Если минимальный размер содержимого превышает размер "
+"ScrollContainer, расстояние не добавляется."
+
+msgid ""
+"The indicator that will be shown when the content can still be scrolled "
+"horizontally. See [member scroll_hint_mode]."
+msgstr ""
+"Индикатор, который будет отображаться, когда контент еще можно прокручивать "
+"по горизонтали. См. [member scroll_hint_mode]."
+
+msgid ""
+"The indicator that will be shown when the content can still be scrolled "
+"vertically. See [member scroll_hint_mode]."
+msgstr ""
+"Индикатор, который будет отображаться, когда контент еще можно прокручивать "
+"вертикально. См. [member scroll_hint_mode]."
+
 msgid ""
 "The focus border [StyleBox] of the [ScrollContainer]. Only used if [member "
 "draw_focus_border] is [code]true[/code]."
@@ -171691,6 +174965,32 @@ msgstr ""
 "Возвращает текущее значение, установленное для данного материала униформы в "
 "шейдере."
 
+msgid ""
+"Changes the value set for this material of a uniform in the shader.\n"
+"[b]Note:[/b] [param param] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector).\n"
+"[b]Note:[/b] Changes to the shader uniform will be effective on all instances "
+"using this [ShaderMaterial]. To prevent this, use per-instance uniforms with "
+"[method CanvasItem.set_instance_shader_parameter], [method "
+"GeometryInstance3D.set_instance_shader_parameter] or duplicate the "
+"[ShaderMaterial] resource using [method Resource.duplicate]. Per-instance "
+"uniforms allow for better shader reuse and are therefore faster, so they "
+"should be preferred over duplicating the [ShaderMaterial] when possible."
+msgstr ""
+"Изменяет значение, установленное для этого материала униформы в шейдере.\n"
+"[b]Примечание:[/b] [param param] чувствителен к регистру и должен точно "
+"соответствовать имени униформы в коде (а не имени, написанному с заглавной "
+"буквы в инспекторе).\n"
+"[b]Примечание:[/b] Изменения в униформе шейдера будут действовать на всех "
+"экземплярах, использующих этот [ShaderMaterial]. Чтобы этого избежать, "
+"используйте униформы для каждого экземпляра с помощью [method "
+"CanvasItem.set_instance_shader_parameter], [method "
+"GeometryInstance3D.set_instance_shader_parameter] или дублируйте ресурс "
+"[ShaderMaterial] с помощью [method Resource.duplicate]. Униформы для каждого "
+"экземпляра обеспечивают лучшее повторное использование шейдера и, "
+"следовательно, работают быстрее, поэтому их следует предпочитать дублированию "
+"[ShaderMaterial], когда это возможно."
+
 msgid "The [Shader] program used to render this material."
 msgstr "Программа [Shader], использованная для рендеринга этого материала."
 
@@ -173030,6 +176330,13 @@ msgstr ""
 msgid "Returns the global rest transform for [param bone_idx]."
 msgstr "Возвращает глобальное преобразование rest для [param bone_idx]."
 
+msgid ""
+"Returns the metadata with the given [param key] for the bone at index [param "
+"bone_idx]."
+msgstr ""
+"Возвращает метаданные с заданным ключом [param key] для кости по индексу "
+"[param bone_idx]."
+
 msgid ""
 "Returns the list of all metadata keys for the bone at index [param bone_idx]."
 msgstr ""
@@ -173117,6 +176424,13 @@ msgstr ""
 "Используется для аннулирования кэшей в IK и других узлах, которые "
 "обрабатывают кости."
 
+msgid ""
+"Returns [code]true[/code] if the bone at index [param bone_idx] has metadata "
+"with the given [param key]."
+msgstr ""
+"Возвращает [code]true[/code], если кость с индексом [param bone_idx] имеет "
+"метаданные с заданным [param key]."
+
 msgid ""
 "Returns whether the bone pose for the bone at [param bone_idx] is enabled."
 msgstr "Возвращает, включена ли поза кости для кости в [param bone_idx]."
@@ -173175,6 +176489,13 @@ msgstr ""
 "умножьте [method Transform3D.affine_inverse] узла [member "
 "Node3D.global_transform] на желаемое мировое преобразование."
 
+msgid ""
+"Sets the metadata with the given [param key] to [param value] for the bone at "
+"index [param bone_idx]."
+msgstr ""
+"Устанавливает метаданные с заданным значением [param key] равным [param "
+"value] для кости с индексом [param bone_idx]."
+
 msgid "Sets the bone name, [param name], for the bone at [param bone_idx]."
 msgstr ""
 "Устанавливает имя кости [param name] для кости с параметром [param bone_idx]."
@@ -174574,9 +177895,50 @@ msgstr ""
 "костей, поскольку [Skeleton3D] автоматически применяет влияние ко всем позам "
 "костей, заданным модификатором."
 
+msgid ""
+"Override this virtual method to implement a custom skeleton modifier. You "
+"should do things like get the [Skeleton3D]'s current pose and apply the pose "
+"here.\n"
+"[method _process_modification_with_delta] must not apply [member influence] "
+"to bone poses because the [Skeleton3D] automatically applies influence to all "
+"bone poses set by the modifier.\n"
+"[param delta] is passed from parent [Skeleton3D]. See also [method "
+"Skeleton3D.advance].\n"
+"[b]Note:[/b] This method may be called outside [method Node._process] and "
+"[method Node._physics_process] with [param delta] is [code]0.0[/code], since "
+"the modification should be processed immediately after initialization of the "
+"[Skeleton3D]."
+msgstr ""
+"Переопределите этот виртуальный метод, чтобы реализовать пользовательский "
+"модификатор скелета. Вам следует получить текущую позу [Skeleton3D] и "
+"применить её здесь.\n"
+"Метод [method _process_modification_with_delta] не должен применять [member "
+"influence] к позам костей, поскольку [Skeleton3D] автоматически применяет "
+"влияние ко всем позам костей, заданным модификатором.\n"
+"[param delta] передаётся от родительского [Skeleton3D]. См. также [method "
+"Skeleton3D.advance].\n"
+"[b]Примечание:[/b] Этот метод может быть вызван вне [method Node._process] и "
+"[method Node._physics_process] с [param delta] равным [code]0.0[/code], "
+"поскольку модификация должна быть обработана сразу после инициализации "
+"[Skeleton3D]."
+
 msgid "Called when the skeleton is changed."
 msgstr "Вызывается при изменении скелета."
 
+msgid ""
+"Called when bone names and indices need to be validated, such as when "
+"entering the scene tree or changing skeleton."
+msgstr ""
+"Вызывается, когда необходимо проверить имена и индексы костей, например, при "
+"входе в дерево сцены или изменении скелета."
+
+msgid ""
+"Returns the parent [Skeleton3D] node if it exists. Otherwise, returns "
+"[code]null[/code]."
+msgstr ""
+"Возвращает родительский узел [Skeleton3D], если он существует. В противном "
+"случае возвращает [code]null[/code]."
+
 msgid "If [code]true[/code], the [SkeletonModifier3D] will be processing."
 msgstr "Если [code]true[/code], то [SkeletonModifier3D] будет обработан."
 
@@ -174623,6 +177985,12 @@ msgstr "Перечисленное значение для оси -Z."
 msgid "Enumerated value for the axis from a parent bone to the child bone."
 msgstr "Перечисленное значение для оси от родительской кости до дочерней кости."
 
+msgid "Enumerated value for the case when the axis is undefined."
+msgstr "Перечисляемое значение для случая, когда ось не определена."
+
+msgid "Enumerated value for an optional axis."
+msgstr "Перечисляемое значение для необязательной оси."
+
 msgid "Enumerated value for the rotation of the X axis."
 msgstr "Перечисленное значение для вращения оси X."
 
@@ -174635,6 +178003,9 @@ msgstr "Перечисленное значение для вращения ос
 msgid "Enumerated value for the unconstrained rotation."
 msgstr "Перечисленное значение для неограниченного вращения."
 
+msgid "Enumerated value for an optional rotation axis."
+msgstr "Перечисляемое значение для необязательной оси вращения."
+
 msgid ""
 "Base class for a profile of a virtual skeleton used as a target for "
 "retargeting."
@@ -174859,6 +178230,136 @@ msgstr "Направление не рассчитано."
 msgid "A humanoid [SkeletonProfile] preset."
 msgstr "Предустановка гуманоида [SkeletonProfile]."
 
+msgid ""
+"A [SkeletonProfile] as a preset that is optimized for the human form. This "
+"exists for standardization, so all parameters are read-only.\n"
+"A humanoid skeleton profile contains 56 bones divided into 4 groups: [code]"
+"\"Body\"[/code], [code]\"Face\"[/code], [code]\"LeftHand\"[/code], and [code]"
+"\"RightHand\"[/code]. It is structured as follows:\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+msgstr ""
+"[SkeletonProfile] — это предустановка, оптимизированная для человеческой "
+"формы. Она существует для стандартизации, поэтому все параметры доступны "
+"только для чтения.\n"
+"Профиль скелета гуманоида содержит 56 костей, разделенных на 4 группы: [code]"
+"\"Body\"[/code], [code]\"Face\"[/code], [code]\"LeftHand\"[/code] и [code]"
+"\"RightHand\"[/code]. Он имеет следующую структуру:\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+
 msgid ""
 "A reference-counted holder object for a skeleton RID used in the "
 "[RenderingServer]."
@@ -175395,6 +178896,12 @@ msgstr ""
 "Константа для доступа к [member angular_ortho/damping]. Величина "
 "демпфирования вращения по осям, перпендикулярным ползунку."
 
+msgid "An abstract class for servers based on sockets."
+msgstr "Абстрактный класс для серверов, работающих на основе сокетов."
+
+msgid "A socket server."
+msgstr "Сервер сокетов."
+
 msgid "Returns [code]true[/code] if a connection is available for taking."
 msgstr "Возвращает [code]true[/code], если соединение доступно для принятия."
 
@@ -175408,6 +178915,12 @@ msgstr ""
 msgid "Stops listening."
 msgstr "Перестает слушать."
 
+msgid ""
+"If a connection is available, returns a StreamPeerSocket with the connection."
+msgstr ""
+"Если соединение доступно, возвращает объект StreamPeerSocket с установленным "
+"соединением."
+
 msgid "A deformable 3D physics mesh."
 msgstr "Деформируемая 3D физическая сетка."
 
@@ -175556,9 +179069,6 @@ msgstr ""
 "Увеличение этого значения улучшит результаты моделирования, но может повлиять "
 "на производительность. Используйте с осторожностью."
 
-msgid "The SoftBody3D's mass."
-msgstr "Масса SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
@@ -175747,6 +179257,17 @@ msgstr ""
 msgid "Changes the alignment of the underlying [LineEdit]."
 msgstr "Изменяет выравнивание базового [LineEdit]."
 
+msgid ""
+"If [code]true[/code], the value will be rounded to a multiple of [member "
+"custom_arrow_step] when interacting with the arrow buttons. Otherwise, "
+"increments the value by [member custom_arrow_step] and then rounds it "
+"according to [member Range.step]."
+msgstr ""
+"Если [code]true[/code], значение будет округляться до кратного [member "
+"custom_arrow_step] при взаимодействии со стрелками. В противном случае "
+"значение увеличивается на [member custom_arrow_step], а затем округляется в "
+"соответствии с [member Range.step]."
+
 msgid ""
 "If not [code]0[/code], sets the step when interacting with the arrow buttons "
 "of the [SpinBox].\n"
@@ -175938,6 +179459,146 @@ msgstr ""
 "[StyleBox] рисуется в пространстве, занимаемом разделением между кнопками "
 "«вверх» и «вниз»."
 
+msgid "A [SkeletonModifier3D] for aligning bones along a [Path3D]."
+msgstr ""
+"Модификатор [SkeletonModifier3D] для выравнивания костей вдоль пути [Path3D]."
+
+msgid ""
+"A [SkeletonModifier3D] for aligning bones along a [Path3D]. The smoothness of "
+"the fitting depends on the [member Curve3D.bake_interval].\n"
+"If you want the [Path3D] to attach to a specific bone, it is recommended to "
+"place a [ModifierBoneTarget3D] before the [SplineIK3D] in the "
+"[SkeletonModifier3D] list (children of the [Skeleton3D]), and then place a "
+"[Path3D] as the [ModifierBoneTarget3D]'s child.\n"
+"Bone twist is determined based on the [method Curve3D.get_point_tilt].\n"
+"If the root bone joint and the start point of the [Curve3D] are separated, it "
+"assumes that there is a linear line segment between them. This means that the "
+"vector pointing toward the start point of the [Curve3D] takes precedence over "
+"the shortest intersection point along the [Curve3D].\n"
+"If the end bone joint exceeds the path length, it is bent as close as "
+"possible to the end point of the [Curve3D]."
+msgstr ""
+"[SkeletonModifier3D] используется для выравнивания костей вдоль [Path3D]. "
+"Плавность подгонки зависит от [member Curve3D.bake_interval].\n"
+"Если вы хотите, чтобы [Path3D] прикреплялся к определенной кости, "
+"рекомендуется разместить [ModifierBoneTarget3D] перед [SplineIK3D] в списке "
+"[SkeletonModifier3D] (дочерние элементы [Skeleton3D]), а затем разместить "
+"[Path3D] в качестве дочернего элемента [ModifierBoneTarget3D].\n"
+"Скручивание кости определяется на основе [method Curve3D.get_point_tilt].\n"
+"Если корневой сустав кости и начальная точка [Curve3D] разделены, "
+"предполагается, что между ними существует линейный отрезок. Это означает, что "
+"вектор, направленный к начальной точке [Curve3D], имеет приоритет над "
+"кратчайшей точкой пересечения вдоль [Curve3D].\n"
+"Если длина конечного костного сустава превышает длину пути, он изгибается как "
+"можно ближе к конечной точке [Curve3D]."
+
+msgid "Returns the node path of the [Path3D] which is describing the path."
+msgstr "Возвращает путь узла объекта [Path3D], описывающего путь."
+
+msgid ""
+"Returns the tilt interpolation method used between the root bone and the "
+"start point of the [Curve3D] when they are apart. See also [method "
+"set_tilt_fade_in]."
+msgstr ""
+"Возвращает метод интерполяции наклона, используемый между корневой костью и "
+"начальной точкой [Curve3D], когда они находятся на некотором расстоянии друг "
+"от друга. См. также [method set_tilt_fade_in]."
+
+msgid ""
+"Returns the tilt interpolation method used between the end bone and the end "
+"point of the [Curve3D] when they are apart. See also [method "
+"set_tilt_fade_out]."
+msgstr ""
+"Возвращает метод интерполяции наклона, используемый между конечной костью и "
+"конечной точкой [Curve3D], когда они находятся на некотором расстоянии друг "
+"от друга. См. также [method set_tilt_fade_out]."
+
+msgid "Returns if the tilt property of the [Curve3D] affects the bone twist."
+msgstr ""
+"Возвращает значение, если свойство наклона объекта [Curve3D] влияет на "
+"скручивание кости."
+
+msgid "Sets the node path of the [Path3D] which is describing the path."
+msgstr "Задает путь к узлу [Path3D], описывающему путь."
+
+msgid "Sets if the tilt property of the [Curve3D] should affect the bone twist."
+msgstr ""
+"Определяет, должно ли свойство наклона объекта [Curve3D] влиять на "
+"скручивание кости."
+
+msgid ""
+"If [param size] is greater than [code]0[/code], the tilt is interpolated "
+"between [param size] start bones from the start point of the [Curve3D] when "
+"they are apart.\n"
+"If [param size] is equal [code]0[/code], the tilts between the root bone head "
+"and the start point of the [Curve3D] are unified with a tilt of the start "
+"point of the [Curve3D].\n"
+"If [param size] is less than [code]0[/code], the tilts between the root bone "
+"and the start point of the [Curve3D] are [code]0.0[/code]."
+msgstr ""
+"Если [param size] больше [code]0[/code], наклон интерполируется между [param "
+"size] начальными костями от начальной точки [Curve3D], когда они находятся на "
+"расстоянии друг от друга.\n"
+"Если [param size] равно [code]0[/code], наклоны между головкой корневой кости "
+"и начальной точкой [Curve3D] объединяются с наклоном начальной точки "
+"[Curve3D].\n"
+"Если [param size] меньше [code]0[/code], наклоны между корневой костью и "
+"начальной точкой [Curve3D] равны [code]0.0[/code]."
+
+msgid ""
+"If [param size] is greater than [code]0[/code], the tilt is interpolated "
+"between [param size] end bones from the end point of the [Curve3D] when they "
+"are apart.\n"
+"If [param size] is equal [code]0[/code], the tilts between the end bone tail "
+"and the end point of the [Curve3D] are unified with a tilt of the end point "
+"of the [Curve3D].\n"
+"If [param size] is less than [code]0[/code], the tilts between the end bone "
+"and the end point of the [Curve3D] are [code]0.0[/code]."
+msgstr ""
+"Если [param size] больше [code]0[/code], наклон интерполируется между [param "
+"size] конечными костями от конечной точки [Curve3D], когда они находятся на "
+"расстоянии друг от друга.\n"
+"Если [param size] равно [code]0[/code], наклоны между хвостовой частью "
+"конечной кости и конечной точкой [Curve3D] объединяются с наклоном конечной "
+"точки [Curve3D].\n"
+"Если [param size] меньше [code]0[/code], наклоны между конечной костью и "
+"конечной точкой [Curve3D] равны [code]0.0[/code]."
+
+msgid ""
+"A container that arranges child controls horizontally or vertically and "
+"provides grabbers for adjusting the split ratios between them."
+msgstr ""
+"Контейнер, в котором элементы управления для дочерних узлов располагаются "
+"горизонтально или вертикально, и предусмотрены захваты для регулировки "
+"соотношения разделения пространства между ними."
+
+msgid ""
+"A container that arranges child controls horizontally or vertically and "
+"creates grabbers between them. The grabbers can be dragged around to change "
+"the size relations between the child controls."
+msgstr ""
+"Контейнер, который располагает дочерние элементы управления горизонтально или "
+"вертикально и создает между ними захватные элементы. Захватные элементы можно "
+"перетаскивать, чтобы изменять соотношение размеров между дочерними элементами "
+"управления."
+
+msgid ""
+"Clamps the [member split_offsets] values to ensure they are within valid "
+"ranges and do not overlap with each other. When overlaps occur, this method "
+"prioritizes one split offset (at index [param priority_index]) by clamping "
+"any overlapping split offsets to it."
+msgstr ""
+"Ограничивает значения [member split_offsets], чтобы гарантировать, что они "
+"находятся в допустимых диапазонах и не перекрываются друг с другом. При "
+"возникновении перекрытий этот метод отдает приоритет одному смещению "
+"разделения (по индексу [param priority_index]), ограничивая все "
+"перекрывающиеся смещения разделения этим смещением."
+
+msgid "Use the first element of [method get_drag_area_controls] instead."
+msgstr ""
+"Вместо этого используйте первый элемент метода [method "
+"get_drag_area_controls]."
+
 msgid ""
 "Returns the drag area [Control]. For example, you can move a pre-configured "
 "button into the drag area [Control] so that it rides along with the split "
@@ -175972,6 +179633,14 @@ msgstr ""
 "[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
 "освобождение может привести к сбою."
 
+msgid ""
+"If [code]true[/code], the draggers will be disabled and the children will be "
+"sized as if all [member split_offsets] were [code]0[/code]."
+msgstr ""
+"Если [code]true[/code], перетаскиватели будут отключены, а размеры дочерних "
+"элементов будут такими, как если бы все [member split_offsets] было [code]0[/"
+"code]."
+
 msgid ""
 "Highlights the drag area [Rect2] so you can see where it is during "
 "development. The drag area is gold if [member dragging_enabled] is "
@@ -176014,6 +179683,48 @@ msgstr ""
 msgid "Enables or disables split dragging."
 msgstr "Включает или отключает раздельное перетаскивание."
 
+msgid ""
+"Use [member split_offsets] instead. The first element of the array is the "
+"split offset between the first two children."
+msgstr ""
+"Вместо этого используйте [member split_offsets]. Первый элемент массива — это "
+"смещение разделения между первыми двумя дочерними элементами."
+
+msgid "The first element of [member split_offsets]."
+msgstr "Первый элемент [member split_offsets]."
+
+msgid ""
+"Offsets for each dragger in pixels. Each one is the offset of the split "
+"between the [Control] nodes before and after the dragger, with [code]0[/code] "
+"being the default position. The default position is based on the [Control] "
+"nodes expand flags and minimum sizes. See [member "
+"Control.size_flags_horizontal], [member Control.size_flags_vertical], and "
+"[member Control.size_flags_stretch_ratio].\n"
+"If none of the [Control] nodes before the dragger are expanded, the default "
+"position will be at the start of the [SplitContainer]. If none of the "
+"[Control] nodes after the dragger are expanded, the default position will be "
+"at the end of the [SplitContainer]. If the dragger is in between expanded "
+"[Control] nodes, the default position will be in the middle, based on the "
+"[member Control.size_flags_stretch_ratio]s and minimum sizes.\n"
+"[b]Note:[/b] If the split offsets cause [Control] nodes to overlap, the first "
+"split will take priority when resolving the positions."
+msgstr ""
+"Смещение для каждого перетаскиваемого элемента в пикселях. Каждое из них "
+"представляет собой смещение разделения между узлами [Control] до и после "
+"перетаскиваемого элемента, при этом [code]0[/code] — положение по умолчанию. "
+"Положение по умолчанию определяется флагами расширения и минимальными "
+"размерами узлов [Control]. См. [member Control.size_flags_horizontal], "
+"[member Control.size_flags_vertical] и [member "
+"Control.size_flags_stretch_ratio].\n"
+"Если ни один из узлов [Control] до перетаскиваемого элемента не расширен, "
+"положение по умолчанию будет в начале [SplitContainer]. Если ни один из узлов "
+"[Control] после перетаскиваемого элемента не расширен, положение по умолчанию "
+"будет в конце [SplitContainer]. Если перетаскиваемый элемент находится между "
+"расширенными узлами [Control], положение по умолчанию будет посередине, "
+"исходя из [member Control.size_flags_stretch_ratio] и минимальных размеров.\n"
+"[b]Примечание:[/b] Если смещения при разделении приводят к перекрытию узлов "
+"[Control], то при определении позиций приоритет будет иметь первое разделение."
+
 msgid ""
 "If [code]true[/code], a touch-friendly drag handle will be enabled for better "
 "usability on smaller screens. Unlike the standard grabber, this drag handle "
@@ -176042,6 +179753,9 @@ msgstr "Генерируется, когда пользователь закан
 msgid "Emitted when the user starts dragging."
 msgstr "Генерируется, когда пользователь начинает перетаскивание."
 
+msgid "Emitted when any dragger is dragged by user."
+msgstr "Вызывается при перетаскивании любого объекта пользователем."
+
 msgid ""
 "The split dragger icon is always visible when [theme_item autohide] is "
 "[code]false[/code], otherwise visible only when the cursor hovers it.\n"
@@ -176081,6 +179795,67 @@ msgstr "Цвет сенсорного ползунка при наведении
 msgid "The color of the touch dragger when pressed."
 msgstr "Цвет сенсорного ползунка при нажатии."
 
+msgid ""
+"Boolean value. If [code]1[/code] ([code]true[/code]), the grabbers will hide "
+"automatically when they aren't under the cursor. If [code]0[/code] "
+"([code]false[/code]), the grabbers are always visible. The [member "
+"dragger_visibility] must be [constant DRAGGER_VISIBLE]."
+msgstr ""
+"Логическое Bool значение. Если [code]1[/code] ([code]true[/code]), элементы "
+"захвата будут автоматически скрываться, когда они не находятся под курсором. "
+"Если [code]0[/code] ([code]false[/code]), элементы захвата всегда видны. "
+"[member dragger_visibility] должен быть [constant DRAGGER_VISIBLE]."
+
+msgid ""
+"The minimum thickness of the area users can click on to grab a split bar. "
+"This ensures that the split bar can still be dragged if [theme_item "
+"separation] or [theme_item h_grabber] / [theme_item v_grabber]'s size is too "
+"narrow to easily select."
+msgstr ""
+"Минимальная толщина области, на которую пользователи могут щелкнуть, чтобы "
+"захватить разделительную полосу. Это гарантирует, что разделительную полосу "
+"можно будет перетаскивать, даже если размер [theme_item separation] или "
+"[theme_item h_grabber] / [theme_item v_grabber] слишком мал для удобного "
+"выбора."
+
+msgid ""
+"The split bar thickness, i.e., the gap between each child of the container. "
+"This is overridden by the size of the grabber icon if [member "
+"dragger_visibility] is set to [constant DRAGGER_VISIBLE], or [constant "
+"DRAGGER_HIDDEN], and [theme_item separation] is smaller than the size of the "
+"grabber icon in the same axis.\n"
+"[b]Note:[/b] To obtain [theme_item separation] values less than the size of "
+"the grabber icon, for example a [code]1 px[/code] hairline, set [theme_item "
+"h_grabber] or [theme_item v_grabber] to a new [ImageTexture], which "
+"effectively sets the grabber icon size to [code]0 px[/code]."
+msgstr ""
+"Толщина разделительной полосы, то есть расстояние между каждым дочерним "
+"элементом контейнера. Это значение переопределяется размером значка захвата, "
+"если [member dragger_visibility] установлено в [constant DRAGGER_VISIBLE] или "
+"[constant DRAGGER_HIDDEN], и [theme_item separation] меньше размера значка "
+"захвата по той же оси.\n"
+"[b]Примечание:[/b] Чтобы получить значения [theme_item separation] меньше "
+"размера значка захвата, например, [code]1 px[/code] тонкой линии, установите "
+"[theme_item h_grabber] или [theme_item v_grabber] в новое значение "
+"[ImageTexture], что фактически устанавливает размер значка захвата равным "
+"[code]0 px[/code]."
+
+msgid ""
+"The icon used for the grabbers drawn in the separations. This is only used in "
+"[HSplitContainer] and [VSplitContainer]. For [SplitContainer], see "
+"[theme_item h_grabber] and [theme_item v_grabber] instead."
+msgstr ""
+"Значок, используемый для элементов захвата, отображаемых в разделителях. Он "
+"используется только в [HSplitContainer] и [VSplitContainer]. Для "
+"[SplitContainer] см. [theme_item h_grabber] и [theme_item v_grabber]."
+
+msgid ""
+"The icon used for the grabbers drawn in the separations when [member "
+"vertical] is [code]false[/code]."
+msgstr ""
+"Значок, используемый для элементов захвата, отображаемых в разделительных "
+"линиях, когда [member vertical] имеет значение [code]false[/code]."
+
 msgid ""
 "The icon used for the drag handle when [member touch_dragger_enabled] is "
 "[code]true[/code] and [member vertical] is [code]false[/code]."
@@ -176100,6 +179875,13 @@ msgstr ""
 "[HSplitContainer] и [VSplitContainer]. Для [SplitContainer] см. [theme_item "
 "h_touch_dragger] и [theme_item v_touch_dragger]."
 
+msgid ""
+"The icon used for the grabbers drawn in the separations when [member "
+"vertical] is [code]true[/code]."
+msgstr ""
+"Значок, используемый для элементов захвата, отображаемых в разделительных "
+"линиях, когда [member vertical] имеет значение [code]true[/code]."
+
 msgid ""
 "The icon used for the drag handle when [member touch_dragger_enabled] is "
 "[code]true[/code] and [member vertical] is [code]true[/code]."
@@ -176270,6 +180052,17 @@ msgstr ""
 "Удаляет указанный [RID] из списка объектов [PhysicsBody3D], исключенных из "
 "проверки столкновений."
 
+msgid ""
+"The layers against which the collision check will be done. See [url=$DOCS_URL/"
+"tutorials/physics/physics_introduction.html#collision-layers-and-"
+"masks]Collision layers and masks[/url] in the documentation for more "
+"information."
+msgstr ""
+"Слои, относительно которых будет выполняться проверка на столкновение. "
+"Дополнительную информацию см. в документации по адресу [url=$DOCS_URL/"
+"tutorials/physics/physics_introduction.html#collision-layers-and-masks]Слои и "
+"маски столкновений[/url]."
+
 msgid ""
 "When the collision check is made, a candidate length for the SpringArm3D is "
 "given.\n"
@@ -176550,6 +180343,21 @@ msgstr "Возвращает кривую демпфирования радиу
 msgid "Returns the rotation axis of the bone chain."
 msgstr "Возвращает ось вращения цепи костей."
 
+msgid ""
+"Returns the rotation axis vector of the bone chain. This vector represents "
+"the axis around which the bone chain can rotate. It is determined based on "
+"the rotation axis set for the bone chain.\n"
+"If [method get_rotation_axis] is [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL], this method returns [code]Vector3(0, "
+"0, 0)[/code]."
+msgstr ""
+"Возвращает вектор оси вращения цепочки костей. Этот вектор представляет ось, "
+"вокруг которой может вращаться цепочка костей. Он определяется на основе оси "
+"вращения, заданной для цепочки костей.\n"
+"Если [method get_rotation_axis] равен [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL], этот метод возвращает [code]Vector3(0, "
+"0, 0)[/code]."
+
 msgid "Returns the stiffness force of the bone chain."
 msgstr "Возвращает силу жесткости костной цепи."
 
@@ -176741,6 +180549,25 @@ msgstr ""
 "Устанавливает радиус сустава в [param joint] в списке суставов цепочки "
 "костей, когда [method is_config_individual] имеет значение [code]true[/code]."
 
+msgid ""
+"Sets the rotation axis at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code].\n"
+"The axes are based on the [method Skeleton3D.get_bone_rest]'s space, if "
+"[param axis] is [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], you can "
+"specify any axis.\n"
+"[b]Note:[/b] The rotation axis and the forward vector shouldn't be colinear "
+"to avoid unintended rotation since [SpringBoneSimulator3D] does not factor in "
+"twisting forces."
+msgstr ""
+"Устанавливает ось вращения в [param joint] в списке суставов цепочки костей, "
+"когда [method is_config_individual] имеет значение [code]true[/code].\n"
+"Оси основаны на пространстве [method Skeleton3D.get_bone_rest]. Если [param "
+"axis] равно [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], можно указать "
+"любую ось.\n"
+"[b]Примечание:[/b] Ось вращения и вектор направления не должны быть "
+"коллинеарными, чтобы избежать непреднамеренного вращения, поскольку "
+"[SpringBoneSimulator3D] не учитывает силы скручивания."
+
 msgid ""
 "Sets the stiffness force at [param joint] in the bone chain's joint list when "
 "[method is_config_individual] is [code]true[/code]."
@@ -176762,6 +180589,42 @@ msgstr ""
 msgid "Sets the joint radius damping curve of the bone chain."
 msgstr "Устанавливает кривую демпфирования радиуса сустава костной цепи."
 
+msgid ""
+"Sets the rotation axis of the bone chain. If set to a specific axis, it acts "
+"like a hinge joint. The value is cached in each joint setting in the joint "
+"list.\n"
+"The axes are based on the [method Skeleton3D.get_bone_rest]'s space, if "
+"[param axis] is [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], you can "
+"specify any axis.\n"
+"[b]Note:[/b] The rotation axis vector and the forward vector shouldn't be "
+"colinear to avoid unintended rotation since [SpringBoneSimulator3D] does not "
+"factor in twisting forces."
+msgstr ""
+"Задает ось вращения цепочки костей. Если задана конкретная ось, она действует "
+"как шарнирный сустав. Значение кэшируется в настройках каждого сустава в "
+"списке суставов.\n"
+"Оси основаны на пространстве [method Skeleton3D.get_bone_rest]. Если [param "
+"axis] — [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], можно указать "
+"любую ось.\n"
+"[b]Примечание:[/b] Вектор оси вращения и вектор направления вращения не "
+"должны быть коллинеарными, чтобы избежать непреднамеренного вращения, "
+"поскольку [SpringBoneSimulator3D] не учитывает силы скручивания."
+
+msgid ""
+"Sets the rotation axis vector of the bone chain. The value is cached in each "
+"joint setting in the joint list.\n"
+"This vector is normalized by an internal process and represents the axis "
+"around which the bone chain can rotate.\n"
+"If the vector length is [code]0[/code], it is considered synonymous with "
+"[constant SkeletonModifier3D.ROTATION_AXIS_ALL]."
+msgstr ""
+"Задает вектор оси вращения цепочки костей. Значение кэшируется в каждой "
+"настройке сустава в списке суставов.\n"
+"Этот вектор нормализуется внутренним процессом и представляет ось, вокруг "
+"которой может вращаться цепочка костей.\n"
+"Если длина вектора равна [code]0[/code], он считается синонимом [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL]."
+
 msgid ""
 "Sets the stiffness force of the bone chain. The greater the value, the faster "
 "it recovers to its initial pose.\n"
@@ -176790,6 +180653,20 @@ msgstr ""
 "направлении.\n"
 "Это полезно для таких эффектов, как ветер и антигравитация."
 
+msgid ""
+"If [code]true[/code], the solver retrieves the bone axis from the bone pose "
+"every frame.\n"
+"If [code]false[/code], the solver retrieves the bone axis from the bone rest "
+"and caches it, which increases performance slightly, but position changes in "
+"the bone pose made before processing this [SpringBoneSimulator3D] are ignored."
+msgstr ""
+"Если [code]true[/code], решатель извлекает ось кости из положения кости "
+"каждый кадр.\n"
+"Если [code]false[/code], решатель извлекает ось кости из состояния покоя "
+"кости и кэширует её, что немного повышает производительность, но изменения "
+"положения кости, внесённые до обработки этого [SpringBoneSimulator3D], "
+"игнорируются."
+
 msgid "The world origin is defined as center."
 msgstr "Начало координат мира определяется как центр."
 
@@ -176876,6 +180753,18 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns [code]true[/code] if the pixel at the given position is opaque, "
+"[code]false[/code] otherwise. Also returns [code]false[/code] if the given "
+"position is out of bounds or this sprite's [member texture] is [code]null[/"
+"code]. [param pos] is in local coordinates."
+msgstr ""
+"Возвращает [code]true[/code], если пиксель в заданной позиции непрозрачен, "
+"[code]false[/code] в противном случае. Также возвращает [code]false[/code], "
+"если заданная позиция выходит за пределы допустимых значений или [member "
+"texture] этого спрайта равна [code]null[/code]. [param pos] — локальные "
+"координаты."
+
 msgid ""
 "If [code]true[/code], texture is centered.\n"
 "[b]Note:[/b] For games with a pixel art aesthetic, textures may appear "
@@ -177514,6 +181403,18 @@ msgstr "Получает из потока знаковое 64-битное зн
 msgid "Returns the number of bytes this [StreamPeer] has available."
 msgstr "Возвращает количество байтов, доступных этому [StreamPeer]."
 
+msgid ""
+"Returns a chunk data with the received bytes, as an [Array] containing two "
+"elements: an [enum Error] constant and a [PackedByteArray]. [param bytes] is "
+"the number of bytes to be received. If not enough bytes are available, the "
+"function will block until the desired amount is received."
+msgstr ""
+"Возвращает фрагмент данных с полученными байтами в виде массива [Array], "
+"содержащего два элемента: константу [enum Error] и массив [PackedByteArray]. "
+"[param bytes] — количество байтов, которые необходимо получить. Если байтов "
+"недостаточно, функция будет блокироваться до тех пор, пока не будет получено "
+"необходимое количество."
+
 msgid "Gets a double-precision float from the stream."
 msgstr "Получает из потока число с плавающей точкой двойной точности."
 
@@ -177523,6 +181424,17 @@ msgstr "Получает из потока число с плавающей то
 msgid "Gets a half-precision float from the stream."
 msgstr "Получает из потока число с плавающей точкой половинной точности."
 
+msgid ""
+"Returns a chunk data with the received bytes, as an [Array] containing two "
+"elements: an [enum Error] constant and a [PackedByteArray]. [param bytes] is "
+"the number of bytes to be received. If not enough bytes are available, the "
+"function will return how many were actually received."
+msgstr ""
+"Возвращает фрагмент данных с полученными байтами в виде массива [Array], "
+"содержащего два элемента: константу [enum Error] и массив [PackedByteArray]. "
+"[param bytes] — количество байтов, которые необходимо получить. Если байтов "
+"недостаточно, функция вернет фактическое количество полученных байтов."
+
 msgid ""
 "Gets an ASCII string with byte-length [param bytes] from the stream. If "
 "[param bytes] is negative (default) the length will be read from the stream "
@@ -177800,9 +181712,39 @@ msgstr ""
 "[param use_deflate] равен [code]true[/code], то вместо GZIP будет "
 "использоваться deflate."
 
+msgid "Abstract base class for interacting with socket streams."
+msgstr "Абстрактный базовый класс для взаимодействия с сокетными потоками."
+
+msgid ""
+"StreamPeerSocket is an abstract base class that defines common behavior for "
+"socket-based streams."
+msgstr ""
+"StreamPeerSocket — это абстрактный базовый класс, определяющий общее "
+"поведение для потоков, передаваемых через сокеты."
+
 msgid "Disconnects from host."
 msgstr "Отключение от хоста."
 
+msgid "Polls the socket, updating its state. See [method get_status]."
+msgstr "Опрашивает сокет, обновляя его состояние. См. [method get_status]."
+
+msgid ""
+"The initial status of the [StreamPeerSocket]. This is also the status after "
+"disconnecting."
+msgstr ""
+"Начальное состояние [StreamPeerSocket]. Это также состояние после разрыва "
+"соединения."
+
+msgid "A status representing a [StreamPeerSocket] that is connecting to a host."
+msgstr ""
+"Статус, представляющий собой [StreamPeerSocket], подключающийся к хосту."
+
+msgid "A status representing a [StreamPeerSocket] that is connected to a host."
+msgstr "Статус, представляющий собой [StreamPeerSocket], подключенный к хосту."
+
+msgid "A status representing a [StreamPeerSocket] in error state."
+msgstr "Статус, указывающий на наличие ошибки в объекте [StreamPeerSocket]."
+
 msgid "A stream peer that handles TCP connections."
 msgstr "Потоковый узел, обрабатывающий TCP-соединения."
 
@@ -177941,6 +181883,45 @@ msgstr ""
 "Статус ошибки, указывающий на несоответствие домена сертификата TLS, "
 "представленного хостом, и домена, запрошенного для проверки."
 
+msgid "A stream peer that handles UNIX Domain Socket (UDS) connections."
+msgstr "Узел потока, обрабатывающий соединения UNIX Domain Socket (UDS)."
+
+msgid ""
+"A stream peer that handles UNIX Domain Socket (UDS) connections. This object "
+"can be used to connect to UDS servers, or also is returned by a UDS server. "
+"Unix Domain Sockets provide inter-process communication on the same machine "
+"using the filesystem namespace.\n"
+"[b]Note:[/b] UNIX Domain Sockets are only available on UNIX-like systems "
+"(Linux, macOS, etc.) and are not supported on Windows."
+msgstr ""
+"Объект потока, обрабатывающий соединения UNIX Domain Socket (UDS). Этот "
+"объект может использоваться для подключения к серверам UDS или возвращаться к "
+"сервером UDS. Сокеты домена Unix обеспечивают межпроцессное взаимодействие на "
+"одной машине с использованием пространства имен файловой системы.\n"
+"[b]Примечание:[/b] Сокеты домена UNIX доступны только в UNIX-подобных "
+"системах (Linux, macOS и т. д.) и не поддерживаются в Windows."
+
+msgid ""
+"Opens the UDS socket, and binds it to the specified socket path.\n"
+"This method is generally not needed, and only used to force the subsequent "
+"call to [method connect_to_host] to use the specified [param path] as the "
+"source address."
+msgstr ""
+"Открывает UDS-сокет и привязывает его к указанному пути к сокету.\n"
+"Этот метод, как правило, не требуется и используется только для того, чтобы "
+"заставить последующий вызов [method connect_to_host] использовать указанный "
+"[param path] в качестве исходного адреса."
+
+msgid ""
+"Connects to the specified UNIX Domain Socket path. Returns [constant OK] on "
+"success."
+msgstr ""
+"Устанавливает соединение с указанным путем к сокету домена UNIX. Возвращает "
+"[constant OK] в случае успеха."
+
+msgid "Returns the socket path of this peer."
+msgstr "Возвращает путь к сокету этого узла."
+
 msgid "A built-in type for strings."
 msgstr "Встроенный тип для строк."
 
@@ -178281,6 +182262,59 @@ msgstr ""
 "оператор [code]==[/code]. См. также [method filecasecmp_to], [method "
 "naturalnocasecmp_to] и [method nocasecmp_to]."
 
+msgid ""
+"Returns the index of the [b]first[/b] occurrence of [param what] in this "
+"string, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the end of the string.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Team\".find(\"I\")) # Prints -1\n"
+"\n"
+"print(\"Potato\".find(\"t\"))    # Prints 2\n"
+"print(\"Potato\".find(\"t\", 3)) # Prints 4\n"
+"print(\"Potato\".find(\"t\", 5)) # Prints -1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Team\".Find(\"I\")); // Prints -1\n"
+"\n"
+"GD.Print(\"Potato\".Find(\"t\"));    // Prints 2\n"
+"GD.Print(\"Potato\".Find(\"t\", 3)); // Prints 4\n"
+"GD.Print(\"Potato\".Find(\"t\", 5)); // Prints -1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you just want to know whether the string contains [param "
+"what], use [method contains]. In GDScript, you may also use the [code]in[/"
+"code] operator.\n"
+"[b]Note:[/b] A negative value of [param from] is converted to a starting "
+"index by counting back from the last possible index with enough space to find "
+"[param what]."
+msgstr ""
+"Возвращает индекс [b]первого[/b] вхождения [param what] в этой строке или "
+"[code]-1[/code], если таких вхождений нет. Начало поиска можно указать с "
+"помощью [param from], поиск продолжается до конца строки.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Team\".find(\"I\")) # Выводит -1\n"
+"\n"
+"print(\"Potato\".find(\"t\"))    # Выводит 2\n"
+"print(\"Potato\".find(\"t\", 3)) # Выводит 4\n"
+"print(\"Potato\".find(\"t\", 5)) # Выводит -1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Team\".Find(\"I\")); // Выводит -1\n"
+"\n"
+"GD.Print(\"Potato\".Find(\"t\"));    // Выводит 2\n"
+"GD.Print(\"Potato\".Find(\"t\", 3)); // Выводит 4\n"
+"GD.Print(\"Potato\".Find(\"t\", 5)); // Выводит -1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Если вам нужно просто узнать, содержит ли строка [param "
+"what], используйте [method contains]. В GDScript вы также можете использовать "
+"оператор [code]in[/code].\n"
+"[b]Примечание:[/b] Отрицательное значение [param from] преобразуется в "
+"начальный индекс путем отсчета назад от последнего возможного индекса с "
+"достаточным пространством для нахождения [param what]."
+
 msgid ""
 "Returns the index of the [b]first[/b] [b]case-insensitive[/b] occurrence of "
 "[param what] in this string, or [code]-1[/code] if there are none. The "
@@ -178467,6 +182501,57 @@ msgstr ""
 "var file = \"/path/to/icon.png\".get_file() # file равен \"icon.png\"\n"
 "[/codeblock]"
 
+msgid ""
+"Splits the string using a [param delimiter] and returns the substring at "
+"index [param slice]. Returns the original string if [param delimiter] does "
+"not occur in the string. Returns an empty string if the [param slice] does "
+"not exist.\n"
+"This is faster than [method split], if you only need one or two substrings.\n"
+"[codeblock]\n"
+"print(\"i/am/example/hi\".get_slice(\"/\", 2)) # Prints \"example\"\n"
+"[/codeblock]"
+msgstr ""
+"Разделяет строку с помощью [param delimiter] и возвращает подстроку по "
+"индексу [param slice]. Возвращает исходную строку, если [param delimiter] "
+"отсутствует в строке. Возвращает пустую строку, если [param slice] не "
+"существует.\n"
+"Это быстрее, чем [method split], если вам нужна только одна или две "
+"подстроки.\n"
+"[codeblock]\n"
+"print(\"i/am/example/hi\".get_slice(\"/\", 2)) # Выводит \"example\"\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the total number of slices when the string is split with the given "
+"[param delimiter] (see [method split]).\n"
+"Use [method get_slice] to extract a specific slice.\n"
+"[codeblock]\n"
+"print(\"i/am/example/string\".get_slice_count(\"/\")) # Prints '4'.\n"
+"print(\"i am example string\".get_slice_count(\"/\")) # Prints '1'.\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает общее количество фрагментов, когда строка разделена с помощью "
+"заданного [param delimiter] (см. [method split]).\n"
+"Используйте [method get_slice] для извлечения конкретного фрагмента.\n"
+"[codeblock]\n"
+"print(\"i/am/example/string\".get_slice_count(\"/\")) # Выводит '4'.\n"
+"print(\"i am example string\".get_slice_count(\"/\")) # Выводит '1'.\n"
+"[/codeblock]"
+
+msgid ""
+"Splits the string using a Unicode character with code [param delimiter] and "
+"returns the substring at index [param slice]. Returns an empty string if the "
+"[param slice] does not exist.\n"
+"This is faster than [method split], if you only need one or two substrings.\n"
+"This is a Unicode version of [method get_slice]."
+msgstr ""
+"Разделяет строку с помощью символа Юникода с кодом [param delimiter] и "
+"возвращает подстроку по индексу [param slice]. Возвращает пустую строку, если "
+"[param slice] не существует.\n"
+"Это быстрее, чем [method split], если вам нужна только одна или две "
+"подстроки.\n"
+"Это версия метода [method get_slice] для Юникода."
+
 msgid ""
 "Returns the 32-bit hash value representing the string's contents.\n"
 "[b]Note:[/b] Strings with equal hash values are [i]not[/i] guaranteed to be "
@@ -179249,6 +183334,13 @@ msgstr ""
 "версия [method replace], когда ключ состоит только из одного символа, а "
 "замена — [code]\"\"[/code]."
 
+msgid ""
+"Removes all occurrences of the characters in [param chars]. See also [method "
+"remove_char]."
+msgstr ""
+"Удаляет все вхождения символов из [param chars]. См. также [method "
+"remove_char]."
+
 msgid ""
 "Repeats this string a number of times. [param count] needs to be greater than "
 "[code]0[/code]. Otherwise, returns an empty string."
@@ -179302,6 +183394,29 @@ msgstr ""
 "кодовыми точками Unicode, а не с последовательностями кодовых точек, и может "
 "сломать такие вещи, как составные буквы или эмодзи."
 
+msgid ""
+"Returns the index of the [b]last[/b] occurrence of [param what] in this "
+"string, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the beginning of the string. This "
+"method is the reverse of [method find].\n"
+"[b]Note:[/b] A negative value of [param from] is converted to a starting "
+"index by counting back from the last possible index with enough space to find "
+"[param what].\n"
+"[b]Note:[/b] A value of [param from] that is greater than the last possible "
+"index with enough space to find [param what] is considered out-of-bounds, and "
+"returns [code]-1[/code]."
+msgstr ""
+"Возвращает индекс [b]последнего[/b] вхождения [param what] в этой строке или "
+"[code]-1[/code], если таких вхождений нет. Начало поиска можно указать с "
+"помощью [param from], продолжая поиск до начала строки. Этот метод является "
+"обратным методу [method find].\n"
+"[b]Примечание:[/b] Отрицательное значение [param from] преобразуется в "
+"начальный индекс путем обратного отсчета от последнего возможного индекса с "
+"достаточным пространством для нахождения [param what].\n"
+"[b]Примечание:[/b] Значение [param from], превышающее последний возможный "
+"индекс с достаточным пространством для нахождения [param what], считается "
+"выходящим за пределы допустимого диапазона и возвращает [code]-1[/code]."
+
 msgid ""
 "Returns the index of the [b]last[/b] [b]case-insensitive[/b] occurrence of "
 "[param what] in this string, or [code]-1[/code] if there are none. The "
@@ -181648,6 +185763,25 @@ msgstr ""
 "поэтому пользователи C# должны использовать [code]uint32.MaxValue[/code] "
 "вместо [code]-1[/code] для создания сетки с плоскими нормалями."
 
+msgid ""
+"Specifies a tangent to use for the [i]next[/i] vertex. If every vertex needs "
+"to have this information set and you fail to submit it for the first vertex, "
+"this information may not be used at all.\n"
+"[b]Note:[/b] Even though [param tangent] is a [Plane], it does not directly "
+"represent the tangent plane. Its [member Plane.x], [member Plane.y], and "
+"[member Plane.z] represent the tangent vector and [member Plane.d] should be "
+"either [code]-1[/code] or [code]1[/code]. See also [constant "
+"Mesh.ARRAY_TANGENT]."
+msgstr ""
+"Указывает касательную для [i]следующей[/i] вершины. Если для каждой вершины "
+"требуется эта информация, и вы не предоставили её для первой вершины, эта "
+"информация может быть не использована вообще.\n"
+"[b]Примечание:[/b] Хотя [param tangent] является [Plane], он не представляет "
+"собой непосредственно касательную плоскость. Его [member Plane.x], [member "
+"Plane.y] и [member Plane.z] представляют собой касательный вектор, а [member "
+"Plane.d] должен быть либо [code]-1[/code], либо [code]1[/code]. См. также "
+"[constant Mesh.ARRAY_TANGENT]."
+
 msgid ""
 "Specifies a set of UV coordinates to use for the [i]next[/i] vertex. If every "
 "vertex needs to have this information set and you fail to submit it for the "
@@ -182103,6 +186237,16 @@ msgstr ""
 "умолчанию и поверх [theme_item icon_max_width]. Высота регулируется в "
 "соответствии с соотношением значка."
 
+msgid ""
+"Sets the language code of the title for the tab at index [param tab_idx] to "
+"[param language]. This is used for line-breaking and text shaping algorithms. "
+"If [param language] is empty, the current locale is used."
+msgstr ""
+"Устанавливает языковой код заголовка вкладки с индексом [param tab_idx] "
+"равным [param language]. Это используется для алгоритмов переноса строк и "
+"формирования текста. Если [param language] пустое значение, используется "
+"текущая локаль."
+
 msgid ""
 "Sets the metadata value for the tab at index [param tab_idx], which can be "
 "retrieved later using [method get_tab_metadata]."
@@ -182138,6 +186282,13 @@ msgstr ""
 "будут скрыты, отображая вместо этого две кнопки навигации. В противном случае "
 "минимальный размер этого узла обновляется так, чтобы все вкладки были видны."
 
+msgid ""
+"If [code]true[/code], middle-clicking on a tab will emit the [signal "
+"tab_close_pressed] signal."
+msgstr ""
+"Если [code]true[/code], то щелчок средней кнопкой мыши по вкладке вызовет "
+"сигнал [signal tab_close_pressed]."
+
 msgid ""
 "The index of the current selected tab. A value of [code]-1[/code] means that "
 "no tab is selected and can only be set when [member deselect_enabled] is "
@@ -182185,6 +186336,20 @@ msgid ""
 "If [code]true[/code], enables selecting a tab with the right mouse button."
 msgstr "Если [code]true[/code], позволяет выбрать вкладку правой кнопкой мыши."
 
+msgid ""
+"If [code]true[/code], hovering over a tab while dragging something will "
+"switch to that tab. Does not have effect when hovering another tab to "
+"rearrange. The delay for when this happens is dictated by [theme_item "
+"hover_switch_wait_msec]."
+msgstr ""
+"Если [code]true[/code], то при наведении курсора на вкладку во время "
+"перетаскивания элемента произойдет переключение на эту вкладку. При наведении "
+"курсора на другую вкладку для изменения ее порядка это не сработает. Задержка "
+"при этом определяется параметром [theme_item hover_switch_wait_msec]."
+
+msgid "The horizontal alignment of the tabs."
+msgstr "Горизонтальное выравнивание вкладок."
+
 msgid "When the close button will appear on the tabs."
 msgstr "Когда на вкладках появится кнопка закрытия."
 
@@ -182222,9 +186387,43 @@ msgstr "Возникает при переключении на другую в
 msgid "Emitted when a tab is clicked, even if it is the current tab."
 msgstr "Выдается при нажатии на вкладку, даже если это текущая вкладка."
 
+msgid ""
+"Emitted when a tab's close button is pressed or, if [member "
+"close_with_middle_mouse] is [code]true[/code], when middle-clicking on a "
+"tab.\n"
+"[b]Note:[/b] Tabs are not removed automatically; this behavior needs to be "
+"coded manually. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$TabBar.tab_close_pressed.connect($TabBar.remove_tab)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<TabBar>(\"TabBar\").TabClosePressed += "
+"GetNode<TabBar>(\"TabBar\").RemoveTab;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Генерируется при нажатии кнопки закрытия вкладки или, если параметр [member "
+"close_with_middle_mouse] имеет значение [code]true[/code], при щелчке средней "
+"кнопкой мыши по вкладке.\n"
+"[b]Примечание:[/b] Вкладки не закрываются автоматически; это поведение "
+"необходимо запрограммировать вручную. Например:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$TabBar.tab_close_pressed.connect($TabBar.remove_tab)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<TabBar>(\"TabBar\").TabClosePressed += "
+"GetNode<TabBar>(\"TabBar\").RemoveTab;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Emitted when a tab is hovered by the mouse."
 msgstr "Выдается при наведении указателя мыши на вкладку."
 
+msgid "Emitted when a tab is right-clicked."
+msgstr "Вызывается при щелчке правой кнопкой мыши по вкладке."
+
 msgid ""
 "Emitted when a tab is selected via click, directional input, or script, even "
 "if it is the current tab."
@@ -182232,6 +186431,15 @@ msgstr ""
 "Испускается при выборе вкладки с помощью щелчка, направленного ввода или "
 "скрипта, даже если это текущая вкладка."
 
+msgid "Aligns tabs to the left."
+msgstr "Выравнивает вкладки по левому краю."
+
+msgid "Aligns tabs in the middle."
+msgstr "Выравнивает вкладки посередине."
+
+msgid "Aligns tabs to the right."
+msgstr "Выравнивает вкладки по правому краю."
+
 msgid "Represents the size of the [enum AlignmentMode] enum."
 msgstr "Представляет размер перечисления [enum AlignmentMode]."
 
@@ -182268,9 +186476,31 @@ msgstr "Цвет шрифта текущей выбранной вкладки."
 msgid "Font color of the other, unselected tabs."
 msgstr "Цвет шрифта остальных, невыбранных вкладок."
 
+msgid "Icon color of disabled tabs."
+msgstr "Цвет значков отключенных вкладок."
+
+msgid ""
+"Icon color of the currently hovered tab. Does not apply to the selected tab."
+msgstr ""
+"Цвет значка текущей вкладки, на которую наведен курсор. Не применяется к "
+"выбранной вкладке."
+
+msgid "Icon color of the currently selected tab."
+msgstr "Цвет значка текущей выбранной вкладки."
+
+msgid "Icon color of the other, unselected tabs."
+msgstr "Цвет значков других, невыбранных вкладок."
+
 msgid "The horizontal separation between the elements inside tabs."
 msgstr "Горизонтальное разделение между элементами внутри вкладок."
 
+msgid ""
+"During a drag-and-drop, this is how many milliseconds to wait before "
+"switching the tab."
+msgstr ""
+"При перетаскивании элементов это количество миллисекунд, которое нужно "
+"подождать перед переключением вкладки."
+
 msgid ""
 "The maximum allowed width of the tab's icon. This limit is applied on top of "
 "the default size of the icon, but before the value set with [method "
@@ -182546,6 +186776,15 @@ msgstr ""
 "одной вкладки. Щелкните [member current_tab], чтобы отменить его выбор.\n"
 "Если не выбрано ни одной вкладки, будет отображаться только заголовок вкладки."
 
+msgid ""
+"If [code]true[/code], hovering over a tab while dragging something will "
+"switch to that tab. Does not have effect when hovering another tab to "
+"rearrange."
+msgstr ""
+"Если [code]true[/code], то при наведении курсора на вкладку во время "
+"перетаскивания элемента произойдет переключение на эту вкладку. При наведении "
+"курсора на другую вкладку для изменения ее порядка это не сработает."
+
 msgid "The position at which tabs will be placed."
 msgstr "Позиция, в которой будут размещены вкладки."
 
@@ -184384,6 +188623,13 @@ msgstr ""
 "управляемых методом обратного вызова, установленным с помощью метода [method "
 "set_gutter_custom_draw]."
 
+msgid ""
+"Assign a [StyleBoxFlat] to [theme_item normal] instead, and set [member "
+"StyleBoxFlat.bg_color] to the desired background color."
+msgstr ""
+"Вместо этого назначьте [StyleBoxFlat] элементу [theme_item normal] и "
+"установите для элемента [member StyleBoxFlat.bg_color] желаемый цвет фона."
+
 msgid "Sets the background [Color] of this [TextEdit]."
 msgstr "Устанавливает фоновый цвет [Color] этого [TextEdit]."
 
@@ -184445,6 +188691,9 @@ msgstr ""
 "code] или ниже, ширина каретки автоматически устанавливается на 1 пиксель и "
 "умножается на коэффициент масштабирования дисплея."
 
+msgid "Sets an additional margin for line wrapping width."
+msgstr "Задает дополнительный отступ для ширины переноса строки."
+
 msgid "Sets the default [Font]."
 msgstr "Устанавливает [Font] по умолчанию."
 
@@ -184519,6 +188768,9 @@ msgstr ""
 "шрифта, в противном случае используются настройки передискретизации области "
 "просмотра."
 
+msgid "Duplicates this [TextLine]."
+msgstr "Дублирует этот [TextLine]."
+
 msgid "Returns the text writing direction inferred by the BiDi algorithm."
 msgstr "Возвращает направление написания текста, выведенное алгоритмом BiDi."
 
@@ -184558,6 +188810,12 @@ msgstr "Возвращает RID буфера TextServer."
 msgid "Returns size of the bounding box of the text."
 msgstr "Возвращает размер ограничивающего прямоугольника текста."
 
+msgid ""
+"Returns [code]true[/code] if an object with [param key] is embedded in this "
+"line."
+msgstr ""
+"Возвращает [code]true[/code], если в эту строку встроен объект с [param key]."
+
 msgid ""
 "Returns caret character offset at the specified pixel offset at the baseline. "
 "This function always returns a valid position."
@@ -184632,6 +188890,21 @@ msgstr ""
 "вниз: 40% высоты для лицевой стороны, 40% для обратной стороны, 10% для "
 "внешних и 10% для внутренних сторон."
 
+msgid ""
+"Step (in pixels) used to approximate Bézier curves. Lower values result in "
+"smoother curves, but is slower to generate and render. Consider adjusting "
+"this according to the font size and the typical viewing distance.\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts."
+msgstr ""
+"Шаг (в пикселях) используется для аппроксимации кривых Безье. Меньшие "
+"значения приводят к более плавным кривым, но их генерация и отрисовка "
+"занимают больше времени. Рекомендуется корректировать этот параметр в "
+"зависимости от размера шрифта и типичного расстояния просмотра.\n"
+"[b]Примечание:[/b] Изменение этого свойства приведет к перегенерации сетки, "
+"что является медленной операцией, особенно при больших размерах шрифта и "
+"длинных текстах."
+
 msgid ""
 "Depths of the mesh, if set to [code]0.0[/code] only front surface, is "
 "generated, and UV layout is changed to use full texture for the front face "
@@ -184641,6 +188914,54 @@ msgstr ""
 "поверхности, генерируется глубина, а UV-разметка изменяется для использования "
 "полной текстуры только для передней поверхности."
 
+msgid ""
+"Font size of the [TextMesh]'s text. This property works in tandem with "
+"[member pixel_size]. Higher values will result in a more detailed font, "
+"regardless of [member curve_step] and [member pixel_size]. Consider keeping "
+"this value below 63 (inclusive) for good performance, and adjust [member "
+"pixel_size] as needed to enlarge text.\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts. To change the "
+"text's size in real-time efficiently, change the node's [member Node3D.scale] "
+"instead."
+msgstr ""
+"Размер шрифта текста в [TextMesh]. Это свойство работает в тандеме с [member "
+"pixel_size]. Более высокие значения приведут к более детализированному "
+"шрифту, независимо от [member curve_step] и [member pixel_size]. "
+"Рекомендуется поддерживать это значение ниже 63 (включительно) для хорошей "
+"производительности и регулировать [member pixel_size] по мере необходимости "
+"для увеличения размера текста.\n"
+"[b]Примечание:[/b] Изменение этого свойства приведет к перегенерации сетки, "
+"что является медленной операцией, особенно при больших размерах шрифта и "
+"длинных текстах. Для эффективного изменения размера текста в реальном времени "
+"вместо этого измените [member Node3D.scale] узла."
+
+msgid ""
+"The text drawing offset (in pixels).\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation. To change the text's position in real-time efficiently, change the "
+"node's [member Node3D.position] instead."
+msgstr ""
+"Смещение при отрисовке текста (в пикселях).\n"
+"[b]Примечание:[/b] Изменение этого свойства приведет к перегенерации сетки, "
+"что является медленной операцией. Для эффективного изменения положения текста "
+"в реальном времени вместо этого измените [member Node3D.position] узла."
+
+msgid ""
+"The size of one pixel's width on the text to scale it in 3D. This property "
+"works in tandem with [member font_size].\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts. To change the "
+"text's size in real-time efficiently, change the node's [member Node3D.scale] "
+"instead."
+msgstr ""
+"Размер текста, равный ширине одного пикселя, используется для его "
+"масштабирования в 3D. Это свойство работает совместно с [member font_size].\n"
+"[b]Примечание:[/b] Изменение этого свойства приведет к перегенерации сетки, "
+"что является медленной операцией, особенно при больших размерах шрифта и "
+"длинных текстах. Для эффективного изменения размера текста в реальном времени "
+"вместо этого измените [member Node3D.scale] узла."
+
 msgid ""
 "The text to generate mesh from.\n"
 "[b]Note:[/b] Due to being a [Resource], it doesn't follow the rules of "
@@ -184740,6 +189061,9 @@ msgstr ""
 "используется как фактор передискретизации шрифта, в противном случае "
 "используются настройки передискретизации области просмотра."
 
+msgid "Duplicates this [TextParagraph]."
+msgstr "Дублирует этот [TextParagraph]."
+
 msgid "Returns number of lines used by dropcap."
 msgstr "Возвращает количество строк, используемых в dropcap (буквицей)."
 
@@ -184802,6 +189126,13 @@ msgstr "Возвращает полный строковый буфер RID Text
 msgid "Returns the size of the bounding box of the paragraph."
 msgstr "Возвращает размер ограничивающей рамки абзаца."
 
+msgid ""
+"Returns [code]true[/code] if an object with [param key] is embedded in this "
+"shaped text buffer."
+msgstr ""
+"Возвращает [code]true[/code], если объект с [param key] встроен в этот "
+"текстовый буфер заданной формы."
+
 msgid ""
 "Returns caret character offset at the specified coordinates. This function "
 "always returns a valid position."
@@ -185016,6 +189347,9 @@ msgstr ""
 "Вместо этого используйте избыточную выборку [Viewport] или аргумент [code "
 "skip-lint]oversampling[/code] методов [code skip-lint]draw_*[/code]."
 
+msgid "This method does nothing and always returns [code]1.0[/code]."
+msgstr "Этот метод ничего не делает и всегда возвращает [code]1.0[/code]."
+
 msgid ""
 "Returns outline contours of the glyph as a [Dictionary] with the following "
 "contents:\n"
@@ -185197,6 +189531,13 @@ msgstr ""
 "предпочтительнее встроенного хинтинга шрифта. Используется только "
 "динамическими шрифтами."
 
+msgid ""
+"Returns [code]true[/code] if color modulation is applied when drawing the "
+"font's colored glyphs."
+msgstr ""
+"Возвращает [code]true[/code], если при отрисовке цветных глифов шрифта "
+"применяется цветовая модуляция."
+
 msgid ""
 "Returns [code]true[/code] if glyphs of all sizes are rendered using single "
 "multichannel signed distance field generated from the dynamic font vector "
@@ -185432,6 +189773,18 @@ msgstr "Возвращает словарь поддерживаемых фун
 msgid "Returns the dictionary of the supported OpenType variation coordinates."
 msgstr "Возвращает словарь поддерживаемых вариационных координат OpenType."
 
+msgid "Use [method TranslationServer.format_number] instead."
+msgstr "Вместо этого используйте [method TranslationServer.format_number]."
+
+msgid ""
+"Converts a number from Western Arabic (0..9) to the numeral system used in "
+"the given [param language].\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"Преобразует число из западного арабского языка (0..9) в систему счисления, "
+"используемую в указанном [param language].\n"
+"Если [param language] — пустая строка, будет использоваться активная локаль."
+
 msgid "Frees an object created by this [TextServer]."
 msgstr "Освобождает объект, созданный этим [TextServer]."
 
@@ -185497,6 +189850,13 @@ msgstr ""
 msgid "Returns [code]true[/code] if locale is right-to-left."
 msgstr "Возвращает [code]true[/code], если язык написания — справа налево."
 
+msgid ""
+"Returns [code]true[/code] if the locale requires text server support data for "
+"line/word breaking."
+msgstr ""
+"Возвращает [code]true[/code], если локаль требует поддержки данных текстового "
+"сервера для переноса строк/слов."
+
 msgid ""
 "Returns [code]true[/code] if [param string] is a valid identifier.\n"
 "If the text server supports the [constant FEATURE_UNICODE_IDENTIFIERS] "
@@ -185543,9 +189903,38 @@ msgstr ""
 "[b]Примечание:[/b] Эту функцию следует вызывать до использования любых других "
 "функций TextServer, в противном случае она не даст никакого эффекта."
 
+msgid ""
+"Converts the given readable name of a feature, variation, script, or language "
+"to an OpenType tag."
+msgstr ""
+"Преобразует заданное читаемое имя функции, варианта, шрифта или языка в тег "
+"OpenType."
+
+msgid "Use [method TranslationServer.parse_number] instead."
+msgstr "Вместо этого используйте [method TranslationServer.parse_number]."
+
+msgid ""
+"Converts [param number] from the numeral system used in the given [param "
+"language] to Western Arabic (0..9).\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"Преобразует [param number] из системы счисления, используемой в заданном "
+"[param language], в западный арабский язык (0..9).\n"
+"Если [param language] — пустая строка, будет использоваться активная локаль."
+
 msgid "Default implementation of the BiDi algorithm override function."
 msgstr "Реализация функции переопределения алгоритма BiDi по умолчанию."
 
+msgid "Use [method TranslationServer.get_percent_sign] instead."
+msgstr "Вместо этого используйте [method TranslationServer.get_percent_sign]."
+
+msgid ""
+"Returns the percent sign used in the given [param language].\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"Возвращает знак процента, используемый в заданном языке [param language].\n"
+"Если [param language] — пустая строка, будет использоваться активная локаль."
+
 msgid ""
 "Saves optional TextServer database (e.g. ICU break iterators and "
 "dictionaries) to the file.\n"
@@ -185680,6 +190069,9 @@ msgstr ""
 "смещения, обрезаются. Если [param clip_r] не является отрицательным, глифы, "
 "заканчивающиеся после смещения, обрезаются."
 
+msgid "Duplicates shaped text buffer."
+msgstr "Дублирует текстовый буфер заданной формы."
+
 msgid "Adjusts text width to fit to specified width, returns new text width."
 msgstr ""
 "Изменяет ширину текста до указанной ширины, возвращает новую ширину текста."
@@ -185991,6 +190383,46 @@ msgstr ""
 "Prints [0, 9, 10, 19]\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the string converted to [code]lowercase[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"Возвращает строку, преобразованную в [code]нижний регистр[/code].\n"
+"[b]Примечание:[/b] Регистр зависит от локали и контекста, если сервер "
+"поддерживает функцию [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] "
+"(поддерживается [TextServerAdvanced]).\n"
+"[b]Примечание:[/b] Результат может быть длиннее или короче исходного."
+
+msgid ""
+"Returns the string converted to [code]Title Case[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"Возвращает строку, преобразованную в регистр заголовка [code]Title Case[/"
+"code].\n"
+"[b]Примечание:[/b] Регистр зависит от локали и контекста, если сервер "
+"поддерживает функцию [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] "
+"(поддерживается [TextServerAdvanced]).\n"
+"[b]Примечание:[/b] Результат может быть длиннее или короче исходного."
+
+msgid ""
+"Returns the string converted to [code]UPPERCASE[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"Возвращает строку, преобразованную в [code]UPPERCASE[/code].\n"
+"[b]Примечание:[/b] Регистр зависит от локали и контекста, если сервер "
+"поддерживает функцию [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] "
+"(поддерживается [TextServerAdvanced]).\n"
+"[b]Примечание:[/b] Результат может быть длиннее или короче исходного."
+
 msgid ""
 "Strips diacritics from the string.\n"
 "[b]Note:[/b] The result may be longer or shorter than the original."
@@ -185998,6 +190430,13 @@ msgstr ""
 "Удаляет диакритические знаки из строки.\n"
 "[b]Примечание:[/b] Результат может быть длиннее или короче оригинала."
 
+msgid ""
+"Converts the given OpenType tag to the readable name of a feature, variation, "
+"script, or language."
+msgstr ""
+"Преобразует заданный тег OpenType в читаемое имя элемента, варианта, шрифта "
+"или языка."
+
 msgid "Font glyphs are rasterized as 1-bit bitmaps."
 msgstr "Глифы шрифта растрируются как 1-битные битовые изображения."
 
@@ -186304,6 +190743,14 @@ msgstr ""
 "Учитывает выравнивание текста перед попыткой его обрезки (см. [enum "
 "JustificationFlag])."
 
+msgid ""
+"Determines whether the ellipsis should be added regardless of the string "
+"length, otherwise it is added only if the string is 6 characters or longer."
+msgstr ""
+"Определяет, следует ли добавлять многоточие независимо от длины строки; в "
+"противном случае оно добавляется только в том случае, если строка состоит из "
+"6 символов или более."
+
 msgid "Grapheme is supported by the font, and can be drawn."
 msgstr "Графема поддерживается шрифтом и может быть нарисована."
 
@@ -187239,11 +191686,40 @@ msgid ""
 msgstr ""
 "Массив текстур для 2D, привязанный к текстуре, созданной на [RenderingDevice]."
 
+msgid ""
+"This texture array class allows you to use a 2D array texture created "
+"directly on the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture2DArrayRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture2DArray] instead."
+msgstr ""
+"Этот класс массива текстур позволяет использовать 2D-текстуру массива, "
+"созданную непосредственно на [RenderingDevice], в качестве текстуры для "
+"материалов, мешей и т. д.\n"
+"[b]Примечание:[/b] [Texture2DArrayRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[Texture2DArray] вместо него."
+
+msgid "Compute Texture demo"
+msgstr "Демонстрация вычисления текстур"
+
 msgid ""
 "Texture for 2D that is bound to a texture created on the [RenderingDevice]."
 msgstr ""
 "Текстура для 2D, привязанная к текстуре, созданной на [RenderingDevice]."
 
+msgid ""
+"This texture class allows you to use a 2D texture created directly on the "
+"[RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture2DRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture2D] instead."
+msgstr ""
+"Этот класс текстур позволяет использовать 2D-текстуру, созданную "
+"непосредственно на [RenderingDevice], в качестве текстуры для материалов, "
+"мешей и т. д.\n"
+"[b]Примечание:[/b] [Texture2DRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[Texture2D] вместо него."
+
 msgid "The RID of the texture object created on the [RenderingDevice]."
 msgstr "RID объекта текстуры, созданного на [RenderingDevice]."
 
@@ -187328,6 +191804,19 @@ msgid ""
 msgstr ""
 "Текстура для 3D, привязанная к текстуре, созданной на [RenderingDevice]."
 
+msgid ""
+"This texture class allows you to use a 3D texture created directly on the "
+"[RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture3DRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture3D] instead."
+msgstr ""
+"Этот класс текстур позволяет использовать 3D-текстуру, созданную "
+"непосредственно на [RenderingDevice], в качестве текстуры для материалов, "
+"мешей и т. д.\n"
+"[b]Примечание:[/b] [Texture3DRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[Texture3D] вместо него."
+
 msgid ""
 "Texture-based button. Supports Pressed, Hover, Disabled and Focused states."
 msgstr ""
@@ -187491,12 +191980,38 @@ msgstr ""
 "Массив текстур для кубических карт, привязанный к текстуре, созданной на "
 "[RenderingDevice]."
 
+msgid ""
+"This texture class allows you to use a cubemap array texture created directly "
+"on the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [TextureCubemapArrayRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [CubemapArray] instead."
+msgstr ""
+"Этот класс текстур позволяет использовать текстуру в виде массива кубических "
+"карт, созданную непосредственно на [RenderingDevice], в качестве текстуры для "
+"материалов, мешей и т. д.\n"
+"[b]Примечание:[/b] [TextureCubemapArrayRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[CubemapArray] вместо него."
+
 msgid ""
 "Texture for Cubemap that is bound to a texture created on the "
 "[RenderingDevice]."
 msgstr ""
 "Текстура для Cubemap, привязанная к текстуре, созданной на [RenderingDevice]."
 
+msgid ""
+"This texture class allows you to use a cubemap texture created directly on "
+"the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [TextureCubemapRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Cubemap] instead."
+msgstr ""
+"Этот класс текстур позволяет использовать текстуру кубической карты, "
+"созданную непосредственно на [RenderingDevice], в качестве текстуры для "
+"материалов, мешей и т. д.\n"
+"[b]Примечание:[/b] [TextureCubemapRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[Cubemap] вместо него."
+
 msgid ""
 "Base class for texture types which contain the data of multiple [Image]s. "
 "Each image is of the same size and format."
@@ -187591,6 +192106,20 @@ msgstr ""
 msgid "Abstract base class for layered texture RD types."
 msgstr "Абстрактный базовый класс для многослойных текстурных типов RD."
 
+msgid ""
+"Base class for [Texture2DArrayRD], [TextureCubemapRD] and "
+"[TextureCubemapArrayRD]. Cannot be used directly, but contains all the "
+"functions necessary for accessing the derived resource types.\n"
+"[b]Note:[/b] [TextureLayeredRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [TextureLayered] instead."
+msgstr ""
+"Базовый класс для [Texture2DArrayRD], [TextureCubemapRD] и "
+"[TextureCubemapArrayRD]. Не может использоваться напрямую, но содержит все "
+"функции, необходимые для доступа к производным типам ресурсов.\n"
+"[b]Примечание:[/b] [TextureLayeredRD] предназначен для низкоуровневого "
+"использования с [RenderingDevice]. В большинстве случаев используйте "
+"[TextureLayered] вместо него."
+
 msgid ""
 "Texture-based progress bar. Useful for loading screens and life or stamina "
 "bars."
@@ -190208,6 +194737,25 @@ msgstr ""
 "\t\treturn 0\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the coordinates of the physics quadrant (see [member "
+"physics_quadrant_size]) for given physics body [RID]. Such an [RID] can be "
+"retrieved from [method KinematicCollision2D.get_collider_rid], when colliding "
+"with a tile.\n"
+"[b]Note:[/b] Higher values of [member physics_quadrant_size] will make this "
+"function less precise. To get the exact cell coordinates, you need to set "
+"[member physics_quadrant_size] to [code]1[/code], which disables physics "
+"chunking."
+msgstr ""
+"Возвращает координаты физического квадранта (см. [member "
+"physics_quadrant_size]) для заданного физического тела [RID]. Такой [RID] "
+"можно получить из [method KinematicCollision2D.get_collider_rid] при "
+"столкновении с тайлом.\n"
+"[b]Примечание:[/b] Более высокие значения [member physics_quadrant_size] "
+"сделают эту функцию менее точной. Чтобы получить точные координаты ячейки, "
+"необходимо установить [member physics_quadrant_size] равным [code]1[/code], "
+"что отключает разбиение физического тела на блоки."
+
 msgid ""
 "Returns the [RID] of the [NavigationServer2D] navigation used by this "
 "[TileMapLayer].\n"
@@ -190511,6 +195059,35 @@ msgstr ""
 msgid "Enable or disable light occlusion."
 msgstr "Включить или отключить окклюзию света."
 
+msgid ""
+"The [TileMapLayer]'s physics quadrant size. Within a physics quadrant, cells "
+"with similar physics properties are grouped together and their collision "
+"shapes get merged. [member physics_quadrant_size] defines the length of a "
+"square's side, in the map's coordinate system, that forms the quadrant. Thus, "
+"the default quadrant size groups together [code]16 * 16 = 256[/code] tiles.\n"
+"[b]Note:[/b] As quadrants are created according to the map's coordinate "
+"system, the quadrant's \"square shape\" might not look like square in the "
+"[TileMapLayer]'s local coordinate system.\n"
+"[b]Note:[/b] This impacts the value returned by [method "
+"get_coords_for_body_rid]. Higher values will make that function less precise. "
+"To get the exact cell coordinates, you need to set [member "
+"physics_quadrant_size] to [code]1[/code], which disables physics chunking."
+msgstr ""
+"Размер физического квадранта [TileMapLayer]. Внутри физического квадранта "
+"ячейки со схожими физическими свойствами группируются вместе, и их формы "
+"столкновений объединяются. [member physics_quadrant_size] определяет длину "
+"стороны квадрата в системе координат карты, которая образует квадрант. Таким "
+"образом, размер квадранта по умолчанию группирует [code]16 * 16 = 256[/code] "
+"тайлов.\n"
+"[b]Примечание:[/b] Поскольку квадранты создаются в соответствии с системой "
+"координат карты, «квадратная форма» квадранта может не выглядеть как квадрат "
+"в локальной системе координат [TileMapLayer].\n"
+"[b]Примечание:[/b] Это влияет на значение, возвращаемое [method "
+"get_coords_for_body_rid]. Более высокие значения сделают эту функцию менее "
+"точной. Чтобы получить точные координаты ячейки, необходимо установить "
+"параметр [member physics_quadrant_size] равным [code]1[/code], что отключает "
+"разбиение физических ячеек на блоки."
+
 msgid ""
 "The [TileMapLayer]'s rendering quadrant size. A quadrant is a group of tiles "
 "to be drawn together on a single canvas item, for optimization purposes. "
@@ -195105,6 +199682,13 @@ msgstr "[Color] текста по умолчанию кнопки заголов
 msgid "The horizontal space between each button in a cell."
 msgstr "Горизонтальное расстояние между каждой кнопкой в ячейке."
 
+msgid ""
+"The horizontal space between the checkbox and the text in a [constant "
+"TreeItem.CELL_MODE_CHECK] mode cell."
+msgstr ""
+"Горизонтальное расстояние между флажком и текстом в ячейке режима [constant "
+"TreeItem.CELL_MODE_CHECK]."
+
 msgid ""
 "The width of the relationship lines between the selected [TreeItem] and its "
 "children."
@@ -195140,6 +199724,9 @@ msgstr ""
 "Горизонтальное пространство между ячейками элементов. Также используется как "
 "поле в начале элемента, когда сворачивание отключено."
 
+msgid "The horizontal space between the icon and the text in item's cells."
+msgstr "Горизонтальное расстояние между значком и текстом в ячейках элемента."
+
 msgid ""
 "The maximum allowed width of the icon in item's cells. This limit is applied "
 "on top of the default size of the icon, but before the value set with [method "
@@ -198565,6 +203152,17 @@ msgid "Uniform set cache manager for Rendering Device based renderers."
 msgstr ""
 "Единый набор менеджеров кэша для рендереров на базе устройств рендеринга."
 
+msgid ""
+"Uniform set cache manager for [RenderingDevice]-based renderers. Provides a "
+"way to create a uniform set and reuse it in subsequent calls for as long as "
+"the uniform set exists. Uniform set will automatically be cleaned up when "
+"dependent objects are freed."
+msgstr ""
+"Менеджер кэша наборов униформ для рендереров на основе [RenderingDevice]. "
+"Предоставляет способ создания набора униформ и его повторного использования в "
+"последующих вызовах до тех пор, пока этот набор существует. Набор униформ "
+"будет автоматически очищен при освобождении зависимых объектов."
+
 msgid ""
 "Creates/returns a cached uniform set based on the provided uniforms for a "
 "given shader."
@@ -203049,6 +207647,16 @@ msgid "If [code]true[/code], the viewport will process 3D audio streams."
 msgstr ""
 "Если [code]true[/code], область просмотра будет обрабатывать 3D-аудиопотоки."
 
+msgid ""
+"The rendering layers in which this [Viewport] renders [CanvasItem] nodes.\n"
+"[b]Note:[/b] A [CanvasItem] does not inherit its parents' visibility layers. "
+"See [member CanvasItem.visibility_layer]'s description for details."
+msgstr ""
+"Слои рендеринга, в которых этот [Viewport] отображает узлы [CanvasItem].\n"
+"[b]Примечание:[/b] [CanvasItem] не наследует слои видимости своих "
+"родительских элементов. Подробности см. в описании [member "
+"CanvasItem.visibility_layer]."
+
 msgid "The default filter mode used by [CanvasItem] nodes in this viewport."
 msgstr ""
 "Режим фильтрации по умолчанию, используемый узлами [CanvasItem] в этом окне "
@@ -204023,6 +208631,27 @@ msgstr ""
 "[b]Примечание:[/b] Поддерживается только при использовании метода "
 "визуализации Forward+."
 
+msgid ""
+"Draws the probes used for signed distance field global illumination (SDFGI).\n"
+"When in the editor, left-clicking a probe will display additional bright dots "
+"that show its occlusion information. A white dot means the light is not "
+"occluded at all at the dot's position, while a red dot means the light is "
+"fully occluded. Intermediate values are possible.\n"
+"Does nothing if the current environment's [member Environment.sdfgi_enabled] "
+"is [code]false[/code].\n"
+"[b]Note:[/b] Only supported when using the Forward+ rendering method."
+msgstr ""
+"Отображает зонды, используемые для глобального освещения с учетом знаковых "
+"расстояний (SDFGI).\n"
+"В редакторе щелчок левой кнопкой мыши по зонду отобразит дополнительные яркие "
+"точки, показывающие информацию о его перекрытии. Белая точка означает, что "
+"свет в точке вообще не перекрыт, а красная точка означает, что свет полностью "
+"перекрыт. Возможны промежуточные значения.\n"
+"Ничего не делает, если параметр [member Environment.sdfgi_enabled] текущей "
+"среды имеет значение [code]false[/code].\n"
+"[b]Примечание:[/b] Поддерживается только при использовании метода рендеринга "
+"Forward+."
+
 msgid ""
 "Draws the buffer used for global illumination from [VoxelGI] or SDFGI. "
 "Requires [VoxelGI] (at least one visible baked VoxelGI node) or SDFGI "
@@ -211104,6 +215733,45 @@ msgid "Specifies how the content is scaled when the [Window] is resized."
 msgstr ""
 "Указывает, как масштабируется содержимое при изменении размера [Window]."
 
+msgid ""
+"The content's base size in \"virtual\" pixels. Not to be confused with "
+"[member size], which sets the actual window's physical size in pixels. If set "
+"to a value greater than [code]0[/code] and [member content_scale_mode] is set "
+"to a value other than [constant CONTENT_SCALE_MODE_DISABLED], the [Window]'s "
+"content will be scaled when the window is resized to a different size. Higher "
+"values will make the content appear [i]smaller[/i], as it will be able to fit "
+"more of the project in view. On the root [Window], this is set to match "
+"[member ProjectSettings.display/window/size/viewport_width] and [member "
+"ProjectSettings.display/window/size/viewport_height] by default.\n"
+"For example, when using [constant CONTENT_SCALE_MODE_CANVAS_ITEMS] and "
+"[member content_scale_size] set to [code]Vector2i(1280, 720)[/code], using a "
+"window size of [code]2560×1440[/code] will make 2D elements appear at double "
+"their original size, as the content is scaled by a factor of [code]2.0[/code] "
+"([code]2560.0 / 1280.0 = 2.0[/code], [code]1440.0 / 720.0 = 2.0[/code]).\n"
+"See [url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html#base-"
+"size]the Base size section of the Multiple resolutions documentation[/url] "
+"for details."
+msgstr ""
+"Базовый размер содержимого в «виртуальных» пикселях. Не следует путать с "
+"параметром [member size], который задает фактический физический размер окна в "
+"пикселях. Если значение больше [code]0[/code], а параметр [member "
+"content_scale_mode] имеет значение, отличное от [constant "
+"CONTENT_SCALE_MODE_DISABLED], содержимое [Window] будет масштабироваться при "
+"изменении размера окна. Более высокие значения сделают содержимое [i]меньше[/"
+"i], так как оно сможет вместить большую часть проекта в поле зрения. Для "
+"корневого [Window] это значение по умолчанию соответствует параметрам "
+"[member  ProjectSettings.display/window/size/viewport_width] и [member "
+"ProjectSettings.display/window/size/viewport_height].\n"
+"Например, при использовании [constant CONTENT_SCALE_MODE_CANVAS_ITEMS] и "
+"[member content_scale_size], установленного на [code]Vector2i(1280, 720)[/"
+"code], использование размера окна [code]2560×1440[/code] приведет к тому, что "
+"2D-элементы будут отображаться вдвое больше исходного размера, поскольку "
+"содержимое масштабируется в 2,0 раза ([code]2560,0 / 1280,0 = 2,0[/code], "
+"[code]1440,0 / 720,0 = 2,0[/code]).\n"
+"Подробнее см. [url=$DOCS_URL/tutorials/rendering/"
+"multiple_resolutions.html#base-size]раздел «Базовый размер» документации по "
+"множественным разрешениям[/url]."
+
 msgid ""
 "The policy to use to determine the final scale factor for 2D elements. This "
 "affects how [member content_scale_factor] is applied, in addition to the "
@@ -211378,6 +216046,15 @@ msgstr ""
 "[b]Примечание:[/b] Это свойство реализовано только в Windows (11).\n"
 "[b]Примечание:[/b] Это свойство работает только с нативными окнами."
 
+msgid ""
+"The window's size in pixels. See also [member content_scale_size], which "
+"doesn't set the window's physical size but affects how scaling works relative "
+"to the current [member content_scale_mode]."
+msgstr ""
+"Размер окна в пикселях. См. также [member content_scale_size], который не "
+"задает физический размер окна, но влияет на то, как работает масштабирование "
+"относительно текущего [member content_scale_mode]."
+
 msgid ""
 "The name of a theme type variation used by this [Window] to look up its own "
 "theme items. See [member Control.theme_type_variation] for more details."
@@ -211785,6 +216462,13 @@ msgstr ""
 msgid "Max value of the [enum Flags]."
 msgstr "Максимальное значение [enum Flags]."
 
+msgid ""
+"The content will not be scaled to match the [Window]'s size ([member "
+"content_scale_size] is ignored)."
+msgstr ""
+"Содержимое не будет масштабироваться в соответствии с размером [Window] "
+"([member content_scale_size] игнорируется)."
+
 msgid ""
 "The content will be rendered at the target size. This is more performance-"
 "expensive than [constant CONTENT_SCALE_MODE_VIEWPORT], but provides better "
diff --git a/engine/doc/translations/ta.po b/engine/doc/translations/ta.po
index e93d2a7b..f654b814 100644
--- a/engine/doc/translations/ta.po
+++ b/engine/doc/translations/ta.po
@@ -86128,25 +86128,6 @@ msgid ""
 msgstr ""
 "நேர அடிப்படையிலான இடைக்கணிப்பின் மாற்றம் வகை. [Enum tween.transitionType] ஐயும் காண்க."
 
-msgid ""
-"If [code]true[/code], limits the amount of rotation. For example, this helps "
-"to prevent a character's neck from rotating 360 degrees.\n"
-"[b]Note:[/b] As with [AnimationTree] blending, interpolation is provided that "
-"favors [method Skeleton3D.get_bone_rest]. This means that interpolation does "
-"not select the shortest path in some cases.\n"
-"[b]Note:[/b] Some values for [member transition_type] (such as [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC], and [constant "
-"Tween.TRANS_SPRING]) may exceed the limitations. If interpolation occurs "
-"while overshooting the limitations, the result might not respect the bone "
-"rest."
-msgstr ""
-"[குறியீடு] உண்மை [/குறியீடு] என்றால், சுழற்சியின் அளவைக் கட்டுப்படுத்துகிறது. "
-"எடுத்துக்காட்டாக, இது ஒரு கதாபாத்திரத்தின் கழுத்து 360 டிகிரி சுழற்றுவதைத் தடுக்க "
-"உதவுகிறது. \n"
-". இதன் பொருள் இடைக்கணிப்பு சில சந்தர்ப்பங்களில் குறுகிய பாதையைத் தேர்ந்தெடுக்காது. \n"
-". வரம்புகளை மிகைப்படுத்தும்போது இடைக்கணிப்பு ஏற்பட்டால், இதன் விளைவாக எலும்பு ஓய்வை "
-"மதிக்காது."
-
 msgid "If [code]true[/code], provides rotation by two axes."
 msgstr "[குறியீடு] உண்மை [/குறியீடு] என்றால், இரண்டு அச்சுகளால் சுழற்சியை வழங்குகிறது."
 
@@ -155216,9 +155197,6 @@ msgstr ""
 "இந்த மதிப்பை அதிகரிப்பது இதன் விளைவாக உருவகப்படுத்துதலை மேம்படுத்தும், ஆனால் செயல்திறனை "
 "பாதிக்கும். கவனத்துடன் பயன்படுத்தவும்."
 
-msgid "The SoftBody3D's mass."
-msgstr "சாப்ட் பாடி 3 டி வெகுசன."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/doc/translations/uk.po b/engine/doc/translations/uk.po
index bedd04cb..17e8f951 100644
--- a/engine/doc/translations/uk.po
+++ b/engine/doc/translations/uk.po
@@ -37,7 +37,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-25 00:40+0000\n"
+"PO-Revision-Date: 2026-01-25 15:05+0000\n"
 "Last-Translator: Максим Горпиніч <gorpinicmaksim0@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/uk/>\n"
@@ -72230,6 +72230,9 @@ msgstr ""
 "створювати зигзагоподібні візерунки, що призводить до неприродного "
 "візуального руху."
 
+msgid "Inverse Kinematics Returns to Godot 4.6 - IKModifier3D"
+msgstr "Зворотна кінематика повертається до Godot 4.6 - IKModifier3D"
+
 msgid "Generates noise using the FastNoiseLite library."
 msgstr "Бібліотека FastNoiseLite."
 
@@ -97550,16 +97553,6 @@ msgstr ""
 "Вісь першого повороту. Цей [SkeletonModifier3D] працює, об’єднуючи обертання "
 "за кутами Ейлера, щоб запобігти обертанню [member forward_axis]."
 
-msgid ""
-"The relative option. If [code]true[/code], the rotation is applied relative "
-"to the pose. If [code]false[/code], the rotation is applied relative to the "
-"rest. It means to replace the current pose with the [LookAtModifier3D]'s "
-"result."
-msgstr ""
-"Відносний параметр. Якщо [code]true[/code], обертання застосовується відносно "
-"пози. Якщо [code]false[/code], обертання застосовується відносно решти. Це "
-"означає заміну поточної пози результатом [LookAtModifier3D]."
-
 msgid "The threshold to start damping for [member secondary_limit_angle]."
 msgstr ""
 "Порогове значення для початку демпфування для [member secondary_limit_angle]."
@@ -97621,29 +97614,6 @@ msgstr ""
 "Тип переходу інтерполяції на основі часу. Дивіться також [enum "
 "Tween.TransitionType]."
 
-msgid ""
-"If [code]true[/code], limits the amount of rotation. For example, this helps "
-"to prevent a character's neck from rotating 360 degrees.\n"
-"[b]Note:[/b] As with [AnimationTree] blending, interpolation is provided that "
-"favors [method Skeleton3D.get_bone_rest]. This means that interpolation does "
-"not select the shortest path in some cases.\n"
-"[b]Note:[/b] Some values for [member transition_type] (such as [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC], and [constant "
-"Tween.TRANS_SPRING]) may exceed the limitations. If interpolation occurs "
-"while overshooting the limitations, the result might not respect the bone "
-"rest."
-msgstr ""
-"Якщо [code]true[/code], обмежує величину обертання. Наприклад, це допомагає "
-"запобігти обертанню шиї персонажа на 360 градусів.\n"
-"[b]Примітка:[/b] Як і у випадку зі змішуванням [AnimationTree], передбачено "
-"інтерполяцію, яка надає перевагу [method Skeleton3D.get_bone_rest]. Це "
-"означає, що інтерполяція в деяких випадках не вибирає найкоротший шлях.\n"
-"[b]Примітка:[/b] Деякі значення для [member transition_type] (такі як "
-"[constant Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC] та [constant "
-"Tween.TRANS_SPRING]) можуть перевищувати обмеження. Якщо інтерполяція "
-"відбувається з перевищенням обмежень, результат може не враховувати залишок "
-"кістки."
-
 msgid "If [code]true[/code], provides rotation by two axes."
 msgstr "Якщо [code]true[/code], забезпечує обертання за двома осями."
 
@@ -177305,9 +177275,6 @@ msgstr ""
 "Збільшення цього значення покращить отримане моделювання, але може вплинути "
 "на продуктивність. Використовуйте з обережністю."
 
-msgid "The SoftBody3D's mass."
-msgstr "Маса SoftBody3D."
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/doc/translations/zh_Hans.po b/engine/doc/translations/zh_Hans.po
index de45fe7f..c79029e7 100644
--- a/engine/doc/translations/zh_Hans.po
+++ b/engine/doc/translations/zh_Hans.po
@@ -76,7 +76,7 @@
 # long li <2361520824@qq.com>, 2023.
 # yisui <hechugetqiufrost@outlook.com>, 2023.
 # penghao123456 <phao0724@163.com>, 2023.
-# Zae Chao <zaevi@live.com>, 2023, 2024.
+# Zae Chao <zaevi@live.com>, 2023, 2024, 2026.
 # SamBillon <sambillon1234+hosted.weblate@gmail.com>, 2023.
 # ZhuQiLi <552084128@qq.com>, 2023.
 # HIM049 <HIM_049@163.com>, 2023.
@@ -118,12 +118,15 @@
 # KarasumaChitos3 <460084657@qq.com>, 2025.
 # Zhen Luo <461652354@qq.com>, 2025, 2026.
 # Aaron <aaronhustudent@163.com>, 2026.
+# Zyx2333Zyx <Zyx_______123456@163.com>, 2026.
+# Rémi Verschelde <remi@godotengine.org>, 2026.
+# hey_yeah <gin9612@outlook.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-25 09:00+0000\n"
-"Last-Translator: Aaron <aaronhustudent@163.com>\n"
+"PO-Revision-Date: 2026-02-07 05:02+0000\n"
+"Last-Translator: 风青山 <idleman@yeah.net>\n"
 "Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot-class-reference/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -1945,6 +1948,88 @@ msgstr ""
 "@onready var character_name = $Label\n"
 "[/codeblock]"
 
+msgid ""
+"Mark the following method for remote procedure calls. See [url=$DOCS_URL/"
+"tutorials/networking/high_level_multiplayer.html]High-level multiplayer[/"
+"url].\n"
+"If [param mode] is set as [code]\"any_peer\"[/code], allows any peer to call "
+"this RPC function. Otherwise, only the authority peer is allowed to call it "
+"and [param mode] should be kept as [code]\"authority\"[/code]. When "
+"configuring functions as RPCs with [method Node.rpc_config], each of these "
+"modes respectively corresponds to the [constant "
+"MultiplayerAPI.RPC_MODE_AUTHORITY] and [constant "
+"MultiplayerAPI.RPC_MODE_ANY_PEER] RPC modes. See [enum "
+"MultiplayerAPI.RPCMode]. If a peer that is not the authority tries to call a "
+"function that is only allowed for the authority, the function will not be "
+"executed. If the error can be detected locally (when the RPC configuration is "
+"consistent between the local and the remote peer), an error message will be "
+"displayed on the sender peer. Otherwise, the remote peer will detect the "
+"error and print an error there.\n"
+"If [param sync] is set as [code]\"call_remote\"[/code], the function will "
+"only be executed on the remote peer, but not locally. To run this function "
+"locally too, set [param sync] to [code]\"call_local\"[/code]. When "
+"configuring functions as RPCs with [method Node.rpc_config], this is "
+"equivalent to setting [code]call_local[/code] to [code]true[/code].\n"
+"The [param transfer_mode] accepted values are [code]\"unreliable\"[/code], "
+"[code]\"unreliable_ordered\"[/code], or [code]\"reliable\"[/code]. It sets "
+"the transfer mode of the underlying [MultiplayerPeer]. See [member "
+"MultiplayerPeer.transfer_mode].\n"
+"The [param transfer_channel] defines the channel of the underlying "
+"[MultiplayerPeer]. See [member MultiplayerPeer.transfer_channel].\n"
+"The order of [param mode], [param sync] and [param transfer_mode] does not "
+"matter, but values related to the same argument must not be used more than "
+"once. [param transfer_channel] always has to be the 4th argument (you must "
+"specify 3 preceding arguments).\n"
+"[codeblock]\n"
+"@rpc\n"
+"func fn(): pass\n"
+"\n"
+"@rpc(\"any_peer\", \"unreliable_ordered\")\n"
+"func fn_update_pos(): pass\n"
+"\n"
+"@rpc(\"authority\", \"call_remote\", \"reliable\", 0) # Equivalent to @rpc\n"
+"func fn_default(): pass\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Methods annotated with [annotation @rpc] cannot receive objects "
+"which define required parameters in [method Object._init]. See [method "
+"Object._init] for more details."
+msgstr ""
+"将后续方法标记为远程过程调用。见[url=$DOCS_URL/tutorials/networking/"
+"high_level_multiplayer.html]《高阶多人游戏》[/url]。\n"
+"如果将 [param mode] 设为 [code]\"any_peer\"[/code]，则会允许所有对等体调用该 "
+"RPC 函数。若只允许该对等体的控制方调用，则应该将 [param mode] 保持为 [code]"
+"\"authority\"[/code]。使用 [method Node.rpc_config] 将函数配置为 RPC 时，这些"
+"模式分别对应的是 RPC 模式 [constant MultiplayerAPI.RPC_MODE_AUTHORITY] 和 "
+"[constant MultiplayerAPI.RPC_MODE_ANY_PEER] 。见 [enum "
+"MultiplayerAPI.RPCMode]。如果非控制方的对等体尝试调用仅限控制方调用的函数，则"
+"不会执行该函数。此时如果本地能够检测到错误（即本地与远程对等体的 RPC 配置一"
+"致），则发送方对等体会显示错误消息。否则远程对等体会检测到错误并在远程一侧输"
+"出。\n"
+"如果将 [param sync] 提示设为 [code]\"call_remote\"[/code]，则该函数只会在远程"
+"对等体上执行，不会在本地执行。要让这个函数同时也在本地执行，请将 [param sync] "
+"设置为 [code]\"call_local\"[/code]。这等价于在使用 [method Node.rpc_config] 将"
+"函数配置为 RPC 时，将 [code]call_local[/code] 设置为 [code]true[/code]。\n"
+"[param transfer_mode] 接受的值有 [code]\"unreliable\"[/code]、[code]"
+"\"unreliable_ordered\"[/code]、[code]\"reliable\"[/code]。该参数设置底层 "
+"[MultiplayerPeer] 的传输模式。见 [member MultiplayerPeer.transfer_mode]。\n"
+"[param transfer_channel] 定义了底层 [MultiplayerPeer] 的频道。见 [member "
+"MultiplayerPeer.transfer_channel]。\n"
+"[param mode]、[param sync] 和 [param transfer_mode] 的顺序是无关紧要的，但是同"
+"一参数的相关取值最多出现一次。[param transfer_channel] 必须为第四个参数（必须"
+"同时指定前三个参数）。\n"
+"[codeblock]\n"
+"@rpc\n"
+"func fn(): pass\n"
+"\n"
+"@rpc(\"any_peer\", \"unreliable_ordered\")\n"
+"func fn_update_pos(): pass\n"
+"\n"
+"@rpc(\"authority\", \"call_remote\", \"reliable\", 0) # 等价于 @rpc\n"
+"func fn_default(): pass\n"
+"[/codeblock]\n"
+"[b]注意：[/b]使用 [annotation @rpc] 注解的方法无法接收在 [method "
+"Object._init] 中定义了必要参数的对象。详情请参阅 [method Object._init]。"
+
 msgid ""
 "Make a script with static variables to not persist after all references are "
 "lost. If the script is loaded again the static variables will revert to their "
@@ -6015,6 +6100,37 @@ msgstr ""
 "\"suffix:unit\"[/code] 表示显示单位后缀（例如 [code]\"suffix:px/s\"[/code] 表"
 "示像素每秒）。"
 
+msgid ""
+"Hints that an [int], [String], or [StringName] property is an enumerated "
+"value to pick in a list specified via a hint string.\n"
+"The hint string is a comma separated list of names such as [code]"
+"\"Hello,Something,Else\"[/code]. Whitespace is [b]not[/b] removed from either "
+"end of a name. For integer properties, the first name in the list has value "
+"0, the next 1, and so on. Explicit values can also be specified by appending "
+"[code]:integer[/code] to the name, e.g. [code]"
+"\"Zero,One,Three:3,Four,Six:6\"[/code]."
+msgstr ""
+"提示 [int] 、 [String] 或 [StringName] 属性是枚举值，可通过提示字符串在指定的"
+"列表中选取。\n"
+"该提示字符串是逗号分隔的名称列表，例如 [code]\"Hello,Something,Else\"[/"
+"code]。 [b]不会[/b]从名称的任何一端删除空格。对于整数属性，列表中的第一个名称"
+"的值为 0，下一个名称的值为 1，依此类推。也可以通过将 [code]:integer[/code] 附"
+"加到名称来显式指定值，例如 [code]\"Zero,One,Three:3,Four,Six:6\"[/code]。"
+
+msgid ""
+"Hints that a [String] or [StringName] property can be an enumerated value to "
+"pick in a list specified via a hint string such as [code]"
+"\"Hello,Something,Else\"[/code]. See [constant PROPERTY_HINT_ENUM] for "
+"details.\n"
+"Unlike [constant PROPERTY_HINT_ENUM], a property with this hint still accepts "
+"arbitrary values and can be empty. The list of values serves to suggest "
+"possible values."
+msgstr ""
+"提示 [String] 或 [StringName] 属性为枚举值，可以通过提示字符串在指定的列表中选"
+"取，例如 [code]\"Hello,Something,Else\"[/code]。\n"
+"与 [constant PROPERTY_HINT_ENUM] 不同，具有该提示的属性仍然接受任意值并且可以"
+"为空。值列表用于建议可能的值。"
+
 msgid ""
 "Hints that a [float] property should be edited via an exponential easing "
 "function. The hint string can include [code]\"attenuation\"[/code] to flip "
@@ -6033,6 +6149,30 @@ msgstr ""
 "提示向量属性应该允许分量链接。例如，这能够让 [member Vector2.x] 和 [member "
 "Vector2.y] 被一起编辑。"
 
+msgid ""
+"Hints that an [int] property is a bitmask with named bit flags.\n"
+"The hint string is a comma separated list of names such as [code]"
+"\"Bit0,Bit1,Bit2,Bit3\"[/code]. Whitespace is [b]not[/b] removed from either "
+"end of a name. The first name in the list has value 1, the next 2, then 4, 8, "
+"16 and so on. Explicit values can also be specified by appending "
+"[code]:integer[/code] to the name, e.g. [code]\"A:4,B:8,C:16\"[/code]. You "
+"can also combine several flags ([code]\"A:4,B:8,AB:12,C:16\"[/code]).\n"
+"[b]Note:[/b] A flag value must be at least [code]1[/code] and at most [code]2 "
+"** 32 - 1[/code].\n"
+"[b]Note:[/b] Unlike [constant PROPERTY_HINT_ENUM], the previous explicit "
+"value is not taken into account. For the hint [code]\"A:16,B,C\"[/code], A is "
+"16, B is 2, C is 4."
+msgstr ""
+"提示 [int] 属性为位掩码，位标志拥有名称。\n"
+"提示字符串为逗号分隔的名称列表，例如 [code]\"Bit0,Bit1,Bit2,Bit3\"[/code]。名"
+"称两端的空白字符[b]不会[/b]被移除。列表中的第一个名称的值为 1、然后是 2、接下"
+"来就是 4、8、16 等值。也可以通过在名称后加上 [code]:整数[/code] 来显式指定数"
+"值，例如 [code]\"A:4,B:8,C:16\"[/code]。你还可以对多个标志进行组合（[code]"
+"\"A:4,B:8,AB:12,C:16\"[/code]）。\n"
+"[b]注意：[/b]标志值最少为 [code]1[/code]，最多为 [code]2 ** 32 - 1[/code]。\n"
+"[b]注意：[/b]与 [constant PROPERTY_HINT_ENUM] 不同，显式值不被纳入自动递增考"
+"虑。提示为 [code]\"A:16,B,C\"[/code]时，A 为 16、B 为 2、C 为 4。"
+
 msgid ""
 "Hints that an [int] property is a bitmask using the optionally named 2D "
 "render layers."
@@ -7909,6 +8049,19 @@ msgstr ""
 "设置第一个旋转的转轴。仅在 [method is_using_euler] 为 [code]true[/code] 时启"
 "用。"
 
+msgid ""
+"Sets relative option in the setting at [param index] to [param enabled].\n"
+"If sets [param enabled] to [code]true[/code], the rotation is applied "
+"relative to the pose.\n"
+"If sets [param enabled] to [code]false[/code], the rotation is applied "
+"relative to the rest. It means to replace the current pose with the "
+"[AimModifier3D]'s result."
+msgstr ""
+"将索引为 [param index] 的设置的相对选项设置为 [param enabled]。\n"
+"如果将 [param enabled] 设置为 [code]true[/code]，则旋转将相对于该姿势应用。\n"
+"如果将 [param enabled] 设置为 [code]false[/code]，则旋转将相对于静止状态应用。"
+"这意味着用 [AimModifier3D] 的结果替换当前姿势。"
+
 msgid ""
 "If sets [param enabled] to [code]true[/code], it provides rotation with using "
 "euler.\n"
@@ -10206,6 +10359,15 @@ msgstr ""
 "如果[code]false[/code]，则尊重原始动画长度。如果将循环设置为[member "
 "loop_mode]，动画将在[member timeline_length]中循环。"
 
+msgid ""
+"The length of the custom timeline.\n"
+"If [member stretch_time_scale] is [code]true[/code], scales the animation to "
+"this length."
+msgstr ""
+"自定义时间轴的长度。\n"
+"如果 [member use_custom_timeline] 为 [code]true[/code]，则会对动画的起始位置进"
+"行偏移。"
+
 msgid ""
 "If [code]true[/code], [AnimationNode] provides an animation based on the "
 "[Animation] resource with some parameters adjusted."
@@ -10726,6 +10888,12 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"If [code]true[/code], the sub-animation will abort if resumed with a reset "
+"after a prior interruption."
+msgstr ""
+"如果为 [code]true[/code]，则子动画在先前中断后使用重置恢复时，子动画将会中止。"
+
 msgid ""
 "If [code]true[/code], the sub-animation will restart automatically after "
 "finishing.\n"
@@ -11035,9 +11203,30 @@ msgstr ""
 msgid "Returns the playback position within the current animation state."
 msgstr "返回当前动画状态内的播放位置。"
 
+msgid ""
+"Returns the playback state length of the node from [method "
+"get_fading_from_node]. Returns [code]0[/code] if no animation fade is "
+"occurring."
+msgstr "返回当前焦点项目的索引。如果没有焦点，则返回 [code]0[/code]。"
+
 msgid "Returns the starting state of currently fading animation."
 msgstr "返回当前淡入淡出动画的开始状态。"
 
+msgid ""
+"Returns the playback position of the node from [method get_fading_from_node]. "
+"Returns [code]0[/code] if no animation fade is occurring."
+msgstr "返回当前焦点项目的索引。如果没有焦点，则返回 [code]0[/code]。"
+
+msgid ""
+"Returns the length of the current fade animation. Returns [code]0[/code] if "
+"no animation fade is occurring."
+msgstr "返回当前焦点项目的索引。如果没有焦点，则返回 [code]0[/code]。"
+
+msgid ""
+"Returns the playback position of the current fade animation. Returns [code]0[/"
+"code] if no animation fade is occurring."
+msgstr "返回当前焦点项目的索引。如果没有焦点，则返回 [code]0[/code]。"
+
 msgid ""
 "Returns the current travel path as computed internally by the A* algorithm."
 msgstr "返回 A* 算法内部计算的当前行进路径。"
@@ -13231,6 +13420,18 @@ msgstr ""
 "如果 [param deep] 为 [code]true[/code] 则会返回[b]深拷贝[/b]：嵌套的数组和字典"
 "也会进行（递归的）复制。不过 [Resource] 仍然是和原数组共享的。"
 
+msgid ""
+"Duplicates this array, deeply, like [method duplicate] when passing "
+"[code]true[/code], with extra control over how subresources are handled.\n"
+"[param deep_subresources_mode] must be one of the values from [enum "
+"Resource.DeepDuplicateMode]. By default, only internal resources will be "
+"duplicated (recursively)."
+msgstr ""
+"深度复制该数组，类似 [method duplicate] 传参 [code](true)[/code]，但能够额外控"
+"制子资源的处理方式。\n"
+"[param deep_subresources_mode] 必须是 [enum Resource.DeepDuplicateMode] 中的一"
+"个值。默认情况下，只会（递归）复制内部资源。"
+
 msgid ""
 "Finds and removes the first occurrence of [param value] from the array. If "
 "[param value] does not exist in the array, nothing happens. To remove an "
@@ -13390,6 +13591,19 @@ msgstr ""
 "[b]注意：[/b]与 [code][][/code] 运算符（[code]array[0][/code]）不同，错误产生"
 "时不会停止项目执行。"
 
+msgid ""
+"Returns the element at the given [param index] in the array. If [param index] "
+"is out-of-bounds or negative, this method fails and returns [code]null[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的元素。如果 [param index] 越界或为负数，则该方"
+"法失败并返回 [code]null[/code]。\n"
+"该方法类似（但不等同）于 [code][][/code] 运算符。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Returns the built-in [Variant] type of the typed array as a [enum "
 "Variant.Type] constant. If the array is not typed, returns [constant "
@@ -13467,6 +13681,17 @@ msgstr ""
 "影响。例如，对于该方法，[code]7[/code]（[int]）和 [code]7.0[/code]（[float]）"
 "不被视为相等。"
 
+msgid ""
+"Returns a hashed 32-bit integer value representing the array and its "
+"contents.\n"
+"[b]Note:[/b] Arrays with equal hash values are [i]not[/i] guaranteed to be "
+"the same, as a result of hash collisions. On the contrary, arrays with "
+"different hash values are guaranteed to be different."
+msgstr ""
+"返回代表该数组及其内容的散列 32 位整数值。\n"
+"[b]注意：[/b]由于哈希碰撞的缘故，哈希相同的数组[i]不[/i]保证相同。反之，哈希不"
+"同的数组保证不同。"
+
 msgid ""
 "Inserts a new element ([param value]) at a given index ([param position]) in "
 "the array. [param position] should be between [code]0[/code] and the array's "
@@ -14701,6 +14926,91 @@ msgstr ""
 "结果位于从 [code]y = 0[/code] 到 [code]y = 5[/code] 的线段中。它是线段中距给定"
 "点最近的位置。"
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar2D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1), 1) # Default weight is 1\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Returns [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1), 1); // Default weight is 1\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Returns [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you change the 2nd point's weight to 3, then the result will be [code][1, "
+"4, 3][/code] instead, because now even though the distance is longer, it's "
+"\"easier\" to get through point 4 than through point 2."
+msgstr ""
+"返回一个数组，其中包含构成由 AStar2D 在给定点之间找到的路径的点的 ID。数组从路"
+"径的起点到终点进行排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有能够到达目标的有效路径，并且 [param "
+"allow_partial_path] 为[code]true[/code]，则返回能够到达的最接近目标点的路"
+"径。\n"
+"[b]注意：[/b]如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param "
+"to_id] 处于禁用状态，搜索耗时可能异常地大。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1), 1) # 默认权重为 1\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # 返回 [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1), 1); // 默认权重为 1\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // 返回 [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"如果将第 2 个点的权重更改为 3，则结果将改为 [code][1, 4, 3][/code]，因为现在即"
+"使距离更长，通过第 4 点也比通过第 2 点“更容易”。"
+
 msgid ""
 "Returns the capacity of the structure backing the points, useful in "
 "conjunction with [method reserve_space]."
@@ -14771,6 +15081,33 @@ msgstr "返回点池中当前的点数。"
 msgid "Returns an array of all point IDs."
 msgstr "返回所有点 ID 的数组。"
 
+msgid ""
+"Returns an array with the points that are in the path found by AStar2D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] This method is not thread-safe; it can only be used from a "
+"single [Thread] at a given time. Consider using [Mutex] to ensure exclusive "
+"access to one thread to avoid race conditions.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"返回一个数组，其中包含 AStar2D 在给定点之间找到的路径中的点。数组从路径的起点"
+"到终点进行排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有通往目标的有效路径并且 [param "
+"allow_partial_path] 为 [code]true[/code]，则会返回通往距离目标最近的可达点的路"
+"径。\n"
+"[b]注意：[/b]该方法不是线程安全的，同一时间只能有一个 [Thread] 使用。请考虑使"
+"用 [Mutex] 来确保线程独占访问，避免竞态条件。\n"
+"另外，如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param to_id] "
+"处于禁用状态，搜索耗时可能异常地大。"
+
 msgid "Returns the position of the point associated with the given [param id]."
 msgstr "返回与给定 [param id] 相关联的点的位置。"
 
@@ -15120,6 +15457,89 @@ msgstr ""
 "结果是在从 [code]y = 0[/code] 到 [code]y = 5[/code] 的线段中。它是线段中距离给"
 "定点最近的位置。"
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar3D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0), 1) # Default weight is 1\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Returns [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0), 1); // Default weight is 1\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Returns [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you change the 2nd point's weight to 3, then the result will be [code][1, "
+"4, 3][/code] instead, because now even though the distance is longer, it's "
+"\"easier\" to get through point 4 than through point 2."
+msgstr ""
+"返回一个数组，其中包含构成 AStar3D 在给定点之间找到的路径中的点的 ID。数组从路"
+"径的起点到终点排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有能够到达目标的有效路径，并且 [param "
+"allow_partial_path] 为[code]true[/code]，则返回能够到达的最接近目标点的路"
+"径。\n"
+"[b]注意：[/b]如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param "
+"to_id] 处于禁用状态，搜索耗时可能异常地大。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0), 1) # 默认权重为 1\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # 返回 [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0), 1); // 默认权重为 1\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // 返回 [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"如果将第 2 个点的权重更改为 3，则结果将改为 [code][1, 4, 3][/code]，因为现在即"
+"使距离更长，但通过第 4 点也比通过第 2 点“更容易”。"
+
 msgid ""
 "Returns an array with the IDs of the points that form the connection with the "
 "given point.\n"
@@ -15176,6 +15596,33 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns an array with the points that are in the path found by AStar3D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] This method is not thread-safe; it can only be used from a "
+"single [Thread] at a given time. Consider using [Mutex] to ensure exclusive "
+"access to one thread to avoid race conditions.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"返回一个数组，其中包含 AStar3D 在给定点之间找到的路径中的点。数组从路径的起点"
+"到终点进行排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有通往目标的有效路径并且 [param "
+"allow_partial_path] 为 [code]true[/code]，则会返回通往距离目标最近的可达点的路"
+"径。\n"
+"[b]注意：[/b]该方法不是线程安全的，同一时间只能有一个 [Thread] 使用。请考虑使"
+"用 [Mutex] 来确保线程独占访问，避免竞态条件。\n"
+"另外，如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param to_id] "
+"处于禁用状态，搜索耗时可能异常地大。"
+
 msgid ""
 "An implementation of A* for finding the shortest path between two points on a "
 "partial 2D grid."
@@ -15281,6 +15728,28 @@ msgstr ""
 "使用指定的值填充网格上 [param region] 区域的权重缩放。\n"
 "[b]注意：[/b]调用该函数后不需要调用 [method update]。"
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar2D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"返回一个数组，其中包含 AStar2D 在给定点之间找到的路径中的点。数组从路径的起点"
+"到终点进行排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有通往目标的有效路径并且 [param "
+"allow_partial_path] 为 [code]true[/code]，则会返回通往距离目标最近的可达点的路"
+"径。\n"
+"[b]注意：[/b]如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param "
+"to_id] 处于禁用状态，搜索耗时可能异常地大。"
+
 msgid ""
 "Returns an array of dictionaries with point data ([code]id[/code]: "
 "[Vector2i], [code]position[/code]: [Vector2], [code]solid[/code]: [bool], "
@@ -15290,6 +15759,33 @@ msgstr ""
 "[code]position[/code]: [Vector2], [code]solid[/code]: [bool], "
 "[code]weight_scale[/code]: [float]）的字典数组。"
 
+msgid ""
+"Returns an array with the points that are in the path found by [AStarGrid2D] "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If [param from_id] point is disabled, returns an empty array (even if "
+"[code]from_id == to_id[/code]).\n"
+"If [param from_id] point is not disabled, there is no valid path to the "
+"target, and [param allow_partial_path] is [code]true[/code], returns a path "
+"to the point closest to the target that can be reached.\n"
+"[b]Note:[/b] This method is not thread-safe; it can only be used from a "
+"single [Thread] at a given time. Consider using [Mutex] to ensure exclusive "
+"access to one thread to avoid race conditions.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"返回一个数组，其中包含 [AStarGrid2D] 在给定点之间找到的路径上的点。数组从路径"
+"的起点到终点排序。\n"
+"如果 [param from_id] 点被禁用，则返回一个空数组（即使 [code]from_id == to_id[/"
+"code]）。\n"
+"如果 [param from_id] 点未被禁用，没有通往目标的有效路径并且 [param "
+"allow_partial_path] 为 [code]true[/code]，则会返回通往距离目标最近的可达点的路"
+"径。\n"
+"[b]注意：[/b]该方法不是线程安全的，同一时间只能有一个 [Thread] 使用。请考虑使"
+"用 [Mutex] 来确保线程独占访问，避免竞态条件。\n"
+"另外，如果 [param allow_partial_path] 为 [code]true[/code] 并且 [param to_id] "
+"处于禁用状态，搜索耗时可能异常地大。"
+
 msgid ""
 "Indicates that the grid parameters were changed and [method update] needs to "
 "be called."
@@ -16931,6 +17427,11 @@ msgstr ""
 "以每秒 [method get_input_mix_rate] 帧的速率被填充。\n"
 "样本值是在 [code]-1[/code] 到 [code]1[/code] 之间的有符号浮点 PCM 值。"
 
+msgid ""
+"Returns the number of frames available to read using [method "
+"get_input_frames]."
+msgstr "返回可使用 [method get_input_frames] 读取的帧数。"
+
 msgid "Returns the sample rate at the input of the [AudioServer]."
 msgstr "返回 [AudioServer] 输入的采样率。"
 
@@ -18820,6 +19321,40 @@ msgid ""
 "Controls how this AudioStreamRandomizer picks which AudioStream to play next."
 msgstr "控制该 AudioStreamRandomizer 如何选择下一个要播放的 AudioStream。"
 
+msgid ""
+"The largest possible frequency multiplier of the random pitch variation. "
+"Pitch will be randomly chosen within a range of [code skip-lint]1.0 / "
+"random_pitch[/code] and [code skip-lint]random_pitch[/code]. A value of "
+"[code]1.0[/code] means no variation. A value of [code]2.0[/code] means pitch "
+"will be randomized between double and half.\n"
+"[b]Note:[/b] Setting this property also sets [member random_pitch_semitones]."
+msgstr ""
+"随机音高变化的最大可能频率乘数。音高将在 [code skip-lint]1.0 / random_pitch[/"
+"code] 和 [code skip-lint]random_pitch[/code] 的范围内随机选择。值为 "
+"[code]1.0[/code] 表示没有变化。值为 [code]2.0[/code] 表示音高将在两倍和一半之"
+"间随机变化。\n"
+"[b]注意：[/b]设置该属性也会设置 [member random_pitch_semitones]。"
+
+msgid ""
+"The largest possible distance, in semitones, of the random pitch variation. A "
+"value of [code]0.0[/code] means no variation.\n"
+"[b]Note:[/b] Setting this property also sets [member random_pitch]."
+msgstr ""
+"随机音高变化的最大可能距离，单位为半音。值为 [code]0.0[/code] 表示没有变化。\n"
+"[b]注意：[/b]设置该属性也会设置 [member random_pitch]。"
+
+msgid ""
+"The intensity of random volume variation. Volume will be increased or "
+"decreased by a random value up to [code skip-lint]random_volume_offset_db[/"
+"code]. A value of [code]0.0[/code] means no variation. A value of [code]3.0[/"
+"code] means volume will be randomized between [code]-3.0 dB[/code] and [code]"
+"+3.0 dB[/code]."
+msgstr ""
+"随机音量变化的强度。音量将根据一个最大为 [code skip-"
+"lint]random_volume_offset_db[/code] 的值随机增加或减少。值为 [code]0.0[/code] "
+"表示没有变化。值为 [code]3.0[/code] 表示音量将在 [code]-3.0 dB[/code] 和 "
+"[code]+3.0 dB[/code] 之间随机变化。"
+
 msgid "The number of streams in the stream pool."
 msgstr "流池中流的数量。"
 
@@ -19315,6 +19850,39 @@ msgstr ""
 msgid "Standard Material 3D and ORM Material 3D"
 msgstr "标准 3D 材质与 ORM 3D 材质"
 
+msgid "Returns [code]true[/code] if the specified [param feature] is enabled."
+msgstr "如果指定的 [param feature] 已启用，则返回 [code]true[/code]。"
+
+msgid "Returns [code]true[/code] if the specified [param flag] is enabled."
+msgstr "如果指定的 [param flag] 已启用，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns the [Texture2D] associated with the specified texture [param param]."
+msgstr "返回与指定纹理参数 [param param] 关联的 [Texture2D]。"
+
+msgid ""
+"If [param enable] is [code]true[/code], enables the specified [param "
+"feature]. Many features that are available in [BaseMaterial3D] need to be "
+"enabled before use. This way, the cost for using the feature is only incurred "
+"when specified. Features can also be enabled by setting their corresponding "
+"property to [code]true[/code]."
+msgstr ""
+"如果 [param enable] 设置为 [code]true[/code]，则启用指定的 [param feature]。"
+"[BaseMaterial3D] 中的许多功能都需要在使用前启用。这样，仅在指定时才会产生使用"
+"该功能的成本。也可以通过将其对应的属性设置为 [code]true[/code] 来启用功能。"
+
+msgid ""
+"If [param enable] is [code]true[/code], enables the specified [param flag]. "
+"Flags are optional behavior that can be turned on and off. Only one flag can "
+"be enabled at a time with this function, the flag enumerators cannot be bit-"
+"masked together to enable or disable multiple flags at once. Flags can also "
+"be enabled by setting their corresponding property to [code]true[/code]."
+msgstr ""
+"如果 [param enable] 为 [code]true[/code]，则启用指定的 [param flag]。标志是可"
+"以打开和关闭的可选行为。使用该函数一次只能启用一个标志，不能将标志枚举值像位掩"
+"码一样进行合并，一次启用或禁用多个标志。也可以通过将相应属性设置为 "
+"[code]true[/code] 来启用标志。"
+
 msgid "Sets the texture for the slot specified by [param param]."
 msgstr "设置 [param param] 对应槽位的纹理。"
 
@@ -19341,6 +19909,25 @@ msgstr ""
 "要乘以 [member albedo_color] 的纹理。用于对象的基本纹理。\n"
 "如果纹理意外地显得太暗或太亮，请检查 [member albedo_texture_force_srgb]。"
 
+msgid ""
+"If [code]true[/code], forces a conversion of the [member albedo_texture] from "
+"nonlinear sRGB encoding to linear encoding. See also [member "
+"vertex_color_is_srgb].\n"
+"This should only be enabled when needed (typically when using a "
+"[ViewportTexture] as [member albedo_texture]). If [member "
+"albedo_texture_force_srgb] is [code]true[/code] when it shouldn't be, the "
+"texture will appear to be too dark. If [member albedo_texture_force_srgb] is "
+"[code]false[/code] when it shouldn't be, the texture will appear to be too "
+"bright."
+msgstr ""
+"如果为 [code]true[/code]，则强制将 [member albedo_texture] 从非线性 sRGB 编码"
+"转换为线性编码。另见 [member vertex_color_is_srgb]。\n"
+"该属性应该只在需要时启用（通常在使用 [ViewportTexture] 作为 [member "
+"albedo_texture] 时）。如果 [member albedo_texture_force_srgb] 在不应该的情况下"
+"为 [code]true[/code]，则纹理会显得太暗。如果 [member "
+"albedo_texture_force_srgb] 在不应该的情况下为 [code]false[/code]，则纹理会显得"
+"太亮。"
+
 msgid ""
 "Enables multichannel signed distance field rendering shader. Use [member "
 "msdf_pixel_range] and [member msdf_outline_size] to configure MSDF parameters."
@@ -19588,6 +20175,16 @@ msgstr "确定深度渲染发生的时间。另见 [member transparency]。"
 msgid "May be affected by future rendering pipeline changes."
 msgstr "可能受到后续渲染管线调整的影响。"
 
+msgid ""
+"Determines which comparison operator is used when testing depth.\n"
+"[b]Note:[/b] Changing [member depth_test] to a non-default value only has a "
+"visible effect when used on a transparent material, or a material that has "
+"[member depth_draw_mode] set to [constant DEPTH_DRAW_DISABLED]."
+msgstr ""
+"决定深度测试时使用的比较运算符。\n"
+"[b]注意：[/b]将 [member depth_test] 设为非默认值只有用于透明材质、[member "
+"depth_draw_mode] 为 [constant DEPTH_DRAW_DISABLED] 的材质时才有可见的效果。"
+
 msgid ""
 "Texture that specifies the color of the detail overlay. [member "
 "detail_albedo]'s alpha channel is used as a mask, even when the material is "
@@ -20201,6 +20798,15 @@ msgstr ""
 msgid "The primary color of the stencil effect."
 msgstr "模板效果的主颜色。"
 
+msgid "The comparison operator to use for stencil masking operations."
+msgstr "模板遮罩运算所使用的比较运算符。"
+
+msgid "The flags dictating how the stencil operation behaves."
+msgstr "控制模板运算行为的标志。"
+
+msgid "The stencil effect mode."
+msgstr "模板效果模式。"
+
 msgid "The outline thickness for [constant STENCIL_MODE_OUTLINE]."
 msgstr "[constant STENCIL_MODE_OUTLINE] 的轮廓粗细。"
 
@@ -20454,6 +21060,20 @@ msgstr ""
 "如果为 [code]true[/code]，则 [code]UV2[/code] 的三平面映射是在世界空间而不是对"
 "象局部空间中计算的。另见 [member uv2_triplanar]。"
 
+msgid ""
+"If [code]true[/code], vertex colors are considered to be stored in nonlinear "
+"sRGB encoding and are converted to linear encoding during rendering. If "
+"[code]false[/code], vertex colors are considered to be stored in linear "
+"encoding and are rendered as-is. See also [member "
+"albedo_texture_force_srgb].\n"
+"[b]Note:[/b] Only effective when using the Forward+ and Mobile rendering "
+"methods, not Compatibility."
+msgstr ""
+"如果为 [code]true[/code]，则顶点颜色被认为以非线性 sRGB 编码存储，并在渲染期间"
+"被转换为线性编码。如果为 [code]false[/code]，则顶点颜色被认为以线性编码存储，"
+"并按原样渲染。另见 [member albedo_texture_force_srgb]。\n"
+"[b]注意：[/b]仅在使用 Forward+ 和移动渲染方式时有效，不支持兼容模式。"
+
 msgid "If [code]true[/code], the vertex color is used as albedo color."
 msgstr "如果为 [code]true[/code]，则使用顶点颜色作为反射率颜色。"
 
@@ -20830,6 +21450,17 @@ msgstr ""
 msgid "Set [code]ALBEDO[/code] to the per-vertex color specified in the mesh."
 msgstr "将 [code]ALBEDO[/code] 设置为网格中指定的每顶点颜色。"
 
+msgid ""
+"Vertex colors are considered to be stored in nonlinear sRGB encoding and are "
+"converted to linear encoding during rendering. See also [member "
+"vertex_color_is_srgb].\n"
+"[b]Note:[/b] Only effective when using the Forward+ and Mobile rendering "
+"methods."
+msgstr ""
+"顶点颜色被认为以非线性 sRGB 编码存储，并在渲染期间转换为线性编码。另见 "
+"[member vertex_color_is_srgb]。\n"
+"[b]注意：[/b]仅在使用 Forward+ 和移动渲染方式时有效。"
+
 msgid ""
 "Uses point size to alter the size of primitive points. Also changes the "
 "albedo texture lookup to use [code]POINT_COORD[/code] instead of [code]UV[/"
@@ -20869,6 +21500,13 @@ msgid ""
 "emission_texture]."
 msgstr "使用 [code]UV2[/code] 坐标从 [member emission_texture] 中查找。"
 
+msgid ""
+"Forces the shader to convert albedo from nonlinear sRGB encoding to linear "
+"encoding. See also [member albedo_texture_force_srgb]."
+msgstr ""
+"强制着色器将反照率从非线性 sRGB 编码转换为线性编码。另见 [member "
+"albedo_texture_force_srgb]。"
+
 msgid "Disables receiving shadows from other objects."
 msgstr "禁用从其他对象接收阴影。"
 
@@ -21071,6 +21709,11 @@ msgstr ""
 msgid "Enables stencil operations without a preset."
 msgstr "启用模板运算，但不使用预设。"
 
+msgid ""
+"The material will only be rendered where it passes a stencil comparison with "
+"existing stencil buffer values."
+msgstr "材质仅当其通过与现有模板缓冲区值的模板比较时才会被渲染。"
+
 msgid ""
 "The material will write the reference value to the stencil buffer where it "
 "passes the depth test."
@@ -22330,6 +22973,13 @@ msgstr ""
 "返回索引为 [param index] 的设置的参考骨骼名称。\n"
 "修改器只会参考该骨骼，不会对其进行修改。"
 
+msgid ""
+"Returns the reference node path of the setting at [param index].\n"
+"This node will be only referenced and not modified by this modifier."
+msgstr ""
+"返回位于 [param index] 处的设置的参考节点路径。\n"
+"该节点仅会被该修改器参考而不会被修改。"
+
 msgid ""
 "Returns the reference target type of the setting at [param index]. See also "
 "[enum ReferenceType]."
@@ -22370,6 +23020,14 @@ msgstr ""
 "将索引为 [param index] 的设置的参考骨骼名称设置为 [param bone_name]。\n"
 "修改器只会参考该骨骼，不会对其进行修改。"
 
+msgid ""
+"Sets the reference node path of the setting at [param index] to [param "
+"node].\n"
+"This node will be only referenced and not modified by this modifier."
+msgstr ""
+"将索引为 [param index] 的设置的参考节点路径设置为 [param node]。\n"
+"该节点仅会被该修改器参考而不会被修改。"
+
 msgid ""
 "Sets the reference target type of the setting at [param index] to [param "
 "type]. See also [enum ReferenceType]."
@@ -22380,6 +23038,21 @@ msgstr ""
 msgid "Sets the number of settings in the modifier."
 msgstr "设置修改器中的设置数。"
 
+msgid ""
+"The reference target is a bone. In this case, the reference target spaces is "
+"local space."
+msgstr "参考目标是骨骼。在这种情况下，参考目标的空间是局部空间。"
+
+msgid ""
+"The reference target is a [Node3D]. In this case, the reference target spaces "
+"is model space.\n"
+"In other words, the reference target's coordinates are treated as if it were "
+"placed directly under [Skeleton3D] which parent of the [BoneConstraint3D]."
+msgstr ""
+"参考目标是一个 [Node3D]。在这种情况下，参考目标的空间是模型空间。\n"
+"换言之，参考目标的坐标被视为它直接位于该 [BoneConstraint3D] 的父节点 "
+"[Skeleton3D] 下方。"
+
 msgid ""
 "Describes a mapping of bone names for retargeting [Skeleton3D] into common "
 "names defined by a [SkeletonProfile]."
@@ -22446,12 +23119,52 @@ msgstr ""
 "配置中的值发生改变或配置的引用发生改变时发出此信号。用于更新 [BoneMap] 中的键"
 "名、重绘 [BoneMap] 编辑器。"
 
+msgid ""
+"A node that propagates and disperses the child bone's twist to the parent "
+"bones."
+msgstr "将子骨骼的扭转传播并分散到其父骨骼上的节点。"
+
+msgid ""
+"This [BoneTwistDisperser3D] allows for smooth twist interpolation between "
+"multiple bones by dispersing the end bone's twist to the parents. This only "
+"changes the twist without changing the global position of each joint.\n"
+"This is useful for smoothly twisting bones in combination with "
+"[CopyTransformModifier3D] and IK.\n"
+"[b]Note:[/b] If an extracted twist is greater than 180 degrees, flipping "
+"occurs. This is similar to [ConvertTransformModifier3D]."
+msgstr ""
+"此 [BoneTwistDisperser3D] 节点通过将末端骨骼的扭转分散到父骨骼，来实现多个骨骼"
+"间的平滑扭转插值。它只会改变扭转角度，而不会改变每个关节的全局位置。\n"
+"与 [CopyTransformModifier3D] 和反向动力学（IK）结合使用时，可用于实现骨骼的平"
+"滑扭转效果。\n"
+"[b]注意：[/b]如果提取的扭转角度超过 180 度，则会发生翻转。这一点与 "
+"[ConvertTransformModifier3D] 类似。"
+
 msgid "Clears all settings."
 msgstr "清空所有设置。"
 
+msgid ""
+"Returns the damping curve when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_CUSTOM]."
+msgstr ""
+"当 [method get_disperse_mode] 的值为 [constant DISPERSE_MODE_CUSTOM] 时，返回"
+"阻尼曲线。"
+
+msgid ""
+"Returns whether to use automatic amount assignment or to allow manual "
+"assignment."
+msgstr "返回是使用自动分配还是允许手动分配。"
+
 msgid "Returns the end bone index of the bone chain."
 msgstr "返回骨骼链末尾骨骼的索引。"
 
+msgid ""
+"Returns the tail direction of the end bone of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，返回骨骼链末端骨骼的"
+"尾部方向。"
+
 msgid "Returns the end bone name of the bone chain."
 msgstr "返回骨骼链末尾骨骼的名称。"
 
@@ -22464,12 +23177,73 @@ msgstr "返回骨骼链关节列表中位于 [param joint] 的骨骼的名称。
 msgid "Returns the joint count of the bone chain's joint list."
 msgstr "返回骨骼链关节列表中的关节数量。"
 
+msgid ""
+"Returns the twist amount at [param joint] in the bone chain's joint list when "
+"[method get_disperse_mode] is [constant DISPERSE_MODE_CUSTOM]."
+msgstr ""
+"当 [method get_disperse_mode] 为 [constant DISPERSE_MODE_CUSTOM] 时，返回骨骼"
+"链关节列表中 [param joint] 处的扭转量。"
+
+msgid ""
+"Returns the reference bone to extract twist of the setting at [param index].\n"
+"This bone is either the end of the chain or its parent, depending on [method "
+"is_end_bone_extended]."
+msgstr ""
+"返回参考骨骼，以提取 [param index] 处的设置项的扭曲。\n"
+"根据 [method is_end_bone_extended]，该骨骼要么是链的末端，要么是它的父级。"
+
+msgid ""
+"Returns the reference bone name to extract twist of the setting at [param "
+"index].\n"
+"This bone is either the end of the chain or its parent, depending on [method "
+"is_end_bone_extended]."
+msgstr ""
+"返回参考骨骼名称，以提取 [param index] 处的设置项的扭曲。\n"
+"根据 [method is_end_bone_extended]，该骨骼要么是链的末端，要么是它的父级。"
+
 msgid "Returns the root bone index of the bone chain."
 msgstr "返回骨骼链根骨骼的索引。"
 
 msgid "Returns the root bone name of the bone chain."
 msgstr "返回骨骼链根骨骼的名称。"
 
+msgid ""
+"Returns the rotation to an arbitrary state before twisting for the current "
+"bone pose to extract the twist when [method is_twist_from_rest] is "
+"[code]false[/code]."
+msgstr ""
+"当 [method is_twist_from_rest] 为 [code]false[/code] 时，返回当前骨骼姿势在扭"
+"转之前恢复到任意状态时的旋转，以便提取扭转角度。"
+
+msgid ""
+"Returns the position at which to divide the segment between joints for weight "
+"assignment when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_WEIGHTED]."
+msgstr ""
+"返回当 [method get_disperse_mode] 为 [constant DISPERSE_MODE_WEIGHTED] 时，在"
+"关节之间分割线段以进行权重分配的位置。"
+
+msgid "Returns [code]true[/code] if the end bone is extended to have a tail."
+msgstr "如果末端骨骼被扩展形成尾部，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if extracting the twist amount from the difference "
+"between the bone rest and the current bone pose."
+msgstr ""
+"如果能够从骨骼放松姿势和当前骨骼姿势之间的差异中提取扭转量，则返回 "
+"[code]true[/code]。"
+
+msgid ""
+"Sets the damping curve when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_CUSTOM]."
+msgstr ""
+"当 [method get_disperse_mode] 为 [constant DISPERSE_MODE_CUSTOM] 时，用于设置"
+"阻尼曲线。"
+
+msgid ""
+"Sets whether to use automatic amount assignment or to allow manual assignment."
+msgstr "设置是使用自动分配还是允许手动分配。"
+
 msgid "Sets the end bone index of the bone chain."
 msgstr "设置骨骼链中末端骨骼的索引。"
 
@@ -22480,6 +23254,13 @@ msgstr ""
 "当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置骨骼链中末端骨骼"
 "的尾部方向。"
 
+msgid ""
+"Sets the end bone name of the bone chain.\n"
+"[b]Note:[/b] The end bone must be a child of the root bone."
+msgstr ""
+"设置骨骼链的末端骨骼名称。\n"
+"[b]注意：[/b]末端骨骼必须是根骨骼的子骨骼。"
+
 msgid ""
 "If [param enabled] is [code]true[/code], the end bone is extended to have a "
 "tail.\n"
@@ -22491,12 +23272,72 @@ msgstr ""
 "如果 [param enabled] 为 [code]false[/code]，则 [method get_reference_bone] 会"
 "成为末端骨骼的父骨骼，并使用到末端骨骼的向量作为扭转轴。"
 
+msgid ""
+"Sets the twist amount at [param joint] in the bone chain's joint list when "
+"[method get_disperse_mode] is [constant DISPERSE_MODE_CUSTOM]."
+msgstr ""
+"当 [method get_disperse_mode] 为 [constant DISPERSE_MODE_CUSTOM] 时，设置骨骼"
+"链关节列表中 [param joint] 处的扭转量。"
+
 msgid "Sets the root bone index of the bone chain."
 msgstr "设置骨骼链中根骨骼的索引。"
 
 msgid "Sets the root bone name of the bone chain."
 msgstr "设置骨骼链中根骨骼的名称。"
 
+msgid ""
+"Sets the rotation to an arbitrary state before twisting for the current bone "
+"pose to extract the twist when [method is_twist_from_rest] is [code]false[/"
+"code].\n"
+"In other words, by calling [method set_twist_from] by [signal "
+"SkeletonModifier3D.modification_processed] of a specific "
+"[SkeletonModifier3D], you can extract only the twists generated by modifiers "
+"processed after that but before this [BoneTwistDisperser3D]."
+msgstr ""
+"在扭转当前骨骼姿势之前，将旋转设置为任意状态，以便在 [method "
+"is_twist_from_rest] 为 [code]false[/code] 时提取扭转。\n"
+"换言之，通过对特定 [SkeletonModifier3D] 的 [signal "
+"SkeletonModifier3D.modification_processed] 调用 [method set_twist_from]，可以"
+"仅提取在该 [BoneTwistDisperser3D] 之前处理的修改器生成的扭转。"
+
+msgid ""
+"If [param enabled] is [code]true[/code], it extracts the twist amount from "
+"the difference between the bone rest and the current bone pose.\n"
+"If [param enabled] is [code]false[/code], it extracts the twist amount from "
+"the difference between [method get_twist_from] and the current bone pose. See "
+"also [method set_twist_from]."
+msgstr ""
+"如果 [param enabled] 为 [code]true[/code]，则从骨骼放松姿势和当前骨骼姿势之间"
+"的差异中提取扭转量。\n"
+"如果 [param enabled] 为 [code]false[/code]，则从 [method get_twist_from] 和当"
+"前骨骼姿势之间的差异中提取扭转量。另见 [method set_twist_from]。"
+
+msgid ""
+"Sets the position at which to divide the segment between joints for weight "
+"assignment when [method get_disperse_mode] is [constant "
+"DISPERSE_MODE_WEIGHTED].\n"
+"For example, when [param weight_position] is [code]0.5[/code], if two bone "
+"segments with a length of [code]1.0[/code] exist between three joints, "
+"weights are assigned to each joint from root to end at ratios of [code]0.5[/"
+"code], [code]1.0[/code], and [code]0.5[/code]. Then amounts become "
+"[code]0.25[/code], [code]0.75[/code], and [code]1.0[/code] respectively."
+msgstr ""
+"当 [method get_disperse_mode] 的值为 [constant DISPERSE_MODE_WEIGHTED] 时，设"
+"置在关节之间分割线段以进行权重分配的位置。\n"
+"例如，当 [param weight_position] 为 [code]0.5[/code] 时，如果三个关节之间存在"
+"两段长度为 [code]1.0[/code] 的骨骼，则从根关节到末端关节，每个关节的权重分配比"
+"例分别为 [code]0.5[/code]、[code]1.0[/code] 和 [code]0.5[/code]。然后，最终的"
+"权重值将分别变为 [code]0.25[/code]、[code]0.75[/code] 和 [code]1.0[/code]。"
+
+msgid ""
+"If [code]true[/code], the solver retrieves the bone axis from the bone pose "
+"every frame.\n"
+"If [code]false[/code], the solver retrieves the bone axis from the bone rest "
+"and caches it."
+msgstr ""
+"如果为 [code]true[/code]，则求解器每帧从骨骼姿态中检索骨骼轴。\n"
+"如果为 [code]false[/code]，则求解器将从骨骼放松中检索骨骼轴并将其缓存。"
+
 msgid "The number of settings."
 msgstr "设置的数量。"
 
@@ -22510,6 +23351,25 @@ msgstr ""
 "相等。例如，如果有五个关节，从根骨骼开始的数值将依次为 [code]0.2[/code]、"
 "[code]0.4[/code]、[code]0.6[/code]、[code]0.8[/code] 和 [code]1.0[/code]。"
 
+msgid ""
+"Assign amounts so that they monotonically increase from [code]0.0[/code] to "
+"[code]1.0[/code], based on the length of the bones between joint segments. "
+"See also [method set_weight_position]."
+msgstr ""
+"根据关节节段之间骨骼的长度，分配数值，使其从 [code]0.0[/code] 单调递增到 "
+"[code]1.0[/code]。另见 [method set_weight_position]。"
+
+msgid ""
+"You can assign arbitrary amounts to the joint list. See also [method "
+"set_joint_twist_amount].\n"
+"When [method is_end_bone_extended] is [code]false[/code], a child of the "
+"reference bone exists solely to determine the twist axis, so its custom "
+"amount has absolutely no effect at all."
+msgstr ""
+"可以为关节列表分配任意值。另见 [method set_joint_twist_amount]。\n"
+"当 [method is_end_bone_extended] 为 [code]false[/code] 时，参考骨骼的子骨骼仅"
+"用于确定扭转轴，因此其自定义量完全没有效果。"
+
 msgid "A built-in boolean type."
 msgstr "内置布尔类型。"
 
@@ -22930,6 +23790,11 @@ msgstr ""
 "齐相同的 [enum HorizontalAlignment] 常量。如果水平居中并且垂直居中，则文本将被"
 "绘制在图标之上。"
 
+msgid ""
+"Language code used for line-breaking and text shaping algorithms. If left "
+"empty, the current locale is used instead."
+msgstr "用于断行和文本塑形算法的语言代码。如果留空，则使用当前区域设置。"
+
 msgid "The button's text that will be displayed inside the button's area."
 msgstr "该按钮的文本，将显示在按钮的区域内。"
 
@@ -23078,7 +23943,7 @@ msgstr ""
 "示在基础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 [StyleBox]，确保基础 "
 "[StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很好地实现这个目的。要"
 "禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会"
-"影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原因，不建议这样做。"
+"影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid "[StyleBox] used when the [Button] is being hovered."
 msgstr "该 [Button] 处于悬停状态时使用的 [StyleBox]。"
@@ -23677,6 +24542,14 @@ msgstr ""
 msgid "2D Isometric Demo"
 msgstr "2D 等轴演示"
 
+msgid ""
+"Aligns the camera to the tracked node.\n"
+"[b]Note:[/b] Calling [method force_update_scroll] after this method is not "
+"required."
+msgstr ""
+"将相机对准跟踪节点。\n"
+"[b]注意：[/b]在该方法之后，不需要调用 [method force_update_scroll]。"
+
 msgid "Forces the camera to update scroll immediately."
 msgstr "强制相机立即更新滚动。"
 
@@ -24830,6 +25703,9 @@ msgstr "设置该源的 RGB 图像。"
 msgid "Sets YCbCr image for this feed."
 msgstr "设置该源的 YCbCr 图像。"
 
+msgid "Sets Y and CbCr images for this feed."
+msgstr "设置该源的 Y 和 CbCr 图像。"
+
 msgid "If [code]true[/code], the feed is active."
 msgstr "如果为 [code]true[/code]，则源是激活的。"
 
@@ -25017,6 +25893,66 @@ msgstr ""
 msgid "Merges several 2D nodes into a single draw operation."
 msgstr "将若干 2D 节点合并至单次绘制操作。"
 
+msgid ""
+"Child [CanvasItem] nodes of a [CanvasGroup] are drawn as a single object. It "
+"allows to e.g. draw overlapping translucent 2D nodes without causing the "
+"overlapping sections to be more opaque than intended (set the [member "
+"CanvasItem.self_modulate] property on the [CanvasGroup] to achieve this "
+"effect).\n"
+"[b]Note:[/b] The [CanvasGroup] uses a custom shader to read from the "
+"backbuffer to draw its children. Assigning a [Material] to the [CanvasGroup] "
+"overrides the built-in shader. To duplicate the behavior of the built-in "
+"shader in a custom [Shader], use the following:\n"
+"[codeblock]\n"
+"shader_type canvas_item;\n"
+"render_mode unshaded;\n"
+"\n"
+"uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, "
+"filter_nearest;\n"
+"\n"
+"void fragment() {\n"
+"\tvec4 c = textureLod(screen_texture, SCREEN_UV, 0.0);\n"
+"\n"
+"\tif (c.a > 0.0001) {\n"
+"\t\tc.rgb /= c.a;\n"
+"\t}\n"
+"\n"
+"\tCOLOR *= c;\n"
+"}\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Since [CanvasGroup] and [member CanvasItem.clip_children] both "
+"utilize the backbuffer, children of a [CanvasGroup] who have their [member "
+"CanvasItem.clip_children] set to anything other than [constant "
+"CanvasItem.CLIP_CHILDREN_DISABLED] will not function correctly."
+msgstr ""
+"[CanvasGroup] 的子 [CanvasItem] 节点被绘制成单个对象。例如，它可以绘制重叠的半"
+"透明 2D 节点，而不会使重叠部分比预期更不透明（在 [CanvasGroup] 上设置 [member "
+"CanvasItem.self_modulate] 属性即可实现该效果）。\n"
+"[b]注意：[/b][CanvasGroup] 使用一个自定义着色器从后台缓冲区读取以绘制其子节"
+"点。为 [CanvasGroup] 指定一个 [Material] 会覆盖内置着色器。要在自定义 "
+"[Shader] 中复制内置着色器的行为，请使用以下方法：\n"
+"[codeblock]\n"
+"shader_type canvas_item;\n"
+"render_mode unshaded;\n"
+"\n"
+"uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, "
+"filter_nearest;\n"
+"\n"
+"void fragment() {\n"
+"\tvec4 c = textureLod(screen_texture, SCREEN_UV, 0.0);\n"
+"\n"
+"\tif (c.a > 0.0001) {\n"
+"\t\tc.rgb /= c.a;\n"
+"\t}\n"
+"\n"
+"\tCOLOR *= c;\n"
+"}\n"
+"[/codeblock]\n"
+"[b]注意：[/b]由于 [CanvasGroup] 和 [member CanvasItem.clip_children] 都使用后"
+"台缓冲区，因此 [CanvasGroup] 的子级如果将其 [member CanvasItem.clip_children] "
+"设置为 [constant CanvasItem.CLIP_CHILDREN_DISABLED] 以外的其他值将无法正常工"
+"作。"
+
 msgid ""
 "Sets the size of the margin used to expand the clearing rect of this "
 "[CanvasGroup]. This expands the area of the backbuffer that will be used by "
@@ -25130,6 +26066,37 @@ msgstr ""
 "后续的绘制命令将被忽略，除非它们位于指定的动画切片内。这是实现在背景上循环而不"
 "是不断重绘的动画的更快方法。"
 
+msgid ""
+"Draws an unfilled arc between the given angles with a uniform [param color] "
+"and [param width] and optional antialiasing (supported only for positive "
+"[param width]). The larger the value of [param point_count], the smoother the "
+"curve. [param center] is defined in local space. For elliptical arcs, see "
+"[method draw_ellipse_arc]. See also [method draw_circle].\n"
+"If [param width] is negative, it will be ignored and the arc will be drawn "
+"using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that when "
+"the CanvasItem is scaled, the arc will remain thin. If this behavior is not "
+"desired, then pass a positive [param width] like [code]1.0[/code].\n"
+"The arc is drawn from [param start_angle] towards the value of [param "
+"end_angle] so in clockwise direction if [code]start_angle < end_angle[/code] "
+"and counter-clockwise otherwise. Passing the same angles but in reversed "
+"order will produce the same arc. If absolute difference of [param "
+"start_angle] and [param end_angle] is greater than [constant @GDScript.TAU] "
+"radians, then a full circle arc is drawn (i.e. arc will not overlap itself)."
+msgstr ""
+"使用一个 uniform [param color] 和 [param width] 以及可选的抗锯齿（仅支持正 "
+"[param width] ），在给定的角度之间绘制一条未填充的弧线。[param point_count] 的"
+"值越大，该曲线越平滑。[param center] 定义在局部空间。绘制椭圆弧见 [method "
+"draw_ellipse_arc]。另见 [method draw_circle]。\n"
+"如果 [param width] 为负，则它将被忽略，并使用 [constant "
+"RenderingServer.PRIMITIVE_LINE_STRIP] 绘制该弧线。这意味着当缩放 CanvasItem "
+"时，弧线将保持细长。如果不需要此行为，请传递一个正的 [param width]，如 "
+"[code]1.0[/code]。\n"
+"如果 [code]start_angle < end_angle[/code] ，则弧线是从 [param start_angle] 朝"
+"向 [param end_angle] 的值绘制的，即是顺时针方向；否则为逆时针方向。以相反的顺"
+"序传递相同的角度，将产生相同的弧线。如果 [param start_angle] 和 [param "
+"end_angle] 的差的绝对值大于 [constant @GDScript.TAU] 弧度，则绘制一个完整的圆"
+"弧（即弧线不会与自身重叠）。"
+
 msgid ""
 "Draws a string first character using a custom font. If [param oversampling] "
 "is greater than zero, it is used as font oversampling factor, otherwise "
@@ -25148,6 +26115,60 @@ msgstr ""
 "使用自定义字体绘制字符串中第一个字符的轮廓。如果 [param oversampling] 大于零则"
 "会用作字体过采样系数，否则使用视口的过采样设置。[param pos] 定义在局部空间。"
 
+msgid ""
+"Draws a circle, with [param position] defined in local space. See also "
+"[method draw_ellipse], [method draw_arc], [method draw_polyline], and [method "
+"draw_polygon].\n"
+"If [param filled] is [code]true[/code], the circle will be filled with the "
+"[param color] specified. If [param filled] is [code]false[/code], the circle "
+"will be drawn as a stroke with the [param color] and [param width] "
+"specified.\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of a four-point ones. This means that when the CanvasItem is scaled, the "
+"lines will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"If [param antialiased] is [code]true[/code], half transparent \"feathers\" "
+"will be attached to the boundary, making outlines smooth.\n"
+"[b]Note:[/b] [param width] is only effective if [param filled] is "
+"[code]false[/code]."
+msgstr ""
+"绘制圆形，[param position] 定义在局部空间。另见 [method draw_ellipse]、"
+"[method draw_arc]、[method draw_polyline]、[method draw_polygon]。\n"
+"如果 [param filled] 为 [code]true[/code]，则圆形将使用指定的 [param color] 填"
+"充。如果 [param filled] 为 [code]false[/code]，则圆形将被绘制为具有指定的 "
+"[param color] 和 [param width] 的笔划。\n"
+"如果 [param width] 为负，则将绘制两点图元而不是四点图元。这意味着当缩放 "
+"CanvasItem 时，线条将保持细长。如果不需要此行为，请传递一个正的 [param "
+"width]，如 [code]1.0[/code]。\n"
+"如果 [param antialiased] 为 [code]true[/code]，则半透明的“羽毛”将附加到边界，"
+"使轮廓变得平滑。\n"
+"[b]注意：[/b][param width] 只有在 [param filled] 为 [code]false[/code] 时才有"
+"效。"
+
+msgid ""
+"Draws a colored polygon of any number of points, convex or concave. The "
+"points in the [param points] array are defined in local space. Unlike [method "
+"draw_polygon], a single color must be specified for the whole polygon.\n"
+"[b]Note:[/b] If you frequently redraw the same polygon with a large number of "
+"vertices, consider pre-calculating the triangulation with [method "
+"Geometry2D.triangulate_polygon] and using [method draw_mesh], [method "
+"draw_multimesh], or [method RenderingServer.canvas_item_add_triangle_array].\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"绘制一个由任意数量的点构成的实心多边形，凹凸均可。[param points] 数组中的点定"
+"义在局部空间。与 [method draw_polygon] 不同，必须为整个多边形制定单一颜色。\n"
+"[b]注意：[/b]如果你需要频繁重绘同样的多边形，包含大量顶点，请考虑预先使用 "
+"[method Geometry2D.triangulate_polygon] 进行三角剖分计算，并使用 [method "
+"draw_mesh]、[method draw_multimesh] 或 [method "
+"RenderingServer.canvas_item_add_triangle_array]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Draws a dashed line from a 2D point to another, with a given color and width. "
 "The [param from] and [param to] positions are defined in local space. See "
@@ -25188,6 +26209,68 @@ msgstr ""
 "[b]注意：[/b]仅当 [param width] 大于 [code]0.0[/code] 时，[param antialiased] "
 "才有效。"
 
+msgid ""
+"Draws an ellipse with semi-major axis [param major] and semi-minor axis "
+"[param minor]. See also [method draw_circle], [method draw_ellipse_arc], "
+"[method draw_polyline], and [method draw_polygon].\n"
+"If [param filled] is [code]true[/code], the ellipse will be filled with the "
+"[param color] specified. If [param filled] is [code]false[/code], the ellipse "
+"will be drawn as a stroke with the [param color] and [param width] "
+"specified.\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of four-point ones. This means that when the CanvasItem is scaled, the lines "
+"will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"If [param antialiased] is [code]true[/code], half transparent \"feathers\" "
+"will be attached to the boundary, making outlines smooth.\n"
+"[b]Note:[/b] [param width] is only effective if [param filled] is "
+"[code]false[/code]."
+msgstr ""
+"绘制一个长半轴长 [param major] 、短半轴长 [param minor] 的椭圆。另见 [method "
+"draw_circle]、[method draw_ellipse_arc]、[method draw_polyline] 和 [method "
+"draw_polygon]。\n"
+"如果 [param filled] 为 [code]true[/code]，则圆形将使用指定的 [param color] 填"
+"充。如果 [param filled] 为 [code]false[/code]，则圆形将被绘制为具有指定的 "
+"[param color] 和 [param width] 的笔划。\n"
+"如果 [param width] 为负，则将绘制两点图元而不是四点图元。这意味着当缩放 "
+"CanvasItem 时，线条将保持细长。如果不需要此行为，请传递一个正的 [param "
+"width]，如 [code]1.0[/code]。\n"
+"如果 [param antialiased] 为 [code]true[/code]，则半透明的“羽毛”将附加到边界，"
+"使轮廓变得平滑。\n"
+"[b]注意：[/b][param width] 只有在 [param filled] 为 [code]false[/code] 时才有"
+"效。"
+
+msgid ""
+"Draws an unfilled elliptical arc between the given angles with a uniform "
+"[param color] and [param width] and optional antialiasing (supported only for "
+"positive [param width]). The larger the value of [param point_count], the "
+"smoother the curve. For circular arcs, see [method draw_arc]. See also "
+"[method draw_ellipse].\n"
+"If [param width] is negative, it will be ignored and the arc will be drawn "
+"using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that when "
+"the CanvasItem is scaled, the arc will remain thin. If this behavior is not "
+"desired, then pass a positive [param width] like [code]1.0[/code].\n"
+"The arc is drawn from [param start_angle] towards the value of [param "
+"end_angle] so in clockwise direction if [code]start_angle < end_angle[/code] "
+"and counter-clockwise otherwise. Passing the same angles but in reversed "
+"order will produce the same arc. If absolute difference of [param "
+"start_angle] and [param end_angle] is greater than [constant @GDScript.TAU] "
+"radians, then a full ellipse is drawn (i.e. arc will not overlap itself)."
+msgstr ""
+"使用一个 uniform [param color] 和 [param width] 以及可选的抗锯齿（仅支持正 "
+"[param width] ），在给定的角度之间绘制一条未填充的椭圆弧线。[param "
+"point_count] 的值越大，该曲线越平滑。[param center] 定义在局部空间。绘制圆弧"
+"见 [method draw_arc]。另见 [method draw_circle]。\n"
+"如果 [param width] 为负，则它将被忽略，并使用 [constant "
+"RenderingServer.PRIMITIVE_LINE_STRIP] 绘制该弧线。这意味着当缩放 CanvasItem "
+"时，弧线将保持细长。如果不需要此行为，请传递一个正的 [param width]，如 "
+"[code]1.0[/code]。\n"
+"如果 [code]start_angle < end_angle[/code] ，则弧线是从 [param start_angle] 朝"
+"向 [param end_angle] 的值绘制的，即是顺时针方向；否则为逆时针方向。以相反的顺"
+"序传递相同的角度，将产生相同的弧线。如果 [param start_angle] 和 [param "
+"end_angle] 的差的绝对值大于 [constant @GDScript.TAU] 弧度，则绘制一个完整的椭"
+"圆（即弧线不会与自身重叠）。"
+
 msgid ""
 "After submitting all animations slices via [method draw_animation_slice], "
 "this function can be used to revert drawing to its default state (all "
@@ -25199,6 +26282,43 @@ msgstr ""
 "恢复到其默认状态（所有后续绘制命令都将可见）。如果不关心这个特定用例，则不需要"
 "在提交切片后使用该函数。"
 
+msgid ""
+"Draws a textured rectangle region of the font texture with LCD subpixel anti-"
+"aliasing at a given position, optionally modulated by a color. The [param "
+"rect] is defined in local space.\n"
+"Texture is drawn using the following blend operation, blend mode of the "
+"[CanvasItemMaterial] is ignored:\n"
+"[codeblock]\n"
+"dst.r = texture.r * modulate.r * modulate.a + dst.r * (1.0 - texture.r * "
+"modulate.a);\n"
+"dst.g = texture.g * modulate.g * modulate.a + dst.g * (1.0 - texture.g * "
+"modulate.a);\n"
+"dst.b = texture.b * modulate.b * modulate.a + dst.b * (1.0 - texture.b * "
+"modulate.a);\n"
+"dst.a = modulate.a + dst.a * (1.0 - modulate.a);\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"在给定的位置绘制一个带有 LCD 子像素抗锯齿的字体纹理的矩形区域，可以选择用一种"
+"颜色来调制。[param rect] 定义在局部空间。\n"
+"纹理是通过以下混合操作绘制的，[CanvasItemMaterial] 的混合模式被忽略：\n"
+"[codeblock]\n"
+"dst.r = texture.r * modulate.r * modulate.a + dst.r * (1.0 - texture.r * "
+"modulate.a);\n"
+"dst.g = texture.g * modulate.g * modulate.a + dst.g * (1.0 - texture.g * "
+"modulate.a);\n"
+"dst.b = texture.b * modulate.b * modulate.a + dst.b * (1.0 - texture.b * "
+"modulate.a);\n"
+"dst.a = modulate.a + dst.a * (1.0 - modulate.a);\n"
+"[/codeblock]\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Draws a line from a 2D point to another, with a given color and width. It can "
 "be optionally antialiased. The [param from] and [param to] positions are "
@@ -25216,6 +26336,47 @@ msgstr ""
 "放 CanvasItem 时，线条将保持细长。如果不需要此行为，请传递一个正的 [param "
 "width]，如 [code]1.0[/code]。"
 
+msgid ""
+"Draws a [Mesh] in 2D, using the provided texture. See [MeshInstance2D] for "
+"related documentation. The [param transform] is defined in local space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"使用提供的纹理在 2D 中绘制一个[Mesh]。相关文档见 [MeshInstance2D]。[param "
+"transform] 是在局部空间中定义的。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
+msgid ""
+"Draws a textured rectangle region of the multichannel signed distance field "
+"texture at a given position, optionally modulated by a color. The [param "
+"rect] is defined in local space. See [member "
+"FontFile.multichannel_signed_distance_field] for more information and caveats "
+"about MSDF font rendering.\n"
+"If [param outline] is positive, each alpha channel value of pixel in region "
+"is set to maximum value of true distance in the [param outline] radius.\n"
+"Value of the [param pixel_range] should the same that was used during "
+"distance field texture generation.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"在给定位置，绘制一条多通道有符号距离场纹理的纹理矩形区域，可以选择用一种颜色来"
+"调制。[param rect] 定义在局部空间。有关 MSDF 字体渲染的更多信息和注意事项，请"
+"参阅 [member FontFile.multichannel_signed_distance_field]。\n"
+"如果 [param outline] 为正，则区域中像素的每个 Alpha 通道值都被设置为 [param "
+"outline] 半径内真实距离的最大值。\n"
+"[param pixel_range] 的值应该与距离场纹理生成期间使用的值相同。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Draws multiple disconnected lines with a uniform [param width] and [param "
 "color]. Each line is defined by two consecutive points from [param points] "
@@ -25294,6 +26455,51 @@ msgstr ""
 "width] 大于等于 0，则文本超出该宽度的部分会被裁剪。如果 [param oversampling] "
 "大于零则会用作字体过采样系数，否则使用视口的过采样设置。"
 
+msgid ""
+"Draws a [MultiMesh] in 2D with the provided texture. See "
+"[MultiMeshInstance2D] for related documentation.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"使用提供的纹理在 2D 中绘制一个[MultiMesh]。相关文档见 "
+"[MultiMeshInstance2D]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
+msgid ""
+"Draws a solid polygon of any number of points, convex or concave. Unlike "
+"[method draw_colored_polygon], each point's color can be changed "
+"individually. The [param points] array is defined in local space. See also "
+"[method draw_polyline] and [method draw_polyline_colors]. If you need more "
+"flexibility (such as being able to use bones), use [method "
+"RenderingServer.canvas_item_add_triangle_array] instead.\n"
+"[b]Note:[/b] If you frequently redraw the same polygon with a large number of "
+"vertices, consider pre-calculating the triangulation with [method "
+"Geometry2D.triangulate_polygon] and using [method draw_mesh], [method "
+"draw_multimesh], or [method RenderingServer.canvas_item_add_triangle_array].\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"绘制一个由任意数量的点构成的实心多边形，凹凸均可。与 [method "
+"draw_colored_polygon] 不同，每个点的颜色都可以单独修改。[param points] 数组定"
+"义在局部空间。另见 [method draw_polyline] 和 [method draw_polyline_colors]。如"
+"果需要更高的灵活度（例如能够用到骨骼），请改用 [method "
+"RenderingServer.canvas_item_add_triangle_array]。\n"
+"[b]注意：[/b]如果你需要频繁重绘同样的多边形，包含大量顶点，请考虑预先使用 "
+"[method Geometry2D.triangulate_polygon] 进行三角剖分计算，并使用 [method "
+"draw_mesh]、[method draw_multimesh] 或 [method "
+"RenderingServer.canvas_item_add_triangle_array]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Draws interconnected line segments with a uniform [param color] and [param "
 "width] and optional antialiasing (supported only for positive [param width]). "
@@ -25342,6 +26548,27 @@ msgstr ""
 "时，折线将保持为细线。如果不需要该行为，请传入一个正的 [param width]，如 "
 "[code]1.0[/code]。"
 
+msgid ""
+"Draws a custom primitive. 1 point for a point, 2 points for a line, 3 points "
+"for a triangle, and 4 points for a quad. If 0 points or more than 4 points "
+"are specified, nothing will be drawn and an error message will be printed. "
+"The [param points] array is defined in local space. See also [method "
+"draw_line], [method draw_polyline], [method draw_polygon], and [method "
+"draw_rect].\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"绘制自定义图元。1 个点的是个点，2 个点的是线段，3 个点的是三角形，4 个点的是四"
+"边形。如果没有指定点或者指定了超过 4 个点，则不会绘制任何东西，只会输出错误消"
+"息。[param points] 数组定义在局部空间。另见 [method draw_line]、[method "
+"draw_polyline]、[method draw_polygon]、[method draw_rect]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Draws a rectangle. If [param filled] is [code]true[/code], the rectangle will "
 "be filled with the [param color] specified. If [param filled] is [code]false[/"
@@ -25402,6 +26629,43 @@ msgid ""
 "afterwards will be transformed by this."
 msgstr "设置通过矩阵绘制时的自定义局部变换。此后绘制的任何东西都将被它变换。"
 
+msgid ""
+"Draws [param text] using the specified [param font] at the [param pos] in "
+"local space (bottom-left corner using the baseline of the font). The text "
+"will have its color multiplied by [param modulate]. If [param width] is "
+"greater than or equal to 0, the text will be clipped if it exceeds the "
+"specified width. If [param oversampling] is greater than zero, it is used as "
+"font oversampling factor, otherwise viewport oversampling settings are used.\n"
+"[b]Example:[/b] Draw \"Hello world\", using the project's default font:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"draw_string(ThemeDB.fallback_font, Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, ThemeDB.fallback_font_size)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"DrawString(ThemeDB.FallbackFont, new Vector2(64, 64), \"Hello world\", "
+"HorizontalAlignment.Left, -1, ThemeDB.FallbackFontSize);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method Font.draw_string]."
+msgstr ""
+"使用 [param font] 字体绘制 [param text] 文本，以局部空间中的 [param pos] 作为"
+"左下角，对齐字体基线。文本颜色会与 [param modulate] 相乘。如果 [param width] "
+"大于等于 0，则文本超出该宽度的部分会被裁剪。如果 [param oversampling] 大于零则"
+"会用作字体过采样系数，否则使用视口的过采样设置。\n"
+"[b]示例：[/b]使用项目默认字体绘制“Hello world”：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"draw_string(ThemeDB.fallback_font, Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, ThemeDB.fallback_font_size)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"DrawString(ThemeDB.FallbackFont, new Vector2(64, 64), \"Hello world\", "
+"HorizontalAlignment.Left, -1, ThemeDB.FallbackFontSize);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"另见 [method Font.draw_string]。"
+
 msgid ""
 "Draws [param text] outline using the specified [param font] at the [param "
 "pos] in local space (bottom-left corner using the baseline of the font). The "
@@ -25415,6 +26679,69 @@ msgstr ""
 "[param width] 大于等于 0，则文本超出该宽度的部分会被裁剪。如果 [param "
 "oversampling] 大于零则会用作字体过采样系数，否则使用视口的过采样设置。"
 
+msgid ""
+"Draws a styled rectangle. The [param rect] is defined in local space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"绘制一个样式化的矩形。[param rect] 在局部空间中定义。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
+msgid ""
+"Draws a texture at a given position. The [param position] is defined in local "
+"space.\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"在给定位置绘制纹理。[param position] 是在局部空间中定义的。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
+msgid ""
+"Draws a textured rectangle at a given position, optionally modulated by a "
+"color. The [param rect] is defined in local space. If [param transpose] is "
+"[code]true[/code], the texture will have its X and Y coordinates swapped. See "
+"also [method draw_rect] and [method draw_texture_rect_region].\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"在给定位置绘制一个带纹理的矩形，可以选择用颜色调制。[param rect] 定义在局部空"
+"间。如果 [param transpose] 为 [code]true[/code]，则纹理将交换其 X 和 Y 坐标。"
+"另见 [method draw_rect] 和 [method draw_texture_rect_region]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
+msgid ""
+"Draws a textured rectangle from a texture's region (specified by [param "
+"src_rect]) at a given position in local space, optionally modulated by a "
+"color. If [param transpose] is [code]true[/code], the texture will have its X "
+"and Y coordinates swapped. See also [method draw_texture_rect].\n"
+"[b]Note:[/b] Styleboxes, textures, and meshes stored only inside local "
+"variables should [b]not[/b] be used with this method in GDScript, because the "
+"drawing operation doesn't begin immediately once this method is called. In "
+"GDScript, when the function with the local variables ends, the local "
+"variables get destroyed before the rendering takes place."
+msgstr ""
+"在给定的局部空间位置绘制具有纹理的矩形，可以指定所使用的纹理区域（由 [param "
+"src_rect] 指定），可选择用颜色调制。如果 [param transpose] 为 [code]true[/"
+"code]，则纹理将交换其 X 和 Y 坐标。另见 [method draw_texture_rect]。\n"
+"[b]注意：[/b]在 GDScript 中，[b]不[/b]应将仅存储在局部变量中的样式框、纹理和网"
+"格与该方法一起使用，因为调用该方法后绘制操作不会立即开始。在 GDScript 中，当使"
+"用局部变量的函数结束时，局部变量会在渲染发生之前被销毁。"
+
 msgid ""
 "Forces the node's transform to update. Fails if the node is not inside the "
 "tree. See also [method get_transform].\n"
@@ -25649,6 +26976,17 @@ msgstr ""
 "[b]注意：[/b][Bone2D]、[CollisionShape2D] 等许多画布项都会自动启用，从而正常工"
 "作。"
 
+msgid ""
+"If [code]true[/code], the node will receive [constant "
+"NOTIFICATION_TRANSFORM_CHANGED] whenever its global transform changes.\n"
+"[b]Note:[/b] Many canvas items such as [Camera2D] or [Light2D] automatically "
+"enable this in order to function correctly."
+msgstr ""
+"如果为 [code]true[/code]，则该节点将在其全局变换发生改变时收到 [constant "
+"NOTIFICATION_TRANSFORM_CHANGED]。\n"
+"[b]注意：[/b][Camera2D]、[Light2D] 等许多画布项都会自动启用该功能，以便正常运"
+"行。"
+
 msgid ""
 "Set/clear individual bits on the rendering visibility layer. This simplifies "
 "editing this [CanvasItem]'s visibility layer."
@@ -25748,6 +27086,30 @@ msgstr ""
 "如果为 [code]true[/code]，则将父级 [CanvasItem] 的 [member material] 属性用作"
 "该节点的材质。"
 
+msgid ""
+"The rendering layer in which this [CanvasItem] is rendered by [Viewport] "
+"nodes. A [Viewport] will render a [CanvasItem] if it and all its parents "
+"share a layer with the [Viewport]'s canvas cull mask.\n"
+"[b]Note:[/b] A [CanvasItem] does not inherit its parents' visibility layers. "
+"This means that if a parent [CanvasItem] does not have all the same layers as "
+"its child, the child may not be visible even if both the parent and child "
+"have [member visible] set to [code]true[/code]. For example, if a parent has "
+"layer 1 and a child has layer 2, the child will not be visible in a "
+"[Viewport] with the canvas cull mask set to layer 1 or 2 (see [member "
+"Viewport.canvas_cull_mask]). To ensure that both the parent and child are "
+"visible, the parent must have both layers 1 and 2, or the child must have "
+"[member top_level] set to [code]true[/code]."
+msgstr ""
+"该 [CanvasItem] 由 [Viewport] 节点渲染的渲染层。如果 [CanvasItem] 及其所有父级"
+"都与 [Viewport] 的画布剔除遮罩共享同一图层，则该 [Viewport] 将渲染它。\n"
+"[b]注意：[/b][CanvasItem] 不会继承其父级的可见性图层。这意味着，如果父 "
+"[CanvasItem] 没有与其子节点相同的全部层，则即使父节点和子节点的 [member "
+"visible] 都设置为 [code]true[/code]，该子节点也可能不可见。例如，如果父节点具"
+"有图层 1，而子节点具有图层 2，则在画布剔除遮罩设置为图层 1 或图层 2 （见 "
+"[member Viewport.canvas_cull_mask]）的 [Viewport] 中，该子节点将不可见。为了确"
+"保父节点和子节点都可见，父节点必须同时具有图层 1 和图层 2，或者子节点必须将 "
+"[member top_level] 设置为 [code]true[/code]。"
+
 msgid ""
 "If [code]true[/code], this [CanvasItem] may be drawn. Whether this "
 "[CanvasItem] is actually drawn depends on the visibility of all of its "
@@ -26485,6 +27847,25 @@ msgstr ""
 "则，胶囊体将变为球体。如果 [member radius] 大于 [member height] 的一半，则属性"
 "将调整为有效值。"
 
+msgid "Rotation based cyclic coordinate descent inverse kinematics solver."
+msgstr "基于旋转的循环坐标下降反向动力学求解器。"
+
+msgid ""
+"[CCDIK3D] is rotation based IK, enabling fast and effective tracking even "
+"with large joint rotations. It's especially suitable for chains with "
+"limitations, providing smoother and more stable target tracking compared to "
+"[FABRIK3D].\n"
+"The resulting twist around the forward vector will always be kept from the "
+"previous pose.\n"
+"[b]Note:[/b] When the target is close to the root, it can cause unnatural "
+"movement, including joint flips and oscillations."
+msgstr ""
+"[CCDIK3D] 是一种基于旋转的反向动力学算法，即使在关节大幅旋转的情况下也能实现快"
+"速有效的跟踪。它特别适用于有限制的链，与 [FABRIK3D] 相比，它能提供更平滑、更稳"
+"定的目标跟踪。\n"
+"由此产生的绕前向向量的扭转将始终与之前的姿态保持一致。\n"
+"[b]注意：[/b]当目标靠近根部时，可能会导致不自然的运动，包括关节翻转和振荡。"
+
 msgid "A container that keeps child controls in its center."
 msgstr "将子控件保持在其中心的容器。"
 
@@ -26499,6 +27880,25 @@ msgid ""
 msgstr ""
 "如果为 [code]true[/code]，会将子节点相对于 [CenterContainer] 的左上角居中。"
 
+msgid ""
+"A [SkeletonModifier3D] to apply inverse kinematics to bone chains containing "
+"an arbitrary number of bones."
+msgstr "[SkeletonModifier3D] 用于对包含任意数量骨骼的骨骼链应用反向动力学。"
+
+msgid ""
+"Base class of [SkeletonModifier3D] that automatically generates a joint list "
+"from the bones between the root bone and the end bone."
+msgstr ""
+"[SkeletonModifier3D] 的基类，可以自动生成根骨骼和末端骨骼之间所有骨骼的关节列"
+"表。"
+
+msgid ""
+"Returns the end bone tail length of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，返回骨骼链的末端骨骼"
+"尾部长度。"
+
 msgid ""
 "Sets the end bone tail length of the bone chain when [method "
 "is_end_bone_extended] is [code]true[/code]."
@@ -26506,6 +27906,16 @@ msgstr ""
 "当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置骨骼链中末端骨骼"
 "的尾部长度。"
 
+msgid ""
+"Sets the end bone name of the bone chain.\n"
+"[b]Note:[/b] The end bone must be the root bone or a child of the root bone. "
+"If they are the same, the tail must be extended by [method "
+"set_extend_end_bone] to modify the bone."
+msgstr ""
+"设置骨骼链的末端骨骼名称。\n"
+"[b]注意：[/b] 末端骨骼必须是根骨骼或根骨骼的子骨骼。如果相同，则必须通过 "
+"[method set_extend_end_bone] 扩展尾部，以修改该骨骼。"
+
 msgid ""
 "If [param enabled] is [code]true[/code], the end bone is extended to have a "
 "tail.\n"
@@ -26622,6 +28032,49 @@ msgstr ""
 "水平方向，爬坡时你也会斜向移动。此方法返回的就是那个斜向移动，与返回请求速度"
 "的 [member velocity] 相对。"
 
+msgid ""
+"Returns a [KinematicCollision2D], which contains information about a "
+"collision that occurred during the last call to [method move_and_slide]. "
+"Since the body can collide several times in a single call to [method "
+"move_and_slide], you must specify the index of the collision in the range 0 "
+"to ([method get_slide_collision_count] - 1). See also [method "
+"get_last_slide_collision].\n"
+"[b]Example:[/b] Iterate through the collisions with a [code]for[/code] loop:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"\tvar collision = get_slide_collision(i)\n"
+"\tprint(\"Collided with: \", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"\tKinematicCollision2D collision = GetSlideCollision(i);\n"
+"\tGD.Print(\"Collided with: \", (collision.GetCollider() as Node).Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"返回 [KinematicCollision2D]，包含最近一次调用 [method move_and_slide] 时发生的"
+"碰撞信息。因为单次调用 [method move_and_slide] 可能发生多次碰撞，所以你必须指"
+"定碰撞索引，范围为 0 到 ([method get_slide_collision_count] - 1)。另见 "
+"[method get_last_slide_collision]。\n"
+"[b]示例：[/b]使用 [code]for[/code] 循环遍历碰撞：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"var collision = get_slide_collision(i)\n"
+"print(\"碰到了：\", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"\tKinematicCollision2D collision = GetSlideCollision(i);\n"
+"\tGD.Print(\"碰到了：\", (collision.GetCollider() as Node).Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the number of times the body collided and changed direction during "
 "the last call to [method move_and_slide]."
@@ -26979,6 +28432,19 @@ msgid ""
 msgstr ""
 "返回位于最近一次碰撞点的平台角速度。仅在调用 [method move_and_slide] 后有效。"
 
+msgid ""
+"Returns a [KinematicCollision3D], which contains information about a "
+"collision that occurred during the last call to [method move_and_slide]. "
+"Since the body can collide several times in a single call to [method "
+"move_and_slide], you must specify the index of the collision in the range 0 "
+"to ([method get_slide_collision_count] - 1). See also [method "
+"get_last_slide_collision]."
+msgstr ""
+"返回 [KinematicCollision3D]，包含最近一次调用 [method move_and_slide] 时发生的"
+"碰撞信息。因为单次调用 [method move_and_slide] 可能发生多次碰撞，所以你必须指"
+"定碰撞索引，范围为 0 到 ([method get_slide_collision_count] - 1)。另见 "
+"[method get_last_slide_collision]。"
+
 msgid ""
 "Moves the body based on [member velocity]. If the body collides with another, "
 "it will slide along the other body rather than stop immediately. If the other "
@@ -28085,6 +29551,9 @@ msgstr ""
 "如果为 [code]true[/code]，则会绘制行号栏。行号从 [code]1[/code] 开始，逐行递"
 "增。在行号栏中点击并拖动会选中整行文本。"
 
+msgid "The minimum width in digits reserved for the line number gutter."
+msgstr "为行号栏预留的最小数字宽度。"
+
 msgid ""
 "If [code]true[/code], line numbers drawn in the gutter are zero padded based "
 "on the total line count. Requires [member gutters_draw_line_numbers] to be "
@@ -28979,6 +30448,21 @@ msgstr ""
 msgid "A node that provides a polygon shape to a [CollisionObject2D] parent."
 msgstr "向 [CollisionObject2D] 父级提供多边形形状的节点。"
 
+msgid ""
+"A node that provides a polygon shape to a [CollisionObject2D] parent and "
+"allows it to be edited. The polygon can be concave or convex. This can give a "
+"detection shape to an [Area2D], turn a [PhysicsBody2D] into a solid object, "
+"or give a hollow shape to a [StaticBody2D].\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionPolygon2D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its polygon instead."
+msgstr ""
+"为 [CollisionObject2D] 父级提供多边形形状并允许对其编辑的节点。该多边形可以是"
+"凹多边形或凸多边形。它可以为 [Area2D] 提供检测形状，将 [PhysicsBody2D] 转换为"
+"实体对象，或为 [StaticBody2D] 提供空心形状。\n"
+"[b]警告：[/b]非均匀缩放的 [CollisionPolygon2D] 可能不会按预期运行。请确保在所"
+"有轴上保持其缩放相同并改为调整其多边形形状。"
+
 msgid "Collision build mode."
 msgstr "碰撞构建模式。"
 
@@ -29043,6 +30527,21 @@ msgid ""
 "[CollisionObject3D] parent."
 msgstr "向 [CollisionObject3D] 父级提供加厚多边形形状（角柱体）的节点。"
 
+msgid ""
+"A node that provides a thickened polygon shape (a prism) to a "
+"[CollisionObject3D] parent and allows it to be edited. The polygon can be "
+"concave or convex. This can give a detection shape to an [Area3D] or turn a "
+"[PhysicsBody3D] into a solid object.\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionShape3D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its shape resource instead."
+msgstr ""
+"向 [CollisionObject3D] 父级提供加厚多边形形状（角柱体）的节点，并允许对其编"
+"辑。该多边形可以是凹多边形，也可以是凸多边形。能够为 [Area3D] 提供检测形状，也"
+"能够将 [PhysicsBody3D] 变为实体。\n"
+"[b]警告：[/b]非均匀缩放的 [CollisionShape3D] 可能不会按预期运行。请确保在所有"
+"轴上保持其缩放相同并改为调整其形状资源。"
+
 msgid ""
 "The collision shape color that is displayed in the editor, or in the running "
 "project if [b]Debug > Visible Collision Shapes[/b] is checked at the top of "
@@ -29085,6 +30584,14 @@ msgstr "在局部 XY 平面中定义 2D 多边形的顶点数组。"
 msgid "A node that provides a [Shape2D] to a [CollisionObject2D] parent."
 msgstr "向 [CollisionObject2D] 父级提供 [Shape2D] 的节点。"
 
+msgid ""
+"A node that provides a [Shape2D] to a [CollisionObject2D] parent and allows "
+"it to be edited. This can give a detection shape to an [Area2D] or turn a "
+"[PhysicsBody2D] into a solid object."
+msgstr ""
+"向 [CollisionObject2D] 父级提供 [Shape2D] 并允许对其编辑的节点。这可以为 "
+"[Area2D] 提供检测形状或将 [PhysicsBody2D] 转变为实体对象。"
+
 msgid ""
 "A disabled collision shape has no effect in the world. This property should "
 "be changed with [method Object.set_deferred]."
@@ -29116,6 +30623,19 @@ msgstr "该碰撞形状拥有的实际形状。"
 msgid "A node that provides a [Shape3D] to a [CollisionObject3D] parent."
 msgstr "向 [CollisionObject3D] 父级提供 [Shape3D] 的节点。"
 
+msgid ""
+"A node that provides a [Shape3D] to a [CollisionObject3D] parent and allows "
+"it to be edited. This can give a detection shape to an [Area3D] or turn a "
+"[PhysicsBody3D] into a solid object.\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionShape3D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its [member shape] resource instead."
+msgstr ""
+"向 [CollisionObject3D] 父级提供 [Shape3D] 并允许对其编辑的节点。可以为 "
+"[Area3D] 提供检测形状，或将 [PhysicsBody3D] 转换为实体对象。\n"
+"[b]警告：[/b]非均匀缩放的 [CollisionShape3D] 可能无法按预期运行。请确保在所有"
+"轴上保持其缩放相同并改为调整其 [member shape] 资源。"
+
 msgid ""
 "Sets the collision shape's shape to the addition of all its convexed "
 "[MeshInstance3D] siblings geometry."
@@ -29243,6 +30763,58 @@ msgstr ""
 "从 HTML 颜色代码或标准化的颜色名称中构建 [Color]，[param alpha] 的范围为 0.0 "
 "到 1.0。支持的颜色名称与常量名相同。"
 
+msgid ""
+"Constructs a [Color] from RGB values, typically between 0.0 and 1.0. [member "
+"a] is set to 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7) # Similar to `Color.from_rgba8(51, 255, 178, "
+"255)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f); // Similar to `Color.Color8(51, 255, "
+"178, 255)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"从通常介于 0.0 和 1.0 之间的 RGB 值构造一个 [Color]。[member a] 被设置为 "
+"1.0。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7) # 类似于 `Color.from_rgba8(51, 255, 178, "
+"255)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f); // 类似于 `Color.Color8(51, 255, "
+"178, 255)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Constructs a [Color] from RGBA values, typically between 0.0 and 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7, 0.8) # Similar to `Color.from_rgba8(51, 255, "
+"178, 204)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f, 0.8f); // Similar to "
+"`Color.Color8(51, 255, 178, 255, 204)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"从通常介于 0.0 和 1.0 之间的 RGBA 值构造一个 [Color]。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7, 0.8) # 类似于 `Color.from_rgba8(51, 255, "
+"178, 204)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f, 0.8f); // 类似于 `Color.Color8(51, "
+"255, 178, 255, 204)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns a new color resulting from overlaying this color over the given "
 "color. In a painting program, you can imagine it as the [param over] color "
@@ -29410,6 +30982,21 @@ msgstr ""
 "如果你想要在常量表达式中使用 String 创建颜色，请改用对应的构造函数（即 "
 "[code]Color(\"颜色字符串\")[/code]）。"
 
+msgid ""
+"Returns the light intensity of the color, as a value between 0.0 and 1.0 "
+"(inclusive). This is useful when determining light or dark color. Colors with "
+"a luminance smaller than 0.5 can be generally considered dark.\n"
+"[b]Note:[/b] [method get_luminance] relies on the color using linear encoding "
+"to return an accurate relative luminance value. If the color uses the default "
+"nonlinear sRGB encoding, use [method srgb_to_linear] to convert it to linear "
+"encoding first."
+msgstr ""
+"将颜色的光照强度返回为一个介于 0.0 和 1.0（包含）之间的值。这在确定浅色或深色"
+"时很有用。亮度小于 0.5 的颜色通常可以认为是深色。\n"
+"[b]注意：[/b][method get_luminance] 依赖于颜色使用线性编码，这样才能返回准确的"
+"相对亮度值。如果颜色使用默认的非线性 sRGB 编码，请先使用 [method "
+"srgb_to_linear] 将其转换为线性编码。"
+
 msgid ""
 "Returns the [Color] associated with the provided [param hex] integer in 32-"
 "bit RGBA format (8 bits per channel). This method is the inverse of [method "
@@ -29666,6 +31253,36 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns a copy of the color that is encoded using the [url=https://"
+"en.wikipedia.org/wiki/SRGB]nonlinear sRGB transfer function[/url]. This "
+"method requires the original color to use linear encoding. See also [method "
+"srgb_to_linear] which performs the opposite operation.\n"
+"[b]Note:[/b] The color's alpha channel ([member a]) is not affected. The "
+"alpha channel is always stored with linear encoding, regardless of the color "
+"space of the other color channels."
+msgstr ""
+"返回使用[url=https://en.wikipedia.org/wiki/SRGB]非线性 sRGB 传递函数[/url]编码"
+"的颜色副本。该方法要求原始颜色使用线性编码。另见执行相反操作的 [method "
+"srgb_to_linear]。\n"
+"[b]注意：[/b]颜色的 Alpha 通道（[member a]）不受影响。Alpha 通道始终使用线性编"
+"码，与其他颜色通道所使用的色彩空间无关。"
+
+msgid ""
+"Returns a copy of the color that uses linear encoding. This method requires "
+"the original color to be encoded using the [url=https://en.wikipedia.org/wiki/"
+"SRGB]nonlinear sRGB transfer function[/url]. See also [method linear_to_srgb] "
+"which performs the opposite operation.\n"
+"[b]Note:[/b] The color's alpha channel ([member a]) is not affected. The "
+"alpha channel is always stored with linear encoding, regardless of the color "
+"space of the other color channels."
+msgstr ""
+"返回使用线性编码的颜色副本。该方法要求原始颜色使用[url=https://"
+"en.wikipedia.org/wiki/SRGB]非线性 sRGB 传输函数[/url]进行编码。另见执行相反操"
+"作的 [method linear_to_srgb]。\n"
+"[b]注意：[/b]颜色的 Alpha 通道（[member a]）不受影响。Alpha 通道始终使用线性编"
+"码，与其他颜色通道所使用的色彩空间无关。"
+
 msgid ""
 "Returns the color converted to a 32-bit integer in ABGR format (each "
 "component is 8 bits). ABGR is the reversed version of the default RGBA "
@@ -29867,6 +31484,20 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"The color's alpha component, typically on the range of 0 to 1. A value of 0 "
+"means that the color is fully transparent. A value of 1 means that the color "
+"is fully opaque.\n"
+"[b]Note:[/b] The alpha channel is always stored with linear encoding, "
+"regardless of the encoding of the other color channels. The [method "
+"linear_to_srgb] and [method srgb_to_linear] methods do not affect the alpha "
+"channel."
+msgstr ""
+"颜色的 Alpha 分量，通常在 0 到 1 的范围内。取值为 0 表示颜色完全透明。取值为 "
+"1 表示颜色完全不透明。\n"
+"[b]注意：[/b]Alpha 通道始终按照线性编码存储，与其他颜色通道如何编码无关。"
+"[method linear_to_srgb] 和 [method srgb_to_linear] 等方法不影响 Alpha 通道。"
+
 msgid "Wrapper for [member a] that uses the range 0 to 255, instead of 0 to 1."
 msgstr "对 [member a] 的封装，使用 0 到 255 的范围而不是 0 到 1。"
 
@@ -30512,6 +32143,14 @@ msgstr ""
 msgid "If [code]true[/code], shows an alpha channel slider (opacity)."
 msgstr "如果为 [code]true[/code]，则显示 Alpha 通道滑块（不透明度）。"
 
+msgid ""
+"If [code]true[/code], shows an intensity slider. The intensity is applied as "
+"follows: convert the color to linear encoding, multiply it by [code]2 ** "
+"intensity[/code], and then convert it back to nonlinear sRGB encoding."
+msgstr ""
+"如果为 [code]true[/code] 则显示强度滑块。强度的应用方式如下：将颜色转换为线性"
+"编码，乘以 [code]2 ** intensity[/code]，然后将其转换回非线性 sRGB 编码。"
+
 msgid "If [code]true[/code], the hex color code input field is visible."
 msgstr "如果为 [code]true[/code]，则十六进制颜色代码输入框可见。"
 
@@ -30691,7 +32330,7 @@ msgstr ""
 "所以应该使用部分透明的 [StyleBox]，确保拾取器形状仍然可见。代表轮廓或下划线的 "
 "[StyleBox] 可以很好地实现这个目的。要禁用聚焦的视觉效果，请指定 "
 "[StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的"
-"可用性，所以出于可访问性的原因，不建议这样做。"
+"可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid ""
 "The [StyleBox] used when the rectangle-shaped part of the picker is focused. "
@@ -30706,7 +32345,7 @@ msgstr ""
 "所以应该使用部分透明的 [StyleBox]，确保拾取器形状仍然可见。代表轮廓或下划线的 "
 "[StyleBox] 可以很好地实现这个目的。要禁用聚焦的视觉效果，请指定 "
 "[StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的"
-"可用性，所以出于可访问性的原因，不建议这样做。"
+"可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid ""
 "The [StyleBox] used for the old color sample part when it is focused. "
@@ -30721,7 +32360,7 @@ msgstr ""
 "使用部分透明的 [StyleBox]，确保拾取器形状仍然可见。代表轮廓或下划线的 "
 "[StyleBox] 可以很好地实现这个目的。要禁用聚焦的视觉效果，请指定 "
 "[StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的"
-"可用性，所以出于可访问性的原因，不建议这样做。"
+"可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid "A button that brings up a [ColorPicker] when pressed."
 msgstr "点击后会显示 [ColorPicker] 的按钮。"
@@ -31864,6 +33503,85 @@ msgid ""
 "parent control."
 msgstr "所有 GUI 控件的基类。根据其父控件调整其位置和大小。"
 
+msgid ""
+"Base class for all UI-related nodes. [Control] features a bounding rectangle "
+"that defines its extents, an anchor position relative to its parent control "
+"or the current viewport, and offsets relative to the anchor. The offsets "
+"update automatically when the node, any of its parents, or the screen size "
+"change.\n"
+"For more information on Godot's UI system, anchors, offsets, and containers, "
+"see the related tutorials in the manual. To build flexible UIs, you'll need a "
+"mix of UI elements that inherit from [Control] and [Container] nodes.\n"
+"[b]Note:[/b] Since both [Node2D] and [Control] inherit from [CanvasItem], "
+"they share several concepts from the class such as the [member "
+"CanvasItem.z_index] and [member CanvasItem.visible] properties.\n"
+"[b]User Interface nodes and input[/b]\n"
+"Godot propagates input events via viewports. Each [Viewport] is responsible "
+"for propagating [InputEvent]s to their child nodes. As the [member "
+"SceneTree.root] is a [Window], this already happens automatically for all UI "
+"elements in your game.\n"
+"Input events are propagated through the [SceneTree] from the root node to all "
+"child nodes by calling [method Node._input]. For UI elements specifically, it "
+"makes more sense to override the virtual method [method _gui_input], which "
+"filters out unrelated input events, such as by checking z-order, [member "
+"mouse_filter], focus, or if the event was inside of the control's bounding "
+"box.\n"
+"Call [method accept_event] so no other node receives the event. Once you "
+"accept an input, it becomes handled so [method Node._unhandled_input] will "
+"not process it.\n"
+"Only one [Control] node can be in focus. Only the node in focus will receive "
+"events. To get the focus, call [method grab_focus]. [Control] nodes lose "
+"focus when another node grabs it, or if you hide the node in focus. Focus "
+"will not be represented visually if gained via mouse/touch input, only "
+"appearing with keyboard/gamepad input (for accessibility), or via [method "
+"grab_focus].\n"
+"Set [member mouse_filter] to [constant MOUSE_FILTER_IGNORE] to tell a "
+"[Control] node to ignore mouse or touch events. You'll need it if you place "
+"an icon on top of a button.\n"
+"[Theme] resources change the control's appearance. The [member theme] of a "
+"[Control] node affects all of its direct and indirect children (as long as a "
+"chain of controls is uninterrupted). To override some of the theme items, "
+"call one of the [code]add_theme_*_override[/code] methods, like [method "
+"add_theme_font_override]. You can also override theme items in the "
+"Inspector.\n"
+"[b]Note:[/b] Theme items are [i]not[/i] [Object] properties. This means you "
+"can't access their values using [method Object.get] and [method Object.set]. "
+"Instead, use the [code]get_theme_*[/code] and [code]add_theme_*_override[/"
+"code] methods provided by this class."
+msgstr ""
+"所有 UI 相关节点的基类。[Control] 具有定义其范围的边界矩形，相对于父控件或当前"
+"视口的锚点位置，以及相对于锚点的偏移。当节点、任何父节点或屏幕尺寸发生变化时，"
+"偏移就会自动更新。\n"
+"更多关于 Godot 的 UI 系统、锚点、偏移和容器的信息，请参阅手册中的相关教程。要"
+"构建灵活的 UI，你需要混合使用从 [Control] 和 [Container] 节点继承的 UI 元"
+"素。\n"
+"[b]注意：[/b][Node2D] 和 [Control] 都继承自 [CanvasItem]，它们都具有该类的 "
+"[member CanvasItem.z_index]、[member CanvasItem.visible] 等属性。\n"
+"[b]用户界面节点与输入[/b]\n"
+"Godot 使用视口来传播输入事件。视口负责将 [InputEvent] 传播给它的子节点。因为 "
+"[member SceneTree.root] 是 [Window]，所以游戏中的所有 UI 元素都会自动进行传"
+"播。\n"
+"输入事件通过调用 [method Node._input] 在 [SceneTree] 中传播，从根节点传播到所"
+"有子节点。对 UI 元素而言，覆盖的最好是 [method _gui_input]，可以过滤掉无关的输"
+"入事件，例如它会对 Z 顺序、[member mouse_filter]、焦点、事件是否在该控件的边界"
+"框内等条件进行检查。\n"
+"请调用 [method accept_event]，这样其他节点就不会收到该事件。输入被接受后，就会"
+"被标记为已处理，[method Node._unhandled_input] 不会对它进行处理。\n"
+"只能有一个 [Control] 节点处于焦点。只有处于焦点的节点才会接收到事件。要获得焦"
+"点，请调用 [method grab_focus]。导致 [Control] 节点失去焦点的情况有：其他节点"
+"获得了焦点、隐藏了聚焦节点。如果焦点是通过鼠标/触摸输入获得的，则不会以视觉方"
+"式显示焦点，只有通过键盘/游戏手柄输入（对于无障碍功能）或通过 [method "
+"grab_focus] 获得焦点时才会显示。\n"
+"将 [member mouse_filter] 设置为 [constant MOUSE_FILTER_IGNORE] 可以让 "
+"[Control] 节点忽略鼠标或触摸事件。如果你在按钮上放了一个图标，就会需要用到。\n"
+"[Theme] 资源会更改控件的外观。[Control] 节点的 [member theme] 会影响所有直接和"
+"间接子级节点（只要控件链没有被打断）。要覆盖某些主题项，请调用 "
+"[code]add_theme_*_override[/code] 方法，例如 [method "
+"add_theme_font_override]。你也可以在检查器中覆盖主题项。\n"
+"[b]注意：[/b]主题项[i]不是[/i] [Object] 的属性。这意味着你无法使用 [method "
+"Object.get] 和 [method Object.set] 访问它们的值。请改用这个类的 "
+"[code]get_theme_*[/code] 和 [code]add_theme_*_override[/code] 方法。"
+
 msgid "GUI documentation index"
 msgstr "GUI 文档索引"
 
@@ -32185,6 +33903,119 @@ msgstr ""
 "[b]注意：[/b]如果要检查一个点是否在该控件内部，可以使用 "
 "[code]Rect2(Vector2.ZERO, size).has_point(point)[/code]。"
 
+msgid ""
+"Virtual method to be implemented by the user. Returns a [Control] node that "
+"should be used as a tooltip instead of the default one. [param for_text] is "
+"the return value of [method get_tooltip].\n"
+"The returned node must be of type [Control] or Control-derived. It can have "
+"child nodes of any type. It is freed when the tooltip disappears, so make "
+"sure you always provide a new instance (if you want to use a pre-existing "
+"node from your scene tree, you can duplicate it and pass the duplicated "
+"instance). When [code]null[/code] or a non-Control node is returned, the "
+"default tooltip will be used instead.\n"
+"The returned node will be added as child to a [PopupPanel], so you should "
+"only provide the contents of that panel. That [PopupPanel] can be themed "
+"using [method Theme.set_stylebox] for the type [code]\"TooltipPanel\"[/code] "
+"(see [member tooltip_text] for an example).\n"
+"[b]Note:[/b] The tooltip is shrunk to minimal size. If you want to ensure "
+"it's fully visible, you might want to set its [member custom_minimum_size] to "
+"some non-zero value.\n"
+"[b]Note:[/b] The node (and any relevant children) should have their [member "
+"CanvasItem.visible] set to [code]true[/code] when returned, otherwise, the "
+"viewport that instantiates it will not be able to calculate its minimum size "
+"reliably.\n"
+"[b]Note:[/b] If overridden, this method is called even if [method "
+"get_tooltip] returns an empty string. When this happens with the default "
+"tooltip, it is not displayed. To copy this behavior, return [code]null[/code] "
+"in this method when [param for_text] is empty.\n"
+"[b]Example:[/b] Use a constructed node as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"\tvar label = Label.new()\n"
+"\tlabel.text = for_text\n"
+"\treturn label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"\tvar label = new Label();\n"
+"\tlabel.Text = forText;\n"
+"\treturn label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Example:[/b] Use a scene instance as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"\tvar tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"\ttooltip.get_node(\"Label\").text = for_text\n"
+"\treturn tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"\tNode tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"\ttooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"\treturn tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"由用户实现的虚方法。返回应当用作工具提示的 [Control] 节点，代替默认的工具提"
+"示。[param for_text] 为 [method get_tooltip] 的返回值。\n"
+"返回的节点必须是 [Control] 或派生自 Control 类型，其子节点可以是任何类型。工具"
+"提示消失时会释放该节点，因此请确保始提供的始终是新的实例（如果想要使用场景树中"
+"已有的节点，可以制作并返回其副本）。如果返回的是 [code]null[/code] 或非 "
+"Control 节点，则会使用默认的工具提示。\n"
+"返回的节点会添加为一个 [PopupPanel] 的子节点，因此只需提供该面板的内容。该 "
+"[PopupPanel] 可以通过为 [code]\"TooltipPanel\"[/code] 类型调用 [method "
+"Theme.set_stylebox] 设置主题样式（示例见 [member tooltip_text]）。\n"
+"[b]注意：[/b]工具提示会缩小至最小尺寸。如果想要确保其完全可见，你可能会需要将 "
+"[member custom_minimum_size] 设为非零值。\n"
+"[b]注意：[/b]返回时节点（及其相关子级节点）的 [member CanvasItem.visible] 应设"
+"为 [code]true[/code]，否则执行实例化的视口无法为其计算可靠的最小尺寸。\n"
+"[b]注意：[/b]覆盖该方法后，即便 [method get_tooltip] 返回空字符串也会调用该方"
+"法。类似情况下不会显示默认工具提示。要复制该行为，请在 [param for_text] 为空时"
+"返回 [code]null[/code]。\n"
+"[b]示例：[/b]构造工具提示节点：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"\tvar label = Label.new()\n"
+"\tlabel.text = for_text\n"
+"\treturn label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"\tvar label = new Label();\n"
+"\tlabel.Text = forText;\n"
+"\treturn label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]示例：[/b]使用场景实例作为工具提示：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"\tvar tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"\ttooltip.get_node(\"Label\").text = for_text\n"
+"\treturn tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"\tNode tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"\ttooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"\treturn tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "User defined BiDi algorithm override function.\n"
 "Returns an [Array] of [Vector3i] text ranges and text base directions, in the "
@@ -32452,6 +34283,13 @@ msgstr ""
 "返回 [member custom_minimum_size] 和 [method get_minimum_size] 的组合最小大"
 "小。"
 
+msgid ""
+"Returns the combined value of [member pivot_offset] and [member "
+"pivot_offset_ratio], in pixels. The ratio is multiplied by the control's size."
+msgstr ""
+"返回 [member pivot_offset] 和 [member pivot_offset_ratio] 的组合值，单位为像"
+"素。该比例值会乘以控件的大小。"
+
 msgid ""
 "Returns the mouse cursor shape for this control when hovered over [param "
 "position] in local coordinates. For most controls, this is the same as "
@@ -32775,6 +34613,39 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Steal the focus from another control and become the focused control (see "
+"[member focus_mode]).\n"
+"If [param hide_focus] is [code]true[/code], the control will not visually "
+"show its focused state. Has no effect for [LineEdit] and [TextEdit] when "
+"[member ProjectSettings.gui/common/show_focus_state_on_pointer_event] is set "
+"to [code]Control Supports Keyboard Input[/code], or for any control when it "
+"is set to [code]Always[/code].\n"
+"[b]Note:[/b] Using this method together with [method Callable.call_deferred] "
+"makes it more reliable, especially when called inside [method Node._ready]."
+msgstr ""
+"从另一个控件窃取焦点并成为聚焦的控件（见 [member focus_mode]）。\n"
+"如果 [param hide_focus] 为 [code]true[/code]，则控件将不会可视地显示其焦点状"
+"态。当 [member ProjectSettings.gui/common/show_focus_state_on_pointer_event] "
+"设置为 [code]Control Supports Keyboard Input[/code] 时，该设置对 [LineEdit] "
+"和 [TextEdit] 无效；当其设置为 [code]Always[/code] 时，则对所有控件均无效。\n"
+"[b]注意：[/b]将该方法与 [method Callable.call_deferred] 结合使用会使其更加可"
+"靠，尤其是在 [method Node._ready] 中调用时。"
+
+msgid ""
+"Returns [code]true[/code] if this is the current focused control. See [member "
+"focus_mode].\n"
+"If [param ignore_hidden_focus] is [code]true[/code], controls that have their "
+"focus hidden will always return [code]false[/code]. Hidden focus happens "
+"automatically when controls gain focus via mouse input, or manually using "
+"[method grab_focus] with [code]hide_focus[/code] set to [code]true[/code]."
+msgstr ""
+"如果这是当前聚焦的控件，则返回 [code]true[/code]。见 [member focus_mode]。\n"
+"如果 [param ignore_hidden_focus] 为 [code]true[/code]，则焦点被隐藏的控件始终"
+"返回 [code]false[/code]。当控件通过鼠标输入获得焦点时，焦点会自动隐藏；或者也"
+"可以通过调用 [method grab_focus] 并将 [code]hide_focus[/code] 设置为 "
+"[code]true[/code] 来手动隐藏。"
+
 msgid ""
 "Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
 "a color item with the specified [param name] and [param theme_type].\n"
@@ -33516,6 +35387,19 @@ msgstr ""
 "scale] 时，节点将围绕此轴心进行旋转或缩放。\n"
 "实际的偏移量是该属性值与 [member pivot_offset_ratio] 值的总和。"
 
+msgid ""
+"Same as [member pivot_offset], but expressed as uniform vector, where "
+"[code]Vector2(0, 0)[/code] is the top-left corner of this control, and "
+"[code]Vector2(1, 1)[/code] is its bottom-right corner. Set this property to "
+"[code]Vector2(0.5, 0.5)[/code] to pivot around this control's center.\n"
+"The actual offset is the combined value of this property and [member "
+"pivot_offset]."
+msgstr ""
+"与 [member pivot_offset] 相同，但表示为 uniform 向量，其中 [code]Vector2(0, 0)"
+"[/code] 是该控件的左上角，[code]Vector2(1, 1)[/code] 是其右下角。将该属性设置"
+"为 [code]Vector2(0.5, 0.5)[/code] 以围绕该控件的中心旋转。\n"
+"实际偏移是该属性和 [member pivot_offset] 的组合。"
+
 msgid ""
 "The node's position, relative to its containing node. It corresponds to the "
 "rectangle's top-left corner. The property is not affected by [member "
@@ -33866,6 +35750,16 @@ msgstr ""
 "阻止控件获取鼠标输入。[method get_mouse_filter_with_override] 会返回 "
 "[constant MOUSE_FILTER_IGNORE]。"
 
+msgid ""
+"Allows the control to receive mouse input, depending on the [member "
+"mouse_filter]. This can be used to ignore the parent's [member "
+"mouse_behavior_recursive]. [method get_mouse_filter_with_override] will "
+"return the [member mouse_filter]."
+msgstr ""
+"允许控件获取鼠标输入，取决于 [member mouse_filter]。可以用来忽略父控件的 "
+"[member mouse_behavior_recursive]。[method get_mouse_filter_with_override] 会"
+"返回 [member mouse_filter]。"
+
 msgid "Sent when the node changes size. Use [member size] to get the new size."
 msgstr "当节点改变大小时发送。请使用 [member size] 获取新大小。"
 
@@ -34507,6 +36401,50 @@ msgid ""
 "reference."
 msgstr "对骨骼应用变换的 [SkeletonModifier3D]，变换转换自参考骨骼。"
 
+msgid ""
+"Apply the copied transform of the bone set by [method "
+"BoneConstraint3D.set_reference_bone] to the bone set by [method "
+"BoneConstraint3D.set_apply_bone] about the specific axis with remapping it "
+"with some options.\n"
+"There are 4 ways to apply the transform, depending on the combination of "
+"[method set_relative] and [method set_additive].\n"
+"[b]Relative + Additive:[/b]\n"
+"- Extract reference pose relative to the rest and add it to the apply bone's "
+"pose.\n"
+"[b]Relative + Not Additive:[/b]\n"
+"- Extract reference pose relative to the rest and add it to the apply bone's "
+"rest.\n"
+"[b]Not Relative + Additive:[/b]\n"
+"- Extract reference pose absolutely and add it to the apply bone's pose.\n"
+"[b]Not Relative + Not Additive:[/b]\n"
+"- Extract reference pose absolutely and the apply bone's pose is replaced "
+"with it.\n"
+"[b]Note:[/b] Relative option is available only in the case [method "
+"BoneConstraint3D.get_reference_type] is [constant "
+"BoneConstraint3D.REFERENCE_TYPE_BONE]. See also [enum "
+"BoneConstraint3D.ReferenceType].\n"
+"[b]Note:[/b] If there is a rotation greater than [code]180[/code] degrees "
+"with constrained axes, flipping may occur."
+msgstr ""
+"从通过 [method BoneConstraint3D.set_reference_bone] 指定的骨骼上复制变换，将所"
+"复制的变换沿特定轴应用到通过 [method BoneConstraint3D.set_apply_bone] 设置的骨"
+"骼上，并可使用一些选项对这个变换进行调整。\n"
+"根据 [method set_relative]（相对）和 [method set_additive]（叠加）的组合，有四"
+"种方式可以应用该变换：\n"
+"[b]相对 + 叠加[/b]：\n"
+"- 提取相对于静止姿态的参考姿态，并将其添加到目标骨骼的姿态上。\n"
+"[b]相对 + 非叠加：[/b]\n"
+"- 提取相对于静止姿态的参考姿态，并将其添加到目标骨骼的静止姿态上。\n"
+"[b]非相对 + 叠加：[/b]\n"
+"- 提取参考姿态的绝对姿态，并将其添加到目标骨骼的姿态上。\n"
+"[b]非相对 + 非叠加[/b]：\n"
+"- 提取参考姿态的绝对姿态，并将其替换目标骨骼的姿态。\n"
+"[b]注意：[/b]相对选项仅当 [method BoneConstraint3D.get_reference_type] 为 "
+"[constant BoneConstraint3D.REFERENCE_TYPE_BONE] 时可用。另见 [enum "
+"BoneConstraint3D.ReferenceType]。\n"
+"[b]注意：[/b]如果旋转角度大于 [code]180[/code] 度且轴受到约束，则可能会发生翻"
+"转。"
+
 msgid "Returns the axis of the remapping destination transform."
 msgstr "返回重映射目标变换的轴。"
 
@@ -34700,6 +36638,46 @@ msgid ""
 "reference."
 msgstr "对骨骼应用变换的 [SkeletonModifier3D]，变换复制自参考骨骼。"
 
+msgid ""
+"Apply the copied transform of the bone set by [method "
+"BoneConstraint3D.set_reference_bone] to the bone set by [method "
+"BoneConstraint3D.set_apply_bone] with processing it with some masks and "
+"options.\n"
+"There are 4 ways to apply the transform, depending on the combination of "
+"[method set_relative] and [method set_additive].\n"
+"[b]Relative + Additive:[/b]\n"
+"- Extract reference pose relative to the rest and add it to the apply bone's "
+"pose.\n"
+"[b]Relative + Not Additive:[/b]\n"
+"- Extract reference pose relative to the rest and add it to the apply bone's "
+"rest.\n"
+"[b]Not Relative + Additive:[/b]\n"
+"- Extract reference pose absolutely and add it to the apply bone's pose.\n"
+"[b]Not Relative + Not Additive:[/b]\n"
+"- Extract reference pose absolutely and the apply bone's pose is replaced "
+"with it.\n"
+"[b]Note:[/b] Relative option is available only in the case [method "
+"BoneConstraint3D.get_reference_type] is [constant "
+"BoneConstraint3D.REFERENCE_TYPE_BONE]. See also [enum "
+"BoneConstraint3D.ReferenceType]."
+msgstr ""
+"从通过 [method BoneConstraint3D.set_reference_bone] 指定的骨骼上复制变换，将所"
+"复制的变换应用到通过 [method BoneConstraint3D.set_apply_bone] 设置的骨骼上，并"
+"可使用一些遮罩和选项对这个过程进行调整。\n"
+"根据 [method set_relative]（相对）和 [method set_additive]（叠加）的组合，有四"
+"种方式可以应用该变换：\n"
+"[b]相对 + 叠加[/b]：\n"
+"- 提取相对于静止姿态的参考姿态，并将其添加到目标骨骼的姿态上。\n"
+"[b]相对 + 非叠加：[/b]\n"
+"- 提取相对于静止姿态的参考姿态，并将其添加到目标骨骼的静止姿态上。\n"
+"[b]非相对 + 叠加：[/b]\n"
+"- 提取参考姿态的绝对姿态，并将其添加到目标骨骼的姿态上。\n"
+"[b]非相对 + 非叠加[/b]：\n"
+"- 提取参考姿态的绝对姿态，并将其替换目标骨骼的姿态。\n"
+"[b]注意：[/b]相对选项仅当 [method BoneConstraint3D.get_reference_type] 为 "
+"[constant BoneConstraint3D.REFERENCE_TYPE_BONE] 时可用。另见 [enum "
+"BoneConstraint3D.ReferenceType]。"
+
 msgid "Returns the axis flags of the setting at [param index]."
 msgstr "返回索引为 [param index] 的设置的轴标志。"
 
@@ -35057,6 +37035,20 @@ msgstr ""
 "[member emission_shape] 被设置为 [constant EMISSION_SHAPE_RECTANGLE] 时，该矩"
 "形的范围。"
 
+msgid ""
+"The ring's inner radius if [member emission_shape] is set to [constant "
+"EMISSION_SHAPE_RING]."
+msgstr ""
+"[member emission_shape] 被设置为 [constant EMISSION_SHAPE_RING] 时，该环的内半"
+"径。"
+
+msgid ""
+"The ring's outer radius if [member emission_shape] is set to [constant "
+"EMISSION_SHAPE_RING]."
+msgstr ""
+"[member emission_shape] 被设置为 [constant EMISSION_SHAPE_RING] 时，该环的外半"
+"径。"
+
 msgid "Particles will be emitted inside this region."
 msgstr "粒子将在该区域内发射。"
 
@@ -35432,6 +37424,11 @@ msgstr ""
 "于 [member emission_normals] 进行设置。粒子颜色将通过 [member "
 "emission_colors] 进行调制。"
 
+msgid ""
+"Particles will be emitted in the area of a ring parameterized by its outer "
+"and inner radius."
+msgstr "粒子将在由其内外半径参数化的环状区域内发射。"
+
 msgid "Represents the size of the [enum EmissionShape] enum."
 msgstr "代表 [enum EmissionShape] 枚举的大小。"
 
@@ -38423,6 +40420,18 @@ msgstr ""
 "如果 [param deep] 为 [code]true[/code] 则会返回[b]深拷贝[/b]：嵌套的数组和字典"
 "也会进行（递归的）复制。不过 [Resource] 仍然是和原字典共享的。"
 
+msgid ""
+"Duplicates this dictionary, deeply, like [method duplicate] when passing "
+"[code]true[/code], with extra control over how subresources are handled.\n"
+"[param deep_subresources_mode] must be one of the values from [enum "
+"Resource.DeepDuplicateMode]. By default, only internal resources will be "
+"duplicated (recursively)."
+msgstr ""
+"深度复制该字典，类似于传递 [code]true[/code] 时的 [method duplicate] 方法，但"
+"可以额外控制子资源的处理方式。\n"
+"[param deep_subresources_mode] 必须是 [enum Resource.DeepDuplicateMode] 中的某"
+"个值。默认只会（递归）复制内部资源。"
+
 msgid ""
 "Removes the dictionary entry by key, if it exists. Returns [code]true[/code] "
 "if the given [param key] existed in the dictionary, otherwise [code]false[/"
@@ -39723,6 +41732,22 @@ msgstr ""
 "如果 [param is_last_line] 为 [code]true[/code]，则不会在文本内容后附加换行符。"
 "对于多行文本框的最后一行和单行文本框，应将此参数设为 [code]true[/code]。"
 
+msgid "Returns the metadata of the accessibility element [param id]."
+msgstr "返回无障碍元素 [param id] 的元数据。"
+
+msgid ""
+"Sets the metadata of the accessibility element [param id] to [param meta]."
+msgstr "将无障碍元素 [param id] 的元数据设置为 [param meta]。"
+
+msgid ""
+"Frees the accessibility element [param id] created by [method "
+"accessibility_create_element], [method accessibility_create_sub_element], or "
+"[method accessibility_create_sub_text_edit_elements]."
+msgstr ""
+"释放由 [method accessibility_create_element]、[method "
+"accessibility_create_sub_element] 或 [method "
+"accessibility_create_sub_text_edit_elements] 创建的无障碍元素 [param id]。"
+
 msgid "Returns the main accessibility element of the OS native window."
 msgstr "返回操作系统原生窗口的主要无障碍元素。"
 
@@ -39730,6 +41755,25 @@ msgid ""
 "Returns [code]true[/code] if [param id] is a valid accessibility element."
 msgstr "如果 [param id] 是有效的无障碍元素，则返回 [code]true[/code]。"
 
+msgid ""
+"Returns [code]1[/code] if a screen reader, Braille display or other assistive "
+"app is active, [code]0[/code] otherwise. Returns [code]-1[/code] if status is "
+"unknown.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights "
+"for Windows, Accessibility Inspector (macOS), or AT-SPI Browser (Linux/BSD), "
+"do not count as assistive apps and will not affect this value. To test your "
+"project with these tools, set [member ProjectSettings.accessibility/general/"
+"accessibility_support] to [code]1[/code]."
+msgstr ""
+"如果屏幕阅读器、盲文显示器或其他辅助应用处于活动状态则返回 [code]1[/code]， 否"
+"则返回 [code]0[/code]。如果状态未知则返回 [code]-1[/code]。\n"
+"[b]注意：[/b]该方法在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]Windows 的 Accessibility Insights、Accessibility Inspector"
+"（macOS）、AT-SPI 浏览器（Linux/BSD）等无障碍调试工具不算作辅助应用，不影响取"
+"值。要使用这些工具测试你的项目，请将 [member ProjectSettings.accessibility/"
+"general/accessibility_support] 设置为 [code]1[/code]。"
+
 msgid ""
 "Sets the window focused state for assistive apps.\n"
 "[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
@@ -40094,6 +42138,25 @@ msgstr ""
 msgid "Returns the default mouse cursor shape set by [method cursor_set_shape]."
 msgstr "返回默认鼠标光标形状，由 [method cursor_set_shape] 设置。"
 
+msgid ""
+"Sets a custom mouse cursor image for the given [param shape]. This means the "
+"user's operating system and mouse cursor theme will no longer influence the "
+"mouse cursor's appearance.\n"
+"[param cursor] can be either a [Texture2D] or an [Image], and it should not "
+"be larger than 256×256 to display correctly. Optionally, [param hotspot] can "
+"be set to offset the image's position relative to the click point. By "
+"default, [param hotspot] is set to the top-left corner of the image. See also "
+"[method cursor_set_shape].\n"
+"[b]Note:[/b] On Web, calling this method every frame can cause the cursor to "
+"flicker."
+msgstr ""
+"为给定的形状 [param shape] 设置自定义鼠标指针图像。这意味着用户的操作系统和鼠"
+"标光标主题不再影响鼠标光标的外观。\n"
+"[param cursor] 可以是 [Texture2D] 或 [Image]，并且它不应大于 256×256 才能正确"
+"显示。还可以选择设置 [param hotspot] 以偏移图像相对于点击点的位置。默认情况"
+"下，[param hotspot] 被设置为图像的左上角。另见 [method cursor_set_shape]。\n"
+"[b]注意：[/b]在 Web 上，每帧调用该方法可能会导致光标闪烁。"
+
 msgid ""
 "Sets the default mouse cursor shape. The cursor's appearance will vary "
 "depending on the user's operating system and mouse cursor theme. See also "
@@ -40222,6 +42285,60 @@ msgstr ""
 "[/codeblocks]\n"
 "只要目录未被移动、重命名或删除，持久化的 URI 权限将在应用重启后保持有效。"
 
+msgid ""
+"Displays OS native dialog for selecting files or directories in the file "
+"system with additional user selectable options.\n"
+"Each filter string in the [param filters] array should be formatted like "
+"this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/jpeg[/code]. The "
+"description text of the filter is optional and can be omitted. It is "
+"recommended to set both file extension and MIME type. See also [member "
+"FileDialog.filters].\n"
+"[param options] is array of [Dictionary]s with the following keys:\n"
+"- [code]\"name\"[/code] - option's name [String].\n"
+"- [code]\"values\"[/code] - [PackedStringArray] of values. If empty, boolean "
+"option (check box) is used.\n"
+"- [code]\"default\"[/code] - default selected option index ([int]) or default "
+"boolean value ([bool]).\n"
+"Callbacks have the following arguments: [code]status: bool, selected_paths: "
+"PackedStringArray, selected_filter_index: int, selected_option: Dictionary[/"
+"code].\n"
+"[b]Note:[/b] This method is implemented if the display server has the "
+"[constant FEATURE_NATIVE_DIALOG_FILE_EXTRA] feature. Supported platforms "
+"include Linux (X11/Wayland), Windows, and macOS.\n"
+"[b]Note:[/b] [param current_directory] might be ignored.\n"
+"[b]Note:[/b] Embedded file dialogs and Windows file dialogs support only file "
+"extensions, while Android, Linux, and macOS file dialogs also support MIME "
+"types.\n"
+"[b]Note:[/b] On Linux (X11), [param show_hidden] is ignored.\n"
+"[b]Note:[/b] On macOS, native file dialogs have no title.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method "
+"OS.get_granted_permissions] to get a list of saved bookmarks."
+msgstr ""
+"显示操作系统原生对话框，用于使用其他用户可选选项，选择文件系统中的文件或目"
+"录。\n"
+"[param filters] 数组中的每个过滤字符串都应该使用类似 [code]png,*.jpg,*.jpeg;图"
+"像文件;image/png,image/jpeg[/code] 的格式。过滤器的描述文本不是必填项，可以省"
+"略。建议同时设置文件扩展名和 MIME 类型。另见 [member FileDialog.filters]。\n"
+"[param options] 是具有以下字段的 [Dictionary] 的数组：\n"
+"- [code]\"name\"[/code] - 选项的名称 [String]。\n"
+"- [code]\"values\"[/code] - 值的 [PackedStringArray]。如果为空，则使用布尔选项"
+"（复选框）。\n"
+"- [code]\"default\"[/code] - 默认选择的选项索引（[int]）或默认布尔值"
+"（[bool]）。\n"
+"回调具有以下参数：[code]status: bool, selected_paths: PackedStringArray, "
+"selected_filter_index: int, selected_option: Dictionary[/code]。\n"
+"[b]注意：[/b]如果显示服务器具有 [constant FEATURE_NATIVE_DIALOG] 功能，则该方"
+"法已被实现。支持的平台包括 Linux（X11/Wayland）、Windows、macOS。\n"
+"[b]注意：[/b][param current_directory] 可能会被忽略。\n"
+"[b]注意：[/b]内嵌文件对话框和 Windows 文件对话框仅支持文件扩展名，而 Android、"
+"Linux 和 macOS 的文件对话框还支持 MIME 类型。\n"
+"[b]注意：[/b]在 Linux（X11） 上，[param show_hidden] 会被忽略。\n"
+"[b]注意：[/b]在 macOS 上，原生文件对话框没有标题。\n"
+"[b]注意：[/b]在 macOS 上，沙盒应用程序将保存安全范围的书签，以保留对多个会话中"
+"打开的文件夹的访问权限。请使用 [method OS.get_granted_permissions] 获取已保存"
+"书签的列表。"
+
 msgid ""
 "Forces window manager processing while ignoring all [InputEvent]s. See also "
 "[method process_events].\n"
@@ -40305,6 +42422,15 @@ msgstr ""
 "[code]--headless[/code] [url=$DOCS_URL/tutorials/editor/"
 "command_line_tutorial.html]命令行参数[/url]启动）。"
 
+msgid ""
+"Returns the index of the primary screen.\n"
+"[b]Note:[/b] This method is implemented on Linux/X11, macOS, and Windows. On "
+"other platforms, this method always returns [code]0[/code]."
+msgstr ""
+"返回主屏幕的索引。\n"
+"[b]注意：[/b]该方法在 Linux/X11、macOS、Windows 上实现。该方法在其他平台上始终"
+"返回 [code]0[/code]。"
+
 msgid ""
 "Returns the number of displays available.\n"
 "[b]Note:[/b] This method is implemented on Linux (X11 and Wayland), macOS, "
@@ -41492,6 +43618,39 @@ msgstr ""
 "SCREEN_OF_MAIN_WINDOW]、[constant SCREEN_PRIMARY]、[constant "
 "SCREEN_WITH_MOUSE_FOCUS]、[constant SCREEN_WITH_KEYBOARD_FOCUS]。"
 
+msgid ""
+"Returns the current refresh rate of the specified screen. When V-Sync is "
+"enabled, this returns the maximum framerate the project can effectively "
+"reach. Returns [code]-1.0[/code] if [param screen] is invalid or the "
+"[DisplayServer] fails to find the refresh rate for the specified screen.\n"
+"To fallback to a default refresh rate if the method fails, try:\n"
+"[codeblock]\n"
+"var refresh_rate = DisplayServer.screen_get_refresh_rate()\n"
+"if refresh_rate < 0:\n"
+"\trefresh_rate = 60.0\n"
+"[/codeblock]\n"
+"[b]Note:[/b] One of the following constants can be used as [param screen]: "
+"[constant SCREEN_OF_MAIN_WINDOW], [constant SCREEN_PRIMARY], [constant "
+"SCREEN_WITH_MOUSE_FOCUS], or [constant SCREEN_WITH_KEYBOARD_FOCUS].\n"
+"[b]Note:[/b] This method is implemented on Android, iOS, macOS, Linux (X11 "
+"and Wayland), and Windows. On other platforms, this method always returns "
+"[code]-1.0[/code]."
+msgstr ""
+"返回指定屏幕的当前刷新率。启用垂直同步时，该函数返回项目实际能够达到的最大帧"
+"率。如果 [param screen] 无效或 [DisplayServer] 无法查到指定屏幕的刷新率，则返"
+"回 [code]-1.0[/code]。\n"
+"要在该方法失败时回退至默认刷新率，可以试一试：\n"
+"[codeblock]\n"
+"var refresh_rate = DisplayServer.screen_get_refresh_rate()\n"
+"if refresh_rate < 0:\n"
+"\trefresh_rate = 60.0\n"
+"[/codeblock]\n"
+"[b]注意：[/b]下列常量可以当作 [param screen] 使用：[constant "
+"SCREEN_OF_MAIN_WINDOW]、[constant SCREEN_PRIMARY]、[constant "
+"SCREEN_WITH_MOUSE_FOCUS]、[constant SCREEN_WITH_KEYBOARD_FOCUS]。\n"
+"[b]注意：[/b]该方法在 Android、iOS、macOS、Linux（X11 和 Wayland）、Windows 上"
+"实现。该方法在其他平台上始终返回 [code]-1.0[/code]。"
+
 msgid ""
 "Returns the scale factor of the specified screen by index. Returns [code]1.0[/"
 "code] if [param screen] is invalid.\n"
@@ -41632,6 +43791,17 @@ msgstr ""
 "改用 [method set_icon]。\n"
 "[b]注意：[/b]需要支持 [constant FEATURE_NATIVE_ICON]。"
 
+msgid ""
+"Sets the callback that should be called when the system's theme settings are "
+"changed. [param callable] should accept zero arguments.\n"
+"[b]Note:[/b] This method is implemented on Android, iOS, macOS, Windows, and "
+"Linux (X11/Wayland)."
+msgstr ""
+"设置系统主题设置项更改时应调用的回调函数。[param callable] 应该接受零个参"
+"数。\n"
+"[b]注意：[/b]该方法在 Android、iOS、macOS、Windows 和 Linux（X11/Wayland）上实"
+"现。"
+
 msgid ""
 "Opens system emoji and symbol picker.\n"
 "[b]Note:[/b] This method is implemented on macOS and Windows."
@@ -42069,6 +44239,22 @@ msgid ""
 msgstr ""
 "如果给定的窗口能够最大化（最大化按钮已启用），则返回 [code]true[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if double-clicking on a window's title should "
+"maximize it.\n"
+"[b]Note:[/b] This method is implemented only on macOS."
+msgstr ""
+"如果双击窗口标题应使其最大化，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]这个方法仅在 macOS 上实现。"
+
+msgid ""
+"Returns [code]true[/code] if double-clicking on a window's title should "
+"minimize it.\n"
+"[b]Note:[/b] This method is implemented only on macOS."
+msgstr ""
+"如果双击窗口标题应将其最小化，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]这个方法仅在 macOS 上实现。"
+
 msgid ""
 "Moves the window specified by [param window_id] to the foreground, so that it "
 "is visible over other windows."
@@ -42084,6 +44270,13 @@ msgstr ""
 "任务栏项目。如果该窗口目前持有焦点，则通常是没有可见效果的。实际的行为因操作系"
 "统而异。"
 
+msgid ""
+"Sets the background color of the root window.\n"
+"[b]Note:[/b] This method is implemented only on Android."
+msgstr ""
+"设置根窗口的背景颜色。\n"
+"[b]注意：[/b]该方法仅在 Android 上实现。"
+
 msgid ""
 "Moves the window specified by [param window_id] to the specified [param "
 "screen]. See also [method window_get_current_screen].\n"
@@ -42529,6 +44722,24 @@ msgstr ""
 "示器检测，而不是根据屏幕分辨率和报告的显示器 DPI 进行猜测（由于显示器 EDID 损"
 "坏，这可能不可靠）。[b]Windows、Linux（Wayland）、macOS[/b]"
 
+msgid ""
+"Display server supports changing the window icon (usually displayed in the "
+"top-left corner). [b]Windows, macOS, Linux (X11/Wayland)[/b]\n"
+"[b]Note:[/b] Use on Wayland requires the compositor to implement the "
+"[url=https://wayland.app/protocols/xdg-toplevel-icon-"
+"v1#xdg_toplevel_icon_v1]xdg_toplevel_icon_v1[/url] protocol, which not all "
+"compositors do. See [url=https://wayland.app/protocols/xdg-toplevel-icon-"
+"v1#compositor-support]xdg_toplevel_icon_v1#compositor-support[/url] for more "
+"information on individual compositor support."
+msgstr ""
+"显示服务器支持更改窗口图标（通常显示在左上角）。[b]Windows、macOS、Linux（X11/"
+"Wayland）[/b]\n"
+"[b]注意：[/b]在 Wayland 上使用时需要合成器实现 [url=https://wayland.app/"
+"protocols/xdg-toplevel-icon-v1#xdg_toplevel_icon_v1]xdg_toplevel_icon_v1[/"
+"url] 协议，但并非所有合成器都支持该协议。有关各个合成器的支持情况，请参阅 "
+"[url=https://wayland.app/protocols/xdg-toplevel-icon-v1#compositor-"
+"support]xdg_toplevel_icon_v1#compositor-support[/url]。"
+
 msgid ""
 "Display server supports changing the window icon (usually displayed in the "
 "top-left corner). [b]Windows, macOS[/b]"
@@ -42808,6 +45019,9 @@ msgstr "弹出对话框。"
 msgid "Element is hidden for accessibility tools."
 msgstr "元素对无障碍工具隐藏。"
 
+msgid "Element supports multiple item selection."
+msgstr "元素支持多项选择。"
+
 msgid "Element require user input."
 msgstr "元素要求用户输入。"
 
@@ -43471,6 +45685,9 @@ msgstr ""
 "禁用窗口的最大化按钮。\n"
 "[b]注意：[/b]该标志在 macOS 和 Windows 上实现。"
 
+msgid "Represents the size of the [enum WindowFlags] enum."
+msgstr "代表 [enum WindowFlags] 枚举的大小。"
+
 msgid "Sent when the mouse pointer enters the window."
 msgstr "当鼠标指针进入该窗口时发送。"
 
@@ -43513,6 +45730,14 @@ msgstr ""
 "置或窗口进入/退出全屏模式）。\n"
 "[b]注意：[/b]该标志仅在 macOS 上实现。"
 
+msgid ""
+"Sent when the window has been forcibly closed by the display server. The "
+"window will immediately hide and clean any internal rendering references.\n"
+"[b]Note:[/b] This flag is implemented only on Linux (Wayland)."
+msgstr ""
+"当窗口被显示服务器强制关闭时发送。该窗口应立即隐藏并清理内部的渲染引用。\n"
+"[b]注意：[/b]该标志仅在 Linux（Wayland）上实现。"
+
 msgid "Top-left edge of a window."
 msgstr "窗口左上边缘。"
 
@@ -43689,14 +45914,27 @@ msgstr ""
 "[member ProjectSettings.display/window/stretch/mode]（“canvas_items”模式）和 "
 "[member Viewport.oversampling_override]。"
 
+msgid ""
+"Creates a new [DPITexture] and initializes it by allocating and setting the "
+"SVG data to [param source]."
+msgstr ""
+"新建 [DPITexture]，并通过分配内存并将 SVG 数据设置为 [param source] 来对其进行"
+"初始化。"
+
 msgid ""
 "Returns the [RID] of the texture rasterized to match the oversampling of the "
 "currently drawn canvas item."
 msgstr "返回栅格化后的纹理 [RID]，与当前绘制的画布项的过采样匹配。"
 
+msgid "Returns this SVG texture's source code."
+msgstr "返回该 SVG 纹理的源代码。"
+
 msgid "Resizes the texture to the specified dimensions."
 msgstr "将纹理的大小调整为指定的尺寸。"
 
+msgid "Sets this SVG texture's source code."
+msgstr "设置该 SVG 纹理的源代码。"
+
 msgid ""
 "Texture scale. [code]1.0[/code] is the original SVG size. Higher values "
 "result in a larger image."
@@ -44595,6 +46833,140 @@ msgid ""
 "session becomes inactive)."
 msgstr "当一个远程实例从该会话中分离出来时（即该会话变为非活动状态）发出。"
 
+msgid "Dockable container for the editor."
+msgstr "用于编辑器的可停靠容器。"
+
+msgid ""
+"EditorDock is a [Container] node that can be docked in one of the editor's "
+"dock slots. Docks are added by plugins to provide space for controls related "
+"to an [EditorPlugin]. The editor comes with a few built-in docks, such as the "
+"Scene dock, FileSystem dock, etc.\n"
+"You can add a dock by using [method EditorPlugin.add_dock]. The dock can be "
+"customized by changing its properties.\n"
+"[codeblock]\n"
+"@tool\n"
+"extends EditorPlugin\n"
+"\n"
+"# Dock reference.\n"
+"var dock\n"
+"\n"
+"# Plugin initialization.\n"
+"func _enter_tree():\n"
+"\tdock = EditorDock.new()\n"
+"\tdock.title = \"My Dock\"\n"
+"\tdock.dock_icon = preload(\"./dock_icon.png\")\n"
+"\tdock.default_slot = EditorDock.DOCK_SLOT_RIGHT_UL\n"
+"\tvar dock_content = preload(\"./dock_content.tscn\").instantiate()\n"
+"\tdock.add_child(dock_content)\n"
+"\tadd_dock(dock)\n"
+"\n"
+"# Plugin clean-up.\n"
+"func _exit_tree():\n"
+"\tremove_dock(dock)\n"
+"\tdock.queue_free()\n"
+"\tdock = null\n"
+"[/codeblock]"
+msgstr ""
+"EditorDock 是一个 [Container] 节点，可以停靠在编辑器的一个停靠面板槽中。插件可"
+"以添加停靠面板来为与 [EditorPlugin] 相关的控件提供空间。编辑器自带一些内置的停"
+"靠面板，例如场景面板、文件系统面板等等。\n"
+"可以使用 [method EditorPlugin.add_dock] 添加停靠面板。可以通过更改其属性来自定"
+"义停靠面板。\n"
+"[codeblock]\n"
+"@tool\n"
+"extends EditorPlugin\n"
+"\n"
+"# 停靠面板引用。\n"
+"var dock\n"
+"\n"
+"# 插件实例化。\n"
+"func _enter_tree():\n"
+"\tdock = EditorDock.new()\n"
+"\tdock.title = \"我的停靠面板\"\n"
+"\tdock.dock_icon = preload(\"./dock_icon.png\")\n"
+"\tdock.default_slot = EditorDock.DOCK_SLOT_RIGHT_UL\n"
+"\tvar dock_content = preload(\"./dock_content.tscn\").instantiate()\n"
+"\tdock.add_child(dock_content)\n"
+"\tadd_dock(dock)\n"
+"\n"
+"# 插件清理。\n"
+"func _exit_tree():\n"
+"\tremove_dock(dock)\n"
+"\tdock.queue_free()\n"
+"\tdock = null\n"
+"[/codeblock]"
+
+msgid "Making plugins"
+msgstr "创建插件"
+
+msgid ""
+"Implement this method to handle loading this dock's layout. It's equivalent "
+"to [method EditorPlugin._set_window_layout]. [param section] is a unique "
+"section based on [member layout_key]."
+msgstr ""
+"实现该方法以处理加载该停靠面板的布局。它等效于 [method "
+"EditorPlugin._set_window_layout]。[param section] 是基于 [member layout_key] "
+"的独特节。"
+
+msgid ""
+"Implement this method to handle saving this dock's layout. It's equivalent to "
+"[method EditorPlugin._get_window_layout]. [param section] is a unique section "
+"based on [member layout_key]."
+msgstr ""
+"实现该方法来处理保存该停靠面板的布局。它等价于 [method "
+"EditorPlugin._get_window_layout]。[param section] 是基于 [member layout_key] "
+"的独特节。"
+
+msgid ""
+"Implement this method to handle the layout switching for this dock. [param "
+"layout] is one of the [enum DockLayout] constants.\n"
+"[codeblock]\n"
+"func _update_layout(layout):\n"
+"\tbox_container.vertical = (layout == DOCK_LAYOUT_VERTICAL)\n"
+"[/codeblock]"
+msgstr ""
+"实现该方法以处理该停靠面板的布局切换。[param layout] 是 [enum DockLayout] 枚举"
+"常量之一。\n"
+"[codeblock]\n"
+"func _update_layout(layout):\n"
+"\tbox_container.vertical = (layout == DOCK_LAYOUT_VERTICAL)\n"
+"[/codeblock]"
+
+msgid "Closes the dock, making its tab hidden."
+msgstr "关闭该停靠面板，使其选项卡隐藏。"
+
+msgid ""
+"Focuses the dock's tab (or window if it's floating). If the dock was closed, "
+"it will be opened. If it's a bottom dock, makes the bottom panel visible."
+msgstr ""
+"聚焦停靠面板的选项卡（如果是浮动窗口，则聚焦窗口）。如果该停靠面板已关闭，则会"
+"将其打开。如果是底部停靠面板，则使底部面板可见。"
+
+msgid ""
+"Opens the dock. It will appear in the last used dock slot. If the dock has no "
+"default slot, it will be opened floating.\n"
+"[b]Note:[/b] This does not focus the dock. If you want to open and focus the "
+"dock, use [method make_visible]."
+msgstr ""
+"打开停靠面板。它将显示在上次使用的停靠插槽中。如果该停靠面板没有默认插槽，它将"
+"以浮动窗口的形式打开。\n"
+"[b]注意：[/b]它不会聚焦停靠面板。如果想打开并聚焦停靠面板，请使用 [method "
+"make_visible]。"
+
+msgid ""
+"The available layouts for this dock, as a bitmask. By default, the dock "
+"allows vertical and floating layouts."
+msgstr ""
+"该停靠面板可用的布局，以位掩码形式表示。默认情况下，该停靠面板允许垂直布局和浮"
+"动布局。"
+
+msgid ""
+"If [code]true[/code], the dock can be closed with the Close button in the "
+"context popup. Docks with [member global] enabled are always closable."
+msgstr ""
+"如果为 [code]true[/code]，则可以使用上下文弹出窗口中的“关闭”按钮关闭该停靠面"
+"板。启用 [member global] 的停靠面板始终是可关闭的。"
+
 msgid ""
 "The default dock slot used when adding the dock with [method "
 "EditorPlugin.add_dock].\n"
@@ -44607,6 +46979,96 @@ msgstr ""
 "面板添加后，可被移动至其他槽位，编辑器会自动在不同会话间记住其位置。若移除后重"
 "新添加，该面板将被重置至默认槽位。"
 
+msgid ""
+"The icon for the dock, as a texture. If specified, it will override [member "
+"icon_name]."
+msgstr "该停靠面板的图标，作为纹理。如果已指定，则它将覆盖 [member icon_name]。"
+
+msgid "The shortcut used to open the dock."
+msgstr "用于打开停靠面板的快捷键。"
+
+msgid ""
+"If [code]true[/code], the dock will always display an icon, regardless of "
+"[member EditorSettings.interface/editor/dock_tab_style] or [member "
+"EditorSettings.interface/editor/bottom_dock_tab_style]."
+msgstr ""
+"如果为 [code]true[/code]，则无论 [member EditorSettings.interface/editor/"
+"dock_tab_style] 或 [member EditorSettings.interface/editor/"
+"bottom_dock_tab_style] 的值如何，该停靠面板始终会显示一个图标。"
+
+msgid ""
+"If [code]true[/code], the dock appears in the [b]Editor > Editor Docks[/b] "
+"menu and can be closed. Non-global docks can still be closed using [method "
+"close] or when [member closable] is [code]true[/code]."
+msgstr ""
+"如果为 [code]true[/code]，则停靠面板会出现在[b]编辑器 > 编辑器面板[/b]菜单中，"
+"并且可以被关闭。非全局的停靠面板仍然可以使用 [method close] 关闭，或者当 "
+"[member closable] 为 [code]true[/code] 时关闭。"
+
+msgid ""
+"The icon for the dock, as a name from the [code]EditorIcons[/code] theme type "
+"in the editor theme. You can find the list of available icons [url=https://"
+"godot-editor-icons.github.io/]here[/url]."
+msgstr ""
+"停靠面板的图标，名称取自编辑器主题中的 [code]EditorIcons[/code] 主题类型。可以"
+"在[url=https://godot-editor-icons.github.io/]此处[/url]找到可用的图标列表。"
+
+msgid ""
+"The key representing this dock in the editor's layout file. If empty, the "
+"dock's displayed name will be used instead."
+msgstr ""
+"该键值用于在编辑器的布局文件中表示该停靠面板。如果为空，则将改用该停靠面板的显"
+"示名称。"
+
+msgid ""
+"The title of the dock's tab. If empty, the dock's [member Node.name] will be "
+"used. If the name is auto-generated (contains [code]@[/code]), the first "
+"child's name will be used instead."
+msgstr ""
+"停靠面板选项卡的标题。如果为空，则使用停靠面板的 [member Node.name]。如果名称"
+"是自动生成的（包含 [code]@[/code]），则会改用第一个子节点的名称。"
+
+msgid ""
+"The color of the dock tab's title. If its alpha is [code]0.0[/code], the "
+"default font color will be used."
+msgstr ""
+"停靠面板选项卡标题的颜色。如果其 Alpha 为 [code]0.0[/code]，则将使用默认字体颜"
+"色。"
+
+msgid ""
+"If [code]true[/code], the dock is not automatically opened or closed when "
+"loading an editor layout, only moved. It also can't be opened using a "
+"shortcut. This is meant for docks that are opened and closed in specific "
+"cases, such as when selecting a [TileMap] or [AnimationTree] node."
+msgstr ""
+"如果为 [code]true[/code]，则加载编辑器布局时，停靠面板不会自动打开或关闭，只会"
+"移动。它也无法通过快捷键打开。这是为在特定情况下打开和关闭的停靠面板而设计的，"
+"例如选择 [TileMap] 或 [AnimationTree] 节点时。"
+
+msgid ""
+"Emitted when the dock is closed with the Close button in the context popup, "
+"before it's removed from its parent. See [member closable]."
+msgstr ""
+"当使用上下文弹出菜单中的“关闭”按钮关闭停靠面板时，在它从其父容器中移除之前发"
+"出。见 [member closable]。"
+
+msgid ""
+"Allows placing the dock in the vertical dock slots on either side of the "
+"editor."
+msgstr "允许将停靠面板放置在编辑器两侧的垂直停靠面板插槽中。"
+
+msgid "Allows placing the dock in the editor's bottom panel."
+msgstr "允许将停靠面板放置在编辑器的底部面板中。"
+
+msgid "Allows making the dock floating (opened as a separate window)."
+msgstr "允许将停靠面板设置为浮动（以单独窗口的形式打开）。"
+
+msgid "Allows placing the dock in all available slots."
+msgstr "允许将停靠面板放置在所有可用插槽中。"
+
+msgid "The dock is closed."
+msgstr "停靠面板是关闭的。"
+
 msgid "Dock slot, left side, upper-left (empty in default layout)."
 msgstr "左侧停靠槽的左上（默认布局中为空）。"
 
@@ -44618,6 +47080,16 @@ msgid ""
 "Import docks)."
 msgstr "左侧停靠槽的右上（默认布局中为“场景”和“导入”面板）。"
 
+msgid ""
+"Dock slot, left side, bottom-right (in default layout includes FileSystem and "
+"History docks)."
+msgstr "左侧停靠槽的右下方（默认布局中包含“文件系统”和“历史”面板）。"
+
+msgid ""
+"Dock slot, right side, upper-left (in default layout includes Inspector, "
+"Signal, and Group docks)."
+msgstr "右侧停靠槽的左上方（默认布局中包含“检查器”、“信号”和“分组”面板）。"
+
 msgid "Dock slot, right side, bottom-left (empty in default layout)."
 msgstr "右侧停靠槽的左下（默认布局中为空）。"
 
@@ -44627,6 +47099,9 @@ msgstr "右侧停靠槽的右上（默认布局中为空）。"
 msgid "Dock slot, right side, bottom-right (empty in default layout)."
 msgstr "右侧停靠槽的右下（默认布局中为空）。"
 
+msgid "Bottom panel."
+msgstr "底部面板。"
+
 msgid "Represents the size of the [enum DockSlot] enum."
 msgstr "代表 [enum DockSlot] 枚举的大小。"
 
@@ -44759,6 +47234,19 @@ msgstr ""
 "[Dictionary] 使用文件名作为键（[String]），值为对应的原始数据"
 "（[PackedByteArray]）。"
 
+msgid ""
+"Returns the message category for the message with the given [param index]."
+msgstr "返回给定 [param index] 的消息的消息类别。"
+
+msgid "Returns the number of messages in the export log."
+msgstr "返回导出日志中的消息数。"
+
+msgid "Returns the text for the message with the given [param index]."
+msgstr "返回给定 [param index] 的消息文本。"
+
+msgid "Returns the type for the message with the given [param index]."
+msgstr "返回具有给定 [param index] 的消息的类型。"
+
 msgid ""
 "Returns the name of the export operating system handled by this "
 "[EditorExportPlatform] class, as a friendly string. Possible return values "
@@ -44923,6 +47411,14 @@ msgstr "适用于 Android 的 Gradle 构建"
 msgid "Android plugins documentation index"
 msgstr "Android 插件文档索引"
 
+msgid ""
+"Array of random bytes that the licensing policy uses to create an "
+"[url=https://developer.android.com/google/play/licensing/adding-"
+"licensing#impl-Obfuscator]Obfuscator[/url]."
+msgstr ""
+"许可策略用于创建[url=https://developer.android.com/google/play/licensing/"
+"adding-licensing#impl-Obfuscator]混淆器[/url]的随机字节数组。"
+
 msgid ""
 "If [code]true[/code], project resources are stored in the separate APK "
 "expansion file, instead of the APK.\n"
@@ -45844,6 +48340,20 @@ msgstr ""
 "developer.android.com/reference/android/"
 "Manifest.permission#MANAGE_EXTERNAL_STORAGE]MANAGE_EXTERNAL_STORAGE[/url]。"
 
+msgid ""
+"Allows an application to modify and delete media files on this device or any "
+"connected storage device without user confirmation. Applications must already "
+"be granted the [code]READ_EXTERNAL_STORAGE[/code] or "
+"[code]MANAGE_EXTERNAL_STORAGE[/code] permissions for this permission to take "
+"effect. See [url=https://developer.android.com/reference/android/"
+"Manifest.permission#MANAGE_MEDIA]MANAGE_MEDIA[/url]."
+msgstr ""
+"允许应用程序在未经用户确认的情况下修改和删除该设备或任何已连接的存储设备上的媒"
+"体文件。应用程序必须已获得 [code]READ_EXTERNAL_STORAGE[/code] 或 "
+"[code]MANAGE_EXTERNAL_STORAGE[/code] 权限，该权限才能生效。请参阅 "
+"[url=https://developer.android.com/reference/android/"
+"Manifest.permission#MANAGE_MEDIA]MANAGE_MEDIA[/url]。"
+
 msgid ""
 "See [url=https://developer.android.com/reference/android/"
 "Manifest.permission#MASTER_CLEAR]MASTER_CLEAR[/url]."
@@ -46515,6 +49025,20 @@ msgstr ""
 "要使用 [EditorExportPlatform]，请先使用 [method "
 "EditorPlugin.add_export_platform] 方法注册。"
 
+msgid ""
+"Returns [code]true[/code] if the specified [param preset] is valid and can be "
+"exported. Use [method set_config_error] and [method "
+"set_config_missing_templates] to set error details.\n"
+"Usual implementations call [method _has_valid_export_configuration] and "
+"[method _has_valid_project_configuration] to determine if exporting is "
+"possible."
+msgstr ""
+"如果指定的 [param preset] 有效且可以导出，则返回 [code]true[/code]。使用 "
+"[method set_config_error] 和 [method set_config_missing_templates] 来设置错误"
+"细节。\n"
+"通常的实现会调用 [method _has_valid_export_configuration] 和 [method "
+"_has_valid_project_configuration] 来确定导出是否可行。"
+
 msgid "Called by the editor before platform is unregistered."
 msgstr "注销平台前编辑器会调用该方法。"
 
@@ -46706,6 +49230,10 @@ msgstr "如果导出配置有效，则返回 [code]true[/code]。"
 msgid "Returns [code]true[/code] if project configuration is valid."
 msgstr "如果项目配置有效，则返回 [code]true[/code]。"
 
+msgid ""
+"Initializes the plugin. Called by the editor when platform is registered."
+msgstr "初始化插件。平台注册时由编辑器调用。"
+
 msgid ""
 "Returns [code]true[/code] if specified file is a valid executable (native "
 "executable or script) for the target platform."
@@ -48469,6 +50997,19 @@ msgstr ""
 "config/macos_native_icon]，继而回退至 [member ProjectSettings.application/"
 "config/icon]。"
 
+msgid ""
+"macOS 26 Liquid Glass icon source file. Use [url=https://developer.apple.com/"
+"icon-composer/]Icon Composer[/url] to create Liquid Glass icons.\n"
+"[b]Note:[/b] Supported when exporting from macOS only, Xcode 26+ required.\n"
+"[b]Note:[/b] Liquid Glass icons are supported on macOS 26 only, use [member "
+"application/icon] to set the icon for older macOS versions."
+msgstr ""
+"macOS 26 Liquid Glass 图标源文件。使用 [url=https://developer.apple.com/icon-"
+"composer/]Icon Composer[/url] 创建 Liquid Glass 图标。\n"
+"[b]注意：[/b]仅在从 macOS 导出时支持，需要 Xcode 26 或更高版本。\n"
+"[b]注意：[/b]Liquid Glass 图标仅在 macOS 26 上受支持，请使用 [member "
+"application/icon] 设置旧版 macOS 的图标。"
+
 msgid ""
 "Minimum version of macOS required for this application to run on Apple "
 "Silicon Macs, in the [code]major.minor.patch[/code] or [code]major.minor[/"
@@ -50314,6 +52855,9 @@ msgid ""
 "still be visible but will be read-only."
 msgstr "场景树编辑。如果禁用此功能，场景树面板仍将可见，但将是只读的。"
 
+msgid "Replaced by the Signals and Groups docks."
+msgstr "已被“信号”和“分组”面板取代。"
+
 msgid ""
 "The Node dock. If this feature is disabled, signals and groups won't be "
 "visible and modifiable from the editor."
@@ -50342,6 +52886,16 @@ msgstr ""
 "游戏选项卡，能够在其中嵌入游戏窗口，在游戏窗口中通过点击选择节点。如果禁用此功"
 "能，则不会显示游戏选项卡。"
 
+msgid ""
+"The Signals dock. If this feature is disabled, signals won't be visible and "
+"modifiable from the editor."
+msgstr "信号面板。如果该功能被禁用，则信号将不可见，也不能从编辑器中修改。"
+
+msgid ""
+"The Groups dock. If this feature is disabled, groups won't be visible and "
+"modifiable from the editor."
+msgstr "分组面板。如果该功能被禁用，则分组将不可见，也不能从编辑器中修改。"
+
 msgid "A modified version of [FileDialog] used by the editor."
 msgstr "编辑器使用的 [FileDialog] 的修改版。"
 
@@ -50365,6 +52919,19 @@ msgstr ""
 "[Window] 的 [code]popup_*[/code] 方法中的其中一个，比如 [method "
 "Window.popup_centered_clamped]。"
 
+msgid "This feature is no longer supported."
+msgstr "该功能已不再支持。"
+
+msgid ""
+"This method is kept for compatibility and does nothing. As an alternative, "
+"you can display another dialog after showing the file dialog."
+msgstr ""
+"该方法仅为保持兼容性而保留，不执行任何操作。作为替代方案，你可以在显示文件对话"
+"框后显示另一个对话框。"
+
+msgid "Use [member FileDialog.overwrite_warning_enabled] instead."
+msgstr "请改用 [member FileDialog.overwrite_warning_enabled]。"
+
 msgid ""
 "If [code]true[/code], the [EditorFileDialog] will not warn the user before "
 "overwriting files."
@@ -50810,6 +53377,20 @@ msgstr ""
 msgid "Import plugins"
 msgstr "导入插件"
 
+msgid ""
+"Tells whether this importer can be run in parallel on threads, or, on the "
+"contrary, it's only safe for the editor to call it from the main thread, for "
+"one file at a time.\n"
+"If this importer's implementation is thread-safe and can be run in parallel, "
+"override this with [code]true[/code] to optimize for concurrency.\n"
+"If not overridden, returns [code]false[/code]."
+msgstr ""
+"表示该导入器是否可以在线程上并行运行，或者相反，编辑器只能从主线程调用安全，一"
+"次处理一个文件。\n"
+"如果该导入器的实现是线程安全的并且可以并行运行，请将其覆盖为 [code]true[/"
+"code] 以优化并发性能。\n"
+"如果未覆盖，则返回 [code]false[/code]。"
+
 msgid ""
 "Gets the format version of this importer. Increment this version when making "
 "incompatible changes to the format of the imported resources.\n"
@@ -51357,6 +53938,9 @@ msgstr "返回在 [FileSystemDock] 中查看的当前路径。"
 msgid "Returns the edited (current) scene's root [Node]."
 msgstr "返回正在编辑的（当前）场景的根 [Node]。"
 
+msgid "Returns the language currently used for the editor interface."
+msgstr "返回编辑器界面当前使用的语言。"
+
 msgid ""
 "Returns the editor control responsible for main screen plugins and tools. Use "
 "it with plugins that implement [method EditorPlugin._has_main_screen].\n"
@@ -51442,6 +54026,17 @@ msgstr ""
 "返回编辑器的属性检查器 [EditorInspector]实例。\n"
 "[b]警告：[/b]删除和释放这个节点将使编辑器的一部分失去作用，并可能导致崩溃。"
 
+msgid ""
+"Returns the amount of degrees the 3D editor's rotational snapping is set to."
+msgstr "返回 3D 编辑器旋转吸附功能设置的度数。"
+
+msgid "Returns the amount of units the 3D editor's scale snapping is set to."
+msgstr "返回 3D 编辑器缩放吸附功能设置的单位数量。"
+
+msgid ""
+"Returns the amount of units the 3D editor's translation snapping is set to."
+msgstr "返回 3D 编辑器平移吸附功能设置的单位数量。"
+
 msgid ""
 "Returns an array with references to the root nodes of the currently opened "
 "scenes."
@@ -51510,6 +54105,20 @@ msgstr ""
 "[url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]命令行参数[/url]，"
 "则强制为 [code]true[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if the 3D editor currently has snapping mode "
+"enabled, and [code]false[/code] otherwise."
+msgstr ""
+"如果 3D 编辑器当前启用了吸附模式，则返回 [code]true[/code]；否则返回 "
+"[code]false[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if the object has been marked as edited through "
+"[method set_object_edited]."
+msgstr ""
+"如果对象已通过 [method set_object_edited] 标记为已编辑，则返回 [code]true[/"
+"code]。"
+
 msgid ""
 "Returns [code]true[/code] if a scene is currently being played, [code]false[/"
 "code] otherwise. Paused scenes are considered as being played."
@@ -51548,6 +54157,45 @@ msgstr "播放文件路径所指定的场景。"
 msgid "Plays the main scene."
 msgstr "播放主场景。"
 
+msgid ""
+"Pops up an editor dialog for creating an object.\n"
+"The [param callback] must take a single argument of type [String], which will "
+"contain the type name of the selected object (or the script path of the type, "
+"if the type is created from a script), or be an empty string if no item is "
+"selected.\n"
+"The [param base_type] specifies the base type of objects to display. For "
+"example, if you set this to \"Resource\", all types derived from [Resource] "
+"will display in the create dialog.\n"
+"The [param current_type] will be passed in the search box of the create "
+"dialog, and the specified type can be immediately selected when the dialog "
+"pops up. If the [param current_type] is not derived from [param base_type], "
+"there will be no result of the type in the dialog.\n"
+"The [param dialog_title] allows you to define a custom title for the dialog. "
+"This is useful if you want to accurately hint the usage of the dialog. If the "
+"[param dialog_title] is an empty string, the dialog will use \"Create New "
+"'Base Type'\" as the default title.\n"
+"The [param type_blocklist] contains a list of type names, and the types in "
+"the blocklist will be hidden from the create dialog.\n"
+"[b]Note:[/b] Trying to list the base type in the [param type_blocklist] will "
+"hide all types derived from the base type from the create dialog."
+msgstr ""
+"弹出用于创建对象的编辑器对话框。\n"
+"[param callback] 必须接受一个类型为 [String] 的参数，其中包含所选对象的类型名"
+"称（如果类型是从脚本创建的，则包含该类型的脚本路径），如果没有选择任何项目，则"
+"为空字符串。\n"
+"[param base_type] 指定要显示对象的基础类型。例如设为“Resource”就会在创建对话框"
+"中显示所有派生自 [Resource] 的类型。\n"
+"[param current_type] 会传递给创建对话框中的搜索框，弹出对话框时会立即选中指定"
+"的类型。如果 [param current_type] 不是从 [param base_type] 派生的，则对话框中"
+"不会有该类型对应的结果。\n"
+"[param dialog_title] 可以为对话框自定义标题。适用于需要精准描述对话框用途的场"
+"合。如果 [param dialog_title] 为空字符串，则对话框会使用默认标题“新建‘Base "
+"Type’”。\n"
+"[param type_blocklist] 包含的是类型名称列表，创建对话框会隐藏拦截列表中的类"
+"型。\n"
+"[b]注意：[/b]尝试在 [param type_blocklist] 中列出基类型将会在创建对话框中隐藏"
+"所有从该基类型派生的类型。"
+
 msgid ""
 "Pops up the [param dialog] in the editor UI with [method "
 "Window.popup_exclusive]. The dialog must have no current parent, otherwise "
@@ -51746,6 +54394,26 @@ msgstr ""
 "选项卡的文本完全匹配（默认选项卡为 [code]2D[/code]、[code]3D[/code]、[code "
 "skip-lint]Script[/code]、[code]Game[/code]、[code]AssetLib[/code]）。"
 
+msgid ""
+"If [param edited] is [code]true[/code], the object is marked as edited.\n"
+"[b]Note:[/b] This is primarily used by the editor for [Resource] based "
+"objects to track their modified state. For example, any changes to an open "
+"scene, a resource in the inspector, or an edited script will cause this "
+"method to be called with [code]true[/code]. Saving the scene, script, or "
+"resource resets the edited state by calling this method with [code]false[/"
+"code].\n"
+"[b]Note:[/b] Each call to this method increments the object's edited version. "
+"This is used to track changes in the editor and to trigger when thumbnails "
+"should be regenerated for resources."
+msgstr ""
+"如果 [param edited] 为 [code]true[/code]，则该对象被标记为已编辑。\n"
+"[b]注意：[/b]这主要由编辑器用于基于 [Resource] 的对象，以跟踪其修改状态。例"
+"如，对打开的场景、检查器中的资源或编辑的脚本的任何更改都会导致该方法被调用，并"
+"返回 [code]true[/code]。保存场景、脚本或资源会使用 [code]false[/code] 调用该方"
+"法，从而重置编辑状态。\n"
+"[b]注意：[/b]对该方法的每次调用都会增加该对象的编辑版本号。这用于在编辑器中跟"
+"踪更改，并在需要时触发资源的缩略图重新生成。"
+
 msgid ""
 "Sets the enabled status of a plugin. The plugin name is the same as its "
 "directory name."
@@ -53117,6 +55785,31 @@ msgstr ""
 "当编辑器被要求变为可见时，该函数将被调用。它用于编辑特定对象类型的插件。\n"
 "请记住，你必须手动管理所有编辑器控件的可见性。"
 
+msgid ""
+"This function is called when an individual scene is about to be played in the "
+"editor. [param args] is a list of command line arguments that will be passed "
+"to the new Godot instance, which will be replaced by the list returned by "
+"this function.\n"
+"[codeblock]\n"
+"func _run_scene(scene, args):\n"
+"\targs.append(\"--an-extra-argument\")\n"
+"\treturn args\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Text that is printed in this method will not be visible in the "
+"editor's Output panel unless [member EditorSettings.run/output/"
+"always_clear_output_on_play] is [code]false[/code]."
+msgstr ""
+"当编辑器中即将播放某个场景时，将调用该函数。[param args] 是将被传递给新的 "
+"Godot 实例的命令行参数列表，该列表将被该函数返回的列表替换。\n"
+"[codeblock]\n"
+"func _run_scene(scene, args):\n"
+"\targs.append(\"--an-extra-argument\")\n"
+"\treturn args\n"
+"[/codeblock]\n"
+"[b]注意：[/b]除非 [member EditorSettings.run/output/"
+"always_clear_output_on_play] 为 [code]false[/code]，否则使用该方法打印的文本将"
+"不会显示在编辑器的输出面板中。"
+
 msgid ""
 "This method is called after the editor saves the project or when it's closed. "
 "It asks the plugin to save edited external scenes/resources."
@@ -53179,6 +55872,13 @@ msgstr ""
 "将插件添加至上下文菜单。[param slot] 为添加插件的上下文菜单。\n"
 "[b]注意：[/b]插件的实例只能属于单个上下文菜单槽。"
 
+msgid ""
+"Use [method add_dock] instead, with [member EditorDock.default_slot] set to "
+"[constant DOCK_SLOT_BOTTOM]."
+msgstr ""
+"请改用 [method add_dock]，并将 [member EditorDock.default_slot] 设置为 "
+"[constant DOCK_SLOT_BOTTOM]。"
+
 msgid ""
 "Adds a control to the bottom panel (together with Output, Debug, Animation, "
 "etc.). Returns a reference to a button that is outside the scene tree. It's "
@@ -53213,6 +55913,9 @@ msgstr ""
 "当插件被停用时，请确保使用 [method remove_control_from_container] 移除自定义控"
 "件，并使用 [method Node.queue_free] 将其释放。"
 
+msgid "Use [method add_dock] instead."
+msgstr "请改用 [method add_dock]。"
+
 msgid ""
 "Adds the control to a specific dock slot.\n"
 "If the dock is repositioned and as long as the plugin is active, the editor "
@@ -53468,6 +56171,9 @@ msgstr "从列表中移除自动加载 [param name]。"
 msgid "Removes the specified context menu plugin."
 msgstr "移除指定的上下文菜单插件。"
 
+msgid "Use [method remove_dock] instead."
+msgstr "改用 [method remove_dock]。"
+
 msgid ""
 "Removes the control from the bottom panel. You have to manually [method "
 "Node.queue_free] the control."
@@ -53492,6 +56198,13 @@ msgstr "移除由 [method add_custom_type] 添加的自定义类型。"
 msgid "Removes the debugger plugin with given script from the Debugger."
 msgstr "从调试器中移除带有给定脚本的调试器插件。"
 
+msgid ""
+"Removes [param dock] from the available docks. You should manually call "
+"[method Node.queue_free] to free it."
+msgstr ""
+"从可用停靠面板中移除 [param dock]。你需要手动调用 [method Node.queue_free] 来"
+"释放它。"
+
 msgid "Removes an export platform registered by [method add_export_platform]."
 msgstr "移除由 [method add_export_platform] 注册的导出平台。"
 
@@ -53539,6 +56252,9 @@ msgid ""
 "add_undo_redo_inspector_hook_callback]."
 msgstr "移除由 [method add_undo_redo_inspector_hook_callback] 添加的回调。"
 
+msgid "Use [member EditorDock.dock_icon] instead."
+msgstr "请改用 [member EditorDock.dock_icon]。"
+
 msgid ""
 "Sets the tab icon for the given control in a dock slot. Setting to "
 "[code]null[/code] removes the icon."
@@ -54186,6 +56902,12 @@ msgid ""
 msgstr ""
 "如果你的生成器支持类型为 [param type] 的资源，则返回 [code]true[/code]。"
 
+msgid ""
+"Call from within [method _generate] to request the rendering server draw to "
+"the [param viewport]."
+msgstr ""
+"从 [method _generate] 方法内部调用，以请求渲染服务器绘制到 [param viewport]。"
+
 msgid "A plugin that advanced tooltip for its handled resource type."
 msgstr "为处理的资源类型制作高阶工具提示的插件。"
 
@@ -54652,6 +57374,12 @@ msgstr ""
 msgid "This method is executed by the Editor when [b]File > Run[/b] is used."
 msgstr "当使用[b]文件 > 运行[/b]时，此方法由编辑器执行。"
 
+msgid "Use [method EditorInterface.add_root_node] instead."
+msgstr "请改用 [method EditorInterface.add_root_node]。"
+
+msgid "Use [method EditorInterface.get_edited_scene_root] instead."
+msgstr "请改用 [method EditorInterface.get_edited_scene_root]。"
+
 msgid ""
 "Returns the edited (current) scene's root [Node]. Equivalent of [method "
 "EditorInterface.get_edited_scene_root]."
@@ -54745,6 +57473,73 @@ msgstr "更改选择时发出。"
 msgid "Object that holds the project-independent editor settings."
 msgstr "保存编辑器设置的对象，这些设置与项目无关。"
 
+msgid ""
+"Object that holds the project-independent editor settings. These settings are "
+"generally visible in the [b]Editor > Editor Settings[/b] menu.\n"
+"Property names use slash delimiters to distinguish sections. Setting values "
+"can be of any [Variant] type. It's recommended to use [code]snake_case[/code] "
+"for editor settings to be consistent with the Godot editor itself.\n"
+"Editor settings are saved automatically when changed.\n"
+"Accessing the settings can be done using the following methods, such as:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var settings = EditorInterface.get_editor_settings()\n"
+"# `settings.set(\"some/property\", 10)` also works as this class overrides "
+"`_set()` internally.\n"
+"settings.set_setting(\"some/property\", 10)\n"
+"# `settings.get(\"some/property\")` also works as this class overrides "
+"`_get()` internally.\n"
+"settings.get_setting(\"some/property\")\n"
+"var list_of_settings = settings.get_property_list()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"EditorSettings settings = EditorInterface.Singleton.GetEditorSettings();\n"
+"// `settings.set(\"some/property\", value)` also works as this class "
+"overrides `_set()` internally.\n"
+"settings.SetSetting(\"some/property\", Value);\n"
+"// `settings.get(\"some/property\", value)` also works as this class "
+"overrides `_get()` internally.\n"
+"settings.GetSetting(\"some/property\");\n"
+"Godot.Collections.Array<Godot.Collections.Dictionary> listOfSettings = "
+"settings.GetPropertyList();\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access "
+"the singleton using [method EditorInterface.get_editor_settings]."
+msgstr ""
+"保存编辑器设置的对象，这些设置与项目无关，通常在[b]编辑器 > 编辑器设置[/b]菜单"
+"中可见。\n"
+"属性名称中使用斜线分隔符来区分不同的部分。设置的值可以是任何 [Variant] 类型。"
+"编辑器设置的名称建议使用 [code]snake_case[/code] 形式，与 Godot 编辑器本身保持"
+"一致。\n"
+"编辑器设置在更改时会自动保存。\n"
+"可以使用以下方法访问设置，例如：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var settings = EditorInterface.get_editor_settings()\n"
+"# 也可以写 `settings.set(\"some/property\", 10)`，因为这个类内部覆盖了 "
+"`_set()`。\n"
+"settings.set_setting(\"some/property\", 10)\n"
+"# 也可以写 `settings.get(\"some/property\")` ，因为这个类内部覆盖了 "
+"`_get()`。\n"
+"settings.get_setting(\"some/property\")\n"
+"var list_of_settings = settings.get_property_list()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"EditorSettings settings = EditorInterface.Singleton.GetEditorSettings();\n"
+"// 也可以写 `settings.set(\"some/property\", 10)`，因为这个类内部覆盖了 "
+"`_set()`。\n"
+"settings.SetSetting(\"some/property\", Value);\n"
+"// 也可以写 `settings.get(\"some/property\")` ，因为这个类内部覆盖了 "
+"`_get()`。\n"
+"settings.GetSetting(\"some/property\");\n"
+"Godot.Collections.Array<Godot.Collections.Dictionary> listOfSettings = "
+"settings.GetPropertyList();\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]不能直接实例化这个类。请改用 [method "
+"EditorInterface.get_editor_settings] 访问单例。"
+
 msgid ""
 "Adds a custom property info to a property. The dictionary must contain:\n"
 "- [code]name[/code]: [String] (the name of the property)\n"
@@ -54816,6 +57611,71 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Adds a [param shortcut] whose path is specified by [param path].\n"
+"The [param path] determines how the shortcut is organized and displayed in "
+"the editor's shortcut settings. The path format affects the display as "
+"follows:\n"
+"- [code]\"name\"[/code] (no slash): Creates a category named [code]name[/"
+"code] with the shortcut displayed as [code]name[/code].\n"
+"- [code]\"category/name\"[/code] (single slash): Displays as [code]name[/"
+"code] in the [code]category[/code] section.\n"
+"- [code]\"category/name/extra\"[/code] (multiple slashes): Extra path "
+"components are ignored, so this behaves the same as [code]\"category/name\"[/"
+"code].\n"
+"[b]Note:[/b] Shortcuts are only saved to the editor settings if they differ "
+"from their original/default state. This means empty shortcuts that were "
+"originally empty will not persist between editor sessions and must be re-"
+"added. If a shortcut with the same [param path] already exists, this method "
+"will update it with the new [param shortcut] instead of creating a "
+"duplicate.\n"
+"[codeblock]\n"
+"# Add a custom shortcut for a plugin action.\n"
+"var my_shortcut = Shortcut.new()\n"
+"var input_event = InputEventKey.new()\n"
+"input_event.keycode = KEY_F5\n"
+"input_event.ctrl_pressed = true\n"
+"my_shortcut.events.append(input_event)\n"
+"\n"
+"# This will appear under the \"My Plugin\" category as \"Reload Data\".\n"
+"EditorInterface.get_editor_settings().add_shortcut(\"my_plugin/reload_data\", "
+"my_shortcut)\n"
+"\n"
+"# This will appear under the \"Test Action\" category as \"Test Action\".\n"
+"EditorInterface.get_editor_settings().add_shortcut(\"test_action\", "
+"my_shortcut)\n"
+"[/codeblock]"
+msgstr ""
+"添加一个 [param shortcut]，其路径由 [param path] 指定。\n"
+"[param path] 参数决定了快捷键在编辑器快捷键设置中的组织方式和显示方式。路径格"
+"式对显示效果的影响如下：\n"
+"- [code]\"name\"[/code]（无斜杠）：创建一个名为 [code]name[/code] 的类别，快捷"
+"键也显示为 [code]name[/code]。\n"
+"- [code]\"category/name\"[/code]（单个斜杠）：在 [code]category[/code] 部分中"
+"显示为 [code]name[/code]。\n"
+"- [code]\"category/name/extra\"[/code]（多个斜杠）：额外的路径部分将被忽略，因"
+"此其行为与 [code]\"category/name\"[/code] 相同。\n"
+"[b]注意：[/b]快捷键只有在与原始/默认设置不同时才会保存到编辑器设置中。这意味着"
+"原本为空的快捷键不会在编辑器会话之间保留，必须重新添加。如果已存在具有相同 "
+"[param path] 的快捷键，该方法将使用新的 [param shortcut] 更新该快捷键，而不是"
+"创建副本。\n"
+"[codeblock]\n"
+"# 为插件操作添加自定义快捷键。\n"
+"var my_shortcut = Shortcut.new()\n"
+"var input_event = InputEventKey.new()\n"
+"input_event.keycode = KEY_F5\n"
+"input_event.ctrl_pressed = true\n"
+"my_shortcut.events.append(input_event)\n"
+"\n"
+"# 它将显示在“My Plugin”类别下，名称为“Reload Data”。\n"
+"EditorInterface.get_editor_settings().add_shortcut(\"my_plugin/reload_data\", "
+"my_shortcut)\n"
+"\n"
+"# 它将显示在“Test Action”类别下，名称为“Test Action”。\n"
+"EditorInterface.get_editor_settings().add_shortcut(\"test_action\", "
+"my_shortcut)\n"
+"[/codeblock]"
+
 msgid ""
 "Checks if any settings with the prefix [param setting_prefix] exist in the "
 "set of changed settings. See also [method get_changed_settings]."
@@ -54859,6 +57719,19 @@ msgstr ""
 "返回由 [param name] 指定的设置项的值。等价于在 EditorSettings 实例上使用 "
 "[method Object.get]。"
 
+msgid ""
+"Returns the shortcut specified by [param path]. Tries to find a built-in "
+"action if no shortcut with the provided path is found in the shortcut list. "
+"If found, adds it to the list and returns it, otherwise returns [code]null[/"
+"code]."
+msgstr ""
+"返回由 [param path] 指定的快捷键。如果在快捷键列表中找不到具有指定路径的快捷"
+"键，则尝试查找内置操作。如果找到，则将其添加到列表中并返回它；否则返回 "
+"[code]null[/code]。"
+
+msgid "Returns the list of stored shortcut paths."
+msgstr "返回存储的快捷键路径列表。"
+
 msgid ""
 "Returns [code]true[/code] if the setting specified by [param name] exists, "
 "[code]false[/code] otherwise."
@@ -54866,6 +57739,20 @@ msgstr ""
 "如果由 [param name] 指定的设置项存在则返回 [code]true[/code]，否则返回 "
 "[code]false[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if the shortcut specified by [param path] exists, "
+"[code]false[/code] otherwise."
+msgstr ""
+"如果由 [param path] 指定的快捷键存在则返回 [code]true[/code]，否则返回 "
+"[code]false[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if the shortcut specified by [param path] matches "
+"the event specified by [param event], [code]false[/code] otherwise."
+msgstr ""
+"如果由 [param path] 指定的快捷键与 [param event] 指定的事件匹配则返回 "
+"[code]true[/code]，否则返回 [code]false[/code]。"
+
 msgid ""
 "Marks the passed editor setting as being changed, see [method "
 "get_changed_settings]. Only settings which exist (see [method has_setting]) "
@@ -54874,6 +57761,9 @@ msgstr ""
 "将传入的编辑器设置项标记为已更改，请参阅 [method get_changed_settings]。只有存"
 "在的设置（参见 [method has_setting]）才会被接受。"
 
+msgid "Removes the shortcut specified by [param path]."
+msgstr "移除由 [param path] 指定的快捷键。"
+
 msgid ""
 "Overrides the built-in editor action [param name] with the input actions "
 "defined in [param actions_list]."
@@ -55115,6 +58005,9 @@ msgstr ""
 "如果为 [code]true[/code]，则创建对话框（创建新节点/创建新资源）将以展开其所有"
 "部分开始。否则，部分将被折叠，直到用户开始搜索（这将根据需要自动展开部分）。"
 
+msgid "Delay time for automatic resampling in the 2D editor (in seconds)."
+msgstr "2D 编辑器中自动重采样的延迟时间（单位为秒）。"
+
 msgid ""
 "The \"start\" stop of the color gradient to use for bones in the 2D skeleton "
 "editor."
@@ -55128,7 +58021,7 @@ msgstr "2D 骨架编辑器中，骨骼颜色渐变的“结束”点。"
 msgid ""
 "The color to use for inverse kinematics-enabled bones in the 2D skeleton "
 "editor."
-msgstr "2D 骨架编辑器中，用于启用了反向运动学的骨骼的颜色。"
+msgstr "2D 骨架编辑器中，用于启用了反向动力学的骨骼的颜色。"
 
 msgid ""
 "The outline color to use for non-selected bones in the 2D skeleton editor. "
@@ -55545,6 +58438,13 @@ msgstr ""
 "当通过移动鼠标进行缩放时要使用的鼠标光标移动方向。这不会影响使用鼠标滚轮进行缩"
 "放。"
 
+msgid ""
+"The angle threshold for snapping camera rotation to 45-degree angles while "
+"orbiting with [kbd]Alt[/kbd] held."
+msgstr ""
+"在按住 [kbd]Alt[/kbd] 键进行视轨操作时，将相机旋转角度吸附到 45 度角的角度阈"
+"值。"
+
 msgid ""
 "The inertia to use when orbiting in the 3D editor. Higher values make the "
 "camera start and stop slower, which looks smoother but adds latency."
@@ -55607,6 +58507,11 @@ msgstr ""
 "用于在 3D 编辑器视口中围绕选定节点的选择框的颜色。颜色的 Alpha 通道影响选择框"
 "的不透明度。"
 
+msgid ""
+"If checked, the transform gizmo remains visible during rotation in that "
+"transform mode."
+msgstr "如果勾选，则在相应的变换模式下进行旋转操作时，变换小工具将保持可见。"
+
 msgid ""
 "The color to use for the AABB gizmo that displays the [GeometryInstance3D]'s "
 "custom [AABB]."
@@ -55629,6 +58534,9 @@ msgstr "[FogVolume] 节点对应的 3D 编辑器小工具的颜色。"
 msgid "The 3D editor gizmo color for the [GridMap] grid."
 msgstr "[GridMap] 栅格对应的 3D 编辑器小工具的颜色。"
 
+msgid "The 3D editor gizmo color for the [IKModifier3D] guides."
+msgstr "[IKModifier3D] 引导线对应的 3D 编辑器小工具的颜色。"
+
 msgid ""
 "The color override to use for 3D editor gizmos if the [Node3D] in question is "
 "part of an instantiated scene file (from the perspective of the current "
@@ -55803,6 +58711,14 @@ msgstr ""
 "[AnimationPlayer] 的默认步长模式（秒或 FPS）。选择会记录在场景本地，该选项只用"
 "来确定场景本地状态尚不存在时的默认值。"
 
+msgid ""
+"If [code]true[/code], animation keys and markers are inserted at the current "
+"time in the animation.\n"
+"If [code]false[/code], they are inserted at the mouse cursor's position."
+msgstr ""
+"如果为 [code]true[/code]，则动画关键帧和标记将被插入到动画的当前时间点。\n"
+"如果为 [code]false[/code]，则它们将被插入到鼠标光标所在的位置。"
+
 msgid ""
 "The modulate color to use for \"future\" frames displayed in the animation "
 "editor's onion skinning feature."
@@ -56311,6 +59227,27 @@ msgstr ""
 "[b]注意：[/b]在 Windows 上，该功能可能会与某些防病毒程序产生负面的交互。在这种"
 "情况下，可能必须将其设置为 [code]false[/code]，以防止出现文件锁定问题。"
 
+msgid ""
+"If [code]true[/code], displays a warning toast message when saving a text-"
+"based scene or resource that is larger than 500 KiB on disk. This is "
+"typically caused by binary subresources being embedded as text, which results "
+"in slow and inefficient conversion to text. This in turn impacts scene saving "
+"and loading times.\n"
+"This should usually be resolved by moving the embedded binary subresource to "
+"its own binary resource file ([code].res[/code] extension instead of "
+"[code].tres[/code]). This is the preferred approach. Alternatively, the "
+"entire scene can be saved with the binary [code].scn[/code] format as opposed "
+"to [code].tscn[/code], but this will make it less friendly to version control "
+"systems."
+msgstr ""
+"如果为 [code]true[/code]，则在保存大于 500 KiB 的基于文本的场景或资源时，会显"
+"示警告提示框消息。这通常是由于将二进制子资源嵌入为文本导致的，这会导致转换成文"
+"本的过程缓慢且低效。进而影响场景的保存和加载时间。\n"
+"通常可以通过将嵌入的二进制子资源移动到它自己的二进制资源文件（使用 "
+"[code].res[/code] 扩展名而不是 [code].tres[/code]）来解决该问题。这是推荐的方"
+"法。或者，可以将整个场景保存为二进制 [code].scn[/code] 格式，而不是 "
+"[code].tscn[/code] 格式，但这会使它对版本控制系统不那么友好。"
+
 msgid ""
 "If set to [code]Adaptive[/code], the dialog opens in list view or grid view "
 "depending on the requested type. If set to [code]Last Used[/code], the "
@@ -56342,6 +59279,13 @@ msgstr ""
 "如果为 [code]true[/code]，则结果中包含位于 [code]addons[/code] 文件夹中的文"
 "件。"
 
+msgid ""
+"If [code]true[/code], highlighting a resource will preview it quickly without "
+"confirming the selection or closing the dialog."
+msgstr ""
+"如果为 [code]true[/code]，则高亮显示资源后会快速预览该资源，而无需确认选择或关"
+"闭对话框。"
+
 msgid ""
 "The number of missed query characters allowed in a match when fuzzy matching "
 "is enabled. For example, with the default value of [code]2[/code], [code]"
@@ -56402,6 +59346,51 @@ msgstr ""
 "可以禁用输入累积，以获得稍微更精确/反应灵敏的输入，但代价是增加 CPU 使用率。\n"
 "[b]注意：[/b]输入累积默认是[i]启用的[/i]。"
 
+msgid ""
+"Editor accessibility support mode:\n"
+"- [b]Auto[/b] ([code]0[/code]): Accessibility support is enabled, but updates "
+"to the accessibility information are processed only if an assistive app (such "
+"as a screen reader or a Braille display) is active (default).\n"
+"- [b]Always Active[/b] ([code]1[/code]): Accessibility support is enabled, "
+"and updates to the accessibility information are always processed, regardless "
+"of the status of assistive apps.\n"
+"- [b]Disabled[/b] ([code]2[/code]): Accessibility support is fully disabled.\n"
+"[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights "
+"for Windows, Accessibility Inspector (macOS), or AT-SPI Browser (Linux/BSD), "
+"do not count as assistive apps. To test the editor with these tools, use "
+"[b]Always Active[/b]."
+msgstr ""
+"编辑器无障碍支持模式：\n"
+"- [b]Auto[/b]（[code]0[/code]）：启用无障碍支持，但只会在辅助应用（屏幕阅读"
+"器、盲文显示器等）处于活动状态时才会处理无障碍信息的更新（默认）。\n"
+"- [b]Always Active[/b]（[code]1[/code]）：启用无障碍支持，无论当前辅助应用的状"
+"态都会处理无障碍信息的处理。\n"
+"- [b]Disabled[/b]（[code]2[/code]）：完全禁用无障碍支持。\n"
+"[b]注意：[/b]Accessibility Insights for Windows、Accessibility Inspector"
+"（macOS）、AT-SPI 浏览器（Linux/BSD）等无障碍调试工具不算作辅助应用。要使用这"
+"些工具测试编辑器，请使用 [b]Always Active[/b]。"
+
+msgid ""
+"How to position the Cancel and OK buttons in the editor's [AcceptDialog] "
+"windows. Different platforms have different conventions for this, which can "
+"be overridden through this setting to avoid accidental clicks when using "
+"Godot on multiple platforms.\n"
+"- [b]Auto[/b] follows the platform convention: OK first on Windows, KDE, and "
+"LXQt; Cancel first on macOS and other Linux desktop environments.\n"
+"- [b]Cancel First[/b] forces the Cancel/OK ordering.\n"
+"- [b]OK First[/b] forces the OK/Cancel ordering.\n"
+"To check if these buttons are swapped at runtime, use [method "
+"DisplayServer.get_swap_cancel_ok]."
+msgstr ""
+"如何在编辑器的 [AcceptDialog] 窗口中定位“取消”和“确定”按钮。不同的平台对此有不"
+"同的约定，可以用这个设置来覆盖，以避免在多个平台上使用 Godot 时误触。\n"
+"- [b]Auto[/b] 遵守平台约定：Windows、KDE、LXQt 上“确定”在前；macOS 及其他 "
+"Linux 桌面上“取消”在前。\n"
+"- [b]Cancel First[/b] 强制为取消、确定的顺序。\n"
+"- [b]OK First[/b] 强制为确定、取消的顺序。\n"
+"要检查这些按钮在运行时是否被调换位置，请使用 [method "
+"DisplayServer.get_swap_cancel_ok]。"
+
 msgid ""
 "If [code]true[/code], automatically opens screenshots with the default "
 "program associated to [code].png[/code] files after a screenshot is taken "
@@ -56410,6 +59399,9 @@ msgstr ""
 "如果为 [code]true[/code]，则在使用[b]编辑器 > 截图[/b]动作截取屏幕截图后，使用"
 "与 [code].png[/code] 文件关联的默认程序自动打开该屏幕截图。"
 
+msgid "Tab style of editor docks located at the bottom."
+msgstr "编辑器停靠面板的选项卡位于底部。"
+
 msgid ""
 "The font to use for the script editor. Must be a resource of a [Font] type "
 "such as a [code].ttf[/code] or [code].otf[/code] font file."
@@ -56501,6 +59493,30 @@ msgstr ""
 "如果被设置为 [b]Custom[/b]，则将使用 [member interface/editor/"
 "custom_display_scale] 中的缩放值。"
 
+msgid "Tab style of editor docks, except bottom docks."
+msgstr "除底部外的编辑器停靠面板的选项卡样式。"
+
+msgid ""
+"During a drag-and-drop, this is how long to wait over a UI element before it "
+"triggers a reaction (e.g. a section unfolds to show nested items)."
+msgstr ""
+"在拖放操作过程中，这是在用户界面元素上停留多久才会触发反应（例如，某个部分展开"
+"以显示嵌套项目）。"
+
+msgid ""
+"The language to use for the editor interface. If set to [b]Auto[/b], the "
+"language is automatically determined based on the system locale. See also "
+"[method EditorInterface.get_editor_language].\n"
+"Translations are provided by the community. If you spot a mistake, "
+"[url=https://contributing.godotengine.org/en/latest/documentation/translation/"
+"index.html]contribute to editor translations on Weblate![/url]"
+msgstr ""
+"用于编辑器界面的语言。如果设置为 [b]Auto[/b]，则语言将根据系统区域设置自动确"
+"定。另见 [method EditorInterface.get_editor_language]。\n"
+"翻译由社区提供。如果发现错误，请[url=https://contributing.godotengine.org/en/"
+"latest/documentation/translation/index.html]在 Weblate 上为编辑器翻译作出贡"
+"献！[/url]"
+
 msgid ""
 "The preferred monitor to display the editor. If [b]Auto[/b], the editor will "
 "remember the last screen it was displayed on across multiple sessions."
@@ -56660,6 +59676,28 @@ msgstr ""
 "code] 或 [code].otf[/code] 字体文件。\n"
 "[b]注意：[/b]如果提供的是可变字体，则会使用 700（粗体）作为字重。"
 
+msgid ""
+"List of custom OpenType features to use, if supported by the currently "
+"configured main font. Check what OpenType features are supported by your font "
+"first.\n"
+"The string should follow the OpenType specification, e.g. "
+"[code]ss01,tnum,calt=false[/code]. Microsoft's documentation contains a list "
+"of [url=https://learn.microsoft.com/en-us/typography/opentype/spec/"
+"featurelist]all registered features[/url].\n"
+"[b]Note:[/b] The default editor main font ([url=https://rsms.me/inter]Inter[/"
+"url]) has custom OpenType features in its font file, with [code]ss04[/code] "
+"and [code]tnum[/code] enabled and [code]calt[/code] disabled by default. "
+"Supported features can be found at its website."
+msgstr ""
+"可以使用的自定义 OpenType 功能列表，如果当前配置的主字体支持的话。请先检查你的"
+"字体支持哪些 OpenType 功能。\n"
+"该字符串应遵循 OpenType 规范，例如 [code]ss01,tnum,calt=false[/code]。微软的文"
+"档包含[url=https://learn.microsoft.com/en-us/typography/opentype/spec/"
+"featurelist]所有已注册功能[/url]的列表。\n"
+"[b]注意：[/b]默认编辑器主字体（[url=https://rsms.me/inter]Inter[/url]）在其字"
+"体文件中包含自定义 OpenType 功能，默认情况下启用 [code]ss04[/code] 和 "
+"[code]tnum[/code]，禁用 [code]calt[/code]。支持的功能可在其网站上找到。"
+
 msgid "The size of the font in the editor interface."
 msgstr "编辑器界面中字体的大小。"
 
@@ -56972,6 +60010,11 @@ msgstr ""
 "行。显示为一行更加紧凑，但如果不将检查器横向扩大，对较大数值的显示和编辑就会更"
 "加困难。"
 
+msgid ""
+"Base speed for increasing/decreasing integer values by dragging them in the "
+"inspector."
+msgstr "在检查器中拖动整数值以增加/减少数值时的基本速度。"
+
 msgid ""
 "The number of [Array] or [Dictionary] items to display on each \"page\" in "
 "the inspector. Higher values allow viewing more values per page, but take "
@@ -57055,6 +60098,12 @@ msgstr ""
 "如果为 [code]true[/code]，则编辑器在退出时会保存浮动面板的位置、大小、屏幕。下"
 "次启动时，会尽可能让浮动面板在保存的位置、大小、屏幕处保持浮动。"
 
+msgid ""
+"If [code]true[/code], the FileSystem dock will automatically navigate to the "
+"currently selected scene tab."
+msgstr ""
+"如果为 [code]true[/code]，则文件系统停靠面板将自动导航到当前选定的场景选项卡。"
+
 msgid ""
 "Controls when the Close (X) button is displayed on scene tabs at the top of "
 "the editor."
@@ -57122,6 +60171,9 @@ msgstr ""
 msgid "The border size to use for interface elements (in pixels)."
 msgstr "界面元素的边框大小（单位为像素）。"
 
+msgid "The editor color preset to use."
+msgstr "要使用的编辑器颜色预设。"
+
 msgid ""
 "The contrast factor to use when deriving the editor theme's base color (see "
 "[member interface/theme/base_color]). When using a positive values, the "
@@ -57155,6 +60207,18 @@ msgstr ""
 "如果 [code]true[/code]，则在编辑器中的交互式 UI 元素周围绘制额外的边框。使用"
 "[b]Black (OLED)[/b]主题预设时该项会自动启用，因为该主题预设使用全黑背景。"
 
+msgid ""
+"What relationship lines to draw in the editor's [Tree]-based GUIs (such as "
+"the Scene tree dock).\n"
+"- [b]None[/b] will make it so that no relationship lines are drawn.\n"
+"- [b]Selected Only[/b] will only draw them for selected items.\n"
+"- [b]All[/b] will always draw them for all items."
+msgstr ""
+"如何在编辑器的基于 [Tree] 的图形用户界面（例如场景树停靠面板）中绘制关系线。\n"
+"- [b]None[/b]：不绘制任何关系线。\n"
+"- [b]Selected Only[/b]：仅为选中的项目绘制关系线。\n"
+"- [b]All[/b]：始终为所有项目绘制关系线。"
+
 msgid ""
 "If [code]true[/code], the editor theme preset will attempt to automatically "
 "match the system theme."
@@ -57204,6 +60268,9 @@ msgstr ""
 "预设要使用的编辑器主题间距。另见 [member interface/theme/base_spacing] 和 "
 "[member interface/theme/additional_spacing]。"
 
+msgid "The editor theme style to use."
+msgstr "要使用的编辑器主题样式。"
+
 msgid ""
 "If [code]true[/code], set accent color based on system settings.\n"
 "[b]Note:[/b] This setting is only effective on Windows, MacOS, and Android."
@@ -57226,6 +60293,16 @@ msgstr ""
 "如果为 [code]true[/code]，则在触摸屏设备上启用两指平移和缩放手势。\n"
 "[b]注意：[/b]在触摸屏设备上默认为 [code]true[/code]。"
 
+msgid ""
+"If [code]true[/code], increases the scrollbar touch area, enables a larger "
+"dragger for split containers, and increases PopupMenu vertical separation to "
+"improve usability on touchscreen devices.\n"
+"[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices."
+msgstr ""
+"如果为 [code]true[/code]，则增加滚动条触摸区域，为拆分容器启用更大的拖动器，并"
+"增加弹出菜单的垂直间距，以提高在触摸屏设备上的可用性。\n"
+"[b]注意：[/b]在触摸屏设备上默认为 [code]true[/code]。"
+
 msgid ""
 "Specify the multiplier to apply to the scale for the editor gizmo handles to "
 "improve usability on touchscreen devices.\n"
@@ -57267,6 +60344,20 @@ msgstr ""
 "[code]4.4.stable[/code]。\n"
 "所有更新模式均会忽略主版本号不同的构建（例如 Godot 4 -> Godot 5）。"
 
+msgid ""
+"Determines whether online features, such as the Asset Library or update "
+"checks, are enabled in the editor. If this is a privacy concern, disabling "
+"these online features prevents the editor from making HTTP requests to the "
+"Godot website or third-party platforms hosting assets from the Asset "
+"Library.\n"
+"Editor plugins and tool scripts are recommended to follow this setting. "
+"However, Godot can't prevent them from violating this rule."
+msgstr ""
+"决定编辑器中是否启用资产库、更新检查等在线功能。如果这涉及到隐私问题，禁用这些"
+"在线功能可以防止编辑器向 Godot 网站和托管资产库中资产的第三方平台发出 HTTP 请"
+"求。\n"
+"建议编辑器插件和工具脚本遵循该设置。但是 Godot 无法阻止违反该规则的行为。"
+
 msgid ""
 "The address to listen to when starting the remote debugger. This can be set "
 "to this device's local IP address to allow external clients to connect to the "
@@ -57309,6 +60400,16 @@ msgstr ""
 "[b]注意：[/b]Godot 目前不会自动使用系统代理设置，所以如果需要，必须在此处手动"
 "输入。"
 
+msgid ""
+"The TLS certificate bundle to use for HTTP requests made within the editor "
+"(e.g. from the AssetLib tab). If left empty, the [url=https://github.com/"
+"godotengine/godot/blob/master/thirdparty/certs/ca-bundle.crt]included Mozilla "
+"certificate bundle[/url] will be used."
+msgstr ""
+"用于在编辑器中发出的 HTTP 请求（例如来自 AssetLib 选项卡）的 TLS 证书包。如果"
+"留空，将使用[url=https://github.com/godotengine/godot/blob/master/thirdparty/"
+"certs/ca-bundle.crt]包含的 Mozilla 证书包[/url]。"
+
 msgid ""
 "If [code]true[/code], enable TLSv1.3 negotiation.\n"
 "[b]Note:[/b] Only supported when using Mbed TLS 3.0 or later (Linux "
@@ -57327,6 +60428,15 @@ msgstr ""
 "创建新项目时默认勾选的渲染器类型。可接受的字符串"
 "是“forward_plus”“mobile”或“gl_compatibility”。"
 
+msgid ""
+"Directory naming convention for the project manager. Options are \"No "
+"Convention\" (project name is directory name), \"kebab-case\" (default), "
+"\"snake_case\", \"camelCase\", \"PascalCase\", or \"Title Case\"."
+msgstr ""
+"项目管理器的目录命名规则。选项有 “No Convention”（使用项目名称作为目录名"
+"称）、“kebab-case”（默认）、“snake_case”、“camelCase”、“PascalCase”、和 "
+"“Title Case”。"
+
 msgid ""
 "The sorting order to use in the project manager. When changing the sorting "
 "order in the project manager, this setting is set permanently in the editor "
@@ -57750,6 +60860,13 @@ msgstr ""
 "左键点击或中键点击时一样）。如果为 [code]false[/code]，文本光标只会在左键点击"
 "或中键点击某个位置时移动。"
 
+msgid ""
+"If [code]true[/code], opens the script editor when connecting a signal to an "
+"existing script method from the Signals dock."
+msgstr ""
+"如果为 [code]true[/code]，则在从信号面板将信号连接到现有脚本方法时打开脚本编辑"
+"器。"
+
 msgid "If [code]true[/code], allows scrolling past the end of the file."
 msgstr "如果为 [code]true[/code]，则允许滚动越过文件的末尾。"
 
@@ -57844,6 +60961,27 @@ msgstr ""
 "如果为 [code]true[/code]，则代码自动补全在合适时使用 [StringName] 而不是 "
 "[String]。"
 
+msgid ""
+"If [code]true[/code], automatically adds [url=$DOCS_URL/tutorials/scripting/"
+"gdscript/static_typing.html]GDScript static typing[/url] (such as [code]-> "
+"void[/code] and [code]: int[/code]) in many situations where it's possible "
+"to, including when:\n"
+"- Accepting a suggestion from code autocompletion;\n"
+"- Creating a new script from a template;\n"
+"- Connecting signals from the Signals dock;\n"
+"- Creating variables prefixed with [annotation @GDScript.@onready], by "
+"dropping nodes from the Scene dock into the script editor while holding "
+"[kbd]Ctrl[/kbd]."
+msgstr ""
+"如果为 [code]true[/code]，则会在可能的情况下自动添加 [url=$DOCS_URL/tutorials/"
+"scripting/gdscript/static_typing.html]GDScript 静态类型[/url]（例如 [code]-> "
+"void[/code] 和 [code]: int[/code]），包括：\n"
+"- 接受代码补全建议；\n"
+"- 根据模板新建脚本；\n"
+"- 在“信号”面板连接信号；\n"
+"- 按住 [kbd]Ctrl[/kbd] 将“场景”面板中的节点拖放进脚本编辑器中创建 [annotation "
+"@GDScript.@onready] 变量。"
+
 msgid ""
 "If [code]true[/code], automatically inserts the matching closing brace when "
 "the opening brace is inserted by typing or autocompletion. Also automatically "
@@ -58017,6 +61155,14 @@ msgstr ""
 "[code]true[/code]，最多可以突出显示多少个脚本名称。超过此值的脚本将使用默认字"
 "体颜色。"
 
+msgid ""
+"If [code]true[/code], displays an overview of the current script's member "
+"functions at the left of the script editor. See also [member text_editor/"
+"script_list/sort_members_outline_alphabetically]."
+msgstr ""
+"如果为 [code]true[/code]，则在脚本编辑器的左侧显示当前脚本的成员函数的概览。另"
+"见 [member text_editor/script_list/sort_members_outline_alphabetically]。"
+
 msgid ""
 "If [code]true[/code], sorts the members outline (located at the left of the "
 "script editor) using alphabetical order. If [code]false[/code], sorts the "
@@ -58349,6 +61495,21 @@ msgstr "脚本编辑器中，当前选中文本的背景色。"
 msgid "The script editor's color for strings (single-line and multi-line)."
 msgstr "脚本编辑器中，字符串的颜色（单行和多行）。"
 
+msgid ""
+"The script editor's color for string placeholders, such as [code]%s[/code] "
+"and [code]{_}[/code]. Refer to the [url=$DOCS_URL/tutorials/scripting/"
+"gdscript/gdscript_format_string.html]GDScript format strings documentation[/"
+"url] for more details.\n"
+"[b]Note:[/b] Only the default [code]{_}[/code] placeholder patterns are "
+"highlighted for the [method String.format] method. Custom patterns still "
+"appear as plain strings."
+msgstr ""
+"脚本编辑器中用于如 [code]%s[/code] 和 [code]{_}[/code] 等字符串占位符的颜色。"
+"更多详情请参阅 [url=$DOCS_URL/tutorials/scripting/gdscript/"
+"gdscript_format_string.html]GDScript 格式化字符串文档[/url]。\n"
+"[b]注意：[/b]只有默认的 [code]{_}[/code] 占位符符号在使用 [method "
+"String.format] 方法时会被高亮显示。自定义符号仍然会显示为普通字符串。"
+
 msgid ""
 "The script editor's color for operators ([code]( ) [ ] { } + - * /[/"
 "code], ...)."
@@ -58429,9 +61590,34 @@ msgstr ""
 "上/向下箭头，类似于 [SpinBox]。如果 [member Range.step] 值不是 [code]1[/"
 "code]，则会显示一个滑块。"
 
+msgid "The state in which the control used to manipulate the value will be."
+msgstr "用于操纵值的控件将处于的状态。"
+
+msgid ""
+"If [code]true[/code], the [EditorSpinSlider] is considered to be editing an "
+"integer value. If [code]false[/code], the [EditorSpinSlider] is considered to "
+"be editing a floating-point value. This is used to determine whether a slider "
+"should be drawn by default. The slider is only drawn for floats; integers use "
+"up-down arrows similar to [SpinBox] instead, unless [member control_state] is "
+"set to [constant CONTROL_STATE_PREFER_SLIDER]. It will also use [member "
+"EditorSettings.interface/inspector/integer_drag_speed] instead of [member "
+"EditorSettings.interface/inspector/float_drag_speed] if the slider is "
+"available."
+msgstr ""
+"如果为 [code]true[/code]，则 [EditorSpinSlider] 会认为正在编辑整数值。如果为 "
+"[code]false[/code]，则 [EditorSpinSlider] 会认为正在编辑浮点数值。默认用于确定"
+"是否绘制滑杆。只有浮点数才会绘制滑杆；整数使用的是类似于 [SpinBox] 的上下箭"
+"头，除非 [member control_state] 被设置为 [constant "
+"CONTROL_STATE_PREFER_SLIDER]。如果滑杆可用，它还将使用 [member "
+"EditorSettings.interface/inspector/integer_drag_speed] 而非 [member "
+"EditorSettings.interface/inspector/float_drag_speed]。"
+
 msgid "If [code]true[/code], the slider will not draw background."
 msgstr "如果为 [code]true[/code]，则滑块不会绘制背景。"
 
+msgid "Use [member control_state] instead."
+msgstr "请改用 [member control_state]。"
+
 msgid "If [code]true[/code], the slider and up/down arrows are hidden."
 msgstr "如果为 [code]true[/code]，则隐藏滑块和向上/向下箭头。"
 
@@ -58464,6 +61650,21 @@ msgstr "值表单获得焦点时发出。"
 msgid "Emitted when the value form loses focus."
 msgstr "值表单丢失焦点时发出。"
 
+msgid ""
+"The type of control used will depend on the value of [member "
+"editing_integer]. Up-down arrows if [code]true[/code], a slider if "
+"[code]false[/code]."
+msgstr ""
+"使用的控件类型取决于 [member editing_integer] 的值。如果为 [code]true[/code]，"
+"则使用上下箭头；如果为 [code]false[/code]，则使用滑杆。"
+
+msgid ""
+"A slider will always be used, even if [member editing_integer] is enabled."
+msgstr "即使启用了 [member editing_integer]，也会始终使用滑杆。"
+
+msgid "Neither the up-down arrows nor the slider will be shown."
+msgstr "向上向下箭头和滑杆都不会显示。"
+
 msgid "Single texture representing both the up and down buttons."
 msgstr "代表上下按钮的单张纹理。"
 
@@ -58501,6 +61702,18 @@ msgstr "虚函数，可以在重写后返回所支持的语言名称。"
 msgid "Manages toast notifications within the editor."
 msgstr "管理编辑器中的 Toast 消息框通知。"
 
+msgid ""
+"This object manages the functionality and display of toast notifications "
+"within the editor, ensuring immediate and informative alerts are presented to "
+"the user.\n"
+"[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access "
+"the singleton using [method EditorInterface.get_editor_toaster]."
+msgstr ""
+"该对象管理编辑器内 Toast 通知的功能和显示，确保立即向用户提供信息丰富的警"
+"报。\n"
+"[b]注意：[/b]这个类不应该直接实例化。请改用 [method "
+"EditorInterface.get_editor_toaster] 访问单例。"
+
 msgid "Pushes a toast notification to the editor for display."
 msgstr "将需要显示的 Toast 通知推送给编辑器。"
 
@@ -58522,6 +61735,237 @@ msgstr ""
 "用于添加自定义解析器，以从自定义文件（.csv、.json等）提取已翻译的字符串的插"
 "件。"
 
+msgid ""
+"[EditorTranslationParserPlugin] is invoked when a file is being parsed to "
+"extract strings that require translation. To define the parsing and string "
+"extraction logic, override the [method _parse_file] method in script.\n"
+"The return value should be an [Array] of [PackedStringArray]s, one for each "
+"extracted translatable string. Each entry should contain [code][msgid, "
+"msgctxt, msgid_plural, comment, source_line][/code], where all except "
+"[code]msgid[/code] are optional. Empty strings will be ignored.\n"
+"The extracted strings will be written into a translation template file "
+"selected by user under \"Template Generation\" in \"Localization\" tab in "
+"\"Project Settings\" menu.\n"
+"Below shows an example of a custom parser that extracts strings from a CSV "
+"file to write into a template.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"\tvar ret: Array[PackedStringArray] = []\n"
+"\tvar file = FileAccess.open(path, FileAccess.READ)\n"
+"\tvar text = file.get_as_text()\n"
+"\tvar split_strs = text.split(\",\", false)\n"
+"\tfor s in split_strs:\n"
+"\t\tret.append(PackedStringArray([s]))\n"
+"\t\t#print(\"Extracted string: \" + s)\n"
+"\n"
+"\treturn ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"\tpublic override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<string[]> ret;\n"
+"\t\tusing var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"\t\tstring text = file.GetAsText();\n"
+"\t\tstring[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"\t\tforeach (string s in splitStrs)\n"
+"\t\t{\n"
+"\t\t\tret.Add([s]);\n"
+"\t\t\t//GD.Print($\"Extracted string: {s}\");\n"
+"\t\t}\n"
+"\t\treturn ret;\n"
+"\t}\n"
+"\n"
+"\tpublic override string[] _GetRecognizedExtensions()\n"
+"\t{\n"
+"\t\treturn [\"csv\"];\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To add a translatable string associated with a context, plural, comment, or "
+"source line:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", comment \"test 1 comment\", and source line "
+"\"7\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\", \"7\"]))\n"
+"# This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", comment \"test 1 comment\", and source line "
+"\"7\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\", "
+"\"7\"]);\n"
+"// This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you override parsing logic for standard script types "
+"(GDScript, C#, etc.), it would be better to load the [code]path[/code] "
+"argument using [method ResourceLoader.load]. This is because built-in scripts "
+"are loaded as [Resource] type, not [FileAccess] type. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"\tvar res = ResourceLoader.load(path, \"Script\")\n"
+"\tvar text = res.source_code\n"
+"\t# Parsing logic.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"\tvar res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"\tstring text = res.SourceCode;\n"
+"\t// Parsing logic.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"\treturn [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To use [EditorTranslationParserPlugin], register it using the [method "
+"EditorPlugin.add_translation_parser_plugin] method first."
+msgstr ""
+"解析文件提取需要翻译的字符串时会调用 [EditorTranslationParserPlugin]。要定义文"
+"件解析和字符串提取逻辑，请在脚本中覆盖 [method _parse_file] 方法。\n"
+"返回值应当为元素为 [PackedStringArray] 的 [Array]，每个元素对应一个提取到的可"
+"翻译字符串。每个条目都应该包含 [code][msgid, msgctxt, msgid_plural, comment, "
+"source_line][/code]，除 [code]msgid[/code] 外都是可选的。空字符串会被忽略。\n"
+"提取到的字符串会被写入到一个翻译模板文件中，该文件由用户在“项目设置”菜单“本地"
+"化”选项卡的“模板生成”中选择。\n"
+"下面是一个自定义解析器的示例，会从 CSV 文件中提取字符串，写入到模板中。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"\tvar ret: Array[PackedStringArray] = []\n"
+"\tvar file = FileAccess.open(path, FileAccess.READ)\n"
+"\tvar text = file.get_as_text()\n"
+"\tvar split_strs = text.split(\",\", false)\n"
+"\tfor s in split_strs:\n"
+"\t\tret.append(PackedStringArray([s]))\n"
+"\t\t#print(\"提取到字符串：\" + s)\n"
+"\n"
+"\treturn ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"\tpublic override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<string[]> ret;\n"
+"\t\tusing var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"\t\tstring text = file.GetAsText();\n"
+"\t\tstring[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"\t\tforeach (string s in splitStrs)\n"
+"\t\t{\n"
+"\t\t\tret.Add([s]);\n"
+"\t\t\t//GD.Print($\"提取到字符串：{s}\");\n"
+"\t\t}\n"
+"\t\treturn ret;\n"
+"\t}\n"
+"\n"
+"\tpublic override string[] _GetRecognizedExtensions()\n"
+"\t{\n"
+"\t\treturn [\"csv\"];\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"添加带有上下文、复数形式、注释、源行号的可翻译字符串：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# 添加 msgid 为“Test 1”、msgctxt 为“context”、msgid_plural 为“test 1 "
+"plurals”、注释为“test 1 comment”、源行号为“7”的消息。\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\", \"7\"]))\n"
+"# 添加 msgid 为“A test without context”、msgid_plural 为“plurals”的消息。\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# 添加 msgid 为“Only with context”、msgctxt 为“a friendly context”的消息。\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// 添加 msgid 为“Test 1”、msgctxt 为“context”、msgid_plural 为“test 1 "
+"plurals”、注释为“test 1 comment”、源行号为“7”的消息。\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\", "
+"\"7\"]);\n"
+"// 添加 msgid 为“A test without context”、msgid_plural 为“plurals”的消息。\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// 添加 msgid 为“Only with context”、msgctxt 为“a friendly context”的消息。\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]如果你覆盖了标准脚本类型（GDScript、C# 等）的解析逻辑，最好使用 "
+"[method ResourceLoader.load] 来加载 [code]path[/code] 参数。因为内置脚本会以 "
+"[Resource] 类型的形式加载，而非 [FileAccess] 类型。例如：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"\tvar res = ResourceLoader.load(path, \"Script\")\n"
+"\tvar text = res.source_code\n"
+"\t# 解析逻辑。\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"\treturn [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"\tvar res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"\tstring text = res.SourceCode;\n"
+"\t// 解析逻辑。\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"\treturn [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"要使用 [EditorTranslationParserPlugin]，请先使用 [method "
+"EditorPlugin.add_translation_parser_plugin] 方法注册。"
+
 msgid ""
 "Gets the list of file extensions to associate with this parser, e.g. [code]"
 "[\"csv\"][/code]."
@@ -58626,6 +62070,34 @@ msgstr ""
 "为“撤消”注册一个引用，如果“撤消”历史丢失，则该引用将被擦除。这主要用于通过“做”"
 "调用（而不是“撤销”调用！）而移除的节点。"
 
+msgid ""
+"Clears the given undo history. You can clear history for a specific scene, "
+"global history, or for all histories at once (except [constant "
+"REMOTE_HISTORY]) if [param id] is [constant INVALID_HISTORY].\n"
+"If [param increase_version] is [code]true[/code], the undo history version "
+"will be increased, marking it as unsaved. Useful for operations that modify "
+"the scene, but don't support undo.\n"
+"[codeblock]\n"
+"var scene_root = EditorInterface.get_edited_scene_root()\n"
+"var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"undo_redo.clear_history(undo_redo.get_object_history_id(scene_root))\n"
+"[/codeblock]\n"
+"[b]Note:[/b] If you want to mark an edited scene as unsaved without clearing "
+"its history, use [method EditorInterface.mark_scene_as_unsaved] instead."
+msgstr ""
+"清空给定的撤销历史。你可以只清空特定场景的历史、全局历史、或者如果 [param id] "
+"为 [constant INVALID_HISTORY]，则可以一次清除所有历史记录（[constant "
+"REMOTE_HISTORY] 除外）。\n"
+"如果 [param increase_version] 为 [code]true[/code]，则会增加撤销历史版本并将其"
+"设为未保存。适合会修改场景但不支持撤销的操作。\n"
+"[codeblock]\n"
+"var scene_root = EditorInterface.get_edited_scene_root()\n"
+"var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"undo_redo.clear_history(undo_redo.get_object_history_id(scene_root))\n"
+"[/codeblock]\n"
+"[b]注意：[/b]如果想要将编辑过的场景标记为未保存且不清除历史记录，请改用 "
+"[method EditorInterface.mark_scene_as_unsaved]。"
+
 msgid ""
 "Commits the action. If [param execute] is [code]true[/code] (default), all "
 "\"do\" methods/properties are called/set when this function is called."
@@ -60291,6 +63763,52 @@ msgstr ""
 "移除在 [param name] 下注册的单例。该单例对象[i]不会[/i]被释放。仅适用于使用 "
 "[method register_singleton] 注册的用户定义的单例。"
 
+msgid ""
+"The maximum number of frames that can be rendered every second (FPS). A value "
+"of [code]0[/code] means the framerate is uncapped.\n"
+"Limiting the FPS can be useful to reduce the host machine's power "
+"consumption, which reduces heat, noise emissions, and improves battery life.\n"
+"If [member ProjectSettings.display/window/vsync/vsync_mode] is [b]Enabled[/b] "
+"or [b]Adaptive[/b], the setting takes precedence and the max FPS number "
+"cannot exceed the monitor's refresh rate. See also [method "
+"DisplayServer.screen_get_refresh_rate].\n"
+"If [member ProjectSettings.display/window/vsync/vsync_mode] is [b]Enabled[/"
+"b], on monitors with variable refresh rate enabled (G-Sync/FreeSync), using "
+"an FPS limit a few frames lower than the monitor's refresh rate will "
+"[url=https://blurbusters.com/howto-low-lag-vsync-on/]reduce input lag while "
+"avoiding tearing[/url]. At higher refresh rates, the difference between the "
+"FPS limit and the monitor refresh rate should be increased to ensure frames "
+"to account for timing inaccuracies. The optimal formula for the FPS limit "
+"value in this scenario is [code]r - (r * r) / 3600.0[/code], where [code]r[/"
+"code] is the monitor's refresh rate.\n"
+"[b]Note:[/b] The actual number of frames per second may still be below this "
+"value if the CPU or GPU cannot keep up with the project's logic and "
+"rendering.\n"
+"[b]Note:[/b] If [member ProjectSettings.display/window/vsync/vsync_mode] is "
+"[b]Disabled[/b], limiting the FPS to a high value that can be consistently "
+"reached on the system can reduce input lag compared to an uncapped framerate. "
+"Since this works by ensuring the GPU load is lower than 100%, this latency "
+"reduction is only effective in GPU-bottlenecked scenarios, not CPU-"
+"bottlenecked scenarios."
+msgstr ""
+"每秒可渲染的最大帧数（FPS）。值为 [code]0[/code] 表示帧速率不受限制。\n"
+"限制 FPS 会对降低主机功耗很有帮助，可以减少热量、噪音排放并延长电池寿命。\n"
+"如果 [member ProjectSettings.display/window/vsync/vsync_mode] 为 [b]Enabled[/"
+"b] 或 [b]Adaptive[/b] ，则该设置将被优先考虑，并且最大 FPS 数不能超过显示器的"
+"刷新率。另见 [method DisplayServer.screen_get_refresh_rate]。\n"
+"如果 [member ProjectSettings.display/window/vsync/vsync_mode] 为 [b]Enabled[/"
+"b]，在启用了可变刷新率（G-Sync/FreeSync）的显示器上，使用比显示器刷新率低几帧"
+"的 FPS 限制，将[url=https://blurbusters.com/howto-low-lag-vsync-on/]减少输入延"
+"迟，同时可以避免撕裂[/url]。在较高的刷新率下，应增大帧率限制与显示器刷新率之间"
+"的差值，以确保有足够的帧数来弥补计时误差。在这种情况下，帧率限制值的最佳公式"
+"为 [code]r - (r * r) / 3600.0[/code]，其中 [code]r[/code] 是显示器的刷新率。\n"
+"[b]注意：[/b]如果CPU或GPU跟不上项目的逻辑和渲染，则每秒的实际帧数可能仍低于该"
+"值。\n"
+"[b]注意：[/b]如果 [member ProjectSettings.display/window/vsync/vsync_mode] 为 "
+"[b]Disabled[/b]，则与无上限的帧率相比，将 FPS 限制为可以在系统上持续达到的较高"
+"值，可以减少输入滞后。由于这是通过确保 GPU 负载低于 100% 来实现的，因此这种延"
+"迟减少仅在 GPU 瓶颈场景中有效，在 CPU 瓶颈场景中无效。"
+
 msgid ""
 "The maximum number of physics steps that can be simulated each rendered "
 "frame.\n"
@@ -60330,6 +63848,50 @@ msgstr ""
 "[b]注意：[/b]当使用自定义物理插值解决方案或在网络游戏中时，建议通过将该属性设"
 "置为 [code]0[/code] 来禁用物理抖动修复。"
 
+msgid ""
+"The number of fixed iterations per second. This controls how often physics "
+"simulation and the [method Node._physics_process] method are run.\n"
+"CPU usage scales approximately with the physics tick rate. However, at very "
+"low tick rates (usually below 30), physics behavior can break down. Input can "
+"also become less responsive at low tick rates as there can be a gap between "
+"input being registered, and the response on the next physics tick. High tick "
+"rates give more accurate physics simulation, particularly for fast moving "
+"objects. For example, racing games may benefit from increasing the tick rate "
+"above the default 60.\n"
+"See also [member max_fps] and [member ProjectSettings.physics/common/"
+"physics_ticks_per_second].\n"
+"[b]Note:[/b] Only [member max_physics_steps_per_frame] physics ticks may be "
+"simulated per rendered frame at most. If more physics ticks have to be "
+"simulated per rendered frame to keep up with rendering, the project will "
+"appear to slow down (even if [code]delta[/code] is used consistently in "
+"physics calculations). Therefore, it is recommended to also increase [member "
+"max_physics_steps_per_frame] if increasing [member physics_ticks_per_second] "
+"significantly above its default value.\n"
+"[b]Note:[/b] Consider enabling [url=$DOCS_URL/tutorials/physics/interpolation/"
+"index.html]physics interpolation[/url] if you change [member "
+"physics_ticks_per_second] to a value that is not a multiple of [code]60[/"
+"code]. Using physics interpolation will avoid jittering when the monitor "
+"refresh rate and physics update rate don't exactly match."
+msgstr ""
+"每秒执行的固定迭代次数。用于控制物理仿真和 [method Node._physics_process] 的执"
+"行频率。\n"
+"CPU 使用率大致与物理周期频率成正比。然而，在周期频率非常低（通常低于 30）的情"
+"况下，物理行为可能会出现异常。在低周期频率下，输入响应也会变得迟钝，因为输入被"
+"注册到系统和系统在下一个物理周期做出响应之间会存在延迟。较高的周期频率可以提供"
+"更精确的物理模拟，尤其对于快速移动的物体而言。例如，赛车游戏可以通过将周期频率"
+"提高到高于默认的 60 来获得更好的效果。\n"
+"另见 [member max_fps] 和 [member ProjectSettings.physics/common/"
+"physics_ticks_per_second]。\n"
+"[b]注意：[/b]每个渲染帧最多只能模拟 [member max_physics_steps_per_frame] 个物"
+"理周期。如果为了追赶渲染，需要在每个渲染帧中模拟更多物理周期，游戏看上去会是降"
+"速的（即便在物理计算中始终使用 [code]delta[/code]）。因此，如果增大了 [member "
+"physics_ticks_per_second]，而且远大于默认值，那么建议将 [member "
+"max_physics_steps_per_frame] 也调大。\n"
+"[b]注意：[/b]如果你将 [member physics_ticks_per_second] 的值更改为不是 "
+"[code]60[/code] 的倍数的值，请考虑启用[url=$DOCS_URL/tutorials/physics/"
+"interpolation/index.html]物理插值[/url]。使用物理插值可以避免显示器刷新率和物"
+"理更新速率不完全匹配时出现的画面抖动。"
+
 msgid ""
 "If [code]false[/code], stops printing error and warning messages to the "
 "console and editor Output log. This can be used to hide error and warning "
@@ -60570,6 +64132,26 @@ msgid ""
 "rendering options."
 msgstr "定义渲染选项的资源，用于环境节点（例如 [WorldEnvironment]）。"
 
+msgid ""
+"Resource for environment nodes (like [WorldEnvironment]) that define multiple "
+"environment operations (such as background [Sky] or [Color], ambient light, "
+"fog, depth-of-field...). These parameters affect the final render of the "
+"scene. The order of these operations is:\n"
+"- Depth of Field Blur\n"
+"- Auto Exposure\n"
+"- Glow\n"
+"- Tonemap\n"
+"- Adjustments"
+msgstr ""
+"定义环境操作（例如背景 [Sky] 或 [Color]、环境光、雾、景深等）的资源，用于环境"
+"节点（例如 [WorldEnvironment]）。这些参数会对场景的最终渲染造成影响。操作的顺"
+"序为：\n"
+"- 景深模糊\n"
+"- 自动曝光\n"
+"- 辉光\n"
+"- 色调映射\n"
+"- 调整"
+
 msgid "Environment and post-processing"
 msgstr "环境和后期处理"
 
@@ -60592,6 +64174,16 @@ msgstr ""
 "都依赖于前一个级别。这意味着启用较高的辉光等级会减慢辉光效果的渲染速度，即使之"
 "前的等级没有启用。"
 
+msgid ""
+"Applies a simple brightness adjustment to the rendered image after "
+"tonemaping. To adjust scene brightness use [member tonemap_exposure] instead, "
+"which is applied before tonemapping and thus less prone to issues with bright "
+"colors. Effective only if [member adjustment_enabled] is [code]true[/code]."
+msgstr ""
+"在色调映射后对渲染图像应用简单的亮度调整。要调整场景亮度，请改用 [member "
+"tonemap_exposure]，它在色调映射之前应用，因此更不容易出现亮色问题。仅当 "
+"[member adjustment_enabled] 为 [code]true[/code] 时有效。"
+
 msgid ""
 "The [Texture2D] or [Texture3D] lookup table (LUT) to use for the built-in "
 "post-process color grading. Can use a [GradientTexture1D] for a 1-dimensional "
@@ -60602,6 +64194,19 @@ msgstr ""
 "[GradientTexture1D] 用于一维 LUT，或将 [Texture3D] 用于更复杂的 LUT。仅当 "
 "[member adjustment_enabled] 为 [code]true[/code] 时有效。"
 
+msgid ""
+"Increasing [member adjustment_contrast] will make dark values darker and "
+"bright values brighter. This simple adjustment is applied to the rendered "
+"image after tonemaping. When set to a value greater than [code]1.0[/code], "
+"[member adjustment_contrast] is prone to clipping colors that become too "
+"bright or too dark. Effective only if [member adjustment_enabled] is "
+"[code]true[/code]."
+msgstr ""
+"增加 [member adjustment_contrast] 的值会使暗部更暗，亮部更亮。这种简单的调整会"
+"在色调映射后应用于渲染图像。当 [member adjustment_contrast] 的值大于 "
+"[code]1.0[/code] 时，可能会导致过亮或过暗的颜色被裁剪。仅当 [member "
+"adjustment_enabled] 被设置为 [code]true[/code] 时有效。"
+
 msgid ""
 "If [code]true[/code], enables the [code]adjustment_*[/code] properties "
 "provided by this resource. If [code]false[/code], modifications to the "
@@ -60612,6 +64217,16 @@ msgstr ""
 "如果为 [code]false[/code]，则对 [code]adjustment_*[/code] 属性的修改将不会对渲"
 "染场景产生影响。"
 
+msgid ""
+"Applies a simple saturation adjustment to the rendered image after "
+"tonemaping. When [member adjustment_saturation] is set to [code]0.0[/code], "
+"the rendered image will be fully converted to a grayscale image. Effective "
+"only if [member adjustment_enabled] is [code]true[/code]."
+msgstr ""
+"在色调映射后对渲染图像应用简单的饱和度调整。当 [member adjustment_saturation] "
+"设置为 [code]0.0[/code] 时，渲染图像将完全转换为灰度图像。仅当 [member "
+"adjustment_enabled] 为 [code]true[/code] 时有效。"
+
 msgid ""
 "The ambient light's [Color]. Only effective if [member "
 "ambient_light_sky_contribution] is lower than [code]1.0[/code] (exclusive)."
@@ -60791,6 +64406,15 @@ msgstr ""
 "如果设置为 [code]0.0[/code] 以上，则根据视角以雾色渲染场景的定向光。这可以用来"
 "给人一种太阳正在“穿透”雾的印象。"
 
+msgid ""
+"The glow blending mode.\n"
+"[b]Note:[/b] The Compatibility renderer always uses [constant "
+"GLOW_BLEND_MODE_SCREEN] and [member glow_blend_mode] will have no effect."
+msgstr ""
+"辉光混合模式。\n"
+"[b]注意：[/b]兼容性渲染器始终使用 [constant GLOW_BLEND_MODE_SCREEN]，[member "
+"glow_blend_mode] 将不起作用。"
+
 msgid ""
 "The bloom's intensity. If set to a value higher than [code]0[/code], this "
 "will make glow visible in areas darker than the [member glow_hdr_threshold]."
@@ -60798,12 +64422,46 @@ msgstr ""
 "泛光的强度。如果设置为大于 [code]0[/code] 的值，则将在比 [member "
 "glow_hdr_threshold] 成员更暗的区域中显示辉光。"
 
+msgid ""
+"If [code]true[/code], the glow effect is enabled. This simulates real world "
+"atmosphere and eye/camera behavior by causing bright pixels to bleed onto "
+"surrounding pixels.\n"
+"[b]Note:[/b] When using the Mobile rendering method, glow looks different due "
+"to the lower dynamic range available in the Mobile rendering method.\n"
+"[b]Note:[/b] When using the Compatibility rendering method, glow uses a "
+"different implementation with some properties being unavailable and hidden "
+"from the inspector: [code]glow_levels/*[/code], [member glow_normalized], "
+"[member glow_strength], [member glow_blend_mode], [member glow_mix], [member "
+"glow_map], and [member glow_map_strength]. This implementation is optimized "
+"to run on low-end devices and is less flexible as a result."
+msgstr ""
+"如果为 [code]true[/code]，则会启用辉光效果。这个效果模拟的是真实世界中的大气和"
+"眼睛/相机的行为，使亮度很高的像素溢出到周围的像素中。\n"
+"[b]注意：[/b]使用“移动”渲染方法时，辉光的外观会不一样，因为“移动”渲染方法中只"
+"能使用低动态范围。\n"
+"[b]注意：[/b]使用“兼容”渲染方法时，辉光的实现方式不同，部分属性不可用，会在检"
+"查器中隐藏：[code]glow_levels/*[/code]、[member glow_normalized]、[member "
+"glow_strength]、[member glow_blend_mode]、[member glow_mix]、[member "
+"glow_map]、[member glow_map_strength]。这种实现方式是针对在低端设备上运行而优"
+"化的，因此灵活性较差。"
+
 msgid ""
 "The higher threshold of the HDR glow. Areas brighter than this threshold will "
 "be clamped for the purposes of the glow effect."
 msgstr ""
 "HDR 辉光的较高阈值。比这个阈值更亮的区域将被限制，以达到辉光效果的目的。"
 
+msgid ""
+"Smooths the transition between values that are below and above [member "
+"glow_hdr_threshold] by reducing the amount of glow generated by values that "
+"are close to [member glow_hdr_threshold]. Values above "
+"[code]glow_hdr_threshold + glow_hdr_scale[/code] will not have glow reduced "
+"in this way."
+msgstr ""
+"通过减少接近 [member glow_hdr_threshold] 的值产生的辉光量，使低于和高于 "
+"[member glow_hdr_threshold] 的值之间的过渡更加平滑。高于 "
+"[code]glow_hdr_threshold + glow_hdr_scale[/code] 的值不会以这种方式减少辉光。"
+
 msgid ""
 "The lower threshold of the HDR glow. When using the Mobile rendering method "
 "(which only supports a lower dynamic range up to [code]2.0[/code]), this may "
@@ -60817,6 +64475,16 @@ msgstr ""
 "[code]0.9[/code] 可以达到不错的效果。在 2D 中使用辉光时也需要降低到 "
 "[code]1.0[/code] 以下，因为 2D 渲染使用 SDR。"
 
+msgid ""
+"The overall brightness multiplier that is applied to the glow effect just "
+"before it is blended with the scene. When using the Mobile rendering method "
+"(which only supports a lower dynamic range up to [code]2.0[/code]), this "
+"should be increased to [code]1.5[/code] to compensate."
+msgstr ""
+"这是在将辉光效果与场景混合之前应用于辉光效果的整体亮度倍数。使用 Mobile 渲染方"
+"法时（仅支持较低的动态范围，最大为 [code]2.0[/code]），应将其增加到 "
+"[code]1.5[/code] 进行补偿。"
+
 msgid ""
 "The intensity of the 1st level of glow. This is the most \"local\" level "
 "(least blurry).\n"
@@ -60954,6 +64622,20 @@ msgstr ""
 "[b]注意：[/b][member glow_normalized] 在使用兼容性渲染方法时没有效果，因为这种"
 "渲染方法使用针对低端设备优化的更简单的辉光实现。"
 
+msgid ""
+"The strength that is used when blurring across the screen to generate the "
+"glow effect. This affects the distance and intensity of the blur. When using "
+"the Mobile rendering method, this should be increased to compensate for the "
+"lower dynamic range.\n"
+"[b]Note:[/b] [member glow_strength] has no effect when using the "
+"Compatibility rendering method, due to this rendering method using a simpler "
+"glow implementation optimized for low-end devices."
+msgstr ""
+"用于在屏幕上进行模糊处理以生成辉光效果的强度。这会影响模糊的距离和强度。使用 "
+"Mobile 渲染方法时应将其提高，对低动态范围进行补偿。\n"
+"[b]注意：[/b][member glow_strength] 在使用兼容性渲染方法时没有效果，因为该渲染"
+"方法使用针对低端设备优化的更简单的辉光实现。"
+
 msgid "The reflected (specular) light source."
 msgstr "反射（镜面反射）光源。"
 
@@ -61140,6 +64822,24 @@ msgstr ""
 "设置屏幕空间环境遮蔽效果的附加细节级别的强度。高的值会使细节传递更加突出，但它"
 "可能会导致最终图像中出现锯齿。"
 
+msgid ""
+"If [code]true[/code], the screen-space ambient occlusion effect is enabled. "
+"This darkens objects' corners and cavities to simulate ambient light not "
+"reaching the entire object as in real life. This works well for small, "
+"dynamic objects, but baked lighting or ambient occlusion textures will do a "
+"better job at displaying ambient occlusion on large static objects. Godot "
+"uses a form of SSAO called Adaptive Screen Space Ambient Occlusion which is "
+"itself a form of Horizon Based Ambient Occlusion.\n"
+"[b]Note:[/b] SSAO is only supported in the Forward+ and Compatibility "
+"rendering methods, not Mobile."
+msgstr ""
+"如果为 [code]true[/code]，则启用屏幕空间环境光遮蔽效果。这会使物体的角落和空腔"
+"变暗，以模拟环境光像现实生活中那样不会到达整个物体。这适用于小型动态对象，但烘"
+"焙照明或环境光遮蔽纹理，在大型静态对象上显示环境光遮蔽方面效果更好。Godot 使用"
+"一种称为自适应屏幕空间环境光遮蔽的 SSAO 形式，它本身就是一种基于地平线的环境光"
+"遮蔽形式。\n"
+"[b]注意：[/b]SSAO 只支持 Forward+ 和 Compatibility 渲染方式，不支持 Mobile。"
+
 msgid ""
 "The threshold for considering whether a given point on a surface is occluded "
 "or not represented as an angle from the horizon mapped into the "
@@ -61248,6 +64948,22 @@ msgstr ""
 msgid "The depth tolerance for screen-space reflections."
 msgstr "屏幕空间反射的深度公差。"
 
+msgid ""
+"If [code]true[/code], screen-space reflections are enabled. Screen-space "
+"reflections are more accurate than reflections from [VoxelGI]s or "
+"[ReflectionProbe]s, but are slower and can't reflect surfaces occluded by "
+"others.\n"
+"[b]Note:[/b] SSR is only supported in the Forward+ rendering method, not "
+"Mobile or Compatibility.\n"
+"[b]Note:[/b] SSR is not supported on viewports that have a transparent "
+"background (where [member Viewport.transparent_bg] is [code]true[/code])."
+msgstr ""
+"如果为 [code]true[/code]，则启用屏幕空间反射。屏幕空间反射比来自 [VoxelGI] 或 "
+"[ReflectionProbe] 的反射更准确，但更慢并且不能反射被其他物体遮挡的表面。\n"
+"[b]注意：[/b]SSR 只支持 Forward+ 渲染方式，不支持 Mobile 或 Compatibility。\n"
+"[b]注意：[/b]在背景透明的视口（即 [member Viewport.transparent_bg] 为 "
+"[code]true[/code] 的视口）上不支持 SSR。"
+
 msgid ""
 "The fade-in distance for screen-space reflections. Affects the area from the "
 "reflected material to the screen-space reflection. Only positive values are "
@@ -61269,6 +64985,38 @@ msgid ""
 "slower."
 msgstr "屏幕空间反射的最大步数。数值越高，速度越慢。"
 
+msgid ""
+"Increasing [member tonemap_agx_contrast] will make dark values darker and "
+"bright values brighter. Produces a higher quality result than [member "
+"adjustment_contrast] without any additional performance cost, but is only "
+"available when using the [constant TONE_MAPPER_AGX] tonemapper."
+msgstr ""
+"增加 [member tonemap_agx_contrast] 的值会使暗部更暗，亮部更亮。与 [member "
+"adjustment_contrast] 相比，它能产生更高质量的结果，且不会增加任何性能开销，但"
+"仅在使用 [constant TONE_MAPPER_AGX] 色调映射器时可用。"
+
+msgid ""
+"The white reference value for tonemapping, which indicates where bright white "
+"is located in the scale of values provided to the tonemapper. For "
+"photorealistic lighting, it is recommended to set [member tonemap_agx_white] "
+"to at least [code]6.0[/code]. Higher values result in less blown out "
+"highlights, but may make the scene appear lower contrast. [member "
+"tonemap_agx_white] is the same as [member tonemap_white], but is only "
+"effective with the [constant TONE_MAPPER_AGX] tonemapper. See also [member "
+"tonemap_exposure].\n"
+"[b]Note:[/b] When using the Mobile renderer with [member Viewport.use_hdr_2d] "
+"disabled, [member tonemap_agx_white] is ignored and a white value of "
+"[code]2.0[/code] will always be used instead."
+msgstr ""
+"色调映射的白色参考值，表示色调映射器所提供的取值范围中亮白色的位置。为了实现逼"
+"真的光照，推荐将 [member tonemap_agx_white] 至少设置为 [code]6.0[/code]。取值"
+"越高，高光部分的过曝程度越低，但可能会使场景看上去对比度较低。[member "
+"tonemap_agx_white] 的功能与 [member tonemap_white] 相同，但仅在 [constant "
+"TONE_MAPPER_AGX] 色调映射器下有效。另见 [member tonemap_exposure]。\n"
+"[b]注意：[/b]当使用移动端渲染器且禁用 [member Viewport.use_hdr_2d] 时，"
+"[member tonemap_agx_white] 参数将被忽略，并始终改用 [code]2.0[/code] 作为白色"
+"值。"
+
 msgid ""
 "Adjusts the brightness of values before they are provided to the tonemapper. "
 "Higher [member tonemap_exposure] values result in a brighter image. See also "
@@ -61292,6 +65040,25 @@ msgstr ""
 "要使用的色调映射模式。色调映射是对 HDR 值进行“转换”的过程，转换后的值适合在 "
 "LDR 显示器上渲染。（Godot 尚不支持在 HDR 显示器上进行渲染。）"
 
+msgid ""
+"The white reference value for tonemapping, which indicates where bright white "
+"is located in the scale of values provided to the tonemapper. For "
+"photorealistic lighting, it is recommended to set [member tonemap_white] to "
+"at least [code]6.0[/code]. Higher values result in less blown out highlights, "
+"but may make the scene appear lower contrast. [member tonemap_agx_white] will "
+"be used instead when using the [constant TONE_MAPPER_AGX] tonemapper. See "
+"also [member tonemap_exposure].\n"
+"[b]Note:[/b] [member tonemap_white] must be set to [code]2.0[/code] or lower "
+"on the Mobile renderer to produce bright images."
+msgstr ""
+"色调映射的白色参考值，表示色调映射器所提供的取值范围中亮白色的位置。为了实现逼"
+"真的光照，推荐将 [member tonemap_agx_white] 至少设置为 [code]6.0[/code]。取值"
+"越高，高光部分的过曝程度越低，但可能会使场景看上去对比度较低。使用 [constant "
+"TONE_MAPPER_AGX] 色调映射器时将改用 [member tonemap_agx_white]。另见 [member "
+"tonemap_exposure]。\n"
+"[b]注意：[/b]在移动渲染器上，必须将 [member tonemap_white] 设置为 [code]2.0[/"
+"code] 或更低的值才能生成明亮的图像。"
+
 msgid ""
 "The [Color] of the volumetric fog when interacting with lights. Mist and fog "
 "have an albedo close to [code]Color(1, 1, 1, 1)[/code] while smoke has a "
@@ -61565,6 +65332,62 @@ msgstr ""
 "外观。比 [constant TONE_MAPPER_FILMIC] 稍慢。\n"
 "[b]注意：[/b]这种色调映射运算符在 Godot 3.x 中被称为“ACES Fitted”。"
 
+msgid ""
+"Uses an adjustable film-like tonemapping curve and desaturates bright values "
+"for a more realistic appearance. Better than other tonemappers at maintaining "
+"the hue of colors as they become brighter. The slowest tonemapping option."
+msgstr ""
+"使用可调节的电影胶片式的色调映射曲线对较亮的值进行去饱和处理，从而获得更真实的"
+"外观。相比其他色调映射器而言，在颜色变亮时能够更好地保持色调。这是最慢的色调映"
+"射选项。"
+
+msgid "Adds the glow effect to the scene."
+msgstr "向场景添加辉光效果。"
+
+msgid ""
+"Adds the glow effect to the scene after modifying the glow influence based on "
+"the scene value; dark values will be highly influenced by glow and bright "
+"values will not be influenced by glow. This approach avoids bright values "
+"becoming overly bright from the glow effect. [member tonemap_white] is used "
+"to determine the maximum scene value where the glow should have no influence. "
+"When [member tonemap_mode] is set to [constant TONE_MAPPER_LINEAR], a value "
+"of [code]1.0[/code] will be used as the maximum scene value."
+msgstr ""
+"根据场景值调整辉光效果的影响程度后，将辉光效果添加到场景中；暗值受辉光影响较"
+"大，而亮值则不受辉光影响。这种方法可以避免亮值因辉光效果而变得过亮。[member "
+"tonemap_white] 用于确定辉光效果不应产生影响的最大场景值。当 [member "
+"tonemap_mode] 设置为 [constant TONE_MAPPER_LINEAR] 时，[code]1.0[/code] 将被用"
+"作最大场景值。"
+
+msgid ""
+"Adds the glow effect to the tonemapped image after modifying the glow "
+"influence based on the image value; dark values and bright values will not be "
+"influenced by glow and mid-range values will be highly influenced by glow. "
+"This approach avoids bright values becoming overly bright from the glow "
+"effect. The glow will have the largest influence on image values of "
+"[code]0.25[/code] and will have no influence when applied to image values "
+"greater than [code]1.0[/code]."
+msgstr ""
+"根据图像值修改辉光影响后，为色调映射图像添加辉光效果；暗值和亮值不会受辉光影"
+"响，而中间值会受辉光强烈影响。这种方法可以避免亮值因辉光效果而变得过亮。当图像"
+"值为 [code]0.25[/code] 时，辉光效果影响最大；当图像值大于 [code]1.0[/code] "
+"时，辉光效果将不起作用。"
+
+msgid ""
+"Replaces all pixels' color by the glow effect. This can be used to simulate a "
+"full-screen blur effect by tweaking the glow parameters to match the original "
+"image's brightness or to preview glow configuration in the editor."
+msgstr ""
+"将所有像素的颜色替换为辉光效果。这可用于通过调整辉光参数来模拟全屏模糊效果，使"
+"其与原始图像的亮度相匹配，或者在编辑器中预览辉光配置。"
+
+msgid ""
+"Mixes the glow image with the scene image. Best used with [member glow_bloom] "
+"to avoid darkening the scene."
+msgstr ""
+"将辉光图像与场景图像混合。最好与 [member glow_bloom] 结合使用，以避免场景变"
+"暗。"
+
 msgid "Use a physically-based fog model defined primarily by fog density."
 msgstr "使用主要由雾密度定义的基于物理的雾模型。"
 
@@ -61773,6 +65596,25 @@ msgstr ""
 msgid "External texture size."
 msgstr "外部纹理大小。"
 
+msgid "Position based forward and backward reaching inverse kinematics solver."
+msgstr "基于位置的前后向延伸的反向动力学求解器。"
+
+msgid ""
+"[FABRIK3D] is position based IK, allowing precise and accurate tracking of "
+"targets. It's ideal for simple chains without limitations.\n"
+"The resulting twist around the forward vector will always be kept from the "
+"previous pose.\n"
+"[b]Note:[/b] When the target is close to the root, it tends to produce zig-"
+"zag patterns, resulting in unnatural visual movement."
+msgstr ""
+"[FABRIK3D] 是一种基于位置的反向动力学算法，可以实现对目标的精确跟踪。它非常适"
+"合没有限制的简单链式结构。\n"
+"围绕前向向量产生的扭转角度将始终保持与上一姿势相同。\n"
+"[b]注意：[/b]当目标靠近根时，容易产生锯齿状运动，导致不自然的视觉运动。"
+
+msgid "Inverse Kinematics Returns to Godot 4.6 - IKModifier3D"
+msgstr "反向动力学回归到 Godot 4.6 - IKModifier3D"
+
 msgid "Generates noise using the FastNoiseLite library."
 msgstr "使用 FastNoiseLite 库生成噪声。"
 
@@ -62319,6 +66161,13 @@ msgstr ""
 "返回文件 [param file] 的最后修改时间，使用 Unix 时间戳格式，出错时返回 "
 "[code]0[/code]。这个 Unix 时间戳可以用 [Time] 单例转换为其他格式。"
 
+msgid ""
+"Returns the whole file as a [String]. Text is interpreted as being UTF-8 "
+"encoded. This ignores the file cursor and does not affect it."
+msgstr ""
+"将整个文件文件内容以 [String] 形式返回。文本被解释为 UTF-8 编码。该操作会忽略"
+"且不影响文件指针。"
+
 msgid ""
 "Returns next [param length] bytes of the file as a [PackedByteArray]. This "
 "advances the file cursor by [param length] bytes."
@@ -62376,6 +66225,62 @@ msgstr ""
 "返回试图执行操作时发生的最后一个错误。请与 [enum Error] 中的 "
 "[code]ERR_FILE_*[/code] 常量比较。"
 
+msgid ""
+"Reads the file extended attribute with name [param attribute_name] as a byte "
+"array.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"将名称为 [param attribute_name] 的文件扩展属性读取为字节数组。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
+msgid ""
+"Reads the file extended attribute with name [param attribute_name] as a UTF-8 "
+"encoded string.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"将名为 [param attribute_name] 的文件扩展属性读取为 UTF-8 编码的字符串。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
+msgid ""
+"Returns a list of file extended attributes.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"返回文件扩展属性列表。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
 msgid ""
 "Returns the whole [param path] file contents as a [PackedByteArray] without "
 "any decoding.\n"
@@ -62406,6 +66311,14 @@ msgid ""
 "number. This advances the file cursor by 2 bytes."
 msgstr "将文件中接下来的 16 位作为半精度浮点数返回。文件游标前进 2 个字节。"
 
+msgid ""
+"Returns [code]true[/code] if the [b]hidden[/b] attribute is set on the file "
+"at the given path.\n"
+"[b]Note:[/b] This method is implemented on iOS, BSD, macOS, and Windows."
+msgstr ""
+"如果指定路径的文件的 [b]hidden[/b] 属性已设置，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]该方法在 iOS、BSD、macOS 和 Windows 上实现。"
+
 msgid ""
 "Returns the size of the file in bytes. For a pipe, returns the number of "
 "bytes available for reading from the pipe."
@@ -62464,6 +66377,14 @@ msgstr ""
 "返回文件游标的位置，单位为字节，相对于文件的开头。文件读写游标由 [method "
 "seek] 和 [method seek_end] 设置，读写操作会导致游标前进。"
 
+msgid ""
+"Returns [code]true[/code] if the [b]read only[/b] attribute is set on the "
+"file at the given path.\n"
+"[b]Note:[/b] This method is implemented on iOS, BSD, macOS, and Windows."
+msgstr ""
+"如果指定路径的文件的 [b]read only[/b] 属性已设置，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]此方法在 iOS、BSD、macOS 和 Windows 上实现。"
+
 msgid ""
 "Returns the next bits from the file as a floating-point number. This advances "
 "the file cursor by either 4 or 8 bytes, depending on the precision used by "
@@ -62485,6 +66406,18 @@ msgid ""
 msgstr ""
 "返回一个表示给定路径下文件的 SHA-256 [String]，失败时返回一个空的 [String]。"
 
+msgid ""
+"Returns the size of the file at the given path, in bytes, or [code]-1[/code] "
+"on error."
+msgstr "返回给定路径的文件大小，单位为字节，出错时为 [code]-1[/code]。"
+
+msgid ""
+"Returns the UNIX permissions of the file at the given path.\n"
+"[b]Note:[/b] This method is implemented on iOS, Linux/BSD, and macOS."
+msgstr ""
+"返回给定路径的文件的 UNIX 权限。\n"
+"[b]注意：[/b]该方法在 iOS、Linux/BSD 和 macOS 上实现。"
+
 msgid ""
 "Returns the next [Variant] value from the file. If [param allow_objects] is "
 "[code]true[/code], decoding objects is allowed. This advances the file cursor "
@@ -62558,6 +66491,24 @@ msgstr ""
 "如果打开文件失败，则返回 [code]null[/code] 。你可以使用 [method "
 "get_open_error] 来检查发生的错误。"
 
+msgid ""
+"Removes file extended attribute with name [param attribute_name].\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"移除名为 [param attribute_name] 的文件扩展属性。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
 msgid ""
 "Resizes the file to a specified length. The file must be open in a mode that "
 "permits writing. If the file is extended, NUL characters are appended. If the "
@@ -62568,6 +66519,61 @@ msgstr ""
 "会追加 NUL 字符。如果截断了文件，则会丢弃从文件末尾到文件原长度之间的所有数"
 "据。"
 
+msgid ""
+"Sets the file cursor to the specified position in bytes, from the beginning "
+"of the file. This changes the value returned by [method get_position]."
+msgstr ""
+"将文件游标设置到指定位置，单位为字节，相对于文件的开头。这将改变 [method "
+"get_position] 的返回值。"
+
+msgid ""
+"Sets the file cursor to the specified position in bytes, from the end of the "
+"file. This changes the value returned by [method get_position].\n"
+"[b]Note:[/b] This is an offset, so you should use negative numbers otherwise "
+"the file cursor will be at the end of the file."
+msgstr ""
+"将文件游标设置到指定位置，单位为字节，相对于文件的末尾。这将改变 [method "
+"get_position] 的返回值。\n"
+"[b]注意：[/b]指定的是偏移量，因此应当使用负数，否则文件游标会处于文件末尾。"
+
+msgid ""
+"Writes file extended attribute with name [param attribute_name] as a byte "
+"array.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"将名为 [param attribute_name] 的文件扩展属性写入为字节数组。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
+msgid ""
+"Writes file extended attribute with name [param attribute_name] as a UTF-8 "
+"encoded string.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] Extended attributes support depends on the file system. "
+"Attributes will be lost when the file is moved between incompatible file "
+"systems.\n"
+"[b]Note:[/b] On Linux, only \"user\" namespace attributes are accessible, "
+"namespace prefix should not be included.\n"
+"[b]Note:[/b] On Windows, alternate data streams are used to store extended "
+"attributes."
+msgstr ""
+"将名为 [param attribute_name] 的文件扩展属性写入为 UTF-8 编码的字符串。\n"
+"[b]注意：[/b]该方法已在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]扩展属性的支持取决于文件系统。当文件在不兼容的文件系统之间移动"
+"时，属性将会丢失。\n"
+"[b]注意：[/b]在 Linux 上，只能访问“user”命名空间属性，不应包含命名空间前缀。\n"
+"[b]注意：[/b]在 Windows 上，使用备用数据流来存储扩展属性。"
+
 msgid ""
 "Sets file [b]hidden[/b] attribute.\n"
 "[b]Note:[/b] This method is implemented on iOS, BSD, macOS, and Windows."
@@ -62737,6 +66743,22 @@ msgstr ""
 "[code]true[/code]。\n"
 "[b]注意：[/b]出错时，文件位置标识符的取值不确定。"
 
+msgid ""
+"Stores the given [PackedStringArray] in the file as a line formatted in the "
+"CSV (Comma-Separated Values) format. You can pass a different delimiter "
+"[param delim] to use other than the default [code]\",\"[/code] (comma). This "
+"delimiter must be one-character long.\n"
+"Text will be encoded as UTF-8. Returns [code]true[/code] if the operation is "
+"successful.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"将给定的 [PackedStringArray] 作为 CSV（逗号分隔值）格式的行存储在文件中。你可"
+"以传递不同的分隔符 [param delim] 以使用默认 [code]\",\"[/code]（逗号）以外的其"
+"他分隔符。此分隔符的长度必须为一个字符。\n"
+"将使用 UTF-8 编码文本。如果操作成功则返回 [code]true[/code]。\n"
+"[b]注意：[/b]出错时，文件位置标识符的取值不确定。"
+
 msgid ""
 "Stores a floating-point number as 64 bits in the file. This advances the file "
 "cursor by 8 bytes. Returns [code]true[/code] if the operation is successful.\n"
@@ -62899,11 +66921,36 @@ msgid ""
 "beginning of the file."
 msgstr "打开文件进行读取操作。文件游标位于文件的开头。"
 
+msgid ""
+"Opens the file for write operations. If the file exists, it is truncated to "
+"zero length and its contents are cleared. Otherwise, it is created.\n"
+"[b]Note:[/b] When creating a file it must be in an already existing "
+"directory. To recursively create directories for a file path, see [method "
+"DirAccess.make_dir_recursive]."
+msgstr ""
+"打开文件进行写入操作。如果文件已存在，则将其截断为零长度并清空其内容。否则，将"
+"创建该文件。\n"
+"[b]注意：[/b]创建文件必须在已有目录中执行。如果要递归创建文件路径中的目录，见 "
+"[method DirAccess.make_dir_recursive]。"
+
 msgid ""
 "Opens the file for read and write operations. Does not truncate the file. The "
 "file cursor is positioned at the beginning of the file."
 msgstr "打开文件进行读写操作。不会截断文件。文件游标位于文件的开头。"
 
+msgid ""
+"Opens the file for read and write operations. If the file exists, it is "
+"truncated to zero length and its contents are cleared. Otherwise, it is "
+"created. The file cursor is positioned at the beginning of the file.\n"
+"[b]Note:[/b] When creating a file it must be in an already existing "
+"directory. To recursively create directories for a file path, see [method "
+"DirAccess.make_dir_recursive]."
+msgstr ""
+"打开文件进行读写操作。如果文件已存在，则将其截断为零长度并清除其内容。否则，创"
+"建新文件。文件游标位于文件开头。\n"
+"[b]注意：[/b]创建文件必须在已有目录中执行。如果要递归创建文件路径中的目录，见 "
+"[method DirAccess.make_dir_recursive]。"
+
 msgid "Uses the [url=https://fastlz.org/]FastLZ[/url] compression method."
 msgstr "使用 [url=https://fastlz.org/]FastLZ[/url] 压缩方法。"
 
@@ -62984,6 +67031,32 @@ msgstr ""
 "[Window] 的 [code]popup_*[/code] 方法中的其中一个，比如 [method "
 "Window.popup_centered_clamped]。"
 
+msgid ""
+"Adds a comma-separated file extension [param filter] and comma-separated MIME "
+"type [param mime_type] option to the [FileDialog] with an optional [param "
+"description], which restricts what files can be picked.\n"
+"A [param filter] should be of the form [code]\"filename.extension\"[/code], "
+"where filename and extension can be [code]*[/code] to match any string. "
+"Filters starting with [code].[/code] (i.e. empty filenames) are not allowed.\n"
+"For example, a [param filter] of [code]\"*.png, *.jpg\"[/code], a [param "
+"mime_type] of [code]image/png, image/jpeg[/code], and a [param description] "
+"of [code]\"Images\"[/code] results in filter text \"Images (*.png, *.jpg)\".\n"
+"[b]Note:[/b] Embedded file dialogs and Windows file dialogs support only file "
+"extensions, while Android, Linux, and macOS file dialogs also support MIME "
+"types."
+msgstr ""
+"将一个逗号分隔的文件扩展名 [param filter] 和以逗号分隔的 MIME 类型 [param "
+"mime_type] 的选项添加到 [FileDialog]，并可选择添加描述 [param description]，用"
+"于限制可以选择的文件类型。\n"
+"[param filter] 的格式应为 [code]\"文件名.扩展名\"[/code]，其中文件名和扩展名可"
+"以是 [code]*[/code]，以匹配任意字符串。不允许使用以 [code].[/code] 开头的筛选"
+"器（即空文件名）。\n"
+"例如，如果 [param filter] 为 [code]\"*.png, *.jpg\"[/code]，[param mime_type] "
+"为 [code]image/png, image/jpeg[/code]，[param description] 为 [code]\"图像\"[/"
+"code]，则生成的筛选器文本为“图像 (*.png, *.jpg)”。\n"
+"[b]注意：[/b]嵌入的文件对话框和 Windows 文件对话框仅支持文件扩展名，而 "
+"Android、Linux 和 macOS 的文件对话框还支持 MIME 类型。"
+
 msgid ""
 "Adds an additional [OptionButton] to the file dialog. If [param values] is "
 "empty, a [CheckBox] is added instead.\n"
@@ -63005,6 +67078,14 @@ msgstr "清除对话框中所有添加的过滤器。"
 msgid "Clear all currently selected items in the dialog."
 msgstr "清除对话框中所有当前选定的项目。"
 
+msgid ""
+"Returns the list of favorite directories, which is shared by all [FileDialog] "
+"nodes. Useful to store the list of favorites between project sessions. This "
+"method can be called only from the main thread."
+msgstr ""
+"返回所有 [FileDialog] 节点共享的收藏目录列表。有利于在项目会话之间保存收藏列"
+"表。该方法只能从主线程中调用。"
+
 msgid ""
 "Returns the LineEdit for the selected file.\n"
 "[b]Warning:[/b] This is a required internal node, removing and freeing it may "
@@ -63030,6 +67111,14 @@ msgid ""
 "Returns an array of values of the [OptionButton] with index [param option]."
 msgstr "返回索引为 [param option] 的 [OptionButton] 值的数组。"
 
+msgid ""
+"Returns the list of recent directories, which is shared by all [FileDialog] "
+"nodes. Useful to store the list of recents between project sessions. This "
+"method can be called only from the main thread."
+msgstr ""
+"返回所有 [FileDialog] 节点共享的最近访问目录列表。有利于在项目会话之间保存最近"
+"访问的目录列表。该方法只能从主线程中调用。"
+
 msgid ""
 "Returns a [Dictionary] with the selected values of the additional "
 "[OptionButton]s and/or [CheckBox]es. [Dictionary] keys are names and values "
@@ -63053,9 +67142,96 @@ msgstr ""
 "[b]注意：[/b]原生文件对话框会忽略对该节点的更改，请使用 [method add_option] 向"
 "对话框添加自定义元素。"
 
+msgid ""
+"Invalidates and updates this dialog's content list.\n"
+"[b]Note:[/b] This method does nothing on native file dialogs."
+msgstr ""
+"使该对话框的内容列表失效并更新。\n"
+"[b]注意：[/b]该方法对原生文件对话框不执行任何操作。"
+
 msgid "Returns [code]true[/code] if the provided [param flag] is enabled."
 msgstr "如果指定的 [param flag] 已启用，则返回 [code]true[/code]。"
 
+msgid ""
+"Shows the [FileDialog] using the default size and position for file dialogs, "
+"and selects the file name if there is a current file."
+msgstr ""
+"使用文件对话框的默认大小和位置显示该 [FileDialog]，如果有当前文件则选择该文件"
+"名。"
+
+msgid ""
+"Sets the specified customization [param flag], allowing to customize the "
+"features available in this [FileDialog]."
+msgstr "设置指定的自定义标志 [param flag]，允许自定义该 [FileDialog] 的特性。"
+
+msgid ""
+"Sets the list of favorite directories, which is shared by all [FileDialog] "
+"nodes. Useful to restore the list of favorites saved with [method "
+"get_favorite_list]. This method can be called only from the main thread.\n"
+"[b]Note:[/b] [FileDialog] will update its internal [ItemList] of favorites "
+"when its visibility changes. Be sure to call this method earlier if you want "
+"your changes to have effect."
+msgstr ""
+"设置所有 [FileDialog] 节点共享的收藏目录列表。有利于恢复使用 [method "
+"get_favorite_list] 保存的收藏列表。该方法只能从主线程中调用。\n"
+"[b]注意：[/b][FileDialog] 在可见性发生变化时会更新其内部的收藏列表 "
+"[ItemList]。如果你希望你的更改生效，请务必提前调用该方法。"
+
+msgid ""
+"Sets the callback used by the [FileDialog] nodes to get a file icon, when "
+"[constant DISPLAY_LIST] mode is used. The callback should take a single "
+"[String] argument (file path), and return a [Texture2D]. If an invalid "
+"texture is returned, the [theme_item file] icon will be used instead."
+msgstr ""
+"设置 [FileDialog] 节点在使用 [constant DISPLAY_LIST] 模式时获取文件图标所用的"
+"回调函数。该回调函数应接受一个 [String] 类型的参数（文件路径），并返回一个 "
+"[Texture2D] 对象。如果返回的纹理无效，则会改用 [theme_item file] 图标。"
+
+msgid ""
+"Sets the callback used by the [FileDialog] nodes to get a file icon, when "
+"[constant DISPLAY_THUMBNAILS] mode is used. The callback should take a single "
+"[String] argument (file path), and return a [Texture2D]. If an invalid "
+"texture is returned, the [theme_item file_thumbnail] icon will be used "
+"instead.\n"
+"Thumbnails are usually more complex and may take a while to load. To avoid "
+"stalling the application, you can use [ImageTexture] to asynchronously create "
+"the thumbnail.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"\tFileDialog.set_get_thumbnail_callback(thumbnail_method)\n"
+"\n"
+"func thumbnail_method(path):\n"
+"\tvar image_texture = ImageTexture.new()\n"
+"\tmake_thumbnail_async(path, image_texture)\n"
+"\treturn image_texture\n"
+"\n"
+"func make_thumbnail_async(path, image_texture):\n"
+"\tvar thumbnail_texture = await generate_thumbnail(path) # Some method that "
+"generates a thumbnail.\n"
+"\timage_texture.set_image(thumbnail_texture.get_image())\n"
+"[/codeblock]"
+msgstr ""
+"设置 [FileDialog] 节点在使用 [constant DISPLAY_THUMBNAILS] 模式时获取文件图标"
+"所用的回调函数。该回调函数应接受一个 [String] 类型的参数（文件路径），并返回一"
+"个 [Texture2D] 对象。如果返回的纹理无效，则会改用 [theme_item file_thumbnail] "
+"图标。\n"
+"缩略图通常比较复杂，加载可能需要一些时间。为了避免应用程序卡顿，可以使用 "
+"[ImageTexture] 来异步创建缩略图。\n"
+"[codeblock]\n"
+"func _ready():\n"
+"\tFileDialog.set_get_thumbnail_callback(thumbnail_method)\n"
+"\n"
+"func thumbnail_method(path):\n"
+"\tvar image_texture = ImageTexture.new()\n"
+"\tmake_thumbnail_async(path, image_texture)\n"
+"\treturn image_texture\n"
+"\n"
+"func make_thumbnail_async(path, image_texture):\n"
+"\tvar thumbnail_texture = await generate_thumbnail(path) # 某种用于生成缩略图"
+"的方法。\n"
+"\timage_texture.set_image(thumbnail_texture.get_image())\n"
+"[/codeblock]"
+
 msgid ""
 "Sets the default value index of the [OptionButton] or [CheckBox] with index "
 "[param option]."
@@ -63069,6 +67245,19 @@ msgstr "设置索引为 [param option] 的 [OptionButton] 或 [CheckBox] 的名
 msgid "Sets the option values of the [OptionButton] with index [param option]."
 msgstr "设置索引为 [param option] 的 [OptionButton] 的选项值。"
 
+msgid ""
+"Sets the list of recent directories, which is shared by all [FileDialog] "
+"nodes. Useful to restore the list of recents saved with [method "
+"set_recent_list]. This method can be called only from the main thread.\n"
+"[b]Note:[/b] [FileDialog] will update its internal [ItemList] of recent "
+"directories when its visibility changes. Be sure to call this method earlier "
+"if you want your changes to have effect."
+msgstr ""
+"设置由所有 [FileDialog] 节点共享的最近访问目录列表。有利于恢复使用 [method "
+"set_recent_list] 保存的最近访问列表。该方法只能从主线程中调用。\n"
+"[b]注意：[/b][FileDialog] 在其可见性改变时会更新其内部的最近目录 [ItemList]。"
+"如果你希望你的更改生效，请务必尽早调用该方法。"
+
 msgid ""
 "The file system access scope.\n"
 "[b]Warning:[/b] In Web builds, FileDialog cannot access the host file system. "
@@ -63095,6 +67284,13 @@ msgstr "文件对话框的当前选定的文件。"
 msgid "The currently selected file path of the file dialog."
 msgstr "当前选择的文件对话框的文件路径。"
 
+msgid ""
+"If [code]true[/code], the context menu will show the \"Delete\" option, which "
+"allows moving files and folders to trash."
+msgstr ""
+"如果为 [code]true[/code]，则上下文菜单将显示“删除”选项，允许将文件和文件夹移动"
+"到回收站。"
+
 msgid "Display mode of the dialog's file list."
 msgstr "对话框文件列表的显示模式。"
 
@@ -63126,6 +67322,31 @@ msgstr ""
 "另见 [member filters]，应使用该属性限制可以选择的文件类型，而 [member "
 "filename_filter] 则是由用户设置的。"
 
+msgid ""
+"The available file type filters. Each filter string in the array should be "
+"formatted like this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/"
+"jpeg[/code]. The description text of the filter is optional and can be "
+"omitted. Both file extensions and MIME type should be always set.\n"
+"[b]Note:[/b] Embedded file dialogs and Windows file dialogs support only file "
+"extensions, while Android, Linux, and macOS file dialogs also support MIME "
+"types."
+msgstr ""
+"可用的文件类型筛选器。数组中筛选器字符串的格式应类似于："
+"[code]*.png,*.jpg,*.jpeg;图像文件;image/png,image/jpeg[/code]。筛选器的描述文"
+"本是可选的，可以省略。应始终设置文件扩展名和 MIME 类型。\n"
+"[b]注意：[/b]嵌入式文件对话框和 Windows 文件对话框仅支持文件扩展名，而 "
+"Android、Linux 和 macOS 文件对话框还支持 MIME 类型。"
+
+msgid ""
+"If [code]true[/code], shows the button for creating new directories (when "
+"using [constant FILE_MODE_OPEN_DIR], [constant FILE_MODE_OPEN_ANY], or "
+"[constant FILE_MODE_SAVE_FILE]), and the context menu will have the \"New "
+"Folder...\" option."
+msgstr ""
+"如果为 [code]true[/code]，则会显示用于新建文件夹的按钮（适用于 [constant "
+"FILE_MODE_OPEN_DIR]、[constant FILE_MODE_OPEN_ANY]、[constant "
+"FILE_MODE_SAVE_FILE]），并且上下文菜单中会包含“新建文件夹...”选项。"
+
 msgid "If [code]true[/code], shows the toggle hidden files button."
 msgstr "如果为 [code]true[/code]，则会显示隐藏文件开关按钮。"
 
@@ -63144,6 +67365,13 @@ msgstr ""
 msgid "The number of additional [OptionButton]s and [CheckBox]es in the dialog."
 msgstr "对话框中附加的 [OptionButton] 和 [CheckBox] 的数量。"
 
+msgid ""
+"If [code]true[/code], the [FileDialog] will warn the user before overwriting "
+"files in save mode."
+msgstr ""
+"如果为 [code]true[/code]，则在保存模式下，[FileDialog] 会在覆盖文件之前向用户"
+"发出警告。"
+
 msgid ""
 "If [code]true[/code], shows the recent directories list on the left side of "
 "the dialog."
@@ -63166,6 +67394,36 @@ msgstr ""
 "如果为 [code]true[/code]，则对话框将显示隐藏文件。\n"
 "[b]注意：[/b]Android 和 Linux 上的原生文件对话框会忽略该属性。"
 
+msgid ""
+"If [code]true[/code], and if supported by the current [DisplayServer], OS "
+"native dialog will be used instead of custom one.\n"
+"[b]Note:[/b] On Android, it is only supported for Android 10+ devices and "
+"when using [constant ACCESS_FILESYSTEM]. For access mode [constant "
+"ACCESS_RESOURCES] and [constant ACCESS_USERDATA], the system will fall back "
+"to custom FileDialog.\n"
+"[b]Note:[/b] On Linux and macOS, sandboxed apps always use native dialogs to "
+"access the host file system.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method "
+"OS.get_granted_permissions] to get a list of saved bookmarks.\n"
+"[b]Note:[/b] Native dialogs are isolated from the base process, file dialog "
+"properties can't be modified once the dialog is shown.\n"
+"[b]Note:[/b] This property is ignored in [EditorFileDialog]."
+msgstr ""
+"如果为 [code]true[/code] 并且当前 [DisplayServer] 支持原生对话框，那么就会使用"
+"操作系统原生对话框代替自定义对话框。\n"
+"[b]注意：[/b]在 Android 上，它只在 Android 10+ 设备且使用 [constant "
+"ACCESS_FILESYSTEM] 时才支持。使用 [constant ACCESS_RESOURCES]、[constant "
+"ACCESS_USERDATA] 等访问模式时系统会回退至自定义 FileDialog。\n"
+"[b]注意：[/b]在 Linux 和 macOS 上，沙盒应用程序始终使用原生对话框来访问主机文"
+"件系统。\n"
+"[b]注意：[/b]在 macOS 上，沙盒应用将保存安全范围的书签，以保留对跨多个会话打开"
+"的文件夹的访问权限。使用 [method OS.get_granted_permissions] 获取已保存书签的"
+"列表。\n"
+"[b]注意：[/b]原生对话框与基本进程隔离，对话框显示后，文件对话框属性无法修"
+"改。\n"
+"[b]注意：[/b]该属性在 [EditorFileDialog] 中会被忽略。"
+
 msgid "Emitted when the user selects a directory."
 msgstr "当用户选择一个目录时触发的。"
 
@@ -63275,6 +67533,22 @@ msgstr ""
 "如果启用，则会显示布局切换按钮（列表、缩略图）。\n"
 "等价于 [member layout_toggle_enabled]。"
 
+msgid ""
+"If enabled, the [FileDialog] will warn the user before overwriting files in "
+"save mode.\n"
+"Equivalent to [member overwrite_warning_enabled]."
+msgstr ""
+"如果启用，则 [FileDialog] 在保存模式下覆盖文件之前会向用户发出警告。\n"
+"等价于 [member overwrite_warning_enabled]。"
+
+msgid ""
+"If enabled, the context menu will show the \"Delete\" option, which allows "
+"moving files and folders to trash.\n"
+"Equivalent to [member deleting_enabled]."
+msgstr ""
+"如果启用，则上下文菜单将显示“删除”选项，允许将文件和文件夹移动到回收站。\n"
+"等价于 [member deleting_enabled]。"
+
 msgid ""
 "The color tint for disabled files (when the [FileDialog] is used in open "
 "folder mode)."
@@ -63402,6 +67676,14 @@ msgstr "在编辑器中实例化给定场景时发出。"
 msgid "Emitted when an external [param resource] had its file removed."
 msgstr "外部资源 [param resource] 的对应文件被移除时发出。"
 
+msgid ""
+"Emitted when the selection changes. Use [method "
+"EditorInterface.get_selected_paths] in the connected method to get the "
+"selected paths."
+msgstr ""
+"当选择发生变化时发出该信号。在连接的方法中使用 [method "
+"EditorInterface.get_selected_paths] 可以获取选定的路径。"
+
 msgid "A built-in type for floating-point numbers."
 msgstr "浮点数内置类型。"
 
@@ -63919,6 +68201,23 @@ msgstr ""
 msgid "A container that can be expanded/collapsed."
 msgstr "能够展开、折叠的容器。"
 
+msgid ""
+"A container that can be expanded/collapsed, with a title that can be filled "
+"with controls, such as buttons. This is also called an accordion.\n"
+"The title can be positioned at the top or bottom of the container. The "
+"container can be expanded or collapsed by clicking the title or by pressing "
+"[code]ui_accept[/code] when focused. Child control nodes are hidden when the "
+"container is collapsed. Ignores non-control children.\n"
+"A FoldableContainer can be grouped with other FoldableContainers so that only "
+"one of them can be opened at a time; see [member foldable_group] and "
+"[FoldableGroup]."
+msgstr ""
+"能够展开、折叠的容器，标题中可以添加按钮等控件。这也叫做手风琴。\n"
+"标题可以放在容器的顶部或底部。点击标题或在聚焦时按下 [code]ui_accept[/code] 可"
+"以将容器展开或折叠。容器折叠时子控件节点隐藏。忽略非控件子节点。\n"
+"可折叠容器可以与其他可折叠容器分组，这样一次只能打开其中一个；见 [member "
+"foldable_group] 和 [FoldableGroup]。"
+
 msgid ""
 "Adds a [Control] that will be placed next to the container's title, obscuring "
 "the clickable area. Prime usage is adding [Button] nodes, but it can be any "
@@ -63958,6 +68257,11 @@ msgid ""
 "children."
 msgstr "如果为 [code]true[/code]，则会折叠容器折叠，隐藏所有子节点。"
 
+msgid ""
+"Language code used for text shaping algorithms. If left empty, the current "
+"locale is used instead."
+msgstr "语言代码，用于文本塑形算法。如果留空则使用当前区域设置。"
+
 msgid "The container's title text."
 msgstr "容器的标题文本。"
 
@@ -64038,7 +68342,7 @@ msgstr ""
 "显示在基础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 [StyleBox]，确保基"
 "础 [StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很好地实现这个目的。"
 "要禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果"
-"会影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原因，不建议这样做。"
+"会影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid "Default background for the [FoldableContainer]."
 msgstr "[FoldableContainer] 的默认背景。"
@@ -64423,6 +68727,20 @@ msgid ""
 "Returns [code]true[/code] if a Unicode [param char] is available in the font."
 msgstr "如果该字体中包含 Unicode 字符 [param char]，则返回 [code]true[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if the font supports the given language (as a "
+"[url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code)."
+msgstr ""
+"如果该字体支持给定的语言（以 [url=https://zh.wikipedia.org/wiki/ISO_639-1]ISO "
+"639[/url] 码），则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if the font supports the given script (as a "
+"[url=https://en.wikipedia.org/wiki/ISO_15924]ISO 15924[/url] code)."
+msgstr ""
+"如果该字体支持给定的文字（以 [url=https://zh.wikipedia.org/wiki/ISO_15924]ISO "
+"15924[/url] 码），则返回 [code]true[/code]。"
+
 msgid "Sets LRU cache capacity for [code]draw_*[/code] methods."
 msgstr "为 [code]draw_*[/code] 方法设置 LRU 缓存容量。"
 
@@ -65078,6 +69396,16 @@ msgstr ""
 msgid "Framebuffer cache manager for Rendering Device based renderers."
 msgstr "基于渲染设备的渲染器的帧缓冲区缓存管理器。"
 
+msgid ""
+"Framebuffer cache manager for [RenderingDevice]-based renderers. Provides a "
+"way to create a framebuffer and reuse it in subsequent calls for as long as "
+"the used textures exists. Framebuffers will automatically be cleaned up when "
+"dependent objects are freed."
+msgstr ""
+"基于 [RenderingDevice] 的渲染器的帧缓冲区缓存管理器。提供一种创建帧缓冲区并在"
+"后续调用中重用它（只要使用的纹理存在）的方法。当依赖的对象被释放时，帧缓冲区将"
+"被自动清理。"
+
 msgid ""
 "Creates, or obtains a cached, framebuffer. [param textures] lists textures "
 "accessed. [param passes] defines the subpasses and texture allocation, if "
@@ -65177,6 +69505,15 @@ msgstr ""
 "使用绝对文件路径加载扩展。[param path] 需要指向有效的 [GDExtension]。成功时返"
 "回 [constant LOAD_STATUS_OK]。"
 
+msgid ""
+"Loads the extension already in address space via the given path and "
+"initialization function. The [param path] needs to be unique and start with "
+"[code]\"libgodot://\"[/code]. Returns [constant LOAD_STATUS_OK] if successful."
+msgstr ""
+"通过给定的路径和初始化函数加载已存在于地址空间中的扩展。[param path] 必须是唯"
+"一的，并且以 [code]\"libgodot://\"[/code] 开头。成功时返回 [constant "
+"LOAD_STATUS_OK]。"
+
 msgid ""
 "Reloads the extension at the given file path. The [param path] needs to point "
 "to a valid [GDExtension], otherwise this method may return either [constant "
@@ -66319,6 +70656,9 @@ msgstr ""
 "[b]注意：[/b]逐实例着色器 uniform 仅在 Spatial 和 CanvasItem 着色器中可用，在 "
 "Fog、Sky、Particles 着色器中不可用。"
 
+msgid "The mode used to cast shadows from this instance."
+msgstr "用于从该实例投射阴影的模式。"
+
 msgid ""
 "Overrides the bounding box of this node with a custom one. This can be used "
 "to avoid the expensive [AABB] recalculation that happens when a skeleton is "
@@ -66677,6 +71017,12 @@ msgstr ""
 msgid "Buffers, BufferViews, and Accessors in Khronos glTF specification"
 msgstr "Khronos glTF 规范中的缓冲区、BufferView 和访问器"
 
+msgid "Creates a new GLTFAccessor instance by parsing the given [Dictionary]."
+msgstr "通过解析给定的 [Dictionary] 新建 GLTFAccessor 实例。"
+
+msgid "Serializes this GLTFAccessor instance into a [Dictionary]."
+msgstr "将这个 GLTFAccessor 实例序列化为 [Dictionary]。"
+
 msgid "The glTF accessor type, as an enum."
 msgstr "glTF 访问器类型枚举。"
 
@@ -66959,6 +71305,9 @@ msgstr ""
 "[member byte_offset]。[member byte_stride] 和 [member indices] 属性适用于更高"
 "级的用例，例如为 GPU 编码的交错网格数据。"
 
+msgid "Creates a new GLTFBufferView instance by parsing the given [Dictionary]."
+msgstr "通过解析给定的 [Dictionary] 新建 GLTFBufferView 实例。"
+
 msgid ""
 "Loads the buffer view data from the buffer referenced by this buffer view in "
 "the given [GLTFState]. Interleaved data with a byte stride is not yet "
@@ -66967,6 +71316,9 @@ msgstr ""
 "从给定 [GLTFState] 中该缓冲区视图引用的缓冲区加载缓冲区视图数据。该方法尚不支"
 "持具有字节步幅的交错数据。数据以 [PackedByteArray] 形式返回。"
 
+msgid "Serializes this GLTFBufferView instance into a [Dictionary]."
+msgstr "将这个 GLTFBufferView 实例序列化为 [Dictionary]。"
+
 msgid ""
 "The index of the buffer this buffer view is referencing. If [code]-1[/code], "
 "this buffer view is not referencing any buffer."
@@ -68028,6 +72380,16 @@ msgstr ""
 "如果该 glTF 节点有皮肤，则 [GLTFState] 中的 [GLTFSkin] 的索引将描述皮肤的属"
 "性。如果为 -1，则该节点没有皮肤。"
 
+msgid ""
+"If [code]true[/code], the GLTF node is visible. If [code]false[/code], the "
+"GLTF node is not visible. This is converted to the [member Node3D.visible] "
+"property in the Godot scene, and is exported to [code]KHR_node_visibility[/"
+"code] when [code]false[/code]."
+msgstr ""
+"如果为 [code]true[/code]，则 GLTF 节点可见。如果 [code]false[/code]，则 GLTF "
+"节点不可见。这会被转换为 Godot 场景中的 [member Node3D.visible] 属性，为 "
+"[code]false[/code] 时会导出到 [code]KHR_node_visibility[/code]。"
+
 msgid ""
 "The transform of the glTF node relative to its parent. This property is "
 "usually unused since the position, rotation, and scale properties are "
@@ -68672,6 +73034,19 @@ msgstr ""
 "返回 glTF 文件中所有 [GLTFCamera] 的数组。这些是 [member GLTFNode.camera] 索引"
 "引用的相机。"
 
+msgid "Use [member handle_binary_image_mode] instead."
+msgstr "请改用 [member handle_binary_image_mode]。"
+
+msgid ""
+"Deprecated untyped alias for [member handle_binary_image_mode]. When "
+"importing a glTF file with unimported raw binary images embedded inside of "
+"binary blob buffers, in data URIs, or separate files not imported by Godot, "
+"this controls how the images are handled."
+msgstr ""
+"[member handle_binary_image_mode] 的已弃用无类型别名。当导入包含未导入的原始二"
+"进制图像（这些图像可能嵌入在二进制数据块缓冲区中、数据 URI 中或 Godot 未导入的"
+"单独文件中）的 glTF 文件时，该选项控制图像的处理方式。"
+
 msgid ""
 "Gets the images of the glTF file as an array of [Texture2D]s. These are the "
 "images that the [member GLTFTexture.src_image] index refers to."
@@ -68879,6 +73254,25 @@ msgstr ""
 msgid "The binary buffer attached to a .glb file."
 msgstr "附加到 .glb 文件的二进制缓冲区。"
 
+msgid ""
+"When importing a glTF file with unimported raw binary images embedded inside "
+"of binary blob buffers, in data URIs, or separate files not imported by "
+"Godot, this controls how the images are handled. Images can be discarded, "
+"saved as separate files, or embedded in the scene lossily or losslessly. See "
+"[enum HandleBinaryImageMode] for options.\n"
+"This property does nothing for image files in the [code]res://[/code] folder "
+"imported by Godot, as those are handled by Godot's image importer directly, "
+"and then the Godot scene generated from the glTF file will use the images as "
+"Godot imported them."
+msgstr ""
+"导入包含未导入的原始二进制图像（这些图像可能嵌入在二进制数据块缓冲区中、数据 "
+"URI 中或 Godot 未导入的单独文件中）的 glTF 文件时，该设置控制图像的处理方式。"
+"图像可以被丢弃，保存为单独的文件，或以有损或无损方式嵌入到场景中。有关选项见 "
+"[enum HandleBinaryImageMode]。\n"
+"该属性对 Godot 导入的位于 [code]res://[/code] 文件夹中的图像文件不起作用，因为"
+"这些文件由 Godot 的图像导入器直接处理，然后从 glTF 文件生成的 Godot 场景将使"
+"用 Godot 导入的图像。"
+
 msgid ""
 "If [code]true[/code], forces all GLTFNodes in the document to be bones of a "
 "single [Skeleton3D] Godot node."
@@ -68907,18 +73301,82 @@ msgstr ""
 "场景的名称。导入时，如果没有指定，这将是文件名。导出时，如果指定，场景名称将被"
 "保存到 glTF 文件中。"
 
+msgid ""
+"When importing a glTF file with embedded binary images, discards all images "
+"and uses untextured materials in their place. Images stored as separate files "
+"in the [code]res://[/code] folder are not affected by this; those will be "
+"used as Godot imported them."
+msgstr ""
+"导入包含嵌入式二进制图像的 glTF 文件时，会丢弃所有图像，并使用未应用纹理的材质"
+"代替它们。以独立文件存储在 [code]res://[/code] 文件夹中的图像不受此影响；"
+"Godot 会按照导入时的设置使用这些图像。"
+
+msgid ""
+"When importing a glTF file with embedded binary images, extracts them and "
+"saves them to their own files. This allows the image to be imported by "
+"Godot's image importer, which can then have their import options customized "
+"by the user, including optionally compressing the image to VRAM texture "
+"formats.\n"
+"This will save the images's bytes exactly as-is, without recompression. For "
+"image formats supplied by glTF extensions, the file will have a filename "
+"ending with the file extension supplied by [method "
+"GLTFDocumentExtension._get_image_file_extension] of the extension class.\n"
+"[b]Note:[/b] This option is editor-only. At runtime, this acts the same as "
+"[constant HANDLE_BINARY_IMAGE_MODE_EMBED_AS_UNCOMPRESSED]."
+msgstr ""
+"导入包含嵌入式二进制图像的 glTF 文件时，程序会提取这些图像并将它们保存到单独的"
+"文件中。这样，Godot 的图像导入器就可以导入这些图像，用户也可以自定义它们的导入"
+"选项，包括选择性地将图像压缩为 VRAM 纹理格式。\n"
+"这将以原始格式保存图像的字节数据，而不会重新压缩。对于由 glTF 扩展提供的图像格"
+"式，文件名将以扩展类的 [method "
+"GLTFDocumentExtension._get_image_file_extension] 提供的文件扩展名结尾。\n"
+"[b]注意：[/b]该选项仅供编辑器使用。在运行时中，它的行为与 [constant "
+"HANDLE_BINARY_IMAGE_MODE_EMBED_AS_UNCOMPRESSED] 相同。"
+
+msgid ""
+"When importing a glTF file with embedded binary images, embeds textures VRAM "
+"compressed with Basis Universal into the generated scene. Images stored as "
+"separate files in the [code]res://[/code] folder are not affected by this; "
+"those will be used as Godot imported them."
+msgstr ""
+"导入包含嵌入的二进制图像的 glTF 文件时，会将使用 Basis Universal 压缩的 VRAM "
+"纹理嵌入到生成的场景中。以独立文件存储在 [code]res://[/code] 文件夹中的图像不"
+"受此影响；这些图像将按照 Godot 导入的方式使用。"
+
+msgid ""
+"When importing a glTF file with embedded binary images, embeds textures "
+"compressed losslessly into the generated scene. Images stored as separate "
+"files in the [code]res://[/code] folder are not affected by this; those will "
+"be used as Godot imported them."
+msgstr ""
+"导入包含嵌入的二进制图像的 glTF 文件时，程序会将纹理以无损压缩方式嵌入到生成的"
+"场景中。以独立文件存储在 [code]res://[/code] 文件夹中的图像不受此影响；这些文"
+"件将按照 Godot 导入的方式使用。"
+
+msgid "Use [constant HANDLE_BINARY_IMAGE_MODE_DISCARD_TEXTURES] instead."
+msgstr "请改用 [constant HANDLE_BINARY_IMAGE_MODE_DISCARD_TEXTURES]。"
+
 msgid "Discards all embedded textures and uses untextured materials."
 msgstr "丢弃所有内嵌的纹理，并使用无纹理的材质。"
 
+msgid "Use [constant HANDLE_BINARY_IMAGE_MODE_EXTRACT_TEXTURES] instead."
+msgstr "请改用 [constant HANDLE_BINARY_IMAGE_MODE_EXTRACT_TEXTURES]。"
+
 msgid ""
 "Extracts embedded textures to be reimported and compressed. Editor only. Acts "
 "as uncompressed at runtime."
 msgstr "提取内嵌的纹理以重新导入和压缩。仅限编辑器。在运行时充当未压缩的。"
 
+msgid "Use [constant HANDLE_BINARY_IMAGE_MODE_EMBED_AS_BASISU] instead."
+msgstr "请改用 [constant HANDLE_BINARY_IMAGE_MODE_EMBED_AS_BASISU]。"
+
 msgid ""
 "Embeds textures VRAM compressed with Basis Universal into the generated scene."
 msgstr "将使用 Basis Universal 压缩的纹理 VRAM 嵌入到生成的场景中。"
 
+msgid "Use [constant HANDLE_BINARY_IMAGE_MODE_EMBED_AS_UNCOMPRESSED] instead."
+msgstr "请改用 [constant HANDLE_BINARY_IMAGE_MODE_EMBED_AS_UNCOMPRESSED]。"
+
 msgid ""
 "Embeds textures compressed losslessly into the generated scene, matching old "
 "behavior."
@@ -68970,6 +73428,44 @@ msgstr "用于 S 轴（水平）纹理坐标的环绕模式。"
 msgid "Wrapping mode to use for T-axis (vertical) texture coordinates."
 msgstr "用于 T 轴（垂直）纹理坐标的环绕模式。"
 
+msgid "Provides access to an embedded Godot instance."
+msgstr "提供对嵌入的 Godot 实例的访问权限。"
+
+msgid ""
+"GodotInstance represents a running Godot instance that is controlled from an "
+"outside codebase, without a perpetual main loop. It is created by the C API "
+"[code]libgodot_create_godot_instance[/code]. Only one may be created per "
+"process."
+msgstr ""
+"GodotInstance 代表一个正在运行的 Godot 实例，该实例由外部代码库控制，且没有永"
+"久的主循环。它通过 C API 函数 [code]libgodot_create_godot_instance[/code] 创"
+"建。每个进程只能创建一个 GodotInstance 实例。"
+
+msgid "Notifies the instance that it is now in focus."
+msgstr "通知实例它现在处于焦点状态。"
+
+msgid "Notifies the instance that it is now not in focus."
+msgstr "通知实例它现在已失去焦点。"
+
+msgid "Returns [code]true[/code] if this instance has been fully started."
+msgstr "如果该实例已完全启动，则返回 [code]true[/code]。"
+
+msgid ""
+"Runs a single iteration of the main loop. Returns [code]true[/code] if the "
+"engine is attempting to quit."
+msgstr "执行主循环的单次迭代。如果引擎正在尝试退出，则返回 [code]true[/code]。"
+
+msgid "Notifies the instance that it is going to be paused."
+msgstr "通知实例它即将被暂停。"
+
+msgid "Notifies the instance that it is being resumed."
+msgstr "通知实例它正在被恢复运行。"
+
+msgid ""
+"Finishes this instance's startup sequence. Returns [code]true[/code] on "
+"success."
+msgstr "完成该实例的启动序列。成功时返回 [code]true[/code]。"
+
 msgid "A 2D particle emitter."
 msgstr "2D 粒子发射器。"
 
@@ -70129,6 +74625,18 @@ msgstr ""
 "[b]注意：[/b]设置该属性会一次性更新所有颜色。单独更改某个颜色请使用 [method "
 "set_color]。"
 
+msgid ""
+"The color space used to interpolate between points of the gradient. It does "
+"not affect the returned colors, which will always use nonlinear sRGB "
+"encoding.\n"
+"[b]Note:[/b] This setting has no effect when [member interpolation_mode] is "
+"set to [constant GRADIENT_INTERPOLATE_CONSTANT]."
+msgstr ""
+"用于在渐变点之间进行插值的色彩空间。不影响返回的颜色，返回的颜色始终使用非线"
+"性 sRGB 编码。\n"
+"[b]注意：[/b][member interpolation_mode] 为 [constant "
+"GRADIENT_INTERPOLATE_CONSTANT] 时该设置无效。"
+
 msgid "The algorithm used to interpolate between points of the gradient."
 msgstr "用于在渐变点之间进行插值的算法。"
 
@@ -70706,6 +75214,25 @@ msgstr ""
 "义的。\n"
 "另见 [method is_valid_connection_type]。"
 
+msgid ""
+"Disallows to disconnect nodes when dragging from the left port of the "
+"[GraphNode]'s slot if it has the specified type. Use this to disable a "
+"disconnection previously allowed with [method add_valid_left_disconnect_type]."
+msgstr ""
+"如果 [GraphNode] 插槽的左侧端口具有指定类型，当从该端口拖动时，则不允许断开节"
+"点的连接。使用该方法来禁用以前使用 [method add_valid_left_disconnect_type] 允"
+"许的断开连接。"
+
+msgid ""
+"Disallows to disconnect nodes when dragging from the right port of the "
+"[GraphNode]'s slot if it has the specified type. Use this to disable a "
+"disconnection previously allowed with [method "
+"add_valid_right_disconnect_type]."
+msgstr ""
+"如果 [GraphNode] 插槽的右侧端口具有指定类型，当从该端口拖动时，则不允许断开节"
+"点的连接。使用该方法来禁用以前使用 [method add_valid_right_disconnect_type] 允"
+"许的断开连接。"
+
 msgid ""
 "Sets the coloration of the connection between [param from_node]'s [param "
 "from_port] and [param to_node]'s [param to_port] with the color provided in "
@@ -70822,6 +75349,9 @@ msgstr "吸附距离，单位为像素，也决定了栅格线距离。"
 msgid "If [code]true[/code], enables snapping."
 msgstr "如果为 [code]true[/code]，启用自动吸附。"
 
+msgid "[Dictionary] of human-readable port type names."
+msgstr "包含人类可读端口类型名称的 [Dictionary]。"
+
 msgid "The current zoom value."
 msgstr "当前缩放值。"
 
@@ -70996,6 +75526,14 @@ msgstr "选定的矩形的填充颜色。"
 msgid "The outline color of the selection rectangle."
 msgstr "选择的矩形的轮廓颜色。"
 
+msgid ""
+"Widens the line of a connection when the mouse is hovering over it by a "
+"percentage factor. A value of [code]0[/code] disables the highlight. A value "
+"of [code]100[/code] doubles the line width."
+msgstr ""
+"鼠标悬停在连接上时，按百分比系数加宽连接的线条。取值为 [code]0[/code] 会禁用高"
+"亮。取值为 [code]100[/code] 会将线宽加倍。"
+
 msgid "The horizontal range within which a port can be grabbed (inner side)."
 msgstr "能够抓取端口的（内侧）横向范围。"
 
@@ -71064,6 +75602,13 @@ msgstr ""
 "[b]注意：[/b]拖动手柄只会发出 [signal resize_request] 和 [signal resize_end] "
 "信号，GraphElement 需要手动调整大小。"
 
+msgid ""
+"If [code]true[/code], [PopupMenu]s that are descendants of the GraphElement "
+"are scaled with the [GraphEdit] zoom."
+msgstr ""
+"如果为 [code]true[/code]，则作为该 GraphElement 后代的 [PopupMenu] 会随着 "
+"[GraphEdit] 的缩放而缩放。"
+
 msgid "If [code]true[/code], the user can select the GraphElement."
 msgstr "如果为 [code]true[/code]，则用户能够选中该 GraphElement。"
 
@@ -71297,6 +75842,16 @@ msgid ""
 msgstr ""
 "返回具有给定 [param slot_index] 的插槽的右侧（输出）的自定义 [Texture2D]。"
 
+msgid ""
+"Returns the left (input) metadata of the slot with the given [param "
+"slot_index]."
+msgstr "返回索引为 [param slot_index] 的插槽左侧（输入）的元数据。"
+
+msgid ""
+"Returns the right (output) metadata of the slot with the given [param "
+"slot_index]."
+msgstr "返回索引为 [param slot_index] 的插槽右侧（输出）的元数据。"
+
 msgid ""
 "Returns the left (input) type of the slot with the given [param slot_index]."
 msgstr "返回索引为 [param slot_index] 的插槽左侧（输入）的类型。"
@@ -71422,6 +75977,20 @@ msgstr ""
 "切换给定插槽 [param slot_index] 的右侧（输出）端口。如果 [param enable] 为 "
 "[code]true[/code]，则右侧会出现一个端口，并且该插槽可以从这一侧连接。"
 
+msgid ""
+"Sets the custom metadata for the left (input) side of the slot with the given "
+"[param slot_index] to [param value]."
+msgstr ""
+"将索引为 [param slot_index] 的插槽的左侧（输入）的自定义元数据设置为 [param "
+"value]。"
+
+msgid ""
+"Sets the custom metadata for the right (output) side of the slot with the "
+"given [param slot_index] to [param value]."
+msgstr ""
+"将索引为 [param slot_index] 的插槽的右侧（输出）的自定义元数据设置为 [param "
+"value]。"
+
 msgid ""
 "Sets the left (input) type of the slot with the given [param slot_index] to "
 "[param type]. If the value is negative, all connections will be disallowed to "
@@ -72020,6 +76589,9 @@ msgstr ""
 "[BoxContainer] 的变体，只会将子控件横向排列。子控件的最小尺寸发生变化时会自动"
 "进行重新排列。"
 
+msgid "A 3D heightmap shape used for physics collision."
+msgstr "3D 高度图形状，用于物理碰撞。"
+
 msgid ""
 "A 3D heightmap shape, intended for use in physics to provide a shape for a "
 "[CollisionShape3D]. This type is most commonly used for terrain with vertices "
@@ -72129,6 +76701,22 @@ msgstr ""
 "[b]注意：[/b]使用 16 位或 32 位数据的高度图时建议存储为 EXR 或 HDR 格式。使用 "
 "8 位高度数据或像 PNG 这样 Godot 会导入为 8 位的格式，将导致阶梯状地形。"
 
+msgid ""
+"Heightmap data. The array's size must be equal to [member map_width] "
+"multiplied by [member map_depth]."
+msgstr ""
+"高度图数据。该数组的大小必须等于 [member map_width] 乘以 [member map_depth]。"
+
+msgid ""
+"Number of vertices in the depth of the heightmap. Changing this will resize "
+"the [member map_data]."
+msgstr "高度图深度中的顶点数。更改该项将调整 [member map_data] 的大小。"
+
+msgid ""
+"Number of vertices in the width of the heightmap. Changing this will resize "
+"the [member map_data]."
+msgstr "高度图宽度中的顶点数。更改该项将调整 [member map_data] 的大小。"
+
 msgid ""
 "A container that arranges its child controls horizontally and wraps them "
 "around at the borders."
@@ -72344,6 +76932,28 @@ msgstr ""
 "水平滚动条，通常用于为超出控件可见宽度的内容进行导航。这是基于 [Range] 的控"
 "件，从左侧（最小）滚动到右侧（最大）。"
 
+msgid ""
+"Padding between the bottom of the [theme_item ScrollBar.scroll] element and "
+"the [theme_item ScrollBar.grabber].\n"
+"[b]Note:[/b] To apply horizontal padding, modify the left/right content "
+"margins of [theme_item ScrollBar.scroll] instead."
+msgstr ""
+"[theme_item ScrollBar.scroll] 元素底部与 [theme_item ScrollBar.grabber] 之间的"
+"内边距。\n"
+"[b]注意：[/b]要应用水平内边距，请改为修改 [theme_item ScrollBar.scroll] 的左右"
+"内容边距。"
+
+msgid ""
+"Padding between the top of the [theme_item ScrollBar.scroll] element and the "
+"[theme_item ScrollBar.grabber].\n"
+"[b]Note:[/b] To apply horizontal padding, modify the left/right content "
+"margins of [theme_item ScrollBar.scroll] instead."
+msgstr ""
+"[theme_item ScrollBar.scroll] 元素顶部与 [theme_item ScrollBar.grabber] 之间的"
+"内边距。\n"
+"[b]注意：[/b]要应用水平内边距，请改为修改 [theme_item ScrollBar.scroll] 的左右"
+"内容边距。"
+
 msgid "A horizontal line used for separating other controls."
 msgstr "分隔其他控件的水平线。"
 
@@ -73797,6 +78407,27 @@ msgstr "要下载到的文件。将任何接收到的文件输出到其中。"
 msgid "Maximum number of allowed redirects."
 msgstr "允许的最大重定向数。"
 
+msgid ""
+"The duration to wait before a request times out, in seconds (independent of "
+"[member Engine.time_scale]). If [member timeout] is set to [code]0.0[/code], "
+"the request will never time out.\n"
+"For simple requests, such as communication with a REST API, it is recommended "
+"to set [member timeout] to a value suitable for the server response time "
+"(commonly between [code]1.0[/code] and [code]10.0[/code]). This will help "
+"prevent unwanted timeouts caused by variation in response times while still "
+"allowing the application to detect when a request has timed out. For larger "
+"requests such as file downloads, it is recommended to set [member timeout] to "
+"[code]0.0[/code], disabling the timeout functionality. This will help prevent "
+"large transfers from failing due to exceeding the timeout value."
+msgstr ""
+"请求超时前的等待时间，单位为秒（与 [member Engine.time_scale] 无关）。如果 "
+"[member timeout] 为 [code]0.0[/code]，则请求将永远不会超时。\n"
+"对于简单的请求，例如与 REST API 通信，建议将 [member timeout] 设为与服务器响应"
+"时间匹配的值（通常在 [code]1.0[/code] 到 [code]10.0[/code] 之间）。这将有助于"
+"防止由于响应时间波动而导致的不必要的超时，同时仍然允许应用程序检测请求何时超"
+"时。对于较大的请求，例如文件下载，建议将 [member timeout] 设置为 [code]0.0[/"
+"code]，禁用超时功能。这将有助于防止由于超出超时值而导致大型传输失败。"
+
 msgid "If [code]true[/code], multithreading is used to improve performance."
 msgstr "为 [code]true[/code] 时，将启用多线程提高性能。"
 
@@ -73860,9 +78491,65 @@ msgstr ""
 "请求由于超时而失败。如果本就希望请求花费较长的时间，请尝试增大 [member "
 "timeout]，或将其设为 [code]0.0[/code] 从而完全移除超时。"
 
+msgid "A node for inverse kinematics which may modify more than one bone."
+msgstr "用于反向动力学的节点，可以修改多个骨骼。"
+
+msgid ""
+"Base class of [SkeletonModifier3D]s that has some joint lists and applies "
+"inverse kinematics. This class has some structs, enums, and helper methods "
+"which are useful to solve inverse kinematics."
+msgstr ""
+"这是 [SkeletonModifier3D] 的基类，包含一些关节列表并应用反向动力学。该类包含一"
+"些结构体、枚举和辅助方法，这些对于解决反向动力学问题非常有用。"
+
+msgid "Returns the number of settings."
+msgstr "返回设置项的数量。"
+
+msgid "Resets a state with respect to the current bone pose."
+msgstr "根据当前的骨骼姿势重置状态。"
+
+msgid "Sets the number of settings."
+msgstr "设置设置项的数量。"
+
+msgid ""
+"If [code]true[/code], the solver retrieves the bone axis from the bone pose "
+"every frame.\n"
+"If [code]false[/code], the solver retrieves the bone axis from the bone rest "
+"and caches it, which increases performance slightly, but position changes in "
+"the bone pose made before processing this [IKModifier3D] are ignored."
+msgstr ""
+"如果为 [code]true[/code]，求解器会在每一帧从骨骼姿势中检索骨骼轴。\n"
+"如果为 [code]false[/code]，求解器会从骨骼静止状态中检索骨骼轴并进行缓存，这会"
+"略微提高性能，但在处理该 [IKModifier3D] 之前对骨骼姿势进行的任何位置更改都将被"
+"忽略。"
+
 msgid "Image datatype."
 msgstr "图像数据类型。"
 
+msgid ""
+"Native image datatype. Contains image data which can be converted to an "
+"[ImageTexture] and provides commonly used [i]image processing[/i] methods. "
+"The maximum width and height for an [Image] are [constant MAX_WIDTH] and "
+"[constant MAX_HEIGHT].\n"
+"An [Image] cannot be assigned to a texture property of an object directly "
+"(such as [member Sprite2D.texture]), and has to be converted manually to an "
+"[ImageTexture] first.\n"
+"[b]Note:[/b] Methods that modify the image data cannot be used on VRAM-"
+"compressed images. Use [method decompress] to convert the image to an "
+"uncompressed format first.\n"
+"[b]Note:[/b] The maximum image size is 16384×16384 pixels due to graphics "
+"hardware limitations. Larger images may fail to import."
+msgstr ""
+"本机图像数据类型。包含可以被转换为 [ImageTexture] 的图像数据，并提供常用的[i]"
+"图像处理[/i]方法。[Image] 的最大宽度和高度为 [constant MAX_WIDTH] 和 "
+"[constant MAX_HEIGHT]。\n"
+"[Image] 不能被直接分配给对象的纹理属性（例如 [member Sprite2D.texture]），必须"
+"先手动转换为 [ImageTexture]。\n"
+"[b]注意：[/b]修改图像数据的方法不能用于 VRAM 压缩的图像。请先使用 [method "
+"decompress] 方法将图像转换为未压缩格式。\n"
+"[b]注意：[/b]由于图形硬件限制，最大图像大小为 16384×16384 像素。较大的图像可能"
+"无法导入。"
+
 msgid "Importing images"
 msgstr "导入图像"
 
@@ -73945,6 +78632,59 @@ msgstr ""
 msgid "Removes the image's mipmaps."
 msgstr "删除图像的多级渐远纹理。"
 
+msgid ""
+"Compresses the image with a VRAM-compressed format to use less memory. Can "
+"not directly access pixel data while the image is compressed. Returns error "
+"if the chosen compression mode is not available.\n"
+"The [param source] parameter helps to pick the best compression method for "
+"DXT and ETC2 formats. It is ignored for ASTC compression.\n"
+"The [param astc_format] parameter is only taken into account when using ASTC "
+"compression; it is ignored for all other formats.\n"
+"[b]Note:[/b] [method compress] is only supported in editor builds. When run "
+"in an exported project, this method always returns [constant ERR_UNAVAILABLE]."
+msgstr ""
+"使用 VRAM 压缩格式压缩图像以减少内存的使用。当图像被压缩时，不能直接访问像素数"
+"据。如果选择的压缩模式不可用，则返回错误。\n"
+"[param source] 参数有助于为 DXT 和 ETC2 格式选择最佳压缩方法。对于 ASTC 压缩，"
+"它会被忽略。\n"
+"[param astc_format] 参数仅在使用 ASTC 压缩时才会生效；对于其他格式，它将被忽"
+"略。\n"
+"[b]注意：[/b][method compress] 仅在编辑器构建中受支持。在导出的项目中运行时，"
+"该方法始终返回 [constant ERR_UNAVAILABLE]。"
+
+msgid ""
+"Compresses the image with a VRAM-compressed format to use less memory. Can "
+"not directly access pixel data while the image is compressed. Returns error "
+"if the chosen compression mode is not available.\n"
+"This is an alternative to [method compress] that lets the user supply the "
+"channels used in order for the compressor to pick the best DXT and ETC2 "
+"formats. For other formats (non DXT or ETC2), this argument is ignored.\n"
+"The [param astc_format] parameter is only taken into account when using ASTC "
+"compression; it is ignored for all other formats.\n"
+"[b]Note:[/b] [method compress_from_channels] is only supported in editor "
+"builds. When run in an exported project, this method always returns [constant "
+"ERR_UNAVAILABLE]."
+msgstr ""
+"使用 VRAM 压缩格式压缩图像以减少内存的使用。当图像被压缩时，不能直接访问像素数"
+"据。如果选择的压缩模式不可用，则返回错误。\n"
+"这是 [method compress] 的一种替代方法，允许用户提供使用的通道，以便压缩器选择"
+"最佳的 DXT 和 ETC2 格式。对于其他格式（非 DXT 或 ETC2），该参数将被忽略。\n"
+"[param astc_format] 参数仅在使用 ASTC 压缩时才会生效；对于其他格式，它将被忽"
+"略。\n"
+"[b]注意：[/b][method compress_from_channels] 仅在编辑器构建中受支持。在导出的"
+"项目中运行时，该方法始终返回 [constant ERR_UNAVAILABLE]。"
+
+msgid ""
+"Compute image metrics on the current image and the compared image. This can "
+"be used to calculate the similarity between two images.\n"
+"The dictionary contains [code]max[/code], [code]mean[/code], "
+"[code]mean_squared[/code], [code]root_mean_squared[/code] and [code]peak_snr[/"
+"code]."
+msgstr ""
+"计算当前图像和被比较图像的图像指标。这可用于计算两幅图像之间的相似度。\n"
+"该字典包含 [code]max[/code]、[code]mean[/code]、[code]mean_squared[/code]、"
+"[code]root_mean_squared[/code] 和 [code]peak_snr[/code]。"
+
 msgid "Converts this image's format to the given [param format]."
 msgstr "将图像格式转换为 [param format]。"
 
@@ -73954,6 +78694,14 @@ msgstr "将源图像 [param src] 复制到本图像。"
 msgid "Use [method create_empty]."
 msgstr "使用 [method create_empty]。"
 
+msgid ""
+"Creates an empty image of the given size and format. If [param use_mipmaps] "
+"is [code]true[/code], generates mipmaps for this image (see [method "
+"generate_mipmaps])."
+msgstr ""
+"创建一个给定大小和格式的空图像。如果 [param use_mipmaps] 为 [code]true[/"
+"code]，则为该图像生成 mipmap（参见 [method generate_mipmaps]）。"
+
 msgid ""
 "Creates a new image of the given size and format. Fills the image with the "
 "given raw data. If [param use_mipmaps] is [code]true[/code], loads the "
@@ -73971,6 +78719,20 @@ msgstr ""
 "将该图像裁剪成给定的 [param width] 和 [param height]。如果指定的大小大于当前大"
 "小，则额外的区域用黑色像素填充。"
 
+msgid ""
+"Decompresses the image if it is VRAM-compressed in a supported format. This "
+"increases memory utilization, but allows modifying the image. Returns "
+"[constant OK] if the format is supported, otherwise [constant "
+"ERR_UNAVAILABLE]. All VRAM-compressed formats supported by Godot can be "
+"decompressed with this method, except [constant FORMAT_ETC2_R11S], [constant "
+"FORMAT_ETC2_RG11S], and [constant FORMAT_ETC2_RGB8A1]."
+msgstr ""
+"如果图像采用受支持的 VRAM 压缩格式，则对其进行解压缩。这会增加内存占用，但允许"
+"修改图像。如果格式受支持，则返回 [constant OK]，否则返回 [constant "
+"ERR_UNAVAILABLE]。Godot 支持的所有 VRAM 压缩格式都可以使用该方法解压缩，但 "
+"[constant FORMAT_ETC2_R11S]、[constant FORMAT_ETC2_RG11S] 和 [constant "
+"FORMAT_ETC2_RGB8A1] 除外。"
+
 msgid ""
 "Returns [constant ALPHA_BLEND] if the image has data for alpha values. "
 "Returns [constant ALPHA_BIT] if all the alpha values are stored in a single "
@@ -74103,6 +78865,14 @@ msgstr ""
 "如果图像中所有像素的 Alpha 都是 0，则返回 [code]true[/code]。如果有任何像素的 "
 "Alpha 高于 0，则返回 [code]false[/code]。"
 
+msgid ""
+"Converts the entire image from linear encoding to nonlinear sRGB encoding by "
+"using a lookup table. Only works on images with [constant FORMAT_RGB8] or "
+"[constant FORMAT_RGBA8] formats."
+msgstr ""
+"使用查找表将整个图像从线性编码转换为非线性 sRGB 编码。仅适用于 [constant "
+"FORMAT_RGB8] 或 [constant FORMAT_RGBA8] 格式的图像。"
+
 msgid ""
 "Loads an image from file [param path]. See [url=$DOCS_URL/tutorials/"
 "assets_pipeline/importing_images.html#supported-image-formats]Supported image "
@@ -74145,6 +78915,9 @@ msgstr ""
 "启用的，但可以在构建时使用 [code]module_dds_enabled=no[/code] SCons 选项禁用"
 "它。"
 
+msgid "Loads an image from the binary contents of an OpenEXR file."
+msgstr "从 OpenEXR 文件的二进制内容加载图像。"
+
 msgid "Creates a new [Image] and loads data from the specified file."
 msgstr "创建一个新的 [Image] 并从指定文件加载数据。"
 
@@ -74246,6 +79019,11 @@ msgstr ""
 "code]，则将宽度和高度设置为相同。新像素将通过使用 [enum Interpolation] 常量定"
 "义的 [param interpolation] 模式计算。"
 
+msgid ""
+"Converts a standard linear RGBE (Red Green Blue Exponent) image to an image "
+"that uses nonlinear sRGB encoding."
+msgstr "将标准的线性 RGBE（红绿蓝指数）图像转换为使用非线性 sRGB 编码的图像。"
+
 msgid ""
 "Rotates the image in the specified [param direction] by [code]90[/code] "
 "degrees. The width and height of the image must be greater than [code]1[/"
@@ -74290,6 +79068,28 @@ msgstr ""
 "[b]注意：[/b]某些构建会禁用 DDS 模块，这意味着当 [method save_dds_to_buffer] "
 "从导出的项目中被调用时将返回一个空字节数组。"
 
+msgid ""
+"Saves the image as an EXR file to [param path]. If [param grayscale] is "
+"[code]true[/code] and the image has only one channel, it will be saved "
+"explicitly as monochrome rather than one red channel. This function will "
+"return [constant ERR_UNAVAILABLE] if Godot was compiled without the TinyEXR "
+"module."
+msgstr ""
+"将图像作为 EXR 文件保存到 [param path]。如果 [param grayscale] 为 [code]true[/"
+"code]，并且图像只有一个通道，它将被明确地保存为单色而不是一个红色通道。如果 "
+"Godot 引擎编译时未包含 TinyEXR 模块，则该函数将返回 [constant "
+"ERR_UNAVAILABLE]。"
+
+msgid ""
+"Saves the image as an EXR file to a byte array. If [param grayscale] is "
+"[code]true[/code] and the image has only one channel, it will be saved "
+"explicitly as monochrome rather than one red channel. This function will "
+"return an empty byte array if Godot was compiled without the TinyEXR module."
+msgstr ""
+"将图像作为 EXR 文件保存到一个字节数组。如果 [param grayscale] 为 [code]true[/"
+"code] 并且图像只有一个通道，它将被明确地保存为单色而不是一个红色通道。如果 "
+"Godot 编译时未包含 TinyEXR 模块，则该函数将返回一个空的字节数组。"
+
 msgid ""
 "Saves the image as a JPEG file to [param path] with the specified [param "
 "quality] between [code]0.01[/code] and [code]1.0[/code] (inclusive). Higher "
@@ -74371,11 +79171,133 @@ msgid ""
 "create_from_data]."
 msgstr "覆盖现有 [Image] 的数据。[method create_from_data] 的非静态等价物。"
 
+msgid ""
+"Sets the [Color] of the pixel at [code](x, y)[/code] to [param color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixel(1, 2, Color.RED) # Sets the color at (1, 2) to red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixel(1, 2, Colors.Red); // Sets the color at (1, 2) to red.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This is the same as [method set_pixelv], but with a two integer arguments "
+"instead of a [Vector2i] argument.\n"
+"[b]Note:[/b] Depending on the image's format, the color set here may be "
+"clamped or lose precision. Do not assume the color returned by [method "
+"get_pixel] to be identical to the one set here; any comparisons will likely "
+"need to use an approximation like [method Color.is_equal_approx].\n"
+"[b]Note:[/b] On grayscale image formats, only the red channel of [param "
+"color] is used (and alpha if relevant). The green and blue channels are "
+"ignored."
+msgstr ""
+"将 [code](x, y)[/code] 处像素的 [Color] 设置为 [param color]。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixel(1, 2, Color.RED) # 将 (1, 2) 处的颜色设置为红色。\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixel(1, 2, Colors.Red); // 将 (1, 2) 处的颜色设置为红色。\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"这与 [method set_pixelv] 相同，只是使用两个整数参数而不是一个 [Vector2i] 参"
+"数。\n"
+"[b]注意：[/b]根据图像格式的不同，此处设置的颜色可能会受到限制或失去精度。请勿"
+"假定 [method get_pixel] 方法返回的颜色与此处设置的颜色完全相同；任何比较操作可"
+"能都需要使用近似比较方法，例如 [method Color.is_equal_approx]。\n"
+"[b]注意：[/b]在灰度图像格式中，仅使用 [param color] 的红色通道（以及相关的 "
+"alpha 通道）。绿色和蓝色通道将被忽略。"
+
+msgid ""
+"Sets the [Color] of the pixel at [param point] to [param color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixelv(Vector2i(1, 2), Color.RED) # Sets the color at (1, 2) to red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixelv(new Vector2I(1, 2), Colors.Red); // Sets the color at (1, 2) to "
+"red.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This is the same as [method set_pixel], but with a [Vector2i] argument "
+"instead of two integer arguments.\n"
+"[b]Note:[/b] Depending on the image's format, the color set here may be "
+"clamped or lose precision. Do not assume the color returned by [method "
+"get_pixelv] to be identical to the one set here; any comparisons will likely "
+"need to use an approximation like [method Color.is_equal_approx].\n"
+"[b]Note:[/b] On grayscale image formats, only the red channel of [param "
+"color] is used (and alpha if relevant). The green and blue channels are "
+"ignored."
+msgstr ""
+"将 [param point] 处像素的 [Color] 设置为 [param color]。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixelv(Vector2i(1, 2), Color.RED) # 将 (1, 2) 处的颜色设置为红色。\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixelv(new Vector2I(1, 2), Colors.Red); // 将 (1, 2) 处的颜色设置为红"
+"色。\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"这与 [method set_pixel] 相同，只是使用一个 [Vector2i] 参数而不是两个整数参"
+"数。\n"
+"[b]注意：[/b]根据图像格式的不同，此处设置的颜色可能会受到限制或失去精度。请勿"
+"假定 [method get_pixel] 方法返回的颜色与此处设置的颜色完全相同；任何比较操作可"
+"能都需要使用近似比较方法，例如 [method Color.is_equal_approx]。\n"
+"[b]注意：[/b]在灰度图像格式中，仅使用 [param color] 的红色通道（以及相关的 "
+"alpha 通道）。绿色和蓝色通道将被忽略。"
+
 msgid ""
 "Shrinks the image by a factor of 2 on each axis (this divides the pixel count "
 "by 4)."
 msgstr "在每个轴上将图像缩小 2 倍（这会将像素数除以 4）。"
 
+msgid ""
+"Converts the raw data from nonlinear sRGB encoding to linear encoding using a "
+"lookup table. Only works on images with [constant FORMAT_RGB8] or [constant "
+"FORMAT_RGBA8] formats.\n"
+"[b]Note:[/b] The 8-bit formats required by this method are not suitable for "
+"storing linearly encoded values; a significant amount of color information "
+"will be lost in darker values. To maintain image quality, this method should "
+"not be used."
+msgstr ""
+"使用查找表将非线性 sRGB 编码的原始数据转换为线性编码。仅适用于 [constant "
+"FORMAT_RGB8] 或 [constant FORMAT_RGBA8] 格式的图像。\n"
+"[b]注意：[/b]该方法所需的 8 位格式不适合存储线性编码值；在较暗的颜色值中会丢失"
+"大量颜色信息。为了保持图像质量，不应使用该方法。"
+
 msgid ""
 "Holds all the image's color data in a given format. See [enum Format] "
 "constants."
@@ -74405,6 +79327,24 @@ msgid ""
 "for each."
 msgstr "OpenGL 纹理格式 [code]RG[/code]，具有两个部分，每个部分的位深度为 8。"
 
+msgid ""
+"OpenGL texture format [code]RGB[/code] with three components, each with a "
+"bitdepth of 8.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"OpenGL 纹理格式 [code]RGB[/code] 具有三个分量，每个分量的位深度为 8。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
+msgid ""
+"OpenGL texture format [code]RGBA[/code] with four components, each with a "
+"bitdepth of 8.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"OpenGL 纹理格式 [code]RGBA[/code] 有四个分量，每个分量的位深度为 8。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
 msgid ""
 "OpenGL texture format [code]RGBA[/code] with four components, each with a "
 "bitdepth of 4."
@@ -74478,6 +79418,47 @@ msgstr ""
 "一种特殊的 OpenGL 纹理格式，其中三个颜色成分的精度为 9 位，所有三个成分共享一"
 "个 5 比特位的指数。"
 
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/S3_Texture_Compression]S3TC[/url] "
+"texture format that uses Block Compression 1, and is the smallest variation "
+"of S3TC, only providing 1 bit of alpha and color data being premultiplied "
+"with alpha.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"[url=https://en.wikipedia.org/wiki/S3_Texture_Compression]S3TC[/url] 纹理格式"
+"使用块压缩 1，并且是 S3TC 的最小变化，仅提供 1 位的 Alpha 和颜色数据 预乘以 "
+"Alpha。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/S3_Texture_Compression]S3TC[/url] "
+"texture format that uses Block Compression 2, and color data is interpreted "
+"as not having been premultiplied by alpha. Well suited for images with sharp "
+"alpha transitions between translucent and opaque areas.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"使用块压缩 2 的 [url=https://en.wikipedia.org/wiki/"
+"S3_Texture_Compression]S3TC[/url] 贴图格式,并且颜色数据被解析为没有与 Alpha 预"
+"先相乘。非常适用于具有 半透明和不透明区域之间的清晰的 Alpha 过渡。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/S3_Texture_Compression]S3TC[/url] "
+"texture format also known as Block Compression 3 or BC3 that contains 64 bits "
+"of alpha channel data followed by 64 bits of DXT1-encoded color data. Color "
+"data is not premultiplied by alpha, same as DXT3. DXT5 generally produces "
+"superior results for transparent gradients compared to DXT3.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"[url=https://en.wikipedia.org/wiki/S3_Texture_Compression]S3TC[/url] 纹理格式"
+"也称为块压缩 3 或 BC3，其中包含 64 位的 Alpha 通道数据，后跟 64 位的 DXT1 编码"
+"颜色数据。颜色数据不会与 DXT3 预先乘以 Alpha。与 DXT3 相比，DXT5 对于透明渐变"
+"通常会产生更好的结果。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
 msgid ""
 "Texture format that uses [url=https://www.khronos.org/opengl/wiki/"
 "Red_Green_Texture_Compression]Red Green Texture Compression[/url], "
@@ -74498,6 +79479,17 @@ msgstr ""
 "绿贴图压缩[/url]的贴图格式，使用与 DXT5 用于 Alpha 的压缩算法相同的红绿数据通"
 "道。"
 
+msgid ""
+"Texture format that uses [url=https://www.khronos.org/opengl/wiki/"
+"BPTC_Texture_Compression]BPTC[/url] compression with unsigned normalized RGBA "
+"components.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"使用 [url=https://www.khronos.org/opengl/wiki/BPTC_Texture_Compression]BPTC[/"
+"url] 压缩算法和无符号归一化 RGBA 分量的纹理格式。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
 msgid ""
 "Texture format that uses [url=https://www.khronos.org/opengl/wiki/"
 "BPTC_Texture_Compression]BPTC[/url] compression with signed floating-point "
@@ -74568,6 +79560,48 @@ msgstr ""
 "爱立信纹理压缩格式 2[/url]（[code]SIGNED_RG11_EAC[/code] 变体），它提供两个有"
 "符号数据通道。"
 
+msgid ""
+"[url=https://en.wikipedia.org/wiki/"
+"Ericsson_Texture_Compression#ETC2_and_EAC]Ericsson Texture Compression format "
+"2[/url] ([code]RGB8[/code] variant), which is a follow-up of ETC1 and "
+"compresses RGB888 data.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"[url=https://zh.wikipedia.org/zh-cn/"
+"%E7%88%B1%E7%AB%8B%E4%BF%A1%E7%BA%B9%E7%90%86%E5%8E%8B%E7%BC%A9#[3]ETC2%E5%92%8CEAC]"
+"爱立信纹理压缩格式 2[/url]（[code]RGB8[/code] 变体），它是 ETC1 的后续版本，可"
+"压缩 RGB888 数据。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
+msgid ""
+"[url=https://en.wikipedia.org/wiki/"
+"Ericsson_Texture_Compression#ETC2_and_EAC]Ericsson Texture Compression format "
+"2[/url] ([code]RGBA8[/code]variant), which compresses RGBA8888 data with full "
+"alpha support.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"[url=https://zh.wikipedia.org/zh-cn/"
+"%E7%88%B1%E7%AB%8B%E4%BF%A1%E7%BA%B9%E7%90%86%E5%8E%8B%E7%BC%A9#[3]ETC2%E5%92%8CEAC]"
+"爱立信纹理压缩格式 2[/url]（[code]RGBA8[/code] 变体），它可以压缩 RGBA8888 数"
+"据，完全支持 Alpha。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
+msgid ""
+"[url=https://en.wikipedia.org/wiki/"
+"Ericsson_Texture_Compression#ETC2_and_EAC]Ericsson Texture Compression format "
+"2[/url] ([code]RGB8_PUNCHTHROUGH_ALPHA1[/code] variant), which compresses "
+"RGBA data to make alpha either fully transparent or fully opaque.\n"
+"[b]Note:[/b] When creating an [ImageTexture], a nonlinear sRGB to linear "
+"encoding conversion is performed."
+msgstr ""
+"[url=https://zh.wikipedia.org/zh-cn/"
+"%E7%88%B1%E7%AB%8B%E4%BF%A1%E7%BA%B9%E7%90%86%E5%8E%8B%E7%BC%A9#[3]ETC2%E5%92%8CEAC]"
+"爱立信纹理压缩格式 2[/url]（[code]RGB8_PUNCHTHROUGH_ALPHA1[/code] 变体），它可"
+"以压缩 RGBA 数据，使 Alpha 完全透明或完全不透明。\n"
+"[b]注意：[/b]创建 [ImageTexture] 时，会执行非线性 sRGB 到线性编码的转换。"
+
 msgid ""
 "[url=https://en.wikipedia.org/wiki/"
 "Ericsson_Texture_Compression#ETC2_and_EAC]Ericsson Texture Compression format "
@@ -74619,6 +79653,138 @@ msgid ""
 msgstr ""
 "与 [constant FORMAT_ASTC_8x8] 相同的格式，但有提示以让 GPU 知道它用于 HDR。"
 
+msgid ""
+"OpenGL texture format [code]GL_R16[/code] where there's one component, a 16-"
+"bit unsigned normalized integer value. Since the value is normalized, each "
+"component is clamped between [code]0.0[/code] and [code]1.0[/code] "
+"(inclusive).\n"
+"[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be "
+"used on desktop or console devices. It may be unsupported on mobile or web, "
+"and will consequently be converted to [constant FORMAT_RF]."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_R16[/code] 只有一个分量，即 16 位无符号归一化整数值。"
+"由于该值已归一化，因此每个分量的值都被限制在 [code]0.0[/code] 到 [code]1.0[/"
+"code]（含）之间。\n"
+"[b]注意：[/b]由于硬件支持有限，推荐主要在桌面或游戏主机设备上使用。它可能不受"
+"移动或 Web 平台的支持，因此会被转换为 [constant FORMAT_RF] 格式。"
+
+msgid ""
+"OpenGL texture format [code]GL_RG16[/code] where there are two components, "
+"each a 16-bit unsigned normalized integer value. Since the value is "
+"normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/"
+"code] (inclusive).\n"
+"[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be "
+"used on desktop or console devices. It may be unsupported on mobile or web, "
+"and will consequently be converted to [constant FORMAT_RGF]."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RG16[/code] 包含两个分量，每个分量都是一个 16 位无符"
+"号归一化整数值。由于该值已归一化，因此每个分量的值都被限制在 [code]0.0[/code] "
+"到 [code]1.0[/code]（含）之间。\n"
+"[b]注意：[/b]由于硬件支持有限，推荐主要在桌面或游戏主机设备上使用。它可能不受"
+"移动或 Web 平台的支持，因此会被转换为 [constant FORMAT_RGF] 格式。"
+
+msgid ""
+"OpenGL texture format [code]GL_RGB16[/code] where there are three components, "
+"each a 16-bit unsigned normalized integer value. Since the value is "
+"normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/"
+"code] (inclusive).\n"
+"[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be "
+"used on desktop or console devices. It may be unsupported on mobile or web, "
+"and will consequently be converted to [constant FORMAT_RGBF]."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RGB16[/code] 包含三个分量，每个分量都是一个 16 位无符"
+"号归一化整数值。由于该值已归一化，因此每个分量的值都被限制在 [code]0.0[/code] "
+"到 [code]1.0[/code]（含）之间。\n"
+"[b]注意：[/b]由于硬件支持有限，推荐主要在桌面或游戏主机设备上使用。它可能不受"
+"移动或 Web 平台的支持，因此会被转换为 [constant FORMAT_RGBF] 格式。"
+
+msgid ""
+"OpenGL texture format [code]GL_RGBA16[/code] where there are four components, "
+"each a 16-bit unsigned normalized integer value. Since the value is "
+"normalized, each component is clamped between [code]0.0[/code] and [code]1.0[/"
+"code] (inclusive).\n"
+"[b]Note:[/b] Due to limited hardware support, it is mainly recommended to be "
+"used on desktop or console devices. It may be unsupported on mobile or web, "
+"and will consequently be converted to [constant FORMAT_RGBAF]."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RGBA16[/code] 包含四个分量，每个分量都是一个 16 位无"
+"符号归一化整数值。由于该值已归一化，因此每个分量的值都被限制在 [code]0.0[/"
+"code] 到 [code]1.0[/code]（含）之间。\n"
+"[b]注意：[/b]由于硬件支持有限，推荐主要在桌面或游戏主机设备上使用。它可能不受"
+"移动或 Web 平台的支持，因此会被转换为 [constant FORMAT_RGBAF] 格式。"
+
+msgid ""
+"OpenGL texture format [code]GL_R16UI[/code] where there's one component, a 16-"
+"bit unsigned integer value. Each component is clamped between [code]0[/code] "
+"and [code]65535[/code] (inclusive).\n"
+"[b]Note:[/b] When used in a shader, the texture requires usage of "
+"[code]usampler[/code] samplers. Additionally, it only supports nearest-"
+"neighbor filtering under the Compatibility renderer.\n"
+"[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s "
+"have to be divided by [code]65535[/code] to get the correct color value."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_R16UI[/code] 包含一个分量，该分量是一个 16 位无符号整"
+"数值。每个分量的值都被限制在 [code]0[/code] 到 [code]65535[/code]（含）之"
+"间。\n"
+"[b]注意：[/b]在着色器中使用时，该纹理需要使用 [code]usampler[/code] 采样器。此"
+"外，在兼容性渲染器下，它仅支持最近邻过滤。\n"
+"[b]注意：[/b]使用 [method Image.get_pixel] 进行采样时，返回的 [Color] 值需要除"
+"以 [code]65535[/code] 才能获得正确的颜色值。"
+
+msgid ""
+"OpenGL texture format [code]GL_RG16UI[/code] where there are two components, "
+"each a 16-bit unsigned integer value. Each component is clamped between "
+"[code]0[/code] and [code]65535[/code] (inclusive).\n"
+"[b]Note:[/b] When used in a shader, the texture requires usage of "
+"[code]usampler[/code] samplers. Additionally, it only supports nearest-"
+"neighbor filtering under the Compatibility renderer.\n"
+"[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s "
+"have to be divided by [code]65535[/code] to get the correct color value."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RG16UI[/code] 包含两个分量，每个分量都是一个 16 位无"
+"符号整数值。每个分量的值都被限制在 [code]0[/code] 到 [code]65535[/code]（含）"
+"之间。\n"
+"[b]注意：[/b]在着色器中使用时，该纹理需要使用 [code]usampler[/code] 采样器。此"
+"外，在兼容性渲染器下，它仅支持最近邻过滤。\n"
+"[b]注意：[/b]使用 [method Image.get_pixel] 进行采样时，返回的 [Color] 值需要除"
+"以 [code]65535[/code] 才能获得正确的颜色值。"
+
+msgid ""
+"OpenGL texture format [code]GL_RGB16UI[/code] where there are three "
+"components, each a 16-bit unsigned integer value. Each component is clamped "
+"between [code]0[/code] and [code]65535[/code] (inclusive).\n"
+"[b]Note:[/b] When used in a shader, the texture requires usage of "
+"[code]usampler[/code] samplers. Additionally, it only supports nearest-"
+"neighbor filtering under the Compatibility renderer.\n"
+"[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s "
+"have to be divided by [code]65535[/code] to get the correct color value."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RGB16UI[/code] 包含三个分量，每个分量都是一个 16 位无"
+"符号整数值。每个分量的值都被限制在 [code]0[/code] 到 [code]65535[/code]（含）"
+"之间。\n"
+"[b]注意：[/b]在着色器中使用时，该纹理需要使用 [code]usampler[/code] 采样器。此"
+"外，在兼容性渲染器下，它仅支持最近邻过滤。\n"
+"[b]注意：[/b]使用 [method Image.get_pixel] 进行采样时，返回的 [Color] 值需要除"
+"以 [code]65535[/code] 才能获得正确的颜色值。"
+
+msgid ""
+"OpenGL texture format [code]GL_RGBA16UI[/code] where there are four "
+"components, each a 16-bit unsigned integer value. Each component is clamped "
+"between [code]0[/code] and [code]65535[/code] (inclusive).\n"
+"[b]Note:[/b] When used in a shader, the texture requires usage of "
+"[code]usampler[/code] samplers. Additionally, it only supports nearest-"
+"neighbor filtering under the Compatibility renderer.\n"
+"[b]Note:[/b] When sampling using [method Image.get_pixel], returned [Color]s "
+"have to be divided by [code]65535[/code] to get the correct color value."
+msgstr ""
+"OpenGL 纹理格式 [code]GL_RGBA16UI[/code] 包含四个分量，每个分量都是一个 16 位"
+"无符号整数值。每个分量的值都被限制在 [code]0[/code] 到 [code]65535[/code]"
+"（含）之间。\n"
+"[b]注意：[/b]在着色器中使用时，该纹理需要使用 [code]usampler[/code] 采样器。此"
+"外，在兼容性渲染器下，它仅支持最近邻过滤。\n"
+"[b]注意：[/b]使用 [method Image.get_pixel] 进行采样时，返回的 [Color] 值需要除"
+"以 [code]65535[/code] 才能获得正确的颜色值。"
+
 msgid "Represents the size of the [enum Format] enum."
 msgstr "代表 [enum Format] 枚举的大小。"
 
@@ -74674,6 +79840,20 @@ msgstr ""
 "执行 Lanczos 插值。这是最慢的图像调整大小模式，但通常可以提供最佳效果，尤其是"
 "在缩小图像时。"
 
+msgid "Image is fully opaque. It does not store alpha data."
+msgstr "图像完全不透明。它不存储 Alpha 通道数据。"
+
+msgid ""
+"Image stores either fully opaque or fully transparent pixels. Also known as "
+"punchthrough alpha."
+msgstr "图像存储的像素要么完全不透明，要么完全透明。也称为穿透式 Alpha 通道。"
+
+msgid ""
+"Image stores alpha data with values varying between [code]0.0[/code] and "
+"[code]1.0[/code]."
+msgstr ""
+"图像存储 alpha 数据，其值在 [code]0.0[/code] 和 [code]1.0[/code] 之间变化。"
+
 msgid "Use S3TC compression."
 msgstr "使用 S3TC 压缩。"
 
@@ -74715,6 +79895,9 @@ msgid ""
 "textures."
 msgstr "原始纹理（在压缩前）是常规纹理。所有纹理的默认值。"
 
+msgid "Source texture (before compression) uses nonlinear sRGB encoding."
+msgstr "源纹理（在压缩前）使用非线性 sRGB 编码。"
+
 msgid ""
 "Source texture (before compression) is a normal texture (e.g. it can be "
 "compressed into two channels)."
@@ -75113,6 +80296,20 @@ msgstr "设置将与下一个顶点一起推送的颜色属性。"
 msgid "Set the normal attribute that will be pushed with the next vertex."
 msgstr "设置将与下一个顶点一起推送的法线属性。"
 
+msgid ""
+"Set the tangent attribute that will be pushed with the next vertex.\n"
+"[b]Note:[/b] Even though [param tangent] is a [Plane], it does not directly "
+"represent the tangent plane. Its [member Plane.x], [member Plane.y], and "
+"[member Plane.z] represent the tangent vector and [member Plane.d] should be "
+"either [code]-1[/code] or [code]1[/code]. See also [constant "
+"Mesh.ARRAY_TANGENT]."
+msgstr ""
+"设置将与下一个顶点一起推送的切线属性。\n"
+"[b]注意：[/b]尽管 [param tangent] 是一个 [Plane] ，但它并不直接表示切平面。它"
+"的 [member Plane.x]、[member Plane.y] 和 [member Plane.z] 表示切线向量，而 "
+"[member Plane.d] 应该为 [code]-1[/code] 或 [code]1[/code]。另见 [constant "
+"Mesh.ARRAY_TANGENT]。"
+
 msgid "Set the UV attribute that will be pushed with the next vertex."
 msgstr "设置将与下一个顶点一起推送的 UV 属性。"
 
@@ -75153,6 +80350,13 @@ msgstr ""
 msgid "Removes all surfaces and blend shapes from this [ImporterMesh]."
 msgstr "从该 [ImporterMesh] 中，移除所有表面和混合形状。"
 
+msgid ""
+"Converts the given [Mesh] into an [ImporterMesh] by copying all its surfaces, "
+"blend shapes, materials, and metadata into a new [ImporterMesh] object."
+msgstr ""
+"通过将给定 [Mesh] 的所有表面、混合形状、材质和元数据复制到一个新的 "
+"[ImporterMesh] 对象中，将其转换为 [ImporterMesh] 对象。"
+
 msgid ""
 "Generates all lods for this ImporterMesh.\n"
 "[param normal_merge_angle] is in degrees and used in the same way as the "
@@ -75532,6 +80736,15 @@ msgstr ""
 "默认情况下，死区根据动作死区的平均值自动计算。然而，你可以把死区覆盖为任何你想"
 "要的值（在 0 到 1 的范围内）。"
 
+msgid ""
+"Returns [code]true[/code] if the joypad has an LED light that can change "
+"colors and/or brightness. See also [method set_joy_light].\n"
+"[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS."
+msgstr ""
+"如果游戏手柄具有可以改变颜色和/或亮度的 LED 灯，则返回 [code]true[/code]。另"
+"见 [method set_joy_light]。\n"
+"[b]注意：[/b]该功能仅支持 Windows、Linux 和 macOS。"
+
 msgid ""
 "Returns [code]true[/code] when the user has [i]started[/i] pressing the "
 "action event in the current frame or physics tick. It will only return "
@@ -75899,6 +81112,18 @@ msgstr ""
 "PC 上的编辑器中。\n"
 "[b]注意：[/b]在 Android 和 iOS 上，这个值可立即被硬件传感器的值所覆盖。"
 
+msgid ""
+"Sets the joypad's LED light, if available, to the specified color. See also "
+"[method has_joy_light].\n"
+"[b]Note:[/b] There is no way to get the color of the light from a joypad. If "
+"you need to know the assigned color, store it separately.\n"
+"[b]Note:[/b] This feature is only supported on Windows, Linux, and macOS."
+msgstr ""
+"将游戏手柄的 LED 灯（如果有）设置为指定颜色。另见 [method has_joy_light]。\n"
+"[b]注意：[/b]无法从游戏手柄获取灯光的颜色。如果你需要知道分配的颜色，请单独存"
+"储。\n"
+"[b]注意：[/b]该功能仅支持 Windows、Linux 和 macOS。"
+
 msgid ""
 "Sets the value of the magnetic field of the magnetometer sensor. Can be used "
 "for debugging on devices without a hardware sensor, for example in an editor "
@@ -76573,11 +81798,136 @@ msgstr ""
 "项目在所有配置下都能正常工作，请不要假设用户在项目行为中具有特定的按键重复配"
 "置。"
 
+msgid ""
+"Represents the localized label printed on the key in the current keyboard "
+"layout, which corresponds to one of the [enum Key] constants or any valid "
+"Unicode character. Key labels are meant for key prompts.\n"
+"For keyboard layouts with a single label on the key, it is equivalent to "
+"[member keycode].\n"
+"To get a human-readable representation of the [InputEventKey], use "
+"[code]OS.get_keycode_string(event.key_label)[/code] where [code]event[/code] "
+"is the [InputEventKey].\n"
+"[codeblock lang=text]\n"
+"+-----+ +-----+\n"
+"| Q   | | Q   | - \"Q\" - keycode\n"
+"|   Й | |  ض | - \"Й\" and \"ض\" - key_label\n"
+"+-----+ +-----+\n"
+"[/codeblock]"
+msgstr ""
+"表示当前键盘布局中印在键上的本地化标签，对应于 [enum Key] 常量之一或任何有效"
+"的 Unicode 字符。按键标签用于按键提示。\n"
+"对于键上只有一个标签的键盘布局，它等同于 [member keycode]。\n"
+"要获得 [InputEventKey] 的人类可读表示，请使用 "
+"[code]OS.get_keycode_string(event.key_label)[/code]，其中 [code]event[/code] "
+"是 [InputEventKey]。\n"
+"[codeblock lang=text]\n"
+"+-----+ +-----+\n"
+"| Q   | | Q   | - \"Q\" - keycode\n"
+"|   Й | |  ض | - \"Й\" and \"ض\" - key_label\n"
+"+-----+ +-----+\n"
+"[/codeblock]"
+
+msgid ""
+"Latin label printed on the key in the current keyboard layout, which "
+"corresponds to one of the [enum Key] constants. Key codes are meant for "
+"shortcuts expressed with a standard Latin keyboard, such as [kbd]Ctrl + S[/"
+"kbd] for a \"Save\" shortcut.\n"
+"To get a human-readable representation of the [InputEventKey], use "
+"[code]OS.get_keycode_string(event.keycode)[/code] where [code]event[/code] is "
+"the [InputEventKey].\n"
+"[codeblock lang=text]\n"
+"+-----+ +-----+\n"
+"| Q   | | Q   | - \"Q\" - keycode\n"
+"|   Й | |  ض | - \"Й\" and \"ض\" - key_label\n"
+"+-----+ +-----+\n"
+"[/codeblock]"
+msgstr ""
+"当前键盘布局中键上打印的拉丁标签，对应于 [enum Key] 常量之一。键码用于表示使用"
+"标准拉丁键盘的快捷键，例如 [kbd]Ctrl + S[/kbd] 表示“保存”快捷键。\n"
+"要获得 [InputEventKey] 的人类可读表示，请使用 "
+"[code]OS.get_keycode_string(event.keycode)[/code]，其中 [code]event[/code] 是 "
+"[InputEventKey]。\n"
+"[codeblock lang=text]\n"
+"+-----+ +-----+\n"
+"| Q   | | Q   | - \"Q\" - 键码\n"
+"|   Й | |  ض | - \"Й\" 和 \"ض\" - key_label\n"
+"+-----+ +-----+\n"
+"[/codeblock]"
+
 msgid ""
 "Represents the location of a key which has both left and right versions, such "
 "as [kbd]Shift[/kbd] or [kbd]Alt[/kbd]."
 msgstr "表示具有左右版本的键的位置，例如 [kbd]Shift[/kbd] 和 [kbd]Alt[/kbd]。"
 
+msgid ""
+"Represents the physical location of a key on the 101/102-key US QWERTY "
+"keyboard, which corresponds to one of the [enum Key] constants. Physical key "
+"codes meant for game input, such as WASD movement, where only the location of "
+"the keys is important.\n"
+"To get a human-readable representation of the [InputEventKey], use [method "
+"OS.get_keycode_string] in combination with [method "
+"DisplayServer.keyboard_get_keycode_from_physical] or [method "
+"DisplayServer.keyboard_get_label_from_physical]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _input(event):\n"
+"\tif event is InputEventKey:\n"
+"\t\tvar keycode = "
+"DisplayServer.keyboard_get_keycode_from_physical(event.physical_keycode)\n"
+"\t\tvar label = "
+"DisplayServer.keyboard_get_label_from_physical(event.physical_keycode)\n"
+"\t\tprint(OS.get_keycode_string(keycode))\n"
+"\t\tprint(OS.get_keycode_string(label))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Input(InputEvent @event)\n"
+"{\n"
+"\tif (@event is InputEventKey inputEventKey)\n"
+"\t{\n"
+"\t\tvar keycode = "
+"DisplayServer.KeyboardGetKeycodeFromPhysical(inputEventKey.PhysicalKeycode);\n"
+"\t\tvar label = "
+"DisplayServer.KeyboardGetLabelFromPhysical(inputEventKey.PhysicalKeycode);\n"
+"\t\tGD.Print(OS.GetKeycodeString(keycode));\n"
+"\t\tGD.Print(OS.GetKeycodeString(label));\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"代表按键在 101/102 键的美式键盘上的物理位置，对应一个 [enum Key] 常量。用于游"
+"戏输入的物理键码，例如 WASD 移动键，其中只有按键的位置很重要。\n"
+"要获取 [InputEventKey] 的人类可读表示，请搭配使用 [method "
+"OS.get_keycode_string] 和 [method "
+"DisplayServer.keyboard_get_keycode_from_physical] 或 [method "
+"DisplayServer.keyboard_get_label_from_physical] 方法：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _input(event):\n"
+"\tif event is InputEventKey:\n"
+"\t\tvar keycode = "
+"DisplayServer.keyboard_get_keycode_from_physical(event.physical_keycode)\n"
+"\t\tvar label = "
+"DisplayServer.keyboard_get_label_from_physical(event.physical_keycode)\n"
+"\t\tprint(OS.get_keycode_string(keycode))\n"
+"\t\tprint(OS.get_keycode_string(label))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Input(InputEvent @event)\n"
+"{\n"
+"\tif (@event is InputEventKey inputEventKey)\n"
+"\t{\n"
+"\t\tvar keycode = "
+"DisplayServer.KeyboardGetKeycodeFromPhysical(inputEventKey.PhysicalKeycode);\n"
+"\t\tvar label = "
+"DisplayServer.KeyboardGetLabelFromPhysical(inputEventKey.PhysicalKeycode);\n"
+"\t\tGD.Print(OS.GetKeycodeString(keycode));\n"
+"\t\tGD.Print(OS.GetKeycodeString(label));\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "If [code]true[/code], the key's state is pressed. If [code]false[/code], the "
 "key's state is released."
@@ -76585,6 +81935,22 @@ msgstr ""
 "如果为 [code]true[/code]，按键的状态是被按下。如果为 [code]false[/code]，该键"
 "的状态被释放。"
 
+msgid ""
+"The key Unicode character code (when relevant), shifted by modifier keys. "
+"Unicode character codes for composite characters and complex scripts may not "
+"be available unless IME input mode is active. See [method "
+"Window.set_ime_active] for more information. Unicode character codes are "
+"meant for text input.\n"
+"[b]Note:[/b] This property is set by the engine only for a pressed event. If "
+"the event is sent by an IME or a virtual keyboard, no corresponding key "
+"released event is sent."
+msgstr ""
+"按键 Unicode 字符代码（当相关时），由修饰键进行调整。除非 IME 输入模式处于活动"
+"状态，否则复合字符和复杂文字的 Unicode 字符代码可能不可用。有关详细信息，请参"
+"阅 [method Window.set_ime_active]。Unicode 字符码用于文本输入。\n"
+"[b]注意：[/b]该属性由引擎设置仅用于按下事件。如果事件是由 IME 或虚拟键盘发送"
+"的，则不会发送相应的按键释放事件。"
+
 msgid "Represents a magnifying touch gesture."
 msgstr "代表放大触摸手势。"
 
@@ -78210,6 +83576,14 @@ msgstr "设置项目图标的使用区域。如果该区域大小为 0，将使
 msgid "Sets whether the item icon will be drawn transposed."
 msgstr "设置项目图标是否将被转置绘制。"
 
+msgid ""
+"Sets the language code of the text for the item at the given index to [param "
+"language]. This is used for line-breaking and text shaping algorithms. If "
+"[param language] is empty, the current locale is used."
+msgstr ""
+"将给定索引处项目的文本语言代码设置为 [param language]。这是用于换行和文本塑形"
+"算法的。如果 [param language] 为空，则使用当前区域设置。"
+
 msgid ""
 "Sets a value (of any type) to be stored with the item associated with the "
 "specified index."
@@ -78313,6 +83687,11 @@ msgstr ""
 "是否所有列的宽度相同。\n"
 "如果为 [code]true[/code]，则宽度等于所有列的最大列宽度。"
 
+msgid ""
+"The way which scroll hints (indicators that show that the content can still "
+"be scrolled in a certain direction) will be shown."
+msgstr "滚动提示（指示内容仍可沿特定方向滚动的指示器）的显示方式。"
+
 msgid ""
 "Allows single or multiple item selection. See the [enum SelectMode] constants."
 msgstr "允许单选或多选。参阅[enum SelectMode]常量。"
@@ -78321,6 +83700,13 @@ msgid ""
 "The clipping behavior when the text exceeds an item's bounding rectangle."
 msgstr "当文本超出项目的边界矩形时的裁剪行为。"
 
+msgid ""
+"If [code]true[/code], the scroll hint texture will be tiled instead of "
+"stretched. See [member scroll_hint_mode]."
+msgstr ""
+"如果为 [code]true[/code]，则滚动提示纹理将平铺而不是拉伸。见 [member "
+"scroll_hint_mode]。"
+
 msgid ""
 "If [code]true[/code], the control will automatically move items into a new "
 "row to fit its content. See also [HFlowContainer] for this behavior.\n"
@@ -78383,6 +83769,18 @@ msgstr "允许通过按住 [kbd]Ctrl[/kbd] 或 [kbd]Shift[/kbd] 来选择多个
 msgid "Allows selecting multiple items by toggling them on and off."
 msgstr "允许选择多个项目，可以切换项目是否选中。"
 
+msgid "Scroll hints will never be shown."
+msgstr "滚动提示将永远不会显示。"
+
+msgid "Scroll hints will be shown at the top and bottom."
+msgstr "滚动提示将显示在顶部和底部。"
+
+msgid "Only the top scroll hint will be shown."
+msgstr "只会显示顶部的滚动提示。"
+
+msgid "Only the bottom scroll hint will be shown."
+msgstr "只会显示底部的滚动提示。"
+
 msgid "Default text [Color] of the item."
 msgstr "项目的默认文本颜色 [Color]。"
 
@@ -78403,6 +83801,9 @@ msgid ""
 "items."
 msgstr "参考线的颜色 [Color]。参考线是在每行项目之间画的一条线。"
 
+msgid "[Color] used to modulate the [theme_item scroll_hint] texture."
+msgstr "用于调制 [theme_item scroll_hint] 纹理的 [Color]。"
+
 msgid "The horizontal spacing between items."
 msgstr "项目之间的水平间距。"
 
@@ -78435,6 +83836,11 @@ msgstr "项目文本的字体 [Font] 。"
 msgid "Font size of the item's text."
 msgstr "项目文本的字体大小。"
 
+msgid ""
+"The indicator that will be shown when the content can still be scrolled. See "
+"[member scroll_hint_mode]."
+msgstr "内容仍可滚动时将显示的指示器。见 [member scroll_hint_mode]。"
+
 msgid "[StyleBox] used for the cursor, when the [ItemList] is being focused."
 msgstr "当该 [ItemList] 获得焦点时，用作光标的样式盒 [StyleBox]。"
 
@@ -78442,6 +83848,9 @@ msgid ""
 "[StyleBox] used for the cursor, when the [ItemList] is not being focused."
 msgstr "当该 [ItemList] 未获得焦点时，用作光标的样式盒 [StyleBox]。"
 
+msgid "The focused style for the [ItemList], drawn on top of everything."
+msgstr "[ItemList] 的聚焦样式，绘制在所有内容之上。"
+
 msgid "[StyleBox] for the hovered, but not selected items."
 msgstr "项目处于悬停但未选中状态时的 [StyleBox]。"
 
@@ -78467,10 +83876,208 @@ msgid ""
 "[StyleBox] for the selected items, used when the [ItemList] is being focused."
 msgstr "所选项的样式盒 [StyleBox]，当该 [ItemList] 获得焦点时使用。"
 
+msgid ""
+"A [SkeletonModifier3D] to approach the goal by repeating small rotations."
+msgstr "通过重复进行小幅度旋转来逐步接近目标的 [SkeletonModifier3D]。"
+
+msgid ""
+"Base class of [SkeletonModifier3D] to approach the goal by repeating small "
+"rotations.\n"
+"Each bone chain (setting) has one effector, which is processed in order of "
+"the setting list. You can set some limitations for each joint."
+msgstr ""
+"[SkeletonModifier3D] 的基类，通过重复进行小幅度旋转来接近目标。\n"
+"每个骨骼链（设置项）都有一个效果器，并按照设置项列表的顺序进行处理。你可以为每"
+"个关节设置一些限制。"
+
+msgid ""
+"Returns the joint limitation at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 的关节限制。"
+
+msgid ""
+"Returns the joint limitation right axis at [param joint] in the bone chain's "
+"joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 处的关节限制右轴。"
+
+msgid ""
+"Returns the joint limitation right axis vector at [param joint] in the bone "
+"chain's joint list.\n"
+"If [method get_joint_limitation_right_axis] is [constant "
+"SkeletonModifier3D.SECONDARY_DIRECTION_NONE], this method returns "
+"[code]Vector3(0, 0, 0)[/code]."
+msgstr ""
+"返回骨骼链关节列表中 [param joint] 处关节的右轴限制向量。\n"
+"如果 [method get_joint_limitation_right_axis] 为 [constant "
+"SkeletonModifier3D.SECONDARY_DIRECTION_NONE]，则该方法返回 [code]Vector3(0, "
+"0, 0)[/code]。"
+
+msgid ""
+"Returns the joint limitation rotation offset at [param joint] in the bone "
+"chain's joint list.\n"
+"Rotation is done in the local space which is constructed by the bone "
+"direction (in general parent to child) as the +Y axis and [method "
+"get_joint_limitation_right_axis_vector] as the +X axis.\n"
+"If the +X and +Y axes are not orthogonal, the +X axis is implicitly modified "
+"to make it orthogonal.\n"
+"Also, if the length of [method get_joint_limitation_right_axis_vector] is "
+"zero, the space is created by rotating the bone rest using the shortest arc "
+"that rotates the +Y axis of the bone rest to match the bone direction."
+msgstr ""
+"返回骨骼链关节列表中 [param joint] 处的关节限制旋转偏移量。\n"
+"旋转是在局部空间中进行的，该局部空间以骨骼方向（通常是从父骨骼指向子骨骼）作"
+"为 +Y 轴，并以 [method get_joint_limitation_right_axis_vector] 作为 +X 轴构"
+"建。\n"
+"如果 +X 轴和 +Y 轴并不正交，则会隐式修改 +X 轴使其正交。\n"
+"此外，如果 [method get_joint_limitation_right_axis_vector] 的长度为零，则通过"
+"使用最短弧旋转骨骼的静止姿态来创建该空间，使骨骼静止姿态的 +Y 轴与骨骼方向匹"
+"配。"
+
 msgid ""
 "Returns the rotation axis at [param joint] in the bone chain's joint list."
 msgstr "返回骨骼链关节列表中 [param joint] 关节的旋转轴。"
 
+msgid ""
+"Returns the rotation axis vector for the specified joint in the bone chain. "
+"This vector represents the axis around which the joint can rotate. It is "
+"determined based on the rotation axis set for the joint.\n"
+"If [method get_joint_rotation_axis] is [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL], this method returns [code]Vector3(0, "
+"0, 0)[/code]."
+msgstr ""
+"返回骨骼链中指定关节的旋转轴向量。该向量表示关节可以绕其旋转的轴。它根据为该关"
+"节设置的旋转轴确定。\n"
+"如果 [method get_joint_rotation_axis] 为 [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL]，则该方法返回 [code]Vector3(0, 0, 0)[/"
+"code]。"
+
+msgid "Returns the target node that the end bone is trying to reach."
+msgstr "返回末端骨骼试图到达的目标节点。"
+
+msgid ""
+"Sets the joint limitation at [param joint] in the bone chain's joint list."
+msgstr "设置骨骼链关节列表中 [param joint] 处的关节限制。"
+
+msgid ""
+"Sets the joint limitation right axis at [param joint] in the bone chain's "
+"joint list."
+msgstr "设置骨骼链关节列表中 [param joint] 处的关节限制右轴。"
+
+msgid ""
+"Sets the optional joint limitation right axis vector at [param joint] in the "
+"bone chain's joint list."
+msgstr "设置骨骼链关节列表中 [param joint] 处的可选关节限制右轴向量。"
+
+msgid ""
+"Sets the joint limitation rotation offset at [param joint] in the bone "
+"chain's joint list.\n"
+"Rotation is done in the local space which is constructed by the bone "
+"direction (in general parent to child) as the +Y axis and [method "
+"get_joint_limitation_right_axis_vector] as the +X axis.\n"
+"If the +X and +Y axes are not orthogonal, the +X axis is implicitly modified "
+"to make it orthogonal.\n"
+"Also, if the length of [method get_joint_limitation_right_axis_vector] is "
+"zero, the space is created by rotating the bone rest using the shortest arc "
+"that rotates the +Y axis of the bone rest to match the bone direction."
+msgstr ""
+"设置骨骼链关节列表中 [param joint] 处的关节限制旋转偏移量。\n"
+"旋转是在局部空间中进行的，该局部空间以骨骼方向（通常是从父骨骼指向子骨骼）作"
+"为 +Y 轴，并以 [method get_joint_limitation_right_axis_vector] 作为 +X 轴构"
+"建。\n"
+"如果 +X 轴和 +Y 轴并不正交，则会隐式修改 +X 轴使其正交。\n"
+"此外，如果 [method get_joint_limitation_right_axis_vector] 的长度为零，则通过"
+"使用最短弧旋转骨骼的静止姿态来创建该空间，使骨骼静止姿态的 +Y 轴与骨骼方向匹"
+"配。"
+
+msgid ""
+"Sets the rotation axis at [param joint] in the bone chain's joint list.\n"
+"The axes are based on the [method Skeleton3D.get_bone_rest]'s space, if "
+"[param axis] is [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], you can "
+"specify any axis.\n"
+"[b]Note:[/b] The rotation axis and the forward vector shouldn't be colinear "
+"to avoid unintended rotation since [ChainIK3D] does not factor in twisting "
+"forces."
+msgstr ""
+"设置骨骼链关节列表中 [param joint] 处的旋转轴。\n"
+"轴是基于 [method Skeleton3D.get_bone_rest] 的空间的，如果 [param axis] 为 "
+"[constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM]，则可以指定任意轴。\n"
+"[b]注意：[/b]旋转轴和前向向量不应共线，以避免意外旋转，因为 [ChainIK3D] 不考虑"
+"扭转力。"
+
+msgid ""
+"Sets the rotation axis vector for the specified joint in the bone chain.\n"
+"This vector is normalized by an internal process and represents the axis "
+"around which the bone chain can rotate.\n"
+"If the vector length is [code]0[/code], it is considered synonymous with "
+"[constant SkeletonModifier3D.ROTATION_AXIS_ALL]."
+msgstr ""
+"设置骨骼链中指定关节的旋转轴向量。\n"
+"该向量会经过内部处理进行归一化，并代表骨骼链可以围绕其旋转的轴。\n"
+"如果向量长度为 [code]0[/code]，则被视为等同于 [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL]。"
+
+msgid "Sets the target node that the end bone is trying to reach."
+msgstr "设置末端骨骼试图到达的目标节点。"
+
+msgid ""
+"The maximum amount each bone can rotate in a single iteration.\n"
+"[b]Note:[/b] This limitation is applied during each iteration. For example, "
+"if [member max_iterations] is [code]4[/code] and [member angular_delta_limit] "
+"is [code]5[/code] degrees, the maximum rotation possible in a single frame is "
+"[code]20[/code] degrees."
+msgstr ""
+"单次迭代中每根骨骼可以旋转的最大角度。\n"
+"[b]注意：[/b]该限制在每次迭代中都会应用。例如，如果 [member max_iterations] "
+"为 [code]4[/code]，[member angular_delta_limit] 为 [code]5[/code] 度，则单帧中"
+"可能的最大旋转角度为 [code]20[/code] 度。"
+
+msgid ""
+"If [code]false[/code], the result is calculated from the previous frame's "
+"[IterateIK3D] result as the initial state.\n"
+"If [code]true[/code], the previous frame's [IterateIK3D] result is discarded. "
+"At this point, the new result is calculated from the bone pose excluding the "
+"[IterateIK3D] as the initial state. This means the result will be always "
+"equal as long as the target position and the previous bone pose are the same. "
+"However, if [member angular_delta_limit] and [member max_iterations] are set "
+"too small, the end bone of the chain will never reach the target."
+msgstr ""
+"如果为 [code]false[/code]，则结果将以前一帧的 [IterateIK3D] 结果作为初始状态进"
+"行计算。\n"
+"如果为 [code]true[/code]，则会丢弃前一帧的 [IterateIK3D] 结果。此时，新的结果"
+"将以除 [IterateIK3D] 之外的骨骼姿势作为初始状态进行计算。这意味着只要目标位置"
+"和之前的骨骼姿势相同，结果就始终相同。但是，如果 [member angular_delta_limit] "
+"和 [member max_iterations] 设置得太小，骨骼链的末端骨骼将永远无法到达目标位"
+"置。"
+
+msgid ""
+"The number of iteration loops used by the IK solver to produce more accurate "
+"results."
+msgstr "IK 求解器用于生成更精确结果的迭代循环次数。"
+
+msgid ""
+"The minimum distance between the end bone and the target. If the distance is "
+"below this value, the IK solver stops any further iterations."
+msgstr ""
+"末端骨骼与目标位置之间的最小距离。如果距离小于此值，IK 求解器将停止进一步迭"
+"代。"
+
+msgid "Jacobian transpose based inverse kinematics solver."
+msgstr "基于雅可比矩阵转置的反向动力学求解器。"
+
+msgid ""
+"[JacobianIK3D] calculates rotations for all joints simultaneously, producing "
+"natural and smooth movement. It is particularly suited for biological "
+"animations.\n"
+"The resulting twist around the forward vector will always be kept from the "
+"previous pose.\n"
+"[b]Note:[/b] It converges more slowly than other IK solvers, leading to "
+"gentler and less immediate tracking of targets."
+msgstr ""
+"[JacobianIK3D] 可同时计算所有关节的旋转角度，从而产生自然流畅的运动。它特别适"
+"用于生物动画。\n"
+"围绕前向向量的扭转角度将始终保持与前一姿势相同。\n"
+"[b]注意：[/b]它的收敛速度比其他反向动力学求解器慢，因此目标跟踪更加平缓，响应"
+"也更慢。"
+
 msgid "Represents a class from the Java Native Interface."
 msgstr "代表来自 Java 原生接口的类。"
 
@@ -78498,6 +84105,13 @@ msgstr ""
 msgid "Returns a [JavaClass] representing the Java parent class of this class."
 msgstr "返回代表该类的 Java 父类的 [JavaClass]。"
 
+msgid ""
+"Returns [code]true[/code] if the given [param method] name exists in the "
+"object's Java methods."
+msgstr ""
+"如果给定的 [param method] 名存在于对象的 Java 方法中，则返回 [code]true[/"
+"code]。"
+
 msgid "Provides access to the Java Native Interface."
 msgstr "提供对 Java 原生接口的访问。"
 
@@ -78846,6 +84460,13 @@ msgstr ""
 msgid "Creating Android plugins"
 msgstr "创建 Android 插件"
 
+msgid ""
+"Returns [code]true[/code] if the given [param method] name exists in the "
+"JNISingleton's Java methods."
+msgstr ""
+"如果给定的 [param method] 名存在于 JNISingleton 的 Java 方法中，则返回 "
+"[code]true[/code]。"
+
 msgid "Abstract base class for all 2D physics joints."
 msgstr "所有 2D 物理关节的抽象基类。"
 
@@ -78933,6 +84554,25 @@ msgid ""
 msgstr ""
 "用于定义哪个解算器在多个关节中被首先执行的优先级。数值越低，优先级越高。"
 
+msgid "A base class of the limitation that interacts with [ChainIK3D]."
+msgstr "与 [ChainIK3D] 交互的限制的基类。"
+
+msgid ""
+"The limitation is attached to each joint and limits the rotation of the bone."
+msgstr "这种限制附加于每个关节并限制骨骼的旋转。"
+
+msgid "A cone shape limitation that interacts with [ChainIK3D]."
+msgstr "与 [ChainIK3D] 交互的锥形限制。"
+
+msgid ""
+"The radius range of the hole made by the cone.\n"
+"[code]0[/code] degrees makes a sphere without hole, [code]180[/code] degrees "
+"makes a hemisphere, and [code]360[/code] degrees become empty (no limitation)."
+msgstr ""
+"圆锥体形成的孔的半径范围。\n"
+"[code]0[/code] 度时形成一个没有孔的球体，[code]180[/code] 度时形成一个半球体，"
+"[code]360[/code] 度时则为空（无限制）。"
+
 msgid "Helper class for creating and parsing JSON data."
 msgstr "用于创建和解析 JSON 数据的辅助类。"
 
@@ -79090,6 +84730,123 @@ msgstr ""
 "试图解析提供的 [param json_string]，并返回解析后的数据。如果解析失败，返回 "
 "[code]null[/code]。"
 
+msgid ""
+"Converts a [Variant] var to JSON text and returns the result. Useful for "
+"serializing data to store or send over the network.\n"
+"[b]Note:[/b] The JSON specification does not define integer or float types, "
+"but only a [i]number[/i] type. Therefore, converting a Variant to JSON text "
+"will convert all numerical values to [float] types.\n"
+"[b]Note:[/b] If [param full_precision] is [code]true[/code], when "
+"stringifying floats, the unreliable digits are stringified in addition to the "
+"reliable digits to guarantee exact decoding.\n"
+"The [param indent] parameter controls if and how something is indented; its "
+"contents will be used where there should be an indent in the output. Even "
+"spaces like [code]\"   \"[/code] will work. [code]\\t[/code] and [code]\\n[/"
+"code] can also be used for a tab indent, or to make a newline for each indent "
+"respectively.\n"
+"[b]Warning:[/b] Non-finite numbers are not supported in JSON. Any occurrences "
+"of [constant @GDScript.INF] will be replaced with [code]1e99999[/code], and "
+"negative [constant @GDScript.INF] will be replaced with [code]-1e99999[/"
+"code], but they will be interpreted correctly as infinity by most JSON "
+"parsers. [constant @GDScript.NAN] will be replaced with [code]null[/code], "
+"and it will not be interpreted as NaN in JSON parsers. If you expect non-"
+"finite numbers, consider passing your data through [method from_native] "
+"first.\n"
+"[b]Example output:[/b]\n"
+"[codeblock]\n"
+"## JSON.stringify(my_dictionary)\n"
+"{\"name\":\"my_dictionary\",\"version\":\"1.0.0\",\"entities\":[{\"name\":"
+"\"entity_0\",\"value\":\"value_0\"},{\"name\":\"entity_1\",\"value\":"
+"\"value_1\"}]}\n"
+"\n"
+"## JSON.stringify(my_dictionary, \"\\t\")\n"
+"{\n"
+"\t\"name\": \"my_dictionary\",\n"
+"\t\"version\": \"1.0.0\",\n"
+"\t\"entities\": [\n"
+"\t\t{\n"
+"\t\t\t\"name\": \"entity_0\",\n"
+"\t\t\t\"value\": \"value_0\"\n"
+"\t\t},\n"
+"\t\t{\n"
+"\t\t\t\"name\": \"entity_1\",\n"
+"\t\t\t\"value\": \"value_1\"\n"
+"\t\t}\n"
+"\t]\n"
+"}\n"
+"\n"
+"## JSON.stringify(my_dictionary, \"...\")\n"
+"{\n"
+"...\"name\": \"my_dictionary\",\n"
+"...\"version\": \"1.0.0\",\n"
+"...\"entities\": [\n"
+"......{\n"
+".........\"name\": \"entity_0\",\n"
+".........\"value\": \"value_0\"\n"
+"......},\n"
+"......{\n"
+".........\"name\": \"entity_1\",\n"
+".........\"value\": \"value_1\"\n"
+"......}\n"
+"...]\n"
+"}\n"
+"[/codeblock]"
+msgstr ""
+"将 [Variant] 变量转换为 JSON 文本并返回结果。可用于将数据进行序列化保存或通过"
+"网络发送。\n"
+"[b]注意：[/b]JSON 规范没有定义整数和浮点数类型，只有一个[i]数字[/i]类型。因"
+"此，将 Variant 转换为 JSON 文本会将所有数字值转换为 [float] 类型。\n"
+"[b]注意：[/b]如果 [param full_precision] 为 [code]true[/code]，则在字符串化浮"
+"点数时，除可靠数字外，还将对不可靠数字进行字符串化，以保证准确解码。\n"
+"[param indent] 参数控制是否缩进以及如何缩进，输出时应该有缩进的地方会用到它的"
+"值。甚至可以使用空格 [code]\" \"[/code] 缩进。[code]\\t[/code] 和 [code]\\n[/"
+"code] 可用于制表符缩进，或分别为每个缩进换行。\n"
+"[b]警告：[/b]JSON 不支持非有限数。任何出现的 [constant @GDScript.INF] 都将被替"
+"换为 [code]1e99999[/code]，负数 [constant @GDScript.INF] 将被替换为 "
+"[code]-1e99999[/code]，但大多数 JSON 解析器会将其正确解析为无穷大。[constant "
+"@GDScript.NAN] 将被替换为 [code]null[/code]，并且 JSON 解析器不会将其解析为 "
+"NaN。如果你需要处理非有限数，请考虑先使用 [method from_native] 方法处理你的数"
+"据。\n"
+"[b]示例输出：[/b]\n"
+"[codeblock]\n"
+"## JSON.stringify(my_dictionary)\n"
+"{\"name\":\"my_dictionary\",\"version\":\"1.0.0\",\"entities\":[{\"name\":"
+"\"entity_0\",\"value\":\"value_0\"},{\"name\":\"entity_1\",\"value\":"
+"\"value_1\"}]}\n"
+"\n"
+"## JSON.stringify(my_dictionary, \"\\t\")\n"
+"{\n"
+"\t\"name\": \"my_dictionary\",\n"
+"\t\"version\": \"1.0.0\",\n"
+"\t\"entities\": [\n"
+"\t\t{\n"
+"\t\t\t\"name\": \"entity_0\",\n"
+"\t\t\t\"value\": \"value_0\"\n"
+"\t\t},\n"
+"\t\t{\n"
+"\t\t\t\"name\": \"entity_1\",\n"
+"\t\t\t\"value\": \"value_1\"\n"
+"\t\t}\n"
+"\t]\n"
+"}\n"
+"\n"
+"## JSON.stringify(my_dictionary, \"...\")\n"
+"{\n"
+"...\"name\": \"my_dictionary\",\n"
+"...\"version\": \"1.0.0\",\n"
+"...\"entities\": [\n"
+"......{\n"
+".........\"name\": \"entity_0\",\n"
+".........\"value\": \"value_0\"\n"
+"......},\n"
+"......{\n"
+".........\"name\": \"entity_1\",\n"
+".........\"value\": \"value_1\"\n"
+"......}\n"
+"...]\n"
+"}\n"
+"[/codeblock]"
+
 msgid ""
 "Converts a JSON-compliant value that was created with [method from_native] "
 "back to native engine types.\n"
@@ -79196,6 +84953,15 @@ msgstr ""
 "process_action]。\n"
 "[param action]：要运行的动作，作为 JSON-RPC 请求或通知形式的字典。"
 
+msgid ""
+"Registers a callback for the given method name.\n"
+"- [param name]: The name that clients can use to access the callback.\n"
+"- [param callback]: The callback which will handle the specified method."
+msgstr ""
+"为给定的方法名注册回调。\n"
+"- [param name]：客户端用于访问该回调的名称。\n"
+"- [param callback]：用于处理指定方法的回调。"
+
 msgid ""
 "The request could not be parsed as it was not valid by JSON standard ([method "
 "JSON.parse] failed)."
@@ -79369,6 +85135,23 @@ msgstr "给定碰撞索引（默认情况下最深的碰撞），返回以全局
 msgid "A control for displaying plain text."
 msgstr "用于显示纯文本的控件。"
 
+msgid ""
+"A control for displaying plain text. It gives you control over the horizontal "
+"and vertical alignment and can wrap the text inside the node's bounding "
+"rectangle. It doesn't support bold, italics, or other rich text formatting. "
+"For that, use [RichTextLabel] instead.\n"
+"[b]Note:[/b] A single Label node is not designed to display huge amounts of "
+"text. To display large amounts of text in a single node, consider using "
+"[RichTextLabel] instead as it supports features like an integrated scroll bar "
+"and threading. [RichTextLabel] generally performs better when displaying "
+"large amounts of text (several pages or more)."
+msgstr ""
+"用于显示纯文本的控件。可以控制水平和垂直对齐方式以及文本在节点包围框内的换行方"
+"式。不支持粗体、斜体等富文本格式。这种需求请改用 [RichTextLabel]。\n"
+"[b]注意：[/b]单个标签节点并非设计用于显示大量文本。如果需要在单个节点中显示大"
+"量文本，请考虑改用 [RichTextLabel]，因为它支持集成滚动条和多线程等功能。"
+"[RichTextLabel] 在显示大量文本（几页或更多）时通常性能更佳。"
+
 msgid ""
 "Returns the bounding rectangle of the character at position [param pos] in "
 "the label's local coordinate system. If the character is a non-visual "
@@ -80144,6 +85927,14 @@ msgstr ""
 "[b]注意：[/b]网格的全局照明模式也会影响全局照明渲染。见 [member "
 "GeometryInstance3D.gi_mode]。"
 
+msgid ""
+"The light's color in nonlinear sRGB encoding. An [i]overbright[/i] color can "
+"be used to achieve a result equivalent to increasing the light's [member "
+"light_energy]."
+msgstr ""
+"非线性 sRGB 编码下的光照颜色。可以使用[i]过亮[/i]的颜色来达到与增加光照 "
+"[member light_energy] 相同的效果。"
+
 msgid ""
 "The light will affect objects in the selected layers.\n"
 "[b]Note:[/b] The light cull mask is ignored by [VoxelGI], SDFGI, "
@@ -81091,6 +86882,26 @@ msgstr ""
 msgid "The built-in GPU-based lightmapper for use with [LightmapGI]."
 msgstr "内置的基于 GPU 的光照贴图器，与 [LightmapGI] 一起使用。"
 
+msgid ""
+"LightmapperRD (\"RD\" stands for [RenderingDevice]) is the built-in GPU-based "
+"lightmapper for use with [LightmapGI]. On most dedicated GPUs, it can bake "
+"lightmaps much faster than most CPU-based lightmappers. LightmapperRD uses "
+"compute shaders to bake lightmaps, so it does not require CUDA or OpenCL "
+"libraries to be installed to be usable.\n"
+"[b]Note:[/b] This lightmapper requires the GPU to support the "
+"[RenderingDevice] backend (Forward+ and Mobile renderers). When using the "
+"Compatibility renderer, baking will use a temporary [RenderingDevice]. "
+"Support for [RenderingDevice] is not required to [i]render[/i] lightmaps that "
+"were already baked beforehand."
+msgstr ""
+"LightmapperRD（“RD”代表 [RenderingDevice]）是基于 GPU 的内置光照贴图器，可与 "
+"[LightmapGI] 一起使用。在大多数专用 GPU 上，它可以比大多数基于 CPU 的光照贴图"
+"更快地烘焙光照贴图。LightmapperRD 使用计算着色器来烘焙光照贴图，因此它不需要安"
+"装 CUDA 或 OpenCL 库即可使用。\n"
+"[b]注意：[/b]该光照贴图器需要 GPU 支持 [RenderingDevice] 后端（Forward+ 和 "
+"Mobile 渲染器）。使用兼容渲染器时，烘焙过程将使用临时的 [RenderingDevice]。[i]"
+"渲染[/i]预先烘焙好的光照贴图不需要支持 [RenderingDevice]。"
+
 msgid ""
 "Represents a single manually placed probe for dynamic object lighting with "
 "[LightmapGI]."
@@ -81151,6 +86962,57 @@ msgstr ""
 "如果启用，该遮挡器将成为实时生成的带符号距离场的一部分，可被用于自定义着色器"
 "中。"
 
+msgid "Limit bone rotation angular velocity."
+msgstr "限制骨骼旋转角速度。"
+
+msgid ""
+"This modifier limits bone rotation angular velocity by comparing poses "
+"between previous and current frame.\n"
+"You can add bone chains by specifying their root and end bones, then add the "
+"bones between them to a list. Modifier processes either that list or the "
+"bones excluding those in the list depending on the option [member exclude]."
+msgstr ""
+"该修改器通过比较前一帧和当前帧之间的姿势来限制骨骼旋转角速度。\n"
+"可以通过指定骨骼链的根骨骼和末端骨骼来添加骨骼链，然后将它们之间的骨骼添加到列"
+"表中。修改器会根据选项 [member exclude] 处理该列表中的骨骼或处理除列表中骨骼之"
+"外的其他骨骼。"
+
+msgid "Clear all chains."
+msgstr "清除所有链。"
+
+msgid ""
+"Sets the reference pose for angle comparison to the current pose with the "
+"influence of constraints removed. This function is automatically triggered "
+"when joints change or upon activation."
+msgstr ""
+"设置参考姿态，用于与当前姿态进行角度比较，并去除约束的影响。当关节发生变化或激"
+"活时，该函数会自动触发。"
+
+msgid ""
+"Sets the end bone name of the bone chain.\n"
+"[b]Note:[/b] End bone must be the root bone or a child of the root bone."
+msgstr ""
+"设置骨骼链中末端骨骼的名称。\n"
+"[b]注意：[/b]末端骨骼必须是根骨骼或根骨骼的子骨骼。"
+
+msgid "The number of chains."
+msgstr "链数。"
+
+msgid ""
+"If [code]true[/code], the modifier processes bones not included in the bone "
+"list.\n"
+"If [code]false[/code], the bones processed by the modifier are equal to the "
+"bone list."
+msgstr ""
+"如果为 [code]true[/code]，则修改器会处理骨骼列表中未包含的骨骼。\n"
+"如果为 [code]false[/code]，则修改器处理的骨骼与骨骼列表中的骨骼相同。"
+
+msgid "The number of joints in the list which created by chains dynamically."
+msgstr "链式结构动态创建的列表中的关节数。"
+
+msgid "The maximum angular velocity per second."
+msgstr "每秒最大角速度。"
+
 msgid "A 2D polyline that can optionally be textured."
 msgstr "可以选择设置纹理的 2D 折线。"
 
@@ -81496,6 +87358,16 @@ msgstr ""
 msgid "Clears the current selection."
 msgstr "清除当前选择。"
 
+msgid ""
+"Allows entering edit mode whether the [LineEdit] is focused or not. If [param "
+"hide_focus] is [code]true[/code], the focused state will not be shown (see "
+"[method Control.grab_focus]).\n"
+"See also [member keep_editing_on_text_submit]."
+msgstr ""
+"允许进入编辑模式，无论 [LineEdit] 是否获得焦点。如果 [param hide_focus] 为 "
+"[code]true[/code]，则不会显示焦点状态（参见 [method Control.grab_focus]）。\n"
+"另见 [member keep_editing_on_text_submit]。"
+
 msgid ""
 "Returns the [PopupMenu] of this [LineEdit]. By default, this menu is "
 "displayed when right-clicking on the [LineEdit].\n"
@@ -81714,6 +87586,9 @@ msgstr "选中整个 [String]。"
 msgid "Allows exiting edit mode while preserving focus."
 msgstr "允许退出编辑模式，保持焦点。"
 
+msgid "The text's horizontal alignment."
+msgstr "文本的水平对齐方式。"
+
 msgid ""
 "If [code]true[/code] and [member caret_mid_grapheme] is [code]false[/code], "
 "backspace deletes an entire composite character such as ❤️‍🩹, instead of "
@@ -81788,6 +87663,9 @@ msgstr ""
 msgid "If [code]true[/code], the [LineEdit] doesn't display decoration."
 msgstr "如果为 [code]true[/code]，则 [LineEdit] 不显示装饰。"
 
+msgid "Define the scaling behavior of the [member right_icon]."
+msgstr "定义 [member right_icon] 的缩放行为。"
+
 msgid ""
 "If [code]true[/code], the [LineEdit] will not exit edit mode when text is "
 "submitted by pressing [code]ui_text_submit[/code] action (by default: "
@@ -81876,6 +87754,13 @@ msgstr ""
 "设置 [LineEdit] 右端的图标，这个图标会在没有 [member text] 时出现，如果 "
 "[member clear_button_enabled] 为 [code]false[/code] 则始终可见。"
 
+msgid ""
+"Scale ratio of the icon when [member icon_expand_mode] is set to [constant "
+"EXPAND_MODE_FIT_TO_LINE_EDIT]."
+msgstr ""
+"[member icon_expand_mode] 设置为 [constant EXPAND_MODE_FIT_TO_LINE_EDIT] 时图"
+"标的缩放比例。"
+
 msgid ""
 "If [code]true[/code], every character is replaced with the secret character "
 "(see [member secret_character])."
@@ -82056,6 +87941,15 @@ msgstr "打开系统 Emoji 和符号拾取器。"
 msgid "Represents the size of the [enum MenuItems] enum."
 msgstr "代表 [enum MenuItems] 枚举的大小。"
 
+msgid "Use the original size for the right icon."
+msgstr "右侧图标使用原始大小。"
+
+msgid "Scale the right icon's size to match the size of the text."
+msgstr "缩放右侧图标的大小以匹配文本大小。"
+
+msgid "Scale the right icon to fit the LineEdit."
+msgstr "缩放右侧图标以适应 LineEdit。"
+
 msgid ""
 "Color of the [LineEdit]'s caret (text cursor). This can be set to a fully "
 "transparent color to hide the caret entirely."
@@ -82092,8 +87986,8 @@ msgid ""
 "accessibility by ensuring the caret is easily visible, or to ensure "
 "consistency with a large font size."
 msgstr ""
-"文本光标的像素宽度。使用较大的数值可以提高可访问性，使文本光标更加显眼，或者确"
-"保文本与较大字体尺寸的一致性。"
+"文本光标的像素宽度。使用较大的数值可以提高无障碍访问，使文本光标更加显眼，或者"
+"确保文本与较大字体尺寸的一致性。"
 
 msgid ""
 "Minimum horizontal space for the text (not counting the clear button and "
@@ -82126,7 +88020,7 @@ msgstr ""
 "础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 [StyleBox]，确保基础 "
 "[StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很好地实现这个目的。要"
 "禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会"
-"影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原因，不建议这样做。"
+"影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid "Default background for the [LineEdit]."
 msgstr "该 [LineEdit] 的默认背景。"
@@ -82253,7 +88147,7 @@ msgstr ""
 "[StyleBox] 显示在基础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 "
 "[StyleBox]，确保基础 [StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很"
 "好地实现这个目的。要禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，"
-"禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原"
+"禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原"
 "因，不建议这样做。"
 
 msgid ""
@@ -82267,6 +88161,63 @@ msgstr ""
 "自定义日志记录器，能够从内部错误/警告流接收消息。日志记录器通过 [method "
 "OS.add_logger] 注册。"
 
+msgid ""
+"Called when an error is logged. The error provides the [param function], "
+"[param file], and [param line] that it originated from, as well as either the "
+"[param code] that generated the error or a [param rationale].\n"
+"The type of error provided by [param error_type] is described in the [enum "
+"ErrorType] enumeration.\n"
+"Additionally, [param script_backtraces] provides backtraces for each of the "
+"script languages. These will only contain stack frames in editor builds and "
+"debug builds by default. To enable them for release builds as well, you need "
+"to enable [member ProjectSettings.debug/settings/gdscript/"
+"always_track_call_stacks].\n"
+"[b]Warning:[/b] This method will be called from threads other than the main "
+"thread, possibly at the same time, so you will need to have some kind of "
+"thread-safety in your implementation of it, like a [Mutex].\n"
+"[b]Note:[/b] [param script_backtraces] will not contain any captured "
+"variables, due to its prohibitively high cost. To get those you will need to "
+"capture the backtraces yourself, from within the [Logger] virtual methods, "
+"using [method Engine.capture_script_backtraces].\n"
+"[b]Note:[/b] Logging errors from this method using functions like [method "
+"@GlobalScope.push_error] or [method @GlobalScope.push_warning] is not "
+"supported, as it could cause infinite recursion. These errors will only show "
+"up in the console output."
+msgstr ""
+"记录错误时调用。错误会提供对应的函数 [param function]、文件 [param file]、行"
+"号 [param line] 等信息，以及错误码 [param code] 或者解释信息 [param "
+"rationale]。\n"
+"错误类型由 [param error_type] 提供，描述见 [enum ErrorType] 枚举。\n"
+"此外，[param script_backtraces] 还提供了各个脚本语言的追踪信息。默认情况下，只"
+"有在编辑器构建和调试构建中才会包含栈帧。如果在发布构建中也需要启用栈帧信息，请"
+"启用 [member ProjectSettings.debug/settings/gdscript/"
+"always_track_call_stacks]。\n"
+"[b]警告：[/b]该方法将从主线程以外的线程调用，可能会同时调用，因此需要在实现中"
+"提供某种线程安全机制，例如 [Mutex]。\n"
+"[b]注意：[/b]由于开销过大，[param script_backtraces] 中不包含捕获变量。如果要"
+"获取变量，就需要使用 [method Engine.capture_script_backtraces] 在 [Logger] 的"
+"虚函数中自行捕获追踪。\n"
+"[b]注意：[/b]不支持使用 [method @GlobalScope.push_error] 或 [method "
+"@GlobalScope.push_warning] 等函数记录该方法的错误，因为这可能会导致无限递归。"
+"这些错误只会显示在控制台输出中。"
+
+msgid ""
+"Called when a message is logged. If [param error] is [code]true[/code], then "
+"this message was meant to be sent to [code]stderr[/code].\n"
+"[b]Warning:[/b] This method will be called from threads other than the main "
+"thread, possibly at the same time, so you will need to have some kind of "
+"thread-safety in your implementation of it, like a [Mutex].\n"
+"[b]Note:[/b] Logging another message from this method using functions like "
+"[method @GlobalScope.print] is not supported, as it could cause infinite "
+"recursion. These messages will only show up in the console output."
+msgstr ""
+"当记录消息时调用。如果 [param error] 为 [code]true[/code]，则该消息应发送到 "
+"[code]stderr[/code]。\n"
+"[b]警告：[/b]该方法可能会从主线程以外的其他线程调用，甚至可能同时被多个线程调"
+"用，因此需要在实现该方法时确保线程安全，例如使用 [Mutex]。\n"
+"[b]注意：[/b]不支持在该方法中使用 [method @GlobalScope.print] 等函数记录其他消"
+"息，因为这可能导致无限递归。这些消息只会显示在控制台输出中。"
+
 msgid "The message received is an error."
 msgstr "接收到的消息是错误。"
 
@@ -82413,14 +88364,35 @@ msgstr ""
 "值，会使得在旋转到边缘限制时感受到更多的阻力。适用于模拟人类运动的限制。\n"
 "如果为 [code]1.0[/code] 则不执行阻尼。如果为 [code]0.0[/code] 则始终执行阻尼。"
 
+msgid ""
+"The limit angle of the primary rotation when [member symmetry_limitation] is "
+"[code]true[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]true[/code] 时，主旋转的限制角度，单"
+"位为弧度。"
+
 msgid ""
 "The threshold to start damping for [member primary_negative_limit_angle]."
 msgstr "开始对 [member primary_negative_limit_angle] 执行阻尼的阈值。"
 
+msgid ""
+"The limit angle of negative side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]false[/code] 时，主旋转负方向的限制角"
+"度，单位为弧度。"
+
 msgid ""
 "The threshold to start damping for [member primary_positive_limit_angle]."
 msgstr "开始对 [member primary_positive_limit_angle] 执行阻尼的阈值。"
 
+msgid ""
+"The limit angle of positive side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]false[/code] 时，主旋转正方向的限制角"
+"度，单位为弧度。"
+
 msgid ""
 "The axis of the first rotation. This [SkeletonModifier3D] works by "
 "compositing the rotation by Euler angles to prevent to rotate the [member "
@@ -82432,14 +88404,35 @@ msgstr ""
 msgid "The threshold to start damping for [member secondary_limit_angle]."
 msgstr "开始对 [member secondary_limit_angle] 执行阻尼的阈值。"
 
+msgid ""
+"The limit angle of the secondary rotation when [member symmetry_limitation] "
+"is [code]true[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]true[/code] 时，次旋转的限制角度，单"
+"位为弧度。"
+
 msgid ""
 "The threshold to start damping for [member secondary_negative_limit_angle]."
 msgstr "开始对 [member secondary_negative_limit_angle] 执行阻尼的阈值。"
 
+msgid ""
+"The limit angle of negative side of the secondary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]false[/code] 时，次旋转负方向的限制角"
+"度，单位为弧度。"
+
 msgid ""
 "The threshold to start damping for [member secondary_positive_limit_angle]."
 msgstr "开始对 [member secondary_positive_limit_angle] 执行阻尼的阈值。"
 
+msgid ""
+"The limit angle of positive side of the secondary rotation when [member "
+"symmetry_limitation] is [code]false[/code], in radians."
+msgstr ""
+"当 [member symmetry_limitation] 为 [code]false[/code] 时，次旋转正方向的限制角"
+"度，单位为弧度。"
+
 msgid ""
 "If [code]true[/code], the limitations are spread from the bone "
 "symmetrically.\n"
@@ -82459,27 +88452,6 @@ msgid ""
 "Tween.TransitionType]."
 msgstr "基于时间的插值的过渡类型。另见 [enum Tween.TransitionType]。"
 
-msgid ""
-"If [code]true[/code], limits the amount of rotation. For example, this helps "
-"to prevent a character's neck from rotating 360 degrees.\n"
-"[b]Note:[/b] As with [AnimationTree] blending, interpolation is provided that "
-"favors [method Skeleton3D.get_bone_rest]. This means that interpolation does "
-"not select the shortest path in some cases.\n"
-"[b]Note:[/b] Some values for [member transition_type] (such as [constant "
-"Tween.TRANS_BACK], [constant Tween.TRANS_ELASTIC], and [constant "
-"Tween.TRANS_SPRING]) may exceed the limitations. If interpolation occurs "
-"while overshooting the limitations, the result might not respect the bone "
-"rest."
-msgstr ""
-"如果为 [code]true[/code] 则会限制旋转量。例如，可以帮助防止角色的脖子发生 360 "
-"度旋转。\n"
-"[b]注意：[/b]与 [AnimationTree] 混合一样，插值时会优先考虑 [method "
-"Skeleton3D.get_bone_rest]。这意味着插值在某些情况下不会选择最短路径。\n"
-"[b]注意：[/b]某些 [member transition_type] 的取值可能会超出限制（例如 "
-"[constant Tween.TRANS_BACK]、[constant Tween.TRANS_ELASTIC]、[constant "
-"Tween.TRANS_SPRING]）。如果在超出限制时发生插值，结果可能不会遵循骨骼的放松姿"
-"势。"
-
 msgid "If [code]true[/code], provides rotation by two axes."
 msgstr "如果为 [code]true[/code] 就能够使用两个转轴。"
 
@@ -82740,6 +88712,15 @@ msgstr ""
 "当引擎即将崩溃时，从Godot的崩溃处理程序收到的通知。\n"
 "如果崩溃处理程序被启用，这只会在桌面平台上实现。"
 
+msgid ""
+"Notification received from the OS when an update of the Input Method Engine "
+"occurs (e.g. change of IME cursor position or composition string).\n"
+"Implemented on desktop and web platforms."
+msgstr ""
+"当输入法引擎发生更新时，从操作系统收到的通知（例如，IME 光标位置或组成字符串的"
+"变化）。\n"
+"已在桌面平台和 web 平台上实现。"
+
 msgid ""
 "Notification received from the OS when the application is resumed.\n"
 "Specific to the Android and iOS platforms."
@@ -83057,6 +89038,18 @@ msgstr "返回菜单项的标题。"
 msgid "Returns menu item tooltip."
 msgstr "返回菜单项的工具提示。"
 
+msgid "Returns [code]true[/code] if the menu item is disabled."
+msgstr "如果菜单项被禁用，则返回 [code]true[/code]。"
+
+msgid "Returns [code]true[/code] if the menu item is hidden."
+msgstr "如果菜单项被隐藏，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if the current system's global menu is supported "
+"and used by this [MenuBar]."
+msgstr ""
+"如果当前系统的全局菜单受支持且被该 [MenuBar] 使用，则返回 [code]true[/code]。"
+
 msgid ""
 "If [code]true[/code], shortcuts are disabled and cannot be used to trigger "
 "the button."
@@ -84072,6 +90065,20 @@ msgstr "设置与给定顶点关联的元数据。"
 msgid "Sets the normal of the given vertex."
 msgstr "设置给定顶点的法线。"
 
+msgid ""
+"Sets the tangent of the given vertex.\n"
+"[b]Note:[/b] Even though [param tangent] is a [Plane], it does not directly "
+"represent the tangent plane. Its [member Plane.x], [member Plane.y], and "
+"[member Plane.z] represent the tangent vector and [member Plane.d] should be "
+"either [code]-1[/code] or [code]1[/code]. See also [constant "
+"Mesh.ARRAY_TANGENT]."
+msgstr ""
+"设置给定顶点的切线。\n"
+"[b]注意：[/b]尽管 [param tangent] 是一个 [Plane]，但它并不直接表示切平面。它"
+"的 [member Plane.x]、[member Plane.y] 和 [member Plane.z] 表示切向量，而 "
+"[member Plane.d] 应该为 [code]-1[/code] 或 [code]1[/code]。另见 [constant "
+"Mesh.ARRAY_TANGENT]。"
+
 msgid "Sets the UV of the given vertex."
 msgstr "设置给定顶点的 UV。"
 
@@ -84084,6 +90091,29 @@ msgstr "设置给定顶点的骨骼权重。"
 msgid "Node used for displaying a [Mesh] in 2D."
 msgstr "用于在 2D 中显示 [Mesh] 的节点。"
 
+msgid ""
+"Node used for displaying a [Mesh] in 2D. This can be faster to render "
+"compared to displaying a [Sprite2D] node with large transparent areas, "
+"especially if the node takes up a lot of space on screen at high viewport "
+"resolutions. This is because using a mesh designed to fit the sprite's opaque "
+"areas will reduce GPU fill rate utilization (at the cost of increased vertex "
+"processing utilization).\n"
+"When a [Mesh] has to be instantiated more than thousands of times close to "
+"each other, consider using a [MultiMesh] in a [MultiMeshInstance2D] instead.\n"
+"A [MeshInstance2D] can be created from an existing [Sprite2D] via a tool in "
+"the editor toolbar. Select the [Sprite2D] node, then choose [b]Sprite2D > "
+"Convert to MeshInstance2D[/b] at the top of the 2D editor viewport."
+msgstr ""
+"用于在 2D 中显示 [Mesh] 的节点。与显示带有大面积透明区域的 [Sprite2D] 节点相"
+"比，这种方式渲染速度更快，尤其是在视口分辨率较高且节点占据屏幕较大空间的情况"
+"下。这是因为使用专为适合精灵不透明区域而设计的网格可以降低 GPU 填充率（但会增"
+"加顶点处理的开销）。\n"
+"如果 [Mesh] 需要被实例化数千次并彼此靠近，请考虑在 [MultiMeshInstance2D] 中改"
+"用 [MultiMesh]。\n"
+"可以通过编辑器工具栏中的工具从已有的 [Sprite2D] 创建 [MeshInstance2D]。选择 "
+"[Sprite2D] 节点，然后在 2D 编辑器视口顶部选择 [b]Sprite2D > 转换为 "
+"MeshInstance2D[/b]。"
+
 msgid "2D meshes"
 msgstr "2D 网格"
 
@@ -84286,6 +90316,18 @@ msgstr ""
 msgid "The [Mesh] resource for the instance."
 msgstr "该实例的 [Mesh] 资源。"
 
+msgid ""
+"[NodePath] to the [Skeleton3D] associated with the instance.\n"
+"[b]Note:[/b] The default value of this property has changed in Godot 4.6. "
+"Enable [member ProjectSettings.animation/compatibility/"
+"default_parent_skeleton_in_mesh_instance_3d] if the old behavior is needed "
+"for compatibility."
+msgstr ""
+"指向与该实例关联的 [Skeleton3D] 的 [NodePath]。\n"
+"[b]注意：[/b]该属性的默认值在 Godot 4.6 中已更改。如果需要旧版行为以确保兼容"
+"性，请启用 [member ProjectSettings.animation/compatibility/"
+"default_parent_skeleton_in_mesh_instance_3d]。"
+
 msgid "The [Skin] to be used by this instance."
 msgstr "该实例要使用的 [Skin]。"
 
@@ -84497,6 +90539,14 @@ msgstr ""
 "如果为 [code]true[/code]，则允许将新属性与已有属性一起设置。如果为 "
 "[code]false[/code]，则只能设置已有属性的值，并且无法添加新属性。"
 
+msgid ""
+"If [code]true[/code], allows new signals to be connected to along with "
+"existing ones. If [code]false[/code], only existing signals can be connected "
+"to, and new signals cannot be added."
+msgstr ""
+"如果为 [code]true[/code]，则允许将新信号与已有信号一起连接。如果为 "
+"[code]false[/code]，则只能连接已有信号，不能添加新的信号。"
+
 msgid ""
 "An internal editor class intended for keeping the data of unrecognized "
 "resources."
@@ -84903,6 +90953,16 @@ msgstr ""
 "使用[i]物理插值[/i]时，该函数能够让你在当前物理周期中阻止对实例进行插值。\n"
 "这样你就可以让实例瞬移，通常在初始放置子弹等实例时使用，防止出现图形问题。"
 
+msgid ""
+"When using [i]physics interpolation[/i], this function allows you to prevent "
+"interpolation for all instances in the current physics tick.\n"
+"This allows you to move all instances instantaneously, and should usually be "
+"used when initially placing instances to prevent graphical glitches."
+msgstr ""
+"使用[i]物理插值[/i]时，该函数能够让你在当前物理周期中阻止对所有实例进行插"
+"值。\n"
+"这允许你瞬间移动所有实例，通常应在初始放置实例时使用，防止出现图形问题。"
+
 msgid ""
 "An alternative to setting the [member buffer] property, which can be used "
 "with [i]physics interpolation[/i]. This method takes two arrays, and can set "
@@ -85115,6 +91175,21 @@ msgstr "尽可能使用 Basis 球面线性插值，否则回退至线性插值
 msgid "Node that instances a [MultiMesh] in 2D."
 msgstr "在 2D 中实例化 [MultiMesh] 的节点。"
 
+msgid ""
+"[MultiMeshInstance2D] is a specialized node to instance a [MultiMesh] "
+"resource in 2D. This can be faster to render compared to displaying many "
+"[Sprite2D] nodes with large transparent areas, especially if the nodes take "
+"up a lot of space on screen at high viewport resolutions. This is because "
+"using a mesh designed to fit the sprites' opaque areas will reduce GPU fill "
+"rate utilization (at the cost of increased vertex processing utilization).\n"
+"Usage is the same as [MultiMeshInstance3D]."
+msgstr ""
+"[MultiMeshInstance2D] 是一个专门用于在 2D 中实例化 [MultiMesh] 资源的节点。与"
+"显示许多带有大面积透明区域的 [Sprite2D] 节点相比，这种方法渲染速度更快，尤其是"
+"在视口分辨率较高且节点占据屏幕较大空间的情况下。这是因为使用专为适合精灵不透明"
+"区域而设计的网格可以降低 GPU 填充率（但会增加顶点处理的开销）。\n"
+"其用法与 [MultiMeshInstance3D] 相同。"
+
 msgid "The [MultiMesh] that will be drawn by the [MultiMeshInstance2D]."
 msgstr "将由 [MultiMeshInstance2D] 绘制的 [MultiMesh]。"
 
@@ -86164,6 +92239,29 @@ msgstr ""
 msgid "A binary [Semaphore] for synchronization of multiple [Thread]s."
 msgstr "二元 [Semaphore]，用于在多 [Thread] 间进行同步。"
 
+msgid ""
+"A synchronization mutex (mutual exclusion). This is used to synchronize "
+"multiple [Thread]s, and is equivalent to a binary [Semaphore]. It guarantees "
+"that only one thread can access a critical section at a time.\n"
+"This is a reentrant mutex, meaning that it can be locked multiple times by "
+"one thread, provided it also unlocks it as many times.\n"
+"[b]Warning:[/b] To ensure proper cleanup without crashes or deadlocks, the "
+"following conditions must be met:\n"
+"- When a [Mutex]'s reference count reaches zero and it is therefore "
+"destroyed, no threads (including the one on which the destruction will "
+"happen) must have it locked.\n"
+"- When a [Thread]'s reference count reaches zero and it is therefore "
+"destroyed, it must not have any mutex locked."
+msgstr ""
+"同步互斥器（mutex 来源于 mutual exclusion，即互斥）。可用于在多 [Thread] 间进"
+"行同步，等价于二元 [Semaphore]。能够确保同时只有一个线程能够访问临界区。\n"
+"这是一种可重入的互斥器，也就是说同一个线程能够将其多次上锁，只要也进行相同次数"
+"的解锁即可。\n"
+"[b]警告：[/b]为了能够正确清理，避免崩溃和死锁，必须满足以下条件：\n"
+"- [Mutex] 的引用计数到达零，将被销毁时，必须没有线程将其锁定（包括发生析构的线"
+"程）。\n"
+"- [Thread] 的引用计数达到零，将被销毁时，必须没有锁定任何互斥器。"
+
 msgid "Using multiple threads"
 msgstr "使用多线程"
 
@@ -86189,6 +92287,21 @@ msgstr ""
 "[b]注意：[/b]如果该线程已经拥有了该互斥器的所有权，则函数返回 [code]true[/"
 "code]。"
 
+msgid ""
+"Unlocks this [Mutex], leaving it to other threads.\n"
+"[b]Note:[/b] If a thread called [method lock] or [method try_lock] multiple "
+"times while already having ownership of the mutex, it must also call [method "
+"unlock] the same number of times in order to unlock it correctly.\n"
+"[b]Warning:[/b] Calling [method unlock] more times than [method lock] on a "
+"given thread, thus ending up trying to unlock a non-locked mutex, is wrong "
+"and may causes crashes or deadlocks."
+msgstr ""
+"解锁该 [Mutex]，将其留给其他线程。\n"
+"[b]注意：[/b]如果一个线程在已经拥有互斥器的情况下多次调用 [method lock] 或 "
+"[method try_lock]，则也必须调用相同次数的 [method unlock] 才能正确解锁。\n"
+"[b]警告：[/b]在给定的线程中调用 [method unlock] 的次数超过调用 [method lock] "
+"的次数，导致尝试解锁未加锁的互斥器，是错误的行为，可能引起崩溃和死锁。"
+
 msgid "A server interface for OS native menus."
 msgstr "操作系统原生菜单的服务器接口。"
 
@@ -86670,6 +92783,13 @@ msgstr ""
 "返回特殊系统菜单的可读名称。\n"
 "[b]注意：[/b]该方法仅在 macOS 上实现。"
 
+msgid ""
+"Returns the text of the system menu item.\n"
+"[b]Note:[/b] This method is implemented on macOS."
+msgstr ""
+"返回系统菜单项的文本。\n"
+"[b]注意：[/b]该方法在 macOS 上实现。"
+
 msgid ""
 "Returns [code]true[/code] if the specified [param feature] is supported by "
 "the current [NativeMenu], [code]false[/code] otherwise.\n"
@@ -86905,6 +93025,13 @@ msgstr ""
 "注册可调用函数以在菜单关闭后发出。\n"
 "[b]注意：[/b]该方法仅在 macOS 上实现。"
 
+msgid ""
+"Sets the text of the system menu item.\n"
+"[b]Note:[/b] This method is implemented on macOS."
+msgstr ""
+"设置系统菜单项的文本。\n"
+"[b]注意：[/b]该方法在 macOS 上实现。"
+
 msgid "[NativeMenu] supports native global main menu."
 msgstr "[NativeMenu] 支持原生全局主菜单。"
 
@@ -89199,6 +95326,15 @@ msgstr ""
 "SOURCE_GEOMETRY_GROUPS_WITH_CHILDREN] 或 [constant "
 "SOURCE_GEOMETRY_GROUPS_EXPLICIT] 时才使用。"
 
+msgid ""
+"Convex partitioning that results in a navigation mesh with convex polygons."
+msgstr "凸面剖分，生成具有凸多边形的导航网格。"
+
+msgid ""
+"Triangulation partitioning that results in a navigation mesh with triangle "
+"polygons."
+msgstr "三角剖分，生成由三角状多边形构成的导航网格。"
+
 msgid ""
 "Parses mesh instances as obstruction geometry. This includes [Polygon2D], "
 "[MeshInstance2D], [MultiMeshInstance2D], and [TileMap] nodes.\n"
@@ -90400,6 +96536,34 @@ msgstr ""
 msgid "Constant to get the number of active navigation obstacles."
 msgstr "常量，用于获取活动导航障碍物的数量。"
 
+msgid "A singleton for managing [NavigationServer2D] implementations."
+msgstr "用于管理 [NavigationServer2D] 实现的单例。"
+
+msgid ""
+"[NavigationServer2DManager] is the API for registering [NavigationServer2D] "
+"implementations and setting the default implementation.\n"
+"[b]Note:[/b] It is not possible to switch servers at runtime. This class is "
+"only used on startup at the server initialization level."
+msgstr ""
+"[NavigationServer2DManager] 是用于注册 [NavigationServer2D] 实现并设置默认实现"
+"的 API。\n"
+"[b]注意：[/b]无法在运行时中切换服务器。该类仅在启动时在服务器初始化阶段使用。"
+
+msgid ""
+"Registers a [NavigationServer2D] implementation by passing a [param name] and "
+"a [Callable] that returns a [NavigationServer2D] object."
+msgstr ""
+"通过传递 [param name] 和一个返回 [NavigationServer2D] 对象的 [Callable]，注册"
+"一个 [NavigationServer2D] 实现。"
+
+msgid ""
+"Sets the default [NavigationServer2D] implementation to the one identified by "
+"[param name], if [param priority] is greater than the priority of the current "
+"default implementation."
+msgstr ""
+"如果 [param priority] 的值大于当前默认实现的优先级，则将默认的 "
+"[NavigationServer2D] 实现设置为由 [param name] 指定的实现。"
+
 msgid "A server interface for low-level 3D navigation access."
 msgstr "用于访问低阶 3D 导航的服务器接口。"
 
@@ -90724,6 +96888,34 @@ msgstr ""
 "用。将用于导航网格烘焙的自定义源几何体添加到该对象。\n"
 "- [code]node[/code] - 解析的 [Node]。"
 
+msgid "A singleton for managing [NavigationServer3D] implementations."
+msgstr "用于管理 [NavigationServer3D] 实现的单例。"
+
+msgid ""
+"[NavigationServer3DManager] is the API for registering [NavigationServer3D] "
+"implementations and setting the default implementation.\n"
+"[b]Note:[/b] It is not possible to switch servers at runtime. This class is "
+"only used on startup at the server initialization level."
+msgstr ""
+"[NavigationServer3DManager] 是用于注册 [NavigationServer3D] 实现并设置默认实现"
+"的 API。\n"
+"[b]注意：[/b]无法在运行时中切换服务器。该类仅在启动时在服务器初始化阶段使用。"
+
+msgid ""
+"Registers a [NavigationServer3D] implementation by passing a [param name] and "
+"a [Callable] that returns a [NavigationServer3D] object."
+msgstr ""
+"通过传递 [param name] 和一个返回 [NavigationServer3D] 对象的 [Callable]，注册"
+"一个 [NavigationServer3D] 实现。"
+
+msgid ""
+"Sets the default [NavigationServer3D] implementation to the one identified by "
+"[param name], if [param priority] is greater than the priority of the current "
+"default implementation."
+msgstr ""
+"如果 [param priority] 的值高于当前默认实现的优先级，则将默认的 "
+"[NavigationServer3D] 实现设置为由 [param name] 指定的实现。"
+
 msgid ""
 "A control that displays a texture by keeping its corners intact, but tiling "
 "its edges and center."
@@ -91368,6 +97560,30 @@ msgstr ""
 "[b]注意：[/b]如果这个节点是内部的，则添加的同级节点也将是内部的（参见 [method "
 "add_child] 的 [code]internal[/code] 参数）。"
 
+msgid ""
+"Adds the node to the [param group]. Groups can be helpful to organize a "
+"subset of nodes, for example [code]\"enemies\"[/code] or [code]"
+"\"collectables\"[/code]. See notes in the description, and the group methods "
+"in [SceneTree].\n"
+"If [param persistent] is [code]true[/code], the group will be stored when "
+"saved inside a [PackedScene]. All groups created and displayed in the Groups "
+"dock are persistent.\n"
+"[b]Note:[/b] To improve performance, the order of group names is [i]not[/i] "
+"guaranteed and may vary between project runs. Therefore, do not rely on the "
+"group order.\n"
+"[b]Note:[/b] [SceneTree]'s group methods will [i]not[/i] work on this node if "
+"not inside the tree (see [method is_inside_tree])."
+msgstr ""
+"将该节点加入 [param group] 分组。使用分组可以很方便地组织部分节点，例如将敌人"
+"加入 [code]\"enemies\"[/code] 分组、将收集品加入 [code]\"collectables\"[/"
+"code] 分组。注意事项见下文，以及 [SceneTree] 中相关的分组方法。\n"
+"如果 [param persistent] 为 [code]true[/code]，则保存 [PackedScene] 时会存储该"
+"分组。在“分组”面板中创建、显示的分组都是持久的。\n"
+"[b]注意：[/b]为了提升性能，[i]并不[/i]保证分组名称的顺序，每次运行项目可能会不"
+"同。因此请不要依赖分组的顺序。\n"
+"[b]注意：[/b]不在场景树中时，[SceneTree] 的分组方法[i]无法[/i]正常工作（见 "
+"[method is_inside_tree]）。"
+
 msgid ""
 "Translates a [param message], using the translation catalogs configured in "
 "the Project Settings. Further [param context] can be specified to help with "
@@ -91523,6 +97739,29 @@ msgstr ""
 "[b]注意：[/b]当节点不在 [SceneTree] 内部时，该方法仍然可以使用。在使用自定义 "
 "[MainLoop] 的极少数情况下，它可能会失败。"
 
+msgid ""
+"Duplicates the node, returning a new node with all of its properties, "
+"signals, groups, and children copied from the original, recursively. The "
+"behavior can be tweaked through the [param flags] (see [enum "
+"DuplicateFlags]). Internal nodes are not duplicated.\n"
+"[b]Note:[/b] For nodes with a [Script] attached, if [method Object._init] has "
+"been defined with required parameters, the duplicated node will not have a "
+"[Script].\n"
+"[b]Note:[/b] By default, this method will duplicate only properties marked "
+"for serialization (i.e. using [constant @GlobalScope.PROPERTY_USAGE_STORAGE], "
+"or in GDScript, [annotation @GDScript.@export]). If you want to duplicate all "
+"properties, use [constant DUPLICATE_INTERNAL_STATE]."
+msgstr ""
+"复制该节点，返回一个新节点，其中包含从原始节点递归复制的所有属性、信号、组、子"
+"节点。可以通过 [param flags] 调整该行为（见 [enum DuplicateFlags]）。不会复制"
+"内部节点。\n"
+"[b]注意：[/b]对于附带有 [Script] 的节点，如果 [method Object._init] 已使用所需"
+"参数定义，则复制的节点将不会有 [Script]。\n"
+"[b]注意：[/b]默认情况下，该方法只会复制标记为序列化（即使用 [constant "
+"@GlobalScope.PROPERTY_USAGE_STORAGE]，或在 GDScript 中使用 [annotation "
+"@GDScript.@export]）的属性。如果你想复制所有属性，请使用 [constant "
+"DUPLICATE_INTERNAL_STATE]。"
+
 msgid ""
 "Finds the first descendant of this node whose [member name] matches [param "
 "pattern], returning [code]null[/code] if no match is found. The matching is "
@@ -92304,6 +98543,16 @@ msgstr "类似于 [method call_deferred_thread_group]，但针对的是通知。
 msgid "Similar to [method call_thread_safe], but for notifications."
 msgstr "类似于 [method call_thread_safe]，但针对的是通知。"
 
+msgid ""
+"Prints all orphan nodes (nodes outside the [SceneTree]). Useful for "
+"debugging.\n"
+"[b]Note:[/b] This method only works in debug builds. It does nothing in a "
+"project exported in release mode."
+msgstr ""
+"输出所有孤立节点（[SceneTree] 之外的节点）。利于调试。\n"
+"[b]注意：[/b]该方法仅适用于调试构建版本。在以发布模式导出的项目中不执行任何操"
+"作。"
+
 msgid ""
 "Prints the node and its children to the console, recursively. The node does "
 "not have to be inside the tree. This method outputs [NodePath]s relative to "
@@ -92760,6 +99009,22 @@ msgstr ""
 "刷新场景面板中为该节点显示的警告。使用 [method _get_configuration_warnings] 自"
 "定义要显示的警告消息。"
 
+msgid ""
+"Defines if any text should automatically change to its translated version "
+"depending on the current locale (for nodes such as [Label], [RichTextLabel], "
+"[Window], etc.). Also decides if the node's strings should be parsed for "
+"translation template generation.\n"
+"[b]Note:[/b] For the root node, auto translate mode can also be set via "
+"[member ProjectSettings.internationalization/rendering/"
+"root_node_auto_translate]."
+msgstr ""
+"定义是否应该根据当前区域设置自动将所有文本更改为翻译后的版本（针对 [Label]、"
+"[RichTextLabel]、[Window] 等节点）。同时也会决定生成翻译模板时是否解析该节点的"
+"字符串。\n"
+"[b]注意：[/b]根节点的自动翻译模式也可以通过 [member "
+"ProjectSettings.internationalization/rendering/root_node_auto_translate] 设"
+"置。"
+
 msgid ""
 "An optional description to the node. It will be displayed as a tooltip when "
 "hovering over the node in the editor's Scene dock."
@@ -92794,6 +99059,27 @@ msgstr ""
 "[code]@[/code] 字符是为自动生成的名称保留的。另见 [method "
 "String.validate_node_name]。"
 
+msgid ""
+"The owner of this node. The owner must be an ancestor of this node. When "
+"packing the owner node in a [PackedScene], all the nodes it owns are also "
+"saved with it. See also [member unique_name_in_owner].\n"
+"[b]Note:[/b] In the editor, nodes not owned by the scene root are usually not "
+"displayed in the Scene dock, and will [b]not[/b] be saved. To prevent this, "
+"remember to set the owner after calling [method add_child].\n"
+"[b]Note:[/b] The owner needs to be the current scene root. See [url=$DOCS_URL/"
+"tutorials/plugins/running_code_in_the_editor.html#instancing-"
+"scenes]Instancing scenes[/url] in the documentation for more information."
+msgstr ""
+"该节点的所有者。所有者必须是该节点的祖先节点。将所有者节点打包到 "
+"[PackedScene] 中时，它所拥有的节点也都会随之保存。另见 [member "
+"unique_name_in_owner]。\n"
+"[b]注意：[/b]在编辑器中，未被场景根节点拥有的节点通常不会显示在场景面板中，并"
+"且[b]不会[/b]被保存。为了防止这种情况，请记得在调用 [method add_child] 后设置"
+"所有者。\n"
+"[b]注意：[/b]所有者必须是当前场景根。更多信息请参阅文档中的[url=$DOCS_URL/"
+"tutorials/plugins/running_code_in_the_editor.html#instancing-scenes]实例化场景"
+"[/url]部分。"
+
 msgid ""
 "The physics interpolation mode to use for this node. Only effective if "
 "[member ProjectSettings.physics/common/physics_interpolation] or [member "
@@ -93353,8 +99639,8 @@ msgid ""
 "message, therefore all existing references to such elements should be "
 "discarded."
 msgstr ""
-"无障碍元素失效时收到的通知。收到该消息后，会自动删除节点的无障碍元素，所以应当"
-"丢弃现有的对此类元素的引用。"
+"无障碍元素失效时收到的通知。收到该消息后，会自动删除节点的所有无障碍元素，所以"
+"应当丢弃已有的对此类元素的所有引用。"
 
 msgid ""
 "Inherits [member process_mode] from the node's parent. This is the default "
@@ -93481,6 +99767,27 @@ msgstr ""
 "使用 [method PackedScene.instantiate] 进行复制。如果该节点来自磁盘上保存的场"
 "景，则会重用 [method PackedScene.instantiate] 作为该节点及其子节点副本的基础。"
 
+msgid ""
+"Duplicate also non-serializable variables (i.e. without [constant "
+"@GlobalScope.PROPERTY_USAGE_STORAGE])."
+msgstr ""
+"同时复制不可序列化的变量（即没有 [constant "
+"@GlobalScope.PROPERTY_USAGE_STORAGE]）。"
+
+msgid ""
+"Duplicate using default flags. This constant is useful to add or remove a "
+"single flag.\n"
+"[codeblock]\n"
+"# Duplicate non-exported variables.\n"
+"var dupe = duplicate(DUPLICATE_DEFAULT | DUPLICATE_INTERNAL_STATE)\n"
+"[/codeblock]"
+msgstr ""
+"使用默认标志进行复制。这个常量对于添加或移除单个标志非常有用。\n"
+"[codeblock]\n"
+"# 复制非导出变量。\n"
+"var dupe = duplicate(DUPLICATE_DEFAULT | DUPLICATE_INTERNAL_STATE)\n"
+"[/codeblock]"
+
 msgid "The node will not be internal."
 msgstr "该节点不是内部节点。"
 
@@ -93508,6 +99815,16 @@ msgstr ""
 "始终自动翻译。和 [constant AUTO_TRANSLATE_MODE_DISABLED] 相反，是根节点的默认"
 "值。"
 
+msgid ""
+"Never automatically translate. This is the inverse of [constant "
+"AUTO_TRANSLATE_MODE_ALWAYS].\n"
+"String parsing for translation template generation will be skipped for this "
+"node and children that are set to [constant AUTO_TRANSLATE_MODE_INHERIT]."
+msgstr ""
+"始终不自动翻译。和 [constant AUTO_TRANSLATE_MODE_ALWAYS] 相反。\n"
+"生成翻译模板解析字符串时会跳过该节点，如果子节点为 [constant "
+"AUTO_TRANSLATE_MODE_INHERIT] 则还会跳过子节点。"
+
 msgid ""
 "A 2D game object, inherited by all 2D-related nodes. Has a position, "
 "rotation, scale, and skew."
@@ -93534,12 +99851,58 @@ msgstr "所有 2D 演示"
 msgid "Multiplies the current scale by the [param ratio] vector."
 msgstr "将当前缩放乘以比例向量 [param ratio]。"
 
+msgid ""
+"Returns the angle between the node and the [param point] in radians. See also "
+"[method look_at].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"node2d_get_angle_to.png]Illustration of the returned angle.[/url]"
+msgstr ""
+"返回该节点和 [param point] 之间的夹角，单位为弧度。另见 [method look_at]。\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"node2d_get_angle_to.png]返回夹角的示意图。[/url]"
+
 msgid "Returns the [Transform2D] relative to this node's parent."
 msgstr "返回相对于此节点的父节点的 [Transform2D]。"
 
 msgid "Adds the [param offset] vector to the node's global position."
 msgstr "将偏移向量 [param offset] 添加到该节点的全局位置。"
 
+msgid ""
+"Rotates the node so that its local +X axis points towards the [param point], "
+"which is expected to use global coordinates. This method is a combination of "
+"both [method rotate] and [method get_angle_to].\n"
+"[param point] should not be the same as the node's position, otherwise the "
+"node always looks to the right."
+msgstr ""
+"旋转该节点，使其局部 X 轴的正方向指向 [param point]，该参数应使用全局坐标。该"
+"方法是 [method rotate] 和 [method get_angle_to] 的结合。\n"
+"[param point] 不应该与该节点的位置相同，否则该节点始终看向右侧。"
+
+msgid ""
+"Applies a local translation on the node's X axis with the amount specified in "
+"[param delta]. If [param scaled] is [code]false[/code], normalizes the "
+"movement to occur independently of the node's [member scale]."
+msgstr ""
+"在节点的 X 轴应用局部平移，平移量由 [param delta] 指定。如果 [param scaled] "
+"为 [code]false[/code]，则对移动进行归一化处理，使其不受节点 [member scale] 的"
+"影响。"
+
+msgid ""
+"Applies a local translation on the node's Y axis with the amount specified in "
+"[param delta]. If [param scaled] is [code]false[/code], normalizes the "
+"movement to occur independently of the node's [member scale]."
+msgstr ""
+"在节点的 Y 轴应用局部平移，平移量由 [param delta] 指定。如果 [param scaled] "
+"为 [code]false[/code]，则对移动进行归一化处理，使其不受节点 [member scale] 的"
+"影响。"
+
+msgid ""
+"Applies a rotation to the node, in radians, starting from its current "
+"rotation. This is equivalent to [code]rotation += radians[/code]."
+msgstr ""
+"从节点的当前旋转开始，以弧度为单位，对节点进行旋转。这相当于 [code]rotation "
+"+= radians[/code]。"
+
 msgid ""
 "Transforms the provided local position into a position in global coordinate "
 "space. The input is expected to be local relative to the [Node2D] it is "
@@ -93561,6 +99924,13 @@ msgstr ""
 "将提供的全局位置转换为本地坐标空间的位置。例如，它适合于确定子节点的位置，但不"
 "适合于确定其自身相对于父节点的位置。"
 
+msgid ""
+"Translates the node by the given [param offset] in local coordinates. This is "
+"equivalent to [code]position += offset[/code]."
+msgstr ""
+"在局部坐标系中，将该节点按给定的偏移量 [param offset] 进行平移。这相当于 "
+"[code]position += offset[/code]。"
+
 msgid "Global position. See also [member position]."
 msgstr "全局位置。另见 [member position]。"
 
@@ -95234,6 +101604,253 @@ msgstr ""
 "造来调用。最底层子类的该方法会首先被调用，接着是沿类层次结构向上依次调用。调用"
 "链会在第一个返回了非 [code]null[/code] 值的类停止。"
 
+msgid ""
+"Override this method to provide a custom list of additional properties to "
+"handle by the engine.\n"
+"Should return a property list, as an [Array] of dictionaries. The result is "
+"added to the array of [method get_property_list], and should be formatted in "
+"the same way. Each [Dictionary] must at least contain the [code]name[/code] "
+"and [code]type[/code] entries.\n"
+"You can use [method _property_can_revert] and [method _property_get_revert] "
+"to customize the default values of the properties added by this method.\n"
+"The example below displays a list of numbers shown as words going from "
+"[code]ZERO[/code] to [code]FIVE[/code], with [code]number_count[/code] "
+"controlling the size of the list:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends Node\n"
+"\n"
+"@export var number_count = 3:\n"
+"\tset(nc):\n"
+"\t\tnumber_count = nc\n"
+"\t\tnumbers.resize(number_count)\n"
+"\t\tnotify_property_list_changed()\n"
+"\n"
+"var numbers = PackedInt32Array([0, 0, 0])\n"
+"\n"
+"func _get_property_list():\n"
+"\tvar properties = []\n"
+"\n"
+"\tfor i in range(number_count):\n"
+"\t\tproperties.append({\n"
+"\t\t\t\"name\": \"number_%d\" % i,\n"
+"\t\t\t\"type\": TYPE_INT,\n"
+"\t\t\t\"hint\": PROPERTY_HINT_ENUM,\n"
+"\t\t\t\"hint_string\": \"ZERO,ONE,TWO,THREE,FOUR,FIVE\",\n"
+"\t\t})\n"
+"\n"
+"\treturn properties\n"
+"\n"
+"func _get(property):\n"
+"\tif property.begins_with(\"number_\"):\n"
+"\t\tvar index = property.get_slice(\"_\", 1).to_int()\n"
+"\t\treturn numbers[index]\n"
+"\n"
+"func _set(property, value):\n"
+"\tif property.begins_with(\"number_\"):\n"
+"\t\tvar index = property.get_slice(\"_\", 1).to_int()\n"
+"\t\tnumbers[index] = value\n"
+"\t\treturn true\n"
+"\treturn false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Tool]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"\tprivate int _numberCount;\n"
+"\n"
+"\t[Export]\n"
+"\tpublic int NumberCount\n"
+"\t{\n"
+"\t\tget => _numberCount;\n"
+"\t\tset\n"
+"\t\t{\n"
+"\t\t\t_numberCount = value;\n"
+"\t\t\t_numbers.Resize(_numberCount);\n"
+"\t\t\tNotifyPropertyListChanged();\n"
+"\t\t}\n"
+"\t}\n"
+"\n"
+"\tprivate Godot.Collections.Array<int> _numbers = [];\n"
+"\n"
+"\tpublic override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<Godot.Collections.Dictionary> properties = [];\n"
+"\n"
+"\t\tfor (int i = 0; i < _numberCount; i++)\n"
+"\t\t{\n"
+"\t\t\tproperties.Add(new Godot.Collections.Dictionary()\n"
+"\t\t\t{\n"
+"\t\t\t\t{ \"name\", $\"number_{i}\" },\n"
+"\t\t\t\t{ \"type\", (int)Variant.Type.Int },\n"
+"\t\t\t\t{ \"hint\", (int)PropertyHint.Enum },\n"
+"\t\t\t\t{ \"hint_string\", \"Zero,One,Two,Three,Four,Five\" },\n"
+"\t\t\t});\n"
+"\t\t}\n"
+"\n"
+"\t\treturn properties;\n"
+"\t}\n"
+"\n"
+"\tpublic override Variant _Get(StringName property)\n"
+"\t{\n"
+"\t\tstring propertyName = property.ToString();\n"
+"\t\tif (propertyName.StartsWith(\"number_\"))\n"
+"\t\t{\n"
+"\t\t\tint index = int.Parse(propertyName.Substring(\"number_\".Length));\n"
+"\t\t\treturn _numbers[index];\n"
+"\t\t}\n"
+"\t\treturn default;\n"
+"\t}\n"
+"\n"
+"\tpublic override bool _Set(StringName property, Variant value)\n"
+"\t{\n"
+"\t\tstring propertyName = property.ToString();\n"
+"\t\tif (propertyName.StartsWith(\"number_\"))\n"
+"\t\t{\n"
+"\t\t\tint index = int.Parse(propertyName.Substring(\"number_\".Length));\n"
+"\t\t\t_numbers[index] = value.As<int>();\n"
+"\t\t\treturn true;\n"
+"\t\t}\n"
+"\t\treturn false;\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This method is intended for advanced purposes. For most common "
+"use cases, the scripting languages offer easier ways to handle properties. "
+"See [annotation @GDScript.@export], [annotation @GDScript.@export_enum], "
+"[annotation @GDScript.@export_group], etc. If you want to customize exported "
+"properties, use [method _validate_property].\n"
+"[b]Note:[/b] If the object's script is not [annotation @GDScript.@tool], this "
+"method will not be called in the editor.\n"
+"[b]Note:[/b] Unlike other virtual methods, this method is called "
+"automatically for every script that overrides it. This means that the base "
+"implementation should not be called via [code]super[/code] in GDScript or its "
+"equivalents in other languages. The bottom-most sub-class will be called "
+"first, with subsequent calls ascending the class hierarchy."
+msgstr ""
+"覆盖该方法以提供由引擎处理的额外属性的自定义列表。\n"
+"应该返回一个属性列表，作为字典的 [Array]。该结果被添加到 [method "
+"get_property_list] 的数组中，并且应该以相同的方式进行格式化。每个 "
+"[Dictionary] 必须至少包含 [code]name[/code] 和 [code]type[/code] 条目。\n"
+"你可以使用 [method _property_can_revert] 和 [method _property_get_revert] 自定"
+"义该方法添加的属性的默认值。\n"
+"下面的示例显示了一个数字列表，该列表显示为从 [code]ZERO[/code] 到 [code]FIVE[/"
+"code] 的单词，其中 [code]number_count[/code] 控制列表的大小：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends Node\n"
+"\n"
+"@export var number_count = 3:\n"
+"\tset(nc):\n"
+"\t\tnumber_count = nc\n"
+"\t\tnumbers.resize(number_count)\n"
+"\t\tnotify_property_list_changed()\n"
+"\n"
+"var numbers = PackedInt32Array([0, 0, 0])\n"
+"\n"
+"func _get_property_list():\n"
+"\tvar properties = []\n"
+"\n"
+"\tfor i in range(number_count):\n"
+"\t\tproperties.append({\n"
+"\t\t\t\"name\": \"number_%d\" % i,\n"
+"\t\t\t\"type\": TYPE_INT,\n"
+"\t\t\t\"hint\": PROPERTY_HINT_ENUM,\n"
+"\t\t\t\"hint_string\": \"ZERO,ONE,TWO,THREE,FOUR,FIVE\",\n"
+"\t\t})\n"
+"\n"
+"\treturn properties\n"
+"\n"
+"func _get(property):\n"
+"\tif property.begins_with(\"number_\"):\n"
+"\t\tvar index = property.get_slice(\"_\", 1).to_int()\n"
+"\t\treturn numbers[index]\n"
+"\n"
+"func _set(property, value):\n"
+"\tif property.begins_with(\"number_\"):\n"
+"\t\tvar index = property.get_slice(\"_\", 1).to_int()\n"
+"\t\tnumbers[index] = value\n"
+"\t\treturn true\n"
+"\treturn false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Tool]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"\tprivate int _numberCount;\n"
+"\n"
+"\t[Export]\n"
+"\tpublic int NumberCount\n"
+"\t{\n"
+"\t\tget => _numberCount;\n"
+"\t\tset\n"
+"\t\t{\n"
+"\t\t\t_numberCount = value;\n"
+"\t\t\t_numbers.Resize(_numberCount);\n"
+"\t\t\tNotifyPropertyListChanged();\n"
+"\t\t}\n"
+"\t}\n"
+"\n"
+"\tprivate Godot.Collections.Array<int> _numbers = [];\n"
+"\n"
+"\tpublic override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"\t{\n"
+"\t\tGodot.Collections.Array<Godot.Collections.Dictionary> properties = [];\n"
+"\n"
+"\t\tfor (int i = 0; i < _numberCount; i++)\n"
+"\t\t{\n"
+"\t\t\tproperties.Add(new Godot.Collections.Dictionary()\n"
+"\t\t\t{\n"
+"\t\t\t\t{ \"name\", $\"number_{i}\" },\n"
+"\t\t\t\t{ \"type\", (int)Variant.Type.Int },\n"
+"\t\t\t\t{ \"hint\", (int)PropertyHint.Enum },\n"
+"\t\t\t\t{ \"hint_string\", \"Zero,One,Two,Three,Four,Five\" },\n"
+"\t\t\t});\n"
+"\t\t}\n"
+"\n"
+"\t\treturn properties;\n"
+"\t}\n"
+"\n"
+"\tpublic override Variant _Get(StringName property)\n"
+"\t{\n"
+"\t\tstring propertyName = property.ToString();\n"
+"\t\tif (propertyName.StartsWith(\"number_\"))\n"
+"\t\t{\n"
+"\t\t\tint index = int.Parse(propertyName.Substring(\"number_\".Length));\n"
+"\t\t\treturn _numbers[index];\n"
+"\t\t}\n"
+"\t\treturn default;\n"
+"\t}\n"
+"\n"
+"\tpublic override bool _Set(StringName property, Variant value)\n"
+"\t{\n"
+"\t\tstring propertyName = property.ToString();\n"
+"\t\tif (propertyName.StartsWith(\"number_\"))\n"
+"\t\t{\n"
+"\t\t\tint index = int.Parse(propertyName.Substring(\"number_\".Length));\n"
+"\t\t\t_numbers[index] = value.As<int>();\n"
+"\t\t\treturn true;\n"
+"\t\t}\n"
+"\t\treturn false;\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]该方法旨在用于高级目的。对于大多数常见用例，脚本语言提供了更简单"
+"的方法来处理属性。参见 [annotation @GDScript.@export]、[annotation "
+"@GDScript.@export_enum]、[annotation @GDScript.@export_group] 等。如果要自定义"
+"导出的属性，请使用 [method _validate_property]。\n"
+"[b]注意：[/b]如果该对象的脚本不是 [annotation @GDScript.@tool]，则该方法在编辑"
+"器中不会被调用。\n"
+"[b]注意：[/b]与其他虚方法不同，该方法会被每个重写它的脚本自动调用。这意味着不"
+"应该通过 GDScript 中的 [code]super[/code] 或其他语言中的类似手段来调用基类实"
+"现。最底层的子类最先被调用，后续调用将沿着类层次结构向上进行。"
+
 msgid ""
 "Called when the object's script is instantiated, oftentimes after the object "
 "is initialized in memory (through [code]Object.new()[/code] in GDScript, or "
@@ -95348,6 +101965,112 @@ msgstr ""
 "用传递参数，这里使用单元素数组作为包装器。只要迭代器尚未到达末尾就会返回 "
 "[code]true[/code]。"
 
+msgid ""
+"Called when the object receives a notification, which can be identified in "
+"[param what] by comparing it with a constant. See also [method "
+"notification].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _notification(what):\n"
+"\tif what == NOTIFICATION_PREDELETE:\n"
+"\t\tprint(\"Goodbye!\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Notification(int what)\n"
+"{\n"
+"\tif (what == NotificationPredelete)\n"
+"\t{\n"
+"\t\tGD.Print(\"Goodbye!\");\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The base [Object] defines a few notifications ([constant "
+"NOTIFICATION_POSTINITIALIZE] and [constant NOTIFICATION_PREDELETE]). "
+"Inheriting classes such as [Node] define a lot more notifications, which are "
+"also received by this method.\n"
+"[b]Note:[/b] Unlike other virtual methods, this method is called "
+"automatically for every script that overrides it. This means that the base "
+"implementation should not be called via [code]super[/code] in GDScript or its "
+"equivalents in other languages. Call order depends on the [code]reversed[/"
+"code] argument of [method notification] and varies between different "
+"notifications. Most notifications are sent in the forward order (i.e. Object "
+"class first, most derived class last)."
+msgstr ""
+"当对象收到通知时被调用，可以通过将 [param what] 与常量比较来识别通知。另见 "
+"[method notification]。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _notification(what):\n"
+"\tif what == NOTIFICATION_PREDELETE:\n"
+"\t\tprint(\"再见！\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Notification(int what)\n"
+"{\n"
+"\tif (what == NotificationPredelete)\n"
+"\t{\n"
+"\t\tGD.Print(\"再见！\");\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]基类 [Object] 定义了一些通知（[constant "
+"NOTIFICATION_POSTINITIALIZE] 和 [constant NOTIFICATION_PREDELETE]）。[Node] 等"
+"继承类定义了更多通知，这些通知也由该方法接收。\n"
+"[b]注意：[/b]与其他虚方法不同，该方法会被每个覆盖的脚本自动调用。这意味着不应"
+"该通过 GDScript 中的 [code]super[/code] 或其他语言中的类似手段来调用基类实现。"
+"调用顺序取决于 [method notification] 方法的 [code]reversed[/code] 参数，并且不"
+"同的通知类型的调用顺序也可能不同。大多数通知都按正向顺序发送（即先调用 Object "
+"类，最后调用派生程度最高的类）。"
+
+msgid ""
+"Override this method to customize the given [param property]'s revert "
+"behavior. Should return [code]true[/code] if the [param property] has a "
+"custom default value and is revertible in the Inspector dock. Use [method "
+"_property_get_revert] to specify the [param property]'s default value.\n"
+"[b]Note:[/b] This method must return consistently, regardless of the current "
+"value of the [param property].\n"
+"[b]Note:[/b] Unlike other virtual methods, this method is called "
+"automatically for every script that overrides it. This means that the base "
+"implementation should not be called via [code]super[/code] in GDScript or its "
+"equivalents in other languages. The bottom-most sub-class will be called "
+"first, with subsequent calls ascending the class hierarchy. The call chain "
+"will stop on the first class that returns [code]true[/code]."
+msgstr ""
+"覆盖该方法以自定义给定 [param property] 的恢复行为。如果 [param property] 具有"
+"自定义默认值并且可在检查器面板中恢复，则应返回 [code]true[/code]。使用 "
+"[method _property_get_revert] 来指定 [param property] 的默认值。\n"
+"[b]注意：[/b]无论 [param property] 的当前值如何，该方法都必须始终如一地返"
+"回。\n"
+"[b]注意：[/b]与其他虚方法不同，该方法会被每个重写它的脚本自动调用。这意味着不"
+"应该通过 GDScript 中的 [code]super[/code] 或其他语言中的类似手段来调用基类实"
+"现。最底层的子类最先被调用，后续调用将沿着类层次结构向上进行。调用链会在第一个"
+"返回 [code]true[/code] 的类处停止。"
+
+msgid ""
+"Override this method to customize the given [param property]'s revert "
+"behavior. Should return the default value for the [param property]. If the "
+"default value differs from the [param property]'s current value, a revert "
+"icon is displayed in the Inspector dock.\n"
+"[b]Note:[/b] [method _property_can_revert] must also be overridden for this "
+"method to be called.\n"
+"[b]Note:[/b] Unlike other virtual methods, this method is called "
+"automatically for every script that overrides it. This means that the base "
+"implementation should not be called via [code]super[/code] in GDScript or its "
+"equivalents in other languages. The bottom-most sub-class will be called "
+"first, with subsequent calls ascending the class hierarchy. The call chain "
+"will stop on the first class that returns a non-[code]null[/code] value."
+msgstr ""
+"覆盖该方法以自定义给定 [param property] 的还原行为。应返回 [param property] 的"
+"默认值。如果默认值与 [param property] 的当前值不同，则检查器停靠面板中会显示一"
+"个还原图标。\n"
+"[b]注意：[/b][method _property_can_revert] 也必须被覆盖，该方法才能被调用。\n"
+"[b]注意：[/b]与其他虚方法不同，该方法会被每个重写它的脚本自动调用。这意味着不"
+"应该通过 GDScript 中的 [code]super[/code] 或其他语言中的类似手段来调用基类实"
+"现。最底层的子类最先被调用，后续调用将沿着类层次结构向上进行。调用链会在第一个"
+"返回非 [code]null[/code] 的类处停止。"
+
 msgid ""
 "Override this method to customize the behavior of [method set]. Should set "
 "the [param property] to [param value] and return [code]true[/code], or "
@@ -95694,6 +102417,85 @@ msgstr ""
 "snake_case 格式。最好使用 [code]MethodName[/code] 类中公开的名称，以避免在每次"
 "调用时分配新的 [StringName]。"
 
+msgid ""
+"Calls the [param method] on the object during idle time. Always returns "
+"[code]null[/code], [b]not[/b] the method's result.\n"
+"Idle time happens mainly at the end of process and physics frames. In it, "
+"deferred calls will be run until there are none left, which means you can "
+"defer calls from other deferred calls and they'll still be run in the current "
+"idle time cycle. This means you should not call a method deferred from itself "
+"(or from a method called by it), as this causes infinite recursion the same "
+"way as if you had called the method directly.\n"
+"This method supports a variable number of arguments, so parameters can be "
+"passed as a comma separated list.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"For methods that are deferred from the same thread, the order of execution at "
+"idle time is identical to the order in which [code skip-lint]call_deferred[/"
+"code] was called.\n"
+"See also [method Callable.call_deferred].\n"
+"[b]Note:[/b] In C#, [param method] must be in snake_case when referring to "
+"built-in Godot methods. Prefer using the names exposed in the "
+"[code]MethodName[/code] class to avoid allocating a new [StringName] on each "
+"call.\n"
+"[b]Note:[/b] If you're looking to delay the function call by a frame, refer "
+"to the [signal SceneTree.process_frame] and [signal SceneTree.physics_frame] "
+"signals.\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# Make a Callable and bind the arguments to the node's rotate() call.\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# Connect the callable to the process_frame signal, so it gets called in the "
+"next process frame.\n"
+"# CONNECT_ONE_SHOT makes sure it only gets called once instead of every "
+"frame.\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+msgstr ""
+"在空闲时调用该对象的 [param method] 方法。始终返回 [code]null[/code]，[b]不返"
+"回[/b]该方法的结果。\n"
+"空闲时间主要出现在处理帧和物理帧的末尾。延迟的调用会在此时执行，直到全部执行完"
+"毕，这意味着你可以从其他延迟调用中延迟调用，并且它们仍将在当前空闲时间周期中运"
+"行。这意味着你不应从延迟调用的方法（或从其调用的方法）中延迟调用其自身，因为这"
+"会导致无限递归，就像你直接调用该方法一样。\n"
+"这个方法支持可变数量的参数，所以参数可以用逗号分隔列表的形式传递。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"对于从同一线程中延迟执行的方法，在空闲时执行的顺序与调用 [code skip-"
+"lint]call_deferred[/code] 的顺序相同。\n"
+"另见 [method Callable.call_deferred]。\n"
+"[b]注意：[/b]在 C# 中，[param method] 引用内置的 Godot 方法时必须使用 "
+"snake_case 的形式。请优先使用 [code]MethodName[/code] 类中暴露的名称，避免每次"
+"调用都分配一个新的 [StringName]。\n"
+"[b]注意：[/b]如果你想要延迟一帧再调用函数，请使用 [signal "
+"SceneTree.process_frame] 和 [signal SceneTree.physics_frame] 信号。\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# 制作可调用体并将参数绑定到该节点的 rotate() 调用。\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# 将可调用体连接到 process_frame 信号，这样就能够在下一个处理帧中调用。\n"
+"# CONNECT_ONE_SHOT 能够确保只调用一次，不会每帧都调用。\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+
 msgid ""
 "Calls the [param method] on the object and returns the result. Unlike [method "
 "call], this method expects all parameters to be contained inside [param "
@@ -95746,6 +102548,33 @@ msgstr ""
 "保持已分配的状态。主要是作为内部函数使用，用于错误处理，避免用户释放不想释放的"
 "对象。"
 
+msgid ""
+"Connects a [param signal] by name to a [param callable]. Optional [param "
+"flags] can be also added to configure the connection's behavior (see [enum "
+"ConnectFlags] constants).\n"
+"A signal can only be connected once to the same [Callable]. If the signal is "
+"already connected, this method returns [constant ERR_INVALID_PARAMETER] and "
+"generates an error, unless the signal is connected with [constant "
+"CONNECT_REFERENCE_COUNTED]. To prevent this, use [method is_connected] first "
+"to check for existing connections.\n"
+"[b]Note:[/b] If the [param callable]'s object is freed, the connection will "
+"be lost.\n"
+"[b]Note:[/b] In GDScript, it is generally recommended to connect signals with "
+"[method Signal.connect] instead.\n"
+"[b]Note:[/b] This method, and all other signal-related methods, are thread-"
+"safe."
+msgstr ""
+"将名为 [param signal] 的信号与可调用体 [param callable] 连接。还可以通过 "
+"[param flags] 添加标志，配置连接行为（见 [enum ConnectFlags] 常量）。\n"
+"一个信号与同一个 [Callable] 只能连接一次。如果信号已连接，则该方法会返回 "
+"[constant ERR_INVALID_PARAMETER] 并报错误，除非信号是使用 [constant "
+"CONNECT_REFERENCE_COUNTED] 连接的。要防止出现这种情况，请先使用 [method "
+"is_connected] 检查是否已存在连接。\n"
+"[b]注意：[/b]如果 [param callable] 的对象被释放，连接就会丢失。\n"
+"[b]注意：[/b]在 GDScript 中，通常建议使用 [method Signal.connect] 来连接信"
+"号。\n"
+"[b]注意：[/b]该方法以及所有其他与信号相关的方法都是线程安全的。"
+
 msgid ""
 "Disconnects a [param signal] by name from a given [param callable]. If the "
 "connection does not exist, generates an error. Use [method is_connected] to "
@@ -96042,6 +102871,15 @@ msgstr ""
 "- [code]callable[/code] 是对已连接 [Callable] 的引用；\n"
 "- [code]flags[/code] 是 [enum ConnectFlags] 的组合。"
 
+msgid ""
+"Returns the list of existing signals as an [Array] of dictionaries.\n"
+"[b]Note:[/b] Due to the implementation, each [Dictionary] is formatted very "
+"similarly to the returned values of [method get_method_list]."
+msgstr ""
+"将现有信号的列表返回为字典的一个 [Array] 。\n"
+"[b]注意：[/b]由于该实现，每个 [Dictionary] 的格式与 [method get_method_list] "
+"的返回值非常相似。"
+
 msgid ""
 "Returns the name of the translation domain used by [method tr] and [method "
 "tr_n]. See also [TranslationServer]."
@@ -96601,6 +103439,18 @@ msgid ""
 "the frame), rather than instantly."
 msgstr "延迟连接会在空闲时触发 [Callable]（当前帧的末尾），不会立即触发。"
 
+msgid ""
+"Persisting connections are stored when the object is serialized (such as when "
+"using [method PackedScene.pack]). In the editor, connections created through "
+"the Signals dock are always persisting.\n"
+"[b]Note:[/b] Connections to lambda functions (that is, when the function code "
+"is embedded in the [method connect] call) cannot be made persistent."
+msgstr ""
+"持久连接会在序列化对象时存储（比如使用 [method PackedScene.pack] 时）。在编辑"
+"器中，通过“信号”面板创建的连接总是持久的。\n"
+"[b]注意：[/b]与 Lambda 函数（即函数代码嵌入在 [method connect] 调用中的）的连"
+"接无法持久化。"
+
 msgid "One-shot connections disconnect themselves after emission."
 msgstr "一次性连接，会在触发后自行断开。"
 
@@ -96612,6 +103462,38 @@ msgstr ""
 "引用计数连接可以多次分配给同一个 [Callable]。每断开一次连接会让内部计数器减"
 "一。信号会在计数器变为 0 时完全断开连接。"
 
+msgid ""
+"On signal emission, the source object is automatically appended after the "
+"original arguments of the signal, regardless of the connected [Callable]'s "
+"unbinds which affect only the original arguments of the signal (see [method "
+"Callable.unbind], [method Callable.get_unbound_arguments_count]).\n"
+"[codeblock]\n"
+"extends Object\n"
+"\n"
+"signal test_signal\n"
+"\n"
+"func test():\n"
+"\tprint(self) # Prints e.g. <Object#35332818393>\n"
+"\ttest_signal.connect(prints.unbind(1), CONNECT_APPEND_SOURCE_OBJECT)\n"
+"\ttest_signal.emit(\"emit_arg_1\", \"emit_arg_2\") # Prints emit_arg_1 "
+"<Object#35332818393>\n"
+"[/codeblock]"
+msgstr ""
+"信号发出时，源对象会自动追加到信号的原始参数之后，与连接的 [Callable] 的解绑操"
+"作无关，因为解绑操作只会影响信号的原始参数（见 [method Callable.unbind] 和 "
+"[method Callable.get_unbound_arguments_count]）。\n"
+"[codeblock]\n"
+"extends Object\n"
+"\n"
+"signal test_signal\n"
+"\n"
+"func test():\n"
+"\tprint(self) # 输出如：<Object#35332818393>\n"
+"\ttest_signal.connect(prints.unbind(1), CONNECT_APPEND_SOURCE_OBJECT)\n"
+"\ttest_signal.emit(\"emit_arg_1\", \"emit_arg_2\") # 输出：emit_arg_1 "
+"<Object#35332818393>\n"
+"[/codeblock]"
+
 msgid ""
 "Occluder shape resource for use with occlusion culling in "
 "[OccluderInstance3D]."
@@ -97111,6 +103993,75 @@ msgstr ""
 "输入大于等于此值时，输出变为 [code]true[/code]。直到低于 [member "
 "off_threshold] 都会保持为 [code]true[/code]。"
 
+msgid "Positional tracker for our spatial entity anchor extension."
+msgstr "用于我们的空间实体锚点扩展的位置跟踪器。"
+
+msgid ""
+"Positional tracker for our OpenXR spatial entity anchor extension, it tracks "
+"a user defined location in real space and maps it to our virtual space."
+msgstr ""
+"我们的 OpenXR 空间实体锚点扩展的位置跟踪器，它可以跟踪用户在现实空间中定义的位"
+"置，并将其映射到我们的虚拟空间。"
+
+msgid "Returns [code]true[/code] if a non-zero UUID is set."
+msgstr "如果设置了非零的 UUID，则返回 [code]true[/code]。"
+
+msgid "The UUID provided for persistent anchors."
+msgstr "为持久锚点提供的 UUID。"
+
+msgid "Emitted when the UUID for this anchor was changed."
+msgstr "当该锚点的 UUID 发生更改时发出。"
+
+msgid ""
+"Wraps the [url=https://registry.khronos.org/OpenXR/specs/1.1/html/"
+"xrspec.html#XR_KHR_android_thread_settings]XR_KHR_android_thread_settings[/"
+"url] extension."
+msgstr ""
+"封装了 [url=https://registry.khronos.org/OpenXR/specs/1.1/html/"
+"xrspec.html#XR_KHR_android_thread_settings]XR_KHR_android_thread_settings[/"
+"url] 扩展。"
+
+msgid ""
+"For XR to be comfortable, it is important for applications to deliver frames "
+"quickly and consistently. In order to make sure the important application "
+"threads get their full share of time, these threads must be identified to the "
+"system, which will adjust their scheduling priority accordingly."
+msgstr ""
+"为了让扩展现实（XR）体验更加舒适，应用程序必须快速且稳定地渲染画面。为了确保重"
+"要的应用程序线程能够获得足够的运行时间，必须将这些线程告知系统，系统会相应地调"
+"整它们的调度优先级。"
+
+msgid ""
+"Sets the thread type of the given thread, so that the XR runtime can adjust "
+"its scheduling priority accordingly.\n"
+"[param thread_id] refers to the OS thread id (ie from [code]gettid()[/code]). "
+"When [param thread_id] is [code]0[/code], it will set the thread type of the "
+"current thread.\n"
+"[b]NOTE:[/b] The id returned by [method Thread.get_id] is incompatible with "
+"[param thread_id]."
+msgstr ""
+"设置给定线程的线程类型，以便 XR 运行时可以相应地调整其调度优先级。\n"
+"[param thread_id] 指的是操作系统线程 ID（例如，来自 [code]gettid()[/code]）。"
+"当 [param thread_id] 为 [code]0[/code] 时，它将设置当前线程的线程类型。\n"
+"[b]注意：[/b][method Thread.get_id] 返回的 ID 与 [param thread_id] 不兼容。"
+
+msgid ""
+"Hints to the XR runtime that the thread is doing time critical CPU tasks."
+msgstr "给 XR 运行时的提示，表明该线程正在执行时间敏感的 CPU 任务。"
+
+msgid "Hints to the XR runtime that the thread is doing background CPU tasks."
+msgstr "给 XR 运行时的提示，表明该线程正在执行后台 CPU 任务。"
+
+msgid ""
+"Hints to the XR runtime that the thread is doing time critical graphics "
+"device tasks."
+msgstr "给 XR 运行时的提示，表明该线程正在执行时间敏感的图形设备任务。"
+
+msgid ""
+"Hints to the XR runtime that the thread is doing background graphics device "
+"tasks."
+msgstr "给 XR 运行时的提示，表明该线程正在执行后台图形设备任务。"
+
 msgid "Makes the OpenXR API available for GDExtension."
 msgstr "为 GDExtension 提供 OpenXR API。"
 
@@ -97217,6 +104168,16 @@ msgstr ""
 msgid "Returns the predicted display timing for the next frame."
 msgstr "返回下一帧的预测显示时间。"
 
+msgid ""
+"Returns the version of OpenXR that was initialized. Only valid after the "
+"OpenXR instance has been created. See [url=https://registry.khronos.org/"
+"OpenXR/specs/1.1/html/xrspec.html#XR_MAKE_VERSION]XR_MAKE_VERSION[/url] for "
+"how the version is calculated."
+msgstr ""
+"返回已初始化的 OpenXR 版本。仅在 OpenXR 实例创建后有效。有关版本计算方法，请参"
+"阅 [url=https://registry.khronos.org/OpenXR/specs/1.1/html/"
+"xrspec.html#XR_MAKE_VERSION]XR_MAKE_VERSION[/url]。"
+
 msgid ""
 "Returns the play space, which is an [url=https://registry.khronos.org/OpenXR/"
 "specs/1.0/man/html/XrSpace.html]XrSpace[/url] cast to an integer."
@@ -97262,6 +104223,13 @@ msgstr "返回支持的交换链格式的数组。"
 msgid "Returns the name of the specified swapchain format."
 msgstr "返回指定交换链格式的名称。"
 
+msgid ""
+"Returns the ID of the system, which is an [url=https://registry.khronos.org/"
+"OpenXR/specs/1.0/man/html/XrSystemId.html]XrSystemId[/url] cast to an integer."
+msgstr ""
+"返回系统的 ID，该 ID 是一个被转换为整数的 [url=https://registry.khronos.org/"
+"OpenXR/specs/1.0/man/html/XrSystemId.html]XrSystemId[/url] 类型值。"
+
 msgid ""
 "Inserts a debug label, this label is reported in any debug message resulting "
 "from the OpenXR calls that follows, until any of [method "
@@ -97315,6 +104283,45 @@ msgstr "返回给定交换链的 [code]XrSwapchain[/code] 句柄。"
 msgid "Releases the image of the provided swapchain."
 msgstr "释放给定交换链的图像。"
 
+msgid ""
+"Registers the given extension as a composition layer provider.\n"
+"[b]Note:[/b] This cannot be called after the OpenXR session has started. "
+"However, it can be called in [method "
+"OpenXRExtensionWrapper._on_session_created]."
+msgstr ""
+"将给定的扩展注册为合成层提供程序。\n"
+"[b]注意：[/b]该方法不能在 OpenXR 会话启动后调用。但是，可以在 [method "
+"OpenXRExtensionWrapper._on_session_created] 方法中调用它。"
+
+msgid ""
+"Registers the given extension as modifying frame info via the [method "
+"OpenXRExtensionWrapper._set_frame_wait_info_and_get_next_pointer], [method "
+"OpenXRExtensionWrapper._set_view_locate_info_and_get_next_pointer], or "
+"[method OpenXRExtensionWrapper._set_frame_end_info_and_get_next_pointer] "
+"virtual methods.\n"
+"[b]Note:[/b] This cannot be called after the OpenXR session has started. "
+"However, it can be called in [method "
+"OpenXRExtensionWrapper._on_session_created]."
+msgstr ""
+"将给定扩展注册为会通过 [method "
+"OpenXRExtensionWrapper._set_frame_wait_info_and_get_next_pointer]、[method "
+"OpenXRExtensionWrapper._set_view_locate_info_and_get_next_pointer]、[method "
+"OpenXRExtensionWrapper._set_frame_end_info_and_get_next_pointer] 等虚方法修改"
+"帧信息。\n"
+"[b]注意：[/b]该方法不能在 OpenXR 会话启动后调用。但是，可以在 [method "
+"OpenXRExtensionWrapper._on_session_created] 方法中调用它。"
+
+msgid ""
+"Registers the given extension as a provider of additional data structures to "
+"projections views.\n"
+"[b]Note:[/b] This cannot be called after the OpenXR session has started. "
+"However, it can be called in [method "
+"OpenXRExtensionWrapper._on_session_created]."
+msgstr ""
+"将给定的扩展程序注册为向投影视图提供附加数据结构的提供程序。\n"
+"[b]注意：[/b]该方法不能在 OpenXR 会话启动后调用。但是，可以在 [method "
+"OpenXRExtensionWrapper._on_session_created] 方法中调用它。"
+
 msgid ""
 "Sets the reference space used by OpenXR to the given [url=https://"
 "registry.khronos.org/OpenXR/specs/1.0/man/html/XrSpace.html]XrSpace[/url] "
@@ -97362,6 +104369,34 @@ msgstr ""
 "从 [url=https://registry.khronos.org/OpenXR/specs/1.0/man/html/"
 "XrPosef.html]XrPosef[/url] 创建一个 [Transform3D] 。"
 
+msgid ""
+"Unregisters the given extension as a composition layer provider.\n"
+"[b]Note:[/b] This cannot be called while the OpenXR session is still running."
+msgstr ""
+"将给定的扩展取消注册为合成层提供器。\n"
+"[b]注意：[/b]它无法在 OpenXR 会话仍在运行时被调用。"
+
+msgid ""
+"Unregisters the given extension as modifying frame info.\n"
+"[b]Note:[/b] This cannot be called while the OpenXR session is still running."
+msgstr ""
+"将给定的扩展程序取消注册为修改帧信息的功能。\n"
+"[b]注意：[/b]它无法在 OpenXR 会话仍在运行时被调用。"
+
+msgid ""
+"Unregisters the given extension as a provider of additional data structures "
+"to projections views.\n"
+"[b]Note:[/b] This cannot be called while the OpenXR session is still running."
+msgstr ""
+"将给定的扩展取消注册为投影视图的附加数据结构提供器。\n"
+"[b]注意：[/b]它无法在 OpenXR 会话仍在运行时被调用。"
+
+msgid ""
+"Request the recommended resolution from the OpenXR runtime and update the "
+"main swapchain size if it has changed."
+msgstr ""
+"从 OpenXR 运行时请求推荐的分辨率，如果分辨率发生变化，则更新主交换链的大小。"
+
 msgid ""
 "Returns [code]true[/code] if the provided [url=https://registry.khronos.org/"
 "OpenXR/specs/1.0/man/html/XrResult.html]XrResult[/url] (cast to an integer) "
@@ -97517,6 +104552,20 @@ msgstr ""
 msgid "The [SubViewport] to render on the composition layer."
 msgstr "合成层上渲染的 [SubViewport]。"
 
+msgid ""
+"If enabled, the OpenXR swapchain will be created with the "
+"[code]XR_SWAPCHAIN_CREATE_PROTECTED_CONTENT_BIT[/code] flag, which will "
+"protect its contents from CPU access.\n"
+"When used with an Android Surface, this may allow DRM content to be "
+"presented, and will only take effect when the Surface is first created; later "
+"changes to this property will have no effect."
+msgstr ""
+"如果启用，则 OpenXR 交换链将使用 "
+"[code]XR_SWAPCHAIN_CREATE_PROTECTED_CONTENT_BIT[/code] 标志创建，这将保护其内"
+"容免受 CPU 访问。\n"
+"与 Android Surface 一起使用时，这可能允许显示 DRM 内容，并且仅在 Surface 首次"
+"创建时生效；之后对该属性的更改将无效。"
+
 msgid ""
 "The sort order for this composition layer. Higher numbers will be shown in "
 "front of lower numbers.\n"
@@ -97818,11 +104867,151 @@ msgstr "每个楔形的角度，用于标识模拟十字键的四个方向。"
 msgid "Allows implementing OpenXR extensions with GDExtension."
 msgstr "允许使用 GDExtension 实现 OpenXR 扩展。"
 
+msgid ""
+"[OpenXRExtensionWrapper] allows implementing OpenXR extensions with "
+"GDExtension. The extension should be registered with [method "
+"register_extension_wrapper].\n"
+"When [OpenXRInterface] is initialized as the primary interface and any "
+"[Viewport] has [member Viewport.use_xr] set to [code]true[/code], OpenXR will "
+"become involved in Godot's rendering process. If [member "
+"ProjectSettings.rendering/driver/threads/thread_model] is set to "
+"\"Separate\", Godot's renderer will run on its own thread, and special care "
+"must be taken in all [OpenXRExtensionWrapper]s in order to prevent crashes or "
+"unexpected behavior. Some virtual methods will be called on the render "
+"thread, and any data they access should not be directly written to on the "
+"main thread. This is to prevent two potential issues:\n"
+"1. Changes intended for the next frame, taking effect on the current frame. "
+"When using the \"Separate\" thread model, the main thread will immediately "
+"start working on the next frame while the render thread may still be "
+"rendering the current frame. If the main thread changes anything used by the "
+"render thread directly, the change could end up being used one frame earlier "
+"than intended.\n"
+"2. Reading and writing to the same data at the same time from different "
+"threads can lead to the render thread using data in an invalid state.\n"
+"In most cases, the solution is to use [method "
+"RenderingServer.call_on_render_thread] to schedule [Callable]s to write to "
+"any data used on the render thread. When using the \"Separate\" thread model, "
+"these [Callable]s will run after the renderer finishes the current frame and "
+"before it starts rendering the next frame. When not using this mode, they'll "
+"run immediately, so it's recommended to always use [method "
+"RenderingServer.call_on_render_thread] in these cases, which will allow your "
+"code to do the right thing regardless of the thread model.\n"
+"Any virtual methods that run on the render thread will be noted below."
+msgstr ""
+"[OpenXRExtensionWrapper] 允许使用 GDExtension 实现 OpenXR 扩展。扩展必须使用 "
+"[method register_extension_wrapper] 方法进行注册。\n"
+"当 [OpenXRInterface] 被初始化为主接口，并且任何 [Viewport] 的 [member "
+"Viewport.use_xr] 被设置为 [code]true[/code] 时，OpenXR 将参与 Godot 的渲染过"
+"程。如果 [member ProjectSettings.rendering/driver/threads/thread_model] 被设置"
+"为“Separate”，Godot 的渲染器将在其自己的线程上运行，因此所有 "
+"[OpenXRExtensionWrapper] 都必须特别注意，以防止崩溃或意外行为。一些虚方法将在"
+"渲染线程上调用，它们访问的任何数据都不应在主线程上直接写入。这是为了防止两个潜"
+"在问题：\n"
+"1. 旨在用于下一帧的更改，却在当前帧生效。使用“Separate”线程模型时，主线程会立"
+"即开始处理下一帧，而渲染线程可能仍在渲染当前帧。如果主线程直接更改渲染线程使用"
+"的任何内容，则更改可能会比预期提前一帧生效。\n"
+"2. 从不同的线程同时读取和写入相同的数据会导致渲染线程使用处于无效状态的数"
+"据。\n"
+"在大多数情况下，解决方案是使用 [method RenderingServer.call_on_render_thread] "
+"来调度 [Callable] 函数，以便写入渲染线程上使用的任何数据。使用“Separate”线程模"
+"型时，这些 [Callable] 函数将在渲染器完成当前帧渲染后、开始渲染下一帧之前运行。"
+"不使用该模式时，它们会立即运行，因此建议始终在这些情况下使用 [method "
+"RenderingServer.call_on_render_thread]，这样无论使用哪种线程模型，你的代码都能"
+"正常工作。\n"
+"任何在渲染线程上运行的虚方法都将在下面注明。"
+
+msgid ""
+"Returns a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct to "
+"provide the given composition layer.\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_composition_layer_provider].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"返回指向 [code]XrCompositionLayerBaseHeader[/code] 结构的指针以提供给定的合成"
+"层。\n"
+"仅当扩展先前使用 [method "
+"OpenXRAPIExtension.register_composition_layer_provider] 注册自身后才会调用该函"
+"数。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，它返回的数据将在调用该方法后不"
+"久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行为止。"
+
+msgid ""
+"Returns the number of composition layers this extension wrapper provides via "
+"[method _get_composition_layer].\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_composition_layer_provider].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"通过 [method _get_composition_layer] 返回该扩展包装器提供的合成层数量。\n"
+"仅当扩展先前使用 [method "
+"OpenXRAPIExtension.register_composition_layer_provider] 注册自身时，才会调用该"
+"方法。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，它返回的数据将在调用该方法后不"
+"久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行为止。"
+
+msgid ""
+"Returns an integer that will be used to sort the given composition layer "
+"provided via [method _get_composition_layer]. Lower numbers will move the "
+"layer to the front of the list, and higher numbers to the end. The default "
+"projection layer has an order of [code]0[/code], so layers provided by this "
+"method should probably be above or below (but not exactly) [code]0[/code].\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_composition_layer_provider].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"返回一个整数，该整数将用于对通过 [method _get_composition_layer] 提供的给定合"
+"成层进行排序。数字越小，层就越容易移到列表的最前面，数字越大，层就越容易移到列"
+"表的最后面。默认投影层的顺序为 [code]0[/code]，因此该方法提供的层可能应该位于"
+"（但不完全位于）[code]0[/code] 的上方或下方。\n"
+"仅当扩展程序先前使用 [method "
+"OpenXRAPIExtension.register_composition_layer_provider] 注册自身时，才会调用该"
+"方法。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，它返回的数据将在调用该方法后不"
+"久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行为止。"
+
+msgid ""
+"Returns a [Dictionary] of OpenXR extensions related to this extension. [param "
+"xr_version] specifies the OpenXR version we're instantiating. This will be "
+"zero if the editor requests this list to flag supported features. The "
+"[Dictionary] should contain the name of the extension, mapped to a [code]bool "
+"*[/code] cast to an integer:\n"
+"- If the [code]bool *[/code] is a [code]nullptr[/code] this extension is "
+"mandatory.\n"
+"- If the [code]bool *[/code] points to a boolean, the boolean will be updated "
+"to [code]true[/code] if the extension is enabled."
+msgstr ""
+"返回与该扩展相关的 OpenXR 扩展的 [Dictionary]。[param xr_version] 指定我们正在"
+"实例化的 OpenXR 版本。如果编辑器请求该列表以标记支持的功能，则该值将为零。"
+"[Dictionary] 应包含扩展的名称，并将其映射到一个强制转换为整数的 [code]bool *[/"
+"code] 类型指针：\n"
+"- 如果 [code]bool *[/code] 是 [code]nullptr[/code]，则该扩展是强制性的。\n"
+"- 如果 [code]bool *[/code] 指向布尔值，则在启用扩展的情况下，该布尔值将更新为 "
+"[code]true[/code]。"
+
 msgid ""
 "Returns a [PackedStringArray] of positional tracker names that are used "
 "within the extension wrapper."
 msgstr "返回扩展包装器中使用的位置跟踪器名称的 [PackedStringArray]。"
 
+msgid ""
+"Gets an array of [Dictionary]s that represent properties, just like [method "
+"Object._get_property_list], that will be added to [OpenXRCompositionLayer] "
+"nodes.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"获取表示属性的 [Dictionary] 数组，就像 [method Object._get_property_list] 一"
+"样，将被添加到 [OpenXRCompositionLayer] 节点。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
 msgid ""
 "Gets a [Dictionary] containing the default values for the properties returned "
 "by [method _get_viewport_composition_layer_extension_properties]."
@@ -97830,6 +105019,16 @@ msgstr ""
 "获取一个 [Dictionary]，其中包含 [method "
 "_get_viewport_composition_layer_extension_properties] 返回的属性的默认值。"
 
+msgid ""
+"Called before the OpenXR instance is created.\n"
+"[b]Note:[/b] This virtual method will be called on the main thread, however, "
+"it will be called [i]before[/i] OpenXR becomes involved in rendering, so it "
+"is safe to write to data that will be used by the render thread."
+msgstr ""
+"在 OpenXR 实例创建之前调用。\n"
+"[b]注意：[/b]该虚方法将在主线程上调用，但它会在 OpenXR 参与渲染[i]之前[/i]调"
+"用，因此可以安全地写入渲染线程将使用的数据。"
+
 msgid ""
 "Called when there is an OpenXR event to process. When implementing, return "
 "[code]true[/code] if the event was handled, return [code]false[/code] "
@@ -97838,6 +105037,57 @@ msgstr ""
 "当有 OpenXR 事件需要处理时调用。实现时，如果事件已被处理，则返回 [code]true[/"
 "code]，否则返回 [code]false[/code]。"
 
+msgid ""
+"Called right after the OpenXR instance is created.\n"
+"[b]Note:[/b] This virtual method will be called on the main thread, however, "
+"it will be called [i]before[/i] OpenXR becomes involved in rendering, so it "
+"is safe to write to data that will be used by the render thread."
+msgstr ""
+"在 OpenXR 实例创建后立即调用。\n"
+"[b]注意：[/b]该虚方法将在主线程上调用，但会在 OpenXR 参与渲染[i]之前[/i]调用，"
+"因此可以安全地写入渲染线程将使用的数据。"
+
+msgid ""
+"Called right before the OpenXR instance is destroyed.\n"
+"[b]Note:[/b] This virtual method will be called on the main thread, however, "
+"it will be called [i]after[/i] OpenXR is done being involved in rendering, so "
+"it is safe to write to data that was used by the render thread."
+msgstr ""
+"在 OpenXR 实例销毁之前调用。\n"
+"[b]注意：[/b]该虚方法将在主线程上调用，但会在 OpenXR 完成渲染[i]之后[/i]调用，"
+"因此可以安全地写入渲染线程使用的数据。"
+
+msgid ""
+"Called right after the main swapchains are (re)created.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"在主交换链（重新）创建后立即调用。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
+msgid ""
+"Called right after the given viewport is rendered.\n"
+"[b]Note:[/b] The draw commands might only be queued at this point, not "
+"executed.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"在给定视口渲染完成后立即调用。\n"
+"[b]注意：[/b]此时绘制命令可能只是在队列中，尚未执行。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
+msgid ""
+"Called right before the given viewport is rendered.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"在给定视口渲染之前调用。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
+msgid ""
+"Called right before the XR viewports begin their rendering step.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"在 XR 视口开始其渲染步骤之前调用。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
 msgid ""
 "Called as part of the OpenXR process handling. This happens right before "
 "general and physics processing steps of the main loop. During this step "
@@ -97859,6 +105109,26 @@ msgstr ""
 "扩展还应该提供元数据，无论主机系统是否支持它们。控制器数据用于为可以访问相关硬"
 "件的用户设置动作映射。"
 
+msgid ""
+"Called right after the OpenXR session is created.\n"
+"[b]Note:[/b] This virtual method will be called on the main thread, however, "
+"it will be called [i]before[/i] OpenXR becomes involved in rendering, so it "
+"is safe to write to data that will be used by the render thread."
+msgstr ""
+"在 OpenXR 会话创建后立即调用。\n"
+"[b]注意：[/b]该虚方法将在主线程上调用，但会在 OpenXR 参与渲染[i]之前[/i]调用，"
+"因此可以安全地写入渲染线程将使用的数据。"
+
+msgid ""
+"Called right before the OpenXR session is destroyed.\n"
+"[b]Note:[/b] This virtual method will be called on the main thread, however, "
+"it will be called [i]after[/i] OpenXR is done being involved in rendering, so "
+"it is safe to write to data that was used by the render thread."
+msgstr ""
+"在 OpenXR 会话销毁之前调用。\n"
+"[b]注意：[/b]该虚方法将在主线程上调用，但会在 OpenXR 完成渲染相关操作[i]之后[/"
+"i]调用，因此可以安全地写入渲染线程使用的数据。"
+
 msgid "Called when the OpenXR session state is changed to exiting."
 msgstr "当 OpenXR 会话状态被更改为退出时调用。"
 
@@ -97907,11 +105177,144 @@ msgstr ""
 "当通过 [OpenXRCompositionLayer] 创建的合成层被销毁时调用。\n"
 "[param layer] 是指向 [code]XrCompositionLayerBaseHeader[/code] 结构的指针。"
 
+msgid ""
+"Called before [method _set_view_configuration_and_get_next_pointer] to allow "
+"the extension to reserve data for the given number of views."
+msgstr ""
+"在 [method _set_view_configuration_and_get_next_pointer] 之前调用，以允许扩展"
+"为给定数量的视图保留数据。"
+
+msgid ""
+"Called to allow an extension to print additional information about its view "
+"configuration, if applicable. This will only be called if verbose output is "
+"enabled."
+msgstr ""
+"如果适用，调用以用于允许扩展打印有关其视图配置的更多信息。仅当详细输出启用时才"
+"会调用该方法。"
+
+msgid ""
+"Add additional data structures to Android surface swapchains created by "
+"[OpenXRCompositionLayer].\n"
+"[param property_values] contains the values of the properties returned by "
+"[method _get_viewport_composition_layer_extension_properties].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"向由 [OpenXRCompositionLayer] 创建的 Android 表面交换链添加额外的数据结构。\n"
+"[param property_values] 包含 [method "
+"_get_viewport_composition_layer_extension_properties] 返回的属性值。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
+msgid ""
+"Add additional data structures to [code]XrFrameEndInfo[/code].\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_frame_info_extension].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"向 [code]XrFrameEndInfo[/code] 添加额外的数据结构。\n"
+"仅当扩展之前已通过 [method OpenXRAPIExtension.register_frame_info_extension] "
+"注册自身后才会调用。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，它返回的数据将在调用该方法后不"
+"久使用，因此该数据必须保持有效，直到下次 [method _on_pre_render] 运行。"
+
+msgid ""
+"Add additional data structures to [code]XrFrameWaitInfo[/code].\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_frame_info_extension].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread."
+msgstr ""
+"向 [code]XrFrameWaitInfo[/code] 添加额外的数据结构。\n"
+"仅当扩展之前已通过 [method OpenXRAPIExtension.register_frame_info_extension] "
+"方法注册自身后才会调用。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。"
+
+msgid "Add additional data structures when each hand tracker is created."
+msgstr "当每个手部跟踪器被创建时添加额外的数据结构。"
+
+msgid ""
+"Add additional data structures when the OpenXR instance is created. [param "
+"xr_version] specifies the OpenXR version we're instantiating."
+msgstr ""
+"在 OpenXR 实例被创建时添加额外的数据结构。[param xr_version] 指定我们要实例化"
+"的 OpenXR 版本。"
+
+msgid ""
+"Add additional data structures to the projection view of the given [param "
+"view_index].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"向给定 [param view_index] 的投影视图添加额外数据结构。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，该方法返回的数据将在调用该方法"
+"后不久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行。"
+
+msgid ""
+"Add additional data structures to [code]XrReferenceSpaceCreateInfo[/code]."
+msgstr "向 [code]XrReferenceSpaceCreateInfo[/code] 添加额外的数据结构。"
+
+msgid "Add additional data structures when the OpenXR session is created."
+msgstr "在 OpenXR 会话创建时添加额外的数据结构。"
+
+msgid "Add additional data structures when creating OpenXR swapchains."
+msgstr "在 OpenXR 交换链创建时添加额外的数据结构。"
+
+msgid "Add additional data structures when querying OpenXR system abilities."
+msgstr "在查询 OpenXR 系统功能时添加额外的数据结构。"
+
+msgid "Add additional data structures when querying OpenXR view configuration."
+msgstr "在查询 OpenXR 视图配置时添加额外的数据结构。"
+
+msgid ""
+"Add additional data structures to [code]XrViewLocateInfo[/code].\n"
+"This will only be called if the extension previously registered itself with "
+"[method OpenXRAPIExtension.register_frame_info_extension].\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"为 [code]XrViewLocateInfo[/code] 添加额外的数据结构。\n"
+"仅当扩展先前使用 [method OpenXRAPIExtension.register_frame_info_extension] 注"
+"册自身时才会调用该函数。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，该方法返回的数据将在调用该方法"
+"后不久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行。"
+
+msgid ""
+"Add additional data structures to composition layers created by "
+"[OpenXRCompositionLayer].\n"
+"[param property_values] contains the values of the properties returned by "
+"[method _get_viewport_composition_layer_extension_properties].\n"
+"[param layer] is a pointer to an [code]XrCompositionLayerBaseHeader[/code] "
+"struct.\n"
+"[b]Note:[/b] This virtual method will be called on the render thread. "
+"Additionally, the data it returns will be used shortly after this method is "
+"called, so it needs to remain valid until the next time [method "
+"_on_pre_render] runs."
+msgstr ""
+"向由 [OpenXRCompositionLayer] 创建的合成层添加其他数据结构。\n"
+"[param property_values] 包含 [method "
+"_get_viewport_composition_layer_extension_properties] 返回的属性值。\n"
+"[param layer] 是指向 [code]XrCompositionLayerBaseHeader[/code] 结构的指针。\n"
+"[b]注意：[/b]该虚方法将在渲染线程上调用。此外，该方法返回的数据将在调用该方法"
+"后不久使用，因此它需要保持有效，直到下次 [method _on_pre_render] 运行。"
+
 msgid ""
 "Returns the created [OpenXRAPIExtension], which can be used to access the "
 "OpenXR API."
 msgstr "返回创建的 [OpenXRAPIExtension]，可用于访问 OpenXR API。"
 
+msgid ""
+"Registers the extension. This should happen at core module initialization "
+"level.\n"
+"[b]Note:[/b] This cannot be called once OpenXR has been initialized."
+msgstr ""
+"注册扩展。这应该发生在核心模块初始化阶段。\n"
+"[b]注意：[/b]OpenXR 初始化后不能再调用该函数。"
+
 msgid "Use [OpenXRExtensionWrapper] instead."
 msgstr "请改用 [OpenXRExtensionWrapper]。"
 
@@ -97923,6 +105326,55 @@ msgstr ""
 "[OpenXRExtensionWrapperExtension] 允许使用 GDExtension 实现 OpenXR 扩展。扩展"
 "应该使用 [method OpenXRExtensionWrapper.register_extension_wrapper] 注册。"
 
+msgid ""
+"The OpenXR Frame synthesis extension allows for advanced reprojection at "
+"low(er) framerates."
+msgstr "OpenXR 帧合成扩展允许在较低帧率下进行高级重投影。"
+
+msgid ""
+"This class implements the [url=https://registry.khronos.org/OpenXR/specs/1.1/"
+"html/xrspec.html#XR_EXT_frame_synthesis]OpenXR Frame synthesis extension[/"
+"url]. When enabled in the project settings and supported by the XR runtime in "
+"use, frame synthesis uses advanced reprojection techniques to inject "
+"additional frames so that your XR experience hits the full frame rate of the "
+"device."
+msgstr ""
+"该类实现了 [url=https://registry.khronos.org/OpenXR/specs/1.1/html/"
+"xrspec.html#XR_EXT_frame_synthesis]OpenXR 帧合成扩展[/url]。如果在项目设置中启"
+"用，并且所使用的 XR 运行时也支持时，则帧合成技术会使用先进的重投影技术来插入额"
+"外的帧，从而使你的 XR 体验达到设备的完整帧率。"
+
+msgid ""
+"Returns [code]true[/code] if frame synthesis is enabled in the project "
+"settings and the current XR runtime supports frame synthesis. The value "
+"returned will only be valid once OpenXR has been initialized."
+msgstr ""
+"如果项目设置中启用了帧合成功能，并且当前的 XR 运行时支持帧合成，则返回 "
+"[code]true[/code]。返回的值仅在 OpenXR 初始化后才有效。"
+
+msgid ""
+"Queues the next frame to be skipped when supplying motion vector and depth "
+"data. Call this after teleporting your player or a similar action has moved "
+"the player to prevent incorrect reprojection results due to this movement."
+msgstr ""
+"在提供运动矢量和深度数据时，将下一帧加入队列以跳过。在玩家瞬移或执行类似操作导"
+"致玩家位置发生变化后调用该函数，以防止由于该移动导致重投影结果不正确。"
+
+msgid ""
+"Enable frame synthesis. When [code]true[/code] motion vector and depth data "
+"is provided to the XR runtime."
+msgstr ""
+"启用帧合成功能。为 [code]true[/code] 时，运动矢量和深度数据将提供给 XR 运行"
+"时。"
+
+msgid ""
+"If [code]true[/code] this informs the XR runtime we will be providing frames "
+"at a greatly reduced rate. Enable this when you expect your application to "
+"run at low framerates and wish to inject multiple reprojected frames."
+msgstr ""
+"如果为 [code]true[/code]，则通知 XR 运行时我们将以大大降低的帧率提供帧数据。如"
+"果你预计应用程序将以较低的帧率运行，并且希望注入多个重投影帧时，请启用该选项。"
+
 msgid "The OpenXR Future extension allows for asynchronous APIs to be used."
 msgstr "OpenXR Future 扩展，允许使用异步 API。"
 
@@ -98233,6 +105685,78 @@ msgstr ""
 "等）相关的元数据。它主要由动作映射编辑器使用，并在适用时通过移除依赖于扩展的条"
 "目来清理任何动作映射。"
 
+msgid ""
+"Registers an interaction profile using its OpenXR designation (e.g. [code]/"
+"interaction_profiles/khr/simple_controller[/code] is the profile for OpenXR's "
+"simple controller profile).\n"
+"[param display_name] is the description shown to the user. [param "
+"openxr_path] is the interaction profile path being registered. [param "
+"openxr_extension_names] optionally restricts this profile to the given "
+"extension being enabled/available. If the extension is not available, the "
+"profile and all related entries used in an action map are filtered out."
+msgstr ""
+"使用 OpenXR 名称注册交互配置文件（例如 [code]/interaction_profiles/khr/"
+"simple_controller[/code] 是 OpenXR 简单控制器配置文件的配置文件）。\n"
+"[param display_name] 是向用户显示的描述。[param openxr_path] 是正被注册的交互"
+"配置文件路径。[param openxr_extension_names] 可以选择将该配置文件限制为对给定"
+"扩展启用/可用。如果该扩展不可用，则动作映射中使用的配置文件和所有相关条目都会"
+"被过滤掉。"
+
+msgid ""
+"Registers an input/output path for the given [param interaction_profile]. The "
+"profile should previously have been registered using [method "
+"register_interaction_profile]. [param display_name] is the description shown "
+"to the user. [param toplevel_path] specifies the bind path this input/output "
+"can be bound to (e.g. [code]/user/hand/left[/code] or [code]/user/hand/right[/"
+"code]). [param openxr_path] is the action input/output being registered (e.g. "
+"[code]/user/hand/left/input/aim/pose[/code]). [param openxr_extension_names] "
+"restricts this input/output to an enabled/available extension, this doesn't "
+"need to repeat the extension on the profile but relates to overlapping "
+"extension (e.g. [code]XR_EXT_palm_pose[/code] that introduces [code]…/input/"
+"palm_ext/pose[/code] input paths). [param action_type] defines the type of "
+"input or output provided by OpenXR."
+msgstr ""
+"为给定的 [param interaction_profile] 注册输入/输出路径。该配置文件之前应已使"
+"用 [method register_interaction_profile] 注册。[param display_name] 是向用户显"
+"示的描述。[param toplevel_path] 指定该输入/输出可以被绑定到的绑定路径（例如 "
+"[code]/user/hand/left[/code] 或 [code]/user/hand/right[/code]）。[param "
+"openxr_path] 是正被注册的动作输入/输出（例如 [code]/user/hand/left/input/aim/"
+"pose[/code]）。[param openxr_extension_names] 将该输入/输出限制为启用的/可用的"
+"扩展，这不需要在配置文件上重复该扩展，但与重叠扩展相关（例如引入 [code]…/"
+"input/palm_ext/pose[/code] 输入路径的 [code]XR_EXT_palm_pose[/code]）。[param "
+"action_type] 定义 OpenXR 提供的输入或输出的类型。"
+
+msgid ""
+"Allows for renaming old input/output paths to new paths in order to load and "
+"process older action maps."
+msgstr "允许将旧的输入/输出路径重命名为新路径，以便加载和处理旧动作映射。"
+
+msgid ""
+"Allows for renaming old interaction profile paths to new paths in order to "
+"load and process older action maps."
+msgstr "允许将旧的交互配置文件路径重命名为新路径，以便加载和处理旧动作映射。"
+
+msgid ""
+"Registers a top level path to which profiles can be bound. For instance "
+"[code]/user/hand/left[/code] refers to the bind point for the player's left "
+"hand. Extensions can register additional top level paths, for instance a "
+"haptic vest extension might register [code]/user/body/vest[/code].\n"
+"[param display_name] is the name shown to the user. [param openxr_path] is "
+"the top level path being registered. [param openxr_extension_names] is "
+"optional and ensures the top level path is only used if the specified "
+"extension is available/enabled.\n"
+"When a top level path ends up being bound by OpenXR, an [XRPositionalTracker] "
+"is instantiated to manage the state of the device."
+msgstr ""
+"注册配置文件可以被绑定到的顶级路径。例如 [code]/user/hand/left[/code] 指的是玩"
+"家左手的绑定点。扩展可以注册额外的顶级路径，例如触觉背心扩展可以注册 [code]/"
+"user/body/vest[/code]。\n"
+"[param display_name] 是向用户显示的名称。[param openxr_path] 是正被注册的顶级"
+"路径。[param openxr_extension_names] 是可选的，可确保仅在指定的扩展可用/启用时"
+"才使用顶级路径。\n"
+"当顶级路径最终被 OpenXR 绑定时，[XRPositionalTracker] 被实例化以管理该设备的状"
+"态。"
+
 msgid "Our OpenXR interface."
 msgstr "OpenXR 接口。"
 
@@ -98261,6 +105785,14 @@ msgid ""
 "map at runtime)."
 msgstr "返回向 Godot 注册的动作集的列表（在运行时从动作映射加载）。"
 
+msgid ""
+"Returns a list of display refresh rates supported by the current HMD. Only "
+"returned if this feature is supported by the OpenXR runtime and after the "
+"interface has been initialized."
+msgstr ""
+"返回当前头戴式显示器支持的显示刷新率列表。仅当 OpenXR 运行时支持该功能且接口已"
+"被初始化后才会返回。"
+
 msgid ""
 "Use [method XRHandTracker.get_hand_joint_angular_velocity] obtained from "
 "[method XRServer.get_tracker] instead."
@@ -98373,6 +105905,18 @@ msgstr ""
 "返回眼睛注视交互扩展的功能。\n"
 "[b]注意：[/b]这仅在 OpenXR 被初始化后返回一个有效值。"
 
+msgid ""
+"Returns [code]true[/code] if OpenXR's foveation extension is supported. The "
+"interface must be initialized before this returns a valid value.\n"
+"[b]Note:[/b] When using the Vulkan rendering driver, [member "
+"Viewport.vrs_mode] must be set to [constant Viewport.VRS_XR] to support "
+"foveation."
+msgstr ""
+"如果支持 OpenXR 的注视点扩展，则返回 [code]true[/code]。该接口必须在该方法返回"
+"有效值之前初始化。\n"
+"[b]注意：[/b]使用 Vulkan 渲染驱动程序时，必须将 [member Viewport.vrs_mode] 设"
+"置为 [constant Viewport.VRS_XR] 才能支持注视点。"
+
 msgid ""
 "Returns [code]true[/code] if OpenXR's hand interaction profile is supported "
 "and enabled.\n"
@@ -98415,6 +105959,25 @@ msgstr ""
 "当前 HMD 的显示刷新率。仅当 OpenXR 运行时支持该功能并且接口已被初始化后才会有"
 "效。"
 
+msgid ""
+"If [code]true[/code], enables dynamic foveation adjustment. The interface "
+"must be initialized before this is accessible. If enabled, foveation will "
+"automatically be adjusted between low and [member foveation_level].\n"
+"[b]Note:[/b] Only works on the Compatibility renderer."
+msgstr ""
+"如果为 [code]true[/code]，则启用动态注视点调整。该接口必须在访问该功能之前初始"
+"化。如果启用，注视点将在低和 [member foveation_level] 之间自动调整。\n"
+"[b]注意：[/b]仅适用于兼容性渲染器。"
+
+msgid ""
+"The foveation level, from [code]0[/code] (off) to [code]3[/code] (high). The "
+"interface must be initialized before this is accessible.\n"
+"[b]Note:[/b] Only works on the Compatibility renderer."
+msgstr ""
+"注视点级别，从 [code]0[/code]（关闭）到 [code]3[/code]（高）。该接口必须在访问"
+"该功能之前初始化。\n"
+"[b]注意：[/b]仅适用于兼容性渲染器。"
+
 msgid ""
 "The render size multiplier for the current HMD. Must be set before the "
 "interface has been initialized."
@@ -98525,6 +106088,13 @@ msgid ""
 "when we change to this state."
 msgstr "会话即将丢失。进入该状态时会发出 [signal session_loss_pending]。"
 
+msgid ""
+"The OpenXR instance is about to be destroyed and we're exiting. [signal "
+"instance_exiting] is emitted when we change to this state."
+msgstr ""
+"OpenXR 实例即将被销毁，正在退出。更改为该状态时会发出 [signal "
+"instance_exiting]。"
+
 msgid "Left hand."
 msgstr "左手。"
 
@@ -98786,6 +106356,95 @@ msgstr "定义该设备上绑定的输入或输出的路径。"
 msgid "Binding modifier that applies directly on an interaction profile."
 msgstr "直接应用于某个交互配置的绑定修改器。"
 
+msgid "Spatial entity tracker for our spatial entity marker tracking extension."
+msgstr "用于空间实体标记跟踪扩展的空间实体跟踪器。"
+
+msgid ""
+"Spatial entity tracker for our OpenXR spatial entity marker tracking "
+"extension. These trackers identify entities in our real space detected by a "
+"visual marker such as a QRCode or Aruco code, and map their location to our "
+"virtual space."
+msgstr ""
+"用于 OpenXR 空间实体标记跟踪扩展的空间实体跟踪器。这些跟踪器可以识别现实空间中"
+"由诸如二维码或 Aruco 码等视觉标记检测到的实体，并将它们的位置映射到虚拟空间。"
+
+msgid ""
+"Returns the marker data for this marker. This can return a [String] or "
+"[PackedByteArray]. Only applicable to QR Code based markers."
+msgstr ""
+"返回该标记的标记数据。可以返回 [String] 或 [PackedByteArray]。仅适用于基于二维"
+"码的标记。"
+
+msgid ""
+"Sets the marker data for this marker.\n"
+"[b]Note:[/b] This should only be set by marker discovery logic."
+msgstr ""
+"设置该标记的标记数据。\n"
+"[b]注意：[/b]该数据只能由标记发现逻辑设置。"
+
+msgid "The bounds size for this marker."
+msgstr "该标记的边界大小。"
+
+msgid ""
+"The marker ID for this marker, this is only returned for Aruco and April Tag "
+"markers. Call [method get_marker_data] for QRCode markers."
+msgstr ""
+"该标记的标记 ID，仅适用于 Aruco 和 AprilTag 标记。对于二维码标记，请调用 "
+"[method get_marker_data]。"
+
+msgid "The type of marker."
+msgstr "标记的类型。"
+
+msgid "Spatial entity tracker for our spatial entity plane tracking extension."
+msgstr "用于空间实体平面跟踪扩展的空间实体跟踪器。"
+
+msgid ""
+"Spatial entity tracker for our OpenXR spatial entity plane tracking "
+"extension. These trackers identify entities in our real space such as walls, "
+"floors, tables, etc. and map their location to our virtual space."
+msgstr ""
+"用于 OpenXR 空间实体平面跟踪扩展的空间实体跟踪器。这些跟踪器可以识别现实空间中"
+"的实体，例如墙壁、地板、桌子等，并将它们的位置映射到虚拟空间中。"
+
+msgid ""
+"Clears the mesh data for this tracker. You should only call this if you are "
+"handling your own discovery logic."
+msgstr "清除该跟踪器的网格数据。仅当需自行处理发现逻辑时才应调用该函数。"
+
+msgid ""
+"Gets a mesh created from either the mesh data or from our bounding size for "
+"this plane."
+msgstr "获取根据网格数据或该平面的边界大小创建的网格。"
+
+msgid ""
+"Gets the transform by which to offset the mesh and collision shape from our "
+"pose to display these correctly."
+msgstr "获取用于将网格和碰撞形状从我们的姿势偏移以正确显示它们的变换。"
+
+msgid ""
+"Gets a collision shape built either from the mesh data or from our bounding "
+"size for this plane."
+msgstr "获取由网格数据或该平面的边界大小构建的碰撞形状。"
+
+msgid ""
+"Sets the mesh data for this plane. You should only call this if you are "
+"handling your own discovery logic."
+msgstr "设置该平面的网格数据。仅当需自行处理发现逻辑时才应调用该方法。"
+
+msgid "The bounding size of the plane. This is a 2D size."
+msgstr "平面的边界大小。这是一个 2D 大小。"
+
+msgid "The main alignment in space of this plane."
+msgstr "该平面在空间中的主要对齐方式。"
+
+msgid "The semantic label for this plane."
+msgstr "该平面的语义标签。"
+
+msgid ""
+"Emitted when our mesh data has changed the mesh instance and collision needs "
+"to be updated."
+msgstr "当网格数据发生变化，网格实例和碰撞体需要更新时发出。"
+
 msgid "This node will display an OpenXR render model."
 msgstr "该节点会显示 OpenXR 渲染模型。"
 
@@ -98978,6 +106637,1076 @@ msgid ""
 "tracker."
 msgstr "仅显示与右手跟踪器相关的活动渲染模型。"
 
+msgid "Implementation for handling spatial entity anchor logic."
+msgstr "用于处理空间实体锚点逻辑的实现。"
+
+msgid ""
+"This is an internal class that handles the OpenXR anchor spatial entity "
+"extension."
+msgstr "这是一个内部类，用于处理 OpenXR 锚点空间实体扩展。"
+
+msgid ""
+"Creates a new anchor that will be tracked by the XR runtime. The [param "
+"transform] should be a transform in the local space of your [XROrigin3D] "
+"node. If [param spatial_context] is not specified the default will be used, "
+"this requires [member ProjectSettings.xr/openxr/extensions/spatial_entity/"
+"enable_builtin_anchor_detection] to be set. The returned tracker will track "
+"the location in case our reference space changes."
+msgstr ""
+"创建一个新的锚点，该锚点将由 XR 运行时进行跟踪。[param transform] 参数应为相对"
+"于 [XROrigin3D] 节点的本地空间变换。如果未指定 [param spatial_context]，则将使"
+"用默认值，但这需要设置 [member ProjectSettings.xr/openxr/extensions/"
+"spatial_entity/enable_builtin_anchor_detection]。返回的跟踪器将跟踪该位置，以"
+"防参考空间发生变化。"
+
+msgid ""
+"Creates a new persistence context for storing persistent data.\n"
+"[b]Note:[/b] This is an asynchronous method and returns an "
+"[OpenXRFutureResult] object with which to track the status, discarding this "
+"object will not cancel the creation process. On success [param user_callback] "
+"will be called if specified. The result value for this function is the [RID] "
+"for our persistence context."
+msgstr ""
+"创建一个新的持久化上下文，用于存储持久化数据。\n"
+"[b]注意：[/b]这是一个异步方法，它返回一个 [OpenXRFutureResult] 对象，用于跟踪"
+"状态；丢弃该对象不会取消创建过程。如果指定了 [param user_callback]，则创建成功"
+"后会调用该回调函数。该函数的返回值是持久化上下文的 [RID]。"
+
+msgid ""
+"Frees a persistence context previously created with [method "
+"create_persistence_context]."
+msgstr "释放之前使用 [method create_persistence_context] 创建的持久化上下文。"
+
+msgid ""
+"Returns the internal handle for this persistence context.\n"
+"[b]Note:[/b] For GDExtension implementations."
+msgstr ""
+"返回该持久化上下文的内部句柄。\n"
+"[b]注意：[/b]适用于 GDExtension 实现。"
+
+msgid ""
+"Returns [code]true[/code] if this persistence scope is supported by our "
+"spatial anchor capability.\n"
+"[b]Note:[/b] Only valid after an OpenXR instance has been created."
+msgstr ""
+"如果空间锚点功能支持该持久性范围，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]该方法仅在 OpenXR 实例创建后有效。"
+
+msgid ""
+"Returns [code]true[/code] if spatial anchors are supported by the hardware. "
+"Only returns a valid value after OpenXR has been initialized."
+msgstr ""
+"如果硬件支持空间锚点功能，则返回 [code]true[/code]。该函数只有在 OpenXR 初始化"
+"后才会返回有效值。"
+
+msgid ""
+"Returns [code]true[/code] if persistent spatial anchors are supported by the "
+"hardware. Only returns a valid value after OpenXR has been initialized."
+msgstr ""
+"如果硬件支持持久空间锚点，则返回 [code]true[/code]。仅在 OpenXR 初始化后才会返"
+"回有效值。"
+
+msgid ""
+"Changes this anchor into a persistent anchor. This means its location will be "
+"stored on the device and the anchor will be restored the next time your "
+"application starts. If [param persistence_context] is not specified the "
+"default will be used, this requires [member ProjectSettings.xr/openxr/"
+"extensions/spatial_entity/enable_builtin_anchor_detection] to be set.\n"
+"[b]Note:[/b] This is an asynchronous method and returns an "
+"[OpenXRFutureResult] object with which to track the status, discarding this "
+"object will not cancel the creation process. On success [param user_callback] "
+"will be called if specified. The result value for this function is a boolean "
+"which will be set to [code]true[/code] on successful completion."
+msgstr ""
+"将该锚点转换为持久锚点。这意味着其位置将存储在设备上，并在下次应用程序启动时恢"
+"复该锚点。如果未指定 [param persistence_context]，则将使用默认值，但这需要设"
+"置 [member ProjectSettings.xr/openxr/extensions/spatial_entity/"
+"enable_builtin_anchor_detection]。\n"
+"[b]注意：[/b]这是一个异步方法，它返回一个 [OpenXRFutureResult] 对象，用于跟踪"
+"状态；丢弃该对象不会取消创建过程。如果指定了 [param user_callback]，则在成功完"
+"成后将调用该回调函数。该函数的返回值是一个布尔值，成功完成后将被设置为 "
+"[code]true[/code]。"
+
+msgid ""
+"Remove an anchor previously created with [method create_new_anchor]. If this "
+"anchor was persistent you must first call [method unpersist_anchor] and await "
+"its callback."
+msgstr ""
+"移除之前使用 [method create_new_anchor] 方法创建的锚点。如果该锚点是持久化的，"
+"则必须先调用 [method unpersist_anchor] 并等待其回调完成。"
+
+msgid ""
+"Removes the persistent data from this anchor. The runtime will not recreate "
+"the anchor when your application restarts. If [param persistence_context] is "
+"not specified the default will be used, this requires [member "
+"ProjectSettings.xr/openxr/extensions/spatial_entity/enabled] to be set.\n"
+"[b]Note:[/b] This is an asynchronous method and returns an "
+"[OpenXRFutureResult] object with which to track the status, discarding this "
+"object will not cancel the creation process. On success [param user_callback] "
+"will be called if specified. The result value for this function is a boolean "
+"which will be set to [code]true[/code] on successful completion."
+msgstr ""
+"移除该锚点的持久化数据。应用程序重启后，运行时将不会重新创建该锚点。如果未指"
+"定 [param persistence_context]，则将使用默认值，但这需要启用 [member "
+"ProjectSettings.xr/openxr/extensions/spatial_entity/enabled]。\n"
+"[b]注意：[/b]这是一个异步方法，它返回一个 [OpenXRFutureResult] 对象，用于跟踪"
+"状态；丢弃该对象不会取消创建过程。如果指定了 [param user_callback]，则成功完成"
+"后会调用该回调函数。该函数的返回值为布尔值，成功完成后将被设置为 [code]true[/"
+"code]。"
+
+msgid ""
+"Provides the application with read-only access (i.e. application cannot "
+"modify this scope) to spatial entities persisted and managed by the system. "
+"The application can use the UUID in the persistence component for this scope "
+"to correlate entities across spatial contexts and device reboots."
+msgstr ""
+"为应用程序提供对由系统持久化和管理的空间实体的只读访问权限（即应用程序不能修改"
+"该范围）。应用程序可以使用该范围的持久化组件中的 UUID，以便在不同的地理空间上"
+"下文和设备重启后关联实体。"
+
+msgid ""
+"Persistence operations and data access is limited to spatial anchors, on the "
+"same device, for the same user and same app (using [method persist_anchor] "
+"and [method unpersist_anchor] functions)"
+msgstr ""
+"持久化操作和数据访问仅限于同一设备、同一用户和同一应用程序的空间锚点（使用 "
+"[method persist_anchor] 和 [method unpersist_anchor] 函数）"
+
+msgid "Configuration header for spatial anchors."
+msgstr "空间锚点的配置标头。"
+
+msgid ""
+"Configuration header for spatial anchors. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context with spatial anchor capabilities."
+msgstr ""
+"空间锚点的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 方法，即可创建具有空间锚"
+"点功能的空间上下文。"
+
+msgid ""
+"Returns the components enabled by this configuration.\n"
+"[b]Note:[/b] Only valid after this configuration was used to create a spatial "
+"context."
+msgstr ""
+"返回该配置启用的组件。\n"
+"[b]注意：[/b]仅在该配置用于创建空间上下文后有效。"
+
+msgid "Configuration header for April tag markers."
+msgstr "用于 AprilTag 标记的配置标头。"
+
+msgid ""
+"Configuration header for April tag markers. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context that can detect April tags."
+msgstr ""
+"用于 AprilTag 标记的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 即可创建一个可以检测 "
+"AprilTag 标记的空间上下文。"
+
+msgid ""
+"Dictionary to use to decode April tags.\n"
+"[b]Note:[/b] Must be set before using this configuration to create a spatial "
+"context."
+msgstr ""
+"用于解码 April 标签的字典。\n"
+"[b]注意：[/b]必须在使用该配置创建空间上下文之前设置。"
+
+msgid ""
+"4 by 4 bits, minimum Hamming distance between any two codes = 5, 30 codes."
+msgstr "4 位 x 4 位，任意两个码之间的最小汉明距离 = 5，30 个码。"
+
+msgid ""
+"5 by 5 bits, minimum Hamming distance between any two codes = 9, 35 codes."
+msgstr "5 位 x 5 位，任意两个码之间的最小汉明距离 = 9，35 个码。"
+
+msgid ""
+"6 by 6 bits, minimum Hamming distance between any two codes = 10, 2320 codes."
+msgstr "6 位 x 6 位，任意两个码之间的最小汉明距离 = 10，2320 个码。"
+
+msgid ""
+"6 by 6 bits, minimum Hamming distance between any two codes = 11, 587 codes."
+msgstr "6 位 x 6 位，任意两个码之间的最小汉明距离 = 11，587 个码。"
+
+msgid "Configuration header for Aruco markers."
+msgstr "Aruco 标记的配置标头。"
+
+msgid ""
+"Configuration header for Aruco markers. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context that can detect Aruco markers."
+msgstr ""
+"Aruco 标记的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 即可创建一个能够检测 "
+"Aruco 标记的空间上下文。"
+
+msgid ""
+"Dictionary to use to decode Aruco markers.\n"
+"[b]Note:[/b] Must be set before using this configuration to create a spatial "
+"context."
+msgstr ""
+"用于解码 Aruco 标记的字典。\n"
+"[b]注意：[/b]在使用该配置创建空间上下文之前必须先设置。"
+
+msgid "4 by 4 pixel Aruco marker dictionary with 50 IDs."
+msgstr "4 x 4 像素 Aruco 标记字典，包含 50 个 ID。"
+
+msgid "4 by 4 pixel Aruco marker dictionary with 100 IDs."
+msgstr "4 x 4 像素 Aruco 标记字典，包含 100 个 ID。"
+
+msgid "4 by 4 pixel Aruco marker dictionary with 250 IDs."
+msgstr "4 x 4 像素 Aruco 标记字典，包含 250 个 ID。"
+
+msgid "4 by 4 pixel Aruco marker dictionary with 1000 IDs."
+msgstr "4 x 4 像素 Aruco 标记字典，包含 1000 个 ID。"
+
+msgid "5 by 5 pixel Aruco marker dictionary with 50 IDs."
+msgstr "5 x 5 像素 Aruco 标记字典，包含 50 个 ID。"
+
+msgid "5 by 5 pixel Aruco marker dictionary with 100 IDs."
+msgstr "5 x 5 像素 Aruco 标记字典，包含 100 个 ID。"
+
+msgid "5 by 5 pixel Aruco marker dictionary with 250 IDs."
+msgstr "5 x 5 像素 Aruco 标记字典，包含 250 个 ID。"
+
+msgid "5 by 5 pixel Aruco marker dictionary with 1000 IDs."
+msgstr "5 x 5 像素 Aruco 标记字典，包含 1000 个 ID。"
+
+msgid "6 by 6 pixel Aruco marker dictionary with 50 IDs."
+msgstr "6 x 6 像素 Aruco 标记字典，包含 50 个 ID。"
+
+msgid "6 by 6 pixel Aruco marker dictionary with 100 IDs."
+msgstr "6 x 6 像素 Aruco 标记字典，包含 100 个 ID。"
+
+msgid "6 by 6 pixel Aruco marker dictionary with 250 IDs."
+msgstr "6 x 6 像素 Aruco 标记字典，包含 250 个 ID。"
+
+msgid "6 by 6 pixel Aruco marker dictionary with 1000 IDs."
+msgstr "6 x 6 像素 Aruco 标记字典，包含 1000 个 ID。"
+
+msgid "7 by 7 pixel Aruco marker dictionary with 50 IDs."
+msgstr "7 x 7 像素 Aruco 标记字典，包含 50 个 ID。"
+
+msgid "7 by 7 pixel Aruco marker dictionary with 100 IDs."
+msgstr "7 x 7 像素 Aruco 标记字典，包含 100 个 ID。"
+
+msgid "7 by 7 pixel Aruco marker dictionary with 250 IDs."
+msgstr "7 x 7 像素 Aruco 标记字典，包含 250 个 ID。"
+
+msgid "7 by 7 pixel Aruco marker dictionary with 1000 IDs."
+msgstr "7 x 7 像素 Aruco 标记字典，包含 1000 个 ID。"
+
+msgid "Wrapper base class for OpenXR Spatial Capability Configuration headers."
+msgstr "用于 OpenXR 空间能力配置标头的包装器基类。"
+
+msgid ""
+"Wrapper base class for OpenXR Spatial Capability Configuration headers. This "
+"class needs to be implemented for each capability configuration structure "
+"usable within OpenXR's spatial entities system."
+msgstr ""
+"OpenXR 空间功能配置标头的包装器基类。对于 OpenXR 空间实体系统中可用的每种功能"
+"配置结构，都需要实现该基类。"
+
+msgid ""
+"Return a pointer (encoded as an [code]int64_t[/code]) to a struct holding the "
+"spatial capability configuration data. The memory for this struct should "
+"remain accessible as long as this object remains instantiated."
+msgstr ""
+"返回一个指向包含空间能力配置数据的结构的指针（编码为 [code]int64_t[/code] 类"
+"型）。只要该对象仍然存在，该结构所占用的内存就应该保持可访问状态。"
+
+msgid ""
+"Return [code]true[/code] if this object contains a valid configuration that "
+"can be retrieved when calling [method _get_configuration]."
+msgstr ""
+"如果该对象包含有效的配置，并且可以通过调用 [method _get_configuration] 方法检"
+"索该配置，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if this object contains a valid configuration that "
+"can be used when calling [method "
+"OpenXRSpatialEntityExtension.create_spatial_context]."
+msgstr ""
+"如果该对象包含可用于调用 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 的有效配置，则返回 "
+"[code]true[/code]。"
+
+msgid "Configuration header for QR code markers."
+msgstr "二维码标记的配置标头。"
+
+msgid ""
+"Configuration header for QR code markers. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context that can detect QR code markers."
+msgstr ""
+"用于二维码标记的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 方法即可创建一个可以检测"
+"二维码标记的空间上下文。"
+
+msgid "Configuration header for plane tracking."
+msgstr "平面跟踪的配置标头。"
+
+msgid ""
+"Configuration header for plane tracking. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context with plane tracking capabilities."
+msgstr ""
+"用于平面跟踪的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 方法即可创建具有平面跟踪"
+"功能的空间上下文。"
+
+msgid ""
+"Returns [code]true[/code] if we support the plane semantic label component "
+"(only valid after the OpenXR session has started). You can query these using "
+"the [OpenXRSpatialComponentPlaneSemanticLabelList] data object."
+msgstr ""
+"如果支持平面语义标签组件，则返回 [code]true[/code]（仅在 OpenXR 会话启动后有"
+"效）。可以使用 [OpenXRSpatialComponentPlaneSemanticLabelList] 数据对象查询这些"
+"标签。"
+
+msgid ""
+"Returns [code]true[/code] if we support the mesh 2D component (only valid "
+"after the OpenXR session has started). You can query these using the "
+"[OpenXRSpatialComponentMesh2DList] data object."
+msgstr ""
+"如果支持网格 2D 组件，则返回 [code]true[/code]（仅在 OpenXR 会话启动后有效）。"
+"可以使用 [OpenXRSpatialComponentMesh2DList] 数据对象查询这些信息。"
+
+msgid ""
+"Returns [code]true[/code] if we support the polygon 2D component (only valid "
+"after the OpenXR session has started). You can query these using the "
+"[OpenXRSpatialComponentPolygon2DList] data object."
+msgstr ""
+"如果支持 2D 多边形组件，则返回 [code]true[/code]（仅在 OpenXR 会话启动后有"
+"效）。可以使用 [OpenXRSpatialComponentPolygon2DList] 数据对象查询这些信息。"
+
+msgid "Configuration header for micro QR code markers."
+msgstr "微型二维码标记的配置标头。"
+
+msgid ""
+"Configuration header for micro QR code markers. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] to create a spatial "
+"context that can detect micro QR code markers."
+msgstr ""
+"用于微型二维码标记的配置标头。将它传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 即可创建一个能够检测微型"
+"二维码标记的空间上下文。"
+
+msgid "Object for storing the queries anchor result data."
+msgstr "用于存储查询锚点结果数据的对象。"
+
+msgid ""
+"Object for storing the queries anchor result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时，用于存储查询锚点"
+"结果数据的对象。"
+
+msgid "Returns the transform for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的变换矩阵。"
+
+msgid "Object for storing the queries bounded2d result data."
+msgstr "用于存储查询 bounded2d 结果数据的对象。"
+
+msgid ""
+"Object for storing the queries 2D bounding rectangle result data when calling "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于存储调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时查询二维边"
+"界矩形结果数据的对象。"
+
+msgid ""
+"Returns the center of our bounding rectangle for the entity at this [param "
+"index]."
+msgstr "返回位于该 [param index] 处实体的边界矩形的中心点。"
+
+msgid ""
+"Returns the size of our bounding rectangle for the entity at this [param "
+"index]."
+msgstr "返回该 [param index] 处实体的边界矩形的大小。"
+
+msgid "Object for storing the queries bounded3d result data."
+msgstr "用于存储查询 bounded3d 结果数据的对象。"
+
+msgid ""
+"Object for storing the queries 3d bounding box result data when calling "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于存储调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时查询到的 "
+"3D 边界框结果数据的对象。"
+
+msgid ""
+"Returns the center of our bounding box for the entity at this [param index]."
+msgstr "返回位于该 [param index] 处的实体的边界框中心点。"
+
+msgid ""
+"Returns the size of our bounding box for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的边界框大小。"
+
+msgid "Object for storing OpenXR spatial entity component data."
+msgstr "用于存储 OpenXR 空间实体组件数据的对象。"
+
+msgid "Return the component type for the component we store data for."
+msgstr "返回存储数据的组件的组件类型。"
+
+msgid ""
+"Return a pointer to the structure data that will be submitted along with the "
+"snapshot query. This pointer must remain valid as long as this object is "
+"instantiated."
+msgstr ""
+"返回指向结构体数据的指针，该结构体数据将与快照查询一起提交。只要该对象被实例"
+"化，该指针就必须保持有效。"
+
+msgid ""
+"Set the expected capacity as provided by the spatial entities query system. "
+"Buffers should be initialized with the correct storage."
+msgstr ""
+"设置空间实体查询系统提供的预期容量。缓冲区应使用正确的存储空间进行初始化。"
+
+msgid "Object for storing the queries marker result data."
+msgstr "用于存储查询标记结果数据的对象。"
+
+msgid ""
+"Object for storing the queries marker result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询标记结"
+"果数据的对象。"
+
+msgid ""
+"Returns either a [String] or a [PackedByteArray] buffer with data for the "
+"marker at this [param index]. Only applicable for QR code markers."
+msgstr ""
+"返回一个 [String] 或 [PackedByteArray] 缓冲区，其中包含该 [param index] 处的标"
+"记的数据。仅适用于二维码标记。"
+
+msgid ""
+"Returns the marker ID for the marker at this [param index]. Only applicable "
+"for Aruco or April Tag markers."
+msgstr ""
+"返回该 [param index] 处的标记的标记 ID。仅适用于 Aruco 或 April Tag 标记。"
+
+msgid "Returns the marker type for the marker at this [param index]."
+msgstr "返回该 [param index] 处的标记的标记类型。"
+
+msgid "Unknown or unset marker type."
+msgstr "未知或未设置的标记类型。"
+
+msgid "Marker based on a QR code."
+msgstr "基于二维码的标记。"
+
+msgid "Marker based on a micro QR code."
+msgstr "基于微型二维码的标记。"
+
+msgid "Marker based on an Aruco code."
+msgstr "基于 Aruco 码的标记。"
+
+msgid "Marker based on an April Tag."
+msgstr "基于 April Tag 的标记。"
+
+msgid "Maximum value for this enum."
+msgstr "该枚举的最大值。"
+
+msgid "Object for storing the queries mesh2d result data."
+msgstr "用于存储查询 mesh2d 结果数据的对象。"
+
+msgid ""
+"Object for storing the queries 2D mesh result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于存储调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时查询到的 "
+"2D 网格结果数据的对象。"
+
+msgid "Returns the mesh indices for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的网格索引。"
+
+msgid ""
+"Returns the transform for positioning our mesh for the entity at this [param "
+"index]."
+msgstr "返回用于定位该 [param index] 处实体的网格的变换。"
+
+msgid "Returns the mesh vertices for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的网格顶点。"
+
+msgid "Object for storing the queries mesh3d result data."
+msgstr "用于存储查询 mesh3d 结果数据的对象。"
+
+msgid ""
+"Object for storing the queries 3d mesh result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于存储调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时生成的 3D "
+"网格查询结果数据的对象。"
+
+msgid "Returns the mesh for the entity at this [param index]."
+msgstr "返回位于该 [param index] 处的实体的网格。"
+
+msgid "Object for storing the queries parent result data."
+msgstr "用于存储查询父级结果数据的对象。"
+
+msgid ""
+"Object for storing the queries parent result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询父级结"
+"果数据的对象。"
+
+msgid "Returns the RID for the parent entity at this [param index]."
+msgstr "返回该 [param index] 处的父实体的 RID。"
+
+msgid "Object for storing the query persistence result data."
+msgstr "用于存储查询持久化结果数据的对象。"
+
+msgid ""
+"Object for storing the query persistence result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询持久化"
+"结果数据的对象。"
+
+msgid ""
+"Returns the persistent state ([code]XrSpatialPersistenceStateEXT[/code]) for "
+"the entity at this [param index]."
+msgstr ""
+"返回该 [param index] 处实体的持久状态（[code]XrSpatialPersistenceStateEXT[/"
+"code]）。"
+
+msgid "Returns the persistent uuid for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的持久 uuid。"
+
+msgid "Object for storing the queries plane alignment result data."
+msgstr "用于存储查询平面对齐结果数据的对象。"
+
+msgid ""
+"Object for storing the queries plane alignment result data when calling "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询平面对"
+"齐结果数据的对象。"
+
+msgid "Returns the plane alignment for the parent entity at this [param index]."
+msgstr "返回该 [param index] 处父实体的平面对齐方式。"
+
+msgid "Plane is facing upward."
+msgstr "平面面朝上。"
+
+msgid "Plane is facing downwards."
+msgstr "平面面朝下。"
+
+msgid "Plane is vertically aligned."
+msgstr "平面垂直对齐。"
+
+msgid "Plane has an arbitrary alignment."
+msgstr "平面具有任意方向。"
+
+msgid "Object for storing the queries plane semantic label result data."
+msgstr "用于存储查询平面语义标签结果数据的对象。"
+
+msgid ""
+"Object for storing the queries plane semantic label result data when calling "
+"[method OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询平面语"
+"义标签结果数据的对象。"
+
+msgid ""
+"Returns the plane semantic label for the parent entity at this [param index]."
+msgstr "返回该 [param index] 处父实体的平面语义标签。"
+
+msgid "Uncategorized plane."
+msgstr "未分类的平面。"
+
+msgid "Plane represents a floor."
+msgstr "平面代表地面。"
+
+msgid "Plane represents a wall."
+msgstr "平面代表一面墙。"
+
+msgid "Plane represents a ceiling."
+msgstr "平面代表天花板。"
+
+msgid "Plane represents the surface of a table."
+msgstr "平面代表桌子的表面。"
+
+msgid "Object for storing the queries polygon2d result data."
+msgstr "用于存储查询 polygon2d 结果的对象。"
+
+msgid ""
+"Object for storing the queries 2D polygon result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]."
+msgstr ""
+"用于调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时存储查询二维多"
+"边形结果数据的对象。"
+
+msgid ""
+"Returns the transform for positioning our polygon for the entity at this "
+"[param index]."
+msgstr "返回用于定位该 [param index] 处实体的多边形的变换。"
+
+msgid "Returns the polygon vertices for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的多边形顶点。"
+
+msgid "Configuration header for spatial persistence."
+msgstr "空间持久性配置标头。"
+
+msgid ""
+"Configuration header for spatial persistence. Pass this to [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] as the next parameter to "
+"create a spatial context with spatial persistence capabilities."
+msgstr ""
+"用于空间持久化的配置标头。将其作为下一个参数传递给 [method "
+"OpenXRSpatialEntityExtension.create_spatial_context] 方法即可创建具有空间持久"
+"化功能的空间上下文。"
+
+msgid ""
+"Adds a persistence context to this configuration. You must add at least one "
+"persistence context to create a valid configuration. You can create a "
+"persistence context by calling [method "
+"OpenXRSpatialAnchorCapability.create_persistence_context]."
+msgstr ""
+"将持久化上下文添加到该配置中。必须添加至少一个持久化上下文才能创建一个有效的配"
+"置。可以通过调用 [method "
+"OpenXRSpatialAnchorCapability.create_persistence_context] 来创建持久化上下文。"
+
+msgid "Removes a persistence context."
+msgstr "移除持久化上下文。"
+
+msgid "OpenXR extension that handles spatial entities."
+msgstr "用于处理空间实体的 OpenXR 扩展。"
+
+msgid ""
+"OpenXR extension that handles spatial entities and, when enabled, allows "
+"querying those spatial entities. This extension will also automatically "
+"manage [XRTracker] objects for static entities."
+msgstr ""
+"OpenXR 扩展，用于处理空间实体，启用后允许查询这些空间实体。该扩展还将自动管理"
+"静态实体的 [XRTracker] 对象。"
+
+msgid "Registers an entity that was created directly on the OpenXR runtime."
+msgstr "注册一个直接在 OpenXR 运行时上创建的实体。"
+
+msgid ""
+"Creates a new spatial context that handles entities for the provided "
+"capability configurations. [param capability_configurations] is an array of "
+"[OpenXRSpatialCapabilityConfigurationBaseHeader] with the needed capability "
+"configuration data.\n"
+"[param next] is an optional parameter that can contain additional information "
+"for creating our spatial context.\n"
+"[b]Note:[/b] This is an asynchronous method and returns an "
+"[OpenXRFutureResult] object with which to track the status, discarding this "
+"object will not cancel the creation process. On success [param user_callback] "
+"will be called if specified. The result data for this function is the [RID] "
+"for our spatial context."
+msgstr ""
+"创建一个新的空间上下文，用于处理所提供的功能配置的实体。[param "
+"capability_configurations] 是一个包含所需功能配置数据的 "
+"[OpenXRSpatialCapabilityConfigurationBaseHeader] 数组。\n"
+"[param next] 是一个可选参数，可以包含用于创建空间上下文的附加信息。\n"
+"[b]注意：[/b]这是一个异步方法，返回一个 [OpenXRFutureResult] 对象，用于跟踪状"
+"态；丢弃该对象不会取消创建过程。如果指定了 [param user_callback]，则成功时会调"
+"用该回调函数。该函数的结果数据是空间上下文的 [RID]。"
+
+msgid ""
+"Starts a new discovery query, this will gather all objects tracked by the "
+"[param spatial_context] that have at least one of the component types "
+"specified in [param component_types].\n"
+"[param next] is an optional parameter that can contain additional information "
+"for executing the discovery query.\n"
+"[b]Note:[/b] This is an asynchronous method and returns an "
+"[OpenXRFutureResult] object with which to track the status, discarding this "
+"object will not cancel the discovery process. On success [param "
+"user_callback] will be called if specified. The result data for this function "
+"is the [RID] for our snapshot."
+msgstr ""
+"启动一个新的发现查询，这将收集由 [param spatial_context] 跟踪的所有对象，这些"
+"对象至少具有 [param component_types] 中指定的一种组件类型。\n"
+"[param next] 是一个可选参数，可以包含用于执行发现查询的附加信息。\n"
+"[b]注意：[/b]这是一个异步方法，它返回一个 [OpenXRFutureResult] 对象，用于跟踪"
+"状态；丢弃该对象不会取消发现过程。如果指定了 [param user_callback]，则成功时会"
+"调用该回调函数。该函数的结果数据是快照的 [RID]。"
+
+msgid "Returns the [RID] for the specified spatial entity ID."
+msgstr "返回指定空间实体 ID 对应的 [RID]。"
+
+msgid ""
+"Frees a spatial context previously created when calling [method "
+"create_spatial_context]. If the spatial context creation is still ongoing, "
+"the asynchronous process is cancelled."
+msgstr ""
+"释放之前调用 [method create_spatial_context] 创建的空间上下文。如果空间上下文"
+"创建过程仍在进行中，则会取消该异步进程。"
+
+msgid ""
+"Frees an entity previously created when calling [method add_spatial_entity] "
+"or [method make_spatial_entity]."
+msgstr ""
+"释放之前调用 [method add_spatial_entity] 或 [method make_spatial_entity] 创建"
+"的实体。"
+
+msgid ""
+"Frees a spatial snapshot previously created when calling [method "
+"discover_spatial_entities]. If the spatial snapshot creation is still "
+"ongoing, the asynchronous process is cancelled."
+msgstr ""
+"释放之前调用 [method discover_spatial_entities] 创建的空间快照。如果空间快照创"
+"建仍在进行中，则会取消该异步进程。"
+
+msgid ""
+"Returns a buffer with floats from a buffer that was retrieved when taking a "
+"snapshot."
+msgstr ""
+"返回一个包含浮点数的缓冲区，该缓冲区是从拍摄快照时获取的缓冲区中提取的。"
+
+msgid ""
+"Returns the OpenXR spatial context handle for this snapshot.\n"
+"[b]Note:[/b] This method is intended to be used from GDExtensions that "
+"implement spatial entity capability handlers."
+msgstr ""
+"返回该快照的 OpenXR 空间上下文句柄。\n"
+"[b]注意：[/b]该方法旨在供实现空间实体功能处理程序的 GDExtensions 使用。"
+
+msgid ""
+"Returns [code]true[/code] if the spatial context finished its creation and is "
+"ready to be used."
+msgstr "如果空间上下文已完成创建并准备使用，则返回 [code]true[/code]。"
+
+msgid "Returns the spatial context for this entity."
+msgstr "返回该实体的空间上下文。"
+
+msgid ""
+"Returns the internal [code]XrSpatialEntityIdEXT[/code] associated with the "
+"entity."
+msgstr "返回与该实体关联的内部 [code]XrSpatialEntityIdEXT[/code]。"
+
+msgid "Returns the spatial context related to this spatial snapshot."
+msgstr "返回与该空间快照相关的空间上下文。"
+
+msgid ""
+"Returns the OpenXR spatial snapshot handle for this snapshot.\n"
+"[b]Note:[/b] This method is intended to be used from GDExtensions that "
+"implement spatial entity capability handlers."
+msgstr ""
+"返回该快照的 OpenXR 空间快照句柄。\n"
+"[b]注意：[/b]该方法旨在供实现空间实体功能处理程序的 GDExtension 扩展使用。"
+
+msgid ""
+"Returns a string from a buffer that was retrieved when taking a snapshot."
+msgstr "返回从拍摄快照时获取的缓冲区中提取的字符串。"
+
+msgid ""
+"Returns a buffer with 8 bit ints from a buffer that was retrieved when taking "
+"a snapshot."
+msgstr "从拍摄快照时获取的缓冲区中返回一个包含 8 位整数的缓冲区。"
+
+msgid ""
+"Returns a buffer with 16 bit ints from a buffer that was retrieved when "
+"taking a snapshot."
+msgstr "从拍摄快照时获取的缓冲区中返回一个包含 16 位整数的缓冲区。"
+
+msgid ""
+"Returns a buffer with 32 bit ints from a buffer that was retrieved when "
+"taking a snapshot."
+msgstr "从拍摄快照时获取的缓冲区中返回一个包含 32 位整数的缓冲区。"
+
+msgid ""
+"Returns a buffer with [Vector2] entries from a buffer that was retrieved when "
+"taking a snapshot."
+msgstr "从拍摄快照时获取的缓冲区中返回一个包含提取的 [Vector2] 条目的缓冲区。"
+
+msgid ""
+"Returns a buffer with [Vector3] entries from a buffer that was retrieved when "
+"taking a snapshot."
+msgstr "从拍摄快照时获取的缓冲区中返回一个包含提取的 [Vector3] 条目的缓冲区。"
+
+msgid ""
+"Creates a new entity for this [param entity_id]. The [param spatial_context] "
+"should match the context that discovered the entity."
+msgstr ""
+"为该 [param entity_id] 创建一个新的实体。[param spatial_context] 应与发现该实"
+"体的上下文相匹配。"
+
+msgid ""
+"Queries the snapshot data. This will find all entities in the snapshot that "
+"contain all requested components in [param component_data]. The objects held "
+"within [param component_data] will then be populated with the queried data. "
+"[param component_data] must always have an object of "
+"[OpenXRSpatialQueryResultData] as the first entry.\n"
+"[param next] is an optional parameter that can contain additional information "
+"passed when setting our query conditions."
+msgstr ""
+"查询快照数据。该函数将查找快照中包含 [param component_data] 中所有指定组件的所"
+"有实体。然后，[param component_data] 中包含的对象将填充查询到的数据。[param "
+"component_data] 必须始终以 [OpenXRSpatialQueryResultData] 对象作为第一个条"
+"目。\n"
+"[param next] 是一个可选参数，可包含设置查询条件时传递的附加信息。"
+
+msgid ""
+"Returns [code]true[/code] if this spatial entity [param capability] is "
+"supported by the hardware used."
+msgstr ""
+"如果所使用的硬件支持该空间实体 [param capability]，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if this [param capability] supports the [param "
+"component_type]."
+msgstr ""
+"如果该 [param capability] 支持 [param component_type]，则返回 [code]true[/"
+"code]。"
+
+msgid ""
+"Performs a snapshot for a limited number of entities. This is NOT an "
+"asynchronous method and will return the snapshot immediately."
+msgstr "对有限数量的实体执行快照操作。这不是异步方法，会立即返回快照结果。"
+
+msgid ""
+"Emitted when OpenXR recommends running a discovery query because entities "
+"managed by this spatial context have (likely) changed."
+msgstr ""
+"当 OpenXR 建议运行发现查询时发出该信号，因为该空间上下文管理的实体（可能）已发"
+"生更改。"
+
+msgid "Plane tracking capability."
+msgstr "平面跟踪功能。"
+
+msgid "QR code based marker tracking capability."
+msgstr "基于二维码的标记跟踪功能。"
+
+msgid "Micro QR code based marker tracking capability."
+msgstr "基于微型二维码的标记跟踪功能。"
+
+msgid "Aruco marker based marker tracking capability."
+msgstr "基于 Aruco 标记的标记跟踪功能。"
+
+msgid "April tag based marker tracking capability."
+msgstr "基于 April 标签的标记跟踪功能。"
+
+msgid "Anchor capability."
+msgstr "锚点功能。"
+
+msgid ""
+"Component that provides the 2D bounds for a spatial entity. The corresponding "
+"list structure is [code]XrSpatialComponentBounded2DListEXT[/code]; the "
+"corresponding data structure is [code]XrSpatialBounded2DDataEXT[/code]."
+msgstr ""
+"为空间实体提供 2D 边界的组件。相应的列表结构为 "
+"[code]XrSpatialComponentBounded2DListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialBounded2DDataEXT[/code]。"
+
+msgid ""
+"Component that provides the 3D bounds for a spatial entity. The corresponding "
+"list structure is [code]XrSpatialComponentBounded3DListEXT[/code]; the "
+"corresponding data structure is [code]XrBoxf[/code]."
+msgstr ""
+"为空间实体提供 3D 边界的组件。相应的列表结构为 "
+"[code]XrSpatialComponentBounded3DListEXT[/code]；相应的数据结构为 "
+"[code]XrBoxf[/code]。"
+
+msgid ""
+"Component that provides the XrSpatialEntityIdEXT of the parent for a spatial "
+"entity. The corresponding list structure is "
+"[code]XrSpatialComponentParentListEXT[/code]; the corresponding data "
+"structure is [code]XrSpatialEntityIdEXT[/code]."
+msgstr ""
+"为空间实体提供父级 XrSpatialEntityIdEXT 的组件。相应的列表结构为 "
+"[code]XrSpatialComponentParentListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialEntityIdEXT[/code]。"
+
+msgid ""
+"Component that provides a 3D mesh for a spatial entity. The corresponding "
+"list structure is [code]XrSpatialComponentMesh3DListEXT[/code]; the "
+"corresponding data structure is [code]XrSpatialMeshDataEXT[/code]."
+msgstr ""
+"为空间实体提供 3D 网格的组件。相应的列表结构为 "
+"[code]XrSpatialComponentMesh3DListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialMeshDataEXT[/code]。"
+
+msgid ""
+"Component that provides the plane alignment enum for a spatial entity. The "
+"corresponding list structure is "
+"[code]XrSpatialComponentPlaneAlignmentListEXT[/code]; the corresponding data "
+"structure is [code]XrSpatialPlaneAlignmentEXT[/code] (Added by the "
+"[code]XR_EXT_spatial_plane_tracking[/code] extension)."
+msgstr ""
+"为空间实体提供平面对齐枚举的组件。相应的列表结构为 "
+"[code]XrSpatialComponentPlaneAlignmentListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialPlaneAlignmentEXT[/code]（由 "
+"[code]XR_EXT_spatial_plane_tracking[/code] 扩展添加）。"
+
+msgid ""
+"Component that provides a 2D mesh for a spatial entity. The corresponding "
+"list structure is [code]XrSpatialComponentMesh2DListEXT[/code]; the "
+"corresponding data structure is [code]XrSpatialMeshDataEXT[/code] (Added by "
+"the [code]XR_EXT_spatial_plane_tracking[/code] extension)."
+msgstr ""
+"为空间实体提供 2D 网格的组件。相应的列表结构为 "
+"[code]XrSpatialComponentMesh2DListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialMeshDataEXT[/code]（由 [code]XR_EXT_spatial_plane_tracking[/"
+"code] 扩展添加）。"
+
+msgid ""
+"Component that provides a 2D boundary polygon for a spatial entity. The "
+"corresponding list structure is [code]XrSpatialComponentPolygon2DListEXT[/"
+"code]; the corresponding data structure is [code]XrSpatialPolygon2DDataEXT[/"
+"code] (Added by the [code]XR_EXT_spatial_plane_tracking[/code] extension)."
+msgstr ""
+"为空间实体提供 2D 边界多边形的组件。相应的列表结构为 "
+"[code]XrSpatialComponentPolygon2DListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialPolygon2DDataEXT[/code]（由 "
+"[code]XR_EXT_spatial_plane_tracking[/code] 扩展添加）。"
+
+msgid ""
+"Component that provides a semantic label for a plane. The corresponding list "
+"structure is [code]XrSpatialComponentPlaneSemanticLabelListEXT[/code]; the "
+"corresponding data structure is [code]XrSpatialPlaneSemanticLabelEXT[/code] "
+"(Added by the [code]XR_EXT_spatial_plane_tracking[/code] extension)."
+msgstr ""
+"为屏幕提供语义标签的组件。相应的列表结构为 "
+"[code]XrSpatialComponentPlaneSemanticLabelListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialPlaneSemanticLabelEXT[/code]（由 "
+"[code]XR_EXT_spatial_plane_tracking[/code] 扩展添加）。"
+
+msgid ""
+"A component describing the marker type, ID and location. The corresponding "
+"list structure is [code]XrSpatialComponentMarkerListEXT[/code]; the "
+"corresponding data structure is [code]XrSpatialMarkerDataEXT[/code] (Added by "
+"the [code]XR_EXT_spatial_marker_tracking[/code] extension)."
+msgstr ""
+"描述标记类型、ID 和位置的组件。相应的列表结构为 "
+"[code]XrSpatialComponentMarkerListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialMarkerDataEXT[/code]（由 [code]XR_EXT_spatial_marker_tracking[/"
+"code] 扩展添加）。"
+
+msgid ""
+"Component that provides the location for an anchor. The corresponding list "
+"structure is [code]XrSpatialComponentAnchorListEXT[/code]; the corresponding "
+"data structure is [code]XrPosef[/code] (Added by the "
+"[code]XR_EXT_spatial_anchor[/code] extension)."
+msgstr ""
+"用于提供锚点位置的组件。相应的列表结构为 "
+"[code]XrSpatialComponentAnchorListEXT[/code]；相应的数据结构为 [code]XrPosef[/"
+"code]（由 [code]XR_EXT_spatial_anchor[/code] 扩展添加）。"
+
+msgid ""
+"Component that provides the persisted UUID for a spatial entity. The "
+"corresponding list structure is [code]XrSpatialComponentPersistenceListEXT; "
+"the corresponding data structure is [code]XrSpatialPersistenceDataEXT[/code] "
+"(Added by the [code]XR_EXT_spatial_persistence[/code] extension)."
+msgstr ""
+"为空间实体提供持久化 UUID 的组件。相应的列表结构为 "
+"[code]XrSpatialComponentPersistenceListEXT[/code]；相应的数据结构为 "
+"[code]XrSpatialPersistenceDataEXT[/code]（由 "
+"[code]XR_EXT_spatial_persistence[/code] 扩展添加）。"
+
+msgid ""
+"Base class for Positional trackers managed by OpenXR's spatial entity "
+"extensions."
+msgstr "OpenXR 空间实体扩展管理的位置跟踪器的基类。"
+
+msgid ""
+"These are trackers created and managed by OpenXR's spatial entity extensions "
+"that give access to specific data related to OpenXR's spatial entities. They "
+"will always be of type [code]TRACKER_ANCHOR[/code]."
+msgstr ""
+"这些跟踪器由 OpenXR 的空间实体扩展创建和管理，用于访问与 OpenXR 空间实体相关的"
+"特定数据。它们的类型始终为 [code]TRACKER_ANCHOR[/code]。"
+
+msgid "The spatial entity associated with this tracker."
+msgstr "与该跟踪器关联的空间实体。"
+
+msgid "The spatial tracking state for this tracker."
+msgstr "该跟踪器的空间跟踪状态。"
+
+msgid "This anchor has stopped tracking."
+msgstr "该锚点已停止跟踪。"
+
+msgid "Tracking is currently paused."
+msgstr "跟踪目前已暂停。"
+
+msgid "This anchor is currently being tracked."
+msgstr "该锚点目前正在被跟踪。"
+
+msgid "Implementation for handling spatial entity marker tracking logic."
+msgstr "用于处理空间实体标记跟踪逻辑的实现。"
+
+msgid "This class handles the OpenXR marker tracking spatial entity extension."
+msgstr "该类用于处理 OpenXR 标记跟踪空间实体扩展。"
+
+msgid ""
+"Returns [code]true[/code] if April tag marker tracking is supported by the "
+"current device."
+msgstr "如果当前设备支持 April 标签标记跟踪，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if Aruco marker tracking is supported by the "
+"current device."
+msgstr "如果当前设备支持 Aruco 标记跟踪，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if micro QR code marker tracking is supported by "
+"the current device."
+msgstr "如果当前设备支持微型二维码标记跟踪，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if QR code marker tracking is supported by the "
+"current device."
+msgstr "如果当前设备支持二维码标记跟踪，则返回 [code]true[/code]。"
+
+msgid "Implementation for handling spatial entity plane tracking logic."
+msgstr "用于处理空间实体平面跟踪逻辑的实现。"
+
+msgid "This class handles the OpenXR plane tracking spatial entity extension."
+msgstr "该类用于处理 OpenXR 平面跟踪空间实体扩展。"
+
+msgid ""
+"Returns [code]true[/code] if plane tracking is supported by the current "
+"device."
+msgstr "如果当前设备支持平面跟踪功能，则返回 [code]true[/code]。"
+
+msgid "Object for storing the main query result data."
+msgstr "用于存储主查询结果数据的对象。"
+
+msgid ""
+"Object for storing the main query result data when calling [method "
+"OpenXRSpatialEntityExtension.query_snapshot]. This must always be the first "
+"component requested."
+msgstr ""
+"调用 [method OpenXRSpatialEntityExtension.query_snapshot] 时，用于存储主查询结"
+"果数据的对象。这必须始终是请求的第一个组件。"
+
+msgid "Returns the number of entities that were retrieved."
+msgstr "返回已检索到的实体数量。"
+
+msgid ""
+"Returns the entity id ([code]XrSpatialEntityIdEXT[/code]) for the entity at "
+"this [param index]."
+msgstr ""
+"返回位于该 [param index] 的实体的实体 ID（[code]XrSpatialEntityIdEXT[/"
+"code]）。"
+
+msgid "Returns the entity state for the entity at this [param index]."
+msgstr "返回该 [param index] 处实体的实体状态。"
+
+msgid "Object for storing OpenXR structure data."
+msgstr "用于存储 OpenXR 结构数据的对象。"
+
+msgid ""
+"Object for storing OpenXR structure data that is passed when calling into "
+"OpenXR APIs."
+msgstr "用于存储调用 OpenXR API 时传递的 OpenXR 结构数据的对象。"
+
+msgid ""
+"Returns the structure type (OpenXR [code]XrStructureType[/code]) used for "
+"this structure."
+msgstr "返回该结构使用的结构类型（OpenXR [code]XrStructureType[/code]）。"
+
+msgid ""
+"Setting another structure object here chains these structures together to "
+"extend the API functionality. Consult the OpenXR documentation for which "
+"structures can be used with a given API call."
+msgstr ""
+"在此设置另一个结构对象可以将这些结构链接起来，从而扩展 API 功能。有关哪些结构"
+"可以与特定 API 调用一起使用，请参阅 OpenXR 文档。"
+
 msgid "Draws a stereo correct visibility mask."
 msgstr "绘制立体校正可见遮罩。"
 
@@ -98991,6 +107720,35 @@ msgstr ""
 "由于可见遮罩是第一个渲染的，因此可以避免处理光照计算昂贵的片段，因为这些片段会"
 "通过 Z 检查丢弃。"
 
+msgid "An optimized translation."
+msgstr "经过优化的翻译。"
+
+msgid ""
+"An optimized translation. Uses real-time compressed translations, which "
+"results in very small dictionaries.\n"
+"This class does not store the untranslated strings for optimization purposes. "
+"Therefore, [method Translation.get_message_list] always returns an empty "
+"array, and [method Translation.get_message_count] always returns [code]0[/"
+"code]."
+msgstr ""
+"优化后的翻译。它使用实时压缩翻译，因此生成的字典非常小。\n"
+"出于优化目的，该类不存储未翻译的字符串。因此，[method "
+"Translation.get_message_list] 始终返回一个空数组，而 [method "
+"Translation.get_message_count] 始终返回 [code]0[/code]。"
+
+msgid ""
+"Generates and sets an optimized translation from the given [Translation] "
+"resource.\n"
+"[b]Note:[/b] Messages in [param from] should not use context or plural "
+"forms.\n"
+"[b]Note:[/b] This method is intended to be used in the editor. It does "
+"nothing when called from an exported project."
+msgstr ""
+"根据给定的 [Translation] 资源生成并设置优化翻译。\n"
+"[b]注意：[/b][param from] 中的消息不应使用上下文或复数形式。\n"
+"[b]注意：[/b]该方法旨在用于编辑器中。从导出的项目中调用时，它不会执行任何操"
+"作。"
+
 msgid "A button that brings up a dropdown with selectable options when pressed."
 msgstr "按下时弹出下拉菜单的按钮。"
 
@@ -99627,6 +108385,139 @@ msgstr ""
 "不要与 [method get_user_data_dir] 混淆，后者返回[i]项目特定的[/i]用户数据路"
 "径。"
 
+msgid ""
+"Returns the command-line arguments passed to the engine, excluding arguments "
+"processed by the engine, such as [code]--headless[/code] and [code]--"
+"fullscreen[/code].\n"
+"[codeblock]\n"
+"# Godot has been executed with the following command:\n"
+"# godot --headless --verbose --scene my_scene.tscn --custom\n"
+"OS.get_cmdline_args() # Returns [\"--scene\", \"my_scene.tscn\", \"--"
+"custom\"]\n"
+"[/codeblock]\n"
+"Command-line arguments can be written in any form, including both [code]--key "
+"value[/code] and [code]--key=value[/code] forms so they can be properly "
+"parsed, as long as custom command-line arguments do not conflict with engine "
+"arguments.\n"
+"You can also incorporate environment variables using the [method "
+"get_environment] method.\n"
+"You can set [member ProjectSettings.editor/run/main_run_args] to define "
+"command-line arguments to be passed by the editor when running the project.\n"
+"[b]Example:[/b] Parse command-line arguments into a [Dictionary] using the "
+"[code]--key=value[/code] form for arguments:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var arguments = {}\n"
+"for argument in OS.get_cmdline_args():\n"
+"\tif argument.contains(\"=\"):\n"
+"\t\tvar key_value = argument.split(\"=\")\n"
+"\t\targuments[key_value[0].trim_prefix(\"--\")] = key_value[1]\n"
+"\telse:\n"
+"\t\t# Options without an argument will be present in the dictionary,\n"
+"\t\t# with the value set to an empty string.\n"
+"\t\targuments[argument.trim_prefix(\"--\")] = \"\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var arguments = new Dictionary<string, string>();\n"
+"foreach (var argument in OS.GetCmdlineArgs())\n"
+"{\n"
+"\tif (argument.Contains('='))\n"
+"\t{\n"
+"\t\tstring[] keyValue = argument.Split(\"=\");\n"
+"\t\targuments[keyValue[0].TrimPrefix(\"--\")] = keyValue[1];\n"
+"\t}\n"
+"\telse\n"
+"\t{\n"
+"\t\t// Options without an argument will be present in the dictionary,\n"
+"\t\t// with the value set to an empty string.\n"
+"\t\targuments[argument.TrimPrefix(\"--\")] = \"\";\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Passing custom user arguments directly is not recommended, as "
+"the engine may discard or modify them. Instead, pass the standard UNIX double "
+"dash ([code]--[/code]) and then the custom arguments, which the engine will "
+"ignore by design. These can be read via [method get_cmdline_user_args]."
+msgstr ""
+"返回传递给引擎的命令行参数，但不包括引擎处理的参数，例如 [code]--headless[/"
+"code] 和 [code]--fullscreen[/code]。\n"
+"[codeblock]\n"
+"# Godot 已使用以下命令执行：\n"
+"# godot --headless --verbose --scene my_scene.tscn --custom\n"
+"OS.get_cmdline_args() # 返回 [\"--scene\", \"my_scene.tscn\", \"--custom\"]\n"
+"[/codeblock]\n"
+"命令行参数可以写成任何形式，包括 [code]--key value[/code] 和 [code]--"
+"key=value[/code] 两种形式，这样它们就可以被正确解析，只要自定义命令行参数不与"
+"引擎参数冲突。\n"
+"还可以使用 [method get_environment] 方法合并环境变量。\n"
+"可以设置 [member ProjectSettings.editor/run/main_run_args] 来定义编辑器在运行"
+"项目时传递的命令行参数。\n"
+"[b]示例：[/b]使用参数的 [code]--key=value[/code] 形式，将命令行参数解析为 "
+"[Dictionary]：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var arguments = {}\n"
+"for argument in OS.get_cmdline_args():\n"
+"\tif argument.contains(\"=\"):\n"
+"\t\tvar key_value = argument.split(\"=\")\n"
+"\t\targuments[key_value[0].trim_prefix(\"--\")] = key_value[1]\n"
+"\telse:\n"
+"\t\t# 没有参数的选项将出现在字典中，\n"
+"\t\t# 其值被设置为空字符串。\n"
+"\t\targuments[argument.trim_prefix(\"--\")] = \"\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var arguments = new Dictionary<string, string>();\n"
+"foreach (var argument in OS.GetCmdlineArgs())\n"
+"{\n"
+"\tif (argument.Contains('='))\n"
+"\t{\n"
+"\t\tstring[] keyValue = argument.Split(\"=\");\n"
+"\t\targuments[keyValue[0].TrimPrefix(\"--\")] = keyValue[1];\n"
+"\t}\n"
+"\telse\n"
+"\t{\n"
+"\t\t// 没有参数的选项将出现在字典中，\n"
+"\t\t// 其值被设置为空字符串。\n"
+"\t\targuments[argument.TrimPrefix(\"--\")] = \"\";\n"
+"\t}\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]不建议直接传递自定义用户参数，因为引擎可能会丢弃或修改它们。相"
+"反，传递标准的 UNIX 双破折号（[code]--[/code]），然后传递自定义参数，引擎将根"
+"据设计忽略这些参数。这些可以通过 [method get_cmdline_user_args] 读取。"
+
+msgid ""
+"Returns the command-line user arguments passed to the engine. User arguments "
+"are ignored by the engine and reserved for the user. They are passed after "
+"the double dash [code]--[/code] argument. [code]++[/code] may be used when "
+"[code]--[/code] is intercepted by another program (such as [code]startx[/"
+"code]).\n"
+"[codeblock]\n"
+"# Godot has been executed with the following command:\n"
+"# godot --fullscreen --custom -- --level=2 --hardcore\n"
+"\n"
+"OS.get_cmdline_args()      # Returns [\"--custom\"]\n"
+"OS.get_cmdline_user_args() # Returns [\"--level=2\", \"--hardcore\"]\n"
+"[/codeblock]\n"
+"To get arguments passed before [code]--[/code] or [code]++[/code], use "
+"[method get_cmdline_args]."
+msgstr ""
+"返回传递给引擎的命令行用户参数。引擎不会使用用户参数，用户可以自由指定。用户参"
+"数在双横杠 [code]--[/code] 之后指定。如果其他程序会拦截 [code]--[/code]（例如 "
+"[code]startx[/code]），那么也可以使用 [code]++[/code]。\n"
+"[codeblock]\n"
+"# Godot 已使用以下命令执行：\n"
+"# godot --fullscreen --custom -- --level=2 --hardcore\n"
+"\n"
+"OS.get_cmdline_args()      # 返回 [\"--custom\"]\n"
+"OS.get_cmdline_user_args() # 返回 [\"--level=2\", \"--hardcore\"]\n"
+"[/codeblock]\n"
+"要获取在 [code]--[/code] 或 [code]++[/code] 之前传递的参数，请使用 [method "
+"get_cmdline_args]。"
+
 msgid ""
 "Returns the [i]global[/i] user configuration directory according to the "
 "operating system's standards.\n"
@@ -101358,6 +110249,18 @@ msgstr ""
 "在数组中搜索值并返回其索引，如果未找到则返回 [code]-1[/code] 。可选地，可以传"
 "递起始搜索索引。"
 
+msgid ""
+"Returns the byte at the given [param index] in the array. If [param index] is "
+"out-of-bounds or negative, this method fails and returns [code]0[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的字节。如果 [param index] 越界或为负数，则该方"
+"法失败并返回 [code]0[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Converts ASCII/Latin-1 encoded array to [String]. Fast alternative to [method "
 "get_string_from_utf8] if the content is ASCII/Latin-1 only. Unlike the UTF-8 "
@@ -101746,6 +110649,19 @@ msgstr ""
 msgid "Appends a [PackedColorArray] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedColorArray]。"
 
+msgid ""
+"Returns the [Color] at the given [param index] in the array. If [param index] "
+"is out-of-bounds or negative, this method fails and returns [code]Color(0, 0, "
+"0, 1)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 [Color]。如果 [param index] 越界或为负数，则"
+"该方法失败并返回 [code]Color(0, 0, 0, 1)[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid "Appends a value to the array."
 msgstr "将一个值添加到数组中。"
 
@@ -102029,6 +110945,19 @@ msgstr ""
 "[b]注意：[/b][constant @GDScript.NAN] 的行为与其他数字不同。因此，如果包含 "
 "NaN，则这个方法的结果可能不准确。"
 
+msgid ""
+"Returns the 32-bit float at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns [code]0.0[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 32 位浮点数。如果 [param index] 越界或为负"
+"数，则该方法失败并返回 [code]0.0[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Returns [code]true[/code] if the array contains [param value].\n"
 "[b]Note:[/b] [constant @GDScript.NAN] doesn't behave the same as other "
@@ -102169,6 +111098,19 @@ msgstr "构造新 [PackedFloat64Array]。你还可以传入通用 [Array] 进行
 msgid "Appends a [PackedFloat64Array] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedFloat64Array]。"
 
+msgid ""
+"Returns the 64-bit float at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns [code]0.0[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 64 位浮点数。如果 [param index] 越界或为负"
+"数，则该方法失败并返回 [code]0.0[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Returns the slice of the [PackedFloat64Array], from [param begin] (inclusive) "
 "to [param end] (exclusive), as a new [PackedFloat64Array].\n"
@@ -102265,6 +111207,19 @@ msgstr "构造新 [PackedInt32Array]。你还可以传入通用 [Array] 进行
 msgid "Appends a [PackedInt32Array] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedInt32Array]。"
 
+msgid ""
+"Returns the 32-bit integer at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns [code]0[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 32 位整数。如果 [param index] 越界或为负数，"
+"则该方法失败并返回 [code]0[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Inserts a new integer at a given position in the array. The position must be "
 "valid, or at the end of the array ([code]idx == size()[/code])."
@@ -102383,6 +111338,19 @@ msgstr "构造新 [PackedInt64Array]。你还可以传入通用 [Array] 进行
 msgid "Appends a [PackedInt64Array] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedInt64Array]。"
 
+msgid ""
+"Returns the 64-bit integer at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns [code]0[/"
+"code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 64 位整数。如果 [param index] 越界或为负数，"
+"则该方法失败并返回 [code]0[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Returns the slice of the [PackedInt64Array], from [param begin] (inclusive) "
 "to [param end] (exclusive), as a new [PackedInt64Array].\n"
@@ -102696,6 +111664,19 @@ msgstr "构造新 [PackedStringArray]。你还可以传入通用 [Array] 进行
 msgid "Appends a [PackedStringArray] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedStringArray]。"
 
+msgid ""
+"Returns the [String] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns an empty "
+"string.\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中给定 [param index] 处的 [String] 值。如果 [param index] 越界或为负"
+"数，则该方法失败并返回空字符串。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid "Appends a string element at end of the array."
 msgstr "在数组的末尾追加字符串元素。"
 
@@ -102865,6 +111846,19 @@ msgstr ""
 "[b]注意：[/b]包含 [constant @GDScript.NAN] 元素的向量的行为与其他向量不同。因"
 "此，如果包含 NaN，则这个方法的结果可能不准确。"
 
+msgid ""
+"Returns the [Vector2] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector2(0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 [Vector2]。如果 [param index] 越界或为负数，"
+"则该方法失败并返回 [code]Vector2(0, 0)[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid ""
 "Returns [code]true[/code] if the array contains [param value].\n"
 "[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the "
@@ -103027,6 +112021,19 @@ msgstr ""
 msgid "Appends a [PackedVector3Array] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedVector3Array]。"
 
+msgid ""
+"Returns the [Vector3] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector3(0, 0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 [Vector3]。如果 [param index] 越界或为负数，"
+"则该方法失败并返回 [code]Vector3(0, 0, 0)[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid "Inserts a [Vector3] at the end."
 msgstr "在末尾插入一个 [Vector3]。"
 
@@ -103155,6 +112162,19 @@ msgstr ""
 msgid "Appends a [PackedVector4Array] at the end of this array."
 msgstr "在该数组的末尾追加一个 [PackedVector4Array]。"
 
+msgid ""
+"Returns the [Vector4] at the given [param index] in the array. If [param "
+"index] is out-of-bounds or negative, this method fails and returns "
+"[code]Vector4(0, 0, 0, 0)[/code].\n"
+"This method is similar (but not identical) to the [code][][/code] operator. "
+"Most notably, when this method fails, it doesn't pause project execution if "
+"run from the editor."
+msgstr ""
+"返回数组中索引为 [param index] 的 [Vector4]。如果 [param index] 越界或为负数，"
+"则该方法失败并返回 [code]Vector4(0, 0, 0, 0)[/code]。\n"
+"该方法类似于 [code][][/code] 运算符（但不等价）。最显著的区别就是从编辑器中运"
+"行时，该方法失败不会暂停项目运行。"
+
 msgid "Inserts a [Vector4] at the end."
 msgstr "在末尾插入一个 [Vector4]。"
 
@@ -103972,6 +112992,23 @@ msgstr "为指定的 [enum Parameter] 设置 [Texture2D]。"
 msgid "Sets the [param particle_flag] to [param enable]."
 msgstr "将粒子标志 [param particle_flag] 是否启用设置为 [param enable]。"
 
+msgid ""
+"The alpha value of each particle's color will be multiplied by this "
+"[CurveTexture] over its lifetime.\n"
+"[b]Note:[/b] [member alpha_curve] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALPHA *= COLOR.a;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"alpha_curve] will have no visible effect."
+msgstr ""
+"每个粒子的颜色的 Alpha 值将在其生命周期内与 [CurveTexture] 相乘。\n"
+"[b]注意：[/b][member alpha_curve] 乘以粒子网格的顶点颜色。要在 "
+"[BaseMaterial3D] 上产生可见效果，[member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]必须[/i]为 [code]true[/code]。对"
+"于 [ShaderMaterial]，必须在着色器的 [code]fragment()[/code] 函数中插入 "
+"[code]ALPHA *= COLOR.a;[/code]。否则 [member alpha_curve] 将没有可见效果。"
+
 msgid "Each particle's rotation will be animated along this [CurveTexture]."
 msgstr "每个粒子的旋转将沿着这个 [CurveTexture] 动画。"
 
@@ -104773,6 +113810,15 @@ msgstr ""
 msgid "A [Curve3D] describing the path."
 msgstr "描述路径的 [Curve3D]。"
 
+msgid ""
+"The custom color used to draw the path in the editor. If set to [constant "
+"Color.BLACK] (as by default), the color set in [member ProjectSettings.debug/"
+"shapes/paths/geometry_color] is used."
+msgstr ""
+"编辑器中用于绘制路径的自定义颜色。如果设置为 [constant Color.BLACK]（默认"
+"值），则使用 [member ProjectSettings.debug/shapes/paths/geometry_color] 中设置"
+"的颜色。"
+
 msgid "Emitted when the [member curve] changes."
 msgstr "当 [member curve] 改变时触发。"
 
@@ -105219,6 +114265,10 @@ msgstr ""
 msgid "Returns the names of active custom monitors in an [Array]."
 msgstr "以一个 [Array]，返回活动自定义监视器的名称。"
 
+msgid ""
+"Returns the [enum MonitorType] values of active custom monitors in an [Array]."
+msgstr "以一个数组返回活动自定义监视器的 [enum MonitorType] 值。"
+
 msgid ""
 "Returns the value of one of the available built-in monitors. You should "
 "provide one of the [enum Monitor] constants as the argument, like this:\n"
@@ -105410,6 +114460,14 @@ msgstr ""
 "[AudioServer] 的输出延迟。等同于调用 [method AudioServer.get_output_latency]，"
 "不建议每帧都调用该方法。"
 
+msgid ""
+"Number of active navigation maps in [NavigationServer2D] and "
+"[NavigationServer3D]. This also includes the empty default navigation maps "
+"created by [World2D] and [World3D] instances."
+msgstr ""
+"[NavigationServer2D] 和 [NavigationServer3D] 中活动导航地图的数量。这也包括由 "
+"[World2D] 和 [World3D] 实例创建的默认空导航地图。"
+
 msgid ""
 "Number of active navigation regions in [NavigationServer2D] and "
 "[NavigationServer3D]."
@@ -105501,6 +114559,13 @@ msgid ""
 msgstr ""
 "因优化当前场景而触发的管线编译次数。这些编译是在后台进行的，不会导致任何卡顿。"
 
+msgid ""
+"Number of active navigation maps in the [NavigationServer2D]. This also "
+"includes the empty default navigation maps created by [World2D] instances."
+msgstr ""
+"[NavigationServer2D] 中活动导航地图的数量。这也包括由 [World2D] 实例创建的默认"
+"空导航地图。"
+
 msgid "Number of active navigation regions in the [NavigationServer2D]."
 msgstr "[NavigationServer2D] 中活动导航区块的数量。"
 
@@ -105539,6 +114604,13 @@ msgstr ""
 msgid "Number of active navigation obstacles in the [NavigationServer2D]."
 msgstr "[NavigationServer2D] 中活动导航障碍物的数量。"
 
+msgid ""
+"Number of active navigation maps in the [NavigationServer3D]. This also "
+"includes the empty default navigation maps created by [World3D] instances."
+msgstr ""
+"[NavigationServer3D] 中活动导航地图的数量。这也包括由 [World3D] 实例创建的默认"
+"空导航地图。"
+
 msgid "Number of active navigation regions in the [NavigationServer3D]."
 msgstr "[NavigationServer3D] 中活动导航地区的数量。"
 
@@ -105580,6 +114652,28 @@ msgstr "[NavigationServer3D] 中活动导航障碍物的数量。"
 msgid "Represents the size of the [enum Monitor] enum."
 msgstr "代表 [enum Monitor] 枚举的大小。"
 
+msgid "Monitor output is formatted as an integer value."
+msgstr "显示器输出格式化为整数值。"
+
+msgid ""
+"Monitor output is formatted as computer memory. Submitted values should "
+"represent a number of bytes."
+msgstr "显示器输出格式化为计算机内存格式。提交的值应代表字节数。"
+
+msgid ""
+"Monitor output is formatted as time in milliseconds. Submitted values should "
+"represent a time in seconds (not milliseconds)."
+msgstr ""
+"显示器输出格式化为毫秒级时间。提交的值应表示以秒（而不是毫秒）为单位的时间。"
+
+msgid ""
+"Monitor output is formatted as a percentage. Submitted values should "
+"represent a fractional value rather than the percentage directly, e.g. "
+"[code]0.5[/code] for [code]50.00%[/code]."
+msgstr ""
+"显示器输出格式化为百分比。提交的值应表示分数，而不是直接表示百分比，例如 "
+"[code]0.5[/code] 表示 [code]50.00%[/code]。"
+
 msgid ""
 "A [RigidBody2D]-derived node used to make [Bone2D]s in a [Skeleton2D] react "
 "to physics."
@@ -105680,6 +114774,9 @@ msgstr ""
 "[Skeleton3D] 的骨骼必须正确分配给 [PhysicalBone3D]；这意味着 [method "
 "get_bone_id] 应该返回一个有效的 id（[code]>= 0[/code]）。"
 
+msgid "Ragdoll System"
+msgstr "布娃娃系统"
+
 msgid ""
 "Called during physics processing, allowing you to read and safely modify the "
 "simulation state for the object. By default, it is called before the standard "
@@ -110207,12 +119304,65 @@ msgstr ""
 "递 [PhysicsTestMotionParameters3D] 可以设置运动参数。还可以传递 "
 "[PhysicsTestMotionResult3D]，从而返回其他信息。"
 
+msgid ""
+"Creates a 3D box shape in the physics server, and returns the [RID] that "
+"identifies it. Use [method shape_set_data] to set the box's half-extents."
+msgstr ""
+"在物理服务器中创建一个 3D 盒子形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置盒子的半边距。"
+
+msgid ""
+"Creates a 3D capsule shape in the physics server, and returns the [RID] that "
+"identifies it. Use [method shape_set_data] to set the capsule's height and "
+"radius."
+msgstr ""
+"在物理服务器中创建一个 3D 胶囊体形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置胶囊体的高度和半径。"
+
+msgid ""
+"Creates a 3D concave polygon shape in the physics server, and returns the "
+"[RID] that identifies it. Use [method shape_set_data] to set the concave "
+"polygon's triangles."
+msgstr ""
+"在物理服务器中创建一个 3D 凹多边形形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置凹多边形的三角形。"
+
 msgid "Gets a cone twist joint parameter."
 msgstr "获取锥体扭转关节的参数。"
 
 msgid "Sets a cone twist joint parameter."
 msgstr "设置锥体扭转关节的参数。"
 
+msgid ""
+"Creates a 3D convex polygon shape in the physics server, and returns the "
+"[RID] that identifies it. Use [method shape_set_data] to set the convex "
+"polygon's points."
+msgstr ""
+"在物理服务器中创建一个 3D 凸多边形形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置凸多边形的点。"
+
+msgid ""
+"Creates a custom shape in the physics server, and returns the [RID] that "
+"identifies it. Use [method shape_set_data] to set the shape's data.\n"
+"[b]Note:[/b] Custom shapes are not supported by the built-in physics servers, "
+"so calling this method always produces an error when using Godot Physics or "
+"Jolt Physics. Custom physics servers implemented as GDExtensions may support "
+"a custom shape."
+msgstr ""
+"在物理服务器中创建一个自定义形状，并返回用于标识它的 [RID]。使用 [method "
+"shape_set_data] 方法设置形状数据。\n"
+"[b]注意：[/b]内置物理服务器不支持自定义形状，因此在使用 Godot 物理或 Jolt 物理"
+"时调用该方法始终会产生错误。作为 GDExtension 实现的自定义物理服务器可能支持自"
+"定义形状。"
+
+msgid ""
+"Creates a 3D cylinder shape in the physics server, and returns the [RID] that "
+"identifies it. Use [method shape_set_data] to set the cylinder's height and "
+"radius."
+msgstr ""
+"在物理服务器中创建一个 3D 圆柱体形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置圆柱体的高度和半径。"
+
 msgid ""
 "Destroys any of the objects created by PhysicsServer3D. If the [RID] passed "
 "is not one of the objects that can be created by PhysicsServer3D, an error "
@@ -110233,6 +119383,13 @@ msgstr "设置通用六自由度关节的标志值。"
 msgid "Sets the value of a given generic 6DOF joint parameter."
 msgstr "设置通用六自由度关节的参数值。"
 
+msgid ""
+"Creates a 3D heightmap shape in the physics server, and returns the [RID] "
+"that identifies it. Use [method shape_set_data] to set the heightmap's data."
+msgstr ""
+"在物理服务器中创建一个 3D 高度图形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置高度图的数据。"
+
 msgid "Gets a hinge joint flag."
 msgstr "获取铰链关节标志。"
 
@@ -110288,9 +119445,26 @@ msgstr "设置关节在关节物体 A 的局部空间中的位置。"
 msgid "Sets position of the joint in the local space of body b of the joint."
 msgstr "设置关节在关节物体 B 的局部空间中的位置。"
 
+msgid ""
+"Creates a 3D separation ray shape in the physics server, and returns the "
+"[RID] that identifies it. Use [method shape_set_data] to set the shape's "
+"[code]length[/code] and [code]slide_on_slope[/code] properties."
+msgstr ""
+"在物理服务器中创建一个 3D 分离射线形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置形状的 [code]length[/code] 和 [code]slide_on_slope[/code] "
+"属性。"
+
 msgid "Activates or deactivates the 3D physics engine."
 msgstr "激活或停用 3D 物理引擎。"
 
+msgid ""
+"Returns the shape data that configures the shape, such as the half-extents of "
+"a box or the triangles of a concave (trimesh) shape. See [method "
+"shape_set_data] for the precise format of this data in each case."
+msgstr ""
+"返回用于配置形状的形状数据，例如盒子的半边距或凹形（三角形网格）形状的三角形。"
+"有关每种情况下该数据的精确格式，请参阅 [method shape_set_data]。"
+
 msgid ""
 "Returns the collision margin for the shape.\n"
 "[b]Note:[/b] This is not used in Godot Physics, so will always return "
@@ -110299,6 +119473,64 @@ msgstr ""
 "返回形状的碰撞边距。\n"
 "[b]注意：[/b]Godot Physics 中并未使用，所以始终返回 [code]0[/code]。"
 
+msgid ""
+"Sets the shape data that configures the shape. The [param data] to be passed "
+"depends on the shape's type (see [method shape_get_type]):\n"
+"- [constant SHAPE_WORLD_BOUNDARY]: a [Plane],\n"
+"- [constant SHAPE_SEPARATION_RAY]: a dictionary containing the key [code]"
+"\"length\"[/code] with a [float] value and the key [code]\"slide_on_slope\"[/"
+"code] with a [bool] value,\n"
+"- [constant SHAPE_SPHERE]: a [float] that is the radius of the sphere,\n"
+"- [constant SHAPE_BOX]: a [Vector3] containing the half-extents of the box,\n"
+"- [constant SHAPE_CAPSULE]: a dictionary containing the keys [code]"
+"\"height\"[/code] and [code]\"radius\"[/code] with [float] values,\n"
+"- [constant SHAPE_CYLINDER]: a dictionary containing the keys [code]"
+"\"height\"[/code] and [code]\"radius\"[/code] with [float] values,\n"
+"- [constant SHAPE_CONVEX_POLYGON]: a [PackedVector3Array] of points defining "
+"a convex polygon (the shape will be the convex hull of the points),\n"
+"- [constant SHAPE_CONCAVE_POLYGON]: a dictionary containing the key [code]"
+"\"faces\"[/code] with a [PackedVector3Array] value (with a length divisible "
+"by 3, so that each 3-tuple of points forms a face) and the key [code]"
+"\"backface_collision\"[/code] with a [bool] value,\n"
+"- [constant SHAPE_HEIGHTMAP]: a dictionary containing the keys [code]"
+"\"width\"[/code] and [code]\"depth\"[/code] with [int] values, and the key "
+"[code]\"heights\"[/code] with a value that is a packed array of [float]s of "
+"length [code]width * depth[/code] (that is a [PackedFloat32Array], or a "
+"[PackedFloat64Array] if Godot was compiled with the [code]precision=double[/"
+"code] option), and optionally the keys [code]\"min_height\"[/code] and [code]"
+"\"max_height\"[/code] with [float] values,\n"
+"- [constant SHAPE_SOFT_BODY]: the input [param data] is ignored and this "
+"method has no effect,\n"
+"- [constant SHAPE_CUSTOM]: the input [param data] is interpreted by a custom "
+"physics server, if it supports custom shapes."
+msgstr ""
+"设置用于配置形状的形状数据。要传递的 [param data] 取决于形状的类型（见 "
+"[method shape_get_type]）：\n"
+"- [constant SHAPE_WORLD_BOUNDARY]：一个 [Plane]，\n"
+"- [constant SHAPE_SEPARATION_RAY]：一个字典，包含键 [code]\"length\"[/code]"
+"（值为 [float] 类型）和键 [code]\"slide_on_slope\"[/code]（值为 [bool] 类"
+"型），\n"
+"- [constant SHAPE_SPHERE]：一个 [float] 值，表示球体的半径，\n"
+"- [constant SHAPE_BOX]：一个 [Vector3]，包含盒体的半边距，\n"
+"- [constant SHAPE_CAPSULE]：一个字典，包含键 [code]\"height\"[/code] 和 [code]"
+"\"radius\"[/code]（值为 [float] 类型），\n"
+"- [constant SHAPE_CYLINDER]：一个字典，包含键 [code]\"height\"[/code] 和 "
+"[code]\"radius\"[/code]（值为 [float] 类型），\n"
+"- [constant SHAPE_CONVEX_POLYGON]：一个 [PackedVector3Array]，包含定义凸多边形"
+"的点（形状将是这些点的凸包），\n"
+"- [constant SHAPE_CONCAVE_POLYGON]：一个字典，包含键 [code]\"faces\"[/code]"
+"（值为 [PackedVector3Array]，长度可被 3 整除，因此每三个点构成一个面）和键 "
+"[code]\"backface_collision\"[/code]（值为 [bool] 类型），\n"
+"- [constant SHAPE_HEIGHTMAP]：一个字典，包含键 [code]\"width\"[/code] 和 "
+"[code]\"depth\"[/code]（值为 [int] 类型），以及键 [code]\"heights\"[/code]（值"
+"为长度为 [code]width * depth[/code] 的 [float] 数组（即 [PackedFloat32Array]，"
+"如果 Godot 使用 [code]precision=double[/code] 选项编译，则为 "
+"[PackedFloat64Array]）），以及可选的键 [code]\"min_height\"[/code] 和 [code]"
+"\"max_height\"[/code]（值为 [float] 类型），\n"
+"- [constant SHAPE_SOFT_BODY]：输入参数 [param data] 被忽略并且该方法无效。\n"
+"- [constant SHAPE_CUSTOM]：如果物理服务器支持自定义形状，则输入参数 [param "
+"data] 将由自定义物理服务器进行解释。"
+
 msgid ""
 "Sets the collision margin for the shape.\n"
 "[b]Note:[/b] This is not used in Godot Physics."
@@ -110534,6 +119766,21 @@ msgid ""
 "the [enum SpaceParameter] constants."
 msgstr "设置空间参数的值。可用参数列表位于 [enum SpaceParameter] 常量上。"
 
+msgid ""
+"Creates a 3D sphere shape in the physics server, and returns the [RID] that "
+"identifies it. Use [method shape_set_data] to set the sphere's radius."
+msgstr ""
+"在物理服务器中创建一个 3D 球体形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置球体的半径。"
+
+msgid ""
+"Creates a 3D world boundary shape in the physics server, and returns the "
+"[RID] that identifies it. Use [method shape_set_data] to set the shape's "
+"normal direction and distance properties."
+msgstr ""
+"在物理服务器中创建一个 3D 世界边界形状，并返回标识它的 [RID]。可使用 [method "
+"shape_set_data] 设置形状的法线方向和距离属性。"
+
 msgid "The [Joint3D] is a [PinJoint3D]."
 msgstr "该 [Joint3D] 为 [PinJoint3D]。"
 
@@ -110721,6 +119968,62 @@ msgstr "设置时，存在跨这些轴的线性马达，以指定的速度为目
 msgid "Represents the size of the [enum G6DOFJointAxisFlag] enum."
 msgstr "代表 [enum G6DOFJointAxisFlag] 枚举的大小。"
 
+msgid ""
+"Constant for creating a world boundary shape (used by the "
+"[WorldBoundaryShape3D] resource)."
+msgstr "用于创建世界边界形状的常量（由 [WorldBoundaryShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a separation ray shape (used by the "
+"[SeparationRayShape3D] resource)."
+msgstr "用于创建分离射线形状的常量（由 [SeparationRayShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a sphere shape (used by the [SphereShape3D] resource)."
+msgstr "用于创建球体形状的常量（由 [SphereShape3D] 资源使用）。"
+
+msgid "Constant for creating a box shape (used by the [BoxShape3D] resource)."
+msgstr "用于创建盒状形状的常量（由 [BoxShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a capsule shape (used by the [CapsuleShape3D] resource)."
+msgstr "用于创建胶囊体形状的常量（由 [CapsuleShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a cylinder shape (used by the [CylinderShape3D] "
+"resource)."
+msgstr "用于创建圆柱体形状的常量（由 [CylinderShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a convex polygon shape (used by the "
+"[ConvexPolygonShape3D] resource)."
+msgstr "用于创建凸多边形形状的常量（由 [ConvexPolygonShape3D] 资源使用）。"
+
+msgid ""
+"Constant for creating a concave polygon (trimesh) shape (used by the "
+"[ConcavePolygonShape3D] resource)."
+msgstr ""
+"用于创建凹多边形（三角网格）形状的常量（由 [ConcavePolygonShape3D] 资源使"
+"用）。"
+
+msgid ""
+"Constant for creating a heightmap shape (used by the [HeightMapShape3D] "
+"resource)."
+msgstr "用于创建高度图形状的常量（由 [HeightMapShape3D] 资源使用）。"
+
+msgid ""
+"Constant used internally for a soft body shape. Any attempt to create this "
+"kind of shape results in an error."
+msgstr ""
+"内部使用的常量，用于表示软体形状。任何尝试创建这类形状的操作都会产生错误。"
+
+msgid ""
+"Constant used internally for a custom shape. Any attempt to create this kind "
+"of shape results in an error when using Godot Physics or Jolt Physics."
+msgstr ""
+"内部使用的常量，用于表示自定义形状。在使用 Godot 物理引擎或 Jolt 物理引擎时，"
+"任何尝试创建这类形状的操作都会产生错误。"
+
 msgid ""
 "Constant to set/get gravity override mode in an area. See [enum "
 "AreaSpaceOverrideMode] for possible values."
@@ -112928,6 +122231,36 @@ msgstr ""
 "[PopupMenu] 菜单项之间存在链接，则无论该属性为何值，均可使用原生菜单，请使用 "
 "[method is_native_menu] 检查。"
 
+msgid ""
+"If [code]true[/code], shrinks [PopupMenu] to minimum height when it's shown."
+msgstr "如果为 [code]true[/code]，则在显示 [PopupMenu] 时将其缩小到最小高度。"
+
+msgid ""
+"If [code]true[/code], shrinks [PopupMenu] to minimum width when it's shown."
+msgstr "如果为 [code]true[/code]，则在显示 [PopupMenu] 时会将其宽度缩小到最小。"
+
+msgid ""
+"Sets the delay time in seconds for the submenu item to popup on mouse "
+"hovering. If the popup menu is added as a child of another (acting as a "
+"submenu), it will inherit the delay time of the parent menu item.\n"
+"[b]Note:[/b] If the mouse is exiting a submenu item with an open submenu and "
+"enters a different submenu item, the submenu popup delay time is affected by "
+"the direction of the mouse movement toward the open submenu. If the mouse is "
+"moving toward the submenu, the open submenu will wait approximately "
+"[code]0.5[/code] seconds before closing, which then allows the hovered "
+"submenu item to open. This additional delay allows the mouse time to move to "
+"the open submenu across other menu items without prematurely closing. If the "
+"mouse is not moving toward the open submenu, for example in a downward "
+"direction, the open submenu will close immediately."
+msgstr ""
+"设置鼠标悬停时子菜单项弹出的延迟时间，单位为秒。如果将弹出菜单添加为另一个菜单"
+"的子级（充当子菜单），它将继承父菜单项的延迟时间。\n"
+"[b]注意：[/b]如果鼠标离开一个已打开子菜单的子菜单项并进入另一个子菜单项，子菜"
+"单弹出延迟时间会受到鼠标移动方向的影响。如果鼠标朝已打开的子菜单移动，则已打开"
+"的子菜单会等待大约 [code]0.5[/code] 秒后关闭，然后允许当前悬停的子菜单项打开。"
+"这种额外的延迟使鼠标有时间穿过其他菜单项移动到已打开的子菜单，而不会过早关闭。"
+"如果鼠标没有朝向已打开的子菜单移动，例如向下移动，则已打开的子菜单会立即关闭。"
+
 msgid ""
 "If set to one of the values of [enum NativeMenu.SystemMenus], this "
 "[PopupMenu] is bound to the special system menu. Only one [PopupMenu] can be "
@@ -112942,8 +122275,25 @@ msgid ""
 "ui_down] input action."
 msgstr ""
 "用户使用 [member ProjectSettings.input/ui_up] 或 [member "
-"ProjectSettings.input/ui_down] 输入动作移动至 ID 为 [param id] 的菜单项时发"
-"出。"
+"ProjectSettings.input/ui_down] 输入动作导航至某个 [param id] 的菜单项时发出。"
+
+msgid ""
+"Emitted when an item of some [param id] is pressed. Also emitted when its "
+"accelerator is activated on macOS.\n"
+"[b]Note:[/b] If [param id] is negative (either explicitly or due to "
+"overflow), this will return the corresponding index instead."
+msgstr ""
+"ID 为 [param id] 的项目被按下时发出。在 macOS 系统上，当其快捷键被激活时也会发"
+"出。\n"
+"[b]注意：[/b]如果 [param id] 为负数（无论是明确指定的还是由于溢出导致的），将"
+"返回相应的索引来代替。"
+
+msgid ""
+"Emitted when an item of some [param index] is pressed. Also emitted when its "
+"accelerator is activated on macOS."
+msgstr ""
+"索引为 [param index] 的项目被按下时发出。在 macOS 系统上，当其快捷键被激活时也"
+"会发出。"
 
 msgid "Emitted when any item is added, modified or removed."
 msgstr "发生菜单项的添加、修改、删除时发出。"
@@ -112971,6 +122321,13 @@ msgstr "用于标注分隔符文本的颜色 [Color]。见 [method add_separator
 msgid "The tint of text outline of the labeled separator."
 msgstr "带标签分隔符的文本轮廓的色调。"
 
+msgid ""
+"If not [code]0[/code], the icon gutter will be merged with the checkbox "
+"gutter when possible. This acts as a boolean."
+msgstr ""
+"如果不是 [code]0[/code]，则图标边栏将在可能的情况下与复选框边栏合并。它充当布"
+"尔值。"
+
 msgid "The horizontal space between the item's elements."
 msgstr "菜单项元素之间的水平间距。"
 
@@ -113116,6 +122473,44 @@ msgstr "返回使用的压缩模式（初始化后有效）。"
 msgid "Return the image format used (valid after initialized)."
 msgstr "返回使用的图像格式（初始化后有效）。"
 
+msgid ""
+"Returns [code]true[/code] if the flag is overridden for all textures of this "
+"type."
+msgstr "如果此类型的纹理的所有标志都被覆盖，则返回 [code]true[/code]。"
+
+msgid ""
+"Sets the compressor parameters for Basis Universal compression. See also the "
+"settings in [ResourceImporterTexture].\n"
+"[b]Note:[/b] This method must be called before [method create_from_image] for "
+"this to work."
+msgstr ""
+"设置 Basis Universal 压缩的压缩器参数。另见 [ResourceImporterTexture] 中的设"
+"置。\n"
+"[b]注意：[/b]该方法必须在 [method create_from_image] 之前调用才能生效。"
+
+msgid ""
+"If [param keep] is [code]true[/code], overrides the flag globally for all "
+"textures of this type. This is used primarily by the editor."
+msgstr ""
+"如果 [param keep] 为 [code]true[/code]，则会全局覆盖所有此类纹理的标志。主要用"
+"于编辑器。"
+
+msgid ""
+"If [code]true[/code], when running in the editor, this texture will keep the "
+"source-compressed data in memory, allowing the data to persist after loading. "
+"Otherwise, the source-compressed data is lost after loading and the texture "
+"can't be re-saved.\n"
+"[b]Note:[/b] This property must be set before [method create_from_image] for "
+"this to work."
+msgstr ""
+"如果为 [code]true[/code]，则在编辑器中运行时，该纹理会将源压缩数据保留在内存"
+"中，从而使数据在加载后仍然存在。否则，源压缩数据在加载后会丢失，并且纹理无法重"
+"新保存。\n"
+"[b]注意：[/b]该属性必须在 [method create_from_image] 之前设置才能生效。"
+
+msgid "Allows overriding the texture's size (for 2D only)."
+msgstr "允许覆盖纹理大小（仅限 2D）。"
+
 msgid ""
 "Base class for all primitive meshes. Handles applying a [Material] to a "
 "primitive mesh."
@@ -113840,6 +123235,16 @@ msgstr ""
 msgid "Clears the whole configuration (not recommended, may break things)."
 msgstr "清除整个配置（不推荐，可能会弄坏东西）。"
 
+msgid ""
+"Gets an array of the settings which have been changed since the last save. "
+"Note that internally [code]changed_settings[/code] is cleared after a "
+"successful save, so generally the most appropriate place to use this method "
+"is when processing [signal settings_changed]."
+msgstr ""
+"获取上次保存以来发生更改的设置项数组。请注意，成功保存后内部会将 "
+"[code]changed_settings[/code] 清空，所以一般最适合使用该方法的地方是在处理 "
+"[signal settings_changed] 信号时。"
+
 msgid ""
 "Returns an [Array] of registered global classes. Each global class is "
 "represented as a [Dictionary] that contains the following entries:\n"
@@ -114156,9 +123561,48 @@ msgstr ""
 "[/codeblocks]\n"
 "也可以用来擦除自定义项目设置。方法是将设置项的值设置为 [code]null[/code]。"
 
+msgid ""
+"Accessibility support mode:\n"
+"- [b]Auto[/b] ([code]0[/code]): Accessibility support is enabled, but updates "
+"to the accessibility information are processed only if an assistive app (such "
+"as a screen reader or a Braille display) is active (default).\n"
+"- [b]Always Active[/b] ([code]1[/code]): Accessibility support is enabled, "
+"and updates to the accessibility information are always processed, regardless "
+"of the status of assistive apps.\n"
+"- [b]Disabled[/b] ([code]2[/code]): Accessibility support is fully disabled.\n"
+"[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights "
+"for Windows, Accessibility Inspector (macOS), or AT-SPI Browser (Linux/BSD), "
+"do not count as assistive apps. To test your project with these tools, use "
+"[b]Always Active[/b]."
+msgstr ""
+"无障碍支持模式：\n"
+"- [b]Auto[/b]（[code]0[/code]）：启用无障碍支持，但只会在辅助应用（屏幕阅读"
+"器、盲文显示器等）处于活动状态时才会处理无障碍信息的更新（默认）。\n"
+"- [b]Always Active[/b]（[code]1[/code]）：启用无障碍支持，无论当前辅助应用的状"
+"态都会处理无障碍信息的处理。\n"
+"- [b]Disabled[/b]（[code]2[/code]）：完全禁用无障碍支持。\n"
+"[b]注意：[/b]Accessibility Insights for Windows、Accessibility Inspector"
+"（macOS）、AT-SPI 浏览器（Linux/BSD）等无障碍调试工具不算作辅助应用。要使用这"
+"些工具测试应用，请使用 [b]Always Active[/b]。"
+
 msgid "The number of accessibility information updates per second."
 msgstr "每秒无障碍信息的更新次数。"
 
+msgid ""
+"If [code]true[/code], [member MeshInstance3D.skeleton] will point to the "
+"parent node ([code]..[/code]) by default, which was the behavior before Godot "
+"4.6. It's recommended to keep this setting disabled unless the old behavior "
+"is needed for compatibility.\n"
+"[b]Note:[/b] If you disable this option in an existing project, it's strongly "
+"recommended to use the [code]Project > Tools > Upgrade Project Files...[/"
+"code] option to ensure existing scenes do not break."
+msgstr ""
+"如果为 [code]true[/code]，则 [member MeshInstance3D.skeleton] 默认指向父节点"
+"（[code]..[/code]），这是 Godot 4.6 之前的行为。建议保持该设置项的禁用状态，除"
+"非出于兼容性考虑需要保留旧的行为。\n"
+"[b]注意：[/b]如果你在已有项目中禁用该选项，强烈建议使用[code]项目 > 工具 > 升"
+"级项目文件...[/code]选项，以确保已有场景不会出现问题。"
+
 msgid ""
 "If [code]true[/code], [AnimationMixer] prints the warning of interpolation "
 "being forced to choose the shortest rotation path due to multiple angle "
@@ -114210,6 +123654,14 @@ msgstr ""
 "image] 所指定的图像。为 [code]false[/code] 时，仅显示 [member application/"
 "boot_splash/bg_color] 所指定的纯色。"
 
+msgid ""
+"Specifies how the splash image will be stretched. For the original size "
+"without stretching, set to disabled. See [enum "
+"RenderingServer.SplashStretchMode] constants for more information."
+msgstr ""
+"指定启动画面图像的拉伸方式。如果不需要拉伸，保持原始尺寸，请设置为“禁用”。更多"
+"信息请参阅 [enum RenderingServer.SplashStretchMode] 常量。"
+
 msgid ""
 "If [code]true[/code], applies linear filtering when scaling the image "
 "(recommended for high-resolution artwork). If [code]false[/code], uses "
@@ -114246,6 +123698,15 @@ msgid ""
 "hovering the project."
 msgstr "项目的描述，在项目管理器中悬停时显示为工具提示。"
 
+msgid ""
+"If [code]true[/code], disables loading of project settings overrides (file "
+"defined in [member application/config/project_settings_override] and "
+"[code]res://override.cfg[/code]) and related CLI arguments."
+msgstr ""
+"如果为 [code]true[/code]，则禁用加载项目设置项覆盖（在 [member application/"
+"config/project_settings_override] 和 [code]res://override.cfg[/code] 中定义的"
+"文件）以及相关的命令行参数。"
+
 msgid ""
 "Icon used for the project, set when project loads. Exporters will also use "
 "this icon as a fallback if necessary."
@@ -114280,6 +123741,16 @@ msgstr ""
 "称。有关更多信息，请参阅文档中的 [url=$DOCS_URL/tutorials/io/data_paths.html]"
 "《数据路径》[/url]。"
 
+msgid ""
+"Translations of the project's name. This setting is used by OS tools to "
+"translate application name on Android, iOS and macOS.\n"
+"[b]Note:[/b] When left empty, the application name is translated using the "
+"project translations."
+msgstr ""
+"项目名称的翻译。操作系统工具会使用此设置来翻译 Android、iOS 和 macOS 上的应用"
+"程序名称。\n"
+"[b]注意：[/b]如果留空，应用程序名称将使用项目翻译进行翻译。"
+
 msgid ""
 "Specifies a file to override project settings. For example: [code]user://"
 "custom_settings.cfg[/code]. See \"Overriding\" in the [ProjectSettings] class "
@@ -114501,6 +123972,62 @@ msgstr "实现引擎主循环的类型名称。"
 msgid "Path to the main scene file that will be loaded when the project runs."
 msgstr "项目运行时将加载的主场景文件的路径。"
 
+msgid ""
+"Maximum number of frames per second allowed. A value of [code]0[/code] means "
+"\"no limit\". The actual number of frames per second may still be below this "
+"value if the CPU or GPU cannot keep up with the project logic and rendering.\n"
+"Limiting the FPS can be useful to reduce system power consumption, which "
+"reduces heat and noise emissions (and improves battery life on mobile "
+"devices).\n"
+"If [member display/window/vsync/vsync_mode] is set to [code]Enabled[/code] or "
+"[code]Adaptive[/code], it takes precedence and the forced FPS number cannot "
+"exceed the monitor's refresh rate. See also [method "
+"DisplayServer.screen_get_refresh_rate].\n"
+"If [member display/window/vsync/vsync_mode] is [code]Enabled[/code], on "
+"monitors with variable refresh rate enabled (G-Sync/FreeSync), using an FPS "
+"limit slightly lower than the monitor's refresh rate will [url=https://"
+"blurbusters.com/howto-low-lag-vsync-on/]reduce input lag while avoiding "
+"tearing[/url]. At higher refresh rates, the difference between the FPS limit "
+"and the monitor refresh rate should be increased to ensure frames to account "
+"for timing inaccuracies. The optimal formula for the FPS limit value in this "
+"scenario is [code]r - (r * r) / 3600.0[/code], where [code]r[/code] is the "
+"monitor's refresh rate.\n"
+"If [member display/window/vsync/vsync_mode] is [code]Disabled[/code], "
+"limiting the FPS to a high value that can be consistently reached on the "
+"system can reduce input lag compared to an uncapped framerate. Since this "
+"works by ensuring the GPU load is lower than 100%, this latency reduction is "
+"only effective in GPU-bottlenecked scenarios, not CPU-bottlenecked "
+"scenarios.\n"
+"See also [member physics/common/physics_ticks_per_second].\n"
+"This setting can be overridden using the [code]--max-fps <fps>[/code] command "
+"line argument (including with a value of [code]0[/code] for unlimited "
+"framerate).\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the rendering FPS cap at runtime, set [member Engine.max_fps] instead."
+msgstr ""
+"每秒允许的最大帧数。[code]0[/code] 表示“不限制”。如果 CPU 或 GPU 无法满足项目"
+"逻辑和渲染，则实际每秒的帧数可能仍然比这个值小。\n"
+"限制 FPS 可以降低系统对电源的消耗，能够降低发热、减少噪音（延长移动设备的电池"
+"寿命）。\n"
+"[member display/window/vsync/vsync_mode] 为 [code]Enabled[/code] 或 "
+"[code]Adaptive[/code] 时，该设置优先生效，强制的 FPS 数无法超过显示器的刷新"
+"率。另见 [method DisplayServer.screen_get_refresh_rate]。\n"
+"[member display/window/vsync/vsync_mode] 为 [code]Enabled[/code] 时，在启用了"
+"可变刷新率（G-Sync/FreeSync）的显示器上使用比显示器刷新率略低的 FPS 限制会"
+"[url=https://blurbusters.com/howto-low-lag-vsync-on/]降低输入延迟，避免画面撕"
+"裂[/url]。在较高的刷新率下，应增大帧率限制与显示器刷新率之间的差值，以确保有足"
+"够的帧数来弥补计时误差。在这种情况下，帧率限制值的最佳公式为 [code]r - (r * "
+"r) / 3600.0[/code]，其中 [code]r[/code] 是显示器的刷新率。\n"
+"[member display/window/vsync/vsync_mode] 为 [code]Disabled[/code] 时，与不限制"
+"帧率相比，将 FPS 限制设为系统所能达到的较高值能够降低输入延迟。因为原理是确保 "
+"GPU 负载低于 100%，所以只有在 GPU 为瓶颈时才会降低延迟，无法缓解 CPU 瓶颈导致"
+"的延迟。\n"
+"另见 [member physics/common/physics_ticks_per_second]。\n"
+"这个设置可以使用 [code]--max-fps <fps>[/code] 命令行参数覆盖（设为 [code]0[/"
+"code] 则是不限制帧率）。\n"
+"[b]注意：[/b]这个属性仅在项目启动时读取。要在运行时修改渲染 FPS 上限，请改为设"
+"置 [member Engine.max_fps]。"
+
 msgid ""
 "If [code]true[/code], the engine header is printed in the console on startup. "
 "This header describes the current version of the engine, as well as the "
@@ -114704,6 +124231,19 @@ msgstr ""
 "avaudiosessioncategory]AVAudioSessionCategory[/url]。如果需要让手机在静音模式"
 "时也进行声音输出，请使用 [code]Playback[/code] 类别。"
 
+msgid ""
+"If [code]true[/code], text-to-speech support is enabled on startup, otherwise "
+"it is enabled the first time any TTS method is used. See also [method "
+"DisplayServer.tts_get_voices] and [method DisplayServer.tts_speak].\n"
+"[b]Note:[/b] Enabling TTS can cause additional idle CPU usage and interfere "
+"with the sleep mode, so consider disabling it if TTS is not used."
+msgstr ""
+"如果为 [code]true[/code]，则文本转语音（Text-to-Speech，TTS）支持会在启动时启"
+"用，否则会在首次使用任意 TTS 方法时启用，另见 [method "
+"DisplayServer.tts_get_voices] 和 [method DisplayServer.tts_speak]。\n"
+"[b]注意：[/b]启用 TTS 会增加空闲 CPU 的占用，影响睡眠模式，所以请在不需要 TTS "
+"时考虑将其关闭。"
+
 msgid ""
 "Setting to hardcode audio delay when playing video. Best to leave this "
 "unchanged unless you know what you are doing."
@@ -114817,6 +124357,103 @@ msgstr ""
 "如果使用 [code]--log-file <file>[/code] [url=$DOCS_URL/tutorials/editor/"
 "command_line_tutorial.html]命令行参数[/url] ，则始终禁用日志轮转。"
 
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an [code]assert[/code] call always evaluates to "
+"[code]false[/code]."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在 [code]assert[/code] 调用永远求值为 "
+"[code]false[/code] 时对应产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an [code]assert[/code] call always evaluates to [code]true[/"
+"code]."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在 [code]assert[/code] 调用永远求值为 "
+"[code]true[/code] 时对应产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable captured by a lambda is reassigned, since "
+"this does not modify the outer local variable."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，如果为 lambda 捕获的局部变量重新赋值，就"
+"会对应产生警告或错误，因为这样做并不会修改外部的局部变量。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an identifier contains characters that can be confused with "
+"something else, like when mixing different alphabets."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在标识符中的字符可能与其他东西产生混淆"
+"时对应产生警告或错误，例如混用不同的字母表。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an identifier declared in the nested block has the same "
+"name as an identifier declared below in the parent block."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在嵌套块中声明的标识符与父块中下面声明"
+"的标识符同名时，分别产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an identifier that will be shadowed below in the block is "
+"used."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在该块下的一个将被隐藏的标识符被使用"
+"时，分别产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when deprecated keywords are used.\n"
+"[b]Note:[/b] There are currently no deprecated keywords, so this warning is "
+"never produced."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在使用已启用的关键字时对应产生警告或错"
+"误。\n"
+"[b]注意：[/b]目前没有弃用的关键字，因此不会产生该警告。"
+
+msgid ""
+"The rules for including or excluding scripts when generating warnings, as a "
+"dictionary. Each rule is an entry consisting of a directory path (key) and a "
+"decision (value). When trying to generate a warning, the GDScript parser "
+"chooses the most specific rule, i.e. the most nested directory containing the "
+"script. If the decision is [b]Exclude[/b], warnings are not generated for "
+"this script. If the decision is [b]Include[/b] or the script doesn't satisfy "
+"any of the rules, the warning configuration specified in the Project Settings "
+"is applied.\n"
+"It is recommended to include your own addons/libraries, either project-"
+"specific or actively being developed at the moment. Third-party or project-"
+"agnostic addons/libraries should be excluded, as they may be incompatible "
+"with the project's warning configuration.\n"
+"[b]Note:[/b] It is not recommended to remove or change the rule for [code]"
+"\"res://addons\"[/code] as the project's warning configuration may break "
+"third-party addons. Instead, consider including individual addons, if "
+"necessary.\n"
+"[b]Note:[/b] The editor does not check whether the specified paths are "
+"existing directories. It also does not automatically update these paths when "
+"directories are moved."
+msgstr ""
+"生成警告时包含或排除脚本的规则，以字典形式表示。每条规则都是一个条目，由目录路"
+"径（键）和决策（值）组成。尝试生成警告时，GDScript 解析器会选择最具体的规则，"
+"即包含该脚本的最深层目录。如果决策是 [b]Exclude[/b]，则不会为此脚本生成警告。"
+"如果决策是 [b]Include[/b] 或脚本不满足任何规则，则会应用项目设置中指定的警告配"
+"置。\n"
+"建议包含你自己的插件/库，无论是项目特定的还是当前正在积极开发的。第三方或与项"
+"目无关的插件/库应排除在外，因为它们可能与项目的警告配置不兼容。\n"
+"[b]注意：[/b]不建议删除或更改 [code]\"res://addons\"[/code] 的规则，因为项目的"
+"警告配置可能会破坏第三方插件。如有必要，可以考虑添加单独的插件。\n"
+"[b]注意：[/b]编辑器不会检查指定的路径是否为已存在的目录。当目录被移动时，它也"
+"不会自动更新这些路径。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an empty file is parsed."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在解析空文件时对应产生警告或错误。"
+
 msgid ""
 "If [code]true[/code], enables specific GDScript warnings (see [code]debug/"
 "gdscript/warnings/*[/code] settings). If [code]false[/code], disables all "
@@ -114826,6 +124463,142 @@ msgstr ""
 "gdscript/warnings/*[/code] 设置）。如果为 [code]false[/code]，则禁用所有 "
 "GDScript 警告。"
 
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a variable has an enum type but no explicit default value, "
+"but only if the enum does not contain [code]0[/code] as a valid value."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，如果变量具有枚举类型但没有明确的默认值，"
+"且枚举不包含 [code]0[/code] 作为有效值时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when [method Node.get_node] (or the shorthand [code]$[/code]) is "
+"used as default value of a class variable without the [code]@onready[/code] "
+"annotation."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当 [method Node.get_node]（或简写 [code]$"
+"[/code]）被用作一个没有 [code]@onready[/code] 注解的类变量的默认值时，会分别产"
+"生一个警告或一个错误 。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a ternary operator may emit values with incompatible types."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当三元运算符可能发出具有不兼容类型的值"
+"时，分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a static inferred type uses a [Variant] as initial value, "
+"which makes the static type to also be Variant."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当静态推断类型使用一个 [Variant] 作为初始"
+"值时，这使得静态类型也成为 Variant，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a variable, constant, or parameter has an implicitly "
+"inferred static type. In GDScript, type inference is performed by declaring a "
+"variable with [code]:=[/code] instead of [code]=[/code] and leaving out the "
+"type specifier. For example, [code]var x := 1[/code] will [i]infer[/i] the "
+"[int] type, while [code]var x: int = 1[/code] explicitly declares the "
+"variable as [int].\n"
+"[b]Note:[/b] This warning is recommended [i]in addition[/i] to [member debug/"
+"gdscript/warnings/untyped_declaration] if you want to always specify the type "
+"explicitly. Having [code]INFERRED_DECLARATION[/code] warning level higher "
+"than [code]UNTYPED_DECLARATION[/code] warning level makes little sense and is "
+"not recommended."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当变量、常量或参数具有隐式推断的静态类型"
+"时，分别产生警告或错误。在 GDScript 中，类型推断的执行是通过使用 [code]:=[/"
+"code] 而不是 [code]=[/code] 声明变量，并且省略类型说明符。例如，[code]var "
+"x := 1[/code] 将[i]推断[/i]为 [int] 类型，而 [code]var x: int = 1[/code] 则明"
+"确将变量声明为 [int]。\n"
+"[b]注意：[/b]如果你希望始终显式指定类型，则推荐该警告，[i]除了[/i] [member "
+"debug/gdscript/warnings/untyped_declaration]。使 [code]INFERRED_DECLARATION[/"
+"code] 警告级别高于 [code]UNTYPED_DECLARATION[/code] 警告级别意义不大，且不被推"
+"荐。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when trying to use an integer as an enum without an explicit "
+"cast."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当尝试将整数用作没有显式转换的枚举时，会"
+"分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when trying to use an integer as an enum when there is no "
+"matching enum member for that numeric value."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当在尝试将整数用作枚举，且没有与该数值匹"
+"配的枚举成员时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when dividing an integer by another integer (the decimal part "
+"will be discarded)."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当一个整数除以另一个整数时（小数部分将被"
+"丢弃），会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a coroutine without [code]await[/code]."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当在调用协程时没有使用 [code]await[/"
+"code]，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when the base class script has the [code]@tool[/code] "
+"annotation, but the current class script does not have it."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在基类脚本带有 [code]@tool[/code] 注"
+"解，但当前类脚本没有该注解时对应产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when passing a floating-point value to a function that expects "
+"an integer (it will be converted and lose precision)."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，在将浮点值传递给需要整数的函数时（它将被"
+"转换并失去精度），会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a method in the script overrides a native method, because "
+"it may not behave as expected."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当脚本中的方法覆盖本地方法，因为它可能不"
+"会按预期运行时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when the [code]@onready[/code] annotation is used together with "
+"the [code]@export[/code] annotation, since it may not behave as expected."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当 [code]@onready[/code] 注解与 "
+"[code]@export[/code] 注解一起使用时，因为它可能不会按预期运行，会分别产生一个"
+"警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a function that is not a coroutine is called with await."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当使用 await 调用一个非协程的函数时，会分"
+"别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when the [code]@static_unload[/code] annotation is used in a "
+"script without any static variables."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，会在 [code]@static_unload[/code] 注解用于"
+"不包含任何静态变量的脚本时对应产生警告或错误。"
+
 msgid ""
 "When enabled, using a property, enum, or function that was renamed since "
 "Godot 3 will produce a hint if an error occurs."
@@ -114833,6 +124606,186 @@ msgstr ""
 "启用后，使用自 Godot 3 以来重命名的属性、枚举或函数，将在发生错误时产生一个提"
 "示。"
 
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a function without using its return value (by "
+"assigning it to a variable or using it as a function argument). These return "
+"values are sometimes used to indicate possible errors using the [enum Error] "
+"enum."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当调用函数却不使用其返回值（通过将其分配"
+"给变量或将其用作函数参数）时，会分别产生一个警告或一个错误。这些返回值有时使"
+"用 [enum Error] 枚举来指示可能的错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when defining a local or member variable, signal, or enum that "
+"would have the same name as a built-in function or global class name, thus "
+"shadowing it."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当定义一个与内置函数或全局类同名的局部变"
+"量或成员变量、信号或枚举，从而隐藏该内置函数或全局类时，会分别产生一个警告或一"
+"个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable or local constant shadows a member "
+"declared in the current class."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当局部变量或局部常量隐藏了当前类定义成员"
+"时，会对应产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable or local constant shadows a member "
+"declared in a base class."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当局部变量或局部常量隐藏了基类定义成员"
+"时，会对应产生警告或错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling an expression that may have no effect on the "
+"surrounding code, such as writing [code]2 + 2[/code] as a statement."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当调用可能对周围代码没有影响的表达式，例"
+"如将 [code]2 + 2[/code] 写为语句时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a ternary expression that may have no effect on the "
+"surrounding code, such as writing [code]42 if active else 0[/code] as a "
+"statement."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当调用可能对周围代码没有影响的三元表达"
+"式，例如将 [code]42 if active else 0[/code] 写为语句时，会分别产生一个警告或一"
+"个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a static method from an instance of a class instead "
+"of from the class directly."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当从类的实例而不是直接从类调用静态方法"
+"时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when using a variable that wasn't previously assigned."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当使用以前未分配的变量时，会分别产生一个"
+"警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when assigning a variable using an assignment operator like "
+"[code]+=[/code] if the variable wasn't previously assigned."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当使用 [code]+=[/code] 等赋值运算符分配一"
+"个变量，且该变量以前未分配时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when unreachable code is detected (such as after a [code]return[/"
+"code] statement that will always be executed)."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当检测到无法访问的代码（例如始终在 "
+"[code]return[/code] 语句之后被执行的代码）时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when an unreachable [code]match[/code] pattern is detected."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当检测到无法到达的 [code]match[/code] 模"
+"式时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when using an expression whose type may not be compatible with "
+"the function parameter expected."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当使用类型可能与函数参数预期的类型不兼容"
+"的表达式时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a [Variant] value is cast to a non-Variant."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当 [Variant] 值转换为非 Variant 时，会分"
+"别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when calling a method whose presence is not guaranteed at "
+"compile-time in the class."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当调用类中不能保证在编译时存在的方法时，"
+"会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when accessing a property whose presence is not guaranteed at "
+"compile-time in the class."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当访问类中不能保证在编译时存在的属性时，"
+"会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when returning a call from a [code]void[/code] function when "
+"such call cannot be guaranteed to be also [code]void[/code]."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当从 [code]void[/code] 函数返回一个调用，"
+"且无法保证该调用也是 [code]void[/code] 时，会分别产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a variable or parameter has no static type, or if a "
+"function has no static return type.\n"
+"[b]Note:[/b] This warning is recommended together with [member "
+"EditorSettings.text_editor/completion/add_type_hints] to help achieve type "
+"safety."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当变量或参数没有静态类型，或函数没有静态"
+"返回类型时，会分别产生一个警告或一个错误。\n"
+"[b]注意：[/b]建议将该警告与 [member EditorSettings.text_editor/completion/"
+"add_type_hints] 一起使用，以帮助实现类型安全。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local constant is never used."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当一个局部常量从未被使用时，分别产生一个"
+"警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a function parameter is never used."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当一个函数参数从未使用时，会分别产生一个"
+"警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a private member variable is never used."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当一个私有成员变量从未被使用时，会分别产"
+"生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a signal is declared but never explicitly used in the class."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当信号在类中声明但从未明确使用时，会分别"
+"产生一个警告或一个错误。"
+
+msgid ""
+"When set to [b]Warn[/b] or [b]Error[/b], produces a warning or an error "
+"respectively when a local variable is unused."
+msgstr ""
+"设为 [b]Warn[/b] 或 [b]Error[/b] 时，当一个局部变量未被使用时，会分别产生一个"
+"警告或一个错误。"
+
 msgid ""
 "Message to be displayed before the backtrace when the engine crashes. By "
 "default, this message is only used in exported projects due to the editor-"
@@ -115386,6 +125339,32 @@ msgstr ""
 "[b]注意：[/b]该设置仅影响导出的项目，或者当项目从命令行运行时。在编辑器中，请"
 "改用 [member EditorSettings.run/window_placement/rect_custom_position] 的值。"
 
+msgid ""
+"Main window initial position.\n"
+"[code]0[/code] - \"Absolute\", [member display/window/size/initial_position] "
+"is used to set window position.\n"
+"[code]1[/code] - \"Primary Screen Center\".\n"
+"[code]3[/code] - \"Other Screen Center\", [member display/window/size/"
+"initial_screen] is used to set the screen.\n"
+"[code]4[/code] - \"Center of Screen With Mouse Pointer\".\n"
+"[code]5[/code] - \"Center of Screen With Keyboard Focus\".\n"
+"[b]Note:[/b] This setting only affects the exported project, or when the "
+"project is run from the command line. In the editor, the value of [member "
+"EditorSettings.run/window_placement/rect] is used instead."
+msgstr ""
+"主窗口的初始位置。\n"
+"[code]0[/code] - “Absolute（绝对位置）”，窗口位置用 [member display/window/"
+"size/initial_position] 设置。\n"
+"[code]1[/code] - “Primary Screen Center（主屏幕中心）”。\n"
+"[code]3[/code] - “Other Screen Center（其他屏幕中心）”，屏幕用 [member "
+"display/window/size/initial_screen] 设置。\n"
+"[code]4[/code] - “Center of Screen With Mouse Pointer（屏幕中心，带有鼠标指"
+"针）”。\n"
+"[code]5[/code] - “Center of Screen With Keyboard Focus（屏幕中心，带有键盘焦"
+"点）”。\n"
+"[b]注意：[/b]该设置仅影响导出的项目，或者当项目从命令行运行时。在编辑器中，请"
+"改用 [member EditorSettings.run/window_placement/rect] 的值。"
+
 msgid ""
 "Main window initial screen, this setting is used only if [member display/"
 "window/size/initial_position_type] is set to \"Other Screen Center\" "
@@ -115531,6 +125510,85 @@ msgstr ""
 "[member display/window/size/viewport_width]。在 iOS、Android 和 Web 上会忽略该"
 "设置。"
 
+msgid ""
+"Defines how the aspect ratio of the base size is preserved when stretching to "
+"fit the resolution of the window or screen.\n"
+"[code]\"ignore\"[/code]: Ignore the aspect ratio when stretching the screen. "
+"This means that the original resolution will be stretched to exactly fill the "
+"screen, even if it's wider or narrower. This may result in non-uniform "
+"stretching: things looking wider or taller than designed.\n"
+"[code]\"keep\"[/code]: Keep aspect ratio when stretching the screen. This "
+"means that the viewport retains its original size regardless of the screen "
+"resolution, and black bars will be added to the top/bottom of the screen "
+"(\"letterboxing\") or the sides (\"pillarboxing\").\n"
+"[code]\"keep_width\"[/code]: Keep aspect ratio when stretching the screen. If "
+"the screen is wider than the base size, black bars are added at the left and "
+"right (pillarboxing). But if the screen is taller than the base resolution, "
+"the viewport will be grown in the vertical direction (and more content will "
+"be visible at the bottom). You can also think of this as \"Expand "
+"Vertically\".\n"
+"[code]\"keep_height\"[/code]: Keep aspect ratio when stretching the screen. "
+"If the screen is taller than the base size, black bars are added at the top "
+"and bottom (letterboxing). But if the screen is wider than the base "
+"resolution, the viewport will be grown in the horizontal direction (and more "
+"content will be visible to the right). You can also think of this as \"Expand "
+"Horizontally\".\n"
+"[code]\"expand\"[/code]: Keep aspect ratio when stretching the screen, but "
+"keep neither the base width nor height. Depending on the screen aspect ratio, "
+"the viewport will either be larger in the horizontal direction (if the screen "
+"is wider than the base size) or in the vertical direction (if the screen is "
+"taller than the original size)."
+msgstr ""
+"定义在拉伸以适应窗口或屏幕分辨率时如何保持基本大小的纵横比。\n"
+"[code]\"ignore\"[/code]：拉伸屏幕时忽略纵横比。这意味着即使屏幕更宽或更窄，原"
+"始分辨率也会被拉伸以完全填满屏幕。这可能会导致拉伸不均匀：物体看起来比设计得更"
+"宽或更高。\n"
+"[code]\"keep\"[/code]：拉伸屏幕时保持纵横比。这意味着无论屏幕分辨率如何，视口"
+"都会保持其原始大小，并且会在屏幕顶部/底部（“信箱模式”）或两侧（“柱状模式”）添"
+"加黑边。\n"
+"[code]\"keep_width\"[/code]：拉伸屏幕时保持纵横比。如果屏幕比基本大小宽，则会"
+"在左右两侧添加黑边（柱状模式）。但如果屏幕比基本分辨率高，则视口会在垂直方向上"
+"扩展（并且底部会显示更多内容）。你也可以把它理解为“垂直扩展”。\n"
+"[code]\"keep_height\"[/code]：拉伸屏幕时保持纵横比。如果屏幕比基本大小高，则会"
+"在顶部和底部添加黑边（信箱模式）。但如果屏幕比基本分辨率宽，则视口会在水平方向"
+"上扩展（并且右侧会显示更多内容）。你也可以把它理解为“水平扩展”。\n"
+"[code]\"expand\"[/code]：拉伸屏幕时保持宽高比，但不保持基本宽度或高度。根据屏"
+"幕纵横比，视口将在水平方向（如果屏幕比基本大小宽）或垂直方向（如果屏幕比原始大"
+"小高）上更大。"
+
+msgid ""
+"Defines how the base size is stretched to fit the resolution of the window or "
+"screen.\n"
+"[code]\"disabled\"[/code]: No stretching happens. One unit in the scene "
+"corresponds to one pixel on the screen. In this mode, [member display/window/"
+"stretch/aspect] has no effect. Recommended for non-game applications.\n"
+"[code]\"canvas_items\"[/code]: The base size specified in width and height in "
+"the project settings is stretched to cover the whole screen (taking [member "
+"display/window/stretch/aspect] into account). This means that everything is "
+"rendered directly at the target resolution. 3D is unaffected, while in 2D, "
+"there is no longer a 1:1 correspondence between sprite pixels and screen "
+"pixels, which may result in scaling artifacts. Recommended for most games "
+"that don't use a pixel art aesthetic, although it is possible to use this "
+"stretch mode for pixel art games too (especially in 3D).\n"
+"[code]\"viewport\"[/code]: The size of the root [Viewport] is set precisely "
+"to the base size specified in the Project Settings' Display section. The "
+"scene is rendered to this viewport first. Finally, this viewport is scaled to "
+"fit the screen (taking [member display/window/stretch/aspect] into account). "
+"Recommended for games that use a pixel art aesthetic."
+msgstr ""
+"定义如何将基础大小进行拉伸，从而适应窗口或屏幕的分辨率。\n"
+"[code]\"disabled\"[/code]：不进行拉伸。场景中的一个单位对应屏幕上的一个像素。"
+"[member display/window/stretch/aspect] 在该模式下无效。推荐非游戏应用程序使"
+"用。\n"
+"[code]\"canvas_items\"[/code]：将项目设置中指定的基础大小拉伸至覆盖整个屏幕"
+"（会考虑 [member display/window/stretch/aspect]）。这样所有东西都是直接按照目"
+"标分辨率渲染的。3D 不受影响，但在 2D 中精灵的像素和屏幕像素就不再是 1:1 的关系"
+"了，缩放可能导致画面问题。推荐大多数非像素风的游戏使用，尽管像素风游戏也可以使"
+"用该拉伸模式（尤其是 3D）。\n"
+"[code]\"viewport\"[/code]：将根 [Viewport] 的大小设为项目设置中“显示”部分中指"
+"定的基础大小。场景会现在这个视口中渲染。最终会将该视口缩放至适合屏幕的尺寸（会"
+"考虑 [member display/window/stretch/aspect]）。推荐像素风游戏使用。"
+
 msgid ""
 "The scale factor multiplier to use for 2D elements. This multiplies the final "
 "scale factor determined by [member display/window/stretch/mode]. If using the "
@@ -115541,6 +125599,50 @@ msgstr ""
 "定的最终缩放系数相乘。如果使用的是 [b]Disabled[/b] 拉伸模式，那么这个缩放系数"
 "是原样使用的。可以通过调节这个数值来让 UI 则某些屏幕上更易于阅读。"
 
+msgid ""
+"The policy to use to determine the final scale factor for 2D elements. This "
+"affects how [member display/window/stretch/scale] is applied, in addition to "
+"the automatic scale factor determined by [member display/window/stretch/"
+"mode].\n"
+"[code]\"fractional\"[/code]: The scale factor will not be modified.\n"
+"[code]\"integer\"[/code]: The scale factor will be floored to an integer "
+"value, which means that the screen size will always be an integer multiple of "
+"the base viewport size. This provides a crisp pixel art appearance.\n"
+"[b]Note:[/b] When using integer scaling with a stretch mode, resizing the "
+"window to be smaller than the base viewport size will clip the contents. "
+"Consider preventing that by setting [member Window.min_size] to the same "
+"value as the base viewport size defined in [member display/window/size/"
+"viewport_width] and [member display/window/size/viewport_height]."
+msgstr ""
+"决定 2D 元素最终缩放系数的策略。会影响 [member display/window/stretch/scale] "
+"的使用，与 [member display/window/stretch/mode] 决定的自动缩放系数共同生效。\n"
+"[code]\"fractional\"[/code]：小数。不改变缩放系数。\n"
+"[code]\"integer\"[/code]：整数。将缩放系数向下取整，屏幕大小始终为基础视口大小"
+"的整数倍。能够显示锐利的像素风画面。\n"
+"[b]注意：[/b]使用整数缩放并设置拉伸模式时，将窗口大小调整得比基础视口大小更小"
+"会将内容进行裁剪。请考虑将 [member Window.min_size] 设为与 [member display/"
+"window/size/viewport_width] 和 [member display/window/size/viewport_height] 定"
+"义的基础视口大小一致，避免这种情况的发生。"
+
+msgid ""
+"If [code]true[/code], subwindows are embedded in the main window (this is "
+"also called single-window mode). Single-window mode can be faster as it does "
+"not need to create a separate window for every popup and tooltip, which can "
+"be a slow operation depending on the operating system and rendering method in "
+"use.\n"
+"If [code]false[/code], subwindows are created as separate windows (this is "
+"also called multi-window mode). This allows them to be moved outside the main "
+"window and use native operating system window decorations.\n"
+"This is equivalent to [member EditorSettings.interface/editor/"
+"single_window_mode] in the editor."
+msgstr ""
+"如果为 [code]true[/code]，则会将子窗口嵌入到主窗口中（也称为单窗口模式）。单窗"
+"口模式可能更快，因为无须为每个弹出项和工具提示都创建一个单独的窗口，根据操作系"
+"统和所使用的渲染方法的不同，创建窗口可能是很慢的操作。\n"
+"如果为 [code]false[/code]，则会为子窗口会创建单独的窗口（也称为多窗口模式）。"
+"该模式下能够将子窗口移动到主窗口之外，使用的也是操作系统窗口的装饰。\n"
+"等价于编辑器中的 [member EditorSettings.interface/editor/single_window_mode]。"
+
 msgid ""
 "Sets the V-Sync mode for the main game window. The editor's own V-Sync mode "
 "can be set using [member EditorSettings.interface/editor/vsync_mode].\n"
@@ -115634,6 +125736,12 @@ msgstr ""
 msgid "If [code]true[/code] importing of resources is run on multiple threads."
 msgstr "如果为 [code]true[/code]，则会多线程执行资源的导入。"
 
+msgid ""
+"Number of bits per audio sample written to the [code].avi[/code] file. Only "
+"16 and 32-bit are supported."
+msgstr ""
+"写入 [code].avi[/code] 文件的每个音频采样的比特数。目前仅支持 16 位和 32 位。"
+
 msgid ""
 "If [code]true[/code], requests V-Sync to be disabled when writing a movie "
 "(similar to setting [member display/window/vsync/vsync_mode] to [b]Disabled[/"
@@ -115935,6 +126043,32 @@ msgstr ""
 "[member ScrollContainer.scroll_deadzone]，它将用于所有 [ScrollContainer]，除非"
 "fug。"
 
+msgid ""
+"The minimum distance the mouse cursor must move while pressed before a drag "
+"operation begins in the default viewport. For custom viewports see [member "
+"Viewport.gui_drag_threshold]."
+msgstr ""
+"在默认视口中，鼠标光标按下后必须移动的最小距离，超过该距离才会开始拖动操作。对"
+"于自定义视口，请参阅 [member Viewport.gui_drag_threshold]。"
+
+msgid ""
+"Determines whether a [Control] should visually indicate focus when said focus "
+"is gained using a mouse or touch input.\n"
+"- [b]Never[/b] ([code]0[/code]) show the focused state for mouse/touch "
+"input.\n"
+"- [b]Control Supports Keyboard Input[/b] ([code]1[/code]) shows the focused "
+"state even when gained via mouse/touch input (similar to how browsers handle "
+"focus).\n"
+"- [b]Always[/b] ([code]2[/code]) show the focused state, even if said focus "
+"was gained via mouse/touch input."
+msgstr ""
+"确定当使用鼠标或触摸输入获得焦点时，[Control] 是否应在视觉上指示焦点。\n"
+"- [b]Never（从不）[/b]（[code]0[/code]）显示鼠标/触摸输入时的焦点状态。\n"
+"- [b]Control Supports Keyboard Input（控件支持键盘输入）[/b]（[code]1[/code]）"
+"显示焦点状态，即使通过鼠标/触摸输入获得焦点（类似于浏览器处理焦点的方式）。\n"
+"- [b]Always（始终）[/b]（[code]2[/code]）显示焦点状态，即使焦点是通过鼠标/触摸"
+"输入获得的。"
+
 msgid ""
 "If [code]true[/code], snaps [Control] node vertices to the nearest pixel to "
 "ensure they remain crisp even when the camera moves or zooms."
@@ -115942,9 +126076,43 @@ msgstr ""
 "如果为 [code]true[/code]，则将 [Control] 节点的顶点吸附到最近的像素，确保即便"
 "相机发生移动或缩放也能够保持锐利。"
 
+msgid ""
+"How to position the Cancel and OK buttons in the project's [AcceptDialog] "
+"windows. Different platforms have different conventions for this, which can "
+"be overridden through this setting.\n"
+"- [b]Auto[/b] follows the platform convention: OK first on Windows, KDE, and "
+"LXQt; Cancel first on macOS and other Linux desktop environments.\n"
+"- [b]Cancel First[/b] forces the Cancel/OK ordering.\n"
+"- [b]OK First[/b] forces the OK/Cancel ordering.\n"
+"To check if these buttons are swapped at runtime, use [method "
+"DisplayServer.get_swap_cancel_ok].\n"
+"[b]Note:[/b] This doesn't affect native dialogs such as the ones spawned by "
+"[method DisplayServer.dialog_show]."
+msgstr ""
+"如何在编辑器的 [AcceptDialog] 窗口中放置“取消”和“确定”按钮。不同的平台有不同的"
+"约定，但可以通过这个设置项来覆盖。\n"
+"- [b]Auto[/b] 遵守平台约定：在 Windows、KDE、LXQt 上确定在前，在 macOS 和其他 "
+"Linux 桌面环境中取消在前。\n"
+"- [b]Cancel First[/b] 强制为取消、确定的顺序。\n"
+"- [b]OK First[/b] 强制为确定、取消的顺序。\n"
+"要检查这些按钮在运行时中是否被调换位置，请使用 [method "
+"DisplayServer.get_swap_cancel_ok]。\n"
+"[b]注意：[/b]这不会影响原生对话框，例如由 [method DisplayServer.dialog_show] "
+"方法生成的对话框。"
+
 msgid "Maximum undo/redo history size for [TextEdit] fields."
 msgstr "[TextEdit] 字段的最大撤销/重做历史大小。"
 
+msgid ""
+"If set to [code]true[/code] and [member display/window/stretch/mode] is set "
+"to [code]\"canvas_items\"[/code], font and [DPITexture] oversampling is "
+"enabled in the main window. Use [member Viewport.oversampling] to control "
+"oversampling in other viewports and windows."
+msgstr ""
+"如果为 [code]true[/code] 且 [member display/window/stretch/mode] 为 [code]"
+"\"canvas_items\"[/code]，则会在主窗口启用字体和 [DPITexture] 的过采样。其他视"
+"口和窗口中请使用 [member Viewport.oversampling] 来控制过采样。"
+
 msgid ""
 "Path to a custom [Theme] resource file to use for the project ([code].theme[/"
 "code] or generic [code].tres[/code]/[code].res[/code] extension)."
@@ -116035,6 +126203,24 @@ msgstr ""
 "[b]注意：[/b]这项设置不影响项目中使用的自定义 [Font]。请改用[b]导入[/b]面板"
 "（见 [member ResourceImporterDynamicFont.subpixel_positioning]）。"
 
+msgid ""
+"The default scale factor for [Control]s, when not overridden by a [Theme].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the default theme scale at runtime, set [member ThemeDB.fallback_base_scale] "
+"instead. However, to adjust the scale of all 2D elements at runtime, it's "
+"preferable to use [member Window.content_scale_factor] on the root [Window] "
+"node instead (as this also affects overridden [Theme]s). See [url=$DOCS_URL/"
+"tutorials/rendering/multiple_resolutions.html]Multiple resolutions[/url] in "
+"the documentation for details."
+msgstr ""
+"当未被 [Theme] 覆盖时，[Control] 的默认缩放因子。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时中更改默认主题缩放比例，请改"
+"为设置 [member ThemeDB.fallback_base_scale]。但是，要在运行时中调整所有 2D 元"
+"素的缩放比例，最好在根 [Window] 节点上使用 [member "
+"Window.content_scale_factor]（因为这也会影响覆盖的 [Theme]）。有关详细信息，请"
+"参阅文档中的[url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]多分"
+"辨率[/url]部分。"
+
 msgid ""
 "LCD subpixel layout used for font anti-aliasing. See [enum "
 "TextServer.FontLCDSubpixelLayout]."
@@ -116094,6 +126280,19 @@ msgstr ""
 "[b]注意：[/b]默认的 [code]ui_*[/code] 动作是部分 [Control] 的内部逻辑所必需"
 "的，无法删除。但是可以修改分配给该动作的事件。"
 
+msgid ""
+"Default [InputEventAction] to close a dialog window.\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"用于关闭对话框窗口的默认 [InputEventAction]。\n"
+"[b]注意：[/b]默认的 [code]ui_*[/code] 动作无法移除，因为它们是多个 [Control] "
+"控件内部逻辑所必需的。但是，可以修改分配给该动作的事件。"
+
+msgid "macOS specific override for the shortcut to close a dialog window."
+msgstr "macOS 特有的用于关闭对话框窗口的快捷键覆盖。"
+
 msgid ""
 "Default [InputEventAction] to delete a color preset in a [ColorPicker].\n"
 "[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
@@ -116147,6 +126346,41 @@ msgstr ""
 "[b]注意：[/b]默认的 [code]ui_*[/code] 动作是部分 [Control] 的内部逻辑所必需"
 "的，无法删除。但是可以修改分配给该动作的事件。"
 
+msgid ""
+"Default [InputEventAction] to delete the selected file in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"用于在 [FileDialog] 中删除选定文件的默认 [InputEventAction]。\n"
+"[b]注意：[/b]默认的 [code]ui_*[/code] 动作无法移除，因为它们是多个 [Control] "
+"控件内部逻辑所必需的。但是，可以修改分配给该动作的事件。"
+
+msgid ""
+"Default [InputEventAction] to open file filter in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"用于在 [FileDialog] 中打开文件筛选器的默认 [InputEventAction] 。\n"
+"[b]注意：[/b]默认的 [code]ui_*[/code] 动作无法移除，因为它们是多个 [Control] "
+"控件内部逻辑所必需的。但是，可以修改分配给该动作的事件。"
+
+msgid ""
+"Default [InputEventAction] to focus path edit field in a [FileDialog].\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"用于在 [FileDialog] 中聚焦路径编辑字段的默认 [InputEventAction] 。\n"
+"[b]注意：[/b]默认的 [code]ui_*[/code] 动作无法移除，因为它们是多个 [Control] "
+"控件内部逻辑所必需的。但是，可以修改分配给该动作的事件。"
+
+msgid ""
+"macOS specific override for the shortcut to focus path edit field in "
+"[FileDialog]."
+msgstr "macOS 特有的用于在 [FileDialog] 中聚焦路径编辑字段的快捷键覆盖。"
+
 msgid ""
 "Default [InputEventAction] to refresh the contents of the current directory "
 "of a [FileDialog].\n"
@@ -118232,6 +128466,25 @@ msgstr ""
 "2D 导航地图的默认合并光栅化单元格缩放。见 [method "
 "NavigationServer2D.map_set_merge_rasterizer_cell_scale]。"
 
+msgid ""
+"Sets which navigation engine to use for 2D navigation.\n"
+"[b]DEFAULT[/b] is equivalent to [b]GodotNavigation2D[/b], but may change in "
+"future releases. Select an explicit implementation if you want to ensure that "
+"your project stays on the same engine.\n"
+"[b]GodotNavigation2D[/b] is Godot's internal 2D navigation engine.\n"
+"[b]Dummy[/b] is a 2D navigation server that does nothing and returns only "
+"dummy values, effectively disabling all 2D navigation functionality.\n"
+"Third-party modules can add other navigation engines to select with this "
+"setting."
+msgstr ""
+"设置用于 2D 导航的导航引擎。\n"
+"[b]DEFAULT[/b] 等价于 [b]GodotNavigation2D[/b]，但在未来的版本中可能会更改。如"
+"果希望确保项目始终使用相同的引擎，请选择明确的实现。\n"
+"[b]GodotNavigation2D[/b] 是 Godot 的内部 2D 导航引擎。\n"
+"[b]Dummy[/b] 是一个不执行任何操作、仅返回虚设值的 2D 导航服务器，实际上禁用了"
+"所有 2D 导航功能。\n"
+"第三方模块可以通过该设置添加其他可选择的导航引擎。"
+
 msgid ""
 "If enabled 2D navigation regions will use edge connections to connect with "
 "other navigation regions within proximity of the navigation map edge "
@@ -118295,6 +128548,25 @@ msgstr ""
 "3D 导航地图的默认合并光栅化单元格缩放。请参阅 [method "
 "NavigationServer3D.map_set_merge_rasterizer_cell_scale]。"
 
+msgid ""
+"Sets which navigation engine to use for 3D navigation.\n"
+"[b]DEFAULT[/b] is equivalent to [b]GodotNavigation3D[/b], but may change in "
+"future releases. Select an explicit implementation if you want to ensure that "
+"your project stays on the same engine.\n"
+"[b]GodotNavigation3D[/b] is Godot's internal 3D navigation engine.\n"
+"[b]Dummy[/b] is a 3D navigation server that does nothing and returns only "
+"dummy values, effectively disabling all 3D navigation functionality.\n"
+"Third-party modules can add other navigation engines to select with this "
+"setting."
+msgstr ""
+"设置用于 3D 导航的导航引擎。\n"
+"[b]DEFAULT[/b] 等价于 [b]GodotNavigation3D[/b]，但在未来的版本中可能会更改。如"
+"果希望确保项目始终使用相同的引擎，请选择明确的实现。\n"
+"[b]GodotNavigation3D[/b] 是 Godot 的内部 3D 导航引擎。\n"
+"[b]Dummy[/b] 是一个不执行任何操作、仅返回虚设值的 3D 导航服务器，实际上禁用了"
+"所有 3D 导航功能。\n"
+"第三方模块可以通过该设置添加其他可选择的导航引擎。"
+
 msgid ""
 "If enabled 3D navigation regions will use edge connections to connect with "
 "other navigation regions within proximity of the navigation map edge "
@@ -118403,9 +128675,25 @@ msgstr ""
 msgid "Timeout (in seconds) for connection attempts using TCP."
 msgstr "使用TCP的连接尝试的超时（以秒为单位）。"
 
+msgid "Timeout (in seconds) for connection attempts using UNIX domain socket."
+msgstr "使用 UNIX 域套接字连接尝试的超时（以秒为单位）。"
+
 msgid "Maximum size (in kiB) for the [WebRTCDataChannel] input buffer."
 msgstr "[WebRTCDataChannel] 输入缓冲区的最大尺寸（单位为 kiB）。"
 
+msgid ""
+"The CA certificates bundle to use for TLS connections. If this is set to a "
+"non-empty value, this will [i]override[/i] Godot's default [url=https://"
+"github.com/godotengine/godot/blob/master/thirdparty/certs/ca-"
+"bundle.crt]Mozilla certificate bundle[/url]. If left empty, the default "
+"certificate bundle will be used.\n"
+"If in doubt, leave this setting empty."
+msgstr ""
+"用于 TLS 连接的 CA 证书包。如果设置为非空值，这将[i]覆盖[/i] Godot 默认的 "
+"[url=https://github.com/godotengine/godot/blob/master/thirdparty/certs/ca-"
+"bundle.crt]Mozilla 证书包[/url]。如果留空，将使用默认的证书包。\n"
+"如果有疑问，请将此设置留空。"
+
 msgid ""
 "The default rotational motion damping in 2D. Damping is used to gradually "
 "slow down physical objects over time. RigidBodies will fall back to this "
@@ -118826,6 +129114,30 @@ msgstr ""
 "阻尼值都会有这种现象。要恢复此前的感觉，就需要修改阻尼值。修改多少并不成比例，"
 "需要根据实际情况调整。"
 
+msgid ""
+"Sets which physics engine to use for 3D physics.\n"
+"[b]DEFAULT[/b] is currently equivalent to [b]GodotPhysics3D[/b], but may "
+"change in future releases. Select an explicit implementation if you want to "
+"ensure that your project stays on the same engine.\n"
+"[b]GodotPhysics3D[/b] is Godot's internal 3D physics engine.\n"
+"[b]Jolt Physics[/b] is an alternative physics engine that is generally faster "
+"and more reliable than [b]GodotPhysics3D[/b]. Jolt Physics is the default for "
+"projects created starting in Godot 4.6.\n"
+"[b]Dummy[/b] is a 3D physics server that does nothing and returns only dummy "
+"values, effectively disabling all 3D physics functionality.\n"
+"Third-party extensions and modules can add other physics engines to select "
+"with this setting."
+msgstr ""
+"设置用于 3D 物理的物理引擎。\n"
+"[b]DEFAULT[/b] 目前等价于 [b]GodotPhysics3D[/b]，但在未来的版本中可能会有所更"
+"改。如果希望确保项目始终使用相同的引擎，请选择明确的实现。\n"
+"[b]GodotPhysics3D[/b] 是 Godot 的内部 3D 物理引擎。\n"
+"[b]Jolt Physics[/b] 是备选的物理引擎，通常比 [b]GodotPhysics3D[/b] 更快更可"
+"靠。从 Godot 4.6 开始创建的项目默认使用 Jolt Physics。\n"
+"[b]Dummy[/b] 是一个不执行任何操作、仅返回虚设值的 3D 物理服务器，实际上禁用了"
+"所有 3D 物理功能。\n"
+"第三方扩展和模块可以通过该设置添加其他可选择的物理引擎。"
+
 msgid ""
 "The approach used for 3D scene traversal when physics interpolation is "
 "enabled.\n"
@@ -119021,6 +129333,54 @@ msgstr ""
 "[b]注意：[/b]该属性仅在项目启动时读取。 要在运行时更改物理抖动修复，请改为设"
 "置 [member Engine.physics_jitter_fix]。"
 
+msgid ""
+"The number of fixed iterations per second. This controls how often physics "
+"simulation and the [method Node._physics_process] method are run.\n"
+"CPU usage scales approximately with the physics tick rate. However, at very "
+"low tick rates (usually below 30), physics behavior can break down. Input can "
+"also become less responsive at low tick rates as there can be a gap between "
+"input being registered, and the response on the next physics tick. High tick "
+"rates give more accurate physics simulation, particularly for fast moving "
+"objects. For example, racing games may benefit from increasing the tick rate "
+"above the default 60.\n"
+"See also [member application/run/max_fps].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the physics FPS at runtime, set [member Engine.physics_ticks_per_second] "
+"instead.\n"
+"[b]Note:[/b] Only [member physics/common/max_physics_steps_per_frame] physics "
+"ticks may be simulated per rendered frame at most. If more physics ticks have "
+"to be simulated per rendered frame to keep up with rendering, the project "
+"will appear to slow down (even if [code]delta[/code] is used consistently in "
+"physics calculations). Therefore, it is recommended to also increase [member "
+"physics/common/max_physics_steps_per_frame] if increasing [member physics/"
+"common/physics_ticks_per_second] significantly above its default value.\n"
+"[b]Note:[/b] Consider enabling [url=$DOCS_URL/tutorials/physics/interpolation/"
+"index.html]physics interpolation[/url] if you change [member physics/common/"
+"physics_ticks_per_second] to a value that is not a multiple of [code]60[/"
+"code]. Using physics interpolation will avoid jittering when the monitor "
+"refresh rate and physics update rate don't exactly match."
+msgstr ""
+"每秒执行的固定迭代次数。用于控制物理仿真和 [method Node._physics_process] 的执"
+"行频率。\n"
+"CPU 使用率大致与物理周期速率成正比。然而，在周期速率非常低（通常低于 30）的情"
+"况下，物理行为可能损坏。在低周期速率下，输入响应也可能变得迟钝，因为输入被注册"
+"和在下一个物理周期做出响应之间会存在延迟。较高的周期速率可以提供更精确的物理模"
+"拟，尤其对于快速移动的物体而言更是如此。例如，赛车游戏可以通过将刷新率提高到高"
+"于默认值 60 来获得更好的体验。\n"
+"另见 [member application/run/max_fps]。\n"
+"[b]注意：[/b]这个属性只在项目启动时读取。要在运行时改变物理 FPS，请改为设置 "
+"[member Engine.physics_ticks_per_second]。\n"
+"[b]注意：[/b]每个渲染帧最多只能模拟 [member physics/common/"
+"max_physics_steps_per_frame] 个物理周期。如果为了追赶渲染，需要在每个渲染帧中"
+"模拟更多物理周期，游戏看上去会是降速的（即便在物理计算中始终使用 [code]delta[/"
+"code]）。因此，如果增大了 [member physics/common/physics_ticks_per_second]，而"
+"且远大于默认值，那么建议将 [member physics/common/"
+"max_physics_steps_per_frame] 也调大。\n"
+"[b]注意：[/b]如果将 [member physics/common/physics_ticks_per_second] 的值更改"
+"为不是 [code]60[/code] 的倍数，请考虑启用 [url=$DOCS_URL/tutorials/physics/"
+"interpolation/index.html]物理插值[/url]。使用物理插值可以避免显示器刷新率和物"
+"理更新率不完全匹配时出现抖动。"
+
 msgid ""
 "The maximum angle, in radians, between two adjacent triangles in a "
 "[ConcavePolygonShape3D] or [HeightMapShape3D] for which the edge between "
@@ -119602,6 +129962,39 @@ msgstr ""
 "也越高。\n"
 "[b]注意：[/b]该属性仅在项目启动时读取，目前没有办法在运行时更改。"
 
+msgid ""
+"If [code]true[/code], uses a fast dithering filter just before transforming "
+"floating point color values to integer color values to make banding "
+"significantly less visible. Debanding is applied at different steps of the "
+"rendering process depending on the rendering method and [member rendering/"
+"viewport/hdr_2d] setting.\n"
+"In some cases, debanding may introduce a slightly noticeable dithering "
+"pattern. It's recommended to enable debanding only when actually needed since "
+"the dithering pattern will make lossless-compressed screenshots larger.\n"
+"[b]Note:[/b] This property is only read when the project starts and "
+"configures [method RenderingServer.material_set_use_debanding] and [member "
+"Viewport.use_debanding] of the root [Viewport]. When [member rendering/"
+"viewport/hdr_2d] is disabled, you should additionally set the [member "
+"Viewport.use_debanding] of other viewports in your project. To set debanding "
+"at run-time, the property that should be set depends on the renderer: "
+"Forward+ only uses [member Viewport.use_debanding] and Mobile uses both "
+"[method RenderingServer.material_set_use_debanding] and [member "
+"Viewport.use_debanding]."
+msgstr ""
+"如果为 [code]true[/code]，则在将浮点颜色值转换为整数颜色值之前使用快速抖动滤"
+"镜，以显著减少色带现象。去色带处理会在渲染过程的不同阶段应用，具体取决于渲染方"
+"法和 [member rendering/viewport/hdr_2d] 设置项。\n"
+"在某些情况下，去条带处理可能会引入轻微可见的抖动图案。建议仅在实际需要时启用去"
+"条带处理，因为抖动图案会使无损压缩的截图变大。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取，并用于配置根 [Viewport] 的 [method "
+"RenderingServer.material_set_use_debanding] 和 [member "
+"Viewport.use_debanding]。当 [member rendering/viewport/hdr_2d] 被禁用时，还需"
+"要设置项目中其他视口的 [member Viewport.use_debanding] 属性。要在运行时中设置"
+"去色带功能，需要设置的属性取决于渲染器：Forward+ 仅使用 [member "
+"Viewport.use_debanding]，而 Mobile 则同时使用 [method "
+"RenderingServer.material_set_use_debanding] 和 [member "
+"Viewport.use_debanding]。"
+
 msgid ""
 "Enables temporal antialiasing for the default screen [Viewport]. TAA works by "
 "jittering the camera and accumulating the images of the last rendered frames, "
@@ -119763,6 +130156,16 @@ msgstr ""
 "由于性能或驱动程序支持问题，[member rendering/environment/glow/upscale_mode] "
 "在移动设备上的低端覆盖项。"
 
+msgid ""
+"If [code]true[/code], screen-space reflections will be rendered at half size "
+"and then upscaled before being added to the scene. This is faster but may "
+"look pixelated or cause flickering. If [code]false[/code], screen-space "
+"reflections will be rendered at full size."
+msgstr ""
+"如果为 [code]true[/code]，屏幕空间反射将以一半大小渲染，然后在被添加到场景之前"
+"放大。这更快但可能会出现像素化或闪烁。如果为 [code]false[/code]，则屏幕空间反"
+"射将以全尺寸渲染。"
+
 msgid ""
 "Quality target to use when [member rendering/environment/ssao/quality] is set "
 "to [code]Ultra[/code]. A value of [code]0.0[/code] provides a quality and "
@@ -120870,6 +131273,41 @@ msgstr ""
 msgid "If [code]true[/code], reduces reflections based on ambient light."
 msgstr "如果为 [code]true[/code]，则会减少基于环境光的反射。"
 
+msgid ""
+"Sets the renderer that will be used by the project. Options are:\n"
+"[b]forward_plus[/b] (Forward+): High-end renderer designed for desktop "
+"devices. Has a higher base overhead, but scales well with complex scenes. Not "
+"suitable for older devices or mobile.\n"
+"[b]mobile[/b] (Mobile): Modern renderer designed for mobile devices. Has a "
+"lower base overhead than Forward+, but does not scale as well to large scenes "
+"with many elements.\n"
+"[b]gl_compatibility[/b] (Compatibility): Low-end renderer designed for older "
+"devices. Based on the limitations of the OpenGL 3.3 / OpenGL ES 3.0 / WebGL 2 "
+"APIs. Lighting calculations are performed on nonlinear sRGB-encoded color "
+"data, which produces inaccurate results that may look acceptable for some "
+"games.\n"
+"This can be overridden using the [code]--rendering-method <method>[/code] "
+"command line argument.\n"
+"[b]Note:[/b] The actual rendering method may be automatically changed by the "
+"engine as a result of a fallback, or a user-specified command line argument. "
+"To get the actual rendering method that is used at runtime, use [method "
+"RenderingServer.get_current_rendering_method] instead of reading this project "
+"setting's value."
+msgstr ""
+"设置项目使用的渲染器。选项有：\n"
+"[b]forward_plus[/b]（Forward+）：为桌面设备设计的高端渲染器。有较高的基础开"
+"销，但能够很好地扩展到复杂的场景。不适合老旧设备和移动设备。\n"
+"[b]mobile[/b]（移动）：为移动设备设计的现代渲染器。基础开销比 Forward+ 低，但"
+"在处理有许多元素的大型场景时，扩展性并不理想。\n"
+"[b]gl_compatibility[/b]（兼容）：为老旧设备设计的低端渲染器。基于 OpenGL 3.3/ "
+"OpenGL ES 3.0 / WebGL 2 API 的限制。光照计算是在非线性 sRGB 编码的颜色数据上进"
+"行的，这会产生不准确的结果，尽管对于某些游戏来说，这些结果看起来可能可以接"
+"受。\n"
+"可以使用 [code]--rendering-method <method>[/code] 命令行参数覆盖。\n"
+"[b]注意：[/b]实际的渲染方法可能会因回退或用户指定的命令行参数而被引擎自动更"
+"改。要获取运行时使用的实际渲染方法，请使用 [method "
+"RenderingServer.get_current_rendering_method]，不该读取该项目设置的值。"
+
 msgid ""
 "Override for [member rendering/renderer/rendering_method] on mobile devices."
 msgstr "移动设备的 [member rendering/renderer/rendering_method] 覆盖项。"
@@ -120877,6 +131315,38 @@ msgstr "移动设备的 [member rendering/renderer/rendering_method] 覆盖项
 msgid "Override for [member rendering/renderer/rendering_method] on web."
 msgstr "Web 平台的 [member rendering/renderer/rendering_method] 覆盖项。"
 
+msgid ""
+"Version code of the [url=https://devblogs.microsoft.com/directx/"
+"directx12agility/]Direct3D 12 Agility SDK[/url] to use "
+"([code]D3D12SDKVersion[/code]). This must match the [i]minor[/i] version that "
+"is installed next to the editor binary and in the export templates directory "
+"for the current editor version. For example, if you have [code]1.618.5[/code] "
+"installed, you need to input [code]618[/code] here."
+msgstr ""
+"要使用的 [url=https://devblogs.microsoft.com/directx/"
+"directx12agility/]Direct3D 12 Agility SDK[/url] 的版本代码"
+"（[code]D3D12SDKVersion[/code]）。该代码必须与安装在编辑器二进制文件旁边的[i]"
+"次要[/i]版本以及当前编辑器版本的导出模板目录中的版本相匹配。例如，如果安装了 "
+"[code]1.618.5[/code]，则需要在此处输入 [code]618[/code]。"
+
+msgid ""
+"The number of entries in the resource descriptor heap the Direct3D 12 "
+"rendering driver uses for most rendering operations.\n"
+"Depending on the complexity of scenes, this value may be lowered or may need "
+"to be raised."
+msgstr ""
+"Direct3D 12 渲染驱动程序用于大多数渲染操作的资源描述符堆中的条目数。\n"
+"这个值可能会降低，也可能需要提高，具体取决于场景的复杂度。"
+
+msgid ""
+"The number of entries in the sampler descriptor heap the Direct3D 12 "
+"rendering driver uses for most rendering operations.\n"
+"Depending on the complexity of scenes, this value may be lowered or may need "
+"to be raised."
+msgstr ""
+"Direct3D 12 渲染驱动程序用于大多数渲染操作的采样器描述符堆中的条目数。\n"
+"这个值可能会降低，也可能需要提高，具体取决于场景的复杂度。"
+
 msgid ""
 "Sets the driver to be used by the renderer when using a RenderingDevice-based "
 "renderer like the Forward+ or Mobile renderers. Editing this property has no "
@@ -120981,6 +131451,66 @@ msgstr ""
 "仅支持一个选项：\n"
 "- [code]metal[/code]（默认），使用原生驱动程序的 Metal。"
 
+msgid ""
+"Windows override for [member rendering/rendering_device/driver].\n"
+"Two options are supported:\n"
+"- [code]vulkan[/code] (default), Vulkan from native drivers. If [member "
+"rendering/rendering_device/fallback_to_vulkan] is enabled, this is used as a "
+"fallback if Direct3D 12 is not supported.\n"
+"- [code]d3d12[/code], Direct3D 12 from native drivers. If [member rendering/"
+"rendering_device/fallback_to_d3d12] is enabled, this is used as a fallback if "
+"Vulkan is not supported.\n"
+"[b]Note:[/b] Starting with Godot 4.6, new projects are configured by default "
+"to use [code]d3d12[/code] on Windows. Projects created before Godot 4.6 keep "
+"[code]vulkan[/code] for compatibility reasons, but it is recommended to "
+"switch them manually to [code]d3d12[/code]."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 Windows 的覆盖项。\n"
+"支持两个选项：\n"
+"- [code]vulkan[/code]（默认），使用原生驱动程序的 Vulkan。如果启用了 [member "
+"rendering/rendering_device/fallback_to_vulkan]，则在不支持 Direct3D 12 时将作"
+"为回退使用。\n"
+"- [code]d3d12[/code]，使用原生驱动程序的 Direct3D 12。如果启用了 [member "
+"rendering/rendering_device/fallback_to_d3d12]，则在不支持 Vulkan 时将作为回退"
+"使用。\n"
+"[b]注意：[/b]从 Godot 4.6 开始，新项目默认配置为在 Windows 上使用 "
+"[code]d3d12[/code]。出于兼容性考虑，在 Godot 4.6 之前创建的项目仍然使用 "
+"[code]vulkan[/code]，但建议手动将其切换到 [code]d3d12[/code]。"
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to Direct3D 12 if "
+"Vulkan is not supported. The fallback is always attempted regardless of this "
+"setting if Vulkan driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward+ 渲染器会在不支持 Vulkan 时回退到 "
+"Direct3D 12。如果在编译时禁用了 Vulkan 驱动程序支持则会始终尝试回退，不考虑该"
+"设置。\n"
+"[b]注意：[/b]该设置仅在 Windows 上实现。"
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to OpenGL 3 if "
+"Direct3D 12, Metal, and Vulkan are not supported.\n"
+"[b]Note:[/b] This setting is implemented on Windows, Android, macOS, iOS, and "
+"Linux/X11."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward+ 渲染器在不支持 Direct3D 12、Metal、"
+"Vulkan 时会回退到 OpenGL 3。\n"
+"[b]注意：[/b]该设置在 Windows、Android、macOS、iOS、Linux/X11 上实现。"
+
+msgid ""
+"If [code]true[/code], the Forward+ renderer will fall back to Vulkan if "
+"Direct3D 12 (on Windows) or Metal (on macOS x86_64) are not supported. The "
+"fallback is always attempted regardless of this setting if Direct3D 12 "
+"(Windows) or Metal (macOS) driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented on Windows and macOS."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward+ 渲染器在不支持 Direct3D 12（在 Windows "
+"上）或 Metal（在 macOS x86_64 上）时会回退到 Vulkan。如果编译时禁用了 "
+"Direct3D 12（Windows）或 Metal（macOS）驱动程序支持，则会始终尝试回退，不考虑"
+"该设置。\n"
+"[b]注意：[/b]该设置在 Windows 和 macOS 上实现。"
+
 msgid ""
 "Enable the pipeline cache that is saved to disk if the graphics API supports "
 "it.\n"
@@ -121073,6 +131603,42 @@ msgstr ""
 "响。\n"
 "[b]注意：[/b]该属性仅在项目启动时读取。目前无法在运行时更改该值。"
 
+msgid ""
+"The number of images the swapchain will consist of (back buffers + front "
+"buffer).\n"
+"[code]2[/code] corresponds to double-buffering and [code]3[/code] to triple-"
+"buffering.\n"
+"Double-buffering may give you the lowest lag/latency but if V-Sync is on and "
+"the system can't render at 60 fps, the framerate will go down in multiples of "
+"it (e.g. 30 fps, 15, 7.5, etc.). Triple buffering gives you higher framerate "
+"(specially if the system can't reach a constant 60 fps) at the cost of up to "
+"1 frame of latency, with [constant DisplayServer.VSYNC_ENABLED] (FIFO).\n"
+"Use double-buffering with [constant DisplayServer.VSYNC_ENABLED]. Triple-"
+"buffering is a must if you plan on using [constant "
+"DisplayServer.VSYNC_MAILBOX] mode.\n"
+"Try the [url=https://darksylinc.github.io/vsync_simulator/]V-Sync Simulator[/"
+"url], an interactive interface that simulates presentation to better "
+"understand how it is affected by different variables under various "
+"conditions.\n"
+"[b]Note:[/b] Changes to this setting will only be applied on startup or when "
+"the swapchain is recreated (e.g. when setting the V-Sync mode).\n"
+"[b]Note:[/b] Some platforms may restrict the actual value."
+msgstr ""
+"交换链将包含的图像数量（后台缓冲区 + 前台缓冲区）。\n"
+"[code]2[/code] 对应双缓冲，[code]3[/code] 对应三缓冲。\n"
+"双缓冲可能会给你带来最低的滞后/延迟，但如果垂直同步打开并且系统无法以 60 fps "
+"渲染，则帧率将以它的倍数下降（例如 30 fps、15、7.5 等） 。三重缓冲可为你提供更"
+"高的帧率（特别是在系统无法达到恒定 60 fps 的情况下），其代价是 [constant "
+"DisplayServer.VSYNC_ENABLED]（FIFO）时最多 1 帧延迟。\n"
+"将双缓冲与 [constant DisplayServer.VSYNC_ENABLED] 结合使用。如果你计划使用 "
+"[constant DisplayServer.VSYNC_MAILBOX] 模式，则必须使用三重缓冲。\n"
+"尝试使用[url=https://darksylinc.github.io/vsync_simulator/]垂直同步模拟器[/"
+"url]，这是一个交互式界面，可以模拟演示，以更好地了解不同条件下不同变量的影"
+"响。\n"
+"[b]注意：[/b]该设置项的更改仅在启动时或重新创建交换链时生效（例如，设置垂直同"
+"步模式时）。\n"
+"[b]注意：[/b]某些平台可能会限制实际值。"
+
 msgid ""
 "The number of descriptors per pool. Godot's Vulkan backend uses linear pools "
 "for descriptors that will be created and destroyed within a single frame. "
@@ -121347,6 +131913,14 @@ msgstr ""
 "如果为 [code]true[/code]，纹理导入器将使用 PNG 格式导入无损纹理。否则默认使用 "
 "WebP。"
 
+msgid ""
+"If [code]true[/code], the GPU texture compressor will cache the local "
+"RenderingDevice and its resources (shaders and pipelines), making subsequent "
+"imports faster at the cost of increased memory usage."
+msgstr ""
+"如果为 [code]true[/code]，则 GPU 纹理压缩器会缓存本地 RenderingDevice 及其资源"
+"（着色器和管道），从而加快后续导入速度，但会增加内存使用量。"
+
 msgid ""
 "If [code]true[/code], the texture importer will utilize the GPU for "
 "compressing textures, improving the import time of large images.\n"
@@ -121430,6 +132004,31 @@ msgstr ""
 "无损 WebP 的默认压缩系数。解压速度通常不受压缩系数的影响。支持的值为 0 到 "
 "100。"
 
+msgid ""
+"If [code]true[/code], enables [member Viewport.use_hdr_2d] on the root "
+"Viewport. 2D rendering will use a high dynamic range (HDR) [code]RGBA16[/"
+"code] format framebuffer. Additionally, 2D rendering will be performed on "
+"linear values and will be converted using the appropriate transfer function "
+"immediately before blitting to the screen.\n"
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped to the [code]0-1[/code] range and can be used in 3D rendering "
+"without color encoding adjustments. This allows 2D rendering to take "
+"advantage of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients.\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"HDR 2D at runtime, set [member Viewport.use_hdr_2d] on the root [Viewport]."
+msgstr ""
+"如果为 [code]true[/code]，则在根 Viewport 上启用 [member "
+"Viewport.use_hdr_2d]。2D 渲染将使用高动态范围（HDR）[code]RGBA16[/code] 格式的"
+"帧缓冲区。此外，2D 渲染将在线性值下进行，并在位块传输到屏幕之前立即使用适当的"
+"传输函数进行转换。\n"
+"实际上，这意味着 Viewport 的最终结果不会被限制在 [code]0-1[/code] 范围内，无需"
+"调整颜色编码即可在 3D 渲染中使用。这使得 2D 渲染能够利用需要高动态范围的效果"
+"（例如 2D 辉光），并显著改善需要高度详细渐变的效果的外观。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时开关 HDR 2D，请在根 "
+"[Viewport] 上设置 [member Viewport.use_hdr_2d]。"
+
 msgid ""
 "If [code]true[/code], enables [member Viewport.transparent_bg] on the root "
 "viewport. This allows per-pixel transparency to be effective after also "
@@ -121498,6 +132097,15 @@ msgstr ""
 "个值是 [code]0.3[/code]，那么就会为低优先级任务保留 3 个工作线程。实际的取值不"
 "会超过 CPU 核心数减一，如果可能，至少会有一个专门用于低优先级任务的线程。"
 
+msgid ""
+"Maximum number of threads to be used by [WorkerThreadPool]. On Web, a value "
+"of [code]-1[/code] means [code]1[/code]. On other platforms, it means all "
+"[i]logical[/i] CPU cores available (see [method OS.get_processor_count])."
+msgstr ""
+"[WorkerThreadPool] 所使用的最大线程数。在 Web 平台上，值为 [code]-1[/code] 表"
+"示 [code]1[/code]。在其他平台上，表示所有可用的[i]逻辑[/i] CPU 内核（见 "
+"[method OS.get_processor_count]）。"
+
 msgid ""
 "If [code]true[/code], enables the analog threshold binding modifier if "
 "supported by the XR runtime."
@@ -121544,6 +132152,16 @@ msgid ""
 "platform, additional export configuration may be needed."
 msgstr "指定是否为该项目启用眼动追踪。根据平台的不同，可能需要额外的导出配置。"
 
+msgid ""
+"If [code]true[/code] the frame synthesis extension will be activated if "
+"supported by the platform.\n"
+"[b]Note:[/b] This feature should not be enabled in conjunction with "
+"Application Space Warp, if supported this replaces ASW."
+msgstr ""
+"如果为 [code]true[/code]，则如果平台支持，帧合成扩展功能将被激活。\n"
+"[b]注意：[/b]该功能不应与应用程序空间扭曲（Application Space Warp）同时启用；"
+"如果支持，该功能将取代 ASW。"
+
 msgid ""
 "If [code]true[/code] the hand interaction profile extension will be activated "
 "if supported by the platform."
@@ -121609,6 +132227,135 @@ msgstr ""
 "如果为 [code]true[/code]，则在渲染模型扩展可用时启用该扩展。\n"
 "[b]注意：[/b]与核心 OpenXR 渲染模型扩展相关，与供应商渲染模型扩展无关。"
 
+msgid ""
+"The April Tag marker types the built-in marker tracking is set to recognize "
+"(if April Tag marker tracking is available and enabled)."
+msgstr ""
+"April Tag 标记类型，内置标记跟踪被设置以识别（如果 April Tag 标记跟踪可用且已"
+"启用）。"
+
+msgid ""
+"The ArUco marker types the built-in marker tracking is set to recognize (if "
+"ArUco marker tracking is available and enabled)."
+msgstr ""
+"ArUco 标记类型，内置标记跟踪被设置以识别（如果 ArUco 标记跟踪可用且已启用）。"
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling anchors. "
+"Godot will query (persistent) anchors and manage [OpenXRAnchorTracker] "
+"instances for you. If disabled you'll need to create your own spatial and "
+"persistence context and perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that spatial anchors are supported "
+"and enabled."
+msgstr ""
+"如果为 [code]true[/code]，则启用用于处理锚点的内置逻辑。Godot 将查询（持久化）"
+"锚点并管理 [OpenXRAnchorTracker] 实例。如果禁用，则需要创建自己的空间和持久化"
+"上下文，并执行自己的发现查询。\n"
+"[b]注意：[/b]该功能要求支持并启用空间锚点。"
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling marker "
+"tracking. Godot will query markers and manage [OpenXRMarkerTracker] instances "
+"for you. If disabled you'll need to create your own spatial context and "
+"perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that marker tracking is supported "
+"and enabled."
+msgstr ""
+"如果为 [code]true[/code]，则启用用于处理标记跟踪的内置逻辑。Godot 将查询标记并"
+"管理 [OpenXRMarkerTracker] 实例。如果禁用，则需要创建自己的空间上下文并执行自"
+"己的发现查询。\n"
+"[b]注意：[/b]该功能需要标记跟踪功能得到支持并已启用。"
+
+msgid ""
+"If [code]true[/code], we enable the built-in logic for handling plane "
+"detection. Godot will query detected planes (walls, floors, ceilings, etc.) "
+"and manage [OpenXRPlaneTracker] instances for you. If disabled you'll need to "
+"create your own spatial context and perform your own discovery queries.\n"
+"[b]Note:[/b] This functionality requires that plane tracking is supported and "
+"enabled."
+msgstr ""
+"如果为 [code]true[/code]，则启用用于处理平面检测的内置逻辑。Godot 将查询检测到"
+"的平面（墙壁、地板、天花板等）并管理 [OpenXRPlaneTracker] 实例。如果禁用，则需"
+"要创建自己的空间上下文并执行自己的发现查询。\n"
+"[b]注意：[/b]该功能需要平面跟踪功能得到支持且已启用。"
+
+msgid ""
+"If [code]true[/code], support for the marker tracking extension is requested. "
+"If supported, you will be able to query information about markers detected by "
+"the XR runtime, e.g. QR codes, aruca markers and april tags.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and marker "
+"tracking extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则请求支持标记跟踪扩展。如果支持，则将能够查询 XR 运"
+"行时检测到的标记信息，例如二维码、Aruco 标记和 AprilTag 标记。\n"
+"[b]注意：[/b]这要求 XR 运行时支持 OpenXR 空间实体和标记跟踪扩展。如果不支持，"
+"则该设置项将被忽略。必须启用 [member xr/openxr/extensions/spatial_entity/"
+"enabled] 才能使用该设置项。"
+
+msgid ""
+"If [code]true[/code], support for the persistent anchors extension is "
+"requested. If supported, you will be able to store spatial anchors and they "
+"will be restored on application startup.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities, spatial anchors, "
+"and spatial persistence extensions are supported by the XR runtime. If not "
+"supported this setting will be ignored. [member xr/openxr/extensions/"
+"spatial_entity/enabled] and [member xr/openxr/extensions/spatial_entity/"
+"enable_spatial_anchors] must be enabled for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则请求支持持久锚点扩展。如果支持，则将能够存储空间锚"
+"点，并且它们将在应用程序启动时恢复。\n"
+"[b]注意：[/b]这要求 XR 运行时支持 OpenXR 空间实体、空间锚点和空间持久性扩展。"
+"如果不支持，则该设置项将被忽略。必须启用 [member xr/openxr/extensions/"
+"spatial_entity/enabled] 和 [member xr/openxr/extensions/spatial_entity/"
+"enable_spatial_anchors] 才能使用该设置项。"
+
+msgid ""
+"If [code]true[/code], support for the plane tracking extension is requested. "
+"If supported, you will be able to query information about planes detected by "
+"the XR runtime, e.g. walls, floors, etc.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and plane "
+"tracking extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则请求支持平面跟踪扩展。如果支持，则将能够查询 XR 运"
+"行时检测到的平面信息，例如墙壁、地板等。\n"
+"[b]注意：[/b]这要求 XR 运行时支持 OpenXR 空间实体和平面跟踪扩展。如果不支持，"
+"则该设置项将被忽略。必须启用 [member xr/openxr/extensions/spatial_entity/"
+"enabled] 才能使用该设置项。"
+
+msgid ""
+"If [code]true[/code], support for the spatial anchors extension is requested. "
+"If supported, you will be able to register anchor locations in the real world "
+"that the XR runtime will adjust as needed and/or potentially share with other "
+"headsets.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities and spatial "
+"anchors extensions are supported by the XR runtime. If not supported this "
+"setting will be ignored. [member xr/openxr/extensions/spatial_entity/enabled] "
+"must be enabled for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则请求支持空间锚点扩展。如果支持，则将能够在现实世界"
+"中注册锚点位置，XR 运行时会根据需要调整这些位置，并/或可能与其他头显设备共享这"
+"些位置。\n"
+"[b]注意：[/b]这要求 XR 运行时支持 OpenXR 空间实体和空间锚点扩展。如果不支持，"
+"则该设置项将被忽略。必须启用 [member xr/openxr/extensions/spatial_entity/"
+"enabled] 才能使用该设置项。"
+
+msgid ""
+"If [code]true[/code], support for the spatial entity extension is requested. "
+"If supported, you will be able to access spatial information about the real "
+"environment around you. What information is available is dependent on "
+"additional extensions.\n"
+"[b]Note:[/b] This requires that the OpenXR spatial entities extension is "
+"supported by the XR runtime. If not supported this setting will be ignored."
+msgstr ""
+"如果为 [code]true[/code]，则请求支持空间实体扩展。如果支持，则将能够访问周围真"
+"实环境的空间信息。具体可用的信息取决于其他扩展。\n"
+"[b]注意：[/b]这要求 XR 运行时支持 OpenXR 空间实体扩展。如果不支持，则该设置项"
+"将被忽略。"
+
 msgid ""
 "Specify whether OpenXR should be configured for an HMD or a hand held device."
 msgstr "指定是否应为 HMD 或手持设备配置 OpenXR。"
@@ -121621,6 +132368,15 @@ msgstr ""
 "如果为 [code]true[/code] 并且支持注视点，将根据帧速率自动调整注视点级别，直至"
 "达到 [member xr/openxr/foveation_level] 上设置的级别。"
 
+msgid ""
+"Applied foveation level if supported.\n"
+"[b]Note:[/b] On platforms other than Android, if [member rendering/"
+"anti_aliasing/quality/msaa_3d] is enabled, this feature will be disabled."
+msgstr ""
+"支持时应用的注视点级别。\n"
+"[b]注意：[/b]在 Android 以外的平台上，如果启用了 [member rendering/"
+"anti_aliasing/quality/msaa_3d]，则该功能将被禁用。"
+
 msgid "Specify the default reference space."
 msgstr "指定默认参照空间。"
 
@@ -121641,6 +132397,14 @@ msgstr ""
 "投影，前提是 XR 运行时支持。请注意，Godot 中的部分渲染特性无法与该特性一同使"
 "用。"
 
+msgid ""
+"Optionally sets a specific API version of OpenXR to initialize in "
+"[code]major.minor.patch[/code] notation. Some XR runtimes gate old behavior "
+"behind version checks. This is non-standard OpenXR behavior."
+msgstr ""
+"可选地以 [code]major.minor.patch[/code] 表示法设置要初始化的特定 OpenXR API 版"
+"本。某些 XR 运行时会通过版本检查来限制旧功能。这并非 OpenXR 的标准行为。"
+
 msgid ""
 "Specify the view configuration with which to configure OpenXR setting up "
 "either Mono or Stereo rendering."
@@ -122527,8 +133291,8 @@ msgid ""
 "[ScrollBar]'s size multiplied by [member page] over the difference between "
 "[member min_value] and [member max_value]."
 msgstr ""
-"页面大小。主要用于 [ScrollBar]。[ScrollBar] 滑块的长度是 [ScrollBar] 的尺寸乘"
-"以 [member page] 再除以 [member min_value] 和 [member max_value] 的差。"
+"页面大小。主要用于 [ScrollBar]。[ScrollBar] 抓取器的长度是 [ScrollBar] 的尺寸"
+"乘以 [member page] 再除以 [member min_value] 和 [member max_value] 的差。"
 
 msgid "The value mapped between 0 and 1."
 msgstr "该值在 0 和 1 之间进行映射。"
@@ -122538,6 +133302,22 @@ msgid ""
 "integer."
 msgstr "如果为 [code]true[/code]，[member value] 将始终四舍五入到最接近的整数。"
 
+msgid ""
+"If greater than [code]0.0[/code], [member value] will always be rounded to a "
+"multiple of this property's value above [member min_value]. For example, if "
+"[member min_value] is [code]0.1[/code] and step is [code]0.2[/code], then "
+"[member value] is limited to [code]0.1[/code], [code]0.3[/code], [code]0.5[/"
+"code], and so on. If [member rounded] is also [code]true[/code], [member "
+"value] will first be rounded to a multiple of this property's value, then "
+"rounded to the nearest integer."
+msgstr ""
+"如果大于 [code]0.0[/code]，[member value] 将总是被四舍五入为大于 [member "
+"min_value] 的该属性的倍数。例如，如果 [member min_value] 为 [code]0.1[/code]，"
+"步长为 [code]0.2[/code]，则 [member value] 被限制为 [code]0.1[/code]、"
+"[code]0.3[/code]、[code]0.5[/code]，依此类推。如果 [member rounded] 也是 "
+"[code]true[/code]，[member value] 将首先被四舍五入为这个属性的倍数，然后舍入为"
+"最近的整数。"
+
 msgid ""
 "Range's current value. Changing this property (even via code) will trigger "
 "[signal value_changed] signal. Use [method set_value_no_signal] if you want "
@@ -123965,6 +134745,19 @@ msgstr "Uniform 的数据类型。"
 msgid "Vertex attribute (used by [RenderingDevice])."
 msgstr "顶点属性（由 [RenderingDevice] 使用）。"
 
+msgid ""
+"The index of the buffer in the vertex buffer array to bind this vertex "
+"attribute. When set to [code]-1[/code], it defaults to the index of the "
+"attribute.\n"
+"[b]Note:[/b] You cannot mix binding explicitly assigned attributes with "
+"implicitly assigned ones (i.e. [code]-1[/code]). Either all attributes must "
+"have their binding set to [code]-1[/code], or all must have explicit bindings."
+msgstr ""
+"要绑定该顶点属性的顶点缓冲区数组中的缓冲区索引。当设置为 [code]-1[/code] 时，"
+"默认为该属性的索引。\n"
+"[b]注意：[/b]不能混用显式绑定指定的属性和隐式绑定指定的属性（即 [code]-1[/"
+"code]）。所有属性的绑定要么都设置为 [code]-1[/code]，要么都必须显式绑定。"
+
 msgid "The way that this attribute's data is interpreted when sent to a shader."
 msgstr "将属性数据发送至着色器时，对该数据的解释方式。"
 
@@ -124924,6 +135717,137 @@ msgstr ""
 msgid "Class for searching text for patterns using regular expressions."
 msgstr "使用正则表达式搜索文本的类。"
 
+msgid ""
+"A regular expression (or regex) is a compact language that can be used to "
+"recognize strings that follow a specific pattern, such as URLs, email "
+"addresses, complete sentences, etc. For example, a regex of [code]ab[0-9][/"
+"code] would find any string that is [code]ab[/code] followed by any number "
+"from [code]0[/code] to [code]9[/code]. For a more in-depth look, you can "
+"easily find various tutorials and detailed explanations on the Internet.\n"
+"To begin, the RegEx object needs to be compiled with the search pattern using "
+"[method compile] before it can be used. Alternatively, the static method "
+"[method create_from_string] can be used to create and compile a RegEx object "
+"in a single method call.\n"
+"[codeblock]\n"
+"var regex = RegEx.new()\n"
+"regex.compile(\"\\\\w-(\\\\d+)\")\n"
+"# Shorthand to create and compile a regex (used in the examples below):\n"
+"var regex2 = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"[/codeblock]\n"
+"The search pattern must be escaped first for GDScript before it is escaped "
+"for the expression. For example, [code]compile(\"\\\\d+\")[/code] would be "
+"read by RegEx as [code]\\d+[/code]. Similarly, [code]compile(\"\\\"(?:\\\\\\"
+"\\.|[^\\\"])*\\\"\")[/code] would be read as [code]\"(?:\\\\.|[^\"])*\"[/"
+"code]. In GDScript, you can also use raw string literals (r-strings). For "
+"example, [code]compile(r'\"(?:\\\\.|[^\"])*\"')[/code] would be read the "
+"same.\n"
+"Using [method search], you can find the pattern within the given text. If a "
+"pattern is found, [RegExMatch] is returned and you can retrieve details of "
+"the results using methods such as [method RegExMatch.get_string] and [method "
+"RegExMatch.get_start].\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"var result = regex.search(\"abc n-0123\")\n"
+"if result:\n"
+"\tprint(result.get_string()) # Prints \"n-0123\"\n"
+"[/codeblock]\n"
+"The results of capturing groups [code]()[/code] can be retrieved by passing "
+"the group number to the various methods in [RegExMatch]. Group 0 is the "
+"default and will always refer to the entire pattern. In the above example, "
+"calling [code]result.get_string(1)[/code] would give you [code]0123[/code].\n"
+"This version of RegEx also supports named capturing groups, and the names can "
+"be used to retrieve the results. If two or more groups have the same name, "
+"the name would only refer to the first one with a match.\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"d(?<digit>[0-9]+)|x(?<digit>[0-9a-f]+)"
+"\")\n"
+"var result = regex.search(\"the number is x2f\")\n"
+"if result:\n"
+"\tprint(result.get_string(\"digit\")) # Prints \"2f\"\n"
+"[/codeblock]\n"
+"If you need to process multiple results, [method search_all] generates a list "
+"of all non-overlapping results. This can be combined with a [code]for[/code] "
+"loop for convenience.\n"
+"[codeblock]\n"
+"# Prints \"01 03 0 3f 42\"\n"
+"for result in regex.search_all(\"d01, d03, d0c, x3f and x42\"):\n"
+"\tprint(result.get_string(\"digit\"))\n"
+"[/codeblock]\n"
+"[b]Example:[/b] Split a string using a RegEx:\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\S+\") # Negated whitespace "
+"character class.\n"
+"var results = []\n"
+"for result in regex.search_all(\"One  Two \\n\\tThree\"):\n"
+"\tresults.push_back(result.get_string())\n"
+"print(results) # Prints [\"One\", \"Two\", \"Three\"]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Godot's regex implementation is based on the [url=https://"
+"www.pcre.org/]PCRE2[/url] library. You can view the full pattern reference "
+"[url=https://www.pcre.org/current/doc/html/pcre2pattern.html]here[/url].\n"
+"[b]Tip:[/b] You can use [url=https://regexr.com/]Regexr[/url] to test regular "
+"expressions online."
+msgstr ""
+"正则表达式（或称 regex）是一种紧凑的语言，可用于识别遵循特定模式的字符串，如 "
+"URL、电子邮件地址、完整句子等。例如正则表达式 [code]ab[0-9][/code] 可以找到 "
+"[code]ab[/code] 后面跟着 [code]0[/code] 到 [code]9[/code] 的任何数字的字符串。"
+"要想更深入地了解，你可以很容易地在互联网上找到各种教程和详细解释。\n"
+"首先，在使用 RegEx 对象之前，需要用 [method compile] 对其进行搜索模式的编译。"
+"或者，可以使用静态方法 [method create_from_string] 在单次方法调用中创建并编译"
+"一个 RegEx 对象。\n"
+"[codeblock]\n"
+"var regex = RegEx.new()\n"
+"regex.compile(\"\\\\w-(\\\\d+)\")\n"
+"# 用于创建和编译正则表达式的简写（如下例所示）：\n"
+"var regex2 = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"[/codeblock]\n"
+"在为表达式转义之前，必须先为 GDScript 转义搜索模式。例如，[code]compile(\"\\"
+"\\d+\")[/code] 会被 RegEx 读成 [code]\\d+[/code]。同样，[code]compile(\"\\"
+"\"(?:\\\\\\\\.|[^\\\"])*\\\")[/code] 会被读作 [code]\"(?:\\\\.|[^\"])*\"[/"
+"code]。在 GDScript 中，你还可以使用原始字符串文字（r-字符串）。例如，"
+"[code]compile(r'\"(?:\\\\.|[^\"])*\"')[/code] 将被读取为相同的。\n"
+"使用 [method search]，你可以在给定的文本中匹配模式。如果匹配到一个模式，将返"
+"回 [RegExMatch]，你可以使用 [method RegExMatch.get_string] 和 [method "
+"RegExMatch.get_start] 等方法检索结果的细节。\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\w-(\\\\d+)\")\n"
+"var result = regex.search(\"abc n-0123\")\n"
+"if result:\n"
+"\tprint(result.get_string()) # 输出“n-0123”\n"
+"[/codeblock]\n"
+"捕获组的结果 [code]()[/code] 可以通过向 [RegExMatch] 中的各种方法传递组号来检"
+"索。默认是组 0，并且将总是指整个模式。在上面的例子中，调用 "
+"[code]result.get_string(1)[/code] 会得到 [code]0123[/code]。\n"
+"这个版本的 RegEx 也支持命名的捕获组，名称可以用来检索结果。如果两个或更多的组"
+"有相同的名称，那么这个名称将只指第一个有匹配的组。\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"d(?<digit>[0-9]+)|x(?<digit>[0-9a-f]+)"
+"\")\n"
+"var result = regex.search(\"数字是 x2f\")\n"
+"if result:\n"
+"\tprint(result.get_string(\"digit\")) # 输出“2f”\n"
+"[/codeblock]\n"
+"如果你需要处理多个结果，[method search_all] 会生成一个所有不重叠的结果列表。为"
+"了方便起见，这可以和一个 [code]for[/code] 循环结合起来。\n"
+"[codeblock]\n"
+"for result in regex.search_all(\"d01, d03, d0c, x3f and x42\"):\n"
+"\tprint(result.get_string(\"digit\"))\n"
+"# 会输出 01 03 0 3f 42\n"
+"[/codeblock]\n"
+"[b]示例：[/b]使用 RegEx 分割字符串：\n"
+"[codeblock]\n"
+"var regex = RegEx.create_from_string(\"\\\\S+\") # 非空白字符类。\n"
+"var results = []\n"
+"for result in regex.search_all(\"One  Two \\n\\tThree\"):\n"
+"\tresults.push_back(result.get_string())\n"
+"print(results) # 输出 [\"One\", \"Two\", \"Three\"]\n"
+"[/codeblock]\n"
+"[b]注意：[/b]Godot 的 regex 实现基于的是 [url=https://www.pcre.org/]PCRE2[/"
+"url]。你可以查看完整的模式参考[url=https://www.pcre.org/current/doc/html/"
+"pcre2pattern.html]这里[/url]。\n"
+"[b]提示：[/b]你可以使用 [url=https://regexr.com/]Regexr[/url] 来在线测试正则表"
+"达式。"
+
 msgid ""
 "This method resets the state of the object, as if it was freshly created. "
 "Namely, it unassigns the regular expression of this object."
@@ -125163,6 +136087,17 @@ msgid ""
 "frame of a viewport."
 msgstr "抽象渲染数据对象，存放的是与渲染视口中某一帧相关的帧数据。"
 
+msgid ""
+"Abstract render data object, exists for the duration of rendering a single "
+"viewport. See also [RenderDataRD], [RenderSceneData], and "
+"[RenderSceneDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"抽象渲染数据对象，渲染单一视口期间可用。另见 [RenderDataRD]、"
+"[RenderSceneData] 和 [RenderSceneDataRD]。\n"
+"[b]注意：[/b]这是内部渲染服务器对象。请勿从脚本中实例化该类。"
+
 msgid ""
 "Returns the [RID] of the camera attributes object in the [RenderingServer] "
 "being used to render this viewport."
@@ -125205,6 +136140,20 @@ msgid ""
 "[RenderSceneDataExtension] object."
 msgstr "在 GDExtension 中实现它以返回实现的 [RenderSceneDataExtension] 对象。"
 
+msgid "Render data implementation for the RenderingDevice based renderers."
+msgstr "基于 RenderingDevice 的渲染器的渲染数据实现。"
+
+msgid ""
+"This object manages all render data for the [RenderingDevice]-based "
+"renderers. See also [RenderData], [RenderSceneData], and "
+"[RenderSceneDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"该对象管理基于 [RenderingDevice] 的渲染器的所有渲染数据。另见 [RenderData]、"
+"[RenderSceneData] 和 [RenderSceneDataRD]。\n"
+"[b]注意：[/b]这是内部渲染服务器对象。请勿从脚本中实例化该类。"
+
 msgid "Abstraction for working with modern low-level graphics APIs."
 msgstr "用于处理现代低阶图形 API 的抽象。"
 
@@ -125493,6 +136442,18 @@ msgstr ""
 "二进制数据由着色器决定。另外还必须在 [param size_bytes] 中指定缓冲的字节大小"
 "（可以通过对 [param buffer] 调用 [method PackedByteArray.size] 获取）。"
 
+msgid ""
+"Creates a new compute pipeline. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] is freed."
+msgstr ""
+"新建计算管线。管线可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当 [param shader] 被释放时，它将自动释放。"
+
 msgid ""
 "Returns [code]true[/code] if the compute pipeline specified by the [param "
 "compute_pipeline] RID is valid, [code]false[/code] otherwise."
@@ -125670,6 +136631,16 @@ msgstr ""
 msgid "Binds [param vertex_array] to the specified [param draw_list]."
 msgstr "将 [param vertex_array] 绑定到指定的 [param draw_list]。"
 
+msgid ""
+"Binds a set of [param vertex_buffers] directly to the specified [param "
+"draw_list] using [param vertex_format] without creating a vertex array RID. "
+"Provide the number of vertices in [param vertex_count]; optional per-buffer "
+"byte [param offsets] may also be supplied."
+msgstr ""
+"使用 [param vertex_format] 将一组 [param vertex_buffers] 直接绑定到指定的 "
+"[param draw_list]，而不创建顶点数组 RID。在 [param vertex_count] 中提供顶点"
+"数；也可以选择提供各缓冲区字节 [param offsets]。"
+
 msgid ""
 "Removes and disables the scissor rectangle for the specified [param "
 "draw_list]. See also [method draw_list_enable_scissor]."
@@ -125738,6 +136709,17 @@ msgstr ""
 msgid "Switches to the next draw pass."
 msgstr "切换到下一个绘制阶段。"
 
+msgid ""
+"Creates a new framebuffer. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param textures] is freed."
+msgstr ""
+"新建帧缓冲。帧缓冲可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当 [param textures] 中的任何纹理被释放时，它将自动释放。"
+
 msgid ""
 "Creates a new empty framebuffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -125747,6 +136729,18 @@ msgstr ""
 "新建空的帧缓冲。可以通过返回的 RID 进行访问。\n"
 "RID 使用结束后，应该使用 RenderingServer 的 [method free_rid] 方法进行释放。"
 
+msgid ""
+"Creates a new multipass framebuffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param textures] is freed."
+msgstr ""
+"新建多阶段帧缓冲。可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当任何 [param textures] 被释放时，它将自动释放。"
+
 msgid ""
 "Creates a new framebuffer format with the specified [param attachments] and "
 "[param view_count]. Returns the new framebuffer's unique framebuffer format "
@@ -126084,6 +137078,17 @@ msgid ""
 "Returns [code]true[/code] if the [param feature] is supported by the GPU."
 msgstr "如果 GPU 支持 [param feature] 特性，则返回 [code]true[/code]。"
 
+msgid ""
+"Creates a new index array. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param index_buffer] is freed."
+msgstr ""
+"新建索引数组。可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当 [param index_buffer] 被释放时，它将自动释放。"
+
 msgid ""
 "Creates a new index buffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -126105,6 +137110,18 @@ msgstr ""
 "各种图形硬件的极限可以在 [url=https://vulkan.gpuinfo.org/]Vulkan 硬件数据库[/"
 "url]中找到。"
 
+msgid ""
+"Creates a new render pipeline. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] is freed."
+msgstr ""
+"新建渲染管线。可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当 [param shader] 被释放时，它将自动释放。"
+
 msgid ""
 "Returns [code]true[/code] if the render pipeline specified by the [param "
 "render_pipeline] RID is valid, [code]false[/code] otherwise."
@@ -126418,6 +137435,36 @@ msgstr ""
 "[param mipmaps] 返回已有 [param image]（[code]VkImage[/code]）的 RID。可用于允"
 "许 Godot 渲染到外部图像上。"
 
+msgid ""
+"Creates a shared texture using the specified [param view] and the texture "
+"information from [param with_texture].\n"
+"This will be freed automatically when the [param with_texture] is freed."
+msgstr ""
+"使用指定的 [param view] 和来自 [param with_texture] 的纹理信息创建一个共享纹"
+"理。\n"
+"当 [param with_texture] 被释放时，它将自动释放。"
+
+msgid ""
+"Creates a shared texture using the specified [param view] and the texture "
+"information from [param with_texture]'s [param layer] and [param mipmap]. The "
+"number of included mipmaps from the original texture can be controlled using "
+"the [param mipmaps] parameter. Only relevant for textures with multiple "
+"layers, such as 3D textures, texture arrays and cubemaps. For single-layer "
+"textures, use [method texture_create_shared].\n"
+"For 2D textures (which only have one layer), [param layer] must be [code]0[/"
+"code].\n"
+"[b]Note:[/b] Layer slicing is only supported for 2D texture arrays, not 3D "
+"textures or cubemaps.\n"
+"This will be freed automatically when the [param with_texture] is freed."
+msgstr ""
+"使用指定的 [param view] 和来自 [param with_texture] 的 [param layer] 和 "
+"[param mipmap] 的纹理信息创建共享纹理。可以使用 [param mipmaps] 参数控制包含的"
+"原始纹理的 mipmap 数量。仅适用于具有多个图层的纹理，例如 3D 纹理、纹理数组和立"
+"方体贴图。对于单层纹理，请使用 [method texture_create_shared]。\n"
+"对于 2D 纹理（只有一个图层），[param layer] 必须为 [code]0[/code]。\n"
+"[b]注意：[/b]只有 2D 纹理数组支持图层切片，3D 纹理和立方体贴图不支持。\n"
+"当 [param with_texture] 被释放时，它将自动释放。"
+
 msgid ""
 "Returns the [param texture] data for the specified [param layer] as raw "
 "binary data. For 2D textures (which only have one layer), [param layer] must "
@@ -126627,9 +137674,34 @@ msgstr ""
 "新建 uniform 缓冲。可以通过返回的 RID 进行访问。\n"
 "RID 使用结束后，应该使用 RenderingDevice 的 [method free_rid] 方法进行释放。"
 
+msgid ""
+"Creates a new uniform set. It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when the [param shader] or any of the RIDs "
+"in the [param uniforms] is freed."
+msgstr ""
+"新建 uniform 集。可以通过返回的 RID 进行访问。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当 [param shader] 或 [param uniforms] 中的任意 RID 被释放时，它将自动释放。"
+
 msgid "Checks if the [param uniform_set] is valid, i.e. is owned."
 msgstr "检查 [param uniform_set] 是否有效，即是否有归属。"
 
+msgid ""
+"Creates a vertex array based on the specified buffers. Optionally, [param "
+"offsets] (in bytes) may be defined for each buffer.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method.\n"
+"This will be freed automatically when any of the [param src_buffers] is freed."
+msgstr ""
+"根据指定的缓冲区创建顶点数组。可以选择为每个缓冲区定义 [param offsets]（单位为"
+"字节）。\n"
+"使用完 RID 后，需要使用 RenderingDevice 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"当任一 [param src_buffers] 被释放时，它将自动释放。"
+
 msgid ""
 "Creates a new vertex buffer. It can be accessed with the RID that is "
 "returned.\n"
@@ -126725,6 +137797,18 @@ msgstr ""
 "顶层图形 API 入口对象（忽略 [code]rid[/code] 参数）。\n"
 "- Vulkan：[code]VkInstance[/code]。"
 
+msgid ""
+"The main graphics-compute command queue ([code]rid[/code] parameter is "
+"ignored).\n"
+"- Vulkan: [code]VkQueue[/code].\n"
+"- D3D12: [code]ID3D12CommandQueue[/code].\n"
+"- Metal: [code]MTLCommandQueue[/code]."
+msgstr ""
+"主要图形计算命令队列（忽略 [code]rid[/code] 参数）。\n"
+"- Vulkan：[code]VkQueue[/code]。\n"
+"- D3D12：[code]ID3D12CommandQueue[/code]。\n"
+"- Metal：[code]MTLCommandQueue[/code]。"
+
 msgid ""
 "The specific family the main queue belongs to ([code]rid[/code] parameter is "
 "ignored).\n"
@@ -126733,6 +137817,13 @@ msgstr ""
 "主要队列所属的家族（忽略 [code]rid[/code] 参数）。\n"
 "- Vulkan：队列家族索引，是一个 [code]uint32_t[/code]。"
 
+msgid ""
+"- Vulkan: [code]VkImage[/code].\n"
+"- D3D12: [code]ID3D12Resource[/code]."
+msgstr ""
+"- Vulkan：[code]VkImage[/code]。\n"
+"- D3D12：[code]ID3D12Resource[/code]。"
+
 msgid ""
 "The view of an owned or shared texture.\n"
 "- Vulkan: [code]VkImageView[/code].\n"
@@ -126935,6 +138026,14 @@ msgstr ""
 "每通道 8 位的带符号整数红通道数据格式。取值均在 [code][-127, 127][/code] 的范"
 "围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数红通道数据格式，使用归一化的值、非线性 sRGB 编码。取"
+"值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -126979,6 +138078,14 @@ msgstr ""
 "每通道 8 位的带符号整数红、绿通道数据格式。取值均在 [code][-127, 127][/code] "
 "的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数红、绿通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green/blue channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -127023,6 +138130,14 @@ msgstr ""
 "每通道 8 位的带符号整数红、绿、蓝通道数据格式。取值均在 [code][-127, 127][/"
 "code] 的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green/blue channel data format "
+"with normalized value and nonlinear sRGB encoding. Values are in the [code]"
+"[0.0, 1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数红、绿、蓝通道数据格式，使用归一化的值、非线性 sRGB "
+"编码。取值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point blue/green/red channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -127067,6 +138182,14 @@ msgstr ""
 "每通道 8 位的带符号整数蓝、绿、红通道数据格式。取值均在 [code][-127, 127][/"
 "code] 的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point blue/green/red data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数蓝、绿、红通道数据格式，使用归一化的值、非线性 sRGB "
+"编码。取值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point red/green/blue/alpha channel data "
 "format with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -127112,6 +138235,14 @@ msgstr ""
 "每通道 8 位的带符号整数红、绿、蓝、Alpha 通道数据格式。取值均在 [code][-127, "
 "127][/code] 的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point red/green/blue/alpha channel data "
+"format with normalized value and nonlinear sRGB encoding. Values are in the "
+"[code][0.0, 1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线"
+"性 sRGB 编码。取值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point blue/green/red/alpha channel data "
 "format with normalized value. Values are in the [code][0.0, 1.0][/code] range."
@@ -127157,6 +138288,14 @@ msgstr ""
 "每通道 8 位的带符号整数蓝、绿、红、Alpha 通道数据格式。取值均在 [code][-127, "
 "127][/code] 的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point blue/green/red/alpha channel data "
+"format with normalized value and nonlinear sRGB encoding. Values are in the "
+"[code][0.0, 1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数蓝、绿、红、Alpha 通道数据格式，使用归一化的值、非线"
+"性 sRGB 编码。取值均在 [code][0.0, 1.0][/code] 的范围内。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point alpha/red/green/blue channel data "
 "format with normalized value, packed in 32 bits. Values are in the [code]"
@@ -127205,6 +138344,15 @@ msgstr ""
 "每通道 8 位的带符号整数 Alpha、红、绿、蓝通道数据格式，紧缩在 32 个比特位中。"
 "取值均在 [code][-127, 127][/code] 的范围内。"
 
+msgid ""
+"8-bit-per-channel unsigned floating-point alpha/red/green/blue channel data "
+"format with normalized value and nonlinear sRGB encoding, packed in 32 bits. "
+"Values are in the [code][0.0, 1.0][/code] range."
+msgstr ""
+"每通道 8 位的无符号浮点数 Alpha、红、绿、蓝通道数据格式，使用归一化的值、非线"
+"性 sRGB 编码，紧缩在 32 个比特位中。取值均在 [code][0.0, 1.0][/code] 的范围"
+"内。"
+
 msgid ""
 "Unsigned floating-point alpha/red/green/blue channel data format with "
 "normalized value, packed in 32 bits. Format contains 2 bits of alpha, 10 bits "
@@ -127760,6 +138908,17 @@ msgstr ""
 "1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通道 6 位、蓝通道 5 位。使"
 "用 BC1 纹理压缩（也叫 S3TC DXT1）。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue channel data format with normalized "
+"value and nonlinear sRGB encoding. Values are in the [code][0.0, 1.0][/code] "
+"range. The format's precision is 5 bits of red channel, 6 bits of green "
+"channel, and 5 bits of blue channel. Using BC1 texture compression (also "
+"known as S3TC DXT1)."
+msgstr ""
+"显存压缩的无符号红、绿、蓝通道数据格式，使用归一化的值、非线性 sRGB 编码。取值"
+"均在 [code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通道 6 "
+"位、蓝通道 5 位。使用 BC1 纹理压缩（也叫 S3TC DXT1）。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -127771,6 +138930,17 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通道 6 位、蓝通"
 "道 5 位、Alpha 通道 1 位。使用 BC1 纹理压缩（也叫 S3TC DXT1）。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 1 bit of alpha channel. Using BC1 "
+"texture compression (also known as S3TC DXT1)."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通"
+"道 6 位、蓝通道 5 位、Alpha 通道 1 位。使用 BC1 纹理压缩（也叫 S3TC DXT1）。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -127782,6 +138952,17 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通道 6 位、蓝通"
 "道 5 位、Alpha 通道 4 位。使用 BC2 纹理压缩（也叫 S3TC DXT3）。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 4 bits of alpha channel. Using BC2 "
+"texture compression (also known as S3TC DXT3)."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通"
+"道 6 位、蓝通道 5 位、Alpha 通道 4 位。使用 BC2 纹理压缩（也叫 S3TC DXT3）。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. The "
@@ -127793,6 +138974,17 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通道 6 位、蓝通"
 "道 5 位、Alpha 通道 8 位。使用 BC3 纹理压缩（也叫 S3TC DXT5）。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is 5 bits of red channel, 6 bits of "
+"green channel, 5 bits of blue channel, and 8 bits of alpha channel. Using BC3 "
+"texture compression (also known as S3TC DXT5)."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。该格式的精度为红通道 5 位、绿通"
+"道 6 位、蓝通道 5 位、Alpha 通道 8 位。使用 BC3 纹理压缩（也叫 S3TC DXT5）。"
+
 msgid ""
 "VRAM-compressed unsigned red channel data format with normalized value. "
 "Values are in the [code][0.0, 1.0][/code] range. The format's precision is 8 "
@@ -127857,6 +139049,17 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。该格式的精度为红、绿、蓝通道在 4 到 7 位之"
 "间，Alpha 通道在 0 到 8 位之间。使用 BC7 纹理压缩。也叫 BPTC HDR。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. The format's precision is between 4 and 7 bits for the red/"
+"green/blue channels and between 0 and 8 bits for the alpha channel. Also "
+"known as BPTC LDR."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。该格式的精度为红、绿、蓝通道在 "
+"4 到 7 位之间，Alpha 通道在 0 到 8 位之间。使用 BC7 纹理压缩。也叫 BPTC HDR。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue channel data format with normalized "
 "value. Values are in the [code][0.0, 1.0][/code] range. Using ETC2 texture "
@@ -127865,6 +139068,14 @@ msgstr ""
 "显存压缩的无符号红、绿、蓝通道数据格式，使用归一化的值。取值均在 [code][0.0, "
 "1.0][/code] 的范围内。使用 ETC2 纹理压缩。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue channel data format with normalized "
+"value and nonlinear sRGB encoding. Values are in the [code][0.0, 1.0][/code] "
+"range. Using ETC2 texture compression."
+msgstr ""
+"显存压缩的无符号红、绿、蓝通道数据格式，使用归一化的值、非线性 sRGB 编码。取值"
+"均在 [code][0.0, 1.0][/code] 的范围内。使用 ETC2 纹理压缩。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. Red/green/"
@@ -127875,6 +139086,16 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。红、绿、蓝均使用 8 位精度，Alpha 使用 1 位精"
 "度。使用 ETC2 纹理压缩。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. Red/green/blue use 8 bit of precision each, with alpha "
+"using 1 bit of precision. Using ETC2 texture compression."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。红、绿、蓝均使用 8 位精度，"
+"Alpha 使用 1 位精度。使用 ETC2 纹理压缩。"
+
 msgid ""
 "VRAM-compressed unsigned red/green/blue/alpha channel data format with "
 "normalized value. Values are in the [code][0.0, 1.0][/code] range. Red/green/"
@@ -127885,6 +139106,16 @@ msgstr ""
 "[code][0.0, 1.0][/code] 的范围内。红、绿、蓝均使用 8 位精度，Alpha 使用 8 位精"
 "度。使用 ETC2 纹理压缩。"
 
+msgid ""
+"VRAM-compressed unsigned red/green/blue/alpha channel data format with "
+"normalized value and nonlinear sRGB encoding. Values are in the [code][0.0, "
+"1.0][/code] range. Red/green/blue use 8 bits of precision each, with alpha "
+"using 8 bits of precision. Using ETC2 texture compression."
+msgstr ""
+"显存压缩的无符号红、绿、蓝、Alpha 通道数据格式，使用归一化的值、非线性 sRGB 编"
+"码。取值均在 [code][0.0, 1.0][/code] 的范围内。红、绿、蓝均使用 8 位精度，"
+"Alpha 使用 8 位精度。使用 ETC2 纹理压缩。"
+
 msgid ""
 "11-bit VRAM-compressed unsigned red channel data format with normalized "
 "value. Values are in the [code][0.0, 1.0][/code] range. Using ETC2 texture "
@@ -127925,6 +139156,15 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 4x4 的区块内（质量最"
 "高）。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 4×4 blocks (highest quality). Values are "
+"in the [code][0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 4x4 "
+"的区块内（质量最高）。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压"
+"缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 5×4 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127933,6 +139173,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 5x4 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 5×4 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 5x4 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 5×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127941,6 +139189,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 5x5 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 5×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 5x5 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 6×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127949,6 +139205,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 6x5 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 6×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 6x5 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 6×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127957,6 +139221,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 6x6 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 6×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 6x6 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127965,6 +139237,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 8x5 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 8x5 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127973,6 +139253,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 8x6 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 8x6 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 8×8 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127981,6 +139269,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 8x8 的区块内。取值均在 "
 "[code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 8×8 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 8x8 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×5 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127989,6 +139285,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 10x5 的区块内。取值均"
 "在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×5 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 10x5 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×6 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -127997,6 +139301,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 10x6 的区块内。取值均"
 "在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×6 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 10x6 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×8 blocks. Values are in the [code][0.0, 1.0][/code] range. Using "
@@ -128005,6 +139317,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 10x8 的区块内。取值均"
 "在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×8 blocks. Values are in the [code][0.0, "
+"1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 10x8 "
+"的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 10×10 blocks. Values are in the [code][0.0, 1.0][/code] range. "
@@ -128013,6 +139333,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 10x10 的区块内。取值均"
 "在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 10×10 blocks. Values are in the [code]"
+"[0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 "
+"10x10 的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 12×10 blocks. Values are in the [code][0.0, 1.0][/code] range. "
@@ -128021,6 +139349,14 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 12x10 的区块内。取值均"
 "在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 12×10 blocks. Values are in the [code]"
+"[0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 "
+"12x10 的区块内。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
+
 msgid ""
 "VRAM-compressed unsigned floating-point data format with normalized value, "
 "packed in 12 blocks (lowest quality). Values are in the [code][0.0, 1.0][/"
@@ -128029,6 +139365,15 @@ msgstr ""
 "显存压缩的无符号浮点数数据格式，使用归一化的值，紧缩在 12 个区块内（质量最"
 "低）。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压缩。"
 
+msgid ""
+"VRAM-compressed unsigned floating-point data format with normalized value and "
+"nonlinear sRGB encoding, packed in 12 blocks (lowest quality). Values are in "
+"the [code][0.0, 1.0][/code] range. Using ASTC compression."
+msgstr ""
+"显存压缩的无符号浮点数数据格式，使用归一化的值、非线性 sRGB 编码，紧缩在 12 个"
+"区块内（质量最低）。取值均在 [code][0.0, 1.0][/code] 的范围内。使用 ASTC 压"
+"缩。"
+
 msgid ""
 "8-bit-per-channel unsigned floating-point green/blue/red channel data format "
 "with normalized value. Values are in the [code][0.0, 1.0][/code] range. Blue "
@@ -128510,6 +139855,10 @@ msgstr "纹理可以用作帧缓冲的颜色附件。"
 msgid "Texture can be used as a depth/stencil attachment in a framebuffer."
 msgstr "纹理可以用作帧缓冲的深度/模板附件。"
 
+msgid ""
+"Texture can be used as a depth/stencil resolve attachment in a framebuffer."
+msgstr "纹理可以用作帧缓冲的深度/模板解析附件。"
+
 msgid ""
 "Texture can be used as a [url=https://registry.khronos.org/vulkan/specs/1.3-"
 "extensions/html/vkspec.html#descriptorsets-storageimage]storage image[/url]."
@@ -128779,6 +140128,34 @@ msgstr ""
 msgid "Input attachment uniform."
 msgstr "输入附件 uniform。"
 
+msgid ""
+"Same as UNIFORM_TYPE_UNIFORM_BUFFER but for buffers created with "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Note:[/b] This flag is not available to GD users due to being too "
+"dangerous (i.e. wrong usage can result in visual glitches).\n"
+"It's exposed in case GD users receive a buffer created with such flag from "
+"Godot."
+msgstr ""
+"与 UNIFORM_TYPE_UNIFORM_BUFFER 相同，但适用于使用 "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT 创建的缓冲区。\n"
+"[b]注意：[/b]由于该标志过于危险（即错误使用可能会导致视觉故障），因此该标志对 "
+"GD 用户不可用。\n"
+"之所以公开该标志，是为了防止 GD 用户从 Godot 接收到使用该标志创建的缓冲区。"
+
+msgid ""
+"Same as UNIFORM_TYPE_STORAGE_BUFFER but for buffers created with "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT.\n"
+"[b]Note:[/b] This flag is not available to GD users due to being too "
+"dangerous (i.e. wrong usage can result in visual glitches).\n"
+"It's exposed in case GD users receive a buffer created with such flag from "
+"Godot."
+msgstr ""
+"与 UNIFORM_TYPE_STORAGE_BUFFER 相同，但适用于使用 "
+"BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT 标志创建的缓冲区。\n"
+"[b]注意：[/b]由于该标志过于危险（即错误使用可能会导致视觉故障），因此该标志对 "
+"GD 用户不可用。\n"
+"之所以公开该标志，是为了防止 GD 用户从 Godot 接收到使用该标志创建的缓冲区。"
+
 msgid "Represents the size of the [enum UniformType] enum."
 msgstr "表示 [enum UniformType] 枚举的大小。"
 
@@ -129925,6 +141302,14 @@ msgstr ""
 "如果 [param ignore] 为 [code]true[/code]，则使用该画布项绘制的项目会忽略裁剪，"
 "直到将 [param ignore] 设置为 [code]false[/code] 再次调用。"
 
+msgid ""
+"Draws an ellipse with semi-major axis [param major] and semi-minor axis "
+"[param minor] on the [CanvasItem] pointed to by the [param item] [RID]. See "
+"also [method CanvasItem.draw_ellipse]."
+msgstr ""
+"在由 [param item] [RID] 指向的 [CanvasItem] 上绘制一个半长轴为 [param major]、"
+"半短轴为 [param minor] 的椭圆。另见 [method CanvasItem.draw_ellipse]。"
+
 msgid "See also [method CanvasItem.draw_lcd_texture_rect_region]."
 msgstr "另见 [method CanvasItem.draw_lcd_texture_rect_region]。"
 
@@ -130761,6 +142146,32 @@ msgstr ""
 "ProjectSettings.rendering/lights_and_shadows/directional_shadow/"
 "soft_shadow_filter_quality]。这个参数是全局的，无法针对某个视口单独设置。"
 
+msgid ""
+"Generates and returns an [Image] containing the radiance map for the "
+"specified [param environment] RID's sky. This supports built-in sky material "
+"and custom sky shaders. If [param bake_irradiance] is [code]true[/code], the "
+"irradiance map is saved instead of the radiance map. The radiance map is used "
+"to render reflected light, while the irradiance map is used to render ambient "
+"light. See also [method sky_bake_panorama].\n"
+"[b]Note:[/b] The image is saved using linear encoding without any tonemapping "
+"performed, which means it will look too dark if viewed directly in an image "
+"editor.\n"
+"[b]Note:[/b] [param size] should be a 2:1 aspect ratio for the generated "
+"panorama to have square pixels. For radiance maps, there is no point in using "
+"a height greater than [member Sky.radiance_size], as it won't increase "
+"detail. Irradiance maps only contain low-frequency data, so there is usually "
+"no point in going past a size of 128×64 pixels when saving an irradiance map."
+msgstr ""
+"生成并返回包含 [param environment] RID 中的天空的辐射率贴图的 [Image]。支持内"
+"置天空材质和自定义天空着色器。如果 [param bake_irradiance] 为 [code]true[/"
+"code]，则保存的是辐照度贴图，而不是辐射率贴图。辐射率贴图用于渲染反射光，而辐"
+"照度贴图用于渲染环境光。另见 [method sky_bake_panorama]。\n"
+"[b]注意：[/b]该图像使用线性编码保存，未执行任何色调映射，这意味着如果直接在图"
+"像编辑器中查看，图像会显得太暗。\n"
+"[b]注意：[/b]要让生成的全景图拥有正方形的像素，[param size] 的长宽比应该为 "
+"2:1。辐射率贴图的高度超过 [member Sky.radiance_size] 没有意义，不会增加细节。"
+"辐照度仅包含低频数据，保存时超过 128×64 像素通常没有意义。"
+
 msgid ""
 "Creates an environment and adds it to the RenderingServer. It can be accessed "
 "with the RID that is returned. This RID will be used in all "
@@ -130912,11 +142323,24 @@ msgid ""
 "process effect. See [Environment] for more details."
 msgstr "设置屏幕空间反射（SSR）后期处理效果所使用的变量。详见 [Environment]。"
 
+msgid ""
+"Sets whether screen-space reflections will be rendered at full or half size. "
+"Half size is faster, but may look pixelated or cause flickering."
+msgstr ""
+"设置屏幕空间反射是以全尺寸还是半尺寸渲染。半尺寸渲染速度更快，但可能会出现像素"
+"化或闪烁现象。"
+
+msgid "This option no longer does anything."
+msgstr "该选项已失效。"
+
 msgid ""
 "Sets the variables to be used with the \"tonemap\" post-process effect. See "
 "[Environment] for more details."
 msgstr "设置“色调映射”后期处理效果所使用的变量。详见 [Environment]。"
 
+msgid "See [member Environment.tonemap_agx_contrast] for more details."
+msgstr "有关更多详细信息，请参阅 [member Environment.tonemap_agx_contrast]。"
+
 msgid ""
 "Sets the variables to be used with the volumetric fog post-process effect. "
 "See [Environment] for more details."
@@ -131815,6 +143239,23 @@ msgstr "设置材质的渲染优先级。"
 msgid "Sets a shader material's shader."
 msgstr "设置着色器材质的着色器。"
 
+msgid ""
+"When using the Mobile renderer, [method material_set_use_debanding] can be "
+"used to enable or disable the debanding feature of 3D materials "
+"([BaseMaterial3D] and [ShaderMaterial]).\n"
+"[method material_set_use_debanding] has no effect when using the "
+"Compatibility or Forward+ renderer. In Forward+, [Viewport] debanding can be "
+"used instead.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] and [method RenderingServer.viewport_set_use_debanding]."
+msgstr ""
+"使用移动渲染器时，可以使用 [method material_set_use_debanding] 启用或禁用 3D "
+"材质（[BaseMaterial3D] 和 [ShaderMaterial]）的去色带功能。\n"
+"使用兼容性渲染器或 Forward+ 渲染器时，[method material_set_use_debanding] 无"
+"效。在 Forward+ 渲染器中，可以改用 [Viewport] 的去色带功能。\n"
+"另见 [member ProjectSettings.rendering/anti_aliasing/quality/use_debanding] "
+"和 [method RenderingServer.viewport_set_use_debanding]。"
+
 msgid "Removes all surfaces from a mesh."
 msgstr "移除网格中的所有表面。"
 
@@ -132059,6 +143500,16 @@ msgstr ""
 "为此实例设置 [Transform2D]。用于在 2D 中使用 multimesh 时。相当于 [method "
 "MultiMesh.set_instance_transform_2d]。"
 
+msgid ""
+"Prevents physics interpolation for all instances during the current physics "
+"tick.\n"
+"This is useful when moving all instances to new locations, to give "
+"instantaneous changes rather than interpolation from the previous locations."
+msgstr ""
+"在当前物理周期中阻止对所有实例进行物理插值。\n"
+"适用于将所有实例移动到新位置的场合，可以产生瞬时变化，而不是从先前位置进行插"
+"值。"
+
 msgid ""
 "Set the entire data to use for drawing the [param multimesh] at once to "
 "[param buffer] (such as instance transforms and colors). [param buffer]'s "
@@ -132656,6 +144107,9 @@ msgstr ""
 "设置该反射探针的渲染反射掩码。只有具有匹配层的实例才会被该探针应用反射。相当"
 "于 [member ReflectionProbe.reflection_mask]。"
 
+msgid "This method has not done anything since Godot 3."
+msgstr "自 Godot 3 以来，该方法就没有任何效果了。"
+
 msgid "Deprecated. This method does nothing."
 msgstr "已弃用。该方法什么也不做。"
 
@@ -132723,6 +144177,34 @@ msgstr ""
 "screen_space_roughness_limiter/amount] 和 [member ProjectSettings.rendering/"
 "anti_aliasing/screen_space_roughness_limiter/limit]。"
 
+msgid "Use [method set_boot_image_with_stretch] instead."
+msgstr "改用 [method set_boot_image_with_stretch]。"
+
+msgid ""
+"Sets a boot image. The [param color] defines the background color. The value "
+"of [param scale] indicates if the image will be scaled to fit the screen "
+"size. If [param use_filter] is [code]true[/code], the image will be scaled "
+"with linear interpolation. If [param use_filter] is [code]false[/code], the "
+"image will be scaled with nearest-neighbor interpolation."
+msgstr ""
+"设置一个启动图像。[param color] 定义背景颜色。[param scale] 的值指示该图像是否"
+"会缩放以适应屏幕大小。如果 [param use_filter] 为 [code]true[/code]，则该图像将"
+"使用线性插值进行缩放。如果 [param use_filter] 为 [code]false[/code]，则该图像"
+"将使用最近邻插值进行缩放。"
+
+msgid ""
+"Sets a boot image. The [param color] defines the background color. The value "
+"of [param stretch_mode] indicates how the image will be stretched (see [enum "
+"SplashStretchMode] for possible values). If [param use_filter] is [code]true[/"
+"code], the image will be scaled with linear interpolation. If [param "
+"use_filter] is [code]false[/code], the image will be scaled with nearest-"
+"neighbor interpolation."
+msgstr ""
+"设置一个启动图像。[param color] 定义背景颜色。[param stretch_mode] 的值（可能"
+"的取值见 [enum SplashStretchMode]）指示该图像的拉伸方式。如果 [param "
+"use_filter] 为 [code]true[/code]，则该图像将使用线性插值进行缩放。如果 [param "
+"use_filter] 为 [code]false[/code]，则该图像将使用最近邻插值进行缩放。"
+
 msgid ""
 "If [param generate] is [code]true[/code], generates debug wireframes for all "
 "meshes that are loaded when using the Compatibility renderer. By default, the "
@@ -132819,6 +144301,35 @@ msgstr ""
 msgid "Returns the number of bones allocated for this skeleton."
 msgstr "返回分配给这个骨架的骨骼数量。"
 
+msgid ""
+"Generates and returns an [Image] containing the radiance map for the "
+"specified [param sky] RID. This supports built-in sky material and custom sky "
+"shaders. If [param bake_irradiance] is [code]true[/code], the irradiance map "
+"is saved instead of the radiance map. The radiance map is used to render "
+"reflected light, while the irradiance map is used to render ambient light. "
+"See also [method environment_bake_panorama].\n"
+"[b]Note:[/b] The image is saved using linear encoding without any tonemapping "
+"performed, which means it will look too dark if viewed directly in an image "
+"editor. [param energy] values above [code]1.0[/code] can be used to brighten "
+"the resulting image.\n"
+"[b]Note:[/b] [param size] should be a 2:1 aspect ratio for the generated "
+"panorama to have square pixels. For radiance maps, there is no point in using "
+"a height greater than [member Sky.radiance_size], as it won't increase "
+"detail. Irradiance maps only contain low-frequency data, so there is usually "
+"no point in going past a size of 128×64 pixels when saving an irradiance map."
+msgstr ""
+"生成并返回包含指定 [param sky] RID 的辐射率贴图的 [Image]。这样就能支持内置天"
+"空材质和自定义天空着色器。如果 [param bake_irradiance] 为 [code]true[/code]，"
+"则会保存辐照度贴图，不保存辐射率贴图。辐射率贴图用于渲染反射光，而辐照度贴图用"
+"于渲染环境光。另见 [method environment_bake_panorama]。\n"
+"[b]注意：[/b]该图像使用线性编码保存，未进行任何色调映射，这意味着如果直接在图"
+"像编辑器中查看，图像会显得太暗。[param energy] 值高于 [code]1.0[/code] 可以用"
+"来提高图像亮度。\n"
+"[b]注意：[/b]对于生成的全景图，[param size] 应该是 2:1 的比例，才能够得到正方"
+"形的像素。对于辐射率贴图，将高度设为大于 [member Sky.radiance_size] 的值没有意"
+"义，因为不会增加细节。辐照度贴图仅包含低频数据，因此保存辐照度贴图时通常大小超"
+"过 128×64 像素没有意义。"
+
 msgid ""
 "Creates an empty sky and adds it to the RenderingServer. It can be accessed "
 "with the RID that is returned. This RID will be used in all [code]sky_*[/"
@@ -133023,15 +144534,70 @@ msgstr ""
 "会输出错误，不会修改原始纹理。如果你需要使用不同的宽度、高度或格式，请改用 "
 "[method texture_replace]。"
 
+msgid ""
+"Creates a texture based on a native handle that was created outside of "
+"Godot's renderer.\n"
+"[b]Note:[/b] If using only the rendering device renderer, it's recommend to "
+"use [method RenderingDevice.texture_create_from_extension] together with "
+"[method RenderingServer.texture_rd_create], rather than this method. This "
+"way, the texture's format and usage can be controlled more effectively."
+msgstr ""
+"根据在 Godot 渲染器外部创建的原生句柄创建纹理。\n"
+"[b]注意：[/b]如果仅使用渲染设备渲染器，建议将 [method "
+"RenderingDevice.texture_create_from_extension] 和 [method "
+"RenderingServer.texture_rd_create] 结合使用，不要使用此方法。这样可以更有效地"
+"控制纹理的格式和用途。"
+
 msgid "Returns the format for the texture."
 msgstr "返回该纹理的格式。"
 
+msgid ""
+"Returns the internal graphics handle for this texture object. For use when "
+"communicating with third-party APIs mostly with GDExtension.\n"
+"[param srgb] should be [code]true[/code] when the texture uses nonlinear sRGB "
+"encoding and [code]false[/code] when the texture uses linear encoding.\n"
+"[b]Note:[/b] This function returns a [code]uint64_t[/code] which internally "
+"maps to a [code]GLuint[/code] (OpenGL) or [code]VkImage[/code] (Vulkan)."
+msgstr ""
+"返回该纹理对象的内部图形句柄。主要用于 GDExtension 与第三方 API 通讯。\n"
+"[param srgb] 在纹理使用非线性 sRGB 编码时应为 [code]true[/code]，在纹理使用线"
+"性编码时应为 [code]false[/code]。\n"
+"[b]注意：[/b]这个函数返回的是 [code]uint64_t[/code]，内部将其映射到 "
+"[code]GLuint[/code]（OpenGL）或 [code]VkImage[/code]（Vulkan）。"
+
+msgid ""
+"Returns a texture [RID] that can be used with [RenderingDevice].\n"
+"[param srgb] should be [code]true[/code] when the texture uses nonlinear sRGB "
+"encoding and [code]false[/code] when the texture uses linear encoding."
+msgstr ""
+"返回一个可用于 [RenderingDevice] 的纹理 [RID]。\n"
+"当纹理使用非线性 sRGB 编码时，[param srgb] 应为 [code]true[/code]；当纹理使用"
+"线性编码时，则应为 [code]false[/code]。"
+
 msgid "ProxyTexture was removed in Godot 4."
 msgstr "ProxyTexture 已在 Godot 4 中移除。"
 
 msgid "This method does nothing and always returns an invalid [RID]."
 msgstr "这个方法不起任何作用，始终返回无效的 [RID]。"
 
+msgid ""
+"Creates a new texture object based on a texture created directly on the "
+"[RenderingDevice]. If the texture contains layers, [param layer_type] is used "
+"to define the layer type.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingServer's [method free_rid] method.\n"
+"[b]Note:[/b] The RenderingServer's [method free_rid] won't free the "
+"underlying [param rd_texture], you will want to free the [param rd_texture] "
+"using [method RenderingDevice.free_rid]."
+msgstr ""
+"基于直接在 [RenderingDevice] 上创建的纹理新建一个纹理对象。如果纹理包含图层，"
+"则使用 [param layer_type] 定义图层类型。\n"
+"使用完 RID 后，需要使用 RenderingServer 的 [method free_rid] 方法释放该 "
+"RID。\n"
+"[b]注意：[/b]RenderingServer 的 [method free_rid] 方法不会释放底层 [param "
+"rd_texture]，需要使用 [method RenderingDevice.free_rid] 方法释放 [param "
+"rd_texture]。"
+
 msgid ""
 "Replaces [param texture]'s texture data by the texture specified by the "
 "[param by_texture] RID, without changing [param texture]'s RID."
@@ -133549,6 +145115,27 @@ msgstr ""
 "等价于 [member Viewport.use_debanding]。另见 [member "
 "ProjectSettings.rendering/anti_aliasing/quality/use_debanding]。"
 
+msgid ""
+"If [code]true[/code], 2D rendering will use a high dynamic range (HDR) "
+"[code]RGBA16[/code] format framebuffer. Additionally, 2D rendering will be "
+"performed on linear values and will be converted using the appropriate "
+"transfer function immediately before blitting to the screen (if the Viewport "
+"is attached to the screen).\n"
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped to the [code]0-1[/code] range and can be used in 3D rendering "
+"without color encoding adjustments. This allows 2D rendering to take "
+"advantage of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients. This setting has the same effect as [member Viewport.use_hdr_2d]."
+msgstr ""
+"如果为 [code]true[/code]，则 2D 渲染将使用高动态范围（HDR）[code]RGBA16[/"
+"code] 格式帧缓冲区。此外，2D 渲染将在线性值上执行，并在位块传输到屏幕之前（如"
+"果视口被附加到屏幕）立即使用适当的传输函数进行转换。\n"
+"实际上，这意味着视口的最终结果不会被限制在 [code]0-1[/code] 范围内，无需调整颜"
+"色编码即可在 3D 渲染中使用。这使得 2D 渲染能够利用需要高动态范围的效果（例如 "
+"2D 辉光），并显著改善需要高度详细渐变的效果的外观。该设置与 [member "
+"Viewport.use_hdr_2d] 的效果相同。"
+
 msgid ""
 "If [code]true[/code], enables occlusion culling on the specified viewport. "
 "Equivalent to [member ProjectSettings.rendering/occlusion_culling/"
@@ -134961,6 +146548,20 @@ msgstr ""
 "绘制 SDFGI 级联数据。这是用于反弹灯光、创建反射的数据结构。\n"
 "[b]注意：[/b]仅在使用 Forward+ 渲染方法时支持。"
 
+msgid ""
+"Draws SDFGI probe data. This is the data structure that is used to give "
+"indirect lighting dynamic objects moving within the scene.\n"
+"When in the editor, left-clicking a probe will display additional bright dots "
+"that show its occlusion information. A white dot means the light is not "
+"occluded at all at the dot's position, while a red dot means the light is "
+"fully occluded. Intermediate values are possible.\n"
+"[b]Note:[/b] Only supported when using the Forward+ rendering method."
+msgstr ""
+"绘制 SDFGI 探针数据。这是用于为场景中移动的动态对象提供间接照明的数据结构。\n"
+"在编辑器中，左键点击探针将显示额外的亮点，这些亮点显示其遮挡信息。白点表示该点"
+"位置处的光线完全没有被遮挡，而红点表示光线完全被遮挡。也可能出现中间值。\n"
+"[b]注意：[/b]仅在使用 Forward+ 渲染方法时支持。"
+
 msgid ""
 "Draws the global illumination buffer from [VoxelGI] or SDFGI. Requires "
 "[VoxelGI] (at least one visible baked VoxelGI node) or SDFGI ([member "
@@ -135962,6 +147563,27 @@ msgstr "因优化当前场景而触发的管线编译。"
 msgid "Represents the size of the [enum PipelineSource] enum."
 msgstr "代表 [enum PipelineSource] 枚举的大小。"
 
+msgid "No stretching is applied."
+msgstr "不执行拉伸。"
+
+msgid "Stretches image to fullscreen while preserving aspect ratio."
+msgstr "将图像拉伸至全屏，同时保持纵横比。"
+
+msgid "Stretches the height of the image based on the width of the screen."
+msgstr "根据屏幕宽度拉伸图像的高度。"
+
+msgid "Stretches the width of the image based on the height of the screen."
+msgstr "根据屏幕高度拉伸图像的宽度。"
+
+msgid ""
+"Stretches the image to cover the entire screen while preserving aspect ratio."
+msgstr "将图像拉伸以覆盖整个屏幕，同时保持纵横比。"
+
+msgid ""
+"Stretches the image to cover the entire screen but doesn't preserve aspect "
+"ratio."
+msgstr "将图像拉伸以覆盖整个屏幕，但不保留纵横比。"
+
 msgid "This constant has not been used since Godot 3.0."
 msgstr "Godot 3.0 起不再使用这个常量。"
 
@@ -135970,6 +147592,18 @@ msgid ""
 "rendering is done."
 msgstr "抽象场景缓冲对象，为完成 3D 渲染的每个视口创建。"
 
+msgid ""
+"Abstract scene buffers object, created for each viewport for which 3D "
+"rendering is done. It manages any additional buffers used during rendering "
+"and will discard buffers when the viewport is resized. See also "
+"[RenderSceneBuffersRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"抽象场景缓冲对象，为完成 3D 渲染的每个视口创建。它管理渲染期间使用的任何额外缓"
+"冲区，并在调整视口大小时丢弃缓冲区。另见 [RenderSceneBuffersRD]。\n"
+"[b]注意：[/b]这是内部渲染服务器对象。请勿在脚本中实例化该类。"
+
 msgid ""
 "This method is called by the rendering server when the associated viewport's "
 "configuration is changed. It will discard the old buffers and recreate the "
@@ -136046,6 +147680,26 @@ msgid ""
 "Render scene buffer implementation for the RenderingDevice based renderers."
 msgstr "渲染场景缓冲的实现，适用于基于 RenderingDevice 的渲染器。"
 
+msgid ""
+"This object manages all 3D rendering buffers for the rendering device based "
+"renderers. An instance of this object is created for every viewport that has "
+"3D rendering enabled. See also [RenderSceneBuffers].\n"
+"All buffers are organized in [b]contexts[/b]. The default context is called "
+"[b]render_buffers[/b] and can contain amongst others the color buffer, depth "
+"buffer, velocity buffers, VRS density map and MSAA variants of these "
+"buffers.\n"
+"Buffers are only guaranteed to exist during rendering of the viewport.\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"该对象管理基于渲染设备的渲染器的所有 3D 渲染缓冲区。为每个启用 3D 渲染的视口创"
+"建该对象的实例。另见 [RenderSceneBuffers]。\n"
+"所有缓冲区都被组织在[b]上下文[/b]中。默认上下文被称为 [b]render_buffers[/b]，"
+"可以包含颜色缓冲区、深度缓冲区、速度缓冲区、VRS 密度图和这些缓冲区的 MSAA 变体"
+"等。\n"
+"缓冲区仅保证在视口渲染期间存在。\n"
+"[b]注意：[/b]这是内部渲染服务器对象。请勿在脚本中实例化该类。"
+
 msgid "Frees all buffers related to this context."
 msgstr "释放与这个上下文相关的所有缓冲。"
 
@@ -136193,6 +147847,16 @@ msgid ""
 "frame of a viewport."
 msgstr "抽象渲染数据对象，保存与渲染视口的单个帧相关的场景数据。"
 
+msgid ""
+"Abstract scene data object, exists for the duration of rendering a single "
+"viewport. See also [RenderSceneDataRD], [RenderData], and [RenderDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"抽象场景数据对象，在渲染单个视口期间存在。另见 [RenderSceneDataRD]、"
+"[RenderData] 和 [RenderDataRD]。\n"
+"[b]注意：[/b]这是一个内部渲染服务器对象。不要从脚本中实例化该类。"
+
 msgid ""
 "Returns the camera projection used to render this frame.\n"
 "[b]Note:[/b] If more than one view is rendered, this will return a combined "
@@ -136268,6 +147932,16 @@ msgid ""
 "Render scene data implementation for the RenderingDevice based renderers."
 msgstr "基于 RenderingDevice 的渲染器的渲染场景数据实现。"
 
+msgid ""
+"Object holds scene data related to rendering a single frame of a viewport. "
+"See also [RenderSceneData], [RenderData], and [RenderDataRD].\n"
+"[b]Note:[/b] This is an internal rendering server object. Do not instantiate "
+"this class from a script."
+msgstr ""
+"对象保存与渲染视口的单个帧相关的场景数据。另见 [RenderSceneData]、"
+"[RenderData] 和 [RenderDataRD]。\n"
+"[b]注意：[/b]这是一个内部渲染服务器对象。不要从脚本中实例化该类。"
+
 msgid "Base class for serializable objects."
 msgstr "可序列化对象的基类。"
 
@@ -136395,6 +148069,13 @@ msgstr ""
 "在多次引用。例如你复制的资源 A 里正好对资源 B 存在两个引用，那么新的资源 A' 就"
 "会引用新的资源 B' 两次。"
 
+msgid ""
+"Duplicates this resource, deeply, like [method duplicate] when passing "
+"[code]true[/code], with extra control over how subresources are handled."
+msgstr ""
+"深度复制该资源，就像传递 [code]true[/code] 时 [method duplicate] 一样，并对子"
+"资源的处理方式进行额外控制。"
+
 msgid ""
 "Emits the [signal changed] signal. This method is called automatically for "
 "some built-in resources.\n"
@@ -137018,9 +148699,104 @@ msgstr "字体缩放模式。"
 msgid "Imports comma-separated values as [Translation]s."
 msgstr "导入 CSV 作为 [Translation]。"
 
+msgid ""
+"Comma-separated values are a plain text table storage format. The format's "
+"simplicity makes it easy to edit in any text editor or spreadsheet software. "
+"This makes it a common choice for game localization.\n"
+"In the CSV file used for translation, the first column contains string "
+"identifiers, and the first row serves as the header. The first column's "
+"header can be any value. The remaining headers indicate the locale for that "
+"column. Columns whose headers begin with an underscore ([code]_[/code]) will "
+"be ignored.\n"
+"[b]Example CSV file:[/b]\n"
+"[codeblock lang=text]\n"
+"keys,en,es,ja\n"
+"GREET,\"Hello, friend!\",\"Hola, amigo!\",こんにちは\n"
+"ASK,How are you?,Cómo está?,元気ですか\n"
+"BYE,Goodbye,Adiós,さようなら\n"
+"QUOTE,\"\"\"Hello\"\" said the man.\",\"\"\"Hola\"\" dijo el hombre.\",「こん"
+"にちは」男は言いました\n"
+"[/codeblock]\n"
+"Although keys in the first column typically use uppercase string identifiers, "
+"it is not uncommon to directly use strings appearing in the game as keys. To "
+"avoid string ambiguity, you can use a special [code]?context[/code] column to "
+"specify the context to use with [method Object.tr].\n"
+"[codeblock lang=text]\n"
+"en,?context,fr,ja,zh\n"
+"Letter,Alphabet,Lettre,字母,字母\n"
+"Letter,Message,Courrier,手紙,信件\n"
+"[/codeblock]\n"
+"To set the plural form of a string to use with [method Object.tr_n], add a "
+"special [code]?plural[/code] column. After setting the plural form of the "
+"source string in this column, you can add additional rows to provide "
+"translations for more plural forms. The first column and all special columns "
+"in these plural form rows must be empty.\n"
+"Godot includes built-in plural rules for some languages. You can also "
+"customize them using a special [code]?pluralrule[/code] row. See [url=https://"
+"www.gnu.org/software/gettext/manual/html_node/Plural-forms.html]GNU gettext[/"
+"url] for examples and more info.\n"
+"[codeblock lang=text]\n"
+"en,?plural,fr,ru,zh,_Comment\n"
+"?pluralrule,,nplurals=2; plural=(n >= 2);,,,Customize the plural rule for "
+"French\n"
+"There is %d apple,There are %d apples,Il y a %d pomme,Есть %d яблоко,那里有%d"
+"个苹果,\n"
+",,Il y a %d pommes,Есть %d яблока,,\n"
+",,,Есть %d яблок,,\n"
+"[/codeblock]"
+msgstr ""
+"逗号分隔值是一种纯文本表格存储格式。这种格式简单易用，可以在任何文本编辑器或电"
+"子表格软件中进行编辑。这使其成为游戏本地化的常用选择。\n"
+"在用于翻译的 CSV 文件中，第一列包含字符串标识符，第一行用作标题。第一列的标题"
+"可以是任意值。其余标题表示该列的区域设置。标题以下划线（[code]_[/code]）开头的"
+"列将被忽略。\n"
+"[b]CSV 文件示例：[/b]\n"
+"[codeblock lang=text]\n"
+"keys,en,es,ja\n"
+"GREET,\"Hello, friend!\",\"Hola, amigo!\",こんにちは\n"
+"ASK,How are you?,Cómo está?,元気ですか\n"
+"BYE,Goodbye,Adiós,さようなら\n"
+"QUOTE,\"\"\"Hello\"\" said the man.\",\"\"\"Hola\"\" dijo el hombre.\",「こん"
+"にちは」男は言いました\n"
+"[/codeblock]\n"
+"虽然第一列中的键通常使用大写字符串标识符，但直接使用游戏中出现的字符串作为键也"
+"很常见。为了避免字符串歧义，可以使用特殊的 [code]?context[/code] 列来指定与 "
+"[method Object.tr] 一起使用的上下文。\n"
+"[codeblock lang=text]\n"
+"en,?context,fr,ja,zh\n"
+"Letter,Alphabet,Lettre,字母,字母\n"
+"Letter,Message,Courrier,手紙,信件\n"
+"[/codeblock]\n"
+"要设置用于 [method Object.tr_n] 方法的字符串的复数形式，请添加一个特殊的 "
+"[code]?plural[/code] 列。在该列中设置源字符串的复数形式后，可以添加其他行来提"
+"供更多复数形式的翻译。这些复数形式行中的第一列和所有特殊列都必须为空。\n"
+"Godot 包含一些语言的内置复数规则。还可以使用特殊的 [code]?pluralrule[/code] 行"
+"来自定义它们。有关示例和更多信息，请参阅 [url=https://www.gnu.org/software/"
+"gettext/manual/html_node/Plural-forms.html]GNU gettext[/url]。\n"
+"[codeblock lang=text]\n"
+"en,?plural,fr,ru,zh,_Comment\n"
+"?pluralrule,,nplurals=2; plural=(n >= 2);,,,Customize the plural rule for "
+"French\n"
+"There is %d apple,There are %d apples,Il y a %d pomme,Есть %d яблоко,那里有%d"
+"个苹果,\n"
+",,Il y a %d pommes,Есть %d яблока,,\n"
+",,,Есть %d яблок,,\n"
+"[/codeblock]"
+
 msgid "Importing translations"
 msgstr "导入翻译"
 
+msgid ""
+"- [b]Disabled[/b]: Creates a [Translation].\n"
+"- [b]Auto[/b]: Creates an [OptimizedTranslation] when possible. This makes "
+"the resulting file smaller at the cost of a small CPU overhead. Falls back to "
+"[Translation] for translations with context or plural forms."
+msgstr ""
+"- [b]Disabled[/b]：创建 [Translation]。\n"
+"- [b]Auto[/b]：可能时创建 [OptimizedTranslation]。这样做可以减小生成的文件大"
+"小，但会增加少量 CPU 开销。对于包含上下文或复数形式的翻译，则会回退到 "
+"[Translation]。"
+
 msgid ""
 "The delimiter to use in the CSV file. The default value matches the common "
 "CSV convention. Tab-separated values are sometimes called TSV files."
@@ -137028,6 +148804,20 @@ msgstr ""
 "在 CSV 文件中使用的分隔符。该默认值符合常见的 CSV 约定。制表符分隔值有时被称"
 "为 TSV 文件。"
 
+msgid ""
+"If [code]true[/code], message keys in the CSV file are unescaped using "
+"[method String.c_unescape] during the import process."
+msgstr ""
+"如果为 [code]true[/code]，则在导入过程中使用 [method String.c_unescape] 对 "
+"CSV 文件中的消息键进行反转义。"
+
+msgid ""
+"If [code]true[/code], message translations in the CSV file are unescaped "
+"using [method String.c_unescape] during the import process."
+msgstr ""
+"如果为 [code]true[/code]，则在导入过程中使用 [method String.c_unescape] 对 "
+"CSV 文件中的消息翻译进行反转义。"
+
 msgid ""
 "Imports a TTF, TTC, OTF, OTC, WOFF or WOFF2 font file for font rendering that "
 "adapts to any size."
@@ -137133,6 +148923,26 @@ msgstr ""
 "启用 [member generate_mipmaps] 会增加字体生成时间和内存使用量。请只在你确实需"
 "要时才启用此设置。"
 
+msgid ""
+"The hinting mode to use. This controls how aggressively glyph edges should be "
+"snapped to pixels when rasterizing the font. Depending on personal "
+"preference, you may prefer using one hinting mode over the other. Hinting "
+"modes other than [b]None[/b] are only effective if the font contains hinting "
+"data (see [member force_autohinter]).\n"
+"[b]None:[/b] Smoothest appearance, which can make the font look blurry at "
+"small sizes.\n"
+"[b]Light:[/b] Sharp result by snapping glyph edges to pixels on the Y axis "
+"only.\n"
+"[b]Normal:[/b] Sharpest by snapping glyph edges to pixels on both X and Y "
+"axes."
+msgstr ""
+"要使用的提示模式。这控制在光栅化字体时应如何积极地将字形边缘吸附到像素。根据个"
+"人喜好，你可能更喜欢使用一种提示模式而不是另一种。除 [b]None[/b] 之外的提示模"
+"式仅在字体包含提示数据时才有效（请参阅 [member force_autohinter]）。\n"
+"[b]None：[/b]最平滑的外观，这会使字体在小尺寸下看起来模糊。\n"
+"[b]Light：[/b]通过仅将字形边缘吸附到 Y 轴上的像素来获得清晰的结果。\n"
+"[b]Normal：[/b]通过将字形边缘吸附到 X 轴和 Y 轴上的像素获得最清晰的结果。"
+
 msgid ""
 "Override the list of languages supported by this font. If left empty, this is "
 "supplied by the font metadata. There is usually no need to change this. See "
@@ -137278,6 +149088,41 @@ msgstr ""
 "在每个导入的字形周围应用边距。如果你的字体图像包含参考线（以字形之间的线的形"
 "式）或者字符之间的间距看起来不正确，请尝试调整 [member character_margin]。"
 
+msgid ""
+"The character ranges to import from the font image. This is an array that "
+"maps each position on the image (in tile coordinates, not pixels). The font "
+"atlas is traversed from left to right and top to bottom. Characters can be "
+"specified with decimal numbers (126), hexadecimal numbers ([code]0x007e[/"
+"code] or [code]U+007e[/code]), or between single quotes ([code]'~'[/code]). "
+"Ranges can be specified with a hyphen between characters.\n"
+"For example, [code]0-127[/code] represents the full ASCII range. It can also "
+"be written as [code]0x0000-0x007f[/code] (or [code]U+0000-U+007f[/code]). As "
+"another example, [code]' '-'~'[/code] is equivalent to [code]32-126[/code] "
+"and represents the range of printable (visible) ASCII characters.\n"
+"For any range, the character advance and offset can be customized by "
+"appending three space-separated integer values (additional advance, x offset, "
+"y offset) to the end. For example [code]'a'-'b' 4 5 2[/code] sets the advance "
+"to [code]char_width + 4[/code] and offset to [code]Vector2(5, 2)[/code] for "
+"both `a` and `b` characters.\n"
+"[b]Note:[/b] The overall number of characters must not exceed the number of "
+"[member columns] multiplied by [member rows]. Otherwise, the font will fail "
+"to import."
+msgstr ""
+"从字体图像导入的字符范围。这是一个数组，能够对图像上的每一个位置做映射（使用图"
+"块坐标，而非像素坐标）。字体图集是从左到右、从上到下遍历的。可以使用十进制数字"
+"（126）、十六进制数字（[code]0x007e[/code] 或 [code]U+007e[/code]）、单引号"
+"（[code]'~'[/code]）来指定字符。在字符之间加上连字符指定的就是一个范围。\n"
+"例如 [code]0-127[/code] 表示的是完整的 ASCII 范围。这个范围也可以写作 "
+"[code]0x0000-0x007f[/code]（或者 [code]U+0000-U+007f[/code]）。再比如，"
+"[code]' '-'~'[/code] 等价于 [code]32-126[/code]，表示的是可打印（可见）ASCII "
+"字符的范围。\n"
+"指定范围时如果在后面加上三个用空格分隔的整数值，就可以自定义字符的前进量和偏移"
+"（额外前进量、X 偏移量、Y 偏移量）。例如 [code]'a'-'b' 4 5 2[/code] 就是将 "
+"`a` 和 `b` 这两个字符的前进量设为 [code]char_width + 4[/code] 并将偏移量设为 "
+"[code]Vector2(5, 2)[/code]。\n"
+"[b]注意：[/b]总字符数必须不超过 [member columns] 与 [member rows] 的乘积。否则"
+"字体将无法导入。"
+
 msgid "Number of columns in the font image. See also [member rows]."
 msgstr "字体图像中的列数。另见 [member rows]。"
 
@@ -137328,6 +149173,34 @@ msgstr ""
 "[GPUParticlesAttractorVectorField3D]。另请参见 [ResourceImporterTexture] 和 "
 "[ResourceImporterTextureAtlas]。"
 
+msgid ""
+"Controls how color channels should be used in the imported texture.\n"
+"[b]sRGB Friendly:[/b], prevents the R and RG color formats from being used, "
+"as they do not support nonlinear sRGB encoding.\n"
+"[b]Optimized:[/b], allows the RG color format to be used if the texture does "
+"not use the blue channel. This reduces memory usage if the texture's blue "
+"channel can be discarded (all pixels must have a blue value of [code]0[/"
+"code]).\n"
+"[b]Normal Map (RG Channels):[/b] This forces all layers from the texture to "
+"be imported with the RG color format, with only the red and green channels "
+"preserved. RGTC (Red-Green Texture Compression) compression is able to "
+"preserve its detail much better, while using the same amount of memory as a "
+"standard RGBA VRAM-compressed texture. This only has an effect on textures "
+"with the VRAM Compressed or Basis Universal compression modes. This mode is "
+"only available in layered textures ([Cubemap], [CubemapArray], "
+"[Texture2DArray] and [Texture3D])."
+msgstr ""
+"控制在导入的纹理中应如何使用颜色通道。\n"
+"[b]sRGB 友好：[/b]阻止使用 R 和 RG 颜色格式，因为它们不支持非线性 sRGB 编"
+"码。\n"
+"[b]优化：[/b]如果纹理不使用蓝色通道，则允许使用 RG 颜色格式。如果可以丢弃纹理"
+"的蓝色通道（所有像素的蓝色值必须为 [code]0[/code]），则可以减少内存使用量。\n"
+"[b]法线贴图（RG 通道）：[/b]这会强制使用 RG 颜色格式导入纹理中的所有图层，仅保"
+"留红色和绿色通道。RGTC（红绿纹理压缩）压缩能够更好地保留细节，同时使用与标准 "
+"RGBA VRAM 压缩纹理相同的内存量。这仅对具有 VRAM 压缩或 Basis Universal 压缩模"
+"式的纹理有影响。该模式仅适用于分层纹理（[Cubemap]、[CubemapArray]、"
+"[Texture2DArray] 和 [Texture3D]）。"
+
 msgid ""
 "Controls how VRAM compression should be performed for HDR images.\n"
 "[b]Disabled:[/b] Never use VRAM compression for HDR textures, regardless of "
@@ -138002,6 +149875,21 @@ msgstr ""
 "该导入器导入 [CompressedTexture2D] 资源。如果你需要以更方便的方式处理脚本中的"
 "图像，请改用 [ResourceImporterImage]。另见 [ResourceImporterLayeredTexture]。"
 
+msgid ""
+"Controls how color channels should be used in the imported texture.\n"
+"[b]sRGB Friendly:[/b] Prevents the R and RG color formats from being used, as "
+"they do not support nonlinear sRGB encoding.\n"
+"[b]Optimized:[/b] Allows the RG color format to be used if the texture does "
+"not use the blue channel. This reduces memory usage if the texture's blue "
+"channel can be discarded (all pixels must have a blue value of [code]0[/"
+"code])."
+msgstr ""
+"控制在导入的纹理中应如何使用颜色通道。\n"
+"[b]sRGB 友好：[/b]阻止使用 R 和 RG 颜色格式，因为它们不支持非线性 sRGB 编"
+"码。\n"
+"[b]优化：[/b]如果纹理不使用蓝色通道，则允许使用 RG 颜色格式。如果可以丢弃纹理"
+"的蓝色通道（所有像素的蓝色值必须为 [code]0[/code]），则可以减少内存占用。"
+
 msgid ""
 "When using a texture as normal map, only the red and green channels are "
 "required. Given regular texture compression algorithms produce artifacts that "
@@ -138252,6 +150140,21 @@ msgstr ""
 "果。\n"
 "建议启用该功能（默认情况下），除非这会导致特定图像出现问题。"
 
+msgid ""
+"Some HDR images you can find online may be broken and contain data that is "
+"encoded using the nonlinear sRGB transfer function (instead of using linear "
+"encoding). It is advised not to use those files. If you absolutely have to, "
+"enabling [member process/hdr_as_srgb] will make them look correct.\n"
+"[b]Warning:[/b] Enabling [member process/hdr_as_srgb] on well-formatted HDR "
+"images will cause the resulting image to look too dark, so leave this on "
+"[code]false[/code] if unsure."
+msgstr ""
+"你在网上可以找到的一些 HDR 图像可能已损坏，并且包含使用非线性 sRGB 传输函数"
+"（而不是使用线性编码）编码的数据。建议不要使用这些文件。如果你确实需要使用，启"
+"用 [member process/hdr_as_srgb] 选项可以使它们看起来正确。\n"
+"[b]警告：[/b]在格式良好的 HDR 图像上启用 [member process/hdr_as_srgb] 将导致生"
+"成的图像看起来太暗，因此如果不确定，请将其保留为 [code]false[/code]。"
+
 msgid ""
 "If [code]true[/code], clamps exposure in the imported high dynamic range "
 "images using a smart clamping formula (without introducing [i]visible[/i] "
@@ -138612,6 +150515,9 @@ msgstr ""
 "[FileAccess] 来处理这些文件，注意默认情况下不会导出非资源文件（导出说明见 "
 "[FileAccess] 类描述）。"
 
+msgid "Threaded Loading Demo"
+msgstr "多线程加载演示"
+
 msgid ""
 "Registers a new [ResourceFormatLoader]. The ResourceLoader will use the "
 "ResourceFormatLoader as described in [method load].\n"
@@ -139026,6 +150932,13 @@ msgstr ""
 "与 [method create_id] 类型，但是 UID 会使用 [param path] 路径和项目名称设置随"
 "机数种子。在当前项目中为该路径生成的 UID 始终相同。"
 
+msgid ""
+"Returns a path, converting [param path_or_uid] if necessary. Fails and "
+"returns an empty string if an invalid UID is provided."
+msgstr ""
+"返回路径，必要时转换 [param path_or_uid]。如果提供了无效的 UID，则操作失败并返"
+"回空字符串。"
+
 msgid ""
 "Returns the path that the given UID value refers to.\n"
 "Fails with an error if the UID does not exist, so be sure to check [method "
@@ -140039,6 +151952,15 @@ msgstr ""
 msgid "Adds a [code skip-lint][p][/code] tag to the tag stack."
 msgstr "向标签栈中添加 [code skip-lint][p][/code] 标签。"
 
+msgid ""
+"Adds a [code skip-lint][s][/code] tag to the tag stack. If [param color]'s "
+"alpha value is [code]0.0[/code], the current font's color with its alpha "
+"multiplied by [theme_item strikethrough_alpha] is used."
+msgstr ""
+"添加一个 [code skip-lint][s][/code] 标签到标签栈。如果 [param color] 的 Alpha "
+"值是 [code]0.0[/code]，则会使用当前字体的颜色并将其 Alpha 值与 [theme_item "
+"strikethrough_alpha] 相乘。"
+
 msgid ""
 "Adds a [code skip-lint][table=columns,inline_align][/code] tag to the tag "
 "stack. Use [method set_table_column_expand] to set column expansion ratio. "
@@ -140049,6 +151971,15 @@ msgstr ""
 "[method set_table_column_expand] 设置列扩展率。使用 [method push_cell] 添加单"
 "元格。[param name] 会用作辅助应用中的表格名。"
 
+msgid ""
+"Adds a [code skip-lint][u][/code] tag to the tag stack. If [param color]'s "
+"alpha value is [code]0.0[/code], the current font's color with its alpha "
+"multiplied by [theme_item underline_alpha] is used."
+msgstr ""
+"添加一个 [code skip-lint][u][/code] 标签到标签栈。如果 [param color] 的 Alpha "
+"值是 [code]0.0[/code]，则会使用当前字体的颜色并将其 Alpha 值与 [theme_item "
+"underline_alpha] 相乘。"
+
 msgid ""
 "Reloads custom effects. Useful when [member custom_effects] is modified "
 "manually."
@@ -140479,7 +152410,7 @@ msgstr ""
 "示在基础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 [StyleBox]，确保基础 "
 "[StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很好地实现这个目的。要"
 "禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，禁用聚焦的视觉效果会"
-"影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原因，不建议这样做。"
+"影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原因，不建议这样做。"
 
 msgid "The normal background for the [RichTextLabel]."
 msgstr "[RichTextLabel] 的正常背景。"
@@ -140756,6 +152687,27 @@ msgstr ""
 "设置该属性将在内部调用方法 [method "
 "PhysicsServer2D.body_set_omit_force_integration]。"
 
+msgid ""
+"If [code]true[/code], the body is frozen. Gravity and forces are not applied "
+"anymore.\n"
+"See [member freeze_mode] to set the body's behavior when frozen.\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody2D] or "
+"[AnimatableBody2D] instead."
+msgstr ""
+"如果为 [code]true[/code]，则物体被冻结。不再施加重力和力。\n"
+"请参阅 [member freeze_mode]，以设置冻结时，物体的行为。\n"
+"[b]注意：[/b] 对于始终冻结的物体，请改用 [StaticBody2D] 或 "
+"[AnimatableBody2D]。"
+
+msgid ""
+"The body's freeze mode. Determines the body's behavior when [member freeze] "
+"is [code]true[/code].\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody2D] or "
+"[AnimatableBody2D] instead."
+msgstr ""
+"物体的冻结模式。[member freeze] 为 [code]true[/code] 时决定物体的行为。\n"
+"[b]注意：[/b]始终冻结的物体请改用 [StaticBody2D] 或 [AnimatableBody2D]。"
+
 msgid ""
 "Multiplies the gravity applied to the body. The body's gravity is calculated "
 "from the [member ProjectSettings.physics/2d/default_gravity] project setting "
@@ -141156,6 +153108,26 @@ msgstr ""
 "正它的运动。连续碰撞检测更精确，并且错过了较小的、快速移动的物体的撞击。不使用"
 "连续碰撞检测的计算速度更快，但可能会错过小的、快速移动的物体。"
 
+msgid ""
+"If [code]true[/code], the body is frozen. Gravity and forces are not applied "
+"anymore.\n"
+"See [member freeze_mode] to set the body's behavior when frozen.\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody3D] or "
+"[AnimatableBody3D] instead."
+msgstr ""
+"如果为 [code]true[/code]，则该物体被冻结。不再施加重力和力。\n"
+"要设置冻结时物体的行为，见 [member freeze_mode]。\n"
+"[b]注意：[/b]对于始终冻结的物体，请改用 [StaticBody3D] 或 [AnimatableBody3D]。"
+
+msgid ""
+"The body's freeze mode. Determines the body's behavior when [member freeze] "
+"is [code]true[/code].\n"
+"[b]Note:[/b] For a body that is always frozen, use [StaticBody3D] or "
+"[AnimatableBody3D] instead."
+msgstr ""
+"物体的冻结模式。[member freeze] 为 [code]true[/code] 时决定物体的行为。\n"
+"[b]注意：[/b]始终冻结的物体请改用 [StaticBody3D] 或 [AnimatableBody3D]。"
+
 msgid ""
 "The body's moment of inertia. This is like mass, but for rotation: it "
 "determines how much torque it takes to rotate the body on each axis. The "
@@ -141966,6 +153938,78 @@ msgstr ""
 "snake_case。最好使用 [code]MethodName[/code] 类中公开的名称，以避免在每次调用"
 "时分配新的 [StringName]。"
 
+msgid ""
+"Changes the running scene to the one at the given [param path], after loading "
+"it into a [PackedScene] and creating a new instance.\n"
+"Returns [constant OK] on success, [constant ERR_CANT_OPEN] if the [param "
+"path] cannot be loaded into a [PackedScene], or [constant ERR_CANT_CREATE] if "
+"that scene cannot be instantiated.\n"
+"[b]Note:[/b] See [method change_scene_to_node] for details on the order of "
+"operations."
+msgstr ""
+"将位于给定路径 [param path] 的场景加载为一个 [PackedScene] 并创建新实例，然后"
+"将正在运行的场景修改为这个场景。\n"
+"成功时返回 [constant OK]；如果 [param path] 不能被加载为一个 [PackedScene] ，"
+"则返回 [constant ERR_CANT_OPEN]；如果该场景无法被实例化，则返回 [constant "
+"ERR_CANT_CREATE]。\n"
+"[b]注意：[/b]有关操作顺序的详细信息，请参阅 [method change_scene_to_packed]。"
+
+msgid ""
+"Changes the running scene to the provided [Node]. Useful when you want to set "
+"up the new scene before changing.\n"
+"Returns [constant OK] on success, [constant ERR_INVALID_PARAMETER] if the "
+"[param node] is [code]null[/code], or [constant ERR_UNCONFIGURED] if the "
+"[param node] is already inside the scene tree.\n"
+"[b]Note:[/b] Operations happen in the following order when [method "
+"change_scene_to_node] is called:\n"
+"1. The current scene node is immediately removed from the tree. From that "
+"point, [method Node.get_tree] called on the current (outgoing) scene will "
+"return [code]null[/code]. [member current_scene] will be [code]null[/code] "
+"too, because the new scene is not available yet.\n"
+"2. At the end of the frame, the formerly current scene, already removed from "
+"the tree, will be deleted (freed from memory) and then the new scene node "
+"will be added to the tree. [method Node.get_tree] and [member current_scene] "
+"will be back to working as usual.\n"
+"This ensures that both scenes aren't running at the same time, while still "
+"freeing the previous scene in a safe way similar to [method "
+"Node.queue_free].\n"
+"If you want to reliably access the new scene, await the [signal "
+"scene_changed] signal.\n"
+"[b]Warning:[/b] After using this method, the [SceneTree] will take ownership "
+"of the node and will free it automatically when changing scene again. Any "
+"references you had to that node will become invalid."
+msgstr ""
+"将正在运行的场景切换为给定的 [Node]。当你希望在切换前设置新场景时非常有用。\n"
+"成功时返回 [constant OK]，[param node] 为 [code]null[/code] 时返回 [constant "
+"ERR_INVALID_PARAMETER]，[param node] 已经在场景树中时返回 [constant "
+"ERR_UNCONFIGURED]。\n"
+"[b]注意：[/b]当 [method change_scene_to_node] 被调用时，操作按以下顺序发生：\n"
+"1. 当前场景节点被立即从树中移除。从那时起，在当前（即将退出）场景上调用的 "
+"[method Node.get_tree] 将返回 [code]null[/code]。[member current_scene] 也将变"
+"为 [code]null[/code]，因为新场景尚不可用。\n"
+"2. 在帧末尾时，已从树中移除的、之前的当前场景将被删除（从内存中释放），然后新"
+"场景节点将被添加到树中。[method Node.get_tree] 和 [member current_scene] 将恢"
+"复正常工作。\n"
+"这确保了两个场景不会同时运行，并且仍然会以类似于 [method Node.queue_free] 的安"
+"全方式释放之前的场景。\n"
+"如果你想要稳定地访问新场景，请等待 [signal scene_changed] 信号。\n"
+"[b]警告：[/b] 使用此方法之后，[SceneTree] 将获得该节点的所有权，并在再次切换场"
+"景时自动释放它。你对该节点的一切引用都将失效。"
+
+msgid ""
+"Changes the running scene to a new instance of the given [PackedScene] (which "
+"must be valid).\n"
+"Returns [constant OK] on success, [constant ERR_CANT_CREATE] if the scene "
+"cannot be instantiated, or [constant ERR_INVALID_PARAMETER] if the scene is "
+"invalid.\n"
+"[b]Note:[/b] See [method change_scene_to_node] for details on the order of "
+"operations."
+msgstr ""
+"将正在运行的场景切换为指定 [PackedScene] （必须有效）的一个新实例。\n"
+"成功时返回 [constant OK]；如果该场景无法被实例化，则返回 [constant "
+"ERR_CANT_CREATE]。如果场景无效，则返回 [constant ERR_INVALID_PARAMETER]。\n"
+"[b]注意：[/b]有关操作顺序的详细信息，请参阅 [method change_scene_to_node]。"
+
 msgid ""
 "Returns a new [SceneTreeTimer]. After [param time_sec] in seconds have "
 "passed, the timer will emit [signal SceneTreeTimer.timeout] and will be "
@@ -142625,6 +154669,15 @@ msgstr ""
 "[b]注意：[/b]该方法所返回的字典与 [method Object.get_property_list] 返回值的格"
 "式是一样的。"
 
+msgid ""
+"Returns the list of signals defined in this [Script].\n"
+"[b]Note:[/b] The dictionaries returned by this method are formatted "
+"identically to those returned by [method Object.get_signal_list]."
+msgstr ""
+"返回该 [Script] 中定义的信号列表。\n"
+"[b]注意：[/b]该方法所返回的字典与 [method Object.get_signal_list] 返回值的格式"
+"是一样的。"
+
 msgid ""
 "Returns [code]true[/code] if the script, or a base class, defines a signal "
 "with the given name."
@@ -143164,13 +155217,13 @@ msgstr "在按下增量按钮时显示。"
 msgid ""
 "Used as texture for the grabber, the draggable element representing current "
 "scroll."
-msgstr "用作拖动条的纹理，表示当前的可拖动元素。"
+msgstr "用作抓取器的纹理，表示当前的可拖动元素。"
 
 msgid "Used when the mouse hovers over the grabber."
-msgstr "当鼠标悬停在拖动条上时使用。"
+msgstr "当鼠标悬停在抓取器上时使用。"
 
 msgid "Used when the grabber is being dragged."
-msgstr "在拖动条被拖动时使用。"
+msgstr "在抓取器被拖动时使用。"
 
 msgid "Used as background of this [ScrollBar]."
 msgstr "用作此 [ScrollBar] 的背景。"
@@ -143261,6 +155314,15 @@ msgid ""
 "sensitive."
 msgstr "触摸滚动的死区。较低的死区使滚动更加敏感。"
 
+msgid ""
+"The way which scroll hints (indicators that show that the content can still "
+"be scrolled in a certain direction) will be shown.\n"
+"[b]Note:[/b] Hints won't be shown if the content can be scrolled both "
+"vertically and horizontally."
+msgstr ""
+"滚动提示（指示内容可以向特定方向滚动的指示器）的显示方式。\n"
+"[b]注意：[/b]如果内容可以同时在垂直和水平方向滚动，则不会显示提示。"
+
 msgid ""
 "The current horizontal scroll value.\n"
 "[b]Note:[/b] If you are setting this value in the [method Node._ready] "
@@ -143371,6 +155433,55 @@ msgstr ""
 "必要时显示滚动条，但是会按照滚动条始终显示来调整内容的大小。适合需要保证无论滚"
 "动条是否可见，内容大小都保持一致的场合。"
 
+msgid ""
+"Scroll hints will be shown at the top and bottom (if vertical), or left and "
+"right (if horizontal)."
+msgstr ""
+"滚动提示将显示在顶部和底部（如果是垂直的），或左侧和右侧（如果是水平的）。"
+
+msgid ""
+"Scroll hints will be shown at the top (if vertical), or the left (if "
+"horizontal)."
+msgstr "滚动提示将显示在顶部（如果是垂直的），或左侧（如果是水平的）。"
+
+msgid ""
+"Scroll hints will be shown at the bottom (if horizontal), or the right (if "
+"horizontal)."
+msgstr "滚动提示将显示在底部（如果是水平的），或右侧（如果是垂直的）。"
+
+msgid ""
+"[Color] used to modulate the [theme_item scroll_hint_horizontal] texture."
+msgstr "用于调制 [theme_item scroll_hint_horizontal] 纹理的 [Color]。"
+
+msgid "[Color] used to modulate the [theme_item scroll_hint_vertical] texture."
+msgstr "用于调制 [theme_item scroll_hint_vertical] 纹理的 [Color]。"
+
+msgid ""
+"The space between the ScrollContainer's vertical scroll bar and its content, "
+"in pixels. No space will be added when the content's minimum size is larger "
+"than the ScrollContainer's size."
+msgstr ""
+"ScrollContainer 的垂直滚动条与其内容之间的间距，单位为像素。如果内容的最小大小"
+"大于 ScrollContainer 的大小，则不会添加任何间距。"
+
+msgid ""
+"The space between the ScrollContainer's horizontal scroll bar and its "
+"content, in pixels. No space will be added when the content's minimum size is "
+"larger than the ScrollContainer's size."
+msgstr ""
+"ScrollContainer 的水平滚动条与其内容之间的间距，单位为像素。如果内容的最小大小"
+"大于 ScrollContainer 的大小，则不会添加任何间距。"
+
+msgid ""
+"The indicator that will be shown when the content can still be scrolled "
+"horizontally. See [member scroll_hint_mode]."
+msgstr "当内容仍可水平滚动时将显示的指示器。请参阅 [member scroll_hint_mode]。"
+
+msgid ""
+"The indicator that will be shown when the content can still be scrolled "
+"vertically. See [member scroll_hint_mode]."
+msgstr "当内容仍可垂直滚动时将显示的指示器。请参阅 [member scroll_hint_mode]。"
+
 msgid ""
 "The focus border [StyleBox] of the [ScrollContainer]. Only used if [member "
 "draw_focus_border] is [code]true[/code]."
@@ -143716,6 +155827,29 @@ msgid ""
 "Returns the current value set for this material of a uniform in the shader."
 msgstr "返回在着色器中此 uniform 材质的当前值。"
 
+msgid ""
+"Changes the value set for this material of a uniform in the shader.\n"
+"[b]Note:[/b] [param param] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector).\n"
+"[b]Note:[/b] Changes to the shader uniform will be effective on all instances "
+"using this [ShaderMaterial]. To prevent this, use per-instance uniforms with "
+"[method CanvasItem.set_instance_shader_parameter], [method "
+"GeometryInstance3D.set_instance_shader_parameter] or duplicate the "
+"[ShaderMaterial] resource using [method Resource.duplicate]. Per-instance "
+"uniforms allow for better shader reuse and are therefore faster, so they "
+"should be preferred over duplicating the [ShaderMaterial] when possible."
+msgstr ""
+"更改这个材质的着色器中为某个 uniform 设置的值。\n"
+"[b]注意：[/b][param param] 大小写敏感，必须完全匹配代码中 uniform 的名称（不是"
+"检查器中首字母大写后的名称）。\n"
+"[b]注意：[/b]对着色器 uniform 的修改会在使用这个 [ShaderMaterial] 的所有实例上"
+"生效。要防止这种行为，请通过 [method "
+"CanvasItem.set_instance_shader_parameter]、[method "
+"GeometryInstance3D.set_instance_shader_parameter] 使用各个实例的 uniform，或者"
+"使用 [method Resource.duplicate] 制作该 [ShaderMaterial] 的副本。各个实例的 "
+"uniform 可以更好地复用着色器，因此速度也更快，所以应该尽可能优先使用，而不是制"
+"作 [ShaderMaterial] 的副本。"
+
 msgid "The [Shader] program used to render this material."
 msgstr "用于渲染此材质的 [Shader] 程序。"
 
@@ -144734,10 +156868,10 @@ msgid ""
 msgstr ""
 "[Skeleton2D] 是 [Bone2D] 节点层级结构的父节点，持有对每个 [Bone2D] 的放松姿势"
 "的引用，充当其骨骼的单一访问点。\n"
-"要为给定的 Skeleton2D 设置不同类型的反向运动学机制，应当创建一个 "
+"要为给定的 Skeleton2D 设置不同类型的反向动力学机制，应当创建一个 "
 "[SkeletonModificationStack2D]。增加 [member "
 "SkeletonModificationStack2D.modification_count] 并创建所需数量的修改器即可应用"
-"反向运动学机制。"
+"反向动力学机制。"
 
 msgid "2D skeletons"
 msgstr "2D 骨架"
@@ -144898,6 +157032,11 @@ msgstr "返回 [param bone_idx] 骨骼的全局姿势覆盖变换。"
 msgid "Returns the global rest transform for [param bone_idx]."
 msgstr "返回 [param bone_idx] 骨骼的全局放松变换。"
 
+msgid ""
+"Returns the metadata with the given [param key] for the bone at index [param "
+"bone_idx]."
+msgstr "返回索引为 [param bone_idx] 的骨骼的给定 [param key] 对应的元数据。"
+
 msgid ""
 "Returns the list of all metadata keys for the bone at index [param bone_idx]."
 msgstr "返回索引为 [param bone_idx] 的骨骼中所有元数据的键名。"
@@ -144974,6 +157113,13 @@ msgstr ""
 "骨架版本没有被序列化：只能在 Skeleton3D 的单个实例中使用。\n"
 "用于使 IK 解算器中的和处理骨骼的其他节点中的缓存失效。"
 
+msgid ""
+"Returns [code]true[/code] if the bone at index [param bone_idx] has metadata "
+"with the given [param key]."
+msgstr ""
+"如果索引为 [param bone_idx] 的骨骼具有给定 [param key] 的元数据，则返回 "
+"[code]true[/code]。"
+
 msgid ""
 "Returns whether the bone pose for the bone at [param bone_idx] is enabled."
 msgstr "返回位于 [param bone_idx] 的骨骼是否启用了骨骼姿势。"
@@ -145027,6 +157173,13 @@ msgstr ""
 "姿势，请将节点的 [member Node3D.global_transform] 的 [method "
 "Transform3D.affine_inverse] 乘以所期望的世界变换。"
 
+msgid ""
+"Sets the metadata with the given [param key] to [param value] for the bone at "
+"index [param bone_idx]."
+msgstr ""
+"在索引为 [param bone_idx] 的骨骼的元数据中，将键为 [param key] 的值设置为 "
+"[param value]。"
+
 msgid "Sets the bone name, [param name], for the bone at [param bone_idx]."
 msgstr "将索引号为 [param bone_idx] 的骨骼的名称设置为 [param name]。"
 
@@ -145364,7 +157517,7 @@ msgid ""
 msgstr ""
 "该资源提供了一个可以扩展的接口，因此在 [Skeleton2D] 中的 [Bone2D] 节点上运行的"
 "代码可以被混合并匹配在一起，以创建复杂的交互。\n"
-"这用于为 Godot 提供一套灵活而强大的反向运动学解决方案，该解决方案可以适用许多"
+"这用于为 Godot 提供一套灵活而强大的反向动力学解决方案，该解决方案可以适用许多"
 "不同的用途。"
 
 msgid ""
@@ -145468,7 +157621,7 @@ msgid ""
 "CCDIK also fully supports angle constraints, allowing for more control over "
 "how a solution is met."
 msgstr ""
-"这种 [SkeletonModification2D] 使用的是名为循环坐标下降逆向运动学（Cyclic "
+"这种 [SkeletonModification2D] 使用的是名为循环坐标下降反向动力学（Cyclic "
 "Coordinate Descent Inverse Kinematics）的算法，即 CCDIK，能够对 [Skeleton2D] "
 "中的一条骨骼链进行操作，从而抵达指定的目标。\n"
 "CCDIK 的工作原理是让一组骨骼围绕单一轴旋转，这组骨骼通常称作“骨骼链”。每根骨骼"
@@ -145604,7 +157757,7 @@ msgid ""
 "which can nudge the bones in a certain direction prior to solving, giving a "
 "level of control over the final result."
 msgstr ""
-"这种 [SkeletonModification2D] 使用的是名为前后延伸反向运动学（Forward And "
+"这种 [SkeletonModification2D] 使用的是名为前后延伸反向动力学（Forward And "
 "Backward Reaching Inverse Kinematics）的算法，即 FABRIK，能够对一条骨骼链进行"
 "旋转，从而抵达目标。\n"
 "FABRIK 需要先拿到一系列骨骼的位置和长度，这组骨骼通常称作“骨骼链”。它首先会做"
@@ -146232,9 +158385,44 @@ msgstr ""
 "[method _process_modification] 不得将 [member influence] 应用于骨骼姿势，因为 "
 "[Skeleton3D] 会自动将影响应用于修改器设置的所有骨骼姿势。"
 
+msgid ""
+"Override this virtual method to implement a custom skeleton modifier. You "
+"should do things like get the [Skeleton3D]'s current pose and apply the pose "
+"here.\n"
+"[method _process_modification_with_delta] must not apply [member influence] "
+"to bone poses because the [Skeleton3D] automatically applies influence to all "
+"bone poses set by the modifier.\n"
+"[param delta] is passed from parent [Skeleton3D]. See also [method "
+"Skeleton3D.advance].\n"
+"[b]Note:[/b] This method may be called outside [method Node._process] and "
+"[method Node._physics_process] with [param delta] is [code]0.0[/code], since "
+"the modification should be processed immediately after initialization of the "
+"[Skeleton3D]."
+msgstr ""
+"覆盖该虚方法可以实现自定义骨架修改器。你应该在这里执行获取 [Skeleton3D] 的当前"
+"姿势、应用姿势之类的操作。\n"
+"[method _process_modification_with_delta] 不得将 [member influence] 应用于骨骼"
+"姿势，因为 [Skeleton3D] 会自动将影响应用于修改器设置的所有骨骼姿势。\n"
+"[param delta] 是由父级 [Skeleton3D] 传入的。另见 [method "
+"Skeleton3D.advance]。\n"
+"[b]注意：[/b]该方法可以在 [method Node._process] 和 [method "
+"Node._physics_process] 之外调用，[param delta] 为 [code]0.0[/code]，因为修改应"
+"该在 [Skeleton3D] 初始化之后立即处理。"
+
 msgid "Called when the skeleton is changed."
 msgstr "骨架发生改变时调用。"
 
+msgid ""
+"Called when bone names and indices need to be validated, such as when "
+"entering the scene tree or changing skeleton."
+msgstr "在骨骼名称和索引需要验证时调用，例如进入场景树时或更改骨架时。"
+
+msgid ""
+"Returns the parent [Skeleton3D] node if it exists. Otherwise, returns "
+"[code]null[/code]."
+msgstr ""
+"如果存在父级 [Skeleton3D] 节点则将其返回。否则，返回 [code]null[/code]。"
+
 msgid "If [code]true[/code], the [SkeletonModifier3D] will be processing."
 msgstr "如果为 [code]true[/code]，则 [SkeletonModifier3D] 将执行处理。"
 
@@ -146279,6 +158467,12 @@ msgstr "-Z 轴对应的枚举值。"
 msgid "Enumerated value for the axis from a parent bone to the child bone."
 msgstr "枚举值，表示从父骨骼指向子骨骼的轴。"
 
+msgid "Enumerated value for the case when the axis is undefined."
+msgstr "当轴未定义时对应的枚举值。"
+
+msgid "Enumerated value for an optional axis."
+msgstr "可选轴对应的枚举值。"
+
 msgid "Enumerated value for the rotation of the X axis."
 msgstr "枚举值，表示 X 轴的旋转。"
 
@@ -146291,6 +158485,9 @@ msgstr "枚举值，表示 Z 轴的旋转。"
 msgid "Enumerated value for the unconstrained rotation."
 msgstr "枚举值，表示无约束的旋转。"
 
+msgid "Enumerated value for an optional rotation axis."
+msgstr "可选旋转轴对应的枚举值。"
+
 msgid ""
 "Base class for a profile of a virtual skeleton used as a target for "
 "retargeting."
@@ -146495,6 +158692,135 @@ msgstr "不计算方向。"
 msgid "A humanoid [SkeletonProfile] preset."
 msgstr "人形 [SkeletonProfile] 预设。"
 
+msgid ""
+"A [SkeletonProfile] as a preset that is optimized for the human form. This "
+"exists for standardization, so all parameters are read-only.\n"
+"A humanoid skeleton profile contains 56 bones divided into 4 groups: [code]"
+"\"Body\"[/code], [code]\"Face\"[/code], [code]\"LeftHand\"[/code], and [code]"
+"\"RightHand\"[/code]. It is structured as follows:\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+msgstr ""
+"[SkeletonProfile] 是针对人形优化的预设。它存在的目的是进行标准化，因此所有参数"
+"都是只读的。\n"
+"人形骨架预设包含了 56 根骨骼，分为 [code]\"Body\"[/code]（身体）、[code]"
+"\"Face\"[/code]（面部）、 [code]\"LeftHand\"[/code]（左手）、[code]"
+"\"RightHand\"[/code]（右手）4 组。结构如下：\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+
 msgid ""
 "A reference-counted holder object for a skeleton RID used in the "
 "[RenderingServer]."
@@ -146704,14 +159030,14 @@ msgid ""
 "[code]true[/code], [member Range.value] is different from the value when the "
 "dragging was started."
 msgstr ""
-"停止拖拽拖动器时发出。如果 [param value_changed] 为 [code]true[/code]，则 "
+"停止拖拽抓取器时发出。如果 [param value_changed] 为 [code]true[/code]，则 "
 "[member Range.value] 与开始拖拽时的值不同。"
 
 msgid ""
 "Emitted when the grabber starts being dragged. This is emitted before the "
 "corresponding [signal Range.value_changed] signal."
 msgstr ""
-"开始拖拽拖动器时发出，时机在对应的 [signal Range.value_changed] 信号之前。"
+"开始拖拽抓取器时发出，时机在对应的 [signal Range.value_changed] 信号之前。"
 
 msgid ""
 "Places the ticks at the bottom of the [HSlider], or right of the [VSlider]."
@@ -146742,7 +159068,7 @@ msgid ""
 msgstr "刻度的垂直或水平偏移量。顶部和左侧刻度的偏移量是反的。"
 
 msgid "The texture for the grabber (the draggable element)."
-msgstr "用作拖动条的纹理（可拖动的元素）。"
+msgstr "用作抓取器（可拖动的元素）的纹理。"
 
 msgid "The texture for the grabber when it's disabled."
 msgstr "抓取器禁用时的材质。"
@@ -146969,6 +159295,12 @@ msgid ""
 msgstr ""
 "用于访问 [member angular_ortho/damping] 的常量。垂直于滑块的轴上的旋转阻尼量。"
 
+msgid "An abstract class for servers based on sockets."
+msgstr "基于套接字的服务器的抽象类。"
+
+msgid "A socket server."
+msgstr "套接字服务器。"
+
 msgid "Returns [code]true[/code] if a connection is available for taking."
 msgstr "如果有连接可供获取，则返回 [code]true[/code]。"
 
@@ -146980,6 +159312,10 @@ msgstr "如果服务器当前正在侦听连接，则返回 [code]true[/code]。
 msgid "Stops listening."
 msgstr "停止监听。"
 
+msgid ""
+"If a connection is available, returns a StreamPeerSocket with the connection."
+msgstr "如果连接可用，则返回带有该连接的 StreamPeerSocket。"
+
 msgid "A deformable 3D physics mesh."
 msgstr "可形变的 3D 物理网格。"
 
@@ -147104,9 +159440,6 @@ msgid ""
 "performance. Use with care."
 msgstr "增加这个值会改善模拟结果，但会影响性能。请小心使用。"
 
-msgid "The SoftBody3D's mass."
-msgstr "该 SoftBody3D 的质量。"
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
@@ -147275,6 +159608,16 @@ msgstr ""
 msgid "Changes the alignment of the underlying [LineEdit]."
 msgstr "更改底层 [LineEdit] 的对齐方式。"
 
+msgid ""
+"If [code]true[/code], the value will be rounded to a multiple of [member "
+"custom_arrow_step] when interacting with the arrow buttons. Otherwise, "
+"increments the value by [member custom_arrow_step] and then rounds it "
+"according to [member Range.step]."
+msgstr ""
+"如果为 [code]true[/code]，则与箭头按钮交互时，该值将四舍五入为 [member "
+"custom_arrow_step] 的倍数。否则，值将增加 [member custom_arrow_step]，然后根"
+"据 [member Range.step] 进行四舍五入。"
+
 msgid ""
 "If not [code]0[/code], sets the step when interacting with the arrow buttons "
 "of the [SpinBox].\n"
@@ -147449,6 +159792,123 @@ msgid ""
 "down buttons."
 msgstr "上下按钮之间的间隔区域内绘制的 [StyleBox]。"
 
+msgid "A [SkeletonModifier3D] for aligning bones along a [Path3D]."
+msgstr "用于沿 [Path3D] 对齐骨骼的 [SkeletonModifier3D]。"
+
+msgid ""
+"A [SkeletonModifier3D] for aligning bones along a [Path3D]. The smoothness of "
+"the fitting depends on the [member Curve3D.bake_interval].\n"
+"If you want the [Path3D] to attach to a specific bone, it is recommended to "
+"place a [ModifierBoneTarget3D] before the [SplineIK3D] in the "
+"[SkeletonModifier3D] list (children of the [Skeleton3D]), and then place a "
+"[Path3D] as the [ModifierBoneTarget3D]'s child.\n"
+"Bone twist is determined based on the [method Curve3D.get_point_tilt].\n"
+"If the root bone joint and the start point of the [Curve3D] are separated, it "
+"assumes that there is a linear line segment between them. This means that the "
+"vector pointing toward the start point of the [Curve3D] takes precedence over "
+"the shortest intersection point along the [Curve3D].\n"
+"If the end bone joint exceeds the path length, it is bent as close as "
+"possible to the end point of the [Curve3D]."
+msgstr ""
+"用于沿 [Path3D] 对齐骨骼的 [SkeletonModifier3D]。拟合的平滑度取决于 [member "
+"Curve3D.bake_interval]。\n"
+"如果希望 [Path3D] 附加到特定骨骼，建议在 [SkeletonModifier3D] 列表中"
+"（[Skeleton3D] 的子级）将 [ModifierBoneTarget3D] 放置在 [SplineIK3D] 之前，然"
+"后将 [Path3D] 放置为 [ModifierBoneTarget3D] 的子节点。\n"
+"骨骼扭转根据 [method Curve3D.get_point_tilt] 确定。\n"
+"如果根骨骼关节与 [Curve3D] 的起点不重合，则假定它们之间存在一条直线段。这意味"
+"着指向 [Curve3D] 起点的向量优先于沿 [Curve3D] 的最短交点。\n"
+"如果末端骨骼关节超出路径长度，则会将其弯曲到尽可能靠近 [Curve3D] 终点的位置。"
+
+msgid "Returns the node path of the [Path3D] which is describing the path."
+msgstr "返回描述路径的 [Path3D] 的节点路径。"
+
+msgid ""
+"Returns the tilt interpolation method used between the root bone and the "
+"start point of the [Curve3D] when they are apart. See also [method "
+"set_tilt_fade_in]."
+msgstr ""
+"根骨骼与 [Curve3D] 起始点不重合时，返回它们之间使用的倾斜插值方法。另见 "
+"[method set_tilt_fade_in]。"
+
+msgid ""
+"Returns the tilt interpolation method used between the end bone and the end "
+"point of the [Curve3D] when they are apart. See also [method "
+"set_tilt_fade_out]."
+msgstr ""
+"当末端骨骼和 [Curve3D] 的终点不重合时，返回它们之间使用的倾斜插值的方法。另见 "
+"[method set_tilt_fade_out]。"
+
+msgid "Returns if the tilt property of the [Curve3D] affects the bone twist."
+msgstr "返回 [Curve3D] 的倾斜属性是否影响骨骼扭转。"
+
+msgid "Sets the node path of the [Path3D] which is describing the path."
+msgstr "设置描述路径的 [Path3D] 的节点路径。"
+
+msgid "Sets if the tilt property of the [Curve3D] should affect the bone twist."
+msgstr "设置 [Curve3D] 的倾斜属性是否应该影响骨骼的扭转。"
+
+msgid ""
+"If [param size] is greater than [code]0[/code], the tilt is interpolated "
+"between [param size] start bones from the start point of the [Curve3D] when "
+"they are apart.\n"
+"If [param size] is equal [code]0[/code], the tilts between the root bone head "
+"and the start point of the [Curve3D] are unified with a tilt of the start "
+"point of the [Curve3D].\n"
+"If [param size] is less than [code]0[/code], the tilts between the root bone "
+"and the start point of the [Curve3D] are [code]0.0[/code]."
+msgstr ""
+"如果 [param size] 大于 [code]0[/code]，则当它们彼此分离时，倾斜角度会在从 "
+"[Curve3D] 起始点起的 [param size] 个起始骨骼之间进行插值计算。\n"
+"如果 [param size] 等于 [code]0[/code]，则根骨骼头部和 [Curve3D] 起始点之间的倾"
+"斜角度将与 [Curve3D] 起始点的倾斜角度保持一致。\n"
+"如果 [param size] 小于 [code]0[/code]，则根骨骼和 [Curve3D] 起始点之间的倾斜角"
+"度为 [code]0.0[/code]。"
+
+msgid ""
+"If [param size] is greater than [code]0[/code], the tilt is interpolated "
+"between [param size] end bones from the end point of the [Curve3D] when they "
+"are apart.\n"
+"If [param size] is equal [code]0[/code], the tilts between the end bone tail "
+"and the end point of the [Curve3D] are unified with a tilt of the end point "
+"of the [Curve3D].\n"
+"If [param size] is less than [code]0[/code], the tilts between the end bone "
+"and the end point of the [Curve3D] are [code]0.0[/code]."
+msgstr ""
+"如果 [param size] 大于 [code]0[/code]，则当它们彼此分离时，倾斜角度会在从 "
+"[Curve3D] 终点起的 [param size] 个末端骨骼之间进行插值计算。\n"
+"如果 [param size] 等于 [code]0[/code]，则末端骨骼尾部与 [Curve3D] 终点之间的倾"
+"斜角度将与 [Curve3D] 终点的倾斜角度保持一致。\n"
+"如果 [param size] 小于 [code]0[/code]，则末端骨骼与 [Curve3D] 终点之间的倾斜角"
+"度为 [code]0.0[/code]。"
+
+msgid ""
+"A container that arranges child controls horizontally or vertically and "
+"provides grabbers for adjusting the split ratios between them."
+msgstr ""
+"将两个子控件垂直或水平排列的容器，提供了用于调整它们之间分隔比例的抓取器。"
+
+msgid ""
+"A container that arranges child controls horizontally or vertically and "
+"creates grabbers between them. The grabbers can be dragged around to change "
+"the size relations between the child controls."
+msgstr ""
+"用于水平或垂直排列子控件的容器，还会在它们之间创建抓取器。可以拖动抓取器来改变"
+"子控件之间的大小关系。"
+
+msgid ""
+"Clamps the [member split_offsets] values to ensure they are within valid "
+"ranges and do not overlap with each other. When overlaps occur, this method "
+"prioritizes one split offset (at index [param priority_index]) by clamping "
+"any overlapping split offsets to it."
+msgstr ""
+"钳制 [member split_offsets] 的值以确保它们位于有效范围内且彼此不重叠。重叠时该"
+"方法会通过将所有重叠的分割偏移量钳制到该范围，以优先考虑某个分割偏移量（位于索"
+"引 [param priority_index] 处）。"
+
+msgid "Use the first element of [method get_drag_area_controls] instead."
+msgstr "请改用 [method get_drag_area_controls] 的第一个元素。"
+
 msgid ""
 "Returns the drag area [Control]. For example, you can move a pre-configured "
 "button into the drag area [Control] so that it rides along with the split "
@@ -147479,6 +159939,45 @@ msgstr ""
 "Control.MOUSE_FILTER_IGNORE]。\n"
 "[b]警告：[/b]这是必要的内部节点，将其移除或释放都可能造成崩溃。"
 
+msgid ""
+"Returns an [Array] of the drag area [Control]s. These are the interactable "
+"[Control] nodes between each child. For example, this can be used to add a "
+"pre-configured button to a drag area [Control] so that it rides along with "
+"the split bar. Try setting the [Button] anchors to [code]center[/code] prior "
+"to the [method Node.reparent] call.\n"
+"[codeblock]\n"
+"$BarnacleButton.reparent($SplitContainer.get_drag_area_controls()[0])\n"
+"[/codeblock]\n"
+"[b]Note:[/b] The drag area [Control]s are drawn over the [SplitContainer]'s "
+"children, so [CanvasItem] draw objects called from a drag area and children "
+"added to it will also appear over the [SplitContainer]'s children. Try "
+"setting [member Control.mouse_filter] of custom children to [constant "
+"Control.MOUSE_FILTER_IGNORE] to prevent blocking the mouse from dragging if "
+"desired.\n"
+"[b]Warning:[/b] These are required internal nodes, removing or freeing them "
+"may cause a crash."
+msgstr ""
+"返回拖拽区域 [Control] 的 [Array]。这些是每个子节点之间可交互的 [Control] 节"
+"点。例如，可以使用该方法将预配置的按钮添加到拖拽区域 [Control]，使其随分割条一"
+"起移动。尝试在调用 [method Node.reparent] 之前将 [Button] 的锚点设置为 "
+"[code]center[/code]。\n"
+"[codeblock]\n"
+"$BarnacleButton.reparent($SplitContainer.get_drag_area_controls()[0])\n"
+"[/codeblock]\n"
+"[b]注意：[/b]拖拽区域 [Control] 绘制在 [SplitContainer] 的子级之上，因此从拖拽"
+"区域调用的 [CanvasItem] 绘制对象以及添加到它的子对象也会出现在 "
+"[SplitContainer] 的子级之上。如果需要，可以尝试将自定义子级的 [member "
+"Control.mouse_filter] 设置为 [constant Control.MOUSE_FILTER_IGNORE] 以防止阻止"
+"鼠标拖动。\n"
+"[b]警告：[/b]这些是必要的内部节点，将其移除或释放都可能造成崩溃。"
+
+msgid ""
+"If [code]true[/code], the draggers will be disabled and the children will be "
+"sized as if all [member split_offsets] were [code]0[/code]."
+msgstr ""
+"如果为 [code]true[/code]，则会禁用拖动器，子节点会根据所有 [member "
+"split_offsets] 都为 [code]0[/code] 时的情况来调整大小。"
+
 msgid ""
 "Highlights the drag area [Rect2] so you can see where it is during "
 "development. The drag area is gold if [member dragging_enabled] is "
@@ -147517,6 +160016,43 @@ msgstr ""
 msgid "Enables or disables split dragging."
 msgstr "启用或禁用拆分拖拽。"
 
+msgid ""
+"Use [member split_offsets] instead. The first element of the array is the "
+"split offset between the first two children."
+msgstr ""
+"请改用 [member split_offsets]。数组的第一个元素是前两个子级之间的分割偏移量。"
+
+msgid "The first element of [member split_offsets]."
+msgstr "[member split_offsets] 的第一个元素。"
+
+msgid ""
+"Offsets for each dragger in pixels. Each one is the offset of the split "
+"between the [Control] nodes before and after the dragger, with [code]0[/code] "
+"being the default position. The default position is based on the [Control] "
+"nodes expand flags and minimum sizes. See [member "
+"Control.size_flags_horizontal], [member Control.size_flags_vertical], and "
+"[member Control.size_flags_stretch_ratio].\n"
+"If none of the [Control] nodes before the dragger are expanded, the default "
+"position will be at the start of the [SplitContainer]. If none of the "
+"[Control] nodes after the dragger are expanded, the default position will be "
+"at the end of the [SplitContainer]. If the dragger is in between expanded "
+"[Control] nodes, the default position will be in the middle, based on the "
+"[member Control.size_flags_stretch_ratio]s and minimum sizes.\n"
+"[b]Note:[/b] If the split offsets cause [Control] nodes to overlap, the first "
+"split will take priority when resolving the positions."
+msgstr ""
+"每个拖动器的偏移量，单位为像素。每个都是拖动器前后 [Control] 节点分割的偏移"
+"量，[code]0[/code] 为默认位置。默认位置基于 [Control] 节点的扩展标志和最小大"
+"小。请参阅 [member Control.size_flags_horizontal]、[member "
+"Control.size_flags_vertical] 和 [member Control.size_flags_stretch_ratio]。\n"
+"如果拖动器前面的所有 [Control] 节点都没有扩展，则默认位置位于 "
+"[SplitContainer] 的起始位置。如果拖动器后面的所有 [Control] 节点都没有扩展，则"
+"默认位置位于 [SplitContainer] 的末尾。如果拖动器位于两个已扩展的 [Control] 节"
+"点之间，则默认位置将位于中间，具体位置取决于 [member "
+"Control.size_flags_stretch_ratio] 和最小大小。\n"
+"[b]注意：[/b]如果分割偏移量导致 [Control] 节点重叠，则在确定位置时将优先使用第"
+"一个分割。"
+
 msgid ""
 "If [code]true[/code], a touch-friendly drag handle will be enabled for better "
 "usability on smaller screens. Unlike the standard grabber, this drag handle "
@@ -147543,6 +160079,9 @@ msgstr "用户结束拖拽时发出。"
 msgid "Emitted when the user starts dragging."
 msgstr "用户开始拖拽时发出。"
 
+msgid "Emitted when any dragger is dragged by user."
+msgstr "当用户拖动任意拖动器时发出。"
+
 msgid ""
 "The split dragger icon is always visible when [theme_item autohide] is "
 "[code]false[/code], otherwise visible only when the cursor hovers it.\n"
@@ -147552,8 +160091,8 @@ msgid ""
 msgstr ""
 "当 [theme_item autohide] 为 [code]false[/code] 时，拆分拖动器始终可见，否则仅"
 "在鼠标在拖动器上悬停时可见。\n"
-"拖动器图标的大小决定了最小间隔 [theme_item separation]。\n"
-"拖动器图标如果比拆分条长，就会自动隐藏。"
+"抓取器图标的大小决定了最小间隔 [theme_item separation]。\n"
+"抓取器图标如果比拆分条长，就会自动隐藏。"
 
 msgid ""
 "The split dragger icon is never visible regardless of the value of "
@@ -147561,7 +160100,7 @@ msgid ""
 "The size of the grabber icon determines the minimum [theme_item separation]."
 msgstr ""
 "拆分拖动器图标始终不可见，无视 [theme_item autohide] 的值。\n"
-"拖动器图标的大小决定了最小间隔 [theme_item separation]。"
+"抓取器图标的大小决定了最小间隔 [theme_item separation]。"
 
 msgid ""
 "The split dragger icon is not visible, and the split bar is collapsed to zero "
@@ -147577,6 +160116,60 @@ msgstr "触摸拖动器悬停状态的颜色。"
 msgid "The color of the touch dragger when pressed."
 msgstr "触摸拖动器按下状态的颜色。"
 
+msgid ""
+"Boolean value. If [code]1[/code] ([code]true[/code]), the grabbers will hide "
+"automatically when they aren't under the cursor. If [code]0[/code] "
+"([code]false[/code]), the grabbers are always visible. The [member "
+"dragger_visibility] must be [constant DRAGGER_VISIBLE]."
+msgstr ""
+"布尔值。如果为 [code]1[/code]（[code]true[/code]），则当抓取器不在光标下方时会"
+"自动隐藏。如果为 [code]0[/code]（[code]false[/code]），则抓取器始终可见。"
+"[member dragger_visibility] 必须设置为 [constant DRAGGER_VISIBLE]。"
+
+msgid ""
+"The minimum thickness of the area users can click on to grab a split bar. "
+"This ensures that the split bar can still be dragged if [theme_item "
+"separation] or [theme_item h_grabber] / [theme_item v_grabber]'s size is too "
+"narrow to easily select."
+msgstr ""
+"拆分条上用户可点击抓取区域的最小厚度。能够确保拆分条在 [theme_item "
+"separation] 或 [theme_item h_grabber] / [theme_item v_grabber] 过窄、难以选中"
+"时仍然可以拖动。"
+
+msgid ""
+"The split bar thickness, i.e., the gap between each child of the container. "
+"This is overridden by the size of the grabber icon if [member "
+"dragger_visibility] is set to [constant DRAGGER_VISIBLE], or [constant "
+"DRAGGER_HIDDEN], and [theme_item separation] is smaller than the size of the "
+"grabber icon in the same axis.\n"
+"[b]Note:[/b] To obtain [theme_item separation] values less than the size of "
+"the grabber icon, for example a [code]1 px[/code] hairline, set [theme_item "
+"h_grabber] or [theme_item v_grabber] to a new [ImageTexture], which "
+"effectively sets the grabber icon size to [code]0 px[/code]."
+msgstr ""
+"拆分条的粗细，即容器中每个子节点的间隙。如果 [member dragger_visibility] 为 "
+"[constant DRAGGER_VISIBLE] 或者为 [constant DRAGGER_HIDDEN] 的同时 "
+"[theme_item separation] 比抓取器图标相应方向的大小要小，这个粗细就会被抓取器图"
+"标的大小覆盖。\n"
+"[b]注意：[/b]如果要让 [theme_item separation] 比抓取器图标大小要小，例如想要设"
+"成 [code]1 px[/code] 的细线，请将 [theme_item h_grabber] 或 [theme_item "
+"v_grabber] 设为新的 [ImageTexture]，这样就把抓取器图标的大小设为了 [code]0 "
+"px[/code]。"
+
+msgid ""
+"The icon used for the grabbers drawn in the separations. This is only used in "
+"[HSplitContainer] and [VSplitContainer]. For [SplitContainer], see "
+"[theme_item h_grabber] and [theme_item v_grabber] instead."
+msgstr ""
+"用于在分隔条绘制的抓取器的图标。仅在 [HSplitContainer] 和 [VSplitContainer] 中"
+"使用。对于 [SplitContainer]，见 [theme_item h_grabber] 和 [theme_item "
+"v_grabber]。"
+
+msgid ""
+"The icon used for the grabbers drawn in the separations when [member "
+"vertical] is [code]false[/code]."
+msgstr "[member vertical] 为 [code]false[/code] 时绘制在分隔条的抓取器图标。"
+
 msgid ""
 "The icon used for the drag handle when [member touch_dragger_enabled] is "
 "[code]true[/code] and [member vertical] is [code]false[/code]."
@@ -147594,6 +160187,11 @@ msgstr ""
 "在 [HSplitContainer] 和 [VSplitContainer] 中使用。对于 [SplitContainer]，见 "
 "[theme_item h_touch_dragger] 和 [theme_item v_touch_dragger]。"
 
+msgid ""
+"The icon used for the grabbers drawn in the separations when [member "
+"vertical] is [code]true[/code]."
+msgstr "[member vertical] 为 [code]true[/code] 时绘制在分隔符的抓取器图标。"
+
 msgid ""
 "The icon used for the drag handle when [member touch_dragger_enabled] is "
 "[code]true[/code] and [member vertical] is [code]true[/code]."
@@ -147740,6 +160338,15 @@ msgid ""
 "from the collision check."
 msgstr "从碰撞检测排除 [PhysicsBody3D] 对象的列表中移除给定的 [RID]。"
 
+msgid ""
+"The layers against which the collision check will be done. See [url=$DOCS_URL/"
+"tutorials/physics/physics_introduction.html#collision-layers-and-"
+"masks]Collision layers and masks[/url] in the documentation for more "
+"information."
+msgstr ""
+"碰撞检测的目标层。更多信息请参阅文档中的[url=$DOCS_URL/tutorials/physics/"
+"physics_introduction.html#collision-layers-and-masks]《碰撞层与遮罩》[/url]。"
+
 msgid ""
 "When the collision check is made, a candidate length for the SpringArm3D is "
 "given.\n"
@@ -147982,6 +160589,20 @@ msgstr "返回骨骼链的关节半径阻尼曲线。"
 msgid "Returns the rotation axis of the bone chain."
 msgstr "返回骨骼链的旋转轴。"
 
+msgid ""
+"Returns the rotation axis vector of the bone chain. This vector represents "
+"the axis around which the bone chain can rotate. It is determined based on "
+"the rotation axis set for the bone chain.\n"
+"If [method get_rotation_axis] is [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL], this method returns [code]Vector3(0, "
+"0, 0)[/code]."
+msgstr ""
+"返回骨骼链的旋转轴向量。该向量表示骨骼链围绕哪个轴旋转，是根据为骨骼链设置的旋"
+"转轴确定的。\n"
+"如果 [method get_rotation_axis] 为 [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL]，则该方法返回 [code]Vector3(0, 0, 0)[/"
+"code]。"
+
 msgid "Returns the stiffness force of the bone chain."
 msgstr "返回骨骼链的刚度力。"
 
@@ -148158,6 +160779,23 @@ msgstr ""
 "当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
 "中 [param joint] 关节的半径。"
 
+msgid ""
+"Sets the rotation axis at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code].\n"
+"The axes are based on the [method Skeleton3D.get_bone_rest]'s space, if "
+"[param axis] is [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], you can "
+"specify any axis.\n"
+"[b]Note:[/b] The rotation axis and the forward vector shouldn't be colinear "
+"to avoid unintended rotation since [SpringBoneSimulator3D] does not factor in "
+"twisting forces."
+msgstr ""
+"设置当 [method is_config_individual] 为 [code]true[/code] 时，在骨骼链的关节列"
+"表中 [param joint] 的旋转轴。\n"
+"旋转轴基于 [method Skeleton3D.get_bone_rest] 的空间，如果 [param axis] 为 "
+"[constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM]，则可以指定任何轴。\n"
+"[b]注意：[/b]旋转轴和前向向量不应共线，否则可能造成意外旋转，因为 "
+"[SpringBoneSimulator3D] 不考虑扭转力。"
+
 msgid ""
 "Sets the stiffness force at [param joint] in the bone chain's joint list when "
 "[method is_config_individual] is [code]true[/code]."
@@ -148179,6 +160817,37 @@ msgstr ""
 msgid "Sets the joint radius damping curve of the bone chain."
 msgstr "设置骨骼链的关节半径阻尼曲线。"
 
+msgid ""
+"Sets the rotation axis of the bone chain. If set to a specific axis, it acts "
+"like a hinge joint. The value is cached in each joint setting in the joint "
+"list.\n"
+"The axes are based on the [method Skeleton3D.get_bone_rest]'s space, if "
+"[param axis] is [constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM], you can "
+"specify any axis.\n"
+"[b]Note:[/b] The rotation axis vector and the forward vector shouldn't be "
+"colinear to avoid unintended rotation since [SpringBoneSimulator3D] does not "
+"factor in twisting forces."
+msgstr ""
+"设置骨骼链的旋转轴。如果设置为特定的轴，行为就会像铰链关节。该值会缓存到关节列"
+"表中的每个关节设置中。\n"
+"旋转轴基于 [method Skeleton3D.get_bone_rest] 的空间，如果 [param axis] 为 "
+"[constant SkeletonModifier3D.ROTATION_AXIS_CUSTOM]，则可以指定任何轴。\n"
+"[b]注意：[/b]旋转轴向量和前向向量不应共线，否则可能造成意外旋转，因为 "
+"[SpringBoneSimulator3D] 不考虑扭转力。"
+
+msgid ""
+"Sets the rotation axis vector of the bone chain. The value is cached in each "
+"joint setting in the joint list.\n"
+"This vector is normalized by an internal process and represents the axis "
+"around which the bone chain can rotate.\n"
+"If the vector length is [code]0[/code], it is considered synonymous with "
+"[constant SkeletonModifier3D.ROTATION_AXIS_ALL]."
+msgstr ""
+"设置骨骼链的旋转轴向量。该值会缓存到关节列表中的每个关节设置中。\n"
+"该向量经过内部处理后会被归一化，表示骨骼链围绕哪个轴旋转。\n"
+"如果向量长度为 [code]0[/code]，则被视为与 [constant "
+"SkeletonModifier3D.ROTATION_AXIS_ALL] 同义。"
+
 msgid ""
 "Sets the stiffness force of the bone chain. The greater the value, the faster "
 "it recovers to its initial pose.\n"
@@ -148204,6 +160873,18 @@ msgstr ""
 "其结果。\n"
 "对于风和反重力等效果非常有用。"
 
+msgid ""
+"If [code]true[/code], the solver retrieves the bone axis from the bone pose "
+"every frame.\n"
+"If [code]false[/code], the solver retrieves the bone axis from the bone rest "
+"and caches it, which increases performance slightly, but position changes in "
+"the bone pose made before processing this [SpringBoneSimulator3D] are ignored."
+msgstr ""
+"如果为 [code]true[/code]，则求解器会每帧从骨骼姿势中检索骨骼轴。\n"
+"如果为 [code]false[/code]，则求解器会从骨骼放松姿势中检索骨骼轴并进行缓存，这"
+"会略微提高性能，但在该 [SpringBoneSimulator3D] 处理之前对骨骼姿势进行的任何位"
+"置更改都将被忽略。"
+
 msgid "The world origin is defined as center."
 msgstr "将世界原点定义为中心。"
 
@@ -148289,6 +160970,16 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns [code]true[/code] if the pixel at the given position is opaque, "
+"[code]false[/code] otherwise. Also returns [code]false[/code] if the given "
+"position is out of bounds or this sprite's [member texture] is [code]null[/"
+"code]. [param pos] is in local coordinates."
+msgstr ""
+"如果给定位置的像素不透明，则返回 [code]true[/code]，否则返回 [code]false[/"
+"code]。如果给定位置超出范围或该精灵的 [member texture] 为 [code]null[/code]，"
+"也会返回 [code]false[/code]。[param pos] 为局部坐标。"
+
 msgid ""
 "If [code]true[/code], texture is centered.\n"
 "[b]Note:[/b] For games with a pixel art aesthetic, textures may appear "
@@ -148866,6 +161557,16 @@ msgstr "从流中获取有符号 64 位值。"
 msgid "Returns the number of bytes this [StreamPeer] has available."
 msgstr "返回该 [StreamPeer] 可用的字节数。"
 
+msgid ""
+"Returns a chunk data with the received bytes, as an [Array] containing two "
+"elements: an [enum Error] constant and a [PackedByteArray]. [param bytes] is "
+"the number of bytes to be received. If not enough bytes are available, the "
+"function will block until the desired amount is received."
+msgstr ""
+"返回包含接收到的字节的块数据，该块数据是一个 [Array]，其中包含两个元素：一个 "
+"[enum Error] 常量和一个 [PackedByteArray]。[param bytes] 是要接收的字节数。如"
+"果可用字节数不足，则该函数将阻塞直到接收到所需的字节数为止。"
+
 msgid "Gets a double-precision float from the stream."
 msgstr "从流中获取一个双精度浮点数。"
 
@@ -148875,6 +161576,16 @@ msgstr "从流中获取一个单精度浮点数。"
 msgid "Gets a half-precision float from the stream."
 msgstr "从流中获取一个半精度浮点数。"
 
+msgid ""
+"Returns a chunk data with the received bytes, as an [Array] containing two "
+"elements: an [enum Error] constant and a [PackedByteArray]. [param bytes] is "
+"the number of bytes to be received. If not enough bytes are available, the "
+"function will return how many were actually received."
+msgstr ""
+"返回包含接收到的字节的块数据，该块数据是一个 [Array]，其中包含两个元素：一个 "
+"[enum Error] 常量和一个 [PackedByteArray]。[param bytes] 是要接收的字节数。如"
+"果可用的字节数不足，则该函数将返回实际接收到的字节数。"
+
 msgid ""
 "Gets an ASCII string with byte-length [param bytes] from the stream. If "
 "[param bytes] is negative (default) the length will be read from the stream "
@@ -149131,9 +161842,34 @@ msgstr ""
 "开始解压模式的流，缓冲区大小为 [param buffer_size]，如果 [param use_deflate] "
 "为 [code]true[/code] 则使用 deflate 而不是 GZIP。"
 
+msgid "Abstract base class for interacting with socket streams."
+msgstr "用于与套接字流交互的抽象基类。"
+
+msgid ""
+"StreamPeerSocket is an abstract base class that defines common behavior for "
+"socket-based streams."
+msgstr "StreamPeerSocket 是一个抽象基类，定义了基于套接字的流的通用行为。"
+
 msgid "Disconnects from host."
 msgstr "与主机断开连接。"
 
+msgid "Polls the socket, updating its state. See [method get_status]."
+msgstr "轮询套接字，更新其状态。见 [method get_status]。"
+
+msgid ""
+"The initial status of the [StreamPeerSocket]. This is also the status after "
+"disconnecting."
+msgstr "[StreamPeerSocket] 的初始状态。这也是断开连接后的状态。"
+
+msgid "A status representing a [StreamPeerSocket] that is connecting to a host."
+msgstr "表示 [StreamPeerSocket] 正在连接到主机的状态。"
+
+msgid "A status representing a [StreamPeerSocket] that is connected to a host."
+msgstr "表示 [StreamPeerSocket] 已连接到主机的状态。"
+
+msgid "A status representing a [StreamPeerSocket] in error state."
+msgstr "表示 [StreamPeerSocket] 处于错误状态的状态。"
+
 msgid "A stream peer that handles TCP connections."
 msgstr "处理 TCP 连接的流对等体。"
 
@@ -149260,6 +161996,41 @@ msgid ""
 "by the host and the domain requested for validation."
 msgstr "错误状态，表示主机的 TLS 证书域名与请求验证的域名不匹配。"
 
+msgid "A stream peer that handles UNIX Domain Socket (UDS) connections."
+msgstr "处理 UNIX 域套接字 (UDS) 连接的流对等体。"
+
+msgid ""
+"A stream peer that handles UNIX Domain Socket (UDS) connections. This object "
+"can be used to connect to UDS servers, or also is returned by a UDS server. "
+"Unix Domain Sockets provide inter-process communication on the same machine "
+"using the filesystem namespace.\n"
+"[b]Note:[/b] UNIX Domain Sockets are only available on UNIX-like systems "
+"(Linux, macOS, etc.) and are not supported on Windows."
+msgstr ""
+"处理 UNIX 域套接字 (UDS) 连接的流对等体。该对象可用于连接 UDS 服务器，也可由 "
+"UDS 服务器返回。Unix 域套接字使用文件系统命名空间在同一台机器上提供进程间通"
+"信。\n"
+"[b]注意：[/b]UNIX 域套接字仅在类 UNIX 系统（Linux、macOS 等）上可用，Windows "
+"系统上不受支持。"
+
+msgid ""
+"Opens the UDS socket, and binds it to the specified socket path.\n"
+"This method is generally not needed, and only used to force the subsequent "
+"call to [method connect_to_host] to use the specified [param path] as the "
+"source address."
+msgstr ""
+"打开 UDS 套接字，并将其绑定到指定的套接字路径。\n"
+"通常不需要该方法，它仅用于强制后续调用 [method connect_to_host] 时使用指定的 "
+"[param path] 作为源地址。"
+
+msgid ""
+"Connects to the specified UNIX Domain Socket path. Returns [constant OK] on "
+"success."
+msgstr "连接到指定的 UNIX 域套接字路径。成功时返回 [constant OK]。"
+
+msgid "Returns the socket path of this peer."
+msgstr "返回该对等体的套接字路径。"
+
 msgid "A built-in type for strings."
 msgstr "字符串内置类型。"
 
@@ -149576,6 +162347,56 @@ msgstr ""
 "要从字符串比较中获取 [bool] 结果，请改用 [code]==[/code] 运算符。另见 [method "
 "filecasecmp_to]、[method naturalnocasecmp_to] 和 [method nocasecmp_to]。"
 
+msgid ""
+"Returns the index of the [b]first[/b] occurrence of [param what] in this "
+"string, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the end of the string.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Team\".find(\"I\")) # Prints -1\n"
+"\n"
+"print(\"Potato\".find(\"t\"))    # Prints 2\n"
+"print(\"Potato\".find(\"t\", 3)) # Prints 4\n"
+"print(\"Potato\".find(\"t\", 5)) # Prints -1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Team\".Find(\"I\")); // Prints -1\n"
+"\n"
+"GD.Print(\"Potato\".Find(\"t\"));    // Prints 2\n"
+"GD.Print(\"Potato\".Find(\"t\", 3)); // Prints 4\n"
+"GD.Print(\"Potato\".Find(\"t\", 5)); // Prints -1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you just want to know whether the string contains [param "
+"what], use [method contains]. In GDScript, you may also use the [code]in[/"
+"code] operator.\n"
+"[b]Note:[/b] A negative value of [param from] is converted to a starting "
+"index by counting back from the last possible index with enough space to find "
+"[param what]."
+msgstr ""
+"返回 [param what] 在该字符串中[b]第一次[/b]出现的索引，如果不存在则返回 "
+"[code]-1[/code]。搜索的起点可以用 [param from] 指定，持续到字符串结尾。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Team\".find(\"I\")) # 输出 -1\n"
+"\n"
+"print(\"Potato\".find(\"t\"))    # 输出 2\n"
+"print(\"Potato\".find(\"t\", 3)) # 输出 4\n"
+"print(\"Potato\".find(\"t\", 5)) # 输出 -1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Team\".Find(\"I\")); // 输出 -1\n"
+"\n"
+"GD.Print(\"Potato\".Find(\"t\"));    // 输出 2\n"
+"GD.Print(\"Potato\".Find(\"t\", 3)); // 输出 4\n"
+"GD.Print(\"Potato\".Find(\"t\", 5)); // 输出 -1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]如果你只是想要知道该字符串中是否包含 [param what]，请使用 "
+"[method contains]。在 GDScript 中，你还可以使用 [code]in[/code] 运算符。\n"
+"[b]注意：[/b][param from] 的负值通过从最后一个有足够空间找到 [param what] 的索"
+"引开始倒数来转换为起始索引。"
+
 msgid ""
 "Returns the index of the [b]first[/b] [b]case-insensitive[/b] occurrence of "
 "[param what] in this string, or [code]-1[/code] if there are none. The "
@@ -149749,6 +162570,53 @@ msgstr ""
 "var file = \"/path/to/icon.png\".get_file() # file 为 \"icon.png\"\n"
 "[/codeblock]"
 
+msgid ""
+"Splits the string using a [param delimiter] and returns the substring at "
+"index [param slice]. Returns the original string if [param delimiter] does "
+"not occur in the string. Returns an empty string if the [param slice] does "
+"not exist.\n"
+"This is faster than [method split], if you only need one or two substrings.\n"
+"[codeblock]\n"
+"print(\"i/am/example/hi\".get_slice(\"/\", 2)) # Prints \"example\"\n"
+"[/codeblock]"
+msgstr ""
+"使用分隔符 [param delimiter] 拆分该字符串，返回索引为 [param slice] 的子串。如"
+"果字符串中不存在 [param delimiter] 则返回原字符串。如果 [param slice] 不存在则"
+"返回空字符串。\n"
+"只需要一两个子串时这个方法比 [method split] 快。\n"
+"[codeblock]\n"
+"print(\"i/am/example/hi\".get_slice(\"/\", 2)) # 输出“example”\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the total number of slices when the string is split with the given "
+"[param delimiter] (see [method split]).\n"
+"Use [method get_slice] to extract a specific slice.\n"
+"[codeblock]\n"
+"print(\"i/am/example/string\".get_slice_count(\"/\")) # Prints '4'.\n"
+"print(\"i am example string\".get_slice_count(\"/\")) # Prints '1'.\n"
+"[/codeblock]"
+msgstr ""
+"返回使用给定的 [param delimiter] 分割字符串时得到的切片总数（参见 [method "
+"split]）。\n"
+"使用 [method get_slice] 提取特定切片。\n"
+"[codeblock]\n"
+"print(\"i/am/example/string\".get_slice_count(\"/\")) # 输出 “4”。\n"
+"print(\"i am example string\".get_slice_count(\"/\")) # 输出 “1”。\n"
+"[/codeblock]"
+
+msgid ""
+"Splits the string using a Unicode character with code [param delimiter] and "
+"returns the substring at index [param slice]. Returns an empty string if the "
+"[param slice] does not exist.\n"
+"This is faster than [method split], if you only need one or two substrings.\n"
+"This is a Unicode version of [method get_slice]."
+msgstr ""
+"使用 Unicode 字符码分隔符 [param delimiter] 拆分该字符串，返回索引为 [param "
+"slice] 的子串。如果 [param slice] 不存在则返回空字符串。\n"
+"只需要一两个子串时这个方法比 [method split] 快。\n"
+"这是 [method get_slice] 的 Unicode 版本。"
+
 msgid ""
 "Returns the 32-bit hash value representing the string's contents.\n"
 "[b]Note:[/b] Strings with equal hash values are [i]not[/i] guaranteed to be "
@@ -150474,6 +163342,11 @@ msgstr ""
 "移除字符串中出现的所有码位为 [param what] 的 Unicode 字符。相较于调用 [method "
 "replace] 时键为单字符串且替换为 [code]\"\"[/code] 要快。"
 
+msgid ""
+"Removes all occurrences of the characters in [param chars]. See also [method "
+"remove_char]."
+msgstr "移除所有出现在 [param chars] 中的字符。另见 [method remove_char]。"
+
 msgid ""
 "Repeats this string a number of times. [param count] needs to be greater than "
 "[code]0[/code]. Otherwise, returns an empty string."
@@ -150522,6 +163395,26 @@ msgstr ""
 "返回该字符串的逆序的副本。该操作适用于 Unicode 代码点，而不是代码点序列，并且"
 "可能会破坏复合字母或表情符号等内容。"
 
+msgid ""
+"Returns the index of the [b]last[/b] occurrence of [param what] in this "
+"string, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the beginning of the string. This "
+"method is the reverse of [method find].\n"
+"[b]Note:[/b] A negative value of [param from] is converted to a starting "
+"index by counting back from the last possible index with enough space to find "
+"[param what].\n"
+"[b]Note:[/b] A value of [param from] that is greater than the last possible "
+"index with enough space to find [param what] is considered out-of-bounds, and "
+"returns [code]-1[/code]."
+msgstr ""
+"返回这个字符串中 [param what] [b]最后一次[/b]出现时的索引，不存在时则为 "
+"[code]-1[/code]。搜索的起点可以用 [param from] 指定，终点为该字符串的开头。这"
+"个方法与 [method find] 相对。\n"
+"[b]注意：[/b][param from] 的负值通过从最后一个有足够空间找到 [param what] 的索"
+"引开始倒数来转换为起始索引。\n"
+"[b]注意：[/b]如果 [param from] 的值大于能够找到 [param what] 的最后一个可能索"
+"引，则视为越界，并返回 [code]-1[/code]。"
+
 msgid ""
 "Returns the index of the [b]last[/b] [b]case-insensitive[/b] occurrence of "
 "[param what] in this string, or [code]-1[/code] if there are none. The "
@@ -152611,6 +165504,23 @@ msgstr ""
 "成法线平坦的网格，那么就应该使用 [code]uint32.MaxValue[/code] 而不是 "
 "[code]-1[/code]。"
 
+msgid ""
+"Specifies a tangent to use for the [i]next[/i] vertex. If every vertex needs "
+"to have this information set and you fail to submit it for the first vertex, "
+"this information may not be used at all.\n"
+"[b]Note:[/b] Even though [param tangent] is a [Plane], it does not directly "
+"represent the tangent plane. Its [member Plane.x], [member Plane.y], and "
+"[member Plane.z] represent the tangent vector and [member Plane.d] should be "
+"either [code]-1[/code] or [code]1[/code]. See also [constant "
+"Mesh.ARRAY_TANGENT]."
+msgstr ""
+"指定用于[i]下一个[/i]顶点的切线。如果每个顶点都需要设置该信息，但你未能为第一"
+"个顶点提交，则该信息可能根本不会被使用。\n"
+"[b]注意：[/b]尽管 [param tangent] 是一个 [Plane]，但它并不直接表示切平面。它"
+"的 [member Plane.x]、[member Plane.y] 和 [member Plane.z] 表示切向量，而 "
+"[member Plane.d] 应该为 [code]-1[/code] 或 [code]1[/code]。另见 [constant "
+"Mesh.ARRAY_TANGENT]。"
+
 msgid ""
 "Specifies a set of UV coordinates to use for the [i]next[/i] vertex. If every "
 "vertex needs to have this information set and you fail to submit it for the "
@@ -153013,6 +165923,14 @@ msgstr ""
 "设置索引为 [param tab_idx] 处选项卡所允许的最大图标宽度。这是在图标的默认大小"
 "和 [theme_item icon_max_width] 的基础上的限制。高度会根据图标的长宽比调整。"
 
+msgid ""
+"Sets the language code of the title for the tab at index [param tab_idx] to "
+"[param language]. This is used for line-breaking and text shaping algorithms. "
+"If [param language] is empty, the current locale is used."
+msgstr ""
+"将索引为 [param tab_idx] 的选项卡的标题语言代码设置为 [param language]。这是用"
+"于断行和文本塑形算法的。如果 [param language] 为空，则使用当前区域设置。"
+
 msgid ""
 "Sets the metadata value for the tab at index [param tab_idx], which can be "
 "retrieved later using [method get_tab_metadata]."
@@ -153046,6 +165964,13 @@ msgstr ""
 "如果为 [code]true[/code]，则会隐藏超出该节点宽度的选项卡，改为显示两个导航按"
 "钮。否则，会更新该节点的最小尺寸，让所有选项卡均可见。"
 
+msgid ""
+"If [code]true[/code], middle-clicking on a tab will emit the [signal "
+"tab_close_pressed] signal."
+msgstr ""
+"如果为 [code]true[/code]，则在选项卡上点击鼠标中键将发出 [signal "
+"tab_close_pressed] 信号。"
+
 msgid ""
 "The index of the current selected tab. A value of [code]-1[/code] means that "
 "no tab is selected and can only be set when [member deselect_enabled] is "
@@ -153085,6 +166010,19 @@ msgid ""
 "If [code]true[/code], enables selecting a tab with the right mouse button."
 msgstr "如果为 [code]true[/code]，启用鼠标右键选择选项卡。"
 
+msgid ""
+"If [code]true[/code], hovering over a tab while dragging something will "
+"switch to that tab. Does not have effect when hovering another tab to "
+"rearrange. The delay for when this happens is dictated by [theme_item "
+"hover_switch_wait_msec]."
+msgstr ""
+"如果为 [code]true[/code]，则在拖动内容时将鼠标悬停在选项卡上将切换到该选项卡。"
+"将鼠标悬停在另一个标签页上进行重新排列时无效。该操作的延迟时间由 [theme_item "
+"hover_switch_wait_msec] 决定。"
+
+msgid "The horizontal alignment of the tabs."
+msgstr "选项卡的水平对齐方式。"
+
 msgid "When the close button will appear on the tabs."
 msgstr "选项卡上显示关闭按钮的时机。"
 
@@ -153117,15 +166055,56 @@ msgstr "切换到另一个选项卡时发出。"
 msgid "Emitted when a tab is clicked, even if it is the current tab."
 msgstr "单击选项卡时发出，即使它是当前选项卡。"
 
+msgid ""
+"Emitted when a tab's close button is pressed or, if [member "
+"close_with_middle_mouse] is [code]true[/code], when middle-clicking on a "
+"tab.\n"
+"[b]Note:[/b] Tabs are not removed automatically; this behavior needs to be "
+"coded manually. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$TabBar.tab_close_pressed.connect($TabBar.remove_tab)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<TabBar>(\"TabBar\").TabClosePressed += "
+"GetNode<TabBar>(\"TabBar\").RemoveTab;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"当按下选项卡的关闭按钮时，或者如果 [member close_with_middle_mouse] 为 "
+"[code]true[/code] 且中键点击选项卡时，会发出。\n"
+"[b]注意：[/b]选项卡不会自动移除；这种行为需要手动编写代码来实现。例如：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$TabBar.tab_close_pressed.connect($TabBar.remove_tab)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<TabBar>(\"TabBar\").TabClosePressed += "
+"GetNode<TabBar>(\"TabBar\").RemoveTab;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Emitted when a tab is hovered by the mouse."
 msgstr "当鼠标悬停选项卡时发出。"
 
+msgid "Emitted when a tab is right-clicked."
+msgstr "右键点击选项卡时发出。"
+
 msgid ""
 "Emitted when a tab is selected via click, directional input, or script, even "
 "if it is the current tab."
 msgstr ""
 "通过点击、定向输入或脚本选中某个选项卡时发出，即便该选项卡本来就是当前选项卡。"
 
+msgid "Aligns tabs to the left."
+msgstr "将选项卡左对齐。"
+
+msgid "Aligns tabs in the middle."
+msgstr "将选项卡居中对齐。"
+
+msgid "Aligns tabs to the right."
+msgstr "将选项卡右对齐。"
+
 msgid "Represents the size of the [enum AlignmentMode] enum."
 msgstr "代表 [enum AlignmentMode] 枚举的大小。"
 
@@ -153145,7 +166124,7 @@ msgid "Modulation color for the [theme_item drop_mark] icon."
 msgstr "[theme_item drop_mark] 图标的调制颜色。"
 
 msgid "Font color of disabled tabs."
-msgstr "禁用选项卡的字体颜色。"
+msgstr "禁用的选项卡的字体颜色。"
 
 msgid ""
 "Font color of the currently hovered tab. Does not apply to the selected tab."
@@ -153160,9 +166139,27 @@ msgstr "当前所选选项卡的字体颜色。"
 msgid "Font color of the other, unselected tabs."
 msgstr "其他未被选中的选项卡的字体颜色。"
 
+msgid "Icon color of disabled tabs."
+msgstr "禁用的选项卡的图标颜色。"
+
+msgid ""
+"Icon color of the currently hovered tab. Does not apply to the selected tab."
+msgstr "当前悬停的选项卡的图标颜色。不适用于选中的选项卡。"
+
+msgid "Icon color of the currently selected tab."
+msgstr "当前所选选项卡的图标颜色。"
+
+msgid "Icon color of the other, unselected tabs."
+msgstr "其他未被选中的选项卡的图标颜色。"
+
 msgid "The horizontal separation between the elements inside tabs."
 msgstr "选项卡内元素之间的水平分隔。"
 
+msgid ""
+"During a drag-and-drop, this is how many milliseconds to wait before "
+"switching the tab."
+msgstr "在拖放操作中，切换选项卡之前需要等待的毫秒数。"
+
 msgid ""
 "The maximum allowed width of the tab's icon. This limit is applied on top of "
 "the default size of the icon, but before the value set with [method "
@@ -153259,7 +166256,7 @@ msgstr ""
 "[StyleBox] 显示在基础 [StyleBox] [i]之上[/i]，所以应该使用部分透明的 "
 "[StyleBox]，确保基础 [StyleBox] 仍然可见。代表轮廓或下划线的 [StyleBox] 可以很"
 "好地实现这个目的。要禁用聚焦的视觉效果，请指定 [StyleBoxEmpty] 资源。请注意，"
-"禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的可用性，所以出于可访问性的原"
+"禁用聚焦的视觉效果会影响使用键盘/手柄进行导航的可用性，所以出于无障碍访问的原"
 "因，不建议这样做。"
 
 msgid ""
@@ -153408,6 +166405,14 @@ msgstr ""
 "的状态。点击 [member current_tab] 取消选中。\n"
 "未选中任何选项卡时只会显示选项卡头。"
 
+msgid ""
+"If [code]true[/code], hovering over a tab while dragging something will "
+"switch to that tab. Does not have effect when hovering another tab to "
+"rearrange."
+msgstr ""
+"如果为 [code]true[/code]，则在拖动内容时将鼠标悬停在选项卡上将切换到该选项卡。"
+"将鼠标悬停在另一个标签页上进行重新排列时无效。"
+
 msgid "The position at which tabs will be placed."
 msgstr "选项卡的放置位置。"
 
@@ -155078,6 +168083,13 @@ msgstr ""
 "当使用 [method set_gutter_type] 将边栏设置为自定义时，它被用于包含由通过 "
 "[method set_gutter_custom_draw] 方法设置的回调方法控制的自定义视觉效果。"
 
+msgid ""
+"Assign a [StyleBoxFlat] to [theme_item normal] instead, and set [member "
+"StyleBoxFlat.bg_color] to the desired background color."
+msgstr ""
+"改为将 [StyleBoxFlat] 分配给 [theme_item normal]，并将 [member "
+"StyleBoxFlat.bg_color] 设置为所需的背景颜色。"
+
 msgid "Sets the background [Color] of this [TextEdit]."
 msgstr "设置该 [TextEdit] 的背景 [Color]。"
 
@@ -155131,8 +168143,11 @@ msgid ""
 "scaling factor."
 msgstr ""
 "文本光标的像素宽度。较大的值能够确保光标易于看到，确保光标与较大的字体保持一"
-"致，从而提高可访问性。如果设置为 [code]0[/code] 或更低，光标的宽度将被自动设置"
-"为 1 像素，并乘以显示缩放系数。"
+"致，从而改善无障碍访问。如果设置为 [code]0[/code] 或更低，光标的宽度将被自动设"
+"置为 1 像素，并乘以显示缩放系数。"
+
+msgid "Sets an additional margin for line wrapping width."
+msgstr "设置换行宽度的额外边距。"
 
 msgid "Sets the default [Font]."
 msgstr "设置默认的字体 [Font]。"
@@ -155160,7 +168175,7 @@ msgstr ""
 "[StyleBox] [i]之上[/i]，因此应使用部分透明的 [StyleBox] 以确保基础 [StyleBox] "
 "保持可见。表示轮廓或下划线的 [StyleBox] 非常适合此目的。要禁用焦点视觉效果，请"
 "指定一个 [StyleBoxEmpty] 资源。请注意，禁用焦点视觉效果会破坏键盘 / 控制器导航"
-"的可用性，出于可访问性原因，不建议这样做。"
+"的可用性，出于无障碍访问的原因，不建议这样做。"
 
 msgid "Sets the [StyleBox] of this [TextEdit]."
 msgstr "设置这个 [TextEdit] 的 [StyleBox]。"
@@ -155198,6 +168213,9 @@ msgstr ""
 "的左上角。如果 [param oversampling] 大于零则会用作字体过采样系数，否则使用视口"
 "的过采样设置。"
 
+msgid "Duplicates this [TextLine]."
+msgstr "复制该 [TextLine]。"
+
 msgid "Returns the text writing direction inferred by the BiDi algorithm."
 msgstr "返回由 BiDi 算法推断的文本书写方向。"
 
@@ -155234,6 +168252,11 @@ msgstr "返回 TextServer 缓冲区 RID。"
 msgid "Returns size of the bounding box of the text."
 msgstr "返回文本边界框的大小。"
 
+msgid ""
+"Returns [code]true[/code] if an object with [param key] is embedded in this "
+"line."
+msgstr "如果该行中嵌入了具有 [param key] 的对象，则返回 [code]true[/code]。"
+
 msgid ""
 "Returns caret character offset at the specified pixel offset at the baseline. "
 "This function always returns a valid position."
@@ -155293,6 +168316,18 @@ msgstr ""
 "UV 布局由 4 个横条组成，从上到下依次为：正面占 40% 高度，背面占 40% 的高度，外"
 "面占 10% 的高度，内侧面占 10% 的高度。"
 
+msgid ""
+"Step (in pixels) used to approximate Bézier curves. Lower values result in "
+"smoother curves, but is slower to generate and render. Consider adjusting "
+"this according to the font size and the typical viewing distance.\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts."
+msgstr ""
+"用于近似贝塞尔曲线的步长（单位为像素）。值越小，曲线越平滑，但生成和渲染速度越"
+"慢。请根据字体大小和典型的观看距离进行调整。\n"
+"[b]注意：[/b]更改该属性会重新生成网格，这是一个耗时的操作，尤其是在字体较大和"
+"文本较长时。"
+
 msgid ""
 "Depths of the mesh, if set to [code]0.0[/code] only front surface, is "
 "generated, and UV layout is changed to use full texture for the front face "
@@ -155301,6 +168336,48 @@ msgstr ""
 "生成的网格的深度，设为 [code]0.0[/code] 时只有正面，此时的 UV 布局会变为让正面"
 "占据整张纹理。"
 
+msgid ""
+"Font size of the [TextMesh]'s text. This property works in tandem with "
+"[member pixel_size]. Higher values will result in a more detailed font, "
+"regardless of [member curve_step] and [member pixel_size]. Consider keeping "
+"this value below 63 (inclusive) for good performance, and adjust [member "
+"pixel_size] as needed to enlarge text.\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts. To change the "
+"text's size in real-time efficiently, change the node's [member Node3D.scale] "
+"instead."
+msgstr ""
+"[TextMesh] 文本的字体大小。该属性与 [member pixel_size] 协同工作。无论 "
+"[member curve_step] 和 [member pixel_size] 的值如何，更高的值都会产生更精细的"
+"字体。为了获得良好的性能，请考虑将该值保持在 63（含）以下，并根据需要调整 "
+"[member pixel_size] 以放大文本。\n"
+"[b]注意：[/b]更改该属性会重新生成网格，这是一个耗时的操作，尤其是在字体较大且"
+"文本较长时。要高效地实时更改文本大小，请改为更改节点的 [member Node3D.scale]。"
+
+msgid ""
+"The text drawing offset (in pixels).\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation. To change the text's position in real-time efficiently, change the "
+"node's [member Node3D.position] instead."
+msgstr ""
+"文本绘制偏移量（单位为像素）。\n"
+"[b]注意：[/b]更改该属性会重新生成网格，这是一个耗时的操作。要高效地实时更改文"
+"本位置，请改为更改节点的 [member Node3D.position]。"
+
+msgid ""
+"The size of one pixel's width on the text to scale it in 3D. This property "
+"works in tandem with [member font_size].\n"
+"[b]Note:[/b] Changing this property will regenerate the mesh, which is a slow "
+"operation, especially with large font sizes and long texts. To change the "
+"text's size in real-time efficiently, change the node's [member Node3D.scale] "
+"instead."
+msgstr ""
+"用于缩放文本在 3D 空间中单个像素宽度的大小。该属性与 [member font_size] 协同工"
+"作。\n"
+"[b]注意：[/b]更改该属性会重新生成网格，这是一个耗时的操作，尤其是在字体大小较"
+"大且文本较长时。要高效地实时更改文本大小，请改为更改节点的 [member "
+"Node3D.scale]。"
+
 msgid ""
 "The text to generate mesh from.\n"
 "[b]Note:[/b] Due to being a [Resource], it doesn't follow the rules of "
@@ -155388,6 +168465,9 @@ msgstr ""
 "[param pos] 指定的是边界框的左上角。如果 [param oversampling] 大于零则会用作字"
 "体过采样系数，否则使用视口的过采样设置。"
 
+msgid "Duplicates this [TextParagraph]."
+msgstr "复制该 [TextParagraph]。"
+
 msgid "Returns number of lines used by dropcap."
 msgstr "返回首字下沉使用的行数。"
 
@@ -155446,6 +168526,13 @@ msgstr "返回 TextServer 完整字符串缓冲区的 RID。"
 msgid "Returns the size of the bounding box of the paragraph."
 msgstr "返回段落边界框的大小。"
 
+msgid ""
+"Returns [code]true[/code] if an object with [param key] is embedded in this "
+"shaped text buffer."
+msgstr ""
+"如果该塑形文本缓冲区中嵌入了具有 [param key] 的对象，则返回 [code]true[/"
+"code]。"
+
 msgid ""
 "Returns caret character offset at the specified coordinates. This function "
 "always returns a valid position."
@@ -155636,6 +168723,9 @@ msgstr ""
 "请改用 [Viewport] 过采样或 [code skip-lint]draw_*[/code] 方法的 [code skip-"
 "lint]oversampling[/code] 参数。"
 
+msgid "This method does nothing and always returns [code]1.0[/code]."
+msgstr "该方法不执行任何操作，并且始终返回 [code]1.0[/code]。"
+
 msgid ""
 "Returns outline contours of the glyph as a [Dictionary] with the following "
 "contents:\n"
@@ -155791,6 +168881,11 @@ msgstr ""
 "如果自动提示被支持且优先于字体内置提示，则返回 [code]true[/code]。仅由动态字体"
 "使用。"
 
+msgid ""
+"Returns [code]true[/code] if color modulation is applied when drawing the "
+"font's colored glyphs."
+msgstr "如果绘制字体彩色字形时应用了颜色调制，则返回 [code]true[/code]。"
+
 msgid ""
 "Returns [code]true[/code] if glyphs of all sizes are rendered using single "
 "multichannel signed distance field generated from the dynamic font vector "
@@ -155993,6 +169088,17 @@ msgstr "返回支持的 OpenType 特性的字典。"
 msgid "Returns the dictionary of the supported OpenType variation coordinates."
 msgstr "返回支持的 OpenType 变体坐标的字典。"
 
+msgid "Use [method TranslationServer.format_number] instead."
+msgstr "请改用 [method TranslationServer.format_number]。"
+
+msgid ""
+"Converts a number from Western Arabic (0..9) to the numeral system used in "
+"the given [param language].\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"将数字从西阿拉伯数字（0..9）转换为给定 [param language] 中使用的记数系统。\n"
+"如果 [param language] 为空字符串，则会使用激活的区域设置。"
+
 msgid "Frees an object created by this [TextServer]."
 msgstr "释放由该 [TextServer] 创建的某个对象。"
 
@@ -156049,6 +169155,12 @@ msgstr ""
 msgid "Returns [code]true[/code] if locale is right-to-left."
 msgstr "如果区域设置为从右至左，则返回 [code]true[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if the locale requires text server support data for "
+"line/word breaking."
+msgstr ""
+"如果区域设置需要文本服务器支持数据以进行断行、断词，则返回 [code]true[/code]。"
+
 msgid ""
 "Returns [code]true[/code] if [param string] is a valid identifier.\n"
 "If the text server supports the [constant FEATURE_UNICODE_IDENTIFIERS] "
@@ -156091,9 +169203,36 @@ msgstr ""
 "[b]注意：[/b]这个函数应该在使用任何其他 TextServer 函数之前调用，否则不会起任"
 "何作用。"
 
+msgid ""
+"Converts the given readable name of a feature, variation, script, or language "
+"to an OpenType tag."
+msgstr "将给定的特性、变体、文字、语言的可读名称转换为 OpenType 标记。"
+
+msgid "Use [method TranslationServer.parse_number] instead."
+msgstr "请改用 [method TranslationServer.parse_number]。"
+
+msgid ""
+"Converts [param number] from the numeral system used in the given [param "
+"language] to Western Arabic (0..9).\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"将 [param number] 从给定 [param language] 所使用的记数系统转换为西阿拉伯数字"
+"（0..9）。\n"
+"如果 [param language] 为空字符串，则会使用激活的区域设置。"
+
 msgid "Default implementation of the BiDi algorithm override function."
 msgstr "BiDi 算法覆盖函数的默认实现。"
 
+msgid "Use [method TranslationServer.get_percent_sign] instead."
+msgstr "改用 [method TranslationServer.get_percent_sign]。"
+
+msgid ""
+"Returns the percent sign used in the given [param language].\n"
+"If [param language] is an empty string, the active locale will be used."
+msgstr ""
+"返回给定语言 [param language] 中使用的百分号。\n"
+"如果 [param language] 是空字符串，则会使用激活的区域设置。"
+
 msgid ""
 "Saves optional TextServer database (e.g. ICU break iterators and "
 "dictionaries) to the file.\n"
@@ -156202,6 +169341,9 @@ msgstr ""
 "右、纵向排版时朝下。如果 [param clip_l] 非负数，则会裁剪在偏移量之前开始的字"
 "形。如果 [param clip_r] 非负数，则会裁剪在偏移量之后结束的字形。"
 
+msgid "Duplicates shaped text buffer."
+msgstr "复制塑形文本缓冲区。"
+
 msgid "Adjusts text width to fit to specified width, returns new text width."
 msgstr "两端对齐文本以适合指定宽度，返回新的文本宽度。"
 
@@ -156480,6 +169622,45 @@ msgstr ""
 "[0, 9, 10, 19]\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the string converted to [code]lowercase[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"返回转换为 [code]lowercase[/code] 的字符串。\n"
+"[b]注意：[/b]如果服务器支持 [constant "
+"FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] 特性（由 [TextServerAdvanced] 支"
+"持），则大小写取决于区域设置和上下文敏感。\n"
+"[b]注意：[/b]结果可能比原字符更长，也可能更短。"
+
+msgid ""
+"Returns the string converted to [code]Title Case[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"返回转换为 [code]Title Case[/code] 的字符串。\n"
+"[b]注意：[/b]如果服务器支持 [constant "
+"FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] 特性（由 [TextServerAdvanced] 支"
+"持），则大小写取决于区域设置和上下文敏感。\n"
+"[b]注意：[/b]结果可能比原字符更长，也可能更短。"
+
+msgid ""
+"Returns the string converted to [code]UPPERCASE[/code].\n"
+"[b]Note:[/b] Casing is locale dependent and context sensitive if server "
+"support [constant FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] feature "
+"(supported by [TextServerAdvanced]).\n"
+"[b]Note:[/b] The result may be longer or shorter than the original."
+msgstr ""
+"返回转换为 [code]UPPERCASE[/code] 的字符串。\n"
+"[b]注意：[/b]如果服务器支持 [constant "
+"FEATURE_CONTEXT_SENSITIVE_CASE_CONVERSION] 特性（由 [TextServerAdvanced] 支"
+"持），则大小写取决于区域设置和上下文敏感。\n"
+"[b]注意：[/b]结果可能比原字符更长，也可能更短。"
+
 msgid ""
 "Strips diacritics from the string.\n"
 "[b]Note:[/b] The result may be longer or shorter than the original."
@@ -156487,6 +169668,11 @@ msgstr ""
 "从字符串中剥离变音符号。\n"
 "[b]注意：[/b]得到的字符串可能比原来的更长，也可能更短。"
 
+msgid ""
+"Converts the given OpenType tag to the readable name of a feature, variation, "
+"script, or language."
+msgstr "将给定的 OpenType 标签转换为特性、变体、文字、语言的可读名称。"
+
 msgid "Font glyphs are rasterized as 1-bit bitmaps."
 msgstr "字体字形栅格化为 1 位的位图。"
 
@@ -156765,6 +169951,13 @@ msgid ""
 "JustificationFlag])."
 msgstr "在尝试修剪文本之前考虑文本是否对齐（请参阅 [enum JustificationFlag]）。"
 
+msgid ""
+"Determines whether the ellipsis should be added regardless of the string "
+"length, otherwise it is added only if the string is 6 characters or longer."
+msgstr ""
+"决定是否无论字符串长度如何都应添加省略号，否则仅当字符串长度为 6 个字符或更长"
+"时才添加省略号。"
+
 msgid "Grapheme is supported by the font, and can be drawn."
 msgstr "字素由字体支持，并且可以被绘制。"
 
@@ -157222,6 +170415,9 @@ msgid ""
 "dictionaries)."
 msgstr "加载可选的 TextServer 数据库（例如 ICU 中断迭代器和字典）。"
 
+msgid "Returns percent sign used in the given [param language]."
+msgstr "返回给定 [param language] 中使用的百分号符号。"
+
 msgid ""
 "Increases the reference count of the specified oversampling level. This "
 "method is called by [Viewport], and should not be used directly."
@@ -157311,6 +170507,9 @@ msgstr ""
 "返回分词边界的数组。数组中的元素是单词起始位置和结束位置的偏移量。因此数组的长"
 "度始终为偶数。"
 
+msgid "Returns the string converted to [code]Title Case[/code]."
+msgstr "返回转换为 [code]Title Case[/code] 的字符串。"
+
 msgid "Strips diacritics from the string."
 msgstr "从字符串中剥离变音符号。"
 
@@ -157568,10 +170767,35 @@ msgid ""
 "[RenderingDevice]."
 msgstr "用于 2D 的纹理数组，与 [RenderingDevice] 上创建的纹理绑定。"
 
+msgid ""
+"This texture array class allows you to use a 2D array texture created "
+"directly on the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture2DArrayRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture2DArray] instead."
+msgstr ""
+"该纹理数组类允许你使用直接在 [RenderingDevice] 上创建的 2D 数组纹理作为材质、"
+"网格等的纹理。\n"
+"[b]注意：[/b][Texture2DArrayRD] 旨在用于 [RenderingDevice] 的底层操作。对于大"
+"多数用例，请改用 [Texture2DArray]。"
+
+msgid "Compute Texture demo"
+msgstr "计算纹理演示"
+
 msgid ""
 "Texture for 2D that is bound to a texture created on the [RenderingDevice]."
 msgstr "用于 2D 的纹理，与 [RenderingDevice] 上创建的纹理绑定。"
 
+msgid ""
+"This texture class allows you to use a 2D texture created directly on the "
+"[RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture2DRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture2D] instead."
+msgstr ""
+"该纹理类允许你使用直接在 [RenderingDevice] 上创建的 2D 纹理作为材质、网格等的"
+"纹理。\n"
+"[b]注意：[/b][Texture2DRD] 旨在用于 [RenderingDevice] 的底层操作。对于大多数用"
+"例，请改用 [Texture2D]。"
+
 msgid "The RID of the texture object created on the [RenderingDevice]."
 msgstr "[RenderingDevice] 上创建的纹理对象的 RID。"
 
@@ -157649,6 +170873,17 @@ msgid ""
 "Texture for 3D that is bound to a texture created on the [RenderingDevice]."
 msgstr "被绑定到在 [RenderingDevice] 上创建的纹理的 3D 的纹理。"
 
+msgid ""
+"This texture class allows you to use a 3D texture created directly on the "
+"[RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [Texture3DRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Texture3D] instead."
+msgstr ""
+"该纹理类允许你使用直接在 [RenderingDevice] 上创建的 3D 纹理作为材质、网格等的"
+"纹理。\n"
+"[b]注意：[/b][Texture3DRD] 旨在用于 [RenderingDevice] 的底层操作。对于大多数用"
+"例，请改用 [Texture3D]。"
+
 msgid ""
 "Texture-based button. Supports Pressed, Hover, Disabled and Focused states."
 msgstr "基于纹理的按钮。支持按下、悬停、停用和焦点状态。"
@@ -157718,7 +170953,7 @@ msgstr ""
 "texture_focused] 会在基础纹理上方显示，所以要让基础纹理可见就应该使用半透明纹"
 "理。这种情况下比较适用代表轮廓或者下划线的纹理。要禁用焦点的视觉效果，请分配一"
 "张任意大小的全透明纹理。请注意，禁用焦点的视觉效果不利于键盘/控制器的导航，所"
-"以出于可用性的原因并不建议这么做。"
+"以出于无障碍访问的原因并不建议这么做。"
 
 msgid ""
 "Texture to display when the mouse hovers over the node. If not assigned, the "
@@ -157781,11 +171016,33 @@ msgid ""
 "[RenderingDevice]."
 msgstr "立方体贴图的纹理数组，被绑定到在 [RenderingDevice] 上创建的纹理。"
 
+msgid ""
+"This texture class allows you to use a cubemap array texture created directly "
+"on the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [TextureCubemapArrayRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [CubemapArray] instead."
+msgstr ""
+"该纹理类允许你使用直接在 [RenderingDevice] 上创建的立方体贴图数组纹理作为材"
+"质、网格等的纹理。\n"
+"[b]注意：[/b][TextureCubemapArrayRD] 旨在用于 [RenderingDevice] 的底层操作。对"
+"于大多数用例，请改用 [CubemapArray]。"
+
 msgid ""
 "Texture for Cubemap that is bound to a texture created on the "
 "[RenderingDevice]."
 msgstr "被绑定到在 [RenderingDevice] 上创建的纹理的立方体贴图的纹理。"
 
+msgid ""
+"This texture class allows you to use a cubemap texture created directly on "
+"the [RenderingDevice] as a texture for materials, meshes, etc.\n"
+"[b]Note:[/b] [TextureCubemapRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [Cubemap] instead."
+msgstr ""
+"该纹理类允许你使用直接在 [RenderingDevice] 上创建的立方体贴图纹理作为材质、网"
+"格等的纹理。\n"
+"[b]注意：[/b][TextureCubemapRD] 旨在用于 [RenderingDevice] 的底层操作。对于大"
+"多数用例，请改用 [Cubemap]。"
+
 msgid ""
 "Base class for texture types which contain the data of multiple [Image]s. "
 "Each image is of the same size and format."
@@ -157869,6 +171126,18 @@ msgstr "纹理为 [CubemapArray]，每个立方体贴图都由 6 层组成。"
 msgid "Abstract base class for layered texture RD types."
 msgstr "分层纹理 RD 类型的抽象基类。"
 
+msgid ""
+"Base class for [Texture2DArrayRD], [TextureCubemapRD] and "
+"[TextureCubemapArrayRD]. Cannot be used directly, but contains all the "
+"functions necessary for accessing the derived resource types.\n"
+"[b]Note:[/b] [TextureLayeredRD] is intended for low-level usage with "
+"[RenderingDevice]. For most use cases, use [TextureLayered] instead."
+msgstr ""
+"[Texture2DArrayRD]、[TextureCubemapRD] 和 [TextureCubemapArrayRD] 的基类。不能"
+"直接使用，但包含了访问派生资源类型所需的所有函数。\n"
+"[b]注意：[/b][TextureLayeredRD] 旨在用于 [RenderingDevice] 的底层操作。对于大"
+"多数用例，请改用 [TextureLayered]。"
+
 msgid ""
 "Texture-based progress bar. Useful for loading screens and life or stamina "
 "bars."
@@ -158964,6 +172233,15 @@ msgstr ""
 "[method wait_to_finish] 是否可以不阻塞调用的线程。\n"
 "要检查 [Thread] 是否可被并入，请使用 [method is_started]。"
 
+msgid ""
+"Returns [code]true[/code] if the thread this method was called from is the "
+"main thread.\n"
+"[b]Note:[/b] This is a static method and isn't associated with a specific "
+"[Thread] object."
+msgstr ""
+"如果调用该方法的线程是主线程，则返回 [code]true[/code]。\n"
+"[b]注意：[/b]这是一个静态方法，与特定的 [Thread] 对象无关。"
+
 msgid ""
 "Returns [code]true[/code] if this [Thread] has been started. Once started, "
 "this will return [code]true[/code] until it is joined using [method "
@@ -160176,6 +173454,23 @@ msgstr ""
 "\t\treturn 0\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the coordinates of the physics quadrant (see [member "
+"physics_quadrant_size]) for given physics body [RID]. Such an [RID] can be "
+"retrieved from [method KinematicCollision2D.get_collider_rid], when colliding "
+"with a tile.\n"
+"[b]Note:[/b] Higher values of [member physics_quadrant_size] will make this "
+"function less precise. To get the exact cell coordinates, you need to set "
+"[member physics_quadrant_size] to [code]1[/code], which disables physics "
+"chunking."
+msgstr ""
+"返回给定物理体 [RID] 对应的物理象限的坐标（见 [member "
+"physics_quadrant_size]）。与图块发生碰撞时，可以通过 [method "
+"KinematicCollision2D.get_collider_rid] 获取该 [RID]。\n"
+"[b]注意：[/b][member physics_quadrant_size] 的值越大，该函数的精度越低。要获取"
+"精确的单元格坐标，需要将 [member physics_quadrant_size] 设置为 [code]1[/"
+"code]，这将禁用物理分块。"
+
 msgid ""
 "Returns the [RID] of the [NavigationServer2D] navigation used by this "
 "[TileMapLayer].\n"
@@ -160443,6 +173738,30 @@ msgstr ""
 msgid "Enable or disable light occlusion."
 msgstr "启用或禁用光线遮蔽。"
 
+msgid ""
+"The [TileMapLayer]'s physics quadrant size. Within a physics quadrant, cells "
+"with similar physics properties are grouped together and their collision "
+"shapes get merged. [member physics_quadrant_size] defines the length of a "
+"square's side, in the map's coordinate system, that forms the quadrant. Thus, "
+"the default quadrant size groups together [code]16 * 16 = 256[/code] tiles.\n"
+"[b]Note:[/b] As quadrants are created according to the map's coordinate "
+"system, the quadrant's \"square shape\" might not look like square in the "
+"[TileMapLayer]'s local coordinate system.\n"
+"[b]Note:[/b] This impacts the value returned by [method "
+"get_coords_for_body_rid]. Higher values will make that function less precise. "
+"To get the exact cell coordinates, you need to set [member "
+"physics_quadrant_size] to [code]1[/code], which disables physics chunking."
+msgstr ""
+"[TileMapLayer] 的物理象限大小。物理象限中具有相似的物理属性的单元格会被分组在"
+"一起，其碰撞形状会被合并。[member physics_quadrant_size] 定义的是形成象限的正"
+"方形的边长，使用地图坐标系。因此，默认象限大小将 [code]16 * 16 = 256[/code] 个"
+"图块组合到了一起。\n"
+"[b]注意：[/b]象限是根据地图坐标系创建的，“正方形”的象限在 [TileMapLayer] 的局"
+"部坐标系中可能看起来并不像正方形。\n"
+"[b]注意：[/b]这会影响 [method get_coords_for_body_rid] 方法返回的值。值越大，"
+"该函数的精度越低。要获取精确的单元格坐标，需要将 [member "
+"physics_quadrant_size] 设置为 [code]1[/code]，这将禁用物理分块。"
+
 msgid ""
 "The [TileMapLayer]'s rendering quadrant size. A quadrant is a group of tiles "
 "to be drawn together on a single canvas item, for optimization purposes. "
@@ -161236,6 +174555,14 @@ msgid ""
 "create_alternative_tile] would return."
 msgstr "返回后续调用 [method create_alternative_tile] 时将返回的备选 ID。"
 
+msgid ""
+"If [member use_texture_padding] is [code]false[/code], returns [member "
+"texture]. Otherwise, returns an internal [ImageTexture] created that includes "
+"the padding."
+msgstr ""
+"如果 [member use_texture_padding] 为 [code]false[/code]，则返回 [member "
+"texture]。否则，创建并返回包含内边距的内部 [ImageTexture]。"
+
 msgid ""
 "Returns the region of the tile at coordinates [param atlas_coords] for the "
 "given [param frame] inside the texture returned by [method "
@@ -162062,6 +175389,43 @@ msgstr "星期六，使用数字 [code]6[/code] 表示。"
 msgid "A countdown timer."
 msgstr "倒数计时器。"
 
+msgid ""
+"The [Timer] node is a countdown timer and is the simplest way to handle time-"
+"based logic in the engine. When a timer reaches the end of its [member "
+"wait_time], it will emit the [signal timeout] signal.\n"
+"After a timer enters the scene tree, it can be manually started with [method "
+"start]. A timer node is also started automatically if [member autostart] is "
+"[code]true[/code].\n"
+"Without requiring much code, a timer node can be added and configured in the "
+"editor. The [signal timeout] signal it emits can also be connected through "
+"the Signals dock in the editor:\n"
+"[codeblock]\n"
+"func _on_timer_timeout():\n"
+"\tprint(\"Time to attack!\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] To create a one-shot timer without instantiating a node, use "
+"[method SceneTree.create_timer].\n"
+"[b]Note:[/b] Timers are affected by [member Engine.time_scale] unless [member "
+"ignore_time_scale] is [code]true[/code]. The higher the time scale, the "
+"sooner timers will end. How often a timer processes may depend on the "
+"framerate or [member Engine.physics_ticks_per_second]."
+msgstr ""
+"[Timer] 即计时器节点，是一种倒计时器，也是引擎中最简单的处理基于时间的逻辑的方"
+"法。计时器在等待 [member wait_time] 结束后就会发出 [signal timeout] 信号。\n"
+"计时器进入场景树时，可以使用 [method start] 手动启动。如果 [member autostart] "
+"为 [code]true[/code]，计时器节点也会自动启动。\n"
+"可以在编辑器中添加并配置计时器节点，无需编写特别多的代码。计时器发出的 "
+"[signal timeout] 信号可以在编辑器的“信号”面板中连接：\n"
+"[codeblock]\n"
+"func _on_timer_timeout():\n"
+"\tprint(\"是时候表演真正的技术了！\")\n"
+"[/codeblock]\n"
+"[b]注意：[/b]如果只想创建一次性的计时器，不想实例化节点，请使用 [method "
+"SceneTree.create_timer]。\n"
+"[b]注意：[/b]除非 [member ignore_time_scale] 为 [code]true[/code]，否则计时器"
+"会受到 [member Engine.time_scale] 的影响。时间缩放值越大，计时器结束得越早。计"
+"时器的处理频率取决于帧率或 [member Engine.physics_ticks_per_second]。"
+
 msgid "Returns [code]true[/code] if the timer is stopped or has not started."
 msgstr "如果定时器处于停止状态或尚未启动，则返回 [code]true[/code]。"
 
@@ -163262,6 +176626,20 @@ msgid ""
 "translations."
 msgstr "语言翻译，能够将一组字符串映射到对应的翻译。"
 
+msgid ""
+"[Translation] maps a collection of strings to their individual translations, "
+"and also provides convenience methods for pluralization.\n"
+"A [Translation] consists of messages. A message is identified by its context "
+"and untranslated string. Unlike [url=https://www.gnu.org/software/"
+"gettext/]gettext[/url], using an empty context string in Godot means not "
+"using any context."
+msgstr ""
+"[Translation] 将一组字符串映射到其各自的翻译，并提供一些方便的复数形式处理方"
+"法。\n"
+"[Translation] 包含多条消息。消息通过其上下文和未翻译的字符串来识别。与 "
+"[url=https://www.gnu.org/software/gettext/]gettext[/url] 不同，在 Godot 中使用"
+"空上下文字符串意味着不使用任何上下文。"
+
 msgid "Internationalizing games"
 msgstr "将游戏国际化"
 
@@ -163285,6 +176663,15 @@ msgstr ""
 "如果不存在，则添加一条消息，后跟其翻译。\n"
 "可以使用一个额外的上下文，来指定翻译上下文或区分多义词。"
 
+msgid ""
+"Adds a message involving plural translation if nonexistent, followed by its "
+"translation.\n"
+"An additional context could be used to specify the translation context or "
+"differentiate polysemic words."
+msgstr ""
+"如果不存在相应的复数形式翻译，则添加一条，后跟其翻译。\n"
+"可以使用额外的上下文来指定翻译上下文或区分多义词。"
+
 msgid "Erases a message."
 msgstr "删除信息。"
 
@@ -163294,6 +176681,41 @@ msgstr "返回信息的翻译。"
 msgid "Returns the number of existing messages."
 msgstr "返回现有信息的数量。"
 
+msgid ""
+"Returns the keys of all messages, that is, the context and untranslated "
+"strings of each message.\n"
+"[b]Note:[/b] If a message does not use a context, the corresponding element "
+"is the untranslated string. Otherwise, the corresponding element is the "
+"context and untranslated string separated by the EOT character ([code]U+0004[/"
+"code]). This is done for compatibility purposes.\n"
+"[codeblock]\n"
+"for key in translation.get_message_list():\n"
+"\tvar p = key.find(\"\\u0004\")\n"
+"\tif p == -1:\n"
+"\t\tvar untranslated = key\n"
+"\t\tprint(\"Message %s\" % untranslated)\n"
+"\telse:\n"
+"\t\tvar context = key.substr(0, p)\n"
+"\t\tvar untranslated = key.substr(p + 1)\n"
+"\t\tprint(\"Message %s with context %s\" % [untranslated, context])\n"
+"[/codeblock]"
+msgstr ""
+"返回所有消息的键，即每条消息的上下文和未翻译的字符串。\n"
+"[b]注意：[/b]如果消息不使用上下文，则对应的元素为未翻译的字符串。否则，相应的"
+"元素是上下文和未翻译的字符串，以 EOT 字符（[code]U+0004[/code]）分隔。这样做是"
+"为了保持兼容性。\n"
+"[codeblock]\n"
+"for key in translation.get_message_list():\n"
+"\tvar p = key.find(\"\\u0004\")\n"
+"\tif p == -1:\n"
+"\t\tvar untranslated = key\n"
+"\t\tprint(\"消息 %s\" % untranslated)\n"
+"\telse:\n"
+"\t\tvar context = key.substr(0, p)\n"
+"\t\tvar untranslated = key.substr(p + 1)\n"
+"\t\tprint(\"消息 %s 其上下文 %s\" % [untranslated, context])\n"
+"[/codeblock]"
+
 msgid ""
 "Returns a message's translation involving plurals.\n"
 "The number [param n] is the number or quantity of the plural object. It will "
@@ -163309,9 +176731,26 @@ msgstr ""
 "[b]注意：[/b]仅[url=$DOCS_URL/tutorials/i18n/localization_using_gettext.html]"
 "基于 gettext 的翻译（PO）[/url]支持复数，CSV 不支持。"
 
+msgid "Returns all the translated strings."
+msgstr "返回所有已翻译的字符串。"
+
 msgid "The locale of the translation."
 msgstr "翻译的区域设置。"
 
+msgid ""
+"The plural rules string to enforce. See [url=https://www.gnu.org/software/"
+"gettext/manual/html_node/Plural-forms.html]GNU gettext[/url] for examples and "
+"more info.\n"
+"If empty or invalid, default plural rules from [method "
+"TranslationServer.get_plural_rules] are used. The English plural rules are "
+"used as a fallback."
+msgstr ""
+"要强制执行的复数规则字符串。有关示例和更多信息，请参阅 [url=https://"
+"www.gnu.org/software/gettext/manual/html_node/Plural-forms.html]GNU gettext[/"
+"url]。\n"
+"如果为空或无效，则使用 [method TranslationServer.get_plural_rules] 中的默认复"
+"数规则。英文复数规则被用作回退方案。"
+
 msgid "A self-contained collection of [Translation] resources."
 msgstr "独立的 [Translation] 资源合集。"
 
@@ -163331,11 +176770,23 @@ msgstr "添加翻译。"
 msgid "Removes all translations."
 msgstr "移除所有翻译。"
 
+msgid ""
+"Returns the [Translation] instances that match [param locale] (see [method "
+"TranslationServer.compare_locales]). If [param exact] is [code]true[/code], "
+"only instances whose locale exactly equals [param locale] will be returned."
+msgstr ""
+"返回与 [param locale] 匹配的 [Translation] 实例（见 [method "
+"TranslationServer.compare_locales]）。如果 [param exact] 为 [code]true[/"
+"code]，则仅返回其区域设置与 [param locale] 完全相等的实例。"
+
 msgid ""
 "Returns the locale override of the domain. Returns an empty string if locale "
 "override is disabled."
 msgstr "返回翻译域的区域设置覆盖项。如果禁用区域设置覆盖则返回空字符串。"
 
+msgid "Use [method find_translations] instead."
+msgstr "请改用 [method find_translations]。"
+
 msgid ""
 "Returns the [Translation] instance that best matches [param locale]. Returns "
 "[code]null[/code] if there are no matches."
@@ -163343,6 +176794,27 @@ msgstr ""
 "返回与 [param locale] 最为匹配的 [Translation] 实例。如果没有能够匹配的翻译则"
 "返回 [code]null[/code]。"
 
+msgid ""
+"Returns all available [Translation] instances as added by [method "
+"add_translation]."
+msgstr "返回通过 [method add_translation] 添加的所有可用 [Translation] 实例。"
+
+msgid ""
+"Returns [code]true[/code] if this translation domain contains the given "
+"[param translation]."
+msgstr "如果该翻译域包含给定的 [param translation]，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if there are any [Translation] instances that match "
+"[param locale] (see [method TranslationServer.compare_locales]). If [param "
+"exact] is [code]true[/code], only instances whose locale exactly equals "
+"[param locale] are considered."
+msgstr ""
+"如果存在任何与 [param locale] 匹配（见 [method "
+"TranslationServer.compare_locales]）的 [Translation] 实例，则返回 [code]true[/"
+"code]。如果 [param exact] 为 [code]true[/code]，则仅考虑其区域设置与 [param "
+"locale] 完全相等的实例。"
+
 msgid ""
 "Returns the pseudolocalized string based on the [param message] passed in."
 msgstr "根据传入的 [param message] 返回伪本地化字符串。"
@@ -163540,6 +177012,21 @@ msgstr ""
 "比较两个区域设置，返回 [code]0[/code]（不匹配）和 [code]10[/code]（完全匹配）"
 "之间的相似度得分。"
 
+msgid ""
+"Returns the [Translation] instances in the main translation domain that match "
+"[param locale] (see [method compare_locales]). If [param exact] is "
+"[code]true[/code], only instances whose locale exactly equals [param locale] "
+"will be returned."
+msgstr ""
+"返回主翻译域中与 [param locale] 匹配（见 [method compare_locales]）的 "
+"[Translation] 实例。如果 [param exact] 为 [code]true[/code]，则仅返回其区域设"
+"置与 [param locale] 完全匹配的实例。"
+
+msgid ""
+"Converts a number from Western Arabic (0..9) to the numeral system used in "
+"the given [param locale]."
+msgstr "将数字从阿拉伯数字（0..9）转换为给定 [param locale] 中使用的记数系统。"
+
 msgid "Returns an array of known country codes."
 msgstr "返回已知地区代码的数组。"
 
@@ -163581,6 +177068,12 @@ msgstr ""
 "返回给定名称对应的翻译域。如果不存在使用该名称的翻译域，则会创建并添加一个空的"
 "翻译域。"
 
+msgid "Returns the percent sign used in the given [param locale]."
+msgstr "返回给定 [param locale] 中使用的百分号。"
+
+msgid "Returns the default plural rules for the [param locale]."
+msgstr "返回 [param locale] 的默认复数规则。"
+
 msgid "Returns a readable script name for the [param script] code."
 msgstr "返回文字代码 [param script] 的可读文字名称。"
 
@@ -163599,11 +177092,40 @@ msgstr ""
 "返回主翻译域中与 [param locale] 最为匹配的 [Translation] 实例。如果没有能够匹"
 "配的翻译则返回 [code]null[/code]。"
 
+msgid ""
+"Returns all available [Translation] instances in the main translation domain "
+"as added by [method add_translation]."
+msgstr ""
+"返回通过 [method add_translation] 添加的主翻译域中所有可用的 [Translation] 实"
+"例。"
+
 msgid ""
 "Returns [code]true[/code] if a translation domain with the specified name "
 "exists."
 msgstr "如果存在指定名称的翻译域，则返回 [code]true[/code]。"
 
+msgid ""
+"Returns [code]true[/code] if the main translation domain contains the given "
+"[param translation]."
+msgstr "如果主翻译域包含给定的 [param translation]，则返回 [code]true[/code]。"
+
+msgid ""
+"Returns [code]true[/code] if there are any [Translation] instances in the "
+"main translation domain that match [param locale] (see [method "
+"compare_locales]). If [param exact] is [code]true[/code], only instances "
+"whose locale exactly equals [param locale] are considered."
+msgstr ""
+"如果主翻译域中存在与 [param locale] 匹配（见 [method compare_locales]）的 "
+"[Translation] 实例，则返回 [code]true[/code]。如果 [param exact] 为 "
+"[code]true[/code]，则仅考虑其区域设置与 [param locale] 完全相等的实例。"
+
+msgid ""
+"Converts [param number] from the numeral system used in the given [param "
+"locale] to Western Arabic (0..9)."
+msgstr ""
+"将数字 [param number] 从给定 [param locale] 中使用的记数系统转换为西阿拉伯数字"
+"（0..9）。"
+
 msgid ""
 "Returns the pseudolocalized string based on the [param message] passed in.\n"
 "[b]Note:[/b] This method always uses the main translation domain."
@@ -163841,6 +177363,9 @@ msgstr "返回列标题的基础书写方向。"
 msgid "Returns column title language code."
 msgstr "返回列标题的语言代码。"
 
+msgid "Returns the column title's tooltip text."
+msgstr "返回列标题的工具提示文本。"
+
 msgid "Returns the column's width in pixels."
 msgstr "返回列的宽度，单位是像素。"
 
@@ -164035,6 +177560,17 @@ msgstr ""
 msgid "Sets column title base writing direction."
 msgstr "设置列标题的基础书写方向。"
 
+msgid ""
+"Sets the language code of the given [param column]'s title to [param "
+"language]. This is used for line-breaking and text shaping algorithms. If "
+"[param language] is empty, the current locale is used."
+msgstr ""
+"将给定 [param column] 的标题的语言代码设置为 [param language]。用于断行和文本"
+"塑形算法。如果 [param language] 为空，则使用当前区域设置。"
+
+msgid "Sets the column title's tooltip text."
+msgstr "设置列标题的工具提示文本。"
+
 msgid "Selects the specified [TreeItem] and column."
 msgstr "选中指定的 [TreeItem] 和列。"
 
@@ -164077,6 +177613,14 @@ msgstr ""
 "间设置。\n"
 "控制的是放置区，即根据鼠标的位置决定并绘制可能的放置位置。"
 
+msgid ""
+"If [code]true[/code], tree items will unfold when hovered over during a drag-"
+"and-drop. The delay for when this happens is dictated by [theme_item "
+"dragging_unfold_wait_msec]."
+msgstr ""
+"如果为 [code]true[/code]，则在拖放过程中，当鼠标悬停在树项目上时，树项目将会展"
+"开。该操作的延迟时间由 [theme_item dragging_unfold_wait_msec] 决定。"
+
 msgid ""
 "If [code]true[/code], recursive folding is enabled for this [Tree]. Holding "
 "down [kbd]Shift[/kbd] while clicking the fold arrow or using [code]ui_right[/"
@@ -164306,11 +177850,23 @@ msgstr "标题按钮的默认文本 [Color] 颜色。"
 msgid "The horizontal space between each button in a cell."
 msgstr "单元格中按钮之间的水平间距。"
 
+msgid ""
+"The horizontal space between the checkbox and the text in a [constant "
+"TreeItem.CELL_MODE_CHECK] mode cell."
+msgstr ""
+"在 [constant TreeItem.CELL_MODE_CHECK] 模式的单元格中，复选框和文本之间的水平"
+"间距。"
+
 msgid ""
 "The width of the relationship lines between the selected [TreeItem] and its "
 "children."
 msgstr "被选中的 [TreeItem] 与其子项之间的关系线的宽度。"
 
+msgid ""
+"During a drag-and-drop, this is how many milliseconds to wait over a section "
+"before the section unfolds."
+msgstr "在拖放期间，这表示在展开某个部分之前，需要等待多少毫秒。"
+
 msgid ""
 "Draws the guidelines if not zero, this acts as a boolean. The guideline is a "
 "horizontal line drawn at the bottom of each item."
@@ -164330,6 +177886,9 @@ msgid ""
 "the start of an item when folding is disabled."
 msgstr "项目单元之间的水平空间。这也用作禁用折叠时项目开头的边距。"
 
+msgid "The horizontal space between the icon and the text in item's cells."
+msgstr "项目的单元格中图标和文本之间的水平间距。"
+
 msgid ""
 "The maximum allowed width of the icon in item's cells. This limit is applied "
 "on top of the default size of the icon, but before the value set with [method "
@@ -164711,6 +178270,10 @@ msgstr "返回用于在 [param column] 列绘制文本的自定义字体。"
 msgid "Returns custom font size used to draw text in the column [param column]."
 msgstr "返回用于在 [param column] 列绘制文本的自定义字体大小。"
 
+msgid ""
+"Returns the given column's custom [StyleBox] used to draw the background."
+msgstr "返回给定列的自定义 [StyleBox]，用于绘制背景。"
+
 msgid "Returns the given column's description for assistive apps."
 msgstr "返回给定列为辅助应用提供的描述。"
 
@@ -165011,6 +178574,15 @@ msgid ""
 msgstr ""
 "让 [constant CELL_MODE_CUSTOM] 的单元格显示为使用 [StyleBox] 的非扁平按钮。"
 
+msgid ""
+"Sets the given column's custom background color and whether to just use it as "
+"an outline.\n"
+"[b]Note:[/b] If a custom [StyleBox] is set, the background color will be "
+"drawn behind it."
+msgstr ""
+"设置给定列的自定义背景颜色，以及是否只将其用作轮廓。\n"
+"[b]注意：[/b]如果设置了自定义 [StyleBox]，则背景颜色将绘制在其后方。"
+
 msgid "Sets the given column's custom color."
 msgstr "设置给定列的自定义颜色。"
 
@@ -165046,6 +178618,14 @@ msgstr "设置用于在给定列 [param column] 中绘制文本的自定义字
 msgid "Sets custom font size used to draw text in the given [param column]."
 msgstr "设置用于在给定列 [param column] 中绘制文本的自定义字体大小。"
 
+msgid ""
+"Sets the given column's custom [StyleBox] used to draw the background.\n"
+"[b]Note:[/b] If a custom background color is set, the [StyleBox] will be "
+"drawn in front of it."
+msgstr ""
+"设置给定列的自定义 [StyleBox]，用于绘制背景。\n"
+"[b]注意：[/b]如果设置了自定义背景颜色，则该 [StyleBox] 将绘制在它之前。"
+
 msgid "Sets the given column's description for assistive apps."
 msgstr "设置给定列为辅助应用提供的描述。"
 
@@ -165117,6 +178697,14 @@ msgstr ""
 "[b]注意：[/b]如果从 [code]false[/code] 设置为 [code]true[/code]，则该列的勾选"
 "状态会被清除。"
 
+msgid ""
+"Sets the language code of the given [param column]'s text to [param "
+"language]. This is used for line-breaking and text shaping algorithms. If "
+"[param language] is empty, the current locale is used."
+msgstr ""
+"将给定 [param column] 的文本的语言代码设置为 [param language]。用于断行和文本"
+"塑形算法。如果 [param language] 为空，则使用当前区域设置。"
+
 msgid ""
 "Sets the metadata value for the given column, which can be retrieved later "
 "using [method get_metadata]. This can be used, for example, to store a "
@@ -166511,6 +180099,157 @@ msgid ""
 "due to a freed object)."
 msgstr "当该 [Tweener] 刚刚完成其任务或失效（例如对象被释放）时触发。"
 
+msgid "Rotation based intersection of two circles inverse kinematics solver."
+msgstr "基于旋转的两圆相交反向动力学求解器。"
+
+msgid ""
+"This [IKModifier3D] requires a pole target. It provides deterministic results "
+"by constructing a plane from each joint and pole target and finding the "
+"intersection of two circles (disks in 3D).\n"
+"This IK can handle twist by setting the pole direction. If there are more "
+"than one bone between each set bone, their rotations are ignored, and the "
+"straight line connecting the root-middle and middle-end joints are treated as "
+"virtual bones."
+msgstr ""
+"该 [IKModifier3D] 需要一个极点目标。它通过从每个关节和极点目标构建一个平面，并"
+"找到两个圆（3D 中的圆盘）的交点来提供确定性的结果。\n"
+"该 IK 可以通过设置极点方向来处理扭转。如果每组骨骼之间有多根骨骼，则忽略它们的"
+"旋转，并将连接根部中间关节和中间末端关节的直线视为虚拟骨骼。"
+
+msgid "Returns the end bone index."
+msgstr "返回末端骨骼的索引。"
+
+msgid ""
+"Returns the end bone's tail direction when [method is_end_bone_extended] is "
+"[code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，返回末端骨骼的尾部方"
+"向。"
+
+msgid "Returns the end bone name."
+msgstr "返回末端骨骼的名称。"
+
+msgid "Returns the middle bone index."
+msgstr "返回中间骨骼的索引。"
+
+msgid "Returns the middle bone name."
+msgstr "返回中间骨骼的名称。"
+
+msgid "Returns the pole direction."
+msgstr "返回极点方向。"
+
+msgid ""
+"Returns the pole direction vector.\n"
+"If [method get_pole_direction] is [constant "
+"SkeletonModifier3D.SECONDARY_DIRECTION_NONE], this method returns "
+"[code]Vector3(0, 0, 0)[/code]."
+msgstr ""
+"返回极点方向向量。\n"
+"如果 [method get_pole_direction] 为 [constant "
+"SkeletonModifier3D.SECONDARY_DIRECTION_NONE]，则该方法返回 [code]Vector3(0, "
+"0, 0)[/code]。"
+
+msgid ""
+"Returns the pole target node that constructs a plane which the joints are all "
+"on and the pole is trying to direct."
+msgstr ""
+"返回极点目标节点，该节点构建一个平面，所有关节都位于该平面上，并且极点试图指向"
+"该平面。"
+
+msgid "Returns the root bone index."
+msgstr "返回根骨骼的索引。"
+
+msgid "Returns the root bone name."
+msgstr "返回根骨骼的名称。"
+
+msgid ""
+"Returns [code]true[/code] if the end bone is extended from the middle bone as "
+"a virtual bone."
+msgstr "如果末端骨骼作为虚拟骨骼从中间骨骼延伸出来，则返回 [code]true[/code]。"
+
+msgid "Sets the end bone index."
+msgstr "设置末端骨骼索引。"
+
+msgid ""
+"Sets the end bone tail direction when [method is_end_bone_extended] is "
+"[code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置末端骨骼的尾部方"
+"向。"
+
+msgid ""
+"Sets the end bone tail length when [method is_end_bone_extended] is "
+"[code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置末端骨骼的尾部长"
+"度。"
+
+msgid ""
+"Sets the end bone name.\n"
+"[b]Note:[/b] The end bone must be a child of the middle bone."
+msgstr ""
+"设置末端骨骼的名称。\n"
+"[b]注意：[/b]末端骨骼必须是中间骨骼的子级。"
+
+msgid ""
+"If [param enabled] is [code]true[/code], the end bone is extended to have a "
+"tail."
+msgstr "如果 [param enabled] 为 [code]true[/code]，则末端骨骼会延伸出一条尾巴。"
+
+msgid "Sets the middle bone index."
+msgstr "设置中间骨骼的索引。"
+
+msgid ""
+"Sets the middle bone name.\n"
+"[b]Note:[/b] The middle bone must be a child of the root bone."
+msgstr ""
+"设置中间骨骼的名称。\n"
+"[b]注意：[/b]中间骨骼必须是根骨骼的子级。"
+
+msgid ""
+"Sets the pole direction.\n"
+"The pole is on the middle bone and will direct to the pole target.\n"
+"The rotation axis is a vector that is orthogonal to this and the forward "
+"vector.\n"
+"[b]Note:[/b] The pole direction and the forward vector shouldn't be colinear "
+"to avoid unintended rotation."
+msgstr ""
+"设置极点方向。\n"
+"极点位于中间骨骼上，并指向极点目标。\n"
+"旋转轴是一个与该向量和前向向量正交的向量。\n"
+"[b]注意：[/b]极点方向和前向向量不应共线，以避免意外旋转。"
+
+msgid ""
+"Sets the pole direction vector.\n"
+"This vector is normalized by an internal process.\n"
+"If the vector length is [code]0[/code], it is considered synonymous with "
+"[constant SkeletonModifier3D.SECONDARY_DIRECTION_NONE]."
+msgstr ""
+"设置极点方向向量。\n"
+"该向量会经过内部处理进行归一化。\n"
+"如果向量长度为 [code]0[/code]，则被视为与 [constant "
+"SkeletonModifier3D.SECONDARY_DIRECTION_NONE] 同义。"
+
+msgid ""
+"Sets the pole target node that constructs a plane which the joints are all on "
+"and the pole is trying to direct."
+msgstr ""
+"设置极点目标节点，该节点构建一个平面，所有关节都位于该平面上，极点试图指向该平"
+"面。"
+
+msgid "Sets the root bone index."
+msgstr "设置根骨骼索引。"
+
+msgid "Sets the root bone name."
+msgstr "设置根骨骼名称。"
+
+msgid ""
+"If [param enabled] is [code]true[/code], the end bone is extended from the "
+"middle bone as a virtual bone."
+msgstr ""
+"如果 [param enabled] 为 [code]true[/code]，则末端骨骼将从中间骨骼延伸为虚拟骨"
+"骼。"
+
 msgid "Helper class to implement a UDP server."
 msgstr "用于实现 UDP 服务器的辅助类。"
 
@@ -166820,6 +180559,37 @@ msgstr ""
 "弃。把这个值设置为[code]0[/code]可以有效地防止任何新的待定连接被接受，例如，当"
 "你的所有玩家都连接时。"
 
+msgid "A Unix Domain Socket (UDS) server."
+msgstr "Unix 域套接字（UDS）服务器。"
+
+msgid ""
+"A Unix Domain Socket (UDS) server. Listens to connections on a socket path "
+"and returns a [StreamPeerUDS] when it gets an incoming connection. Unix "
+"Domain Sockets provide inter-process communication on the same machine using "
+"the filesystem namespace.\n"
+"[b]Note:[/b] Unix Domain Sockets are only available on Unix-like systems "
+"(Linux, macOS, etc.) and are not supported on Windows."
+msgstr ""
+"Unix 域套接字（UDS）服务器。监听套接字路径上的连接，并在收到传入连接时返回 "
+"[StreamPeerUDS]。Unix 域套接字使用文件系统命名空间在同一台机器上提供进程间通"
+"信。\n"
+"[b]注意：[/b]Unix 域套接字仅在类 Unix 系统（Linux、macOS 等）上可用，Windows "
+"系统上不受支持。"
+
+msgid ""
+"Listens on the socket at [param path]. The socket file will be created at the "
+"specified path.\n"
+"[b]Note:[/b] The socket file must not already exist at the specified path. "
+"You may need to remove any existing socket file before calling this method."
+msgstr ""
+"监听 [param path] 处的套接字。套接字文件将在指定路径创建。\n"
+"[b]注意：[/b]指定路径下不能已存在套接字文件。调用该方法之前，可能需要删除任何"
+"已有的套接字文件。"
+
+msgid ""
+"If a connection is available, returns a StreamPeerUDS with the connection."
+msgstr "如果连接可用，则返回带有该连接的 StreamPeerUDS。"
+
 msgid ""
 "Provides a high-level interface for implementing undo and redo operations."
 msgstr "为实现撤销和重做操作提供高阶接口。"
@@ -167213,6 +180983,16 @@ msgstr "如果当前动作与上一个动作的名称相同，则将两者合并
 msgid "Uniform set cache manager for Rendering Device based renderers."
 msgstr "基于渲染设备的渲染器的 uniform 集缓存管理器。"
 
+msgid ""
+"Uniform set cache manager for [RenderingDevice]-based renderers. Provides a "
+"way to create a uniform set and reuse it in subsequent calls for as long as "
+"the uniform set exists. Uniform set will automatically be cleaned up when "
+"dependent objects are freed."
+msgstr ""
+"用于基于 [RenderingDevice] 的渲染器的 uniform 集缓存管理器。提供一种创建 "
+"uniform 集并在它存在期间的后续调用中重用它的方法。当依赖对象被释放时，uniform "
+"集将自动被清理。"
+
 msgid ""
 "Creates/returns a cached uniform set based on the provided uniforms for a "
 "given shader."
@@ -168011,6 +181791,37 @@ msgstr ""
 "[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
 "vector2_angle.png]返回角度的示意图。[/url]"
 
+msgid ""
+"Returns the signed angle to the given vector, in radians. The result ranges "
+"from [code]-PI[/code] to [code]PI[/code] (inclusive).\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to.png]Illustration of the returned angle.[/url]"
+msgstr ""
+"返回与给定向量的带符号夹角，单位为弧度。结果范围从 [code]-PI[/code] 到 "
+"[code]PI[/code]（含）。\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to.png]返回的夹角的示意图。[/url]"
+
+msgid ""
+"Returns the signed angle between the X axis and the line from this vector to "
+"point [param to], in radians. The result ranges from [code]-PI[/code] to "
+"[code]PI[/code] (inclusive).\n"
+"[code]a.angle_to_point(b)[/code] is equivalent to [code](b - a).angle()[/"
+"code]. See also [method angle].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to_point.png]Illustration of the returned angle.[/url]"
+msgstr ""
+"返回 X 轴与从该向量到点 [param to] 的直线之间的有符号夹角，单位为弧度。结果范"
+"围从 [code]-PI[/code] 到 [code]PI[/code]（含）。\n"
+"[code]a.angle_to_point(b)[/code] 等价于 [code](b - a).angle()[/code]。另见 "
+"[method angle]。\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to_point.png]返回的夹角的示意图。[/url]"
+
+msgid ""
+"Returns this vector's aspect ratio, which is [member x] divided by [member y]."
+msgstr "返回该向量的纵横比，即 [member x] 与 [member y] 的比例。"
+
 msgid ""
 "Returns the derivative at the given [param t] on the [url=https://"
 "en.wikipedia.org/wiki/B%C3%A9zier_curve]Bézier curve[/url] defined by this "
@@ -168101,6 +181912,15 @@ msgstr ""
 "表插值的量。\n"
 "通过使用时间值，可以比 [method cubic_interpolate] 进行更平滑的插值。"
 
+msgid ""
+"Returns the normalized vector pointing from this vector to [param to].\n"
+"[code]a.direction_to(b)[/code] is equivalent to [code](b - a).normalized()[/"
+"code]. See also [method normalized]."
+msgstr ""
+"返回从该向量指向 [param to] 的归一化向量。\n"
+"[code]a.direction_to(b)[/code] 等价于 [code](b - a).normalized()[/code]。另见 "
+"[method normalized]。"
+
 msgid ""
 "Returns the squared distance between this vector and [param to].\n"
 "This method runs faster than [method distance_to], so prefer it if you need "
@@ -168830,6 +182650,18 @@ msgstr ""
 "print(Vector2i(10, 20) / Vector2i(2, 5)) # 输出 (5, 4)\n"
 "[/codeblock]"
 
+msgid ""
+"Divides each component of the [Vector2i] by the given [float]. Returns a "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2i(1, 2) / 2.5) # Prints (0.4, 0.8)\n"
+"[/codeblock]"
+msgstr ""
+"将该 [Vector2i] 的每个分量除以给定的 [float]。返回的是 [Vector2]。\n"
+"[codeblock]\n"
+"print(Vector2i(1, 2) / 2.5) # 输出 (0.4, 0.8)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector2i] by the given [int]."
 msgstr "将该 [Vector2i] 的每个分量除以给定的 [int]。"
 
@@ -169522,6 +183354,18 @@ msgstr ""
 "print(Vector3i(10, 20, 30) / Vector3i(2, 5, 3)) # 输出 (5, 4, 10)\n"
 "[/codeblock]"
 
+msgid ""
+"Divides each component of the [Vector3i] by the given [float]. Returns a "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3i(1, 2, 3) / 2.5) # Prints (0.4, 0.8, 1.2)\n"
+"[/codeblock]"
+msgstr ""
+"将该 [Vector3i] 的每个分量除以给定的 [float]。返回的是 [Vector3]。\n"
+"[codeblock]\n"
+"print(Vector3i(1, 2, 3) / 2.5) # 输出 (0.4, 0.8, 1.2)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector3i] by the given [int]."
 msgstr "将该 [Vector3i] 的每个分量除以给定的 [int]。"
 
@@ -170059,6 +183903,19 @@ msgstr ""
 "print(Vector4i(10, 20, 30, 40) / Vector4i(2, 5, 3, 4)) # 输出 (5, 4, 10, 10)\n"
 "[/codeblock]"
 
+msgid ""
+"Divides each component of the [Vector4i] by the given [float].\n"
+"Returns a Vector4 value due to floating-point operations.\n"
+"[codeblock]\n"
+"print(Vector4i(1, 2, 3, 4) / 2.5) # Prints (0.4, 0.8, 1.2, 1.6)\n"
+"[/codeblock]"
+msgstr ""
+"将该 [Vector4i] 的每个分量除以给定的 [float]。\n"
+"由于浮点数运算，返回值为 Vector4。\n"
+"[codeblock]\n"
+"print(Vector4i(1, 2, 3, 4) / 2.5) # 输出 (0.4, 0.8, 1.2, 1.6)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector4i] by the given [int]."
 msgstr "将该 [Vector4] 的每个分量除以给定的 [int]。"
 
@@ -170712,6 +184569,36 @@ msgstr ""
 "返回当前活动的 3D 音频侦听器。如果没有活动的 3D 音频侦听器，则返回 "
 "[code]null[/code]，此时会将活动的 3D 相机作为侦听器。"
 
+msgid ""
+"Returns the currently active 2D camera. Returns [code]null[/code] if there "
+"are no active cameras.\n"
+"[b]Note:[/b] If called while the [i]Camera Override[/i] system is active in "
+"editor, this will return the internally managed override camera. It is "
+"therefore advised to avoid caching the return value, or to check that the "
+"cached value is still a valid instance and is the current camera before use. "
+"See [method @GlobalScope.is_instance_valid] and [method Camera2D.is_current]."
+msgstr ""
+"返回当前活动的 2D 相机。如果没有活动的相机，则返回 [code]null[/code]。\n"
+"[b]注意：[/b]如果在编辑器中启用[i]相机覆盖[/i]系统时调用该方法，它将返回内部管"
+"理的覆盖相机。因此，建议避免缓存该返回值，或者在使用缓存值之前检查缓存值是否仍"
+"然是有效实例且是当前相机。见 [method @GlobalScope.is_instance_valid] 和 "
+"[method Camera2D.is_current]。"
+
+msgid ""
+"Returns the currently active 3D camera. Returns [code]null[/code] if there "
+"are no active cameras.\n"
+"[b]Note:[/b] If called while the [i]Camera Override[/i] system is active in "
+"editor, this will return the internally managed override camera. It is "
+"therefore advised to avoid caching the return value, or to check that the "
+"cached value is a valid instance and is the current camera before use. See "
+"[method @GlobalScope.is_instance_valid] and [member Camera3D.current]."
+msgstr ""
+"返回当前活动的 3D 相机。如果没有活动的相机，则返回 [code]null[/code]。\n"
+"[b]注意：[/b]如果在编辑器中启用[i]相机覆盖[/i]系统时调用该方法，它将返回内部管"
+"理的覆盖相机。因此，建议避免缓存该返回值，或者在使用缓存值之前检查缓存值是否仍"
+"然是有效实例且是当前相机。见 [method @GlobalScope.is_instance_valid] 和 "
+"[member Camera3D.current]。"
+
 msgid "Returns an individual bit on the rendering layer mask."
 msgstr "返回渲染层遮罩上的某个比特位。"
 
@@ -170776,6 +184663,54 @@ msgstr ""
 "缩放也可能会略有不同。如果 [member Window.content_scale_aspect] 为 [constant "
 "Window.CONTENT_SCALE_ASPECT_IGNORE]，则 X 和 Y 缩放可能会有[i]显著[/i]差异。"
 
+msgid ""
+"Returns the viewport's texture.\n"
+"[b]Note:[/b] When trying to store the current texture (e.g. in a file), it "
+"might be completely black or outdated if used too early, especially when used "
+"in e.g. [method Node._ready]. To make sure the texture you get is correct, "
+"you can await [signal RenderingServer.frame_post_draw] signal.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    await RenderingServer.frame_post_draw\n"
+"    $Viewport.get_texture().get_image().save_png(\"user://Screenshot.png\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public async override void _Ready()\n"
+"{\n"
+"    await ToSignal(RenderingServer.Singleton, "
+"RenderingServer.SignalName.FramePostDraw);\n"
+"    var viewport = GetNode<Viewport>(\"Viewport\");\n"
+"    viewport.GetTexture().GetImage().SavePng(\"user://Screenshot.png\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] When [member use_hdr_2d] is [code]true[/code] the returned "
+"texture will be an HDR image using linear encoding."
+msgstr ""
+"返回该视口的纹理\n"
+"[b]注意：[/b]保存当前纹理时（例如保存到文件中），如果时机过早则可能是全黑或过"
+"时的图片，尤其是在 [method Node._ready] 等函数中使用时。要确保获得正确的纹理，"
+"你可以等待 [signal RenderingServer.frame_post_draw] 信号。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    await RenderingServer.frame_post_draw\n"
+"    $Viewport.get_texture().get_image().save_png(\"user://Screenshot.png\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public async override void _Ready()\n"
+"{\n"
+"    await ToSignal(RenderingServer.Singleton, "
+"RenderingServer.SignalName.FramePostDraw);\n"
+"    var viewport = GetNode<Viewport>(\"Viewport\");\n"
+"    viewport.GetTexture().GetImage().SavePng(\"user://Screenshot.png\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b][member use_hdr_2d] 为 [code]true[/code] 时，返回的纹理将是使用线"
+"性编码的 HDR 图像。"
+
 msgid "Returns the viewport's RID from the [RenderingServer]."
 msgstr "返回该视口在 [RenderingServer] 的 RID。"
 
@@ -170795,6 +184730,11 @@ msgid ""
 msgstr ""
 "返回 GUI 的拖动数据，该数据先前由 [method Control._get_drag_data] 返回。"
 
+msgid ""
+"Returns the human-readable description of the drag data, used for assistive "
+"apps."
+msgstr "返回用于辅助应用程序的拖拽数据的人类可读描述。"
+
 msgid ""
 "Returns the currently focused [Control] within this viewport. If no [Control] "
 "is focused, returns [code]null[/code]."
@@ -170834,6 +184774,11 @@ msgstr ""
 "移除这个视口中当前聚焦 [Control] 的焦点。如果没有聚焦任何 [Control]，则什么都"
 "不做。"
 
+msgid ""
+"Sets the human-readable description of the drag data to [param description], "
+"used for assistive apps."
+msgstr "将拖拽数据的人类可读描述设置为 [param description]，用于辅助应用程序。"
+
 msgid ""
 "Returns whether the current [InputEvent] has been handled. Input events are "
 "not handled until [method set_input_as_handled] has been called during the "
@@ -170980,6 +184925,14 @@ msgid ""
 "editing this [Viewport]'s layers."
 msgstr "设置或清除碰撞掩码上的比特位。可以简化 [Viewport] 层的编辑。"
 
+msgid ""
+"Stops the input from propagating further up the [SceneTree].\n"
+"[b]Note:[/b] This does not affect the methods in [Input], only the way events "
+"are propagated."
+msgstr ""
+"让输入停止继续沿着 [SceneTree] 向上传播。\n"
+"[b]注意：[/b]不会影响 [Input] 中的方法，只会影响事件的传播。"
+
 msgid ""
 "Sets the number of subdivisions to use in the specified quadrant. A higher "
 "number of subdivisions allows you to have more shadows in the scene at once, "
@@ -171019,6 +184972,21 @@ msgstr "如果为 [code]true[/code]，该视口将处理 2D 音频流。"
 msgid "If [code]true[/code], the viewport will process 3D audio streams."
 msgstr "如果为 [code]true[/code]，该视口将处理 3D 音频流。"
 
+msgid ""
+"The rendering layers in which this [Viewport] renders [CanvasItem] nodes.\n"
+"[b]Note:[/b] A [CanvasItem] does not inherit its parents' visibility layers. "
+"See [member CanvasItem.visibility_layer]'s description for details."
+msgstr ""
+"该 [Viewport] 渲染 [CanvasItem] 节点的渲染层。\n"
+"[b]注意：[/b][CanvasItem] 不会继承其父级的可见性图层。详情见 [member "
+"CanvasItem.visibility_layer] 的描述。"
+
+msgid "The default filter mode used by [CanvasItem] nodes in this viewport."
+msgstr "该视口中 [CanvasItem] 节点所使用的默认过滤模式。"
+
+msgid "The default repeat mode used by [CanvasItem] nodes in this viewport."
+msgstr "该视口中 [CanvasItem] 所使用的默认重复模式。"
+
 msgid ""
 "The canvas transform of the viewport, useful for changing the on-screen "
 "positions of all child [CanvasItem]s. This is relative to the global canvas "
@@ -171053,6 +185021,11 @@ msgstr "该视口的全局画布变换。画布变换是相对于这个的。"
 msgid "If [code]true[/code], the viewport will not receive input events."
 msgstr "如果为 [code]true[/code]，该视口将不接收输入事件。"
 
+msgid ""
+"The minimum distance the mouse cursor must move while pressed before a drag "
+"operation begins."
+msgstr "鼠标光标在按下状态下必须移动的最小距离，超过该距离后才会开始拖动操作。"
+
 msgid ""
 "If [code]true[/code], sub-windows (popups and dialogs) will be embedded "
 "inside application window as control-like nodes. If [code]false[/code], they "
@@ -171380,6 +185353,56 @@ msgstr ""
 "[b]注意：[/b] 由于技术限制，当视口背景为透明时，某些渲染功能会被禁用。目前，这"
 "适用于屏幕空间反射、次表面散射和景深字段。"
 
+msgid ""
+"When using the Mobile or Forward+ renderers, set [member use_debanding] to "
+"enable or disable the debanding feature of this [Viewport]. If [member "
+"use_hdr_2d] is [code]false[/code], 2D rendering is [i]not[/i] affected by "
+"debanding unless the [member Environment.background_mode] is [constant "
+"Environment.BG_CANVAS]. If [member use_hdr_2d] is [code]true[/code], "
+"debanding will only be applied if this is the root [Viewport] and will affect "
+"all 2D and 3D rendering, including canvas items.\n"
+"[member use_debanding] has no effect when using the Compatibility rendering "
+"method. The Mobile renderer can also use material debanding, which can be set "
+"with [method RenderingServer.material_set_use_debanding] or configured with "
+"[member ProjectSettings.rendering/anti_aliasing/quality/use_debanding].\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding], [method RenderingServer.material_set_use_debanding], and "
+"[method RenderingServer.viewport_set_use_debanding]."
+msgstr ""
+"使用 Mobile 或 Forward+ 渲染器时，设置 [member use_debanding] 以启用或禁用该 "
+"[Viewport] 的去色带功能。如果 [member use_hdr_2d] 为 [code]false[/code]，则除"
+"非 [member Environment.background_mode] 为 [constant Environment.BG_CANVAS]，"
+"否则 2D 渲染[i]不会[/i]受到去色带的影响。如果 [member use_hdr_2d] 为 "
+"[code]true[/code]，则仅当该 [Viewport] 为根 [Viewport] 时才会应用去色带，并会"
+"影响所有 2D 和 3D 渲染，包括画布项目。\n"
+"使用 Compatibility 渲染方法时，[member use_debanding] 无效。Mobile 渲染器还可"
+"以使用材质去色带，可以通过 [method "
+"RenderingServer.material_set_use_debanding] 设置，或通过 [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_debanding] 配置。\n"
+"另见 [member ProjectSettings.rendering/anti_aliasing/quality/use_debanding]、"
+"[method RenderingServer.material_set_use_debanding] 和 [method "
+"RenderingServer.viewport_set_use_debanding]。"
+
+msgid ""
+"If [code]true[/code], 2D rendering will use a high dynamic range (HDR) "
+"[code]RGBA16[/code] format framebuffer. Additionally, 2D rendering will be "
+"performed on linear values and will be converted using the appropriate "
+"transfer function immediately before blitting to the screen (if the Viewport "
+"is attached to the screen).\n"
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped to the [code]0-1[/code] range and can be used in 3D rendering "
+"without color encoding adjustments. This allows 2D rendering to take "
+"advantage of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients."
+msgstr ""
+"如果为 [code]true[/code]，则 2D 渲染将使用高动态范围（HDR）[code]RGBA16[/"
+"code] 格式帧缓冲区。此外，2D 渲染将在线性值上进行，并在绘制到屏幕之前（如果视"
+"口已连接到屏幕）立即使用适当的传输函数进行转换。\n"
+"实际上，这意味着视口的最终结果不会限制在 [code]0-1[/code] 范围内，无需调整颜色"
+"编码即可在 3D 渲染中使用。这使得 2D 渲染能够利用需要高动态范围的效果（例如 2D "
+"辉光），并显著改善需要高度详细渐变的效果的外观。"
+
 msgid ""
 "If [code]true[/code], [OccluderInstance3D] nodes will be usable for occlusion "
 "culling in 3D for this viewport. For the root viewport, [member "
@@ -171779,6 +185802,24 @@ msgstr ""
 "不支持 SDFGI，则不执行任何操作。\n"
 "[b]注意：[/b]仅在使用 Forward+ 渲染方法时支持。"
 
+msgid ""
+"Draws the probes used for signed distance field global illumination (SDFGI).\n"
+"When in the editor, left-clicking a probe will display additional bright dots "
+"that show its occlusion information. A white dot means the light is not "
+"occluded at all at the dot's position, while a red dot means the light is "
+"fully occluded. Intermediate values are possible.\n"
+"Does nothing if the current environment's [member Environment.sdfgi_enabled] "
+"is [code]false[/code].\n"
+"[b]Note:[/b] Only supported when using the Forward+ rendering method."
+msgstr ""
+"绘制用于带符号距离场全局照明（SDFGI）的探针。\n"
+"在编辑器中，左键点击探针将显示额外的亮点，这些亮点显示其遮挡信息。白点表示该点"
+"位置的光线完全没有被遮挡，而红点表示该位置的光线完全被遮挡。也可能出现中间"
+"值。\n"
+"如果当前环境的 [member Environment.sdfgi_enabled] 为 [code]false[/code]，则不"
+"执行任何操作。\n"
+"[b]注意：[/b]仅在使用 Forward+ 渲染方法时受支持。"
+
 msgid ""
 "Draws the buffer used for global illumination from [VoxelGI] or SDFGI. "
 "Requires [VoxelGI] (at least one visible baked VoxelGI node) or SDFGI "
@@ -171914,6 +185955,55 @@ msgstr "代表 [enum VRSUpdateMode] 枚举的大小。"
 msgid "Provides the content of a [Viewport] as a dynamic texture."
 msgstr "以动态纹理的形式提供 [Viewport] 的内容。"
 
+msgid ""
+"A [ViewportTexture] provides the content of a [Viewport] as a dynamic "
+"[Texture2D]. This can be used to combine the rendering of [Control], [Node2D] "
+"and [Node3D] nodes. For example, you can use this texture to display a 3D "
+"scene inside a [TextureRect], or a 2D overlay in a [Sprite3D].\n"
+"To get a [ViewportTexture] in code, use the [method Viewport.get_texture] "
+"method on the target viewport.\n"
+"[b]Note:[/b] A [ViewportTexture] is always local to its scene (see [member "
+"Resource.resource_local_to_scene]). If the scene root is not ready, it may "
+"return incorrect data (see [signal Node.ready]).\n"
+"[b]Note:[/b] Instantiating scenes containing a high-resolution "
+"[ViewportTexture] may cause noticeable stutter.\n"
+"[b]Note:[/b] When using a [Viewport] with [member Viewport.use_hdr_2d] set to "
+"[code]true[/code], the returned texture will be an HDR image that uses linear "
+"encoding. This may look darker than normal when displayed directly on screen. "
+"To convert to nonlinear sRGB encoding, you can do the following:\n"
+"[codeblock]\n"
+"img.convert(Image.FORMAT_RGBA8)\n"
+"img.linear_to_srgb()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Some nodes such as [Decal], [Light3D], and [PointLight2D] do not "
+"support using [ViewportTexture] directly. To use texture data from a "
+"[ViewportTexture] in these nodes, you need to create an [ImageTexture] by "
+"calling [method Texture2D.get_image] on the [ViewportTexture] and passing the "
+"result to [method ImageTexture.create_from_image]. This conversion is a slow "
+"operation, so it should not be performed every frame."
+msgstr ""
+"[ViewportTexture] 以动态 [Texture2D] 的形式提供 [Viewport] 的内容，可以用来结"
+"合 [Control]、[Node2D]、[Node3D] 等节点的渲染。例如你可以用该纹理在 "
+"[TextureRect] 中显示 3D 场景，也可以在 [Sprite3D] 中显示 2D 覆盖层。\n"
+"要在代码中获取 [ViewportTexture]，请在目标视口上使用 [method "
+"Viewport.get_texture] 方法。\n"
+"[b]注意：[/b][ViewportTexture] 始终是局部于其场景的（见 [member "
+"Resource.resource_local_to_scene]）。如果场景根节点尚未就绪，就可能返回不正确"
+"的数据（见 [signal Node.ready]）。\n"
+"[b]注意：[/b]实例化包含高分辨率 [ViewportTexture] 的场景可能引起显著的卡顿。\n"
+"[b]注意：[/b]如果使用的 [Viewport] 将 [member Viewport.use_hdr_2d] 设为了 "
+"[code]true[/code]，则返回的纹理将是使用线性编码的 HDR 图像。这种图像在屏幕上直"
+"接显示时看上去比较暗。要将其转换为非线性 sRGB 编码，可以执行以下操作：\n"
+"[codeblock]\n"
+"img.convert(Image.FORMAT_RGBA8)\n"
+"img.linear_to_srgb()\n"
+"[/codeblock]\n"
+"[b]注意：[/b][Decal]、[Light3D]、[PointLight2D] 等节点并不支持直接使用 "
+"[ViewportTexture]。要在这些节点中使用 [ViewportTexture] 的纹理数据，你需要对 "
+"[ViewportTexture] 调用 [method Texture2D.get_image] 获取 [ImageTexture]，将这"
+"个结果传给 [method ImageTexture.create_from_image]。这种转换操作比较慢，因此不"
+"应该每帧都执行。"
+
 msgid ""
 "The path to the [Viewport] node to display. This is relative to the local "
 "scene root (see [method Resource.get_local_scene]), [b]not[/b] to the nodes "
@@ -172696,6 +186786,62 @@ msgstr ""
 "return vec3(r, g, b);\n"
 "[/codeblock]"
 
+msgid ""
+"Converts color from linear encoding to nonlinear sRGB encoding using the "
+"following formula:\n"
+"[codeblock]\n"
+"vec3 c = clamp(c, vec3(0.0), vec3(1.0));\n"
+"const vec3 a = vec3(0.055f);\n"
+"return mix((vec3(1.0f) + a) * pow(c.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * "
+"c.rgb, lessThan(c.rgb, vec3(0.0031308f)));\n"
+"[/codeblock]\n"
+"The Compatibility renderer uses a simpler formula:\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return max(vec3(1.055) * pow(c, vec3(0.416666667)) - vec3(0.055), "
+"vec3(0.0));\n"
+"[/codeblock]"
+msgstr ""
+"使用以下公式将颜色从线性编码转换为非线性 sRGB 编码：\n"
+"[codeblock]\n"
+"vec3 c = clamp(c, vec3(0.0), vec3(1.0));\n"
+"const vec3 a = vec3(0.055f);\n"
+"return mix((vec3(1.0f) + a) * pow(c.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * "
+"c.rgb, lessThan(c.rgb, vec3(0.0031308f)));\n"
+"[/codeblock]\n"
+"Compatibility 渲染器使用的公式更简单：\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return max(vec3(1.055) * pow(c, vec3(0.416666667)) - vec3(0.055), "
+"vec3(0.0));\n"
+"[/codeblock]"
+
+msgid ""
+"Converts color from nonlinear sRGB encoding to linear encoding using the "
+"following formula:\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return mix(pow((c.rgb + vec3(0.055)) * (1.0 / (1.0 + 0.055)), vec3(2.4)), "
+"c.rgb * (1.0 / 12.92), lessThan(c.rgb, vec3(0.04045)));\n"
+"[/codeblock]\n"
+"The Compatibility renderer uses a simpler formula:\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878);\n"
+"[/codeblock]"
+msgstr ""
+"使用以下公式将颜色从非线性 sRGB 编码转换为线性编码：\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return mix(pow((c.rgb + vec3(0.055)) * (1.0 / (1.0 + 0.055)), vec3(2.4)), "
+"c.rgb * (1.0 / 12.92), lessThan(c.rgb, vec3(0.04045)));\n"
+"[/codeblock]\n"
+"Compatibility 渲染器使用的公式更简单：\n"
+"[codeblock]\n"
+"vec3 c = input;\n"
+"return c * (c * (c * 0.305306011 + 0.682171111) + 0.012522878);\n"
+"[/codeblock]"
+
 msgid "Represents the size of the [enum Function] enum."
 msgstr "代表 [enum Function] 枚举的大小。"
 
@@ -173014,6 +187160,13 @@ msgstr "代表 [enum Source] 枚举的大小。"
 msgid "No hints are added to the uniform declaration."
 msgstr "在uniform声明中未添加提示。"
 
+msgid ""
+"Adds [code]source_color[/code] as hint to the uniform declaration for proper "
+"conversion from nonlinear sRGB encoding to linear encoding."
+msgstr ""
+"将 [code]source_color[/code] 作为提示添加到 uniform 声明中，以便将非线性 sRGB "
+"编码正确转换为线性编码。"
+
 msgid ""
 "Adds [code]hint_normal[/code] as hint to the uniform declaration, which "
 "internally converts the texture for proper usage as normal map."
@@ -173306,6 +187459,19 @@ msgstr ""
 "的成员对话框中。\n"
 "定义这个方法是[b]可选[/b]的。未覆盖时为 [code]true[/code]。"
 
+msgid ""
+"Override this method to enable the high-end mark in the Visual Shader "
+"Editor's members dialog. This should return [code]true[/code] for nodes that "
+"only work when using the Forward+ and Mobile renderers.\n"
+"Defining this method is [b]optional[/b]. If not overridden, it's [code]false[/"
+"code], which indicates this node works with all renderers (including "
+"Compatibility)."
+msgstr ""
+"覆盖该方法可在可视化着色器编辑器成员对话框中启用高端标记。对于仅在使用 "
+"Forward+ 和 Mobile 渲染器时才能工作的节点，该方法应返回 [code]true[/code]。\n"
+"定义该方法是[b]可选的[/b]。未覆盖时默认为 [code]false[/code]，表示该节点适用于"
+"所有渲染器（包括兼容模式）。"
+
 msgid ""
 "Returns the selected index of the drop-down list option within a graph. You "
 "may use this function to define the specific behavior in the [method "
@@ -174264,6 +188430,11 @@ msgstr ""
 "参数代表着色器中的一个变量，是由外部设置的，即从 [ShaderMaterial] 中设置。参数"
 "在 [ShaderMaterial] 中以属性的形式暴露，可以从检查器或脚本中分配。"
 
+msgid ""
+"The index within 0-15 range, which is used to avoid clashes when shader used "
+"on multiple materials."
+msgstr "该索引的取值范围为 0-15，用于避免着色器在用于多种材质时崩溃。"
+
 msgid ""
 "Name of the parameter, by which it can be accessed through the "
 "[ShaderMaterial] properties."
@@ -174283,6 +188454,13 @@ msgid ""
 "this shader."
 msgstr "该参数绑定至节点，该节点附加了使用此着色器的 [ShaderMaterial]。"
 
+msgid ""
+"The parameter will be tied to the node with attached [ShaderMaterial] using "
+"this shader. Enables setting a [member instance_index] property."
+msgstr ""
+"该参数将绑定至附加了使用该着色器的 [ShaderMaterial] 的节点。启用后可以设置 "
+"[member instance_index] 属性。"
+
 msgid "Represents the size of the [enum Qualifier] enum."
 msgstr "代表 [enum Qualifier] 枚举的大小。"
 
@@ -175613,6 +189791,17 @@ msgstr ""
 msgid "The [VoxelGIData] resource that holds the data for this [VoxelGI]."
 msgstr "为该 [VoxelGI] 存放数据的 [VoxelGIData] 资源。"
 
+msgid ""
+"The size of the area covered by the [VoxelGI]. This must be [code]1.0[/code] "
+"or greater on each axis.\n"
+"[b]Note:[/b] If you make the size larger without increasing the number of "
+"subdivisions with [member subdiv], the size of each cell will increase and "
+"result in less detailed lighting."
+msgstr ""
+"[VoxelGI] 所覆盖区域的大小。每个轴上的值必须大于或等于 [code]1.0[/code]。\n"
+"[b]注意：[/b]如果在没有通过 [member subdiv] 增加细分数量的情况下增大大小，则每"
+"个单元格的大小都会增加，从而导致光照细节减少。"
+
 msgid ""
 "Number of times to subdivide the grid that the [VoxelGI] operates on. A "
 "higher number results in finer detail and thus higher visual quality, while "
@@ -175775,6 +189964,28 @@ msgstr ""
 "垂直滑块，通常用于为超出控件可见高度的内容进行导航。这是基于 [Range] 的控件，"
 "从顶部（最小）滚动到底部（最大）。注意，滚动方向和 [VSlider] 相反。"
 
+msgid ""
+"Padding between the left of the [theme_item ScrollBar.scroll] element and the "
+"[theme_item ScrollBar.grabber].\n"
+"[b]Note:[/b] To apply vertical padding, modify the top/bottom content margins "
+"of [theme_item ScrollBar.scroll] instead."
+msgstr ""
+"[theme_item ScrollBar.scroll] 元素左侧与 [theme_item ScrollBar.grabber] 之间的"
+"内边距。\n"
+"[b]注意：[/b]要应用垂直内边距，请改为修改 [theme_item ScrollBar.scroll] 的顶"
+"部/底部内容边距。"
+
+msgid ""
+"Padding between the right of the [theme_item ScrollBar.scroll] element and "
+"the [theme_item ScrollBar.grabber].\n"
+"[b]Note:[/b] To apply vertical padding, modify the top/bottom content margins "
+"of [theme_item ScrollBar.scroll] instead."
+msgstr ""
+"[theme_item ScrollBar.scroll] 元素右侧与 [theme_item ScrollBar.grabber] 之间的"
+"内边距。\n"
+"[b]注意：[/b]要应用垂直内边距，请改为修改 [theme_item ScrollBar.scroll] 的顶"
+"部/底部内容边距。"
+
 msgid "A vertical line used for separating other controls."
 msgstr "分隔其他控件的垂直线。"
 
@@ -176071,6 +190282,34 @@ msgstr ""
 msgid "Interface to a WebRTC peer connection."
 msgstr "与 WebRTC 对等体连接的接口。"
 
+msgid ""
+"A WebRTC connection between the local computer and a remote peer. Provides an "
+"interface to connect, maintain, and monitor the connection.\n"
+"Setting up a WebRTC connection between two peers may not seem a trivial task, "
+"but it can be broken down into 3 main steps:\n"
+"- The peer that wants to initiate the connection ([code]A[/code] from now on) "
+"creates an offer and sends it to the other peer ([code]B[/code] from now "
+"on).\n"
+"- [code]B[/code] receives the offer, generates an answer, and sends it to "
+"[code]A[/code].\n"
+"- [code]A[/code] and [code]B[/code] then generate and exchange ICE candidates "
+"with each other.\n"
+"After these steps, the connection should be established. Refer to the linked "
+"tutorials for details."
+msgstr ""
+"本地计算机和远程对等体之间的 WebRTC 连接。提供一个接口来连接、维护和监控连"
+"接。\n"
+"在两个对等体之间建立 WebRTC 连接看上去可能不是一项简单的任务，但它可以分解为 "
+"3 个主要步骤。\n"
+"- 想要启动连接的对等体（以下简称 [code]A[/code]）创建一个提交，并将其发送给另"
+"一个对等体（以下简称 [code]B[/code]）。\n"
+"- [code]B[/code] 收到要约，生成回答，并将其发送给 [code]A[/code]。\n"
+"- [code]A[/code] 和 [code]B[/code] 然后生成并相互交换 ICE 候选。\n"
+"在这些步骤之后，连接应该就建立起来了。有关详细信息，请参阅链接的教程。"
+
+msgid "WebRTC documentation"
+msgstr "WebRTC 文档"
+
 msgid ""
 "Add an ice candidate generated by a remote peer (and received over the "
 "signaling server). See [signal ice_candidate_created]."
@@ -176471,6 +190710,88 @@ msgstr ""
 msgid "A WebSocket connection."
 msgstr "WebSocket 连接。"
 
+msgid ""
+"This class represents WebSocket connection, and can be used as a WebSocket "
+"client ([url=https://datatracker.ietf.org/doc/html/rfc6455]RFC 6455[/url]-"
+"compliant) or as a remote peer of a WebSocket server.\n"
+"You can send WebSocket binary frames using [method PacketPeer.put_packet], "
+"and WebSocket text frames using [method send] (prefer text frames when "
+"interacting with text-based API). You can check the frame type of the last "
+"packet via [method was_string_packet].\n"
+"To start a WebSocket client, first call [method connect_to_url], then "
+"regularly call [method poll] (e.g. during [Node] process). You can query the "
+"socket state via [method get_ready_state], get the number of pending packets "
+"using [method PacketPeer.get_available_packet_count], and retrieve them via "
+"[method PacketPeer.get_packet].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"\n"
+"var socket = WebSocketPeer.new()\n"
+"\n"
+"func _ready():\n"
+"\tsocket.connect_to_url(\"wss://example.com\")\n"
+"\n"
+"func _process(delta):\n"
+"\tsocket.poll()\n"
+"\tvar state = socket.get_ready_state()\n"
+"\tif state == WebSocketPeer.STATE_OPEN:\n"
+"\t\twhile socket.get_available_packet_count():\n"
+"\t\t\tprint(\"Packet: \", socket.get_packet())\n"
+"\telif state == WebSocketPeer.STATE_CLOSING:\n"
+"\t\t# Keep polling to achieve proper close.\n"
+"\t\tpass\n"
+"\telif state == WebSocketPeer.STATE_CLOSED:\n"
+"\t\tvar code = socket.get_close_code()\n"
+"\t\tvar reason = socket.get_close_reason()\n"
+"\t\tprint(\"WebSocket closed with code: %d, reason %s. Clean: %s\" % [code, "
+"reason, code != -1])\n"
+"\t\tset_process(false) # Stop processing.\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"To use the peer as part of a WebSocket server refer to [method accept_stream] "
+"and the online tutorial."
+msgstr ""
+"这个类代表 WebSocket 连接，可以用作 WebSocket 客户端（兼容 [url=https://"
+"datatracker.ietf.org/doc/html/rfc6455]RFC 6455[/url]），也可以用作 WebSocket "
+"服务器的远程对等体。\n"
+"发送 WebSocket 二进制帧请使用 [method PacketPeer.put_packet]，发送 WebSocket "
+"文本帧请使用 [method send]（与基于文本的 API 交互时请优先选择文本帧）。可以通"
+"过 [method was_string_packet] 检查最近一个数据包的帧类型。\n"
+"开启 WebSocket 客户端的方法是：首先调用 [method connect_to_url]，然后定期调用 "
+"[method poll]（例如在 [Node] 的处理过程中）。查询套接字的状态请使用 [method "
+"get_ready_state]，获取挂起的数据包数量请使用 [method "
+"PacketPeer.get_available_packet_count]，获取挂起的数据包请使用 [method "
+"PacketPeer.get_packet]。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"\n"
+"var socket = WebSocketPeer.new()\n"
+"\n"
+"func _ready():\n"
+"\tsocket.connect_to_url(\"wss://example.com\")\n"
+"\n"
+"func _process(delta):\n"
+"\tsocket.poll()\n"
+"\tvar state = socket.get_ready_state()\n"
+"\tif state == WebSocketPeer.STATE_OPEN:\n"
+"\t\twhile socket.get_available_packet_count():\n"
+"\t\t\tprint(\"数据包：\", socket.get_packet())\n"
+"\telif state == WebSocketPeer.STATE_CLOSING:\n"
+"\t\t# 继续轮询才能正确关闭。\n"
+"\t\tpass\n"
+"\telif state == WebSocketPeer.STATE_CLOSED:\n"
+"\t\tvar code = socket.get_close_code()\n"
+"\t\tvar reason = socket.get_close_reason()\n"
+"\t\tprint(\"WebSocket 已关闭，代码：%d，原因 %s。干净得体：%s\" % [code, "
+"reason, code != -1])\n"
+"\t\tset_process(false) # 停止处理。\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"如果要作为 WebSocket 服务器的对等体使用，请参考 [method accept_stream] 及在线"
+"教程。"
+
 msgid ""
 "Accepts a peer connection performing the HTTP handshake as a WebSocket "
 "server. The [param stream] must be a valid TCP stream retrieved via [method "
@@ -176483,6 +190804,29 @@ msgstr ""
 "[method StreamPeerTLS.accept_stream] 接受的 TLS 流。\n"
 "[b]注意：[/b]由于浏览器的限制，Web 导出中不支持此方法。"
 
+msgid ""
+"Closes this WebSocket connection.\n"
+"[param code] is the status code for the closure (see [url=https://"
+"datatracker.ietf.org/doc/html/rfc6455#section-7.4.1]RFC 6455 section 7.4[/"
+"url] for a list of valid status codes). If [param code] is negative, the "
+"connection will be closed immediately without notifying the remote peer.\n"
+"[param reason] is the human-readable reason for closing the connection. It "
+"can be any UTF-8 string that's smaller than 123 bytes.\n"
+"[b]Note:[/b] To achieve a clean closure, you will need to keep polling until "
+"[constant STATE_CLOSED] is reached.\n"
+"[b]Note:[/b] The Web export might not support all status codes. Please refer "
+"to browser-specific documentation for more details."
+msgstr ""
+"关闭该 WebSocket 连接。\n"
+"[param code] 是关闭的状态码（有效状态代码的列表见 [url=https://"
+"datatracker.ietf.org/doc/html/rfc6455#section-7.4.1]RFC 6455 第 7.4 节[/"
+"url]）。如果 [param code] 为负数，则连接会立即关闭而不通知远程对等体。\n"
+"[param reason] 是人类可读的关闭连接原因。可以是任何小于 123 字节的 UTF-8 字符"
+"串。\n"
+"[b]注意：[/b]为了实现干净得体的关闭，你需要在达到 [constant STATE_CLOSED] 之前"
+"保持轮询。\n"
+"[b]注意：[/b]Web 导出可能不支持部分状态码。详情请参考具体浏览器的文档。"
+
 msgid ""
 "Connects to the given URL. TLS certificates will be verified against the "
 "hostname when connecting using the [code]wss://[/code] protocol. You can pass "
@@ -177484,6 +191828,13 @@ msgstr ""
 "如果启用了字体过采样，则返回 [code]true[/code]。见 [method "
 "set_use_font_oversampling]。"
 
+msgid ""
+"Centers the window in the current screen. If the window is embedded, it is "
+"centered in the embedder [Viewport] instead."
+msgstr ""
+"将窗口居中显示在当前屏幕中。如果窗口是嵌入式的，则会改为在嵌入器 [Viewport] 中"
+"居中显示。"
+
 msgid "Use [method Window.grab_focus] instead."
 msgstr "请改用 [method Window.grab_focus]。"
 
@@ -177730,6 +192081,40 @@ msgstr ""
 msgid "Specifies how the content is scaled when the [Window] is resized."
 msgstr "指定当 [Window] 的大小改变时，如何对内容进行缩放。"
 
+msgid ""
+"The content's base size in \"virtual\" pixels. Not to be confused with "
+"[member size], which sets the actual window's physical size in pixels. If set "
+"to a value greater than [code]0[/code] and [member content_scale_mode] is set "
+"to a value other than [constant CONTENT_SCALE_MODE_DISABLED], the [Window]'s "
+"content will be scaled when the window is resized to a different size. Higher "
+"values will make the content appear [i]smaller[/i], as it will be able to fit "
+"more of the project in view. On the root [Window], this is set to match "
+"[member ProjectSettings.display/window/size/viewport_width] and [member "
+"ProjectSettings.display/window/size/viewport_height] by default.\n"
+"For example, when using [constant CONTENT_SCALE_MODE_CANVAS_ITEMS] and "
+"[member content_scale_size] set to [code]Vector2i(1280, 720)[/code], using a "
+"window size of [code]2560×1440[/code] will make 2D elements appear at double "
+"their original size, as the content is scaled by a factor of [code]2.0[/code] "
+"([code]2560.0 / 1280.0 = 2.0[/code], [code]1440.0 / 720.0 = 2.0[/code]).\n"
+"See [url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html#base-"
+"size]the Base size section of the Multiple resolutions documentation[/url] "
+"for details."
+msgstr ""
+"内容的基础大小，单位为“虚拟”像素。请勿与 [member size] 混淆，后者设置的是窗口"
+"的实际物理大小，单位为像素。如果设置为大于 [code]0[/code] 的值且 [member "
+"content_scale_mode] 设为除 [constant CONTENT_SCALE_MODE_DISABLED] 以外的值，则"
+"当将窗口调整为不同大小时，[Window] 的内容将被缩放。更高的值会让内容看起来[i]更"
+"小[/i]，因为它可以在视图中容纳更多的项目内容。在根 [Window] 上，默认情况下，将"
+"被设置与 [member ProjectSettings.display/window/size/viewport_width] 和 "
+"[member ProjectSettings.display/window/size/viewport_height] 相匹配。\n"
+"例如，当使用 [constant CONTENT_SCALE_MODE_CANVAS_ITEMS] 并将 [member "
+"content_scale_size] 设置为 [code]Vector2i(1280, 720)[/code] 时，使用 "
+"[code]2560×1440[/code] 的窗口大小将使 2D 元素显示为其原始大小的两倍，因为内容"
+"按 [code]2.0[/code] 的倍数缩放（[code]2560.0 / 1280.0 = 2.0[/code]，"
+"[code]1440.0 / 720.0 = 2.0[/code]）。\n"
+"有关详细信息，见 [url=$DOCS_URL/tutorials/rendering/"
+"multiple_resolutions.html#base-size]多分辨率文档的基本大小部分[/url]。"
+
 msgid ""
 "The policy to use to determine the final scale factor for 2D elements. This "
 "affects how [member content_scale_factor] is applied, in addition to the "
@@ -177925,6 +192310,15 @@ msgstr ""
 "和 macOS 上则会被绘制。\n"
 "[b]注意：[/b]该属性在 Linux (X11)、macOS 和 Windows 上实现。"
 
+msgid ""
+"If set, defines the window's custom decoration area which will receive mouse "
+"input, even if normal input to the window is blocked (such as when it has an "
+"exclusive child opened). See also [signal nonclient_window_input]."
+msgstr ""
+"如果设置，则定义窗口的自定义装饰区域，该区域将接收鼠标输入，即使对窗口的正常输"
+"入被阻止（例如，当它打开一个独占子窗口时）。另见 [signal "
+"nonclient_window_input]。"
+
 msgid ""
 "If [code]true[/code], the [Window] will be considered a popup. Popups are sub-"
 "windows that don't show as separate windows in system's window manager's "
@@ -177969,6 +192363,14 @@ msgstr ""
 "[b]注意：[/b]这个属性仅在 Windows（11）上实现。\n"
 "[b]注意：[/b]这个属性仅对原生窗口有效。"
 
+msgid ""
+"The window's size in pixels. See also [member content_scale_size], which "
+"doesn't set the window's physical size but affects how scaling works relative "
+"to the current [member content_scale_mode]."
+msgstr ""
+"窗口大小，单位为像素。另见 [member content_scale_size]，它不会设置窗口的物理大"
+"小，但会影响缩放相对于当前 [member content_scale_mode] 的工作方式。"
+
 msgid ""
 "The name of a theme type variation used by this [Window] to look up its own "
 "theme items. See [member Control.theme_type_variation] for more details."
@@ -177992,7 +192394,7 @@ msgstr ""
 "如果为 [code]true[/code] 则该 [Window] 是临时窗口，即会被认为是另一个 "
 "[Window] 的子级。临时窗口会和临时父级一起销毁，关闭时会将焦点返还给父级。临时"
 "窗口显示在非独占全屏父窗口之上。临时窗口无法进入全屏模式。\n"
-"请注意，不同平台可能由不同的行为。"
+"请注意，不同平台可能有不同的行为。"
 
 msgid ""
 "If [code]true[/code], and the [Window] is [member transient], this window "
@@ -178128,6 +192530,16 @@ msgstr ""
 "挡，只要其 [member Viewport.gui_disable_input] 为 [code]false[/code] 并且无论"
 "它当前聚焦与否。"
 
+msgid ""
+"Emitted when the mouse event is received by the custom decoration area "
+"defined by [member nonclient_area], and normal input to the window is blocked "
+"(such as when it has an exclusive child opened). [param event]'s position is "
+"in the embedder's coordinate system."
+msgstr ""
+"当 [member nonclient_area] 定义的自定义装饰区域接收到鼠标事件并且窗口的正常输"
+"入被阻止时（例如，当窗口打开一个独占子窗口时）发出。[param event] 的位置位于嵌"
+"入器的坐标系中。"
+
 msgid "Emitted when window title bar text is changed."
 msgstr "当窗口标题栏文本发生变化时发出。"
 
@@ -178319,6 +192731,13 @@ msgstr ""
 msgid "Max value of the [enum Flags]."
 msgstr "[enum Flags] 的最大值。"
 
+msgid ""
+"The content will not be scaled to match the [Window]'s size ([member "
+"content_scale_size] is ignored)."
+msgstr ""
+"不会为了匹配 [Window] 的大小而对内容进行缩放（[member content_scale_size] 将被"
+"忽略）。"
+
 msgid ""
 "The content will be rendered at the target size. This is more performance-"
 "expensive than [constant CONTENT_SCALE_MODE_VIEWPORT], but provides better "
@@ -180780,6 +195199,9 @@ msgid ""
 "Returns a [Dictionary] with system information related to this interface."
 msgstr "返回包含与这个接口相关的系统信息的 [Dictionary]。"
 
+msgid "Returns the current status of our tracking."
+msgstr "返回跟踪的当前状态。"
+
 msgid "Returns a [Transform3D] for a given view."
 msgstr "返回给定视图的 [Transform3D]。"
 
diff --git a/engine/doc/translations/zh_Hant.po b/engine/doc/translations/zh_Hant.po
index 98c2a2d0..2288607a 100644
--- a/engine/doc/translations/zh_Hant.po
+++ b/engine/doc/translations/zh_Hant.po
@@ -89752,9 +89752,6 @@ msgid ""
 "performance. Use with care."
 msgstr "增加這個值會改善模擬結果，但會影響性能。請小心使用。"
 
-msgid "The SoftBody3D's mass."
-msgstr "該 SoftBody3D 的品質。"
-
 msgid ""
 "When [member Node.process_mode] is set to [constant "
 "Node.PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
diff --git a/engine/drivers/SCsub b/engine/drivers/SCsub
index a1eb8510..a5a5e6d8 100644
--- a/engine/drivers/SCsub
+++ b/engine/drivers/SCsub
@@ -61,8 +61,8 @@ if env["metal"]:
     SConscript("metal/SCsub")
 
 # Input drivers
-if env["sdl"] and env["platform"] in ["linuxbsd", "macos", "windows", "ios", "visionos"]:
-    # TODO: Evaluate support for Android and Web.
+if env["sdl"] and env["platform"] in ["linuxbsd", "macos", "windows"]:
+    # TODO: Evaluate support for Android, iOS, and Web.
     SConscript("sdl/SCsub")
 
 # Core dependencies
diff --git a/engine/drivers/accesskit/SCsub b/engine/drivers/accesskit/SCsub
index f2afb8bd..6365898a 100644
--- a/engine/drivers/accesskit/SCsub
+++ b/engine/drivers/accesskit/SCsub
@@ -4,4 +4,13 @@ from misc.utility.scons_hints import *
 Import("env")
 
 # Driver source files
-env.add_source_files(env.drivers_sources, "accessibility_server_accesskit.cpp")
+env.add_source_files(env.drivers_sources, "accessibility_driver_accesskit.cpp")
+
+if env["accesskit_sdk_path"] == "":
+    if env["platform"] == "windows":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dll_wrap.c")
+    if env["platform"] == "macos":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dylib_wrap.c")
+    if env["platform"] == "linuxbsd":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-so_wrap.c")
+    env.Prepend(CPPPATH=["#thirdparty/accesskit/include"])
diff --git a/engine/drivers/accesskit/accessibility_server_accesskit.cpp b/engine/drivers/accesskit/accessibility_driver_accesskit.cpp
similarity index 68%
rename from engine/drivers/accesskit/accessibility_server_accesskit.cpp
rename to engine/drivers/accesskit/accessibility_driver_accesskit.cpp
index 005c01c0..f0dfc5e0 100644
--- a/engine/drivers/accesskit/accessibility_server_accesskit.cpp
+++ b/engine/drivers/accesskit/accessibility_driver_accesskit.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  accessibility_server_accesskit.cpp                                    */
+/*  accessibility_driver_accesskit.cpp                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,25 +30,31 @@
 
 #ifdef ACCESSKIT_ENABLED
 
-#include "accessibility_server_accesskit.h"
+#include "accessibility_driver_accesskit.h"
+
+#include "core/config/project_settings.h"
+#include "core/io/file_access.h"
+#include "core/version.h"
 
 #include "servers/text/text_server.h"
 
-_FORCE_INLINE_ accesskit_role AccessibilityServerAccessKit::_accessibility_role(AccessibilityServerEnums::AccessibilityRole p_role) const {
+AccessibilityDriverAccessKit *AccessibilityDriverAccessKit::singleton = nullptr;
+
+_FORCE_INLINE_ accesskit_role AccessibilityDriverAccessKit::_accessibility_role(DisplayServer::AccessibilityRole p_role) const {
 	if (role_map.has(p_role)) {
 		return role_map[p_role];
 	}
 	return ACCESSKIT_ROLE_UNKNOWN;
 }
 
-_FORCE_INLINE_ accesskit_action AccessibilityServerAccessKit::_accessibility_action(AccessibilityServerEnums::AccessibilityAction p_action) const {
+_FORCE_INLINE_ accesskit_action AccessibilityDriverAccessKit::_accessibility_action(DisplayServer::AccessibilityAction p_action) const {
 	if (action_map.has(p_action)) {
 		return action_map[p_action];
 	}
 	return ACCESSKIT_ACTION_CLICK;
 }
 
-bool AccessibilityServerAccessKit::window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) {
+bool AccessibilityDriverAccessKit::window_create(DisplayServer::WindowID p_window_id, void *p_handle) {
 	ERR_FAIL_COND_V(windows.has(p_window_id), false);
 
 	WindowData &wd = windows[p_window_id];
@@ -80,7 +86,7 @@ bool AccessibilityServerAccessKit::window_create(DisplayServerEnums::WindowID p_
 	}
 }
 
-void AccessibilityServerAccessKit::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void AccessibilityDriverAccessKit::window_destroy(DisplayServer::WindowID p_window_id) {
 	WindowData *wd = windows.getptr(p_window_id);
 	ERR_FAIL_NULL(wd);
 
@@ -95,43 +101,41 @@ void AccessibilityServerAccessKit::window_destroy(DisplayServerEnums::WindowID p
 #ifdef LINUXBSD_ENABLED
 	accesskit_unix_adapter_free(wd->adapter);
 #endif
-	free_element(wd->root_id);
+	accessibility_free_element(wd->root_id);
 
 	windows.erase(p_window_id);
 }
 
-void AccessibilityServerAccessKit::_accessibility_deactivation_callback(void *p_user_data) {
-	DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
-	WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(window_id);
+void AccessibilityDriverAccessKit::_accessibility_deactivation_callback(void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+	WindowData *wd = singleton->windows.getptr(window_id);
 	ERR_FAIL_NULL(wd);
 
 	print_verbose(vformat("Accessibility: window %d adapter deactivated.", window_id));
 
-	if (static_cast<AccessibilityServerAccessKit *>(get_singleton())->focus.is_valid()) {
-		AccessibilityElement *ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(static_cast<AccessibilityServerAccessKit *>(get_singleton())->focus);
+	if (singleton->focus.is_valid()) {
+		AccessibilityElement *ae = singleton->rid_owner.get_or_null(singleton->focus);
 		if (ae && ae->window_id == window_id) {
-			static_cast<AccessibilityServerAccessKit *>(get_singleton())->focus = RID();
+			singleton->focus = RID();
 		}
 	}
 	if (wd->deactivate.is_valid()) {
 		wd->deactivate.call_deferred(); // Should be called on main thread only.
 	}
-
-	wd->activated = false;
 	wd->update.clear();
 }
 
-void AccessibilityServerAccessKit::_accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data) {
-	DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
-	ERR_FAIL_COND(!static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.has(window_id));
+void AccessibilityDriverAccessKit::_accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+	ERR_FAIL_COND(!singleton->windows.has(window_id));
 
 	RID rid = RID::from_uint64(p_request->target_node);
-	AccessibilityElement *ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(rid);
+	AccessibilityElement *ae = singleton->rid_owner.get_or_null(rid);
 	ERR_FAIL_NULL(ae);
 
 	Variant rq_data;
 	if (!ae->actions.has(p_request->action) && ae->role == ACCESSKIT_ROLE_TEXT_RUN && p_request->action == ACCESSKIT_ACTION_SCROLL_INTO_VIEW) {
-		AccessibilityElement *root_ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(ae->parent);
+		AccessibilityElement *root_ae = singleton->rid_owner.get_or_null(ae->parent);
 		ERR_FAIL_NULL(root_ae);
 		ae = root_ae;
 		rq_data = ae->run;
@@ -154,22 +158,22 @@ void AccessibilityServerAccessKit::_accessibility_action_callback(struct accessk
 					case ACCESSKIT_ACTION_DATA_SCROLL_HINT: {
 						switch (p_request->data.value.scroll_hint) {
 							case ACCESSKIT_SCROLL_HINT_TOP_LEFT: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_TOP_LEFT;
+								rq_data = DisplayServer::SCROLL_HINT_TOP_LEFT;
 							} break;
 							case ACCESSKIT_SCROLL_HINT_BOTTOM_RIGHT: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_BOTTOM_RIGHT;
+								rq_data = DisplayServer::SCROLL_HINT_BOTTOM_RIGHT;
 							} break;
 							case ACCESSKIT_SCROLL_HINT_TOP_EDGE: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_TOP_EDGE;
+								rq_data = DisplayServer::SCROLL_HINT_TOP_EDGE;
 							} break;
 							case ACCESSKIT_SCROLL_HINT_BOTTOM_EDGE: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_BOTTOM_EDGE;
+								rq_data = DisplayServer::SCROLL_HINT_BOTTOM_EDGE;
 							} break;
 							case ACCESSKIT_SCROLL_HINT_LEFT_EDGE: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_LEFT_EDGE;
+								rq_data = DisplayServer::SCROLL_HINT_LEFT_EDGE;
 							} break;
 							case ACCESSKIT_SCROLL_HINT_RIGHT_EDGE: {
-								rq_data = AccessibilityServerEnums::SCROLL_HINT_RIGHT_EDGE;
+								rq_data = DisplayServer::SCROLL_HINT_RIGHT_EDGE;
 							} break;
 							default:
 								break;
@@ -177,9 +181,9 @@ void AccessibilityServerAccessKit::_accessibility_action_callback(struct accessk
 					} break;
 					case ACCESSKIT_ACTION_DATA_SCROLL_UNIT: {
 						if (p_request->data.value.scroll_unit == ACCESSKIT_SCROLL_UNIT_ITEM) {
-							rq_data = AccessibilityServerEnums::SCROLL_UNIT_ITEM;
+							rq_data = DisplayServer::SCROLL_UNIT_ITEM;
 						} else if (p_request->data.value.scroll_unit == ACCESSKIT_SCROLL_UNIT_PAGE) {
-							rq_data = AccessibilityServerEnums::SCROLL_UNIT_PAGE;
+							rq_data = DisplayServer::SCROLL_UNIT_PAGE;
 						}
 					} break;
 					case ACCESSKIT_ACTION_DATA_SCROLL_TO_POINT: {
@@ -192,11 +196,11 @@ void AccessibilityServerAccessKit::_accessibility_action_callback(struct accessk
 						Dictionary sel;
 
 						RID start_rid = RID::from_uint64(p_request->data.value.set_text_selection.anchor.node);
-						AccessibilityElement *start_ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(start_rid);
+						AccessibilityElement *start_ae = singleton->rid_owner.get_or_null(start_rid);
 						ERR_FAIL_NULL(start_ae);
 
 						RID end_rid = RID::from_uint64(p_request->data.value.set_text_selection.focus.node);
-						AccessibilityElement *end_ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(end_rid);
+						AccessibilityElement *end_ae = singleton->rid_owner.get_or_null(end_rid);
 						ERR_FAIL_NULL(end_ae);
 
 						sel["start_element"] = start_ae->parent;
@@ -213,9 +217,9 @@ void AccessibilityServerAccessKit::_accessibility_action_callback(struct accessk
 	}
 }
 
-accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_initial_tree_update_callback(void *p_user_data) {
-	DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
-	WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(window_id);
+accesskit_tree_update *AccessibilityDriverAccessKit::_accessibility_initial_tree_update_callback(void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+	WindowData *wd = singleton->windows.getptr(window_id);
 	ERR_FAIL_NULL_V(wd, nullptr);
 
 	accesskit_node *win_node = accesskit_node_new(ACCESSKIT_ROLE_WINDOW);
@@ -234,21 +238,20 @@ accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_initial_tree
 	if (wd->activate.is_valid()) {
 		wd->activate.call_deferred(); // Should be called on main thread only.
 	}
-	wd->activated = true;
 
 	return tree_update;
 }
 
-void AccessibilityServerAccessKit::set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
-	WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
+void AccessibilityDriverAccessKit::accessibility_set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
+	WindowData *wd = singleton->windows.getptr(p_window_id);
 	ERR_FAIL_NULL(wd);
 
 	wd->activate = p_activate_callable;
 	wd->deactivate = p_deativate_callable;
 }
 
-void AccessibilityServerAccessKit::window_activation_completed(DisplayServerEnums::WindowID p_window_id) {
-	WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
+void AccessibilityDriverAccessKit::accessibility_window_activation_completed(DisplayServer::WindowID p_window_id) {
+	WindowData *wd = singleton->windows.getptr(p_window_id);
 	if (!wd) {
 		return;
 	}
@@ -258,8 +261,8 @@ void AccessibilityServerAccessKit::window_activation_completed(DisplayServerEnum
 	wd->initial_update_completed = true;
 }
 
-void AccessibilityServerAccessKit::window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) {
-	WindowData *wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.getptr(p_window_id);
+void AccessibilityDriverAccessKit::accessibility_window_deactivation_completed(DisplayServer::WindowID p_window_id) {
+	WindowData *wd = singleton->windows.getptr(p_window_id);
 	if (!wd) {
 		return;
 	}
@@ -282,7 +285,7 @@ void AccessibilityServerAccessKit::window_deactivation_completed(DisplayServerEn
 	wd->initial_update_completed = false;
 }
 
-RID AccessibilityServerAccessKit::create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) {
+RID AccessibilityDriverAccessKit::accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) {
 	AccessibilityElement *ae = memnew(AccessibilityElement);
 	ae->role = _accessibility_role(p_role);
 	ae->window_id = p_window_id;
@@ -291,7 +294,7 @@ RID AccessibilityServerAccessKit::create_element(DisplayServerEnums::WindowID p_
 	return rid;
 }
 
-RID AccessibilityServerAccessKit::create_sub_element(const RID &p_parent_rid, AccessibilityServerEnums::AccessibilityRole p_role, int p_insert_pos) {
+RID AccessibilityDriverAccessKit::accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos) {
 	AccessibilityElement *parent_ae = rid_owner.get_or_null(p_parent_rid);
 	ERR_FAIL_NULL_V(parent_ae, RID());
 
@@ -314,7 +317,7 @@ RID AccessibilityServerAccessKit::create_sub_element(const RID &p_parent_rid, Ac
 	return rid;
 }
 
-RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos, bool p_is_last_line) {
+RID AccessibilityDriverAccessKit::accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos, bool p_is_last_line) {
 	AccessibilityElement *parent_ae = rid_owner.get_or_null(p_parent_rid);
 	ERR_FAIL_NULL_V(parent_ae, RID());
 
@@ -400,7 +403,6 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 				}
 				subrun_ranges.push_back(cur_range);
 				subrun_word_starts.push_back(word_starts);
-
 				if (slice) {
 					cur_range.x = cur_range.y;
 					cur_range.y = range.y;
@@ -442,7 +444,6 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 			Vector<uint8_t> char_lengths;
 			CharString text = sub_t.utf8(&char_lengths);
 
-			ae->value = sub_t;
 			accesskit_node_set_value(ae->node, text.ptr());
 			accesskit_node_set_character_lengths(ae->node, char_lengths.size(), char_lengths.ptr());
 
@@ -463,7 +464,6 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 				if (gl[j].start >= ae->run.y || gl[j].start < ae->run.x) {
 					continue;
 				}
-
 				float advance = 0.0; // Graphame advance.
 				for (int k = 0; k < gl[j].count; k++) {
 					advance += gl[j + k].advance;
@@ -501,6 +501,7 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 			if (language.length() > 0) {
 				accesskit_node_set_language(ae->node, language.ptr());
 			}
+
 			accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT);
 
 			accesskit_rect rect;
@@ -525,7 +526,6 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 
 		text_elements.push_back(ae);
 
-		ae->value = String();
 		if (!p_is_last_line) {
 			accesskit_node_set_value(ae->node, "\n");
 
@@ -576,11 +576,11 @@ RID AccessibilityServerAccessKit::create_sub_text_edit_elements(const RID &p_par
 	return root_rid;
 }
 
-bool AccessibilityServerAccessKit::has_element(const RID &p_id) const {
+bool AccessibilityDriverAccessKit::accessibility_has_element(const RID &p_id) const {
 	return rid_owner.owns(p_id);
 }
 
-void AccessibilityServerAccessKit::_free_recursive(WindowData *p_wd, const RID &p_id) {
+void AccessibilityDriverAccessKit::_free_recursive(WindowData *p_wd, const RID &p_id) {
 	if (p_wd && p_wd->update.has(p_id)) {
 		p_wd->update.erase(p_id);
 	}
@@ -595,7 +595,7 @@ void AccessibilityServerAccessKit::_free_recursive(WindowData *p_wd, const RID &
 	rid_owner.free(p_id);
 }
 
-void AccessibilityServerAccessKit::free_element(const RID &p_id) {
+void AccessibilityDriverAccessKit::accessibility_free_element(const RID &p_id) {
 	ERR_FAIL_COND_MSG(in_accessibility_update, "Element can't be removed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -609,7 +609,7 @@ void AccessibilityServerAccessKit::free_element(const RID &p_id) {
 	}
 }
 
-void AccessibilityServerAccessKit::element_set_meta(const RID &p_id, const Variant &p_meta) {
+void AccessibilityDriverAccessKit::accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -617,13 +617,13 @@ void AccessibilityServerAccessKit::element_set_meta(const RID &p_id, const Varia
 	ae->meta = p_meta;
 }
 
-Variant AccessibilityServerAccessKit::element_get_meta(const RID &p_id) const {
+Variant AccessibilityDriverAccessKit::accessibility_element_get_meta(const RID &p_id) const {
 	const AccessibilityElement *ae = rid_owner.get_or_null(p_id);
 	ERR_FAIL_NULL_V(ae, Variant());
 	return ae->meta;
 }
 
-void AccessibilityServerAccessKit::update_set_focus(const RID &p_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_focus(const RID &p_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	if (p_id.is_valid() && rid_owner.owns(p_id)) {
@@ -633,35 +633,36 @@ void AccessibilityServerAccessKit::update_set_focus(const RID &p_id) {
 	}
 }
 
-RID AccessibilityServerAccessKit::get_window_root(DisplayServerEnums::WindowID p_window_id) const {
+RID AccessibilityDriverAccessKit::accessibility_get_window_root(DisplayServer::WindowID p_window_id) const {
 	const WindowData *wd = windows.getptr(p_window_id);
 	ERR_FAIL_NULL_V(wd, RID());
 
 	return wd->root_id;
 }
 
-accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_build_tree_update(void *p_user_data) {
-	DisplayServerEnums::WindowID window_id = (DisplayServerEnums::WindowID)(size_t)p_user_data;
+accesskit_tree_update *AccessibilityDriverAccessKit::_accessibility_build_tree_update(void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
 
-	ERR_FAIL_COND_V(!static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows.has(window_id), nullptr);
-	WindowData &wd = static_cast<AccessibilityServerAccessKit *>(get_singleton())->windows[window_id];
+	ERR_FAIL_COND_V(!singleton->windows.has(window_id), nullptr);
+	WindowData &wd = singleton->windows[window_id];
 
-	static_cast<AccessibilityServerAccessKit *>(get_singleton())->in_accessibility_update = true;
-	if (static_cast<AccessibilityServerAccessKit *>(get_singleton())->update_cb.is_valid()) {
-		static_cast<AccessibilityServerAccessKit *>(get_singleton())->update_cb.call(window_id);
+	singleton->in_accessibility_update = true;
+	if (singleton->update_cb.is_valid()) {
+		singleton->update_cb.call(window_id);
 	}
-	static_cast<AccessibilityServerAccessKit *>(get_singleton())->in_accessibility_update = false;
+	singleton->in_accessibility_update = false;
 
-	AccessibilityElement *focus_ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(static_cast<AccessibilityServerAccessKit *>(get_singleton())->focus);
+	AccessibilityElement *focus_ae = singleton->rid_owner.get_or_null(singleton->focus);
 	uint32_t update_size = wd.update.size();
 
 	accesskit_node_id ac_focus = (accesskit_node_id)wd.root_id.get_id();
 	if (focus_ae && focus_ae->window_id == window_id) {
-		ac_focus = (accesskit_node_id) static_cast<AccessibilityServerAccessKit *>(get_singleton())->focus.get_id();
+		ac_focus = (accesskit_node_id)singleton->focus.get_id();
 	}
+
 	accesskit_tree_update *tree_update = (update_size > 0) ? accesskit_tree_update_with_capacity_and_focus(update_size, ac_focus) : accesskit_tree_update_with_focus(ac_focus);
 	for (const RID &rid : wd.update) {
-		AccessibilityElement *ae = static_cast<AccessibilityServerAccessKit *>(get_singleton())->rid_owner.get_or_null(rid);
+		AccessibilityElement *ae = singleton->rid_owner.get_or_null(rid);
 		if (ae && ae->node) {
 			for (const RID &child_rid : ae->children) {
 				accesskit_node_push_child(ae->node, (accesskit_node_id)child_rid.get_id());
@@ -675,10 +676,10 @@ accesskit_tree_update *AccessibilityServerAccessKit::_accessibility_build_tree_u
 	return tree_update;
 }
 
-void AccessibilityServerAccessKit::update_if_active(const Callable &p_callable) {
+void AccessibilityDriverAccessKit::accessibility_update_if_active(const Callable &p_callable) {
 	ERR_FAIL_COND(!p_callable.is_valid());
 	update_cb = p_callable;
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &window : windows) {
+	for (KeyValue<DisplayServer::WindowID, WindowData> &window : windows) {
 #ifdef WINDOWS_ENABLED
 		accesskit_windows_queued_events *events = accesskit_windows_subclassing_adapter_update_if_active(window.value.adapter, _accessibility_build_tree_update, (void *)(size_t)window.key);
 		if (events) {
@@ -698,7 +699,7 @@ void AccessibilityServerAccessKit::update_if_active(const Callable &p_callable)
 	update_cb = Callable();
 }
 
-_FORCE_INLINE_ void AccessibilityServerAccessKit::_ensure_node(const RID &p_id, AccessibilityElement *p_ae) {
+_FORCE_INLINE_ void AccessibilityDriverAccessKit::_ensure_node(const RID &p_id, AccessibilityElement *p_ae) {
 	if (unlikely(!p_ae->node)) {
 		WindowData *wd = windows.getptr(p_ae->window_id);
 		ERR_FAIL_NULL(wd);
@@ -708,14 +709,14 @@ _FORCE_INLINE_ void AccessibilityServerAccessKit::_ensure_node(const RID &p_id,
 
 		// Re-apply stored name if any, so nodes recreated by _ensure_node
 		// retain their label even if the caller doesn't re-set all properties.
-		String full_name = (p_ae->name + " " + p_ae->name_extra_info).strip_edges();
-		if (!full_name.is_empty()) {
+		if (!p_ae->name.is_empty() || !p_ae->name_extra_info.is_empty()) {
+			String full_name = p_ae->name + " " + p_ae->name_extra_info;
 			accesskit_node_set_label(p_ae->node, full_name.utf8().ptr());
 		}
 	}
 }
 
-void AccessibilityServerAccessKit::set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
+void AccessibilityDriverAccessKit::accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
 #ifdef LINUXBSD_ENABLED
 	const WindowData *wd = windows.getptr(p_window_id);
 	ERR_FAIL_NULL(wd);
@@ -726,7 +727,7 @@ void AccessibilityServerAccessKit::set_window_rect(DisplayServerEnums::WindowID
 #endif
 }
 
-void AccessibilityServerAccessKit::set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) {
+void AccessibilityDriverAccessKit::accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) {
 	const WindowData *wd = windows.getptr(p_window_id);
 	ERR_FAIL_NULL(wd);
 
@@ -742,7 +743,7 @@ void AccessibilityServerAccessKit::set_window_focused(DisplayServerEnums::Window
 	// Note: On Windows, the subclassing adapter takes care of this.
 }
 
-void AccessibilityServerAccessKit::update_set_role(const RID &p_id, AccessibilityServerEnums::AccessibilityRole p_role) {
+void AccessibilityDriverAccessKit::accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -756,7 +757,7 @@ void AccessibilityServerAccessKit::update_set_role(const RID &p_id, Accessibilit
 	accesskit_node_set_role(ae->node, ae->role);
 }
 
-void AccessibilityServerAccessKit::update_set_name(const RID &p_id, const String &p_name) {
+void AccessibilityDriverAccessKit::accessibility_update_set_name(const RID &p_id, const String &p_name) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -764,7 +765,7 @@ void AccessibilityServerAccessKit::update_set_name(const RID &p_id, const String
 	_ensure_node(p_id, ae);
 
 	ae->name = p_name;
-	String full_name = (ae->name + " " + ae->name_extra_info).strip_edges();
+	String full_name = ae->name + " " + ae->name_extra_info;
 	if (!full_name.is_empty()) {
 		accesskit_node_set_label(ae->node, full_name.utf8().ptr());
 	} else {
@@ -772,35 +773,7 @@ void AccessibilityServerAccessKit::update_set_name(const RID &p_id, const String
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_braille_label(const RID &p_id, const String &p_name) {
-	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
-
-	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
-	ERR_FAIL_NULL(ae);
-	_ensure_node(p_id, ae);
-
-	if (!p_name.is_empty()) {
-		accesskit_node_set_braille_label(ae->node, p_name.utf8().ptr());
-	} else {
-		accesskit_node_clear_braille_label(ae->node);
-	}
-}
-
-void AccessibilityServerAccessKit::update_set_braille_role_description(const RID &p_id, const String &p_description) {
-	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
-
-	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
-	ERR_FAIL_NULL(ae);
-	_ensure_node(p_id, ae);
-
-	if (!p_description.is_empty()) {
-		accesskit_node_set_braille_role_description(ae->node, p_description.utf8().ptr());
-	} else {
-		accesskit_node_clear_braille_role_description(ae->node);
-	}
-}
-
-void AccessibilityServerAccessKit::update_set_extra_info(const RID &p_id, const String &p_name_extra_info) {
+void AccessibilityDriverAccessKit::accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -808,7 +781,7 @@ void AccessibilityServerAccessKit::update_set_extra_info(const RID &p_id, const
 	_ensure_node(p_id, ae);
 
 	ae->name_extra_info = p_name_extra_info;
-	String full_name = (ae->name + " " + ae->name_extra_info).strip_edges();
+	String full_name = ae->name + " " + ae->name_extra_info;
 	if (!full_name.is_empty()) {
 		accesskit_node_set_label(ae->node, full_name.utf8().ptr());
 	} else {
@@ -816,7 +789,7 @@ void AccessibilityServerAccessKit::update_set_extra_info(const RID &p_id, const
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_description(const RID &p_id, const String &p_description) {
+void AccessibilityDriverAccessKit::accessibility_update_set_description(const RID &p_id, const String &p_description) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -830,7 +803,7 @@ void AccessibilityServerAccessKit::update_set_description(const RID &p_id, const
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_value(const RID &p_id, const String &p_value) {
+void AccessibilityDriverAccessKit::accessibility_update_set_value(const RID &p_id, const String &p_value) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -839,17 +812,15 @@ void AccessibilityServerAccessKit::update_set_value(const RID &p_id, const Strin
 
 	if (!p_value.is_empty()) {
 		Vector<uint8_t> ch_length;
-		ae->value = p_value;
 		accesskit_node_set_value(ae->node, p_value.utf8(&ch_length).ptr());
 		accesskit_node_set_character_lengths(ae->node, ch_length.size(), ch_length.ptr());
 	} else {
-		ae->value = String();
 		accesskit_node_clear_value(ae->node);
 		accesskit_node_clear_character_lengths(ae->node);
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_tooltip(const RID &p_id, const String &p_tooltip) {
+void AccessibilityDriverAccessKit::accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -863,7 +834,7 @@ void AccessibilityServerAccessKit::update_set_tooltip(const RID &p_id, const Str
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_bounds(const RID &p_id, const Rect2 &p_rect) {
+void AccessibilityDriverAccessKit::accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -878,7 +849,7 @@ void AccessibilityServerAccessKit::update_set_bounds(const RID &p_id, const Rect
 	accesskit_node_set_bounds(ae->node, rect);
 }
 
-void AccessibilityServerAccessKit::update_set_transform(const RID &p_id, const Transform2D &p_transform) {
+void AccessibilityDriverAccessKit::accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -889,7 +860,7 @@ void AccessibilityServerAccessKit::update_set_transform(const RID &p_id, const T
 	accesskit_node_set_transform(ae->node, transform);
 }
 
-void AccessibilityServerAccessKit::update_add_child(const RID &p_id, const RID &p_child_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_child(const RID &p_id, const RID &p_child_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -902,7 +873,7 @@ void AccessibilityServerAccessKit::update_add_child(const RID &p_id, const RID &
 	accesskit_node_push_child(ae->node, (accesskit_node_id)p_child_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_controls(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -915,7 +886,7 @@ void AccessibilityServerAccessKit::update_add_related_controls(const RID &p_id,
 	accesskit_node_push_controlled(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_details(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -928,7 +899,7 @@ void AccessibilityServerAccessKit::update_add_related_details(const RID &p_id, c
 	accesskit_node_push_detail(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_described_by(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -941,7 +912,7 @@ void AccessibilityServerAccessKit::update_add_related_described_by(const RID &p_
 	accesskit_node_push_described_by(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_flow_to(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -954,7 +925,7 @@ void AccessibilityServerAccessKit::update_add_related_flow_to(const RID &p_id, c
 	accesskit_node_push_flow_to(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -967,7 +938,7 @@ void AccessibilityServerAccessKit::update_add_related_labeled_by(const RID &p_id
 	accesskit_node_push_labelled_by(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_add_related_radio_group(const RID &p_id, const RID &p_related_id) {
+void AccessibilityDriverAccessKit::accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -980,7 +951,7 @@ void AccessibilityServerAccessKit::update_add_related_radio_group(const RID &p_i
 	accesskit_node_push_to_radio_group(ae->node, (accesskit_node_id)p_related_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_active_descendant(const RID &p_id, const RID &p_other_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -993,7 +964,7 @@ void AccessibilityServerAccessKit::update_set_active_descendant(const RID &p_id,
 	accesskit_node_set_active_descendant(ae->node, (accesskit_node_id)p_other_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_next_on_line(const RID &p_id, const RID &p_other_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1006,7 +977,7 @@ void AccessibilityServerAccessKit::update_set_next_on_line(const RID &p_id, cons
 	accesskit_node_set_next_on_line(ae->node, (accesskit_node_id)p_other_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_previous_on_line(const RID &p_id, const RID &p_other_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1019,7 +990,7 @@ void AccessibilityServerAccessKit::update_set_previous_on_line(const RID &p_id,
 	accesskit_node_set_previous_on_line(ae->node, (accesskit_node_id)p_other_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_member_of(const RID &p_id, const RID &p_group_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1032,7 +1003,7 @@ void AccessibilityServerAccessKit::update_set_member_of(const RID &p_id, const R
 	accesskit_node_set_member_of(ae->node, (accesskit_node_id)p_group_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1045,7 +1016,7 @@ void AccessibilityServerAccessKit::update_set_in_page_link_target(const RID &p_i
 	accesskit_node_set_in_page_link_target(ae->node, (accesskit_node_id)p_other_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_error_message(const RID &p_id, const RID &p_other_id) {
+void AccessibilityDriverAccessKit::accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1058,7 +1029,7 @@ void AccessibilityServerAccessKit::update_set_error_message(const RID &p_id, con
 	accesskit_node_set_error_message(ae->node, (accesskit_node_id)p_other_id.get_id());
 }
 
-void AccessibilityServerAccessKit::update_set_live(const RID &p_id, AccessibilityServerEnums::AccessibilityLiveMode p_live) {
+void AccessibilityDriverAccessKit::accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1066,19 +1037,19 @@ void AccessibilityServerAccessKit::update_set_live(const RID &p_id, Accessibilit
 	_ensure_node(p_id, ae);
 
 	switch (p_live) {
-		case AccessibilityServerEnums::AccessibilityLiveMode::LIVE_OFF: {
+		case DisplayServer::AccessibilityLiveMode::LIVE_OFF: {
 			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_OFF);
 		} break;
-		case AccessibilityServerEnums::AccessibilityLiveMode::LIVE_POLITE: {
+		case DisplayServer::AccessibilityLiveMode::LIVE_POLITE: {
 			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_POLITE);
 		} break;
-		case AccessibilityServerEnums::AccessibilityLiveMode::LIVE_ASSERTIVE: {
+		case DisplayServer::AccessibilityLiveMode::LIVE_ASSERTIVE: {
 			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_ASSERTIVE);
 		} break;
 	}
 }
 
-void AccessibilityServerAccessKit::update_add_action(const RID &p_id, AccessibilityServerEnums::AccessibilityAction p_action, const Callable &p_callable) {
+void AccessibilityDriverAccessKit::accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1090,7 +1061,7 @@ void AccessibilityServerAccessKit::update_add_action(const RID &p_id, Accessibil
 	accesskit_node_add_action(ae->node, _accessibility_action(p_action));
 }
 
-void AccessibilityServerAccessKit::update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) {
+void AccessibilityDriverAccessKit::accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1109,7 +1080,7 @@ void AccessibilityServerAccessKit::update_add_custom_action(const RID &p_id, int
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_table_row_count(const RID &p_id, int p_count) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_row_count(const RID &p_id, int p_count) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1119,7 +1090,7 @@ void AccessibilityServerAccessKit::update_set_table_row_count(const RID &p_id, i
 	accesskit_node_set_row_count(ae->node, p_count);
 }
 
-void AccessibilityServerAccessKit::update_set_table_column_count(const RID &p_id, int p_count) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_column_count(const RID &p_id, int p_count) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1129,7 +1100,7 @@ void AccessibilityServerAccessKit::update_set_table_column_count(const RID &p_id
 	accesskit_node_set_column_count(ae->node, p_count);
 }
 
-void AccessibilityServerAccessKit::update_set_table_row_index(const RID &p_id, int p_index) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_row_index(const RID &p_id, int p_index) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1139,7 +1110,7 @@ void AccessibilityServerAccessKit::update_set_table_row_index(const RID &p_id, i
 	accesskit_node_set_row_index(ae->node, p_index);
 }
 
-void AccessibilityServerAccessKit::update_set_table_column_index(const RID &p_id, int p_index) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_column_index(const RID &p_id, int p_index) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1149,7 +1120,7 @@ void AccessibilityServerAccessKit::update_set_table_column_index(const RID &p_id
 	accesskit_node_set_column_index(ae->node, p_index);
 }
 
-void AccessibilityServerAccessKit::update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1160,7 +1131,7 @@ void AccessibilityServerAccessKit::update_set_table_cell_position(const RID &p_i
 	accesskit_node_set_column_index(ae->node, p_column_index);
 }
 
-void AccessibilityServerAccessKit::update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) {
+void AccessibilityDriverAccessKit::accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1171,7 +1142,7 @@ void AccessibilityServerAccessKit::update_set_table_cell_span(const RID &p_id, i
 	accesskit_node_set_column_span(ae->node, p_column_span);
 }
 
-void AccessibilityServerAccessKit::update_set_list_item_count(const RID &p_id, int p_size) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_count(const RID &p_id, int p_size) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1181,7 +1152,7 @@ void AccessibilityServerAccessKit::update_set_list_item_count(const RID &p_id, i
 	accesskit_node_set_size_of_set(ae->node, p_size);
 }
 
-void AccessibilityServerAccessKit::update_set_list_item_index(const RID &p_id, int p_index) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_index(const RID &p_id, int p_index) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1191,7 +1162,7 @@ void AccessibilityServerAccessKit::update_set_list_item_index(const RID &p_id, i
 	accesskit_node_set_position_in_set(ae->node, p_index);
 }
 
-void AccessibilityServerAccessKit::update_set_list_item_level(const RID &p_id, int p_level) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_level(const RID &p_id, int p_level) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1201,7 +1172,7 @@ void AccessibilityServerAccessKit::update_set_list_item_level(const RID &p_id, i
 	accesskit_node_set_level(ae->node, p_level);
 }
 
-void AccessibilityServerAccessKit::update_set_list_item_selected(const RID &p_id, bool p_selected) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1211,7 +1182,7 @@ void AccessibilityServerAccessKit::update_set_list_item_selected(const RID &p_id
 	accesskit_node_set_selected(ae->node, p_selected);
 }
 
-void AccessibilityServerAccessKit::update_set_list_item_expanded(const RID &p_id, bool p_expanded) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1221,7 +1192,7 @@ void AccessibilityServerAccessKit::update_set_list_item_expanded(const RID &p_id
 	accesskit_node_set_expanded(ae->node, p_expanded);
 }
 
-void AccessibilityServerAccessKit::update_set_popup_type(const RID &p_id, AccessibilityServerEnums::AccessibilityPopupType p_popup) {
+void AccessibilityDriverAccessKit::accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1229,22 +1200,22 @@ void AccessibilityServerAccessKit::update_set_popup_type(const RID &p_id, Access
 	_ensure_node(p_id, ae);
 
 	switch (p_popup) {
-		case AccessibilityServerEnums::AccessibilityPopupType::POPUP_MENU: {
+		case DisplayServer::AccessibilityPopupType::POPUP_MENU: {
 			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_MENU);
 		} break;
-		case AccessibilityServerEnums::AccessibilityPopupType::POPUP_LIST: {
+		case DisplayServer::AccessibilityPopupType::POPUP_LIST: {
 			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_LISTBOX);
 		} break;
-		case AccessibilityServerEnums::AccessibilityPopupType::POPUP_TREE: {
+		case DisplayServer::AccessibilityPopupType::POPUP_TREE: {
 			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_TREE);
 		} break;
-		case AccessibilityServerEnums::AccessibilityPopupType::POPUP_DIALOG: {
+		case DisplayServer::AccessibilityPopupType::POPUP_DIALOG: {
 			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_DIALOG);
 		} break;
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_checked(const RID &p_id, bool p_checekd) {
+void AccessibilityDriverAccessKit::accessibility_update_set_checked(const RID &p_id, bool p_checekd) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1258,7 +1229,7 @@ void AccessibilityServerAccessKit::update_set_checked(const RID &p_id, bool p_ch
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_num_value(const RID &p_id, double p_position) {
+void AccessibilityDriverAccessKit::accessibility_update_set_num_value(const RID &p_id, double p_position) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1266,10 +1237,9 @@ void AccessibilityServerAccessKit::update_set_num_value(const RID &p_id, double
 	_ensure_node(p_id, ae);
 
 	accesskit_node_set_numeric_value(ae->node, p_position);
-	ae->value = p_position;
 }
 
-void AccessibilityServerAccessKit::update_set_num_range(const RID &p_id, double p_min, double p_max) {
+void AccessibilityDriverAccessKit::accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1280,7 +1250,7 @@ void AccessibilityServerAccessKit::update_set_num_range(const RID &p_id, double
 	accesskit_node_set_max_numeric_value(ae->node, p_max);
 }
 
-void AccessibilityServerAccessKit::update_set_num_step(const RID &p_id, double p_step) {
+void AccessibilityDriverAccessKit::accessibility_update_set_num_step(const RID &p_id, double p_step) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1290,7 +1260,7 @@ void AccessibilityServerAccessKit::update_set_num_step(const RID &p_id, double p
 	accesskit_node_set_numeric_value_step(ae->node, p_step);
 }
 
-void AccessibilityServerAccessKit::update_set_num_jump(const RID &p_id, double p_jump) {
+void AccessibilityDriverAccessKit::accessibility_update_set_num_jump(const RID &p_id, double p_jump) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1300,7 +1270,7 @@ void AccessibilityServerAccessKit::update_set_num_jump(const RID &p_id, double p
 	accesskit_node_set_numeric_value_jump(ae->node, p_jump);
 }
 
-void AccessibilityServerAccessKit::update_set_scroll_x(const RID &p_id, double p_position) {
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_x(const RID &p_id, double p_position) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1310,7 +1280,7 @@ void AccessibilityServerAccessKit::update_set_scroll_x(const RID &p_id, double p
 	accesskit_node_set_scroll_x(ae->node, p_position);
 }
 
-void AccessibilityServerAccessKit::update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) {
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1321,7 +1291,7 @@ void AccessibilityServerAccessKit::update_set_scroll_x_range(const RID &p_id, do
 	accesskit_node_set_scroll_x_max(ae->node, p_max);
 }
 
-void AccessibilityServerAccessKit::update_set_scroll_y(const RID &p_id, double p_position) {
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_y(const RID &p_id, double p_position) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1331,7 +1301,7 @@ void AccessibilityServerAccessKit::update_set_scroll_y(const RID &p_id, double p
 	accesskit_node_set_scroll_y(ae->node, p_position);
 }
 
-void AccessibilityServerAccessKit::update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) {
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1342,7 +1312,7 @@ void AccessibilityServerAccessKit::update_set_scroll_y_range(const RID &p_id, do
 	accesskit_node_set_scroll_y_max(ae->node, p_max);
 }
 
-void AccessibilityServerAccessKit::update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline, const Color &p_color) {
+void AccessibilityDriverAccessKit::accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1350,10 +1320,10 @@ void AccessibilityServerAccessKit::update_set_text_decorations(const RID &p_id,
 	_ensure_node(p_id, ae);
 
 	accesskit_color color;
-	color.red = p_color.get_r8();
-	color.blue = p_color.get_b8();
-	color.green = p_color.get_g8();
-	color.alpha = p_color.get_a8();
+	color.red = 0;
+	color.blue = 0;
+	color.green = 0;
+	color.alpha = 255;
 
 	if (p_underline) {
 		accesskit_node_set_underline(ae->node, { ACCESSKIT_TEXT_DECORATION_STYLE_SOLID, color });
@@ -1372,7 +1342,7 @@ void AccessibilityServerAccessKit::update_set_text_decorations(const RID &p_id,
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_text_align(const RID &p_id, HorizontalAlignment p_align) {
+void AccessibilityDriverAccessKit::accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1395,7 +1365,7 @@ void AccessibilityServerAccessKit::update_set_text_align(const RID &p_id, Horizo
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) {
+void AccessibilityDriverAccessKit::accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1442,83 +1412,78 @@ void AccessibilityServerAccessKit::update_set_text_selection(const RID &p_id, co
 	accesskit_node_set_text_selection(ae->node, sel);
 }
 
-void AccessibilityServerAccessKit::update_set_flag(const RID &p_id, AccessibilityServerEnums::AccessibilityFlags p_flag, bool p_value) {
+void AccessibilityDriverAccessKit::accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
 	ERR_FAIL_NULL(ae);
 	_ensure_node(p_id, ae);
 
-	if (p_value) {
-		ae->flags |= (1ULL << (uint64_t)p_flag);
-	} else {
-		ae->flags &= ~(1ULL << (uint64_t)p_flag);
-	}
 	switch (p_flag) {
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN: {
+		case DisplayServer::AccessibilityFlags::FLAG_HIDDEN: {
 			if (p_value) {
 				accesskit_node_set_hidden(ae->node);
 			} else {
 				accesskit_node_clear_hidden(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_MULTISELECTABLE: {
+		case DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE: {
 			if (p_value) {
 				accesskit_node_set_multiselectable(ae->node);
 			} else {
 				accesskit_node_clear_multiselectable(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_REQUIRED: {
+		case DisplayServer::AccessibilityFlags::FLAG_REQUIRED: {
 			if (p_value) {
 				accesskit_node_set_required(ae->node);
 			} else {
 				accesskit_node_clear_required(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_VISITED: {
+		case DisplayServer::AccessibilityFlags::FLAG_VISITED: {
 			if (p_value) {
 				accesskit_node_set_visited(ae->node);
 			} else {
 				accesskit_node_clear_visited(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_BUSY: {
+		case DisplayServer::AccessibilityFlags::FLAG_BUSY: {
 			if (p_value) {
 				accesskit_node_set_busy(ae->node);
 			} else {
 				accesskit_node_clear_busy(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_MODAL: {
+		case DisplayServer::AccessibilityFlags::FLAG_MODAL: {
 			if (p_value) {
 				accesskit_node_set_modal(ae->node);
 			} else {
 				accesskit_node_clear_modal(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH: {
+		case DisplayServer::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH: {
 			if (p_value) {
 				accesskit_node_set_touch_transparent(ae->node);
 			} else {
 				accesskit_node_clear_touch_transparent(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_READONLY: {
+		case DisplayServer::AccessibilityFlags::FLAG_READONLY: {
 			if (p_value) {
 				accesskit_node_set_read_only(ae->node);
 			} else {
 				accesskit_node_clear_read_only(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED: {
+		case DisplayServer::AccessibilityFlags::FLAG_DISABLED: {
 			if (p_value) {
 				accesskit_node_set_disabled(ae->node);
 			} else {
 				accesskit_node_clear_disabled(ae->node);
 			}
 		} break;
-		case AccessibilityServerEnums::AccessibilityFlags::FLAG_CLIPS_CHILDREN: {
+		case DisplayServer::AccessibilityFlags::FLAG_CLIPS_CHILDREN: {
 			if (p_value) {
 				accesskit_node_set_clips_children(ae->node);
 			} else {
@@ -1528,7 +1493,7 @@ void AccessibilityServerAccessKit::update_set_flag(const RID &p_id, Accessibilit
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_classname(const RID &p_id, const String &p_classname) {
+void AccessibilityDriverAccessKit::accessibility_update_set_classname(const RID &p_id, const String &p_classname) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1542,7 +1507,7 @@ void AccessibilityServerAccessKit::update_set_classname(const RID &p_id, const S
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_placeholder(const RID &p_id, const String &p_placeholder) {
+void AccessibilityDriverAccessKit::accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1556,7 +1521,7 @@ void AccessibilityServerAccessKit::update_set_placeholder(const RID &p_id, const
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_language(const RID &p_id, const String &p_language) {
+void AccessibilityDriverAccessKit::accessibility_update_set_language(const RID &p_id, const String &p_language) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1566,7 +1531,7 @@ void AccessibilityServerAccessKit::update_set_language(const RID &p_id, const St
 	accesskit_node_set_language(ae->node, p_language.utf8().ptr());
 }
 
-void AccessibilityServerAccessKit::update_set_text_orientation(const RID &p_id, bool p_vertical) {
+void AccessibilityDriverAccessKit::accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1580,7 +1545,7 @@ void AccessibilityServerAccessKit::update_set_text_orientation(const RID &p_id,
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_list_orientation(const RID &p_id, bool p_vertical) {
+void AccessibilityDriverAccessKit::accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1594,7 +1559,7 @@ void AccessibilityServerAccessKit::update_set_list_orientation(const RID &p_id,
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_shortcut(const RID &p_id, const String &p_shortcut) {
+void AccessibilityDriverAccessKit::accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1608,7 +1573,7 @@ void AccessibilityServerAccessKit::update_set_shortcut(const RID &p_id, const St
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_url(const RID &p_id, const String &p_url) {
+void AccessibilityDriverAccessKit::accessibility_update_set_url(const RID &p_id, const String &p_url) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1622,7 +1587,7 @@ void AccessibilityServerAccessKit::update_set_url(const RID &p_id, const String
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_role_description(const RID &p_id, const String &p_description) {
+void AccessibilityDriverAccessKit::accessibility_update_set_role_description(const RID &p_id, const String &p_description) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1636,7 +1601,7 @@ void AccessibilityServerAccessKit::update_set_role_description(const RID &p_id,
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_state_description(const RID &p_id, const String &p_description) {
+void AccessibilityDriverAccessKit::accessibility_update_set_state_description(const RID &p_id, const String &p_description) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1650,15 +1615,13 @@ void AccessibilityServerAccessKit::update_set_state_description(const RID &p_id,
 	}
 }
 
-void AccessibilityServerAccessKit::update_set_color_value(const RID &p_id, const Color &p_color) {
+void AccessibilityDriverAccessKit::accessibility_update_set_color_value(const RID &p_id, const Color &p_color) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
 	ERR_FAIL_NULL(ae);
 	_ensure_node(p_id, ae);
 
-	ae->value = p_color;
-
 	accesskit_color color;
 	color.red = p_color.get_r8();
 	color.blue = p_color.get_b8();
@@ -1668,7 +1631,7 @@ void AccessibilityServerAccessKit::update_set_color_value(const RID &p_id, const
 	accesskit_node_set_color_value(ae->node, color);
 }
 
-void AccessibilityServerAccessKit::update_set_background_color(const RID &p_id, const Color &p_color) {
+void AccessibilityDriverAccessKit::accessibility_update_set_background_color(const RID &p_id, const Color &p_color) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1684,7 +1647,7 @@ void AccessibilityServerAccessKit::update_set_background_color(const RID &p_id,
 	accesskit_node_set_background_color(ae->node, color);
 }
 
-void AccessibilityServerAccessKit::update_set_foreground_color(const RID &p_id, const Color &p_color) {
+void AccessibilityDriverAccessKit::accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) {
 	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessibility updates are only allowed inside the NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
 
 	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
@@ -1700,94 +1663,149 @@ void AccessibilityServerAccessKit::update_set_foreground_color(const RID &p_id,
 	accesskit_node_set_foreground_color(ae->node, color);
 }
 
-AccessibilityServer *AccessibilityServerAccessKit::create_func(Error &r_error) {
-	print_verbose("Accessibility: AccessKit driver loaded.");
-	r_error = OK;
-	return memnew(AccessibilityServerAccessKit);
+Error AccessibilityDriverAccessKit::init() {
+#ifdef ACCESSKIT_DYNAMIC
+#ifdef DEBUG_ENABLED
+	int dylibloader_verbose = 1;
+#else
+	int dylibloader_verbose = 0;
+#endif
+	void *library_handle = nullptr;
+	String path;
+	String arch = Engine::get_singleton()->get_architecture_name();
+#ifdef LINUXBSD_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".so");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit." + arch + ".so");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.so");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit.so");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef MACOS_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".dylib");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit." + arch + ".dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit.dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef WINDOWS_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit." + arch + ".dll");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit.dll");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+
+	Error err = OS::get_singleton()->open_dynamic_library(path, library_handle);
+	if (err == OK && initialize_libaccesskit(dylibloader_verbose, library_handle) == 0) {
+		print_verbose("AccessKit loaded.");
+	} else {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef MACOS_ENABLED
+	//accesskit_macos_add_focus_forwarder_to_window_class("GodotWindow");
+#endif
+	return OK;
 }
 
-AccessibilityServerAccessKit::AccessibilityServerAccessKit() {
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_UNKNOWN] = ACCESSKIT_ROLE_UNKNOWN;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_DEFAULT_BUTTON] = ACCESSKIT_ROLE_DEFAULT_BUTTON;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_AUDIO] = ACCESSKIT_ROLE_AUDIO;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_VIDEO] = ACCESSKIT_ROLE_VIDEO;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_STATIC_TEXT] = ACCESSKIT_ROLE_LABEL;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER] = ACCESSKIT_ROLE_GENERIC_CONTAINER;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_PANEL] = ACCESSKIT_ROLE_PANE;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON] = ACCESSKIT_ROLE_BUTTON;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_LINK] = ACCESSKIT_ROLE_LINK;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_CHECK_BOX] = ACCESSKIT_ROLE_CHECK_BOX;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_RADIO_BUTTON] = ACCESSKIT_ROLE_RADIO_BUTTON;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_CHECK_BUTTON] = ACCESSKIT_ROLE_SWITCH;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_SCROLL_BAR] = ACCESSKIT_ROLE_SCROLL_BAR;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_SCROLL_VIEW] = ACCESSKIT_ROLE_SCROLL_VIEW;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_SPLITTER] = ACCESSKIT_ROLE_SPLITTER;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_SLIDER] = ACCESSKIT_ROLE_SLIDER;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_SPIN_BUTTON] = ACCESSKIT_ROLE_SPIN_BUTTON;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_PROGRESS_INDICATOR] = ACCESSKIT_ROLE_PROGRESS_INDICATOR;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TEXT_FIELD] = ACCESSKIT_ROLE_TEXT_INPUT;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD] = ACCESSKIT_ROLE_MULTILINE_TEXT_INPUT;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_COLOR_PICKER] = ACCESSKIT_ROLE_COLOR_WELL;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TABLE] = ACCESSKIT_ROLE_TABLE;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_CELL] = ACCESSKIT_ROLE_CELL;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_ROW] = ACCESSKIT_ROLE_ROW;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_ROW_GROUP] = ACCESSKIT_ROLE_ROW_GROUP;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_ROW_HEADER] = ACCESSKIT_ROLE_ROW_HEADER;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_COLUMN_HEADER] = ACCESSKIT_ROLE_COLUMN_HEADER;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TREE] = ACCESSKIT_ROLE_TREE;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TREE_ITEM] = ACCESSKIT_ROLE_TREE_ITEM;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_LIST] = ACCESSKIT_ROLE_LIST;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_ITEM] = ACCESSKIT_ROLE_LIST_ITEM;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX] = ACCESSKIT_ROLE_LIST_BOX;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX_OPTION] = ACCESSKIT_ROLE_LIST_BOX_OPTION;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TAB_BAR] = ACCESSKIT_ROLE_TAB_LIST;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TAB] = ACCESSKIT_ROLE_TAB;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TAB_PANEL] = ACCESSKIT_ROLE_TAB_PANEL;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_BAR] = ACCESSKIT_ROLE_MENU_BAR;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MENU] = ACCESSKIT_ROLE_MENU;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM] = ACCESSKIT_ROLE_MENU_ITEM;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX] = ACCESSKIT_ROLE_MENU_ITEM_CHECK_BOX;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM_RADIO] = ACCESSKIT_ROLE_MENU_ITEM_RADIO;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_IMAGE] = ACCESSKIT_ROLE_IMAGE;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_WINDOW] = ACCESSKIT_ROLE_WINDOW;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TITLE_BAR] = ACCESSKIT_ROLE_TITLE_BAR;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_DIALOG] = ACCESSKIT_ROLE_DIALOG;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TOOLTIP] = ACCESSKIT_ROLE_TOOLTIP;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_REGION] = ACCESSKIT_ROLE_REGION;
-	role_map[AccessibilityServerEnums::AccessibilityRole::ROLE_TEXT_RUN] = ACCESSKIT_ROLE_TEXT_RUN;
+AccessibilityDriverAccessKit::AccessibilityDriverAccessKit() {
+	singleton = this;
 
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK] = ACCESSKIT_ACTION_CLICK;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS] = ACCESSKIT_ACTION_FOCUS;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR] = ACCESSKIT_ACTION_BLUR;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_COLLAPSE] = ACCESSKIT_ACTION_COLLAPSE;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_EXPAND] = ACCESSKIT_ACTION_EXPAND;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_DECREMENT] = ACCESSKIT_ACTION_DECREMENT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_INCREMENT] = ACCESSKIT_ACTION_INCREMENT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_HIDE_TOOLTIP] = ACCESSKIT_ACTION_HIDE_TOOLTIP;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_TOOLTIP] = ACCESSKIT_ACTION_SHOW_TOOLTIP;
-	//action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_INVALIDATE_TREE] = ACCESSKIT_ACTION_INVALIDATE_TREE;
-	//action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_LOAD_INLINE_TEXT_BOXES] = ACCESSKIT_ACTION_LOAD_INLINE_TEXT_BOXES;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SET_TEXT_SELECTION] = ACCESSKIT_ACTION_SET_TEXT_SELECTION;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT] = ACCESSKIT_ACTION_REPLACE_SELECTED_TEXT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_BACKWARD] = ACCESSKIT_ACTION_SCROLL_UP;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN] = ACCESSKIT_ACTION_SCROLL_DOWN;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_FORWARD] = ACCESSKIT_ACTION_SCROLL_DOWN;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_LEFT] = ACCESSKIT_ACTION_SCROLL_LEFT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_RIGHT] = ACCESSKIT_ACTION_SCROLL_RIGHT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP] = ACCESSKIT_ACTION_SCROLL_UP;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW] = ACCESSKIT_ACTION_SCROLL_INTO_VIEW;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_TO_POINT] = ACCESSKIT_ACTION_SCROLL_TO_POINT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET] = ACCESSKIT_ACTION_SET_SCROLL_OFFSET;
-	//action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT] = ACCESSKIT_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE] = ACCESSKIT_ACTION_SET_VALUE;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU] = ACCESSKIT_ACTION_SHOW_CONTEXT_MENU;
-	action_map[AccessibilityServerEnums::AccessibilityAction::ACTION_CUSTOM] = ACCESSKIT_ACTION_CUSTOM_ACTION;
+	role_map[DisplayServer::AccessibilityRole::ROLE_UNKNOWN] = ACCESSKIT_ROLE_UNKNOWN;
+	role_map[DisplayServer::AccessibilityRole::ROLE_DEFAULT_BUTTON] = ACCESSKIT_ROLE_DEFAULT_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_AUDIO] = ACCESSKIT_ROLE_AUDIO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_VIDEO] = ACCESSKIT_ROLE_VIDEO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT] = ACCESSKIT_ROLE_LABEL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CONTAINER] = ACCESSKIT_ROLE_GENERIC_CONTAINER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_PANEL] = ACCESSKIT_ROLE_PANE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_BUTTON] = ACCESSKIT_ROLE_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LINK] = ACCESSKIT_ROLE_LINK;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CHECK_BOX] = ACCESSKIT_ROLE_CHECK_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_RADIO_BUTTON] = ACCESSKIT_ROLE_RADIO_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CHECK_BUTTON] = ACCESSKIT_ROLE_SWITCH;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SCROLL_BAR] = ACCESSKIT_ROLE_SCROLL_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SCROLL_VIEW] = ACCESSKIT_ROLE_SCROLL_VIEW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SPLITTER] = ACCESSKIT_ROLE_SPLITTER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SLIDER] = ACCESSKIT_ROLE_SLIDER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON] = ACCESSKIT_ROLE_SPIN_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR] = ACCESSKIT_ROLE_PROGRESS_INDICATOR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TEXT_FIELD] = ACCESSKIT_ROLE_TEXT_INPUT;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD] = ACCESSKIT_ROLE_MULTILINE_TEXT_INPUT;
+	role_map[DisplayServer::AccessibilityRole::ROLE_COLOR_PICKER] = ACCESSKIT_ROLE_COLOR_WELL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TABLE] = ACCESSKIT_ROLE_TABLE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CELL] = ACCESSKIT_ROLE_CELL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW] = ACCESSKIT_ROLE_ROW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW_GROUP] = ACCESSKIT_ROLE_ROW_GROUP;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW_HEADER] = ACCESSKIT_ROLE_ROW_HEADER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_COLUMN_HEADER] = ACCESSKIT_ROLE_COLUMN_HEADER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TREE] = ACCESSKIT_ROLE_TREE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TREE_ITEM] = ACCESSKIT_ROLE_TREE_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST] = ACCESSKIT_ROLE_LIST;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_ITEM] = ACCESSKIT_ROLE_LIST_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_BOX] = ACCESSKIT_ROLE_LIST_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION] = ACCESSKIT_ROLE_LIST_BOX_OPTION;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB_BAR] = ACCESSKIT_ROLE_TAB_LIST;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB] = ACCESSKIT_ROLE_TAB;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB_PANEL] = ACCESSKIT_ROLE_TAB_PANEL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_BAR] = ACCESSKIT_ROLE_MENU_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU] = ACCESSKIT_ROLE_MENU;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM] = ACCESSKIT_ROLE_MENU_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX] = ACCESSKIT_ROLE_MENU_ITEM_CHECK_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_RADIO] = ACCESSKIT_ROLE_MENU_ITEM_RADIO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_IMAGE] = ACCESSKIT_ROLE_IMAGE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_WINDOW] = ACCESSKIT_ROLE_WINDOW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TITLE_BAR] = ACCESSKIT_ROLE_TITLE_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_DIALOG] = ACCESSKIT_ROLE_DIALOG;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TOOLTIP] = ACCESSKIT_ROLE_TOOLTIP;
+
+	action_map[DisplayServer::AccessibilityAction::ACTION_CLICK] = ACCESSKIT_ACTION_CLICK;
+	action_map[DisplayServer::AccessibilityAction::ACTION_FOCUS] = ACCESSKIT_ACTION_FOCUS;
+	action_map[DisplayServer::AccessibilityAction::ACTION_BLUR] = ACCESSKIT_ACTION_BLUR;
+	action_map[DisplayServer::AccessibilityAction::ACTION_COLLAPSE] = ACCESSKIT_ACTION_COLLAPSE;
+	action_map[DisplayServer::AccessibilityAction::ACTION_EXPAND] = ACCESSKIT_ACTION_EXPAND;
+	action_map[DisplayServer::AccessibilityAction::ACTION_DECREMENT] = ACCESSKIT_ACTION_DECREMENT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_INCREMENT] = ACCESSKIT_ACTION_INCREMENT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_HIDE_TOOLTIP] = ACCESSKIT_ACTION_HIDE_TOOLTIP;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SHOW_TOOLTIP] = ACCESSKIT_ACTION_SHOW_TOOLTIP;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_INVALIDATE_TREE] = ACCESSKIT_ACTION_INVALIDATE_TREE;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_LOAD_INLINE_TEXT_BOXES] = ACCESSKIT_ACTION_LOAD_INLINE_TEXT_BOXES;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION] = ACCESSKIT_ACTION_SET_TEXT_SELECTION;
+	action_map[DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT] = ACCESSKIT_ACTION_REPLACE_SELECTED_TEXT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_BACKWARD] = ACCESSKIT_ACTION_SCROLL_UP;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN] = ACCESSKIT_ACTION_SCROLL_DOWN;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_FORWARD] = ACCESSKIT_ACTION_SCROLL_DOWN;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT] = ACCESSKIT_ACTION_SCROLL_LEFT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT] = ACCESSKIT_ACTION_SCROLL_RIGHT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_UP] = ACCESSKIT_ACTION_SCROLL_UP;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW] = ACCESSKIT_ACTION_SCROLL_INTO_VIEW;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_TO_POINT] = ACCESSKIT_ACTION_SCROLL_TO_POINT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET] = ACCESSKIT_ACTION_SET_SCROLL_OFFSET;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT] = ACCESSKIT_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_VALUE] = ACCESSKIT_ACTION_SET_VALUE;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU] = ACCESSKIT_ACTION_SHOW_CONTEXT_MENU;
+	action_map[DisplayServer::AccessibilityAction::ACTION_CUSTOM] = ACCESSKIT_ACTION_CUSTOM_ACTION;
 }
 
-AccessibilityServerAccessKit::~AccessibilityServerAccessKit() {}
-
-void AccessibilityServerAccessKit::register_create_func() {
-	register_create_function("accesskit", create_func);
+AccessibilityDriverAccessKit::~AccessibilityDriverAccessKit() {
+	singleton = nullptr;
 }
 
 #endif // ACCESSKIT_ENABLED
diff --git a/engine/drivers/accesskit/accessibility_driver_accesskit.h b/engine/drivers/accesskit/accessibility_driver_accesskit.h
new file mode 100644
index 00000000..a4196c6b
--- /dev/null
+++ b/engine/drivers/accesskit/accessibility_driver_accesskit.h
@@ -0,0 +1,203 @@
+/**************************************************************************/
+/*  accessibility_driver_accesskit.h                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#ifdef ACCESSKIT_ENABLED
+
+#include "core/templates/rid_owner.h"
+#include "servers/display/display_server.h"
+
+#ifdef ACCESSKIT_DYNAMIC
+#ifdef LINUXBSD_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-so_wrap.h"
+#endif
+#ifdef MACOS_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h"
+#endif
+#ifdef WINDOWS_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-dll_wrap.h"
+#endif
+#else
+#include <accesskit.h>
+#endif
+
+class AccessibilityDriverAccessKit : public AccessibilityDriver {
+	static AccessibilityDriverAccessKit *singleton;
+
+	struct AccessibilityElement {
+		HashMap<accesskit_action, Callable> actions;
+
+		DisplayServer::WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
+		RID parent;
+		LocalVector<RID> children;
+		Vector3i run;
+		Variant meta;
+		String name;
+		String name_extra_info;
+
+		accesskit_role role = ACCESSKIT_ROLE_UNKNOWN;
+		accesskit_node *node = nullptr;
+	};
+	mutable RID_PtrOwner<AccessibilityElement> rid_owner;
+
+	struct WindowData {
+		// Adapter.
+#ifdef WINDOWS_ENABLED
+		accesskit_windows_subclassing_adapter *adapter = nullptr;
+#endif
+#ifdef MACOS_ENABLED
+		accesskit_macos_subclassing_adapter *adapter = nullptr;
+#endif
+#ifdef LINUXBSD_ENABLED
+		accesskit_unix_adapter *adapter = nullptr;
+#endif
+
+		RID root_id;
+		bool initial_update_completed = false;
+		HashSet<RID> update;
+		Callable activate;
+		Callable deactivate;
+	};
+
+	RID focus;
+
+	HashMap<DisplayServer::WindowID, WindowData> windows;
+
+	HashMap<DisplayServer::AccessibilityRole, accesskit_role> role_map;
+	HashMap<DisplayServer::AccessibilityAction, accesskit_action> action_map;
+
+	_FORCE_INLINE_ accesskit_role _accessibility_role(DisplayServer::AccessibilityRole p_role) const;
+	_FORCE_INLINE_ accesskit_action _accessibility_action(DisplayServer::AccessibilityAction p_action) const;
+
+	void _free_recursive(WindowData *p_wd, const RID &p_id);
+	_FORCE_INLINE_ void _ensure_node(const RID &p_id, AccessibilityElement *p_ae);
+
+	static void _accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data);
+	static accesskit_tree_update *_accessibility_initial_tree_update_callback(void *p_user_data);
+	static void _accessibility_deactivation_callback(void *p_user_data);
+	static accesskit_tree_update *_accessibility_build_tree_update(void *p_user_data);
+
+	bool in_accessibility_update = false;
+	Callable update_cb;
+
+public:
+	Error init() override;
+
+	bool window_create(DisplayServer::WindowID p_window_id, void *p_handle) override;
+	void window_destroy(DisplayServer::WindowID p_window_id) override;
+
+	RID accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) override;
+	RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1) override;
+	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) override;
+	bool accessibility_has_element(const RID &p_id) const override;
+	void accessibility_free_element(const RID &p_id) override;
+
+	void accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) override;
+	Variant accessibility_element_get_meta(const RID &p_id) const override;
+
+	void accessibility_update_if_active(const Callable &p_callable) override;
+
+	void accessibility_update_set_focus(const RID &p_id) override;
+	RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const override;
+
+	void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override;
+	void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) override;
+	void accessibility_set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) override;
+	void accessibility_window_activation_completed(DisplayServer::WindowID p_window_id) override;
+	void accessibility_window_deactivation_completed(DisplayServer::WindowID p_window_id) override;
+
+	void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) override;
+	void accessibility_update_set_name(const RID &p_id, const String &p_name) override;
+	void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) override;
+	void accessibility_update_set_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_value(const RID &p_id, const String &p_value) override;
+	void accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) override;
+	void accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) override;
+	void accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) override;
+	void accessibility_update_add_child(const RID &p_id, const RID &p_child_id) override;
+	void accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) override;
+	void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) override;
+	void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) override;
+	void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) override;
+	void accessibility_update_set_table_row_count(const RID &p_id, int p_count) override;
+	void accessibility_update_set_table_column_count(const RID &p_id, int p_count) override;
+	void accessibility_update_set_table_row_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_table_column_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) override;
+	void accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) override;
+	void accessibility_update_set_list_item_count(const RID &p_id, int p_size) override;
+	void accessibility_update_set_list_item_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_list_item_level(const RID &p_id, int p_level) override;
+	void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) override;
+	void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) override;
+	void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) override;
+	void accessibility_update_set_checked(const RID &p_id, bool p_checekd) override;
+	void accessibility_update_set_num_value(const RID &p_id, double p_position) override;
+	void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_num_step(const RID &p_id, double p_step) override;
+	void accessibility_update_set_num_jump(const RID &p_id, double p_jump) override;
+	void accessibility_update_set_scroll_x(const RID &p_id, double p_position) override;
+	void accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_scroll_y(const RID &p_id, double p_position) override;
+	void accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) override;
+	void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) override;
+	void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) override;
+	void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) override;
+	void accessibility_update_set_classname(const RID &p_id, const String &p_classname) override;
+	void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) override;
+	void accessibility_update_set_language(const RID &p_id, const String &p_language) override;
+	void accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) override;
+	void accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) override;
+	void accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) override;
+	void accessibility_update_set_url(const RID &p_id, const String &p_url) override;
+	void accessibility_update_set_role_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_state_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_color_value(const RID &p_id, const Color &p_color) override;
+	void accessibility_update_set_background_color(const RID &p_id, const Color &p_color) override;
+	void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) override;
+
+	AccessibilityDriverAccessKit();
+	~AccessibilityDriverAccessKit();
+};
+
+#endif // ACCESSKIT_ENABLED
diff --git a/engine/drivers/accesskit/accessibility_server_accesskit.h b/engine/drivers/accesskit/accessibility_server_accesskit.h
deleted file mode 100644
index c6708209..00000000
--- a/engine/drivers/accesskit/accessibility_server_accesskit.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/**************************************************************************/
-/*  accessibility_server_accesskit.h                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#ifdef ACCESSKIT_ENABLED
-
-#include "core/templates/rid_owner.h"
-#include "servers/display/accessibility_server.h"
-
-#include <accesskit.h>
-
-class AccessibilityServerAccessKit : public AccessibilityServer {
-	GDSOFTCLASS(AccessibilityServerAccessKit, AccessibilityServer);
-
-	static AccessibilityServer *create_func(Error &r_error);
-
-	struct AccessibilityElement {
-		HashMap<accesskit_action, Callable> actions;
-
-		DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
-		RID parent;
-		LocalVector<RID> children;
-		Vector3i run;
-		Variant meta;
-		String name;
-		String name_extra_info;
-		Variant value;
-		int64_t flags = 0;
-
-		accesskit_role role = ACCESSKIT_ROLE_UNKNOWN;
-		accesskit_node *node = nullptr;
-	};
-	mutable RID_PtrOwner<AccessibilityElement> rid_owner;
-
-	struct WindowData {
-		// Adapter.
-#ifdef WINDOWS_ENABLED
-		accesskit_windows_subclassing_adapter *adapter = nullptr;
-#endif
-#ifdef MACOS_ENABLED
-		accesskit_macos_subclassing_adapter *adapter = nullptr;
-#endif
-#ifdef LINUXBSD_ENABLED
-		accesskit_unix_adapter *adapter = nullptr;
-#endif
-
-		RID root_id;
-		bool initial_update_completed = false;
-		HashSet<RID> update;
-		Callable activate;
-		Callable deactivate;
-		bool activated = false;
-	};
-
-	RID focus;
-
-	HashMap<DisplayServerEnums::WindowID, WindowData> windows;
-
-	HashMap<AccessibilityServerEnums::AccessibilityRole, accesskit_role> role_map;
-	HashMap<AccessibilityServerEnums::AccessibilityAction, accesskit_action> action_map;
-
-	_FORCE_INLINE_ accesskit_role _accessibility_role(AccessibilityServerEnums::AccessibilityRole p_role) const;
-	_FORCE_INLINE_ accesskit_action _accessibility_action(AccessibilityServerEnums::AccessibilityAction p_action) const;
-
-	void _free_recursive(WindowData *p_wd, const RID &p_id);
-	_FORCE_INLINE_ void _ensure_node(const RID &p_id, AccessibilityElement *p_ae);
-
-	static void _accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data);
-	static accesskit_tree_update *_accessibility_initial_tree_update_callback(void *p_user_data);
-	static void _accessibility_deactivation_callback(void *p_user_data);
-	static accesskit_tree_update *_accessibility_build_tree_update(void *p_user_data);
-
-	bool in_accessibility_update = false;
-	Callable update_cb;
-
-public:
-	bool is_supported() const override { return true; }
-
-	bool window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) override;
-	void window_destroy(DisplayServerEnums::WindowID p_window_id) override;
-
-	RID create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) override;
-	RID create_sub_element(const RID &p_parent_rid, AccessibilityServerEnums::AccessibilityRole p_role, int p_insert_pos = -1) override;
-	virtual RID create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) override;
-	bool has_element(const RID &p_id) const override;
-	void free_element(const RID &p_id) override;
-
-	void element_set_meta(const RID &p_id, const Variant &p_meta) override;
-	Variant element_get_meta(const RID &p_id) const override;
-
-	void update_if_active(const Callable &p_callable) override;
-
-	void update_set_focus(const RID &p_id) override;
-	RID get_window_root(DisplayServerEnums::WindowID p_window_id) const override;
-
-	void set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override;
-	void set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) override;
-	void set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) override;
-	void window_activation_completed(DisplayServerEnums::WindowID p_window_id) override;
-	void window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) override;
-
-	void update_set_role(const RID &p_id, AccessibilityServerEnums::AccessibilityRole p_role) override;
-	void update_set_name(const RID &p_id, const String &p_name) override;
-	void update_set_braille_label(const RID &p_id, const String &p_name) override;
-	void update_set_braille_role_description(const RID &p_id, const String &p_description) override;
-	void update_set_extra_info(const RID &p_id, const String &p_name_extra_info) override;
-	void update_set_description(const RID &p_id, const String &p_description) override;
-	void update_set_value(const RID &p_id, const String &p_value) override;
-	void update_set_tooltip(const RID &p_id, const String &p_tooltip) override;
-	void update_set_bounds(const RID &p_id, const Rect2 &p_rect) override;
-	void update_set_transform(const RID &p_id, const Transform2D &p_transform) override;
-	void update_add_child(const RID &p_id, const RID &p_child_id) override;
-	void update_add_related_controls(const RID &p_id, const RID &p_related_id) override;
-	void update_add_related_details(const RID &p_id, const RID &p_related_id) override;
-	void update_add_related_described_by(const RID &p_id, const RID &p_related_id) override;
-	void update_add_related_flow_to(const RID &p_id, const RID &p_related_id) override;
-	void update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) override;
-	void update_add_related_radio_group(const RID &p_id, const RID &p_related_id) override;
-	void update_set_active_descendant(const RID &p_id, const RID &p_other_id) override;
-	void update_set_next_on_line(const RID &p_id, const RID &p_other_id) override;
-	void update_set_previous_on_line(const RID &p_id, const RID &p_other_id) override;
-	void update_set_member_of(const RID &p_id, const RID &p_group_id) override;
-	void update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) override;
-	void update_set_error_message(const RID &p_id, const RID &p_other_id) override;
-	void update_set_live(const RID &p_id, AccessibilityServerEnums::AccessibilityLiveMode p_live) override;
-	void update_add_action(const RID &p_id, AccessibilityServerEnums::AccessibilityAction p_action, const Callable &p_callable) override;
-	void update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) override;
-	void update_set_table_row_count(const RID &p_id, int p_count) override;
-	void update_set_table_column_count(const RID &p_id, int p_count) override;
-	void update_set_table_row_index(const RID &p_id, int p_index) override;
-	void update_set_table_column_index(const RID &p_id, int p_index) override;
-	void update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) override;
-	void update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) override;
-	void update_set_list_item_count(const RID &p_id, int p_size) override;
-	void update_set_list_item_index(const RID &p_id, int p_index) override;
-	void update_set_list_item_level(const RID &p_id, int p_level) override;
-	void update_set_list_item_selected(const RID &p_id, bool p_selected) override;
-	void update_set_list_item_expanded(const RID &p_id, bool p_expanded) override;
-	void update_set_popup_type(const RID &p_id, AccessibilityServerEnums::AccessibilityPopupType p_popup) override;
-	void update_set_checked(const RID &p_id, bool p_checekd) override;
-	void update_set_num_value(const RID &p_id, double p_position) override;
-	void update_set_num_range(const RID &p_id, double p_min, double p_max) override;
-	void update_set_num_step(const RID &p_id, double p_step) override;
-	void update_set_num_jump(const RID &p_id, double p_jump) override;
-	void update_set_scroll_x(const RID &p_id, double p_position) override;
-	void update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) override;
-	void update_set_scroll_y(const RID &p_id, double p_position) override;
-	void update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) override;
-	void update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline, const Color &p_color) override;
-	void update_set_text_align(const RID &p_id, HorizontalAlignment p_align) override;
-	void update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) override;
-	void update_set_flag(const RID &p_id, AccessibilityServerEnums::AccessibilityFlags p_flag, bool p_value) override;
-	void update_set_classname(const RID &p_id, const String &p_classname) override;
-	void update_set_placeholder(const RID &p_id, const String &p_placeholder) override;
-	void update_set_language(const RID &p_id, const String &p_language) override;
-	void update_set_text_orientation(const RID &p_id, bool p_vertical) override;
-	void update_set_list_orientation(const RID &p_id, bool p_vertical) override;
-	void update_set_shortcut(const RID &p_id, const String &p_shortcut) override;
-	void update_set_url(const RID &p_id, const String &p_url) override;
-	void update_set_role_description(const RID &p_id, const String &p_description) override;
-	void update_set_state_description(const RID &p_id, const String &p_description) override;
-	void update_set_color_value(const RID &p_id, const Color &p_color) override;
-	void update_set_background_color(const RID &p_id, const Color &p_color) override;
-	void update_set_foreground_color(const RID &p_id, const Color &p_color) override;
-
-	static void register_create_func();
-
-	AccessibilityServerAccessKit();
-	~AccessibilityServerAccessKit();
-};
-
-#endif // ACCESSKIT_ENABLED
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c
new file mode 100644
index 00000000..95dfc702
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c
@@ -0,0 +1,4869 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 01:01:33
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dll --init-name libaccesskit --output-header accesskit-dll_wrap.h --output-implementation accesskit-dll_wrap.c
+//
+
+// NOTE:
+// This has been handpatched to add WinAPI wrappers for dlfcn functions.
+
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_debug accesskit_windows_adapter_debug_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_windows_queued_events_raise
+#undef accesskit_windows_adapter_new
+#undef accesskit_windows_adapter_free
+#undef accesskit_windows_adapter_update_if_active
+#undef accesskit_windows_adapter_update_window_focus_state
+#undef accesskit_windows_adapter_handle_wm_getobject
+#undef accesskit_windows_adapter_debug
+#undef accesskit_windows_subclassing_adapter_new
+#undef accesskit_windows_subclassing_adapter_free
+#undef accesskit_windows_subclassing_adapter_update_if_active
+
+#define RTLD_LAZY 0
+
+char *dl_error = NULL;
+char dl_error_text[2048];
+
+void *dlsym(void *p_handle, const char *p_name) {
+  dl_error = NULL;
+
+  HMODULE hmodule = (HMODULE)p_handle;
+  void *f = (void *)GetProcAddress(hmodule, p_name);
+  if (!f) {
+    FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), dl_error_text, 2048, NULL);
+    dl_error = dl_error_text;
+  }
+  return f;
+}
+
+char *dlerror() {
+  return dl_error;
+}
+
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+void (*accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_queued_events *);
+struct accesskit_windows_adapter *(*accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, bool, accesskit_action_handler_callback, void *);
+void (*accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *);
+struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, bool);
+struct accesskit_opt_lresult (*accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, WPARAM, LPARAM, accesskit_activation_handler_callback, void *);
+char *(*accesskit_windows_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_windows_adapter *);
+struct accesskit_windows_subclassing_adapter *(*accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+void (*accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *);
+struct accesskit_windows_queued_events *(*accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *, accesskit_tree_update_factory, void *);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_child_supports_action
+  *(void **) (&accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_child_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_child_action
+  *(void **) (&accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_child_action
+  *(void **) (&accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_child_actions
+  *(void **) (&accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_child_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label_with_length
+  *(void **) (&accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description_with_length
+  *(void **) (&accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value_with_length
+  *(void **) (&accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key_with_length
+  *(void **) (&accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id_with_length
+  *(void **) (&accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name_with_length
+  *(void **) (&accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family_with_length
+  *(void **) (&accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag_with_length
+  *(void **) (&accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html_with_length
+  *(void **) (&accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut_with_length
+  *(void **) (&accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language_with_length
+  *(void **) (&accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder_with_length
+  *(void **) (&accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description_with_length
+  *(void **) (&accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description_with_length
+  *(void **) (&accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip_with_length
+  *(void **) (&accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url_with_length
+  *(void **) (&accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text_with_length
+  *(void **) (&accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text_with_length
+  *(void **) (&accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_label
+  *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label
+  *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label_with_length
+  *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_label
+  *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_role_description
+  *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description
+  *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description_with_length
+  *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_role_description
+  *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_starts
+  *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_starts
+  *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_starts
+  *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_free
+  *(void **) (&accesskit_custom_action_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_id
+  *(void **) (&accesskit_custom_action_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_id
+  *(void **) (&accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_description
+  *(void **) (&accesskit_custom_action_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description
+  *(void **) (&accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description_with_length
+  *(void **) (&accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_debug
+  *(void **) (&accesskit_node_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name_with_length
+  *(void **) (&accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version_with_length
+  *(void **) (&accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_debug
+  *(void **) (&accesskit_tree_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_debug
+  *(void **) (&accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_mul
+  *(void **) (&accesskit_affine_mul_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_mul");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_point
+  *(void **) (&accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_add_vec2
+  *(void **) (&accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_add_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_vec2
+  *(void **) (&accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_point
+  *(void **) (&accesskit_point_sub_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_new
+  *(void **) (&accesskit_rect_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_translate
+  *(void **) (&accesskit_rect_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_scale
+  *(void **) (&accesskit_size_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_add
+  *(void **) (&accesskit_size_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_sub
+  *(void **) (&accesskit_size_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_add
+  *(void **) (&accesskit_vec2_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_sub
+  *(void **) (&accesskit_vec2_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_scale
+  *(void **) (&accesskit_vec2_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_neg
+  *(void **) (&accesskit_vec2_neg_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_neg");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_queued_events_raise
+  *(void **) (&accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_queued_events_raise");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_new
+  *(void **) (&accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_free
+  *(void **) (&accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_update_if_active
+  *(void **) (&accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_update_window_focus_state
+  *(void **) (&accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_update_window_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_handle_wm_getobject
+  *(void **) (&accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_handle_wm_getobject");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_debug
+  *(void **) (&accesskit_windows_adapter_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_new
+  *(void **) (&accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_free
+  *(void **) (&accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_update_if_active
+  *(void **) (&accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h
new file mode 100644
index 00000000..0e4835f9
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h
@@ -0,0 +1,1774 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 01:01:33
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dll --init-name libaccesskit --output-header accesskit-dll_wrap.h --output-implementation accesskit-dll_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_debug accesskit_windows_adapter_debug_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_windows_queued_events_raise
+#undef accesskit_windows_adapter_new
+#undef accesskit_windows_adapter_free
+#undef accesskit_windows_adapter_update_if_active
+#undef accesskit_windows_adapter_update_window_focus_state
+#undef accesskit_windows_adapter_handle_wm_getobject
+#undef accesskit_windows_adapter_debug
+#undef accesskit_windows_subclassing_adapter_new
+#undef accesskit_windows_subclassing_adapter_free
+#undef accesskit_windows_subclassing_adapter_update_if_active
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_wrapper_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_debug accesskit_windows_adapter_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+extern void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+extern int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+extern char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+extern void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+extern struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+extern struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+extern struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern void (*accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_queued_events *);
+extern struct accesskit_windows_adapter *(*accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, bool, accesskit_action_handler_callback, void *);
+extern void (*accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, bool);
+extern struct accesskit_opt_lresult (*accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, WPARAM, LPARAM, accesskit_activation_handler_callback, void *);
+extern char *(*accesskit_windows_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_windows_adapter *);
+extern struct accesskit_windows_subclassing_adapter *(*accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern void (*accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *, accesskit_tree_update_factory, void *);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c
new file mode 100644
index 00000000..3881b4f0
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c
@@ -0,0 +1,4910 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 00:53:36
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dylib --init-name libaccesskit --output-header accesskit-dylib_wrap.h --output-implementation accesskit-dylib_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_debug accesskit_macos_adapter_debug_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class_with_length accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_macos_queued_events_raise
+#undef accesskit_macos_adapter_new
+#undef accesskit_macos_adapter_free
+#undef accesskit_macos_adapter_update_if_active
+#undef accesskit_macos_adapter_update_view_focus_state
+#undef accesskit_macos_adapter_view_children
+#undef accesskit_macos_adapter_focus
+#undef accesskit_macos_adapter_hit_test
+#undef accesskit_macos_adapter_debug
+#undef accesskit_macos_subclassing_adapter_new
+#undef accesskit_macos_subclassing_adapter_for_window
+#undef accesskit_macos_subclassing_adapter_free
+#undef accesskit_macos_subclassing_adapter_update_if_active
+#undef accesskit_macos_subclassing_adapter_update_view_focus_state
+#undef accesskit_macos_add_focus_forwarder_to_window_class
+#undef accesskit_macos_add_focus_forwarder_to_window_class_with_length
+#include <dlfcn.h>
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+void (*accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_queued_events *);
+struct accesskit_macos_adapter *(*accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit)(void *, bool, accesskit_action_handler_callback, void *);
+void (*accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *);
+struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, bool);
+void *(*accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+void *(*accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+void *(*accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, double, double, accesskit_activation_handler_callback, void *);
+char *(*accesskit_macos_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_macos_adapter *);
+struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+void (*accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *);
+struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, bool);
+void (*accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit)(const char *);
+void (*accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_wrapper_libaccesskit)(const char *, size_t);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_child_supports_action
+  *(void **) (&accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_child_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_child_action
+  *(void **) (&accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_child_action
+  *(void **) (&accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_child_actions
+  *(void **) (&accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_child_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label_with_length
+  *(void **) (&accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description_with_length
+  *(void **) (&accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value_with_length
+  *(void **) (&accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key_with_length
+  *(void **) (&accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id_with_length
+  *(void **) (&accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name_with_length
+  *(void **) (&accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family_with_length
+  *(void **) (&accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag_with_length
+  *(void **) (&accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html_with_length
+  *(void **) (&accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut_with_length
+  *(void **) (&accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language_with_length
+  *(void **) (&accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder_with_length
+  *(void **) (&accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description_with_length
+  *(void **) (&accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description_with_length
+  *(void **) (&accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip_with_length
+  *(void **) (&accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url_with_length
+  *(void **) (&accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text_with_length
+  *(void **) (&accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text_with_length
+  *(void **) (&accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_label
+  *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label
+  *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label_with_length
+  *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_label
+  *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_role_description
+  *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description
+  *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description_with_length
+  *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_role_description
+  *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_starts
+  *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_starts
+  *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_starts
+  *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_free
+  *(void **) (&accesskit_custom_action_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_id
+  *(void **) (&accesskit_custom_action_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_id
+  *(void **) (&accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_description
+  *(void **) (&accesskit_custom_action_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description
+  *(void **) (&accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description_with_length
+  *(void **) (&accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_debug
+  *(void **) (&accesskit_node_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name_with_length
+  *(void **) (&accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version_with_length
+  *(void **) (&accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_debug
+  *(void **) (&accesskit_tree_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_debug
+  *(void **) (&accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_mul
+  *(void **) (&accesskit_affine_mul_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_mul");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_point
+  *(void **) (&accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_add_vec2
+  *(void **) (&accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_add_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_vec2
+  *(void **) (&accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_point
+  *(void **) (&accesskit_point_sub_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_new
+  *(void **) (&accesskit_rect_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_translate
+  *(void **) (&accesskit_rect_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_scale
+  *(void **) (&accesskit_size_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_add
+  *(void **) (&accesskit_size_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_sub
+  *(void **) (&accesskit_size_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_add
+  *(void **) (&accesskit_vec2_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_sub
+  *(void **) (&accesskit_vec2_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_scale
+  *(void **) (&accesskit_vec2_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_neg
+  *(void **) (&accesskit_vec2_neg_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_neg");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_queued_events_raise
+  *(void **) (&accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_queued_events_raise");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_new
+  *(void **) (&accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_free
+  *(void **) (&accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_update_if_active
+  *(void **) (&accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_update_view_focus_state
+  *(void **) (&accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_update_view_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_view_children
+  *(void **) (&accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_view_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_focus
+  *(void **) (&accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_hit_test
+  *(void **) (&accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_hit_test");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_debug
+  *(void **) (&accesskit_macos_adapter_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_new
+  *(void **) (&accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_for_window
+  *(void **) (&accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_for_window");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_free
+  *(void **) (&accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_update_if_active
+  *(void **) (&accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_update_view_focus_state
+  *(void **) (&accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_update_view_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_add_focus_forwarder_to_window_class
+  *(void **) (&accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_add_focus_forwarder_to_window_class");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_add_focus_forwarder_to_window_class_with_length
+  *(void **) (&accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_add_focus_forwarder_to_window_class_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h
new file mode 100644
index 00000000..fd0d3553
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h
@@ -0,0 +1,1798 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 00:53:36
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dylib --init-name libaccesskit --output-header accesskit-dylib_wrap.h --output-implementation accesskit-dylib_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_debug accesskit_macos_adapter_debug_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class_with_length accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_macos_queued_events_raise
+#undef accesskit_macos_adapter_new
+#undef accesskit_macos_adapter_free
+#undef accesskit_macos_adapter_update_if_active
+#undef accesskit_macos_adapter_update_view_focus_state
+#undef accesskit_macos_adapter_view_children
+#undef accesskit_macos_adapter_focus
+#undef accesskit_macos_adapter_hit_test
+#undef accesskit_macos_adapter_debug
+#undef accesskit_macos_subclassing_adapter_new
+#undef accesskit_macos_subclassing_adapter_for_window
+#undef accesskit_macos_subclassing_adapter_free
+#undef accesskit_macos_subclassing_adapter_update_if_active
+#undef accesskit_macos_subclassing_adapter_update_view_focus_state
+#undef accesskit_macos_add_focus_forwarder_to_window_class
+#undef accesskit_macos_add_focus_forwarder_to_window_class_with_length
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_wrapper_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_debug accesskit_macos_adapter_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class_with_length accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+extern void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+extern int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+extern char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+extern void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+extern struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+extern struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+extern struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern void (*accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_queued_events *);
+extern struct accesskit_macos_adapter *(*accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit)(void *, bool, accesskit_action_handler_callback, void *);
+extern void (*accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, bool);
+extern void *(*accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+extern void *(*accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+extern void *(*accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, double, double, accesskit_activation_handler_callback, void *);
+extern char *(*accesskit_macos_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_macos_adapter *);
+extern struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern void (*accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, bool);
+extern void (*accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit)(const char *);
+extern void (*accesskit_macos_add_focus_forwarder_to_window_class_with_length_dylibloader_wrapper_libaccesskit)(const char *, size_t);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c
new file mode 100644
index 00000000..36aadec7
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c
@@ -0,0 +1,4800 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 00:54:05
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.so --init-name libaccesskit --output-header accesskit-so_wrap.h --output-implementation accesskit-so_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_debug accesskit_unix_adapter_debug_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_unix_adapter_new
+#undef accesskit_unix_adapter_free
+#undef accesskit_unix_adapter_set_root_window_bounds
+#undef accesskit_unix_adapter_update_if_active
+#undef accesskit_unix_adapter_update_window_focus_state
+#undef accesskit_unix_adapter_debug
+#include <dlfcn.h>
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_unix_adapter *(*accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit)(accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *, accesskit_deactivation_handler_callback, void *);
+void (*accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *);
+void (*accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, struct accesskit_rect, struct accesskit_rect);
+void (*accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, accesskit_tree_update_factory, void *);
+void (*accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, bool);
+char *(*accesskit_unix_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_unix_adapter *);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_child_supports_action
+  *(void **) (&accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_child_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_child_action
+  *(void **) (&accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_child_action
+  *(void **) (&accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_child_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_child_actions
+  *(void **) (&accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_child_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label_with_length
+  *(void **) (&accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description_with_length
+  *(void **) (&accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value_with_length
+  *(void **) (&accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key_with_length
+  *(void **) (&accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id_with_length
+  *(void **) (&accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name_with_length
+  *(void **) (&accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family_with_length
+  *(void **) (&accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag_with_length
+  *(void **) (&accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html_with_length
+  *(void **) (&accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut_with_length
+  *(void **) (&accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language_with_length
+  *(void **) (&accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder_with_length
+  *(void **) (&accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description_with_length
+  *(void **) (&accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description_with_length
+  *(void **) (&accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip_with_length
+  *(void **) (&accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url_with_length
+  *(void **) (&accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text_with_length
+  *(void **) (&accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text_with_length
+  *(void **) (&accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_label
+  *(void **) (&accesskit_node_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label
+  *(void **) (&accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_label_with_length
+  *(void **) (&accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_label_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_label
+  *(void **) (&accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_braille_role_description
+  *(void **) (&accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description
+  *(void **) (&accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_braille_role_description_with_length
+  *(void **) (&accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_braille_role_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_braille_role_description
+  *(void **) (&accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_braille_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_starts
+  *(void **) (&accesskit_node_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_starts
+  *(void **) (&accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_starts
+  *(void **) (&accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_starts");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_free
+  *(void **) (&accesskit_custom_action_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_id
+  *(void **) (&accesskit_custom_action_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_id
+  *(void **) (&accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_description
+  *(void **) (&accesskit_custom_action_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description
+  *(void **) (&accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_set_description_with_length
+  *(void **) (&accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_set_description_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_debug
+  *(void **) (&accesskit_node_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name_with_length
+  *(void **) (&accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version_with_length
+  *(void **) (&accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version_with_length");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_debug
+  *(void **) (&accesskit_tree_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_debug
+  *(void **) (&accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_mul
+  *(void **) (&accesskit_affine_mul_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_mul");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_point
+  *(void **) (&accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_add_vec2
+  *(void **) (&accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_add_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_vec2
+  *(void **) (&accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_sub_point
+  *(void **) (&accesskit_point_sub_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_sub_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_new
+  *(void **) (&accesskit_rect_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_translate
+  *(void **) (&accesskit_rect_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_scale
+  *(void **) (&accesskit_size_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_add
+  *(void **) (&accesskit_size_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_sub
+  *(void **) (&accesskit_size_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_add
+  *(void **) (&accesskit_vec2_add_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_add");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_sub
+  *(void **) (&accesskit_vec2_sub_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_sub");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_scale
+  *(void **) (&accesskit_vec2_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_neg
+  *(void **) (&accesskit_vec2_neg_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_neg");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_new
+  *(void **) (&accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_free
+  *(void **) (&accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_set_root_window_bounds
+  *(void **) (&accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_set_root_window_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_update_if_active
+  *(void **) (&accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_update_window_focus_state
+  *(void **) (&accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_update_window_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_debug
+  *(void **) (&accesskit_unix_adapter_debug_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_debug");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h
new file mode 100644
index 00000000..f9e11bba
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h
@@ -0,0 +1,1758 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2025-12-14 00:54:05
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.so --init-name libaccesskit --output-header accesskit-so_wrap.h --output-implementation accesskit-so_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_orig_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_orig_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_orig_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_orig_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_orig_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_orig_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_orig_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_orig_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_debug accesskit_unix_adapter_debug_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_child_supports_action
+#undef accesskit_node_add_child_action
+#undef accesskit_node_remove_child_action
+#undef accesskit_node_clear_child_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_set_label_with_length
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_set_description_with_length
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_set_value_with_length
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_set_access_key_with_length
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_set_author_id_with_length
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_set_class_name_with_length
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_set_font_family_with_length
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_set_html_tag_with_length
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_set_inner_html_with_length
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut_with_length
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_set_language_with_length
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_set_placeholder_with_length
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_set_role_description_with_length
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_set_state_description_with_length
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_set_tooltip_with_length
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_set_url_with_length
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_set_row_index_text_with_length
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_set_column_index_text_with_length
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_braille_label
+#undef accesskit_node_set_braille_label
+#undef accesskit_node_set_braille_label_with_length
+#undef accesskit_node_clear_braille_label
+#undef accesskit_node_braille_role_description
+#undef accesskit_node_set_braille_role_description
+#undef accesskit_node_set_braille_role_description_with_length
+#undef accesskit_node_clear_braille_role_description
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_starts
+#undef accesskit_node_set_word_starts
+#undef accesskit_node_clear_word_starts
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_action_free
+#undef accesskit_custom_action_id
+#undef accesskit_custom_action_set_id
+#undef accesskit_custom_action_description
+#undef accesskit_custom_action_set_description
+#undef accesskit_custom_action_set_description_with_length
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_node_debug
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_set_toolkit_name_with_length
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_set_toolkit_version_with_length
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_debug
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_tree_update_debug
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_affine_mul
+#undef accesskit_affine_transform_point
+#undef accesskit_point_to_vec2
+#undef accesskit_point_add_vec2
+#undef accesskit_point_sub_vec2
+#undef accesskit_point_sub_point
+#undef accesskit_rect_new
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_rect_translate
+#undef accesskit_size_to_vec2
+#undef accesskit_size_scale
+#undef accesskit_size_add
+#undef accesskit_size_sub
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_vec2_add
+#undef accesskit_vec2_sub
+#undef accesskit_vec2_scale
+#undef accesskit_vec2_neg
+#undef accesskit_unix_adapter_new
+#undef accesskit_unix_adapter_free
+#undef accesskit_unix_adapter_set_root_window_bounds
+#undef accesskit_unix_adapter_update_if_active
+#undef accesskit_unix_adapter_update_window_focus_state
+#undef accesskit_unix_adapter_debug
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_child_supports_action accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_child_action accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_child_action accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_child_actions accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label_with_length accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description_with_length accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value_with_length accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key_with_length accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id_with_length accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name_with_length accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family_with_length accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag_with_length accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html_with_length accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut_with_length accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language_with_length accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder_with_length accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description_with_length accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description_with_length accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip_with_length accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url_with_length accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text_with_length accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text_with_length accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_label accesskit_node_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_label_with_length accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_label accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_braille_role_description accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_braille_role_description_with_length accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_braille_role_description accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_starts accesskit_node_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_starts accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_starts accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_free accesskit_custom_action_free_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_id accesskit_custom_action_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_id accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_description accesskit_custom_action_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_set_description_with_length accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_debug accesskit_node_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name_with_length accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version_with_length accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_debug accesskit_tree_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_debug accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_mul accesskit_affine_mul_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_point accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_add_vec2 accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_vec2 accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_point_sub_point accesskit_point_sub_point_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_new accesskit_rect_new_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_translate accesskit_rect_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_size_scale accesskit_size_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_size_add accesskit_size_add_dylibloader_wrapper_libaccesskit
+#define accesskit_size_sub accesskit_size_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_add accesskit_vec2_add_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_sub accesskit_vec2_sub_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_scale accesskit_vec2_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_neg accesskit_vec2_neg_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_debug accesskit_unix_adapter_debug_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_child_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_child_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_child_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_value_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_access_key_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_author_id_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_class_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_font_family_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_html_tag_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_inner_html_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_keyboard_shortcut_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_language_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_placeholder_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_state_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_tooltip_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_url_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_row_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_column_index_text_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_label_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_braille_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_set_braille_role_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *, size_t);
+extern void (*accesskit_node_clear_braille_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_float (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, float);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_color);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_starts_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_starts_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action *(*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t);
+extern void (*accesskit_custom_action_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *);
+extern int32_t (*accesskit_custom_action_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_id_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, int32_t);
+extern char *(*accesskit_custom_action_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_custom_action *);
+extern void (*accesskit_custom_action_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *);
+extern void (*accesskit_custom_action_set_description_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_action *, const char *, size_t);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, struct accesskit_custom_action * const *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action *);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_name_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_set_toolkit_version_with_length_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *, size_t);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern char *(*accesskit_tree_update_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree_update *);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_affine (*accesskit_affine_mul_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_affine);
+extern struct accesskit_point (*accesskit_affine_transform_point_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_point);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_point (*accesskit_point_add_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_point (*accesskit_point_sub_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_point_sub_point_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_new_dylibloader_wrapper_libaccesskit)(double, double, double, double);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_size, double);
+extern struct accesskit_size (*accesskit_size_add_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_size (*accesskit_size_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_size, struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_add_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_sub_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, struct accesskit_vec2);
+extern struct accesskit_vec2 (*accesskit_vec2_scale_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2, double);
+extern struct accesskit_vec2 (*accesskit_vec2_neg_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_unix_adapter *(*accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit)(accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *, accesskit_deactivation_handler_callback, void *);
+extern void (*accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *);
+extern void (*accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, struct accesskit_rect, struct accesskit_rect);
+extern void (*accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, accesskit_tree_update_factory, void *);
+extern void (*accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, bool);
+extern char *(*accesskit_unix_adapter_debug_dylibloader_wrapper_libaccesskit)(const struct accesskit_unix_adapter *);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/alsa/asound-so_wrap.c b/engine/drivers/alsa/asound-so_wrap.c
index 20cac9b6..ffe24d43 100644
--- a/engine/drivers/alsa/asound-so_wrap.c
+++ b/engine/drivers/alsa/asound-so_wrap.c
@@ -1276,7 +1276,7 @@
 #define snd_midi_event_encode snd_midi_event_encode_dylibloader_orig_asound
 #define snd_midi_event_encode_byte snd_midi_event_encode_byte_dylibloader_orig_asound
 #define snd_midi_event_decode snd_midi_event_decode_dylibloader_orig_asound
-#include <thirdparty/linuxbsd_headers/alsa/asoundlib.h>
+#include "thirdparty/linuxbsd_headers/alsa/asoundlib.h"
 #undef snd_asoundlib_version
 #undef snd_dlopen
 #undef snd_dlsym
diff --git a/engine/drivers/alsa/asound-so_wrap.h b/engine/drivers/alsa/asound-so_wrap.h
index 6a09959a..8d12d15b 100644
--- a/engine/drivers/alsa/asound-so_wrap.h
+++ b/engine/drivers/alsa/asound-so_wrap.h
@@ -1278,7 +1278,7 @@
 #define snd_midi_event_encode snd_midi_event_encode_dylibloader_orig_asound
 #define snd_midi_event_encode_byte snd_midi_event_encode_byte_dylibloader_orig_asound
 #define snd_midi_event_decode snd_midi_event_decode_dylibloader_orig_asound
-#include <thirdparty/linuxbsd_headers/alsa/asoundlib.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/alsa/asoundlib.h"
 #undef snd_asoundlib_version
 #undef snd_dlopen
 #undef snd_dlsym
diff --git a/engine/drivers/alsa/audio_driver_alsa.cpp b/engine/drivers/alsa/audio_driver_alsa.cpp
index 744e6a72..960f0fb9 100644
--- a/engine/drivers/alsa/audio_driver_alsa.cpp
+++ b/engine/drivers/alsa/audio_driver_alsa.cpp
@@ -32,16 +32,9 @@
 
 #ifdef ALSA_ENABLED
 
-#include "core/config/engine.h"
-#include "core/math/math_funcs_binary.h"
+#include "core/config/project_settings.h"
 #include "core/os/os.h"
 
-#ifdef SOWRAP_ENABLED
-#include "drivers/alsa/asound-so_wrap.h"
-#else
-#include <alsa/asoundlib.h>
-#endif
-
 #include <cerrno>
 
 #if defined(PULSEAUDIO_ENABLED) && defined(SOWRAP_ENABLED)
@@ -69,14 +62,14 @@ Error AudioDriverALSA::init_output_device() {
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_sw_params_t *swparams;
 
-#define CHECK_FAIL(m_cond) \
-	if (m_cond) { \
+#define CHECK_FAIL(m_cond)                                       \
+	if (m_cond) {                                                \
 		fprintf(stderr, "ALSA ERR: %s\n", snd_strerror(status)); \
-		if (pcm_handle) { \
-			snd_pcm_close(pcm_handle); \
-			pcm_handle = nullptr; \
-		} \
-		ERR_FAIL_COND_V(m_cond, ERR_CANT_OPEN); \
+		if (pcm_handle) {                                        \
+			snd_pcm_close(pcm_handle);                           \
+			pcm_handle = nullptr;                                \
+		}                                                        \
+		ERR_FAIL_COND_V(m_cond, ERR_CANT_OPEN);                  \
 	}
 
 	//todo, add
@@ -96,7 +89,7 @@ Error AudioDriverALSA::init_output_device() {
 
 	ERR_FAIL_COND_V(status < 0, ERR_CANT_OPEN);
 
-	snd_pcm_hw_params_alloca(&hwparams); // NOLINT(modernize-use-bool-literals)
+	snd_pcm_hw_params_alloca(&hwparams);
 
 	status = snd_pcm_hw_params_any(pcm_handle, hwparams);
 	CHECK_FAIL(status < 0);
@@ -119,7 +112,7 @@ Error AudioDriverALSA::init_output_device() {
 	// Ref: https://www.alsa-project.org/main/index.php/FramesPeriods
 	unsigned int periods = 2;
 	int latency = Engine::get_singleton()->get_audio_output_latency();
-	buffer_frames = Math::closest_power_of_2(latency * mix_rate / 1000);
+	buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
 	buffer_size = buffer_frames * periods;
 	period_size = buffer_frames;
 
@@ -140,7 +133,7 @@ Error AudioDriverALSA::init_output_device() {
 
 	//snd_pcm_hw_params_free(&hwparams);
 
-	snd_pcm_sw_params_alloca(&swparams); // NOLINT(modernize-use-bool-literals)
+	snd_pcm_sw_params_alloca(&swparams);
 
 	status = snd_pcm_sw_params_current(pcm_handle, swparams);
 	CHECK_FAIL(status < 0);
diff --git a/engine/drivers/alsa/audio_driver_alsa.h b/engine/drivers/alsa/audio_driver_alsa.h
index d9c8ad21..7f59f745 100644
--- a/engine/drivers/alsa/audio_driver_alsa.h
+++ b/engine/drivers/alsa/audio_driver_alsa.h
@@ -37,8 +37,11 @@
 #include "core/templates/safe_refcount.h"
 #include "servers/audio/audio_server.h"
 
-typedef struct _snd_pcm snd_pcm_t;
-typedef unsigned long snd_pcm_uframes_t;
+#ifdef SOWRAP_ENABLED
+#include "asound-so_wrap.h"
+#else
+#include <alsa/asoundlib.h>
+#endif
 
 class AudioDriverALSA : public AudioDriver {
 	Thread thread;
diff --git a/engine/drivers/alsamidi/midi_driver_alsamidi.cpp b/engine/drivers/alsamidi/midi_driver_alsamidi.cpp
index 66b663d8..8c61a133 100644
--- a/engine/drivers/alsamidi/midi_driver_alsamidi.cpp
+++ b/engine/drivers/alsamidi/midi_driver_alsamidi.cpp
@@ -34,12 +34,6 @@
 
 #include "core/os/os.h"
 
-#ifdef SOWRAP_ENABLED
-#include "drivers/alsa/asound-so_wrap.h"
-#else
-#include <alsa/asoundlib.h>
-#endif
-
 #include <cerrno>
 
 MIDIDriverALSAMidi::InputConnection::InputConnection(int p_device_index,
diff --git a/engine/drivers/alsamidi/midi_driver_alsamidi.h b/engine/drivers/alsamidi/midi_driver_alsamidi.h
index 7ae8513b..7904c558 100644
--- a/engine/drivers/alsamidi/midi_driver_alsamidi.h
+++ b/engine/drivers/alsamidi/midi_driver_alsamidi.h
@@ -38,7 +38,11 @@
 #include "core/templates/safe_refcount.h"
 #include "core/templates/vector.h"
 
-typedef struct _snd_rawmidi snd_rawmidi_t;
+#ifdef SOWRAP_ENABLED
+#include "../alsa/asound-so_wrap.h"
+#else
+#include <alsa/asoundlib.h>
+#endif
 
 class MIDIDriverALSAMidi : public MIDIDriver {
 	Thread thread;
diff --git a/engine/drivers/apple/foundation_helpers.h b/engine/drivers/apple/foundation_helpers.h
index f07b4d50..db87fba9 100644
--- a/engine/drivers/apple/foundation_helpers.h
+++ b/engine/drivers/apple/foundation_helpers.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#ifdef __OBJC__
 #import <Foundation/NSString.h>
-#else
-#include <Foundation/NSString.hpp>
-#endif
 
 class String;
 template <typename T>
@@ -42,20 +38,12 @@ class CharStringT;
 
 using CharString = CharStringT<char>;
 
-template <typename T>
-class Span;
-
 namespace conv {
 
-#ifdef __OBJC__
 /**
  * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
  * */
 NSString *to_nsstring(const String &p_str);
-/**
- * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
- * */
-NSString *to_nsstring(Span<char> p_str);
 /**
  * Converts a Godot CharString to an NSString without allocating an intermediate UTF-8 buffer.
  * */
@@ -64,24 +52,5 @@ NSString *to_nsstring(const CharString &p_str);
  * Converts an NSString to a Godot String without allocating intermediate buffers.
  * */
 String to_string(NSString *p_str);
-#else
-/**
- * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
- * */
-NS::String *to_nsstring(const String &p_str);
-/**
- * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
- * */
-NS::String *to_nsstring(Span<char> p_str);
-/**
- * Converts a Godot CharString to an NSString without allocating an intermediate UTF-8 buffer.
- * */
-NS::String *to_nsstring(const CharString &p_str);
-/**
- * Converts an NSString to a Godot String without allocating intermediate buffers.
- * */
-String to_string(NS::String *p_str);
-
-#endif
 
 } //namespace conv
diff --git a/engine/drivers/apple/foundation_helpers.mm b/engine/drivers/apple/foundation_helpers.mm
index df02ea2a..0453011b 100644
--- a/engine/drivers/apple/foundation_helpers.mm
+++ b/engine/drivers/apple/foundation_helpers.mm
@@ -31,7 +31,6 @@
 #import "foundation_helpers.h"
 
 #import "core/string/ustring.h"
-#import "core/templates/span.h"
 
 #import <CoreFoundation/CFString.h>
 
@@ -43,12 +42,6 @@ NSString *to_nsstring(const String &p_str) {
 								  encoding:NSUTF32LittleEndianStringEncoding];
 }
 
-NSString *to_nsstring(Span<char> p_str) {
-	return [[NSString alloc] initWithBytes:(const void *)p_str.ptr()
-									length:p_str.size()
-								  encoding:NSASCIIStringEncoding];
-}
-
 NSString *to_nsstring(const CharString &p_str) {
 	return [[NSString alloc] initWithBytes:(const void *)p_str.ptr()
 									length:p_str.length()
diff --git a/engine/servers/display/display_server_headless.cpp b/engine/drivers/apple/joypad_apple.h
similarity index 60%
rename from engine/servers/display/display_server_headless.cpp
rename to engine/drivers/apple/joypad_apple.h
index 1e35d5e7..1ea46ce9 100644
--- a/engine/servers/display/display_server_headless.cpp
+++ b/engine/drivers/apple/joypad_apple.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  display_server_headless.cpp                                           */
+/*  joypad_apple.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,41 +28,53 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "display_server_headless.h"
+#pragma once
 
 #include "core/input/input.h"
-#include "core/input/input_event.h"
-#include "servers/display/native_menu.h"
-#include "servers/rendering/dummy/rasterizer_dummy.h"
+#include "core/input/input_enums.h"
 
-DisplayServer *DisplayServerHeadless::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
-	r_error = OK;
-	RasterizerDummy::make_current();
-	return memnew(DisplayServerHeadless());
-}
+#define Key _QKey
+#import <GameController/GameController.h>
+#undef Key
 
-void DisplayServerHeadless::_dispatch_input_events(const Ref<InputEvent> &p_event) {
-	static_cast<DisplayServerHeadless *>(get_singleton())->_dispatch_input_event(p_event);
-}
+@class GCController;
+class RumbleContext;
 
-void DisplayServerHeadless::_dispatch_input_event(const Ref<InputEvent> &p_event) {
-	if (input_event_callback.is_valid()) {
-		input_event_callback.call(p_event);
-	}
-}
+struct GameController {
+	int joy_id;
+	GCController *controller;
+	RumbleContext *rumble_context API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) = nil;
+	NSInteger ff_effect_timestamp = 0;
+	bool force_feedback = false;
+	bool double_nintendo_joycon_layout = false;
+	bool single_nintendo_joycon_layout = false;
 
-void DisplayServerHeadless::process_events() {
-	Input::get_singleton()->flush_buffered_events();
-}
+	uint32_t axis_changed_mask = 0;
+	static_assert(static_cast<uint32_t>(JoyAxis::MAX) < 32, "JoyAxis::MAX must be less than 32");
+	double axis_value[(int)JoyAxis::MAX];
 
-DisplayServerHeadless::DisplayServerHeadless() {
-	native_menu = memnew(NativeMenu);
-	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
-}
+	GameController(int p_joy_id, GCController *p_controller);
+	~GameController();
+};
 
-DisplayServerHeadless::~DisplayServerHeadless() {
-	if (native_menu) {
-		memdelete(native_menu);
-		native_menu = nullptr;
-	}
-}
+class JoypadApple {
+private:
+	id<NSObject> connect_observer = nil;
+	id<NSObject> disconnect_observer = nil;
+	HashMap<int, GameController *> joypads;
+	HashMap<GCController *, int> controller_to_joy_id;
+
+	GCControllerPlayerIndex get_free_player_index();
+
+	void add_joypad(GCController *p_controller);
+	void remove_joypad(GCController *p_controller);
+
+public:
+	JoypadApple();
+	~JoypadApple();
+
+	void joypad_vibration_start(GameController &p_joypad, float p_weak_magnitude, float p_strong_magnitude, float p_duration, uint64_t p_timestamp) API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0));
+	void joypad_vibration_stop(GameController &p_joypad, uint64_t p_timestamp) API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0));
+
+	void process_joypads();
+};
diff --git a/engine/drivers/apple/joypad_apple.mm b/engine/drivers/apple/joypad_apple.mm
new file mode 100644
index 00000000..38dfc5ac
--- /dev/null
+++ b/engine/drivers/apple/joypad_apple.mm
@@ -0,0 +1,634 @@
+/**************************************************************************/
+/*  joypad_apple.mm                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#import "joypad_apple.h"
+
+#import <CoreHaptics/CoreHaptics.h>
+#import <os/log.h>
+
+#include "core/config/project_settings.h"
+#include "main/main.h"
+
+class API_AVAILABLE(macos(11), ios(14.0), tvos(14.0)) RumbleMotor {
+	CHHapticEngine *engine;
+	id<CHHapticPatternPlayer> player;
+	bool is_started;
+
+	RumbleMotor(GCController *p_controller, GCHapticsLocality p_locality) {
+		engine = [p_controller.haptics createEngineWithLocality:p_locality];
+		engine.autoShutdownEnabled = YES;
+	}
+
+public:
+	static RumbleMotor *create(GCController *p_controller, GCHapticsLocality p_locality) {
+		if ([p_controller.haptics.supportedLocalities containsObject:p_locality]) {
+			return memnew(RumbleMotor(p_controller, p_locality));
+		}
+		return nullptr;
+	}
+
+	_ALWAYS_INLINE_ bool has_active_player() {
+		return player != nil;
+	}
+
+	void execute_pattern(CHHapticPattern *p_pattern) {
+		NSError *error;
+		if (!is_started) {
+			ERR_FAIL_COND_MSG(![engine startAndReturnError:&error], "Couldn't start controller haptic engine: " + String::utf8(error.localizedDescription.UTF8String));
+			is_started = YES;
+		}
+
+		player = [engine createPlayerWithPattern:p_pattern error:&error];
+		ERR_FAIL_COND_MSG(error, "Couldn't create controller haptic pattern player: " + String::utf8(error.localizedDescription.UTF8String));
+		ERR_FAIL_COND_MSG(![player startAtTime:CHHapticTimeImmediate error:&error], "Couldn't execute controller haptic pattern: " + String::utf8(error.localizedDescription.UTF8String));
+	}
+
+	void stop() {
+		id<CHHapticPatternPlayer> old_player = player;
+		player = nil;
+
+		NSError *error;
+		ERR_FAIL_COND_MSG(![old_player stopAtTime:CHHapticTimeImmediate error:&error], "Couldn't stop controller haptic pattern: " + String::utf8(error.localizedDescription.UTF8String));
+	}
+};
+
+class API_AVAILABLE(macos(11), ios(14.0), tvos(14.0)) RumbleContext {
+	RumbleMotor *weak_motor;
+	RumbleMotor *strong_motor;
+
+public:
+	RumbleContext(GCController *p_controller) {
+		weak_motor = RumbleMotor::create(p_controller, GCHapticsLocalityRightHandle);
+		strong_motor = RumbleMotor::create(p_controller, GCHapticsLocalityLeftHandle);
+	}
+
+	~RumbleContext() {
+		if (weak_motor) {
+			memdelete(weak_motor);
+		}
+		if (strong_motor) {
+			memdelete(strong_motor);
+		}
+	}
+
+	_ALWAYS_INLINE_ bool has_motors() {
+		return weak_motor != nullptr && strong_motor != nullptr;
+	}
+
+	_ALWAYS_INLINE_ bool has_active_players() {
+		if (!has_motors()) {
+			return false;
+		}
+		return (weak_motor && weak_motor->has_active_player()) || (strong_motor && strong_motor->has_active_player());
+	}
+
+	void stop() {
+		if (weak_motor) {
+			weak_motor->stop();
+		}
+		if (strong_motor) {
+			strong_motor->stop();
+		}
+	}
+
+	void play_weak_pattern(CHHapticPattern *p_pattern) {
+		if (weak_motor) {
+			weak_motor->execute_pattern(p_pattern);
+		}
+	}
+
+	void play_strong_pattern(CHHapticPattern *p_pattern) {
+		if (strong_motor) {
+			strong_motor->execute_pattern(p_pattern);
+		}
+	}
+};
+
+GameController::GameController(int p_joy_id, GCController *p_controller) :
+		joy_id(p_joy_id), controller(p_controller) {
+	force_feedback = NO;
+
+	for (int i = 0; i < (int)JoyAxis::MAX; i++) {
+		axis_value[i] = 0.0;
+	}
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		if (controller.haptics != nil) {
+			// Create a rumble context for the controller.
+			rumble_context = memnew(RumbleContext(p_controller));
+
+			// If the rumble motors aren't available, disable force feedback.
+			force_feedback = rumble_context->has_motors();
+		}
+	}
+
+	if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+		if ([controller.productCategory isEqualToString:@"Switch Pro Controller"] || [controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (L/R)"]) {
+			double_nintendo_joycon_layout = true;
+		}
+
+		if ([controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (L)"] || [controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (R)"]) {
+			single_nintendo_joycon_layout = true;
+		}
+	}
+
+	int l_joy_id = joy_id;
+
+	auto BUTTON = [l_joy_id](JoyButton p_button) {
+		return ^(GCControllerButtonInput *button, float value, BOOL pressed) {
+			Input::get_singleton()->joy_button(l_joy_id, p_button, pressed);
+		};
+	};
+
+	auto JOYSTICK_LEFT = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
+		if (axis_value[(int)JoyAxis::LEFT_X] != xValue) {
+			axis_changed_mask |= (1 << (int)JoyAxis::LEFT_X);
+			axis_value[(int)JoyAxis::LEFT_X] = xValue;
+		}
+		if (axis_value[(int)JoyAxis::LEFT_Y] != -yValue) {
+			axis_changed_mask |= (1 << (int)JoyAxis::LEFT_Y);
+			axis_value[(int)JoyAxis::LEFT_Y] = -yValue;
+		}
+	};
+
+	auto JOYSTICK_RIGHT = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
+		if (axis_value[(int)JoyAxis::RIGHT_X] != xValue) {
+			axis_changed_mask |= (1 << (int)JoyAxis::RIGHT_X);
+			axis_value[(int)JoyAxis::RIGHT_X] = xValue;
+		}
+		if (axis_value[(int)JoyAxis::RIGHT_Y] != -yValue) {
+			axis_changed_mask |= (1 << (int)JoyAxis::RIGHT_Y);
+			axis_value[(int)JoyAxis::RIGHT_Y] = -yValue;
+		}
+	};
+
+	auto TRIGGER_LEFT = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
+		if (axis_value[(int)JoyAxis::TRIGGER_LEFT] != value) {
+			axis_changed_mask |= (1 << (int)JoyAxis::TRIGGER_LEFT);
+			axis_value[(int)JoyAxis::TRIGGER_LEFT] = value;
+		}
+	};
+
+	auto TRIGGER_RIGHT = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
+		if (axis_value[(int)JoyAxis::TRIGGER_RIGHT] != value) {
+			axis_changed_mask |= (1 << (int)JoyAxis::TRIGGER_RIGHT);
+			axis_value[(int)JoyAxis::TRIGGER_RIGHT] = value;
+		}
+	};
+
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		if (controller.physicalInputProfile != nil) {
+			GCPhysicalInputProfile *profile = controller.physicalInputProfile;
+
+			GCControllerButtonInput *buttonA = profile.buttons[GCInputButtonA];
+			GCControllerButtonInput *buttonB = profile.buttons[GCInputButtonB];
+			GCControllerButtonInput *buttonX = profile.buttons[GCInputButtonX];
+			GCControllerButtonInput *buttonY = profile.buttons[GCInputButtonY];
+			if (double_nintendo_joycon_layout) {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+			} else if (single_nintendo_joycon_layout) {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+			} else {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+			}
+
+			GCControllerButtonInput *leftThumbstickButton = profile.buttons[GCInputLeftThumbstickButton];
+			GCControllerButtonInput *rightThumbstickButton = profile.buttons[GCInputRightThumbstickButton];
+			if (leftThumbstickButton) {
+				leftThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::LEFT_STICK);
+			}
+			if (rightThumbstickButton) {
+				rightThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::RIGHT_STICK);
+			}
+
+			GCControllerButtonInput *leftShoulder = profile.buttons[GCInputLeftShoulder];
+			GCControllerButtonInput *rightShoulder = profile.buttons[GCInputRightShoulder];
+			if (leftShoulder) {
+				leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER);
+			}
+			if (rightShoulder) {
+				rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER);
+			}
+
+			GCControllerButtonInput *leftTrigger = profile.buttons[GCInputLeftTrigger];
+			GCControllerButtonInput *rightTrigger = profile.buttons[GCInputRightTrigger];
+			if (leftTrigger) {
+				leftTrigger.valueChangedHandler = TRIGGER_LEFT;
+			}
+			if (rightTrigger) {
+				rightTrigger.valueChangedHandler = TRIGGER_RIGHT;
+			}
+
+			GCControllerButtonInput *buttonMenu = profile.buttons[GCInputButtonMenu];
+			GCControllerButtonInput *buttonHome = profile.buttons[GCInputButtonHome];
+			GCControllerButtonInput *buttonOptions = profile.buttons[GCInputButtonOptions];
+			if (buttonMenu) {
+				buttonMenu.pressedChangedHandler = BUTTON(JoyButton::START);
+			}
+			if (buttonHome) {
+				buttonHome.pressedChangedHandler = BUTTON(JoyButton::GUIDE);
+			}
+			if (buttonOptions) {
+				buttonOptions.pressedChangedHandler = BUTTON(JoyButton::BACK);
+			}
+
+			// Xbox controller buttons.
+			if (@available(macOS 12.0, iOS 15.0, tvOS 15.0, *)) {
+				GCControllerButtonInput *buttonShare = profile.buttons[GCInputButtonShare];
+				if (buttonShare) {
+					buttonShare.pressedChangedHandler = BUTTON(JoyButton::MISC1);
+				}
+			}
+
+			GCControllerButtonInput *paddleButton1 = profile.buttons[GCInputXboxPaddleOne];
+			GCControllerButtonInput *paddleButton2 = profile.buttons[GCInputXboxPaddleTwo];
+			GCControllerButtonInput *paddleButton3 = profile.buttons[GCInputXboxPaddleThree];
+			GCControllerButtonInput *paddleButton4 = profile.buttons[GCInputXboxPaddleFour];
+			if (paddleButton1) {
+				paddleButton1.pressedChangedHandler = BUTTON(JoyButton::PADDLE1);
+			}
+			if (paddleButton2) {
+				paddleButton2.pressedChangedHandler = BUTTON(JoyButton::PADDLE2);
+			}
+			if (paddleButton3) {
+				paddleButton3.pressedChangedHandler = BUTTON(JoyButton::PADDLE3);
+			}
+			if (paddleButton4) {
+				paddleButton4.pressedChangedHandler = BUTTON(JoyButton::PADDLE4);
+			}
+
+			GCControllerDirectionPad *leftThumbstick = profile.dpads[GCInputLeftThumbstick];
+			if (leftThumbstick) {
+				leftThumbstick.valueChangedHandler = JOYSTICK_LEFT;
+			}
+
+			GCControllerDirectionPad *rightThumbstick = profile.dpads[GCInputRightThumbstick];
+			if (rightThumbstick) {
+				rightThumbstick.valueChangedHandler = JOYSTICK_RIGHT;
+			}
+
+			GCControllerDirectionPad *dpad = nil;
+			if (controller.extendedGamepad != nil) {
+				dpad = controller.extendedGamepad.dpad;
+			} else if (controller.microGamepad != nil) {
+				dpad = controller.microGamepad.dpad;
+			}
+			if (dpad) {
+				dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);
+				dpad.down.pressedChangedHandler = BUTTON(JoyButton::DPAD_DOWN);
+				dpad.left.pressedChangedHandler = BUTTON(JoyButton::DPAD_LEFT);
+				dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
+			}
+		}
+	} else if (controller.extendedGamepad != nil) {
+		GCExtendedGamepad *gamepad = controller.extendedGamepad;
+
+		if (double_nintendo_joycon_layout) {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::Y);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::X);
+		} else if (single_nintendo_joycon_layout) {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::X);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+		} else {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+		}
+
+		gamepad.leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER);
+		gamepad.rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER);
+		gamepad.dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);
+		gamepad.dpad.down.pressedChangedHandler = BUTTON(JoyButton::DPAD_DOWN);
+		gamepad.dpad.left.pressedChangedHandler = BUTTON(JoyButton::DPAD_LEFT);
+		gamepad.dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
+
+		gamepad.leftThumbstick.valueChangedHandler = JOYSTICK_LEFT;
+		gamepad.rightThumbstick.valueChangedHandler = JOYSTICK_RIGHT;
+		gamepad.leftTrigger.valueChangedHandler = TRIGGER_LEFT;
+		gamepad.rightTrigger.valueChangedHandler = TRIGGER_RIGHT;
+
+		if (@available(macOS 10.14.1, iOS 12.1, tvOS 12.1, *)) {
+			gamepad.leftThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::LEFT_STICK);
+			gamepad.rightThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::RIGHT_STICK);
+		}
+
+		if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+			gamepad.buttonOptions.pressedChangedHandler = BUTTON(JoyButton::BACK);
+			gamepad.buttonMenu.pressedChangedHandler = BUTTON(JoyButton::START);
+		}
+
+		if (@available(macOS 11, iOS 14.0, tvOS 14.0, *)) {
+			gamepad.buttonHome.pressedChangedHandler = BUTTON(JoyButton::GUIDE);
+			if ([gamepad isKindOfClass:[GCXboxGamepad class]]) {
+				GCXboxGamepad *xboxGamepad = (GCXboxGamepad *)gamepad;
+				xboxGamepad.paddleButton1.pressedChangedHandler = BUTTON(JoyButton::PADDLE1);
+				xboxGamepad.paddleButton2.pressedChangedHandler = BUTTON(JoyButton::PADDLE2);
+				xboxGamepad.paddleButton3.pressedChangedHandler = BUTTON(JoyButton::PADDLE3);
+				xboxGamepad.paddleButton4.pressedChangedHandler = BUTTON(JoyButton::PADDLE4);
+			}
+		}
+
+		if (@available(macOS 12, iOS 15.0, tvOS 15.0, *)) {
+			if ([gamepad isKindOfClass:[GCXboxGamepad class]]) {
+				GCXboxGamepad *xboxGamepad = (GCXboxGamepad *)gamepad;
+				xboxGamepad.buttonShare.pressedChangedHandler = BUTTON(JoyButton::MISC1);
+			}
+		}
+	} else if (controller.microGamepad != nil) {
+		GCMicroGamepad *gamepad = controller.microGamepad;
+
+		gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+		gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
+		gamepad.dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);
+		gamepad.dpad.down.pressedChangedHandler = BUTTON(JoyButton::DPAD_DOWN);
+		gamepad.dpad.left.pressedChangedHandler = BUTTON(JoyButton::DPAD_LEFT);
+		gamepad.dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
+	}
+
+	// TODO: Need to add support for controller.motion which gives us access to
+	// the orientation of the device (if supported).
+}
+
+GameController::~GameController() {
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		if (rumble_context) {
+			memdelete(rumble_context);
+		}
+	}
+}
+
+JoypadApple::JoypadApple() {
+	connect_observer = [NSNotificationCenter.defaultCenter
+			addObserverForName:GCControllerDidConnectNotification
+						object:nil
+						 queue:NSOperationQueue.mainQueue
+					usingBlock:^(NSNotification *notification) {
+						GCController *controller = notification.object;
+						if (!controller) {
+							return;
+						}
+						add_joypad(controller);
+					}];
+
+	disconnect_observer = [NSNotificationCenter.defaultCenter
+			addObserverForName:GCControllerDidDisconnectNotification
+						object:nil
+						 queue:NSOperationQueue.mainQueue
+					usingBlock:^(NSNotification *notification) {
+						GCController *controller = notification.object;
+						if (!controller) {
+							return;
+						}
+						remove_joypad(controller);
+					}];
+
+	if (@available(macOS 11.3, iOS 14.5, tvOS 14.5, *)) {
+		GCController.shouldMonitorBackgroundEvents = YES;
+	}
+}
+
+JoypadApple::~JoypadApple() {
+	for (KeyValue<int, GameController *> &E : joypads) {
+		memdelete(E.value);
+		E.value = nullptr;
+	}
+
+	[NSNotificationCenter.defaultCenter removeObserver:connect_observer];
+	[NSNotificationCenter.defaultCenter removeObserver:disconnect_observer];
+}
+
+// Finds the rightmost set bit in a number, n.
+// variation of https://www.geeksforgeeks.org/position-of-rightmost-set-bit/
+int rightmost_one(int n) {
+	return __builtin_ctz(n & -n) + 1;
+}
+
+GCControllerPlayerIndex JoypadApple::get_free_player_index() {
+	// player_set will be a bitfield where each bit represents a player index.
+	__block uint32_t player_set = 0;
+	for (const KeyValue<GCController *, int> &E : controller_to_joy_id) {
+		player_set |= 1U << E.key.playerIndex;
+	}
+
+	// invert, as we want to find the first unset player index.
+	int n = rightmost_one((int)(~player_set));
+	if (n >= 5) {
+		return GCControllerPlayerIndexUnset;
+	}
+
+	return (GCControllerPlayerIndex)(n - 1);
+}
+
+void JoypadApple::add_joypad(GCController *p_controller) {
+	if (controller_to_joy_id.has(p_controller)) {
+		return;
+	}
+
+	// Get a new id for our controller.
+	int joy_id = Input::get_singleton()->get_unused_joy_id();
+
+	if (joy_id == -1) {
+		print_verbose("Couldn't retrieve new joy ID.");
+		return;
+	}
+
+	// Assign our player index.
+	if (p_controller.playerIndex == GCControllerPlayerIndexUnset) {
+		p_controller.playerIndex = get_free_player_index();
+	}
+
+	// Tell Godot about our new controller.
+	char const *device_name;
+	if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+		device_name = p_controller.productCategory.UTF8String;
+	} else {
+		device_name = p_controller.vendorName.UTF8String;
+	}
+	Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8(device_name));
+
+	// Assign our player index.
+	joypads.insert(joy_id, memnew(GameController(joy_id, p_controller)));
+	controller_to_joy_id.insert(p_controller, joy_id);
+}
+
+void JoypadApple::remove_joypad(GCController *p_controller) {
+	if (!controller_to_joy_id.has(p_controller)) {
+		return;
+	}
+
+	int joy_id = controller_to_joy_id[p_controller];
+	controller_to_joy_id.erase(p_controller);
+
+	// Tell Godot this joystick is no longer there.
+	Input::get_singleton()->joy_connection_changed(joy_id, false, "");
+
+	// And remove it from our dictionary.
+	GameController **old = joypads.getptr(joy_id);
+	memdelete(*old);
+	*old = nullptr;
+	joypads.erase(joy_id);
+}
+
+API_AVAILABLE(macos(10.15), ios(13.0), tvos(14.0))
+CHHapticPattern *get_vibration_pattern(float p_magnitude, float p_duration) {
+	// Creates a vibration pattern with an intensity and duration.
+	NSDictionary *hapticDict = @{
+		CHHapticPatternKeyPattern : @[
+			@{
+				CHHapticPatternKeyEvent : @{
+					CHHapticPatternKeyEventType : CHHapticEventTypeHapticContinuous,
+					CHHapticPatternKeyTime : @(CHHapticTimeImmediate),
+					CHHapticPatternKeyEventDuration : [NSNumber numberWithFloat:p_duration],
+
+					CHHapticPatternKeyEventParameters : @[
+						@{
+							CHHapticPatternKeyParameterID : CHHapticEventParameterIDHapticIntensity,
+							CHHapticPatternKeyParameterValue : [NSNumber numberWithFloat:p_magnitude]
+						},
+					],
+				},
+			},
+		],
+	};
+	NSError *error;
+	CHHapticPattern *pattern = [[CHHapticPattern alloc] initWithDictionary:hapticDict error:&error];
+	return pattern;
+}
+
+void JoypadApple::joypad_vibration_start(GameController &p_joypad, float p_weak_magnitude, float p_strong_magnitude, float p_duration, uint64_t p_timestamp) {
+	if (!p_joypad.force_feedback || p_weak_magnitude < 0.f || p_weak_magnitude > 1.f || p_strong_magnitude < 0.f || p_strong_magnitude > 1.f) {
+		return;
+	}
+
+	// If there is active vibration players, stop them.
+	if (p_joypad.rumble_context->has_active_players()) {
+		joypad_vibration_stop(p_joypad, p_timestamp);
+	}
+
+	// Gets the default vibration pattern and creates a player for each motor.
+	CHHapticPattern *weak_pattern = get_vibration_pattern(p_weak_magnitude, p_duration);
+	CHHapticPattern *strong_pattern = get_vibration_pattern(p_strong_magnitude, p_duration);
+
+	p_joypad.rumble_context->play_weak_pattern(weak_pattern);
+	p_joypad.rumble_context->play_strong_pattern(strong_pattern);
+
+	p_joypad.ff_effect_timestamp = p_timestamp;
+}
+
+void JoypadApple::joypad_vibration_stop(GameController &p_joypad, uint64_t p_timestamp) {
+	if (!p_joypad.force_feedback) {
+		return;
+	}
+	// If there is no active vibration players, exit.
+	if (!p_joypad.rumble_context->has_active_players()) {
+		return;
+	}
+
+	p_joypad.rumble_context->stop();
+
+	p_joypad.ff_effect_timestamp = p_timestamp;
+}
+
+void JoypadApple::process_joypads() {
+	Input *input = Input::get_singleton();
+
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		for (KeyValue<int, GameController *> &E : joypads) {
+			int id = E.key;
+			GameController &joypad = *E.value;
+
+			uint32_t changed = joypad.axis_changed_mask;
+			joypad.axis_changed_mask = 0;
+			// Loop over changed axes.
+			while (changed) {
+				// Find the index of the next set bit.
+				uint32_t i = (uint32_t)__builtin_ctzll(changed);
+				// Clear the set bit.
+				changed &= (changed - 1);
+				input->joy_axis(id, (JoyAxis)i, joypad.axis_value[i]);
+			}
+
+			if (joypad.force_feedback) {
+				uint64_t timestamp = input->get_joy_vibration_timestamp(id);
+
+				if (timestamp > (unsigned)joypad.ff_effect_timestamp) {
+					Vector2 strength = input->get_joy_vibration_strength(id);
+					float duration = input->get_joy_vibration_duration(id);
+					if (duration == 0) {
+						duration = GCHapticDurationInfinite;
+					}
+
+					if (strength.x == 0 && strength.y == 0) {
+						joypad_vibration_stop(joypad, timestamp);
+					} else {
+						joypad_vibration_start(joypad, strength.x, strength.y, duration, timestamp);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/engine/drivers/apple/os_log_logger.cpp b/engine/drivers/apple/os_log_logger.cpp
index 9417f778..50b695df 100644
--- a/engine/drivers/apple/os_log_logger.cpp
+++ b/engine/drivers/apple/os_log_logger.cpp
@@ -31,10 +31,9 @@
 #include "os_log_logger.h"
 
 #include "core/object/script_backtrace.h"
-#include "core/os/memory.h"
 #include "core/string/print_string.h"
 
-#include <cstdio> // For vsnprintf.
+#include <cstdlib> // For malloc/free
 
 OsLogLogger::OsLogLogger(const char *p_subsystem) {
 	const char *subsystem = p_subsystem;
diff --git a/engine/drivers/apple/thread_apple.h b/engine/drivers/apple/thread_apple.h
index 729c56cc..f8715bd0 100644
--- a/engine/drivers/apple/thread_apple.h
+++ b/engine/drivers/apple/thread_apple.h
@@ -34,7 +34,6 @@
 #include "core/typedefs.h"
 
 #include <pthread.h>
-
 #include <new> // For hardware interference size
 
 class String;
diff --git a/engine/drivers/apple_embedded/SCsub b/engine/drivers/apple_embedded/SCsub
index 59ade51e..7cf6599d 100644
--- a/engine/drivers/apple_embedded/SCsub
+++ b/engine/drivers/apple_embedded/SCsub
@@ -27,9 +27,6 @@ setup_swift_builder(
 vulkan_dir = "#thirdparty/vulkan"
 env_apple_embedded.Prepend(CPPPATH=[vulkan_dir, vulkan_dir + "/include"])
 
-# Use bundled metal-cpp headers
-env_apple_embedded.Prepend(CPPPATH=["#thirdparty/metal-cpp"])
-
 # Driver source files
 env_apple_embedded.add_source_files(env_apple_embedded.drivers_sources, "*.mm")
 env_apple_embedded.add_source_files(env_apple_embedded.drivers_sources, "*.swift")
diff --git a/engine/drivers/apple_embedded/app_delegate_service.mm b/engine/drivers/apple_embedded/app_delegate_service.mm
index 4e3ce1b4..ee2d03d0 100644
--- a/engine/drivers/apple_embedded/app_delegate_service.mm
+++ b/engine/drivers/apple_embedded/app_delegate_service.mm
@@ -30,12 +30,12 @@
 
 #import "app_delegate_service.h"
 
+#import "godot_view_apple_embedded.h"
+#import "godot_view_controller.h"
+#import "os_apple_embedded.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
-#import "drivers/apple_embedded/godot_view_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_controller.h"
-#import "drivers/apple_embedded/os_apple_embedded.h"
 #import "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "main/main.h"
 
diff --git a/engine/drivers/apple_embedded/apple_embedded.h b/engine/drivers/apple_embedded/apple_embedded.h
index 3047670d..f06d5796 100644
--- a/engine/drivers/apple_embedded/apple_embedded.h
+++ b/engine/drivers/apple_embedded/apple_embedded.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 
 #import <CoreHaptics/CoreHaptics.h>
 
diff --git a/engine/drivers/apple_embedded/apple_embedded.mm b/engine/drivers/apple_embedded/apple_embedded.mm
index b6b5410e..7e8fd4af 100644
--- a/engine/drivers/apple_embedded/apple_embedded.mm
+++ b/engine/drivers/apple_embedded/apple_embedded.mm
@@ -30,9 +30,8 @@
 
 #import "apple_embedded.h"
 
-#include "core/object/class_db.h"
-#import "drivers/apple_embedded/app_delegate_service.h"
-#import "drivers/apple_embedded/godot_view_controller.h"
+#import "app_delegate_service.h"
+#import "godot_view_controller.h"
 
 #import <CoreHaptics/CoreHaptics.h>
 #import <UIKit/UIKit.h>
diff --git a/engine/drivers/apple_embedded/bridging_header_apple_embedded.h b/engine/drivers/apple_embedded/bridging_header_apple_embedded.h
index 5e0bb8b2..ea608eca 100644
--- a/engine/drivers/apple_embedded/bridging_header_apple_embedded.h
+++ b/engine/drivers/apple_embedded/bridging_header_apple_embedded.h
@@ -30,9 +30,7 @@
 
 #pragma once
 
-// IWYU pragma: begin_exports.
-#import "drivers/apple_embedded/app_delegate_service.h"
-#import "drivers/apple_embedded/godot_app_delegate.h"
-#import "drivers/apple_embedded/godot_view_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_controller.h"
-// IWYU pragma: end_exports.
+#import "app_delegate_service.h"
+#import "godot_app_delegate.h"
+#import "godot_view_apple_embedded.h"
+#import "godot_view_controller.h"
diff --git a/engine/drivers/apple_embedded/display_server_apple_embedded.h b/engine/drivers/apple_embedded/display_server_apple_embedded.h
index f8efc734..e5cdaaf3 100644
--- a/engine/drivers/apple_embedded/display_server_apple_embedded.h
+++ b/engine/drivers/apple_embedded/display_server_apple_embedded.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/os/thread_safe.h"
+#include "core/input/input.h"
 #include "servers/display/display_server.h"
 
 #if defined(RD_ENABLED)
@@ -38,9 +38,9 @@
 #include "servers/rendering/rendering_device.h"
 
 #if defined(VULKAN_ENABLED)
-#import "drivers/apple_embedded/rendering_context_driver_vulkan_apple_embedded.h"
+#import "rendering_context_driver_vulkan_apple_embedded.h"
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 #endif // VULKAN_ENABLED
 
 #if defined(METAL_ENABLED)
@@ -55,10 +55,6 @@
 #import <Foundation/Foundation.h>
 #import <QuartzCore/CAMetalLayer.h>
 
-class InputEvent;
-class NativeMenu;
-
-/// "Embedded" as in "Embedded Device".
 class DisplayServerAppleEmbedded : public DisplayServer {
 	GDSOFTCLASS(DisplayServerAppleEmbedded, DisplayServer);
 
@@ -72,7 +68,7 @@ class DisplayServerAppleEmbedded : public DisplayServer {
 
 	id tts = nullptr;
 
-	DisplayServerEnums::ScreenOrientation screen_orientation;
+	DisplayServer::ScreenOrientation screen_orientation;
 
 	ObjectID window_attached_instance_id;
 
@@ -89,17 +85,8 @@ class DisplayServerAppleEmbedded : public DisplayServer {
 
 	void initialize_tts() const;
 
-	bool edr_requested = false;
-	void _update_hdr_output(bool edr_headroom_changed);
-	float _calculate_current_reference_luminance() const;
-
 protected:
-	virtual bool _screen_hdr_is_supported() const { return false; }
-	virtual float _screen_potential_edr_headroom() const { return 1.0f; }
-	virtual float _screen_current_edr_headroom() const { return 1.0f; }
-	float hardware_reference_luminance_nits = 100.0f;
-
-	DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerAppleEmbedded();
 
 public:
@@ -113,16 +100,16 @@ public:
 
 	virtual void process_events() override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
 	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
 	void send_input_event(const Ref<InputEvent> &p_event) const;
 	void send_input_text(const String &p_text) const;
-	void send_window_event(DisplayServerEnums::WindowEvent p_event) const;
+	void send_window_event(DisplayServer::WindowEvent p_event) const;
 	void _window_callback(const Callable &p_callable, const Variant &p_arg) const;
 
 	void emit_system_theme_changed();
@@ -149,7 +136,7 @@ public:
 
 	// MARK: -
 
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 
 	virtual bool tts_is_speaking() const override;
 	virtual bool tts_is_paused() const override;
@@ -168,67 +155,67 @@ public:
 
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual float screen_get_max_scale() const override;
 
-	virtual void screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) override;
-	virtual DisplayServerEnums::ScreenOrientation screen_get_orientation(int p_screen) const override;
+	virtual void screen_set_orientation(DisplayServer::ScreenOrientation p_orientation, int p_screen) override;
+	virtual DisplayServer::ScreenOrientation screen_get_orientation(int p_screen) const override;
 
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
 	virtual bool is_touchscreen_available() const override;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) override;
 	virtual void virtual_keyboard_hide() override;
 
 	void virtual_keyboard_set_height(int height);
@@ -241,24 +228,6 @@ public:
 	virtual void screen_set_keep_on(bool p_enable) override;
 	virtual bool screen_is_kept_on() const override;
 
-	// MARK: - HDR / EDR
-
-	void current_edr_headroom_changed();
-	virtual bool window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_request_hdr_output(const bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual bool window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
 	void resize_window(CGSize size);
 	virtual void swap_buffers() override {}
 
diff --git a/engine/drivers/apple_embedded/display_server_apple_embedded.mm b/engine/drivers/apple_embedded/display_server_apple_embedded.mm
index 587e526e..83d78962 100644
--- a/engine/drivers/apple_embedded/display_server_apple_embedded.mm
+++ b/engine/drivers/apple_embedded/display_server_apple_embedded.mm
@@ -30,19 +30,17 @@
 
 #import "display_server_apple_embedded.h"
 
+#import "app_delegate_service.h"
+#import "apple_embedded.h"
+#import "godot_keyboard_input_view.h"
+#import "godot_view_apple_embedded.h"
+#import "godot_view_controller.h"
+#import "key_mapping_apple_embedded.h"
+#import "os_apple_embedded.h"
+#import "tts_apple_embedded.h"
+
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/file_access_pack.h"
-#include "core/os/os.h"
-#import "drivers/apple_embedded/app_delegate_service.h"
-#import "drivers/apple_embedded/apple_embedded.h"
-#import "drivers/apple_embedded/godot_keyboard_input_view.h"
-#import "drivers/apple_embedded/godot_view_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_controller.h"
-#import "drivers/apple_embedded/key_mapping_apple_embedded.h"
-#import "drivers/apple_embedded/os_apple_embedded.h"
-#import "drivers/apple_embedded/tts_apple_embedded.h"
-#include "servers/display/native_menu.h"
 
 #import <GameController/GameController.h>
 
@@ -52,7 +50,7 @@ DisplayServerAppleEmbedded *DisplayServerAppleEmbedded::get_singleton() {
 	return (DisplayServerAppleEmbedded *)DisplayServer::get_singleton();
 }
 
-DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	KeyMappingAppleEmbedded::initialize();
 
 	rendering_driver = p_rendering_driver;
@@ -98,7 +96,7 @@ DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering
 	if (rendering_driver == "metal") {
 		if (@available(iOS 14.0, *)) {
 			layer = [GDTAppDelegateService.viewController.godotView initializeRenderingForDriver:@"metal"];
-			wpd.metal.layer = (__bridge CA::MetalLayer *)layer;
+			wpd.metal.layer = (CAMetalLayer *)layer;
 			rendering_context = memnew(RenderingContextDriverMetal);
 		} else {
 			OS::get_singleton()->alert("Metal is only supported on iOS 14.0 and later.");
@@ -116,8 +114,8 @@ DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering
 			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
 				WARN_PRINT("Your device does not seem to support MoltenVK or Metal, switching to OpenGL 3.");
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else
 #endif
 			{
@@ -129,7 +127,7 @@ DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering
 	}
 
 	if (rendering_context) {
-		if (rendering_context->window_create(DisplayServerEnums::MAIN_WINDOW_ID, &wpd) != OK) {
+		if (rendering_context->window_create(MAIN_WINDOW_ID, &wpd) != OK) {
 			ERR_PRINT(vformat("Failed to create %s window.", rendering_driver));
 			memdelete(rendering_context);
 			rendering_context = nullptr;
@@ -138,18 +136,18 @@ DisplayServerAppleEmbedded::DisplayServerAppleEmbedded(const String &p_rendering
 		}
 
 		Size2i size = Size2i(layer.bounds.size.width, layer.bounds.size.height) * screen_get_max_scale();
-		rendering_context->window_set_size(DisplayServerEnums::MAIN_WINDOW_ID, size.width, size.height);
-		rendering_context->window_set_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID, p_vsync_mode);
+		rendering_context->window_set_size(MAIN_WINDOW_ID, size.width, size.height);
+		rendering_context->window_set_vsync_mode(MAIN_WINDOW_ID, p_vsync_mode);
 
 		rendering_device = memnew(RenderingDevice);
-		if (rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) != OK) {
 			rendering_device = nullptr;
 			memdelete(rendering_context);
 			rendering_context = nullptr;
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 		has_made_render_compositor_current = true;
@@ -187,13 +185,13 @@ DisplayServerAppleEmbedded::~DisplayServerAppleEmbedded() {
 
 #if defined(RD_ENABLED)
 	if (rendering_device) {
-		rendering_device->screen_free(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_free(MAIN_WINDOW_ID);
 		memdelete(rendering_device);
 		rendering_device = nullptr;
 	}
 
 	if (rendering_context) {
-		rendering_context->window_destroy(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_context->window_destroy(MAIN_WINDOW_ID);
 		memdelete(rendering_context);
 		rendering_context = nullptr;
 	}
@@ -220,22 +218,22 @@ Vector<String> DisplayServerAppleEmbedded::get_rendering_drivers_func() {
 
 // MARK: Events
 
-void DisplayServerAppleEmbedded::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	window_resize_callback = p_callable;
 }
 
-void DisplayServerAppleEmbedded::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	window_event_callback = p_callable;
 }
-void DisplayServerAppleEmbedded::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	input_event_callback = p_callable;
 }
 
-void DisplayServerAppleEmbedded::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	input_text_callback = p_callable;
 }
 
-void DisplayServerAppleEmbedded::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
@@ -255,7 +253,7 @@ void DisplayServerAppleEmbedded::send_input_text(const String &p_text) const {
 	_window_callback(input_text_callback, p_text);
 }
 
-void DisplayServerAppleEmbedded::send_window_event(DisplayServerEnums::WindowEvent p_event) const {
+void DisplayServerAppleEmbedded::send_window_event(DisplayServer::WindowEvent p_event) const {
 	_window_callback(window_event_callback, int(p_event));
 }
 
@@ -354,34 +352,33 @@ void DisplayServerAppleEmbedded::update_gyroscope(const Vector3 &p_gyroscope) {
 
 // MARK: -
 
-bool DisplayServerAppleEmbedded::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerAppleEmbedded::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		// case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		// case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		// case DisplayServerEnums::FEATURE_HIDPI:
-		// case DisplayServerEnums::FEATURE_ICON:
-		// case DisplayServerEnums::FEATURE_IME:
-		// case DisplayServerEnums::FEATURE_MOUSE:
-		// case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		// case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
-		// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		// case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
-		// case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		// case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_HDR_OUTPUT:
-		case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		case DisplayServerEnums::FEATURE_ORIENTATION:
-		case DisplayServerEnums::FEATURE_TOUCHSCREEN:
-		case DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD:
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
+		// case FEATURE_CURSOR_SHAPE:
+		// case FEATURE_CUSTOM_CURSOR_SHAPE:
+		// case FEATURE_HIDPI:
+		// case FEATURE_ICON:
+		// case FEATURE_IME:
+		// case FEATURE_MOUSE:
+		// case FEATURE_MOUSE_WARP:
+		// case FEATURE_NATIVE_DIALOG:
+		// case FEATURE_NATIVE_DIALOG_INPUT:
+		// case FEATURE_NATIVE_DIALOG_FILE:
+		// case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		// case FEATURE_NATIVE_DIALOG_FILE_MIME:
+		// case FEATURE_NATIVE_ICON:
+		// case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_ORIENTATION:
+		case FEATURE_TOUCHSCREEN:
+		case FEATURE_VIRTUAL_KEYBOARD:
+		case FEATURE_TEXT_TO_SPEECH:
 			return true;
 		default:
 			return false;
@@ -529,26 +526,26 @@ Rect2i DisplayServerAppleEmbedded::screen_get_usable_rect(int p_screen) const {
 	return Rect2i(screen_get_position(p_screen), screen_get_size(p_screen));
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerAppleEmbedded::get_window_list() const {
-	Vector<DisplayServerEnums::WindowID> list;
-	list.push_back(DisplayServerEnums::MAIN_WINDOW_ID);
+Vector<DisplayServer::WindowID> DisplayServerAppleEmbedded::get_window_list() const {
+	Vector<DisplayServer::WindowID> list;
+	list.push_back(MAIN_WINDOW_ID);
 	return list;
 }
 
-DisplayServerEnums::WindowID DisplayServerAppleEmbedded::get_window_at_screen_position(const Point2i &p_position) const {
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+DisplayServer::WindowID DisplayServerAppleEmbedded::get_window_at_screen_position(const Point2i &p_position) const {
+	return MAIN_WINDOW_ID;
 }
 
-int64_t DisplayServerAppleEmbedded::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, 0);
+int64_t DisplayServerAppleEmbedded::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, 0);
 	switch (p_handle_type) {
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			return 0; // Not supported.
 		}
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return (int64_t)GDTAppDelegateService.viewController;
 		}
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			return (int64_t)GDTAppDelegateService.viewController.godotView;
 		}
 		default: {
@@ -557,109 +554,109 @@ int64_t DisplayServerAppleEmbedded::window_get_native_handle(DisplayServerEnums:
 	}
 }
 
-void DisplayServerAppleEmbedded::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	window_attached_instance_id = p_instance;
 }
 
-ObjectID DisplayServerAppleEmbedded::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerAppleEmbedded::window_get_attached_instance_id(WindowID p_window) const {
 	return window_attached_instance_id;
 }
 
-void DisplayServerAppleEmbedded::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_title(const String &p_title, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-int DisplayServerAppleEmbedded::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, DisplayServerEnums::INVALID_SCREEN);
+int DisplayServerAppleEmbedded::window_get_current_screen(WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, INVALID_SCREEN);
 	return 0;
 }
 
-void DisplayServerAppleEmbedded::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_current_screen(int p_screen, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-Point2i DisplayServerAppleEmbedded::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerAppleEmbedded::window_get_position(WindowID p_window) const {
 	return Point2i();
 }
 
-Point2i DisplayServerAppleEmbedded::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerAppleEmbedded::window_get_position_with_decorations(WindowID p_window) const {
 	return Point2i();
 }
 
-void DisplayServerAppleEmbedded::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_position(const Point2i &p_position, WindowID p_window) {
 	// Probably not supported for single window iOS app
 }
 
-void DisplayServerAppleEmbedded::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerAppleEmbedded::window_set_transient(WindowID p_window, WindowID p_parent) {
 	// Probably not supported for iOS
 }
 
-void DisplayServerAppleEmbedded::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-Size2i DisplayServerAppleEmbedded::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAppleEmbedded::window_get_max_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerAppleEmbedded::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-Size2i DisplayServerAppleEmbedded::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAppleEmbedded::window_get_min_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerAppleEmbedded::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_size(const Size2i p_size, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-Size2i DisplayServerAppleEmbedded::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAppleEmbedded::window_get_size(WindowID p_window) const {
 	CGRect viewBounds = GDTAppDelegateService.viewController.view.bounds;
 	return Size2i(viewBounds.size.width, viewBounds.size.height) * screen_get_max_scale();
 }
 
-Size2i DisplayServerAppleEmbedded::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAppleEmbedded::window_get_size_with_decorations(WindowID p_window) const {
 	return window_get_size(p_window);
 }
 
-void DisplayServerAppleEmbedded::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-DisplayServerEnums::WindowMode DisplayServerAppleEmbedded::window_get_mode(DisplayServerEnums::WindowID p_window) const {
-	return DisplayServerEnums::WindowMode::WINDOW_MODE_FULLSCREEN;
+DisplayServer::WindowMode DisplayServerAppleEmbedded::window_get_mode(WindowID p_window) const {
+	return WindowMode::WINDOW_MODE_FULLSCREEN;
 }
 
-bool DisplayServerAppleEmbedded::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAppleEmbedded::window_is_maximize_allowed(WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerAppleEmbedded::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-bool DisplayServerAppleEmbedded::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAppleEmbedded::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerAppleEmbedded::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_request_attention(WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-void DisplayServerAppleEmbedded::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_move_to_foreground(WindowID p_window) {
 	// Probably not supported for iOS
 }
 
-bool DisplayServerAppleEmbedded::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAppleEmbedded::window_is_focused(WindowID p_window) const {
 	return true;
 }
 
 float DisplayServerAppleEmbedded::screen_get_max_scale() const {
-	return screen_get_scale(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW);
+	return screen_get_scale(SCREEN_OF_MAIN_WINDOW);
 }
 
-void DisplayServerAppleEmbedded::screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) {
+void DisplayServerAppleEmbedded::screen_set_orientation(DisplayServer::ScreenOrientation p_orientation, int p_screen) {
 	p_screen = _get_screen_index(p_screen);
 	int screen_count = get_screen_count();
 	ERR_FAIL_INDEX(p_screen, screen_count);
@@ -675,15 +672,15 @@ void DisplayServerAppleEmbedded::screen_set_orientation(DisplayServerEnums::Scre
 #endif
 }
 
-DisplayServerEnums::ScreenOrientation DisplayServerAppleEmbedded::screen_get_orientation(int p_screen) const {
+DisplayServer::ScreenOrientation DisplayServerAppleEmbedded::screen_get_orientation(int p_screen) const {
 	p_screen = _get_screen_index(p_screen);
 	int screen_count = get_screen_count();
-	ERR_FAIL_INDEX_V(p_screen, screen_count, DisplayServerEnums::SCREEN_LANDSCAPE);
+	ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_LANDSCAPE);
 
 	return screen_orientation;
 }
 
-bool DisplayServerAppleEmbedded::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAppleEmbedded::window_can_draw(WindowID p_window) const {
 	return true;
 }
 
@@ -705,37 +702,37 @@ _FORCE_INLINE_ int _convert_utf32_offset_to_utf16(const String &p_existing_text,
 	return limit;
 }
 
-void DisplayServerAppleEmbedded::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServerAppleEmbedded::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	NSString *existingString = [[NSString alloc] initWithUTF8String:p_existing_text.utf8().get_data()];
 
 	GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
 	GDTAppDelegateService.viewController.keyboardView.textContentType = nil;
 	switch (p_type) {
-		case DisplayServerEnums::KEYBOARD_TYPE_DEFAULT: {
+		case KEYBOARD_TYPE_DEFAULT: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_MULTILINE: {
+		case KEYBOARD_TYPE_MULTILINE: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_NUMBER: {
+		case KEYBOARD_TYPE_NUMBER: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeNumberPad;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_NUMBER_DECIMAL: {
+		case KEYBOARD_TYPE_NUMBER_DECIMAL: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDecimalPad;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_PHONE: {
+		case KEYBOARD_TYPE_PHONE: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypePhonePad;
 			GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeTelephoneNumber;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_EMAIL_ADDRESS: {
+		case KEYBOARD_TYPE_EMAIL_ADDRESS: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeEmailAddress;
 			GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeEmailAddress;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_PASSWORD: {
+		case KEYBOARD_TYPE_PASSWORD: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeDefault;
 			GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypePassword;
 		} break;
-		case DisplayServerEnums::KEYBOARD_TYPE_URL: {
+		case KEYBOARD_TYPE_URL: {
 			GDTAppDelegateService.viewController.keyboardView.keyboardType = UIKeyboardTypeWebSearch;
 			GDTAppDelegateService.viewController.keyboardView.textContentType = UITextContentTypeURL;
 		} break;
@@ -794,7 +791,7 @@ void DisplayServerAppleEmbedded::resize_window(CGSize viewSize) {
 
 #if defined(RD_ENABLED)
 	if (rendering_context) {
-		rendering_context->window_set_size(DisplayServerEnums::MAIN_WINDOW_ID, size.x, size.y);
+		rendering_context->window_set_size(MAIN_WINDOW_ID, size.x, size.y);
 	}
 #endif
 
@@ -802,7 +799,7 @@ void DisplayServerAppleEmbedded::resize_window(CGSize viewSize) {
 	_window_callback(window_resize_callback, resize_rect);
 }
 
-void DisplayServerAppleEmbedded::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAppleEmbedded::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -811,119 +808,14 @@ void DisplayServerAppleEmbedded::window_set_vsync_mode(DisplayServerEnums::VSync
 #endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerAppleEmbedded::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerAppleEmbedded::window_get_vsync_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		return rendering_context->window_get_vsync_mode(p_window);
 	}
 #endif
-	return DisplayServerEnums::VSYNC_ENABLED;
-}
-
-// MARK: - HDR / EDR
-
-void DisplayServerAppleEmbedded::_update_hdr_output(bool edr_headroom_changed) {
-#ifdef RD_ENABLED
-	if (!rendering_context) {
-		return;
-	}
-
-	bool desired = edr_requested && _screen_hdr_is_supported();
-	bool hdr_state_changed = rendering_context->window_get_hdr_output_enabled(DisplayServerEnums::MAIN_WINDOW_ID) != desired;
-	if (hdr_state_changed) {
-		rendering_context->window_set_hdr_output_enabled(DisplayServerEnums::MAIN_WINDOW_ID, desired);
-	}
-
-	float reference_luminance = _calculate_current_reference_luminance();
-	rendering_context->window_set_hdr_output_reference_luminance(DisplayServerEnums::MAIN_WINDOW_ID, reference_luminance);
-
-	float max_luminance = _screen_potential_edr_headroom() * hardware_reference_luminance_nits;
-	rendering_context->window_set_hdr_output_max_luminance(DisplayServerEnums::MAIN_WINDOW_ID, max_luminance);
-
-	if (hdr_state_changed || edr_headroom_changed) {
-		send_window_event(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
-	}
-#endif
-}
-
-void DisplayServerAppleEmbedded::current_edr_headroom_changed() {
-	_update_hdr_output(true);
-}
-
-bool DisplayServerAppleEmbedded::window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window) const {
-#if defined(RD_ENABLED)
-	if (rendering_device && !rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT)) {
-		return false;
-	}
-#endif
-	return _screen_hdr_is_supported();
-}
-
-void DisplayServerAppleEmbedded::window_request_hdr_output(const bool p_enabled, DisplayServerEnums::WindowID p_window) {
-#if defined(RD_ENABLED)
-	ERR_FAIL_COND_MSG(p_enabled && rendering_device && !rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT), "HDR output is not supported by the rendering device.");
-#endif
-
-	edr_requested = p_enabled;
-	_update_hdr_output(false);
-}
-
-bool DisplayServerAppleEmbedded::window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window) const {
-	return edr_requested;
-}
-
-bool DisplayServerAppleEmbedded::window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_enabled(p_window);
-	}
-#endif
-	return false;
-}
-
-void DisplayServerAppleEmbedded::window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window) {
-	ERR_PRINT_ONCE("Manually setting reference white luminance is not supported on Apple devices, as they provide a user-facing brightness setting that directly controls reference white luminance.");
-}
-
-float DisplayServerAppleEmbedded::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	return -1.0f; // Always auto-adjusted by the OS on Apple platforms.
-}
-
-float DisplayServerAppleEmbedded::_calculate_current_reference_luminance() const {
-	float potential = _screen_potential_edr_headroom();
-	float current = _screen_current_edr_headroom();
-	return potential * hardware_reference_luminance_nits / current;
-}
-
-float DisplayServerAppleEmbedded::window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_reference_luminance(p_window);
-	}
-#endif
-	return 200.0f;
-}
-
-void DisplayServerAppleEmbedded::window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window) {
-	ERR_PRINT_ONCE("Manually setting max luminance is not supported on Apple embedded devices as they provide accurate max luminance values for their built-in screens.");
-}
-
-float DisplayServerAppleEmbedded::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	return -1.0f;
-}
-
-float DisplayServerAppleEmbedded::window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	return _screen_potential_edr_headroom() * hardware_reference_luminance_nits;
-}
-
-float DisplayServerAppleEmbedded::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_output_max_linear_value(p_window);
-	}
-#endif
-	return 1.0f;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
 void DisplayServerAppleEmbedded::set_native_icon(const String &p_filename) {
diff --git a/engine/drivers/apple_embedded/godot_app_delegate.mm b/engine/drivers/apple_embedded/godot_app_delegate.mm
index b3360e4a..da658f36 100644
--- a/engine/drivers/apple_embedded/godot_app_delegate.mm
+++ b/engine/drivers/apple_embedded/godot_app_delegate.mm
@@ -30,8 +30,8 @@
 
 #import "godot_app_delegate.h"
 
+#import "app_delegate_service.h"
 #include "core/typedefs.h"
-#import "drivers/apple_embedded/app_delegate_service.h"
 
 @implementation GDTApplicationDelegate
 
diff --git a/engine/drivers/apple_embedded/godot_keyboard_input_view.mm b/engine/drivers/apple_embedded/godot_keyboard_input_view.mm
index 013c8c08..9cbc9a0f 100644
--- a/engine/drivers/apple_embedded/godot_keyboard_input_view.mm
+++ b/engine/drivers/apple_embedded/godot_keyboard_input_view.mm
@@ -30,9 +30,10 @@
 
 #import "godot_keyboard_input_view.h"
 
+#import "display_server_apple_embedded.h"
+#import "os_apple_embedded.h"
+
 #include "core/os/keyboard.h"
-#import "drivers/apple_embedded/display_server_apple_embedded.h"
-#import "drivers/apple_embedded/os_apple_embedded.h"
 
 @interface GDTKeyboardInputView () <UITextViewDelegate>
 
diff --git a/engine/drivers/apple_embedded/godot_view_apple_embedded.mm b/engine/drivers/apple_embedded/godot_view_apple_embedded.mm
index ffd22c34..8f187703 100644
--- a/engine/drivers/apple_embedded/godot_view_apple_embedded.mm
+++ b/engine/drivers/apple_embedded/godot_view_apple_embedded.mm
@@ -30,12 +30,13 @@
 
 #import "godot_view_apple_embedded.h"
 
+#import "display_layer_apple_embedded.h"
+#import "display_server_apple_embedded.h"
+#import "godot_view_renderer.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "core/string/ustring.h"
-#import "drivers/apple_embedded/display_layer_apple_embedded.h"
-#import "drivers/apple_embedded/display_server_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_renderer.h"
 
 #import <CoreMotion/CoreMotion.h>
 
@@ -44,7 +45,6 @@ static const float earth_gravity = 9.80665;
 
 @interface GDTView () {
 	UITouch *godot_touches[max_touches];
-	CGFloat last_edr_headroom;
 }
 
 @property(assign, nonatomic) BOOL isActive;
@@ -121,7 +121,6 @@ static const float earth_gravity = 9.80665;
 - (void)godot_commonInit {
 	self.preferredFrameRate = 60;
 	self.useCADisplayLink = bool(GLOBAL_DEF("display.AppleEmbedded/use_cadisplaylink", true)) ? YES : NO;
-	last_edr_headroom = 0.0;
 
 #if !defined(VISIONOS_ENABLED)
 	self.contentScaleFactor = [UIScreen mainScreen].scale;
@@ -250,20 +249,6 @@ static const float earth_gravity = 9.80665;
 	}
 
 	[self handleMotion];
-
-#if !defined(VISIONOS_ENABLED)
-	if (@available(iOS 16.0, *)) {
-		CGFloat edr_headroom = UIScreen.mainScreen.currentEDRHeadroom;
-		if (last_edr_headroom != edr_headroom) {
-			last_edr_headroom = edr_headroom;
-			if (DisplayServerAppleEmbedded::get_singleton()) {
-				DisplayServerAppleEmbedded::get_singleton()->current_edr_headroom_changed();
-			}
-		}
-	}
-
-#endif
-
 	[self.renderer renderOnView:self];
 
 	[self.renderingLayer stopRenderDisplayLayer];
diff --git a/engine/drivers/apple_embedded/godot_view_controller.mm b/engine/drivers/apple_embedded/godot_view_controller.mm
index d3831878..0bb2ee39 100644
--- a/engine/drivers/apple_embedded/godot_view_controller.mm
+++ b/engine/drivers/apple_embedded/godot_view_controller.mm
@@ -30,13 +30,14 @@
 
 #import "godot_view_controller.h"
 
+#import "display_server_apple_embedded.h"
+#import "godot_keyboard_input_view.h"
+#import "godot_view_apple_embedded.h"
+#import "godot_view_renderer.h"
+#import "key_mapping_apple_embedded.h"
+#import "os_apple_embedded.h"
+
 #include "core/config/project_settings.h"
-#import "drivers/apple_embedded/display_server_apple_embedded.h"
-#import "drivers/apple_embedded/godot_keyboard_input_view.h"
-#import "drivers/apple_embedded/godot_view_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_renderer.h"
-#import "drivers/apple_embedded/key_mapping_apple_embedded.h"
-#import "drivers/apple_embedded/os_apple_embedded.h"
 #include "servers/camera/camera_server.h"
 
 #import <AVFoundation/AVFoundation.h>
@@ -285,17 +286,6 @@
 									 if (camera_server) {
 										 camera_server->handle_display_rotation_change((int)orientation);
 									 }
-
-									 DisplayServer *display_server = DisplayServer::get_singleton();
-									 if (display_server) {
-										 int out = 0;
-										 if (UIInterfaceOrientationIsPortrait(orientation)) {
-											 out = 1;
-										 } else if (UIInterfaceOrientationIsLandscape(orientation)) {
-											 out = 2;
-										 }
-										 display_server->emit_signal("orientation_changed", out);
-									 }
 								 }];
 }
 #endif
@@ -313,10 +303,10 @@
 		return NO;
 	}
 
-	switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW)) {
-		case DisplayServerEnums::SCREEN_SENSOR:
-		case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
-		case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+	switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServer::SCREEN_OF_MAIN_WINDOW)) {
+		case DisplayServer::SCREEN_SENSOR:
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 			return YES;
 		default:
 			return NO;
@@ -328,24 +318,24 @@
 		return UIInterfaceOrientationMaskAll;
 	}
 
-	switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW)) {
-		case DisplayServerEnums::SCREEN_PORTRAIT:
+	switch (DisplayServerAppleEmbedded::get_singleton()->screen_get_orientation(DisplayServer::SCREEN_OF_MAIN_WINDOW)) {
+		case DisplayServer::SCREEN_PORTRAIT:
 			return UIInterfaceOrientationMaskPortrait;
-		case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
+		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
 			if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
 				return UIInterfaceOrientationMaskLandscapeLeft;
 			} else {
 				return UIInterfaceOrientationMaskLandscapeRight;
 			}
-		case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
+		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
 			return UIInterfaceOrientationMaskPortraitUpsideDown;
-		case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
 			return UIInterfaceOrientationMaskLandscape;
-		case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 			return UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
-		case DisplayServerEnums::SCREEN_SENSOR:
+		case DisplayServer::SCREEN_SENSOR:
 			return UIInterfaceOrientationMaskAll;
-		case DisplayServerEnums::SCREEN_LANDSCAPE:
+		case DisplayServer::SCREEN_LANDSCAPE:
 			if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
 				return UIInterfaceOrientationMaskLandscapeRight;
 			} else {
diff --git a/engine/drivers/apple_embedded/godot_view_renderer.mm b/engine/drivers/apple_embedded/godot_view_renderer.mm
index 60c67016..95789c87 100644
--- a/engine/drivers/apple_embedded/godot_view_renderer.mm
+++ b/engine/drivers/apple_embedded/godot_view_renderer.mm
@@ -30,11 +30,11 @@
 
 #import "godot_view_renderer.h"
 
+#import "display_server_apple_embedded.h"
+#import "os_apple_embedded.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
-#import "drivers/apple_embedded/display_server_apple_embedded.h"
-#import "drivers/apple_embedded/os_apple_embedded.h"
 #include "main/main.h"
 #include "servers/audio/audio_server.h"
 
diff --git a/engine/drivers/apple_embedded/main_utilities.mm b/engine/drivers/apple_embedded/main_utilities.mm
index a1b34108..31bb6ffd 100644
--- a/engine/drivers/apple_embedded/main_utilities.mm
+++ b/engine/drivers/apple_embedded/main_utilities.mm
@@ -31,8 +31,8 @@
 #include "core/string/ustring.h"
 
 #import <UIKit/UIKit.h>
-#include <unistd.h>
 
+#include <unistd.h>
 #include <cstdio>
 
 void change_to_launch_dir(char **p_args) {
diff --git a/engine/drivers/apple_embedded/os_apple_embedded.h b/engine/drivers/apple_embedded/os_apple_embedded.h
index d801a865..f274866b 100644
--- a/engine/drivers/apple_embedded/os_apple_embedded.h
+++ b/engine/drivers/apple_embedded/os_apple_embedded.h
@@ -32,7 +32,9 @@
 
 #ifdef APPLE_EMBEDDED_ENABLED
 
-#import "drivers/apple_embedded/apple_embedded.h"
+#import "apple_embedded.h"
+
+#import "drivers/apple/joypad_apple.h"
 #import "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/unix/os_unix.h"
 #include "servers/audio/audio_server.h"
@@ -42,12 +44,10 @@
 #include "servers/rendering/rendering_device.h"
 
 #if defined(VULKAN_ENABLED)
-#import "drivers/apple_embedded/rendering_context_driver_vulkan_apple_embedded.h"
+#import "rendering_context_driver_vulkan_apple_embedded.h"
 #endif
 #endif
 
-class JoypadSDL;
-
 class OS_AppleEmbedded : public OS_Unix {
 private:
 	static HashMap<String, void *> dynamic_symbol_lookup_table;
@@ -57,9 +57,7 @@ private:
 
 	AppleEmbedded *apple_embedded = nullptr;
 
-#ifdef SDL_ENABLED
-	JoypadSDL *joypad_sdl = nullptr;
-#endif
+	JoypadApple *joypad_apple = nullptr;
 
 	MainLoop *main_loop = nullptr;
 
@@ -143,17 +141,6 @@ public:
 
 	virtual bool request_permission(const String &p_name) override;
 	virtual Vector<String> get_granted_permissions() const override;
-
-	virtual String get_platform_string(PlatformString p_platform_string) const override {
-		switch (p_platform_string) {
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_OPEN:
-				return ETR("Open in Files");
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_SHOW:
-				return ETR("Show in Files");
-			default:
-				return OS::get_platform_string(p_platform_string);
-		}
-	}
 };
 
 #endif // APPLE_EMBEDDED_ENABLED
diff --git a/engine/drivers/apple_embedded/os_apple_embedded.mm b/engine/drivers/apple_embedded/os_apple_embedded.mm
index c1dfa530..332078b0 100644
--- a/engine/drivers/apple_embedded/os_apple_embedded.mm
+++ b/engine/drivers/apple_embedded/os_apple_embedded.mm
@@ -32,21 +32,17 @@
 
 #ifdef APPLE_EMBEDDED_ENABLED
 
-#include "core/config/engine.h"
+#import "app_delegate_service.h"
+#import "display_server_apple_embedded.h"
+#import "godot_view_apple_embedded.h"
+#import "godot_view_controller.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #import "drivers/apple/os_log_logger.h"
-#import "drivers/apple_embedded/app_delegate_service.h"
-#import "drivers/apple_embedded/display_server_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_apple_embedded.h"
-#import "drivers/apple_embedded/godot_view_controller.h"
-#ifdef SDL_ENABLED
-#include "drivers/sdl/joypad_sdl.h"
-#endif
 #include "main/main.h"
 
 #import <AVFoundation/AVFAudio.h>
@@ -56,15 +52,12 @@
 #import <dlfcn.h>
 #include <sys/sysctl.h>
 
-#include <iterator>
-
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-
 #import <QuartzCore/CAMetalLayer.h>
 
 #if defined(VULKAN_ENABLED)
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 #endif // VULKAN_ENABLED
 #endif
 
@@ -173,14 +166,7 @@ void OS_AppleEmbedded::initialize() {
 }
 
 void OS_AppleEmbedded::initialize_joypads() {
-#ifdef SDL_ENABLED
-	joypad_sdl = memnew(JoypadSDL());
-	if (joypad_sdl->initialize() != OK) {
-		ERR_PRINT("Couldn't initialize SDL joypad input driver.");
-		memdelete(joypad_sdl);
-		joypad_sdl = nullptr;
-	}
-#endif
+	joypad_apple = memnew(JoypadApple);
 }
 
 void OS_AppleEmbedded::initialize_modules() {
@@ -189,11 +175,9 @@ void OS_AppleEmbedded::initialize_modules() {
 }
 
 void OS_AppleEmbedded::deinitialize_modules() {
-#ifdef SDL_ENABLED
-	if (joypad_sdl) {
-		memdelete(joypad_sdl);
+	if (joypad_apple) {
+		memdelete(joypad_apple);
 	}
-#endif
 
 	if (apple_embedded) {
 		memdelete(apple_embedded);
@@ -229,11 +213,7 @@ bool OS_AppleEmbedded::iterate() {
 		DisplayServer::get_singleton()->process_events();
 	}
 
-#ifdef SDL_ENABLED
-	if (joypad_sdl) {
-		joypad_sdl->process_events();
-	}
-#endif
+	joypad_apple->process_joypads();
 
 	return Main::iteration();
 }
@@ -771,7 +751,7 @@ void OS_AppleEmbedded::on_focus_out() {
 		is_focused = false;
 
 		if (DisplayServerAppleEmbedded::get_singleton()) {
-			DisplayServerAppleEmbedded::get_singleton()->send_window_event(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+			DisplayServerAppleEmbedded::get_singleton()->send_window_event(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 		}
 
 		if (OS::get_singleton()->get_main_loop()) {
@@ -789,7 +769,7 @@ void OS_AppleEmbedded::on_focus_in() {
 		is_focused = true;
 
 		if (DisplayServerAppleEmbedded::get_singleton()) {
-			DisplayServerAppleEmbedded::get_singleton()->send_window_event(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+			DisplayServerAppleEmbedded::get_singleton()->send_window_event(DisplayServer::WINDOW_EVENT_FOCUS_IN);
 		}
 
 		if (OS::get_singleton()->get_main_loop()) {
diff --git a/engine/drivers/apple_embedded/platform_config.h b/engine/drivers/apple_embedded/platform_config.h
index 3e46717d..bc8b4560 100644
--- a/engine/drivers/apple_embedded/platform_config.h
+++ b/engine/drivers/apple_embedded/platform_config.h
@@ -37,8 +37,8 @@
 #define PTHREAD_RENAME_SELF
 
 #define _weakify(var) __weak typeof(var) GDWeak_##var = var;
-#define _strongify(var) \
-	_Pragma("clang diagnostic push") \
+#define _strongify(var)                                      \
+	_Pragma("clang diagnostic push")                         \
 			_Pragma("clang diagnostic ignored \"-Wshadow\"") \
 					__strong typeof(var) var = GDWeak_##var; \
 	_Pragma("clang diagnostic pop")
diff --git a/engine/drivers/apple_embedded/tts_apple_embedded.h b/engine/drivers/apple_embedded/tts_apple_embedded.h
index c3822da4..8d550790 100644
--- a/engine/drivers/apple_embedded/tts_apple_embedded.h
+++ b/engine/drivers/apple_embedded/tts_apple_embedded.h
@@ -34,6 +34,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
+#include "servers/display/display_server.h"
 
 #if __has_include(<AVFAudio/AVSpeechSynthesis.h>)
 #import <AVFAudio/AVSpeechSynthesis.h>
@@ -41,14 +42,12 @@
 #import <AVFoundation/AVFoundation.h>
 #endif
 
-struct TTSUtterance;
-
 @interface GDTTTS : NSObject <AVSpeechSynthesizerDelegate> {
 	bool speaking;
 	HashMap<id, int64_t> ids;
 
 	AVSpeechSynthesizer *av_synth;
-	List<TTSUtterance> queue;
+	List<DisplayServer::TTSUtterance> queue;
 }
 
 - (void)pauseSpeaking;
diff --git a/engine/drivers/apple_embedded/tts_apple_embedded.mm b/engine/drivers/apple_embedded/tts_apple_embedded.mm
index 4736a095..a4169143 100644
--- a/engine/drivers/apple_embedded/tts_apple_embedded.mm
+++ b/engine/drivers/apple_embedded/tts_apple_embedded.mm
@@ -30,8 +30,6 @@
 
 #import "tts_apple_embedded.h"
 
-#include "servers/display/display_server.h"
-
 @implementation GDTTTS
 
 - (id)init {
@@ -56,18 +54,18 @@
 		pos++;
 	}
 
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
 }
 
 - (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didCancelSpeechUtterance:(AVSpeechUtterance *)utterance {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[utterance]);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[utterance]);
 	ids.erase(utterance);
 	speaking = false;
 	[self update];
 }
 
 - (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didFinishSpeechUtterance:(AVSpeechUtterance *)utterance {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, ids[utterance]);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, ids[utterance]);
 	ids.erase(utterance);
 	speaking = false;
 	[self update];
@@ -75,7 +73,7 @@
 
 - (void)update {
 	if (!speaking && queue.size() > 0) {
-		TTSUtterance &message = queue.front()->get();
+		DisplayServer::TTSUtterance &message = queue.front()->get();
 
 		AVSpeechUtterance *new_utterance = [[AVSpeechUtterance alloc] initWithString:[NSString stringWithUTF8String:message.text.utf8().get_data()]];
 		[new_utterance setVoice:[AVSpeechSynthesisVoice voiceWithIdentifier:[NSString stringWithUTF8String:message.voice.utf8().get_data()]]];
@@ -89,7 +87,7 @@
 
 		ids[new_utterance] = message.id;
 		[av_synth speakUtterance:new_utterance];
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, message.id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_STARTED, message.id);
 
 		queue.pop_front();
 		speaking = true;
@@ -105,8 +103,8 @@
 }
 
 - (void)stopSpeaking {
-	for (TTSUtterance &message : queue) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
+	for (DisplayServer::TTSUtterance &message : queue) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, message.id);
 	}
 	queue.clear();
 	[av_synth stopSpeakingAtBoundary:AVSpeechBoundaryImmediate];
@@ -127,11 +125,11 @@
 	}
 
 	if (text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, utterance_id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, utterance_id);
 		return;
 	}
 
-	TTSUtterance message;
+	DisplayServer::TTSUtterance message;
 	message.text = text;
 	message.voice = voice;
 	message.volume = CLAMP(volume, 0, 100);
diff --git a/engine/drivers/coreaudio/audio_driver_coreaudio.mm b/engine/drivers/coreaudio/audio_driver_coreaudio.mm
index fbd73c8d..d9e0240a 100644
--- a/engine/drivers/coreaudio/audio_driver_coreaudio.mm
+++ b/engine/drivers/coreaudio/audio_driver_coreaudio.mm
@@ -32,9 +32,7 @@
 
 #ifdef COREAUDIO_ENABLED
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/math/math_funcs_binary.h"
 #include "core/os/os.h"
 
 #define kOutputBus 0
@@ -157,7 +155,7 @@ Error AudioDriverCoreAudio::init() {
 
 	uint32_t latency = Engine::get_singleton()->get_audio_output_latency();
 	// Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels)
-	buffer_frames = Math::closest_power_of_2(latency * (uint32_t)mix_rate / (uint32_t)1000);
+	buffer_frames = closest_power_of_2(latency * (uint32_t)mix_rate / (uint32_t)1000);
 
 #ifdef MACOS_ENABLED
 	result = AudioUnitSetProperty(audio_unit, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, kOutputBus, &buffer_frames, sizeof(UInt32));
@@ -463,7 +461,7 @@ Error AudioDriverCoreAudio::init_input_device() {
 
 	uint32_t latency = Engine::get_singleton()->get_audio_output_latency();
 	// Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels)
-	capture_buffer_frames = Math::closest_power_of_2(latency * (uint32_t)capture_mix_rate / (uint32_t)1000);
+	capture_buffer_frames = closest_power_of_2(latency * (uint32_t)capture_mix_rate / (uint32_t)1000);
 
 	buffer_size = capture_buffer_frames * capture_channels;
 
diff --git a/engine/drivers/coremidi/midi_driver_coremidi.h b/engine/drivers/coremidi/midi_driver_coremidi.h
index 3ee1bd09..82e7b15f 100644
--- a/engine/drivers/coremidi/midi_driver_coremidi.h
+++ b/engine/drivers/coremidi/midi_driver_coremidi.h
@@ -37,7 +37,6 @@
 #include "core/templates/vector.h"
 
 #import <CoreMIDI/CoreMIDI.h>
-
 #include <cstdio>
 
 class MIDIDriverCoreMidi : public MIDIDriver {
diff --git a/engine/drivers/d3d12/SCsub b/engine/drivers/d3d12/SCsub
index db2e9f8b..767afcfe 100644
--- a/engine/drivers/d3d12/SCsub
+++ b/engine/drivers/d3d12/SCsub
@@ -120,7 +120,7 @@ if (
 ):
     print_error(
         "The Direct3D 12 rendering driver dependencies are outdated or missing.\n"
-        f"You can re-install them by running `python {os.path.join('misc', 'scripts', 'install_d3d12_sdk_windows.py')}`.\n"
+        "You can re-install them by running `python misc\\scripts\\install_d3d12_sdk_windows.py`.\n"
     )
     sys.exit(255)
 
diff --git a/engine/drivers/d3d12/d3d12_godot_nir_bridge.h b/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
index a236c8ba..59992bee 100644
--- a/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
+++ b/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
@@ -30,13 +30,9 @@
 
 #pragma once
 
-#ifndef __cplusplus
-#include <stddef.h>
-#include <stdint.h>
-#else
-#include <cstddef>
 #include <cstdint>
 
+#ifdef __cplusplus
 extern "C" {
 #endif
 
diff --git a/engine/drivers/d3d12/d3d12_hooks.h b/engine/drivers/d3d12/d3d12_hooks.h
index 0902eb4d..bd6b89b6 100644
--- a/engine/drivers/d3d12/d3d12_hooks.h
+++ b/engine/drivers/d3d12/d3d12_hooks.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <drivers/d3d12/godot_d3dx12.h>
+#include "rendering_device_driver_d3d12.h"
 
 class D3D12Hooks {
 private:
diff --git a/engine/drivers/d3d12/dxil_hash.h b/engine/drivers/d3d12/dxil_hash.h
index a0763033..8dd24835 100644
--- a/engine/drivers/d3d12/dxil_hash.h
+++ b/engine/drivers/d3d12/dxil_hash.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 void compute_dxil_hash(const BYTE *pData, UINT byteCount, BYTE *pOutHash);
diff --git a/engine/drivers/d3d12/godot_d3d12ma.h b/engine/drivers/d3d12/godot_d3d12ma.h
deleted file mode 100644
index 939cc3a7..00000000
--- a/engine/drivers/d3d12/godot_d3d12ma.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************/
-/*  godot_d3d12ma.h                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/typedefs.h"
-
-GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
-
-#include <drivers/d3d12/godot_d3dx12.h>
-#include <dxgi1_6.h>
-
-#define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
-#include <thirdparty/d3d12ma/D3D12MemAlloc.h> // IWYU pragma: export.
-
-GODOT_GCC_WARNING_POP
-GODOT_CLANG_WARNING_POP
diff --git a/engine/drivers/d3d12/godot_nir.h b/engine/drivers/d3d12/godot_nir.h
deleted file mode 100644
index 8a343afa..00000000
--- a/engine/drivers/d3d12/godot_nir.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************/
-/*  godot_nir.h                                                           */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/typedefs.h"
-
-GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wmissing-field-initializers")
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wmissing-field-initializers")
-GODOT_MSVC_WARNING_PUSH
-GODOT_MSVC_WARNING_IGNORE(4200) // "nonstandard extension used: zero-sized array in struct/union".
-GODOT_MSVC_WARNING_IGNORE(4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
-
-#include <nir_spirv.h>
-#include <nir_to_dxil.h>
-#include <spirv_to_dxil.h>
-extern "C" {
-#include <dxil_spirv_nir.h>
-}
-
-GODOT_GCC_WARNING_POP
-GODOT_CLANG_WARNING_POP
-GODOT_MSVC_WARNING_POP
diff --git a/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp b/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
index 0e5741e7..9d9ad8f5 100644
--- a/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
+++ b/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
@@ -30,23 +30,36 @@
 
 #include "rendering_context_driver_d3d12.h"
 
+#include "d3d12_hooks.h"
+
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/string/ustring.h"
 #include "core/templates/local_vector.h"
+#include "core/version.h"
+#include "servers/rendering/rendering_device.h"
+
+GODOT_GCC_WARNING_PUSH
+GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_GCC_WARNING_IGNORE("-Wshadow")
+GODOT_GCC_WARNING_IGNORE("-Wswitch")
+GODOT_CLANG_WARNING_PUSH
+GODOT_CLANG_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
+GODOT_CLANG_WARNING_IGNORE("-Wswitch")
 
-GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
 #include <dxcapi.h>
+#include <dxgi1_6.h>
+
 GODOT_GCC_WARNING_POP
 GODOT_CLANG_WARNING_POP
 
-#include <dxgi1_6.h>
-
 #if !defined(_MSC_VER)
-#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
-
 #include <guiddef.h>
+
+#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif
 
 using Microsoft::WRL::ComPtr;
@@ -139,7 +152,7 @@ Error RenderingContextDriverD3D12::_initialize_debug_layers() {
 	return OK;
 }
 
-Error RenderingContextDriverD3D12::_create_dxgi_factory() {
+Error RenderingContextDriverD3D12::_initialize_devices() {
 	const UINT dxgi_factory_flags = use_validation_layers() ? DXGI_CREATE_FACTORY_DEBUG : 0;
 
 	typedef HRESULT(WINAPI * PFN_DXGI_CREATE_DXGI_FACTORY2)(UINT, REFIID, void **);
@@ -149,16 +162,6 @@ Error RenderingContextDriverD3D12::_create_dxgi_factory() {
 	HRESULT res = dxgi_CreateDXGIFactory2(dxgi_factory_flags, IID_PPV_ARGS(&dxgi_factory));
 	ERR_FAIL_COND_V(!SUCCEEDED(res), ERR_CANT_CREATE);
 
-	return OK;
-}
-
-Error RenderingContextDriverD3D12::_initialize_devices() {
-	// Create the initial DXGI factory.
-	Error err = _create_dxgi_factory();
-	ERR_FAIL_COND_V(err != OK, err);
-
-	HRESULT res;
-
 	// Enumerate all possible adapters.
 	LocalVector<IDXGIAdapter1 *> adapters;
 	IDXGIAdapter1 *adapter = nullptr;
@@ -266,63 +269,17 @@ void RenderingContextDriverD3D12::surface_set_size(SurfaceID p_surface, uint32_t
 	surface->needs_resize = true;
 }
 
-void RenderingContextDriverD3D12::surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) {
+void RenderingContextDriverD3D12::surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) {
 	Surface *surface = (Surface *)(p_surface);
 	surface->vsync_mode = p_vsync_mode;
 	surface->needs_resize = true;
 }
 
-DisplayServerEnums::VSyncMode RenderingContextDriverD3D12::surface_get_vsync_mode(SurfaceID p_surface) const {
+DisplayServer::VSyncMode RenderingContextDriverD3D12::surface_get_vsync_mode(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->vsync_mode;
 }
 
-void RenderingContextDriverD3D12::surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_output = p_enabled;
-	surface->needs_resize = true;
-}
-
-bool RenderingContextDriverD3D12::surface_get_hdr_output_enabled(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_output;
-}
-
-void RenderingContextDriverD3D12::surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_reference_luminance = p_reference_luminance;
-}
-
-float RenderingContextDriverD3D12::surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_reference_luminance;
-}
-
-void RenderingContextDriverD3D12::surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_max_luminance = p_max_luminance;
-}
-
-float RenderingContextDriverD3D12::surface_get_hdr_output_max_luminance(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_max_luminance;
-}
-
-void RenderingContextDriverD3D12::surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_linear_luminance_scale = p_linear_luminance_scale;
-}
-
-float RenderingContextDriverD3D12::surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_linear_luminance_scale;
-}
-
-float RenderingContextDriverD3D12::surface_get_hdr_output_max_value(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return MAX(surface->hdr_max_luminance / MAX(surface->hdr_reference_luminance, 1.0f), 1.0f);
-}
-
 uint32_t RenderingContextDriverD3D12::surface_get_width(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->width;
@@ -379,12 +336,7 @@ ID3D12DeviceFactory *RenderingContextDriverD3D12::device_factory_get() const {
 	return device_factory.Get();
 }
 
-IDXGIFactory2 *RenderingContextDriverD3D12::dxgi_factory_get() {
-	// Check if the factory is still current. It can become invalid if displays change
-	if (dxgi_factory && !dxgi_factory->IsCurrent()) {
-		dxgi_factory.Reset();
-		_create_dxgi_factory();
-	}
+IDXGIFactory2 *RenderingContextDriverD3D12::dxgi_factory_get() const {
 	return dxgi_factory.Get();
 }
 
diff --git a/engine/drivers/d3d12/rendering_context_driver_d3d12.h b/engine/drivers/d3d12/rendering_context_driver_d3d12.h
index 3892a1b2..cd856e43 100644
--- a/engine/drivers/d3d12/rendering_context_driver_d3d12.h
+++ b/engine/drivers/d3d12/rendering_context_driver_d3d12.h
@@ -30,11 +30,39 @@
 
 #pragma once
 
-#include "drivers/d3d12/rendering_device_driver_d3d12.h"
-#include "servers/display/display_server_enums.h"
+#include "core/os/mutex.h"
+#include "core/string/ustring.h"
+#include "core/templates/rid_owner.h"
+#include "rendering_device_driver_d3d12.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 
-#include <drivers/d3d12/godot_d3dx12.h>
+#if !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+// Match current version used by MinGW, MSVC and Direct3D 12 headers use 500.
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif // !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+
+GODOT_GCC_WARNING_PUSH
+GODOT_GCC_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_GCC_WARNING_IGNORE("-Wshadow")
+GODOT_GCC_WARNING_IGNORE("-Wswitch")
+GODOT_CLANG_WARNING_PUSH
+GODOT_CLANG_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_CLANG_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
+GODOT_CLANG_WARNING_IGNORE("-Wswitch")
+
+#include <thirdparty/directx_headers/include/directx/d3dx12.h>
+
+GODOT_GCC_WARNING_POP
+GODOT_CLANG_WARNING_POP
+
+#if defined(AS)
+#undef AS
+#endif
 
 #ifdef DCOMP_ENABLED
 #include <dcomp.h>
@@ -52,7 +80,6 @@ class RenderingContextDriverD3D12 : public RenderingContextDriver {
 
 	Error _init_device_factory();
 	Error _initialize_debug_layers();
-	Error _create_dxgi_factory();
 	Error _initialize_devices();
 
 public:
@@ -64,17 +91,8 @@ public:
 	virtual void driver_free(RenderingDeviceDriver *p_driver) override;
 	virtual SurfaceID surface_create(const void *p_platform_data) override;
 	virtual void surface_set_size(SurfaceID p_surface, uint32_t p_width, uint32_t p_height) override;
-	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) override;
-	virtual DisplayServerEnums::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) override;
-	virtual bool surface_get_hdr_output_enabled(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) override;
-	virtual float surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) override;
-	virtual float surface_get_hdr_output_max_luminance(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) override;
-	virtual float surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const override;
-	virtual float surface_get_hdr_output_max_value(SurfaceID p_surface) const override;
+	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) override;
+	virtual DisplayServer::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const override;
 	virtual uint32_t surface_get_width(SurfaceID p_surface) const override;
 	virtual uint32_t surface_get_height(SurfaceID p_surface) const override;
 	virtual void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) override;
@@ -92,17 +110,8 @@ public:
 		HWND hwnd = nullptr;
 		uint32_t width = 0;
 		uint32_t height = 0;
-		DisplayServerEnums::VSyncMode vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
+		DisplayServer::VSyncMode vsync_mode = DisplayServer::VSYNC_ENABLED;
 		bool needs_resize = false;
-
-		bool hdr_output = false;
-		// BT.2408 recommendation of 203 nits for HDR Reference White, rounded to 200
-		// to be a more pleasant player-facing value. This value is used by Steam
-		// Deck and other Windows emulation that does not provide an SDRWhiteLevel.
-		float hdr_reference_luminance = 200.0f;
-		float hdr_max_luminance = 1000.0f;
-		float hdr_linear_luminance_scale = 80.0f;
-
 #ifdef DCOMP_ENABLED
 		Microsoft::WRL::ComPtr<IDCompositionDevice> composition_device;
 		Microsoft::WRL::ComPtr<IDCompositionTarget> composition_target;
@@ -118,7 +127,7 @@ public:
 
 	IDXGIAdapter1 *create_adapter(uint32_t p_adapter_index) const;
 	ID3D12DeviceFactory *device_factory_get() const;
-	IDXGIFactory2 *dxgi_factory_get();
+	IDXGIFactory2 *dxgi_factory_get() const;
 	bool get_tearing_supported() const;
 	bool use_validation_layers() const;
 
diff --git a/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp b/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
index ad2ba1e3..b5244ad1 100644
--- a/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
+++ b/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
@@ -30,20 +30,53 @@
 
 #include "rendering_device_driver_d3d12.h"
 
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
-#include "drivers/d3d12/d3d12_hooks.h"
-#include "drivers/d3d12/rendering_context_driver_d3d12.h"
+#include "d3d12_hooks.h"
+
+#include "core/config/project_settings.h"
+#include "core/io/marshalls.h"
+#include "servers/rendering/rendering_device.h"
+#include "thirdparty/zlib/zlib.h"
+
+#include "d3d12_godot_nir_bridge.h"
+#include "rendering_context_driver_d3d12.h"
+
+GODOT_GCC_WARNING_PUSH
+GODOT_GCC_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_GCC_WARNING_IGNORE("-Wlogical-not-parentheses")
+GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_GCC_WARNING_IGNORE("-Wshadow")
+GODOT_GCC_WARNING_IGNORE("-Wswitch")
+GODOT_CLANG_WARNING_PUSH
+GODOT_CLANG_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_CLANG_WARNING_IGNORE("-Wlogical-not-parentheses")
+GODOT_CLANG_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
+GODOT_CLANG_WARNING_IGNORE("-Wswitch")
+GODOT_MSVC_WARNING_PUSH
+GODOT_MSVC_WARNING_IGNORE(4200) // "nonstandard extension used: zero-sized array in struct/union".
+GODOT_MSVC_WARNING_IGNORE(4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
 
-#include <drivers/d3d12/godot_d3d12ma.h>
-#include <drivers/d3d12/godot_nir.h>
 #include <dxgi1_6.h>
+#define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
+#include <thirdparty/d3d12ma/D3D12MemAlloc.h>
+
+#include <nir_spirv.h>
+#include <nir_to_dxil.h>
+#include <spirv_to_dxil.h>
+extern "C" {
+#include <dxil_spirv_nir.h>
+}
+
+GODOT_GCC_WARNING_POP
+GODOT_CLANG_WARNING_POP
+GODOT_MSVC_WARNING_POP
 
 #if !defined(_MSC_VER)
-#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
-
 #include <guiddef.h>
+
+#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif
 
 using Microsoft::WRL::ComPtr;
@@ -318,11 +351,6 @@ const RenderingDeviceDriverD3D12::D3D12Format RenderingDeviceDriverD3D12::RD_TO_
 	/* DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK */ {},
 };
 
-const DXGI_COLOR_SPACE_TYPE RenderingDeviceDriverD3D12::RD_TO_DXGI_COLOR_SPACE_TYPE[RDD::COLOR_SPACE_MAX]{
-	/* COLOR_SPACE_REC709_LINEAR */ DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709,
-	/* COLOR_SPACE_REC709_NONLINEAR_SRGB */ DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709,
-};
-
 static D3D12_CPU_DESCRIPTOR_HANDLE get_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE p_handle, uint64_t p_index, uint32_t p_increment_size) {
 	p_handle.ptr += p_index * p_increment_size;
 	return p_handle;
@@ -442,7 +470,7 @@ void RenderingDeviceDriverD3D12::CPUDescriptorHeapPool::free(const Allocation &p
 	}
 }
 
-static const D3D12_COMPARISON_FUNC RD_TO_D3D12_COMPARE_OP[RDD::COMPARE_OP_MAX] = {
+static const D3D12_COMPARISON_FUNC RD_TO_D3D12_COMPARE_OP[RD::COMPARE_OP_MAX] = {
 	D3D12_COMPARISON_FUNC_NEVER,
 	D3D12_COMPARISON_FUNC_LESS,
 	D3D12_COMPARISON_FUNC_EQUAL,
@@ -456,8 +484,8 @@ static const D3D12_COMPARISON_FUNC RD_TO_D3D12_COMPARE_OP[RDD::COMPARE_OP_MAX] =
 uint32_t RenderingDeviceDriverD3D12::SubgroupCapabilities::supported_stages_flags_rd() const {
 	// If there's a way to check exactly which are supported, I have yet to find it.
 	return (
-			RenderingDeviceCommons::ShaderStage::SHADER_STAGE_FRAGMENT_BIT |
-			RenderingDeviceCommons::ShaderStage::SHADER_STAGE_COMPUTE_BIT);
+			RenderingDevice::ShaderStage::SHADER_STAGE_FRAGMENT_BIT |
+			RenderingDevice::ShaderStage::SHADER_STAGE_COMPUTE_BIT);
 }
 
 uint32_t RenderingDeviceDriverD3D12::SubgroupCapabilities::supported_operations_flags_rd() const {
@@ -465,14 +493,14 @@ uint32_t RenderingDeviceDriverD3D12::SubgroupCapabilities::supported_operations_
 		return 0;
 	} else {
 		return (
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_BASIC_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_BALLOT_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_VOTE_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_SHUFFLE_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_SHUFFLE_RELATIVE_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_QUAD_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_ARITHMETIC_BIT |
-				RenderingDeviceCommons::SubgroupOperations::SUBGROUP_CLUSTERED_BIT);
+				RenderingDevice::SubgroupOperations::SUBGROUP_BASIC_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_BALLOT_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_VOTE_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_SHUFFLE_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_SHUFFLE_RELATIVE_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_QUAD_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_ARITHMETIC_BIT |
+				RenderingDevice::SubgroupOperations::SUBGROUP_CLUSTERED_BIT);
 	}
 }
 
@@ -542,7 +570,7 @@ void RenderingDeviceDriverD3D12::_debug_message_func(D3D12_MESSAGE_CATEGORY p_ca
 /**** RESOURCE ****/
 /******************/
 
-static const D3D12_RESOURCE_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_RESOURCE_DIMENSION[RDD::TEXTURE_TYPE_MAX] = {
+static const D3D12_RESOURCE_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_RESOURCE_DIMENSION[RD::TEXTURE_TYPE_MAX] = {
 	D3D12_RESOURCE_DIMENSION_TEXTURE1D,
 	D3D12_RESOURCE_DIMENSION_TEXTURE2D,
 	D3D12_RESOURCE_DIMENSION_TEXTURE3D,
@@ -1042,7 +1070,7 @@ uint64_t RenderingDeviceDriverD3D12::buffer_get_device_address(BufferID p_buffer
 /**** TEXTURE ****/
 /*****************/
 
-static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV[RDD::TEXTURE_TYPE_MAX] = {
+static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV[RD::TEXTURE_TYPE_MAX] = {
 	D3D12_SRV_DIMENSION_TEXTURE1D,
 	D3D12_SRV_DIMENSION_TEXTURE2D,
 	D3D12_SRV_DIMENSION_TEXTURE3D,
@@ -1052,7 +1080,7 @@ static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV
 	D3D12_SRV_DIMENSION_TEXTURECUBEARRAY,
 };
 
-static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV_MS[RDD::TEXTURE_TYPE_MAX] = {
+static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV_MS[RD::TEXTURE_TYPE_MAX] = {
 	D3D12_SRV_DIMENSION_UNKNOWN,
 	D3D12_SRV_DIMENSION_TEXTURE2DMS,
 	D3D12_SRV_DIMENSION_UNKNOWN,
@@ -1062,7 +1090,7 @@ static const D3D12_SRV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_SRV
 	D3D12_SRV_DIMENSION_UNKNOWN,
 };
 
-static const D3D12_UAV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_UAV[RDD::TEXTURE_TYPE_MAX] = {
+static const D3D12_UAV_DIMENSION RD_TEXTURE_TYPE_TO_D3D12_VIEW_DIMENSION_FOR_UAV[RD::TEXTURE_TYPE_MAX] = {
 	D3D12_UAV_DIMENSION_TEXTURE1D,
 	D3D12_UAV_DIMENSION_TEXTURE2D,
 	D3D12_UAV_DIMENSION_TEXTURE3D,
@@ -1087,7 +1115,7 @@ uint32_t RenderingDeviceDriverD3D12::_find_max_common_supported_sample_count(Vec
 				msql.SampleCount = (UINT)samples;
 				HRESULT res = device->CheckFeatureSupport(D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, &msql, sizeof(msql));
 				if (SUCCEEDED(res) && msql.NumQualityLevels) {
-					int bit = Math::get_shift_from_power_of_2((uint32_t)samples);
+					int bit = get_shift_from_power_of_2((uint32_t)samples);
 					ERR_FAIL_COND_V(bit == -1, 1);
 					mask |= (uint32_t)(1 << bit);
 				}
@@ -1099,7 +1127,7 @@ uint32_t RenderingDeviceDriverD3D12::_find_max_common_supported_sample_count(Vec
 	if (common == UINT32_MAX) {
 		return 1;
 	} else {
-		return ((uint32_t)1 << Math::nearest_shift(common));
+		return ((uint32_t)1 << nearest_shift(common));
 	}
 }
 
@@ -2271,8 +2299,7 @@ void RenderingDeviceDriverD3D12::command_pipeline_barrier(CommandBufferID p_cmd_
 		BitField<PipelineStageBits> p_dst_stages,
 		VectorView<RDD::MemoryAccessBarrier> p_memory_barriers,
 		VectorView<RDD::BufferBarrier> p_buffer_barriers,
-		VectorView<RDD::TextureBarrier> p_texture_barriers,
-		VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) {
+		VectorView<RDD::TextureBarrier> p_texture_barriers) {
 	if (!barrier_capabilities.enhanced_barriers_supported) {
 		// Enhanced barriers are a requirement for this function.
 		return;
@@ -2283,6 +2310,12 @@ void RenderingDeviceDriverD3D12::command_pipeline_barrier(CommandBufferID p_cmd_
 		return;
 	}
 
+	// The command list must support the required interface.
+	const CommandBufferInfo *cmd_buf_info = (const CommandBufferInfo *)(p_cmd_buffer.id);
+	ComPtr<ID3D12GraphicsCommandList7> cmd_list_7;
+	HRESULT res = cmd_buf_info->cmd_list->QueryInterface(cmd_list_7.GetAddressOf());
+	ERR_FAIL_COND(FAILED(res));
+
 	// Convert the RDD barriers to D3D12 enhanced barriers.
 	thread_local LocalVector<D3D12_GLOBAL_BARRIER> global_barriers;
 	thread_local LocalVector<D3D12_BUFFER_BARRIER> buffer_barriers;
@@ -2372,8 +2405,7 @@ void RenderingDeviceDriverD3D12::command_pipeline_barrier(CommandBufferID p_cmd_
 	}
 
 	if (barrier_groups_count) {
-		const CommandBufferInfo *cmd_buf_info = (const CommandBufferInfo *)(p_cmd_buffer.id);
-		cmd_buf_info->cmd_list_7->Barrier(barrier_groups_count, barrier_groups);
+		cmd_list_7->Barrier(barrier_groups_count, barrier_groups);
 	}
 }
 
@@ -2541,9 +2573,6 @@ void RenderingDeviceDriverD3D12::command_pool_free(CommandPoolID p_cmd_pool) {
 		cmd_buf_elem = cmd_buf_elem->next();
 
 		cmd_buf_info->cmd_list.Reset();
-		cmd_buf_info->cmd_list_1.Reset();
-		cmd_buf_info->cmd_list_5.Reset();
-		cmd_buf_info->cmd_list_7.Reset();
 		cmd_buf_info->cmd_allocator.Reset();
 
 		resource_descriptor_heap_pool.free(cmd_buf_info->uav_alloc);
@@ -2619,10 +2648,6 @@ RDD::CommandBufferID RenderingDeviceDriverD3D12::command_buffer_create(CommandPo
 	cmd_buf_info->cmd_allocator = cmd_allocator;
 	cmd_buf_info->cmd_list = cmd_list;
 
-	cmd_list->QueryInterface(cmd_buf_info->cmd_list_1.GetAddressOf());
-	cmd_list->QueryInterface(cmd_buf_info->cmd_list_5.GetAddressOf());
-	cmd_list->QueryInterface(cmd_buf_info->cmd_list_7.GetAddressOf());
-
 	cmd_buf_info->uav_alloc = uav_alloc;
 	cmd_buf_info->rtv_alloc = rtv_alloc;
 	cmd_buf_info->dsv_alloc = dsv_alloc;
@@ -2660,7 +2685,6 @@ void RenderingDeviceDriverD3D12::command_buffer_end(CommandBufferID p_cmd_buffer
 	cmd_buf_info->graphics_root_signature_crc = 0;
 	cmd_buf_info->compute_pso = nullptr;
 	cmd_buf_info->compute_root_signature_crc = 0;
-	cmd_buf_info->pending_dyn_params = true;
 	cmd_buf_info->descriptor_heaps_set = false;
 }
 
@@ -2679,11 +2703,6 @@ void RenderingDeviceDriverD3D12::command_buffer_execute_secondary(CommandBufferI
 void RenderingDeviceDriverD3D12::_swap_chain_release(SwapChain *p_swap_chain) {
 	_swap_chain_release_buffers(p_swap_chain);
 
-	if (p_swap_chain->render_pass.id != 0) {
-		render_pass_free(p_swap_chain->render_pass);
-		p_swap_chain->render_pass = RenderPassID();
-	}
-
 	p_swap_chain->d3d_swap_chain.Reset();
 }
 
@@ -2702,10 +2721,10 @@ void RenderingDeviceDriverD3D12::_swap_chain_release_buffers(SwapChain *p_swap_c
 	p_swap_chain->framebuffers.clear();
 }
 
-RDD::RenderPassID RenderingDeviceDriverD3D12::_swap_chain_create_render_pass(RDD::DataFormat p_format) {
+RDD::SwapChainID RenderingDeviceDriverD3D12::swap_chain_create(RenderingContextDriver::SurfaceID p_surface) {
 	// Create the render pass that will be used to draw to the swap chain's framebuffers.
 	RDD::Attachment attachment;
-	attachment.format = p_format;
+	attachment.format = DATA_FORMAT_R8G8B8A8_UNORM;
 	attachment.samples = RDD::TEXTURE_SAMPLES_1;
 	attachment.load_op = RDD::ATTACHMENT_LOAD_OP_CLEAR;
 	attachment.store_op = RDD::ATTACHMENT_STORE_OP_STORE;
@@ -2716,30 +2735,14 @@ RDD::RenderPassID RenderingDeviceDriverD3D12::_swap_chain_create_render_pass(RDD
 	color_ref.aspect.set_flag(RDD::TEXTURE_ASPECT_COLOR_BIT);
 	subpass.color_references.push_back(color_ref);
 
-	return render_pass_create(attachment, subpass, {}, 1, AttachmentReference());
-}
+	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1, AttachmentReference());
+	ERR_FAIL_COND_V(!render_pass, SwapChainID());
 
-void RenderingDeviceDriverD3D12::_determine_swap_chain_format(SwapChain *p_swap_chain, DataFormat &r_format, ColorSpace &r_color_space) {
-	DEV_ASSERT(p_swap_chain);
-	DEV_ASSERT(p_swap_chain->surface != 0);
-
-	// Direct3D Hardware level 10 mandates support for all these formats.
-	// Godot requires at least Hardware level 11, so these formats are guaranteed to be supported.
-	if (context_driver->surface_get_hdr_output_enabled(p_swap_chain->surface)) {
-		r_format = DATA_FORMAT_R16G16B16A16_SFLOAT;
-		r_color_space = COLOR_SPACE_REC709_LINEAR;
-	} else {
-		r_format = DATA_FORMAT_R8G8B8A8_UNORM;
-		r_color_space = COLOR_SPACE_REC709_NONLINEAR_SRGB;
-	}
-}
-
-RDD::SwapChainID RenderingDeviceDriverD3D12::swap_chain_create(RenderingContextDriver::SurfaceID p_surface) {
-	DEV_ASSERT(p_surface != 0);
-
-	// Create an empty swap chain until it is resized.
+	// Create the empty swap chain until it is resized.
 	SwapChain *swap_chain = memnew(SwapChain);
 	swap_chain->surface = p_surface;
+	swap_chain->data_format = attachment.format;
+	swap_chain->render_pass = render_pass;
 	return SwapChainID(swap_chain);
 }
 
@@ -2761,37 +2764,31 @@ Error RenderingDeviceDriverD3D12::swap_chain_resize(CommandQueueID p_cmd_queue,
 	UINT present_flags = 0;
 	UINT creation_flags = 0;
 	switch (surface->vsync_mode) {
-		case DisplayServerEnums::VSYNC_MAILBOX: {
+		case DisplayServer::VSYNC_MAILBOX: {
 			sync_interval = 1;
 			present_flags = DXGI_PRESENT_RESTART;
 		} break;
-		case DisplayServerEnums::VSYNC_ENABLED: {
+		case DisplayServer::VSYNC_ENABLED: {
 			sync_interval = 1;
 			present_flags = 0;
 		} break;
-		case DisplayServerEnums::VSYNC_DISABLED: {
+		case DisplayServer::VSYNC_DISABLED: {
 			sync_interval = 0;
 			present_flags = is_tearing_supported ? DXGI_PRESENT_ALLOW_TEARING : 0;
 			creation_flags = is_tearing_supported ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0;
 		} break;
-		case DisplayServerEnums::VSYNC_ADAPTIVE: // Unsupported.
+		case DisplayServer::VSYNC_ADAPTIVE: // Unsupported.
 		default:
 			sync_interval = 1;
 			present_flags = 0;
 			break;
 	}
 
-	RDD::DataFormat new_data_format;
-	RDD::ColorSpace new_color_space;
-	_determine_swap_chain_format(swap_chain, new_data_format, new_color_space);
-
-	if (swap_chain->d3d_swap_chain != nullptr && (creation_flags != swap_chain->creation_flags || new_data_format != swap_chain->data_format)) {
-		// The swap chain must be recreated if the creation flags or data format are different.
+	if (swap_chain->d3d_swap_chain != nullptr && creation_flags != swap_chain->creation_flags) {
+		// The swap chain must be recreated if the creation flags are different.
 		_swap_chain_release(swap_chain);
 	}
 
-	swap_chain->data_format = new_data_format;
-
 #ifdef DCOMP_ENABLED
 	bool create_for_composition = OS::get_singleton()->is_layered_allowed();
 #else
@@ -2807,10 +2804,6 @@ Error RenderingDeviceDriverD3D12::swap_chain_resize(CommandQueueID p_cmd_queue,
 		res = swap_chain->d3d_swap_chain->ResizeBuffers(p_desired_framebuffer_count, surface->width, surface->height, DXGI_FORMAT_UNKNOWN, creation_flags);
 		ERR_FAIL_COND_V(!SUCCEEDED(res), ERR_UNAVAILABLE);
 	} else {
-		DEV_ASSERT(swap_chain->render_pass.id == 0);
-		swap_chain->render_pass = _swap_chain_create_render_pass(new_data_format);
-		ERR_FAIL_COND_V(!swap_chain->render_pass, ERR_CANT_CREATE);
-
 		swap_chain_desc.BufferCount = p_desired_framebuffer_count;
 		swap_chain_desc.Format = RD_TO_D3D12_FORMAT[swap_chain->data_format].general_format;
 		swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
@@ -2852,13 +2845,6 @@ Error RenderingDeviceDriverD3D12::swap_chain_resize(CommandQueueID p_cmd_queue,
 		ERR_FAIL_COND_V(!SUCCEEDED(res), ERR_CANT_CREATE);
 	}
 
-	if (swap_chain->color_space != new_color_space) {
-		res = swap_chain->d3d_swap_chain->SetColorSpace1(RD_TO_DXGI_COLOR_SPACE_TYPE[new_color_space]);
-		ERR_FAIL_COND_V(!SUCCEEDED(res), ERR_CANT_CREATE);
-
-		swap_chain->color_space = new_color_space;
-	}
-
 #ifdef DCOMP_ENABLED
 	if (create_for_composition) {
 		if (surface->composition_device.Get() == nullptr) {
@@ -2972,14 +2958,10 @@ RDD::DataFormat RenderingDeviceDriverD3D12::swap_chain_get_format(SwapChainID p_
 	return swap_chain->data_format;
 }
 
-RDD::ColorSpace RenderingDeviceDriverD3D12::swap_chain_get_color_space(SwapChainID p_swap_chain) {
-	const SwapChain *swap_chain = (const SwapChain *)(p_swap_chain.id);
-	return swap_chain->color_space;
-}
-
 void RenderingDeviceDriverD3D12::swap_chain_free(SwapChainID p_swap_chain) {
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
 	_swap_chain_release(swap_chain);
+	render_pass_free(swap_chain->render_pass);
 	memdelete(swap_chain);
 }
 
@@ -3277,7 +3259,7 @@ RDD::ShaderID RenderingDeviceDriverD3D12::shader_create_from_container(const Ref
 
 	shader_info_in.spirv_specialization_constants_ids_mask = shader_refl_d3d12.spirv_specialization_constants_ids_mask;
 	shader_info_in.nir_runtime_data_root_param_idx = shader_refl_d3d12.nir_runtime_data_root_param_idx;
-	shader_info_in.pipeline_type = shader_refl.pipeline_type;
+	shader_info_in.is_compute = shader_refl.is_compute;
 
 	shader_info_in.sets.resize(shader_refl.uniform_sets.size());
 	for (uint32_t i = 0; i < shader_info_in.sets.size(); i++) {
@@ -4004,11 +3986,18 @@ void RenderingDeviceDriverD3D12::command_clear_color_texture(CommandBufferID p_c
 					cmd_buf_info->uav_alloc.cpu_handle,
 					D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
 
-			cmd_buf_info->cmd_list->ClearUnorderedAccessViewFloat(
+			UINT values[4] = {
+				(UINT)p_color.get_r8(),
+				(UINT)p_color.get_g8(),
+				(UINT)p_color.get_b8(),
+				(UINT)p_color.get_a8(),
+			};
+
+			cmd_buf_info->cmd_list->ClearUnorderedAccessViewUint(
 					shader_visible_descriptor_allocation.gpu_handle,
 					cmd_buf_info->uav_alloc.cpu_handle,
 					tex_info->resource,
-					p_color.components,
+					values,
 					0,
 					nullptr);
 		}
@@ -4204,14 +4193,10 @@ void RenderingDeviceDriverD3D12::command_bind_push_constants(CommandBufferID p_c
 	if (!shader_info_in->dxil_push_constant_size) {
 		return;
 	}
-	if (shader_info_in->pipeline_type == PIPELINE_TYPE_COMPUTE) {
+	if (shader_info_in->is_compute) {
 		cmd_buf_info->cmd_list->SetComputeRoot32BitConstants(0, p_data.size(), p_data.ptr(), p_dst_first_index);
-	} else if (shader_info_in->pipeline_type == PIPELINE_TYPE_RASTERIZATION) {
-		cmd_buf_info->cmd_list->SetGraphicsRoot32BitConstants(0, p_data.size(), p_data.ptr(), p_dst_first_index);
-	} else if (shader_info_in->pipeline_type == PIPELINE_TYPE_RAYTRACING) {
-		ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
 	} else {
-		ERR_FAIL_MSG("This pipeline type is not currently supported by the D3D12 driver.");
+		cmd_buf_info->cmd_list->SetGraphicsRoot32BitConstants(0, p_data.size(), p_data.ptr(), p_dst_first_index);
 	}
 }
 
@@ -4351,11 +4336,15 @@ void RenderingDeviceDriverD3D12::command_begin_render_pass(CommandBufferID p_cmd
 	}
 
 	if (fb_info->vrs_attachment && fsr_capabilities.attachment_supported) {
-		static const D3D12_SHADING_RATE_COMBINER COMBINERS[D3D12_RS_SET_SHADING_RATE_COMBINER_COUNT] = {
-			D3D12_SHADING_RATE_COMBINER_PASSTHROUGH,
-			D3D12_SHADING_RATE_COMBINER_OVERRIDE,
-		};
-		cmd_buf_info->cmd_list_5->RSSetShadingRate(D3D12_SHADING_RATE_1X1, COMBINERS);
+		ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
+		cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
+		if (cmd_list_5) {
+			static const D3D12_SHADING_RATE_COMBINER COMBINERS[D3D12_RS_SET_SHADING_RATE_COMBINER_COUNT] = {
+				D3D12_SHADING_RATE_COMBINER_PASSTHROUGH,
+				D3D12_SHADING_RATE_COMBINER_OVERRIDE,
+			};
+			cmd_list_5->RSSetShadingRate(D3D12_SHADING_RATE_1X1, COMBINERS);
+		}
 	}
 
 	cmd_buf_info->render_pass_state.current_subpass = UINT32_MAX;
@@ -4479,7 +4468,7 @@ void RenderingDeviceDriverD3D12::_render_pass_enhanced_barriers_flush(CommandBuf
 	}
 
 	if (!texture_barriers.is_empty()) {
-		command_pipeline_barrier(p_cmd_buffer, src_stages, dst_stages, VectorView<MemoryAccessBarrier>(), VectorView<BufferBarrier>(), texture_barriers, VectorView<AccelerationStructureBarrier>());
+		command_pipeline_barrier(p_cmd_buffer, src_stages, dst_stages, VectorView<MemoryAccessBarrier>(), VectorView<BufferBarrier>(), texture_barriers);
 	}
 }
 
@@ -4567,8 +4556,12 @@ void RenderingDeviceDriverD3D12::command_end_render_pass(CommandBufferID p_cmd_b
 	const FramebufferInfo *fb_info = cmd_buf_info->render_pass_state.fb_info;
 	const RenderPassInfo *pass_info = cmd_buf_info->render_pass_state.pass_info;
 
-	if (fb_info->vrs_attachment && fsr_capabilities.attachment_supported) {
-		cmd_buf_info->cmd_list_5->RSSetShadingRateImage(nullptr);
+	if (fsr_capabilities.attachment_supported) {
+		ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
+		cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
+		if (cmd_list_5) {
+			cmd_list_5->RSSetShadingRateImage(nullptr);
+		}
 	}
 
 	auto _transition_subresources = [&](TextureInfo *p_texture_info, D3D12_RESOURCE_STATES p_states) {
@@ -4784,46 +4777,37 @@ void RenderingDeviceDriverD3D12::command_render_clear_attachments(CommandBufferI
 
 void RenderingDeviceDriverD3D12::command_bind_render_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
 	CommandBufferInfo *cmd_buf_info = (CommandBufferInfo *)p_cmd_buffer.id;
-
 	const PipelineInfo *pipeline_info = (const PipelineInfo *)p_pipeline.id;
+
+	if (cmd_buf_info->graphics_pso == pipeline_info->pso.Get()) {
+		return;
+	}
+
 	const ShaderInfo *shader_info_in = pipeline_info->shader_info;
 	const RenderPipelineInfo &render_info = pipeline_info->render_info;
 
-	if (cmd_buf_info->graphics_pso != pipeline_info->pso.Get()) {
-		cmd_buf_info->cmd_list->SetPipelineState(pipeline_info->pso.Get());
-
-		cmd_buf_info->graphics_pso = pipeline_info->pso.Get();
-		cmd_buf_info->compute_pso = nullptr;
-	}
-
+	cmd_buf_info->cmd_list->SetPipelineState(pipeline_info->pso.Get());
 	if (cmd_buf_info->graphics_root_signature_crc != shader_info_in->root_signature_crc) {
 		cmd_buf_info->cmd_list->SetGraphicsRootSignature(shader_info_in->root_signature.Get());
 		cmd_buf_info->graphics_root_signature_crc = shader_info_in->root_signature_crc;
 	}
 
-	if (cmd_buf_info->pending_dyn_params || (cmd_buf_info->dyn_params.primitive_topology != render_info.dyn_params.primitive_topology)) {
-		cmd_buf_info->cmd_list->IASetPrimitiveTopology(render_info.dyn_params.primitive_topology);
-		cmd_buf_info->dyn_params.primitive_topology = render_info.dyn_params.primitive_topology;
+	cmd_buf_info->cmd_list->IASetPrimitiveTopology(render_info.dyn_params.primitive_topology);
+	cmd_buf_info->cmd_list->OMSetBlendFactor(render_info.dyn_params.blend_constant.components);
+	cmd_buf_info->cmd_list->OMSetStencilRef(render_info.dyn_params.stencil_reference);
+
+	if (misc_features_support.depth_bounds_supported) {
+		ComPtr<ID3D12GraphicsCommandList1> command_list_1;
+		cmd_buf_info->cmd_list->QueryInterface(command_list_1.GetAddressOf());
+		if (command_list_1) {
+			command_list_1->OMSetDepthBounds(render_info.dyn_params.depth_bounds_min, render_info.dyn_params.depth_bounds_max);
+		}
 	}
 
-	if (cmd_buf_info->pending_dyn_params || (cmd_buf_info->dyn_params.blend_constant != render_info.dyn_params.blend_constant)) {
-		cmd_buf_info->cmd_list->OMSetBlendFactor(render_info.dyn_params.blend_constant.components);
-		cmd_buf_info->dyn_params.blend_constant = render_info.dyn_params.blend_constant;
-	}
-
-	if (cmd_buf_info->pending_dyn_params || (cmd_buf_info->dyn_params.stencil_reference != render_info.dyn_params.stencil_reference)) {
-		cmd_buf_info->cmd_list->OMSetStencilRef(render_info.dyn_params.stencil_reference);
-		cmd_buf_info->dyn_params.stencil_reference = render_info.dyn_params.stencil_reference;
-	}
-
-	if (misc_features_support.depth_bounds_supported && (cmd_buf_info->pending_dyn_params || (cmd_buf_info->dyn_params.depth_bounds_min != render_info.dyn_params.depth_bounds_min) || (cmd_buf_info->dyn_params.depth_bounds_max != render_info.dyn_params.depth_bounds_max))) {
-		cmd_buf_info->cmd_list_1->OMSetDepthBounds(render_info.dyn_params.depth_bounds_min, render_info.dyn_params.depth_bounds_max);
-		cmd_buf_info->dyn_params.depth_bounds_min = render_info.dyn_params.depth_bounds_min;
-		cmd_buf_info->dyn_params.depth_bounds_max = render_info.dyn_params.depth_bounds_max;
-	}
-
-	cmd_buf_info->pending_dyn_params = false;
 	cmd_buf_info->render_pass_state.vf_info = render_info.vf_info;
+
+	cmd_buf_info->graphics_pso = pipeline_info->pso.Get();
+	cmd_buf_info->compute_pso = nullptr;
 }
 
 void RenderingDeviceDriverD3D12::command_bind_render_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
@@ -5367,21 +5351,21 @@ RDD::PipelineID RenderingDeviceDriverD3D12::render_pipeline_create(
 
 void RenderingDeviceDriverD3D12::command_bind_compute_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
 	CommandBufferInfo *cmd_buf_info = (CommandBufferInfo *)p_cmd_buffer.id;
-
 	const PipelineInfo *pipeline_info = (const PipelineInfo *)p_pipeline.id;
-	const ShaderInfo *shader_info_in = pipeline_info->shader_info;
 
-	if (cmd_buf_info->compute_pso != pipeline_info->pso.Get()) {
-		cmd_buf_info->cmd_list->SetPipelineState(pipeline_info->pso.Get());
-
-		cmd_buf_info->compute_pso = pipeline_info->pso.Get();
-		cmd_buf_info->graphics_pso = nullptr;
+	if (cmd_buf_info->compute_pso == pipeline_info->pso.Get()) {
+		return;
 	}
 
+	const ShaderInfo *shader_info_in = pipeline_info->shader_info;
+	cmd_buf_info->cmd_list->SetPipelineState(pipeline_info->pso.Get());
 	if (cmd_buf_info->compute_root_signature_crc != shader_info_in->root_signature_crc) {
 		cmd_buf_info->cmd_list->SetComputeRootSignature(shader_info_in->root_signature.Get());
 		cmd_buf_info->compute_root_signature_crc = shader_info_in->root_signature_crc;
 	}
+
+	cmd_buf_info->compute_pso = pipeline_info->pso.Get();
+	cmd_buf_info->graphics_pso = nullptr;
 }
 
 void RenderingDeviceDriverD3D12::command_bind_compute_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
@@ -5488,64 +5472,6 @@ RDD::PipelineID RenderingDeviceDriverD3D12::compute_pipeline_create(ShaderID p_s
 	return PipelineID(pipeline_info);
 }
 
-/********************/
-/**** RAYTRACING ****/
-/********************/
-
-// ---- ACCELERATION STRUCTURES ----
-
-RDD::AccelerationStructureID RenderingDeviceDriverD3D12::blas_create(VectorView<AccelerationStructureGeometry> p_geometries) {
-	ERR_FAIL_V_MSG(AccelerationStructureID(), "Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-uint32_t RenderingDeviceDriverD3D12::tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) {
-	ERR_FAIL_V_MSG(0, "Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-RDD::AccelerationStructureID RenderingDeviceDriverD3D12::tlas_create(BufferID p_instance_buffer) {
-	ERR_FAIL_V_MSG(AccelerationStructureID(), "Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::acceleration_structure_free(AccelerationStructureID p_acceleration_structure) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-uint32_t RenderingDeviceDriverD3D12::acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) {
-	ERR_FAIL_V_MSG(0, "Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-// ----- PIPELINE -----
-
-RDD::RaytracingPipelineID RenderingDeviceDriverD3D12::raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) {
-	ERR_FAIL_V_MSG(RaytracingPipelineID(), "Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::raytracing_pipeline_free(RDD::RaytracingPipelineID p_pipeline) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-// ----- COMMANDS -----
-
-void RenderingDeviceDriverD3D12::command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
-void RenderingDeviceDriverD3D12::command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the D3D12 driver.");
-}
-
 /*****************/
 /**** QUERIES ****/
 /*****************/
@@ -5760,11 +5686,9 @@ uint64_t RenderingDeviceDriverD3D12::get_resource_native_handle(DriverResource p
 }
 
 uint64_t RenderingDeviceDriverD3D12::get_total_memory_used() {
-	D3D12MA::Budget local_budget;
-	D3D12MA::Budget non_local_budget;
-	allocator->GetBudget(&local_budget, &non_local_budget);
-
-	return local_budget.Stats.AllocationBytes + non_local_budget.Stats.AllocationBytes;
+	D3D12MA::TotalStatistics stats;
+	allocator->CalculateStatistics(&stats);
+	return stats.Total.Stats.BlockBytes;
 }
 
 uint64_t RenderingDeviceDriverD3D12::get_lazily_memory_used() {
@@ -5867,8 +5791,6 @@ bool RenderingDeviceDriverD3D12::has_feature(Features p_feature) {
 			return false;
 		case SUPPORTS_POINT_SIZE:
 			return false;
-		case SUPPORTS_HDR_OUTPUT:
-			return true;
 		default:
 			return false;
 	}
@@ -6286,7 +6208,7 @@ Error RenderingDeviceDriverD3D12::_initialize_allocator() {
 	D3D12MA::ALLOCATOR_DESC allocator_desc = {};
 	allocator_desc.pDevice = device.Get();
 	allocator_desc.pAdapter = adapter.Get();
-	allocator_desc.Flags = D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS | D3D12MA::ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED;
+	allocator_desc.Flags = D3D12MA::ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED | D3D12MA::ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED;
 
 	HRESULT res = D3D12MA::CreateAllocator(&allocator_desc, &allocator);
 	ERR_FAIL_COND_V_MSG(!SUCCEEDED(res), ERR_CANT_CREATE, "D3D12MA::CreateAllocator failed with error " + vformat("0x%08ux", (uint64_t)res) + ".");
diff --git a/engine/drivers/d3d12/rendering_device_driver_d3d12.h b/engine/drivers/d3d12/rendering_device_driver_d3d12.h
index 42bf7132..f8b113c2 100644
--- a/engine/drivers/d3d12/rendering_device_driver_d3d12.h
+++ b/engine/drivers/d3d12/rendering_device_driver_d3d12.h
@@ -35,10 +35,32 @@
 #include "core/templates/paged_allocator.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/self_list.h"
-#include "drivers/d3d12/rendering_shader_container_d3d12.h"
+#include "rendering_shader_container_d3d12.h"
 #include "servers/rendering/rendering_device_driver.h"
 
-#include <drivers/d3d12/godot_d3dx12.h>
+#if !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+// Match current version used by MinGW, MSVC and Direct3D 12 headers use 500.
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif // !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+
+GODOT_GCC_WARNING_PUSH
+GODOT_GCC_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_GCC_WARNING_IGNORE("-Wshadow")
+GODOT_GCC_WARNING_IGNORE("-Wswitch")
+GODOT_CLANG_WARNING_PUSH
+GODOT_CLANG_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_CLANG_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
+GODOT_CLANG_WARNING_IGNORE("-Wswitch")
+
+#include <thirdparty/directx_headers/include/directx/d3dx12.h>
+
+GODOT_GCC_WARNING_POP
+GODOT_CLANG_WARNING_POP
+
 #include <wrl/client.h>
 
 #ifdef DEV_ENABLED
@@ -71,7 +93,6 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
 	};
 
 	static const D3D12Format RD_TO_D3D12_FORMAT[RDD::DATA_FORMAT_MAX];
-	static const DXGI_COLOR_SPACE_TYPE RD_TO_DXGI_COLOR_SPACE_TYPE[RDD::COLOR_SPACE_MAX];
 
 	struct DeviceLimits {
 		uint64_t max_srvs_per_shader_stage = 0;
@@ -373,8 +394,7 @@ public:
 			BitField<PipelineStageBits> p_dst_stages,
 			VectorView<RDD::MemoryAccessBarrier> p_memory_barriers,
 			VectorView<RDD::BufferBarrier> p_buffer_barriers,
-			VectorView<RDD::TextureBarrier> p_texture_barriers,
-			VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) override final;
+			VectorView<RDD::TextureBarrier> p_texture_barriers) override final;
 
 private:
 	/****************/
@@ -468,14 +488,6 @@ private:
 		uint32_t vertex_buffer_count = 0;
 	};
 
-	struct DynParams {
-		D3D12_PRIMITIVE_TOPOLOGY primitive_topology = {};
-		Color blend_constant;
-		float depth_bounds_min = 0.0f;
-		float depth_bounds_max = 1.0f;
-		uint32_t stencil_reference = 0;
-	};
-
 	// Leveraging knowledge of actual usage and D3D12 specifics (namely, command lists from the same allocator
 	// can't be freely begun and ended), an allocator per list works better.
 	struct CommandBufferInfo {
@@ -484,16 +496,10 @@ private:
 
 		Microsoft::WRL::ComPtr<ID3D12CommandAllocator> cmd_allocator;
 		Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList> cmd_list;
-		Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList1> cmd_list_1;
-		Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
-		Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList7> cmd_list_7;
 
 		ID3D12PipelineState *graphics_pso = nullptr;
 		ID3D12PipelineState *compute_pso = nullptr;
 
-		DynParams dyn_params;
-		bool pending_dyn_params = true;
-
 		uint32_t graphics_root_signature_crc = 0;
 		uint32_t compute_root_signature_crc = 0;
 
@@ -533,13 +539,10 @@ private:
 		TightLocalVector<TextureInfo> render_targets_info;
 		TightLocalVector<FramebufferID> framebuffers;
 		RDD::DataFormat data_format = DATA_FORMAT_MAX;
-		RDD::ColorSpace color_space = COLOR_SPACE_MAX;
 	};
 
 	void _swap_chain_release(SwapChain *p_swap_chain);
 	void _swap_chain_release_buffers(SwapChain *p_swap_chain);
-	RenderPassID _swap_chain_create_render_pass(RDD::DataFormat p_format);
-	void _determine_swap_chain_format(SwapChain *p_swap_chain, DataFormat &r_format, ColorSpace &r_color_space);
 
 public:
 	virtual SwapChainID swap_chain_create(RenderingContextDriver::SurfaceID p_surface) override;
@@ -547,7 +550,6 @@ public:
 	virtual FramebufferID swap_chain_acquire_framebuffer(CommandQueueID p_cmd_queue, SwapChainID p_swap_chain, bool &r_resize_required) override;
 	virtual RenderPassID swap_chain_get_render_pass(SwapChainID p_swap_chain) override;
 	virtual DataFormat swap_chain_get_format(SwapChainID p_swap_chain) override;
-	virtual ColorSpace swap_chain_get_color_space(SwapChainID p_swap_chain) override;
 	virtual void swap_chain_free(SwapChainID p_swap_chain) override;
 
 	/*********************/
@@ -600,7 +602,7 @@ private:
 	struct ShaderInfo {
 		uint32_t dxil_push_constant_size = 0;
 		uint32_t nir_runtime_data_root_param_idx = UINT32_MAX;
-		PipelineType pipeline_type = PIPELINE_TYPE_RASTERIZATION;
+		bool is_compute = false;
 
 		struct UniformBindingInfo {
 			uint32_t stages = 0; // Actual shader stages using the uniform (0 if totally optimized out).
@@ -713,7 +715,14 @@ public:
 
 	struct RenderPipelineInfo {
 		const VertexFormatInfo *vf_info = nullptr;
-		DynParams dyn_params;
+
+		struct {
+			D3D12_PRIMITIVE_TOPOLOGY primitive_topology = {};
+			Color blend_constant;
+			float depth_bounds_min = 0.0f;
+			float depth_bounds_max = 0.0f;
+			uint32_t stencil_reference = 0;
+		} dyn_params;
 	};
 
 	struct PipelineInfo {
@@ -829,31 +838,6 @@ public:
 
 	virtual PipelineID compute_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
 
-	/********************/
-	/**** RAYTRACING ****/
-	/********************/
-
-	// ---- ACCELERATION STRUCTURES ----
-
-	virtual AccelerationStructureID blas_create(VectorView<AccelerationStructureGeometry> p_geometries) override final;
-	virtual uint32_t tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) override final;
-	virtual void tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) override final;
-	virtual AccelerationStructureID tlas_create(BufferID p_instances_buffer) override final;
-	virtual void acceleration_structure_free(AccelerationStructureID p_acceleration_structure) override final;
-	virtual uint32_t acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) override final;
-
-	// ----- PIPELINE -----
-
-	virtual RaytracingPipelineID raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
-	virtual void raytracing_pipeline_free(RaytracingPipelineID p_pipeline) override final;
-
-	// ----- COMMANDS -----
-
-	virtual void command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) override final;
-	virtual void command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) override final;
-	virtual void command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) override final;
-	virtual void command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) override final;
-
 	/*****************/
 	/**** QUERIES ****/
 	/*****************/
diff --git a/engine/drivers/d3d12/rendering_shader_container_d3d12.cpp b/engine/drivers/d3d12/rendering_shader_container_d3d12.cpp
index 6090ea86..d4fe32e2 100644
--- a/engine/drivers/d3d12/rendering_shader_container_d3d12.cpp
+++ b/engine/drivers/d3d12/rendering_shader_container_d3d12.cpp
@@ -31,19 +31,50 @@
 #include "rendering_shader_container_d3d12.h"
 
 #include "core/templates/sort_array.h"
-#include "drivers/d3d12/dxil_hash.h"
 
-#include <drivers/d3d12/godot_d3d12ma.h>
-#include <drivers/d3d12/godot_d3dx12.h>
-#include <drivers/d3d12/godot_nir.h>
-#include <wrl/client.h>
+#include "dxil_hash.h"
+
 #include <zlib.h>
 
+GODOT_GCC_WARNING_PUSH
+GODOT_GCC_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_GCC_WARNING_IGNORE("-Wlogical-not-parentheses")
+GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_GCC_WARNING_IGNORE("-Wshadow")
+GODOT_GCC_WARNING_IGNORE("-Wswitch")
+GODOT_CLANG_WARNING_PUSH
+GODOT_CLANG_WARNING_IGNORE("-Wimplicit-fallthrough")
+GODOT_CLANG_WARNING_IGNORE("-Wlogical-not-parentheses")
+GODOT_CLANG_WARNING_IGNORE("-Wmissing-field-initializers")
+GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
+GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
+GODOT_CLANG_WARNING_IGNORE("-Wswitch")
+GODOT_MSVC_WARNING_PUSH
+GODOT_MSVC_WARNING_IGNORE(4200) // "nonstandard extension used: zero-sized array in struct/union".
+GODOT_MSVC_WARNING_IGNORE(4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
+
+#include <dxgi1_6.h>
+#include <thirdparty/directx_headers/include/directx/d3dx12.h>
+#define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
+#include <thirdparty/d3d12ma/D3D12MemAlloc.h>
+
+#include <wrl/client.h>
+
+#include <nir_spirv.h>
+#include <nir_to_dxil.h>
+#include <spirv_to_dxil.h>
 extern "C" {
+#include <dxil_spirv_nir.h>
+
 void dxil_reassign_driver_locations(nir_shader *s, nir_variable_mode modes,
 		uint64_t other_stage_mask, const BITSET_WORD *other_stage_frac_mask);
 }
 
+GODOT_GCC_WARNING_POP
+GODOT_CLANG_WARNING_POP
+GODOT_MSVC_WARNING_POP
+
 // SPIR-V to DXIL does way too many allocations, which causes worker threads
 // to bottleneck each other due to sharing the same global process heap.
 // This can be solved by making each thread allocate from its own heap.
@@ -426,8 +457,8 @@ bool RenderingShaderContainerD3D12::_convert_spirv_to_nir(Span<ReflectShaderStag
 				shader->info.inputs_read |= VARYING_BIT_POS;
 
 				if (prev_shader) {
-					dxil_reassign_driver_locations(shader, nir_var_shader_in, prev_shader->info.outputs_written, nullptr);
-					dxil_reassign_driver_locations(prev_shader, nir_var_shader_out, shader->info.inputs_read, nullptr);
+					dxil_reassign_driver_locations(shader, nir_var_shader_in, prev_shader->info.outputs_written, NULL);
+					dxil_reassign_driver_locations(prev_shader, nir_var_shader_out, shader->info.inputs_read, NULL);
 				}
 			}
 		}
@@ -539,7 +570,7 @@ bool RenderingShaderContainerD3D12::_generate_root_signature(BitField<RenderingD
 
 	// NIR-DXIL runtime data.
 	if (reflection_data_d3d12.nir_runtime_data_root_param_idx == 1) { // Set above to 1 when discovering runtime data is needed.
-		DEV_ASSERT(reflection_data.pipeline_type != RDC::PIPELINE_TYPE_COMPUTE); // Could be supported if needed, but it's pointless as of now.
+		DEV_ASSERT(!reflection_data.is_compute); // Could be supported if needed, but it's pointless as of now.
 		reflection_data_d3d12.nir_runtime_data_root_param_idx = root_params.size();
 		CD3DX12_ROOT_PARAMETER1 nir_runtime_data;
 		nir_runtime_data.InitAsConstants(
diff --git a/engine/drivers/d3d12/rendering_shader_container_d3d12.h b/engine/drivers/d3d12/rendering_shader_container_d3d12.h
index 7ce49e71..62fb3019 100644
--- a/engine/drivers/d3d12/rendering_shader_container_d3d12.h
+++ b/engine/drivers/d3d12/rendering_shader_container_d3d12.h
@@ -38,7 +38,7 @@
 #undef NIR_ENABLED
 #endif
 
-#include "drivers/d3d12/d3d12_godot_nir_bridge.h"
+#include "d3d12_godot_nir_bridge.h"
 
 #define D3D12_BITCODE_OFFSETS_NUM_STAGES 3
 
diff --git a/engine/drivers/egl/egl_manager.cpp b/engine/drivers/egl/egl_manager.cpp
index 935fb26f..f240c7c8 100644
--- a/engine/drivers/egl/egl_manager.cpp
+++ b/engine/drivers/egl/egl_manager.cpp
@@ -30,17 +30,12 @@
 
 #include "egl_manager.h"
 
-#ifdef EGL_ENABLED
-
-#include "core/config/engine.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/os/os.h"
-
-#ifdef WINDOWS_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"
-#endif
+
+#ifdef EGL_ENABLED
 
 #if defined(EGL_STATIC)
 
@@ -254,7 +249,7 @@ int EGLManager::display_get_native_visual_id(void *p_display) {
 	return native_visual_id;
 }
 
-Error EGLManager::window_create(DisplayServerEnums::WindowID p_window_id, void *p_display, void *p_native_window, int p_width, int p_height) {
+Error EGLManager::window_create(DisplayServer::WindowID p_window_id, void *p_display, void *p_native_window, int p_width, int p_height) {
 	int gldisplay_id = _get_gldisplay_id(p_display);
 	ERR_FAIL_COND_V(gldisplay_id < 0, ERR_CANT_CREATE);
 
@@ -322,7 +317,7 @@ Error EGLManager::window_create(DisplayServerEnums::WindowID p_window_id, void *
 	return OK;
 }
 
-void EGLManager::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void EGLManager::window_destroy(DisplayServer::WindowID p_window_id) {
 	ERR_FAIL_INDEX(p_window_id, (int)windows.size());
 
 	GLWindow &glwindow = windows[p_window_id];
@@ -367,8 +362,8 @@ void EGLManager::swap_buffers() {
 	eglSwapBuffers(current_display.egl_display, current_window->egl_surface);
 }
 
-void EGLManager::window_make_current(DisplayServerEnums::WindowID p_window_id) {
-	if (p_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+void EGLManager::window_make_current(DisplayServer::WindowID p_window_id) {
+	if (p_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -410,7 +405,7 @@ bool EGLManager::is_using_vsync() const {
 	return use_vsync;
 }
 
-EGLContext EGLManager::get_context(DisplayServerEnums::WindowID p_window_id) {
+EGLContext EGLManager::get_context(DisplayServer::WindowID p_window_id) {
 	GLWindow &glwindow = windows[p_window_id];
 
 	if (!glwindow.initialized) {
@@ -422,7 +417,7 @@ EGLContext EGLManager::get_context(DisplayServerEnums::WindowID p_window_id) {
 	return display.egl_context;
 }
 
-EGLDisplay EGLManager::get_display(DisplayServerEnums::WindowID p_window_id) {
+EGLDisplay EGLManager::get_display(DisplayServer::WindowID p_window_id) {
 	GLWindow &glwindow = windows[p_window_id];
 
 	if (!glwindow.initialized) {
@@ -434,7 +429,7 @@ EGLDisplay EGLManager::get_display(DisplayServerEnums::WindowID p_window_id) {
 	return display.egl_display;
 }
 
-EGLConfig EGLManager::get_config(DisplayServerEnums::WindowID p_window_id) {
+EGLConfig EGLManager::get_config(DisplayServer::WindowID p_window_id) {
 	GLWindow &glwindow = windows[p_window_id];
 
 	if (!glwindow.initialized) {
diff --git a/engine/drivers/egl/egl_manager.h b/engine/drivers/egl/egl_manager.h
index cbd664f0..7fe5f916 100644
--- a/engine/drivers/egl/egl_manager.h
+++ b/engine/drivers/egl/egl_manager.h
@@ -32,10 +32,11 @@
 
 #ifdef EGL_ENABLED
 
-#include "core/templates/local_vector.h"
-#include "servers/display/display_server_enums.h"
+// These must come first to avoid windows.h mess.
+#include "platform_gl.h"
 
-#include <platform_gl.h>
+#include "core/templates/local_vector.h"
+#include "servers/display/display_server.h"
 
 class EGLManager {
 private:
@@ -94,21 +95,21 @@ public:
 	int display_get_native_visual_id(void *p_display);
 
 	Error open_display(void *p_display);
-	Error window_create(DisplayServerEnums::WindowID p_window_id, void *p_display, void *p_native_window, int p_width, int p_height);
+	Error window_create(DisplayServer::WindowID p_window_id, void *p_display, void *p_native_window, int p_width, int p_height);
 
-	void window_destroy(DisplayServerEnums::WindowID p_window_id);
+	void window_destroy(DisplayServer::WindowID p_window_id);
 
 	void release_current();
 	void swap_buffers();
 
-	void window_make_current(DisplayServerEnums::WindowID p_window_id);
+	void window_make_current(DisplayServer::WindowID p_window_id);
 
 	void set_use_vsync(bool p_use);
 	bool is_using_vsync() const;
 
-	EGLContext get_context(DisplayServerEnums::WindowID p_window_id);
-	EGLDisplay get_display(DisplayServerEnums::WindowID p_window_id);
-	EGLConfig get_config(DisplayServerEnums::WindowID p_window_id);
+	EGLContext get_context(DisplayServer::WindowID p_window_id);
+	EGLDisplay get_display(DisplayServer::WindowID p_window_id);
+	EGLConfig get_config(DisplayServer::WindowID p_window_id);
 
 	Error initialize(void *p_native_display = nullptr);
 
diff --git a/engine/drivers/gl_context/SCsub b/engine/drivers/gl_context/SCsub
index 6a3ac959..8210c7f5 100644
--- a/engine/drivers/gl_context/SCsub
+++ b/engine/drivers/gl_context/SCsub
@@ -8,17 +8,15 @@ if env["platform"] in ["macos", "windows", "linuxbsd"]:
     thirdparty_dir = "#thirdparty/glad/"
     thirdparty_sources = ["gl.c"]
 
+    if not env.get("angle_libs"):
+        thirdparty_sources += ["egl.c"]
+
+    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
     env.Prepend(CPPPATH=[thirdparty_dir])
 
     env.Append(CPPDEFINES=["GLAD_ENABLED"])
-    if env["platform"] == "linuxbsd":
-        thirdparty_sources += ["egl.c"]
-        env.Append(CPPDEFINES=["EGL_ENABLED", "GLAD_GLES2"])
-    else:
-        if env["angle"]:
-            env.Append(CPPDEFINES=["EGL_ENABLED", "GLAD_GLES2"])
-
-    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+    env.Append(CPPDEFINES=["EGL_ENABLED"])
 
     env_thirdparty = env.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/drivers/gles3/effects/copy_effects.cpp b/engine/drivers/gles3/effects/copy_effects.cpp
index 9567d76b..e7b5a172 100644
--- a/engine/drivers/gles3/effects/copy_effects.cpp
+++ b/engine/drivers/gles3/effects/copy_effects.cpp
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "copy_effects.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/texture_storage.h"
+#include "copy_effects.h"
+#include "../storage/texture_storage.h"
 
 using namespace GLES3;
 
@@ -68,8 +67,8 @@ CopyEffects::CopyEffects() {
 		glGenVertexArrays(1, &screen_triangle_array);
 		glBindVertexArray(screen_triangle_array);
 		glBindBuffer(GL_ARRAY_BUFFER, screen_triangle);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
@@ -100,8 +99,8 @@ CopyEffects::CopyEffects() {
 		glGenVertexArrays(1, &quad_array);
 		glBindVertexArray(quad_array);
 		glBindBuffer(GL_ARRAY_BUFFER, quad);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
@@ -192,18 +191,6 @@ void CopyEffects::copy_screen(float p_multiply) {
 	draw_screen_triangle();
 }
 
-void CopyEffects::copy_with_exposure(float p_exposure, float p_multiply) {
-	bool success = copy.shader.version_bind_shader(copy.shader_version, CopyShaderGLES3::MODE_APPLY_LINEAR_EXPOSURE_TO_SRGB);
-	if (!success) {
-		return;
-	}
-
-	copy.shader.version_set_uniform(CopyShaderGLES3::EXPOSURE, p_exposure, copy.shader_version, CopyShaderGLES3::MODE_APPLY_LINEAR_EXPOSURE_TO_SRGB);
-	copy.shader.version_set_uniform(CopyShaderGLES3::MULTIPLY, p_multiply, copy.shader_version, CopyShaderGLES3::MODE_APPLY_LINEAR_EXPOSURE_TO_SRGB);
-
-	draw_screen_triangle();
-}
-
 void CopyEffects::copy_cube_to_rect(const Rect2 &p_rect) {
 	bool success = copy.shader.version_bind_shader(copy.shader_version, CopyShaderGLES3::MODE_CUBE_TO_OCTAHEDRAL);
 	if (!success) {
diff --git a/engine/drivers/gles3/effects/copy_effects.h b/engine/drivers/gles3/effects/copy_effects.h
index 5dbaeb4c..b50ad9a3 100644
--- a/engine/drivers/gles3/effects/copy_effects.h
+++ b/engine/drivers/gles3/effects/copy_effects.h
@@ -65,7 +65,6 @@ public:
 	void copy_with_lens_distortion(const Rect2 &p_rect, float p_layer, const Vector2 &p_eye_center, float p_k1, float p_k2, float p_upscale, float p_aspect_ration, bool p_linear_to_srgb = false);
 	void copy_to_and_from_rect(const Rect2 &p_rect);
 	void copy_screen(float p_multiply = 1.0);
-	void copy_with_exposure(float p_exposure, float p_multiply);
 	void copy_cube_to_rect(const Rect2 &p_rect);
 	void copy_cube_to_panorama(float p_mip_level);
 	void bilinear_blur(GLuint p_source_texture, int p_mipmap_count, const Rect2i &p_region);
diff --git a/engine/drivers/gles3/effects/cubemap_filter.cpp b/engine/drivers/gles3/effects/cubemap_filter.cpp
index 801cda86..cc4e3707 100644
--- a/engine/drivers/gles3/effects/cubemap_filter.cpp
+++ b/engine/drivers/gles3/effects/cubemap_filter.cpp
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "cubemap_filter.h"
-
 #ifdef GLES3_ENABLED
 
+#include "cubemap_filter.h"
+
+#include "../storage/texture_storage.h"
 #include "core/config/project_settings.h"
-#include "drivers/gles3/storage/texture_storage.h"
 
 using namespace GLES3;
 
@@ -72,8 +72,8 @@ CubemapFilter::CubemapFilter() {
 		glGenVertexArrays(1, &screen_triangle_array);
 		glBindVertexArray(screen_triangle_array);
 		glBindBuffer(GL_ARRAY_BUFFER, screen_triangle);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
diff --git a/engine/drivers/gles3/effects/feed_effects.cpp b/engine/drivers/gles3/effects/feed_effects.cpp
index 59f72e08..8ca88da6 100644
--- a/engine/drivers/gles3/effects/feed_effects.cpp
+++ b/engine/drivers/gles3/effects/feed_effects.cpp
@@ -28,12 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "feed_effects.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/os/os.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "feed_effects.h"
+
+#ifdef ANDROID_ENABLED
+#include <GLES3/gl3ext.h>
+#endif
+
+#define GL_PROGRAM_POINT_SIZE 0x8642
 
 using namespace GLES3;
 
@@ -69,8 +72,8 @@ FeedEffects::FeedEffects() {
 		glGenVertexArrays(1, &screen_triangle_array);
 		glBindVertexArray(screen_triangle_array);
 		glBindBuffer(GL_ARRAY_BUFFER, screen_triangle);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
diff --git a/engine/drivers/gles3/effects/feed_effects.h b/engine/drivers/gles3/effects/feed_effects.h
index 78a70575..255fd80c 100644
--- a/engine/drivers/gles3/effects/feed_effects.h
+++ b/engine/drivers/gles3/effects/feed_effects.h
@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "drivers/gles3/shader_gles3.h"
 #include "drivers/gles3/shaders/feed.glsl.gen.h"
 
 namespace GLES3 {
diff --git a/engine/drivers/gles3/effects/glow.cpp b/engine/drivers/gles3/effects/glow.cpp
index ff805784..9728b089 100644
--- a/engine/drivers/gles3/effects/glow.cpp
+++ b/engine/drivers/gles3/effects/glow.cpp
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "glow.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/texture_storage.h"
+#include "glow.h"
+#include "../storage/texture_storage.h"
 
 using namespace GLES3;
 
@@ -67,8 +66,8 @@ Glow::Glow() {
 		glGenVertexArrays(1, &screen_triangle_array);
 		glBindVertexArray(screen_triangle_array);
 		glBindBuffer(GL_ARRAY_BUFFER, screen_triangle);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
@@ -89,7 +88,7 @@ void Glow::_draw_screen_triangle() {
 	glBindVertexArray(0);
 }
 
-void Glow::process_glow(GLuint p_source_color, Size2i p_size, const Glow::Level *p_glow_buffers, uint32_t p_view, bool p_use_multiview) {
+void Glow::process_glow(GLuint p_source_color, Size2i p_size, const Glow::GLOWLEVEL *p_glow_buffers, uint32_t p_view, bool p_use_multiview) {
 	ERR_FAIL_COND(p_source_color == 0);
 	ERR_FAIL_COND(p_glow_buffers[3].color == 0);
 
diff --git a/engine/drivers/gles3/effects/glow.h b/engine/drivers/gles3/effects/glow.h
index 03abece9..faeb99e8 100644
--- a/engine/drivers/gles3/effects/glow.h
+++ b/engine/drivers/gles3/effects/glow.h
@@ -40,7 +40,7 @@ class Glow {
 private:
 	static Glow *singleton;
 
-	struct GlowShader {
+	struct GLOW {
 		GlowShaderGLES3 shader;
 		RID shader_version;
 	} glow;
@@ -60,7 +60,7 @@ private:
 	void _draw_screen_triangle();
 
 public:
-	struct Level {
+	struct GLOWLEVEL {
 		Size2i size;
 		GLuint color = 0;
 		GLuint fbo = 0;
@@ -78,7 +78,7 @@ public:
 	void set_glow_hdr_bleed_scale(float p_scale) { glow_hdr_bleed_scale = p_scale; }
 	void set_glow_hdr_luminance_cap(float p_cap) { glow_hdr_luminance_cap = p_cap; }
 
-	void process_glow(GLuint p_source_color, Size2i p_size, const Level *p_glow_buffers, uint32_t p_view = 0, bool p_use_multiview = false);
+	void process_glow(GLuint p_source_color, Size2i p_size, const GLOWLEVEL *p_glow_buffers, uint32_t p_view = 0, bool p_use_multiview = false);
 };
 
 } //namespace GLES3
diff --git a/engine/drivers/gles3/effects/post_effects.cpp b/engine/drivers/gles3/effects/post_effects.cpp
index ebc46bf2..a9f51fc3 100644
--- a/engine/drivers/gles3/effects/post_effects.cpp
+++ b/engine/drivers/gles3/effects/post_effects.cpp
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "post_effects.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/texture_storage.h"
+#include "post_effects.h"
+#include "../storage/texture_storage.h"
 
 using namespace GLES3;
 
@@ -68,8 +67,8 @@ PostEffects::PostEffects() {
 		glGenVertexArrays(1, &screen_triangle_array);
 		glBindVertexArray(screen_triangle_array);
 		glBindBuffer(GL_ARRAY_BUFFER, screen_triangle);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
@@ -91,8 +90,8 @@ void PostEffects::_draw_screen_triangle() {
 void PostEffects::post_copy(
 		GLuint p_dest_framebuffer, Size2i p_dest_size, GLuint p_source_color,
 		GLuint p_source_depth, bool p_ssao_enabled, int p_ssao_quality_level, float p_ssao_strength, float p_ssao_radius,
-		Size2i p_source_size, float p_luminance_multiplier, const Glow::Level *p_glow_buffers, float p_glow_intensity,
-		float p_srgb_white, uint32_t p_view, bool p_use_multiview, uint64_t p_spec_constants, bool p_filter) {
+		Size2i p_source_size, float p_luminance_multiplier, const Glow::GLOWLEVEL *p_glow_buffers, float p_glow_intensity,
+		float p_srgb_white, uint32_t p_view, bool p_use_multiview, uint64_t p_spec_constants) {
 	glDisable(GL_DEPTH_TEST);
 	glDepthMask(GL_FALSE);
 	glDisable(GL_BLEND);
@@ -109,13 +108,13 @@ void PostEffects::post_copy(
 		flags |= PostShaderGLES3::USE_GLOW;
 	}
 	if (p_ssao_enabled) {
-		if (p_ssao_quality_level == RSE::ENV_SSAO_QUALITY_VERY_LOW) {
+		if (p_ssao_quality_level == RS::ENV_SSAO_QUALITY_VERY_LOW) {
 			flags |= PostShaderGLES3::USE_SSAO_ABYSS;
-		} else if (p_ssao_quality_level == RSE::ENV_SSAO_QUALITY_LOW) {
+		} else if (p_ssao_quality_level == RS::ENV_SSAO_QUALITY_LOW) {
 			flags |= PostShaderGLES3::USE_SSAO_LOW;
-		} else if (p_ssao_quality_level == RSE::ENV_SSAO_QUALITY_HIGH) {
+		} else if (p_ssao_quality_level == RS::ENV_SSAO_QUALITY_HIGH) {
 			flags |= PostShaderGLES3::USE_SSAO_HIGH;
-		} else if (p_ssao_quality_level == RSE::ENV_SSAO_QUALITY_ULTRA) {
+		} else if (p_ssao_quality_level == RS::ENV_SSAO_QUALITY_ULTRA) {
 			flags |= PostShaderGLES3::USE_SSAO_MEGA;
 		} else {
 			flags |= PostShaderGLES3::USE_SSAO_MED;
@@ -133,9 +132,8 @@ void PostEffects::post_copy(
 	GLenum texture_target = p_use_multiview ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D;
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(texture_target, p_source_color);
-
-	glTexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, p_filter ? GL_LINEAR : GL_NEAREST);
-	glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, p_filter ? GL_LINEAR : GL_NEAREST);
+	glTexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
 	if (p_ssao_enabled) {
 		glActiveTexture(GL_TEXTURE3);
diff --git a/engine/drivers/gles3/effects/post_effects.h b/engine/drivers/gles3/effects/post_effects.h
index c1c4a4eb..ae686e24 100644
--- a/engine/drivers/gles3/effects/post_effects.h
+++ b/engine/drivers/gles3/effects/post_effects.h
@@ -32,8 +32,8 @@
 
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/effects/glow.h"
 #include "drivers/gles3/shaders/effects/post.glsl.gen.h"
+#include "glow.h"
 
 namespace GLES3 {
 
@@ -60,8 +60,8 @@ public:
 
 	void post_copy(GLuint p_dest_framebuffer, Size2i p_dest_size, GLuint p_source_color,
 			GLuint p_source_depth, bool p_ssao_enabled, int p_ssao_quality_level, float p_ssao_strength, float p_ssao_radius,
-			Size2i p_source_size, float p_luminance_multiplier, const Glow::Level *p_glow_buffers, float p_glow_intensity,
-			float p_srgb_white, uint32_t p_view = 0, bool p_use_multiview = false, uint64_t p_spec_constants = 0, bool p_filter = true);
+			Size2i p_source_size, float p_luminance_multiplier, const Glow::GLOWLEVEL *p_glow_buffers, float p_glow_intensity,
+			float p_srgb_white, uint32_t p_view = 0, bool p_use_multiview = false, uint64_t p_spec_constants = 0);
 };
 
 } //namespace GLES3
diff --git a/engine/drivers/gles3/environment/fog.cpp b/engine/drivers/gles3/environment/fog.cpp
index 7435f3a5..6083c4da 100644
--- a/engine/drivers/gles3/environment/fog.cpp
+++ b/engine/drivers/gles3/environment/fog.cpp
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "fog.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/math/aabb.h"
-#include "core/templates/rid.h"
+#include "fog.h"
 
 using namespace GLES3;
 
@@ -49,7 +46,7 @@ void Fog::fog_volume_initialize(RID p_rid) {
 void Fog::fog_volume_free(RID p_rid) {
 }
 
-void Fog::fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) {
+void Fog::fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) {
 }
 
 void Fog::fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) {
@@ -62,8 +59,8 @@ AABB Fog::fog_volume_get_aabb(RID p_fog_volume) const {
 	return AABB();
 }
 
-RSE::FogVolumeShape Fog::fog_volume_get_shape(RID p_fog_volume) const {
-	return RSE::FOG_VOLUME_SHAPE_BOX;
+RS::FogVolumeShape Fog::fog_volume_get_shape(RID p_fog_volume) const {
+	return RS::FOG_VOLUME_SHAPE_BOX;
 }
 
 #endif // GLES3_ENABLED
diff --git a/engine/drivers/gles3/environment/fog.h b/engine/drivers/gles3/environment/fog.h
index f55a6e33..9db34eae 100644
--- a/engine/drivers/gles3/environment/fog.h
+++ b/engine/drivers/gles3/environment/fog.h
@@ -44,11 +44,11 @@ public:
 	virtual void fog_volume_initialize(RID p_rid) override;
 	virtual void fog_volume_free(RID p_rid) override;
 
-	virtual void fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) override;
+	virtual void fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) override;
 	virtual void fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) override;
 	virtual void fog_volume_set_material(RID p_fog_volume, RID p_material) override;
 	virtual AABB fog_volume_get_aabb(RID p_fog_volume) const override;
-	virtual RSE::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override;
+	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override;
 };
 
 } // namespace GLES3
diff --git a/engine/drivers/gles3/environment/gi.cpp b/engine/drivers/gles3/environment/gi.cpp
index 6b6d774c..6b33e0aa 100644
--- a/engine/drivers/gles3/environment/gi.cpp
+++ b/engine/drivers/gles3/environment/gi.cpp
@@ -28,15 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "gi.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/math/aabb.h"
-#include "core/math/transform_3d.h"
-#include "core/math/vector3i.h"
-#include "core/templates/rid.h"
-#include "core/templates/vector.h"
+#include "gi.h"
 
 using namespace GLES3;
 
diff --git a/engine/drivers/gles3/rasterizer_canvas_gles3.cpp b/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
index 3b570522..816b3131 100644
--- a/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
@@ -32,19 +32,18 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/config/engine.h"
+#include "rasterizer_gles3.h"
+#include "rasterizer_scene_gles3.h"
+
 #include "core/config/project_settings.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/transform_interpolator.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/mesh_storage.h"
-#include "drivers/gles3/storage/particles_storage.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
 #include "servers/rendering/rendering_server_default.h"
-#include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "storage/config.h"
+#include "storage/material_storage.h"
+#include "storage/mesh_storage.h"
+#include "storage/particles_storage.h"
+#include "storage/texture_storage.h"
 
 void RasterizerCanvasGLES3::_update_transform_2d_to_mat4(const Transform2D &p_transform, float *p_mat4) {
 	p_mat4[0] = p_transform.columns[0][0];
@@ -105,7 +104,7 @@ void RasterizerCanvasGLES3::_update_transform_to_mat4(const Transform3D &p_trans
 	p_mat4[15] = 1;
 }
 
-void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info) {
+void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info) {
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 	GLES3::MeshStorage *mesh_storage = GLES3::MeshStorage::get_singleton();
@@ -424,7 +423,7 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 		// Check material for something that may change flow of rendering, but do not bind for now.
 		RID material = ci->material_owner == nullptr ? ci->material : ci->material_owner->material;
 		if (material.is_valid()) {
-			GLES3::CanvasMaterialData *md = static_cast<GLES3::CanvasMaterialData *>(material_storage->material_get_data(material, RSE::SHADER_CANVAS_ITEM));
+			GLES3::CanvasMaterialData *md = static_cast<GLES3::CanvasMaterialData *>(material_storage->material_get_data(material, RS::SHADER_CANVAS_ITEM));
 			if (md && md->shader_data->valid) {
 				if (md->shader_data->uses_screen_texture && canvas_group_owner == nullptr) {
 					if (!material_screen_texture_cached) {
@@ -471,10 +470,10 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 				_render_items(p_to_render_target, item_count, canvas_transform_inverse, p_light_list, r_sdf_used, false, r_render_info, material_screen_texture_mipmaps_cached);
 				item_count = 0;
 
-				if (ci->canvas_group_owner->canvas_group->mode != RSE::CANVAS_GROUP_MODE_TRANSPARENT) {
+				if (ci->canvas_group_owner->canvas_group->mode != RS::CANVAS_GROUP_MODE_TRANSPARENT) {
 					Rect2i group_rect = ci->canvas_group_owner->global_rect_cache;
 					texture_storage->render_target_copy_to_back_buffer(p_to_render_target, group_rect, false);
-					if (ci->canvas_group_owner->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+					if (ci->canvas_group_owner->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 						ci->canvas_group_owner->use_canvas_group = false;
 						items[item_count++] = ci->canvas_group_owner;
 					}
@@ -490,7 +489,7 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 			ci->canvas_group_owner = nullptr; //must be cleared
 		}
 
-		if (canvas_group_owner == nullptr && ci->canvas_group != nullptr && ci->canvas_group->mode != RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+		if (canvas_group_owner == nullptr && ci->canvas_group != nullptr && ci->canvas_group->mode != RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 			skip_item = true;
 		}
 
@@ -573,7 +572,7 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 	state.current_instance_buffer_index = 0;
 }
 
-void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer, RenderingServerTypes::RenderInfo *r_render_info, bool p_backbuffer_has_mipmaps) {
+void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer, RenderingMethod::RenderInfo *r_render_info, bool p_backbuffer_has_mipmaps) {
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 
 	canvas_begin(p_to_render_target, p_to_backbuffer, p_backbuffer_has_mipmaps);
@@ -607,11 +606,11 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
 
 		RID material = ci->material_owner == nullptr ? ci->material : ci->material_owner->material;
 		if (ci->use_canvas_group) {
-			if (ci->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+			if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 				material = default_clip_children_material;
 			} else {
 				if (material.is_null()) {
-					if (ci->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_ONLY) {
+					if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_ONLY) {
 						material = default_clip_children_material;
 					} else {
 						material = default_canvas_group_material;
@@ -625,7 +624,7 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
 
 			GLES3::CanvasMaterialData *material_data = nullptr;
 			if (material.is_valid()) {
-				material_data = static_cast<GLES3::CanvasMaterialData *>(material_storage->material_get_data(material, RSE::SHADER_CANVAS_ITEM));
+				material_data = static_cast<GLES3::CanvasMaterialData *>(material_storage->material_get_data(material, RS::SHADER_CANVAS_ITEM));
 			}
 			shader_data_cache = nullptr;
 			if (material_data) {
@@ -661,7 +660,7 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
 		}
 	}
 
-	if (state.current_batch_index == 0 && state.canvas_instance_batches[0].instance_count == 0) {
+	if (index == 0) {
 		// Nothing to render, just return.
 		return;
 	}
@@ -812,7 +811,7 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
 }
 
 void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_render_target, const Transform2D &p_canvas_transform_inverse, Item *&current_clip, GLES3::CanvasShaderData::BlendMode p_blend_mode, Light *p_lights, uint32_t &r_index, bool &r_batch_broken, bool &r_sdf_used, const Point2 &p_repeat_offset) {
-	RSE::CanvasItemTextureFilter texture_filter = p_item->texture_filter == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? state.default_filter : p_item->texture_filter;
+	RenderingServer::CanvasItemTextureFilter texture_filter = p_item->texture_filter == RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? state.default_filter : p_item->texture_filter;
 	const uint64_t specialization_command_mask = ~(CanvasShaderGLES3::USE_NINEPATCH | CanvasShaderGLES3::USE_PRIMITIVE | CanvasShaderGLES3::USE_ATTRIBUTES | CanvasShaderGLES3::USE_INSTANCING);
 
 	if (texture_filter != state.canvas_instance_batches[state.current_batch_index].filter) {
@@ -821,6 +820,14 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 		state.canvas_instance_batches[state.current_batch_index].filter = texture_filter;
 	}
 
+	RenderingServer::CanvasItemTextureRepeat texture_repeat = p_item->texture_repeat == RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? state.default_repeat : p_item->texture_repeat;
+
+	if (texture_repeat != state.canvas_instance_batches[state.current_batch_index].repeat) {
+		_new_batch(r_batch_broken);
+
+		state.canvas_instance_batches[state.current_batch_index].repeat = texture_repeat;
+	}
+
 	Transform2D base_transform = p_item->final_transform;
 	if (p_item->repeat_source_item && (p_repeat_offset.x || p_repeat_offset.y)) {
 		base_transform.columns[2] += p_item->repeat_source_item->final_transform.basis_xform(p_repeat_offset);
@@ -875,7 +882,6 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 		state.canvas_instance_batches[state.current_batch_index].specialization ^= CanvasShaderGLES3::DISABLE_LIGHTING;
 	}
 
-	const RSE::CanvasItemTextureRepeat base_texture_repeat = p_item->texture_repeat == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? state.default_repeat : p_item->texture_repeat;
 	const Item::Command *c = p_item->commands;
 	while (c) {
 		if (skipping && c->type != Item::Command::TYPE_ANIMATION_SLICE) {
@@ -909,21 +915,12 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 
 		Color blend_color = base_color;
 		GLES3::CanvasShaderData::BlendMode blend_mode = p_blend_mode;
-		RSE::CanvasItemTextureRepeat texture_repeat = base_texture_repeat;
 		if (c->type == Item::Command::TYPE_RECT) {
 			const Item::CommandRect *rect = static_cast<const Item::CommandRect *>(c);
 			if (rect->flags & CANVAS_RECT_LCD) {
 				blend_mode = GLES3::CanvasShaderData::BLEND_MODE_LCD;
 				blend_color = rect->modulate * base_color;
 			}
-
-			if (rect->flags & CANVAS_RECT_TILE) {
-				texture_repeat = RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED;
-			}
-		}
-		if (texture_repeat != state.canvas_instance_batches[state.current_batch_index].repeat) {
-			_new_batch(r_batch_broken);
-			state.canvas_instance_batches[state.current_batch_index].repeat = texture_repeat;
 		}
 
 		if (blend_mode != state.canvas_instance_batches[state.current_batch_index].blend_mode || blend_color != state.canvas_instance_batches[state.current_batch_index].blend_color) {
@@ -935,6 +932,12 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 		switch (c->type) {
 			case Item::Command::TYPE_RECT: {
 				const Item::CommandRect *rect = static_cast<const Item::CommandRect *>(c);
+
+				if (rect->flags & CANVAS_RECT_TILE && state.canvas_instance_batches[state.current_batch_index].repeat != RenderingServer::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED) {
+					_new_batch(r_batch_broken);
+					state.canvas_instance_batches[state.current_batch_index].repeat = RenderingServer::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED;
+				}
+
 				if (rect->texture != state.canvas_instance_batches[state.current_batch_index].tex || state.canvas_instance_batches[state.current_batch_index].command_type != Item::Command::TYPE_RECT) {
 					_new_batch(r_batch_broken);
 					state.canvas_instance_batches[state.current_batch_index].tex = rect->texture;
@@ -1290,13 +1293,13 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 	}
 }
 
-_FORCE_INLINE_ static uint32_t _indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) {
-	static const uint32_t divisor[RSE::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RSE::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
+_FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
+	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
-void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, RenderingServerTypes::RenderInfo *r_render_info) {
+void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, RenderingMethod::RenderInfo *r_render_info) {
 	ERR_FAIL_NULL(state.canvas_instance_batches[state.current_batch_index].command);
 
 	// Used by Polygon and Mesh.
@@ -1316,9 +1319,9 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 			glBindVertexArray(0);
 
 			if (r_render_info) {
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += state.canvas_instance_batches[p_index].instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += 2 * state.canvas_instance_batches[p_index].instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += state.canvas_instance_batches[p_index].instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += 2 * state.canvas_instance_batches[p_index].instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 
 		} break;
@@ -1336,7 +1339,7 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 			_enable_attributes(range_start, false);
 
 			if (pb->color_disabled && pb->color != Color(1.0, 1.0, 1.0, 1.0)) {
-				glVertexAttrib4f(RSE::ARRAY_COLOR, pb->color.r, pb->color.g, pb->color.b, pb->color.a);
+				glVertexAttrib4f(RS::ARRAY_COLOR, pb->color.r, pb->color.g, pb->color.b, pb->color.a);
 			}
 
 			if (pb->index_buffer != 0) {
@@ -1348,13 +1351,13 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 
 			if (pb->color_disabled && pb->color != Color(1.0, 1.0, 1.0, 1.0)) {
 				// Reset so this doesn't pollute other draw calls.
-				glVertexAttrib4f(RSE::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
+				glVertexAttrib4f(RS::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
 			}
 
 			if (r_render_info) {
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(polygon->primitive, pb->count);
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(polygon->primitive, pb->count);
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 		} break;
 
@@ -1371,10 +1374,10 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 				glDrawArraysInstanced(primitive[state.canvas_instance_batches[p_index].primitive_points], 0, state.canvas_instance_batches[p_index].primitive_points, instance_count);
 			}
 			if (r_render_info) {
-				const RSE::PrimitiveType rs_primitive[5] = { RSE::PRIMITIVE_POINTS, RSE::PRIMITIVE_POINTS, RSE::PRIMITIVE_LINES, RSE::PRIMITIVE_TRIANGLES, RSE::PRIMITIVE_TRIANGLES };
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(rs_primitive[state.canvas_instance_batches[p_index].primitive_points], state.canvas_instance_batches[p_index].primitive_points) * instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				const RenderingServer::PrimitiveType rs_primitive[5] = { RS::PRIMITIVE_POINTS, RS::PRIMITIVE_POINTS, RS::PRIMITIVE_LINES, RS::PRIMITIVE_TRIANGLES, RS::PRIMITIVE_TRIANGLES };
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(rs_primitive[state.canvas_instance_batches[p_index].primitive_points], state.canvas_instance_batches[p_index].primitive_points) * instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 
 		} break;
@@ -1404,7 +1407,7 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 				RID multimesh = mm->multimesh;
 				mesh = mesh_storage->multimesh_get_mesh(multimesh);
 
-				if (mesh_storage->multimesh_get_transform_format(multimesh) != RSE::MULTIMESH_TRANSFORM_2D) {
+				if (mesh_storage->multimesh_get_transform_format(multimesh) != RS::MULTIMESH_TRANSFORM_2D) {
 					break;
 				}
 
@@ -1426,7 +1429,7 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 				RID particles = pt->particles;
 				mesh = particles_storage->particles_get_draw_pass_mesh(particles, 0);
 
-				ERR_BREAK(particles_storage->particles_get_mode(particles) != RSE::PARTICLES_MODE_2D);
+				ERR_BREAK(particles_storage->particles_get_mode(particles) != RS::PARTICLES_MODE_2D);
 				particles_storage->particles_request_process(particles);
 
 				if (particles_storage->particles_is_inactive(particles)) {
@@ -1456,8 +1459,8 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 			for (uint32_t j = 0; j < surf_count; j++) {
 				void *surface = mesh_storage->mesh_get_surface(mesh, j);
 
-				RSE::PrimitiveType primitive = mesh_storage->mesh_surface_get_primitive(surface);
-				ERR_CONTINUE(primitive < 0 || primitive >= RSE::PRIMITIVE_MAX);
+				RS::PrimitiveType primitive = mesh_storage->mesh_surface_get_primitive(surface);
+				ERR_CONTINUE(primitive < 0 || primitive >= RS::PRIMITIVE_MAX);
 
 				GLuint vertex_array_gl = 0;
 				GLuint index_array_gl = 0;
@@ -1529,9 +1532,9 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index, Ren
 				}
 				if (r_render_info) {
 					// Meshes, Particles, and MultiMesh are always just one object with one draw call.
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(primitive, vertex_count) * instance_count;
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(primitive, vertex_count) * instance_count;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 				}
 			}
 
@@ -1659,13 +1662,13 @@ void RasterizerCanvasGLES3::light_update_shadow(RID p_rid, int p_shadow_index, c
 	glEnable(GL_SCISSOR_TEST);
 	glScissor(0, p_shadow_index * 2, state.shadow_texture_size, 2);
 	glClearColor(p_far, p_far, p_far, 1.0);
-	RasterizerUtilGLES3::clear_depth(1.0);
+	RasterizerGLES3::clear_depth(1.0);
 
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	glCullFace(GL_BACK);
 	glDisable(GL_CULL_FACE);
-	RSE::CanvasOccluderPolygonCullMode cull_mode = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+	RS::CanvasOccluderPolygonCullMode cull_mode = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 
 	CanvasOcclusionShaderGLES3::ShaderVariant variant = config->float_texture_supported ? CanvasOcclusionShaderGLES3::MODE_SHADOW : CanvasOcclusionShaderGLES3::MODE_SHADOW_RGBA;
 	bool success = shadow_render.shader.version_bind_shader(shadow_render.shader_version, variant);
@@ -1726,14 +1729,14 @@ void RasterizerCanvasGLES3::light_update_shadow(RID p_rid, int p_shadow_index, c
 			shadow_render.shader.version_set_uniform(CanvasOcclusionShaderGLES3::MODELVIEW2, modelview.columns[0][1], modelview.columns[1][1], 0, modelview.columns[2][1], shadow_render.shader_version, variant);
 
 			if (co->cull_mode != cull_mode) {
-				if (co->cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
+				if (co->cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
 					glDisable(GL_CULL_FACE);
 				} else {
-					if (cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
+					if (cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
 						// Last time was disabled, so enable and set proper face.
 						glEnable(GL_CULL_FACE);
 					}
-					glCullFace(co->cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? GL_FRONT : GL_BACK);
+					glCullFace(co->cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? GL_FRONT : GL_BACK);
 				}
 				cull_mode = co->cull_mode;
 			}
@@ -1792,13 +1795,13 @@ void RasterizerCanvasGLES3::light_update_directional_shadow(RID p_rid, int p_sha
 	glEnable(GL_SCISSOR_TEST);
 	glScissor(0, p_shadow_index * 2, state.shadow_texture_size, 2);
 	glClearColor(1.0, 1.0, 1.0, 1.0);
-	RasterizerUtilGLES3::clear_depth(1.0);
+	RasterizerGLES3::clear_depth(1.0);
 
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	glCullFace(GL_BACK);
 	glDisable(GL_CULL_FACE);
-	RSE::CanvasOccluderPolygonCullMode cull_mode = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+	RS::CanvasOccluderPolygonCullMode cull_mode = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 
 	CanvasOcclusionShaderGLES3::ShaderVariant variant = config->float_texture_supported ? CanvasOcclusionShaderGLES3::MODE_SHADOW : CanvasOcclusionShaderGLES3::MODE_SHADOW_RGBA;
 	bool success = shadow_render.shader.version_bind_shader(shadow_render.shader_version, variant);
@@ -1829,14 +1832,14 @@ void RasterizerCanvasGLES3::light_update_directional_shadow(RID p_rid, int p_sha
 		shadow_render.shader.version_set_uniform(CanvasOcclusionShaderGLES3::MODELVIEW2, modelview.columns[0][1], modelview.columns[1][1], 0, modelview.columns[2][1], shadow_render.shader_version, variant);
 
 		if (co->cull_mode != cull_mode) {
-			if (co->cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
+			if (co->cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
 				glDisable(GL_CULL_FACE);
 			} else {
-				if (cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
+				if (cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED) {
 					// Last time was disabled, so enable and set proper face.
 					glEnable(GL_CULL_FACE);
 				}
-				glCullFace(co->cull_mode == RSE::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? GL_FRONT : GL_BACK);
+				glCullFace(co->cull_mode == RS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE ? GL_FRONT : GL_BACK);
 			}
 			cull_mode = co->cull_mode;
 		}
@@ -2068,8 +2071,8 @@ void RasterizerCanvasGLES3::occluder_polygon_set_shape(RID p_occluder, const Vec
 
 			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, oc->vertex_buffer, lc * 6 * sizeof(float), geometry.ptr(), GL_STATIC_DRAW, "Occluder polygon vertex buffer");
 
-			glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-			glVertexAttribPointer(RSE::ARRAY_VERTEX, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
+			glEnableVertexAttribArray(RS::ARRAY_VERTEX);
+			glVertexAttribPointer(RS::ARRAY_VERTEX, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
 
 			glGenBuffers(1, &oc->index_buffer);
 			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, oc->index_buffer);
@@ -2131,8 +2134,8 @@ void RasterizerCanvasGLES3::occluder_polygon_set_shape(RID p_occluder, const Vec
 
 			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, oc->sdf_vertex_buffer, oc->sdf_point_count * 2 * sizeof(float), p_points.ptr(), GL_STATIC_DRAW, "Occluder polygon SDF vertex buffer");
 
-			glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-			glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr);
+			glEnableVertexAttribArray(RS::ARRAY_VERTEX);
+			glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr);
 
 			glGenBuffers(1, &oc->sdf_index_buffer);
 			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, oc->sdf_index_buffer);
@@ -2150,7 +2153,7 @@ void RasterizerCanvasGLES3::occluder_polygon_set_shape(RID p_occluder, const Vec
 	}
 }
 
-void RasterizerCanvasGLES3::occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) {
+void RasterizerCanvasGLES3::occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) {
 	OccluderPolygon *oc = occluder_polygon_owner.get_or_null(p_occluder);
 	ERR_FAIL_NULL(oc);
 	oc->cull_mode = p_mode;
@@ -2158,7 +2161,7 @@ void RasterizerCanvasGLES3::occluder_polygon_set_cull_mode(RID p_occluder, RSE::
 
 void RasterizerCanvasGLES3::set_shadow_texture_size(int p_size) {
 	GLES3::Config *config = GLES3::Config::get_singleton();
-	p_size = Math::nearest_power_of_2_templated(p_size);
+	p_size = nearest_power_of_2_templated(p_size);
 
 	if (p_size > config->max_texture_size) {
 		p_size = config->max_texture_size;
@@ -2240,7 +2243,7 @@ void RasterizerCanvasGLES3::canvas_begin(RID p_to_render_target, bool p_to_backb
 	glBindTexture(GL_TEXTURE_2D, tex->tex_id);
 }
 
-void RasterizerCanvasGLES3::_bind_canvas_texture(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat) {
+void RasterizerCanvasGLES3::_bind_canvas_texture(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat) {
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 	GLES3::Config *config = GLES3::Config::get_singleton();
 
@@ -2276,11 +2279,11 @@ void RasterizerCanvasGLES3::_bind_canvas_texture(RID p_texture, RSE::CanvasItemT
 		return;
 	}
 
-	RSE::CanvasItemTextureFilter filter = ct->texture_filter != RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? ct->texture_filter : p_base_filter;
-	ERR_FAIL_COND(filter == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT);
+	RS::CanvasItemTextureFilter filter = ct->texture_filter != RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? ct->texture_filter : p_base_filter;
+	ERR_FAIL_COND(filter == RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT);
 
-	RSE::CanvasItemTextureRepeat repeat = ct->texture_repeat != RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? ct->texture_repeat : p_base_repeat;
-	ERR_FAIL_COND(repeat == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT);
+	RS::CanvasItemTextureRepeat repeat = ct->texture_repeat != RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? ct->texture_repeat : p_base_repeat;
+	ERR_FAIL_COND(repeat == RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT);
 
 	GLES3::Texture *texture = texture_storage->get_texture(ct->diffuse);
 
@@ -2331,7 +2334,7 @@ void RasterizerCanvasGLES3::_bind_canvas_texture(RID p_texture, RSE::CanvasItemT
 	}
 }
 
-void RasterizerCanvasGLES3::_prepare_canvas_texture(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat, uint32_t &r_index, Size2 &r_texpixel_size) {
+void RasterizerCanvasGLES3::_prepare_canvas_texture(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, uint32_t &r_index, Size2 &r_texpixel_size) {
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 
 	if (p_texture == RID()) {
@@ -2454,8 +2457,8 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 		uint32_t base_offset = 0;
 		{
 			// Always uses vertex positions
-			glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-			glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), nullptr);
+			glEnableVertexAttribArray(RS::ARRAY_VERTEX);
+			glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), nullptr);
 			const Vector2 *points_ptr = p_points.ptr();
 
 			for (uint32_t i = 0; i < vertex_count; i++) {
@@ -2468,8 +2471,8 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 
 		// Next add colors
 		if ((uint32_t)p_colors.size() == vertex_count) {
-			glEnableVertexAttribArray(RSE::ARRAY_COLOR);
-			glVertexAttribPointer(RSE::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
+			glEnableVertexAttribArray(RS::ARRAY_COLOR);
+			glVertexAttribPointer(RS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
 
 			const Color *color_ptr = p_colors.ptr();
 
@@ -2481,14 +2484,14 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 			}
 			base_offset += 4;
 		} else {
-			glDisableVertexAttribArray(RSE::ARRAY_COLOR);
+			glDisableVertexAttribArray(RS::ARRAY_COLOR);
 			pb.color_disabled = true;
 			pb.color = p_colors.size() == 1 ? p_colors[0] : Color(1.0, 1.0, 1.0, 1.0);
 		}
 
 		if ((uint32_t)p_uvs.size() == vertex_count) {
-			glEnableVertexAttribArray(RSE::ARRAY_TEX_UV);
-			glVertexAttribPointer(RSE::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
+			glEnableVertexAttribArray(RS::ARRAY_TEX_UV);
+			glVertexAttribPointer(RS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
 
 			const Vector2 *uv_ptr = p_uvs.ptr();
 
@@ -2499,12 +2502,12 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 
 			base_offset += 2;
 		} else {
-			glDisableVertexAttribArray(RSE::ARRAY_TEX_UV);
+			glDisableVertexAttribArray(RS::ARRAY_TEX_UV);
 		}
 
 		if ((uint32_t)p_indices.size() == vertex_count * 4 && (uint32_t)p_weights.size() == vertex_count * 4) {
-			glEnableVertexAttribArray(RSE::ARRAY_BONES);
-			glVertexAttribPointer(RSE::ARRAY_BONES, 4, GL_UNSIGNED_INT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
+			glEnableVertexAttribArray(RS::ARRAY_BONES);
+			glVertexAttribPointer(RS::ARRAY_BONES, 4, GL_UNSIGNED_INT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
 
 			const int *bone_ptr = p_bones.ptr();
 
@@ -2519,12 +2522,12 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 
 			base_offset += 2;
 		} else {
-			glDisableVertexAttribArray(RSE::ARRAY_BONES);
+			glDisableVertexAttribArray(RS::ARRAY_BONES);
 		}
 
 		if ((uint32_t)p_weights.size() == vertex_count * 4) {
-			glEnableVertexAttribArray(RSE::ARRAY_WEIGHTS);
-			glVertexAttribPointer(RSE::ARRAY_WEIGHTS, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
+			glEnableVertexAttribArray(RS::ARRAY_WEIGHTS);
+			glVertexAttribPointer(RS::ARRAY_WEIGHTS, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(base_offset * sizeof(float)));
 
 			const float *weight_ptr = p_weights.ptr();
 
@@ -2539,7 +2542,7 @@ RendererCanvasRender::PolygonID RasterizerCanvasGLES3::request_polygon(const Vec
 
 			base_offset += 2;
 		} else {
-			glDisableVertexAttribArray(RSE::ARRAY_WEIGHTS);
+			glDisableVertexAttribArray(RS::ARRAY_WEIGHTS);
 		}
 
 		ERR_FAIL_COND_V(base_offset != stride, 0);
@@ -2650,7 +2653,7 @@ RasterizerCanvasGLES3::RasterizerCanvasGLES3() {
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 	GLES3::Config *config = GLES3::Config::get_singleton();
 
-	glVertexAttrib4f(RSE::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
+	glVertexAttrib4f(RS::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
 
 	polygon_buffers.last_id = 1;
 	// quad buffer
@@ -2704,10 +2707,10 @@ RasterizerCanvasGLES3::RasterizerCanvasGLES3() {
 		glGenVertexArrays(1, &data.particle_quad_array);
 		glBindVertexArray(data.particle_quad_array);
 		glBindBuffer(GL_ARRAY_BUFFER, data.particle_quad_vertices);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_TEX_UV);
-		glVertexAttribPointer(RSE::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, CAST_INT_TO_UCHAR_PTR(8));
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_TEX_UV);
+		glVertexAttribPointer(RS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, CAST_INT_TO_UCHAR_PTR(8));
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
diff --git a/engine/drivers/gles3/rasterizer_canvas_gles3.h b/engine/drivers/gles3/rasterizer_canvas_gles3.h
index 6874d5d3..ff1b18c3 100644
--- a/engine/drivers/gles3/rasterizer_canvas_gles3.h
+++ b/engine/drivers/gles3/rasterizer_canvas_gles3.h
@@ -32,11 +32,16 @@
 
 #ifdef GLES3_ENABLED
 
+#include "rasterizer_scene_gles3.h"
+#include "servers/rendering/renderer_canvas_render.h"
+#include "servers/rendering/renderer_compositor.h"
+#include "storage/material_storage.h"
+#include "storage/texture_storage.h"
+
 #include "drivers/gles3/shaders/canvas.glsl.gen.h"
 #include "drivers/gles3/shaders/canvas_occlusion.glsl.gen.h"
-#include "drivers/gles3/storage/material_storage.h"
-#include "servers/rendering/renderer_canvas_render.h"
-#include "servers/rendering/rendering_server_enums.h"
+
+class RasterizerSceneGLES3;
 
 class RasterizerCanvasGLES3 : public RendererCanvasRender {
 	static RasterizerCanvasGLES3 *singleton;
@@ -108,7 +113,7 @@ class RasterizerCanvasGLES3 : public RendererCanvasRender {
 	RID_Owner<CanvasLight> canvas_light_owner;
 
 	struct OccluderPolygon {
-		RSE::CanvasOccluderPolygonCullMode cull_mode = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+		RS::CanvasOccluderPolygonCullMode cull_mode = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 		int line_point_count = 0;
 		GLuint vertex_buffer = 0;
 		GLuint vertex_array = 0;
@@ -255,8 +260,8 @@ public:
 		uint32_t instance_buffer_index = 0;
 
 		RID tex;
-		RSE::CanvasItemTextureFilter filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX;
-		RSE::CanvasItemTextureRepeat repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
+		RS::CanvasItemTextureFilter filter = RS::CANVAS_ITEM_TEXTURE_FILTER_MAX;
+		RS::CanvasItemTextureRepeat repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
 
 		GLES3::CanvasShaderData::BlendMode blend_mode = GLES3::CanvasShaderData::BLEND_MODE_MIX;
 		Color blend_color = Color(1.0, 1.0, 1.0, 1.0);
@@ -265,7 +270,7 @@ public:
 
 		RID material;
 		GLES3::CanvasMaterialData *material_data = nullptr;
-		uint64_t vertex_input_mask = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_COLOR | RSE::ARRAY_FORMAT_TEX_UV;
+		uint64_t vertex_input_mask = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_COLOR | RS::ARRAY_FORMAT_TEX_UV;
 		uint64_t specialization = 0;
 
 		const Item::Command *command = nullptr;
@@ -309,15 +314,15 @@ public:
 		bool using_directional_lights = false;
 
 		RID current_tex;
-		RSE::CanvasItemTextureFilter current_filter_mode = RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX;
-		RSE::CanvasItemTextureRepeat current_repeat_mode = RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
+		RS::CanvasItemTextureFilter current_filter_mode = RS::CANVAS_ITEM_TEXTURE_FILTER_MAX;
+		RS::CanvasItemTextureRepeat current_repeat_mode = RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
 
 		bool transparent_render_target = false;
 
 		double time = 0.0;
 
-		RSE::CanvasItemTextureFilter default_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
-		RSE::CanvasItemTextureRepeat default_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
+		RS::CanvasItemTextureFilter default_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
+		RS::CanvasItemTextureRepeat default_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
 	} state;
 
 	Item *items[MAX_RENDER_ITEMS];
@@ -346,19 +351,19 @@ public:
 	void render_sdf(RID p_render_target, LightOccluderInstance *p_occluders) override;
 	RID occluder_polygon_create() override;
 	void occluder_polygon_set_shape(RID p_occluder, const Vector<Vector2> &p_points, bool p_closed) override;
-	void occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) override;
+	void occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) override;
 	void set_shadow_texture_size(int p_size) override;
 
 	bool free(RID p_rid) override;
 	void update() override;
 
-	void _bind_canvas_texture(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat);
-	void _prepare_canvas_texture(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat, uint32_t &r_index, Size2 &r_texpixel_size);
+	void _bind_canvas_texture(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat);
+	void _prepare_canvas_texture(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, uint32_t &r_index, Size2 &r_texpixel_size);
 
-	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info = nullptr) override;
-	void _render_items(RID p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer = false, RenderingServerTypes::RenderInfo *r_render_info = nullptr, bool p_backbuffer_has_mipmaps = false);
+	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info = nullptr) override;
+	void _render_items(RID p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer = false, RenderingMethod::RenderInfo *r_render_info = nullptr, bool p_backbuffer_has_mipmaps = false);
 	void _record_item_commands(const Item *p_item, RID p_render_target, const Transform2D &p_canvas_transform_inverse, Item *&current_clip, GLES3::CanvasShaderData::BlendMode p_blend_mode, Light *p_lights, uint32_t &r_index, bool &r_break_batch, bool &r_sdf_used, const Point2 &p_repeat_offset);
-	void _render_batch(Light *p_lights, uint32_t p_index, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void _render_batch(Light *p_lights, uint32_t p_index, RenderingMethod::RenderInfo *r_render_info = nullptr);
 	bool _bind_material(GLES3::CanvasMaterialData *p_material_data, CanvasShaderGLES3::ShaderVariant p_variant, uint64_t p_specialization);
 	void _new_batch(bool &r_batch_broken);
 	void _add_to_batch(uint32_t &r_index, bool &r_batch_broken);
@@ -374,7 +379,7 @@ public:
 		}
 	}
 
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override { return 0; }
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override { return 0; }
 
 	static RasterizerCanvasGLES3 *get_singleton();
 	RasterizerCanvasGLES3();
diff --git a/engine/drivers/gles3/rasterizer_gles3.cpp b/engine/drivers/gles3/rasterizer_gles3.cpp
index cc61d822..1df41493 100644
--- a/engine/drivers/gles3/rasterizer_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_gles3.cpp
@@ -29,18 +29,15 @@
 /**************************************************************************/
 
 #include "rasterizer_gles3.h"
+#include "storage/utilities.h"
 
 #ifdef GLES3_ENABLED
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/image.h"
 #include "core/os/os.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "storage/texture_storage.h"
 
 #define _EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242
 #define _EXT_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
@@ -95,6 +92,8 @@
 bool RasterizerGLES3::screen_flipped_y = false;
 #endif
 
+bool RasterizerGLES3::gles_over_gl = true;
+
 void RasterizerGLES3::begin_frame(double frame_step) {
 	frame++;
 	delta = frame_step;
@@ -126,6 +125,23 @@ void RasterizerGLES3::gl_end_frame(bool p_swap_buffers) {
 	}
 }
 
+void RasterizerGLES3::clear_depth(float p_depth) {
+#ifdef GL_API_ENABLED
+	if (is_gles_over_gl()) {
+		glClearDepth(p_depth);
+	}
+#endif // GL_API_ENABLED
+#ifdef GLES_API_ENABLED
+	if (!is_gles_over_gl()) {
+		glClearDepthf(p_depth);
+	}
+#endif // GLES_API_ENABLED
+}
+
+void RasterizerGLES3::clear_stencil(int32_t p_stencil) {
+	glClearStencil(p_stencil);
+}
+
 #ifdef CAN_DEBUG
 static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) {
 	// These are ultimately annoying, so removing for now.
@@ -194,8 +210,6 @@ void RasterizerGLES3::initialize() {
 }
 
 void RasterizerGLES3::finalize() {
-	// Has to be a separate call due to TextureStorage & MaterialStorage needing to interact for TexBlit Shaders
-	texture_storage->_tex_blit_shader_free();
 	memdelete(scene);
 	memdelete(canvas);
 	memdelete(gi);
@@ -214,13 +228,6 @@ void RasterizerGLES3::finalize() {
 	memdelete(config);
 }
 
-void RasterizerGLES3::make_current(bool p_gles_over_gl) {
-	RasterizerUtilGLES3::set_gles_over_gl(p_gles_over_gl);
-	OS::get_singleton()->set_gles_over_gl(p_gles_over_gl);
-	_create_func = _create_current;
-	low_end = true;
-}
-
 RasterizerGLES3 *RasterizerGLES3::singleton = nullptr;
 
 #ifdef EGL_ENABLED
@@ -246,7 +253,7 @@ RasterizerGLES3::RasterizerGLES3() {
 	bool has_egl = (eglGetProcAddress != nullptr);
 #endif
 
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (gles_over_gl) {
 		if (has_egl && !glad_loaded && gladLoadGL((GLADloadfunc)&_egl_load_function_wrapper)) {
 			glad_loaded = true;
 		}
@@ -257,16 +264,14 @@ RasterizerGLES3::RasterizerGLES3() {
 	}
 #endif // EGL_ENABLED
 
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (gles_over_gl) {
 		if (!glad_loaded && gladLoaderLoadGL()) {
 			glad_loaded = true;
 		}
-#ifdef GLES_API_ENABLED
 	} else {
 		if (!glad_loaded && gladLoaderLoadGLES2()) {
 			glad_loaded = true;
 		}
-#endif
 	}
 
 	// FIXME this is an early return from a constructor.  Any other code using this instance will crash or the finalizer will crash, because none of
@@ -274,7 +279,7 @@ RasterizerGLES3::RasterizerGLES3() {
 	// or we need to actually test for this situation before constructing this.
 	ERR_FAIL_COND_MSG(!glad_loaded, "Error initializing GLAD.");
 
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (gles_over_gl) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			if (GLAD_GL_ARB_debug_output) {
 				glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
@@ -290,7 +295,7 @@ RasterizerGLES3::RasterizerGLES3() {
 	// For debugging
 #ifdef CAN_DEBUG
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (gles_over_gl) {
 		if (OS::get_singleton()->is_stdout_verbose() && GLAD_GL_ARB_debug_output) {
 			glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_ERROR_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, nullptr, GL_TRUE);
 			glDebugMessageControlARB(_EXT_DEBUG_SOURCE_API_ARB, _EXT_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB, _EXT_DEBUG_SEVERITY_HIGH_ARB, 0, nullptr, GL_TRUE);
@@ -302,7 +307,7 @@ RasterizerGLES3::RasterizerGLES3() {
 	}
 #endif // GL_API_ENABLED
 #ifdef GLES_API_ENABLED
-	if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (!gles_over_gl) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			DebugMessageCallbackARB callback = (DebugMessageCallbackARB)eglGetProcAddress("glDebugMessageCallback");
 			if (!callback) {
@@ -367,8 +372,6 @@ RasterizerGLES3::RasterizerGLES3() {
 	fog = memnew(GLES3::Fog);
 	canvas = memnew(RasterizerCanvasGLES3());
 	scene = memnew(RasterizerSceneGLES3());
-	// Has to be a separate call due to TextureStorage & MaterialStorage needing to interact for TexBlit Shaders
-	texture_storage->_tex_blit_shader_initialize();
 
 	// Disable OpenGL linear to sRGB conversion, because Godot will always do this conversion itself.
 	if (config->srgb_framebuffer_supported) {
@@ -379,7 +382,7 @@ RasterizerGLES3::RasterizerGLES3() {
 RasterizerGLES3::~RasterizerGLES3() {
 }
 
-void RasterizerGLES3::_blit_render_target_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen &p_blit, bool p_first) {
+void RasterizerGLES3::_blit_render_target_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen &p_blit, bool p_first) {
 	GLES3::RenderTarget *rt = GLES3::TextureStorage::get_singleton()->get_render_target(p_blit.render_target);
 
 	ERR_FAIL_NULL(rt);
@@ -454,13 +457,13 @@ void RasterizerGLES3::_blit_render_target_to_screen(DisplayServerEnums::WindowID
 }
 
 // is this p_screen useless in a multi window environment?
-void RasterizerGLES3::blit_render_targets_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount) {
+void RasterizerGLES3::blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount) {
 	for (int i = 0; i < p_amount; i++) {
 		_blit_render_target_to_screen(p_screen, p_render_targets[i], i == 0);
 	}
 }
 
-void RasterizerGLES3::set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter) {
+void RasterizerGLES3::set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter) {
 	if (p_image.is_null() || p_image->is_empty()) {
 		return;
 	}
@@ -478,7 +481,7 @@ void RasterizerGLES3::set_boot_image_with_stretch(const Ref<Image> &p_image, con
 	RID texture = texture_storage->texture_allocate();
 	texture_storage->texture_2d_initialize(texture, p_image);
 
-	Rect2 screenrect = RenderingServerTypes::get_splash_stretched_screen_rect(p_image->get_size(), win_size, p_stretch_mode);
+	Rect2 screenrect = RenderingServer::get_splash_stretched_screen_rect(p_image->get_size(), win_size, p_stretch_mode);
 
 #ifdef WINDOWS_ENABLED
 	if (!screen_flipped_y)
@@ -494,7 +497,7 @@ void RasterizerGLES3::set_boot_image_with_stretch(const Ref<Image> &p_image, con
 	screenrect.size /= win_size;
 
 	GLES3::Texture *t = texture_storage->get_texture(texture);
-	t->gl_set_filter(p_use_filter ? RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR : RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+	t->gl_set_filter(p_use_filter ? RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR : RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, t->tex_id);
 	copy_effects->copy_to_rect(screenrect);
diff --git a/engine/drivers/gles3/rasterizer_gles3.h b/engine/drivers/gles3/rasterizer_gles3.h
index 0db1af75..6fd5f9c2 100644
--- a/engine/drivers/gles3/rasterizer_gles3.h
+++ b/engine/drivers/gles3/rasterizer_gles3.h
@@ -32,23 +32,23 @@
 
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/effects/copy_effects.h"
-#include "drivers/gles3/effects/cubemap_filter.h"
-#include "drivers/gles3/effects/feed_effects.h"
-#include "drivers/gles3/effects/glow.h"
-#include "drivers/gles3/effects/post_effects.h"
-#include "drivers/gles3/environment/fog.h"
-#include "drivers/gles3/environment/gi.h"
-#include "drivers/gles3/rasterizer_canvas_gles3.h"
-#include "drivers/gles3/rasterizer_scene_gles3.h"
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/light_storage.h"
-#include "drivers/gles3/storage/material_storage.h"
-#include "drivers/gles3/storage/mesh_storage.h"
-#include "drivers/gles3/storage/particles_storage.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
+#include "effects/copy_effects.h"
+#include "effects/cubemap_filter.h"
+#include "effects/feed_effects.h"
+#include "effects/glow.h"
+#include "effects/post_effects.h"
+#include "environment/fog.h"
+#include "environment/gi.h"
+#include "rasterizer_canvas_gles3.h"
+#include "rasterizer_scene_gles3.h"
 #include "servers/rendering/renderer_compositor.h"
+#include "storage/config.h"
+#include "storage/light_storage.h"
+#include "storage/material_storage.h"
+#include "storage/mesh_storage.h"
+#include "storage/particles_storage.h"
+#include "storage/texture_storage.h"
+#include "storage/utilities.h"
 
 class RasterizerGLES3 : public RendererCompositor {
 private:
@@ -61,6 +61,8 @@ private:
 	static bool screen_flipped_y;
 #endif
 
+	static bool gles_over_gl;
+
 protected:
 	GLES3::Config *config = nullptr;
 	GLES3::Utilities *utilities = nullptr;
@@ -80,7 +82,7 @@ protected:
 	RasterizerSceneGLES3 *scene = nullptr;
 	static RasterizerGLES3 *singleton;
 
-	void _blit_render_target_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen &p_blit, bool p_first = true);
+	void _blit_render_target_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen &p_blit, bool p_first = true);
 
 public:
 	RendererUtilities *get_utilities() { return utilities; }
@@ -94,12 +96,12 @@ public:
 	RendererCanvasRender *get_canvas() { return canvas; }
 	RendererSceneRender *get_scene() { return scene; }
 
-	void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter = true);
+	void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter = true);
 
 	void initialize();
 	void begin_frame(double frame_step);
 
-	void blit_render_targets_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount);
+	void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount);
 
 	bool is_opengl() { return true; }
 	void gl_end_frame(bool p_swap_buffers);
@@ -111,7 +113,16 @@ public:
 		return memnew(RasterizerGLES3);
 	}
 
-	static void make_current(bool p_gles_over_gl);
+	static bool is_gles_over_gl() { return gles_over_gl; }
+	static void clear_depth(float p_depth);
+	static void clear_stencil(int32_t p_stencil);
+
+	static void make_current(bool p_gles_over_gl) {
+		gles_over_gl = p_gles_over_gl;
+		OS::get_singleton()->set_gles_over_gl(gles_over_gl);
+		_create_func = _create_current;
+		low_end = true;
+	}
 
 #ifdef WINDOWS_ENABLED
 	static void set_screen_flipped_y(bool p_flipped) {
diff --git a/engine/drivers/gles3/rasterizer_scene_gles3.cpp b/engine/drivers/gles3/rasterizer_scene_gles3.cpp
index db6e1d38..04e07531 100644
--- a/engine/drivers/gles3/rasterizer_scene_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -30,32 +30,29 @@
 
 #include "rasterizer_scene_gles3.h"
 
-#ifdef GLES3_ENABLED
+#include "drivers/gles3/effects/copy_effects.h"
+#include "drivers/gles3/effects/feed_effects.h"
+#include "drivers/gles3/storage/material_storage.h"
+#include "rasterizer_gles3.h"
+#include "storage/config.h"
+#include "storage/mesh_storage.h"
+#include "storage/particles_storage.h"
+#include "storage/texture_storage.h"
 
 #include "core/config/project_settings.h"
 #include "core/templates/sort_array.h"
-#include "drivers/gles3/effects/copy_effects.h"
-#include "drivers/gles3/effects/cubemap_filter.h"
-#include "drivers/gles3/effects/feed_effects.h"
-#include "drivers/gles3/effects/post_effects.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/mesh_storage.h"
-#include "drivers/gles3/storage/particles_storage.h"
-#include "drivers/gles3/storage/render_scene_buffers_gles3.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
 #include "servers/camera/camera_feed.h"
 #include "servers/camera/camera_server.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/rendering_server_types.h"
+
+#ifdef GLES3_ENABLED
 
 RasterizerSceneGLES3 *RasterizerSceneGLES3::singleton = nullptr;
 
 RenderGeometryInstance *RasterizerSceneGLES3::geometry_instance_create(RID p_base) {
-	RSE::InstanceType type = RSG::utilities->get_base_type(p_base);
-	ERR_FAIL_COND_V(!((1 << type) & RSE::INSTANCE_GEOMETRY_MASK), nullptr);
+	RS::InstanceType type = RSG::utilities->get_base_type(p_base);
+	ERR_FAIL_COND_V(!((1 << type) & RS::INSTANCE_GEOMETRY_MASK), nullptr);
 
 	GeometryInstanceGLES3 *ginstance = geometry_instance_alloc.alloc();
 	ginstance->data = memnew(GeometryInstanceGLES3::Data);
@@ -72,42 +69,30 @@ RenderGeometryInstance *RasterizerSceneGLES3::geometry_instance_create(RID p_bas
 }
 
 uint32_t RasterizerSceneGLES3::geometry_instance_get_pair_mask() {
-	return ((1 << RSE::INSTANCE_LIGHT) | (1 << RSE::INSTANCE_REFLECTION_PROBE));
+	return ((1 << RS::INSTANCE_LIGHT) | (1 << RS::INSTANCE_REFLECTION_PROBE));
 }
 
-uint32_t RasterizerSceneGLES3::get_max_lights_total() {
-	return (uint32_t)GLES3::Config::get_singleton()->max_renderable_lights;
-}
+void RasterizerSceneGLES3::GeometryInstanceGLES3::pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) {
+	GLES3::Config *config = GLES3::Config::get_singleton();
 
-uint32_t RasterizerSceneGLES3::get_max_lights_per_mesh() {
-	return (uint32_t)GLES3::Config::get_singleton()->max_lights_per_object;
-}
-
-void RasterizerSceneGLES3::GeometryInstanceGLES3::clear_light_instances() {
 	paired_omni_light_count = 0;
 	paired_spot_light_count = 0;
 	paired_omni_lights.clear();
 	paired_spot_lights.clear();
-}
 
-void RasterizerSceneGLES3::GeometryInstanceGLES3::pair_light_instance(
-		const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) {
-	if (placement_idx < GLES3::Config::get_singleton()->max_lights_per_object) {
-		switch (light_type) {
-			case RSE::LIGHT_OMNI: {
-				if (placement_idx >= paired_omni_light_count) {
-					paired_omni_lights.push_back(p_light_instance);
-					++paired_omni_light_count;
-				} else {
-					paired_omni_lights[placement_idx] = p_light_instance;
+	for (uint32_t i = 0; i < p_light_instance_count; i++) {
+		RS::LightType type = GLES3::LightStorage::get_singleton()->light_instance_get_type(p_light_instances[i]);
+		switch (type) {
+			case RS::LIGHT_OMNI: {
+				if (paired_omni_light_count < (uint32_t)config->max_lights_per_object) {
+					paired_omni_lights.push_back(p_light_instances[i]);
+					paired_omni_light_count++;
 				}
 			} break;
-			case RSE::LIGHT_SPOT: {
-				if (placement_idx >= paired_spot_light_count) {
-					paired_spot_lights.push_back(p_light_instance);
-					++paired_spot_light_count;
-				} else {
-					paired_spot_lights[placement_idx] = p_light_instance;
+			case RS::LIGHT_SPOT: {
+				if (paired_spot_light_count < (uint32_t)config->max_lights_per_object) {
+					paired_spot_lights.push_back(p_light_instances[i]);
+					paired_spot_light_count++;
 				}
 			} break;
 			default:
@@ -198,7 +183,7 @@ void RasterizerSceneGLES3::_geometry_instance_dependency_changed(Dependency::Dep
 		} break;
 		case Dependency::DEPENDENCY_CHANGED_MULTIMESH_VISIBLE_INSTANCES: {
 			GeometryInstanceGLES3 *ginstance = static_cast<GeometryInstanceGLES3 *>(p_tracker->userdata);
-			if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+			if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 				ginstance->instance_count = GLES3::MeshStorage::get_singleton()->multimesh_get_instances_to_draw(ginstance->data->base);
 			}
 		} break;
@@ -271,7 +256,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface_with_material(Geometry
 	void *surface_shadow = nullptr;
 	if (!p_material->shader_data->uses_particle_trails && !p_material->shader_data->writes_modelview_or_projection && !p_material->shader_data->uses_vertex && !p_material->shader_data->uses_discard && !p_material->shader_data->uses_depth_prepass_alpha && !p_material->shader_data->uses_alpha_clip && !p_material->shader_data->uses_world_coordinates && !p_material->shader_data->wireframe) {
 		flags |= GeometryInstanceSurface::FLAG_USES_SHARED_SHADOW_MATERIAL;
-		material_shadow = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.default_material, RSE::SHADER_SPATIAL));
+		material_shadow = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.default_material, RS::SHADER_SPATIAL));
 
 		RID shadow_mesh = mesh_storage->mesh_get_shadow_mesh(p_mesh);
 
@@ -321,7 +306,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface_with_material(Geometry
 	sdcache->sort.priority = p_material->priority;
 
 	GLES3::Mesh::Surface *s = reinterpret_cast<GLES3::Mesh::Surface *>(sdcache->surface);
-	if (p_material->shader_data->uses_tangent && !(s->format & RSE::ARRAY_FORMAT_TANGENT)) {
+	if (p_material->shader_data->uses_tangent && !(s->format & RS::ARRAY_FORMAT_TANGENT)) {
 		String shader_path = p_material->shader_data->path.is_empty() ? "" : "(" + p_material->shader_data->path + ")";
 		String mesh_path = mesh_storage->mesh_get_path(p_mesh).is_empty() ? "" : "(" + mesh_storage->mesh_get_path(p_mesh) + ")";
 		WARN_PRINT_ED(vformat("Attempting to use a shader %s that requires tangents with a mesh %s that doesn't contain tangents. Ensure that meshes are imported with the 'ensure_tangents' option. If creating your own meshes, add an `ARRAY_TANGENT` array (when using ArrayMesh) or call `generate_tangents()` (when using SurfaceTool).", shader_path, mesh_path));
@@ -336,7 +321,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface_with_material_chain(Ge
 
 	while (material_data->next_pass.is_valid()) {
 		RID next_pass = material_data->next_pass;
-		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(next_pass, RSE::SHADER_SPATIAL));
+		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(next_pass, RS::SHADER_SPATIAL));
 		if (!material_data || !material_data->shader_data->valid) {
 			break;
 		}
@@ -356,7 +341,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface(GeometryInstanceGLES3
 	GLES3::SceneMaterialData *material_data = nullptr;
 
 	if (m_src.is_valid()) {
-		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(m_src, RSE::SHADER_SPATIAL));
+		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(m_src, RS::SHADER_SPATIAL));
 		if (!material_data || !material_data->shader_data->valid) {
 			material_data = nullptr;
 		}
@@ -367,7 +352,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface(GeometryInstanceGLES3
 			material_storage->material_update_dependency(m_src, &ginstance->data->dependency_tracker);
 		}
 	} else {
-		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(scene_globals.default_material, RSE::SHADER_SPATIAL));
+		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(scene_globals.default_material, RS::SHADER_SPATIAL));
 		m_src = scene_globals.default_material;
 	}
 
@@ -378,7 +363,7 @@ void RasterizerSceneGLES3::_geometry_instance_add_surface(GeometryInstanceGLES3
 	if (ginstance->data->material_overlay.is_valid()) {
 		m_src = ginstance->data->material_overlay;
 
-		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(m_src, RSE::SHADER_SPATIAL));
+		material_data = static_cast<GLES3::SceneMaterialData *>(material_storage->material_get_data(m_src, RS::SHADER_SPATIAL));
 		if (material_data && material_data->shader_data->valid) {
 			if (ginstance->data->dirty_dependencies) {
 				material_storage->material_update_dependency(m_src, &ginstance->data->dependency_tracker);
@@ -401,7 +386,7 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 
 	//add geometry for drawing
 	switch (ginstance->data->base_type) {
-		case RSE::INSTANCE_MESH: {
+		case RS::INSTANCE_MESH: {
 			const RID *materials = nullptr;
 			uint32_t surface_count;
 			RID mesh = ginstance->data->base;
@@ -422,7 +407,7 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 
 		} break;
 
-		case RSE::INSTANCE_MULTIMESH: {
+		case RS::INSTANCE_MULTIMESH: {
 			RID mesh = mesh_storage->multimesh_get_mesh(ginstance->data->base);
 			if (mesh.is_valid()) {
 				const RID *materials = nullptr;
@@ -439,7 +424,7 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 			}
 
 		} break;
-		case RSE::INSTANCE_PARTICLES: {
+		case RS::INSTANCE_PARTICLES: {
 			int draw_passes = particles_storage->particles_get_draw_passes(ginstance->data->base);
 
 			for (int j = 0; j < draw_passes; j++) {
@@ -469,9 +454,9 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 	bool store_transform = true;
 	ginstance->base_flags = 0;
 
-	if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+	if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
-		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RSE::MULTIMESH_TRANSFORM_2D) {
+		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RS::MULTIMESH_TRANSFORM_2D) {
 			ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH_FORMAT_2D;
 		}
 		if (mesh_storage->multimesh_uses_colors(ginstance->data->base)) {
@@ -481,7 +466,7 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 			ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH_HAS_CUSTOM_DATA;
 		}
 
-	} else if (ginstance->data->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_PARTICLES) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_PARTICLES;
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
 
@@ -492,7 +477,7 @@ void RasterizerSceneGLES3::_geometry_instance_update(RenderGeometryInstance *p_g
 			store_transform = false;
 		}
 
-	} else if (ginstance->data->base_type == RSE::INSTANCE_MESH) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_MESH) {
 		if (mesh_storage->skeleton_is_valid(ginstance->data->skeleton)) {
 			if (ginstance->data->dirty_dependencies) {
 				mesh_storage->skeleton_update_dependency(ginstance->data->skeleton, &ginstance->data->dependency_tracker);
@@ -546,7 +531,7 @@ void RasterizerSceneGLES3::sky_set_radiance_size(RID p_sky, int p_radiance_size)
 	_invalidate_sky(sky);
 }
 
-void RasterizerSceneGLES3::sky_set_mode(RID p_sky, RSE::SkyMode p_mode) {
+void RasterizerSceneGLES3::sky_set_mode(RID p_sky, RS::SkyMode p_mode) {
 	Sky *sky = sky_owner.get_or_null(p_sky);
 	ERR_FAIL_NULL(sky);
 
@@ -591,7 +576,7 @@ GLuint _init_radiance_texture(int p_size, int p_mipmaps, String p_name) {
 	glGenTextures(1, &radiance_id);
 	glBindTexture(GL_TEXTURE_CUBE_MAP, radiance_id);
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		//TODO, on low-end compare this to allocating each face of each mip individually
 		// see: https://www.khronos.org/registry/OpenGL-Refpages/es3.0/html/glTexStorage2D.xhtml
 		for (int i = 0; i < 6; i++) {
@@ -602,7 +587,7 @@ GLuint _init_radiance_texture(int p_size, int p_mipmaps, String p_name) {
 	}
 #endif // GL_API_ENABLED
 #ifdef GLES_API_ENABLED
-	if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (!RasterizerGLES3::is_gles_over_gl()) {
 		glTexStorage2D(GL_TEXTURE_CUBE_MAP, p_mipmaps, GL_RGB10_A2, p_size, p_size);
 	}
 #endif // GLES_API_ENABLED
@@ -657,7 +642,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 		sky_material = sky->material;
 
 		if (sky_material.is_valid()) {
-			material = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+			material = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 			if (!material || !material->shader_data->valid) {
 				material = nullptr;
 			}
@@ -666,7 +651,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 
 	if (!material) {
 		sky_material = sky_globals.default_material;
-		material = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+		material = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 	}
 
 	ERR_FAIL_NULL(material);
@@ -711,8 +696,8 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 
 			ERR_CONTINUE(base.is_null());
 
-			RSE::LightType type = light_storage->light_get_type(base);
-			if (type == RSE::LIGHT_DIRECTIONAL && light_storage->light_directional_get_sky_mode(base) != RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY) {
+			RS::LightType type = light_storage->light_get_type(base);
+			if (type == RS::LIGHT_DIRECTIONAL && light_storage->light_directional_get_sky_mode(base) != RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY) {
 				DirectionalLightData &sky_light_data = sky_globals.directional_lights[sky_globals.directional_light_count];
 				Transform3D light_transform = li->transform;
 				Vector3 world_direction = light_transform.basis.xform(Vector3(0, 0, 1)).normalized();
@@ -722,10 +707,10 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 				sky_light_data.direction[2] = world_direction.z;
 
 				float sign = light_storage->light_is_negative(base) ? -1 : 1;
-				sky_light_data.energy = sign * light_storage->light_get_param(base, RSE::LIGHT_PARAM_ENERGY);
+				sky_light_data.energy = sign * light_storage->light_get_param(base, RS::LIGHT_PARAM_ENERGY);
 
 				if (is_using_physical_light_units()) {
-					sky_light_data.energy *= light_storage->light_get_param(base, RSE::LIGHT_PARAM_INTENSITY);
+					sky_light_data.energy *= light_storage->light_get_param(base, RS::LIGHT_PARAM_INTENSITY);
 				}
 
 				if (p_render_data->camera_attributes.is_valid()) {
@@ -739,7 +724,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 
 				sky_light_data.enabled = true;
 
-				float angular_diameter = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SIZE);
+				float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
 				sky_light_data.size = Math::deg_to_rad(angular_diameter);
 				sky_globals.directional_light_count++;
 				if (sky_globals.directional_light_count >= sky_globals.max_directional_lights) {
@@ -802,7 +787,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 	}
 }
 
-void RasterizerSceneGLES3::_draw_sky(RID p_env, const Projection &p_projection, const Transform3D &p_transform, float p_sky_energy_multiplier, float p_luminance_multiplier, bool p_use_multiview, bool p_flip_y, bool p_apply_environment_effects_in_post) {
+void RasterizerSceneGLES3::_draw_sky(RID p_env, const Projection &p_projection, const Transform3D &p_transform, float p_sky_energy_multiplier, float p_luminance_multiplier, bool p_use_multiview, bool p_flip_y, bool p_apply_color_adjustments_in_post) {
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 	ERR_FAIL_COND(p_env.is_null());
 
@@ -815,17 +800,17 @@ void RasterizerSceneGLES3::_draw_sky(RID p_env, const Projection &p_projection,
 	if (p_flip_y) {
 		spec_constants |= SkyShaderGLES3::USE_INVERTED_Y;
 	}
-	if (!p_apply_environment_effects_in_post) {
+	if (!p_apply_color_adjustments_in_post) {
 		spec_constants |= SkyShaderGLES3::APPLY_TONEMAPPING;
 	}
 
-	RSE::EnvironmentBG background = environment_get_background(p_env);
+	RS::EnvironmentBG background = environment_get_background(p_env);
 
 	if (sky) {
 		sky_material = sky->material;
 
 		if (sky_material.is_valid()) {
-			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 			if (!material_data || !material_data->shader_data->valid) {
 				material_data = nullptr;
 			}
@@ -833,11 +818,11 @@ void RasterizerSceneGLES3::_draw_sky(RID p_env, const Projection &p_projection,
 
 		if (!material_data) {
 			sky_material = sky_globals.default_material;
-			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 		}
-	} else if (background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) {
+	} else if (background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) {
 		sky_material = sky_globals.fog_material;
-		material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+		material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 	}
 
 	ERR_FAIL_NULL(material_data);
@@ -861,7 +846,7 @@ void RasterizerSceneGLES3::_draw_sky(RID p_env, const Projection &p_projection,
 	}
 
 	Projection correction;
-	correction.set_depth_correction(p_flip_y, true, false);
+	correction.set_depth_correction(false, true, false);
 	camera = correction * camera;
 
 	Basis sky_transform = environment_get_sky_orientation(p_env);
@@ -909,14 +894,14 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 	GLES3::SkyMaterialData *material_data = nullptr;
 	RID sky_material;
 
-	RSE::EnvironmentBG background = environment_get_background(p_env);
+	RS::EnvironmentBG background = environment_get_background(p_env);
 
 	if (sky) {
 		ERR_FAIL_NULL(sky);
 		sky_material = sky->material;
 
 		if (sky_material.is_valid()) {
-			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 			if (!material_data || !material_data->shader_data->valid) {
 				material_data = nullptr;
 			}
@@ -924,11 +909,11 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 
 		if (!material_data) {
 			sky_material = sky_globals.default_material;
-			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+			material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 		}
-	} else if (background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) {
+	} else if (background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) {
 		sky_material = sky_globals.fog_material;
-		material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RSE::SHADER_SKY));
+		material_data = static_cast<GLES3::SkyMaterialData *>(material_storage->material_get_data(sky_material, RS::SHADER_SKY));
 	}
 
 	ERR_FAIL_NULL(material_data);
@@ -938,28 +923,28 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 
 	ERR_FAIL_NULL(shader_data);
 
-	bool update_single_frame = sky->mode == RSE::SKY_MODE_REALTIME || sky->mode == RSE::SKY_MODE_QUALITY;
-	RSE::SkyMode sky_mode = sky->mode;
+	bool update_single_frame = sky->mode == RS::SKY_MODE_REALTIME || sky->mode == RS::SKY_MODE_QUALITY;
+	RS::SkyMode sky_mode = sky->mode;
 
-	if (sky_mode == RSE::SKY_MODE_AUTOMATIC) {
+	if (sky_mode == RS::SKY_MODE_AUTOMATIC) {
 		bool sun_scatter_enabled = environment_get_fog_enabled(p_env) && environment_get_fog_sun_scatter(p_env) > 0.001;
 
 		if ((shader_data->uses_time || shader_data->uses_position) && sky->radiance_size == 256) {
 			update_single_frame = true;
-			sky_mode = RSE::SKY_MODE_REALTIME;
+			sky_mode = RS::SKY_MODE_REALTIME;
 		} else if (shader_data->uses_light || sun_scatter_enabled || shader_data->ubo_size > 0) {
 			update_single_frame = false;
-			sky_mode = RSE::SKY_MODE_INCREMENTAL;
+			sky_mode = RS::SKY_MODE_INCREMENTAL;
 		} else {
 			update_single_frame = true;
-			sky_mode = RSE::SKY_MODE_QUALITY;
+			sky_mode = RS::SKY_MODE_QUALITY;
 		}
 	}
 
-	if (sky->processing_layer == 0 && sky_mode == RSE::SKY_MODE_INCREMENTAL) {
+	if (sky->processing_layer == 0 && sky_mode == RS::SKY_MODE_INCREMENTAL) {
 		// On the first frame after creating sky, rebuild in single frame
 		update_single_frame = true;
-		sky_mode = RSE::SKY_MODE_QUALITY;
+		sky_mode = RS::SKY_MODE_QUALITY;
 	}
 
 	int max_processing_layer = sky->mipmap_count;
@@ -986,7 +971,7 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 		Projection cm;
 		cm.set_perspective(90, 1, 0.01, 10.0);
 		Projection correction;
-		correction.set_depth_correction(false, true, false);
+		correction.set_depth_correction(true, true, false);
 		cm = correction * cm;
 
 		bool success = material_storage->shaders.sky_shader.version_bind_shader(shader_data->version, SkyShaderGLES3::MODE_CUBEMAP);
@@ -1006,7 +991,7 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 		glBindFramebuffer(GL_FRAMEBUFFER, sky->radiance_framebuffer);
 
 		scene_state.reset_gl_state();
-		scene_state.set_gl_cull_mode(RSE::CULL_MODE_DISABLED);
+		scene_state.set_gl_cull_mode(RS::CULL_MODE_DISABLED);
 		scene_state.enable_gl_blend(false);
 
 		for (int i = 0; i < 6; i++) {
@@ -1027,9 +1012,9 @@ void RasterizerSceneGLES3::_update_sky_radiance(RID p_env, const Projection &p_p
 		sky->baked_exposure = p_sky_energy_multiplier;
 		sky->reflection_dirty = false;
 	} else {
-		if (sky_mode == RSE::SKY_MODE_INCREMENTAL && sky->processing_layer < max_processing_layer) {
+		if (sky_mode == RS::SKY_MODE_INCREMENTAL && sky->processing_layer < max_processing_layer) {
 			scene_state.reset_gl_state();
-			scene_state.set_gl_cull_mode(RSE::CULL_MODE_DISABLED);
+			scene_state.set_gl_cull_mode(RS::CULL_MODE_DISABLED);
 			scene_state.enable_gl_blend(false);
 
 			cubemap_filter->filter_radiance(sky->raw_radiance, sky->radiance, sky->radiance_framebuffer, sky->radiance_size, sky->mipmap_count, sky->processing_layer);
@@ -1128,23 +1113,23 @@ void RasterizerSceneGLES3::environment_glow_set_use_bicubic_upscale(bool p_enabl
 void RasterizerSceneGLES3::environment_set_ssr_half_size(bool p_half_size) {
 }
 
-void RasterizerSceneGLES3::environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) {
+void RasterizerSceneGLES3::environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) {
 }
 
-void RasterizerSceneGLES3::environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void RasterizerSceneGLES3::environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 	ssao_quality = p_quality;
 }
 
-void RasterizerSceneGLES3::environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void RasterizerSceneGLES3::environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 }
 
-void RasterizerSceneGLES3::environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) {
+void RasterizerSceneGLES3::environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) {
 }
 
-void RasterizerSceneGLES3::environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) {
+void RasterizerSceneGLES3::environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) {
 }
 
-void RasterizerSceneGLES3::environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) {
+void RasterizerSceneGLES3::environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) {
 }
 
 void RasterizerSceneGLES3::environment_set_volumetric_fog_volume_size(int p_size, int p_depth) {
@@ -1156,24 +1141,24 @@ void RasterizerSceneGLES3::environment_set_volumetric_fog_filter_active(bool p_e
 Ref<Image> RasterizerSceneGLES3::environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) {
 	ERR_FAIL_COND_V(p_env.is_null(), Ref<Image>());
 
-	RSE::EnvironmentBG environment_background = environment_get_background(p_env);
+	RS::EnvironmentBG environment_background = environment_get_background(p_env);
 
-	if (environment_background == RSE::ENV_BG_CAMERA_FEED || environment_background == RSE::ENV_BG_CANVAS || environment_background == RSE::ENV_BG_KEEP) {
+	if (environment_background == RS::ENV_BG_CAMERA_FEED || environment_background == RS::ENV_BG_CANVAS || environment_background == RS::ENV_BG_KEEP) {
 		return Ref<Image>(); // Nothing to bake.
 	}
 
-	RSE::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_env);
+	RS::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_env);
 
 	bool use_ambient_light = false;
 	bool use_cube_map = false;
-	if (ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && (environment_background == RSE::ENV_BG_CLEAR_COLOR || environment_background == RSE::ENV_BG_COLOR)) {
+	if (ambient_source == RS::ENV_AMBIENT_SOURCE_BG && (environment_background == RS::ENV_BG_CLEAR_COLOR || environment_background == RS::ENV_BG_COLOR)) {
 		use_ambient_light = true;
 	} else {
-		use_cube_map = (ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && environment_background == RSE::ENV_BG_SKY) || ambient_source == RSE::ENV_AMBIENT_SOURCE_SKY;
-		use_ambient_light = use_cube_map || ambient_source == RSE::ENV_AMBIENT_SOURCE_COLOR;
+		use_cube_map = (ambient_source == RS::ENV_AMBIENT_SOURCE_BG && environment_background == RS::ENV_BG_SKY) || ambient_source == RS::ENV_AMBIENT_SOURCE_SKY;
+		use_ambient_light = use_cube_map || ambient_source == RS::ENV_AMBIENT_SOURCE_COLOR;
 	}
 
-	use_cube_map = use_cube_map || (environment_background == RSE::ENV_BG_SKY && environment_get_sky(p_env).is_valid());
+	use_cube_map = use_cube_map || (environment_background == RS::ENV_BG_SKY && environment_get_sky(p_env).is_valid());
 
 	Color ambient_color;
 	float ambient_color_sky_mix = 0.0;
@@ -1199,7 +1184,7 @@ Ref<Image> RasterizerSceneGLES3::environment_bake_panorama(RID p_env, bool p_bak
 		return panorama;
 	} else {
 		const float bg_energy_multiplier = environment_get_bg_energy_multiplier(p_env);
-		Color panorama_color = ((environment_background == RSE::ENV_BG_CLEAR_COLOR) ? RSG::texture_storage->get_default_clear_color() : environment_get_bg_color(p_env));
+		Color panorama_color = ((environment_background == RS::ENV_BG_CLEAR_COLOR) ? RSG::texture_storage->get_default_clear_color() : environment_get_bg_color(p_env));
 		panorama_color = panorama_color.srgb_to_linear();
 		panorama_color.r *= bg_energy_multiplier;
 		panorama_color.g *= bg_energy_multiplier;
@@ -1215,11 +1200,11 @@ Ref<Image> RasterizerSceneGLES3::environment_bake_panorama(RID p_env, bool p_bak
 	}
 }
 
-void RasterizerSceneGLES3::positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) {
+void RasterizerSceneGLES3::positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) {
 	scene_state.positional_shadow_quality = p_quality;
 }
 
-void RasterizerSceneGLES3::directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) {
+void RasterizerSceneGLES3::directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) {
 	scene_state.directional_shadow_quality = p_quality;
 }
 
@@ -1255,12 +1240,12 @@ bool RasterizerSceneGLES3::voxel_gi_needs_update(RID p_probe) const {
 void RasterizerSceneGLES3::voxel_gi_update(RID p_probe, bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects) {
 }
 
-void RasterizerSceneGLES3::voxel_gi_set_quality(RSE::VoxelGIQuality) {
+void RasterizerSceneGLES3::voxel_gi_set_quality(RS::VoxelGIQuality) {
 }
 
-uint32_t RasterizerSceneGLES3::_indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) const {
-	static const uint32_t divisor[RSE::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RSE::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
+_FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
+	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 void RasterizerSceneGLES3::_fill_render_list(RenderListType p_render_list, const RenderDataGLES3 *p_render_data, PassMode p_pass_mode, bool p_append) {
@@ -1421,9 +1406,9 @@ void RasterizerSceneGLES3::_fill_render_list(RenderListType p_render_list, const
 				if (p_render_data->render_info) {
 					indices = _indices_to_primitives(surf->primitive, indices);
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					}
 				}
 
@@ -1435,9 +1420,9 @@ void RasterizerSceneGLES3::_fill_render_list(RenderListType p_render_list, const
 					to_draw = _indices_to_primitives(surf->primitive, to_draw);
 					to_draw *= inst->instance_count > 0 ? inst->instance_count : 1;
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					}
 				}
 			}
@@ -1445,7 +1430,7 @@ void RasterizerSceneGLES3::_fill_render_list(RenderListType p_render_list, const
 			// ADD Element
 			if (p_pass_mode == PASS_MODE_COLOR) {
 #ifdef DEBUG_ENABLED
-				bool force_alpha = unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW);
+				bool force_alpha = unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW);
 #else
 				bool force_alpha = false;
 #endif
@@ -1555,7 +1540,7 @@ void RasterizerSceneGLES3::_setup_environment(const RenderDataGLES3 *p_render_da
 	//time global variables
 	scene_state.data.time = time;
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 		scene_state.data.use_ambient_light = true;
 		scene_state.data.ambient_light_color_energy[0] = 1;
 		scene_state.data.ambient_light_color_energy[1] = 1;
@@ -1564,8 +1549,8 @@ void RasterizerSceneGLES3::_setup_environment(const RenderDataGLES3 *p_render_da
 		scene_state.data.use_ambient_cubemap = false;
 		scene_state.data.use_reflection_cubemap = false;
 	} else if (is_environment(p_render_data->environment)) {
-		RSE::EnvironmentBG env_bg = environment_get_background(p_render_data->environment);
-		RSE::EnvironmentAmbientSource ambient_src = environment_get_ambient_source(p_render_data->environment);
+		RS::EnvironmentBG env_bg = environment_get_background(p_render_data->environment);
+		RS::EnvironmentAmbientSource ambient_src = environment_get_ambient_source(p_render_data->environment);
 
 		float bg_energy_multiplier = environment_get_bg_energy_multiplier(p_render_data->environment);
 
@@ -1574,8 +1559,8 @@ void RasterizerSceneGLES3::_setup_environment(const RenderDataGLES3 *p_render_da
 		scene_state.data.ambient_color_sky_mix = environment_get_ambient_sky_contribution(p_render_data->environment);
 
 		//ambient
-		if (ambient_src == RSE::ENV_AMBIENT_SOURCE_BG && (env_bg == RSE::ENV_BG_CLEAR_COLOR || env_bg == RSE::ENV_BG_COLOR)) {
-			Color color = env_bg == RSE::ENV_BG_CLEAR_COLOR ? p_default_bg_color : environment_get_bg_color(p_render_data->environment);
+		if (ambient_src == RS::ENV_AMBIENT_SOURCE_BG && (env_bg == RS::ENV_BG_CLEAR_COLOR || env_bg == RS::ENV_BG_COLOR)) {
+			Color color = env_bg == RS::ENV_BG_CLEAR_COLOR ? p_default_bg_color : environment_get_bg_color(p_render_data->environment);
 			color = color.srgb_to_linear();
 
 			scene_state.data.ambient_light_color_energy[0] = color.r * bg_energy_multiplier;
@@ -1594,13 +1579,13 @@ void RasterizerSceneGLES3::_setup_environment(const RenderDataGLES3 *p_render_da
 			Basis sky_transform = environment_get_sky_orientation(p_render_data->environment);
 			sky_transform = sky_transform.inverse() * p_render_data->cam_transform.basis;
 			GLES3::MaterialStorage::store_transform_3x3(sky_transform, scene_state.data.radiance_inverse_xform);
-			scene_state.data.use_ambient_cubemap = (ambient_src == RSE::ENV_AMBIENT_SOURCE_BG && env_bg == RSE::ENV_BG_SKY) || ambient_src == RSE::ENV_AMBIENT_SOURCE_SKY;
-			scene_state.data.use_ambient_light = scene_state.data.use_ambient_cubemap || ambient_src == RSE::ENV_AMBIENT_SOURCE_COLOR;
+			scene_state.data.use_ambient_cubemap = (ambient_src == RS::ENV_AMBIENT_SOURCE_BG && env_bg == RS::ENV_BG_SKY) || ambient_src == RS::ENV_AMBIENT_SOURCE_SKY;
+			scene_state.data.use_ambient_light = scene_state.data.use_ambient_cubemap || ambient_src == RS::ENV_AMBIENT_SOURCE_COLOR;
 		}
 
 		//specular
-		RSE::EnvironmentReflectionSource ref_src = environment_get_reflection_source(p_render_data->environment);
-		if ((ref_src == RSE::ENV_REFLECTION_SOURCE_BG && env_bg == RSE::ENV_BG_SKY) || ref_src == RSE::ENV_REFLECTION_SOURCE_SKY) {
+		RS::EnvironmentReflectionSource ref_src = environment_get_reflection_source(p_render_data->environment);
+		if ((ref_src == RS::ENV_REFLECTION_SOURCE_BG && env_bg == RS::ENV_BG_SKY) || ref_src == RS::ENV_REFLECTION_SOURCE_SKY) {
 			scene_state.data.use_reflection_cubemap = true;
 		} else {
 			scene_state.data.use_reflection_cubemap = false;
@@ -1688,10 +1673,10 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 		ERR_CONTINUE(base.is_null());
 
-		RSE::LightType type = light_storage->light_get_type(base);
+		RS::LightType type = light_storage->light_get_type(base);
 		switch (type) {
-			case RSE::LIGHT_DIRECTIONAL: {
-				if (r_directional_light_count >= RendererSceneRender::MAX_DIRECTIONAL_LIGHTS || light_storage->light_directional_get_sky_mode(base) == RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
+			case RS::LIGHT_DIRECTIONAL: {
+				if (r_directional_light_count >= RendererSceneRender::MAX_DIRECTIONAL_LIGHTS || light_storage->light_directional_get_sky_mode(base) == RS::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
 					continue;
 				}
 
@@ -1718,10 +1703,10 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 				float sign = light_storage->light_is_negative(base) ? -1 : 1;
 
-				light_data.energy = sign * light_storage->light_get_param(base, RSE::LIGHT_PARAM_ENERGY);
+				light_data.energy = sign * light_storage->light_get_param(base, RS::LIGHT_PARAM_ENERGY);
 
 				if (is_using_physical_light_units()) {
-					light_data.energy *= light_storage->light_get_param(base, RSE::LIGHT_PARAM_INTENSITY);
+					light_data.energy *= light_storage->light_get_param(base, RS::LIGHT_PARAM_INTENSITY);
 				} else {
 					light_data.energy *= Math::PI;
 				}
@@ -1735,27 +1720,27 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 				light_data.color[1] = linear_col.g;
 				light_data.color[2] = linear_col.b;
 
-				float size = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SIZE);
+				float size = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
 				light_data.size = 1.0 - Math::cos(Math::deg_to_rad(size)); //angle to cosine offset
 
-				light_data.specular = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SPECULAR);
+				light_data.specular = light_storage->light_get_param(base, RS::LIGHT_PARAM_SPECULAR);
 
 				light_data.mask = light_storage->light_get_cull_mask(base);
 
 				light_data.shadow_opacity = (p_using_shadows && light_storage->light_has_shadow(base))
-						? light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_OPACITY)
+						? light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_OPACITY)
 						: 0.0;
 
 				if (has_shadow) {
 					DirectionalShadowData &shadow_data = scene_state.directional_shadows[MAX_DIRECTIONAL_LIGHTS - 1 - r_directional_shadow_count];
 
-					RSE::LightDirectionalShadowMode shadow_mode = light_storage->light_directional_get_shadow_mode(base);
+					RS::LightDirectionalShadowMode shadow_mode = light_storage->light_directional_get_shadow_mode(base);
 
-					int limit = shadow_mode == RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL ? 0 : (shadow_mode == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS ? 1 : 3);
+					int limit = shadow_mode == RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL ? 0 : (shadow_mode == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS ? 1 : 3);
 
 					shadow_data.shadow_atlas_pixel_size = 1.0 / light_storage->directional_shadow_get_size();
 
-					shadow_data.blend_splits = uint32_t((shadow_mode != RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL) && light_storage->light_directional_get_blend_splits(base));
+					shadow_data.blend_splits = uint32_t((shadow_mode != RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL) && light_storage->light_directional_get_blend_splits(base));
 					for (int j = 0; j < 4; j++) {
 						Rect2 atlas_rect = li->shadow_transform[j].atlas_rect;
 						Projection correction;
@@ -1776,10 +1761,10 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 						Projection shadow_mtx = rectm * bias * matrix * modelview;
 						shadow_data.shadow_split_offsets[j] = split;
-						shadow_data.shadow_normal_bias[j] = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS) * li->shadow_transform[j].shadow_texel_size;
+						shadow_data.shadow_normal_bias[j] = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS) * li->shadow_transform[j].shadow_texel_size;
 						GLES3::MaterialStorage::store_camera(shadow_mtx, shadow_data.shadow_matrices[j]);
 					}
-					float fade_start = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_FADE_START);
+					float fade_start = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_FADE_START);
 					shadow_data.fade_from = -shadow_data.shadow_split_offsets[3] * MIN(fade_start, 0.999);
 					shadow_data.fade_to = -shadow_data.shadow_split_offsets[3];
 
@@ -1788,7 +1773,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 				r_directional_light_count++;
 			} break;
-			case RSE::LIGHT_OMNI: {
+			case RS::LIGHT_OMNI: {
 				if (r_omni_light_count >= (uint32_t)config->max_renderable_lights) {
 					continue;
 				}
@@ -1811,7 +1796,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 				scene_state.omni_light_sort[r_omni_light_count].depth = distance;
 				r_omni_light_count++;
 			} break;
-			case RSE::LIGHT_SPOT: {
+			case RS::LIGHT_SPOT: {
 				if (r_spot_light_count >= (uint32_t)config->max_renderable_lights) {
 					continue;
 				}
@@ -1854,7 +1839,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 	for (uint32_t i = 0; i < (r_omni_light_count + r_spot_light_count); i++) {
 		uint32_t index = (i < r_omni_light_count) ? i : i - (r_omni_light_count);
 		LightData &light_data = (i < r_omni_light_count) ? scene_state.omni_lights[index] : scene_state.spot_lights[index];
-		RSE::LightType type = (i < r_omni_light_count) ? RSE::LIGHT_OMNI : RSE::LIGHT_SPOT;
+		RS::LightType type = (i < r_omni_light_count) ? RS::LIGHT_OMNI : RS::LIGHT_SPOT;
 		GLES3::LightInstance *li = (i < r_omni_light_count) ? scene_state.omni_light_sort[index].instance : scene_state.spot_light_sort[index].instance;
 		real_t distance = (i < r_omni_light_count) ? scene_state.omni_light_sort[index].depth : scene_state.spot_light_sort[index].depth;
 		RID base = li->light;
@@ -1870,7 +1855,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 		light_data.bake_mode = light_storage->light_get_bake_mode(base);
 
-		float radius = MAX(0.001, light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE));
+		float radius = MAX(0.001, light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE));
 		light_data.inv_radius = 1.0 / radius;
 
 		Vector3 direction = inverse_transform.basis.xform(light_transform.basis.xform(Vector3(0, 0, -1))).normalized();
@@ -1879,7 +1864,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 		light_data.direction[1] = direction.y;
 		light_data.direction[2] = direction.z;
 
-		float size = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SIZE);
+		float size = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
 
 		light_data.size = size;
 
@@ -1908,13 +1893,13 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 			}
 		}
 
-		float energy = sign * light_storage->light_get_param(base, RSE::LIGHT_PARAM_ENERGY) * fade;
+		float energy = sign * light_storage->light_get_param(base, RS::LIGHT_PARAM_ENERGY) * fade;
 
 		if (is_using_physical_light_units()) {
-			energy *= light_storage->light_get_param(base, RSE::LIGHT_PARAM_INTENSITY);
+			energy *= light_storage->light_get_param(base, RS::LIGHT_PARAM_INTENSITY);
 
 			// Convert from Luminous Power to Luminous Intensity
-			if (type == RSE::LIGHT_OMNI) {
+			if (type == RS::LIGHT_OMNI) {
 				energy *= 1.0 / (Math::PI * 4.0);
 			} else {
 				// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
@@ -1933,14 +1918,14 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 		light_data.color[1] = linear_col.g * energy;
 		light_data.color[2] = linear_col.b * energy;
 
-		light_data.attenuation = light_storage->light_get_param(base, RSE::LIGHT_PARAM_ATTENUATION);
+		light_data.attenuation = light_storage->light_get_param(base, RS::LIGHT_PARAM_ATTENUATION);
 
-		light_data.inv_spot_attenuation = 1.0f / light_storage->light_get_param(base, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+		light_data.inv_spot_attenuation = 1.0f / light_storage->light_get_param(base, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 
-		float spot_angle = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SPOT_ANGLE);
+		float spot_angle = light_storage->light_get_param(base, RS::LIGHT_PARAM_SPOT_ANGLE);
 		light_data.cos_spot_angle = Math::cos(Math::deg_to_rad(spot_angle));
 
-		light_data.specular_amount = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SPECULAR) * 2.0;
+		light_data.specular_amount = light_storage->light_get_param(base, RS::LIGHT_PARAM_SPECULAR) * 2.0;
 
 		// Setup shadows
 		const bool needs_shadow =
@@ -1966,22 +1951,22 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 			li->shadow_id = num_positional_shadows;
 			num_positional_shadows++;
 
-			light_data.shadow_opacity = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_OPACITY) * shadow_opacity_fade;
+			light_data.shadow_opacity = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_OPACITY) * shadow_opacity_fade;
 
 			float shadow_texel_size = light_storage->light_instance_get_shadow_texel_size(li->self, p_render_data->shadow_atlas);
 			shadow_data.shadow_atlas_pixel_size = shadow_texel_size;
-			shadow_data.shadow_normal_bias = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS) * shadow_texel_size * 10.0;
+			shadow_data.shadow_normal_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS) * shadow_texel_size * 10.0;
 
 			shadow_data.light_position[0] = light_data.position[0];
 			shadow_data.light_position[1] = light_data.position[1];
 			shadow_data.light_position[2] = light_data.position[2];
 
-			if (type == RSE::LIGHT_OMNI) {
+			if (type == RS::LIGHT_OMNI) {
 				Transform3D proj = (inverse_transform * light_transform).inverse();
 
 				GLES3::MaterialStorage::store_transform(proj, shadow_data.shadow_matrix);
 
-			} else if (type == RSE::LIGHT_SPOT) {
+			} else if (type == RS::LIGHT_SPOT) {
 				Transform3D modelview = (inverse_transform * light_transform).inverse();
 				Projection bias;
 				bias.set_light_bias();
@@ -2040,9 +2025,9 @@ void RasterizerSceneGLES3::_render_shadows(const RenderDataGLES3 *p_render_data,
 			RID li = p_render_data->render_shadows[i].light;
 			RID base = light_storage->light_instance_get_base_light(li);
 
-			if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+			if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 				directional_shadows.push_back(i);
-			} else if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+			} else if (light_storage->light_get_type(base) == RS::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				cube_shadows.push_back(i);
 			} else {
 				shadows.push_back(i);
@@ -2073,7 +2058,7 @@ void RasterizerSceneGLES3::_render_shadows(const RenderDataGLES3 *p_render_data,
 	}
 }
 
-void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, RenderingServerTypes::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
+void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, RenderingMethod::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
 	GLES3::LightStorage *light_storage = GLES3::LightStorage::get_singleton();
 
 	ERR_FAIL_COND(!light_storage->owns_light_instance(p_light));
@@ -2091,7 +2076,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 	GLuint shadow_fb = 0;
 	Rect2i atlas_rect;
 
-	if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+	if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 		// Set pssm stuff.
 		uint64_t last_scene_shadow_pass = light_storage->light_instance_get_shadow_pass(p_light);
 		if (last_scene_shadow_pass != get_scene_pass()) {
@@ -2102,7 +2087,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 
 		atlas_rect = light_storage->light_instance_get_directional_rect(p_light);
 
-		if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
+		if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
 			atlas_rect.size.width /= 2;
 			atlas_rect.size.height /= 2;
 
@@ -2113,7 +2098,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 			} else if (p_pass == 3) {
 				atlas_rect.position += atlas_rect.size;
 			}
-		} else if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
+		} else if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
 			atlas_rect.size.height /= 2;
 
 			if (p_pass == 0) {
@@ -2122,7 +2107,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 			}
 		}
 
-		use_pancake = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
+		use_pancake = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
 		light_projection = light_storage->light_instance_get_shadow_camera(p_light, p_pass);
 		light_transform = light_storage->light_instance_get_shadow_transform(p_light, p_pass);
 
@@ -2132,12 +2117,12 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 		atlas_rect_norm.size /= directional_shadow_size;
 		light_storage->light_instance_set_directional_shadow_atlas_rect(p_light, p_pass, atlas_rect_norm);
 
-		zfar = RSG::light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = RSG::light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 		shadow_fb = light_storage->direction_shadow_get_fb();
 		reverse_cull = !light_storage->light_get_reverse_cull_face_mode(base);
 
 		float bias_scale = light_storage->light_instance_get_shadow_bias_scale(p_light, p_pass);
-		shadow_bias = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_BIAS) / 100.0 * bias_scale;
+		shadow_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_BIAS) / 100.0 * bias_scale;
 
 	} else {
 		// Set from shadow atlas.
@@ -2156,11 +2141,11 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 
 		shadow_fb = light_storage->shadow_atlas_get_quadrant_shadow_fb(p_shadow_atlas, quadrant, shadow);
 
-		zfar = light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 		reverse_cull = !light_storage->light_get_reverse_cull_face_mode(base);
 
-		if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI) {
-			if (light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+		if (light_storage->light_get_type(base) == RS::LIGHT_OMNI) {
+			if (light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				GLuint shadow_texture = light_storage->shadow_atlas_get_quadrant_shadow_texture(p_shadow_atlas, quadrant, shadow);
 				glBindFramebuffer(GL_FRAMEBUFFER, shadow_fb);
 
@@ -2184,15 +2169,15 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 				ERR_FAIL_MSG("Dual paraboloid shadow mode not supported in the Compatibility renderer. Please use CubeMap shadow mode instead.");
 			}
 
-			shadow_bias = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_BIAS);
+			shadow_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_BIAS);
 
-		} else if (light_storage->light_get_type(base) == RSE::LIGHT_SPOT) {
+		} else if (light_storage->light_get_type(base) == RS::LIGHT_SPOT) {
 			light_projection = light_storage->light_instance_get_shadow_camera(p_light, 0);
 			light_transform = light_storage->light_instance_get_shadow_transform(p_light, 0);
 
-			shadow_bias = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_BIAS) / 10.0;
+			shadow_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_BIAS) / 10.0;
 			// Prebake range into bias so we can scale based on distance easily.
-			shadow_bias *= light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+			shadow_bias *= light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 		}
 		atlas_rect.size.x = shadow_size;
 		atlas_rect.size.y = shadow_size;
@@ -2214,7 +2199,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 
 	_setup_environment(&render_data, true, p_viewport_size, false, Color(), use_pancake, shadow_bias);
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
 		render_data.screen_mesh_lod_threshold = 0.0;
 	} else {
 		render_data.screen_mesh_lod_threshold = p_screen_mesh_lod_threshold;
@@ -2238,7 +2223,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 
 	glColorMask(0, 0, 0, 0);
 	glDrawBuffers(0, nullptr);
-	RasterizerUtilGLES3::clear_depth(0.0);
+	RasterizerGLES3::clear_depth(0.0);
 	if (needs_clear) {
 		glClear(GL_DEPTH_BUFFER_BIT);
 	}
@@ -2250,7 +2235,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 			SceneShaderGLES3::DISABLE_FOG |
 			SceneShaderGLES3::RENDER_SHADOWS;
 
-	if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI) {
+	if (light_storage->light_get_type(base) == RS::LIGHT_OMNI) {
 		spec_constant_base_flags |= SceneShaderGLES3::RENDER_SHADOWS_LINEAR;
 	}
 
@@ -2262,24 +2247,24 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
 	scene_state.enable_gl_depth_test(false);
 	scene_state.enable_gl_depth_draw(true);
 	glDisable(GL_CULL_FACE);
-	scene_state.cull_mode = RSE::CULL_MODE_DISABLED;
+	scene_state.cull_mode = RS::CULL_MODE_DISABLED;
 	glBindFramebuffer(GL_FRAMEBUFFER, GLES3::TextureStorage::system_fbo);
 }
 
-void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data, RenderingServerTypes::RenderInfo *r_render_info) {
+void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data, RenderingMethod::RenderInfo *r_render_info) {
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 	GLES3::Config *config = GLES3::Config::get_singleton();
 	RENDER_TIMESTAMP("Setup 3D Scene");
 
-	bool apply_environment_effects_in_post = false;
+	bool apply_color_adjustments_in_post = false;
 	bool is_reflection_probe = p_reflection_probe.is_valid();
 
 	Ref<RenderSceneBuffersGLES3> rb = p_render_buffers;
 	ERR_FAIL_COND(rb.is_null());
 
-	if (rb->get_scaling_3d_mode() != RSE::VIEWPORT_SCALING_3D_MODE_OFF) {
+	if (rb->get_scaling_3d_mode() != RS::VIEWPORT_SCALING_3D_MODE_OFF) {
 		// If we're scaling, we apply tonemapping etc. in post, so disable it during rendering
-		apply_environment_effects_in_post = true;
+		apply_color_adjustments_in_post = true;
 	}
 
 	GLES3::RenderTarget *rt = nullptr; // No render target for reflection probe
@@ -2289,17 +2274,20 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 	}
 
 	bool glow_enabled = false;
-	bool ssao_enabled = false;
-	bool use_bcs = false;
 	if (p_environment.is_valid()) {
-		// We apply tonemapping, etc. in post when any of these are true. In this
-		// case, set apply_environment_effects_in_post to true to skip tonemapping during rendering.
 		glow_enabled = environment_get_glow_enabled(p_environment);
+		if (glow_enabled) {
+			// If glow is enabled, we apply tonemapping etc. in post, so disable it during rendering
+			apply_color_adjustments_in_post = true;
+		}
+	}
+
+	bool ssao_enabled = false;
+	if (p_environment.is_valid()) {
 		ssao_enabled = environment_get_ssao_enabled(p_environment);
-		use_bcs = environment_get_adjustments_enabled(p_environment);
-		bool canvas_tonemapping = environment_get_background(p_environment) == RSE::ENV_BG_CANVAS && environment_get_tone_mapper(p_environment) != RSE::ENV_TONE_MAPPER_LINEAR;
-		if (glow_enabled || ssao_enabled || use_bcs || canvas_tonemapping) {
-			apply_environment_effects_in_post = true;
+		if (ssao_enabled) {
+			// If SSAO is enabled, we apply tonemapping etc. in post, so disable it during rendering
+			apply_color_adjustments_in_post = true;
 		}
 	}
 
@@ -2319,6 +2307,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		render_data.inv_cam_transform = render_data.cam_transform.affine_inverse();
 		render_data.cam_projection = p_camera_data->main_projection;
 		render_data.cam_orthogonal = p_camera_data->is_orthogonal;
+		render_data.cam_frustum = p_camera_data->is_frustum;
 		render_data.camera_visible_layers = p_camera_data->visible_layers;
 		render_data.main_cam_transform = p_camera_data->main_transform;
 
@@ -2350,7 +2339,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 			render_data.luminance_multiplier = 1.0;
 		}
 
-		if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
+		if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
 			render_data.screen_mesh_lod_threshold = 0.0;
 		} else {
 			render_data.screen_mesh_lod_threshold = p_screen_mesh_lod_threshold;
@@ -2362,7 +2351,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 
 	PagedArray<RID> empty;
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 		render_data.lights = &empty;
 		render_data.reflection_probes = &empty;
 	}
@@ -2387,13 +2376,18 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 
 	Size2i screen_size = rb->internal_size;
 
-	bool use_wireframe = get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME;
+	bool use_wireframe = get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME;
 
 	SceneState::TonemapUBO tonemap_ubo;
 	if (render_data.environment.is_valid()) {
+		bool use_bcs = environment_get_adjustments_enabled(render_data.environment);
+		if (use_bcs) {
+			apply_color_adjustments_in_post = true;
+		}
+
 		tonemap_ubo.exposure = environment_get_exposure(render_data.environment);
 		tonemap_ubo.tonemapper = int32_t(environment_get_tone_mapper(render_data.environment));
-		RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(render_data.environment, false, 1.0f);
+		RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(render_data.environment, false);
 		tonemap_ubo.tonemapper_params[0] = params.tonemapper_params[0];
 		tonemap_ubo.tonemapper_params[1] = params.tonemapper_params[1];
 		tonemap_ubo.tonemapper_params[2] = params.tonemapper_params[2];
@@ -2455,23 +2449,22 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 	bool draw_feed = false;
 	float sky_energy_multiplier = 1.0;
 	int camera_feed_id = -1;
-	bool apply_canvas_bg_exposure = false;
 
-	if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
+	if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
 		clear_color = Color(0, 0, 0, 1); //in overdraw mode, BG should always be black
 	} else if (render_data.environment.is_valid()) {
-		RSE::EnvironmentBG bg_mode = environment_get_background(render_data.environment);
+		RS::EnvironmentBG bg_mode = environment_get_background(render_data.environment);
 		float bg_energy_multiplier = environment_get_bg_energy_multiplier(render_data.environment);
 		bg_energy_multiplier *= environment_get_bg_intensity(render_data.environment);
-		RSE::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(render_data.environment);
-		RSE::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(render_data.environment);
+		RS::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(render_data.environment);
+		RS::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(render_data.environment);
 
 		if (render_data.camera_attributes.is_valid()) {
 			bg_energy_multiplier *= RSG::camera_attributes->camera_attributes_get_exposure_normalization_factor(render_data.camera_attributes);
 		}
 
 		switch (bg_mode) {
-			case RSE::ENV_BG_CLEAR_COLOR: {
+			case RS::ENV_BG_CLEAR_COLOR: {
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
 				clear_color.b *= bg_energy_multiplier;
@@ -2480,7 +2473,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 					GLES3::MaterialStorage::get_singleton()->material_set_param(sky_globals.fog_material, "clear_color", Variant(clear_color));
 				}
 			} break;
-			case RSE::ENV_BG_COLOR: {
+			case RS::ENV_BG_COLOR: {
 				clear_color = environment_get_bg_color(render_data.environment);
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
@@ -2490,17 +2483,16 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 					GLES3::MaterialStorage::get_singleton()->material_set_param(sky_globals.fog_material, "clear_color", Variant(clear_color));
 				}
 			} break;
-			case RSE::ENV_BG_SKY: {
+			case RS::ENV_BG_SKY: {
 				draw_sky = !render_data.transparent_bg;
 			} break;
-			case RSE::ENV_BG_CANVAS: {
+			case RS::ENV_BG_CANVAS: {
 				draw_canvas = true;
-				apply_canvas_bg_exposure = !Math::is_equal_approx(tonemap_ubo.exposure, 1.0f);
 			} break;
-			case RSE::ENV_BG_KEEP: {
+			case RS::ENV_BG_KEEP: {
 				keep_color = true;
 			} break;
-			case RSE::ENV_BG_CAMERA_FEED: {
+			case RS::ENV_BG_CAMERA_FEED: {
 				camera_feed_id = environment_get_camera_feed_id(render_data.environment);
 				draw_feed = true;
 				keep_color = true;
@@ -2509,15 +2501,20 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 			}
 		}
 
-		bool sky_reflections = reflection_source == RSE::ENV_REFLECTION_SOURCE_SKY;
-		sky_reflections |= reflection_source == RSE::ENV_REFLECTION_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY;
-		bool sky_ambient = ambient_source == RSE::ENV_AMBIENT_SOURCE_SKY;
-		sky_ambient |= ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY;
+		bool sky_reflections = reflection_source == RS::ENV_REFLECTION_SOURCE_SKY;
+		sky_reflections |= reflection_source == RS::ENV_REFLECTION_SOURCE_BG && bg_mode == RS::ENV_BG_SKY;
+		bool sky_ambient = ambient_source == RS::ENV_AMBIENT_SOURCE_SKY;
+		sky_ambient |= ambient_source == RS::ENV_AMBIENT_SOURCE_BG && bg_mode == RS::ENV_BG_SKY;
 
 		// setup sky if used for ambient, reflections, or background
 		if (draw_sky || draw_sky_fog_only || sky_reflections || sky_ambient) {
 			RENDER_TIMESTAMP("Setup Sky");
 			Projection projection = render_data.cam_projection;
+			if (is_reflection_probe) {
+				Projection correction;
+				correction.set_depth_correction(true, true, false);
+				projection = correction * render_data.cam_projection;
+			}
 
 			sky_energy_multiplier *= bg_energy_multiplier;
 
@@ -2551,7 +2548,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		scene_state.enable_gl_scissor_test(false);
 
 		glColorMask(1, 1, 1, 1);
-		RasterizerUtilGLES3::clear_depth(0.0);
+		RasterizerGLES3::clear_depth(0.0);
 		glClearColor(0.0, 0.0, 0.0, 0.0);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 		GLuint db = GL_COLOR_ATTACHMENT0;
@@ -2574,8 +2571,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 	if (is_reflection_probe && GLES3::LightStorage::get_singleton()->reflection_probe_has_atlas_index(render_data.reflection_probe)) {
 		fbo = GLES3::LightStorage::get_singleton()->reflection_probe_instance_get_framebuffer(render_data.reflection_probe, render_data.reflection_probe_pass);
 	} else {
-		rb->set_apply_environment_effects_in_post(apply_environment_effects_in_post);
-		rb->set_apply_canvas_bg_exposure(apply_canvas_bg_exposure);
+		rb->set_apply_color_adjustments_in_post(apply_color_adjustments_in_post);
 		fbo = rb->get_render_fbo();
 	}
 
@@ -2594,7 +2590,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 	use_depth_prepass = use_depth_prepass || scene_state.used_opaque_stencil;
 
 	// Don't do depth prepass we are rendering overdraw
-	use_depth_prepass = use_depth_prepass && get_debug_draw_mode() != RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW;
+	use_depth_prepass = use_depth_prepass && get_debug_draw_mode() != RS::VIEWPORT_DEBUG_DRAW_OVERDRAW;
 
 	if (use_depth_prepass) {
 		RENDER_TIMESTAMP("Depth Prepass");
@@ -2612,8 +2608,8 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		scene_state.enable_gl_stencil_test(false);
 
 		glColorMask(0, 0, 0, 0);
-		RasterizerUtilGLES3::clear_depth(0.0);
-		RasterizerUtilGLES3::clear_stencil(0);
+		RasterizerGLES3::clear_depth(0.0);
+		RasterizerGLES3::clear_stencil(0);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 		// Some desktop GL implementations fall apart when using Multiview with GL_NONE.
 		GLuint db = p_camera_data->view_count > 1 ? GL_COLOR_ATTACHMENT0 : GL_NONE;
@@ -2657,8 +2653,8 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 	scene_state.enable_gl_stencil_test(false);
 
 	if (!fb_cleared) {
-		RasterizerUtilGLES3::clear_depth(0.0);
-		RasterizerUtilGLES3::clear_stencil(0);
+		RasterizerGLES3::clear_depth(0.0);
+		RasterizerGLES3::clear_stencil(0);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 	}
 
@@ -2679,11 +2675,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(rt->view_count > 1 ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D, rt->color);
 
-		if (apply_canvas_bg_exposure) {
-			copy_effects->copy_with_exposure(tonemap_ubo.exposure, render_data.luminance_multiplier);
-		} else {
-			copy_effects->copy_screen(render_data.luminance_multiplier);
-		}
+		copy_effects->copy_screen(render_data.luminance_multiplier);
 
 		scene_state.enable_gl_depth_test(true);
 		scene_state.enable_gl_depth_draw(true);
@@ -2706,11 +2698,11 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 			spec_constant_base_flags |= SceneShaderGLES3::DISABLE_FOG;
 		}
 
-		if (render_data.environment.is_valid() && environment_get_fog_mode(render_data.environment) == RSE::EnvironmentFogMode::ENV_FOG_MODE_DEPTH) {
+		if (render_data.environment.is_valid() && environment_get_fog_mode(render_data.environment) == RS::EnvironmentFogMode::ENV_FOG_MODE_DEPTH) {
 			spec_constant_base_flags |= SceneShaderGLES3::USE_DEPTH_FOG;
 		}
 
-		if (!apply_environment_effects_in_post) {
+		if (!apply_color_adjustments_in_post) {
 			spec_constant_base_flags |= SceneShaderGLES3::APPLY_TONEMAPPING;
 		}
 	}
@@ -2721,7 +2713,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		scene_state.enable_gl_depth_draw(false);
 		scene_state.enable_gl_depth_test(false);
 		scene_state.enable_gl_blend(false);
-		scene_state.set_gl_cull_mode(RSE::CULL_MODE_BACK);
+		scene_state.set_gl_cull_mode(RS::CULL_MODE_BACK);
 
 		Ref<CameraFeed> feed = CameraServer::get_singleton()->get_feed_by_id(camera_feed_id);
 
@@ -2751,12 +2743,20 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
 		scene_state.enable_gl_depth_test(true);
 		scene_state.set_gl_depth_func(GL_GEQUAL);
 		scene_state.enable_gl_blend(false);
-		scene_state.set_gl_cull_mode(RSE::CULL_MODE_BACK);
+		scene_state.set_gl_cull_mode(RS::CULL_MODE_BACK);
 
 		Transform3D transform = render_data.cam_transform;
 		Projection projection = render_data.cam_projection;
+		if (is_reflection_probe) {
+			Projection correction;
+			correction.columns[1][1] = -1.0;
+			projection = correction * render_data.cam_projection;
+		} else if (render_data.cam_frustum) {
+			// Sky is drawn upside down, the frustum offset doesn't know the image is upside down so needs a flip.
+			projection[2].y = -projection[2].y;
+		}
 
-		_draw_sky(render_data.environment, projection, transform, sky_energy_multiplier, render_data.luminance_multiplier, p_camera_data->view_count > 1, flip_y, apply_environment_effects_in_post);
+		_draw_sky(render_data.environment, projection, transform, sky_energy_multiplier, render_data.luminance_multiplier, p_camera_data->view_count > 1, flip_y, apply_color_adjustments_in_post);
 	}
 
 	if (scene_state.used_screen_texture || scene_state.used_depth_texture) {
@@ -2835,7 +2835,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 	Size2i target_size = rb->get_target_size();
 	uint32_t view_count = rb->get_view_count();
 
-	// bool msaa2d_needs_resolve = texture_storage->render_target_get_msaa(render_target) != RSE::VIEWPORT_MSAA_DISABLED && !GLES3::Config::get_singleton()->rt_msaa_supported;
+	// bool msaa2d_needs_resolve = texture_storage->render_target_get_msaa(render_target) != RS::VIEWPORT_MSAA_DISABLED && !GLES3::Config::get_singleton()->rt_msaa_supported;
 	bool msaa3d_needs_resolve = rb->get_msaa_needs_resolve();
 	GLuint fbo_msaa_3d = rb->get_msaa3d_fbo();
 	GLuint fbo_int = rb->get_internal_fbo();
@@ -2856,7 +2856,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 		glow_hdr_bleed_threshold = environment_get_glow_hdr_bleed_threshold(p_render_data->environment);
 		glow_hdr_bleed_scale = environment_get_glow_hdr_bleed_scale(p_render_data->environment);
 		glow_hdr_luminance_cap = environment_get_glow_hdr_luminance_cap(p_render_data->environment);
-		srgb_white = environment_get_white(p_render_data->environment, false, 1.0f);
+		srgb_white = environment_get_white(p_render_data->environment, false);
 	}
 
 	if (glow_enabled) {
@@ -2929,7 +2929,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 			// We need to pass this in for SSAO.
 			GLuint depth_buffer = fbo_int != 0 ? rb->get_internal_depth() : texture_storage->render_target_get_depth(render_target);
 
-			const GLES3::Glow::Level *glow_buffers = nullptr;
+			const GLES3::Glow::GLOWLEVEL *glow_buffers = nullptr;
 			if (glow_enabled) {
 				glow_buffers = rb->get_glow_buffers();
 
@@ -2948,7 +2948,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 			post_effects->post_copy(fbo_rt, target_size, color,
 					depth_buffer, ssao_enabled, ssao_quality, ssao_strength, ssao_radius,
 					internal_size, p_render_data->luminance_multiplier, glow_buffers, glow_intensity,
-					srgb_white, 0, false, bcs_spec_constants, p_render_data->render_buffers->scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_NEAREST);
+					srgb_white, 0, false, bcs_spec_constants);
 
 			// Copy depth buffer
 			glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_int);
@@ -2992,7 +2992,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 		// Rendered to intermediate buffer, must copy to our render target
 		if (fbo_int != 0) {
 			// Apply glow/bloom if requested? then populate our glow buffers
-			const GLES3::Glow::Level *glow_buffers = nullptr;
+			const GLES3::Glow::GLOWLEVEL *glow_buffers = nullptr;
 			GLuint source_color = fbo_int != 0 ? rb->get_internal_color() : texture_storage->render_target_get_color(render_target);
 
 			// Moved this up so SSAO could use it too.
@@ -3022,7 +3022,7 @@ void RasterizerSceneGLES3::_render_post_processing(const RenderDataGLES3 *p_rend
 				post_effects->post_copy(fbos[2], target_size, source_color,
 						read_depth, ssao_enabled, ssao_quality, ssao_strength, ssao_radius,
 						internal_size, p_render_data->luminance_multiplier, glow_buffers, glow_intensity,
-						srgb_white, v, true, bcs_spec_constants, p_render_data->render_buffers->scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_NEAREST);
+						srgb_white, v, true, bcs_spec_constants);
 			}
 
 			// Copy depth
@@ -3094,7 +3094,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 	if constexpr (p_pass_mode != PASS_MODE_DEPTH && p_pass_mode != PASS_MODE_MOTION_VECTORS) {
 		// Don't count elements during depth pre-pass or motion vector pass to match the RD renderers.
 		if (p_render_data->render_info) {
-			p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += p_to_element - p_from_element;
+			p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += p_to_element - p_from_element;
 		}
 	}
 
@@ -3119,10 +3119,10 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 			material_data = surf->material_shadow;
 			mesh_surface = surf->surface_shadow;
 		} else {
-			if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
+			if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
 				material_data = overdraw_material_data_ptr;
 				shader = material_data->shader_data;
-			} else if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
+			} else if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
 				material_data = default_material_data_ptr;
 				shader = material_data->shader_data;
 			} else {
@@ -3233,7 +3233,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 					}
 				} else if (pass > 0) {
 					uint32_t shadow_id = MAX_DIRECTIONAL_LIGHTS - 1 - (pass - int32_t(inst->light_passes.size()));
-					if (inst->lightmap_instance.is_valid() && scene_state.directional_lights[shadow_id].bake_mode == RSE::LIGHT_BAKE_STATIC) {
+					if (inst->lightmap_instance.is_valid() && scene_state.directional_lights[shadow_id].bake_mode == RenderingServer::LIGHT_BAKE_STATIC) {
 						// Skip shadows for static lights on meshes with a lightmap.
 						continue;
 					}
@@ -3292,27 +3292,27 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 			}
 
 			// Find cull variant.
-			RSE::CullMode cull_mode = shader->cull_mode;
+			RS::CullMode cull_mode = shader->cull_mode;
 
 			if (p_pass_mode == PASS_MODE_MATERIAL || (p_pass_mode == PASS_MODE_SHADOW && (surf->flags & GeometryInstanceSurface::FLAG_USES_DOUBLE_SIDED_SHADOWS))) {
-				cull_mode = RSE::CULL_MODE_DISABLED;
+				cull_mode = RS::CULL_MODE_DISABLED;
 			} else {
 				bool mirror = inst->mirror;
 				if (p_params->reverse_cull) {
 					mirror = !mirror;
 				}
-				if (cull_mode == RSE::CULL_MODE_FRONT && mirror) {
-					cull_mode = RSE::CULL_MODE_BACK;
-				} else if (cull_mode == RSE::CULL_MODE_BACK && mirror) {
-					cull_mode = RSE::CULL_MODE_FRONT;
+				if (cull_mode == RS::CULL_MODE_FRONT && mirror) {
+					cull_mode = RS::CULL_MODE_BACK;
+				} else if (cull_mode == RS::CULL_MODE_BACK && mirror) {
+					cull_mode = RS::CULL_MODE_FRONT;
 				}
 			}
 
 			scene_state.set_gl_cull_mode(cull_mode);
 
-			RSE::PrimitiveType primitive = surf->primitive;
+			RS::PrimitiveType primitive = surf->primitive;
 			if (shader->uses_point_size) {
-				primitive = RSE::PRIMITIVE_POINTS;
+				primitive = RS::PRIMITIVE_POINTS;
 			}
 			static const GLenum prim[5] = { GL_POINTS, GL_LINES, GL_LINE_STRIP, GL_TRIANGLES, GL_TRIANGLE_STRIP };
 			GLenum primitive_gl = prim[int(primitive)];
@@ -3321,7 +3321,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 			GLuint index_array_gl = 0;
 			uint64_t vertex_input_mask = shader->vertex_input_mask;
 			if (inst->lightmap_instance.is_valid() || p_pass_mode == PASS_MODE_MATERIAL) {
-				vertex_input_mask |= 1 << RSE::ARRAY_TEX_UV2;
+				vertex_input_mask |= 1 << RS::ARRAY_TEX_UV2;
 			}
 
 			// Skeleton and blend shapes.
@@ -3387,7 +3387,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 				if (pass == 0) {
 					spec_constants |= SceneShaderGLES3::BASE_PASS;
 
-					if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+					if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 						spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_OMNI;
 						spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_SPOT;
 						spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_DIRECTIONAL;
@@ -3451,7 +3451,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						GLES3::LightmapInstance *li = GLES3::LightStorage::get_singleton()->get_lightmap_instance(inst->lightmap_instance);
 						GLES3::Lightmap *lm = GLES3::LightStorage::get_singleton()->get_lightmap(li->lightmap);
 
-						if (lm->shadowmask_mode != RSE::SHADOWMASK_MODE_NONE) {
+						if (lm->shadowmask_mode != RS::SHADOWMASK_MODE_NONE) {
 							spec_constants |= SceneShaderGLES3::USE_LIGHTMAP;
 							disable_lightmaps = false;
 
@@ -3477,9 +3477,9 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 							spec_constants |= SceneShaderGLES3::ADDITIVE_SPOT;
 						}
 
-						if (scene_state.positional_shadow_quality >= RSE::SHADOW_QUALITY_SOFT_HIGH) {
+						if (scene_state.positional_shadow_quality >= RS::SHADOW_QUALITY_SOFT_HIGH) {
 							spec_constants |= SceneShaderGLES3::SHADOW_MODE_PCF_13;
-						} else if (scene_state.positional_shadow_quality >= RSE::SHADOW_QUALITY_SOFT_LOW) {
+						} else if (scene_state.positional_shadow_quality >= RS::SHADOW_QUALITY_SOFT_LOW) {
 							spec_constants |= SceneShaderGLES3::SHADOW_MODE_PCF_5;
 						}
 					} else {
@@ -3490,7 +3490,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 							// Disable additive lighting when masks are not overlapping.
 							spec_constants &= ~SceneShaderGLES3::USE_ADDITIVE_LIGHTING;
 						}
-						if (pass == 0 && inst->lightmap_instance.is_valid() && scene_state.directional_lights[shadow_id].bake_mode == RSE::LIGHT_BAKE_STATIC) {
+						if (pass == 0 && inst->lightmap_instance.is_valid() && scene_state.directional_lights[shadow_id].bake_mode == RenderingServer::LIGHT_BAKE_STATIC) {
 							// Disable additive lighting with a static light and a lightmap.
 							spec_constants &= ~SceneShaderGLES3::USE_ADDITIVE_LIGHTING;
 						}
@@ -3506,9 +3506,9 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 							spec_constants |= SceneShaderGLES3::LIGHT_USE_PSSM_BLEND;
 						}
 
-						if (scene_state.directional_shadow_quality >= RSE::SHADOW_QUALITY_SOFT_HIGH) {
+						if (scene_state.directional_shadow_quality >= RS::SHADOW_QUALITY_SOFT_HIGH) {
 							spec_constants |= SceneShaderGLES3::SHADOW_MODE_PCF_13;
-						} else if (scene_state.directional_shadow_quality >= RSE::SHADOW_QUALITY_SOFT_LOW) {
+						} else if (scene_state.directional_shadow_quality >= RS::SHADOW_QUALITY_SOFT_LOW) {
 							spec_constants |= SceneShaderGLES3::SHADOW_MODE_PCF_5;
 						}
 					}
@@ -3720,7 +3720,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 			material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::WORLD_TRANSFORM, world_transform, shader->version, instance_variant, spec_constants);
 			{
 				GLES3::Mesh::Surface *s = reinterpret_cast<GLES3::Mesh::Surface *>(surf->surface);
-				if (s->format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (s->format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::COMPRESSED_AABB_POSITION, s->aabb.position, shader->version, instance_variant, spec_constants);
 					material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::COMPRESSED_AABB_SIZE, s->aabb.size, shader->version, instance_variant, spec_constants);
 					material_storage->shaders.scene_shader.version_set_uniform(SceneShaderGLES3::UV_SCALE, s->uv_scale, shader->version, instance_variant, spec_constants);
@@ -3756,7 +3756,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 			if constexpr (p_pass_mode != PASS_MODE_DEPTH && p_pass_mode != PASS_MODE_MOTION_VECTORS) {
 				// Don't count draw calls during depth pre-pass or motion vector pass to match the RD renderers.
 				if (p_render_data->render_info) {
-					p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+					p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 				}
 			}
 
@@ -3918,7 +3918,7 @@ void RasterizerSceneGLES3::render_particle_collider_heightfield(RID p_collider,
 	glDrawBuffers(0, nullptr);
 
 	glColorMask(0, 0, 0, 0);
-	RasterizerUtilGLES3::clear_depth(0.0);
+	RasterizerGLES3::clear_depth(0.0);
 
 	glClear(GL_DEPTH_BUFFER_BIT);
 
@@ -3970,7 +3970,7 @@ void RasterizerSceneGLES3::_render_uv2(const PagedArray<RenderGeometryInstance *
 		glDrawBuffers(std_size(draw_buffers), draw_buffers);
 
 		glClearColor(0.0, 0.0, 0.0, 0.0);
-		RasterizerUtilGLES3::clear_depth(0.0);
+		RasterizerGLES3::clear_depth(0.0);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
 
 		uint64_t base_spec_constant = 0;
@@ -4019,7 +4019,7 @@ void RasterizerSceneGLES3::set_time(double p_time, double p_step) {
 	time_step = p_step;
 }
 
-void RasterizerSceneGLES3::set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) {
+void RasterizerSceneGLES3::set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) {
 	debug_draw = p_debug_draw;
 }
 
@@ -4040,7 +4040,7 @@ void RasterizerSceneGLES3::_render_buffers_debug_draw(Ref<RenderSceneBuffersGLES
 	GLES3::RenderTarget *rt = texture_storage->get_render_target(render_target);
 	ERR_FAIL_NULL(rt);
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS) {
 		if (p_shadow_atlas.is_valid()) {
 			// Get or create debug textures to display shadow maps as an atlas.
 			GLuint shadow_atlas_texture = light_storage->shadow_atlas_get_debug_texture(p_shadow_atlas);
@@ -4054,7 +4054,7 @@ void RasterizerSceneGLES3::_render_buffers_debug_draw(Ref<RenderSceneBuffersGLES
 			glActiveTexture(GL_TEXTURE0);
 			scene_state.enable_gl_depth_draw(true);
 			scene_state.set_gl_depth_func(GL_ALWAYS);
-			scene_state.set_gl_cull_mode(RSE::CULL_MODE_DISABLED);
+			scene_state.set_gl_cull_mode(RS::CULL_MODE_DISABLED);
 
 			// Loop through quadrants and copy shadows over.
 			for (int quadrant = 0; quadrant < 4; quadrant++) {
@@ -4117,7 +4117,7 @@ void RasterizerSceneGLES3::_render_buffers_debug_draw(Ref<RenderSceneBuffersGLES
 			glBindFramebuffer(GL_FRAMEBUFFER, GLES3::TextureStorage::system_fbo);
 		}
 	}
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS) {
 		if (light_storage->directional_shadow_get_texture() != 0) {
 			GLuint shadow_atlas_texture = light_storage->directional_shadow_get_texture();
 			glActiveTexture(GL_TEXTURE0);
@@ -4153,7 +4153,7 @@ bool RasterizerSceneGLES3::screen_space_roughness_limiter_is_active() const {
 	return false;
 }
 
-void RasterizerSceneGLES3::sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) {
+void RasterizerSceneGLES3::sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) {
 }
 
 void RasterizerSceneGLES3::sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) {
@@ -4341,10 +4341,10 @@ void RasterizerSceneGLES3::update() {
 void RasterizerSceneGLES3::sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) {
 }
 
-void RasterizerSceneGLES3::decals_set_filter(RSE::DecalFilter p_filter) {
+void RasterizerSceneGLES3::decals_set_filter(RS::DecalFilter p_filter) {
 }
 
-void RasterizerSceneGLES3::light_projectors_set_filter(RSE::LightProjectorFilter p_filter) {
+void RasterizerSceneGLES3::light_projectors_set_filter(RS::LightProjectorFilter p_filter) {
 }
 
 void RasterizerSceneGLES3::lightmaps_set_bicubic_filter(bool p_enable) {
@@ -4366,8 +4366,8 @@ RasterizerSceneGLES3::RasterizerSceneGLES3() {
 	// Quality settings.
 	use_physical_light_units = GLOBAL_GET("rendering/lights_and_shadows/use_physical_light_units");
 
-	positional_soft_shadow_filter_set_quality((RSE::ShadowQuality)(int)GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality"));
-	directional_soft_shadow_filter_set_quality((RSE::ShadowQuality)(int)GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality"));
+	positional_soft_shadow_filter_set_quality((RS::ShadowQuality)(int)GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality"));
+	directional_soft_shadow_filter_set_quality((RS::ShadowQuality)(int)GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality"));
 	lightmaps_set_bicubic_filter(GLOBAL_GET("rendering/lightmapping/lightmap_gi/use_bicubic_filter"));
 
 	{
@@ -4463,7 +4463,7 @@ void fragment() {
 		scene_globals.default_material = material_storage->material_allocate();
 		material_storage->material_initialize(scene_globals.default_material);
 		material_storage->material_set_shader(scene_globals.default_material, scene_globals.default_shader);
-		default_material_data_ptr = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.default_material, RSE::SHADER_SPATIAL));
+		default_material_data_ptr = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.default_material, RS::SHADER_SPATIAL));
 	}
 
 	{
@@ -4485,7 +4485,7 @@ void fragment() {
 		scene_globals.overdraw_material = material_storage->material_allocate();
 		material_storage->material_initialize(scene_globals.overdraw_material);
 		material_storage->material_set_shader(scene_globals.overdraw_material, scene_globals.overdraw_shader);
-		overdraw_material_data_ptr = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.overdraw_material, RSE::SHADER_SPATIAL));
+		overdraw_material_data_ptr = static_cast<GLES3::SceneMaterialData *>(GLES3::MaterialStorage::get_singleton()->material_get_data(scene_globals.overdraw_material, RS::SHADER_SPATIAL));
 	}
 
 	{
@@ -4556,20 +4556,20 @@ void sky() {
 
 		GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, sky_globals.screen_triangle, sizeof(float) * 6, qv, GL_STATIC_DRAW, "Screen triangle vertex buffer");
 
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
 		glBindVertexArray(0);
 		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
 	}
 
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		glEnable(_EXT_TEXTURE_CUBE_MAP_SEAMLESS);
 	}
 #endif // GL_API_ENABLED
 
 	// MultiMesh may read from color when color is disabled, so make sure that the color defaults to white instead of black;
-	glVertexAttrib4f(RSE::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
+	glVertexAttrib4f(RS::ARRAY_COLOR, 1.0, 1.0, 1.0, 1.0);
 }
 
 RasterizerSceneGLES3::~RasterizerSceneGLES3() {
diff --git a/engine/drivers/gles3/rasterizer_scene_gles3.h b/engine/drivers/gles3/rasterizer_scene_gles3.h
index 948f216a..3ca8fcf3 100644
--- a/engine/drivers/gles3/rasterizer_scene_gles3.h
+++ b/engine/drivers/gles3/rasterizer_scene_gles3.h
@@ -30,19 +30,24 @@
 
 #pragma once
 
+#include "platform_gl.h"
 #ifdef GLES3_ENABLED
 
 #include "core/math/projection.h"
 #include "core/templates/paged_allocator.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "drivers/gles3/storage/light_storage.h"
-#include "drivers/gles3/storage/material_storage.h"
+#include "drivers/gles3/shaders/effects/cubemap_filter.glsl.gen.h"
+#include "drivers/gles3/shaders/sky.glsl.gen.h"
+#include "scene/resources/mesh.h"
+#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-
-class RenderSceneBuffersGLES3;
+#include "servers/rendering/rendering_server.h"
+#include "shader_gles3.h"
+#include "storage/light_storage.h"
+#include "storage/material_storage.h"
+#include "storage/render_scene_buffers_gles3.h"
+#include "storage/utilities.h"
 
 enum RenderListType {
 	RENDER_LIST_OPAQUE, //used for opaque objects
@@ -104,6 +109,7 @@ struct RenderDataGLES3 {
 	Transform3D inv_cam_transform;
 	Projection cam_projection;
 	bool cam_orthogonal = false;
+	bool cam_frustum = false;
 	uint32_t camera_visible_layers = 0xFFFFFFFF;
 
 	// For billboards to cast correct shadows.
@@ -137,7 +143,7 @@ struct RenderDataGLES3 {
 
 	float luminance_multiplier = 1.0;
 
-	RenderingServerTypes::RenderInfo *render_info = nullptr;
+	RenderingMethod::RenderInfo *render_info = nullptr;
 
 	/* Shadow data */
 	const RendererSceneRender::RenderShadowData *render_shadows = nullptr;
@@ -149,7 +155,7 @@ class RasterizerCanvasGLES3;
 class RasterizerSceneGLES3 : public RendererSceneRender {
 private:
 	static RasterizerSceneGLES3 *singleton;
-	RSE::ViewportDebugDraw debug_draw = RSE::VIEWPORT_DEBUG_DRAW_DISABLED;
+	RS::ViewportDebugDraw debug_draw = RS::VIEWPORT_DEBUG_DRAW_DISABLED;
 	uint64_t scene_pass = 0;
 
 	template <typename T>
@@ -272,7 +278,7 @@ private:
 			};
 		} sort;
 
-		RSE::PrimitiveType primitive = RSE::PRIMITIVE_MAX;
+		RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
 		uint32_t flags = 0;
 		uint32_t surface_index = 0;
 		uint32_t lod_index = 0;
@@ -347,8 +353,7 @@ private:
 		virtual void set_use_lightmap(RID p_lightmap_instance, const Rect2 &p_lightmap_uv_scale, int p_lightmap_slice_index) override;
 		virtual void set_lightmap_capture(const Color *p_sh9) override;
 
-		virtual void clear_light_instances() override;
-		virtual void pair_light_instance(const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) override;
+		virtual void pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) override;
 		virtual void pair_reflection_probe_instances(const RID *p_reflection_probe_instances, uint32_t p_reflection_probe_instance_count) override;
 		virtual void pair_decal_instances(const RID *p_decal_instances, uint32_t p_decal_instance_count) override {}
 		virtual void pair_voxel_gi_instances(const RID *p_voxel_gi_instances, uint32_t p_voxel_gi_instance_count) override {}
@@ -356,9 +361,6 @@ private:
 		virtual void set_softshadow_projector_pairing(bool p_softshadow, bool p_projector) override {}
 	};
 
-	virtual uint32_t get_max_lights_total() override;
-	virtual uint32_t get_max_lights_per_mesh() override;
-
 	enum {
 		INSTANCE_DATA_FLAGS_DYNAMIC = 1 << 3,
 		INSTANCE_DATA_FLAGS_NON_UNIFORM_SCALE = 1 << 4,
@@ -477,7 +479,7 @@ private:
 		bool used_depth_prepass = false;
 
 		GLES3::SceneShaderData::BlendMode current_blend_mode = GLES3::SceneShaderData::BLEND_MODE_MIX;
-		RSE::CullMode cull_mode = RSE::CULL_MODE_BACK;
+		RS::CullMode cull_mode = RS::CULL_MODE_BACK;
 		GLenum current_depth_function = GL_GEQUAL;
 
 		bool current_blend_enabled = false;
@@ -494,7 +496,7 @@ private:
 
 			glCullFace(GL_BACK);
 			glEnable(GL_CULL_FACE);
-			cull_mode = RSE::CULL_MODE_BACK;
+			cull_mode = RS::CULL_MODE_BACK;
 
 			glDepthMask(GL_FALSE);
 			current_depth_draw_enabled = false;
@@ -514,16 +516,16 @@ private:
 			current_stencil_compare_mask = 255;
 		}
 
-		void set_gl_cull_mode(RSE::CullMode p_mode) {
+		void set_gl_cull_mode(RS::CullMode p_mode) {
 			if (cull_mode != p_mode) {
-				if (p_mode == RSE::CULL_MODE_DISABLED) {
+				if (p_mode == RS::CULL_MODE_DISABLED) {
 					glDisable(GL_CULL_FACE);
 				} else {
-					if (cull_mode == RSE::CULL_MODE_DISABLED) {
+					if (cull_mode == RS::CULL_MODE_DISABLED) {
 						// Last time was disabled, so enable and set proper face.
 						glEnable(GL_CULL_FACE);
 					}
-					glCullFace(p_mode == RSE::CULL_MODE_FRONT ? GL_FRONT : GL_BACK);
+					glCullFace(p_mode == RS::CULL_MODE_FRONT ? GL_FRONT : GL_BACK);
 				}
 				cull_mode = p_mode;
 			}
@@ -638,13 +640,13 @@ private:
 		GLuint positional_shadow_buffer = 0;
 		uint32_t omni_light_count = 0;
 		uint32_t spot_light_count = 0;
-		RSE::ShadowQuality positional_shadow_quality = RSE::ShadowQuality::SHADOW_QUALITY_SOFT_LOW;
+		RS::ShadowQuality positional_shadow_quality = RS::ShadowQuality::SHADOW_QUALITY_SOFT_LOW;
 
 		DirectionalLightData *directional_lights = nullptr;
 		GLuint directional_light_buffer = 0;
 		DirectionalShadowData *directional_shadows = nullptr;
 		GLuint directional_shadow_buffer = 0;
-		RSE::ShadowQuality directional_shadow_quality = RSE::ShadowQuality::SHADOW_QUALITY_SOFT_LOW;
+		RS::ShadowQuality directional_shadow_quality = RS::ShadowQuality::SHADOW_QUALITY_SOFT_LOW;
 	} scene_state;
 
 	struct RenderListParameters {
@@ -727,14 +729,12 @@ private:
 	void _setup_environment(const RenderDataGLES3 *p_render_data, bool p_no_fog, const Size2i &p_screen_size, bool p_flip_y, const Color &p_default_bg_color, bool p_pancake_shadows, float p_shadow_bias = 0.0);
 	void _fill_render_list(RenderListType p_render_list, const RenderDataGLES3 *p_render_data, PassMode p_pass_mode, bool p_append = false);
 	void _render_shadows(const RenderDataGLES3 *p_render_data, const Size2i &p_viewport_size = Size2i(1, 1));
-	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, RenderingServerTypes::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
+	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, RenderingMethod::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
 	void _render_post_processing(const RenderDataGLES3 *p_render_data);
 
 	template <PassMode p_pass_mode>
 	_FORCE_INLINE_ void _render_list_template(RenderListParameters *p_params, const RenderDataGLES3 *p_render_data, uint32_t p_from_element, uint32_t p_to_element, bool p_alpha_pass = false);
 
-	_FORCE_INLINE_ uint32_t _indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) const;
-
 protected:
 	double time;
 	double time_step = 0;
@@ -757,7 +757,7 @@ protected:
 
 	/* Environment */
 
-	RSE::EnvironmentSSAOQuality ssao_quality = RSE::ENV_SSAO_QUALITY_MEDIUM;
+	RS::EnvironmentSSAOQuality ssao_quality = RS::ENV_SSAO_QUALITY_MEDIUM;
 	bool ssao_half_size = false;
 	float ssao_adaptive_target = 0.5;
 	int ssao_blur_passes = 2;
@@ -814,7 +814,7 @@ protected:
 		int radiance_size = 256;
 		int mipmap_count = 1;
 
-		RSE::SkyMode mode = RSE::SKY_MODE_AUTOMATIC;
+		RS::SkyMode mode = RS::SKY_MODE_AUTOMATIC;
 
 		//ReflectionData reflection;
 		bool reflection_dirty = false;
@@ -856,7 +856,7 @@ public:
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) override {}
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override { return 0; }
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override { return 0; }
 
 	/* SDFGI UPDATE */
 
@@ -876,7 +876,7 @@ public:
 	RID sky_allocate() override;
 	void sky_initialize(RID p_rid) override;
 	void sky_set_radiance_size(RID p_sky, int p_radiance_size) override;
-	void sky_set_mode(RID p_sky, RSE::SkyMode p_mode) override;
+	void sky_set_mode(RID p_sky, RS::SkyMode p_mode) override;
 	void sky_set_material(RID p_sky, RID p_material) override;
 	Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) override;
 	float sky_get_baked_exposure(RID p_sky) const;
@@ -886,15 +886,15 @@ public:
 	void environment_glow_set_use_bicubic_upscale(bool p_enable) override;
 
 	void environment_set_ssr_half_size(bool p_half_size) override;
-	void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) override;
+	void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override;
 
-	void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
+	void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
 
-	void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
+	void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
 
-	void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) override;
-	void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) override;
-	void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) override;
+	void environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) override;
+	void environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) override;
+	void environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) override;
 
 	void environment_set_volumetric_fog_volume_size(int p_size, int p_depth) override;
 	void environment_set_volumetric_fog_filter_active(bool p_enable) override;
@@ -905,8 +905,8 @@ public:
 		return use_physical_light_units;
 	}
 
-	void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override;
-	void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override;
+	void positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override;
+	void directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override;
 
 	RID fog_volume_instance_create(RID p_fog_volume) override;
 	void fog_volume_instance_set_transform(RID p_fog_volume_instance, const Transform3D &p_transform) override;
@@ -919,9 +919,9 @@ public:
 	bool voxel_gi_needs_update(RID p_probe) const override;
 	void voxel_gi_update(RID p_probe, bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects) override;
 
-	void voxel_gi_set_quality(RSE::VoxelGIQuality) override;
+	void voxel_gi_set_quality(RS::VoxelGIQuality) override;
 
-	void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingServerTypes::RenderInfo *r_render_info = nullptr) override;
+	void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingMethod::RenderInfo *r_render_info = nullptr) override;
 	void render_material(const Transform3D &p_cam_transform, const Projection &p_cam_projection, bool p_cam_orthogonal, const PagedArray<RenderGeometryInstance *> &p_instances, RID p_framebuffer, const Rect2i &p_region) override;
 	void render_particle_collider_heightfield(RID p_collider, const Transform3D &p_transform, const PagedArray<RenderGeometryInstance *> &p_instances) override;
 
@@ -934,8 +934,8 @@ public:
 	}
 
 	void set_time(double p_time, double p_step) override;
-	void set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) override;
-	_FORCE_INLINE_ RSE::ViewportDebugDraw get_debug_draw_mode() const {
+	void set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) override;
+	_FORCE_INLINE_ RS::ViewportDebugDraw get_debug_draw_mode() const {
 		return debug_draw;
 	}
 
@@ -945,7 +945,7 @@ public:
 	void screen_space_roughness_limiter_set_active(bool p_enable, float p_amount, float p_curve) override;
 	bool screen_space_roughness_limiter_is_active() const override;
 
-	void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) override;
+	void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override;
 	void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override;
 
 	TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) override;
@@ -955,8 +955,8 @@ public:
 	void update() override;
 	void sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) override;
 
-	void decals_set_filter(RSE::DecalFilter p_filter) override;
-	void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) override;
+	void decals_set_filter(RS::DecalFilter p_filter) override;
+	void light_projectors_set_filter(RS::LightProjectorFilter p_filter) override;
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) override;
 	virtual void material_set_use_debanding(bool p_enable) override;
 
diff --git a/engine/drivers/gles3/rasterizer_util_gles3.cpp b/engine/drivers/gles3/rasterizer_util_gles3.cpp
deleted file mode 100644
index e285fe25..00000000
--- a/engine/drivers/gles3/rasterizer_util_gles3.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/**************************************************************************/
-/*  rasterizer_util_gles3.cpp                                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "rasterizer_util_gles3.h"
-
-#include <platform_gl.h>
-
-bool RasterizerUtilGLES3::gles_over_gl = true;
-
-void RasterizerUtilGLES3::clear_depth(float p_depth) {
-#ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
-		glClearDepth(p_depth);
-	}
-#endif // GL_API_ENABLED
-#ifdef GLES_API_ENABLED
-	if (!RasterizerUtilGLES3::is_gles_over_gl()) {
-		glClearDepthf(p_depth);
-	}
-#endif // GLES_API_ENABLED
-}
-
-void RasterizerUtilGLES3::clear_stencil(int32_t p_stencil) {
-	glClearStencil(p_stencil);
-}
diff --git a/engine/drivers/gles3/rasterizer_util_gles3.h b/engine/drivers/gles3/rasterizer_util_gles3.h
deleted file mode 100644
index ef6568a6..00000000
--- a/engine/drivers/gles3/rasterizer_util_gles3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************/
-/*  rasterizer_util_gles3.h                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include <cstdint>
-
-// This class is meant to hold static utility methods with minimal dependencies.
-
-class RasterizerUtilGLES3 {
-private:
-	static bool gles_over_gl;
-
-public:
-	static void set_gles_over_gl(bool p_gles_over_gl) {
-		gles_over_gl = p_gles_over_gl;
-	}
-	static bool is_gles_over_gl() {
-		return gles_over_gl;
-	}
-
-	static void clear_depth(float p_depth);
-	static void clear_stencil(int32_t p_stencil);
-};
diff --git a/engine/drivers/gles3/shader_gles3.cpp b/engine/drivers/gles3/shader_gles3.cpp
index 4fe333e3..709195ab 100644
--- a/engine/drivers/gles3/shader_gles3.cpp
+++ b/engine/drivers/gles3/shader_gles3.cpp
@@ -33,13 +33,10 @@
 #ifdef GLES3_ENABLED
 
 #include "core/io/dir_access.h"
-#include "core/string/string_builder.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "drivers/gles3/storage/config.h"
-
-#ifndef WEB_ENABLED
 #include "core/io/file_access.h"
-#endif
+
+#include "drivers/gles3/rasterizer_gles3.h"
+#include "drivers/gles3/storage/config.h"
 
 static String _mkid(const String &p_id) {
 	String id = "m_" + p_id.replace("__", "_dus_");
@@ -157,7 +154,7 @@ RID ShaderGLES3::version_create() {
 }
 
 void ShaderGLES3::_build_variant_code(StringBuilder &builder, uint32_t p_variant, const Version *p_version, StageType p_stage_type, uint64_t p_specialization) {
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		builder.append("#version 330\n");
 		builder.append("#define USE_GLES_OVER_GL\n");
 	} else {
@@ -218,7 +215,7 @@ void ShaderGLES3::_build_variant_code(StringBuilder &builder, uint32_t p_variant
 	// Default to highp precision unless specified otherwise.
 	builder.append("precision highp float;\n");
 	builder.append("precision highp int;\n");
-	if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (!RasterizerGLES3::is_gles_over_gl()) {
 		builder.append("precision highp sampler2D;\n");
 		builder.append("precision highp samplerCube;\n");
 		builder.append("precision highp sampler2DArray;\n");
@@ -469,9 +466,9 @@ void ShaderGLES3::_compile_specialization(Version::Specialization &spec, uint32_
 	spec.ok = true;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode ShaderGLES3::version_get_native_source_code(RID p_version) {
+RS::ShaderNativeSourceCode ShaderGLES3::version_get_native_source_code(RID p_version) {
 	Version *version = version_owner.get_or_null(p_version);
-	RenderingServerTypes::ShaderNativeSourceCode source_code;
+	RS::ShaderNativeSourceCode source_code;
 	ERR_FAIL_NULL_V(version, source_code);
 
 	source_code.versions.resize(variant_count);
@@ -483,7 +480,7 @@ RenderingServerTypes::ShaderNativeSourceCode ShaderGLES3::version_get_native_sou
 			StringBuilder builder;
 			_build_variant_code(builder, i, version, STAGE_TYPE_VERTEX, specialization_default_mask);
 
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
+			RS::ShaderNativeSourceCode::Version::Stage stage;
 			stage.name = "vertex";
 			stage.code = builder.as_string();
 
@@ -495,7 +492,7 @@ RenderingServerTypes::ShaderNativeSourceCode ShaderGLES3::version_get_native_sou
 			StringBuilder builder;
 			_build_variant_code(builder, i, version, STAGE_TYPE_FRAGMENT, specialization_default_mask);
 
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
+			RS::ShaderNativeSourceCode::Version::Stage stage;
 			stage.name = "fragment";
 			stage.code = builder.as_string();
 
@@ -530,7 +527,7 @@ String ShaderGLES3::_version_get_sha1(Version *p_version) const {
 		hash_build.append("[custom_defines:" + itos(i) + "]");
 		hash_build.append(p_version->custom_defines[i].get_data());
 	}
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		hash_build.append("[gl]");
 	} else {
 		hash_build.append("[gles]");
@@ -549,7 +546,7 @@ bool ShaderGLES3::_load_from_cache(Version *p_version) {
 	return false;
 #else
 #if !defined(ANDROID_ENABLED) && !defined(IOS_ENABLED)
-	if (RasterizerUtilGLES3::is_gles_over_gl() && (glProgramBinary == nullptr)) { // ARB_get_program_binary extension not available.
+	if (RasterizerGLES3::is_gles_over_gl() && (glProgramBinary == nullptr)) { // ARB_get_program_binary extension not available.
 		return false;
 	}
 #endif
@@ -622,7 +619,7 @@ bool ShaderGLES3::_load_from_cache(Version *p_version) {
 
 			variant.insert(specialization_key, specialization);
 		}
-		variants.push_back(std::move(variant));
+		variants.push_back(variant);
 	}
 	p_version->variants = variants;
 
@@ -636,7 +633,7 @@ void ShaderGLES3::_save_to_cache(Version *p_version) {
 #else
 	ERR_FAIL_COND(!shader_cache_dir_valid);
 #if !defined(ANDROID_ENABLED) && !defined(IOS_ENABLED)
-	if (RasterizerUtilGLES3::is_gles_over_gl() && (glGetProgramBinary == nullptr)) { // ARB_get_program_binary extension not available.
+	if (RasterizerGLES3::is_gles_over_gl() && (glGetProgramBinary == nullptr)) { // ARB_get_program_binary extension not available.
 		return;
 	}
 #endif
@@ -708,7 +705,8 @@ void ShaderGLES3::_initialize_version(Version *p_version) {
 	}
 	p_version->variants.reserve(variant_count);
 	for (int i = 0; i < variant_count; i++) {
-		p_version->variants.push_back(AHashMap<uint64_t, Version::Specialization>());
+		AHashMap<uint64_t, Version::Specialization> variant;
+		p_version->variants.push_back(variant);
 		Version::Specialization spec;
 		_compile_specialization(spec, i, p_version, specialization_default_mask);
 		p_version->variants[i].insert(specialization_default_mask, spec);
diff --git a/engine/drivers/gles3/shader_gles3.h b/engine/drivers/gles3/shader_gles3.h
index 4ff35c1b..7589e828 100644
--- a/engine/drivers/gles3/shader_gles3.h
+++ b/engine/drivers/gles3/shader_gles3.h
@@ -30,17 +30,17 @@
 
 #pragma once
 
-#ifdef GLES3_ENABLED
-
-#include "core/templates/a_hash_map.h"
+#include "core/math/projection.h"
+#include "core/os/mutex.h"
+#include "core/string/string_builder.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_server.h"
 
-#include <platform_gl.h>
+#ifdef GLES3_ENABLED
 
-class StringBuilder;
+#include "platform_gl.h"
 
 class ShaderGLES3 {
 public:
@@ -105,6 +105,8 @@ private:
 		LocalVector<AHashMap<uint64_t, Specialization>> variants;
 	};
 
+	Mutex variant_set_mutex;
+
 	void _get_uniform_locations(Version::Specialization &spec, Version *p_version);
 	void _compile_specialization(Version::Specialization &spec, uint32_t p_variant, Version *p_version, uint64_t p_specialization);
 
@@ -248,7 +250,7 @@ public:
 	static void set_shader_cache_save_compressed_zstd(bool p_enable);
 	static void set_shader_cache_save_debug(bool p_enable);
 
-	RenderingServerTypes::ShaderNativeSourceCode version_get_native_source_code(RID p_version);
+	RS::ShaderNativeSourceCode version_get_native_source_code(RID p_version);
 
 	void initialize(const String &p_general_defines = "", int p_base_texture_index = 0);
 	virtual ~ShaderGLES3();
diff --git a/engine/drivers/gles3/shaders/SCsub b/engine/drivers/gles3/shaders/SCsub
index ecbaaf0c..0207ba12 100644
--- a/engine/drivers/gles3/shaders/SCsub
+++ b/engine/drivers/gles3/shaders/SCsub
@@ -25,7 +25,6 @@ if "GLES3_GLSL" in env["BUILDERS"]:
     env.GLES3_GLSL("particles.glsl")
     env.GLES3_GLSL("particles_copy.glsl")
     env.GLES3_GLSL("skeleton.glsl")
-    env.GLES3_GLSL("tex_blit.glsl")
 
     # once we finish conversion we can introduce this to cover all files:
     # for glsl_file in glsl_files:
diff --git a/engine/drivers/gles3/shaders/effects/copy.glsl b/engine/drivers/gles3/shaders/effects/copy.glsl
index dc6253e7..d6fe865e 100644
--- a/engine/drivers/gles3/shaders/effects/copy.glsl
+++ b/engine/drivers/gles3/shaders/effects/copy.glsl
@@ -13,7 +13,6 @@ mode_mipmap = #define MODE_MIPMAP
 mode_simple_color = #define MODE_SIMPLE_COLOR \n#define USE_COPY_SECTION
 mode_cube_to_octahedral = #define CUBE_TO_OCTAHEDRAL \n#define USE_COPY_SECTION
 mode_cube_to_panorama = #define CUBE_TO_PANORAMA
-mode_apply_linear_exposure_to_srgb = #define MODE_SIMPLE_COPY \n#define MODE_MULTIPLY \n#define APPLY_LINEAR_EXPOSURE_TO_SRGB
 
 #[specializations]
 
@@ -105,19 +104,15 @@ uniform float upscale;
 uniform float aspect_ratio;
 #endif // APPLY_LENS_DISTORTION
 
-#ifdef APPLY_LINEAR_EXPOSURE_TO_SRGB
-uniform float exposure;
-#endif
-
 layout(location = 0) out vec4 frag_color;
 
-// This approximation expects non-negative input; negative input behaves poorly.
+// This expects 0-1 range input, outside that range it behaves poorly.
 vec3 srgb_to_linear(vec3 color) {
 	// Approximation from http://chilliant.blogspot.com/2012/08/srgb-approximations-for-hlsl.html
 	return color * (color * (color * 0.305306011 + 0.682171111) + 0.012522878);
 }
 
-// This approximation expects non-negative input; negative input is undefined behavior.
+// This expects 0-1 range input.
 vec3 linear_to_srgb(vec3 color) {
 	// Approximation from http://chilliant.blogspot.com/2012/08/srgb-approximations-for-hlsl.html
 	return max(vec3(1.055) * pow(color, vec3(0.416666667)) - vec3(0.055), vec3(0.0));
@@ -170,12 +165,6 @@ void main() {
 		color.rgb = linear_to_srgb(color.rgb);
 #endif
 
-#ifdef APPLY_LINEAR_EXPOSURE_TO_SRGB
-		color.rgb = srgb_to_linear(color.rgb);
-		color.rgb *= exposure;
-		color.rgb = linear_to_srgb(color.rgb);
-#endif
-
 #ifdef MODE_MULTIPLY
 		color *= multiply;
 #endif // MODE_MULTIPLY
diff --git a/engine/drivers/gles3/shaders/effects/cubemap_filter.glsl b/engine/drivers/gles3/shaders/effects/cubemap_filter.glsl
index b798e5fa..6fcb2320 100644
--- a/engine/drivers/gles3/shaders/effects/cubemap_filter.glsl
+++ b/engine/drivers/gles3/shaders/effects/cubemap_filter.glsl
@@ -43,12 +43,10 @@ layout(location = 0) out vec4 frag_color;
 #define M_PI 3.14159265359
 
 // Don't include tonemap_inc.glsl because all we want is these functions, we don't want the uniforms
-// This approximation expects non-negative input; negative input is undefined behavior.
 vec3 linear_to_srgb(vec3 color) {
 	return max(vec3(1.055) * pow(color, vec3(0.416666667)) - vec3(0.055), vec3(0.0));
 }
 
-// This approximation expects non-negative input; negative input behaves poorly.
 vec3 srgb_to_linear(vec3 color) {
 	return color * (color * (color * 0.305306011 + 0.682171111) + 0.012522878);
 }
diff --git a/engine/drivers/gles3/shaders/particles_copy.glsl b/engine/drivers/gles3/shaders/particles_copy.glsl
index a2632ca9..55b5e6d7 100644
--- a/engine/drivers/gles3/shaders/particles_copy.glsl
+++ b/engine/drivers/gles3/shaders/particles_copy.glsl
@@ -37,24 +37,10 @@ uniform highp uint align_mode;
 
 uniform highp mat4 inv_emission_transform;
 
-uniform uint align_channel_filter;
-uniform uint align_axis;
-
-#define ALIGN_DISABLED uint(0)
-#define ALIGN_BILLBOARD uint(1)
-#define ALIGN_Y_TO_VELOCITY uint(2)
-#define ALIGN_Z_BILLBOARD_Y_TO_VELOCITY uint(3)
-#define ALIGN_LOCAL_BILLBOARD uint(4)
-
-#define CHANNEL_FILTER_NONE uint(0)
-#define CHANNEL_FILTER_X uint(1)
-#define CHANNEL_FILTER_Y uint(2)
-#define CHANNEL_FILTER_Z uint(3)
-#define CHANNEL_FILTER_W uint(4)
-
-#define ALIGN_AXIS_X uint(0)
-#define ALIGN_AXIS_Y uint(1)
-#define ALIGN_AXIS_Z uint(2)
+#define TRANSFORM_ALIGN_DISABLED uint(0)
+#define TRANSFORM_ALIGN_Z_BILLBOARD uint(1)
+#define TRANSFORM_ALIGN_Y_TO_VELOCITY uint(2)
+#define TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY uint(3)
 
 #define PARTICLE_FLAG_ACTIVE uint(1)
 
@@ -71,46 +57,15 @@ void main() {
 		txform = transpose(mat4(xform_1, xform_2, vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0)));
 #endif
 
-		if (align_mode == ALIGN_DISABLED) {
+		if (align_mode == TRANSFORM_ALIGN_DISABLED) {
 			// nothing
-		} else if (align_mode == ALIGN_BILLBOARD) {
-			float angle = 0.;
-			if (align_channel_filter == CHANNEL_FILTER_NONE) {
-				mat3 local = mat3(normalize(cross(align_up, sort_direction)), align_up, sort_direction);
-				local = local * mat3(txform);
-				txform[0].xyz = local[0];
-				txform[1].xyz = local[1];
-				txform[2].xyz = local[2];
-			} else {
-				if (align_channel_filter == CHANNEL_FILTER_X) {
-					angle = custom.x;
-
-				} else if (align_channel_filter == CHANNEL_FILTER_Y) {
-					angle = custom.y;
-
-				} else if (align_channel_filter == CHANNEL_FILTER_Z) {
-					angle = custom.z;
-
-				} else if (align_channel_filter == CHANNEL_FILTER_W) {
-					angle = custom.w;
-				}
-
-				vec3 axis = normalize(sort_direction);
-				float s = sin(angle);
-				float c = cos(angle);
-				float oc = 1.0 - c;
-				mat3 rotated = mat3(
-						oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s,
-						oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s,
-						oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c);
-				vec3 new_up = rotated * align_up;
-				mat3 local = mat3(normalize(cross(new_up, sort_direction)), new_up, sort_direction);
-				local = local * mat3(txform);
-				txform[0].xyz = local[0];
-				txform[1].xyz = local[1];
-				txform[2].xyz = local[2];
-			}
-		} else if (align_mode == ALIGN_Y_TO_VELOCITY) {
+		} else if (align_mode == TRANSFORM_ALIGN_Z_BILLBOARD) {
+			mat3 local = mat3(normalize(cross(align_up, sort_direction)), align_up, sort_direction);
+			local = local * mat3(txform);
+			txform[0].xyz = local[0];
+			txform[1].xyz = local[1];
+			txform[2].xyz = local[2];
+		} else if (align_mode == TRANSFORM_ALIGN_Y_TO_VELOCITY) {
 			vec3 v = velocity_flags.xyz;
 			float s = (length(txform[0]) + length(txform[1]) + length(txform[2])) / 3.0;
 			if (length(v) > 0.0) {
@@ -123,7 +78,7 @@ void main() {
 			txform[2].xyz = vec3(0.0, 0.0, 1.0) * s;
 			txform[0].xyz *= s;
 			txform[1].xyz *= s;
-		} else if (align_mode == ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
+		} else if (align_mode == TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
 			vec3 sv = velocity_flags.xyz - sort_direction * dot(sort_direction, velocity_flags.xyz); //screen velocity
 
 			if (length(sv) == 0.0) {
@@ -135,32 +90,6 @@ void main() {
 			txform[0].xyz = normalize(cross(sv, sort_direction)) * length(txform[0]);
 			txform[1].xyz = sv * length(txform[1]);
 			txform[2].xyz = sort_direction * length(txform[2]);
-		} else if (align_mode == ALIGN_LOCAL_BILLBOARD) {
-			if (align_axis == ALIGN_AXIS_X) {
-				vec3 len = vec3(
-						length(txform[0].xyz),
-						length(txform[1].xyz),
-						length(txform[2].xyz));
-				txform[0].xyz = normalize(txform[0].xyz);
-				txform[1].xyz = normalize(cross(sort_direction, txform[0].xyz));
-				txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-				txform[0].xyz *= len.x;
-				txform[1].xyz *= len.y;
-				txform[2].xyz *= len.z;
-			} else if (align_axis == ALIGN_AXIS_Y) {
-				vec3 len = vec3(
-						length(txform[0].xyz),
-						length(txform[1].xyz),
-						length(txform[2].xyz));
-				txform[1].xyz = normalize(txform[1].xyz);
-				txform[0].xyz = normalize(cross(txform[1].xyz, sort_direction));
-				txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-				txform[0].xyz *= len.x;
-				txform[1].xyz *= len.y;
-				txform[2].xyz *= len.z;
-			}
 		}
 
 		txform[3].xyz += velocity_flags.xyz * frame_remainder;
diff --git a/engine/drivers/gles3/shaders/scene.glsl b/engine/drivers/gles3/shaders/scene.glsl
index aaaf18e0..10a5d9f9 100644
--- a/engine/drivers/gles3/shaders/scene.glsl
+++ b/engine/drivers/gles3/shaders/scene.glsl
@@ -62,7 +62,7 @@ RENDER_MOTION_VECTORS = false
 
 #include "stdlib_inc.glsl"
 
-#if !defined(MODE_RENDER_DEPTH) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) || defined(LIGHT_CLEARCOAT_USED)
+#if !defined(MODE_RENDER_DEPTH) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) ||defined(LIGHT_CLEARCOAT_USED)
 #ifndef NORMAL_USED
 #define NORMAL_USED
 #endif
@@ -517,7 +517,7 @@ out vec2 uv_interp;
 out vec2 uv2_interp;
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 out vec3 tangent_interp;
 out vec3 binormal_interp;
 #endif
@@ -610,7 +610,7 @@ void vertex_shader(vec4 vertex_angle_attrib_input,
 		model_normal_matrix = mat3(model_matrix);
 	}
 
-#if defined(NORMAL_USED) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(NORMAL_USED) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 
 	vec3 binormal;
 	float binormal_sign;
@@ -685,7 +685,7 @@ void vertex_shader(vec4 vertex_angle_attrib_input,
 	normal = model_normal_matrix * normal;
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 
 	tangent = model_normal_matrix * tangent;
 	binormal = model_normal_matrix * binormal;
@@ -718,7 +718,7 @@ void vertex_shader(vec4 vertex_angle_attrib_input,
 	normal = modelview_normal * normal;
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 
 	binormal = modelview_normal * binormal;
 	tangent = modelview_normal * tangent;
@@ -733,7 +733,7 @@ void vertex_shader(vec4 vertex_angle_attrib_input,
 	normal = (scene_data_input.view_matrix * vec4(normal, 0.0)).xyz;
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 	binormal = (scene_data_input.view_matrix * vec4(binormal, 0.0)).xyz;
 	tangent = (scene_data_input.view_matrix * vec4(tangent, 0.0)).xyz;
 #endif
@@ -747,7 +747,7 @@ void vertex_shader(vec4 vertex_angle_attrib_input,
 	normal_interp = normalize(normal);
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 	tangent_interp = normalize(tangent);
 	binormal_interp = normalize(binormal);
 #endif
@@ -990,7 +990,7 @@ void main() {
 #define SPECULAR_SCHLICK_GGX
 #endif
 
-#if !defined(MODE_RENDER_DEPTH) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) ||defined(LIGHT_CLEARCOAT_USED)
+#if !defined(MODE_RENDER_DEPTH) || defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) ||defined(LIGHT_CLEARCOAT_USED)
 #ifndef NORMAL_USED
 #define NORMAL_USED
 #endif
@@ -1065,7 +1065,7 @@ in vec2 uv2_interp;
 #endif
 #endif
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 in vec3 tangent_interp;
 in vec3 binormal_interp;
 #endif
@@ -1517,11 +1517,6 @@ float SchlickFresnel(float u) {
 	return m2 * m2 * m; // pow(m,5)
 }
 
-float V_Kelemen(float LdotH) {
-	// Kelemen 2001, "A Microfacet Based Coupled Specular-Matte BRDF Model with Importance Sampling"
-	return 0.25 / (LdotH * LdotH + 1e-4);
-}
-
 void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_directional, float attenuation, vec3 f0, float roughness, float metallic, float specular_amount, vec3 albedo, inout float alpha, vec2 screen_uv,
 #ifdef LIGHT_BACKLIGHT_USED
 		vec3 backlight,
@@ -1560,8 +1555,6 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_di
 	float NdotV = dot(N, V);
 	float cNdotV = max(NdotV, 1e-4);
 
-	float cc_attenuation = 1.0;
-
 #if defined(DIFFUSE_BURLEY) || defined(SPECULAR_SCHLICK_GGX) || defined(LIGHT_CLEARCOAT_USED)
 	vec3 H = normalize(V + L);
 #endif
@@ -1574,21 +1567,6 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_di
 	float cLdotH = clamp(A + dot(L, H), 0.0, 1.0);
 #endif
 
-#if defined(LIGHT_CLEARCOAT_USED)
-	// Clearcoat ignores normal_map, use vertex normal instead
-	float ccNdotL = clamp(A + dot(vertex_normal, L), 0.0, 1.0);
-	float ccNdotH = clamp(A + dot(vertex_normal, H), 0.0, 1.0);
-	float cLdotH5 = SchlickFresnel(cLdotH);
-
-	float Dr = D_GGX(ccNdotH, mix(0.001, 0.1, clearcoat_roughness));
-	float Gr = V_Kelemen(cLdotH);
-	float Fr = mix(0.04, 1.0, cLdotH5) * clearcoat;
-	cc_attenuation = 1.0 - Fr;
-	float clearcoat_specular_brdf_NL = Dr * Gr * Fr * ccNdotL;
-
-	specular_light += clearcoat_specular_brdf_NL * light_color * attenuation * specular_amount;
-#endif // LIGHT_CLEARCOAT_USED
-
 	if (metallic < 1.0) {
 		float diffuse_brdf_NL; // BRDF times N.L for calculating diffuse radiance
 
@@ -1610,10 +1588,10 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_di
 		diffuse_brdf_NL = cNdotL * (1.0 / M_PI);
 #endif
 
-		diffuse_light += light_color * diffuse_brdf_NL * attenuation * cc_attenuation;
+		diffuse_light += light_color * diffuse_brdf_NL * attenuation;
 
 #if defined(LIGHT_BACKLIGHT_USED)
-		diffuse_light += light_color * (vec3(1.0 / M_PI) - diffuse_brdf_NL) * backlight * attenuation * cc_attenuation;
+		diffuse_light += light_color * (vec3(1.0 / M_PI) - diffuse_brdf_NL) * backlight * attenuation;
 #endif
 
 #if defined(LIGHT_RIM_USED)
@@ -1655,9 +1633,7 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_di
 		float G = V_GGX(cNdotL, cNdotV, alpha_ggx);
 #endif // LIGHT_ANISOTROPY_USED
 	   // F
-#if !defined(LIGHT_CLEARCOAT_USED)
 		float cLdotH5 = SchlickFresnel(cLdotH);
-#endif
 		// Calculate Fresnel using cheap approximate specular occlusion term from Filament:
 		// https://google.github.io/filament/Filament.html#lighting/occlusion/specularocclusion
 		float f90 = clamp(50.0 * f0.g, 0.0, 1.0);
@@ -1665,8 +1641,27 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, bool is_di
 
 		vec3 specular_brdf_NL = cNdotL * D * F * G;
 
-		specular_light += specular_brdf_NL * light_color * attenuation * cc_attenuation * specular_amount;
+		specular_light += specular_brdf_NL * light_color * attenuation * specular_amount;
 #endif
+
+#if defined(LIGHT_CLEARCOAT_USED)
+		// Clearcoat ignores normal_map, use vertex normal instead
+		float ccNdotL = max(min(A + dot(vertex_normal, L), 1.0), 0.0);
+		float ccNdotH = clamp(A + dot(vertex_normal, H), 0.0, 1.0);
+		float ccNdotV = max(dot(vertex_normal, V), 1e-4);
+
+#if !defined(SPECULAR_SCHLICK_GGX)
+		float cLdotH5 = SchlickFresnel(cLdotH);
+#endif
+		float Dr = D_GGX(ccNdotH, mix(0.001, 0.1, clearcoat_roughness));
+		float Gr = 0.25 / (cLdotH * cLdotH + 1e-4);
+		float Fr = mix(.04, 1.0, cLdotH5);
+		float clearcoat_specular_brdf_NL = clearcoat * Gr * Fr * Dr * cNdotL;
+
+		specular_light += clearcoat_specular_brdf_NL * light_color * attenuation * specular_amount;
+		// TODO: Clearcoat adds light to the scene right now (it is non-energy conserving), both diffuse and specular need to be scaled by (1.0 - FR)
+		// but to do so we need to rearrange this entire function
+#endif // LIGHT_CLEARCOAT_USED
 	}
 
 #ifdef USE_SHADOW_TO_OPACITY
@@ -2044,7 +2039,7 @@ void main() {
 
 	float alpha = 1.0;
 
-#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(BENT_NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
+#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
 	vec3 binormal = binormal_interp;
 	vec3 tangent = tangent_interp;
 #else
@@ -2079,7 +2074,6 @@ void main() {
 #endif
 
 #if defined(BENT_NORMAL_MAP_USED)
-	vec3 bent_normal_vector;
 	vec3 bent_normal_map = vec3(0.5);
 #endif
 
@@ -2161,13 +2155,6 @@ void main() {
 
 #endif // !USE_SHADOW_TO_OPACITY
 
-#ifdef BENT_NORMAL_MAP_USED
-	bent_normal_map.xy = bent_normal_map.xy * 2.0 - 1.0;
-	bent_normal_map.z = sqrt(max(0.0, 1.0 - dot(bent_normal_map.xy, bent_normal_map.xy)));
-
-	bent_normal_vector = normalize(tangent * bent_normal_map.x + binormal * bent_normal_map.y + normal * bent_normal_map.z);
-#endif
-
 #if defined(NORMAL_MAP_USED)
 	normal_map.xy = normal_map.xy * 2.0 - 1.0;
 	normal_map.z = sqrt(max(0.0, 1.0 - dot(normal_map.xy, normal_map.xy))); //always ignore Z, as it can be RG packed, Z may be pos/neg, etc.
@@ -2222,13 +2209,8 @@ void main() {
 	/////////////////////// LIGHTING //////////////////////////////
 
 #ifndef AMBIENT_LIGHT_DISABLED
-#ifdef BENT_NORMAL_MAP_USED
-	vec3 indirect_normal = bent_normal_vector;
-#else
-	vec3 indirect_normal = normal;
-#endif // BENT_NORMAL_MAP_USED
 	// IBL precalculations
-	float ndotv = clamp(dot(indirect_normal, view), 0.0, 1.0);
+	float ndotv = clamp(dot(normal, view), 0.0, 1.0);
 	vec3 F = f0 + (max(vec3(1.0 - roughness), f0) - f0) * pow(1.0 - ndotv, 5.0);
 
 #ifdef USE_RADIANCE_MAP
@@ -2238,13 +2220,13 @@ void main() {
 		vec3 anisotropic_direction = anisotropy >= 0.0 ? binormal : tangent;
 		vec3 anisotropic_tangent = cross(anisotropic_direction, view);
 		vec3 anisotropic_normal = cross(anisotropic_tangent, anisotropic_direction);
-		vec3 bent_normal = normalize(mix(indirect_normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
+		vec3 bent_normal = normalize(mix(normal, anisotropic_normal, abs(anisotropy) * clamp(5.0 * roughness, 0.0, 1.0)));
 		vec3 ref_vec = reflect(-view, bent_normal);
 #else
-		vec3 ref_vec = reflect(-view, indirect_normal);
+		vec3 ref_vec = reflect(-view, normal);
 #endif
-		ref_vec = mix(ref_vec, indirect_normal, roughness * roughness);
-		float horizon = min(1.0 + dot(ref_vec, indirect_normal), 1.0);
+		ref_vec = mix(ref_vec, normal, roughness * roughness);
+		float horizon = min(1.0 + dot(ref_vec, normal), 1.0);
 		ref_vec = mat3(scene_data_block.data.radiance_inverse_xform) * ref_vec;
 		specular_light = textureLod(radiance_map, ref_vec, sqrt(roughness) * RADIANCE_MAX_LOD).rgb;
 		specular_light = srgb_to_linear(specular_light);
@@ -2259,14 +2241,14 @@ void main() {
 	{
 		vec4 reflection_accum = vec4(0.0);
 
-		reflection_process(refprobe1_texture, indirect_normal, vertex_interp, refprobe1_local_matrix,
+		reflection_process(refprobe1_texture, normal, vertex_interp, refprobe1_local_matrix,
 				refprobe1_use_box_project, refprobe1_box_extents, refprobe1_box_offset,
 				refprobe1_exterior, refprobe1_intensity, refprobe1_blend_distance, refprobe1_ambient_mode, refprobe1_ambient_color,
 				roughness, ambient_light, specular_light, reflection_accum, ambient_accum);
 
 #ifdef SECOND_REFLECTION_PROBE
 
-		reflection_process(refprobe2_texture, indirect_normal, vertex_interp, refprobe2_local_matrix,
+		reflection_process(refprobe2_texture, normal, vertex_interp, refprobe2_local_matrix,
 				refprobe2_use_box_project, refprobe2_box_extents, refprobe2_box_offset,
 				refprobe2_exterior, refprobe2_intensity, refprobe2_blend_distance, refprobe2_ambient_mode, refprobe2_ambient_color,
 				roughness, ambient_light, specular_light, reflection_accum, ambient_accum);
@@ -2290,7 +2272,7 @@ void main() {
 
 #ifdef USE_RADIANCE_MAP
 		if (scene_data_block.data.use_ambient_cubemap) {
-			vec3 ambient_dir = mat3(scene_data_block.data.radiance_inverse_xform) * indirect_normal;
+			vec3 ambient_dir = mat3(scene_data_block.data.radiance_inverse_xform) * normal;
 			vec3 cubemap_ambient = textureLod(radiance_map, ambient_dir, RADIANCE_MAX_LOD).rgb;
 			cubemap_ambient = srgb_to_linear(cubemap_ambient);
 			ambient_light = mix(ambient_light, cubemap_ambient * scene_data_block.data.ambient_light_color_energy.a, scene_data_block.data.ambient_color_sky_mix);
@@ -2313,7 +2295,7 @@ void main() {
 #ifdef USE_LIGHTMAP_CAPTURE
 	{
 		// The world normal.
-		vec3 wnormal = mat3(scene_data_block.data.inv_view_matrix) * indirect_normal;
+		vec3 wnormal = mat3(scene_data_block.data.inv_view_matrix) * normal;
 
 		// The SH coefficients used for evaluating diffuse data from SH probes.
 		const float c0 = 0.886227; // l0				sqrt(1.0/(4.0*PI)) 	* PI
@@ -2355,7 +2337,7 @@ void main() {
 		vec3 lm_light_l1p1 = (textureLod(lightmap_textures, uvw + vec3(0.0, 0.0, 3.0), 0.0).rgb - vec3(0.5)) * 2.0;
 #endif
 
-		vec3 n = normalize(lightmap_normal_xform * indirect_normal);
+		vec3 n = normalize(lightmap_normal_xform * normal);
 
 		ambient_light += lm_light_l0 * lightmap_exposure_normalization;
 		ambient_light += lm_light_l1n1 * n.y * (lm_light_l0 * lightmap_exposure_normalization * 4.0);
@@ -2375,12 +2357,6 @@ void main() {
 
 	ambient_light *= ao;
 #ifndef SPECULAR_OCCLUSION_DISABLED
-#ifdef BENT_NORMAL_MAP_USED
-	float cos_b = max(dot(reflect(-view, normal), bent_normal_vector), 0.0);
-	float specular_occlusion = clamp((ao - (1.0 - cos_b)) / roughness, 0.0, 1.0);
-	specular_occlusion = mix(specular_occlusion, cos_b * (1.0 - ao), roughness);
-	specular_light *= specular_occlusion;
-#else // BENT_NORMAL_MAP_USED
 	float specular_occlusion = (ambient_light.r * 0.3 + ambient_light.g * 0.59 + ambient_light.b * 0.11) * 2.0; // Luminance of ambient light.
 	specular_occlusion = min(specular_occlusion * 4.0, 1.0); // This multiplication preserves speculars on bright areas.
 
@@ -2389,7 +2365,6 @@ void main() {
 	// Low enough for occlusion, high enough for reaction to lights and shadows.
 	specular_occlusion = max(min(reflective_f * specular_occlusion * 10.0, 1.0), specular_occlusion);
 	specular_light *= specular_occlusion;
-#endif // BENT_NORMAL_MAP_USED
 #endif // !SPECULAR_OCCLUSION_DISABLED
 	ambient_light *= albedo.rgb;
 
@@ -2411,7 +2386,7 @@ void main() {
 		const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);
 		const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);
 		vec4 r = roughness * c0 + c1;
-		float ndotv = clamp(dot(indirect_normal, view), 0.0, 1.0);
+		float ndotv = clamp(dot(normal, view), 0.0, 1.0);
 
 		float a004 = min(r.x * r.x, exp2(-9.28 * ndotv)) * r.x + r.y;
 		vec2 env = vec2(-1.04, 1.04) * a004 + r.zw;
diff --git a/engine/drivers/gles3/shaders/sky.glsl b/engine/drivers/gles3/shaders/sky.glsl
index 7aab3caa..62250eae 100644
--- a/engine/drivers/gles3/shaders/sky.glsl
+++ b/engine/drivers/gles3/shaders/sky.glsl
@@ -40,7 +40,7 @@ in vec2 uv_interp;
 
 /* clang-format on */
 
-uniform samplerCube radiance; //texunit:-2
+uniform samplerCube radiance; //texunit:-1
 #ifdef USE_CUBEMAP_PASS
 uniform samplerCube half_res; //texunit:-2
 uniform samplerCube quarter_res; //texunit:-3
@@ -195,7 +195,7 @@ void main() {
 #else
 	cube_normal.z = -1.0;
 	cube_normal.x = (uv_interp.x + projection.x) / projection.y;
-	cube_normal.y = (uv_interp.y + projection.z) / projection.w;
+	cube_normal.y = (-uv_interp.y - projection.z) / projection.w;
 #endif
 	cube_normal = mat3(orientation) * cube_normal;
 	cube_normal = normalize(cube_normal);
diff --git a/engine/drivers/gles3/shaders/tex_blit.glsl b/engine/drivers/gles3/shaders/tex_blit.glsl
deleted file mode 100644
index 3358ff6d..00000000
--- a/engine/drivers/gles3/shaders/tex_blit.glsl
+++ /dev/null
@@ -1,121 +0,0 @@
-/* clang-format off */
-
-#[modes]
-
-mode_default =
-
-#[specializations]
-
-USE_OUTPUT1 = true
-USE_OUTPUT2 = true
-USE_OUTPUT3 = true
-
-#[vertex]
-
-layout(location = 0) in vec2 vertex_attrib;
-
-uniform vec2 offset;
-uniform vec2 size;
-
-out vec2 uv;
-
-void main() {
-	uv = vertex_attrib * 0.5 + 0.5;
-	// This math scales the Vertex Attribute Quad to match the Rect the user passed in, based on Offset & Size
-	gl_Position = vec4( (offset * 2.0 - 1.0) + (size * (vertex_attrib + 1.0)), 1.0, 1.0);
-}
-
-#[fragment]
-
-uniform sampler2D source0; // texunit:0
-
-uniform sampler2D source1; // texunit:-1
-
-uniform sampler2D source2; // texunit:-2
-
-uniform sampler2D source3; // texunit:-3
-
-#define OUTPUT0_SRGB uint(1)
-#define OUTPUT1_SRGB uint(2)
-#define OUTPUT2_SRGB uint(4)
-#define OUTPUT3_SRGB uint(8)
-
-uniform uint convert_to_srgb;
-uniform vec4 modulate;
-uniform float time;
-
-in vec2 uv;
-
-layout (location = 0) out vec4 out_color0;
-
-#ifdef USE_OUTPUT1
-layout (location = 1) out vec4 out_color1;
-#endif
-
-#ifdef USE_OUTPUT2
-layout (location = 2) out vec4 out_color2;
-#endif
-
-#ifdef USE_OUTPUT3
-layout (location = 3) out vec4 out_color3;
-#endif
-
-// This needs to be outside clang-format so the ubo comment is in the right place
-#ifdef MATERIAL_UNIFORMS_USED
-layout(std140) uniform MaterialUniforms{ //ubo:0
-
-#MATERIAL_UNIFORMS
-
-};
-#endif
-
-#GLOBALS
-
-vec3 linear_to_srgb(vec3 color) {
-	// If going to srgb, clamp from 0 to 1.
-	color = clamp(color, vec3(0.0), vec3(1.0));
-	const vec3 a = vec3(0.055f);
-	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
-}
-
-void main() {
-	// Handles the case where user code uses extra outputs, but extra output targets were not bound
-	vec4 color0 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color1 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color2 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color3 = vec4(0.0, 0.0, 0.0, 1.0);
-
-#CODE : BLIT
-
-	// Discards extra outputs if extra output targets were not bound
-	out_color0 = color0;
-
-#ifdef USE_OUTPUT1
-	out_color1 = color1;
-#endif
-#ifdef USE_OUTPUT2
-	out_color2 = color2;
-#endif
-#ifdef USE_OUTPUT3
-	out_color3 = color3;
-#endif
-
-	if (bool(convert_to_srgb & OUTPUT0_SRGB)) {
-		out_color0.rgb = linear_to_srgb(out_color0.rgb); // Regular linear -> SRGB conversion.
-	}
-#ifdef USE_OUTPUT1
-	if (bool(convert_to_srgb & OUTPUT1_SRGB)) {
-		out_color1.rgb = linear_to_srgb(out_color1.rgb);
-	}
-#endif
-#ifdef USE_OUTPUT2
-	if (bool(convert_to_srgb & OUTPUT2_SRGB)) {
-		out_color2.rgb = linear_to_srgb(out_color2.rgb);
-	}
-#endif
-#ifdef USE_OUTPUT3
-	if (bool(convert_to_srgb & OUTPUT3_SRGB)) {
-		out_color3.rgb = linear_to_srgb(out_color3.rgb);
-	}
-#endif
-}
diff --git a/engine/drivers/gles3/shaders/tonemap_inc.glsl b/engine/drivers/gles3/shaders/tonemap_inc.glsl
index eb160a1f..b128dce4 100644
--- a/engine/drivers/gles3/shaders/tonemap_inc.glsl
+++ b/engine/drivers/gles3/shaders/tonemap_inc.glsl
@@ -10,15 +10,16 @@ layout(std140) uniform TonemapData { //ubo:0
 	int pad3;
 };
 
-// This approximation expects non-negative input; negative input is undefined behavior.
+// This expects 0-1 range input.
 vec3 linear_to_srgb(vec3 color) {
+	//color = clamp(color, vec3(0.0), vec3(1.0));
 	//const vec3 a = vec3(0.055f);
 	//return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
 	// Approximation from http://chilliant.blogspot.com/2012/08/srgb-approximations-for-hlsl.html
 	return max(vec3(1.055) * pow(color, vec3(0.416666667)) - vec3(0.055), vec3(0.0));
 }
 
-// This approximation expects non-negative input; negative input behaves poorly.
+// This expects 0-1 range input, outside that range it behaves poorly.
 vec3 srgb_to_linear(vec3 color) {
 	// Approximation from http://chilliant.blogspot.com/2012/08/srgb-approximations-for-hlsl.html
 	return color * (color * (color * 0.305306011 + 0.682171111) + 0.012522878);
diff --git a/engine/drivers/gles3/storage/config.cpp b/engine/drivers/gles3/storage/config.cpp
index 5a0373c7..a8892bd5 100644
--- a/engine/drivers/gles3/storage/config.cpp
+++ b/engine/drivers/gles3/storage/config.cpp
@@ -28,14 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "config.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
-#include "core/string/ustring.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
+#include "config.h"
+
+#include "../rasterizer_gles3.h"
 
 #ifdef WEB_ENABLED
 #include <emscripten/html5_webgl.h>
@@ -86,7 +83,7 @@ Config::Config() {
 	astc_layered_supported = astc_hdr_supported || extensions.has("GL_KHR_texture_compression_astc_sliced_3d");
 	astc_supported = astc_layered_supported || extensions.has("GL_KHR_texture_compression_astc_ldr") || extensions.has("WEBGL_compressed_texture_astc");
 
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		float_texture_supported = true;
 		float_texture_linear_supported = true;
 		etc2_supported = false;
diff --git a/engine/drivers/gles3/storage/config.h b/engine/drivers/gles3/storage/config.h
index c8d21763..4ddfba3c 100644
--- a/engine/drivers/gles3/storage/config.h
+++ b/engine/drivers/gles3/storage/config.h
@@ -32,10 +32,11 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/project_settings.h"
+#include "core/string/ustring.h"
 #include "core/templates/hash_set.h"
 
-#include <platform_gl.h>
-#undef ConnectFlags // Defined by windows.h through egl.h, breaks object.h.
+#include "platform_gl.h"
 
 #ifdef ANDROID_ENABLED
 typedef void (*PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
@@ -45,8 +46,6 @@ typedef void (*PFNGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC)(GLenum, GLenu
 typedef void (*PFNEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum, void *);
 #endif
 
-class String;
-
 namespace GLES3 {
 
 class Config {
diff --git a/engine/drivers/gles3/storage/light_storage.cpp b/engine/drivers/gles3/storage/light_storage.cpp
index ad1fee4d..4130a5e4 100644
--- a/engine/drivers/gles3/storage/light_storage.cpp
+++ b/engine/drivers/gles3/storage/light_storage.cpp
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "light_storage.h"
-
 #ifdef GLES3_ENABLED
 
+#include "light_storage.h"
+#include "../rasterizer_gles3.h"
+#include "../rasterizer_scene_gles3.h"
 #include "core/config/project_settings.h"
-#include "core/math/geometry_3d.h"
-#include "core/os/os.h"
-#include "drivers/gles3/effects/cubemap_filter.h"
-#include "drivers/gles3/rasterizer_scene_gles3.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "drivers/gles3/storage/render_scene_buffers_gles3.h"
-#include "drivers/gles3/storage/utilities.h"
+#include "texture_storage.h"
 
 using namespace GLES3;
 
@@ -64,31 +59,31 @@ LightStorage::~LightStorage() {
 
 /* Light API */
 
-void LightStorage::_light_initialize(RID p_light, RSE::LightType p_type) {
+void LightStorage::_light_initialize(RID p_light, RS::LightType p_type) {
 	Light light;
 	light.type = p_type;
 
-	light.param[RSE::LIGHT_PARAM_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_INDIRECT_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SPECULAR] = 0.5;
-	light.param[RSE::LIGHT_PARAM_RANGE] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SIZE] = 0.0;
-	light.param[RSE::LIGHT_PARAM_ATTENUATION] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SPOT_ANGLE] = 45;
-	light.param[RSE::LIGHT_PARAM_SPOT_ATTENUATION] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE] = 0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET] = 0.1;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET] = 0.3;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET] = 0.6;
-	light.param[RSE::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
-	light.param[RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
-	light.param[RSE::LIGHT_PARAM_SHADOW_BLUR] = 0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
-	light.param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS] = 0.05;
-	light.param[RSE::LIGHT_PARAM_INTENSITY] = p_type == RSE::LIGHT_DIRECTIONAL ? 100000.0 : 1000.0;
+	light.param[RS::LIGHT_PARAM_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_INDIRECT_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_SPECULAR] = 0.5;
+	light.param[RS::LIGHT_PARAM_RANGE] = 1.0;
+	light.param[RS::LIGHT_PARAM_SIZE] = 0.0;
+	light.param[RS::LIGHT_PARAM_ATTENUATION] = 1.0;
+	light.param[RS::LIGHT_PARAM_SPOT_ANGLE] = 45;
+	light.param[RS::LIGHT_PARAM_SPOT_ATTENUATION] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE] = 0;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET] = 0.1;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET] = 0.3;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET] = 0.6;
+	light.param[RS::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
+	light.param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
+	light.param[RS::LIGHT_PARAM_SHADOW_BLUR] = 0;
+	light.param[RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
+	light.param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS] = 0.05;
+	light.param[RS::LIGHT_PARAM_INTENSITY] = p_type == RS::LIGHT_DIRECTIONAL ? 100000.0 : 1000.0;
 
 	light_owner.initialize_rid(p_light, light);
 }
@@ -98,7 +93,7 @@ RID LightStorage::directional_light_allocate() {
 }
 
 void LightStorage::directional_light_initialize(RID p_rid) {
-	_light_initialize(p_rid, RSE::LIGHT_DIRECTIONAL);
+	_light_initialize(p_rid, RS::LIGHT_DIRECTIONAL);
 }
 
 RID LightStorage::omni_light_allocate() {
@@ -106,7 +101,7 @@ RID LightStorage::omni_light_allocate() {
 }
 
 void LightStorage::omni_light_initialize(RID p_rid) {
-	_light_initialize(p_rid, RSE::LIGHT_OMNI);
+	_light_initialize(p_rid, RS::LIGHT_OMNI);
 }
 
 RID LightStorage::spot_light_allocate() {
@@ -114,7 +109,7 @@ RID LightStorage::spot_light_allocate() {
 }
 
 void LightStorage::spot_light_initialize(RID p_rid) {
-	_light_initialize(p_rid, RSE::LIGHT_SPOT);
+	_light_initialize(p_rid, RS::LIGHT_SPOT);
 }
 
 void LightStorage::light_free(RID p_rid) {
@@ -133,29 +128,29 @@ void LightStorage::light_set_color(RID p_light, const Color &p_color) {
 	light->color = p_color;
 }
 
-void LightStorage::light_set_param(RID p_light, RSE::LightParam p_param, float p_value) {
+void LightStorage::light_set_param(RID p_light, RS::LightParam p_param, float p_value) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
-	ERR_FAIL_INDEX(p_param, RSE::LIGHT_PARAM_MAX);
+	ERR_FAIL_INDEX(p_param, RS::LIGHT_PARAM_MAX);
 
 	if (light->param[p_param] == p_value) {
 		return;
 	}
 
 	switch (p_param) {
-		case RSE::LIGHT_PARAM_RANGE:
-		case RSE::LIGHT_PARAM_SPOT_ANGLE:
-		case RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS:
-		case RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE:
-		case RSE::LIGHT_PARAM_SHADOW_BIAS: {
+		case RS::LIGHT_PARAM_RANGE:
+		case RS::LIGHT_PARAM_SPOT_ANGLE:
+		case RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS:
+		case RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE:
+		case RS::LIGHT_PARAM_SHADOW_BIAS: {
 			light->version++;
 			light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 		} break;
-		case RSE::LIGHT_PARAM_SIZE: {
+		case RS::LIGHT_PARAM_SIZE: {
 			if ((light->param[p_param] > CMP_EPSILON) != (p_value > CMP_EPSILON)) {
 				//changing from no size to size and the opposite
 				light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT_SOFT_SHADOW_AND_PROJECTOR);
@@ -186,15 +181,15 @@ void LightStorage::light_set_projector(RID p_light, RID p_texture) {
 		return;
 	}
 
-	if (light->type != RSE::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
-		texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RSE::LIGHT_OMNI);
+	if (light->type != RS::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
+		texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
 	}
 
 	light->projector = p_texture;
 
-	if (light->type != RSE::LIGHT_DIRECTIONAL) {
+	if (light->type != RS::LIGHT_DIRECTIONAL) {
 		if (light->projector.is_valid()) {
-			texture_storage->texture_add_to_decal_atlas(light->projector, light->type == RSE::LIGHT_OMNI);
+			texture_storage->texture_add_to_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
 		}
 		light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT_SOFT_SHADOW_AND_PROJECTOR);
 	}
@@ -254,7 +249,7 @@ void LightStorage::light_set_reverse_cull_face_mode(RID p_light, bool p_enabled)
 	light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 }
 
-void LightStorage::light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) {
+void LightStorage::light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -264,7 +259,7 @@ void LightStorage::light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mo
 	light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 }
 
-void LightStorage::light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) {
+void LightStorage::light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -274,14 +269,14 @@ void LightStorage::light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowM
 	light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 }
 
-RSE::LightOmniShadowMode LightStorage::light_omni_get_shadow_mode(RID p_light) {
+RS::LightOmniShadowMode LightStorage::light_omni_get_shadow_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_OMNI_SHADOW_CUBE);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_OMNI_SHADOW_CUBE);
 
 	return light->omni_shadow_mode;
 }
 
-void LightStorage::light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) {
+void LightStorage::light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -306,30 +301,30 @@ bool LightStorage::light_directional_get_blend_splits(RID p_light) const {
 	return light->directional_blend_splits;
 }
 
-void LightStorage::light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) {
+void LightStorage::light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
 	light->directional_sky_mode = p_mode;
 }
 
-RSE::LightDirectionalSkyMode LightStorage::light_directional_get_sky_mode(RID p_light) const {
+RS::LightDirectionalSkyMode LightStorage::light_directional_get_sky_mode(RID p_light) const {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
 
 	return light->directional_sky_mode;
 }
 
-RSE::LightDirectionalShadowMode LightStorage::light_directional_get_shadow_mode(RID p_light) {
+RS::LightDirectionalShadowMode LightStorage::light_directional_get_shadow_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
 
 	return light->directional_shadow_mode;
 }
 
-RSE::LightBakeMode LightStorage::light_get_bake_mode(RID p_light) {
+RS::LightBakeMode LightStorage::light_get_bake_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_BAKE_DISABLED);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_BAKE_DISABLED);
 
 	return light->bake_mode;
 }
@@ -353,9 +348,9 @@ AABB LightStorage::light_get_aabb(RID p_light) const {
 	ERR_FAIL_NULL_V(light, AABB());
 
 	switch (light->type) {
-		case RSE::LIGHT_SPOT: {
-			float len = light->param[RSE::LIGHT_PARAM_RANGE];
-			float angle = Math::deg_to_rad(light->param[RSE::LIGHT_PARAM_SPOT_ANGLE]);
+		case RS::LIGHT_SPOT: {
+			float len = light->param[RS::LIGHT_PARAM_RANGE];
+			float angle = Math::deg_to_rad(light->param[RS::LIGHT_PARAM_SPOT_ANGLE]);
 
 			if (angle > Math::PI * 0.5) {
 				// Light casts backwards as well.
@@ -365,11 +360,11 @@ AABB LightStorage::light_get_aabb(RID p_light) const {
 			float size = Math::sin(angle) * len;
 			return AABB(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len));
 		};
-		case RSE::LIGHT_OMNI: {
-			float r = light->param[RSE::LIGHT_PARAM_RANGE];
+		case RS::LIGHT_OMNI: {
+			float r = light->param[RS::LIGHT_PARAM_RANGE];
 			return AABB(-Vector3(r, r, r), Vector3(r, r, r) * 2);
 		};
-		case RSE::LIGHT_DIRECTIONAL: {
+		case RS::LIGHT_DIRECTIONAL: {
 			return AABB();
 		};
 	}
@@ -467,7 +462,7 @@ void LightStorage::reflection_probe_free(RID p_rid) {
 	reflection_probe_owner.free(p_rid);
 }
 
-void LightStorage::reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) {
+void LightStorage::reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) {
 	ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
 	ERR_FAIL_NULL(reflection_probe);
 
@@ -489,7 +484,7 @@ void LightStorage::reflection_probe_set_blend_distance(RID p_probe, float p_blen
 	reflection_probe->blend_distance = p_blend_distance;
 }
 
-void LightStorage::reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) {
+void LightStorage::reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) {
 	ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
 	ERR_FAIL_NULL(reflection_probe);
 
@@ -588,9 +583,9 @@ AABB LightStorage::reflection_probe_get_aabb(RID p_probe) const {
 	return aabb;
 }
 
-RSE::ReflectionProbeUpdateMode LightStorage::reflection_probe_get_update_mode(RID p_probe) const {
+RS::ReflectionProbeUpdateMode LightStorage::reflection_probe_get_update_mode(RID p_probe) const {
 	const ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
-	ERR_FAIL_NULL_V(reflection_probe, RSE::REFLECTION_PROBE_UPDATE_ONCE);
+	ERR_FAIL_NULL_V(reflection_probe, RenderingServer::REFLECTION_PROBE_UPDATE_ONCE);
 
 	return reflection_probe->update_mode;
 }
@@ -796,7 +791,7 @@ bool LightStorage::reflection_probe_instance_needs_redraw(RID p_instance) {
 		return true;
 	}
 
-	if (reflection_probe_get_update_mode(rpi->probe) == RSE::REFLECTION_PROBE_UPDATE_ALWAYS) {
+	if (reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS) {
 		return true;
 	}
 
@@ -860,7 +855,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 			atlas->reflections.write[i].color = color;
 
 #ifdef GL_API_ENABLED
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				for (int s = 0; s < 6; s++) {
 					glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + s, 0, GL_RGB10_A2, atlas->size, atlas->size, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 				}
@@ -868,7 +863,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 			}
 #endif
 #ifdef GLES_API_ENABLED
-			if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (!RasterizerGLES3::is_gles_over_gl()) {
 				glTexStorage2D(GL_TEXTURE_CUBE_MAP, atlas->mipmap_count, GL_RGB10_A2, atlas->size, atlas->size);
 			}
 #endif // GLES_API_ENABLED
@@ -898,7 +893,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 			atlas->reflections.write[i].radiance = radiance;
 
 #ifdef GL_API_ENABLED
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				for (int s = 0; s < 6; s++) {
 					glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + s, 0, GL_RGB10_A2, atlas->size, atlas->size, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 				}
@@ -906,7 +901,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 			}
 #endif
 #ifdef GLES_API_ENABLED
-			if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (!RasterizerGLES3::is_gles_over_gl()) {
 				glTexStorage2D(GL_TEXTURE_CUBE_MAP, atlas->mipmap_count, GL_RGB10_A2, atlas->size, atlas->size);
 			}
 #endif // GLES_API_ENABLED
@@ -1017,7 +1012,7 @@ bool LightStorage::reflection_probe_instance_postprocess_step(RID p_instance) {
 		return false;
 	}
 
-	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RSE::REFLECTION_PROBE_UPDATE_ALWAYS) {
+	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS) {
 		// Using real time reflections, all roughness is done in one step
 		for (int m = 0; m < atlas->mipmap_count; m++) {
 			const GLES3::ReflectionAtlas::Reflection &reflection = atlas->reflections[rpi->atlas_index];
@@ -1243,14 +1238,14 @@ void LightStorage::lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow
 	glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
 }
 
-RSE::ShadowmaskMode LightStorage::lightmap_get_shadowmask_mode(RID p_lightmap) {
+RS::ShadowmaskMode LightStorage::lightmap_get_shadowmask_mode(RID p_lightmap) {
 	Lightmap *lightmap = lightmap_owner.get_or_null(p_lightmap);
-	ERR_FAIL_NULL_V(lightmap, RSE::SHADOWMASK_MODE_NONE);
+	ERR_FAIL_NULL_V(lightmap, RS::SHADOWMASK_MODE_NONE);
 
 	return lightmap->shadowmask_mode;
 }
 
-void LightStorage::lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) {
+void LightStorage::lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) {
 	Lightmap *lightmap = lightmap_owner.get_or_null(p_lightmap);
 	ERR_FAIL_NULL(lightmap);
 	lightmap->shadowmask_mode = p_mode;
@@ -1289,7 +1284,7 @@ void LightStorage::shadow_atlas_set_size(RID p_atlas, int p_size, bool p_16_bits
 	ShadowAtlas *shadow_atlas = shadow_atlas_owner.get_or_null(p_atlas);
 	ERR_FAIL_NULL(shadow_atlas);
 	ERR_FAIL_COND(p_size < 0);
-	p_size = Math::next_power_of_2((uint32_t)p_size);
+	p_size = next_power_of_2((uint32_t)p_size);
 
 	if (p_size == shadow_atlas->size && p_16_bits == shadow_atlas->use_16_bits) {
 		return;
@@ -1336,7 +1331,7 @@ void LightStorage::shadow_atlas_set_quadrant_subdivision(RID p_atlas, int p_quad
 	ERR_FAIL_INDEX(p_quadrant, 4);
 	ERR_FAIL_INDEX(p_subdivision, 16384);
 
-	uint32_t subdiv = Math::next_power_of_2((uint32_t)p_subdivision);
+	uint32_t subdiv = next_power_of_2((uint32_t)p_subdivision);
 	if (subdiv & 0xaaaaaaaa) { // sqrt(subdiv) must be integer.
 		subdiv <<= 1;
 	}
@@ -1410,7 +1405,7 @@ bool LightStorage::shadow_atlas_update_light(RID p_atlas, RID p_light_instance,
 	}
 
 	uint32_t quad_size = shadow_atlas->size >> 1;
-	int desired_fit = MIN(quad_size / shadow_atlas->smallest_subdiv, Math::next_power_of_2(uint32_t(quad_size * p_coverage)));
+	int desired_fit = MIN(quad_size / shadow_atlas->smallest_subdiv, next_power_of_2(uint32_t(quad_size * p_coverage)));
 
 	int valid_quadrants[4];
 	int valid_quadrant_count = 0;
@@ -1469,7 +1464,7 @@ bool LightStorage::shadow_atlas_update_light(RID p_atlas, RID p_light_instance,
 		old_subdivision = shadow_atlas->quadrants[old_quadrant].subdivision;
 	}
 
-	bool is_omni = li->light_type == RSE::LIGHT_OMNI;
+	bool is_omni = li->light_type == RS::LIGHT_OMNI;
 	bool found_shadow = false;
 	int new_quadrant = -1;
 	int new_shadow = -1;
@@ -1671,7 +1666,7 @@ void LightStorage::update_directional_shadow_atlas() {
 	glUseProgram(0);
 	glDepthMask(GL_TRUE);
 	glBindFramebuffer(GL_FRAMEBUFFER, directional_shadow.fbo);
-	RasterizerUtilGLES3::clear_depth(0.0);
+	RasterizerGLES3::clear_depth(0.0);
 	glClear(GL_DEPTH_BUFFER_BIT);
 
 	glBindTexture(GL_TEXTURE_2D, 0);
@@ -1679,7 +1674,7 @@ void LightStorage::update_directional_shadow_atlas() {
 }
 
 void LightStorage::directional_shadow_atlas_set_size(int p_size, bool p_16_bits) {
-	p_size = Math::nearest_power_of_2_templated(p_size);
+	p_size = nearest_power_of_2_templated(p_size);
 
 	if (directional_shadow.size == p_size && directional_shadow.use_16_bits == p_16_bits) {
 		return;
@@ -1736,12 +1731,12 @@ int LightStorage::get_directional_light_shadow_size(RID p_light_instance) {
 	ERR_FAIL_NULL_V(light_instance, 0);
 
 	switch (light_directional_get_shadow_mode(light_instance->light)) {
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
 			break; //none
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
 			r.size.height /= 2;
 			break;
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
 			r.size /= 2;
 			break;
 	}
diff --git a/engine/drivers/gles3/storage/light_storage.h b/engine/drivers/gles3/storage/light_storage.h
index 905b52fa..487a14e5 100644
--- a/engine/drivers/gles3/storage/light_storage.h
+++ b/engine/drivers/gles3/storage/light_storage.h
@@ -32,29 +32,28 @@
 
 #ifdef GLES3_ENABLED
 
+#include "platform_gl.h"
+#include "render_scene_buffers_gles3.h"
+
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "drivers/gles3/storage/texture_storage.h"
 #include "servers/rendering/storage/light_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
-#include <platform_gl.h>
-
-class RenderSceneBuffersGLES3;
-
 namespace GLES3 {
 
 /* LIGHT */
 
 struct Light {
-	RSE::LightType type;
-	float param[RSE::LIGHT_PARAM_MAX];
+	RS::LightType type;
+	float param[RS::LIGHT_PARAM_MAX];
 	Color color = Color(1, 1, 1, 1);
 	RID projector;
 	bool shadow = false;
 	bool negative = false;
 	bool reverse_cull = false;
-	RSE::LightBakeMode bake_mode = RSE::LIGHT_BAKE_DYNAMIC;
+	RS::LightBakeMode bake_mode = RS::LIGHT_BAKE_DYNAMIC;
 	uint32_t max_sdfgi_cascade = 2;
 	uint32_t cull_mask = 0xFFFFFFFF;
 	uint32_t shadow_caster_mask = 0xFFFFFFFF;
@@ -62,10 +61,10 @@ struct Light {
 	real_t distance_fade_begin = 40.0;
 	real_t distance_fade_shadow = 50.0;
 	real_t distance_fade_length = 10.0;
-	RSE::LightOmniShadowMode omni_shadow_mode = RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID;
-	RSE::LightDirectionalShadowMode directional_shadow_mode = RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL;
+	RS::LightOmniShadowMode omni_shadow_mode = RS::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID;
+	RS::LightDirectionalShadowMode directional_shadow_mode = RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL;
 	bool directional_blend_splits = false;
-	RSE::LightDirectionalSkyMode directional_sky_mode = RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY;
+	RS::LightDirectionalSkyMode directional_sky_mode = RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY;
 	uint64_t version = 0;
 
 	Dependency dependency;
@@ -86,7 +85,7 @@ struct LightInstance {
 	};
 
 	ShadowTransform shadow_transform[6];
-	RSE::LightType light_type = RSE::LIGHT_DIRECTIONAL;
+	RS::LightType light_type = RS::LIGHT_DIRECTIONAL;
 
 	AABB aabb;
 	RID self;
@@ -113,10 +112,10 @@ struct LightInstance {
 /* REFLECTION PROBE */
 
 struct ReflectionProbe {
-	RSE::ReflectionProbeUpdateMode update_mode = RSE::REFLECTION_PROBE_UPDATE_ONCE;
+	RS::ReflectionProbeUpdateMode update_mode = RS::REFLECTION_PROBE_UPDATE_ONCE;
 	float intensity = 1.0;
 	float blend_distance = 1.0;
-	RSE::ReflectionProbeAmbientMode ambient_mode = RSE::REFLECTION_PROBE_AMBIENT_ENVIRONMENT;
+	RS::ReflectionProbeAmbientMode ambient_mode = RS::REFLECTION_PROBE_AMBIENT_ENVIRONMENT;
 	Color ambient_color;
 	float ambient_color_energy = 1.0;
 	float max_distance = 0;
@@ -182,7 +181,7 @@ struct Lightmap {
 	float baked_exposure = 1.0;
 	Vector2i light_texture_size;
 	int32_t array_index = -1; //unassigned
-	RSE::ShadowmaskMode shadowmask_mode = RSE::SHADOWMASK_MODE_NONE;
+	RS::ShadowmaskMode shadowmask_mode = RS::SHADOWMASK_MODE_NONE;
 	PackedVector3Array points;
 	PackedColorArray point_sh;
 	PackedInt32Array tetrahedra;
@@ -307,7 +306,7 @@ public:
 	Light *get_light(RID p_rid) { return light_owner.get_or_null(p_rid); }
 	bool owns_light(RID p_rid) { return light_owner.owns(p_rid); }
 
-	void _light_initialize(RID p_rid, RSE::LightType p_type);
+	void _light_initialize(RID p_rid, RS::LightType p_type);
 
 	virtual RID directional_light_allocate() override;
 	virtual void directional_light_initialize(RID p_rid) override;
@@ -319,7 +318,7 @@ public:
 	virtual void light_free(RID p_rid) override;
 
 	virtual void light_set_color(RID p_light, const Color &p_color) override;
-	virtual void light_set_param(RID p_light, RSE::LightParam p_param, float p_value) override;
+	virtual void light_set_param(RID p_light, RS::LightParam p_param, float p_value) override;
 	virtual void light_set_shadow(RID p_light, bool p_enabled) override;
 	virtual void light_set_projector(RID p_light, RID p_texture) override;
 	virtual void light_set_negative(RID p_light, bool p_enable) override;
@@ -328,28 +327,28 @@ public:
 	virtual void light_set_reverse_cull_face_mode(RID p_light, bool p_enabled) override;
 	virtual void light_set_shadow_caster_mask(RID p_light, uint32_t p_caster_mask) override;
 	virtual uint32_t light_get_shadow_caster_mask(RID p_light) const override;
-	virtual void light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) override;
+	virtual void light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) override;
 	virtual void light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade) override {}
 
-	virtual void light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) override;
+	virtual void light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) override;
 
-	virtual void light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) override;
+	virtual void light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) override;
 	virtual void light_directional_set_blend_splits(RID p_light, bool p_enable) override;
 	virtual bool light_directional_get_blend_splits(RID p_light) const override;
-	virtual void light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) override;
-	virtual RSE::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override;
+	virtual void light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) override;
+	virtual RS::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override;
 
-	virtual RSE::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override;
-	virtual RSE::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override;
-	virtual RSE::LightType light_get_type(RID p_light) const override {
+	virtual RS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override;
+	virtual RS::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override;
+	virtual RS::LightType light_get_type(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->type;
 	}
 	virtual AABB light_get_aabb(RID p_light) const override;
 
-	virtual float light_get_param(RID p_light, RSE::LightParam p_param) override {
+	virtual float light_get_param(RID p_light, RS::LightParam p_param) override {
 		const Light *light = light_owner.get_or_null(p_light);
 		ERR_FAIL_NULL_V(light, 0);
 
@@ -392,21 +391,21 @@ public:
 
 	virtual bool light_has_shadow(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->shadow;
 	}
 
 	virtual bool light_has_projector(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return TextureStorage::get_singleton()->owns_texture(light->projector);
 	}
 
 	_FORCE_INLINE_ bool light_is_negative(RID p_light) const {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->negative;
 	}
@@ -415,7 +414,7 @@ public:
 		const Light *light = light_owner.get_or_null(p_light);
 		ERR_FAIL_NULL_V(light, 0.0);
 
-		return light->param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS];
+		return light->param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS];
 	}
 
 	virtual bool light_get_reverse_cull_face_mode(RID p_light) const override {
@@ -425,7 +424,7 @@ public:
 		return light->reverse_cull;
 	}
 
-	virtual RSE::LightBakeMode light_get_bake_mode(RID p_light) override;
+	virtual RS::LightBakeMode light_get_bake_mode(RID p_light) override;
 	virtual uint32_t light_get_max_sdfgi_cascade(RID p_light) override { return 0; }
 	virtual uint64_t light_get_version(RID p_light) const override;
 	virtual uint32_t light_get_cull_mask(RID p_light) const override;
@@ -614,7 +613,7 @@ public:
 		return li->directional_rect;
 	}
 
-	_FORCE_INLINE_ RSE::LightType light_instance_get_type(RID p_light_instance) {
+	_FORCE_INLINE_ RS::LightType light_instance_get_type(RID p_light_instance) {
 		LightInstance *li = light_instance_owner.get_or_null(p_light_instance);
 		return li->light_type;
 	}
@@ -638,10 +637,10 @@ public:
 	virtual void reflection_probe_initialize(RID p_rid) override;
 	virtual void reflection_probe_free(RID p_rid) override;
 
-	virtual void reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) override;
+	virtual void reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) override;
 	virtual void reflection_probe_set_intensity(RID p_probe, float p_intensity) override;
 	virtual void reflection_probe_set_blend_distance(RID p_probe, float p_blend_distance) override;
-	virtual void reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) override;
+	virtual void reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) override;
 	virtual void reflection_probe_set_ambient_color(RID p_probe, const Color &p_color) override;
 	virtual void reflection_probe_set_ambient_energy(RID p_probe, float p_energy) override;
 	virtual void reflection_probe_set_max_distance(RID p_probe, float p_distance) override;
@@ -657,7 +656,7 @@ public:
 	virtual float reflection_probe_get_mesh_lod_threshold(RID p_probe) const override;
 
 	virtual AABB reflection_probe_get_aabb(RID p_probe) const override;
-	virtual RSE::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override;
+	virtual RS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override;
 	virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const override;
 	virtual uint32_t reflection_probe_get_reflection_mask(RID p_probe) const override;
 	virtual Vector3 reflection_probe_get_size(RID p_probe) const override;
@@ -738,8 +737,8 @@ public:
 	virtual float lightmap_get_probe_capture_update_speed() const override;
 
 	virtual void lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow) override;
-	virtual RSE::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override;
-	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) override;
+	virtual RS::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override;
+	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) override;
 
 	/* LIGHTMAP INSTANCE */
 
diff --git a/engine/drivers/gles3/storage/material_storage.cpp b/engine/drivers/gles3/storage/material_storage.cpp
index eccab2fd..2a11a1c5 100644
--- a/engine/drivers/gles3/storage/material_storage.cpp
+++ b/engine/drivers/gles3/storage/material_storage.cpp
@@ -28,18 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "material_storage.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
+
+#include "config.h"
+#include "material_storage.h"
+#include "particles_storage.h"
+#include "texture_storage.h"
+
 #include "drivers/gles3/rasterizer_canvas_gles3.h"
 #include "drivers/gles3/rasterizer_gles3.h"
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/storage/variant_converters.h"
 
 using namespace GLES3;
@@ -683,36 +682,36 @@ static const GLenum target_from_type[ShaderLanguage::TYPE_MAX] = {
 	GL_TEXTURE_2D, // TYPE_STRUCT
 };
 
-static const RSE::CanvasItemTextureRepeat repeat_from_uniform[ShaderLanguage::REPEAT_DEFAULT + 1] = {
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DISABLE,
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_ENABLE,
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_DEFAULT,
+static const RS::CanvasItemTextureRepeat repeat_from_uniform[ShaderLanguage::REPEAT_DEFAULT + 1] = {
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DISABLE,
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_ENABLE,
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_DEFAULT,
 };
 
-static const RSE::CanvasItemTextureRepeat repeat_from_uniform_canvas[ShaderLanguage::REPEAT_DEFAULT + 1] = {
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DISABLE,
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_ENABLE,
-	RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DEFAULT,
+static const RS::CanvasItemTextureRepeat repeat_from_uniform_canvas[ShaderLanguage::REPEAT_DEFAULT + 1] = {
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DISABLE,
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED, // ShaderLanguage::TextureRepeat::REPEAT_ENABLE,
+	RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED, // ShaderLanguage::TextureRepeat::REPEAT_DEFAULT,
 };
 
-static const RSE::CanvasItemTextureFilter filter_from_uniform[ShaderLanguage::FILTER_DEFAULT + 1] = {
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, // ShaderLanguage::TextureFilter::FILTER_NEAREST,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_LINEAR,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP_ANISOTROPIC,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP_ANISOTROPIC,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_DEFAULT,
+static const RS::CanvasItemTextureFilter filter_from_uniform[ShaderLanguage::FILTER_DEFAULT + 1] = {
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, // ShaderLanguage::TextureFilter::FILTER_NEAREST,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_LINEAR,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP_ANISOTROPIC,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP_ANISOTROPIC,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_DEFAULT,
 };
 
-static const RSE::CanvasItemTextureFilter filter_from_uniform_canvas[ShaderLanguage::FILTER_DEFAULT + 1] = {
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, // ShaderLanguage::TextureFilter::FILTER_NEAREST,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_LINEAR,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP_ANISOTROPIC,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP_ANISOTROPIC,
-	RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_DEFAULT,
+static const RS::CanvasItemTextureFilter filter_from_uniform_canvas[ShaderLanguage::FILTER_DEFAULT + 1] = {
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, // ShaderLanguage::TextureFilter::FILTER_NEAREST,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_LINEAR,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_NEAREST_MIPMAP_ANISOTROPIC,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, // ShaderLanguage::TextureFilter::FILTER_LINEAR_MIPMAP_ANISOTROPIC,
+	RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, // ShaderLanguage::TextureFilter::FILTER_DEFAULT,
 };
 
 void MaterialData::update_uniform_buffer(const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const HashMap<StringName, Variant> &p_parameters, uint8_t *p_buffer, uint32_t p_buffer_size) {
@@ -832,11 +831,12 @@ MaterialData::~MaterialData() {
 }
 
 void MaterialData::update_textures(const HashMap<StringName, Variant> &p_parameters, const HashMap<StringName, HashMap<int, RID>> &p_default_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, RID *p_textures, bool p_is_3d_shader_type) {
+	TextureStorage *texture_storage = TextureStorage::get_singleton();
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 
 #ifdef TOOLS_ENABLED
 	Texture *roughness_detect_texture = nullptr;
-	RSE::TextureDetectRoughnessChannel roughness_channel = RSE::TEXTURE_DETECT_ROUGHNESS_R;
+	RS::TextureDetectRoughnessChannel roughness_channel = RS::TEXTURE_DETECT_ROUGHNESS_R;
 	Texture *normal_detect_texture = nullptr;
 #endif
 
@@ -925,9 +925,91 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
 			}
 		}
 
+		RID gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_WHITE);
+
 		if (textures.is_empty()) {
 			//check default usage
-			RID gl_texture = get_default_texture_id(p_texture_uniforms[i].type, p_texture_uniforms[i].hint);
+			switch (p_texture_uniforms[i].type) {
+				case ShaderLanguage::TYPE_ISAMPLER2D:
+				case ShaderLanguage::TYPE_USAMPLER2D:
+				case ShaderLanguage::TYPE_SAMPLER2D: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_TRANSPARENT);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_ANISO);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_NORMAL);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_NORMAL: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_NORMAL);
+						} break;
+						default: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_WHITE);
+						} break;
+					}
+				} break;
+
+				case ShaderLanguage::TYPE_SAMPLERCUBE: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_TRANSPARENT);
+						} break;
+						default: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_WHITE);
+						} break;
+					}
+				} break;
+				case ShaderLanguage::TYPE_SAMPLERCUBEARRAY: {
+					ERR_PRINT_ONCE("Type: SamplerCubeArray is not supported in the Compatibility renderer, please use another type.");
+				} break;
+				case ShaderLanguage::TYPE_SAMPLEREXT: {
+					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_EXT);
+				} break;
+
+				case ShaderLanguage::TYPE_ISAMPLER3D:
+				case ShaderLanguage::TYPE_USAMPLER3D:
+				case ShaderLanguage::TYPE_SAMPLER3D: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_TRANSPARENT);
+						} break;
+						default: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_WHITE);
+						} break;
+					}
+				} break;
+
+				case ShaderLanguage::TYPE_ISAMPLER2DARRAY:
+				case ShaderLanguage::TYPE_USAMPLER2DARRAY:
+				case ShaderLanguage::TYPE_SAMPLER2DARRAY: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_TRANSPARENT);
+						} break;
+						default: {
+							gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE);
+						} break;
+					}
+				} break;
+
+				default: {
+				}
+			}
 #ifdef TOOLS_ENABLED
 			if (roughness_detect_texture && normal_detect_texture && !normal_detect_texture->path.is_empty()) {
 				roughness_detect_texture->detect_roughness_callback(roughness_detect_texture->detect_roughness_callback_ud, normal_detect_texture->path, roughness_channel);
@@ -941,11 +1023,8 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
 				p_textures[k++] = gl_texture;
 			}
 		} else {
-			RID gl_default;
-
 			for (int j = 0; j < textures.size(); j++) {
 				Texture *tex = TextureStorage::get_singleton()->get_texture(textures[j]);
-				RID gl_texture;
 
 				if (tex) {
 					gl_texture = textures[j];
@@ -962,7 +1041,7 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
 					if (tex->detect_roughness_callback && (p_texture_uniforms[i].hint >= ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R || p_texture_uniforms[i].hint <= ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_GRAY)) {
 						//find the normal texture
 						roughness_detect_texture = tex;
-						roughness_channel = RSE::TextureDetectRoughnessChannel(p_texture_uniforms[i].hint - ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R);
+						roughness_channel = RS::TextureDetectRoughnessChannel(p_texture_uniforms[i].hint - ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R);
 					}
 #endif
 				}
@@ -971,12 +1050,6 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
 					roughness_detect_texture->detect_roughness_callback(roughness_detect_texture->detect_roughness_callback_ud, normal_detect_texture->path, roughness_channel);
 				}
 #endif
-				if (gl_texture.is_null()) {
-					if (gl_default.is_null()) {
-						gl_default = get_default_texture_id(p_texture_uniforms[i].type, p_texture_uniforms[i].hint);
-					}
-					gl_texture = gl_default;
-				}
 				p_textures[k++] = gl_texture;
 			}
 		}
@@ -1011,95 +1084,6 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
 	}
 }
 
-RID MaterialData::get_default_texture_id(ShaderLanguage::DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint) {
-	TextureStorage *texture_storage = TextureStorage::get_singleton();
-	RID gl_texture;
-
-	switch (p_type) {
-		case ShaderLanguage::TYPE_ISAMPLER2D:
-		case ShaderLanguage::TYPE_USAMPLER2D:
-		case ShaderLanguage::TYPE_SAMPLER2D: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_TRANSPARENT);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_ANISO);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_NORMAL);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_NORMAL: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_NORMAL);
-				} break;
-				default: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_WHITE);
-				} break;
-			}
-		} break;
-
-		case ShaderLanguage::TYPE_SAMPLERCUBE: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_TRANSPARENT);
-				} break;
-				default: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_CUBEMAP_WHITE);
-				} break;
-			}
-		} break;
-		case ShaderLanguage::TYPE_SAMPLERCUBEARRAY: {
-			ERR_PRINT_ONCE("Type: SamplerCubeArray is not supported in the Compatibility renderer, please use another type.");
-		} break;
-		case ShaderLanguage::TYPE_SAMPLEREXT: {
-			gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_EXT);
-		} break;
-
-		case ShaderLanguage::TYPE_ISAMPLER3D:
-		case ShaderLanguage::TYPE_USAMPLER3D:
-		case ShaderLanguage::TYPE_SAMPLER3D: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_TRANSPARENT);
-				} break;
-				default: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_3D_WHITE);
-				} break;
-			}
-		} break;
-
-		case ShaderLanguage::TYPE_ISAMPLER2DARRAY:
-		case ShaderLanguage::TYPE_USAMPLER2DARRAY:
-		case ShaderLanguage::TYPE_SAMPLER2DARRAY: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_TRANSPARENT);
-				} break;
-				default: {
-					gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE);
-				} break;
-			}
-		} break;
-
-		default: {
-		}
-	}
-
-	return gl_texture;
-}
-
 void MaterialData::update_parameters_internal(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty, const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, const HashMap<StringName, HashMap<int, RID>> &p_default_texture_params, uint32_t p_ubo_size, bool p_is_3d_shader_type) {
 	if ((uint32_t)ubo_data.size() != p_ubo_size) {
 		p_uniform_dirty = true;
@@ -1149,19 +1133,17 @@ MaterialStorage *MaterialStorage::get_singleton() {
 MaterialStorage::MaterialStorage() {
 	singleton = this;
 
-	shader_data_request_func[RSE::SHADER_SPATIAL] = _create_scene_shader_func;
-	shader_data_request_func[RSE::SHADER_CANVAS_ITEM] = _create_canvas_shader_func;
-	shader_data_request_func[RSE::SHADER_PARTICLES] = _create_particles_shader_func;
-	shader_data_request_func[RSE::SHADER_SKY] = _create_sky_shader_func;
-	shader_data_request_func[RSE::SHADER_TEXTURE_BLIT] = _create_tex_blit_shader_func;
-	shader_data_request_func[RSE::SHADER_FOG] = nullptr;
+	shader_data_request_func[RS::SHADER_SPATIAL] = _create_scene_shader_func;
+	shader_data_request_func[RS::SHADER_CANVAS_ITEM] = _create_canvas_shader_func;
+	shader_data_request_func[RS::SHADER_PARTICLES] = _create_particles_shader_func;
+	shader_data_request_func[RS::SHADER_SKY] = _create_sky_shader_func;
+	shader_data_request_func[RS::SHADER_FOG] = nullptr;
 
-	material_data_request_func[RSE::SHADER_SPATIAL] = _create_scene_material_func;
-	material_data_request_func[RSE::SHADER_CANVAS_ITEM] = _create_canvas_material_func;
-	material_data_request_func[RSE::SHADER_PARTICLES] = _create_particles_material_func;
-	material_data_request_func[RSE::SHADER_SKY] = _create_sky_material_func;
-	material_data_request_func[RSE::SHADER_TEXTURE_BLIT] = _create_tex_blit_material_func;
-	material_data_request_func[RSE::SHADER_FOG] = nullptr;
+	material_data_request_func[RS::SHADER_SPATIAL] = _create_scene_material_func;
+	material_data_request_func[RS::SHADER_CANVAS_ITEM] = _create_canvas_material_func;
+	material_data_request_func[RS::SHADER_PARTICLES] = _create_particles_material_func;
+	material_data_request_func[RS::SHADER_SKY] = _create_sky_material_func;
+	material_data_request_func[RS::SHADER_FOG] = nullptr;
 
 	static_assert(sizeof(GlobalShaderUniforms::Value) == 16);
 
@@ -1567,28 +1549,6 @@ MaterialStorage::MaterialStorage() {
 
 		shaders.compiler_sky.initialize(actions);
 	}
-
-	{
-		// Setup TextureBlit compiler
-		ShaderCompiler::DefaultIdentifierActions actions;
-
-		actions.renames["TIME"] = "time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
-
-		actions.renames["FRAGCOORD"] = "gl_FragCoord";
-
-		actions.renames["UV"] = "uv";
-		actions.renames["MODULATE"] = "modulate";
-
-		actions.renames["COLOR0"] = "color0";
-		actions.renames["COLOR1"] = "color1";
-		actions.renames["COLOR2"] = "color2";
-		actions.renames["COLOR3"] = "color3";
-
-		shaders.compiler_tex_blit.initialize(actions);
-	}
 }
 
 MaterialStorage::~MaterialStorage() {
@@ -1630,9 +1590,9 @@ int32_t MaterialStorage::_global_shader_uniform_allocate(uint32_t p_elements) {
 	return -1;
 }
 
-void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RSE::GlobalShaderParameterType p_type, const Variant &p_value) {
+void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS::GlobalShaderParameterType p_type, const Variant &p_value) {
 	switch (p_type) {
-		case RSE::GLOBAL_VAR_TYPE_BOOL: {
+		case RS::GLOBAL_VAR_TYPE_BOOL: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			bool b = p_value;
 			bv.x = b ? 1.0 : 0.0;
@@ -1641,7 +1601,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.w = 0.0;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC2: {
+		case RS::GLOBAL_VAR_TYPE_BVEC2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1649,7 +1609,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0.0;
 			bv.w = 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC3: {
+		case RS::GLOBAL_VAR_TYPE_BVEC3: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1657,7 +1617,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = (bvec & 4) ? 1.0 : 0.0;
 			bv.w = 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC4: {
+		case RS::GLOBAL_VAR_TYPE_BVEC4: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1665,7 +1625,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = (bvec & 4) ? 1.0 : 0.0;
 			bv.w = (bvec & 8) ? 1.0 : 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_INT: {
+		case RS::GLOBAL_VAR_TYPE_INT: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			int32_t v = p_value;
 			bv.x = v;
@@ -1673,7 +1633,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC2: {
+		case RS::GLOBAL_VAR_TYPE_IVEC2: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector2i v = convert_to_vector<Vector2i>(p_value);
 			bv.x = v.x;
@@ -1681,7 +1641,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC3: {
+		case RS::GLOBAL_VAR_TYPE_IVEC3: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector3i v = convert_to_vector<Vector3i>(p_value);
 			bv.x = v.x;
@@ -1689,7 +1649,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC4: {
+		case RS::GLOBAL_VAR_TYPE_IVEC4: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector4i v = convert_to_vector<Vector4i>(p_value);
 			bv.x = v.x;
@@ -1697,7 +1657,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_RECT2I: {
+		case RS::GLOBAL_VAR_TYPE_RECT2I: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Rect2i v = p_value;
 			bv.x = v.position.x;
@@ -1705,7 +1665,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.size.x;
 			bv.w = v.size.y;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UINT: {
+		case RS::GLOBAL_VAR_TYPE_UINT: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			uint32_t v = p_value;
 			bv.x = v;
@@ -1713,7 +1673,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC2: {
+		case RS::GLOBAL_VAR_TYPE_UVEC2: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector2i v = convert_to_vector<Vector2i>(p_value);
 			bv.x = v.x;
@@ -1721,7 +1681,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC3: {
+		case RS::GLOBAL_VAR_TYPE_UVEC3: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector3i v = convert_to_vector<Vector3i>(p_value);
 			bv.x = v.x;
@@ -1729,7 +1689,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC4: {
+		case RS::GLOBAL_VAR_TYPE_UVEC4: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector4i v = convert_to_vector<Vector4i>(p_value);
 			bv.x = v.x;
@@ -1737,7 +1697,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+		case RS::GLOBAL_VAR_TYPE_FLOAT: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			float v = p_value;
 			bv.x = v;
@@ -1745,7 +1705,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC2: {
+		case RS::GLOBAL_VAR_TYPE_VEC2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector2 v = convert_to_vector<Vector2>(p_value);
 			bv.x = v.x;
@@ -1753,7 +1713,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC3: {
+		case RS::GLOBAL_VAR_TYPE_VEC3: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector3 v = convert_to_vector<Vector3>(p_value);
 			bv.x = v.x;
@@ -1761,7 +1721,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC4: {
+		case RS::GLOBAL_VAR_TYPE_VEC4: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector4 v = convert_to_vector<Vector4>(p_value);
 			bv.x = v.x;
@@ -1769,7 +1729,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_COLOR: {
+		case RS::GLOBAL_VAR_TYPE_COLOR: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Color v = p_value;
 			bv.x = v.r;
@@ -1785,7 +1745,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv_linear.w = v.a;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_RECT2: {
+		case RS::GLOBAL_VAR_TYPE_RECT2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Rect2 v = p_value;
 			bv.x = v.position.x;
@@ -1793,7 +1753,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.size.x;
 			bv.w = v.size.y;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT2: {
+		case RS::GLOBAL_VAR_TYPE_MAT2: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Vector<float> m2 = p_value;
 			if (m2.size() < 4) {
@@ -1810,25 +1770,25 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv[1].w = 0;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT3: {
+		case RS::GLOBAL_VAR_TYPE_MAT3: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Basis v = p_value;
 			convert_item_std140<Basis>(v, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT4: {
+		case RS::GLOBAL_VAR_TYPE_MAT4: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Projection m = p_value;
 			convert_item_std140<Projection>(m, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Transform2D v = p_value;
 			convert_item_std140<Transform2D>(v, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Transform3D v = p_value;
 			convert_item_std140<Transform3D>(v, &bv->x);
@@ -1856,27 +1816,27 @@ void MaterialStorage::_global_shader_uniform_mark_buffer_dirty(int32_t p_index,
 	}
 }
 
-void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) {
+void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) {
 	ERR_FAIL_COND(global_shader_uniforms.variables.has(p_name));
 	GlobalShaderUniforms::Variable gv;
 	gv.type = p_type;
 	gv.value = p_value;
 	gv.buffer_index = -1;
 
-	if (p_type >= RSE::GLOBAL_VAR_TYPE_SAMPLER2D) {
+	if (p_type >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
 		//is texture
 		global_shader_uniforms.must_update_texture_materials = true; //normally there are none
 	} else {
 		gv.buffer_elements = 1;
-		if (p_type == RSE::GLOBAL_VAR_TYPE_COLOR || p_type == RSE::GLOBAL_VAR_TYPE_MAT2) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_COLOR || p_type == RS::GLOBAL_VAR_TYPE_MAT2) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 2;
 		}
-		if (p_type == RSE::GLOBAL_VAR_TYPE_MAT3 || p_type == RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_MAT3 || p_type == RS::GLOBAL_VAR_TYPE_TRANSFORM_2D) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 3;
 		}
-		if (p_type == RSE::GLOBAL_VAR_TYPE_MAT4 || p_type == RSE::GLOBAL_VAR_TYPE_TRANSFORM) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_MAT4 || p_type == RS::GLOBAL_VAR_TYPE_TRANSFORM) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 4;
 		}
@@ -1987,17 +1947,17 @@ Variant MaterialStorage::global_shader_parameter_get(const StringName &p_name) c
 	return global_shader_uniforms.variables[p_name].value;
 }
 
-RSE::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type_internal(const StringName &p_name) const {
+RS::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type_internal(const StringName &p_name) const {
 	if (!global_shader_uniforms.variables.has(p_name)) {
-		return RSE::GLOBAL_VAR_TYPE_MAX;
+		return RS::GLOBAL_VAR_TYPE_MAX;
 	}
 
 	return global_shader_uniforms.variables[p_name].type;
 }
 
-RSE::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
+RS::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
-		ERR_FAIL_V_MSG(RSE::GLOBAL_VAR_TYPE_MAX, "This function should never be used outside the editor, it can severely damage performance.");
+		ERR_FAIL_V_MSG(RS::GLOBAL_VAR_TYPE_MAX, "This function should never be used outside the editor, it can severely damage performance.");
 	}
 
 	return global_shader_parameter_get_type_internal(p_name);
@@ -2017,7 +1977,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 			String type = d["type"];
 
-			static const char *global_var_type_names[RSE::GLOBAL_VAR_TYPE_MAX] = {
+			static const char *global_var_type_names[RS::GLOBAL_VAR_TYPE_MAX] = {
 				"bool",
 				"bvec2",
 				"bvec3",
@@ -2049,20 +2009,20 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 				"samplerExternalOES"
 			};
 
-			RSE::GlobalShaderParameterType gvtype = RSE::GLOBAL_VAR_TYPE_MAX;
+			RS::GlobalShaderParameterType gvtype = RS::GLOBAL_VAR_TYPE_MAX;
 
-			for (int i = 0; i < RSE::GLOBAL_VAR_TYPE_MAX; i++) {
+			for (int i = 0; i < RS::GLOBAL_VAR_TYPE_MAX; i++) {
 				if (global_var_type_names[i] == type) {
-					gvtype = RSE::GlobalShaderParameterType(i);
+					gvtype = RS::GlobalShaderParameterType(i);
 					break;
 				}
 			}
 
-			ERR_CONTINUE(gvtype == RSE::GLOBAL_VAR_TYPE_MAX); //type invalid
+			ERR_CONTINUE(gvtype == RS::GLOBAL_VAR_TYPE_MAX); //type invalid
 
 			Variant value = d["value"];
 
-			if (gvtype >= RSE::GLOBAL_VAR_TYPE_SAMPLER2D) {
+			if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
 				String path = value;
 				// Don't load the textures, but still add the parameter so shaders compile correctly while loading.
 				if (!p_load_textures || path.is_empty()) {
@@ -2233,7 +2193,7 @@ RID MaterialStorage::shader_allocate() {
 void MaterialStorage::shader_initialize(RID p_rid, bool p_embedded) {
 	Shader shader;
 	shader.data = nullptr;
-	shader.mode = RSE::SHADER_MAX;
+	shader.mode = RS::SHADER_MAX;
 
 	shader_owner.initialize_rid(p_rid, shader);
 }
@@ -2262,21 +2222,19 @@ void MaterialStorage::shader_set_code(RID p_shader, const String &p_code) {
 
 	String mode_string = ShaderLanguage::get_shader_type(p_code);
 
-	RSE::ShaderMode new_mode;
+	RS::ShaderMode new_mode;
 	if (mode_string == "canvas_item") {
-		new_mode = RSE::SHADER_CANVAS_ITEM;
+		new_mode = RS::SHADER_CANVAS_ITEM;
 	} else if (mode_string == "particles") {
-		new_mode = RSE::SHADER_PARTICLES;
+		new_mode = RS::SHADER_PARTICLES;
 	} else if (mode_string == "spatial") {
-		new_mode = RSE::SHADER_SPATIAL;
+		new_mode = RS::SHADER_SPATIAL;
 	} else if (mode_string == "sky") {
-		new_mode = RSE::SHADER_SKY;
+		new_mode = RS::SHADER_SKY;
 		//} else if (mode_string == "fog") {
-		//	new_mode = RSE::SHADER_FOG;
-	} else if (mode_string == "texture_blit") {
-		new_mode = RSE::SHADER_TEXTURE_BLIT;
+		//	new_mode = RS::SHADER_FOG;
 	} else {
-		new_mode = RSE::SHADER_MAX;
+		new_mode = RS::SHADER_MAX;
 		ERR_PRINT("shader type " + mode_string + " not supported in OpenGL renderer");
 	}
 
@@ -2297,10 +2255,10 @@ void MaterialStorage::shader_set_code(RID p_shader, const String &p_code) {
 
 		shader->mode = new_mode;
 
-		if (new_mode < RSE::SHADER_MAX && shader_data_request_func[new_mode]) {
+		if (new_mode < RS::SHADER_MAX && shader_data_request_func[new_mode]) {
 			shader->data = shader_data_request_func[new_mode]();
 		} else {
-			shader->mode = RSE::SHADER_MAX; //invalid
+			shader->mode = RS::SHADER_MAX; //invalid
 		}
 
 		for (Material *E : shader->owners) {
@@ -2405,13 +2363,13 @@ Variant MaterialStorage::shader_get_parameter_default(RID p_shader, const String
 	return Variant();
 }
 
-RenderingServerTypes::ShaderNativeSourceCode MaterialStorage::shader_get_native_source_code(RID p_shader) const {
+RS::ShaderNativeSourceCode MaterialStorage::shader_get_native_source_code(RID p_shader) const {
 	Shader *shader = shader_owner.get_or_null(p_shader);
-	ERR_FAIL_NULL_V(shader, RenderingServerTypes::ShaderNativeSourceCode());
+	ERR_FAIL_NULL_V(shader, RS::ShaderNativeSourceCode());
 	if (shader->data) {
 		return shader->data->get_native_source_code();
 	}
-	return RenderingServerTypes::ShaderNativeSourceCode();
+	return RS::ShaderNativeSourceCode();
 }
 
 /* MATERIAL API */
@@ -2482,7 +2440,7 @@ void MaterialStorage::material_set_shader(RID p_material, RID p_shader) {
 	if (material->shader) {
 		material->shader->owners.erase(material);
 		material->shader = nullptr;
-		material->shader_mode = RSE::SHADER_MAX;
+		material->shader_mode = RS::SHADER_MAX;
 	}
 
 	if (p_shader.is_null()) {
@@ -2498,7 +2456,7 @@ void MaterialStorage::material_set_shader(RID p_material, RID p_shader) {
 	material->shader_id = p_shader.get_local_index();
 	shader->owners.insert(material);
 
-	if (shader->mode == RSE::SHADER_MAX) {
+	if (shader->mode == RS::SHADER_MAX) {
 		return;
 	}
 
@@ -2559,8 +2517,8 @@ void MaterialStorage::material_set_next_pass(RID p_material, RID p_next_material
 }
 
 void MaterialStorage::material_set_render_priority(RID p_material, int priority) {
-	ERR_FAIL_COND(priority < RSE::MATERIAL_RENDER_PRIORITY_MIN);
-	ERR_FAIL_COND(priority > RSE::MATERIAL_RENDER_PRIORITY_MAX);
+	ERR_FAIL_COND(priority < RS::MATERIAL_RENDER_PRIORITY_MIN);
+	ERR_FAIL_COND(priority > RS::MATERIAL_RENDER_PRIORITY_MAX);
 
 	GLES3::Material *material = material_owner.get_or_null(p_material);
 	ERR_FAIL_NULL(material);
@@ -2597,17 +2555,17 @@ bool MaterialStorage::material_casts_shadows(RID p_material) {
 	return true; //by default everything casts shadows
 }
 
-RSE::CullMode MaterialStorage::material_get_cull_mode(RID p_material) const {
+RS::CullMode MaterialStorage::material_get_cull_mode(RID p_material) const {
 	const GLES3::Material *material = material_owner.get_or_null(p_material);
-	ERR_FAIL_NULL_V(material, RSE::CULL_MODE_DISABLED);
-	ERR_FAIL_NULL_V(material->shader, RSE::CULL_MODE_DISABLED);
+	ERR_FAIL_NULL_V(material, RS::CULL_MODE_DISABLED);
+	ERR_FAIL_NULL_V(material->shader, RS::CULL_MODE_DISABLED);
 	if (material->shader->data) {
 		SceneShaderData *data = dynamic_cast<SceneShaderData *>(material->shader->data);
 		if (data) {
-			return (RSE::CullMode)data->cull_mode;
+			return (RS::CullMode)data->cull_mode;
 		}
 	}
-	return RSE::CULL_MODE_DISABLED;
+	return RS::CULL_MODE_DISABLED;
 }
 
 void MaterialStorage::material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) {
@@ -2687,7 +2645,7 @@ void CanvasShaderData::set_code(const String &p_code) {
 	actions.usage_flag_pointers["CUSTOM1"] = &uses_custom1;
 
 	actions.uniforms = &uniforms;
-	Error err = MaterialStorage::get_singleton()->shaders.compiler_canvas.compile(RSE::SHADER_CANVAS_ITEM, code, &actions, path, gen_code);
+	Error err = MaterialStorage::get_singleton()->shaders.compiler_canvas.compile(RS::SHADER_CANVAS_ITEM, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -2721,9 +2679,9 @@ void CanvasShaderData::set_code(const String &p_code) {
 	MaterialStorage::get_singleton()->shaders.canvas_shader.version_set_code(version, gen_code.code, gen_code.uniforms, gen_code.stage_globals[ShaderCompiler::STAGE_VERTEX], gen_code.stage_globals[ShaderCompiler::STAGE_FRAGMENT], gen_code.defines, texture_uniform_data);
 	ERR_FAIL_COND(!MaterialStorage::get_singleton()->shaders.canvas_shader.version_is_valid(version));
 
-	vertex_input_mask = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_COLOR | RSE::ARRAY_FORMAT_TEX_UV;
-	vertex_input_mask |= uses_custom0 << RSE::ARRAY_CUSTOM0;
-	vertex_input_mask |= uses_custom1 << RSE::ARRAY_CUSTOM1;
+	vertex_input_mask = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_COLOR | RS::ARRAY_FORMAT_TEX_UV;
+	vertex_input_mask |= uses_custom0 << RS::ARRAY_CUSTOM0;
+	vertex_input_mask |= uses_custom1 << RS::ARRAY_CUSTOM1;
 
 	ubo_size = gen_code.uniform_total_size;
 	ubo_offsets = gen_code.uniform_offsets;
@@ -2740,7 +2698,7 @@ bool CanvasShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode CanvasShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode CanvasShaderData::get_native_source_code() const {
 	return MaterialStorage::get_singleton()->shaders.canvas_shader.version_get_native_source_code(version);
 }
 
@@ -2765,7 +2723,7 @@ void CanvasMaterialData::update_parameters(const HashMap<StringName, Variant> &p
 	update_parameters_internal(p_parameters, p_uniform_dirty, p_textures_dirty, shader_data->uniforms, shader_data->ubo_offsets.ptr(), shader_data->texture_uniforms, shader_data->default_texture_params, shader_data->ubo_size, false);
 }
 
-static void bind_uniforms_generic(const Vector<RID> &p_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, int texture_offset = 0, const RSE::CanvasItemTextureFilter *filter_mapping = filter_from_uniform, const RSE::CanvasItemTextureRepeat *repeat_mapping = repeat_from_uniform) {
+static void bind_uniforms_generic(const Vector<RID> &p_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, int texture_offset = 0, const RS::CanvasItemTextureFilter *filter_mapping = filter_from_uniform, const RS::CanvasItemTextureRepeat *repeat_mapping = repeat_from_uniform) {
 	const RID *textures = p_textures.ptr();
 	const ShaderCompiler::GeneratedCode::Texture *texture_uniforms = p_texture_uniforms.ptr();
 	int texture_uniform_index = 0;
@@ -2867,7 +2825,7 @@ void SkyShaderData::set_code(const String &p_code) {
 
 	actions.uniforms = &uniforms;
 
-	Error err = MaterialStorage::get_singleton()->shaders.compiler_sky.compile(RSE::SHADER_SKY, code, &actions, path, gen_code);
+	Error err = MaterialStorage::get_singleton()->shaders.compiler_sky.compile(RS::SHADER_SKY, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -2912,7 +2870,7 @@ bool SkyShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode SkyShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode SkyShaderData::get_native_source_code() const {
 	return MaterialStorage::get_singleton()->shaders.sky_shader.version_get_native_source_code(version);
 }
 
@@ -3014,7 +2972,7 @@ void SceneShaderData::set_code(const String &p_code) {
 	int depth_test_disabledi = 0;
 	int depth_test_invertedi = 0;
 	int alpha_antialiasing_modei = ALPHA_ANTIALIASING_OFF;
-	int cull_modei = RSE::CULL_MODE_BACK;
+	int cull_modei = RS::CULL_MODE_BACK;
 	int depth_drawi = DEPTH_DRAW_OPAQUE;
 
 	int stencil_readi = 0;
@@ -3044,9 +3002,9 @@ void SceneShaderData::set_code(const String &p_code) {
 	actions.render_mode_values["depth_test_disabled"] = Pair<int *, int>(&depth_test_disabledi, 1);
 	actions.render_mode_values["depth_test_inverted"] = Pair<int *, int>(&depth_test_invertedi, 1);
 
-	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_DISABLED);
-	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_FRONT);
-	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_BACK);
+	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_DISABLED);
+	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_FRONT);
+	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_BACK);
 
 	actions.render_mode_flags["unshaded"] = &unshaded;
 	actions.render_mode_flags["wireframe"] = &wireframe;
@@ -3108,7 +3066,7 @@ void SceneShaderData::set_code(const String &p_code) {
 
 	actions.uniforms = &uniforms;
 
-	Error err = MaterialStorage::get_singleton()->shaders.compiler_scene.compile(RSE::SHADER_SPATIAL, code, &actions, path, gen_code);
+	Error err = MaterialStorage::get_singleton()->shaders.compiler_scene.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -3125,19 +3083,19 @@ void SceneShaderData::set_code(const String &p_code) {
 	} else {
 		depth_test = DEPTH_TEST_ENABLED;
 	}
-	cull_mode = RSE::CullMode(cull_modei);
+	cull_mode = RS::CullMode(cull_modei);
 
-	vertex_input_mask = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_NORMAL; // We can always read vertices and normals.
-	vertex_input_mask |= uses_tangent << RSE::ARRAY_TANGENT;
-	vertex_input_mask |= uses_color << RSE::ARRAY_COLOR;
-	vertex_input_mask |= uses_uv << RSE::ARRAY_TEX_UV;
-	vertex_input_mask |= uses_uv2 << RSE::ARRAY_TEX_UV2;
-	vertex_input_mask |= uses_custom0 << RSE::ARRAY_CUSTOM0;
-	vertex_input_mask |= uses_custom1 << RSE::ARRAY_CUSTOM1;
-	vertex_input_mask |= uses_custom2 << RSE::ARRAY_CUSTOM2;
-	vertex_input_mask |= uses_custom3 << RSE::ARRAY_CUSTOM3;
-	vertex_input_mask |= uses_bones << RSE::ARRAY_BONES;
-	vertex_input_mask |= uses_weights << RSE::ARRAY_WEIGHTS;
+	vertex_input_mask = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_NORMAL; // We can always read vertices and normals.
+	vertex_input_mask |= uses_tangent << RS::ARRAY_TANGENT;
+	vertex_input_mask |= uses_color << RS::ARRAY_COLOR;
+	vertex_input_mask |= uses_uv << RS::ARRAY_TEX_UV;
+	vertex_input_mask |= uses_uv2 << RS::ARRAY_TEX_UV2;
+	vertex_input_mask |= uses_custom0 << RS::ARRAY_CUSTOM0;
+	vertex_input_mask |= uses_custom1 << RS::ARRAY_CUSTOM1;
+	vertex_input_mask |= uses_custom2 << RS::ARRAY_CUSTOM2;
+	vertex_input_mask |= uses_custom3 << RS::ARRAY_CUSTOM3;
+	vertex_input_mask |= uses_bones << RS::ARRAY_BONES;
+	vertex_input_mask |= uses_weights << RS::ARRAY_WEIGHTS;
 
 	uses_screen_texture = gen_code.uses_screen_texture;
 	uses_screen_texture_mipmaps = gen_code.uses_screen_texture_mipmaps;
@@ -3220,7 +3178,7 @@ bool SceneShaderData::casts_shadows() const {
 	return !has_alpha || (uses_depth_prepass_alpha && !(depth_draw == DEPTH_DRAW_DISABLED || depth_test != DEPTH_TEST_ENABLED));
 }
 
-RenderingServerTypes::ShaderNativeSourceCode SceneShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode SceneShaderData::get_native_source_code() const {
 	return MaterialStorage::get_singleton()->shaders.scene_shader.version_get_native_source_code(version);
 }
 
@@ -3241,7 +3199,7 @@ GLES3::ShaderData *GLES3::_create_scene_shader_func() {
 }
 
 void SceneMaterialData::set_render_priority(int p_priority) {
-	priority = p_priority - RSE::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
+	priority = p_priority - RS::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
 }
 
 void SceneMaterialData::set_next_pass(RID p_pass) {
@@ -3302,7 +3260,7 @@ void ParticlesShaderData::set_code(const String &p_code) {
 
 	actions.uniforms = &uniforms;
 
-	Error err = MaterialStorage::get_singleton()->shaders.compiler_particles.compile(RSE::SHADER_PARTICLES, code, &actions, path, gen_code);
+	Error err = MaterialStorage::get_singleton()->shaders.compiler_particles.compile(RS::SHADER_PARTICLES, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -3335,7 +3293,7 @@ bool ParticlesShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode ParticlesShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode ParticlesShaderData::get_native_source_code() const {
 	return MaterialStorage::get_singleton()->shaders.particles_process_shader.version_get_native_source_code(version);
 }
 
@@ -3371,119 +3329,4 @@ void ParticleProcessMaterialData::bind_uniforms() {
 	bind_uniforms_generic(texture_cache, shader_data->texture_uniforms, 1); // Start at GL_TEXTURE1 because texture slot 0 is reserved for the heightmap texture.
 }
 
-/* TextureBlit SHADER */
-
-void TexBlitShaderData::set_code(const String &p_code) {
-	// Initialize and compile the shader.
-
-	code = p_code;
-	valid = false;
-	ubo_size = 0;
-	uniforms.clear();
-
-	if (code.is_empty()) {
-		return; // Just invalid, but no error.
-	}
-
-	ShaderCompiler::GeneratedCode gen_code;
-
-	// Actual enum set further down after compilation.
-	int blend_modei = BLEND_MODE_MIX;
-
-	ShaderCompiler::IdentifierActions actions;
-	actions.entry_point_stages["blit"] = ShaderCompiler::STAGE_FRAGMENT;
-
-	actions.render_mode_values["blend_add"] = Pair<int *, int>(&blend_modei, BLEND_MODE_ADD);
-	actions.render_mode_values["blend_mix"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MIX);
-	actions.render_mode_values["blend_sub"] = Pair<int *, int>(&blend_modei, BLEND_MODE_SUB);
-	actions.render_mode_values["blend_mul"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MUL);
-	actions.render_mode_values["blend_disabled"] = Pair<int *, int>(&blend_modei, BLEND_MODE_DISABLED);
-
-	actions.uniforms = &uniforms;
-	Error err = MaterialStorage::get_singleton()->shaders.compiler_tex_blit.compile(RSE::SHADER_TEXTURE_BLIT, code, &actions, path, gen_code);
-	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
-
-	if (version.is_null()) {
-		version = MaterialStorage::get_singleton()->shaders.tex_blit_shader.version_create();
-	}
-
-	blend_mode = BlendMode(blend_modei);
-
-#if 0
-	print_line("**compiling shader:");
-	print_line("**defines:\n");
-	for (int i = 0; i < gen_code.defines.size(); i++) {
-		print_line(gen_code.defines[i]);
-	}
-
-	HashMap<String, String>::Iterator el = gen_code.code.begin();
-	while (el) {
-		print_line("\n**code " + el->key + ":\n" + el->value);
-		++el;
-	}
-
-	print_line("\n**uniforms:\n" + gen_code.uniforms);
-	print_line("\n**vertex_globals:\n" + gen_code.stage_globals[ShaderCompiler::STAGE_VERTEX]);
-	print_line("\n**fragment_globals:\n" + gen_code.stage_globals[ShaderCompiler::STAGE_FRAGMENT]);
-#endif
-
-	LocalVector<ShaderGLES3::TextureUniformData> texture_uniform_data = get_texture_uniform_data(gen_code.texture_uniforms);
-
-	MaterialStorage::get_singleton()->shaders.tex_blit_shader.version_set_code(version, gen_code.code, gen_code.uniforms, gen_code.stage_globals[ShaderCompiler::STAGE_VERTEX], gen_code.stage_globals[ShaderCompiler::STAGE_FRAGMENT], gen_code.defines, texture_uniform_data);
-	ERR_FAIL_COND(!MaterialStorage::get_singleton()->shaders.tex_blit_shader.version_is_valid(version));
-
-	ubo_size = gen_code.uniform_total_size;
-	ubo_offsets = gen_code.uniform_offsets;
-	texture_uniforms = gen_code.texture_uniforms;
-
-	valid = true;
-}
-
-bool TexBlitShaderData::is_animated() const {
-	return false;
-}
-
-bool TexBlitShaderData::casts_shadows() const {
-	return false;
-}
-
-RenderingServerTypes::ShaderNativeSourceCode TexBlitShaderData::get_native_source_code() const {
-	return MaterialStorage::get_singleton()->shaders.tex_blit_shader.version_get_native_source_code(version);
-}
-
-TexBlitShaderData::TexBlitShaderData() {
-	valid = false;
-}
-
-TexBlitShaderData::~TexBlitShaderData() {
-	if (version.is_valid()) {
-		MaterialStorage::get_singleton()->shaders.tex_blit_shader.version_free(version);
-	}
-}
-
-GLES3::ShaderData *GLES3::_create_tex_blit_shader_func() {
-	TexBlitShaderData *shader_data = memnew(TexBlitShaderData);
-	return shader_data;
-}
-
-void TexBlitMaterialData::update_parameters(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty) {
-	update_parameters_internal(p_parameters, p_uniform_dirty, p_textures_dirty, shader_data->uniforms, shader_data->ubo_offsets.ptr(), shader_data->texture_uniforms, shader_data->default_texture_params, shader_data->ubo_size, false);
-}
-
-void TexBlitMaterialData::bind_uniforms() {
-	glBindBufferBase(GL_UNIFORM_BUFFER, 0, uniform_buffer);
-
-	bind_uniforms_generic(texture_cache, shader_data->texture_uniforms, 1);
-}
-
-TexBlitMaterialData::~TexBlitMaterialData() {
-}
-
-GLES3::MaterialData *GLES3::_create_tex_blit_material_func(ShaderData *p_shader) {
-	TexBlitMaterialData *material_data = memnew(TexBlitMaterialData);
-	material_data->shader_data = static_cast<TexBlitShaderData *>(p_shader);
-	//update will happen later anyway so do nothing.
-	return material_data;
-}
-
 #endif // !GLES3_ENABLED
diff --git a/engine/drivers/gles3/storage/material_storage.h b/engine/drivers/gles3/storage/material_storage.h
index 97cf61cc..ec93b8fb 100644
--- a/engine/drivers/gles3/storage/material_storage.h
+++ b/engine/drivers/gles3/storage/material_storage.h
@@ -34,17 +34,16 @@
 
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "drivers/gles3/shaders/canvas.glsl.gen.h"
-#include "drivers/gles3/shaders/particles.glsl.gen.h"
-#include "drivers/gles3/shaders/scene.glsl.gen.h"
-#include "drivers/gles3/shaders/sky.glsl.gen.h"
-#include "drivers/gles3/shaders/tex_blit.glsl.gen.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
+#include "drivers/gles3/shaders/canvas.glsl.gen.h"
+#include "drivers/gles3/shaders/particles.glsl.gen.h"
+#include "drivers/gles3/shaders/scene.glsl.gen.h"
+#include "drivers/gles3/shaders/sky.glsl.gen.h"
+
 namespace GLES3 {
 
 /* Shader Structs */
@@ -64,7 +63,7 @@ struct ShaderData {
 	virtual void set_code(const String &p_Code) = 0;
 	virtual bool is_animated() const = 0;
 	virtual bool casts_shadows() const = 0;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const { return RenderingServerTypes::ShaderNativeSourceCode(); }
+	virtual RS::ShaderNativeSourceCode get_native_source_code() const { return RS::ShaderNativeSourceCode(); }
 
 	virtual ~ShaderData() {}
 };
@@ -77,7 +76,7 @@ struct Shader {
 	ShaderData *data = nullptr;
 	String code;
 	String path_hint;
-	RSE::ShaderMode mode;
+	RS::ShaderMode mode;
 	HashMap<StringName, HashMap<int, RID>> default_texture_parameter;
 	HashSet<Material *> owners;
 };
@@ -87,7 +86,6 @@ struct Shader {
 struct MaterialData {
 	void update_uniform_buffer(const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const HashMap<StringName, Variant> &p_parameters, uint8_t *p_buffer, uint32_t p_buffer_size);
 	void update_textures(const HashMap<StringName, Variant> &p_parameters, const HashMap<StringName, HashMap<int, RID>> &p_default_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, RID *p_textures, bool p_use_linear_color);
-	RID get_default_texture_id(ShaderLanguage::DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint);
 
 	virtual void set_render_priority(int p_priority) = 0;
 	virtual void set_next_pass(RID p_pass) = 0;
@@ -119,7 +117,7 @@ struct Material {
 	MaterialData *data = nullptr;
 	Shader *shader = nullptr;
 	//shortcut to shader data and type
-	RSE::ShaderMode shader_mode = RSE::SHADER_MAX;
+	RS::ShaderMode shader_mode = RS::SHADER_MAX;
 	uint32_t shader_id = 0;
 	bool uniform_dirty = false;
 	bool texture_dirty = false;
@@ -174,7 +172,7 @@ struct CanvasShaderData : public ShaderData {
 	virtual void set_code(const String &p_Code);
 	virtual bool is_animated() const;
 	virtual bool casts_shadows() const;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+	virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 
 	CanvasShaderData();
 	virtual ~CanvasShaderData();
@@ -219,7 +217,7 @@ struct SkyShaderData : public ShaderData {
 	virtual void set_code(const String &p_Code);
 	virtual bool is_animated() const;
 	virtual bool casts_shadows() const;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+	virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 	SkyShaderData();
 	virtual ~SkyShaderData();
 };
@@ -303,7 +301,7 @@ struct SceneShaderData : public ShaderData {
 	AlphaAntiAliasing alpha_antialiasing_mode;
 	DepthDraw depth_draw;
 	DepthTest depth_test;
-	RSE::CullMode cull_mode;
+	RS::CullMode cull_mode;
 
 	StencilCompare stencil_compare;
 	uint32_t stencil_flags;
@@ -352,7 +350,7 @@ struct SceneShaderData : public ShaderData {
 	virtual void set_code(const String &p_Code);
 	virtual bool is_animated() const;
 	virtual bool casts_shadows() const;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+	virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 
 	SceneShaderData();
 	virtual ~SceneShaderData();
@@ -404,7 +402,7 @@ struct ParticlesShaderData : public ShaderData {
 	virtual void set_code(const String &p_Code);
 	virtual bool is_animated() const;
 	virtual bool casts_shadows() const;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+	virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 
 	ParticlesShaderData() {}
 	virtual ~ParticlesShaderData();
@@ -425,52 +423,6 @@ struct ParticleProcessMaterialData : public MaterialData {
 
 MaterialData *_create_particles_material_func(ShaderData *p_shader);
 
-/* Texture Blit Shader */
-
-struct TexBlitShaderData : public ShaderData {
-	enum BlendMode { // Used internally.
-		BLEND_MODE_MIX,
-		BLEND_MODE_ADD,
-		BLEND_MODE_SUB,
-		BLEND_MODE_MUL,
-		BLEND_MODE_DISABLED,
-	};
-
-	bool valid;
-	RID version;
-
-	Vector<ShaderCompiler::GeneratedCode::Texture> texture_uniforms;
-
-	Vector<uint32_t> ubo_offsets;
-	uint32_t ubo_size;
-
-	String code;
-
-	BlendMode blend_mode;
-
-	virtual void set_code(const String &p_code);
-	virtual bool is_animated() const;
-	virtual bool casts_shadows() const;
-	virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
-
-	TexBlitShaderData();
-	virtual ~TexBlitShaderData();
-};
-
-ShaderData *_create_tex_blit_shader_func();
-
-struct TexBlitMaterialData : public MaterialData {
-	TexBlitShaderData *shader_data = nullptr;
-
-	virtual void set_render_priority(int p_priority) {}
-	virtual void set_next_pass(RID p_pass) {}
-	virtual void update_parameters(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty);
-	virtual void bind_uniforms();
-	virtual ~TexBlitMaterialData();
-};
-
-MaterialData *_create_tex_blit_material_func(ShaderData *p_shader);
-
 /* Global shader uniform structs */
 struct GlobalShaderUniforms {
 	enum {
@@ -479,7 +431,7 @@ struct GlobalShaderUniforms {
 	struct Variable {
 		HashSet<RID> texture_materials; // materials using this
 
-		RSE::GlobalShaderParameterType type;
+		RS::GlobalShaderParameterType type;
 		Variant value;
 		Variant override;
 		int32_t buffer_index; //for vectors
@@ -540,16 +492,16 @@ private:
 	GlobalShaderUniforms global_shader_uniforms;
 
 	int32_t _global_shader_uniform_allocate(uint32_t p_elements);
-	void _global_shader_uniform_store_in_buffer(int32_t p_index, RSE::GlobalShaderParameterType p_type, const Variant &p_value);
+	void _global_shader_uniform_store_in_buffer(int32_t p_index, RS::GlobalShaderParameterType p_type, const Variant &p_value);
 	void _global_shader_uniform_mark_buffer_dirty(int32_t p_index, int32_t p_elements);
 
 	/* SHADER API */
 
-	ShaderDataRequestFunction shader_data_request_func[RSE::SHADER_MAX];
+	ShaderDataRequestFunction shader_data_request_func[RS::SHADER_MAX];
 	mutable RID_Owner<Shader, true> shader_owner;
 
 	/* MATERIAL API */
-	MaterialDataRequestFunction material_data_request_func[RSE::SHADER_MAX];
+	MaterialDataRequestFunction material_data_request_func[RS::SHADER_MAX];
 	mutable RID_Owner<Material, true> material_owner;
 
 	SelfList<Material>::List material_update_list;
@@ -608,28 +560,26 @@ public:
 		SkyShaderGLES3 sky_shader;
 		SceneShaderGLES3 scene_shader;
 		ParticlesShaderGLES3 particles_process_shader;
-		TexBlitShaderGLES3 tex_blit_shader;
 
 		ShaderCompiler compiler_canvas;
 		ShaderCompiler compiler_scene;
 		ShaderCompiler compiler_particles;
 		ShaderCompiler compiler_sky;
-		ShaderCompiler compiler_tex_blit;
 	} shaders;
 
 	/* GLOBAL SHADER UNIFORM API */
 
 	void _update_global_shader_uniforms();
 
-	virtual void global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) override;
+	virtual void global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) override;
 	virtual void global_shader_parameter_remove(const StringName &p_name) override;
 	virtual Vector<StringName> global_shader_parameter_get_list() const override;
 
 	virtual void global_shader_parameter_set(const StringName &p_name, const Variant &p_value) override;
 	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) override;
 	virtual Variant global_shader_parameter_get(const StringName &p_name) const override;
-	virtual RSE::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
-	RSE::GlobalShaderParameterType global_shader_parameter_get_type_internal(const StringName &p_name) const;
+	virtual RS::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
+	RS::GlobalShaderParameterType global_shader_parameter_get_type_internal(const StringName &p_name) const;
 
 	virtual void global_shader_parameters_load_settings(bool p_load_textures = true) override;
 	virtual void global_shader_parameters_clear() override;
@@ -660,7 +610,7 @@ public:
 	virtual RID shader_get_default_texture_parameter(RID p_shader, const StringName &p_name, int p_index) const override;
 	virtual Variant shader_get_parameter_default(RID p_shader, const StringName &p_name) const override;
 
-	virtual RenderingServerTypes::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override;
+	virtual RS::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override;
 	virtual void shader_embedded_set_lock() override {}
 	virtual const HashSet<RID> &shader_embedded_set_get() const override { return dummy_embedded_set; }
 	virtual void shader_embedded_set_unlock() override {}
@@ -687,7 +637,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) override;
 	virtual bool material_casts_shadows(RID p_material) override;
-	virtual RSE::CullMode material_get_cull_mode(RID p_material) const override;
+	virtual RS::CullMode material_get_cull_mode(RID p_material) const override;
 
 	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override;
 
@@ -698,7 +648,7 @@ public:
 		return material->shader_id;
 	}
 
-	_FORCE_INLINE_ MaterialData *material_get_data(RID p_material, RSE::ShaderMode p_shader_mode) {
+	_FORCE_INLINE_ MaterialData *material_get_data(RID p_material, RS::ShaderMode p_shader_mode) {
 		Material *material = material_owner.get_or_null(p_material);
 		if (!material || material->shader_mode != p_shader_mode) {
 			return nullptr;
diff --git a/engine/drivers/gles3/storage/mesh_storage.cpp b/engine/drivers/gles3/storage/mesh_storage.cpp
index 420702a2..e51bef15 100644
--- a/engine/drivers/gles3/storage/mesh_storage.cpp
+++ b/engine/drivers/gles3/storage/mesh_storage.cpp
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "mesh_storage.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
-#include "servers/rendering/renderer_viewport.h"
-#include "servers/rendering/rendering_server.h"
+#include "mesh_storage.h"
+#include "config.h"
+#include "texture_storage.h"
+#include "utilities.h"
 
 using namespace GLES3;
 
@@ -107,11 +104,11 @@ bool MeshStorage::mesh_needs_instance(RID p_mesh, bool p_has_skeleton) {
 	return mesh->blend_shape_count > 0 || (mesh->has_bone_weights && p_has_skeleton);
 }
 
-void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) {
+void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
 	ERR_FAIL_NULL(mesh);
 
-	ERR_FAIL_COND(mesh->surface_count == RSE::MAX_MESH_SURFACES);
+	ERR_FAIL_COND(mesh->surface_count == RS::MAX_MESH_SURFACES);
 
 #ifdef DEBUG_ENABLED
 	//do a validation, to catch errors first
@@ -120,57 +117,57 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		uint32_t attrib_stride = 0;
 		uint32_t skin_stride = 0;
 
-		for (int i = 0; i < RSE::ARRAY_WEIGHTS; i++) {
+		for (int i = 0; i < RS::ARRAY_WEIGHTS; i++) {
 			if ((p_surface.format & (1ULL << i))) {
 				switch (i) {
-					case RSE::ARRAY_VERTEX: {
-						if ((p_surface.format & RSE::ARRAY_FLAG_USE_2D_VERTICES) || (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					case RS::ARRAY_VERTEX: {
+						if ((p_surface.format & RS::ARRAY_FLAG_USE_2D_VERTICES) || (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 							stride += sizeof(float) * 2;
 						} else {
 							stride += sizeof(float) * 3;
 						}
 					} break;
-					case RSE::ARRAY_NORMAL: {
+					case RS::ARRAY_NORMAL: {
 						stride += sizeof(uint16_t) * 2;
 
 					} break;
-					case RSE::ARRAY_TANGENT: {
-						if (!(p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					case RS::ARRAY_TANGENT: {
+						if (!(p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 							stride += sizeof(uint16_t) * 2;
 						}
 					} break;
-					case RSE::ARRAY_COLOR: {
+					case RS::ARRAY_COLOR: {
 						attrib_stride += sizeof(uint32_t);
 					} break;
-					case RSE::ARRAY_TEX_UV: {
-						if (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					case RS::ARRAY_TEX_UV: {
+						if (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 							attrib_stride += sizeof(uint16_t) * 2;
 						} else {
 							attrib_stride += sizeof(float) * 2;
 						}
 					} break;
-					case RSE::ARRAY_TEX_UV2: {
-						if (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					case RS::ARRAY_TEX_UV2: {
+						if (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 							attrib_stride += sizeof(uint16_t) * 2;
 						} else {
 							attrib_stride += sizeof(float) * 2;
 						}
 					} break;
-					case RSE::ARRAY_CUSTOM0:
-					case RSE::ARRAY_CUSTOM1:
-					case RSE::ARRAY_CUSTOM2:
-					case RSE::ARRAY_CUSTOM3: {
-						int idx = i - RSE::ARRAY_CUSTOM0;
-						uint32_t fmt_shift[RSE::ARRAY_CUSTOM_COUNT] = { RSE::ARRAY_FORMAT_CUSTOM0_SHIFT, RSE::ARRAY_FORMAT_CUSTOM1_SHIFT, RSE::ARRAY_FORMAT_CUSTOM2_SHIFT, RSE::ARRAY_FORMAT_CUSTOM3_SHIFT };
-						uint32_t fmt = (p_surface.format >> fmt_shift[idx]) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
-						uint32_t fmtsize[RSE::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
+					case RS::ARRAY_CUSTOM0:
+					case RS::ARRAY_CUSTOM1:
+					case RS::ARRAY_CUSTOM2:
+					case RS::ARRAY_CUSTOM3: {
+						int idx = i - RS::ARRAY_CUSTOM0;
+						uint32_t fmt_shift[RS::ARRAY_CUSTOM_COUNT] = { RS::ARRAY_FORMAT_CUSTOM0_SHIFT, RS::ARRAY_FORMAT_CUSTOM1_SHIFT, RS::ARRAY_FORMAT_CUSTOM2_SHIFT, RS::ARRAY_FORMAT_CUSTOM3_SHIFT };
+						uint32_t fmt = (p_surface.format >> fmt_shift[idx]) & RS::ARRAY_FORMAT_CUSTOM_MASK;
+						uint32_t fmtsize[RS::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
 						attrib_stride += fmtsize[fmt];
 
 					} break;
-					case RSE::ARRAY_WEIGHTS:
-					case RSE::ARRAY_BONES: {
+					case RS::ARRAY_WEIGHTS:
+					case RS::ARRAY_BONES: {
 						//uses a separate array
-						bool use_8 = p_surface.format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+						bool use_8 = p_surface.format & RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 						skin_stride += sizeof(int16_t) * (use_8 ? 16 : 8);
 					} break;
 				}
@@ -187,7 +184,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		int expected_attrib_size = attrib_stride * p_surface.vertex_count;
 		ERR_FAIL_COND_MSG(expected_attrib_size != p_surface.attribute_data.size(), "Size of attribute data provided (" + itos(p_surface.attribute_data.size()) + ") does not match expected (" + itos(expected_attrib_size) + ")");
 
-		if ((p_surface.format & RSE::ARRAY_FORMAT_WEIGHTS) && (p_surface.format & RSE::ARRAY_FORMAT_BONES)) {
+		if ((p_surface.format & RS::ARRAY_FORMAT_WEIGHTS) && (p_surface.format & RS::ARRAY_FORMAT_BONES)) {
 			expected_size = skin_stride * p_surface.vertex_count;
 			ERR_FAIL_COND_MSG(expected_size != p_surface.skin_data.size(), "Size of skin data provided (" + itos(p_surface.skin_data.size()) + ") does not match expected (" + itos(expected_size) + ")");
 		}
@@ -195,21 +192,21 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 
 #endif
 
-	uint64_t surface_version = p_surface.format & (uint64_t(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK) << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	RenderingServerTypes::SurfaceData new_surface = p_surface;
+	uint64_t surface_version = p_surface.format & (uint64_t(RS::ARRAY_FLAG_FORMAT_VERSION_MASK) << RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	RS::SurfaceData new_surface = p_surface;
 #ifdef DISABLE_DEPRECATED
 
-	ERR_FAIL_COND_MSG(surface_version != RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Surface version provided (" + itos(int(surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT)) + ") does not match current version (" + itos(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) + ")");
+	ERR_FAIL_COND_MSG(surface_version != RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Surface version provided (" + itos(int(surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT)) + ") does not match current version (" + itos(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) + ")");
 
 #else
 
-	if (surface_version != uint64_t(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION)) {
+	if (surface_version != uint64_t(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION)) {
 		RS::get_singleton()->fix_surface_compatibility(new_surface);
-		surface_version = new_surface.format & (uint64_t(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK) << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-		ERR_FAIL_COND_MSG(surface_version != RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
+		surface_version = new_surface.format & (uint64_t(RS::ARRAY_FLAG_FORMAT_VERSION_MASK) << RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+		ERR_FAIL_COND_MSG(surface_version != RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
 				vformat("Surface version provided (%d) does not match current version (%d).",
-						(surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK,
-						(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK));
+						(surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK,
+						(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK));
 	}
 #endif
 
@@ -227,15 +224,15 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		// This allows us to avoid adding a shader permutation, and avoid passing dummy tangents. Since the stride is kept small
 		// this should still be a net win for bandwidth.
 		// If we do this, then the last normal will read past the end of the array. So we need to pad the array with dummy data.
-		if (!(new_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (new_surface.format & RSE::ARRAY_FORMAT_NORMAL) && !(new_surface.format & RSE::ARRAY_FORMAT_TANGENT)) {
+		if (!(new_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (new_surface.format & RS::ARRAY_FORMAT_NORMAL) && !(new_surface.format & RS::ARRAY_FORMAT_TANGENT)) {
 			// Unfortunately, we need to copy the buffer, which is fine as doing a resize triggers a CoW anyway.
 			Vector<uint8_t> new_vertex_data;
 			new_vertex_data.resize_initialized(new_surface.vertex_data.size() + sizeof(uint16_t) * 2);
 			memcpy(new_vertex_data.ptrw(), new_surface.vertex_data.ptr(), new_surface.vertex_data.size());
-			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->vertex_buffer, new_vertex_data.size(), new_vertex_data.ptr(), (s->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh vertex buffer");
+			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->vertex_buffer, new_vertex_data.size(), new_vertex_data.ptr(), (s->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh vertex buffer");
 			s->vertex_buffer_size = new_vertex_data.size();
 		} else {
-			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->vertex_buffer, new_surface.vertex_data.size(), new_surface.vertex_data.ptr(), (s->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh vertex buffer");
+			GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->vertex_buffer, new_surface.vertex_data.size(), new_surface.vertex_data.ptr(), (s->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh vertex buffer");
 			s->vertex_buffer_size = new_surface.vertex_data.size();
 		}
 	}
@@ -243,14 +240,14 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 	if (new_surface.attribute_data.size()) {
 		glGenBuffers(1, &s->attribute_buffer);
 		glBindBuffer(GL_ARRAY_BUFFER, s->attribute_buffer);
-		GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->attribute_buffer, new_surface.attribute_data.size(), new_surface.attribute_data.ptr(), (s->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh attribute buffer");
+		GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->attribute_buffer, new_surface.attribute_data.size(), new_surface.attribute_data.ptr(), (s->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh attribute buffer");
 		s->attribute_buffer_size = new_surface.attribute_data.size();
 	}
 
 	if (new_surface.skin_data.size()) {
 		glGenBuffers(1, &s->skin_buffer);
 		glBindBuffer(GL_ARRAY_BUFFER, s->skin_buffer);
-		GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->skin_buffer, new_surface.skin_data.size(), new_surface.skin_data.ptr(), (s->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh skin buffer");
+		GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->skin_buffer, new_surface.skin_data.size(), new_surface.skin_data.ptr(), (s->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh skin buffer");
 		s->skin_buffer_size = new_surface.skin_data.size();
 	}
 
@@ -258,7 +255,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 
 	s->vertex_count = new_surface.vertex_count;
 
-	if (new_surface.format & RSE::ARRAY_FORMAT_BONES) {
+	if (new_surface.format & RS::ARRAY_FORMAT_BONES) {
 		mesh->has_bone_weights = true;
 	}
 
@@ -289,14 +286,14 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 
 	ERR_FAIL_COND_MSG(!new_surface.index_count && !new_surface.vertex_count, "Meshes must contain a vertex array, an index array, or both");
 
-	if (GLES3::Config::get_singleton()->generate_wireframes && s->primitive == RSE::PRIMITIVE_TRIANGLES) {
+	if (GLES3::Config::get_singleton()->generate_wireframes && s->primitive == RS::PRIMITIVE_TRIANGLES) {
 		// Generate wireframes. This is mostly used by the editor.
 		s->wireframe = memnew(Mesh::Surface::Wireframe);
 		Vector<uint32_t> wf_indices;
 		uint32_t &wf_index_count = s->wireframe->index_count;
 		uint32_t *wr = nullptr;
 
-		if (new_surface.format & RSE::ARRAY_FORMAT_INDEX) {
+		if (new_surface.format & RS::ARRAY_FORMAT_INDEX) {
 			wf_index_count = s->index_count * 2;
 			wf_indices.resize(wf_index_count);
 
@@ -366,12 +363,12 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		int normal_tangent_stride = 0;
 		int normal_offset = 0;
 		int tangent_offset = 0;
-		if ((new_surface.format & (1ULL << RSE::ARRAY_VERTEX))) {
-			if (new_surface.format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+		if ((new_surface.format & (1ULL << RS::ARRAY_VERTEX))) {
+			if (new_surface.format & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 				vertex_size = 2;
 				position_stride = sizeof(float) * vertex_size;
 			} else {
-				if (new_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (new_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					vertex_size = 4;
 					position_stride = sizeof(uint16_t) * vertex_size;
 				} else {
@@ -380,11 +377,11 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 				}
 			}
 		}
-		if ((new_surface.format & (1ULL << RSE::ARRAY_NORMAL))) {
+		if ((new_surface.format & (1ULL << RS::ARRAY_NORMAL))) {
 			normal_offset = position_stride * s->vertex_count;
 			normal_tangent_stride += sizeof(uint16_t) * 2;
 		}
-		if ((new_surface.format & (1ULL << RSE::ARRAY_TANGENT))) {
+		if ((new_surface.format & (1ULL << RS::ARRAY_TANGENT))) {
 			tangent_offset = normal_offset + normal_tangent_stride;
 			normal_tangent_stride += sizeof(uint16_t) * 2;
 		}
@@ -398,20 +395,20 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 				glBindVertexArray(s->blend_shapes[i].vertex_array);
 				glGenBuffers(1, &s->blend_shapes[i].vertex_buffer);
 				glBindBuffer(GL_ARRAY_BUFFER, s->blend_shapes[i].vertex_buffer);
-				GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->blend_shapes[i].vertex_buffer, size, new_surface.blend_shape_data.ptr() + i * size, (s->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh blend shape buffer");
+				GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, s->blend_shapes[i].vertex_buffer, size, new_surface.blend_shape_data.ptr() + i * size, (s->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Mesh blend shape buffer");
 
-				if ((new_surface.format & (1ULL << RSE::ARRAY_VERTEX))) {
-					glEnableVertexAttribArray(RSE::ARRAY_VERTEX + 3);
-					glVertexAttribPointer(RSE::ARRAY_VERTEX + 3, vertex_size, GL_FLOAT, GL_FALSE, position_stride, CAST_INT_TO_UCHAR_PTR(0));
+				if ((new_surface.format & (1ULL << RS::ARRAY_VERTEX))) {
+					glEnableVertexAttribArray(RS::ARRAY_VERTEX + 3);
+					glVertexAttribPointer(RS::ARRAY_VERTEX + 3, vertex_size, GL_FLOAT, GL_FALSE, position_stride, CAST_INT_TO_UCHAR_PTR(0));
 				}
-				if ((new_surface.format & (1ULL << RSE::ARRAY_NORMAL))) {
+				if ((new_surface.format & (1ULL << RS::ARRAY_NORMAL))) {
 					// Normal and tangent are packed into the same attribute.
-					glEnableVertexAttribArray(RSE::ARRAY_NORMAL + 3);
-					glVertexAttribPointer(RSE::ARRAY_NORMAL + 3, 2, GL_UNSIGNED_SHORT, GL_TRUE, normal_tangent_stride, CAST_INT_TO_UCHAR_PTR(normal_offset));
+					glEnableVertexAttribArray(RS::ARRAY_NORMAL + 3);
+					glVertexAttribPointer(RS::ARRAY_NORMAL + 3, 2, GL_UNSIGNED_SHORT, GL_TRUE, normal_tangent_stride, CAST_INT_TO_UCHAR_PTR(normal_offset));
 				}
-				if ((p_surface.format & (1ULL << RSE::ARRAY_TANGENT))) {
-					glEnableVertexAttribArray(RSE::ARRAY_TANGENT + 3);
-					glVertexAttribPointer(RSE::ARRAY_TANGENT + 3, 2, GL_UNSIGNED_SHORT, GL_TRUE, normal_tangent_stride, CAST_INT_TO_UCHAR_PTR(tangent_offset));
+				if ((p_surface.format & (1ULL << RS::ARRAY_TANGENT))) {
+					glEnableVertexAttribArray(RS::ARRAY_TANGENT + 3);
+					glVertexAttribPointer(RS::ARRAY_TANGENT + 3, 2, GL_UNSIGNED_SHORT, GL_TRUE, normal_tangent_stride, CAST_INT_TO_UCHAR_PTR(tangent_offset));
 				}
 			}
 			glBindVertexArray(0);
@@ -522,7 +519,7 @@ int MeshStorage::mesh_get_blend_shape_count(RID p_mesh) const {
 	return mesh->blend_shape_count;
 }
 
-void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) {
+void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
 	ERR_FAIL_NULL(mesh);
 	ERR_FAIL_INDEX((int)p_mode, 2);
@@ -530,9 +527,9 @@ void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mo
 	mesh->blend_shape_mode = p_mode;
 }
 
-RSE::BlendShapeMode MeshStorage::mesh_get_blend_shape_mode(RID p_mesh) const {
+RS::BlendShapeMode MeshStorage::mesh_get_blend_shape_mode(RID p_mesh) const {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
-	ERR_FAIL_NULL_V(mesh, RSE::BLEND_SHAPE_MODE_NORMALIZED);
+	ERR_FAIL_NULL_V(mesh, RS::BLEND_SHAPE_MODE_NORMALIZED);
 	return mesh->blend_shape_mode;
 }
 
@@ -614,20 +611,20 @@ RID MeshStorage::mesh_surface_get_material(RID p_mesh, int p_surface) const {
 	return mesh->surfaces[p_surface]->material;
 }
 
-RenderingServerTypes::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int p_surface) const {
+RS::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int p_surface) const {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
-	ERR_FAIL_NULL_V(mesh, RenderingServerTypes::SurfaceData());
-	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_surface, mesh->surface_count, RenderingServerTypes::SurfaceData());
+	ERR_FAIL_NULL_V(mesh, RS::SurfaceData());
+	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_surface, mesh->surface_count, RS::SurfaceData());
 
 	Mesh::Surface &s = *mesh->surfaces[p_surface];
 
-	RenderingServerTypes::SurfaceData sd;
+	RS::SurfaceData sd;
 	sd.format = s.format;
 	if (s.vertex_buffer != 0) {
 		sd.vertex_data = Utilities::buffer_get_data(GL_ARRAY_BUFFER, s.vertex_buffer, s.vertex_buffer_size);
 
 		// When using an uncompressed buffer with normals, but without tangents, we have to trim the padding.
-		if (!(s.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (s.format & RSE::ARRAY_FORMAT_NORMAL) && !(s.format & RSE::ARRAY_FORMAT_TANGENT)) {
+		if (!(s.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (s.format & RS::ARRAY_FORMAT_NORMAL) && !(s.format & RS::ARRAY_FORMAT_TANGENT)) {
 			sd.vertex_data.resize(sd.vertex_data.size() - sizeof(uint16_t) * 2);
 		}
 	}
@@ -650,7 +647,7 @@ RenderingServerTypes::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int
 
 	sd.aabb = s.aabb;
 	for (uint32_t i = 0; i < s.lod_count; i++) {
-		RenderingServerTypes::SurfaceData::LOD lod;
+		RS::SurfaceData::LOD lod;
 		lod.edge_length = s.lods[i].edge_length;
 		lod.index_data = Utilities::buffer_get_data(GL_ELEMENT_ARRAY_BUFFER, s.lods[i].index_buffer, s.lods[i].index_buffer_size);
 		sd.lods.push_back(lod);
@@ -712,7 +709,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 	for (uint32_t i = 0; i < mesh->surface_count; i++) {
 		AABB laabb;
 		const Mesh::Surface &surface = *mesh->surfaces[i];
-		if ((surface.format & RSE::ARRAY_FORMAT_BONES) && surface.bone_aabbs.size()) {
+		if ((surface.format & RS::ARRAY_FORMAT_BONES) && surface.bone_aabbs.size()) {
 			int bs = surface.bone_aabbs.size();
 			const AABB *skbones = surface.bone_aabbs.ptr();
 
@@ -876,14 +873,14 @@ void MeshStorage::mesh_clear(RID p_mesh) {
 }
 
 void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::Version &v, Mesh::Surface *s, uint64_t p_input_mask, bool p_uses_motion_vectors, MeshInstance::Surface *mis, int p_current_vertex_buffer, int p_prev_vertex_buffer) {
-	Mesh::Surface::Attrib attribs[RSE::ARRAY_MAX];
+	Mesh::Surface::Attrib attribs[RS::ARRAY_MAX];
 
 	int position_stride = 0; // Vertex position only.
 	int normal_tangent_stride = 0;
 	int attributes_stride = 0;
 	int skin_stride = 0;
 
-	for (int i = 0; i < RSE::ARRAY_INDEX; i++) {
+	for (int i = 0; i < RS::ARRAY_INDEX; i++) {
 		attribs[i].enabled = false;
 		attribs[i].integer = false;
 		if (!(s->format & (1ULL << i))) {
@@ -897,15 +894,15 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 		}
 
 		switch (i) {
-			case RSE::ARRAY_VERTEX: {
+			case RS::ARRAY_VERTEX: {
 				attribs[i].offset = 0;
 				attribs[i].type = GL_FLOAT;
 				attribs[i].normalized = GL_FALSE;
-				if (s->format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+				if (s->format & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 					attribs[i].size = 2;
 					position_stride = attribs[i].size * sizeof(float);
 				} else {
-					if (!mis && (s->format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					if (!mis && (s->format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 						attribs[i].size = 4;
 						position_stride = attribs[i].size * sizeof(uint16_t);
 						attribs[i].type = GL_UNSIGNED_SHORT;
@@ -916,8 +913,8 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 					}
 				}
 			} break;
-			case RSE::ARRAY_NORMAL: {
-				if (!mis && (s->format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+			case RS::ARRAY_NORMAL: {
+				if (!mis && (s->format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 					attribs[i].size = 2;
 					normal_tangent_stride += 2 * attribs[i].size;
 				} else {
@@ -925,7 +922,7 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 					// A small trick here: if we are uncompressed and we have normals, but no tangents. We need
 					// the shader to think there are 4 components to "axis_tangent_attrib". So we give a size of 4,
 					// but a stride based on only having 2 elements.
-					if (!(s->format & RSE::ARRAY_FORMAT_TANGENT)) {
+					if (!(s->format & RS::ARRAY_FORMAT_TANGENT)) {
 						normal_tangent_stride += (mis ? sizeof(float) : sizeof(uint16_t)) * 2;
 					} else {
 						normal_tangent_stride += (mis ? sizeof(float) : sizeof(uint16_t)) * 4;
@@ -943,22 +940,22 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 				attribs[i].type = (mis ? GL_FLOAT : GL_UNSIGNED_SHORT);
 				attribs[i].normalized = GL_TRUE;
 			} break;
-			case RSE::ARRAY_TANGENT: {
+			case RS::ARRAY_TANGENT: {
 				// We never use the tangent attribute. It is always packed in ARRAY_NORMAL, or ARRAY_VERTEX.
 				attribs[i].enabled = false;
 				attribs[i].integer = false;
 			} break;
-			case RSE::ARRAY_COLOR: {
+			case RS::ARRAY_COLOR: {
 				attribs[i].offset = attributes_stride;
 				attribs[i].size = 4;
 				attribs[i].type = GL_UNSIGNED_BYTE;
 				attributes_stride += 4;
 				attribs[i].normalized = GL_TRUE;
 			} break;
-			case RSE::ARRAY_TEX_UV: {
+			case RS::ARRAY_TEX_UV: {
 				attribs[i].offset = attributes_stride;
 				attribs[i].size = 2;
-				if (s->format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (s->format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					attribs[i].type = GL_UNSIGNED_SHORT;
 					attributes_stride += 2 * sizeof(uint16_t);
 					attribs[i].normalized = GL_TRUE;
@@ -968,10 +965,10 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 					attribs[i].normalized = GL_FALSE;
 				}
 			} break;
-			case RSE::ARRAY_TEX_UV2: {
+			case RS::ARRAY_TEX_UV2: {
 				attribs[i].offset = attributes_stride;
 				attribs[i].size = 2;
-				if (s->format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (s->format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					attribs[i].type = GL_UNSIGNED_SHORT;
 					attributes_stride += 2 * sizeof(uint16_t);
 					attribs[i].normalized = GL_TRUE;
@@ -981,24 +978,24 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 					attribs[i].normalized = GL_FALSE;
 				}
 			} break;
-			case RSE::ARRAY_CUSTOM0:
-			case RSE::ARRAY_CUSTOM1:
-			case RSE::ARRAY_CUSTOM2:
-			case RSE::ARRAY_CUSTOM3: {
+			case RS::ARRAY_CUSTOM0:
+			case RS::ARRAY_CUSTOM1:
+			case RS::ARRAY_CUSTOM2:
+			case RS::ARRAY_CUSTOM3: {
 				attribs[i].offset = attributes_stride;
 
-				int idx = i - RSE::ARRAY_CUSTOM0;
-				uint32_t fmt_shift[RSE::ARRAY_CUSTOM_COUNT] = { RSE::ARRAY_FORMAT_CUSTOM0_SHIFT, RSE::ARRAY_FORMAT_CUSTOM1_SHIFT, RSE::ARRAY_FORMAT_CUSTOM2_SHIFT, RSE::ARRAY_FORMAT_CUSTOM3_SHIFT };
-				uint32_t fmt = (s->format >> fmt_shift[idx]) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
-				uint32_t fmtsize[RSE::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
-				GLenum gl_type[RSE::ARRAY_CUSTOM_MAX] = { GL_UNSIGNED_BYTE, GL_BYTE, GL_HALF_FLOAT, GL_HALF_FLOAT, GL_FLOAT, GL_FLOAT, GL_FLOAT, GL_FLOAT };
-				GLboolean norm[RSE::ARRAY_CUSTOM_MAX] = { GL_TRUE, GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE };
+				int idx = i - RS::ARRAY_CUSTOM0;
+				uint32_t fmt_shift[RS::ARRAY_CUSTOM_COUNT] = { RS::ARRAY_FORMAT_CUSTOM0_SHIFT, RS::ARRAY_FORMAT_CUSTOM1_SHIFT, RS::ARRAY_FORMAT_CUSTOM2_SHIFT, RS::ARRAY_FORMAT_CUSTOM3_SHIFT };
+				uint32_t fmt = (s->format >> fmt_shift[idx]) & RS::ARRAY_FORMAT_CUSTOM_MASK;
+				uint32_t fmtsize[RS::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
+				GLenum gl_type[RS::ARRAY_CUSTOM_MAX] = { GL_UNSIGNED_BYTE, GL_BYTE, GL_HALF_FLOAT, GL_HALF_FLOAT, GL_FLOAT, GL_FLOAT, GL_FLOAT, GL_FLOAT };
+				GLboolean norm[RS::ARRAY_CUSTOM_MAX] = { GL_TRUE, GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE };
 				attribs[i].type = gl_type[fmt];
 				attributes_stride += fmtsize[fmt];
 				attribs[i].size = fmtsize[fmt] / sizeof(float);
 				attribs[i].normalized = norm[fmt];
 			} break;
-			case RSE::ARRAY_BONES: {
+			case RS::ARRAY_BONES: {
 				attribs[i].offset = skin_stride;
 				attribs[i].size = 4;
 				attribs[i].type = GL_UNSIGNED_SHORT;
@@ -1006,7 +1003,7 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 				attribs[i].normalized = GL_FALSE;
 				attribs[i].integer = true;
 			} break;
-			case RSE::ARRAY_WEIGHTS: {
+			case RS::ARRAY_WEIGHTS: {
 				attribs[i].offset = skin_stride;
 				attribs[i].size = 4;
 				attribs[i].type = GL_UNSIGNED_SHORT;
@@ -1019,19 +1016,19 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 	glGenVertexArrays(1, &v.vertex_array);
 	glBindVertexArray(v.vertex_array);
 
-	for (int i = 0; i < RSE::ARRAY_INDEX; i++) {
+	for (int i = 0; i < RS::ARRAY_INDEX; i++) {
 		if (!attribs[i].enabled) {
 			glDisableVertexAttribArray(i);
 			continue;
 		}
-		if (i <= RSE::ARRAY_TANGENT) {
-			attribs[i].stride = (i == RSE::ARRAY_VERTEX) ? position_stride : normal_tangent_stride;
+		if (i <= RS::ARRAY_TANGENT) {
+			attribs[i].stride = (i == RS::ARRAY_VERTEX) ? position_stride : normal_tangent_stride;
 			if (mis) {
 				glBindBuffer(GL_ARRAY_BUFFER, mis->vertex_buffers[p_current_vertex_buffer]);
 			} else {
 				glBindBuffer(GL_ARRAY_BUFFER, s->vertex_buffer);
 			}
-		} else if (i <= RSE::ARRAY_CUSTOM3) {
+		} else if (i <= RS::ARRAY_CUSTOM3) {
 			attribs[i].stride = attributes_stride;
 			glBindBuffer(GL_ARRAY_BUFFER, s->attribute_buffer);
 		} else {
@@ -1048,7 +1045,7 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 	}
 
 	if (p_uses_motion_vectors) {
-		for (int i = 0; i < RSE::ARRAY_TANGENT; i++) {
+		for (int i = 0; i < RS::ARRAY_TANGENT; i++) {
 			if (mis) {
 				glBindBuffer(GL_ARRAY_BUFFER, mis->vertex_buffers[mis->prev_vertex_buffer]);
 			} else {
@@ -1096,7 +1093,7 @@ void MeshStorage::mesh_surface_remove(RID p_mesh, int p_surface) {
 	if (mesh->has_bone_weights) {
 		mesh->has_bone_weights = false;
 		for (uint32_t i = 0; i < mesh->surface_count; i++) {
-			if (mesh->surfaces[i]->format & RSE::ARRAY_FORMAT_BONES) {
+			if (mesh->surfaces[i]->format & RS::ARRAY_FORMAT_BONES) {
 				mesh->has_bone_weights = true;
 				break;
 			}
@@ -1186,22 +1183,22 @@ void MeshStorage::_mesh_instance_add_surface(MeshInstance *mi, Mesh *mesh, uint3
 	}
 
 	MeshInstance::Surface s;
-	if ((mesh->blend_shape_count > 0 || (mesh->surfaces[p_surface]->format & RSE::ARRAY_FORMAT_BONES)) && mesh->surfaces[p_surface]->vertex_buffer_size > 0) {
+	if ((mesh->blend_shape_count > 0 || (mesh->surfaces[p_surface]->format & RS::ARRAY_FORMAT_BONES)) && mesh->surfaces[p_surface]->vertex_buffer_size > 0) {
 		// Cache surface properties
 		s.format_cache = mesh->surfaces[p_surface]->format;
-		if ((s.format_cache & (1ULL << RSE::ARRAY_VERTEX))) {
-			if (s.format_cache & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+		if ((s.format_cache & (1ULL << RS::ARRAY_VERTEX))) {
+			if (s.format_cache & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 				s.vertex_size_cache = 2;
 			} else {
 				s.vertex_size_cache = 3;
 			}
 			s.vertex_stride_cache = sizeof(float) * s.vertex_size_cache;
 		}
-		if ((s.format_cache & (1ULL << RSE::ARRAY_NORMAL))) {
+		if ((s.format_cache & (1ULL << RS::ARRAY_NORMAL))) {
 			s.vertex_normal_offset_cache = s.vertex_stride_cache;
 			s.vertex_stride_cache += sizeof(uint32_t) * 2;
 		}
-		if ((s.format_cache & (1ULL << RSE::ARRAY_TANGENT))) {
+		if ((s.format_cache & (1ULL << RS::ARRAY_TANGENT))) {
 			s.vertex_tangent_offset_cache = s.vertex_stride_cache;
 			s.vertex_stride_cache += sizeof(uint32_t) * 2;
 		}
@@ -1292,23 +1289,23 @@ void MeshStorage::mesh_instance_set_canvas_item_transform(RID p_mesh_instance, c
 void MeshStorage::_blend_shape_bind_mesh_instance_buffer(MeshInstance *p_mi, uint32_t p_surface) {
 	glBindBuffer(GL_ARRAY_BUFFER, p_mi->surfaces[p_surface].blend_shape_vertex_buffers[0]);
 
-	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RSE::ARRAY_VERTEX))) {
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, p_mi->surfaces[p_surface].vertex_size_cache, GL_FLOAT, GL_FALSE, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(0));
+	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RS::ARRAY_VERTEX))) {
+		glEnableVertexAttribArray(RS::ARRAY_VERTEX);
+		glVertexAttribPointer(RS::ARRAY_VERTEX, p_mi->surfaces[p_surface].vertex_size_cache, GL_FLOAT, GL_FALSE, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(0));
 	} else {
-		glDisableVertexAttribArray(RSE::ARRAY_VERTEX);
+		glDisableVertexAttribArray(RS::ARRAY_VERTEX);
 	}
-	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RSE::ARRAY_NORMAL))) {
-		glEnableVertexAttribArray(RSE::ARRAY_NORMAL);
-		glVertexAttribIPointer(RSE::ARRAY_NORMAL, 2, GL_UNSIGNED_INT, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(p_mi->surfaces[p_surface].vertex_normal_offset_cache));
+	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RS::ARRAY_NORMAL))) {
+		glEnableVertexAttribArray(RS::ARRAY_NORMAL);
+		glVertexAttribIPointer(RS::ARRAY_NORMAL, 2, GL_UNSIGNED_INT, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(p_mi->surfaces[p_surface].vertex_normal_offset_cache));
 	} else {
-		glDisableVertexAttribArray(RSE::ARRAY_NORMAL);
+		glDisableVertexAttribArray(RS::ARRAY_NORMAL);
 	}
-	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RSE::ARRAY_TANGENT))) {
-		glEnableVertexAttribArray(RSE::ARRAY_TANGENT);
-		glVertexAttribIPointer(RSE::ARRAY_TANGENT, 2, GL_UNSIGNED_INT, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(p_mi->surfaces[p_surface].vertex_tangent_offset_cache));
+	if ((p_mi->surfaces[p_surface].format_cache & (1ULL << RS::ARRAY_TANGENT))) {
+		glEnableVertexAttribArray(RS::ARRAY_TANGENT);
+		glVertexAttribIPointer(RS::ARRAY_TANGENT, 2, GL_UNSIGNED_INT, p_mi->surfaces[p_surface].vertex_stride_cache, CAST_INT_TO_UCHAR_PTR(p_mi->surfaces[p_surface].vertex_tangent_offset_cache));
 	} else {
-		glDisableVertexAttribArray(RSE::ARRAY_TANGENT);
+		glDisableVertexAttribArray(RS::ARRAY_TANGENT);
 	}
 }
 
@@ -1316,10 +1313,10 @@ void MeshStorage::_compute_skeleton(MeshInstance *p_mi, Skeleton *p_sk, uint32_t
 	// Add in the bones and weights.
 	glBindBuffer(GL_ARRAY_BUFFER, p_mi->mesh->surfaces[p_surface]->skin_buffer);
 
-	bool use_8_weights = p_mi->surfaces[p_surface].format_cache & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+	bool use_8_weights = p_mi->surfaces[p_surface].format_cache & RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 	int skin_stride = sizeof(int16_t) * (use_8_weights ? 16 : 8);
-	glEnableVertexAttribArray(RSE::ARRAY_BONES);
-	glVertexAttribIPointer(RSE::ARRAY_BONES, 4, GL_UNSIGNED_SHORT, skin_stride, CAST_INT_TO_UCHAR_PTR(0));
+	glEnableVertexAttribArray(RS::ARRAY_BONES);
+	glVertexAttribIPointer(RS::ARRAY_BONES, 4, GL_UNSIGNED_SHORT, skin_stride, CAST_INT_TO_UCHAR_PTR(0));
 	if (use_8_weights) {
 		glEnableVertexAttribArray(11);
 		glVertexAttribIPointer(11, 4, GL_UNSIGNED_SHORT, skin_stride, CAST_INT_TO_UCHAR_PTR(4 * sizeof(uint16_t)));
@@ -1328,8 +1325,8 @@ void MeshStorage::_compute_skeleton(MeshInstance *p_mi, Skeleton *p_sk, uint32_t
 		glEnableVertexAttribArray(13);
 		glVertexAttribPointer(13, 4, GL_UNSIGNED_SHORT, GL_TRUE, skin_stride, CAST_INT_TO_UCHAR_PTR(12 * sizeof(uint16_t)));
 	} else {
-		glEnableVertexAttribArray(RSE::ARRAY_WEIGHTS);
-		glVertexAttribPointer(RSE::ARRAY_WEIGHTS, 4, GL_UNSIGNED_SHORT, GL_TRUE, skin_stride, CAST_INT_TO_UCHAR_PTR(4 * sizeof(uint16_t)));
+		glEnableVertexAttribArray(RS::ARRAY_WEIGHTS);
+		glVertexAttribPointer(RS::ARRAY_WEIGHTS, 4, GL_UNSIGNED_SHORT, GL_TRUE, skin_stride, CAST_INT_TO_UCHAR_PTR(4 * sizeof(uint16_t)));
 	}
 
 	glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, p_mi->surfaces[p_surface].vertex_buffers[p_mi->surfaces[p_surface].current_vertex_buffer]);
@@ -1340,10 +1337,10 @@ void MeshStorage::_compute_skeleton(MeshInstance *p_mi, Skeleton *p_sk, uint32_t
 	glDrawArrays(GL_POINTS, 0, p_mi->mesh->surfaces[p_surface]->vertex_count);
 	glEndTransformFeedback();
 
-	glDisableVertexAttribArray(RSE::ARRAY_BONES);
-	glDisableVertexAttribArray(RSE::ARRAY_WEIGHTS);
-	glDisableVertexAttribArray(RSE::ARRAY_BONES + 2);
-	glDisableVertexAttribArray(RSE::ARRAY_WEIGHTS + 2);
+	glDisableVertexAttribArray(RS::ARRAY_BONES);
+	glDisableVertexAttribArray(RS::ARRAY_WEIGHTS);
+	glDisableVertexAttribArray(RS::ARRAY_BONES + 2);
+	glDisableVertexAttribArray(RS::ARRAY_WEIGHTS + 2);
 	glBindVertexArray(0);
 	glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
 }
@@ -1376,7 +1373,7 @@ void MeshStorage::update_mesh_instances() {
 						int buffer_size = mi->surfaces[i].vertex_stride_cache * surface->vertex_count;
 						glGenBuffers(1, &new_vertex_buffer);
 						glBindBuffer(GL_ARRAY_BUFFER, new_vertex_buffer);
-						GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, new_vertex_buffer, buffer_size, nullptr, (surface->format & RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Secondary mesh vertex buffer");
+						GLES3::Utilities::get_singleton()->buffer_allocate_data(GL_ARRAY_BUFFER, new_vertex_buffer, buffer_size, nullptr, (surface->format & RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW, "Secondary mesh vertex buffer");
 						glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 						mi->surfaces[i].vertex_buffers[new_buffer_index] = new_vertex_buffer;
@@ -1393,7 +1390,7 @@ void MeshStorage::update_mesh_instances() {
 
 		// Precompute base weight if using blend shapes.
 		float base_weight = 1.0;
-		if (mi->surfaces.size() && mi->mesh->blend_shape_count && mi->mesh->blend_shape_mode == RSE::BLEND_SHAPE_MODE_NORMALIZED) {
+		if (mi->surfaces.size() && mi->mesh->blend_shape_count && mi->mesh->blend_shape_mode == RS::BLEND_SHAPE_MODE_NORMALIZED) {
 			for (uint32_t i = 0; i < mi->mesh->blend_shape_count; i++) {
 				base_weight -= mi->blend_weights[i];
 			}
@@ -1404,9 +1401,9 @@ void MeshStorage::update_mesh_instances() {
 				continue;
 			}
 
-			bool array_is_2d = mi->surfaces[i].format_cache & RSE::ARRAY_FLAG_USE_2D_VERTICES;
-			bool can_use_skeleton = sk != nullptr && sk->use_2d == array_is_2d && (mi->surfaces[i].format_cache & RSE::ARRAY_FORMAT_BONES);
-			bool use_8_weights = mi->surfaces[i].format_cache & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+			bool array_is_2d = mi->surfaces[i].format_cache & RS::ARRAY_FLAG_USE_2D_VERTICES;
+			bool can_use_skeleton = sk != nullptr && sk->use_2d == array_is_2d && (mi->surfaces[i].format_cache & RS::ARRAY_FORMAT_BONES);
+			bool use_8_weights = mi->surfaces[i].format_cache & RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 
 			// Always process blend shapes first.
 			if (mi->mesh->blend_shape_count) {
@@ -1415,10 +1412,10 @@ void MeshStorage::update_mesh_instances() {
 				specialization |= array_is_2d ? SkeletonShaderGLES3::MODE_2D : 0;
 				specialization |= SkeletonShaderGLES3::USE_BLEND_SHAPES;
 				if (!array_is_2d) {
-					if ((mi->surfaces[i].format_cache & (1ULL << RSE::ARRAY_NORMAL))) {
+					if ((mi->surfaces[i].format_cache & (1ULL << RS::ARRAY_NORMAL))) {
 						specialization |= SkeletonShaderGLES3::USE_NORMAL;
 					}
-					if ((mi->surfaces[i].format_cache & (1ULL << RSE::ARRAY_TANGENT))) {
+					if ((mi->surfaces[i].format_cache & (1ULL << RS::ARRAY_TANGENT))) {
 						specialization |= SkeletonShaderGLES3::USE_TANGENT;
 					}
 				}
@@ -1433,7 +1430,7 @@ void MeshStorage::update_mesh_instances() {
 
 				glBindBuffer(GL_ARRAY_BUFFER, 0);
 				GLuint vertex_array_gl = 0;
-				uint64_t mask = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_NORMAL | RSE::ARRAY_FORMAT_VERTEX;
+				uint64_t mask = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_NORMAL | RS::ARRAY_FORMAT_VERTEX;
 				uint64_t format = mi->mesh->surfaces[i]->format & mask; // Format should only have vertex, normal, tangent (as necessary).
 				mesh_surface_get_vertex_arrays_and_format(mi->mesh->surfaces[i], format, false, vertex_array_gl);
 				glBindVertexArray(vertex_array_gl);
@@ -1525,10 +1522,10 @@ void MeshStorage::update_mesh_instances() {
 				specialization |= SkeletonShaderGLES3::FINAL_PASS;
 				specialization |= use_8_weights ? SkeletonShaderGLES3::USE_EIGHT_WEIGHTS : 0;
 				if (!array_is_2d) {
-					if ((mi->surfaces[i].format_cache & (1ULL << RSE::ARRAY_NORMAL))) {
+					if ((mi->surfaces[i].format_cache & (1ULL << RS::ARRAY_NORMAL))) {
 						specialization |= SkeletonShaderGLES3::USE_NORMAL;
 					}
-					if ((mi->surfaces[i].format_cache & (1ULL << RSE::ARRAY_TANGENT))) {
+					if ((mi->surfaces[i].format_cache & (1ULL << RS::ARRAY_TANGENT))) {
 						specialization |= SkeletonShaderGLES3::USE_TANGENT;
 					}
 				}
@@ -1549,7 +1546,7 @@ void MeshStorage::update_mesh_instances() {
 				skeleton_shader.shader.version_set_uniform(SkeletonShaderGLES3::INVERSE_TRANSFORM_OFFSET, inverse_transform[2], skeleton_shader.shader_version, variant, specialization);
 
 				GLuint vertex_array_gl = 0;
-				uint64_t mask = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_NORMAL | RSE::ARRAY_FORMAT_VERTEX;
+				uint64_t mask = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_NORMAL | RS::ARRAY_FORMAT_VERTEX;
 				uint64_t format = mi->mesh->surfaces[i]->format & mask; // Format should only have vertex, normal, tangent (as necessary).
 				mesh_surface_get_vertex_arrays_and_format(mi->mesh->surfaces[i], format, false, vertex_array_gl);
 				glBindVertexArray(vertex_array_gl);
@@ -1581,13 +1578,13 @@ void MeshStorage::_multimesh_free(RID p_rid) {
 	// Remove from interpolator.
 	_interpolation_data.notify_free_multimesh(p_rid);
 	_update_dirty_multimeshes();
-	multimesh_allocate_data(p_rid, 0, RSE::MULTIMESH_TRANSFORM_2D);
+	multimesh_allocate_data(p_rid, 0, RS::MULTIMESH_TRANSFORM_2D);
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_rid);
 	multimesh->dependency.deleted_notify(p_rid);
 	multimesh_owner.free(p_rid);
 }
 
-void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
+void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 
@@ -1615,7 +1612,7 @@ void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RSE
 	multimesh->instances = p_instances;
 	multimesh->xform_format = p_transform_format;
 	multimesh->uses_colors = p_use_colors;
-	multimesh->color_offset_cache = p_transform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12;
+	multimesh->color_offset_cache = p_transform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
 	multimesh->uses_custom_data = p_use_custom_data;
 	multimesh->custom_data_offset_cache = multimesh->color_offset_cache + color_and_custom_strides;
 	multimesh->stride_cache = multimesh->custom_data_offset_cache + color_and_custom_strides;
@@ -1758,7 +1755,7 @@ void MeshStorage::_multimesh_re_create_aabb(MultiMesh *multimesh, const float *p
 		const float *data = p_data + multimesh->stride_cache * i;
 		Transform3D t;
 
-		if (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_3D) {
+		if (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_3D) {
 			t.basis.rows[0][0] = data[0];
 			t.basis.rows[0][1] = data[1];
 			t.basis.rows[0][2] = data[2];
@@ -1796,7 +1793,7 @@ void MeshStorage::_multimesh_instance_set_transform(RID p_multimesh, int p_index
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 	ERR_FAIL_INDEX(p_index, multimesh->instances);
-	ERR_FAIL_COND(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_3D);
+	ERR_FAIL_COND(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_3D);
 
 	_multimesh_make_local(multimesh);
 
@@ -1826,7 +1823,7 @@ void MeshStorage::_multimesh_instance_set_transform_2d(RID p_multimesh, int p_in
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 	ERR_FAIL_INDEX(p_index, multimesh->instances);
-	ERR_FAIL_COND(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_2D);
+	ERR_FAIL_COND(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_2D);
 
 	_multimesh_make_local(multimesh);
 
@@ -1923,7 +1920,7 @@ Transform3D MeshStorage::_multimesh_instance_get_transform(RID p_multimesh, int
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, Transform3D());
 	ERR_FAIL_INDEX_V(p_index, multimesh->instances, Transform3D());
-	ERR_FAIL_COND_V(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_3D, Transform3D());
+	ERR_FAIL_COND_V(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_3D, Transform3D());
 
 	_multimesh_make_local(multimesh);
 
@@ -1954,7 +1951,7 @@ Transform2D MeshStorage::_multimesh_instance_get_transform_2d(RID p_multimesh, i
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, Transform2D());
 	ERR_FAIL_INDEX_V(p_index, multimesh->instances, Transform2D());
-	ERR_FAIL_COND_V(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_2D, Transform2D());
+	ERR_FAIL_COND_V(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_2D, Transform2D());
 
 	_multimesh_make_local(multimesh);
 
@@ -2036,7 +2033,7 @@ void MeshStorage::_multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_
 
 		_multimesh_make_local(multimesh);
 
-		uint32_t old_stride = multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12;
+		uint32_t old_stride = multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
 		old_stride += multimesh->uses_colors ? 4 : 0;
 		old_stride += multimesh->uses_custom_data ? 4 : 0;
 		ERR_FAIL_COND(p_buffer.size() != (multimesh->instances * (int)old_stride));
@@ -2053,7 +2050,7 @@ void MeshStorage::_multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_
 				memcpy(newptr, vals, 8 * 4);
 			}
 
-			if (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_3D) {
+			if (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_3D) {
 				float *dataptr = w + i * old_stride + 8;
 				float *newptr = w + i * multimesh->stride_cache + 8;
 				float vals[8] = { dataptr[0], dataptr[1], dataptr[2], dataptr[3] };
@@ -2061,13 +2058,13 @@ void MeshStorage::_multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_
 			}
 
 			if (multimesh->uses_colors) {
-				float *dataptr = w + i * old_stride + (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12);
+				float *dataptr = w + i * old_stride + (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12);
 				float *newptr = w + i * multimesh->stride_cache + multimesh->color_offset_cache;
 				uint16_t val[4] = { Math::make_half_float(dataptr[0]), Math::make_half_float(dataptr[1]), Math::make_half_float(dataptr[2]), Math::make_half_float(dataptr[3]) };
 				memcpy(newptr, val, 2 * 4);
 			}
 			if (multimesh->uses_custom_data) {
-				float *dataptr = w + i * old_stride + (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12) + (multimesh->uses_colors ? 4 : 0);
+				float *dataptr = w + i * old_stride + (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12) + (multimesh->uses_colors ? 4 : 0);
 				float *newptr = w + i * multimesh->stride_cache + multimesh->custom_data_offset_cache;
 				uint16_t val[4] = { Math::make_half_float(dataptr[0]), Math::make_half_float(dataptr[1]), Math::make_half_float(dataptr[2]), Math::make_half_float(dataptr[3]) };
 				memcpy(newptr, val, 2 * 4);
@@ -2145,7 +2142,7 @@ Vector<float> MeshStorage::_multimesh_get_buffer(RID p_multimesh) const {
 	}
 	if (multimesh->uses_colors || multimesh->uses_custom_data) {
 		// Need to decompress buffer.
-		uint32_t new_stride = multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12;
+		uint32_t new_stride = multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
 		new_stride += multimesh->uses_colors ? 4 : 0;
 		new_stride += multimesh->uses_custom_data ? 4 : 0;
 
@@ -2162,7 +2159,7 @@ Vector<float> MeshStorage::_multimesh_get_buffer(RID p_multimesh) const {
 				memcpy(newptr, vals, 8 * 4);
 			}
 
-			if (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_3D) {
+			if (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_3D) {
 				float *newptr = w + i * new_stride + 8;
 				const float *oldptr = r + i * multimesh->stride_cache + 8;
 				float vals[8] = { oldptr[0], oldptr[1], oldptr[2], oldptr[3] };
@@ -2170,7 +2167,7 @@ Vector<float> MeshStorage::_multimesh_get_buffer(RID p_multimesh) const {
 			}
 
 			if (multimesh->uses_colors) {
-				float *newptr = w + i * new_stride + (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12);
+				float *newptr = w + i * new_stride + (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12);
 				const float *oldptr = r + i * multimesh->stride_cache + multimesh->color_offset_cache;
 				uint16_t raw_data[4];
 				memcpy(raw_data, oldptr, 2 * 4);
@@ -2180,7 +2177,7 @@ Vector<float> MeshStorage::_multimesh_get_buffer(RID p_multimesh) const {
 				newptr[3] = Math::half_to_float(raw_data[3]);
 			}
 			if (multimesh->uses_custom_data) {
-				float *newptr = w + i * new_stride + (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12) + (multimesh->uses_colors ? 4 : 0);
+				float *newptr = w + i * new_stride + (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12) + (multimesh->uses_colors ? 4 : 0);
 				const float *oldptr = r + i * multimesh->stride_cache + multimesh->custom_data_offset_cache;
 				uint16_t raw_data[4];
 				memcpy(raw_data, oldptr, 2 * 4);
diff --git a/engine/drivers/gles3/storage/mesh_storage.h b/engine/drivers/gles3/storage/mesh_storage.h
index d9ab1b77..52074c94 100644
--- a/engine/drivers/gles3/storage/mesh_storage.h
+++ b/engine/drivers/gles3/storage/mesh_storage.h
@@ -36,13 +36,11 @@
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
 #include "drivers/gles3/shaders/skeleton.glsl.gen.h"
-#include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/rendering_server_enums.h"
 #include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/mesh_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
-#include <platform_gl.h>
+#include "platform_gl.h"
 
 namespace GLES3 {
 
@@ -59,7 +57,7 @@ struct Mesh {
 			GLsizei stride;
 			uint32_t offset;
 		};
-		RSE::PrimitiveType primitive = RSE::PRIMITIVE_POINTS;
+		RS::PrimitiveType primitive = RS::PRIMITIVE_POINTS;
 		uint64_t format = 0;
 
 		GLuint vertex_buffer = 0;
@@ -78,7 +76,7 @@ struct Mesh {
 			uint32_t prev_vertex_buffer = 0;
 			GLuint vertex_array = 0;
 
-			Attrib attribs[RSE::ARRAY_MAX];
+			Attrib attribs[RS::ARRAY_MAX];
 		};
 
 		SpinLock version_lock; //needed to access versions
@@ -129,7 +127,7 @@ struct Mesh {
 	};
 
 	uint32_t blend_shape_count = 0;
-	RSE::BlendShapeMode blend_shape_mode = RSE::BLEND_SHAPE_MODE_NORMALIZED;
+	RS::BlendShapeMode blend_shape_mode = RS::BLEND_SHAPE_MODE_NORMALIZED;
 
 	Surface **surfaces = nullptr;
 	uint32_t surface_count = 0;
@@ -194,7 +192,7 @@ struct MeshInstance {
 struct MultiMesh {
 	RID mesh;
 	int instances = 0;
-	RSE::MultimeshTransformFormat xform_format = RSE::MULTIMESH_TRANSFORM_3D;
+	RS::MultimeshTransformFormat xform_format = RS::MULTIMESH_TRANSFORM_3D;
 	bool uses_colors = false;
 	bool uses_custom_data = false;
 	int visible_instances = -1;
@@ -305,12 +303,12 @@ public:
 	virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) override;
 	virtual bool mesh_needs_instance(RID p_mesh, bool p_has_skeleton) override;
 
-	virtual void mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) override;
+	virtual void mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) override;
 
 	virtual int mesh_get_blend_shape_count(RID p_mesh) const override;
 
-	virtual void mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) override;
-	virtual RSE::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override;
+	virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) override;
+	virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override;
 
 	virtual void mesh_surface_update_vertex_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override;
 	virtual void mesh_surface_update_attribute_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override;
@@ -320,7 +318,7 @@ public:
 	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material) override;
 	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const override;
 
-	virtual RenderingServerTypes::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override;
+	virtual RS::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override;
 	virtual int mesh_get_surface_count(RID p_mesh) const override;
 
 	virtual void mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb) override;
@@ -334,7 +332,7 @@ public:
 
 	virtual void mesh_clear(RID p_mesh) override;
 	virtual void mesh_surface_remove(RID p_mesh, int p_surface) override;
-	virtual void mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) override {}
+	virtual void mesh_debug_usage(List<RS::MeshInfo> *r_info) override {}
 
 	_FORCE_INLINE_ const RID *mesh_get_surface_count_and_materials(RID p_mesh, uint32_t &r_surface_count) {
 		Mesh *mesh = mesh_owner.get_or_null(p_mesh);
@@ -368,7 +366,7 @@ public:
 		return mesh->shadow_mesh;
 	}
 
-	_FORCE_INLINE_ RSE::PrimitiveType mesh_surface_get_primitive(void *p_surface) {
+	_FORCE_INLINE_ RS::PrimitiveType mesh_surface_get_primitive(void *p_surface) {
 		Mesh::Surface *surface = reinterpret_cast<Mesh::Surface *>(p_surface);
 		return surface->primitive;
 	}
@@ -527,7 +525,7 @@ public:
 	virtual RID _multimesh_allocate() override;
 	virtual void _multimesh_initialize(RID p_rid) override;
 	virtual void _multimesh_free(RID p_rid) override;
-	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override;
+	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override;
 	virtual int _multimesh_get_instance_count(RID p_multimesh) const override;
 
 	virtual void _multimesh_set_mesh(RID p_multimesh, RID p_mesh) override;
@@ -560,9 +558,9 @@ public:
 
 	void multimesh_vertex_attrib_setup(GLuint p_instance_buffer, uint32_t p_stride, bool p_uses_format_2d, bool p_has_color_or_custom_data, int p_attrib_base_index);
 
-	_FORCE_INLINE_ RSE::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
+	_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
-		ERR_FAIL_NULL_V(multimesh, RSE::MULTIMESH_TRANSFORM_3D);
+		ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);
 		return multimesh->xform_format;
 	}
 
diff --git a/engine/drivers/gles3/storage/particles_storage.cpp b/engine/drivers/gles3/storage/particles_storage.cpp
index 1f37fcb4..4f3b13aa 100644
--- a/engine/drivers/gles3/storage/particles_storage.cpp
+++ b/engine/drivers/gles3/storage/particles_storage.cpp
@@ -28,15 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "particles_storage.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/material_storage.h"
-#include "drivers/gles3/storage/mesh_storage.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
+#include "particles_storage.h"
+
+#include "config.h"
+#include "material_storage.h"
+#include "mesh_storage.h"
+#include "texture_storage.h"
+#include "utilities.h"
+
 #include "servers/rendering/rendering_server_globals.h"
 
 using namespace GLES3;
@@ -108,7 +109,7 @@ void ParticlesStorage::particles_free(RID p_rid) {
 	particles_owner.free(p_rid);
 }
 
-void ParticlesStorage::particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) {
+void ParticlesStorage::particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 	if (particles->mode == p_mode) {
@@ -223,11 +224,10 @@ void ParticlesStorage::particles_set_pre_process_time(RID p_particles, double p_
 	particles->pre_process_time = p_time;
 }
 
-void ParticlesStorage::particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual) {
+void ParticlesStorage::particles_request_process_time(RID p_particles, real_t p_request_process_time) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 	particles->request_process_time = p_request_process_time;
-	particles->request_process_time_residual = p_request_process_time_residual;
 }
 
 void ParticlesStorage::particles_set_seed(RID p_particles, uint32_t p_seed) {
@@ -317,27 +317,13 @@ void ParticlesStorage::particles_set_collision_base_size(RID p_particles, real_t
 	particles->collision_base_size = p_size;
 }
 
-void ParticlesStorage::particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) {
+void ParticlesStorage::particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
 	particles->transform_align = p_transform_align;
 }
 
-void ParticlesStorage::particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_channel_filter) {
-	Particles *particles = particles_owner.get_or_null(p_particles);
-	ERR_FAIL_NULL(particles);
-
-	particles->transform_align_channel_filter = p_channel_filter;
-}
-
-void ParticlesStorage::particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) {
-	Particles *particles = particles_owner.get_or_null(p_particles);
-	ERR_FAIL_NULL(particles);
-
-	particles->transform_align_axis = p_rotation_axis;
-}
-
 void ParticlesStorage::particles_set_process_material(RID p_particles, RID p_material) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
@@ -353,7 +339,7 @@ RID ParticlesStorage::particles_get_process_material(RID p_particles) const {
 	return particles->process_material;
 }
 
-void ParticlesStorage::particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) {
+void ParticlesStorage::particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
@@ -641,7 +627,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 			Vector3 scale = to_collider.basis.get_scale();
 			to_collider.basis.orthonormalize();
 
-			if (pc->type <= RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
+			if (pc->type <= RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
 				//attractor
 				if (frame_params.attractor_count >= ParticlesFrameParams::MAX_ATTRACTORS) {
 					continue;
@@ -655,7 +641,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 				attr.directionality = pc->attractor_directionality;
 
 				switch (pc->type) {
-					case RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT: {
 						attr.type = ParticlesFrameParams::ATTRACTOR_TYPE_SPHERE;
 						float radius = pc->radius;
 						radius *= (scale.x + scale.y + scale.z) / 3.0;
@@ -663,14 +649,14 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 						attr.extents[1] = radius;
 						attr.extents[2] = radius;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_BOX_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_BOX_ATTRACT: {
 						attr.type = ParticlesFrameParams::ATTRACTOR_TYPE_BOX;
 						Vector3 extents = pc->extents * scale;
 						attr.extents[0] = extents.x;
 						attr.extents[1] = extents.y;
 						attr.extents[2] = extents.z;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT: {
 						WARN_PRINT_ONCE_ED("Vector field particle attractors are not available in the Compatibility renderer.");
 					} break;
 					default: {
@@ -688,7 +674,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 
 				GLES3::MaterialStorage::store_transform(to_collider, col.transform);
 				switch (pc->type) {
-					case RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
 						col.type = ParticlesFrameParams::COLLISION_TYPE_SPHERE;
 						float radius = pc->radius;
 						radius *= (scale.x + scale.y + scale.z) / 3.0;
@@ -696,17 +682,17 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 						col.extents[1] = radius;
 						col.extents[2] = radius;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_BOX_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_BOX_COLLIDE: {
 						col.type = ParticlesFrameParams::COLLISION_TYPE_BOX;
 						Vector3 extents = pc->extents * scale;
 						col.extents[0] = extents.x;
 						col.extents[1] = extents.y;
 						col.extents[2] = extents.z;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_SDF_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_SDF_COLLIDE: {
 						WARN_PRINT_ONCE_ED("SDF Particle Colliders are not available in the Compatibility renderer.");
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE: {
 						if (collision_heightmap_texture != 0) { //already taken
 							continue;
 						}
@@ -747,9 +733,9 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 	}
 
 	// Get shader and set shader uniforms;
-	ParticleProcessMaterialData *m = static_cast<ParticleProcessMaterialData *>(material_storage->material_get_data(p_particles->process_material, RSE::SHADER_PARTICLES));
+	ParticleProcessMaterialData *m = static_cast<ParticleProcessMaterialData *>(material_storage->material_get_data(p_particles->process_material, RS::SHADER_PARTICLES));
 	if (!m) {
-		m = static_cast<ParticleProcessMaterialData *>(material_storage->material_get_data(particles_shader.default_material, RSE::SHADER_PARTICLES));
+		m = static_cast<ParticleProcessMaterialData *>(material_storage->material_get_data(particles_shader.default_material, RS::SHADER_PARTICLES));
 	}
 
 	ERR_FAIL_NULL(m);
@@ -763,7 +749,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 		}
 	}
 
-	if (p_particles->mode == RSE::ParticlesMode::PARTICLES_MODE_3D) {
+	if (p_particles->mode == RS::ParticlesMode::PARTICLES_MODE_3D) {
 		specialization |= ParticlesShaderGLES3::MODE_3D;
 	}
 
@@ -807,7 +793,7 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
-	if (particles->draw_order != RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD) {
+	if (particles->draw_order != RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
 		return;
 	}
 
@@ -824,7 +810,7 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 	// Sort will be done on CPU since we don't have compute shaders.
 	// If the sort_buffer has valid data
 	// Use a buffer that is 2 frames out of date to avoid stalls.
-	if (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->sort_buffer_filled) {
+	if (particles->draw_order == RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->sort_buffer_filled) {
 		glBindBuffer(GL_ARRAY_BUFFER, particles->sort_buffer);
 
 		ParticleInstanceData3D *particle_array;
@@ -859,7 +845,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 	uint32_t userdata_count = 0;
 
 	if (particles->process_material.is_valid()) {
-		GLES3::ParticleProcessMaterialData *material_data = static_cast<GLES3::ParticleProcessMaterialData *>(material_storage->material_get_data(particles->process_material, RSE::SHADER_PARTICLES));
+		GLES3::ParticleProcessMaterialData *material_data = static_cast<GLES3::ParticleProcessMaterialData *>(material_storage->material_get_data(particles->process_material, RS::SHADER_PARTICLES));
 		if (material_data && material_data->shader_data->version.is_valid() && material_data->shader_data->valid) {
 			userdata_count = material_data->shader_data->userdata_count;
 		}
@@ -875,7 +861,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 
 		particles->userdata_count = userdata_count;
 
-		uint32_t xform_size = particles->mode == RSE::PARTICLES_MODE_2D ? 2 : 3;
+		uint32_t xform_size = particles->mode == RS::PARTICLES_MODE_2D ? 2 : 3;
 		particles->instance_buffer_stride_cache = sizeof(float) * 4 * (xform_size + 1);
 		particles->instance_buffer_size_cache = particles->instance_buffer_stride_cache * total_amount;
 		particles->num_attrib_arrays_cache = 5 + userdata_count + (xform_size - 2);
@@ -947,7 +933,7 @@ void ParticlesStorage::_particles_update_instance_buffer(Particles *particles, c
 	ParticlesCopyShaderGLES3::ShaderVariant variant = ParticlesCopyShaderGLES3::MODE_DEFAULT;
 
 	uint64_t specialization = 0;
-	if (particles->mode == RSE::ParticlesMode::PARTICLES_MODE_3D) {
+	if (particles->mode == RS::ParticlesMode::PARTICLES_MODE_3D) {
 		specialization |= ParticlesCopyShaderGLES3::MODE_3D;
 	}
 
@@ -975,14 +961,12 @@ void ParticlesStorage::_particles_update_instance_buffer(Particles *particles, c
 	particles_shader.copy_shader.version_set_uniform(ParticlesCopyShaderGLES3::ALIGN_MODE, uint32_t(particles->transform_align), particles_shader.copy_shader_version, variant, specialization);
 	particles_shader.copy_shader.version_set_uniform(ParticlesCopyShaderGLES3::ALIGN_UP, p_up_axis, particles_shader.copy_shader_version, variant, specialization);
 	particles_shader.copy_shader.version_set_uniform(ParticlesCopyShaderGLES3::SORT_DIRECTION, p_axis, particles_shader.copy_shader_version, variant, specialization);
-	particles_shader.copy_shader.version_set_uniform(ParticlesCopyShaderGLES3::ALIGN_AXIS, uint32_t(particles->transform_align_axis), particles_shader.copy_shader_version, variant, specialization);
-	particles_shader.copy_shader.version_set_uniform(ParticlesCopyShaderGLES3::ALIGN_CHANNEL_FILTER, uint32_t(particles->transform_align_channel_filter), particles_shader.copy_shader_version, variant, specialization);
 
 	glBindVertexArray(particles->back_vertex_array);
 	glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, particles->front_instance_buffer, 0, particles->instance_buffer_size_cache);
 	glBeginTransformFeedback(GL_POINTS);
 
-	if (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_LIFETIME) {
+	if (particles->draw_order == RS::PARTICLES_DRAW_ORDER_LIFETIME) {
 		uint32_t lifetime_split = (MIN(int(particles->amount * particles->phase), particles->amount - 1) + 1) % particles->amount;
 		uint32_t stride = particles->process_buffer_stride_cache;
 
@@ -1000,7 +984,7 @@ void ParticlesStorage::_particles_update_instance_buffer(Particles *particles, c
 			glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, stride, CAST_INT_TO_UCHAR_PTR(stride * lifetime_split + sizeof(float) * 4 * 3));
 			glEnableVertexAttribArray(4); // Xform2.
 			glVertexAttribPointer(4, 4, GL_FLOAT, GL_FALSE, stride, CAST_INT_TO_UCHAR_PTR(stride * lifetime_split + sizeof(float) * 4 * 4));
-			if (particles->mode == RSE::PARTICLES_MODE_3D) {
+			if (particles->mode == RS::PARTICLES_MODE_3D) {
 				glEnableVertexAttribArray(5); // Xform3.
 				glVertexAttribPointer(5, 4, GL_FLOAT, GL_FALSE, stride, CAST_INT_TO_UCHAR_PTR(stride * lifetime_split + sizeof(float) * 4 * 5));
 			}
@@ -1064,7 +1048,6 @@ void ParticlesStorage::update_particles() {
 			particles->prev_phase = 0;
 			particles->clear = true;
 			particles->restart_request = false;
-			particles->frame_remainder = 0.0;
 		}
 
 		if (particles->inactive && !particles->emitting) {
@@ -1092,7 +1075,7 @@ void ParticlesStorage::update_particles() {
 
 		// Copy the instance buffer that was last used into the last_frame buffer.
 		// sort_buffer should now be 2 frames out of date.
-		if (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH || particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME) {
+		if (particles->draw_order == RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH || particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME) {
 			_particles_allocate_history_buffers(particles);
 			SWAP(particles->last_frame_buffer, particles->sort_buffer);
 
@@ -1114,50 +1097,20 @@ void ParticlesStorage::update_particles() {
 			fixed_fps = particles->fixed_fps;
 		}
 
-		// Request process and pre-process block
-		{
-			float todo = particles->clear ? particles->pre_process_time : 0;
-			todo = todo > particles->request_process_time ? todo : particles->request_process_time;
-			todo = todo > particles->request_process_time_residual ? todo : particles->request_process_time_residual;
-
-			if (todo > 0.0) {
-				real_t frame_time;
-				if (fixed_fps > 0) {
-					frame_time = 1.0 / fixed_fps;
-				} else {
-					frame_time = 1.0 / 30.0;
-				}
-
-				float tmp_scale = particles->speed_scale;
-				// We need this otherwise the speed scale of the particle system influences the `todo`.
-				particles->speed_scale = 1.0;
-				if (particles->clear) {
-					todo = particles->pre_process_time;
-					while (todo > 0.00001) {
-						_particles_process(particles, frame_time > todo ? todo : frame_time);
-						todo -= frame_time;
-					}
-				}
-				if (particles->request_process_time > 0.0) {
-					todo = particles->request_process_time;
-					while (todo > 0.0) {
-						_particles_process(particles, frame_time > todo ? todo : frame_time);
-						todo -= frame_time;
-					}
-				}
-				if (particles->request_process_time_residual > 0.0) {
-					particles->emitting = false;
-					todo = particles->request_process_time_residual;
-					while (todo > 0.0) {
-						_particles_process(particles, frame_time > todo ? todo : frame_time);
-						todo -= frame_time;
-					}
-				}
-				particles->speed_scale = tmp_scale;
+		if (particles->clear && particles->pre_process_time > 0.0) {
+			double frame_time;
+			if (fixed_fps > 0) {
+				frame_time = 1.0 / fixed_fps;
+			} else {
+				frame_time = 1.0 / 30.0;
 			}
 
-			particles->request_process_time = 0.0;
-			particles->request_process_time_residual = 0.0;
+			double todo = particles->pre_process_time;
+
+			while (todo >= 0) {
+				_particles_process(particles, frame_time);
+				todo -= frame_time;
+			}
 		}
 
 		double time_scale = MAX(particles->speed_scale, 0.0);
@@ -1203,12 +1156,11 @@ void ParticlesStorage::update_particles() {
 
 		// Copy particles to instance buffer and pack Color/Custom.
 		// We don't have camera information here, so don't copy here if we need camera information for view depth or align mode.
-
-		if (particles->draw_order != RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD) {
+		if (particles->draw_order != RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
 			_particles_update_instance_buffer(particles, Vector3(0.0, 0.0, 0.0), Vector3(0.0, 0.0, 0.0));
 
-			if (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME && particles->sort_buffer_filled) {
-				if (particles->mode == RSE::ParticlesMode::PARTICLES_MODE_2D) {
+			if (particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME && particles->sort_buffer_filled) {
+				if (particles->mode == RS::ParticlesMode::PARTICLES_MODE_2D) {
 					_particles_reverse_lifetime_sort<ParticleInstanceData2D>(particles);
 				} else {
 					_particles_reverse_lifetime_sort<ParticleInstanceData3D>(particles);
@@ -1299,11 +1251,11 @@ void ParticlesStorage::particles_collision_free(RID p_rid) {
 GLuint ParticlesStorage::particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL_V(particles_collision, 0);
-	ERR_FAIL_COND_V(particles_collision->type != RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, 0);
+	ERR_FAIL_COND_V(particles_collision->type != RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, 0);
 
 	if (particles_collision->heightfield_texture == 0) {
 		//create
-		const int resolutions[RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX] = { 256, 512, 1024, 2048, 4096, 8192 };
+		const int resolutions[RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX] = { 256, 512, 1024, 2048, 4096, 8192 };
 		Size2i size;
 		if (particles_collision->extents.x > particles_collision->extents.z) {
 			size.x = resolutions[particles_collision->heightfield_resolution];
@@ -1345,7 +1297,7 @@ GLuint ParticlesStorage::particles_collision_get_heightfield_framebuffer(RID p_p
 	return particles_collision->heightfield_fb;
 }
 
-void ParticlesStorage::particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) {
+void ParticlesStorage::particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL(particles_collision);
 
@@ -1424,10 +1376,10 @@ void ParticlesStorage::particles_collision_height_field_update(RID p_particles_c
 	particles_collision->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
 }
 
-void ParticlesStorage::particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) {
+void ParticlesStorage::particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL(particles_collision);
-	ERR_FAIL_INDEX(p_resolution, RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
+	ERR_FAIL_INDEX(p_resolution, RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
 
 	if (particles_collision->heightfield_resolution == p_resolution) {
 		return;
@@ -1448,8 +1400,8 @@ AABB ParticlesStorage::particles_collision_get_aabb(RID p_particles_collision) c
 	ERR_FAIL_NULL_V(particles_collision, AABB());
 
 	switch (particles_collision->type) {
-		case RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT:
-		case RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
+		case RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT:
+		case RS::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
 			AABB aabb;
 			aabb.position = -Vector3(1, 1, 1) * particles_collision->radius;
 			aabb.size = Vector3(2, 2, 2) * particles_collision->radius;
@@ -1473,7 +1425,7 @@ Vector3 ParticlesStorage::particles_collision_get_extents(RID p_particles_collis
 bool ParticlesStorage::particles_collision_is_heightfield(RID p_particles_collision) const {
 	const ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL_V(particles_collision, false);
-	return particles_collision->type == RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE;
+	return particles_collision->type == RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE;
 }
 
 uint32_t ParticlesStorage::particles_collision_get_height_field_mask(RID p_particles_collision) const {
diff --git a/engine/drivers/gles3/storage/particles_storage.h b/engine/drivers/gles3/storage/particles_storage.h
index c31d3425..60449faa 100644
--- a/engine/drivers/gles3/storage/particles_storage.h
+++ b/engine/drivers/gles3/storage/particles_storage.h
@@ -38,7 +38,7 @@
 #include "servers/rendering/storage/particles_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
-#include <platform_gl.h>
+#include "platform_gl.h"
 
 namespace GLES3 {
 
@@ -147,7 +147,7 @@ private:
 	static_assert(sizeof(ParticlesFrameParams) < 16384, "ParticlesFrameParams must be 16384 bytes or smaller");
 
 	struct Particles {
-		RSE::ParticlesMode mode = RSE::PARTICLES_MODE_3D;
+		RS::ParticlesMode mode = RS::PARTICLES_MODE_3D;
 		bool inactive = true;
 		double inactive_time = 0.0;
 		bool emitting = false;
@@ -157,7 +157,6 @@ private:
 		double lifetime = 1.0;
 		double pre_process_time = 0.0;
 		real_t request_process_time = 0.0;
-		real_t request_process_time_residual = 0.0;
 		real_t explosiveness = 0.0;
 		real_t randomness = 0.0;
 		bool restart_request = false;
@@ -172,11 +171,9 @@ private:
 
 		RID process_material;
 		uint32_t frame_counter = 0;
+		RS::ParticlesTransformAlign transform_align = RS::PARTICLES_TRANSFORM_ALIGN_DISABLED;
 
-		RSE::ParticlesTransformAlign transform_align = RSE::PARTICLES_TRANSFORM_ALIGN_DISABLED;
-		RSE::ParticlesTransformAlignAxis transform_align_axis = RSE::PARTICLES_ALIGN_AXIS_Y;
-		RSE::ParticlesTransformAlignCustomSrc transform_align_channel_filter = RSE::PARTICLES_ALIGN_CHANNEL_FILTER_X;
-		RSE::ParticlesDrawOrder draw_order = RSE::PARTICLES_DRAW_ORDER_INDEX;
+		RS::ParticlesDrawOrder draw_order = RS::PARTICLES_DRAW_ORDER_INDEX;
 
 		Vector<RID> draw_passes;
 
@@ -280,7 +277,7 @@ private:
 	/* Particles Collision */
 
 	struct ParticlesCollision {
-		RSE::ParticlesCollisionType type = RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT;
+		RS::ParticlesCollisionType type = RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT;
 		uint32_t cull_mask = 0xFFFFFFFF;
 		float radius = 1.0;
 		Vector3 extents = Vector3(1, 1, 1);
@@ -293,7 +290,7 @@ private:
 		Size2i heightfield_fb_size;
 		uint32_t heightfield_mask = (1 << 20) - 1;
 
-		RSE::ParticlesCollisionHeightfieldResolution heightfield_resolution = RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024;
+		RS::ParticlesCollisionHeightfieldResolution heightfield_resolution = RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024;
 
 		Dependency dependency;
 	};
@@ -324,7 +321,7 @@ public:
 	virtual void particles_initialize(RID p_rid) override;
 	virtual void particles_free(RID p_rid) override;
 
-	virtual void particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) override;
+	virtual void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) override;
 	virtual void particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) override;
 	virtual void particles_set_emitting(RID p_particles, bool p_emitting) override;
 	virtual void particles_set_amount(RID p_particles, int p_amount) override;
@@ -332,7 +329,7 @@ public:
 	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) override;
 	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) override;
 	virtual void particles_set_pre_process_time(RID p_particles, double p_time) override;
-	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual) override;
+	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time) override;
 	virtual void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) override;
 	virtual void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) override;
 	virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) override;
@@ -347,10 +344,7 @@ public:
 	virtual void particles_set_view_axis(RID p_particles, const Vector3 &p_axis, const Vector3 &p_up_axis) override;
 	virtual void particles_set_collision_base_size(RID p_particles, real_t p_size) override;
 
-	virtual void particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) override;
-	virtual void particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_channel_filter) override;
-	virtual void particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) override;
-
+	virtual void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) override;
 	virtual void particles_set_seed(RID p_particles, uint32_t p_seed) override;
 
 	virtual void particles_set_trails(RID p_particles, bool p_enable, double p_length) override;
@@ -358,7 +352,7 @@ public:
 
 	virtual void particles_restart(RID p_particles) override;
 
-	virtual void particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) override;
+	virtual void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) override;
 
 	virtual void particles_set_draw_passes(RID p_particles, int p_count) override;
 	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) override;
@@ -383,9 +377,9 @@ public:
 	virtual void update_particles() override;
 	virtual bool particles_is_inactive(RID p_particles) const override;
 
-	_FORCE_INLINE_ RSE::ParticlesMode particles_get_mode(RID p_particles) {
+	_FORCE_INLINE_ RS::ParticlesMode particles_get_mode(RID p_particles) {
 		Particles *particles = particles_owner.get_or_null(p_particles);
-		ERR_FAIL_NULL_V(particles, RSE::PARTICLES_MODE_2D);
+		ERR_FAIL_NULL_V(particles, RS::PARTICLES_MODE_2D);
 		return particles->mode;
 	}
 
@@ -399,7 +393,7 @@ public:
 	_FORCE_INLINE_ GLuint particles_get_gl_buffer(RID p_particles) {
 		Particles *particles = particles_owner.get_or_null(p_particles);
 
-		if ((particles->draw_order == RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH || particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME) && particles->sort_buffer_filled) {
+		if ((particles->draw_order == RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH || particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME) && particles->sort_buffer_filled) {
 			return particles->sort_buffer;
 		}
 		return particles->back_instance_buffer;
@@ -442,7 +436,7 @@ public:
 	virtual void particles_collision_initialize(RID p_rid) override;
 	virtual void particles_collision_free(RID p_rid) override;
 
-	virtual void particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) override;
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) override;
 	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) override;
 	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) override;
 	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) override;
@@ -451,7 +445,7 @@ public:
 	virtual void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) override;
 	virtual void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) override;
 	virtual void particles_collision_height_field_update(RID p_particles_collision) override;
-	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) override;
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) override;
 	virtual AABB particles_collision_get_aabb(RID p_particles_collision) const override;
 	Vector3 particles_collision_get_extents(RID p_particles_collision) const;
 	virtual bool particles_collision_is_heightfield(RID p_particles_collision) const override;
@@ -463,7 +457,7 @@ public:
 	_FORCE_INLINE_ Size2i particles_collision_get_heightfield_size(RID p_particles_collision) const {
 		ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 		ERR_FAIL_NULL_V(particles_collision, Size2i());
-		ERR_FAIL_COND_V(particles_collision->type != RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, Size2i());
+		ERR_FAIL_COND_V(particles_collision->type != RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, Size2i());
 
 		return particles_collision->heightfield_fb_size;
 	}
diff --git a/engine/drivers/gles3/storage/render_scene_buffers_gles3.cpp b/engine/drivers/gles3/storage/render_scene_buffers_gles3.cpp
index 296206ae..e9739681 100644
--- a/engine/drivers/gles3/storage/render_scene_buffers_gles3.cpp
+++ b/engine/drivers/gles3/storage/render_scene_buffers_gles3.cpp
@@ -28,13 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "render_scene_buffers_gles3.h"
-
 #ifdef GLES3_ENABLED
 
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/texture_storage.h"
-#include "drivers/gles3/storage/utilities.h"
+#include "render_scene_buffers_gles3.h"
+#include "config.h"
+#include "texture_storage.h"
+#include "utilities.h"
 
 // Will only be defined if GLES 3.2 headers are included
 #ifndef GL_TEXTURE_2D_MULTISAMPLE_ARRAY
@@ -156,28 +155,28 @@ void RenderSceneBuffersGLES3::configure(const RenderSceneBuffersConfiguration *p
 	}
 
 	// Check our scaling mode
-	if (scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF && internal_size.x == 0 && internal_size.y == 0) {
+	if (scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF && internal_size.x == 0 && internal_size.y == 0) {
 		// Disable, no size set.
-		scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
-	} else if (scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF && internal_size == target_size) {
+		scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
+	} else if (scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF && internal_size == target_size) {
 		// If size matches, we won't use scaling.
-		scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
-	} else if (scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF && !(scaling_3d_mode == RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR || scaling_3d_mode == RSE::VIEWPORT_SCALING_3D_MODE_NEAREST)) {
-		WARN_PRINT_ONCE("The Compatibility rendering method only supports bilinear and nearest-neighbor scaling. Falling back to bilinear scaling.");
-		scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+		scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
+	} else if (scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF && scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_BILINEAR) {
+		// We only support bilinear scaling atm.
+		WARN_PRINT_ONCE("GLES only supports bilinear scaling.");
+		scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
 	}
-	// Nearest/bilinear scaling decision is handled in `RasterizerSceneGLES3::_render_post_processing()`.
 
 	// Check if we support MSAA.
-	if (msaa3d.mode != RSE::VIEWPORT_MSAA_DISABLED && internal_size.x == 0 && internal_size.y == 0) {
+	if (msaa3d.mode != RS::VIEWPORT_MSAA_DISABLED && internal_size.x == 0 && internal_size.y == 0) {
 		// Disable, no size set.
-		msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
-	} else if (!use_multiview && msaa3d.mode != RSE::VIEWPORT_MSAA_DISABLED && !config->msaa_supported && !config->rt_msaa_supported) {
+		msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
+	} else if (!use_multiview && msaa3d.mode != RS::VIEWPORT_MSAA_DISABLED && !config->msaa_supported && !config->rt_msaa_supported) {
 		WARN_PRINT_ONCE("MSAA is not supported on this device.");
-		msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
-	} else if (use_multiview && msaa3d.mode != RSE::VIEWPORT_MSAA_DISABLED && !config->msaa_multiview_supported && !config->rt_msaa_multiview_supported) {
+		msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
+	} else if (use_multiview && msaa3d.mode != RS::VIEWPORT_MSAA_DISABLED && !config->msaa_multiview_supported && !config->rt_msaa_multiview_supported) {
 		WARN_PRINT_ONCE("Multiview MSAA is not supported on this device.");
-		msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
+		msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
 	}
 
 	// We don't create our buffers right away because post effects can be made active at any time and change our buffer configuration.
@@ -189,7 +188,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 
 	ERR_FAIL_COND(view_count == 0);
 
-	bool use_internal_buffer = scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF || apply_environment_effects_in_post || apply_canvas_bg_exposure;
+	bool use_internal_buffer = scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF || apply_color_adjustments_in_post;
 	GLenum depth_format = GL_DEPTH24_STENCIL8;
 	uint32_t depth_format_size = 4;
 	bool use_multiview = view_count > 1;
@@ -198,7 +197,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 		_clear_intermediate_buffers();
 	}
 
-	if ((!use_internal_buffer || internal3d.color != 0) && (msaa3d.mode == RSE::VIEWPORT_MSAA_DISABLED || msaa3d.color != 0)) {
+	if ((!use_internal_buffer || internal3d.color != 0) && (msaa3d.mode == RS::VIEWPORT_MSAA_DISABLED || msaa3d.color != 0)) {
 		// already setup!
 		return;
 	}
@@ -268,7 +267,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 		glBindFramebuffer(GL_FRAMEBUFFER, GLES3::TextureStorage::system_fbo);
 	}
 
-	if (msaa3d.mode != RSE::VIEWPORT_MSAA_DISABLED && msaa3d.color == 0) {
+	if (msaa3d.mode != RS::VIEWPORT_MSAA_DISABLED && msaa3d.color == 0) {
 		// Setup MSAA.
 		const GLsizei samples[] = { 1, 2, 4, 8 };
 		msaa3d.samples = samples[msaa3d.mode];
@@ -311,7 +310,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 			if (status != GL_FRAMEBUFFER_COMPLETE) {
 				_clear_msaa3d_buffers();
-				msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
+				msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
 				WARN_PRINT("Could not create 3D MSAA buffers, status: " + texture_storage->get_framebuffer_error(status));
 			}
 
@@ -357,7 +356,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 			if (status != GL_FRAMEBUFFER_COMPLETE) {
 				_clear_msaa3d_buffers();
-				msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
+				msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
 				WARN_PRINT("Could not create 3D MSAA buffers, status: " + texture_storage->get_framebuffer_error(status));
 			}
 
@@ -386,7 +385,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 			if (status != GL_FRAMEBUFFER_COMPLETE) {
 				_clear_msaa3d_buffers();
-				msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
+				msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
 				WARN_PRINT("Could not create 3D MSAA framebuffer, status: " + texture_storage->get_framebuffer_error(status));
 			}
 
@@ -395,7 +394,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 		} else {
 			// HUH? how did we get here?
 			WARN_PRINT_ONCE("MSAA is not supported on this device.");
-			msaa3d.mode = RSE::VIEWPORT_MSAA_DISABLED;
+			msaa3d.mode = RS::VIEWPORT_MSAA_DISABLED;
 			msaa3d.samples = 1;
 			msaa3d.check_fbo_cache = false;
 		}
@@ -408,7 +407,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
 void RenderSceneBuffersGLES3::configure_for_probe(Size2i p_size) {
 	internal_size = p_size;
 	target_size = p_size;
-	scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+	scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 	view_count = 1;
 }
 
@@ -559,12 +558,8 @@ void RenderSceneBuffersGLES3::_clear_back_buffers() {
 	}
 }
 
-void RenderSceneBuffersGLES3::set_apply_environment_effects_in_post(bool p_apply_in_post) {
-	apply_environment_effects_in_post = p_apply_in_post;
-}
-
-void RenderSceneBuffersGLES3::set_apply_canvas_bg_exposure(bool p_apply_canvas_bg_exposure) {
-	apply_canvas_bg_exposure = p_apply_canvas_bg_exposure;
+void RenderSceneBuffersGLES3::set_apply_color_adjustments_in_post(bool p_apply_in_post) {
+	apply_color_adjustments_in_post = p_apply_in_post;
 }
 
 void RenderSceneBuffersGLES3::check_glow_buffers() {
diff --git a/engine/drivers/gles3/storage/render_scene_buffers_gles3.h b/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
index 497c5d3e..f98454f3 100644
--- a/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
+++ b/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
@@ -35,7 +35,7 @@
 #include "drivers/gles3/effects/glow.h"
 #include "servers/rendering/storage/render_scene_buffers.h"
 
-#include <platform_gl.h>
+#include "platform_gl.h"
 
 class RenderSceneBuffersGLES3 : public RenderSceneBuffers {
 	GDCLASS(RenderSceneBuffersGLES3, RenderSceneBuffers);
@@ -43,14 +43,13 @@ class RenderSceneBuffersGLES3 : public RenderSceneBuffers {
 public:
 	Size2i internal_size; // Size of the buffer we render 3D content to.
 	Size2i target_size; // Size of our output buffer (render target).
-	RSE::ViewportScaling3DMode scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+	RS::ViewportScaling3DMode scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 	//float fsr_sharpness = 0.2f;
-	//RSE::ViewportScreenSpaceAA screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+	//RS::ViewportScreenSpaceAA screen_space_aa = RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
 	//bool use_taa = false;
 	//bool use_debanding = false;
 	uint32_t view_count = 1;
-	bool apply_environment_effects_in_post = false;
-	bool apply_canvas_bg_exposure = false;
+	bool apply_color_adjustments_in_post = false;
 
 	RID render_target;
 
@@ -67,7 +66,7 @@ public:
 	};
 
 	struct RTMSAA3D {
-		RSE::ViewportMSAA mode = RSE::VIEWPORT_MSAA_DISABLED;
+		RS::ViewportMSAA mode = RS::VIEWPORT_MSAA_DISABLED;
 		bool needs_resolve = false;
 		GLsizei samples = 1;
 		GLuint color = 0;
@@ -84,7 +83,7 @@ public:
 
 	// Buffers for our glow implementation
 	struct GLOW {
-		GLES3::Glow::Level levels[4];
+		GLES3::Glow::GLOWLEVEL levels[4];
 	} glow;
 
 private:
@@ -103,12 +102,11 @@ public:
 	virtual void configure(const RenderSceneBuffersConfiguration *p_config) override;
 	void configure_for_probe(Size2i p_size);
 
-	virtual void set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override {}
+	virtual void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override {}
 	virtual void set_fsr_sharpness(float p_fsr_sharpness) override {}
 	virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override {}
 	virtual void set_use_debanding(bool p_use_debanding) override {}
-	void set_apply_environment_effects_in_post(bool p_apply_environment_effects_in_post);
-	void set_apply_canvas_bg_exposure(bool p_apply_canvas_bg_exposure);
+	void set_apply_color_adjustments_in_post(bool p_apply_in_post);
 
 	void free_render_buffer_data();
 
@@ -148,7 +146,7 @@ public:
 	GLuint get_backbuffer() const { return backbuffer3d.color; }
 	GLuint get_backbuffer_depth() const { return backbuffer3d.depth; }
 
-	const GLES3::Glow::Level *get_glow_buffers() const { return &glow.levels[0]; }
+	const GLES3::Glow::GLOWLEVEL *get_glow_buffers() const { return &glow.levels[0]; }
 
 	// Getters
 
@@ -156,10 +154,10 @@ public:
 	_FORCE_INLINE_ uint32_t get_view_count() const { return view_count; }
 	_FORCE_INLINE_ Size2i get_internal_size() const { return internal_size; }
 	_FORCE_INLINE_ Size2i get_target_size() const { return target_size; }
-	_FORCE_INLINE_ RSE::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
+	_FORCE_INLINE_ RS::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
 	//_FORCE_INLINE_ float get_fsr_sharpness() const { return fsr_sharpness; }
-	_FORCE_INLINE_ RSE::ViewportMSAA get_msaa_3d() const { return msaa3d.mode; }
-	//_FORCE_INLINE_ RSE::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
+	_FORCE_INLINE_ RS::ViewportMSAA get_msaa_3d() const { return msaa3d.mode; }
+	//_FORCE_INLINE_ RS::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
 	//_FORCE_INLINE_ bool get_use_taa() const { return use_taa; }
 	//_FORCE_INLINE_ bool get_use_debanding() const { return use_debanding; }
 };
diff --git a/engine/drivers/gles3/storage/texture_storage.cpp b/engine/drivers/gles3/storage/texture_storage.cpp
index 8e5daad1..bd7b1db6 100644
--- a/engine/drivers/gles3/storage/texture_storage.cpp
+++ b/engine/drivers/gles3/storage/texture_storage.cpp
@@ -28,16 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "texture_storage.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/config/engine.h"
-#include "drivers/gles3/effects/copy_effects.h"
-#include "drivers/gles3/rasterizer_gles3.h"
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#include "drivers/gles3/storage/material_storage.h"
-#include "drivers/gles3/storage/utilities.h"
+#include "texture_storage.h"
+
+#include "../effects/copy_effects.h"
+#include "../rasterizer_gles3.h"
+#include "config.h"
+#include "utilities.h"
 
 using namespace GLES3;
 
@@ -73,14 +71,14 @@ TextureStorage::TextureStorage() {
 			images.push_back(image);
 
 			default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE], images, RSE::TEXTURE_LAYERED_2D_ARRAY);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE], images, RS::TEXTURE_LAYERED_2D_ARRAY);
 
 			for (int i = 0; i < 5; i++) {
 				images.push_back(image);
 			}
 
 			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE], images, RSE::TEXTURE_LAYERED_CUBEMAP);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE], images, RS::TEXTURE_LAYERED_CUBEMAP);
 		}
 
 		{
@@ -107,13 +105,13 @@ TextureStorage::TextureStorage() {
 			images.push_back(image);
 
 			default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_BLACK] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_BLACK], images, RSE::TEXTURE_LAYERED_2D_ARRAY);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_BLACK], images, RS::TEXTURE_LAYERED_2D_ARRAY);
 
 			for (int i = 0; i < 5; i++) {
 				images.push_back(image);
 			}
 			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK], images, RSE::TEXTURE_LAYERED_CUBEMAP);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK], images, RS::TEXTURE_LAYERED_CUBEMAP);
 		}
 
 		{
@@ -140,14 +138,14 @@ TextureStorage::TextureStorage() {
 			images.push_back(image);
 
 			default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_TRANSPARENT] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_TRANSPARENT], images, RSE::TEXTURE_LAYERED_2D_ARRAY);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_TRANSPARENT], images, RS::TEXTURE_LAYERED_2D_ARRAY);
 
 			for (int i = 0; i < 5; i++) {
 				images.push_back(image);
 			}
 
 			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_TRANSPARENT] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_TRANSPARENT], images, RSE::TEXTURE_LAYERED_CUBEMAP);
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_TRANSPARENT], images, RS::TEXTURE_LAYERED_CUBEMAP);
 		}
 
 		{
@@ -208,7 +206,7 @@ TextureStorage::TextureStorage() {
 			glBindTexture(GL_TEXTURE_2D, texture.tex_id);
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8UI, 4, 4, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE, pixel_data);
 			GLES3::Utilities::get_singleton()->texture_allocated_data(texture.tex_id, 4 * 4 * 4, "Default uint texture");
-			texture.gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+			texture.gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
 		}
 		{
 			uint16_t pixel_data[4 * 4];
@@ -230,7 +228,7 @@ TextureStorage::TextureStorage() {
 			glBindTexture(GL_TEXTURE_2D, texture.tex_id);
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, 4, 4, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, pixel_data);
 			GLES3::Utilities::get_singleton()->texture_allocated_data(texture.tex_id, 4 * 4 * 2, "Default depth texture");
-			texture.gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+			texture.gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
 		}
 	}
 
@@ -285,7 +283,7 @@ TextureStorage::TextureStorage() {
 	}
 
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		glEnable(GL_PROGRAM_POINT_SIZE);
 	}
 #endif // GL_API_ENABLED
@@ -305,94 +303,6 @@ TextureStorage::~TextureStorage() {
 	sdf_shader.shader.version_free(sdf_shader.shader_version);
 }
 
-// Has to be a separate call from TextureStorage initialization due to interacting with MaterialStorage
-void TextureStorage::_tex_blit_shader_initialize() {
-	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
-
-	{
-		String global_defines;
-		global_defines += "#define MAX_GLOBAL_SHADER_UNIFORMS 256\n"; // TODO: this is arbitrary for now
-		material_storage->shaders.tex_blit_shader.initialize(global_defines, 1);
-	}
-
-	{
-		// default material and shader for Texture Blit shader
-		tex_blit_shader.default_shader = material_storage->shader_allocate();
-		material_storage->shader_initialize(tex_blit_shader.default_shader);
-		material_storage->shader_set_code(tex_blit_shader.default_shader, R"(
-// Default Texture Blit shader.
-
-shader_type texture_blit;
-render_mode blend_mix;
-
-uniform sampler2D source_texture0 : hint_blit_source0;
-uniform sampler2D source_texture1 : hint_blit_source1;
-uniform sampler2D source_texture2 : hint_blit_source2;
-uniform sampler2D source_texture3 : hint_blit_source3;
-
-void blit() {
-	// Copies from each whole source texture to a rect on each output texture.
-	COLOR0 = texture(source_texture0, UV) * MODULATE;
-	COLOR1 = texture(source_texture1, UV) * MODULATE;
-	COLOR2 = texture(source_texture2, UV) * MODULATE;
-	COLOR3 = texture(source_texture3, UV) * MODULATE;
-}
-)");
-		tex_blit_shader.default_material = material_storage->material_allocate();
-		material_storage->material_initialize(tex_blit_shader.default_material);
-		material_storage->material_set_shader(tex_blit_shader.default_material, tex_blit_shader.default_shader);
-	}
-
-	{
-		// Set up Frame & Vertex Buffers for TextureBlit Shaders
-		// Just a 1x1 Quad to draw
-		glGenFramebuffers(1, &tex_blit_fbo);
-
-		glGenBuffers(1, &tex_blit_quad);
-		glBindBuffer(GL_ARRAY_BUFFER, tex_blit_quad);
-
-		const float qv[12] = {
-			-1.0f,
-			-1.0f,
-			1.0f,
-			-1.0f,
-			1.0f,
-			1.0f,
-			-1.0f,
-			-1.0f,
-			1.0f,
-			1.0f,
-			-1.0f,
-			1.0f,
-		};
-
-		glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 12, qv, GL_STATIC_DRAW);
-		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
-
-		glGenVertexArrays(1, &tex_blit_quad_array);
-		glBindVertexArray(tex_blit_quad_array);
-		glBindBuffer(GL_ARRAY_BUFFER, tex_blit_quad);
-		glVertexAttribPointer(RSE::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, nullptr);
-		glEnableVertexAttribArray(RSE::ARRAY_VERTEX);
-		glBindVertexArray(0);
-		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
-	}
-
-	tex_blit_shader.initialized = true;
-}
-
-// Has to be a separate call from TextureStorage destruction due to interacting with Material Storage
-void TextureStorage::_tex_blit_shader_free() {
-	if (tex_blit_shader.initialized) {
-		GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
-		glDeleteFramebuffers(1, &tex_blit_fbo);
-		glDeleteBuffers(1, &tex_blit_quad);
-		glDeleteVertexArrays(1, &tex_blit_quad_array);
-		material_storage->material_free(tex_blit_shader.default_material);
-		material_storage->shader_free(tex_blit_shader.default_shader);
-	}
-}
-
 /* Canvas Texture API */
 
 RID TextureStorage::canvas_texture_allocate() {
@@ -407,18 +317,18 @@ void TextureStorage::canvas_texture_free(RID p_rid) {
 	canvas_texture_owner.free(p_rid);
 }
 
-void TextureStorage::canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) {
+void TextureStorage::canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
 	switch (p_channel) {
-		case RSE::CANVAS_TEXTURE_CHANNEL_DIFFUSE: {
+		case RS::CANVAS_TEXTURE_CHANNEL_DIFFUSE: {
 			ct->diffuse = p_texture;
 		} break;
-		case RSE::CANVAS_TEXTURE_CHANNEL_NORMAL: {
+		case RS::CANVAS_TEXTURE_CHANNEL_NORMAL: {
 			ct->normal_map = p_texture;
 		} break;
-		case RSE::CANVAS_TEXTURE_CHANNEL_SPECULAR: {
+		case RS::CANVAS_TEXTURE_CHANNEL_SPECULAR: {
 			ct->specular = p_texture;
 		} break;
 	}
@@ -434,14 +344,14 @@ void TextureStorage::canvas_texture_set_shading_parameters(RID p_canvas_texture,
 	ct->specular_color.a = p_shininess;
 }
 
-void TextureStorage::canvas_texture_set_texture_filter(RID p_canvas_texture, RSE::CanvasItemTextureFilter p_filter) {
+void TextureStorage::canvas_texture_set_texture_filter(RID p_canvas_texture, RS::CanvasItemTextureFilter p_filter) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
 	ct->texture_filter = p_filter;
 }
 
-void TextureStorage::canvas_texture_set_texture_repeat(RID p_canvas_texture, RSE::CanvasItemTextureRepeat p_repeat) {
+void TextureStorage::canvas_texture_set_texture_repeat(RID p_canvas_texture, RS::CanvasItemTextureRepeat p_repeat) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
@@ -455,7 +365,7 @@ static inline Error _get_gl_uncompressed_format(const Ref<Image> &p_image, Image
 
 	switch (p_format) {
 		case Image::FORMAT_L8: {
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				r_gl_internal_format = GL_R8;
 				r_gl_format = GL_RED;
 				r_gl_type = GL_UNSIGNED_BYTE;
@@ -466,7 +376,7 @@ static inline Error _get_gl_uncompressed_format(const Ref<Image> &p_image, Image
 			}
 		} break;
 		case Image::FORMAT_LA8: {
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				r_gl_internal_format = GL_RG8;
 				r_gl_format = GL_RG;
 				r_gl_type = GL_UNSIGNED_BYTE;
@@ -1098,11 +1008,11 @@ void TextureStorage::texture_external_initialize(RID p_texture, int p_width, int
 	glBindTexture(texture.target, 0);
 }
 
-void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) {
+void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) {
 	ERR_FAIL_COND(p_layers.is_empty());
 
-	ERR_FAIL_COND(p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP && p_layers.size() != 6);
-	ERR_FAIL_COND_MSG(p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY, "Cubemap Arrays are not supported in the Compatibility renderer.");
+	ERR_FAIL_COND(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP && p_layers.size() != 6);
+	ERR_FAIL_COND_MSG(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP_ARRAY, "Cubemap Arrays are not supported in the Compatibility renderer.");
 
 	const Ref<Image> &image = p_layers[0];
 	{
@@ -1137,7 +1047,7 @@ void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<R
 	texture.format = image->get_format();
 	texture.type = Texture::TYPE_LAYERED;
 	texture.layered_type = p_layered_type;
-	texture.target = p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D_ARRAY;
+	texture.target = p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D_ARRAY;
 	texture.layers = p_layers.size();
 	_get_gl_image_and_format(Ref<Image>(), texture.format, texture.real_format, texture.gl_format_cache, texture.gl_internal_format_cache, texture.gl_type_cache, texture.compressed, false);
 	texture.total_data_size = p_layers[0]->get_image_data_size(texture.width, texture.height, texture.format, texture.mipmaps) * texture.layers;
@@ -1203,66 +1113,21 @@ void TextureStorage::texture_proxy_initialize(RID p_texture, RID p_base) {
 	texture_owner.initialize_rid(p_texture, proxy_tex);
 }
 
-void TextureStorage::texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) {
-	// Behaves identically to Texture_2D_Initialize by generating a white image based on parameters.
-
-	// GUARDRAIL: Bad Widths/Heights
-	ERR_FAIL_COND_MSG(p_width <= 0 || p_height <= 0, "Drawable Texture Width or Height cannot be less than 1.");
-	ERR_FAIL_COND_MSG(p_width >= 16384 || p_height >= 16384, "Drawable Texture Width or Height cannot be greater than 16383.");
-
-	Image::Format format;
-	switch (p_format) {
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8:
-			format = Image::FORMAT_RGBA8;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB:
-			format = Image::FORMAT_RGBA8;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBAH:
-			format = Image::FORMAT_RGBAH;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBAF:
-			format = Image::FORMAT_RGBAF;
-			break;
-		default:
-			format = Image::FORMAT_RGBA8;
-	}
-
-	Ref<Image> image = Image::create_empty(p_width, p_height, p_with_mipmaps, format);
-	image->fill(p_color);
-	Texture texture;
-	texture.width = image->get_width();
-	texture.height = image->get_height();
-	texture.alloc_width = texture.width;
-	texture.alloc_height = texture.height;
-	texture.mipmaps = image->get_mipmap_count() + 1;
-	texture.format = image->get_format();
-	texture.type = Texture::TYPE_2D;
-	texture.target = GL_TEXTURE_2D;
-	_get_gl_image_and_format(Ref<Image>(), texture.format, texture.real_format, texture.gl_format_cache, texture.gl_internal_format_cache, texture.gl_type_cache, texture.compressed, false);
-	texture.total_data_size = image->get_image_data_size(texture.width, texture.height, texture.format, texture.mipmaps);
-	texture.active = true;
-	glGenTextures(1, &texture.tex_id);
-	GLES3::Utilities::get_singleton()->texture_allocated_data(texture.tex_id, texture.total_data_size, "Texture 2D");
-	texture_owner.initialize_rid(p_texture, texture);
-	texture_set_data(p_texture, image);
-}
-
-RID TextureStorage::texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers, RSE::TextureLayeredType p_layered_type) {
+RID TextureStorage::texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers, RS::TextureLayeredType p_layered_type) {
 	Texture texture;
 	texture.active = true;
 	texture.is_from_native_handle = true;
 
 	switch (p_type) {
-		case RSE::TEXTURE_TYPE_2D: {
+		case RS::TEXTURE_TYPE_2D: {
 			texture.type = Texture::TYPE_2D;
 			texture.target = GL_TEXTURE_2D;
 		} break;
-		case RSE::TEXTURE_TYPE_3D: {
+		case RS::TEXTURE_TYPE_3D: {
 			texture.type = Texture::TYPE_3D;
 			texture.target = GL_TEXTURE_3D;
 		} break;
-		case RSE::TEXTURE_TYPE_LAYERED: {
+		case RS::TEXTURE_TYPE_LAYERED: {
 			texture.type = Texture::TYPE_LAYERED;
 			texture.target = GL_TEXTURE_2D_ARRAY;
 		} break;
@@ -1358,7 +1223,7 @@ void TextureStorage::texture_remap_proxies(RID p_from_texture, RID p_to_texture)
 	}
 
 	// Make a local copy, we're about to change the content of the original.
-	thread_local LocalVector<RID> proxies(from_tex->proxies);
+	thread_local LocalVector<RID> proxies = from_tex->proxies;
 
 	// Now change them to our new texture.
 	for (RID &proxy : proxies) {
@@ -1366,141 +1231,12 @@ void TextureStorage::texture_remap_proxies(RID p_from_texture, RID p_to_texture)
 	}
 }
 
-// Output textures in p_textures must ALL BE THE SAME SIZE
-void TextureStorage::texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) {
-	ERR_FAIL_COND_MSG(!tex_blit_shader.initialized, "Texture Blit shader & materials not yet initialized.");
-	ERR_FAIL_COND_MSG(p_textures.size() == 0 || p_source_textures.size() == 0, "Blit Rect texture output and source arrays must contain at least 1 texture.");
-	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
-
-	TexBlitMaterialData *m = static_cast<TexBlitMaterialData *>(material_storage->material_get_data(p_material, RSE::SHADER_TEXTURE_BLIT));
-	if (!m) {
-		m = static_cast<TexBlitMaterialData *>(material_storage->material_get_data(tex_blit_shader.default_material, RSE::SHADER_TEXTURE_BLIT));
-	}
-	// GUARDRAIL: p_material MUST BE ShaderType TextureBlit
-	ERR_FAIL_NULL(m);
-
-	TexBlitShaderGLES3::ShaderVariant variant = TexBlitShaderGLES3::MODE_DEFAULT;
-	RID version = tex_blit_shader.default_shader_version;
-	if (m->shader_data->version.is_valid() && m->shader_data->valid) {
-		// Must be called to force user ShaderMaterials to actually populate uniform buffer before binding
-		// NOTE: Not an ideal work around, maybe in the future this can only update this MaterialData and remove it from the queue, instead of processing all queued updates
-		material_storage->_update_queued_materials();
-		// Bind material uniform buffer and textures.
-		m->bind_uniforms();
-		version = m->shader_data->version;
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, tex_blit_fbo);
-	TightLocalVector<GLenum> draw_buffers;
-
-	Texture *tar_textures[4];
-	int convert_to_srgb_mask = 0;
-	Texture *src_textures[4];
-
-	int i = 0;
-	uint32_t specialization = 0;
-	const int outputFlagArray[4] = { 0, TexBlitShaderGLES3::USE_OUTPUT1, TexBlitShaderGLES3::USE_OUTPUT2, TexBlitShaderGLES3::USE_OUTPUT3 };
-	const int srgbMaskArray[4] = { 1, 2, 4, 8 };
-	while (i < 4) {
-		// Attach Targets to Framebuffer
-		if (i < p_textures.size()) {
-			tar_textures[i] = get_texture(p_textures[i]);
-			ERR_FAIL_NULL_MSG(tar_textures[i], "Drawable Texture target cannot be null.");
-			if (i > 0) {
-				ERR_FAIL_COND_MSG(texture_get_size(p_textures[i - 1]) != texture_get_size(p_textures[i]), "All Blit_Rect output textures must be same size.");
-			}
-			specialization |= outputFlagArray[i];
-			draw_buffers.push_back(GL_COLOR_ATTACHMENT0 + i);
-			ERR_FAIL_COND_MSG(p_to_mipmap >= tar_textures[i]->mipmaps, vformat("Drawable Texture Target does not have mipmap level %d.", p_to_mipmap));
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, tar_textures[i]->tex_id, p_to_mipmap);
-			convert_to_srgb_mask += tar_textures[i]->drawable_type == RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB ? srgbMaskArray[i] : 0;
-		}
-
-		// Bind Sources to buffer. Use placeholder Black Texture if source is bad.
-		if (i < p_source_textures.size()) {
-			src_textures[i] = get_texture(p_source_textures[i]);
-			if (!src_textures[i]) {
-				src_textures[i] = get_texture(default_gl_textures[DEFAULT_GL_TEXTURE_WHITE]);
-			}
-		} else {
-			src_textures[i] = get_texture(default_gl_textures[DEFAULT_GL_TEXTURE_WHITE]);
-		}
-		int shift = i == 0 ? 0 : GLES3::Config::get_singleton()->max_texture_image_units - i;
-		glActiveTexture(GL_TEXTURE0 + shift);
-		glBindTexture(GL_TEXTURE_2D, src_textures[i]->tex_id);
-
-		i += 1;
-	}
-
-	bool success = material_storage->shaders.tex_blit_shader.version_bind_shader(version, variant, specialization);
-	if (!success) {
-		return;
-	}
-
-	// Calculates the Rects Offset & Size in UV space for Shader to scale Vertex Quad correctly
-	Vector3 size = texture_get_size(p_textures[0]);
-	Vector2 offset = Vector2(p_rect.position.x / size.x, p_rect.position.y / size.y);
-	Vector2 rect_size = Vector2(p_rect.size.x / size.x, p_rect.size.y / size.y);
-	Vector2i vp_size = Vector2i(tar_textures[0]->alloc_width, tar_textures[0]->alloc_height);
-	if (p_to_mipmap != 0) {
-		vp_size.x >>= p_to_mipmap;
-		vp_size.y >>= p_to_mipmap;
-	}
-
-	glViewport(0, 0, vp_size.x, vp_size.y);
-
-	material_storage->shaders.tex_blit_shader.version_set_uniform(TexBlitShaderGLES3::CONVERT_TO_SRGB, convert_to_srgb_mask, version, variant, specialization);
-	material_storage->shaders.tex_blit_shader.version_set_uniform(TexBlitShaderGLES3::SIZE, rect_size, version, variant, specialization);
-	material_storage->shaders.tex_blit_shader.version_set_uniform(TexBlitShaderGLES3::OFFSET, offset, version, variant, specialization);
-	material_storage->shaders.tex_blit_shader.version_set_uniform(TexBlitShaderGLES3::MODULATE, p_modulate, version, variant, specialization);
-	material_storage->shaders.tex_blit_shader.version_set_uniform(TexBlitShaderGLES3::TIME, RasterizerGLES3::get_singleton()->get_total_time(), version, variant, specialization);
-
-	// Set Blend_Mode correctly
-	GLES3::TexBlitShaderData::BlendMode blend_mode = m->shader_data->blend_mode;
-	glEnable(GL_BLEND);
-	switch (blend_mode) {
-		case GLES3::TexBlitShaderData::BLEND_MODE_ADD:
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFuncSeparate(GL_ONE, GL_ONE, GL_ONE, GL_ONE);
-			break;
-
-		case GLES3::TexBlitShaderData::BLEND_MODE_SUB:
-			glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-			glBlendFuncSeparate(GL_ONE, GL_ONE, GL_ONE, GL_ONE);
-			break;
-
-		case GLES3::TexBlitShaderData::BLEND_MODE_MIX:
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-			break;
-
-		case GLES3::TexBlitShaderData::BLEND_MODE_MUL:
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFuncSeparate(GL_DST_COLOR, GL_ZERO, GL_DST_ALPHA, GL_ZERO);
-			break;
-
-		case GLES3::TexBlitShaderData::BLEND_MODE_DISABLED:
-			glDisable(GL_BLEND);
-			break;
-	}
-
-	glDrawBuffers(draw_buffers.size(), draw_buffers.ptr());
-
-	// DRAW!!
-	glBindVertexArray(tex_blit_quad_array);
-	glDrawArrays(GL_TRIANGLES, 0, 6);
-	glBindVertexArray(0);
-
-	// Reset to system FBO
-	glBindFramebuffer(GL_FRAMEBUFFER, GLES3::TextureStorage::system_fbo);
-}
-
 void TextureStorage::texture_2d_placeholder_initialize(RID p_texture) {
 	texture_2d_initialize(p_texture, texture_2d_placeholder);
 }
 
-void TextureStorage::texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) {
-	if (p_layered_type == RSE::TEXTURE_LAYERED_2D_ARRAY) {
+void TextureStorage::texture_2d_layered_placeholder_initialize(RID p_texture, RS::TextureLayeredType p_layered_type) {
+	if (p_layered_type == RS::TEXTURE_LAYERED_2D_ARRAY) {
 		texture_2d_layered_initialize(p_texture, texture_2d_array_placeholder, p_layered_type);
 	} else {
 		texture_2d_layered_initialize(p_texture, cubemap_placeholder, p_layered_type);
@@ -1523,7 +1259,7 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 
 	Ref<Image> image;
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		// OpenGL 3.3 supports glGetTexImage which is faster and simpler than glReadPixels.
 		// It also allows for reading compressed textures, mipmaps, and more formats.
 		Vector<uint8_t> data;
@@ -1566,7 +1302,7 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 	}
 #endif // GL_API_ENABLED
 #ifdef GLES_API_ENABLED
-	if (!RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (!RasterizerGLES3::is_gles_over_gl()) {
 		Vector<uint8_t> data;
 
 		// On web and mobile we always read an RGBA8 image with no mipmaps.
@@ -1801,17 +1537,6 @@ Vector<Ref<Image>> TextureStorage::texture_3d_get(RID p_texture) const {
 	return ret;
 }
 
-void TextureStorage::texture_drawable_generate_mipmaps(RID p_texture) {
-	Texture *texture = get_texture(p_texture);
-	Vector3i size = texture_get_size(p_texture);
-	CopyEffects::get_singleton()->bilinear_blur(texture->tex_id, texture->mipmaps, Rect2i(0, 0, size.x, size.y));
-}
-
-RID TextureStorage::texture_drawable_get_default_material() const {
-	// This should never be called before DrawableTexture stuff is initialized.
-	return tex_blit_shader.default_material;
-}
-
 void TextureStorage::texture_replace(RID p_texture, RID p_by_texture) {
 	Texture *tex_to = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex_to);
@@ -1884,7 +1609,7 @@ String TextureStorage::texture_get_path(RID p_texture) const {
 	return texture->path;
 }
 
-void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) {
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(texture);
 
@@ -1892,10 +1617,10 @@ void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RenderingServ
 	texture->detect_3d_callback_ud = p_userdata;
 }
 
-void TextureStorage::texture_set_detect_srgb_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_srgb_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) {
 }
 
-void TextureStorage::texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) {
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(texture);
 
@@ -1903,7 +1628,7 @@ void TextureStorage::texture_set_detect_normal_callback(RID p_texture, Rendering
 	texture->detect_normal_callback_ud = p_userdata;
 }
 
-void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) {
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(texture);
 
@@ -1911,19 +1636,19 @@ void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, Render
 	texture->detect_roughness_callback_ud = p_userdata;
 }
 
-void TextureStorage::texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) {
+void TextureStorage::texture_debug_usage(List<RS::TextureInfo> *r_info) {
 	for (const RID &rid : texture_owner.get_owned_list()) {
 		Texture *t = texture_owner.get_or_null(rid);
 		if (!t) {
 			continue;
 		}
-		RenderingServerTypes::TextureInfo tinfo;
+		RS::TextureInfo tinfo;
 		tinfo.path = t->path;
 		tinfo.format = t->format;
 		tinfo.width = t->alloc_width;
 		tinfo.height = t->alloc_height;
 		tinfo.bytes = t->total_data_size;
-		tinfo.type = static_cast<RSE::TextureType>(t->type);
+		tinfo.type = static_cast<RenderingServer::TextureType>(t->type);
 
 		switch (t->type) {
 			case Texture::TYPE_3D:
@@ -1961,7 +1686,7 @@ Size2 TextureStorage::texture_size_with_proxy(RID p_texture) {
 	}
 }
 
-void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type) {
+void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type) {
 }
 
 RID TextureStorage::texture_get_rd_texture(RID p_texture, bool p_srgb) const {
@@ -2003,7 +1728,7 @@ void TextureStorage::_texture_set_data(RID p_texture, const Ref<Image> &p_image,
 	bool needs_decompress = texture->resize_to_po2;
 
 	// Support for RGTC-compressed Texture Arrays isn't mandated by GLES3/WebGL.
-	if (!RasterizerUtilGLES3::is_gles_over_gl() && texture->target == GL_TEXTURE_2D_ARRAY) {
+	if (!RasterizerGLES3::is_gles_over_gl() && texture->target == GL_TEXTURE_2D_ARRAY) {
 		if (p_image->get_format() == Image::FORMAT_RGTC_R || p_image->get_format() == Image::FORMAT_RGTC_RG) {
 			needs_decompress = true;
 		}
@@ -2035,12 +1760,12 @@ void TextureStorage::_texture_set_data(RID p_texture, const Ref<Image> &p_image,
 
 	// Set filtering and repeat state to default.
 	if (mipmaps > 1) {
-		texture->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
+		texture->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
 	} else {
-		texture->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+		texture->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
 	}
 
-	texture->gl_set_repeat(RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
+	texture->gl_set_repeat(RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
 
 	int w = img->get_width();
 	int h = img->get_height();
@@ -2115,12 +1840,12 @@ void TextureStorage::_texture_set_3d_data(RID p_texture, const Vector<Ref<Image>
 
 	// Set filtering and repeat state to default.
 	if (texture->mipmaps > 1) {
-		texture->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
+		texture->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
 	} else {
-		texture->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+		texture->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
 	}
 
-	texture->gl_set_repeat(RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
+	texture->gl_set_repeat(RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
 
 	Vector<Ref<Image>> images;
 	images.resize(p_data.size());
@@ -2175,7 +1900,7 @@ void TextureStorage::_texture_set_swizzle(GLES3::Texture *p_texture, Image::Form
 #ifndef WEB_ENABLED
 	switch (p_texture->format) {
 		case Image::FORMAT_L8: {
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_R, GL_RED);
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_G, GL_RED);
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_B, GL_RED);
@@ -2188,7 +1913,7 @@ void TextureStorage::_texture_set_swizzle(GLES3::Texture *p_texture, Image::Form
 			}
 		} break;
 		case Image::FORMAT_LA8: {
-			if (RasterizerUtilGLES3::is_gles_over_gl()) {
+			if (RasterizerGLES3::is_gles_over_gl()) {
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_R, GL_RED);
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_G, GL_RED);
 				glTexParameteri(p_texture->target, GL_TEXTURE_SWIZZLE_B, GL_RED);
@@ -2358,7 +2083,7 @@ void TextureStorage::update_texture_atlas() {
 			si.pixel_size = Size2i(src_tex->width, src_tex->height);
 
 			if (base_size < (uint32_t)si.size.width) {
-				base_size = Math::nearest_power_of_2_templated(si.size.width);
+				base_size = nearest_power_of_2_templated(si.size.width);
 			}
 
 			si.texture = E.key;
@@ -2428,7 +2153,7 @@ void TextureStorage::update_texture_atlas() {
 		}
 
 		texture_atlas.size.width = base_size * border;
-		texture_atlas.size.height = Math::nearest_power_of_2_templated(atlas_height * border);
+		texture_atlas.size.height = nearest_power_of_2_templated(atlas_height * border);
 
 		for (int i = 0; i < item_count; i++) {
 			TextureAtlas::Texture *t = texture_atlas.textures.getptr(items[i].texture);
@@ -2504,7 +2229,7 @@ void TextureStorage::decal_initialize(RID p_rid) {
 void TextureStorage::decal_set_size(RID p_decal, const Vector3 &p_size) {
 }
 
-void TextureStorage::decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) {
+void TextureStorage::decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) {
 }
 
 void TextureStorage::decal_set_emission_energy(RID p_decal, float p_energy) {
@@ -2604,8 +2329,8 @@ void TextureStorage::_update_render_target_color(RenderTarget *rt) {
 				glTexImage2D(texture_target, 0, rt->color_internal_format, rt->size.x, rt->size.y, 0, rt->color_format, rt->color_type, nullptr);
 			}
 
-			texture->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
-			texture->gl_set_repeat(RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			texture->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+			texture->gl_set_repeat(RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 			GLES3::Utilities::get_singleton()->texture_allocated_data(rt->color, rt->size.x * rt->size.y * rt->view_count * rt->color_format_size, "Render target color texture");
 		}
@@ -2854,8 +2579,8 @@ void TextureStorage::_clear_render_target(RenderTarget *rt) {
 			tex->active = false;
 			tex->render_target = nullptr;
 			tex->is_render_target = false;
-			tex->gl_set_filter(RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX);
-			tex->gl_set_repeat(RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX);
+			tex->gl_set_filter(RS::CANVAS_ITEM_TEXTURE_FILTER_MAX);
+			tex->gl_set_repeat(RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX);
 		}
 	} else {
 		Texture *tex = get_texture(rt->overridden.color);
@@ -3198,7 +2923,7 @@ void TextureStorage::render_target_clear_used(RID p_render_target) {
 	rt->used_in_frame = false;
 }
 
-void TextureStorage::render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) {
+void TextureStorage::render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 	ERR_FAIL_COND(rt->direct_to_screen);
@@ -3215,9 +2940,9 @@ void TextureStorage::render_target_set_msaa(RID p_render_target, RSE::ViewportMS
 	}
 }
 
-RSE::ViewportMSAA TextureStorage::render_target_get_msaa(RID p_render_target) const {
+RS::ViewportMSAA TextureStorage::render_target_get_msaa(RID p_render_target) const {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, RSE::VIEWPORT_MSAA_DISABLED);
+	ERR_FAIL_NULL_V(rt, RS::VIEWPORT_MSAA_DISABLED);
 
 	return rt->msaa;
 }
@@ -3346,7 +3071,7 @@ GLuint TextureStorage::render_target_get_depth(RID p_render_target) const {
 
 bool TextureStorage::render_target_get_depth_has_stencil(RID p_render_target) const {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, false);
+	ERR_FAIL_NULL_V(rt, 0);
 
 	return rt->depth_has_stencil;
 }
@@ -3365,7 +3090,7 @@ bool TextureStorage::render_target_is_reattach_textures(RID p_render_target) con
 	return rt->reattach_textures;
 }
 
-void TextureStorage::render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) {
+void TextureStorage::render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 	if (rt->sdf_oversize == p_size && rt->sdf_scale == p_scale) {
@@ -3382,16 +3107,16 @@ Rect2i TextureStorage::_render_target_get_sdf_rect(const RenderTarget *rt) const
 	Size2i margin;
 	int scale;
 	switch (rt->sdf_oversize) {
-		case RSE::VIEWPORT_SDF_OVERSIZE_100_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_100_PERCENT: {
 			scale = 100;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_120_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_120_PERCENT: {
 			scale = 120;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_150_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_150_PERCENT: {
 			scale = 150;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_200_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_200_PERCENT: {
 			scale = 200;
 		} break;
 		default: {
@@ -3464,13 +3189,13 @@ void TextureStorage::_render_target_allocate_sdf(RenderTarget *rt) {
 
 	int scale;
 	switch (rt->sdf_scale) {
-		case RSE::VIEWPORT_SDF_SCALE_100_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_100_PERCENT: {
 			scale = 100;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_50_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_50_PERCENT: {
 			scale = 50;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_25_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_25_PERCENT: {
 			scale = 25;
 		} break;
 		default: {
@@ -3556,13 +3281,13 @@ void TextureStorage::render_target_sdf_process(RID p_render_target) {
 	bool shrink = false;
 
 	switch (rt->sdf_scale) {
-		case RSE::VIEWPORT_SDF_SCALE_50_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_50_PERCENT: {
 			size[0] >>= 1;
 			size[1] >>= 1;
 			shift = 1;
 			shrink = true;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_25_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_25_PERCENT: {
 			size[0] >>= 2;
 			size[1] >>= 2;
 			shift = 2;
@@ -3600,7 +3325,7 @@ void TextureStorage::render_target_sdf_process(RID p_render_target) {
 
 	// Process
 
-	int stride = Math::nearest_power_of_2_templated(MAX(size.width, size.height) / 2);
+	int stride = nearest_power_of_2_templated(MAX(size.width, size.height) / 2);
 
 	variant = CanvasSdfShaderGLES3::MODE_PROCESS;
 	success = sdf_shader.shader.version_bind_shader(sdf_shader.shader_version, variant);
diff --git a/engine/drivers/gles3/storage/texture_storage.h b/engine/drivers/gles3/storage/texture_storage.h
index 368dd037..a77c361d 100644
--- a/engine/drivers/gles3/storage/texture_storage.h
+++ b/engine/drivers/gles3/storage/texture_storage.h
@@ -32,16 +32,16 @@
 
 #ifdef GLES3_ENABLED
 
+#include "platform_gl.h"
+
+#include "config.h"
 #include "core/io/image.h"
-#include "core/templates/rb_map.h"
+#include "core/os/os.h"
 #include "core/templates/rid_owner.h"
-#include "drivers/gles3/shaders/canvas_sdf.glsl.gen.h"
-#include "drivers/gles3/storage/config.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/storage/texture_storage.h"
 
-#include <platform_gl.h>
+#include "drivers/gles3/shaders/canvas_sdf.glsl.gen.h"
 
 namespace GLES3 {
 
@@ -147,8 +147,8 @@ struct CanvasTexture {
 	Color specular_color = Color(1, 1, 1, 1);
 	float shininess = 1.0;
 
-	RSE::CanvasItemTextureFilter texture_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
-	RSE::CanvasItemTextureRepeat texture_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
+	RS::CanvasItemTextureFilter texture_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
+	RS::CanvasItemTextureRepeat texture_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
 };
 
 struct RenderTarget;
@@ -181,8 +181,7 @@ struct Texture {
 	};
 
 	Type type = TYPE_2D;
-	RSE::TextureLayeredType layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY;
-	RSE::TextureDrawableFormat drawable_type = RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8;
+	RS::TextureLayeredType layered_type = RS::TEXTURE_LAYERED_2D_ARRAY;
 
 	GLenum target = GL_TEXTURE_2D;
 	GLenum gl_format_cache = 0;
@@ -207,13 +206,13 @@ struct Texture {
 
 	bool redraw_if_visible = false;
 
-	RenderingServerTypes::TextureDetectCallback detect_3d_callback = nullptr;
+	RS::TextureDetectCallback detect_3d_callback = nullptr;
 	void *detect_3d_callback_ud = nullptr;
 
-	RenderingServerTypes::TextureDetectCallback detect_normal_callback = nullptr;
+	RS::TextureDetectCallback detect_normal_callback = nullptr;
 	void *detect_normal_callback_ud = nullptr;
 
-	RenderingServerTypes::TextureDetectRoughnessCallback detect_roughness_callback = nullptr;
+	RS::TextureDetectRoughnessCallback detect_roughness_callback = nullptr;
 	void *detect_roughness_callback_ud = nullptr;
 
 	CanvasTexture *canvas_texture = nullptr;
@@ -249,7 +248,7 @@ struct Texture {
 	}
 
 	// texture state
-	void gl_set_filter(RSE::CanvasItemTextureFilter p_filter) {
+	void gl_set_filter(RS::CanvasItemTextureFilter p_filter) {
 		if (p_filter == state_filter) {
 			return;
 		}
@@ -260,21 +259,21 @@ struct Texture {
 		GLint max_lod = 0;
 		GLfloat anisotropy = 1.0f;
 		switch (state_filter) {
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST: {
 				pmin = GL_NEAREST;
 				pmag = GL_NEAREST;
 				max_lod = 0;
 			} break;
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR: {
 				pmin = GL_LINEAR;
 				pmag = GL_LINEAR;
 				max_lod = 0;
 			} break;
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC: {
 				anisotropy = config->anisotropic_level;
 			};
 				[[fallthrough]];
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
 				pmag = GL_NEAREST;
 				if (mipmaps <= 1) {
 					pmin = GL_NEAREST;
@@ -287,11 +286,11 @@ struct Texture {
 					max_lod = mipmaps - 1;
 				}
 			} break;
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC: {
 				anisotropy = config->anisotropic_level;
 			};
 				[[fallthrough]];
-			case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: {
+			case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: {
 				pmag = GL_LINEAR;
 				if (mipmaps <= 1) {
 					pmin = GL_LINEAR;
@@ -316,20 +315,20 @@ struct Texture {
 			glTexParameterf(target, _GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy);
 		}
 	}
-	void gl_set_repeat(RSE::CanvasItemTextureRepeat p_repeat) {
+	void gl_set_repeat(RS::CanvasItemTextureRepeat p_repeat) {
 		if (p_repeat == state_repeat) {
 			return;
 		}
 		state_repeat = p_repeat;
 		GLenum prep = GL_CLAMP_TO_EDGE;
 		switch (state_repeat) {
-			case RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: {
+			case RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: {
 				prep = GL_CLAMP_TO_EDGE;
 			} break;
-			case RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: {
+			case RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: {
 				prep = GL_REPEAT;
 			} break;
-			case RSE::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: {
+			case RS::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: {
 				prep = GL_MIRRORED_REPEAT;
 			} break;
 			default: {
@@ -342,8 +341,8 @@ struct Texture {
 	}
 
 private:
-	RSE::CanvasItemTextureFilter state_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX;
-	RSE::CanvasItemTextureRepeat state_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
+	RS::CanvasItemTextureFilter state_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_MAX;
+	RS::CanvasItemTextureRepeat state_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX;
 };
 
 struct RenderTarget {
@@ -373,8 +372,8 @@ struct RenderTarget {
 	GLuint sdf_texture_write_fb = 0;
 	GLuint sdf_texture_process[2] = { 0, 0 };
 	GLuint sdf_texture_read = 0;
-	RSE::ViewportSDFOversize sdf_oversize = RSE::VIEWPORT_SDF_OVERSIZE_120_PERCENT;
-	RSE::ViewportSDFScale sdf_scale = RSE::VIEWPORT_SDF_SCALE_50_PERCENT;
+	RS::ViewportSDFOversize sdf_oversize = RS::VIEWPORT_SDF_OVERSIZE_120_PERCENT;
+	RS::ViewportSDFScale sdf_scale = RS::VIEWPORT_SDF_SCALE_50_PERCENT;
 	Size2i process_size;
 	bool sdf_enabled = false;
 
@@ -382,7 +381,7 @@ struct RenderTarget {
 	bool direct_to_screen = false;
 
 	bool used_in_frame = false;
-	RSE::ViewportMSAA msaa = RSE::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportMSAA msaa = RS::VIEWPORT_MSAA_DISABLED;
 	bool reattach_textures = false;
 
 	Rect2i render_region;
@@ -488,25 +487,9 @@ private:
 		RID shader_version;
 	} sdf_shader;
 
-	/* Texture Blit Shader API */
-
-	struct TexBlitShader {
-		bool initialized = false;
-		RID default_shader;
-		RID default_material;
-		RID default_shader_version;
-	} tex_blit_shader;
-
-	GLuint tex_blit_fbo;
-	GLuint tex_blit_quad;
-	GLuint tex_blit_quad_array;
-
 public:
 	static TextureStorage *get_singleton();
 
-	void _tex_blit_shader_initialize();
-	void _tex_blit_shader_free();
-
 	TextureStorage();
 	virtual ~TextureStorage();
 
@@ -523,11 +506,11 @@ public:
 	virtual void canvas_texture_initialize(RID p_rid) override;
 	virtual void canvas_texture_free(RID p_rid) override;
 
-	virtual void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) override;
+	virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) override;
 	virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) override;
 
-	virtual void canvas_texture_set_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) override;
-	virtual void canvas_texture_set_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) override;
+	virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) override;
+	virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) override;
 
 	/* Texture API */
 
@@ -548,13 +531,12 @@ public:
 	virtual void texture_free(RID p_rid) override;
 
 	virtual void texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) override;
-	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) override;
+	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) override;
 	virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) override;
 	virtual void texture_external_initialize(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) override;
 	virtual void texture_proxy_initialize(RID p_texture, RID p_base) override; //all slices, then all the mipmaps, must be coherent
-	virtual void texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) override;
 
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override;
+	virtual RID texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RS::TextureLayeredType p_layered_type = RS::TEXTURE_LAYERED_2D_ARRAY) override;
 
 	virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) override;
 	virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) override;
@@ -562,8 +544,6 @@ public:
 	virtual void texture_proxy_update(RID p_proxy, RID p_base) override;
 	void texture_remap_proxies(RID p_from_texture, RID p_to_texture);
 
-	virtual void texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) override;
-
 	Ref<Image> texture_2d_placeholder;
 	Vector<Ref<Image>> texture_2d_array_placeholder;
 	Vector<Ref<Image>> cubemap_placeholder;
@@ -571,34 +551,31 @@ public:
 
 	//these two APIs can be used together or in combination with the others.
 	virtual void texture_2d_placeholder_initialize(RID p_texture) override;
-	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) override;
+	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) override;
 	virtual void texture_3d_placeholder_initialize(RID p_texture) override;
 
 	virtual Ref<Image> texture_2d_get(RID p_texture) const override;
 	virtual Ref<Image> texture_2d_layer_get(RID p_texture, int p_layer) const override;
 	virtual Vector<Ref<Image>> texture_3d_get(RID p_texture) const override;
 
-	virtual void texture_drawable_generate_mipmaps(RID p_texture) override;
-	virtual RID texture_drawable_get_default_material() const override;
-
 	virtual void texture_replace(RID p_texture, RID p_by_texture) override;
 	virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) override;
 
 	virtual void texture_set_path(RID p_texture, const String &p_path) override;
 	virtual String texture_get_path(RID p_texture) const override;
 
-	virtual void texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override;
-	void texture_set_detect_srgb_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata);
-	virtual void texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override;
-	virtual void texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) override;
+	virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override;
+	void texture_set_detect_srgb_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata);
+	virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override;
+	virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) override;
 
-	virtual void texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) override;
+	virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) override;
 
 	virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) override;
 
 	virtual Size2 texture_size_with_proxy(RID p_proxy) override;
 
-	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override;
+	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type = RS::TEXTURE_LAYERED_2D_ARRAY) override;
 	virtual RID texture_get_rd_texture(RID p_texture, bool p_srgb = false) const override;
 	virtual uint64_t texture_get_native_handle(RID p_texture, bool p_srgb = false) const override;
 
@@ -637,7 +614,7 @@ public:
 	virtual void decal_free(RID p_rid) override {}
 
 	virtual void decal_set_size(RID p_decal, const Vector3 &p_size) override;
-	virtual void decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) override;
+	virtual void decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) override;
 	virtual void decal_set_emission_energy(RID p_decal, float p_energy) override;
 	virtual void decal_set_albedo_mix(RID p_decal, float p_mix) override;
 	virtual void decal_set_modulate(RID p_decal, const Color &p_modulate) override;
@@ -679,8 +656,8 @@ public:
 	virtual bool render_target_get_direct_to_screen(RID p_render_target) const override;
 	virtual bool render_target_was_used(RID p_render_target) const override;
 	void render_target_clear_used(RID p_render_target);
-	virtual void render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) override;
-	virtual RSE::ViewportMSAA render_target_get_msaa(RID p_render_target) const override;
+	virtual void render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) override;
+	virtual RS::ViewportMSAA render_target_get_msaa(RID p_render_target) const override;
 	virtual void render_target_set_msaa_needs_resolve(RID p_render_target, bool p_needs_resolve) override {}
 	virtual bool render_target_get_msaa_needs_resolve(RID p_render_target) const override { return false; }
 	virtual void render_target_do_msaa_resolve(RID p_render_target) override {}
@@ -712,7 +689,7 @@ public:
 	void render_target_set_reattach_textures(RID p_render_target, bool p_reattach_textures) const;
 	bool render_target_is_reattach_textures(RID p_render_target) const;
 
-	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) override;
+	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) override;
 	virtual Rect2i render_target_get_sdf_rect(RID p_render_target) const override;
 	GLuint render_target_get_sdf_texture(RID p_render_target);
 	GLuint render_target_get_sdf_framebuffer(RID p_render_target);
@@ -724,10 +701,10 @@ public:
 	void render_target_clear_back_buffer(RID p_render_target, const Rect2i &p_region, const Color &p_color);
 	void render_target_gen_back_buffer_mipmaps(RID p_render_target, const Rect2i &p_region);
 
-	virtual void render_target_set_vrs_mode(RID p_render_target, RSE::ViewportVRSMode p_mode) override {}
-	virtual RSE::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override { return RSE::VIEWPORT_VRS_DISABLED; }
-	virtual void render_target_set_vrs_update_mode(RID p_render_target, RSE::ViewportVRSUpdateMode p_mode) override {}
-	virtual RSE::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override { return RSE::VIEWPORT_VRS_UPDATE_DISABLED; }
+	virtual void render_target_set_vrs_mode(RID p_render_target, RS::ViewportVRSMode p_mode) override {}
+	virtual RS::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override { return RS::VIEWPORT_VRS_DISABLED; }
+	virtual void render_target_set_vrs_update_mode(RID p_render_target, RS::ViewportVRSUpdateMode p_mode) override {}
+	virtual RS::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override { return RS::VIEWPORT_VRS_UPDATE_DISABLED; }
 	virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {}
 	virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); }
 
@@ -740,12 +717,6 @@ public:
 	virtual void render_target_set_render_region(RID p_render_target, const Rect2i &p_render_region) override;
 	virtual Rect2i render_target_get_render_region(RID p_render_target) const override;
 
-	virtual void render_target_set_subsampled_enabled(RID p_render_target, bool p_enabled) override {}
-	virtual bool render_target_is_subsampled_enabled(RID p_render_target) const override { return false; }
-
-	virtual void render_target_set_subsampled_allowed(RID p_render_target, bool p_allowed) override {}
-	virtual bool render_target_is_subsampled_allowed(RID p_render_target) const override { return false; }
-
 	virtual RID render_target_get_texture(RID p_render_target) override;
 
 	virtual void render_target_set_velocity_target_size(RID p_render_target, const Size2i &p_target_size) override;
diff --git a/engine/drivers/gles3/storage/utilities.cpp b/engine/drivers/gles3/storage/utilities.cpp
index 383d38c9..b096a8a7 100644
--- a/engine/drivers/gles3/storage/utilities.cpp
+++ b/engine/drivers/gles3/storage/utilities.cpp
@@ -28,22 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "utilities.h"
-
 #ifdef GLES3_ENABLED
 
-#include "core/config/engine.h"
-#include "core/os/os.h"
-#include "drivers/gles3/storage/config.h"
-#include "drivers/gles3/storage/light_storage.h"
-#include "drivers/gles3/storage/material_storage.h"
-#include "drivers/gles3/storage/mesh_storage.h"
-#include "drivers/gles3/storage/particles_storage.h"
-#include "drivers/gles3/storage/texture_storage.h"
+#include "utilities.h"
 
-#ifdef GL_API_ENABLED
-#include "drivers/gles3/rasterizer_util_gles3.h"
-#endif
+#include "../rasterizer_gles3.h"
+#include "config.h"
+#include "light_storage.h"
+#include "material_storage.h"
+#include "mesh_storage.h"
+#include "particles_storage.h"
+#include "texture_storage.h"
 
 using namespace GLES3;
 
@@ -150,25 +145,25 @@ Vector<uint8_t> Utilities::buffer_get_data(GLenum p_target, GLuint p_buffer, uin
 
 /* INSTANCES */
 
-RSE::InstanceType Utilities::get_base_type(RID p_rid) const {
+RS::InstanceType Utilities::get_base_type(RID p_rid) const {
 	if (GLES3::MeshStorage::get_singleton()->owns_mesh(p_rid)) {
-		return RSE::INSTANCE_MESH;
+		return RS::INSTANCE_MESH;
 	} else if (GLES3::MeshStorage::get_singleton()->owns_multimesh(p_rid)) {
-		return RSE::INSTANCE_MULTIMESH;
+		return RS::INSTANCE_MULTIMESH;
 	} else if (GLES3::LightStorage::get_singleton()->owns_light(p_rid)) {
-		return RSE::INSTANCE_LIGHT;
+		return RS::INSTANCE_LIGHT;
 	} else if (GLES3::LightStorage::get_singleton()->owns_lightmap(p_rid)) {
-		return RSE::INSTANCE_LIGHTMAP;
+		return RS::INSTANCE_LIGHTMAP;
 	} else if (GLES3::ParticlesStorage::get_singleton()->owns_particles(p_rid)) {
-		return RSE::INSTANCE_PARTICLES;
+		return RS::INSTANCE_PARTICLES;
 	} else if (GLES3::LightStorage::get_singleton()->owns_reflection_probe(p_rid)) {
-		return RSE::INSTANCE_REFLECTION_PROBE;
+		return RS::INSTANCE_REFLECTION_PROBE;
 	} else if (GLES3::ParticlesStorage::get_singleton()->owns_particles_collision(p_rid)) {
-		return RSE::INSTANCE_PARTICLES_COLLISION;
+		return RS::INSTANCE_PARTICLES_COLLISION;
 	} else if (owns_visibility_notifier(p_rid)) {
-		return RSE::INSTANCE_VISIBLITY_NOTIFIER;
+		return RS::INSTANCE_VISIBLITY_NOTIFIER;
 	}
-	return RSE::INSTANCE_NONE;
+	return RS::INSTANCE_NONE;
 }
 
 bool Utilities::free(RID p_rid) {
@@ -330,7 +325,7 @@ void Utilities::capture_timestamp(const String &p_name) {
 	ERR_FAIL_COND(frames[frame].timestamp_count >= max_timestamp_query_elements);
 
 #ifdef GL_API_ENABLED
-	if (RasterizerUtilGLES3::is_gles_over_gl()) {
+	if (RasterizerGLES3::is_gles_over_gl()) {
 		glQueryCounter(frames[frame].queries[frames[frame].timestamp_count], GL_TIMESTAMP);
 	}
 #endif // GL_API_ENABLED
@@ -344,7 +339,7 @@ void Utilities::_capture_timestamps_begin() {
 	// frame is incremented at the end of the frame so this gives us the queries for frame - 2. By then they should be ready.
 	if (frames[frame].timestamp_count) {
 #ifdef GL_API_ENABLED
-		if (RasterizerUtilGLES3::is_gles_over_gl()) {
+		if (RasterizerGLES3::is_gles_over_gl()) {
 			for (uint32_t i = 0; i < frames[frame].timestamp_count; i++) {
 				uint64_t temp = 0;
 				glGetQueryObjectui64v(frames[frame].queries[i], GL_QUERY_RESULT, &temp);
@@ -436,12 +431,12 @@ bool Utilities::has_os_feature(const String &p_feature) const {
 void Utilities::update_memory_info() {
 }
 
-uint64_t Utilities::get_rendering_info(RSE::RenderingInfo p_info) {
-	if (p_info == RSE::RENDERING_INFO_TEXTURE_MEM_USED) {
+uint64_t Utilities::get_rendering_info(RS::RenderingInfo p_info) {
+	if (p_info == RS::RENDERING_INFO_TEXTURE_MEM_USED) {
 		return texture_mem_cache + render_buffer_mem_cache; // Add render buffer memory to our texture mem.
-	} else if (p_info == RSE::RENDERING_INFO_BUFFER_MEM_USED) {
+	} else if (p_info == RS::RENDERING_INFO_BUFFER_MEM_USED) {
 		return buffer_mem_cache;
-	} else if (p_info == RSE::RENDERING_INFO_VIDEO_MEM_USED) {
+	} else if (p_info == RS::RENDERING_INFO_VIDEO_MEM_USED) {
 		return texture_mem_cache + buffer_mem_cache + render_buffer_mem_cache;
 	}
 	return 0;
@@ -459,8 +454,8 @@ String Utilities::get_video_adapter_vendor() const {
 	return rendering_device_vendor.trim_suffix(" Corporation");
 }
 
-RenderingDeviceEnums::DeviceType Utilities::get_video_adapter_type() const {
-	return RenderingDeviceEnums::DeviceType::DEVICE_TYPE_OTHER;
+RenderingDevice::DeviceType Utilities::get_video_adapter_type() const {
+	return RenderingDevice::DeviceType::DEVICE_TYPE_OTHER;
 }
 
 String Utilities::get_video_adapter_api_version() const {
diff --git a/engine/drivers/gles3/storage/utilities.h b/engine/drivers/gles3/storage/utilities.h
index a0b953b5..9e40d596 100644
--- a/engine/drivers/gles3/storage/utilities.h
+++ b/engine/drivers/gles3/storage/utilities.h
@@ -32,10 +32,9 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/utilities.h"
 
-#include <platform_gl.h>
+#include "platform_gl.h"
 
 namespace GLES3 {
 
@@ -156,7 +155,7 @@ public:
 
 	/* INSTANCES */
 
-	virtual RSE::InstanceType get_base_type(RID p_rid) const override;
+	virtual RS::InstanceType get_base_type(RID p_rid) const override;
 	virtual bool free(RID p_rid) override;
 
 	/* DEPENDENCIES */
@@ -219,10 +218,10 @@ public:
 
 	virtual void update_memory_info() override;
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) override;
+	virtual uint64_t get_rendering_info(RS::RenderingInfo p_info) override;
 	virtual String get_video_adapter_name() const override;
 	virtual String get_video_adapter_vendor() const override;
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const override;
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const override;
 	virtual String get_video_adapter_api_version() const override;
 
 	virtual Size2i get_maximum_viewport_size() const override;
diff --git a/engine/drivers/metal/SCsub b/engine/drivers/metal/SCsub
index 8f853630..8d4bdffd 100644
--- a/engine/drivers/metal/SCsub
+++ b/engine/drivers/metal/SCsub
@@ -3,9 +3,6 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-# If we're using Metal, we need metal-cpp.
-env.Prepend(CPPPATH=["#thirdparty/metal-cpp/"])
-
 env_metal = env.Clone()
 
 # Thirdparty source files
@@ -22,15 +19,9 @@ thirdparty_sources = [
     "spirv_reflect.cpp",
     "spirv_glsl.cpp",
     "spirv_cross_parsed_ir.cpp",
-    "spirv_cross_util.cpp",
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-# Include metal-cpp
-thirdparty_sources += [
-    "#thirdparty/metal-cpp/metal_cpp.cpp",
-]
-
 env_metal.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 env_metal.Prepend(CPPPATH=[thirdparty_spirv_headers_dir + "include/spirv/unified1"])
 
@@ -56,6 +47,7 @@ env_metal.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
 
 driver_obj = []
 
+env_metal.add_source_files(driver_obj, "*.mm")
 env_metal.add_source_files(driver_obj, "*.cpp")
 env.drivers_sources += driver_obj
 
diff --git a/engine/drivers/metal/metal3_objects.cpp b/engine/drivers/metal/metal3_objects.cpp
deleted file mode 100644
index d0c1f21b..00000000
--- a/engine/drivers/metal/metal3_objects.cpp
+++ /dev/null
@@ -1,1806 +0,0 @@
-/**************************************************************************/
-/*  metal3_objects.cpp                                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-/**************************************************************************/
-/*                                                                        */
-/* Portions of this code were derived from MoltenVK.                      */
-/*                                                                        */
-/* Copyright (c) 2015-2023 The Brenwill Workshop Ltd.                     */
-/* (http://www.brenwill.com)                                              */
-/*                                                                        */
-/* 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                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/**************************************************************************/
-
-#include "metal3_objects.h"
-
-#include "drivers/metal/metal_utils.h"
-#include "drivers/metal/pixel_formats.h"
-#include "drivers/metal/rendering_device_driver_metal3.h"
-#include "drivers/metal/rendering_shader_container_metal.h"
-
-#include <algorithm>
-
-using namespace MTL3;
-
-MDCommandBuffer::MDCommandBuffer(MTL::CommandQueue *p_queue, ::RenderingDeviceDriverMetal *p_device_driver) :
-		_scratch(p_queue->device()), queue(p_queue) {
-	device_driver = p_device_driver;
-	type = MDCommandBufferStateType::None;
-	use_barriers = device_driver->use_barriers;
-	if (use_barriers) {
-		// Already validated availability if use_barriers is true.
-		MTL::Device *device = p_queue->device();
-		NS::SharedPtr<MTL::ResidencySetDescriptor> rs_desc = NS::TransferPtr(MTL::ResidencySetDescriptor::alloc()->init());
-		rs_desc->setInitialCapacity(10);
-		rs_desc->setLabel(MTLSTR("Command Residency Set"));
-		NS::Error *error = nullptr;
-		_frame_state.rs = NS::TransferPtr(device->newResidencySet(rs_desc.get(), &error));
-		CRASH_COND_MSG(error != nullptr, vformat("Failed to create residency set: %s", String(error->localizedDescription()->utf8String())));
-	}
-}
-
-void MDCommandBuffer::begin_label(const char *p_label_name, const Color &p_color) {
-	NS::SharedPtr<NS::String> s = NS::TransferPtr(NS::String::alloc()->init(p_label_name, NS::UTF8StringEncoding));
-	command_buffer()->pushDebugGroup(s.get());
-}
-
-void MDCommandBuffer::end_label() {
-	command_buffer()->popDebugGroup();
-}
-
-void MDCommandBuffer::begin() {
-	DEV_ASSERT(commandBuffer.get() == nullptr && !state_begin);
-	state_begin = true;
-	bzero(pending_after_stages, sizeof(pending_after_stages));
-	bzero(pending_before_queue_stages, sizeof(pending_before_queue_stages));
-	binding_cache.clear();
-	_scratch.reset();
-	release_resources();
-}
-
-MDCommandBuffer::Alloc MDCommandBuffer::allocate_arg_buffer(uint32_t p_size) {
-	return _scratch.allocate(p_size);
-}
-
-void MDCommandBuffer::end() {
-	switch (type) {
-		case MDCommandBufferStateType::None:
-			return;
-		case MDCommandBufferStateType::Render:
-			return render_end_pass();
-		case MDCommandBufferStateType::Compute:
-			return _end_compute_dispatch();
-		case MDCommandBufferStateType::Blit:
-			return _end_blit();
-	}
-}
-
-void MDCommandBuffer::commit() {
-	end();
-	if (use_barriers) {
-		if (_scratch.is_changed()) {
-			Span<MTL::Buffer *const> bufs = _scratch.get_buffers();
-			_frame_state.rs->addAllocations(reinterpret_cast<const MTL::Allocation *const *>(bufs.ptr()), bufs.size());
-			_scratch.clear_changed();
-			_frame_state.rs->commit();
-		}
-	}
-	commandBuffer->commit();
-	commandBuffer.reset();
-	state_begin = false;
-}
-
-MTL::CommandBuffer *MDCommandBuffer::command_buffer() {
-	DEV_ASSERT(state_begin);
-	if (commandBuffer.get() == nullptr) {
-		commandBuffer = NS::RetainPtr(queue->commandBuffer());
-		if (use_barriers) {
-			commandBuffer->useResidencySet(_frame_state.rs.get());
-		}
-	}
-	return commandBuffer.get();
-}
-
-void MDCommandBuffer::_encode_barrier(MTL::CommandEncoder *p_enc) {
-	DEV_ASSERT(p_enc);
-
-	static const MTL::Stages empty_stages[STAGE_MAX] = { 0, 0, 0 };
-	if (memcmp(&pending_before_queue_stages, empty_stages, sizeof(pending_before_queue_stages)) == 0) {
-		return;
-	}
-
-	int stage = STAGE_MAX;
-	// Determine encoder type by checking if it's the current active encoder.
-	if (render.encoder.get() == p_enc && pending_after_stages[STAGE_RENDER] != 0) {
-		stage = STAGE_RENDER;
-	} else if (compute.encoder.get() == p_enc && pending_after_stages[STAGE_COMPUTE] != 0) {
-		stage = STAGE_COMPUTE;
-	} else if (blit.encoder.get() == p_enc && pending_after_stages[STAGE_BLIT] != 0) {
-		stage = STAGE_BLIT;
-	}
-
-	if (stage == STAGE_MAX) {
-		return;
-	}
-
-	p_enc->barrierAfterQueueStages(pending_after_stages[stage], pending_before_queue_stages[stage]);
-	pending_before_queue_stages[stage] = 0;
-	pending_after_stages[stage] = 0;
-}
-
-void MDCommandBuffer::pipeline_barrier(BitField<RDD::PipelineStageBits> p_src_stages,
-		BitField<RDD::PipelineStageBits> p_dst_stages,
-		VectorView<RDD::MemoryAccessBarrier> p_memory_barriers,
-		VectorView<RDD::BufferBarrier> p_buffer_barriers,
-		VectorView<RDD::TextureBarrier> p_texture_barriers,
-		VectorView<RDD::AccelerationStructureBarrier> p_acceleration_structure_barriers) {
-	MTL::Stages after_stages = convert_src_pipeline_stages_to_metal(p_src_stages);
-	if (after_stages == 0) {
-		return;
-	}
-
-	MTL::Stages before_stages = convert_dst_pipeline_stages_to_metal(p_dst_stages);
-	if (before_stages == 0) {
-		return;
-	}
-
-	// Encode intra-encoder memory barrier if an encoder is active for matching stages.
-	if (render.encoder.get() != nullptr) {
-		MTL::RenderStages render_after = static_cast<MTL::RenderStages>(after_stages & (MTL::StageVertex | MTL::StageFragment));
-		MTL::RenderStages render_before = static_cast<MTL::RenderStages>(before_stages & (MTL::StageVertex | MTL::StageFragment));
-		if (render_after != 0 && render_before != 0) {
-			render.encoder->memoryBarrier(MTL::BarrierScopeBuffers | MTL::BarrierScopeTextures, render_after, render_before);
-		}
-	} else if (compute.encoder.get() != nullptr) {
-		if (after_stages & MTL::StageDispatch) {
-			compute.encoder->memoryBarrier(MTL::BarrierScopeBuffers | MTL::BarrierScopeTextures);
-		}
-	}
-	// Blit encoder has no memory barrier API.
-
-	// Also cache for inter-pass barriers based on DESTINATION stages,
-	// since barrierAfterQueueStages is called on the encoder that must wait.
-	if (before_stages & (MTL::StageVertex | MTL::StageFragment)) {
-		pending_after_stages[STAGE_RENDER] |= after_stages;
-		pending_before_queue_stages[STAGE_RENDER] |= before_stages;
-	}
-
-	if (before_stages & MTL::StageDispatch) {
-		pending_after_stages[STAGE_COMPUTE] |= after_stages;
-		pending_before_queue_stages[STAGE_COMPUTE] |= before_stages;
-	}
-
-	if (before_stages & MTL::StageBlit) {
-		pending_after_stages[STAGE_BLIT] |= after_stages;
-		pending_before_queue_stages[STAGE_BLIT] |= before_stages;
-	}
-}
-
-void MDCommandBuffer::bind_pipeline(RDD::PipelineID p_pipeline) {
-	MDPipeline *p = (MDPipeline *)(p_pipeline.id);
-
-	// End current encoder if it is a compute encoder or blit encoder,
-	// as they do not have a defined end boundary in the RDD like render.
-	if (type == MDCommandBufferStateType::Compute) {
-		_end_compute_dispatch();
-	} else if (type == MDCommandBufferStateType::Blit) {
-		_end_blit();
-	}
-
-	if (p->type == MDPipelineType::Render) {
-		DEV_ASSERT(type == MDCommandBufferStateType::Render);
-		MDRenderPipeline *rp = (MDRenderPipeline *)p;
-
-		if (render.encoder.get() == nullptr) {
-			// This error would happen if the render pass failed.
-			ERR_FAIL_NULL_MSG(render.desc.get(), "Render pass descriptor is null.");
-
-			// This condition occurs when there are no attachments when calling render_next_subpass()
-			// and is due to the SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS flag.
-			render.desc->setDefaultRasterSampleCount(static_cast<NS::UInteger>(rp->sample_count));
-
-			render.encoder = NS::RetainPtr(command_buffer()->renderCommandEncoder(render.desc.get()));
-			_encode_barrier(render.encoder.get());
-		}
-
-		if (render.pipeline != rp) {
-			render.dirty.set_flag((RenderState::DirtyFlag)(RenderState::DIRTY_PIPELINE | RenderState::DIRTY_RASTER));
-			// Mark all uniforms as dirty, as variants of a shader pipeline may have a different entry point ABI,
-			// due to setting force_active_argument_buffer_resources = true for spirv_cross::CompilerMSL::Options.
-			// As a result, uniform sets with the same layout will generate redundant binding warnings when
-			// capturing a Metal frame in Xcode.
-			//
-			// If we don't mark as dirty, then some bindings will generate a validation error.
-			// binding_cache.clear();
-			render.mark_uniforms_dirty();
-
-			if (render.pipeline != nullptr && render.pipeline->depth_stencil != rp->depth_stencil) {
-				render.dirty.set_flag(RenderState::DIRTY_DEPTH);
-			}
-			if (rp->raster_state.blend.enabled) {
-				render.dirty.set_flag(RenderState::DIRTY_BLEND);
-			}
-			render.pipeline = rp;
-		}
-	} else if (p->type == MDPipelineType::Compute) {
-		DEV_ASSERT(type == MDCommandBufferStateType::None);
-		type = MDCommandBufferStateType::Compute;
-
-		if (compute.pipeline != p) {
-			compute.dirty.set_flag(ComputeState::DIRTY_PIPELINE);
-			binding_cache.clear();
-			compute.mark_uniforms_dirty();
-			compute.pipeline = (MDComputePipeline *)p;
-		}
-	}
-}
-
-void MDCommandBuffer::mark_push_constants_dirty() {
-	switch (type) {
-		case MDCommandBufferStateType::Render:
-			render.dirty.set_flag(RenderState::DirtyFlag::DIRTY_PUSH);
-			break;
-		case MDCommandBufferStateType::Compute:
-			compute.dirty.set_flag(ComputeState::DirtyFlag::DIRTY_PUSH);
-			break;
-		default:
-			break;
-	}
-}
-
-MTL::BlitCommandEncoder *MDCommandBuffer::_ensure_blit_encoder() {
-	switch (type) {
-		case MDCommandBufferStateType::None:
-			break;
-		case MDCommandBufferStateType::Render:
-			render_end_pass();
-			break;
-		case MDCommandBufferStateType::Compute:
-			_end_compute_dispatch();
-			break;
-		case MDCommandBufferStateType::Blit:
-			return blit.encoder.get();
-	}
-
-	type = MDCommandBufferStateType::Blit;
-	blit.encoder = NS::RetainPtr(command_buffer()->blitCommandEncoder());
-	_encode_barrier(blit.encoder.get());
-
-	return blit.encoder.get();
-}
-
-void MDCommandBuffer::resolve_texture(RDD::TextureID p_src_texture, RDD::TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, RDD::TextureID p_dst_texture, RDD::TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) {
-	MTL::Texture *src_tex = rid::get<MTL::Texture>(p_src_texture);
-	MTL::Texture *dst_tex = rid::get<MTL::Texture>(p_dst_texture);
-
-	NS::SharedPtr<MTL::RenderPassDescriptor> mtlRPD = NS::TransferPtr(MTL::RenderPassDescriptor::alloc()->init());
-	MTL::RenderPassColorAttachmentDescriptor *mtlColorAttDesc = mtlRPD->colorAttachments()->object(0);
-	mtlColorAttDesc->setLoadAction(MTL::LoadActionLoad);
-	mtlColorAttDesc->setStoreAction(MTL::StoreActionMultisampleResolve);
-
-	mtlColorAttDesc->setTexture(src_tex);
-	mtlColorAttDesc->setResolveTexture(dst_tex);
-	mtlColorAttDesc->setLevel(p_src_mipmap);
-	mtlColorAttDesc->setSlice(p_src_layer);
-	mtlColorAttDesc->setResolveLevel(p_dst_mipmap);
-	mtlColorAttDesc->setResolveSlice(p_dst_layer);
-	MTL::RenderCommandEncoder *enc = get_new_render_encoder_with_descriptor(mtlRPD.get());
-	enc->setLabel(MTLSTR("Resolve Image"));
-	enc->endEncoding();
-}
-
-void MDCommandBuffer::clear_color_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, const Color &p_color, const RDD::TextureSubresourceRange &p_subresources) {
-	MTL::Texture *src_tex = rid::get<MTL::Texture>(p_texture);
-
-	if (src_tex->parentTexture()) {
-		// Clear via the parent texture rather than the view.
-		src_tex = src_tex->parentTexture();
-	}
-
-	PixelFormats &pf = device_driver->get_pixel_formats();
-
-	if (pf.isDepthFormat(src_tex->pixelFormat()) || pf.isStencilFormat(src_tex->pixelFormat())) {
-		ERR_FAIL_MSG("invalid: depth or stencil texture format");
-	}
-
-	NS::SharedPtr<MTL::RenderPassDescriptor> desc = NS::TransferPtr(MTL::RenderPassDescriptor::alloc()->init());
-
-	if (p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
-		MTL::RenderPassColorAttachmentDescriptor *caDesc = desc->colorAttachments()->object(0);
-		caDesc->setTexture(src_tex);
-		caDesc->setLoadAction(MTL::LoadActionClear);
-		caDesc->setStoreAction(MTL::StoreActionStore);
-		caDesc->setClearColor(MTL::ClearColor(p_color.r, p_color.g, p_color.b, p_color.a));
-
-		// Extract the mipmap levels that are to be updated.
-		uint32_t mipLvlStart = p_subresources.base_mipmap;
-		uint32_t mipLvlCnt = p_subresources.mipmap_count;
-		uint32_t mipLvlEnd = mipLvlStart + mipLvlCnt;
-
-		uint32_t levelCount = src_tex->mipmapLevelCount();
-
-		// Extract the cube or array layers (slices) that are to be updated.
-		bool is3D = src_tex->textureType() == MTL::TextureType3D;
-		uint32_t layerStart = is3D ? 0 : p_subresources.base_layer;
-		uint32_t layerCnt = p_subresources.layer_count;
-		uint32_t layerEnd = layerStart + layerCnt;
-
-		MetalFeatures const &features = device_driver->get_device_properties().features;
-
-		// Iterate across mipmap levels and layers, and perform and empty render to clear each.
-		for (uint32_t mipLvl = mipLvlStart; mipLvl < mipLvlEnd; mipLvl++) {
-			ERR_FAIL_INDEX_MSG(mipLvl, levelCount, "mip level out of range");
-
-			caDesc->setLevel(mipLvl);
-
-			// If a 3D image, we need to get the depth for each level.
-			if (is3D) {
-				layerCnt = mipmapLevelSizeFromTexture(src_tex, mipLvl).depth;
-				layerEnd = layerStart + layerCnt;
-			}
-
-			if ((features.layeredRendering && src_tex->sampleCount() == 1) || features.multisampleLayeredRendering) {
-				// We can clear all layers at once.
-				if (is3D) {
-					caDesc->setDepthPlane(layerStart);
-				} else {
-					caDesc->setSlice(layerStart);
-				}
-				desc->setRenderTargetArrayLength(layerCnt);
-				MTL::RenderCommandEncoder *enc = get_new_render_encoder_with_descriptor(desc.get());
-				enc->setLabel(MTLSTR("Clear Image"));
-				enc->endEncoding();
-			} else {
-				for (uint32_t layer = layerStart; layer < layerEnd; layer++) {
-					if (is3D) {
-						caDesc->setDepthPlane(layer);
-					} else {
-						caDesc->setSlice(layer);
-					}
-					MTL::RenderCommandEncoder *enc = get_new_render_encoder_with_descriptor(desc.get());
-					enc->setLabel(MTLSTR("Clear Image"));
-					enc->endEncoding();
-				}
-			}
-		}
-	}
-}
-
-void MDCommandBuffer::clear_buffer(RDD::BufferID p_buffer, uint64_t p_offset, uint64_t p_size) {
-	MTL::BlitCommandEncoder *blit_enc = _ensure_blit_encoder();
-	const RDM::BufferInfo *buffer = (const RDM::BufferInfo *)p_buffer.id;
-
-	blit_enc->fillBuffer(buffer->metal_buffer.get(), NS::Range(p_offset, p_size), 0);
-}
-
-void MDCommandBuffer::clear_depth_stencil_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const RDD::TextureSubresourceRange &p_subresources) {
-	MTL::Texture *src_tex = rid::get<MTL::Texture>(p_texture);
-
-	if (src_tex->parentTexture()) {
-		// Clear via the parent texture rather than the view.
-		src_tex = src_tex->parentTexture();
-	}
-
-	PixelFormats &pf = device_driver->get_pixel_formats();
-
-	bool is_depth_format = pf.isDepthFormat(src_tex->pixelFormat());
-	bool is_stencil_format = pf.isStencilFormat(src_tex->pixelFormat());
-
-	if (!is_depth_format && !is_stencil_format) {
-		ERR_FAIL_MSG("invalid: color texture format");
-	}
-
-	bool clear_depth = is_depth_format && p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
-	bool clear_stencil = is_stencil_format && p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT);
-
-	if (clear_depth || clear_stencil) {
-		NS::SharedPtr<MTL::RenderPassDescriptor> desc = NS::TransferPtr(MTL::RenderPassDescriptor::alloc()->init());
-
-		MTL::RenderPassDepthAttachmentDescriptor *daDesc = desc->depthAttachment();
-		if (clear_depth) {
-			daDesc->setTexture(src_tex);
-			daDesc->setLoadAction(MTL::LoadActionClear);
-			daDesc->setStoreAction(MTL::StoreActionStore);
-			daDesc->setClearDepth(p_depth);
-		}
-
-		MTL::RenderPassStencilAttachmentDescriptor *saDesc = desc->stencilAttachment();
-		if (clear_stencil) {
-			saDesc->setTexture(src_tex);
-			saDesc->setLoadAction(MTL::LoadActionClear);
-			saDesc->setStoreAction(MTL::StoreActionStore);
-			saDesc->setClearStencil(p_stencil);
-		}
-
-		// Extract the mipmap levels that are to be updated.
-		uint32_t mipLvlStart = p_subresources.base_mipmap;
-		uint32_t mipLvlCnt = p_subresources.mipmap_count;
-		uint32_t mipLvlEnd = mipLvlStart + mipLvlCnt;
-
-		uint32_t levelCount = src_tex->mipmapLevelCount();
-
-		// Extract the cube or array layers (slices) that are to be updated.
-		bool is3D = src_tex->textureType() == MTL::TextureType3D;
-		uint32_t layerStart = is3D ? 0 : p_subresources.base_layer;
-		uint32_t layerCnt = p_subresources.layer_count;
-		uint32_t layerEnd = layerStart + layerCnt;
-
-		MetalFeatures const &features = device_driver->get_device_properties().features;
-
-		// Iterate across mipmap levels and layers, and perform and empty render to clear each.
-		for (uint32_t mipLvl = mipLvlStart; mipLvl < mipLvlEnd; mipLvl++) {
-			ERR_FAIL_INDEX_MSG(mipLvl, levelCount, "mip level out of range");
-
-			if (clear_depth) {
-				daDesc->setLevel(mipLvl);
-			}
-			if (clear_stencil) {
-				saDesc->setLevel(mipLvl);
-			}
-
-			// If a 3D image, we need to get the depth for each level.
-			if (is3D) {
-				layerCnt = mipmapLevelSizeFromTexture(src_tex, mipLvl).depth;
-				layerEnd = layerStart + layerCnt;
-			}
-
-			if ((features.layeredRendering && src_tex->sampleCount() == 1) || features.multisampleLayeredRendering) {
-				// We can clear all layers at once.
-				if (is3D) {
-					if (clear_depth) {
-						daDesc->setDepthPlane(layerStart);
-					}
-					if (clear_stencil) {
-						saDesc->setDepthPlane(layerStart);
-					}
-				} else {
-					if (clear_depth) {
-						daDesc->setSlice(layerStart);
-					}
-					if (clear_stencil) {
-						saDesc->setSlice(layerStart);
-					}
-				}
-				desc->setRenderTargetArrayLength(layerCnt);
-				MTL::RenderCommandEncoder *enc = get_new_render_encoder_with_descriptor(desc.get());
-				enc->setLabel(MTLSTR("Clear Image"));
-				enc->endEncoding();
-			} else {
-				for (uint32_t layer = layerStart; layer < layerEnd; layer++) {
-					if (is3D) {
-						if (clear_depth) {
-							daDesc->setDepthPlane(layer);
-						}
-						if (clear_stencil) {
-							saDesc->setDepthPlane(layer);
-						}
-					} else {
-						if (clear_depth) {
-							daDesc->setSlice(layer);
-						}
-						if (clear_stencil) {
-							saDesc->setSlice(layer);
-						}
-					}
-					MTL::RenderCommandEncoder *enc = get_new_render_encoder_with_descriptor(desc.get());
-					enc->setLabel(MTLSTR("Clear Image"));
-					enc->endEncoding();
-				}
-			}
-		}
-	}
-}
-
-void MDCommandBuffer::copy_buffer(RDD::BufferID p_src_buffer, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferCopyRegion> p_regions) {
-	const RDM::BufferInfo *src = (const RDM::BufferInfo *)p_src_buffer.id;
-	const RDM::BufferInfo *dst = (const RDM::BufferInfo *)p_dst_buffer.id;
-
-	MTL::BlitCommandEncoder *enc = _ensure_blit_encoder();
-
-	for (uint32_t i = 0; i < p_regions.size(); i++) {
-		RDD::BufferCopyRegion region = p_regions[i];
-		enc->copyFromBuffer(src->metal_buffer.get(), region.src_offset,
-				dst->metal_buffer.get(), region.dst_offset, region.size);
-	}
-}
-
-void MDCommandBuffer::copy_texture(RDD::TextureID p_src_texture, RDD::TextureID p_dst_texture, VectorView<RDD::TextureCopyRegion> p_regions) {
-	MTL::Texture *src = rid::get<MTL::Texture>(p_src_texture);
-	MTL::Texture *dst = rid::get<MTL::Texture>(p_dst_texture);
-
-	MTL::BlitCommandEncoder *enc = _ensure_blit_encoder();
-	PixelFormats &pf = device_driver->get_pixel_formats();
-
-	MTL::PixelFormat src_fmt = src->pixelFormat();
-	bool src_is_compressed = pf.getFormatType(src_fmt) == MTLFormatType::Compressed;
-	MTL::PixelFormat dst_fmt = dst->pixelFormat();
-	bool dst_is_compressed = pf.getFormatType(dst_fmt) == MTLFormatType::Compressed;
-
-	// Validate copy.
-	if (src->sampleCount() != dst->sampleCount() || pf.getBytesPerBlock(src_fmt) != pf.getBytesPerBlock(dst_fmt)) {
-		ERR_FAIL_MSG("Cannot copy between incompatible pixel formats, such as formats of different pixel sizes, or between images with different sample counts.");
-	}
-
-	// If source and destination have different formats and at least one is compressed, a temporary buffer is required.
-	bool need_tmp_buffer = (src_fmt != dst_fmt) && (src_is_compressed || dst_is_compressed);
-	if (need_tmp_buffer) {
-		ERR_FAIL_MSG("not implemented: copy with intermediate buffer");
-	}
-
-	if (src_fmt != dst_fmt) {
-		// Map the source pixel format to the dst through a texture view on the source texture.
-		src = src->newTextureView(dst_fmt);
-	}
-
-	for (uint32_t i = 0; i < p_regions.size(); i++) {
-		RDD::TextureCopyRegion region = p_regions[i];
-
-		MTL::Size extent = MTLSizeFromVector3i(region.size);
-
-		// If copies can be performed using direct texture-texture copying, do so.
-		uint32_t src_level = region.src_subresources.mipmap;
-		uint32_t src_base_layer = region.src_subresources.base_layer;
-		MTL::Size src_extent = mipmapLevelSizeFromTexture(src, src_level);
-		uint32_t dst_level = region.dst_subresources.mipmap;
-		uint32_t dst_base_layer = region.dst_subresources.base_layer;
-		MTL::Size dst_extent = mipmapLevelSizeFromTexture(dst, dst_level);
-
-		// All layers may be copied at once, if the extent completely covers both images.
-		if (src_extent == extent && dst_extent == extent) {
-			enc->copyFromTexture(src, src_base_layer, src_level,
-					dst, dst_base_layer, dst_level,
-					region.src_subresources.layer_count, 1);
-		} else {
-			MTL::Origin src_origin = MTLOriginFromVector3i(region.src_offset);
-			MTL::Size src_size = clampMTLSize(extent, src_origin, src_extent);
-			uint32_t layer_count = 0;
-			if ((src->textureType() == MTL::TextureType3D) != (dst->textureType() == MTL::TextureType3D)) {
-				// In the case, the number of layers to copy is in extent.depth. Use that value,
-				// then clamp the depth, so we don't try to copy more than Metal will allow.
-				layer_count = extent.depth;
-				src_size.depth = 1;
-			} else {
-				layer_count = region.src_subresources.layer_count;
-			}
-			MTL::Origin dst_origin = MTLOriginFromVector3i(region.dst_offset);
-
-			for (uint32_t layer = 0; layer < layer_count; layer++) {
-				// We can copy between a 3D and a 2D image easily. Just copy between
-				// one slice of the 2D image and one plane of the 3D image at a time.
-				if ((src->textureType() == MTL::TextureType3D) == (dst->textureType() == MTL::TextureType3D)) {
-					enc->copyFromTexture(src, src_base_layer + layer, src_level, src_origin, src_size,
-							dst, dst_base_layer + layer, dst_level, dst_origin);
-				} else if (src->textureType() == MTL::TextureType3D) {
-					enc->copyFromTexture(src, src_base_layer, src_level,
-							MTL::Origin(src_origin.x, src_origin.y, src_origin.z + layer), src_size,
-							dst, dst_base_layer + layer, dst_level, dst_origin);
-				} else {
-					DEV_ASSERT(dst->textureType() == MTL::TextureType3D);
-					enc->copyFromTexture(src, src_base_layer + layer, src_level, src_origin, src_size,
-							dst, dst_base_layer, dst_level,
-							MTL::Origin(dst_origin.x, dst_origin.y, dst_origin.z + layer));
-				}
-			}
-		}
-	}
-}
-
-void MDCommandBuffer::copy_buffer_to_texture(RDD::BufferID p_src_buffer, RDD::TextureID p_dst_texture, VectorView<RDD::BufferTextureCopyRegion> p_regions) {
-	_copy_texture_buffer(CopySource::Buffer, p_dst_texture, p_src_buffer, p_regions);
-}
-
-void MDCommandBuffer::copy_texture_to_buffer(RDD::TextureID p_src_texture, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferTextureCopyRegion> p_regions) {
-	_copy_texture_buffer(CopySource::Texture, p_src_texture, p_dst_buffer, p_regions);
-}
-
-void MDCommandBuffer::_copy_texture_buffer(CopySource p_source,
-		RDD::TextureID p_texture,
-		RDD::BufferID p_buffer,
-		VectorView<RDD::BufferTextureCopyRegion> p_regions) {
-	const RDM::BufferInfo *buffer = (const RDM::BufferInfo *)p_buffer.id;
-	MTL::Texture *texture = rid::get<MTL::Texture>(p_texture);
-
-	MTL::BlitCommandEncoder *enc = _ensure_blit_encoder();
-
-	PixelFormats &pf = device_driver->get_pixel_formats();
-	MTL::PixelFormat mtlPixFmt = texture->pixelFormat();
-
-	MTL::BlitOption options = MTL::BlitOptionNone;
-	if (pf.isPVRTCFormat(mtlPixFmt)) {
-		options |= MTL::BlitOptionRowLinearPVRTC;
-	}
-
-	for (uint32_t i = 0; i < p_regions.size(); i++) {
-		RDD::BufferTextureCopyRegion region = p_regions[i];
-
-		uint32_t mip_level = region.texture_subresource.mipmap;
-		MTL::Origin txt_origin = MTL::Origin(region.texture_offset.x, region.texture_offset.y, region.texture_offset.z);
-		MTL::Size src_extent = mipmapLevelSizeFromTexture(texture, mip_level);
-		MTL::Size txt_size = clampMTLSize(MTL::Size(region.texture_region_size.x, region.texture_region_size.y, region.texture_region_size.z),
-				txt_origin,
-				src_extent);
-
-		uint32_t buffImgWd = region.texture_region_size.x;
-		uint32_t buffImgHt = region.texture_region_size.y;
-
-		NS::UInteger bytesPerRow = pf.getBytesPerRow(mtlPixFmt, buffImgWd);
-		NS::UInteger bytesPerImg = pf.getBytesPerLayer(mtlPixFmt, bytesPerRow, buffImgHt);
-
-		MTL::BlitOption blit_options = options;
-
-		if (pf.isDepthFormat(mtlPixFmt) && pf.isStencilFormat(mtlPixFmt)) {
-			// Don't reduce depths of 32-bit depth/stencil formats.
-			if (region.texture_subresource.aspect == RDD::TEXTURE_ASPECT_DEPTH) {
-				if (pf.getBytesPerTexel(mtlPixFmt) != 4) {
-					bytesPerRow -= buffImgWd;
-					bytesPerImg -= buffImgWd * buffImgHt;
-				}
-				blit_options |= MTL::BlitOptionDepthFromDepthStencil;
-			} else if (region.texture_subresource.aspect == RDD::TEXTURE_ASPECT_STENCIL) {
-				// The stencil component is always 1 byte per pixel.
-				bytesPerRow = buffImgWd;
-				bytesPerImg = buffImgWd * buffImgHt;
-				blit_options |= MTL::BlitOptionStencilFromDepthStencil;
-			}
-		}
-
-		if (!isArrayTexture(texture->textureType())) {
-			bytesPerImg = 0;
-		}
-
-		if (p_source == CopySource::Buffer) {
-			enc->copyFromBuffer(buffer->metal_buffer.get(), region.buffer_offset, bytesPerRow, bytesPerImg, txt_size,
-					texture, region.texture_subresource.layer, mip_level, txt_origin, blit_options);
-		} else {
-			enc->copyFromTexture(texture, region.texture_subresource.layer, mip_level, txt_origin, txt_size,
-					buffer->metal_buffer.get(), region.buffer_offset, bytesPerRow, bytesPerImg, blit_options);
-		}
-	}
-}
-
-MTL::RenderCommandEncoder *MDCommandBuffer::get_new_render_encoder_with_descriptor(MTL::RenderPassDescriptor *p_desc) {
-	switch (type) {
-		case MDCommandBufferStateType::None:
-			break;
-		case MDCommandBufferStateType::Render:
-			render_end_pass();
-			break;
-		case MDCommandBufferStateType::Compute:
-			_end_compute_dispatch();
-			break;
-		case MDCommandBufferStateType::Blit:
-			_end_blit();
-			break;
-	}
-
-	MTL::RenderCommandEncoder *enc = command_buffer()->renderCommandEncoder(p_desc);
-	_encode_barrier(enc);
-	return enc;
-}
-
-#pragma mark - Render Commands
-
-void MDCommandBuffer::render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-
-	if (uint32_t new_size = p_first_set_index + p_set_count; render.uniform_sets.size() < new_size) {
-		uint32_t s = render.uniform_sets.size();
-		render.uniform_sets.resize(new_size);
-		// Set intermediate values to null.
-		std::fill(&render.uniform_sets[s], render.uniform_sets.end().operator->(), nullptr);
-	}
-
-	const MDShader *shader = (const MDShader *)p_shader.id;
-	DynamicOffsetLayout layout = shader->dynamic_offset_layout;
-
-	// Clear bits for sets being bound, then OR new values.
-	for (uint32_t i = 0; i < p_set_count && render.dynamic_offsets != 0; i++) {
-		uint32_t set_index = p_first_set_index + i;
-		uint32_t count = layout.get_count(set_index);
-		if (count > 0) {
-			uint32_t shift = layout.get_offset_index_shift(set_index);
-			uint32_t mask = ((1u << (count * 4u)) - 1u) << shift;
-			render.dynamic_offsets &= ~mask; // Clear this set's bits
-		}
-	}
-	render.dynamic_offsets |= p_dynamic_offsets;
-
-	for (size_t i = 0; i < p_set_count; ++i) {
-		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
-
-		uint32_t index = p_first_set_index + i;
-		if (render.uniform_sets[index] != set || layout.get_count(index) > 0) {
-			render.dirty.set_flag(RenderState::DIRTY_UNIFORMS);
-			render.uniform_set_mask |= 1ULL << index;
-			render.uniform_sets[index] = set;
-		}
-	}
-}
-
-void MDCommandBuffer::render_clear_attachments(VectorView<RDD::AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-
-	const MDSubpass &subpass = render.get_subpass();
-
-	uint32_t vertex_count = p_rects.size() * 6 * subpass.view_count;
-	simd::float4 *vertices = ALLOCA_ARRAY(simd::float4, vertex_count);
-	simd::float4 clear_colors[ClearAttKey::ATTACHMENT_COUNT];
-
-	Size2i size = render.frameBuffer->size;
-	Rect2i render_area = render.clip_to_render_area({ { 0, 0 }, size });
-	size = Size2i(render_area.position.x + render_area.size.width, render_area.position.y + render_area.size.height);
-	_populate_vertices(vertices, size, p_rects);
-
-	ClearAttKey key;
-	key.sample_count = render.pass->get_sample_count();
-	if (subpass.view_count > 1) {
-		key.enable_layered_rendering();
-	}
-
-	float depth_value = 0;
-	uint32_t stencil_value = 0;
-
-	for (uint32_t i = 0; i < p_attachment_clears.size(); i++) {
-		RDD::AttachmentClear const &attClear = p_attachment_clears[i];
-		uint32_t attachment_index;
-		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
-			attachment_index = attClear.color_attachment;
-		} else {
-			attachment_index = subpass.depth_stencil_reference.attachment;
-		}
-
-		MDAttachment const &mda = render.pass->attachments[attachment_index];
-		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
-			key.set_color_format(attachment_index, mda.format);
-			clear_colors[attachment_index] = {
-				attClear.value.color.r,
-				attClear.value.color.g,
-				attClear.value.color.b,
-				attClear.value.color.a
-			};
-		}
-
-		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT)) {
-			key.set_depth_format(mda.format);
-			depth_value = attClear.value.depth;
-		}
-
-		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT)) {
-			key.set_stencil_format(mda.format);
-			stencil_value = attClear.value.stencil;
-		}
-	}
-	clear_colors[ClearAttKey::DEPTH_INDEX] = {
-		depth_value,
-		depth_value,
-		depth_value,
-		depth_value
-	};
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-
-	MDResourceCache &cache = device_driver->get_resource_cache();
-
-	enc->pushDebugGroup(MTLSTR("ClearAttachments"));
-	enc->setRenderPipelineState(cache.get_clear_render_pipeline_state(key, nullptr));
-	enc->setDepthStencilState(cache.get_depth_stencil_state(
-			key.is_depth_enabled(),
-			key.is_stencil_enabled()));
-	enc->setStencilReferenceValue(stencil_value);
-	enc->setCullMode(MTL::CullModeNone);
-	enc->setTriangleFillMode(MTL::TriangleFillModeFill);
-	enc->setDepthBias(0, 0, 0);
-	enc->setViewport(MTL::Viewport{ 0, 0, (double)size.width, (double)size.height, 0.0, 1.0 });
-	enc->setScissorRect(MTL::ScissorRect{ 0, 0, (NS::UInteger)size.width, (NS::UInteger)size.height });
-
-	enc->setVertexBytes(clear_colors, sizeof(clear_colors), 0);
-	enc->setFragmentBytes(clear_colors, sizeof(clear_colors), 0);
-	enc->setVertexBytes(vertices, vertex_count * sizeof(vertices[0]), device_driver->get_metal_buffer_index_for_vertex_attribute_binding(VERT_CONTENT_BUFFER_INDEX));
-
-	enc->drawPrimitives(MTL::PrimitiveTypeTriangle, (NS::UInteger)0, vertex_count);
-	enc->popDebugGroup();
-
-	render.dirty.set_flag((RenderState::DirtyFlag)(RenderState::DIRTY_PIPELINE | RenderState::DIRTY_DEPTH | RenderState::DIRTY_RASTER));
-	binding_cache.clear();
-	render.mark_uniforms_dirty({ 0 }); // Mark index 0 dirty, if there is already a binding for index 0.
-	render.mark_viewport_dirty();
-	render.mark_scissors_dirty();
-	render.mark_vertex_dirty();
-	render.mark_blend_dirty();
-}
-
-void MDCommandBuffer::_render_set_dirty_state() {
-	_render_bind_uniform_sets();
-
-	if (render.dirty.has_flag(RenderState::DIRTY_PUSH)) {
-		if (push_constant_binding != UINT32_MAX) {
-			render.encoder->setVertexBytes(push_constant_data, push_constant_data_len, push_constant_binding);
-			render.encoder->setFragmentBytes(push_constant_data, push_constant_data_len, push_constant_binding);
-		}
-	}
-
-	MDSubpass const &subpass = render.get_subpass();
-	if (subpass.view_count > 1) {
-		uint32_t view_range[2] = { 0, subpass.view_count };
-		render.encoder->setVertexBytes(view_range, sizeof(view_range), VIEW_MASK_BUFFER_INDEX);
-		render.encoder->setFragmentBytes(view_range, sizeof(view_range), VIEW_MASK_BUFFER_INDEX);
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_PIPELINE)) {
-		render.encoder->setRenderPipelineState(render.pipeline->state.get());
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_VIEWPORT)) {
-		render.encoder->setViewports(reinterpret_cast<const MTL::Viewport *>(render.viewports.ptr()), render.viewports.size());
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_DEPTH)) {
-		render.encoder->setDepthStencilState(render.pipeline->depth_stencil.get());
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_RASTER)) {
-		render.pipeline->raster_state.apply(render.encoder.get());
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_SCISSOR) && !render.scissors.is_empty()) {
-		size_t len = render.scissors.size();
-		MTL::ScissorRect *rects = ALLOCA_ARRAY(MTL::ScissorRect, len);
-		for (size_t i = 0; i < len; i++) {
-			rects[i] = render.clip_to_render_area(render.scissors[i]);
-		}
-		render.encoder->setScissorRects(rects, len);
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_BLEND) && render.blend_constants.has_value()) {
-		render.encoder->setBlendColor(render.blend_constants->r, render.blend_constants->g, render.blend_constants->b, render.blend_constants->a);
-	}
-
-	if (render.dirty.has_flag(RenderState::DIRTY_VERTEX)) {
-		uint32_t p_binding_count = render.vertex_buffers.size();
-		if (p_binding_count > 0) {
-			uint32_t first = device_driver->get_metal_buffer_index_for_vertex_attribute_binding(p_binding_count - 1);
-			render.encoder->setVertexBuffers(render.vertex_buffers.ptr(), render.vertex_offsets.ptr(), NS::Range(first, p_binding_count));
-		}
-	}
-
-	if (!use_barriers) {
-		render.resource_tracker.encode(render.encoder.get());
-	}
-
-	render.dirty.clear();
-}
-
-void ResourceTracker::merge_from(const ::ResourceUsageMap &p_from) {
-	for (KeyValue<StageResourceUsage, ::ResourceVector> const &keyval : p_from) {
-		ResourceVector *resources = _current.getptr(keyval.key);
-		if (resources == nullptr) {
-			resources = &_current.insert(keyval.key, ResourceVector())->value;
-		}
-		resources->reserve(resources->size() + keyval.value.size());
-
-		MTL::Resource *const *keyval_ptr = (MTL::Resource *const *)(void *)keyval.value.ptr();
-
-		// Helper to check if a resource needs to be added based on previous usage.
-		auto should_add_resource = [this, usage = keyval.key](MTL::Resource *res) -> bool {
-			ResourceUsageEntry *existing = _previous.getptr(res);
-			if (existing == nullptr) {
-				_previous.insert(res, usage);
-				return true;
-			}
-			if (existing->usage != usage) {
-				existing->usage |= usage;
-				return true;
-			}
-			return false;
-		};
-
-		// 2-way merge of sorted resource lists.
-		uint32_t i = 0, j = 0;
-		while (i < resources->size() && j < keyval.value.size()) {
-			MTL::Resource *current_res = resources->ptr()[i];
-			MTL::Resource *new_res = keyval_ptr[j];
-
-			if (current_res < new_res) {
-				i++;
-			} else if (current_res > new_res) {
-				if (should_add_resource(new_res)) {
-					resources->insert(i, new_res);
-				}
-				i++;
-				j++;
-			} else {
-				i++;
-				j++;
-			}
-		}
-
-		// Append any remaining resources from the input.
-		for (; j < keyval.value.size(); j++) {
-			if (should_add_resource(keyval_ptr[j])) {
-				resources->push_back(keyval_ptr[j]);
-			}
-		}
-	}
-}
-
-void ResourceTracker::encode(MTL::RenderCommandEncoder *p_enc) {
-	for (KeyValue<StageResourceUsage, ResourceVector> const &keyval : _current) {
-		if (keyval.value.is_empty()) {
-			continue;
-		}
-
-		MTL::ResourceUsage vert_usage = (MTL::ResourceUsage)resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_VERTEX);
-		MTL::ResourceUsage frag_usage = (MTL::ResourceUsage)resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_FRAGMENT);
-		const MTL::Resource **resources = (const MTL::Resource **)(void *)keyval.value.ptr();
-		NS::UInteger count = keyval.value.size();
-		if (vert_usage == frag_usage) {
-			p_enc->useResources(resources, count, vert_usage, MTL::RenderStageVertex | MTL::RenderStageFragment);
-		} else {
-			if (vert_usage != 0) {
-				p_enc->useResources(resources, count, vert_usage, MTL::RenderStageVertex);
-			}
-			if (frag_usage != 0) {
-				p_enc->useResources(resources, count, frag_usage, MTL::RenderStageFragment);
-			}
-		}
-	}
-
-	// Keep the keys for now and clear the vectors to reduce churn.
-	for (KeyValue<StageResourceUsage, ResourceVector> &v : _current) {
-		v.value.clear();
-	}
-}
-
-void ResourceTracker::encode(MTL::ComputeCommandEncoder *p_enc) {
-	for (KeyValue<StageResourceUsage, ResourceVector> const &keyval : _current) {
-		if (keyval.value.is_empty()) {
-			continue;
-		}
-		MTL::ResourceUsage usage = (MTL::ResourceUsage)resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_COMPUTE);
-		if (usage != 0) {
-			const MTL::Resource **resources = (const MTL::Resource **)(void *)keyval.value.ptr();
-			p_enc->useResources(resources, keyval.value.size(), usage);
-		}
-	}
-
-	// Keep the keys for now and clear the vectors to reduce churn.
-	for (KeyValue<StageResourceUsage, ResourceVector> &v : _current) {
-		v.value.clear();
-	}
-}
-
-void ResourceTracker::reset() {
-	// Keep the keys for now, as they are likely to be used repeatedly.
-	for (KeyValue<MTL::Resource *, ResourceUsageEntry> &v : _previous) {
-		if (v.value.usage == ResourceUnused) {
-			v.value.unused++;
-			if (v.value.unused >= RESOURCE_UNUSED_CLEANUP_COUNT) {
-				_scratch.push_back(v.key);
-			}
-		} else {
-			v.value = ResourceUnused;
-			v.value.unused = 0;
-		}
-	}
-
-	// Clear up resources that weren't used for the last pass.
-	for (MTL::Resource *res : _scratch) {
-		_previous.erase(res);
-	}
-	_scratch.clear();
-}
-
-void MDCommandBuffer::_render_bind_uniform_sets() {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	if (!render.dirty.has_flag(RenderState::DIRTY_UNIFORMS)) {
-		return;
-	}
-
-	render.dirty.clear_flag(RenderState::DIRTY_UNIFORMS);
-	uint64_t set_uniforms = render.uniform_set_mask;
-	render.uniform_set_mask = 0;
-
-	MDRenderShader *shader = render.pipeline->shader;
-	const uint32_t dynamic_offsets = render.dynamic_offsets;
-
-	while (set_uniforms != 0) {
-		// Find the index of the next set bit.
-		uint32_t index = (uint32_t)__builtin_ctzll(set_uniforms);
-		// Clear the set bit.
-		set_uniforms &= (set_uniforms - 1);
-		MDUniformSet *set = render.uniform_sets[index];
-		if (set == nullptr || index >= (uint32_t)shader->sets.size()) {
-			continue;
-		}
-		if (shader->uses_argument_buffers) {
-			_bind_uniforms_argument_buffers(set, shader, index, dynamic_offsets);
-		} else {
-			DirectEncoder de(render.encoder.get(), binding_cache, DirectEncoder::RENDER);
-			_bind_uniforms_direct(set, shader, de, index, dynamic_offsets);
-		}
-	}
-}
-
-void MDCommandBuffer::render_begin_pass(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_frameBuffer, RDD::CommandBufferType p_cmd_buffer_type, const Rect2i &p_rect, VectorView<RDD::RenderPassClearValue> p_clear_values) {
-	DEV_ASSERT(command_buffer() != nullptr);
-	end();
-
-	MDRenderPass *pass = (MDRenderPass *)(p_render_pass.id);
-	MDFrameBuffer *fb = (MDFrameBuffer *)(p_frameBuffer.id);
-
-	type = MDCommandBufferStateType::Render;
-	render.pass = pass;
-	render.current_subpass = UINT32_MAX;
-	render.render_area = p_rect;
-	render.clear_values.resize(p_clear_values.size());
-	for (uint32_t i = 0; i < p_clear_values.size(); i++) {
-		render.clear_values[i] = p_clear_values[i];
-	}
-	render.is_rendering_entire_area = (p_rect.position == Point2i(0, 0)) && p_rect.size == fb->size;
-	render.frameBuffer = fb;
-	render_next_subpass();
-}
-
-void MDCommandBuffer::render_next_subpass() {
-	DEV_ASSERT(command_buffer() != nullptr);
-
-	if (render.current_subpass == UINT32_MAX) {
-		render.current_subpass = 0;
-	} else {
-		_end_render_pass();
-		render.current_subpass++;
-	}
-
-	MDFrameBuffer const &fb = *render.frameBuffer;
-	MDRenderPass const &pass = *render.pass;
-	MDSubpass const &subpass = render.get_subpass();
-
-	NS::SharedPtr<MTL::RenderPassDescriptor> desc = NS::TransferPtr(MTL::RenderPassDescriptor::alloc()->init());
-
-	if (subpass.view_count > 1) {
-		desc->setRenderTargetArrayLength(subpass.view_count);
-	}
-
-	PixelFormats &pf = device_driver->get_pixel_formats();
-
-	uint32_t attachmentCount = 0;
-	for (uint32_t i = 0; i < subpass.color_references.size(); i++) {
-		uint32_t idx = subpass.color_references[i].attachment;
-		if (idx == RDD::AttachmentReference::UNUSED) {
-			continue;
-		}
-
-		attachmentCount += 1;
-		MTL::RenderPassColorAttachmentDescriptor *ca = desc->colorAttachments()->object(i);
-
-		uint32_t resolveIdx = subpass.resolve_references.is_empty() ? RDD::AttachmentReference::UNUSED : subpass.resolve_references[i].attachment;
-		bool has_resolve = resolveIdx != RDD::AttachmentReference::UNUSED;
-		bool can_resolve = true;
-		if (resolveIdx != RDD::AttachmentReference::UNUSED) {
-			MTL::Texture *resolve_tex = fb.get_texture(resolveIdx);
-			can_resolve = flags::all(pf.getCapabilities(resolve_tex->pixelFormat()), kMTLFmtCapsResolve);
-			if (can_resolve) {
-				ca->setResolveTexture(resolve_tex);
-			} else {
-				CRASH_NOW_MSG("unimplemented: using a texture format that is not supported for resolve");
-			}
-		}
-
-		MDAttachment const &attachment = pass.attachments[idx];
-
-		MTL::Texture *tex = fb.get_texture(idx);
-		ERR_FAIL_NULL_MSG(tex, "Frame buffer color texture is null.");
-
-		if ((attachment.type & MDAttachmentType::Color)) {
-			if (attachment.configureDescriptor(ca, pf, subpass, tex, render.is_rendering_entire_area, has_resolve, can_resolve, false)) {
-				Color clearColor = render.clear_values[idx].color;
-				ca->setClearColor(MTL::ClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a));
-			}
-		}
-	}
-
-	if (subpass.depth_stencil_reference.attachment != RDD::AttachmentReference::UNUSED) {
-		attachmentCount += 1;
-		uint32_t idx = subpass.depth_stencil_reference.attachment;
-		MDAttachment const &attachment = pass.attachments[idx];
-		MTL::Texture *tex = fb.get_texture(idx);
-		ERR_FAIL_NULL_MSG(tex, "Frame buffer depth / stencil texture is null.");
-		if (attachment.type & MDAttachmentType::Depth) {
-			MTL::RenderPassDepthAttachmentDescriptor *da = desc->depthAttachment();
-			if (attachment.configureDescriptor(da, pf, subpass, tex, render.is_rendering_entire_area, false, false, false)) {
-				da->setClearDepth(render.clear_values[idx].depth);
-			}
-		}
-
-		if (attachment.type & MDAttachmentType::Stencil) {
-			MTL::RenderPassStencilAttachmentDescriptor *sa = desc->stencilAttachment();
-			if (attachment.configureDescriptor(sa, pf, subpass, tex, render.is_rendering_entire_area, false, false, true)) {
-				sa->setClearStencil(render.clear_values[idx].stencil);
-			}
-		}
-	}
-
-	desc->setRenderTargetWidth(MAX((NS::UInteger)MIN(render.render_area.position.x + render.render_area.size.width, fb.size.width), 1u));
-	desc->setRenderTargetHeight(MAX((NS::UInteger)MIN(render.render_area.position.y + render.render_area.size.height, fb.size.height), 1u));
-
-	if (attachmentCount == 0) {
-		// If there are no attachments, delay the creation of the encoder,
-		// so we can use a matching sample count for the pipeline, by setting
-		// the defaultRasterSampleCount from the pipeline's sample count.
-		render.desc = desc;
-	} else {
-		render.encoder = NS::RetainPtr(command_buffer()->renderCommandEncoder(desc.get()));
-		_encode_barrier(render.encoder.get());
-
-		if (!render.is_rendering_entire_area) {
-			_render_clear_render_area();
-		}
-		// With a new encoder, all state is dirty.
-		render.dirty.set_flag(RenderState::DIRTY_ALL);
-	}
-}
-
-void MDCommandBuffer::render_draw(uint32_t p_vertex_count,
-		uint32_t p_instance_count,
-		uint32_t p_base_vertex,
-		uint32_t p_first_instance) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
-
-	_render_set_dirty_state();
-
-	MDSubpass const &subpass = render.get_subpass();
-	if (subpass.view_count > 1) {
-		p_instance_count *= subpass.view_count;
-	}
-
-	DEV_ASSERT(render.dirty == 0);
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-	enc->drawPrimitives(render.pipeline->raster_state.render_primitive, p_base_vertex, p_vertex_count, p_instance_count, p_first_instance);
-}
-
-void MDCommandBuffer::render_bind_vertex_buffers(uint32_t p_binding_count, const RDD::BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-
-	render.vertex_buffers.resize(p_binding_count);
-	render.vertex_offsets.resize(p_binding_count);
-
-	// Are the existing buffer bindings the same?
-	bool same = true;
-
-	// Reverse the buffers, as their bindings are assigned in descending order.
-	for (uint32_t i = 0; i < p_binding_count; i += 1) {
-		const RenderingDeviceDriverMetal::BufferInfo *buf_info = (const RenderingDeviceDriverMetal::BufferInfo *)p_buffers[p_binding_count - i - 1].id;
-
-		NS::UInteger dynamic_offset = 0;
-		if (buf_info->is_dynamic()) {
-			const MetalBufferDynamicInfo *dyn_buf = (const MetalBufferDynamicInfo *)buf_info;
-			uint64_t frame_idx = p_dynamic_offsets & 0x3;
-			p_dynamic_offsets >>= 2;
-			dynamic_offset = frame_idx * dyn_buf->size_bytes;
-		}
-		if (render.vertex_buffers[i] != buf_info->metal_buffer.get()) {
-			render.vertex_buffers[i] = buf_info->metal_buffer.get();
-			same = false;
-		}
-
-		render.vertex_offsets[i] = dynamic_offset + p_offsets[p_binding_count - i - 1];
-	}
-
-	if (render.encoder.get() != nullptr) {
-		uint32_t first = device_driver->get_metal_buffer_index_for_vertex_attribute_binding(p_binding_count - 1);
-		if (same) {
-			NS::UInteger *offset_ptr = render.vertex_offsets.ptr();
-			for (uint32_t i = first; i < first + p_binding_count; i++) {
-				render.encoder->setVertexBufferOffset(*offset_ptr, i);
-				offset_ptr++;
-			}
-		} else {
-			render.encoder->setVertexBuffers(render.vertex_buffers.ptr(), render.vertex_offsets.ptr(), NS::Range(first, p_binding_count));
-		}
-		render.dirty.clear_flag(RenderState::DIRTY_VERTEX);
-	} else {
-		render.dirty.set_flag(RenderState::DIRTY_VERTEX);
-	}
-}
-
-void MDCommandBuffer::render_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint64_t p_offset) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-
-	const RenderingDeviceDriverMetal::BufferInfo *buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_buffer.id;
-
-	render.index_buffer = buffer->metal_buffer.get();
-	render.index_type = p_format == RDD::IndexBufferFormat::INDEX_BUFFER_FORMAT_UINT16 ? MTL::IndexTypeUInt16 : MTL::IndexTypeUInt32;
-	render.index_offset = p_offset;
-}
-
-void MDCommandBuffer::render_draw_indexed(uint32_t p_index_count,
-		uint32_t p_instance_count,
-		uint32_t p_first_index,
-		int32_t p_vertex_offset,
-		uint32_t p_first_instance) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
-
-	_render_set_dirty_state();
-
-	MDSubpass const &subpass = render.get_subpass();
-	if (subpass.view_count > 1) {
-		p_instance_count *= subpass.view_count;
-	}
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-
-	uint32_t index_offset = render.index_offset;
-	index_offset += p_first_index * (render.index_type == MTL::IndexTypeUInt16 ? sizeof(uint16_t) : sizeof(uint32_t));
-
-	enc->drawIndexedPrimitives(render.pipeline->raster_state.render_primitive, p_index_count, render.index_type, render.index_buffer, index_offset, p_instance_count, p_vertex_offset, p_first_instance);
-}
-
-void MDCommandBuffer::render_draw_indexed_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
-
-	_render_set_dirty_state();
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-
-	const RenderingDeviceDriverMetal::BufferInfo *indirect_buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
-	NS::UInteger indirect_offset = p_offset;
-
-	for (uint32_t i = 0; i < p_draw_count; i++) {
-		enc->drawIndexedPrimitives(render.pipeline->raster_state.render_primitive, render.index_type, render.index_buffer, 0, indirect_buffer->metal_buffer.get(), indirect_offset);
-		indirect_offset += p_stride;
-	}
-}
-
-void MDCommandBuffer::render_draw_indexed_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
-	ERR_FAIL_MSG("not implemented");
-}
-
-void MDCommandBuffer::render_draw_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
-
-	_render_set_dirty_state();
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-
-	const RenderingDeviceDriverMetal::BufferInfo *indirect_buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
-	NS::UInteger indirect_offset = p_offset;
-
-	for (uint32_t i = 0; i < p_draw_count; i++) {
-		enc->drawPrimitives(render.pipeline->raster_state.render_primitive, indirect_buffer->metal_buffer.get(), indirect_offset);
-		indirect_offset += p_stride;
-	}
-}
-
-void MDCommandBuffer::render_draw_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
-	ERR_FAIL_MSG("not implemented");
-}
-
-void MDCommandBuffer::render_end_pass() {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-
-	render.end_encoding();
-	render.reset();
-	reset();
-}
-
-#pragma mark - RenderState
-
-void MDCommandBuffer::RenderState::reset() {
-	pass = nullptr;
-	frameBuffer = nullptr;
-	pipeline = nullptr;
-	current_subpass = UINT32_MAX;
-	render_area = {};
-	is_rendering_entire_area = false;
-	desc.reset();
-	encoder.reset();
-	index_buffer = nullptr;
-	index_type = MTL::IndexTypeUInt16;
-	dirty = DIRTY_NONE;
-	uniform_sets.clear();
-	dynamic_offsets = 0;
-	uniform_set_mask = 0;
-	clear_values.clear();
-	viewports.clear();
-	scissors.clear();
-	blend_constants.reset();
-	bzero(vertex_buffers.ptr(), sizeof(MTL::Buffer *) * vertex_buffers.size());
-	vertex_buffers.clear();
-	bzero(vertex_offsets.ptr(), sizeof(NS::UInteger) * vertex_offsets.size());
-	vertex_offsets.clear();
-	resource_tracker.reset();
-}
-
-void MDCommandBuffer::RenderState::end_encoding() {
-	if (encoder.get() == nullptr) {
-		return;
-	}
-
-	encoder->endEncoding();
-	encoder.reset();
-}
-
-#pragma mark - ComputeState
-
-void MDCommandBuffer::ComputeState::end_encoding() {
-	if (encoder.get() == nullptr) {
-		return;
-	}
-
-	encoder->endEncoding();
-	encoder.reset();
-}
-
-#pragma mark - Compute
-
-void MDCommandBuffer::_compute_set_dirty_state() {
-	if (compute.dirty.has_flag(ComputeState::DIRTY_PIPELINE)) {
-		compute.encoder = NS::RetainPtr(command_buffer()->computeCommandEncoder(MTL::DispatchTypeConcurrent));
-		_encode_barrier(compute.encoder.get());
-		compute.encoder->setComputePipelineState(compute.pipeline->state.get());
-	}
-
-	_compute_bind_uniform_sets();
-
-	if (compute.dirty.has_flag(ComputeState::DIRTY_PUSH)) {
-		if (push_constant_binding != UINT32_MAX) {
-			compute.encoder->setBytes(push_constant_data, push_constant_data_len, push_constant_binding);
-		}
-	}
-
-	if (!use_barriers) {
-		compute.resource_tracker.encode(compute.encoder.get());
-	}
-
-	compute.dirty.clear();
-}
-
-void MDCommandBuffer::_compute_bind_uniform_sets() {
-	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
-	if (!compute.dirty.has_flag(ComputeState::DIRTY_UNIFORMS)) {
-		return;
-	}
-
-	compute.dirty.clear_flag(ComputeState::DIRTY_UNIFORMS);
-	uint64_t set_uniforms = compute.uniform_set_mask;
-	compute.uniform_set_mask = 0;
-
-	MDComputeShader *shader = compute.pipeline->shader;
-	const uint32_t dynamic_offsets = compute.dynamic_offsets;
-
-	while (set_uniforms != 0) {
-		// Find the index of the next set bit.
-		uint32_t index = (uint32_t)__builtin_ctzll(set_uniforms);
-		// Clear the set bit.
-		set_uniforms &= (set_uniforms - 1);
-		MDUniformSet *set = compute.uniform_sets[index];
-		if (set == nullptr || index >= (uint32_t)shader->sets.size()) {
-			continue;
-		}
-		if (shader->uses_argument_buffers) {
-			_bind_uniforms_argument_buffers_compute(set, shader, index, dynamic_offsets);
-		} else {
-			DirectEncoder de(compute.encoder.get(), binding_cache, DirectEncoder::COMPUTE);
-			_bind_uniforms_direct(set, shader, de, index, dynamic_offsets);
-		}
-	}
-}
-
-void MDCommandBuffer::ComputeState::reset() {
-	pipeline = nullptr;
-	encoder.reset();
-	dirty = DIRTY_NONE;
-	uniform_sets.clear();
-	dynamic_offsets = 0;
-	uniform_set_mask = 0;
-	resource_tracker.reset();
-}
-
-void MDCommandBuffer::compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
-
-	if (uint32_t new_size = p_first_set_index + p_set_count; compute.uniform_sets.size() < new_size) {
-		uint32_t s = compute.uniform_sets.size();
-		compute.uniform_sets.resize(new_size);
-		// Set intermediate values to null.
-		std::fill(&compute.uniform_sets[s], compute.uniform_sets.end().operator->(), nullptr);
-	}
-
-	const MDShader *shader = (const MDShader *)p_shader.id;
-	DynamicOffsetLayout layout = shader->dynamic_offset_layout;
-
-	// Clear bits for sets being bound, then OR new values.
-	for (uint32_t i = 0; i < p_set_count && compute.dynamic_offsets != 0; i++) {
-		uint32_t set_index = p_first_set_index + i;
-		uint32_t count = layout.get_count(set_index);
-		if (count > 0) {
-			uint32_t shift = layout.get_offset_index_shift(set_index);
-			uint32_t mask = ((1u << (count * 4u)) - 1u) << shift;
-			compute.dynamic_offsets &= ~mask; // Clear this set's bits
-		}
-	}
-	compute.dynamic_offsets |= p_dynamic_offsets;
-
-	for (size_t i = 0; i < p_set_count; ++i) {
-		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
-
-		uint32_t index = p_first_set_index + i;
-		if (compute.uniform_sets[index] != set || layout.get_count(index) > 0) {
-			compute.dirty.set_flag(ComputeState::DIRTY_UNIFORMS);
-			compute.uniform_set_mask |= 1ULL << index;
-			compute.uniform_sets[index] = set;
-		}
-	}
-}
-
-void MDCommandBuffer::compute_dispatch(uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
-
-	_compute_set_dirty_state();
-
-	MTL::Size size = MTL::Size(p_x_groups, p_y_groups, p_z_groups);
-
-	MTL::ComputeCommandEncoder *enc = compute.encoder.get();
-	enc->dispatchThreadgroups(size, compute.pipeline->compute_state.local);
-}
-
-void MDCommandBuffer::compute_dispatch_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
-
-	_compute_set_dirty_state();
-
-	const RenderingDeviceDriverMetal::BufferInfo *indirectBuffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
-
-	MTL::ComputeCommandEncoder *enc = compute.encoder.get();
-	enc->dispatchThreadgroups(indirectBuffer->metal_buffer.get(), p_offset, compute.pipeline->compute_state.local);
-}
-
-void MDCommandBuffer::reset() {
-	push_constant_binding = UINT32_MAX;
-	push_constant_data_len = 0;
-	type = MDCommandBufferStateType::None;
-	binding_cache.clear();
-}
-
-void MDCommandBuffer::_end_compute_dispatch() {
-	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
-
-	compute.end_encoding();
-	compute.reset();
-	reset();
-}
-
-void MDCommandBuffer::_end_blit() {
-	DEV_ASSERT(type == MDCommandBufferStateType::Blit);
-
-	blit.encoder->endEncoding();
-	blit.reset();
-	reset();
-}
-
-MDComputeShader::MDComputeShader(CharString p_name,
-		Vector<UniformSet> p_sets,
-		bool p_uses_argument_buffers,
-		std::shared_ptr<MDLibrary> p_kernel) :
-		MDShader(p_name, p_sets, p_uses_argument_buffers), kernel(std::move(p_kernel)) {
-}
-
-MDRenderShader::MDRenderShader(CharString p_name,
-		Vector<UniformSet> p_sets,
-		bool p_needs_view_mask_buffer,
-		bool p_uses_argument_buffers,
-		std::shared_ptr<MDLibrary> p_vert, std::shared_ptr<MDLibrary> p_frag) :
-		MDShader(p_name, p_sets, p_uses_argument_buffers),
-		needs_view_mask_buffer(p_needs_view_mask_buffer),
-		vert(std::move(p_vert)),
-		frag(std::move(p_frag)) {
-}
-
-void DirectEncoder::set(MTL::Texture **p_textures, NS::Range p_range) {
-	if (cache.update(p_range, p_textures)) {
-		switch (mode) {
-			case RENDER: {
-				MTL::RenderCommandEncoder *enc = static_cast<MTL::RenderCommandEncoder *>(encoder);
-				enc->setVertexTextures(p_textures, p_range);
-				enc->setFragmentTextures(p_textures, p_range);
-			} break;
-			case COMPUTE: {
-				MTL::ComputeCommandEncoder *enc = static_cast<MTL::ComputeCommandEncoder *>(encoder);
-				enc->setTextures(p_textures, p_range);
-			} break;
-		}
-	}
-}
-
-void DirectEncoder::set(MTL::Buffer **p_buffers, const NS::UInteger *p_offsets, NS::Range p_range) {
-	if (cache.update(p_range, p_buffers, p_offsets)) {
-		switch (mode) {
-			case RENDER: {
-				MTL::RenderCommandEncoder *enc = static_cast<MTL::RenderCommandEncoder *>(encoder);
-				enc->setVertexBuffers(p_buffers, p_offsets, p_range);
-				enc->setFragmentBuffers(p_buffers, p_offsets, p_range);
-			} break;
-			case COMPUTE: {
-				MTL::ComputeCommandEncoder *enc = static_cast<MTL::ComputeCommandEncoder *>(encoder);
-				enc->setBuffers(p_buffers, p_offsets, p_range);
-			} break;
-		}
-	}
-}
-
-void DirectEncoder::set(MTL::Buffer *p_buffer, NS::UInteger p_offset, uint32_t p_index) {
-	if (cache.update(p_buffer, p_offset, p_index)) {
-		switch (mode) {
-			case RENDER: {
-				MTL::RenderCommandEncoder *enc = static_cast<MTL::RenderCommandEncoder *>(encoder);
-				enc->setVertexBuffer(p_buffer, p_offset, p_index);
-				enc->setFragmentBuffer(p_buffer, p_offset, p_index);
-			} break;
-			case COMPUTE: {
-				MTL::ComputeCommandEncoder *enc = static_cast<MTL::ComputeCommandEncoder *>(encoder);
-				enc->setBuffer(p_buffer, p_offset, p_index);
-			} break;
-		}
-	}
-}
-
-void DirectEncoder::set(MTL::SamplerState **p_samplers, NS::Range p_range) {
-	if (cache.update(p_range, p_samplers)) {
-		switch (mode) {
-			case RENDER: {
-				MTL::RenderCommandEncoder *enc = static_cast<MTL::RenderCommandEncoder *>(encoder);
-				enc->setVertexSamplerStates(p_samplers, p_range);
-				enc->setFragmentSamplerStates(p_samplers, p_range);
-			} break;
-			case COMPUTE: {
-				MTL::ComputeCommandEncoder *enc = static_cast<MTL::ComputeCommandEncoder *>(encoder);
-				enc->setSamplerStates(p_samplers, p_range);
-			} break;
-		}
-	}
-}
-
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability-new")
-
-void MDCommandBuffer::_bind_uniforms_argument_buffers(MDUniformSet *p_set, MDShader *p_shader, uint32_t p_set_index, uint32_t p_dynamic_offsets) {
-	DEV_ASSERT(p_shader->uses_argument_buffers);
-	DEV_ASSERT(render.encoder.get() != nullptr);
-
-	MTL::RenderCommandEncoder *enc = render.encoder.get();
-	render.resource_tracker.merge_from(p_set->usage_to_resources);
-
-	const UniformSet &shader_set = p_shader->sets[p_set_index];
-
-	// Check if this set has dynamic uniforms.
-	if (!shader_set.dynamic_uniforms.is_empty()) {
-		// Allocate from the ring buffer.
-		uint32_t buffer_size = p_set->arg_buffer_data.size();
-		MDRingBuffer::Allocation alloc = allocate_arg_buffer(buffer_size);
-
-		// Copy the base argument buffer data.
-		memcpy(alloc.ptr, p_set->arg_buffer_data.ptr(), buffer_size);
-
-		// Update dynamic buffer GPU addresses.
-		uint64_t *ptr = (uint64_t *)alloc.ptr;
-		DynamicOffsetLayout layout = p_shader->dynamic_offset_layout;
-		uint32_t dynamic_index = 0;
-
-		for (uint32_t i : shader_set.dynamic_uniforms) {
-			RDD::BoundUniform const &uniform = p_set->uniforms[i];
-			const UniformInfo &ui = shader_set.uniforms[i];
-			const UniformInfo::Indexes &idx = ui.arg_buffer;
-
-			uint32_t shift = layout.get_offset_index_shift(p_set_index, dynamic_index);
-			dynamic_index++;
-			uint32_t frame_idx = (p_dynamic_offsets >> shift) & 0xf;
-
-			const MetalBufferDynamicInfo *buf_info = (const MetalBufferDynamicInfo *)uniform.ids[0].id;
-			uint64_t gpu_address = buf_info->metal_buffer.get()->gpuAddress() + frame_idx * buf_info->size_bytes;
-			*(uint64_t *)(ptr + idx.buffer) = gpu_address;
-		}
-
-		enc->setVertexBuffer(alloc.buffer, alloc.offset, p_set_index);
-		enc->setFragmentBuffer(alloc.buffer, alloc.offset, p_set_index);
-	} else {
-		enc->setVertexBuffer(p_set->arg_buffer.get(), 0, p_set_index);
-		enc->setFragmentBuffer(p_set->arg_buffer.get(), 0, p_set_index);
-	}
-}
-
-void MDCommandBuffer::_bind_uniforms_direct(MDUniformSet *p_set, MDShader *p_shader, DirectEncoder p_enc, uint32_t p_set_index, uint32_t p_dynamic_offsets) {
-	DEV_ASSERT(!p_shader->uses_argument_buffers);
-
-	UniformSet const &set = p_shader->sets[p_set_index];
-	DynamicOffsetLayout layout = p_shader->dynamic_offset_layout;
-	uint32_t dynamic_index = 0;
-
-	for (uint32_t i = 0; i < MIN(p_set->uniforms.size(), set.uniforms.size()); i++) {
-		RDD::BoundUniform const &uniform = p_set->uniforms[i];
-		const UniformInfo &ui = set.uniforms[i];
-		const UniformInfo::Indexes &indexes = ui.slot;
-
-		uint32_t frame_idx;
-		if (uniform.is_dynamic()) {
-			uint32_t shift = layout.get_offset_index_shift(p_set_index, dynamic_index);
-			dynamic_index++;
-			frame_idx = (p_dynamic_offsets >> shift) & 0xf;
-		} else {
-			frame_idx = 0;
-		}
-
-		switch (uniform.type) {
-			case RDD::UNIFORM_TYPE_SAMPLER: {
-				size_t count = uniform.ids.size();
-				MTL::SamplerState **objects = ALLOCA_ARRAY(MTL::SamplerState *, count);
-				for (size_t j = 0; j < count; j += 1) {
-					objects[j] = rid::get<MTL::SamplerState>(uniform.ids[j]);
-				}
-				NS::Range sampler_range = { indexes.sampler, count };
-				p_enc.set(objects, sampler_range);
-			} break;
-			case RDD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE: {
-				size_t count = uniform.ids.size() / 2;
-				MTL::Texture **textures = ALLOCA_ARRAY(MTL::Texture *, count);
-				MTL::SamplerState **samplers = ALLOCA_ARRAY(MTL::SamplerState *, count);
-				for (uint32_t j = 0; j < count; j += 1) {
-					samplers[j] = rid::get<MTL::SamplerState>(uniform.ids[j * 2 + 0]);
-					textures[j] = rid::get<MTL::Texture>(uniform.ids[j * 2 + 1]);
-				}
-				NS::Range sampler_range = { indexes.sampler, count };
-				NS::Range texture_range = { indexes.texture, count };
-				p_enc.set(samplers, sampler_range);
-				p_enc.set(textures, texture_range);
-			} break;
-			case RDD::UNIFORM_TYPE_TEXTURE: {
-				size_t count = uniform.ids.size();
-				MTL::Texture **objects = ALLOCA_ARRAY(MTL::Texture *, count);
-				for (size_t j = 0; j < count; j += 1) {
-					objects[j] = rid::get<MTL::Texture>(uniform.ids[j]);
-				}
-				NS::Range texture_range = { indexes.texture, count };
-				p_enc.set(objects, texture_range);
-			} break;
-			case RDD::UNIFORM_TYPE_IMAGE: {
-				size_t count = uniform.ids.size();
-				MTL::Texture **objects = ALLOCA_ARRAY(MTL::Texture *, count);
-				for (size_t j = 0; j < count; j += 1) {
-					objects[j] = rid::get<MTL::Texture>(uniform.ids[j]);
-				}
-				NS::Range texture_range = { indexes.texture, count };
-				p_enc.set(objects, texture_range);
-
-				if (indexes.buffer != UINT32_MAX) {
-					// Emulated atomic image access.
-					MTL::Buffer **bufs = ALLOCA_ARRAY(MTL::Buffer *, count);
-					for (size_t j = 0; j < count; j += 1) {
-						MTL::Texture *obj = objects[j];
-						MTL::Texture *tex = obj->parentTexture() ? obj->parentTexture() : obj;
-						bufs[j] = tex->buffer();
-					}
-					NS::UInteger *offs = ALLOCA_ARRAY(NS::UInteger, count);
-					bzero(offs, sizeof(NS::UInteger) * count);
-					NS::Range buffer_range = { indexes.buffer, count };
-					p_enc.set(bufs, offs, buffer_range);
-				}
-			} break;
-			case RDD::UNIFORM_TYPE_TEXTURE_BUFFER: {
-				ERR_PRINT("not implemented: UNIFORM_TYPE_TEXTURE_BUFFER");
-			} break;
-			case RDD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER: {
-				ERR_PRINT("not implemented: UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER");
-			} break;
-			case RDD::UNIFORM_TYPE_IMAGE_BUFFER: {
-				CRASH_NOW_MSG("not implemented: UNIFORM_TYPE_IMAGE_BUFFER");
-			} break;
-			case RDD::UNIFORM_TYPE_UNIFORM_BUFFER:
-			case RDD::UNIFORM_TYPE_STORAGE_BUFFER: {
-				const RDM::BufferInfo *buf_info = (const RDM::BufferInfo *)uniform.ids[0].id;
-				p_enc.set(buf_info->metal_buffer.get(), 0, indexes.buffer);
-			} break;
-			case RDD::UNIFORM_TYPE_UNIFORM_BUFFER_DYNAMIC:
-			case RDD::UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC: {
-				const MetalBufferDynamicInfo *buf_info = (const MetalBufferDynamicInfo *)uniform.ids[0].id;
-				p_enc.set(buf_info->metal_buffer.get(), frame_idx * buf_info->size_bytes, indexes.buffer);
-			} break;
-			case RDD::UNIFORM_TYPE_INPUT_ATTACHMENT: {
-				size_t count = uniform.ids.size();
-				MTL::Texture **objects = ALLOCA_ARRAY(MTL::Texture *, count);
-				for (size_t j = 0; j < count; j += 1) {
-					objects[j] = rid::get<MTL::Texture>(uniform.ids[j]);
-				}
-				NS::Range texture_range = { indexes.texture, count };
-				p_enc.set(objects, texture_range);
-			} break;
-			default: {
-				DEV_ASSERT(false);
-			}
-		}
-	}
-}
-
-void MDCommandBuffer::_bind_uniforms_argument_buffers_compute(MDUniformSet *p_set, MDShader *p_shader, uint32_t p_set_index, uint32_t p_dynamic_offsets) {
-	DEV_ASSERT(p_shader->uses_argument_buffers);
-	DEV_ASSERT(compute.encoder.get() != nullptr);
-
-	MTL::ComputeCommandEncoder *enc = compute.encoder.get();
-	compute.resource_tracker.merge_from(p_set->usage_to_resources);
-
-	const UniformSet &shader_set = p_shader->sets[p_set_index];
-
-	// Check if this set has dynamic uniforms.
-	if (!shader_set.dynamic_uniforms.is_empty()) {
-		// Allocate from the ring buffer.
-		uint32_t buffer_size = p_set->arg_buffer_data.size();
-		MDRingBuffer::Allocation alloc = allocate_arg_buffer(buffer_size);
-
-		// Copy the base argument buffer data.
-		memcpy(alloc.ptr, p_set->arg_buffer_data.ptr(), buffer_size);
-
-		// Update dynamic buffer GPU addresses.
-		uint64_t *ptr = (uint64_t *)alloc.ptr;
-		DynamicOffsetLayout layout = p_shader->dynamic_offset_layout;
-		uint32_t dynamic_index = 0;
-
-		for (uint32_t i : shader_set.dynamic_uniforms) {
-			RDD::BoundUniform const &uniform = p_set->uniforms[i];
-			const UniformInfo &ui = shader_set.uniforms[i];
-			const UniformInfo::Indexes &idx = ui.arg_buffer;
-
-			uint32_t shift = layout.get_offset_index_shift(p_set_index, dynamic_index);
-			dynamic_index++;
-			uint32_t frame_idx = (p_dynamic_offsets >> shift) & 0xf;
-
-			const MetalBufferDynamicInfo *buf_info = (const MetalBufferDynamicInfo *)uniform.ids[0].id;
-			uint64_t gpu_address = buf_info->metal_buffer.get()->gpuAddress() + frame_idx * buf_info->size_bytes;
-			*(uint64_t *)(ptr + idx.buffer) = gpu_address;
-		}
-
-		enc->setBuffer(alloc.buffer, alloc.offset, p_set_index);
-	} else {
-		enc->setBuffer(p_set->arg_buffer.get(), 0, p_set_index);
-	}
-}
-
-GODOT_CLANG_WARNING_POP
diff --git a/engine/drivers/metal/metal3_objects.h b/engine/drivers/metal/metal3_objects.h
deleted file mode 100644
index 4e690cdc..00000000
--- a/engine/drivers/metal/metal3_objects.h
+++ /dev/null
@@ -1,589 +0,0 @@
-/**************************************************************************/
-/*  metal3_objects.h                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-/**************************************************************************/
-/*                                                                        */
-/* Portions of this code were derived from MoltenVK.                      */
-/*                                                                        */
-/* Copyright (c) 2015-2023 The Brenwill Workshop Ltd.                     */
-/* (http://www.brenwill.com)                                              */
-/*                                                                        */
-/* 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                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/**************************************************************************/
-
-#include "drivers/metal/metal_objects_shared.h"
-#include "servers/rendering/rendering_device_driver.h"
-
-#include <Metal/Metal.hpp>
-
-#include <initializer_list>
-#include <optional>
-
-namespace MTL3 {
-
-// These types are defined in the global namespace (metal_objects_shared.h / rendering_device_driver_metal.h)
-using ::MDAttachment;
-using ::MDAttachmentType;
-using ::MDCommandBufferBase;
-using ::MDCommandBufferStateType;
-using ::MDFrameBuffer;
-using ::MDRenderPass;
-using ::MDRingBuffer;
-using ::MDSubpass;
-using ::RenderStateBase;
-
-using ::DynamicOffsetLayout;
-using ::MDComputePipeline;
-using ::MDComputeShader;
-using ::MDLibrary;
-using ::MDPipeline;
-using ::MDPipelineType;
-using ::MDRenderPipeline;
-using ::MDRenderShader;
-using ::MDShader;
-using ::MDUniformSet;
-using ::ShaderCacheEntry;
-using ::ShaderLoadStrategy;
-using ::UniformInfo;
-using ::UniformSet;
-
-using RDM = ::RenderingDeviceDriverMetal;
-
-struct ResourceUsageEntry {
-	StageResourceUsage usage = ResourceUnused;
-	uint32_t unused = 0;
-
-	ResourceUsageEntry() {}
-	ResourceUsageEntry(StageResourceUsage p_usage) :
-			usage(p_usage) {}
-};
-
-} // namespace MTL3
-
-template <>
-struct is_zero_constructible<MTL3::ResourceUsageEntry> : std::true_type {};
-
-namespace MTL3 {
-
-/*! Track the cumulative usage for a resource during a render or compute pass */
-typedef HashMap<MTL::Resource *, ResourceUsageEntry> ResourceToStageUsage;
-
-/*! Track resource and ensure they are resident prior to dispatch or draw commands.
- *
- * The primary purpose of this data structure is to track all the resources that must be made resident prior
- * to issuing the next dispatch or draw command. It aggregates all resources used from argument buffers.
- *
- * As an optimization, this data structure also tracks previous usage for resources, so that
- * it may avoid binding them again in later commands if the resource is already resident and its usage flagged.
- */
-struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) ResourceTracker {
-	// A constant specifying how many iterations a resource can remain in
-	// the _previous HashSet before it will be removed permanently.
-	//
-	// Keeping them in the _previous HashMap reduces churn if resources are regularly
-	// bound. 256 is arbitrary, but if an object remains unused for 256 encoders,
-	// it will be released.
-	static constexpr uint32_t RESOURCE_UNUSED_CLEANUP_COUNT = 256;
-
-	// Used as a scratch buffer to periodically clean up resources from _previous.
-	ResourceVector _scratch;
-	// Tracks all resources and their prior usage for the duration of the encoder.
-	ResourceToStageUsage _previous;
-	// Tracks resources for the current command that must be made resident
-	ResourceUsageMap _current;
-
-	void merge_from(const ::ResourceUsageMap &p_from);
-	void encode(MTL::RenderCommandEncoder *p_enc);
-	void encode(MTL::ComputeCommandEncoder *p_enc);
-	void reset();
-};
-
-struct BindingCache {
-	struct BufferBinding {
-		MTL::Buffer *buffer = nullptr;
-		NS::UInteger offset = 0;
-
-		bool operator!=(const BufferBinding &p_other) const {
-			return buffer != p_other.buffer || offset != p_other.offset;
-		}
-	};
-
-	LocalVector<MTL::Texture *> textures;
-	LocalVector<MTL::SamplerState *> samplers;
-	LocalVector<BufferBinding> buffers;
-
-	_FORCE_INLINE_ void clear() {
-		textures.clear();
-		samplers.clear();
-		buffers.clear();
-	}
-
-private:
-	template <typename T>
-	_FORCE_INLINE_ void ensure_size(LocalVector<T> &p_vec, uint32_t p_required) {
-		if (p_vec.size() < p_required) {
-			p_vec.resize_initialized(p_required);
-		}
-	}
-
-public:
-	_FORCE_INLINE_ bool update(NS::Range p_range, MTL::Texture *const *p_values) {
-		if (p_range.length == 0) {
-			return false;
-		}
-		uint32_t required = (uint32_t)(p_range.location + p_range.length);
-		ensure_size(textures, required);
-		bool changed = false;
-		for (NS::UInteger i = 0; i < p_range.length; ++i) {
-			uint32_t slot = (uint32_t)(p_range.location + i);
-			MTL::Texture *value = p_values[i];
-			if (textures[slot] != value) {
-				textures[slot] = value;
-				changed = true;
-			}
-		}
-		return changed;
-	}
-
-	_FORCE_INLINE_ bool update(NS::Range p_range, MTL::SamplerState *const *p_values) {
-		if (p_range.length == 0) {
-			return false;
-		}
-		uint32_t required = (uint32_t)(p_range.location + p_range.length);
-		ensure_size(samplers, required);
-		bool changed = false;
-		for (NS::UInteger i = 0; i < p_range.length; ++i) {
-			uint32_t slot = (uint32_t)(p_range.location + i);
-			MTL::SamplerState *value = p_values[i];
-			if (samplers[slot] != value) {
-				samplers[slot] = value;
-				changed = true;
-			}
-		}
-		return changed;
-	}
-
-	_FORCE_INLINE_ bool update(NS::Range p_range, MTL::Buffer *const *p_values, const NS::UInteger *p_offsets) {
-		if (p_range.length == 0) {
-			return false;
-		}
-		uint32_t required = (uint32_t)(p_range.location + p_range.length);
-		ensure_size(buffers, required);
-		BufferBinding *buffers_ptr = buffers.ptr() + p_range.location;
-		bool changed = false;
-		for (NS::UInteger i = 0; i < p_range.length; ++i) {
-			BufferBinding &binding = *buffers_ptr;
-			BufferBinding new_binding = {
-				.buffer = p_values[i],
-				.offset = p_offsets[i],
-			};
-			if (binding != new_binding) {
-				binding = new_binding;
-				changed = true;
-			}
-			++buffers_ptr;
-		}
-		return changed;
-	}
-
-	_FORCE_INLINE_ bool update(MTL::Buffer *p_buffer, NS::UInteger p_offset, uint32_t p_index) {
-		uint32_t required = p_index + 1;
-		ensure_size(buffers, required);
-		BufferBinding &binding = buffers.ptr()[p_index];
-		BufferBinding new_binding = {
-			.buffer = p_buffer,
-			.offset = p_offset,
-		};
-		if (binding != new_binding) {
-			binding = new_binding;
-			return true;
-		}
-		return false;
-	}
-};
-
-// A type used to encode resources directly to a MTLCommandEncoder
-struct DirectEncoder {
-	MTL::CommandEncoder *encoder;
-	BindingCache &cache;
-	enum Mode {
-		RENDER,
-		COMPUTE
-	};
-	Mode mode;
-
-	void set(MTL::Buffer **p_buffers, const NS::UInteger *p_offsets, NS::Range p_range);
-	void set(MTL::Buffer *p_buffer, NS::UInteger p_offset, uint32_t p_index);
-	void set(MTL::Texture **p_textures, NS::Range p_range);
-	void set(MTL::SamplerState **p_samplers, NS::Range p_range);
-
-	DirectEncoder(MTL::CommandEncoder *p_encoder, BindingCache &p_cache, Mode p_mode) :
-			encoder(p_encoder), cache(p_cache), mode(p_mode) {}
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDCommandBuffer : public MDCommandBufferBase {
-	friend class MDUniformSet;
-
-private:
-#pragma mark - Common State
-
-	BindingCache binding_cache;
-
-#pragma mark - Argument Buffer Ring Allocator
-
-	using Alloc = MDRingBuffer::Allocation;
-
-	// Used for argument buffers that contain dynamic uniforms.
-	MDRingBuffer _scratch;
-
-	/// Allocates from the ring buffer for dynamic argument buffers.
-	Alloc allocate_arg_buffer(uint32_t p_size);
-
-	struct {
-		NS::SharedPtr<MTL::ResidencySet> rs;
-	} _frame_state;
-
-#pragma mark - Synchronization
-
-	enum {
-		STAGE_RENDER,
-		STAGE_COMPUTE,
-		STAGE_BLIT,
-		STAGE_MAX,
-	};
-	bool use_barriers = false;
-	MTL::Stages pending_after_stages[STAGE_MAX] = { 0, 0, 0 };
-	MTL::Stages pending_before_queue_stages[STAGE_MAX] = { 0, 0, 0 };
-	void _encode_barrier(MTL::CommandEncoder *p_enc);
-
-	void reset();
-
-	MTL::CommandQueue *queue = nullptr;
-	NS::SharedPtr<MTL::CommandBuffer> commandBuffer;
-	bool state_begin = false;
-
-	MTL::CommandBuffer *command_buffer();
-
-	void _end_compute_dispatch();
-	void _end_blit();
-	MTL::BlitCommandEncoder *_ensure_blit_encoder();
-
-	enum class CopySource {
-		Buffer,
-		Texture,
-	};
-	void _copy_texture_buffer(CopySource p_source,
-			RDD::TextureID p_texture,
-			RDD::BufferID p_buffer,
-			VectorView<RDD::BufferTextureCopyRegion> p_regions);
-
-#pragma mark - Render
-
-	void _render_set_dirty_state();
-	void _render_bind_uniform_sets();
-	void _bind_uniforms_argument_buffers(MDUniformSet *p_set, MDShader *p_shader, uint32_t p_set_index, uint32_t p_dynamic_offsets);
-	void _bind_uniforms_direct(MDUniformSet *p_set, MDShader *p_shader, DirectEncoder p_enc, uint32_t p_set_index, uint32_t p_dynamic_offsets);
-
-#pragma mark - Compute
-
-	void _compute_set_dirty_state();
-	void _compute_bind_uniform_sets();
-	void _bind_uniforms_argument_buffers_compute(MDUniformSet *p_set, MDShader *p_shader, uint32_t p_set_index, uint32_t p_dynamic_offsets);
-
-protected:
-	void mark_push_constants_dirty() override;
-	RenderStateBase &get_render_state_base() override { return render; }
-	uint32_t get_current_view_count() const override { return render.get_subpass().view_count; }
-	MDRenderPass *get_render_pass() const override { return render.pass; }
-	MDFrameBuffer *get_frame_buffer() const override { return render.frameBuffer; }
-	const MDSubpass &get_current_subpass() const override { return render.get_subpass(); }
-	LocalVector<RDD::RenderPassClearValue> &get_clear_values() override { return render.clear_values; }
-	const Rect2i &get_render_area() const override { return render.render_area; }
-	void end_render_encoding() override { render.end_encoding(); }
-
-public:
-	struct RenderState : public RenderStateBase {
-		MDRenderPass *pass = nullptr;
-		MDFrameBuffer *frameBuffer = nullptr;
-		MDRenderPipeline *pipeline = nullptr;
-		LocalVector<RDD::RenderPassClearValue> clear_values;
-		uint32_t current_subpass = UINT32_MAX;
-		Rect2i render_area;
-		bool is_rendering_entire_area = false;
-		NS::SharedPtr<MTL::RenderPassDescriptor> desc;
-		NS::SharedPtr<MTL::RenderCommandEncoder> encoder;
-		MTL::Buffer *index_buffer = nullptr; // Buffer is owned by RDD.
-		MTL::IndexType index_type = MTL::IndexTypeUInt16;
-		uint32_t index_offset = 0;
-		LocalVector<MTL::Buffer *> vertex_buffers;
-		LocalVector<NS::UInteger> vertex_offsets;
-		ResourceTracker resource_tracker;
-
-		LocalVector<MDUniformSet *> uniform_sets;
-		uint32_t dynamic_offsets = 0;
-		// Bit mask of the uniform sets that are dirty, to prevent redundant binding.
-		uint64_t uniform_set_mask = 0;
-
-		_FORCE_INLINE_ void reset();
-		void end_encoding();
-
-		_ALWAYS_INLINE_ const MDSubpass &get_subpass() const {
-			DEV_ASSERT(pass != nullptr);
-			return pass->subpasses[current_subpass];
-		}
-
-		_FORCE_INLINE_ void mark_viewport_dirty() {
-			if (viewports.is_empty()) {
-				return;
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_VIEWPORT);
-		}
-
-		_FORCE_INLINE_ void mark_scissors_dirty() {
-			if (scissors.is_empty()) {
-				return;
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_SCISSOR);
-		}
-
-		_FORCE_INLINE_ void mark_vertex_dirty() {
-			if (vertex_buffers.is_empty()) {
-				return;
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_VERTEX);
-		}
-
-		_FORCE_INLINE_ void mark_uniforms_dirty(std::initializer_list<uint32_t> l) {
-			if (uniform_sets.is_empty()) {
-				return;
-			}
-			for (uint32_t i : l) {
-				if (i < uniform_sets.size() && uniform_sets[i] != nullptr) {
-					uniform_set_mask |= 1 << i;
-				}
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
-		}
-
-		_FORCE_INLINE_ void mark_uniforms_dirty() {
-			if (uniform_sets.is_empty()) {
-				return;
-			}
-			for (uint32_t i = 0; i < uniform_sets.size(); i++) {
-				if (uniform_sets[i] != nullptr) {
-					uniform_set_mask |= 1 << i;
-				}
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
-		}
-
-		_FORCE_INLINE_ void mark_blend_dirty() {
-			if (!blend_constants.has_value()) {
-				return;
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_BLEND);
-		}
-
-		MTL::ScissorRect clip_to_render_area(MTL::ScissorRect p_rect) const {
-			uint32_t raLeft = render_area.position.x;
-			uint32_t raRight = raLeft + render_area.size.width;
-			uint32_t raBottom = render_area.position.y;
-			uint32_t raTop = raBottom + render_area.size.height;
-
-			p_rect.x = CLAMP(p_rect.x, raLeft, MAX(raRight - 1, raLeft));
-			p_rect.y = CLAMP(p_rect.y, raBottom, MAX(raTop - 1, raBottom));
-			p_rect.width = MIN(p_rect.width, raRight - p_rect.x);
-			p_rect.height = MIN(p_rect.height, raTop - p_rect.y);
-
-			return p_rect;
-		}
-
-		Rect2i clip_to_render_area(Rect2i p_rect) const {
-			int32_t raLeft = render_area.position.x;
-			int32_t raRight = raLeft + render_area.size.width;
-			int32_t raBottom = render_area.position.y;
-			int32_t raTop = raBottom + render_area.size.height;
-
-			p_rect.position.x = CLAMP(p_rect.position.x, raLeft, MAX(raRight - 1, raLeft));
-			p_rect.position.y = CLAMP(p_rect.position.y, raBottom, MAX(raTop - 1, raBottom));
-			p_rect.size.width = MIN(p_rect.size.width, raRight - p_rect.position.x);
-			p_rect.size.height = MIN(p_rect.size.height, raTop - p_rect.position.y);
-
-			return p_rect;
-		}
-
-	} render;
-
-	// State specific for a compute pass.
-	struct ComputeState {
-		MDComputePipeline *pipeline = nullptr;
-		NS::SharedPtr<MTL::ComputeCommandEncoder> encoder;
-		ResourceTracker resource_tracker;
-		// clang-format off
-		enum DirtyFlag: uint16_t {
-			DIRTY_NONE     = 0,
-			DIRTY_PIPELINE = 1 << 0, //! pipeline state
-			DIRTY_UNIFORMS = 1 << 1, //! uniform sets
-			DIRTY_PUSH     = 1 << 2, //! push constants
-			DIRTY_ALL      = (1 << 3) - 1,
-		};
-		// clang-format on
-		BitField<DirtyFlag> dirty = DIRTY_NONE;
-
-		LocalVector<MDUniformSet *> uniform_sets;
-		uint32_t dynamic_offsets = 0;
-		// Bit mask of the uniform sets that are dirty, to prevent redundant binding.
-		uint64_t uniform_set_mask = 0;
-
-		_FORCE_INLINE_ void reset();
-		void end_encoding();
-
-		_FORCE_INLINE_ void mark_uniforms_dirty() {
-			if (uniform_sets.is_empty()) {
-				return;
-			}
-			for (uint32_t i = 0; i < uniform_sets.size(); i++) {
-				if (uniform_sets[i] != nullptr) {
-					uniform_set_mask |= 1 << i;
-				}
-			}
-			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
-		}
-	} compute;
-
-	// State specific to a blit pass.
-	struct {
-		NS::SharedPtr<MTL::BlitCommandEncoder> encoder;
-		_FORCE_INLINE_ void reset() {
-			encoder.reset();
-		}
-	} blit;
-
-	_FORCE_INLINE_ MTL::CommandBuffer *get_command_buffer() const {
-		return commandBuffer.get();
-	}
-
-	void begin() override;
-	void commit() override;
-	void end() override;
-
-	void bind_pipeline(RDD::PipelineID p_pipeline) override;
-
-#pragma mark - Render Commands
-
-	void render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) override;
-	void render_clear_attachments(VectorView<RDD::AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) override;
-	void render_begin_pass(RDD::RenderPassID p_render_pass,
-			RDD::FramebufferID p_frameBuffer,
-			RDD::CommandBufferType p_cmd_buffer_type,
-			const Rect2i &p_rect,
-			VectorView<RDD::RenderPassClearValue> p_clear_values) override;
-	void render_next_subpass() override;
-	void render_draw(uint32_t p_vertex_count,
-			uint32_t p_instance_count,
-			uint32_t p_base_vertex,
-			uint32_t p_first_instance) override;
-	void render_bind_vertex_buffers(uint32_t p_binding_count, const RDD::BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets) override;
-	void render_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint64_t p_offset) override;
-
-	void render_draw_indexed(uint32_t p_index_count,
-			uint32_t p_instance_count,
-			uint32_t p_first_index,
-			int32_t p_vertex_offset,
-			uint32_t p_first_instance) override;
-
-	void render_draw_indexed_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) override;
-	void render_draw_indexed_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) override;
-	void render_draw_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) override;
-	void render_draw_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) override;
-
-	void render_end_pass() override;
-
-#pragma mark - Compute Commands
-
-	void compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) override;
-	void compute_dispatch(uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) override;
-	void compute_dispatch_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset) override;
-
-#pragma mark - Transfer
-
-private:
-	MTL::RenderCommandEncoder *get_new_render_encoder_with_descriptor(MTL::RenderPassDescriptor *p_desc);
-
-public:
-	void resolve_texture(RDD::TextureID p_src_texture, RDD::TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, RDD::TextureID p_dst_texture, RDD::TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) override;
-	void clear_color_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, const Color &p_color, const RDD::TextureSubresourceRange &p_subresources) override;
-	void clear_depth_stencil_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const RDD::TextureSubresourceRange &p_subresources) override;
-	void clear_buffer(RDD::BufferID p_buffer, uint64_t p_offset, uint64_t p_size) override;
-	void copy_buffer(RDD::BufferID p_src_buffer, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferCopyRegion> p_regions) override;
-	void copy_texture(RDD::TextureID p_src_texture, RDD::TextureID p_dst_texture, VectorView<RDD::TextureCopyRegion> p_regions) override;
-	void copy_buffer_to_texture(RDD::BufferID p_src_buffer, RDD::TextureID p_dst_texture, VectorView<RDD::BufferTextureCopyRegion> p_regions) override;
-	void copy_texture_to_buffer(RDD::TextureID p_src_texture, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferTextureCopyRegion> p_regions) override;
-
-#pragma mark - Synchronization
-
-	void pipeline_barrier(BitField<RDD::PipelineStageBits> p_src_stages,
-			BitField<RDD::PipelineStageBits> p_dst_stages,
-			VectorView<RDD::MemoryAccessBarrier> p_memory_barriers,
-			VectorView<RDD::BufferBarrier> p_buffer_barriers,
-			VectorView<RDD::TextureBarrier> p_texture_barriers,
-			VectorView<RDD::AccelerationStructureBarrier> p_acceleration_structure_barriers) override;
-
-#pragma mark - Debugging
-
-	void begin_label(const char *p_label_name, const Color &p_color) override;
-	void end_label() override;
-
-	MDCommandBuffer(MTL::CommandQueue *p_queue, ::RenderingDeviceDriverMetal *p_device_driver);
-	MDCommandBuffer() = default;
-};
-
-} // namespace MTL3
-
-// C++ helper to get mipmap level size from texture
-_FORCE_INLINE_ static MTL::Size mipmapLevelSizeFromTexture(MTL::Texture *p_tex, NS::UInteger p_level) {
-	MTL::Size lvlSize;
-	lvlSize.width = MAX(p_tex->width() >> p_level, 1UL);
-	lvlSize.height = MAX(p_tex->height() >> p_level, 1UL);
-	lvlSize.depth = MAX(p_tex->depth() >> p_level, 1UL);
-	return lvlSize;
-}
diff --git a/engine/drivers/metal/metal_device_profile.cpp b/engine/drivers/metal/metal_device_profile.cpp
index d7eb025d..d373dbd4 100644
--- a/engine/drivers/metal/metal_device_profile.cpp
+++ b/engine/drivers/metal/metal_device_profile.cpp
@@ -30,7 +30,7 @@
 
 #include "metal_device_profile.h"
 
-#include "drivers/metal/metal_utils.h"
+#include "metal_utils.h"
 
 Mutex MetalDeviceProfile::profiles_lock;
 HashMap<MetalDeviceProfile::ProfileKey, MetalDeviceProfile> MetalDeviceProfile::profiles;
diff --git a/engine/drivers/metal/metal_device_properties.h b/engine/drivers/metal/metal_device_properties.h
index 093c05e5..447e485d 100644
--- a/engine/drivers/metal/metal_device_properties.h
+++ b/engine/drivers/metal/metal_device_properties.h
@@ -50,17 +50,16 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#include "servers/rendering/rendering_device_driver.h"
+#import "servers/rendering/rendering_device.h"
 
-#include <Metal/Metal.hpp>
-
-#include <cstddef>
+#import <Foundation/Foundation.h>
+#import <Metal/Metal.h>
 
 /** The buffer index to use for vertex content. */
 const static uint32_t VERT_CONTENT_BUFFER_INDEX = 0;
 const static uint32_t MAX_COLOR_ATTACHMENT_COUNT = 8;
 
-enum SampleCount : NS::UInteger {
+typedef NS_OPTIONS(NSUInteger, SampleCount) {
 	SampleCount1 = (1UL << 0),
 	SampleCount2 = (1UL << 1),
 	SampleCount4 = (1UL << 2),
@@ -70,22 +69,6 @@ enum SampleCount : NS::UInteger {
 	SampleCount64 = (1UL << 6),
 };
 
-_FORCE_INLINE_ SampleCount operator|(SampleCount a, SampleCount b) {
-	return static_cast<SampleCount>(static_cast<NS::UInteger>(a) | static_cast<NS::UInteger>(b));
-}
-
-_FORCE_INLINE_ SampleCount &operator|=(SampleCount &a, SampleCount b) {
-	return a = a | b;
-}
-
-_FORCE_INLINE_ SampleCount operator<<(SampleCount a, int shift) {
-	return static_cast<SampleCount>(static_cast<NS::UInteger>(a) << shift);
-}
-
-_FORCE_INLINE_ SampleCount &operator<<=(SampleCount &a, int shift) {
-	return a = a << shift;
-}
-
 struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalFeatures {
 	/// Maximum version of the Metal Shading Language version available.
 	uint32_t msl_max_version = 0;
@@ -95,7 +78,7 @@ struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalFeatures {
 	 * for engine developers for testing.
 	 */
 	uint32_t msl_target_version = 0;
-	MTL::GPUFamily highestFamily = MTL::GPUFamilyApple4;
+	MTLGPUFamily highestFamily = MTLGPUFamilyApple4;
 	bool supportsBCTextureCompression = false;
 	bool supportsDepth24Stencil8 = false;
 	bool supports32BitFloatFiltering = false;
@@ -110,7 +93,7 @@ struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalFeatures {
 	bool simdReduction = false; /**< If true, SIMD-group reduction functions (arithmetic) are supported in shaders. */
 	bool tessellationShader = false; /**< If true, tessellation shaders are supported. */
 	bool imageCubeArray = false; /**< If true, image cube arrays are supported. */
-	MTL::ArgumentBuffersTier argument_buffers_tier = MTL::ArgumentBuffersTier1;
+	MTLArgumentBuffersTier argument_buffers_tier = MTLArgumentBuffersTier1;
 	bool needs_arg_encoders = true; /**< If true, argument encoders are required to encode arguments into an argument buffer. */
 	bool use_argument_buffers = true; /**< If true, argument buffers are can be used instead of slot binding, if available. */
 	bool metal_fx_spatial = false; /**< If true, Metal FX spatial functions are supported. */
@@ -119,14 +102,13 @@ struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalFeatures {
 	bool supports_image_atomic_32_bit = false; /**< If true, 32-bit atomic operations on images are supported by the GPU. */
 	bool supports_image_atomic_64_bit = false; /**< If true, 64-bit atomic operations on images are supported by the GPU. */
 	bool supports_native_image_atomics = false; /**< If true, native image atomic operations are supported by the OS. */
-	bool supports_border_color = false; /**< If true, sampler border color (clamp-to-border) is supported. Requires Apple7+. */
 	bool supports_residency_sets = false; /**< If true, residency sets (MTLResidencySet) are supported by the OS. */
 
 	/*!
 	 * Check if argument buffers are fully supported, which requires tier 2 support and no need for argument encoders.
 	 */
 	_FORCE_INLINE_ bool argument_buffers_supported() const {
-		return argument_buffers_tier == MTL::ArgumentBuffersTier2 && needs_arg_encoders == false;
+		return argument_buffers_tier == MTLArgumentBuffersTier2 && needs_arg_encoders == false;
 	}
 
 	/*!
@@ -147,8 +129,8 @@ struct MetalLimits {
 	uint64_t maxImageDimensionCube;
 	uint64_t maxViewportDimensionX;
 	uint64_t maxViewportDimensionY;
-	MTL::Size maxThreadsPerThreadGroup;
-	MTL::Size maxComputeWorkGroupCount;
+	MTLSize maxThreadsPerThreadGroup;
+	MTLSize maxComputeWorkGroupCount;
 	uint64_t maxBoundDescriptorSets;
 	uint64_t maxColorAttachments;
 	uint64_t maxTexturesPerArgumentBuffer;
@@ -174,13 +156,13 @@ struct MetalLimits {
 	uint32_t minSubgroupSize; /**< The minimum number of threads in a SIMD-group. */
 	uint32_t maxSubgroupSize; /**< The maximum number of threads in a SIMD-group. */
 	BitField<RDD::ShaderStage> subgroupSupportedShaderStages;
-	BitField<RDD::SubgroupOperations> subgroupSupportedOperations; /**< The subgroup operations supported by the device. */
+	BitField<RD::SubgroupOperations> subgroupSupportedOperations; /**< The subgroup operations supported by the device. */
 };
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalDeviceProperties {
 private:
-	void init_features(MTL::Device *p_device);
-	void init_limits(MTL::Device *p_device);
+	void init_features(id<MTLDevice> p_device);
+	void init_limits(id<MTLDevice> p_device);
 	void init_os_props();
 
 public:
@@ -190,11 +172,11 @@ public:
 	// maj * 10000 + min * 100 + patch
 	uint32_t os_version;
 
-	SampleCount find_nearest_supported_sample_count(RDD::TextureSamples p_samples) const;
+	SampleCount find_nearest_supported_sample_count(RenderingDevice::TextureSamples p_samples) const;
 
-	MetalDeviceProperties(MTL::Device *p_device);
+	MetalDeviceProperties(id<MTLDevice> p_device);
 	~MetalDeviceProperties();
 
 private:
-	static const SampleCount sample_count[RDD::TextureSamples::TEXTURE_SAMPLES_MAX];
+	static const SampleCount sample_count[RenderingDevice::TextureSamples::TEXTURE_SAMPLES_MAX];
 };
diff --git a/engine/drivers/metal/metal_device_properties.cpp b/engine/drivers/metal/metal_device_properties.mm
similarity index 68%
rename from engine/drivers/metal/metal_device_properties.cpp
rename to engine/drivers/metal/metal_device_properties.mm
index aca31d64..2abec4b4 100644
--- a/engine/drivers/metal/metal_device_properties.cpp
+++ b/engine/drivers/metal/metal_device_properties.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  metal_device_properties.cpp                                           */
+/*  metal_device_properties.mm                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -48,45 +48,41 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#include "metal_device_properties.h"
+#import "metal_device_properties.h"
 
-#include "core/os/os.h"
-#include "drivers/metal/metal_utils.h"
-#include "servers/rendering/renderer_rd/effects/metal_fx.h"
+#import "metal_utils.h"
 
-#include <MetalFX/MetalFX.hpp>
-#include <spirv_cross.hpp>
-#include <spirv_msl.hpp>
-#include <unistd.h>
+#import "servers/rendering/renderer_rd/effects/metal_fx.h"
+
+#import <Metal/Metal.h>
+#import <MetalFX/MetalFX.h>
+#import <spirv_cross.hpp>
+#import <spirv_msl.hpp>
 
 // Common scaling multipliers.
 #define KIBI (1024)
 #define MEBI (KIBI * KIBI)
 
 #if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED < 170000)
-constexpr MTL::GPUFamily GPUFamilyApple9 = static_cast<MTL::GPUFamily>(1009);
-#else
-constexpr MTL::GPUFamily GPUFamilyApple9 = MTL::GPUFamilyApple9;
+#define MTLGPUFamilyApple9 (MTLGPUFamily)1009
 #endif
 
 API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(1.0))
-MTL::GPUFamily &operator--(MTL::GPUFamily &p_family) {
-	p_family = static_cast<MTL::GPUFamily>(static_cast<int>(p_family) - 1);
-	if (p_family < MTL::GPUFamilyApple1) {
-		p_family = GPUFamilyApple9;
+MTLGPUFamily &operator--(MTLGPUFamily &p_family) {
+	p_family = static_cast<MTLGPUFamily>(static_cast<int>(p_family) - 1);
+	if (p_family < MTLGPUFamilyApple1) {
+		p_family = MTLGPUFamilyApple9;
 	}
 
 	return p_family;
 }
 
-void MetalDeviceProperties::init_features(MTL::Device *p_device) {
+void MetalDeviceProperties::init_features(id<MTLDevice> p_device) {
 	features = {};
 
-	MTL::CompileOptions *opts = MTL::CompileOptions::alloc()->init();
-	MTL::LanguageVersion lang_version = opts->languageVersion();
-	features.msl_max_version = make_msl_version((static_cast<uint32_t>(lang_version) >> 0x10) & 0xff, (static_cast<uint32_t>(lang_version) >> 0x00) & 0xff);
+	MTLCompileOptions *opts = [MTLCompileOptions new];
+	features.msl_max_version = make_msl_version((opts.languageVersion >> 0x10) & 0xff, (opts.languageVersion >> 0x00) & 0xff);
 	features.msl_target_version = features.msl_max_version;
-	opts->release();
 	if (String version = OS::get_singleton()->get_environment("GODOT_MTL_TARGET_VERSION"); !version.is_empty()) {
 		if (version != "max") {
 			Vector<String> parts = version.split(".", true, 2);
@@ -106,56 +102,55 @@ void MetalDeviceProperties::init_features(MTL::Device *p_device) {
 		}
 	}
 
-	features.highestFamily = MTL::GPUFamilyApple1;
-	for (MTL::GPUFamily family = GPUFamilyApple9; family >= MTL::GPUFamilyApple1; --family) {
-		if (p_device->supportsFamily(family)) {
+	features.highestFamily = MTLGPUFamilyApple1;
+	for (MTLGPUFamily family = MTLGPUFamilyApple9; family >= MTLGPUFamilyApple1; --family) {
+		if ([p_device supportsFamily:family]) {
 			features.highestFamily = family;
 			break;
 		}
 	}
 
-	if (__builtin_available(macOS 11, iOS 16.4, tvOS 16.4, *)) {
-		features.supportsBCTextureCompression = p_device->supportsBCTextureCompression();
+	if (@available(macOS 11, iOS 16.4, tvOS 16.4, *)) {
+		features.supportsBCTextureCompression = p_device.supportsBCTextureCompression;
 	} else {
 		features.supportsBCTextureCompression = false;
 	}
 
 #if TARGET_OS_OSX
-	features.supportsDepth24Stencil8 = p_device->isDepth24Stencil8PixelFormatSupported();
+	features.supportsDepth24Stencil8 = p_device.isDepth24Stencil8PixelFormatSupported;
 #endif
 
-	if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
-		features.supports32BitFloatFiltering = p_device->supports32BitFloatFiltering();
-		features.supports32BitMSAA = p_device->supports32BitMSAA();
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		features.supports32BitFloatFiltering = p_device.supports32BitFloatFiltering;
+		features.supports32BitMSAA = p_device.supports32BitMSAA;
 	}
 
-	if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
+	if (@available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
 		features.supports_gpu_address = true;
 	}
 
 	features.hostMemoryPageSize = sysconf(_SC_PAGESIZE);
 
 	for (SampleCount sc = SampleCount1; sc <= SampleCount64; sc <<= 1) {
-		if (p_device->supportsTextureSampleCount(sc)) {
+		if ([p_device supportsTextureSampleCount:sc]) {
 			features.supportedSampleCounts |= sc;
 		}
 	}
 
-	features.layeredRendering = p_device->supportsFamily(MTL::GPUFamilyApple5);
-	features.multisampleLayeredRendering = p_device->supportsFamily(MTL::GPUFamilyApple7);
-	features.tessellationShader = p_device->supportsFamily(MTL::GPUFamilyApple3);
-	features.imageCubeArray = p_device->supportsFamily(MTL::GPUFamilyApple3);
-	features.quadPermute = p_device->supportsFamily(MTL::GPUFamilyApple4);
-	features.simdPermute = p_device->supportsFamily(MTL::GPUFamilyApple6);
-	features.simdReduction = p_device->supportsFamily(MTL::GPUFamilyApple7);
-	features.supports_border_color = p_device->supportsFamily(MTL::GPUFamilyApple7);
-	features.argument_buffers_tier = p_device->argumentBuffersSupport();
-	features.supports_image_atomic_32_bit = p_device->supportsFamily(MTL::GPUFamilyApple6);
-	features.supports_image_atomic_64_bit = p_device->supportsFamily(GPUFamilyApple9) || (p_device->supportsFamily(MTL::GPUFamilyApple8) && p_device->supportsFamily(MTL::GPUFamilyMac2));
+	features.layeredRendering = [p_device supportsFamily:MTLGPUFamilyApple5];
+	features.multisampleLayeredRendering = [p_device supportsFamily:MTLGPUFamilyApple7];
+	features.tessellationShader = [p_device supportsFamily:MTLGPUFamilyApple3];
+	features.imageCubeArray = [p_device supportsFamily:MTLGPUFamilyApple3];
+	features.quadPermute = [p_device supportsFamily:MTLGPUFamilyApple4];
+	features.simdPermute = [p_device supportsFamily:MTLGPUFamilyApple6];
+	features.simdReduction = [p_device supportsFamily:MTLGPUFamilyApple7];
+	features.argument_buffers_tier = p_device.argumentBuffersSupport;
+	features.supports_image_atomic_32_bit = [p_device supportsFamily:MTLGPUFamilyApple6];
+	features.supports_image_atomic_64_bit = [p_device supportsFamily:MTLGPUFamilyApple9] || ([p_device supportsFamily:MTLGPUFamilyApple8] && [p_device supportsFamily:MTLGPUFamilyMac2]);
 
 	if (features.msl_target_version >= MSL_VERSION_31) {
 		// Native atomics are only supported on 3.1 and above.
-		if (__builtin_available(macOS 14.0, iOS 17.0, tvOS 17.0, visionOS 1.0, *)) {
+		if (@available(macOS 14.0, iOS 17.0, tvOS 17.0, visionOS 1.0, *)) {
 			features.supports_native_image_atomics = true;
 		}
 	}
@@ -164,31 +159,31 @@ void MetalDeviceProperties::init_features(MTL::Device *p_device) {
 		features.supports_native_image_atomics = false;
 	}
 
-	if (__builtin_available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
+	if (@available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
 		features.supports_residency_sets = true;
 	} else {
 		features.supports_residency_sets = false;
 	}
 
-	if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
-		features.needs_arg_encoders = !(p_device->supportsFamily(MTL::GPUFamilyMetal3) && features.argument_buffers_tier == MTL::ArgumentBuffersTier2);
+	if (@available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
+		features.needs_arg_encoders = !([p_device supportsFamily:MTLGPUFamilyMetal3] && features.argument_buffers_tier == MTLArgumentBuffersTier2);
 	}
 
 	if (String v = OS::get_singleton()->get_environment("GODOT_MTL_DISABLE_ARGUMENT_BUFFERS"); v == "1") {
 		features.use_argument_buffers = false;
 	}
 
-	if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
-		features.metal_fx_spatial = MTLFX::SpatialScalerDescriptor::supportsDevice(p_device);
+	if (@available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
+		features.metal_fx_spatial = [MTLFXSpatialScalerDescriptor supportsDevice:p_device];
 #ifdef METAL_MFXTEMPORAL_ENABLED
-		features.metal_fx_temporal = MTLFX::TemporalScalerDescriptor::supportsDevice(p_device);
+		features.metal_fx_temporal = [MTLFXTemporalScalerDescriptor supportsDevice:p_device];
 #else
 		features.metal_fx_temporal = false;
 #endif
 	}
 }
 
-void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
+void MetalDeviceProperties::init_limits(id<MTLDevice> p_device) {
 	using std::max;
 	using std::min;
 
@@ -196,7 +191,7 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 
 	// FST: Maximum number of layers per 1D texture array, 2D texture array, or 3D texture.
 	limits.maxImageArrayLayers = 2048;
-	if (p_device->supportsFamily(MTL::GPUFamilyApple3)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple3]) {
 		// FST: Maximum 2D texture width and height.
 		limits.maxFramebufferWidth = 16384;
 		limits.maxFramebufferHeight = 16384;
@@ -224,7 +219,7 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 	// FST: Maximum 3D texture width, height, and depth.
 	limits.maxImageDimension3D = 2048;
 
-	limits.maxThreadsPerThreadGroup = p_device->maxThreadsPerThreadgroup();
+	limits.maxThreadsPerThreadGroup = p_device.maxThreadsPerThreadgroup;
 	// No effective limits.
 	limits.maxComputeWorkGroupCount = { std::numeric_limits<uint32_t>::max(), std::numeric_limits<uint32_t>::max(), std::numeric_limits<uint32_t>::max() };
 	// https://github.com/KhronosGroup/MoltenVK/blob/568cc3acc0e2299931fdaecaaa1fc3ec5b4af281/MoltenVK/MoltenVK/GPUObjects/MVKDevice.h#L85
@@ -233,25 +228,25 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 	limits.maxColorAttachments = 8;
 
 	// Maximum number of textures the device can access, per stage, from an argument buffer.
-	if (p_device->supportsFamily(MTL::GPUFamilyApple6)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple6]) {
 		limits.maxTexturesPerArgumentBuffer = 1'000'000;
-	} else if (p_device->supportsFamily(MTL::GPUFamilyApple4)) {
+	} else if ([p_device supportsFamily:MTLGPUFamilyApple4]) {
 		limits.maxTexturesPerArgumentBuffer = 96;
 	} else {
 		limits.maxTexturesPerArgumentBuffer = 31;
 	}
 
 	// Maximum number of samplers the device can access, per stage, from an argument buffer.
-	if (p_device->supportsFamily(MTL::GPUFamilyApple6)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple6]) {
 		limits.maxSamplersPerArgumentBuffer = 1024;
 	} else {
 		limits.maxSamplersPerArgumentBuffer = 16;
 	}
 
 	// Maximum number of buffers the device can access, per stage, from an argument buffer.
-	if (p_device->supportsFamily(MTL::GPUFamilyApple6)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple6]) {
 		limits.maxBuffersPerArgumentBuffer = std::numeric_limits<uint64_t>::max();
-	} else if (p_device->supportsFamily(MTL::GPUFamilyApple4)) {
+	} else if ([p_device supportsFamily:MTLGPUFamilyApple4]) {
 		limits.maxBuffersPerArgumentBuffer = 96;
 	} else {
 		limits.maxBuffersPerArgumentBuffer = 31;
@@ -272,29 +267,29 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 	}
 	limits.subgroupSupportedShaderStages.set_flag(RDD::ShaderStage::SHADER_STAGE_FRAGMENT_BIT);
 
-	limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_BASIC_BIT);
+	limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_BASIC_BIT);
 	if (features.simdPermute || features.quadPermute) {
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_VOTE_BIT);
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_BALLOT_BIT);
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_SHUFFLE_BIT);
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_SHUFFLE_RELATIVE_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_VOTE_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_BALLOT_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_SHUFFLE_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_SHUFFLE_RELATIVE_BIT);
 	}
 
 	if (features.simdReduction) {
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_ARITHMETIC_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_ARITHMETIC_BIT);
 	}
 
 	if (features.quadPermute) {
-		limits.subgroupSupportedOperations.set_flag(RDD::SubgroupOperations::SUBGROUP_QUAD_BIT);
+		limits.subgroupSupportedOperations.set_flag(RD::SubgroupOperations::SUBGROUP_QUAD_BIT);
 	}
 
-	limits.maxBufferLength = p_device->maxBufferLength();
+	limits.maxBufferLength = p_device.maxBufferLength;
 
 	// FST: Maximum size of vertex descriptor layout stride.
 	limits.maxVertexDescriptorLayoutStride = std::numeric_limits<uint64_t>::max();
 
 	// Maximum number of viewports.
-	if (p_device->supportsFamily(MTL::GPUFamilyApple5)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple5]) {
 		limits.maxViewports = 16;
 	} else {
 		limits.maxViewports = 1;
@@ -302,9 +297,9 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 
 	limits.maxPerStageBufferCount = 31;
 	limits.maxPerStageSamplerCount = 16;
-	if (p_device->supportsFamily(MTL::GPUFamilyApple6)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple6]) {
 		limits.maxPerStageTextureCount = 128;
-	} else if (p_device->supportsFamily(MTL::GPUFamilyApple4)) {
+	} else if ([p_device supportsFamily:MTLGPUFamilyApple4]) {
 		limits.maxPerStageTextureCount = 96;
 	} else {
 		limits.maxPerStageTextureCount = 31;
@@ -315,9 +310,9 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 	limits.maxVertexInputBindingStride = (2 * KIBI);
 	limits.maxShaderVaryings = 31; // Accurate on Apple4 and above. See: https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
 
-	if (p_device->supportsFamily(MTL::GPUFamilyApple4)) {
+	if ([p_device supportsFamily:MTLGPUFamilyApple4]) {
 		limits.maxThreadGroupMemoryAllocation = 32768;
-	} else if (p_device->supportsFamily(MTL::GPUFamilyApple3)) {
+	} else if ([p_device supportsFamily:MTLGPUFamilyApple3]) {
 		limits.maxThreadGroupMemoryAllocation = 16384;
 	} else {
 		limits.maxThreadGroupMemoryAllocation = 16352;
@@ -335,9 +330,9 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 	limits.maxDrawIndexedIndexValue = std::numeric_limits<uint32_t>::max() - 1;
 
 #ifdef METAL_MFXTEMPORAL_ENABLED
-	if (__builtin_available(macOS 14.0, iOS 17.0, tvOS 17.0, *)) {
-		limits.temporalScalerInputContentMinScale = MTLFX::TemporalScalerDescriptor::supportedInputContentMinScale(p_device);
-		limits.temporalScalerInputContentMaxScale = MTLFX::TemporalScalerDescriptor::supportedInputContentMaxScale(p_device);
+	if (@available(macOS 14.0, iOS 17.0, tvOS 17.0, *)) {
+		limits.temporalScalerInputContentMinScale = (double)[MTLFXTemporalScalerDescriptor supportedInputContentMinScaleForDevice:p_device];
+		limits.temporalScalerInputContentMaxScale = (double)[MTLFXTemporalScalerDescriptor supportedInputContentMaxScaleForDevice:p_device];
 	} else {
 		// Defaults taken from macOS 14+
 		limits.temporalScalerInputContentMinScale = 1.0;
@@ -351,11 +346,11 @@ void MetalDeviceProperties::init_limits(MTL::Device *p_device) {
 }
 
 void MetalDeviceProperties::init_os_props() {
-	NS::OperatingSystemVersion ver = NS::ProcessInfo::processInfo()->operatingSystemVersion();
+	NSOperatingSystemVersion ver = NSProcessInfo.processInfo.operatingSystemVersion;
 	os_version = (uint32_t)ver.majorVersion * 10000 + (uint32_t)ver.minorVersion * 100 + (uint32_t)ver.patchVersion;
 }
 
-MetalDeviceProperties::MetalDeviceProperties(MTL::Device *p_device) {
+MetalDeviceProperties::MetalDeviceProperties(id<MTLDevice> p_device) {
 	init_features(p_device);
 	init_limits(p_device);
 	init_os_props();
@@ -364,7 +359,7 @@ MetalDeviceProperties::MetalDeviceProperties(MTL::Device *p_device) {
 MetalDeviceProperties::~MetalDeviceProperties() {
 }
 
-SampleCount MetalDeviceProperties::find_nearest_supported_sample_count(RenderingDeviceCommons::TextureSamples p_samples) const {
+SampleCount MetalDeviceProperties::find_nearest_supported_sample_count(RenderingDevice::TextureSamples p_samples) const {
 	SampleCount supported = features.supportedSampleCounts;
 	if (supported & sample_count[p_samples]) {
 		return sample_count[p_samples];
@@ -384,7 +379,7 @@ SampleCount MetalDeviceProperties::find_nearest_supported_sample_count(Rendering
 
 // region static members
 
-const SampleCount MetalDeviceProperties::sample_count[RenderingDeviceCommons::TextureSamples::TEXTURE_SAMPLES_MAX] = {
+const SampleCount MetalDeviceProperties::sample_count[RenderingDevice::TextureSamples::TEXTURE_SAMPLES_MAX] = {
 	SampleCount1,
 	SampleCount2,
 	SampleCount4,
diff --git a/engine/drivers/metal/metal_objects.h b/engine/drivers/metal/metal_objects.h
new file mode 100644
index 00000000..8f6e3222
--- /dev/null
+++ b/engine/drivers/metal/metal_objects.h
@@ -0,0 +1,1086 @@
+/**************************************************************************/
+/*  metal_objects.h                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+/**************************************************************************/
+/*                                                                        */
+/* Portions of this code were derived from MoltenVK.                      */
+/*                                                                        */
+/* Copyright (c) 2015-2023 The Brenwill Workshop Ltd.                     */
+/* (http://www.brenwill.com)                                              */
+/*                                                                        */
+/* 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                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/**************************************************************************/
+
+#import "metal_device_properties.h"
+#import "metal_objects_shared.h"
+#import "metal_utils.h"
+#import "pixel_formats.h"
+#import "sha256_digest.h"
+
+#include "servers/rendering/rendering_device_driver.h"
+
+#import <CommonCrypto/CommonDigest.h>
+#import <Foundation/Foundation.h>
+#import <Metal/Metal.h>
+#import <QuartzCore/CAMetalLayer.h>
+#import <simd/simd.h>
+#import <zlib.h>
+#import <initializer_list>
+#import <memory>
+#import <optional>
+
+enum StageResourceUsage : uint32_t {
+	ResourceUnused = 0,
+	VertexRead = (MTLResourceUsageRead << RDD::SHADER_STAGE_VERTEX * 2),
+	VertexWrite = (MTLResourceUsageWrite << RDD::SHADER_STAGE_VERTEX * 2),
+	FragmentRead = (MTLResourceUsageRead << RDD::SHADER_STAGE_FRAGMENT * 2),
+	FragmentWrite = (MTLResourceUsageWrite << RDD::SHADER_STAGE_FRAGMENT * 2),
+	TesselationControlRead = (MTLResourceUsageRead << RDD::SHADER_STAGE_TESSELATION_CONTROL * 2),
+	TesselationControlWrite = (MTLResourceUsageWrite << RDD::SHADER_STAGE_TESSELATION_CONTROL * 2),
+	TesselationEvaluationRead = (MTLResourceUsageRead << RDD::SHADER_STAGE_TESSELATION_EVALUATION * 2),
+	TesselationEvaluationWrite = (MTLResourceUsageWrite << RDD::SHADER_STAGE_TESSELATION_EVALUATION * 2),
+	ComputeRead = (MTLResourceUsageRead << RDD::SHADER_STAGE_COMPUTE * 2),
+	ComputeWrite = (MTLResourceUsageWrite << RDD::SHADER_STAGE_COMPUTE * 2),
+};
+
+typedef id<MTLResource> __unsafe_unretained MTLResourceUnsafe;
+
+template <>
+struct HashMapHasherDefaultImpl<MTLResourceUnsafe> {
+	static _FORCE_INLINE_ uint32_t hash(const MTLResourceUnsafe p_pointer) { return hash_one_uint64((uint64_t)p_pointer); }
+};
+
+typedef LocalVector<MTLResourceUnsafe> ResourceVector;
+typedef HashMap<StageResourceUsage, ResourceVector> ResourceUsageMap;
+
+struct ResourceUsageEntry {
+	StageResourceUsage usage = ResourceUnused;
+	uint32_t unused = 0;
+
+	ResourceUsageEntry() {}
+	ResourceUsageEntry(StageResourceUsage p_usage) :
+			usage(p_usage) {}
+};
+
+template <>
+struct is_zero_constructible<ResourceUsageEntry> : std::true_type {};
+
+/*! Track the cumulative usage for a resource during a render or compute pass */
+typedef HashMap<MTLResourceUnsafe, ResourceUsageEntry> ResourceToStageUsage;
+
+/*! Track resource and ensure they are resident prior to dispatch or draw commands.
+ *
+ * The primary purpose of this data structure is to track all the resources that must be made resident prior
+ * to issuing the next dispatch or draw command. It aggregates all resources used from argument buffers.
+ *
+ * As an optimization, this data structure also tracks previous usage for resources, so that
+ * it may avoid binding them again in later commands if the resource is already resident and its usage flagged.
+ */
+struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) ResourceTracker {
+	// A constant specifying how many iterations a resource can remain in
+	// the _previous HashSet before it will be removed permanently.
+	//
+	// Keeping them in the _previous HashMap reduces churn if resources are regularly
+	// bound. 256 is arbitrary, but if an object remains unused for 256 encoders,
+	// it will be released.
+	static constexpr uint32_t RESOURCE_UNUSED_CLEANUP_COUNT = 256;
+
+	// Used as a scratch buffer to periodically clean up resources from _previous.
+	ResourceVector _scratch;
+	// Tracks all resources and their prior usage for the duration of the encoder.
+	ResourceToStageUsage _previous;
+	// Tracks resources for the current command that must be made resident
+	ResourceUsageMap _current;
+
+	void merge_from(const ResourceUsageMap &p_from);
+	void encode(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc);
+	void encode(id<MTLComputeCommandEncoder> __unsafe_unretained p_enc);
+	void reset();
+};
+
+enum class MDCommandBufferStateType {
+	None,
+	Render,
+	Compute,
+	Blit,
+};
+
+enum class MDPipelineType {
+	None,
+	Render,
+	Compute,
+};
+
+class MDRenderPass;
+class MDPipeline;
+class MDRenderPipeline;
+class MDComputePipeline;
+class RenderingDeviceDriverMetal;
+class MDUniformSet;
+class MDShader;
+
+struct MetalBufferDynamicInfo;
+
+using RDM = RenderingDeviceDriverMetal;
+
+#pragma mark - Resource Factory
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDResourceFactory {
+private:
+	RenderingDeviceDriverMetal *device_driver;
+
+	id<MTLFunction> new_func(NSString *p_source, NSString *p_name, NSError **p_error);
+	id<MTLFunction> new_clear_vert_func(ClearAttKey &p_key);
+	id<MTLFunction> new_clear_frag_func(ClearAttKey &p_key);
+	NSString *get_format_type_string(MTLPixelFormat p_fmt);
+
+public:
+	id<MTLRenderPipelineState> new_clear_pipeline_state(ClearAttKey &p_key, NSError **p_error);
+	id<MTLDepthStencilState> new_depth_stencil_state(bool p_use_depth, bool p_use_stencil);
+
+	MDResourceFactory(RenderingDeviceDriverMetal *p_device_driver) :
+			device_driver(p_device_driver) {}
+	~MDResourceFactory() = default;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDResourceCache {
+private:
+	typedef HashMap<ClearAttKey, id<MTLRenderPipelineState>> HashMap;
+	std::unique_ptr<MDResourceFactory> resource_factory;
+	HashMap clear_states;
+
+	struct {
+		id<MTLDepthStencilState> all;
+		id<MTLDepthStencilState> depth_only;
+		id<MTLDepthStencilState> stencil_only;
+		id<MTLDepthStencilState> none;
+	} clear_depth_stencil_state;
+
+public:
+	id<MTLRenderPipelineState> get_clear_render_pipeline_state(ClearAttKey &p_key, NSError **p_error);
+	id<MTLDepthStencilState> get_depth_stencil_state(bool p_use_depth, bool p_use_stencil);
+
+	explicit MDResourceCache(RenderingDeviceDriverMetal *p_device_driver) :
+			resource_factory(new MDResourceFactory(p_device_driver)) {}
+	~MDResourceCache() = default;
+};
+
+enum class MDAttachmentType : uint8_t {
+	None = 0,
+	Color = 1 << 0,
+	Depth = 1 << 1,
+	Stencil = 1 << 2,
+};
+
+_FORCE_INLINE_ MDAttachmentType &operator|=(MDAttachmentType &p_a, MDAttachmentType p_b) {
+	flags::set(p_a, p_b);
+	return p_a;
+}
+
+_FORCE_INLINE_ bool operator&(MDAttachmentType p_a, MDAttachmentType p_b) {
+	return uint8_t(p_a) & uint8_t(p_b);
+}
+
+struct MDSubpass {
+	uint32_t subpass_index = 0;
+	uint32_t view_count = 0;
+	LocalVector<RDD::AttachmentReference> input_references;
+	LocalVector<RDD::AttachmentReference> color_references;
+	RDD::AttachmentReference depth_stencil_reference;
+	LocalVector<RDD::AttachmentReference> resolve_references;
+
+	MTLFmtCaps getRequiredFmtCapsForAttachmentAt(uint32_t p_index) const;
+};
+
+struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDAttachment {
+private:
+	uint32_t index = 0;
+	uint32_t firstUseSubpassIndex = 0;
+	uint32_t lastUseSubpassIndex = 0;
+
+public:
+	MTLPixelFormat format = MTLPixelFormatInvalid;
+	MDAttachmentType type = MDAttachmentType::None;
+	MTLLoadAction loadAction = MTLLoadActionDontCare;
+	MTLStoreAction storeAction = MTLStoreActionDontCare;
+	MTLLoadAction stencilLoadAction = MTLLoadActionDontCare;
+	MTLStoreAction stencilStoreAction = MTLStoreActionDontCare;
+	uint32_t samples = 1;
+
+	/*!
+	 * @brief Returns true if this attachment is first used in the given subpass.
+	 * @param p_subpass
+	 * @return
+	 */
+	_FORCE_INLINE_ bool isFirstUseOf(MDSubpass const &p_subpass) const {
+		return p_subpass.subpass_index == firstUseSubpassIndex;
+	}
+
+	/*!
+	 * @brief Returns true if this attachment is last used in the given subpass.
+	 * @param p_subpass
+	 * @return
+	 */
+	_FORCE_INLINE_ bool isLastUseOf(MDSubpass const &p_subpass) const {
+		return p_subpass.subpass_index == lastUseSubpassIndex;
+	}
+
+	void linkToSubpass(MDRenderPass const &p_pass);
+
+	MTLStoreAction getMTLStoreAction(MDSubpass const &p_subpass,
+			bool p_is_rendering_entire_area,
+			bool p_has_resolve,
+			bool p_can_resolve,
+			bool p_is_stencil) const;
+	bool configureDescriptor(MTLRenderPassAttachmentDescriptor *p_desc,
+			PixelFormats &p_pf,
+			MDSubpass const &p_subpass,
+			id<MTLTexture> p_attachment,
+			bool p_is_rendering_entire_area,
+			bool p_has_resolve,
+			bool p_can_resolve,
+			bool p_is_stencil) const;
+	/** Returns whether this attachment should be cleared in the subpass. */
+	bool shouldClear(MDSubpass const &p_subpass, bool p_is_stencil) const;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDRenderPass {
+public:
+	Vector<MDAttachment> attachments;
+	Vector<MDSubpass> subpasses;
+
+	uint32_t get_sample_count() const {
+		return attachments.is_empty() ? 1 : attachments[0].samples;
+	}
+
+	MDRenderPass(Vector<MDAttachment> &p_attachments, Vector<MDSubpass> &p_subpasses);
+};
+
+struct BindingCache {
+	struct BufferBinding {
+		id<MTLBuffer> __unsafe_unretained buffer = nil;
+		NSUInteger offset = 0;
+
+		bool operator!=(const BufferBinding &p_other) const {
+			return buffer != p_other.buffer || offset != p_other.offset;
+		}
+	};
+
+	LocalVector<id<MTLTexture> __unsafe_unretained> textures;
+	LocalVector<id<MTLSamplerState> __unsafe_unretained> samplers;
+	LocalVector<BufferBinding> buffers;
+
+	_FORCE_INLINE_ void clear() {
+		textures.clear();
+		samplers.clear();
+		buffers.clear();
+	}
+
+private:
+	template <typename T>
+	_FORCE_INLINE_ void ensure_size(LocalVector<T> &p_vec, uint32_t p_required) {
+		if (p_vec.size() < p_required) {
+			p_vec.resize_initialized(p_required);
+		}
+	}
+
+public:
+	_FORCE_INLINE_ bool update(NSRange p_range, id<MTLTexture> __unsafe_unretained const *p_values) {
+		if (p_range.length == 0) {
+			return false;
+		}
+		uint32_t required = (uint32_t)(p_range.location + p_range.length);
+		ensure_size(textures, required);
+		bool changed = false;
+		for (NSUInteger i = 0; i < p_range.length; ++i) {
+			uint32_t slot = (uint32_t)(p_range.location + i);
+			id<MTLTexture> value = p_values[i];
+			if (textures[slot] != value) {
+				textures[slot] = value;
+				changed = true;
+			}
+		}
+		return changed;
+	}
+
+	_FORCE_INLINE_ bool update(NSRange p_range, id<MTLSamplerState> __unsafe_unretained const *p_values) {
+		if (p_range.length == 0) {
+			return false;
+		}
+		uint32_t required = (uint32_t)(p_range.location + p_range.length);
+		ensure_size(samplers, required);
+		bool changed = false;
+		for (NSUInteger i = 0; i < p_range.length; ++i) {
+			uint32_t slot = (uint32_t)(p_range.location + i);
+			id<MTLSamplerState> __unsafe_unretained value = p_values[i];
+			if (samplers[slot] != value) {
+				samplers[slot] = value;
+				changed = true;
+			}
+		}
+		return changed;
+	}
+
+	_FORCE_INLINE_ bool update(NSRange p_range, id<MTLBuffer> __unsafe_unretained const *p_values, const NSUInteger *p_offsets) {
+		if (p_range.length == 0) {
+			return false;
+		}
+		uint32_t required = (uint32_t)(p_range.location + p_range.length);
+		ensure_size(buffers, required);
+		BufferBinding *buffers_ptr = buffers.ptr() + p_range.location;
+		bool changed = false;
+		for (NSUInteger i = 0; i < p_range.length; ++i) {
+			BufferBinding &binding = *buffers_ptr;
+			BufferBinding new_binding = {
+				.buffer = p_values[i],
+				.offset = p_offsets[i],
+			};
+			if (binding != new_binding) {
+				binding = new_binding;
+				changed = true;
+			}
+			++buffers_ptr;
+		}
+		return changed;
+	}
+
+	_FORCE_INLINE_ bool update(id<MTLBuffer> __unsafe_unretained p_buffer, NSUInteger p_offset, uint32_t p_index) {
+		uint32_t required = p_index + 1;
+		ensure_size(buffers, required);
+		BufferBinding &binding = buffers.ptr()[p_index];
+		BufferBinding new_binding = {
+			.buffer = p_buffer,
+			.offset = p_offset,
+		};
+		if (binding != new_binding) {
+			binding = new_binding;
+			return true;
+		}
+		return false;
+	}
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDCommandBuffer {
+	friend class MDUniformSet;
+
+private:
+#pragma mark - Common State
+
+	// From RenderingDevice
+	static constexpr uint32_t MAX_PUSH_CONSTANT_SIZE = 128;
+
+	uint8_t push_constant_data[MAX_PUSH_CONSTANT_SIZE];
+	uint32_t push_constant_data_len = 0;
+	uint32_t push_constant_binding = UINT32_MAX;
+
+	BindingCache binding_cache;
+
+	void reset();
+
+	RenderingDeviceDriverMetal *device_driver = nullptr;
+	id<MTLCommandQueue> queue = nil;
+	id<MTLCommandBuffer> commandBuffer = nil;
+	bool state_begin = false;
+
+	_FORCE_INLINE_ id<MTLCommandBuffer> command_buffer() {
+		DEV_ASSERT(state_begin);
+		if (commandBuffer == nil) {
+			commandBuffer = queue.commandBuffer;
+		}
+		return commandBuffer;
+	}
+
+	void _end_compute_dispatch();
+	void _end_blit();
+	id<MTLBlitCommandEncoder> _ensure_blit_encoder();
+
+	enum class CopySource {
+		Buffer,
+		Texture,
+	};
+	void _copy_texture_buffer(CopySource p_source,
+			RDD::TextureID p_texture,
+			RDD::BufferID p_buffer,
+			VectorView<RDD::BufferTextureCopyRegion> p_regions);
+
+#pragma mark - Render
+
+	void _render_set_dirty_state();
+	void _render_bind_uniform_sets();
+
+	void _populate_vertices(simd::float4 *p_vertices, Size2i p_fb_size, VectorView<Rect2i> p_rects);
+	uint32_t _populate_vertices(simd::float4 *p_vertices, uint32_t p_index, Rect2i const &p_rect, Size2i p_fb_size);
+	void _end_render_pass();
+	void _render_clear_render_area();
+
+#pragma mark - Compute
+
+	void _compute_set_dirty_state();
+	void _compute_bind_uniform_sets();
+
+public:
+	MDCommandBufferStateType type = MDCommandBufferStateType::None;
+
+	struct RenderState {
+		MDRenderPass *pass = nullptr;
+		MDFrameBuffer *frameBuffer = nullptr;
+		MDRenderPipeline *pipeline = nullptr;
+		LocalVector<RDD::RenderPassClearValue> clear_values;
+		LocalVector<MTLViewport> viewports;
+		LocalVector<MTLScissorRect> scissors;
+		std::optional<Color> blend_constants;
+		uint32_t current_subpass = UINT32_MAX;
+		Rect2i render_area = {};
+		bool is_rendering_entire_area = false;
+		MTLRenderPassDescriptor *desc = nil;
+		id<MTLRenderCommandEncoder> encoder = nil;
+		id<MTLBuffer> __unsafe_unretained index_buffer = nil; // Buffer is owned by RDD.
+		MTLIndexType index_type = MTLIndexTypeUInt16;
+		uint32_t index_offset = 0;
+		LocalVector<id<MTLBuffer> __unsafe_unretained> vertex_buffers;
+		LocalVector<NSUInteger> vertex_offsets;
+		ResourceTracker resource_tracker;
+		// clang-format off
+		enum DirtyFlag: uint16_t {
+			DIRTY_NONE     = 0,
+			DIRTY_PIPELINE = 1 << 0, //! pipeline state
+			DIRTY_UNIFORMS = 1 << 1, //! uniform sets
+			DIRTY_PUSH     = 1 << 2, //! push constants
+			DIRTY_DEPTH    = 1 << 3, //! depth / stencil state
+			DIRTY_VERTEX   = 1 << 4, //! vertex buffers
+			DIRTY_VIEWPORT = 1 << 5, //! viewport rectangles
+			DIRTY_SCISSOR  = 1 << 6, //! scissor rectangles
+			DIRTY_BLEND    = 1 << 7, //! blend state
+			DIRTY_RASTER   = 1 << 8, //! encoder state like cull mode
+			DIRTY_ALL      = (1 << 9) - 1,
+		};
+		// clang-format on
+		BitField<DirtyFlag> dirty = DIRTY_NONE;
+
+		LocalVector<MDUniformSet *> uniform_sets;
+		uint32_t dynamic_offsets = 0;
+		// Bit mask of the uniform sets that are dirty, to prevent redundant binding.
+		uint64_t uniform_set_mask = 0;
+
+		_FORCE_INLINE_ void reset();
+		void end_encoding();
+
+		_ALWAYS_INLINE_ const MDSubpass &get_subpass() const {
+			DEV_ASSERT(pass != nullptr);
+			return pass->subpasses[current_subpass];
+		}
+
+		_FORCE_INLINE_ void mark_viewport_dirty() {
+			if (viewports.is_empty()) {
+				return;
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_VIEWPORT);
+		}
+
+		_FORCE_INLINE_ void mark_scissors_dirty() {
+			if (scissors.is_empty()) {
+				return;
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_SCISSOR);
+		}
+
+		_FORCE_INLINE_ void mark_vertex_dirty() {
+			if (vertex_buffers.is_empty()) {
+				return;
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_VERTEX);
+		}
+
+		_FORCE_INLINE_ void mark_uniforms_dirty(std::initializer_list<uint32_t> l) {
+			if (uniform_sets.is_empty()) {
+				return;
+			}
+			for (uint32_t i : l) {
+				if (i < uniform_sets.size() && uniform_sets[i] != nullptr) {
+					uniform_set_mask |= 1 << i;
+				}
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
+		}
+
+		_FORCE_INLINE_ void mark_uniforms_dirty(void) {
+			if (uniform_sets.is_empty()) {
+				return;
+			}
+			for (uint32_t i = 0; i < uniform_sets.size(); i++) {
+				if (uniform_sets[i] != nullptr) {
+					uniform_set_mask |= 1 << i;
+				}
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
+		}
+
+		_FORCE_INLINE_ void mark_blend_dirty() {
+			if (!blend_constants.has_value()) {
+				return;
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_BLEND);
+		}
+
+		MTLScissorRect clip_to_render_area(MTLScissorRect p_rect) const {
+			uint32_t raLeft = render_area.position.x;
+			uint32_t raRight = raLeft + render_area.size.width;
+			uint32_t raBottom = render_area.position.y;
+			uint32_t raTop = raBottom + render_area.size.height;
+
+			p_rect.x = CLAMP(p_rect.x, raLeft, MAX(raRight - 1, raLeft));
+			p_rect.y = CLAMP(p_rect.y, raBottom, MAX(raTop - 1, raBottom));
+			p_rect.width = MIN(p_rect.width, raRight - p_rect.x);
+			p_rect.height = MIN(p_rect.height, raTop - p_rect.y);
+
+			return p_rect;
+		}
+
+		Rect2i clip_to_render_area(Rect2i p_rect) const {
+			int32_t raLeft = render_area.position.x;
+			int32_t raRight = raLeft + render_area.size.width;
+			int32_t raBottom = render_area.position.y;
+			int32_t raTop = raBottom + render_area.size.height;
+
+			p_rect.position.x = CLAMP(p_rect.position.x, raLeft, MAX(raRight - 1, raLeft));
+			p_rect.position.y = CLAMP(p_rect.position.y, raBottom, MAX(raTop - 1, raBottom));
+			p_rect.size.width = MIN(p_rect.size.width, raRight - p_rect.position.x);
+			p_rect.size.height = MIN(p_rect.size.height, raTop - p_rect.position.y);
+
+			return p_rect;
+		}
+
+	} render;
+
+	// State specific for a compute pass.
+	struct ComputeState {
+		MDComputePipeline *pipeline = nullptr;
+		id<MTLComputeCommandEncoder> encoder = nil;
+		ResourceTracker resource_tracker;
+		// clang-format off
+		enum DirtyFlag: uint16_t {
+			DIRTY_NONE     = 0,
+			DIRTY_PIPELINE = 1 << 0, //! pipeline state
+			DIRTY_UNIFORMS = 1 << 1, //! uniform sets
+			DIRTY_PUSH     = 1 << 2, //! push constants
+			DIRTY_ALL      = (1 << 3) - 1,
+		};
+		// clang-format on
+		BitField<DirtyFlag> dirty = DIRTY_NONE;
+
+		LocalVector<MDUniformSet *> uniform_sets;
+		uint32_t dynamic_offsets = 0;
+		// Bit mask of the uniform sets that are dirty, to prevent redundant binding.
+		uint64_t uniform_set_mask = 0;
+
+		_FORCE_INLINE_ void reset();
+		void end_encoding();
+
+		_FORCE_INLINE_ void mark_uniforms_dirty(void) {
+			if (uniform_sets.is_empty()) {
+				return;
+			}
+			for (uint32_t i = 0; i < uniform_sets.size(); i++) {
+				if (uniform_sets[i] != nullptr) {
+					uniform_set_mask |= 1 << i;
+				}
+			}
+			dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
+		}
+	} compute;
+
+	// State specific to a blit pass.
+	struct {
+		id<MTLBlitCommandEncoder> encoder = nil;
+		_FORCE_INLINE_ void reset() {
+			encoder = nil;
+		}
+	} blit;
+
+	_FORCE_INLINE_ id<MTLCommandBuffer> get_command_buffer() const {
+		return commandBuffer;
+	}
+
+	void begin();
+	void commit();
+	void end();
+
+	void bind_pipeline(RDD::PipelineID p_pipeline);
+	void encode_push_constant_data(RDD::ShaderID p_shader, VectorView<uint32_t> p_data);
+
+#pragma mark - Render Commands
+
+	void render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets);
+	void render_clear_attachments(VectorView<RDD::AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects);
+	void render_set_viewport(VectorView<Rect2i> p_viewports);
+	void render_set_scissor(VectorView<Rect2i> p_scissors);
+	void render_set_blend_constants(const Color &p_constants);
+	void render_begin_pass(RDD::RenderPassID p_render_pass,
+			RDD::FramebufferID p_frameBuffer,
+			RDD::CommandBufferType p_cmd_buffer_type,
+			const Rect2i &p_rect,
+			VectorView<RDD::RenderPassClearValue> p_clear_values);
+	void render_next_subpass();
+	void render_draw(uint32_t p_vertex_count,
+			uint32_t p_instance_count,
+			uint32_t p_base_vertex,
+			uint32_t p_first_instance);
+	void render_bind_vertex_buffers(uint32_t p_binding_count, const RDD::BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets);
+	void render_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint64_t p_offset);
+
+	void render_draw_indexed(uint32_t p_index_count,
+			uint32_t p_instance_count,
+			uint32_t p_first_index,
+			int32_t p_vertex_offset,
+			uint32_t p_first_instance);
+
+	void render_draw_indexed_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride);
+	void render_draw_indexed_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride);
+	void render_draw_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride);
+	void render_draw_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride);
+
+	void render_end_pass();
+
+#pragma mark - Compute Commands
+
+	void compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets);
+	void compute_dispatch(uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups);
+	void compute_dispatch_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset);
+
+#pragma mark - Transfer
+
+private:
+	void encodeRenderCommandEncoderWithDescriptor(MTLRenderPassDescriptor *p_desc, NSString *p_label);
+
+public:
+	void resolve_texture(RDD::TextureID p_src_texture, RDD::TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, RDD::TextureID p_dst_texture, RDD::TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap);
+	void clear_color_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, const Color &p_color, const RDD::TextureSubresourceRange &p_subresources);
+	void clear_depth_stencil_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const RDD::TextureSubresourceRange &p_subresources);
+	void clear_buffer(RDD::BufferID p_buffer, uint64_t p_offset, uint64_t p_size);
+	void copy_buffer(RDD::BufferID p_src_buffer, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferCopyRegion> p_regions);
+	void copy_texture(RDD::TextureID p_src_texture, RDD::TextureID p_dst_texture, VectorView<RDD::TextureCopyRegion> p_regions);
+	void copy_buffer_to_texture(RDD::BufferID p_src_buffer, RDD::TextureID p_dst_texture, VectorView<RDD::BufferTextureCopyRegion> p_regions);
+	void copy_texture_to_buffer(RDD::TextureID p_src_texture, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferTextureCopyRegion> p_regions);
+
+#pragma mark - Debugging
+
+	void begin_label(const char *p_label_name, const Color &p_color);
+	void end_label();
+
+	MDCommandBuffer(id<MTLCommandQueue> p_queue, RenderingDeviceDriverMetal *p_device_driver) :
+			device_driver(p_device_driver), queue(p_queue) {
+		type = MDCommandBufferStateType::None;
+	}
+
+	MDCommandBuffer() = default;
+};
+
+#if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000) || (TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 170000)
+#define MTLBindingAccess MTLArgumentAccess
+#define MTLBindingAccessReadOnly MTLArgumentAccessReadOnly
+#define MTLBindingAccessReadWrite MTLArgumentAccessReadWrite
+#define MTLBindingAccessWriteOnly MTLArgumentAccessWriteOnly
+#endif
+
+struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) UniformInfo {
+	uint32_t binding;
+	BitField<RDD::ShaderStage> active_stages;
+	MTLDataType dataType = MTLDataTypeNone;
+	MTLBindingAccess access = MTLBindingAccessReadOnly;
+	MTLResourceUsage usage = 0;
+	MTLTextureType textureType = MTLTextureType2D;
+	uint32_t imageFormat = 0;
+	uint32_t arrayLength = 0;
+	bool isMultisampled = 0;
+
+	struct Indexes {
+		uint32_t buffer = UINT32_MAX;
+		uint32_t texture = UINT32_MAX;
+		uint32_t sampler = UINT32_MAX;
+	};
+	Indexes slot;
+	Indexes arg_buffer;
+
+	enum class IndexType {
+		SLOT,
+		ARG,
+	};
+
+	_FORCE_INLINE_ Indexes &get_indexes(IndexType p_type) {
+		switch (p_type) {
+			case IndexType::SLOT:
+				return slot;
+			case IndexType::ARG:
+				return arg_buffer;
+		}
+	}
+};
+
+struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) UniformSet {
+	LocalVector<UniformInfo> uniforms;
+	LocalVector<uint32_t> dynamic_uniforms;
+	uint32_t buffer_size = 0;
+};
+
+struct ShaderCacheEntry;
+
+enum class ShaderLoadStrategy {
+	IMMEDIATE,
+	LAZY,
+
+	/// The default strategy is to load the shader immediately.
+	DEFAULT = IMMEDIATE,
+};
+
+/// A Metal shader library.
+@interface MDLibrary : NSObject {
+	ShaderCacheEntry *_entry;
+	NSString *_original_source;
+};
+- (id<MTLLibrary>)library;
+- (NSError *)error;
+- (void)setLabel:(NSString *)label;
+#ifdef DEV_ENABLED
+- (NSString *)originalSource;
+#endif
+
++ (instancetype)newLibraryWithCacheEntry:(ShaderCacheEntry *)entry
+								  device:(id<MTLDevice>)device
+								  source:(NSString *)source
+								 options:(MTLCompileOptions *)options
+								strategy:(ShaderLoadStrategy)strategy;
+
++ (instancetype)newLibraryWithCacheEntry:(ShaderCacheEntry *)entry
+								  device:(id<MTLDevice>)device
+#ifdef DEV_ENABLED
+								  source:(NSString *)source
+#endif
+									data:(dispatch_data_t)data;
+@end
+
+/// A cache entry for a Metal shader library.
+struct ShaderCacheEntry {
+	RenderingDeviceDriverMetal &owner;
+	/// A hash of the Metal shader source code.
+	SHA256Digest key;
+	CharString name;
+	RD::ShaderStage stage = RD::SHADER_STAGE_VERTEX;
+	/// This reference must be weak, to ensure that when the last strong reference to the library
+	/// is released, the cache entry is freed.
+	MDLibrary *__weak library = nil;
+
+	/// Notify the cache that this entry is no longer needed.
+	void notify_free() const;
+
+	ShaderCacheEntry(RenderingDeviceDriverMetal &p_owner, SHA256Digest p_key) :
+			owner(p_owner), key(p_key) {
+	}
+	~ShaderCacheEntry() = default;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) DynamicOffsetLayout {
+	struct Data {
+		uint8_t offset : 4;
+		uint8_t count : 4;
+	};
+
+	union {
+		Data data[MAX_DYNAMIC_BUFFERS];
+		uint64_t _val = 0;
+	};
+
+public:
+	_FORCE_INLINE_ bool is_empty() const { return _val == 0; }
+
+	_FORCE_INLINE_ uint32_t get_count(uint32_t p_set_index) const {
+		return data[p_set_index].count;
+	}
+
+	_FORCE_INLINE_ uint32_t get_offset(uint32_t p_set_index) const {
+		return data[p_set_index].offset;
+	}
+
+	_FORCE_INLINE_ void set_offset_count(uint32_t p_set_index, uint8_t p_offset, uint8_t p_count) {
+		data[p_set_index].offset = p_offset;
+		data[p_set_index].count = p_count;
+	}
+
+	_FORCE_INLINE_ uint32_t get_offset_index_shift(uint32_t p_set_index, uint32_t p_dynamic_index = 0) const {
+		return (data[p_set_index].offset + p_dynamic_index) * 4u;
+	}
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDShader {
+public:
+	CharString name;
+	Vector<UniformSet> sets;
+	struct {
+		BitField<RDD::ShaderStage> stages = {};
+		uint32_t binding = UINT32_MAX;
+		uint32_t size = 0;
+	} push_constants;
+	DynamicOffsetLayout dynamic_offset_layout;
+	bool uses_argument_buffers = true;
+
+	MDShader(CharString p_name, Vector<UniformSet> p_sets, bool p_uses_argument_buffers) :
+			name(p_name), sets(p_sets), uses_argument_buffers(p_uses_argument_buffers) {}
+	virtual ~MDShader() = default;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDComputeShader final : public MDShader {
+public:
+	MTLSize local = {};
+
+	MDLibrary *kernel;
+
+	MDComputeShader(CharString p_name, Vector<UniformSet> p_sets, bool p_uses_argument_buffers, MDLibrary *p_kernel);
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDRenderShader final : public MDShader {
+public:
+	bool needs_view_mask_buffer = false;
+
+	MDLibrary *vert;
+	MDLibrary *frag;
+
+	MDRenderShader(CharString p_name,
+			Vector<UniformSet> p_sets,
+			bool p_needs_view_mask_buffer,
+			bool p_uses_argument_buffers,
+			MDLibrary *p_vert, MDLibrary *p_frag);
+};
+
+_FORCE_INLINE_ StageResourceUsage &operator|=(StageResourceUsage &p_a, uint32_t p_b) {
+	p_a = StageResourceUsage(uint32_t(p_a) | p_b);
+	return p_a;
+}
+
+_FORCE_INLINE_ StageResourceUsage stage_resource_usage(RDC::ShaderStage p_stage, MTLResourceUsage p_usage) {
+	return StageResourceUsage(p_usage << (p_stage * 2));
+}
+
+_FORCE_INLINE_ MTLResourceUsage resource_usage_for_stage(StageResourceUsage p_usage, RDC::ShaderStage p_stage) {
+	return MTLResourceUsage((p_usage >> (p_stage * 2)) & 0b11);
+}
+
+template <>
+struct HashMapComparatorDefault<RDD::ShaderID> {
+	static bool compare(const RDD::ShaderID &p_lhs, const RDD::ShaderID &p_rhs) {
+		return p_lhs.id == p_rhs.id;
+	}
+};
+
+template <>
+struct HashMapComparatorDefault<RDD::BufferID> {
+	static bool compare(const RDD::BufferID &p_lhs, const RDD::BufferID &p_rhs) {
+		return p_lhs.id == p_rhs.id;
+	}
+};
+
+template <>
+struct HashMapComparatorDefault<RDD::TextureID> {
+	static bool compare(const RDD::TextureID &p_lhs, const RDD::TextureID &p_rhs) {
+		return p_lhs.id == p_rhs.id;
+	}
+};
+
+template <>
+struct HashMapHasherDefaultImpl<RDD::BufferID> {
+	static _FORCE_INLINE_ uint32_t hash(const RDD::BufferID &p_value) {
+		return HashMapHasherDefaultImpl<uint64_t>::hash(p_value.id);
+	}
+};
+
+template <>
+struct HashMapHasherDefaultImpl<RDD::TextureID> {
+	static _FORCE_INLINE_ uint32_t hash(const RDD::TextureID &p_value) {
+		return HashMapHasherDefaultImpl<uint64_t>::hash(p_value.id);
+	}
+};
+
+// A type used to encode resources directly to a MTLCommandEncoder
+struct DirectEncoder {
+	id<MTLCommandEncoder> __unsafe_unretained encoder;
+	BindingCache &cache;
+	enum Mode {
+		RENDER,
+		COMPUTE
+	};
+	Mode mode;
+
+	void set(id<MTLBuffer> __unsafe_unretained *p_buffers, const NSUInteger *p_offsets, NSRange p_range);
+	void set(id<MTLBuffer> __unsafe_unretained p_buffer, const NSUInteger p_offset, uint32_t p_index);
+	void set(id<MTLTexture> __unsafe_unretained *p_textures, NSRange p_range);
+	void set(id<MTLSamplerState> __unsafe_unretained *p_samplers, NSRange p_range);
+
+	DirectEncoder(id<MTLCommandEncoder> __unsafe_unretained p_encoder, BindingCache &p_cache) :
+			encoder(p_encoder), cache(p_cache) {
+		if ([p_encoder conformsToProtocol:@protocol(MTLRenderCommandEncoder)]) {
+			mode = RENDER;
+		} else {
+			mode = COMPUTE;
+		}
+	}
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDUniformSet {
+public:
+	uint32_t index = 0;
+	id<MTLBuffer> arg_buffer = nil;
+	ResourceUsageMap usage_to_resources;
+	LocalVector<RDD::BoundUniform> uniforms;
+
+	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index, uint32_t p_dynamic_offsets, uint32_t p_frame_idx, uint32_t p_frame_count);
+	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index, uint32_t p_dynamic_offsets, uint32_t p_frame_idx, uint32_t p_frame_count);
+	void bind_uniforms_direct(MDShader *p_shader, DirectEncoder p_enc, uint32_t p_set_index, uint32_t p_dynamic_offsets);
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDPipeline {
+public:
+	MDPipelineType type;
+
+	explicit MDPipeline(MDPipelineType p_type) :
+			type(p_type) {}
+	virtual ~MDPipeline() = default;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDRenderPipeline final : public MDPipeline {
+public:
+	id<MTLRenderPipelineState> state = nil;
+	id<MTLDepthStencilState> depth_stencil = nil;
+	uint32_t push_constant_size = 0;
+	uint32_t push_constant_stages_mask = 0;
+	SampleCount sample_count = SampleCount1;
+
+	struct {
+		MTLCullMode cull_mode = MTLCullModeNone;
+		MTLTriangleFillMode fill_mode = MTLTriangleFillModeFill;
+		MTLDepthClipMode clip_mode = MTLDepthClipModeClip;
+		MTLWinding winding = MTLWindingClockwise;
+		MTLPrimitiveType render_primitive = MTLPrimitiveTypePoint;
+
+		struct {
+			bool enabled = false;
+		} depth_test;
+
+		struct {
+			bool enabled = false;
+			float depth_bias = 0.0;
+			float slope_scale = 0.0;
+			float clamp = 0.0;
+			_FORCE_INLINE_ void apply(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc) const {
+				if (!enabled) {
+					return;
+				}
+				[p_enc setDepthBias:depth_bias slopeScale:slope_scale clamp:clamp];
+			}
+		} depth_bias;
+
+		struct {
+			bool enabled = false;
+			uint32_t front_reference = 0;
+			uint32_t back_reference = 0;
+			_FORCE_INLINE_ void apply(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc) const {
+				if (!enabled) {
+					return;
+				}
+				[p_enc setStencilFrontReferenceValue:front_reference backReferenceValue:back_reference];
+			}
+		} stencil;
+
+		struct {
+			bool enabled = false;
+			float r = 0.0;
+			float g = 0.0;
+			float b = 0.0;
+			float a = 0.0;
+
+			_FORCE_INLINE_ void apply(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc) const {
+				//if (!enabled)
+				//	return;
+				[p_enc setBlendColorRed:r green:g blue:b alpha:a];
+			}
+		} blend;
+
+		_FORCE_INLINE_ void apply(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc) const {
+			[p_enc setCullMode:cull_mode];
+			[p_enc setTriangleFillMode:fill_mode];
+			[p_enc setDepthClipMode:clip_mode];
+			[p_enc setFrontFacingWinding:winding];
+			depth_bias.apply(p_enc);
+			stencil.apply(p_enc);
+			blend.apply(p_enc);
+		}
+
+	} raster_state;
+
+	MDRenderShader *shader = nil;
+
+	MDRenderPipeline() :
+			MDPipeline(MDPipelineType::Render) {}
+	~MDRenderPipeline() final = default;
+};
+
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDComputePipeline final : public MDPipeline {
+public:
+	id<MTLComputePipelineState> state = nil;
+	struct {
+		MTLSize local = {};
+	} compute_state;
+
+	MDComputeShader *shader = nil;
+
+	explicit MDComputePipeline(id<MTLComputePipelineState> p_state) :
+			MDPipeline(MDPipelineType::Compute), state(p_state) {}
+	~MDComputePipeline() final = default;
+};
+
+namespace rid {
+#define MAKE_ID(FROM, TO)                \
+	_FORCE_INLINE_ TO make(FROM p_obj) { \
+		return TO(owned(p_obj));         \
+	}
+
+MAKE_ID(id<MTLCommandQueue>, RDD::CommandPoolID)
+
+#undef MAKE_ID
+} //namespace rid
diff --git a/engine/drivers/metal/metal_objects.mm b/engine/drivers/metal/metal_objects.mm
new file mode 100644
index 00000000..3649645b
--- /dev/null
+++ b/engine/drivers/metal/metal_objects.mm
@@ -0,0 +1,2548 @@
+/**************************************************************************/
+/*  metal_objects.mm                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+/**************************************************************************/
+/*                                                                        */
+/* Portions of this code were derived from MoltenVK.                      */
+/*                                                                        */
+/* Copyright (c) 2015-2023 The Brenwill Workshop Ltd.                     */
+/* (http://www.brenwill.com)                                              */
+/*                                                                        */
+/* 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                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/**************************************************************************/
+
+#import "metal_objects.h"
+
+#import "metal_utils.h"
+#import "pixel_formats.h"
+#import "rendering_device_driver_metal.h"
+#import "rendering_shader_container_metal.h"
+
+#import <os/signpost.h>
+#import <algorithm>
+
+// We have to undefine these macros because they are defined in NSObjCRuntime.h.
+#undef MIN
+#undef MAX
+
+void MDCommandBuffer::begin_label(const char *p_label_name, const Color &p_color) {
+	NSString *s = [[NSString alloc] initWithBytesNoCopy:(void *)p_label_name length:strlen(p_label_name) encoding:NSUTF8StringEncoding freeWhenDone:NO];
+	[commandBuffer pushDebugGroup:s];
+}
+
+void MDCommandBuffer::end_label() {
+	[commandBuffer popDebugGroup];
+}
+
+void MDCommandBuffer::begin() {
+	DEV_ASSERT(commandBuffer == nil && !state_begin);
+	state_begin = true;
+	binding_cache.clear();
+}
+
+void MDCommandBuffer::end() {
+	switch (type) {
+		case MDCommandBufferStateType::None:
+			return;
+		case MDCommandBufferStateType::Render:
+			return render_end_pass();
+		case MDCommandBufferStateType::Compute:
+			return _end_compute_dispatch();
+		case MDCommandBufferStateType::Blit:
+			return _end_blit();
+	}
+}
+
+void MDCommandBuffer::commit() {
+	end();
+	[commandBuffer commit];
+	commandBuffer = nil;
+	state_begin = false;
+}
+
+void MDCommandBuffer::bind_pipeline(RDD::PipelineID p_pipeline) {
+	MDPipeline *p = (MDPipeline *)(p_pipeline.id);
+
+	// End current encoder if it is a compute encoder or blit encoder,
+	// as they do not have a defined end boundary in the RDD like render.
+	if (type == MDCommandBufferStateType::Compute) {
+		_end_compute_dispatch();
+	} else if (type == MDCommandBufferStateType::Blit) {
+		_end_blit();
+	}
+
+	if (p->type == MDPipelineType::Render) {
+		DEV_ASSERT(type == MDCommandBufferStateType::Render);
+		MDRenderPipeline *rp = (MDRenderPipeline *)p;
+
+		if (render.encoder == nil) {
+			// This error would happen if the render pass failed.
+			ERR_FAIL_NULL_MSG(render.desc, "Render pass descriptor is null.");
+
+			// This condition occurs when there are no attachments when calling render_next_subpass()
+			// and is due to the SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS flag.
+			render.desc.defaultRasterSampleCount = static_cast<NSUInteger>(rp->sample_count);
+
+// NOTE(sgc): This is to test rdar://FB13605547 and will be deleted once fix is confirmed.
+#if 0
+			if (render.pipeline->sample_count == 4) {
+				static id<MTLTexture> tex = nil;
+				static id<MTLTexture> res_tex = nil;
+				static dispatch_once_t onceToken;
+				dispatch_once(&onceToken, ^{
+					Size2i sz = render.frameBuffer->size;
+					MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA8Unorm width:sz.width height:sz.height mipmapped:NO];
+					td.textureType = MTLTextureType2DMultisample;
+					td.storageMode = MTLStorageModeMemoryless;
+					td.usage = MTLTextureUsageRenderTarget;
+					td.sampleCount = render.pipeline->sample_count;
+					tex = [device_driver->get_device() newTextureWithDescriptor:td];
+
+					td.textureType = MTLTextureType2D;
+					td.storageMode = MTLStorageModePrivate;
+					td.usage = MTLTextureUsageShaderWrite;
+					td.sampleCount = 1;
+					res_tex = [device_driver->get_device() newTextureWithDescriptor:td];
+				});
+				render.desc.colorAttachments[0].texture = tex;
+				render.desc.colorAttachments[0].loadAction = MTLLoadActionClear;
+				render.desc.colorAttachments[0].storeAction = MTLStoreActionMultisampleResolve;
+
+				render.desc.colorAttachments[0].resolveTexture = res_tex;
+			}
+#endif
+			render.encoder = [command_buffer() renderCommandEncoderWithDescriptor:render.desc];
+		}
+
+		if (render.pipeline != rp) {
+			render.dirty.set_flag((RenderState::DirtyFlag)(RenderState::DIRTY_PIPELINE | RenderState::DIRTY_RASTER));
+			// Mark all uniforms as dirty, as variants of a shader pipeline may have a different entry point ABI,
+			// due to setting force_active_argument_buffer_resources = true for spirv_cross::CompilerMSL::Options.
+			// As a result, uniform sets with the same layout will generate redundant binding warnings when
+			// capturing a Metal frame in Xcode.
+			//
+			// If we don't mark as dirty, then some bindings will generate a validation error.
+			binding_cache.clear();
+			render.mark_uniforms_dirty();
+			if (render.pipeline != nullptr && render.pipeline->depth_stencil != rp->depth_stencil) {
+				render.dirty.set_flag(RenderState::DIRTY_DEPTH);
+			}
+			if (rp->raster_state.blend.enabled) {
+				render.dirty.set_flag(RenderState::DIRTY_BLEND);
+			}
+			render.pipeline = rp;
+		}
+	} else if (p->type == MDPipelineType::Compute) {
+		DEV_ASSERT(type == MDCommandBufferStateType::None);
+		type = MDCommandBufferStateType::Compute;
+
+		if (compute.pipeline != p) {
+			compute.dirty.set_flag(ComputeState::DIRTY_PIPELINE);
+			binding_cache.clear();
+			compute.mark_uniforms_dirty();
+			compute.pipeline = (MDComputePipeline *)p;
+		}
+	}
+}
+
+void MDCommandBuffer::encode_push_constant_data(RDD::ShaderID p_shader, VectorView<uint32_t> p_data) {
+	switch (type) {
+		case MDCommandBufferStateType::Render:
+		case MDCommandBufferStateType::Compute: {
+			MDShader *shader = (MDShader *)(p_shader.id);
+			if (shader->push_constants.binding == UINT32_MAX) {
+				return;
+			}
+			push_constant_binding = shader->push_constants.binding;
+			void const *ptr = p_data.ptr();
+			push_constant_data_len = p_data.size() * sizeof(uint32_t);
+			DEV_ASSERT(push_constant_data_len <= sizeof(push_constant_data));
+			memcpy(push_constant_data, ptr, push_constant_data_len);
+			if (push_constant_data_len > 0) {
+				switch (type) {
+					case MDCommandBufferStateType::Render:
+						render.dirty.set_flag(RenderState::DirtyFlag::DIRTY_PUSH);
+						break;
+					case MDCommandBufferStateType::Compute:
+						compute.dirty.set_flag(ComputeState::DirtyFlag::DIRTY_PUSH);
+						break;
+					default:
+						break;
+				}
+			}
+		} break;
+		case MDCommandBufferStateType::Blit:
+		case MDCommandBufferStateType::None:
+			return;
+	}
+}
+
+id<MTLBlitCommandEncoder> MDCommandBuffer::_ensure_blit_encoder() {
+	switch (type) {
+		case MDCommandBufferStateType::None:
+			break;
+		case MDCommandBufferStateType::Render:
+			render_end_pass();
+			break;
+		case MDCommandBufferStateType::Compute:
+			_end_compute_dispatch();
+			break;
+		case MDCommandBufferStateType::Blit:
+			return blit.encoder;
+	}
+
+	type = MDCommandBufferStateType::Blit;
+	blit.encoder = command_buffer().blitCommandEncoder;
+	return blit.encoder;
+}
+
+_FORCE_INLINE_ static MTLSize mipmapLevelSizeFromTexture(id<MTLTexture> p_tex, NSUInteger p_level) {
+	MTLSize lvlSize;
+	lvlSize.width = MAX(p_tex.width >> p_level, 1UL);
+	lvlSize.height = MAX(p_tex.height >> p_level, 1UL);
+	lvlSize.depth = MAX(p_tex.depth >> p_level, 1UL);
+	return lvlSize;
+}
+
+void MDCommandBuffer::resolve_texture(RDD::TextureID p_src_texture, RDD::TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, RDD::TextureID p_dst_texture, RDD::TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) {
+	id<MTLTexture> src_tex = rid::get(p_src_texture);
+	id<MTLTexture> dst_tex = rid::get(p_dst_texture);
+
+	MTLRenderPassDescriptor *mtlRPD = [MTLRenderPassDescriptor renderPassDescriptor];
+	MTLRenderPassColorAttachmentDescriptor *mtlColorAttDesc = mtlRPD.colorAttachments[0];
+	mtlColorAttDesc.loadAction = MTLLoadActionLoad;
+	mtlColorAttDesc.storeAction = MTLStoreActionMultisampleResolve;
+
+	mtlColorAttDesc.texture = src_tex;
+	mtlColorAttDesc.resolveTexture = dst_tex;
+	mtlColorAttDesc.level = p_src_mipmap;
+	mtlColorAttDesc.slice = p_src_layer;
+	mtlColorAttDesc.resolveLevel = p_dst_mipmap;
+	mtlColorAttDesc.resolveSlice = p_dst_layer;
+	encodeRenderCommandEncoderWithDescriptor(mtlRPD, @"Resolve Image");
+}
+
+void MDCommandBuffer::clear_color_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, const Color &p_color, const RDD::TextureSubresourceRange &p_subresources) {
+	id<MTLTexture> src_tex = rid::get(p_texture);
+
+	if (src_tex.parentTexture) {
+		// Clear via the parent texture rather than the view.
+		src_tex = src_tex.parentTexture;
+	}
+
+	PixelFormats &pf = device_driver->get_pixel_formats();
+
+	if (pf.isDepthFormat(src_tex.pixelFormat) || pf.isStencilFormat(src_tex.pixelFormat)) {
+		ERR_FAIL_MSG("invalid: depth or stencil texture format");
+	}
+
+	MTLRenderPassDescriptor *desc = MTLRenderPassDescriptor.renderPassDescriptor;
+
+	if (p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
+		MTLRenderPassColorAttachmentDescriptor *caDesc = desc.colorAttachments[0];
+		caDesc.texture = src_tex;
+		caDesc.loadAction = MTLLoadActionClear;
+		caDesc.storeAction = MTLStoreActionStore;
+		caDesc.clearColor = MTLClearColorMake(p_color.r, p_color.g, p_color.b, p_color.a);
+
+		// Extract the mipmap levels that are to be updated.
+		uint32_t mipLvlStart = p_subresources.base_mipmap;
+		uint32_t mipLvlCnt = p_subresources.mipmap_count;
+		uint32_t mipLvlEnd = mipLvlStart + mipLvlCnt;
+
+		uint32_t levelCount = src_tex.mipmapLevelCount;
+
+		// Extract the cube or array layers (slices) that are to be updated.
+		bool is3D = src_tex.textureType == MTLTextureType3D;
+		uint32_t layerStart = is3D ? 0 : p_subresources.base_layer;
+		uint32_t layerCnt = p_subresources.layer_count;
+		uint32_t layerEnd = layerStart + layerCnt;
+
+		MetalFeatures const &features = device_driver->get_device_properties().features;
+
+		// Iterate across mipmap levels and layers, and perform and empty render to clear each.
+		for (uint32_t mipLvl = mipLvlStart; mipLvl < mipLvlEnd; mipLvl++) {
+			ERR_FAIL_INDEX_MSG(mipLvl, levelCount, "mip level out of range");
+
+			caDesc.level = mipLvl;
+
+			// If a 3D image, we need to get the depth for each level.
+			if (is3D) {
+				layerCnt = mipmapLevelSizeFromTexture(src_tex, mipLvl).depth;
+				layerEnd = layerStart + layerCnt;
+			}
+
+			if ((features.layeredRendering && src_tex.sampleCount == 1) || features.multisampleLayeredRendering) {
+				// We can clear all layers at once.
+				if (is3D) {
+					caDesc.depthPlane = layerStart;
+				} else {
+					caDesc.slice = layerStart;
+				}
+				desc.renderTargetArrayLength = layerCnt;
+				encodeRenderCommandEncoderWithDescriptor(desc, @"Clear Image");
+			} else {
+				for (uint32_t layer = layerStart; layer < layerEnd; layer++) {
+					if (is3D) {
+						caDesc.depthPlane = layer;
+					} else {
+						caDesc.slice = layer;
+					}
+					encodeRenderCommandEncoderWithDescriptor(desc, @"Clear Image");
+				}
+			}
+		}
+	}
+}
+
+void MDCommandBuffer::clear_depth_stencil_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const RDD::TextureSubresourceRange &p_subresources) {
+	id<MTLTexture> src_tex = rid::get(p_texture);
+
+	if (src_tex.parentTexture) {
+		// Clear via the parent texture rather than the view.
+		src_tex = src_tex.parentTexture;
+	}
+
+	PixelFormats &pf = device_driver->get_pixel_formats();
+
+	bool is_depth_format = pf.isDepthFormat(src_tex.pixelFormat);
+	bool is_stencil_format = pf.isStencilFormat(src_tex.pixelFormat);
+
+	if (!is_depth_format && !is_stencil_format) {
+		ERR_FAIL_MSG("invalid: color texture format");
+	}
+
+	bool clear_depth = is_depth_format && p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
+	bool clear_stencil = is_stencil_format && p_subresources.aspect.has_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT);
+
+	if (clear_depth || clear_stencil) {
+		MTLRenderPassDescriptor *desc = MTLRenderPassDescriptor.renderPassDescriptor;
+
+		MTLRenderPassDepthAttachmentDescriptor *daDesc = desc.depthAttachment;
+		if (clear_depth) {
+			daDesc.texture = src_tex;
+			daDesc.loadAction = MTLLoadActionClear;
+			daDesc.storeAction = MTLStoreActionStore;
+			daDesc.clearDepth = p_depth;
+		}
+
+		MTLRenderPassStencilAttachmentDescriptor *saDesc = desc.stencilAttachment;
+		if (clear_stencil) {
+			saDesc.texture = src_tex;
+			saDesc.loadAction = MTLLoadActionClear;
+			saDesc.storeAction = MTLStoreActionStore;
+			saDesc.clearStencil = p_stencil;
+		}
+
+		// Extract the mipmap levels that are to be updated.
+		uint32_t mipLvlStart = p_subresources.base_mipmap;
+		uint32_t mipLvlCnt = p_subresources.mipmap_count;
+		uint32_t mipLvlEnd = mipLvlStart + mipLvlCnt;
+
+		uint32_t levelCount = src_tex.mipmapLevelCount;
+
+		// Extract the cube or array layers (slices) that are to be updated.
+		bool is3D = src_tex.textureType == MTLTextureType3D;
+		uint32_t layerStart = is3D ? 0 : p_subresources.base_layer;
+		uint32_t layerCnt = p_subresources.layer_count;
+		uint32_t layerEnd = layerStart + layerCnt;
+
+		MetalFeatures const &features = device_driver->get_device_properties().features;
+
+		// Iterate across mipmap levels and layers, and perform and empty render to clear each.
+		for (uint32_t mipLvl = mipLvlStart; mipLvl < mipLvlEnd; mipLvl++) {
+			ERR_FAIL_INDEX_MSG(mipLvl, levelCount, "mip level out of range");
+
+			if (clear_depth) {
+				daDesc.level = mipLvl;
+			}
+			if (clear_stencil) {
+				saDesc.level = mipLvl;
+			}
+
+			// If a 3D image, we need to get the depth for each level.
+			if (is3D) {
+				layerCnt = mipmapLevelSizeFromTexture(src_tex, mipLvl).depth;
+				layerEnd = layerStart + layerCnt;
+			}
+
+			if ((features.layeredRendering && src_tex.sampleCount == 1) || features.multisampleLayeredRendering) {
+				// We can clear all layers at once.
+				if (is3D) {
+					if (clear_depth) {
+						daDesc.depthPlane = layerStart;
+					}
+					if (clear_stencil) {
+						saDesc.depthPlane = layerStart;
+					}
+				} else {
+					if (clear_depth) {
+						daDesc.slice = layerStart;
+					}
+					if (clear_stencil) {
+						saDesc.slice = layerStart;
+					}
+				}
+				desc.renderTargetArrayLength = layerCnt;
+				encodeRenderCommandEncoderWithDescriptor(desc, @"Clear Image");
+			} else {
+				for (uint32_t layer = layerStart; layer < layerEnd; layer++) {
+					if (is3D) {
+						if (clear_depth) {
+							daDesc.depthPlane = layer;
+						}
+						if (clear_stencil) {
+							saDesc.depthPlane = layer;
+						}
+					} else {
+						if (clear_depth) {
+							daDesc.slice = layer;
+						}
+						if (clear_stencil) {
+							saDesc.slice = layer;
+						}
+					}
+					encodeRenderCommandEncoderWithDescriptor(desc, @"Clear Image");
+				}
+			}
+		}
+	}
+}
+
+void MDCommandBuffer::clear_buffer(RDD::BufferID p_buffer, uint64_t p_offset, uint64_t p_size) {
+	id<MTLBlitCommandEncoder> blit_enc = _ensure_blit_encoder();
+	const RDM::BufferInfo *buffer = (const RDM::BufferInfo *)p_buffer.id;
+
+	[blit_enc fillBuffer:buffer->metal_buffer
+				   range:NSMakeRange(p_offset, p_size)
+				   value:0];
+}
+
+void MDCommandBuffer::copy_buffer(RDD::BufferID p_src_buffer, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferCopyRegion> p_regions) {
+	const RDM::BufferInfo *src = (const RDM::BufferInfo *)p_src_buffer.id;
+	const RDM::BufferInfo *dst = (const RDM::BufferInfo *)p_dst_buffer.id;
+
+	id<MTLBlitCommandEncoder> enc = _ensure_blit_encoder();
+
+	for (uint32_t i = 0; i < p_regions.size(); i++) {
+		RDD::BufferCopyRegion region = p_regions[i];
+		[enc copyFromBuffer:src->metal_buffer
+					 sourceOffset:region.src_offset
+						 toBuffer:dst->metal_buffer
+				destinationOffset:region.dst_offset
+							 size:region.size];
+	}
+}
+
+static MTLSize MTLSizeFromVector3i(Vector3i p_size) {
+	return MTLSizeMake(p_size.x, p_size.y, p_size.z);
+}
+
+static MTLOrigin MTLOriginFromVector3i(Vector3i p_origin) {
+	return MTLOriginMake(p_origin.x, p_origin.y, p_origin.z);
+}
+
+// Clamps the size so that the sum of the origin and size do not exceed the maximum size.
+static inline MTLSize clampMTLSize(MTLSize p_size, MTLOrigin p_origin, MTLSize p_max_size) {
+	MTLSize clamped;
+	clamped.width = MIN(p_size.width, p_max_size.width - p_origin.x);
+	clamped.height = MIN(p_size.height, p_max_size.height - p_origin.y);
+	clamped.depth = MIN(p_size.depth, p_max_size.depth - p_origin.z);
+	return clamped;
+}
+
+API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
+static bool isArrayTexture(MTLTextureType p_type) {
+	return (p_type == MTLTextureType3D ||
+			p_type == MTLTextureType2DArray ||
+			p_type == MTLTextureType2DMultisampleArray ||
+			p_type == MTLTextureType1DArray);
+}
+
+_FORCE_INLINE_ static bool operator==(MTLSize p_a, MTLSize p_b) {
+	return p_a.width == p_b.width && p_a.height == p_b.height && p_a.depth == p_b.depth;
+}
+
+void MDCommandBuffer::copy_texture(RDD::TextureID p_src_texture, RDD::TextureID p_dst_texture, VectorView<RDD::TextureCopyRegion> p_regions) {
+	id<MTLTexture> src = rid::get(p_src_texture);
+	id<MTLTexture> dst = rid::get(p_dst_texture);
+
+	id<MTLBlitCommandEncoder> enc = _ensure_blit_encoder();
+	PixelFormats &pf = device_driver->get_pixel_formats();
+
+	MTLPixelFormat src_fmt = src.pixelFormat;
+	bool src_is_compressed = pf.getFormatType(src_fmt) == MTLFormatType::Compressed;
+	MTLPixelFormat dst_fmt = dst.pixelFormat;
+	bool dst_is_compressed = pf.getFormatType(dst_fmt) == MTLFormatType::Compressed;
+
+	// Validate copy.
+	if (src.sampleCount != dst.sampleCount || pf.getBytesPerBlock(src_fmt) != pf.getBytesPerBlock(dst_fmt)) {
+		ERR_FAIL_MSG("Cannot copy between incompatible pixel formats, such as formats of different pixel sizes, or between images with different sample counts.");
+	}
+
+	// If source and destination have different formats and at least one is compressed, a temporary buffer is required.
+	bool need_tmp_buffer = (src_fmt != dst_fmt) && (src_is_compressed || dst_is_compressed);
+	if (need_tmp_buffer) {
+		ERR_FAIL_MSG("not implemented: copy with intermediate buffer");
+	}
+
+	if (src_fmt != dst_fmt) {
+		// Map the source pixel format to the dst through a texture view on the source texture.
+		src = [src newTextureViewWithPixelFormat:dst_fmt];
+	}
+
+	for (uint32_t i = 0; i < p_regions.size(); i++) {
+		RDD::TextureCopyRegion region = p_regions[i];
+
+		MTLSize extent = MTLSizeFromVector3i(region.size);
+
+		// If copies can be performed using direct texture-texture copying, do so.
+		uint32_t src_level = region.src_subresources.mipmap;
+		uint32_t src_base_layer = region.src_subresources.base_layer;
+		MTLSize src_extent = mipmapLevelSizeFromTexture(src, src_level);
+		uint32_t dst_level = region.dst_subresources.mipmap;
+		uint32_t dst_base_layer = region.dst_subresources.base_layer;
+		MTLSize dst_extent = mipmapLevelSizeFromTexture(dst, dst_level);
+
+		// All layers may be copied at once, if the extent completely covers both images.
+		if (src_extent == extent && dst_extent == extent) {
+			[enc copyFromTexture:src
+						 sourceSlice:src_base_layer
+						 sourceLevel:src_level
+						   toTexture:dst
+					destinationSlice:dst_base_layer
+					destinationLevel:dst_level
+						  sliceCount:region.src_subresources.layer_count
+						  levelCount:1];
+		} else {
+			MTLOrigin src_origin = MTLOriginFromVector3i(region.src_offset);
+			MTLSize src_size = clampMTLSize(extent, src_origin, src_extent);
+			uint32_t layer_count = 0;
+			if ((src.textureType == MTLTextureType3D) != (dst.textureType == MTLTextureType3D)) {
+				// In the case, the number of layers to copy is in extent.depth. Use that value,
+				// then clamp the depth, so we don't try to copy more than Metal will allow.
+				layer_count = extent.depth;
+				src_size.depth = 1;
+			} else {
+				layer_count = region.src_subresources.layer_count;
+			}
+			MTLOrigin dst_origin = MTLOriginFromVector3i(region.dst_offset);
+
+			for (uint32_t layer = 0; layer < layer_count; layer++) {
+				// We can copy between a 3D and a 2D image easily. Just copy between
+				// one slice of the 2D image and one plane of the 3D image at a time.
+				if ((src.textureType == MTLTextureType3D) == (dst.textureType == MTLTextureType3D)) {
+					[enc copyFromTexture:src
+								  sourceSlice:src_base_layer + layer
+								  sourceLevel:src_level
+								 sourceOrigin:src_origin
+								   sourceSize:src_size
+									toTexture:dst
+							 destinationSlice:dst_base_layer + layer
+							 destinationLevel:dst_level
+							destinationOrigin:dst_origin];
+				} else if (src.textureType == MTLTextureType3D) {
+					[enc copyFromTexture:src
+								  sourceSlice:src_base_layer
+								  sourceLevel:src_level
+								 sourceOrigin:MTLOriginMake(src_origin.x, src_origin.y, src_origin.z + layer)
+								   sourceSize:src_size
+									toTexture:dst
+							 destinationSlice:dst_base_layer + layer
+							 destinationLevel:dst_level
+							destinationOrigin:dst_origin];
+				} else {
+					DEV_ASSERT(dst.textureType == MTLTextureType3D);
+					[enc copyFromTexture:src
+								  sourceSlice:src_base_layer + layer
+								  sourceLevel:src_level
+								 sourceOrigin:src_origin
+								   sourceSize:src_size
+									toTexture:dst
+							 destinationSlice:dst_base_layer
+							 destinationLevel:dst_level
+							destinationOrigin:MTLOriginMake(dst_origin.x, dst_origin.y, dst_origin.z + layer)];
+				}
+			}
+		}
+	}
+}
+
+void MDCommandBuffer::copy_buffer_to_texture(RDD::BufferID p_src_buffer, RDD::TextureID p_dst_texture, VectorView<RDD::BufferTextureCopyRegion> p_regions) {
+	_copy_texture_buffer(CopySource::Buffer, p_dst_texture, p_src_buffer, p_regions);
+}
+
+void MDCommandBuffer::copy_texture_to_buffer(RDD::TextureID p_src_texture, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferTextureCopyRegion> p_regions) {
+	_copy_texture_buffer(CopySource::Texture, p_src_texture, p_dst_buffer, p_regions);
+}
+
+void MDCommandBuffer::_copy_texture_buffer(CopySource p_source,
+		RDD::TextureID p_texture,
+		RDD::BufferID p_buffer,
+		VectorView<RDD::BufferTextureCopyRegion> p_regions) {
+	const RDM::BufferInfo *buffer = (const RDM::BufferInfo *)p_buffer.id;
+	id<MTLTexture> texture = rid::get(p_texture);
+
+	id<MTLBlitCommandEncoder> enc = _ensure_blit_encoder();
+
+	PixelFormats &pf = device_driver->get_pixel_formats();
+	MTLPixelFormat mtlPixFmt = texture.pixelFormat;
+
+	MTLBlitOption options = MTLBlitOptionNone;
+	if (pf.isPVRTCFormat(mtlPixFmt)) {
+		options |= MTLBlitOptionRowLinearPVRTC;
+	}
+
+	for (uint32_t i = 0; i < p_regions.size(); i++) {
+		RDD::BufferTextureCopyRegion region = p_regions[i];
+
+		uint32_t mip_level = region.texture_subresource.mipmap;
+		MTLOrigin txt_origin = MTLOriginMake(region.texture_offset.x, region.texture_offset.y, region.texture_offset.z);
+		MTLSize src_extent = mipmapLevelSizeFromTexture(texture, mip_level);
+		MTLSize txt_size = clampMTLSize(MTLSizeMake(region.texture_region_size.x, region.texture_region_size.y, region.texture_region_size.z),
+				txt_origin,
+				src_extent);
+
+		uint32_t buffImgWd = region.texture_region_size.x;
+		uint32_t buffImgHt = region.texture_region_size.y;
+
+		NSUInteger bytesPerRow = pf.getBytesPerRow(mtlPixFmt, buffImgWd);
+		NSUInteger bytesPerImg = pf.getBytesPerLayer(mtlPixFmt, bytesPerRow, buffImgHt);
+
+		MTLBlitOption blit_options = options;
+
+		if (pf.isDepthFormat(mtlPixFmt) && pf.isStencilFormat(mtlPixFmt)) {
+			// Don't reduce depths of 32-bit depth/stencil formats.
+			if (region.texture_subresource.aspect == RDD::TEXTURE_ASPECT_DEPTH) {
+				if (pf.getBytesPerTexel(mtlPixFmt) != 4) {
+					bytesPerRow -= buffImgWd;
+					bytesPerImg -= buffImgWd * buffImgHt;
+				}
+				blit_options |= MTLBlitOptionDepthFromDepthStencil;
+			} else if (region.texture_subresource.aspect == RDD::TEXTURE_ASPECT_STENCIL) {
+				// The stencil component is always 1 byte per pixel.
+				bytesPerRow = buffImgWd;
+				bytesPerImg = buffImgWd * buffImgHt;
+				blit_options |= MTLBlitOptionStencilFromDepthStencil;
+			}
+		}
+
+		if (!isArrayTexture(texture.textureType)) {
+			bytesPerImg = 0;
+		}
+
+		if (p_source == CopySource::Buffer) {
+			[enc copyFromBuffer:buffer->metal_buffer
+						   sourceOffset:region.buffer_offset
+					  sourceBytesPerRow:bytesPerRow
+					sourceBytesPerImage:bytesPerImg
+							 sourceSize:txt_size
+							  toTexture:texture
+					   destinationSlice:region.texture_subresource.layer
+					   destinationLevel:mip_level
+					  destinationOrigin:txt_origin
+								options:blit_options];
+		} else {
+			[enc copyFromTexture:texture
+								 sourceSlice:region.texture_subresource.layer
+								 sourceLevel:mip_level
+								sourceOrigin:txt_origin
+								  sourceSize:txt_size
+									toBuffer:buffer->metal_buffer
+						   destinationOffset:region.buffer_offset
+					  destinationBytesPerRow:bytesPerRow
+					destinationBytesPerImage:bytesPerImg
+									 options:blit_options];
+		}
+	}
+}
+
+void MDCommandBuffer::encodeRenderCommandEncoderWithDescriptor(MTLRenderPassDescriptor *p_desc, NSString *p_label) {
+	switch (type) {
+		case MDCommandBufferStateType::None:
+			break;
+		case MDCommandBufferStateType::Render:
+			render_end_pass();
+			break;
+		case MDCommandBufferStateType::Compute:
+			_end_compute_dispatch();
+			break;
+		case MDCommandBufferStateType::Blit:
+			_end_blit();
+			break;
+	}
+
+	id<MTLRenderCommandEncoder> enc = [command_buffer() renderCommandEncoderWithDescriptor:p_desc];
+	if (p_label != nil) {
+		[enc pushDebugGroup:p_label];
+		[enc popDebugGroup];
+	}
+	[enc endEncoding];
+}
+
+#pragma mark - Render Commands
+
+void MDCommandBuffer::render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+
+	if (uint32_t new_size = p_first_set_index + p_set_count; render.uniform_sets.size() < new_size) {
+		uint32_t s = render.uniform_sets.size();
+		render.uniform_sets.resize(new_size);
+		// Set intermediate values to null.
+		std::fill(&render.uniform_sets[s], render.uniform_sets.end().operator->(), nullptr);
+	}
+
+	const MDShader *shader = (const MDShader *)p_shader.id;
+	DynamicOffsetLayout layout = shader->dynamic_offset_layout;
+
+	// Clear bits for sets being rebound before OR'ing new values.
+	// This prevents corruption when the same set is bound multiple times
+	// with different frame indices (e.g., OPAQUE pass then ALPHA pass).
+	for (uint32_t i = 0; i < p_set_count && render.dynamic_offsets != 0; i++) {
+		uint32_t set_index = p_first_set_index + i;
+		uint32_t count = layout.get_count(set_index);
+		if (count > 0) {
+			uint32_t shift = layout.get_offset_index_shift(set_index);
+			uint32_t mask = ((1u << (count * 4u)) - 1u) << shift;
+			render.dynamic_offsets &= ~mask;
+		}
+	}
+	render.dynamic_offsets |= p_dynamic_offsets;
+
+	for (size_t i = 0; i < p_set_count; ++i) {
+		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
+
+		uint32_t index = p_first_set_index + i;
+		if (render.uniform_sets[index] != set || layout.get_count(index) > 0) {
+			render.dirty.set_flag(RenderState::DIRTY_UNIFORMS);
+			render.uniform_set_mask |= 1ULL << index;
+			render.uniform_sets[index] = set;
+		}
+	}
+}
+
+void MDCommandBuffer::render_clear_attachments(VectorView<RDD::AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+
+	const MDSubpass &subpass = render.get_subpass();
+
+	uint32_t vertex_count = p_rects.size() * 6 * subpass.view_count;
+	simd::float4 *vertices = ALLOCA_ARRAY(simd::float4, vertex_count);
+	simd::float4 clear_colors[ClearAttKey::ATTACHMENT_COUNT];
+
+	Size2i size = render.frameBuffer->size;
+	Rect2i render_area = render.clip_to_render_area({ { 0, 0 }, size });
+	size = Size2i(render_area.position.x + render_area.size.width, render_area.position.y + render_area.size.height);
+	_populate_vertices(vertices, size, p_rects);
+
+	ClearAttKey key;
+	key.sample_count = render.pass->get_sample_count();
+	if (subpass.view_count > 1) {
+		key.enable_layered_rendering();
+	}
+
+	float depth_value = 0;
+	uint32_t stencil_value = 0;
+
+	for (uint32_t i = 0; i < p_attachment_clears.size(); i++) {
+		RDD::AttachmentClear const &attClear = p_attachment_clears[i];
+		uint32_t attachment_index;
+		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
+			attachment_index = attClear.color_attachment;
+		} else {
+			attachment_index = subpass.depth_stencil_reference.attachment;
+		}
+
+		MDAttachment const &mda = render.pass->attachments[attachment_index];
+		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_COLOR_BIT)) {
+			key.set_color_format(attachment_index, mda.format);
+			clear_colors[attachment_index] = {
+				attClear.value.color.r,
+				attClear.value.color.g,
+				attClear.value.color.b,
+				attClear.value.color.a
+			};
+		}
+
+		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT)) {
+			key.set_depth_format(mda.format);
+			depth_value = attClear.value.depth;
+		}
+
+		if (attClear.aspect.has_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT)) {
+			key.set_stencil_format(mda.format);
+			stencil_value = attClear.value.stencil;
+		}
+	}
+	clear_colors[ClearAttKey::DEPTH_INDEX] = {
+		depth_value,
+		depth_value,
+		depth_value,
+		depth_value
+	};
+
+	id<MTLRenderCommandEncoder> enc = render.encoder;
+
+	MDResourceCache &cache = device_driver->get_resource_cache();
+
+	[enc pushDebugGroup:@"ClearAttachments"];
+	[enc setRenderPipelineState:cache.get_clear_render_pipeline_state(key, nil)];
+	[enc setDepthStencilState:cache.get_depth_stencil_state(
+									  key.is_depth_enabled(),
+									  key.is_stencil_enabled())];
+	[enc setStencilReferenceValue:stencil_value];
+	[enc setCullMode:MTLCullModeNone];
+	[enc setTriangleFillMode:MTLTriangleFillModeFill];
+	[enc setDepthBias:0 slopeScale:0 clamp:0];
+	[enc setViewport:{ 0, 0, (double)size.width, (double)size.height, 0.0, 1.0 }];
+	[enc setScissorRect:{ 0, 0, (NSUInteger)size.width, (NSUInteger)size.height }];
+
+	[enc setVertexBytes:clear_colors length:sizeof(clear_colors) atIndex:0];
+	[enc setFragmentBytes:clear_colors length:sizeof(clear_colors) atIndex:0];
+	[enc setVertexBytes:vertices length:vertex_count * sizeof(vertices[0]) atIndex:device_driver->get_metal_buffer_index_for_vertex_attribute_binding(VERT_CONTENT_BUFFER_INDEX)];
+
+	[enc drawPrimitives:MTLPrimitiveTypeTriangle vertexStart:0 vertexCount:vertex_count];
+	[enc popDebugGroup];
+
+	render.dirty.set_flag((RenderState::DirtyFlag)(RenderState::DIRTY_PIPELINE | RenderState::DIRTY_DEPTH | RenderState::DIRTY_RASTER));
+	binding_cache.clear();
+	render.mark_uniforms_dirty({ 0 }); // Mark index 0 dirty, if there is already a binding for index 0.
+	render.mark_viewport_dirty();
+	render.mark_scissors_dirty();
+	render.mark_vertex_dirty();
+	render.mark_blend_dirty();
+}
+
+void MDCommandBuffer::_render_set_dirty_state() {
+	_render_bind_uniform_sets();
+
+	if (render.dirty.has_flag(RenderState::DIRTY_PUSH)) {
+		if (push_constant_binding != UINT32_MAX) {
+			[render.encoder setVertexBytes:push_constant_data
+									length:push_constant_data_len
+								   atIndex:push_constant_binding];
+			[render.encoder setFragmentBytes:push_constant_data
+									  length:push_constant_data_len
+									 atIndex:push_constant_binding];
+		}
+	}
+
+	MDSubpass const &subpass = render.get_subpass();
+	if (subpass.view_count > 1) {
+		uint32_t view_range[2] = { 0, subpass.view_count };
+		[render.encoder setVertexBytes:view_range length:sizeof(view_range) atIndex:VIEW_MASK_BUFFER_INDEX];
+		[render.encoder setFragmentBytes:view_range length:sizeof(view_range) atIndex:VIEW_MASK_BUFFER_INDEX];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_PIPELINE)) {
+		[render.encoder setRenderPipelineState:render.pipeline->state];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_VIEWPORT)) {
+		[render.encoder setViewports:render.viewports.ptr() count:render.viewports.size()];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_DEPTH)) {
+		[render.encoder setDepthStencilState:render.pipeline->depth_stencil];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_RASTER)) {
+		render.pipeline->raster_state.apply(render.encoder);
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_SCISSOR) && !render.scissors.is_empty()) {
+		size_t len = render.scissors.size();
+		MTLScissorRect *rects = ALLOCA_ARRAY(MTLScissorRect, len);
+		for (size_t i = 0; i < len; i++) {
+			rects[i] = render.clip_to_render_area(render.scissors[i]);
+		}
+		[render.encoder setScissorRects:rects count:len];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_BLEND) && render.blend_constants.has_value()) {
+		[render.encoder setBlendColorRed:render.blend_constants->r green:render.blend_constants->g blue:render.blend_constants->b alpha:render.blend_constants->a];
+	}
+
+	if (render.dirty.has_flag(RenderState::DIRTY_VERTEX)) {
+		uint32_t p_binding_count = render.vertex_buffers.size();
+		if (p_binding_count > 0) {
+			uint32_t first = device_driver->get_metal_buffer_index_for_vertex_attribute_binding(p_binding_count - 1);
+			[render.encoder setVertexBuffers:render.vertex_buffers.ptr()
+									 offsets:render.vertex_offsets.ptr()
+								   withRange:NSMakeRange(first, p_binding_count)];
+		}
+	}
+
+	render.resource_tracker.encode(render.encoder);
+
+	render.dirty.clear();
+}
+
+void MDCommandBuffer::render_set_viewport(VectorView<Rect2i> p_viewports) {
+	render.viewports.resize(p_viewports.size());
+	for (uint32_t i = 0; i < p_viewports.size(); i += 1) {
+		Rect2i const &vp = p_viewports[i];
+		render.viewports[i] = {
+			.originX = static_cast<double>(vp.position.x),
+			.originY = static_cast<double>(vp.position.y),
+			.width = static_cast<double>(vp.size.width),
+			.height = static_cast<double>(vp.size.height),
+			.znear = 0.0,
+			.zfar = 1.0,
+		};
+	}
+
+	render.dirty.set_flag(RenderState::DIRTY_VIEWPORT);
+}
+
+void MDCommandBuffer::render_set_scissor(VectorView<Rect2i> p_scissors) {
+	render.scissors.resize(p_scissors.size());
+	for (uint32_t i = 0; i < p_scissors.size(); i += 1) {
+		Rect2i const &vp = p_scissors[i];
+		render.scissors[i] = {
+			.x = static_cast<NSUInteger>(vp.position.x),
+			.y = static_cast<NSUInteger>(vp.position.y),
+			.width = static_cast<NSUInteger>(vp.size.width),
+			.height = static_cast<NSUInteger>(vp.size.height),
+		};
+	}
+
+	render.dirty.set_flag(RenderState::DIRTY_SCISSOR);
+}
+
+void MDCommandBuffer::render_set_blend_constants(const Color &p_constants) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	if (render.blend_constants != p_constants) {
+		render.blend_constants = p_constants;
+		render.dirty.set_flag(RenderState::DIRTY_BLEND);
+	}
+}
+
+void ResourceTracker::merge_from(const ResourceUsageMap &p_from) {
+	for (KeyValue<StageResourceUsage, ResourceVector> const &keyval : p_from) {
+		ResourceVector *resources = _current.getptr(keyval.key);
+		if (resources == nullptr) {
+			resources = &_current.insert(keyval.key, ResourceVector())->value;
+		}
+		// Reserve space for the new resources, assuming they are all added.
+		resources->reserve(resources->size() + keyval.value.size());
+
+		uint32_t i = 0, j = 0;
+		MTLResourceUnsafe *resources_ptr = resources->ptr();
+		const MTLResourceUnsafe *keyval_ptr = keyval.value.ptr();
+		// 2-way merge.
+		while (i < resources->size() && j < keyval.value.size()) {
+			if (resources_ptr[i] < keyval_ptr[j]) {
+				i++;
+			} else if (resources_ptr[i] > keyval_ptr[j]) {
+				ResourceUsageEntry *existing = nullptr;
+				if ((existing = _previous.getptr(keyval_ptr[j])) == nullptr) {
+					existing = &_previous.insert(keyval_ptr[j], keyval.key)->value;
+					resources->insert(i, keyval_ptr[j]);
+				} else {
+					if (existing->usage != keyval.key) {
+						existing->usage |= keyval.key;
+						resources->insert(i, keyval_ptr[j]);
+					}
+				}
+				i++;
+				j++;
+			} else {
+				i++;
+				j++;
+			}
+		}
+		// Append the remaining resources.
+		for (; j < keyval.value.size(); j++) {
+			ResourceUsageEntry *existing = nullptr;
+			if ((existing = _previous.getptr(keyval_ptr[j])) == nullptr) {
+				existing = &_previous.insert(keyval_ptr[j], keyval.key)->value;
+				resources->push_back(keyval_ptr[j]);
+			} else {
+				if (existing->usage != keyval.key) {
+					existing->usage |= keyval.key;
+					resources->push_back(keyval_ptr[j]);
+				}
+			}
+		}
+	}
+}
+
+void ResourceTracker::encode(id<MTLRenderCommandEncoder> __unsafe_unretained p_enc) {
+	for (KeyValue<StageResourceUsage, ResourceVector> const &keyval : _current) {
+		if (keyval.value.is_empty()) {
+			continue;
+		}
+
+		MTLResourceUsage vert_usage = resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_VERTEX);
+		MTLResourceUsage frag_usage = resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_FRAGMENT);
+		if (vert_usage == frag_usage) {
+			[p_enc useResources:keyval.value.ptr() count:keyval.value.size() usage:vert_usage stages:MTLRenderStageVertex | MTLRenderStageFragment];
+		} else {
+			if (vert_usage != 0) {
+				[p_enc useResources:keyval.value.ptr() count:keyval.value.size() usage:vert_usage stages:MTLRenderStageVertex];
+			}
+			if (frag_usage != 0) {
+				[p_enc useResources:keyval.value.ptr() count:keyval.value.size() usage:frag_usage stages:MTLRenderStageFragment];
+			}
+		}
+	}
+
+	// Keep the keys for now and clear the vectors to reduce churn.
+	for (KeyValue<StageResourceUsage, ResourceVector> &v : _current) {
+		v.value.clear();
+	}
+}
+
+void ResourceTracker::encode(id<MTLComputeCommandEncoder> __unsafe_unretained p_enc) {
+	for (KeyValue<StageResourceUsage, ResourceVector> const &keyval : _current) {
+		if (keyval.value.is_empty()) {
+			continue;
+		}
+		MTLResourceUsage usage = resource_usage_for_stage(keyval.key, RDD::ShaderStage::SHADER_STAGE_COMPUTE);
+		if (usage != 0) {
+			[p_enc useResources:keyval.value.ptr() count:keyval.value.size() usage:usage];
+		}
+	}
+
+	// Keep the keys for now and clear the vectors to reduce churn.
+	for (KeyValue<StageResourceUsage, ResourceVector> &v : _current) {
+		v.value.clear();
+	}
+}
+
+void ResourceTracker::reset() {
+	// Keep the keys for now, as they are likely to be used repeatedly.
+	for (KeyValue<MTLResourceUnsafe, ResourceUsageEntry> &v : _previous) {
+		if (v.value.usage == ResourceUnused) {
+			v.value.unused++;
+			if (v.value.unused >= RESOURCE_UNUSED_CLEANUP_COUNT) {
+				_scratch.push_back(v.key);
+			}
+		} else {
+			v.value = ResourceUnused;
+			v.value.unused = 0;
+		}
+	}
+
+	// Clear up resources that weren't used for the last pass.
+	for (const MTLResourceUnsafe &res : _scratch) {
+		_previous.erase(res);
+	}
+	_scratch.clear();
+}
+
+void MDCommandBuffer::_render_bind_uniform_sets() {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	if (!render.dirty.has_flag(RenderState::DIRTY_UNIFORMS)) {
+		return;
+	}
+
+	render.dirty.clear_flag(RenderState::DIRTY_UNIFORMS);
+	uint64_t set_uniforms = render.uniform_set_mask;
+	render.uniform_set_mask = 0;
+
+	MDRenderShader *shader = render.pipeline->shader;
+	const uint32_t dynamic_offsets = render.dynamic_offsets;
+
+	while (set_uniforms != 0) {
+		// Find the index of the next set bit.
+		uint32_t index = (uint32_t)__builtin_ctzll(set_uniforms);
+		// Clear the set bit.
+		set_uniforms &= (set_uniforms - 1);
+		MDUniformSet *set = render.uniform_sets[index];
+		if (set == nullptr || index >= (uint32_t)shader->sets.size()) {
+			continue;
+		}
+		if (shader->uses_argument_buffers) {
+			set->bind_uniforms_argument_buffers(shader, render, index, dynamic_offsets, device_driver->frame_index(), device_driver->frame_count());
+		} else {
+			DirectEncoder de(render.encoder, binding_cache);
+			set->bind_uniforms_direct(shader, de, index, dynamic_offsets);
+		}
+	}
+}
+
+void MDCommandBuffer::_populate_vertices(simd::float4 *p_vertices, Size2i p_fb_size, VectorView<Rect2i> p_rects) {
+	uint32_t idx = 0;
+	for (uint32_t i = 0; i < p_rects.size(); i++) {
+		Rect2i const &rect = p_rects[i];
+		idx = _populate_vertices(p_vertices, idx, rect, p_fb_size);
+	}
+}
+
+uint32_t MDCommandBuffer::_populate_vertices(simd::float4 *p_vertices, uint32_t p_index, Rect2i const &p_rect, Size2i p_fb_size) {
+	// Determine the positions of the four edges of the
+	// clear rectangle as a fraction of the attachment size.
+	float leftPos = (float)(p_rect.position.x) / (float)p_fb_size.width;
+	float rightPos = (float)(p_rect.size.width) / (float)p_fb_size.width + leftPos;
+	float bottomPos = (float)(p_rect.position.y) / (float)p_fb_size.height;
+	float topPos = (float)(p_rect.size.height) / (float)p_fb_size.height + bottomPos;
+
+	// Transform to clip-space coordinates, which are bounded by (-1.0 < p < 1.0) in clip-space.
+	leftPos = (leftPos * 2.0f) - 1.0f;
+	rightPos = (rightPos * 2.0f) - 1.0f;
+	bottomPos = (bottomPos * 2.0f) - 1.0f;
+	topPos = (topPos * 2.0f) - 1.0f;
+
+	simd::float4 vtx;
+
+	uint32_t idx = p_index;
+	uint32_t endLayer = render.get_subpass().view_count;
+
+	for (uint32_t layer = 0; layer < endLayer; layer++) {
+		vtx.z = 0.0;
+		vtx.w = (float)layer;
+
+		// Top left vertex - First triangle.
+		vtx.y = topPos;
+		vtx.x = leftPos;
+		p_vertices[idx++] = vtx;
+
+		// Bottom left vertex.
+		vtx.y = bottomPos;
+		vtx.x = leftPos;
+		p_vertices[idx++] = vtx;
+
+		// Bottom right vertex.
+		vtx.y = bottomPos;
+		vtx.x = rightPos;
+		p_vertices[idx++] = vtx;
+
+		// Bottom right vertex - Second triangle.
+		p_vertices[idx++] = vtx;
+
+		// Top right vertex.
+		vtx.y = topPos;
+		vtx.x = rightPos;
+		p_vertices[idx++] = vtx;
+
+		// Top left vertex.
+		vtx.y = topPos;
+		vtx.x = leftPos;
+		p_vertices[idx++] = vtx;
+	}
+
+	return idx;
+}
+
+void MDCommandBuffer::render_begin_pass(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_frameBuffer, RDD::CommandBufferType p_cmd_buffer_type, const Rect2i &p_rect, VectorView<RDD::RenderPassClearValue> p_clear_values) {
+	DEV_ASSERT(command_buffer() != nil);
+	end();
+
+	MDRenderPass *pass = (MDRenderPass *)(p_render_pass.id);
+	MDFrameBuffer *fb = (MDFrameBuffer *)(p_frameBuffer.id);
+
+	type = MDCommandBufferStateType::Render;
+	render.pass = pass;
+	render.current_subpass = UINT32_MAX;
+	render.render_area = p_rect;
+	render.clear_values.resize(p_clear_values.size());
+	for (uint32_t i = 0; i < p_clear_values.size(); i++) {
+		render.clear_values[i] = p_clear_values[i];
+	}
+	render.is_rendering_entire_area = (p_rect.position == Point2i(0, 0)) && p_rect.size == fb->size;
+	render.frameBuffer = fb;
+	render_next_subpass();
+}
+
+void MDCommandBuffer::_end_render_pass() {
+	MDFrameBuffer const &fb_info = *render.frameBuffer;
+	MDSubpass const &subpass = render.get_subpass();
+
+	PixelFormats &pf = device_driver->get_pixel_formats();
+
+	for (uint32_t i = 0; i < subpass.resolve_references.size(); i++) {
+		uint32_t color_index = subpass.color_references[i].attachment;
+		uint32_t resolve_index = subpass.resolve_references[i].attachment;
+		DEV_ASSERT((color_index == RDD::AttachmentReference::UNUSED) == (resolve_index == RDD::AttachmentReference::UNUSED));
+		if (color_index == RDD::AttachmentReference::UNUSED || !fb_info.has_texture(color_index)) {
+			continue;
+		}
+
+		id<MTLTexture> resolve_tex = fb_info.get_texture(resolve_index);
+
+		CRASH_COND_MSG(!flags::all(pf.getCapabilities(resolve_tex.pixelFormat), kMTLFmtCapsResolve), "not implemented: unresolvable texture types");
+		// see: https://github.com/KhronosGroup/MoltenVK/blob/d20d13fe2735adb845636a81522df1b9d89c0fba/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm#L407
+	}
+
+	render.end_encoding();
+}
+
+void MDCommandBuffer::_render_clear_render_area() {
+	MDRenderPass const &pass = *render.pass;
+	MDSubpass const &subpass = render.get_subpass();
+
+	uint32_t ds_index = subpass.depth_stencil_reference.attachment;
+	bool clear_depth = (ds_index != RDD::AttachmentReference::UNUSED && pass.attachments[ds_index].shouldClear(subpass, false));
+	bool clear_stencil = (ds_index != RDD::AttachmentReference::UNUSED && pass.attachments[ds_index].shouldClear(subpass, true));
+
+	uint32_t color_count = subpass.color_references.size();
+	uint32_t clears_size = color_count + (clear_depth || clear_stencil ? 1 : 0);
+	if (clears_size == 0) {
+		return;
+	}
+
+	RDD::AttachmentClear *clears = ALLOCA_ARRAY(RDD::AttachmentClear, clears_size);
+	uint32_t clears_count = 0;
+
+	for (uint32_t i = 0; i < color_count; i++) {
+		uint32_t idx = subpass.color_references[i].attachment;
+		if (idx != RDD::AttachmentReference::UNUSED && pass.attachments[idx].shouldClear(subpass, false)) {
+			clears[clears_count++] = { .aspect = RDD::TEXTURE_ASPECT_COLOR_BIT, .color_attachment = idx, .value = render.clear_values[idx] };
+		}
+	}
+
+	if (clear_depth || clear_stencil) {
+		MDAttachment const &attachment = pass.attachments[ds_index];
+		BitField<RDD::TextureAspectBits> bits = {};
+		if (clear_depth && attachment.type & MDAttachmentType::Depth) {
+			bits.set_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
+		}
+		if (clear_stencil && attachment.type & MDAttachmentType::Stencil) {
+			bits.set_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT);
+		}
+
+		clears[clears_count++] = { .aspect = bits, .color_attachment = ds_index, .value = render.clear_values[ds_index] };
+	}
+
+	if (clears_count == 0) {
+		return;
+	}
+
+	render_clear_attachments(VectorView(clears, clears_count), { render.render_area });
+}
+
+void MDCommandBuffer::render_next_subpass() {
+	DEV_ASSERT(command_buffer() != nil);
+
+	if (render.current_subpass == UINT32_MAX) {
+		render.current_subpass = 0;
+	} else {
+		_end_render_pass();
+		render.current_subpass++;
+	}
+
+	MDFrameBuffer const &fb = *render.frameBuffer;
+	MDRenderPass const &pass = *render.pass;
+	MDSubpass const &subpass = render.get_subpass();
+
+	MTLRenderPassDescriptor *desc = MTLRenderPassDescriptor.renderPassDescriptor;
+
+	if (subpass.view_count > 1) {
+		desc.renderTargetArrayLength = subpass.view_count;
+	}
+
+	PixelFormats &pf = device_driver->get_pixel_formats();
+
+	uint32_t attachmentCount = 0;
+	for (uint32_t i = 0; i < subpass.color_references.size(); i++) {
+		uint32_t idx = subpass.color_references[i].attachment;
+		if (idx == RDD::AttachmentReference::UNUSED) {
+			continue;
+		}
+
+		attachmentCount += 1;
+		MTLRenderPassColorAttachmentDescriptor *ca = desc.colorAttachments[i];
+
+		uint32_t resolveIdx = subpass.resolve_references.is_empty() ? RDD::AttachmentReference::UNUSED : subpass.resolve_references[i].attachment;
+		bool has_resolve = resolveIdx != RDD::AttachmentReference::UNUSED;
+		bool can_resolve = true;
+		if (resolveIdx != RDD::AttachmentReference::UNUSED) {
+			id<MTLTexture> resolve_tex = fb.get_texture(resolveIdx);
+			can_resolve = flags::all(pf.getCapabilities(resolve_tex.pixelFormat), kMTLFmtCapsResolve);
+			if (can_resolve) {
+				ca.resolveTexture = resolve_tex;
+			} else {
+				CRASH_NOW_MSG("unimplemented: using a texture format that is not supported for resolve");
+			}
+		}
+
+		MDAttachment const &attachment = pass.attachments[idx];
+
+		id<MTLTexture> tex = fb.get_texture(idx);
+		ERR_FAIL_NULL_MSG(tex, "Frame buffer color texture is null.");
+
+		if ((attachment.type & MDAttachmentType::Color)) {
+			if (attachment.configureDescriptor(ca, pf, subpass, tex, render.is_rendering_entire_area, has_resolve, can_resolve, false)) {
+				Color clearColor = render.clear_values[idx].color;
+				ca.clearColor = MTLClearColorMake(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
+			}
+		}
+	}
+
+	if (subpass.depth_stencil_reference.attachment != RDD::AttachmentReference::UNUSED) {
+		attachmentCount += 1;
+		uint32_t idx = subpass.depth_stencil_reference.attachment;
+		MDAttachment const &attachment = pass.attachments[idx];
+		id<MTLTexture> tex = fb.get_texture(idx);
+		ERR_FAIL_NULL_MSG(tex, "Frame buffer depth / stencil texture is null.");
+		if (attachment.type & MDAttachmentType::Depth) {
+			MTLRenderPassDepthAttachmentDescriptor *da = desc.depthAttachment;
+			if (attachment.configureDescriptor(da, pf, subpass, tex, render.is_rendering_entire_area, false, false, false)) {
+				da.clearDepth = render.clear_values[idx].depth;
+			}
+		}
+
+		if (attachment.type & MDAttachmentType::Stencil) {
+			MTLRenderPassStencilAttachmentDescriptor *sa = desc.stencilAttachment;
+			if (attachment.configureDescriptor(sa, pf, subpass, tex, render.is_rendering_entire_area, false, false, true)) {
+				sa.clearStencil = render.clear_values[idx].stencil;
+			}
+		}
+	}
+
+	desc.renderTargetWidth = MAX((NSUInteger)MIN(render.render_area.position.x + render.render_area.size.width, fb.size.width), 1u);
+	desc.renderTargetHeight = MAX((NSUInteger)MIN(render.render_area.position.y + render.render_area.size.height, fb.size.height), 1u);
+
+	if (attachmentCount == 0) {
+		// If there are no attachments, delay the creation of the encoder,
+		// so we can use a matching sample count for the pipeline, by setting
+		// the defaultRasterSampleCount from the pipeline's sample count.
+		render.desc = desc;
+	} else {
+		render.encoder = [command_buffer() renderCommandEncoderWithDescriptor:desc];
+
+		if (!render.is_rendering_entire_area) {
+			_render_clear_render_area();
+		}
+		// With a new encoder, all state is dirty.
+		render.dirty.set_flag(RenderState::DIRTY_ALL);
+	}
+}
+
+void MDCommandBuffer::render_draw(uint32_t p_vertex_count,
+		uint32_t p_instance_count,
+		uint32_t p_base_vertex,
+		uint32_t p_first_instance) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
+
+	_render_set_dirty_state();
+
+	MDSubpass const &subpass = render.get_subpass();
+	if (subpass.view_count > 1) {
+		p_instance_count *= subpass.view_count;
+	}
+
+	DEV_ASSERT(render.dirty == 0);
+
+	id<MTLRenderCommandEncoder> enc = render.encoder;
+
+	[enc drawPrimitives:render.pipeline->raster_state.render_primitive
+			  vertexStart:p_base_vertex
+			  vertexCount:p_vertex_count
+			instanceCount:p_instance_count
+			 baseInstance:p_first_instance];
+}
+
+void MDCommandBuffer::render_bind_vertex_buffers(uint32_t p_binding_count, const RDD::BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+
+	render.vertex_buffers.resize(p_binding_count);
+	render.vertex_offsets.resize(p_binding_count);
+
+	// Are the existing buffer bindings the same?
+	bool same = true;
+
+	// Reverse the buffers, as their bindings are assigned in descending order.
+	for (uint32_t i = 0; i < p_binding_count; i += 1) {
+		const RenderingDeviceDriverMetal::BufferInfo *buf_info = (const RenderingDeviceDriverMetal::BufferInfo *)p_buffers[p_binding_count - i - 1].id;
+
+		NSUInteger dynamic_offset = 0;
+		if (buf_info->is_dynamic()) {
+			const MetalBufferDynamicInfo *dyn_buf = (const MetalBufferDynamicInfo *)buf_info;
+			uint64_t frame_idx = p_dynamic_offsets & 0x3;
+			p_dynamic_offsets >>= 2;
+			dynamic_offset = frame_idx * dyn_buf->size_bytes;
+		}
+		if (render.vertex_buffers[i] != buf_info->metal_buffer) {
+			render.vertex_buffers[i] = buf_info->metal_buffer;
+			same = false;
+		}
+
+		render.vertex_offsets[i] = dynamic_offset + p_offsets[p_binding_count - i - 1];
+	}
+
+	if (render.encoder) {
+		uint32_t first = device_driver->get_metal_buffer_index_for_vertex_attribute_binding(p_binding_count - 1);
+		if (same) {
+			NSUInteger *offset_ptr = render.vertex_offsets.ptr();
+			for (uint32_t i = first; i < first + p_binding_count; i++) {
+				[render.encoder setVertexBufferOffset:*offset_ptr atIndex:i];
+				offset_ptr++;
+			}
+		} else {
+			[render.encoder setVertexBuffers:render.vertex_buffers.ptr()
+									 offsets:render.vertex_offsets.ptr()
+								   withRange:NSMakeRange(first, p_binding_count)];
+		}
+		render.dirty.clear_flag(RenderState::DIRTY_VERTEX);
+	} else {
+		render.dirty.set_flag(RenderState::DIRTY_VERTEX);
+	}
+}
+
+void MDCommandBuffer::render_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint64_t p_offset) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+
+	const RenderingDeviceDriverMetal::BufferInfo *buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_buffer.id;
+
+	render.index_buffer = buffer->metal_buffer;
+	render.index_type = p_format == RDD::IndexBufferFormat::INDEX_BUFFER_FORMAT_UINT16 ? MTLIndexTypeUInt16 : MTLIndexTypeUInt32;
+	render.index_offset = p_offset;
+}
+
+void MDCommandBuffer::render_draw_indexed(uint32_t p_index_count,
+		uint32_t p_instance_count,
+		uint32_t p_first_index,
+		int32_t p_vertex_offset,
+		uint32_t p_first_instance) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
+
+	_render_set_dirty_state();
+
+	MDSubpass const &subpass = render.get_subpass();
+	if (subpass.view_count > 1) {
+		p_instance_count *= subpass.view_count;
+	}
+
+	id<MTLRenderCommandEncoder> enc = render.encoder;
+
+	uint32_t index_offset = render.index_offset;
+	index_offset += p_first_index * (render.index_type == MTLIndexTypeUInt16 ? sizeof(uint16_t) : sizeof(uint32_t));
+
+	[enc drawIndexedPrimitives:render.pipeline->raster_state.render_primitive
+					indexCount:p_index_count
+					 indexType:render.index_type
+				   indexBuffer:render.index_buffer
+			 indexBufferOffset:index_offset
+				 instanceCount:p_instance_count
+					baseVertex:p_vertex_offset
+				  baseInstance:p_first_instance];
+}
+
+void MDCommandBuffer::render_draw_indexed_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
+
+	_render_set_dirty_state();
+
+	id<MTLRenderCommandEncoder> enc = render.encoder;
+
+	const RenderingDeviceDriverMetal::BufferInfo *indirect_buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
+	NSUInteger indirect_offset = p_offset;
+
+	for (uint32_t i = 0; i < p_draw_count; i++) {
+		[enc drawIndexedPrimitives:render.pipeline->raster_state.render_primitive
+						   indexType:render.index_type
+						 indexBuffer:render.index_buffer
+				   indexBufferOffset:0
+					  indirectBuffer:indirect_buffer->metal_buffer
+				indirectBufferOffset:indirect_offset];
+		indirect_offset += p_stride;
+	}
+}
+
+void MDCommandBuffer::render_draw_indexed_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
+	ERR_FAIL_MSG("not implemented");
+}
+
+void MDCommandBuffer::render_draw_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+	ERR_FAIL_NULL_MSG(render.pipeline, "No pipeline set for render command buffer.");
+
+	_render_set_dirty_state();
+
+	id<MTLRenderCommandEncoder> enc = render.encoder;
+
+	const RenderingDeviceDriverMetal::BufferInfo *indirect_buffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
+	NSUInteger indirect_offset = p_offset;
+
+	for (uint32_t i = 0; i < p_draw_count; i++) {
+		[enc drawPrimitives:render.pipeline->raster_state.render_primitive
+					  indirectBuffer:indirect_buffer->metal_buffer
+				indirectBufferOffset:indirect_offset];
+		indirect_offset += p_stride;
+	}
+}
+
+void MDCommandBuffer::render_draw_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
+	ERR_FAIL_MSG("not implemented");
+}
+
+void MDCommandBuffer::render_end_pass() {
+	DEV_ASSERT(type == MDCommandBufferStateType::Render);
+
+	render.end_encoding();
+	render.reset();
+	reset();
+}
+
+#pragma mark - RenderState
+
+void MDCommandBuffer::RenderState::reset() {
+	pass = nil;
+	frameBuffer = nil;
+	pipeline = nil;
+	current_subpass = UINT32_MAX;
+	render_area = {};
+	is_rendering_entire_area = false;
+	desc = nil;
+	encoder = nil;
+	index_buffer = nil;
+	index_type = MTLIndexTypeUInt16;
+	dirty = DIRTY_NONE;
+	uniform_sets.clear();
+	dynamic_offsets = 0;
+	uniform_set_mask = 0;
+	clear_values.clear();
+	viewports.clear();
+	scissors.clear();
+	blend_constants.reset();
+	bzero(vertex_buffers.ptr(), sizeof(id<MTLBuffer> __unsafe_unretained) * vertex_buffers.size());
+	vertex_buffers.clear();
+	bzero(vertex_offsets.ptr(), sizeof(NSUInteger) * vertex_offsets.size());
+	vertex_offsets.clear();
+	resource_tracker.reset();
+}
+
+void MDCommandBuffer::RenderState::end_encoding() {
+	if (encoder == nil) {
+		return;
+	}
+
+	[encoder endEncoding];
+	encoder = nil;
+}
+
+#pragma mark - ComputeState
+
+void MDCommandBuffer::ComputeState::end_encoding() {
+	if (encoder == nil) {
+		return;
+	}
+
+	[encoder endEncoding];
+	encoder = nil;
+}
+
+#pragma mark - Compute
+
+void MDCommandBuffer::_compute_set_dirty_state() {
+	if (compute.dirty.has_flag(ComputeState::DIRTY_PIPELINE)) {
+		compute.encoder = [command_buffer() computeCommandEncoderWithDispatchType:MTLDispatchTypeConcurrent];
+		[compute.encoder setComputePipelineState:compute.pipeline->state];
+	}
+
+	_compute_bind_uniform_sets();
+
+	if (compute.dirty.has_flag(ComputeState::DIRTY_PUSH)) {
+		if (push_constant_binding != UINT32_MAX) {
+			[compute.encoder setBytes:push_constant_data
+							   length:push_constant_data_len
+							  atIndex:push_constant_binding];
+		}
+	}
+
+	compute.resource_tracker.encode(compute.encoder);
+
+	compute.dirty.clear();
+}
+
+void MDCommandBuffer::_compute_bind_uniform_sets() {
+	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
+	if (!compute.dirty.has_flag(ComputeState::DIRTY_UNIFORMS)) {
+		return;
+	}
+
+	compute.dirty.clear_flag(ComputeState::DIRTY_UNIFORMS);
+	uint64_t set_uniforms = compute.uniform_set_mask;
+	compute.uniform_set_mask = 0;
+
+	MDComputeShader *shader = compute.pipeline->shader;
+	const uint32_t dynamic_offsets = compute.dynamic_offsets;
+
+	while (set_uniforms != 0) {
+		// Find the index of the next set bit.
+		uint32_t index = (uint32_t)__builtin_ctzll(set_uniforms);
+		// Clear the set bit.
+		set_uniforms &= (set_uniforms - 1);
+		MDUniformSet *set = compute.uniform_sets[index];
+		if (set == nullptr || index >= (uint32_t)shader->sets.size()) {
+			continue;
+		}
+		if (shader->uses_argument_buffers) {
+			set->bind_uniforms_argument_buffers(shader, compute, index, dynamic_offsets, device_driver->frame_index(), device_driver->frame_count());
+		} else {
+			DirectEncoder de(compute.encoder, binding_cache);
+			set->bind_uniforms_direct(shader, de, index, dynamic_offsets);
+		}
+	}
+}
+
+void MDCommandBuffer::ComputeState::reset() {
+	pipeline = nil;
+	encoder = nil;
+	dirty = DIRTY_NONE;
+	uniform_sets.clear();
+	dynamic_offsets = 0;
+	uniform_set_mask = 0;
+	resource_tracker.reset();
+}
+
+void MDCommandBuffer::compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
+
+	if (uint32_t new_size = p_first_set_index + p_set_count; compute.uniform_sets.size() < new_size) {
+		uint32_t s = compute.uniform_sets.size();
+		compute.uniform_sets.resize(new_size);
+		// Set intermediate values to null.
+		std::fill(&compute.uniform_sets[s], compute.uniform_sets.end().operator->(), nullptr);
+	}
+
+	const MDShader *shader = (const MDShader *)p_shader.id;
+	DynamicOffsetLayout layout = shader->dynamic_offset_layout;
+
+	// Clear bits for sets being rebound before OR'ing new values.
+	// This prevents corruption when the same set is bound multiple times
+	// with different frame indices.
+	for (uint32_t i = 0; i < p_set_count && compute.dynamic_offsets != 0; i++) {
+		uint32_t set_index = p_first_set_index + i;
+		uint32_t count = layout.get_count(set_index);
+		if (count > 0) {
+			uint32_t shift = layout.get_offset_index_shift(set_index);
+			uint32_t mask = ((1u << (count * 4u)) - 1u) << shift;
+			compute.dynamic_offsets &= ~mask;
+		}
+	}
+	compute.dynamic_offsets |= p_dynamic_offsets;
+
+	for (size_t i = 0; i < p_set_count; ++i) {
+		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
+
+		uint32_t index = p_first_set_index + i;
+		if (compute.uniform_sets[index] != set || layout.get_count(index) > 0) {
+			compute.dirty.set_flag(ComputeState::DIRTY_UNIFORMS);
+			compute.uniform_set_mask |= 1ULL << index;
+			compute.uniform_sets[index] = set;
+		}
+	}
+}
+
+void MDCommandBuffer::compute_dispatch(uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
+
+	_compute_set_dirty_state();
+
+	MTLRegion region = MTLRegionMake3D(0, 0, 0, p_x_groups, p_y_groups, p_z_groups);
+
+	id<MTLComputeCommandEncoder> enc = compute.encoder;
+	[enc dispatchThreadgroups:region.size threadsPerThreadgroup:compute.pipeline->compute_state.local];
+}
+
+void MDCommandBuffer::compute_dispatch_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset) {
+	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
+
+	_compute_set_dirty_state();
+
+	const RenderingDeviceDriverMetal::BufferInfo *indirectBuffer = (const RenderingDeviceDriverMetal::BufferInfo *)p_indirect_buffer.id;
+
+	id<MTLComputeCommandEncoder> enc = compute.encoder;
+	[enc dispatchThreadgroupsWithIndirectBuffer:indirectBuffer->metal_buffer indirectBufferOffset:p_offset threadsPerThreadgroup:compute.pipeline->compute_state.local];
+}
+
+void MDCommandBuffer::reset() {
+	push_constant_data_len = 0;
+	type = MDCommandBufferStateType::None;
+}
+
+void MDCommandBuffer::_end_compute_dispatch() {
+	DEV_ASSERT(type == MDCommandBufferStateType::Compute);
+
+	compute.end_encoding();
+	compute.reset();
+	reset();
+}
+
+void MDCommandBuffer::_end_blit() {
+	DEV_ASSERT(type == MDCommandBufferStateType::Blit);
+
+	[blit.encoder endEncoding];
+	blit.reset();
+	reset();
+}
+
+MDComputeShader::MDComputeShader(CharString p_name,
+		Vector<UniformSet> p_sets,
+		bool p_uses_argument_buffers,
+		MDLibrary *p_kernel) :
+		MDShader(p_name, p_sets, p_uses_argument_buffers), kernel(p_kernel) {
+}
+
+MDRenderShader::MDRenderShader(CharString p_name,
+		Vector<UniformSet> p_sets,
+		bool p_needs_view_mask_buffer,
+		bool p_uses_argument_buffers,
+		MDLibrary *_Nonnull p_vert, MDLibrary *_Nonnull p_frag) :
+		MDShader(p_name, p_sets, p_uses_argument_buffers),
+		needs_view_mask_buffer(p_needs_view_mask_buffer),
+		vert(p_vert),
+		frag(p_frag) {
+}
+
+void DirectEncoder::set(__unsafe_unretained id<MTLTexture> *p_textures, NSRange p_range) {
+	if (cache.update(p_range, p_textures)) {
+		switch (mode) {
+			case RENDER: {
+				id<MTLRenderCommandEncoder> __unsafe_unretained enc = (id<MTLRenderCommandEncoder>)encoder;
+				[enc setVertexTextures:p_textures withRange:p_range];
+				[enc setFragmentTextures:p_textures withRange:p_range];
+			} break;
+			case COMPUTE: {
+				id<MTLComputeCommandEncoder> __unsafe_unretained enc = (id<MTLComputeCommandEncoder>)encoder;
+				[enc setTextures:p_textures withRange:p_range];
+			} break;
+		}
+	}
+}
+
+void DirectEncoder::set(__unsafe_unretained id<MTLBuffer> *p_buffers, const NSUInteger *p_offsets, NSRange p_range) {
+	if (cache.update(p_range, p_buffers, p_offsets)) {
+		switch (mode) {
+			case RENDER: {
+				id<MTLRenderCommandEncoder> __unsafe_unretained enc = (id<MTLRenderCommandEncoder>)encoder;
+				[enc setVertexBuffers:p_buffers offsets:p_offsets withRange:p_range];
+				[enc setFragmentBuffers:p_buffers offsets:p_offsets withRange:p_range];
+			} break;
+			case COMPUTE: {
+				id<MTLComputeCommandEncoder> __unsafe_unretained enc = (id<MTLComputeCommandEncoder>)encoder;
+				[enc setBuffers:p_buffers offsets:p_offsets withRange:p_range];
+			} break;
+		}
+	}
+}
+
+void DirectEncoder::set(id<MTLBuffer> __unsafe_unretained p_buffer, const NSUInteger p_offset, uint32_t p_index) {
+	if (cache.update(p_buffer, p_offset, p_index)) {
+		switch (mode) {
+			case RENDER: {
+				id<MTLRenderCommandEncoder> __unsafe_unretained enc = (id<MTLRenderCommandEncoder>)encoder;
+				[enc setVertexBuffer:p_buffer offset:p_offset atIndex:p_index];
+				[enc setFragmentBuffer:p_buffer offset:p_offset atIndex:p_index];
+			} break;
+			case COMPUTE: {
+				id<MTLComputeCommandEncoder> __unsafe_unretained enc = (id<MTLComputeCommandEncoder>)encoder;
+				[enc setBuffer:p_buffer offset:p_offset atIndex:p_index];
+			} break;
+		}
+	}
+}
+
+void DirectEncoder::set(__unsafe_unretained id<MTLSamplerState> *p_samplers, NSRange p_range) {
+	if (cache.update(p_range, p_samplers)) {
+		switch (mode) {
+			case RENDER: {
+				id<MTLRenderCommandEncoder> __unsafe_unretained enc = (id<MTLRenderCommandEncoder>)encoder;
+				[enc setVertexSamplerStates:p_samplers withRange:p_range];
+				[enc setFragmentSamplerStates:p_samplers withRange:p_range];
+			} break;
+			case COMPUTE: {
+				id<MTLComputeCommandEncoder> __unsafe_unretained enc = (id<MTLComputeCommandEncoder>)encoder;
+				[enc setSamplerStates:p_samplers withRange:p_range];
+			} break;
+		}
+	}
+}
+
+void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index, uint32_t p_dynamic_offsets, uint32_t p_frame_idx, uint32_t p_frame_count) {
+	DEV_ASSERT(p_shader->uses_argument_buffers);
+	DEV_ASSERT(p_state.encoder != nil);
+	DEV_ASSERT(p_shader->dynamic_offset_layout.is_empty()); // Argument buffers do not support dynamic offsets.
+
+	id<MTLRenderCommandEncoder> __unsafe_unretained enc = p_state.encoder;
+
+	p_state.resource_tracker.merge_from(usage_to_resources);
+
+	[enc setVertexBuffer:arg_buffer
+				  offset:0
+				 atIndex:p_set_index];
+	[enc setFragmentBuffer:arg_buffer offset:0 atIndex:p_set_index];
+}
+
+void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, DirectEncoder p_enc, uint32_t p_set_index, uint32_t p_dynamic_offsets) {
+	DEV_ASSERT(!p_shader->uses_argument_buffers);
+
+	UniformSet const &set = p_shader->sets[p_set_index];
+	DynamicOffsetLayout layout = p_shader->dynamic_offset_layout;
+	uint32_t dynamic_index = 0;
+
+	for (uint32_t i = 0; i < MIN(uniforms.size(), set.uniforms.size()); i++) {
+		RDD::BoundUniform const &uniform = uniforms[i];
+		const UniformInfo &ui = set.uniforms[i];
+		const UniformInfo::Indexes &indexes = ui.slot;
+
+		uint32_t frame_idx;
+		if (uniform.is_dynamic()) {
+			uint32_t shift = layout.get_offset_index_shift(p_set_index, dynamic_index);
+			dynamic_index++;
+			frame_idx = (p_dynamic_offsets >> shift) & 0xf;
+		} else {
+			frame_idx = 0;
+		}
+
+		switch (uniform.type) {
+			case RDD::UNIFORM_TYPE_SAMPLER: {
+				size_t count = uniform.ids.size();
+				id<MTLSamplerState> __unsafe_unretained *objects = ALLOCA_ARRAY(id<MTLSamplerState> __unsafe_unretained, count);
+				for (size_t j = 0; j < count; j += 1) {
+					objects[j] = rid::get(uniform.ids[j].id);
+				}
+				NSRange sampler_range = NSMakeRange(indexes.sampler, count);
+				p_enc.set(objects, sampler_range);
+			} break;
+			case RDD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE: {
+				size_t count = uniform.ids.size() / 2;
+				id<MTLTexture> __unsafe_unretained *textures = ALLOCA_ARRAY(id<MTLTexture> __unsafe_unretained, count);
+				id<MTLSamplerState> __unsafe_unretained *samplers = ALLOCA_ARRAY(id<MTLSamplerState> __unsafe_unretained, count);
+				for (uint32_t j = 0; j < count; j += 1) {
+					id<MTLSamplerState> sampler = rid::get(uniform.ids[j * 2 + 0]);
+					id<MTLTexture> texture = rid::get(uniform.ids[j * 2 + 1]);
+					samplers[j] = sampler;
+					textures[j] = texture;
+				}
+				NSRange sampler_range = NSMakeRange(indexes.sampler, count);
+				NSRange texture_range = NSMakeRange(indexes.texture, count);
+				p_enc.set(samplers, sampler_range);
+				p_enc.set(textures, texture_range);
+			} break;
+			case RDD::UNIFORM_TYPE_TEXTURE: {
+				size_t count = uniform.ids.size();
+				id<MTLTexture> __unsafe_unretained *objects = ALLOCA_ARRAY(id<MTLTexture> __unsafe_unretained, count);
+				for (size_t j = 0; j < count; j += 1) {
+					id<MTLTexture> obj = rid::get(uniform.ids[j]);
+					objects[j] = obj;
+				}
+				NSRange texture_range = NSMakeRange(indexes.texture, count);
+				p_enc.set(objects, texture_range);
+			} break;
+			case RDD::UNIFORM_TYPE_IMAGE: {
+				size_t count = uniform.ids.size();
+				id<MTLTexture> __unsafe_unretained *objects = ALLOCA_ARRAY(id<MTLTexture> __unsafe_unretained, count);
+				for (size_t j = 0; j < count; j += 1) {
+					id<MTLTexture> obj = rid::get(uniform.ids[j]);
+					objects[j] = obj;
+				}
+				NSRange texture_range = NSMakeRange(indexes.texture, count);
+				p_enc.set(objects, texture_range);
+
+				if (indexes.buffer != UINT32_MAX) {
+					// Emulated atomic image access.
+					id<MTLBuffer> __unsafe_unretained *bufs = ALLOCA_ARRAY(id<MTLBuffer> __unsafe_unretained, count);
+					for (size_t j = 0; j < count; j += 1) {
+						id<MTLTexture> obj = rid::get(uniform.ids[j]);
+						id<MTLTexture> tex = obj.parentTexture ? obj.parentTexture : obj;
+						id<MTLBuffer> buf = tex.buffer;
+						bufs[j] = buf;
+					}
+					NSUInteger *offs = ALLOCA_ARRAY(NSUInteger, count);
+					bzero(offs, sizeof(NSUInteger) * count);
+					NSRange buffer_range = NSMakeRange(indexes.buffer, count);
+					p_enc.set(bufs, offs, buffer_range);
+				}
+			} break;
+			case RDD::UNIFORM_TYPE_TEXTURE_BUFFER: {
+				ERR_PRINT("not implemented: UNIFORM_TYPE_TEXTURE_BUFFER");
+			} break;
+			case RDD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER: {
+				ERR_PRINT("not implemented: UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER");
+			} break;
+			case RDD::UNIFORM_TYPE_IMAGE_BUFFER: {
+				CRASH_NOW_MSG("not implemented: UNIFORM_TYPE_IMAGE_BUFFER");
+			} break;
+			case RDD::UNIFORM_TYPE_UNIFORM_BUFFER:
+			case RDD::UNIFORM_TYPE_STORAGE_BUFFER: {
+				const RDM::BufferInfo *buf_info = (const RDM::BufferInfo *)uniform.ids[0].id;
+				p_enc.set(buf_info->metal_buffer, 0, indexes.buffer);
+			} break;
+			case RDD::UNIFORM_TYPE_UNIFORM_BUFFER_DYNAMIC:
+			case RDD::UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC: {
+				const MetalBufferDynamicInfo *buf_info = (const MetalBufferDynamicInfo *)uniform.ids[0].id;
+				p_enc.set(buf_info->metal_buffer, frame_idx * buf_info->size_bytes, indexes.buffer);
+			} break;
+			case RDD::UNIFORM_TYPE_INPUT_ATTACHMENT: {
+				size_t count = uniform.ids.size();
+				id<MTLTexture> __unsafe_unretained *objects = ALLOCA_ARRAY(id<MTLTexture> __unsafe_unretained, count);
+				for (size_t j = 0; j < count; j += 1) {
+					id<MTLTexture> obj = rid::get(uniform.ids[j]);
+					objects[j] = obj;
+				}
+				NSRange texture_range = NSMakeRange(indexes.texture, count);
+				p_enc.set(objects, texture_range);
+			} break;
+			default: {
+				DEV_ASSERT(false);
+			}
+		}
+	}
+}
+
+void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index, uint32_t p_dynamic_offsets, uint32_t p_frame_idx, uint32_t p_frame_count) {
+	DEV_ASSERT(p_shader->uses_argument_buffers);
+	DEV_ASSERT(p_state.encoder != nil);
+
+	id<MTLComputeCommandEncoder> enc = p_state.encoder;
+
+	p_state.resource_tracker.merge_from(usage_to_resources);
+	[enc setBuffer:arg_buffer
+			 offset:0
+			atIndex:p_set_index];
+}
+
+MTLFmtCaps MDSubpass::getRequiredFmtCapsForAttachmentAt(uint32_t p_index) const {
+	MTLFmtCaps caps = kMTLFmtCapsNone;
+
+	for (RDD::AttachmentReference const &ar : input_references) {
+		if (ar.attachment == p_index) {
+			flags::set(caps, kMTLFmtCapsRead);
+			break;
+		}
+	}
+
+	for (RDD::AttachmentReference const &ar : color_references) {
+		if (ar.attachment == p_index) {
+			flags::set(caps, kMTLFmtCapsColorAtt);
+			break;
+		}
+	}
+
+	for (RDD::AttachmentReference const &ar : resolve_references) {
+		if (ar.attachment == p_index) {
+			flags::set(caps, kMTLFmtCapsResolve);
+			break;
+		}
+	}
+
+	if (depth_stencil_reference.attachment == p_index) {
+		flags::set(caps, kMTLFmtCapsDSAtt);
+	}
+
+	return caps;
+}
+
+void MDAttachment::linkToSubpass(const MDRenderPass &p_pass) {
+	firstUseSubpassIndex = UINT32_MAX;
+	lastUseSubpassIndex = 0;
+
+	for (MDSubpass const &subpass : p_pass.subpasses) {
+		MTLFmtCaps reqCaps = subpass.getRequiredFmtCapsForAttachmentAt(index);
+		if (reqCaps) {
+			firstUseSubpassIndex = MIN(subpass.subpass_index, firstUseSubpassIndex);
+			lastUseSubpassIndex = MAX(subpass.subpass_index, lastUseSubpassIndex);
+		}
+	}
+}
+
+MTLStoreAction MDAttachment::getMTLStoreAction(MDSubpass const &p_subpass,
+		bool p_is_rendering_entire_area,
+		bool p_has_resolve,
+		bool p_can_resolve,
+		bool p_is_stencil) const {
+	if (!p_is_rendering_entire_area || !isLastUseOf(p_subpass)) {
+		return p_has_resolve && p_can_resolve ? MTLStoreActionStoreAndMultisampleResolve : MTLStoreActionStore;
+	}
+
+	switch (p_is_stencil ? stencilStoreAction : storeAction) {
+		case MTLStoreActionStore:
+			return p_has_resolve && p_can_resolve ? MTLStoreActionStoreAndMultisampleResolve : MTLStoreActionStore;
+		case MTLStoreActionDontCare:
+			return p_has_resolve ? (p_can_resolve ? MTLStoreActionMultisampleResolve : MTLStoreActionStore) : MTLStoreActionDontCare;
+
+		default:
+			return MTLStoreActionStore;
+	}
+}
+
+bool MDAttachment::configureDescriptor(MTLRenderPassAttachmentDescriptor *p_desc,
+		PixelFormats &p_pf,
+		MDSubpass const &p_subpass,
+		id<MTLTexture> p_attachment,
+		bool p_is_rendering_entire_area,
+		bool p_has_resolve,
+		bool p_can_resolve,
+		bool p_is_stencil) const {
+	p_desc.texture = p_attachment;
+
+	MTLLoadAction load;
+	if (!p_is_rendering_entire_area || !isFirstUseOf(p_subpass)) {
+		load = MTLLoadActionLoad;
+	} else {
+		load = p_is_stencil ? stencilLoadAction : loadAction;
+	}
+
+	p_desc.loadAction = load;
+
+	MTLPixelFormat mtlFmt = p_attachment.pixelFormat;
+	bool isDepthFormat = p_pf.isDepthFormat(mtlFmt);
+	bool isStencilFormat = p_pf.isStencilFormat(mtlFmt);
+	if (isStencilFormat && !p_is_stencil && !isDepthFormat) {
+		p_desc.storeAction = MTLStoreActionDontCare;
+	} else {
+		p_desc.storeAction = getMTLStoreAction(p_subpass, p_is_rendering_entire_area, p_has_resolve, p_can_resolve, p_is_stencil);
+	}
+
+	return load == MTLLoadActionClear;
+}
+
+bool MDAttachment::shouldClear(const MDSubpass &p_subpass, bool p_is_stencil) const {
+	// If the subpass is not the first subpass to use this attachment, don't clear this attachment.
+	if (p_subpass.subpass_index != firstUseSubpassIndex) {
+		return false;
+	}
+	return (p_is_stencil ? stencilLoadAction : loadAction) == MTLLoadActionClear;
+}
+
+MDRenderPass::MDRenderPass(Vector<MDAttachment> &p_attachments, Vector<MDSubpass> &p_subpasses) :
+		attachments(p_attachments), subpasses(p_subpasses) {
+	for (MDAttachment &att : attachments) {
+		att.linkToSubpass(*this);
+	}
+}
+
+#pragma mark - Resource Factory
+
+id<MTLFunction> MDResourceFactory::new_func(NSString *p_source, NSString *p_name, NSError **p_error) {
+	@autoreleasepool {
+		NSError *err = nil;
+		MTLCompileOptions *options = [MTLCompileOptions new];
+		id<MTLDevice> device = device_driver->get_device();
+		id<MTLLibrary> mtlLib = [device newLibraryWithSource:p_source
+													 options:options
+													   error:&err];
+		if (err) {
+			if (p_error != nil) {
+				*p_error = err;
+			}
+		}
+		return [mtlLib newFunctionWithName:p_name];
+	}
+}
+
+id<MTLFunction> MDResourceFactory::new_clear_vert_func(ClearAttKey &p_key) {
+	@autoreleasepool {
+		NSString *msl = [NSString stringWithFormat:@R"(
+#include <metal_stdlib>
+using namespace metal;
+
+typedef struct {
+    float4 a_position [[attribute(0)]];
+} AttributesPos;
+
+typedef struct {
+    float4 colors[9];
+} ClearColorsIn;
+
+typedef struct {
+    float4 v_position [[position]];
+    uint layer%s;
+} VaryingsPos;
+
+vertex VaryingsPos vertClear(AttributesPos attributes [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) {
+    VaryingsPos varyings;
+    varyings.v_position = float4(attributes.a_position.x, -attributes.a_position.y, ccIn.colors[%d].r, 1.0);
+    varyings.layer = uint(attributes.a_position.w);
+    return varyings;
+}
+)", p_key.is_layered_rendering_enabled() ? " [[render_target_array_index]]" : "", ClearAttKey::DEPTH_INDEX];
+
+		return new_func(msl, @"vertClear", nil);
+	}
+}
+
+id<MTLFunction> MDResourceFactory::new_clear_frag_func(ClearAttKey &p_key) {
+	@autoreleasepool {
+		NSMutableString *msl = [NSMutableString stringWithCapacity:2048];
+
+		[msl appendFormat:@R"(
+#include <metal_stdlib>
+using namespace metal;
+
+typedef struct {
+    float4 v_position [[position]];
+} VaryingsPos;
+
+typedef struct {
+    float4 colors[9];
+} ClearColorsIn;
+
+typedef struct {
+)"];
+
+		for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
+			if (p_key.is_enabled(caIdx)) {
+				NSString *typeStr = get_format_type_string((MTLPixelFormat)p_key.pixel_formats[caIdx]);
+				[msl appendFormat:@"    %@4 color%u [[color(%u)]];\n", typeStr, caIdx, caIdx];
+			}
+		}
+		[msl appendFormat:@R"(} ClearColorsOut;
+
+fragment ClearColorsOut fragClear(VaryingsPos varyings [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) {
+
+    ClearColorsOut ccOut;
+)"];
+		for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
+			if (p_key.is_enabled(caIdx)) {
+				NSString *typeStr = get_format_type_string((MTLPixelFormat)p_key.pixel_formats[caIdx]);
+				[msl appendFormat:@"    ccOut.color%u = %@4(ccIn.colors[%u]);\n", caIdx, typeStr, caIdx];
+			}
+		}
+		[msl appendString:@R"(    return ccOut;
+})"];
+
+		return new_func(msl, @"fragClear", nil);
+	}
+}
+
+NSString *MDResourceFactory::get_format_type_string(MTLPixelFormat p_fmt) {
+	switch (device_driver->get_pixel_formats().getFormatType(p_fmt)) {
+		case MTLFormatType::ColorInt8:
+		case MTLFormatType::ColorInt16:
+			return @"short";
+		case MTLFormatType::ColorUInt8:
+		case MTLFormatType::ColorUInt16:
+			return @"ushort";
+		case MTLFormatType::ColorInt32:
+			return @"int";
+		case MTLFormatType::ColorUInt32:
+			return @"uint";
+		case MTLFormatType::ColorHalf:
+			return @"half";
+		case MTLFormatType::ColorFloat:
+		case MTLFormatType::DepthStencil:
+		case MTLFormatType::Compressed:
+			return @"float";
+		case MTLFormatType::None:
+			return @"unexpected_MTLPixelFormatInvalid";
+	}
+}
+
+id<MTLDepthStencilState> MDResourceFactory::new_depth_stencil_state(bool p_use_depth, bool p_use_stencil) {
+	MTLDepthStencilDescriptor *dsDesc = [MTLDepthStencilDescriptor new];
+	dsDesc.depthCompareFunction = MTLCompareFunctionAlways;
+	dsDesc.depthWriteEnabled = p_use_depth;
+
+	if (p_use_stencil) {
+		MTLStencilDescriptor *sDesc = [MTLStencilDescriptor new];
+		sDesc.stencilCompareFunction = MTLCompareFunctionAlways;
+		sDesc.stencilFailureOperation = MTLStencilOperationReplace;
+		sDesc.depthFailureOperation = MTLStencilOperationReplace;
+		sDesc.depthStencilPassOperation = MTLStencilOperationReplace;
+
+		dsDesc.frontFaceStencil = sDesc;
+		dsDesc.backFaceStencil = sDesc;
+	} else {
+		dsDesc.frontFaceStencil = nil;
+		dsDesc.backFaceStencil = nil;
+	}
+
+	return [device_driver->get_device() newDepthStencilStateWithDescriptor:dsDesc];
+}
+
+id<MTLRenderPipelineState> MDResourceFactory::new_clear_pipeline_state(ClearAttKey &p_key, NSError **p_error) {
+	PixelFormats &pixFmts = device_driver->get_pixel_formats();
+
+	id<MTLFunction> vtxFunc = new_clear_vert_func(p_key);
+	id<MTLFunction> fragFunc = new_clear_frag_func(p_key);
+	MTLRenderPipelineDescriptor *plDesc = [MTLRenderPipelineDescriptor new];
+	plDesc.label = @"ClearRenderAttachments";
+	plDesc.vertexFunction = vtxFunc;
+	plDesc.fragmentFunction = fragFunc;
+	plDesc.rasterSampleCount = p_key.sample_count;
+	plDesc.inputPrimitiveTopology = MTLPrimitiveTopologyClassTriangle;
+
+	for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
+		MTLRenderPipelineColorAttachmentDescriptor *colorDesc = plDesc.colorAttachments[caIdx];
+		colorDesc.pixelFormat = (MTLPixelFormat)p_key.pixel_formats[caIdx];
+		colorDesc.writeMask = p_key.is_enabled(caIdx) ? MTLColorWriteMaskAll : MTLColorWriteMaskNone;
+	}
+
+	MTLPixelFormat mtlDepthFormat = p_key.depth_format();
+	if (pixFmts.isDepthFormat(mtlDepthFormat)) {
+		plDesc.depthAttachmentPixelFormat = mtlDepthFormat;
+	}
+
+	MTLPixelFormat mtlStencilFormat = p_key.stencil_format();
+	if (pixFmts.isStencilFormat(mtlStencilFormat)) {
+		plDesc.stencilAttachmentPixelFormat = mtlStencilFormat;
+	}
+
+	MTLVertexDescriptor *vtxDesc = plDesc.vertexDescriptor;
+
+	// Vertex attribute descriptors.
+	MTLVertexAttributeDescriptorArray *vaDescArray = vtxDesc.attributes;
+	MTLVertexAttributeDescriptor *vaDesc;
+	NSUInteger vtxBuffIdx = device_driver->get_metal_buffer_index_for_vertex_attribute_binding(VERT_CONTENT_BUFFER_INDEX);
+	NSUInteger vtxStride = 0;
+
+	// Vertex location.
+	vaDesc = vaDescArray[0];
+	vaDesc.format = MTLVertexFormatFloat4;
+	vaDesc.bufferIndex = vtxBuffIdx;
+	vaDesc.offset = vtxStride;
+	vtxStride += sizeof(simd::float4);
+
+	// Vertex attribute buffer.
+	MTLVertexBufferLayoutDescriptorArray *vbDescArray = vtxDesc.layouts;
+	MTLVertexBufferLayoutDescriptor *vbDesc = vbDescArray[vtxBuffIdx];
+	vbDesc.stepFunction = MTLVertexStepFunctionPerVertex;
+	vbDesc.stepRate = 1;
+	vbDesc.stride = vtxStride;
+
+	return [device_driver->get_device() newRenderPipelineStateWithDescriptor:plDesc error:p_error];
+}
+
+id<MTLRenderPipelineState> MDResourceCache::get_clear_render_pipeline_state(ClearAttKey &p_key, NSError **p_error) {
+	HashMap::ConstIterator it = clear_states.find(p_key);
+	if (it != clear_states.end()) {
+		return it->value;
+	}
+
+	id<MTLRenderPipelineState> state = resource_factory->new_clear_pipeline_state(p_key, p_error);
+	clear_states[p_key] = state;
+	return state;
+}
+
+id<MTLDepthStencilState> MDResourceCache::get_depth_stencil_state(bool p_use_depth, bool p_use_stencil) {
+	id<MTLDepthStencilState> __strong *val;
+	if (p_use_depth && p_use_stencil) {
+		val = &clear_depth_stencil_state.all;
+	} else if (p_use_depth) {
+		val = &clear_depth_stencil_state.depth_only;
+	} else if (p_use_stencil) {
+		val = &clear_depth_stencil_state.stencil_only;
+	} else {
+		val = &clear_depth_stencil_state.none;
+	}
+	DEV_ASSERT(val != nullptr);
+
+	if (*val == nil) {
+		*val = resource_factory->new_depth_stencil_state(p_use_depth, p_use_stencil);
+	}
+	return *val;
+}
+
+static const char *SHADER_STAGE_NAMES[] = {
+	"vert", // [RD::SHADER_STAGE_VERTEX]
+	"frag", // [RD::SHADER_STAGE_FRAGMENT]
+	"tess_ctrl", // [RD::SHADER_STAGE_TESSELATION_CONTROL]
+	"tess_eval", // [RD::SHADER_STAGE_TESSELATION_EVALUATION]
+	"comp", // [RD::SHADER_STAGE_COMPUTE]
+};
+
+void ShaderCacheEntry::notify_free() const {
+	owner.shader_cache_free_entry(key);
+}
+
+@interface MDLibrary ()
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+#ifdef DEV_ENABLED
+							source:(NSString *)source;
+#endif
+;
+@end
+
+/// Loads the MTLLibrary when the library is first accessed.
+@interface MDLazyLibrary : MDLibrary {
+	id<MTLLibrary> _library;
+	NSError *_error;
+	std::shared_mutex _mu;
+	bool _loaded;
+	id<MTLDevice> _device;
+	NSString *_source;
+	MTLCompileOptions *_options;
+}
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+							source:(NSString *)source
+						   options:(MTLCompileOptions *)options;
+@end
+
+/// Loads the MTLLibrary immediately on initialization, using an asynchronous API.
+@interface MDImmediateLibrary : MDLibrary {
+	id<MTLLibrary> _library;
+	NSError *_error;
+	std::mutex _cv_mutex;
+	std::condition_variable _cv;
+	std::atomic<bool> _complete;
+	bool _ready;
+}
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+							source:(NSString *)source
+						   options:(MTLCompileOptions *)options;
+@end
+
+@interface MDBinaryLibrary : MDLibrary {
+	id<MTLLibrary> _library;
+	NSError *_error;
+}
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+#ifdef DEV_ENABLED
+							source:(NSString *)source
+#endif
+							  data:(dispatch_data_t)data;
+@end
+
+@implementation MDLibrary
+
++ (instancetype)newLibraryWithCacheEntry:(ShaderCacheEntry *)entry
+								  device:(id<MTLDevice>)device
+								  source:(NSString *)source
+								 options:(MTLCompileOptions *)options
+								strategy:(ShaderLoadStrategy)strategy {
+	switch (strategy) {
+		case ShaderLoadStrategy::IMMEDIATE:
+			[[fallthrough]];
+		default:
+			return [[MDImmediateLibrary alloc] initWithCacheEntry:entry device:device source:source options:options];
+		case ShaderLoadStrategy::LAZY:
+			return [[MDLazyLibrary alloc] initWithCacheEntry:entry device:device source:source options:options];
+	}
+}
+
++ (instancetype)newLibraryWithCacheEntry:(ShaderCacheEntry *)entry
+								  device:(id<MTLDevice>)device
+#ifdef DEV_ENABLED
+								  source:(NSString *)source
+#endif
+									data:(dispatch_data_t)data {
+	return [[MDBinaryLibrary alloc] initWithCacheEntry:entry
+												device:device
+#ifdef DEV_ENABLED
+												source:source
+#endif
+												  data:data];
+}
+
+#ifdef DEV_ENABLED
+- (NSString *)originalSource {
+	return _original_source;
+}
+#endif
+
+- (id<MTLLibrary>)library {
+	CRASH_NOW_MSG("Not implemented");
+	return nil;
+}
+
+- (NSError *)error {
+	CRASH_NOW_MSG("Not implemented");
+	return nil;
+}
+
+- (void)setLabel:(NSString *)label {
+}
+
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+#ifdef DEV_ENABLED
+							source:(NSString *)source
+#endif
+{
+	self = [super init];
+	_entry = entry;
+	_entry->library = self;
+#ifdef DEV_ENABLED
+	_original_source = source;
+#endif
+	return self;
+}
+
+- (void)dealloc {
+	_entry->notify_free();
+}
+
+@end
+
+@implementation MDImmediateLibrary
+
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+							source:(NSString *)source
+						   options:(MTLCompileOptions *)options {
+	self = [super initWithCacheEntry:entry
+#ifdef DEV_ENABLED
+							  source:source
+#endif
+	];
+	_complete = false;
+	_ready = false;
+
+	__block os_signpost_id_t compile_id = (os_signpost_id_t)(uintptr_t)self;
+	os_signpost_interval_begin(LOG_INTERVALS, compile_id, "shader_compile",
+			"shader_name=%{public}s stage=%{public}s hash=%X",
+			entry->name.get_data(), SHADER_STAGE_NAMES[entry->stage], entry->key.short_sha());
+
+	[device newLibraryWithSource:source
+						 options:options
+			   completionHandler:^(id<MTLLibrary> library, NSError *error) {
+				   os_signpost_interval_end(LOG_INTERVALS, compile_id, "shader_compile");
+				   self->_library = library;
+				   self->_error = error;
+				   if (error) {
+					   ERR_PRINT(vformat(U"Error compiling shader %s: %s", entry->name.get_data(), error.localizedDescription.UTF8String));
+				   }
+
+				   {
+					   std::lock_guard<std::mutex> lock(self->_cv_mutex);
+					   _ready = true;
+				   }
+				   _cv.notify_all();
+				   _complete = true;
+			   }];
+	return self;
+}
+
+- (id<MTLLibrary>)library {
+	if (!_complete) {
+		std::unique_lock<std::mutex> lock(_cv_mutex);
+		_cv.wait(lock, [&] { return _ready; });
+	}
+	return _library;
+}
+
+- (NSError *)error {
+	if (!_complete) {
+		std::unique_lock<std::mutex> lock(_cv_mutex);
+		_cv.wait(lock, [&] { return _ready; });
+	}
+	return _error;
+}
+
+@end
+
+@implementation MDLazyLibrary
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+							source:(NSString *)source
+						   options:(MTLCompileOptions *)options {
+	self = [super initWithCacheEntry:entry
+#ifdef DEV_ENABLED
+							  source:source
+#endif
+	];
+	_device = device;
+	_source = source;
+	_options = options;
+
+	return self;
+}
+
+- (void)load {
+	{
+		std::shared_lock<std::shared_mutex> lock(_mu);
+		if (_loaded) {
+			return;
+		}
+	}
+
+	std::unique_lock<std::shared_mutex> lock(_mu);
+	if (_loaded) {
+		return;
+	}
+
+	__block os_signpost_id_t compile_id = (os_signpost_id_t)(uintptr_t)self;
+	os_signpost_interval_begin(LOG_INTERVALS, compile_id, "shader_compile",
+			"shader_name=%{public}s stage=%{public}s hash=%X",
+			_entry->name.get_data(), SHADER_STAGE_NAMES[_entry->stage], _entry->key.short_sha());
+	NSError *error;
+	_library = [_device newLibraryWithSource:_source options:_options error:&error];
+	os_signpost_interval_end(LOG_INTERVALS, compile_id, "shader_compile");
+	_device = nil;
+	_source = nil;
+	_options = nil;
+	_loaded = true;
+}
+
+- (id<MTLLibrary>)library {
+	[self load];
+	return _library;
+}
+
+- (NSError *)error {
+	[self load];
+	return _error;
+}
+
+@end
+
+@implementation MDBinaryLibrary
+
+- (instancetype)initWithCacheEntry:(ShaderCacheEntry *)entry
+							device:(id<MTLDevice>)device
+#ifdef DEV_ENABLED
+							source:(NSString *)source
+#endif
+							  data:(dispatch_data_t)data {
+	self = [super initWithCacheEntry:entry
+#ifdef DEV_ENABLED
+							  source:source
+#endif
+	];
+	NSError *error = nil;
+	_library = [device newLibraryWithData:data error:&error];
+	if (error != nil) {
+		_error = error;
+		NSString *desc = [error description];
+		ERR_PRINT(vformat("Unable to load shader library: %s", desc.UTF8String));
+	}
+	return self;
+}
+
+- (id<MTLLibrary>)library {
+	return _library;
+}
+
+- (NSError *)error {
+	return _error;
+}
+
+@end
diff --git a/engine/drivers/metal/metal_objects_shared.cpp b/engine/drivers/metal/metal_objects_shared.cpp
deleted file mode 100644
index 69a399ff..00000000
--- a/engine/drivers/metal/metal_objects_shared.cpp
+++ /dev/null
@@ -1,900 +0,0 @@
-/**************************************************************************/
-/*  metal_objects_shared.cpp                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "metal_objects_shared.h"
-
-#include "drivers/metal/rendering_device_driver_metal.h"
-
-#include <os/signpost.h>
-#include <simd/simd.h>
-
-#include <shared_mutex>
-#include <string>
-
-#pragma mark - Resource Factory
-
-NS::SharedPtr<MTL::Function> MDResourceFactory::new_func(NS::String *p_source, NS::String *p_name, NS::Error **p_error) {
-	NS::SharedPtr<NS::AutoreleasePool> pool = NS::TransferPtr(NS::AutoreleasePool::alloc()->init());
-	NS::SharedPtr<MTL::CompileOptions> options = NS::TransferPtr(MTL::CompileOptions::alloc()->init());
-	NS::Error *err = nullptr;
-	NS::SharedPtr<MTL::Library> mtlLib = NS::TransferPtr(device->newLibrary(p_source, options.get(), &err));
-	if (err) {
-		if (p_error != nullptr) {
-			*p_error = err;
-		}
-	}
-	return NS::TransferPtr(mtlLib->newFunction(p_name));
-}
-
-NS::SharedPtr<MTL::Function> MDResourceFactory::new_clear_vert_func(ClearAttKey &p_key) {
-	NS::SharedPtr<NS::AutoreleasePool> pool = NS::TransferPtr(NS::AutoreleasePool::alloc()->init());
-	char msl[1024];
-	snprintf(msl, sizeof(msl), R"(
-#include <metal_stdlib>
-using namespace metal;
-
-typedef struct {
-    float4 a_position [[attribute(0)]];
-} AttributesPos;
-
-typedef struct {
-    float4 colors[9];
-} ClearColorsIn;
-
-typedef struct {
-    float4 v_position [[position]];
-    uint layer%s;
-} VaryingsPos;
-
-vertex VaryingsPos vertClear(AttributesPos attributes [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) {
-    VaryingsPos varyings;
-    varyings.v_position = float4(attributes.a_position.x, -attributes.a_position.y, ccIn.colors[%d].r, 1.0);
-    varyings.layer = uint(attributes.a_position.w);
-    return varyings;
-}
-)",
-			p_key.is_layered_rendering_enabled() ? " [[render_target_array_index]]" : "", ClearAttKey::DEPTH_INDEX);
-
-	return new_func(NS::String::string(msl, NS::UTF8StringEncoding), MTLSTR("vertClear"), nullptr);
-}
-
-NS::SharedPtr<MTL::Function> MDResourceFactory::new_clear_frag_func(ClearAttKey &p_key) {
-	NS::SharedPtr<NS::AutoreleasePool> pool = NS::TransferPtr(NS::AutoreleasePool::alloc()->init());
-	std::string msl;
-	msl.reserve(2048);
-
-	msl += R"(
-#include <metal_stdlib>
-using namespace metal;
-
-typedef struct {
-    float4 v_position [[position]];
-} VaryingsPos;
-
-typedef struct {
-    float4 colors[9];
-} ClearColorsIn;
-
-typedef struct {
-)";
-
-	char line[128];
-	for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
-		if (p_key.is_enabled(caIdx)) {
-			const char *typeStr = get_format_type_string((MTL::PixelFormat)p_key.pixel_formats[caIdx]);
-			snprintf(line, sizeof(line), "    %s4 color%u [[color(%u)]];\n", typeStr, caIdx, caIdx);
-			msl += line;
-		}
-	}
-	msl += R"(} ClearColorsOut;
-
-fragment ClearColorsOut fragClear(VaryingsPos varyings [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) {
-
-    ClearColorsOut ccOut;
-)";
-	for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
-		if (p_key.is_enabled(caIdx)) {
-			const char *typeStr = get_format_type_string((MTL::PixelFormat)p_key.pixel_formats[caIdx]);
-			snprintf(line, sizeof(line), "    ccOut.color%u = %s4(ccIn.colors[%u]);\n", caIdx, typeStr, caIdx);
-			msl += line;
-		}
-	}
-	msl += R"(    return ccOut;
-})";
-
-	return new_func(NS::String::string(msl.c_str(), NS::UTF8StringEncoding), MTLSTR("fragClear"), nullptr);
-}
-
-const char *MDResourceFactory::get_format_type_string(MTL::PixelFormat p_fmt) const {
-	switch (pixel_formats.getFormatType(p_fmt)) {
-		case MTLFormatType::ColorInt8:
-		case MTLFormatType::ColorInt16:
-			return "short";
-		case MTLFormatType::ColorUInt8:
-		case MTLFormatType::ColorUInt16:
-			return "ushort";
-		case MTLFormatType::ColorInt32:
-			return "int";
-		case MTLFormatType::ColorUInt32:
-			return "uint";
-		case MTLFormatType::ColorHalf:
-			return "half";
-		case MTLFormatType::ColorFloat:
-		case MTLFormatType::DepthStencil:
-		case MTLFormatType::Compressed:
-			return "float";
-		case MTLFormatType::None:
-		default:
-			return "unexpected_MTLPixelFormatInvalid";
-	}
-}
-
-NS::SharedPtr<MTL::DepthStencilState> MDResourceFactory::new_depth_stencil_state(bool p_use_depth, bool p_use_stencil) {
-	NS::SharedPtr<MTL::DepthStencilDescriptor> dsDesc = NS::TransferPtr(MTL::DepthStencilDescriptor::alloc()->init());
-	dsDesc->setDepthCompareFunction(MTL::CompareFunctionAlways);
-	dsDesc->setDepthWriteEnabled(p_use_depth);
-
-	if (p_use_stencil) {
-		NS::SharedPtr<MTL::StencilDescriptor> sDesc = NS::TransferPtr(MTL::StencilDescriptor::alloc()->init());
-		sDesc->setStencilCompareFunction(MTL::CompareFunctionAlways);
-		sDesc->setStencilFailureOperation(MTL::StencilOperationReplace);
-		sDesc->setDepthFailureOperation(MTL::StencilOperationReplace);
-		sDesc->setDepthStencilPassOperation(MTL::StencilOperationReplace);
-
-		dsDesc->setFrontFaceStencil(sDesc.get());
-		dsDesc->setBackFaceStencil(sDesc.get());
-	} else {
-		dsDesc->setFrontFaceStencil(nullptr);
-		dsDesc->setBackFaceStencil(nullptr);
-	}
-
-	return NS::TransferPtr(device->newDepthStencilState(dsDesc.get()));
-}
-
-NS::SharedPtr<MTL::RenderPipelineState> MDResourceFactory::new_clear_pipeline_state(ClearAttKey &p_key, NS::Error **p_error) {
-	NS::SharedPtr<MTL::Function> vtxFunc = new_clear_vert_func(p_key);
-	NS::SharedPtr<MTL::Function> fragFunc = new_clear_frag_func(p_key);
-	NS::SharedPtr<MTL::RenderPipelineDescriptor> plDesc = NS::TransferPtr(MTL::RenderPipelineDescriptor::alloc()->init());
-	plDesc->setLabel(MTLSTR("ClearRenderAttachments"));
-	plDesc->setVertexFunction(vtxFunc.get());
-	plDesc->setFragmentFunction(fragFunc.get());
-	plDesc->setRasterSampleCount(p_key.sample_count);
-	plDesc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassTriangle);
-
-	for (uint32_t caIdx = 0; caIdx < ClearAttKey::COLOR_COUNT; caIdx++) {
-		MTL::RenderPipelineColorAttachmentDescriptor *colorDesc = plDesc->colorAttachments()->object(caIdx);
-		colorDesc->setPixelFormat((MTL::PixelFormat)p_key.pixel_formats[caIdx]);
-		colorDesc->setWriteMask(p_key.is_enabled(caIdx) ? MTL::ColorWriteMaskAll : MTL::ColorWriteMaskNone);
-	}
-
-	MTL::PixelFormat mtlDepthFormat = (MTL::PixelFormat)p_key.depth_format();
-	if (pixel_formats.isDepthFormat(mtlDepthFormat)) {
-		plDesc->setDepthAttachmentPixelFormat(mtlDepthFormat);
-	}
-
-	MTL::PixelFormat mtlStencilFormat = (MTL::PixelFormat)p_key.stencil_format();
-	if (pixel_formats.isStencilFormat(mtlStencilFormat)) {
-		plDesc->setStencilAttachmentPixelFormat(mtlStencilFormat);
-	}
-
-	MTL::VertexDescriptor *vtxDesc = plDesc->vertexDescriptor();
-
-	// Vertex attribute descriptors.
-	NS::UInteger vtxBuffIdx = get_vertex_buffer_index(VERT_CONTENT_BUFFER_INDEX);
-	NS::UInteger vtxStride = 0;
-
-	// Vertex location.
-	MTL::VertexAttributeDescriptor *vaDesc = vtxDesc->attributes()->object(0);
-	vaDesc->setFormat(MTL::VertexFormatFloat4);
-	vaDesc->setBufferIndex(vtxBuffIdx);
-	vaDesc->setOffset(vtxStride);
-	vtxStride += sizeof(simd::float4);
-
-	// Vertex attribute buffer.
-	MTL::VertexBufferLayoutDescriptor *vbDesc = vtxDesc->layouts()->object(vtxBuffIdx);
-	vbDesc->setStepFunction(MTL::VertexStepFunctionPerVertex);
-	vbDesc->setStepRate(1);
-	vbDesc->setStride(vtxStride);
-
-	NS::Error *err = nullptr;
-	NS::SharedPtr<MTL::RenderPipelineState> state = NS::TransferPtr(device->newRenderPipelineState(plDesc.get(), &err));
-	if (p_error != nullptr) {
-		*p_error = err;
-	}
-	return state;
-}
-
-NS::SharedPtr<MTL::RenderPipelineState> MDResourceFactory::new_empty_draw_pipeline_state(ClearAttKey &p_key, NS::Error **p_error) {
-	DEV_ASSERT(!p_key.is_layered_rendering_enabled());
-	DEV_ASSERT(p_key.is_enabled(0));
-	DEV_ASSERT(!p_key.is_depth_enabled());
-	DEV_ASSERT(!p_key.is_stencil_enabled());
-
-	NS::SharedPtr<NS::AutoreleasePool> pool = NS::TransferPtr(NS::AutoreleasePool::alloc()->init());
-	static const char *msl = R"(#include <metal_stdlib>
-using namespace metal;
-
-struct FullscreenNoopOut {
-    float4 position [[position]];
-};
-
-vertex FullscreenNoopOut fullscreenNoopVert(uint vid [[vertex_id]]) {
-    float2 positions[3] = { float2(-1.0, -1.0), float2(3.0, -1.0), float2(-1.0, 3.0) };
-    float2 pos = positions[vid];
-
-    FullscreenNoopOut out;
-    out.position = float4(pos, 0.0, 1.0);
-    return out;
-}
-
-fragment void fullscreenNoopFrag(float4 gl_FragCoord [[position]]) {
-}
-)";
-
-	NS::Error *err = nullptr;
-	NS::SharedPtr<MTL::CompileOptions> options = NS::TransferPtr(MTL::CompileOptions::alloc()->init());
-	NS::SharedPtr<MTL::Library> mtlLib = NS::TransferPtr(device->newLibrary(NS::String::string(msl, NS::UTF8StringEncoding), options.get(), &err));
-	if (err && p_error != nullptr) {
-		*p_error = err;
-	}
-
-	if (mtlLib.get() == nullptr) {
-		return {};
-	}
-
-	NS::SharedPtr<MTL::Function> vtxFunc = NS::TransferPtr(mtlLib->newFunction(MTLSTR("fullscreenNoopVert")));
-	NS::SharedPtr<MTL::Function> fragFunc = NS::TransferPtr(mtlLib->newFunction(MTLSTR("fullscreenNoopFrag")));
-
-	NS::SharedPtr<MTL::RenderPipelineDescriptor> plDesc = NS::TransferPtr(MTL::RenderPipelineDescriptor::alloc()->init());
-	plDesc->setLabel(MTLSTR("EmptyDrawFullscreenTriangle"));
-	plDesc->setVertexFunction(vtxFunc.get());
-	plDesc->setFragmentFunction(fragFunc.get());
-	plDesc->setRasterSampleCount(p_key.sample_count ? p_key.sample_count : 1);
-	plDesc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassTriangle);
-
-	MTL::RenderPipelineColorAttachmentDescriptor *colorDesc = plDesc->colorAttachments()->object(0);
-	colorDesc->setPixelFormat((MTL::PixelFormat)p_key.pixel_formats[0]);
-	colorDesc->setWriteMask(MTL::ColorWriteMaskNone);
-
-	err = nullptr;
-	NS::SharedPtr<MTL::RenderPipelineState> state = NS::TransferPtr(device->newRenderPipelineState(plDesc.get(), &err));
-	if (p_error != nullptr && err != nullptr) {
-		*p_error = err;
-	}
-	return state;
-}
-
-#pragma mark - Resource Cache
-
-MTL::RenderPipelineState *MDResourceCache::get_clear_render_pipeline_state(ClearAttKey &p_key, NS::Error **p_error) {
-	HashMap::ConstIterator it = clear_states.find(p_key);
-	if (it != clear_states.end()) {
-		return it->value.get();
-	}
-
-	NS::SharedPtr<MTL::RenderPipelineState> state = resource_factory->new_clear_pipeline_state(p_key, p_error);
-	MTL::RenderPipelineState *result = state.get();
-	clear_states[p_key] = std::move(state);
-	return result;
-}
-
-MTL::RenderPipelineState *MDResourceCache::get_empty_draw_pipeline_state(ClearAttKey &p_key, NS::Error **p_error) {
-	HashMap::ConstIterator it = empty_draw_states.find(p_key);
-	if (it != empty_draw_states.end()) {
-		return it->value.get();
-	}
-
-	NS::SharedPtr<MTL::RenderPipelineState> state = resource_factory->new_empty_draw_pipeline_state(p_key, p_error);
-	MTL::RenderPipelineState *result = state.get();
-	empty_draw_states[p_key] = std::move(state);
-	return result;
-}
-
-MTL::DepthStencilState *MDResourceCache::get_depth_stencil_state(bool p_use_depth, bool p_use_stencil) {
-	if (p_use_depth && p_use_stencil) {
-		if (!clear_depth_stencil_state.all) {
-			clear_depth_stencil_state.all = resource_factory->new_depth_stencil_state(true, true);
-		}
-		return clear_depth_stencil_state.all.get();
-	} else if (p_use_depth) {
-		if (!clear_depth_stencil_state.depth_only) {
-			clear_depth_stencil_state.depth_only = resource_factory->new_depth_stencil_state(true, false);
-		}
-		return clear_depth_stencil_state.depth_only.get();
-	} else if (p_use_stencil) {
-		if (!clear_depth_stencil_state.stencil_only) {
-			clear_depth_stencil_state.stencil_only = resource_factory->new_depth_stencil_state(false, true);
-		}
-		return clear_depth_stencil_state.stencil_only.get();
-	} else {
-		if (!clear_depth_stencil_state.none) {
-			clear_depth_stencil_state.none = resource_factory->new_depth_stencil_state(false, false);
-		}
-		return clear_depth_stencil_state.none.get();
-	}
-}
-
-#pragma mark - Render Pass Types
-
-MTLFmtCaps MDSubpass::getRequiredFmtCapsForAttachmentAt(uint32_t p_index) const {
-	MTLFmtCaps caps = kMTLFmtCapsNone;
-
-	for (RDD::AttachmentReference const &ar : input_references) {
-		if (ar.attachment == p_index) {
-			flags::set(caps, kMTLFmtCapsRead);
-			break;
-		}
-	}
-
-	for (RDD::AttachmentReference const &ar : color_references) {
-		if (ar.attachment == p_index) {
-			flags::set(caps, kMTLFmtCapsColorAtt);
-			break;
-		}
-	}
-
-	for (RDD::AttachmentReference const &ar : resolve_references) {
-		if (ar.attachment == p_index) {
-			flags::set(caps, kMTLFmtCapsResolve);
-			break;
-		}
-	}
-
-	if (depth_stencil_reference.attachment == p_index) {
-		flags::set(caps, kMTLFmtCapsDSAtt);
-	}
-
-	return caps;
-}
-
-void MDAttachment::linkToSubpass(const MDRenderPass &p_pass) {
-	firstUseSubpassIndex = UINT32_MAX;
-	lastUseSubpassIndex = 0;
-
-	for (MDSubpass const &subpass : p_pass.subpasses) {
-		MTLFmtCaps reqCaps = subpass.getRequiredFmtCapsForAttachmentAt(index);
-		if (reqCaps) {
-			firstUseSubpassIndex = MIN(subpass.subpass_index, firstUseSubpassIndex);
-			lastUseSubpassIndex = MAX(subpass.subpass_index, lastUseSubpassIndex);
-		}
-	}
-}
-
-MTL::StoreAction MDAttachment::getMTLStoreAction(MDSubpass const &p_subpass,
-		bool p_is_rendering_entire_area,
-		bool p_has_resolve,
-		bool p_can_resolve,
-		bool p_is_stencil) const {
-	if (!p_is_rendering_entire_area || !isLastUseOf(p_subpass)) {
-		return p_has_resolve && p_can_resolve ? MTL::StoreActionStoreAndMultisampleResolve : MTL::StoreActionStore;
-	}
-
-	switch (p_is_stencil ? stencilStoreAction : storeAction) {
-		case MTL::StoreActionStore:
-			return p_has_resolve && p_can_resolve ? MTL::StoreActionStoreAndMultisampleResolve : MTL::StoreActionStore;
-		case MTL::StoreActionDontCare:
-			return p_has_resolve ? (p_can_resolve ? MTL::StoreActionMultisampleResolve : MTL::StoreActionStore) : MTL::StoreActionDontCare;
-
-		default:
-			return MTL::StoreActionStore;
-	}
-}
-
-bool MDAttachment::shouldClear(const MDSubpass &p_subpass, bool p_is_stencil) const {
-	// If the subpass is not the first subpass to use this attachment, don't clear this attachment.
-	if (p_subpass.subpass_index != firstUseSubpassIndex) {
-		return false;
-	}
-	return (p_is_stencil ? stencilLoadAction : loadAction) == MTL::LoadActionClear;
-}
-
-MDRenderPass::MDRenderPass(Vector<MDAttachment> &p_attachments, Vector<MDSubpass> &p_subpasses) :
-		attachments(p_attachments), subpasses(p_subpasses) {
-	for (MDAttachment &att : attachments) {
-		att.linkToSubpass(*this);
-	}
-}
-
-#pragma mark - Command Buffer Base
-
-void MDCommandBufferBase::retain_resource(CFTypeRef p_resource) {
-	CFRetain(p_resource);
-	_retained_resources.push_back(p_resource);
-}
-
-void MDCommandBufferBase::release_resources() {
-	for (CFTypeRef r : _retained_resources) {
-		CFRelease(r);
-	}
-	_retained_resources.clear();
-}
-
-void MDCommandBufferBase::render_set_viewport(VectorView<Rect2i> p_viewports) {
-	RenderStateBase &state = get_render_state_base();
-	state.viewports.resize(p_viewports.size());
-	for (uint32_t i = 0; i < p_viewports.size(); i += 1) {
-		Rect2i const &vp = p_viewports[i];
-		state.viewports[i] = {
-			.originX = static_cast<double>(vp.position.x),
-			.originY = static_cast<double>(vp.position.y),
-			.width = static_cast<double>(vp.size.width),
-			.height = static_cast<double>(vp.size.height),
-			.znear = 0.0,
-			.zfar = 1.0,
-		};
-	}
-	state.dirty.set_flag(RenderStateBase::DIRTY_VIEWPORT);
-}
-
-void MDCommandBufferBase::render_set_scissor(VectorView<Rect2i> p_scissors) {
-	RenderStateBase &state = get_render_state_base();
-	state.scissors.resize(p_scissors.size());
-	for (uint32_t i = 0; i < p_scissors.size(); i += 1) {
-		Rect2i const &vp = p_scissors[i];
-		state.scissors[i] = {
-			.x = static_cast<NS::UInteger>(vp.position.x),
-			.y = static_cast<NS::UInteger>(vp.position.y),
-			.width = static_cast<NS::UInteger>(vp.size.width),
-			.height = static_cast<NS::UInteger>(vp.size.height),
-		};
-	}
-	state.dirty.set_flag(RenderStateBase::DIRTY_SCISSOR);
-}
-
-void MDCommandBufferBase::render_set_blend_constants(const Color &p_constants) {
-	DEV_ASSERT(type == MDCommandBufferStateType::Render);
-	RenderStateBase &state = get_render_state_base();
-	if (state.blend_constants != p_constants) {
-		state.blend_constants = p_constants;
-		state.dirty.set_flag(RenderStateBase::DIRTY_BLEND);
-	}
-}
-
-void MDCommandBufferBase::_populate_vertices(simd::float4 *p_vertices, Size2i p_fb_size, VectorView<Rect2i> p_rects) {
-	uint32_t idx = 0;
-	for (uint32_t i = 0; i < p_rects.size(); i++) {
-		Rect2i const &rect = p_rects[i];
-		idx = _populate_vertices(p_vertices, idx, rect, p_fb_size);
-	}
-}
-
-uint32_t MDCommandBufferBase::_populate_vertices(simd::float4 *p_vertices, uint32_t p_index, Rect2i const &p_rect, Size2i p_fb_size) {
-	// Determine the positions of the four edges of the
-	// clear rectangle as a fraction of the attachment size.
-	float leftPos = (float)(p_rect.position.x) / (float)p_fb_size.width;
-	float rightPos = (float)(p_rect.size.width) / (float)p_fb_size.width + leftPos;
-	float bottomPos = (float)(p_rect.position.y) / (float)p_fb_size.height;
-	float topPos = (float)(p_rect.size.height) / (float)p_fb_size.height + bottomPos;
-
-	// Transform to clip-space coordinates, which are bounded by (-1.0 < p < 1.0) in clip-space.
-	leftPos = (leftPos * 2.0f) - 1.0f;
-	rightPos = (rightPos * 2.0f) - 1.0f;
-	bottomPos = (bottomPos * 2.0f) - 1.0f;
-	topPos = (topPos * 2.0f) - 1.0f;
-
-	simd::float4 vtx;
-
-	uint32_t idx = p_index;
-	uint32_t endLayer = get_current_view_count();
-
-	for (uint32_t layer = 0; layer < endLayer; layer++) {
-		vtx.z = 0.0;
-		vtx.w = (float)layer;
-
-		// Top left vertex - First triangle.
-		vtx.y = topPos;
-		vtx.x = leftPos;
-		p_vertices[idx++] = vtx;
-
-		// Bottom left vertex.
-		vtx.y = bottomPos;
-		vtx.x = leftPos;
-		p_vertices[idx++] = vtx;
-
-		// Bottom right vertex.
-		vtx.y = bottomPos;
-		vtx.x = rightPos;
-		p_vertices[idx++] = vtx;
-
-		// Bottom right vertex - Second triangle.
-		p_vertices[idx++] = vtx;
-
-		// Top right vertex.
-		vtx.y = topPos;
-		vtx.x = rightPos;
-		p_vertices[idx++] = vtx;
-
-		// Top left vertex.
-		vtx.y = topPos;
-		vtx.x = leftPos;
-		p_vertices[idx++] = vtx;
-	}
-
-	return idx;
-}
-
-void MDCommandBufferBase::_end_render_pass() {
-	MDFrameBuffer const &fb_info = *get_frame_buffer();
-	MDSubpass const &subpass = get_current_subpass();
-
-	PixelFormats &pf = device_driver->get_pixel_formats();
-
-	for (uint32_t i = 0; i < subpass.resolve_references.size(); i++) {
-		uint32_t color_index = subpass.color_references[i].attachment;
-		uint32_t resolve_index = subpass.resolve_references[i].attachment;
-		DEV_ASSERT((color_index == RDD::AttachmentReference::UNUSED) == (resolve_index == RDD::AttachmentReference::UNUSED));
-		if (color_index == RDD::AttachmentReference::UNUSED || !fb_info.has_texture(color_index)) {
-			continue;
-		}
-
-		MTL::Texture *resolve_tex = fb_info.get_texture(resolve_index);
-
-		CRASH_COND_MSG(!flags::all(pf.getCapabilities(resolve_tex->pixelFormat()), kMTLFmtCapsResolve), "not implemented: unresolvable texture types");
-		// see: https://github.com/KhronosGroup/MoltenVK/blob/d20d13fe2735adb845636a81522df1b9d89c0fba/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm#L407
-	}
-
-	end_render_encoding();
-}
-
-void MDCommandBufferBase::_render_clear_render_area() {
-	MDRenderPass const &pass = *get_render_pass();
-	MDSubpass const &subpass = get_current_subpass();
-	LocalVector<RDD::RenderPassClearValue> &clear_values = get_clear_values();
-
-	uint32_t ds_index = subpass.depth_stencil_reference.attachment;
-	bool clear_depth = (ds_index != RDD::AttachmentReference::UNUSED && pass.attachments[ds_index].shouldClear(subpass, false));
-	bool clear_stencil = (ds_index != RDD::AttachmentReference::UNUSED && pass.attachments[ds_index].shouldClear(subpass, true));
-
-	uint32_t color_count = subpass.color_references.size();
-	uint32_t clears_size = color_count + (clear_depth || clear_stencil ? 1 : 0);
-	if (clears_size == 0) {
-		return;
-	}
-
-	RDD::AttachmentClear *clears = ALLOCA_ARRAY(RDD::AttachmentClear, clears_size);
-	uint32_t clears_count = 0;
-
-	for (uint32_t i = 0; i < color_count; i++) {
-		uint32_t idx = subpass.color_references[i].attachment;
-		if (idx != RDD::AttachmentReference::UNUSED && pass.attachments[idx].shouldClear(subpass, false)) {
-			clears[clears_count++] = { .aspect = RDD::TEXTURE_ASPECT_COLOR_BIT, .color_attachment = idx, .value = clear_values[idx] };
-		}
-	}
-
-	if (clear_depth || clear_stencil) {
-		MDAttachment const &attachment = pass.attachments[ds_index];
-		BitField<RDD::TextureAspectBits> bits = {};
-		if (clear_depth && attachment.type & MDAttachmentType::Depth) {
-			bits.set_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
-		}
-		if (clear_stencil && attachment.type & MDAttachmentType::Stencil) {
-			bits.set_flag(RDD::TEXTURE_ASPECT_STENCIL_BIT);
-		}
-
-		clears[clears_count++] = { .aspect = bits, .color_attachment = ds_index, .value = clear_values[ds_index] };
-	}
-
-	if (clears_count == 0) {
-		return;
-	}
-
-	render_clear_attachments(VectorView(clears, clears_count), { get_render_area() });
-}
-
-void MDCommandBufferBase::encode_push_constant_data(RDD::ShaderID p_shader, VectorView<uint32_t> p_data) {
-	switch (type) {
-		case MDCommandBufferStateType::Render:
-		case MDCommandBufferStateType::Compute: {
-			MDShader *shader = (MDShader *)(p_shader.id);
-			if (shader->push_constants.binding == UINT32_MAX) {
-				return;
-			}
-			push_constant_binding = shader->push_constants.binding;
-			void const *ptr = p_data.ptr();
-			push_constant_data_len = p_data.size() * sizeof(uint32_t);
-			DEV_ASSERT(push_constant_data_len <= sizeof(push_constant_data));
-			memcpy(push_constant_data, ptr, push_constant_data_len);
-			if (push_constant_data_len > 0) {
-				mark_push_constants_dirty();
-			}
-		} break;
-		case MDCommandBufferStateType::Blit:
-		case MDCommandBufferStateType::None:
-			return;
-	}
-}
-
-#pragma mark - Metal Library
-
-static const char *SHADER_STAGE_NAMES[] = {
-	"vert", // RDC::SHADER_STAGE_VERTEX
-	"frag", // RDC::SHADER_STAGE_FRAGMENT
-	"tess_ctrl", // RDC::SHADER_STAGE_TESSELATION_CONTROL
-	"tess_eval", // RDC::SHADER_STAGE_TESSELATION_EVALUATION
-	"comp", // RDC::SHADER_STAGE_COMPUTE
-};
-
-void ShaderCacheEntry::notify_free() const {
-	owner.shader_cache_free_entry(key);
-}
-
-#pragma mark - MDLibrary
-
-MDLibrary::MDLibrary(ShaderCacheEntry *p_entry
-#ifdef DEV_ENABLED
-		,
-		NS::String *p_source
-#endif
-		) :
-		_entry(p_entry) {
-#ifdef DEV_ENABLED
-	_original_source = NS::RetainPtr(p_source);
-#endif
-}
-
-MDLibrary::~MDLibrary() {
-	_entry->notify_free();
-}
-
-void MDLibrary::set_label(NS::String *p_label) {
-}
-
-#pragma mark - MDLazyLibrary
-
-/// Loads the MTLLibrary when the library is first accessed.
-class MDLazyLibrary final : public MDLibrary {
-	NS::SharedPtr<MTL::Library> _library;
-	NS::Error *_error = nullptr;
-	std::shared_mutex _mu;
-	bool _loaded = false;
-	MTL::Device *_device = nullptr;
-	NS::SharedPtr<NS::String> _source;
-	NS::SharedPtr<MTL::CompileOptions> _options;
-
-	void _load();
-
-public:
-	MDLazyLibrary(ShaderCacheEntry *p_entry,
-			MTL::Device *p_device,
-			NS::String *p_source,
-			MTL::CompileOptions *p_options);
-
-	MTL::Library *get_library() override;
-	NS::Error *get_error() override;
-};
-
-MDLazyLibrary::MDLazyLibrary(ShaderCacheEntry *p_entry,
-		MTL::Device *p_device,
-		NS::String *p_source,
-		MTL::CompileOptions *p_options) :
-		MDLibrary(p_entry
-#ifdef DEV_ENABLED
-				,
-				p_source
-#endif
-				),
-		_device(p_device),
-		_source(NS::RetainPtr(p_source)),
-		_options(NS::RetainPtr(p_options)) {
-}
-
-void MDLazyLibrary::_load() {
-	{
-		std::shared_lock<std::shared_mutex> lock(_mu);
-		if (_loaded) {
-			return;
-		}
-	}
-
-	std::unique_lock<std::shared_mutex> lock(_mu);
-	if (_loaded) {
-		return;
-	}
-
-	os_signpost_id_t compile_id = (os_signpost_id_t)(uintptr_t)this;
-	os_signpost_interval_begin(LOG_INTERVALS, compile_id, "shader_compile",
-			"shader_name=%{public}s stage=%{public}s hash=%X",
-			_entry->name.get_data(), SHADER_STAGE_NAMES[_entry->stage], _entry->key.short_sha());
-	NS::Error *error = nullptr;
-	_library = NS::TransferPtr(_device->newLibrary(_source.get(), _options.get(), &error));
-	os_signpost_interval_end(LOG_INTERVALS, compile_id, "shader_compile");
-	_error = error;
-	_device = nullptr;
-	_source.reset();
-	_options.reset();
-	_loaded = true;
-}
-
-MTL::Library *MDLazyLibrary::get_library() {
-	_load();
-	return _library.get();
-}
-
-NS::Error *MDLazyLibrary::get_error() {
-	_load();
-	return _error;
-}
-
-#pragma mark - MDImmediateLibrary
-
-/// Loads the MTLLibrary immediately on initialization, using Metal's async compilation API.
-class MDImmediateLibrary final : public MDLibrary {
-	NS::SharedPtr<MTL::Library> _library;
-	NS::Error *_error = nullptr;
-	std::mutex _cv_mutex;
-	std::condition_variable _cv;
-	bool _complete = false;
-
-	void _check_and_wait() {
-		std::unique_lock<std::mutex> lock(_cv_mutex);
-		_cv.wait(lock, [this] { return _complete; });
-	}
-
-public:
-	MDImmediateLibrary(ShaderCacheEntry *p_entry,
-			MTL::Device *p_device,
-			NS::String *p_source,
-			MTL::CompileOptions *p_options);
-	~MDImmediateLibrary() override;
-
-	MTL::Library *get_library() override;
-	NS::Error *get_error() override;
-};
-
-MDImmediateLibrary::MDImmediateLibrary(ShaderCacheEntry *p_entry,
-		MTL::Device *p_device,
-		NS::String *p_source,
-		MTL::CompileOptions *p_options) :
-		MDLibrary(p_entry
-#ifdef DEV_ENABLED
-				,
-				p_source
-#endif
-		) {
-	os_signpost_id_t compile_id = (os_signpost_id_t)(uintptr_t)this;
-	os_signpost_interval_begin(LOG_INTERVALS, compile_id, "shader_compile",
-			"shader_name=%{public}s stage=%{public}s hash=%X",
-			p_entry->name.get_data(), SHADER_STAGE_NAMES[p_entry->stage], p_entry->key.short_sha());
-
-	// Use Metal's async compilation API with std::function callback.
-	p_device->newLibrary(p_source, p_options, [this, compile_id, p_entry](MTL::Library *library, NS::Error *error) {
-		os_signpost_interval_end(LOG_INTERVALS, compile_id, "shader_compile");
-		if (library) {
-			_library = NS::RetainPtr(library);
-		}
-		_error = error;
-		if (error) {
-			ERR_PRINT(vformat(U"Error compiling shader %s: %s", p_entry->name.get_data(), error->localizedDescription()->utf8String()));
-		}
-
-		std::lock_guard<std::mutex> lock(_cv_mutex);
-		_complete = true;
-		_cv.notify_all();
-	});
-}
-
-MDImmediateLibrary::~MDImmediateLibrary() {
-	// Wait for the async compilation callback to complete before destroying to avoid segfault.
-	_check_and_wait();
-}
-
-MTL::Library *MDImmediateLibrary::get_library() {
-	_check_and_wait();
-	return _library.get();
-}
-
-NS::Error *MDImmediateLibrary::get_error() {
-	_check_and_wait();
-	return _error;
-}
-
-#pragma mark - MDBinaryLibrary
-
-/// Loads the MTLLibrary from pre-compiled binary data.
-class MDBinaryLibrary final : public MDLibrary {
-	NS::SharedPtr<MTL::Library> _library;
-	NS::Error *_error = nullptr;
-
-public:
-	MDBinaryLibrary(ShaderCacheEntry *p_entry,
-			MTL::Device *p_device,
-#ifdef DEV_ENABLED
-			NS::String *p_source,
-#endif
-			dispatch_data_t p_data);
-
-	MTL::Library *get_library() override;
-	NS::Error *get_error() override;
-};
-
-MDBinaryLibrary::MDBinaryLibrary(ShaderCacheEntry *p_entry,
-		MTL::Device *p_device,
-#ifdef DEV_ENABLED
-		NS::String *p_source,
-#endif
-		dispatch_data_t p_data) :
-		MDLibrary(p_entry
-#ifdef DEV_ENABLED
-				,
-				p_source
-#endif
-		) {
-	NS::Error *error = nullptr;
-	_library = NS::TransferPtr(p_device->newLibrary(p_data, &error));
-	if (error != nullptr) {
-		_error = error;
-		ERR_PRINT(vformat("Unable to load shader library: %s", error->localizedDescription()->utf8String()));
-	}
-}
-
-MTL::Library *MDBinaryLibrary::get_library() {
-	return _library.get();
-}
-
-NS::Error *MDBinaryLibrary::get_error() {
-	return _error;
-}
-
-#pragma mark - MDLibrary Factory Methods
-
-std::shared_ptr<MDLibrary> MDLibrary::create(ShaderCacheEntry *p_entry,
-		MTL::Device *p_device,
-		NS::String *p_source,
-		MTL::CompileOptions *p_options,
-		ShaderLoadStrategy p_strategy) {
-	std::shared_ptr<MDLibrary> lib;
-	switch (p_strategy) {
-		case ShaderLoadStrategy::IMMEDIATE:
-			[[fallthrough]];
-		default:
-			lib = std::make_shared<MDImmediateLibrary>(p_entry, p_device, p_source, p_options);
-			break;
-		case ShaderLoadStrategy::LAZY:
-			lib = std::make_shared<MDLazyLibrary>(p_entry, p_device, p_source, p_options);
-			break;
-	}
-	p_entry->library = lib;
-	return lib;
-}
-
-std::shared_ptr<MDLibrary> MDLibrary::create(ShaderCacheEntry *p_entry,
-		MTL::Device *p_device,
-#ifdef DEV_ENABLED
-		NS::String *p_source,
-#endif
-		dispatch_data_t p_data) {
-	std::shared_ptr<MDLibrary> lib = std::make_shared<MDBinaryLibrary>(p_entry, p_device,
-#ifdef DEV_ENABLED
-			p_source,
-#endif
-			p_data);
-	p_entry->library = lib;
-	return lib;
-}
diff --git a/engine/drivers/metal/metal_objects_shared.h b/engine/drivers/metal/metal_objects_shared.h
index e5d01d90..d74072c9 100644
--- a/engine/drivers/metal/metal_objects_shared.h
+++ b/engine/drivers/metal/metal_objects_shared.h
@@ -30,20 +30,28 @@
 
 #pragma once
 
-#include "drivers/metal/metal_device_properties.h"
-#include "drivers/metal/metal_utils.h"
-#include "drivers/metal/pixel_formats.h"
-#include "drivers/metal/sha256_digest.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <memory>
-#include <optional>
-
-class RenderingDeviceDriverMetal;
+#import "metal_device_properties.h"
+#import "metal_utils.h"
 
 using RDC = RenderingDeviceCommons;
 
+// These types can be used in Vector and other containers that use
+// pointer operations not supported by ARC.
+namespace MTL {
+#define MTL_CLASS(name)                               \
+	class name {                                      \
+	public:                                           \
+		name(id<MTL##name> obj = nil) : m_obj(obj) {} \
+		operator id<MTL##name>() const {              \
+			return m_obj;                             \
+		}                                             \
+		id<MTL##name> m_obj;                          \
+	};
+
+MTL_CLASS(Texture)
+
+} //namespace MTL
+
 enum ShaderStageUsage : uint32_t {
 	None = 0,
 	Vertex = RDD::SHADER_STAGE_VERTEX_BIT,
@@ -73,11 +81,11 @@ struct ClearAttKey {
 	uint16_t sample_count = 0;
 	uint16_t pixel_formats[ATTACHMENT_COUNT] = { 0 };
 
-	_FORCE_INLINE_ void set_color_format(uint32_t p_idx, MTL::PixelFormat p_fmt) { pixel_formats[p_idx] = p_fmt; }
-	_FORCE_INLINE_ void set_depth_format(MTL::PixelFormat p_fmt) { pixel_formats[DEPTH_INDEX] = p_fmt; }
-	_FORCE_INLINE_ void set_stencil_format(MTL::PixelFormat p_fmt) { pixel_formats[STENCIL_INDEX] = p_fmt; }
-	_FORCE_INLINE_ MTL::PixelFormat depth_format() const { return (MTL::PixelFormat)pixel_formats[DEPTH_INDEX]; }
-	_FORCE_INLINE_ MTL::PixelFormat stencil_format() const { return (MTL::PixelFormat)pixel_formats[STENCIL_INDEX]; }
+	_FORCE_INLINE_ void set_color_format(uint32_t p_idx, MTLPixelFormat p_fmt) { pixel_formats[p_idx] = p_fmt; }
+	_FORCE_INLINE_ void set_depth_format(MTLPixelFormat p_fmt) { pixel_formats[DEPTH_INDEX] = p_fmt; }
+	_FORCE_INLINE_ void set_stencil_format(MTLPixelFormat p_fmt) { pixel_formats[STENCIL_INDEX] = p_fmt; }
+	_FORCE_INLINE_ MTLPixelFormat depth_format() const { return (MTLPixelFormat)pixel_formats[DEPTH_INDEX]; }
+	_FORCE_INLINE_ MTLPixelFormat stencil_format() const { return (MTLPixelFormat)pixel_formats[STENCIL_INDEX]; }
 	_FORCE_INLINE_ void enable_layered_rendering() { flags::set(flags, CLEAR_FLAGS_LAYERED); }
 
 	_FORCE_INLINE_ bool is_enabled(uint32_t p_idx) const { return pixel_formats[p_idx] != 0; }
@@ -97,175 +105,6 @@ struct ClearAttKey {
 	}
 };
 
-#pragma mark - Ring Buffer
-
-/// A ring buffer backed by MTLBuffer instances for transient GPU allocations.
-/// Allocations are 16-byte aligned with a minimum size of 16 bytes.
-/// When the current buffer is exhausted, a new buffer is allocated.
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDRingBuffer {
-public:
-	static constexpr uint32_t DEFAULT_BUFFER_SIZE = 512 * 1024;
-	static constexpr uint32_t MIN_BLOCK_SIZE = 16;
-	static constexpr uint32_t ALIGNMENT = 16;
-
-	struct Allocation {
-		void *ptr = nullptr;
-		MTL::Buffer *buffer = nullptr;
-		uint64_t gpu_address = 0;
-		uint32_t offset = 0;
-
-		_FORCE_INLINE_ bool is_valid() const { return ptr != nullptr; }
-	};
-
-private:
-	MTL::Device *device = nullptr;
-	LocalVector<MTL::Buffer *> buffers;
-	LocalVector<uint32_t> heads;
-	uint32_t current_segment = 0;
-	uint32_t buffer_size = DEFAULT_BUFFER_SIZE;
-	bool changed = false;
-
-	_FORCE_INLINE_ uint32_t alloc_segment() {
-		MTL::Buffer *buffer = device->newBuffer(buffer_size, MTL::ResourceStorageModeShared | MTL::ResourceHazardTrackingModeUntracked);
-		buffers.push_back(buffer);
-		heads.push_back(0);
-		changed = true;
-
-		return buffers.size() - 1;
-	}
-
-public:
-	MDRingBuffer() = default;
-
-	MDRingBuffer(MTL::Device *p_device, uint32_t p_buffer_size = DEFAULT_BUFFER_SIZE) :
-			device(p_device), buffer_size(p_buffer_size) {}
-
-	~MDRingBuffer() {
-		for (MTL::Buffer *buffer : buffers) {
-			buffer->release();
-		}
-	}
-
-	/// Allocates a block of memory from the ring buffer.
-	/// Returns an Allocation with the pointer, buffer, and offset.
-	_FORCE_INLINE_ Allocation allocate(uint32_t p_size) {
-		p_size = MAX(p_size, MIN_BLOCK_SIZE);
-		p_size = (p_size + ALIGNMENT - 1) & ~(ALIGNMENT - 1);
-
-		if (buffers.is_empty()) {
-			alloc_segment();
-		}
-
-		uint32_t aligned_head = (heads[current_segment] + ALIGNMENT - 1) & ~(ALIGNMENT - 1);
-
-		if (aligned_head + p_size > buffer_size) {
-			// Current segment exhausted, try to find one with space or allocate new.
-			bool found = false;
-			for (uint32_t i = 0; i < buffers.size(); i++) {
-				uint32_t ah = (heads[i] + ALIGNMENT - 1) & ~(ALIGNMENT - 1);
-				if (ah + p_size <= buffer_size) {
-					current_segment = i;
-					aligned_head = ah;
-					found = true;
-					break;
-				}
-			}
-
-			if (!found) {
-				current_segment = alloc_segment();
-				aligned_head = 0;
-			}
-		}
-
-		MTL::Buffer *buffer = buffers[current_segment];
-		Allocation alloc;
-		alloc.buffer = buffer;
-		alloc.offset = aligned_head;
-		alloc.ptr = static_cast<uint8_t *>(buffer->contents()) + aligned_head;
-		if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
-			alloc.gpu_address = buffer->gpuAddress() + aligned_head;
-		}
-		heads[current_segment] = aligned_head + p_size;
-
-		return alloc;
-	}
-
-	/// Resets all segments for reuse. Call at frame boundaries when GPU work is complete.
-	_FORCE_INLINE_ void reset() {
-		for (uint32_t &head : heads) {
-			head = 0;
-		}
-		current_segment = 0;
-	}
-
-	/// Returns true if buffers were added or removed since last clear_changed().
-	_FORCE_INLINE_ bool is_changed() const { return changed; }
-
-	/// Clears the changed flag.
-	_FORCE_INLINE_ void clear_changed() { changed = false; }
-
-	/// Returns a Span of all backing buffers.
-	_FORCE_INLINE_ Span<MTL::Buffer *const> get_buffers() const {
-		return Span<MTL::Buffer *const>(buffers.ptr(), buffers.size());
-	}
-
-	/// Returns the number of buffer segments currently allocated.
-	_FORCE_INLINE_ uint32_t get_segment_count() const {
-		return buffers.size();
-	}
-};
-
-#pragma mark - Resource Factory
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDResourceFactory {
-private:
-	MTL::Device *device;
-	PixelFormats &pixel_formats;
-	uint32_t max_buffer_count;
-
-	NS::SharedPtr<MTL::Function> new_func(NS::String *p_source, NS::String *p_name, NS::Error **p_error);
-	NS::SharedPtr<MTL::Function> new_clear_vert_func(ClearAttKey &p_key);
-	NS::SharedPtr<MTL::Function> new_clear_frag_func(ClearAttKey &p_key);
-	const char *get_format_type_string(MTL::PixelFormat p_fmt) const;
-
-	_FORCE_INLINE_ uint32_t get_vertex_buffer_index(uint32_t p_binding) {
-		return (max_buffer_count - 1) - p_binding;
-	}
-
-public:
-	NS::SharedPtr<MTL::RenderPipelineState> new_clear_pipeline_state(ClearAttKey &p_key, NS::Error **p_error);
-	NS::SharedPtr<MTL::RenderPipelineState> new_empty_draw_pipeline_state(ClearAttKey &p_key, NS::Error **p_error);
-	NS::SharedPtr<MTL::DepthStencilState> new_depth_stencil_state(bool p_use_depth, bool p_use_stencil);
-
-	MDResourceFactory(MTL::Device *p_device, PixelFormats &p_pixel_formats, uint32_t p_max_buffer_count) :
-			device(p_device), pixel_formats(p_pixel_formats), max_buffer_count(p_max_buffer_count) {}
-	~MDResourceFactory() = default;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDResourceCache {
-private:
-	typedef HashMap<ClearAttKey, NS::SharedPtr<MTL::RenderPipelineState>> HashMap;
-	std::unique_ptr<MDResourceFactory> resource_factory;
-	HashMap clear_states;
-	HashMap empty_draw_states;
-
-	struct {
-		NS::SharedPtr<MTL::DepthStencilState> all;
-		NS::SharedPtr<MTL::DepthStencilState> depth_only;
-		NS::SharedPtr<MTL::DepthStencilState> stencil_only;
-		NS::SharedPtr<MTL::DepthStencilState> none;
-	} clear_depth_stencil_state;
-
-public:
-	MTL::RenderPipelineState *get_clear_render_pipeline_state(ClearAttKey &p_key, NS::Error **p_error);
-	MTL::RenderPipelineState *get_empty_draw_pipeline_state(ClearAttKey &p_key, NS::Error **p_error);
-	MTL::DepthStencilState *get_depth_stencil_state(bool p_use_depth, bool p_use_stencil);
-
-	explicit MDResourceCache(MTL::Device *p_device, PixelFormats &p_pixel_formats, uint32_t p_max_buffer_count) :
-			resource_factory(new MDResourceFactory(p_device, p_pixel_formats, p_max_buffer_count)) {}
-	~MDResourceCache() = default;
-};
-
 /**
  * Returns an index that can be used to map a shader stage to an index in a fixed-size array that is used for
  * a single pipeline type.
@@ -283,33 +122,33 @@ _FORCE_INLINE_ static uint32_t to_index(RDD::ShaderStage p_s) {
 	}
 }
 
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDFrameBuffer {
-	Vector<MTL::Texture *> textures;
+class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDFrameBuffer {
+	Vector<MTL::Texture> textures;
 
 public:
 	Size2i size;
-	MDFrameBuffer(Vector<MTL::Texture *> p_textures, Size2i p_size) :
+	MDFrameBuffer(Vector<MTL::Texture> p_textures, Size2i p_size) :
 			textures(p_textures), size(p_size) {}
 	MDFrameBuffer() {}
 
 	/// Returns the texture at the given index.
-	_ALWAYS_INLINE_ MTL::Texture *get_texture(uint32_t p_idx) const {
+	_ALWAYS_INLINE_ MTL::Texture get_texture(uint32_t p_idx) const {
 		return textures[p_idx];
 	}
 
 	/// Returns true if the texture at the given index is not nil.
 	_ALWAYS_INLINE_ bool has_texture(uint32_t p_idx) const {
-		return textures[p_idx] != nullptr;
+		return textures[p_idx] != nil;
 	}
 
 	/// Set the texture at the given index.
-	_ALWAYS_INLINE_ void set_texture(uint32_t p_idx, MTL::Texture *p_texture) {
+	_ALWAYS_INLINE_ void set_texture(uint32_t p_idx, MTL::Texture p_texture) {
 		textures.write[p_idx] = p_texture;
 	}
 
 	/// Unset or nil the texture at the given index.
 	_ALWAYS_INLINE_ void unset_texture(uint32_t p_idx) {
-		textures.write[p_idx] = nullptr;
+		textures.write[p_idx] = nil;
 	}
 
 	/// Resizes buffers to the specified size.
@@ -320,771 +159,38 @@ public:
 	virtual ~MDFrameBuffer() = default;
 };
 
-template <>
-struct HashMapComparatorDefault<RDD::ShaderID> {
-	static bool compare(const RDD::ShaderID &p_lhs, const RDD::ShaderID &p_rhs) {
-		return p_lhs.id == p_rhs.id;
-	}
-};
-
-template <>
-struct HashMapComparatorDefault<RDD::BufferID> {
-	static bool compare(const RDD::BufferID &p_lhs, const RDD::BufferID &p_rhs) {
-		return p_lhs.id == p_rhs.id;
-	}
-};
-
-template <>
-struct HashMapComparatorDefault<RDD::TextureID> {
-	static bool compare(const RDD::TextureID &p_lhs, const RDD::TextureID &p_rhs) {
-		return p_lhs.id == p_rhs.id;
-	}
-};
-
-template <>
-struct HashMapHasherDefaultImpl<RDD::BufferID> {
-	static _FORCE_INLINE_ uint32_t hash(const RDD::BufferID &p_value) {
-		return HashMapHasherDefaultImpl<uint64_t>::hash(p_value.id);
-	}
-};
-
-template <>
-struct HashMapHasherDefaultImpl<RDD::TextureID> {
-	static _FORCE_INLINE_ uint32_t hash(const RDD::TextureID &p_value) {
-		return HashMapHasherDefaultImpl<uint64_t>::hash(p_value.id);
-	}
-};
-
+// These functions are used to convert between Objective-C objects and
+// the RIDs used by Godot, respecting automatic reference counting.
 namespace rid {
 
-template <typename T>
-_FORCE_INLINE_ T *get(RDD::ID p_id) {
-	return reinterpret_cast<T *>(p_id.id);
+// Converts an Objective-C object to a pointer, and incrementing the
+// reference count.
+_FORCE_INLINE_ void *owned(id p_id) {
+	return (__bridge_retained void *)p_id;
 }
 
-template <typename T>
-_FORCE_INLINE_ T *get(uint64_t p_id) {
-	return reinterpret_cast<T *>(p_id);
+#define MAKE_ID(FROM, TO)                \
+	_FORCE_INLINE_ TO make(FROM p_obj) { \
+		return TO(owned(p_obj));         \
+	}
+
+// These are shared for Metal and Metal 4 drivers
+
+MAKE_ID(id<MTLTexture>, RDD::TextureID)
+MAKE_ID(id<MTLBuffer>, RDD::BufferID)
+MAKE_ID(id<MTLSamplerState>, RDD::SamplerID)
+MAKE_ID(MTLVertexDescriptor *, RDD::VertexFormatID)
+
+#undef MAKE_ID
+
+// Converts a pointer to an Objective-C object without changing the reference count.
+_FORCE_INLINE_ auto get(RDD::ID p_id) {
+	return (p_id.id) ? (__bridge ::id)(void *)p_id.id : nil;
+}
+
+// Converts a pointer to an Objective-C object, and decrements the reference count.
+_FORCE_INLINE_ auto release(RDD::ID p_id) {
+	return (__bridge_transfer ::id)(void *)p_id.id;
 }
 
 } // namespace rid
-
-#pragma mark - Render Pass Types
-
-class MDRenderPass;
-
-enum class MDAttachmentType : uint8_t {
-	None = 0,
-	Color = 1 << 0,
-	Depth = 1 << 1,
-	Stencil = 1 << 2,
-};
-
-_FORCE_INLINE_ MDAttachmentType &operator|=(MDAttachmentType &p_a, MDAttachmentType p_b) {
-	flags::set(p_a, p_b);
-	return p_a;
-}
-
-_FORCE_INLINE_ bool operator&(MDAttachmentType p_a, MDAttachmentType p_b) {
-	return uint8_t(p_a) & uint8_t(p_b);
-}
-
-struct MDSubpass {
-	uint32_t subpass_index = 0;
-	uint32_t view_count = 0;
-	LocalVector<RDD::AttachmentReference> input_references;
-	LocalVector<RDD::AttachmentReference> color_references;
-	RDD::AttachmentReference depth_stencil_reference;
-	LocalVector<RDD::AttachmentReference> resolve_references;
-
-	MTLFmtCaps getRequiredFmtCapsForAttachmentAt(uint32_t p_index) const;
-};
-
-struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDAttachment {
-private:
-	uint32_t index = 0;
-	uint32_t firstUseSubpassIndex = 0;
-	uint32_t lastUseSubpassIndex = 0;
-
-public:
-	MTL::PixelFormat format = MTL::PixelFormatInvalid;
-	MDAttachmentType type = MDAttachmentType::None;
-	MTL::LoadAction loadAction = MTL::LoadActionDontCare;
-	MTL::StoreAction storeAction = MTL::StoreActionDontCare;
-	MTL::LoadAction stencilLoadAction = MTL::LoadActionDontCare;
-	MTL::StoreAction stencilStoreAction = MTL::StoreActionDontCare;
-	uint32_t samples = 1;
-
-	/*!
-	 * @brief Returns true if this attachment is first used in the given subpass.
-	 * @param p_subpass
-	 * @return
-	 */
-	_FORCE_INLINE_ bool isFirstUseOf(MDSubpass const &p_subpass) const {
-		return p_subpass.subpass_index == firstUseSubpassIndex;
-	}
-
-	/*!
-	 * @brief Returns true if this attachment is last used in the given subpass.
-	 * @param p_subpass
-	 * @return
-	 */
-	_FORCE_INLINE_ bool isLastUseOf(MDSubpass const &p_subpass) const {
-		return p_subpass.subpass_index == lastUseSubpassIndex;
-	}
-
-	void linkToSubpass(MDRenderPass const &p_pass);
-
-	MTL::StoreAction getMTLStoreAction(MDSubpass const &p_subpass,
-			bool p_is_rendering_entire_area,
-			bool p_has_resolve,
-			bool p_can_resolve,
-			bool p_is_stencil) const;
-	bool configureDescriptor(MTL::RenderPassAttachmentDescriptor *p_desc,
-			PixelFormats &p_pf,
-			MDSubpass const &p_subpass,
-			MTL::Texture *p_attachment,
-			bool p_is_rendering_entire_area,
-			bool p_has_resolve,
-			bool p_can_resolve,
-			bool p_is_stencil) const {
-		p_desc->setTexture(p_attachment);
-
-		MTL::LoadAction load;
-		if (!p_is_rendering_entire_area || !isFirstUseOf(p_subpass)) {
-			load = MTL::LoadActionLoad;
-		} else {
-			load = p_is_stencil ? (MTL::LoadAction)stencilLoadAction : (MTL::LoadAction)loadAction;
-		}
-
-		p_desc->setLoadAction(load);
-
-		MTL::PixelFormat mtlFmt = p_attachment->pixelFormat();
-		bool isDepthFormat = p_pf.isDepthFormat(mtlFmt);
-		bool isStencilFormat = p_pf.isStencilFormat(mtlFmt);
-		if (isStencilFormat && !p_is_stencil && !isDepthFormat) {
-			p_desc->setStoreAction(MTL::StoreActionDontCare);
-		} else {
-			p_desc->setStoreAction(getMTLStoreAction(p_subpass, p_is_rendering_entire_area, p_has_resolve, p_can_resolve, p_is_stencil));
-		}
-
-		return load == MTL::LoadActionClear;
-	}
-
-	/** Returns whether this attachment should be cleared in the subpass. */
-	bool shouldClear(MDSubpass const &p_subpass, bool p_is_stencil) const;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDRenderPass {
-public:
-	Vector<MDAttachment> attachments;
-	Vector<MDSubpass> subpasses;
-
-	uint32_t get_sample_count() const {
-		return attachments.is_empty() ? 1 : attachments[0].samples;
-	}
-
-	MDRenderPass(Vector<MDAttachment> &p_attachments, Vector<MDSubpass> &p_subpasses);
-};
-
-#pragma mark - Command Buffer Helpers
-
-_FORCE_INLINE_ static MTL::Size MTLSizeFromVector3i(Vector3i p_size) {
-	return MTL::Size{ (NS::UInteger)p_size.x, (NS::UInteger)p_size.y, (NS::UInteger)p_size.z };
-}
-
-_FORCE_INLINE_ static MTL::Origin MTLOriginFromVector3i(Vector3i p_origin) {
-	return MTL::Origin{ (NS::UInteger)p_origin.x, (NS::UInteger)p_origin.y, (NS::UInteger)p_origin.z };
-}
-
-// Clamps the size so that the sum of the origin and size do not exceed the maximum size.
-_FORCE_INLINE_ static MTL::Size clampMTLSize(MTL::Size p_size, MTL::Origin p_origin, MTL::Size p_max_size) {
-	MTL::Size clamped;
-	clamped.width = MIN(p_size.width, p_max_size.width - p_origin.x);
-	clamped.height = MIN(p_size.height, p_max_size.height - p_origin.y);
-	clamped.depth = MIN(p_size.depth, p_max_size.depth - p_origin.z);
-	return clamped;
-}
-
-API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
-_FORCE_INLINE_ static bool isArrayTexture(MTL::TextureType p_type) {
-	return (p_type == MTL::TextureType3D ||
-			p_type == MTL::TextureType2DArray ||
-			p_type == MTL::TextureType2DMultisampleArray ||
-			p_type == MTL::TextureType1DArray);
-}
-
-_FORCE_INLINE_ static bool operator==(MTL::Size p_a, MTL::Size p_b) {
-	return p_a.width == p_b.width && p_a.height == p_b.height && p_a.depth == p_b.depth;
-}
-
-#pragma mark - Pipeline Stage Conversion
-
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
-
-_FORCE_INLINE_ static MTL::Stages convert_src_pipeline_stages_to_metal(BitField<RDD::PipelineStageBits> p_stages) {
-	p_stages.clear_flag(RDD::PIPELINE_STAGE_TOP_OF_PIPE_BIT);
-
-	// BOTTOM_OF_PIPE or ALL_COMMANDS means "all prior work must complete".
-	if (p_stages & (RDD::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT | RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT)) {
-		return MTL::StageAll;
-	}
-
-	MTL::Stages mtlStages = 0;
-
-	// Vertex stage mappings.
-	if (p_stages & (RDD::PIPELINE_STAGE_DRAW_INDIRECT_BIT | RDD::PIPELINE_STAGE_VERTEX_INPUT_BIT | RDD::PIPELINE_STAGE_VERTEX_SHADER_BIT | RDD::PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | RDD::PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | RDD::PIPELINE_STAGE_GEOMETRY_SHADER_BIT)) {
-		mtlStages |= MTL::StageVertex;
-	}
-
-	// Fragment stage mappings.
-	// Includes resolve and clear_storage, which on Metal use the render pipeline.
-	if (p_stages & (RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT | RDD::PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | RDD::PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | RDD::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT | RDD::PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT | RDD::PIPELINE_STAGE_RESOLVE_BIT | RDD::PIPELINE_STAGE_CLEAR_STORAGE_BIT)) {
-		mtlStages |= MTL::StageFragment;
-	}
-
-	// Compute stage.
-	if (p_stages & RDD::PIPELINE_STAGE_COMPUTE_SHADER_BIT) {
-		mtlStages |= MTL::StageDispatch;
-	}
-
-	// Blit stage (transfer operations).
-	if (p_stages & RDD::PIPELINE_STAGE_COPY_BIT) {
-		mtlStages |= MTL::StageBlit;
-	}
-
-	// ALL_GRAPHICS_BIT special case.
-	if (p_stages & RDD::PIPELINE_STAGE_ALL_GRAPHICS_BIT) {
-		mtlStages |= (MTL::StageVertex | MTL::StageFragment);
-	}
-
-	return mtlStages;
-}
-
-_FORCE_INLINE_ static MTL::Stages convert_dst_pipeline_stages_to_metal(BitField<RDD::PipelineStageBits> p_stages) {
-	p_stages.clear_flag(RDD::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT);
-
-	// TOP_OF_PIPE or ALL_COMMANDS means "wait before any work starts".
-	if (p_stages & (RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT | RDD::PIPELINE_STAGE_TOP_OF_PIPE_BIT)) {
-		return MTL::StageAll;
-	}
-
-	MTL::Stages mtlStages = 0;
-
-	// Vertex stage mappings.
-	if (p_stages & (RDD::PIPELINE_STAGE_DRAW_INDIRECT_BIT | RDD::PIPELINE_STAGE_VERTEX_INPUT_BIT | RDD::PIPELINE_STAGE_VERTEX_SHADER_BIT | RDD::PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | RDD::PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | RDD::PIPELINE_STAGE_GEOMETRY_SHADER_BIT)) {
-		mtlStages |= MTL::StageVertex;
-	}
-
-	// Fragment stage mappings.
-	// Includes resolve and clear_storage, which on Metal use the render pipeline.
-	if (p_stages & (RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT | RDD::PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | RDD::PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | RDD::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT | RDD::PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT | RDD::PIPELINE_STAGE_RESOLVE_BIT | RDD::PIPELINE_STAGE_CLEAR_STORAGE_BIT)) {
-		mtlStages |= MTL::StageFragment;
-	}
-
-	// Compute stage.
-	if (p_stages & RDD::PIPELINE_STAGE_COMPUTE_SHADER_BIT) {
-		mtlStages |= MTL::StageDispatch;
-	}
-
-	// Blit stage (transfer operations).
-	if (p_stages & RDD::PIPELINE_STAGE_COPY_BIT) {
-		mtlStages |= MTL::StageBlit;
-	}
-
-	// ALL_GRAPHICS_BIT special case.
-	if (p_stages & RDD::PIPELINE_STAGE_ALL_GRAPHICS_BIT) {
-		mtlStages |= (MTL::StageVertex | MTL::StageFragment);
-	}
-
-	return mtlStages;
-}
-
-GODOT_CLANG_WARNING_POP
-
-#pragma mark - Command Buffer Base
-
-enum class MDCommandBufferStateType {
-	None,
-	Render,
-	Compute,
-	Blit, // Only used by Metal 3
-};
-
-/// Base struct for render state shared between MTL3 and MTL4 implementations.
-struct RenderStateBase {
-	LocalVector<MTL::Viewport> viewports;
-	LocalVector<MTL::ScissorRect> scissors;
-	std::optional<Color> blend_constants;
-
-	// clang-format off
-	enum DirtyFlag : uint16_t {
-		DIRTY_NONE     = 0,
-		DIRTY_PIPELINE = 1 << 0,
-		DIRTY_UNIFORMS = 1 << 1,
-		DIRTY_PUSH     = 1 << 2,
-		DIRTY_DEPTH    = 1 << 3,
-		DIRTY_VERTEX   = 1 << 4,
-		DIRTY_VIEWPORT = 1 << 5,
-		DIRTY_SCISSOR  = 1 << 6,
-		DIRTY_BLEND    = 1 << 7,
-		DIRTY_RASTER   = 1 << 8,
-		DIRTY_ALL      = (1 << 9) - 1,
-	};
-	// clang-format on
-	BitField<DirtyFlag> dirty = DIRTY_NONE;
-};
-
-/// Abstract base class for Metal command buffers, shared between MTL3 and MTL4 implementations.
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDCommandBufferBase {
-	LocalVector<CFTypeRef> _retained_resources;
-
-protected:
-	// From RenderingDevice
-	static constexpr uint32_t MAX_PUSH_CONSTANT_SIZE = 128;
-
-	MDCommandBufferStateType type = MDCommandBufferStateType::None;
-
-	uint8_t push_constant_data[MAX_PUSH_CONSTANT_SIZE];
-	uint32_t push_constant_data_len = 0;
-	uint32_t push_constant_binding = UINT32_MAX;
-
-	::RenderingDeviceDriverMetal *device_driver = nullptr;
-
-	void release_resources();
-
-	/// Called when push constants are modified to mark the appropriate dirty flags.
-	virtual void mark_push_constants_dirty() = 0;
-
-	/// Returns a reference to the render state base for viewport/scissor/blend operations.
-	virtual RenderStateBase &get_render_state_base() = 0;
-
-	/// Returns the view count for the current subpass.
-	virtual uint32_t get_current_view_count() const = 0;
-
-	/// Accessors for render pass state.
-	virtual MDRenderPass *get_render_pass() const = 0;
-	virtual MDFrameBuffer *get_frame_buffer() const = 0;
-	virtual const MDSubpass &get_current_subpass() const = 0;
-	virtual LocalVector<RDD::RenderPassClearValue> &get_clear_values() = 0;
-	virtual const Rect2i &get_render_area() const = 0;
-	virtual void end_render_encoding() = 0;
-
-	void _populate_vertices(simd::float4 *p_vertices, Size2i p_fb_size, VectorView<Rect2i> p_rects);
-	uint32_t _populate_vertices(simd::float4 *p_vertices, uint32_t p_index, Rect2i const &p_rect, Size2i p_fb_size);
-	void _end_render_pass();
-	void _render_clear_render_area();
-
-public:
-	virtual ~MDCommandBufferBase() { release_resources(); }
-
-	virtual void begin() = 0;
-	virtual void commit() = 0;
-	virtual void end() = 0;
-
-	virtual void bind_pipeline(RDD::PipelineID p_pipeline) = 0;
-	void encode_push_constant_data(RDD::ShaderID p_shader, VectorView<uint32_t> p_data);
-
-	void retain_resource(CFTypeRef p_resource);
-
-#pragma mark - Render Commands
-
-	virtual void render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) = 0;
-	virtual void render_clear_attachments(VectorView<RDD::AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) = 0;
-	void render_set_viewport(VectorView<Rect2i> p_viewports);
-	void render_set_scissor(VectorView<Rect2i> p_scissors);
-	void render_set_blend_constants(const Color &p_constants);
-	virtual void render_begin_pass(RDD::RenderPassID p_render_pass,
-			RDD::FramebufferID p_frameBuffer,
-			RDD::CommandBufferType p_cmd_buffer_type,
-			const Rect2i &p_rect,
-			VectorView<RDD::RenderPassClearValue> p_clear_values) = 0;
-	virtual void render_next_subpass() = 0;
-	virtual void render_draw(uint32_t p_vertex_count,
-			uint32_t p_instance_count,
-			uint32_t p_base_vertex,
-			uint32_t p_first_instance) = 0;
-	virtual void render_bind_vertex_buffers(uint32_t p_binding_count, const RDD::BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets) = 0;
-	virtual void render_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint64_t p_offset) = 0;
-
-	virtual void render_draw_indexed(uint32_t p_index_count,
-			uint32_t p_instance_count,
-			uint32_t p_first_index,
-			int32_t p_vertex_offset,
-			uint32_t p_first_instance) = 0;
-
-	virtual void render_draw_indexed_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) = 0;
-	virtual void render_draw_indexed_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) = 0;
-	virtual void render_draw_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) = 0;
-	virtual void render_draw_indirect_count(RDD::BufferID p_indirect_buffer, uint64_t p_offset, RDD::BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) = 0;
-
-	virtual void render_end_pass() = 0;
-
-#pragma mark - Compute Commands
-
-	virtual void compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) = 0;
-	virtual void compute_dispatch(uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) = 0;
-	virtual void compute_dispatch_indirect(RDD::BufferID p_indirect_buffer, uint64_t p_offset) = 0;
-
-#pragma mark - Transfer
-
-	virtual void resolve_texture(RDD::TextureID p_src_texture, RDD::TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, RDD::TextureID p_dst_texture, RDD::TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) = 0;
-	virtual void clear_color_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, const Color &p_color, const RDD::TextureSubresourceRange &p_subresources) = 0;
-	virtual void clear_depth_stencil_texture(RDD::TextureID p_texture, RDD::TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const RDD::TextureSubresourceRange &p_subresources) = 0;
-	virtual void clear_buffer(RDD::BufferID p_buffer, uint64_t p_offset, uint64_t p_size) = 0;
-	virtual void copy_buffer(RDD::BufferID p_src_buffer, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferCopyRegion> p_regions) = 0;
-	virtual void copy_texture(RDD::TextureID p_src_texture, RDD::TextureID p_dst_texture, VectorView<RDD::TextureCopyRegion> p_regions) = 0;
-	virtual void copy_buffer_to_texture(RDD::BufferID p_src_buffer, RDD::TextureID p_dst_texture, VectorView<RDD::BufferTextureCopyRegion> p_regions) = 0;
-	virtual void copy_texture_to_buffer(RDD::TextureID p_src_texture, RDD::BufferID p_dst_buffer, VectorView<RDD::BufferTextureCopyRegion> p_regions) = 0;
-
-#pragma mark - Synchronization
-
-	virtual void pipeline_barrier(BitField<RDD::PipelineStageBits> p_src_stages,
-			BitField<RDD::PipelineStageBits> p_dst_stages,
-			VectorView<RDD::MemoryAccessBarrier> p_memory_barriers,
-			VectorView<RDD::BufferBarrier> p_buffer_barriers,
-			VectorView<RDD::TextureBarrier> p_texture_barriers,
-			VectorView<RDD::AccelerationStructureBarrier> p_acceleration_structure_barriers) = 0;
-
-#pragma mark - Debugging
-
-	virtual void begin_label(const char *p_label_name, const Color &p_color) = 0;
-	virtual void end_label() = 0;
-};
-
-#pragma mark - Uniform Types
-
-struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) UniformInfo {
-	uint32_t binding;
-	BitField<RDD::ShaderStage> active_stages;
-	MTL::DataType dataType = MTL::DataTypeNone;
-	MTL::BindingAccess access = MTL::BindingAccessReadOnly;
-	MTL::ResourceUsage usage = 0;
-	MTL::TextureType textureType = MTL::TextureType2D;
-	uint32_t imageFormat = 0;
-	uint32_t arrayLength = 0;
-	bool isMultisampled = false;
-
-	struct Indexes {
-		uint32_t buffer = UINT32_MAX;
-		uint32_t texture = UINT32_MAX;
-		uint32_t sampler = UINT32_MAX;
-	};
-	Indexes slot;
-	Indexes arg_buffer;
-
-	enum class IndexType {
-		SLOT,
-		ARG,
-	};
-
-	_FORCE_INLINE_ Indexes &get_indexes(IndexType p_type) {
-		switch (p_type) {
-			case IndexType::SLOT:
-				return slot;
-			case IndexType::ARG:
-				return arg_buffer;
-		}
-	}
-};
-
-struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) UniformSet {
-	LocalVector<UniformInfo> uniforms;
-	LocalVector<uint32_t> dynamic_uniforms;
-	uint32_t buffer_size = 0;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) DynamicOffsetLayout {
-	struct Data {
-		uint8_t offset : 4;
-		uint8_t count : 4;
-	};
-
-	union {
-		Data data[MAX_DYNAMIC_BUFFERS];
-		uint64_t _val = 0;
-	};
-
-public:
-	_FORCE_INLINE_ bool is_empty() const { return _val == 0; }
-
-	_FORCE_INLINE_ uint32_t get_count(uint32_t p_set_index) const {
-		return data[p_set_index].count;
-	}
-
-	_FORCE_INLINE_ uint32_t get_offset(uint32_t p_set_index) const {
-		return data[p_set_index].offset;
-	}
-
-	_FORCE_INLINE_ void set_offset_count(uint32_t p_set_index, uint8_t p_offset, uint8_t p_count) {
-		data[p_set_index].offset = p_offset;
-		data[p_set_index].count = p_count;
-	}
-
-	_FORCE_INLINE_ uint32_t get_offset_index_shift(uint32_t p_set_index, uint32_t p_dynamic_index = 0) const {
-		return (data[p_set_index].offset + p_dynamic_index) * 4u;
-	}
-};
-
-#pragma mark - Shader Types
-
-class MDLibrary; // Forward declaration for C++ code
-struct ShaderCacheEntry; // Forward declaration for C++ code
-
-enum class ShaderLoadStrategy {
-	IMMEDIATE,
-	LAZY,
-
-	/// The default strategy is to load the shader immediately.
-	DEFAULT = IMMEDIATE,
-};
-
-/// A Metal shader library.
-class MDLibrary : public std::enable_shared_from_this<MDLibrary> {
-protected:
-	ShaderCacheEntry *_entry = nullptr;
-#ifdef DEV_ENABLED
-	NS::SharedPtr<NS::String> _original_source = nullptr;
-#endif
-
-	MDLibrary(ShaderCacheEntry *p_entry
-#ifdef DEV_ENABLED
-			,
-			NS::String *p_source
-#endif
-	);
-
-public:
-	virtual ~MDLibrary();
-
-	virtual MTL::Library *get_library() = 0;
-	virtual NS::Error *get_error() = 0;
-	virtual void set_label(NS::String *p_label);
-#ifdef DEV_ENABLED
-	NS::String *get_original_source() const { return _original_source.get(); }
-#endif
-
-	static std::shared_ptr<MDLibrary> create(ShaderCacheEntry *p_entry,
-			MTL::Device *p_device,
-			NS::String *p_source,
-			MTL::CompileOptions *p_options,
-			ShaderLoadStrategy p_strategy);
-
-	static std::shared_ptr<MDLibrary> create(ShaderCacheEntry *p_entry,
-			MTL::Device *p_device,
-#ifdef DEV_ENABLED
-			NS::String *p_source,
-#endif
-			dispatch_data_t p_data);
-};
-
-/// A cache entry for a Metal shader library.
-struct ShaderCacheEntry {
-	RenderingDeviceDriverMetal &owner;
-	/// A hash of the Metal shader source code.
-	SHA256Digest key;
-	CharString name;
-	RDC::ShaderStage stage = RDC::SHADER_STAGE_VERTEX;
-	/// Weak reference to the library; allows cache lookup without preventing cleanup.
-	std::weak_ptr<MDLibrary> library;
-
-	/// Notify the cache that this entry is no longer needed.
-	void notify_free() const;
-
-	ShaderCacheEntry(RenderingDeviceDriverMetal &p_owner, SHA256Digest p_key) :
-			owner(p_owner), key(p_key) {
-	}
-	~ShaderCacheEntry() = default;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDShader {
-public:
-	CharString name;
-	Vector<UniformSet> sets;
-	struct {
-		BitField<RDD::ShaderStage> stages = {};
-		uint32_t binding = UINT32_MAX;
-		uint32_t size = 0;
-	} push_constants;
-	DynamicOffsetLayout dynamic_offset_layout;
-	bool uses_argument_buffers = true;
-
-	MDShader(CharString p_name, Vector<UniformSet> p_sets, bool p_uses_argument_buffers) :
-			name(p_name), sets(p_sets), uses_argument_buffers(p_uses_argument_buffers) {}
-	virtual ~MDShader() = default;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDComputeShader final : public MDShader {
-public:
-	MTL::Size local = {};
-
-	std::shared_ptr<MDLibrary> kernel;
-
-	MDComputeShader(CharString p_name, Vector<UniformSet> p_sets, bool p_uses_argument_buffers, std::shared_ptr<MDLibrary> p_kernel);
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDRenderShader final : public MDShader {
-public:
-	bool needs_view_mask_buffer = false;
-
-	std::shared_ptr<MDLibrary> vert;
-	std::shared_ptr<MDLibrary> frag;
-
-	MDRenderShader(CharString p_name,
-			Vector<UniformSet> p_sets,
-			bool p_needs_view_mask_buffer,
-			bool p_uses_argument_buffers,
-			std::shared_ptr<MDLibrary> p_vert, std::shared_ptr<MDLibrary> p_frag);
-};
-
-#pragma mark - Uniform Set
-
-enum StageResourceUsage : uint32_t {
-	ResourceUnused = 0,
-	VertexRead = (MTL::ResourceUsageRead << RDD::SHADER_STAGE_VERTEX * 2),
-	VertexWrite = (MTL::ResourceUsageWrite << RDD::SHADER_STAGE_VERTEX * 2),
-	FragmentRead = (MTL::ResourceUsageRead << RDD::SHADER_STAGE_FRAGMENT * 2),
-	FragmentWrite = (MTL::ResourceUsageWrite << RDD::SHADER_STAGE_FRAGMENT * 2),
-	TesselationControlRead = (MTL::ResourceUsageRead << RDD::SHADER_STAGE_TESSELATION_CONTROL * 2),
-	TesselationControlWrite = (MTL::ResourceUsageWrite << RDD::SHADER_STAGE_TESSELATION_CONTROL * 2),
-	TesselationEvaluationRead = (MTL::ResourceUsageRead << RDD::SHADER_STAGE_TESSELATION_EVALUATION * 2),
-	TesselationEvaluationWrite = (MTL::ResourceUsageWrite << RDD::SHADER_STAGE_TESSELATION_EVALUATION * 2),
-	ComputeRead = (MTL::ResourceUsageRead << RDD::SHADER_STAGE_COMPUTE * 2),
-	ComputeWrite = (MTL::ResourceUsageWrite << RDD::SHADER_STAGE_COMPUTE * 2),
-};
-
-typedef LocalVector<MTL::Resource *> ResourceVector;
-typedef HashMap<StageResourceUsage, ResourceVector> ResourceUsageMap;
-
-_FORCE_INLINE_ StageResourceUsage &operator|=(StageResourceUsage &p_a, uint32_t p_b) {
-	p_a = StageResourceUsage(uint32_t(p_a) | p_b);
-	return p_a;
-}
-
-_FORCE_INLINE_ StageResourceUsage stage_resource_usage(RDC::ShaderStage p_stage, MTL::ResourceUsage p_usage) {
-	return StageResourceUsage(p_usage << (p_stage * 2));
-}
-
-_FORCE_INLINE_ MTL::ResourceUsage resource_usage_for_stage(StageResourceUsage p_usage, RDC::ShaderStage p_stage) {
-	return MTL::ResourceUsage((p_usage >> (p_stage * 2)) & 0b11);
-}
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDUniformSet {
-public:
-	NS::SharedPtr<MTL::Buffer> arg_buffer;
-	Vector<uint8_t> arg_buffer_data; // Stored for dynamic uniform sets.
-	ResourceUsageMap usage_to_resources; // Used by Metal 3 for resource tracking.
-	Vector<RDD::BoundUniform> uniforms;
-};
-
-#pragma mark - Pipeline Types
-
-enum class MDPipelineType {
-	None,
-	Render,
-	Compute,
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDPipeline {
-public:
-	MDPipelineType type;
-
-	explicit MDPipeline(MDPipelineType p_type) :
-			type(p_type) {}
-	virtual ~MDPipeline() = default;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDRenderPipeline final : public MDPipeline {
-public:
-	NS::SharedPtr<MTL::RenderPipelineState> state;
-	NS::SharedPtr<MTL::DepthStencilState> depth_stencil;
-	uint32_t push_constant_size = 0;
-	uint32_t push_constant_stages_mask = 0;
-	SampleCount sample_count = SampleCount1;
-
-	struct {
-		MTL::CullMode cull_mode = MTL::CullModeNone;
-		MTL::TriangleFillMode fill_mode = MTL::TriangleFillModeFill;
-		MTL::DepthClipMode clip_mode = MTL::DepthClipModeClip;
-		MTL::Winding winding = MTL::WindingClockwise;
-		MTL::PrimitiveType render_primitive = MTL::PrimitiveTypePoint;
-
-		struct {
-			bool enabled = false;
-		} depth_test;
-
-		struct {
-			bool enabled = false;
-			float depth_bias = 0.0;
-			float slope_scale = 0.0;
-			float clamp = 0.0;
-
-			template <typename T>
-			_FORCE_INLINE_ void apply(T *p_enc) const {
-				if (!enabled) {
-					return;
-				}
-				p_enc->setDepthBias(depth_bias, slope_scale, clamp);
-			}
-		} depth_bias;
-
-		struct {
-			bool enabled = false;
-			uint32_t front_reference = 0;
-			uint32_t back_reference = 0;
-
-			template <typename T>
-			_FORCE_INLINE_ void apply(T *p_enc) const {
-				if (!enabled) {
-					return;
-				}
-				p_enc->setStencilReferenceValues(front_reference, back_reference);
-			}
-		} stencil;
-
-		struct {
-			bool enabled = false;
-			float r = 0.0;
-			float g = 0.0;
-			float b = 0.0;
-			float a = 0.0;
-
-			template <typename T>
-			_FORCE_INLINE_ void apply(T *p_enc) const {
-				p_enc->setBlendColor(r, g, b, a);
-			}
-		} blend;
-
-		template <typename T>
-		_FORCE_INLINE_ void apply(T *p_enc) const {
-			p_enc->setCullMode(cull_mode);
-			p_enc->setTriangleFillMode(fill_mode);
-			p_enc->setDepthClipMode(clip_mode);
-			p_enc->setFrontFacingWinding(winding);
-			depth_bias.apply(p_enc);
-			stencil.apply(p_enc);
-			blend.apply(p_enc);
-		}
-
-	} raster_state;
-
-	MDRenderShader *shader = nullptr;
-
-	MDRenderPipeline() :
-			MDPipeline(MDPipelineType::Render) {}
-	~MDRenderPipeline() final = default;
-};
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(2.0)) MDComputePipeline final : public MDPipeline {
-public:
-	NS::SharedPtr<MTL::ComputePipelineState> state;
-	struct {
-		MTL::Size local = {};
-	} compute_state;
-
-	MDComputeShader *shader = nullptr;
-
-	explicit MDComputePipeline(NS::SharedPtr<MTL::ComputePipelineState> p_state) :
-			MDPipeline(MDPipelineType::Compute), state(std::move(p_state)) {}
-	~MDComputePipeline() final = default;
-};
diff --git a/engine/drivers/metal/metal_utils.h b/engine/drivers/metal/metal_utils.h
index 5ad21c1f..54c35099 100644
--- a/engine/drivers/metal/metal_utils.h
+++ b/engine/drivers/metal/metal_utils.h
@@ -30,13 +30,9 @@
 
 #pragma once
 
-#include "core/error/error_macros.h"
+#import <os/log.h>
 
-#include <os/log.h>
-
-#include <cstdint>
-#include <functional>
-#include <type_traits>
+#import <functional>
 
 /// Godot limits the number of dynamic buffers to 8.
 ///
@@ -97,32 +93,19 @@ static constexpr uint64_t round_up_to_alignment(uint64_t p_value, uint64_t p_ali
 	return aligned_value;
 }
 
-template <typename F>
 class Defer {
 public:
-	explicit Defer(F &&f) :
-			func_(std::forward<F>(f)) {}
+	Defer(std::function<void()> func) :
+			func_(func) {}
 	~Defer() { func_(); }
 
-	// Non-copyable (correct RAII semantics)
-	Defer(const Defer &) = delete;
-	Defer &operator=(const Defer &) = delete;
-
-	// Movable
-	Defer(Defer &&) = default;
-	Defer &operator=(Defer &&) = default;
-
 private:
-	F func_;
+	std::function<void()> func_;
 };
 
-// C++17 class template argument deduction.
-template <typename F>
-Defer(F &&) -> Defer<std::decay_t<F>>;
-
 #define CONCAT_INTERNAL(x, y) x##y
 #define CONCAT(x, y) CONCAT_INTERNAL(x, y)
-#define DEFER const auto &CONCAT(defer__, __LINE__) = Defer
+#define DEFER const Defer &CONCAT(defer__, __LINE__) = Defer
 
 extern os_log_t LOG_DRIVER;
 // Used for dynamic tracing.
diff --git a/engine/drivers/metal/pixel_formats.h b/engine/drivers/metal/pixel_formats.h
index c45bdf96..04f1d935 100644
--- a/engine/drivers/metal/pixel_formats.h
+++ b/engine/drivers/metal/pixel_formats.h
@@ -54,22 +54,17 @@
 
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations")
 
-#include "drivers/metal/inflection_map.h"
-#include "drivers/metal/metal_device_properties.h"
-#include "servers/rendering/rendering_device_commons.h"
+#import "inflection_map.h"
+#import "metal_device_properties.h"
 
-#ifdef __OBJC__
-#include <Metal/Metal.h>
-#endif
-#include <Metal/Metal.hpp>
+#include "servers/rendering/rendering_device.h"
 
+#import <Metal/Metal.h>
 #include <iterator>
 
 #pragma mark -
 #pragma mark Metal format capabilities
 
-using RDC = RenderingDeviceCommons;
-
 typedef enum : uint16_t {
 
 	kMTLFmtCapsNone = 0,
@@ -193,19 +188,19 @@ struct Extent2D {
 };
 
 struct ComponentMapping {
-	RDC::TextureSwizzle r = RDC::TEXTURE_SWIZZLE_IDENTITY;
-	RDC::TextureSwizzle g = RDC::TEXTURE_SWIZZLE_IDENTITY;
-	RDC::TextureSwizzle b = RDC::TEXTURE_SWIZZLE_IDENTITY;
-	RDC::TextureSwizzle a = RDC::TEXTURE_SWIZZLE_IDENTITY;
+	RD::TextureSwizzle r = RD::TEXTURE_SWIZZLE_IDENTITY;
+	RD::TextureSwizzle g = RD::TEXTURE_SWIZZLE_IDENTITY;
+	RD::TextureSwizzle b = RD::TEXTURE_SWIZZLE_IDENTITY;
+	RD::TextureSwizzle a = RD::TEXTURE_SWIZZLE_IDENTITY;
 };
 
 /** Describes the properties of a DataFormat, including the corresponding Metal pixel and vertex format. */
 struct DataFormatDesc {
-	RDC::DataFormat dataFormat;
-	MTL::PixelFormat mtlPixelFormat;
-	MTL::PixelFormat mtlPixelFormatSubstitute;
-	MTL::VertexFormat mtlVertexFormat;
-	MTL::VertexFormat mtlVertexFormatSubstitute;
+	RD::DataFormat dataFormat;
+	MTLPixelFormat mtlPixelFormat;
+	MTLPixelFormat mtlPixelFormatSubstitute;
+	MTLVertexFormat mtlVertexFormat;
+	MTLVertexFormat mtlVertexFormatSubstitute;
 	uint8_t chromaSubsamplingPlaneCount;
 	uint8_t chromaSubsamplingComponentBits;
 	Extent2D blockTexelSize;
@@ -217,37 +212,37 @@ struct DataFormatDesc {
 
 	inline double bytesPerTexel() const { return (double)bytesPerBlock / (double)(blockTexelSize.width * blockTexelSize.height); }
 
-	inline bool isSupported() const { return (mtlPixelFormat != MTL::PixelFormatInvalid || chromaSubsamplingPlaneCount > 1); }
-	inline bool isSupportedOrSubstitutable() const { return isSupported() || (mtlPixelFormatSubstitute != MTL::PixelFormatInvalid); }
+	inline bool isSupported() const { return (mtlPixelFormat != MTLPixelFormatInvalid || chromaSubsamplingPlaneCount > 1); }
+	inline bool isSupportedOrSubstitutable() const { return isSupported() || (mtlPixelFormatSubstitute != MTLPixelFormatInvalid); }
 
-	inline bool vertexIsSupported() const { return (mtlVertexFormat != MTL::VertexFormatInvalid); }
-	inline bool vertexIsSupportedOrSubstitutable() const { return vertexIsSupported() || (mtlVertexFormatSubstitute != MTL::VertexFormatInvalid); }
+	inline bool vertexIsSupported() const { return (mtlVertexFormat != MTLVertexFormatInvalid); }
+	inline bool vertexIsSupportedOrSubstitutable() const { return vertexIsSupported() || (mtlVertexFormatSubstitute != MTLVertexFormatInvalid); }
 
 	bool needsSwizzle() const {
-		return (componentMapping.r != RDC::TEXTURE_SWIZZLE_IDENTITY ||
-				componentMapping.g != RDC::TEXTURE_SWIZZLE_IDENTITY ||
-				componentMapping.b != RDC::TEXTURE_SWIZZLE_IDENTITY ||
-				componentMapping.a != RDC::TEXTURE_SWIZZLE_IDENTITY);
+		return (componentMapping.r != RD::TEXTURE_SWIZZLE_IDENTITY ||
+				componentMapping.g != RD::TEXTURE_SWIZZLE_IDENTITY ||
+				componentMapping.b != RD::TEXTURE_SWIZZLE_IDENTITY ||
+				componentMapping.a != RD::TEXTURE_SWIZZLE_IDENTITY);
 	}
 };
 
-/** Describes the properties of a MTL::PixelFormat or MTL::VertexFormat. */
+/** Describes the properties of a MTLPixelFormat or MTLVertexFormat. */
 struct MTLFormatDesc {
 	union {
-		MTL::PixelFormat mtlPixelFormat;
-		MTL::VertexFormat mtlVertexFormat;
+		MTLPixelFormat mtlPixelFormat;
+		MTLVertexFormat mtlVertexFormat;
 	};
-	RDC::DataFormat dataFormat = RDC::DATA_FORMAT_MAX;
+	RD::DataFormat dataFormat = RD::DATA_FORMAT_MAX;
 	MTLFmtCaps mtlFmtCaps;
 	MTLViewClass mtlViewClass;
-	MTL::PixelFormat mtlPixelFormatLinear;
+	MTLPixelFormat mtlPixelFormatLinear;
 	const char *name = nullptr;
 
-	inline bool isSupported() const { return (mtlPixelFormat != MTL::PixelFormatInvalid) && (mtlFmtCaps != kMTLFmtCapsNone); }
+	inline bool isSupported() const { return (mtlPixelFormat != MTLPixelFormatInvalid) && (mtlFmtCaps != kMTLFmtCapsNone); }
 };
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) PixelFormats {
-	using DataFormat = RDC::DataFormat;
+	using DataFormat = RD::DataFormat;
 
 public:
 	/** Returns whether the DataFormat is supported by the GPU bound to this instance. */
@@ -256,14 +251,14 @@ public:
 	/** Returns whether the DataFormat is supported by this implementation, or can be substituted by one that is. */
 	bool isSupportedOrSubstitutable(DataFormat p_format);
 
-	/** Returns whether the specified Metal MTL::PixelFormat can be used as a depth format. */
-	_FORCE_INLINE_ bool isDepthFormat(MTL::PixelFormat p_format) {
+	/** Returns whether the specified Metal MTLPixelFormat can be used as a depth format. */
+	_FORCE_INLINE_ bool isDepthFormat(MTLPixelFormat p_format) {
 		switch (p_format) {
-			case MTL::PixelFormatDepth32Float:
-			case MTL::PixelFormatDepth16Unorm:
-			case MTL::PixelFormatDepth32Float_Stencil8:
+			case MTLPixelFormatDepth32Float:
+			case MTLPixelFormatDepth16Unorm:
+			case MTLPixelFormatDepth32Float_Stencil8:
 #if TARGET_OS_OSX
-			case MTL::PixelFormatDepth24Unorm_Stencil8:
+			case MTLPixelFormatDepth24Unorm_Stencil8:
 #endif
 				return true;
 			default:
@@ -271,42 +266,42 @@ public:
 		}
 	}
 
-	/** Returns whether the specified Metal MTL::PixelFormat can be used as a stencil format. */
-	_FORCE_INLINE_ bool isStencilFormat(MTL::PixelFormat p_format) {
+	/** Returns whether the specified Metal MTLPixelFormat can be used as a stencil format. */
+	_FORCE_INLINE_ bool isStencilFormat(MTLPixelFormat p_format) {
 		switch (p_format) {
-			case MTL::PixelFormatStencil8:
+			case MTLPixelFormatStencil8:
 #if TARGET_OS_OSX
-			case MTL::PixelFormatDepth24Unorm_Stencil8:
-			case MTL::PixelFormatX24_Stencil8:
+			case MTLPixelFormatDepth24Unorm_Stencil8:
+			case MTLPixelFormatX24_Stencil8:
 #endif
-			case MTL::PixelFormatDepth32Float_Stencil8:
-			case MTL::PixelFormatX32_Stencil8:
+			case MTLPixelFormatDepth32Float_Stencil8:
+			case MTLPixelFormatX32_Stencil8:
 				return true;
 			default:
 				return false;
 		}
 	}
 
-	/** Returns whether the specified Metal MTL::PixelFormat is a PVRTC format. */
-	bool isPVRTCFormat(MTL::PixelFormat p_format);
+	/** Returns whether the specified Metal MTLPixelFormat is a PVRTC format. */
+	bool isPVRTCFormat(MTLPixelFormat p_format);
 
 	/** Returns the format type corresponding to the specified Godot pixel format, */
 	MTLFormatType getFormatType(DataFormat p_format);
 
-	/** Returns the format type corresponding to the specified Metal MTL::PixelFormat, */
-	MTLFormatType getFormatType(MTL::PixelFormat p_format);
+	/** Returns the format type corresponding to the specified Metal MTLPixelFormat, */
+	MTLFormatType getFormatType(MTLPixelFormat p_format);
 
 	/**
-	 * Returns the Metal MTL::PixelFormat corresponding to the specified Godot pixel
-	 * or returns MTL::PixelFormatInvalid if no corresponding MTL::PixelFormat exists.
+	 * Returns the Metal MTLPixelFormat corresponding to the specified Godot pixel
+	 * or returns MTLPixelFormatInvalid if no corresponding MTLPixelFormat exists.
 	 */
-	MTL::PixelFormat getMTLPixelFormat(DataFormat p_format);
+	MTLPixelFormat getMTLPixelFormat(DataFormat p_format);
 
 	/**
-	 * Returns the DataFormat corresponding to the specified Metal MTL::PixelFormat,
+	 * Returns the DataFormat corresponding to the specified Metal MTLPixelFormat,
 	 * or returns DATA_FORMAT_MAX if no corresponding DataFormat exists.
 	 */
-	DataFormat getDataFormat(MTL::PixelFormat p_format);
+	DataFormat getDataFormat(MTLPixelFormat p_format);
 
 	/**
 	 * Returns the size, in bytes, of a texel block of the specified Godot pixel.
@@ -318,7 +313,7 @@ public:
 	 * Returns the size, in bytes, of a texel block of the specified Metal format.
 	 * For uncompressed formats, the returned value corresponds to the size in bytes of a single texel.
 	 */
-	uint32_t getBytesPerBlock(MTL::PixelFormat p_format);
+	uint32_t getBytesPerBlock(MTLPixelFormat p_format);
 
 	/** Returns the number of planes of the specified chroma-subsampling (YCbCr) DataFormat */
 	uint8_t getChromaSubsamplingPlaneCount(DataFormat p_format);
@@ -336,7 +331,7 @@ public:
 	 * Returns the size, in bytes, of a texel of the specified Metal format.
 	 * The returned value may be fractional for certain compressed formats.
 	 */
-	float getBytesPerTexel(MTL::PixelFormat p_format);
+	float getBytesPerTexel(MTLPixelFormat p_format);
 
 	/**
 	 * Returns the size, in bytes, of a row of texels of the specified Godot pixel format.
@@ -354,7 +349,7 @@ public:
 	 * and texelsPerRow should specify the width in texels, not blocks. The result is rounded
 	 * up if texelsPerRow is not an integer multiple of the compression block width.
 	 */
-	size_t getBytesPerRow(MTL::PixelFormat p_format, uint32_t p_texels_per_row);
+	size_t getBytesPerRow(MTLPixelFormat p_format, uint32_t p_texels_per_row);
 
 	/**
 	 * Returns the size, in bytes, of a texture layer of the specified Godot pixel format.
@@ -371,7 +366,7 @@ public:
 	 * and p_texel_rows_per_layer should specify the height in texels, not blocks. The result is
 	 * rounded up if p_texel_rows_per_layer is not an integer multiple of the compression block height.
 	 */
-	size_t getBytesPerLayer(MTL::PixelFormat p_format, size_t p_bytes_per_row, uint32_t p_texel_rows_per_layer);
+	size_t getBytesPerLayer(MTLPixelFormat p_format, size_t p_bytes_per_row, uint32_t p_texel_rows_per_layer);
 
 	/** Returns whether or not the specified Godot format requires swizzling to use with Metal. */
 	bool needsSwizzle(DataFormat p_format);
@@ -380,38 +375,37 @@ public:
 	MTLFmtCaps getCapabilities(DataFormat p_format, bool p_extended = false);
 
 	/** Returns the Metal format capabilities supported by the specified Metal format. */
-	MTLFmtCaps getCapabilities(MTL::PixelFormat p_format, bool p_extended = false);
+	MTLFmtCaps getCapabilities(MTLPixelFormat p_format, bool p_extended = false);
 
 	/**
-	 * Returns the Metal MTL::VertexFormat corresponding to the specified
+	 * Returns the Metal MTLVertexFormat corresponding to the specified
 	 * DataFormat as used as a vertex attribute format.
 	 */
-	MTL::VertexFormat getMTLVertexFormat(DataFormat p_format);
+	MTLVertexFormat getMTLVertexFormat(DataFormat p_format);
 
 #pragma mark Construction
 
-	explicit PixelFormats(MTL::Device *p_device, const MetalFeatures &p_feat);
-	~PixelFormats();
+	explicit PixelFormats(id<MTLDevice> p_device, const MetalFeatures &p_feat);
 
 protected:
 	DataFormatDesc &getDataFormatDesc(DataFormat p_format);
-	DataFormatDesc &getDataFormatDesc(MTL::PixelFormat p_format);
-	MTLFormatDesc &getMTLPixelFormatDesc(MTL::PixelFormat p_format);
-	MTLFmtCaps &getMTLPixelFormatCapsIf(MTL::PixelFormat mtlPixFmt, bool cond);
-	MTLFormatDesc &getMTLVertexFormatDesc(MTL::VertexFormat p_format);
+	DataFormatDesc &getDataFormatDesc(MTLPixelFormat p_format);
+	MTLFormatDesc &getMTLPixelFormatDesc(MTLPixelFormat p_format);
+	MTLFmtCaps &getMTLPixelFormatCapsIf(MTLPixelFormat mtlPixFmt, bool cond);
+	MTLFormatDesc &getMTLVertexFormatDesc(MTLVertexFormat p_format);
 
 	void initDataFormatCapabilities();
 	void initMTLPixelFormatCapabilities();
 	void initMTLVertexFormatCapabilities(const MetalFeatures &p_feat);
 	void modifyMTLFormatCapabilities(const MetalFeatures &p_feat);
 	void buildDFFormatMaps();
-	void addMTLPixelFormatDescImpl(MTL::PixelFormat p_pix_fmt, MTL::PixelFormat p_pix_fmt_linear,
+	void addMTLPixelFormatDescImpl(MTLPixelFormat p_pix_fmt, MTLPixelFormat p_pix_fmt_linear,
 			MTLViewClass p_view_class, MTLFmtCaps p_fmt_caps, const char *p_name);
-	void addMTLVertexFormatDescImpl(MTL::VertexFormat p_vert_fmt, MTLFmtCaps p_vert_caps, const char *name);
+	void addMTLVertexFormatDescImpl(MTLVertexFormat p_vert_fmt, MTLFmtCaps p_vert_caps, const char *name);
 
-	MTL::Device *device;
-	InflectionMap<DataFormat, DataFormatDesc, RDC::DATA_FORMAT_MAX> _data_format_descs;
-	InflectionMap<uint16_t, MTLFormatDesc, MTL::PixelFormatX32_Stencil8 + 2> _mtl_pixel_format_descs; // The actual last enum value is not available on iOS.
+	id<MTLDevice> device;
+	InflectionMap<DataFormat, DataFormatDesc, RD::DATA_FORMAT_MAX> _data_format_descs;
+	InflectionMap<uint16_t, MTLFormatDesc, MTLPixelFormatX32_Stencil8 + 2> _mtl_pixel_format_descs; // The actual last enum value is not available on iOS.
 	TightLocalVector<MTLFormatDesc> _mtl_vertex_format_descs;
 };
 
diff --git a/engine/drivers/metal/pixel_formats.cpp b/engine/drivers/metal/pixel_formats.mm
similarity index 86%
rename from engine/drivers/metal/pixel_formats.cpp
rename to engine/drivers/metal/pixel_formats.mm
index 0c64ac0c..f781d320 100644
--- a/engine/drivers/metal/pixel_formats.cpp
+++ b/engine/drivers/metal/pixel_formats.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  pixel_formats.cpp                                                     */
+/*  pixel_formats.mm                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -48,53 +48,53 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#include "pixel_formats.h"
+#import "pixel_formats.h"
 
-#include "drivers/metal/metal_utils.h"
+#import "metal_utils.h"
 
 #if TARGET_OS_IPHONE || TARGET_OS_TV
 #if !(__IPHONE_OS_VERSION_MAX_ALLOWED >= 160400) // iOS/tvOS 16.4
-#define PixelFormatBC1_RGBA PixelFormatInvalid
-#define PixelFormatBC1_RGBA_sRGB PixelFormatInvalid
-#define PixelFormatBC2_RGBA PixelFormatInvalid
-#define PixelFormatBC2_RGBA_sRGB PixelFormatInvalid
-#define PixelFormatBC3_RGBA PixelFormatInvalid
-#define PixelFormatBC3_RGBA_sRGB PixelFormatInvalid
-#define PixelFormatBC4_RUnorm PixelFormatInvalid
-#define PixelFormatBC4_RSnorm PixelFormatInvalid
-#define PixelFormatBC5_RGUnorm PixelFormatInvalid
-#define PixelFormatBC5_RGSnorm PixelFormatInvalid
-#define PixelFormatBC6H_RGBUfloat PixelFormatInvalid
-#define PixelFormatBC6H_RGBFloat PixelFormatInvalid
-#define PixelFormatBC7_RGBAUnorm PixelFormatInvalid
-#define PixelFormatBC7_RGBAUnorm_sRGB PixelFormatInvalid
+#define MTLPixelFormatBC1_RGBA MTLPixelFormatInvalid
+#define MTLPixelFormatBC1_RGBA_sRGB MTLPixelFormatInvalid
+#define MTLPixelFormatBC2_RGBA MTLPixelFormatInvalid
+#define MTLPixelFormatBC2_RGBA_sRGB MTLPixelFormatInvalid
+#define MTLPixelFormatBC3_RGBA MTLPixelFormatInvalid
+#define MTLPixelFormatBC3_RGBA_sRGB MTLPixelFormatInvalid
+#define MTLPixelFormatBC4_RUnorm MTLPixelFormatInvalid
+#define MTLPixelFormatBC4_RSnorm MTLPixelFormatInvalid
+#define MTLPixelFormatBC5_RGUnorm MTLPixelFormatInvalid
+#define MTLPixelFormatBC5_RGSnorm MTLPixelFormatInvalid
+#define MTLPixelFormatBC6H_RGBUfloat MTLPixelFormatInvalid
+#define MTLPixelFormatBC6H_RGBFloat MTLPixelFormatInvalid
+#define MTLPixelFormatBC7_RGBAUnorm MTLPixelFormatInvalid
+#define MTLPixelFormatBC7_RGBAUnorm_sRGB MTLPixelFormatInvalid
 #endif
 
-#define PixelFormatDepth16Unorm_Stencil8 PixelFormatDepth32Float_Stencil8
-#define PixelFormatDepth24Unorm_Stencil8 PixelFormatInvalid
-#define PixelFormatX24_Stencil8 PixelFormatInvalid
+#define MTLPixelFormatDepth16Unorm_Stencil8 MTLPixelFormatDepth32Float_Stencil8
+#define MTLPixelFormatDepth24Unorm_Stencil8 MTLPixelFormatInvalid
+#define MTLPixelFormatX24_Stencil8 MTLPixelFormatInvalid
 #endif
 
 #if TARGET_OS_TV
-#define PixelFormatASTC_4x4_HDR PixelFormatInvalid
-#define PixelFormatASTC_5x4_HDR PixelFormatInvalid
-#define PixelFormatASTC_5x5_HDR PixelFormatInvalid
-#define PixelFormatASTC_6x5_HDR PixelFormatInvalid
-#define PixelFormatASTC_6x6_HDR PixelFormatInvalid
-#define PixelFormatASTC_8x5_HDR PixelFormatInvalid
-#define PixelFormatASTC_8x6_HDR PixelFormatInvalid
-#define PixelFormatASTC_8x8_HDR PixelFormatInvalid
-#define PixelFormatASTC_10x5_HDR PixelFormatInvalid
-#define PixelFormatASTC_10x6_HDR PixelFormatInvalid
-#define PixelFormatASTC_10x8_HDR PixelFormatInvalid
-#define PixelFormatASTC_10x10_HDR PixelFormatInvalid
-#define PixelFormatASTC_12x10_HDR PixelFormatInvalid
-#define PixelFormatASTC_12x12_HDR PixelFormatInvalid
+#define MTLPixelFormatASTC_4x4_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_5x4_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_5x5_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_6x5_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_6x6_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_8x5_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_8x6_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_8x8_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_10x5_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_10x6_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_10x8_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_10x10_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_12x10_HDR MTLPixelFormatInvalid
+#define MTLPixelFormatASTC_12x12_HDR MTLPixelFormatInvalid
 #endif
 
 #if !((__MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) || (__IPHONE_OS_VERSION_MAX_ALLOWED >= 170000)) // Xcode 15
-#define VertexFormatFloatRG11B10 VertexFormatInvalid
-#define VertexFormatFloatRGB9E5 VertexFormatInvalid
+#define MTLVertexFormatFloatRG11B10 MTLVertexFormatInvalid
+#define MTLVertexFormatFloatRGB9E5 MTLVertexFormatInvalid
 #endif
 
 template <typename T>
@@ -113,21 +113,21 @@ bool PixelFormats::isSupportedOrSubstitutable(DataFormat p_format) {
 	return getDataFormatDesc(p_format).isSupportedOrSubstitutable();
 }
 
-bool PixelFormats::isPVRTCFormat(MTL::PixelFormat p_format) {
+bool PixelFormats::isPVRTCFormat(MTLPixelFormat p_format) {
 #if defined(VISIONOS_ENABLED)
 	return false;
 #else
 	// Deprecated in SDK 26.0
 	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations")
 	switch (p_format) {
-		case MTL::PixelFormatPVRTC_RGBA_2BPP:
-		case MTL::PixelFormatPVRTC_RGBA_2BPP_sRGB:
-		case MTL::PixelFormatPVRTC_RGBA_4BPP:
-		case MTL::PixelFormatPVRTC_RGBA_4BPP_sRGB:
-		case MTL::PixelFormatPVRTC_RGB_2BPP:
-		case MTL::PixelFormatPVRTC_RGB_2BPP_sRGB:
-		case MTL::PixelFormatPVRTC_RGB_4BPP:
-		case MTL::PixelFormatPVRTC_RGB_4BPP_sRGB:
+		case MTLPixelFormatPVRTC_RGBA_2BPP:
+		case MTLPixelFormatPVRTC_RGBA_2BPP_sRGB:
+		case MTLPixelFormatPVRTC_RGBA_4BPP:
+		case MTLPixelFormatPVRTC_RGBA_4BPP_sRGB:
+		case MTLPixelFormatPVRTC_RGB_2BPP:
+		case MTLPixelFormatPVRTC_RGB_2BPP_sRGB:
+		case MTLPixelFormatPVRTC_RGB_4BPP:
+		case MTLPixelFormatPVRTC_RGB_4BPP_sRGB:
 			return true;
 		default:
 			return false;
@@ -140,24 +140,24 @@ MTLFormatType PixelFormats::getFormatType(DataFormat p_format) {
 	return getDataFormatDesc(p_format).formatType;
 }
 
-MTLFormatType PixelFormats::getFormatType(MTL::PixelFormat p_format) {
+MTLFormatType PixelFormats::getFormatType(MTLPixelFormat p_format) {
 	return getDataFormatDesc(p_format).formatType;
 }
 
-MTL::PixelFormat PixelFormats::getMTLPixelFormat(DataFormat p_format) {
+MTLPixelFormat PixelFormats::getMTLPixelFormat(DataFormat p_format) {
 	DataFormatDesc &dfDesc = getDataFormatDesc(p_format);
-	MTL::PixelFormat mtlPixFmt = dfDesc.mtlPixelFormat;
+	MTLPixelFormat mtlPixFmt = dfDesc.mtlPixelFormat;
 
-	// If the MTL::PixelFormat is not supported but DataFormat is valid,
+	// If the MTLPixelFormat is not supported but DataFormat is valid,
 	// attempt to substitute a different format.
-	if (mtlPixFmt == MTL::PixelFormatInvalid && p_format != RDC::DATA_FORMAT_MAX && dfDesc.chromaSubsamplingPlaneCount <= 1) {
+	if (mtlPixFmt == MTLPixelFormatInvalid && p_format != RD::DATA_FORMAT_MAX && dfDesc.chromaSubsamplingPlaneCount <= 1) {
 		mtlPixFmt = dfDesc.mtlPixelFormatSubstitute;
 	}
 
 	return mtlPixFmt;
 }
 
-RDC::DataFormat PixelFormats::getDataFormat(MTL::PixelFormat p_format) {
+RD::DataFormat PixelFormats::getDataFormat(MTLPixelFormat p_format) {
 	return getMTLPixelFormatDesc(p_format).dataFormat;
 }
 
@@ -165,7 +165,7 @@ uint32_t PixelFormats::getBytesPerBlock(DataFormat p_format) {
 	return getDataFormatDesc(p_format).bytesPerBlock;
 }
 
-uint32_t PixelFormats::getBytesPerBlock(MTL::PixelFormat p_format) {
+uint32_t PixelFormats::getBytesPerBlock(MTLPixelFormat p_format) {
 	return getDataFormatDesc(p_format).bytesPerBlock;
 }
 
@@ -181,7 +181,7 @@ float PixelFormats::getBytesPerTexel(DataFormat p_format) {
 	return getDataFormatDesc(p_format).bytesPerTexel();
 }
 
-float PixelFormats::getBytesPerTexel(MTL::PixelFormat p_format) {
+float PixelFormats::getBytesPerTexel(MTLPixelFormat p_format) {
 	return getDataFormatDesc(p_format).bytesPerTexel();
 }
 
@@ -190,7 +190,7 @@ size_t PixelFormats::getBytesPerRow(DataFormat p_format, uint32_t p_texels_per_r
 	return Math::division_round_up(p_texels_per_row, dfDesc.blockTexelSize.width) * dfDesc.bytesPerBlock;
 }
 
-size_t PixelFormats::getBytesPerRow(MTL::PixelFormat p_format, uint32_t p_texels_per_row) {
+size_t PixelFormats::getBytesPerRow(MTLPixelFormat p_format, uint32_t p_texels_per_row) {
 	DataFormatDesc &dfDesc = getDataFormatDesc(p_format);
 	return Math::division_round_up(p_texels_per_row, dfDesc.blockTexelSize.width) * dfDesc.bytesPerBlock;
 }
@@ -199,7 +199,7 @@ size_t PixelFormats::getBytesPerLayer(DataFormat p_format, size_t p_bytes_per_ro
 	return Math::division_round_up(p_texel_rows_per_layer, getDataFormatDesc(p_format).blockTexelSize.height) * p_bytes_per_row;
 }
 
-size_t PixelFormats::getBytesPerLayer(MTL::PixelFormat p_format, size_t p_bytes_per_row, uint32_t p_texel_rows_per_layer) {
+size_t PixelFormats::getBytesPerLayer(MTLPixelFormat p_format, size_t p_bytes_per_row, uint32_t p_texel_rows_per_layer) {
 	return Math::division_round_up(p_texel_rows_per_layer, getDataFormatDesc(p_format).blockTexelSize.height) * p_bytes_per_row;
 }
 
@@ -211,7 +211,7 @@ MTLFmtCaps PixelFormats::getCapabilities(DataFormat p_format, bool p_extended) {
 	return getCapabilities(getDataFormatDesc(p_format).mtlPixelFormat, p_extended);
 }
 
-MTLFmtCaps PixelFormats::getCapabilities(MTL::PixelFormat p_format, bool p_extended) {
+MTLFmtCaps PixelFormats::getCapabilities(MTLPixelFormat p_format, bool p_extended) {
 	MTLFormatDesc &mtlDesc = getMTLPixelFormatDesc(p_format);
 	MTLFmtCaps caps = mtlDesc.mtlFmtCaps;
 	if (!p_extended || mtlDesc.mtlViewClass == MTLViewClass::None) {
@@ -226,11 +226,11 @@ MTLFmtCaps PixelFormats::getCapabilities(MTL::PixelFormat p_format, bool p_exten
 	return caps;
 }
 
-MTL::VertexFormat PixelFormats::getMTLVertexFormat(DataFormat p_format) {
+MTLVertexFormat PixelFormats::getMTLVertexFormat(DataFormat p_format) {
 	DataFormatDesc &dfDesc = getDataFormatDesc(p_format);
-	MTL::VertexFormat format = dfDesc.mtlVertexFormat;
+	MTLVertexFormat format = dfDesc.mtlVertexFormat;
 
-	if (format == MTL::VertexFormatInvalid) {
+	if (format == MTLVertexFormatInvalid) {
 		String errMsg;
 		errMsg += "DataFormat ";
 		errMsg += dfDesc.name;
@@ -254,22 +254,22 @@ DataFormatDesc &PixelFormats::getDataFormatDesc(DataFormat p_format) {
 	return _data_format_descs[p_format];
 }
 
-DataFormatDesc &PixelFormats::getDataFormatDesc(MTL::PixelFormat p_format) {
+DataFormatDesc &PixelFormats::getDataFormatDesc(MTLPixelFormat p_format) {
 	return getDataFormatDesc(getMTLPixelFormatDesc(p_format).dataFormat);
 }
 
-// Return a reference to the Metal format descriptor corresponding to the MTL::PixelFormat.
-MTLFormatDesc &PixelFormats::getMTLPixelFormatDesc(MTL::PixelFormat p_format) {
+// Return a reference to the Metal format descriptor corresponding to the MTLPixelFormat.
+MTLFormatDesc &PixelFormats::getMTLPixelFormatDesc(MTLPixelFormat p_format) {
 	return _mtl_pixel_format_descs[p_format];
 }
 
-// Return a reference to the Metal format descriptor corresponding to the MTL::VertexFormat.
-MTLFormatDesc &PixelFormats::getMTLVertexFormatDesc(MTL::VertexFormat p_format) {
+// Return a reference to the Metal format descriptor corresponding to the MTLVertexFormat.
+MTLFormatDesc &PixelFormats::getMTLVertexFormatDesc(MTLVertexFormat p_format) {
 	return _mtl_vertex_format_descs[p_format];
 }
 
-PixelFormats::PixelFormats(MTL::Device *p_device, const MetalFeatures &p_feat) :
-		device(p_device->retain()) {
+PixelFormats::PixelFormats(id<MTLDevice> p_device, const MetalFeatures &p_feat) :
+		device(p_device) {
 	initMTLPixelFormatCapabilities();
 	initMTLVertexFormatCapabilities(p_feat);
 	modifyMTLFormatCapabilities(p_feat);
@@ -278,15 +278,11 @@ PixelFormats::PixelFormats(MTL::Device *p_device, const MetalFeatures &p_feat) :
 	buildDFFormatMaps();
 }
 
-PixelFormats::~PixelFormats() {
-	device->release();
-}
-
 #define addDataFormatDescFull(DATA_FMT, MTL_FMT, MTL_FMT_ALT, MTL_VTX_FMT, MTL_VTX_FMT_ALT, CSPC, CSCB, BLK_W, BLK_H, BLK_BYTE_CNT, MVK_FMT_TYPE, SWIZ_R, SWIZ_G, SWIZ_B, SWIZ_A) \
-	dfFmt = RDC::DATA_FORMAT_##DATA_FMT; \
-	_data_format_descs[dfFmt] = { dfFmt, MTL::PixelFormat##MTL_FMT, MTL::PixelFormat##MTL_FMT_ALT, MTL::VertexFormat##MTL_VTX_FMT, MTL::VertexFormat##MTL_VTX_FMT_ALT, \
-		CSPC, CSCB, { BLK_W, BLK_H }, BLK_BYTE_CNT, MTLFormatType::MVK_FMT_TYPE, \
-		{ RDC::TEXTURE_SWIZZLE_##SWIZ_R, RDC::TEXTURE_SWIZZLE_##SWIZ_G, RDC::TEXTURE_SWIZZLE_##SWIZ_B, RDC::TEXTURE_SWIZZLE_##SWIZ_A }, \
+	dfFmt = RD::DATA_FORMAT_##DATA_FMT;                                                                                                                                           \
+	_data_format_descs[dfFmt] = { dfFmt, MTLPixelFormat##MTL_FMT, MTLPixelFormat##MTL_FMT_ALT, MTLVertexFormat##MTL_VTX_FMT, MTLVertexFormat##MTL_VTX_FMT_ALT,                    \
+		CSPC, CSCB, { BLK_W, BLK_H }, BLK_BYTE_CNT, MTLFormatType::MVK_FMT_TYPE,                                                                                                  \
+		{ RD::TEXTURE_SWIZZLE_##SWIZ_R, RD::TEXTURE_SWIZZLE_##SWIZ_G, RD::TEXTURE_SWIZZLE_##SWIZ_B, RD::TEXTURE_SWIZZLE_##SWIZ_A },                                               \
 		"DATA_FORMAT_" #DATA_FMT, false }
 
 #define addDataFormatDesc(VK_FMT, MTL_FMT, MTL_FMT_ALT, MTL_VTX_FMT, MTL_VTX_FMT_ALT, BLK_W, BLK_H, BLK_BYTE_CNT, MVK_FMT_TYPE) \
@@ -299,7 +295,7 @@ PixelFormats::~PixelFormats() {
 	addDataFormatDescFull(DATA_FMT, MTL_FMT, Invalid, Invalid, Invalid, CSPC, CSCB, BLK_W, BLK_H, BLK_BYTE_CNT, ColorFloat, IDENTITY, IDENTITY, IDENTITY, IDENTITY)
 
 void PixelFormats::initDataFormatCapabilities() {
-	_data_format_descs.reserve(RDC::DATA_FORMAT_MAX + 1); // reserve enough space to avoid reallocs
+	_data_format_descs.reserve(RD::DATA_FORMAT_MAX + 1); // reserve enough space to avoid reallocs
 	DataFormat dfFmt;
 
 	addDataFormatDesc(R4G4_UNORM_PACK8, Invalid, Invalid, Invalid, Invalid, 1, 1, 1, ColorFloat);
@@ -581,33 +577,33 @@ void PixelFormats::initDataFormatCapabilities() {
 	addDfFormatDescChromaSubsampling(G16_B16_R16_3PLANE_444_UNORM, Invalid, 3, 16, 1, 1, 6);
 }
 
-void PixelFormats::addMTLPixelFormatDescImpl(MTL::PixelFormat p_pix_fmt, MTL::PixelFormat p_pix_fmt_linear,
+void PixelFormats::addMTLPixelFormatDescImpl(MTLPixelFormat p_pix_fmt, MTLPixelFormat p_pix_fmt_linear,
 		MTLViewClass p_view_class, MTLFmtCaps p_fmt_caps, const char *p_name) {
 	_mtl_pixel_format_descs[p_pix_fmt] = { .mtlPixelFormat = p_pix_fmt, .dataFormat = DataFormat::DATA_FORMAT_MAX, .mtlFmtCaps = p_fmt_caps, .mtlViewClass = p_view_class, .mtlPixelFormatLinear = p_pix_fmt_linear, .name = p_name };
 }
 
-#define addMTLPixelFormatDescFull(mtlFmt, mtlFmtLinear, viewClass, appleGPUCaps) \
-	addMTLPixelFormatDescImpl(MTL::PixelFormat##mtlFmt, MTL::PixelFormat##mtlFmtLinear, MTLViewClass::viewClass, \
-			appleGPUCaps, "MTL::PixelFormat" #mtlFmt)
+#define addMTLPixelFormatDescFull(mtlFmt, mtlFmtLinear, viewClass, appleGPUCaps)                             \
+	addMTLPixelFormatDescImpl(MTLPixelFormat##mtlFmt, MTLPixelFormat##mtlFmtLinear, MTLViewClass::viewClass, \
+			appleGPUCaps, "MTLPixelFormat" #mtlFmt)
 
 #define addMTLPixelFormatDesc(mtlFmt, viewClass, appleGPUCaps) \
 	addMTLPixelFormatDescFull(mtlFmt, mtlFmt, viewClass, kMTLFmtCaps##appleGPUCaps)
 
-#define addMTLPixelFormatDescSRGB(mtlFmt, viewClass, appleGPUCaps, mtlFmtLinear) \
-	/* Cannot write to sRGB textures in the simulator */ \
-	if (TARGET_OS_SIMULATOR) { \
-		MTLFmtCaps appleFmtCaps = kMTLFmtCaps##appleGPUCaps; \
-		flags::clear(appleFmtCaps, kMTLFmtCapsWrite); \
-		addMTLPixelFormatDescFull(mtlFmt, mtlFmtLinear, viewClass, appleFmtCaps); \
-	} else { \
+#define addMTLPixelFormatDescSRGB(mtlFmt, viewClass, appleGPUCaps, mtlFmtLinear)               \
+	/* Cannot write to sRGB textures in the simulator */                                       \
+	if (TARGET_OS_SIMULATOR) {                                                                 \
+		MTLFmtCaps appleFmtCaps = kMTLFmtCaps##appleGPUCaps;                                   \
+		flags::clear(appleFmtCaps, kMTLFmtCapsWrite);                                          \
+		addMTLPixelFormatDescFull(mtlFmt, mtlFmtLinear, viewClass, appleFmtCaps);              \
+	} else {                                                                                   \
 		addMTLPixelFormatDescFull(mtlFmt, mtlFmtLinear, viewClass, kMTLFmtCaps##appleGPUCaps); \
 	}
 
 void PixelFormats::initMTLPixelFormatCapabilities() {
 	_mtl_pixel_format_descs.reserve(1024);
 
-	// MTL::PixelFormatInvalid must come first. Use addMTLPixelFormatDescImpl to avoid guard code.
-	addMTLPixelFormatDescImpl(MTL::PixelFormatInvalid, MTL::PixelFormatInvalid, MTLViewClass::None, kMTLFmtCapsNone, "MTL::PixelFormatInvalid");
+	// MTLPixelFormatInvalid must come first. Use addMTLPixelFormatDescImpl to avoid guard code.
+	addMTLPixelFormatDescImpl(MTLPixelFormatInvalid, MTLPixelFormatInvalid, MTLViewClass::None, kMTLFmtCapsNone, "MTLPixelFormatInvalid");
 
 	// Ordinary 8-bit pixel formats.
 	addMTLPixelFormatDesc(A8Unorm, Color8, All);
@@ -783,23 +779,23 @@ void PixelFormats::initMTLPixelFormatCapabilities() {
 }
 
 // If necessary, resize vector with empty elements.
-void PixelFormats::addMTLVertexFormatDescImpl(MTL::VertexFormat mtlVtxFmt, MTLFmtCaps vtxCap, const char *name) {
+void PixelFormats::addMTLVertexFormatDescImpl(MTLVertexFormat mtlVtxFmt, MTLFmtCaps vtxCap, const char *name) {
 	if (mtlVtxFmt >= _mtl_vertex_format_descs.size()) {
 		_mtl_vertex_format_descs.resize(mtlVtxFmt + 1);
 	}
-	_mtl_vertex_format_descs[mtlVtxFmt] = { .mtlVertexFormat = mtlVtxFmt, .dataFormat = RDC::DATA_FORMAT_MAX, .mtlFmtCaps = vtxCap, .mtlViewClass = MTLViewClass::None, .mtlPixelFormatLinear = MTL::PixelFormatInvalid, .name = name };
+	_mtl_vertex_format_descs[mtlVtxFmt] = { .mtlVertexFormat = mtlVtxFmt, .dataFormat = RD::DATA_FORMAT_MAX, .mtlFmtCaps = vtxCap, .mtlViewClass = MTLViewClass::None, .mtlPixelFormatLinear = MTLPixelFormatInvalid, .name = name };
 }
 
-// Check mtlVtx exists on platform, to avoid overwriting the MTL::VertexFormatInvalid entry.
-#define addMTLVertexFormatDesc(mtlVtx) \
-	if (MTL::VertexFormat##mtlVtx) { \
-		addMTLVertexFormatDescImpl(MTL::VertexFormat##mtlVtx, kMTLFmtCapsVertex, "MTL::VertexFormat" #mtlVtx); \
+// Check mtlVtx exists on platform, to avoid overwriting the MTLVertexFormatInvalid entry.
+#define addMTLVertexFormatDesc(mtlVtx)                                                                     \
+	if (MTLVertexFormat##mtlVtx) {                                                                         \
+		addMTLVertexFormatDescImpl(MTLVertexFormat##mtlVtx, kMTLFmtCapsVertex, "MTLVertexFormat" #mtlVtx); \
 	}
 
 void PixelFormats::initMTLVertexFormatCapabilities(const MetalFeatures &p_feat) {
-	_mtl_vertex_format_descs.resize(MTL::VertexFormatHalf + 3);
-	// MTL::VertexFormatInvalid must come first. Use addMTLVertexFormatDescImpl to avoid guard code.
-	addMTLVertexFormatDescImpl(MTL::VertexFormatInvalid, kMTLFmtCapsNone, "MTL::VertexFormatInvalid");
+	_mtl_vertex_format_descs.resize(MTLVertexFormatHalf + 3);
+	// MTLVertexFormatInvalid must come first. Use addMTLVertexFormatDescImpl to avoid guard code.
+	addMTLVertexFormatDescImpl(MTLVertexFormatInvalid, kMTLFmtCapsNone, "MTLVertexFormatInvalid");
 
 	addMTLVertexFormatDesc(UChar2Normalized);
 	addMTLVertexFormatDesc(Char2Normalized);
@@ -866,8 +862,8 @@ void PixelFormats::initMTLVertexFormatCapabilities(const MetalFeatures &p_feat)
 
 	addMTLVertexFormatDesc(UChar4Normalized_BGRA);
 
-	if (__builtin_available(macos 14.0, ios 17.0, tvos 17.0, *)) {
-		if (p_feat.highestFamily >= MTL::GPUFamilyApple5) {
+	if (@available(macos 14.0, ios 17.0, tvos 17.0, *)) {
+		if (p_feat.highestFamily >= MTLGPUFamilyApple5) {
 			addMTLVertexFormatDesc(FloatRG11B10);
 			addMTLVertexFormatDesc(FloatRGB9E5);
 		}
@@ -875,9 +871,9 @@ void PixelFormats::initMTLVertexFormatCapabilities(const MetalFeatures &p_feat)
 }
 
 // Return a reference to the format capabilities, so the caller can manipulate them.
-// Check mtlPixFmt exists on platform, to avoid overwriting the MTL::PixelFormatInvalid entry.
+// Check mtlPixFmt exists on platform, to avoid overwriting the MTLPixelFormatInvalid entry.
 // When returning the dummy, reset it on each access because it can be written to by caller.
-MTLFmtCaps &PixelFormats::getMTLPixelFormatCapsIf(MTL::PixelFormat mtlPixFmt, bool cond) {
+MTLFmtCaps &PixelFormats::getMTLPixelFormatCapsIf(MTLPixelFormat mtlPixFmt, bool cond) {
 	static MTLFmtCaps dummyFmtCaps;
 	if (mtlPixFmt && cond) {
 		return getMTLPixelFormatDesc(mtlPixFmt).mtlFmtCaps;
@@ -887,22 +883,22 @@ MTLFmtCaps &PixelFormats::getMTLPixelFormatCapsIf(MTL::PixelFormat mtlPixFmt, bo
 	}
 }
 
-#define setMTLPixFmtCapsIf(cond, mtlFmt, caps) getMTLPixelFormatCapsIf(MTL::PixelFormat##mtlFmt, cond) = kMTLFmtCaps##caps;
+#define setMTLPixFmtCapsIf(cond, mtlFmt, caps) getMTLPixelFormatCapsIf(MTLPixelFormat##mtlFmt, cond) = kMTLFmtCaps##caps;
 #define setMTLPixFmtCapsIfGPU(gpuFam, mtlFmt, caps) setMTLPixFmtCapsIf(gpuCaps.supports##gpuFam, mtlFmt, caps)
 
-#define enableMTLPixFmtCapsIf(cond, mtlFmt, caps) flags::set(getMTLPixelFormatCapsIf(MTL::PixelFormat##mtlFmt, cond), kMTLFmtCaps##caps);
-#define enableMTLPixFmtCapsIfGPU(gpuFam, mtlFmt, caps) enableMTLPixFmtCapsIf(p_feat.highestFamily >= MTL::GPUFamily##gpuFam, mtlFmt, caps)
+#define enableMTLPixFmtCapsIf(cond, mtlFmt, caps) flags::set(getMTLPixelFormatCapsIf(MTLPixelFormat##mtlFmt, cond), kMTLFmtCaps##caps);
+#define enableMTLPixFmtCapsIfGPU(gpuFam, mtlFmt, caps) enableMTLPixFmtCapsIf(p_feat.highestFamily >= MTLGPUFamily##gpuFam, mtlFmt, caps)
 
-#define disableMTLPixFmtCapsIf(cond, mtlFmt, caps) flags::clear(getMTLPixelFormatCapsIf(MTL::PixelFormat##mtlFmt, cond), kMTLFmtCaps##caps);
+#define disableMTLPixFmtCapsIf(cond, mtlFmt, caps) flags::clear(getMTLPixelFormatCapsIf(MTLPixelFormat##mtlFmt, cond), kMTLFmtCaps##caps);
 
 // Modifies the format capability tables based on the capabilities of the specific MTLDevice.
 void PixelFormats::modifyMTLFormatCapabilities(const MetalFeatures &p_feat) {
 	bool noVulkanSupport = false; // Indicated supported in Metal but not Vulkan or SPIR-V.
 	bool notMac = !p_feat.supportsMac;
-	bool iosOnly1 = notMac && p_feat.highestFamily < MTL::GPUFamilyApple2;
-	bool iosOnly2 = notMac && p_feat.highestFamily < MTL::GPUFamilyApple3;
-	bool iosOnly6 = notMac && p_feat.highestFamily < MTL::GPUFamilyApple7;
-	bool iosOnly8 = notMac && p_feat.highestFamily < MTL::GPUFamilyApple9;
+	bool iosOnly1 = notMac && p_feat.highestFamily < MTLGPUFamilyApple2;
+	bool iosOnly2 = notMac && p_feat.highestFamily < MTLGPUFamilyApple3;
+	bool iosOnly6 = notMac && p_feat.highestFamily < MTLGPUFamilyApple7;
+	bool iosOnly8 = notMac && p_feat.highestFamily < MTLGPUFamilyApple9;
 
 	setMTLPixFmtCapsIf(iosOnly2, A8Unorm, RF);
 	setMTLPixFmtCapsIf(iosOnly1, R8Unorm_sRGB, RFCMRB);
@@ -938,7 +934,7 @@ void PixelFormats::modifyMTLFormatCapabilities(const MetalFeatures &p_feat) {
 
 	// Metal supports reading both R&G into as one 64-bit atomic operation, but Vulkan and SPIR-V do not.
 	// Including this here so we remember to update this if support is added to Vulkan in the future.
-	bool atomic64 = noVulkanSupport && (p_feat.highestFamily >= MTL::GPUFamilyApple9 || (p_feat.highestFamily >= MTL::GPUFamilyApple8 && p_feat.supportsMac));
+	bool atomic64 = noVulkanSupport && (p_feat.highestFamily >= MTLGPUFamilyApple9 || (p_feat.highestFamily >= MTLGPUFamilyApple8 && p_feat.supportsMac));
 	enableMTLPixFmtCapsIf(atomic64, RG32Uint, Atomic);
 	enableMTLPixFmtCapsIf(atomic64, RG32Sint, Atomic);
 
@@ -965,7 +961,7 @@ void PixelFormats::modifyMTLFormatCapabilities(const MetalFeatures &p_feat) {
 	enableMTLPixFmtCapsIf(floatFB, RGBA32Float, Filter);
 	enableMTLPixFmtCapsIf(floatFB, RGBA32Float, Blend); // Undocumented by confirmed through testing.
 
-	bool noHDR_ASTC = p_feat.highestFamily < MTL::GPUFamilyApple6;
+	bool noHDR_ASTC = p_feat.highestFamily < MTLGPUFamilyApple6;
 	setMTLPixFmtCapsIf(noHDR_ASTC, ASTC_4x4_HDR, None);
 	setMTLPixFmtCapsIf(noHDR_ASTC, ASTC_5x4_HDR, None);
 	setMTLPixFmtCapsIf(noHDR_ASTC, ASTC_5x5_HDR, None);
@@ -1021,32 +1017,32 @@ void PixelFormats::buildDFFormatMaps() {
 		// in the Godot format if not supported.
 		if (dfDesc.mtlPixelFormat) {
 			MTLFormatDesc &mtlDesc = getMTLPixelFormatDesc(dfDesc.mtlPixelFormat);
-			if (mtlDesc.dataFormat == RDC::DATA_FORMAT_MAX) {
+			if (mtlDesc.dataFormat == RD::DATA_FORMAT_MAX) {
 				mtlDesc.dataFormat = dfDesc.dataFormat;
 			}
 			if (!mtlDesc.isSupported()) {
-				dfDesc.mtlPixelFormat = MTL::PixelFormatInvalid;
+				dfDesc.mtlPixelFormat = MTLPixelFormatInvalid;
 			}
 		}
 		if (dfDesc.mtlPixelFormatSubstitute) {
 			MTLFormatDesc &mtlDesc = getMTLPixelFormatDesc(dfDesc.mtlPixelFormatSubstitute);
 			if (!mtlDesc.isSupported()) {
-				dfDesc.mtlPixelFormatSubstitute = MTL::PixelFormatInvalid;
+				dfDesc.mtlPixelFormatSubstitute = MTLPixelFormatInvalid;
 			}
 		}
 		if (dfDesc.mtlVertexFormat) {
 			MTLFormatDesc &mtlDesc = getMTLVertexFormatDesc(dfDesc.mtlVertexFormat);
-			if (mtlDesc.dataFormat == RDC::DATA_FORMAT_MAX) {
+			if (mtlDesc.dataFormat == RD::DATA_FORMAT_MAX) {
 				mtlDesc.dataFormat = dfDesc.dataFormat;
 			}
 			if (!mtlDesc.isSupported()) {
-				dfDesc.mtlVertexFormat = MTL::VertexFormatInvalid;
+				dfDesc.mtlVertexFormat = MTLVertexFormatInvalid;
 			}
 		}
 		if (dfDesc.mtlVertexFormatSubstitute) {
 			MTLFormatDesc &mtlDesc = getMTLVertexFormatDesc(dfDesc.mtlVertexFormatSubstitute);
 			if (!mtlDesc.isSupported()) {
-				dfDesc.mtlVertexFormatSubstitute = MTL::VertexFormatInvalid;
+				dfDesc.mtlVertexFormatSubstitute = MTLVertexFormatInvalid;
 			}
 		}
 	}
diff --git a/engine/drivers/metal/rendering_context_driver_metal.h b/engine/drivers/metal/rendering_context_driver_metal.h
index d417fa8b..8e313d81 100644
--- a/engine/drivers/metal/rendering_context_driver_metal.h
+++ b/engine/drivers/metal/rendering_context_driver_metal.h
@@ -35,18 +35,42 @@
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device_driver.h"
 
-#include <Metal/Metal.hpp>
-#include <QuartzCore/QuartzCore.hpp>
+#import <CoreGraphics/CGGeometry.h>
 
-namespace MTL3 {
+#ifdef __OBJC__
+#import "metal_objects.h"
+
+#import <Metal/Metal.h>
+#import <QuartzCore/CALayer.h>
+
+@class CAMetalLayer;
+@protocol CAMetalDrawable;
+#else
+typedef enum MTLPixelFormat {
+	MTLPixelFormatBGRA8Unorm = 80,
+} MTLPixelFormat;
 class MDCommandBuffer;
-}
+#endif
+
+class PixelFormats;
+
+#ifdef __OBJC__
+#define METAL_DEVICE id<MTLDevice>
+#define METAL_DRAWABLE id<MTLDrawable>
+#define METAL_LAYER CAMetalLayer *__unsafe_unretained
+#define METAL_RESIDENCY_SET id<MTLResidencySet>
+#else
+#define METAL_DEVICE void *
+#define METAL_DRAWABLE void *
+#define METAL_LAYER void *
+#define METAL_RESIDENCY_SET void *
+#endif
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingContextDriverMetal : public RenderingContextDriver {
 	bool capture_available = false;
 
 protected:
-	MTL::Device *metal_device = nullptr;
+	METAL_DEVICE metal_device = nullptr;
 	Device device; // There is only one device on Apple Silicon.
 
 public:
@@ -58,17 +82,8 @@ public:
 	void driver_free(RenderingDeviceDriver *p_driver) final override;
 	SurfaceID surface_create(const void *p_platform_data) final override;
 	void surface_set_size(SurfaceID p_surface, uint32_t p_width, uint32_t p_height) final override;
-	void surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) final override;
-	DisplayServerEnums::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const final override;
-	virtual void surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) final override;
-	virtual bool surface_get_hdr_output_enabled(SurfaceID p_surface) const final override;
-	virtual void surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) final override;
-	virtual float surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const final override;
-	virtual void surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) final override;
-	virtual float surface_get_hdr_output_max_luminance(SurfaceID p_surface) const final override;
-	virtual void surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) final override;
-	virtual float surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const final override;
-	virtual float surface_get_hdr_output_max_value(SurfaceID p_surface) const final override;
+	void surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) final override;
+	DisplayServer::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const final override;
 	uint32_t surface_get_width(SurfaceID p_surface) const final override;
 	uint32_t surface_get_height(SurfaceID p_surface) const final override;
 	void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) final override;
@@ -80,52 +95,32 @@ public:
 
 	// Platform-specific data for the Windows embedded in this driver.
 	struct WindowPlatformData {
-		CA::MetalLayer *layer;
+		METAL_LAYER layer;
 	};
 
 	class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) Surface {
 	protected:
-		MTL::Device *device;
+		METAL_DEVICE device;
 
 	public:
 		uint32_t width = 0;
 		uint32_t height = 0;
-		DisplayServerEnums::VSyncMode vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
-		double present_minimum_duration = 0.0;
-		MTL::PixelFormat pixel_format = MTL::PixelFormatBGRA8Unorm;
-
-		// BT.2408 recommendation of 203 nits for HDR Reference White, rounded to 200
-		// to be a more pleasant player-facing value.
-		float hdr_reference_luminance = 200.0f;
-		float hdr_max_luminance = 1000.0f;
+		DisplayServer::VSyncMode vsync_mode = DisplayServer::VSYNC_ENABLED;
 		bool needs_resize = false;
-		bool hdr_output = false;
+		double present_minimum_duration = 0.0;
 
-		Surface(MTL::Device *p_device) :
+		Surface(METAL_DEVICE p_device) :
 				device(p_device) {}
 		virtual ~Surface() = default;
 
-		MTL::PixelFormat get_pixel_format() const { return pixel_format; }
-		void set_hdr_output_enabled(bool p_enabled) {
-			if (hdr_output != p_enabled) {
-				hdr_output = p_enabled;
-				needs_resize = true;
-			}
-		}
-
-		bool is_hdr_output_enabled() const {
-			return hdr_output;
-		}
-		virtual Error resize(uint32_t p_desired_framebuffer_count, RDD::DataFormat &r_format, RDD::ColorSpace &r_color_space) = 0;
+		MTLPixelFormat get_pixel_format() const { return MTLPixelFormatBGRA8Unorm; }
+		virtual Error resize(uint32_t p_desired_framebuffer_count) = 0;
 		virtual RDD::FramebufferID acquire_next_frame_buffer() = 0;
-		virtual void present(MTL3::MDCommandBuffer *p_cmd_buffer) = 0;
-		virtual MTL::Drawable *next_drawable() = 0;
-		API_AVAILABLE(macos(26.0), ios(26.0))
-		virtual MTL::ResidencySet *get_residency_set() const = 0;
+		virtual void present(MDCommandBuffer *p_cmd_buffer) = 0;
 		void set_max_fps(int p_max_fps) { present_minimum_duration = p_max_fps ? 1.0 / p_max_fps : 0.0; }
 	};
 
-	MTL::Device *get_metal_device() const {
+	METAL_DEVICE get_metal_device() const {
 		return metal_device;
 	}
 
diff --git a/engine/drivers/metal/rendering_context_driver_metal.cpp b/engine/drivers/metal/rendering_context_driver_metal.mm
similarity index 50%
rename from engine/drivers/metal/rendering_context_driver_metal.cpp
rename to engine/drivers/metal/rendering_context_driver_metal.mm
index a749de82..51b752f2 100644
--- a/engine/drivers/metal/rendering_context_driver_metal.cpp
+++ b/engine/drivers/metal/rendering_context_driver_metal.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  rendering_context_driver_metal.cpp                                    */
+/*  rendering_context_driver_metal.mm                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "rendering_context_driver_metal.h"
+#import "rendering_context_driver_metal.h"
+
+#import "rendering_device_driver_metal.h"
 
-#include "core/os/os.h"
 #include "core/templates/sort_array.h"
-#include "drivers/metal/metal3_objects.h"
-#include "drivers/metal/metal_objects_shared.h"
-#include "drivers/metal/rendering_device_driver_metal3.h"
 
-#include <objc/message.h>
-#include <os/log.h>
-#include <os/signpost.h>
+#import <os/log.h>
+#import <os/signpost.h>
 
 #pragma mark - Logging
 
@@ -51,6 +48,12 @@ __attribute__((constructor)) static void InitializeLogging(void) {
 	LOG_INTERVALS = os_log_create("org.godotengine.godot.metal", "events");
 }
 
+@protocol MTLDeviceEx <MTLDevice>
+#if TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 130300
+- (void)setShouldMaximizeConcurrentCompilation:(BOOL)v;
+#endif
+@end
+
 RenderingContextDriverMetal::RenderingContextDriverMetal() {
 }
 
@@ -58,14 +61,14 @@ RenderingContextDriverMetal::~RenderingContextDriverMetal() {
 }
 
 Error RenderingContextDriverMetal::initialize() {
-	if (OS::get_singleton()->get_environment("MTL_CAPTURE_ENABLED") == "1" || OS::get_singleton()->get_environment("MTLCAPTURE_DESTINATION_DEVELOPER_TOOLS_ENABLE") == "1") {
+	if (OS::get_singleton()->get_environment("MTL_CAPTURE_ENABLED") == "1") {
 		capture_available = true;
 	}
 
-	metal_device = MTL::CreateSystemDefaultDevice();
+	metal_device = MTLCreateSystemDefaultDevice();
 #if TARGET_OS_OSX
-	if (__builtin_available(macOS 13.3, *)) {
-		metal_device->setShouldMaximizeConcurrentCompilation(true);
+	if (@available(macOS 13.3, *)) {
+		[id<MTLDeviceEx>(metal_device) setShouldMaximizeConcurrentCompilation:YES];
 	}
 #endif
 	device.type = DEVICE_TYPE_INTEGRATED_GPU;
@@ -73,8 +76,8 @@ Error RenderingContextDriverMetal::initialize() {
 	device.workarounds = Workarounds();
 
 	MetalDeviceProperties props(metal_device);
-	int version = (int)props.features.highestFamily - (int)MTL::GPUFamilyApple1 + 1;
-	device.name = vformat("%s (Apple%d)", metal_device->name()->utf8String(), version);
+	int version = (int)props.features.highestFamily - (int)MTLGPUFamilyApple1 + 1;
+	device.name = vformat("%s (Apple%d)", metal_device.name.UTF8String, version);
 
 	return OK;
 }
@@ -89,7 +92,7 @@ uint32_t RenderingContextDriverMetal::device_get_count() const {
 }
 
 RenderingDeviceDriver *RenderingContextDriverMetal::driver_create() {
-	return memnew(MTL3::RenderingDeviceDriverMetal(this));
+	return memnew(RenderingDeviceDriverMetal(this));
 }
 
 void RenderingContextDriverMetal::driver_free(RenderingDeviceDriver *p_driver) {
@@ -97,53 +100,53 @@ void RenderingContextDriverMetal::driver_free(RenderingDeviceDriver *p_driver) {
 }
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) SurfaceLayer : public RenderingContextDriverMetal::Surface {
-	CA::MetalLayer *layer = nullptr;
+	CAMetalLayer *__unsafe_unretained layer = nil;
 	LocalVector<MDFrameBuffer> frame_buffers;
-	LocalVector<MTL::Drawable *> drawables;
+	LocalVector<id<MTLDrawable>> drawables;
 	uint32_t rear = -1;
 	uint32_t front = 0;
 	uint32_t count = 0;
 
 public:
-	SurfaceLayer(CA::MetalLayer *p_layer, MTL::Device *p_device) :
+	SurfaceLayer(CAMetalLayer *p_layer, id<MTLDevice> p_device) :
 			Surface(p_device), layer(p_layer) {
-		layer->setAllowsNextDrawableTimeout(true);
-		layer->setFramebufferOnly(true);
-		layer->setOpaque(!OS::get_singleton()->is_layered_allowed());
-		layer->setPixelFormat(get_pixel_format());
-		layer->setDevice(p_device);
+		layer.allowsNextDrawableTimeout = YES;
+		layer.framebufferOnly = YES;
+		layer.opaque = OS::get_singleton()->is_layered_allowed() ? NO : YES;
+		layer.pixelFormat = get_pixel_format();
+		layer.device = p_device;
 	}
 
 	~SurfaceLayer() override {
-		layer = nullptr;
+		layer = nil;
 	}
 
-	Error resize(uint32_t p_desired_framebuffer_count, RDD::DataFormat &r_format, RDD::ColorSpace &r_color_space) override final {
+	Error resize(uint32_t p_desired_framebuffer_count) override final {
 		if (width == 0 || height == 0) {
 			// Very likely the window is minimized, don't create a swap chain.
 			return ERR_SKIP;
 		}
 
 		CGSize drawableSize = CGSizeMake(width, height);
-		CGSize current = layer->drawableSize();
+		CGSize current = layer.drawableSize;
 		if (!CGSizeEqualToSize(current, drawableSize)) {
-			layer->setDrawableSize(drawableSize);
+			layer.drawableSize = drawableSize;
 		}
 
 		// Metal supports a maximum of 3 drawables.
 		p_desired_framebuffer_count = MIN(3U, p_desired_framebuffer_count);
-		layer->setMaximumDrawableCount(p_desired_framebuffer_count);
+		layer.maximumDrawableCount = p_desired_framebuffer_count;
 
 #if TARGET_OS_OSX
 		// Display sync is only supported on macOS.
 		switch (vsync_mode) {
-			case DisplayServerEnums::VSYNC_MAILBOX:
-			case DisplayServerEnums::VSYNC_ADAPTIVE:
-			case DisplayServerEnums::VSYNC_ENABLED:
-				layer->setDisplaySyncEnabled(true);
+			case DisplayServer::VSYNC_MAILBOX:
+			case DisplayServer::VSYNC_ADAPTIVE:
+			case DisplayServer::VSYNC_ENABLED:
+				layer.displaySyncEnabled = YES;
 				break;
-			case DisplayServerEnums::VSYNC_DISABLED:
-				layer->setDisplaySyncEnabled(false);
+			case DisplayServer::VSYNC_DISABLED:
+				layer.displaySyncEnabled = NO;
 				break;
 		}
 #endif
@@ -154,28 +157,6 @@ public:
 			frame_buffers[i].set_texture_count(1);
 		}
 
-		if (hdr_output) {
-			layer->setWantsExtendedDynamicRangeContent(true);
-			CGColorSpaceRef color_space = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
-			layer->setColorspace(color_space);
-			CGColorSpaceRelease(color_space);
-			layer->setPixelFormat(MTL::PixelFormatRGBA16Float);
-
-			r_color_space = RDD::COLOR_SPACE_REC709_LINEAR;
-			r_format = RDD::DATA_FORMAT_R16G16B16A16_SFLOAT;
-			pixel_format = MTL::PixelFormatRGBA16Float;
-		} else {
-			layer->setWantsExtendedDynamicRangeContent(false);
-			CGColorSpaceRef color_space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-			layer->setColorspace(color_space);
-			CGColorSpaceRelease(color_space);
-			layer->setPixelFormat(MTL::PixelFormatBGRA8Unorm);
-
-			r_color_space = RDD::COLOR_SPACE_REC709_NONLINEAR_SRGB;
-			r_format = RDD::DATA_FORMAT_B8G8R8A8_UNORM;
-			pixel_format = MTL::PixelFormatBGRA8Unorm;
-		}
-
 		return OK;
 	}
 
@@ -190,77 +171,56 @@ public:
 		MDFrameBuffer &frame_buffer = frame_buffers[rear];
 		frame_buffer.size = Size2i(width, height);
 
-		CA::MetalDrawable *drawable = layer->nextDrawable();
+		id<CAMetalDrawable> drawable = layer.nextDrawable;
 		ERR_FAIL_NULL_V_MSG(drawable, RDD::FramebufferID(), "no drawable available");
 		drawables[rear] = drawable;
-		frame_buffer.set_texture(0, drawable->texture());
+		frame_buffer.set_texture(0, drawable.texture);
 
 		return RDD::FramebufferID(&frame_buffer);
 	}
 
-	void present(MTL3::MDCommandBuffer *p_cmd_buffer) override final {
+	void present(MDCommandBuffer *p_cmd_buffer) override final {
 		if (count == 0) {
 			return;
 		}
 
 		// Release texture and drawable.
 		frame_buffers[front].unset_texture(0);
-		MTL::Drawable *drawable = drawables[front];
-		drawables[front] = nullptr;
+		id<MTLDrawable> drawable = drawables[front];
+		drawables[front] = nil;
 
 		count--;
 		front = (front + 1) % frame_buffers.size();
 
-		if (vsync_mode != DisplayServerEnums::VSYNC_DISABLED) {
-			p_cmd_buffer->get_command_buffer()->presentDrawableAfterMinimumDuration(drawable, present_minimum_duration);
+		if (vsync_mode != DisplayServer::VSYNC_DISABLED) {
+			[p_cmd_buffer->get_command_buffer() presentDrawable:drawable afterMinimumDuration:present_minimum_duration];
 		} else {
-			p_cmd_buffer->get_command_buffer()->presentDrawable(drawable);
+			[p_cmd_buffer->get_command_buffer() presentDrawable:drawable];
 		}
 	}
-
-	MTL::Drawable *next_drawable() override final {
-		if (count == 0) {
-			return nullptr;
-		}
-
-		// Release texture and drawable.
-		frame_buffers[front].unset_texture(0);
-		MTL::Drawable *drawable = drawables[front];
-		drawables[front] = nullptr;
-
-		count--;
-		front = (front + 1) % frame_buffers.size();
-
-		return drawable;
-	}
-
-	API_AVAILABLE(macos(26.0), ios(26.0))
-	MTL::ResidencySet *get_residency_set() const override final {
-		return layer->residencySet();
-	}
 };
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) SurfaceOffscreen : public RenderingContextDriverMetal::Surface {
 	int frame_buffer_size = 3;
 	MDFrameBuffer *frame_buffers;
-	LocalVector<MTL::Texture *> textures;
-	LocalVector<MTL::Drawable *> drawables;
+	LocalVector<id<MTLTexture>> textures;
+	LocalVector<id<MTLDrawable>> drawables;
 
 	int32_t rear = -1;
 	std::atomic_int count;
 	uint64_t target_time = 0;
-	CA::MetalLayer *layer;
+	CAMetalLayer *layer;
 
 public:
-	SurfaceOffscreen(CA::MetalLayer *p_layer, MTL::Device *p_device) :
+	SurfaceOffscreen(CAMetalLayer *p_layer, id<MTLDevice> p_device) :
 			Surface(p_device), layer(p_layer) {
-		layer->setAllowsNextDrawableTimeout(true);
-		layer->setFramebufferOnly(true);
-		layer->setOpaque(!OS::get_singleton()->is_layered_allowed());
-		layer->setPixelFormat(get_pixel_format());
-		layer->setDevice(p_device);
+		layer.allowsNextDrawableTimeout = YES;
+		layer.framebufferOnly = YES;
+		layer.opaque = OS::get_singleton()->is_layered_allowed() ? NO : YES;
+		layer.pixelFormat = get_pixel_format();
+		layer.device = p_device;
 #if TARGET_OS_OSX
-		layer->setDisplaySyncEnabled(false);
+		layer.displaySyncEnabled = NO;
 #endif
 		target_time = OS::get_singleton()->get_ticks_usec();
 
@@ -275,45 +235,18 @@ public:
 
 	~SurfaceOffscreen() override {
 		memdelete_arr(frame_buffers);
-		for (MTL::Texture *texture : textures) {
-			if (texture) {
-				texture->release();
-			}
-		}
 	}
 
-	Error resize(uint32_t p_desired_framebuffer_count, RDD::DataFormat &r_format, RDD::ColorSpace &r_color_space) override final {
+	Error resize(uint32_t p_desired_framebuffer_count) override final {
 		if (width == 0 || height == 0) {
 			// Very likely the window is minimized, don't create a swap chain.
 			return ERR_SKIP;
 		}
 
 		CGSize drawableSize = CGSizeMake(width, height);
-		CGSize current = layer->drawableSize();
+		CGSize current = layer.drawableSize;
 		if (!CGSizeEqualToSize(current, drawableSize)) {
-			layer->setDrawableSize(drawableSize);
-		}
-
-		if (hdr_output) {
-			layer->setWantsExtendedDynamicRangeContent(true);
-			CGColorSpaceRef color_space = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
-			layer->setColorspace(color_space);
-			CGColorSpaceRelease(color_space);
-			layer->setPixelFormat(MTL::PixelFormatRGBA16Float);
-
-			r_color_space = RDD::COLOR_SPACE_REC709_LINEAR;
-			r_format = RDD::DATA_FORMAT_R16G16B16A16_SFLOAT;
-			pixel_format = MTL::PixelFormatRGBA16Float;
-		} else {
-			layer->setWantsExtendedDynamicRangeContent(false);
-			CGColorSpaceRef color_space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-			layer->setColorspace(color_space);
-			CGColorSpaceRelease(color_space);
-			layer->setPixelFormat(MTL::PixelFormatBGRA8Unorm);
-
-			r_color_space = RDD::COLOR_SPACE_REC709_NONLINEAR_SRGB;
-			r_format = RDD::DATA_FORMAT_B8G8R8A8_UNORM;
-			pixel_format = MTL::PixelFormatBGRA8Unorm;
+			layer.drawableSize = drawableSize;
 		}
 
 		return OK;
@@ -330,67 +263,41 @@ public:
 
 		MDFrameBuffer &frame_buffer = frame_buffers[rear];
 
-		MTL::Texture *texture = textures[rear];
-		if (texture == nullptr || texture->width() != width || texture->height() != height || texture->pixelFormat() != pixel_format) {
-			MTL::TextureDescriptor *texture_descriptor = MTL::TextureDescriptor::texture2DDescriptor(get_pixel_format(), width, height, false);
-			texture_descriptor->setUsage(MTL::TextureUsageRenderTarget);
-			texture_descriptor->setHazardTrackingMode(MTL::HazardTrackingModeUntracked);
-			texture_descriptor->setStorageMode(MTL::StorageModePrivate);
-			if (texture) {
-				texture->release();
-			}
-			texture = device->newTexture(texture_descriptor);
-			textures[rear] = texture;
+		if (textures[rear] == nil || textures[rear].width != width || textures[rear].height != height) {
+			MTLTextureDescriptor *texture_descriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:get_pixel_format() width:width height:height mipmapped:NO];
+			texture_descriptor.usage = MTLTextureUsageRenderTarget;
+			texture_descriptor.hazardTrackingMode = MTLHazardTrackingModeUntracked;
+			texture_descriptor.storageMode = MTLStorageModePrivate;
+			textures[rear] = [device newTextureWithDescriptor:texture_descriptor];
 		}
 
 		frame_buffer.size = Size2i(width, height);
 		uint64_t now = OS::get_singleton()->get_ticks_usec();
 		if (now >= target_time) {
 			target_time = now + 1'000'000; // 1 second into the future.
-			CA::MetalDrawable *drawable = layer->nextDrawable();
+			id<CAMetalDrawable> drawable = layer.nextDrawable;
 			ERR_FAIL_NULL_V_MSG(drawable, RDD::FramebufferID(), "no drawable available");
 			drawables[rear] = drawable;
-			frame_buffer.set_texture(0, drawable->texture());
+			frame_buffer.set_texture(0, drawable.texture);
 		} else {
-			frame_buffer.set_texture(0, texture);
+			frame_buffer.set_texture(0, textures[rear]);
 		}
 
 		return RDD::FramebufferID(&frame_buffers[rear]);
 	}
 
-	void present(MTL3::MDCommandBuffer *p_cmd_buffer) override final {
+	void present(MDCommandBuffer *p_cmd_buffer) override final {
 		MDFrameBuffer *frame_buffer = &frame_buffers[rear];
 
-		if (drawables[rear] != nullptr) {
-			p_cmd_buffer->get_command_buffer()->presentDrawable(drawables[rear]);
-			drawables[rear] = nullptr;
+		if (drawables[rear] != nil) {
+			[p_cmd_buffer->get_command_buffer() presentDrawable:drawables[rear]];
+			drawables[rear] = nil;
 		}
 
-		p_cmd_buffer->get_command_buffer()->addScheduledHandler([frame_buffer, this](MTL::CommandBuffer *) {
+		[p_cmd_buffer->get_command_buffer() addScheduledHandler:^(id<MTLCommandBuffer> p_command_buffer) {
 			frame_buffer->unset_texture(0);
 			count.fetch_add(-1, std::memory_order_relaxed);
-		});
-	}
-
-	MTL::Drawable *next_drawable() override final {
-		if (count == 0) {
-			return nullptr;
-		}
-
-		MDFrameBuffer *frame_buffer = &frame_buffers[rear];
-
-		MTL::Drawable *next = drawables[rear];
-		drawables[rear] = nullptr;
-
-		frame_buffer->unset_texture(0);
-		count--;
-
-		return next;
-	}
-
-	API_AVAILABLE(macos(26.0), ios(26.0))
-	MTL::ResidencySet *get_residency_set() const override final {
-		return layer->residencySet();
+		}];
 	}
 };
 
@@ -416,7 +323,7 @@ void RenderingContextDriverMetal::surface_set_size(SurfaceID p_surface, uint32_t
 	surface->needs_resize = true;
 }
 
-void RenderingContextDriverMetal::surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) {
+void RenderingContextDriverMetal::surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) {
 	Surface *surface = (Surface *)(p_surface);
 	if (surface->vsync_mode == p_vsync_mode) {
 		return;
@@ -425,54 +332,11 @@ void RenderingContextDriverMetal::surface_set_vsync_mode(SurfaceID p_surface, Di
 	surface->needs_resize = true;
 }
 
-DisplayServerEnums::VSyncMode RenderingContextDriverMetal::surface_get_vsync_mode(SurfaceID p_surface) const {
+DisplayServer::VSyncMode RenderingContextDriverMetal::surface_get_vsync_mode(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->vsync_mode;
 }
 
-void RenderingContextDriverMetal::surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->set_hdr_output_enabled(p_enabled);
-}
-
-bool RenderingContextDriverMetal::surface_get_hdr_output_enabled(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->is_hdr_output_enabled();
-}
-
-void RenderingContextDriverMetal::surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_reference_luminance = p_reference_luminance;
-}
-
-float RenderingContextDriverMetal::surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const {
-	const Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_reference_luminance;
-}
-
-void RenderingContextDriverMetal::surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_max_luminance = p_max_luminance;
-}
-
-float RenderingContextDriverMetal::surface_get_hdr_output_max_luminance(SurfaceID p_surface) const {
-	const Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_max_luminance;
-}
-
-void RenderingContextDriverMetal::surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) {
-}
-
-float RenderingContextDriverMetal::surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_reference_luminance;
-}
-
-float RenderingContextDriverMetal::surface_get_hdr_output_max_value(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return MAX(surface->hdr_max_luminance / MAX(surface->hdr_reference_luminance, 1.0f), 1.0f);
-}
-
 uint32_t RenderingContextDriverMetal::surface_get_width(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->width;
diff --git a/engine/drivers/metal/rendering_device_driver_metal.h b/engine/drivers/metal/rendering_device_driver_metal.h
index 7604fff9..c5ca6e9c 100644
--- a/engine/drivers/metal/rendering_device_driver_metal.h
+++ b/engine/drivers/metal/rendering_device_driver_metal.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
-#include "drivers/metal/metal_device_profile.h"
-#include "drivers/metal/metal_objects_shared.h"
+#import "metal_device_profile.h"
+#import "metal_objects.h"
+
 #include "servers/rendering/rendering_device_driver.h"
 
-#include <Metal/Metal.hpp>
-
-#include <variant>
+#import <Metal/Metal.h>
+#import <variant>
 
 class RenderingShaderContainerFormatMetal;
 
@@ -48,28 +48,18 @@ class RenderingShaderContainerFormatMetal;
 
 class RenderingContextDriverMetal;
 
-namespace MTL3 {
-class MDCommandBuffer;
-}
-namespace MTL4 {
-class MDCommandBuffer;
-}
-
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingDeviceDriverMetal : public RenderingDeviceDriver {
 	friend struct ShaderCacheEntry;
-	friend class MTL3::MDCommandBuffer;
-	friend class MTL4::MDCommandBuffer;
-	friend class MDUniformSet;
+	friend class MDCommandBuffer;
 
 	template <typename T>
 	using Result = std::variant<T, Error>;
 
 #pragma mark - Generic
 
-protected:
 	RenderingContextDriverMetal *context_driver = nullptr;
 	RenderingContextDriver::Device context_device;
-	MTL::Device *device = nullptr;
+	id<MTLDevice> device = nil;
 
 	uint32_t _frame_count = 1;
 	/// frame_index is a cyclic counter derived from the current frame number modulo frame_count,
@@ -88,84 +78,16 @@ protected:
 	RDD::FragmentShadingRateCapabilities fsr_capabilities;
 	RDD::FragmentDensityMapCapabilities fdm_capabilities;
 
-	NS::SharedPtr<MTL::BinaryArchive> archive;
+	id<MTLBinaryArchive> archive = nil;
 	uint32_t archive_count = 0;
-	// DEV: When true, attempting to create a pipeline will fail if it cannot use the archive.
-	bool archive_fail_on_miss = false;
 
-	/// Resources to be added to the `main_residency_set`.
-	LocalVector<MTL::Resource *> _residency_add;
-	/// Resources to be removed from the `main_residency_set`.
-	LocalVector<MTL::Resource *> _residency_del;
-
-#pragma mark - Copy Queue
-
-	Mutex copy_queue_mutex;
-	/// A command queue used for internal copy operations.
-	NS::SharedPtr<MTL::CommandQueue> copy_queue;
-	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
-	NS::SharedPtr<MTL::ResidencySet> copy_queue_rs;
-	GODOT_CLANG_WARNING_POP
-	// If this is not nullptr, there are pending copy operations.
-	NS::SharedPtr<MTL::CommandBuffer> copy_queue_command_buffer;
-	NS::SharedPtr<MTL::BlitCommandEncoder> copy_queue_blit_encoder;
-	NS::SharedPtr<MTL::Buffer> copy_queue_buffer;
-	NS::UInteger copy_queue_buffer_offset = 0;
-
-	_FORCE_INLINE_ NS::UInteger _copy_queue_buffer_available() const {
-		return copy_queue_buffer.get()->length() - copy_queue_buffer_offset;
-	}
-
-	/// Marks p_size bytes as consumed from the copy queue buffer, aligning the offset to 16 bytes.
-	_FORCE_INLINE_ void _copy_queue_buffer_consume(NS::UInteger p_size) {
-		NS::UInteger aligned_offset = round_up_to_alignment(copy_queue_buffer_offset, 16);
-		copy_queue_buffer_offset = aligned_offset + p_size;
-	}
-
-	/// Returns a pointer to the current position in the copy queue buffer.
-	_FORCE_INLINE_ void *_copy_queue_buffer_ptr() const {
-		return static_cast<uint8_t *>(copy_queue_buffer.get()->contents()) + copy_queue_buffer_offset;
-	}
-
-	_FORCE_INLINE_ MTL::CommandBuffer *_copy_queue_command_buffer() {
-		if (!copy_queue_command_buffer) {
-			DEV_ASSERT(!copy_queue_blit_encoder);
-			copy_queue_command_buffer = NS::RetainPtr(copy_queue.get()->commandBufferWithUnretainedReferences());
-		}
-		return copy_queue_command_buffer.get();
-	}
-
-	_FORCE_INLINE_ MTL::BlitCommandEncoder *_copy_queue_blit_encoder() {
-		if (!copy_queue_blit_encoder) {
-			MTL::BlitCommandEncoder *enc = _copy_queue_command_buffer()->blitCommandEncoder();
-			copy_queue_blit_encoder = NS::RetainPtr(enc);
-		}
-		return copy_queue_blit_encoder.get();
-	}
-
-	void _copy_queue_copy_to_buffer(Span<uint8_t> p_src_data, MTL::Buffer *p_dst_buffer, uint64_t p_dst_offset = 0);
-	void _copy_queue_flush();
-	Error _copy_queue_initialize();
-
-	NS::SharedPtr<MTL::CaptureScope> device_scope;
+	id<MTLCommandQueue> device_queue = nil;
+	id<MTLCaptureScope> device_scope = nil;
 
 	String pipeline_cache_id;
 
-	virtual MTL::CommandQueue *get_command_queue() const = 0;
-	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
-	virtual void add_residency_set_to_main_queue(MTL::ResidencySet *p_set) = 0;
-	virtual void remove_residency_set_to_main_queue(MTL::ResidencySet *p_set) = 0;
-	NS::SharedPtr<MTL::ResidencySet> main_residency_set;
-	GODOT_CLANG_WARNING_POP
-
-	bool use_barriers = false;
-	MTL::ResourceOptions base_hazard_tracking = MTL::ResourceHazardTrackingModeTracked;
-
-	virtual Error _create_device();
-	virtual void _track_resource(MTL::Resource *p_resource);
-	virtual void _untrack_resource(MTL::Resource *p_resource);
+	Error _create_device();
 	void _check_capabilities();
-	Error _initialize(uint32_t p_device_index, uint32_t p_frame_count);
 
 #pragma mark - Shader Cache
 
@@ -181,7 +103,7 @@ protected:
 	void shader_cache_free_entry(const SHA256Digest &key);
 
 public:
-	virtual Error initialize(uint32_t p_device_index, uint32_t p_frame_count) override = 0;
+	Error initialize(uint32_t p_device_index, uint32_t p_frame_count) override final;
 
 #pragma mark - Memory
 
@@ -189,7 +111,7 @@ public:
 
 public:
 	struct BufferInfo {
-		NS::SharedPtr<MTL::Buffer> metal_buffer;
+		id<MTLBuffer> metal_buffer;
 
 		_FORCE_INLINE_ bool is_dynamic() const { return _frame_idx != UINT32_MAX; }
 		_FORCE_INLINE_ uint32_t frame_index() const { return _frame_idx; }
@@ -209,6 +131,7 @@ public:
 	virtual void buffer_unmap(BufferID p_buffer) override final;
 	virtual uint8_t *buffer_persistent_map_advance(BufferID p_buffer, uint64_t p_frames_drawn) override final;
 	virtual uint64_t buffer_get_dynamic_offsets(Span<BufferID> p_buffers) override final;
+	virtual void buffer_flush(BufferID p_buffer) override final;
 	virtual uint64_t buffer_get_device_address(BufferID p_buffer) override final;
 
 #pragma mark - Texture
@@ -245,28 +168,88 @@ public:
 
 #pragma mark - Barriers
 
-public:
 	virtual void command_pipeline_barrier(
 			CommandBufferID p_cmd_buffer,
 			BitField<PipelineStageBits> p_src_stages,
 			BitField<PipelineStageBits> p_dst_stages,
 			VectorView<MemoryAccessBarrier> p_memory_barriers,
 			VectorView<BufferBarrier> p_buffer_barriers,
-			VectorView<TextureBarrier> p_texture_barriers,
-			VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) override final;
+			VectorView<TextureBarrier> p_texture_barriers) override final;
 
 #pragma mark - Fences
 
+private:
+	struct Fence {
+		virtual void signal(id<MTLCommandBuffer> p_cmd_buffer) = 0;
+		virtual Error wait(uint32_t p_timeout_ms) = 0;
+		virtual ~Fence() = default;
+	};
+
+	struct FenceEvent : public Fence {
+		id<MTLSharedEvent> event;
+		uint64_t value;
+		FenceEvent(id<MTLSharedEvent> p_event) :
+				event(p_event),
+				value(0) {}
+
+		virtual void signal(id<MTLCommandBuffer> p_cb) override {
+			if (p_cb) {
+				value++;
+				[p_cb encodeSignalEvent:event value:value];
+			}
+		}
+
+		virtual Error wait(uint32_t p_timeout_ms) override {
+			GODOT_CLANG_WARNING_PUSH
+			GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
+			BOOL signaled = [event waitUntilSignaledValue:value timeoutMS:p_timeout_ms];
+			GODOT_CLANG_WARNING_POP
+			if (!signaled) {
+#ifdef DEBUG_ENABLED
+				ERR_PRINT("timeout waiting for fence");
+#endif
+				return ERR_TIMEOUT;
+			}
+
+			return OK;
+		}
+	};
+
+	struct FenceSemaphore : public Fence {
+		dispatch_semaphore_t semaphore;
+		FenceSemaphore() :
+				semaphore(dispatch_semaphore_create(0)) {}
+
+		virtual void signal(id<MTLCommandBuffer> p_cb) override {
+			if (p_cb) {
+				[p_cb addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
+					dispatch_semaphore_signal(semaphore);
+				}];
+			} else {
+				dispatch_semaphore_signal(semaphore);
+			}
+		}
+
+		virtual Error wait(uint32_t p_timeout_ms) override {
+			dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, static_cast<int64_t>(p_timeout_ms) * 1000000);
+			long result = dispatch_semaphore_wait(semaphore, timeout);
+			if (result != 0) {
+				return ERR_TIMEOUT;
+			}
+			return OK;
+		}
+	};
+
 public:
-	virtual FenceID fence_create() override = 0;
-	virtual Error fence_wait(FenceID p_fence) override = 0;
-	virtual void fence_free(FenceID p_fence) override = 0;
+	virtual FenceID fence_create() override final;
+	virtual Error fence_wait(FenceID p_fence) override final;
+	virtual void fence_free(FenceID p_fence) override final;
 
 #pragma mark - Semaphores
 
 public:
-	virtual SemaphoreID semaphore_create() override = 0;
-	virtual void semaphore_free(SemaphoreID p_semaphore) override = 0;
+	virtual SemaphoreID semaphore_create() override final;
+	virtual void semaphore_free(SemaphoreID p_semaphore) override final;
 
 #pragma mark - Commands
 	// ----- QUEUE FAMILY -----
@@ -274,22 +257,25 @@ public:
 	virtual CommandQueueFamilyID command_queue_family_get(BitField<CommandQueueFamilyBits> p_cmd_queue_family_bits, RenderingContextDriver::SurfaceID p_surface = 0) override final;
 
 	// ----- QUEUE -----
-
 public:
-	virtual CommandQueueID command_queue_create(CommandQueueFamilyID p_cmd_queue_family, bool p_identify_as_main_queue = false) override = 0;
-	virtual Error command_queue_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_semaphores, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_semaphores, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) override = 0;
-	virtual void command_queue_free(CommandQueueID p_cmd_queue) override = 0;
+	virtual CommandQueueID command_queue_create(CommandQueueFamilyID p_cmd_queue_family, bool p_identify_as_main_queue = false) override final;
+	virtual Error command_queue_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_semaphores, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_semaphores, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) override final;
+	virtual void command_queue_free(CommandQueueID p_cmd_queue) override final;
 
 	// ----- POOL -----
 
-	virtual CommandPoolID command_pool_create(CommandQueueFamilyID p_cmd_queue_family, CommandBufferType p_cmd_buffer_type) override = 0;
-	virtual bool command_pool_reset(CommandPoolID p_cmd_pool) override = 0;
-	virtual void command_pool_free(CommandPoolID p_cmd_pool) override = 0;
+	virtual CommandPoolID command_pool_create(CommandQueueFamilyID p_cmd_queue_family, CommandBufferType p_cmd_buffer_type) override final;
+	virtual bool command_pool_reset(CommandPoolID p_cmd_pool) override final;
+	virtual void command_pool_free(CommandPoolID p_cmd_pool) override final;
 
 	// ----- BUFFER -----
 
+private:
+	// Used to maintain references.
+	Vector<MDCommandBuffer *> command_buffers;
+
 public:
-	virtual CommandBufferID command_buffer_create(CommandPoolID p_cmd_pool) override = 0;
+	virtual CommandBufferID command_buffer_create(CommandPoolID p_cmd_pool) override final;
 	virtual bool command_buffer_begin(CommandBufferID p_cmd_buffer) override final;
 	virtual bool command_buffer_begin_secondary(CommandBufferID p_cmd_buffer, RenderPassID p_render_pass, uint32_t p_subpass, FramebufferID p_framebuffer) override final;
 	virtual void command_buffer_end(CommandBufferID p_cmd_buffer) override final;
@@ -297,15 +283,15 @@ public:
 
 #pragma mark - Swapchain
 
-protected:
+private:
 	struct SwapChain {
 		RenderingContextDriver::SurfaceID surface = RenderingContextDriver::SurfaceID();
 		RenderPassID render_pass;
-		DataFormat data_format = DATA_FORMAT_MAX;
-		ColorSpace color_space = COLOR_SPACE_MAX;
+		RDD::DataFormat data_format = DATA_FORMAT_MAX;
+		SwapChain() :
+				render_pass(nullptr) {}
 	};
 
-	RenderPassID _swap_chain_create_render_pass(DataFormat p_format);
 	void _swap_chain_release(SwapChain *p_swap_chain);
 	void _swap_chain_release_buffers(SwapChain *p_swap_chain);
 
@@ -315,7 +301,6 @@ public:
 	virtual FramebufferID swap_chain_acquire_framebuffer(CommandQueueID p_cmd_queue, SwapChainID p_swap_chain, bool &r_resize_required) override final;
 	virtual RenderPassID swap_chain_get_render_pass(SwapChainID p_swap_chain) override final;
 	virtual DataFormat swap_chain_get_format(SwapChainID p_swap_chain) override final;
-	virtual ColorSpace swap_chain_get_color_space(SwapChainID p_swap_chain) override final;
 	virtual void swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) override final;
 	virtual void swap_chain_free(SwapChainID p_swap_chain) override final;
 
@@ -369,7 +354,7 @@ public:
 #pragma mark Pipeline
 
 private:
-	Result<NS::SharedPtr<MTL::Function>> _create_function(MDLibrary *p_library, NS::String *p_name, VectorView<PipelineSpecializationConstant> &p_specialization_constants);
+	Result<id<MTLFunction>> _create_function(MDLibrary *p_library, NSString *p_name, VectorView<PipelineSpecializationConstant> &p_specialization_constants);
 
 public:
 	virtual void pipeline_free(PipelineID p_pipeline_id) override final;
@@ -457,29 +442,6 @@ public:
 
 	virtual PipelineID compute_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
 
-#pragma mark - Raytracing
-
-	// ----- ACCELERATION STRUCTURE -----
-
-	virtual AccelerationStructureID blas_create(VectorView<AccelerationStructureGeometry> p_geometries) override final;
-	virtual uint32_t tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) override final;
-	virtual void tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) override final;
-	virtual AccelerationStructureID tlas_create(BufferID p_instances_buffer) override final;
-	virtual void acceleration_structure_free(AccelerationStructureID p_acceleration_structure) override final;
-	virtual uint32_t acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) override final;
-
-	// ----- PIPELINE -----
-
-	virtual RaytracingPipelineID raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
-	virtual void raytracing_pipeline_free(RaytracingPipelineID p_pipeline) override final;
-
-	// ----- COMMANDS -----
-
-	virtual void command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) override final;
-	virtual void command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) override final;
-	virtual void command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) override final;
-	virtual void command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) override final;
-
 #pragma mark - Queries
 
 	// ----- TIMESTAMP -----
@@ -520,13 +482,14 @@ public:
 	virtual const MultiviewCapabilities &get_multiview_capabilities() override final;
 	virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() override final;
 	virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() override final;
+	virtual String get_api_name() const override final { return "Metal"; }
 	virtual String get_api_version() const override final;
 	virtual String get_pipeline_cache_uuid() const override final;
 	virtual const Capabilities &get_capabilities() const override final;
 	virtual bool is_composite_alpha_supported(CommandQueueID p_queue) const override final;
 
 	// Metal-specific.
-	MTL::Device *get_device() const { return device; }
+	id<MTLDevice> get_device() const { return device; }
 	PixelFormats &get_pixel_formats() const { return *pixel_formats; }
 	MDResourceCache &get_resource_cache() const { return *resource_cache; }
 	MetalDeviceProperties const &get_device_properties() const { return *device_properties; }
@@ -536,7 +499,7 @@ public:
 	}
 
 	size_t get_texel_buffer_alignment_for_format(RDD::DataFormat p_format) const;
-	size_t get_texel_buffer_alignment_for_format(MTL::PixelFormat p_format) const;
+	size_t get_texel_buffer_alignment_for_format(MTLPixelFormat p_format) const;
 
 	_FORCE_INLINE_ uint32_t frame_count() const { return _frame_count; }
 	_FORCE_INLINE_ uint32_t frame_index() const { return _frame_index; }
@@ -547,7 +510,7 @@ public:
 	~RenderingDeviceDriverMetal();
 };
 
-// Defined outside because we need to forward declare it in metal3_objects.h
+// Defined outside because we need to forward declare it in metal_objects.h
 struct API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MetalBufferDynamicInfo : public RenderingDeviceDriverMetal::BufferInfo {
 	uint64_t size_bytes; // Contains the real buffer size / frame_count.
 	uint32_t next_frame_index(uint32_t p_frame_count) {
diff --git a/engine/drivers/metal/rendering_device_driver_metal.cpp b/engine/drivers/metal/rendering_device_driver_metal.mm
similarity index 61%
rename from engine/drivers/metal/rendering_device_driver_metal.cpp
rename to engine/drivers/metal/rendering_device_driver_metal.mm
index 14381a1b..ff303e85 100644
--- a/engine/drivers/metal/rendering_device_driver_metal.cpp
+++ b/engine/drivers/metal/rendering_device_driver_metal.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  rendering_device_driver_metal.cpp                                     */
+/*  rendering_device_driver_metal.mm                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -48,23 +48,21 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#include "rendering_device_driver_metal.h"
+#import "rendering_device_driver_metal.h"
+
+#import "pixel_formats.h"
+#import "rendering_context_driver_metal.h"
+#import "rendering_shader_container_metal.h"
 
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
-#include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "drivers/apple/foundation_helpers.h"
-#include "drivers/metal/pixel_formats.h"
-#include "drivers/metal/rendering_context_driver_metal.h"
-#include "drivers/metal/rendering_shader_container_metal.h"
-
-#include <Metal/Metal.hpp>
-#include <os/log.h>
-#include <os/signpost.h>
 
+#import <Metal/MTLTexture.h>
+#import <Metal/Metal.h>
+#import <os/log.h>
+#import <os/signpost.h>
 #include <algorithm>
 
 #ifndef MTLGPUAddress
@@ -82,14 +80,26 @@ extern os_log_t LOG_INTERVALS;
 /*****************/
 
 // RDD::CompareOperator == VkCompareOp.
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_NEVER, MTL::CompareFunctionNever));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_LESS, MTL::CompareFunctionLess));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_EQUAL, MTL::CompareFunctionEqual));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_LESS_OR_EQUAL, MTL::CompareFunctionLessEqual));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_GREATER, MTL::CompareFunctionGreater));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_NOT_EQUAL, MTL::CompareFunctionNotEqual));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_GREATER_OR_EQUAL, MTL::CompareFunctionGreaterEqual));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_ALWAYS, MTL::CompareFunctionAlways));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_NEVER, MTLCompareFunctionNever));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_LESS, MTLCompareFunctionLess));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_EQUAL, MTLCompareFunctionEqual));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_LESS_OR_EQUAL, MTLCompareFunctionLessEqual));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_GREATER, MTLCompareFunctionGreater));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_NOT_EQUAL, MTLCompareFunctionNotEqual));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_GREATER_OR_EQUAL, MTLCompareFunctionGreaterEqual));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::COMPARE_OP_ALWAYS, MTLCompareFunctionAlways));
+
+_FORCE_INLINE_ MTLSize mipmapLevelSizeFromSize(MTLSize p_size, NSUInteger p_level) {
+	if (p_level == 0) {
+		return p_size;
+	}
+
+	MTLSize lvlSize;
+	lvlSize.width = MAX(p_size.width >> p_level, 1UL);
+	lvlSize.height = MAX(p_size.height >> p_level, 1UL);
+	lvlSize.depth = MAX(p_size.depth >> p_level, 1UL);
+	return lvlSize;
+}
 
 /*****************/
 /**** BUFFERS ****/
@@ -101,21 +111,21 @@ RDD::BufferID RenderingDeviceDriverMetal::buffer_create(uint64_t p_size, BitFiel
 		p_size = round_up_to_alignment(p_size, 16u) * _frame_count;
 	}
 
-	MTL::ResourceOptions options = 0;
+	MTLResourceOptions options = 0;
 	switch (p_allocation_type) {
 		case MEMORY_ALLOCATION_TYPE_CPU:
-			options = base_hazard_tracking | MTL::ResourceStorageModeShared;
+			options = MTLResourceHazardTrackingModeTracked | MTLResourceStorageModeShared;
 			break;
 		case MEMORY_ALLOCATION_TYPE_GPU:
 			if (p_usage.has_flag(BUFFER_USAGE_DYNAMIC_PERSISTENT_BIT)) {
-				options = MTL::ResourceHazardTrackingModeUntracked | MTL::ResourceStorageModeShared | MTL::ResourceCPUCacheModeWriteCombined;
+				options = MTLResourceHazardTrackingModeUntracked | MTLResourceStorageModeShared | MTLResourceCPUCacheModeWriteCombined;
 			} else {
-				options = base_hazard_tracking | MTL::ResourceStorageModePrivate;
+				options = MTLResourceHazardTrackingModeTracked | MTLResourceStorageModePrivate;
 			}
 			break;
 	}
 
-	MTL::Buffer *obj = device->newBuffer(p_size, options);
+	id<MTLBuffer> obj = [device newBufferWithLength:p_size options:options];
 	ERR_FAIL_NULL_V_MSG(obj, BufferID(), "Can't create buffer of size: " + itos(p_size));
 
 	BufferInfo *buf_info;
@@ -130,9 +140,7 @@ RDD::BufferID RenderingDeviceDriverMetal::buffer_create(uint64_t p_size, BitFiel
 	} else {
 		buf_info = memnew(BufferInfo);
 	}
-	buf_info->metal_buffer = NS::TransferPtr(obj);
-
-	_track_resource(buf_info->metal_buffer.get());
+	buf_info->metal_buffer = obj;
 
 	return BufferID(buf_info);
 }
@@ -144,8 +152,7 @@ bool RenderingDeviceDriverMetal::buffer_set_texel_format(BufferID p_buffer, Data
 
 void RenderingDeviceDriverMetal::buffer_free(BufferID p_buffer) {
 	BufferInfo *buf_info = (BufferInfo *)p_buffer.id;
-
-	_untrack_resource(buf_info->metal_buffer.get());
+	buf_info->metal_buffer = nil; // Tell ARC to release.
 
 	if (buf_info->is_dynamic()) {
 		memdelete((MetalBufferDynamicInfo *)buf_info);
@@ -156,13 +163,13 @@ void RenderingDeviceDriverMetal::buffer_free(BufferID p_buffer) {
 
 uint64_t RenderingDeviceDriverMetal::buffer_get_allocation_size(BufferID p_buffer) {
 	const BufferInfo *buf_info = (const BufferInfo *)p_buffer.id;
-	return buf_info->metal_buffer.get()->allocatedSize();
+	return buf_info->metal_buffer.allocatedSize;
 }
 
 uint8_t *RenderingDeviceDriverMetal::buffer_map(BufferID p_buffer) {
 	const BufferInfo *buf_info = (const BufferInfo *)p_buffer.id;
-	ERR_FAIL_COND_V_MSG(buf_info->metal_buffer.get()->storageMode() != MTL::StorageModeShared, nullptr, "Unable to map private buffers");
-	return (uint8_t *)buf_info->metal_buffer.get()->contents();
+	ERR_FAIL_COND_V_MSG(buf_info->metal_buffer.storageMode != MTLStorageModeShared, nullptr, "Unable to map private buffers");
+	return (uint8_t *)buf_info->metal_buffer.contents;
 }
 
 void RenderingDeviceDriverMetal::buffer_unmap(BufferID p_buffer) {
@@ -176,7 +183,7 @@ uint8_t *RenderingDeviceDriverMetal::buffer_persistent_map_advance(BufferID p_bu
 	ERR_FAIL_COND_V_MSG(buf_info->last_frame_mapped == p_frames_drawn, nullptr, "Buffers with BUFFER_USAGE_DYNAMIC_PERSISTENT_BIT must only be mapped once per frame. Otherwise there could be race conditions with the GPU. Amalgamate all data uploading into one map(), use an extra buffer or remove the bit.");
 	buf_info->last_frame_mapped = p_frames_drawn;
 #endif
-	return (uint8_t *)buf_info->metal_buffer.get()->contents() + buf_info->next_frame_index(_frame_count) * buf_info->size_bytes;
+	return (uint8_t *)buf_info->metal_buffer.contents + buf_info->next_frame_index(_frame_count) * buf_info->size_bytes;
 }
 
 uint64_t RenderingDeviceDriverMetal::buffer_get_dynamic_offsets(Span<BufferID> p_buffers) {
@@ -196,10 +203,14 @@ uint64_t RenderingDeviceDriverMetal::buffer_get_dynamic_offsets(Span<BufferID> p
 	return mask;
 }
 
+void RenderingDeviceDriverMetal::buffer_flush(BufferID p_buffer) {
+	// Nothing to do.
+}
+
 uint64_t RenderingDeviceDriverMetal::buffer_get_device_address(BufferID p_buffer) {
-	if (__builtin_available(iOS 16.0, macOS 13.0, *)) {
+	if (@available(iOS 16.0, macOS 13.0, *)) {
 		const BufferInfo *buf_info = (const BufferInfo *)p_buffer.id;
-		return buf_info->metal_buffer.get()->gpuAddress();
+		return buf_info->metal_buffer.gpuAddress;
 	} else {
 #if DEV_ENABLED
 		WARN_PRINT_ONCE("buffer_get_device_address is not supported on this OS version.");
@@ -212,14 +223,14 @@ uint64_t RenderingDeviceDriverMetal::buffer_get_device_address(BufferID p_buffer
 
 #pragma mark - Format Conversions
 
-static const MTL::TextureType TEXTURE_TYPE[RDD::TEXTURE_TYPE_MAX] = {
-	MTL::TextureType1D,
-	MTL::TextureType2D,
-	MTL::TextureType3D,
-	MTL::TextureTypeCube,
-	MTL::TextureType1DArray,
-	MTL::TextureType2DArray,
-	MTL::TextureTypeCubeArray,
+static const MTLTextureType TEXTURE_TYPE[RD::TEXTURE_TYPE_MAX] = {
+	MTLTextureType1D,
+	MTLTextureType2D,
+	MTLTextureType3D,
+	MTLTextureTypeCube,
+	MTLTextureType1DArray,
+	MTLTextureType2DArray,
+	MTLTextureTypeCubeArray,
 };
 
 bool RenderingDeviceDriverMetal::is_valid_linear(TextureFormat const &p_format) const {
@@ -233,28 +244,28 @@ bool RenderingDeviceDriverMetal::is_valid_linear(TextureFormat const &p_format)
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p_format, const TextureView &p_view) {
-	NS::SharedPtr<MTL::TextureDescriptor> desc = NS::TransferPtr(MTL::TextureDescriptor::alloc()->init());
-	desc->setTextureType(TEXTURE_TYPE[p_format.texture_type]);
+	MTLTextureDescriptor *desc = [MTLTextureDescriptor new];
+	desc.textureType = TEXTURE_TYPE[p_format.texture_type];
 
 	PixelFormats &formats = *pixel_formats;
-	desc->setPixelFormat((MTL::PixelFormat)formats.getMTLPixelFormat(p_format.format));
-	MTLFmtCaps format_caps = formats.getCapabilities(desc->pixelFormat());
+	desc.pixelFormat = formats.getMTLPixelFormat(p_format.format);
+	MTLFmtCaps format_caps = formats.getCapabilities(desc.pixelFormat);
 
-	desc->setWidth(p_format.width);
-	desc->setHeight(p_format.height);
-	desc->setDepth(p_format.depth);
-	desc->setMipmapLevelCount(p_format.mipmaps);
+	desc.width = p_format.width;
+	desc.height = p_format.height;
+	desc.depth = p_format.depth;
+	desc.mipmapLevelCount = p_format.mipmaps;
 
 	if (p_format.texture_type == TEXTURE_TYPE_1D_ARRAY ||
 			p_format.texture_type == TEXTURE_TYPE_2D_ARRAY) {
-		desc->setArrayLength(p_format.array_layers);
+		desc.arrayLength = p_format.array_layers;
 	} else if (p_format.texture_type == TEXTURE_TYPE_CUBE_ARRAY) {
-		desc->setArrayLength(p_format.array_layers / 6);
+		desc.arrayLength = p_format.array_layers / 6;
 	}
 
 	// TODO(sgc): Evaluate lossy texture support (perhaps as a project option?)
 	//  https://developer.apple.com/videos/play/tech-talks/10876?time=459
-	// desc->setCompressionType(MTL::TextureCompressionTypeLossy);
+	// desc.compressionType = MTLTextureCompressionTypeLossy;
 
 	if (p_format.samples > TEXTURE_SAMPLES_1) {
 		SampleCount supported = (*device_properties).find_nearest_supported_sample_count(p_format.samples);
@@ -264,19 +275,19 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p
 			if (ok) {
 				switch (p_format.texture_type) {
 					case TEXTURE_TYPE_2D:
-						desc->setTextureType(MTL::TextureType2DMultisample);
+						desc.textureType = MTLTextureType2DMultisample;
 						break;
 					case TEXTURE_TYPE_2D_ARRAY:
-						desc->setTextureType(MTL::TextureType2DMultisampleArray);
+						desc.textureType = MTLTextureType2DMultisampleArray;
 						break;
 					default:
 						break;
 				}
-				desc->setSampleCount((NS::UInteger)supported);
+				desc.sampleCount = (NSUInteger)supported;
 				if (p_format.mipmaps > 1) {
 					// For a buffer-backed or multi-sample texture, the value must be 1.
 					WARN_PRINT("mipmaps == 1 for multi-sample textures");
-					desc->setMipmapLevelCount(1);
+					desc.mipmapLevelCount = 1;
 				}
 			} else {
 				WARN_PRINT("Unsupported multi-sample texture type; disabling multi-sample");
@@ -284,85 +295,89 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p
 		}
 	}
 
-	static const MTL::TextureSwizzle COMPONENT_SWIZZLE[TEXTURE_SWIZZLE_MAX] = {
-		static_cast<MTL::TextureSwizzle>(255), // IDENTITY
-		MTL::TextureSwizzleZero,
-		MTL::TextureSwizzleOne,
-		MTL::TextureSwizzleRed,
-		MTL::TextureSwizzleGreen,
-		MTL::TextureSwizzleBlue,
-		MTL::TextureSwizzleAlpha,
+	static const MTLTextureSwizzle COMPONENT_SWIZZLE[TEXTURE_SWIZZLE_MAX] = {
+		static_cast<MTLTextureSwizzle>(255), // IDENTITY
+		MTLTextureSwizzleZero,
+		MTLTextureSwizzleOne,
+		MTLTextureSwizzleRed,
+		MTLTextureSwizzleGreen,
+		MTLTextureSwizzleBlue,
+		MTLTextureSwizzleAlpha,
 	};
 
-	MTL::TextureSwizzleChannels swizzle = MTL::TextureSwizzleChannels::Make(
-			p_view.swizzle_r != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_r] : MTL::TextureSwizzleRed,
-			p_view.swizzle_g != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_g] : MTL::TextureSwizzleGreen,
-			p_view.swizzle_b != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_b] : MTL::TextureSwizzleBlue,
-			p_view.swizzle_a != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_a] : MTL::TextureSwizzleAlpha);
+	MTLTextureSwizzleChannels swizzle = MTLTextureSwizzleChannelsMake(
+			p_view.swizzle_r != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_r] : MTLTextureSwizzleRed,
+			p_view.swizzle_g != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_g] : MTLTextureSwizzleGreen,
+			p_view.swizzle_b != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_b] : MTLTextureSwizzleBlue,
+			p_view.swizzle_a != TEXTURE_SWIZZLE_IDENTITY ? COMPONENT_SWIZZLE[p_view.swizzle_a] : MTLTextureSwizzleAlpha);
 
 	// Represents a swizzle operation that is a no-op.
-	static MTL::TextureSwizzleChannels IDENTITY_SWIZZLE = MTL::TextureSwizzleChannels::Default();
+	static MTLTextureSwizzleChannels IDENTITY_SWIZZLE = {
+		.red = MTLTextureSwizzleRed,
+		.green = MTLTextureSwizzleGreen,
+		.blue = MTLTextureSwizzleBlue,
+		.alpha = MTLTextureSwizzleAlpha,
+	};
 
-	bool no_swizzle = memcmp(&IDENTITY_SWIZZLE, &swizzle, sizeof(MTL::TextureSwizzleChannels)) == 0;
+	bool no_swizzle = memcmp(&IDENTITY_SWIZZLE, &swizzle, sizeof(MTLTextureSwizzleChannels)) == 0;
 	if (!no_swizzle) {
-		desc->setSwizzle(swizzle);
+		desc.swizzle = swizzle;
 	}
 
 	// Usage.
 
-	MTL::ResourceOptions options = 0;
+	MTLResourceOptions options = 0;
 	bool is_linear = false;
 #if defined(VISIONOS_ENABLED)
 	const bool supports_memoryless = true;
 #else
 	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations")
-	const bool supports_memoryless = (*device_properties).features.highestFamily >= MTL::GPUFamilyApple2 && (*device_properties).features.highestFamily < MTL::GPUFamilyMac1;
+	const bool supports_memoryless = (*device_properties).features.highestFamily >= MTLGPUFamilyApple2 && (*device_properties).features.highestFamily < MTLGPUFamilyMac1;
 	GODOT_CLANG_WARNING_POP
 #endif
 	if (supports_memoryless && p_format.usage_bits & TEXTURE_USAGE_TRANSIENT_BIT) {
-		options = base_hazard_tracking | MTL::ResourceStorageModeMemoryless;
-		desc->setStorageMode(MTL::StorageModeMemoryless);
+		options = MTLResourceStorageModeMemoryless | MTLResourceHazardTrackingModeTracked;
+		desc.storageMode = MTLStorageModeMemoryless;
 	} else {
-		options = base_hazard_tracking | MTL::ResourceCPUCacheModeDefaultCache;
+		options = MTLResourceCPUCacheModeDefaultCache | MTLResourceHazardTrackingModeTracked;
 		if (p_format.usage_bits & TEXTURE_USAGE_CPU_READ_BIT) {
-			options |= MTL::ResourceStorageModeShared;
+			options |= MTLResourceStorageModeShared;
 			// The user has indicated they want to read from the texture on the CPU,
 			// so we'll see if we can use a linear format.
 			// A linear format is a texture that is backed by a buffer,
 			// which allows for CPU access to the texture data via a pointer.
 			is_linear = is_valid_linear(p_format);
 		} else {
-			options |= MTL::ResourceStorageModePrivate;
+			options |= MTLResourceStorageModePrivate;
 		}
 	}
-	desc->setResourceOptions(options);
+	desc.resourceOptions = options;
 
-	MTL::TextureUsage usage = desc->usage();
 	if (p_format.usage_bits & TEXTURE_USAGE_SAMPLING_BIT) {
-		usage |= MTL::TextureUsageShaderRead;
+		desc.usage |= MTLTextureUsageShaderRead;
 	}
 
 	if (p_format.usage_bits & TEXTURE_USAGE_STORAGE_BIT) {
-		usage |= MTL::TextureUsageShaderWrite;
+		desc.usage |= MTLTextureUsageShaderWrite;
 	}
 
 	bool can_be_attachment = flags::any(format_caps, (kMTLFmtCapsColorAtt | kMTLFmtCapsDSAtt));
 
 	if (flags::any(p_format.usage_bits, TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) &&
 			can_be_attachment) {
-		usage |= MTL::TextureUsageRenderTarget;
+		desc.usage |= MTLTextureUsageRenderTarget;
 	}
 
 	if (p_format.usage_bits & TEXTURE_USAGE_INPUT_ATTACHMENT_BIT) {
-		usage |= MTL::TextureUsageShaderRead;
+		desc.usage |= MTLTextureUsageShaderRead;
 	}
 
 	if (p_format.usage_bits & TEXTURE_USAGE_STORAGE_ATOMIC_BIT) {
 		ERR_FAIL_COND_V_MSG((format_caps & kMTLFmtCapsAtomic) == 0, RDD::TextureID(), "Atomic operations on this texture format are not supported.");
 		ERR_FAIL_COND_V_MSG(!device_properties->features.supports_native_image_atomics, RDD::TextureID(), "Atomic operations on textures are not supported on this OS version. Check SUPPORTS_IMAGE_ATOMIC_32_BIT.");
 		// If supports_native_image_atomics is true, this condition should always succeed, as it is set the same.
-		if (__builtin_available(macOS 14.0, iOS 17.0, tvOS 17.0, *)) {
-			usage |= MTL::TextureUsageShaderAtomic;
+		if (@available(macOS 14.0, iOS 17.0, tvOS 17.0, *)) {
+			desc.usage |= MTLTextureUsageShaderAtomic;
 		}
 	}
 
@@ -373,7 +388,7 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p
 	if (flags::any(p_format.usage_bits, TEXTURE_USAGE_CAN_UPDATE_BIT | TEXTURE_USAGE_CAN_COPY_TO_BIT) &&
 			can_be_attachment && no_swizzle) {
 		// Per MoltenVK, can be cleared as a render attachment.
-		usage |= MTL::TextureUsageRenderTarget;
+		desc.usage |= MTLTextureUsageRenderTarget;
 	}
 	if (p_format.usage_bits & TEXTURE_USAGE_CAN_COPY_FROM_BIT) {
 		// Covered by blits.
@@ -381,169 +396,180 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p
 
 	// Create texture views with a different component layout.
 	if (!p_format.shareable_formats.is_empty()) {
-		usage |= MTL::TextureUsagePixelFormatView;
+		desc.usage |= MTLTextureUsagePixelFormatView;
 	}
 
-	desc->setUsage(usage);
-
 	// Allocate memory.
 
-	MTL::Texture *obj = nullptr;
+	id<MTLTexture> obj = nil;
 	if (is_linear) {
 		// Linear textures are restricted to 2D textures, a single mipmap level and a single array layer.
-		MTL::PixelFormat pixel_format = desc->pixelFormat();
+		MTLPixelFormat pixel_format = desc.pixelFormat;
 		size_t row_alignment = get_texel_buffer_alignment_for_format(p_format.format);
 		size_t bytes_per_row = formats.getBytesPerRow(pixel_format, p_format.width);
 		bytes_per_row = round_up_to_alignment(bytes_per_row, row_alignment);
 		size_t bytes_per_layer = formats.getBytesPerLayer(pixel_format, bytes_per_row, p_format.height);
 		size_t byte_count = bytes_per_layer * p_format.depth * p_format.array_layers;
 
-		MTL::Buffer *buf = device->newBuffer(byte_count, options);
-		obj = buf->newTexture(desc.get(), 0, bytes_per_row);
-		buf->release();
-
-		_track_resource(buf);
+		id<MTLBuffer> buf = [device newBufferWithLength:byte_count options:options];
+		obj = [buf newTextureWithDescriptor:desc offset:0 bytesPerRow:bytes_per_row];
 	} else {
-		obj = device->newTexture(desc.get());
+		obj = [device newTextureWithDescriptor:desc];
 	}
 	ERR_FAIL_NULL_V_MSG(obj, TextureID(), "Unable to create texture.");
 
-	_track_resource(obj);
-
-	return TextureID(reinterpret_cast<uint64_t>(obj));
+	return rid::make(obj);
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_t p_native_texture, TextureType p_type, DataFormat p_format, uint32_t p_array_layers, bool p_depth_stencil, uint32_t p_mipmaps) {
-	MTL::Texture *res = reinterpret_cast<MTL::Texture *>(p_native_texture);
+	id<MTLTexture> res = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;
 
 	// If the requested format is different, we need to create a view.
-	MTL::PixelFormat format = (MTL::PixelFormat)pixel_formats->getMTLPixelFormat(p_format);
-	if (res->pixelFormat() != format) {
-		MTL::TextureSwizzleChannels swizzle = MTL::TextureSwizzleChannels::Default();
-		res = res->newTextureView(format, res->textureType(), NS::Range::Make(0, res->mipmapLevelCount()), NS::Range::Make(0, p_array_layers), swizzle);
+	MTLPixelFormat format = pixel_formats->getMTLPixelFormat(p_format);
+	if (res.pixelFormat != format) {
+		MTLTextureSwizzleChannels swizzle = MTLTextureSwizzleChannelsMake(
+				MTLTextureSwizzleRed,
+				MTLTextureSwizzleGreen,
+				MTLTextureSwizzleBlue,
+				MTLTextureSwizzleAlpha);
+		res = [res newTextureViewWithPixelFormat:format
+									 textureType:res.textureType
+										  levels:NSMakeRange(0, res.mipmapLevelCount)
+										  slices:NSMakeRange(0, p_array_layers)
+										 swizzle:swizzle];
 		ERR_FAIL_NULL_V_MSG(res, TextureID(), "Unable to create texture view.");
 	}
 
-	_track_resource(res);
-
-	return TextureID(reinterpret_cast<uint64_t>(res));
+	return rid::make(res);
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {
-	MTL::Texture *src_texture = reinterpret_cast<MTL::Texture *>(p_original_texture.id);
+	id<MTLTexture> src_texture = rid::get(p_original_texture);
 
-	NS::UInteger slices = src_texture->arrayLength();
-	if (src_texture->textureType() == MTL::TextureTypeCube) {
+	NSUInteger slices = src_texture.arrayLength;
+	if (src_texture.textureType == MTLTextureTypeCube) {
 		// Metal expects Cube textures to have a slice count of 6.
 		slices = 6;
-	} else if (src_texture->textureType() == MTL::TextureTypeCubeArray) {
+	} else if (src_texture.textureType == MTLTextureTypeCubeArray) {
 		// Metal expects Cube Array textures to have 6 slices per layer.
 		slices *= 6;
 	}
 
 #if DEV_ENABLED
-	if (src_texture->sampleCount() > 1) {
+	if (src_texture.sampleCount > 1) {
 		// TODO(sgc): is it ok to create a shared texture from a multi-sample texture?
 		WARN_PRINT("Is it safe to create a shared texture from multi-sample texture?");
 	}
 #endif
 
-	MTL::PixelFormat format = (MTL::PixelFormat)pixel_formats->getMTLPixelFormat(p_view.format);
+	MTLPixelFormat format = pixel_formats->getMTLPixelFormat(p_view.format);
 
-	static const MTL::TextureSwizzle component_swizzle[TEXTURE_SWIZZLE_MAX] = {
-		static_cast<MTL::TextureSwizzle>(255), // IDENTITY
-		MTL::TextureSwizzleZero,
-		MTL::TextureSwizzleOne,
-		MTL::TextureSwizzleRed,
-		MTL::TextureSwizzleGreen,
-		MTL::TextureSwizzleBlue,
-		MTL::TextureSwizzleAlpha,
+	static const MTLTextureSwizzle component_swizzle[TEXTURE_SWIZZLE_MAX] = {
+		static_cast<MTLTextureSwizzle>(255), // IDENTITY
+		MTLTextureSwizzleZero,
+		MTLTextureSwizzleOne,
+		MTLTextureSwizzleRed,
+		MTLTextureSwizzleGreen,
+		MTLTextureSwizzleBlue,
+		MTLTextureSwizzleAlpha,
 	};
 
-#define SWIZZLE(C, CHAN) (p_view.swizzle_##C != TEXTURE_SWIZZLE_IDENTITY ? component_swizzle[p_view.swizzle_##C] : MTL::TextureSwizzle##CHAN)
-	MTL::TextureSwizzleChannels swizzle = MTL::TextureSwizzleChannels::Make(SWIZZLE(r, Red), SWIZZLE(g, Green), SWIZZLE(b, Blue), SWIZZLE(a, Alpha));
+#define SWIZZLE(C, CHAN) (p_view.swizzle_##C != TEXTURE_SWIZZLE_IDENTITY ? component_swizzle[p_view.swizzle_##C] : MTLTextureSwizzle##CHAN)
+	MTLTextureSwizzleChannels swizzle = MTLTextureSwizzleChannelsMake(
+			SWIZZLE(r, Red),
+			SWIZZLE(g, Green),
+			SWIZZLE(b, Blue),
+			SWIZZLE(a, Alpha));
 #undef SWIZZLE
-	MTL::Texture *obj = src_texture->newTextureView(format, src_texture->textureType(), NS::Range::Make(0, src_texture->mipmapLevelCount()), NS::Range::Make(0, slices), swizzle);
+	id<MTLTexture> obj = [src_texture newTextureViewWithPixelFormat:format
+														textureType:src_texture.textureType
+															 levels:NSMakeRange(0, src_texture.mipmapLevelCount)
+															 slices:NSMakeRange(0, slices)
+															swizzle:swizzle];
 	ERR_FAIL_NULL_V_MSG(obj, TextureID(), "Unable to create shared texture");
-	_track_resource(obj);
-	return TextureID(reinterpret_cast<uint64_t>(obj));
+	return rid::make(obj);
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared_from_slice(TextureID p_original_texture, const TextureView &p_view, TextureSliceType p_slice_type, uint32_t p_layer, uint32_t p_layers, uint32_t p_mipmap, uint32_t p_mipmaps) {
-	MTL::Texture *src_texture = reinterpret_cast<MTL::Texture *>(p_original_texture.id);
+	id<MTLTexture> src_texture = rid::get(p_original_texture);
 
-	static const MTL::TextureType VIEW_TYPES[] = {
-		MTL::TextureType1D, // MTLTextureType1D
-		MTL::TextureType1D, // MTLTextureType1DArray
-		MTL::TextureType2D, // MTLTextureType2D
-		MTL::TextureType2D, // MTLTextureType2DArray
-		MTL::TextureType2D, // MTLTextureType2DMultisample
-		MTL::TextureType2D, // MTLTextureTypeCube
-		MTL::TextureType2D, // MTLTextureTypeCubeArray
-		MTL::TextureType2D, // MTLTextureType3D
-		MTL::TextureType2D, // MTLTextureType2DMultisampleArray
+	static const MTLTextureType VIEW_TYPES[] = {
+		MTLTextureType1D, // MTLTextureType1D
+		MTLTextureType1D, // MTLTextureType1DArray
+		MTLTextureType2D, // MTLTextureType2D
+		MTLTextureType2D, // MTLTextureType2DArray
+		MTLTextureType2D, // MTLTextureType2DMultisample
+		MTLTextureType2D, // MTLTextureTypeCube
+		MTLTextureType2D, // MTLTextureTypeCubeArray
+		MTLTextureType2D, // MTLTextureType3D
+		MTLTextureType2D, // MTLTextureType2DMultisampleArray
 	};
 
-	MTL::TextureType textureType = VIEW_TYPES[src_texture->textureType()];
+	MTLTextureType textureType = VIEW_TYPES[src_texture.textureType];
 	switch (p_slice_type) {
 		case TEXTURE_SLICE_2D: {
-			textureType = MTL::TextureType2D;
+			textureType = MTLTextureType2D;
 		} break;
 		case TEXTURE_SLICE_3D: {
-			textureType = MTL::TextureType3D;
+			textureType = MTLTextureType3D;
 		} break;
 		case TEXTURE_SLICE_CUBEMAP: {
-			textureType = MTL::TextureTypeCube;
+			textureType = MTLTextureTypeCube;
 		} break;
 		case TEXTURE_SLICE_2D_ARRAY: {
-			textureType = MTL::TextureType2DArray;
+			textureType = MTLTextureType2DArray;
 		} break;
 		case TEXTURE_SLICE_MAX: {
 			ERR_FAIL_V_MSG(TextureID(), "Invalid texture slice type");
 		} break;
 	}
 
-	MTL::PixelFormat format = (MTL::PixelFormat)pixel_formats->getMTLPixelFormat(p_view.format);
+	MTLPixelFormat format = pixel_formats->getMTLPixelFormat(p_view.format);
 
-	static const MTL::TextureSwizzle component_swizzle[TEXTURE_SWIZZLE_MAX] = {
-		static_cast<MTL::TextureSwizzle>(255), // IDENTITY
-		MTL::TextureSwizzleZero,
-		MTL::TextureSwizzleOne,
-		MTL::TextureSwizzleRed,
-		MTL::TextureSwizzleGreen,
-		MTL::TextureSwizzleBlue,
-		MTL::TextureSwizzleAlpha,
+	static const MTLTextureSwizzle component_swizzle[TEXTURE_SWIZZLE_MAX] = {
+		static_cast<MTLTextureSwizzle>(255), // IDENTITY
+		MTLTextureSwizzleZero,
+		MTLTextureSwizzleOne,
+		MTLTextureSwizzleRed,
+		MTLTextureSwizzleGreen,
+		MTLTextureSwizzleBlue,
+		MTLTextureSwizzleAlpha,
 	};
 
-#define SWIZZLE(C, CHAN) (p_view.swizzle_##C != TEXTURE_SWIZZLE_IDENTITY ? component_swizzle[p_view.swizzle_##C] : MTL::TextureSwizzle##CHAN)
-	MTL::TextureSwizzleChannels swizzle = MTL::TextureSwizzleChannels::Make(SWIZZLE(r, Red), SWIZZLE(g, Green), SWIZZLE(b, Blue), SWIZZLE(a, Alpha));
+#define SWIZZLE(C, CHAN) (p_view.swizzle_##C != TEXTURE_SWIZZLE_IDENTITY ? component_swizzle[p_view.swizzle_##C] : MTLTextureSwizzle##CHAN)
+	MTLTextureSwizzleChannels swizzle = MTLTextureSwizzleChannelsMake(
+			SWIZZLE(r, Red),
+			SWIZZLE(g, Green),
+			SWIZZLE(b, Blue),
+			SWIZZLE(a, Alpha));
 #undef SWIZZLE
-	MTL::Texture *obj = src_texture->newTextureView(format, textureType, NS::Range::Make(p_mipmap, p_mipmaps), NS::Range::Make(p_layer, p_layers), swizzle);
+	id<MTLTexture> obj = [src_texture newTextureViewWithPixelFormat:format
+														textureType:textureType
+															 levels:NSMakeRange(p_mipmap, p_mipmaps)
+															 slices:NSMakeRange(p_layer, p_layers)
+															swizzle:swizzle];
 	ERR_FAIL_NULL_V_MSG(obj, TextureID(), "Unable to create shared texture");
-	_track_resource(obj);
-	return TextureID(reinterpret_cast<uint64_t>(obj));
+	return rid::make(obj);
 }
 
 void RenderingDeviceDriverMetal::texture_free(TextureID p_texture) {
-	MTL::Texture *obj = reinterpret_cast<MTL::Texture *>(p_texture.id);
-	_untrack_resource(obj);
-	obj->release();
+	rid::release(p_texture);
 }
 
 uint64_t RenderingDeviceDriverMetal::texture_get_allocation_size(TextureID p_texture) {
-	MTL::Texture *obj = reinterpret_cast<MTL::Texture *>(p_texture.id);
-	return NS::Object::sendMessageSafe<NS::UInteger>(obj, _MTL_PRIVATE_SEL(allocatedSize));
+	id<MTLTexture> __unsafe_unretained obj = rid::get(p_texture);
+	return obj.allocatedSize;
 }
 
 void RenderingDeviceDriverMetal::texture_get_copyable_layout(TextureID p_texture, const TextureSubresource &p_subresource, TextureCopyableLayout *r_layout) {
-	MTL::Texture *obj = reinterpret_cast<MTL::Texture *>(p_texture.id);
+	id<MTLTexture> __unsafe_unretained obj = rid::get(p_texture);
 
 	PixelFormats &pf = *pixel_formats;
-	DataFormat format = pf.getDataFormat(obj->pixelFormat());
+	DataFormat format = pf.getDataFormat(obj.pixelFormat);
 
-	uint32_t w = MAX(1u, obj->width() >> p_subresource.mipmap);
-	uint32_t h = MAX(1u, obj->height() >> p_subresource.mipmap);
-	uint32_t d = MAX(1u, obj->depth() >> p_subresource.mipmap);
+	uint32_t w = MAX(1u, obj.width >> p_subresource.mipmap);
+	uint32_t h = MAX(1u, obj.height >> p_subresource.mipmap);
+	uint32_t d = MAX(1u, obj.depth >> p_subresource.mipmap);
 
 	uint32_t bw = 0, bh = 0;
 	get_compressed_image_format_block_dimensions(format, bw, bh);
@@ -555,24 +581,23 @@ void RenderingDeviceDriverMetal::texture_get_copyable_layout(TextureID p_texture
 }
 
 Vector<uint8_t> RenderingDeviceDriverMetal::texture_get_data(TextureID p_texture, uint32_t p_layer) {
-	MTL::Texture *obj = reinterpret_cast<MTL::Texture *>(p_texture.id);
-	ERR_FAIL_COND_V_MSG(obj->storageMode() != MTL::StorageModeShared, Vector<uint8_t>(), "Texture must be created with TEXTURE_USAGE_CPU_READ_BIT set.");
+	id<MTLTexture> obj = rid::get(p_texture);
+	ERR_FAIL_COND_V_MSG(obj.storageMode != MTLStorageModeShared, Vector<uint8_t>(), "Texture must be created with TEXTURE_USAGE_CPU_READ_BIT set.");
 
-	MTL::Buffer *buf = obj->buffer();
-	if (buf) {
+	if (obj.buffer) {
 		ERR_FAIL_COND_V_MSG(p_layer > 0, Vector<uint8_t>(), "A linear texture has a single layer.");
-		ERR_FAIL_COND_V_MSG(obj->mipmapLevelCount() > 1, Vector<uint8_t>(), "A linear texture has a single mipmap level.");
+		ERR_FAIL_COND_V_MSG(obj.mipmapLevelCount > 1, Vector<uint8_t>(), "A linear texture has a single mipmap level.");
 		Vector<uint8_t> image_data;
-		image_data.resize_uninitialized(buf->length());
-		memcpy(image_data.ptrw(), buf->contents(), buf->length());
+		image_data.resize_uninitialized(obj.buffer.length);
+		memcpy(image_data.ptrw(), obj.buffer.contents, obj.buffer.length);
 		return image_data;
 	}
 
-	DataFormat tex_format = pixel_formats->getDataFormat(obj->pixelFormat());
-	uint32_t tex_w = obj->width();
-	uint32_t tex_h = obj->height();
-	uint32_t tex_d = obj->depth();
-	uint32_t tex_mipmaps = obj->mipmapLevelCount();
+	DataFormat tex_format = pixel_formats->getDataFormat(obj.pixelFormat);
+	uint32_t tex_w = obj.width;
+	uint32_t tex_h = obj.height;
+	uint32_t tex_d = obj.depth;
+	uint32_t tex_mipmaps = obj.mipmapLevelCount;
 
 	// Must iteratively copy the texture data to a buffer.
 
@@ -596,7 +621,12 @@ Vector<uint8_t> RenderingDeviceDriverMetal::texture_get_data(TextureID p_texture
 		uint32_t bytes_per_img = bytes_per_row * bh;
 		uint32_t mip_size = bytes_per_img * tex_d;
 
-		obj->getBytes(dest_ptr, bytes_per_row, bytes_per_img, MTL::Region(0, 0, 0, bw, bh, tex_d), mm_i, p_layer);
+		[obj getBytes:(void *)dest_ptr
+				  bytesPerRow:bytes_per_row
+				bytesPerImage:bytes_per_img
+				   fromRegion:MTLRegionMake3D(0, 0, 0, bw, bh, tex_d)
+				  mipmapLevel:mm_i
+						slice:p_layer];
 
 		dest_ptr += mip_size;
 
@@ -614,7 +644,7 @@ Vector<uint8_t> RenderingDeviceDriverMetal::texture_get_data(TextureID p_texture
 
 BitField<RDD::TextureUsageBits> RenderingDeviceDriverMetal::texture_get_usages_supported_by_format(DataFormat p_format, bool p_cpu_readable) {
 	PixelFormats &pf = *pixel_formats;
-	if (pf.getMTLPixelFormat(p_format) == MTL::PixelFormatInvalid) {
+	if (pf.getMTLPixelFormat(p_format) == MTLPixelFormatInvalid) {
 		return 0;
 	}
 
@@ -647,134 +677,114 @@ bool RenderingDeviceDriverMetal::texture_can_make_shared_with_format(TextureID p
 
 #pragma mark - Sampler
 
-static const MTL::CompareFunction COMPARE_OPERATORS[RDD::COMPARE_OP_MAX] = {
-	MTL::CompareFunctionNever,
-	MTL::CompareFunctionLess,
-	MTL::CompareFunctionEqual,
-	MTL::CompareFunctionLessEqual,
-	MTL::CompareFunctionGreater,
-	MTL::CompareFunctionNotEqual,
-	MTL::CompareFunctionGreaterEqual,
-	MTL::CompareFunctionAlways,
+static const MTLCompareFunction COMPARE_OPERATORS[RD::COMPARE_OP_MAX] = {
+	MTLCompareFunctionNever,
+	MTLCompareFunctionLess,
+	MTLCompareFunctionEqual,
+	MTLCompareFunctionLessEqual,
+	MTLCompareFunctionGreater,
+	MTLCompareFunctionNotEqual,
+	MTLCompareFunctionGreaterEqual,
+	MTLCompareFunctionAlways,
 };
 
-static const MTL::StencilOperation STENCIL_OPERATIONS[RDD::STENCIL_OP_MAX] = {
-	MTL::StencilOperationKeep,
-	MTL::StencilOperationZero,
-	MTL::StencilOperationReplace,
-	MTL::StencilOperationIncrementClamp,
-	MTL::StencilOperationDecrementClamp,
-	MTL::StencilOperationInvert,
-	MTL::StencilOperationIncrementWrap,
-	MTL::StencilOperationDecrementWrap,
+static const MTLStencilOperation STENCIL_OPERATIONS[RD::STENCIL_OP_MAX] = {
+	MTLStencilOperationKeep,
+	MTLStencilOperationZero,
+	MTLStencilOperationReplace,
+	MTLStencilOperationIncrementClamp,
+	MTLStencilOperationDecrementClamp,
+	MTLStencilOperationInvert,
+	MTLStencilOperationIncrementWrap,
+	MTLStencilOperationDecrementWrap,
 };
 
-static const MTL::BlendFactor BLEND_FACTORS[RDD::BLEND_FACTOR_MAX] = {
-	MTL::BlendFactorZero,
-	MTL::BlendFactorOne,
-	MTL::BlendFactorSourceColor,
-	MTL::BlendFactorOneMinusSourceColor,
-	MTL::BlendFactorDestinationColor,
-	MTL::BlendFactorOneMinusDestinationColor,
-	MTL::BlendFactorSourceAlpha,
-	MTL::BlendFactorOneMinusSourceAlpha,
-	MTL::BlendFactorDestinationAlpha,
-	MTL::BlendFactorOneMinusDestinationAlpha,
-	MTL::BlendFactorBlendColor,
-	MTL::BlendFactorOneMinusBlendColor,
-	MTL::BlendFactorBlendAlpha,
-	MTL::BlendFactorOneMinusBlendAlpha,
-	MTL::BlendFactorSourceAlphaSaturated,
-	MTL::BlendFactorSource1Color,
-	MTL::BlendFactorOneMinusSource1Color,
-	MTL::BlendFactorSource1Alpha,
-	MTL::BlendFactorOneMinusSource1Alpha,
+static const MTLBlendFactor BLEND_FACTORS[RD::BLEND_FACTOR_MAX] = {
+	MTLBlendFactorZero,
+	MTLBlendFactorOne,
+	MTLBlendFactorSourceColor,
+	MTLBlendFactorOneMinusSourceColor,
+	MTLBlendFactorDestinationColor,
+	MTLBlendFactorOneMinusDestinationColor,
+	MTLBlendFactorSourceAlpha,
+	MTLBlendFactorOneMinusSourceAlpha,
+	MTLBlendFactorDestinationAlpha,
+	MTLBlendFactorOneMinusDestinationAlpha,
+	MTLBlendFactorBlendColor,
+	MTLBlendFactorOneMinusBlendColor,
+	MTLBlendFactorBlendAlpha,
+	MTLBlendFactorOneMinusBlendAlpha,
+	MTLBlendFactorSourceAlphaSaturated,
+	MTLBlendFactorSource1Color,
+	MTLBlendFactorOneMinusSource1Color,
+	MTLBlendFactorSource1Alpha,
+	MTLBlendFactorOneMinusSource1Alpha,
 };
-static const MTL::BlendOperation BLEND_OPERATIONS[RDD::BLEND_OP_MAX] = {
-	MTL::BlendOperationAdd,
-	MTL::BlendOperationSubtract,
-	MTL::BlendOperationReverseSubtract,
-	MTL::BlendOperationMin,
-	MTL::BlendOperationMax,
+static const MTLBlendOperation BLEND_OPERATIONS[RD::BLEND_OP_MAX] = {
+	MTLBlendOperationAdd,
+	MTLBlendOperationSubtract,
+	MTLBlendOperationReverseSubtract,
+	MTLBlendOperationMin,
+	MTLBlendOperationMax,
 };
 
-static const MTL::SamplerAddressMode ADDRESS_MODES[RDD::SAMPLER_REPEAT_MODE_MAX] = {
-	MTL::SamplerAddressModeRepeat,
-	MTL::SamplerAddressModeMirrorRepeat,
-	MTL::SamplerAddressModeClampToEdge,
-	MTL::SamplerAddressModeClampToBorderColor,
-	MTL::SamplerAddressModeMirrorClampToEdge,
+static const API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MTLSamplerAddressMode ADDRESS_MODES[RD::SAMPLER_REPEAT_MODE_MAX] = {
+	MTLSamplerAddressModeRepeat,
+	MTLSamplerAddressModeMirrorRepeat,
+	MTLSamplerAddressModeClampToEdge,
+	MTLSamplerAddressModeClampToBorderColor,
+	MTLSamplerAddressModeMirrorClampToEdge,
 };
 
-static const MTL::SamplerBorderColor SAMPLER_BORDER_COLORS[RDD::SAMPLER_BORDER_COLOR_MAX] = {
-	MTL::SamplerBorderColorTransparentBlack,
-	MTL::SamplerBorderColorTransparentBlack,
-	MTL::SamplerBorderColorOpaqueBlack,
-	MTL::SamplerBorderColorOpaqueBlack,
-	MTL::SamplerBorderColorOpaqueWhite,
-	MTL::SamplerBorderColorOpaqueWhite,
+static const API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MTLSamplerBorderColor SAMPLER_BORDER_COLORS[RD::SAMPLER_BORDER_COLOR_MAX] = {
+	MTLSamplerBorderColorTransparentBlack,
+	MTLSamplerBorderColorTransparentBlack,
+	MTLSamplerBorderColorOpaqueBlack,
+	MTLSamplerBorderColorOpaqueBlack,
+	MTLSamplerBorderColorOpaqueWhite,
+	MTLSamplerBorderColorOpaqueWhite,
 };
 
 RDD::SamplerID RenderingDeviceDriverMetal::sampler_create(const SamplerState &p_state) {
-	NS::SharedPtr<MTL::SamplerDescriptor> desc = NS::TransferPtr(MTL::SamplerDescriptor::alloc()->init());
-	desc->setSupportArgumentBuffers(true);
+	MTLSamplerDescriptor *desc = [MTLSamplerDescriptor new];
+	desc.supportArgumentBuffers = YES;
 
-	desc->setMagFilter(p_state.mag_filter == SAMPLER_FILTER_LINEAR ? MTL::SamplerMinMagFilterLinear : MTL::SamplerMinMagFilterNearest);
-	desc->setMinFilter(p_state.min_filter == SAMPLER_FILTER_LINEAR ? MTL::SamplerMinMagFilterLinear : MTL::SamplerMinMagFilterNearest);
-	desc->setMipFilter(p_state.mip_filter == SAMPLER_FILTER_LINEAR ? MTL::SamplerMipFilterLinear : MTL::SamplerMipFilterNearest);
+	desc.magFilter = p_state.mag_filter == SAMPLER_FILTER_LINEAR ? MTLSamplerMinMagFilterLinear : MTLSamplerMinMagFilterNearest;
+	desc.minFilter = p_state.min_filter == SAMPLER_FILTER_LINEAR ? MTLSamplerMinMagFilterLinear : MTLSamplerMinMagFilterNearest;
+	desc.mipFilter = p_state.mip_filter == SAMPLER_FILTER_LINEAR ? MTLSamplerMipFilterLinear : MTLSamplerMipFilterNearest;
 
-	MTL::SamplerAddressMode address_u = ADDRESS_MODES[p_state.repeat_u];
-	MTL::SamplerAddressMode address_v = ADDRESS_MODES[p_state.repeat_v];
-	MTL::SamplerAddressMode address_w = ADDRESS_MODES[p_state.repeat_w];
-
-	if (!device_properties->features.supports_border_color) {
-		// Default to clamp to edge if border color is not supported.
-		if (address_u == MTL::SamplerAddressModeClampToBorderColor) {
-			address_u = MTL::SamplerAddressModeClampToEdge;
-		}
-		if (address_v == MTL::SamplerAddressModeClampToBorderColor) {
-			address_v = MTL::SamplerAddressModeClampToEdge;
-		}
-		if (address_w == MTL::SamplerAddressModeClampToBorderColor) {
-			address_w = MTL::SamplerAddressModeClampToEdge;
-		}
-	}
-
-	desc->setSAddressMode(address_u);
-	desc->setTAddressMode(address_v);
-	desc->setRAddressMode(address_w);
+	desc.sAddressMode = ADDRESS_MODES[p_state.repeat_u];
+	desc.tAddressMode = ADDRESS_MODES[p_state.repeat_v];
+	desc.rAddressMode = ADDRESS_MODES[p_state.repeat_w];
 
 	if (p_state.use_anisotropy) {
-		desc->setMaxAnisotropy(p_state.anisotropy_max);
+		desc.maxAnisotropy = p_state.anisotropy_max;
 	}
 
-	desc->setCompareFunction(COMPARE_OPERATORS[p_state.compare_op]);
+	desc.compareFunction = COMPARE_OPERATORS[p_state.compare_op];
 
-	desc->setLodMinClamp(p_state.min_lod);
-	desc->setLodMaxClamp(p_state.max_lod);
+	desc.lodMinClamp = p_state.min_lod;
+	desc.lodMaxClamp = p_state.max_lod;
 
-	if (device_properties->features.supports_border_color) {
-		desc->setBorderColor(SAMPLER_BORDER_COLORS[p_state.border_color]);
-	}
+	desc.borderColor = SAMPLER_BORDER_COLORS[p_state.border_color];
 
-	desc->setNormalizedCoordinates(!p_state.unnormalized_uvw);
+	desc.normalizedCoordinates = !p_state.unnormalized_uvw;
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 260000 || __TV_OS_VERSION_MAX_ALLOWED >= 260000 || __VISION_OS_VERSION_MAX_ALLOWED >= 260000
 	if (p_state.lod_bias != 0.0) {
-		if (__builtin_available(macOS 26.0, iOS 26.0, tvOS 26.0, visionOS 26.0, *)) {
-			desc->setLodBias(p_state.lod_bias);
+		if (@available(macOS 26.0, iOS 26.0, tvOS 26.0, visionOS 26.0, *)) {
+			desc.lodBias = p_state.lod_bias;
 		}
 	}
 #endif
 
-	MTL::SamplerState *obj = device->newSamplerState(desc.get());
-	ERR_FAIL_NULL_V_MSG(obj, SamplerID(), "newSamplerState failed");
-	return SamplerID(reinterpret_cast<uint64_t>(obj));
+	id<MTLSamplerState> obj = [device newSamplerStateWithDescriptor:desc];
+	ERR_FAIL_NULL_V_MSG(obj, SamplerID(), "newSamplerStateWithDescriptor failed");
+	return rid::make(obj);
 }
 
 void RenderingDeviceDriverMetal::sampler_free(SamplerID p_sampler) {
-	MTL::SamplerState *obj = reinterpret_cast<MTL::SamplerState *>(p_sampler.id);
-	obj->release();
+	rid::release(p_sampler);
 }
 
 bool RenderingDeviceDriverMetal::sampler_is_format_supported_for_filter(DataFormat p_format, SamplerFilter p_filter) {
@@ -791,43 +801,40 @@ bool RenderingDeviceDriverMetal::sampler_is_format_supported_for_filter(DataForm
 #pragma mark - Vertex Array
 
 RDD::VertexFormatID RenderingDeviceDriverMetal::vertex_format_create(Span<VertexAttribute> p_vertex_attribs, const VertexAttributeBindingsMap &p_vertex_bindings) {
-	MTL::VertexDescriptor *desc = MTL::VertexDescriptor::vertexDescriptor();
+	MTLVertexDescriptor *desc = MTLVertexDescriptor.vertexDescriptor;
 
 	for (const VertexAttributeBindingsMap::KV &kv : p_vertex_bindings) {
 		uint32_t idx = get_metal_buffer_index_for_vertex_attribute_binding(kv.key);
-		MTL::VertexBufferLayoutDescriptor *ld = desc->layouts()->object(idx);
+		MTLVertexBufferLayoutDescriptor *ld = desc.layouts[idx];
 		if (kv.value.stride != 0) {
-			ld->setStepFunction(kv.value.frequency == VERTEX_FREQUENCY_VERTEX ? MTL::VertexStepFunctionPerVertex : MTL::VertexStepFunctionPerInstance);
-			ld->setStepRate(1);
-			ld->setStride(kv.value.stride);
+			ld.stepFunction = kv.value.frequency == VERTEX_FREQUENCY_VERTEX ? MTLVertexStepFunctionPerVertex : MTLVertexStepFunctionPerInstance;
+			ld.stepRate = 1;
+			ld.stride = kv.value.stride;
 		} else {
-			ld->setStepFunction(MTL::VertexStepFunctionConstant);
-			ld->setStepRate(0);
-			ld->setStride(0);
+			ld.stepFunction = MTLVertexStepFunctionConstant;
+			ld.stepRate = 0;
+			ld.stride = 0;
 		}
-		DEV_ASSERT(ld->stride() == desc->layouts()->object(idx)->stride());
+		DEV_ASSERT(ld.stride == desc.layouts[idx].stride);
 	}
 
 	for (const VertexAttribute &vf : p_vertex_attribs) {
-		MTL::VertexAttributeDescriptor *attr = desc->attributes()->object(vf.location);
-		attr->setFormat((MTL::VertexFormat)pixel_formats->getMTLVertexFormat(vf.format));
-		attr->setOffset(vf.offset);
+		desc.attributes[vf.location].format = pixel_formats->getMTLVertexFormat(vf.format);
+		desc.attributes[vf.location].offset = vf.offset;
 		uint32_t idx = get_metal_buffer_index_for_vertex_attribute_binding(vf.binding);
-		attr->setBufferIndex(idx);
+		desc.attributes[vf.location].bufferIndex = idx;
 		if (vf.stride == 0) {
 			// Constant attribute, so we must determine the stride to satisfy Metal API.
-			uint32_t stride = desc->layouts()->object(idx)->stride();
-			desc->layouts()->object(idx)->setStride(std::max(stride, vf.offset + pixel_formats->getBytesPerBlock(vf.format)));
+			uint32_t stride = desc.layouts[idx].stride;
+			desc.layouts[idx].stride = std::max(stride, vf.offset + pixel_formats->getBytesPerBlock(vf.format));
 		}
 	}
 
-	desc->retain();
-	return VertexFormatID(reinterpret_cast<uint64_t>(desc));
+	return rid::make(desc);
 }
 
 void RenderingDeviceDriverMetal::vertex_format_free(VertexFormatID p_vertex_format) {
-	MTL::VertexDescriptor *obj = reinterpret_cast<MTL::VertexDescriptor *>(p_vertex_format.id);
-	obj->release();
+	rid::release(p_vertex_format);
 }
 
 #pragma mark - Barriers
@@ -838,10 +845,40 @@ void RenderingDeviceDriverMetal::command_pipeline_barrier(
 		BitField<PipelineStageBits> p_dst_stages,
 		VectorView<MemoryAccessBarrier> p_memory_barriers,
 		VectorView<BufferBarrier> p_buffer_barriers,
-		VectorView<TextureBarrier> p_texture_barriers,
-		VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) {
-	MDCommandBufferBase *obj = (MDCommandBufferBase *)(p_cmd_buffer.id);
-	obj->pipeline_barrier(p_src_stages, p_dst_stages, p_memory_barriers, p_buffer_barriers, p_texture_barriers, p_acceleration_structure_barriers);
+		VectorView<TextureBarrier> p_texture_barriers) {
+	WARN_PRINT_ONCE("not implemented");
+}
+
+#pragma mark - Fences
+
+RDD::FenceID RenderingDeviceDriverMetal::fence_create() {
+	Fence *fence = nullptr;
+	if (@available(macOS 10.14, iOS 12.0, tvOS 12.0, visionOS 1.0, *)) {
+		fence = memnew(FenceEvent([device newSharedEvent]));
+	} else {
+		fence = memnew(FenceSemaphore());
+	}
+	return FenceID(fence);
+}
+
+Error RenderingDeviceDriverMetal::fence_wait(FenceID p_fence) {
+	Fence *fence = (Fence *)(p_fence.id);
+	return fence->wait(1000);
+}
+
+void RenderingDeviceDriverMetal::fence_free(FenceID p_fence) {
+	Fence *fence = (Fence *)(p_fence.id);
+	memdelete(fence);
+}
+
+#pragma mark - Semaphores
+
+RDD::SemaphoreID RenderingDeviceDriverMetal::semaphore_create() {
+	// Metal doesn't use semaphores, as their purpose within Godot is to ensure ordering of command buffer execution.
+	return SemaphoreID(1);
+}
+
+void RenderingDeviceDriverMetal::semaphore_free(SemaphoreID p_semaphore) {
 }
 
 #pragma mark - Queues
@@ -858,10 +895,78 @@ RDD::CommandQueueFamilyID RenderingDeviceDriverMetal::command_queue_family_get(B
 	}
 }
 
+RDD::CommandQueueID RenderingDeviceDriverMetal::command_queue_create(CommandQueueFamilyID p_cmd_queue_family, bool p_identify_as_main_queue) {
+	return CommandQueueID(1);
+}
+
+Error RenderingDeviceDriverMetal::command_queue_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID>, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID>, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) {
+	uint32_t size = p_cmd_buffers.size();
+	if (size == 0) {
+		return OK;
+	}
+
+	for (uint32_t i = 0; i < size - 1; i++) {
+		MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[i].id);
+		cmd_buffer->commit();
+	}
+
+	// The last command buffer will signal the fence and semaphores.
+	MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[size - 1].id);
+	Fence *fence = (Fence *)(p_cmd_fence.id);
+	if (fence != nullptr) {
+		cmd_buffer->end();
+		id<MTLCommandBuffer> cb = cmd_buffer->get_command_buffer();
+		fence->signal(cb);
+	}
+
+	for (uint32_t i = 0; i < p_swap_chains.size(); i++) {
+		SwapChain *swap_chain = (SwapChain *)(p_swap_chains[i].id);
+		RenderingContextDriverMetal::Surface *metal_surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
+		metal_surface->present(cmd_buffer);
+	}
+
+	cmd_buffer->commit();
+
+	if (p_swap_chains.size() > 0) {
+		// Used as a signal that we're presenting, so this is the end of a frame.
+		[device_scope endScope];
+		[device_scope beginScope];
+	}
+
+	return OK;
+}
+
+void RenderingDeviceDriverMetal::command_queue_free(CommandQueueID p_cmd_queue) {
+}
+
 #pragma mark - Command Buffers
 
+// ----- POOL -----
+
+RDD::CommandPoolID RenderingDeviceDriverMetal::command_pool_create(CommandQueueFamilyID p_cmd_queue_family, CommandBufferType p_cmd_buffer_type) {
+	DEV_ASSERT(p_cmd_buffer_type == COMMAND_BUFFER_TYPE_PRIMARY);
+	return rid::make(device_queue);
+}
+
+bool RenderingDeviceDriverMetal::command_pool_reset(CommandPoolID p_cmd_pool) {
+	return true;
+}
+
+void RenderingDeviceDriverMetal::command_pool_free(CommandPoolID p_cmd_pool) {
+	rid::release(p_cmd_pool);
+}
+
+// ----- BUFFER -----
+
+RDD::CommandBufferID RenderingDeviceDriverMetal::command_buffer_create(CommandPoolID p_cmd_pool) {
+	id<MTLCommandQueue> queue = rid::get(p_cmd_pool);
+	MDCommandBuffer *obj = new MDCommandBuffer(queue, this);
+	command_buffers.push_back(obj);
+	return CommandBufferID(obj);
+}
+
 bool RenderingDeviceDriverMetal::command_buffer_begin(CommandBufferID p_cmd_buffer) {
-	MDCommandBufferBase *obj = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *obj = (MDCommandBuffer *)(p_cmd_buffer.id);
 	obj->begin();
 	return true;
 }
@@ -871,7 +976,7 @@ bool RenderingDeviceDriverMetal::command_buffer_begin_secondary(CommandBufferID
 }
 
 void RenderingDeviceDriverMetal::command_buffer_end(CommandBufferID p_cmd_buffer) {
-	MDCommandBufferBase *obj = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *obj = (MDCommandBuffer *)(p_cmd_buffer.id);
 	obj->end();
 }
 
@@ -883,11 +988,6 @@ void RenderingDeviceDriverMetal::command_buffer_execute_secondary(CommandBufferI
 
 void RenderingDeviceDriverMetal::_swap_chain_release(SwapChain *p_swap_chain) {
 	_swap_chain_release_buffers(p_swap_chain);
-
-	if (p_swap_chain->render_pass.id != 0) {
-		render_pass_free(p_swap_chain->render_pass);
-		p_swap_chain->render_pass = RenderPassID();
-	}
 }
 
 void RenderingDeviceDriverMetal::_swap_chain_release_buffers(SwapChain *p_swap_chain) {
@@ -895,21 +995,10 @@ void RenderingDeviceDriverMetal::_swap_chain_release_buffers(SwapChain *p_swap_c
 
 RDD::SwapChainID RenderingDeviceDriverMetal::swap_chain_create(RenderingContextDriver::SurfaceID p_surface) {
 	RenderingContextDriverMetal::Surface const *surface = (RenderingContextDriverMetal::Surface *)(p_surface);
-	if (use_barriers) {
-		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
-		add_residency_set_to_main_queue(surface->get_residency_set());
-		GODOT_CLANG_WARNING_POP
-	}
 
-	SwapChain *swap_chain = memnew(SwapChain);
-	swap_chain->surface = p_surface;
-	return SwapChainID(swap_chain);
-}
-
-RDD::RenderPassID RenderingDeviceDriverMetal::_swap_chain_create_render_pass(RDD::DataFormat p_format) {
 	// Create the render pass that will be used to draw to the swap chain's framebuffers.
 	RDD::Attachment attachment;
-	attachment.format = p_format;
+	attachment.format = pixel_formats->getDataFormat(surface->get_pixel_format());
 	attachment.samples = RDD::TEXTURE_SAMPLES_1;
 	attachment.load_op = RDD::ATTACHMENT_LOAD_OP_CLEAR;
 	attachment.store_op = RDD::ATTACHMENT_STORE_OP_STORE;
@@ -920,7 +1009,15 @@ RDD::RenderPassID RenderingDeviceDriverMetal::_swap_chain_create_render_pass(RDD
 	color_ref.aspect.set_flag(RDD::TEXTURE_ASPECT_COLOR_BIT);
 	subpass.color_references.push_back(color_ref);
 
-	return render_pass_create(attachment, subpass, {}, 1, RDD::AttachmentReference());
+	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1, RDD::AttachmentReference());
+	ERR_FAIL_COND_V(!render_pass, SwapChainID());
+
+	// Create the empty swap chain until it is resized.
+	SwapChain *swap_chain = memnew(SwapChain);
+	swap_chain->surface = p_surface;
+	swap_chain->data_format = attachment.format;
+	swap_chain->render_pass = render_pass;
+	return SwapChainID(swap_chain);
 }
 
 Error RenderingDeviceDriverMetal::swap_chain_resize(CommandQueueID p_cmd_queue, SwapChainID p_swap_chain, uint32_t p_desired_framebuffer_count) {
@@ -929,24 +1026,7 @@ Error RenderingDeviceDriverMetal::swap_chain_resize(CommandQueueID p_cmd_queue,
 
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
 	RenderingContextDriverMetal::Surface *surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
-
-	DataFormat new_data_format = DATA_FORMAT_MAX;
-	ColorSpace new_color_space = COLOR_SPACE_MAX;
-	Error err = surface->resize(p_desired_framebuffer_count, new_data_format, new_color_space);
-	if (err != OK) {
-		return err;
-	}
-
-	if (new_data_format != swap_chain->data_format) {
-		_swap_chain_release(swap_chain);
-		swap_chain->render_pass = _swap_chain_create_render_pass(new_data_format);
-		if (!swap_chain->render_pass) {
-			return ERR_INVALID_DATA;
-		}
-	}
-
-	swap_chain->data_format = new_data_format;
-	swap_chain->color_space = new_color_space;
+	surface->resize(p_desired_framebuffer_count);
 
 	// Once everything's been created correctly, indicate the surface no longer needs to be resized.
 	context_driver->surface_set_needs_resize(swap_chain->surface, false);
@@ -978,11 +1058,6 @@ RDD::DataFormat RenderingDeviceDriverMetal::swap_chain_get_format(SwapChainID p_
 	return swap_chain->data_format;
 }
 
-RDD::ColorSpace RenderingDeviceDriverMetal::swap_chain_get_color_space(SwapChainID p_swap_chain) {
-	const SwapChain *swap_chain = (const SwapChain *)(p_swap_chain.id);
-	return swap_chain->color_space;
-}
-
 void RenderingDeviceDriverMetal::swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) {
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
 	RenderingContextDriverMetal::Surface *metal_surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
@@ -991,13 +1066,8 @@ void RenderingDeviceDriverMetal::swap_chain_set_max_fps(SwapChainID p_swap_chain
 
 void RenderingDeviceDriverMetal::swap_chain_free(SwapChainID p_swap_chain) {
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
-	if (use_barriers) {
-		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
-		RenderingContextDriverMetal::Surface *surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
-		remove_residency_set_to_main_queue(surface->get_residency_set());
-		GODOT_CLANG_WARNING_POP
-	}
 	_swap_chain_release(swap_chain);
+	render_pass_free(swap_chain->render_pass);
 	memdelete(swap_chain);
 }
 
@@ -1006,34 +1076,34 @@ void RenderingDeviceDriverMetal::swap_chain_free(SwapChainID p_swap_chain) {
 RDD::FramebufferID RenderingDeviceDriverMetal::framebuffer_create(RenderPassID p_render_pass, VectorView<TextureID> p_attachments, uint32_t p_width, uint32_t p_height) {
 	MDRenderPass *pass = (MDRenderPass *)(p_render_pass.id);
 
-	Vector<MTL::Texture *> textures;
+	Vector<MTL::Texture> textures;
 	textures.resize(p_attachments.size());
 
 	for (uint32_t i = 0; i < p_attachments.size(); i += 1) {
 		MDAttachment const &a = pass->attachments[i];
-		MTL::Texture *tex = reinterpret_cast<MTL::Texture *>(p_attachments[i].id);
-		if (tex == nullptr) {
+		id<MTLTexture> tex = rid::get(p_attachments[i]);
+		if (tex == nil) {
 #if DEV_ENABLED
 			WARN_PRINT("Invalid texture for attachment " + itos(i));
 #endif
 		}
 		if (a.samples > 1) {
-			if (tex->sampleCount() != a.samples) {
+			if (tex.sampleCount != a.samples) {
 #if DEV_ENABLED
-				WARN_PRINT("Mismatched sample count for attachment " + itos(i) + "; expected " + itos(a.samples) + ", got " + itos(tex->sampleCount()));
+				WARN_PRINT("Mismatched sample count for attachment " + itos(i) + "; expected " + itos(a.samples) + ", got " + itos(tex.sampleCount));
 #endif
 			}
 		}
 		textures.write[i] = tex;
 	}
 
-	MDFrameBuffer *fb = memnew(MDFrameBuffer(textures, Size2i(p_width, p_height)));
+	MDFrameBuffer *fb = new MDFrameBuffer(textures, Size2i(p_width, p_height));
 	return FramebufferID(fb);
 }
 
 void RenderingDeviceDriverMetal::framebuffer_free(FramebufferID p_framebuffer) {
 	MDFrameBuffer *obj = (MDFrameBuffer *)(p_framebuffer.id);
-	memdelete(obj);
+	delete obj;
 }
 
 #pragma mark - Shader
@@ -1042,7 +1112,7 @@ void RenderingDeviceDriverMetal::shader_cache_free_entry(const SHA256Digest &key
 	if (ShaderCacheEntry **pentry = _shader_cache.getptr(key); pentry != nullptr) {
 		ShaderCacheEntry *entry = *pentry;
 		_shader_cache.erase(key);
-		entry->library.reset();
+		entry->library = nil;
 		memdelete(entry);
 	}
 }
@@ -1059,12 +1129,12 @@ static_assert(is_layout_compatible<UniformInfo::Indexes, RenderingShaderContaine
 API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
 static void update_uniform_info(const RenderingShaderContainerMetal::UniformData &p_data, UniformInfo &r_ui) {
 	r_ui.active_stages = p_data.active_stages;
-	r_ui.dataType = static_cast<MTL::DataType>(p_data.data_type);
+	r_ui.dataType = static_cast<MTLDataType>(p_data.data_type);
 	memcpy(&r_ui.slot, &p_data.slot, sizeof(UniformInfo::Indexes));
 	memcpy(&r_ui.arg_buffer, &p_data.arg_buffer, sizeof(UniformInfo::Indexes));
-	r_ui.access = static_cast<MTL::BindingAccess>(p_data.access);
-	r_ui.usage = static_cast<MTL::ResourceUsage>(p_data.usage);
-	r_ui.textureType = static_cast<MTL::TextureType>(p_data.texture_type);
+	r_ui.access = static_cast<MTLBindingAccess>(p_data.access);
+	r_ui.usage = static_cast<MTLResourceUsage>(p_data.usage);
+	r_ui.textureType = static_cast<MTLTextureType>(p_data.texture_type);
 	r_ui.imageFormat = p_data.image_format;
 	r_ui.arrayLength = p_data.array_length;
 	r_ui.isMultisampled = p_data.is_multisampled;
@@ -1088,38 +1158,34 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_container(const Ref
 			RDD::ShaderID(),
 			"Shader was compiled for a newer version of Metal");
 
-	MTL::GPUFamily compiled_gpu_family = static_cast<MTL::GPUFamily>(mtl_reflection_data.profile.gpu);
+	MTLGPUFamily compiled_gpu_family = static_cast<MTLGPUFamily>(mtl_reflection_data.profile.gpu);
 	ERR_FAIL_COND_V_MSG(device_properties->features.highestFamily < compiled_gpu_family,
 			RDD::ShaderID(),
 			"Shader was generated for a newer Apple GPU");
 
-	NS::SharedPtr<MTL::CompileOptions> options = NS::TransferPtr(MTL::CompileOptions::alloc()->init());
+	MTLCompileOptions *options = [MTLCompileOptions new];
 	uint32_t major = mtl_reflection_data.msl_version / 10000;
 	uint32_t minor = (mtl_reflection_data.msl_version / 100) % 100;
-	options->setLanguageVersion(MTL::LanguageVersion((major << 0x10) + minor));
-	if (__builtin_available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
-		options->setEnableLogging(mtl_reflection_data.needs_debug_logging());
+	options.languageVersion = MTLLanguageVersion((major << 0x10) + minor);
+	if (@available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 2.0, *)) {
+		options.enableLogging = mtl_reflection_data.needs_debug_logging();
 	}
 
-	HashMap<RDD::ShaderStage, std::shared_ptr<MDLibrary>> libraries;
+	HashMap<RD::ShaderStage, MDLibrary *> libraries;
 
-	PipelineType pipeline_type = PIPELINE_TYPE_RASTERIZATION;
+	bool is_compute = false;
 	Vector<uint8_t> decompressed_code;
 	for (uint32_t shader_index = 0; shader_index < shaders.size(); shader_index++) {
 		const RenderingShaderContainer::Shader &shader = shaders[shader_index];
 		const RSCM::StageData &shader_data = mtl_shaders[shader_index];
 
-		if (shader.shader_stage == RDD::ShaderStage::SHADER_STAGE_COMPUTE) {
-			pipeline_type = PIPELINE_TYPE_COMPUTE;
+		if (shader.shader_stage == RD::ShaderStage::SHADER_STAGE_COMPUTE) {
+			is_compute = true;
 		}
 
 		if (ShaderCacheEntry **p = _shader_cache.getptr(shader_data.hash); p != nullptr) {
-			if (std::shared_ptr<MDLibrary> lib = (*p)->library.lock()) {
-				libraries[shader.shader_stage] = lib;
-				continue;
-			}
-			// Library was released; remove stale cache entry and recreate.
-			_shader_cache.erase(shader_data.hash);
+			libraries[shader.shader_stage] = (*p)->library;
+			continue;
 		}
 
 		if (shader.code_decompressed_size > 0) {
@@ -1134,27 +1200,34 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_container(const Ref
 		cd->name = shader_name;
 		cd->stage = shader.shader_stage;
 
-		NS::SharedPtr<NS::String> source = NS::TransferPtr(NS::String::alloc()->init((void *)decompressed_code.ptr(), shader_data.source_size, NS::UTF8StringEncoding));
+		NSString *source = [[NSString alloc] initWithBytes:(void *)decompressed_code.ptr()
+													length:shader_data.source_size
+												  encoding:NSUTF8StringEncoding];
 
-		std::shared_ptr<MDLibrary> library;
+		MDLibrary *library = nil;
 		if (shader_data.library_size > 0) {
 			ERR_FAIL_COND_V_MSG(mtl_reflection_data.os_min_version > device_properties->os_version,
 					RDD::ShaderID(),
 					"Metal shader binary was generated for a newer target OS");
 			dispatch_data_t binary = dispatch_data_create(decompressed_code.ptr() + shader_data.source_size, shader_data.library_size, dispatch_get_main_queue(), DISPATCH_DATA_DESTRUCTOR_DEFAULT);
-			library = MDLibrary::create(cd, device,
+			library = [MDLibrary newLibraryWithCacheEntry:cd
+												   device:device
 #if DEV_ENABLED
-					source.get(),
+												   source:source
 #endif
-					binary);
+													 data:binary];
 		} else {
-			options->setPreserveInvariance(shader_data.is_position_invariant);
+			options.preserveInvariance = shader_data.is_position_invariant;
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 150000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 180000 || __TV_OS_VERSION_MIN_REQUIRED >= 180000 || defined(VISIONOS_ENABLED)
-			options->setMathMode(MTL::MathModeFast);
+			options.mathMode = MTLMathModeFast;
 #else
-			options->setFastMathEnabled(true);
+			options.fastMathEnabled = YES;
 #endif
-			library = MDLibrary::create(cd, device, source.get(), options.get(), _shader_load_strategy);
+			library = [MDLibrary newLibraryWithCacheEntry:cd
+												   device:device
+												   source:source
+												  options:options
+												 strategy:_shader_load_strategy];
 		}
 
 		_shader_cache[shader_data.hash] = cd;
@@ -1219,14 +1292,14 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_container(const Ref
 	}
 
 	MDShader *shader = nullptr;
-	if (pipeline_type == PIPELINE_TYPE_COMPUTE) {
+	if (is_compute) {
 		MDComputeShader *cs = new MDComputeShader(
 				shader_name,
 				uniform_sets,
 				mtl_reflection_data.uses_argument_buffers(),
-				libraries[RDD::ShaderStage::SHADER_STAGE_COMPUTE]);
+				libraries[RD::ShaderStage::SHADER_STAGE_COMPUTE]);
 
-		cs->local = MTL::Size(refl.compute_local_size[0], refl.compute_local_size[1], refl.compute_local_size[2]);
+		cs->local = MTLSizeMake(refl.compute_local_size[0], refl.compute_local_size[1], refl.compute_local_size[2]);
 		shader = cs;
 	} else {
 		MDRenderShader *rs = new MDRenderShader(
@@ -1234,8 +1307,8 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_container(const Ref
 				uniform_sets,
 				mtl_reflection_data.needs_view_mask_buffer(),
 				mtl_reflection_data.uses_argument_buffers(),
-				libraries[RDD::ShaderStage::SHADER_STAGE_VERTEX],
-				libraries[RDD::ShaderStage::SHADER_STAGE_FRAGMENT]);
+				libraries[RD::ShaderStage::SHADER_STAGE_VERTEX],
+				libraries[RD::ShaderStage::SHADER_STAGE_FRAGMENT]);
 		shader = rs;
 	}
 
@@ -1267,20 +1340,16 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 	ERR_FAIL_INDEX_V_MSG(p_set_index, shader->sets.size(), UniformSetID(), "Set index out of range");
 	const UniformSet &shader_set = shader->sets.get(p_set_index);
 	MDUniformSet *set = memnew(MDUniformSet);
-	// Determine if there are any dynamic uniforms in this set.
-	bool is_dynamic = !shader_set.dynamic_uniforms.is_empty();
-
-	Vector<uint8_t> arg_buffer_data;
 
 	if (device_properties->features.argument_buffers_supported()) {
-		arg_buffer_data.resize(shader_set.buffer_size);
-
 		// If argument buffers are enabled, we have already verified availability, so we can skip the runtime check.
 		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability-new")
-		uint64_t *ptr = (uint64_t *)arg_buffer_data.ptrw();
 
-		HashMap<MTL::Resource *, StageResourceUsage, HashMapHasherDefault> bound_resources;
-		auto add_usage = [&bound_resources](MTL::Resource *res, BitField<RDD::ShaderStage> stage, MTL::ResourceUsage usage) {
+		set->arg_buffer = [device newBufferWithLength:shader_set.buffer_size options:MTLResourceStorageModeShared];
+		uint64_t *ptr = (uint64_t *)set->arg_buffer.contents;
+
+		HashMap<MTLResourceUnsafe, StageResourceUsage, HashMapHasherDefault> bound_resources;
+		auto add_usage = [&bound_resources](MTLResourceUnsafe res, BitField<RDD::ShaderStage> stage, MTLResourceUsage usage) {
 			StageResourceUsage *sru = bound_resources.getptr(res);
 			if (sru == nullptr) {
 				sru = &bound_resources.insert(res, ResourceUnused)->value;
@@ -1295,10 +1364,6 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 				*sru |= stage_resource_usage(RDD::SHADER_STAGE_COMPUTE, usage);
 			}
 		};
-#define ADD_USAGE(res, stage, usage) \
-	if (!use_barriers) { \
-		add_usage(res, stage, usage); \
-	}
 
 		// Ensure the argument buffer exists for this set as some shader pipelines may
 		// have been generated with argument buffers enabled.
@@ -1311,44 +1376,43 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 				case UNIFORM_TYPE_SAMPLER: {
 					size_t count = uniform.ids.size();
 					for (size_t j = 0; j < count; j += 1) {
-						MTL::SamplerState *sampler = reinterpret_cast<MTL::SamplerState *>(uniform.ids[j].id);
-						*(MTL::ResourceID *)(ptr + idx.sampler + j) = sampler->gpuResourceID();
+						id<MTLSamplerState> sampler = rid::get(uniform.ids[j]);
+						*(MTLResourceID *)(ptr + idx.sampler + j) = sampler.gpuResourceID;
 					}
 				} break;
 				case UNIFORM_TYPE_SAMPLER_WITH_TEXTURE: {
 					uint32_t count = uniform.ids.size() / 2;
 					for (uint32_t j = 0; j < count; j += 1) {
-						MTL::SamplerState *sampler = reinterpret_cast<MTL::SamplerState *>(uniform.ids[j * 2 + 0].id);
-						MTL::Texture *texture = reinterpret_cast<MTL::Texture *>(uniform.ids[j * 2 + 1].id);
-						*(MTL::ResourceID *)(ptr + idx.texture + j) = texture->gpuResourceID();
-						*(MTL::ResourceID *)(ptr + idx.sampler + j) = sampler->gpuResourceID();
+						id<MTLSamplerState> sampler = rid::get(uniform.ids[j * 2 + 0]);
+						id<MTLTexture> texture = rid::get(uniform.ids[j * 2 + 1]);
+						*(MTLResourceID *)(ptr + idx.texture + j) = texture.gpuResourceID;
+						*(MTLResourceID *)(ptr + idx.sampler + j) = sampler.gpuResourceID;
 
-						ADD_USAGE(texture, ui.active_stages, ui.usage);
+						add_usage(texture, ui.active_stages, ui.usage);
 					}
 				} break;
 				case UNIFORM_TYPE_TEXTURE: {
 					size_t count = uniform.ids.size();
 					for (size_t j = 0; j < count; j += 1) {
-						MTL::Texture *texture = reinterpret_cast<MTL::Texture *>(uniform.ids[j].id);
-						*(MTL::ResourceID *)(ptr + idx.texture + j) = texture->gpuResourceID();
+						id<MTLTexture> texture = rid::get(uniform.ids[j]);
+						*(MTLResourceID *)(ptr + idx.texture + j) = texture.gpuResourceID;
 
-						ADD_USAGE(texture, ui.active_stages, ui.usage);
+						add_usage(texture, ui.active_stages, ui.usage);
 					}
 				} break;
 				case UNIFORM_TYPE_IMAGE: {
 					size_t count = uniform.ids.size();
 					for (size_t j = 0; j < count; j += 1) {
-						MTL::Texture *texture = reinterpret_cast<MTL::Texture *>(uniform.ids[j].id);
-						*(MTL::ResourceID *)(ptr + idx.texture + j) = texture->gpuResourceID();
-						ADD_USAGE(texture, ui.active_stages, ui.usage);
+						id<MTLTexture> texture = rid::get(uniform.ids[j]);
+						*(MTLResourceID *)(ptr + idx.texture + j) = texture.gpuResourceID;
+						add_usage(texture, ui.active_stages, ui.usage);
 
 						if (idx.buffer != UINT32_MAX) {
 							// Emulated atomic image access.
-							MTL::Texture *parent = texture->parentTexture();
-							MTL::Buffer *buffer = (parent ? parent : texture)->buffer();
-							*(MTLGPUAddress *)(ptr + idx.buffer + j) = buffer->gpuAddress();
+							id<MTLBuffer> buffer = (texture.parentTexture ? texture.parentTexture : texture).buffer;
+							*(MTLGPUAddress *)(ptr + idx.buffer + j) = buffer.gpuAddress;
 
-							ADD_USAGE(buffer, ui.active_stages, ui.usage);
+							add_usage(buffer, ui.active_stages, ui.usage);
 						}
 					}
 				} break;
@@ -1364,26 +1428,23 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 				case UNIFORM_TYPE_STORAGE_BUFFER:
 				case UNIFORM_TYPE_UNIFORM_BUFFER: {
 					const BufferInfo *buffer = (const BufferInfo *)uniform.ids[0].id;
-					*(MTLGPUAddress *)(ptr + idx.buffer) = buffer->metal_buffer.get()->gpuAddress();
+					*(MTLGPUAddress *)(ptr + idx.buffer) = buffer->metal_buffer.gpuAddress;
 
-					ADD_USAGE(buffer->metal_buffer.get(), ui.active_stages, ui.usage);
+					add_usage(buffer->metal_buffer, ui.active_stages, ui.usage);
 				} break;
 				case UNIFORM_TYPE_INPUT_ATTACHMENT: {
 					size_t count = uniform.ids.size();
 					for (size_t j = 0; j < count; j += 1) {
-						MTL::Texture *texture = reinterpret_cast<MTL::Texture *>(uniform.ids[j].id);
-						*(MTL::ResourceID *)(ptr + idx.texture + j) = texture->gpuResourceID();
+						id<MTLTexture> texture = rid::get(uniform.ids[j]);
+						*(MTLResourceID *)(ptr + idx.texture + j) = texture.gpuResourceID;
 
-						ADD_USAGE(texture, ui.active_stages, ui.usage);
+						add_usage(texture, ui.active_stages, ui.usage);
 					}
 				} break;
 				case UNIFORM_TYPE_UNIFORM_BUFFER_DYNAMIC:
 				case UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC: {
-					// Encode the base GPU address (frame 0); it will be updated at bind time.
-					const MetalBufferDynamicInfo *buffer = (const MetalBufferDynamicInfo *)uniform.ids[0].id;
-					*(MTLGPUAddress *)(ptr + idx.buffer) = buffer->metal_buffer.get()->gpuAddress();
-
-					ADD_USAGE(buffer->metal_buffer.get(), ui.active_stages, ui.usage);
+					// Dynamic buffers are not supported by argument buffers currently.
+					// so we do not encode them, as there shouldn't be any runtime shaders that used them.
 				} break;
 				default: {
 					DEV_ASSERT(false);
@@ -1391,34 +1452,15 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 			}
 		}
 
-#undef ADD_USAGE
-
-		if (!use_barriers) {
-			for (KeyValue<MTL::Resource *, StageResourceUsage> const &keyval : bound_resources) {
-				ResourceVector *resources = set->usage_to_resources.getptr(keyval.value);
-				if (resources == nullptr) {
-					resources = &set->usage_to_resources.insert(keyval.value, ResourceVector())->value;
-				}
-				int64_t pos = resources->span().bisect(keyval.key, true);
-				if (pos == resources->size() || (*resources)[pos] != keyval.key) {
-					resources->insert(pos, keyval.key);
-				}
+		for (KeyValue<MTLResourceUnsafe, StageResourceUsage> const &keyval : bound_resources) {
+			ResourceVector *resources = set->usage_to_resources.getptr(keyval.value);
+			if (resources == nullptr) {
+				resources = &set->usage_to_resources.insert(keyval.value, ResourceVector())->value;
+			}
+			int64_t pos = resources->span().bisect(keyval.key, true);
+			if (pos == resources->size() || (*resources)[pos] != keyval.key) {
+				resources->insert(pos, keyval.key);
 			}
-		}
-
-		if (!is_dynamic) {
-			set->arg_buffer = NS::TransferPtr(device->newBuffer(shader_set.buffer_size, base_hazard_tracking | MTL::ResourceStorageModePrivate));
-#if DEV_ENABLED
-			char label[64];
-			snprintf(label, sizeof(label), "Uniform Set %u", p_set_index);
-			set->arg_buffer->setLabel(NS::String::string(label, NS::UTF8StringEncoding));
-#endif
-			_track_resource(set->arg_buffer.get());
-			_copy_queue_copy_to_buffer(arg_buffer_data, set->arg_buffer.get());
-		} else {
-			// Store the arg buffer data for dynamic uniform sets.
-			// It will be copied and updated at bind time.
-			set->arg_buffer_data = arg_buffer_data;
 		}
 
 		GODOT_CLANG_WARNING_POP
@@ -1429,15 +1471,13 @@ RDD::UniformSetID RenderingDeviceDriverMetal::uniform_set_create(VectorView<Boun
 		bound_uniforms.write[i] = p_uniforms[i];
 	}
 	set->uniforms = bound_uniforms;
+	set->index = p_set_index;
 
 	return UniformSetID(set);
 }
 
 void RenderingDeviceDriverMetal::uniform_set_free(UniformSetID p_uniform_set) {
 	MDUniformSet *obj = (MDUniformSet *)p_uniform_set.id;
-	if (obj->arg_buffer) {
-		_untrack_resource(obj->arg_buffer.get());
-	}
 	memdelete(obj);
 }
 
@@ -1479,42 +1519,42 @@ void RenderingDeviceDriverMetal::command_uniform_set_prepare_for_use(CommandBuff
 #pragma mark - Transfer
 
 void RenderingDeviceDriverMetal::command_clear_buffer(CommandBufferID p_cmd_buffer, BufferID p_buffer, uint64_t p_offset, uint64_t p_size) {
-	MDCommandBufferBase *cmd = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cmd = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cmd->clear_buffer(p_buffer, p_offset, p_size);
 }
 
 void RenderingDeviceDriverMetal::command_copy_buffer(CommandBufferID p_cmd_buffer, BufferID p_src_buffer, BufferID p_dst_buffer, VectorView<BufferCopyRegion> p_regions) {
-	MDCommandBufferBase *cmd = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cmd = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cmd->copy_buffer(p_src_buffer, p_dst_buffer, p_regions);
 }
 
 void RenderingDeviceDriverMetal::command_copy_texture(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, VectorView<TextureCopyRegion> p_regions) {
-	MDCommandBufferBase *cmd = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cmd = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cmd->copy_texture(p_src_texture, p_dst_texture, p_regions);
 }
 
 void RenderingDeviceDriverMetal::command_resolve_texture(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->resolve_texture(p_src_texture, p_src_texture_layout, p_src_layer, p_src_mipmap, p_dst_texture, p_dst_texture_layout, p_dst_layer, p_dst_mipmap);
 }
 
 void RenderingDeviceDriverMetal::command_clear_color_texture(CommandBufferID p_cmd_buffer, TextureID p_texture, TextureLayout p_texture_layout, const Color &p_color, const TextureSubresourceRange &p_subresources) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->clear_color_texture(p_texture, p_texture_layout, p_color, p_subresources);
 }
 
 void RenderingDeviceDriverMetal::command_clear_depth_stencil_texture(CommandBufferID p_cmd_buffer, TextureID p_texture, TextureLayout p_texture_layout, float p_depth, uint8_t p_stencil, const TextureSubresourceRange &p_subresources) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->clear_depth_stencil_texture(p_texture, p_texture_layout, p_depth, p_stencil, p_subresources);
 }
 
 void RenderingDeviceDriverMetal::command_copy_buffer_to_texture(CommandBufferID p_cmd_buffer, BufferID p_src_buffer, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, VectorView<BufferTextureCopyRegion> p_regions) {
-	MDCommandBufferBase *cmd = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cmd = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cmd->copy_buffer_to_texture(p_src_buffer, p_dst_texture, p_regions);
 }
 
 void RenderingDeviceDriverMetal::command_copy_texture_to_buffer(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, BufferID p_dst_buffer, VectorView<BufferTextureCopyRegion> p_regions) {
-	MDCommandBufferBase *cmd = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cmd = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cmd->copy_texture_to_buffer(p_src_texture, p_dst_buffer, p_regions);
 }
 
@@ -1528,7 +1568,7 @@ void RenderingDeviceDriverMetal::pipeline_free(PipelineID p_pipeline_id) {
 // ----- BINDING -----
 
 void RenderingDeviceDriverMetal::command_bind_push_constants(CommandBufferID p_cmd_buffer, ShaderID p_shader, uint32_t p_dst_first_index, VectorView<uint32_t> p_data) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->encode_push_constant_data(p_shader, p_data);
 }
 
@@ -1547,16 +1587,22 @@ String RenderingDeviceDriverMetal::_pipeline_get_cache_path() const {
 
 bool RenderingDeviceDriverMetal::pipeline_cache_create(const Vector<uint8_t> &p_data) {
 	return false;
-	// TODO: Convert to metal-cpp when pipeline caching is re-enabled
-	// CharString path = _pipeline_get_cache_path().utf8();
-	// NS::SharedPtr<MTL::BinaryArchiveDescriptor> desc = NS::TransferPtr(MTL::BinaryArchiveDescriptor::alloc()->init());
-	// NS::Error *error = nullptr;
-	// archive = NS::TransferPtr(device->newBinaryArchive(desc.get(), &error));
-	// return true;
+	CharString path = _pipeline_get_cache_path().utf8();
+	NSString *nPath = [[NSString alloc] initWithBytesNoCopy:path.ptrw()
+													 length:path.length()
+												   encoding:NSUTF8StringEncoding
+											   freeWhenDone:NO];
+	MTLBinaryArchiveDescriptor *desc = [MTLBinaryArchiveDescriptor new];
+	if ([[NSFileManager defaultManager] fileExistsAtPath:nPath]) {
+		desc.url = [NSURL fileURLWithPath:nPath];
+	}
+	NSError *error = nil;
+	archive = [device newBinaryArchiveWithDescriptor:desc error:&error];
+	return true;
 }
 
 void RenderingDeviceDriverMetal::pipeline_cache_free() {
-	archive = nullptr;
+	archive = nil;
 }
 
 size_t RenderingDeviceDriverMetal::pipeline_cache_query_size() {
@@ -1568,17 +1614,20 @@ Vector<uint8_t> RenderingDeviceDriverMetal::pipeline_cache_serialize() {
 		return Vector<uint8_t>();
 	}
 
-	// TODO: Convert to metal-cpp when pipeline caching is re-enabled
-	// CharString path = _pipeline_get_cache_path().utf8();
-	// NS::URL *target = NS::URL::fileURLWithPath(NS::String::string(path.get_data(), NS::UTF8StringEncoding));
-	// NS::Error *error = nullptr;
-	// if (archive->serializeToURL(target, &error)) {
-	//     return Vector<uint8_t>();
-	// } else {
-	//     print_line(error->localizedDescription()->utf8String());
-	//     return Vector<uint8_t>();
-	// }
-	return Vector<uint8_t>();
+	CharString path = _pipeline_get_cache_path().utf8();
+
+	NSString *nPath = [[NSString alloc] initWithBytesNoCopy:path.ptrw()
+													 length:path.length()
+												   encoding:NSUTF8StringEncoding
+											   freeWhenDone:NO];
+	NSURL *target = [NSURL fileURLWithPath:nPath];
+	NSError *error = nil;
+	if ([archive serializeToURL:target error:&error]) {
+		return Vector<uint8_t>();
+	} else {
+		print_line(error.localizedDescription.UTF8String);
+		return Vector<uint8_t>();
+	}
 }
 
 #pragma mark - Rendering
@@ -1602,15 +1651,15 @@ RDD::RenderPassID RenderingDeviceDriverMetal::render_pass_create(VectorView<Atta
 		subpass.resolve_references = p_subpasses[i].resolve_references;
 	}
 
-	static const MTL::LoadAction LOAD_ACTIONS[] = {
-		MTL::LoadActionLoad, // ATTACHMENT_LOAD_OP_LOAD
-		MTL::LoadActionClear, // ATTACHMENT_LOAD_OP_CLEAR
-		MTL::LoadActionDontCare, // ATTACHMENT_LOAD_OP_DONT_CARE
+	static const MTLLoadAction LOAD_ACTIONS[] = {
+		MTLLoadActionLoad, // ATTACHMENT_LOAD_OP_LOAD
+		MTLLoadActionClear, // ATTACHMENT_LOAD_OP_CLEAR
+		MTLLoadActionDontCare, // ATTACHMENT_LOAD_OP_DONT_CARE
 	};
 
-	static const MTL::StoreAction STORE_ACTIONS[] = {
-		MTL::StoreActionStore, // ATTACHMENT_STORE_OP_STORE
-		MTL::StoreActionDontCare, // ATTACHMENT_STORE_OP_DONT_CARE
+	static const MTLStoreAction STORE_ACTIONS[] = {
+		MTLStoreActionStore, // ATTACHMENT_STORE_OP_STORE
+		MTLStoreActionDontCare, // ATTACHMENT_STORE_OP_DONT_CARE
 	};
 
 	Vector<MDAttachment> attachments;
@@ -1619,7 +1668,7 @@ RDD::RenderPassID RenderingDeviceDriverMetal::render_pass_create(VectorView<Atta
 	for (uint32_t i = 0; i < p_attachments.size(); i++) {
 		Attachment const &a = p_attachments[i];
 		MDAttachment &mda = attachments.write[i];
-		MTL::PixelFormat format = pf.getMTLPixelFormat(a.format);
+		MTLPixelFormat format = pf.getMTLPixelFormat(a.format);
 		mda.format = format;
 		if (a.samples > TEXTURE_SAMPLES_1) {
 			mda.samples = (*device_properties).find_nearest_supported_sample_count(a.samples);
@@ -1640,99 +1689,99 @@ RDD::RenderPassID RenderingDeviceDriverMetal::render_pass_create(VectorView<Atta
 			mda.type |= MDAttachmentType::Color;
 		}
 	}
-	MDRenderPass *obj = memnew(MDRenderPass(attachments, subpasses));
+	MDRenderPass *obj = new MDRenderPass(attachments, subpasses);
 	return RenderPassID(obj);
 }
 
 void RenderingDeviceDriverMetal::render_pass_free(RenderPassID p_render_pass) {
 	MDRenderPass *obj = (MDRenderPass *)(p_render_pass.id);
-	memdelete(obj);
+	delete obj;
 }
 
 // ----- COMMANDS -----
 
 void RenderingDeviceDriverMetal::command_begin_render_pass(CommandBufferID p_cmd_buffer, RenderPassID p_render_pass, FramebufferID p_framebuffer, CommandBufferType p_cmd_buffer_type, const Rect2i &p_rect, VectorView<RenderPassClearValue> p_clear_values) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_begin_pass(p_render_pass, p_framebuffer, p_cmd_buffer_type, p_rect, p_clear_values);
 }
 
 void RenderingDeviceDriverMetal::command_end_render_pass(CommandBufferID p_cmd_buffer) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_end_pass();
 }
 
 void RenderingDeviceDriverMetal::command_next_render_subpass(CommandBufferID p_cmd_buffer, CommandBufferType p_cmd_buffer_type) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_next_subpass();
 }
 
 void RenderingDeviceDriverMetal::command_render_set_viewport(CommandBufferID p_cmd_buffer, VectorView<Rect2i> p_viewports) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_set_viewport(p_viewports);
 }
 
 void RenderingDeviceDriverMetal::command_render_set_scissor(CommandBufferID p_cmd_buffer, VectorView<Rect2i> p_scissors) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_set_scissor(p_scissors);
 }
 
 void RenderingDeviceDriverMetal::command_render_clear_attachments(CommandBufferID p_cmd_buffer, VectorView<AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_clear_attachments(p_attachment_clears, p_rects);
 }
 
 void RenderingDeviceDriverMetal::command_bind_render_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->bind_pipeline(p_pipeline);
 }
 
 void RenderingDeviceDriverMetal::command_bind_render_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_bind_uniform_sets(p_uniform_sets, p_shader, p_first_set_index, p_set_count, p_dynamic_offsets);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw(CommandBufferID p_cmd_buffer, uint32_t p_vertex_count, uint32_t p_instance_count, uint32_t p_base_vertex, uint32_t p_first_instance) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw(p_vertex_count, p_instance_count, p_base_vertex, p_first_instance);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw_indexed(CommandBufferID p_cmd_buffer, uint32_t p_index_count, uint32_t p_instance_count, uint32_t p_first_index, int32_t p_vertex_offset, uint32_t p_first_instance) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw_indexed(p_index_count, p_instance_count, p_first_index, p_vertex_offset, p_first_instance);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw_indexed_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw_indexed_indirect(p_indirect_buffer, p_offset, p_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw_indexed_indirect_count(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw_indexed_indirect_count(p_indirect_buffer, p_offset, p_count_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw_indirect(p_indirect_buffer, p_offset, p_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverMetal::command_render_draw_indirect_count(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_draw_indirect_count(p_indirect_buffer, p_offset, p_count_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverMetal::command_render_bind_vertex_buffers(CommandBufferID p_cmd_buffer, uint32_t p_binding_count, const BufferID *p_buffers, const uint64_t *p_offsets, uint64_t p_dynamic_offsets) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_bind_vertex_buffers(p_binding_count, p_buffers, p_offsets, p_dynamic_offsets);
 }
 
 void RenderingDeviceDriverMetal::command_render_bind_index_buffer(CommandBufferID p_cmd_buffer, BufferID p_buffer, IndexBufferFormat p_format, uint64_t p_offset) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_bind_index_buffer(p_buffer, p_format, p_offset);
 }
 
 void RenderingDeviceDriverMetal::command_render_set_blend_constants(CommandBufferID p_cmd_buffer, const Color &p_constants) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->render_set_blend_constants(p_constants);
 }
 
@@ -1744,123 +1793,119 @@ void RenderingDeviceDriverMetal::command_render_set_line_width(CommandBufferID p
 
 // ----- PIPELINE -----
 
-RenderingDeviceDriverMetal::Result<NS::SharedPtr<MTL::Function>> RenderingDeviceDriverMetal::_create_function(MDLibrary *p_library, NS::String *p_name, VectorView<PipelineSpecializationConstant> &p_specialization_constants) {
-	MTL::Library *library = p_library->get_library();
+RenderingDeviceDriverMetal::Result<id<MTLFunction>> RenderingDeviceDriverMetal::_create_function(MDLibrary *p_library, NSString *p_name, VectorView<PipelineSpecializationConstant> &p_specialization_constants) {
+	id<MTLLibrary> library = p_library.library;
 	if (!library) {
 		ERR_FAIL_V_MSG(ERR_CANT_CREATE, "Failed to compile Metal library");
 	}
 
-	MTL::Function *function = library->newFunction(p_name);
+	id<MTLFunction> function = [library newFunctionWithName:p_name];
 	ERR_FAIL_NULL_V_MSG(function, ERR_CANT_CREATE, "No function named main0");
 
-	NS::Dictionary *constants_dict = function->functionConstantsDictionary();
-	if (constants_dict->count() == 0) {
-		return NS::TransferPtr(function);
+	if (function.functionConstantsDictionary.count == 0) {
+		return function;
 	}
 
-	LocalVector<MTL::FunctionConstant *> constants;
-	NS::Enumerator<NS::String> *keys = constants_dict->keyEnumerator<NS::String>();
-	while (NS::String *key = keys->nextObject()) {
-		constants.push_back(constants_dict->object<MTL::FunctionConstant>(key));
-	}
-
-	// Check if already sorted by index.
+	NSArray<MTLFunctionConstant *> *constants = function.functionConstantsDictionary.allValues;
 	bool is_sorted = true;
-	for (NS::UInteger i = 1; i < constants.size(); i++) {
-		MTL::FunctionConstant *prev = constants[i - 1];
-		MTL::FunctionConstant *curr = constants[i];
-		if (prev->index() > curr->index()) {
+	for (uint32_t i = 1; i < constants.count; i++) {
+		if (constants[i - 1].index > constants[i].index) {
 			is_sorted = false;
 			break;
 		}
 	}
 
 	if (!is_sorted) {
-		struct Comparator {
-			bool operator()(const MTL::FunctionConstant *p, const MTL::FunctionConstant *q) const {
-				return p->index() < q->index();
+		constants = [constants sortedArrayUsingComparator:^NSComparisonResult(MTLFunctionConstant *a, MTLFunctionConstant *b) {
+			if (a.index < b.index) {
+				return NSOrderedAscending;
+			} else if (a.index > b.index) {
+				return NSOrderedDescending;
+			} else {
+				return NSOrderedSame;
 			}
-		};
-
-		constants.sort_custom<Comparator>();
+		}];
 	}
 
-	// Build a sorted list of specialization constants by constant_id.
+	// Initialize an array of integers representing the indexes of p_specialization_constants
 	uint32_t *indexes = (uint32_t *)alloca(p_specialization_constants.size() * sizeof(uint32_t));
 	for (uint32_t i = 0; i < p_specialization_constants.size(); i++) {
 		indexes[i] = i;
 	}
+	// Sort the array of integers based on the values in p_specialization_constants
 	std::sort(indexes, &indexes[p_specialization_constants.size()], [&](int a, int b) {
 		return p_specialization_constants[a].constant_id < p_specialization_constants[b].constant_id;
 	});
 
-	NS::SharedPtr<MTL::FunctionConstantValues> constantValues = NS::TransferPtr(MTL::FunctionConstantValues::alloc()->init());
-
-	// Merge the sorted constants from the function with the sorted user constants.
-	NS::UInteger i = 0;
+	MTLFunctionConstantValues *constantValues = [MTLFunctionConstantValues new];
+	uint32_t i = 0;
 	uint32_t j = 0;
-	while (i < constants.size() && j < p_specialization_constants.size()) {
-		MTL::FunctionConstant *curr = (MTL::FunctionConstant *)constants[i];
+	while (i < constants.count && j < p_specialization_constants.size()) {
+		MTLFunctionConstant *curr = constants[i];
 		PipelineSpecializationConstant const &sc = p_specialization_constants[indexes[j]];
-		if (curr->index() == sc.constant_id) {
-			switch (curr->type()) {
-				case MTL::DataTypeBool:
-				case MTL::DataTypeFloat:
-				case MTL::DataTypeInt:
-				case MTL::DataTypeUInt: {
-					constantValues->setConstantValue(&sc.int_value, curr->type(), sc.constant_id);
+		if (curr.index == sc.constant_id) {
+			switch (curr.type) {
+				case MTLDataTypeBool:
+				case MTLDataTypeFloat:
+				case MTLDataTypeInt:
+				case MTLDataTypeUInt: {
+					[constantValues setConstantValue:&sc.int_value
+												type:curr.type
+											 atIndex:sc.constant_id];
 				} break;
 				default:
-					ERR_FAIL_V_MSG(NS::TransferPtr(function), "Invalid specialization constant type");
+					ERR_FAIL_V_MSG(function, "Invalid specialization constant type");
 			}
 			i++;
 			j++;
-		} else if (curr->index() < sc.constant_id) {
+		} else if (curr.index < sc.constant_id) {
 			i++;
 		} else {
 			j++;
 		}
 	}
 
-	// Handle R32UI_ALIGNMENT_CONSTANT_ID if present.
-	if (i < constants.size()) {
-		MTL::FunctionConstant *curr = constants[i];
-		if (curr->index() == R32UI_ALIGNMENT_CONSTANT_ID) {
+	if (i != constants.count) {
+		MTLFunctionConstant *curr = constants[i];
+		if (curr.index == R32UI_ALIGNMENT_CONSTANT_ID) {
 			uint32_t alignment = 16; // TODO(sgc): is this always correct?
-			constantValues->setConstantValue(&alignment, curr->type(), curr->index());
+			[constantValues setConstantValue:&alignment
+										type:curr.type
+									 atIndex:curr.index];
 			i++;
 		}
 	}
 
-	NS::Error *err = nullptr;
-	function->release();
-	function = library->newFunction(p_name, constantValues.get(), &err);
-	ERR_FAIL_NULL_V_MSG(function, ERR_CANT_CREATE, String("specialized function failed: ") + (err ? err->localizedDescription()->utf8String() : "unknown error"));
+	NSError *err = nil;
+	function = [library newFunctionWithName:@"main0"
+							 constantValues:constantValues
+									  error:&err];
+	ERR_FAIL_NULL_V_MSG(function, ERR_CANT_CREATE, String("specialized function failed: ") + err.localizedDescription.UTF8String);
 
-	return NS::TransferPtr(function);
+	return function;
 }
 
-// RDD::PolygonCullMode == MTL::CullMode.
-static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_DISABLED, MTL::CullModeNone));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_FRONT, MTL::CullModeFront));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_BACK, MTL::CullModeBack));
+// RDD::PolygonCullMode == MTLCullMode.
+static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_DISABLED, MTLCullModeNone));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_FRONT, MTLCullModeFront));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::POLYGON_CULL_BACK, MTLCullModeBack));
 
-// RDD::StencilOperation == MTL::StencilOperation.
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_KEEP, MTL::StencilOperationKeep));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_ZERO, MTL::StencilOperationZero));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_REPLACE, MTL::StencilOperationReplace));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INCREMENT_AND_CLAMP, MTL::StencilOperationIncrementClamp));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_DECREMENT_AND_CLAMP, MTL::StencilOperationDecrementClamp));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INVERT, MTL::StencilOperationInvert));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INCREMENT_AND_WRAP, MTL::StencilOperationIncrementWrap));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_DECREMENT_AND_WRAP, MTL::StencilOperationDecrementWrap));
+// RDD::StencilOperation == MTLStencilOperation.
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_KEEP, MTLStencilOperationKeep));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_ZERO, MTLStencilOperationZero));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_REPLACE, MTLStencilOperationReplace));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INCREMENT_AND_CLAMP, MTLStencilOperationIncrementClamp));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_DECREMENT_AND_CLAMP, MTLStencilOperationDecrementClamp));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INVERT, MTLStencilOperationInvert));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_INCREMENT_AND_WRAP, MTLStencilOperationIncrementWrap));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::STENCIL_OP_DECREMENT_AND_WRAP, MTLStencilOperationDecrementWrap));
 
-// RDD::BlendOperation == MTL::BlendOperation.
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_ADD, MTL::BlendOperationAdd));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_SUBTRACT, MTL::BlendOperationSubtract));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_REVERSE_SUBTRACT, MTL::BlendOperationReverseSubtract));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_MINIMUM, MTL::BlendOperationMin));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_MAXIMUM, MTL::BlendOperationMax));
+// RDD::BlendOperation == MTLBlendOperation.
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_ADD, MTLBlendOperationAdd));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_SUBTRACT, MTLBlendOperationSubtract));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_REVERSE_SUBTRACT, MTLBlendOperationReverseSubtract));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_MINIMUM, MTLBlendOperationMin));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BLEND_OP_MAXIMUM, MTLBlendOperationMax));
 
 RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 		ShaderID p_shader,
@@ -1876,7 +1921,7 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 		uint32_t p_render_subpass,
 		VectorView<PipelineSpecializationConstant> p_specialization_constants) {
 	MDRenderShader *shader = (MDRenderShader *)(p_shader.id);
-	MTL::VertexDescriptor *vert_desc = reinterpret_cast<MTL::VertexDescriptor *>(p_vertex_format.id);
+	MTLVertexDescriptor *vert_desc = rid::get(p_vertex_format);
 	MDRenderPass *pass = (MDRenderPass *)(p_render_pass.id);
 
 	os_signpost_id_t reflect_id = os_signpost_id_make_with_pointer(LOG_INTERVALS, shader);
@@ -1887,7 +1932,7 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 
 	os_signpost_event_emit(LOG_DRIVER, OS_SIGNPOST_ID_EXCLUSIVE, "create_pipeline");
 
-	NS::SharedPtr<MTL::RenderPipelineDescriptor> desc = NS::TransferPtr(MTL::RenderPipelineDescriptor::alloc()->init());
+	MTLRenderPipelineDescriptor *desc = [MTLRenderPipelineDescriptor new];
 
 	{
 		MDSubpass const &subpass = pass->subpasses[p_render_subpass];
@@ -1895,7 +1940,7 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 			uint32_t attachment = subpass.color_references[i].attachment;
 			if (attachment != AttachmentReference::UNUSED) {
 				MDAttachment const &a = pass->attachments[attachment];
-				desc->colorAttachments()->object(i)->setPixelFormat(a.format);
+				desc.colorAttachments[i].pixelFormat = a.format;
 			}
 		}
 
@@ -1904,27 +1949,17 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 			MDAttachment const &a = pass->attachments[attachment];
 
 			if (a.type & MDAttachmentType::Depth) {
-				desc->setDepthAttachmentPixelFormat(a.format);
+				desc.depthAttachmentPixelFormat = a.format;
 			}
 
 			if (a.type & MDAttachmentType::Stencil) {
-				desc->setStencilAttachmentPixelFormat(a.format);
+				desc.stencilAttachmentPixelFormat = a.format;
 			}
 		}
 	}
 
-	desc->setVertexDescriptor(vert_desc);
-	desc->setLabel(conv::to_nsstring(shader->name));
-
-	if (shader->uses_argument_buffers) {
-		// Set mutability of argument buffers.
-		for (uint32_t i = 0; i < shader->sets.size(); i++) {
-			const UniformSet &set = shader->sets[i];
-			const MTL::Mutability mutability = set.dynamic_uniforms.is_empty() ? MTL::MutabilityImmutable : MTL::MutabilityMutable;
-			desc->vertexBuffers()->object(i)->setMutability(mutability);
-			desc->fragmentBuffers()->object(i)->setMutability(mutability);
-		}
-	}
+	desc.vertexDescriptor = vert_desc;
+	desc.label = [NSString stringWithUTF8String:shader->name.get_data()];
 
 	// Input assembly & tessellation.
 
@@ -1932,69 +1967,69 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 
 	switch (p_render_primitive) {
 		case RENDER_PRIMITIVE_POINTS:
-			desc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassPoint);
+			desc.inputPrimitiveTopology = MTLPrimitiveTopologyClassPoint;
 			break;
 		case RENDER_PRIMITIVE_LINES:
 		case RENDER_PRIMITIVE_LINES_WITH_ADJACENCY:
 		case RENDER_PRIMITIVE_LINESTRIPS_WITH_ADJACENCY:
 		case RENDER_PRIMITIVE_LINESTRIPS:
-			desc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassLine);
+			desc.inputPrimitiveTopology = MTLPrimitiveTopologyClassLine;
 			break;
 		case RENDER_PRIMITIVE_TRIANGLES:
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS:
 		case RENDER_PRIMITIVE_TRIANGLES_WITH_ADJACENCY:
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_AJACENCY:
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_RESTART_INDEX:
-			desc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassTriangle);
+			desc.inputPrimitiveTopology = MTLPrimitiveTopologyClassTriangle;
 			break;
 		case RENDER_PRIMITIVE_TESSELATION_PATCH:
-			desc->setMaxTessellationFactor(p_rasterization_state.patch_control_points);
-			desc->setTessellationPartitionMode(MTL::TessellationPartitionModeInteger);
+			desc.maxTessellationFactor = p_rasterization_state.patch_control_points;
+			desc.tessellationPartitionMode = MTLTessellationPartitionModeInteger;
 			ERR_FAIL_V_MSG(PipelineID(), "tessellation not implemented");
 			break;
 		case RENDER_PRIMITIVE_MAX:
 		default:
-			desc->setInputPrimitiveTopology(MTL::PrimitiveTopologyClassUnspecified);
+			desc.inputPrimitiveTopology = MTLPrimitiveTopologyClassUnspecified;
 			break;
 	}
 
 	switch (p_render_primitive) {
 		case RENDER_PRIMITIVE_POINTS:
-			pipeline->raster_state.render_primitive = MTL::PrimitiveTypePoint;
+			pipeline->raster_state.render_primitive = MTLPrimitiveTypePoint;
 			break;
 		case RENDER_PRIMITIVE_LINES:
 		case RENDER_PRIMITIVE_LINES_WITH_ADJACENCY:
-			pipeline->raster_state.render_primitive = MTL::PrimitiveTypeLine;
+			pipeline->raster_state.render_primitive = MTLPrimitiveTypeLine;
 			break;
 		case RENDER_PRIMITIVE_LINESTRIPS:
 		case RENDER_PRIMITIVE_LINESTRIPS_WITH_ADJACENCY:
-			pipeline->raster_state.render_primitive = MTL::PrimitiveTypeLineStrip;
+			pipeline->raster_state.render_primitive = MTLPrimitiveTypeLineStrip;
 			break;
 		case RENDER_PRIMITIVE_TRIANGLES:
 		case RENDER_PRIMITIVE_TRIANGLES_WITH_ADJACENCY:
-			pipeline->raster_state.render_primitive = MTL::PrimitiveTypeTriangle;
+			pipeline->raster_state.render_primitive = MTLPrimitiveTypeTriangle;
 			break;
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS:
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_AJACENCY:
 		case RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_RESTART_INDEX:
-			pipeline->raster_state.render_primitive = MTL::PrimitiveTypeTriangleStrip;
+			pipeline->raster_state.render_primitive = MTLPrimitiveTypeTriangleStrip;
 			break;
 		default:
 			break;
 	}
 
 	// Rasterization.
-	desc->setRasterizationEnabled(!p_rasterization_state.discard_primitives);
-	pipeline->raster_state.clip_mode = p_rasterization_state.enable_depth_clamp ? MTL::DepthClipModeClamp : MTL::DepthClipModeClip;
-	pipeline->raster_state.fill_mode = p_rasterization_state.wireframe ? MTL::TriangleFillModeLines : MTL::TriangleFillModeFill;
+	desc.rasterizationEnabled = !p_rasterization_state.discard_primitives;
+	pipeline->raster_state.clip_mode = p_rasterization_state.enable_depth_clamp ? MTLDepthClipModeClamp : MTLDepthClipModeClip;
+	pipeline->raster_state.fill_mode = p_rasterization_state.wireframe ? MTLTriangleFillModeLines : MTLTriangleFillModeFill;
 
-	static const MTL::CullMode CULL_MODE[3] = {
-		MTL::CullModeNone,
-		MTL::CullModeFront,
-		MTL::CullModeBack,
+	static const MTLCullMode CULL_MODE[3] = {
+		MTLCullModeNone,
+		MTLCullModeFront,
+		MTLCullModeBack,
 	};
 	pipeline->raster_state.cull_mode = CULL_MODE[p_rasterization_state.cull_mode];
-	pipeline->raster_state.winding = (p_rasterization_state.front_face == POLYGON_FRONT_FACE_CLOCKWISE) ? MTL::WindingClockwise : MTL::WindingCounterClockwise;
+	pipeline->raster_state.winding = (p_rasterization_state.front_face == POLYGON_FRONT_FACE_CLOCKWISE) ? MTLWindingClockwise : MTLWindingCounterClockwise;
 	pipeline->raster_state.depth_bias.enabled = p_rasterization_state.depth_bias_enabled;
 	pipeline->raster_state.depth_bias.depth_bias = p_rasterization_state.depth_bias_constant_factor;
 	pipeline->raster_state.depth_bias.slope_scale = p_rasterization_state.depth_bias_slope_factor;
@@ -2012,20 +2047,20 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 	if (p_multisample_state.sample_count > TEXTURE_SAMPLES_1) {
 		pipeline->sample_count = (*device_properties).find_nearest_supported_sample_count(p_multisample_state.sample_count);
 	}
-	desc->setRasterSampleCount(static_cast<NS::UInteger>(pipeline->sample_count));
-	desc->setAlphaToCoverageEnabled(p_multisample_state.enable_alpha_to_coverage);
-	desc->setAlphaToOneEnabled(p_multisample_state.enable_alpha_to_one);
+	desc.rasterSampleCount = static_cast<NSUInteger>(pipeline->sample_count);
+	desc.alphaToCoverageEnabled = p_multisample_state.enable_alpha_to_coverage;
+	desc.alphaToOneEnabled = p_multisample_state.enable_alpha_to_one;
 
 	// Depth buffer.
-	bool depth_enabled = p_depth_stencil_state.enable_depth_test && desc->depthAttachmentPixelFormat() != MTL::PixelFormatInvalid;
-	bool stencil_enabled = p_depth_stencil_state.enable_stencil && desc->stencilAttachmentPixelFormat() != MTL::PixelFormatInvalid;
+	bool depth_enabled = p_depth_stencil_state.enable_depth_test && desc.depthAttachmentPixelFormat != MTLPixelFormatInvalid;
+	bool stencil_enabled = p_depth_stencil_state.enable_stencil && desc.stencilAttachmentPixelFormat != MTLPixelFormatInvalid;
 
 	if (depth_enabled || stencil_enabled) {
-		NS::SharedPtr<MTL::DepthStencilDescriptor> ds_desc = NS::TransferPtr(MTL::DepthStencilDescriptor::alloc()->init());
+		MTLDepthStencilDescriptor *ds_desc = [MTLDepthStencilDescriptor new];
 
 		pipeline->raster_state.depth_test.enabled = depth_enabled;
-		ds_desc->setDepthWriteEnabled(p_depth_stencil_state.enable_depth_write);
-		ds_desc->setDepthCompareFunction(COMPARE_OPERATORS[p_depth_stencil_state.depth_compare_operator]);
+		ds_desc.depthWriteEnabled = p_depth_stencil_state.enable_depth_write;
+		ds_desc.depthCompareFunction = COMPARE_OPERATORS[p_depth_stencil_state.depth_compare_operator];
 		if (p_depth_stencil_state.enable_depth_range) {
 			WARN_PRINT("unsupported: depth range");
 		}
@@ -2037,33 +2072,33 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 
 			{
 				// Front.
-				NS::SharedPtr<MTL::StencilDescriptor> sd = NS::TransferPtr(MTL::StencilDescriptor::alloc()->init());
-				sd->setStencilFailureOperation(STENCIL_OPERATIONS[p_depth_stencil_state.front_op.fail]);
-				sd->setDepthStencilPassOperation(STENCIL_OPERATIONS[p_depth_stencil_state.front_op.pass]);
-				sd->setDepthFailureOperation(STENCIL_OPERATIONS[p_depth_stencil_state.front_op.depth_fail]);
-				sd->setStencilCompareFunction(COMPARE_OPERATORS[p_depth_stencil_state.front_op.compare]);
-				sd->setReadMask(p_depth_stencil_state.front_op.compare_mask);
-				sd->setWriteMask(p_depth_stencil_state.front_op.write_mask);
-				ds_desc->setFrontFaceStencil(sd.get());
+				MTLStencilDescriptor *sd = [MTLStencilDescriptor new];
+				sd.stencilFailureOperation = STENCIL_OPERATIONS[p_depth_stencil_state.front_op.fail];
+				sd.depthStencilPassOperation = STENCIL_OPERATIONS[p_depth_stencil_state.front_op.pass];
+				sd.depthFailureOperation = STENCIL_OPERATIONS[p_depth_stencil_state.front_op.depth_fail];
+				sd.stencilCompareFunction = COMPARE_OPERATORS[p_depth_stencil_state.front_op.compare];
+				sd.readMask = p_depth_stencil_state.front_op.compare_mask;
+				sd.writeMask = p_depth_stencil_state.front_op.write_mask;
+				ds_desc.frontFaceStencil = sd;
 			}
 			{
 				// Back.
-				NS::SharedPtr<MTL::StencilDescriptor> sd = NS::TransferPtr(MTL::StencilDescriptor::alloc()->init());
-				sd->setStencilFailureOperation(STENCIL_OPERATIONS[p_depth_stencil_state.back_op.fail]);
-				sd->setDepthStencilPassOperation(STENCIL_OPERATIONS[p_depth_stencil_state.back_op.pass]);
-				sd->setDepthFailureOperation(STENCIL_OPERATIONS[p_depth_stencil_state.back_op.depth_fail]);
-				sd->setStencilCompareFunction(COMPARE_OPERATORS[p_depth_stencil_state.back_op.compare]);
-				sd->setReadMask(p_depth_stencil_state.back_op.compare_mask);
-				sd->setWriteMask(p_depth_stencil_state.back_op.write_mask);
-				ds_desc->setBackFaceStencil(sd.get());
+				MTLStencilDescriptor *sd = [MTLStencilDescriptor new];
+				sd.stencilFailureOperation = STENCIL_OPERATIONS[p_depth_stencil_state.back_op.fail];
+				sd.depthStencilPassOperation = STENCIL_OPERATIONS[p_depth_stencil_state.back_op.pass];
+				sd.depthFailureOperation = STENCIL_OPERATIONS[p_depth_stencil_state.back_op.depth_fail];
+				sd.stencilCompareFunction = COMPARE_OPERATORS[p_depth_stencil_state.back_op.compare];
+				sd.readMask = p_depth_stencil_state.back_op.compare_mask;
+				sd.writeMask = p_depth_stencil_state.back_op.write_mask;
+				ds_desc.backFaceStencil = sd;
 			}
 		}
 
-		pipeline->depth_stencil = NS::TransferPtr(device->newDepthStencilState(ds_desc.get()));
-		ERR_FAIL_COND_V_MSG(!pipeline->depth_stencil, PipelineID(), "Failed to create depth stencil state");
+		pipeline->depth_stencil = [device newDepthStencilStateWithDescriptor:ds_desc];
+		ERR_FAIL_NULL_V_MSG(pipeline->depth_stencil, PipelineID(), "Failed to create depth stencil state");
 	} else {
 		// TODO(sgc): FB13671991 raised as Apple docs state calling setDepthStencilState:nil is valid, but currently generates an exception
-		pipeline->depth_stencil = NS::RetainPtr(get_resource_cache().get_depth_stencil_state(false, false));
+		pipeline->depth_stencil = get_resource_cache().get_depth_stencil_state(false, false);
 	}
 
 	// Blend state.
@@ -2075,31 +2110,30 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 
 			const PipelineColorBlendState::Attachment &bs = p_blend_state.attachments[i];
 
-			MTL::RenderPipelineColorAttachmentDescriptor *ca_desc = desc->colorAttachments()->object(p_color_attachments[i]);
-			ca_desc->setBlendingEnabled(bs.enable_blend);
+			MTLRenderPipelineColorAttachmentDescriptor *ca_desc = desc.colorAttachments[p_color_attachments[i]];
+			ca_desc.blendingEnabled = bs.enable_blend;
 
-			ca_desc->setSourceRGBBlendFactor(BLEND_FACTORS[bs.src_color_blend_factor]);
-			ca_desc->setDestinationRGBBlendFactor(BLEND_FACTORS[bs.dst_color_blend_factor]);
-			ca_desc->setRgbBlendOperation(BLEND_OPERATIONS[bs.color_blend_op]);
+			ca_desc.sourceRGBBlendFactor = BLEND_FACTORS[bs.src_color_blend_factor];
+			ca_desc.destinationRGBBlendFactor = BLEND_FACTORS[bs.dst_color_blend_factor];
+			ca_desc.rgbBlendOperation = BLEND_OPERATIONS[bs.color_blend_op];
 
-			ca_desc->setSourceAlphaBlendFactor(BLEND_FACTORS[bs.src_alpha_blend_factor]);
-			ca_desc->setDestinationAlphaBlendFactor(BLEND_FACTORS[bs.dst_alpha_blend_factor]);
-			ca_desc->setAlphaBlendOperation(BLEND_OPERATIONS[bs.alpha_blend_op]);
+			ca_desc.sourceAlphaBlendFactor = BLEND_FACTORS[bs.src_alpha_blend_factor];
+			ca_desc.destinationAlphaBlendFactor = BLEND_FACTORS[bs.dst_alpha_blend_factor];
+			ca_desc.alphaBlendOperation = BLEND_OPERATIONS[bs.alpha_blend_op];
 
-			MTL::ColorWriteMask writeMask = MTL::ColorWriteMaskNone;
+			ca_desc.writeMask = MTLColorWriteMaskNone;
 			if (bs.write_r) {
-				writeMask |= MTL::ColorWriteMaskRed;
+				ca_desc.writeMask |= MTLColorWriteMaskRed;
 			}
 			if (bs.write_g) {
-				writeMask |= MTL::ColorWriteMaskGreen;
+				ca_desc.writeMask |= MTLColorWriteMaskGreen;
 			}
 			if (bs.write_b) {
-				writeMask |= MTL::ColorWriteMaskBlue;
+				ca_desc.writeMask |= MTLColorWriteMaskBlue;
 			}
 			if (bs.write_a) {
-				writeMask |= MTL::ColorWriteMaskAlpha;
+				ca_desc.writeMask |= MTLColorWriteMaskAlpha;
 			}
-			ca_desc->setWriteMask(writeMask);
 		}
 
 		pipeline->raster_state.blend.r = p_blend_state.blend_constant.r;
@@ -2134,40 +2168,34 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 		pipeline->raster_state.stencil.enabled = true;
 	}
 
-	if (shader->vert) {
-		Result<NS::SharedPtr<MTL::Function>> function_or_err = _create_function(shader->vert.get(), MTLSTR("main0"), p_specialization_constants);
+	if (shader->vert != nil) {
+		Result<id<MTLFunction>> function_or_err = _create_function(shader->vert, @"main0", p_specialization_constants);
 		ERR_FAIL_COND_V(std::holds_alternative<Error>(function_or_err), PipelineID());
-		desc->setVertexFunction(std::get<NS::SharedPtr<MTL::Function>>(function_or_err).get());
+		desc.vertexFunction = std::get<id<MTLFunction>>(function_or_err);
 	}
 
-	if (shader->frag) {
-		Result<NS::SharedPtr<MTL::Function>> function_or_err = _create_function(shader->frag.get(), MTLSTR("main0"), p_specialization_constants);
+	if (shader->frag != nil) {
+		Result<id<MTLFunction>> function_or_err = _create_function(shader->frag, @"main0", p_specialization_constants);
 		ERR_FAIL_COND_V(std::holds_alternative<Error>(function_or_err), PipelineID());
-		desc->setFragmentFunction(std::get<NS::SharedPtr<MTL::Function>>(function_or_err).get());
+		desc.fragmentFunction = std::get<id<MTLFunction>>(function_or_err);
 	}
 
-	MTL::PipelineOption options = MTL::PipelineOptionNone;
-	MTL::BinaryArchive *arc = archive.get();
-	if (arc) {
-		NS::SharedPtr<NS::Array> archives = NS::TransferPtr(NS::Array::array(reinterpret_cast<NS::Object *const *>(&arc), 1)->retain());
-		desc->setBinaryArchives(archives.get());
-		if (archive_fail_on_miss) {
-			options |= MTL::PipelineOptionFailOnBinaryArchiveMiss;
-		}
+	if (archive) {
+		desc.binaryArchives = @[ archive ];
 	}
 
-	NS::Error *error = nullptr;
-	pipeline->state = NS::TransferPtr(device->newRenderPipelineState(desc.get(), options, nullptr, &error));
+	NSError *error = nil;
+	pipeline->state = [device newRenderPipelineStateWithDescriptor:desc
+															 error:&error];
 	pipeline->shader = shader;
 
-	ERR_FAIL_COND_V_MSG(error != nullptr, PipelineID(), String("error creating pipeline: ") + error->localizedDescription()->utf8String());
-	ERR_FAIL_COND_V_MSG(!pipeline->state, PipelineID(), "Failed to create render pipeline state");
+	ERR_FAIL_COND_V_MSG(error != nil, PipelineID(), ([NSString stringWithFormat:@"error creating pipeline: %@", error.localizedDescription].UTF8String));
 
-	if (arc) {
-		if (arc->addRenderPipelineFunctions(desc.get(), &error)) {
+	if (archive) {
+		if ([archive addRenderPipelineFunctionsWithDescriptor:desc error:&error]) {
 			archive_count += 1;
 		} else {
-			print_error(error->localizedDescription()->utf8String());
+			print_error(error.localizedDescription.UTF8String);
 		}
 	}
 
@@ -2179,22 +2207,22 @@ RDD::PipelineID RenderingDeviceDriverMetal::render_pipeline_create(
 // ----- COMMANDS -----
 
 void RenderingDeviceDriverMetal::command_bind_compute_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->bind_pipeline(p_pipeline);
 }
 
 void RenderingDeviceDriverMetal::command_bind_compute_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count, uint32_t p_dynamic_offsets) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->compute_bind_uniform_sets(p_uniform_sets, p_shader, p_first_set_index, p_set_count, p_dynamic_offsets);
 }
 
 void RenderingDeviceDriverMetal::command_compute_dispatch(CommandBufferID p_cmd_buffer, uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->compute_dispatch(p_x_groups, p_y_groups, p_z_groups);
 }
 
 void RenderingDeviceDriverMetal::command_compute_dispatch_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->compute_dispatch_indirect(p_indirect_buffer, p_offset);
 }
 
@@ -2211,109 +2239,39 @@ RDD::PipelineID RenderingDeviceDriverMetal::compute_pipeline_create(ShaderID p_s
 
 	os_signpost_event_emit(LOG_DRIVER, OS_SIGNPOST_ID_EXCLUSIVE, "create_pipeline");
 
-	Result<NS::SharedPtr<MTL::Function>> function_or_err = _create_function(shader->kernel.get(), MTLSTR("main0"), p_specialization_constants);
+	Result<id<MTLFunction>> function_or_err = _create_function(shader->kernel, @"main0", p_specialization_constants);
 	ERR_FAIL_COND_V(std::holds_alternative<Error>(function_or_err), PipelineID());
-	NS::SharedPtr<MTL::Function> function = std::get<NS::SharedPtr<MTL::Function>>(function_or_err);
+	id<MTLFunction> function = std::get<id<MTLFunction>>(function_or_err);
 
-	NS::SharedPtr<MTL::ComputePipelineDescriptor> desc = NS::TransferPtr(MTL::ComputePipelineDescriptor::alloc()->init());
-	desc->setComputeFunction(function.get());
-	desc->setLabel(conv::to_nsstring(shader->name));
-
-	if (shader->uses_argument_buffers) {
-		// Set mutability of argument buffers.
-		for (uint32_t i = 0; i < shader->sets.size(); i++) {
-			const UniformSet &set = shader->sets[i];
-			const MTL::Mutability mutability = set.dynamic_uniforms.is_empty() ? MTL::MutabilityImmutable : MTL::MutabilityMutable;
-			desc->buffers()->object(i)->setMutability(mutability);
-		}
+	MTLComputePipelineDescriptor *desc = [MTLComputePipelineDescriptor new];
+	desc.computeFunction = function;
+	desc.label = conv::to_nsstring(shader->name);
+	if (archive) {
+		desc.binaryArchives = @[ archive ];
 	}
 
-	MTL::PipelineOption options = MTL::PipelineOptionNone;
-	MTL::BinaryArchive *arc = archive.get();
-	if (arc) {
-		NS::SharedPtr<NS::Array> archives = NS::TransferPtr(NS::Array::array(reinterpret_cast<NS::Object *const *>(&arc), 1)->retain());
-		desc->setBinaryArchives(archives.get());
-		if (archive_fail_on_miss) {
-			options |= MTL::PipelineOptionFailOnBinaryArchiveMiss;
-		}
-	}
-
-	NS::Error *error = nullptr;
-	NS::SharedPtr<MTL::ComputePipelineState> state = NS::TransferPtr(device->newComputePipelineState(desc.get(), options, nullptr, &error));
-	ERR_FAIL_COND_V_MSG(error != nullptr, PipelineID(), String("error creating pipeline: ") + error->localizedDescription()->utf8String());
-	ERR_FAIL_COND_V_MSG(!state, PipelineID(), "Failed to create compute pipeline state");
+	NSError *error;
+	id<MTLComputePipelineState> state = [device newComputePipelineStateWithDescriptor:desc
+																			  options:MTLPipelineOptionNone
+																		   reflection:nil
+																				error:&error];
+	ERR_FAIL_COND_V_MSG(error != nil, PipelineID(), ([NSString stringWithFormat:@"error creating pipeline: %@", error.localizedDescription].UTF8String));
 
 	MDComputePipeline *pipeline = new MDComputePipeline(state);
 	pipeline->compute_state.local = shader->local;
 	pipeline->shader = shader;
 
-	if (arc) {
-		if (arc->addComputePipelineFunctions(desc.get(), &error)) {
+	if (archive) {
+		if ([archive addComputePipelineFunctionsWithDescriptor:desc error:&error]) {
 			archive_count += 1;
 		} else {
-			print_error(error->localizedDescription()->utf8String());
+			print_error(error.localizedDescription.UTF8String);
 		}
 	}
 
 	return PipelineID(pipeline);
 }
 
-#pragma mark - Raytracing
-
-// ----- ACCELERATION STRUCTURE -----
-
-RDD::AccelerationStructureID RenderingDeviceDriverMetal::blas_create(VectorView<AccelerationStructureGeometry> p_geometries) {
-	ERR_FAIL_V_MSG(AccelerationStructureID(), "Ray tracing is not currently supported by the Metal driver.");
-}
-
-uint32_t RenderingDeviceDriverMetal::tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) {
-	ERR_FAIL_V_MSG(0, "Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-RDD::AccelerationStructureID RenderingDeviceDriverMetal::tlas_create(BufferID p_instance_buffer) {
-	ERR_FAIL_V_MSG(AccelerationStructureID(), "Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::acceleration_structure_free(RDD::AccelerationStructureID p_acceleration_structure) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-uint32_t RenderingDeviceDriverMetal::acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) {
-	ERR_FAIL_V_MSG(0, "Ray tracing is not currently supported by the Metal driver.");
-}
-
-// ----- PIPELINE -----
-
-RDD::RaytracingPipelineID RenderingDeviceDriverMetal::raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) {
-	ERR_FAIL_V_MSG(RaytracingPipelineID(), "Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::raytracing_pipeline_free(RDD::RaytracingPipelineID p_pipeline) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-// ----- COMMANDS -----
-
-void RenderingDeviceDriverMetal::command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
-void RenderingDeviceDriverMetal::command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) {
-	ERR_FAIL_MSG("Ray tracing is not currently supported by the Metal driver.");
-}
-
 #pragma mark - Queries
 
 // ----- TIMESTAMP -----
@@ -2343,12 +2301,12 @@ void RenderingDeviceDriverMetal::command_timestamp_write(CommandBufferID p_cmd_b
 #pragma mark - Labels
 
 void RenderingDeviceDriverMetal::command_begin_label(CommandBufferID p_cmd_buffer, const char *p_label_name, const Color &p_color) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->begin_label(p_label_name, p_color);
 }
 
 void RenderingDeviceDriverMetal::command_end_label(CommandBufferID p_cmd_buffer) {
-	MDCommandBufferBase *cb = (MDCommandBufferBase *)(p_cmd_buffer.id);
+	MDCommandBuffer *cb = (MDCommandBuffer *)(p_cmd_buffer.id);
 	cb->end_label();
 }
 
@@ -2366,41 +2324,38 @@ void RenderingDeviceDriverMetal::begin_segment(uint32_t p_frame_index, uint32_t
 }
 
 void RenderingDeviceDriverMetal::end_segment() {
-	MutexLock lock(copy_queue_mutex);
-	_copy_queue_flush();
 }
 
 #pragma mark - Misc
 
 void RenderingDeviceDriverMetal::set_object_name(ObjectType p_type, ID p_driver_id, const String &p_name) {
-	NS::String *label = conv::to_nsstring(p_name);
-
 	switch (p_type) {
 		case OBJECT_TYPE_TEXTURE: {
-			MTL::Texture *tex = reinterpret_cast<MTL::Texture *>(p_driver_id.id);
-			tex->setLabel(label);
+			id<MTLTexture> tex = rid::get(p_driver_id);
+			tex.label = [NSString stringWithUTF8String:p_name.utf8().get_data()];
 		} break;
 		case OBJECT_TYPE_SAMPLER: {
 			// Can't set label after creation.
 		} break;
 		case OBJECT_TYPE_BUFFER: {
 			const BufferInfo *buf_info = (const BufferInfo *)p_driver_id.id;
-			buf_info->metal_buffer.get()->setLabel(label);
+			buf_info->metal_buffer.label = [NSString stringWithUTF8String:p_name.utf8().get_data()];
 		} break;
 		case OBJECT_TYPE_SHADER: {
+			NSString *label = [NSString stringWithUTF8String:p_name.utf8().get_data()];
 			MDShader *shader = (MDShader *)(p_driver_id.id);
 			if (MDRenderShader *rs = dynamic_cast<MDRenderShader *>(shader); rs != nullptr) {
-				rs->vert->set_label(label);
-				rs->frag->set_label(label);
+				[rs->vert setLabel:label];
+				[rs->frag setLabel:label];
 			} else if (MDComputeShader *cs = dynamic_cast<MDComputeShader *>(shader); cs != nullptr) {
-				cs->kernel->set_label(label);
+				[cs->kernel setLabel:label];
 			} else {
 				DEV_ASSERT(false);
 			}
 		} break;
 		case OBJECT_TYPE_UNIFORM_SET: {
 			MDUniformSet *set = (MDUniformSet *)(p_driver_id.id);
-			set->arg_buffer->setLabel(label);
+			set->arg_buffer.label = [NSString stringWithUTF8String:p_name.utf8().get_data()];
 		} break;
 		case OBJECT_TYPE_PIPELINE: {
 			// Can't set label after creation.
@@ -2414,7 +2369,7 @@ void RenderingDeviceDriverMetal::set_object_name(ObjectType p_type, ID p_driver_
 uint64_t RenderingDeviceDriverMetal::get_resource_native_handle(DriverResource p_type, ID p_driver_id) {
 	switch (p_type) {
 		case DRIVER_RESOURCE_LOGICAL_DEVICE: {
-			return (uint64_t)(uintptr_t)device;
+			return (uint64_t)(uintptr_t)(__bridge void *)device;
 		}
 		case DRIVER_RESOURCE_PHYSICAL_DEVICE: {
 			return 0;
@@ -2423,7 +2378,7 @@ uint64_t RenderingDeviceDriverMetal::get_resource_native_handle(DriverResource p
 			return 0;
 		}
 		case DRIVER_RESOURCE_COMMAND_QUEUE: {
-			return (uint64_t)(uintptr_t)get_command_queue();
+			return (uint64_t)(uintptr_t)(__bridge void *)device_queue;
 		}
 		case DRIVER_RESOURCE_QUEUE_FAMILY: {
 			return 0;
@@ -2448,11 +2403,11 @@ uint64_t RenderingDeviceDriverMetal::get_resource_native_handle(DriverResource p
 		}
 		case DRIVER_RESOURCE_COMPUTE_PIPELINE: {
 			MDComputePipeline *pipeline = (MDComputePipeline *)(p_driver_id.id);
-			return (uint64_t)(uintptr_t)pipeline->state.get();
+			return (uint64_t)(uintptr_t)(__bridge void *)pipeline->state;
 		}
 		case DRIVER_RESOURCE_RENDER_PIPELINE: {
 			MDRenderPipeline *pipeline = (MDRenderPipeline *)(p_driver_id.id);
-			return (uint64_t)(uintptr_t)pipeline->state.get();
+			return (uint64_t)(uintptr_t)(__bridge void *)pipeline->state;
 		}
 		default: {
 			return 0;
@@ -2460,65 +2415,8 @@ uint64_t RenderingDeviceDriverMetal::get_resource_native_handle(DriverResource p
 	}
 }
 
-void RenderingDeviceDriverMetal::_copy_queue_copy_to_buffer(Span<uint8_t> p_src_data, MTL::Buffer *p_dst_buffer, uint64_t p_dst_offset) {
-	MutexLock lock(copy_queue_mutex);
-	if (_copy_queue_buffer_available() < p_src_data.size()) {
-		_copy_queue_flush();
-	}
-
-	MTL::BlitCommandEncoder *blit_encoder = _copy_queue_blit_encoder();
-
-	memcpy(_copy_queue_buffer_ptr(), p_src_data.ptr(), p_src_data.size());
-
-	copy_queue_rs.get()->addAllocation(p_dst_buffer);
-	blit_encoder->copyFromBuffer(copy_queue_buffer.get(), copy_queue_buffer_offset, p_dst_buffer, p_dst_offset, p_src_data.size());
-
-	_copy_queue_buffer_consume(p_src_data.size());
-}
-
-void RenderingDeviceDriverMetal::_copy_queue_flush() {
-	if (!copy_queue_blit_encoder) {
-		return;
-	}
-
-	copy_queue_rs.get()->addAllocation(copy_queue_buffer.get());
-	copy_queue_rs.get()->commit();
-
-	copy_queue_blit_encoder.get()->endEncoding();
-	copy_queue_blit_encoder.reset();
-	copy_queue_command_buffer.get()->commit();
-	copy_queue_command_buffer.get()->waitUntilCompleted();
-	copy_queue_command_buffer.reset();
-	copy_queue_buffer_offset = 0;
-	copy_queue_rs.get()->removeAllAllocations();
-}
-
-Error RenderingDeviceDriverMetal::_copy_queue_initialize() {
-	DEV_ASSERT(!copy_queue);
-
-	copy_queue = NS::TransferPtr(device->newCommandQueue());
-	copy_queue.get()->setLabel(MTLSTR("Copy Command Queue"));
-	ERR_FAIL_COND_V(!copy_queue, ERR_CANT_CREATE);
-
-	// Reserve 64 KiB for copy commands. If the buffer fills, it will be flushed automatically.
-	copy_queue_buffer = NS::TransferPtr(device->newBuffer(64 * 1024, MTL::ResourceStorageModeShared | MTL::ResourceHazardTrackingModeUntracked));
-	copy_queue_buffer.get()->setLabel(MTLSTR("Copy Command Scratch Buffer"));
-
-	if (__builtin_available(macOS 15.0, iOS 18.0, tvOS 18.0, visionOS 1.0, *)) {
-		MTL::ResidencySetDescriptor *rs_desc = MTL::ResidencySetDescriptor::alloc()->init();
-		rs_desc->setInitialCapacity(2);
-		rs_desc->setLabel(MTLSTR("Copy Queue Residency Set"));
-		NS::Error *error = nullptr;
-		copy_queue_rs = NS::TransferPtr(device->newResidencySet(rs_desc, &error));
-		rs_desc->release();
-		copy_queue.get()->addResidencySet(copy_queue_rs.get());
-	}
-
-	return OK;
-}
-
 uint64_t RenderingDeviceDriverMetal::get_total_memory_used() {
-	return device->currentAllocatedSize();
+	return device.currentAllocatedSize;
 }
 
 uint64_t RenderingDeviceDriverMetal::get_lazily_memory_used() {
@@ -2530,13 +2428,13 @@ uint64_t RenderingDeviceDriverMetal::limit_get(Limit p_limit) {
 	MetalLimits const &limits = props.limits;
 	uint64_t safe_unbounded = ((uint64_t)1 << 30);
 #if defined(DEV_ENABLED)
-#define UNKNOWN(NAME) \
-	case NAME: \
+#define UNKNOWN(NAME)                                                            \
+	case NAME:                                                                   \
 		WARN_PRINT_ONCE("Returning maximum value for unknown limit " #NAME "."); \
 		return safe_unbounded;
 #else
 #define UNKNOWN(NAME) \
-	case NAME: \
+	case NAME:        \
 		return safe_unbounded
 #endif
 
@@ -2647,7 +2545,7 @@ uint64_t RenderingDeviceDriverMetal::limit_get(Limit p_limit) {
 uint64_t RenderingDeviceDriverMetal::api_trait_get(ApiTrait p_trait) {
 	switch (p_trait) {
 		case API_TRAIT_HONORS_PIPELINE_BARRIERS:
-			return use_barriers;
+			return false;
 		case API_TRAIT_CLEARS_WITH_COPY_ENGINE:
 			return false;
 		default:
@@ -2667,8 +2565,6 @@ bool RenderingDeviceDriverMetal::has_feature(Features p_feature) {
 			return device_properties->features.metal_fx_spatial;
 		case SUPPORTS_METALFX_TEMPORAL:
 			return device_properties->features.metal_fx_temporal;
-		case SUPPORTS_HDR_OUTPUT:
-			return true;
 		case SUPPORTS_IMAGE_ATOMIC_32_BIT:
 			return device_properties->features.supports_native_image_atomics;
 		case SUPPORTS_VULKAN_MEMORY_MODEL:
@@ -2710,11 +2606,11 @@ bool RenderingDeviceDriverMetal::is_composite_alpha_supported(CommandQueueID p_q
 }
 
 size_t RenderingDeviceDriverMetal::get_texel_buffer_alignment_for_format(RDD::DataFormat p_format) const {
-	return device->minimumLinearTextureAlignmentForPixelFormat(pixel_formats->getMTLPixelFormat(p_format));
+	return [device minimumLinearTextureAlignmentForPixelFormat:pixel_formats->getMTLPixelFormat(p_format)];
 }
 
-size_t RenderingDeviceDriverMetal::get_texel_buffer_alignment_for_format(MTL::PixelFormat p_format) const {
-	return device->minimumLinearTextureAlignmentForPixelFormat(p_format);
+size_t RenderingDeviceDriverMetal::get_texel_buffer_alignment_for_format(MTLPixelFormat p_format) const {
+	return [device minimumLinearTextureAlignmentForPixelFormat:p_format];
 }
 
 /******************/
@@ -2722,9 +2618,6 @@ size_t RenderingDeviceDriverMetal::get_texel_buffer_alignment_for_format(MTL::Pi
 RenderingDeviceDriverMetal::RenderingDeviceDriverMetal(RenderingContextDriverMetal *p_context_driver) :
 		context_driver(p_context_driver) {
 	DEV_ASSERT(p_context_driver != nullptr);
-	if (String res = OS::get_singleton()->get_environment("GODOT_MTL_ARCHIVE_FAIL_ON_MISS"); res == "1") {
-		archive_fail_on_miss = true;
-	}
 
 #if TARGET_OS_OSX
 	if (String res = OS::get_singleton()->get_environment("GODOT_MTL_SHADER_LOAD_STRATEGY"); res == U"lazy") {
@@ -2737,6 +2630,10 @@ RenderingDeviceDriverMetal::RenderingDeviceDriverMetal(RenderingContextDriverMet
 }
 
 RenderingDeviceDriverMetal::~RenderingDeviceDriverMetal() {
+	for (MDCommandBuffer *cb : command_buffers) {
+		delete cb;
+	}
+
 	for (KeyValue<SHA256Digest, ShaderCacheEntry *> &kv : _shader_cache) {
 		memdelete(kv.value);
 	}
@@ -2759,25 +2656,18 @@ RenderingDeviceDriverMetal::~RenderingDeviceDriverMetal() {
 Error RenderingDeviceDriverMetal::_create_device() {
 	device = context_driver->get_metal_device();
 
-	device_scope = NS::TransferPtr(MTL::CaptureManager::sharedCaptureManager()->newCaptureScope(device));
-	device_scope->setLabel(MTLSTR("Godot Frame"));
-	device_scope->beginScope(); // Allow Xcode to capture the first frame, if desired.
+	device_queue = [device newCommandQueue];
+	ERR_FAIL_NULL_V(device_queue, ERR_CANT_CREATE);
+
+	device_scope = [MTLCaptureManager.sharedCaptureManager newCaptureScopeWithCommandQueue:device_queue];
+	device_scope.label = @"Godot Frame";
+	[device_scope beginScope]; // Allow Xcode to capture the first frame, if desired.
+
+	resource_cache = std::make_unique<MDResourceCache>(this);
 
 	return OK;
 }
 
-void RenderingDeviceDriverMetal::_track_resource(MTL::Resource *p_resource) {
-	if (use_barriers) {
-		_residency_add.push_back(p_resource);
-	}
-}
-
-void RenderingDeviceDriverMetal::_untrack_resource(MTL::Resource *p_resource) {
-	if (use_barriers) {
-		_residency_del.push_back(p_resource);
-	}
-}
-
 void RenderingDeviceDriverMetal::_check_capabilities() {
 	capabilities.device_family = DEVICE_METAL;
 	parse_msl_version(device_properties->features.msl_target_version, capabilities.version_major, capabilities.version_minor);
@@ -2786,17 +2676,13 @@ void RenderingDeviceDriverMetal::_check_capabilities() {
 API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
 static MetalDeviceProfile device_profile_from_properties(MetalDeviceProperties *p_device_properties) {
 	using DP = MetalDeviceProfile;
-	NS::OperatingSystemVersion os_version = NS::ProcessInfo::processInfo()->operatingSystemVersion();
+	NSOperatingSystemVersion os_version = NSProcessInfo.processInfo.operatingSystemVersion;
 	MetalDeviceProfile res;
 	res.min_os_version = MinOsVersion(os_version.majorVersion, os_version.minorVersion, os_version.patchVersion);
 #if TARGET_OS_OSX
 	res.platform = DP::Platform::macOS;
-#elif TARGET_OS_IPHONE
-	res.platform = DP::Platform::iOS;
-#elif TARGET_OS_VISION
-	res.platform = DP::Platform::visionOS;
 #else
-#error "Unsupported Apple platform"
+	res.platform = DP::Platform::iOS;
 #endif
 	res.features = {
 		.msl_version = p_device_properties->features.msl_target_version,
@@ -2806,31 +2692,31 @@ static MetalDeviceProfile device_profile_from_properties(MetalDeviceProperties *
 
 	// highestFamily will only be set to an Apple GPU family
 	switch (p_device_properties->features.highestFamily) {
-		case MTL::GPUFamilyApple1:
+		case MTLGPUFamilyApple1:
 			res.gpu = DP::GPU::Apple1;
 			break;
-		case MTL::GPUFamilyApple2:
+		case MTLGPUFamilyApple2:
 			res.gpu = DP::GPU::Apple2;
 			break;
-		case MTL::GPUFamilyApple3:
+		case MTLGPUFamilyApple3:
 			res.gpu = DP::GPU::Apple3;
 			break;
-		case MTL::GPUFamilyApple4:
+		case MTLGPUFamilyApple4:
 			res.gpu = DP::GPU::Apple4;
 			break;
-		case MTL::GPUFamilyApple5:
+		case MTLGPUFamilyApple5:
 			res.gpu = DP::GPU::Apple5;
 			break;
-		case MTL::GPUFamilyApple6:
+		case MTLGPUFamilyApple6:
 			res.gpu = DP::GPU::Apple6;
 			break;
-		case MTL::GPUFamilyApple7:
+		case MTLGPUFamilyApple7:
 			res.gpu = DP::GPU::Apple7;
 			break;
-		case MTL::GPUFamilyApple8:
+		case MTLGPUFamilyApple8:
 			res.gpu = DP::GPU::Apple8;
 			break;
-		case MTL::GPUFamilyApple9:
+		case MTLGPUFamilyApple9:
 			res.gpu = DP::GPU::Apple9;
 			break;
 		default: {
@@ -2842,27 +2728,23 @@ static MetalDeviceProfile device_profile_from_properties(MetalDeviceProperties *
 	return res;
 }
 
-Error RenderingDeviceDriverMetal::_initialize(uint32_t p_device_index, uint32_t p_frame_count) {
+Error RenderingDeviceDriverMetal::initialize(uint32_t p_device_index, uint32_t p_frame_count) {
 	context_device = context_driver->device_get(p_device_index);
 	Error err = _create_device();
 	ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
 
 	device_properties = memnew(MetalDeviceProperties(device));
-	pixel_formats = memnew(PixelFormats(device, device_properties->features));
 	device_profile = device_profile_from_properties(device_properties);
-	resource_cache = std::make_unique<MDResourceCache>(device, *pixel_formats, device_properties->limits.maxPerStageBufferCount);
 	shader_container_format = memnew(RenderingShaderContainerFormatMetal(&device_profile));
 
 	_check_capabilities();
 
-	err = _copy_queue_initialize();
-	ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
-
 	_frame_count = p_frame_count;
 
 	// Set the pipeline cache ID based on the Metal version.
 	pipeline_cache_id = "metal-driver-" + get_api_version();
 
+	pixel_formats = memnew(PixelFormats(device, device_properties->features));
 	if (device_properties->features.layeredRendering) {
 		multiview_capabilities.is_supported = true;
 		multiview_capabilities.max_view_count = device_properties->limits.maxViewports;
@@ -2877,7 +2759,7 @@ Error RenderingDeviceDriverMetal::_initialize(uint32_t p_device_index, uint32_t
 	}
 
 	// The Metal renderer requires Apple4 family. This is 2017 era A11 chips and newer.
-	if (device_properties->features.highestFamily < MTL::GPUFamilyApple4) {
+	if (device_properties->features.highestFamily < MTLGPUFamilyApple4) {
 		String error_string = vformat("Your Apple GPU does not support the following features, which are required to use Metal-based renderers in Godot:\n\n");
 		if (!device_properties->features.imageCubeArray) {
 			error_string += "- No support for image cube arrays.\n";
diff --git a/engine/drivers/metal/rendering_device_driver_metal3.cpp b/engine/drivers/metal/rendering_device_driver_metal3.cpp
deleted file mode 100644
index 1fbd16fb..00000000
--- a/engine/drivers/metal/rendering_device_driver_metal3.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/**************************************************************************/
-/*  rendering_device_driver_metal3.cpp                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "rendering_device_driver_metal3.h"
-
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
-#include "core/string/ustring.h"
-#include "drivers/metal/pixel_formats.h"
-#include "drivers/metal/rendering_context_driver_metal.h"
-
-namespace MTL3 {
-
-#pragma mark - FenceEvent / FenceSemaphore
-
-void RenderingDeviceDriverMetal::FenceEvent::signal(MTL::CommandBuffer *p_cb) {
-	if (p_cb) {
-		value++;
-		p_cb->encodeSignalEvent(event.get(), value);
-	}
-}
-
-Error RenderingDeviceDriverMetal::FenceEvent::wait(uint32_t p_timeout_ms) {
-	bool signaled = event->waitUntilSignaledValue(value, p_timeout_ms);
-	if (!signaled) {
-#ifdef DEBUG_ENABLED
-		ERR_PRINT("timeout waiting for fence");
-#endif
-		return ERR_TIMEOUT;
-	}
-	return OK;
-}
-
-void RenderingDeviceDriverMetal::FenceSemaphore::signal(MTL::CommandBuffer *p_cb) {
-	if (p_cb) {
-		p_cb->addCompletedHandler([this](MTL::CommandBuffer *) {
-			dispatch_semaphore_signal(semaphore);
-		});
-	} else {
-		dispatch_semaphore_signal(semaphore);
-	}
-}
-
-Error RenderingDeviceDriverMetal::FenceSemaphore::wait(uint32_t p_timeout_ms) {
-	dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, static_cast<int64_t>(p_timeout_ms) * 1000000);
-	long result = dispatch_semaphore_wait(semaphore, timeout);
-	if (result != 0) {
-		return ERR_TIMEOUT;
-	}
-	return OK;
-}
-
-#pragma mark - Constructor / Destructor
-
-RenderingDeviceDriverMetal::RenderingDeviceDriverMetal(RenderingContextDriverMetal *p_context_driver) :
-		::RenderingDeviceDriverMetal(p_context_driver) {
-}
-
-RenderingDeviceDriverMetal::~RenderingDeviceDriverMetal() {
-	for (MDCommandBuffer *cb : command_buffers) {
-		memdelete(cb);
-	}
-}
-
-#pragma mark - Initialization
-
-Error RenderingDeviceDriverMetal::_create_device() {
-	Error err = ::RenderingDeviceDriverMetal::_create_device();
-	ERR_FAIL_COND_V(err, err);
-
-	device_queue = NS::TransferPtr(device->newCommandQueue());
-	ERR_FAIL_NULL_V(device_queue.get(), ERR_CANT_CREATE);
-	device_queue->setLabel(MTLSTR("Godot Main Command Queue"));
-
-	return OK;
-}
-
-Error RenderingDeviceDriverMetal::initialize(uint32_t p_device_index, uint32_t p_frame_count) {
-	Error err = _initialize(p_device_index, p_frame_count);
-	ERR_FAIL_COND_V(err, err);
-
-	// Barriers are still experimental in Metal 3, so they are disabled by default
-	// and can only be enabled via an environment variable.
-	bool barriers_enabled = OS::get_singleton()->get_environment("GODOT_MTL_FORCE_BARRIERS") == "1";
-	if (__builtin_available(macos 26.0, ios 26.0, tvos 26.0, visionos 26.0, *)) {
-		if (barriers_enabled) {
-			print_line("Metal 3: Resource barriers enabled.");
-			NS::SharedPtr<MTL::ResidencySetDescriptor> rs_desc = NS::TransferPtr(MTL::ResidencySetDescriptor::alloc()->init());
-			rs_desc->setInitialCapacity(250);
-			rs_desc->setLabel(MTLSTR("Main Residency Set"));
-			NS::Error *error = nullptr;
-			NS::SharedPtr<MTL::ResidencySet> mrs = NS::TransferPtr(device->newResidencySet(rs_desc.get(), &error));
-			if (!mrs) {
-				String error_msg = error ? String(error->localizedDescription()->utf8String()) : "Unknown error";
-				print_error(vformat("Resource barriers unavailable. Failed to create main residency set for explicit resource barriers: %s", error_msg));
-			} else {
-				use_barriers = true;
-				base_hazard_tracking = MTL::ResourceHazardTrackingModeUntracked;
-				main_residency_set = mrs;
-				device_queue->addResidencySet(mrs.get());
-			}
-		}
-	} else {
-		if (barriers_enabled) {
-			// Application or user has requested barriers, but the OS doesn't support them.
-			print_verbose("Metal 3: Resource barriers are not supported on this OS version.");
-			barriers_enabled = false;
-		}
-	}
-
-	return OK;
-}
-
-#pragma mark - Residency
-
-void RenderingDeviceDriverMetal::add_residency_set_to_main_queue(MTL::ResidencySet *p_set) {
-	device_queue->addResidencySet(p_set);
-}
-
-void RenderingDeviceDriverMetal::remove_residency_set_to_main_queue(MTL::ResidencySet *p_set) {
-	device_queue->removeResidencySet(p_set);
-}
-
-#pragma mark - Fences
-
-RDD::FenceID RenderingDeviceDriverMetal::fence_create() {
-	Fence *fence = nullptr;
-	if (__builtin_available(macOS 12.0, iOS 15.0, tvOS 15.0, visionOS 1.0, *)) {
-		fence = memnew(FenceEvent(NS::TransferPtr(device->newSharedEvent())));
-	} else {
-		fence = memnew(FenceSemaphore());
-	}
-	return FenceID(fence);
-}
-
-Error RenderingDeviceDriverMetal::fence_wait(FenceID p_fence) {
-	Fence *fence = (Fence *)(p_fence.id);
-	return fence->wait(1000);
-}
-
-void RenderingDeviceDriverMetal::fence_free(FenceID p_fence) {
-	Fence *fence = (Fence *)(p_fence.id);
-	memdelete(fence);
-}
-
-#pragma mark - Semaphores
-
-RDD::SemaphoreID RenderingDeviceDriverMetal::semaphore_create() {
-	if (use_barriers) {
-		Semaphore *sem = memnew(Semaphore(NS::TransferPtr(device->newEvent())));
-		return SemaphoreID(sem);
-	}
-	return SemaphoreID(1);
-}
-
-void RenderingDeviceDriverMetal::semaphore_free(SemaphoreID p_semaphore) {
-	if (use_barriers) {
-		Semaphore *sem = (Semaphore *)(p_semaphore.id);
-		memdelete(sem);
-	}
-}
-
-#pragma mark - Command Queues
-
-RDD::CommandQueueID RenderingDeviceDriverMetal::command_queue_create(CommandQueueFamilyID p_cmd_queue_family, bool p_identify_as_main_queue) {
-	return CommandQueueID(1);
-}
-
-Error RenderingDeviceDriverMetal::_execute_and_present_barriers(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_sem, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_sem, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) {
-	uint32_t size = p_cmd_buffers.size();
-	if (size == 0) {
-		return OK;
-	}
-
-	bool changed = false;
-	MTL::ResidencySet *mrs = main_residency_set.get();
-	if (!_residency_add.is_empty()) {
-		mrs->addAllocations(reinterpret_cast<const MTL::Allocation *const *>(_residency_add.ptr()), _residency_add.size());
-		_residency_add.clear();
-		changed = true;
-	}
-	if (!_residency_del.is_empty()) {
-		mrs->removeAllocations(reinterpret_cast<const MTL::Allocation *const *>(_residency_del.ptr()), _residency_del.size());
-		_residency_del.clear();
-		changed = true;
-	}
-	if (changed) {
-		mrs->commit();
-	}
-
-	if (p_wait_sem.size() > 0) {
-		MTL::CommandBuffer *cb = device_queue->commandBuffer();
-#ifdef DEV_ENABLED
-		cb->setLabel(MTLSTR("Wait Command Buffer"));
-#endif
-		for (uint32_t i = 0; i < p_wait_sem.size(); i++) {
-			Semaphore *sem = (Semaphore *)p_wait_sem[i].id;
-			cb->encodeWait(sem->event.get(), sem->value);
-		}
-		cb->commit();
-	}
-
-	for (uint32_t i = 0; i < size - 1; i++) {
-		MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[i].id);
-		cmd_buffer->commit();
-	}
-
-	// The last command buffer will signal the fence and semaphores.
-	MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[size - 1].id);
-	Fence *fence = (Fence *)(p_cmd_fence.id);
-	if (fence != nullptr) {
-		cmd_buffer->end();
-		MTL::CommandBuffer *cb = cmd_buffer->get_command_buffer();
-		fence->signal(cb);
-	}
-
-	struct DrawRequest {
-		NS::SharedPtr<MTL::Drawable> drawable;
-		DisplayServerEnums::VSyncMode vsync_mode;
-		double duration;
-	};
-
-	if (p_swap_chains.size() > 0) {
-		Vector<DrawRequest> drawables;
-		drawables.reserve(p_swap_chains.size());
-
-		for (uint32_t i = 0; i < p_swap_chains.size(); i++) {
-			SwapChain *swap_chain = (SwapChain *)(p_swap_chains[i].id);
-			RenderingContextDriverMetal::Surface *metal_surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
-			MTL::Drawable *drawable = metal_surface->next_drawable();
-			if (drawable) {
-				drawables.push_back(DrawRequest{
-						.drawable = NS::RetainPtr(drawable),
-						.vsync_mode = metal_surface->vsync_mode,
-						.duration = metal_surface->present_minimum_duration,
-				});
-			}
-		}
-
-		MTL::CommandBuffer *cb = cmd_buffer->get_command_buffer();
-		cb->addCompletedHandler([drawables = std::move(drawables)](MTL::CommandBuffer *) {
-			for (const DrawRequest &dr : drawables) {
-				switch (dr.vsync_mode) {
-					case DisplayServerEnums::VSYNC_DISABLED: {
-						dr.drawable->present();
-					} break;
-					default: {
-						dr.drawable->presentAfterMinimumDuration(dr.duration);
-					} break;
-				}
-			}
-		});
-	}
-
-	cmd_buffer->commit();
-
-	if (p_cmd_sem.size() > 0) {
-		MTL::CommandBuffer *cb = device_queue->commandBuffer();
-		for (uint32_t i = 0; i < p_cmd_sem.size(); i++) {
-			Semaphore *sem = (Semaphore *)p_cmd_sem[i].id;
-			sem->value++;
-			cb->encodeSignalEvent(sem->event.get(), sem->value);
-		}
-		cb->commit();
-	}
-
-	return OK;
-}
-
-Error RenderingDeviceDriverMetal::_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_sem, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_sem, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) {
-	uint32_t size = p_cmd_buffers.size();
-	if (size == 0) {
-		return OK;
-	}
-
-	for (uint32_t i = 0; i < size - 1; i++) {
-		MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[i].id);
-		cmd_buffer->commit();
-	}
-
-	// The last command buffer will signal the fence and semaphores.
-	MDCommandBuffer *cmd_buffer = (MDCommandBuffer *)(p_cmd_buffers[size - 1].id);
-	Fence *fence = (Fence *)(p_cmd_fence.id);
-	if (fence != nullptr) {
-		cmd_buffer->end();
-		MTL::CommandBuffer *cb = cmd_buffer->get_command_buffer();
-		fence->signal(cb);
-	}
-
-	for (uint32_t i = 0; i < p_swap_chains.size(); i++) {
-		SwapChain *swap_chain = (SwapChain *)(p_swap_chains[i].id);
-		RenderingContextDriverMetal::Surface *metal_surface = (RenderingContextDriverMetal::Surface *)(swap_chain->surface);
-		metal_surface->present(cmd_buffer);
-	}
-
-	cmd_buffer->commit();
-
-	return OK;
-}
-
-Error RenderingDeviceDriverMetal::command_queue_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_sem, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_sem, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) {
-	Error res;
-	if (use_barriers) {
-		res = _execute_and_present_barriers(p_cmd_queue, p_wait_sem, p_cmd_buffers, p_cmd_sem, p_cmd_fence, p_swap_chains);
-	} else {
-		res = _execute_and_present(p_cmd_queue, p_wait_sem, p_cmd_buffers, p_cmd_sem, p_cmd_fence, p_swap_chains);
-	}
-	ERR_FAIL_COND_V(res != OK, res);
-
-	if (p_swap_chains.size() > 0) {
-		// Used as a signal that we're presenting, so this is the end of a frame.
-		MTL::CaptureScope *scope = device_scope.get();
-		scope->endScope();
-		scope->beginScope();
-	}
-
-	return OK;
-}
-
-void RenderingDeviceDriverMetal::command_queue_free(CommandQueueID p_cmd_queue) {
-}
-
-#pragma mark - Command Pools
-
-RDD::CommandPoolID RenderingDeviceDriverMetal::command_pool_create(CommandQueueFamilyID p_cmd_queue_family, CommandBufferType p_cmd_buffer_type) {
-	DEV_ASSERT(p_cmd_buffer_type == COMMAND_BUFFER_TYPE_PRIMARY);
-	return CommandPoolID(reinterpret_cast<uint64_t>(device_queue.get()));
-}
-
-bool RenderingDeviceDriverMetal::command_pool_reset(CommandPoolID p_cmd_pool) {
-	return true;
-}
-
-void RenderingDeviceDriverMetal::command_pool_free(CommandPoolID p_cmd_pool) {
-	// Nothing to free - the device_queue is managed by SharedPtr.
-}
-
-#pragma mark - Command Buffers
-
-RDD::CommandBufferID RenderingDeviceDriverMetal::command_buffer_create(CommandPoolID p_cmd_pool) {
-	MTL::CommandQueue *queue = reinterpret_cast<MTL::CommandQueue *>(p_cmd_pool.id);
-	MDCommandBuffer *obj = memnew(MDCommandBuffer(queue, this));
-	command_buffers.push_back(obj);
-	return CommandBufferID(obj);
-}
-
-} // namespace MTL3
diff --git a/engine/drivers/metal/rendering_device_driver_metal3.h b/engine/drivers/metal/rendering_device_driver_metal3.h
deleted file mode 100644
index d87fa438..00000000
--- a/engine/drivers/metal/rendering_device_driver_metal3.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************/
-/*  rendering_device_driver_metal3.h                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "drivers/metal/metal3_objects.h"
-#include "drivers/metal/rendering_device_driver_metal.h"
-
-#include <Metal/Metal.hpp>
-
-namespace MTL3 {
-
-class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingDeviceDriverMetal final : public ::RenderingDeviceDriverMetal {
-	friend class MDCommandBuffer;
-#pragma mark - Generic
-
-	NS::SharedPtr<MTL::CommandQueue> device_queue;
-
-	struct Fence {
-		virtual void signal(MTL::CommandBuffer *p_cmd_buffer) = 0;
-		virtual Error wait(uint32_t p_timeout_ms) = 0;
-		virtual ~Fence() = default;
-	};
-
-	struct FenceEvent : Fence {
-		NS::SharedPtr<MTL::SharedEvent> event;
-		uint64_t value = 0;
-		FenceEvent(NS::SharedPtr<MTL::SharedEvent> p_event) :
-				event(p_event) {}
-		void signal(MTL::CommandBuffer *p_cb) override;
-		Error wait(uint32_t p_timeout_ms) override;
-	};
-
-	struct FenceSemaphore : Fence {
-		dispatch_semaphore_t semaphore;
-		FenceSemaphore() :
-				semaphore(dispatch_semaphore_create(0)) {}
-		void signal(MTL::CommandBuffer *p_cb) override;
-		Error wait(uint32_t p_timeout_ms) override;
-	};
-
-	struct Semaphore {
-		NS::SharedPtr<MTL::Event> event;
-		uint64_t value = 0;
-		Semaphore(NS::SharedPtr<MTL::Event> p_event) :
-				event(p_event) {}
-	};
-
-	Vector<MDCommandBuffer *> command_buffers;
-
-	Error _create_device() override;
-	Error _execute_and_present_barriers(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_semaphores, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_semaphores, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains);
-	Error _execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_semaphores, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_semaphores, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains);
-
-protected:
-	MTL::CommandQueue *get_command_queue() const override { return device_queue.get(); }
-	void add_residency_set_to_main_queue(MTL::ResidencySet *p_set) override;
-	void remove_residency_set_to_main_queue(MTL::ResidencySet *p_set) override;
-
-public:
-	Error initialize(uint32_t p_device_index, uint32_t p_frame_count) override;
-
-	FenceID fence_create() override;
-	Error fence_wait(FenceID p_fence) override;
-	void fence_free(FenceID p_fence) override;
-
-	SemaphoreID semaphore_create() override;
-	void semaphore_free(SemaphoreID p_semaphore) override;
-
-	CommandQueueID command_queue_create(CommandQueueFamilyID p_cmd_queue_family, bool p_identify_as_main_queue = false) override;
-	Error command_queue_execute_and_present(CommandQueueID p_cmd_queue, VectorView<SemaphoreID> p_wait_semaphores, VectorView<CommandBufferID> p_cmd_buffers, VectorView<SemaphoreID> p_cmd_semaphores, FenceID p_cmd_fence, VectorView<SwapChainID> p_swap_chains) override;
-	void command_queue_free(CommandQueueID p_cmd_queue) override;
-
-	CommandPoolID command_pool_create(CommandQueueFamilyID p_cmd_queue_family, CommandBufferType p_cmd_buffer_type) override;
-	bool command_pool_reset(CommandPoolID p_cmd_pool) override;
-	void command_pool_free(CommandPoolID p_cmd_pool) override;
-
-	CommandBufferID command_buffer_create(CommandPoolID p_cmd_pool) override;
-
-#pragma mark - Miscellaneous
-
-	String get_api_name() const override { return "Metal"; }
-
-	RenderingDeviceDriverMetal(RenderingContextDriverMetal *p_context_driver);
-	~RenderingDeviceDriverMetal();
-};
-
-} // namespace MTL3
diff --git a/engine/drivers/metal/rendering_shader_container_metal.h b/engine/drivers/metal/rendering_shader_container_metal.h
index 9a3aad83..24af5783 100644
--- a/engine/drivers/metal/rendering_shader_container_metal.h
+++ b/engine/drivers/metal/rendering_shader_container_metal.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
-#include "drivers/metal/metal_device_profile.h"
-#include "drivers/metal/sha256_digest.h"
-#include "servers/rendering/rendering_device_driver.h"
-#include "servers/rendering/rendering_shader_container.h"
+#import "metal_device_profile.h"
+#import "sha256_digest.h"
+
+#import "servers/rendering/rendering_device_driver.h"
+#import "servers/rendering/rendering_shader_container.h"
 
 constexpr uint32_t R32UI_ALIGNMENT_CONSTANT_ID = 65535;
 /// Metal buffer index for the view mask when rendering multi-view.
@@ -176,8 +177,6 @@ private:
 
 	Error compile_metal_source(const char *p_source, const StageData &p_stage_data, Vector<uint8_t> &r_binary_data);
 
-	Error reflect_spirv(const ReflectShader &p_shader);
-
 public:
 	static constexpr uint32_t FORMAT_VERSION = 2;
 
diff --git a/engine/drivers/metal/rendering_shader_container_metal.cpp b/engine/drivers/metal/rendering_shader_container_metal.mm
similarity index 84%
rename from engine/drivers/metal/rendering_shader_container_metal.cpp
rename to engine/drivers/metal/rendering_shader_container_metal.mm
index e0bc77e4..28ac7dc6 100644
--- a/engine/drivers/metal/rendering_shader_container_metal.cpp
+++ b/engine/drivers/metal/rendering_shader_container_metal.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  rendering_shader_container_metal.cpp                                  */
+/*  rendering_shader_container_metal.mm                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,21 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "rendering_shader_container_metal.h"
+#import "rendering_shader_container_metal.h"
 
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
-#include "core/os/os.h"
-#include "core/templates/fixed_vector.h"
-#include "drivers/metal/metal_utils.h"
+#import "metal_utils.h"
 
-#include <thirdparty/spirv-reflect/spirv_reflect.h>
+#import "core/io/file_access.h"
+#import "core/io/marshalls.h"
+#import "core/templates/fixed_vector.h"
+#import "servers/rendering/rendering_device.h"
 
-#include <Metal/Metal.hpp>
-#include <spirv.hpp>
-#include <spirv_msl.hpp>
-#include <spirv_parser.hpp>
+#include "thirdparty/spirv-reflect/spirv_reflect.h"
+
+#import <Metal/Metal.h>
+#import <spirv.hpp>
+#import <spirv_msl.hpp>
+#import <spirv_parser.hpp>
 
 void RenderingShaderContainerMetal::_initialize_toolchain_properties() {
 	if (compiler_props.is_valid()) {
@@ -235,74 +236,6 @@ spv::ExecutionModel map_stage(RDD::ShaderStage p_stage) {
 	return SHADER_STAGE_REMAP[p_stage];
 }
 
-Error RenderingShaderContainerMetal::reflect_spirv(const ReflectShader &p_shader) {
-	//	const LocalVector<ReflectShaderStage> &p_spirv = p_shader.shader_stages;
-	//
-	//	using ShaderStage = RenderingDeviceCommons::ShaderStage;
-	//
-	//	const uint32_t spirv_size = p_spirv.size();
-	//
-	//	HashSet<uint32_t> atomic_spirv_ids;
-	//	bool atomics_scanned = false;
-	//	auto scan_atomic_accesses = [&atomic_spirv_ids, &p_spirv, spirv_size, &atomics_scanned]() {
-	//		if (atomics_scanned) {
-	//			return;
-	//		}
-	//
-	//		for (uint32_t i = 0; i < spirv_size + 0; i++) {
-	//			const uint32_t STARTING_WORD_INDEX = 5;
-	//			Span<uint32_t> spirv = p_spirv[i].spirv();
-	//			const uint32_t *words = spirv.ptr() + STARTING_WORD_INDEX;
-	//			while (words < spirv.end()) {
-	//				uint32_t instruction = *words;
-	//				uint16_t word_count = instruction >> 16;
-	//				SpvOp opcode = (SpvOp)(instruction & 0xFFFF);
-	//				if (opcode == SpvOpImageTexelPointer) {
-	//					uint32_t image_var_id = words[3];
-	//					atomic_spirv_ids.insert(image_var_id);
-	//				}
-	//				words += word_count;
-	//			}
-	//		}
-	//
-	//		atomics_scanned = true;
-	//	};
-	//
-	//	for (uint32_t i = 0; i < spirv_size + 0; i++) {
-	//		ShaderStage stage = p_spirv[i].shader_stage;
-	//		ShaderStage stage_flag = (ShaderStage)(1 << p_spirv[i].shader_stage);
-	//		SpvReflectResult result;
-	//
-	//		const SpvReflectShaderModule &module = p_spirv[i].module();
-	//
-	//		uint32_t binding_count = 0;
-	//		result = spvReflectEnumerateDescriptorBindings(&module, &binding_count, nullptr);
-	//		CRASH_COND(result != SPV_REFLECT_RESULT_SUCCESS);
-	//
-	//		if (binding_count > 0) {
-	//			LocalVector<SpvReflectDescriptorBinding *> bindings;
-	//			bindings.resize_uninitialized(binding_count);
-	//			result = spvReflectEnumerateDescriptorBindings(&module, &binding_count, bindings.ptr());
-	//
-	//			for (uint32_t j = 0; j < binding_count; j++) {
-	//				const SpvReflectDescriptorBinding &binding = *bindings[j];
-	//
-	//				switch (binding.descriptor_type) {
-	//					case SPV_REFLECT_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
-	//					case SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
-	//					case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE:
-	//					case SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
-	//						break;
-	//					default:
-	//						break;
-	//				}
-	//			}
-	//		}
-	//	}
-	//
-	return OK;
-}
-
 bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_shader) {
 	using namespace spirv_cross;
 	using spirv_cross::CompilerMSL;
@@ -349,7 +282,12 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 		msl_options.ios_support_base_vertex_instance = true;
 	}
 
-	if (device_profile->features.use_argument_buffers) {
+	// We don't currently allow argument buffers when using dynamic buffers as
+	// the current implementation does not update the argument buffer each time
+	// the dynamic buffer changes. This is a future TODO.
+	bool argument_buffers_allowed = get_shader_reflection().has_dynamic_buffers == false;
+
+	if (device_profile->features.use_argument_buffers && argument_buffers_allowed) {
 		msl_options.argument_buffers_tier = CompilerMSL::Options::ArgumentBuffersTier::Tier2;
 		msl_options.argument_buffers = true;
 		mtl_reflection_data.set_uses_argument_buffers(true);
@@ -424,7 +362,7 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 
 				found->active_stages = uniform.stages;
 
-				RDC::UniformType type = RDC::UniformType(uniform.type);
+				RD::UniformType type = RD::UniformType(uniform.type);
 				uint32_t binding_stride = 1; // If this is an array, stride will be the length of the array.
 				if (uniform.length > 1) {
 					switch (type) {
@@ -446,9 +384,9 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 					case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE: {
 						if (!(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE)) {
 							if (!(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_READABLE)) {
-								found->access = MTL::BindingAccessReadWrite;
+								found->access = MTLBindingAccessReadWrite;
 							} else {
-								found->access = MTL::BindingAccessWriteOnly;
+								found->access = MTLBindingAccessWriteOnly;
 							}
 						}
 					} break;
@@ -456,9 +394,9 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 					case SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER: {
 						if (!(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE) && !(binding.block.decoration_flags & SPV_REFLECT_DECORATION_NON_WRITABLE)) {
 							if (!(binding.decoration_flags & SPV_REFLECT_DECORATION_NON_READABLE) && !(binding.block.decoration_flags & SPV_REFLECT_DECORATION_NON_READABLE)) {
-								found->access = MTL::BindingAccessReadWrite;
+								found->access = MTLBindingAccessReadWrite;
 							} else {
-								found->access = MTL::BindingAccessWriteOnly;
+								found->access = MTLBindingAccessWriteOnly;
 							}
 						}
 					} break;
@@ -467,14 +405,14 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 				}
 
 				switch (found->access) {
-					case MTL::BindingAccessReadOnly:
-						found->usage = MTL::ResourceUsageRead;
+					case MTLBindingAccessReadOnly:
+						found->usage = MTLResourceUsageRead;
 						break;
-					case MTL::BindingAccessWriteOnly:
-						found->usage = MTL::ResourceUsageWrite;
+					case MTLBindingAccessWriteOnly:
+						found->usage = MTLResourceUsageWrite;
 						break;
-					case MTL::BindingAccessReadWrite:
-						found->usage = MTL::ResourceUsageRead | MTL::ResourceUsageWrite;
+					case MTLBindingAccessReadWrite:
+						found->usage = MTLResourceUsageRead | MTLResourceUsageWrite;
 						break;
 				}
 
@@ -486,7 +424,7 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 
 				switch (type) {
 					case RDC::UNIFORM_TYPE_SAMPLER: {
-						found->data_type = MTL::DataTypeSampler;
+						found->data_type = MTLDataTypeSampler;
 						found->get_indexes(UniformData::IndexType::SLOT).sampler = next_index(Sampler, binding_stride);
 						found->get_indexes(UniformData::IndexType::ARG).sampler = next_arg_index(binding_stride);
 
@@ -495,7 +433,7 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 					} break;
 					case RDC::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE:
 					case RDC::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE_BUFFER: {
-						found->data_type = MTL::DataTypeTexture;
+						found->data_type = MTLDataTypeTexture;
 						found->get_indexes(UniformData::IndexType::SLOT).texture = next_index(Texture, binding_stride);
 						found->get_indexes(UniformData::IndexType::SLOT).sampler = next_index(Sampler, binding_stride);
 						found->get_indexes(UniformData::IndexType::ARG).texture = next_arg_index(binding_stride);
@@ -505,7 +443,7 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 					case RDC::UNIFORM_TYPE_TEXTURE:
 					case RDC::UNIFORM_TYPE_IMAGE:
 					case RDC::UNIFORM_TYPE_TEXTURE_BUFFER: {
-						found->data_type = MTL::DataTypeTexture;
+						found->data_type = MTLDataTypeTexture;
 						found->get_indexes(UniformData::IndexType::SLOT).texture = next_index(Texture, binding_stride);
 						found->get_indexes(UniformData::IndexType::ARG).texture = next_arg_index(binding_stride);
 						rb.basetype = SPIRType::BaseType::Image;
@@ -517,13 +455,13 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 					case RDC::UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC:
 					case RDC::UNIFORM_TYPE_UNIFORM_BUFFER:
 					case RDC::UNIFORM_TYPE_STORAGE_BUFFER: {
-						found->data_type = MTL::DataTypePointer;
+						found->data_type = MTLDataTypePointer;
 						found->get_indexes(UniformData::IndexType::SLOT).buffer = next_index(Buffer, binding_stride);
 						found->get_indexes(UniformData::IndexType::ARG).buffer = next_arg_index(binding_stride);
 						rb.basetype = SPIRType::BaseType::Void;
 					} break;
 					case RDC::UNIFORM_TYPE_INPUT_ATTACHMENT: {
-						found->data_type = MTL::DataTypeTexture;
+						found->data_type = MTLDataTypeTexture;
 						found->get_indexes(UniformData::IndexType::SLOT).texture = next_index(Texture, binding_stride);
 						found->get_indexes(UniformData::IndexType::ARG).texture = next_arg_index(binding_stride);
 						rb.basetype = SPIRType::BaseType::Image;
@@ -538,53 +476,44 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 				rb.msl_texture = found->get_indexes(shader_index_type).texture;
 				rb.msl_sampler = found->get_indexes(shader_index_type).sampler;
 
-				if (found->data_type == MTL::DataTypeTexture) {
+				if (found->data_type == MTLDataTypeTexture) {
 					const SpvReflectImageTraits &image = uniform.get_spv_reflect().image;
 
 					switch (image.dim) {
 						case SpvDim1D: {
 							if (image.arrayed) {
-								found->texture_type = MTL::TextureType1DArray;
+								found->texture_type = MTLTextureType1DArray;
 							} else {
-								found->texture_type = MTL::TextureType1D;
+								found->texture_type = MTLTextureType1D;
 							}
 						} break;
 						case SpvDimSubpassData:
 						case SpvDim2D: {
 							if (image.arrayed && image.ms) {
-								found->texture_type = MTL::TextureType2DMultisampleArray;
+								found->texture_type = MTLTextureType2DMultisampleArray;
 							} else if (image.arrayed) {
-								found->texture_type = MTL::TextureType2DArray;
+								found->texture_type = MTLTextureType2DArray;
 							} else if (image.ms) {
-								found->texture_type = MTL::TextureType2DMultisample;
+								found->texture_type = MTLTextureType2DMultisample;
 							} else {
-								found->texture_type = MTL::TextureType2D;
+								found->texture_type = MTLTextureType2D;
 							}
 						} break;
 						case SpvDim3D: {
-							found->texture_type = MTL::TextureType3D;
+							found->texture_type = MTLTextureType3D;
 						} break;
 						case SpvDimCube: {
 							if (image.arrayed) {
-								found->texture_type = MTL::TextureTypeCubeArray;
+								found->texture_type = MTLTextureTypeCubeArray;
 							} else {
-								found->texture_type = MTL::TextureTypeCube;
+								found->texture_type = MTLTextureTypeCube;
 							}
 						} break;
 						case SpvDimRect: {
 							// Ignored.
 						} break;
 						case SpvDimBuffer: {
-							found->texture_type = MTL::TextureTypeTextureBuffer;
-							// If this is used with atomics, we need to use a read-write texture.
-							// 	scan_atomic_accesses();
-							// 	if (atomic_spirv_ids.find(uniform.spirv_id) != atomic_spirv_ids.end()) {
-							// 		rb.access = MTLBindingAccessReadWrite;
-							// 		found->access = MTLBindingAccessReadWrite;
-							// 	} else {
-							// 		rb.access = MTLBindingAccessReadOnly;
-							// 		found->access = MTLBindingAccessReadOnly;
-							// 	}
+							found->texture_type = MTLTextureTypeTextureBuffer;
 						} break;
 						case SpvDimTileImageDataEXT: {
 							// Godot does not use this extension.
@@ -618,13 +547,13 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 	for (uint32_t i = 0; i < p_spirv.size(); i++) {
 		StageData &stage_data = mtl_shaders.write[i];
 		const ReflectShaderStage &v = p_spirv[i];
-		RDC::ShaderStage stage = v.shader_stage;
+		RD::ShaderStage stage = v.shader_stage;
 		Span<uint32_t> spirv = v.spirv();
 		Parser parser(spirv.ptr(), spirv.size());
 		try {
 			parser.parse();
 		} catch (CompilerError &e) {
-			ERR_FAIL_V_MSG(false, "Failed to parse IR at stage " + String(RDC::SHADER_STAGE_NAMES[stage]) + ": " + e.what());
+			ERR_FAIL_V_MSG(false, "Failed to parse IR at stage " + String(RD::SHADER_STAGE_NAMES[stage]) + ": " + e.what());
 		}
 
 		CompilerMSL compiler(std::move(parser.get_parsed_ir()));
@@ -650,7 +579,7 @@ bool RenderingShaderContainerMetal::_set_code_from_spirv(const ReflectShader &p_
 		try {
 			source = compiler.compile();
 		} catch (CompilerError &e) {
-			ERR_FAIL_V_MSG(false, "Failed to compile stage " + String(RDC::SHADER_STAGE_NAMES[stage]) + ": " + e.what());
+			ERR_FAIL_V_MSG(false, "Failed to compile stage " + String(RD::SHADER_STAGE_NAMES[stage]) + ": " + e.what());
 		}
 
 		ERR_FAIL_COND_V_MSG(compiler.get_entry_points_and_stages().size() != 1, false, "Expected a single entry point and stage.");
diff --git a/engine/drivers/metal/sha256_digest.h b/engine/drivers/metal/sha256_digest.h
index f8c226cb..6b477c95 100644
--- a/engine/drivers/metal/sha256_digest.h
+++ b/engine/drivers/metal/sha256_digest.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
+#import <CommonCrypto/CommonDigest.h>
+#import <simd/simd.h>
+#import <zlib.h>
+
 #include "core/templates/hashfuncs.h"
 #include "core/templates/local_vector.h"
 
-#include <CommonCrypto/CommonDigest.h>
-#include <simd/simd.h>
-#include <zlib.h>
-
 struct SHA256Digest {
 	unsigned char data[CC_SHA256_DIGEST_LENGTH];
 
diff --git a/engine/drivers/png/png_driver_common.cpp b/engine/drivers/png/png_driver_common.cpp
index aa69ad38..018e94bb 100644
--- a/engine/drivers/png/png_driver_common.cpp
+++ b/engine/drivers/png/png_driver_common.cpp
@@ -30,9 +30,7 @@
 
 #include "png_driver_common.h"
 
-#ifdef TOOLS_ENABLED
 #include "core/config/engine.h"
-#endif
 
 #include <png.h>
 
diff --git a/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
index 8b8e21c5..8bc88495 100644
--- a/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
+++ b/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
@@ -32,9 +32,7 @@
 
 #ifdef PULSEAUDIO_ENABLED
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/math/math_funcs_binary.h"
 #include "core/os/os.h"
 #include "core/version.h"
 
@@ -224,7 +222,7 @@ Error AudioDriverPulseAudio::init_output_device() {
 	}
 
 	int tmp_latency = Engine::get_singleton()->get_audio_output_latency();
-	buffer_frames = Math::closest_power_of_2(tmp_latency * mix_rate / 1000);
+	buffer_frames = closest_power_of_2(tmp_latency * mix_rate / 1000);
 	pa_buffer_size = buffer_frames * pa_map.channels;
 
 	print_verbose("PulseAudio: detected " + itos(pa_map.channels) + " output channels");
@@ -729,7 +727,7 @@ Error AudioDriverPulseAudio::init_input_device() {
 	spec.rate = mix_rate;
 
 	int input_latency = 30;
-	int input_buffer_frames = Math::closest_power_of_2(input_latency * mix_rate / 1000);
+	int input_buffer_frames = closest_power_of_2(input_latency * mix_rate / 1000);
 	int input_buffer_size = input_buffer_frames * spec.channels;
 
 	pa_buffer_attr attr = {};
diff --git a/engine/drivers/pulseaudio/audio_driver_pulseaudio.h b/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
index dde0e34a..3186ebf1 100644
--- a/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
+++ b/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
@@ -38,7 +38,7 @@
 #include "servers/audio/audio_server.h"
 
 #ifdef SOWRAP_ENABLED
-#include "drivers/pulseaudio/pulse-so_wrap.h" // IWYU pragma: keep. Relies on pulseaudio.h transitive includes.
+#include "pulse-so_wrap.h"
 #else
 #include <pulse/pulseaudio.h>
 #endif
diff --git a/engine/drivers/pulseaudio/pulse-so_wrap.c b/engine/drivers/pulseaudio/pulse-so_wrap.c
index 0928f9dc..8f477740 100644
--- a/engine/drivers/pulseaudio/pulse-so_wrap.c
+++ b/engine/drivers/pulseaudio/pulse-so_wrap.c
@@ -356,7 +356,7 @@
 #define pa_timeval_store pa_timeval_store_dylibloader_orig_pulse
 #define pa_timeval_load pa_timeval_load_dylibloader_orig_pulse
 #define pa_rtclock_now pa_rtclock_now_dylibloader_orig_pulse
-#include <thirdparty/linuxbsd_headers/pulse/pulseaudio.h>
+#include "thirdparty/linuxbsd_headers/pulse/pulseaudio.h"
 #undef pa_get_library_version
 #undef pa_bytes_per_second
 #undef pa_frame_size
diff --git a/engine/drivers/pulseaudio/pulse-so_wrap.h b/engine/drivers/pulseaudio/pulse-so_wrap.h
index c02d76ef..bba8fd36 100644
--- a/engine/drivers/pulseaudio/pulse-so_wrap.h
+++ b/engine/drivers/pulseaudio/pulse-so_wrap.h
@@ -358,7 +358,7 @@
 #define pa_timeval_store pa_timeval_store_dylibloader_orig_pulse
 #define pa_timeval_load pa_timeval_load_dylibloader_orig_pulse
 #define pa_rtclock_now pa_rtclock_now_dylibloader_orig_pulse
-#include <thirdparty/linuxbsd_headers/pulse/pulseaudio.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/pulse/pulseaudio.h"
 #undef pa_get_library_version
 #undef pa_bytes_per_second
 #undef pa_frame_size
diff --git a/engine/drivers/register_driver_types.cpp b/engine/drivers/register_driver_types.cpp
index 9d8a87fe..55660ffe 100644
--- a/engine/drivers/register_driver_types.cpp
+++ b/engine/drivers/register_driver_types.cpp
@@ -30,22 +30,13 @@
 
 #include "register_driver_types.h"
 
-#include "core/io/resource_saver.h"
 #include "drivers/png/image_loader_png.h"
 #include "drivers/png/resource_saver_png.h"
 
-#ifdef ACCESSKIT_ENABLED
-#include "drivers/accesskit/accessibility_server_accesskit.h"
-#endif
-
 static Ref<ImageLoaderPNG> image_loader_png;
 static Ref<ResourceSaverPNG> resource_saver_png;
 
 void register_core_driver_types() {
-#ifdef ACCESSKIT_ENABLED
-	AccessibilityServerAccessKit::register_create_func();
-#endif
-
 	image_loader_png.instantiate();
 	ImageLoader::add_image_format_loader(image_loader_png);
 
diff --git a/engine/drivers/sdl/SCsub b/engine/drivers/sdl/SCsub
index 4666edb5..a3631fed 100644
--- a/engine/drivers/sdl/SCsub
+++ b/engine/drivers/sdl/SCsub
@@ -188,26 +188,6 @@ if env["builtin_sdl"]:
             "timer/windows/SDL_systimer.c",
         ]
 
-    elif env["platform"] in ["ios", "visionos"]:
-        if env["platform"] == "ios":
-            env_sdl.Append(CPPDEFINES=["SDL_PLATFORM_IOS"])
-        else:
-            env_sdl.Append(CPPDEFINES=["SDL_PLATFORM_VISIONOS"])
-
-        thirdparty_sources += [
-            "core/unix/SDL_appid.c",
-            "core/unix/SDL_poll.c",
-            "haptic/dummy/SDL_syshaptic.c",
-            "joystick/apple/SDL_mfijoystick.m",
-            "thread/pthread/SDL_syscond.c",
-            "thread/pthread/SDL_sysmutex.c",
-            "thread/pthread/SDL_sysrwlock.c",
-            "thread/pthread/SDL_syssem.c",
-            "thread/pthread/SDL_systhread.c",
-            "thread/pthread/SDL_systls.c",
-            "timer/unix/SDL_systimer.c",
-        ]
-
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     env_thirdparty = env_sdl.Clone()
diff --git a/engine/drivers/sdl/SDL_build_config_private.h b/engine/drivers/sdl/SDL_build_config_private.h
index 1a86bb55..d6e6cb72 100644
--- a/engine/drivers/sdl/SDL_build_config_private.h
+++ b/engine/drivers/sdl/SDL_build_config_private.h
@@ -117,7 +117,7 @@
 #define SDL_INPUT_LINUXEV 1
 #define SDL_THREAD_PTHREAD 1
 
-// macOS defines
+// MacOS defines
 #elif defined(SDL_PLATFORM_MACOS)
 
 #define SDL_PLATFORM_PRIVATE_NAME "macOS"
@@ -132,27 +132,6 @@
 #define SDL_THREAD_PTHREAD 1
 #define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
 
-// iOS/visionOS defines
-#elif defined(SDL_PLATFORM_IOS) || defined(SDL_PLATFORM_VISIONOS)
-
-#ifdef SDL_PLATFORM_IOS
-#define SDL_PLATFORM_PRIVATE_NAME "iOS"
-#else
-#define SDL_PLATFORM_PRIVATE_NAME "visionOS"
-#endif
-
-#define SDL_PLATFORM_UNIX 1
-
-#define HAVE_STDIO_H 1
-#define HAVE_LIBC 1
-
-#define SDL_JOYSTICK_MFI 1
-#define SDL_HAPTIC_DUMMY 1
-#define SDL_TIMER_UNIX 1
-#define SDL_THREAD_PTHREAD 1
-
-#define SDL_MAIN_HANDLED 1
-
 // Other platforms are not supported (for now)
 #else
 #error "No SDL build config was found for this platform. Setup one before compiling the engine."
diff --git a/engine/drivers/sdl/joypad_sdl.cpp b/engine/drivers/sdl/joypad_sdl.cpp
index 669d766f..99384736 100644
--- a/engine/drivers/sdl/joypad_sdl.cpp
+++ b/engine/drivers/sdl/joypad_sdl.cpp
@@ -33,6 +33,7 @@
 #ifdef SDL_ENABLED
 
 #include "core/input/default_controller_mappings.h"
+#include "core/os/time.h"
 #include "core/variant/dictionary.h"
 
 #include <SDL3/SDL.h>
@@ -42,13 +43,19 @@
 #include <SDL3/SDL_iostream.h>
 #include <SDL3/SDL_joystick.h>
 
+JoypadSDL *JoypadSDL::singleton = nullptr;
+
 // Macro to skip the SDL joystick event handling if the device is an SDL gamepad, because
 // there are separate events for SDL gamepads
-#define SKIP_EVENT_FOR_GAMEPAD \
+#define SKIP_EVENT_FOR_GAMEPAD                    \
 	if (SDL_IsGamepad(sdl_event.jdevice.which)) { \
-		continue; \
+		continue;                                 \
 	}
 
+JoypadSDL::JoypadSDL() {
+	singleton = this;
+}
+
 JoypadSDL::~JoypadSDL() {
 	// Process any remaining input events
 	process_events();
@@ -58,6 +65,11 @@ JoypadSDL::~JoypadSDL() {
 		}
 	}
 	SDL_Quit();
+	singleton = nullptr;
+}
+
+JoypadSDL *JoypadSDL::get_singleton() {
+	return singleton;
 }
 
 Error JoypadSDL::initialize() {
@@ -71,7 +83,7 @@ Error JoypadSDL::initialize() {
 		String mapping_string = DefaultControllerMappings::mappings[i++];
 		CharString data = mapping_string.utf8();
 		SDL_IOStream *rw = SDL_IOFromMem((void *)data.ptr(), data.size());
-		SDL_AddGamepadMappingsFromIO(rw, true);
+		SDL_AddGamepadMappingsFromIO(rw, 1);
 	}
 
 	// Make sure that we handle already connected joypads when the driver is initialized.
@@ -94,17 +106,6 @@ void JoypadSDL::process_events() {
 
 				SDL_Joystick *sdl_joy = SDL_GetJoystickFromID(joypads[i].sdl_instance_idx);
 				Vector2 strength = Input::get_singleton()->get_joy_vibration_strength(i);
-				// Invalid values for strength are filtered by Input::start_joy_vibration().
-
-				float duration = Input::get_singleton()->get_joy_vibration_duration(i);
-				Uint32 duration_ms = 0;
-				if (duration < 0.0f) {
-					continue; // Invalid duration.
-				} else if (duration == 0.0f) {
-					duration_ms = 0xFFFF; // SDL_MAX_RUMBLE_DURATION_MS
-				} else {
-					duration_ms = duration * 1000;
-				}
 
 				/*
 					If the vibration was requested to start, SDL_RumbleJoystick will start it.
@@ -113,10 +114,13 @@ void JoypadSDL::process_events() {
 					Here strength.y goes first and then strength.x, because Input.get_joy_vibration_strength().x
 					is vibration's weak magnitude (high frequency rumble), and .y is strong magnitude (low frequency rumble),
 					SDL_RumbleJoystick takes low frequency rumble first and then high frequency rumble.
-
-					Rumble strength goes from 0 to 0xFFFF.
 				*/
-				SDL_RumbleJoystick(sdl_joy, strength.y * UINT16_MAX, strength.x * UINT16_MAX, duration_ms);
+				SDL_RumbleJoystick(
+						sdl_joy,
+						// Rumble strength goes from 0 to 0xFFFF
+						strength.y * UINT16_MAX,
+						strength.x * UINT16_MAX,
+						Input::get_singleton()->get_joy_vibration_duration(i) * 1000);
 			}
 		}
 	}
@@ -157,44 +161,34 @@ void JoypadSDL::process_events() {
 
 				const int MAX_GUID_SIZE = 64;
 				char guid[MAX_GUID_SIZE] = {};
-				SDL_GUID joy_guid = SDL_GetJoystickGUID(joy);
-				SDL_GUIDToString(joy_guid, guid, MAX_GUID_SIZE);
+
+				SDL_GUIDToString(SDL_GetJoystickGUID(joy), guid, MAX_GUID_SIZE);
 				SDL_PropertiesID propertiesID = SDL_GetJoystickProperties(joy);
 
 				joypads[joy_id].attached = true;
 				joypads[joy_id].sdl_instance_idx = sdl_event.jdevice.which;
 				joypads[joy_id].supports_force_feedback = SDL_GetBooleanProperty(propertiesID, SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, false);
 				joypads[joy_id].guid = StringName(String(guid));
-				joypads[joy_id].supports_motion_sensors = SDL_GamepadHasSensor(gamepad, SDL_SENSOR_ACCEL) || SDL_GamepadHasSensor(gamepad, SDL_SENSOR_GYRO);
 
 				sdl_instance_id_to_joypad_id.insert(sdl_event.jdevice.which, joy_id);
 
 				Dictionary joypad_info;
 				// Skip Godot's mapping system if SDL already handles the joypad's mapping.
 				joypad_info["mapping_handled"] = SDL_IsGamepad(sdl_event.jdevice.which);
-				joypad_info["raw_name"] = String::utf8(SDL_GetJoystickName(joy));
+				joypad_info["raw_name"] = String(SDL_GetJoystickName(joy));
 				joypad_info["vendor_id"] = itos(SDL_GetJoystickVendor(joy));
 				joypad_info["product_id"] = itos(SDL_GetJoystickProduct(joy));
 
-				const String serial = String(SDL_GetJoystickSerial(joy));
-				if (!serial.is_empty()) {
-					joypad_info["serial_number"] = serial;
-				}
-
-#if defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED) || defined(MACOS_ENABLED)
 				const uint64_t steam_handle = SDL_GetGamepadSteamHandle(gamepad);
 				if (steam_handle != 0) {
 					joypad_info["steam_input_index"] = itos(steam_handle);
 				}
-#endif
 
-#ifdef WINDOWS_ENABLED
 				const int player_index = SDL_GetJoystickPlayerIndex(joy);
-				if (player_index >= 0 && joy_guid.data[14] == 'x') { // See also "SDL_IsJoystickXInput" in "thirdparty/sdl/joystick/SDL_joystick.c".
+				if (player_index >= 0) {
 					// For XInput controllers SDL_GetJoystickPlayerIndex returns the XInput user index.
 					joypad_info["xinput_index"] = itos(player_index);
 				}
-#endif
 
 				Input::get_singleton()->joy_connection_changed(
 						joy_id,
@@ -204,11 +198,6 @@ void JoypadSDL::process_events() {
 						joypad_info);
 
 				Input::get_singleton()->set_joy_features(joy_id, &joypads[joy_id]);
-
-				if (joypads[joy_id].supports_motion_sensors) {
-					// Data rate for all sensors should be the same.
-					Input::get_singleton()->set_joy_motion_sensors_rate(joy_id, SDL_GetGamepadSensorDataRate(gamepad, SDL_SENSOR_ACCEL));
-				}
 			}
 			// An event for an attached joypad
 		} else if (sdl_event.type >= SDL_EVENT_JOYSTICK_AXIS_MOTION && sdl_event.type < SDL_EVENT_FINGER_DOWN && sdl_instance_id_to_joypad_id.has(sdl_event.jdevice.which)) {
@@ -283,25 +272,6 @@ void JoypadSDL::process_events() {
 			}
 		}
 	}
-
-	for (int i = 0; i < Input::JOYPADS_MAX; i++) {
-		Joypad &joy = joypads[i];
-		if (!joy.attached || !joy.supports_motion_sensors) {
-			continue;
-		}
-		SDL_Gamepad *gamepad = SDL_GetGamepadFromID(joy.sdl_instance_idx);
-		// gamepad should not be NULL since joy.supports_motion_sensors is true here.
-
-		float accel_data[3];
-		float gyro_data[3];
-		SDL_GetGamepadSensorData(gamepad, SDL_SENSOR_ACCEL, accel_data, 3);
-		SDL_GetGamepadSensorData(gamepad, SDL_SENSOR_GYRO, gyro_data, 3);
-
-		Input::get_singleton()->joy_motion_sensors(
-				i,
-				Vector3(-accel_data[0], -accel_data[1], -accel_data[2]),
-				Vector3(gyro_data[0], gyro_data[1], gyro_data[2]));
-	}
 }
 
 void JoypadSDL::close_joypad(int p_pad_idx) {
@@ -320,8 +290,7 @@ void JoypadSDL::close_joypad(int p_pad_idx) {
 }
 
 bool JoypadSDL::Joypad::has_joy_light() const {
-	SDL_Joystick *joystick = get_sdl_joystick();
-	SDL_PropertiesID properties_id = SDL_GetJoystickProperties(joystick);
+	SDL_PropertiesID properties_id = SDL_GetJoystickProperties(get_sdl_joystick());
 	if (properties_id == 0) {
 		return false;
 	}
@@ -332,20 +301,6 @@ void JoypadSDL::Joypad::set_joy_light(const Color &p_color) {
 	SDL_SetJoystickLED(get_sdl_joystick(), p_color.get_r8(), p_color.get_g8(), p_color.get_b8());
 }
 
-bool JoypadSDL::Joypad::has_joy_motion_sensors() const {
-	return supports_motion_sensors;
-}
-
-void JoypadSDL::Joypad::set_joy_motion_sensors_enabled(bool p_enable) {
-	SDL_Gamepad *gamepad = get_sdl_gamepad();
-	SDL_SetGamepadSensorEnabled(gamepad, SDL_SENSOR_ACCEL, p_enable);
-	SDL_SetGamepadSensorEnabled(gamepad, SDL_SENSOR_GYRO, p_enable);
-}
-
-bool JoypadSDL::Joypad::has_joy_vibration() const {
-	return supports_force_feedback;
-}
-
 SDL_Joystick *JoypadSDL::Joypad::get_sdl_joystick() const {
 	return SDL_GetJoystickFromID(sdl_instance_idx);
 }
diff --git a/engine/drivers/sdl/joypad_sdl.h b/engine/drivers/sdl/joypad_sdl.h
index e3c7c03e..88aa342b 100644
--- a/engine/drivers/sdl/joypad_sdl.h
+++ b/engine/drivers/sdl/joypad_sdl.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/input/input.h"
+#include "core/os/thread.h"
 
 typedef uint32_t SDL_JoystickID;
 typedef struct SDL_Joystick SDL_Joystick;
@@ -38,8 +39,11 @@ typedef struct SDL_Gamepad SDL_Gamepad;
 
 class JoypadSDL {
 public:
+	JoypadSDL();
 	~JoypadSDL();
 
+	static JoypadSDL *get_singleton();
+
 	Error initialize();
 	void process_events();
 
@@ -52,21 +56,17 @@ private:
 		SDL_JoystickID sdl_instance_idx;
 
 		bool supports_force_feedback = false;
-		bool supports_motion_sensors = false;
 		uint64_t ff_effect_timestamp = 0;
 
 		virtual bool has_joy_light() const override;
 		virtual void set_joy_light(const Color &p_color) override;
 
-		virtual bool has_joy_motion_sensors() const override;
-		virtual void set_joy_motion_sensors_enabled(bool p_enable) override;
-
-		virtual bool has_joy_vibration() const override;
-
 		SDL_Joystick *get_sdl_joystick() const;
 		SDL_Gamepad *get_sdl_gamepad() const;
 	};
 
+	static JoypadSDL *singleton;
+
 	Joypad joypads[Input::JOYPADS_MAX];
 	HashMap<SDL_JoystickID, int> sdl_instance_id_to_joypad_id;
 
diff --git a/engine/drivers/unix/dir_access_unix.cpp b/engine/drivers/unix/dir_access_unix.cpp
index f1ee07ce..399157c1 100644
--- a/engine/drivers/unix/dir_access_unix.cpp
+++ b/engine/drivers/unix/dir_access_unix.cpp
@@ -32,6 +32,7 @@
 
 #if defined(UNIX_ENABLED)
 
+#include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/templates/list.h"
@@ -43,7 +44,6 @@
 #include <sys/statfs.h>
 #endif
 #include <sys/statvfs.h>
-
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
diff --git a/engine/drivers/unix/file_access_unix.cpp b/engine/drivers/unix/file_access_unix.cpp
index 6b241dc3..303d4174 100644
--- a/engine/drivers/unix/file_access_unix.cpp
+++ b/engine/drivers/unix/file_access_unix.cpp
@@ -32,7 +32,8 @@
 
 #if defined(UNIX_ENABLED)
 
-#include "core/string/ustring.h"
+#include "core/os/os.h"
+#include "core/string/print_string.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -41,10 +42,10 @@
 #include <sys/xattr.h>
 #endif
 #include <unistd.h>
-
 #include <cerrno>
 
 #if defined(TOOLS_ENABLED)
+#include <climits>
 #include <cstdlib>
 #endif
 
diff --git a/engine/drivers/unix/file_access_unix.h b/engine/drivers/unix/file_access_unix.h
index 691d36a6..3e200a71 100644
--- a/engine/drivers/unix/file_access_unix.h
+++ b/engine/drivers/unix/file_access_unix.h
@@ -30,12 +30,13 @@
 
 #pragma once
 
-#if defined(UNIX_ENABLED)
-
 #include "core/io/file_access.h"
+#include "core/os/memory.h"
 
 #include <cstdio>
 
+#if defined(UNIX_ENABLED)
+
 class FileAccessUnix : public FileAccess {
 	GDSOFTCLASS(FileAccessUnix, FileAccess);
 	FILE *f = nullptr;
diff --git a/engine/drivers/unix/file_access_unix_pipe.cpp b/engine/drivers/unix/file_access_unix_pipe.cpp
index c3276d9f..e808c5de 100644
--- a/engine/drivers/unix/file_access_unix_pipe.cpp
+++ b/engine/drivers/unix/file_access_unix_pipe.cpp
@@ -32,18 +32,18 @@
 
 #if defined(UNIX_ENABLED)
 
-#include "core/string/ustring.h"
+#include "core/os/os.h"
+#include "core/string/print_string.h"
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-
 #include <cerrno>
 #include <csignal>
 
-#ifndef _GNU_SOURCE
+#ifndef sighandler_t
 typedef typeof(void(int)) *sighandler_t;
 #endif
 
diff --git a/engine/drivers/unix/file_access_unix_pipe.h b/engine/drivers/unix/file_access_unix_pipe.h
index c55cb7ee..71960253 100644
--- a/engine/drivers/unix/file_access_unix_pipe.h
+++ b/engine/drivers/unix/file_access_unix_pipe.h
@@ -30,9 +30,12 @@
 
 #pragma once
 
-#if defined(UNIX_ENABLED)
-
 #include "core/io/file_access.h"
+#include "core/os/memory.h"
+
+#include <cstdio>
+
+#if defined(UNIX_ENABLED)
 
 class FileAccessUnixPipe : public FileAccess {
 	GDSOFTCLASS(FileAccessUnixPipe, FileAccess);
diff --git a/engine/drivers/unix/ip_unix.cpp b/engine/drivers/unix/ip_unix.cpp
index ce972f7b..b290b7cd 100644
--- a/engine/drivers/unix/ip_unix.cpp
+++ b/engine/drivers/unix/ip_unix.cpp
@@ -37,7 +37,7 @@
 #ifdef ANDROID_ENABLED
 // We could drop this file once we up our API level to 24,
 // where the NDK's ifaddrs.h supports to needed getifaddrs.
-#include <thirdparty/misc/ifaddrs-android.h>
+#include "thirdparty/misc/ifaddrs-android.h"
 #else
 #ifdef __FreeBSD__
 #include <sys/types.h>
diff --git a/engine/drivers/unix/net_socket_unix.cpp b/engine/drivers/unix/net_socket_unix.cpp
index 01cd5577..3953a845 100644
--- a/engine/drivers/unix/net_socket_unix.cpp
+++ b/engine/drivers/unix/net_socket_unix.cpp
@@ -44,7 +44,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -130,7 +129,7 @@ void NetSocketUnix::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *r_i
 	}
 }
 
-Ref<NetSocket> NetSocketUnix::_create_func() {
+NetSocket *NetSocketUnix::_create_func() {
 	return memnew(NetSocketUnix);
 }
 
@@ -190,7 +189,7 @@ bool NetSocketUnix::_can_use_ip(const IPAddress &p_ip, const bool p_for_bind) co
 
 bool NetSocketUnix::_can_use_path(const CharString &p_path) const {
 	// Path must not exceed maximum path length for Unix domain socket
-	return !p_path.is_empty() && (size_t)p_path.length() < sizeof(((sockaddr_un *)nullptr)->sun_path);
+	return !p_path.is_empty() && (size_t)p_path.length() < sizeof(((sockaddr_un *)0)->sun_path);
 }
 
 _FORCE_INLINE_ Error NetSocketUnix::_change_multicast_group(IPAddress p_ip, String p_if_name, bool p_add) {
@@ -796,8 +795,7 @@ Ref<NetSocket> NetSocketUnix::_inet_accept(IPAddress &r_ip, uint16_t &r_port) {
 
 	_set_ip_port(&their_addr, &r_ip, &r_port);
 
-	Ref<NetSocketUnix> ns;
-	ns.instantiate();
+	NetSocketUnix *ns = memnew(NetSocketUnix);
 	ns->_set_socket(fd, _ip_type, _is_stream);
 	ns->set_blocking_enabled(false);
 	return Ref<NetSocket>(ns);
@@ -814,7 +812,7 @@ Ref<NetSocket> NetSocketUnix::_unix_accept() {
 		return Ref<NetSocket>();
 	}
 
-	Ref<NetSocketUnix> ret = memnew(NetSocketUnix);
+	NetSocketUnix *ret = memnew(NetSocketUnix);
 	ret->_sock = fd;
 	ret->_family = _family;
 	ret->_unix_path = _unix_path;
diff --git a/engine/drivers/unix/net_socket_unix.h b/engine/drivers/unix/net_socket_unix.h
index 1ef30d67..3f64420d 100644
--- a/engine/drivers/unix/net_socket_unix.h
+++ b/engine/drivers/unix/net_socket_unix.h
@@ -65,7 +65,7 @@ private:
 	_FORCE_INLINE_ void _set_close_exec_enabled(bool p_enabled);
 
 protected:
-	static Ref<NetSocket> _create_func();
+	static NetSocket *_create_func();
 
 	bool _can_use_ip(const IPAddress &p_ip, const bool p_for_bind) const;
 	bool _can_use_path(const CharString &p_path) const;
diff --git a/engine/drivers/unix/os_unix.cpp b/engine/drivers/unix/os_unix.cpp
index 1384b02f..044e9a0c 100644
--- a/engine/drivers/unix/os_unix.cpp
+++ b/engine/drivers/unix/os_unix.cpp
@@ -32,17 +32,15 @@
 
 #ifdef UNIX_ENABLED
 
+#include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
 #include "drivers/unix/file_access_unix_pipe.h"
-#include "drivers/unix/thread_posix.h"
-
-#ifndef UNIX_SOCKET_UNAVAILABLE
-#include "drivers/unix/ip_unix.h"
 #include "drivers/unix/net_socket_unix.h"
-#endif
+#include "drivers/unix/thread_posix.h"
+#include "servers/rendering/rendering_server.h"
 
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
@@ -78,9 +76,9 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
 #include <cerrno>
 #include <csignal>
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
@@ -89,7 +87,7 @@
 #define RTLD_DEEPBIND 0
 #endif
 
-#ifndef ASAN_ENABLED
+#ifndef SANITIZERS_ENABLED
 #define GODOT_DLOPEN_MODE RTLD_NOW | RTLD_DEEPBIND
 #else
 #define GODOT_DLOPEN_MODE RTLD_NOW
@@ -713,23 +711,23 @@ PackedByteArray OS_Unix::string_to_multibyte(const String &p_encoding, const Str
 }
 
 Dictionary OS_Unix::execute_with_pipe(const String &p_path, const List<String> &p_arguments, bool p_blocking) {
-#define CLEAN_PIPES \
-	if (pipe_in[0] >= 0) { \
-		::close(pipe_in[0]); \
-	} \
-	if (pipe_in[1] >= 0) { \
-		::close(pipe_in[1]); \
-	} \
-	if (pipe_out[0] >= 0) { \
+#define CLEAN_PIPES           \
+	if (pipe_in[0] >= 0) {    \
+		::close(pipe_in[0]);  \
+	}                         \
+	if (pipe_in[1] >= 0) {    \
+		::close(pipe_in[1]);  \
+	}                         \
+	if (pipe_out[0] >= 0) {   \
 		::close(pipe_out[0]); \
-	} \
-	if (pipe_out[1] >= 0) { \
+	}                         \
+	if (pipe_out[1] >= 0) {   \
 		::close(pipe_out[1]); \
-	} \
-	if (pipe_err[0] >= 0) { \
+	}                         \
+	if (pipe_err[0] >= 0) {   \
 		::close(pipe_err[0]); \
-	} \
-	if (pipe_err[1] >= 0) { \
+	}                         \
+	if (pipe_err[1] >= 0) {   \
 		::close(pipe_err[1]); \
 	}
 
@@ -860,8 +858,8 @@ bool OS_Unix::_check_pid_is_running(const pid_t p_pid, int *r_status) const {
 		// Thread is still running.
 		return true;
 	}
-	ERR_FAIL_COND_V_MSG(result != 0 && errno == ECHILD, false, vformat("The process %d does not exist or is not a child of the calling process.", (int)p_pid));
-	ERR_FAIL_COND_V_MSG(result != 0, false, vformat("waitpid for process %d failed with errno: %d", (int)p_pid, errno));
+
+	ERR_FAIL_COND_V_MSG(result != 0, false, vformat("Thread %d exited with errno: %d", (int)p_pid, errno));
 
 	// Thread exited normally.
 	status = WIFEXITED(status) ? WEXITSTATUS(status) : status;
@@ -1060,7 +1058,7 @@ Error OS_Unix::open_dynamic_library(const String &p_path, void *&p_library_handl
 		path = get_executable_path().get_base_dir().path_join("../lib").path_join(p_path.get_file());
 	}
 
-	ERR_FAIL_COND_V_MSG(!FileAccess::exists(path), ERR_FILE_NOT_FOUND, vformat("Can't open dynamic library, file not found: '%s'.", p_path));
+	ERR_FAIL_COND_V(!FileAccess::exists(path), ERR_FILE_NOT_FOUND);
 
 	p_library_handle = dlopen(path.utf8().get_data(), GODOT_DLOPEN_MODE);
 	ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));
@@ -1210,19 +1208,6 @@ String OS_Unix::get_executable_path() const {
 #endif
 }
 
-String OS_Unix::expand_path(const String &p_path) const {
-	String path = p_path;
-
-	if (path.begins_with("~/") || path == "~") {
-		String home = get_environment("HOME");
-		if (!home.is_empty()) {
-			path = home + path.substr(1);
-		}
-	}
-
-	return path;
-}
-
 void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type, const Vector<Ref<ScriptBacktrace>> &p_script_backtraces) {
 	if (!should_log(true)) {
 		return;
diff --git a/engine/drivers/unix/os_unix.h b/engine/drivers/unix/os_unix.h
index 3a4b4fc2..45668958 100644
--- a/engine/drivers/unix/os_unix.h
+++ b/engine/drivers/unix/os_unix.h
@@ -33,6 +33,7 @@
 #ifdef UNIX_ENABLED
 
 #include "core/os/os.h"
+#include "drivers/unix/ip_unix.h"
 
 #if defined(__GLIBC__) || defined(WEB_ENABLED)
 #include <iconv.h>
@@ -46,7 +47,7 @@ typedef void *gd_iconv_t;
 typedef gd_iconv_t (*PIConvOpen)(const char *, const char *);
 typedef size_t (*PIConv)(gd_iconv_t, char **, size_t *, char **, size_t *);
 typedef int (*PIConvClose)(gd_iconv_t);
-typedef const char *(*PIConvLocaleCharset)();
+typedef const char *(*PIConvLocaleCharset)(void);
 #endif
 
 class OS_Unix : public OS {
@@ -140,8 +141,6 @@ public:
 
 	virtual String get_executable_path() const override;
 	virtual String get_user_data_dir(const String &p_user_dir) const override;
-
-	virtual String expand_path(const String &p_path) const override;
 };
 
 class UnixTerminalLogger : public StdLogger {
diff --git a/engine/drivers/unix/syslog_logger.cpp b/engine/drivers/unix/syslog_logger.cpp
index f6e6139e..2efe4d8f 100644
--- a/engine/drivers/unix/syslog_logger.cpp
+++ b/engine/drivers/unix/syslog_logger.cpp
@@ -32,6 +32,8 @@
 
 #include "syslog_logger.h"
 
+#include "core/string/print_string.h"
+
 #include <syslog.h>
 
 void SyslogLogger::logv(const char *p_format, va_list p_list, bool p_err) {
diff --git a/engine/drivers/vulkan/SCsub b/engine/drivers/vulkan/SCsub
index 92e7f685..b0330118 100644
--- a/engine/drivers/vulkan/SCsub
+++ b/engine/drivers/vulkan/SCsub
@@ -31,10 +31,6 @@ elif env["platform"] == "windows":
     env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_WIN32_KHR"])
 
 # Build Vulkan memory allocator and volk
-
-# We don't use it for now, and it depends on Windows APIs.
-env.AppendUnique(CPPDEFINES=["VMA_EXTERNAL_MEMORY_WIN32=0"])
-
 env_thirdparty_vma = env.Clone()
 env_thirdparty_vma.disable_warnings()
 thirdparty_sources_vma = [thirdparty_dir + "/vk_mem_alloc.cpp"]
diff --git a/engine/drivers/vulkan/godot_vulkan.h b/engine/drivers/vulkan/godot_vulkan.h
index b3f057a2..b665cddd 100644
--- a/engine/drivers/vulkan/godot_vulkan.h
+++ b/engine/drivers/vulkan/godot_vulkan.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-// IWYU pragma: begin_exports.
 #ifdef USE_VOLK
 #include <volk.h>
 #else
@@ -38,4 +37,3 @@
 #define VK_NO_STDINT_H
 #include <vulkan/vulkan.h>
 #endif
-// IWYU pragma: end_exports.
diff --git a/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp b/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
index 28b45ee0..f702cf23 100644
--- a/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
+++ b/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
@@ -32,17 +32,13 @@
 
 #include "rendering_context_driver_vulkan.h"
 
-#include "core/config/engine.h"
+#include "vk_enum_string_helper.h"
+
 #include "core/config/project_settings.h"
 #include "core/version.h"
-#include "drivers/vulkan/rendering_device_driver_vulkan.h"
-#include "drivers/vulkan/vulkan_hooks.h"
 
-#ifndef DEV_ENABLED
-#include "core/os/os.h"
-#endif
-
-#include <vk_enum_string_helper.h>
+#include "rendering_device_driver_vulkan.h"
+#include "vulkan_hooks.h"
 
 #if defined(VK_TRACK_DRIVER_MEMORY)
 /*************************************************/
@@ -440,9 +436,6 @@ Error RenderingContextDriverVulkan::_initialize_instance_extensions() {
 	// This extension allows us to use the properties2 features to query additional device capabilities.
 	_register_requested_instance_extension(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, false);
 
-	// This extension allows us to use colorspaces other than SRGB.
-	_register_requested_instance_extension(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME, false);
-
 #if defined(USE_VOLK) && (defined(MACOS_ENABLED) || defined(IOS_ENABLED))
 	_register_requested_instance_extension(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, true);
 #endif
@@ -987,63 +980,17 @@ void RenderingContextDriverVulkan::surface_set_size(SurfaceID p_surface, uint32_
 	surface->needs_resize = true;
 }
 
-void RenderingContextDriverVulkan::surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) {
+void RenderingContextDriverVulkan::surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) {
 	Surface *surface = (Surface *)(p_surface);
 	surface->vsync_mode = p_vsync_mode;
 	surface->needs_resize = true;
 }
 
-DisplayServerEnums::VSyncMode RenderingContextDriverVulkan::surface_get_vsync_mode(SurfaceID p_surface) const {
+DisplayServer::VSyncMode RenderingContextDriverVulkan::surface_get_vsync_mode(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->vsync_mode;
 }
 
-void RenderingContextDriverVulkan::surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_output = p_enabled;
-	surface->needs_resize = true;
-}
-
-bool RenderingContextDriverVulkan::surface_get_hdr_output_enabled(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_output;
-}
-
-void RenderingContextDriverVulkan::surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_reference_luminance = p_reference_luminance;
-}
-
-float RenderingContextDriverVulkan::surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_reference_luminance;
-}
-
-void RenderingContextDriverVulkan::surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_max_luminance = p_max_luminance;
-}
-
-float RenderingContextDriverVulkan::surface_get_hdr_output_max_luminance(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_max_luminance;
-}
-
-void RenderingContextDriverVulkan::surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) {
-	Surface *surface = (Surface *)(p_surface);
-	surface->hdr_linear_luminance_scale = p_linear_luminance_scale;
-}
-
-float RenderingContextDriverVulkan::surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return surface->hdr_linear_luminance_scale;
-}
-
-float RenderingContextDriverVulkan::surface_get_hdr_output_max_value(SurfaceID p_surface) const {
-	Surface *surface = (Surface *)(p_surface);
-	return MAX(surface->hdr_max_luminance / MAX(surface->hdr_reference_luminance, 1.0f), 1.0f);
-}
-
 uint32_t RenderingContextDriverVulkan::surface_get_width(SurfaceID p_surface) const {
 	Surface *surface = (Surface *)(p_surface);
 	return surface->width;
@@ -1074,10 +1021,6 @@ bool RenderingContextDriverVulkan::is_debug_utils_enabled() const {
 	return enabled_instance_extension_names.has(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
 }
 
-bool RenderingContextDriverVulkan::is_colorspace_supported() const {
-	return enabled_instance_extension_names.has(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME);
-}
-
 VkInstance RenderingContextDriverVulkan::instance_get() const {
 	return instance;
 }
diff --git a/engine/drivers/vulkan/rendering_context_driver_vulkan.h b/engine/drivers/vulkan/rendering_context_driver_vulkan.h
index 5d760a89..2881a17c 100644
--- a/engine/drivers/vulkan/rendering_context_driver_vulkan.h
+++ b/engine/drivers/vulkan/rendering_context_driver_vulkan.h
@@ -32,16 +32,14 @@
 
 #ifdef VULKAN_ENABLED
 
-#include "core/templates/hash_set.h"
-#include "core/templates/local_vector.h"
 #include "servers/rendering/rendering_context_driver.h"
 
-#if defined(DEBUG_ENABLED)
+#if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)
 #define VK_TRACK_DRIVER_MEMORY
 #define VK_TRACK_DEVICE_MEMORY
 #endif
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 class RenderingContextDriverVulkan : public RenderingContextDriver {
 public:
@@ -138,40 +136,22 @@ public:
 	virtual void driver_free(RenderingDeviceDriver *p_driver) override;
 	virtual SurfaceID surface_create(const void *p_platform_data) override;
 	virtual void surface_set_size(SurfaceID p_surface, uint32_t p_width, uint32_t p_height) override;
-	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) override;
-	virtual DisplayServerEnums::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) override;
-	virtual bool surface_get_hdr_output_enabled(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) override;
-	virtual float surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) override;
-	virtual float surface_get_hdr_output_max_luminance(SurfaceID p_surface) const override;
-	virtual void surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) override;
-	virtual float surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const override;
-	virtual float surface_get_hdr_output_max_value(SurfaceID p_surface) const override;
+	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) override;
+	virtual DisplayServer::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const override;
 	virtual uint32_t surface_get_width(SurfaceID p_surface) const override;
 	virtual uint32_t surface_get_height(SurfaceID p_surface) const override;
 	virtual void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) override;
 	virtual bool surface_get_needs_resize(SurfaceID p_surface) const override;
 	virtual void surface_destroy(SurfaceID p_surface) override;
 	virtual bool is_debug_utils_enabled() const override;
-	virtual bool is_colorspace_externally_managed() const { return false; }
-	bool is_colorspace_supported() const;
 
 	// Vulkan-only methods.
 	struct Surface {
 		VkSurfaceKHR vk_surface = VK_NULL_HANDLE;
 		uint32_t width = 0;
 		uint32_t height = 0;
-		DisplayServerEnums::VSyncMode vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
+		DisplayServer::VSyncMode vsync_mode = DisplayServer::VSYNC_ENABLED;
 		bool needs_resize = false;
-
-		bool hdr_output = false;
-		// BT.2408 recommendation of 203 nits for HDR Reference White, rounded to 200
-		// to be a more pleasant player-facing value.
-		float hdr_reference_luminance = 200.0f;
-		float hdr_max_luminance = 1000.0f;
-		float hdr_linear_luminance_scale = 100.0f;
 	};
 
 	VkInstance instance_get() const;
diff --git a/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp b/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
index 3896bd3f..2b368aa2 100644
--- a/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
+++ b/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
@@ -30,31 +30,24 @@
 
 #include "rendering_device_driver_vulkan.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
-#include "core/templates/fixed_vector.h"
-#include "drivers/vulkan/vulkan_hooks.h"
+#include "core/io/marshalls.h"
+#include "vulkan_hooks.h"
 
-#include <thirdparty/misc/smolv.h>
+#include "thirdparty/misc/smolv.h"
 
-#if defined(SWAPPY_FRAME_PACING_ENABLED)
+#if defined(ANDROID_ENABLED)
 #include "platform/android/java_godot_wrapper.h"
 #include "platform/android/os_android.h"
 #include "platform/android/thread_jandroid.h"
+#endif
 
-#include <thirdparty/swappy-frame-pacing/swappyVk.h>
+#if defined(SWAPPY_FRAME_PACING_ENABLED)
+#include "thirdparty/swappy-frame-pacing/swappyVk.h"
 #endif
 
 #define ARRAY_SIZE(a) std_size(a)
 
-// Disable raytracing support on macOS and iOS due to MoltenVK limitations.
-#if !(defined(MACOS_ENABLED) || defined(IOS_ENABLED))
-#define VULKAN_RAYTRACING_ENABLED 1
-#else
-#define VULKAN_RAYTRACING_ENABLED 0
-#endif
-
 #define PRINT_NATIVE_COMMANDS 0
 
 // Enable the use of re-spirv for optimizing shaders after applying specialization constants.
@@ -415,21 +408,6 @@ uint32_t RenderingDeviceDriverVulkan::SubgroupCapabilities::supported_stages_fla
 	if (supported_stages & VK_SHADER_STAGE_COMPUTE_BIT) {
 		flags += SHADER_STAGE_COMPUTE_BIT;
 	}
-	if (supported_stages & VK_SHADER_STAGE_RAYGEN_BIT_KHR) {
-		flags += SHADER_STAGE_RAYGEN_BIT;
-	}
-	if (supported_stages & VK_SHADER_STAGE_ANY_HIT_BIT_KHR) {
-		flags += SHADER_STAGE_ANY_HIT_BIT;
-	}
-	if (supported_stages & VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR) {
-		flags += SHADER_STAGE_CLOSEST_HIT_BIT;
-	}
-	if (supported_stages & VK_SHADER_STAGE_MISS_BIT_KHR) {
-		flags += SHADER_STAGE_MISS_BIT;
-	}
-	if (supported_stages & VK_SHADER_STAGE_INTERSECTION_BIT_KHR) {
-		flags += SHADER_STAGE_INTERSECTION_BIT;
-	}
 
 	return flags;
 }
@@ -566,7 +544,6 @@ Error RenderingDeviceDriverVulkan::_initialize_device_extensions() {
 	_register_requested_device_extension(VK_KHR_MULTIVIEW_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, false);
@@ -581,11 +558,6 @@ Error RenderingDeviceDriverVulkan::_initialize_device_extensions() {
 	_register_requested_device_extension(VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_DEPTH_STENCIL_RESOLVE_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_NV_RAY_TRACING_VALIDATION_EXTENSION_NAME, false);
-	_register_requested_device_extension(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME, false);
 
 	// We don't actually use this extension, but some runtime components on some platforms
 	// can and will fill the validation layers with useless info otherwise if not enabled.
@@ -739,10 +711,10 @@ Error RenderingDeviceDriverVulkan::_check_device_features() {
 	// - sparseResidencyAliased
 	// - inheritedQueries
 
-#define VK_DEVICEFEATURE_ENABLE_IF(x) \
-	if (physical_device_features.x) { \
+#define VK_DEVICEFEATURE_ENABLE_IF(x)                             \
+	if (physical_device_features.x) {                             \
 		requested_device_features.x = physical_device_features.x; \
-	} else \
+	} else                                                        \
 		((void)0)
 
 	requested_device_features = {};
@@ -790,10 +762,6 @@ Error RenderingDeviceDriverVulkan::_check_device_features() {
 	return OK;
 }
 
-static uint32_t _align_up(uint32_t size, uint32_t alignment) {
-	return (size + (alignment - 1)) & ~(alignment - 1);
-}
-
 Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 	// Fill device family and version.
 	device_capabilities.device_family = DEVICE_VULKAN;
@@ -827,11 +795,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		VkPhysicalDevice16BitStorageFeaturesKHR storage_feature = {};
 		VkPhysicalDeviceMultiviewFeatures multiview_features = {};
 		VkPhysicalDevicePipelineCreationCacheControlFeatures pipeline_cache_control_features = {};
-		VkPhysicalDeviceVulkanMemoryModelFeatures memory_model_features = {};
-		VkPhysicalDeviceAccelerationStructureFeaturesKHR acceleration_structure_features = {};
-		VkPhysicalDeviceRayTracingPipelineFeaturesKHR raytracing_pipeline_features = {};
-		VkPhysicalDeviceSynchronization2FeaturesKHR sync_2_features = {};
-		VkPhysicalDeviceRayTracingValidationFeaturesNV raytracing_validation_features = {};
 
 		const bool use_1_2_features = physical_device_properties.apiVersion >= VK_API_VERSION_1_2;
 		if (use_1_2_features) {
@@ -892,36 +855,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 			next_features = &pipeline_cache_control_features;
 		}
 
-		if (enabled_device_extension_names.has(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME)) {
-			memory_model_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES;
-			memory_model_features.pNext = next_features;
-			next_features = &memory_model_features;
-		}
-
-		if (enabled_device_extension_names.has(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME)) {
-			acceleration_structure_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
-			acceleration_structure_features.pNext = next_features;
-			next_features = &acceleration_structure_features;
-		}
-
-		if (enabled_device_extension_names.has(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME)) {
-			raytracing_pipeline_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
-			raytracing_pipeline_features.pNext = next_features;
-			next_features = &raytracing_pipeline_features;
-		}
-
-		if (enabled_device_extension_names.has(VK_NV_RAY_TRACING_VALIDATION_EXTENSION_NAME)) {
-			raytracing_validation_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV;
-			raytracing_validation_features.pNext = next_features;
-			next_features = &raytracing_validation_features;
-		}
-
-		if (enabled_device_extension_names.has(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME)) {
-			sync_2_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES;
-			sync_2_features.pNext = next_features;
-			next_features = &sync_2_features;
-		}
-
 		VkPhysicalDeviceFeatures2 device_features_2 = {};
 		device_features_2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
 		device_features_2.pNext = next_features;
@@ -1001,15 +934,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 			device_memory_report_support = true;
 		}
 #endif
-
-		if (enabled_device_extension_names.has(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME)) {
-			acceleration_structure_capabilities.acceleration_structure_support = acceleration_structure_features.accelerationStructure;
-		}
-
-		if (enabled_device_extension_names.has(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME)) {
-			raytracing_capabilities.raytracing_pipeline_support = raytracing_pipeline_features.rayTracingPipeline;
-			raytracing_capabilities.validation = raytracing_validation_features.rayTracingValidation;
-		}
 	}
 
 	if (functions.GetPhysicalDeviceProperties2 != nullptr) {
@@ -1020,8 +944,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		VkPhysicalDeviceMultiviewProperties multiview_properties = {};
 		VkPhysicalDeviceSubgroupProperties subgroup_properties = {};
 		VkPhysicalDeviceSubgroupSizeControlProperties subgroup_size_control_properties = {};
-		VkPhysicalDeviceAccelerationStructurePropertiesKHR acceleration_structure_properties = {};
-		VkPhysicalDeviceRayTracingPipelinePropertiesKHR raytracing_properties = {};
 		VkPhysicalDeviceProperties2 physical_device_properties_2 = {};
 
 		const bool use_1_1_properties = physical_device_properties.apiVersion >= VK_API_VERSION_1_1;
@@ -1062,18 +984,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 			next_properties = &fdmo_properties;
 		}
 
-		if (acceleration_structure_capabilities.acceleration_structure_support) {
-			acceleration_structure_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;
-			acceleration_structure_properties.pNext = next_properties;
-			next_properties = &acceleration_structure_properties;
-		}
-
-		if (raytracing_capabilities.raytracing_pipeline_support) {
-			raytracing_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR;
-			raytracing_properties.pNext = next_properties;
-			next_properties = &raytracing_properties;
-		}
-
 		physical_device_properties_2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
 		physical_device_properties_2.pNext = next_properties;
 		functions.GetPhysicalDeviceProperties2(physical_device, &physical_device_properties_2);
@@ -1174,29 +1084,6 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		if (subgroup_capabilities.quad_operations_in_all_stages) {
 			print_verbose("  quad operations in all stages");
 		}
-
-		if (acceleration_structure_capabilities.acceleration_structure_support) {
-			print_verbose("- Vulkan Acceleration Structure supported");
-			acceleration_structure_capabilities.min_acceleration_structure_scratch_offset_alignment = acceleration_structure_properties.minAccelerationStructureScratchOffsetAlignment;
-			print_verbose("  min acceleration structure scratch offset alignment: " + itos(acceleration_structure_capabilities.min_acceleration_structure_scratch_offset_alignment));
-		} else {
-			print_verbose("- Vulkan Acceleration Structure not supported");
-		}
-
-		if (raytracing_capabilities.raytracing_pipeline_support) {
-			raytracing_capabilities.shader_group_handle_size = raytracing_properties.shaderGroupHandleSize;
-			raytracing_capabilities.shader_group_handle_alignment = raytracing_properties.shaderGroupHandleAlignment;
-			raytracing_capabilities.shader_group_handle_size_aligned = _align_up(raytracing_capabilities.shader_group_handle_size, raytracing_capabilities.shader_group_handle_alignment);
-			raytracing_capabilities.shader_group_base_alignment = raytracing_properties.shaderGroupBaseAlignment;
-
-			print_verbose("- Vulkan Raytracing supported");
-			print_verbose("  shader group handle size: " + itos(raytracing_capabilities.shader_group_handle_size));
-			print_verbose("  shader group handle alignment: " + itos(raytracing_capabilities.shader_group_handle_alignment));
-			print_verbose("  shader group handle size aligned: " + itos(raytracing_capabilities.shader_group_handle_size_aligned));
-			print_verbose("  shader group base alignment: " + itos(raytracing_capabilities.shader_group_base_alignment));
-		} else {
-			print_verbose("- Vulkan Raytracing not supported");
-		}
 	}
 
 	return OK;
@@ -1333,30 +1220,6 @@ Error RenderingDeviceDriverVulkan::_initialize_device(const LocalVector<VkDevice
 	}
 #endif
 
-	VkPhysicalDeviceAccelerationStructureFeaturesKHR acceleration_structure_features = {};
-	if (acceleration_structure_capabilities.acceleration_structure_support) {
-		acceleration_structure_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
-		acceleration_structure_features.pNext = create_info_next;
-		acceleration_structure_features.accelerationStructure = acceleration_structure_capabilities.acceleration_structure_support;
-		create_info_next = &acceleration_structure_features;
-	}
-
-	VkPhysicalDeviceRayTracingPipelineFeaturesKHR raytracing_pipeline_features = {};
-	if (raytracing_capabilities.raytracing_pipeline_support) {
-		raytracing_pipeline_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
-		raytracing_pipeline_features.pNext = create_info_next;
-		raytracing_pipeline_features.rayTracingPipeline = raytracing_capabilities.raytracing_pipeline_support;
-		create_info_next = &raytracing_pipeline_features;
-	}
-
-	VkPhysicalDeviceRayTracingValidationFeaturesNV raytracing_validation_features = {};
-	if (raytracing_capabilities.validation) {
-		raytracing_validation_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV;
-		raytracing_validation_features.pNext = create_info_next;
-		raytracing_validation_features.rayTracingValidation = raytracing_capabilities.validation;
-		create_info_next = &raytracing_validation_features;
-	}
-
 	VkPhysicalDeviceVulkan11Features vulkan_1_1_features = {};
 	VkPhysicalDevice16BitStorageFeaturesKHR storage_features = {};
 	VkPhysicalDeviceMultiviewFeatures multiview_features = {};
@@ -1447,15 +1310,6 @@ Error RenderingDeviceDriverVulkan::_initialize_device(const LocalVector<VkDevice
 		if (device_fault_support) {
 			device_functions.GetDeviceFaultInfoEXT = (PFN_vkGetDeviceFaultInfoEXT)functions.GetDeviceProcAddr(vk_device, "vkGetDeviceFaultInfoEXT");
 		}
-
-		// Device raytracing extensions.
-		if (enabled_device_extension_names.has(VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME)) {
-			device_functions.CreateAccelerationStructureKHR = PFN_vkCreateAccelerationStructureKHR(functions.GetDeviceProcAddr(vk_device, "vkCreateAccelerationStructureKHR"));
-		}
-
-		if (enabled_device_extension_names.has(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME)) {
-			device_functions.CreateRaytracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR(functions.GetDeviceProcAddr(vk_device, "vkCreateRayTracingPipelinesKHR"));
-		}
 	}
 
 	return OK;
@@ -1867,8 +1721,6 @@ static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_INDEX_BIT, VK_BUFFER_USAGE_IN
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_VERTEX_BIT, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_INDIRECT_BIT, VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR));
 
 RDD::BufferID RenderingDeviceDriverVulkan::buffer_create(uint64_t p_size, BitField<BufferUsageBits> p_usage, MemoryAllocationType p_allocation_type, uint64_t p_frames_drawn) {
 	uint32_t alignment = 16u; // 16 bytes is reasonable.
@@ -2192,11 +2044,6 @@ RDD::TextureID RenderingDeviceDriverVulkan::texture_create(const TextureFormat &
 		create_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT;
 	}*/
 
-	bool use_subsampled_images = VulkanHooks::get_singleton() && VulkanHooks::get_singleton()->use_subsampled_images();
-	if (fdm_capabilities.attachment_supported && use_subsampled_images && p_format.is_subsampled && (p_format.usage_bits & (TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | TEXTURE_USAGE_INPUT_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_RESOLVE_ATTACHMENT_BIT))) {
-		create_info.flags |= VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT;
-	}
-
 	if (fdm_capabilities.offset_supported && (p_format.usage_bits & (TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | TEXTURE_USAGE_INPUT_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_RESOLVE_ATTACHMENT_BIT | TEXTURE_USAGE_VRS_ATTACHMENT_BIT))) {
 		create_info.flags |= VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM;
 	}
@@ -2356,7 +2203,6 @@ RDD::TextureID RenderingDeviceDriverVulkan::texture_create(const TextureFormat &
 	tex_info->vk_create_info = create_info;
 	tex_info->vk_view_create_info = image_view_create_info;
 	tex_info->allocation.handle = allocation;
-	tex_info->is_subsampled = (create_info.flags & VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT) != 0;
 #ifdef DEBUG_ENABLED
 	tex_info->transient = (p_format.usage_bits & TEXTURE_USAGE_TRANSIENT_BIT) != 0;
 #endif
@@ -2794,8 +2640,6 @@ static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELI
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT, VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_RAY_TRACING_SHADER_BIT, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR));
 
 // RDD::BarrierAccessBits == VkAccessFlagBits.
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_INDIRECT_COMMAND_READ_BIT, VK_ACCESS_INDIRECT_COMMAND_READ_BIT));
@@ -2815,8 +2659,6 @@ static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_MEMORY_READ_BIT, VK_ACCESS_
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_MEMORY_WRITE_BIT, VK_ACCESS_MEMORY_WRITE_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT, VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT, VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_READ_BIT, VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT, VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR));
 
 void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 		CommandBufferID p_cmd_buffer,
@@ -2824,14 +2666,13 @@ void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 		BitField<PipelineStageBits> p_dst_stages,
 		VectorView<MemoryAccessBarrier> p_memory_barriers,
 		VectorView<BufferBarrier> p_buffer_barriers,
-		VectorView<TextureBarrier> p_texture_barriers,
-		VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) {
+		VectorView<TextureBarrier> p_texture_barriers) {
 	VkMemoryBarrier *vk_memory_barriers = ALLOCA_ARRAY(VkMemoryBarrier, p_memory_barriers.size());
 	for (uint32_t i = 0; i < p_memory_barriers.size(); i++) {
 		vk_memory_barriers[i] = {};
 		vk_memory_barriers[i].sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
-		vk_memory_barriers[i].srcAccessMask = _rd_to_vk_access_flags(p_memory_barriers[i].src_access) & ~VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR;
-		vk_memory_barriers[i].dstAccessMask = _rd_to_vk_access_flags(p_memory_barriers[i].dst_access) & ~VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR;
+		vk_memory_barriers[i].srcAccessMask = _rd_to_vk_access_flags(p_memory_barriers[i].src_access);
+		vk_memory_barriers[i].dstAccessMask = _rd_to_vk_access_flags(p_memory_barriers[i].dst_access);
 	}
 
 	VkBufferMemoryBarrier *vk_buffer_barriers = ALLOCA_ARRAY(VkBufferMemoryBarrier, p_buffer_barriers.size());
@@ -2840,8 +2681,8 @@ void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 		vk_buffer_barriers[i].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
 		vk_buffer_barriers[i].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
 		vk_buffer_barriers[i].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-		vk_buffer_barriers[i].srcAccessMask = _rd_to_vk_access_flags(p_buffer_barriers[i].src_access) & ~VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR;
-		vk_buffer_barriers[i].dstAccessMask = _rd_to_vk_access_flags(p_buffer_barriers[i].dst_access) & ~VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR;
+		vk_buffer_barriers[i].srcAccessMask = _rd_to_vk_access_flags(p_buffer_barriers[i].src_access);
+		vk_buffer_barriers[i].dstAccessMask = _rd_to_vk_access_flags(p_buffer_barriers[i].dst_access);
 		vk_buffer_barriers[i].buffer = ((const BufferInfo *)p_buffer_barriers[i].buffer.id)->vk_buffer;
 		vk_buffer_barriers[i].offset = p_buffer_barriers[i].offset;
 		vk_buffer_barriers[i].size = p_buffer_barriers[i].size;
@@ -2866,43 +2707,8 @@ void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 		vk_image_barriers[i].subresourceRange.layerCount = p_texture_barriers[i].subresources.layer_count;
 	}
 
-	VkPipelineStageFlags src_stage_flags = _rd_to_vk_pipeline_stages(p_src_stages);
-	VkPipelineStageFlags dst_stage_flags = _rd_to_vk_pipeline_stages(p_dst_stages);
-	VkPipelineStageFlags accel_src_stages = src_stage_flags;
-	VkPipelineStageFlags accel_dst_stages = dst_stage_flags;
-
-	VkBufferMemoryBarrier *vk_accel_barriers = ALLOCA_ARRAY(VkBufferMemoryBarrier, p_acceleration_structure_barriers.size());
-	for (uint32_t i = 0; i < p_acceleration_structure_barriers.size(); i++) {
-		// If the rayQuery feature is not enabled and a memory barrier srcAccessMask includes
-		// VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, srcStageMask must not include any of the
-		// VK_PIPELINE_STAGE_*_SHADER_BIT stages except VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
-		VkAccessFlags src_access = _rd_to_vk_access_flags(p_acceleration_structure_barriers[i].src_access);
-		if ((src_access & VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR) != 0) {
-			accel_src_stages &= ~(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
-		}
-
-		// If the rayQuery feature is not enabled and a memory barrier dstAccessMask includes
-		// VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, dstStageMask must not include any of the
-		// VK_PIPELINE_STAGE_*_SHADER_BIT stages except VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
-		VkAccessFlags dst_access = _rd_to_vk_access_flags(p_acceleration_structure_barriers[i].dst_access);
-		if ((dst_access & VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR) != 0) {
-			accel_dst_stages &= ~(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
-		}
-
-		const AccelerationStructureInfo *accel_info = (const AccelerationStructureInfo *)p_acceleration_structure_barriers[i].acceleration_structure.id;
-		vk_accel_barriers[i] = {};
-		vk_accel_barriers[i].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
-		vk_accel_barriers[i].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-		vk_accel_barriers[i].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-		vk_accel_barriers[i].srcAccessMask = src_access;
-		vk_accel_barriers[i].dstAccessMask = dst_access;
-		vk_accel_barriers[i].buffer = ((const BufferInfo *)accel_info->buffer.id)->vk_buffer;
-		vk_accel_barriers[i].offset = p_acceleration_structure_barriers[i].offset;
-		vk_accel_barriers[i].size = p_acceleration_structure_barriers[i].size;
-	}
-
 #if PRINT_NATIVE_COMMANDS
-	print_line(vformat("vkCmdPipelineBarrier MEMORY %d BUFFER %d TEXTURE %d ACCELERATION STRUCTURE %d", p_memory_barriers.size(), p_buffer_barriers.size(), p_texture_barriers.size(), p_acceleration_structure_barriers.size()));
+	print_line(vformat("vkCmdPipelineBarrier MEMORY %d BUFFER %d TEXTURE %d", p_memory_barriers.size(), p_buffer_barriers.size(), p_texture_barriers.size()));
 	for (uint32_t i = 0; i < p_memory_barriers.size(); i++) {
 		print_line(vformat("  VkMemoryBarrier #%d src 0x%uX dst 0x%uX", i, vk_memory_barriers[i].srcAccessMask, vk_memory_barriers[i].dstAccessMask));
 	}
@@ -2916,32 +2722,17 @@ void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 				uint64_t(vk_image_barriers[i].image), vk_image_barriers[i].oldLayout, vk_image_barriers[i].newLayout, vk_image_barriers[i].subresourceRange.baseMipLevel, vk_image_barriers[i].subresourceRange.levelCount,
 				vk_image_barriers[i].subresourceRange.baseArrayLayer, vk_image_barriers[i].subresourceRange.layerCount));
 	}
-
-	for (uint32_t i = 0; i < p_acceleration_structure_barriers.size(); i++) {
-		print_line(vformat("  VkBufferMemoryBarrier #%d src 0x%uX dst 0x%uX acceleration structure buffer 0x%ux", i, vk_accel_barriers[i].srcAccessMask, vk_accel_barriers[i].dstAccessMask, uint64_t(vk_accel_barriers[i].buffer)));
-	}
 #endif
 
 	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	vkCmdPipelineBarrier(
 			command_buffer->vk_command_buffer,
-			src_stage_flags,
-			dst_stage_flags,
+			_rd_to_vk_pipeline_stages(p_src_stages),
+			_rd_to_vk_pipeline_stages(p_dst_stages),
 			0,
 			p_memory_barriers.size(), vk_memory_barriers,
 			p_buffer_barriers.size(), vk_buffer_barriers,
 			p_texture_barriers.size(), vk_image_barriers);
-
-	if (p_acceleration_structure_barriers.size() > 0) {
-		vkCmdPipelineBarrier(
-				command_buffer->vk_command_buffer,
-				accel_src_stages,
-				accel_dst_stages,
-				0,
-				0, nullptr,
-				p_acceleration_structure_barriers.size(), vk_accel_barriers,
-				0, nullptr);
-	}
 }
 
 /****************/
@@ -3428,96 +3219,6 @@ void RenderingDeviceDriverVulkan::command_buffer_execute_secondary(CommandBuffer
 /**** SWAP CHAIN ****/
 /********************/
 
-struct FormatCandidate {
-	VkFormat format;
-	VkColorSpaceKHR colorspace;
-	RDD::ColorSpace rdd_colorspace;
-};
-
-bool RenderingDeviceDriverVulkan::_determine_swap_chain_format(RenderingContextDriver::SurfaceID p_surface, VkFormat &r_format, VkColorSpaceKHR &r_color_space, RDD::ColorSpace &r_rdd_color_space) {
-	DEV_ASSERT(p_surface != 0);
-
-	RenderingContextDriverVulkan::Surface *surface = (RenderingContextDriverVulkan::Surface *)(p_surface);
-	const RenderingContextDriverVulkan::Functions &functions = context_driver->functions_get();
-
-	// Retrieve the formats supported by the surface.
-	uint32_t format_count = 0;
-	VkResult err = functions.GetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface->vk_surface, &format_count, nullptr);
-	ERR_FAIL_COND_V(err != VK_SUCCESS, false);
-
-	TightLocalVector<VkSurfaceFormatKHR> formats;
-	formats.resize(format_count);
-	err = functions.GetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface->vk_surface, &format_count, formats.ptr());
-	ERR_FAIL_COND_V(err != VK_SUCCESS, false);
-
-	// If the format list includes just one entry of VK_FORMAT_UNDEFINED, the surface has no preferred format.
-	if (format_count == 1 && formats[0].format == VK_FORMAT_UNDEFINED) {
-		r_format = VK_FORMAT_B8G8R8A8_UNORM;
-		r_color_space = formats[0].colorSpace;
-		return true;
-	}
-
-	bool colorspace_supported = context_driver->is_colorspace_supported();
-	bool hdr_output_requested = context_driver->surface_get_hdr_output_enabled(p_surface);
-
-	// Determine which formats to prefer based on the requested capabilities.
-	FixedVector<FormatCandidate, 6> preferred_formats;
-	if (hdr_output_requested) {
-		// Our preferred HDR format is 16-bit float + extended linear.
-		if (context_driver->is_colorspace_externally_managed()) {
-			// When the colorspace is managed externally to the driver we need to disable its color management.
-			// The colorspace which disables color management is VK_COLOR_SPACE_PASS_THROUGH_EXT.
-			preferred_formats.push_back({ VK_FORMAT_R16G16B16A16_SFLOAT, VK_COLOR_SPACE_PASS_THROUGH_EXT, COLOR_SPACE_REC709_LINEAR });
-
-			// SRGB_NONLINEAR_KHR is required for some NVIDIA drivers that support HDR output but do not support PASS_THROUGH_EXT.
-			preferred_formats.push_back({ VK_FORMAT_R16G16B16A16_SFLOAT, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR, COLOR_SPACE_REC709_LINEAR });
-		} else if (colorspace_supported) {
-			preferred_formats.push_back({ VK_FORMAT_R16G16B16A16_SFLOAT, VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT, COLOR_SPACE_REC709_LINEAR });
-		}
-	}
-
-	// Some drivers may use wp-color-management even when performing SDR.
-	// https://github.com/godotengine/godot/pull/102987#discussion_r2913373482
-	if (context_driver->is_colorspace_externally_managed()) {
-		preferred_formats.push_back({ VK_FORMAT_B8G8R8A8_UNORM, VK_COLOR_SPACE_PASS_THROUGH_EXT, COLOR_SPACE_REC709_NONLINEAR_SRGB });
-		preferred_formats.push_back({ VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_PASS_THROUGH_EXT, COLOR_SPACE_REC709_NONLINEAR_SRGB });
-	}
-
-	// These formats are always considered for SDR.
-	preferred_formats.push_back({ VK_FORMAT_B8G8R8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR, COLOR_SPACE_REC709_NONLINEAR_SRGB });
-	preferred_formats.push_back({ VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR, COLOR_SPACE_REC709_NONLINEAR_SRGB });
-
-	bool found = false;
-	for (const FormatCandidate &candidate : preferred_formats) {
-		for (uint32_t i = 0; i < format_count; i++) {
-			if (formats[i].format == candidate.format && formats[i].colorSpace == candidate.colorspace) {
-				r_format = formats[i].format;
-				r_color_space = formats[i].colorSpace;
-				r_rdd_color_space = candidate.rdd_colorspace;
-				found = true;
-				break;
-			}
-		}
-
-		if (found) {
-			break;
-		}
-	}
-
-	// Warnings for when HDR capabilities are requested but not found.
-	if (hdr_output_requested) {
-		if (!colorspace_supported && !context_driver->is_colorspace_externally_managed()) {
-			WARN_PRINT("HDR output requested but the vulkan driver does not support VK_EXT_swapchain_colorspace, falling back to SDR.");
-		}
-
-		if (r_rdd_color_space == COLOR_SPACE_REC709_NONLINEAR_SRGB) {
-			WARN_PRINT("HDR output requested but no HDR compatible format was found, falling back to SDR.");
-		}
-	}
-
-	return found;
-}
-
 void RenderingDeviceDriverVulkan::_swap_chain_release(SwapChain *swap_chain) {
 	// Destroy views and framebuffers associated to the swapchain's images.
 	for (FramebufferID framebuffer : swap_chain->framebuffers) {
@@ -3546,11 +3247,6 @@ void RenderingDeviceDriverVulkan::_swap_chain_release(SwapChain *swap_chain) {
 		swap_chain->vk_swapchain = VK_NULL_HANDLE;
 	}
 
-	if (swap_chain->render_pass.id != 0) {
-		render_pass_free(swap_chain->render_pass);
-		swap_chain->render_pass = RenderPassID();
-	}
-
 	for (uint32_t i = 0; i < swap_chain->command_queues_acquired.size(); i++) {
 		_recreate_image_semaphore(swap_chain->command_queues_acquired[i], swap_chain->command_queues_acquired_semaphores[i], false);
 	}
@@ -3568,9 +3264,84 @@ void RenderingDeviceDriverVulkan::_swap_chain_release(SwapChain *swap_chain) {
 RenderingDeviceDriver::SwapChainID RenderingDeviceDriverVulkan::swap_chain_create(RenderingContextDriver::SurfaceID p_surface) {
 	DEV_ASSERT(p_surface != 0);
 
-	// Create an empty swap chain until it is resized.
+	RenderingContextDriverVulkan::Surface *surface = (RenderingContextDriverVulkan::Surface *)(p_surface);
+	const RenderingContextDriverVulkan::Functions &functions = context_driver->functions_get();
+
+	// Retrieve the formats supported by the surface.
+	uint32_t format_count = 0;
+	VkResult err = functions.GetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface->vk_surface, &format_count, nullptr);
+	ERR_FAIL_COND_V(err != VK_SUCCESS, SwapChainID());
+
+	TightLocalVector<VkSurfaceFormatKHR> formats;
+	formats.resize(format_count);
+	err = functions.GetPhysicalDeviceSurfaceFormatsKHR(physical_device, surface->vk_surface, &format_count, formats.ptr());
+	ERR_FAIL_COND_V(err != VK_SUCCESS, SwapChainID());
+
+	VkFormat format = VK_FORMAT_UNDEFINED;
+	VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+	if (format_count == 1 && formats[0].format == VK_FORMAT_UNDEFINED) {
+		// If the format list includes just one entry of VK_FORMAT_UNDEFINED, the surface has no preferred format.
+		format = VK_FORMAT_B8G8R8A8_UNORM;
+		color_space = formats[0].colorSpace;
+	} else if (format_count > 0) {
+		// Use one of the supported formats, prefer B8G8R8A8_UNORM.
+		const VkFormat preferred_format = VK_FORMAT_B8G8R8A8_UNORM;
+		const VkFormat second_format = VK_FORMAT_R8G8B8A8_UNORM;
+		for (uint32_t i = 0; i < format_count; i++) {
+			if (formats[i].format == preferred_format || formats[i].format == second_format) {
+				format = formats[i].format;
+				if (formats[i].format == preferred_format) {
+					// This is the preferred format, stop searching.
+					break;
+				}
+			}
+		}
+	}
+
+	// No formats are supported.
+	ERR_FAIL_COND_V_MSG(format == VK_FORMAT_UNDEFINED, SwapChainID(), "Surface did not return any valid formats.");
+
+	// Create the render pass for the chosen format.
+	VkAttachmentDescription2KHR attachment = {};
+	attachment.sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2_KHR;
+	attachment.format = format;
+	attachment.samples = VK_SAMPLE_COUNT_1_BIT;
+	attachment.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+	attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	attachment.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachment.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+
+	VkAttachmentReference2KHR color_reference = {};
+	color_reference.sType = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR;
+	color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+	VkSubpassDescription2KHR subpass = {};
+	subpass.sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR;
+	subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+	subpass.colorAttachmentCount = 1;
+	subpass.pColorAttachments = &color_reference;
+
+	VkRenderPassCreateInfo2KHR pass_info = {};
+	pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR;
+	pass_info.attachmentCount = 1;
+	pass_info.pAttachments = &attachment;
+	pass_info.subpassCount = 1;
+	pass_info.pSubpasses = &subpass;
+
+	VkRenderPass vk_render_pass = VK_NULL_HANDLE;
+	err = _create_render_pass(vk_device, &pass_info, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS), &vk_render_pass);
+	ERR_FAIL_COND_V(err != VK_SUCCESS, SwapChainID());
+
+	RenderPassInfo *render_pass_info = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
+	render_pass_info->vk_render_pass = vk_render_pass;
+
 	SwapChain *swap_chain = memnew(SwapChain);
 	swap_chain->surface = p_surface;
+	swap_chain->format = format;
+	swap_chain->color_space = color_space;
+	swap_chain->render_pass = RenderPassID(render_pass_info);
 	return SwapChainID(swap_chain);
 }
 
@@ -3649,19 +3420,19 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
 	VkPresentModeKHR present_mode = VkPresentModeKHR::VK_PRESENT_MODE_FIFO_KHR;
 	String present_mode_name = "Enabled";
 	switch (surface->vsync_mode) {
-		case DisplayServerEnums::VSYNC_MAILBOX:
+		case DisplayServer::VSYNC_MAILBOX:
 			present_mode = VK_PRESENT_MODE_MAILBOX_KHR;
 			present_mode_name = "Mailbox";
 			break;
-		case DisplayServerEnums::VSYNC_ADAPTIVE:
+		case DisplayServer::VSYNC_ADAPTIVE:
 			present_mode = VK_PRESENT_MODE_FIFO_RELAXED_KHR;
 			present_mode_name = "Adaptive";
 			break;
-		case DisplayServerEnums::VSYNC_ENABLED:
+		case DisplayServer::VSYNC_ENABLED:
 			present_mode = VK_PRESENT_MODE_FIFO_KHR;
 			present_mode_name = "Enabled";
 			break;
-		case DisplayServerEnums::VSYNC_DISABLED:
+		case DisplayServer::VSYNC_DISABLED:
 			present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR;
 			present_mode_name = "Disabled";
 			break;
@@ -3671,7 +3442,7 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
 	if (!present_mode_available) {
 		// Present mode is not available, fall back to FIFO which is guaranteed to be supported.
 		WARN_PRINT(vformat("The requested V-Sync mode %s is not available. Falling back to V-Sync mode Enabled.", present_mode_name));
-		surface->vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
+		surface->vsync_mode = DisplayServer::VSYNC_ENABLED;
 		present_mode = VkPresentModeKHR::VK_PRESENT_MODE_FIFO_KHR;
 	}
 
@@ -3704,18 +3475,6 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
 		has_comp_alpha[(uint64_t)p_cmd_queue.id] = (composite_alpha != VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR);
 	}
 
-	// Determine the format and color space for the swap chain.
-	VkFormat format = VK_FORMAT_UNDEFINED;
-	VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
-	RDD::ColorSpace rdd_color_space = COLOR_SPACE_REC709_NONLINEAR_SRGB;
-	if (!_determine_swap_chain_format(swap_chain->surface, format, color_space, rdd_color_space)) {
-		ERR_FAIL_V_MSG(ERR_CANT_CREATE, "Surface did not return any valid formats.");
-	} else {
-		swap_chain->format = format;
-		swap_chain->color_space = color_space;
-		swap_chain->rdd_color_space = rdd_color_space;
-	}
-
 	VkSwapchainCreateInfoKHR swap_create_info = {};
 	swap_create_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
 	swap_create_info.surface = surface->vk_surface;
@@ -3814,48 +3573,10 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
 
 	swap_chain->framebuffers.reserve(image_count);
 
-	// Create the render pass for the chosen format.
-	VkAttachmentDescription2KHR attachment = {};
-	attachment.sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2_KHR;
-	attachment.format = format;
-	attachment.samples = VK_SAMPLE_COUNT_1_BIT;
-	attachment.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-	attachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-	attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-	attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-	attachment.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-	attachment.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-
-	VkAttachmentReference2KHR color_reference = {};
-	color_reference.sType = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR;
-	color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-
-	VkSubpassDescription2KHR subpass = {};
-	subpass.sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR;
-	subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
-	subpass.colorAttachmentCount = 1;
-	subpass.pColorAttachments = &color_reference;
-
-	VkRenderPassCreateInfo2KHR pass_info = {};
-	pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR;
-	pass_info.attachmentCount = 1;
-	pass_info.pAttachments = &attachment;
-	pass_info.subpassCount = 1;
-	pass_info.pSubpasses = &subpass;
-
-	VkRenderPass vk_render_pass = VK_NULL_HANDLE;
-	err = _create_render_pass(vk_device, &pass_info, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS), &vk_render_pass);
-	ERR_FAIL_COND_V(err != VK_SUCCESS, ERR_CANT_CREATE);
-
-	RenderPassInfo *render_pass_info = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
-	render_pass_info->vk_render_pass = vk_render_pass;
-
-	DEV_ASSERT(swap_chain->render_pass.id == 0);
-	swap_chain->render_pass = RenderPassID(render_pass_info);
-
+	const RenderPassInfo *render_pass = (const RenderPassInfo *)(swap_chain->render_pass.id);
 	VkFramebufferCreateInfo fb_create_info = {};
 	fb_create_info.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	fb_create_info.renderPass = vk_render_pass;
+	fb_create_info.renderPass = render_pass->vk_render_pass;
 	fb_create_info.attachmentCount = 1;
 	fb_create_info.width = surface->width;
 	fb_create_info.height = surface->height;
@@ -3979,25 +3700,12 @@ RDD::DataFormat RenderingDeviceDriverVulkan::swap_chain_get_format(SwapChainID p
 			return DATA_FORMAT_B8G8R8A8_UNORM;
 		case VK_FORMAT_R8G8B8A8_UNORM:
 			return DATA_FORMAT_R8G8B8A8_UNORM;
-		case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
-			return DATA_FORMAT_A2B10G10R10_UNORM_PACK32;
-		case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
-			return DATA_FORMAT_A2R10G10B10_UNORM_PACK32;
-		case VK_FORMAT_R16G16B16A16_SFLOAT:
-			return DATA_FORMAT_R16G16B16A16_SFLOAT;
 		default:
 			DEV_ASSERT(false && "Unknown swap chain format.");
 			return DATA_FORMAT_MAX;
 	}
 }
 
-RDD::ColorSpace RenderingDeviceDriverVulkan::swap_chain_get_color_space(SwapChainID p_swap_chain) {
-	DEV_ASSERT(p_swap_chain.id != 0);
-
-	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
-	return swap_chain->rdd_color_space;
-}
-
 void RenderingDeviceDriverVulkan::swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) {
 	DEV_ASSERT(p_swap_chain.id != 0);
 
@@ -4020,6 +3728,10 @@ void RenderingDeviceDriverVulkan::swap_chain_free(SwapChainID p_swap_chain) {
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
 	_swap_chain_release(swap_chain);
 
+	if (swap_chain->render_pass) {
+		render_pass_free(swap_chain->render_pass);
+	}
+
 	memdelete(swap_chain);
 }
 
@@ -4080,11 +3792,6 @@ static VkShaderStageFlagBits RD_STAGE_TO_VK_SHADER_STAGE_BITS[RDD::SHADER_STAGE_
 	VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
 	VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
 	VK_SHADER_STAGE_COMPUTE_BIT,
-	VK_SHADER_STAGE_RAYGEN_BIT_KHR,
-	VK_SHADER_STAGE_ANY_HIT_BIT_KHR,
-	VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
-	VK_SHADER_STAGE_MISS_BIT_KHR,
-	VK_SHADER_STAGE_INTERSECTION_BIT_KHR,
 };
 
 RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Ref<RenderingShaderContainer> &p_shader_container, const Vector<ImmutableSampler> &p_immutable_samplers) {
@@ -4165,9 +3872,6 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 				case UNIFORM_TYPE_INPUT_ATTACHMENT: {
 					layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
 				} break;
-				case UNIFORM_TYPE_ACCELERATION_STRUCTURE: {
-					layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
-				} break;
 				default: {
 					DEV_ASSERT(false);
 				}
@@ -4183,7 +3887,7 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 	Vector<uint8_t> decompressed_code;
 	VkShaderModule vk_module;
 	PackedByteArray decoded_spirv;
-	const bool use_respv = (RESPV_ENABLED == 1) && !shader_container_format.get_debug_info_enabled();
+	const bool use_respv = RESPV_ENABLED && !shader_container_format.get_debug_info_enabled();
 	const bool store_respv = use_respv && !shader_refl.specialization_constants.is_empty();
 	const int64_t stage_count = shader_refl.stages_vector.size();
 	shader_info.vk_stages_create_info.reserve(stage_count);
@@ -4197,9 +3901,6 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 		shader_info.respv_stage_shaders.reserve(stage_count);
 	}
 
-	// AnyHit and ClosestHit go in the same group.
-	uint32_t hit_group_index = UINT32_MAX;
-
 	for (int i = 0; i < stage_count; i++) {
 		const RenderingShaderContainer::Shader &shader = p_shader_container->shaders[i];
 		bool requires_decompression = (shader.code_decompressed_size > 0);
@@ -4233,7 +3934,7 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 		shader_info.original_stage_size.push_back(decoded_spirv.size());
 
 		if (use_respv) {
-			const bool inline_data = store_respv || (RESPV_ONLY_INLINE_SHADERS_WITH_SPEC_CONSTANTS == 0);
+			const bool inline_data = store_respv || !RESPV_ONLY_INLINE_SHADERS_WITH_SPEC_CONSTANTS;
 			respv::Shader respv_shader(decoded_spirv.ptr(), decoded_spirv.size(), inline_data);
 			if (respv_shader.empty()) {
 #if RESPV_VERBOSE
@@ -4281,52 +3982,6 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 		create_info.module = vk_module;
 		create_info.pName = "main";
 		shader_info.vk_stages_create_info.push_back(create_info);
-
-		ShaderStage stage = shader_refl.stages_vector[i];
-
-		if (stage == ShaderStage::SHADER_STAGE_RAYGEN || stage == ShaderStage::SHADER_STAGE_MISS) {
-			VkRayTracingShaderGroupCreateInfoKHR group_info = {};
-			group_info.sType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR;
-			group_info.type = VK_RAY_TRACING_SHADER_GROUP_TYPE_GENERAL_KHR;
-			group_info.anyHitShader = VK_SHADER_UNUSED_KHR;
-			group_info.closestHitShader = VK_SHADER_UNUSED_KHR;
-			group_info.intersectionShader = VK_SHADER_UNUSED_KHR;
-			group_info.generalShader = i;
-
-			shader_info.vk_groups_create_info.push_back(group_info);
-		}
-		if (stage == ShaderStage::SHADER_STAGE_ANY_HIT || stage == ShaderStage::SHADER_STAGE_CLOSEST_HIT) {
-			if (hit_group_index == UINT32_MAX) {
-				VkRayTracingShaderGroupCreateInfoKHR group_info = {};
-				group_info.sType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR;
-				group_info.type = VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR;
-				group_info.anyHitShader = VK_SHADER_UNUSED_KHR;
-				group_info.closestHitShader = VK_SHADER_UNUSED_KHR;
-				group_info.intersectionShader = VK_SHADER_UNUSED_KHR;
-				group_info.generalShader = VK_SHADER_UNUSED_KHR;
-
-				hit_group_index = shader_info.vk_groups_create_info.size();
-				shader_info.vk_groups_create_info.push_back(group_info);
-			}
-
-			VkRayTracingShaderGroupCreateInfoKHR &group_info = shader_info.vk_groups_create_info[hit_group_index];
-			if (stage == ShaderStage::SHADER_STAGE_ANY_HIT) {
-				group_info.anyHitShader = i;
-			} else if (stage == ShaderStage::SHADER_STAGE_CLOSEST_HIT) {
-				group_info.closestHitShader = i;
-			}
-		}
-		if (stage == ShaderStage::SHADER_STAGE_INTERSECTION) {
-			VkRayTracingShaderGroupCreateInfoKHR group_info = {};
-			group_info.sType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR;
-			group_info.type = VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR;
-			group_info.anyHitShader = VK_SHADER_UNUSED_KHR;
-			group_info.closestHitShader = VK_SHADER_UNUSED_KHR;
-			group_info.intersectionShader = i;
-			group_info.generalShader = VK_SHADER_UNUSED_KHR;
-
-			shader_info.vk_groups_create_info.push_back(group_info);
-		}
 	}
 
 	// Descriptor sets.
@@ -4396,30 +4051,6 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_container(const Re
 		ERR_FAIL_V_MSG(ShaderID(), error_text);
 	}
 
-	if (shader_refl.pipeline_type == PIPELINE_TYPE_RAYTRACING) {
-		// Regions
-
-		for (ShaderStage stage : shader_refl.stages_vector) {
-			switch (stage) {
-				case ShaderStage::SHADER_STAGE_RAYGEN:
-					shader_info.region_count.raygen_count += 1;
-					break;
-				case ShaderStage::SHADER_STAGE_ANY_HIT:
-				case ShaderStage::SHADER_STAGE_CLOSEST_HIT:
-					shader_info.region_count.hit_count += 1;
-					break;
-				case ShaderStage::SHADER_STAGE_MISS:
-					shader_info.region_count.miss_count += 1;
-					break;
-				default:
-					// nothing
-					break;
-			}
-		}
-
-		shader_info.region_count.group_count = shader_info.region_count.raygen_count + shader_info.region_count.hit_count + shader_info.region_count.miss_count;
-	}
-
 	// Bookkeep.
 	ShaderInfo *shader_info_ptr = VersatileResource::allocate<ShaderInfo>(resources_allocator);
 	*shader_info_ptr = shader_info;
@@ -4539,13 +4170,6 @@ VkDescriptorPool RenderingDeviceDriverVulkan::_descriptor_set_pool_create(const
 			curr_vk_size++;
 			vk_sizes_count++;
 		}
-		if (p_key.uniform_type[UNIFORM_TYPE_ACCELERATION_STRUCTURE]) {
-			*curr_vk_size = {};
-			curr_vk_size->type = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
-			curr_vk_size->descriptorCount = p_key.uniform_type[UNIFORM_TYPE_ACCELERATION_STRUCTURE] * max_descriptor_sets_per_pool;
-			curr_vk_size++;
-			vk_sizes_count++;
-		}
 		DEV_ASSERT(vk_sizes_count <= UNIFORM_TYPE_MAX);
 	}
 
@@ -4798,17 +4422,6 @@ RDD::UniformSetID RenderingDeviceDriverVulkan::uniform_set_create(VectorView<Bou
 				vk_writes[writes_amount].descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
 				vk_writes[writes_amount].pImageInfo = vk_img_infos;
 			} break;
-			case UNIFORM_TYPE_ACCELERATION_STRUCTURE: {
-				const AccelerationStructureInfo *accel_info = (const AccelerationStructureInfo *)uniform.ids[0].id;
-				VkWriteDescriptorSetAccelerationStructureKHR *acceleration_structure_write = ALLOCA_SINGLE(VkWriteDescriptorSetAccelerationStructureKHR);
-				*acceleration_structure_write = {};
-				acceleration_structure_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR;
-				acceleration_structure_write->accelerationStructureCount = 1;
-				acceleration_structure_write->pAccelerationStructures = &accel_info->vk_acceleration_structure;
-
-				vk_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
-				vk_writes[i].pNext = acceleration_structure_write;
-			} break;
 			default: {
 				DEV_ASSERT(false);
 			}
@@ -5122,11 +4735,6 @@ void RenderingDeviceDriverVulkan::command_clear_depth_stencil_texture(CommandBuf
 void RenderingDeviceDriverVulkan::command_copy_buffer_to_texture(CommandBufferID p_cmd_buffer, BufferID p_src_buffer, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, VectorView<BufferTextureCopyRegion> p_regions) {
 	const TextureInfo *tex_info = (const TextureInfo *)p_dst_texture.id;
 
-	if (tex_info->is_subsampled) {
-		// Subsampled images can't be copied into, only used as attachments to a framebuffer.
-		return;
-	}
-
 	uint32_t pixel_size = get_image_format_pixel_size(tex_info->rd_format);
 	uint32_t block_size = get_compressed_image_format_block_byte_size(tex_info->rd_format);
 	uint32_t block_w, block_h;
@@ -6178,404 +5786,6 @@ RDD::PipelineID RenderingDeviceDriverVulkan::render_pipeline_create(
 	return PipelineID(vk_pipeline);
 }
 
-/********************/
-/**** RAYTRACING ****/
-/********************/
-
-// RDD::AccelerationStructureGeometryBits == VkGeometryFlagsKHR.
-static_assert(ENUM_MEMBERS_EQUAL(RDD::ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT, VK_GEOMETRY_OPAQUE_BIT_KHR));
-static_assert(ENUM_MEMBERS_EQUAL(RDD::ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT, VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_KHR));
-
-RDD::AccelerationStructureID RenderingDeviceDriverVulkan::blas_create(VectorView<AccelerationStructureGeometry> p_geometries) {
-#if VULKAN_RAYTRACING_ENABLED
-	AccelerationStructureInfo *accel_info = VersatileResource::allocate<AccelerationStructureInfo>(resources_allocator);
-
-	accel_info->geometries.resize(p_geometries.size());
-	accel_info->range_infos.resize(p_geometries.size());
-
-	thread_local LocalVector<uint32_t> max_primitive_counts;
-	max_primitive_counts.resize(p_geometries.size());
-
-	for (uint32_t i = 0; i < p_geometries.size(); i++) {
-		const AccelerationStructureGeometry &geometry = p_geometries[i];
-
-		VkAccelerationStructureGeometryKHR &vk_geometry = accel_info->geometries[i];
-		vk_geometry = {};
-		vk_geometry.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR;
-		vk_geometry.geometryType = VK_GEOMETRY_TYPE_TRIANGLES_KHR;
-		vk_geometry.flags = geometry.flags;
-
-		vk_geometry.geometry.triangles.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR;
-		vk_geometry.geometry.triangles.vertexFormat = RD_TO_VK_FORMAT[geometry.vertex_format];
-		vk_geometry.geometry.triangles.vertexData.deviceAddress = buffer_get_device_address(geometry.vertex_buffer) + geometry.vertex_offset;
-		vk_geometry.geometry.triangles.vertexStride = geometry.vertex_stride;
-		// Number of vertices in vertexData minus one, aka max vertex index.
-		vk_geometry.geometry.triangles.maxVertex = (geometry.vertex_count ? (geometry.vertex_count - 1) : 0);
-
-		// Info for building BLAS.
-		uint32_t primitive_count;
-		if (geometry.index_buffer != BufferID()) {
-			vk_geometry.geometry.triangles.indexType = (geometry.index_format == INDEX_BUFFER_FORMAT_UINT16 ? VK_INDEX_TYPE_UINT16 : VK_INDEX_TYPE_UINT32);
-			vk_geometry.geometry.triangles.indexData.deviceAddress = buffer_get_device_address(geometry.index_buffer) + geometry.index_offset;
-			primitive_count = geometry.index_count / 3;
-		} else {
-			vk_geometry.geometry.triangles.indexType = VK_INDEX_TYPE_NONE_KHR;
-			primitive_count = geometry.vertex_count / 3;
-		}
-
-		VkAccelerationStructureBuildRangeInfoKHR &vk_range_info = accel_info->range_infos[i];
-		vk_range_info = {};
-		vk_range_info.primitiveCount = primitive_count;
-
-		max_primitive_counts[i] = primitive_count;
-	}
-
-	accel_info->build_info = {};
-	accel_info->build_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR;
-	accel_info->build_info.type = VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR;
-	accel_info->build_info.mode = VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR;
-	accel_info->build_info.pGeometries = accel_info->geometries.ptr();
-	accel_info->build_info.geometryCount = p_geometries.size();
-	accel_info->build_info.flags = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_KHR;
-
-	VkAccelerationStructureBuildSizesInfoKHR size_info = {};
-	size_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR;
-
-	vkGetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, max_primitive_counts.ptr(), &size_info);
-	_acceleration_structure_create(VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR, size_info, accel_info);
-
-	return AccelerationStructureID(accel_info);
-#else
-	return AccelerationStructureID();
-#endif
-}
-
-#if VULKAN_RAYTRACING_ENABLED
-static _FORCE_INLINE_ void _store_transform_transposed_3x4(const Transform3D &p_mtx, VkTransformMatrixKHR &r_mtx) {
-	r_mtx.matrix[0][0] = p_mtx.basis.rows[0][0];
-	r_mtx.matrix[0][1] = p_mtx.basis.rows[0][1];
-	r_mtx.matrix[0][2] = p_mtx.basis.rows[0][2];
-	r_mtx.matrix[0][3] = p_mtx.origin.x;
-	r_mtx.matrix[1][0] = p_mtx.basis.rows[1][0];
-	r_mtx.matrix[1][1] = p_mtx.basis.rows[1][1];
-	r_mtx.matrix[1][2] = p_mtx.basis.rows[1][2];
-	r_mtx.matrix[1][3] = p_mtx.origin.y;
-	r_mtx.matrix[2][0] = p_mtx.basis.rows[2][0];
-	r_mtx.matrix[2][1] = p_mtx.basis.rows[2][1];
-	r_mtx.matrix[2][2] = p_mtx.basis.rows[2][2];
-	r_mtx.matrix[2][3] = p_mtx.origin.z;
-}
-#endif
-
-uint32_t RenderingDeviceDriverVulkan::tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) {
-#if VULKAN_RAYTRACING_ENABLED
-	return p_instance_count * sizeof(VkAccelerationStructureInstanceKHR);
-#else
-	return 0;
-#endif
-}
-
-void RenderingDeviceDriverVulkan::tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) {
-#if VULKAN_RAYTRACING_ENABLED
-	uint32_t blases_count = p_blases.size();
-	ERR_FAIL_COND_MSG(blases_count != p_transforms.size(), "Blases and transforms vectors must have the same size.");
-	ERR_FAIL_COND(blases_count == 0);
-
-	LocalVector<VkAccelerationStructureInstanceKHR> instances;
-	instances.resize(blases_count);
-
-	for (uint32_t i = 0; i < blases_count; ++i) {
-		const AccelerationStructureID &blas = p_blases[i];
-		AccelerationStructureInfo *blas_info = (AccelerationStructureInfo *)blas.id;
-
-		VkAccelerationStructureInstanceKHR &instance = instances[i];
-		_store_transform_transposed_3x4(p_transforms[i], instance.transform);
-		instance.instanceCustomIndex = i;
-		instance.mask = 0xFF;
-		instance.accelerationStructureReference = buffer_get_device_address(blas_info->buffer);
-		instance.instanceShaderBindingTableRecordOffset = 0;
-		instance.flags = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR;
-	}
-
-	uint8_t *data_ptr = buffer_map(p_instances_buffer);
-	ERR_FAIL_NULL(data_ptr);
-	uint32_t instances_size = blases_count * sizeof(instances[0]);
-	memcpy(data_ptr, instances.ptr(), instances_size);
-	buffer_unmap(p_instances_buffer);
-#endif
-}
-
-RDD::AccelerationStructureID RenderingDeviceDriverVulkan::tlas_create(BufferID p_instances_buffer) {
-#if VULKAN_RAYTRACING_ENABLED
-	ERR_FAIL_COND_V(p_instances_buffer == BufferID(), AccelerationStructureID());
-
-	AccelerationStructureInfo *accel_info = VersatileResource::allocate<AccelerationStructureInfo>(resources_allocator);
-
-	accel_info->geometries.resize_initialized(1);
-	accel_info->geometries[0].sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR;
-	accel_info->geometries[0].geometryType = VK_GEOMETRY_TYPE_INSTANCES_KHR;
-	accel_info->geometries[0].geometry.instances.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR;
-	accel_info->geometries[0].geometry.instances.data.deviceAddress = buffer_get_device_address(p_instances_buffer);
-
-	accel_info->build_info = {};
-	accel_info->build_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR;
-	accel_info->build_info.flags = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_KHR;
-	accel_info->build_info.geometryCount = 1;
-	accel_info->build_info.pGeometries = &accel_info->geometries[0];
-	accel_info->build_info.mode = VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR;
-	accel_info->build_info.type = VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR;
-
-	uint32_t instance_count = buffer_get_allocation_size(p_instances_buffer) / sizeof(VkAccelerationStructureInstanceKHR);
-	VkAccelerationStructureBuildSizesInfoKHR size_info = {};
-	size_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR;
-	vkGetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, &instance_count, &size_info);
-
-	accel_info->range_infos.resize_initialized(1);
-	accel_info->range_infos[0].primitiveCount = instance_count;
-
-	_acceleration_structure_create(VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR, size_info, accel_info);
-	return AccelerationStructureID(accel_info);
-#else
-	return AccelerationStructureID();
-#endif
-}
-
-#if VULKAN_RAYTRACING_ENABLED
-static VkDeviceAddress _align_up_address(VkDeviceAddress address, VkDeviceAddress alignment) {
-	return (address + (alignment - 1)) & ~(alignment - 1);
-}
-#endif
-
-void RenderingDeviceDriverVulkan::_acceleration_structure_create(VkAccelerationStructureTypeKHR p_type, VkAccelerationStructureBuildSizesInfoKHR p_size_info, AccelerationStructureInfo *r_accel_info) {
-#if VULKAN_RAYTRACING_ENABLED
-	RDD::BufferID buffer = buffer_create(p_size_info.accelerationStructureSize, RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT | RDD::BUFFER_USAGE_STORAGE_BIT | RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT, RDD::MEMORY_ALLOCATION_TYPE_GPU, UINT64_MAX);
-	r_accel_info->buffer = buffer;
-
-	// Scratch address must be a multiple of minAccelerationStructureScratchOffsetAlignment.
-	r_accel_info->scratch_alignment = acceleration_structure_capabilities.min_acceleration_structure_scratch_offset_alignment;
-	r_accel_info->scratch_size = p_size_info.buildScratchSize + r_accel_info->scratch_alignment;
-
-	VkAccelerationStructureCreateInfoKHR accel_create_info = {};
-	accel_create_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR;
-	accel_create_info.type = p_type;
-	accel_create_info.size = p_size_info.accelerationStructureSize;
-	accel_create_info.buffer = ((const BufferInfo *)buffer.id)->vk_buffer;
-	VkResult err = vkCreateAccelerationStructureKHR(vk_device, &accel_create_info, nullptr, &r_accel_info->vk_acceleration_structure);
-	ERR_FAIL_COND_MSG(err, "vkCreateAccelerationStructureKHR failed with error " + itos(err) + ".");
-	r_accel_info->build_info.dstAccelerationStructure = r_accel_info->vk_acceleration_structure;
-#endif
-}
-
-void RenderingDeviceDriverVulkan::acceleration_structure_free(AccelerationStructureID p_acceleration_structure) {
-#if VULKAN_RAYTRACING_ENABLED
-	AccelerationStructureInfo *accel_info = (AccelerationStructureInfo *)p_acceleration_structure.id;
-	ERR_FAIL_NULL_MSG(accel_info, "Acceleration structure input parameter is not valid.");
-	if (accel_info->instances_buffer) {
-		buffer_free(accel_info->instances_buffer);
-	}
-	if (accel_info->buffer) {
-		buffer_free(accel_info->buffer);
-	}
-	if (accel_info->vk_acceleration_structure) {
-		vkDestroyAccelerationStructureKHR(vk_device, accel_info->vk_acceleration_structure, nullptr);
-	}
-	VersatileResource::free(resources_allocator, accel_info);
-#endif
-}
-
-uint32_t RenderingDeviceDriverVulkan::acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) {
-	AccelerationStructureInfo *accel_info = (AccelerationStructureInfo *)p_acceleration_structure.id;
-	ERR_FAIL_NULL_V_MSG(accel_info, 0, "Acceleration structure input parameter is not valid.");
-	return accel_info->scratch_size;
-}
-
-// ----- COMMANDS -----
-
-void RenderingDeviceDriverVulkan::command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) {
-#if VULKAN_RAYTRACING_ENABLED
-	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
-	AccelerationStructureInfo *accel_info = (AccelerationStructureInfo *)p_acceleration_structure.id;
-
-	VkAccelerationStructureBuildGeometryInfoKHR *build_info = &accel_info->build_info;
-	VkDeviceAddress scratch_address = buffer_get_device_address(p_scratch_buffer);
-	build_info->scratchData.deviceAddress = _align_up_address(scratch_address, accel_info->scratch_alignment);
-
-	const VkAccelerationStructureBuildRangeInfoKHR *range_infos = accel_info->range_infos.ptr();
-
-	vkCmdBuildAccelerationStructuresKHR(command_buffer->vk_command_buffer, 1, build_info, &range_infos);
-#endif
-}
-
-void RenderingDeviceDriverVulkan::command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) {
-	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
-	bound_raytracing_pipeline_id = p_pipeline;
-	const RaytracingPipelineInfo *rpi = (const RaytracingPipelineInfo *)p_pipeline.id;
-	vkCmdBindPipeline(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, rpi->vk_pipeline);
-}
-
-void RenderingDeviceDriverVulkan::command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) {
-	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
-	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-	const UniformSetInfo *usi = (const UniformSetInfo *)p_uniform_set.id;
-	vkCmdBindDescriptorSets(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, shader_info->vk_pipeline_layout, p_set_index, 1, &usi->vk_descriptor_set, 0, nullptr);
-}
-
-void RenderingDeviceDriverVulkan::command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) {
-#if VULKAN_RAYTRACING_ENABLED
-	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
-	ERR_FAIL_COND_MSG(bound_raytracing_pipeline_id == RaytracingPipelineID(), "A raytracing pipeline must have been bound with `command_bind_raytracing_pipeline()`.");
-	const RaytracingPipelineInfo *rpi = (const RaytracingPipelineInfo *)bound_raytracing_pipeline_id.id;
-	vkCmdTraceRaysKHR(command_buffer->vk_command_buffer, &rpi->regions.raygen, &rpi->regions.miss, &rpi->regions.hit, &rpi->regions.call, p_width, p_height, 1);
-#endif
-}
-
-// --- PIPELINE ---
-
-RDD::RaytracingPipelineID RenderingDeviceDriverVulkan::raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) {
-#if VULKAN_RAYTRACING_ENABLED
-	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-
-	VkRayTracingPipelineCreateInfoKHR pipeline_create_info = {};
-	pipeline_create_info.sType = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR;
-
-	// Stages.
-	pipeline_create_info.stageCount = shader_info->vk_stages_create_info.size();
-
-	VkPipelineShaderStageCreateInfo *vk_pipeline_stages = ALLOCA_ARRAY(VkPipelineShaderStageCreateInfo, pipeline_create_info.stageCount);
-
-	for (uint32_t i = 0; i < pipeline_create_info.stageCount; i++) {
-		vk_pipeline_stages[i] = shader_info->vk_stages_create_info[i];
-
-		if (p_specialization_constants.size()) {
-			VkSpecializationMapEntry *specialization_map_entries = ALLOCA_ARRAY(VkSpecializationMapEntry, p_specialization_constants.size());
-			for (uint32_t j = 0; j < p_specialization_constants.size(); j++) {
-				specialization_map_entries[j] = {};
-				specialization_map_entries[j].constantID = p_specialization_constants[j].constant_id;
-				specialization_map_entries[j].offset = (const char *)&p_specialization_constants[j].int_value - (const char *)p_specialization_constants.ptr();
-				specialization_map_entries[j].size = sizeof(uint32_t);
-			}
-
-			VkSpecializationInfo *specialization_info = ALLOCA_SINGLE(VkSpecializationInfo);
-			*specialization_info = {};
-			specialization_info->dataSize = p_specialization_constants.size() * sizeof(PipelineSpecializationConstant);
-			specialization_info->pData = p_specialization_constants.ptr();
-			specialization_info->mapEntryCount = p_specialization_constants.size();
-			specialization_info->pMapEntries = specialization_map_entries;
-
-			vk_pipeline_stages[i].pSpecializationInfo = specialization_info;
-		}
-	}
-
-	// Groups.
-	pipeline_create_info.groupCount = pipeline_create_info.stageCount;
-	VkRayTracingShaderGroupCreateInfoKHR *vk_pipeline_groups = ALLOCA_ARRAY(VkRayTracingShaderGroupCreateInfoKHR, pipeline_create_info.groupCount);
-	for (uint32_t i = 0; i < pipeline_create_info.stageCount; i++) {
-		vk_pipeline_groups[i] = shader_info->vk_groups_create_info[i];
-	}
-
-	// Pipeline.
-	pipeline_create_info.layout = shader_info->vk_pipeline_layout;
-	pipeline_create_info.pStages = vk_pipeline_stages;
-	pipeline_create_info.pGroups = vk_pipeline_groups;
-	pipeline_create_info.maxPipelineRayRecursionDepth = 1;
-
-	RaytracingPipelineInfo *rpi = VersatileResource::allocate<RaytracingPipelineInfo>(resources_allocator);
-
-	VkResult err = vkCreateRayTracingPipelinesKHR(vk_device, VK_NULL_HANDLE, pipelines_cache.vk_cache, 1, &pipeline_create_info, nullptr, &rpi->vk_pipeline);
-	ERR_FAIL_COND_V_MSG(err, RaytracingPipelineID(), "vkCreateRayTracingPipelinesKHR failed with error " + itos(err) + ".");
-
-	RaytracingPipelineID raytracing_pipeline = RaytracingPipelineID(rpi);
-	err = _raytracing_pipeline_stb_create(raytracing_pipeline, p_shader);
-	ERR_FAIL_COND_V_MSG(err, RaytracingPipelineID(), "_raytracing_pipeline_stb_create failed with error " + itos(err) + ".");
-
-	return raytracing_pipeline;
-#else
-	return RaytracingPipelineID();
-#endif
-}
-
-VkResult RenderingDeviceDriverVulkan::_raytracing_pipeline_stb_create(RaytracingPipelineID p_pipeline, ShaderID p_shader) {
-#if VULKAN_RAYTRACING_ENABLED
-	RaytracingPipelineInfo *rpi = (RaytracingPipelineInfo *)p_pipeline.id;
-	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-
-	// Shader group handles.
-	uint32_t handle_size_aligned = raytracing_capabilities.shader_group_handle_size_aligned;
-	uint32_t base_alignment = raytracing_capabilities.shader_group_base_alignment;
-
-	rpi->regions.raygen.stride = _align_up(handle_size_aligned * shader_info->region_count.raygen_count, base_alignment);
-	rpi->regions.raygen.size = rpi->regions.raygen.stride; // odd but ok.
-
-	rpi->regions.hit.stride = handle_size_aligned;
-	rpi->regions.hit.size = _align_up(handle_size_aligned * shader_info->region_count.hit_count, base_alignment);
-
-	rpi->regions.miss.stride = handle_size_aligned;
-	rpi->regions.miss.size = _align_up(handle_size_aligned * shader_info->region_count.miss_count, base_alignment);
-
-	rpi->regions.call.stride = 0;
-	rpi->regions.call.size = 0;
-
-	// Shader binding table.
-	uint32_t sbt_size = rpi->regions.raygen.size + rpi->regions.hit.size + rpi->regions.miss.size + rpi->regions.call.size;
-	rpi->sbt_buffer = buffer_create(sbt_size, BUFFER_USAGE_TRANSFER_FROM_BIT | BUFFER_USAGE_DEVICE_ADDRESS_BIT | BUFFER_USAGE_SHADER_BINDING_TABLE_BIT, MEMORY_ALLOCATION_TYPE_CPU, UINT64_MAX);
-
-	// Update regions addresses.
-	rpi->regions.raygen.deviceAddress = buffer_get_device_address(rpi->sbt_buffer);
-	rpi->regions.hit.deviceAddress = rpi->regions.raygen.deviceAddress + rpi->regions.raygen.size;
-	rpi->regions.miss.deviceAddress = rpi->regions.hit.deviceAddress + rpi->regions.hit.size;
-	rpi->regions.call.deviceAddress = 0;
-
-	// Update shader binding table buffer.
-	uint32_t handle_size = raytracing_capabilities.shader_group_handle_size;
-	uint32_t handles_size = shader_info->region_count.group_count * handle_size;
-	LocalVector<uint8_t> handles_data;
-	handles_data.resize(handles_size);
-	uint8_t *handles_ptr = handles_data.ptr();
-
-	VkResult err = vkGetRayTracingShaderGroupHandlesKHR(vk_device, rpi->vk_pipeline, 0, shader_info->region_count.group_count, handles_size, handles_ptr);
-	ERR_FAIL_COND_V_MSG(err, err, "vkGetRayTracingShaderGroupHandlesKHR failed with error " + itos(err) + ".");
-
-	uint8_t *sbt_ptr = buffer_map(rpi->sbt_buffer);
-	uint8_t *sbt_data = sbt_ptr;
-	uint32_t handle_index = 0;
-
-	// Raygen.
-	memcpy(sbt_data, handles_ptr + handle_index * handle_size, handle_size);
-	++handle_index;
-
-	// Hit.
-	sbt_data = sbt_ptr + rpi->regions.raygen.size;
-	for (uint32_t i = 0; i < shader_info->region_count.hit_count; ++i) {
-		memcpy(sbt_data, handles_ptr + handle_index * handle_size, handle_size);
-		sbt_data += rpi->regions.hit.stride;
-		++handle_index;
-	}
-
-	// Miss.
-	sbt_data = sbt_ptr + rpi->regions.raygen.size + rpi->regions.hit.size;
-	for (uint32_t i = 0; i < shader_info->region_count.miss_count; ++i) {
-		memcpy(sbt_data, handles_ptr + handle_index * handle_size, handle_size);
-		sbt_data += rpi->regions.miss.stride;
-		++handle_index;
-	}
-
-	buffer_unmap(rpi->sbt_buffer);
-
-	return err;
-#else
-	return VK_ERROR_UNKNOWN;
-#endif
-}
-
-void RenderingDeviceDriverVulkan::raytracing_pipeline_free(RaytracingPipelineID p_pipeline) {
-	const RaytracingPipelineInfo *rpi = (const RaytracingPipelineInfo *)p_pipeline.id;
-	vkDestroyPipeline(vk_device, rpi->vk_pipeline, nullptr);
-	if (rpi->sbt_buffer) {
-		buffer_free(rpi->sbt_buffer);
-	}
-	VersatileResource::free(resources_allocator, rpi);
-}
-
 /*****************/
 /**** COMPUTE ****/
 /*****************/
@@ -7113,14 +6323,6 @@ void RenderingDeviceDriverVulkan::set_object_name(ObjectType p_type, ID p_driver
 		case OBJECT_TYPE_PIPELINE: {
 			_set_object_name(VK_OBJECT_TYPE_PIPELINE, (uint64_t)p_driver_id.id, p_name);
 		} break;
-		case OBJECT_TYPE_ACCELERATION_STRUCTURE: {
-			const AccelerationStructureInfo *asi = (const AccelerationStructureInfo *)p_driver_id.id;
-			_set_object_name(VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR, (uint64_t)asi->vk_acceleration_structure, p_name);
-		} break;
-		case OBJECT_TYPE_RAYTRACING_PIPELINE: {
-			const RaytracingPipelineInfo *rpi = (const RaytracingPipelineInfo *)p_driver_id.id;
-			_set_object_name(VK_OBJECT_TYPE_PIPELINE, (uint64_t)rpi->vk_pipeline, p_name);
-		} break;
 		default: {
 			DEV_ASSERT(false);
 		}
@@ -7171,18 +6373,9 @@ uint64_t RenderingDeviceDriverVulkan::get_resource_native_handle(DriverResource
 }
 
 uint64_t RenderingDeviceDriverVulkan::get_total_memory_used() {
-	const VkPhysicalDeviceMemoryProperties *memory_properties = nullptr;
-	vmaGetMemoryProperties(allocator, &memory_properties);
-
-	VmaBudget *budgets = ALLOCA_ARRAY(VmaBudget, memory_properties->memoryHeapCount);
-	vmaGetHeapBudgets(allocator, budgets);
-
-	uint64_t total_memory_used = 0;
-	for (uint32_t i = 0; i < memory_properties->memoryHeapCount; i++) {
-		total_memory_used += budgets[i].statistics.allocationBytes;
-	}
-
-	return total_memory_used;
+	VmaTotalStatistics stats = {};
+	vmaCalculateStatistics(allocator, &stats);
+	return stats.total.statistics.allocationBytes;
 }
 
 uint64_t RenderingDeviceDriverVulkan::get_lazily_memory_used() {
@@ -7322,22 +6515,6 @@ bool RenderingDeviceDriverVulkan::has_feature(Features p_feature) {
 			return framebuffer_depth_resolve;
 		case SUPPORTS_POINT_SIZE:
 			return true;
-		case SUPPORTS_RAY_QUERY:
-			return acceleration_structure_capabilities.acceleration_structure_support && ray_query_support;
-		case SUPPORTS_RAYTRACING_PIPELINE:
-			return acceleration_structure_capabilities.acceleration_structure_support && raytracing_capabilities.raytracing_pipeline_support;
-		case SUPPORTS_HDR_OUTPUT:
-#if defined(WINDOWS_ENABLED)
-			// When using a Vulkan swapchain on Windows, some configurations
-			// involving integrated GPU hardware do not function correctly
-			// with HDR output.
-			return false;
-#elif defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
-			// HDR support has not yet been thoroughly tested and validated for Apple platforms.
-			return false;
-#else
-			return context_driver->is_colorspace_supported();
-#endif // defined(WINDOWS_ENABLED)
 		default:
 			return false;
 	}
diff --git a/engine/drivers/vulkan/rendering_device_driver_vulkan.h b/engine/drivers/vulkan/rendering_device_driver_vulkan.h
index 7777140b..c53ac31b 100644
--- a/engine/drivers/vulkan/rendering_device_driver_vulkan.h
+++ b/engine/drivers/vulkan/rendering_device_driver_vulkan.h
@@ -32,7 +32,6 @@
 
 #include "core/templates/hash_map.h"
 #include "core/templates/paged_allocator.h"
-#include "core/templates/rb_map.h"
 #include "drivers/vulkan/rendering_context_driver_vulkan.h"
 #include "drivers/vulkan/rendering_shader_container_vulkan.h"
 #include "servers/rendering/rendering_device_driver.h"
@@ -42,12 +41,10 @@
 #define _DEBUG
 #endif
 #endif
-#include <thirdparty/re-spirv/re-spirv.h>
-#include <thirdparty/vulkan/vk_mem_alloc.h>
+#include "thirdparty/re-spirv/re-spirv.h"
+#include "thirdparty/vulkan/vk_mem_alloc.h"
 
-#include <drivers/vulkan/godot_vulkan.h>
-
-class FileAccess;
+#include "drivers/vulkan/godot_vulkan.h"
 
 // Design principles:
 // - Vulkan structs are zero-initialized and fields not requiring a non-zero value are omitted (except in cases where expresivity reasons apply).
@@ -95,20 +92,6 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 		bool storage_input_output_16 = false;
 	};
 
-	struct AccelerationStructureCapabilities {
-		bool acceleration_structure_support = false;
-		uint32_t min_acceleration_structure_scratch_offset_alignment = 0;
-	};
-
-	struct RaytracingCapabilities {
-		bool raytracing_pipeline_support = false;
-		uint32_t shader_group_handle_size = 0;
-		uint32_t shader_group_handle_alignment = 0;
-		uint32_t shader_group_handle_size_aligned = 0;
-		uint32_t shader_group_base_alignment = 0;
-		bool validation = false;
-	};
-
 	struct DeviceFunctions {
 		PFN_vkCreateSwapchainKHR CreateSwapchainKHR = nullptr;
 		PFN_vkDestroySwapchainKHR DestroySwapchainKHR = nullptr;
@@ -126,10 +109,6 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 
 		// Debug device fault.
 		PFN_vkGetDeviceFaultInfoEXT GetDeviceFaultInfoEXT = nullptr;
-
-		// Raytracing extensions.
-		PFN_vkCreateAccelerationStructureKHR CreateAccelerationStructureKHR = nullptr;
-		PFN_vkCreateRayTracingPipelinesKHR CreateRaytracingPipelinesKHR = nullptr;
 	};
 	// Debug marker extensions.
 	VkDebugReportObjectTypeEXT _convert_to_debug_report_objectType(VkObjectType p_object_type);
@@ -157,9 +136,6 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 	bool buffer_device_address_support = false;
 	bool vulkan_memory_model_support = false;
 	bool vulkan_memory_model_device_scope_support = false;
-	AccelerationStructureCapabilities acceleration_structure_capabilities;
-	bool ray_query_support = false;
-	RaytracingCapabilities raytracing_capabilities;
 	bool pipeline_cache_control_support = false;
 	bool device_fault_support = false;
 	bool framebuffer_depth_resolve = false;
@@ -275,7 +251,6 @@ public:
 			VmaAllocation handle = nullptr;
 			VmaAllocationInfo info = {};
 		} allocation; // All 0/null if just a view.
-		bool is_subsampled = false;
 #ifdef DEBUG_ENABLED
 		bool created_from_extension = false;
 		bool transient = false;
@@ -328,8 +303,7 @@ public:
 			BitField<PipelineStageBits> p_dst_stages,
 			VectorView<MemoryAccessBarrier> p_memory_barriers,
 			VectorView<BufferBarrier> p_buffer_barriers,
-			VectorView<TextureBarrier> p_texture_barriers,
-			VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) override final;
+			VectorView<TextureBarrier> p_texture_barriers) override final;
 
 	/****************/
 	/**** FENCES ****/
@@ -419,7 +393,6 @@ private:
 		RenderingContextDriver::SurfaceID surface = RenderingContextDriver::SurfaceID();
 		VkFormat format = VK_FORMAT_UNDEFINED;
 		VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
-		RDD::ColorSpace rdd_color_space = RDD::COLOR_SPACE_REC709_NONLINEAR_SRGB;
 		TightLocalVector<VkImage> images;
 		TightLocalVector<VkImageView> image_views;
 		TightLocalVector<VkSemaphore> present_semaphores;
@@ -434,7 +407,6 @@ private:
 #endif
 	};
 
-	bool _determine_swap_chain_format(RenderingContextDriver::SurfaceID p_surface, VkFormat &r_format, VkColorSpaceKHR &r_color_space, RDD::ColorSpace &r_rdd_color_space);
 	void _swap_chain_release(SwapChain *p_swap_chain);
 
 public:
@@ -444,7 +416,6 @@ public:
 	virtual RenderPassID swap_chain_get_render_pass(SwapChainID p_swap_chain) override final;
 	virtual int swap_chain_get_pre_rotation_degrees(SwapChainID p_swap_chain) override final;
 	virtual DataFormat swap_chain_get_format(SwapChainID p_swap_chain) override final;
-	virtual ColorSpace swap_chain_get_color_space(SwapChainID p_swap_chain) override final;
 	virtual void swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) override final;
 	virtual void swap_chain_free(SwapChainID p_swap_chain) override final;
 
@@ -473,25 +444,15 @@ public:
 	/**** SHADER ****/
 	/****************/
 private:
-	struct RaytracingShaderRegionCount {
-		uint32_t raygen_count = 0;
-		uint32_t hit_count = 0;
-		uint32_t miss_count = 0;
-		uint32_t group_count = 0;
-	};
-
 	struct ShaderInfo {
 		String name;
 		VkShaderStageFlags vk_push_constant_stages = 0;
 		TightLocalVector<VkPipelineShaderStageCreateInfo> vk_stages_create_info;
-		TightLocalVector<VkRayTracingShaderGroupCreateInfoKHR> vk_groups_create_info;
 		TightLocalVector<VkDescriptorSetLayout> vk_descriptor_set_layouts;
 		TightLocalVector<respv::Shader> respv_stage_shaders;
 		TightLocalVector<Vector<uint8_t>> spirv_stage_bytes;
 		TightLocalVector<uint64_t> original_stage_size;
 		VkPipelineLayout vk_pipeline_layout = VK_NULL_HANDLE;
-		// Used to update the shader binding table buffer.
-		RaytracingShaderRegionCount region_count;
 	};
 
 public:
@@ -698,76 +659,6 @@ public:
 
 	virtual PipelineID compute_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
 
-	/********************/
-	/**** RAYTRACING ****/
-	/********************/
-
-	// ----- ACCELERATION STRUCTURE -----
-
-	struct AccelerationStructureInfo {
-		VkAccelerationStructureKHR vk_acceleration_structure = VK_NULL_HANDLE;
-		// Buffer used for the structure
-		RDD::BufferID buffer;
-
-		// Alignment of the scratch buffer for building the structure
-		uint32_t scratch_alignment;
-		// Size of the scratch buffer for building the structure
-		uint32_t scratch_size;
-
-		// Buffer used for instances in a TLAS
-		RDD::BufferID instances_buffer;
-
-		// Required for building
-		TightLocalVector<VkAccelerationStructureGeometryKHR> geometries;
-		LocalVector<VkAccelerationStructureInstanceKHR> instances;
-		VkAccelerationStructureBuildGeometryInfoKHR build_info;
-		TightLocalVector<VkAccelerationStructureBuildRangeInfoKHR> range_infos;
-	};
-
-	virtual AccelerationStructureID blas_create(VectorView<AccelerationStructureGeometry> p_geometries) override final;
-	virtual uint32_t tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) override final;
-	virtual void tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) override final;
-	virtual AccelerationStructureID tlas_create(BufferID p_instances_buffer) override final;
-	virtual void acceleration_structure_free(AccelerationStructureID p_acceleration_structure) override final;
-	virtual uint32_t acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) override final;
-
-private:
-	void _acceleration_structure_create(VkAccelerationStructureTypeKHR p_type, VkAccelerationStructureBuildSizesInfoKHR p_size_info, AccelerationStructureInfo *r_accel_info);
-
-public:
-	// ----- COMMANDS -----
-
-	virtual void command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) override final;
-	virtual void command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) override final;
-	virtual void command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) override final;
-	virtual void command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) override final;
-
-private:
-	RaytracingPipelineID bound_raytracing_pipeline_id;
-
-	// ----- PIPELINE -----
-
-	struct RaytracingShaderRegions {
-		VkStridedDeviceAddressRegionKHR raygen;
-		VkStridedDeviceAddressRegionKHR hit;
-		VkStridedDeviceAddressRegionKHR miss;
-		VkStridedDeviceAddressRegionKHR call;
-	};
-
-	struct RaytracingPipelineInfo {
-		VkPipeline vk_pipeline = VK_NULL_HANDLE;
-		ShaderID shader;
-		// Used vkCmdTraceRaysKHR.
-		RaytracingShaderRegions regions;
-		// Shader binding table.
-		BufferID sbt_buffer;
-	};
-
-public:
-	virtual RaytracingPipelineID raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) override final;
-	VkResult _raytracing_pipeline_stb_create(RaytracingPipelineID p_pipeline, ShaderID p_shader);
-	virtual void raytracing_pipeline_free(RaytracingPipelineID p_pipeline) override final;
-
 	/*****************/
 	/**** QUERIES ****/
 	/*****************/
diff --git a/engine/drivers/vulkan/rendering_shader_container_vulkan.cpp b/engine/drivers/vulkan/rendering_shader_container_vulkan.cpp
index 3bb2880a..1b4dcb49 100644
--- a/engine/drivers/vulkan/rendering_shader_container_vulkan.cpp
+++ b/engine/drivers/vulkan/rendering_shader_container_vulkan.cpp
@@ -30,7 +30,7 @@
 
 #include "rendering_shader_container_vulkan.h"
 
-#include <thirdparty/misc/smolv.h>
+#include "thirdparty/misc/smolv.h"
 
 // RenderingShaderContainerVulkan
 
@@ -101,7 +101,7 @@ RenderingDeviceCommons::ShaderLanguageVersion RenderingShaderContainerFormatVulk
 }
 
 RenderingDeviceCommons::ShaderSpirvVersion RenderingShaderContainerFormatVulkan::get_shader_spirv_version() const {
-	return SHADER_SPIRV_VERSION_1_4;
+	return SHADER_SPIRV_VERSION_1_3;
 }
 
 void RenderingShaderContainerFormatVulkan::set_debug_info_enabled(bool p_debug_info_enabled) {
diff --git a/engine/drivers/vulkan/vulkan_hooks.h b/engine/drivers/vulkan/vulkan_hooks.h
index e54ee11c..c4f6b953 100644
--- a/engine/drivers/vulkan/vulkan_hooks.h
+++ b/engine/drivers/vulkan/vulkan_hooks.h
@@ -32,8 +32,7 @@
 
 #include "core/math/vector2i.h"
 #include "core/templates/local_vector.h"
-
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 class VulkanHooks {
 private:
@@ -48,6 +47,5 @@ public:
 	virtual void set_direct_queue_family_and_index(uint32_t p_queue_family_index, uint32_t p_queue_index) = 0;
 	virtual bool use_fragment_density_offsets() = 0;
 	virtual void get_fragment_density_offsets(LocalVector<VkOffset2D> &r_offsets, const Vector2i &p_granularity) = 0;
-	virtual bool use_subsampled_images() = 0;
 	static VulkanHooks *get_singleton() { return singleton; }
 };
diff --git a/engine/drivers/wasapi/audio_driver_wasapi.cpp b/engine/drivers/wasapi/audio_driver_wasapi.cpp
index 710e0457..3cdfd4ca 100644
--- a/engine/drivers/wasapi/audio_driver_wasapi.cpp
+++ b/engine/drivers/wasapi/audio_driver_wasapi.cpp
@@ -32,12 +32,12 @@
 
 #include "audio_driver_wasapi.h"
 
-#include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/os/os.h"
 
 #include <functiondiscoverykeys.h>
-#include <wrl/client.h>
 
+#include <wrl/client.h>
 using Microsoft::WRL::ComPtr;
 
 // Define IAudioClient3 if not already defined by MinGW headers
@@ -110,10 +110,10 @@ const IID IID_IAudioClient3 = __uuidof(IAudioClient3);
 const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
 const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient);
 
-#define SAFE_RELEASE(memory) \
+#define SAFE_RELEASE(memory)   \
 	if ((memory) != nullptr) { \
-		(memory)->Release(); \
-		(memory) = nullptr; \
+		(memory)->Release();   \
+		(memory) = nullptr;    \
 	}
 
 #define REFTIMES_PER_SEC 10000000
diff --git a/engine/drivers/wasapi/audio_driver_wasapi.h b/engine/drivers/wasapi/audio_driver_wasapi.h
index 2f7ba8d3..409dafe0 100644
--- a/engine/drivers/wasapi/audio_driver_wasapi.h
+++ b/engine/drivers/wasapi/audio_driver_wasapi.h
@@ -37,10 +37,10 @@
 #include "core/templates/safe_refcount.h"
 #include "servers/audio/audio_server.h"
 
-#include <windows.h>
-
 #include <audioclient.h>
 #include <mmdeviceapi.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 class AudioDriverWASAPI : public AudioDriver {
 	class AudioDeviceWASAPI {
diff --git a/engine/drivers/windows/dir_access_windows.cpp b/engine/drivers/windows/dir_access_windows.cpp
index 20b16616..73df578c 100644
--- a/engine/drivers/windows/dir_access_windows.cpp
+++ b/engine/drivers/windows/dir_access_windows.cpp
@@ -31,16 +31,17 @@
 #if defined(WINDOWS_ENABLED)
 
 #include "dir_access_windows.h"
+#include "file_access_windows.h"
 
+#include "core/config/project_settings.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "drivers/windows/file_access_windows.h"
-
-#include <windows.h>
 
 #include <cstdio>
 #include <cwchar>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 typedef struct _NT_IO_STATUS_BLOCK {
 	union {
@@ -135,48 +136,16 @@ void DirAccessWindows::list_dir_end() {
 	}
 }
 
-void DirAccessWindows::_update_drives() {
-	drives.clear();
-	DWORD mask = GetLogicalDrives();
-	for (int i = 0; i < MAX_DRIVES; i++) {
-		if (mask & (1 << i)) {
-			String drive = String::chr('A' + i) + ':';
-			String path = drive + '\\';
-			String label;
-			char16_t wlabel[4096];
-			if (GetVolumeInformationW((LPCWSTR)(path).utf16().get_data(), (LPWSTR)wlabel, 4096, nullptr, nullptr, nullptr, nullptr, 0)) {
-				label = String::utf16(wlabel);
-			}
-			drives.push_back(DriveInfo{ drive, label });
-		}
-	}
-}
-
 int DirAccessWindows::get_drive_count() {
-	if (drives.size() == 0) {
-		_update_drives();
-	}
-	return drives.size();
-}
-
-String DirAccessWindows::get_drive_label(int p_drive) {
-	if (drives.size() == 0) {
-		_update_drives();
-	}
-	if (p_drive < 0 || p_drive >= (int)drives.size()) {
-		return String();
-	}
-	return drives[p_drive].label;
+	return drive_count;
 }
 
 String DirAccessWindows::get_drive(int p_drive) {
-	if (drives.size() == 0) {
-		_update_drives();
+	if (p_drive < 0 || p_drive >= drive_count) {
+		return "";
 	}
-	if (p_drive < 0 || p_drive >= (int)drives.size()) {
-		return String();
-	}
-	return drives[p_drive].path;
+
+	return String::chr(drives[p_drive]) + ":";
 }
 
 Error DirAccessWindows::change_dir(String p_dir) {
@@ -517,6 +486,16 @@ DirAccessWindows::DirAccessWindows() {
 	GetCurrentDirectoryW(real_current_dir_name.size(), (LPWSTR)real_current_dir_name.ptrw());
 	current_dir = String::utf16((const char16_t *)real_current_dir_name.get_data());
 
+	DWORD mask = GetLogicalDrives();
+
+	for (int i = 0; i < MAX_DRIVES; i++) {
+		if (mask & (1 << i)) { //DRIVE EXISTS
+
+			drives[drive_count] = 'A' + i;
+			drive_count++;
+		}
+	}
+
 	change_dir(".");
 }
 
diff --git a/engine/drivers/windows/dir_access_windows.h b/engine/drivers/windows/dir_access_windows.h
index 015a2d31..9bc4bc7c 100644
--- a/engine/drivers/windows/dir_access_windows.h
+++ b/engine/drivers/windows/dir_access_windows.h
@@ -45,13 +45,8 @@ class DirAccessWindows : public DirAccess {
 	DirAccessWindowsPrivate *p = nullptr;
 	/* Windows stuff */
 
-	struct DriveInfo {
-		String path;
-		String label;
-	};
-
-	LocalVector<DriveInfo> drives;
-	void _update_drives();
+	char drives[MAX_DRIVES] = { 0 }; // a-z:
+	int drive_count = 0;
 
 	String current_dir;
 
@@ -70,7 +65,6 @@ public:
 
 	virtual int get_drive_count() override;
 	virtual String get_drive(int p_drive) override;
-	virtual String get_drive_label(int p_drive) override;
 
 	virtual Error change_dir(String p_dir) override; ///< can be relative or absolute, return false on success
 	virtual String get_current_dir(bool p_include_drive = true) const override; ///< return current dir location
diff --git a/engine/drivers/windows/file_access_windows.cpp b/engine/drivers/windows/file_access_windows.cpp
index 6f9f466a..6d305ae3 100644
--- a/engine/drivers/windows/file_access_windows.cpp
+++ b/engine/drivers/windows/file_access_windows.cpp
@@ -36,13 +36,15 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 
-#include <io.h>
 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <io.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <tchar.h>
-
 #include <cerrno>
 #include <cwchar>
 
@@ -69,9 +71,6 @@ void FileAccessWindows::check_errors(bool p_write) const {
 bool FileAccessWindows::is_path_invalid(const String &p_path) {
 	// Check for invalid operating system file.
 	String fname = p_path.get_file().to_lower();
-	if (fname.ends_with(".") || fname.ends_with(" ")) {
-		return true;
-	}
 
 	int dot = fname.find_char('.');
 	if (dot != -1) {
@@ -142,7 +141,7 @@ Error FileAccessWindows::open_internal(const String &p_path, int p_mode_flags) {
 	// platforms), we only check for relative paths, or paths in res:// or user://,
 	// other paths aren't likely to be portable anyway.
 	if (p_mode_flags == READ && (p_path.is_relative_path() || get_access_type() != ACCESS_FILESYSTEM)) {
-		String base_path = FileAccess::fix_path(p_path);
+		String base_path = p_path;
 		String working_path;
 		String proper_path;
 
@@ -694,11 +693,11 @@ HashSet<String> FileAccessWindows::invalid_files;
 
 void FileAccessWindows::initialize() {
 	static const char *reserved_files[]{
-		"con", "prn", "aux", "nul", "com0", "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "com¹", "com²", "com³", "lpt0", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "lpt¹", "lpt²", "lpt³", nullptr
+		"con", "prn", "aux", "nul", "com0", "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt0", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", nullptr
 	};
 	int reserved_file_index = 0;
 	while (reserved_files[reserved_file_index] != nullptr) {
-		invalid_files.insert(String::utf8(reserved_files[reserved_file_index]));
+		invalid_files.insert(reserved_files[reserved_file_index]);
 		reserved_file_index++;
 	}
 
diff --git a/engine/drivers/windows/file_access_windows.h b/engine/drivers/windows/file_access_windows.h
index 437728b5..7142c765 100644
--- a/engine/drivers/windows/file_access_windows.h
+++ b/engine/drivers/windows/file_access_windows.h
@@ -33,6 +33,7 @@
 #ifdef WINDOWS_ENABLED
 
 #include "core/io/file_access.h"
+#include "core/os/memory.h"
 
 #include <cstdio>
 
diff --git a/engine/drivers/windows/file_access_windows_pipe.cpp b/engine/drivers/windows/file_access_windows_pipe.cpp
index 049b8e7a..94dec737 100644
--- a/engine/drivers/windows/file_access_windows_pipe.cpp
+++ b/engine/drivers/windows/file_access_windows_pipe.cpp
@@ -32,9 +32,8 @@
 
 #include "file_access_windows_pipe.h"
 
-#include "core/string/ustring.h"
-
-#include <winbase.h>
+#include "core/os/os.h"
+#include "core/string/print_string.h"
 
 Error FileAccessWindowsPipe::open_existing(HANDLE p_rfd, HANDLE p_wfd, bool p_blocking) {
 	// Open pipe using handles created by CreatePipe(rfd, wfd, NULL, 4096) call in the OS.execute_with_pipe.
diff --git a/engine/drivers/windows/file_access_windows_pipe.h b/engine/drivers/windows/file_access_windows_pipe.h
index bd8187f7..38a5d452 100644
--- a/engine/drivers/windows/file_access_windows_pipe.h
+++ b/engine/drivers/windows/file_access_windows_pipe.h
@@ -33,7 +33,9 @@
 #ifdef WINDOWS_ENABLED
 
 #include "core/io/file_access.h"
+#include "core/os/memory.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class FileAccessWindowsPipe : public FileAccess {
diff --git a/engine/drivers/windows/ip_windows.cpp b/engine/drivers/windows/ip_windows.cpp
index b23cb655..60f2378e 100644
--- a/engine/drivers/windows/ip_windows.cpp
+++ b/engine/drivers/windows/ip_windows.cpp
@@ -32,11 +32,15 @@
 
 #include "ip_windows.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-// Include winsock2 before iphlpapi.
+
 #include <iphlpapi.h>
 
+#include <cstdio>
+
 static IPAddress _sockaddr2ip(struct sockaddr *p_addr) {
 	IPAddress ip;
 
diff --git a/engine/drivers/windows/net_socket_winsock.cpp b/engine/drivers/windows/net_socket_winsock.cpp
index 065a6ad3..c5f0edd2 100644
--- a/engine/drivers/windows/net_socket_winsock.cpp
+++ b/engine/drivers/windows/net_socket_winsock.cpp
@@ -32,10 +32,10 @@
 
 #include "net_socket_winsock.h"
 
-#include <mswsock.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <mswsock.h>
 // Workaround missing flag in MinGW
 #if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
 #define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
@@ -96,7 +96,7 @@ void NetSocketWinSock::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *
 	}
 }
 
-Ref<NetSocket> NetSocketWinSock::_create_func() {
+NetSocket *NetSocketWinSock::_create_func() {
 	return memnew(NetSocketWinSock);
 }
 
@@ -607,7 +607,7 @@ Ref<NetSocket> NetSocketWinSock::accept(Address &r_addr) {
 	_set_ip_port(&their_addr, &ip, &port);
 	r_addr = Address(ip, port);
 
-	Ref<NetSocketWinSock> ns = memnew(NetSocketWinSock);
+	NetSocketWinSock *ns = memnew(NetSocketWinSock);
 	ns->_set_socket(fd, _ip_type, _is_stream);
 	ns->set_blocking_enabled(false);
 	return Ref<NetSocket>(ns);
diff --git a/engine/drivers/windows/net_socket_winsock.h b/engine/drivers/windows/net_socket_winsock.h
index a13cfef1..3162e1ec 100644
--- a/engine/drivers/windows/net_socket_winsock.h
+++ b/engine/drivers/windows/net_socket_winsock.h
@@ -60,7 +60,7 @@ private:
 	_FORCE_INLINE_ Error _change_multicast_group(IPAddress p_ip, String p_if_name, bool p_add);
 
 protected:
-	static Ref<NetSocket> _create_func();
+	static NetSocket *_create_func();
 
 	bool _can_use_ip(const IPAddress &p_ip, const bool p_for_bind) const;
 
diff --git a/engine/drivers/windows/thread_windows.cpp b/engine/drivers/windows/thread_windows.cpp
index c46299b1..183d104a 100644
--- a/engine/drivers/windows/thread_windows.cpp
+++ b/engine/drivers/windows/thread_windows.cpp
@@ -35,6 +35,7 @@
 #include "core/os/thread.h"
 #include "core/string/ustring.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 typedef HRESULT(WINAPI *SetThreadDescriptionPtr)(HANDLE p_thread, PCWSTR p_thread_description);
diff --git a/engine/drivers/winmidi/midi_driver_winmidi.h b/engine/drivers/winmidi/midi_driver_winmidi.h
index 3e82d429..833f1123 100644
--- a/engine/drivers/winmidi/midi_driver_winmidi.h
+++ b/engine/drivers/winmidi/midi_driver_winmidi.h
@@ -35,6 +35,8 @@
 #include "core/os/midi_driver.h"
 #include "core/templates/vector.h"
 
+#include <cstdio>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <mmsystem.h>
diff --git a/engine/drivers/xaudio2/audio_driver_xaudio2.cpp b/engine/drivers/xaudio2/audio_driver_xaudio2.cpp
index c74f0987..0c2fdb64 100644
--- a/engine/drivers/xaudio2/audio_driver_xaudio2.cpp
+++ b/engine/drivers/xaudio2/audio_driver_xaudio2.cpp
@@ -30,8 +30,8 @@
 
 #include "audio_driver_xaudio2.h"
 
-#include "core/config/engine.h"
-#include "core/math/math_funcs_binary.h"
+#include "core/config/project_settings.h"
+#include "core/os/os.h"
 
 Error AudioDriverXAudio2::init() {
 	active.clear();
@@ -46,7 +46,7 @@ Error AudioDriverXAudio2::init() {
 	channels = 2;
 
 	int latency = Engine::get_singleton()->get_audio_output_latency();
-	buffer_size = Math::closest_power_of_2(latency * mix_rate / 1000);
+	buffer_size = closest_power_of_2(latency * mix_rate / 1000);
 
 	samples_in = memnew_arr(int32_t, size_t(buffer_size) * channels);
 	for (int i = 0; i < AUDIO_BUFFERS; i++) {
@@ -97,7 +97,7 @@ void AudioDriverXAudio2::thread_func(void *p_udata) {
 			ad->stop_counting_ticks();
 			ad->unlock();
 
-			for (int i = 0; i < ad->buffer_size * ad->channels; i++) {
+			for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
 				ad->samples_out[ad->current_buffer][i] = ad->samples_in[i] >> 16;
 			}
 
@@ -174,7 +174,7 @@ void AudioDriverXAudio2::finish() {
 
 AudioDriverXAudio2::AudioDriverXAudio2() {
 	for (int i = 0; i < AUDIO_BUFFERS; i++) {
-		xaudio_buffer[i] = {};
-		samples_out[i] = nullptr;
+		xaudio_buffer[i] = { 0 };
+		samples_out[i] = 0;
 	}
 }
diff --git a/engine/drivers/xaudio2/audio_driver_xaudio2.h b/engine/drivers/xaudio2/audio_driver_xaudio2.h
index e1da8e8b..393836b5 100644
--- a/engine/drivers/xaudio2/audio_driver_xaudio2.h
+++ b/engine/drivers/xaudio2/audio_driver_xaudio2.h
@@ -35,8 +35,9 @@
 #include "core/templates/safe_refcount.h"
 #include "servers/audio/audio_server.h"
 
+#include <mmsystem.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-
 #include <wrl/client.h>
 #include <xaudio2.h>
 
@@ -47,14 +48,8 @@ class AudioDriverXAudio2 : public AudioDriver {
 
 	struct XAudio2DriverVoiceCallback : public IXAudio2VoiceCallback {
 		HANDLE buffer_end_event;
-
 		XAudio2DriverVoiceCallback() :
 				buffer_end_event(CreateEvent(nullptr, FALSE, FALSE, nullptr)) {}
-
-		virtual ~XAudio2DriverVoiceCallback() {
-			CloseHandle(buffer_end_event);
-		}
-
 		void STDMETHODCALLTYPE OnBufferEnd(void *pBufferContext) {
 			SetEvent(buffer_end_event);
 		}
@@ -86,7 +81,7 @@ class AudioDriverXAudio2 : public AudioDriver {
 	SafeFlag exit_thread;
 	bool pcm_open = false;
 
-	WAVEFORMATEX wave_format = {};
+	WAVEFORMATEX wave_format = { 0 };
 	Microsoft::WRL::ComPtr<IXAudio2> xaudio;
 	int current_buffer = 0;
 	IXAudio2MasteringVoice *mastering_voice = nullptr;
diff --git a/engine/editor/animation/animation_bezier_editor.cpp b/engine/editor/animation/animation_bezier_editor.cpp
index f68b3469..ed84a319 100644
--- a/engine/editor/animation/animation_bezier_editor.cpp
+++ b/engine/editor/animation/animation_bezier_editor.cpp
@@ -30,8 +30,6 @@
 
 #include "animation_bezier_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/editor_node.h"
@@ -264,13 +262,13 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("editors/panning")) {
 				panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/animation_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-				panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+				panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 			}
 		} break;
 
 		case NOTIFICATION_READY: {
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/animation_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 		case NOTIFICATION_THEME_CHANGED: {
 			bezier_icon = get_editor_theme_icon(SNAME("KeyBezierPoint"));
@@ -278,6 +276,15 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("KeyBezierSelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation bezier track editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
diff --git a/engine/editor/animation/animation_bezier_editor.h b/engine/editor/animation/animation_bezier_editor.h
index 872fe44b..6b78e181 100644
--- a/engine/editor/animation/animation_bezier_editor.h
+++ b/engine/editor/animation/animation_bezier_editor.h
@@ -30,10 +30,8 @@
 
 #pragma once
 
+#include "animation_track_editor.h"
 #include "core/templates/hashfuncs.h"
-#include "core/templates/rb_map.h"
-#include "core/templates/rb_set.h"
-#include "editor/animation/animation_track_editor.h"
 
 class ViewPanner;
 
diff --git a/engine/editor/animation/animation_blend_space_1d_editor.cpp b/engine/editor/animation/animation_blend_space_1d_editor.cpp
index fe092e7e..382d00b3 100644
--- a/engine/editor/animation/animation_blend_space_1d_editor.cpp
+++ b/engine/editor/animation/animation_blend_space_1d_editor.cpp
@@ -30,9 +30,6 @@
 
 #include "animation_blend_space_1d_editor.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -46,10 +43,8 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
-#include "scene/main/timer.h"
 
 StringName AnimationNodeBlendSpace1DEditor::get_blend_position_path() const {
 	StringName path = AnimationTreeEditor::get_singleton()->get_base_path() + "blend_position";
@@ -64,20 +59,12 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 
 	Ref<InputEventKey> k = p_event;
 
-	if (k.is_valid() && k->is_pressed() && !k->is_echo()) {
-		if (k->get_keycode() == Key::ESCAPE && editing_point != -1) {
-			_cancel_inline_edit();
-			accept_event();
-			return;
-		}
-
-		if (tool_select->is_pressed() && k->get_keycode() == Key::KEY_DELETE) {
-			if (selected_point != -1) {
-				if (!read_only) {
-					_erase_selected();
-				}
-				accept_event();
+	if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == Key::KEY_DELETE && !k->is_echo()) {
+		if (selected_point != -1) {
+			if (!read_only) {
+				_erase_selected();
 			}
+			accept_event();
 		}
 	}
 
@@ -90,12 +77,15 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 			animations_to_add.clear();
 
 			LocalVector<StringName> classes;
-			ClassDB::get_inheriters_from_class(SNAME("AnimationRootNode"), classes);
+			ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 			classes.sort_custom<StringName::AlphCompare>();
 
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
 
-			for (const StringName &E : tree->get_sorted_animation_list()) {
+			List<StringName> names;
+			tree->get_animation_list(&names);
+
+			for (const StringName &E : names) {
 				animations_menu->add_icon_item(get_editor_theme_icon(SNAME("Animation")), E);
 				animations_to_add.push_back(E);
 			}
@@ -137,26 +127,16 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 		blend_space_draw->queue_redraw(); // why not
 
 		// try to see if a point can be selected
-		_set_selected_point(-1);
+		selected_point = -1;
+		_update_tool_erase();
 
-		// Check if clicking on text areas first.
-		for (int i = 0; i < text_rects.size(); i++) {
-			if (text_rects[i].has_point(mb->get_position())) {
-				_set_selected_point(i);
-
-				dragging_selected_attempt = true;
-				drag_from = mb->get_position();
-				_update_edited_point_name();
-				return;
-			}
-		}
-
-		// Then check point positions.
 		for (int i = 0; i < points.size(); i++) {
 			if (Math::abs(float(points[i] - mb->get_position().x)) < 10 * EDSCALE) {
-				_set_selected_point(i);
+				selected_point = i;
 
 				Ref<AnimationNode> node = blend_space->get_blend_point_node(i);
+				EditorNode::get_singleton()->push_item(node.ptr(), "", true);
+
 				if (mb->is_double_click() && AnimationTreeEditor::get_singleton()->can_edit(node)) {
 					_open_editor();
 					return;
@@ -164,24 +144,19 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 
 				dragging_selected_attempt = true;
 				drag_from = mb->get_position();
-				_update_edited_point_name();
+				_update_tool_erase();
+				_update_edited_point_pos();
 				return;
 			}
 		}
+
+		// If no point was selected, select host BlendSpace1D node.
+		if (selected_point == -1) {
+			EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
+		}
 	}
 
 	if (mb.is_valid() && !mb->is_pressed() && dragging_selected_attempt && mb->get_button_index() == MouseButton::LEFT) {
-		// Check if releasing over text without any dragging - if so, start text editing instead.
-		if (!read_only && !dragging_selected) {
-			for (int i = 0; i < text_rects.size(); i++) {
-				if (text_rects[i].has_point(mb->get_position())) {
-					_start_inline_edit(i);
-					dragging_selected_attempt = false;
-					return;
-				}
-			}
-		}
-
 		if (!read_only) {
 			if (dragging_selected) {
 				// move
@@ -191,11 +166,10 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 				if (snap->is_pressed()) {
 					point = Math::snapped(point, blend_space->get_snap());
 				}
-				point = CLAMP(point, blend_space->get_min_space(), blend_space->get_max_space());
 
 				updating = true;
 				EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-				undo_redo->create_action(TTR("Move BlendSpace1D Node Point"));
+				undo_redo->create_action(TTR("Move Node Point"));
 				undo_redo->add_do_method(blend_space.ptr(), "set_blend_point_position", selected_point, point);
 				undo_redo->add_undo_method(blend_space.ptr(), "set_blend_point_position", selected_point, blend_space->get_blend_point_position(selected_point));
 				undo_redo->add_do_method(this, "_update_space");
@@ -246,28 +220,6 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 
 		blend_space_draw->queue_redraw();
 	}
-
-	// Handle mousewheel for reordering points.
-	Ref<InputEventMouseButton> mw = p_event;
-	if (mw.is_valid() && mw->is_pressed() && (mw->get_button_index() == MouseButton::WHEEL_UP || mw->get_button_index() == MouseButton::WHEEL_DOWN)) {
-		if (!read_only && tool_select->is_pressed()) {
-			int hovered_point = -1;
-			for (int i = 0; i < points.size(); i++) {
-				if (Math::abs(float(points[i] - mw->get_position().x)) < 10 * EDSCALE) {
-					hovered_point = i;
-					break;
-				}
-			}
-
-			if (hovered_point != -1) {
-				int direction = (mw->get_button_index() == MouseButton::WHEEL_DOWN) ? -1 : 1;
-				int new_index = hovered_point + direction;
-				_set_selected_point(hovered_point);
-				_edit_point_index(new_index);
-				accept_event();
-			}
-		}
-	}
 }
 
 void AnimationNodeBlendSpace1DEditor::_blend_space_draw() {
@@ -276,9 +228,6 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_draw() {
 		return;
 	}
 
-	// Clear text rectangles for fresh click detection.
-	text_rects.clear();
-
 	Color linecolor = get_theme_color(SceneStringName(font_color), SNAME("Label"));
 	Color linecolor_soft = linecolor;
 	linecolor_soft.a *= 0.5;
@@ -297,7 +246,7 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_draw() {
 
 	blend_space_draw->draw_line(Point2(1, s.height - 1), Point2(s.width - 1, s.height - 1), linecolor, Math::round(EDSCALE));
 
-	if (blend_space->get_min_space() <= 0 && blend_space->get_max_space() >= 0) {
+	if (blend_space->get_min_space() < 0) {
 		float point = 0.0;
 		point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
 		point *= s.width;
@@ -315,7 +264,7 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_draw() {
 		if (blend_space->get_snap() > 0) {
 			int prev_idx = -1;
 
-			for (int i = 0; i <= s.x; i++) {
+			for (int i = 0; i < s.x; i++) {
 				float v = blend_space->get_min_space() + i * (blend_space->get_max_space() - blend_space->get_min_space()) / s.x;
 				int idx = int(v / blend_space->get_snap());
 
@@ -332,34 +281,31 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_draw() {
 
 	for (int i = 0; i < blend_space->get_blend_point_count(); i++) {
 		float point = blend_space->get_blend_point_position(i);
-		if (!read_only && dragging_selected && selected_point == i) {
-			point += drag_ofs.x;
-			if (snap->is_pressed()) {
-				point = Math::snapped(point, blend_space->get_snap());
+
+		if (!read_only) {
+			if (dragging_selected && selected_point == i) {
+				point += drag_ofs.x;
+				if (snap->is_pressed()) {
+					point = Math::snapped(point, blend_space->get_snap());
+				}
 			}
-			point = CLAMP(point, blend_space->get_min_space(), blend_space->get_max_space());
 		}
 
 		point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
 		point *= s.width;
+
 		points.push_back(point);
 
-		Vector2 gui_point = (Vector2(point, s.height / 2.0) - icon->get_size() / 2.0).floor();
-		blend_space_draw->draw_texture(i == selected_point ? icon_selected : icon, gui_point);
+		Vector2 gui_point = Vector2(point, s.height / 2.0);
 
-		if (point >= 0.0 && point <= s.width && editing_point != i) {
-			String name_text = show_indices ? itos(i) : String(blend_space->get_blend_point_name(i));
-			Vector2 text_size = font->get_string_size(name_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-			Vector2 text_pos = Vector2(CLAMP(point - text_size.x / 2.0, 0, s.width - text_size.x), gui_point.y - 4 * EDSCALE);
+		gui_point -= (icon->get_size() / 2.0);
 
-			Color name_color = i == selected_point ? get_theme_color(SNAME("accent_color"), EditorStringName(Editor)) : linecolor;
-			blend_space_draw->draw_string(font, text_pos, name_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, name_color);
+		gui_point = gui_point.floor();
 
-			if (text_rects.size() <= i) {
-				text_rects.resize(i + 1);
-			}
-
-			text_rects.write[i] = Rect2(Vector2(text_pos.x, text_pos.y - font->get_ascent(font_size)), text_size);
+		if (i == selected_point) {
+			blend_space_draw->draw_texture(icon_selected, gui_point);
+		} else {
+			blend_space_draw->draw_texture(icon, gui_point);
 		}
 	}
 
@@ -417,11 +363,6 @@ void AnimationNodeBlendSpace1DEditor::_config_changed(double) {
 	}
 
 	updating = true;
-
-	constexpr double STEP_UNIT = 0.01;
-	min_value->set_max(max_value->get_value() - STEP_UNIT);
-	max_value->set_min(min_value->get_value() + STEP_UNIT);
-
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Change BlendSpace1D Config"));
 	undo_redo->add_do_method(blend_space.ptr(), "set_max_space", max_value->get_value());
@@ -471,19 +412,6 @@ void AnimationNodeBlendSpace1DEditor::_file_opened(const String &p_file) {
 	}
 }
 
-String AnimationNodeBlendSpace1DEditor::_get_safe_name(const Ref<AnimationNodeBlendSpace1D> &p_blend_space, const String &p_name) {
-	String final_name = p_name;
-
-	// Append a number suffix if there's a naming conflict.
-	int suffix = 1;
-	while (p_blend_space->find_blend_point_by_name(final_name) != -1) {
-		suffix++;
-		final_name = p_name + " " + itos(suffix);
-	}
-
-	return final_name;
-}
-
 void AnimationNodeBlendSpace1DEditor::_add_menu_type(int p_index) {
 	Ref<AnimationRootNode> node;
 	if (p_index == MENU_LOAD_FILE) {
@@ -519,7 +447,7 @@ void AnimationNodeBlendSpace1DEditor::_add_menu_type(int p_index) {
 	updating = true;
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Add Node Point"));
-	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", node, add_point_pos, -1, _get_safe_name(blend_space, node->get_class().replace_first("AnimationNode", "")));
+	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", node, add_point_pos);
 	undo_redo->add_undo_method(blend_space.ptr(), "remove_blend_point", blend_space->get_blend_point_count());
 	undo_redo->add_do_method(this, "_update_space");
 	undo_redo->add_undo_method(this, "_update_space");
@@ -538,7 +466,7 @@ void AnimationNodeBlendSpace1DEditor::_add_animation_type(int p_index) {
 	updating = true;
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Add Animation Point"));
-	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", anim, add_point_pos, -1, _get_safe_name(blend_space, String(animations_to_add[p_index]).validate_node_name()));
+	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", anim, add_point_pos);
 	undo_redo->add_undo_method(blend_space.ptr(), "remove_blend_point", blend_space->get_blend_point_count());
 	undo_redo->add_do_method(this, "_update_space");
 	undo_redo->add_undo_method(this, "_update_space");
@@ -575,24 +503,14 @@ void AnimationNodeBlendSpace1DEditor::_update_edited_point_pos() {
 			if (snap->is_pressed()) {
 				pos = Math::snapped(pos, blend_space->get_snap());
 			}
-			pos = CLAMP(pos, blend_space->get_min_space(), blend_space->get_max_space());
 		}
 
 		updating = true;
 		edit_value->set_value(pos);
-		index_edit->set_max(blend_space->get_blend_point_count() - 1);
-		index_edit->set_value(selected_point);
-		index_edit->set_editable(blend_space->get_blend_point_count() > 1 && !read_only);
 		updating = false;
 	}
 }
 
-void AnimationNodeBlendSpace1DEditor::_update_edited_point_name() {
-	if (updating) {
-		return;
-	}
-}
-
 void AnimationNodeBlendSpace1DEditor::_update_tool_erase() {
 	bool point_valid = selected_point >= 0 && selected_point < blend_space->get_blend_point_count();
 	tool_erase->set_disabled(!point_valid || read_only);
@@ -602,10 +520,8 @@ void AnimationNodeBlendSpace1DEditor::_update_tool_erase() {
 
 		if (AnimationTreeEditor::get_singleton()->can_edit(an)) {
 			open_editor->show();
-			open_editor_sep->show();
 		} else {
 			open_editor->hide();
-			open_editor_sep->hide();
 		}
 
 		if (!read_only) {
@@ -622,21 +538,19 @@ void AnimationNodeBlendSpace1DEditor::_erase_selected() {
 	if (selected_point != -1) {
 		updating = true;
 
-		Ref<AnimationRootNode> node = blend_space->get_blend_point_node(selected_point);
-		float position = blend_space->get_blend_point_position(selected_point);
-		String point_name = blend_space->get_blend_point_name(selected_point);
-
 		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 		undo_redo->create_action(TTR("Remove BlendSpace1D Point"));
 		undo_redo->add_do_method(blend_space.ptr(), "remove_blend_point", selected_point);
-		undo_redo->add_undo_method(blend_space.ptr(), "add_blend_point", node, position, selected_point, point_name);
+		undo_redo->add_undo_method(blend_space.ptr(), "add_blend_point", blend_space->get_blend_point_node(selected_point), blend_space->get_blend_point_position(selected_point), selected_point);
 		undo_redo->add_do_method(this, "_update_space");
 		undo_redo->add_undo_method(this, "_update_space");
 		undo_redo->commit_action();
 
-		_set_selected_point(-1);
+		// Return selection to host BlendSpace1D node.
+		EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
 
 		updating = false;
+		_update_tool_erase();
 
 		blend_space_draw->queue_redraw();
 	}
@@ -662,77 +576,11 @@ void AnimationNodeBlendSpace1DEditor::_edit_point_pos(double) {
 	blend_space_draw->queue_redraw();
 }
 
-void AnimationNodeBlendSpace1DEditor::_edit_point_index(double p_index) {
-	if (updating || selected_point < 0 || selected_point >= blend_space->get_blend_point_count()) {
-		return;
-	}
-
-	int new_index = (int)p_index;
-	if (new_index < 0 || new_index >= blend_space->get_blend_point_count() || new_index == selected_point) {
-		return;
-	}
-
-	updating = true;
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Reorder BlendSpace1D Point Index"));
-	undo_redo->add_do_method(blend_space.ptr(), "reorder_blend_point", selected_point, new_index);
-	undo_redo->add_undo_method(blend_space.ptr(), "reorder_blend_point", new_index, selected_point);
-	undo_redo->add_do_method(this, "_update_space");
-	undo_redo->add_undo_method(this, "_update_space");
-	undo_redo->add_do_method(this, "_set_selected_point", new_index);
-	undo_redo->add_undo_method(this, "_set_selected_point", selected_point);
-	undo_redo->add_do_method(this, "_show_indices_with_cooldown");
-	undo_redo->add_undo_method(this, "_show_indices_with_cooldown");
-	undo_redo->commit_action();
-	updating = false;
-
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace1DEditor::_set_selected_point(int p_index) {
-	selected_point = p_index;
-	_update_tool_erase();
-	if (p_index != -1) {
-		_update_edited_point_pos();
-		Ref<AnimationNode> node = blend_space->get_blend_point_node(p_index);
-		EditorNode::get_singleton()->push_item(node.ptr(), "", true);
-	} else {
-		// Return selection to host BlendSpace1D node.
-		EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
-	}
-}
-
-void AnimationNodeBlendSpace1DEditor::_edit_point_name(const String &p_name) {
-	if (updating || selected_point == -1 || p_name.is_empty()) {
-		return;
-	}
-
-	String old_name = blend_space->get_blend_point_name(selected_point);
-	if (p_name == old_name) {
-		return;
-	}
-	String safe_name = _get_safe_name(blend_space, p_name);
-
-	updating = true;
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Change BlendSpace1D Point Name"));
-	undo_redo->add_do_method(blend_space.ptr(), "set_blend_point_name", selected_point, safe_name);
-	undo_redo->add_undo_method(blend_space.ptr(), "set_blend_point_name", selected_point, old_name);
-	undo_redo->add_do_method(this, "_update_space");
-	undo_redo->add_undo_method(this, "_update_space");
-	undo_redo->add_do_method(this, "_update_edited_point_name");
-	undo_redo->add_undo_method(this, "_update_edited_point_name");
-	undo_redo->commit_action();
-	updating = false;
-
-	blend_space_draw->queue_redraw();
-}
-
 void AnimationNodeBlendSpace1DEditor::_open_editor() {
 	if (selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) {
 		Ref<AnimationNode> an = blend_space->get_blend_point_node(selected_point);
 		ERR_FAIL_COND(an.is_null());
-		AnimationTreeEditor::get_singleton()->enter_editor(blend_space->get_blend_point_name(selected_point));
+		AnimationTreeEditor::get_singleton()->enter_editor(itos(selected_point));
 	}
 }
 
@@ -740,7 +588,7 @@ void AnimationNodeBlendSpace1DEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			error_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
-			error_label->add_theme_color_override(SNAME("default_color"), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
+			error_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
 			panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
 			tool_blend->set_button_icon(get_editor_theme_icon(SNAME("EditPivot")));
 			tool_select->set_button_icon(get_editor_theme_icon(SNAME("ToolSelect")));
@@ -760,7 +608,18 @@ void AnimationNodeBlendSpace1DEditor::_notification(int p_what) {
 				return;
 			}
 
-			update_error_message(tree, error_panel, error_label);
+			String error;
+
+			error = tree->get_editor_error_message();
+
+			if (error != error_label->get_text()) {
+				error_label->set_text(error);
+				if (!error.is_empty()) {
+					error_panel->show();
+				} else {
+					error_panel->hide();
+				}
+			}
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -774,9 +633,6 @@ void AnimationNodeBlendSpace1DEditor::_bind_methods() {
 	ClassDB::bind_method("_update_tool_erase", &AnimationNodeBlendSpace1DEditor::_update_tool_erase);
 
 	ClassDB::bind_method("_update_edited_point_pos", &AnimationNodeBlendSpace1DEditor::_update_edited_point_pos);
-	ClassDB::bind_method("_update_edited_point_name", &AnimationNodeBlendSpace1DEditor::_update_edited_point_name);
-	ClassDB::bind_method("_set_selected_point", &AnimationNodeBlendSpace1DEditor::_set_selected_point);
-	ClassDB::bind_method("_show_indices_with_cooldown", &AnimationNodeBlendSpace1DEditor::_show_indices_with_cooldown);
 }
 
 bool AnimationNodeBlendSpace1DEditor::can_edit(const Ref<AnimationNode> &p_node) {
@@ -796,7 +652,6 @@ void AnimationNodeBlendSpace1DEditor::edit(const Ref<AnimationNode> &p_node) {
 
 	tool_create->set_disabled(read_only);
 	edit_value->set_editable(!read_only);
-	index_edit->set_editable(!read_only);
 	label_value->set_editable(!read_only);
 	min_value->set_editable(!read_only);
 	max_value->set_editable(!read_only);
@@ -804,133 +659,6 @@ void AnimationNodeBlendSpace1DEditor::edit(const Ref<AnimationNode> &p_node) {
 	interpolation->set_disabled(read_only);
 }
 
-void AnimationNodeBlendSpace1DEditor::_start_inline_edit(int p_point) {
-	if (editing_point != -1 || p_point < 0 || p_point >= blend_space->get_blend_point_count()) {
-		return;
-	}
-
-	editing_point = p_point;
-	_set_selected_point(p_point);
-
-	inline_editor = memnew(LineEdit);
-	blend_space_draw->add_child(inline_editor);
-
-	inline_editor->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-	inline_editor->add_theme_color_override("font_selected_color", Color::named("white"));
-	inline_editor->add_theme_color_override("selection_color", get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-	Ref<StyleBoxEmpty> empty_style = memnew(StyleBoxEmpty);
-	empty_style->set_content_margin_all(0);
-	inline_editor->add_theme_style_override(CoreStringName(normal), empty_style);
-	inline_editor->add_theme_style_override("focus", memnew(StyleBoxEmpty));
-	inline_editor->add_theme_style_override("read_only", memnew(StyleBoxEmpty));
-	inline_editor->add_theme_constant_override("minimum_character_width", 0);
-	inline_editor->set_flat(true);
-
-	inline_editor->set_text(blend_space->get_blend_point_name(p_point));
-	inline_editor->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	inline_editor->set_expand_to_text_length_enabled(true);
-
-	if (p_point < text_rects.size() && p_point < points.size()) {
-		Rect2 text_rect = text_rects[p_point];
-
-		inline_editor_point_x = points[p_point];
-
-		float editor_width = text_rect.size.x;
-		inline_editor->set_size(Vector2(editor_width, text_rect.size.y));
-
-		Size2 s = blend_space_draw->get_size();
-
-		float editor_x = inline_editor_point_x - editor_width / 2.0;
-		editor_x = CLAMP(editor_x, 0.0f, s.width - editor_width);
-		inline_editor->set_position(Vector2(editor_x, text_rect.position.y - 1 * EDSCALE));
-	}
-
-	inline_editor->connect(SceneStringName(text_changed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_inline_editor_text_changed));
-	inline_editor->connect(SceneStringName(text_submitted), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_finish_inline_edit_with_text));
-	inline_editor->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_finish_inline_edit));
-
-	inline_editor->grab_focus();
-	inline_editor->select_all();
-
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace1DEditor::_finish_inline_edit() {
-	if (editing_point == -1 || !inline_editor) {
-		return;
-	}
-
-	String new_name = inline_editor->get_text();
-	_edit_point_name(new_name);
-
-	_cancel_inline_edit();
-}
-
-void AnimationNodeBlendSpace1DEditor::_finish_inline_edit_with_text(const String &p_text) {
-	if (editing_point == -1 || !inline_editor) {
-		return;
-	}
-
-	_edit_point_name(p_text);
-
-	_cancel_inline_edit();
-}
-
-void AnimationNodeBlendSpace1DEditor::_cancel_inline_edit() {
-	if (inline_editor) {
-		inline_editor->queue_free();
-		inline_editor = nullptr;
-	}
-	editing_point = -1;
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace1DEditor::_inline_editor_text_changed(const String &p_text) {
-	if (!inline_editor) {
-		return;
-	}
-
-	inline_editor->set_size(Vector2(0, inline_editor->get_size().y));
-
-	Vector2 editor_size = inline_editor->get_size();
-	Size2 s = blend_space_draw->get_size();
-
-	float editor_x = inline_editor_point_x - editor_size.x / 2.0;
-	editor_x = CLAMP(editor_x, 0.0f, s.width - editor_size.x);
-
-	inline_editor->set_position(Vector2(editor_x, inline_editor->get_position().y));
-}
-
-void AnimationNodeBlendSpace1DEditor::_index_edit_focus_entered() {
-	if (index_focus_cooldown_timer->is_stopped() == false) {
-		index_focus_cooldown_timer->stop();
-	}
-	index_edit_has_focus = true;
-	show_indices = true;
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace1DEditor::_index_edit_focus_exited() {
-	index_edit_has_focus = false;
-	index_focus_cooldown_timer->start();
-}
-
-void AnimationNodeBlendSpace1DEditor::_index_focus_cooldown_timeout() {
-	if (!index_edit_has_focus) {
-		show_indices = false;
-		blend_space_draw->queue_redraw();
-	}
-}
-
-void AnimationNodeBlendSpace1DEditor::_show_indices_with_cooldown() {
-	if (index_focus_cooldown_timer->is_stopped() == false) {
-		index_focus_cooldown_timer->stop();
-	}
-	show_indices = true;
-	index_focus_cooldown_timer->start();
-	blend_space_draw->queue_redraw();
-}
-
 AnimationNodeBlendSpace1DEditor *AnimationNodeBlendSpace1DEditor::singleton = nullptr;
 
 AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
@@ -948,7 +676,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	tool_select->set_button_group(bg);
 	top_hb->add_child(tool_select);
 	tool_select->set_pressed(true);
-	tool_select->set_tooltip_text(TTR("Select and move points.\nRMB: Create point at position clicked.\nShift+LMB+Drag: Set the blending position within the space.\nScroll: Increment or decrement index."));
+	tool_select->set_tooltip_text(TTR("Select and move points.\nRMB: Create point at position clicked.\nShift+LMB+Drag: Set the blending position within the space."));
 	tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(0));
 
 	tool_create = memnew(Button);
@@ -993,60 +721,38 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	snap_value->set_accessibility_name(TTRC("Grid Step"));
 
 	top_hb->add_child(memnew(VSeparator));
-	top_hb->add_child(memnew(Label(TTR("Sync"))));
+	top_hb->add_child(memnew(Label(TTR("Sync:"))));
 	sync = memnew(CheckBox);
 	top_hb->add_child(sync);
 	sync->connect(SceneStringName(toggled), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_config_changed));
 
 	top_hb->add_child(memnew(VSeparator));
 
-	top_hb->add_child(memnew(Label(TTR("Blend"))));
+	top_hb->add_child(memnew(Label(TTR("Blend:"))));
 	interpolation = memnew(OptionButton);
 	top_hb->add_child(interpolation);
 	interpolation->connect(SceneStringName(item_selected), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_config_changed));
 
-	top_hb->add_spacer();
-
 	edit_hb = memnew(HBoxContainer);
 	top_hb->add_child(edit_hb);
+	edit_hb->add_child(memnew(VSeparator));
+	edit_hb->add_child(memnew(Label(TTR("Point"))));
+
+	edit_value = memnew(SpinBox);
+	edit_hb->add_child(edit_value);
+	edit_value->set_min(-1000);
+	edit_value->set_max(1000);
+	edit_value->set_step(0.01);
+	edit_value->set_accessibility_name(TTRC("Blend Value"));
+	edit_value->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_edit_point_pos));
 
 	open_editor = memnew(Button);
 	edit_hb->add_child(open_editor);
 	open_editor->set_text(TTR("Open Editor"));
 	open_editor->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_open_editor), CONNECT_DEFERRED);
-	open_editor_sep = memnew(VSeparator);
-	edit_hb->add_child(open_editor_sep);
-
-	edit_hb->add_child(memnew(Label(TTR("Index"))));
-	index_edit = memnew(SpinBox);
-	edit_hb->add_child(index_edit);
-	index_edit->set_min(0);
-	index_edit->set_step(1);
-	index_edit->set_allow_greater(false);
-	index_edit->set_allow_lesser(false);
-	index_edit->set_accessibility_name(TTRC("Blend Point Index"));
-	index_edit->set_tooltip_text(TTR("Index of the blend point.\nValues outside of the valid range will be clamped to the nearest index."));
-	index_edit->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_edit_point_index));
-	index_edit->get_line_edit()->connect(SceneStringName(focus_entered), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_index_edit_focus_entered));
-	index_edit->get_line_edit()->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_index_edit_focus_exited));
-
-	edit_hb->add_child(memnew(VSeparator));
-
-	constexpr double STEP_UNIT = 0.01;
-	constexpr double ABS_MAX = 10000;
-
-	edit_hb->add_child(memnew(Label(TTR("Position"))));
-	edit_value = memnew(SpinBox);
-	edit_hb->add_child(edit_value);
-	edit_value->set_min(-ABS_MAX);
-	edit_value->set_max(ABS_MAX);
-	edit_value->set_step(STEP_UNIT);
-	edit_value->set_accessibility_name(TTRC("Blend Value"));
-	edit_value->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_edit_point_pos));
 
 	edit_hb->hide();
 	open_editor->hide();
-	open_editor_sep->hide();
 
 	VBoxContainer *main_vb = memnew(VBoxContainer);
 	add_child(main_vb);
@@ -1071,15 +777,15 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 		bottom_hb->set_h_size_flags(SIZE_EXPAND_FILL);
 
 		min_value = memnew(SpinBox);
-		min_value->set_min(-ABS_MAX);
-		min_value->set_max(ABS_MAX - STEP_UNIT);
-		min_value->set_step(STEP_UNIT);
+		min_value->set_min(-10000);
+		min_value->set_max(0);
+		min_value->set_step(0.01);
 		min_value->set_accessibility_name(TTRC("Min"));
 
 		max_value = memnew(SpinBox);
-		max_value->set_min(-ABS_MAX + STEP_UNIT);
-		max_value->set_max(ABS_MAX);
-		max_value->set_step(STEP_UNIT);
+		max_value->set_min(0.01);
+		max_value->set_max(10000);
+		max_value->set_step(0.01);
 		max_value->set_accessibility_name(TTRC("Max"));
 
 		label_value = memnew(LineEdit);
@@ -1103,7 +809,8 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	error_panel = memnew(PanelContainer);
 	add_child(error_panel);
 
-	error_label = create_error_label_node();
+	error_label = memnew(Label);
+	error_label->set_focus_mode(FOCUS_ACCESSIBILITY);
 	error_panel->add_child(error_label);
 	error_panel->hide();
 
@@ -1122,12 +829,5 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	open_file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	open_file->connect("file_selected", callable_mp(this, &AnimationNodeBlendSpace1DEditor::_file_opened));
 
-	// Create timer for index focus cooldown (1.5 seconds).
-	index_focus_cooldown_timer = memnew(Timer);
-	add_child(index_focus_cooldown_timer);
-	index_focus_cooldown_timer->set_wait_time(1.5);
-	index_focus_cooldown_timer->set_one_shot(true);
-	index_focus_cooldown_timer->connect("timeout", callable_mp(this, &AnimationNodeBlendSpace1DEditor::_index_focus_cooldown_timeout));
-
 	set_custom_minimum_size(Size2(0, 150 * EDSCALE));
 }
diff --git a/engine/editor/animation/animation_blend_space_1d_editor.h b/engine/editor/animation/animation_blend_space_1d_editor.h
index dbc82992..6b7778d0 100644
--- a/engine/editor/animation/animation_blend_space_1d_editor.h
+++ b/engine/editor/animation/animation_blend_space_1d_editor.h
@@ -41,7 +41,6 @@ class LineEdit;
 class OptionButton;
 class PanelContainer;
 class SpinBox;
-class Timer;
 class VSeparator;
 
 class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
@@ -69,15 +68,13 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 	HBoxContainer *edit_hb = nullptr;
 	SpinBox *edit_value = nullptr;
 	Button *open_editor = nullptr;
-	VSeparator *open_editor_sep = nullptr;
-	SpinBox *index_edit = nullptr;
 
 	int selected_point = -1;
 
 	Control *blend_space_draw = nullptr;
 
 	PanelContainer *error_panel = nullptr;
-	RichTextLabel *error_label = nullptr;
+	Label *error_label = nullptr;
 
 	bool updating = false;
 
@@ -94,7 +91,7 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 
 	PopupMenu *menu = nullptr;
 	PopupMenu *animations_menu = nullptr;
-	Vector<StringName> animations_to_add;
+	Vector<String> animations_to_add;
 	float add_point_pos = 0.0f;
 	Vector<real_t> points;
 
@@ -104,36 +101,15 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 	Vector2 drag_from;
 	Vector2 drag_ofs;
 
-	Vector<Rect2> text_rects;
-	int editing_point = -1;
-	LineEdit *inline_editor = nullptr;
-	float inline_editor_point_x = 0.0f;
-	bool index_edit_has_focus = false;
-	bool show_indices = false;
-	Timer *index_focus_cooldown_timer = nullptr;
-
 	void _add_menu_type(int p_index);
 	void _add_animation_type(int p_index);
 
 	void _tool_switch(int p_tool);
 	void _update_edited_point_pos();
-	void _update_edited_point_name();
 	void _update_tool_erase();
 	void _erase_selected();
 	void _edit_point_pos(double);
-	void _edit_point_name(const String &p_name);
-	void _edit_point_index(double p_index);
-	void _set_selected_point(int p_index);
-	void _start_inline_edit(int p_point);
-	void _finish_inline_edit();
-	void _finish_inline_edit_with_text(const String &p_text);
-	void _cancel_inline_edit();
-	void _inline_editor_text_changed(const String &p_text);
 	void _open_editor();
-	void _index_edit_focus_entered();
-	void _index_edit_focus_exited();
-	void _index_focus_cooldown_timeout();
-	void _show_indices_with_cooldown();
 
 	EditorFileDialog *open_file = nullptr;
 	Ref<AnimationNode> file_loaded;
@@ -146,7 +122,6 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 	};
 
 	StringName get_blend_position_path() const;
-	String _get_safe_name(const Ref<AnimationNodeBlendSpace1D> &p_blend_space, const String &p_name);
 
 protected:
 	void _notification(int p_what);
@@ -154,7 +129,6 @@ protected:
 
 public:
 	static AnimationNodeBlendSpace1DEditor *get_singleton() { return singleton; }
-	void refresh_editor() { _update_space(); }
 	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
 	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace1DEditor();
diff --git a/engine/editor/animation/animation_blend_space_2d_editor.cpp b/engine/editor/animation/animation_blend_space_2d_editor.cpp
index f5f25b24..807188c1 100644
--- a/engine/editor/animation/animation_blend_space_2d_editor.cpp
+++ b/engine/editor/animation/animation_blend_space_2d_editor.cpp
@@ -32,8 +32,6 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -42,16 +40,17 @@
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
+#include "scene/animation/animation_player.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
-#include "scene/main/timer.h"
 #include "scene/main/window.h"
 
 bool AnimationNodeBlendSpace2DEditor::can_edit(const Ref<AnimationNode> &p_node) {
@@ -86,7 +85,6 @@ void AnimationNodeBlendSpace2DEditor::edit(const Ref<AnimationNode> &p_node) {
 	label_y->set_editable(!read_only);
 	edit_x->set_editable(!read_only);
 	edit_y->set_editable(!read_only);
-	index_edit->set_editable(!read_only);
 	tool_triangle->set_disabled(read_only);
 	auto_triangles->set_disabled(read_only);
 	sync->set_disabled(read_only);
@@ -105,20 +103,12 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 	}
 
 	Ref<InputEventKey> k = p_event;
-	if (k.is_valid() && k->is_pressed() && !k->is_echo()) {
-		if (k->get_keycode() == Key::ESCAPE && editing_point != -1) {
-			_cancel_inline_edit();
-			accept_event();
-			return;
-		}
-
-		if (tool_select->is_pressed() && k->get_keycode() == Key::KEY_DELETE) {
-			if (selected_point != -1 || selected_triangle != -1) {
-				if (!read_only) {
-					_erase_selected();
-				}
-				accept_event();
+	if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == Key::KEY_DELETE && !k->is_echo()) {
+		if (selected_point != -1 || selected_triangle != -1) {
+			if (!read_only) {
+				_erase_selected();
 			}
+			accept_event();
 		}
 	}
 
@@ -136,7 +126,9 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
 
-			for (const StringName &E : tree->get_sorted_animation_list()) {
+			List<StringName> names;
+			tree->get_animation_list(&names);
+			for (const StringName &E : names) {
 				animations_menu->add_icon_item(get_editor_theme_icon(SNAME("Animation")), E);
 				animations_to_add.push_back(E);
 			}
@@ -175,28 +167,17 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 
 	if (mb.is_valid() && mb->is_pressed() && tool_select->is_pressed() && !mb->is_shift_pressed() && !mb->is_command_or_control_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		blend_space_draw->queue_redraw(); //update anyway
-
 		//try to see if a point can be selected
-		_set_selected_point(-1);
+		selected_point = -1;
 		selected_triangle = -1;
+		_update_tool_erase();
 
-		// Check if clicking on text areas first.
-		for (int i = 0; i < text_rects.size(); i++) {
-			if (text_rects[i].has_point(mb->get_position())) {
-				_set_selected_point(i);
-				dragging_selected_attempt = true;
-				drag_from = mb->get_position();
-				_update_edited_point_name();
-				return;
-			}
-		}
-
-		// Then check point positions.
 		for (int i = 0; i < points.size(); i++) {
 			if (points[i].distance_to(mb->get_position()) < 10 * EDSCALE) {
-				_set_selected_point(i);
-
+				selected_point = i;
 				Ref<AnimationNode> node = blend_space->get_blend_point_node(i);
+				EditorNode::get_singleton()->push_item(node.ptr(), "", true);
+
 				if (mb->is_double_click() && AnimationTreeEditor::get_singleton()->can_edit(node)) {
 					_open_editor();
 					return;
@@ -204,7 +185,8 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 
 				dragging_selected_attempt = true;
 				drag_from = mb->get_position();
-				_update_edited_point_name();
+				_update_tool_erase();
+				_update_edited_point_pos();
 				return;
 			}
 		}
@@ -227,12 +209,17 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 				}
 			}
 		}
+
+		// If no point or triangle was selected, select host BlendSpace2D node.
+		if (selected_point == -1 && selected_triangle == -1) {
+			EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
+		}
 	}
 
 	if (mb.is_valid() && mb->is_pressed() && tool_triangle->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		blend_space_draw->queue_redraw(); //update anyway
 		//try to see if a point can be selected
-		_set_selected_point(-1);
+		selected_point = -1;
 
 		for (int i = 0; i < points.size(); i++) {
 			if (making_triangle.has(i)) {
@@ -266,17 +253,6 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 	}
 
 	if (mb.is_valid() && !mb->is_pressed() && dragging_selected_attempt && mb->get_button_index() == MouseButton::LEFT) {
-		// Check if releasing over text without actual dragging - if so, start text editing instead.
-		if (!read_only && !dragging_selected) {
-			for (int i = 0; i < text_rects.size(); i++) {
-				if (text_rects[i].has_point(mb->get_position())) {
-					_start_inline_edit(i);
-					dragging_selected_attempt = false;
-					return;
-				}
-			}
-		}
-
 		if (dragging_selected) {
 			//move
 			Vector2 point = blend_space->get_blend_point_position(selected_point);
@@ -284,12 +260,11 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 			if (snap->is_pressed()) {
 				point = point.snapped(blend_space->get_snap());
 			}
-			point = point.clamp(blend_space->get_min_space(), blend_space->get_max_space());
 
 			if (!read_only) {
 				updating = true;
 				EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-				undo_redo->create_action(TTR("Move BlendSpace2D Node Point"));
+				undo_redo->create_action(TTR("Move Node Point"));
 				undo_redo->add_do_method(blend_space.ptr(), "set_blend_point_position", selected_point, point);
 				undo_redo->add_undo_method(blend_space.ptr(), "set_blend_point_position", selected_point, blend_space->get_blend_point_position(selected_point));
 				undo_redo->add_do_method(this, "_update_space");
@@ -351,29 +326,6 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 
 		blend_space_draw->queue_redraw();
 	}
-
-	// Handle mousewheel for reordering points.
-	Ref<InputEventMouseButton> mw = p_event;
-	if (mw.is_valid() && mw->is_pressed() && (mw->get_button_index() == MouseButton::WHEEL_UP || mw->get_button_index() == MouseButton::WHEEL_DOWN)) {
-		if (!read_only && tool_select->is_pressed()) {
-			// Check if hovering over a point.
-			int hovered_point = -1;
-			for (int i = 0; i < points.size(); i++) {
-				if (points[i].distance_to(mw->get_position()) < 10 * EDSCALE) {
-					hovered_point = i;
-					break;
-				}
-			}
-
-			if (hovered_point != -1) {
-				int direction = (mw->get_button_index() == MouseButton::WHEEL_DOWN) ? -1 : 1;
-				int new_index = hovered_point + direction;
-				_set_selected_point(hovered_point);
-				_edit_point_index(new_index);
-				accept_event();
-			}
-		}
-	}
 }
 
 void AnimationNodeBlendSpace2DEditor::_file_opened(const String &p_file) {
@@ -385,19 +337,6 @@ void AnimationNodeBlendSpace2DEditor::_file_opened(const String &p_file) {
 	}
 }
 
-String AnimationNodeBlendSpace2DEditor::_get_safe_name(const Ref<AnimationNodeBlendSpace2D> &p_blend_space, const String &p_name) {
-	String final_name = p_name;
-
-	// Append a number suffix if there's a naming conflict.
-	int suffix = 1;
-	while (p_blend_space->find_blend_point_by_name(final_name) != -1) {
-		suffix++;
-		final_name = p_name + " " + itos(suffix);
-	}
-
-	return final_name;
-}
-
 void AnimationNodeBlendSpace2DEditor::_add_menu_type(int p_index) {
 	Ref<AnimationRootNode> node;
 	if (p_index == MENU_LOAD_FILE) {
@@ -433,7 +372,7 @@ void AnimationNodeBlendSpace2DEditor::_add_menu_type(int p_index) {
 	updating = true;
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Add Node Point"));
-	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", node, add_point_pos, -1, _get_safe_name(blend_space, node->get_class().replace_first("AnimationNode", "")));
+	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", node, add_point_pos);
 	undo_redo->add_undo_method(blend_space.ptr(), "remove_blend_point", blend_space->get_blend_point_count());
 	undo_redo->add_do_method(this, "_update_space");
 	undo_redo->add_undo_method(this, "_update_space");
@@ -452,7 +391,7 @@ void AnimationNodeBlendSpace2DEditor::_add_animation_type(int p_index) {
 	updating = true;
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Add Animation Point"));
-	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", anim, add_point_pos, -1, _get_safe_name(blend_space, String(animations_to_add[p_index]).validate_node_name()));
+	undo_redo->add_do_method(blend_space.ptr(), "add_blend_point", anim, add_point_pos);
 	undo_redo->add_undo_method(blend_space.ptr(), "remove_blend_point", blend_space->get_blend_point_count());
 	undo_redo->add_do_method(this, "_update_space");
 	undo_redo->add_undo_method(this, "_update_space");
@@ -471,10 +410,8 @@ void AnimationNodeBlendSpace2DEditor::_update_tool_erase() {
 		Ref<AnimationNode> an = blend_space->get_blend_point_node(selected_point);
 		if (AnimationTreeEditor::get_singleton()->can_edit(an)) {
 			open_editor->show();
-			open_editor_sep->show();
 		} else {
 			open_editor->hide();
-			open_editor_sep->hide();
 		}
 		if (!read_only) {
 			edit_hb->show();
@@ -517,9 +454,6 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 		return;
 	}
 
-	// Clear text rectangles for fresh click detection.
-	text_rects.clear();
-
 	Color linecolor = get_theme_color(SceneStringName(font_color), SNAME("Label"));
 	Color linecolor_soft = linecolor;
 	linecolor_soft.a *= 0.5;
@@ -538,14 +472,14 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 	blend_space_draw->draw_line(Point2(1, s.height - 1), Point2(s.width - 1, s.height - 1), linecolor, Math::round(EDSCALE));
 
 	blend_space_draw->draw_line(Point2(0, 0), Point2(5 * EDSCALE, 0), linecolor, Math::round(EDSCALE));
-	if (blend_space->get_min_space().y <= 0 && blend_space->get_max_space().y >= 0) {
+	if (blend_space->get_min_space().y < 0) {
 		int y = (blend_space->get_max_space().y / (blend_space->get_max_space().y - blend_space->get_min_space().y)) * s.height;
 		blend_space_draw->draw_line(Point2(0, y), Point2(5 * EDSCALE, y), linecolor, Math::round(EDSCALE));
 		blend_space_draw->draw_string(font, Point2(2 * EDSCALE, y - font->get_height(font_size) + font->get_ascent(font_size)), "0", HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, linecolor);
 		blend_space_draw->draw_line(Point2(5 * EDSCALE, y), Point2(s.width, y), linecolor_soft, Math::round(EDSCALE));
 	}
 
-	if (blend_space->get_min_space().x <= 0 && blend_space->get_max_space().x >= 0) {
+	if (blend_space->get_min_space().x < 0) {
 		int x = (-blend_space->get_min_space().x / (blend_space->get_max_space().x - blend_space->get_min_space().x)) * s.width;
 		blend_space_draw->draw_line(Point2(x, s.height - 1), Point2(x, s.height - 5 * EDSCALE), linecolor, Math::round(EDSCALE));
 		blend_space_draw->draw_string(font, Point2(x + 2 * EDSCALE, s.height - 2 * EDSCALE - font->get_height(font_size) + font->get_ascent(font_size)), "0", HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, linecolor);
@@ -557,7 +491,7 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 
 		if (blend_space->get_snap().x > 0) {
 			int prev_idx = 0;
-			for (int i = 0; i <= s.x; i++) {
+			for (int i = 0; i < s.x; i++) {
 				float v = blend_space->get_min_space().x + i * (blend_space->get_max_space().x - blend_space->get_min_space().x) / s.x;
 				int idx = int(v / blend_space->get_snap().x);
 
@@ -571,7 +505,7 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 
 		if (blend_space->get_snap().y > 0) {
 			int prev_idx = 0;
-			for (int i = 0; i <= s.y; i++) {
+			for (int i = 0; i < s.y; i++) {
 				float v = blend_space->get_max_space().y - i * (blend_space->get_max_space().y - blend_space->get_min_space().y) / s.y;
 				int idx = int(v / blend_space->get_snap().y);
 
@@ -597,7 +531,6 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 				if (snap->is_pressed()) {
 					point = point.snapped(blend_space->get_snap());
 				}
-				point = point.clamp(blend_space->get_min_space(), blend_space->get_max_space());
 			}
 			point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
 			point *= s;
@@ -629,40 +562,26 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_draw() {
 	points.clear();
 	for (int i = 0; i < blend_space->get_blend_point_count(); i++) {
 		Vector2 point = blend_space->get_blend_point_position(i);
-		if (!read_only && dragging_selected && selected_point == i) {
-			point += drag_ofs;
-			if (snap->is_pressed()) {
-				point = point.snapped(blend_space->get_snap());
+		if (!read_only) {
+			if (dragging_selected && selected_point == i) {
+				point += drag_ofs;
+				if (snap->is_pressed()) {
+					point = point.snapped(blend_space->get_snap());
+				}
 			}
-			point = point.clamp(blend_space->get_min_space(), blend_space->get_max_space());
 		}
-
 		point = (point - blend_space->get_min_space()) / (blend_space->get_max_space() - blend_space->get_min_space());
 		point *= s;
 		point.y = s.height - point.y;
+
 		points.push_back(point);
+		point -= (icon->get_size() / 2);
+		point = point.floor();
 
-		Vector2 gui_point = (point - icon->get_size() / 2).floor();
-		blend_space_draw->draw_texture(i == selected_point ? icon_selected : icon, gui_point);
-
-		if (point.x >= 0.0 && point.x <= s.width && point.y >= 0.0 && point.y <= s.height && editing_point != i) {
-			String name_text = show_indices ? itos(i) : String(blend_space->get_blend_point_name(i));
-			Vector2 text_size = font->get_string_size(name_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-
-			float half_icon_h = icon->get_size().y / 2.0;
-			float above_pos_y = point.y - half_icon_h - 4 * EDSCALE;
-			float text_x = CLAMP(point.x - text_size.x / 2.0, 0, s.width - text_size.x);
-			float text_y = above_pos_y >= text_size.y ? above_pos_y : point.y + half_icon_h + font->get_ascent(font_size);
-			Vector2 text_pos = Vector2(text_x, text_y);
-
-			Color name_color = i == selected_point ? get_theme_color(SNAME("accent_color"), EditorStringName(Editor)) : linecolor;
-			blend_space_draw->draw_string(font, text_pos, name_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, name_color);
-
-			if (text_rects.size() <= i) {
-				text_rects.resize(i + 1);
-			}
-
-			text_rects.write[i] = Rect2(Vector2(text_pos.x, text_pos.y - font->get_ascent(font_size)), text_size);
+		if (i == selected_point) {
+			blend_space_draw->draw_texture(icon_selected, point);
+		} else {
+			blend_space_draw->draw_texture(icon, point);
 		}
 	}
 
@@ -765,13 +684,6 @@ void AnimationNodeBlendSpace2DEditor::_config_changed(double) {
 	}
 
 	updating = true;
-
-	constexpr double STEP_UNIT = 0.01;
-	min_x_value->set_max(max_x_value->get_value() - STEP_UNIT);
-	max_x_value->set_min(min_x_value->get_value() + STEP_UNIT);
-	min_y_value->set_max(max_y_value->get_value() - STEP_UNIT);
-	max_y_value->set_min(min_y_value->get_value() + STEP_UNIT);
-
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Change BlendSpace2D Config"));
 	undo_redo->add_do_method(blend_space.ptr(), "set_max_space", Vector2(max_x_value->get_value(), max_y_value->get_value()));
@@ -814,14 +726,9 @@ void AnimationNodeBlendSpace2DEditor::_erase_selected() {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	if (selected_point != -1) {
 		updating = true;
-
-		Ref<AnimationRootNode> node = blend_space->get_blend_point_node(selected_point);
-		Vector2 position = blend_space->get_blend_point_position(selected_point);
-		String point_name = blend_space->get_blend_point_name(selected_point);
-
 		undo_redo->create_action(TTR("Remove BlendSpace2D Point"));
 		undo_redo->add_do_method(blend_space.ptr(), "remove_blend_point", selected_point);
-		undo_redo->add_undo_method(blend_space.ptr(), "add_blend_point", node, position, selected_point, point_name);
+		undo_redo->add_undo_method(blend_space.ptr(), "add_blend_point", blend_space->get_blend_point_node(selected_point), blend_space->get_blend_point_position(selected_point), selected_point);
 
 		//restore triangles using this point
 		for (int i = 0; i < blend_space->get_triangle_count(); i++) {
@@ -837,9 +744,11 @@ void AnimationNodeBlendSpace2DEditor::_erase_selected() {
 		undo_redo->add_undo_method(this, "_update_space");
 		undo_redo->commit_action();
 
-		_set_selected_point(-1);
+		// Return selection to host BlendSpace2D node.
+		EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
 
 		updating = false;
+		_update_tool_erase();
 
 		blend_space_draw->queue_redraw();
 	} else if (selected_triangle != -1) {
@@ -873,31 +782,21 @@ void AnimationNodeBlendSpace2DEditor::_update_edited_point_pos() {
 			if (snap->is_pressed()) {
 				pos = pos.snapped(blend_space->get_snap());
 			}
-			pos = pos.clamp(blend_space->get_min_space(), blend_space->get_max_space());
 		}
 		updating = true;
 		edit_x->set_value(pos.x);
 		edit_y->set_value(pos.y);
-		index_edit->set_max(blend_space->get_blend_point_count() - 1);
-		index_edit->set_value(selected_point);
-		index_edit->set_editable(blend_space->get_blend_point_count() > 1 && !read_only);
 		updating = false;
 	}
 }
 
-void AnimationNodeBlendSpace2DEditor::_update_edited_point_name() {
-	if (updating) {
-		return;
-	}
-}
-
 void AnimationNodeBlendSpace2DEditor::_edit_point_pos(double) {
 	if (updating) {
 		return;
 	}
 	updating = true;
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Move BlendSpace2D Node Point"));
+	undo_redo->create_action(TTR("Move Node Point"));
 	undo_redo->add_do_method(blend_space.ptr(), "set_blend_point_position", selected_point, Vector2(edit_x->get_value(), edit_y->get_value()));
 	undo_redo->add_undo_method(blend_space.ptr(), "set_blend_point_position", selected_point, blend_space->get_blend_point_position(selected_point));
 	undo_redo->add_do_method(this, "_update_space");
@@ -910,76 +809,11 @@ void AnimationNodeBlendSpace2DEditor::_edit_point_pos(double) {
 	blend_space_draw->queue_redraw();
 }
 
-void AnimationNodeBlendSpace2DEditor::_edit_point_index(double p_index) {
-	if (updating || selected_point < 0 || selected_point >= blend_space->get_blend_point_count()) {
-		return;
-	}
-
-	int new_index = (int)p_index;
-	if (new_index < 0 || new_index >= blend_space->get_blend_point_count() || new_index == selected_point) {
-		return;
-	}
-
-	updating = true;
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Reorder BlendSpace2D Point Index"));
-	undo_redo->add_do_method(blend_space.ptr(), "reorder_blend_point", selected_point, new_index);
-	undo_redo->add_undo_method(blend_space.ptr(), "reorder_blend_point", new_index, selected_point);
-	undo_redo->add_do_method(this, "_update_space");
-	undo_redo->add_undo_method(this, "_update_space");
-	undo_redo->add_do_method(this, "_set_selected_point", new_index);
-	undo_redo->add_undo_method(this, "_set_selected_point", selected_point);
-	undo_redo->add_do_method(this, "_show_indices_with_cooldown");
-	undo_redo->add_undo_method(this, "_show_indices_with_cooldown");
-	undo_redo->commit_action();
-	updating = false;
-
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace2DEditor::_set_selected_point(int p_index) {
-	selected_point = p_index;
-	_update_tool_erase();
-	if (p_index != -1) {
-		_update_edited_point_pos();
-		Ref<AnimationNode> node = blend_space->get_blend_point_node(p_index);
-		EditorNode::get_singleton()->push_item(node.ptr(), "", true);
-	} else {
-		EditorNode::get_singleton()->push_item(blend_space.ptr(), "", true);
-	}
-}
-
-void AnimationNodeBlendSpace2DEditor::_edit_point_name(const String &p_name) {
-	if (updating || selected_point == -1 || p_name.is_empty()) {
-		return;
-	}
-
-	String old_name = blend_space->get_blend_point_name(selected_point);
-	if (p_name == old_name) {
-		return;
-	}
-	String safe_name = _get_safe_name(blend_space, p_name);
-
-	updating = true;
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Change BlendSpace2D Point Name"));
-	undo_redo->add_do_method(blend_space.ptr(), "set_blend_point_name", selected_point, safe_name);
-	undo_redo->add_undo_method(blend_space.ptr(), "set_blend_point_name", selected_point, old_name);
-	undo_redo->add_do_method(this, "_update_space");
-	undo_redo->add_undo_method(this, "_update_space");
-	undo_redo->add_do_method(this, "_update_edited_point_name");
-	undo_redo->add_undo_method(this, "_update_edited_point_name");
-	undo_redo->commit_action();
-	updating = false;
-
-	blend_space_draw->queue_redraw();
-}
-
 void AnimationNodeBlendSpace2DEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			error_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
-			error_label->add_theme_color_override(SNAME("default_color"), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
+			error_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
 			panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
 			tool_blend->set_button_icon(get_editor_theme_icon(SNAME("EditPivot")));
 			tool_select->set_button_icon(get_editor_theme_icon(SNAME("ToolSelect")));
@@ -1001,7 +835,22 @@ void AnimationNodeBlendSpace2DEditor::_notification(int p_what) {
 				return;
 			}
 
-			update_error_message(tree, error_panel, error_label);
+			String error;
+
+			error = tree->get_editor_error_message();
+
+			if (error.is_empty() && blend_space->get_triangle_count() == 0) {
+				error = TTR("No triangles exist, so no blending can take place.");
+			}
+
+			if (error != error_label->get_text()) {
+				error_label->set_text(error);
+				if (!error.is_empty()) {
+					error_panel->show();
+				} else {
+					error_panel->hide();
+				}
+			}
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -1014,40 +863,10 @@ void AnimationNodeBlendSpace2DEditor::_open_editor() {
 	if (selected_point >= 0 && selected_point < blend_space->get_blend_point_count()) {
 		Ref<AnimationNode> an = blend_space->get_blend_point_node(selected_point);
 		ERR_FAIL_COND(an.is_null());
-		AnimationTreeEditor::get_singleton()->enter_editor(blend_space->get_blend_point_name(selected_point));
+		AnimationTreeEditor::get_singleton()->enter_editor(itos(selected_point));
 	}
 }
 
-void AnimationNodeBlendSpace2DEditor::_index_edit_focus_entered() {
-	if (index_focus_cooldown_timer->is_stopped() == false) {
-		index_focus_cooldown_timer->stop();
-	}
-	index_edit_has_focus = true;
-	show_indices = true;
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace2DEditor::_index_edit_focus_exited() {
-	index_edit_has_focus = false;
-	index_focus_cooldown_timer->start();
-}
-
-void AnimationNodeBlendSpace2DEditor::_index_focus_cooldown_timeout() {
-	if (!index_edit_has_focus) {
-		show_indices = false;
-		blend_space_draw->queue_redraw();
-	}
-}
-
-void AnimationNodeBlendSpace2DEditor::_show_indices_with_cooldown() {
-	if (index_focus_cooldown_timer->is_stopped() == false) {
-		index_focus_cooldown_timer->stop();
-	}
-	show_indices = true;
-	index_focus_cooldown_timer->start();
-	blend_space_draw->queue_redraw();
-}
-
 void AnimationNodeBlendSpace2DEditor::_auto_triangles_toggled() {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Toggle Auto Triangles"));
@@ -1063,106 +882,6 @@ void AnimationNodeBlendSpace2DEditor::_bind_methods() {
 	ClassDB::bind_method("_update_tool_erase", &AnimationNodeBlendSpace2DEditor::_update_tool_erase);
 
 	ClassDB::bind_method("_update_edited_point_pos", &AnimationNodeBlendSpace2DEditor::_update_edited_point_pos);
-	ClassDB::bind_method("_update_edited_point_name", &AnimationNodeBlendSpace2DEditor::_update_edited_point_name);
-	ClassDB::bind_method("_set_selected_point", &AnimationNodeBlendSpace2DEditor::_set_selected_point);
-	ClassDB::bind_method("_show_indices_with_cooldown", &AnimationNodeBlendSpace2DEditor::_show_indices_with_cooldown);
-}
-
-void AnimationNodeBlendSpace2DEditor::_start_inline_edit(int p_point) {
-	if (editing_point != -1 || p_point < 0 || p_point >= blend_space->get_blend_point_count()) {
-		return;
-	}
-
-	editing_point = p_point;
-	_set_selected_point(p_point);
-
-	inline_editor = memnew(LineEdit);
-	blend_space_draw->add_child(inline_editor);
-
-	inline_editor->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-	inline_editor->add_theme_color_override("font_selected_color", Color::named("white"));
-	inline_editor->add_theme_color_override("selection_color", get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-	Ref<StyleBoxEmpty> empty_style = memnew(StyleBoxEmpty);
-	empty_style->set_content_margin_all(0);
-	inline_editor->add_theme_style_override(CoreStringName(normal), empty_style);
-	inline_editor->add_theme_style_override("focus", memnew(StyleBoxEmpty));
-	inline_editor->add_theme_style_override("read_only", memnew(StyleBoxEmpty));
-	inline_editor->add_theme_constant_override("minimum_character_width", 0);
-	inline_editor->set_flat(true);
-
-	inline_editor->set_text(blend_space->get_blend_point_name(p_point));
-	inline_editor->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	inline_editor->set_expand_to_text_length_enabled(true);
-
-	if (p_point < text_rects.size() && p_point < points.size()) {
-		Rect2 text_rect = text_rects[p_point];
-
-		inline_editor_point_x = points[p_point].x;
-
-		float editor_width = text_rect.size.x;
-		inline_editor->set_size(Vector2(editor_width, text_rect.size.y));
-
-		Size2 s = blend_space_draw->get_size();
-
-		float editor_x = inline_editor_point_x - editor_width / 2.0;
-		editor_x = CLAMP(editor_x, 0.0f, s.width - editor_width);
-		inline_editor->set_position(Vector2(editor_x, text_rect.position.y - 1 * EDSCALE));
-	}
-
-	inline_editor->connect(SceneStringName(text_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_inline_editor_text_changed));
-	inline_editor->connect(SceneStringName(text_submitted), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_finish_inline_edit_with_text));
-	inline_editor->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_finish_inline_edit));
-
-	inline_editor->grab_focus();
-	inline_editor->select_all();
-
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace2DEditor::_finish_inline_edit() {
-	if (editing_point == -1 || !inline_editor) {
-		return;
-	}
-
-	String new_name = inline_editor->get_text();
-	_edit_point_name(new_name);
-
-	_cancel_inline_edit();
-}
-
-void AnimationNodeBlendSpace2DEditor::_finish_inline_edit_with_text(const String &p_text) {
-	if (editing_point == -1 || !inline_editor) {
-		return;
-	}
-
-	_edit_point_name(p_text);
-
-	_cancel_inline_edit();
-}
-
-void AnimationNodeBlendSpace2DEditor::_cancel_inline_edit() {
-	if (inline_editor) {
-		inline_editor->queue_free();
-		inline_editor = nullptr;
-	}
-	editing_point = -1;
-	blend_space_draw->queue_redraw();
-}
-
-void AnimationNodeBlendSpace2DEditor::_inline_editor_text_changed(const String &p_text) {
-	if (!inline_editor) {
-		return;
-	}
-
-	inline_editor->set_size(Vector2(0, inline_editor->get_size().y));
-
-	Vector2 editor_size = inline_editor->get_size();
-	Size2 s = blend_space_draw->get_size();
-
-	float editor_x = inline_editor_point_x - editor_size.x / 2.0;
-	editor_x = CLAMP(editor_x, 0.0f, s.width - editor_size.x);
-
-	inline_editor->set_position(Vector2(editor_x, inline_editor->get_position().y));
 }
 
 AnimationNodeBlendSpace2DEditor *AnimationNodeBlendSpace2DEditor::singleton = nullptr;
@@ -1183,7 +902,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	tool_select->set_button_group(bg);
 	top_hb->add_child(tool_select);
 	tool_select->set_pressed(true);
-	tool_select->set_tooltip_text(TTR("Select and move points.\nRMB: Create point at position clicked.\nShift+LMB+Drag: Set the blending position within the space.\nScroll: Increment or decrement index."));
+	tool_select->set_tooltip_text(TTR("Select and move points.\nRMB: Create point at position clicked.\nShift+LMB+Drag: Set the blending position within the space."));
 	tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(0));
 
 	tool_create = memnew(Button);
@@ -1256,67 +975,42 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 
 	top_hb->add_child(memnew(VSeparator));
 
-	top_hb->add_child(memnew(Label(TTR("Sync"))));
+	top_hb->add_child(memnew(Label(TTR("Sync:"))));
 	sync = memnew(CheckBox);
 	top_hb->add_child(sync);
 	sync->connect(SceneStringName(toggled), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_config_changed));
 
 	top_hb->add_child(memnew(VSeparator));
 
-	top_hb->add_child(memnew(Label(TTR("Blend"))));
+	top_hb->add_child(memnew(Label(TTR("Blend:"))));
 	interpolation = memnew(OptionButton);
 	top_hb->add_child(interpolation);
 	interpolation->connect(SceneStringName(item_selected), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_config_changed));
 
-	top_hb->add_spacer();
-
 	edit_hb = memnew(HBoxContainer);
 	top_hb->add_child(edit_hb);
-
-	open_editor = memnew(Button);
-	edit_hb->add_child(open_editor);
-	open_editor->set_text(TTR("Open Editor"));
-	open_editor->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_open_editor), CONNECT_DEFERRED);
-	open_editor_sep = memnew(VSeparator);
-	edit_hb->add_child(open_editor_sep);
-
-	edit_hb->add_child(memnew(Label(TTR("Index"))));
-	index_edit = memnew(SpinBox);
-	edit_hb->add_child(index_edit);
-	index_edit->set_min(0);
-	index_edit->set_step(1);
-	index_edit->set_allow_greater(false);
-	index_edit->set_allow_lesser(false);
-	index_edit->set_accessibility_name(TTRC("Blend Point Index"));
-	index_edit->set_tooltip_text(TTR("Index of the blend point.\nValues outside of the valid range will be clamped to the nearest index."));
-	index_edit->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_edit_point_index));
-	index_edit->get_line_edit()->connect(SceneStringName(focus_entered), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_index_edit_focus_entered));
-	index_edit->get_line_edit()->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_index_edit_focus_exited));
-
 	edit_hb->add_child(memnew(VSeparator));
-
-	constexpr double STEP_UNIT = 0.01;
-	constexpr double ABS_MAX = 10000;
-
-	edit_hb->add_child(memnew(Label(TTR("Position"))));
+	edit_hb->add_child(memnew(Label(TTR("Point"))));
 	edit_x = memnew(SpinBox);
 	edit_hb->add_child(edit_x);
-	edit_x->set_min(-ABS_MAX);
-	edit_x->set_max(ABS_MAX);
-	edit_x->set_step(STEP_UNIT);
+	edit_x->set_min(-1000);
+	edit_x->set_step(0.01);
+	edit_x->set_max(1000);
 	edit_x->set_accessibility_name(TTRC("Blend X Value"));
 	edit_x->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_edit_point_pos));
 	edit_y = memnew(SpinBox);
 	edit_hb->add_child(edit_y);
-	edit_y->set_min(-ABS_MAX);
-	edit_y->set_max(ABS_MAX);
-	edit_y->set_step(STEP_UNIT);
+	edit_y->set_min(-1000);
+	edit_y->set_step(0.01);
+	edit_y->set_max(1000);
 	edit_y->set_accessibility_name(TTRC("Blend Y Value"));
 	edit_y->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_edit_point_pos));
-
+	open_editor = memnew(Button);
+	edit_hb->add_child(open_editor);
+	open_editor->set_text(TTR("Open Editor"));
+	open_editor->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_open_editor), CONNECT_DEFERRED);
 	edit_hb->hide();
 	open_editor->hide();
-	open_editor_sep->hide();
 
 	HBoxContainer *main_hb = memnew(HBoxContainer);
 	add_child(main_hb);
@@ -1343,13 +1037,13 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 		min_y_value->set_accessibility_name(TTRC("Min Y"));
 		left_vbox->add_child(min_y_value);
 
-		max_y_value->set_max(ABS_MAX);
-		max_y_value->set_min(-ABS_MAX + STEP_UNIT);
-		max_y_value->set_step(STEP_UNIT);
+		max_y_value->set_max(10000);
+		max_y_value->set_min(0.01);
+		max_y_value->set_step(0.01);
 
-		min_y_value->set_min(-ABS_MAX);
-		min_y_value->set_max(ABS_MAX - STEP_UNIT);
-		min_y_value->set_step(STEP_UNIT);
+		min_y_value->set_min(-10000);
+		min_y_value->set_max(0);
+		min_y_value->set_step(0.01);
 	}
 
 	panel = memnew(PanelContainer);
@@ -1382,13 +1076,13 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 		max_x_value->set_accessibility_name(TTRC("Max X"));
 		bottom_vbox->add_child(max_x_value);
 
-		max_x_value->set_max(ABS_MAX);
-		max_x_value->set_min(-ABS_MAX + STEP_UNIT);
-		max_x_value->set_step(STEP_UNIT);
+		max_x_value->set_max(10000);
+		max_x_value->set_min(0.01);
+		max_x_value->set_step(0.01);
 
-		min_x_value->set_min(-ABS_MAX);
-		min_x_value->set_max(ABS_MAX - STEP_UNIT);
-		min_x_value->set_step(STEP_UNIT);
+		min_x_value->set_min(-10000);
+		min_x_value->set_max(0);
+		min_x_value->set_step(0.01);
 	}
 
 	snap_x->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_config_changed));
@@ -1402,7 +1096,8 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 
 	error_panel = memnew(PanelContainer);
 	add_child(error_panel);
-	error_label = create_error_label_node();
+	error_label = memnew(Label);
+	error_label->set_focus_mode(FOCUS_ACCESSIBILITY);
 	error_panel->add_child(error_label);
 	error_panel->hide();
 
@@ -1423,13 +1118,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	open_file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	open_file->connect("file_selected", callable_mp(this, &AnimationNodeBlendSpace2DEditor::_file_opened));
 
-	// Create timer for index focus cooldown (1.5 seconds).
-	index_focus_cooldown_timer = memnew(Timer);
-	add_child(index_focus_cooldown_timer);
-	index_focus_cooldown_timer->set_wait_time(1.5);
-	index_focus_cooldown_timer->set_one_shot(true);
-	index_focus_cooldown_timer->connect("timeout", callable_mp(this, &AnimationNodeBlendSpace2DEditor::_index_focus_cooldown_timeout));
-
 	selected_point = -1;
 	selected_triangle = -1;
 
diff --git a/engine/editor/animation/animation_blend_space_2d_editor.h b/engine/editor/animation/animation_blend_space_2d_editor.h
index ddcb937c..684e7c45 100644
--- a/engine/editor/animation/animation_blend_space_2d_editor.h
+++ b/engine/editor/animation/animation_blend_space_2d_editor.h
@@ -41,7 +41,6 @@ class LineEdit;
 class OptionButton;
 class PanelContainer;
 class SpinBox;
-class Timer;
 class VSeparator;
 
 class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
@@ -76,8 +75,6 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
 	SpinBox *edit_x = nullptr;
 	SpinBox *edit_y = nullptr;
 	Button *open_editor = nullptr;
-	VSeparator *open_editor_sep = nullptr;
-	SpinBox *index_edit = nullptr;
 
 	int selected_point;
 	int selected_triangle;
@@ -85,7 +82,7 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
 	Control *blend_space_draw = nullptr;
 
 	PanelContainer *error_panel = nullptr;
-	RichTextLabel *error_label = nullptr;
+	Label *error_label = nullptr;
 
 	bool updating;
 
@@ -102,7 +99,7 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
 
 	PopupMenu *menu = nullptr;
 	PopupMenu *animations_menu = nullptr;
-	Vector<StringName> animations_to_add;
+	Vector<String> animations_to_add;
 	Vector2 add_point_pos;
 	Vector<Vector2> points;
 
@@ -112,14 +109,6 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
 	Vector2 drag_from;
 	Vector2 drag_ofs;
 
-	Vector<Rect2> text_rects;
-	int editing_point = -1;
-	LineEdit *inline_editor = nullptr;
-	float inline_editor_point_x = 0.0f;
-	bool index_edit_has_focus = false;
-	bool show_indices = false;
-	Timer *index_focus_cooldown_timer = nullptr;
-
 	Vector<int> making_triangle;
 
 	void _add_menu_type(int p_index);
@@ -127,28 +116,14 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
 
 	void _tool_switch(int p_tool);
 	void _update_edited_point_pos();
-	void _update_edited_point_name();
 	void _update_tool_erase();
 	void _erase_selected();
 	void _edit_point_pos(double);
-	void _edit_point_name(const String &p_name);
-	void _edit_point_index(double p_index);
-	void _set_selected_point(int p_index);
-	void _start_inline_edit(int p_point);
-	void _finish_inline_edit();
-	void _finish_inline_edit_with_text(const String &p_text);
-	void _cancel_inline_edit();
-	void _inline_editor_text_changed(const String &p_text);
 	void _open_editor();
-	void _index_edit_focus_entered();
-	void _index_edit_focus_exited();
-	void _index_focus_cooldown_timeout();
-	void _show_indices_with_cooldown();
 
 	void _auto_triangles_toggled();
 
 	StringName get_blend_position_path() const;
-	String _get_safe_name(const Ref<AnimationNodeBlendSpace2D> &p_blend_space, const String &p_name);
 
 	EditorFileDialog *open_file = nullptr;
 	Ref<AnimationNode> file_loaded;
@@ -168,7 +143,6 @@ protected:
 
 public:
 	static AnimationNodeBlendSpace2DEditor *get_singleton() { return singleton; }
-	void refresh_editor() { _update_space(); }
 	virtual bool can_edit(const Ref<AnimationNode> &p_node) override;
 	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace2DEditor();
diff --git a/engine/editor/animation/animation_blend_tree_editor_plugin.cpp b/engine/editor/animation/animation_blend_tree_editor_plugin.cpp
index a6fc12ce..6b550544 100644
--- a/engine/editor/animation/animation_blend_tree_editor_plugin.cpp
+++ b/engine/editor/animation/animation_blend_tree_editor_plugin.cpp
@@ -32,9 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/templates/rb_set.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -50,7 +47,6 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/progress_bar.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
@@ -123,30 +119,16 @@ void AnimationNodeBlendTreeEditor::update_graph() {
 	if (updating || blend_tree.is_null()) {
 		return;
 	}
-	if (graph_update_queued) {
-		return;
-	}
-	graph_update_queued = true;
-	// Defer to idle time, so multiple requests can be merged.
-	callable_mp(this, &AnimationNodeBlendTreeEditor::update_graph_immediately).call_deferred();
-}
-
-void AnimationNodeBlendTreeEditor::update_graph_immediately() {
-	if (updating || blend_tree.is_null()) {
-		graph_update_queued = false;
-		return;
-	}
 
 	AnimationTree *tree = AnimationTreeEditor::get_singleton()->get_animation_tree();
 	if (!tree) {
-		graph_update_queued = false;
 		return;
 	}
 
 	visible_properties.clear();
 
 	// Store selected nodes before clearing the graph.
-	LocalVector<StringName> selected_nodes;
+	List<StringName> selected_nodes;
 	for (int i = 0; i < graph->get_child_count(); i++) {
 		GraphNode *gn = Object::cast_to<GraphNode>(graph->get_child(i));
 		if (gn && gn->is_selected()) {
@@ -182,7 +164,6 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 
 		node->set_title(agnode->get_caption());
 		node->set_name(E);
-		node->set_meta(animation_node_name_meta, E);
 
 		int base = 0;
 		if (E != SceneStringName(output)) {
@@ -193,8 +174,8 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 			name->set_custom_minimum_size(Vector2(100, 0) * EDSCALE);
 			node->add_child(name);
 			node->set_slot(0, false, 0, Color(), true, read_only ? -1 : 0, get_theme_color(SceneStringName(font_color), SNAME("Label")));
-			name->connect(SceneStringName(text_submitted), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_renamed).bind(agnode, E), CONNECT_DEFERRED);
-			name->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_renamed_focus_out).bind(agnode, E), CONNECT_DEFERRED);
+			name->connect(SceneStringName(text_submitted), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_renamed).bind(agnode), CONNECT_DEFERRED);
+			name->connect(SceneStringName(focus_exited), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_renamed_focus_out).bind(agnode), CONNECT_DEFERRED);
 			name->connect(SceneStringName(text_changed), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_rename_lineedit_changed), CONNECT_DEFERRED);
 			base = 1;
 			agnode->set_deletable(true);
@@ -217,7 +198,7 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 			node->set_slot(base + i, true, read_only ? -1 : 0, get_theme_color(SceneStringName(font_color), SNAME("Label")), false, 0, Color());
 		}
 
-		LocalVector<PropertyInfo> pinfo;
+		List<PropertyInfo> pinfo;
 		agnode->get_parameter_list(&pinfo);
 		for (const PropertyInfo &F : pinfo) {
 			if (!(F.usage & PROPERTY_USAGE_EDITOR)) {
@@ -237,7 +218,7 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 				}
 				prop->set_name_split_ratio(ratio);
 				prop->update_property();
-				prop->connect(SNAME("property_changed"), callable_mp(this, &AnimationNodeBlendTreeEditor::_property_changed));
+				prop->connect("property_changed", callable_mp(this, &AnimationNodeBlendTreeEditor::_property_changed));
 
 				if (F.hint == PROPERTY_HINT_RESOURCE_TYPE) {
 					// Give the resource editor some more space to make the inside readable.
@@ -251,7 +232,7 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 			}
 		}
 
-		node->connect(SNAME("dragged"), callable_mp(this, &AnimationNodeBlendTreeEditor::_node_dragged).bind(E));
+		node->connect("dragged", callable_mp(this, &AnimationNodeBlendTreeEditor::_node_dragged).bind(E));
 
 		if (AnimationTreeEditor::get_singleton()->can_edit(agnode)) {
 			node->add_child(memnew(HSeparator));
@@ -291,7 +272,10 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 
 			ProgressBar *pb = memnew(ProgressBar);
 
-			for (const StringName &F : tree->get_sorted_animation_list()) {
+			List<StringName> anims;
+			tree->get_animation_list(&anims);
+
+			for (const StringName &F : anims) {
 				mb->get_popup()->add_item(F);
 				options.push_back(F);
 			}
@@ -301,25 +285,25 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 			animations[E] = pb;
 			node->add_child(pb);
 
-			mb->get_popup()->connect(SNAME("index_pressed"), callable_mp(this, &AnimationNodeBlendTreeEditor::_anim_selected).bind(options, E), CONNECT_DEFERRED);
+			mb->get_popup()->connect("index_pressed", callable_mp(this, &AnimationNodeBlendTreeEditor::_anim_selected).bind(options, E), CONNECT_DEFERRED);
 		}
 
-		Ref<StyleBox> sb_panel = node->get_theme_stylebox(SceneStringName(panel), SNAME("GraphNode"))->duplicate();
+		Ref<StyleBox> sb_panel = node->get_theme_stylebox(SceneStringName(panel), "GraphNode")->duplicate();
 		if (sb_panel.is_valid()) {
 			sb_panel->set_content_margin(SIDE_TOP, 12 * EDSCALE);
 			sb_panel->set_content_margin(SIDE_BOTTOM, 12 * EDSCALE);
 			node->add_theme_style_override(SceneStringName(panel), sb_panel);
 		}
 
-		node->add_theme_constant_override(SNAME("separation"), 4 * EDSCALE);
+		node->add_theme_constant_override("separation", 4 * EDSCALE);
 	}
 
-	LocalVector<AnimationNodeBlendTree::NodeConnection> node_connections;
+	List<AnimationNodeBlendTree::NodeConnection> node_connections;
 	blend_tree->get_node_connections(&node_connections);
 
 	for (const AnimationNodeBlendTree::NodeConnection &E : node_connections) {
-		const StringName &from = E.output_node;
-		const StringName &to = E.input_node;
+		StringName from = E.output_node;
+		StringName to = E.input_node;
 		int to_idx = E.input_index;
 
 		graph->connect_node(from, 0, to, to_idx);
@@ -340,48 +324,6 @@ void AnimationNodeBlendTreeEditor::update_graph_immediately() {
 			}
 		}
 	}
-
-	graph_update_queued = false;
-}
-
-void AnimationNodeBlendTreeEditor::pan_to_node(const StringName &p_node_name, int p_input_index) {
-	GraphNode *target_node = nullptr;
-	for (int i = 0; i < graph->get_child_count(); i++) {
-		if (GraphNode *gn = Object::cast_to<GraphNode>(graph->get_child(i)); gn && gn->has_meta(animation_node_name_meta)) {
-			if (gn->get_meta(animation_node_name_meta).operator StringName() == p_node_name) {
-				target_node = gn;
-				break;
-			}
-		}
-	}
-	ERR_FAIL_NULL(target_node);
-
-	Vector2 position = target_node->get_position_offset();
-	if (p_input_index != -1) {
-		const Vector2 slot_pos = target_node->get_input_port_position(p_input_index);
-		position += slot_pos;
-	} else {
-		position += target_node->get_size() * 0.5f; // Center of the node.
-	}
-	const Vector2 target = position * graph->get_zoom() - graph->get_size() * 0.5f;
-
-	if (pan_to_tween.is_valid()) {
-		pan_to_tween->kill();
-	}
-	pan_to_tween = Ref<Tween>(graph->create_tween());
-
-	bool is_close_enough = graph->get_scroll_offset().distance_to(target) < 10.0f;
-	if (!is_close_enough) {
-		pan_to_tween
-				->set_trans(Tween::TRANS_CUBIC)
-				->set_ease(Tween::EASE_OUT)
-				->tween_method(callable_mp(graph, &GraphEdit::set_scroll_offset), graph->get_scroll_offset(), target, 0.25);
-	}
-
-	pan_to_tween->tween_property(target_node, NodePath("modulate"), Color(1, 1, 1, 1) * 10, 0.05);
-	pan_to_tween->set_trans(Tween::TRANS_LINEAR)
-			->set_ease(Tween::EASE_OUT)
-			->tween_property(target_node, NodePath("modulate"), Color(1, 1, 1, 1), 0.3);
 }
 
 void AnimationNodeBlendTreeEditor::_file_opened(const String &p_file) {
@@ -605,7 +547,7 @@ void AnimationNodeBlendTreeEditor::_delete_node_request(const String &p_which) {
 	undo_redo->add_do_method(blend_tree.ptr(), "remove_node", p_which);
 	undo_redo->add_undo_method(blend_tree.ptr(), "add_node", p_which, blend_tree->get_node(p_which), blend_tree.ptr()->get_node_position(p_which));
 
-	LocalVector<AnimationNodeBlendTree::NodeConnection> conns;
+	List<AnimationNodeBlendTree::NodeConnection> conns;
 	blend_tree->get_node_connections(&conns);
 
 	for (const AnimationNodeBlendTree::NodeConnection &E : conns) {
@@ -853,13 +795,16 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 
 	updating = true;
 
-	HashSet<NodePath> paths;
-	HashMap<NodePath, RBSet<String>> types;
+	HashSet<String> paths;
+	HashMap<String, RBSet<String>> types;
 	{
-		for (const StringName &E : tree->get_sorted_animation_list()) {
+		List<StringName> animation_list;
+		tree->get_animation_list(&animation_list);
+
+		for (const StringName &E : animation_list) {
 			Ref<Animation> anim = tree->get_animation(E);
 			for (int i = 0; i < anim->get_track_count(); i++) {
-				NodePath track_path = anim->track_get_path(i);
+				String track_path = String(anim->track_get_path(i));
 				paths.insert(track_path);
 
 				String track_type_name;
@@ -890,7 +835,8 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 
 	HashMap<String, TreeItem *> parenthood;
 
-	for (const NodePath &path : paths) {
+	for (const String &E : paths) {
+		NodePath path = E;
 		TreeItem *ti = nullptr;
 		String accum;
 		for (int i = 0; i < path.get_name_count(); i++) {
@@ -910,8 +856,8 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 				ti->set_selectable(0, false);
 				ti->set_editable(0, false);
 
-				Node *node = base->get_node_or_null(accum);
-				if (node) {
+				if (base->has_node(accum)) {
+					Node *node = base->get_node(accum);
 					ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node));
 				}
 
@@ -920,7 +866,10 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 			}
 		}
 
-		Node *node = base->get_node_or_null(accum);
+		Node *node = nullptr;
+		if (base->has_node(accum)) {
+			node = base->get_node(accum);
+		}
 		if (!node) {
 			continue; //no node, can't edit
 		}
@@ -1045,7 +994,7 @@ void AnimationNodeBlendTreeEditor::_notification(int p_what) {
 
 		case NOTIFICATION_THEME_CHANGED: {
 			error_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
-			error_label->add_theme_color_override(SNAME("default_color"), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
+			error_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
 
 			if (is_visible_in_tree()) {
 				update_graph();
@@ -1058,13 +1007,20 @@ void AnimationNodeBlendTreeEditor::_notification(int p_what) {
 				return; // Node has been changed.
 			}
 
-			if (graph_update_queued) {
-				return;
+			String error;
+
+			error = tree->get_editor_error_message();
+
+			if (error != error_label->get_text()) {
+				error_label->set_text(error);
+				if (!error.is_empty()) {
+					error_panel->show();
+				} else {
+					error_panel->hide();
+				}
 			}
 
-			update_error_message(tree, error_panel, error_label);
-
-			LocalVector<AnimationNodeBlendTree::NodeConnection> conns;
+			List<AnimationNodeBlendTree::NodeConnection> conns;
 			blend_tree->get_node_connections(&conns);
 			for (const AnimationNodeBlendTree::NodeConnection &E : conns) {
 				float activity = 0;
@@ -1138,7 +1094,7 @@ void AnimationNodeBlendTreeEditor::_node_changed(const StringName &p_node_name)
 	update_graph();
 }
 
-void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<AnimationNode> p_node, const StringName &p_name) {
+void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<AnimationNode> p_node) {
 	if (blend_tree.is_null()) {
 		return;
 	}
@@ -1148,14 +1104,13 @@ void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<Anima
 		return;
 	}
 
-	String prev_name = p_name;
+	String prev_name = blend_tree->get_node_name(p_node);
 	ERR_FAIL_COND(prev_name.is_empty());
 	GraphNode *gn = Object::cast_to<GraphNode>(graph->get_node(prev_name));
 	ERR_FAIL_NULL(gn);
 
 	const String &new_name = p_text;
 
-	ERR_FAIL_COND_MSG(String(p_name).validate_node_name() != p_name, "Invalid AnimationNode name, ignoring rename.");
 	ERR_FAIL_COND(new_name.is_empty() || new_name.contains_char('.') || new_name.contains_char('/'));
 
 	if (new_name == prev_name) {
@@ -1182,7 +1137,6 @@ void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<Anima
 	undo_redo->commit_action();
 	updating = false;
 	gn->set_name(new_name);
-	gn->set_meta(animation_node_name_meta, new_name);
 	gn->set_size(gn->get_minimum_size());
 
 	//change editors accordingly
@@ -1197,7 +1151,7 @@ void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<Anima
 	//recreate connections
 	graph->clear_connections();
 
-	LocalVector<AnimationNodeBlendTree::NodeConnection> node_connections;
+	List<AnimationNodeBlendTree::NodeConnection> node_connections;
 	blend_tree->get_node_connections(&node_connections);
 
 	for (const AnimationNodeBlendTree::NodeConnection &E : node_connections) {
@@ -1221,11 +1175,11 @@ void AnimationNodeBlendTreeEditor::_node_renamed(const String &p_text, Ref<Anima
 	current_node_rename_text = String();
 }
 
-void AnimationNodeBlendTreeEditor::_node_renamed_focus_out(Ref<AnimationNode> p_node, const StringName &p_name) {
+void AnimationNodeBlendTreeEditor::_node_renamed_focus_out(Ref<AnimationNode> p_node) {
 	if (current_node_rename_text.is_empty()) {
 		return; // The text_submitted signal triggered the graph update and freed the LineEdit.
 	}
-	_node_renamed(current_node_rename_text, p_node, p_name);
+	_node_renamed(current_node_rename_text, p_node);
 }
 
 void AnimationNodeBlendTreeEditor::_node_rename_lineedit_changed(const String &p_text) {
@@ -1315,8 +1269,10 @@ AnimationNodeBlendTreeEditor::AnimationNodeBlendTreeEditor() {
 
 	error_panel = memnew(PanelContainer);
 	add_child(error_panel);
-	error_label = create_error_label_node();
+	error_label = memnew(Label);
+	error_label->set_focus_mode(FOCUS_ACCESSIBILITY);
 	error_panel->add_child(error_label);
+	error_label->set_text("eh");
 
 	filter_dialog = memnew(AcceptDialog);
 	add_child(filter_dialog);
diff --git a/engine/editor/animation/animation_blend_tree_editor_plugin.h b/engine/editor/animation/animation_blend_tree_editor_plugin.h
index 40f915e2..a74e0eb5 100644
--- a/engine/editor/animation/animation_blend_tree_editor_plugin.h
+++ b/engine/editor/animation/animation_blend_tree_editor_plugin.h
@@ -47,7 +47,6 @@ class EditorFileDialog;
 class EditorProperty;
 class MenuButton;
 class PanelContainer;
-class RichTextLabel;
 class EditorInspectorPluginAnimationNodeAnimation;
 
 class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
@@ -63,7 +62,7 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 	bool use_position_from_popup_menu;
 
 	PanelContainer *error_panel = nullptr;
-	RichTextLabel *error_label = nullptr;
+	Label *error_label = nullptr;
 
 	AcceptDialog *filter_dialog = nullptr;
 	Tree *filters = nullptr;
@@ -96,18 +95,16 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 	void _add_node(int p_idx);
 	void _update_options_menu(bool p_has_input_ports = false);
 
-	StringName animation_node_name_meta = StringName("_animation_node_name");
 	static AnimationNodeBlendTreeEditor *singleton;
 
 	void _node_dragged(const Vector2 &p_from, const Vector2 &p_to, const StringName &p_which);
-	void _node_renamed(const String &p_text, Ref<AnimationNode> p_node, const StringName &p_name);
-	void _node_renamed_focus_out(Ref<AnimationNode> p_node, const StringName &p_name);
+	void _node_renamed(const String &p_text, Ref<AnimationNode> p_node);
+	void _node_renamed_focus_out(Ref<AnimationNode> p_node);
 	void _node_rename_lineedit_changed(const String &p_text);
 	void _node_changed(const StringName &p_node_name);
 
 	String current_node_rename_text;
-	bool graph_update_queued = false;
-	bool updating = false;
+	bool updating;
 
 	void _connection_request(const String &p_from, int p_from_index, const String &p_to, int p_to_index);
 	void _disconnection_request(const String &p_from, int p_from_index, const String &p_to, int p_to_index);
@@ -153,7 +150,6 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 	};
 
 	Ref<EditorInspectorPluginAnimationNodeAnimation> animation_node_inspector_plugin;
-	Ref<Tween> pan_to_tween;
 
 protected:
 	void _notification(int p_what);
@@ -171,9 +167,7 @@ public:
 	virtual void edit(const Ref<AnimationNode> &p_node) override;
 
 	void update_graph();
-	void update_graph_immediately();
 
-	void pan_to_node(const StringName &p_node_name, int p_input_index = -1);
 	AnimationNodeBlendTreeEditor();
 };
 
diff --git a/engine/editor/animation/animation_library_editor.cpp b/engine/editor/animation/animation_library_editor.cpp
index e37b465d..395d832d 100644
--- a/engine/editor/animation/animation_library_editor.cpp
+++ b/engine/editor/animation/animation_library_editor.cpp
@@ -30,10 +30,7 @@
 
 #include "animation_library_editor.h"
 
-#include "core/io/config_file.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/string/print_string.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"
@@ -46,8 +43,6 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_mixer.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/margin_container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
 
 void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) {
@@ -55,6 +50,7 @@ void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) {
 }
 
 void AnimationLibraryEditor::_add_library() {
+	add_library_dialog->set_title(TTR("Library Name:"));
 	add_library_name->set_text("");
 	add_library_dialog->popup_centered();
 	add_library_name->grab_focus();
@@ -213,7 +209,7 @@ void AnimationLibraryEditor::_file_popup_selected(int p_id) {
 		} break;
 		case FILE_MENU_MAKE_LIBRARY_UNIQUE: {
 			StringName lib_name = file_dialog_library;
-			LocalVector<StringName> animation_list;
+			List<StringName> animation_list;
 
 			Ref<AnimationLibrary> ald = memnew(AnimationLibrary);
 			al->get_animation_list(&animation_list);
@@ -378,7 +374,7 @@ void AnimationLibraryEditor::_load_files(const PackedStringArray &p_paths) {
 					continue;
 				}
 
-				LocalVector<StringName> libs;
+				List<StringName> libs;
 				mixer->get_animation_library_list(&libs);
 				bool is_already_added = false;
 				for (const StringName &K : libs) {
@@ -424,7 +420,7 @@ void AnimationLibraryEditor::_load_files(const PackedStringArray &p_paths) {
 					continue;
 				}
 
-				LocalVector<StringName> anims;
+				List<StringName> anims;
 				al->get_animation_list(&anims);
 				bool is_already_added = false;
 				for (const StringName &K : anims) {
@@ -546,6 +542,7 @@ void AnimationLibraryEditor::_button_pressed(TreeItem *p_item, int p_column, int
 		Ref<AnimationLibrary> al = mixer->get_animation_library(lib_name);
 		switch (p_id) {
 			case LIB_BUTTON_ADD: {
+				add_library_dialog->set_title(TTR("Animation Name:"));
 				add_library_name->set_text("");
 				add_library_dialog->popup_centered();
 				add_library_name->grab_focus();
@@ -687,8 +684,8 @@ void AnimationLibraryEditor::update_tree() {
 	Color ss_color = get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor));
 
 	TreeItem *root = tree->create_item();
-	LocalVector<StringName> libs;
-	const Vector<String> collapsed_libs = _load_mixer_libs_folding();
+	List<StringName> libs;
+	Vector<uint64_t> collapsed_lib_ids = _load_mixer_libs_folding();
 
 	mixer->get_animation_library_list(&libs);
 
@@ -744,7 +741,7 @@ void AnimationLibraryEditor::update_tree() {
 
 		libitem->set_custom_bg_color(0, ss_color);
 
-		LocalVector<StringName> animations;
+		List<StringName> animations;
 		al->get_animation_list(&animations);
 		for (const StringName &L : animations) {
 			TreeItem *anitem = tree->create_item(libitem);
@@ -782,10 +779,16 @@ void AnimationLibraryEditor::update_tree() {
 
 			anitem->add_button(1, get_editor_theme_icon("Save"), ANIM_BUTTON_FILE, animation_library_is_foreign, TTR("Save animation to resource on disk."));
 			anitem->add_button(1, get_editor_theme_icon("Remove"), ANIM_BUTTON_DELETE, animation_library_is_foreign, TTR("Remove animation from Library."));
-		}
 
-		if (collapsed_libs.has(String(K))) {
-			libitem->set_collapsed_recursive(true);
+			for (const uint64_t &lib_id : collapsed_lib_ids) {
+				Object *lib_obj = ObjectDB::get_instance(ObjectID(lib_id));
+				AnimationLibrary *cur_lib = Object::cast_to<AnimationLibrary>(lib_obj);
+				StringName M = mixer->get_animation_library_name(cur_lib);
+
+				if (M == K) {
+					libitem->set_collapsed_recursive(true);
+				}
+			}
 		}
 	}
 }
@@ -805,45 +808,65 @@ void AnimationLibraryEditor::_save_mixer_lib_folding(TreeItem *p_item) {
 		ERR_PRINT("Error loading lib_folding.cfg: " + itos(err));
 	}
 
-	// Get unique identifier for this scene+mixer combination.
-	const String md = (mixer->get_tree()->get_edited_scene_root()->get_scene_file_path() + String(mixer->get_path())).md5_text();
+	// Get unique identifier for this scene+mixer combination
+	String md = (mixer->get_tree()->get_edited_scene_root()->get_scene_file_path() + String(mixer->get_path())).md5_text();
 
-	Vector<String> collapsed_libs;
-	if (config->has_section_key(md, "folding")) {
-		collapsed_libs = config->get_value(md, "folding");
+	PackedStringArray collapsed_lib_names;
+	PackedStringArray collapsed_lib_ids;
+
+	if (config->has_section(md)) {
+		collapsed_lib_names = String(config->get_value(md, "folding")).split("\n");
+		collapsed_lib_ids = String(config->get_value(md, "id")).split("\n");
 	}
 
-	for (int i = collapsed_libs.size() - 1; i >= 0; i--) {
-		if (!mixer->has_animation_library(collapsed_libs[i])) {
-			collapsed_libs.remove_at(i);
-		}
+	String lib_name = p_item->get_text(0);
+
+	// Get library reference and check validity
+	Ref<AnimationLibrary> al;
+	uint64_t lib_id = 0;
+
+	if (mixer->has_animation_library(lib_name)) {
+		al = mixer->get_animation_library(lib_name);
+		ERR_FAIL_COND(al.is_null());
+		lib_id = uint64_t(al->get_instance_id());
+	} else {
+		ERR_PRINT("Library not found: " + lib_name);
 	}
 
-	const String lib_name = p_item->get_text(0);
+	int at = collapsed_lib_names.find(lib_name);
 	if (p_item->is_collapsed()) {
-		if (!collapsed_libs.has(lib_name)) {
-			collapsed_libs.append(lib_name);
+		if (at != -1) {
+			//Entry exists and needs updating
+			collapsed_lib_ids.set(at, String::num_int64(lib_id + INT64_MIN));
+		} else {
+			//Check if it's a rename
+			int id_at = collapsed_lib_ids.find(String::num_int64(lib_id + INT64_MIN));
+			if (id_at != -1) {
+				//It's actually a rename
+				collapsed_lib_names.set(id_at, lib_name);
+			} else {
+				//It's a new entry
+				collapsed_lib_names.append(lib_name);
+				collapsed_lib_ids.append(String::num_int64(lib_id + INT64_MIN));
+			}
 		}
 	} else {
-		collapsed_libs.erase(lib_name);
+		if (at != -1) {
+			collapsed_lib_names.remove_at(at);
+			collapsed_lib_ids.remove_at(at);
+		}
 	}
 
-	// Plan B recovery mechanism.
+	//Runtime IDs
+	config->set_value(md, "root", uint64_t(mixer->get_tree()->get_edited_scene_root()->get_instance_id()));
+	config->set_value(md, "mixer", uint64_t(mixer->get_instance_id()));
+
+	//Plan B recovery mechanism
 	config->set_value(md, "mixer_signature", _get_mixer_signature());
 
-	// Save folding state as text and runtime ID.
-	config->set_value(md, "folding", collapsed_libs);
-
-	// Remove deprecated keys.
-	if (config->has_section_key(md, "id")) {
-		config->erase_section_key(md, "id");
-	}
-	if (config->has_section_key(md, "root")) {
-		config->erase_section_key(md, "root");
-	}
-	if (config->has_section_key(md, "mixer")) {
-		config->erase_section_key(md, "mixer");
-	}
+	//Save folding state as text and runtime ID
+	config->set_value(md, "folding", String("\n").join(collapsed_lib_names));
+	config->set_value(md, "id", String("\n").join(collapsed_lib_ids));
 
 	err = config->save(path);
 	if (err != OK) {
@@ -851,28 +874,48 @@ void AnimationLibraryEditor::_save_mixer_lib_folding(TreeItem *p_item) {
 	}
 }
 
-Vector<String> AnimationLibraryEditor::_load_mixer_libs_folding() {
+Vector<uint64_t> AnimationLibraryEditor::_load_mixer_libs_folding() {
 	Ref<ConfigFile> config;
 	config.instantiate();
 
 	String path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("lib_folding.cfg");
 	Error err = config->load(path);
-	ERR_FAIL_COND_V_MSG(err != OK && err != ERR_FILE_NOT_FOUND, Vector<String>(), "Error loading lib_folding.cfg: " + itos(err));
+	if (err != OK && err != ERR_FILE_NOT_FOUND) {
+		ERR_PRINT("Error loading lib_folding.cfg: " + itos(err));
+		return Vector<uint64_t>();
+	}
 
-	// Get unique identifier for this scene+mixer combination.
-	const String md = (mixer->get_tree()->get_edited_scene_root()->get_scene_file_path() + String(mixer->get_path())).md5_text();
+	// Get unique identifier for this scene+mixer combination
+	String md = (mixer->get_tree()->get_edited_scene_root()->get_scene_file_path() + String(mixer->get_path())).md5_text();
 
-	if (!config->has_section(md)) {
-		// The scene/mixer combination is no longer valid and we'll try to recover.
+	Vector<uint64_t> collapsed_lib_ids;
+
+	if (config->has_section(md)) {
+		_load_config_libs_folding(collapsed_lib_ids, config.ptr(), md);
+
+	} else {
+		//The scene/mixer combination is no longer valid and we'll try to recover
+		uint64_t current_mixer_id = uint64_t(mixer->get_instance_id());
 		String current_mixer_signature = _get_mixer_signature();
+		Vector<String> sections = config->get_sections();
 
-		for (const String &section : config->get_sections()) {
-			if (config->get_value(section, "mixer_signature") == current_mixer_signature) {
-				config->set_value(md, "mixer_signature", current_mixer_signature);
-				config->set_value(md, "folding", config->get_value(section, "folding", PackedStringArray()));
+		for (const String &section : sections) {
+			Variant mixer_id = config->get_value(section, "mixer");
+			if ((mixer_id.get_type() == Variant::INT && uint64_t(mixer_id) == current_mixer_id) || config->get_value(section, "mixer_signature") == current_mixer_signature) { // Ensure value exists and is correct type
+				// Found the mixer in a different section!
+				_load_config_libs_folding(collapsed_lib_ids, config.ptr(), section);
 
+				//Cleanup old entry and copy fold data into new one!
+				String collapsed_lib_names_str = String(config->get_value(section, "folding"));
+				String collapsed_lib_ids_str = String(config->get_value(section, "id"));
 				config->erase_section(section);
 
+				config->set_value(md, "root", uint64_t(mixer->get_tree()->get_edited_scene_root()->get_instance_id()));
+				config->set_value(md, "mixer", uint64_t(mixer->get_instance_id()));
+				config->set_value(md, "mixer_signature", _get_mixer_signature());
+				config->set_value(md, "folding", collapsed_lib_names_str);
+				config->set_value(md, "id", collapsed_lib_ids_str);
+
 				err = config->save(path);
 				if (err != OK) {
 					ERR_PRINT("Error saving lib_folding.cfg: " + itos(err));
@@ -882,14 +925,33 @@ Vector<String> AnimationLibraryEditor::_load_mixer_libs_folding() {
 		}
 	}
 
-	return config->get_value(md, "folding", PackedStringArray());
+	return collapsed_lib_ids;
+}
+
+void AnimationLibraryEditor::_load_config_libs_folding(Vector<uint64_t> &p_lib_ids, ConfigFile *p_config, String p_section) {
+	if (uint64_t(p_config->get_value(p_section, "root", 0)) != uint64_t(mixer->get_tree()->get_edited_scene_root()->get_instance_id())) {
+		// Root changed - tries to match by library names
+		PackedStringArray collapsed_lib_names = String(p_config->get_value(p_section, "folding", "")).split("\n");
+		for (const String &lib_name : collapsed_lib_names) {
+			if (mixer->has_animation_library(lib_name)) {
+				p_lib_ids.append(mixer->get_animation_library(lib_name)->get_instance_id());
+			} else {
+				print_line("Can't find ", lib_name, " in mixer");
+			}
+		}
+	} else {
+		// Root same - uses saved instance IDs
+		for (const String &saved_id : String(p_config->get_value(p_section, "id")).split("\n")) {
+			p_lib_ids.append(uint64_t(saved_id.to_int() - INT64_MIN));
+		}
+	}
 }
 
 String AnimationLibraryEditor::_get_mixer_signature() const {
 	String signature = String();
 
 	// Get all libraries sorted for consistency
-	LocalVector<StringName> libs;
+	List<StringName> libs;
 	mixer->get_animation_library_list(&libs);
 	libs.sort_custom<StringName::AlphCompare>();
 
@@ -898,7 +960,7 @@ String AnimationLibraryEditor::_get_mixer_signature() const {
 		signature += "::" + String(lib_name);
 		Ref<AnimationLibrary> lib = mixer->get_animation_library(lib_name);
 		if (lib.is_valid()) {
-			LocalVector<StringName> anims;
+			List<StringName> anims;
 			lib->get_animation_list(&anims);
 			anims.sort_custom<StringName::AlphCompare>();
 			for (const StringName &anim_name : anims) {
@@ -920,12 +982,7 @@ void AnimationLibraryEditor::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			new_library_button->set_button_icon(get_editor_theme_icon(SNAME("Add")));
 			load_library_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
-		} break;
-
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			tree->set_column_title(0, TTR("Resource"));
-			tree->set_column_title(1, TTR("Storage"));
-		} break;
+		}
 	}
 }
 
@@ -960,7 +1017,7 @@ void AnimationLibraryEditor::_bind_methods() {
 }
 
 AnimationLibraryEditor::AnimationLibraryEditor() {
-	set_title(TTRC("Edit Animation Libraries"));
+	set_title(TTR("Edit Animation Libraries"));
 	set_process_shortcut_input(true);
 
 	file_dialog = memnew(EditorFileDialog);
@@ -969,8 +1026,6 @@ AnimationLibraryEditor::AnimationLibraryEditor() {
 	file_dialog->connect("files_selected", callable_mp(this, &AnimationLibraryEditor::_load_files));
 
 	add_library_dialog = memnew(ConfirmationDialog);
-	add_library_dialog->set_title(TTRC("Library Name:"));
-
 	VBoxContainer *dialog_vb = memnew(VBoxContainer);
 	add_library_name = memnew(LineEdit);
 	dialog_vb->add_child(add_library_name);
@@ -986,33 +1041,31 @@ AnimationLibraryEditor::AnimationLibraryEditor() {
 	VBoxContainer *vb = memnew(VBoxContainer);
 	HBoxContainer *hb = memnew(HBoxContainer);
 	hb->add_spacer(true);
-	new_library_button = memnew(Button(TTRC("New Library")));
-	new_library_button->set_tooltip_text(TTRC("Create new empty animation library."));
+	new_library_button = memnew(Button(TTR("New Library")));
+	new_library_button->set_tooltip_text(TTR("Create new empty animation library."));
 	new_library_button->connect(SceneStringName(pressed), callable_mp(this, &AnimationLibraryEditor::_add_library));
 	hb->add_child(new_library_button);
-	load_library_button = memnew(Button(TTRC("Load Library")));
-	load_library_button->set_tooltip_text(TTRC("Load animation library from disk."));
+	load_library_button = memnew(Button(TTR("Load Library")));
+	load_library_button->set_tooltip_text(TTR("Load animation library from disk."));
 	load_library_button->connect(SceneStringName(pressed), callable_mp(this, &AnimationLibraryEditor::_load_library));
 	hb->add_child(load_library_button);
 	vb->add_child(hb);
-
-	MarginContainer *mc = memnew(MarginContainer);
-	mc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	mc->set_theme_type_variation("NoBorderHorizontalWindow");
-	vb->add_child(mc);
-
 	tree = memnew(Tree);
+	vb->add_child(tree);
+
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	tree->set_theme_type_variation("TreeTable");
 	tree->set_columns(2);
 	tree->set_column_titles_visible(true);
+	tree->set_column_title(0, TTR("Resource"));
+	tree->set_column_title(1, TTR("Storage"));
 	tree->set_column_expand(0, true);
 	tree->set_column_custom_minimum_width(1, EDSCALE * 250);
 	tree->set_column_expand(1, false);
 	tree->set_hide_root(true);
 	tree->set_hide_folding(false);
-	tree->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTTOM);
-	mc->add_child(tree);
+	tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+
 	tree->connect("item_edited", callable_mp(this, &AnimationLibraryEditor::_item_renamed));
 	tree->connect("button_clicked", callable_mp(this, &AnimationLibraryEditor::_button_pressed));
 	tree->connect("item_collapsed", callable_mp(this, &AnimationLibraryEditor::_save_mixer_lib_folding));
@@ -1024,6 +1077,6 @@ AnimationLibraryEditor::AnimationLibraryEditor() {
 	add_child(vb);
 
 	error_dialog = memnew(AcceptDialog);
-	error_dialog->set_title(TTRC("Error:"));
+	error_dialog->set_title(TTR("Error:"));
 	add_child(error_dialog);
 }
diff --git a/engine/editor/animation/animation_library_editor.h b/engine/editor/animation/animation_library_editor.h
index a5504711..6f00de37 100644
--- a/engine/editor/animation/animation_library_editor.h
+++ b/engine/editor/animation/animation_library_editor.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/config_file.h"
 #include "core/templates/vector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_mixer.h"
@@ -103,7 +104,8 @@ class AnimationLibraryEditor : public AcceptDialog {
 	void _load_files(const PackedStringArray &p_paths);
 
 	void _save_mixer_lib_folding(TreeItem *p_item);
-	Vector<String> _load_mixer_libs_folding();
+	Vector<uint64_t> _load_mixer_libs_folding();
+	void _load_config_libs_folding(Vector<uint64_t> &p_lib_ids, ConfigFile *p_config, String p_section);
 	String _get_mixer_signature() const;
 
 	void _item_renamed();
diff --git a/engine/editor/animation/animation_player_editor_plugin.cpp b/engine/editor/animation/animation_player_editor_plugin.cpp
index a186955b..217d3ea0 100644
--- a/engine/editor/animation/animation_player_editor_plugin.cpp
+++ b/engine/editor/animation/animation_player_editor_plugin.cpp
@@ -32,10 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/inspector_dock.h"
@@ -52,11 +49,9 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/separator.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/image_texture.h"
-#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 ///////////////////////////////////
@@ -472,12 +467,12 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 			Node *root = player->get_node_or_null(player->get_root_node());
 
 			// Player shouldn't access parent if it's the scene root.
-			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == NodePath(".."))) {
+			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == SceneStringName(path_pp))) {
 				NodePath cached_root_path = player->get_path_to(get_cached_root_node());
 				if (player->get_node_or_null(cached_root_path) != nullptr) {
 					player->set_root_node(cached_root_path);
 				} else {
-					player->set_root_node(NodePath("..")); // No other choice, preventing crash.
+					player->set_root_node(SceneStringName(path_pp)); // No other choice, preventing crash.
 				}
 			} else {
 				cached_root_node_id = root->get_instance_id(); // Caching as `track_editor` can lose track of player's root node.
@@ -829,8 +824,10 @@ void AnimationPlayerEditor::_update_animation_blend() {
 
 	blend_editor.tree->clear();
 
-	StringName current = animation->get_item_text(animation->get_selected());
+	String current = animation->get_item_text(animation->get_selected());
 
+	List<StringName> anims;
+	player->get_animation_list(&anims);
 	TreeItem *root = blend_editor.tree->create_item();
 	updating_blends = true;
 
@@ -839,7 +836,7 @@ void AnimationPlayerEditor::_update_animation_blend() {
 	blend_editor.next->clear();
 	blend_editor.next->add_item("", i);
 
-	for (const StringName &to : player->get_sorted_animation_list()) {
+	for (const StringName &to : anims) {
 		TreeItem *blend = blend_editor.tree->create_item(root);
 		blend->set_editable(0, false);
 		blend->set_editable(1, true);
@@ -1036,11 +1033,10 @@ void AnimationPlayerEditor::_update_player() {
 		return;
 	}
 
-	LocalVector<StringName> libraries;
+	List<StringName> libraries;
 	player->get_animation_library_list(&libraries);
 
 	int active_idx = -1;
-	int reset_index = -1;
 	bool no_anims_found = true;
 	bool global_animation_library_is_readonly = false;
 	bool all_animation_libraries_are_readonly = libraries.size() > 0;
@@ -1061,7 +1057,7 @@ void AnimationPlayerEditor::_update_player() {
 			}
 		}
 
-		LocalVector<StringName> animlist;
+		List<StringName> animlist;
 		anim_library->get_animation_list(&animlist);
 
 		for (const StringName &E : animlist) {
@@ -1070,9 +1066,6 @@ void AnimationPlayerEditor::_update_player() {
 				path += "/";
 			}
 			path += E;
-			if (E == SceneStringName(RESET)) {
-				reset_index = animation->get_item_count();
-			}
 			animation->add_item(path);
 			if (player->get_assigned_animation() == path) {
 				active_idx = animation->get_selectable_item(true);
@@ -1092,10 +1085,7 @@ void AnimationPlayerEditor::_update_player() {
 		autoplay->set_pressed(animation->get_item_text(active_idx) == player->get_autoplay());
 		_animation_selected(active_idx);
 	} else if (animation->has_selectable_items()) {
-		int item = reset_index;
-		if (item == -1) {
-			item = animation->get_selectable_item();
-		}
+		int item = animation->get_selectable_item();
 		animation->select(item);
 		autoplay->set_pressed(animation->get_item_text(item) == player->get_autoplay());
 		_animation_selected(item);
@@ -1167,7 +1157,7 @@ void AnimationPlayerEditor::_update_name_dialog_library_dropdown() {
 		}
 	}
 
-	LocalVector<StringName> libraries;
+	List<StringName> libraries;
 	player->get_animation_library_list(&libraries);
 	library->clear();
 
@@ -1509,7 +1499,7 @@ void AnimationPlayerEditor::_current_animation_changed(const StringName &p_name)
 		}
 
 		// Determine the read-only status of the animation's library and the libraries as a whole.
-		LocalVector<StringName> libraries;
+		List<StringName> libraries;
 		player->get_animation_library_list(&libraries);
 
 		bool current_animation_library_is_readonly = false;
@@ -1521,7 +1511,7 @@ void AnimationPlayerEditor::_current_animation_changed(const StringName &p_name)
 				all_animation_libraries_are_readonly = false;
 			}
 
-			LocalVector<StringName> animlist;
+			List<StringName> animlist;
 			anim_library->get_animation_list(&animlist);
 			bool animation_found = false;
 			for (const StringName &E : animlist) {
@@ -1717,7 +1707,7 @@ void AnimationPlayerEditor::_editor_visibility_changed() {
 bool AnimationPlayerEditor::_are_onion_layers_valid() {
 	ERR_FAIL_COND_V(!onion.past && !onion.future, false);
 
-	Size2 capture_size = DisplayServer::get_singleton()->window_get_size(DisplayServerEnums::MAIN_WINDOW_ID);
+	Size2 capture_size = DisplayServer::get_singleton()->window_get_size(DisplayServer::MAIN_WINDOW_ID);
 	return onion.captures.size() == onion.get_capture_count() && onion.capture_size == capture_size;
 }
 
@@ -1725,7 +1715,7 @@ void AnimationPlayerEditor::_allocate_onion_layers() {
 	_free_onion_layers();
 
 	int captures = onion.get_capture_count();
-	Size2 capture_size = DisplayServer::get_singleton()->window_get_size(DisplayServerEnums::MAIN_WINDOW_ID);
+	Size2 capture_size = DisplayServer::get_singleton()->window_get_size(DisplayServer::MAIN_WINDOW_ID);
 
 	onion.captures.resize(captures);
 	onion.captures_valid.resize(captures);
@@ -1737,7 +1727,7 @@ void AnimationPlayerEditor::_allocate_onion_layers() {
 		onion.captures[i] = RS::get_singleton()->viewport_create();
 
 		RS::get_singleton()->viewport_set_size(onion.captures[i], capture_size.width, capture_size.height);
-		RS::get_singleton()->viewport_set_update_mode(onion.captures[i], RSE::VIEWPORT_UPDATE_ALWAYS);
+		RS::get_singleton()->viewport_set_update_mode(onion.captures[i], RS::VIEWPORT_UPDATE_ALWAYS);
 		RS::get_singleton()->viewport_set_transparent_background(onion.captures[i], !is_present);
 		RS::get_singleton()->viewport_attach_canvas(onion.captures[i], onion.capture.canvas);
 	}
@@ -1836,9 +1826,9 @@ void AnimationPlayerEditor::_prepare_onion_layers_2_prolog() {
 
 	// Tweak the root viewport to ensure it's rendered before our target.
 	RID root_vp = get_tree()->get_root()->get_viewport_rid();
-	onion.temp.screen_rect = Rect2(Vector2(), DisplayServer::get_singleton()->window_get_size(DisplayServerEnums::MAIN_WINDOW_ID));
-	RS::get_singleton()->viewport_attach_to_screen(root_vp, Rect2(), DisplayServerEnums::INVALID_WINDOW_ID);
-	RS::get_singleton()->viewport_set_update_mode(root_vp, RSE::VIEWPORT_UPDATE_ALWAYS);
+	onion.temp.screen_rect = Rect2(Vector2(), DisplayServer::get_singleton()->window_get_size(DisplayServer::MAIN_WINDOW_ID));
+	RS::get_singleton()->viewport_attach_to_screen(root_vp, Rect2(), DisplayServer::INVALID_WINDOW_ID);
+	RS::get_singleton()->viewport_set_update_mode(root_vp, RS::VIEWPORT_UPDATE_ALWAYS);
 
 	RID present_rid;
 	if (onion.differences_only) {
@@ -1923,8 +1913,8 @@ void AnimationPlayerEditor::_prepare_onion_layers_2_epilog() {
 	// Restore root viewport.
 	RID root_vp = get_tree()->get_root()->get_viewport_rid();
 	RS::get_singleton()->viewport_set_parent_viewport(root_vp, RID());
-	RS::get_singleton()->viewport_attach_to_screen(root_vp, onion.temp.screen_rect, DisplayServerEnums::MAIN_WINDOW_ID);
-	RS::get_singleton()->viewport_set_update_mode(root_vp, RSE::VIEWPORT_UPDATE_WHEN_VISIBLE);
+	RS::get_singleton()->viewport_attach_to_screen(root_vp, onion.temp.screen_rect, DisplayServer::MAIN_WINDOW_ID);
+	RS::get_singleton()->viewport_set_update_mode(root_vp, RS::VIEWPORT_UPDATE_WHEN_VISIBLE);
 
 	// Restore animation state.
 	// Here we're combine the power of seeking back to the original position and
@@ -2117,7 +2107,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	frame->set_custom_minimum_size(Size2(80, 0) * EDSCALE);
 	frame->set_stretch_ratio(2);
 	frame->set_step(0.0001);
-	frame->set_tooltip_text(TTRC("Animation position (in seconds)."));
+	frame->set_tooltip_text(TTR("Animation position (in seconds)."));
 
 	hb->add_child(memnew(VSeparator));
 
@@ -2125,7 +2115,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	hb->add_child(scale);
 	scale->set_h_size_flags(SIZE_EXPAND_FILL);
 	scale->set_stretch_ratio(1);
-	scale->set_tooltip_text(TTRC("Scale animation playback globally for the node."));
+	scale->set_tooltip_text(TTR("Scale animation playback globally for the node."));
 	scale->hide();
 
 	delete_dialog = memnew(ConfirmationDialog);
@@ -2135,8 +2125,8 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	tool_anim = memnew(MenuButton);
 	tool_anim->set_shortcut_context(this);
 	tool_anim->set_flat(false);
-	tool_anim->set_tooltip_text(TTRC("Animation Tools"));
-	tool_anim->set_text(TTRC("Animation"));
+	tool_anim->set_tooltip_text(TTR("Animation Tools"));
+	tool_anim->set_text(TTR("Animation"));
 	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/new_animation", TTRC("New...")), TOOL_NEW_ANIM);
 	tool_anim->get_popup()->add_separator();
 	tool_anim->get_popup()->add_shortcut(ED_SHORTCUT("animation_player_editor/animation_libraries", TTRC("Manage Animations...")), TOOL_ANIM_LIBRARY);
@@ -2156,14 +2146,14 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	hb->add_child(animation);
 	animation->set_accessibility_name(TTRC("Animation"));
 	animation->set_h_size_flags(SIZE_EXPAND_FILL);
-	animation->set_tooltip_text(TTRC("Display list of animations in player."));
+	animation->set_tooltip_text(TTR("Display list of animations in player."));
 	animation->set_clip_text(true);
 	animation->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 
 	autoplay = memnew(Button);
 	autoplay->set_theme_type_variation(SceneStringName(FlatButton));
 	hb->add_child(autoplay);
-	autoplay->set_tooltip_text(TTRC("Autoplay on Load"));
+	autoplay->set_tooltip_text(TTR("Autoplay on Load"));
 
 	hb->add_child(memnew(VSeparator));
 
@@ -2175,7 +2165,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	onion_toggle = memnew(Button);
 	onion_toggle->set_theme_type_variation(SceneStringName(FlatButton));
 	onion_toggle->set_toggle_mode(true);
-	onion_toggle->set_tooltip_text(TTRC("Enable Onion Skinning"));
+	onion_toggle->set_tooltip_text(TTR("Enable Onion Skinning"));
 	onion_toggle->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_onion_skinning_menu).bind(ONION_SKINNING_ENABLE));
 	hb->add_child(onion_toggle);
 
@@ -2183,22 +2173,22 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	onion_skinning->set_accessibility_name(TTRC("Onion Skinning Options"));
 	onion_skinning->set_flat(false);
 	onion_skinning->set_theme_type_variation("FlatMenuButton");
-	onion_skinning->set_tooltip_text(TTRC("Onion Skinning Options"));
-	onion_skinning->get_popup()->add_separator(TTRC("Directions"));
+	onion_skinning->set_tooltip_text(TTR("Onion Skinning Options"));
+	onion_skinning->get_popup()->add_separator(TTR("Directions"));
 	// TRANSLATORS: Opposite of "Future", refers to a direction in animation onion skinning.
-	onion_skinning->get_popup()->add_check_item(TTRC("Past"), ONION_SKINNING_PAST);
+	onion_skinning->get_popup()->add_check_item(TTR("Past"), ONION_SKINNING_PAST);
 	onion_skinning->get_popup()->set_item_checked(-1, true);
 	// TRANSLATORS: Opposite of "Past", refers to a direction in animation onion skinning.
-	onion_skinning->get_popup()->add_check_item(TTRC("Future"), ONION_SKINNING_FUTURE);
-	onion_skinning->get_popup()->add_separator(TTRC("Depth"));
-	onion_skinning->get_popup()->add_radio_check_item(TTRC("1 step"), ONION_SKINNING_1_STEP);
+	onion_skinning->get_popup()->add_check_item(TTR("Future"), ONION_SKINNING_FUTURE);
+	onion_skinning->get_popup()->add_separator(TTR("Depth"));
+	onion_skinning->get_popup()->add_radio_check_item(TTR("1 step"), ONION_SKINNING_1_STEP);
 	onion_skinning->get_popup()->set_item_checked(-1, true);
-	onion_skinning->get_popup()->add_radio_check_item(TTRC("2 steps"), ONION_SKINNING_2_STEPS);
-	onion_skinning->get_popup()->add_radio_check_item(TTRC("3 steps"), ONION_SKINNING_3_STEPS);
+	onion_skinning->get_popup()->add_radio_check_item(TTR("2 steps"), ONION_SKINNING_2_STEPS);
+	onion_skinning->get_popup()->add_radio_check_item(TTR("3 steps"), ONION_SKINNING_3_STEPS);
 	onion_skinning->get_popup()->add_separator();
-	onion_skinning->get_popup()->add_check_item(TTRC("Differences Only"), ONION_SKINNING_DIFFERENCES_ONLY);
-	onion_skinning->get_popup()->add_check_item(TTRC("Force White Modulate"), ONION_SKINNING_FORCE_WHITE_MODULATE);
-	onion_skinning->get_popup()->add_check_item(TTRC("Include Gizmos (3D)"), ONION_SKINNING_INCLUDE_GIZMOS);
+	onion_skinning->get_popup()->add_check_item(TTR("Differences Only"), ONION_SKINNING_DIFFERENCES_ONLY);
+	onion_skinning->get_popup()->add_check_item(TTR("Force White Modulate"), ONION_SKINNING_FORCE_WHITE_MODULATE);
+	onion_skinning->get_popup()->add_check_item(TTR("Include Gizmos (3D)"), ONION_SKINNING_INCLUDE_GIZMOS);
 	onion_skinning->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &AnimationPlayerEditor::_onion_skinning_menu));
 	hb->add_child(onion_skinning);
 
@@ -2207,7 +2197,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	pin = memnew(Button);
 	pin->set_theme_type_variation(SceneStringName(FlatButton));
 	pin->set_toggle_mode(true);
-	pin->set_tooltip_text(TTRC("Pin AnimationPlayer"));
+	pin->set_tooltip_text(TTR("Pin AnimationPlayer"));
 	hb->add_child(pin);
 	pin->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_pin_pressed));
 
@@ -2215,13 +2205,13 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	add_child(file);
 
 	name_dialog = memnew(ConfirmationDialog);
-	name_dialog->set_title(TTRC("Create New Animation"));
+	name_dialog->set_title(TTR("Create New Animation"));
 	name_dialog->set_hide_on_ok(false);
 	add_child(name_dialog);
 	VBoxContainer *vb = memnew(VBoxContainer);
 	name_dialog->add_child(vb);
 
-	name_title = memnew(Label(TTRC("Animation Name:")));
+	name_title = memnew(Label(TTR("Animation Name:")));
 	vb->add_child(name_title);
 
 	HBoxContainer *name_hb = memnew(HBoxContainer);
@@ -2235,15 +2225,15 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	name_dialog->register_text_enter(name);
 
 	error_dialog = memnew(AcceptDialog);
-	error_dialog->set_ok_button_text(TTRC("Close"));
-	error_dialog->set_title(TTRC("Error!"));
+	error_dialog->set_ok_button_text(TTR("Close"));
+	error_dialog->set_title(TTR("Error!"));
 	name_dialog->add_child(error_dialog);
 
 	name_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationPlayerEditor::_animation_name_edited));
 
 	blend_editor.dialog = memnew(AcceptDialog);
-	blend_editor.dialog->set_title(TTRC("Cross-Animation Blend Times"));
-	blend_editor.dialog->set_ok_button_text(TTRC("Close"));
+	blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times"));
+	blend_editor.dialog->set_ok_button_text(TTR("Close"));
 	blend_editor.dialog->set_hide_on_ok(true);
 	add_child(blend_editor.dialog);
 
@@ -2258,14 +2248,13 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	blend_editor.tree->set_column_clip_content(0, true);
 	blend_editor.tree->set_column_expand_ratio(1, 3);
 	blend_editor.tree->set_column_clip_content(1, true);
-	blend_editor.tree->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
-	blend_vb->add_margin_child(TTRC("Blend Times:"), blend_editor.tree, true)->set_theme_type_variation("NoBorderHorizontalWindow");
+	blend_vb->add_margin_child(TTR("Blend Times:"), blend_editor.tree, true);
 	blend_editor.tree->connect(SNAME("item_edited"), callable_mp(this, &AnimationPlayerEditor::_blend_edited));
 
 	blend_editor.next = memnew(OptionButton);
 	blend_editor.next->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	blend_editor.next->connect(SceneStringName(item_selected), callable_mp(this, &AnimationPlayerEditor::_blend_editor_next_changed));
-	blend_vb->add_margin_child(TTRC("Next (Auto Queue):"), blend_editor.next);
+	blend_vb->add_margin_child(TTR("Next (Auto Queue):"), blend_editor.next);
 
 	autoplay->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_autoplay_pressed));
 	autoplay->set_toggle_mode(true);
@@ -2462,13 +2451,7 @@ void AnimationPlayerEditorPlugin::_update_dummy_player(AnimationMixer *p_mixer)
 	memdelete(default_node);
 
 	// Library list is dynamically added to property list, should be copied explicitly.
-	LocalVector<StringName> existing_libs;
-	dummy_player->get_animation_library_list(&existing_libs);
-	for (const StringName &K : existing_libs) {
-		dummy_player->remove_animation_library(K);
-	}
-
-	LocalVector<StringName> libraries;
+	List<StringName> libraries;
 	p_mixer->get_animation_library_list(&libraries);
 	for (const StringName &K : libraries) {
 		dummy_player->add_animation_library(K, p_mixer->get_animation_library(K));
@@ -2485,6 +2468,10 @@ bool AnimationPlayerEditorPlugin::handles(Object *p_object) const {
 
 void AnimationPlayerEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
+		// if AnimationTree editor is visible, do not occupy the bottom panel
+		if (AnimationTreeEditor::get_singleton() && AnimationTreeEditor::get_singleton()->is_visible_in_tree()) {
+			return;
+		}
 		anim_editor->make_visible();
 		anim_editor->set_process(true);
 		anim_editor->ensure_visibility();
diff --git a/engine/editor/animation/animation_player_editor_plugin.h b/engine/editor/animation/animation_player_editor_plugin.h
index b178dd0f..c662d2e0 100644
--- a/engine/editor/animation/animation_player_editor_plugin.h
+++ b/engine/editor/animation/animation_player_editor_plugin.h
@@ -36,9 +36,10 @@
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/dialogs.h"
+#include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
+#include "scene/gui/texture_button.h"
 #include "scene/gui/tree.h"
-#include "scene/resources/material.h"
 
 class AnimationPlayerEditorPlugin;
 class ImageTexture;
@@ -305,6 +306,7 @@ public:
 	virtual void clear() override { anim_editor->clear(); }
 
 	virtual String get_plugin_name() const override { return "Anim"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
@@ -331,9 +333,10 @@ public:
 class AnimationTrackKeyEditEditorPlugin : public EditorPlugin {
 	GDCLASS(AnimationTrackKeyEditEditorPlugin, EditorPlugin);
 
-	Ref<EditorInspectorPluginAnimationTrackKeyEdit> atk_plugin;
+	EditorInspectorPluginAnimationTrackKeyEdit *atk_plugin = nullptr;
 
 public:
+	bool has_main_screen() const override { return false; }
 	virtual bool handles(Object *p_object) const override;
 
 	virtual String get_plugin_name() const override { return "AnimationTrackKeyEdit"; }
@@ -356,9 +359,10 @@ public:
 class AnimationMarkerKeyEditEditorPlugin : public EditorPlugin {
 	GDCLASS(AnimationMarkerKeyEditEditorPlugin, EditorPlugin);
 
-	Ref<EditorInspectorPluginAnimationMarkerKeyEdit> amk_plugin;
+	EditorInspectorPluginAnimationMarkerKeyEdit *amk_plugin = nullptr;
 
 public:
+	bool has_main_screen() const override { return false; }
 	virtual bool handles(Object *p_object) const override;
 
 	virtual String get_plugin_name() const override { return "AnimationMarkerKeyEdit"; }
diff --git a/engine/editor/animation/animation_state_machine_editor.cpp b/engine/editor/animation/animation_state_machine_editor.cpp
index 7c60db2d..7e3da079 100644
--- a/engine/editor/animation/animation_state_machine_editor.cpp
+++ b/engine/editor/animation/animation_state_machine_editor.cpp
@@ -32,8 +32,6 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -44,7 +42,6 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
@@ -824,7 +821,8 @@ void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {
 	animations_menu->clear();
 	animations_to_add.clear();
 
-	LocalVector<StringName> animation_names = tree->get_sorted_animation_list();
+	List<StringName> animation_names;
+	tree->get_animation_list(&animation_names);
 	menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
 	if (animation_names.is_empty()) {
 		menu->set_item_disabled(menu->get_item_idx_from_text(TTR("Add Animation")), true);
@@ -972,8 +970,6 @@ void AnimationNodeStateMachineEditor::_add_menu_type(int p_index) {
 	undo_redo->add_undo_method(state_machine.ptr(), "remove_node", name);
 	connecting_to_node = name;
 	_add_transition(true);
-	undo_redo->add_do_method(this, "_update_graph");
-	undo_redo->add_undo_method(this, "_update_graph");
 	undo_redo->commit_action();
 	updating = false;
 
@@ -986,7 +982,7 @@ void AnimationNodeStateMachineEditor::_add_animation_type(int p_index) {
 
 	anim->set_animation(animations_to_add[p_index]);
 
-	String base_name = String(animations_to_add[p_index]).validate_node_name();
+	String base_name = animations_to_add[p_index].validate_node_name();
 	int base = 1;
 	String name = base_name;
 	while (state_machine->has_node(name)) {
@@ -1001,8 +997,6 @@ void AnimationNodeStateMachineEditor::_add_animation_type(int p_index) {
 	undo_redo->add_undo_method(state_machine.ptr(), "remove_node", name);
 	connecting_to_node = name;
 	_add_transition(true);
-	undo_redo->add_do_method(this, "_update_graph");
-	undo_redo->add_undo_method(this, "_update_graph");
 	undo_redo->commit_action();
 	updating = false;
 
@@ -1666,7 +1660,7 @@ void AnimationNodeStateMachineEditor::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			panel->add_theme_style_override(SceneStringName(panel), theme_cache.panel_style);
 			error_panel->add_theme_style_override(SceneStringName(panel), theme_cache.error_panel_style);
-			error_label->add_theme_color_override(SNAME("default_color"), theme_cache.error_color);
+			error_label->add_theme_color_override(SceneStringName(font_color), theme_cache.error_color);
 
 			tool_select->set_button_icon(theme_cache.tool_icon_select);
 			tool_create->set_button_icon(theme_cache.tool_icon_create);
@@ -1697,14 +1691,24 @@ void AnimationNodeStateMachineEditor::_notification(int p_what) {
 			Ref<AnimationNodeStateMachinePlayback> playback = tree->get(AnimationTreeEditor::get_singleton()->get_base_path() + "playback");
 
 			if (error_time > 0) {
+				error = error_text;
 				error_time -= get_process_delta_time();
+			} else {
+				error = tree->get_editor_error_message();
 			}
 
-			if (playback.is_null()) {
+			if (error.is_empty() && playback.is_null()) {
 				error = vformat(TTR("No playback resource set at path: %s."), AnimationTreeEditor::get_singleton()->get_base_path() + "playback");
 			}
 
-			update_error_message(tree, error_panel, error_label, &error);
+			if (error != error_label->get_text()) {
+				error_label->set_text(error);
+				if (!error.is_empty()) {
+					error_panel->show();
+				} else {
+					error_panel->hide();
+				}
+			}
 
 			for (int i = 0; i < transition_lines.size(); i++) {
 				int tidx = -1;
@@ -2159,7 +2163,8 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 
 	error_panel = memnew(PanelContainer);
 	add_child(error_panel);
-	error_label = create_error_label_node();
+	error_label = memnew(Label);
+	error_label->set_focus_mode(FOCUS_ACCESSIBILITY);
 	error_panel->add_child(error_label);
 	error_panel->hide();
 
diff --git a/engine/editor/animation/animation_state_machine_editor.h b/engine/editor/animation/animation_state_machine_editor.h
index 48e62de8..d2008b40 100644
--- a/engine/editor/animation/animation_state_machine_editor.h
+++ b/engine/editor/animation/animation_state_machine_editor.h
@@ -75,7 +75,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	Control *state_machine_play_pos = nullptr;
 
 	PanelContainer *error_panel = nullptr;
-	RichTextLabel *error_label = nullptr;
+	Label *error_label = nullptr;
 
 	struct ThemeCache {
 		Ref<StyleBox> panel_style;
@@ -144,7 +144,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	PopupMenu *state_machine_menu = nullptr;
 	PopupMenu *end_menu = nullptr;
 	PopupMenu *animations_menu = nullptr;
-	Vector<StringName> animations_to_add;
+	Vector<String> animations_to_add;
 	Vector<String> nodes_to_connect;
 
 	Vector2 add_node_pos;
@@ -280,6 +280,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	float fading_pos = 0.0f;
 
 	float error_time = 0.0f;
+	String error_text;
 
 	EditorFileDialog *open_file = nullptr;
 	Ref<AnimationNode> file_loaded;
diff --git a/engine/editor/animation/animation_track_editor.cpp b/engine/editor/animation/animation_track_editor.cpp
index e1660c57..aca00dca 100644
--- a/engine/editor/animation/animation_track_editor.cpp
+++ b/engine/editor/animation/animation_track_editor.cpp
@@ -30,16 +30,13 @@
 
 #include "animation_track_editor.h"
 
+#include "animation_track_editor_plugins.h"
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/input/input.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_bezier_editor.h"
 #include "editor/animation/animation_player_editor_plugin.h"
-#include "editor/animation/animation_track_editor_plugins.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -65,7 +62,6 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/audio/audio_stream.h"
 
@@ -637,7 +633,7 @@ void AnimationTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list) const
 
 		} break;
 		case Animation::TYPE_AUDIO: {
-			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("stream"), PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()));
+			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("stream"), PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
 			Ref<AudioStream> audio_stream = animation->audio_track_get_key_stream(track, key);
 			String hint_string = vformat("0,%.4f,0.0001,or_greater", audio_stream.is_valid() ? audio_stream->get_length() : 3600.0);
 			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("start_offset"), PROPERTY_HINT_RANGE, hint_string));
@@ -650,7 +646,9 @@ void AnimationTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list) const
 			if (root_path) {
 				AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node_or_null(animation->track_get_path(track)));
 				if (ap) {
-					for (const StringName &E : ap->get_sorted_animation_list()) {
+					List<StringName> anims;
+					ap->get_animation_list(&anims);
+					for (const StringName &E : anims) {
 						if (!animations.is_empty()) {
 							animations += ",";
 						}
@@ -1240,7 +1238,7 @@ void AnimationMultiTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list)
 				p_list->push_back(PropertyInfo(Variant::INT, "handle_mode", PROPERTY_HINT_ENUM, "Free,Linear,Balanced,Mirrored"));
 			} break;
 			case Animation::TYPE_AUDIO: {
-				p_list->push_back(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
 				p_list->push_back(PropertyInfo(Variant::FLOAT, "start_offset", PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
 				p_list->push_back(PropertyInfo(Variant::FLOAT, "end_offset", PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
 			} break;
@@ -1254,7 +1252,9 @@ void AnimationMultiTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list)
 				if (root_path) {
 					AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node_or_null(animation->track_get_path(first_track)));
 					if (ap) {
-						for (const StringName &anim : ap->get_sorted_animation_list()) {
+						List<StringName> anims;
+						ap->get_animation_list(&anims);
+						for (const StringName &anim : anims) {
 							if (!animations.is_empty()) {
 								animations += ",";
 							}
@@ -1464,15 +1464,15 @@ void AnimationTimelineEdit::_notification(int p_what) {
 			filter_track->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 
 			add_track->get_popup()->clear();
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyValue")), TTRC("Property Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXPosition")), TTRC("3D Position Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXRotation")), TTRC("3D Rotation Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXScale")), TTRC("3D Scale Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyBlendShape")), TTRC("Blend Shape Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyCall")), TTRC("Call Method Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyBezier")), TTRC("Bezier Curve Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyAudio")), TTRC("Audio Playback Track..."));
-			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyAnimation")), TTRC("Animation Playback Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyValue")), TTR("Property Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXPosition")), TTR("3D Position Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXRotation")), TTR("3D Rotation Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyXScale")), TTR("3D Scale Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyBlendShape")), TTR("Blend Shape Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyCall")), TTR("Call Method Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyBezier")), TTR("Bezier Curve Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyAudio")), TTR("Audio Playback Track..."));
+			add_track->get_popup()->add_icon_item(get_editor_theme_icon(SNAME("KeyAnimation")), TTR("Animation Playback Track..."));
 
 			timeline_resize_rect.size = get_editor_theme_icon(SNAME("TimelineHandle"))->get_size();
 		} break;
@@ -1485,7 +1485,7 @@ void AnimationTimelineEdit::_notification(int p_what) {
 		}
 		case NOTIFICATION_READY: {
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/animation_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_RESIZED: {
@@ -1495,6 +1495,15 @@ void AnimationTimelineEdit::_notification(int p_what) {
 			add_track_hb->set_size(Size2(name_limit - ((hsize_icon_width + 16) * EDSCALE), 0));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation timeline editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
@@ -2065,14 +2074,14 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 	add_child(add_track_hb);
 
 	add_track = memnew(MenuButton);
-	add_track->set_tooltip_text(TTRC("Select a new track by type to add to this animation."));
+	add_track->set_tooltip_text(TTR("Select a new track by type to add to this animation."));
 	add_track->set_position(Vector2(0, 0));
 	add_track_hb->add_child(add_track);
 	filter_track = memnew(LineEdit);
 	filter_track->set_h_size_flags(SIZE_EXPAND_FILL);
 	filter_track->set_custom_minimum_size(Vector2(120 * EDSCALE, 0));
-	filter_track->set_placeholder(TTRC("Filter Tracks"));
-	filter_track->set_tooltip_text(TTRC("Filter tracks by entering part of their node name or property."));
+	filter_track->set_placeholder(TTR("Filter Tracks"));
+	filter_track->set_tooltip_text(TTR("Filter tracks by entering part of their node name or property."));
 	filter_track->connect(SceneStringName(text_changed), callable_mp((AnimationTrackEditor *)this, &AnimationTrackEditor::_on_filter_updated));
 	filter_track->set_clear_button_enabled(true);
 	filter_track->hide();
@@ -2087,7 +2096,7 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 
 	time_icon = memnew(TextureRect);
 	time_icon->set_v_size_flags(SIZE_SHRINK_CENTER);
-	time_icon->set_tooltip_text(TTRC("Animation length (seconds)"));
+	time_icon->set_tooltip_text(TTR("Animation length (seconds)"));
 	len_hb->add_child(time_icon);
 
 	length = memnew(EditorSpinSlider);
@@ -2097,14 +2106,14 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 	length->set_allow_greater(true);
 	length->set_custom_minimum_size(Vector2(70 * EDSCALE, 0));
 	length->set_control_state(EditorSpinSlider::CONTROL_STATE_HIDE);
-	length->set_tooltip_text(TTRC("Animation length (seconds)"));
+	length->set_tooltip_text(TTR("Animation length (seconds)"));
 	length->set_accessibility_name(TTRC("Animation length (seconds)"));
 	length->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTimelineEdit::_anim_length_changed));
 	len_hb->add_child(length);
 
 	loop = memnew(Button);
 	loop->set_flat(true);
-	loop->set_tooltip_text(TTRC("Animation Looping"));
+	loop->set_tooltip_text(TTR("Animation Looping"));
 	loop->connect(SceneStringName(pressed), callable_mp(this, &AnimationTimelineEdit::_anim_loop_pressed));
 	loop->set_toggle_mode(true);
 	len_hb->add_child(loop);
@@ -2136,6 +2145,15 @@ void AnimationTrackEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("KeySelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation track editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null() || animation->get_track_count() == 0) {
 				return;
@@ -2181,9 +2199,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 			}
 
 			const Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
-			const Ref<Font> source_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
 			const int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
-			const int source_font_size = get_theme_font_size(SNAME("source_size"), EditorStringName(EditorFonts));
 			const Color color = get_theme_color(SceneStringName(font_color), SNAME("Label"));
 
 			const Color dc = get_theme_color(SNAME("font_disabled_color"), EditorStringName(Editor));
@@ -2191,9 +2207,6 @@ void AnimationTrackEdit::_notification(int p_what) {
 			// Names and icons.
 
 			{
-				Ref<Font> font_to_use = font;
-				int font_size_to_use = font_size;
-
 				Ref<Texture2D> check = animation->track_is_enabled(track) ? get_theme_icon(SNAME("checked"), SNAME("CheckBox")) : get_theme_icon(SNAME("unchecked"), SNAME("CheckBox"));
 
 				int ofs = in_group ? outer_margin : 0;
@@ -2228,13 +2241,6 @@ void AnimationTrackEdit::_notification(int p_what) {
 					} else {
 						text += anim_path.get_concatenated_subnames();
 					}
-
-					bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-					if (animation->track_get_type(track) == Animation::TYPE_VALUE && use_monospace_font) {
-						font_to_use = source_font;
-						font_size_to_use = source_font_size;
-					}
-
 					text_color.a *= 0.7;
 				} else if (node) {
 					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node);
@@ -2258,9 +2264,9 @@ void AnimationTrackEdit::_notification(int p_what) {
 
 				path_rect = Rect2(ofs, 0, limit - ofs - h_separation, get_size().height);
 
-				Vector2 string_pos = Point2(ofs, (get_size().height - font_to_use->get_height(font_size_to_use)) / 2 + font_to_use->get_ascent(font_size_to_use));
+				Vector2 string_pos = Point2(ofs, (get_size().height - font->get_height(font_size)) / 2 + font->get_ascent(font_size));
 				string_pos = string_pos.floor();
-				draw_string(font_to_use, string_pos, text, HORIZONTAL_ALIGNMENT_LEFT, limit - ofs - h_separation, font_size_to_use, text_color);
+				draw_string(font, string_pos, text, HORIZONTAL_ALIGNMENT_LEFT, limit - ofs - h_separation, font_size, text_color);
 
 				draw_line(Point2(limit, 0), Point2(limit, get_size().height), h_line_color, Math::round(EDSCALE));
 			}
@@ -2637,15 +2643,8 @@ void AnimationTrackEdit::draw_key(int p_index, float p_pixels_sec, int p_x, bool
 	Vector2 ofs(p_x - icon_to_draw->get_width() / 2, (get_size().height - icon_to_draw->get_height()) / 2);
 
 	if (animation->track_get_type(track) == Animation::TYPE_METHOD) {
-		bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-
-		Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
-		int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
-		if (use_monospace_font) {
-			font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
-			font_size = get_theme_font_size(SNAME("source_size"), EditorStringName(EditorFonts));
-		}
-
+		const Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
+		const int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
 		Color color = get_theme_color(SceneStringName(font_color), SNAME("Label"));
 		color.a = 0.5;
 
@@ -3245,13 +3244,51 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			// Can do something with menu too! show insert key.
 			float offset = (pos.x - timeline->get_name_limit()) / timeline->get_zoom_scale();
 			if (!read_only) {
-				_try_select_at_ui_pos(pos, mb->is_command_or_control_pressed() || mb->is_shift_pressed(), false);
+				if (!menu) {
+					menu = memnew(PopupMenu);
+					add_child(menu);
+					menu->connect(SceneStringName(id_pressed), callable_mp(this, &AnimationTrackEdit::_menu_selected));
+				}
+
+				bool selected = _try_select_at_ui_pos(pos, mb->is_command_or_control_pressed() || mb->is_shift_pressed(), false);
 				moving_selection_attempt = false;
 
+				menu->clear();
+				if (animation->track_get_type(track) == Animation::TYPE_METHOD) {
+					if (hovering_key_idx != -1) {
+						lookup_key_idx = hovering_key_idx;
+						menu->add_icon_item(get_editor_theme_icon(SNAME("Help")), vformat("%s (%s)", TTR("Go to Definition"), animation->method_track_get_name(track, lookup_key_idx)), MENU_KEY_LOOKUP);
+						menu->add_separator();
+					}
+				}
+				menu->add_icon_item(get_editor_theme_icon(SNAME("Key")), TTR("Insert Key..."), MENU_KEY_INSERT);
+				if (selected || editor->is_selection_active()) {
+					menu->add_separator();
+					menu->add_icon_item(get_editor_theme_icon(SNAME("Duplicate")), TTR("Duplicate Key(s)"), MENU_KEY_DUPLICATE);
+					menu->add_icon_item(get_editor_theme_icon(SNAME("ActionCut")), TTR("Cut Key(s)"), MENU_KEY_CUT);
+					menu->add_icon_item(get_editor_theme_icon(SNAME("ActionCopy")), TTR("Copy Key(s)"), MENU_KEY_COPY);
+				}
+				if (editor->is_key_clipboard_active()) {
+					menu->add_icon_item(get_editor_theme_icon(SNAME("ActionPaste")), TTR("Paste Key(s)"), MENU_KEY_PASTE);
+				}
+				if (selected || editor->is_selection_active()) {
+					AnimationPlayerEditor *ape = AnimationPlayerEditor::get_singleton();
+					if (ape) {
+						AnimationPlayer *ap = ape->get_player();
+						if (ap && editor->can_add_reset_key() && animation != ap->get_animation(SceneStringName(RESET))) {
+							menu->add_separator();
+							menu->add_icon_item(get_editor_theme_icon(SNAME("MoveUp")), TTR("Send Key(s) to RESET"), MENU_KEY_ADD_RESET);
+						}
+					}
+					menu->add_separator();
+					menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTR("Delete Key(s)"), MENU_KEY_DELETE);
+				}
+				menu->reset_size();
+
+				menu->set_position(get_screen_position() + get_local_mouse_position());
+				menu->popup();
+
 				insert_at_pos = offset + timeline->get_value();
-				Vector2 popup_pos = get_screen_position() + get_local_mouse_position();
-				// Use call_deferred to wait for the selected keys being updated.
-				callable_mp(this, &AnimationTrackEdit::_popup_key_context_menu).call_deferred(hovering_key_idx, popup_pos);
 				accept_event();
 			}
 		}
@@ -3484,7 +3521,7 @@ bool AnimationTrackEdit::_lookup_key(int p_key_idx) const {
 					ScriptEditor::get_singleton()->goto_help(vformat("class_method:%s:%s", target->get_class_name(), method));
 				} else {
 					// Still not found, which means the target doesn't have this method. Warn the user.
-					WARN_PRINT_ED(vformat(TTR("Failed to lookup method: \"%s\""), method));
+					WARN_PRINT_ED(TTR(vformat("Failed to lookup method: \"%s\"", method)));
 				}
 			}
 			return true;
@@ -3578,49 +3615,6 @@ void AnimationTrackEdit::drop_data(const Point2 &p_point, const Variant &p_data)
 	}
 }
 
-void AnimationTrackEdit::_popup_key_context_menu(int p_hovering_key_idx, Vector2 p_popup_pos) {
-	if (!menu) {
-		menu = memnew(PopupMenu);
-		add_child(menu);
-		menu->connect(SceneStringName(id_pressed), callable_mp(this, &AnimationTrackEdit::_menu_selected));
-	}
-
-	menu->clear();
-	if (animation->track_get_type(track) == Animation::TYPE_METHOD) {
-		if (p_hovering_key_idx != -1) {
-			lookup_key_idx = p_hovering_key_idx;
-			menu->add_icon_item(get_editor_theme_icon(SNAME("Help")), vformat("%s (%s)", TTR("Go to Definition"), animation->method_track_get_name(track, lookup_key_idx)), MENU_KEY_LOOKUP);
-			menu->add_separator();
-		}
-	}
-	menu->add_icon_item(get_editor_theme_icon(SNAME("Key")), TTR("Insert Key..."), MENU_KEY_INSERT);
-	if (editor->is_selection_active()) {
-		menu->add_separator();
-		menu->add_icon_item(get_editor_theme_icon(SNAME("Duplicate")), TTR("Duplicate Key(s)"), MENU_KEY_DUPLICATE);
-		menu->add_icon_item(get_editor_theme_icon(SNAME("ActionCut")), TTR("Cut Key(s)"), MENU_KEY_CUT);
-		menu->add_icon_item(get_editor_theme_icon(SNAME("ActionCopy")), TTR("Copy Key(s)"), MENU_KEY_COPY);
-	}
-	if (editor->is_key_clipboard_active()) {
-		menu->add_icon_item(get_editor_theme_icon(SNAME("ActionPaste")), TTR("Paste Key(s)"), MENU_KEY_PASTE);
-	}
-	if (editor->is_selection_active()) {
-		AnimationPlayerEditor *ape = AnimationPlayerEditor::get_singleton();
-		if (ape) {
-			AnimationPlayer *ap = ape->get_player();
-			if (ap && editor->can_add_reset_key() && animation != ap->get_animation(SceneStringName(RESET))) {
-				menu->add_separator();
-				menu->add_icon_item(get_editor_theme_icon(SNAME("MoveUp")), TTR("Send Key(s) to RESET"), MENU_KEY_ADD_RESET);
-			}
-		}
-		menu->add_separator();
-		menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTR("Delete Key(s)"), MENU_KEY_DELETE);
-	}
-	menu->reset_size();
-
-	menu->set_position(p_popup_pos);
-	menu->popup();
-}
-
 void AnimationTrackEdit::_menu_selected(int p_index) {
 	switch (p_index) {
 		case MENU_CALL_MODE_CONTINUOUS:
@@ -3811,6 +3805,15 @@ void AnimationTrackEditGroup::_notification(int p_what) {
 			icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation track group")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			const Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
 			const int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
@@ -3917,14 +3920,7 @@ void AnimationTrackEditGroup::_notification(int p_what) {
 			draw_line(Point2(get_size().width - timeline->get_buttons_width(), 0), Point2(get_size().width - timeline->get_buttons_width(), get_size().height), v_line_color, Math::round(EDSCALE));
 
 			int ofs = stylebox_header->get_margin(SIDE_LEFT);
-			bool is_group_folded = editor->get_current_animation()->editor_is_group_folded(node_name);
-			Ref<Texture2D> fold_icon = get_theme_icon(is_group_folded ? SNAME("arrow_collapsed") : SNAME("arrow"), SNAME("Tree"));
-			Size2 fold_icon_size = fold_icon->get_size();
-			draw_texture_rect(fold_icon, Rect2(Point2(ofs, (get_size().height - fold_icon_size.y) / 2 + v_margin_offset).round(), fold_icon_size));
-
-			ofs += h_separation + fold_icon_size.x;
 			draw_texture_rect(icon, Rect2(Point2(ofs, (get_size().height - icon_size.y) / 2 + v_margin_offset).round(), icon_size));
-
 			ofs += h_separation + icon_size.x;
 			draw_string(font, Point2(ofs, (get_size().height - font->get_height(font_size)) / 2 + font->get_ascent(font_size) + v_margin_offset).round(), node_name, HORIZONTAL_ALIGNMENT_LEFT, timeline->get_name_limit() - ofs, font_size, color);
 
@@ -3933,25 +3929,6 @@ void AnimationTrackEditGroup::_notification(int p_what) {
 				const Color accent = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
 				draw_line(Point2(px, 0), Point2(px, get_size().height), accent, Math::round(2 * EDSCALE));
 			}
-
-			if (is_group_folded) {
-				for (const AnimationTrackEdit *track_edit : track_edits) {
-					const Ref<Texture2D> &key_type_icon = track_edit->get_key_type_icon();
-					int track = track_edit->get_track();
-					for (int i = 0; i < editor->get_current_animation()->track_get_key_count(track); ++i) {
-						float key_time_offset = editor->get_current_animation()->track_get_key_time(track, i) - timeline->get_value();
-						int key_screen_pos = int(key_time_offset * timeline->get_zoom_scale() + limit);
-						int key_limit_left = timeline->get_name_limit();
-						int key_limit_right = get_size().width - timeline->get_buttons_width();
-						if (key_screen_pos >= key_limit_left && key_screen_pos <= key_limit_right) {
-							draw_texture(
-									key_type_icon,
-									Vector2(key_screen_pos - key_type_icon->get_width() / 2, (get_size().height - key_type_icon->get_height()) / 2),
-									Color(1, 1, 1, 0.3));
-						}
-					}
-				}
-			}
 		} break;
 
 		case NOTIFICATION_MOUSE_EXIT: {
@@ -3970,41 +3947,14 @@ void AnimationTrackEditGroup::gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		Point2 pos = mb->get_position();
+		Rect2 node_name_rect = Rect2(0, 0, timeline->get_name_limit(), get_size().height);
 
-		int left_ofs = get_theme_stylebox(SNAME("header"), SNAME("AnimationTrackEditGroup"))->get_margin(SIDE_LEFT);
-		bool is_group_folded = editor->get_current_animation()->editor_is_group_folded(node_name);
-		Ref<Texture2D> fold_icon = get_theme_icon(is_group_folded ? SNAME("arrow_collapsed") : SNAME("arrow"), SNAME("Tree"));
-		int fold_icon_width = fold_icon->get_size().width;
-		Rect2 fold_area_rect = Rect2(0, 0, left_ofs + fold_icon_width, get_size().height);
-
-		if (fold_area_rect.has_point(pos)) {
-			bool current_group_folded = !editor->get_current_animation()->editor_is_group_folded(node_name);
-			editor->get_current_animation()->editor_set_group_folded(node_name, current_group_folded);
-
-			if (!editor->get_current_animation()->get_path().is_resource_file()) {
-				EditorNode::get_editor_folding().save_scene_folding(
-						EditorNode::get_singleton()->get_edited_scene(),
-						EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path());
-			} else {
-				EditorNode::get_editor_folding().save_resource_folding(
-						editor->get_current_animation(),
-						editor->get_current_animation()->get_path());
-			}
-
-			for (AnimationTrackEdit *i : track_edits) {
-				i->set_visible(!current_group_folded);
-			}
-
-			queue_redraw();
-		} else {
-			Rect2 node_name_rect = Rect2(0, 0, timeline->get_name_limit(), get_size().height);
-			if (node_name_rect.has_point(pos)) {
-				EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection();
-				editor_selection->clear();
-				Node *n = root->get_node_or_null(node);
-				if (n) {
-					editor_selection->add_node(n);
-				}
+		if (node_name_rect.has_point(pos)) {
+			EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection();
+			editor_selection->clear();
+			Node *n = root->get_node_or_null(node);
+			if (n) {
+				editor_selection->add_node(n);
 			}
 		}
 	}
@@ -4138,12 +4088,6 @@ void AnimationTrackEditor::set_animation(const Ref<Animation> &p_anim, bool p_re
 				}
 			}
 		}
-
-		if (animation->get_path().is_resource_file()) {
-			EditorNode::get_editor_folding().load_resource_folding(
-					animation,
-					animation->get_path());
-		}
 	} else {
 		hscroll->hide();
 		edit->set_disabled(true);
@@ -4312,8 +4256,10 @@ void AnimationTrackEditor::_animation_track_remove_request(int p_track, Ref<Anim
 					if (reset->track_get_path(i) == p_from_animation->track_get_path(p_track)) {
 						// Check if the reset track isn't used by other animations.
 						bool used = false;
+						List<StringName> animation_list;
+						player->get_animation_list(&animation_list);
 
-						for (const StringName &anim_name : player->get_sorted_animation_list()) {
+						for (const StringName &anim_name : animation_list) {
 							Ref<Animation> anim = player->get_animation(anim_name);
 							if (anim == p_from_animation || anim == reset) {
 								continue;
@@ -5368,10 +5314,6 @@ void AnimationTrackEditor::_update_tracks() {
 			track_edit->set_in_group(true);
 			group_sort[base_path]->add_child(track_edit);
 
-			AnimationTrackEditGroup *g = Object::cast_to<AnimationTrackEditGroup>(group_sort[base_path]->get_child(0));
-			ERR_FAIL_NULL_MSG(g, "The first child of this group's VBoxContainer isn't an AnimationTrackEditGroup. Collapsing this animation group may not work.");
-			g->track_edits.push_back(track_edit);
-
 		} else {
 			track_edit->set_in_group(false);
 		}
@@ -5420,13 +5362,6 @@ void AnimationTrackEditor::_update_tracks() {
 
 		for (VBoxContainer *vb : group_containers) {
 			track_vbox->add_child(vb);
-
-			AnimationTrackEditGroup *g = Object::cast_to<AnimationTrackEditGroup>(vb->get_child(0));
-			if (g) {
-				for (AnimationTrackEdit *i : g->track_edits) {
-					i->set_visible(!animation->editor_is_group_folded(g->node_name));
-				}
-			}
 		}
 
 	} else {
@@ -5598,7 +5533,7 @@ void AnimationTrackEditor::_notification(int p_what) {
 			}
 
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/animation_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -5651,7 +5586,7 @@ void AnimationTrackEditor::_notification(int p_what) {
 			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", callable_mp(this, &AnimationTrackEditor::_selection_changed));
 
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/animation_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -5664,25 +5599,6 @@ void AnimationTrackEditor::_notification(int p_what) {
 			bezier_key_mode->set_item_text(bezier_key_mode->get_item_index(Animation::HANDLE_MODE_BALANCED), TTR("Balanced", "Bezier Handle Mode"));
 			bezier_key_mode->set_item_text(bezier_key_mode->get_item_index(Animation::HANDLE_MODE_MIRRORED), TTR("Mirrored", "Bezier Handle Mode"));
 			bezier_key_mode->set_tooltip_text(TTR("Bezier Default Mode") + "\n" + TTR("Set the default handle mode of new bezier keys."));
-
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_LINEAR), TTR("Linear", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_QUINT), TTR("Quint", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_QUART), TTR("Quart", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_QUAD), TTR("Quad", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_EXPO), TTR("Expo", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_ELASTIC), TTR("Elastic", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_CUBIC), TTR("Cubic", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_CIRC), TTR("Circ", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_BOUNCE), TTR("Bounce", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_BACK), TTR("Back", "Transition Type"));
-			transition_selection->set_item_text(transition_selection->get_item_index(Tween::TRANS_SPRING), TTR("Spring", "Transition Type"));
-
-			ease_selection->set_item_text(ease_selection->get_item_index(Tween::EASE_IN), TTR("Ease In", "Ease Type"));
-			ease_selection->set_item_text(ease_selection->get_item_index(Tween::EASE_OUT), TTR("Ease Out", "Ease Type"));
-			ease_selection->set_item_text(ease_selection->get_item_index(Tween::EASE_IN_OUT), TTR("Ease In-Out", "Ease Type"));
-			ease_selection->set_item_text(ease_selection->get_item_index(Tween::EASE_OUT_IN), TTR("Ease Out-In", "Ease Type"));
-
-			_update_nearest_fps_label();
 		} break;
 	}
 }
@@ -5841,8 +5757,6 @@ void AnimationTrackEditor::_add_track(int p_type) {
 		return;
 	}
 	adding_track_type = p_type;
-
-	String title_text = TTRC("Pick a node to animate:");
 	Vector<StringName> valid_types;
 	switch (adding_track_type) {
 		case Animation::TYPE_BLEND_SHAPE: {
@@ -5855,22 +5769,16 @@ void AnimationTrackEditor::_add_track(int p_type) {
 			// 3D Properties come from nodes inheriting Node3D.
 			valid_types.push_back(SNAME("Node3D"));
 		} break;
-		case Animation::TYPE_METHOD: {
-			title_text = TTRC("Pick a node to select method:");
-		} break;
 		case Animation::TYPE_AUDIO: {
 			valid_types.push_back(SNAME("AudioStreamPlayer"));
 			valid_types.push_back(SNAME("AudioStreamPlayer2D"));
 			valid_types.push_back(SNAME("AudioStreamPlayer3D"));
-			title_text = TTRC("Pick a node to play audio:");
 		} break;
 		case Animation::TYPE_ANIMATION: {
 			valid_types.push_back(SNAME("AnimationPlayer"));
-			title_text = TTRC("Pick a node to play animation:");
 		} break;
 	}
 	pick_track->set_valid_types(valid_types);
-	pick_track->set_title(title_text);
 	pick_track->popup_scenetree_dialog(nullptr, root_node);
 	pick_track->get_filter_line_edit()->clear();
 	pick_track->get_filter_line_edit()->grab_focus();
@@ -6025,6 +5933,10 @@ void AnimationTrackEditor::_insert_key_from_track(float p_ofs, int p_track) {
 
 	resolve_insertion_offset(p_ofs);
 
+	while (animation->track_find_key(p_track, p_ofs, Animation::FIND_MODE_APPROX) != -1) { // Make sure insertion point is valid.
+		p_ofs += SECOND_DECIMAL;
+	}
+
 	Node *node = root->get_node_or_null(animation->track_get_path(p_track));
 	if (!node) {
 		EditorNode::get_singleton()->show_warning(TTR("Track path is invalid, so can't add a key."));
@@ -6477,9 +6389,6 @@ void AnimationTrackEditor::_scroll_input(const Ref<InputEvent> &p_event) {
 			if (box_selection->is_visible_in_tree()) {
 				// Only if moved.
 				for (int i = 0; i < track_edits.size(); i++) {
-					if (!track_edits[i]->is_visible_in_tree()) {
-						continue; // Skip collapsed track edits.
-					}
 					Rect2 local_rect = box_select_rect;
 					local_rect.position -= track_edits[i]->get_global_position();
 					track_edits[i]->append_to_selection(local_rect, mb->is_command_or_control_pressed());
@@ -7736,7 +7645,9 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 		} break;
 		case EDIT_CLEAN_UP_ANIMATION_CONFIRM: {
 			if (cleanup_all->is_pressed()) {
-				for (const StringName &E : AnimationPlayerEditor::get_singleton()->get_player()->get_sorted_animation_list()) {
+				List<StringName> names;
+				AnimationPlayerEditor::get_singleton()->get_player()->get_animation_list(&names);
+				for (const StringName &E : names) {
 					_cleanup_animation(AnimationPlayerEditor::get_singleton()->get_player()->get_animation(E));
 				}
 			} else {
@@ -8152,7 +8063,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	info_message = memnew(Label);
 	info_message_vbox->add_child(info_message);
 	info_message->set_focus_mode(FOCUS_ACCESSIBILITY);
-	info_message->set_text(TTRC("Select an AnimationPlayer node to create and edit animations."));
+	info_message->set_text(TTR("Select an AnimationPlayer node to create and edit animations."));
 	info_message->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
 	info_message->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	info_message->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
@@ -8161,8 +8072,8 @@ AnimationTrackEditor::AnimationTrackEditor() {
 
 	add_animation_player = memnew(Button);
 	info_message_vbox->add_child(add_animation_player);
-	add_animation_player->set_text(TTRC("Add AnimationPlayer"));
-	add_animation_player->set_tooltip_text(TTRC("Add a new AnimationPlayer node to the scene."));
+	add_animation_player->set_text(TTR("Add AnimationPlayer"));
+	add_animation_player->set_tooltip_text(TTR("Add a new AnimationPlayer node to the scene."));
 	add_animation_player->set_h_size_flags(SIZE_SHRINK_CENTER);
 	add_animation_player->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_add_animation_player));
 
@@ -8247,22 +8158,22 @@ AnimationTrackEditor::AnimationTrackEditor() {
 
 	imported_anim_warning = memnew(Button);
 	imported_anim_warning->hide();
-	imported_anim_warning->set_text(TTRC("Imported Animation"));
-	imported_anim_warning->set_tooltip_text(TTRC("Warning: Editing imported animation"));
+	imported_anim_warning->set_text(TTR("Imported Animation"));
+	imported_anim_warning->set_tooltip_text(TTR("Warning: Editing imported animation"));
 	imported_anim_warning->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_show_imported_anim_warning));
 	bottom_hf->add_child(imported_anim_warning);
 
 	dummy_player_warning = memnew(Button);
 	dummy_player_warning->hide();
-	dummy_player_warning->set_text(TTRC("Dummy Player"));
-	dummy_player_warning->set_tooltip_text(TTRC("Warning: Editing dummy AnimationPlayer"));
+	dummy_player_warning->set_text(TTR("Dummy Player"));
+	dummy_player_warning->set_tooltip_text(TTR("Warning: Editing dummy AnimationPlayer"));
 	dummy_player_warning->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_show_dummy_player_warning));
 	bottom_hf->add_child(dummy_player_warning);
 
 	inactive_player_warning = memnew(Button);
 	inactive_player_warning->hide();
-	inactive_player_warning->set_text(TTRC("Inactive Player"));
-	inactive_player_warning->set_tooltip_text(TTRC("Warning: AnimationPlayer is inactive"));
+	inactive_player_warning->set_text(TTR("Inactive Player"));
+	inactive_player_warning->set_tooltip_text(TTR("Warning: AnimationPlayer is inactive"));
 	inactive_player_warning->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_show_inactive_player_warning));
 	bottom_hf->add_child(inactive_player_warning);
 
@@ -8288,7 +8199,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	bezier_edit_icon->set_disabled(true);
 	bezier_edit_icon->set_toggle_mode(true);
 	bezier_edit_icon->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_toggle_bezier_edit));
-	bezier_edit_icon->set_tooltip_text(TTRC("Toggle between the bezier curve editor and track editor."));
+	bezier_edit_icon->set_tooltip_text(TTR("Toggle between the bezier curve editor and track editor."));
 
 	bottom_hf->add_child(bezier_edit_icon);
 
@@ -8306,7 +8217,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	selected_filter->set_flat(true);
 	selected_filter->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle)); // Same function works the same.
 	selected_filter->set_toggle_mode(true);
-	selected_filter->set_tooltip_text(TTRC("Only show tracks from nodes selected in tree."));
+	selected_filter->set_tooltip_text(TTR("Only show tracks from nodes selected in tree."));
 
 	bottom_hf->add_child(selected_filter);
 
@@ -8314,7 +8225,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	alphabetic_sorting->set_flat(true);
 	alphabetic_sorting->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_update_tracks));
 	alphabetic_sorting->set_toggle_mode(true);
-	alphabetic_sorting->set_tooltip_text(TTRC("Sort tracks/groups alphabetically.\nIf disabled, tracks are shown in the order they are added and can be reordered using drag-and-drop."));
+	alphabetic_sorting->set_tooltip_text(TTR("Sort tracks/groups alphabetically.\nIf disabled, tracks are shown in the order they are added and can be reordered using drag-and-drop."));
 
 	bottom_hf->add_child(alphabetic_sorting);
 
@@ -8322,7 +8233,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	view_group->set_flat(true);
 	view_group->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle));
 	view_group->set_toggle_mode(true);
-	view_group->set_tooltip_text(TTRC("Group tracks by node or display them as plain list."));
+	view_group->set_tooltip_text(TTR("Group tracks by node or display them as plain list."));
 
 	bottom_hf->add_child(view_group);
 
@@ -8340,7 +8251,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	snap_timeline->set_flat(true);
 	snap_timeline->set_disabled(true);
 	snap_timeline->set_toggle_mode(true);
-	snap_timeline->set_tooltip_text(TTRC("Apply snapping to timeline cursor."));
+	snap_timeline->set_tooltip_text(TTR("Apply snapping to timeline cursor."));
 	snap_timeline->set_pressed(EditorSettings::get_singleton()->get_project_metadata("animation_track_editor", "snap_timeline", false));
 	bottom_hf->add_child(snap_timeline);
 	snap_timeline->connect(SceneStringName(toggled), callable_mp(this, &AnimationTrackEditor::_store_snap_states).unbind(1));
@@ -8349,7 +8260,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	snap_keys->set_flat(true);
 	snap_keys->set_disabled(true);
 	snap_keys->set_toggle_mode(true);
-	snap_keys->set_tooltip_text(TTRC("Apply snapping to selected key(s)."));
+	snap_keys->set_tooltip_text(TTR("Apply snapping to selected key(s)."));
 	snap_keys->set_pressed(EditorSettings::get_singleton()->get_project_metadata("animation_track_editor", "snap_keys", true));
 	bottom_hf->add_child(snap_keys);
 	snap_keys->connect(SceneStringName(toggled), callable_mp(this, &AnimationTrackEditor::_store_snap_states).unbind(1));
@@ -8360,7 +8271,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	fps_compat->set_disabled(true);
 	fps_compat->set_toggle_mode(true);
 	fps_compat->set_pressed(true);
-	fps_compat->set_tooltip_text(TTRC("Apply snapping to the nearest integer FPS."));
+	fps_compat->set_tooltip_text(TTR("Apply snapping to the nearest integer FPS."));
 	fps_compat->connect(SceneStringName(toggled), callable_mp(this, &AnimationTrackEditor::_update_fps_compat_mode));
 
 	nearest_fps_label = memnew(Label);
@@ -8374,15 +8285,15 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	step->set_step(SECOND_DECIMAL);
 	step->set_control_state(EditorSpinSlider::CONTROL_STATE_HIDE);
 	step->set_custom_minimum_size(Size2(100, 0) * EDSCALE);
-	step->set_tooltip_text(TTRC("Animation step value."));
+	step->set_tooltip_text(TTR("Animation step value."));
 	step->set_accessibility_name(TTRC("Animation step value."));
 	bottom_hf->add_child(step);
 	step->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTrackEditor::_update_step));
 	step->set_read_only(true);
 
 	snap_mode = memnew(OptionButton);
-	snap_mode->add_item(TTRC("Seconds"));
-	snap_mode->add_item(TTRC("FPS"));
+	snap_mode->add_item(TTR("Seconds"));
+	snap_mode->add_item(TTR("FPS"));
 	snap_mode->set_accessibility_name(TTRC("Snap Mode"));
 	snap_mode->set_disabled(true);
 	bottom_hf->add_child(snap_mode);
@@ -8425,21 +8336,21 @@ AnimationTrackEditor::AnimationTrackEditor() {
 
 	edit = memnew(MenuButton);
 	edit->set_shortcut_context(this);
-	edit->set_text(TTRC("Edit"));
+	edit->set_text(TTR("Edit"));
 	edit->set_flat(false);
 	edit->set_disabled(true);
-	edit->set_tooltip_text(TTRC("Animation properties."));
+	edit->set_tooltip_text(TTR("Animation properties."));
 	edit->set_accessibility_name(TTRC("Animation properties."));
-	edit->get_popup()->add_item(TTRC("Copy Tracks..."), EDIT_COPY_TRACKS);
-	edit->get_popup()->add_item(TTRC("Paste Tracks"), EDIT_PASTE_TRACKS);
+	edit->get_popup()->add_item(TTR("Copy Tracks..."), EDIT_COPY_TRACKS);
+	edit->get_popup()->add_item(TTR("Paste Tracks"), EDIT_PASTE_TRACKS);
 	edit->get_popup()->add_separator();
-	edit->get_popup()->add_item(TTRC("Scale Selection..."), EDIT_SCALE_SELECTION);
-	edit->get_popup()->add_item(TTRC("Scale From Cursor..."), EDIT_SCALE_FROM_CURSOR);
+	edit->get_popup()->add_item(TTR("Scale Selection..."), EDIT_SCALE_SELECTION);
+	edit->get_popup()->add_item(TTR("Scale From Cursor..."), EDIT_SCALE_FROM_CURSOR);
 	edit->get_popup()->add_separator();
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/set_start_offset", TTRC("Set Start Offset (Audio)"), KeyModifierMask::CMD_OR_CTRL | Key::BRACKETLEFT), EDIT_SET_START_OFFSET);
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/set_end_offset", TTRC("Set End Offset (Audio)"), KeyModifierMask::CMD_OR_CTRL | Key::BRACKETRIGHT), EDIT_SET_END_OFFSET);
 	edit->get_popup()->add_separator();
-	edit->get_popup()->add_item(TTRC("Make Easing Selection..."), EDIT_EASE_SELECTION);
+	edit->get_popup()->add_item(TTR("Make Easing Selection..."), EDIT_EASE_SELECTION);
 	edit->get_popup()->add_separator();
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/duplicate_selected_keys", TTRC("Duplicate Selected Keys"), KeyModifierMask::CMD_OR_CTRL | Key::D), EDIT_DUPLICATE_SELECTED_KEYS);
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/cut_selected_keys", TTRC("Cut Selected Keys"), KeyModifierMask::CMD_OR_CTRL | Key::X), EDIT_CUT_KEYS);
@@ -8463,15 +8374,16 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/add_reset_value", TTRC("Add tracks to RESET")), EDIT_ADD_RESET_KEY);
 	edit->get_popup()->add_shortcut(ED_SHORTCUT("animation_editor/apply_reset", TTRC("Apply RESET")), EDIT_APPLY_RESET);
 	edit->get_popup()->add_separator();
-	edit->get_popup()->add_item(TTRC("Bake Animation..."), EDIT_BAKE_ANIMATION);
-	edit->get_popup()->add_item(TTRC("Optimize Animation (no undo)..."), EDIT_OPTIMIZE_ANIMATION);
-	edit->get_popup()->add_item(TTRC("Clean-Up Animation (no undo)..."), EDIT_CLEAN_UP_ANIMATION);
+	edit->get_popup()->add_item(TTR("Bake Animation..."), EDIT_BAKE_ANIMATION);
+	edit->get_popup()->add_item(TTR("Optimize Animation (no undo)..."), EDIT_OPTIMIZE_ANIMATION);
+	edit->get_popup()->add_item(TTR("Clean-Up Animation (no undo)..."), EDIT_CLEAN_UP_ANIMATION);
 
 	edit->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed));
 	edit->get_popup()->connect("about_to_popup", callable_mp(this, &AnimationTrackEditor::_edit_menu_about_to_popup));
 
 	pick_track = memnew(SceneTreeDialog);
 	add_child(pick_track);
+	pick_track->set_title(TTR("Pick a node to animate:"));
 	pick_track->connect("selected", callable_mp(this, &AnimationTrackEditor::_new_track_node_selected));
 	pick_track->get_filter_line_edit()->connect(SceneStringName(text_changed), callable_mp(this, &AnimationTrackEditor::_pick_track_filter_text_changed));
 
@@ -8496,11 +8408,11 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	HBoxContainer *ichb = memnew(HBoxContainer);
 	icvb->add_child(ichb);
 	insert_confirm_bezier = memnew(CheckBox);
-	insert_confirm_bezier->set_text(TTRC("Use Bezier Curves"));
+	insert_confirm_bezier->set_text(TTR("Use Bezier Curves"));
 	insert_confirm_bezier->set_pressed(EDITOR_GET("editors/animation/default_create_bezier_tracks"));
 	ichb->add_child(insert_confirm_bezier);
 	insert_confirm_reset = memnew(CheckBox);
-	insert_confirm_reset->set_text(TTRC("Create RESET Track(s)"));
+	insert_confirm_reset->set_text(TTR("Create RESET Track(s)", ""));
 	insert_confirm_reset->set_pressed(EDITOR_GET("editors/animation/default_create_reset_tracks"));
 	ichb->add_child(insert_confirm_reset);
 
@@ -8520,7 +8432,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 
 	optimize_dialog = memnew(ConfirmationDialog);
 	add_child(optimize_dialog);
-	optimize_dialog->set_title(TTRC("Animation Optimizer"));
+	optimize_dialog->set_title(TTR("Animation Optimizer"));
 	VBoxContainer *optimize_vb = memnew(VBoxContainer);
 	optimize_dialog->add_child(optimize_vb);
 
@@ -8530,23 +8442,23 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	optimize_velocity_error->set_step(0.001);
 	optimize_velocity_error->set_value(0.01);
 	optimize_velocity_error->set_accessibility_name(TTRC("Max Velocity Error:"));
-	optimize_vb->add_margin_child(TTRC("Max Velocity Error:"), optimize_velocity_error);
+	optimize_vb->add_margin_child(TTR("Max Velocity Error:"), optimize_velocity_error);
 	optimize_angular_error = memnew(SpinBox);
 	optimize_angular_error->set_max(1.0);
 	optimize_angular_error->set_min(0.001);
 	optimize_angular_error->set_step(0.001);
 	optimize_angular_error->set_value(0.01);
 	optimize_angular_error->set_accessibility_name(TTRC("Max Angular Error:"));
-	optimize_vb->add_margin_child(TTRC("Max Angular Error:"), optimize_angular_error);
+	optimize_vb->add_margin_child(TTR("Max Angular Error:"), optimize_angular_error);
 	optimize_precision_error = memnew(SpinBox);
 	optimize_precision_error->set_max(6);
 	optimize_precision_error->set_min(1);
 	optimize_precision_error->set_step(1);
 	optimize_precision_error->set_value(3);
 	optimize_precision_error->set_accessibility_name(TTRC("Max Precision Error:"));
-	optimize_vb->add_margin_child(TTRC("Max Precision Error:"), optimize_precision_error);
+	optimize_vb->add_margin_child(TTR("Max Precision Error:"), optimize_precision_error);
 
-	optimize_dialog->set_ok_button_text(TTRC("Optimize"));
+	optimize_dialog->set_ok_button_text(TTR("Optimize"));
 	optimize_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_OPTIMIZE_ANIMATION_CONFIRM));
 
 	//
@@ -8556,31 +8468,31 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	cleanup_dialog->add_child(cleanup_vb);
 
 	cleanup_keys_with_trimming_head = memnew(CheckBox);
-	cleanup_keys_with_trimming_head->set_text(TTRC("Trim keys placed in negative time"));
+	cleanup_keys_with_trimming_head->set_text(TTR("Trim keys placed in negative time"));
 	cleanup_keys_with_trimming_head->set_pressed(true);
 	cleanup_vb->add_child(cleanup_keys_with_trimming_head);
 
 	cleanup_keys_with_trimming_end = memnew(CheckBox);
-	cleanup_keys_with_trimming_end->set_text(TTRC("Trim keys placed exceed the animation length"));
+	cleanup_keys_with_trimming_end->set_text(TTR("Trim keys placed exceed the animation length"));
 	cleanup_keys_with_trimming_end->set_pressed(true);
 	cleanup_vb->add_child(cleanup_keys_with_trimming_end);
 
 	cleanup_keys = memnew(CheckBox);
-	cleanup_keys->set_text(TTRC("Remove invalid keys"));
+	cleanup_keys->set_text(TTR("Remove invalid keys"));
 	cleanup_keys->set_pressed(true);
 	cleanup_vb->add_child(cleanup_keys);
 
 	cleanup_tracks = memnew(CheckBox);
-	cleanup_tracks->set_text(TTRC("Remove unresolved and empty tracks"));
+	cleanup_tracks->set_text(TTR("Remove unresolved and empty tracks"));
 	cleanup_tracks->set_pressed(true);
 	cleanup_vb->add_child(cleanup_tracks);
 
 	cleanup_all = memnew(CheckBox);
-	cleanup_all->set_text(TTRC("Clean-up all animations"));
+	cleanup_all->set_text(TTR("Clean-up all animations"));
 	cleanup_vb->add_child(cleanup_all);
 
-	cleanup_dialog->set_title(TTRC("Clean-Up Animation(s) (NO UNDO!)"));
-	cleanup_dialog->set_ok_button_text(TTRC("Clean-Up"));
+	cleanup_dialog->set_title(TTR("Clean-Up Animation(s) (NO UNDO!)"));
+	cleanup_dialog->set_ok_button_text(TTR("Clean-Up"));
 
 	cleanup_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_CLEAN_UP_ANIMATION_CONFIRM));
 
@@ -8595,7 +8507,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	scale->set_step(0.001);
 	scale->set_select_all_on_focus(true);
 	scale->set_accessibility_name(TTRC("Scale Ratio"));
-	vbc->add_margin_child(TTRC("Scale Ratio:"), scale);
+	vbc->add_margin_child(TTR("Scale Ratio:"), scale);
 	scale_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_SCALE_CONFIRM), CONNECT_DEFERRED);
 	add_child(scale_dialog);
 
@@ -8603,7 +8515,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 
 	//
 	ease_dialog = memnew(ConfirmationDialog);
-	ease_dialog->set_title(TTRC("Select Transition and Easing"));
+	ease_dialog->set_title(TTR("Select Transition and Easing"));
 	ease_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_EASE_CONFIRM));
 	add_child(ease_dialog);
 	GridContainer *ease_grid = memnew(GridContainer);
@@ -8611,27 +8523,27 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	ease_dialog->add_child(ease_grid);
 	transition_selection = memnew(OptionButton);
 	transition_selection->set_accessibility_name(TTRC("Transition Type:"));
-	transition_selection->add_item(String(), Tween::TRANS_LINEAR);
-	transition_selection->add_item(String(), Tween::TRANS_SINE);
-	transition_selection->add_item(String(), Tween::TRANS_QUINT);
-	transition_selection->add_item(String(), Tween::TRANS_QUART);
-	transition_selection->add_item(String(), Tween::TRANS_QUAD);
-	transition_selection->add_item(String(), Tween::TRANS_EXPO);
-	transition_selection->add_item(String(), Tween::TRANS_ELASTIC);
-	transition_selection->add_item(String(), Tween::TRANS_CUBIC);
-	transition_selection->add_item(String(), Tween::TRANS_CIRC);
-	transition_selection->add_item(String(), Tween::TRANS_BOUNCE);
-	transition_selection->add_item(String(), Tween::TRANS_BACK);
-	transition_selection->add_item(String(), Tween::TRANS_SPRING);
-	transition_selection->select(Tween::TRANS_LINEAR); // Default.
+	transition_selection->add_item(TTR("Linear", "Transition Type"), Tween::TRANS_LINEAR);
+	transition_selection->add_item(TTR("Sine", "Transition Type"), Tween::TRANS_SINE);
+	transition_selection->add_item(TTR("Quint", "Transition Type"), Tween::TRANS_QUINT);
+	transition_selection->add_item(TTR("Quart", "Transition Type"), Tween::TRANS_QUART);
+	transition_selection->add_item(TTR("Quad", "Transition Type"), Tween::TRANS_QUAD);
+	transition_selection->add_item(TTR("Expo", "Transition Type"), Tween::TRANS_EXPO);
+	transition_selection->add_item(TTR("Elastic", "Transition Type"), Tween::TRANS_ELASTIC);
+	transition_selection->add_item(TTR("Cubic", "Transition Type"), Tween::TRANS_CUBIC);
+	transition_selection->add_item(TTR("Circ", "Transition Type"), Tween::TRANS_CIRC);
+	transition_selection->add_item(TTR("Bounce", "Transition Type"), Tween::TRANS_BOUNCE);
+	transition_selection->add_item(TTR("Back", "Transition Type"), Tween::TRANS_BACK);
+	transition_selection->add_item(TTR("Spring", "Transition Type"), Tween::TRANS_SPRING);
+	transition_selection->select(Tween::TRANS_LINEAR); // Default
 	transition_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed.
 	ease_selection = memnew(OptionButton);
 	ease_selection->set_accessibility_name(TTRC("Ease Type:"));
-	ease_selection->add_item(String(), Tween::EASE_IN);
-	ease_selection->add_item(String(), Tween::EASE_OUT);
-	ease_selection->add_item(String(), Tween::EASE_IN_OUT);
-	ease_selection->add_item(String(), Tween::EASE_OUT_IN);
-	ease_selection->select(Tween::EASE_IN_OUT); // Default.
+	ease_selection->add_item(TTR("Ease In", "Ease Type"), Tween::EASE_IN);
+	ease_selection->add_item(TTR("Ease Out", "Ease Type"), Tween::EASE_OUT);
+	ease_selection->add_item(TTR("Ease In-Out", "Ease Type"), Tween::EASE_IN_OUT);
+	ease_selection->add_item(TTR("Ease Out-In", "Ease Type"), Tween::EASE_OUT_IN);
+	ease_selection->select(Tween::EASE_IN_OUT); // Default
 	ease_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed.
 	ease_fps = memnew(SpinBox);
 	ease_fps->set_min(FPS_DECIMAL);
@@ -8639,16 +8551,16 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	ease_fps->set_step(FPS_DECIMAL);
 	ease_fps->set_value(30); // Default
 	ease_fps->set_accessibility_name(TTRC("FPS:"));
-	ease_grid->add_child(memnew(Label(TTRC("Transition Type:"))));
+	ease_grid->add_child(memnew(Label(TTR("Transition Type:"))));
 	ease_grid->add_child(transition_selection);
-	ease_grid->add_child(memnew(Label(TTRC("Ease Type:"))));
+	ease_grid->add_child(memnew(Label(TTR("Ease Type:"))));
 	ease_grid->add_child(ease_selection);
-	ease_grid->add_child(memnew(Label(TTRC("FPS:"))));
+	ease_grid->add_child(memnew(Label(TTR("FPS:"))));
 	ease_grid->add_child(ease_fps);
 
 	//
 	bake_dialog = memnew(ConfirmationDialog);
-	bake_dialog->set_title(TTRC("Animation Baker"));
+	bake_dialog->set_title(TTR("Animation Baker"));
 	bake_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_BAKE_ANIMATION_CONFIRM));
 	add_child(bake_dialog);
 	GridContainer *bake_grid = memnew(GridContainer);
@@ -8669,25 +8581,25 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	bake_fps->set_max(999);
 	bake_fps->set_step(FPS_DECIMAL);
 	bake_fps->set_value(30); // Default
-	bake_grid->add_child(memnew(Label(TTRC("3D Pos/Rot/Scl Track:"))));
+	bake_grid->add_child(memnew(Label(TTR("3D Pos/Rot/Scl Track:"))));
 	bake_grid->add_child(bake_trs);
-	bake_grid->add_child(memnew(Label(TTRC("Blendshape Track:"))));
+	bake_grid->add_child(memnew(Label(TTR("Blendshape Track:"))));
 	bake_grid->add_child(bake_blendshape);
-	bake_grid->add_child(memnew(Label(TTRC("Value Track:"))));
+	bake_grid->add_child(memnew(Label(TTR("Value Track:"))));
 	bake_grid->add_child(bake_value);
-	bake_grid->add_child(memnew(Label(TTRC("FPS:"))));
+	bake_grid->add_child(memnew(Label(TTR("FPS:"))));
 	bake_grid->add_child(bake_fps);
 
 	track_copy_dialog = memnew(ConfirmationDialog);
 	add_child(track_copy_dialog);
-	track_copy_dialog->set_title(TTRC("Select Tracks to Copy"));
-	track_copy_dialog->set_ok_button_text(TTRC("Copy"));
+	track_copy_dialog->set_title(TTR("Select Tracks to Copy"));
+	track_copy_dialog->set_ok_button_text(TTR("Copy"));
 
 	VBoxContainer *track_copy_vbox = memnew(VBoxContainer);
 	track_copy_dialog->add_child(track_copy_vbox);
 
 	Button *select_all_button = memnew(Button);
-	select_all_button->set_text(TTRC("Select All/None"));
+	select_all_button->set_text(TTR("Select All/None"));
 	select_all_button->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_select_all_tracks_for_copy));
 	track_copy_vbox->add_child(select_all_button);
 
@@ -8805,7 +8717,6 @@ AnimationTrackKeyEditEditor::AnimationTrackKeyEditEditor(Ref<Animation> p_animat
 			fps = 1.0 / fps;
 		}
 		spinner->set_value(key_ofs * fps);
-		spinner->set_max(animation->get_length() * fps);
 		spinner->connect("updown_pressed", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_spun), CONNECT_DEFERRED);
 	} else {
 		spinner->set_step(SECOND_DECIMAL);
@@ -9033,6 +8944,15 @@ void AnimationMarkerEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("MarkerSelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation marker editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
@@ -9175,14 +9095,14 @@ void AnimationMarkerEdit::gui_input(const Ref<InputEvent> &p_event) {
 				moving_selection_attempt = false;
 
 				menu->clear();
-				menu->add_icon_item(get_editor_theme_icon(SNAME("Key")), TTRC("Insert Marker..."), MENU_KEY_INSERT);
+				menu->add_icon_item(get_editor_theme_icon(SNAME("Key")), TTR("Insert Marker..."), MENU_KEY_INSERT);
 
 				if (selected || selection.size() > 0) {
-					menu->add_icon_item(get_editor_theme_icon(SNAME("Edit")), TTRC("Rename Marker"), MENU_KEY_RENAME);
-					menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTRC("Delete Marker(s)"), MENU_KEY_DELETE);
+					menu->add_icon_item(get_editor_theme_icon(SNAME("Edit")), TTR("Rename Marker"), MENU_KEY_RENAME);
+					menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTR("Delete Marker(s)"), MENU_KEY_DELETE);
 				}
 
-				menu->add_icon_item(get_editor_theme_icon(should_show_all_marker_names ? SNAME("GuiChecked") : SNAME("GuiUnchecked")), TTRC("Show All Marker Names"), MENU_KEY_TOGGLE_MARKER_NAMES);
+				menu->add_icon_item(get_editor_theme_icon(should_show_all_marker_names ? SNAME("GuiChecked") : SNAME("GuiUnchecked")), TTR("Show All Marker Names"), MENU_KEY_TOGGLE_MARKER_NAMES);
 				menu->reset_size();
 
 				menu->set_position(get_screen_position() + get_local_mouse_position());
@@ -9762,7 +9682,7 @@ AnimationMarkerEdit::AnimationMarkerEdit() {
 	menu->add_shortcut(ED_SHORTCUT("animation_marker_edit/toggle_marker_names", TTRC("Show All Marker Names"), Key::M), MENU_KEY_TOGGLE_MARKER_NAMES);
 
 	marker_insert_confirm = memnew(ConfirmationDialog);
-	marker_insert_confirm->set_title(TTRC("Insert Marker"));
+	marker_insert_confirm->set_title(TTR("Insert Marker"));
 	marker_insert_confirm->set_hide_on_ok(false);
 	marker_insert_confirm->connect(SceneStringName(confirmed), callable_mp(this, &AnimationMarkerEdit::_marker_insert_confirmed));
 	add_child(marker_insert_confirm);
@@ -9772,18 +9692,18 @@ AnimationMarkerEdit::AnimationMarkerEdit() {
 	marker_insert_new_name = memnew(LineEdit);
 	marker_insert_new_name->connect(SceneStringName(text_changed), callable_mp(this, &AnimationMarkerEdit::_marker_insert_new_name_changed));
 	marker_insert_confirm->register_text_enter(marker_insert_new_name);
-	marker_insert_vbox->add_child(_create_hbox_labeled_control(TTRC("Marker Name"), marker_insert_new_name));
+	marker_insert_vbox->add_child(_create_hbox_labeled_control(TTR("Marker Name"), marker_insert_new_name));
 	marker_insert_color = memnew(ColorPickerButton);
 	marker_insert_color->set_edit_alpha(false);
 	marker_insert_color->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(marker_insert_color->get_picker()));
-	marker_insert_vbox->add_child(_create_hbox_labeled_control(TTRC("Marker Color"), marker_insert_color));
+	marker_insert_vbox->add_child(_create_hbox_labeled_control(TTR("Marker Color"), marker_insert_color));
 	marker_insert_error_dialog = memnew(AcceptDialog);
-	marker_insert_error_dialog->set_ok_button_text(TTRC("Close"));
-	marker_insert_error_dialog->set_title(TTRC("Error!"));
+	marker_insert_error_dialog->set_ok_button_text(TTR("Close"));
+	marker_insert_error_dialog->set_title(TTR("Error!"));
 	marker_insert_confirm->add_child(marker_insert_error_dialog);
 
 	marker_rename_confirm = memnew(ConfirmationDialog);
-	marker_rename_confirm->set_title(TTRC("Rename Marker"));
+	marker_rename_confirm->set_title(TTR("Rename Marker"));
 	marker_rename_confirm->set_hide_on_ok(false);
 	marker_rename_confirm->connect(SceneStringName(confirmed), callable_mp(this, &AnimationMarkerEdit::_marker_rename_confirmed));
 	add_child(marker_rename_confirm);
@@ -9791,7 +9711,7 @@ AnimationMarkerEdit::AnimationMarkerEdit() {
 	marker_rename_vbox->set_anchors_and_offsets_preset(Control::LayoutPreset::PRESET_FULL_RECT);
 	marker_rename_confirm->add_child(marker_rename_vbox);
 	Label *marker_rename_new_name_label = memnew(Label);
-	marker_rename_new_name_label->set_text(TTRC("Change Marker Name:"));
+	marker_rename_new_name_label->set_text(TTR("Change Marker Name:"));
 	marker_rename_vbox->add_child(marker_rename_new_name_label);
 	marker_rename_new_name = memnew(LineEdit);
 	marker_rename_new_name->set_accessibility_name(TTRC("Change Marker Name:"));
@@ -9800,8 +9720,8 @@ AnimationMarkerEdit::AnimationMarkerEdit() {
 	marker_rename_vbox->add_child(marker_rename_new_name);
 
 	marker_rename_error_dialog = memnew(AcceptDialog);
-	marker_rename_error_dialog->set_ok_button_text(TTRC("Close"));
-	marker_rename_error_dialog->set_title(TTRC("Error!"));
+	marker_rename_error_dialog->set_ok_button_text(TTR("Close"));
+	marker_rename_error_dialog->set_title(TTR("Error!"));
 	marker_rename_confirm->add_child(marker_rename_error_dialog);
 }
 
@@ -9982,7 +9902,6 @@ AnimationMarkerKeyEditEditor::AnimationMarkerKeyEditEditor(Ref<Animation> p_anim
 			fps = 1.0 / fps;
 		}
 		spinner->set_value(time * fps);
-		spinner->set_max(animation->get_length() * fps);
 		spinner->connect("updown_pressed", callable_mp(this, &AnimationMarkerKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
 	} else {
 		spinner->set_step(SECOND_DECIMAL);
diff --git a/engine/editor/animation/animation_track_editor.h b/engine/editor/animation/animation_track_editor.h
index 1d2fe00d..097e6430 100644
--- a/engine/editor/animation/animation_track_editor.h
+++ b/engine/editor/animation/animation_track_editor.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_map.h"
 #include "editor/editor_data.h"
 #include "editor/inspector/editor_properties.h"
 #include "editor/inspector/property_selector.h"
@@ -41,8 +40,6 @@
 #include "scene/gui/tree.h"
 #include "scene/resources/animation.h"
 
-#include <cfloat> // FLT_MAX
-
 class AnimationMarkerEdit;
 class AnimationTrackEditor;
 class AnimationTrackEdit;
@@ -483,7 +480,6 @@ class AnimationTrackEdit : public Control {
 	String path_cache;
 
 	void _menu_selected(int p_index);
-	void _popup_key_context_menu(int p_hovering_key_idx, Vector2 p_popup_pos);
 
 	void _path_submitted(const String &p_text);
 	void _play_position_draw();
@@ -523,7 +519,6 @@ public:
 	virtual CursorShape get_cursor_shape(const Point2 &p_pos) const override;
 	virtual String get_tooltip(const Point2 &p_pos) const override;
 
-	const Ref<Texture2D> &get_key_type_icon() const { return type_icon; }
 	virtual int get_key_height() const;
 	virtual Rect2 get_key_rect(int p_index, float p_pixels_sec);
 	virtual bool is_key_selectable_by_distance() const;
@@ -572,8 +567,6 @@ class AnimationMultiTrackKeyEdit;
 class AnimationBezierTrackEdit;
 
 class AnimationTrackEditGroup : public Control {
-	friend class AnimationTrackEditor;
-
 	GDCLASS(AnimationTrackEditGroup, Control);
 	Ref<Texture2D> icon;
 	Vector2 icon_size;
@@ -584,7 +577,7 @@ class AnimationTrackEditGroup : public Control {
 	AnimationTrackEditor *editor = nullptr;
 
 	bool hovered = false;
-	LocalVector<AnimationTrackEdit *> track_edits;
+
 	void _zoom_changed();
 
 protected:
@@ -913,7 +906,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	// Public for use as signal callback.
+	// Public for use with callable_mp.
 	void _clear_selection(bool p_update = false);
 	void _key_selected(int p_key, bool p_single, int p_track);
 	void _key_deselected(int p_key, int p_track);
diff --git a/engine/editor/animation/animation_track_editor_plugins.cpp b/engine/editor/animation/animation_track_editor_plugins.cpp
index 61a5d0a5..c3e51962 100644
--- a/engine/editor/animation/animation_track_editor_plugins.cpp
+++ b/engine/editor/animation/animation_track_editor_plugins.cpp
@@ -30,8 +30,6 @@
 
 #include "animation_track_editor_plugins.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -42,7 +40,6 @@
 #include "scene/3d/sprite_3d.h"
 #include "scene/animation/animation_player.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/rendering/rendering_server.h"
 
 /// BOOL ///
 int AnimationTrackEditBool::get_key_height() const {
@@ -185,9 +182,6 @@ void AnimationTrackEditColor::draw_key(int p_index, float p_pixels_sec, int p_x,
 	if (p_selected) {
 		Color accent = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
 		draw_rect_clipped(rect, accent, false);
-		if (color.get_luminance() > 0.3) {
-			draw_rect_clipped(rect.grow(-1), Color(0.0, 0.0, 0.0, 0.5), false);
-		}
 	}
 }
 
diff --git a/engine/editor/animation/animation_tree_editor_plugin.cpp b/engine/editor/animation/animation_tree_editor_plugin.cpp
index 02af1757..08f11617 100644
--- a/engine/editor/animation/animation_tree_editor_plugin.cpp
+++ b/engine/editor/animation/animation_tree_editor_plugin.cpp
@@ -30,12 +30,10 @@
 
 #include "animation_tree_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/string/string_buffer.h"
-#include "editor/animation/animation_blend_space_1d_editor.h"
-#include "editor/animation/animation_blend_space_2d_editor.h"
-#include "editor/animation/animation_blend_tree_editor_plugin.h"
-#include "editor/animation/animation_state_machine_editor.h"
+#include "animation_blend_space_1d_editor.h"
+#include "animation_blend_space_2d_editor.h"
+#include "animation_blend_tree_editor_plugin.h"
+#include "animation_state_machine_editor.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_bottom_panel.h"
@@ -44,156 +42,8 @@
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
-
-RichTextLabel *AnimationTreeNodeEditorPlugin::create_error_label_node() {
-	RichTextLabel *error_label = memnew(RichTextLabel);
-	error_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	error_label->set_fit_content(true);
-	error_label->set_h_size_flags(SIZE_EXPAND_FILL);
-	error_label->set_meta_underline(true);
-	error_label->connect("meta_clicked", callable_mp(this, &AnimationTreeNodeEditorPlugin::_meta_clicked));
-	return error_label;
-}
-
-void AnimationTreeNodeEditorPlugin::_meta_clicked(Variant p_meta) {
-	if (p_meta.get_type() != Variant::STRING) {
-		return;
-	}
-	const String raw_info_str = p_meta;
-	const String full_path_str = raw_info_str.get_slice("::", 0);
-	ERR_FAIL_COND(!full_path_str.ends_with("/"));
-
-	int input_index = -1;
-	if (raw_info_str.contains("::")) {
-		const String input_index_str = raw_info_str.get_slice("::", 1);
-		ERR_FAIL_COND(!input_index_str.is_valid_int());
-		input_index = input_index_str.to_int();
-	}
-
-	AnimationTree *tree = AnimationTreeEditor::get_singleton()->get_animation_tree();
-	ERR_FAIL_NULL(tree);
-
-	// e.g. "parameters/blend_tree/node_name/" -> "parameters/blend_tree/"
-	String parent_path = full_path_str.rstrip("/").substr(0, full_path_str.rstrip("/").rfind_char('/') + 1);
-
-	Ref<AnimationRootNode> root_node = tree->get_animation_node_by_path(parent_path);
-	ERR_FAIL_COND(root_node.is_null());
-
-	String to_edit_root_path = String(parent_path);
-	to_edit_root_path = to_edit_root_path.replace_first(Animation::PARAMETERS_BASE_PATH, "");
-	to_edit_root_path = to_edit_root_path.trim_suffix("/");
-
-	Vector<String> navigate_to;
-	if (!to_edit_root_path.is_empty()) {
-		// empty string still has 1 element when split.
-		navigate_to = to_edit_root_path.split("/");
-	}
-	if (AnimationTreeEditor::get_singleton()->get_edited_path() != navigate_to) {
-		AnimationTreeEditor::get_singleton()->edit_path(navigate_to);
-	}
-
-	// Special case for AnimationNodeBlendTree.
-	if (Ref<AnimationNodeBlendTree> blend_tree = root_node; blend_tree.is_valid()) {
-		String child_name = full_path_str;
-		child_name = child_name.replace_first(parent_path, "");
-		child_name = child_name.trim_suffix("/");
-		callable_mp(AnimationNodeBlendTreeEditor::get_singleton(), &AnimationNodeBlendTreeEditor::pan_to_node).call_deferred(child_name, input_index);
-	}
-}
-
-void AnimationTreeNodeEditorPlugin::update_error_message(const AnimationTree *p_tree, PanelContainer *p_error_panel, RichTextLabel *p_error_label, const String *p_other_errors) {
-	const String editor_error_message = p_tree->get_editor_error_message();
-	const AHashMap<StringName, AnimationNode::InvalidInstance> &invalid_instances = p_tree->get_invalid_instances();
-
-	if (editor_error_message.is_empty() && invalid_instances.is_empty() && (!p_other_errors || p_other_errors->is_empty())) {
-		last_error_key = String();
-		p_error_panel->hide();
-		return;
-	}
-
-	// Cheaper to do this, than rebuild rich text label every frame.
-	// Though it would be better, to only call this when the tree changes.
-	{
-		StringBuffer k;
-		k += editor_error_message;
-		if (p_other_errors) {
-			k += *p_other_errors;
-		}
-		for (const KeyValue<StringName, AnimationNode::InvalidInstance> &kv : invalid_instances) {
-			k += kv.key;
-			for (const String &reason : kv.value.errors) {
-				k += reason;
-			}
-			for (const AnimationNode::InvalidInstance::InputError &E : kv.value.input_errors) {
-				k += itos(E.index);
-				k += E.error;
-			}
-		}
-
-		String error_key = k.as_string();
-		if (error_key == last_error_key) {
-			return;
-		}
-		last_error_key = error_key;
-	}
-
-	const String point = String::utf8("•  ");
-
-	p_error_label->clear();
-	p_error_label->append_text(editor_error_message);
-	if (p_other_errors) {
-		p_error_label->append_text(*p_other_errors);
-	}
-
-	bool first = true;
-	for (const KeyValue<StringName, AnimationNode::InvalidInstance> &kv : invalid_instances) {
-		if (!first) {
-			p_error_label->add_newline();
-		}
-		first = false;
-
-		Ref<AnimationNode> node = p_tree->get_animation_node_by_path(kv.key);
-		ERR_CONTINUE(node.is_null());
-
-		p_error_label->append_text(vformat(RTR("%s at "), node->get_class()));
-		p_error_label->push_meta(String(kv.key));
-		{
-			p_error_label->append_text(vformat(RTR("'%s'"), kv.key));
-		}
-		p_error_label->pop();
-		p_error_label->append_text(RTR(" has errors.\n"));
-
-		StringBuffer instance_error_builder;
-		for (const String &reason : kv.value.errors) {
-			instance_error_builder += point;
-			instance_error_builder += reason;
-			instance_error_builder += "\n";
-		}
-		p_error_label->append_text(instance_error_builder.as_string());
-
-		// Input errors.
-		String input_error_base = String(kv.key) + "::";
-		for (const AnimationNode::InvalidInstance::InputError &input_error : kv.value.input_errors) {
-			const String input_name = node->get_input_name(input_error.index);
-
-			p_error_label->append_text(point + input_error.error + " ");
-			p_error_label->push_meta(input_error_base + itos(input_error.index));
-			{
-				p_error_label->append_text(vformat(RTR("input %d '%s'."), input_error.index, input_name));
-			}
-			p_error_label->pop();
-			p_error_label->add_newline();
-		}
-	}
-
-	p_error_panel->show();
-}
 
 void AnimationTreeEditor::edit(AnimationTree *p_tree) {
 	if (p_tree && !p_tree->is_connected("animation_list_changed", callable_mp(this, &AnimationTreeEditor::_animation_list_changed))) {
@@ -254,14 +104,6 @@ void AnimationTreeEditor::_update_path() {
 	b->connect(SceneStringName(pressed), callable_mp(this, &AnimationTreeEditor::_path_button_pressed).bind(-1));
 	path_hb->add_child(b);
 	for (int i = 0; i < button_path.size(); i++) {
-		// bread crumbs.
-		TextureRect *texture_rect = memnew(TextureRect);
-		texture_rect->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
-		texture_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
-		texture_rect->set_custom_minimum_size(Size2(16, 16) * EDSCALE);
-		texture_rect->set_texture(get_editor_theme_icon(SNAME("GuiTreeArrowRight")));
-		path_hb->add_child(texture_rect);
-
 		b = memnew(Button);
 		b->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 		b->set_text(button_path[i]);
@@ -284,7 +126,7 @@ void AnimationTreeEditor::edit_path(const Vector<String> &p_path) {
 
 		for (int i = 0; i < p_path.size(); i++) {
 			Ref<AnimationNode> child = node->get_child_by_name(p_path[i]);
-			ERR_BREAK_MSG(child.is_null(), vformat("Cannot edit path '%s': node '%s' not found as child of '%s'.", String("/").join(p_path), p_path[i], node->get_class()));
+			ERR_BREAK(child.is_null());
 			node = child;
 			button_path.push_back(p_path[i]);
 		}
@@ -394,19 +236,26 @@ bool AnimationTreeEditor::can_edit(const Ref<AnimationNode> &p_node) const {
 	return false;
 }
 
-LocalVector<StringName> AnimationTreeEditor::get_animation_list() {
+Vector<String> AnimationTreeEditor::get_animation_list() {
 	// This can be called off the main thread due to resource preview generation. Quit early in that case.
 	if (!singleton->tree || !Thread::is_main_thread() || !singleton->is_visible()) {
 		// When tree is empty, singleton not in the main thread.
-		return LocalVector<StringName>();
+		return Vector<String>();
 	}
 
 	AnimationTree *tree = singleton->tree;
 	if (!tree) {
-		return LocalVector<StringName>();
+		return Vector<String>();
 	}
 
-	return tree->get_sorted_animation_list();
+	List<StringName> anims;
+	tree->get_animation_list(&anims);
+	Vector<String> ret;
+	for (const StringName &E : anims) {
+		ret.push_back(E);
+	}
+
+	return ret;
 }
 
 AnimationTreeEditor::AnimationTreeEditor() {
diff --git a/engine/editor/animation/animation_tree_editor_plugin.h b/engine/editor/animation/animation_tree_editor_plugin.h
index dc5790b1..32db6f1a 100644
--- a/engine/editor/animation/animation_tree_editor_plugin.h
+++ b/engine/editor/animation/animation_tree_editor_plugin.h
@@ -33,13 +33,11 @@
 #include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_tree.h"
-#include "scene/gui/box_container.h"
+#include "scene/gui/graph_edit.h"
 
 class Button;
 class EditorFileDialog;
-class PanelContainer;
 class ScrollContainer;
-class RichTextLabel;
 
 class AnimationTreeNodeEditorPlugin : public VBoxContainer {
 	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer);
@@ -47,16 +45,6 @@ class AnimationTreeNodeEditorPlugin : public VBoxContainer {
 public:
 	virtual bool can_edit(const Ref<AnimationNode> &p_node) = 0;
 	virtual void edit(const Ref<AnimationNode> &p_node) = 0;
-
-protected:
-	RichTextLabel *create_error_label_node();
-
-	void _meta_clicked(Variant p_meta);
-
-	void update_error_message(const AnimationTree *p_tree, PanelContainer *p_error_panel, RichTextLabel *p_error_label, const String *p_other_errors = nullptr);
-
-private:
-	String last_error_key;
 };
 
 class AnimationTreeEditor : public EditorDock {
@@ -79,7 +67,7 @@ class AnimationTreeEditor : public EditorDock {
 	void _path_button_pressed(int p_path);
 	void _animation_list_changed();
 
-	static LocalVector<StringName> get_animation_list();
+	static Vector<String> get_animation_list();
 
 protected:
 	void _notification(int p_what);
@@ -112,6 +100,7 @@ class AnimationTreeEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "AnimationTree"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/asset_library/asset_library_editor_plugin.cpp b/engine/editor/asset_library/asset_library_editor_plugin.cpp
index be8a6886..7ff49d5b 100644
--- a/engine/editor/asset_library/asset_library_editor_plugin.cpp
+++ b/engine/editor/asset_library/asset_library_editor_plugin.cpp
@@ -30,14 +30,10 @@
 
 #include "asset_library_editor_plugin.h"
 
-#include "core/config/engine.h"
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/stream_peer_tls.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
@@ -791,7 +787,7 @@ void EditorAssetLibrary::shortcut_input(const Ref<InputEvent> &p_event) {
 	const Ref<InputEventKey> key = p_event;
 
 	if (key.is_valid() && key->is_pressed()) {
-		if (ED_IS_SHORTCUT("editor/open_search", p_event) && is_visible_in_tree()) {
+		if (key->is_match(InputEventKey::create_reference(KeyModifierMask::CMD_OR_CTRL | Key::F)) && is_visible_in_tree()) {
 			filter->grab_focus();
 			filter->select_all();
 			accept_event();
diff --git a/engine/editor/asset_library/editor_asset_installer.cpp b/engine/editor/asset_library/editor_asset_installer.cpp
index 77cc2e24..523e9d66 100644
--- a/engine/editor/asset_library/editor_asset_installer.cpp
+++ b/engine/editor/asset_library/editor_asset_installer.cpp
@@ -33,8 +33,6 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/zip_io.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
diff --git a/engine/editor/audio/audio_stream_editor_plugin.cpp b/engine/editor/audio/audio_stream_editor_plugin.cpp
index 04eea59c..fe24922d 100644
--- a/engine/editor/audio/audio_stream_editor_plugin.cpp
+++ b/engine/editor/audio/audio_stream_editor_plugin.cpp
@@ -30,13 +30,11 @@
 
 #include "audio_stream_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/audio_stream_wav.h"
-#include "servers/rendering/rendering_server.h"
 
 // AudioStreamEditor
 
diff --git a/engine/editor/audio/audio_stream_preview.cpp b/engine/editor/audio/audio_stream_preview.cpp
index f72b7d6c..eae31d1a 100644
--- a/engine/editor/audio/audio_stream_preview.cpp
+++ b/engine/editor/audio/audio_stream_preview.cpp
@@ -30,9 +30,6 @@
 
 #include "audio_stream_preview.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 /////////////////////
 
 float AudioStreamPreview::get_length() const {
diff --git a/engine/editor/audio/audio_stream_randomizer_editor_plugin.cpp b/engine/editor/audio/audio_stream_randomizer_editor_plugin.cpp
index c0c231e5..5e364b11 100644
--- a/engine/editor/audio/audio_stream_randomizer_editor_plugin.cpp
+++ b/engine/editor/audio/audio_stream_randomizer_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_stream_randomizer_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "servers/audio/audio_stream.h"
diff --git a/engine/editor/audio/audio_stream_randomizer_editor_plugin.h b/engine/editor/audio/audio_stream_randomizer_editor_plugin.h
index f302485f..395e9cc6 100644
--- a/engine/editor/audio/audio_stream_randomizer_editor_plugin.h
+++ b/engine/editor/audio/audio_stream_randomizer_editor_plugin.h
@@ -40,6 +40,7 @@ private:
 
 public:
 	virtual String get_plugin_name() const override { return "AudioStreamRandomizer"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/audio/editor_audio_buses.cpp b/engine/editor/audio/editor_audio_buses.cpp
index 1245e7fb..160bc57d 100644
--- a/engine/editor/audio/editor_audio_buses.cpp
+++ b/engine/editor/audio/editor_audio_buses.cpp
@@ -32,10 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
@@ -136,6 +133,14 @@ void EditorAudioBus::_notification(int p_what) {
 			set_process(true);
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Audio bus editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (is_master) {
 				draw_style_box(get_theme_stylebox(SNAME("master"), SNAME("EditorAudioBus")), Rect2(Vector2(), get_size()));
@@ -221,7 +226,7 @@ void EditorAudioBus::update_send() {
 	send->clear();
 	if (is_master) {
 		send->set_disabled(true);
-		send->add_item(TTRC("Speakers"));
+		send->set_text(TTR("Speakers"));
 	} else {
 		send->set_disabled(false);
 		StringName current_send = AudioServer::get_singleton()->get_bus_send(get_index());
diff --git a/engine/editor/audio/editor_audio_buses.h b/engine/editor/audio/editor_audio_buses.h
index ee1715fa..d664d9d6 100644
--- a/engine/editor/audio/editor_audio_buses.h
+++ b/engine/editor/audio/editor_audio_buses.h
@@ -278,6 +278,7 @@ class AudioBusesEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "SampleLibrary"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_node) override;
 	virtual bool handles(Object *p_node) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
index b8c64c46..94fcb308 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
@@ -30,12 +30,11 @@
 
 #include "debug_adapter_parser.h"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/debugger/debug_adapter/debug_adapter_protocol.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/export/editor_export.h"
+#include "editor/export/editor_export_platform.h"
 #include "editor/run/editor_run_bar.h"
 #include "editor/script/script_editor_plugin.h"
 
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
index 367b9566..5859c34d 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
@@ -34,8 +34,6 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/debugger/debug_adapter/debug_adapter_parser.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_log.h"
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
index 48cccecd..5f0e07f9 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
@@ -35,7 +35,7 @@
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
 #include "editor/debugger/debug_adapter/debug_adapter_types.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 
 #define DAP_MAX_BUFFER_SIZE 4194304 // 4MB
 #define DAP_MAX_CLIENTS 8
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_server.cpp b/engine/editor/debugger/debug_adapter/debug_adapter_server.cpp
index d029c89d..da483651 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_server.cpp
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_server.cpp
@@ -80,14 +80,11 @@ void DebugAdapterServer::_notification(int p_what) {
 
 void DebugAdapterServer::start() {
 	remote_port = (DebugAdapterServer::port_override > -1) ? DebugAdapterServer::port_override : (int)_EDITOR_GET("network/debug_adapter/remote_port");
-	const Error status = protocol.start(remote_port, IPAddress("127.0.0.1"));
-	if (status != OK) {
-		EditorNode::get_log()->add_message("--- Failed to start Debug adapter server on port " + itos(remote_port) + ": " + error_names[status] + " ---", EditorLog::MSG_TYPE_EDITOR);
-		return;
+	if (protocol.start(remote_port, IPAddress("127.0.0.1")) == OK) {
+		EditorNode::get_log()->add_message("--- Debug adapter server started on port " + itos(remote_port) + " ---", EditorLog::MSG_TYPE_EDITOR);
+		set_process_internal(true);
+		started = true;
 	}
-	EditorNode::get_log()->add_message("--- Debug adapter server started on port " + itos(remote_port) + " ---", EditorLog::MSG_TYPE_EDITOR);
-	set_process_internal(true);
-	started = true;
 }
 
 void DebugAdapterServer::stop() {
diff --git a/engine/editor/debugger/debugger_editor_plugin.cpp b/engine/editor/debugger/debugger_editor_plugin.cpp
index 75f4b9b1..285b368f 100644
--- a/engine/editor/debugger/debugger_editor_plugin.cpp
+++ b/engine/editor/debugger/debugger_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "debugger_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"
@@ -39,6 +38,7 @@
 #include "editor/editor_node.h"
 #include "editor/run/run_instances_dialog.h"
 #include "editor/script/script_editor_plugin.h"
+#include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/popup_menu.h"
 
diff --git a/engine/editor/debugger/debugger_editor_plugin.h b/engine/editor/debugger/debugger_editor_plugin.h
index 8495e528..c5860d83 100644
--- a/engine/editor/debugger/debugger_editor_plugin.h
+++ b/engine/editor/debugger/debugger_editor_plugin.h
@@ -67,6 +67,7 @@ private:
 
 public:
 	virtual String get_plugin_name() const override { return "Debugger"; }
+	bool has_main_screen() const override { return false; }
 
 	DebuggerEditorPlugin(PopupMenu *p_menu);
 	~DebuggerEditorPlugin();
diff --git a/engine/editor/debugger/editor_debugger_inspector.cpp b/engine/editor/debugger/editor_debugger_inspector.cpp
index 1a9394e9..79bec1ed 100644
--- a/engine/editor/debugger/editor_debugger_inspector.cpp
+++ b/engine/editor/debugger/editor_debugger_inspector.cpp
@@ -32,14 +32,10 @@
 
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/variant/typed_dictionary.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 
 bool EditorDebuggerRemoteObjects::_set(const StringName &p_name, const Variant &p_value) {
 	return _set_impl(p_name, p_value, "");
@@ -51,7 +47,7 @@ bool EditorDebuggerRemoteObjects::_set_impl(const StringName &p_name, const Vari
 		return false;
 	}
 
-	// Change it back to the real name when sending it.
+	// Change it back to the real name when fetching.
 	if (name == "Script") {
 		name = "script";
 	} else if (name.begins_with("Metadata/")) {
@@ -76,10 +72,18 @@ bool EditorDebuggerRemoteObjects::_set_impl(const StringName &p_name, const Vari
 }
 
 bool EditorDebuggerRemoteObjects::_get(const StringName &p_name, Variant &r_ret) const {
-	if (!prop_values.has(p_name)) {
+	String name = p_name;
+	if (!prop_values.has(name)) {
 		return false;
 	}
 
+	// Change it back to the real name when fetching.
+	if (name == "Script") {
+		name = "script";
+	} else if (name.begins_with("Metadata/")) {
+		name = name.replace_first("Metadata/", "metadata/");
+	}
+
 	r_ret = prop_values[p_name][remote_object_ids[0]];
 	return true;
 }
@@ -104,13 +108,7 @@ void EditorDebuggerRemoteObjects::set_property_field(const StringName &p_propert
 String EditorDebuggerRemoteObjects::get_title() {
 	if (!remote_object_ids.is_empty() && ObjectID(remote_object_ids[0].operator uint64_t()).is_valid()) {
 		const int size = remote_object_ids.size();
-		if (size == 1) {
-			if (node_name.is_empty() || node_name == type_name) {
-				return vformat(TTR("Remote %s: %d"), type_name, remote_object_ids[0]);
-			}
-			return vformat(TTR("Remote %s (%s): %d"), type_name, node_name, remote_object_ids[0]);
-		}
-		return vformat(TTR("Remote %s (%d Selected)"), type_name, size);
+		return size == 1 ? vformat(TTR("Remote %s: %d"), type_name, remote_object_ids[0]) : vformat(TTR("Remote %s (%d Selected)"), type_name, size);
 	}
 
 	return "<null>";
@@ -122,17 +120,12 @@ Variant EditorDebuggerRemoteObjects::get_variant(const StringName &p_name) {
 	return var;
 }
 
-void EditorDebuggerRemoteObjects::clear() {
-	prop_list.clear();
-	prop_values.clear();
-}
-
 void EditorDebuggerRemoteObjects::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_title"), &EditorDebuggerRemoteObjects::get_title);
 	ClassDB::bind_method("_hide_script_from_inspector", &EditorDebuggerRemoteObjects::_hide_script_from_inspector);
 	ClassDB::bind_method("_hide_metadata_from_inspector", &EditorDebuggerRemoteObjects::_hide_metadata_from_inspector);
 
-	ADD_SIGNAL(MethodInfo("values_edited", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::DICTIONARY, "values", PROPERTY_HINT_DICTIONARY_TYPE, "uint64_t;Variant"), PropertyInfo(Variant::STRING, "field")));
+	ADD_SIGNAL(MethodInfo("values_edited", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::DICTIONARY, "values", PROPERTY_HINT_DICTIONARY_TYPE, "uint64_t:Variant"), PropertyInfo(Variant::STRING, "field")));
 }
 
 /// EditorDebuggerInspector
@@ -207,6 +200,34 @@ EditorDebuggerRemoteObjects *EditorDebuggerInspector::set_objects(const Array &p
 		remote_objects_list.push_back(remote_objects);
 	}
 
+	StringName class_name = objects[0].class_name;
+	if (class_name != SNAME("Object")) {
+		// Search for the common class between all selected objects.
+		bool check_type_again = true;
+		while (check_type_again) {
+			check_type_again = false;
+
+			if (class_name == SNAME("Object") || class_name == StringName()) {
+				// All objects inherit from Object, so no need to continue checking.
+				class_name = SNAME("Object");
+				break;
+			}
+
+			// Check that all objects inherit from type_name.
+			for (const SceneDebuggerObject &obj : objects) {
+				if (obj.class_name == class_name || ClassDB::is_parent_class(obj.class_name, class_name)) {
+					continue; // class_name is the same or a parent of the object's class.
+				}
+
+				// class_name is not a parent of the node's class, so check again with the parent class.
+				class_name = ClassDB::get_parent_class(class_name);
+				check_type_again = true;
+				break;
+			}
+		}
+	}
+	remote_objects->type_name = class_name;
+
 	// Search for properties that are present in all selected objects.
 	struct UsageData {
 		int qty = 0;
@@ -290,79 +311,6 @@ EditorDebuggerRemoteObjects *EditorDebuggerInspector::set_objects(const Array &p
 		remote_objects->prop_values[pinfo.name] = KV.value.values;
 	}
 
-	StringName class_name = objects[0].class_name;
-	bool has_custom_class = true;
-
-	if (usage.has("Script")) {
-		// Check if all objects have the same script.
-		Ref<Script> common_scr;
-		LocalVector<Variant> keys = usage["Script"].values.get_key_list();
-		for (const Variant &key : keys) {
-			Ref<Script> scr = usage["Script"].values[key];
-			if (scr.is_null()) {
-				has_custom_class = false;
-				break;
-			}
-
-			if (common_scr.is_null()) {
-				common_scr = scr;
-			} else if (scr != common_scr) {
-				has_custom_class = false;
-				break;
-			}
-		}
-
-		if (has_custom_class) {
-			// Now check if the script has a custom class.
-			if (common_scr.is_null()) {
-				has_custom_class = false;
-			} else {
-				const StringName scr_class = common_scr->get_global_name();
-				if (scr_class.is_empty()) {
-					has_custom_class = false;
-				} else {
-					class_name = scr_class;
-				}
-			}
-		}
-	}
-
-	if (!has_custom_class && class_name != SNAME("Object")) {
-		// Search for the common class between all selected objects.
-		bool check_type_again = true;
-		while (check_type_again) {
-			check_type_again = false;
-
-			if (class_name.is_empty() || class_name == SNAME("Object")) {
-				// All objects inherit from Object, so no need to continue checking.
-				class_name = SNAME("Object");
-				break;
-			}
-
-			// Check that all objects inherit from type_name.
-			for (const SceneDebuggerObject &obj : objects) {
-				if (obj.class_name == class_name || ClassDB::is_parent_class(obj.class_name, class_name)) {
-					continue; // class_name is the same or a parent of the object's class.
-				}
-
-				// class_name is not a parent of the node's class, so check again with the parent class.
-				class_name = ClassDB::get_parent_class(class_name);
-				check_type_again = true;
-				break;
-			}
-		}
-	}
-	remote_objects->type_name = class_name;
-	remote_objects->node_name = "";
-	if (objects.size() == 1) {
-		for (const SceneDebuggerObject::SceneDebuggerProperty &prop : objects[0].properties) {
-			if (prop.first.name == "name") {
-				remote_objects->node_name = prop.second;
-				break;
-			}
-		}
-	}
-
 	if (old_prop_size == remote_objects->prop_list.size() && new_props_added == 0) {
 		// Only some may have changed, if so, then update those, if they exist.
 		for (const String &E : changed) {
@@ -426,7 +374,7 @@ void EditorDebuggerInspector::add_stack_variable(const Array &p_array, int p_off
 	if (var.var_type == Variant::OBJECT && v) {
 		v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 		h = PROPERTY_HINT_OBJECT_ID;
-		hs = var.type_hint;
+		hs = "Object";
 	}
 	String type;
 	switch (var.type) {
diff --git a/engine/editor/debugger/editor_debugger_inspector.h b/engine/editor/debugger/editor_debugger_inspector.h
index 9b355c39..a92177cb 100644
--- a/engine/editor/debugger/editor_debugger_inspector.h
+++ b/engine/editor/debugger/editor_debugger_inspector.h
@@ -30,13 +30,11 @@
 
 #pragma once
 
+#include "core/variant/typed_dictionary.h"
 #include "editor/inspector/editor_inspector.h"
 
 class SceneDebuggerObject;
 
-template <typename K, typename V>
-class TypedDictionary;
-
 class EditorDebuggerRemoteObjects : public Object {
 	GDCLASS(EditorDebuggerRemoteObjects, Object);
 
@@ -52,7 +50,6 @@ protected:
 public:
 	TypedArray<uint64_t> remote_object_ids;
 	String type_name;
-	String node_name; // For human-readable name.
 	List<PropertyInfo> prop_list;
 	HashMap<StringName, TypedDictionary<uint64_t, Variant>> prop_values;
 
@@ -63,7 +60,10 @@ public:
 	String get_title();
 	Variant get_variant(const StringName &p_name);
 
-	void clear();
+	void clear() {
+		prop_list.clear();
+		prop_values.clear();
+	}
 
 	void update() { notify_property_list_changed(); }
 };
diff --git a/engine/editor/debugger/editor_debugger_node.cpp b/engine/editor/debugger/editor_debugger_node.cpp
index 0f01de5d..cf50ad94 100644
--- a/engine/editor/debugger/editor_debugger_node.cpp
+++ b/engine/editor/debugger/editor_debugger_node.cpp
@@ -30,10 +30,6 @@
 
 #include "editor_debugger_node.h"
 
-#include "core/config/engine.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/undo_redo.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_debugger_tree.h"
@@ -53,7 +49,6 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display/display_server.h"
 
 template <typename Func>
 void _for_all(TabContainer *p_node, const Func &p_func) {
@@ -72,7 +67,9 @@ EditorDebuggerNode::EditorDebuggerNode() {
 	set_layout_key("Debugger");
 	set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_debugger_bottom_panel", TTRC("Toggle Debugger Dock"), KeyModifierMask::ALT | Key::D));
 	set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
-	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
+	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL);
+	set_global(false);
+	set_transient(true);
 
 	_update_margins();
 
diff --git a/engine/editor/debugger/editor_debugger_plugin.cpp b/engine/editor/debugger/editor_debugger_plugin.cpp
index aca22ff4..fbb389cc 100644
--- a/engine/editor/debugger/editor_debugger_plugin.cpp
+++ b/engine/editor/debugger/editor_debugger_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_debugger_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/debugger/script_editor_debugger.h"
 
 void EditorDebuggerSession::_breaked(bool p_really_did, bool p_can_debug, const String &p_message, bool p_has_stackdump) {
@@ -115,6 +113,7 @@ void EditorDebuggerSession::detach_debugger() {
 	debugger->disconnect("started", callable_mp(this, &EditorDebuggerSession::_started));
 	debugger->disconnect("stopped", callable_mp(this, &EditorDebuggerSession::_stopped));
 	debugger->disconnect("breaked", callable_mp(this, &EditorDebuggerSession::_breaked));
+	debugger->disconnect(SceneStringName(tree_exited), callable_mp(this, &EditorDebuggerSession::_debugger_gone_away));
 	for (Control *tab : tabs) {
 		debugger->remove_debugger_tab(tab);
 	}
@@ -122,12 +121,18 @@ void EditorDebuggerSession::detach_debugger() {
 	debugger = nullptr;
 }
 
+void EditorDebuggerSession::_debugger_gone_away() {
+	debugger = nullptr;
+	tabs.clear();
+}
+
 EditorDebuggerSession::EditorDebuggerSession(ScriptEditorDebugger *p_debugger) {
 	ERR_FAIL_NULL(p_debugger);
 	debugger = p_debugger;
 	debugger->connect("started", callable_mp(this, &EditorDebuggerSession::_started));
 	debugger->connect("stopped", callable_mp(this, &EditorDebuggerSession::_stopped));
 	debugger->connect("breaked", callable_mp(this, &EditorDebuggerSession::_breaked));
+	debugger->connect(SceneStringName(tree_exited), callable_mp(this, &EditorDebuggerSession::_debugger_gone_away), CONNECT_ONE_SHOT);
 }
 
 EditorDebuggerSession::~EditorDebuggerSession() {
diff --git a/engine/editor/debugger/editor_debugger_plugin.h b/engine/editor/debugger/editor_debugger_plugin.h
index a802f2a4..1cc4a54e 100644
--- a/engine/editor/debugger/editor_debugger_plugin.h
+++ b/engine/editor/debugger/editor_debugger_plugin.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "core/object/ref_counted.h"
-#include "core/object/script_language.h"
 #include "scene/gui/control.h"
 
 class ScriptEditorDebugger;
@@ -47,6 +45,7 @@ private:
 	void _breaked(bool p_really_did, bool p_can_debug, const String &p_message, bool p_has_stackdump);
 	void _started();
 	void _stopped();
+	void _debugger_gone_away();
 
 protected:
 	static void _bind_methods();
diff --git a/engine/editor/debugger/editor_debugger_server.cpp b/engine/editor/debugger/editor_debugger_server.cpp
index 1ae99a82..a38bbd1f 100644
--- a/engine/editor/debugger/editor_debugger_server.cpp
+++ b/engine/editor/debugger/editor_debugger_server.cpp
@@ -58,12 +58,12 @@ public:
 
 class EditorDebuggerServerTCP : public EditorDebuggerServerSocket<TCPServer> {
 public:
-	static Ref<EditorDebuggerServer> create(const String &p_protocol);
+	static EditorDebuggerServer *create(const String &p_protocol);
 
 	virtual Error start(const String &p_uri) override;
 };
 
-Ref<EditorDebuggerServer> EditorDebuggerServerTCP::create(const String &p_protocol) {
+EditorDebuggerServer *EditorDebuggerServerTCP::create(const String &p_protocol) {
 	ERR_FAIL_COND_V(p_protocol != "tcp://", nullptr);
 	return memnew(EditorDebuggerServerTCP);
 }
@@ -138,12 +138,12 @@ Ref<RemoteDebuggerPeer> EditorDebuggerServerSocket<T>::take_connection() {
 
 class EditorDebuggerServerUDS : public EditorDebuggerServerSocket<UDSServer> {
 public:
-	static Ref<EditorDebuggerServer> create(const String &p_protocol);
+	static EditorDebuggerServer *create(const String &p_protocol);
 
 	virtual Error start(const String &p_uri) override;
 };
 
-Ref<EditorDebuggerServer> EditorDebuggerServerUDS::create(const String &p_protocol) {
+EditorDebuggerServer *EditorDebuggerServerUDS::create(const String &p_protocol) {
 	ERR_FAIL_COND_V(p_protocol != "unix://", nullptr);
 	return memnew(EditorDebuggerServerUDS);
 }
@@ -163,7 +163,7 @@ Error EditorDebuggerServerUDS::start(const String &p_uri) {
 /// EditorDebuggerServer
 HashMap<StringName, EditorDebuggerServer::CreateServerFunc> EditorDebuggerServer::protocols;
 
-Ref<EditorDebuggerServer> EditorDebuggerServer::create(const String &p_protocol) {
+EditorDebuggerServer *EditorDebuggerServer::create(const String &p_protocol) {
 	CreateServerFunc *create_fn = protocols.getptr(p_protocol);
 	ERR_FAIL_NULL_V(create_fn, nullptr);
 	return (*create_fn)(p_protocol);
diff --git a/engine/editor/debugger/editor_debugger_server.h b/engine/editor/debugger/editor_debugger_server.h
index b846da44..7d35a20a 100644
--- a/engine/editor/debugger/editor_debugger_server.h
+++ b/engine/editor/debugger/editor_debugger_server.h
@@ -37,7 +37,7 @@ class EditorDebuggerServer : public RefCounted {
 	GDSOFTCLASS(EditorDebuggerServer, RefCounted);
 
 public:
-	typedef Ref<EditorDebuggerServer> (*CreateServerFunc)(const String &p_uri);
+	typedef EditorDebuggerServer *(*CreateServerFunc)(const String &p_uri);
 
 private:
 	static HashMap<StringName, CreateServerFunc> protocols;
@@ -47,7 +47,7 @@ public:
 	static void deinitialize();
 
 	static void register_protocol_handler(const String &p_protocol, CreateServerFunc p_func);
-	static Ref<EditorDebuggerServer> create(const String &p_protocol);
+	static EditorDebuggerServer *create(const String &p_protocol);
 
 	virtual String get_uri() const = 0;
 	virtual void poll() = 0;
diff --git a/engine/editor/debugger/editor_debugger_tree.cpp b/engine/editor/debugger/editor_debugger_tree.cpp
index b7fb67ac..10b4ead2 100644
--- a/engine/editor/debugger/editor_debugger_tree.cpp
+++ b/engine/editor/debugger/editor_debugger_tree.cpp
@@ -30,18 +30,14 @@
 
 #include "editor_debugger_tree.h"
 
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
-#include "editor/docks/inspector_dock.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display/display_server.h"
@@ -283,12 +279,18 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 		if (debugger_id == p_debugger) { // Can use remote id.
 			if (inspected_object_ids.has(uint64_t(node.id))) {
 				ids_present.append(node.id);
-				select_items.push_back(item);
-				if (should_scroll) {
+
+				if (selection_uncollapse_all) {
+					selection_uncollapse_all = false;
+
 					// Temporarily set to `false`, to allow caching the unfolds.
 					updating_scene_tree = false;
 					item->uncollapse_tree();
 					updating_scene_tree = true;
+				}
+
+				select_items.push_back(item);
+				if (should_scroll) {
 					scroll_item = item;
 				}
 			}
@@ -410,18 +412,10 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 
 void EditorDebuggerTree::select_nodes(const TypedArray<int64_t> &p_ids) {
 	// Manually select, as the tree control may be out-of-date for some reason (e.g. not shown yet).
+	selection_uncollapse_all = true;
 	inspected_object_ids = p_ids;
 	scrolling_to_item = true;
 
-	// If we have not previously selected any of these items, expand the inspector's properties for this item.
-	for (ObjectID id : p_ids) {
-		if (!selection_cache.has(id)) {
-			selection_cache.insert(id);
-
-			InspectorDock::get_inspector_singleton()->expand_all_folding();
-		}
-	}
-
 	if (!updating_scene_tree) {
 		// Request a tree refresh.
 		EditorDebuggerNode::get_singleton()->request_remote_tree();
@@ -477,11 +471,6 @@ Variant EditorDebuggerTree::get_drag_data(const Point2 &p_point) {
 	return vformat("\"%s\"", path);
 }
 
-void EditorDebuggerTree::set_new_session() {
-	new_session = true;
-	selection_cache.clear();
-}
-
 void EditorDebuggerTree::update_icon_max_width() {
 	add_theme_constant_override("icon_max_width", get_theme_constant("class_icon_size", EditorStringName(Editor)));
 }
diff --git a/engine/editor/debugger/editor_debugger_tree.h b/engine/editor/debugger/editor_debugger_tree.h
index d5c16a0d..27327dbe 100644
--- a/engine/editor/debugger/editor_debugger_tree.h
+++ b/engine/editor/debugger/editor_debugger_tree.h
@@ -65,8 +65,8 @@ private:
 	bool scrolling_to_item = false;
 	bool notify_selection_queued = false;
 	bool selection_surpassed_limit = false;
+	bool selection_uncollapse_all = false;
 	HashSet<ObjectID> unfold_cache;
-	HashSet<ObjectID> selection_cache;
 	PopupMenu *item_menu = nullptr;
 	EditorFileDialog *file_dialog = nullptr;
 	AcceptDialog *accept = nullptr;
@@ -93,7 +93,7 @@ public:
 
 	virtual Variant get_drag_data(const Point2 &p_point) override;
 
-	void set_new_session();
+	void set_new_session() { new_session = true; }
 	void update_icon_max_width();
 	String get_selected_path();
 	ObjectID get_selected_object();
diff --git a/engine/editor/debugger/editor_expression_evaluator.cpp b/engine/editor/debugger/editor_expression_evaluator.cpp
index 609fc401..557dbba9 100644
--- a/engine/editor/debugger/editor_expression_evaluator.cpp
+++ b/engine/editor/debugger/editor_expression_evaluator.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_expression_evaluator.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_string_names.h"
diff --git a/engine/editor/debugger/editor_performance_profiler.cpp b/engine/editor/debugger/editor_performance_profiler.cpp
index c2f7a71f..17ece0c0 100644
--- a/engine/editor/debugger/editor_performance_profiler.cpp
+++ b/engine/editor/debugger/editor_performance_profiler.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_performance_profiler.h"
 
-#include "core/object/callable_mp.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_property_name_processor.h"
@@ -404,7 +403,7 @@ void EditorPerformanceProfiler::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localization/localize_settings")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localize_settings")) {
 				_build_monitor_tree();
 			}
 		} break;
diff --git a/engine/editor/debugger/editor_profiler.cpp b/engine/editor/debugger/editor_profiler.cpp
index 9ba3b4f9..12ecc398 100644
--- a/engine/editor/debugger/editor_profiler.cpp
+++ b/engine/editor/debugger/editor_profiler.cpp
@@ -31,8 +31,6 @@
 #include "editor_profiler.h"
 
 #include "core/io/image.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
@@ -40,7 +38,6 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/label.h"
 #include "scene/resources/image_texture.h"
 
 void EditorProfiler::_make_metric_ptrs(Metric &m) {
@@ -52,7 +49,7 @@ void EditorProfiler::_make_metric_ptrs(Metric &m) {
 	}
 }
 
-const EditorProfiler::Metric &EditorProfiler::_get_frame_metric(int index) const {
+EditorProfiler::Metric EditorProfiler::_get_frame_metric(int index) {
 	return frame_metrics[(frame_metrics.size() + last_metric - (total_metrics - 1) + index) % frame_metrics.size()];
 }
 
diff --git a/engine/editor/debugger/editor_profiler.h b/engine/editor/debugger/editor_profiler.h
index c49a1fb0..28e4c4d8 100644
--- a/engine/editor/debugger/editor_profiler.h
+++ b/engine/editor/debugger/editor_profiler.h
@@ -33,6 +33,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
+#include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
@@ -162,7 +163,7 @@ private:
 
 	void _combo_changed(int);
 
-	const Metric &_get_frame_metric(int index) const;
+	Metric _get_frame_metric(int index);
 
 protected:
 	void _notification(int p_what);
diff --git a/engine/editor/debugger/editor_visual_profiler.cpp b/engine/editor/debugger/editor_visual_profiler.cpp
index 80a525c4..67ede8b9 100644
--- a/engine/editor/debugger/editor_visual_profiler.cpp
+++ b/engine/editor/debugger/editor_visual_profiler.cpp
@@ -31,15 +31,12 @@
 #include "editor_visual_profiler.h"
 
 #include "core/io/image.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/label.h"
 #include "scene/resources/image_texture.h"
 
 void EditorVisualProfiler::set_hardware_info(const String &p_cpu_name, const String &p_gpu_name) {
diff --git a/engine/editor/debugger/editor_visual_profiler.h b/engine/editor/debugger/editor_visual_profiler.h
index f79e08b8..b4a8b1a6 100644
--- a/engine/editor/debugger/editor_visual_profiler.h
+++ b/engine/editor/debugger/editor_visual_profiler.h
@@ -33,6 +33,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
diff --git a/engine/editor/debugger/script_editor_debugger.cpp b/engine/editor/debugger/script_editor_debugger.cpp
index b61619dc..13e56c73 100644
--- a/engine/editor/debugger/script_editor_debugger.cpp
+++ b/engine/editor/debugger/script_editor_debugger.cpp
@@ -30,15 +30,9 @@
 
 #include "script_editor_debugger.h"
 
-#include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/remote_debugger.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/string/ustring.h"
-#include "core/variant/typed_dictionary.h"
 #include "core/version.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_expression_evaluator.h"
@@ -60,7 +54,7 @@
 #include "editor/themes/editor_scale.h"
 #include "main/performance.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
@@ -660,7 +654,6 @@ void ScriptEditorDebugger::_msg_error(uint64_t p_thread_id, const Array &p_data)
 	}
 	error->set_collapsed(true);
 
-	error->set_text_overrun_behavior(0, TextServer::OVERRUN_NO_TRIMMING);
 	error->set_icon(0, get_editor_theme_icon(oe.warning ? SNAME("Warning") : SNAME("Error")));
 	error->set_text(0, time);
 	error->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
@@ -685,7 +678,6 @@ void ScriptEditorDebugger::_msg_error(uint64_t p_thread_id, const Array &p_data)
 	error_title += oe.error_descr.is_empty() ? oe.error : oe.error_descr;
 	error->set_text(1, error_title);
 	error->set_autowrap_mode(1, TextServer::AUTOWRAP_WORD_SMART);
-	error->set_autowrap_trim_flags(1, 0);
 	tooltip += " " + error_title + "\n";
 
 	// Find the language of the error's source file.
@@ -1120,20 +1112,11 @@ void ScriptEditorDebugger::_notification(int p_what) {
 			vmem_notice_icon->set_texture(get_editor_theme_icon(SNAME("NodeInfo")));
 			vmem_refresh->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
 			vmem_export->set_button_icon(get_editor_theme_icon(SNAME("Save")));
-			vmem_item_menu->set_item_icon(VMEM_MENU_SHOW_IN_FILESYSTEM, get_editor_theme_icon(SNAME("ShowInFileSystem")));
-			vmem_item_menu->set_item_icon(VMEM_MENU_SHOW_IN_EXPLORER, get_editor_theme_icon(SNAME("Filesystem")));
 			search->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 
 			reason->add_theme_color_override(SNAME("default_color"), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
 			reason->add_theme_style_override(SNAME("normal"), get_theme_stylebox(SNAME("normal"), SNAME("Label"))); // Empty stylebox.
 
-			const Ref<Font> source_font = get_theme_font(SNAME("output_source"), EditorStringName(EditorFonts));
-			if (source_font.is_valid()) {
-				error_tree->add_theme_font_override("font", source_font);
-			}
-			const int font_size = get_theme_font_size(SNAME("output_source_size"), EditorStringName(EditorFonts));
-			error_tree->add_theme_font_size_override("font_size", font_size);
-
 			TreeItem *error_root = error_tree->get_root();
 			if (error_root) {
 				TreeItem *error = error_root->get_first_child();
@@ -1853,45 +1836,6 @@ void ScriptEditorDebugger::_vmem_item_activated() {
 	FileSystemDock::get_singleton()->navigate_to_path(path);
 }
 
-void ScriptEditorDebugger::_vmem_tree_rmb_selected(const Vector2 &p_pos, MouseButton p_button) {
-	if (p_button != MouseButton::RIGHT) {
-		return;
-	}
-
-	TreeItem *item = vmem_tree->get_selected();
-	if (!item) {
-		return;
-	}
-
-	String path = item->get_text(0);
-	if (path.is_empty() || !FileAccess::exists(path)) {
-		return;
-	}
-
-	vmem_item_menu->set_position(vmem_tree->get_screen_position() + p_pos);
-	vmem_item_menu->popup();
-}
-
-void ScriptEditorDebugger::_vmem_item_menu_id_pressed(int p_option) {
-	TreeItem *item = vmem_tree->get_selected();
-	if (!item) {
-		return;
-	}
-
-	String path = item->get_text(0);
-	switch (p_option) {
-		case VMEM_MENU_SHOW_IN_FILESYSTEM: {
-			FileSystemDock::get_singleton()->navigate_to_path(path);
-		} break;
-		case VMEM_MENU_SHOW_IN_EXPLORER: {
-			OS::get_singleton()->shell_show_in_file_manager(ProjectSettings::get_singleton()->globalize_path(path), true);
-		} break;
-		case VMEM_MENU_OWNERS: {
-			FileSystemDock::get_owners_dialog()->show(path);
-		} break;
-	}
-}
-
 void ScriptEditorDebugger::_clear_errors_list() {
 	error_tree->clear();
 	error_count = 0;
@@ -2307,7 +2251,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 
 		error_tree->set_column_expand(0, false);
 		error_tree->set_column_custom_minimum_width(0, 140);
-		error_tree->set_column_clip_content(0, false);
+		error_tree->set_column_clip_content(0, true);
 
 		error_tree->set_column_expand(1, true);
 		error_tree->set_column_clip_content(1, true);
@@ -2433,17 +2377,9 @@ Instead, use the monitors tab to obtain more precise VRAM usage.
 		vmem_tree->set_hide_root(true);
 		vmem_tree->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTTOM);
 		mc->add_child(vmem_tree);
-		vmem_tree->set_allow_rmb_select(true);
 		vmem_tree->connect("item_activated", callable_mp(this, &ScriptEditorDebugger::_vmem_item_activated));
-		vmem_tree->connect("item_mouse_selected", callable_mp(this, &ScriptEditorDebugger::_vmem_tree_rmb_selected));
-		tabs->add_child(vmem_vb);
 
-		vmem_item_menu = memnew(PopupMenu);
-		vmem_item_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptEditorDebugger::_vmem_item_menu_id_pressed));
-		vmem_item_menu->add_item(TTRC("Show in FileSystem"), VMEM_MENU_SHOW_IN_FILESYSTEM);
-		vmem_item_menu->add_item(OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_SHOW), VMEM_MENU_SHOW_IN_EXPLORER);
-		vmem_item_menu->add_item(TTRC("View Owners..."), VMEM_MENU_OWNERS);
-		add_child(vmem_item_menu);
+		tabs->add_child(vmem_vb);
 	}
 
 	{ // misc
diff --git a/engine/editor/debugger/script_editor_debugger.h b/engine/editor/debugger/script_editor_debugger.h
index 6364037c..7c07b89b 100644
--- a/engine/editor/debugger/script_editor_debugger.h
+++ b/engine/editor/debugger/script_editor_debugger.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/script_language.h"
-#include "core/os/process_id.h"
+#include "core/os/os.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "scene/gui/margin_container.h"
@@ -83,12 +83,6 @@ private:
 		ACTION_DELETE_ALL_BREAKPOINTS,
 	};
 
-	enum VMemMenu {
-		VMEM_MENU_SHOW_IN_FILESYSTEM,
-		VMEM_MENU_SHOW_IN_EXPLORER,
-		VMEM_MENU_OWNERS,
-	};
-
 	AcceptDialog *msgdialog = nullptr;
 
 	LineEdit *clicked_ctrl = nullptr;
@@ -145,7 +139,6 @@ private:
 	Button *vmem_export = nullptr;
 	LineEdit *vmem_total = nullptr;
 	TextureRect *vmem_notice_icon = nullptr;
-	PopupMenu *vmem_item_menu = nullptr;
 
 	Tree *stack_dump = nullptr;
 	LineEdit *search = nullptr;
@@ -164,7 +157,7 @@ private:
 	EditorPerformanceProfiler *performance_profiler = nullptr;
 	EditorExpressionEvaluator *expression_evaluator = nullptr;
 
-	ProcessID remote_pid = 0;
+	OS::ProcessID remote_pid = 0;
 	bool move_to_foreground = true;
 	bool can_request_idle_draw = false;
 
@@ -274,8 +267,6 @@ private:
 	void _collapse_errors_list();
 
 	void _vmem_item_activated();
-	void _vmem_tree_rmb_selected(const Vector2 &p_pos, MouseButton p_button);
-	void _vmem_item_menu_id_pressed(int p_option);
 
 	void _profiler_activate(bool p_enable, int p_profiler);
 	void _profiler_seeked();
diff --git a/engine/editor/doc/doc_tools.cpp b/engine/editor/doc/doc_tools.cpp
index 0460735f..5bdd6390 100644
--- a/engine/editor/doc/doc_tools.cpp
+++ b/engine/editor/doc/doc_tools.cpp
@@ -37,16 +37,16 @@
 #include "core/io/compression.h"
 #include "core/io/dir_access.h"
 #include "core/io/resource_importer.h"
-#include "core/io/xml_parser.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/string/translation_server.h"
 #include "editor/export/editor_export_platform.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/property_list_helper.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
 
+// Used for a hack preserving Mono properties on non-Mono builds.
+#include "modules/modules_enabled.gen.h" // For mono.
+
 static String _get_indent(const String &p_text) {
 	String indent;
 	bool has_text = false;
@@ -409,16 +409,6 @@ static Variant get_documentation_default_value(const StringName &p_class_name, c
 	return default_value;
 }
 
-bool helpers_has_property(const String &p_class_name, const String &p_name) {
-	const Vector<PropertyListHelper *> helpers = PropertyListHelper::get_helpers_for_class(p_class_name);
-	for (const PropertyListHelper *helper : helpers) {
-		if (helper->documentation_has_property(p_name)) {
-			return true;
-		}
-	}
-	return false;
-}
-
 void DocTools::generate(BitField<GenerateFlags> p_flags) {
 	// This may involve instantiating classes that are only usable from the main thread
 	// (which is in fact the case of the core API).
@@ -446,37 +436,19 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 				continue;
 			}
 
+			const String &cname = name;
 			// Property setters and getters do not get exposed as individual methods.
 			HashSet<StringName> setters_getters;
 
-			class_list[name] = DocData::ClassDoc();
-			DocData::ClassDoc &c = class_list[name];
-			c.name = name;
+			class_list[cname] = DocData::ClassDoc();
+			DocData::ClassDoc &c = class_list[cname];
+			c.name = cname;
 			c.inherits = ClassDB::get_parent_class(name);
 
-			inheriting[c.inherits].insert(name);
-
-			switch (ClassDB::get_api_type(name)) {
-				case ClassDB::API_CORE:
-					c.api_type = "core";
-					break;
-				case ClassDB::API_EDITOR:
-					c.api_type = "editor";
-					break;
-				case ClassDB::API_EXTENSION:
-					c.api_type = "extension";
-					break;
-				case ClassDB::API_EDITOR_EXTENSION:
-					c.api_type = "editor_extension";
-					break;
-				case ClassDB::API_NONE:
-					c.api_type = String();
-					break;
-			}
+			inheriting[c.inherits].insert(cname);
 
 			List<PropertyInfo> properties;
 			List<PropertyInfo> own_properties;
-			Vector<PropertyListHelper *> helpers = PropertyListHelper::get_helpers_for_class(name);
 
 			// Special cases for editor/project settings, and ResourceImporter classes,
 			// we have to rely on Object's property list to get settings and import options.
@@ -521,11 +493,6 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 				properties_from_instance = false;
 				ClassDB::get_property_list(name, &properties);
 				ClassDB::get_property_list(name, &own_properties, true);
-
-				for (const PropertyListHelper *helper : helpers) {
-					helper->documentation_get_property_list(&properties);
-					helper->documentation_get_property_list(&own_properties);
-				}
 			}
 
 			// Sort is still needed here to handle inherited properties, even though it is done below, do not remove.
@@ -541,7 +508,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 				}
 
 				if (properties_from_instance) {
-					if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "resource_scene_unique_id") {
+					if (E.name == "resource_local_to_scene" || E.name == "resource_name" || E.name == "resource_path" || E.name == "script" || E.name == "resource_scene_unique_id") {
 						// Don't include spurious properties from Object property list.
 						continue;
 					}
@@ -551,22 +518,14 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 					continue;
 				}
 
-				bool from_helper = E.name.contains("{index}");
-
 				DocData::PropertyDoc prop;
 				prop.name = E.name;
 				prop.overridden = inherited;
 
 				if (inherited) {
 					String parent = ClassDB::get_parent_class(c.name);
-					if (from_helper) {
-						while (!helpers_has_property(parent, prop.name)) {
-							parent = ClassDB::get_parent_class(parent);
-						}
-					} else {
-						while (!ClassDB::has_property(parent, prop.name, true)) {
-							parent = ClassDB::get_parent_class(parent);
-						}
+					while (!ClassDB::has_property(parent, prop.name, true)) {
+						parent = ClassDB::get_parent_class(parent);
 					}
 					prop.overrides = parent;
 				}
@@ -591,22 +550,12 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 					default_value = import_options_default[E.name];
 					default_value_valid = true;
 				} else {
-					if (from_helper) {
-						for (const PropertyListHelper *helper : helpers) {
-							if (helper->documentation_has_property(E.name)) {
-								default_value = helper->documentation_get_default_value(E.name);
-								default_value_valid = true;
-								break;
-							}
-						}
-					} else {
-						default_value = get_documentation_default_value(name, E.name, default_value_valid);
-						if (inherited) {
-							bool base_default_value_valid = false;
-							Variant base_default_value = get_documentation_default_value(ClassDB::get_parent_class(name), E.name, base_default_value_valid);
-							if (!default_value_valid || !base_default_value_valid || default_value == base_default_value) {
-								continue;
-							}
+					default_value = get_documentation_default_value(name, E.name, default_value_valid);
+					if (inherited) {
+						bool base_default_value_valid = false;
+						Variant base_default_value = get_documentation_default_value(ClassDB::get_parent_class(name), E.name, base_default_value_valid);
+						if (!default_value_valid || !base_default_value_valid || default_value == base_default_value) {
+							continue;
 						}
 					}
 				}
@@ -747,7 +696,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 			// Theme items.
 			{
 				List<ThemeDB::ThemeItemBind> theme_items;
-				ThemeDB::get_singleton()->get_class_items(name, &theme_items);
+				ThemeDB::get_singleton()->get_class_items(cname, &theme_items);
 				Ref<Theme> default_theme = ThemeDB::get_singleton()->get_default_theme();
 
 				for (const ThemeDB::ThemeItemBind &theme_item : theme_items) {
@@ -784,7 +733,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 					}
 
 					if (theme_item.data_type == Theme::DATA_TYPE_COLOR || theme_item.data_type == Theme::DATA_TYPE_CONSTANT) {
-						tid.default_value = DocData::get_default_value_string(default_theme->get_theme_item(theme_item.data_type, theme_item.item_name, name));
+						tid.default_value = DocData::get_default_value_string(default_theme->get_theme_item(theme_item.data_type, theme_item.item_name, cname));
 					}
 
 					c.theme_properties.push_back(tid);
@@ -1039,7 +988,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 			}
 			pd.name = s.name;
 			pd.type = s.ptr->get_class();
-			while (!ClassDB::is_class_exposed(pd.type)) {
+			while (String(ClassDB::get_parent_class(pd.type)) != "Object") {
 				pd.type = ClassDB::get_parent_class(pd.type);
 			}
 			c.properties.push_back(pd);
@@ -1352,7 +1301,7 @@ Error DocTools::_load(Ref<XMLParser> parser) {
 		ERR_FAIL_COND_V(parser->get_node_name() != "class", ERR_FILE_CORRUPT);
 
 		ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT);
-		const String name = parser->get_named_attribute_value("name");
+		String name = parser->get_named_attribute_value("name");
 		class_list[name] = DocData::ClassDoc();
 		DocData::ClassDoc &c = class_list[name];
 
@@ -1363,10 +1312,6 @@ Error DocTools::_load(Ref<XMLParser> parser) {
 
 		inheriting[c.inherits].insert(name);
 
-		if (parser->has_attribute("api_type")) {
-			c.api_type = parser->get_named_attribute_value("api_type");
-		}
-
 #ifndef DISABLE_DEPRECATED
 		if (parser->has_attribute("is_deprecated")) {
 			c.is_deprecated = parser->get_named_attribute_value("is_deprecated").to_lower() == "true";
@@ -1706,15 +1651,12 @@ Error DocTools::save_classes(const String &p_default_path, const HashMap<String,
 		String header = "<class name=\"" + c.name.xml_escape(true) + "\"";
 		if (!c.inherits.is_empty()) {
 			header += " inherits=\"" + c.inherits.xml_escape(true) + "\"";
-		}
-		if (!c.api_type.is_empty()) {
-			header += " api_type=\"" + c.api_type.xml_escape(true) + "\"";
-		}
-		if (c.is_deprecated) {
-			header += " deprecated=\"" + c.deprecated_message.xml_escape(true) + "\"";
-		}
-		if (c.is_experimental) {
-			header += " experimental=\"" + c.experimental_message.xml_escape(true) + "\"";
+			if (c.is_deprecated) {
+				header += " deprecated=\"" + c.deprecated_message.xml_escape(true) + "\"";
+			}
+			if (c.is_experimental) {
+				header += " experimental=\"" + c.experimental_message.xml_escape(true) + "\"";
+			}
 		}
 		if (!c.keywords.is_empty()) {
 			header += String(" keywords=\"") + c.keywords.xml_escape(true) + "\"";
diff --git a/engine/editor/doc/doc_tools.h b/engine/editor/doc/doc_tools.h
index f11133c6..b66ce59c 100644
--- a/engine/editor/doc/doc_tools.h
+++ b/engine/editor/doc/doc_tools.h
@@ -33,8 +33,6 @@
 #include "core/doc_data.h"
 #include "core/templates/rb_set.h"
 
-class XMLParser;
-
 class DocTools {
 public:
 	String version;
diff --git a/engine/editor/doc/editor_help.cpp b/engine/editor/doc/editor_help.cpp
index 09a65ece..b20e9cce 100644
--- a/engine/editor/doc/editor_help.cpp
+++ b/engine/editor/doc/editor_help.cpp
@@ -30,19 +30,13 @@
 
 #include "editor_help.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/extension/gdextension.h"
 #include "core/input/input.h"
 #include "core/io/json.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "core/version.h"
 #include "editor/doc/doc_data_compressed.gen.h"
@@ -55,11 +49,9 @@
 #include "editor/gui/editor_toaster.h"
 #include "editor/inspector/editor_property_name_processor.h"
 #include "editor/script/script_editor_plugin.h"
-#include "editor/script/syntax_highlighters.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/line_edit.h"
-#include "servers/display/display_server.h"
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.
 
@@ -74,8 +66,6 @@
 #include "modules/mono/csharp_script.h"
 #endif
 
-#include "modules/regex/regex.h"
-
 #define CONTRIBUTE_URL "https://contributing.godotengine.org/en/latest/documentation/class_reference.html"
 
 #ifdef MODULE_MONO_ENABLED
@@ -112,6 +102,11 @@ const Vector<String> classes_with_csharp_differences = {
 };
 #endif
 
+static const char32_t nbsp_chr = 160;
+static const String nbsp = String::chr(nbsp_chr);
+static const String nbsp_equal_nbsp = nbsp + "=" + nbsp;
+static const String colon_nbsp = ":" + nbsp;
+
 const Vector<String> packed_array_types = {
 	"PackedByteArray",
 	"PackedColorArray",
@@ -125,22 +120,8 @@ const Vector<String> packed_array_types = {
 	"PackedVector4Array",
 };
 
-static const char32_t nbsp_chr = 160;
-static const String nbsp = String::chr(nbsp_chr);
-static const String nbsp_equal_nbsp = nbsp + "=" + nbsp;
-static const String colon_nbsp = ":" + nbsp;
-
-static const char32_t wj_chr = 8288;
-static const String cr_wj = "\r" + String::chr(wj_chr);
-
-static String _fix_newlines(const String &p_string) {
-	// `\n` starts a new paragraph, `\r` just adds a break to existing one.
-	// Add a non-printable character "WORD JOINER" so that multi-breaks work correctly (`RichTextLabel` bug?).
-	return p_string.replace("\n", cr_wj);
-}
-
-static String _fix_selection(const String &p_string) {
-	return p_string.replace_char(nbsp_chr, ' ').remove_char(wj_chr);
+static String _replace_nbsp_with_space(const String &p_string) {
+	return p_string.replace_char(nbsp_chr, ' ');
 }
 
 static String _fix_constant(const String &p_constant) {
@@ -228,8 +209,6 @@ void EditorHelp::_update_theme_item_cache() {
 	theme_cache.qualifier_color = get_theme_color(SNAME("qualifier_color"), SNAME("EditorHelp"));
 	theme_cache.type_color = get_theme_color(SNAME("type_color"), SNAME("EditorHelp"));
 	theme_cache.override_color = get_theme_color(SNAME("override_color"), SNAME("EditorHelp"));
-	theme_cache.primary_hr_color = get_theme_color(SNAME("primary_hr_color"), SNAME("EditorHelp"));
-	theme_cache.secondary_hr_color = get_theme_color(SNAME("secondary_hr_color"), SNAME("EditorHelp"));
 
 	theme_cache.doc_font = get_theme_font(SNAME("doc"), EditorStringName(EditorFonts));
 	theme_cache.doc_bold_font = get_theme_font(SNAME("doc_bold"), EditorStringName(EditorFonts));
@@ -246,17 +225,14 @@ void EditorHelp::_update_theme_item_cache() {
 	theme_cache.background_style = get_theme_stylebox(SNAME("background"), SNAME("EditorHelp"));
 
 	class_desc->begin_bulk_theme_override();
-
 	class_desc->add_theme_font_override("normal_font", theme_cache.doc_font);
 	class_desc->add_theme_font_size_override("normal_font_size", theme_cache.doc_font_size);
 
 	class_desc->add_theme_constant_override(SceneStringName(line_separation), get_theme_constant(SceneStringName(line_separation), SNAME("EditorHelp")));
-	class_desc->add_theme_constant_override(SceneStringName(paragraph_separation), get_theme_constant(SceneStringName(paragraph_separation), SNAME("EditorHelp")));
 	class_desc->add_theme_constant_override("table_h_separation", get_theme_constant(SNAME("table_h_separation"), SNAME("EditorHelp")));
 	class_desc->add_theme_constant_override("table_v_separation", get_theme_constant(SNAME("table_v_separation"), SNAME("EditorHelp")));
 	class_desc->add_theme_constant_override("text_highlight_h_padding", get_theme_constant(SNAME("text_highlight_h_padding"), SNAME("EditorHelp")));
 	class_desc->add_theme_constant_override("text_highlight_v_padding", get_theme_constant(SNAME("text_highlight_v_padding"), SNAME("EditorHelp")));
-
 	class_desc->end_bulk_theme_override();
 }
 
@@ -512,56 +488,56 @@ void EditorHelp::_add_type_icon(const String &p_type, int p_size, const String &
 
 // Macros for assigning the deprecated/experimental marks to class members in overview.
 
-#define DEPRECATED_DOC_TAG \
-	class_desc->push_font(theme_cache.doc_bold_font); \
+#define DEPRECATED_DOC_TAG                                                                   \
+	class_desc->push_font(theme_cache.doc_bold_font);                                        \
 	class_desc->push_color(get_theme_color(SNAME("error_color"), EditorStringName(Editor))); \
-	Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError")); \
-	class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height()); \
-	class_desc->add_text(String::chr(160) + TTR("Deprecated")); \
-	class_desc->pop(); \
+	Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError"));                 \
+	class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height());    \
+	class_desc->add_text(String::chr(160) + TTR("Deprecated"));                              \
+	class_desc->pop();                                                                       \
 	class_desc->pop();
 
-#define EXPERIMENTAL_DOC_TAG \
-	class_desc->push_font(theme_cache.doc_bold_font); \
-	class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor))); \
-	Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning")); \
+#define EXPERIMENTAL_DOC_TAG                                                                    \
+	class_desc->push_font(theme_cache.doc_bold_font);                                           \
+	class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));  \
+	Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning"));                  \
 	class_desc->add_image(warning_icon, warning_icon->get_width(), warning_icon->get_height()); \
-	class_desc->add_text(String::chr(160) + TTR("Experimental")); \
-	class_desc->pop(); \
+	class_desc->add_text(String::chr(160) + TTR("Experimental"));                               \
+	class_desc->pop();                                                                          \
 	class_desc->pop();
 
 // Macros for displaying the deprecated/experimental info in class member descriptions.
 
-#define DEPRECATED_DOC_MSG(m_message, m_default_message) \
-	Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError")); \
-	class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height()); \
-	class_desc->add_text(nbsp); \
+#define DEPRECATED_DOC_MSG(m_message, m_default_message)                                     \
+	Ref<Texture2D> error_icon = get_editor_theme_icon(SNAME("StatusError"));                 \
+	class_desc->add_image(error_icon, error_icon->get_width(), error_icon->get_height());    \
+	class_desc->add_text(nbsp);                                                              \
 	class_desc->push_color(get_theme_color(SNAME("error_color"), EditorStringName(Editor))); \
-	class_desc->push_font(theme_cache.doc_bold_font); \
-	class_desc->add_text(TTR("Deprecated:")); \
-	class_desc->pop(); \
-	class_desc->pop(); \
-	class_desc->add_text(" "); \
-	if ((m_message).is_empty()) { \
-		class_desc->add_text(m_default_message); \
-	} else { \
-		_add_text(m_message); \
+	class_desc->push_font(theme_cache.doc_bold_font);                                        \
+	class_desc->add_text(TTR("Deprecated:"));                                                \
+	class_desc->pop();                                                                       \
+	class_desc->pop();                                                                       \
+	class_desc->add_text(" ");                                                               \
+	if ((m_message).is_empty()) {                                                            \
+		class_desc->add_text(m_default_message);                                             \
+	} else {                                                                                 \
+		_add_text(m_message);                                                                \
 	}
 
-#define EXPERIMENTAL_DOC_MSG(m_message, m_default_message) \
-	Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning")); \
+#define EXPERIMENTAL_DOC_MSG(m_message, m_default_message)                                      \
+	Ref<Texture2D> warning_icon = get_editor_theme_icon(SNAME("NodeWarning"));                  \
 	class_desc->add_image(warning_icon, warning_icon->get_width(), warning_icon->get_height()); \
-	class_desc->add_text(nbsp); \
-	class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor))); \
-	class_desc->push_font(theme_cache.doc_bold_font); \
-	class_desc->add_text(TTR("Experimental:")); \
-	class_desc->pop(); \
-	class_desc->pop(); \
-	class_desc->add_text(" "); \
-	if ((m_message).is_empty()) { \
-		class_desc->add_text(m_default_message); \
-	} else { \
-		_add_text(m_message); \
+	class_desc->add_text(nbsp);                                                                 \
+	class_desc->push_color(get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));  \
+	class_desc->push_font(theme_cache.doc_bold_font);                                           \
+	class_desc->add_text(TTR("Experimental:"));                                                 \
+	class_desc->pop();                                                                          \
+	class_desc->pop();                                                                          \
+	class_desc->add_text(" ");                                                                  \
+	if ((m_message).is_empty()) {                                                               \
+		class_desc->add_text(m_default_message);                                                \
+	} else {                                                                                    \
+		_add_text(m_message);                                                                   \
 	}
 
 void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview, bool p_override) {
@@ -762,8 +738,10 @@ void EditorHelp::_update_method_list(MethodType p_method_type, const Vector<DocD
 	class_desc->add_text(title);
 	_pop_title_font();
 
+	class_desc->add_newline();
 	class_desc->add_newline();
 
+	class_desc->push_indent(1);
 	_push_code_font();
 	class_desc->push_table(2);
 	class_desc->set_table_column_expand(1, true);
@@ -815,13 +793,14 @@ void EditorHelp::_update_method_list(MethodType p_method_type, const Vector<DocD
 
 	class_desc->pop(); // table
 	_pop_code_font();
+	class_desc->pop(); // indent
 }
 
 void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc, MethodType p_method_type, const Vector<DocData::MethodDoc> &p_methods) {
 #define HANDLE_DOC(m_string) ((p_classdoc.is_script_doc ? (m_string) : DTR(m_string)).strip_edges())
 
 	class_desc->add_newline();
-	class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
+	class_desc->add_newline();
 	class_desc->add_newline();
 
 	static const char *titles_by_type[METHOD_TYPE_MAX] = {
@@ -838,33 +817,29 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc
 
 	String link_color_text = theme_cache.title_color.to_html(false);
 
-	bool is_first_method = true;
 	for (int pass = 0; pass < 2; pass++) {
-		Vector<const DocData::MethodDoc *> methods_filtered;
+		Vector<DocData::MethodDoc> methods_filtered;
 
-		for (const DocData::MethodDoc &method : p_methods) {
-			const String &q = method.qualifiers;
+		for (int i = 0; i < p_methods.size(); i++) {
+			const String &q = p_methods[i].qualifiers;
 			if ((pass == 0 && q.contains("virtual")) || (pass == 1 && !q.contains("virtual"))) {
-				methods_filtered.push_back(&method);
+				methods_filtered.push_back(p_methods[i]);
 			}
 		}
 
 		for (int i = 0; i < methods_filtered.size(); i++) {
-			const DocData::MethodDoc &method = *methods_filtered[i];
+			const DocData::MethodDoc &method = methods_filtered[i];
 
 			class_desc->add_newline();
-			if (is_first_method) {
-				is_first_method = false;
-			} else {
-				class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
-				class_desc->add_newline();
-			}
+			class_desc->add_newline();
+			class_desc->add_newline();
 
 			_push_code_font();
 			// For constructors always point to the first one.
 			_add_method(method, false, (p_method_type != METHOD_TYPE_CONSTRUCTOR || i == 0));
 			_pop_code_font();
 
+			class_desc->add_newline();
 			class_desc->add_newline();
 
 			class_desc->push_indent(1);
@@ -887,6 +862,7 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc
 			if (method.is_experimental) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 
@@ -901,6 +877,7 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc
 			if (!method.errors_returned.is_empty()) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 
@@ -933,6 +910,7 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc
 			if (!descr.is_empty()) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 
@@ -940,6 +918,7 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc &p_classdoc
 			} else if (!is_documented) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 
@@ -1053,7 +1032,7 @@ void EditorHelp::_update_doc() {
 
 		_push_normal_font();
 		class_desc->push_color(theme_cache.title_color);
-		class_desc->add_text(TTR("Inherited By:") + " ");
+		class_desc->add_text(TTR("Inherited by:") + " ");
 
 		for (RBSet<String, NaturalNoCaseComparator>::Element *itr = doc->inheriting[cd.name].front(); itr; itr = itr->next()) {
 			if (itr->prev()) {
@@ -1069,45 +1048,60 @@ void EditorHelp::_update_doc() {
 		_pop_normal_font();
 	}
 
-	// Class description
-	class_desc->add_newline();
-	class_desc->add_newline();
-
-	section_line.push_back(Pair<String, int>(TTR("Description"), class_desc->get_paragraph_count() - 2));
-	description_line = class_desc->get_paragraph_count() - 2;
-	_push_title_font();
-	class_desc->add_text(TTR("Description"));
-	_pop_title_font();
+	bool has_description = false;
 
+	// Brief description
 	const String brief_class_descr = HANDLE_DOC(cd.brief_description);
-	const String class_descr = HANDLE_DOC(cd.description);
-	if (!brief_class_descr.is_empty() || !class_descr.is_empty()) {
-		if (!brief_class_descr.is_empty()) {
-			class_desc->add_newline();
+	if (!brief_class_descr.is_empty()) {
+		has_description = true;
 
-			class_desc->push_font(theme_cache.doc_bold_font);
-			class_desc->push_color(theme_cache.text_color);
-
-			_add_text(brief_class_descr);
-
-			class_desc->pop(); // color
-			class_desc->pop(); // font
-		}
-
-		if (!class_descr.is_empty()) {
-			class_desc->add_newline();
-
-			_push_normal_font();
-			class_desc->push_color(theme_cache.text_color);
-
-			_add_text(class_descr);
-
-			class_desc->pop(); // color
-			_pop_normal_font();
-		}
-	} else {
+		class_desc->add_newline();
 		class_desc->add_newline();
 
+		class_desc->push_indent(1);
+		class_desc->push_font(theme_cache.doc_bold_font);
+		class_desc->push_color(theme_cache.text_color);
+
+		_add_text(brief_class_descr);
+
+		class_desc->pop(); // color
+		class_desc->pop(); // font
+		class_desc->pop(); // indent
+	}
+
+	// Class description
+	const String class_descr = HANDLE_DOC(cd.description);
+	if (!class_descr.is_empty()) {
+		has_description = true;
+
+		class_desc->add_newline();
+		class_desc->add_newline();
+
+		section_line.push_back(Pair<String, int>(TTR("Description"), class_desc->get_paragraph_count() - 2));
+		description_line = class_desc->get_paragraph_count() - 2;
+		_push_title_font();
+		class_desc->add_text(TTR("Description"));
+		_pop_title_font();
+
+		class_desc->add_newline();
+		class_desc->add_newline();
+
+		class_desc->push_indent(1);
+		_push_normal_font();
+		class_desc->push_color(theme_cache.text_color);
+
+		_add_text(class_descr);
+
+		class_desc->pop(); // color
+		_pop_normal_font();
+		class_desc->pop(); // indent
+	}
+
+	if (!has_description) {
+		class_desc->add_newline();
+		class_desc->add_newline();
+
+		class_desc->push_indent(1);
 		_push_normal_font();
 
 		class_desc->add_image(get_editor_theme_icon(SNAME("Error")));
@@ -1122,14 +1116,17 @@ void EditorHelp::_update_doc() {
 		class_desc->pop(); // color
 
 		_pop_normal_font();
+		class_desc->pop(); // indent
 	}
 
 #ifdef MODULE_MONO_ENABLED
 	if (classes_with_csharp_differences.has(cd.name)) {
 		class_desc->add_newline();
+		class_desc->add_newline();
 
 		const String &csharp_differences_url = vformat("%s/tutorials/scripting/c_sharp/c_sharp_differences.html", GODOT_VERSION_DOCS_URL);
 
+		class_desc->push_indent(1);
 		_push_normal_font();
 		class_desc->push_color(theme_cache.text_color);
 
@@ -1137,6 +1134,7 @@ void EditorHelp::_update_doc() {
 
 		class_desc->pop(); // color
 		_pop_normal_font();
+		class_desc->pop(); // indent
 	}
 #endif
 
@@ -1145,8 +1143,6 @@ void EditorHelp::_update_doc() {
 		class_desc->add_newline();
 		class_desc->add_newline();
 
-		section_line.push_back(Pair<String, int>(TTR("Online Tutorials"), class_desc->get_paragraph_count() - 2));
-		description_line = class_desc->get_paragraph_count() - 2;
 		_push_title_font();
 		class_desc->add_text(TTR("Online Tutorials"));
 		_pop_title_font();
@@ -1157,7 +1153,6 @@ void EditorHelp::_update_doc() {
 		_push_code_font();
 		class_desc->push_color(theme_cache.symbol_color);
 
-		bool is_first_tutorial = true;
 		for (const DocData::TutorialDoc &tutorial : cd.tutorials) {
 			const String link = HANDLE_DOC(tutorial.link);
 
@@ -1171,13 +1166,7 @@ void EditorHelp::_update_doc() {
 				}
 			}
 
-			if (is_first_tutorial) {
-				is_first_tutorial = false;
-			} else {
-				// `\n` starts a new paragraph, `\r` just adds a break to existing one.
-				class_desc->add_text("\r");
-			}
-
+			class_desc->add_newline();
 			_add_bulletpoint();
 			class_desc->append_text("[url=" + link + "]" + link_text + "[/url]");
 		}
@@ -1213,8 +1202,10 @@ void EditorHelp::_update_doc() {
 		class_desc->add_text(TTR("Properties"));
 		_pop_title_font();
 
+		class_desc->add_newline();
 		class_desc->add_newline();
 
+		class_desc->push_indent(1);
 		_push_code_font();
 		class_desc->push_table(4);
 		class_desc->set_table_column_expand(1, true);
@@ -1374,6 +1365,7 @@ void EditorHelp::_update_doc() {
 
 		class_desc->pop(); // table
 		_pop_code_font();
+		class_desc->pop(); // indent
 	}
 
 	// Methods overview
@@ -1419,7 +1411,6 @@ void EditorHelp::_update_doc() {
 	// Theme properties
 	if (!cd.theme_properties.is_empty()) {
 		class_desc->add_newline();
-		class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
 		class_desc->add_newline();
 
 		section_line.push_back(Pair<String, int>(TTR("Theme Properties"), class_desc->get_paragraph_count() - 2));
@@ -1440,6 +1431,7 @@ void EditorHelp::_update_doc() {
 			if (theme_data_type != theme_item.data_type) {
 				theme_data_type = theme_item.data_type;
 
+				class_desc->add_newline();
 				class_desc->add_newline();
 
 				class_desc->push_indent(1);
@@ -1455,6 +1447,7 @@ void EditorHelp::_update_doc() {
 				class_desc->pop(); // indent
 			}
 
+			class_desc->add_newline();
 			class_desc->add_newline();
 
 			theme_property_line[theme_item.name] = class_desc->get_paragraph_count() - 2; // Gets overridden if description.
@@ -1506,6 +1499,7 @@ void EditorHelp::_update_doc() {
 			if (theme_item.is_experimental) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 				EXPERIMENTAL_DOC_MSG(HANDLE_DOC(theme_item.experimental_message), TTR("This theme property may be changed or removed in future versions."));
@@ -1515,6 +1509,7 @@ void EditorHelp::_update_doc() {
 			if (!descr.is_empty()) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 				_add_text(descr);
@@ -1545,7 +1540,7 @@ void EditorHelp::_update_doc() {
 		}
 
 		bool header_added = false;
-		bool is_first_signal = true;
+
 		for (const DocData::MethodDoc &signal : cd.signals) {
 			// Ignore undocumented private.
 			const bool is_documented = signal.is_deprecated || signal.is_experimental || !signal.description.strip_edges().is_empty();
@@ -1557,7 +1552,6 @@ void EditorHelp::_update_doc() {
 				header_added = true;
 
 				class_desc->add_newline();
-				class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
 				class_desc->add_newline();
 
 				section_line.push_back(Pair<String, int>(TTR("Signals"), class_desc->get_paragraph_count() - 2));
@@ -1567,15 +1561,12 @@ void EditorHelp::_update_doc() {
 			}
 
 			class_desc->add_newline();
-			if (is_first_signal) {
-				is_first_signal = false;
-			} else {
-				class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
-				class_desc->add_newline();
-			}
+			class_desc->add_newline();
 
 			signal_line[signal.name] = class_desc->get_paragraph_count() - 2; // Gets overridden if description.
 
+			class_desc->push_indent(1);
+
 			// Signal header.
 			_push_code_font();
 			_add_bulletpoint();
@@ -1633,6 +1624,7 @@ void EditorHelp::_update_doc() {
 			class_desc->push_color(theme_cache.comment_color);
 
 			const String descr = HANDLE_DOC(signal.description);
+			const bool is_multiline = descr.find_char('\n') > 0;
 			bool has_prev_text = false;
 
 			if (signal.is_deprecated) {
@@ -1643,6 +1635,9 @@ void EditorHelp::_update_doc() {
 			if (signal.is_experimental) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					if (is_multiline) {
+						class_desc->add_newline();
+					}
 				}
 				has_prev_text = true;
 				EXPERIMENTAL_DOC_MSG(HANDLE_DOC(signal.experimental_message), TTR("This signal may be changed or removed in future versions."));
@@ -1651,6 +1646,9 @@ void EditorHelp::_update_doc() {
 			if (!descr.is_empty()) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					if (is_multiline) {
+						class_desc->add_newline();
+					}
 				}
 				has_prev_text = true;
 				_add_text(descr);
@@ -1669,6 +1667,8 @@ void EditorHelp::_update_doc() {
 			class_desc->pop(); // color
 			_pop_normal_font();
 			class_desc->pop(); // indent
+
+			class_desc->pop(); // indent
 		}
 	}
 
@@ -1708,7 +1708,6 @@ void EditorHelp::_update_doc() {
 		}
 		if (has_enums) {
 			class_desc->add_newline();
-			class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
 			class_desc->add_newline();
 
 			section_line.push_back(Pair<String, int>(TTR("Enumerations"), class_desc->get_paragraph_count() - 2));
@@ -1716,7 +1715,6 @@ void EditorHelp::_update_doc() {
 			class_desc->add_text(TTR("Enumerations"));
 			_pop_title_font();
 
-			bool is_first_enum = true;
 			for (KeyValue<String, Vector<DocData::ConstantDoc>> &E : enums) {
 				String key = E.key;
 				if ((key.get_slice_count(".") > 1) && (key.get_slicec('.', 0) == edited_class)) {
@@ -1730,12 +1728,7 @@ void EditorHelp::_update_doc() {
 				}
 
 				class_desc->add_newline();
-				if (is_first_enum) {
-					is_first_enum = false;
-				} else {
-					class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
-					class_desc->add_newline();
-				}
+				class_desc->add_newline();
 
 				// Enum header.
 				_push_code_font();
@@ -1762,6 +1755,7 @@ void EditorHelp::_update_doc() {
 				// Enum description.
 				if (key != "@unnamed_enums" && cd.enums.has(key)) {
 					const String descr = HANDLE_DOC(cd.enums[key].description);
+					const bool is_multiline = descr.find_char('\n') > 0;
 					if (cd.enums[key].is_deprecated || cd.enums[key].is_experimental || !descr.is_empty()) {
 						class_desc->add_newline();
 
@@ -1779,6 +1773,9 @@ void EditorHelp::_update_doc() {
 						if (cd.enums[key].is_experimental) {
 							if (has_prev_text) {
 								class_desc->add_newline();
+								if (is_multiline) {
+									class_desc->add_newline();
+								}
 							}
 							has_prev_text = true;
 							EXPERIMENTAL_DOC_MSG(HANDLE_DOC(cd.enums[key].experimental_message), TTR("This enumeration may be changed or removed in future versions."));
@@ -1787,6 +1784,9 @@ void EditorHelp::_update_doc() {
 						if (!descr.is_empty()) {
 							if (has_prev_text) {
 								class_desc->add_newline();
+								if (is_multiline) {
+									class_desc->add_newline();
+								}
 							}
 							has_prev_text = true;
 							_add_text(descr);
@@ -1801,10 +1801,16 @@ void EditorHelp::_update_doc() {
 				HashMap<String, int> enum_values;
 				const int enum_start_line = enum_line[E.key];
 
+				bool prev_is_multiline = true; // Use a large margin for the first item.
 				for (const DocData::ConstantDoc &enum_value : E.value) {
 					const String descr = HANDLE_DOC(enum_value.description);
+					const bool is_multiline = descr.find_char('\n') > 0;
 
 					class_desc->add_newline();
+					if (prev_is_multiline || is_multiline) {
+						class_desc->add_newline();
+					}
+					prev_is_multiline = is_multiline;
 
 					if (cd.name == "@GlobalScope") {
 						enum_values[enum_value.name] = enum_start_line;
@@ -1851,6 +1857,9 @@ void EditorHelp::_update_doc() {
 						if (enum_value.is_experimental) {
 							if (has_prev_text) {
 								class_desc->add_newline();
+								if (is_multiline) {
+									class_desc->add_newline();
+								}
 							}
 							has_prev_text = true;
 							EXPERIMENTAL_DOC_MSG(HANDLE_DOC(enum_value.experimental_message), TTR("This constant may be changed or removed in future versions."));
@@ -1859,6 +1868,9 @@ void EditorHelp::_update_doc() {
 						if (!descr.is_empty()) {
 							if (has_prev_text) {
 								class_desc->add_newline();
+								if (is_multiline) {
+									class_desc->add_newline();
+								}
 							}
 							has_prev_text = true;
 							_add_text(descr);
@@ -1881,7 +1893,6 @@ void EditorHelp::_update_doc() {
 		// Constants
 		if (!constants.is_empty()) {
 			class_desc->add_newline();
-			class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
 			class_desc->add_newline();
 
 			section_line.push_back(Pair<String, int>(TTR("Constants"), class_desc->get_paragraph_count() - 2));
@@ -1889,20 +1900,21 @@ void EditorHelp::_update_doc() {
 			class_desc->add_text(TTR("Constants"));
 			_pop_title_font();
 
-			bool is_first_constant = true;
+			bool prev_is_multiline = true; // Use a large margin for the first item.
 			for (const DocData::ConstantDoc &constant : constants) {
 				const String descr = HANDLE_DOC(constant.description);
+				const bool is_multiline = descr.find_char('\n') > 0;
 
 				class_desc->add_newline();
-				if (is_first_constant) {
-					is_first_constant = false;
-				} else {
-					class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
+				if (prev_is_multiline || is_multiline) {
 					class_desc->add_newline();
 				}
+				prev_is_multiline = is_multiline;
 
 				constant_line[constant.name] = class_desc->get_paragraph_count() - 2;
 
+				class_desc->push_indent(1);
+
 				// Constant header.
 				_push_code_font();
 
@@ -1950,6 +1962,9 @@ void EditorHelp::_update_doc() {
 					if (constant.is_experimental) {
 						if (has_prev_text) {
 							class_desc->add_newline();
+							if (is_multiline) {
+								class_desc->add_newline();
+							}
 						}
 						has_prev_text = true;
 						EXPERIMENTAL_DOC_MSG(HANDLE_DOC(constant.experimental_message), TTR("This constant may be changed or removed in future versions."));
@@ -1958,6 +1973,9 @@ void EditorHelp::_update_doc() {
 					if (!descr.is_empty()) {
 						if (has_prev_text) {
 							class_desc->add_newline();
+							if (is_multiline) {
+								class_desc->add_newline();
+							}
 						}
 						has_prev_text = true;
 						_add_text(descr);
@@ -1967,6 +1985,8 @@ void EditorHelp::_update_doc() {
 					_pop_normal_font();
 					class_desc->pop(); // indent
 				}
+
+				class_desc->pop(); // indent
 			}
 		}
 	}
@@ -1978,7 +1998,6 @@ void EditorHelp::_update_doc() {
 		}
 
 		class_desc->add_newline();
-		class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
 		class_desc->add_newline();
 
 		section_line.push_back(Pair<String, int>(TTR("Annotations"), class_desc->get_paragraph_count() - 2));
@@ -1986,18 +2005,14 @@ void EditorHelp::_update_doc() {
 		class_desc->add_text(TTR("Annotations"));
 		_pop_title_font();
 
-		bool is_first_annotation = true;
 		for (const DocData::MethodDoc &annotation : cd.annotations) {
 			class_desc->add_newline();
-			if (is_first_annotation) {
-				is_first_annotation = false;
-			} else {
-				class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
-				class_desc->add_newline();
-			}
+			class_desc->add_newline();
 
 			annotation_line[annotation.name] = class_desc->get_paragraph_count() - 2; // Gets overridden if description.
 
+			class_desc->push_indent(1);
+
 			// Annotation header.
 			_push_code_font();
 			_add_bulletpoint();
@@ -2107,13 +2122,15 @@ void EditorHelp::_update_doc() {
 			class_desc->pop(); // color
 			_pop_normal_font();
 			class_desc->pop(); // indent
+
+			class_desc->pop(); // indent
 		}
 	}
 
 	// Property descriptions
 	if (has_property_descriptions) {
 		class_desc->add_newline();
-		class_desc->add_hr(100, 2, theme_cache.primary_hr_color);
+		class_desc->add_newline();
 		class_desc->add_newline();
 
 		section_line.push_back(Pair<String, int>(TTR("Property Descriptions"), class_desc->get_paragraph_count() - 2));
@@ -2121,7 +2138,6 @@ void EditorHelp::_update_doc() {
 		class_desc->add_text(TTR("Property Descriptions"));
 		_pop_title_font();
 
-		bool is_first_property = true;
 		for (const DocData::PropertyDoc &prop : cd.properties) {
 			if (prop.overridden) {
 				continue;
@@ -2133,12 +2149,8 @@ void EditorHelp::_update_doc() {
 			}
 
 			class_desc->add_newline();
-			if (is_first_property) {
-				is_first_property = false;
-			} else {
-				class_desc->add_hr(100, 1, theme_cache.secondary_hr_color);
-				class_desc->add_newline();
-			}
+			class_desc->add_newline();
+			class_desc->add_newline();
 
 			property_line[prop.name] = class_desc->get_paragraph_count() - 2;
 
@@ -2266,6 +2278,7 @@ void EditorHelp::_update_doc() {
 
 			class_desc->pop(); // table
 
+			class_desc->add_newline();
 			class_desc->add_newline();
 
 			class_desc->push_indent(1);
@@ -2282,6 +2295,7 @@ void EditorHelp::_update_doc() {
 			if (prop.is_experimental) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 				EXPERIMENTAL_DOC_MSG(HANDLE_DOC(prop.experimental_message), TTR("This property may be changed or removed in future versions."));
@@ -2291,6 +2305,7 @@ void EditorHelp::_update_doc() {
 			if (!descr.is_empty()) {
 				if (has_prev_text) {
 					class_desc->add_newline();
+					class_desc->add_newline();
 				}
 				has_prev_text = true;
 				_add_text(descr);
@@ -2308,6 +2323,7 @@ void EditorHelp::_update_doc() {
 
 			// Add copy note to built-in properties returning `Packed*Array`.
 			if (!cd.is_script_doc && packed_array_types.has(prop.type)) {
+				class_desc->add_newline();
 				class_desc->add_newline();
 				// See also `EditorHelpBit::parse_symbol()` and `doc/tools/make_rst.py`.
 				_add_text(vformat(TTR("[b]Note:[/b] The returned array is [i]copied[/i] and any changes to it will not update the original property value. See [%s] for more details."), prop.type));
@@ -2336,6 +2352,7 @@ void EditorHelp::_update_doc() {
 
 	// Allow the document to be scrolled slightly below the end.
 	class_desc->add_newline();
+	class_desc->add_newline();
 
 	// Free the scroll.
 	scroll_locked = false;
@@ -2527,7 +2544,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 	bbcode = bbcode.replace("[codeblocks]", "");
 	bbcode = bbcode.replace("[/codeblocks]", "");
 
-	// Remove `\n` here because it doesn't look nice.
+	// Remove `\n` here because `\n` is replaced by `\n\n` later.
 	// Will be compensated when parsing `[/codeblock]`.
 	bbcode = bbcode.replace("[/codeblock]\n", "[/codeblock]");
 
@@ -2542,7 +2559,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 		}
 
 		if (brk_pos > pos) {
-			p_rt->add_text(bbcode.substr(pos, brk_pos - pos));
+			p_rt->add_text(bbcode.substr(pos, brk_pos - pos).replace("\n", "\n\n"));
 		}
 
 		if (brk_pos == bbcode.length()) {
@@ -2552,7 +2569,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 		int brk_end = bbcode.find_char(']', brk_pos + 1);
 
 		if (brk_end == -1) {
-			p_rt->add_text(bbcode.substr(brk_pos));
+			p_rt->add_text(bbcode.substr(brk_pos).replace("\n", "\n\n"));
 			break;
 		}
 
@@ -2697,7 +2714,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 			p_rt->push_bgcolor(code_bg_color);
 			p_rt->push_color(code_color.lerp(p_owner_node->get_theme_color(SNAME("error_color"), EditorStringName(Editor)), 0.6));
 
-			p_rt->add_text(_fix_newlines(bbcode.substr(brk_end + 1, end_pos - (brk_end + 1))));
+			p_rt->add_text(bbcode.substr(brk_end + 1, end_pos - (brk_end + 1)));
 
 			p_rt->pop(); // color
 			p_rt->pop(); // bgcolor
@@ -2749,7 +2766,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 			p_rt->push_font(doc_code_font);
 			p_rt->push_font_size(doc_code_font_size);
 			p_rt->push_table(2);
-			p_rt->set_table_column_expand(0, true, 1, false);
 
 			p_rt->push_cell();
 			p_rt->set_cell_row_background_color(code_bg_color, Color(code_bg_color, 0.99));
@@ -2773,7 +2789,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 #endif
 
 			if (!codeblock_printed) {
-				p_rt->add_text(_fix_newlines(codeblock_text));
+				p_rt->add_text(codeblock_text);
 				codeblock_printed = true;
 			}
 
@@ -2798,12 +2814,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 
 			// Compensate for `\n` removed before the loop.
 			if (pos < bbcode.length()) {
-				if (bbcode.substr(pos, 10) == "[codeblock") {
-					// `\n` starts a new paragraph, `\r` just adds a break to existing one.
-					p_rt->add_text("\r");
-				} else {
-					p_rt->add_newline();
-				}
+				p_rt->add_newline();
 			}
 		} else if (tag == "kbd") {
 			int end_pos = bbcode.find("[/kbd]", brk_end + 1);
@@ -2817,7 +2828,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 			p_rt->push_bgcolor(kbd_bg_color);
 			p_rt->push_color(kbd_color);
 
-			p_rt->add_text(_fix_newlines(bbcode.substr(brk_end + 1, end_pos - (brk_end + 1))));
+			p_rt->add_text(bbcode.substr(brk_end + 1, end_pos - (brk_end + 1)));
 
 			p_rt->pop(); // color
 			p_rt->pop(); // bgcolor
@@ -2831,8 +2842,8 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag == "br") {
-			// `\n` starts a new paragraph, `\r` just adds a break to existing one.
-			p_rt->add_text("\r");
+			// Force a line break.
+			p_rt->add_newline();
 			pos = brk_end + 1;
 		} else if (tag == "u") {
 			// Use underline.
@@ -3438,9 +3449,7 @@ EditorHelp::EditorHelp() {
 
 	class_desc = memnew(RichTextLabel);
 	class_desc->set_tab_size(8);
-	class_desc->set_autowrap_trim_flags(TextServer::BREAK_TRIM_END_EDGE_SPACES);
 	add_child(class_desc);
-
 	class_desc->set_threaded(true);
 	class_desc->set_v_size_flags(SIZE_EXPAND_FILL);
 
@@ -3469,7 +3478,7 @@ EditorHelp::EditorHelp() {
 
 	class_desc->set_selection_enabled(true);
 	class_desc->set_context_menu_enabled(true);
-	class_desc->set_selection_modifier(callable_mp_static(_fix_selection));
+	class_desc->set_selection_modifier(callable_mp_static(_replace_nbsp_with_space));
 
 	class_desc->hide();
 }
@@ -3700,18 +3709,6 @@ EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName
 				}
 			}
 
-			if (property.name.contains("{index}")) {
-				RegEx reg_index = RegEx(property.name.replace("{index}", "\\d*"));
-				Ref<RegExMatch> match = reg_index.search(p_property_name);
-				if (match.is_valid()) {
-					result = current;
-
-					if (!is_native) {
-						break;
-					}
-				}
-			}
-
 			if (is_native) {
 				doc_property_cache[p_class_name][property.name] = current;
 			}
@@ -4158,6 +4155,7 @@ void EditorHelpBit::_update_labels() {
 	if (!help_data.experimental_message.is_empty()) {
 		if (has_prev_text) {
 			content->add_newline();
+			content->add_newline();
 		}
 		has_prev_text = true;
 
@@ -4176,6 +4174,7 @@ void EditorHelpBit::_update_labels() {
 	if (!help_data.description.is_empty()) {
 		if (has_prev_text) {
 			content->add_newline();
+			content->add_newline();
 		}
 		has_prev_text = true;
 
@@ -4186,6 +4185,7 @@ void EditorHelpBit::_update_labels() {
 	if (!help_data.resource_path.is_empty()) {
 		if (has_prev_text) {
 			content->add_newline();
+			content->add_newline();
 		}
 		has_prev_text = true;
 
@@ -4359,7 +4359,6 @@ void EditorHelpBit::_meta_clicked(const String &p_select) {
 		OS::get_singleton()->shell_open(p_select);
 	} else if (p_select.begins_with("^")) { // Copy button.
 		DisplayServer::get_singleton()->clipboard_set(p_select.substr(1));
-		EditorToaster::get_singleton()->popup_str(TTR("Code snippet copied to clipboard."), EditorToaster::SEVERITY_INFO);
 	}
 }
 
@@ -4370,254 +4369,11 @@ void EditorHelpBit::_bind_methods() {
 void EditorHelpBit::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED:
-			content->begin_bulk_theme_override();
-
-			//content->add_theme_constant_override(SceneStringName(line_separation), get_theme_constant(SceneStringName(line_separation), SNAME("EditorHelp")));
-			content->add_theme_constant_override(SceneStringName(paragraph_separation), get_theme_constant(SceneStringName(paragraph_separation), SNAME("EditorHelp")));
-			content->add_theme_constant_override("table_h_separation", get_theme_constant(SNAME("table_h_separation"), SNAME("EditorHelp")));
-			content->add_theme_constant_override("table_v_separation", get_theme_constant(SNAME("table_v_separation"), SNAME("EditorHelp")));
-			content->add_theme_constant_override("text_highlight_h_padding", get_theme_constant(SNAME("text_highlight_h_padding"), SNAME("EditorHelp")));
-			content->add_theme_constant_override("text_highlight_v_padding", get_theme_constant(SNAME("text_highlight_v_padding"), SNAME("EditorHelp")));
-
-			content->end_bulk_theme_override();
-
 			_update_labels();
 			break;
 	}
 }
 
-String EditorHelpBit::get_as_plain_text(const String &p_symbol, const String &p_prologue) {
-	const PackedStringArray slices = p_symbol.split("|", true, 3);
-	ERR_FAIL_COND_V_MSG(slices.size() < 3, String(), R"(Invalid doc id: The expected format is "item_type|class_name|item_name[|item_data]".)");
-
-	const String &item_type = slices[0];
-	const String &class_name = slices[1];
-	const String &item_name = slices[2];
-
-	Dictionary item_data;
-	if (slices.size() > 3) {
-		item_data = JSON::parse_string(slices[3]);
-	}
-
-	HelpData new_help_data = HelpData();
-
-	if (item_type == "class") {
-		new_help_data = _get_class_help_data(class_name);
-	} else if (item_type == "enum") {
-		new_help_data = _get_enum_help_data(class_name, item_name);
-	} else if (item_type == "constant") {
-		new_help_data = _get_constant_help_data(class_name, item_name);
-	} else if (item_type == "property") {
-		new_help_data = _get_property_help_data(class_name, item_name);
-
-		// Add copy note to built-in properties returning `Packed*Array`.
-		const DocData::ClassDoc *cd = EditorHelp::get_doc(class_name);
-		if (cd && !cd->is_script_doc && packed_array_types.has(new_help_data.doc_type.type)) {
-			if (!new_help_data.description.is_empty()) {
-				new_help_data.description += "\n";
-			}
-			// See also `EditorHelp::_update_doc()` and `doc/tools/make_rst.py`.
-			new_help_data.description += vformat(TTR("[b]Note:[/b] The returned array is [i]copied[/i] and any changes to it will not update the original property value. See [%s] for more details."), new_help_data.doc_type.type);
-		}
-	} else if (item_type == "internal_property") {
-		new_help_data.description = TTR("This property can only be set in the Inspector.");
-	} else if (item_type == "theme_item") {
-		new_help_data = _get_theme_item_help_data(class_name, item_name);
-	} else if (item_type == "method") {
-		new_help_data = _get_method_help_data(class_name, item_name);
-	} else if (item_type == "signal") {
-		new_help_data = _get_signal_help_data(class_name, item_name);
-	} else if (item_type == "annotation") {
-		new_help_data = _get_annotation_help_data(class_name, item_name);
-	} else if (item_type == "local_constant" || item_type == "local_variable") {
-		new_help_data.description = item_data.get("description", "").operator String().strip_edges();
-		if (item_data.get("is_deprecated", false)) {
-			const String deprecated_message = item_data.get("deprecated_message", "").operator String().strip_edges();
-			if (deprecated_message.is_empty()) {
-				if (item_type == "local_constant") {
-					new_help_data.deprecated_message = TTR("This constant may be changed or removed in future versions.");
-				} else {
-					new_help_data.deprecated_message = TTR("This variable may be changed or removed in future versions.");
-				}
-			} else {
-				new_help_data.deprecated_message = deprecated_message;
-			}
-		}
-		if (item_data.get("is_experimental", false)) {
-			const String experimental_message = item_data.get("experimental_message", "").operator String().strip_edges();
-			if (experimental_message.is_empty()) {
-				if (item_type == "local_constant") {
-					new_help_data.experimental_message = TTR("This constant may be changed or removed in future versions.");
-				} else {
-					new_help_data.experimental_message = TTR("This variable may be changed or removed in future versions.");
-				}
-			} else {
-				new_help_data.experimental_message = experimental_message;
-			}
-		}
-	}
-
-	if (!p_prologue.is_empty()) {
-		if (new_help_data.description.is_empty()) {
-			new_help_data.description = p_prologue;
-		} else {
-			new_help_data.description = p_prologue + "\n" + new_help_data.description;
-		}
-	}
-
-	if (new_help_data.description.is_empty() && item_type != "resource") {
-		new_help_data.description = TTR("No description available.");
-	}
-
-	String bbcode = new_help_data.description;
-	if (!new_help_data.deprecated_message.is_empty()) {
-		bbcode += "\n" + new_help_data.deprecated_message;
-	}
-	if (!new_help_data.experimental_message.is_empty()) {
-		bbcode += "\n" + new_help_data.experimental_message;
-	}
-
-	if (bbcode.is_empty()) {
-		return String();
-	}
-
-	DocTools *doc = EditorHelp::get_doc_data();
-
-	StringBuilder output;
-
-	List<String> tag_stack;
-	int pos = 0;
-	while (pos < bbcode.length()) {
-		int brk_pos = bbcode.find_char('[', pos);
-
-		if (brk_pos < 0) {
-			brk_pos = bbcode.length();
-		}
-
-		if (brk_pos > pos) {
-			String text = bbcode.substr(pos, brk_pos - pos);
-			output.append(text);
-		}
-
-		if (brk_pos == bbcode.length()) {
-			// Nothing else to add.
-			break;
-		}
-
-		int brk_end = bbcode.find_char(']', brk_pos + 1);
-
-		if (brk_end == -1) {
-			String text = bbcode.substr(brk_pos);
-			output.append(text);
-			break;
-		}
-
-		String tag = bbcode.substr(brk_pos + 1, brk_end - brk_pos - 1);
-
-		if (tag.begins_with("/")) {
-			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1);
-
-			if (!tag_ok) {
-				output.append("]");
-				pos = brk_pos + 1;
-				continue;
-			}
-
-			tag_stack.pop_front();
-			pos = brk_end + 1;
-		} else if (tag.begins_with("method ") || tag.begins_with("constructor ") || tag.begins_with("operator ") || tag.begins_with("member ") || tag.begins_with("signal ") || tag.begins_with("enum ") || tag.begins_with("constant ") || tag.begins_with("theme_item ") || tag.begins_with("param ")) {
-			int tag_end = tag.find_char(' ');
-			String link_tag = tag.left(tag_end);
-			String link_target = tag.substr(tag_end + 1).lstrip(" ");
-			if (link_tag == "param") {
-				link_tag = "parameter";
-			} else if (link_tag == "theme_item") {
-				link_tag = "theme item";
-			}
-			output.append(link_tag + " '" + link_target + "'");
-			pos = brk_end + 1;
-		} else if (tag == "codeblocks") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "codeblock" || tag.begins_with("codeblock ")) {
-			pos = brk_end + 1;
-			tag_stack.push_front("codeblock");
-		} else if (tag.begins_with("gdscript")) {
-			pos = brk_end + 1;
-			output.append("GDScript:\n");
-			tag_stack.push_front("gdscript");
-		} else if (tag.begins_with("csharp")) {
-			pos = brk_end + 1;
-			output.append("C#:\n");
-			tag_stack.push_front("csharp");
-		} else if (tag == "b") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "i") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "code" || tag.begins_with("code ")) {
-			pos = brk_end + 1;
-			tag_stack.push_front("code");
-		} else if (doc->class_list.has(tag)) {
-			output.append(tag);
-			pos = brk_end + 1;
-		} else if (tag == "kbd") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "center") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "br") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "u") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "s") {
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag == "url") {
-			int end = bbcode.find_char('[', brk_end);
-			if (end == -1) {
-				end = bbcode.length();
-			}
-			String url = bbcode.substr(brk_end + 1, end - brk_end - 1);
-			output.append(url);
-
-			pos = brk_end + 1;
-			tag_stack.push_front(tag);
-		} else if (tag.begins_with("url=")) {
-			pos = brk_end + 1;
-			tag_stack.push_front("url");
-		} else if (tag == "img") {
-			int end = bbcode.find_char('[', brk_end);
-			if (end == -1) {
-				end = bbcode.length();
-			}
-			String image = bbcode.substr(brk_end + 1, end - brk_end - 1);
-
-			output.append("(Image: ");
-			output.append(image);
-			output.append(")");
-
-			pos = end;
-			tag_stack.push_front(tag);
-		} else if (tag.begins_with("color=")) {
-			pos = brk_end + 1;
-			tag_stack.push_front("color");
-		} else if (tag.begins_with("font=")) {
-			pos = brk_end + 1;
-			tag_stack.push_front("font");
-		} else {
-			output.append("[");
-			pos = brk_pos + 1;
-		}
-	}
-
-	return output.as_string();
-}
-
 void EditorHelpBit::parse_symbol(const String &p_symbol, const String &p_prologue) {
 	const PackedStringArray slices = p_symbol.split("|", true, 3);
 	ERR_FAIL_COND_MSG(slices.size() < 3, R"(Invalid doc id: The expected format is "item_type|class_name|item_name[|item_data]".)");
@@ -4841,7 +4597,7 @@ EditorHelpBit::EditorHelpBit(const String &p_symbol, const String &p_prologue, b
 	title->set_fit_content(true);
 	title->set_selection_enabled(p_allow_selection);
 	title->set_context_menu_enabled(p_allow_selection);
-	title->set_selection_modifier(callable_mp_static(_fix_selection));
+	title->set_selection_modifier(callable_mp_static(_replace_nbsp_with_space));
 	title->connect("meta_clicked", callable_mp(this, &EditorHelpBit::_meta_clicked));
 	title->hide();
 	add_child(title);
@@ -4851,12 +4607,11 @@ EditorHelpBit::EditorHelpBit(const String &p_symbol, const String &p_prologue, b
 
 	content = memnew(RichTextLabel);
 	content->set_theme_type_variation(p_in_tooltip ? "EditorHelpBitTooltipContent" : "EditorHelpBitContent");
-	content->set_autowrap_trim_flags(TextServer::BREAK_TRIM_END_EDGE_SPACES);
 	content->set_custom_minimum_size(Size2(640 * EDSCALE, content_min_height));
 	content->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	content->set_selection_enabled(p_allow_selection);
 	content->set_context_menu_enabled(p_allow_selection);
-	content->set_selection_modifier(callable_mp_static(_fix_selection));
+	content->set_selection_modifier(callable_mp_static(_replace_nbsp_with_space));
 	content->connect("meta_clicked", callable_mp(this, &EditorHelpBit::_meta_clicked));
 	add_child(content);
 
@@ -4900,20 +4655,6 @@ void EditorHelpBitTooltip::_target_gui_input(const Ref<InputEvent> &p_event) {
 				break;
 		}
 	}
-
-	const Ref<InputEventKey> k = p_event;
-	if (k.is_valid() && k->is_pressed()) {
-		queue_free();
-	}
-}
-
-void EditorHelpBitTooltip::_shortcut_pressed(Control *p_target) {
-	TextEdit *tx = Object::cast_to<TextEdit>(p_target);
-	if (tx) {
-		popup_under_position(
-				tx->get_global_position() + tx->get_caret_draw_pos() +
-				Point2(0, tx->get_line_height()) + tx->get_window()->get_position_with_decorations());
-	}
 }
 
 void EditorHelpBitTooltip::_notification(int p_what) {
@@ -4933,19 +4674,17 @@ void EditorHelpBitTooltip::_notification(int p_what) {
 			_is_mouse_inside_tooltip = false;
 			_start_timer();
 			break;
-		case NOTIFICATION_INTERNAL_PROCESS: {
+		case NOTIFICATION_INTERNAL_PROCESS:
 			// A workaround to hide the tooltip since the window does not receive keyboard events
 			// with `FLAG_POPUP` and `FLAG_NO_FOCUS` flags, so we can't use `_input_from_window()`.
 			if (is_inside_tree()) {
 				if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"), true)) {
 					queue_free();
 					get_parent_viewport()->set_input_as_handled();
-				} else if (Input::get_singleton()->is_any_key_pressed()) {
-					if (!_is_shortcut_pressed) {
-						queue_free();
-					}
+				} else if (Input::get_singleton()->is_anything_pressed_except_mouse()) {
+					queue_free();
 				} else if (!Input::get_singleton()->get_mouse_button_mask().is_empty()) {
-					if (!_is_mouse_inside_tooltip && !_is_shortcut_pressed) {
+					if (!_is_mouse_inside_tooltip) {
 						queue_free();
 					}
 				} else if (!Input::get_singleton()->get_last_mouse_velocity().is_zero_approx()) {
@@ -4954,41 +4693,38 @@ void EditorHelpBitTooltip::_notification(int p_what) {
 					}
 				}
 			}
-		} break;
+			break;
 	}
 }
 
-Control *EditorHelpBitTooltip::make_tooltip(Control *p_target, const String &p_symbol, const String &p_prologue, bool p_use_class_prefix, bool p_shortcut) {
+Control *EditorHelpBitTooltip::make_tooltip(Control *p_target, const String &p_symbol, const String &p_prologue, bool p_use_class_prefix) {
 	ERR_FAIL_NULL_V(p_target, _make_invisible_control());
 
 	// Show the custom tooltip only if it is not already visible.
 	// The viewport will retrigger `make_custom_tooltip()` every few seconds
 	// because the return control is not visible even if the custom tooltip is displayed.
-	if (_is_tooltip_visible || (!p_shortcut && Input::get_singleton()->is_anything_pressed())) {
+	if (_is_tooltip_visible || Input::get_singleton()->is_anything_pressed()) {
 		return _make_invisible_control();
 	}
 
 	EditorHelpBit *help_bit = memnew(EditorHelpBit(p_symbol, p_prologue, p_use_class_prefix, false, true));
 
-	EditorHelpBitTooltip *tooltip = memnew(EditorHelpBitTooltip(p_target, p_shortcut));
+	EditorHelpBitTooltip *tooltip = memnew(EditorHelpBitTooltip(p_target));
 	help_bit->connect("request_hide", callable_mp(static_cast<Node *>(tooltip), &Node::queue_free));
 	tooltip->add_child(help_bit);
 	p_target->add_child(tooltip);
 
 	help_bit->update_content_height();
-	if (tooltip->is_shortcut_pressed()) {
-		tooltip->_shortcut_pressed(p_target);
-	} else {
-		tooltip->popup_under_position(tooltip->get_mouse_position());
-	}
+	tooltip->popup_under_cursor();
 
 	return _make_invisible_control();
 }
 
 // Copy-paste from `Viewport::_gui_show_tooltip()`.
-void EditorHelpBitTooltip::popup_under_position(const Point2 &p_point) {
+void EditorHelpBitTooltip::popup_under_cursor() {
+	Point2 mouse_pos = get_mouse_position();
 	Point2 tooltip_offset = GLOBAL_GET_CACHED(Point2, "display/mouse_cursor/tooltip_position_offset");
-	Rect2 r(p_point + tooltip_offset, get_contents_minimum_size());
+	Rect2 r(mouse_pos + tooltip_offset, get_contents_minimum_size());
 	r.size = r.size.min(get_max_size());
 
 	Window *window = get_parent_visible_window();
@@ -4999,10 +4735,10 @@ void EditorHelpBitTooltip::popup_under_position(const Point2 &p_point) {
 		vr = window->get_usable_parent_rect();
 	}
 
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS) || is_embedded()) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS) || is_embedded()) {
 		if (r.size.x + r.position.x > vr.size.x + vr.position.x) {
 			// Place it in the opposite direction. If it fails, just hug the border.
-			r.position.x = p_point.x - r.size.x - tooltip_offset.x;
+			r.position.x = mouse_pos.x - r.size.x - tooltip_offset.x;
 
 			if (r.position.x < vr.position.x) {
 				r.position.x = vr.position.x + vr.size.x - r.size.x;
@@ -5013,7 +4749,7 @@ void EditorHelpBitTooltip::popup_under_position(const Point2 &p_point) {
 
 		if (r.size.y + r.position.y > vr.size.y + vr.position.y) {
 			// Same as above.
-			r.position.y = p_point.y - r.size.y - tooltip_offset.y;
+			r.position.y = mouse_pos.y - r.size.y - tooltip_offset.y;
 
 			if (r.position.y < vr.position.y) {
 				r.position.y = vr.position.y + vr.size.y - r.size.y;
@@ -5030,11 +4766,9 @@ void EditorHelpBitTooltip::popup_under_position(const Point2 &p_point) {
 	popup(r);
 }
 
-EditorHelpBitTooltip::EditorHelpBitTooltip(Control *p_target, bool p_shortcut) {
+EditorHelpBitTooltip::EditorHelpBitTooltip(Control *p_target) {
 	ERR_FAIL_NULL(p_target);
 
-	_is_shortcut_pressed = p_shortcut;
-
 	set_theme_type_variation("TooltipPanel");
 
 	timer = memnew(Timer);
@@ -5138,7 +4872,7 @@ void EditorHelpHighlighter::highlight(RichTextLabel *p_rich_text_label, Language
 			const Pair<int, Color> &prev = highlight_data[i - 1];
 			const Pair<int, Color> &curr = highlight_data[i];
 			p_rich_text_label->push_color(prev.second);
-			p_rich_text_label->add_text(_fix_newlines(p_source.substr(prev.first, curr.first - prev.first)));
+			p_rich_text_label->add_text(p_source.substr(prev.first, curr.first - prev.first));
 			p_rich_text_label->pop(); // color
 		}
 
diff --git a/engine/editor/doc/editor_help.h b/engine/editor/doc/editor_help.h
index 8b5786a6..b90e012d 100644
--- a/engine/editor/doc/editor_help.h
+++ b/engine/editor/doc/editor_help.h
@@ -36,6 +36,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/rich_text_label.h"
+#include "scene/gui/split_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/main/timer.h"
 
@@ -131,8 +132,6 @@ class EditorHelp : public VBoxContainer {
 		Color qualifier_color;
 		Color type_color;
 		Color override_color;
-		Color primary_hr_color;
-		Color secondary_hr_color;
 
 		Ref<Font> doc_font;
 		Ref<Font> doc_bold_font;
@@ -349,8 +348,6 @@ protected:
 	void _notification(int p_what);
 
 public:
-	static String get_as_plain_text(const String &p_symbol, const String &p_prologue = String());
-
 	void parse_symbol(const String &p_symbol, const String &p_prologue = String());
 	void set_custom_text(const String &p_type, const String &p_name, const String &p_description);
 
@@ -370,26 +367,22 @@ class EditorHelpBitTooltip : public PopupPanel {
 	Timer *timer = nullptr;
 	uint64_t _enter_tree_time = 0;
 	bool _is_mouse_inside_tooltip = false;
-	bool _is_shortcut_pressed = false;
 
 	static Control *_make_invisible_control();
 
 	void _start_timer();
 	void _target_gui_input(const Ref<InputEvent> &p_event);
-	void _shortcut_pressed(Control *p_target);
 
 protected:
 	void _notification(int p_what);
 
 public:
 	// The returned control is an orphan node, which is to make the standard tooltip invisible.
-	[[nodiscard]] static Control *make_tooltip(Control *p_target, const String &p_symbol, const String &p_prologue = String(), bool p_use_class_prefix = false, bool p_shortcut = false);
+	[[nodiscard]] static Control *make_tooltip(Control *p_target, const String &p_symbol, const String &p_prologue = String(), bool p_use_class_prefix = false);
 
-	void popup_under_position(const Point2 &p_point);
+	void popup_under_cursor();
 
-	bool is_shortcut_pressed() const { return _is_shortcut_pressed; }
-
-	EditorHelpBitTooltip(Control *p_target, bool p_shortcut = false);
+	EditorHelpBitTooltip(Control *p_target);
 };
 
 class EditorSyntaxHighlighter;
diff --git a/engine/editor/doc/editor_help_search.cpp b/engine/editor/doc/editor_help_search.cpp
index fe30b336..f63c9dc6 100644
--- a/engine/editor/doc/editor_help_search.cpp
+++ b/engine/editor/doc/editor_help_search.cpp
@@ -30,19 +30,15 @@
 
 #include "editor_help_search.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/settings/editor_feature_profile.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "servers/display/display_server.h"
 
 bool EditorHelpSearch::_all_terms_in_name(const Vector<String> &p_terms, const String &p_name) const {
 	for (int i = 0; i < p_terms.size(); i++) {
@@ -174,6 +170,17 @@ void EditorHelpSearch::_update_results() {
 	}
 }
 
+void EditorHelpSearch::_search_box_gui_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			results_tree->gui_input(key);
+			search_box->accept_event();
+		}
+	}
+}
+
 void EditorHelpSearch::_search_box_text_changed(const String &p_text) {
 	_update_results();
 }
@@ -199,13 +206,13 @@ void EditorHelpSearch::_confirmed() {
 void EditorHelpSearch::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_HELP)) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_HELP)) {
 				DisplayServer::get_singleton()->help_set_search_callbacks(callable_mp(this, &EditorHelpSearch::_native_search_cb), callable_mp(this, &EditorHelpSearch::_native_action_cb));
 			}
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_HELP)) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_HELP)) {
 				DisplayServer::get_singleton()->help_set_search_callbacks();
 			}
 		} break;
@@ -235,6 +242,9 @@ void EditorHelpSearch::_notification(int p_what) {
 			const int icon_width = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 			results_tree->add_theme_constant_override("icon_max_width", icon_width);
 
+			search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
+			search_box->add_theme_icon_override("right_icon", get_editor_theme_icon(SNAME("Search")));
+
 			case_sensitive_button->set_button_icon(get_editor_theme_icon(SNAME("MatchCase")));
 			hierarchy_button->set_button_icon(get_editor_theme_icon(SNAME("ClassList")));
 
@@ -319,10 +329,12 @@ EditorHelpSearch::EditorHelpSearch() {
 	HBoxContainer *hbox = memnew(HBoxContainer);
 	vbox->add_child(hbox);
 
-	search_box = memnew(FilterLineEdit);
+	search_box = memnew(LineEdit);
 	search_box->set_accessibility_name(TTRC("Search"));
 	search_box->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	search_box->set_clear_button_enabled(true);
+	search_box->connect(SceneStringName(gui_input), callable_mp(this, &EditorHelpSearch::_search_box_gui_input));
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorHelpSearch::_search_box_text_changed));
 	register_text_enter(search_box);
 	hbox->add_child(search_box);
@@ -369,7 +381,6 @@ EditorHelpSearch::EditorHelpSearch() {
 
 	// Create the results tree.
 	results_tree = memnew(Tree);
-	search_box->set_forward_control(results_tree);
 	results_tree->set_accessibility_name(TTRC("Search Results"));
 	results_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	results_tree->set_columns(2);
diff --git a/engine/editor/doc/editor_help_search.h b/engine/editor/doc/editor_help_search.h
index f034e26a..d62a3197 100644
--- a/engine/editor/doc/editor_help_search.h
+++ b/engine/editor/doc/editor_help_search.h
@@ -30,15 +30,11 @@
 
 #pragma once
 
-#include "core/doc_data.h"
-#include "core/templates/rb_set.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/tree.h"
 
-class FilterLineEdit;
-
 class EditorHelpSearch : public ConfirmationDialog {
 	GDCLASS(EditorHelpSearch, ConfirmationDialog);
 
@@ -57,7 +53,7 @@ class EditorHelpSearch : public ConfirmationDialog {
 		SEARCH_SHOW_HIERARCHY = 1 << 30
 	};
 
-	FilterLineEdit *search_box = nullptr;
+	LineEdit *search_box = nullptr;
 	Button *case_sensitive_button = nullptr;
 	Button *hierarchy_button = nullptr;
 	OptionButton *filter_combo = nullptr;
@@ -81,6 +77,7 @@ class EditorHelpSearch : public ConfirmationDialog {
 
 	void _update_results();
 
+	void _search_box_gui_input(const Ref<InputEvent> &p_event);
 	void _search_box_text_changed(const String &p_text);
 	void _filter_combo_item_selected(int p_option);
 	void _confirmed();
diff --git a/engine/editor/gui/filter_line_edit.h b/engine/editor/docks/dock_constants.h
similarity index 82%
rename from engine/editor/gui/filter_line_edit.h
rename to engine/editor/docks/dock_constants.h
index 266fcfd3..3b379fb6 100644
--- a/engine/editor/gui/filter_line_edit.h
+++ b/engine/editor/docks/dock_constants.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  filter_line_edit.h                                                    */
+/*  dock_constants.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,20 +30,26 @@
 
 #pragma once
 
-#include "scene/gui/line_edit.h"
+namespace DockConstants {
 
-class FilterLineEdit : public LineEdit {
-	GDCLASS(FilterLineEdit, LineEdit);
-
-	Control *forward_control = nullptr;
-
-protected:
-	void _notification(int p_what);
-
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-
-public:
-	void set_forward_control(Control *p_control);
-
-	FilterLineEdit();
+enum DockSlot {
+	DOCK_SLOT_NONE = -1,
+	DOCK_SLOT_LEFT_UL,
+	DOCK_SLOT_LEFT_BL,
+	DOCK_SLOT_LEFT_UR,
+	DOCK_SLOT_LEFT_BR,
+	DOCK_SLOT_RIGHT_UL,
+	DOCK_SLOT_RIGHT_BL,
+	DOCK_SLOT_RIGHT_UR,
+	DOCK_SLOT_RIGHT_BR,
+	DOCK_SLOT_BOTTOM,
+	DOCK_SLOT_MAX
 };
+
+enum DockLayout {
+	DOCK_LAYOUT_VERTICAL = 1,
+	DOCK_LAYOUT_HORIZONTAL = 2,
+	DOCK_LAYOUT_FLOATING = 4,
+};
+
+}; //namespace DockConstants
diff --git a/engine/editor/docks/dock_tab_container.cpp b/engine/editor/docks/dock_tab_container.cpp
deleted file mode 100644
index 7a5f895d..00000000
--- a/engine/editor/docks/dock_tab_container.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/**************************************************************************/
-/*  dock_tab_container.cpp                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "dock_tab_container.h"
-
-#include "core/object/callable_mp.h"
-#include "editor/docks/editor_dock.h"
-#include "editor/docks/editor_dock_manager.h"
-#include "editor/editor_node.h"
-#include "editor/editor_string_names.h"
-#include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/resources/style_box_flat.h"
-
-bool EditorDockDragHint::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
-	return can_drop_dock;
-}
-
-void EditorDockDragHint::drop_data(const Point2 &p_point, const Variant &p_data) {
-	// Drop dock into last spot if not over tabbar.
-	if (drop_tabbar_parent->get_rect().has_point(p_point)) {
-		drop_tabbar->_handle_drop_data("tab_container_tab", p_point, p_data, callable_mp(this, &EditorDockDragHint::_drag_move_tab), callable_mp(this, &EditorDockDragHint::_drag_move_tab_from));
-	} else {
-		EditorDockManager *dock_manager = EditorDockManager::get_singleton();
-		dock_manager->_move_dock(dock_manager->_get_dock_tab_dragged(), dock_container, drop_tabbar->get_tab_count());
-	}
-}
-
-void EditorDockDragHint::_drag_move_tab(int p_from_index, int p_to_index) {
-	dock_container->get_dock(p_from_index)->set_tab_index(p_to_index, true);
-}
-
-void EditorDockDragHint::_drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index) {
-	EditorDockManager *dock_manager = EditorDockManager::get_singleton();
-	dock_manager->_move_dock(dock_manager->_get_dock_tab_dragged(), dock_container, p_to_index);
-}
-
-void EditorDockDragHint::gui_input(const Ref<InputEvent> &p_event) {
-	ERR_FAIL_COND(p_event.is_null());
-
-	Ref<InputEventMouseMotion> mm = p_event;
-	if (mm.is_valid()) {
-		Point2 pos = mm->get_position();
-
-		// Redraw when inside the tabbar and just exited.
-		if (mouse_inside_tabbar) {
-			queue_redraw();
-		}
-		mouse_inside_tabbar = drop_tabbar_parent->get_rect().has_point(pos);
-	}
-}
-
-void EditorDockDragHint::set_slot(DockTabContainer *p_slot) {
-	dock_container = p_slot;
-	drop_tabbar = p_slot->get_tab_bar();
-	drop_tabbar_parent = (Control *)p_slot->get_internal_container();
-}
-
-void EditorDockDragHint::_notification(int p_what) {
-	switch (p_what) {
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/theme")) {
-				dock_drop_highlight->set_corner_radius_all(EDSCALE * EDITOR_GET("interface/theme/corner_radius").operator int());
-				if (mouse_inside) {
-					queue_redraw();
-				}
-			}
-		} break;
-
-		case NOTIFICATION_THEME_CHANGED: {
-			valid_drop_color = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
-		} break;
-
-		case NOTIFICATION_MOUSE_ENTER:
-		case NOTIFICATION_MOUSE_EXIT: {
-			mouse_inside = p_what == NOTIFICATION_MOUSE_ENTER;
-			queue_redraw();
-		} break;
-
-		case NOTIFICATION_DRAG_BEGIN: {
-			EditorDock *dragged_dock = EditorDockManager::get_singleton()->_get_dock_tab_dragged();
-			if (!dragged_dock) {
-				return;
-			}
-
-			can_drop_dock = dragged_dock->get_available_layouts() & dock_container->layout;
-
-			dock_drop_highlight->set_border_color(valid_drop_color);
-			dock_drop_highlight->set_bg_color(valid_drop_color * Color(1, 1, 1, 0.1));
-		} break;
-		case NOTIFICATION_DRAG_END: {
-			EditorDockManager::get_singleton()->_dock_drag_stopped();
-			can_drop_dock = false;
-			mouse_inside = false;
-			hide();
-		} break;
-
-		case NOTIFICATION_DRAW: {
-			if (!mouse_inside || !can_drop_dock) {
-				return;
-			}
-
-			// Draw highlights around docks that can be dropped.
-			Rect2 dock_rect = Rect2(Point2(), get_size()).grow(2 * EDSCALE);
-			draw_style_box(dock_drop_highlight, dock_rect);
-
-			// Only display tabbar hint if the mouse is over the tabbar.
-			if (drop_tabbar_parent->get_global_rect().has_point(get_global_mouse_position())) {
-				draw_set_transform(drop_tabbar_parent->get_position()); // The TabBar isn't always on top.
-				drop_tabbar->_draw_tab_drop(get_canvas_item());
-			}
-		} break;
-	}
-}
-
-EditorDockDragHint::EditorDockDragHint() {
-	set_as_top_level(true);
-	hide();
-
-	dock_drop_highlight.instantiate();
-	dock_drop_highlight->set_corner_radius_all(EDSCALE * EDITOR_GET("interface/theme/corner_radius").operator int());
-	dock_drop_highlight->set_border_width_all(Math::round(2 * EDSCALE));
-}
-
-void DockTabContainer::_pre_popup() {
-	dock_context_popup->set_dock(get_dock(get_current_tab()));
-}
-
-void DockTabContainer::_tab_rmb_clicked(int p_tab_idx) {
-	EditorDock *hovered_dock = get_dock(p_tab_idx);
-	if (!hovered_dock) {
-		return;
-	}
-
-	// Right click context menu.
-	dock_context_popup->set_dock(hovered_dock);
-	dock_context_popup->set_position(get_tab_bar()->get_screen_position() + get_tab_bar()->get_local_mouse_position());
-	dock_context_popup->popup();
-}
-
-void DockTabContainer::_notification(int p_what) {
-	if (p_what == NOTIFICATION_POSTINITIALIZE) {
-		connect("pre_popup_pressed", callable_mp(this, &DockTabContainer::_pre_popup));
-		connect("child_order_changed", callable_mp(this, &DockTabContainer::update_visibility));
-	}
-}
-
-void DockTabContainer::update_visibility() {
-	// Hide the dock container if there are no tabs.
-	set_visible(EditorDockManager::get_singleton()->are_docks_visible() && get_tab_count() > 0);
-}
-
-DockTabContainer::TabStyle DockTabContainer::get_tab_style() const {
-	return (TabStyle)EDITOR_GET("interface/editor/docks/dock_tab_style").operator int();
-}
-
-bool DockTabContainer::can_switch_dock() const {
-	return EditorDockManager::get_singleton()->are_docks_visible();
-}
-
-void DockTabContainer::save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section) {
-	PackedStringArray names;
-	names.reserve_exact(get_tab_count());
-	for (int i = 0; i < get_tab_count(); i++) {
-		const String name = get_dock(i)->get_effective_layout_key();
-		names.append(name);
-	}
-
-	const String config_key = DockTabContainer::get_config_key(dock_slot);
-	if (!names.is_empty()) {
-		p_layout->set_value(p_section, config_key, String(",").join(names));
-	} else if (p_layout->has_section_key(p_section, config_key)) {
-		p_layout->erase_section_key(p_section, config_key);
-	}
-
-	const String tab_key = config_key + "_selected_tab_idx";
-	int selected_tab_idx = get_current_tab();
-	if (selected_tab_idx >= 0) {
-		p_layout->set_value(p_section, tab_key, selected_tab_idx);
-	} else if (p_layout->has_section_key(p_section, tab_key)) {
-		p_layout->erase_section_key(p_section, tab_key);
-	}
-}
-
-void DockTabContainer::load_selected_tab(int p_idx) {
-	EditorDock *selected_dock = get_dock(p_idx);
-	if (!selected_dock) {
-		return;
-	}
-	set_block_signals(true);
-	set_current_tab(p_idx);
-	set_block_signals(false);
-}
-
-void DockTabContainer::set_dock_context_popup(DockContextPopup *p_popup) {
-	dock_context_popup = p_popup;
-	set_popup(dock_context_popup);
-}
-
-void DockTabContainer::move_dock_index(EditorDock *p_dock, int p_to_index, bool p_set_current) {
-	set_block_signals(true);
-	int target_index = CLAMP(p_to_index, 0, get_tab_count() - 1);
-	move_child(p_dock, get_dock(target_index)->get_index(false));
-
-	if (p_set_current && !p_dock->is_visible_in_tree()) {
-		set_current_tab(target_index);
-	}
-	set_block_signals(false);
-}
-
-EditorDock *DockTabContainer::get_dock(int p_idx) const {
-	return Object::cast_to<EditorDock>(get_tab_control(p_idx));
-}
-
-void DockTabContainer::show_drag_hint() {
-	if (!is_visible_in_tree()) {
-		return;
-	}
-	drag_hint->set_rect(get_global_rect());
-	drag_hint->show();
-}
-
-DockTabContainer::DockTabContainer(EditorDock::DockSlot p_slot) {
-	ERR_FAIL_INDEX(p_slot, EditorDock::DOCK_SLOT_MAX);
-	dock_slot = p_slot;
-
-	set_drag_to_rearrange_enabled(true);
-	set_tabs_rearrange_group(1);
-	hide();
-
-	drag_hint = memnew(EditorDockDragHint);
-	drag_hint->set_slot(this);
-	drag_hint->hide();
-	EditorNode::get_singleton()->get_gui_base()->add_child(drag_hint);
-
-	get_tab_bar()->set_switch_on_release(true);
-	get_tab_bar()->connect("tab_rmb_clicked", callable_mp(this, &DockTabContainer::_tab_rmb_clicked));
-}
-
-SideDockTabContainer::SideDockTabContainer(EditorDock::DockSlot p_slot, const Rect2i &p_slot_rect) :
-		DockTabContainer(p_slot) {
-	grid_rect = p_slot_rect;
-	set_custom_minimum_size(Size2(170 * EDSCALE, 0));
-	set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	set_use_hidden_tabs_for_min_size(true);
-}
-
-BottomSideDockTabContainer::BottomSideDockTabContainer(EditorDock::DockSlot p_slot, const Rect2i &p_slot_rect) :
-		DockTabContainer(p_slot) {
-	grid_rect = p_slot_rect;
-	layout = EditorDock::DOCK_LAYOUT_HORIZONTAL;
-
-	set_custom_minimum_size(Size2(0, 170 * EDSCALE));
-	set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	set_use_hidden_tabs_for_min_size(true);
-}
diff --git a/engine/editor/docks/dock_tab_container.h b/engine/editor/docks/dock_tab_container.h
deleted file mode 100644
index 89d21c79..00000000
--- a/engine/editor/docks/dock_tab_container.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/**************************************************************************/
-/*  dock_tab_container.h                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "editor/docks/editor_dock.h"
-#include "scene/gui/tab_container.h"
-
-class ConfigFile;
-class DockContextPopup;
-class DockTabContainer;
-class EditorDockManager;
-class StyleBoxFlat;
-
-class EditorDockDragHint : public Control {
-	GDCLASS(EditorDockDragHint, Control);
-
-	DockTabContainer *dock_container = nullptr;
-	Control *drop_tabbar_parent = nullptr;
-	TabBar *drop_tabbar = nullptr;
-
-	Color valid_drop_color;
-	Ref<StyleBoxFlat> dock_drop_highlight;
-	bool can_drop_dock = false;
-	bool mouse_inside = false;
-	bool mouse_inside_tabbar = false;
-
-	void _drag_move_tab(int p_from_index, int p_to_index);
-	void _drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index);
-
-protected:
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-
-	void _notification(int p_what);
-	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
-	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
-
-public:
-	void set_slot(DockTabContainer *p_slot);
-
-	EditorDockDragHint();
-};
-
-class DockTabContainer : public TabContainer {
-	GDCLASS(DockTabContainer, TabContainer);
-
-	EditorDockDragHint *drag_hint = nullptr;
-
-	void _pre_popup();
-	void _tab_rmb_clicked(int p_tab_idx);
-
-protected:
-	DockContextPopup *dock_context_popup = nullptr;
-
-	void _notification(int p_what);
-
-public:
-	enum class TabStyle {
-		TEXT_ONLY,
-		ICON_ONLY,
-		TEXT_AND_ICON,
-	};
-
-	EditorDock::DockSlot dock_slot = EditorDock::DOCK_SLOT_NONE;
-	EditorDock::DockLayout layout = EditorDock::DOCK_LAYOUT_VERTICAL;
-	Rect2i grid_rect;
-
-	static String get_config_key(int p_idx) { return "dock_" + itos(p_idx + 1); }
-
-	virtual void dock_closed(EditorDock *p_dock) {}
-	virtual void dock_focused(EditorDock *p_dock, bool p_was_visible) {}
-	virtual void update_visibility();
-	virtual TabStyle get_tab_style() const;
-	virtual bool can_switch_dock() const;
-
-	// There is no equivalent load method, because loading needs to handle floating and closing.
-	void save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section);
-	virtual void load_selected_tab(int p_idx);
-
-	// This method should only be called by EditorDock.
-	void move_dock_index(EditorDock *p_dock, int p_to_index, bool p_set_current);
-
-	void set_dock_context_popup(DockContextPopup *p_popup);
-	EditorDock *get_dock(int p_idx) const;
-	void show_drag_hint();
-
-	DockTabContainer(EditorDock::DockSlot p_slot);
-};
-
-class SideDockTabContainer : public DockTabContainer {
-	GDCLASS(SideDockTabContainer, DockTabContainer);
-
-public:
-	SideDockTabContainer(EditorDock::DockSlot p_slot, const Rect2i &p_slot_rect);
-};
-
-class BottomSideDockTabContainer : public DockTabContainer {
-	GDCLASS(BottomSideDockTabContainer, DockTabContainer);
-
-public:
-	BottomSideDockTabContainer(EditorDock::DockSlot p_slot, const Rect2i &p_slot_rect);
-};
diff --git a/engine/editor/docks/editor_dock.cpp b/engine/editor/docks/editor_dock.cpp
index 7f9be310..f46b68ed 100644
--- a/engine/editor/docks/editor_dock.cpp
+++ b/engine/editor/docks/editor_dock.cpp
@@ -31,9 +31,7 @@
 #include "editor_dock.h"
 
 #include "core/input/shortcut.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "editor/docks/dock_tab_container.h"
+#include "core/io/config_file.h"
 #include "editor/docks/editor_dock_manager.h"
 
 void EditorDock::_set_default_slot_bind(DockSlot p_slot) {
@@ -45,23 +43,6 @@ void EditorDock::_emit_changed() {
 	emit_signal(SNAME("_tab_style_changed"));
 }
 
-void EditorDock::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_READY: {
-			set_accessibility_region(true);
-			set_accessibility_name(get_display_title());
-		} break;
-
-		case NOTIFICATION_PARENTED: {
-			parent_dock_container = Object::cast_to<DockTabContainer>(get_parent());
-		} break;
-
-		case NOTIFICATION_UNPARENTED: {
-			parent_dock_container = nullptr;
-		} break;
-	}
-}
-
 void EditorDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("open"), &EditorDock::open);
 	ClassDB::bind_method(D_METHOD("make_visible"), &EditorDock::make_visible);
@@ -93,7 +74,7 @@ void EditorDock::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_dock_icon", "icon"), &EditorDock::set_dock_icon);
 	ClassDB::bind_method(D_METHOD("get_dock_icon"), &EditorDock::get_dock_icon);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dock_icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_dock_icon", "get_dock_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dock_icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_dock_icon", "get_dock_icon");
 
 	ClassDB::bind_method(D_METHOD("set_force_show_icon", "force"), &EditorDock::set_force_show_icon);
 	ClassDB::bind_method(D_METHOD("get_force_show_icon"), &EditorDock::get_force_show_icon);
@@ -105,7 +86,7 @@ void EditorDock::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_dock_shortcut", "shortcut"), &EditorDock::set_dock_shortcut);
 	ClassDB::bind_method(D_METHOD("get_dock_shortcut"), &EditorDock::get_dock_shortcut);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dock_shortcut", PROPERTY_HINT_RESOURCE_TYPE, Shortcut::get_class_static()), "set_dock_shortcut", "get_dock_shortcut");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "dock_shortcut", PROPERTY_HINT_RESOURCE_TYPE, "Shortcut"), "set_dock_shortcut", "get_dock_shortcut");
 
 	ClassDB::bind_method(D_METHOD("set_default_slot", "slot"), &EditorDock::_set_default_slot_bind);
 	ClassDB::bind_method(D_METHOD("get_default_slot"), &EditorDock::_get_default_slot_bind);
@@ -115,7 +96,6 @@ void EditorDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_available_layouts"), &EditorDock::get_available_layouts);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "available_layouts", PROPERTY_HINT_FLAGS, "Vertical:1,Horizontal:2,Floating:4"), "set_available_layouts", "get_available_layouts");
 
-	ADD_SIGNAL(MethodInfo("opened"));
 	ADD_SIGNAL(MethodInfo("closed"));
 	ADD_SIGNAL(MethodInfo("_tab_style_changed"));
 
@@ -134,8 +114,6 @@ void EditorDock::_bind_methods() {
 	BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_UR);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BR);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_BOTTOM);
-	BIND_ENUM_CONSTANT(DOCK_SLOT_BOTTOM_L);
-	BIND_ENUM_CONSTANT(DOCK_SLOT_BOTTOM_R);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_MAX);
 
 	GDVIRTUAL_BIND(_update_layout, "layout");
@@ -153,10 +131,6 @@ void EditorDock::make_visible() {
 	EditorDockManager::get_singleton()->open_dock(this, true);
 }
 
-void EditorDock::make_floating() {
-	EditorDockManager::get_singleton()->make_dock_floating(this);
-}
-
 void EditorDock::close() {
 	if (is_open) {
 		EditorDockManager::get_singleton()->close_dock(this);
@@ -168,7 +142,6 @@ void EditorDock::set_title(const String &p_title) {
 		return;
 	}
 	title = p_title;
-	set_accessibility_name(get_display_title());
 	_emit_changed();
 }
 
@@ -230,10 +203,6 @@ void EditorDock::set_dock_shortcut(const Ref<Shortcut> &p_shortcut) {
 	_emit_changed();
 }
 
-Ref<Shortcut> EditorDock::get_dock_shortcut() const {
-	return shortcut;
-}
-
 void EditorDock::set_default_slot(DockSlot p_slot) {
 	ERR_FAIL_INDEX(p_slot, DOCK_SLOT_MAX);
 	default_slot = p_slot;
@@ -259,66 +228,3 @@ String EditorDock::get_display_title() const {
 String EditorDock::get_effective_layout_key() const {
 	return layout_key.is_empty() ? get_display_title() : layout_key;
 }
-
-void EditorDock::set_tab_index(int p_index, bool p_set_current) {
-	parent_dock_container->move_dock_index(this, p_index, p_set_current);
-	previous_tab_index = parent_dock_container->get_tab_idx_from_control(this);
-}
-
-void EditorDock::update_tab_style() {
-	if (!enabled || !is_open) {
-		return; // Disabled by feature profile or manually closed by user.
-	}
-	if (dock_window) {
-		return; // Floating.
-	}
-
-	ERR_FAIL_NULL(parent_dock_container);
-
-	int index = parent_dock_container->get_tab_idx_from_control(this);
-	ERR_FAIL_COND(index == -1);
-
-	parent_dock_container->get_tab_bar()->set_font_color_override_all(index, title_color);
-
-	const Ref<Texture2D> icon = get_effective_icon(callable_mp((Control *)this, &Control::get_editor_theme_icon));
-	bool assign_icon = force_show_icon;
-	String tooltip;
-	switch (parent_dock_container->get_tab_style()) {
-		case DockTabContainer::TabStyle::TEXT_ONLY: {
-			parent_dock_container->set_tab_title(index, get_display_title());
-		} break;
-		case DockTabContainer::TabStyle::ICON_ONLY: {
-			parent_dock_container->set_tab_title(index, icon.is_valid() ? String() : get_display_title());
-			tooltip = TTR(get_display_title());
-			assign_icon = true;
-		} break;
-		case DockTabContainer::TabStyle::TEXT_AND_ICON: {
-			parent_dock_container->set_tab_title(index, get_display_title());
-			parent_dock_container->set_tab_tooltip(index, String());
-			assign_icon = true;
-		} break;
-	}
-
-	if (shortcut.is_valid()) {
-		tooltip += (tooltip.is_empty() ? "" : "\n") + TTR(shortcut->get_name());
-
-		if (shortcut->has_valid_event()) {
-			tooltip += " (" + shortcut->get_as_text() + ")";
-		}
-	}
-	parent_dock_container->set_tab_tooltip(index, tooltip);
-
-	if (assign_icon) {
-		parent_dock_container->set_tab_icon(index, icon);
-	} else {
-		parent_dock_container->set_tab_icon(index, Ref<Texture2D>());
-	}
-}
-
-Ref<Texture2D> EditorDock::get_effective_icon(const Callable &p_icon_fetch) {
-	Ref<Texture2D> icon = dock_icon;
-	if (icon.is_null() && !icon_name.is_empty()) {
-		icon = p_icon_fetch.call(icon_name);
-	}
-	return icon;
-}
diff --git a/engine/editor/docks/editor_dock.h b/engine/editor/docks/editor_dock.h
index 0032dac1..2571af39 100644
--- a/engine/editor/docks/editor_dock.h
+++ b/engine/editor/docks/editor_dock.h
@@ -31,9 +31,9 @@
 #pragma once
 
 #include "core/io/config_file.h"
+#include "editor/docks/dock_constants.h"
 #include "scene/gui/margin_container.h"
 
-class DockTabContainer;
 class Shortcut;
 class WindowWrapper;
 
@@ -42,32 +42,29 @@ class EditorDock : public MarginContainer {
 
 public:
 	enum DockLayout {
-		DOCK_LAYOUT_VERTICAL = 1,
-		DOCK_LAYOUT_HORIZONTAL = 2,
-		DOCK_LAYOUT_FLOATING = 4,
+		DOCK_LAYOUT_VERTICAL = DockConstants::DOCK_LAYOUT_VERTICAL,
+		DOCK_LAYOUT_HORIZONTAL = DockConstants::DOCK_LAYOUT_HORIZONTAL,
+		DOCK_LAYOUT_FLOATING = DockConstants::DOCK_LAYOUT_FLOATING,
 		DOCK_LAYOUT_ALL = DOCK_LAYOUT_VERTICAL | DOCK_LAYOUT_HORIZONTAL | DOCK_LAYOUT_FLOATING,
 	};
 
 	enum DockSlot {
-		DOCK_SLOT_NONE = -1,
-		DOCK_SLOT_LEFT_UL,
-		DOCK_SLOT_LEFT_BL,
-		DOCK_SLOT_LEFT_UR,
-		DOCK_SLOT_LEFT_BR,
-		DOCK_SLOT_RIGHT_UL,
-		DOCK_SLOT_RIGHT_BL,
-		DOCK_SLOT_RIGHT_UR,
-		DOCK_SLOT_RIGHT_BR,
-		DOCK_SLOT_BOTTOM,
-		DOCK_SLOT_BOTTOM_L,
-		DOCK_SLOT_BOTTOM_R,
-		DOCK_SLOT_MAX
+		DOCK_SLOT_NONE = DockConstants::DOCK_SLOT_NONE,
+		DOCK_SLOT_LEFT_UL = DockConstants::DOCK_SLOT_LEFT_UL,
+		DOCK_SLOT_LEFT_BL = DockConstants::DOCK_SLOT_LEFT_BL,
+		DOCK_SLOT_LEFT_UR = DockConstants::DOCK_SLOT_LEFT_UR,
+		DOCK_SLOT_LEFT_BR = DockConstants::DOCK_SLOT_LEFT_BR,
+		DOCK_SLOT_RIGHT_UL = DockConstants::DOCK_SLOT_RIGHT_UL,
+		DOCK_SLOT_RIGHT_BL = DockConstants::DOCK_SLOT_RIGHT_BL,
+		DOCK_SLOT_RIGHT_UR = DockConstants::DOCK_SLOT_RIGHT_UR,
+		DOCK_SLOT_RIGHT_BR = DockConstants::DOCK_SLOT_RIGHT_BR,
+		DOCK_SLOT_BOTTOM = DockConstants::DOCK_SLOT_BOTTOM,
+		DOCK_SLOT_MAX = DockConstants::DOCK_SLOT_MAX
 	};
 
 private:
 	friend class EditorDockManager;
 	friend class DockContextPopup;
-	friend class DockSlotGrid;
 	friend class DockShortcutHandler;
 
 	String title;
@@ -89,8 +86,7 @@ private:
 	bool enabled = true;
 	int previous_tab_index = -1;
 	WindowWrapper *dock_window = nullptr;
-	DockTabContainer *parent_dock_container = nullptr;
-	int dock_slot_index = DOCK_SLOT_NONE;
+	int dock_slot_index = DockConstants::DOCK_SLOT_NONE;
 
 	void _set_default_slot_bind(DockSlot p_slot);
 	DockSlot _get_default_slot_bind() const { return default_slot; }
@@ -98,7 +94,6 @@ private:
 	void _emit_changed();
 
 protected:
-	void _notification(int p_what);
 	static void _bind_methods();
 
 	GDVIRTUAL1(_update_layout, int)
@@ -108,7 +103,6 @@ protected:
 public:
 	void open();
 	void make_visible();
-	void make_floating();
 	void close();
 
 	void set_title(const String &p_title);
@@ -139,7 +133,7 @@ public:
 	Color get_title_color() const { return title_color; }
 
 	void set_dock_shortcut(const Ref<Shortcut> &p_shortcut);
-	Ref<Shortcut> get_dock_shortcut() const;
+	Ref<Shortcut> get_dock_shortcut() const { return shortcut; }
 
 	void set_default_slot(DockSlot p_slot);
 	DockSlot get_default_slot() const { return default_slot; }
@@ -150,11 +144,6 @@ public:
 	String get_display_title() const;
 	String get_effective_layout_key() const;
 
-	DockTabContainer *get_parent_container() const { return parent_dock_container; }
-	void set_tab_index(int p_index, bool p_set_current);
-	void update_tab_style();
-	Ref<Texture2D> get_effective_icon(const Callable &p_icon_fetch);
-
 	virtual void update_layout(DockLayout p_layout) { GDVIRTUAL_CALL(_update_layout, p_layout); }
 	DockLayout get_current_layout() const { return current_layout; }
 
diff --git a/engine/editor/docks/editor_dock_manager.cpp b/engine/editor/docks/editor_dock_manager.cpp
index da43f144..b0ef6019 100644
--- a/engine/editor/docks/editor_dock_manager.cpp
+++ b/engine/editor/docks/editor_dock_manager.cpp
@@ -30,38 +30,146 @@
 
 #include "editor_dock_manager.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "editor/docks/dock_tab_container.h"
-#include "editor/docks/editor_dock.h"
-#include "editor/editor_node.h"
-#include "editor/editor_string_names.h"
-#include "editor/gui/window_wrapper.h"
-#include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/main/window.h"
-#include "servers/display/display_server.h"
 
-////////////////////////////////////////////////
-////////////////////////////////////////////////
+#include "editor/docks/editor_dock.h"
+#include "editor/editor_node.h"
+#include "editor/editor_string_names.h"
+#include "editor/gui/editor_bottom_panel.h"
+#include "editor/gui/window_wrapper.h"
+#include "editor/settings/editor_settings.h"
+#include "editor/themes/editor_scale.h"
+#include "scene/resources/style_box_flat.h"
 
-void DockSplitContainer::_notification(int p_what) {
+enum class TabStyle {
+	TEXT_ONLY,
+	ICON_ONLY,
+	TEXT_AND_ICON,
+};
+
+static inline Ref<Texture2D> _get_dock_icon(const EditorDock *p_dock, const Callable &p_icon_fetch) {
+	Ref<Texture2D> icon = p_dock->get_dock_icon();
+	if (icon.is_null() && !p_dock->get_icon_name().is_empty()) {
+		icon = p_icon_fetch.call(p_dock->get_icon_name());
+	}
+	return icon;
+}
+
+bool EditorDockDragHint::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
+	return can_drop_dock;
+}
+
+void EditorDockDragHint::drop_data(const Point2 &p_point, const Variant &p_data) {
+	// Drop dock into last spot if not over tabbar.
+	if (drop_tabbar->get_rect().has_point(p_point)) {
+		drop_tabbar->_handle_drop_data("tab_container_tab", p_point, p_data, callable_mp(this, &EditorDockDragHint::_drag_move_tab), callable_mp(this, &EditorDockDragHint::_drag_move_tab_from));
+	} else {
+		dock_manager->_move_dock(dock_manager->_get_dock_tab_dragged(), dock_manager->dock_slots[occupied_slot].container, drop_tabbar->get_tab_count());
+	}
+}
+
+void EditorDockDragHint::_drag_move_tab(int p_from_index, int p_to_index) {
+	dock_manager->_move_dock_tab_index(dock_manager->_get_dock_tab_dragged(), p_to_index, true);
+}
+
+void EditorDockDragHint::_drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index) {
+	dock_manager->_move_dock(dock_manager->_get_dock_tab_dragged(), dock_manager->dock_slots[occupied_slot].container, p_to_index);
+}
+
+void EditorDockDragHint::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	Ref<InputEventMouseMotion> mm = p_event;
+	if (mm.is_valid()) {
+		Point2 pos = mm->get_position();
+
+		// Redraw when inside the tabbar and just exited.
+		if (mouse_inside_tabbar) {
+			queue_redraw();
+		}
+		mouse_inside_tabbar = drop_tabbar->get_rect().has_point(pos);
+	}
+}
+
+void EditorDockDragHint::set_slot(DockConstants::DockSlot p_slot) {
+	occupied_slot = p_slot;
+	drop_tabbar = dock_manager->dock_slots[occupied_slot].container->get_tab_bar();
+}
+
+void EditorDockDragHint::_notification(int p_what) {
 	switch (p_what) {
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/theme")) {
+				dock_drop_highlight->set_corner_radius_all(EDSCALE * EDITOR_GET("interface/theme/corner_radius").operator int());
+				if (mouse_inside) {
+					queue_redraw();
+				}
+			}
+		} break;
+
+		case NOTIFICATION_THEME_CHANGED: {
+			valid_drop_color = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
+		} break;
+
+		case NOTIFICATION_MOUSE_ENTER:
+		case NOTIFICATION_MOUSE_EXIT: {
+			mouse_inside = p_what == NOTIFICATION_MOUSE_ENTER;
+			queue_redraw();
+		} break;
+
+		case NOTIFICATION_DRAG_BEGIN: {
+			EditorDock *dragged_dock = dock_manager->_get_dock_tab_dragged();
+			if (!dragged_dock) {
 				return;
 			}
-			set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
+
+			can_drop_dock = dragged_dock->get_available_layouts() & (EditorDock::DockLayout)EditorDockManager::get_singleton()->dock_slots[occupied_slot].layout;
+
+			dock_drop_highlight->set_border_color(valid_drop_color);
+			dock_drop_highlight->set_bg_color(valid_drop_color * Color(1, 1, 1, 0.1));
+		} break;
+		case NOTIFICATION_DRAG_END: {
+			dock_manager->_dock_drag_stopped();
+			can_drop_dock = false;
+			mouse_inside = false;
+			hide();
+		} break;
+
+		case NOTIFICATION_DRAW: {
+			if (!mouse_inside || !can_drop_dock) {
+				return;
+			}
+
+			// Draw highlights around docks that can be dropped.
+			Rect2 dock_rect = Rect2(Point2(), get_size()).grow(2 * EDSCALE);
+			draw_style_box(dock_drop_highlight, dock_rect);
+
+			// Only display tabbar hint if the mouse is over the tabbar.
+			if (drop_tabbar->get_global_rect().has_point(get_global_mouse_position())) {
+				draw_set_transform(drop_tabbar->get_position()); // The TabBar isn't always on top.
+				drop_tabbar->_draw_tab_drop(get_canvas_item());
+			}
 		} break;
 	}
 }
 
+EditorDockDragHint::EditorDockDragHint() {
+	dock_manager = EditorDockManager::get_singleton();
+
+	set_as_top_level(true);
+	dock_drop_highlight.instantiate();
+	dock_drop_highlight->set_corner_radius_all(EDSCALE * EDITOR_GET("interface/theme/corner_radius").operator int());
+	dock_drop_highlight->set_border_width_all(Math::round(2 * EDSCALE));
+}
+
+////////////////////////////////////////////////
+////////////////////////////////////////////////
+
 void DockSplitContainer::_update_visibility() {
 	if (is_updating) {
 		return;
@@ -128,7 +236,6 @@ DockSplitContainer::DockSplitContainer() {
 	if (EDITOR_GET("interface/touchscreen/enable_touch_optimizations")) {
 		callable_mp((SplitContainer *)this, &SplitContainer::set_touch_dragger_enabled).call_deferred(true);
 	}
-	set_drag_nested_intersections(true);
 }
 
 ////////////////////////////////////////////////
@@ -139,7 +246,7 @@ EditorDock *EditorDockManager::_get_dock_tab_dragged() {
 		return dock_tab_dragged;
 	}
 
-	Dictionary dock_drop_data = EditorNode::get_singleton()->get_viewport()->gui_get_drag_data();
+	Dictionary dock_drop_data = dock_slots[DockConstants::DOCK_SLOT_LEFT_BL].container->get_viewport()->gui_get_drag_data();
 
 	// Check if we are dragging a dock.
 	if (dock_drop_data.get("type", "").operator String() != "tab") {
@@ -152,22 +259,22 @@ EditorDock *EditorDockManager::_get_dock_tab_dragged() {
 		if (!source_tab_bar) {
 			return nullptr;
 		}
-		HBoxContainer *parent = Object::cast_to<HBoxContainer>(source_tab_bar->get_parent()); // The internal container.
-		if (!parent) {
-			return nullptr;
-		}
-		DockTabContainer *source_tab_container = Object::cast_to<DockTabContainer>(parent->get_parent());
+
+		TabContainer *source_tab_container = Object::cast_to<TabContainer>(source_tab_bar->get_parent());
 		if (!source_tab_container) {
 			return nullptr;
 		}
 
-		dock_tab_dragged = source_tab_container->get_dock(dock_drop_data["tab_index"]);
+		dock_tab_dragged = Object::cast_to<EditorDock>(source_tab_container->get_tab_control(dock_drop_data["tab_index"]));
 		if (!dock_tab_dragged) {
 			return nullptr;
 		}
 
-		for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-			dock_slots[i]->show_drag_hint();
+		for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+			if (dock_slots[i].container->is_visible_in_tree()) {
+				dock_slots[i].drag_hint->set_rect(dock_slots[i].container->get_global_rect());
+				dock_slots[i].drag_hint->show();
+			}
 		}
 
 		return dock_tab_dragged;
@@ -183,6 +290,26 @@ void EditorDockManager::_dock_split_dragged(int p_offset) {
 	EditorNode::get_singleton()->save_editor_layout_delayed();
 }
 
+void EditorDockManager::_dock_container_popup(int p_tab_idx, TabContainer *p_dock_container) {
+	EditorDock *hovered_dock = Object::cast_to<EditorDock>(p_dock_container->get_tab_control(p_tab_idx));
+	if (hovered_dock == nullptr) {
+		return;
+	}
+
+	// Right click context menu.
+	dock_context_popup->set_dock(hovered_dock);
+	dock_context_popup->set_position(p_dock_container->get_tab_bar()->get_screen_position() + p_dock_container->get_tab_bar()->get_local_mouse_position());
+	dock_context_popup->popup();
+}
+
+void EditorDockManager::_dock_container_update_visibility(TabContainer *p_dock_container) {
+	if (!docks_visible) {
+		return;
+	}
+	// Hide the dock container if there are no tabs.
+	p_dock_container->set_visible(p_dock_container->get_tab_count() > 0);
+}
+
 void EditorDockManager::_update_layout() {
 	if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) {
 		return;
@@ -199,7 +326,7 @@ void EditorDockManager::update_docks_menu() {
 	const Ref<Texture2D> default_icon = docks_menu->get_editor_theme_icon(SNAME("Window"));
 	const Color closed_icon_color_mod = Color(1, 1, 1, 0.5);
 
-	bool global_menu = !bool(EDITOR_GET("interface/editor/appearance/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
 	bool dark_mode = DisplayServer::get_singleton()->is_dark_mode_supported() && DisplayServer::get_singleton()->is_dark_mode();
 	int icon_max_width = EditorNode::get_singleton()->get_editor_theme()->get_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 
@@ -219,13 +346,13 @@ void EditorDockManager::update_docks_menu() {
 		}
 		docks_menu->set_item_icon_max_width(id, icon_max_width);
 
-		const Ref<Texture2D> icon = dock->get_effective_icon(icon_fetch);
+		const Ref<Texture2D> icon = _get_dock_icon(dock, icon_fetch);
 		docks_menu->set_item_icon(id, icon.is_valid() ? icon : default_icon);
 		if (!dock->is_open) {
 			docks_menu->set_item_icon_modulate(id, closed_icon_color_mod);
-			docks_menu->set_item_tooltip(id, vformat(TTR("Open the %s dock."), TTR(dock->get_display_title())));
+			docks_menu->set_item_tooltip(id, vformat(TTR("Open the %s dock."), dock->get_display_title()));
 		} else {
-			docks_menu->set_item_tooltip(id, vformat(TTR("Focus on the %s dock."), TTR(dock->get_display_title())));
+			docks_menu->set_item_tooltip(id, vformat(TTR("Focus on the %s dock."), dock->get_display_title()));
 		}
 		docks_menu_docks.push_back(dock);
 		id++;
@@ -249,8 +376,9 @@ void EditorDockManager::_window_close_request(WindowWrapper *p_wrapper) {
 	EditorDock *dock = _close_window(p_wrapper);
 	ERR_FAIL_COND(!all_docks.has(dock));
 
-	if (dock->dock_slot_index != EditorDock::DOCK_SLOT_NONE) {
+	if (dock->dock_slot_index != DockConstants::DOCK_SLOT_NONE) {
 		dock->is_open = false;
+		open_dock(dock);
 		focus_dock(dock);
 	} else {
 		close_dock(dock);
@@ -319,6 +447,23 @@ void EditorDockManager::_restore_dock_to_saved_window(EditorDock *p_dock, const
 			p_window_dump.get("window_screen_rect", Rect2i()));
 }
 
+void EditorDockManager::_move_dock_tab_index(EditorDock *p_dock, int p_tab_index, bool p_set_current) {
+	TabContainer *dock_tab_container = Object::cast_to<TabContainer>(p_dock->get_parent());
+	if (!dock_tab_container) {
+		return;
+	}
+
+	dock_tab_container->set_block_signals(true);
+	int target_index = CLAMP(p_tab_index, 0, dock_tab_container->get_tab_count() - 1);
+	dock_tab_container->move_child(p_dock, dock_tab_container->get_tab_control(target_index)->get_index(false));
+	p_dock->previous_tab_index = target_index;
+
+	if (p_set_current) {
+		dock_tab_container->set_current_tab(target_index);
+	}
+	dock_tab_container->set_block_signals(false);
+}
+
 void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_tab_index, bool p_set_current) {
 	ERR_FAIL_NULL(p_dock);
 	ERR_FAIL_COND_MSG(!all_docks.has(p_dock), vformat("Cannot move unknown dock '%s'.", p_dock->get_display_title()));
@@ -327,7 +472,7 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
 	if (parent == p_target) {
 		if (parent && p_tab_index >= 0) {
 			// Only change the tab index.
-			p_dock->set_tab_index(p_tab_index, p_set_current);
+			_move_dock_tab_index(p_dock, p_tab_index, p_set_current);
 		}
 		return;
 	}
@@ -337,20 +482,15 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
 		if (p_dock->dock_window) {
 			_close_window(p_dock->dock_window);
 		} else {
-			DockTabContainer *parent_tabs = Object::cast_to<DockTabContainer>(parent);
+			TabContainer *parent_tabs = Object::cast_to<TabContainer>(parent);
 			if (parent_tabs) {
 				p_dock->previous_tab_index = parent_tabs->get_tab_idx_from_control(p_dock);
-
-				// Swap to previous tab when closing current tab.
-				if (parent_tabs->get_current_tab() == p_dock->previous_tab_index && parent_tabs->get_previous_tab() != -1) {
-					parent_tabs->set_current_tab(parent_tabs->get_previous_tab());
-				}
 			}
 			parent->set_block_signals(true);
 			parent->remove_child(p_dock);
 			parent->set_block_signals(false);
 			if (parent_tabs) {
-				parent_tabs->update_visibility();
+				_dock_container_update_visibility(parent_tabs);
 			}
 		}
 	}
@@ -360,16 +500,13 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
 		return;
 	}
 
-	// Prevent extra visibility signals from firing.
-	p_dock->hide();
-
-	DockTabContainer *dock_tab_container = Object::cast_to<DockTabContainer>(p_target);
 	if (p_target != closed_dock_parent) {
-		if (dock_tab_container->layout != p_dock->current_layout) {
-			p_dock->update_layout(dock_tab_container->layout);
-			p_dock->current_layout = dock_tab_container->layout;
+		EditorDock::DockLayout layout = p_target->get_meta("dock_layout");
+		if (layout != p_dock->current_layout) {
+			p_dock->update_layout(layout);
+			p_dock->current_layout = layout;
 		}
-		p_dock->dock_slot_index = dock_tab_container->dock_slot;
+		p_dock->dock_slot_index = p_target->get_meta("dock_slot");
 	}
 
 	// Add dock to its new parent, at the given tab index.
@@ -377,14 +514,15 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
 	p_target->add_child(p_dock);
 	p_target->set_block_signals(false);
 
+	TabContainer *dock_tab_container = Object::cast_to<TabContainer>(p_target);
 	if (dock_tab_container) {
 		if (dock_tab_container->is_inside_tree()) {
-			p_dock->update_tab_style();
+			_update_tab_style(p_dock);
 		}
 		if (p_tab_index >= 0) {
-			p_dock->set_tab_index(p_tab_index, p_set_current);
+			_move_dock_tab_index(p_dock, p_tab_index, p_set_current);
 		}
-		dock_tab_container->update_visibility();
+		_dock_container_update_visibility(dock_tab_container);
 	}
 }
 
@@ -399,7 +537,7 @@ void EditorDockManager::_update_dirty_dock_tabs() {
 	bool update_menu = false;
 	for (EditorDock *dock : dirty_docks) {
 		update_menu = update_menu || dock->global;
-		dock->update_tab_style();
+		_update_tab_style(dock);
 	}
 	dirty_docks.clear();
 
@@ -408,10 +546,85 @@ void EditorDockManager::_update_dirty_dock_tabs() {
 	}
 }
 
+void EditorDockManager::_update_tab_style(EditorDock *p_dock) {
+	if (!p_dock->enabled || !p_dock->is_open) {
+		return; // Disabled by feature profile or manually closed by user.
+	}
+	if (p_dock->dock_window) {
+		return; // Floating.
+	}
+
+	TabContainer *tab_container = get_dock_tab_container(p_dock);
+	ERR_FAIL_NULL(tab_container);
+
+	int index = tab_container->get_tab_idx_from_control(p_dock);
+	ERR_FAIL_COND(index == -1);
+
+	tab_container->get_tab_bar()->set_font_color_override_all(index, p_dock->title_color);
+
+	const TabStyle style = (tab_container == EditorNode::get_bottom_panel())
+			? (TabStyle)EDITOR_GET("interface/editor/bottom_dock_tab_style").operator int()
+			: (TabStyle)EDITOR_GET("interface/editor/dock_tab_style").operator int();
+
+	const Ref<Texture2D> icon = _get_dock_icon(p_dock, callable_mp((Control *)tab_container, &Control::get_editor_theme_icon));
+	bool assign_icon = p_dock->force_show_icon;
+	String tooltip;
+	switch (style) {
+		case TabStyle::TEXT_ONLY: {
+			tab_container->set_tab_title(index, p_dock->get_display_title());
+		} break;
+		case TabStyle::ICON_ONLY: {
+			tab_container->set_tab_title(index, icon.is_valid() ? String() : p_dock->get_display_title());
+			tooltip = TTR(p_dock->get_display_title());
+			assign_icon = true;
+		} break;
+		case TabStyle::TEXT_AND_ICON: {
+			tab_container->set_tab_title(index, p_dock->get_display_title());
+			assign_icon = true;
+		} break;
+	}
+
+	if (p_dock->shortcut.is_valid() && p_dock->shortcut->has_valid_event()) {
+		tooltip += (tooltip.is_empty() ? "" : "\n") + TTR(p_dock->shortcut->get_name()) + " (" + p_dock->shortcut->get_as_text() + ")";
+	}
+	tab_container->set_tab_tooltip(index, tooltip);
+
+	if (assign_icon) {
+		tab_container->set_tab_icon(index, icon);
+	} else {
+		tab_container->set_tab_icon(index, Ref<Texture2D>());
+	}
+}
+
 void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section) const {
 	// Save docks by dock slot.
-	for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-		dock_slots[i]->save_docks_to_config(p_layout, p_section);
+	for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+		const DockSlot &dock_slot = dock_slots[i];
+
+		PackedStringArray names;
+		names.reserve_exact(dock_slot.container->get_tab_count());
+		for (int j = 0; j < dock_slot.container->get_tab_count(); j++) {
+			const String name = Object::cast_to<EditorDock>(dock_slot.container->get_tab_control(j))->get_effective_layout_key();
+			names.append(name);
+		}
+
+		const String config_key = "dock_" + itos(i + 1);
+		if (p_layout->has_section_key(p_section, config_key)) {
+			p_layout->erase_section_key(p_section, config_key);
+		}
+
+		if (!names.is_empty()) {
+			p_layout->set_value(p_section, config_key, String(",").join(names));
+		}
+
+		const String tab_key = config_key + "_selected_tab_idx";
+
+		int selected_tab_idx = dock_slots[i].container->get_current_tab();
+		if (selected_tab_idx >= 0) {
+			p_layout->set_value(p_section, tab_key, selected_tab_idx);
+		} else if (p_layout->has_section_key(p_section, tab_key)) {
+			p_layout->erase_section_key(p_section, tab_key);
+		}
 	}
 
 	// Clear the special dock slot for docks without default slots (index -1 = dock_0).
@@ -440,7 +653,7 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
 
 		// Append to regular dock section so we know where to restore it to.
 		int dock_slot_id = dock->dock_slot_index;
-		String config_key = DockTabContainer::get_config_key(dock_slot_id);
+		String config_key = "dock_" + itos(dock_slot_id + 1);
 
 		String names = p_layout->get_value(p_section, config_key, "");
 		if (names.is_empty()) {
@@ -452,6 +665,7 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
 	}
 	p_layout->set_value(p_section, "dock_floating", floating_docks_dump);
 
+	// Save closed docks.
 	Array closed_docks_dump;
 	for (const EditorDock *dock : all_docks) {
 		const String section_name = p_section + "/" + dock->get_effective_layout_key();
@@ -461,14 +675,13 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
 			continue;
 		}
 
-		// Save closed docks.
 		const String name = dock->get_effective_layout_key();
-		if (!dock->transient) {
+		if (!dock->is_open && !dock->transient) {
 			closed_docks_dump.push_back(name);
 		}
 
 		int dock_slot_id = dock->dock_slot_index;
-		String config_key = DockTabContainer::get_config_key(dock_slot_id);
+		String config_key = "dock_" + itos(dock_slot_id + 1);
 
 		String names = p_layout->get_value(p_section, config_key, "");
 		if (names.is_empty()) {
@@ -512,13 +725,13 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 	}
 
 	// Load docks by slot. Index -1 is for docks that have no slot.
-	for (int i = -1; i < EditorDock::DOCK_SLOT_MAX; i++) {
-		const String key = DockTabContainer::get_config_key(i);
-		if (!p_layout->has_section_key(p_section, key)) {
+	for (int i = -1; i < DockConstants::DOCK_SLOT_MAX; i++) {
+		if (!p_layout->has_section_key(p_section, "dock_" + itos(i + 1))) {
 			continue;
 		}
 
-		Vector<String> names = String(p_layout->get_value(p_section, key)).split(",");
+		Vector<String> names = String(p_layout->get_value(p_section, "dock_" + itos(i + 1))).split(",");
+
 		for (int j = names.size() - 1; j >= 0; j--) {
 			const String &name = names[j];
 			const String section_name = p_section + "/" + name;
@@ -529,7 +742,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 			EditorDock *dock = dock_map[name];
 
 			if (!dock->enabled) {
-				// Don't open disabled docks.
+				// Don't is_open disabled docks.
 				dock->load_layout_from_config(p_layout, section_name);
 				continue;
 			}
@@ -544,7 +757,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 					_move_dock(dock, closed_dock_parent);
 				} else {
 					dock->is_open = true;
-					_move_dock(dock, dock_slots[i], 0, false);
+					_move_dock(dock, dock_slots[i].container, 0);
 				}
 			}
 			dock->load_layout_from_config(p_layout, section_name);
@@ -555,9 +768,24 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 	}
 
 	// Set the selected tabs.
-	for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-		int selected_tab_idx = p_layout->get_value(p_section, DockTabContainer::get_config_key(i) + "_selected_tab_idx", -1);
-		dock_slots[i]->load_selected_tab(selected_tab_idx);
+	for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+		const DockSlot &dock_slot = dock_slots[i];
+
+		int selected_tab_idx = p_layout->get_value(p_section, "dock_" + itos(i + 1) + "_selected_tab_idx", -1);
+		if (selected_tab_idx <= 0 || selected_tab_idx >= dock_slot.container->get_tab_count()) {
+			if (i == DockConstants::DOCK_SLOT_BOTTOM) {
+				dock_slot.container->set_current_tab(-1);
+			}
+			continue;
+		}
+
+		EditorDock *selected_dock = Object::cast_to<EditorDock>(dock_slot.container->get_tab_control(selected_tab_idx));
+		if (!selected_dock) {
+			continue;
+		}
+		dock_slot.container->set_block_signals(true);
+		dock_slot.container->set_current_tab(selected_tab_idx);
+		dock_slot.container->set_block_signals(false);
 	}
 
 	// Load SplitContainer offsets.
@@ -605,11 +833,13 @@ void EditorDockManager::close_dock(EditorDock *p_dock) {
 	}
 
 	p_dock->is_open = false;
-	DockTabContainer *parent_container = p_dock->get_parent_container();
-	if (parent_container) {
-		parent_container->dock_closed(p_dock);
-	}
 
+	EditorBottomPanel *bottom_panel = EditorNode::get_bottom_panel();
+	if (get_dock_tab_container(p_dock) == bottom_panel && bottom_panel->get_current_tab_control() == p_dock) {
+		bottom_panel->hide_bottom_panel();
+	}
+	// Hide before moving to remove inconsistent signals.
+	p_dock->hide();
 	_move_dock(p_dock, closed_dock_parent);
 
 	_update_layout();
@@ -630,14 +860,13 @@ void EditorDockManager::open_dock(EditorDock *p_dock, bool p_set_current) {
 	p_dock->is_open = true;
 
 	// Open dock to its previous location.
-	if (p_dock->dock_slot_index != EditorDock::DOCK_SLOT_NONE) {
-		DockTabContainer *slot = dock_slots[p_dock->dock_slot_index];
+	if (p_dock->dock_slot_index != DockConstants::DOCK_SLOT_NONE) {
+		TabContainer *slot = dock_slots[p_dock->dock_slot_index].container;
 		int tab_index = p_dock->previous_tab_index;
 		if (tab_index < 0) {
 			tab_index = slot->get_tab_count();
 		}
-
-		_move_dock(p_dock, slot, tab_index, p_set_current && slot->can_switch_dock());
+		_move_dock(p_dock, slot, tab_index, p_set_current);
 	} else {
 		_open_dock_in_window(p_dock, true, true);
 		return;
@@ -655,6 +884,10 @@ void EditorDockManager::make_dock_floating(EditorDock *p_dock) {
 	}
 }
 
+TabContainer *EditorDockManager::get_dock_tab_container(Control *p_dock) const {
+	return Object::cast_to<TabContainer>(p_dock->get_parent());
+}
+
 void EditorDockManager::_make_dock_visible(EditorDock *p_dock, bool p_grab_focus) {
 	if (p_dock->dock_window) {
 		if (p_grab_focus) {
@@ -663,16 +896,20 @@ void EditorDockManager::_make_dock_visible(EditorDock *p_dock, bool p_grab_focus
 		return;
 	}
 
-	DockTabContainer *tab_container = p_dock->get_parent_container();
-	if (!tab_container || !tab_container->can_switch_dock()) {
+	if (p_dock->get_parent() == EditorNode::get_bottom_panel()) {
+		if (EditorNode::get_bottom_panel()->is_locked()) {
+			return;
+		}
+	} else if (!docks_visible) {
 		return;
 	}
 
-	if (p_grab_focus) {
-		tab_container->get_tab_bar()->grab_focus();
-	}
+	TabContainer *tab_container = get_dock_tab_container(p_dock);
+	if (tab_container) {
+		if (p_grab_focus) {
+			tab_container->get_tab_bar()->grab_focus();
+		}
 
-	if (!p_dock->is_visible_in_tree()) {
 		int tab_index = tab_container->get_tab_idx_from_control(p_dock);
 		tab_container->set_current_tab(tab_index);
 	}
@@ -687,7 +924,6 @@ void EditorDockManager::focus_dock(EditorDock *p_dock) {
 	}
 
 	if (!p_dock->is_open) {
-		p_dock->emit_signal("opened");
 		open_dock(p_dock, false);
 	}
 
@@ -729,9 +965,10 @@ void EditorDockManager::set_docks_visible(bool p_show) {
 		return;
 	}
 	docks_visible = p_show;
-	for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
+	for (int i = 0; i < DockConstants::DOCK_SLOT_BOTTOM; i++) {
 		// Show and hide in reverse order due to the SplitContainer prioritizing the last split offset.
-		dock_slots[docks_visible ? i : EditorDock::DOCK_SLOT_MAX - i - 1]->update_visibility();
+		TabContainer *container = dock_slots[docks_visible ? i : DockConstants::DOCK_SLOT_BOTTOM - i - 1].container;
+		container->set_visible(docks_visible && container->get_tab_count() > 0);
 	}
 	_update_layout();
 }
@@ -742,13 +979,14 @@ bool EditorDockManager::are_docks_visible() const {
 
 void EditorDockManager::update_tab_styles() {
 	for (EditorDock *dock : all_docks) {
-		dock->update_tab_style();
+		_update_tab_style(dock);
 	}
 }
 
 void EditorDockManager::set_tab_icon_max_width(int p_max_width) {
-	for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-		dock_slots[i]->add_theme_constant_override(SNAME("icon_max_width"), p_max_width);
+	for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+		TabContainer *tab_container = dock_slots[i].container;
+		tab_container->add_theme_constant_override(SNAME("icon_max_width"), p_max_width);
 	}
 }
 
@@ -762,13 +1000,40 @@ void EditorDockManager::set_hsplit(DockSplitContainer *p_split) {
 	p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
 }
 
-void EditorDockManager::register_dock_slot(DockTabContainer *p_tab_container) {
+void EditorDockManager::register_dock_slot(DockConstants::DockSlot p_dock_slot, TabContainer *p_tab_container, DockConstants::DockLayout p_layout) {
 	ERR_FAIL_NULL(p_tab_container);
-	dock_slots[p_tab_container->dock_slot] = p_tab_container;
+	ERR_FAIL_INDEX(p_dock_slot, DockConstants::DOCK_SLOT_MAX);
 
-	p_tab_container->set_dock_context_popup(dock_context_popup);
+	DockSlot slot;
+	slot.layout = p_layout;
+
+	slot.container = p_tab_container;
+	p_tab_container->set_popup(dock_context_popup);
+	p_tab_container->connect("pre_popup_pressed", callable_mp(dock_context_popup, &DockContextPopup::select_current_dock_in_dock_slot).bind(p_dock_slot));
+	p_tab_container->get_tab_bar()->set_switch_on_release(true);
+	p_tab_container->get_tab_bar()->connect("tab_rmb_clicked", callable_mp(this, &EditorDockManager::_dock_container_popup).bind(p_tab_container));
+	p_tab_container->set_drag_to_rearrange_enabled(true);
+	p_tab_container->set_tabs_rearrange_group(1);
 	p_tab_container->connect("tab_changed", callable_mp(this, &EditorDockManager::_update_layout).unbind(1));
 	p_tab_container->connect("active_tab_rearranged", callable_mp(this, &EditorDockManager::_update_layout).unbind(1));
+	p_tab_container->connect("child_order_changed", callable_mp(this, &EditorDockManager::_dock_container_update_visibility).bind(p_tab_container));
+	p_tab_container->hide();
+	p_tab_container->set_meta("dock_slot", p_dock_slot);
+	p_tab_container->set_meta("dock_layout", p_layout);
+
+	if (p_layout == DockConstants::DOCK_LAYOUT_VERTICAL) {
+		p_tab_container->set_custom_minimum_size(Size2(170, 0) * EDSCALE);
+		p_tab_container->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+		p_tab_container->set_use_hidden_tabs_for_min_size(true);
+	}
+
+	// Create dock dragging hint.
+	slot.drag_hint = memnew(EditorDockDragHint);
+	slot.drag_hint->hide();
+	EditorNode::get_singleton()->get_gui_base()->add_child(slot.drag_hint);
+
+	dock_slots[p_dock_slot] = slot;
+	slot.drag_hint->set_slot(p_dock_slot);
 }
 
 int EditorDockManager::get_vsplit_count() const {
@@ -823,33 +1088,24 @@ void DockContextPopup::_notification(int p_what) {
 	}
 }
 
-void DockContextPopup::_slot_clicked(int p_slot) {
-	DockTabContainer *target_tab_container = dock_manager->dock_slots[p_slot];
-	if (context_dock->get_parent_container() != target_tab_container) {
-		dock_manager->_move_dock(context_dock, target_tab_container, target_tab_container->get_tab_count());
-		dock_manager->_update_layout();
-		hide();
-	}
-}
-
 void DockContextPopup::_tab_move_left() {
-	TabContainer *tab_container = context_dock->get_parent_container();
+	TabContainer *tab_container = dock_manager->get_dock_tab_container(context_dock);
 	if (!tab_container) {
 		return;
 	}
 	int new_index = tab_container->get_tab_idx_from_control(context_dock) - 1;
-	context_dock->set_tab_index(new_index, true);
+	dock_manager->_move_dock(context_dock, tab_container, new_index);
 	dock_manager->_update_layout();
 	dock_select->queue_redraw();
 }
 
 void DockContextPopup::_tab_move_right() {
-	TabContainer *tab_container = context_dock->get_parent_container();
+	TabContainer *tab_container = dock_manager->get_dock_tab_container(context_dock);
 	if (!tab_container) {
 		return;
 	}
 	int new_index = tab_container->get_tab_idx_from_control(context_dock) + 1;
-	context_dock->set_tab_index(new_index, true);
+	dock_manager->_move_dock(context_dock, tab_container, new_index);
 	dock_manager->_update_layout();
 	dock_select->queue_redraw();
 }
@@ -865,7 +1121,153 @@ void DockContextPopup::_float_dock() {
 	dock_manager->_open_dock_in_window(context_dock);
 }
 
+bool DockContextPopup::_is_slot_available(int p_slot) const {
+	return context_dock->available_layouts & (EditorDock::DockLayout)EditorDockManager::get_singleton()->dock_slots[p_slot].layout;
+}
+
+void DockContextPopup::_dock_select_input(const Ref<InputEvent> &p_input) {
+	Ref<InputEventMouse> me = p_input;
+
+	if (me.is_valid()) {
+		Vector2 point = me->get_position();
+
+		int over_dock_slot = -1;
+		for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+			if (dock_select_rects[i].has_point(point)) {
+				over_dock_slot = i;
+				break;
+			}
+		}
+
+		if (over_dock_slot != dock_select_rect_over_idx) {
+			dock_select->queue_redraw();
+			dock_select_rect_over_idx = over_dock_slot;
+		}
+
+		if (over_dock_slot == -1) {
+			return;
+		}
+
+		Ref<InputEventMouseButton> mb = me;
+		TabContainer *target_tab_container = dock_manager->dock_slots[over_dock_slot].container;
+
+		if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && mb->is_pressed()) {
+			if (dock_manager->get_dock_tab_container(context_dock) != target_tab_container && _is_slot_available(over_dock_slot)) {
+				dock_manager->_move_dock(context_dock, target_tab_container, target_tab_container->get_tab_count());
+				dock_manager->_update_layout();
+				hide();
+			}
+		}
+	}
+}
+
+void DockContextPopup::_dock_select_mouse_exited() {
+	dock_select_rect_over_idx = -1;
+	dock_select->queue_redraw();
+}
+
+void DockContextPopup::_dock_select_draw() {
+	Color used_dock_color = Color(0.6, 0.6, 0.6, 0.8);
+	Color hovered_dock_color = Color(0.8, 0.8, 0.8, 0.8);
+	Color tab_selected_color = dock_select->get_theme_color(SNAME("mono_color"), EditorStringName(Editor));
+	Color tab_unselected_color = used_dock_color;
+	Color unused_dock_color = used_dock_color;
+	unused_dock_color.a = 0.4;
+	Color unusable_dock_color = unused_dock_color;
+	unusable_dock_color.a = 0.1;
+
+	// Update sizes.
+	Size2 dock_size = dock_select->get_size();
+	dock_size.x /= 6.0;
+	dock_size.y /= 2.0;
+
+	real_t center_panel_width = dock_size.x * 2.0;
+	Rect2 center_panel_rect(center_panel_width, 0, center_panel_width, dock_size.y);
+
+	if (dock_select->is_layout_rtl()) {
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_UR] = Rect2(Point2(), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_BR] = Rect2(Point2(0, dock_size.y), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_UL] = Rect2(Point2(dock_size.x, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_BL] = Rect2(dock_size, dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_UR] = Rect2(Point2(dock_size.x * 4, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_BR] = Rect2(Point2(dock_size.x * 4, dock_size.y), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_UL] = Rect2(Point2(dock_size.x * 5, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_BL] = Rect2(Point2(dock_size.x * 5, dock_size.y), dock_size);
+	} else {
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_UL] = Rect2(Point2(), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_BL] = Rect2(Point2(0, dock_size.y), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_UR] = Rect2(Point2(dock_size.x, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_LEFT_BR] = Rect2(dock_size, dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_UL] = Rect2(Point2(dock_size.x * 4, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_BL] = Rect2(Point2(dock_size.x * 4, dock_size.y), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_UR] = Rect2(Point2(dock_size.x * 5, 0), dock_size);
+		dock_select_rects[DockConstants::DOCK_SLOT_RIGHT_BR] = Rect2(Point2(dock_size.x * 5, dock_size.y), dock_size);
+	}
+	dock_select_rects[DockConstants::DOCK_SLOT_BOTTOM] = Rect2(center_panel_width, dock_size.y, center_panel_width, dock_size.y);
+
+	int rtl_dir = dock_select->is_layout_rtl() ? -1 : 1;
+	real_t tab_height = 3.0 * EDSCALE;
+	real_t tab_spacing = 1.0 * EDSCALE;
+	real_t dock_spacing = 2.0 * EDSCALE;
+	real_t dock_top_spacing = tab_height + dock_spacing;
+
+	TabContainer *context_tab_container = dock_manager->get_dock_tab_container(context_dock);
+	int context_tab_index = -1;
+	if (context_tab_container && context_tab_container->get_tab_count() > 0) {
+		context_tab_index = context_tab_container->get_tab_idx_from_control(context_dock);
+	}
+
+	// Draw center panel.
+	Rect2 center_panel_draw_rect = center_panel_rect.grow_individual(-dock_spacing, -dock_top_spacing, -dock_spacing, -dock_spacing);
+	dock_select->draw_rect(center_panel_draw_rect, unusable_dock_color);
+
+	// Draw all dock slots.
+	for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
+		int max_tabs = (i == DockConstants::DOCK_SLOT_BOTTOM) ? 6 : 3;
+		const EditorDockManager::DockSlot &dock_slot = dock_manager->dock_slots[i];
+
+		Rect2 dock_slot_draw_rect = dock_select_rects[i].grow_individual(-dock_spacing, -dock_top_spacing, -dock_spacing, -dock_spacing);
+		real_t tab_width = Math::round(dock_slot_draw_rect.size.width / max_tabs);
+		Rect2 tab_draw_rect = Rect2(dock_slot_draw_rect.position.x, dock_select_rects[i].position.y, tab_width - tab_spacing, tab_height);
+
+		real_t max_width = tab_width * max_tabs;
+		// Tabs may not fit perfectly, so they need to be re-centered.
+		if (max_width > dock_slot_draw_rect.size.x) {
+			tab_draw_rect.position.x -= int(max_width - dock_slot_draw_rect.size.x) / 2 * rtl_dir;
+		}
+		if (dock_select->is_layout_rtl()) {
+			tab_draw_rect.position.x += dock_slot_draw_rect.size.x - tab_draw_rect.size.x;
+		}
+
+		int tabs_to_draw = MIN(max_tabs, dock_slot.container->get_tab_count());
+		bool is_context_dock = context_tab_container == dock_slot.container;
+		if (i == context_dock->dock_slot_index) {
+			dock_select->draw_rect(dock_slot_draw_rect, tab_selected_color);
+		} else if (!_is_slot_available(i)) {
+			dock_select->draw_rect(dock_slot_draw_rect, unusable_dock_color);
+		} else if (i == dock_select_rect_over_idx) {
+			dock_select->draw_rect(dock_slot_draw_rect, hovered_dock_color);
+		} else if (tabs_to_draw == 0) {
+			dock_select->draw_rect(dock_slot_draw_rect, unused_dock_color);
+		} else {
+			dock_select->draw_rect(dock_slot_draw_rect, used_dock_color);
+		}
+
+		// Draw tabs above each used dock slot.
+		for (int j = 0; j < tabs_to_draw; j++) {
+			Color tab_color = tab_unselected_color;
+			if (is_context_dock && context_tab_index == j) {
+				tab_color = tab_selected_color;
+			}
+			Rect2 tabj_draw_rect = tab_draw_rect;
+			tabj_draw_rect.position.x += tab_width * j * rtl_dir;
+			dock_select->draw_rect(tabj_draw_rect, tab_color);
+		}
+	}
+}
+
 void DockContextPopup::_update_buttons() {
+	TabContainer *context_tab_container = dock_manager->get_dock_tab_container(context_dock);
 	if (context_dock->global || context_dock->closable) {
 		close_button->set_tooltip_text(TTRC("Close this dock."));
 		close_button->set_disabled(false);
@@ -886,7 +1288,6 @@ void DockContextPopup::_update_buttons() {
 	// Update tab move buttons.
 	tab_move_left_button->set_disabled(true);
 	tab_move_right_button->set_disabled(true);
-	TabContainer *context_tab_container = context_dock->get_parent_container();
 	if (context_tab_container && context_tab_container->get_tab_count() > 0) {
 		int context_tab_index = context_tab_container->get_tab_idx_from_control(context_dock);
 		tab_move_left_button->set_disabled(context_tab_index == 0);
@@ -895,12 +1296,20 @@ void DockContextPopup::_update_buttons() {
 	reset_size();
 }
 
+void DockContextPopup::select_current_dock_in_dock_slot(int p_dock_slot) {
+	context_dock = Object::cast_to<EditorDock>(dock_manager->dock_slots[p_dock_slot].container->get_current_tab_control());
+	_update_buttons();
+}
+
 void DockContextPopup::set_dock(EditorDock *p_dock) {
 	context_dock = p_dock;
-	dock_select->context_dock = p_dock;
 	_update_buttons();
 }
 
+EditorDock *DockContextPopup::get_dock() const {
+	return context_dock;
+}
+
 void DockContextPopup::docks_updated() {
 	if (!is_visible()) {
 		return;
@@ -937,13 +1346,13 @@ DockContextPopup::DockContextPopup() {
 	header_hb->add_child(tab_move_right_button);
 	dock_select_popup_vb->add_child(header_hb);
 
-	dock_select = memnew(DockSlotGrid);
+	dock_select = memnew(Control);
+	dock_select->set_custom_minimum_size(Size2(128, 64) * EDSCALE);
+	dock_select->connect(SceneStringName(gui_input), callable_mp(this, &DockContextPopup::_dock_select_input));
+	dock_select->connect(SceneStringName(draw), callable_mp(this, &DockContextPopup::_dock_select_draw));
+	dock_select->connect(SceneStringName(mouse_exited), callable_mp(this, &DockContextPopup::_dock_select_mouse_exited));
+	dock_select->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	dock_select_popup_vb->add_child(dock_select);
-	dock_select->connect("slot_clicked", callable_mp(this, &DockContextPopup::_slot_clicked));
-
-	Control *separator = memnew(Control);
-	separator->set_custom_minimum_size(Vector2(0, 8 * EDSCALE));
-	dock_select_popup_vb->add_child(separator);
 
 	make_float_button = memnew(Button);
 	make_float_button->set_text(TTRC("Make Floating"));
@@ -972,163 +1381,13 @@ void DockShortcutHandler::shortcut_input(const Ref<InputEvent> &p_event) {
 	for (EditorDock *dock : EditorDockManager::get_singleton()->all_docks) {
 		const Ref<Shortcut> &dock_shortcut = dock->get_dock_shortcut();
 		if (dock_shortcut.is_valid() && dock_shortcut->matches_event(p_event)) {
-			bool was_visible = dock->is_visible();
-			if (!dock->transient || dock->is_open) {
+			if (dock->is_visible() && dock->get_parent() == EditorNode::get_bottom_panel()) {
+				EditorNode::get_bottom_panel()->hide_bottom_panel();
+			} else if (!dock->transient || dock->is_open) {
 				EditorDockManager::get_singleton()->focus_dock(dock);
 			}
-			DockTabContainer *dock_container = dock->get_parent_container();
-			if (dock_container) {
-				dock_container->dock_focused(dock, was_visible);
-			}
 			get_viewport()->set_input_as_handled();
 			break;
 		}
 	}
 }
-
-void DockSlotGrid::_update_rect_cache() {
-	for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-		Rect2 rect = EditorDockManager::get_singleton()->dock_slots[i]->grid_rect;
-		if (is_layout_rtl()) {
-			rect.position.x = GRID_SIZE.x - rect.position.x - rect.size.x;
-		}
-		rect.position = rect.position * CELL_SIZE * EDSCALE + (rect.position + Vector2i(0, 1)) * MARGINS * EDSCALE;
-		rect.size = rect.size * CELL_SIZE * EDSCALE + (rect.size - Vector2i(1, 1)) * MARGINS * EDSCALE;
-		rect_cache[i] = rect;
-	}
-
-	// Temporarily hard-coded, until main screen is registered as a slot.
-	{
-		Rect2 rect = Rect2i(2, 0, 4, 4);
-		if (is_layout_rtl()) {
-			rect.position.x = GRID_SIZE.x - rect.position.x - rect.size.x;
-		}
-		rect.position = rect.position * CELL_SIZE * EDSCALE + (rect.position + Vector2i(0, 1)) * MARGINS * EDSCALE;
-		rect.size = rect.size * CELL_SIZE * EDSCALE + (rect.size - Vector2i(1, 1)) * MARGINS * EDSCALE;
-		main_screen_rect = rect;
-	}
-}
-
-void DockSlotGrid::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("slot_clicked", PropertyInfo(Variant::INT, "slot")));
-}
-
-void DockSlotGrid::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			rect_cache_dirty = true;
-		} break;
-
-		case NOTIFICATION_DRAW: {
-			if (rect_cache_dirty) {
-				_update_rect_cache();
-				rect_cache_dirty = false;
-			}
-			Color used_dock_color = Color(0.6, 0.6, 0.6, 0.8);
-			Color hovered_dock_color = Color(0.8, 0.8, 0.8, 0.8);
-			Color tab_selected_color = get_theme_color(SNAME("mono_color"), EditorStringName(Editor));
-			Color tab_unselected_color = used_dock_color;
-			Color unused_dock_color = used_dock_color;
-			unused_dock_color.a = 0.4;
-			Color unusable_dock_color = unused_dock_color;
-			unusable_dock_color.a = 0.1;
-			Color tab_unusable_color = unusable_dock_color;
-
-			TabContainer *context_tab_container = context_dock->get_parent_container();
-			int context_tab_index = -1;
-			if (context_tab_container && context_tab_container->get_tab_count() > 0) {
-				context_tab_index = context_tab_container->get_tab_idx_from_control(context_dock);
-			}
-
-			for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-				const Rect2i slot_rect = rect_cache[i];
-				int max_tabs = EditorDockManager::get_singleton()->dock_slots[i]->grid_rect.size.x * TABS_PER_CELL;
-
-				DockTabContainer *dock_slot = EditorDockManager::get_singleton()->dock_slots[i];
-				bool is_context_slot = context_tab_container == dock_slot;
-				bool is_slot_available = context_dock->available_layouts & dock_slot->layout;
-				int tabs_to_draw = MIN(max_tabs, dock_slot->get_tab_count());
-
-				if (i == context_dock->dock_slot_index) {
-					draw_rect(slot_rect, tab_selected_color);
-				} else if (!is_slot_available) {
-					draw_rect(slot_rect, unusable_dock_color);
-				} else if (i == hovered_slot) {
-					draw_rect(slot_rect, hovered_dock_color);
-				} else if (tabs_to_draw == 0) {
-					draw_rect(slot_rect, unused_dock_color);
-				} else {
-					draw_rect(slot_rect, used_dock_color);
-				}
-
-				real_t tab_width = ((slot_rect.size.x - (max_tabs - 1) * TAB_MARGIN * EDSCALE) / max_tabs);
-				real_t initial_offset = (slot_rect.size.x - (max_tabs * tab_width + (max_tabs - 1) * TAB_MARGIN * EDSCALE)) * 0.5;
-
-				for (int j = 0; j < tabs_to_draw; j++) {
-					real_t pos_x = is_layout_rtl()
-							? slot_rect.size.x - (initial_offset + (j + 1) * tab_width + j * TAB_MARGIN * EDSCALE)
-							: initial_offset + j * (tab_width + TAB_MARGIN * EDSCALE);
-					const Rect2 tab_rect = Rect2(slot_rect.position + Vector2(pos_x, -MARGINS.y * EDSCALE + MARGINS.y * EDSCALE / 4), Vector2(tab_width, MARGINS.y * EDSCALE / 2));
-					if (is_context_slot && context_tab_index == j) {
-						draw_rect(tab_rect, tab_selected_color);
-					} else if (is_slot_available) {
-						draw_rect(tab_rect, tab_unselected_color);
-					} else {
-						draw_rect(tab_rect, tab_unusable_color);
-					}
-				}
-			}
-			draw_rect(main_screen_rect, unusable_dock_color);
-		} break;
-
-		case NOTIFICATION_MOUSE_EXIT: {
-			if (hovered_slot > -1) {
-				hovered_slot = -1;
-				queue_redraw();
-			}
-		} break;
-	}
-}
-
-void DockSlotGrid::gui_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEventMouse> me = p_event;
-	if (me.is_valid()) {
-		Vector2 point = me->get_position();
-
-		int over_dock_slot = -1;
-		for (int i = 0; i < EditorDock::DOCK_SLOT_MAX; i++) {
-			if (rect_cache[i].has_point(point)) {
-				over_dock_slot = i;
-				break;
-			}
-		}
-
-		if (over_dock_slot != hovered_slot) {
-			queue_redraw();
-			hovered_slot = over_dock_slot;
-		}
-
-		if (over_dock_slot == -1) {
-			return;
-		}
-
-		Ref<InputEventMouseButton> mb = me;
-		DockTabContainer *target_tab_container = EditorDockManager::get_singleton()->dock_slots[over_dock_slot];
-		if (context_dock->get_parent_container() == target_tab_container) {
-			return;
-		}
-
-		if (!(context_dock->available_layouts & target_tab_container->layout)) {
-			return;
-		}
-
-		if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && mb->is_pressed()) {
-			emit_signal("slot_clicked", over_dock_slot);
-		}
-	}
-}
-
-Size2 DockSlotGrid::get_minimum_size() const {
-	return GRID_SIZE * CELL_SIZE * EDSCALE + (GRID_SIZE - Vector2i(1, 0)) * MARGINS * EDSCALE;
-}
diff --git a/engine/editor/docks/editor_dock_manager.h b/engine/editor/docks/editor_dock_manager.h
index d55e777d..7e10be20 100644
--- a/engine/editor/docks/editor_dock_manager.h
+++ b/engine/editor/docks/editor_dock_manager.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/docks/editor_dock.h"
+#include "editor/docks/dock_constants.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/split_container.h"
 
@@ -52,7 +52,6 @@ private:
 	bool is_updating = false;
 
 protected:
-	void _notification(int p_what);
 	void _update_visibility();
 
 	virtual void add_child_notify(Node *p_child) override;
@@ -74,7 +73,6 @@ public:
 
 class DockContextPopup;
 class EditorDockDragHint;
-class DockTabContainer;
 
 class EditorDockManager : public Object {
 	GDCLASS(EditorDockManager, Object);
@@ -83,7 +81,6 @@ private:
 	friend class DockContextPopup;
 	friend class EditorDockDragHint;
 	friend class DockShortcutHandler;
-	friend class DockSlotGrid;
 
 	static inline EditorDockManager *singleton = nullptr;
 
@@ -91,7 +88,13 @@ private:
 	Vector<DockSplitContainer *> vsplits;
 	DockSplitContainer *main_hsplit = nullptr;
 
-	DockTabContainer *dock_slots[EditorDock::DOCK_SLOT_MAX];
+	struct DockSlot {
+		TabContainer *container = nullptr;
+		EditorDockDragHint *drag_hint = nullptr;
+		DockConstants::DockLayout layout = DockConstants::DOCK_LAYOUT_VERTICAL;
+	};
+
+	DockSlot dock_slots[DockConstants::DOCK_SLOT_MAX];
 	Vector<WindowWrapper *> dock_windows;
 	LocalVector<EditorDock *> all_docks;
 	HashSet<EditorDock *> dirty_docks;
@@ -107,6 +110,8 @@ private:
 	EditorDock *_get_dock_tab_dragged();
 	void _dock_drag_stopped();
 	void _dock_split_dragged(int p_offset);
+	void _dock_container_popup(int p_tab_idx, TabContainer *p_dock_container);
+	void _dock_container_update_visibility(TabContainer *p_dock_container);
 	void _update_layout();
 
 	void _docks_menu_option(int p_id);
@@ -117,10 +122,12 @@ private:
 	void _restore_dock_to_saved_window(EditorDock *p_dock, const Dictionary &p_window_dump);
 
 	void _make_dock_visible(EditorDock *p_dock, bool p_grab_focus);
+	void _move_dock_tab_index(EditorDock *p_dock, int p_tab_index, bool p_set_current);
 	void _move_dock(EditorDock *p_dock, Control *p_target, int p_tab_index = -1, bool p_set_current = true);
 
 	void _queue_update_tab_style(EditorDock *p_dock);
 	void _update_dirty_dock_tabs();
+	void _update_tab_style(EditorDock *p_dock);
 
 public:
 	static EditorDockManager *get_singleton() { return singleton; }
@@ -131,7 +138,7 @@ public:
 
 	void add_vsplit(DockSplitContainer *p_split);
 	void set_hsplit(DockSplitContainer *p_split);
-	void register_dock_slot(DockTabContainer *p_tab_container);
+	void register_dock_slot(DockConstants::DockSlot p_dock_slot, TabContainer *p_tab_container, DockConstants::DockLayout p_layout);
 	int get_vsplit_count() const;
 	PopupMenu *get_docks_menu();
 
@@ -144,6 +151,8 @@ public:
 	void focus_dock(EditorDock *p_dock);
 	void make_dock_floating(EditorDock *p_dock);
 
+	TabContainer *get_dock_tab_container(Control *p_dock) const;
+
 	void set_docks_visible(bool p_show);
 	bool are_docks_visible() const;
 
@@ -153,32 +162,34 @@ public:
 	EditorDockManager();
 };
 
-class DockSlotGrid : public Control {
-	GDCLASS(DockSlotGrid, Control);
+class EditorDockDragHint : public Control {
+	GDCLASS(EditorDockDragHint, Control);
 
-	static constexpr Vector2 GRID_SIZE = Vector2(8, 8);
-	static constexpr Vector2 MARGINS = Vector2(4, 8);
-	static constexpr Vector2 CELL_SIZE = Vector2(24, 12);
-	static constexpr int TABS_PER_CELL = 3;
-	static constexpr int TAB_MARGIN = 2;
+private:
+	EditorDockManager *dock_manager = nullptr;
+	DockConstants::DockSlot occupied_slot = DockConstants::DOCK_SLOT_MAX;
+	TabBar *drop_tabbar = nullptr;
 
-	int hovered_slot = -1;
+	Color valid_drop_color;
+	Ref<StyleBoxFlat> dock_drop_highlight;
+	bool can_drop_dock = false;
+	bool mouse_inside = false;
+	bool mouse_inside_tabbar = false;
 
-	Rect2 rect_cache[EditorDock::DOCK_SLOT_MAX];
-	Rect2 main_screen_rect;
-	bool rect_cache_dirty = true;
-
-	void _update_rect_cache();
+	void _drag_move_tab(int p_from_index, int p_to_index);
+	void _drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index);
 
 protected:
-	static void _bind_methods();
-	void _notification(int p_what);
-
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-	virtual Size2 get_minimum_size() const override;
+
+	void _notification(int p_what);
+	bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
+	void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
 public:
-	EditorDock *context_dock = nullptr;
+	void set_slot(DockConstants::DockSlot p_slot);
+
+	EditorDockDragHint();
 };
 
 class DockContextPopup : public PopupPanel {
@@ -192,17 +203,23 @@ private:
 	Button *tab_move_right_button = nullptr;
 	Button *close_button = nullptr;
 
-	DockSlotGrid *dock_select = nullptr;
+	Control *dock_select = nullptr;
+	Rect2 dock_select_rects[DockConstants::DOCK_SLOT_MAX];
+	int dock_select_rect_over_idx = -1;
 
 	EditorDock *context_dock = nullptr;
 
 	EditorDockManager *dock_manager = nullptr;
 
-	void _slot_clicked(int p_slot);
 	void _tab_move_left();
 	void _tab_move_right();
 	void _close_dock();
 	void _float_dock();
+	bool _is_slot_available(int p_slot) const;
+
+	void _dock_select_input(const Ref<InputEvent> &p_input);
+	void _dock_select_mouse_exited();
+	void _dock_select_draw();
 
 	void _update_buttons();
 
@@ -210,7 +227,9 @@ protected:
 	void _notification(int p_what);
 
 public:
+	void select_current_dock_in_dock_slot(int p_dock_slot);
 	void set_dock(EditorDock *p_dock);
+	EditorDock *get_dock() const;
 	void docks_updated();
 
 	DockContextPopup();
diff --git a/engine/editor/docks/filesystem_dock.cpp b/engine/editor/docks/filesystem_dock.cpp
index e7b8067c..694fa38b 100644
--- a/engine/editor/docks/filesystem_dock.cpp
+++ b/engine/editor/docks/filesystem_dock.cpp
@@ -31,21 +31,15 @@
 #include "filesystem_dock.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_importer.h"
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/templates/list.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/import_dock.h"
 #include "editor/docks/scene_tree_dock.h"
-#include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -63,7 +57,6 @@
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_feature_profile.h"
 #include "editor/settings/editor_settings.h"
-#include "editor/settings/editor_settings_dialog.h"
 #include "editor/shader/shader_create_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
@@ -338,7 +331,6 @@ void FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory
 				file_item->set_custom_bg_color(0, parent_bg_color);
 			}
 			file_item->set_metadata(0, file_metadata);
-			file_item->set_accept_children(false);
 			if (!p_select_in_favorites && current_path == file_metadata) {
 				file_item->select(0);
 				file_item->set_as_cursor(0);
@@ -394,7 +386,6 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo
 	tree_update_id++;
 	updating_tree = true;
 	TreeItem *root = tree->create_item();
-	root->set_accept_children(false);
 	folder_map.clear();
 
 	// Handles the favorites.
@@ -462,7 +453,6 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo
 		ti->set_tooltip_text(0, favorite);
 		ti->set_selectable(0, true);
 		ti->set_metadata(0, favorite);
-		ti->set_accept_children(false);
 
 		if (!favorite.ends_with("/")) {
 			EditorResourcePreview::get_singleton()->queue_resource_preview(favorite, callable_mp(this, &FileSystemDock::_tree_thumbnail_done).bind(tree_update_id, ti->get_instance_id()));
@@ -533,11 +523,11 @@ void FileSystemDock::_update_display_mode(bool p_force) {
 				if (is_vertical) {
 					tree->set_theme_type_variation("");
 					tree->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
-					tree_mc->set_theme_type_variation(horizontal ? "NoBorderBottomPanel" : "NoBorderHorizontal");
+					tree_mc->set_theme_type_variation("NoBorderBottomPanel");
 
-					files->set_theme_type_variation(horizontal ? "ItemListSecondary" : "");
-					files->set_scroll_hint_mode(horizontal ? ItemList::SCROLL_HINT_MODE_DISABLED : ItemList::SCROLL_HINT_MODE_TOP);
-					files_mc->set_theme_type_variation(horizontal ? "" : "NoBorderHorizontalBottom");
+					files->set_theme_type_variation("");
+					files->set_scroll_hint_mode(horizontal ? ItemList::SCROLL_HINT_MODE_BOTH : ItemList::SCROLL_HINT_MODE_TOP);
+					files_mc->set_theme_type_variation(horizontal ? "NoBorderBottomPanel" : "NoBorderHorizontalBottom");
 				} else {
 					tree->set_theme_type_variation("TreeSecondary");
 					tree->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_DISABLED);
@@ -872,16 +862,12 @@ void FileSystemDock::navigate_to_path(const String &p_path) {
 void FileSystemDock::_file_list_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_index, const String &p_filename) {
 	if (p_preview.is_valid()) {
 		if (p_index < files->get_item_count() && files->get_item_text(p_index) == p_filename && files->get_item_metadata(p_index) == p_path) {
-			Ref<Texture2D> thumbnail;
-
 			if (file_list_display_mode == FILE_LIST_DISPLAY_LIST) {
-				thumbnail = p_small_preview;
+				if (p_small_preview.is_valid()) {
+					files->set_item_icon(p_index, p_small_preview);
+				}
 			} else {
-				thumbnail = p_preview;
-			}
-
-			if (thumbnail.is_valid()) {
-				files->set_item_icon(p_index, _apply_thumbnail_filter(thumbnail, p_path));
+				files->set_item_icon(p_index, p_preview);
 			}
 		}
 	}
@@ -890,37 +876,10 @@ void FileSystemDock::_file_list_thumbnail_done(const String &p_path, const Ref<T
 void FileSystemDock::_tree_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_update_id, ObjectID p_item) {
 	TreeItem *item = ObjectDB::get_instance<TreeItem>(p_item);
 	if (item && tree_update_id == p_update_id && p_small_preview.is_valid()) {
-		item->set_icon(0, _apply_thumbnail_filter(p_small_preview, p_path));
+		item->set_icon(0, p_small_preview);
 	}
 }
 
-Ref<Texture2D> FileSystemDock::_apply_thumbnail_filter(const Ref<Texture2D> &p_thumbnail, const String &p_file_path) const {
-	if (!p_file_path.is_empty()) {
-		int index;
-		EditorFileSystemDirectory *dir = EditorFileSystem::get_singleton()->find_file(p_file_path, &index);
-
-		if (dir) {
-			if (dir->get_file_import_is_valid(index)) {
-				const StringName &file_type = dir->get_file_type(index);
-
-				if (file_type == SNAME("CompressedTexture2D") || file_type == SNAME("Image")) {
-					const String extension = p_file_path.get_extension();
-
-					if (extension != "svg" && extension != "svgz") {
-						Ref<CanvasTexture> thumbnail_wrapped;
-						thumbnail_wrapped.instantiate();
-						thumbnail_wrapped->set_diffuse_texture(p_thumbnail);
-						thumbnail_wrapped->set_texture_filter(CanvasItem::TextureFilter::TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
-						return thumbnail_wrapped;
-					}
-				}
-			}
-		}
-	}
-
-	return p_thumbnail;
-}
-
 void FileSystemDock::_toggle_file_display() {
 	_set_file_display(file_list_display_mode != FILE_LIST_DISPLAY_LIST);
 	emit_signal(SNAME("display_mode_changed"));
@@ -1074,13 +1033,6 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
 				if (searched_tokens.is_empty() || _matches_all_search_tokens(text)) {
 					files->add_item(text, icon, true);
 					files->set_item_metadata(-1, favorite);
-
-					const Color folder_color = FileSystemDock::get_dir_icon_color(favorite, default_folder_color);
-					if (!editor_is_dark_icon_and_font && folder_color != default_folder_color) {
-						files->set_item_icon_modulate(-1, folder_color * ITEM_COLOR_SCALE);
-					} else {
-						files->set_item_icon_modulate(-1, folder_color);
-					}
 				}
 			} else {
 				int index;
@@ -1130,7 +1082,19 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
 		} else {
 			if (display_mode == DISPLAY_MODE_TREE_ONLY || always_show_folders) {
 				// Check for a folder color to inherit (if one is assigned).
-				const Color inherited_folder_color = FileSystemDock::get_dir_icon_color(directory, default_folder_color);
+				Color inherited_folder_color = default_folder_color;
+				String color_scan_dir = directory;
+				while (color_scan_dir != "res://" && inherited_folder_color == default_folder_color) {
+					if (!color_scan_dir.ends_with("/")) {
+						color_scan_dir += "/";
+					}
+
+					if (assigned_folder_colors.has(color_scan_dir)) {
+						inherited_folder_color = folder_colors[assigned_folder_colors[color_scan_dir]];
+					}
+
+					color_scan_dir = color_scan_dir.rstrip("/").get_base_dir();
+				}
 
 				// Display folders in the list.
 				if (directory != "res://") {
@@ -1624,7 +1588,19 @@ void FileSystemDock::_try_duplicate_item(const FileOrFolder &p_item, const Strin
 	}
 }
 
-void FileSystemDock::_update_resource_paths_after_move(const HashMap<String, String> &p_renames) const {
+void FileSystemDock::_update_resource_paths_after_move(const HashMap<String, String> &p_renames, const HashMap<String, ResourceUID::ID> &p_uids) const {
+	for (const KeyValue<String, String> &pair : p_renames) {
+		// Update UID path.
+		const String &old_path = pair.key;
+		const String &new_path = pair.value;
+
+		const HashMap<String, ResourceUID::ID>::ConstIterator I = p_uids.find(old_path);
+		if (I) {
+			ResourceUID::get_singleton()->set_id(I->value, new_path);
+		}
+		EditorFileSystem::get_singleton()->register_global_class_script(old_path, new_path);
+	}
+
 	// Rename all resources loaded, be it subresources or actual resources.
 	List<Ref<Resource>> cached;
 	ResourceCache::get_cached_resources(&cached);
@@ -1644,17 +1620,8 @@ void FileSystemDock::_update_resource_paths_after_move(const HashMap<String, Str
 		}
 	}
 
-	Vector<String> files_to_update;
-	for (const KeyValue<String, String> &E : p_renames) {
-		if (!files_to_update.has(E.key)) {
-			files_to_update.push_back(E.key);
-		}
-		if (!files_to_update.has(E.value)) {
-			files_to_update.push_back(E.value);
-		}
-	}
-	print_verbose("FileSystem: updating file infos.");
-	EditorFileSystem::get_singleton()->update_files(files_to_update);
+	EditorNode::get_editor_data().script_class_save_global_classes();
+	EditorFileSystem::get_singleton()->emit_signal(SNAME("script_classes_updated"));
 }
 
 void FileSystemDock::_update_dependencies_after_move(const HashMap<String, String> &p_renames, const HashSet<String> &p_file_owners) const {
@@ -1691,7 +1658,7 @@ void FileSystemDock::_update_dependencies_after_move(const HashMap<String, Strin
 
 void FileSystemDock::_update_project_settings_after_move(const HashMap<String, String> &p_renames, const HashMap<String, String> &p_folders_renames) {
 	// Find all project settings of type FILE and replace them if needed.
-	const HashMap<StringName, PropertyInfo> prop_info(ProjectSettings::get_singleton()->get_custom_property_info());
+	const HashMap<StringName, PropertyInfo> prop_info = ProjectSettings::get_singleton()->get_custom_property_info();
 	for (const KeyValue<StringName, PropertyInfo> &E : prop_info) {
 		if (E.value.hint == PROPERTY_HINT_FILE || E.value.hint == PROPERTY_HINT_FILE_PATH) {
 			String old_path = GLOBAL_GET(E.key);
@@ -1861,7 +1828,7 @@ void FileSystemDock::_rename_operation_confirm() {
 		rename_error = true;
 	} else if (to_rename.is_file && to_rename.path.get_extension() != new_name.get_extension()) {
 		if (!EditorFileSystem::get_singleton()->get_valid_extensions().find(new_name.get_extension())) {
-			unrecognized_ext_dialog->popup_centered_clamped();
+			EditorNode::get_singleton()->show_warning(TTRC("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore."));
 			rename_error = true;
 		}
 	}
@@ -1899,15 +1866,16 @@ void FileSystemDock::_rename_operation_confirm() {
 		return;
 	}
 
+	HashMap<String, ResourceUID::ID> uids;
 	HashSet<String> file_owners; // The files that use these moved/renamed resource files.
-	_before_move(file_owners);
+	_before_move(uids, file_owners);
 
 	HashMap<String, String> file_renames;
 	HashMap<String, String> folder_renames;
 	_try_move_item(to_rename, new_path, file_renames, folder_renames);
 
 	int current_tab = EditorSceneTabs::get_singleton()->get_current_tab();
-	_update_resource_paths_after_move(file_renames);
+	_update_resource_paths_after_move(file_renames, uids);
 	_update_dependencies_after_move(file_renames, file_owners);
 	_update_project_settings_after_move(file_renames, folder_renames);
 	_update_favorites_after_move(file_renames, folder_renames);
@@ -1936,11 +1904,6 @@ void FileSystemDock::_duplicate_operation_confirm(const String &p_path) {
 }
 
 void FileSystemDock::_move_confirm() {
-	if (confirm_before_move_checkbox->is_pressed()) {
-		EditorSettings::get_singleton()->set("docks/filesystem/ask_before_moving_files", false);
-		confirm_before_move_checkbox->set_pressed(false);
-	}
-
 	_move_operation_confirm(confirm_move_to_dir, confirm_to_copy);
 }
 
@@ -2027,7 +1990,7 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
 			overwrite_dialog_footer->set_text(
 					p_copy ? TTRC("Do you wish to overwrite them or rename the copied files?")
 						   : TTRC("Do you wish to overwrite them or rename the moved files?"));
-			overwrite_dialog->popup_centered_ratio(0.6);
+			overwrite_dialog->popup_centered();
 			return;
 		}
 	}
@@ -2057,8 +2020,9 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
 			}
 		}
 
+		HashMap<String, ResourceUID::ID> uids;
 		HashSet<String> file_owners; // The files that use these moved/renamed resource files.
-		_before_move(file_owners);
+		_before_move(uids, file_owners);
 
 		bool is_moved = false;
 		HashMap<String, String> file_renames;
@@ -2072,8 +2036,20 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
 		}
 
 		if (is_moved) {
+			Vector<String> files_to_update;
+			for (KeyValue<String, String> &E : file_renames) {
+				if (!files_to_update.has(E.key)) {
+					files_to_update.push_back(E.key);
+				}
+				if (!files_to_update.has(E.value)) {
+					files_to_update.push_back(E.value);
+				}
+			}
+			print_verbose("FileSystem: updating file infos.");
+			EditorFileSystem::get_singleton()->update_files(files_to_update);
+
 			int current_tab = EditorSceneTabs::get_singleton()->get_current_tab();
-			_update_resource_paths_after_move(file_renames);
+			_update_resource_paths_after_move(file_renames, uids);
 			_update_dependencies_after_move(file_renames, file_owners);
 			_update_project_settings_after_move(file_renames, folder_renames);
 			_update_favorites_after_move(file_renames, folder_renames);
@@ -2089,11 +2065,15 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
 	}
 }
 
-void FileSystemDock::_before_move(HashSet<String> &r_file_owners) const {
+void FileSystemDock::_before_move(HashMap<String, ResourceUID::ID> &r_uids, HashSet<String> &r_file_owners) const {
 	HashSet<String> renamed_files;
 	for (int i = 0; i < to_move.size(); i++) {
 		if (to_move[i].is_file) {
 			renamed_files.insert(to_move[i].path);
+			ResourceUID::ID uid = ResourceLoader::get_resource_uid(to_move[i].path);
+			if (uid != ResourceUID::INVALID_ID) {
+				r_uids[to_move[i].path] = uid;
+			}
 		} else {
 			EditorFileSystemDirectory *current_folder = EditorFileSystem::get_singleton()->get_filesystem_path(to_move[i].path);
 			ERR_CONTINUE(current_folder == nullptr);
@@ -2104,6 +2084,10 @@ void FileSystemDock::_before_move(HashSet<String> &r_file_owners) const {
 				for (int j = 0; j < current_folder->get_file_count(); j++) {
 					const String file_path = current_folder->get_file_path(j);
 					renamed_files.insert(file_path);
+					ResourceUID::ID uid = ResourceLoader::get_resource_uid(file_path);
+					if (uid != ResourceUID::INVALID_ID) {
+						r_uids[file_path] = uid;
+					}
 				}
 				for (int j = 0; j < current_folder->get_subdir_count(); j++) {
 					folders.push_back(current_folder->get_subdir(j));
@@ -2542,7 +2526,7 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
 			}
 			if (to_move.size() > 0) {
 				move_dialog->config(p_selected);
-				move_dialog->popup_centered_ratio(0.5);
+				move_dialog->popup_centered_ratio(0.4);
 			}
 		} break;
 
@@ -2817,9 +2801,6 @@ void FileSystemDock::_resource_created() {
 }
 
 void FileSystemDock::_script_or_shader_created(const Ref<Resource> &p_resource) {
-	if (Object::cast_to<Script>(p_resource.ptr()) && !EDITOR_GET("docks/filesystem/automatically_open_created_scripts").operator bool()) {
-		return;
-	}
 	EditorNode::get_singleton()->push_item(p_resource.ptr());
 }
 
@@ -3220,20 +3201,16 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 				String move_confirm_text;
 				confirm_move_to_dir = to_dir;
 
-				bool ask_before_moving_files = EDITOR_GET("docks/filesystem/ask_before_moving_files") && !Input::get_singleton()->is_key_pressed(Key::SHIFT);
-				confirm_to_copy = Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL);
-
-				if (!ask_before_moving_files) {
-					_move_operation_confirm(to_dir, confirm_to_copy);
+				if (Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL)) {
+					move_confirm_text = vformat(TTRN("Copy %d selected item to \"%s\"?", "Copy %d selected items to \"%s\"?", to_move.size()), to_move.size(), target_dir);
+					confirm_to_copy = true;
 				} else {
-					if (confirm_to_copy) {
-						move_confirm_text = vformat(TTRN("Copy %d selected item to \"%s\"?", "Copy %d selected items to \"%s\"?", to_move.size()), to_move.size(), target_dir);
-					} else {
-						move_confirm_text = vformat(TTRN("Move %d selected item to \"%s\"?", "Move %d selected items to \"%s\"?", to_move.size()), to_move.size(), target_dir);
-					}
-					move_confirm_dialog_label->set_text(move_confirm_text);
-					move_confirm_dialog->popup_centered();
+					move_confirm_text = vformat(TTRN("Move %d selected item to \"%s\"?", "Move %d selected items to \"%s\"?", to_move.size()), to_move.size(), target_dir);
+					confirm_to_copy = false;
 				}
+
+				move_confirm_dialog->set_text(move_confirm_text);
+				move_confirm_dialog->popup_centered();
 			}
 		} else if (favorite) {
 			// Add the files from favorites.
@@ -3281,9 +3258,8 @@ void FileSystemDock::_get_drag_target_folder(String &target, bool &target_favori
 	// In the tree.
 	if (p_from == tree) {
 		TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
+		int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 		if (ti) {
-			int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
-
 			// Check the favorites first.
 			if (ti == tree->get_root()->get_first_child() && section >= 0) {
 				target_favorites = true;
@@ -3293,7 +3269,7 @@ void FileSystemDock::_get_drag_target_folder(String &target, bool &target_favori
 				return;
 			} else {
 				String fpath = ti->get_metadata(0);
-				if (section == 0 || section == 2) {
+				if (section == 0) {
 					if (fpath.ends_with("/")) {
 						// We drop on a folder.
 						target = fpath;
@@ -3642,7 +3618,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 		}
 
 		p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Filesystem")), ED_GET_SHORTCUT("filesystem_dock/show_in_explorer"), FILE_MENU_SHOW_IN_EXPLORER);
-		p_popup->set_item_text(p_popup->get_item_index(FILE_MENU_SHOW_IN_EXPLORER), is_directory ? OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN) : OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_SHOW));
+		p_popup->set_item_text(p_popup->get_item_index(FILE_MENU_SHOW_IN_EXPLORER), is_directory ? TTRC("Open in File Manager") : TTRC("Show in File Manager"));
 #endif
 
 		current_path = fpath;
@@ -3718,7 +3694,7 @@ void FileSystemDock::_file_list_item_clicked(int p_item, const Vector2 &p_pos, M
 	if (p_mouse_button_index != MouseButton::RIGHT) {
 		return;
 	}
-	files->grab_focus(true);
+	files->grab_focus();
 
 	// Right click is pressed in the file list.
 	Vector<String> paths;
@@ -4178,7 +4154,7 @@ void FileSystemDock::update_layout(EditorDock::DockLayout p_layout) {
 	horizontal = new_horizontal;
 
 	if (horizontal) {
-		path_hb->reparent(toolbar_hbc);
+		path_hb->reparent(toolbar_hbc, false);
 		toolbar_hbc->move_child(path_hb, 2);
 		set_meta("_dock_display_mode", get_display_mode());
 		set_meta("_dock_file_display_mode", get_file_list_display_mode());
@@ -4271,17 +4247,6 @@ void FileSystemDock::load_layout_from_config(const Ref<ConfigFile> &p_layout, co
 	}
 }
 
-void FileSystemDock::_on_open_editor_settings_file_exts() {
-	unrecognized_ext_dialog->hide();
-
-	// The FileSystem settings are under "advanced settings", so we have to ensure
-	// that setting is enabled before we attempt to open the menu to them.
-	EditorSettingsDialog *ed_settings = EditorNode::get_singleton()->editor_settings_dialog;
-	ed_settings->set_advanced_mode_enabled(true);
-	ed_settings->popup_edit_settings();
-	ed_settings->set_current_section("docks/filesystem");
-}
-
 void FileSystemDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("navigate_to_path", "path"), &FileSystemDock::navigate_to_path);
 
@@ -4291,7 +4256,7 @@ void FileSystemDock::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("inherit", PropertyInfo(Variant::STRING, "file")));
 	ADD_SIGNAL(MethodInfo("instantiate", PropertyInfo(Variant::PACKED_STRING_ARRAY, "files")));
 
-	ADD_SIGNAL(MethodInfo("resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static())));
+	ADD_SIGNAL(MethodInfo("resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
 	ADD_SIGNAL(MethodInfo("file_removed", PropertyInfo(Variant::STRING, "file")));
 	ADD_SIGNAL(MethodInfo("folder_removed", PropertyInfo(Variant::STRING, "folder")));
 	ADD_SIGNAL(MethodInfo("files_moved", PropertyInfo(Variant::STRING, "old_file"), PropertyInfo(Variant::STRING, "new_file")));
@@ -4533,8 +4498,7 @@ FileSystemDock::FileSystemDock() {
 
 	overwrite_dialog_scroll = memnew(ScrollContainer);
 	overwrite_dialog_vb->add_child(overwrite_dialog_scroll);
-	overwrite_dialog_scroll->set_custom_minimum_size(Vector2(50, 50) * EDSCALE);
-	overwrite_dialog_scroll->set_v_size_flags(SIZE_EXPAND_FILL);
+	overwrite_dialog_scroll->set_custom_minimum_size(Vector2(400, 600) * EDSCALE);
 
 	overwrite_dialog_file_list = memnew(Label);
 	overwrite_dialog_scroll->add_child(overwrite_dialog_file_list);
@@ -4573,21 +4537,6 @@ FileSystemDock::FileSystemDock() {
 	add_child(move_confirm_dialog);
 	move_confirm_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_move_confirm));
 
-	VBoxContainer *vb = memnew(VBoxContainer);
-	move_confirm_dialog->add_child(vb);
-	move_confirm_dialog_label = memnew(Label);
-	move_confirm_dialog_label->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
-	vb->add_child(move_confirm_dialog_label);
-	confirm_before_move_checkbox = memnew(CheckBox(TTRC("Don't Ask Again")));
-	confirm_before_move_checkbox->set_tooltip_text(TTRC("This dialog can be skipped by holding shift or enabled/disabled in the Editor Settings: Docks > FileSystem > Ask Before Moving Files."));
-	vb->add_child(confirm_before_move_checkbox);
-
-	unrecognized_ext_dialog = memnew(AcceptDialog);
-	add_child(unrecognized_ext_dialog);
-	unrecognized_ext_dialog->set_text(TTRC("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore.\nTo make the editor recognize this file extension, add it to one of the lists of extensions in Editor Settings > Docks > FileSystem."));
-	Button *settings_button = unrecognized_ext_dialog->add_button(TTRC("Open Editor Settings"), false, "open_editor_settings_docks_filesystem");
-	settings_button->connect("pressed", callable_mp(this, &FileSystemDock::_on_open_editor_settings_file_exts));
-
 	uncollapsed_paths_before_search = Vector<String>();
 
 	tree_update_id = 0;
diff --git a/engine/editor/docks/filesystem_dock.h b/engine/editor/docks/filesystem_dock.h
index 2cbf2802..a7a3d643 100644
--- a/engine/editor/docks/filesystem_dock.h
+++ b/engine/editor/docks/filesystem_dock.h
@@ -44,7 +44,6 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 
-class AcceptDialog;
 class CreateDialog;
 class DependencyEditor;
 class DependencyEditorOwners;
@@ -206,16 +205,12 @@ private:
 
 	ConfirmationDialog *conversion_dialog = nullptr;
 	ConfirmationDialog *move_confirm_dialog = nullptr;
-	CheckBox *confirm_before_move_checkbox = nullptr;
-	Label *move_confirm_dialog_label = nullptr;
 
 	SceneCreateDialog *make_scene_dialog = nullptr;
 	ScriptCreateDialog *make_script_dialog = nullptr;
 	ShaderCreateDialog *make_shader_dialog = nullptr;
 	CreateDialog *new_resource_dialog = nullptr;
 
-	AcceptDialog *unrecognized_ext_dialog = nullptr;
-
 	String confirm_move_to_dir;
 	bool confirm_to_copy = false;
 
@@ -305,9 +300,9 @@ private:
 	void _find_file_owners(EditorFileSystemDirectory *p_efsd, const HashSet<String> &p_renames, HashSet<String> &r_file_owners) const;
 	void _try_move_item(const FileOrFolder &p_item, const String &p_new_path, HashMap<String, String> &p_file_renames, HashMap<String, String> &p_folder_renames);
 	void _try_duplicate_item(const FileOrFolder &p_item, const String &p_new_path) const;
-	void _before_move(HashSet<String> &r_file_owners) const;
+	void _before_move(HashMap<String, ResourceUID::ID> &r_uids, HashSet<String> &r_file_owners) const;
 	void _update_dependencies_after_move(const HashMap<String, String> &p_renames, const HashSet<String> &p_file_owners) const;
-	void _update_resource_paths_after_move(const HashMap<String, String> &p_renames) const;
+	void _update_resource_paths_after_move(const HashMap<String, String> &p_renames, const HashMap<String, ResourceUID::ID> &p_uids) const;
 	void _update_favorites_after_move(const HashMap<String, String> &p_files_renames, const HashMap<String, String> &p_folders_renames) const;
 	void _update_project_settings_after_move(const HashMap<String, String> &p_renames, const HashMap<String, String> &p_folders_renames);
 	String _get_unique_name(const FileOrFolder &p_entry, const String &p_at_path);
@@ -372,7 +367,6 @@ private:
 	void _preview_invalidated(const String &p_path);
 	void _file_list_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_index, const String &p_filename);
 	void _tree_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_update_id, ObjectID p_item);
-	Ref<Texture2D> _apply_thumbnail_filter(const Ref<Texture2D> &p_thumbnail, const String &p_file_path) const;
 
 	void _update_display_mode(bool p_force = false);
 
@@ -385,14 +379,11 @@ private:
 	void _project_settings_changed();
 	static Vector<String> _remove_self_included_paths(Vector<String> selected_strings);
 
-	void _on_open_editor_settings_file_exts();
-
 private:
 	inline static FileSystemDock *singleton = nullptr;
 
 public:
 	static FileSystemDock *get_singleton() { return singleton; }
-	static DependencyEditorOwners *get_owners_dialog() { return singleton->owners_editor; }
 
 protected:
 	void _notification(int p_what);
@@ -446,7 +437,6 @@ public:
 	FileListDisplayMode get_file_list_display_mode() const { return file_list_display_mode; }
 
 	Tree *get_tree_control() { return tree; }
-	ItemList *get_list_control() { return files; }
 
 	void add_resource_tooltip_plugin(const Ref<EditorResourceTooltipPlugin> &p_plugin);
 	void remove_resource_tooltip_plugin(const Ref<EditorResourceTooltipPlugin> &p_plugin);
diff --git a/engine/editor/docks/groups_editor.cpp b/engine/editor/docks/groups_editor.cpp
index c95dc671..6a26f5f5 100644
--- a/engine/editor/docks/groups_editor.cpp
+++ b/engine/editor/docks/groups_editor.cpp
@@ -30,8 +30,6 @@
 
 #include "groups_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -44,9 +42,7 @@
 #include "scene/gui/check_button.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display/display_server.h"
 
 static bool can_edit(Node *p_node, const String &p_group) {
 	Node *n = p_node;
@@ -665,7 +661,6 @@ void GroupsEditor::_show_add_group_dialog() {
 	if (!add_group_dialog) {
 		add_group_dialog = memnew(ConfirmationDialog);
 		add_group_dialog->set_title(TTR("Create New Group"));
-		add_group_dialog->set_ok_button_text(TTRC("Create"));
 		add_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupsEditor::_confirm_add));
 
 		VBoxContainer *vbc = memnew(VBoxContainer);
@@ -709,7 +704,7 @@ void GroupsEditor::_show_add_group_dialog() {
 		add_group_dialog->register_text_enter(add_group_description);
 
 		add_validation_panel = memnew(EditorValidationPanel);
-		add_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group name is valid."));
+		add_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group name is valid."));
 		add_validation_panel->set_update_callback(callable_mp(this, &GroupsEditor::_check_add));
 		add_validation_panel->set_accept_button(add_group_dialog->get_ok_button());
 
@@ -750,7 +745,7 @@ void GroupsEditor::_show_rename_group_dialog() {
 		rename_group_dialog->register_text_enter(rename_group);
 
 		rename_validation_panel = memnew(EditorValidationPanel);
-		rename_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group name is valid."));
+		rename_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group name is valid."));
 		rename_validation_panel->set_update_callback(callable_mp(this, &GroupsEditor::_check_rename));
 		rename_validation_panel->set_accept_button(rename_group_dialog->get_ok_button());
 
@@ -790,7 +785,6 @@ void GroupsEditor::_show_rename_group_dialog() {
 void GroupsEditor::_show_remove_group_dialog() {
 	if (!remove_group_dialog) {
 		remove_group_dialog = memnew(ConfirmationDialog);
-		remove_group_dialog->set_ok_button_text(TTRC("Delete"));
 		remove_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupsEditor::_confirm_delete));
 
 		VBoxContainer *vbox = memnew(VBoxContainer);
@@ -838,9 +832,9 @@ void GroupsEditor::_check_rename() {
 
 void GroupsEditor::_validate_name(const String &p_name, EditorValidationPanel *p_validation_panel) {
 	if (p_name.is_empty()) {
-		p_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group can't be empty."), EditorValidationPanel::MSG_ERROR);
+		p_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group can't be empty."), EditorValidationPanel::MSG_ERROR);
 	} else if (_has_group(p_name)) {
-		p_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group already exists."), EditorValidationPanel::MSG_ERROR);
+		p_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group already exists."), EditorValidationPanel::MSG_ERROR);
 	}
 }
 
diff --git a/engine/editor/docks/history_dock.cpp b/engine/editor/docks/history_dock.cpp
index ac81ee21..9fe390a7 100644
--- a/engine/editor/docks/history_dock.cpp
+++ b/engine/editor/docks/history_dock.cpp
@@ -31,11 +31,11 @@
 #include "history_dock.h"
 
 #include "core/io/config_file.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/settings/editor_command_palette.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/item_list.h"
 
diff --git a/engine/editor/docks/import_dock.cpp b/engine/editor/docks/import_dock.cpp
index ae86cd22..bd628b0b 100644
--- a/engine/editor/docks/import_dock.cpp
+++ b/engine/editor/docks/import_dock.cpp
@@ -31,14 +31,9 @@
 #include "import_dock.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_importer.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/file_system/editor_file_system.h"
 #include "editor/inspector/editor_resource_preview.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/docks/import_dock.h b/engine/editor/docks/import_dock.h
index fddaed08..109ff14f 100644
--- a/engine/editor/docks/import_dock.h
+++ b/engine/editor/docks/import_dock.h
@@ -31,7 +31,9 @@
 #pragma once
 
 #include "core/io/config_file.h"
+#include "core/io/resource_importer.h"
 #include "editor/docks/editor_dock.h"
+#include "editor/file_system/editor_file_system.h"
 #include "editor/inspector/editor_inspector.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
diff --git a/engine/editor/docks/inspector_dock.cpp b/engine/editor/docks/inspector_dock.cpp
index 4d6fbd79..fbd20fee 100644
--- a/engine/editor/docks/inspector_dock.cpp
+++ b/engine/editor/docks/inspector_dock.cpp
@@ -30,9 +30,6 @@
 
 #include "inspector_dock.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/engine/editor/docks/inspector_dock.h b/engine/editor/docks/inspector_dock.h
index 3a6fd3bc..55eff2a4 100644
--- a/engine/editor/docks/inspector_dock.h
+++ b/engine/editor/docks/inspector_dock.h
@@ -34,6 +34,7 @@
 #include "editor/editor_data.h"
 #include "editor/gui/create_dialog.h"
 #include "editor/inspector/editor_inspector.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
diff --git a/engine/editor/docks/scene_tree_dock.cpp b/engine/editor/docks/scene_tree_dock.cpp
index c7212f85..e1d01cee 100644
--- a/engine/editor/docks/scene_tree_dock.cpp
+++ b/engine/editor/docks/scene_tree_dock.cpp
@@ -32,9 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/animation/animation_player_editor_plugin.h"
@@ -68,15 +66,12 @@
 #include "scene/audio/audio_stream_player.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
-#include "scene/main/scene_tree.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display/display_server.h"
 
 void SceneTreeDock::_nodes_drag_begin() {
 	pending_click_select = nullptr;
-	edited_object_at_drag_start = InspectorDock::get_inspector_singleton()->get_edited_object();
-	scene_tree_drag_active = true;
 }
 
 void SceneTreeDock::_quick_open(const String &p_file_path) {
@@ -101,6 +96,7 @@ void SceneTreeDock::_inspect_hovered_node() {
 		return;
 	}
 
+	select_node_hovered_at_end_of_drag = true;
 	TreeItem *item = tree->get_item_with_metadata(node_hovered_now->get_path());
 
 	_restore_treeitem_custom_color(tree_item_inspected);
@@ -181,24 +177,7 @@ void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
-	if (!p_event->is_pressed()) {
-		return;
-	}
-
-	// These shortcuts allow echo events for continuous execution.
-	if (ED_IS_SHORTCUT("scene_tree/duplicate", p_event)) {
-		_tool_selected(TOOL_DUPLICATE);
-	} else if (ED_IS_SHORTCUT("scene_tree/move_up", p_event)) {
-		_tool_selected(TOOL_MOVE_UP);
-	} else if (ED_IS_SHORTCUT("scene_tree/move_down", p_event)) {
-		_tool_selected(TOOL_MOVE_DOWN);
-	} else if (ED_IS_SHORTCUT("scene_tree/paste_node", p_event)) {
-		_tool_selected(TOOL_PASTE);
-	} else if (ED_IS_SHORTCUT("scene_tree/paste_node_as_sibling", p_event)) {
-		_tool_selected(TOOL_PASTE_AS_SIBLING);
-	}
-
-	if (p_event->is_echo()) {
+	if (!p_event->is_pressed() || p_event->is_echo()) {
 		return;
 	}
 
@@ -224,14 +203,22 @@ void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
 		_tool_selected(TOOL_CUT);
 	} else if (ED_IS_SHORTCUT("scene_tree/copy_node", p_event)) {
 		_tool_selected(TOOL_COPY);
-	} else if (ED_IS_SHORTCUT("scene_tree/paste_node_as_replacement", p_event)) {
-		_tool_selected(TOOL_PASTE_AS_REPLACEMENT);
+	} else if (ED_IS_SHORTCUT("scene_tree/paste_node", p_event)) {
+		_tool_selected(TOOL_PASTE);
+	} else if (ED_IS_SHORTCUT("scene_tree/paste_node_as_sibling", p_event)) {
+		_tool_selected(TOOL_PASTE_AS_SIBLING);
 	} else if (ED_IS_SHORTCUT("scene_tree/change_node_type", p_event)) {
-		_tool_selected(TOOL_CHANGE_TYPE);
+		_tool_selected(TOOL_REPLACE);
+	} else if (ED_IS_SHORTCUT("scene_tree/duplicate", p_event)) {
+		_tool_selected(TOOL_DUPLICATE);
 	} else if (ED_IS_SHORTCUT("scene_tree/attach_script", p_event)) {
 		_tool_selected(TOOL_ATTACH_SCRIPT);
 	} else if (ED_IS_SHORTCUT("scene_tree/detach_script", p_event)) {
 		_tool_selected(TOOL_DETACH_SCRIPT);
+	} else if (ED_IS_SHORTCUT("scene_tree/move_up", p_event)) {
+		_tool_selected(TOOL_MOVE_UP);
+	} else if (ED_IS_SHORTCUT("scene_tree/move_down", p_event)) {
+		_tool_selected(TOOL_MOVE_DOWN);
 	} else if (ED_IS_SHORTCUT("scene_tree/reparent", p_event)) {
 		_tool_selected(TOOL_REPARENT);
 	} else if (ED_IS_SHORTCUT("scene_tree/reparent_to_new_node", p_event)) {
@@ -248,8 +235,6 @@ void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
 		_tool_selected(TOOL_TOGGLE_SCENE_UNIQUE_NAME);
 	} else if (ED_IS_SHORTCUT("scene_tree/toggle_editable_children", p_event)) {
 		_tool_selected(TOOL_SCENE_EDITABLE_CHILDREN);
-	} else if (ED_IS_SHORTCUT("scene_tree/open_scene_in_editor", p_event)) {
-		_tool_selected(TOOL_SCENE_OPEN);
 	} else if (ED_IS_SHORTCUT("scene_tree/delete", p_event)) {
 		_tool_selected(TOOL_ERASE);
 	} else {
@@ -276,9 +261,6 @@ void SceneTreeDock::_scene_tree_gui_input(Ref<InputEvent> p_event) {
 		filter->grab_focus();
 		filter->select_all();
 		accept_event();
-	} else if (ED_IS_SHORTCUT("scene_tree/open_scene_in_editor", p_event)) {
-		_tool_selected(TOOL_SCENE_OPEN);
-		accept_event();
 	}
 }
 
@@ -771,22 +753,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		case TOOL_PASTE_AS_SIBLING: {
 			paste_nodes(true);
 		} break;
-		case TOOL_PASTE_AS_REPLACEMENT: {
-			if (!profile_allow_editing) {
-				break;
-			}
-
-			if (node_clipboard.is_empty()) {
-				break;
-			}
-
-			if (!_validate_no_foreign()) {
-				break;
-			}
-
-			paste_node_as_replacement();
-		} break;
-		case TOOL_CHANGE_TYPE: {
+		case TOOL_REPLACE: {
 			if (!profile_allow_editing) {
 				break;
 			}
@@ -1438,7 +1405,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			const List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
-				if (node && node->is_instance()) {
+				if (node) {
 					scene_tree->emit_signal(SNAME("open"), node->get_scene_file_path());
 				}
 			}
@@ -1760,7 +1727,6 @@ void SceneTreeDock::_notification(int p_what) {
 			button_clipboard->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_PASTE, false));
 
 			_update_create_root_dialog(true);
-			_update_create_root_dialog_visibility();
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
@@ -1780,8 +1746,8 @@ void SceneTreeDock::_notification(int p_what) {
 				scene_tree->set_hide_filtered_out_parents(EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"), false);
 				scene_tree->set_accessibility_warnings(EDITOR_GET("docks/scene_tree/accessibility_warnings"), false);
 			}
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/timers")) {
-				inspect_hovered_node_delay->set_wait_time(EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds"));
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
+				inspect_hovered_node_delay->set_wait_time(EDITOR_GET("interface/editor/dragging_hover_wait_seconds"));
 			}
 		} break;
 
@@ -1815,41 +1781,51 @@ void SceneTreeDock::_notification(int p_what) {
 			menu_subresources->add_theme_constant_override("icon_max_width", get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
 		} break;
 
+		case NOTIFICATION_PROCESS: {
+			bool show_create_root = bool(EDITOR_GET("interface/editors/show_scene_tree_root_selection")) && get_tree()->get_edited_scene_root() == nullptr;
+
+			if (show_create_root != create_root_dialog->is_visible_in_tree() && !remote_tree->is_visible()) {
+				if (show_create_root) {
+					main_mc->set_theme_type_variation("");
+					create_root_dialog->show();
+					scene_tree->hide();
+				} else {
+					main_mc->set_theme_type_variation("NoBorderHorizontalBottom");
+					create_root_dialog->hide();
+					scene_tree->show();
+				}
+			}
+		} break;
+
 		case NOTIFICATION_DRAG_END: {
 			_reset_hovering_timer();
 			if (tree_item_inspected) {
 				_restore_treeitem_custom_color(tree_item_inspected);
 				tree_item_inspected = nullptr;
-			}
-
-			if (!scene_tree_drag_active) {
+			} else {
 				return;
 			}
-			scene_tree_drag_active = false;
-
-			InspectorDock *inspector_dock = InspectorDock::get_singleton();
-			if (!inspector_dock->get_rect().has_point(inspector_dock->get_local_mouse_position())) {
-				Node *node_edited = Object::cast_to<Node>(InspectorDock::get_inspector_singleton()->get_edited_object());
-				if (editor_selection->get_full_selected_node_list().size() == 1 && !editor_selection->is_selected(node_edited)) {
-					Node *node_selected = scene_tree->get_selected();
-					EditorNode::get_singleton()->push_node_item(node_selected);
+			if (!hovered_but_reparenting) {
+				InspectorDock *inspector_dock = InspectorDock::get_singleton();
+				if (!inspector_dock->get_rect().has_point(inspector_dock->get_local_mouse_position())) {
+					List<Node *> full_selection = editor_selection->get_full_selected_node_list();
+					editor_selection->clear();
+					for (Node *E : full_selection) {
+						editor_selection->add_node(E);
+					}
 					return;
 				}
-				if (edited_object_at_drag_start) {
-					EditorSelectionHistory *editor_history = EditorNode::get_singleton()->get_editor_selection_history();
-					editor_history->add_object(edited_object_at_drag_start->get_instance_id());
-					InspectorDock::get_inspector_singleton()->edit(edited_object_at_drag_start);
-					InspectorDock::get_singleton()->update(edited_object_at_drag_start);
+				if (select_node_hovered_at_end_of_drag) {
+					Node *node_inspected = Object::cast_to<Node>(InspectorDock::get_inspector_singleton()->get_edited_object());
+					if (node_inspected) {
+						editor_selection->clear();
+						editor_selection->add_node(node_inspected);
+						scene_tree->set_selected(node_inspected);
+						select_node_hovered_at_end_of_drag = false;
+					}
 				}
-				return;
-			}
-
-			Node *node_edited = Object::cast_to<Node>(InspectorDock::get_inspector_singleton()->get_edited_object());
-			if (node_edited) {
-				editor_selection->clear();
-				editor_selection->add_node(node_edited);
-				scene_tree->set_selected(node_edited);
 			}
+			hovered_but_reparenting = false;
 		} break;
 	}
 }
@@ -1984,7 +1960,10 @@ bool SceneTreeDock::_has_tracks_to_delete(Node *p_node, List<Node *> &p_to_delet
 	if (ap) {
 		Node *root = ap->get_node(ap->get_root_node());
 		if (root && !p_to_delete.find(root)) {
-			for (const StringName &E : ap->get_sorted_animation_list()) {
+			List<StringName> anims;
+			ap->get_animation_list(&anims);
+
+			for (const StringName &E : anims) {
 				Ref<Animation> anim = ap->get_animation(E);
 				if (anim.is_null()) {
 					continue;
@@ -2050,14 +2029,9 @@ bool SceneTreeDock::_update_node_path(Node *p_root_node, NodePath &r_node_path,
 	// Try to find the target node in modified node paths.
 	HashMap<Node *, NodePath>::Iterator found_node_path = p_renames->find(target_node);
 	if (found_node_path) {
-		String old_subnames;
-		if (r_node_path.get_subname_count() > 0) {
-			old_subnames = ":" + r_node_path.get_concatenated_subnames();
-		}
-
 		HashMap<Node *, NodePath>::Iterator found_root_path = p_renames->find(p_root_node);
 		NodePath root_path_new = found_root_path ? found_root_path->value : p_root_node->get_path();
-		r_node_path = NodePath(String(root_path_new.rel_path_to(found_node_path->value)) + old_subnames);
+		r_node_path = root_path_new.rel_path_to(found_node_path->value);
 
 		return true;
 	}
@@ -2067,14 +2041,9 @@ bool SceneTreeDock::_update_node_path(Node *p_root_node, NodePath &r_node_path,
 	if (found_root_path) {
 		NodePath root_path_new = found_root_path->value;
 		if (!root_path_new.is_empty()) {
-			String old_subnames;
-			if (r_node_path.get_subname_count() > 0) {
-				old_subnames = ":" + r_node_path.get_concatenated_subnames();
-			}
-
 			NodePath old_abs_path = NodePath(String(p_root_node->get_path()).path_join(String(r_node_path)));
 			old_abs_path.simplify();
-			r_node_path = NodePath(String(root_path_new.rel_path_to(old_abs_path)) + old_subnames);
+			r_node_path = root_path_new.rel_path_to(old_abs_path);
 		}
 
 		return true;
@@ -2246,13 +2215,15 @@ void SceneTreeDock::perform_node_renames(Node *p_base, HashMap<Node *, NodePath>
 		}
 
 		if (!points_to_other_animation_player) {
+			List<StringName> anims;
+			mixer->get_animation_list(&anims);
 			Node *root = mixer->get_node(mixer->get_root_node());
 
 			if (root) {
 				HashMap<Node *, NodePath>::Iterator found_root_path = p_renames->find(root);
 				NodePath new_root_path = found_root_path ? found_root_path->value : root->get_path();
 				if (!new_root_path.is_empty()) { // No renaming if root node is deleted.
-					for (const StringName &E : mixer->get_sorted_animation_list()) {
+					for (const StringName &E : anims) {
 						Ref<Animation> anim = mixer->get_animation(E);
 						if (!r_rem_anims->has(anim)) {
 							r_rem_anims->insert(anim, HashSet<int>());
@@ -2318,35 +2289,6 @@ void SceneTreeDock::perform_node_renames(Node *p_base, HashMap<Node *, NodePath>
 								}
 							}
 						}
-
-						// key.get_path() of p_renames is like:
-						//  /root/@EditorNode@18033/@Panel@14/.../Scene/TheOldName
-						// value of p_renames is like:
-						//  /root/@EditorNode@18033/@Panel@14/.../Scene/TheNewName
-						for (const KeyValue<Node *, NodePath> &rename : *p_renames) {
-							NodePath old_path = rename.key->get_path();
-							NodePath new_path = rename.value;
-							if (new_path.is_empty()) {
-								continue;
-							}
-							Vector<StringName> rel_path = old_path.rel_path_to(new_path).get_names();
-
-							StringName old_node_name = rename.key->get_name();
-							StringName new_node_name = rel_path[rel_path.size() - 1];
-
-							anim->editor_set_group_folded(new_node_name, anim->editor_is_group_folded(old_node_name));
-							anim->editor_set_group_folded(old_node_name, false);
-						}
-
-						if (!anim->get_path().is_resource_file()) {
-							EditorNode::get_editor_folding().save_scene_folding(
-									EditorNode::get_singleton()->get_edited_scene(),
-									EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path());
-						} else {
-							EditorNode::get_editor_folding().save_resource_folding(
-									anim,
-									anim->get_path());
-						}
 					}
 				}
 			}
@@ -2401,7 +2343,7 @@ bool SceneTreeDock::_validate_no_foreign() {
 			// When edited_scene inherits from another one the root Node will be the parent Scene,
 			// we don't want to consider that Node a foreign one otherwise we would not be able to
 			// delete it.
-			if (edited_scene == E && current_option != TOOL_CHANGE_TYPE) {
+			if (edited_scene == E && current_option != TOOL_REPLACE) {
 				continue;
 			}
 
@@ -2487,6 +2429,9 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 		return; // Position and parent didn't change.
 	}
 
+	// Prevent selecting the hovered node and keep the reparented node(s) selected instead.
+	hovered_but_reparenting = true;
+
 	Node *validate = p_new_parent;
 	while (validate) {
 		ERR_FAIL_COND_MSG(p_nodes.has(validate), "Selection changed at some point. Can't reparent.");
@@ -2503,6 +2448,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 	Vector<StringName> former_names;
 
 	int inc = 0;
+	bool need_edit = false;
 
 	for (int ni = 0; ni < p_nodes.size(); ni++) {
 		// No undo implemented for this yet.
@@ -2523,7 +2469,11 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 			inc--; // If the child will generate a gap when moved, adjust.
 		}
 
-		if (!same_parent) {
+		if (same_parent) {
+			// When node is reparented to the same parent, EditorSelection does not change.
+			// After hovering another node, the inspector has to be manually updated in this case.
+			need_edit = select_node_hovered_at_end_of_drag;
+		} else {
 			undo_redo->add_do_method(node->get_parent(), "remove_child", node);
 			undo_redo->add_do_method(p_new_parent, "add_child", node, true);
 		}
@@ -2639,6 +2589,11 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 		undo_redo->add_undo_method(editor_selection, "add_node", E);
 	}
 
+	if (need_edit) {
+		EditorNode::get_singleton()->edit_current();
+		editor_selection->clear();
+	}
+
 	undo_redo->commit_action();
 }
 
@@ -2689,8 +2644,6 @@ void SceneTreeDock::_shader_created(Ref<Shader> p_shader) {
 	undo_redo->add_do_method(selected_shader_material.ptr(), "set_shader", p_shader);
 	undo_redo->add_undo_method(selected_shader_material.ptr(), "set_shader", existing);
 	undo_redo->commit_action();
-
-	EditorNode::get_singleton()->edit_item(p_shader.ptr(), this);
 }
 
 void SceneTreeDock::_script_creation_closed() {
@@ -3110,7 +3063,7 @@ void SceneTreeDock::_create() {
 
 		_do_create(parent);
 
-	} else if (current_option == TOOL_CHANGE_TYPE) {
+	} else if (current_option == TOOL_REPLACE) {
 		const List<Node *> selection = editor_selection->get_top_selected_node_list();
 		ERR_FAIL_COND(selection.is_empty());
 
@@ -3241,12 +3194,12 @@ void SceneTreeDock::replace_node(Node *p_node, Node *p_by_node) {
 	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 	ur->create_action(TTR("Change type of node(s)"), UndoRedo::MERGE_DISABLE, p_node);
 
-	ur->add_do_method(this, "replace_node", p_node, p_by_node, true);
+	ur->add_do_method(this, "replace_node", p_node, p_by_node, true, false);
 	ur->add_do_reference(p_by_node);
 
-	_replace_node(p_node, p_by_node, true);
+	_replace_node(p_node, p_by_node, true, false);
 
-	ur->add_undo_method(this, "replace_node", p_by_node, p_node, false);
+	ur->add_undo_method(this, "replace_node", p_by_node, p_node, false, false);
 	ur->add_undo_reference(p_node);
 
 	perform_node_replace(nullptr, p_node, p_by_node);
@@ -3254,7 +3207,7 @@ void SceneTreeDock::replace_node(Node *p_node, Node *p_by_node) {
 	ur->commit_action(false);
 }
 
-void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties) {
+void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties, bool p_remove_old) {
 	ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "_replace_node() can't be called on a node outside of tree. You might have called it twice.");
 	Node *oldnode = p_node;
 	Node *newnode = p_by_node;
@@ -3328,6 +3281,14 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro
 	}
 
 	String newname = oldnode->get_name();
+
+	List<Node *> to_erase;
+	for (int i = 0; i < oldnode->get_child_count(); i++) {
+		if (oldnode->get_child(i)->get_owner() == nullptr && oldnode->is_internal()) {
+			to_erase.push_back(oldnode->get_child(i));
+		}
+	}
+
 	if (oldnode == edited_scene) {
 		EditorNode::get_singleton()->set_edited_scene_root(newnode, false);
 	}
@@ -3344,9 +3305,22 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro
 		Node *c = newnode->get_child(i);
 		c->call("set_transform", c->call("get_transform"));
 	}
+	//p_remove_old was added to support undo
+	if (p_remove_old) {
+		EditorUndoRedoManager::get_singleton()->clear_history();
+	}
 	newnode->set_name(newname);
 
 	_push_item(newnode);
+
+	if (p_remove_old) {
+		memdelete(oldnode);
+
+		while (to_erase.front()) {
+			memdelete(to_erase.front()->get());
+			to_erase.pop_front();
+		}
+	}
 }
 
 void SceneTreeDock::perform_node_replace(Node *p_base, Node *p_node, Node *p_by_node) {
@@ -3428,7 +3402,6 @@ bool SceneTreeDock::_check_node_recursive(Variant &r_variant, Node *p_node, Node
 
 void SceneTreeDock::set_edited_scene(Node *p_scene) {
 	edited_scene = p_scene;
-	_update_create_root_dialog_visibility();
 }
 
 static bool _is_same_selection(const Vector<Node *> &p_first, const HashMap<ObjectID, Object *> &p_second) {
@@ -3586,12 +3559,29 @@ static bool _is_node_visible(Node *p_node) {
 	return true;
 }
 
+static bool _has_visible_children(Node *p_node) {
+	bool collapsed = p_node->is_displayed_folded();
+	if (collapsed) {
+		return false;
+	}
+
+	for (int i = 0; i < p_node->get_child_count(); i++) {
+		Node *child = p_node->get_child(i);
+		if (!_is_node_visible(child)) {
+			continue;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
 void SceneTreeDock::_normalize_drop(Node *&to_node, int &to_pos, int p_type) {
-	// Drop as last child, by default.
 	to_pos = -1;
 
 	if (p_type == -1) {
-		// Drop as sibling, above.
+		//drop at above selected node
 		if (to_node == EditorNode::get_singleton()->get_edited_scene()) {
 			to_node = nullptr;
 			ERR_FAIL_MSG("Cannot perform drop above the root node!");
@@ -3599,32 +3589,33 @@ void SceneTreeDock::_normalize_drop(Node *&to_node, int &to_pos, int p_type) {
 
 		to_pos = to_node->get_index(false);
 		to_node = to_node->get_parent();
+
 	} else if (p_type == 1) {
-		// Drop as child of root node if out of bounds.
+		//drop at below selected node
 		if (to_node == EditorNode::get_singleton()->get_edited_scene()) {
-			to_pos = -1;
+			//if at lower sibling of root node
+			to_pos = 0; //just insert at beginning of root node
 			return;
 		}
 
-		// Drop as sibling, below, by using indent space or when children are collapsed.
 		Node *lower_sibling = nullptr;
 
-		for (int i = to_node->get_index(false) + 1; i < to_node->get_parent()->get_child_count(false); i++) {
-			Node *c = to_node->get_parent()->get_child(i, false);
-			if (_is_node_visible(c)) {
-				lower_sibling = c;
-				break;
+		if (_has_visible_children(to_node)) {
+			to_pos = 0;
+		} else {
+			for (int i = to_node->get_index(false) + 1; i < to_node->get_parent()->get_child_count(false); i++) {
+				Node *c = to_node->get_parent()->get_child(i, false);
+				if (_is_node_visible(c)) {
+					lower_sibling = c;
+					break;
+				}
+			}
+			if (lower_sibling) {
+				to_pos = lower_sibling->get_index(false);
 			}
-		}
 
-		if (lower_sibling) {
-			to_pos = lower_sibling->get_index(false);
+			to_node = to_node->get_parent();
 		}
-
-		to_node = to_node->get_parent();
-	} else if (p_type == 2) {
-		// Drop as first child, among others.
-		to_pos = 0;
 	}
 }
 
@@ -3853,7 +3844,6 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 
 		menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Add")), ED_GET_SHORTCUT("scene_tree/add_child_node"), TOOL_NEW);
 		menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Instance")), ED_GET_SHORTCUT("scene_tree/instantiate_scene"), TOOL_INSTANTIATE);
-		EditorContextMenuPluginManager::get_singleton()->add_options_from_plugins(menu, EditorContextMenuPlugin::CONTEXT_SLOT_SCENE_TREE, PackedStringArray());
 
 		menu->reset_size();
 		menu->set_position(p_menu_pos);
@@ -3865,21 +3855,21 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 	bool section_ended = false;
 
 // Marks beginning of a new separated section. When used multiple times in a row, only first use has effect.
-#define BEGIN_SECTION() \
-	{ \
-		if (section_ended) { \
+#define BEGIN_SECTION()            \
+	{                              \
+		if (section_ended) {       \
 			section_ended = false; \
 			menu->add_separator(); \
-		} \
-		section_started = true; \
+		}                          \
+		section_started = true;    \
 	}
 // Marks end of a section.
-#define END_SECTION() \
-	{ \
-		if (section_started) { \
-			section_ended = true; \
+#define END_SECTION()                \
+	{                                \
+		if (section_started) {       \
+			section_ended = true;    \
 			section_started = false; \
-		} \
+		}                            \
 	}
 
 	Ref<Script> existing_script;
@@ -3915,48 +3905,15 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		END_SECTION()
 	}
 
-	bool can_rename = true;
-	bool can_replace = true;
-
 	if (profile_allow_editing) {
-		for (Node *E : selection) {
-			if (E != edited_scene && (E->get_owner() != edited_scene || E->is_instance())) {
-				can_replace = false;
-				if (!E->is_instance()) {
-					can_rename = false;
-				}
-			}
-
-			if (edited_scene->get_scene_inherited_state().is_valid()) {
-				if (E == edited_scene || edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E)) >= 0) {
-					can_replace = false;
-					can_rename = false;
-				}
-			}
-
-			if (!can_rename && !can_replace) {
-				break;
-			}
-		}
-
 		BEGIN_SECTION()
 		menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionCut")), ED_GET_SHORTCUT("scene_tree/cut_node"), TOOL_CUT);
 		menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionCopy")), ED_GET_SHORTCUT("scene_tree/copy_node"), TOOL_COPY);
-		if (!node_clipboard.is_empty()) {
-			if (selection.size() == 1) {
-				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionPaste")), ED_GET_SHORTCUT("scene_tree/paste_node"), TOOL_PASTE);
-				menu->add_shortcut(ED_GET_SHORTCUT("scene_tree/paste_node_as_sibling"), TOOL_PASTE_AS_SIBLING);
-				if (selection.front()->get() == edited_scene) {
-					menu->set_item_disabled(-1, true);
-				}
-			}
-			if (selection.size() >= 1) {
-				if (can_rename || can_replace) {
-					menu->add_shortcut(ED_GET_SHORTCUT("scene_tree/paste_node_as_replacement"), TOOL_PASTE_AS_REPLACEMENT);
-				}
-				if (selection.front()->get() == edited_scene) {
-					menu->set_item_disabled(-1, true);
-				}
+		if (selection.size() == 1 && !node_clipboard.is_empty()) {
+			menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionPaste")), ED_GET_SHORTCUT("scene_tree/paste_node"), TOOL_PASTE);
+			menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ActionPaste")), ED_GET_SHORTCUT("scene_tree/paste_node_as_sibling"), TOOL_PASTE_AS_SIBLING);
+			if (selection.front()->get() == edited_scene) {
+				menu->set_item_disabled(-1, true);
 			}
 		}
 		END_SECTION()
@@ -3994,13 +3951,36 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 	}
 
 	if (profile_allow_editing) {
+		bool can_rename = true;
+		bool can_replace = true;
+
+		for (Node *E : selection) {
+			if (E != edited_scene && (E->get_owner() != edited_scene || E->is_instance())) {
+				can_replace = false;
+				if (!E->is_instance()) {
+					can_rename = false;
+				}
+			}
+
+			if (edited_scene->get_scene_inherited_state().is_valid()) {
+				if (E == edited_scene || edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E)) >= 0) {
+					can_replace = false;
+					can_rename = false;
+				}
+			}
+
+			if (!can_rename && !can_replace) {
+				break;
+			}
+		}
+
 		if (can_rename || can_replace) {
 			BEGIN_SECTION()
 			if (can_rename) {
 				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Rename")), ED_GET_SHORTCUT("scene_tree/rename"), TOOL_RENAME);
 			}
 			if (can_replace) {
-				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Reload")), ED_GET_SHORTCUT("scene_tree/change_node_type"), TOOL_CHANGE_TYPE);
+				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Reload")), ED_GET_SHORTCUT("scene_tree/change_node_type"), TOOL_REPLACE);
 			}
 			END_SECTION()
 		}
@@ -4077,7 +4057,6 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 					menu->add_item(TTR("Make Local"), TOOL_SCENE_MAKE_LOCAL);
 				}
 				menu->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open in Editor"), TOOL_SCENE_OPEN);
-				menu->set_item_shortcut(-1, ED_GET_SHORTCUT("scene_tree/open_scene_in_editor"));
 				if (profile_allow_editing) {
 					menu->set_item_checked(menu->get_item_idx_from_text(TTR("Editable Children")), editable);
 					menu->set_item_checked(menu->get_item_idx_from_text(TTR("Load as Placeholder")), placeholder);
@@ -4449,9 +4428,6 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
 			ur->add_do_method(EditorNode::get_singleton(), "set_edited_scene", dup);
 		} else {
 			ur->add_do_method(paste_parent, "add_child", dup, true);
-			if (paste_sibling) {
-				ur->add_do_method(paste_parent, "move_child", dup, paste_sibling->get_index() + 1);
-			}
 		}
 
 		for (KeyValue<const Node *, Node *> &E2 : duplimap) {
@@ -4495,91 +4471,8 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
 	return pasted_nodes;
 }
 
-void SceneTreeDock::paste_node_as_replacement() {
-	List<Node *> selected_node_list = editor_selection->get_top_selected_node_list();
-	for (Node *selected : selected_node_list) {
-		Node *clipboard_node = node_clipboard.front()->get();
-		HashMap<const Node *, Node *> duplimap;
-		Node *new_node = clipboard_node->duplicate_from_editor(duplimap);
-		if (!new_node) {
-			continue;
-		}
-		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-		String old_scene_file_path = selected->get_scene_file_path();
-		String new_scene_file_path = clipboard_node->get_scene_file_path();
-
-		bool old_is_scene = !old_scene_file_path.is_empty();
-		bool new_is_scene = !new_scene_file_path.is_empty();
-
-		LocalVector<Node *> old_children;
-
-		ur->create_action(TTR("Paste Node(s) as Replacement"), UndoRedo::MERGE_ALL, selected);
-
-		if (old_is_scene) {
-			for (int i = 0; i < selected->get_child_count(); i++) {
-				Node *child = selected->get_child(i);
-				if (child->get_owner() == selected) {
-					ur->add_do_method(selected, "remove_child", child);
-
-					selected->remove_child(child);
-					old_children.push_back(child);
-				}
-			}
-		}
-
-		ur->add_do_method(this, "replace_node", selected, new_node, false);
-		ur->add_do_method(new_node, "set_scene_file_path", new_scene_file_path);
-		ur->add_do_reference(new_node);
-
-		if (new_is_scene) {
-			for (int i = 0; i < new_node->get_child_count(); i++) {
-				Node *child = new_node->get_child(i);
-				if (child->get_owner() == new_node) {
-					ur->add_undo_method(new_node, "add_child", child, true);
-					ur->add_undo_method(child, "set_owner", new_node);
-					ur->add_undo_reference(child);
-				}
-			}
-		}
-
-		Variant selected_pos;
-		if (selected->has_method("get_position")) {
-			selected_pos = selected->call("get_position");
-		}
-		_replace_node(selected, new_node, false);
-		new_node->set_scene_file_path(new_scene_file_path);
-
-		if (new_node->has_method("set_position")) {
-			new_node->call("set_position", selected_pos);
-		}
-
-		if (new_is_scene) {
-			for (int i = 0; i < new_node->get_child_count(); i++) {
-				Node *child = new_node->get_child(i);
-				if (child->get_owner() == new_node) {
-					ur->add_undo_method(new_node, "remove_child", child);
-				}
-			}
-		}
-
-		ur->add_undo_method(this, "replace_node", new_node, selected, false);
-		ur->add_undo_method(selected, "set_scene_file_path", old_scene_file_path);
-		ur->add_undo_reference(selected);
-
-		if (old_is_scene) {
-			for (Node *child : old_children) {
-				ur->add_undo_method(selected, "add_child", child, true);
-				ur->add_undo_method(child, "set_owner", selected);
-				ur->add_undo_reference(child);
-			}
-		}
-
-		ur->commit_action(false);
-	}
-}
-
 List<Node *> SceneTreeDock::get_node_clipboard() const {
-	return List<Node *>(node_clipboard);
+	return node_clipboard;
 }
 
 void SceneTreeDock::add_remote_tree_editor(Tree *p_remote) {
@@ -4621,29 +4514,16 @@ void SceneTreeDock::_remote_tree_selected() {
 }
 
 void SceneTreeDock::_local_tree_selected() {
+	if (!bool(EDITOR_GET("interface/editors/show_scene_tree_root_selection")) || get_tree()->get_edited_scene_root() != nullptr) {
+		scene_tree->show();
+	}
 	if (remote_tree) {
 		remote_tree->hide();
 	}
-	_update_create_root_dialog_visibility();
 	edit_remote->set_pressed(false);
 	edit_local->set_pressed(true);
 }
 
-void SceneTreeDock::_update_create_root_dialog_visibility() {
-	if (remote_tree && remote_tree->is_visible()) {
-		return;
-	}
-	if (edited_scene == nullptr) {
-		main_mc->set_theme_type_variation("");
-		create_root_dialog->show();
-		scene_tree->hide();
-	} else {
-		main_mc->set_theme_type_variation("NoBorderHorizontalBottom");
-		create_root_dialog->hide();
-		scene_tree->show();
-	}
-}
-
 void SceneTreeDock::_update_create_root_dialog(bool p_initializing) {
 	if (!p_initializing) {
 		EditorSettings::get_singleton()->set_setting("_use_favorites_root_selection", node_shortcuts_toggle->is_pressed());
@@ -4898,7 +4778,7 @@ void SceneTreeDock::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("remote_tree_selected"));
 	ADD_SIGNAL(MethodInfo("add_node_used"));
-	ADD_SIGNAL(MethodInfo("node_created", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("node_created", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 }
 
 SceneTreeDock *SceneTreeDock::singleton = nullptr;
@@ -4937,9 +4817,8 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	ED_SHORTCUT("scene_tree/expand_collapse_all", TTRC("Expand/Collapse Branch"));
 	ED_SHORTCUT("scene_tree/cut_node", TTRC("Cut"), KeyModifierMask::CMD_OR_CTRL | Key::X);
 	ED_SHORTCUT("scene_tree/copy_node", TTRC("Copy"), KeyModifierMask::CMD_OR_CTRL | Key::C);
-	ED_SHORTCUT("scene_tree/paste_node", TTRC("Paste (as Child)"), KeyModifierMask::CMD_OR_CTRL | Key::V);
+	ED_SHORTCUT("scene_tree/paste_node", TTRC("Paste"), KeyModifierMask::CMD_OR_CTRL | Key::V);
 	ED_SHORTCUT("scene_tree/paste_node_as_sibling", TTRC("Paste as Sibling"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::V);
-	ED_SHORTCUT("scene_tree/paste_node_as_replacement", TTRC("Paste as Replacement"), KeyModifierMask::ALT | Key::V);
 	ED_SHORTCUT("scene_tree/change_node_type", TTRC("Change Type..."));
 	ED_SHORTCUT("scene_tree/attach_script", TTRC("Attach Script..."));
 	ED_SHORTCUT("scene_tree/extend_script", TTRC("Extend Script..."));
@@ -4955,7 +4834,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	ED_SHORTCUT("scene_tree/show_in_file_system", TTRC("Show in FileSystem"));
 	ED_SHORTCUT("scene_tree/toggle_unique_name", TTRC("Toggle Access as Unique Name"));
 	ED_SHORTCUT("scene_tree/toggle_editable_children", TTRC("Toggle Editable Children"));
-	ED_SHORTCUT_ARRAY("scene_tree/open_scene_in_editor", TTRC("Open Scene in Editor"), { int32_t(Key::SLASH), int32_t(KeyModifierMask::SHIFT | Key::COLON) });
 	ED_SHORTCUT("scene_tree/delete_no_confirm", TTRC("Delete (No Confirm)"), KeyModifierMask::SHIFT | Key::KEY_DELETE);
 	ED_SHORTCUT("scene_tree/delete", TTRC("Delete"), Key::KEY_DELETE);
 
@@ -5110,7 +4988,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	set_process_shortcut_input(true);
 
 	delete_dialog = memnew(ConfirmationDialog);
-	delete_dialog->set_ok_button_text(TTRC("Delete"));
 	add_child(delete_dialog);
 	delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_delete_confirm).bind(false));
 
@@ -5159,6 +5036,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	add_child(clear_inherit_confirm);
 
 	set_process_input(true);
+	set_process(true);
 
 	EDITOR_DEF("_use_favorites_root_selection", false);
 
diff --git a/engine/editor/docks/scene_tree_dock.h b/engine/editor/docks/scene_tree_dock.h
index 6b4a7d96..c3d1a4ad 100644
--- a/engine/editor/docks/scene_tree_dock.h
+++ b/engine/editor/docks/scene_tree_dock.h
@@ -59,10 +59,9 @@ class SceneTreeDock : public EditorDock {
 		TOOL_COPY,
 		TOOL_PASTE,
 		TOOL_PASTE_AS_SIBLING,
-		TOOL_PASTE_AS_REPLACEMENT,
 		TOOL_RENAME,
 		TOOL_BATCH_RENAME,
-		TOOL_CHANGE_TYPE,
+		TOOL_REPLACE,
 		TOOL_EXTEND_SCRIPT,
 		TOOL_ATTACH_SCRIPT,
 		TOOL_DETACH_SCRIPT,
@@ -242,8 +241,8 @@ class SceneTreeDock : public EditorDock {
 	TreeItem *tree_item_inspected = nullptr;
 	Node *node_hovered_now = nullptr;
 	Node *node_hovered_previously = nullptr;
-	Object *edited_object_at_drag_start = nullptr;
-	bool scene_tree_drag_active = false;
+	bool select_node_hovered_at_end_of_drag = false;
+	bool hovered_but_reparenting = false;
 
 	virtual void input(const Ref<InputEvent> &p_event) override;
 	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
@@ -285,7 +284,6 @@ class SceneTreeDock : public EditorDock {
 	void _local_tree_selected();
 
 	void _update_create_root_dialog(bool p_initializing = false);
-	void _update_create_root_dialog_visibility();
 	void _favorite_root_selected(const String &p_class);
 
 	void _feature_profile_changed();
@@ -308,7 +306,7 @@ class SceneTreeDock : public EditorDock {
 	void _check_object_properties_recursive(Node *p_root_node, Object *p_obj, HashMap<Node *, NodePath> *p_renames, bool p_inside_resource = false) const;
 	bool _check_node_path_recursive(Node *p_root_node, Variant &r_variant, HashMap<Node *, NodePath> *p_renames, bool p_inside_resource = false) const;
 	bool _check_node_recursive(Variant &r_variant, Node *p_node, Node *p_by_node, const String type_hint, String &r_warn_message);
-	void _replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties = true);
+	void _replace_node(Node *p_node, Node *p_by_node, bool p_keep_properties = true, bool p_remove_old = true);
 
 private:
 	static SceneTreeDock *singleton;
@@ -358,7 +356,6 @@ public:
 	void open_instance_child_dialog();
 
 	List<Node *> paste_nodes(bool p_paste_as_sibling = false);
-	void paste_node_as_replacement();
 	List<Node *> get_node_clipboard() const;
 
 	ScriptCreateDialog *get_script_create_dialog() {
diff --git a/engine/editor/editor_builders.py b/engine/editor/editor_builders.py
index 26f871ac..c7d04d06 100644
--- a/engine/editor/editor_builders.py
+++ b/engine/editor/editor_builders.py
@@ -85,7 +85,7 @@ def make_translations(target, source, env):
             # msgfmt erases non-translated messages, so avoid using it if exporting the POT.
             if msgfmt and name != category:
                 mo_path = os.path.join(tempfile.gettempdir(), uuid.uuid4().hex + ".mo")
-                cmd = f'{msgfmt} "{path}" --no-hash -o "{mo_path}"'
+                cmd = f"{msgfmt} {path} --no-hash -o {mo_path}"
                 try:
                     subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
                     buffer = methods.get_buffer(mo_path)
diff --git a/engine/editor/editor_data.cpp b/engine/editor/editor_data.cpp
index fce9b48c..f84e1685 100644
--- a/engine/editor/editor_data.cpp
+++ b/engine/editor/editor_data.cpp
@@ -34,15 +34,11 @@
 #include "core/extension/gdextension_manager.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/time.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_context_menu_plugin.h"
 #include "editor/inspector/multi_node_edit.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/main/scene_tree.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
 
@@ -271,9 +267,9 @@ EditorPlugin *EditorData::get_handling_main_editor(Object *p_object) {
 
 Vector<EditorPlugin *> EditorData::get_handling_sub_editors(Object *p_object) {
 	Vector<EditorPlugin *> sub_plugins;
-	for (EditorPlugin *plugin : editor_plugins) {
-		if (!plugin->has_main_screen() && plugin->handles(p_object)) {
-			sub_plugins.push_back(plugin);
+	for (int i = editor_plugins.size() - 1; i > -1; i--) {
+		if (!editor_plugins[i]->has_main_screen() && editor_plugins[i]->handles(p_object)) {
+			sub_plugins.push_back(editor_plugins[i]);
 		}
 	}
 	return sub_plugins;
@@ -621,7 +617,6 @@ int EditorData::add_edited_scene(int p_at_pos) {
 	es.history_current = -1;
 	es.live_edit_root = NodePath(String("/root"));
 	es.history_id = last_created_scene++;
-	es.time_opened = Time::get_singleton()->get_unix_time_from_system();
 
 	if (p_at_pos == edited_scene.size()) {
 		edited_scene.push_back(es);
@@ -821,11 +816,6 @@ Vector<EditorData::EditedScene> EditorData::get_edited_scenes() const {
 	return out_edited_scenes_list;
 }
 
-uint64_t EditorData::get_scene_time_opened(int p_idx) const {
-	ERR_FAIL_INDEX_V(p_idx, edited_scene.size(), 0);
-	return edited_scene[p_idx].time_opened;
-}
-
 void EditorData::set_scene_modified_time(int p_idx, uint64_t p_time) {
 	if (p_idx == -1) {
 		p_idx = current_edited_scene;
@@ -1332,20 +1322,16 @@ void EditorSelection::_update_node_list() {
 	node_list_changed = false;
 }
 
-void EditorSelection::update(bool p_deferred) {
+void EditorSelection::update() {
 	_update_node_list();
 
 	if (!changed) {
 		return;
 	}
 	changed = false;
-	if (p_deferred) {
-		if (!emitted) {
-			emitted = true;
-			callable_mp(this, &EditorSelection::_emit_change).call_deferred();
-		}
-	} else {
-		_emit_change();
+	if (!emitted) {
+		emitted = true;
+		callable_mp(this, &EditorSelection::_emit_change).call_deferred();
 	}
 }
 
diff --git a/engine/editor/editor_data.h b/engine/editor/editor_data.h
index 62acc195..9e5cca53 100644
--- a/engine/editor/editor_data.h
+++ b/engine/editor/editor_data.h
@@ -122,7 +122,6 @@ public:
 		NodePath live_edit_root;
 		int history_id = 0;
 		uint64_t last_checked_version = 0;
-		uint64_t time_opened = 0;
 	};
 
 private:
@@ -215,7 +214,6 @@ public:
 	String get_scene_type(int p_idx) const;
 	void set_scene_path(int p_idx, const String &p_path);
 	Ref<Script> get_scene_root_script(int p_idx) const;
-	uint64_t get_scene_time_opened(int p_idx) const;
 	void set_scene_modified_time(int p_idx, uint64_t p_time);
 	uint64_t get_scene_modified_time(int p_idx) const;
 	void clear_edited_scenes();
@@ -318,7 +316,7 @@ public:
 	// Adds an editor plugin which can provide metadata for selected nodes.
 	void add_editor_plugin(Object *p_object);
 
-	void update(bool p_deferred = true);
+	void update();
 	void clear();
 
 	// Returns only the top level selected nodes.
diff --git a/engine/editor/editor_interface.compat.inc b/engine/editor/editor_interface.compat.inc
index e9c26367..26223863 100644
--- a/engine/editor/editor_interface.compat.inc
+++ b/engine/editor/editor_interface.compat.inc
@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISABLE_DEPRECATED
-
 #include "editor_interface.h"
 
-#include "core/object/class_db.h"
+#ifndef DISABLE_DEPRECATED
 
 void EditorInterface::_popup_node_selector_bind_compat_94323(const Callable &p_callback, const TypedArray<StringName> &p_valid_types) {
 	popup_node_selector(p_callback, p_valid_types, nullptr);
@@ -52,4 +50,4 @@ void EditorInterface::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("open_scene_from_path", "scene_path"), &EditorInterface::_open_scene_from_path_bind_compat_90057);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/editor/editor_interface.cpp b/engine/editor/editor_interface.cpp
index d5d1b5e0..9c6729d9 100644
--- a/engine/editor/editor_interface.cpp
+++ b/engine/editor/editor_interface.cpp
@@ -31,11 +31,8 @@
 #include "editor_interface.h"
 #include "editor_interface.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
@@ -62,11 +59,8 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/main/window.h"
-#include "scene/resources/image_texture.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/theme.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 EditorInterface *EditorInterface::singleton = nullptr;
 
@@ -154,7 +148,7 @@ Vector<Ref<Texture2D>> EditorInterface::make_mesh_previews(const Vector<Ref<Mesh
 	RID scenario = RS::get_singleton()->scenario_create();
 
 	RID viewport = RS::get_singleton()->viewport_create();
-	RS::get_singleton()->viewport_set_update_mode(viewport, RSE::VIEWPORT_UPDATE_ALWAYS);
+	RS::get_singleton()->viewport_set_update_mode(viewport, RS::VIEWPORT_UPDATE_ALWAYS);
 	RS::get_singleton()->viewport_set_scenario(viewport, scenario);
 	RS::get_singleton()->viewport_set_size(viewport, size, size);
 	RS::get_singleton()->viewport_set_transparent_background(viewport, true);
@@ -730,19 +724,10 @@ PackedStringArray EditorInterface::get_open_scenes() const {
 	Vector<EditorData::EditedScene> scenes = EditorNode::get_editor_data().get_edited_scenes();
 
 	for (EditorData::EditedScene &edited_scene : scenes) {
-		ret.push_back(edited_scene.path);
-	}
-	return ret;
-}
-
-PackedStringArray EditorInterface::get_unsaved_scenes() const {
-	PackedStringArray ret;
-	Vector<EditorData::EditedScene> scenes = EditorNode::get_editor_data().get_edited_scenes();
-
-	for (int i = 0; i < scenes.size(); i++) {
-		if (EditorNode::get_singleton()->is_scene_unsaved(i)) {
-			ret.push_back(scenes[i].path);
+		if (edited_scene.root == nullptr) {
+			continue;
 		}
+		ret.push_back(edited_scene.root->get_scene_file_path());
 	}
 	return ret;
 }
@@ -924,7 +909,6 @@ void EditorInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_object_edited", "object"), &EditorInterface::is_object_edited);
 
 	ClassDB::bind_method(D_METHOD("get_open_scenes"), &EditorInterface::get_open_scenes);
-	ClassDB::bind_method(D_METHOD("get_unsaved_scenes"), &EditorInterface::get_unsaved_scenes);
 	ClassDB::bind_method(D_METHOD("get_open_scene_roots"), &EditorInterface::get_open_scene_roots);
 	ClassDB::bind_method(D_METHOD("get_edited_scene_root"), &EditorInterface::get_edited_scene_root);
 
diff --git a/engine/editor/editor_interface.h b/engine/editor/editor_interface.h
index 9bb588f8..1cd86511 100644
--- a/engine/editor/editor_interface.h
+++ b/engine/editor/editor_interface.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/script_language.h"
 
@@ -178,8 +179,6 @@ public:
 	bool is_object_edited(Object *p_object) const;
 
 	PackedStringArray get_open_scenes() const;
-	PackedStringArray get_unsaved_scenes() const;
-
 	TypedArray<Node> get_open_scene_roots() const;
 	Node *get_edited_scene_root() const;
 
@@ -203,9 +202,7 @@ public:
 	void set_movie_maker_enabled(bool p_enabled);
 	bool is_movie_maker_enabled() const;
 
-#ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
-#endif
 
 	// Base.
 	static void create();
diff --git a/engine/editor/editor_log.cpp b/engine/editor/editor_log.cpp
index b7bb696b..2bb472c3 100644
--- a/engine/editor/editor_log.cpp
+++ b/engine/editor/editor_log.cpp
@@ -30,27 +30,23 @@
 
 #include "editor_log.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/message_queue.h"
 #include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "modules/regex/regex.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/flow_container.h"
 #include "scene/gui/separator.h"
 #include "scene/main/timer.h"
 #include "scene/resources/font.h"
-#include "servers/display/display_server.h"
 
 void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) {
 	EditorLog *self = static_cast<EditorLog *>(p_self);
@@ -110,23 +106,20 @@ void EditorLog::_update_theme() {
 	log->add_theme_font_size_override("mono_font_size", font_size);
 	log->end_bulk_theme_override();
 
-	const String wide_text = "MMM";
+	type_filter_map[MSG_TYPE_STD]->toggle_button->set_button_icon(get_editor_theme_icon(SNAME("Popup")));
+	type_filter_map[MSG_TYPE_ERROR]->toggle_button->set_button_icon(get_editor_theme_icon(SNAME("StatusError")));
+	type_filter_map[MSG_TYPE_WARNING]->toggle_button->set_button_icon(get_editor_theme_icon(SNAME("StatusWarning")));
+	type_filter_map[MSG_TYPE_EDITOR]->toggle_button->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
 
-	Button *button = type_filter_map[MSG_TYPE_STD]->toggle_button;
-	button->set_button_icon(get_editor_theme_icon(SNAME("Popup")));
-	button->set_custom_minimum_size(Vector2(button->get_minimum_size_for_text_and_icon(wide_text, button->get_button_icon()).x * EDSCALE, 0));
-	button = type_filter_map[MSG_TYPE_ERROR]->toggle_button;
-	button->set_button_icon(get_editor_theme_icon(SNAME("StatusError")));
-	button->set_custom_minimum_size(Vector2(button->get_minimum_size_for_text_and_icon(wide_text, button->get_button_icon()).x * EDSCALE, 0));
-	button = type_filter_map[MSG_TYPE_WARNING]->toggle_button;
-	button->set_button_icon(get_editor_theme_icon(SNAME("StatusWarning")));
-	button->set_custom_minimum_size(Vector2(button->get_minimum_size_for_text_and_icon(wide_text, button->get_button_icon()).x * EDSCALE, 0));
-	button = type_filter_map[MSG_TYPE_EDITOR]->toggle_button;
-	button->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
-	button->set_custom_minimum_size(Vector2(button->get_minimum_size_for_text_and_icon(wide_text, button->get_button_icon()).x * EDSCALE, 0));
+	type_filter_map[MSG_TYPE_STD]->toggle_button->set_theme_type_variation("EditorLogFilterButton");
+	type_filter_map[MSG_TYPE_ERROR]->toggle_button->set_theme_type_variation("EditorLogFilterButton");
+	type_filter_map[MSG_TYPE_WARNING]->toggle_button->set_theme_type_variation("EditorLogFilterButton");
+	type_filter_map[MSG_TYPE_EDITOR]->toggle_button->set_theme_type_variation("EditorLogFilterButton");
 
 	clear_button->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
+	copy_button->set_button_icon(get_editor_theme_icon(SNAME("ActionCopy")));
 	collapse_button->set_button_icon(get_editor_theme_icon(SNAME("CombineLines")));
+	show_search_button->set_button_icon(get_editor_theme_icon(SNAME("Search")));
 	search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 
 	theme_cache.error_color = get_theme_color(SNAME("error_color"), EditorStringName(Editor));
@@ -151,13 +144,6 @@ void EditorLog::_notification(int p_what) {
 			_load_state();
 		} break;
 
-		case NOTIFICATION_EXIT_TREE: {
-			if (!save_state_timer->is_stopped()) {
-				_save_state();
-				save_state_timer->stop();
-			}
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			_update_theme();
 			_rebuild_log();
@@ -165,17 +151,6 @@ void EditorLog::_notification(int p_what) {
 	}
 }
 
-void EditorLog::shortcut_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEventKey> key = p_event;
-	if (key.is_valid() && key->is_pressed() && !key->is_echo()) {
-		if (ED_IS_SHORTCUT("editor/open_search", p_event)) {
-			search_box->grab_focus();
-			search_box->select_all();
-			accept_event();
-		}
-	}
-}
-
 void EditorLog::_set_collapse(bool p_collapse) {
 	collapse = p_collapse;
 	_start_state_save_timer();
@@ -189,20 +164,40 @@ void EditorLog::_start_state_save_timer() {
 }
 
 void EditorLog::_save_state() {
+	Ref<ConfigFile> config;
+	config.instantiate();
+	// Load and amend existing config if it exists.
+	config->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_layout.cfg"));
+
+	const String section = "editor_log";
 	for (const KeyValue<MessageType, LogFilter *> &E : type_filter_map) {
-		EditorSettings::get_singleton()->set_setting("_editor_log_filter_" + itos(E.key), E.value->is_active());
+		config->set_value(section, "log_filter_" + itos(E.key), E.value->is_active());
 	}
-	EditorSettings::get_singleton()->set_setting("_editor_log_collapse", collapse);
-	EditorSettings::save();
+
+	config->set_value(section, "collapse", collapse);
+	config->set_value(section, "show_search", search_box->is_visible());
+
+	config->save(EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_layout.cfg"));
 }
 
 void EditorLog::_load_state() {
 	is_loading_state = true;
 
+	Ref<ConfigFile> config;
+	config.instantiate();
+	config->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_layout.cfg"));
+
+	// Run the below code even if config->load returns an error, since we want the defaults to be set even if the file does not exist yet.
+	const String section = "editor_log";
 	for (const KeyValue<MessageType, LogFilter *> &E : type_filter_map) {
-		E.value->set_active(EDITOR_DEF("_editor_log_filter_" + itos(E.key), true));
+		E.value->set_active(config->get_value(section, "log_filter_" + itos(E.key), true));
 	}
-	collapse_button->set_pressed(EDITOR_DEF("_editor_log_collapse", false));
+
+	collapse = config->get_value(section, "collapse", false);
+	collapse_button->set_pressed(collapse);
+	bool show_search = config->get_value(section, "show_search", true);
+	search_box->set_visible(show_search);
+	show_search_button->set_pressed(show_search);
 
 	is_loading_state = false;
 }
@@ -244,6 +239,18 @@ void EditorLog::_clear_request() {
 	_set_dock_tab_icon(Ref<Texture2D>());
 }
 
+void EditorLog::_copy_request() {
+	String text = log->get_selected_text();
+
+	if (text.is_empty()) {
+		text = log->get_parsed_text();
+	}
+
+	if (!text.is_empty()) {
+		DisplayServer::get_singleton()->clipboard_set(text);
+	}
+}
+
 void EditorLog::clear() {
 	_clear_request();
 }
@@ -406,7 +413,7 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) {
 			Ref<Texture2D> icon = theme_cache.error_icon;
 			log->add_image(icon);
 			log->push_bold();
-			log->add_text(U" ERROR: ");
+			log->add_text(" ERROR: ");
 			log->pop(); // bold
 			_set_dock_tab_icon(icon);
 		} break;
@@ -415,7 +422,7 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) {
 			Ref<Texture2D> icon = theme_cache.warning_icon;
 			log->add_image(icon);
 			log->push_bold();
-			log->add_text(U" WARNING: ");
+			log->add_text(" WARNING: ");
 			log->pop(); // bold
 			_set_dock_tab_icon(icon);
 		} break;
@@ -461,6 +468,14 @@ void EditorLog::_set_filter_active(bool p_active, MessageType p_message_type) {
 	_rebuild_log();
 }
 
+void EditorLog::_set_search_visible(bool p_visible) {
+	search_box->set_visible(p_visible);
+	if (p_visible) {
+		search_box->grab_focus();
+	}
+	_start_state_save_timer();
+}
+
 void EditorLog::_search_changed(const String &p_text) {
 	_rebuild_log();
 }
@@ -477,8 +492,6 @@ EditorLog::EditorLog() {
 	set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_output_bottom_panel", TTRC("Toggle Output Dock"), KeyModifierMask::ALT | Key::O));
 	set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
 	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
-	set_process_shortcut_input(true);
-	set_shortcut_context(this);
 
 	save_state_timer = memnew(Timer);
 	save_state_timer->set_wait_time(2);
@@ -493,7 +506,7 @@ EditorLog::EditorLog() {
 	add_child(hb);
 
 	VBoxContainer *vb_left = memnew(VBoxContainer);
-	vb_left->set_custom_minimum_size(Size2(0, 90 * EDSCALE));
+	vb_left->set_custom_minimum_size(Size2(0, 180) * EDSCALE);
 	vb_left->set_v_size_flags(SIZE_EXPAND_FILL);
 	vb_left->set_h_size_flags(SIZE_EXPAND_FILL);
 	hb->add_child(vb_left);
@@ -512,22 +525,23 @@ EditorLog::EditorLog() {
 	log->connect("meta_clicked", callable_mp(this, &EditorLog::_meta_clicked));
 	vb_left->add_child(log);
 
-	HFlowContainer *bottom_hf = memnew(HFlowContainer);
-	vb_left->add_child(bottom_hf);
-
-	HBoxContainer *hbox = memnew(HBoxContainer);
-	hbox->set_h_size_flags(SIZE_EXPAND_FILL);
-	bottom_hf->add_child(hbox);
-
 	// Search box
 	search_box = memnew(LineEdit);
-	search_box->set_custom_minimum_size(Vector2(200 * EDSCALE, 0));
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	search_box->set_placeholder(TTRC("Filter Messages"));
+	search_box->set_placeholder(TTR("Filter Messages"));
 	search_box->set_accessibility_name(TTRC("Filter Messages"));
 	search_box->set_clear_button_enabled(true);
+	search_box->set_visible(true);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorLog::_search_changed));
-	hbox->add_child(search_box);
+	vb_left->add_child(search_box);
+
+	VBoxContainer *vb_right = memnew(VBoxContainer);
+	hb->add_child(vb_right);
+
+	// Tools grid
+	HBoxContainer *hb_tools = memnew(HBoxContainer);
+	hb_tools->set_h_size_flags(SIZE_SHRINK_CENTER);
+	vb_right->add_child(hb_tools);
 
 	// Clear.
 	clear_button = memnew(Button);
@@ -536,13 +550,25 @@ EditorLog::EditorLog() {
 	clear_button->set_focus_mode(FOCUS_ACCESSIBILITY);
 	clear_button->set_shortcut(ED_SHORTCUT("editor/clear_output", TTRC("Clear Output"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::ALT | Key::K));
 	clear_button->connect(SceneStringName(pressed), callable_mp(this, &EditorLog::_clear_request));
-	hbox->add_child(clear_button);
+	hb_tools->add_child(clear_button);
+
+	// Copy.
+	copy_button = memnew(Button);
+	copy_button->set_accessibility_name(TTRC("Copy Selection"));
+	copy_button->set_theme_type_variation(SceneStringName(FlatButton));
+	copy_button->set_focus_mode(FOCUS_ACCESSIBILITY);
+	copy_button->set_shortcut(ED_SHORTCUT("editor/copy_output", TTRC("Copy Selection"), KeyModifierMask::CMD_OR_CTRL | Key::C));
+	copy_button->set_shortcut_context(this);
+	copy_button->connect(SceneStringName(pressed), callable_mp(this, &EditorLog::_copy_request));
+	hb_tools->add_child(copy_button);
 
 	// Separate toggle buttons from normal buttons.
-	hbox->add_child(memnew(VSeparator));
+	vb_right->add_child(memnew(HSeparator));
 
-	hbox = memnew(HBoxContainer);
-	bottom_hf->add_child(hbox);
+	// A second hbox to make a 2x2 grid of buttons.
+	HBoxContainer *hb_tools2 = memnew(HBoxContainer);
+	hb_tools2->set_h_size_flags(SIZE_SHRINK_CENTER);
+	vb_right->add_child(hb_tools2);
 
 	// Collapse.
 	collapse_button = memnew(Button);
@@ -552,28 +578,42 @@ EditorLog::EditorLog() {
 	collapse_button->set_toggle_mode(true);
 	collapse_button->set_pressed(false);
 	collapse_button->connect(SceneStringName(toggled), callable_mp(this, &EditorLog::_set_collapse));
-	hbox->add_child(collapse_button);
+	hb_tools2->add_child(collapse_button);
+
+	// Show Search.
+	show_search_button = memnew(Button);
+	show_search_button->set_accessibility_name(TTRC("Show Search"));
+	show_search_button->set_theme_type_variation(SceneStringName(FlatButton));
+	show_search_button->set_focus_mode(FOCUS_ACCESSIBILITY);
+	show_search_button->set_toggle_mode(true);
+	show_search_button->set_pressed(true);
+	show_search_button->set_shortcut(ED_SHORTCUT("editor/open_search", TTRC("Focus Search/Filter Bar"), KeyModifierMask::CMD_OR_CTRL | Key::F));
+	show_search_button->set_shortcut_context(this);
+	show_search_button->connect(SceneStringName(toggled), callable_mp(this, &EditorLog::_set_search_visible));
+	hb_tools2->add_child(show_search_button);
 
 	// Message Type Filters.
+	vb_right->add_child(memnew(HSeparator));
+
 	LogFilter *std_filter = memnew(LogFilter(MSG_TYPE_STD));
 	std_filter->initialize_button(TTRC("Standard Messages"), TTRC("Toggle visibility of standard output messages."), callable_mp(this, &EditorLog::_set_filter_active));
-	hbox->add_child(std_filter->toggle_button);
+	vb_right->add_child(std_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_STD, std_filter);
 	type_filter_map.insert(MSG_TYPE_STD_RICH, std_filter);
 
 	LogFilter *error_filter = memnew(LogFilter(MSG_TYPE_ERROR));
 	error_filter->initialize_button(TTRC("Errors"), TTRC("Toggle visibility of errors."), callable_mp(this, &EditorLog::_set_filter_active));
-	hbox->add_child(error_filter->toggle_button);
+	vb_right->add_child(error_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_ERROR, error_filter);
 
 	LogFilter *warning_filter = memnew(LogFilter(MSG_TYPE_WARNING));
 	warning_filter->initialize_button(TTRC("Warnings"), TTRC("Toggle visibility of warnings."), callable_mp(this, &EditorLog::_set_filter_active));
-	hbox->add_child(warning_filter->toggle_button);
+	vb_right->add_child(warning_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_WARNING, warning_filter);
 
 	LogFilter *editor_filter = memnew(LogFilter(MSG_TYPE_EDITOR));
 	editor_filter->initialize_button(TTRC("Editor Messages"), TTRC("Toggle visibility of editor messages."), callable_mp(this, &EditorLog::_set_filter_active));
-	hbox->add_child(editor_filter->toggle_button);
+	vb_right->add_child(editor_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_EDITOR, editor_filter);
 
 	add_message(GODOT_VERSION_FULL_NAME " (c) 2007-present Juan Linietsky, Ariel Manzur & Godot Contributors.");
diff --git a/engine/editor/editor_log.h b/engine/editor/editor_log.h
index f8d0b508..3ab5d017 100644
--- a/engine/editor/editor_log.h
+++ b/engine/editor/editor_log.h
@@ -96,7 +96,6 @@ private:
 			toggle_button->set_accessibility_name(TTRGET(p_name));
 			toggle_button->set_tooltip_text(TTRGET(p_tooltip));
 			toggle_button->set_focus_mode(FOCUS_ACCESSIBILITY);
-			toggle_button->set_theme_type_variation("EditorLogFilterButton");
 			// When toggled call the callback and pass the MessageType this button is for.
 			toggle_button->connect(SceneStringName(toggled), p_toggled_callback.bind(type));
 		}
@@ -133,10 +132,12 @@ private:
 	RichTextLabel *log = nullptr;
 
 	Button *clear_button = nullptr;
+	Button *copy_button = nullptr;
 
 	Button *collapse_button = nullptr;
 	bool collapse = false;
 
+	Button *show_search_button = nullptr;
 	LineEdit *search_box = nullptr;
 
 	// Reusable RichTextLabel for BBCode parsing during search
@@ -152,6 +153,7 @@ private:
 	//void _dragged(const Point2& p_ofs);
 	void _meta_clicked(const String &p_meta);
 	void _clear_request();
+	void _copy_request();
 	static void _undo_redo_cbk(void *p_self, const String &p_name);
 
 	void _rebuild_log();
@@ -159,6 +161,7 @@ private:
 	bool _check_display_message(LogMessage &p_message);
 
 	void _set_filter_active(bool p_active, MessageType p_message_type);
+	void _set_search_visible(bool p_visible);
 	void _search_changed(const String &p_text);
 
 	void _process_message(const String &p_msg, MessageType p_type, bool p_clear);
@@ -176,7 +179,6 @@ private:
 
 protected:
 	void _notification(int p_what);
-	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
 
 public:
 	void add_message(const String &p_msg, MessageType p_type = MSG_TYPE_STD);
diff --git a/engine/editor/editor_main_screen.cpp b/engine/editor/editor_main_screen.cpp
index 730be32e..d51e8f20 100644
--- a/engine/editor/editor_main_screen.cpp
+++ b/engine/editor/editor_main_screen.cpp
@@ -31,7 +31,6 @@
 #include "editor_main_screen.h"
 
 #include "core/io/config_file.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_plugin.h"
@@ -42,7 +41,6 @@
 void EditorMainScreen::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-			set_accessibility_region(true);
 			if (EDITOR_3D < buttons.size() && buttons[EDITOR_3D]->is_visible()) {
 				// If the 3D editor is enabled, use this as the default.
 				select(EDITOR_3D);
@@ -196,7 +194,6 @@ void EditorMainScreen::select(int p_index) {
 	selected_plugin = new_editor;
 	selected_plugin->make_visible(true);
 	selected_plugin->selected_notify();
-	set_accessibility_name(selected_plugin->get_plugin_name());
 
 	EditorData &editor_data = EditorNode::get_editor_data();
 	int plugin_count = editor_data.get_editor_plugin_count();
diff --git a/engine/editor/editor_node.cpp b/engine/editor/editor_node.cpp
index 2a0f83be..688ea8cb 100644
--- a/engine/editor/editor_node.cpp
+++ b/engine/editor/editor_node.cpp
@@ -30,17 +30,14 @@
 
 #include "editor_node.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/input/input.h"
 #include "core/io/config_file.h"
 #include "core/io/file_access.h"
 #include "core/io/image.h"
-#include "core/io/resource_importer.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
@@ -48,6 +45,36 @@
 #include "core/string/print_string.h"
 #include "core/string/translation_server.h"
 #include "core/version.h"
+#include "editor/editor_string_names.h"
+#include "editor/inspector/editor_context_menu_plugin.h"
+#include "editor/plugins/editor_plugin_list.h"
+#include "main/main.h"
+#include "scene/2d/node_2d.h"
+#include "scene/3d/bone_attachment_3d.h"
+#include "scene/animation/animation_tree.h"
+#include "scene/gui/color_picker.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/file_dialog.h"
+#include "scene/gui/menu_bar.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/panel.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/main/timer.h"
+#include "scene/main/window.h"
+#include "scene/property_utils.h"
+#include "scene/resources/dpi_texture.h"
+#include "scene/resources/image_texture.h"
+#include "scene/resources/packed_scene.h"
+#include "scene/resources/portable_compressed_texture.h"
+#include "scene/theme/theme_db.h"
+#include "servers/display/display_server.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
+#include "servers/rendering/rendering_server.h"
+
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/asset_library/asset_library_editor_plugin.h"
 #include "editor/audio/audio_stream_preview.h"
@@ -68,7 +95,6 @@
 #include "editor/editor_interface.h"
 #include "editor/editor_log.h"
 #include "editor/editor_main_screen.h"
-#include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/export/dedicated_server_export_plugin.h"
 #include "editor/export/editor_export.h"
@@ -107,7 +133,6 @@
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_texture_atlas.h"
 #include "editor/import/resource_importer_wav.h"
-#include "editor/inspector/editor_context_menu_plugin.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/editor_preview_plugins.h"
 #include "editor/inspector/editor_properties.h"
@@ -116,7 +141,6 @@
 #include "editor/inspector/editor_resource_preview.h"
 #include "editor/inspector/multi_node_edit.h"
 #include "editor/plugins/editor_plugin.h"
-#include "editor/plugins/editor_plugin_list.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
 #include "editor/plugins/plugin_config_dialog.h"
 #include "editor/project_upgrade/project_upgrade_tool.h"
@@ -149,34 +173,6 @@
 #include "editor/translations/editor_translation_parser.h"
 #include "editor/translations/packed_scene_translation_parser_plugin.h"
 #include "editor/version_control/version_control_editor_plugin.h"
-#include "main/main.h"
-#include "scene/2d/node_2d.h"
-#include "scene/3d/bone_attachment_3d.h"
-#include "scene/animation/animation_tree.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_bar.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/panel.h"
-#include "scene/gui/popup.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/timer.h"
-#include "scene/main/window.h"
-#include "scene/property_utils.h"
-#include "scene/resources/3d/mesh_library.h"
-#include "scene/resources/dpi_texture.h"
-#include "scene/resources/image_texture.h"
-#include "scene/resources/packed_scene.h"
-#include "scene/resources/portable_compressed_texture.h"
-#include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
-#include "servers/navigation_2d/navigation_server_2d.h"
-#include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifdef VULKAN_ENABLED
 #include "editor/shader/shader_baker/shader_baker_export_plugin_platform_vulkan.h"
@@ -190,6 +186,8 @@
 #include "editor/shader/shader_baker/shader_baker_export_plugin_platform_metal.h"
 #endif
 
+#include "modules/modules_enabled.gen.h" // For gdscript, mono.
+
 #ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_2d/physics_server_2d.h"
 #endif // PHYSICS_2D_DISABLED
@@ -202,8 +200,6 @@
 #include "editor/gui/touch_actions_panel.h"
 #endif // ANDROID_ENABLED
 
-#include "modules/modules_enabled.gen.h" // For gdscript, mono.
-
 #include <cstdlib>
 
 EditorNode *EditorNode::singleton = nullptr;
@@ -260,7 +256,7 @@ void EditorNode::disambiguate_filenames(const Vector<String> p_full_paths, Vecto
 
 	// For each index set with a size > 1, we need to disambiguate.
 	for (int i = 0; i < index_sets.size(); i++) {
-		RBSet<int> iset(index_sets[i]);
+		RBSet<int> iset = index_sets[i];
 		while (iset.size() > 1) {
 			// Append the parent folder to each scene name.
 			for (const int &E : iset) {
@@ -431,26 +427,6 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
 			_open_command_palette();
 		} else if (ED_IS_SHORTCUT("editor/toggle_last_opened_bottom_panel", p_event)) {
 			bottom_panel->toggle_last_opened_bottom_panel();
-		} else if (ED_IS_SHORTCUT("editor/toggle_selected_nodes_visibility", p_event)) {
-			EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-			undo_redo->create_action(TTR("Toggle Selected Node(s) Visibility"));
-			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-
-			for (Node *E : selection) {
-				Node *node_with_visibility;
-				node_with_visibility = Object::cast_to<CanvasItem>(E);
-				if (!node_with_visibility || !node_with_visibility->is_inside_tree()) {
-					node_with_visibility = Object::cast_to<Node3D>(E);
-					if (!node_with_visibility || !node_with_visibility->is_inside_tree()) {
-						continue;
-					}
-				}
-
-				undo_redo->add_do_method(node_with_visibility, "set_visible", !node_with_visibility->get("visible"));
-				undo_redo->add_undo_method(node_with_visibility, "set_visible", node_with_visibility->get("visible"));
-			}
-
-			undo_redo->commit_action();
 		} else {
 			is_handled = false;
 		}
@@ -462,7 +438,7 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
 }
 
 void EditorNode::_update_vsync_mode() {
-	const DisplayServerEnums::VSyncMode window_vsync_mode = DisplayServerEnums::VSyncMode(int(EDITOR_GET("interface/editor/display/vsync_mode")));
+	const DisplayServer::VSyncMode window_vsync_mode = DisplayServer::VSyncMode(int(EDITOR_GET("interface/editor/vsync_mode")));
 	DisplayServer::get_singleton()->window_set_vsync_mode(window_vsync_mode);
 }
 
@@ -492,18 +468,18 @@ void EditorNode::_update_from_settings() {
 		scene_root->propagate_notification(Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED);
 	}
 
-	RSE::DOFBokehShape dof_shape = RSE::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape")));
+	RS::DOFBokehShape dof_shape = RS::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape")));
 	RS::get_singleton()->camera_attributes_set_dof_blur_bokeh_shape(dof_shape);
-	RSE::DOFBlurQuality dof_quality = RSE::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality")));
+	RS::DOFBlurQuality dof_quality = RS::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality")));
 	bool dof_jitter = GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_use_jitter");
 	RS::get_singleton()->camera_attributes_set_dof_blur_quality(dof_quality, dof_jitter);
-	RS::get_singleton()->environment_set_ssao_quality(RSE::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/environment/ssao/quality"))), GLOBAL_GET("rendering/environment/ssao/half_size"), GLOBAL_GET("rendering/environment/ssao/adaptive_target"), GLOBAL_GET("rendering/environment/ssao/blur_passes"), GLOBAL_GET("rendering/environment/ssao/fadeout_from"), GLOBAL_GET("rendering/environment/ssao/fadeout_to"));
+	RS::get_singleton()->environment_set_ssao_quality(RS::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/environment/ssao/quality"))), GLOBAL_GET("rendering/environment/ssao/half_size"), GLOBAL_GET("rendering/environment/ssao/adaptive_target"), GLOBAL_GET("rendering/environment/ssao/blur_passes"), GLOBAL_GET("rendering/environment/ssao/fadeout_from"), GLOBAL_GET("rendering/environment/ssao/fadeout_to"));
 	RS::get_singleton()->screen_space_roughness_limiter_set_active(GLOBAL_GET("rendering/anti_aliasing/screen_space_roughness_limiter/enabled"), GLOBAL_GET("rendering/anti_aliasing/screen_space_roughness_limiter/amount"), GLOBAL_GET("rendering/anti_aliasing/screen_space_roughness_limiter/limit"));
 	bool glow_bicubic = int(GLOBAL_GET("rendering/environment/glow/upscale_mode")) > 0;
-	RS::get_singleton()->environment_set_ssil_quality(RSE::EnvironmentSSILQuality(int(GLOBAL_GET("rendering/environment/ssil/quality"))), GLOBAL_GET("rendering/environment/ssil/half_size"), GLOBAL_GET("rendering/environment/ssil/adaptive_target"), GLOBAL_GET("rendering/environment/ssil/blur_passes"), GLOBAL_GET("rendering/environment/ssil/fadeout_from"), GLOBAL_GET("rendering/environment/ssil/fadeout_to"));
+	RS::get_singleton()->environment_set_ssil_quality(RS::EnvironmentSSILQuality(int(GLOBAL_GET("rendering/environment/ssil/quality"))), GLOBAL_GET("rendering/environment/ssil/half_size"), GLOBAL_GET("rendering/environment/ssil/adaptive_target"), GLOBAL_GET("rendering/environment/ssil/blur_passes"), GLOBAL_GET("rendering/environment/ssil/fadeout_from"), GLOBAL_GET("rendering/environment/ssil/fadeout_to"));
 	RS::get_singleton()->environment_glow_set_use_bicubic_upscale(glow_bicubic);
 	RS::get_singleton()->environment_set_ssr_half_size(GLOBAL_GET("rendering/environment/screen_space_reflection/half_size"));
-	RSE::SubSurfaceScatteringQuality sss_quality = RSE::SubSurfaceScatteringQuality(int(GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_quality")));
+	RS::SubSurfaceScatteringQuality sss_quality = RS::SubSurfaceScatteringQuality(int(GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_quality")));
 	RS::get_singleton()->sub_surface_scattering_set_quality(sss_quality);
 	float sss_scale = GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_scale");
 	float sss_depth_scale = GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_depth_scale");
@@ -513,17 +489,17 @@ void EditorNode::_update_from_settings() {
 	uint32_t directional_shadow_16_bits = GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/16_bits");
 	RS::get_singleton()->directional_shadow_atlas_set_size(directional_shadow_size, directional_shadow_16_bits);
 
-	RSE::ShadowQuality shadows_quality = RSE::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality")));
+	RS::ShadowQuality shadows_quality = RS::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality")));
 	RS::get_singleton()->positional_soft_shadow_filter_set_quality(shadows_quality);
-	RSE::ShadowQuality directional_shadow_quality = RSE::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality")));
+	RS::ShadowQuality directional_shadow_quality = RS::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality")));
 	RS::get_singleton()->directional_soft_shadow_filter_set_quality(directional_shadow_quality);
 	float probe_update_speed = GLOBAL_GET("rendering/lightmapping/probe_capture/update_speed");
 	RS::get_singleton()->lightmap_set_probe_capture_update_speed(probe_update_speed);
-	RSE::EnvironmentSDFGIFramesToConverge frames_to_converge = RSE::EnvironmentSDFGIFramesToConverge(int(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_converge")));
+	RS::EnvironmentSDFGIFramesToConverge frames_to_converge = RS::EnvironmentSDFGIFramesToConverge(int(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_converge")));
 	RS::get_singleton()->environment_set_sdfgi_frames_to_converge(frames_to_converge);
-	RSE::EnvironmentSDFGIRayCount ray_count = RSE::EnvironmentSDFGIRayCount(int(GLOBAL_GET("rendering/global_illumination/sdfgi/probe_ray_count")));
+	RS::EnvironmentSDFGIRayCount ray_count = RS::EnvironmentSDFGIRayCount(int(GLOBAL_GET("rendering/global_illumination/sdfgi/probe_ray_count")));
 	RS::get_singleton()->environment_set_sdfgi_ray_count(ray_count);
-	RSE::VoxelGIQuality voxel_gi_quality = RSE::VoxelGIQuality(int(GLOBAL_GET("rendering/global_illumination/voxel_gi/quality")));
+	RS::VoxelGIQuality voxel_gi_quality = RS::VoxelGIQuality(int(GLOBAL_GET("rendering/global_illumination/voxel_gi/quality")));
 	RS::get_singleton()->voxel_gi_set_quality(voxel_gi_quality);
 	RS::get_singleton()->environment_set_volumetric_fog_volume_size(GLOBAL_GET("rendering/environment/volumetric_fog/volume_size"), GLOBAL_GET("rendering/environment/volumetric_fog/volume_depth"));
 	RS::get_singleton()->environment_set_volumetric_fog_filter_active(bool(GLOBAL_GET("rendering/environment/volumetric_fog/use_filter")));
@@ -550,23 +526,15 @@ void EditorNode::_update_from_settings() {
 	scene_root->set_use_debanding(use_debanding);
 	get_viewport()->set_use_debanding(use_debanding);
 
-	// Enable HDR if requested.
-	const bool hdr_requested = GLOBAL_GET("display/window/hdr/request_hdr_output");
-	DisplayServer::get_singleton()->window_request_hdr_output(hdr_requested);
-
-	const bool use_hdr_2d = GLOBAL_GET("rendering/viewport/hdr_2d");
-	scene_root->set_use_hdr_2d(use_hdr_2d || hdr_requested);
-	get_viewport()->set_use_hdr_2d(use_hdr_2d || hdr_requested);
-
-	if (hdr_requested && !use_hdr_2d) {
-		WARN_PRINT_ED("HDR 2D was automatically enabled because HDR output was requested in project settings. To avoid this warning, enable rendering/viewport/hdr_2d in the Project Settings.");
-	}
+	bool use_hdr_2d = GLOBAL_GET("rendering/viewport/hdr_2d");
+	scene_root->set_use_hdr_2d(use_hdr_2d);
+	get_viewport()->set_use_hdr_2d(use_hdr_2d);
 
 	float mesh_lod_threshold = GLOBAL_GET("rendering/mesh_lod/lod_change/threshold_pixels");
 	scene_root->set_mesh_lod_threshold(mesh_lod_threshold);
 
-	RS::get_singleton()->decals_set_filter(RSE::DecalFilter(int(GLOBAL_GET("rendering/textures/decals/filter"))));
-	RS::get_singleton()->light_projectors_set_filter(RSE::LightProjectorFilter(int(GLOBAL_GET("rendering/textures/light_projectors/filter"))));
+	RS::get_singleton()->decals_set_filter(RS::DecalFilter(int(GLOBAL_GET("rendering/textures/decals/filter"))));
+	RS::get_singleton()->light_projectors_set_filter(RS::LightProjectorFilter(int(GLOBAL_GET("rendering/textures/light_projectors/filter"))));
 	RS::get_singleton()->lightmaps_set_bicubic_filter(GLOBAL_GET("rendering/lightmapping/lightmap_gi/use_bicubic_filter"));
 	RS::get_singleton()->material_set_use_debanding(GLOBAL_GET("rendering/anti_aliasing/quality/use_debanding"));
 
@@ -574,24 +542,6 @@ void EditorNode::_update_from_settings() {
 	tree->set_debug_collisions_color(GLOBAL_GET("debug/shapes/collision/shape_color"));
 	tree->set_debug_collision_contact_color(GLOBAL_GET("debug/shapes/collision/contact_color"));
 
-	if (ProjectSettings::get_singleton()->check_changed_settings_in_group("display/window/hdr/request_hdr_output") || ProjectSettings::get_singleton()->check_changed_settings_in_group("rendering/viewport/hdr_2d")) {
-		const bool use_hdr = GLOBAL_GET("display/window/hdr/request_hdr_output").operator bool() || GLOBAL_GET("rendering/viewport/hdr_2d").operator bool();
-
-		LocalVector<ObjectID> invalid_viewports;
-		for (const ObjectID &id : hdr_viewports) {
-			Viewport *vp = ObjectDB::get_instance<Viewport>(id);
-			if (vp) {
-				vp->set_use_hdr_2d(use_hdr);
-			} else {
-				invalid_viewports.push_back(id);
-			}
-		}
-
-		for (const ObjectID &id : invalid_viewports) {
-			hdr_viewports.erase(id);
-		}
-	}
-
 	ResourceImporterTexture::get_singleton()->update_imports();
 
 	_update_translations();
@@ -883,19 +833,21 @@ void EditorNode::_notification(int p_what) {
 				scene_tabs->update_scene_tabs();
 			}
 
-			if (update_spinner->is_visible()) {
-				// Update the animation frame of the update spinner.
-				uint64_t frame = Engine::get_singleton()->get_frames_drawn();
-				uint64_t tick = OS::get_singleton()->get_ticks_msec();
+			// Update the animation frame of the update spinner.
+			uint64_t frame = Engine::get_singleton()->get_frames_drawn();
+			uint64_t tick = OS::get_singleton()->get_ticks_msec();
 
-				if (frame != update_spinner_step_frame && (tick - update_spinner_step_msec) > (1000 / 8)) {
-					update_spinner_step++;
-					if (update_spinner_step >= 8) {
-						update_spinner_step = 0;
-					}
+			if (frame != update_spinner_step_frame && (tick - update_spinner_step_msec) > (1000 / 8)) {
+				update_spinner_step++;
+				if (update_spinner_step >= 8) {
+					update_spinner_step = 0;
+				}
 
-					update_spinner_step_msec = tick;
-					update_spinner_step_frame = frame + 1;
+				update_spinner_step_msec = tick;
+				update_spinner_step_frame = frame + 1;
+
+				// Update the icon itself only when the spinner is visible.
+				if (_should_display_update_spinner()) {
 					update_spinner->set_button_icon(theme->get_icon("Progress" + itos(update_spinner_step + 1), EditorStringName(EditorIcons)));
 				}
 			}
@@ -934,7 +886,7 @@ void EditorNode::_notification(int p_what) {
 			// Theme has already been created in the constructor, so we can skip that step.
 			_update_theme(true);
 
-			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/timers/low_processor_mode_sleep_usec")));
+			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/low_processor_mode_sleep_usec")));
 			get_tree()->get_root()->set_as_audio_listener_3d(false);
 			get_tree()->get_root()->set_as_audio_listener_2d(false);
 			get_tree()->get_root()->set_snap_2d_transforms_to_pixel(false);
@@ -944,7 +896,7 @@ void EditorNode::_notification(int p_what) {
 			get_tree()->set_quit_on_go_back(false);
 			bool is_fullscreen = EDITOR_DEF("_is_editor_fullscreen", false);
 			if (is_fullscreen) {
-				DisplayServer::get_singleton()->window_set_mode(DisplayServerEnums::WINDOW_MODE_FULLSCREEN);
+				DisplayServer::get_singleton()->window_set_mode(DisplayServer::WINDOW_MODE_FULLSCREEN);
 			}
 #endif
 			get_tree()->get_root()->connect("files_dropped", callable_mp(this, &EditorNode::_dropped_files));
@@ -994,6 +946,8 @@ void EditorNode::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_READY: {
+			started_timestamp = Time::get_singleton()->get_unix_time_from_system();
+
 			// Store the default order of bottom docks. It can only be determined dynamically.
 			PackedStringArray bottom_docks;
 			bottom_docks.reserve_exact(bottom_panel->get_tab_count());
@@ -1004,8 +958,8 @@ void EditorNode::_notification(int p_what) {
 			default_layout->set_value("docks", "dock_9", String(",").join(bottom_docks));
 
 			RenderingServer::get_singleton()->viewport_set_disable_2d(get_scene_root()->get_viewport_rid(), true);
-			RenderingServer::get_singleton()->viewport_set_environment_mode(get_viewport()->get_viewport_rid(), RSE::VIEWPORT_ENVIRONMENT_DISABLED);
-			DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/display/keep_screen_on"));
+			RenderingServer::get_singleton()->viewport_set_environment_mode(get_viewport()->get_viewport_rid(), RenderingServer::VIEWPORT_ENVIRONMENT_DISABLED);
+			DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/keep_screen_on"));
 
 			feature_profile_manager->notify_changed();
 
@@ -1045,7 +999,7 @@ void EditorNode::_notification(int p_what) {
 
 		case NOTIFICATION_APPLICATION_FOCUS_IN: {
 			// Restore the original FPS cap after focusing back on the editor.
-			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/timers/low_processor_mode_sleep_usec")));
+			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/low_processor_mode_sleep_usec")));
 
 			if (_is_project_data_missing()) {
 				project_data_missing->popup_centered();
@@ -1060,13 +1014,13 @@ void EditorNode::_notification(int p_what) {
 
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
 			// Save on focus loss before applying the FPS limit to avoid slowing down the saving process.
-			if (EDITOR_GET("interface/editor/behavior/save_on_focus_loss")) {
+			if (EDITOR_GET("interface/editor/save_on_focus_loss")) {
 				_save_scene_silently();
 			}
 
 			// Set a low FPS cap to decrease CPU/GPU usage while the editor is unfocused.
 			if (unfocused_low_processor_usage_mode_enabled) {
-				OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/timers/unfocused_low_processor_mode_sleep_usec")));
+				OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/unfocused_low_processor_mode_sleep_usec")));
 			}
 		} break;
 
@@ -1084,9 +1038,9 @@ void EditorNode::_notification(int p_what) {
 				FileDialog::set_default_display_mode(EDITOR_GET("filesystem/file_dialog/display_mode"));
 			}
 
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/input/tablet_driver")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/tablet_driver")) {
 				String tablet_driver = GLOBAL_GET("input_devices/pen_tablet/driver");
-				int tablet_driver_idx = EDITOR_GET("interface/editor/input/tablet_driver");
+				int tablet_driver_idx = EDITOR_GET("interface/editor/tablet_driver");
 				if (tablet_driver_idx != -1) {
 					tablet_driver = DisplayServer::get_singleton()->tablet_get_driver_name(tablet_driver_idx);
 				}
@@ -1097,7 +1051,7 @@ void EditorNode::_notification(int p_what) {
 				print_verbose("Using \"" + DisplayServer::get_singleton()->tablet_get_current_driver() + "\" pen tablet driver...");
 			}
 
-			if (EDITOR_GET("interface/editor/behavior/import_resources_when_unfocused")) {
+			if (EDITOR_GET("interface/editor/import_resources_when_unfocused")) {
 				scan_changes_timer->start();
 			} else {
 				scan_changes_timer->stop();
@@ -1113,12 +1067,12 @@ void EditorNode::_notification(int p_what) {
 				recent_scenes->reset_size();
 			}
 
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/timers/dragging_")) {
-				theme->set_constant("dragging_unfold_wait_msec", "Tree", (float)EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds") * 1000);
-				theme->set_constant("hover_switch_wait_msec", "TabBar", (float)EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds") * 1000);
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/dragging_")) {
+				theme->set_constant("dragging_unfold_wait_msec", "Tree", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
+				theme->set_constant("hover_switch_wait_msec", "TabBar", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 			}
 
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/docks")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
 				editor_dock_manager->update_tab_styles();
 			}
 
@@ -1152,13 +1106,11 @@ void EditorNode::_notification(int p_what) {
 				}
 			}
 
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/appearance")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
 				_update_update_spinner();
-				_update_main_menu_type();
-			}
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/display")) {
 				_update_vsync_mode();
-				DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/display/keep_screen_on"));
+				_update_main_menu_type();
+				DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/keep_screen_on"));
 			}
 
 #if defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
@@ -1176,25 +1128,9 @@ void EditorNode::_notification(int p_what) {
 }
 
 void EditorNode::_update_update_spinner() {
-	bool should_display_spinner = false;
-	if (!RenderingServer::get_singleton()->canvas_item_get_debug_redraw()) {
-#ifdef DEV_ENABLED
-		const bool in_dev = true;
-#else
-		const bool in_dev = false;
-#endif
-		const int show_update_spinner_setting = EDITOR_GET("interface/editor/appearance/show_update_spinner");
-		should_display_spinner = (show_update_spinner_setting == 0 && in_dev) || show_update_spinner_setting == 1;
-	}
-	update_spinner->set_visible(should_display_spinner);
-
-	const bool update_continuously = EDITOR_GET("interface/editor/display/update_continuously");
-	OS::get_singleton()->set_low_processor_usage_mode(!update_continuously);
-
-	if (!update_spinner->is_visible()) {
-		return;
-	}
+	update_spinner->set_visible(!RenderingServer::get_singleton()->canvas_item_get_debug_redraw() && _should_display_update_spinner());
 
+	const bool update_continuously = EDITOR_GET("interface/editor/update_continuously");
 	PopupMenu *update_popup = update_spinner->get_popup();
 	update_popup->set_item_checked(update_popup->get_item_index(SPINNER_UPDATE_CONTINUOUSLY), update_continuously);
 	update_popup->set_item_checked(update_popup->get_item_index(SPINNER_UPDATE_WHEN_CHANGED), !update_continuously);
@@ -1212,6 +1148,8 @@ void EditorNode::_update_update_spinner() {
 		update_spinner->set_tooltip_text(TTRC("Spins when the editor window redraws."));
 		update_spinner->set_self_modulate(Color(1, 1, 1));
 	}
+
+	OS::get_singleton()->set_low_processor_usage_mode(!update_continuously);
 }
 
 void EditorNode::_execute_upgrades() {
@@ -1522,7 +1460,7 @@ void EditorNode::_sources_changed(bool p_exist) {
 			if (SceneTreeDock::get_singleton()->is_visible_in_tree()) {
 				SceneTreeDock::get_singleton()->get_tree_editor()->get_scene_tree()->grab_focus();
 			} else {
-				TabContainer *tab_container = SceneTreeDock::get_singleton()->get_parent_container();
+				TabContainer *tab_container = EditorDockManager::get_singleton()->get_dock_tab_container(SceneTreeDock::get_singleton());
 				if (tab_container) {
 					// Another tab is active (e.g., Import) - focus the tab bar so user can switch.
 					tab_container->get_tab_bar()->grab_focus();
@@ -1637,8 +1575,8 @@ void EditorNode::_viewport_resized() {
 }
 
 void EditorNode::_titlebar_resized() {
-	DisplayServer::get_singleton()->window_set_window_buttons_offset(Vector2i(title_bar->get_global_position().y + title_bar->get_size().y / 2, title_bar->get_global_position().y + title_bar->get_size().y / 2), DisplayServerEnums::MAIN_WINDOW_ID);
-	const Vector3i &margin = DisplayServer::get_singleton()->window_get_safe_title_margins(DisplayServerEnums::MAIN_WINDOW_ID);
+	DisplayServer::get_singleton()->window_set_window_buttons_offset(Vector2i(title_bar->get_global_position().y + title_bar->get_size().y / 2, title_bar->get_global_position().y + title_bar->get_size().y / 2), DisplayServer::MAIN_WINDOW_ID);
+	const Vector3i &margin = DisplayServer::get_singleton()->window_get_safe_title_margins(DisplayServer::MAIN_WINDOW_ID);
 	if (left_menu_spacer) {
 		int w = (gui_base->is_layout_rtl()) ? margin.y : margin.x;
 		left_menu_spacer->set_custom_minimum_size(Size2(w, 0));
@@ -1675,15 +1613,9 @@ Error EditorNode::load_resource(const String &p_resource, bool p_ignore_broken_d
 
 	Ref<Resource> res;
 	if (force_textfile_extensions.has(p_resource.get_extension())) {
-		const String resource_type = ResourceLoader::get_resource_type(p_resource);
-		if (resource_type != "Translation" && ResourceLoader::exists(p_resource, "")) {
-			res = ResourceLoader::load(p_resource, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
-		}
-		if (res.is_null()) {
-			res = ResourceCache::get_ref(p_resource);
-			if (res.is_null() || !res->is_class("TextFile")) {
-				res = ScriptEditor::get_singleton()->open_file(p_resource);
-			}
+		res = ResourceCache::get_ref(p_resource);
+		if (res.is_null() || !res->is_class("TextFile")) {
+			res = ScriptEditor::get_singleton()->open_file(p_resource);
 		}
 	} else if (ResourceLoader::exists(p_resource, "")) {
 		res = ResourceLoader::load(p_resource, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
@@ -2007,7 +1939,7 @@ int EditorNode::get_resource_count(Ref<Resource> p_res) {
 
 List<Node *> EditorNode::get_resource_node_list(Ref<Resource> p_res) {
 	List<Node *> *L = resource_count.getptr(p_res);
-	return L == nullptr ? List<Node *>() : List<Node *>(*L);
+	return L == nullptr ? List<Node *>() : *L;
 }
 
 void EditorNode::update_node_reference(const Variant &p_value, Node *p_node, bool p_remove) {
@@ -2611,7 +2543,7 @@ void EditorNode::restart_editor(bool p_goto_project_manager) {
 void EditorNode::_save_all_scenes() {
 	scenes_to_save_as.clear(); // In case saving was canceled before.
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-		if (!is_scene_unsaved(i)) {
+		if (!_is_scene_unsaved(i)) {
 			continue;
 		}
 
@@ -2655,7 +2587,7 @@ void EditorNode::_mark_unsaved_scenes() {
 	scene_tabs->update_scene_tabs();
 }
 
-bool EditorNode::is_scene_unsaved(int p_idx) {
+bool EditorNode::_is_scene_unsaved(int p_idx) {
 	const Node *scene = editor_data.get_edited_scene_root(p_idx);
 	if (!scene) {
 		return false;
@@ -2702,16 +2634,8 @@ void EditorNode::_dialog_action(String p_file) {
 		case SCENE_TAB_CLOSE:
 		case SCENE_SAVE_SCENE:
 		case SCENE_MULTI_SAVE_AS_SCENE:
-		case SCENE_SAVE_AS_SCENE:
-		case SCENE_TAB_SAVE_SCENE:
-		case SCENE_TAB_SAVE_AS_MAIN_SCENE:
-		case SCENE_TAB_SAVE_AS_AND_RUN: {
-			int scene_idx = -1;
-			if (current_menu_option == SCENE_CLOSE || current_menu_option == SCENE_TAB_CLOSE) {
-				scene_idx = tab_closing_idx;
-			} else if (current_menu_option == SCENE_TAB_SAVE_SCENE || current_menu_option == SCENE_TAB_SAVE_AS_MAIN_SCENE || current_menu_option == SCENE_TAB_SAVE_AS_AND_RUN) {
-				scene_idx = scene_tabs->get_option_tab();
-			}
+		case SCENE_SAVE_AS_SCENE: {
+			int scene_idx = (current_menu_option == SCENE_SAVE_SCENE || current_menu_option == SCENE_SAVE_AS_SCENE || current_menu_option == SCENE_MULTI_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
 
 			if (file->get_file_mode() == EditorFileDialog::FILE_MODE_SAVE_FILE) {
 				bool same_open_scene = false;
@@ -2741,11 +2665,8 @@ void EditorNode::_dialog_action(String p_file) {
 
 			if (current_menu_option == SCENE_MULTI_SAVE_AS_SCENE) {
 				_proceed_save_asing_scene_tabs();
-			} else if (current_menu_option == SCENE_TAB_SAVE_AS_MAIN_SCENE) {
-				_menu_option_confirm(EditorSceneTabs::SCENE_SET_AS_MAIN_SCENE, true);
-			} else if (current_menu_option == SCENE_TAB_SAVE_AS_AND_RUN) {
-				project_run_bar->play_custom_scene(p_file);
 			}
+
 		} break;
 
 		case SAVE_AND_RUN: {
@@ -2767,6 +2688,11 @@ void EditorNode::_dialog_action(String p_file) {
 			}
 		} break;
 
+		case SAVE_AND_SET_MAIN_SCENE: {
+			_save_scene(p_file);
+			_menu_option_confirm(SCENE_TAB_SET_AS_MAIN_SCENE, true);
+		} break;
+
 		case FILE_EXPORT_MESH_LIBRARY: {
 			const Dictionary &fd_options = file_export_lib->get_selected_options();
 			bool merge_with_existing_library = fd_options.get(TTR("Merge With Existing"), true);
@@ -3133,7 +3059,7 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 	}
 
 	// Update the use folding setting and state.
-	bool disable_folding = EDITOR_GET("interface/inspector/disable_folding");
+	bool disable_folding = bool(EDITOR_GET("interface/inspector/disable_folding")) || current_obj->is_class("EditorDebuggerRemoteObjects");
 	if (InspectorDock::get_inspector_singleton()->is_using_folding() == disable_folding) {
 		InspectorDock::get_inspector_singleton()->set_use_folding(!disable_folding, false);
 	}
@@ -3335,15 +3261,13 @@ void EditorNode::_android_explore_build_templates() {
 	OS::get_singleton()->shell_show_in_file_manager(ProjectSettings::get_singleton()->globalize_path(export_template_manager->get_android_build_directory(android_export_preset).get_base_dir()), true);
 }
 
-static String _get_unsaved_scene_dialog_text(String p_scene_filename, uint64_t p_opened_timestamp) {
-	const uint64_t scene_modified_time = FileAccess::get_modified_time(p_scene_filename);
+static String _get_unsaved_scene_dialog_text(String p_scene_filename, uint64_t p_started_timestamp) {
 	String unsaved_message;
 
-	// Consider scene opening to be a point of saving, so that when you
+	// Consider editor startup to be a point of saving, so that when you
 	// close and reopen the editor, you don't get an excessively long
 	// "modified X hours ago".
-	const uint64_t last_modified_seconds = Time::get_singleton()->get_unix_time_from_system() - MAX(p_opened_timestamp, scene_modified_time);
-
+	const uint64_t last_modified_seconds = Time::get_singleton()->get_unix_time_from_system() - MAX(p_started_timestamp, FileAccess::get_modified_time(p_scene_filename));
 	String last_modified_string;
 	if (last_modified_seconds < 120) {
 		last_modified_string = vformat(TTRN("%d second ago", "%d seconds ago", last_modified_seconds), last_modified_seconds);
@@ -3352,15 +3276,7 @@ static String _get_unsaved_scene_dialog_text(String p_scene_filename, uint64_t p
 	} else {
 		last_modified_string = vformat(TTRN("%d hour ago", "%d hours ago", last_modified_seconds / 3600), last_modified_seconds / 3600);
 	}
-
-	String last_action_and_time;
-	if (p_opened_timestamp > scene_modified_time) {
-		last_action_and_time = vformat(TTR("Scene opened: %s."), last_modified_string);
-	} else {
-		last_action_and_time = vformat(TTR("Last saved: %s."), last_modified_string);
-	}
-
-	unsaved_message = vformat(TTR("Scene \"%s\" has unsaved changes.\n%s"), p_scene_filename, last_action_and_time);
+	unsaved_message = vformat(TTR("Scene \"%s\" has unsaved changes.\nLast saved: %s."), p_scene_filename, last_modified_string);
 
 	return unsaved_message;
 }
@@ -3394,13 +3310,13 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 
 		} break;
 		case SCENE_QUICK_OPEN: {
-			quick_open_dialog->popup_dialog({ "Resource" }, callable_mp(this, &EditorNode::_quick_opened), true);
+			quick_open_dialog->popup_dialog({ "Resource" }, callable_mp(this, &EditorNode::_quick_opened));
 		} break;
 		case SCENE_QUICK_OPEN_SCENE: {
-			quick_open_dialog->popup_dialog({ "PackedScene" }, callable_mp(this, &EditorNode::_quick_opened), true);
+			quick_open_dialog->popup_dialog({ "PackedScene" }, callable_mp(this, &EditorNode::_quick_opened));
 		} break;
 		case SCENE_QUICK_OPEN_SCRIPT: {
-			quick_open_dialog->popup_dialog({ "Script" }, callable_mp(this, &EditorNode::_quick_opened), true);
+			quick_open_dialog->popup_dialog({ "Script" }, callable_mp(this, &EditorNode::_quick_opened));
 		} break;
 		case SCENE_OPEN_PREV: {
 			if (!prev_closed_scenes.is_empty()) {
@@ -3409,9 +3325,8 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		} break;
 		case EditorSceneTabs::SCENE_CLOSE_OTHERS: {
 			tab_closing_menu_option = -1;
-			int option_tab = scene_tabs->get_option_tab();
 			for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-				if (i == option_tab) {
+				if (i == editor_data.get_edited_scene()) {
 					continue;
 				}
 				tabs_to_close.push_back(editor_data.get_scene_path(i));
@@ -3420,7 +3335,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		} break;
 		case EditorSceneTabs::SCENE_CLOSE_RIGHT: {
 			tab_closing_menu_option = -1;
-			for (int i = scene_tabs->get_option_tab() + 1; i < editor_data.get_edited_scene_count(); i++) {
+			for (int i = editor_data.get_edited_scene() + 1; i < editor_data.get_edited_scene_count(); i++) {
 				tabs_to_close.push_back(editor_data.get_scene_path(i));
 			}
 			_proceed_closing_scene_tabs();
@@ -3435,20 +3350,10 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		case SCENE_CLOSE: {
 			_scene_tab_closed(editor_data.get_edited_scene());
 		} break;
-		case EditorSceneTabs::SCENE_CLOSE: {
-			_scene_tab_closed(scene_tabs->get_option_tab());
-		} break;
 		case SCENE_TAB_CLOSE:
-		case SCENE_SAVE_SCENE:
-		case EditorSceneTabs::SCENE_SAVE_SCENE: {
-			int scene_idx = -1;
-			if (p_option == SCENE_TAB_CLOSE) {
-				scene_idx = tab_closing_idx;
-			} else if (p_option == EditorSceneTabs::SCENE_SAVE_SCENE) {
-				scene_idx = scene_tabs->get_option_tab();
-			}
+		case SCENE_SAVE_SCENE: {
+			int scene_idx = (p_option == SCENE_SAVE_SCENE) ? -1 : tab_closing_idx;
 			Node *scene = editor_data.get_edited_scene_root(scene_idx);
-
 			if (scene && !scene->get_scene_file_path().is_empty()) {
 				if (DirAccess::exists(scene->get_scene_file_path().get_base_dir())) {
 					if (scene_idx != editor_data.get_edited_scene()) {
@@ -3469,16 +3374,11 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			[[fallthrough]];
 		}
 		case SCENE_MULTI_SAVE_AS_SCENE:
-		case SCENE_SAVE_AS_SCENE:
-		case EditorSceneTabs::SCENE_SAVE_AS_SCENE: {
-			int scene_idx = -1;
-			if (p_option == SCENE_TAB_CLOSE) {
-				scene_idx = tab_closing_idx;
-			} else if (p_option == EditorSceneTabs::SCENE_SAVE_SCENE || p_option == EditorSceneTabs::SCENE_SAVE_AS_SCENE) {
-				scene_idx = scene_tabs->get_option_tab();
-				current_menu_option = SCENE_TAB_SAVE_SCENE;
-			}
+		case SCENE_SAVE_AS_SCENE: {
+			int scene_idx = (p_option == SCENE_SAVE_SCENE || p_option == SCENE_SAVE_AS_SCENE || p_option == SCENE_MULTI_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
+
 			Node *scene = editor_data.get_edited_scene_root(scene_idx);
+
 			if (!scene) {
 				if (p_option == SCENE_SAVE_SCENE) {
 					// Pressing Ctrl + S saves the current script if a scene is currently open, but it won't if the scene has no root node.
@@ -3531,11 +3431,11 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 
 		} break;
 
-		case EditorSceneTabs::SCENE_SET_AS_MAIN_SCENE: {
-			const String scene_path = editor_data.get_scene_path(scene_tabs->get_option_tab());
+		case SCENE_TAB_SET_AS_MAIN_SCENE: {
+			const String scene_path = editor_data.get_scene_path(editor_data.get_edited_scene());
 			if (scene_path.is_empty()) {
-				_menu_option_confirm(EditorSceneTabs::SCENE_SAVE_AS_SCENE, true);
-				current_menu_option = SCENE_TAB_SAVE_AS_MAIN_SCENE; // Overwrites SCENE_TAB_SAVE_SCENE.
+				current_menu_option = SAVE_AND_SET_MAIN_SCENE;
+				_menu_option_confirm(SCENE_SAVE_AS_SCENE, true);
 				file->set_title(TTR("Save new main scene..."));
 			} else {
 				ProjectSettings::get_singleton()->set("application/run/main_scene", ResourceUID::path_to_uid(scene_path));
@@ -3549,17 +3449,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		} break;
 
 		case EditorSceneTabs::SCENE_RUN: {
-			Node *scene = editor_data.get_edited_scene_root(scene_tabs->get_option_tab());
-			ERR_FAIL_NULL(scene);
-
-			const String &scene_path = scene->get_scene_file_path();
-			if (scene_path.is_empty()) {
-				_menu_option_confirm(EditorSceneTabs::SCENE_SAVE_AS_SCENE, true);
-				current_menu_option = SCENE_TAB_SAVE_AS_AND_RUN; // Overwrites SCENE_TAB_SAVE_SCENE.
-				file->set_title(TTR("Save scene before running..."));
-			} else {
-				project_run_bar->play_custom_scene(scene_path);
-			}
+			project_run_bar->play_current_scene();
 		} break;
 
 		case PROJECT_EXPORT: {
@@ -3628,10 +3518,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		} break;
 
 		case SCENE_RELOAD_SAVED_SCENE: {
-			const int p_idx = editor_data.get_edited_scene();
-			const uint64_t scene_time_opened = editor_data.get_scene_time_opened(p_idx);
-			const String scene_filename = editor_data.get_scene_path(p_idx);
-
+			const String scene_filename = editor_data.get_scene_path(editor_data.get_edited_scene());
 			if (scene_filename.is_empty()) {
 				show_warning(TTR("Can't reload a scene that was never saved."));
 				break;
@@ -3640,7 +3527,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			if (unsaved_cache) {
 				if (!p_confirmed) {
 					confirmation->set_ok_button_text(TTRC("Save & Reload"));
-					const String unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, scene_time_opened);
+					const String unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, started_timestamp);
 					confirmation->set_text(unsaved_message + "\n\n" + TTR("Save before reloading the scene?"));
 					confirmation->popup_centered();
 					confirmation_button->show();
@@ -3655,7 +3542,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		} break;
 
 		case EditorSceneTabs::SCENE_SHOW_IN_FILESYSTEM: {
-			String path = editor_data.get_scene_path(scene_tabs->get_option_tab());
+			String path = editor_data.get_scene_path(editor_data.get_edited_scene());
 			if (!path.is_empty()) {
 				FileSystemDock::get_singleton()->navigate_to_path(path);
 			}
@@ -3732,12 +3619,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 				p_confirmed = false;
 			}
 
-			if (p_confirmed && stop_download_confirmation && export_template_manager->is_downloading()) {
-				export_template_manager->stop_download();
-				stop_download_confirmation = false;
-				p_confirmed = false;
-			}
-
 			if (!p_confirmed) {
 				if (!stop_project_confirmation && project_run_bar->is_playing()) {
 					if (p_option == PROJECT_RELOAD_CURRENT_PROJECT) {
@@ -3747,28 +3628,14 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 						confirmation->set_text(TTR("Stop running project before exiting the editor?"));
 						confirmation->set_ok_button_text(TTR("Stop & Quit"));
 					}
-					confirmation_button->hide();
 					confirmation->reset_size();
 					confirmation->popup_centered();
+					confirmation_button->hide();
 					stop_project_confirmation = true;
 					break;
 				}
 
-				if (!stop_download_confirmation && export_template_manager->is_downloading()) {
-					confirmation->set_text(TTR("The export templates are still being downloaded."));
-					if (p_option == PROJECT_RELOAD_CURRENT_PROJECT) {
-						confirmation->set_ok_button_text(TTR("Stop & Reload"));
-					} else {
-						confirmation->set_ok_button_text(TTR("Stop & Quit"));
-					}
-					confirmation_button->hide();
-					confirmation->reset_size();
-					confirmation->popup_centered();
-					stop_download_confirmation = true;
-					break;
-				}
-
-				bool save_each = EDITOR_GET("interface/editor/behavior/save_each_scene_on_quit");
+				bool save_each = EDITOR_GET("interface/editor/save_each_scene_on_quit");
 				if (_next_unsaved_scene(!save_each) == -1) {
 					if (EditorUndoRedoManager::get_singleton()->is_history_unsaved(EditorUndoRedoManager::GLOBAL_HISTORY)) {
 						if (p_option == PROJECT_RELOAD_CURRENT_PROJECT) {
@@ -3840,16 +3707,16 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			_discard_changes();
 		} break;
 		case SPINNER_UPDATE_CONTINUOUSLY: {
-			EditorSettings::get_singleton()->set("interface/editor/display/update_continuously", true);
+			EditorSettings::get_singleton()->set("interface/editor/update_continuously", true);
 			_update_update_spinner();
 			show_accept(TTR("This option is deprecated. Situations where refresh must be forced are now considered a bug. Please report."), TTR("OK"));
 		} break;
 		case SPINNER_UPDATE_WHEN_CHANGED: {
-			EditorSettings::get_singleton()->set("interface/editor/display/update_continuously", false);
+			EditorSettings::get_singleton()->set("interface/editor/update_continuously", false);
 			_update_update_spinner();
 		} break;
 		case SPINNER_UPDATE_SPINNER_HIDE: {
-			EditorSettings::get_singleton()->set("interface/editor/appearance/show_update_spinner", 2); // Disabled
+			EditorSettings::get_singleton()->set("interface/editor/show_update_spinner", 2); // Disabled
 			_update_update_spinner();
 		} break;
 		case EDITOR_OPEN_SETTINGS: {
@@ -3873,8 +3740,8 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			feature_profile_manager->popup_centered_clamped(Size2(900, 800) * EDSCALE, 0.8);
 		} break;
 		case EDITOR_TOGGLE_FULLSCREEN: {
-			DisplayServerEnums::WindowMode mode = DisplayServer::get_singleton()->window_get_mode();
-			if (mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+			DisplayServer::WindowMode mode = DisplayServer::get_singleton()->window_get_mode();
+			if (mode == DisplayServer::WINDOW_MODE_FULLSCREEN || mode == DisplayServer::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 				DisplayServer::get_singleton()->window_set_mode(prev_mode);
 #ifdef ANDROID_ENABLED
 				EditorSettings::get_singleton()->set("_is_editor_fullscreen", false);
@@ -3882,7 +3749,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 #endif
 			} else {
 				prev_mode = mode;
-				DisplayServer::get_singleton()->window_set_mode(DisplayServerEnums::WINDOW_MODE_FULLSCREEN);
+				DisplayServer::get_singleton()->window_set_mode(DisplayServer::WINDOW_MODE_FULLSCREEN);
 #ifdef ANDROID_ENABLED
 				EditorSettings::get_singleton()->set("_is_editor_fullscreen", true);
 				EditorSettings::get_singleton()->save();
@@ -4019,7 +3886,7 @@ void EditorNode::_save_screenshot_with_embedded_process(int64_t p_w, int64_t p_h
 	Error error = img->save_png(p_path);
 	ERR_FAIL_COND_MSG(error != OK, "Cannot save screenshot to file '" + p_path + "'.");
 
-	if (EDITOR_GET("interface/editor/behavior/automatically_open_screenshots")) {
+	if (EDITOR_GET("interface/editor/automatically_open_screenshots")) {
 		OS::get_singleton()->shell_show_in_file_manager(ProjectSettings::get_singleton()->globalize_path(p_path), true);
 	}
 }
@@ -4036,7 +3903,7 @@ void EditorNode::_save_screenshot(const String &p_path) {
 	Error error = img->save_png(p_path);
 	ERR_FAIL_COND_MSG(error != OK, "Cannot save screenshot to file '" + p_path + "'.");
 
-	if (EDITOR_GET("interface/editor/behavior/automatically_open_screenshots")) {
+	if (EDITOR_GET("interface/editor/automatically_open_screenshots")) {
 		OS::get_singleton()->shell_show_in_file_manager(ProjectSettings::get_singleton()->globalize_path(p_path), true);
 	}
 }
@@ -4241,7 +4108,7 @@ void EditorNode::_discard_changes(const String &p_str) {
 void EditorNode::_update_file_menu_opened() {
 	bool has_unsaved = false;
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-		if (is_scene_unsaved(i)) {
+		if (_is_scene_unsaved(i)) {
 			has_unsaved = true;
 			break;
 		}
@@ -4535,8 +4402,7 @@ bool EditorNode::is_addon_plugin_enabled(const String &p_addon) const {
 void EditorNode::_remove_edited_scene(bool p_change_tab) {
 	// When scene gets closed no node is edited anymore, so make sure the editors are notified before nodes are freed.
 	hide_unused_editors(SceneTreeDock::get_singleton());
-	editor_selection->clear();
-	editor_selection->update(false);
+	SceneTreeDock::get_singleton()->clear_previous_node_selection();
 
 	int new_index = editor_data.get_edited_scene();
 	int old_index = new_index;
@@ -4779,14 +4645,6 @@ void EditorNode::setup_color_picker(ColorPicker *p_picker) {
 	palette_file_selected_callback = callable_mp(p_picker, &ColorPicker::_quick_open_palette_file_selected);
 }
 
-void EditorNode::register_hdr_viewport(Viewport *p_viewport) {
-	const bool hdr_requested = GLOBAL_GET("display/window/hdr/request_hdr_output");
-	const bool hdr_2d_enabled = GLOBAL_GET("rendering/viewport/hdr_2d");
-	p_viewport->set_use_hdr_2d(hdr_2d_enabled || hdr_requested);
-
-	hdr_viewports.push_back(p_viewport->get_instance_id());
-}
-
 bool EditorNode::is_scene_open(const String &p_path) {
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
 		if (editor_data.get_scene_path(i) == p_path) {
@@ -4798,7 +4656,7 @@ bool EditorNode::is_scene_open(const String &p_path) {
 }
 
 bool EditorNode::is_multi_window_enabled() const {
-	return !SceneTree::get_singleton()->get_root()->is_embedding_subwindows() && !EDITOR_GET("interface/editor/display/single_window_mode") && EDITOR_GET("interface/multi_window/enable");
+	return !SceneTree::get_singleton()->get_root()->is_embedding_subwindows() && !EDITOR_GET("interface/editor/single_window_mode") && EDITOR_GET("interface/multi_window/enable");
 }
 
 int EditorNode::new_scene() {
@@ -5391,12 +5249,12 @@ void EditorNode::request_instantiate_scenes(const Vector<String> &p_files) {
 
 String EditorNode::get_multiwindow_support_tooltip_text() const {
 	if (SceneTree::get_singleton()->get_root()->is_embedding_subwindows()) {
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS)) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) {
 			return TTR("Multi-window support is not available because the `--single-window` command line argument was used to start the editor.");
 		} else {
 			return TTR("Multi-window support is not available because the current platform doesn't support multiple windows.");
 		}
-	} else if (EDITOR_GET("interface/editor/display/single_window_mode")) {
+	} else if (EDITOR_GET("interface/editor/single_window_mode")) {
 		return TTR("Multi-window support is not available because Interface > Editor > Single Window Mode is enabled in the editor settings.");
 	}
 
@@ -5639,11 +5497,11 @@ bool EditorNode::is_scene_in_use(const String &p_path) {
 	return false;
 }
 
-ProcessID EditorNode::has_child_process(ProcessID p_pid) const {
+OS::ProcessID EditorNode::has_child_process(OS::ProcessID p_pid) const {
 	return project_run_bar->has_child_process(p_pid);
 }
 
-void EditorNode::stop_child_process(ProcessID p_pid) {
+void EditorNode::stop_child_process(OS::ProcessID p_pid) {
 	project_run_bar->stop_child_process(p_pid);
 }
 
@@ -6012,23 +5870,23 @@ String EditorNode::_get_system_info() const {
 
 	const String rendering_device_name = RenderingServer::get_singleton()->get_video_adapter_name();
 
-	RenderingDeviceEnums::DeviceType device_type = RenderingServer::get_singleton()->get_video_adapter_type();
+	RenderingDevice::DeviceType device_type = RenderingServer::get_singleton()->get_video_adapter_type();
 	String device_type_string;
 	switch (device_type) {
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_INTEGRATED_GPU:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_INTEGRATED_GPU:
 			device_type_string = "integrated";
 			break;
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_DISCRETE_GPU:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_DISCRETE_GPU:
 			device_type_string = "dedicated";
 			break;
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_VIRTUAL_GPU:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_VIRTUAL_GPU:
 			device_type_string = "virtual";
 			break;
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_CPU:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_CPU:
 			device_type_string = "(software emulation on CPU)";
 			break;
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_OTHER:
-		case RenderingDeviceEnums::DeviceType::DEVICE_TYPE_MAX:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_OTHER:
+		case RenderingDevice::DeviceType::DEVICE_TYPE_MAX:
 			break; // Can't happen, but silences warning for DEVICE_TYPE_MAX
 	}
 
@@ -6122,6 +5980,16 @@ String EditorNode::_get_system_info() const {
 	return String(" - ").join(info);
 }
 
+bool EditorNode::_should_display_update_spinner() const {
+#ifdef DEV_ENABLED
+	const bool in_dev = true;
+#else
+	const bool in_dev = false;
+#endif
+	const int show_update_spinner_setting = EDITOR_GET("interface/editor/show_update_spinner");
+	return (show_update_spinner_setting == 0 && in_dev) || show_update_spinner_setting == 1;
+}
+
 Ref<Texture2D> EditorNode::_file_dialog_get_icon(const String &p_path) {
 	EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->get_filesystem_path(p_path.get_base_dir());
 	if (efsd) {
@@ -6748,8 +6616,7 @@ void EditorNode::_scene_tab_closed(int p_tab) {
 		if (scene_filename.is_empty()) {
 			unsaved_message = TTR("This scene was never saved.");
 		} else {
-			uint32_t time_opened = editor_data.get_scene_time_opened(p_tab);
-			unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, time_opened);
+			unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, started_timestamp);
 		}
 	} else {
 		// Check if any plugin has unsaved changes in that scene.
@@ -6762,6 +6629,10 @@ void EditorNode::_scene_tab_closed(int p_tab) {
 	}
 
 	if (!unsaved_message.is_empty()) {
+		if (scene_tabs->get_current_tab() != p_tab) {
+			_set_current_scene(p_tab);
+		}
+
 		save_confirmation->set_ok_button_text(TTR("Save & Close"));
 		save_confirmation->set_text(unsaved_message + "\n\n" + TTR("Save before closing?"));
 		save_confirmation->reset_size();
@@ -6784,7 +6655,6 @@ void EditorNode::_cancel_close_scene_tab() {
 
 void EditorNode::_cancel_confirmation() {
 	stop_project_confirmation = false;
-	stop_download_confirmation = false;
 }
 
 void EditorNode::_prepare_save_confirmation_popup() {
@@ -6794,7 +6664,7 @@ void EditorNode::_prepare_save_confirmation_popup() {
 }
 
 void EditorNode::_toggle_distraction_free_mode() {
-	if (EDITOR_GET("interface/editor/behavior/separate_distraction_mode")) {
+	if (EDITOR_GET("interface/editor/separate_distraction_mode")) {
 		int screen = editor_main_screen->get_selected_index();
 
 		if (screen == EditorMainScreen::EDITOR_SCRIPT) {
@@ -6810,7 +6680,7 @@ void EditorNode::_toggle_distraction_free_mode() {
 }
 
 void EditorNode::update_distraction_free_mode() {
-	if (!EDITOR_GET("interface/editor/behavior/separate_distraction_mode")) {
+	if (!EDITOR_GET("interface/editor/separate_distraction_mode")) {
 		return;
 	}
 	int screen = editor_main_screen->get_selected_index();
@@ -6831,8 +6701,6 @@ void EditorNode::set_distraction_free_mode(bool p_enter) {
 	} else {
 		editor_dock_manager->set_docks_visible(true);
 	}
-
-	emit_signal(SNAME("distraction_free_mode_changed"), p_enter);
 }
 
 bool EditorNode::is_distraction_free_mode_enabled() const {
@@ -7854,7 +7722,6 @@ void EditorNode::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("scene_closed", PropertyInfo(Variant::STRING, "path")));
 	ADD_SIGNAL(MethodInfo("preview_locale_changed"));
 	ADD_SIGNAL(MethodInfo("resource_counter_changed"));
-	ADD_SIGNAL(MethodInfo("distraction_free_mode_changed", PropertyInfo(Variant::BOOL, "enabled")));
 }
 
 static Node *_resource_get_edited_scene() {
@@ -8138,9 +8005,9 @@ void EditorNode::_add_to_main_menu(const String &p_name, PopupMenu *p_menu) {
 }
 
 void EditorNode::_update_main_menu_type() {
-	bool can_expand = bool(EDITOR_GET("interface/editor/appearance/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EXTEND_TO_TITLE);
-	bool use_menu_button = EDITOR_GET("interface/editor/appearance/collapse_main_menu");
-	bool global_menu = !bool(EDITOR_GET("interface/editor/appearance/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+	bool can_expand = bool(EDITOR_GET("interface/editor/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EXTEND_TO_TITLE);
+	bool use_menu_button = EDITOR_GET("interface/editor/collapse_main_menu");
+	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
 	MenuType new_menu_type;
 	if (global_menu) {
 		new_menu_type = MENU_TYPE_GLOBAL;
@@ -8340,7 +8207,7 @@ EditorNode::EditorNode() {
 			// Only if no touchscreen ui hint, disable emulation just in case.
 			Input::get_singleton()->set_emulate_touch_from_mouse(false);
 		}
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE)) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CUSTOM_CURSOR_SHAPE)) {
 			DisplayServer::get_singleton()->cursor_set_custom_image(Ref<Resource>());
 		}
 	}
@@ -8372,7 +8239,6 @@ EditorNode::EditorNode() {
 	ED_SHORTCUT("editor/unlock_selected_nodes", TTRC("Unlock Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::L);
 	ED_SHORTCUT("editor/group_selected_nodes", TTRC("Group Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | Key::G);
 	ED_SHORTCUT("editor/ungroup_selected_nodes", TTRC("Ungroup Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::G);
-	ED_SHORTCUT("editor/toggle_selected_nodes_visibility", TTRC("Toggle Selected Node(s) Visibility"), Key::H);
 
 	FileAccess::set_backup_save(EDITOR_GET("filesystem/on_save/safe_save_on_backup_then_rename"));
 
@@ -8394,7 +8260,7 @@ EditorNode::EditorNode() {
 	}
 
 	{
-		int display_scale = EDITOR_GET("interface/editor/appearance/display_scale");
+		int display_scale = EDITOR_GET("interface/editor/display_scale");
 
 		switch (display_scale) {
 			case 0:
@@ -8420,7 +8286,7 @@ EditorNode::EditorNode() {
 				EditorScale::set_scale(2.0);
 				break;
 			default:
-				EditorScale::set_scale(EDITOR_GET("interface/editor/appearance/custom_display_scale"));
+				EditorScale::set_scale(EDITOR_GET("interface/editor/custom_display_scale"));
 				break;
 		}
 	}
@@ -8436,13 +8302,13 @@ EditorNode::EditorNode() {
 	FileDialog::set_default_show_hidden_files(EDITOR_GET("filesystem/file_dialog/show_hidden_files"));
 	FileDialog::set_default_display_mode(EDITOR_GET("filesystem/file_dialog/display_mode"));
 
-	int swap_cancel_ok = EDITOR_GET("interface/editor/appearance/accept_dialog_cancel_ok_buttons");
+	int swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
 	if (swap_cancel_ok != 0) { // 0 is auto, set in register_scene based on DisplayServer.
 		// Swap on means OK first.
 		AcceptDialog::set_swap_cancel_ok(swap_cancel_ok == 2);
 	}
 
-	int ed_root_dir = EDITOR_GET("interface/editor/localization/ui_layout_direction");
+	int ed_root_dir = EDITOR_GET("interface/editor/ui_layout_direction");
 	Control::set_root_layout_direction(ed_root_dir);
 	Window::set_root_layout_direction(ed_root_dir);
 
@@ -8642,52 +8508,34 @@ EditorNode::EditorNode() {
 	main_vbox->add_child(title_bar);
 #endif
 
-	DockSplitContainer *main_vsplit = memnew(DockSplitContainer);
-	main_vsplit->set_name("DockVSplitMain");
-	main_vsplit->set_vertical(true);
-	main_vsplit->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	main_vbox->add_child(main_vsplit);
-
 	main_hsplit = memnew(DockSplitContainer);
 	main_hsplit->set_name("DockHSplitMain");
 	main_hsplit->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	main_vsplit->add_child(main_hsplit);
+	main_vbox->add_child(main_hsplit);
 
 	left_l_vsplit = memnew(DockSplitContainer);
 	left_l_vsplit->set_name("DockVSplitLeftL");
 	left_l_vsplit->set_vertical(true);
 	main_hsplit->add_child(left_l_vsplit);
 
-	LocalVector<DockTabContainer *> dock_slots;
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_LEFT_UL, Rect2i(0, 0, 1, 3)));
-		dock_container->set_name("DockSlotLeftUL");
-		left_l_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_LEFT_BL, Rect2i(0, 3, 1, 3)));
-		dock_container->set_name("DockSlotLeftBL");
-		left_l_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
+	TabContainer *dock_slot[DockConstants::DOCK_SLOT_MAX];
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_UL] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_UL]->set_name("DockSlotLeftUL");
+	left_l_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_LEFT_UL]);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_BL] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_BL]->set_name("DockSlotLeftBL");
+	left_l_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_LEFT_BL]);
 
 	left_r_vsplit = memnew(DockSplitContainer);
 	left_r_vsplit->set_name("DockVSplitLeftR");
 	left_r_vsplit->set_vertical(true);
 	main_hsplit->add_child(left_r_vsplit);
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_LEFT_UR, Rect2i(1, 0, 1, 3)));
-		dock_container->set_name("DockSlotLeftUR");
-		left_r_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_LEFT_BR, Rect2i(1, 3, 1, 3)));
-		dock_container->set_name("DockSlotLeftBR");
-		left_r_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_UR] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_UR]->set_name("DockSlotLeftUR");
+	left_r_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_LEFT_UR]);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_BR] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_LEFT_BR]->set_name("DockSlotLeftBR");
+	left_r_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_LEFT_BR]);
 
 	VBoxContainer *center_vb = memnew(VBoxContainer);
 	center_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -8705,51 +8553,23 @@ EditorNode::EditorNode() {
 	right_l_vsplit->set_name("DockVSplitRightL");
 	right_l_vsplit->set_vertical(true);
 	main_hsplit->add_child(right_l_vsplit);
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_RIGHT_UL, Rect2i(6, 0, 1, 3)));
-		dock_container->set_name("DockSlotRightUL");
-		right_l_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_RIGHT_BL, Rect2i(6, 3, 1, 3)));
-		dock_container->set_name("DockSlotRightBL");
-		right_l_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_UL] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_UL]->set_name("DockSlotRightUL");
+	right_l_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_RIGHT_UL]);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_BL] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_BL]->set_name("DockSlotRightBL");
+	right_l_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_RIGHT_BL]);
 
 	right_r_vsplit = memnew(DockSplitContainer);
 	right_r_vsplit->set_name("DockVSplitRightR");
 	right_r_vsplit->set_vertical(true);
 	main_hsplit->add_child(right_r_vsplit);
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_RIGHT_UR, Rect2i(7, 0, 1, 3)));
-		dock_container->set_name("DockSlotRightUR");
-		right_r_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-	{
-		DockTabContainer *dock_container = memnew(SideDockTabContainer(EditorDock::DOCK_SLOT_RIGHT_BR, Rect2i(7, 3, 1, 3)));
-		dock_container->set_name("DockSlotRightBR");
-		right_r_vsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-
-	DockSplitContainer *bottom_hsplit = memnew(DockSplitContainer);
-	bottom_hsplit->set_name("DockHSplitBottom");
-	main_vsplit->add_child(bottom_hsplit);
-	{
-		DockTabContainer *dock_container = memnew(BottomSideDockTabContainer(EditorDock::DOCK_SLOT_BOTTOM_L, Rect2i(0, 6, 4, 2)));
-		dock_container->set_name("DockSlotBottomL");
-		bottom_hsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
-	{
-		DockTabContainer *dock_container = memnew(BottomSideDockTabContainer(EditorDock::DOCK_SLOT_BOTTOM_R, Rect2i(4, 6, 4, 2)));
-		dock_container->set_name("DockSlotBottomR");
-		bottom_hsplit->add_child(dock_container);
-		dock_slots.push_back(dock_container);
-	}
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_UR] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_UR]->set_name("DockSlotRightUR");
+	right_r_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_RIGHT_UR]);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_BR] = memnew(TabContainer);
+	dock_slot[DockConstants::DOCK_SLOT_RIGHT_BR]->set_name("DockSlotRightBR");
+	right_r_vsplit->add_child(dock_slot[DockConstants::DOCK_SLOT_RIGHT_BR]);
 
 	editor_dock_manager = memnew(EditorDockManager);
 
@@ -8761,8 +8581,8 @@ EditorNode::EditorNode() {
 
 	editor_dock_manager->set_hsplit(main_hsplit);
 
-	for (DockTabContainer *dock_container : dock_slots) {
-		editor_dock_manager->register_dock_slot(dock_container);
+	for (int i = 0; i < DockConstants::DOCK_SLOT_BOTTOM; i++) {
+		editor_dock_manager->register_dock_slot((DockConstants::DockSlot)i, dock_slot[i], DockConstants::DOCK_LAYOUT_VERTICAL);
 	}
 
 	editor_layout_save_delay_timer = memnew(Timer);
@@ -8773,7 +8593,7 @@ EditorNode::EditorNode() {
 
 	scan_changes_timer = memnew(Timer);
 	scan_changes_timer->set_wait_time(0.5);
-	scan_changes_timer->set_autostart(EDITOR_GET("interface/editor/behavior/import_resources_when_unfocused"));
+	scan_changes_timer->set_autostart(EDITOR_GET("interface/editor/import_resources_when_unfocused"));
 	scan_changes_timer->connect("timeout", callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan_changes));
 	add_child(scan_changes_timer);
 
@@ -8915,7 +8735,7 @@ EditorNode::EditorNode() {
 	ED_SHORTCUT_AND_COMMAND("editor/engine_compilation_configuration_editor", TTRC("Engine Compilation Configuration Editor..."));
 	ED_SHORTCUT_AND_COMMAND("editor/upgrade_project", TTRC("Upgrade Project Files..."));
 
-	ED_SHORTCUT_AND_COMMAND("editor/reload_current_project", TTRC("Reload Current Project"));
+	ED_SHORTCUT("editor/reload_current_project", TTRC("Reload Current Project"));
 	ED_SHORTCUT_AND_COMMAND("editor/quit_to_project_list", TTRC("Quit to Project List"), KeyModifierMask::CTRL + KeyModifierMask::SHIFT + Key::Q);
 	ED_SHORTCUT_OVERRIDE("editor/quit_to_project_list", "macos", KeyModifierMask::META + KeyModifierMask::CTRL + KeyModifierMask::ALT + Key::Q);
 
@@ -8957,7 +8777,7 @@ EditorNode::EditorNode() {
 	ED_SHORTCUT_AND_COMMAND("editor/editor_prev", TTRC("Open the previous Editor"));
 
 	// Editor menu and toolbar.
-	bool can_expand = bool(EDITOR_GET("interface/editor/appearance/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EXTEND_TO_TITLE);
+	bool can_expand = bool(EDITOR_GET("interface/editor/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EXTEND_TO_TITLE);
 
 #ifdef MACOS_ENABLED
 	if (NativeMenu::get_singleton()->has_system_menu(NativeMenu::APPLICATION_MENU_ID)) {
@@ -9145,25 +8965,9 @@ EditorNode::EditorNode() {
 	const String docks_section = "docks";
 	default_layout.instantiate();
 	// Dock numbers are based on DockSlot enum value + 1.
-	{
-		const String scene_key = SceneTreeDock::get_singleton()->get_effective_layout_key();
-		const String import_key = ImportDock::get_singleton()->get_effective_layout_key();
-		default_layout->set_value(docks_section, "dock_3", vformat("%s,%s", scene_key, import_key));
-		default_layout->set_value(docks_section, "dock_3_selected_tab_idx", 0);
-	}
-	{
-		const String filesystem_key = filesystem_dock->get_effective_layout_key();
-		const String history_key = history_dock->get_effective_layout_key();
-		default_layout->set_value(docks_section, "dock_4", vformat("%s,%s", filesystem_key, history_key));
-		default_layout->set_value(docks_section, "dock_4_selected_tab_idx", 0);
-	}
-	{
-		const String inspector_key = InspectorDock::get_singleton()->get_effective_layout_key();
-		const String signals_key = SignalsDock::get_singleton()->get_effective_layout_key();
-		const String groups_key = GroupsDock::get_singleton()->get_effective_layout_key();
-		default_layout->set_value(docks_section, "dock_5", vformat("%s,%s,%s", inspector_key, signals_key, groups_key));
-		default_layout->set_value(docks_section, "dock_5_selected_tab_idx", 0);
-	}
+	default_layout->set_value(docks_section, "dock_3", "Scene,Import");
+	default_layout->set_value(docks_section, "dock_4", "FileSystem,History");
+	default_layout->set_value(docks_section, "dock_5", "Inspector,Signals,Groups");
 
 	int hsplits[] = { 0, dock_hsize, -dock_hsize, 0 };
 	for (int i = 0; i < (int)std_size(hsplits); i++) {
@@ -9176,7 +8980,6 @@ EditorNode::EditorNode() {
 	{
 		Dictionary offsets;
 		offsets["Audio"] = -450;
-		offsets["Output"] = -270;
 		default_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "bottom_panel_offsets", offsets);
 	}
 
@@ -9185,7 +8988,8 @@ EditorNode::EditorNode() {
 	// Bottom panels.
 
 	bottom_panel = memnew(EditorBottomPanel);
-	editor_dock_manager->register_dock_slot(bottom_panel);
+	editor_dock_manager->register_dock_slot(DockConstants::DOCK_SLOT_BOTTOM, bottom_panel, DockConstants::DOCK_LAYOUT_HORIZONTAL);
+	bottom_panel->set_theme_type_variation("BottomPanel");
 	center_split->add_child(bottom_panel);
 	center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN);
 
@@ -9253,7 +9057,7 @@ EditorNode::EditorNode() {
 	}
 
 	remove_android_build_template = memnew(ConfirmationDialog);
-	remove_android_build_template->set_ok_button_text(OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN));
+	remove_android_build_template->set_ok_button_text(TTR("Show in File Manager"));
 	remove_android_build_template->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_android_explore_build_templates));
 	gui_base->add_child(remove_android_build_template);
 
@@ -9398,10 +9202,6 @@ EditorNode::EditorNode() {
 		canvas_item_mat_convert.instantiate();
 		resource_conversion_plugins.push_back(canvas_item_mat_convert);
 
-		Ref<BlitMaterialConversionPlugin> blit_mat_convert;
-		blit_mat_convert.instantiate();
-		resource_conversion_plugins.push_back(blit_mat_convert);
-
 		Ref<ParticleProcessMaterialConversionPlugin> particles_mat_convert;
 		particles_mat_convert.instantiate();
 		resource_conversion_plugins.push_back(particles_mat_convert);
@@ -9560,7 +9360,7 @@ EditorNode::EditorNode() {
 	// Extend menu bar to window title.
 	if (can_expand) {
 		DisplayServer::get_singleton()->process_events();
-		DisplayServer::get_singleton()->window_set_flag(DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE, true, DisplayServerEnums::MAIN_WINDOW_ID);
+		DisplayServer::get_singleton()->window_set_flag(DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE, true, DisplayServer::MAIN_WINDOW_ID);
 		title_bar->set_can_move_window(true);
 	}
 
diff --git a/engine/editor/editor_node.h b/engine/editor/editor_node.h
index 337c7484..07f0e5c5 100644
--- a/engine/editor/editor_node.h
+++ b/engine/editor/editor_node.h
@@ -31,12 +31,10 @@
 #pragma once
 
 #include "core/object/script_language.h"
-#include "core/os/process_id.h"
 #include "core/templates/safe_refcount.h"
 #include "editor/editor_data.h"
 #include "editor/plugins/editor_plugin.h"
 #include "editor/settings/editor_folding.h"
-#include "servers/display/display_server_enums.h"
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();
@@ -217,11 +215,10 @@ public:
 
 		// Non-menu options.
 		SCENE_TAB_CLOSE,
-		SCENE_TAB_SAVE_SCENE,
-		SCENE_TAB_SAVE_AS_AND_RUN,
-		SCENE_TAB_SAVE_AS_MAIN_SCENE,
+		SCENE_TAB_SET_AS_MAIN_SCENE,
 		SAVE_AND_RUN,
 		SAVE_AND_RUN_MAIN_SCENE,
+		SAVE_AND_SET_MAIN_SCENE,
 		RESOURCE_SAVE,
 		RESOURCE_SAVE_AS,
 		SETTINGS_PICK_MAIN_SCENE,
@@ -319,7 +316,7 @@ private:
 	bool exiting = false;
 	bool dimmed = false;
 
-	DisplayServerEnums::WindowMode prev_mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+	DisplayServer::WindowMode prev_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 	int old_split_ofs = 0;
 	VSplitContainer *top_split = nullptr;
 	Control *vp_base = nullptr;
@@ -351,6 +348,8 @@ private:
 
 	Timer *screenshot_timer = nullptr;
 
+	uint64_t started_timestamp = 0;
+
 	RichTextLabel *load_errors = nullptr;
 	AcceptDialog *load_error_dialog = nullptr;
 	bool load_errors_queued_to_display = false;
@@ -374,7 +373,6 @@ private:
 
 	ConfirmationDialog *confirmation = nullptr;
 	bool stop_project_confirmation = false;
-	bool stop_download_confirmation = false;
 	Button *confirmation_button = nullptr;
 	ConfirmationDialog *save_confirmation = nullptr;
 	ConfirmationDialog *import_confirmation = nullptr;
@@ -480,7 +478,6 @@ private:
 	HashSet<String> textfile_extensions;
 	HashSet<String> other_file_extensions;
 	HashSet<FileDialog *> file_dialogs;
-	LocalVector<ObjectID> hdr_viewports;
 
 	Vector<Ref<EditorResourceConversionPlugin>> resource_conversion_plugins;
 	PrintHandlerList print_handler;
@@ -503,6 +500,8 @@ private:
 
 	String _get_system_info() const;
 
+	bool _should_display_update_spinner() const;
+
 	static void _dependency_error_report(const String &p_path, const String &p_dep, const String &p_type) {
 		DEV_ASSERT(Thread::get_caller_id() == Thread::get_main_id());
 		if (!singleton->dependency_errors.has(p_path)) {
@@ -636,12 +635,15 @@ private:
 	virtual void input(const Ref<InputEvent> &p_event) override;
 	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
 
+	bool has_main_screen() const { return true; }
+
 	void _remove_edited_scene(bool p_change_tab = true);
 	void _remove_scene(int index, bool p_change_tab = true);
 	bool _find_and_save_resource(Ref<Resource> p_res, HashMap<Ref<Resource>, bool> &processed, int32_t flags);
 	bool _find_and_save_edited_subresources(Object *obj, HashMap<Ref<Resource>, bool> &processed, int32_t flags);
 	void _save_edited_subresources(Node *scene, HashMap<Ref<Resource>, bool> &processed, int32_t flags);
 	void _mark_unsaved_scenes();
+	bool _is_scene_unsaved(int p_idx);
 
 	void _find_node_types(Node *p_node, int &count_2d, int &count_3d);
 	void _save_scene_with_preview(String p_file, int p_idx = -1);
@@ -734,10 +736,9 @@ protected:
 	void _notification(int p_what);
 
 public:
-	// Public for use as signal callback.
-	void _on_plugin_ready(Object *p_script, const String &p_activate_name);
-
+	// Public for use with callable_mp.
 	void init_plugins();
+	void _on_plugin_ready(Object *p_script, const String &p_activate_name);
 
 	bool call_build();
 	void call_run_scene(const String &p_scene, Vector<String> &r_args);
@@ -944,7 +945,6 @@ public:
 	bool is_multi_window_enabled() const;
 
 	void setup_color_picker(ColorPicker *p_picker);
-	void register_hdr_viewport(Viewport *p_viewport);
 
 	void request_instantiate_scene(const String &p_path);
 	void request_instantiate_scenes(const Vector<String> &p_files);
@@ -953,8 +953,8 @@ public:
 
 	void notify_all_debug_sessions_exited();
 
-	ProcessID has_child_process(ProcessID p_pid) const;
-	void stop_child_process(ProcessID p_pid);
+	OS::ProcessID has_child_process(OS::ProcessID p_pid) const;
+	void stop_child_process(OS::ProcessID p_pid);
 
 	Ref<Theme> get_editor_theme() const { return theme; }
 	void update_preview_themes(int p_mode);
@@ -1047,7 +1047,6 @@ public:
 	bool ensure_main_scene(bool p_from_native);
 	bool validate_custom_directory();
 	void run_editor_script(const Ref<Script> &p_script);
-	bool is_scene_unsaved(int p_idx);
 };
 
 struct EditorProgressBG {
diff --git a/engine/editor/editor_undo_redo_manager.compat.inc b/engine/editor/editor_undo_redo_manager.compat.inc
index 537b8bbe..b44762e3 100644
--- a/engine/editor/editor_undo_redo_manager.compat.inc
+++ b/engine/editor/editor_undo_redo_manager.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "editor_undo_redo_manager.h"
-
-#include "core/object/class_db.h"
-
 void EditorUndoRedoManager::_create_action_bind_compat_106121(const String &p_name, UndoRedo::MergeMode p_mode, Object *p_custom_context, bool p_backward_undo_ops) {
 	create_action(p_name, p_mode, p_custom_context, p_backward_undo_ops, true);
 }
@@ -42,4 +38,4 @@ void EditorUndoRedoManager::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("create_action", "name", "merge_mode", "custom_context", "backward_undo_ops"), &EditorUndoRedoManager::_create_action_bind_compat_106121, DEFVAL(UndoRedo::MERGE_DISABLE), DEFVAL((Object *)nullptr), DEFVAL(false));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/editor/editor_undo_redo_manager.cpp b/engine/editor/editor_undo_redo_manager.cpp
index 7ef8d6a6..48855c57 100644
--- a/engine/editor/editor_undo_redo_manager.cpp
+++ b/engine/editor/editor_undo_redo_manager.cpp
@@ -32,7 +32,6 @@
 #include "editor_undo_redo_manager.compat.inc"
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
@@ -390,7 +389,6 @@ void EditorUndoRedoManager::set_history_as_saved(int p_id) {
 void EditorUndoRedoManager::set_history_as_unsaved(int p_id) {
 	History &history = get_or_create_history(p_id);
 	history.saved_version = UNSAVED_VERSION;
-	emit_signal(SNAME("history_changed"));
 }
 
 bool EditorUndoRedoManager::is_history_unsaved(int p_id) {
diff --git a/engine/editor/export/codesign.cpp b/engine/editor/export/codesign.cpp
index 1e869f0a..20a5507a 100644
--- a/engine/editor/export/codesign.cpp
+++ b/engine/editor/export/codesign.cpp
@@ -33,9 +33,9 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/plist.h"
-#include "editor/export/lipo.h"
-#include "editor/export/macho.h"
 #include "editor/file_system/editor_paths.h"
+#include "lipo.h"
+#include "macho.h"
 
 #include "modules/regex/regex.h"
 
@@ -199,11 +199,11 @@ bool CodeSignCodeResources::add_file2(const String &p_root, const String &p_path
 }
 
 bool CodeSignCodeResources::add_nested_file(const String &p_root, const String &p_path, const String &p_exepath) {
-#define CLEANUP() \
-	if (files_to_add.size() > 1) { \
+#define CLEANUP()                                       \
+	if (files_to_add.size() > 1) {                      \
 		for (int j = 0; j < files_to_add.size(); j++) { \
-			da->remove(files_to_add[j]); \
-		} \
+			da->remove(files_to_add[j]);                \
+		}                                               \
 	}
 
 	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
@@ -1181,11 +1181,11 @@ PackedByteArray CodeSign::file_hash_sha256(const String &p_path) {
 }
 
 Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const String &p_info, const String &p_exe_path, const String &p_bundle_path, const String &p_ent_path, bool p_ios_bundle, String &r_error_msg) {
-#define CLEANUP() \
-	if (files_to_sign.size() > 1) { \
+#define CLEANUP()                                        \
+	if (files_to_sign.size() > 1) {                      \
 		for (int j = 0; j < files_to_sign.size(); j++) { \
-			da->remove(files_to_sign[j]); \
-		} \
+			da->remove(files_to_sign[j]);                \
+		}                                                \
 	}
 
 	print_verbose(vformat("CodeSign: Signing executable: %s, bundle: %s with entitlements %s", p_exe_path, p_bundle_path, p_ent_path));
diff --git a/engine/editor/export/editor_export.cpp b/engine/editor/export/editor_export.cpp
index d4d02788..fb5c2287 100644
--- a/engine/editor/export/editor_export.cpp
+++ b/engine/editor/export/editor_export.cpp
@@ -30,9 +30,8 @@
 
 #include "editor_export.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/config_file.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/settings/editor_settings.h"
 #include "scene/main/timer.h"
 
@@ -43,17 +42,13 @@ void EditorExport::_save() {
 	Ref<ConfigFile> credentials;
 	config.instantiate();
 	credentials.instantiate();
-
-	for (const KeyValue<Ref<EditorExportPlatform>, Ref<EditorExportPreset>> &E : runnable_presets) {
-		config->set_value(RUNNABLE_SECTION_NAME, E.key->get_name(), E.value->get_name());
-	}
-
 	for (int i = 0; i < export_presets.size(); i++) {
 		Ref<EditorExportPreset> preset = export_presets[i];
 		String section = "preset." + itos(i);
 
 		config->set_value(section, "name", preset->get_name());
 		config->set_value(section, "platform", preset->get_platform()->get_name());
+		config->set_value(section, "runnable", preset->is_runnable());
 		config->set_value(section, "dedicated_server", preset->is_dedicated_server());
 		config->set_value(section, "custom_features", preset->get_custom_features());
 
@@ -226,26 +221,6 @@ Vector<Ref<EditorExportPlugin>> EditorExport::get_export_plugins() {
 	return export_plugins;
 }
 
-void EditorExport::set_runnable_preset(const Ref<EditorExportPreset> &p_preset) {
-	runnable_presets[p_preset->get_platform()] = p_preset;
-	emit_presets_runnable_changed();
-	save_presets();
-}
-
-void EditorExport::unset_runnable_preset(const Ref<EditorExportPreset> &p_preset) {
-	const Ref<EditorExportPreset> *current = runnable_presets.getptr(p_preset->get_platform());
-	if (current && *current == p_preset) {
-		runnable_presets.erase(p_preset->get_platform());
-		emit_presets_runnable_changed();
-		save_presets();
-	}
-}
-
-Ref<EditorExportPreset> EditorExport::get_runnable_preset_for_platform(const Ref<EditorExportPlatform> &p_for_platform) const {
-	const Ref<EditorExportPreset> *preset = runnable_presets.getptr(p_for_platform);
-	return preset ? *preset : Ref<EditorExportPreset>();
-}
-
 void EditorExport::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
@@ -285,13 +260,6 @@ void EditorExport::load_config() {
 		return;
 	}
 
-	HashMap<String, String> runnable_loading;
-	if (config->has_section(RUNNABLE_SECTION_NAME)) {
-		for (const String &platform_name : config->get_section_keys(RUNNABLE_SECTION_NAME)) {
-			runnable_loading[platform_name] = config->get_value(RUNNABLE_SECTION_NAME, platform_name);
-		}
-	}
-
 	block_save = true;
 
 	int index = 0;
@@ -311,17 +279,9 @@ void EditorExport::load_config() {
 
 		Ref<EditorExportPreset> preset;
 
-		for (Ref<EditorExportPlatform> &export_platform : export_platforms) {
-			if (export_platform->get_name() == platform) {
-				preset = export_platform->create_preset();
-
-				const String preset_name = config->get_value(section, "name");
-				preset->set_name(preset_name);
-
-				const String *runnable_preset = runnable_loading.getptr(export_platform->get_name());
-				if (runnable_preset && *runnable_preset == preset_name) {
-					runnable_presets[export_platform] = preset;
-				}
+		for (int i = 0; i < export_platforms.size(); i++) {
+			if (export_platforms[i]->get_name() == platform) {
+				preset = export_platforms.write[i]->create_preset();
 				break;
 			}
 		}
@@ -331,12 +291,8 @@ void EditorExport::load_config() {
 			continue; // Unknown platform, skip without error (platform might be loaded later).
 		}
 
-#ifndef DISABLE_DEPRECATED
-		bool legacy_runnable = config->get_value(section, "runnable", false);
-		if (legacy_runnable) {
-			preset->set_runnable(true);
-		}
-#endif
+		preset->set_name(config->get_value(section, "name"));
+		preset->set_runnable(config->get_value(section, "runnable"));
 		preset->set_dedicated_server(config->get_value(section, "dedicated_server", false));
 
 		if (config->has_section_key(section, "custom_features")) {
@@ -483,7 +439,7 @@ void EditorExport::update_export_presets() {
 			export_presets_updated = true;
 
 			bool update_value_overrides = false;
-			List<EditorExportPlatform::ExportOption> options(platform_options[preset->get_platform()->get_name()]);
+			List<EditorExportPlatform::ExportOption> options = platform_options[preset->get_platform()->get_name()];
 
 			// Clear the preset properties prior to reloading, keep the values to preserve options from plugins that may be currently disabled.
 			preset->properties.clear();
diff --git a/engine/editor/export/editor_export.h b/engine/editor/export/editor_export.h
index e20baf4d..877fca6f 100644
--- a/engine/editor/export/editor_export.h
+++ b/engine/editor/export/editor_export.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "editor/export/editor_export_platform.h"
-#include "editor/export/editor_export_plugin.h"
+#include "editor_export_platform.h"
+#include "editor_export_plugin.h"
 
 class Timer;
 
@@ -41,9 +41,6 @@ class EditorExport : public Node {
 	Vector<Ref<EditorExportPlatform>> export_platforms;
 	Vector<Ref<EditorExportPreset>> export_presets;
 	Vector<Ref<EditorExportPlugin>> export_plugins;
-	HashMap<Ref<EditorExportPlatform>, Ref<EditorExportPreset>> runnable_presets;
-
-	static inline const String RUNNABLE_SECTION_NAME = "runnable_presets";
 
 	static inline StringName _export_presets_updated;
 	static inline StringName _export_presets_runnable_updated;
@@ -88,10 +85,6 @@ public:
 	void remove_export_plugin(const Ref<EditorExportPlugin> &p_plugin);
 	Vector<Ref<EditorExportPlugin>> get_export_plugins();
 
-	void set_runnable_preset(const Ref<EditorExportPreset> &p_preset);
-	void unset_runnable_preset(const Ref<EditorExportPreset> &p_preset);
-	Ref<EditorExportPreset> get_runnable_preset_for_platform(const Ref<EditorExportPlatform> &p_for_platform) const;
-
 	void load_config();
 	void update_export_presets();
 	bool poll_export_platforms();
diff --git a/engine/editor/export/editor_export_platform.compat.inc b/engine/editor/export/editor_export_platform.compat.inc
index a38614c9..fca3300a 100644
--- a/engine/editor/export/editor_export_platform.compat.inc
+++ b/engine/editor/export/editor_export_platform.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "editor_export_platform.h"
-
-#include "core/object/class_db.h"
-
 Vector<String> EditorExportPlatform::_get_forced_export_files_bind_compat_71542() {
 	return get_forced_export_files(Ref<EditorExportPreset>());
 }
@@ -42,4 +38,4 @@ void EditorExportPlatform::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_static_method("EditorExportPlatform", D_METHOD("get_forced_export_files"), &EditorExportPlatform::_get_forced_export_files_bind_compat_71542);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/editor/export/editor_export_platform.cpp b/engine/editor/export/editor_export_platform.cpp
index ceaf61df..68a68b00 100644
--- a/engine/editor/export/editor_export_platform.cpp
+++ b/engine/editor/export/editor_export_platform.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "editor_export_platform.h"
+
 #include "editor_export_platform.compat.inc"
 
 #include "core/config/project_settings.h"
@@ -40,25 +41,20 @@
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
 #include "core/io/image.h"
 #include "core/io/image_loader.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/io/resource_uid.h"
-#include "core/io/zip_io.h"
 #include "core/math/random_pcg.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/os/shared_object.h"
-#include "core/string/translation.h"
+#include "core/string/translation_server.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
-#include "editor/export/editor_export_plugin.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "editor_export_plugin.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/main/node.h"
 #include "scene/resources/packed_scene.h"
@@ -224,154 +220,22 @@ bool EditorExportPlatform::fill_log_messages(RichTextLabel *p_log, Error p_err)
 	return has_messages;
 }
 
-Error EditorExportPlatform::_extract_android_assets(const String &p_bundle_path, String &r_pck_path, String &r_temp_dir) {
+Error EditorExportPlatform::_load_patches(const Vector<String> &p_patches) {
 	Error err = OK;
-
-	Ref<FileAccess> io_fa;
-	zlib_filefunc_def io = zipio_create_io(&io_fa);
-	unzFile zip_file = unzOpen2(p_bundle_path.utf8().get_data(), &io);
-	if (!zip_file) {
-		return ERR_FILE_CANT_OPEN;
-	}
-
-	const char *pck_name = "assets.sparsepck";
-	String pck_base_dir;
-
-	int ret = unzGoToFirstFile(zip_file);
-	while (ret == UNZ_OK) {
-		unz_file_info64 file_info = {};
-		char file_name_buf[16384];
-		ret = unzGetCurrentFileInfo64(zip_file, &file_info, file_name_buf, sizeof(file_name_buf), nullptr, 0, nullptr, 0);
-		if (ret != UNZ_OK) {
-			break;
-		}
-
-		String file_name = String::utf8(file_name_buf);
-		if (file_name.ends_with(pck_name)) {
-			pck_base_dir = file_name.trim_suffix(pck_name);
-			break;
-		}
-
-		ret = unzGoToNextFile(zip_file);
-	}
-
-	if (ret != UNZ_OK || pck_base_dir.is_empty()) {
-		unzClose(zip_file);
-		return ERR_FILE_UNRECOGNIZED;
-	}
-
-	Ref<DirAccess> temp_dir = DirAccess::create_temp("export_patch_base", true, &err);
-	if (err != OK) {
-		unzClose(zip_file);
-		return err;
-	}
-
-	String temp_dir_path = temp_dir->get_current_dir();
-
-	ret = unzGoToFirstFile(zip_file);
-	while (ret == UNZ_OK) {
-		unz_file_info64 zip_file_info = {};
-		char file_name_buf[16384];
-		if (unzGetCurrentFileInfo64(zip_file, &zip_file_info, file_name_buf, sizeof(file_name_buf), nullptr, 0, nullptr, 0) != UNZ_OK) {
-			err = ERR_FILE_CORRUPT;
-			break;
-		}
-
-		String file_name = String::utf8(file_name_buf);
-		if (!file_name.begins_with(pck_base_dir)) {
-			ret = unzGoToNextFile(zip_file);
-			continue;
-		}
-
-		String file_path_relative = file_name.trim_prefix(pck_base_dir).simplify_path();
-		if (file_path_relative.is_empty()) {
-			ret = unzGoToNextFile(zip_file);
-			continue;
-		}
-
-		String file_output_path = temp_dir_path.path_join(file_path_relative);
-		err = DirAccess::make_dir_recursive_absolute(file_output_path.get_base_dir());
-		if (err != OK) {
-			break;
-		}
-
-		if (unzOpenCurrentFile(zip_file) != UNZ_OK) {
-			err = ERR_FILE_CANT_OPEN;
-			break;
-		}
-
-		LocalVector<uint8_t> uncomp_data;
-		uncomp_data.resize(zip_file_info.uncompressed_size);
-		int read_bytes = unzReadCurrentFile(zip_file, uncomp_data.ptr(), uncomp_data.size());
-		unzCloseCurrentFile(zip_file);
-
-		if (read_bytes < 0 || read_bytes != (int)uncomp_data.size()) {
-			err = ERR_FILE_CANT_READ;
-			break;
-		}
-
-		Ref<FileAccess> temp_file = FileAccess::open(file_output_path, FileAccess::WRITE, &err);
-		if (err != OK) {
-			break;
-		}
-
-		if (!temp_file->store_buffer(uncomp_data.ptr(), uncomp_data.size())) {
-			err = ERR_FILE_CANT_WRITE;
-			break;
-		}
-
-		ret = unzGoToNextFile(zip_file);
-	}
-
-	unzClose(zip_file);
-
-	r_pck_path = temp_dir_path.path_join(pck_name);
-	r_temp_dir = temp_dir_path;
-
-	return err;
-}
-
-Error EditorExportPlatform::_load_patches(const Ref<EditorExportPreset> &p_preset, const Vector<String> &p_patches) {
 	if (!p_patches.is_empty()) {
 		for (const String &path : p_patches) {
-			String pck_path = path;
-
-			if (path.ends_with(".apk") || path.ends_with(".aab")) {
-				String temp_dir;
-				Error err = _extract_android_assets(path, pck_path, temp_dir);
-				if (err != OK) {
-					_unload_patches();
-					add_message(EXPORT_MESSAGE_ERROR, TTR("Patch Creation"), vformat(TTR("Could not extract assets from Android bundle \"%s\", due to error \"%s\"."), path, error_names[err]));
-					return err;
-				}
-
-				patch_temp_dirs.push_back(temp_dir);
-			}
-
-			Error err = PackedData::get_singleton()->add_pack(pck_path, true, 0, _get_script_encryption_key_bytes(p_preset));
+			err = PackedData::get_singleton()->add_pack(path, true, 0);
 			if (err != OK) {
-				_unload_patches();
-				add_message(EXPORT_MESSAGE_ERROR, TTR("Patch Creation"), vformat(TTR("Could not load patch pack with path \"%s\"."), pck_path));
+				add_message(EXPORT_MESSAGE_ERROR, TTR("Patch Creation"), vformat(TTR("Could not load patch pack with path \"%s\"."), path));
 				return err;
 			}
 		}
 	}
-
-	return OK;
+	return err;
 }
 
 void EditorExportPlatform::_unload_patches() {
 	PackedData::get_singleton()->clear();
-
-	for (const String &temp_dir : patch_temp_dirs) {
-		Ref<DirAccess> temp_dir_da = DirAccess::open(temp_dir);
-		if (temp_dir_da.is_valid()) {
-			temp_dir_da->erase_contents_recursive();
-			temp_dir_da->remove(temp_dir);
-		}
-	}
-
-	patch_temp_dirs.clear();
 }
 
 Error EditorExportPlatform::_encrypt_and_store_data(Ref<FileAccess> p_fd, const String &p_path, const Vector<uint8_t> &p_data, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed, bool &r_encrypt) {
@@ -483,7 +347,7 @@ Error EditorExportPlatform::_save_pack_file(const Ref<EditorExportPreset> &p_pre
 }
 
 Error EditorExportPlatform::_save_pack_patch_file(const Ref<EditorExportPreset> &p_preset, void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed, bool p_delta) {
-	Ref<FileAccess> old_file = PackedData::get_singleton()->try_open_path(p_path, _get_script_encryption_key_bytes(p_preset));
+	Ref<FileAccess> old_file = PackedData::get_singleton()->try_open_path(p_path);
 	if (old_file.is_null()) {
 		return _save_pack_file(p_preset, p_userdata, p_path, p_data, p_file, p_total, p_enc_in_filters, p_enc_ex_filters, p_key, p_seed, false);
 	}
@@ -1129,7 +993,7 @@ String EditorExportPlatform::_export_customize(const String &p_path, LocalVector
 	return save_path.is_empty() ? p_path : save_path;
 }
 
-String EditorExportPlatform::_get_script_encryption_key(const Ref<EditorExportPreset> &p_preset) {
+String EditorExportPlatform::_get_script_encryption_key(const Ref<EditorExportPreset> &p_preset) const {
 	const String from_env = OS::get_singleton()->get_environment(ENV_SCRIPT_ENCRYPTION_KEY);
 	if (!from_env.is_empty()) {
 		return from_env.to_lower();
@@ -1137,39 +1001,6 @@ String EditorExportPlatform::_get_script_encryption_key(const Ref<EditorExportPr
 	return p_preset->get_script_encryption_key().to_lower();
 }
 
-Vector<uint8_t> EditorExportPlatform::_get_script_encryption_key_bytes(const Ref<EditorExportPreset> &p_preset) {
-	Vector<uint8_t> key;
-	String script_key = _get_script_encryption_key(p_preset);
-	if (script_key.length() == 64) {
-		key.resize(32);
-		for (int i = 0; i < 32; i++) {
-			int v = 0;
-			if (i * 2 < script_key.length()) {
-				char32_t ct = script_key[i * 2];
-				if (is_digit(ct)) {
-					ct = ct - '0';
-				} else if (ct >= 'a' && ct <= 'f') {
-					ct = 10 + ct - 'a';
-				}
-				v |= ct << 4;
-			}
-
-			if (i * 2 + 1 < script_key.length()) {
-				char32_t ct = script_key[i * 2 + 1];
-				if (is_digit(ct)) {
-					ct = ct - '0';
-				} else if (ct >= 'a' && ct <= 'f') {
-					ct = 10 + ct - 'a';
-				}
-				v |= ct;
-			}
-			key.write[i] = v;
-		}
-	}
-
-	return key;
-}
-
 Dictionary EditorExportPlatform::get_internal_export_files(const Ref<EditorExportPreset> &p_preset, bool p_debug) {
 	Dictionary files;
 
@@ -1249,6 +1080,10 @@ Vector<String> EditorExportPlatform::get_forced_export_files(const Ref<EditorExp
 	if (!splash.is_empty() && FileAccess::exists(splash) && icon != splash) {
 		files.push_back(splash);
 	}
+	String resource_cache_file = ResourceUID::get_cache_file();
+	if (FileAccess::exists(resource_cache_file)) {
+		files.push_back(resource_cache_file);
+	}
 
 	String extension_list_config_file = GDExtension::get_extension_list_config_file();
 	if (FileAccess::exists(extension_list_config_file)) {
@@ -1394,7 +1229,33 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 		}
 
 		// Get encryption key.
-		key = _get_script_encryption_key_bytes(p_preset);
+		String script_key = _get_script_encryption_key(p_preset);
+		key.resize(32);
+		if (script_key.length() == 64) {
+			for (int i = 0; i < 32; i++) {
+				int v = 0;
+				if (i * 2 < script_key.length()) {
+					char32_t ct = script_key[i * 2];
+					if (is_digit(ct)) {
+						ct = ct - '0';
+					} else if (ct >= 'a' && ct <= 'f') {
+						ct = 10 + ct - 'a';
+					}
+					v |= ct << 4;
+				}
+
+				if (i * 2 + 1 < script_key.length()) {
+					char32_t ct = script_key[i * 2 + 1];
+					if (is_digit(ct)) {
+						ct = ct - '0';
+					} else if (ct >= 'a' && ct <= 'f') {
+						ct = 10 + ct - 'a';
+					}
+					v |= ct;
+				}
+				key.write[i] = v;
+			}
+		}
 	}
 
 	EditorExportSaveProxy save_proxy(p_save_func, p_remove_func != nullptr);
@@ -1786,36 +1647,23 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 		}
 	}
 
-	const FilteredCache filtered_cache = _get_filtered_cache(paths);
-
 	Vector<String> forced_export = get_forced_export_files(p_preset);
-	for (const String &file : forced_export) {
+	for (int i = 0; i < forced_export.size(); i++) {
 		Vector<uint8_t> array;
-
-		if (file == GDExtension::get_extension_list_config_file()) {
-			array = filtered_cache.extension_list;
-		} else if (file == ProjectSettings::get_singleton()->get_global_class_list_path()) {
-			array = filtered_cache.global_class_list;
+		if (GDExtension::get_extension_list_config_file() == forced_export[i]) {
+			array = _filter_extension_list_config_file(forced_export[i], paths);
+			if (array.is_empty()) {
+				continue;
+			}
 		} else {
-			array = FileAccess::get_file_as_bytes(file);
+			array = FileAccess::get_file_as_bytes(forced_export[i]);
 		}
-
-		if (array.is_empty()) {
-			continue;
-		}
-
-		err = save_proxy.save_file(p_preset, p_udata, file, array, idx, total, enc_in_filters, enc_ex_filters, key, seed, false);
+		err = save_proxy.save_file(p_preset, p_udata, forced_export[i], array, idx, total, enc_in_filters, enc_ex_filters, key, seed, false);
 		if (err != OK) {
 			return err;
 		}
 	}
 
-	String uid_cache_file_path = ResourceUID::get_cache_file();
-	err = save_proxy.save_file(p_preset, p_udata, uid_cache_file_path, filtered_cache.uids, idx, total, enc_in_filters, enc_ex_filters, key, seed, false);
-	if (err != OK) {
-		return err;
-	}
-
 	Dictionary int_export = get_internal_export_files(p_preset, p_debug);
 	for (const KeyValue<Variant, Variant> &int_export_kv : int_export) {
 		const PackedByteArray &array = int_export_kv.value;
@@ -1852,69 +1700,20 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 	return OK;
 }
 
-// Used by the main export function to filter excluded global classes, extensions
-// and UIDs based on excluded resources configured in the export preset.
-EditorExportPlatform::FilteredCache EditorExportPlatform::_get_filtered_cache(const HashSet<String> &p_paths) {
-	FilteredCache result;
-
-	HashSet<String> extension_list_lines;
-	Ref<FileAccess> ext_file = FileAccess::open(GDExtension::get_extension_list_config_file(), FileAccess::READ);
-	if (ext_file.is_valid()) {
-		while (!ext_file->eof_reached()) {
-			String line = ext_file->get_line().strip_edges();
-			extension_list_lines.insert(line);
+Vector<uint8_t> EditorExportPlatform::_filter_extension_list_config_file(const String &p_config_path, const HashSet<String> &p_paths) {
+	Ref<FileAccess> f = FileAccess::open(p_config_path, FileAccess::READ);
+	if (f.is_null()) {
+		ERR_FAIL_V_MSG(Vector<uint8_t>(), "Can't open file from path '" + String(p_config_path) + "'.");
+	}
+	Vector<uint8_t> data;
+	while (!f->eof_reached()) {
+		String l = f->get_line().strip_edges();
+		if (p_paths.has(l)) {
+			data.append_array(l.to_utf8_buffer());
+			data.append('\n');
 		}
 	}
-
-	HashMap<String, Dictionary> class_by_path;
-	Ref<ConfigFile> global_class_cf;
-	global_class_cf.instantiate();
-	if (global_class_cf->load(ProjectSettings::get_singleton()->get_global_class_list_path()) == OK) {
-		Array original_list = global_class_cf->get_value("", "list", Array());
-		class_by_path.reserve(original_list.size());
-		for (const Variant &item : original_list) {
-			const Dictionary &class_dict = item;
-			ERR_CONTINUE(!class_dict.has("path"));
-			class_by_path[class_dict["path"]] = class_dict;
-		}
-	}
-
-	Vector<String> extension_lines;
-	Array global_class_list;
-	Vector<Pair<ResourceUID::ID, String>> uid_entries;
-	extension_lines.reserve(extension_list_lines.size());
-	global_class_list.reserve(class_by_path.size());
-	uid_entries.reserve(p_paths.size());
-
-	for (const String &path : p_paths) {
-		if (extension_list_lines.has(path)) {
-			extension_lines.push_back(path);
-		}
-		if (class_by_path.has(path)) {
-			global_class_list.push_back(class_by_path[path]);
-		}
-		ResourceUID::ID uid = EditorFileSystem::get_singleton()->get_file_uid(path);
-		if (uid != ResourceUID::INVALID_ID) {
-			uid_entries.push_back(Pair<ResourceUID::ID, String>(uid, path));
-		}
-	}
-
-	// Encode extensions.
-	for (const String &line : extension_lines) {
-		result.extension_list.append_array(line.to_utf8_buffer());
-		result.extension_list.append('\n');
-	}
-
-	// Encode global classes.
-	if (!global_class_list.is_empty()) {
-		global_class_cf->set_value("", "list", global_class_list);
-		result.global_class_list = global_class_cf->encode_to_text().to_utf8_buffer();
-	}
-
-	// Encode UIDs.
-	result.uids = ResourceUID::encode_binary_cache(uid_entries);
-
-	return result;
+	return data;
 }
 
 Error EditorExportPlatform::_pack_add_shared_object(const Ref<EditorExportPreset> &p_preset, void *p_userdata, const SharedObject &p_so) {
@@ -1985,7 +1784,7 @@ void EditorExportPlatform::zip_folder_recursive(zipFile &p_zip, const String &p_
 			// 0000755: permissions rwxr-xr-x
 			// 0000644: permissions rw-r--r--
 			uint32_t _mode = 0120644;
-			zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
+			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
 			zipfi.internal_fa = 0;
 
 			zipOpenNewFileInZip4(p_zip,
@@ -2029,7 +1828,7 @@ void EditorExportPlatform::zip_folder_recursive(zipFile &p_zip, const String &p_
 			// 0000755: permissions rwxr-xr-x
 			// 0000644: permissions rw-r--r--
 			uint32_t _mode = (_is_executable ? 0100755 : 0100644);
-			zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
+			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
 			zipfi.internal_fa = 0;
 
 			zipOpenNewFileInZip4(p_zip,
@@ -2164,7 +1963,7 @@ Dictionary EditorExportPlatform::_save_zip_patch(const Ref<EditorExportPreset> &
 	return ret;
 }
 
-bool EditorExportPlatform::_store_header(Ref<FileAccess> p_fd, bool p_enc, bool p_sparse, uint64_t &r_file_base_ofs, uint64_t &r_dir_base_ofs, const String &p_salt) {
+bool EditorExportPlatform::_store_header(Ref<FileAccess> p_fd, bool p_enc, bool p_sparse, uint64_t &r_file_base_ofs, uint64_t &r_dir_base_ofs) {
 	p_fd->store_32(PACK_HEADER_MAGIC);
 	p_fd->store_32(PACK_FORMAT_VERSION);
 	p_fd->store_32(GODOT_VERSION_MAJOR);
@@ -2186,18 +1985,8 @@ bool EditorExportPlatform::_store_header(Ref<FileAccess> p_fd, bool p_enc, bool
 	r_dir_base_ofs = p_fd->get_position();
 	p_fd->store_64(0); // Directory offset.
 
-	if (p_enc && p_sparse && p_salt.length() == 32) {
-		CharString cs = p_salt.latin1();
-		p_fd->store_buffer((const uint8_t *)cs.ptr(), 32);
-	} else {
-		for (int i = 0; i < 8; i++) {
-			// Reserved.
-			p_fd->store_32(0);
-		}
-	}
-
-	for (int i = 0; i < 8; i++) {
-		// Reserved.
+	for (int i = 0; i < 16; i++) {
+		//reserved
 		p_fd->store_32(0);
 	}
 	return true;
@@ -2322,7 +2111,7 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, b
 	uint64_t file_base_ofs = 0;
 	uint64_t dir_base_ofs = 0;
 
-	_store_header(f, p_preset->get_enc_pck() && p_preset->get_enc_directory(), false, file_base_ofs, dir_base_ofs, String());
+	_store_header(f, p_preset->get_enc_pck() && p_preset->get_enc_directory(), false, file_base_ofs, dir_base_ofs);
 
 	// Align for first file.
 	int file_padding = _get_pad(PCK_PADDING, f->get_position());
@@ -2369,7 +2158,33 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, b
 
 	Vector<uint8_t> key;
 	if (p_preset->get_enc_pck() && p_preset->get_enc_directory()) {
-		key = _get_script_encryption_key_bytes(p_preset);
+		String script_key = _get_script_encryption_key(p_preset);
+		key.resize(32);
+		if (script_key.length() == 64) {
+			for (int i = 0; i < 32; i++) {
+				int v = 0;
+				if (i * 2 < script_key.length()) {
+					char32_t ct = script_key[i * 2];
+					if (is_digit(ct)) {
+						ct = ct - '0';
+					} else if (ct >= 'a' && ct <= 'f') {
+						ct = 10 + ct - 'a';
+					}
+					v |= ct << 4;
+				}
+
+				if (i * 2 + 1 < script_key.length()) {
+					char32_t ct = script_key[i * 2 + 1];
+					if (is_digit(ct)) {
+						ct = ct - '0';
+					} else if (ct >= 'a' && ct <= 'f') {
+						ct = 10 + ct - 'a';
+					}
+					v |= ct;
+				}
+				key.write[i] = v;
+			}
+		}
 	}
 
 	if (!_encrypt_and_store_directory(f, pd, key, p_preset->get_seed(), file_base)) {
@@ -2423,8 +2238,6 @@ Error EditorExportPlatform::save_zip(const Ref<EditorExportPreset> &p_preset, bo
 	Error err = export_project_files(p_preset, p_debug, p_save_func, nullptr, &zd, _zip_add_shared_object);
 	if (err != OK && err != ERR_SKIP) {
 		add_message(EXPORT_MESSAGE_ERROR, TTR("Save ZIP"), TTR("Failed to export project files."));
-		zipClose(zip, nullptr);
-		return err;
 	}
 
 	zipClose(zip, nullptr);
@@ -2441,7 +2254,6 @@ Error EditorExportPlatform::save_zip(const Ref<EditorExportPreset> &p_preset, bo
 	if (err != OK) {
 		da->remove(tmppath);
 		add_message(EXPORT_MESSAGE_ERROR, TTR("Save ZIP"), vformat(TTR("Failed to move temporary file \"%s\" to \"%s\"."), tmppath, p_path));
-		return err;
 	}
 
 	return OK;
@@ -2463,7 +2275,7 @@ Error EditorExportPlatform::export_zip(const Ref<EditorExportPreset> &p_preset,
 
 Error EditorExportPlatform::export_pack_patch(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, const Vector<String> &p_patches, BitField<EditorExportPlatform::DebugFlags> p_flags) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-	Error err = _load_patches(p_preset, p_patches.is_empty() ? p_preset->get_patches() : p_patches);
+	Error err = _load_patches(p_patches.is_empty() ? p_preset->get_patches() : p_patches);
 	if (err != OK) {
 		return err;
 	}
@@ -2474,7 +2286,7 @@ Error EditorExportPlatform::export_pack_patch(const Ref<EditorExportPreset> &p_p
 
 Error EditorExportPlatform::export_zip_patch(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, const Vector<String> &p_patches, BitField<EditorExportPlatform::DebugFlags> p_flags) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-	Error err = _load_patches(p_preset, p_patches.is_empty() ? p_preset->get_patches() : p_patches);
+	Error err = _load_patches(p_patches.is_empty() ? p_preset->get_patches() : p_patches);
 	if (err != OK) {
 		return err;
 	}
@@ -2632,7 +2444,7 @@ Error EditorExportPlatform::ssh_run_on_remote(const String &p_host, const String
 	return OK;
 }
 
-Error EditorExportPlatform::ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, ProcessID *r_pid, int p_port_fwd) const {
+Error EditorExportPlatform::ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, OS::ProcessID *r_pid, int p_port_fwd) const {
 	String ssh_path = EDITOR_GET("export/ssh/ssh");
 	if (ssh_path.is_empty()) {
 		ssh_path = "ssh";
diff --git a/engine/editor/export/editor_export_platform.h b/engine/editor/export/editor_export_platform.h
index 4d21da01..3c4f3c1c 100644
--- a/engine/editor/export/editor_export_platform.h
+++ b/engine/editor/export/editor_export_platform.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
-#include "core/os/process_id.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
 #include "editor/export/editor_export_preset.h"
 
 class DirAccess;
 class EditorExportPlugin;
 class EditorFileSystemDirectory;
-class FileAccess;
 class Image;
 class Node;
 class RichTextLabel;
@@ -44,8 +44,6 @@ class Texture2D;
 struct EditorProgress;
 struct SharedObject;
 
-typedef void *zipFile;
-
 const String ENV_SCRIPT_ENCRYPTION_KEY = "GODOT_SCRIPT_ENCRYPTION_KEY";
 
 class EditorExportPlatform : public RefCounted {
@@ -96,7 +94,6 @@ public:
 
 	struct PackData {
 		String path;
-		String salt;
 		Ref<FileAccess> f;
 		Vector<SavedData> file_ofs;
 		EditorProgress *ep = nullptr;
@@ -104,11 +101,10 @@ public:
 		bool use_sparse_pck = false;
 	};
 
-	static bool _store_header(Ref<FileAccess> p_fd, bool p_enc, bool p_sparse, uint64_t &r_file_base_ofs, uint64_t &r_dir_base_ofs, const String &p_salt);
+	static bool _store_header(Ref<FileAccess> p_fd, bool p_enc, bool p_sparse, uint64_t &r_file_base_ofs, uint64_t &r_dir_base_ofs);
 	static bool _encrypt_and_store_directory(Ref<FileAccess> p_fd, PackData &p_pack_data, const Vector<uint8_t> &p_key, uint64_t p_seed, uint64_t p_file_base);
 	static Error _encrypt_and_store_data(Ref<FileAccess> p_fd, const String &p_path, const Vector<uint8_t> &p_data, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed, bool &r_encrypt);
-	static String _get_script_encryption_key(const Ref<EditorExportPreset> &p_preset);
-	static Vector<uint8_t> _get_script_encryption_key_bytes(const Ref<EditorExportPreset> &p_preset);
+	String _get_script_encryption_key(const Ref<EditorExportPreset> &p_preset) const;
 
 private:
 	struct ZipData {
@@ -119,7 +115,6 @@ private:
 	};
 
 	Vector<ExportMessage> messages;
-	Vector<String> patch_temp_dirs;
 
 	void _export_find_resources(EditorFileSystemDirectory *p_dir, HashSet<String> &p_paths);
 	void _export_find_customized_resources(const Ref<EditorExportPreset> &p_preset, EditorFileSystemDirectory *p_dir, EditorExportPreset::FileExportMode p_mode, HashSet<String> &p_paths);
@@ -146,13 +141,7 @@ private:
 	void _edit_files_with_filter(Ref<DirAccess> &da, const Vector<String> &p_filters, HashSet<String> &r_list, bool exclude);
 	void _edit_filter_list(HashSet<String> &r_list, const String &p_filter, bool exclude);
 
-	struct FilteredCache {
-		Vector<uint8_t> extension_list;
-		Vector<uint8_t> global_class_list;
-		Vector<uint8_t> uids;
-	};
-
-	static FilteredCache _get_filtered_cache(const HashSet<String> &p_paths);
+	static Vector<uint8_t> _filter_extension_list_config_file(const String &p_config_path, const HashSet<String> &p_paths);
 
 	struct FileExportCache {
 		uint64_t source_modified_time = 0;
@@ -201,8 +190,8 @@ protected:
 		r_output.push_back(pipe);
 		return err;
 	}
-	ProcessID _ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, int p_port_fwd = -1) const {
-		ProcessID pid = 0;
+	OS::ProcessID _ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, int p_port_fwd = -1) const {
+		OS::ProcessID pid = 0;
 		Error err = ssh_run_on_remote_no_wait(p_host, p_port, p_ssh_args, p_cmd_args, &pid, p_port_fwd);
 		if (err != OK) {
 			return -1;
@@ -212,11 +201,10 @@ protected:
 	}
 
 	Error ssh_run_on_remote(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, String *r_out = nullptr, int p_port_fwd = -1) const;
-	Error ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, ProcessID *r_pid = nullptr, int p_port_fwd = -1) const;
+	Error ssh_run_on_remote_no_wait(const String &p_host, const String &p_port, const Vector<String> &p_ssh_args, const String &p_cmd_args, OS::ProcessID *r_pid = nullptr, int p_port_fwd = -1) const;
 	Error ssh_push_to_remote(const String &p_host, const String &p_port, const Vector<String> &p_scp_args, const String &p_src_file, const String &p_dst_file) const;
 
-	Error _extract_android_assets(const String &p_bundle_path, String &r_pck_path, String &r_temp_dir);
-	Error _load_patches(const Ref<EditorExportPreset> &p_preset, const Vector<String> &p_patches);
+	Error _load_patches(const Vector<String> &p_patches);
 	void _unload_patches();
 
 	Ref<Image> _load_icon_or_splash_image(const String &p_path, Error *r_error) const;
diff --git a/engine/editor/export/editor_export_platform_apple_embedded.cpp b/engine/editor/export/editor_export_platform_apple_embedded.cpp
index 0f701c74..c11a7d69 100644
--- a/engine/editor/export/editor_export_platform_apple_embedded.cpp
+++ b/engine/editor/export/editor_export_platform_apple_embedded.cpp
@@ -30,32 +30,23 @@
 
 #include "editor_export_platform_apple_embedded.h"
 
-#include "core/io/file_access.h"
+#include "core/io/json.h"
 #include "core/io/plist.h"
-#include "core/io/resource_loader.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
+#include "editor/export/lipo.h"
+#include "editor/export/macho.h"
+#include "editor/file_system/editor_paths.h"
 #include "editor/import/resource_importer_texture_settings.h"
+#include "editor/script/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
-#include "servers/display/display_server.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 #include "modules/svg/image_loader_svg.h"
 
-#ifdef MACOS_ENABLED
-#include "core/io/json.h"
-#include "core/object/callable_mp.h"
-#include "core/os/process_id.h"
-#include "editor/file_system/editor_paths.h"
-#include "editor/script/script_editor_plugin.h"
-#include "editor/settings/editor_settings.h"
-#endif
-
 void EditorExportPlatformAppleEmbedded::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const {
 	// Vulkan and OpenGL ES 3.0 both mandate ETC2 support.
 	r_features->push_back("etc2");
@@ -284,8 +275,6 @@ void EditorExportPlatformAppleEmbedded::get_export_options(List<ExportOption> *r
 	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "application/export_project_only"), false));
 	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "application/delete_old_export_files_unconditionally"), false));
 
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "modules/camera"), false));
-
 	Vector<PluginConfigAppleEmbedded> found_plugins = get_plugins(get_platform_name());
 	for (int i = 0; i < found_plugins.size(); i++) {
 		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("plugins"), found_plugins[i].name)), false));
@@ -534,33 +523,33 @@ String EditorExportPlatformAppleEmbedded::_process_config_file_line(const Ref<Ed
 		strnew += p_line.replace("$required_device_capabilities", capabilities);
 	} else if (p_line.contains("$interface_orientations")) {
 		String orientations;
-		const DisplayServerEnums::ScreenOrientation screen_orientation =
-				DisplayServerEnums::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
+		const DisplayServer::ScreenOrientation screen_orientation =
+				DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
 
 		switch (screen_orientation) {
-			case DisplayServerEnums::SCREEN_LANDSCAPE:
+			case DisplayServer::SCREEN_LANDSCAPE:
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_PORTRAIT:
+			case DisplayServer::SCREEN_PORTRAIT:
 				orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
+			case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
+			case DisplayServer::SCREEN_REVERSE_PORTRAIT:
 				orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
+			case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
 				// Allow both landscape orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+			case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 				// Allow both portrait orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
 				orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR:
+			case DisplayServer::SCREEN_SENSOR:
 				// Allow all screen orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
@@ -572,33 +561,33 @@ String EditorExportPlatformAppleEmbedded::_process_config_file_line(const Ref<Ed
 		strnew += p_line.replace("$interface_orientations", orientations);
 	} else if (p_line.contains("$ipad_interface_orientations")) {
 		String orientations;
-		const DisplayServerEnums::ScreenOrientation screen_orientation =
-				DisplayServerEnums::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
+		const DisplayServer::ScreenOrientation screen_orientation =
+				DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
 
 		switch (screen_orientation) {
-			case DisplayServerEnums::SCREEN_LANDSCAPE:
+			case DisplayServer::SCREEN_LANDSCAPE:
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_PORTRAIT:
+			case DisplayServer::SCREEN_PORTRAIT:
 				orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
+			case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
+			case DisplayServer::SCREEN_REVERSE_PORTRAIT:
 				orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
+			case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
 				// Allow both landscape orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+			case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 				// Allow both portrait orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
 				orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
 				break;
-			case DisplayServerEnums::SCREEN_SENSOR:
+			case DisplayServer::SCREEN_SENSOR:
 				// Allow all screen orientations depending on sensor direction.
 				orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
 				orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
@@ -1425,7 +1414,7 @@ Vector<String> EditorExportPlatformAppleEmbedded::_get_preset_architectures(cons
 	return enabled_archs;
 }
 
-Error EditorExportPlatformAppleEmbedded::_export_apple_embedded_plugins(const Ref<EditorExportPreset> &p_preset, AppleEmbeddedConfigData &p_config_data, const String &p_dest_dir, const Vector<String> &p_module_libs, Vector<AppleEmbeddedExportAsset> &r_exported_assets, bool p_debug) {
+Error EditorExportPlatformAppleEmbedded::_export_apple_embedded_plugins(const Ref<EditorExportPreset> &p_preset, AppleEmbeddedConfigData &p_config_data, const String &dest_dir, Vector<AppleEmbeddedExportAsset> &r_exported_assets, bool p_debug) {
 	String plugin_definition_cpp_code;
 	String plugin_initialization_cpp_code;
 	String plugin_deinitialization_cpp_code;
@@ -1452,7 +1441,7 @@ Error EditorExportPlatformAppleEmbedded::_export_apple_embedded_plugins(const Re
 		String plugin_binary_result_file = plugin.binary.get_file();
 		// We shouldn't embed .xcframework that contains static libraries.
 		// Static libraries are not embedded anyway.
-		err = _copy_asset(p_preset, p_dest_dir, plugin_main_binary, &plugin_binary_result_file, true, false, r_exported_assets);
+		err = _copy_asset(p_preset, dest_dir, plugin_main_binary, &plugin_binary_result_file, true, false, r_exported_assets);
 		ERR_FAIL_COND_V(err != OK, err);
 
 		// Adding dependencies.
@@ -1556,23 +1545,6 @@ Error EditorExportPlatformAppleEmbedded::_export_apple_embedded_plugins(const Re
 		plugin_deinitialization_cpp_code += "\t" + deinitialization_method;
 	}
 
-	for (const String &lib_name : p_module_libs) {
-		String definition_comment = "// Module: " + lib_name + "\n";
-		String initialization_method = "register_" + lib_name + "_external_module();\n";
-		String deinitialization_method = "unregister_" + lib_name + "_external_module();\n";
-
-		plugin_definition_cpp_code += definition_comment +
-				"extern void " + initialization_method +
-				"extern void " + deinitialization_method + "\n";
-
-		plugin_initialization_cpp_code += "\t" + initialization_method;
-		plugin_deinitialization_cpp_code += "\t" + deinitialization_method;
-
-		String binary_name = p_dest_dir.get_file().get_basename();
-		AppleEmbeddedExportAsset exported_asset = { binary_name + "_" + lib_name + ".xcframework", true, false };
-		r_exported_assets.push_back(exported_asset);
-	}
-
 	// Updating `Info.plist`
 	{
 		for (const KeyValue<String, String> &E : plist_values) {
@@ -1590,15 +1562,15 @@ Error EditorExportPlatformAppleEmbedded::_export_apple_embedded_plugins(const Re
 	// Export files
 	{
 		// Export linked plugin dependency
-		err = _export_additional_assets(p_preset, p_dest_dir, plugin_linked_dependencies, true, false, r_exported_assets);
+		err = _export_additional_assets(p_preset, dest_dir, plugin_linked_dependencies, true, false, r_exported_assets);
 		ERR_FAIL_COND_V(err != OK, err);
 
 		// Export embedded plugin dependency
-		err = _export_additional_assets(p_preset, p_dest_dir, plugin_embedded_dependencies, true, true, r_exported_assets);
+		err = _export_additional_assets(p_preset, dest_dir, plugin_embedded_dependencies, true, true, r_exported_assets);
 		ERR_FAIL_COND_V(err != OK, err);
 
 		// Export plugin files
-		err = _export_additional_assets(p_preset, p_dest_dir, plugin_files, false, false, r_exported_assets);
+		err = _export_additional_assets(p_preset, dest_dir, plugin_files, false, false, r_exported_assets);
 		ERR_FAIL_COND_V(err != OK, err);
 	}
 
@@ -1785,10 +1757,6 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 	}
 
 	String library_to_use = "libgodot." + get_platform_name() + "." + String(p_debug ? "debug" : "release") + ".xcframework";
-	Vector<String> module_libs;
-	if (p_preset->get("modules/camera").operator bool()) {
-		module_libs.push_back("camera");
-	}
 
 	print_line("Static framework: " + library_to_use);
 	String pkg_name;
@@ -1798,7 +1766,7 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 		pkg_name = "Unnamed";
 	}
 
-	int found_libraries = 0;
+	bool found_library = false;
 
 	HashSet<String> files_to_parse;
 	const String project_file = "godot_apple_embedded.xcodeproj/project.pbxproj";
@@ -1845,7 +1813,7 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 		return ERR_CANT_OPEN;
 	}
 
-	err = _export_apple_embedded_plugins(p_preset, config_data, binary_dir, module_libs, assets, p_debug);
+	err = _export_apple_embedded_plugins(p_preset, config_data, binary_dir, assets, p_debug);
 	if (err != OK) {
 		// TODO: Improve error reporting by using `add_message` throughout all methods called via `_export_apple_embedded_plugins`.
 		// For now a generic top level message would be fine, but we're ought to use proper reporting here instead of
@@ -1885,32 +1853,16 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 
 		if (files_to_parse.has(file)) {
 			_fix_config_file(p_preset, data, config_data, p_debug);
-		} else if (file.begins_with("libgodot") && file.contains(get_platform_name())) {
-			String prefix_lib = library_to_use;
-			String suffix_lib = binary_name;
-			bool is_lib = file.begins_with(library_to_use);
-			if (!is_lib) {
-				for (const String &lib_name : module_libs) {
-					String prefix = "libgodot_" + lib_name + "." + get_platform_name() + "." + String(p_debug ? "debug" : "release") + ".xcframework";
-					if (file.begins_with(prefix)) {
-						is_lib = true;
-						prefix_lib = prefix;
-						suffix_lib = binary_name + "_" + lib_name;
-						break;
-					}
-				}
-			}
-			if (!is_lib || file.ends_with(String("/empty"))) {
+		} else if (file.begins_with("libgodot." + get_platform_name())) {
+			if (!file.begins_with(library_to_use) || file.ends_with(String("/empty"))) {
 				ret = unzGoToNextFile(src_pkg_zip);
 				continue; //ignore!
 			}
-			if (file.ends_with("Info.plist")) {
-				found_libraries++;
-			}
+			found_library = true;
 #if defined(MACOS_ENABLED) || defined(LINUXBSD_ENABLED)
 			is_execute = true;
 #endif
-			file = file.replace(prefix_lib, suffix_lib + ".xcframework");
+			file = file.replace(library_to_use, binary_name + ".xcframework");
 		}
 
 		if (file == project_file) {
@@ -1964,7 +1916,7 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 	// We're done with our source zip.
 	unzClose(src_pkg_zip);
 
-	if (found_libraries < module_libs.size() + 1) {
+	if (!found_library) {
 		add_message(EXPORT_MESSAGE_ERROR, TTR("Export"), vformat(TTR("Requested template library '%s' not found. It might be missing from your template archive."), library_to_use));
 		return ERR_FILE_NOT_FOUND;
 	}
@@ -2106,12 +2058,6 @@ Error EditorExportPlatformAppleEmbedded::_export_project_helper(const Ref<Editor
 		}
 	}
 
-	for (int i = 0; i < export_plugins.size(); i++) {
-		if (export_plugins[i]->supports_platform(Ref<EditorExportPlatform>(this))) {
-			export_plugins[i]->end_generate_apple_embedded_project(p_path, export_project_only);
-		}
-	}
-
 	if (export_project_only) {
 		return OK;
 	}
@@ -2234,14 +2180,6 @@ bool EditorExportPlatformAppleEmbedded::has_valid_export_configuration(const Ref
 	valid = dvalid || rvalid;
 	r_missing_templates = !valid;
 
-	if (p_preset->get("modules/camera").operator bool()) {
-		String description = p_preset->get("privacy/camera_usage_description");
-		if (description.is_empty()) {
-			valid = false;
-			err += TTR("Camera module enabled, but camera usage description is not set.") + "\n";
-		}
-	}
-
 	const String &additional_plist_content = p_preset->get("application/additional_plist_content");
 	if (!additional_plist_content.is_empty()) {
 		const String &plist = vformat("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -2539,7 +2477,17 @@ void EditorExportPlatformAppleEmbedded::_check_for_changes_poll_thread(void *ud)
 }
 
 void EditorExportPlatformAppleEmbedded::_update_preset_status() {
-	bool has_runnable = EditorExport::get_singleton()->get_runnable_preset_for_platform(this).is_valid();
+	const int preset_count = EditorExport::get_singleton()->get_export_preset_count();
+	bool has_runnable = false;
+
+	for (int i = 0; i < preset_count; i++) {
+		const Ref<EditorExportPreset> &preset = EditorExport::get_singleton()->get_export_preset(i);
+		if (preset->get_platform() == this && preset->is_runnable()) {
+			has_runnable = true;
+			break;
+		}
+	}
+
 	if (has_runnable) {
 		has_runnable_preset.set();
 	} else {
@@ -2621,7 +2569,7 @@ int EditorExportPlatformAppleEmbedded::_execute(const String &p_path, const List
 
 	Ref<FileAccess> fa_stdout = pipe_info["stdio"];
 	Ref<FileAccess> fa_stderr = pipe_info["stderr"];
-	ProcessID pid = pipe_info["pid"];
+	OS::ProcessID pid = pipe_info["pid"];
 
 	FileReader stdout_r(fa_stdout);
 	FileReader stderr_r(fa_stderr);
@@ -2680,15 +2628,15 @@ Error EditorExportPlatformAppleEmbedded::run(const Ref<EditorExportPreset> &p_pr
 	filesystem_da->make_dir_recursive(EditorPaths::get_singleton()->get_temp_dir().path_join(id));
 	String tmp_export_path = EditorPaths::get_singleton()->get_temp_dir().path_join(id).path_join("export.ipa");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
+#define CLEANUP_AND_RETURN(m_err)                                                                          \
+	{                                                                                                      \
 		if (filesystem_da->change_dir(EditorPaths::get_singleton()->get_temp_dir().path_join(id)) == OK) { \
-			filesystem_da->erase_contents_recursive(); \
-			filesystem_da->change_dir(".."); \
-			filesystem_da->remove(id); \
-		} \
-		return m_err; \
-	} \
+			filesystem_da->erase_contents_recursive();                                                     \
+			filesystem_da->change_dir("..");                                                               \
+			filesystem_da->remove(id);                                                                     \
+		}                                                                                                  \
+		return m_err;                                                                                      \
+	}                                                                                                      \
 	((void)0)
 
 	Device dev = devices[p_device];
diff --git a/engine/editor/export/editor_export_platform_apple_embedded.h b/engine/editor/export/editor_export_platform_apple_embedded.h
index 4536ce05..5a297ed5 100644
--- a/engine/editor/export/editor_export_platform_apple_embedded.h
+++ b/engine/editor/export/editor_export_platform_apple_embedded.h
@@ -30,18 +30,24 @@
 
 #pragma once
 
+#include "plugin_config_apple_embedded.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/image_loader.h"
+#include "core/io/marshalls.h"
+#include "core/io/resource_saver.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
 #include "core/templates/safe_refcount.h"
 #include "editor/export/editor_export_platform.h"
-#include "editor/export/plugin_config_apple_embedded.h"
+#include "editor/settings/editor_settings.h"
+#include "main/splash.gen.h"
 #include "scene/resources/image_texture.h"
 
 #include <sys/stat.h>
-
-#ifdef MACOS_ENABLED
 #include <functional>
-#endif
 
 // Optional environment variables for defining confidential information. If any
 // of these is set, they will override the values set in the credentials file.
@@ -197,7 +203,7 @@ private:
 	Error _export_additional_assets(const Ref<EditorExportPreset> &p_preset, const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, bool p_should_embed, Vector<AppleEmbeddedExportAsset> &r_exported_assets);
 	Error _copy_asset(const Ref<EditorExportPreset> &p_preset, const String &p_out_dir, const String &p_asset, const String *p_custom_file_name, bool p_is_framework, bool p_should_embed, Vector<AppleEmbeddedExportAsset> &r_exported_assets);
 	Error _export_additional_assets(const Ref<EditorExportPreset> &p_preset, const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<AppleEmbeddedExportAsset> &r_exported_assets);
-	Error _export_apple_embedded_plugins(const Ref<EditorExportPreset> &p_preset, AppleEmbeddedConfigData &p_config_data, const String &p_dest_dir, const Vector<String> &p_module_libs, Vector<AppleEmbeddedExportAsset> &r_exported_assets, bool p_debug);
+	Error _export_apple_embedded_plugins(const Ref<EditorExportPreset> &p_preset, AppleEmbeddedConfigData &p_config_data, const String &dest_dir, Vector<AppleEmbeddedExportAsset> &r_exported_assets, bool p_debug);
 
 	Error _export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, BitField<EditorExportPlatform::DebugFlags> p_flags, bool p_oneclick);
 
diff --git a/engine/editor/export/editor_export_platform_extension.cpp b/engine/editor/export/editor_export_platform_extension.cpp
index e23b524d..72d217c6 100644
--- a/engine/editor/export/editor_export_platform_extension.cpp
+++ b/engine/editor/export/editor_export_platform_extension.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_export_platform_extension.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 void EditorExportPlatformExtension::_bind_methods() {
@@ -311,7 +310,7 @@ Error EditorExportPlatformExtension::export_zip(const Ref<EditorExportPreset> &p
 Error EditorExportPlatformExtension::export_pack_patch(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, const Vector<String> &p_patches, BitField<EditorExportPlatform::DebugFlags> p_flags) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
 
-	Error err = _load_patches(p_preset, p_patches.is_empty() ? p_preset->get_patches() : p_patches);
+	Error err = _load_patches(p_patches.is_empty() ? p_preset->get_patches() : p_patches);
 	if (err != OK) {
 		return err;
 	}
@@ -330,7 +329,7 @@ Error EditorExportPlatformExtension::export_pack_patch(const Ref<EditorExportPre
 Error EditorExportPlatformExtension::export_zip_patch(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, const Vector<String> &p_patches, BitField<EditorExportPlatform::DebugFlags> p_flags) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
 
-	Error err = _load_patches(p_preset, p_patches.is_empty() ? p_preset->get_patches() : p_patches);
+	Error err = _load_patches(p_patches.is_empty() ? p_preset->get_patches() : p_patches);
 	if (err != OK) {
 		return err;
 	}
diff --git a/engine/editor/export/editor_export_platform_extension.h b/engine/editor/export/editor_export_platform_extension.h
index 88912b04..87f9424a 100644
--- a/engine/editor/export/editor_export_platform_extension.h
+++ b/engine/editor/export/editor_export_platform_extension.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/typed_array.h"
 #include "editor/export/editor_export_platform.h"
 #include "editor/export/editor_export_preset.h"
diff --git a/engine/editor/export/editor_export_platform_pc.cpp b/engine/editor/export/editor_export_platform_pc.cpp
index b9c7f716..c513b7eb 100644
--- a/engine/editor/export/editor_export_platform_pc.cpp
+++ b/engine/editor/export/editor_export_platform_pc.cpp
@@ -32,10 +32,8 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/os/os.h"
 #include "core/os/shared_object.h"
-#include "scene/resources/image_texture.h" // IWYU pragma: keep. Misdetection of `logo`.
+#include "scene/resources/image_texture.h"
 
 void EditorExportPlatformPC::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const {
 	if (p_preset->get("texture_format/s3tc_bptc")) {
diff --git a/engine/editor/export/editor_export_platform_pc.h b/engine/editor/export/editor_export_platform_pc.h
index d3318060..09747c4a 100644
--- a/engine/editor/export/editor_export_platform_pc.h
+++ b/engine/editor/export/editor_export_platform_pc.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/export/editor_export_platform.h"
+#include "editor_export_platform.h"
 
 class ImageTexture;
 
diff --git a/engine/editor/export/editor_export_plugin.cpp b/engine/editor/export/editor_export_plugin.cpp
index 9b8dbb8d..2d5e038f 100644
--- a/engine/editor/export/editor_export_plugin.cpp
+++ b/engine/editor/export/editor_export_plugin.cpp
@@ -31,7 +31,6 @@
 #include "editor_export_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "editor/export/editor_export_platform.h"
 
 void EditorExportPlugin::set_export_base_path(const String &p_export_base_path) {
@@ -331,16 +330,6 @@ void EditorExportPlugin::_export_begin(const HashSet<String> &p_features, bool p
 
 void EditorExportPlugin::_export_end() {}
 
-void EditorExportPlugin::_end_generate_apple_embedded_project(const String &p_path, bool p_p_will_build_archive) {}
-
-void EditorExportPlugin::end_generate_apple_embedded_project(const String &p_path, bool p_will_build_archive) {
-	if (GDVIRTUAL_IS_OVERRIDDEN(_end_generate_apple_embedded_project)) {
-		GDVIRTUAL_CALL(_end_generate_apple_embedded_project, p_path, p_will_build_archive);
-	} else {
-		_end_generate_apple_embedded_project(p_path, p_will_build_archive);
-	}
-}
-
 void EditorExportPlugin::skip() {
 	skipped = true;
 }
@@ -377,7 +366,6 @@ void EditorExportPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_export_file, "path", "type", "features");
 	GDVIRTUAL_BIND(_export_begin, "features", "is_debug", "path", "flags");
 	GDVIRTUAL_BIND(_export_end);
-	GDVIRTUAL_BIND(_end_generate_apple_embedded_project, "path", "will_build_archive");
 
 	GDVIRTUAL_BIND(_begin_customize_resources, "platform", "features");
 	GDVIRTUAL_BIND(_customize_resource, "resource", "path");
diff --git a/engine/editor/export/editor_export_plugin.h b/engine/editor/export/editor_export_plugin.h
index ad97a41a..2b7ec087 100644
--- a/engine/editor/export/editor_export_plugin.h
+++ b/engine/editor/export/editor_export_plugin.h
@@ -31,9 +31,8 @@
 #pragma once
 
 #include "core/os/shared_object.h"
-#include "core/variant/typed_array.h"
-#include "editor/export/editor_export_platform.h"
-#include "editor/export/editor_export_preset.h"
+#include "editor_export_platform.h"
+#include "editor_export_preset.h"
 #include "scene/main/node.h"
 
 class EditorExportPlugin : public RefCounted {
@@ -113,14 +112,12 @@ protected:
 	virtual void _export_file(const String &p_path, const String &p_type, const HashSet<String> &p_features);
 	virtual void _export_begin(const HashSet<String> &p_features, bool p_debug, const String &p_path, int p_flags);
 	virtual void _export_end();
-	virtual void _end_generate_apple_embedded_project(const String &p_path, bool p_will_build_archive);
 
 	static void _bind_methods();
 
 	GDVIRTUAL3(_export_file, String, String, Vector<String>)
 	GDVIRTUAL4(_export_begin, Vector<String>, bool, String, uint32_t)
 	GDVIRTUAL0(_export_end)
-	GDVIRTUAL2(_end_generate_apple_embedded_project, const String &, bool)
 
 	GDVIRTUAL2RC(bool, _begin_customize_resources, const Ref<EditorExportPlatform> &, const Vector<String> &)
 	GDVIRTUAL2R_REQUIRED(Ref<Resource>, _customize_resource, const Ref<Resource> &, String)
@@ -175,8 +172,6 @@ public:
 	virtual bool supports_platform(const Ref<EditorExportPlatform> &p_export_platform) const;
 	PackedStringArray get_export_features(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 
-	void end_generate_apple_embedded_project(const String &p_path, bool p_will_build_archive);
-
 	virtual PackedStringArray get_android_dependencies(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 	virtual PackedStringArray get_android_dependencies_maven_repos(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 	virtual PackedStringArray get_android_libraries(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
diff --git a/engine/editor/export/editor_export_preset.compat.inc b/engine/editor/export/editor_export_preset.compat.inc
index a623a57e..84b8446b 100644
--- a/engine/editor/export/editor_export_preset.compat.inc
+++ b/engine/editor/export/editor_export_preset.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "editor_export_preset.h"
-
-#include "core/object/class_db.h"
-
 int EditorExportPreset::_get_script_export_mode_bind_compat_107167() const {
 	return get_script_export_mode();
 }
@@ -42,4 +38,4 @@ void EditorExportPreset::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_script_export_mode"), &EditorExportPreset::_get_script_export_mode_bind_compat_107167);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/editor/export/editor_export_preset.cpp b/engine/editor/export/editor_export_preset.cpp
index 55ce3ee6..a409dcad 100644
--- a/engine/editor/export/editor_export_preset.cpp
+++ b/engine/editor/export/editor_export_preset.cpp
@@ -33,8 +33,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/settings/editor_settings.h"
 
@@ -262,7 +260,7 @@ Vector<String> EditorExportPreset::get_files_to_export() const {
 }
 
 HashSet<String> EditorExportPreset::get_selected_files() const {
-	return HashSet<String>(selected_files);
+	return selected_files;
 }
 
 void EditorExportPreset::set_selected_files(const HashSet<String> &p_files) {
@@ -321,15 +319,13 @@ String EditorExportPreset::get_name() const {
 }
 
 void EditorExportPreset::set_runnable(bool p_enable) {
-	if (p_enable) {
-		EditorExport::singleton->set_runnable_preset(this);
-	} else {
-		EditorExport::singleton->unset_runnable_preset(this);
-	}
+	runnable = p_enable;
+	EditorExport::singleton->emit_presets_runnable_changed();
+	EditorExport::singleton->save_presets();
 }
 
 bool EditorExportPreset::is_runnable() const {
-	return EditorExport::singleton->get_runnable_preset_for_platform(platform).ptr() == this;
+	return runnable;
 }
 
 bool EditorExportPreset::are_advanced_options_enabled() const {
diff --git a/engine/editor/export/editor_export_preset.h b/engine/editor/export/editor_export_preset.h
index 0c1b9dc8..7cc0fb64 100644
--- a/engine/editor/export/editor_export_preset.h
+++ b/engine/editor/export/editor_export_preset.h
@@ -33,7 +33,6 @@
 class EditorExportPlatform;
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class EditorExportPreset : public RefCounted {
 	GDCLASS(EditorExportPreset, RefCounted);
@@ -70,6 +69,7 @@ private:
 	String exporter;
 	HashSet<String> selected_files;
 	HashMap<String, FileExportMode> customized_files;
+	bool runnable = false;
 	bool dedicated_server = false;
 
 	Vector<String> patches;
diff --git a/engine/editor/export/export_template_manager.cpp b/engine/editor/export/export_template_manager.cpp
index e523a2ff..a0f4385d 100644
--- a/engine/editor/export/export_template_manager.cpp
+++ b/engine/editor/export/export_template_manager.cpp
@@ -33,16 +33,12 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
-#include "core/templates/rb_set.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export_preset.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/file_system/editor_paths.h"
-#include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/progress_dialog.h"
 #include "editor/settings/editor_settings.h"
@@ -55,7 +51,6 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/tree.h"
 #include "scene/main/http_request.h"
-#include "servers/display/display_server.h"
 
 enum DownloadsAvailability {
 	DOWNLOADS_AVAILABLE,
@@ -214,11 +209,6 @@ void ExportTemplateManager::_download_template(const String &p_url, bool p_skip_
 
 	set_process(true);
 	_set_current_progress_status(TTR("Connecting to the mirror..."));
-
-	ProgressIndicator *indicator = EditorNode::get_bottom_panel()->get_progress_indicator();
-	indicator->set_tooltip_text(TTRC("Downloading export templates..."));
-	indicator->set_value(0);
-	indicator->show();
 }
 
 void ExportTemplateManager::_download_template_completed(int p_status, int p_code, const PackedStringArray &headers, const PackedByteArray &p_data) {
@@ -265,7 +255,6 @@ void ExportTemplateManager::_download_template_completed(int p_status, int p_cod
 		} break;
 	}
 
-	EditorNode::get_bottom_panel()->get_progress_indicator()->hide();
 	set_process(false);
 }
 
@@ -428,9 +417,6 @@ void ExportTemplateManager::_set_current_progress_status(const String &p_status,
 }
 
 void ExportTemplateManager::_set_current_progress_value(float p_value, const String &p_status) {
-	if (!is_visible()) {
-		return;
-	}
 	download_progress_bar->show();
 	download_progress_bar->set_indeterminate(false);
 	download_progress_bar->set_value(p_value);
@@ -776,11 +762,6 @@ void ExportTemplateManager::popup_manager() {
 	popup_centered(Size2(720, 280) * EDSCALE);
 }
 
-void ExportTemplateManager::stop_download() {
-	download_templates->cancel_request();
-	is_downloading_templates = false;
-}
-
 void ExportTemplateManager::ok_pressed() {
 	if (!is_downloading_templates) {
 		hide();
@@ -944,10 +925,6 @@ Error ExportTemplateManager::install_android_template_from_file(const String &p_
 
 void ExportTemplateManager::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_READY: {
-			EditorNode::get_bottom_panel()->get_progress_indicator()->connect("clicked", callable_mp(this, &ExportTemplateManager::popup_manager));
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			current_value->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("main"), EditorStringName(EditorFonts)));
 			current_missing_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
@@ -956,6 +933,14 @@ void ExportTemplateManager::_notification(int p_what) {
 			mirror_options_button->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
 		} break;
 
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			if (!is_visible()) {
+				set_process(false);
+			} else if (is_visible() && is_downloading_templates) {
+				set_process(true);
+			}
+		} break;
+
 		case NOTIFICATION_PROCESS: {
 			update_countdown -= get_process_delta_time();
 			if (update_countdown > 0) {
@@ -970,9 +955,7 @@ void ExportTemplateManager::_notification(int p_what) {
 
 			if (downloaded_bytes >= 0) {
 				if (total_bytes > 0) {
-					float progress = float(downloaded_bytes) / total_bytes;
-					EditorNode::get_bottom_panel()->get_progress_indicator()->set_value(progress);
-					_set_current_progress_value(progress, status);
+					_set_current_progress_value(float(downloaded_bytes) / total_bytes, status);
 				} else {
 					_set_current_progress_value(0, status);
 				}
@@ -981,7 +964,6 @@ void ExportTemplateManager::_notification(int p_what) {
 			}
 
 			if (!success) {
-				EditorNode::get_bottom_panel()->get_progress_indicator()->hide();
 				set_process(false);
 			}
 		} break;
diff --git a/engine/editor/export/export_template_manager.h b/engine/editor/export/export_template_manager.h
index 31668fc3..c3c1f19f 100644
--- a/engine/editor/export/export_template_manager.h
+++ b/engine/editor/export/export_template_manager.h
@@ -132,8 +132,6 @@ public:
 	Error install_android_template_from_file(const String &p_file, const Ref<EditorExportPreset> &p_preset);
 
 	void popup_manager();
-	bool is_downloading() const { return is_downloading_templates; }
-	void stop_download();
 
 	ExportTemplateManager();
 };
diff --git a/engine/editor/export/gdextension_export_plugin.h b/engine/editor/export/gdextension_export_plugin.h
index c80b7c5b..56fc389a 100644
--- a/engine/editor/export/gdextension_export_plugin.h
+++ b/engine/editor/export/gdextension_export_plugin.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/extension/gdextension_library_loader.h"
-#include "editor/export/editor_export_plugin.h"
+#include "editor/export/editor_export.h"
 
 class GDExtensionExportPlugin : public EditorExportPlugin {
 	GDSOFTCLASS(GDExtensionExportPlugin, EditorExportPlugin);
diff --git a/engine/editor/export/lipo.cpp b/engine/editor/export/lipo.cpp
index e42841d8..079a912b 100644
--- a/engine/editor/export/lipo.cpp
+++ b/engine/editor/export/lipo.cpp
@@ -30,7 +30,7 @@
 
 #include "lipo.h"
 
-#include "editor/export/macho.h"
+#include "macho.h"
 
 bool LipO::is_lipo(const String &p_path) {
 	Ref<FileAccess> fb = FileAccess::open(p_path, FileAccess::READ);
diff --git a/engine/editor/export/project_export.cpp b/engine/editor/export/project_export.cpp
index 567e76e0..8b248ba5 100644
--- a/engine/editor/export/project_export.cpp
+++ b/engine/editor/export/project_export.cpp
@@ -31,9 +31,6 @@
 #include "project_export.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -59,7 +56,6 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
-#include "servers/display/display_server.h"
 
 #include <zstd.h>
 
@@ -111,12 +107,6 @@ void ProjectExportDialog::_notification(int p_what) {
 			}
 		} break;
 
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
-				main_split->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
-			}
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			_script_encryption_key_visibility_changed(show_script_key->is_pressed());
 			duplicate_preset->set_button_icon(presets->get_editor_theme_icon(SNAME("Duplicate")));
@@ -161,12 +151,16 @@ void ProjectExportDialog::_add_preset(int p_platform) {
 	ERR_FAIL_COND(preset.is_null());
 
 	String preset_name = EditorExport::get_singleton()->get_export_platform(p_platform)->get_name();
+	bool make_runnable = true;
 	int attempt = 1;
 	while (true) {
 		bool valid = true;
 
 		for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
 			Ref<EditorExportPreset> p = EditorExport::get_singleton()->get_export_preset(i);
+			if (p->get_platform() == preset->get_platform() && p->is_runnable()) {
+				make_runnable = false;
+			}
 			if (p->get_name() == preset_name) {
 				valid = false;
 				break;
@@ -182,8 +176,8 @@ void ProjectExportDialog::_add_preset(int p_platform) {
 	}
 
 	preset->set_name(preset_name);
-	if (EditorExport::get_singleton()->get_runnable_preset_for_platform(preset->get_platform()).is_null()) {
-		EditorExport::get_singleton()->set_runnable_preset(preset);
+	if (make_runnable) {
+		preset->set_runnable(make_runnable);
 	}
 	EditorExport::get_singleton()->add_export_preset(preset);
 	_update_presets();
@@ -531,9 +525,14 @@ void ProjectExportDialog::_runnable_pressed() {
 	ERR_FAIL_COND(current.is_null());
 
 	if (runnable->is_pressed()) {
-		EditorExport::get_singleton()->set_runnable_preset(current);
+		for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+			Ref<EditorExportPreset> p = EditorExport::get_singleton()->get_export_preset(i);
+			if (p->get_platform() == current->get_platform()) {
+				p->set_runnable(current == p);
+			}
+		}
 	} else {
-		EditorExport::get_singleton()->unset_runnable_preset(current);
+		current->set_runnable(false);
 	}
 
 	_update_presets();
@@ -727,11 +726,15 @@ void ProjectExportDialog::_duplicate_preset() {
 	ERR_FAIL_COND(preset.is_null());
 
 	String preset_name = current->get_name() + " (copy)";
+	bool make_runnable = true;
 	while (true) {
 		bool valid = true;
 
 		for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
 			Ref<EditorExportPreset> p = EditorExport::get_singleton()->get_export_preset(i);
+			if (p->get_platform() == preset->get_platform() && p->is_runnable()) {
+				make_runnable = false;
+			}
 			if (p->get_name() == preset_name) {
 				valid = false;
 				break;
@@ -746,8 +749,8 @@ void ProjectExportDialog::_duplicate_preset() {
 	}
 
 	preset->set_name(preset_name);
-	if (EditorExport::get_singleton()->get_runnable_preset_for_platform(preset->get_platform()).is_null()) {
-		EditorExport::get_singleton()->set_runnable_preset(preset);
+	if (make_runnable) {
+		preset->set_runnable(make_runnable);
 	}
 	preset->set_dedicated_server(current->is_dedicated_server());
 	preset->set_export_filter(current->get_export_filter());
@@ -1540,17 +1543,19 @@ ProjectExportDialog::ProjectExportDialog() {
 	VBoxContainer *main_vb = memnew(VBoxContainer);
 	add_child(main_vb);
 
-	main_split = memnew(HSplitContainer);
-	main_vb->add_child(main_split);
-	main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	main_split->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
+	HSplitContainer *hbox = memnew(HSplitContainer);
+	main_vb->add_child(hbox);
+	hbox->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	if (EDITOR_GET("interface/touchscreen/enable_touch_optimizations")) {
+		hbox->set_touch_dragger_enabled(true);
+	}
 
 	// Presets list.
 
 	VBoxContainer *preset_vb = memnew(VBoxContainer);
 	preset_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	preset_vb->set_stretch_ratio(0.35);
-	main_split->add_child(preset_vb);
+	hbox->add_child(preset_vb);
 
 	Label *l = memnew(Label(TTR("Presets")));
 	l->set_theme_type_variation("HeaderSmall");
@@ -1590,7 +1595,7 @@ ProjectExportDialog::ProjectExportDialog() {
 	settings_vb = memnew(VBoxContainer);
 	settings_vb->hide();
 	settings_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	main_split->add_child(settings_vb);
+	hbox->add_child(settings_vb);
 
 	PanelContainer *panel = memnew(PanelContainer);
 	panel->set_theme_type_variation(SNAME("PanelForeground"));
@@ -1687,9 +1692,8 @@ ProjectExportDialog::ProjectExportDialog() {
 
 	include_files = memnew(Tree);
 	include_files->set_custom_minimum_size(Size2(1, 75 * EDSCALE));
-	include_files->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	include_files->set_theme_type_variation("TreeSecondary");
 	include_margin->add_child(include_files);
+	include_files->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	include_files->connect("item_edited", callable_mp(this, &ProjectExportDialog::_tree_changed));
 	include_files->connect("check_propagated_to_item", callable_mp(this, &ProjectExportDialog::_check_propagated_to_item));
 	include_files->connect("custom_popup_edited", callable_mp(this, &ProjectExportDialog::_tree_popup_edited));
@@ -1794,10 +1798,8 @@ ProjectExportDialog::ProjectExportDialog() {
 
 	patches = memnew(Tree);
 	patches->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	patches->set_custom_minimum_size(Size2(1, 75 * EDSCALE));
 	patches->set_hide_root(true);
 	patches->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	patches->set_theme_type_variation("TreeSecondary");
 	patches->connect("button_clicked", callable_mp(this, &ProjectExportDialog::_patch_tree_button_clicked));
 	patches->connect("item_edited", callable_mp(this, &ProjectExportDialog::_patch_tree_item_edited));
 	SET_DRAG_FORWARDING_GCD(patches, ProjectExportDialog);
@@ -1806,8 +1808,6 @@ ProjectExportDialog::ProjectExportDialog() {
 
 	patch_dialog = memnew(EditorFileDialog);
 	patch_dialog->add_filter("*.pck", TTR("Godot Project Pack"));
-	patch_dialog->add_filter("*.aab", TTR("Android App Bundle"));
-	patch_dialog->add_filter("*.apk", TTR("Android Package"));
 	patch_dialog->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
 	patch_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	patch_dialog->connect("file_selected", callable_mp(this, &ProjectExportDialog::_patch_file_selected));
@@ -1942,7 +1942,7 @@ ProjectExportDialog::ProjectExportDialog() {
 	empty_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	empty_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	empty_label->hide();
-	main_split->add_child(empty_label);
+	hbox->add_child(empty_label);
 
 	// Deletion dialog.
 
diff --git a/engine/editor/export/project_export.h b/engine/editor/export/project_export.h
index a4f375c9..3fbc16ed 100644
--- a/engine/editor/export/project_export.h
+++ b/engine/editor/export/project_export.h
@@ -30,13 +30,11 @@
 
 #pragma once
 
-#include "core/templates/rb_set.h"
 #include "editor/export/editor_export_preset.h"
 #include "scene/gui/dialogs.h"
 
 class CheckBox;
 class CheckButton;
-class HSplitContainer;
 class EditorFileDialog;
 class EditorFileSystemDirectory;
 class EditorInspector;
@@ -74,7 +72,6 @@ public:
 class ProjectExportDialog : public ConfirmationDialog {
 	GDCLASS(ProjectExportDialog, ConfirmationDialog);
 
-	HSplitContainer *main_split = nullptr;
 	TabContainer *sections = nullptr;
 
 	MenuButton *add_preset = nullptr;
diff --git a/engine/editor/export/project_zip_packer.cpp b/engine/editor/export/project_zip_packer.cpp
index f624fe47..4e4639b1 100644
--- a/engine/editor/export/project_zip_packer.cpp
+++ b/engine/editor/export/project_zip_packer.cpp
@@ -33,10 +33,8 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/zip_io.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
-#include "core/string/ustring.h"
 
 String ProjectZIPPacker::get_project_zip_safe_name() {
 	// Name the downloaded ZIP file to contain the project name and download date for easier organization.
@@ -74,39 +72,10 @@ void ProjectZIPPacker::_zip_file(const String &p_path, const String &p_base_path
 	data.resize(len);
 	f->get_buffer(data.ptrw(), len);
 
-	uint64_t time = FileAccess::get_modified_time(p_path);
-	if (time == 0) {
-		time = Time::get_singleton()->get_unix_time_from_system();
-	}
-	Dictionary tz = Time::get_singleton()->get_time_zone_from_system();
-	time += tz["bias"].operator int() * 60;
-	Dictionary dt = Time::get_singleton()->get_datetime_dict_from_unix_time(time);
-
-	zip_fileinfo zipfi;
-	zipfi.tmz_date.tm_year = dt["year"];
-	zipfi.tmz_date.tm_mon = dt["month"].operator int() - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, https://www.cplusplus.com/reference/ctime/tm/
-	zipfi.tmz_date.tm_mday = dt["day"];
-	zipfi.tmz_date.tm_hour = dt["hour"];
-	zipfi.tmz_date.tm_min = dt["minute"];
-	zipfi.tmz_date.tm_sec = dt["second"];
-	zipfi.dosDate = 0;
-
-	// 0100000: regular file type
-	// 0000755: permissions rwxr-xr-x
-	// 0000644: permissions rw-r--r--
-	uint32_t _mode = FileAccess::get_unix_permissions(p_path);
-	if (_mode == 0) {
-		_mode = 0100644;
-	} else {
-		_mode |= 0100000;
-	}
-	zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
-	zipfi.internal_fa = 0;
-
 	String path = p_path.trim_prefix(p_base_path);
 	zipOpenNewFileInZip4(p_zip,
 			path.utf8().get_data(),
-			&zipfi,
+			nullptr,
 			nullptr,
 			0,
 			nullptr,
diff --git a/engine/editor/export/project_zip_packer.h b/engine/editor/export/project_zip_packer.h
index 1fbbd867..c66d793f 100644
--- a/engine/editor/export/project_zip_packer.h
+++ b/engine/editor/export/project_zip_packer.h
@@ -30,9 +30,8 @@
 
 #pragma once
 
-class String;
-
-typedef void *zipFile;
+#include "core/io/zip_io.h"
+#include "core/variant/variant.h"
 
 class ProjectZIPPacker {
 	static void _zip_file(const String &p_path, const String &p_base_path, zipFile p_zip);
diff --git a/engine/editor/export/shader_baker_export_plugin.cpp b/engine/editor/export/shader_baker_export_plugin.cpp
index 0f51b22c..34b28fe1 100644
--- a/engine/editor/export/shader_baker_export_plugin.cpp
+++ b/engine/editor/export/shader_baker_export_plugin.cpp
@@ -30,10 +30,8 @@
 
 #include "shader_baker_export_plugin.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/string/string_builder.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "scene/3d/label_3d.h"
diff --git a/engine/editor/export/shader_baker_export_plugin.h b/engine/editor/export/shader_baker_export_plugin.h
index a6637566..05d22d52 100644
--- a/engine/editor/export/shader_baker_export_plugin.h
+++ b/engine/editor/export/shader_baker_export_plugin.h
@@ -30,13 +30,9 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/object/worker_thread_pool.h"
-#include "core/os/condition_variable.h"
-#include "core/templates/rb_set.h"
 #include "editor/export/editor_export_plugin.h"
+#include "servers/rendering/renderer_rd/shader_rd.h"
 
-class ShaderRD;
 class RenderingShaderContainerFormat;
 
 class ShaderBakerExportPluginPlatform : public RefCounted {
diff --git a/engine/editor/file_system/dependency_editor.cpp b/engine/editor/file_system/dependency_editor.cpp
index 5631fb4a..aa3e4d63 100644
--- a/engine/editor/file_system/dependency_editor.cpp
+++ b/engine/editor/file_system/dependency_editor.cpp
@@ -33,9 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
@@ -45,9 +42,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/tree.h"
 
@@ -65,34 +60,6 @@ static void _setup_search_file_dialog(EditorFileDialog *p_dialog, const String &
 	}
 }
 
-struct DependencyEditorSortByType {
-	bool operator()(const String &p_a, const String &p_b) const {
-		const String a_type = p_a.contains("::") ? p_a.get_slice("::", 1) : "Resource";
-		const String b_type = p_b.contains("::") ? p_b.get_slice("::", 1) : "Resource";
-		const String a_path = p_a.contains("::") ? p_a.get_slice("::", 2) : p_a;
-		const String b_path = p_b.contains("::") ? p_b.get_slice("::", 2) : p_b;
-		return a_type == b_type ? a_path < b_path : a_type < b_type;
-	}
-};
-
-struct DependencyEditorSortByPath {
-	bool operator()(const String &p_a, const String &p_b) const {
-		const String a_path = p_a.contains("::") ? p_a.get_slice("::", 2) : p_a;
-		const String b_path = p_b.contains("::") ? p_b.get_slice("::", 2) : p_b;
-		return a_path < b_path;
-	}
-};
-
-struct DependencyEditorSortByFile {
-	bool operator()(const String &p_a, const String &p_b) const {
-		const String a_path = p_a.contains("::") ? p_a.get_slice("::", 2) : p_a;
-		const String b_path = p_b.contains("::") ? p_b.get_slice("::", 2) : p_b;
-		const String a_file = a_path.get_file();
-		const String b_file = b_path.get_file();
-		return a_file == b_file ? a_path < b_path : a_file < b_file;
-	}
-};
-
 void DependencyEditor::_searched(const String &p_path) {
 	HashMap<String, String> dep_rename;
 	dep_rename[replacing] = p_path;
@@ -108,7 +75,7 @@ void DependencyEditor::_load_pressed(Object *p_item, int p_cell, int p_button, M
 		return;
 	}
 	TreeItem *ti = Object::cast_to<TreeItem>(p_item);
-	replacing = ti->get_text((int)Column::PATH);
+	replacing = ti->get_text(1);
 
 	_setup_search_file_dialog(search, replacing, ti->get_metadata(0));
 	search->popup_file_dialog();
@@ -209,8 +176,6 @@ void DependencyEditor::_update_file() {
 void DependencyEditor::_notification(int p_what) {
 	if (p_what == NOTIFICATION_THEME_CHANGED) {
 		warning_label->add_theme_color_override(SceneStringName(font_color), get_theme_color("warning_color", EditorStringName(Editor)));
-		filter->set_right_icon(get_editor_theme_icon(SNAME("Search")));
-		menu_sort->set_button_icon(get_editor_theme_icon(SNAME("Sort")));
 	}
 }
 
@@ -238,56 +203,9 @@ static String _get_stored_dep_path(const String &p_dep) {
 	return p_dep.get_slice("::", 0);
 }
 
-List<String> DependencyEditor::_filter_deps(const List<String> &p_deps) {
-	const String filter_text = filter->get_text();
-
-	if (filter_text.is_empty()) {
-		return List<String>(p_deps);
-	}
-
-	List<String> filtered;
-
-	for (const String &item : p_deps) {
-		const String path = item.contains("::") ? item.get_slice("::", 2) : item;
-
-		if (path.containsn(filter_text)) {
-			filtered.push_back(item);
-		}
-	}
-
-	return filtered;
-}
-
 void DependencyEditor::_update_list() {
 	List<String> deps;
 	ResourceLoader::get_dependencies(editing, &deps, true);
-	deps = _filter_deps(deps);
-
-	switch (sort_by) {
-		case DependencyEditorSortBy::TYPE:
-			deps.sort_custom<DependencyEditorSortByType>();
-			break;
-		case DependencyEditorSortBy::TYPE_REVERSE:
-			deps.sort_custom<DependencyEditorSortByType>();
-			deps.reverse();
-			break;
-		case DependencyEditorSortBy::PATH:
-			deps.sort_custom<DependencyEditorSortByPath>();
-			break;
-		case DependencyEditorSortBy::PATH_REVERSE:
-			deps.sort_custom<DependencyEditorSortByPath>();
-			deps.reverse();
-			break;
-		case DependencyEditorSortBy::NAME:
-			deps.sort_custom<DependencyEditorSortByFile>();
-			break;
-		case DependencyEditorSortBy::NAME_REVERSE:
-			deps.sort_custom<DependencyEditorSortByFile>();
-			deps.reverse();
-			break;
-		default:
-			break;
-	}
 
 	tree->clear();
 	missing.clear();
@@ -303,26 +221,23 @@ void DependencyEditor::_update_list() {
 
 		const String path = _get_resolved_dep_path(dep);
 		if (FileAccess::exists(path)) {
-			item->set_text((int)Column::NAME, path.get_file());
-			item->set_text((int)Column::PATH, path);
+			item->set_text(0, path.get_file());
+			item->set_text(1, path);
 		} else {
 			const String &stored_path = _get_stored_dep_path(dep);
-			item->set_text((int)Column::NAME, stored_path.get_file());
-			item->set_text((int)Column::PATH, stored_path);
-			item->set_custom_color((int)Column::PATH, Color(1, 0.4, 0.3));
+			item->set_text(0, stored_path.get_file());
+			item->set_text(1, stored_path);
+			item->set_custom_color(1, Color(1, 0.4, 0.3));
 			missing.push_back(stored_path);
 			broken = true;
 		}
 
 		const String type = dep.contains("::") ? dep.get_slice("::", 1) : "Resource";
-		String name = path.get_file();
 		Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(type);
-		item->set_icon((int)Column::TYPE, icon);
+		item->set_icon(0, icon);
 		item->set_metadata(0, type);
-		item->set_text((int)Column::TYPE, type);
-		item->set_text((int)Column::NAME, name);
-		item->set_text((int)Column::PATH, path);
-		item->add_button((int)Column::PATH, folder, 0);
+
+		item->add_button(1, folder, 0);
 	}
 
 	fixdeps->set_disabled(!broken);
@@ -332,9 +247,6 @@ void DependencyEditor::edit(const String &p_path) {
 	editing = p_path;
 	set_title(TTR("Dependencies For:") + " " + p_path.get_file());
 
-	filter->set_text("");
-
-	_update_menu_sort();
 	_update_list();
 
 	if (EditorNode::get_singleton()->is_scene_open(p_path)) {
@@ -349,37 +261,21 @@ void DependencyEditor::edit(const String &p_path) {
 	popup_centered_ratio(0.4);
 }
 
-void DependencyEditor::_sort_option_selected(int p_id) {
-	sort_by = (DependencyEditorSortBy)p_id;
-	_update_menu_sort();
-	_update_list();
-}
-
-void DependencyEditor::_update_menu_sort() {
-	for (int i = 0; i != (int)DependencyEditorSortBy::MAX; i++) {
-		menu_sort->get_popup()->set_item_checked(i, (i == (int)sort_by));
-	}
-}
-
 DependencyEditor::DependencyEditor() {
 	VBoxContainer *vb = memnew(VBoxContainer);
+	vb->set_name(TTR("Dependencies"));
 	add_child(vb);
 
 	tree = memnew(Tree);
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	tree->set_theme_type_variation("TreeTable");
 	tree->set_hide_folding(true);
-	tree->set_columns((int)Column::MAX);
+	tree->set_columns(2);
 	tree->set_column_titles_visible(true);
-	tree->set_column_title((int)Column::TYPE, TTRC("Type"));
-	tree->set_column_clip_content((int)Column::TYPE, true);
-	tree->set_column_expand_ratio((int)Column::TYPE, 2);
-	tree->set_column_title((int)Column::NAME, TTRC("Name"));
-	tree->set_column_clip_content((int)Column::NAME, true);
-	tree->set_column_expand_ratio((int)Column::NAME, 3);
-	tree->set_column_title((int)Column::PATH, TTRC("Path"));
-	tree->set_column_clip_content((int)Column::PATH, true);
-	tree->set_column_expand_ratio((int)Column::PATH, 5);
+	tree->set_column_title(0, TTR("Resource"));
+	tree->set_column_clip_content(0, true);
+	tree->set_column_title(1, TTR("Path"));
+	tree->set_column_clip_content(1, true);
 	tree->set_hide_root(true);
 	tree->connect("button_clicked", callable_mp(this, &DependencyEditor::_load_pressed));
 
@@ -395,34 +291,6 @@ DependencyEditor::DependencyEditor() {
 
 	vb->add_child(hbc);
 
-	HBoxContainer *hbc_filter = memnew(HBoxContainer);
-	vb->add_child(hbc_filter);
-	filter = memnew(LineEdit);
-	filter->set_accessibility_name(TTRC("Filter Dependencies"));
-	filter->set_placeholder(TTRC("Filter Dependencies"));
-	filter->set_clear_button_enabled(true);
-	filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	filter->connect(SceneStringName(text_changed), callable_mp(this, &DependencyEditor::_update_list).unbind(1));
-	hbc_filter->add_child(filter);
-
-	menu_sort = memnew(MenuButton);
-	menu_sort->set_flat(false);
-	menu_sort->set_theme_type_variation("FlatMenuButton");
-	menu_sort->set_tooltip_text(TTRC("Sort Dependencies"));
-	menu_sort->set_accessibility_name(TTRC("Sort Dependencies"));
-
-	PopupMenu *popup_sort = menu_sort->get_popup();
-	popup_sort->connect(SceneStringName(id_pressed), callable_mp(this, &DependencyEditor::_sort_option_selected));
-	popup_sort->add_radio_check_item(TTRC("Sort by Type (Ascending)"), (int)DependencyEditorSortBy::TYPE);
-	popup_sort->add_radio_check_item(TTRC("Sort by Type (Descending)"), (int)DependencyEditorSortBy::TYPE_REVERSE);
-	popup_sort->add_radio_check_item(TTRC("Sort by Name (Ascending)"), (int)DependencyEditorSortBy::NAME);
-	popup_sort->add_radio_check_item(TTRC("Sort by Name (Descending)"), (int)DependencyEditorSortBy::NAME_REVERSE);
-	popup_sort->add_radio_check_item(TTRC("Sort by Path (Ascending)"), (int)DependencyEditorSortBy::PATH);
-	popup_sort->add_radio_check_item(TTRC("Sort by Path (Descending)"), (int)DependencyEditorSortBy::PATH_REVERSE);
-	popup_sort->set_item_checked((int)sort_by, true);
-
-	hbc_filter->add_child(menu_sort);
-
 	MarginContainer *mc = memnew(MarginContainer);
 	mc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
diff --git a/engine/editor/file_system/dependency_editor.h b/engine/editor/file_system/dependency_editor.h
index 63950a1f..5fd63751 100644
--- a/engine/editor/file_system/dependency_editor.h
+++ b/engine/editor/file_system/dependency_editor.h
@@ -39,25 +39,6 @@ class PopupMenu;
 class Tree;
 class TreeItem;
 class VBoxContainer;
-class LineEdit;
-class MenuButton;
-
-enum class DependencyEditorSortBy {
-	TYPE,
-	TYPE_REVERSE,
-	NAME,
-	NAME_REVERSE,
-	PATH,
-	PATH_REVERSE,
-	MAX,
-};
-
-enum class Column {
-	TYPE,
-	NAME,
-	PATH,
-	MAX,
-};
 
 class DependencyEditor : public AcceptDialog {
 	GDCLASS(DependencyEditor, AcceptDialog);
@@ -65,12 +46,9 @@ class DependencyEditor : public AcceptDialog {
 	Tree *tree = nullptr;
 	Button *fixdeps = nullptr;
 	Label *warning_label = nullptr;
-	LineEdit *filter = nullptr;
-	MenuButton *menu_sort = nullptr;
 
 	EditorFileDialog *search = nullptr;
 
-	DependencyEditorSortBy sort_by = DependencyEditorSortBy::PATH;
 	String replacing;
 	String editing;
 	List<String> missing;
@@ -79,12 +57,9 @@ class DependencyEditor : public AcceptDialog {
 
 	void _searched(const String &p_path);
 	void _load_pressed(Object *p_item, int p_cell, int p_button, MouseButton p_mouse_button);
-	List<String> _filter_deps(const List<String> &p_deps);
 	void _fix_all();
 	void _update_list();
 
-	void _update_menu_sort();
-	void _sort_option_selected(int p_id);
 	void _update_file();
 
 protected:
diff --git a/engine/editor/file_system/editor_file_system.cpp b/engine/editor/file_system/editor_file_system.cpp
index fde1c6ea..cdfb403f 100644
--- a/engine/editor/file_system/editor_file_system.cpp
+++ b/engine/editor/file_system/editor_file_system.cpp
@@ -34,11 +34,7 @@
 #include "core/extension/gdextension_manager.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_importer.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
@@ -49,9 +45,7 @@
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/settings/project_settings_editor.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display/display_server.h"
 
 EditorFileSystem *EditorFileSystem::singleton = nullptr;
 int EditorFileSystem::nb_files_total = 0;
@@ -135,11 +129,6 @@ String EditorFileSystemDirectory::get_file_path(int p_idx) const {
 	return get_path().path_join(get_file(p_idx));
 }
 
-ResourceUID::ID EditorFileSystemDirectory::get_file_uid(int p_idx) const {
-	ERR_FAIL_INDEX_V(p_idx, files.size(), ResourceUID::INVALID_ID);
-	return files[p_idx]->uid;
-}
-
 Vector<String> EditorFileSystemDirectory::get_file_deps(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, files.size(), Vector<String>());
 	Vector<String> deps;
@@ -245,12 +234,6 @@ EditorFileSystemDirectory::~EditorFileSystemDirectory() {
 	}
 }
 
-void EditorFileSystemImportFormatSupportQuery::_bind_methods() {
-	GDVIRTUAL_BIND(_is_active);
-	GDVIRTUAL_BIND(_get_file_extensions);
-	GDVIRTUAL_BIND(_query);
-}
-
 EditorFileSystem::ScannedDirectory::~ScannedDirectory() {
 	for (ScannedDirectory *dir : subdirs) {
 		memdelete(dir);
@@ -2556,7 +2539,7 @@ void EditorFileSystem::_notify_filesystem_changed() {
 }
 
 HashSet<String> EditorFileSystem::get_valid_extensions() const {
-	return HashSet<String>(valid_extensions);
+	return valid_extensions;
 }
 
 void EditorFileSystem::_register_global_class_script(const String &p_search_path, const String &p_target_path, const ScriptClassInfoUpdate &p_script_update) {
@@ -2802,7 +2785,7 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
 
 	//try to obtain existing params
 
-	HashMap<StringName, Variant> params(p_custom_options);
+	HashMap<StringName, Variant> params = p_custom_options;
 	String importer_name; //empty by default though
 
 	if (!p_custom_importer.is_empty()) {
@@ -3142,7 +3125,7 @@ Error EditorFileSystem::_copy_file(const String &p_from, const String &p_to) {
 		Error err = OK;
 		Ref<Resource> res = ResourceCache::get_ref(p_from);
 		if (res.is_null()) {
-			res = ResourceLoader::load(p_from, "", ResourceLoaderConstants::CACHE_MODE_REUSE, &err);
+			res = ResourceLoader::load(p_from, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
 		} else {
 			bool edited = false;
 			List<Ref<Resource>> cached;
@@ -3247,9 +3230,9 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
 	// this could lead to a slow import process, especially when the editor is unfocused.
 	// Temporarily disabling VSync and low_processor_usage_mode while reimporting fixes this.
 	const bool old_low_processor_usage_mode = OS::get_singleton()->is_in_low_processor_usage_mode();
-	const DisplayServerEnums::VSyncMode old_vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID);
+	const DisplayServer::VSyncMode old_vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServer::MAIN_WINDOW_ID);
 	OS::get_singleton()->set_low_processor_usage_mode(false);
-	DisplayServer::get_singleton()->window_set_vsync_mode(DisplayServerEnums::VSyncMode::VSYNC_DISABLED);
+	DisplayServer::get_singleton()->window_set_vsync_mode(DisplayServer::VSyncMode::VSYNC_DISABLED);
 
 	Vector<ImportFile> reimport_files;
 
@@ -3443,7 +3426,7 @@ Error EditorFileSystem::_resource_import(const String &p_path) {
 	return OK;
 }
 
-Ref<Resource> EditorFileSystem::_load_resource_on_startup(ResourceFormatImporter *p_importer, const String &p_path, Error *r_error, bool p_use_sub_threads, float *r_progress, ResourceLoaderConstants::CacheMode p_cache_mode) {
+Ref<Resource> EditorFileSystem::_load_resource_on_startup(ResourceFormatImporter *p_importer, const String &p_path, Error *r_error, bool p_use_sub_threads, float *r_progress, ResourceFormatLoader::CacheMode p_cache_mode) {
 	ERR_FAIL_NULL_V(p_importer, Ref<Resource>());
 
 	if (!FileAccess::exists(p_path)) {
@@ -3701,7 +3684,6 @@ bool EditorFileSystem::_scan_extensions() {
 void EditorFileSystem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_filesystem"), &EditorFileSystem::get_filesystem);
 	ClassDB::bind_method(D_METHOD("is_scanning"), &EditorFileSystem::is_scanning);
-	ClassDB::bind_method(D_METHOD("is_importing"), &EditorFileSystem::is_importing);
 	ClassDB::bind_method(D_METHOD("get_scanning_progress"), &EditorFileSystem::get_scanning_progress);
 	ClassDB::bind_method(D_METHOD("scan"), &EditorFileSystem::scan);
 	ClassDB::bind_method(D_METHOD("scan_sources"), &EditorFileSystem::scan_changes);
diff --git a/engine/editor/file_system/editor_file_system.h b/engine/editor/file_system/editor_file_system.h
index 1381df83..93774502 100644
--- a/engine/editor/file_system/editor_file_system.h
+++ b/engine/editor/file_system/editor_file_system.h
@@ -31,15 +31,14 @@
 #pragma once
 
 #include "core/io/dir_access.h"
-#include "core/io/resource_loader_constants.h"
-#include "core/os/semaphore.h"
+#include "core/io/resource_importer.h"
+#include "core/io/resource_loader.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/hash_set.h"
 #include "core/templates/safe_refcount.h"
 #include "scene/main/node.h"
 
-class ResourceFormatImporter;
 class FileAccess;
 
 struct EditorProgressBG;
@@ -92,7 +91,6 @@ public:
 	int get_file_count() const;
 	String get_file(int p_idx) const;
 	String get_file_path(int p_idx) const;
-	ResourceUID::ID get_file_uid(int p_idx) const;
 	StringName get_file_type(int p_idx) const;
 	StringName get_file_resource_script_class(int p_idx) const;
 	Vector<String> get_file_deps(int p_idx) const;
@@ -122,7 +120,11 @@ protected:
 	GDVIRTUAL0RC_REQUIRED(bool, _is_active)
 	GDVIRTUAL0RC_REQUIRED(Vector<String>, _get_file_extensions)
 	GDVIRTUAL0RC_REQUIRED(bool, _query)
-	static void _bind_methods();
+	static void _bind_methods() {
+		GDVIRTUAL_BIND(_is_active);
+		GDVIRTUAL_BIND(_get_file_extensions);
+		GDVIRTUAL_BIND(_query);
+	}
 
 public:
 	virtual bool is_active() const {
@@ -331,7 +333,7 @@ class EditorFileSystem : public Node {
 	ScriptClassInfo _get_global_script_class(const String &p_type, const String &p_path) const;
 
 	static Error _resource_import(const String &p_path);
-	static Ref<Resource> _load_resource_on_startup(ResourceFormatImporter *p_importer, const String &p_path, Error *r_error, bool p_use_sub_threads, float *r_progress, ResourceLoaderConstants::CacheMode p_cache_mode);
+	static Ref<Resource> _load_resource_on_startup(ResourceFormatImporter *p_importer, const String &p_path, Error *r_error, bool p_use_sub_threads, float *r_progress, ResourceFormatLoader::CacheMode p_cache_mode);
 
 	bool using_fat32_or_exfat; // Workaround for projects in FAT32 or exFAT filesystem (pendrives, most of the time)
 
diff --git a/engine/editor/file_system/editor_paths.cpp b/engine/editor/file_system/editor_paths.cpp
index 2738dd04..b8dc77e7 100644
--- a/engine/editor/file_system/editor_paths.cpp
+++ b/engine/editor/file_system/editor_paths.cpp
@@ -34,7 +34,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "main/main.h"
 
diff --git a/engine/editor/file_system/editor_paths.h b/engine/editor/file_system/editor_paths.h
index 4dcf37b5..ab81e825 100644
--- a/engine/editor/file_system/editor_paths.h
+++ b/engine/editor/file_system/editor_paths.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 
diff --git a/engine/editor/gui/code_editor.cpp b/engine/editor/gui/code_editor.cpp
index f164073c..c99b3b05 100644
--- a/engine/editor/gui/code_editor.cpp
+++ b/engine/editor/gui/code_editor.cpp
@@ -31,13 +31,11 @@
 #include "code_editor.h"
 
 #include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "editor/script/syntax_highlighters.h"
+#include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
@@ -97,7 +95,6 @@ void GotoLinePopup::_notification(int p_what) {
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (!is_visible()) {
 				text_editor->set_preview_navigation_change(false);
-				text_editor->get_text_editor()->grab_focus();
 			}
 		} break;
 	}
@@ -574,7 +571,10 @@ bool FindReplaceBar::search_next() {
 }
 
 void FindReplaceBar::_hide_bar() {
-	text_editor->grab_focus();
+	if (replace_text->has_focus() || search_text->has_focus()) {
+		text_editor->grab_focus();
+	}
+
 	text_editor->set_search_text("");
 	result_line = -1;
 	result_col = -1;
@@ -696,11 +696,6 @@ void FindReplaceBar::_replace_text_submitted(const String &p_text) {
 	}
 }
 
-void FindReplaceBar::_replace_button_pressed() {
-	_replace();
-	search_next();
-}
-
 void FindReplaceBar::_toggle_replace_pressed() {
 	bool replace_visible = replace_text->is_visible_in_tree();
 	replace_visible ? popup_search(true) : popup_replace();
@@ -834,7 +829,6 @@ FindReplaceBar::FindReplaceBar() {
 
 	// Replace toolbar.
 	replace_text = memnew(LineEdit);
-	replace_text->set_keep_editing_on_text_submit(true);
 	vbc_lineedit->add_child(replace_text);
 	replace_text->set_placeholder(TTRC("Replace"));
 	replace_text->set_tooltip_text(TTRC("Replace"));
@@ -845,7 +839,7 @@ FindReplaceBar::FindReplaceBar() {
 	replace = memnew(Button);
 	hbc_button_replace->add_child(replace);
 	replace->set_text(TTRC("Replace"));
-	replace->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_replace_button_pressed));
+	replace->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_replace));
 
 	replace_all = memnew(Button);
 	hbc_button_replace->add_child(replace_all);
@@ -916,11 +910,6 @@ void CodeTextEditor::input(const Ref<InputEvent> &event) {
 		accept_event();
 		return;
 	}
-	if (ED_IS_SHORTCUT("script_text_editor/join_lines", key_event)) {
-		text_editor->join_lines();
-		accept_event();
-		return;
-	}
 	if (ED_IS_SHORTCUT("script_text_editor/duplicate_selection", key_event)) {
 		text_editor->duplicate_selection();
 		accept_event();
@@ -1004,7 +993,7 @@ void CodeTextEditor::_line_col_changed() {
 	sb.append(" : ");
 	sb.append(itos(positional_column + 1).lpad(3));
 
-	line_and_col_button->set_text(sb.as_string());
+	line_and_col_txt->set_text(sb.as_string());
 
 	if (find_replace_bar) {
 		if (!find_replace_bar->line_col_changed_for_result) {
@@ -1381,24 +1370,6 @@ void CodeTextEditor::toggle_inline_comment(const String &delimiter) {
 	text_editor->end_complex_operation();
 }
 
-void CodeTextEditor::adjust_viewport_to_caret() {
-	call_on_all_layout_pending_finished(callable_mp((TextEdit *)text_editor, &TextEdit::adjust_viewport_to_caret).bind(0));
-}
-
-void CodeTextEditor::center_viewport_to_caret() {
-	call_on_all_layout_pending_finished(callable_mp((TextEdit *)text_editor, &TextEdit::center_viewport_to_caret).bind(0));
-}
-
-void CodeTextEditor::center_viewport_to_caret_if_line_invisible(int p_line) {
-	if (text_editor->is_layout_pending_in_tree()) {
-		text_editor->call_on_all_layout_pending_finished(callable_mp(this, &CodeTextEditor::center_viewport_to_caret_if_line_invisible).bind(0));
-		return;
-	}
-	if (!text_editor->is_line_in_viewport(p_line)) {
-		text_editor->center_viewport_to_caret();
-	}
-}
-
 void CodeTextEditor::goto_line(int p_line, int p_column) {
 	text_editor->remove_secondary_carets();
 	text_editor->deselect();
@@ -1407,7 +1378,8 @@ void CodeTextEditor::goto_line(int p_line, int p_column) {
 	text_editor->set_caret_column(p_column, false);
 	text_editor->set_code_hint("");
 	text_editor->cancel_code_completion();
-	adjust_viewport_to_caret();
+	// Defer in case the CodeEdit was just created and needs to be resized.
+	callable_mp((TextEdit *)text_editor, &TextEdit::adjust_viewport_to_caret).call_deferred(0);
 }
 
 void CodeTextEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
@@ -1416,7 +1388,7 @@ void CodeTextEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
 	text_editor->select(p_line, p_begin, p_line, p_end);
 	text_editor->set_code_hint("");
 	text_editor->cancel_code_completion();
-	adjust_viewport_to_caret();
+	callable_mp((TextEdit *)text_editor, &TextEdit::adjust_viewport_to_caret).call_deferred(0);
 }
 
 void CodeTextEditor::goto_line_centered(int p_line, int p_column) {
@@ -1427,7 +1399,7 @@ void CodeTextEditor::goto_line_centered(int p_line, int p_column) {
 	text_editor->set_caret_column(p_column, false);
 	text_editor->set_code_hint("");
 	text_editor->cancel_code_completion();
-	center_viewport_to_caret();
+	callable_mp((TextEdit *)text_editor, &TextEdit::center_viewport_to_caret).call_deferred(0);
 }
 
 void CodeTextEditor::set_executing_line(int p_line) {
@@ -1478,21 +1450,15 @@ void CodeTextEditor::set_edit_state(const Variant &p_state) {
 	Dictionary state = p_state;
 
 	/* update the row first as it sets the column to 0 */
-	if (state.get("ensure_caret_visible", false)) {
-		text_editor->set_caret_line(state["row"], false);
-		text_editor->set_caret_column(state["column"], false);
-		center_viewport_to_caret_if_line_invisible(state["row"]);
+	text_editor->set_caret_line(state["row"]);
+	text_editor->set_caret_column(state["column"]);
+	if (int(state["scroll_position"]) == -1) {
+		// Special case for previous state.
+		text_editor->center_viewport_to_caret();
 	} else {
-		text_editor->set_caret_line(state["row"]);
-		text_editor->set_caret_column(state["column"]);
-		if (int(state["scroll_position"]) == -1) {
-			// Special case for previous state.
-			center_viewport_to_caret();
-		} else {
-			text_editor->set_v_scroll(state["scroll_position"]);
-		}
-		text_editor->set_h_scroll(state["h_scroll_position"]);
+		text_editor->set_v_scroll(state["scroll_position"]);
 	}
+	text_editor->set_h_scroll(state["h_scroll_position"]);
 
 	if (state.get("selection", false)) {
 		text_editor->select(state["selection_from_line"], state["selection_from_column"], state["selection_to_line"], state["selection_to_column"]);
@@ -1503,27 +1469,21 @@ void CodeTextEditor::set_edit_state(const Variant &p_state) {
 	if (state.has("folded_lines")) {
 		const PackedInt32Array folded_lines = state["folded_lines"];
 		for (const int &line : folded_lines) {
-			if (line < text_editor->get_line_count()) {
-				text_editor->fold_line(line);
-			}
+			text_editor->fold_line(line);
 		}
 	}
 
 	if (state.has("breakpoints")) {
 		const PackedInt32Array breakpoints = state["breakpoints"];
 		for (const int &line : breakpoints) {
-			if (line < text_editor->get_line_count()) {
-				text_editor->set_line_as_breakpoint(line, true);
-			}
+			text_editor->set_line_as_breakpoint(line, true);
 		}
 	}
 
 	if (state.has("bookmarks")) {
 		const PackedInt32Array bookmarks = state["bookmarks"];
 		for (const int &line : bookmarks) {
-			if (line < text_editor->get_line_count()) {
-				text_editor->set_line_as_bookmarked(line, true);
-			}
+			text_editor->set_line_as_bookmarked(line, true);
 		}
 	}
 
@@ -1644,7 +1604,7 @@ void CodeTextEditor::_update_text_editor_theme() {
 }
 
 void CodeTextEditor::_update_font_ligatures() {
-	int ot_mode = EDITOR_GET("interface/editor/fonts/code_font_contextual_ligatures");
+	int ot_mode = EDITOR_GET("interface/editor/code_font_contextual_ligatures");
 
 	Ref<FontVariation> fc = text_editor->get_theme_font(SceneStringName(font));
 	if (fc.is_valid()) {
@@ -1655,7 +1615,7 @@ void CodeTextEditor::_update_font_ligatures() {
 				fc->set_opentype_features(ftrs);
 			} break;
 			case 2: { // Custom.
-				Vector<String> subtag = String(EDITOR_GET("interface/editor/fonts/code_font_custom_opentype_features")).split(",");
+				Vector<String> subtag = String(EDITOR_GET("interface/editor/code_font_custom_opentype_features")).split(",");
 				Dictionary ftrs;
 				for (int i = 0; i < subtag.size(); i++) {
 					Vector<String> subtag_a = subtag[i].split("=");
@@ -1673,17 +1633,6 @@ void CodeTextEditor::_update_font_ligatures() {
 				fc->set_opentype_features(ftrs);
 			} break;
 		}
-		Vector<String> variation_tags = String(EDITOR_GET("interface/editor/fonts/code_font_custom_variations")).split(",");
-		Dictionary variations_mono;
-		for (int i = 0; i < variation_tags.size(); i++) {
-			Vector<String> subtag_a = variation_tags[i].split("=");
-			if (subtag_a.size() == 2) {
-				variations_mono[TS->name_to_tag(subtag_a[0])] = subtag_a[1].to_float();
-			} else if (subtag_a.size() == 1) {
-				variations_mono[TS->name_to_tag(subtag_a[0])] = 1;
-			}
-		}
-		fc->set_variation_opentype(variations_mono);
 	}
 }
 
@@ -1894,7 +1843,7 @@ void CodeTextEditor::_zoom_to(float p_zoom_factor) {
 
 void CodeTextEditor::set_zoom_factor(float p_zoom_factor) {
 	zoom_factor = CLAMP(p_zoom_factor, 0.25f, 3.0f);
-	int neutral_font_size = int(EDITOR_GET("interface/editor/fonts/code_font_size")) * EDSCALE;
+	int neutral_font_size = int(EDITOR_GET("interface/editor/code_font_size")) * EDSCALE;
 	int new_font_size = Math::round(zoom_factor * neutral_font_size);
 
 	zoom_button->set_text(itos(Math::round(zoom_factor * 100)) + " %");
@@ -1906,16 +1855,11 @@ float CodeTextEditor::get_zoom_factor() {
 	return zoom_factor;
 }
 
-void CodeTextEditor::_show_goto_popup_request() {
-	emit_signal("show_goto_popup");
-}
-
 void CodeTextEditor::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("validate_script"));
 	ADD_SIGNAL(MethodInfo("load_theme_settings"));
 	ADD_SIGNAL(MethodInfo("show_errors_panel"));
 	ADD_SIGNAL(MethodInfo("show_warnings_panel"));
-	ADD_SIGNAL(MethodInfo("show_goto_popup"));
 	ADD_SIGNAL(MethodInfo("navigation_preview_ended"));
 	ADD_SIGNAL(MethodInfo("zoomed", PropertyInfo(Variant::FLOAT, "p_zoom_factor")));
 }
@@ -2038,18 +1982,16 @@ CodeTextEditor::CodeTextEditor() {
 
 	status_bar->add_child(memnew(VSeparator));
 
-	// Line and column.
-	line_and_col_button = memnew(Button);
-	line_and_col_button->set_theme_type_variation("FlatMenuButton");
-	line_and_col_button->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
-	line_and_col_button->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	line_and_col_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS);
-	line_and_col_button->set_tooltip_text(TTRC("Line and column numbers."));
-	line_and_col_button->set_accessibility_name(TTRC("Line and column numbers."));
-	line_and_col_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_show_goto_popup_request));
-	line_and_col_button->set_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_line"));
-	line_and_col_button->set_shortcut_context(this);
-	status_bar->add_child(line_and_col_button);
+	// Line and column
+	line_and_col_txt = memnew(Label);
+	status_bar->add_child(line_and_col_txt);
+	line_and_col_txt->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
+	line_and_col_txt->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	line_and_col_txt->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS);
+	line_and_col_txt->set_tooltip_text(TTRC("Line and column numbers."));
+	line_and_col_txt->set_accessibility_name(TTRC("Line and column numbers."));
+	line_and_col_txt->set_focus_mode(FOCUS_ACCESSIBILITY);
+	line_and_col_txt->set_mouse_filter(MOUSE_FILTER_STOP);
 
 	status_bar->add_child(memnew(VSeparator));
 
diff --git a/engine/editor/gui/code_editor.h b/engine/editor/gui/code_editor.h
index a5bc8fad..ec7024a2 100644
--- a/engine/editor/gui/code_editor.h
+++ b/engine/editor/gui/code_editor.h
@@ -117,7 +117,6 @@ class FindReplaceBar : public HBoxContainer {
 	void _search_text_changed(const String &p_text);
 	void _search_text_submitted(const String &p_text);
 	void _replace_text_submitted(const String &p_text);
-	void _replace_button_pressed();
 	void _toggle_replace_pressed();
 
 protected:
@@ -170,7 +169,7 @@ class CodeTextEditor : public VBoxContainer {
 	Button *warning_button = nullptr;
 
 	MenuButton *zoom_button = nullptr;
-	Button *line_and_col_button = nullptr;
+	Label *line_and_col_txt = nullptr;
 	Label *indentation_txt = nullptr;
 
 	Timer *idle = nullptr;
@@ -210,8 +209,6 @@ class CodeTextEditor : public VBoxContainer {
 	void _zoom_out();
 	void _zoom_to(float p_zoom_factor);
 
-	void _show_goto_popup_request();
-
 	void _update_error_content_height();
 
 	void _error_button_pressed();
@@ -257,10 +254,6 @@ public:
 	/// by adding or removing comment delimiter
 	void toggle_inline_comment(const String &delimiter);
 
-	void adjust_viewport_to_caret();
-	void center_viewport_to_caret();
-	void center_viewport_to_caret_if_line_invisible(int p_line);
-
 	void goto_line(int p_line, int p_column = 0);
 	void goto_line_selection(int p_line, int p_begin, int p_end);
 	void goto_line_centered(int p_line, int p_column = 0);
diff --git a/engine/editor/gui/create_dialog.cpp b/engine/editor/gui/create_dialog.cpp
index 844fe174..5d422617 100644
--- a/engine/editor/gui/create_dialog.cpp
+++ b/engine/editor/gui/create_dialog.cpp
@@ -30,31 +30,17 @@
 
 #include "create_dialog.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
-#include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/settings/editor_feature_profile.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/tree.h"
 
 void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_current_type, const String &p_current_name) {
 	_fill_type_list();
 
-	types_enabled[TYPE_BUILT_IN] = EditorSettings::get_singleton()->get_project_metadata("create_dialog", "built_in_enabled", true);
-	types_enabled[TYPE_CUSTOM] = EditorSettings::get_singleton()->get_project_metadata("create_dialog", "custom_enabled", true);
-	types_enabled[TYPE_EDITOR] = EditorSettings::get_singleton()->get_project_metadata("create_dialog", "editor_enabled", false);
-	_update_filter_button_state();
-
 	icon_fallback = search_options->has_theme_icon(base_type, EditorStringName(EditorIcons)) ? base_type : "Object";
 
 	if (p_dont_clear) {
@@ -182,6 +168,10 @@ bool CreateDialog::_should_hide_type(const StringName &p_type) const {
 		return true;
 	}
 
+	if (is_base_type_node && p_type.operator String().begins_with("Editor")) {
+		return true; // Do not show editor nodes.
+	}
+
 	if (ClassDB::class_exists(p_type)) {
 		if (!ClassDB::can_instantiate(p_type) || ClassDB::is_virtual(p_type)) {
 			return true; // Can't create abstract or virtual class.
@@ -253,50 +243,11 @@ void CreateDialog::_update_search() {
 	_configure_search_option_item(root, base_type, ClassDB::class_exists(base_type) ? TypeCategory::CPP_TYPE : TypeCategory::OTHER_TYPE, "");
 
 	const String search_text = search_box->get_text();
-	bool type_filter_enabled = search_text.is_empty();
-
-	selectable_types.clear();
-	if (type_filter_enabled) {
-		for (const TypeInfo &candidate : type_info_list) {
-			bool is_script_type = !ClassDB::class_exists(candidate.type_name);
-			bool is_extension = !is_script_type && ClassDB::is_gdextension(candidate.type_name);
-			bool is_editor = false;
-			if (!is_script_type) {
-				const ClassDB::APIType api_type = ClassDB::get_api_type(candidate.type_name);
-				is_editor = (api_type == ClassDB::API_EDITOR || api_type == ClassDB::API_EDITOR_EXTENSION);
-			}
-
-			bool valid = false;
-			if (is_script_type) {
-				valid = types_enabled[TYPE_CUSTOM];
-			} else if (is_extension) {
-				if (is_editor) {
-					valid = types_enabled[TYPE_EDITOR];
-				} else {
-					valid = types_enabled[TYPE_CUSTOM];
-				}
-			} else {
-				// Native type.
-				if (is_editor) {
-					valid = types_enabled[TYPE_EDITOR];
-				} else {
-					valid = types_enabled[TYPE_BUILT_IN];
-				}
-			}
-
-			if (valid) {
-				selectable_types.insert(candidate.type_name);
-			}
-		}
-	}
 
 	float highest_score = 0.0f;
 	StringName best_match;
 
 	for (const TypeInfo &candidate : type_info_list) {
-		if (type_filter_enabled && !selectable_types.has(candidate.type_name)) {
-			continue;
-		}
 		String match_keyword;
 
 		// First check if the name matches. If it does not, try the search keywords.
@@ -439,7 +390,7 @@ void CreateDialog::_configure_search_option_item(TreeItem *r_item, const StringN
 	}
 
 	if (!p_match_keyword.is_empty()) {
-		text += "      - " + vformat(TTR("Matches the \"%s\" keyword."), p_match_keyword);
+		text += "      - " + TTR(vformat("Matches the \"%s\" keyword.", p_match_keyword));
 	}
 	r_item->set_text(0, text);
 
@@ -579,33 +530,7 @@ void CreateDialog::_confirmed() {
 	_cleanup();
 }
 
-void CreateDialog::_reset_filters() {
-	if (!types_enabled[TYPE_BUILT_IN]) {
-		_type_filter_toggled(TYPE_BUILT_IN, false);
-	}
-	if (!types_enabled[TYPE_CUSTOM]) {
-		_type_filter_toggled(TYPE_CUSTOM, false);
-	}
-	if (types_enabled[TYPE_EDITOR]) {
-		_type_filter_toggled(TYPE_EDITOR, false);
-	}
-	reset_filters_button->hide();
-	_update_search();
-}
-
-void CreateDialog::_update_filter_button_state() {
-	const bool is_searching = !search_box->get_text().is_empty();
-	filters_button->set_disabled(is_searching);
-	if (!is_searching) {
-		filters_button->get_popup()->set_item_checked(TYPE_BUILT_IN, types_enabled[TYPE_BUILT_IN]);
-		filters_button->get_popup()->set_item_checked(TYPE_CUSTOM, types_enabled[TYPE_CUSTOM]);
-		filters_button->get_popup()->set_item_checked(TYPE_EDITOR, types_enabled[TYPE_EDITOR]);
-	}
-	reset_filters_button->set_visible(!is_searching && (!types_enabled[TYPE_BUILT_IN] || !types_enabled[TYPE_CUSTOM] || types_enabled[TYPE_EDITOR]));
-}
-
 void CreateDialog::_text_changed(const String &p_newtext) {
-	_update_filter_button_state();
 	_update_search();
 }
 
@@ -613,7 +538,10 @@ void CreateDialog::_sbox_input(const Ref<InputEvent> &p_event) {
 	// Redirect navigational key events to the tree.
 	Ref<InputEventKey> key = p_event;
 	if (key.is_valid()) {
-		if (key->is_action_pressed("ui_select", true)) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			search_options->gui_input(key);
+			search_box->accept_event();
+		} else if (key->is_action_pressed("ui_select", true)) {
 			TreeItem *ti = search_options->get_selected();
 			if (ti) {
 				ti->set_collapsed(!ti->is_collapsed());
@@ -625,20 +553,6 @@ void CreateDialog::_sbox_input(const Ref<InputEvent> &p_event) {
 
 void CreateDialog::_notification(int p_what) {
 	switch (p_what) {
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (!EditorSettings::get_singleton()->check_changed_settings_in_group("docks/scene_tree")) {
-				break;
-			}
-
-			[[fallthrough]];
-		}
-
-		case NOTIFICATION_READY: {
-			if (is_visible()) {
-				_update_search();
-			}
-		} break;
-
 		case NOTIFICATION_ENTER_TREE: {
 			connect(SceneStringName(confirmed), callable_mp(this, &CreateDialog::_confirmed));
 		} break;
@@ -662,9 +576,8 @@ void CreateDialog::_notification(int p_what) {
 			favorites->add_theme_constant_override("icon_max_width", icon_width);
 			recent->set_fixed_icon_size(Size2(icon_width, icon_width));
 
+			search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 			favorite->set_button_icon(get_editor_theme_icon(SNAME("Favorites")));
-			reset_filters_button->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
-			filters_button->set_button_icon(get_editor_theme_icon(SNAME("GuiDropdown")));
 		} break;
 	}
 }
@@ -775,29 +688,6 @@ void CreateDialog::cancel_pressed() {
 	_cleanup();
 }
 
-void CreateDialog::_type_filter_toggled(int p_type, bool p_search) {
-	filters_button->get_popup()->toggle_item_checked(p_type);
-	bool is_checked = filters_button->get_popup()->is_item_checked(p_type);
-
-	switch (p_type) {
-		case TYPE_BUILT_IN:
-			EditorSettings::get_singleton()->set_project_metadata("create_dialog", "built_in_enabled", is_checked);
-			break;
-		case TYPE_CUSTOM:
-			EditorSettings::get_singleton()->set_project_metadata("create_dialog", "custom_enabled", is_checked);
-			break;
-		case TYPE_EDITOR:
-			EditorSettings::get_singleton()->set_project_metadata("create_dialog", "editor_enabled", is_checked);
-			break;
-	}
-	types_enabled[p_type] = is_checked;
-
-	if (p_search) {
-		reset_filters_button->set_visible(!types_enabled[TYPE_BUILT_IN] || !types_enabled[TYPE_CUSTOM] || types_enabled[TYPE_EDITOR]);
-		_update_search();
-	}
-}
-
 void CreateDialog::_favorite_toggled() {
 	TreeItem *item = search_options->get_selected();
 	if (!item) {
@@ -979,6 +869,8 @@ CreateDialog::CreateDialog() {
 	base_type = "Object";
 	preferred_search_result_type = "";
 
+	type_blacklist.insert("PluginScript"); // PluginScript must be initialized before use, which is not possible here.
+	type_blacklist.insert("ScriptCreateDialog"); // This is an exposed editor Node that doesn't have an Editor prefix.
 	type_blacklist.insert("MissingNode");
 	type_blacklist.insert("MissingResource");
 
@@ -1030,10 +922,12 @@ CreateDialog::CreateDialog() {
 	vbc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	vsc_right->add_child(vbc);
 
-	search_box = memnew(FilterLineEdit);
+	search_box = memnew(LineEdit);
 	search_box->set_accessibility_name(TTRC("Search"));
+	search_box->set_clear_button_enabled(true);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &CreateDialog::_text_changed));
+	search_box->connect(SceneStringName(gui_input), callable_mp(this, &CreateDialog::_sbox_input));
 
 	HBoxContainer *search_hb = memnew(HBoxContainer);
 	search_hb->add_child(search_box);
@@ -1045,46 +939,14 @@ CreateDialog::CreateDialog() {
 	search_hb->add_child(favorite);
 	vbc->add_margin_child(TTR("Search:"), search_hb);
 
-	HBoxContainer *matches_hb = memnew(HBoxContainer);
-	vbc->add_child(matches_hb);
-
-	Label *matches_label = memnew(Label(TTRC("Matches:")));
-	matches_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	matches_label->set_theme_type_variation("HeaderSmall");
-	matches_hb->add_child(matches_label);
-
-	reset_filters_button = memnew(Button);
-	reset_filters_button->set_tooltip_text(TTRC("Reset filters."));
-	reset_filters_button->set_theme_type_variation(SceneStringName(FlatButton));
-	reset_filters_button->set_h_size_flags(Control::SIZE_SHRINK_END);
-	matches_hb->add_child(reset_filters_button);
-	reset_filters_button->connect(SceneStringName(pressed), callable_mp(this, &CreateDialog::_reset_filters));
-
-	filters_button = memnew(MenuButton);
-	filters_button->set_flat(false);
-	filters_button->set_icon_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
-	filters_button->set_theme_type_variation("FlatMenuButton");
-	filters_button->set_text(TTRC("Filters"));
-	filters_button->set_h_size_flags(Control::SIZE_SHRINK_END);
-	matches_hb->add_child(filters_button);
-
-	PopupMenu *filter_popup = filters_button->get_popup();
-	filter_popup->add_check_item(TTRC("Show Built-in"), TYPE_BUILT_IN);
-	filter_popup->add_check_item(TTRC("Show Custom"), TYPE_CUSTOM);
-	filter_popup->add_check_item(TTRC("Show Editor"), TYPE_EDITOR);
-	filter_popup->set_hide_on_checkable_item_selection(false);
-	filter_popup->connect(SceneStringName(id_pressed), callable_mp(this, &CreateDialog::_type_filter_toggled).bind(true));
-
 	search_options = memnew(Tree);
-	search_box->set_forward_control(search_options);
 	search_options->set_accessibility_name(TTRC("Matches:"));
 	search_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	search_options->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	search_options->set_theme_type_variation("TreeSecondary");
-	vbc->add_child(search_options);
 	search_options->connect("item_activated", callable_mp(this, &CreateDialog::_confirmed));
 	search_options->connect("cell_selected", callable_mp(this, &CreateDialog::_item_selected));
 	search_options->connect("button_clicked", callable_mp(this, &CreateDialog::_script_button_clicked));
+	search_options->set_theme_type_variation("TreeSecondary");
+	vbc->add_margin_child(TTR("Matches:"), search_options, true);
 
 	help_bit = memnew(EditorHelpBit);
 	help_bit->set_accessibility_name(TTRC("Description:"));
diff --git a/engine/editor/gui/create_dialog.h b/engine/editor/gui/create_dialog.h
index b82d7b69..9e12cd0d 100644
--- a/engine/editor/gui/create_dialog.h
+++ b/engine/editor/gui/create_dialog.h
@@ -30,17 +30,12 @@
 
 #pragma once
 
+#include "editor/doc/editor_help.h"
+#include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-
-class Button;
-class EditorHelpBit;
-class FilterLineEdit;
-class ItemList;
-class Tree;
-class TreeItem;
-
-class HBoxContainer;
-class MenuButton;
+#include "scene/gui/item_list.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/tree.h"
 
 class CreateDialog : public ConfirmationDialog {
 	GDCLASS(CreateDialog, ConfirmationDialog);
@@ -51,21 +46,12 @@ class CreateDialog : public ConfirmationDialog {
 		OTHER_TYPE
 	};
 
-	enum TypeGroup {
-		TYPE_BUILT_IN,
-		TYPE_CUSTOM,
-		TYPE_EDITOR,
-		TYPE_MAX,
-	};
-
 	struct TypeInfo {
 		StringName type_name;
 		PackedStringArray search_keywords;
 	};
 
-	bool types_enabled[TYPE_MAX];
-
-	FilterLineEdit *search_box = nullptr;
+	LineEdit *search_box = nullptr;
 	Tree *search_options = nullptr;
 
 	String base_type;
@@ -77,8 +63,6 @@ class CreateDialog : public ConfirmationDialog {
 	Button *favorite = nullptr;
 	Vector<String> favorite_list;
 	Tree *favorites = nullptr;
-	Button *reset_filters_button = nullptr;
-	MenuButton *filters_button = nullptr;
 	ItemList *recent = nullptr;
 	EditorHelpBit *help_bit = nullptr;
 
@@ -88,10 +72,7 @@ class CreateDialog : public ConfirmationDialog {
 	List<TypeInfo> type_info_list;
 	HashSet<StringName> type_blacklist;
 	HashSet<StringName> custom_type_blocklist;
-	HashSet<StringName> selectable_types;
 
-	void _reset_filters();
-	void _update_filter_button_state();
 	void _update_search();
 	bool _should_hide_type(const StringName &p_type) const;
 	void _add_type(const StringName &p_type, TypeCategory p_type_category, const String &p_match_keyword);
@@ -112,7 +93,6 @@ class CreateDialog : public ConfirmationDialog {
 	void _confirmed();
 	virtual void cancel_pressed() override;
 
-	void _type_filter_toggled(int p_type, bool p_search);
 	void _favorite_toggled();
 
 	void _history_selected(int p_idx);
diff --git a/engine/editor/gui/credits_roll.cpp b/engine/editor/gui/credits_roll.cpp
index ae279842..22c67bbe 100644
--- a/engine/editor/gui/credits_roll.cpp
+++ b/engine/editor/gui/credits_roll.cpp
@@ -34,7 +34,6 @@
 #include "core/donors.gen.h"
 #include "core/input/input.h"
 #include "core/license.gen.h"
-#include "core/object/callable_mp.h"
 #include "core/string/string_builder.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -43,7 +42,6 @@
 #include "scene/gui/color_rect.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
 Label *CreditsRoll::_create_label(const String &p_with_text, LabelSize p_size) {
diff --git a/engine/editor/gui/directory_create_dialog.cpp b/engine/editor/gui/directory_create_dialog.cpp
index d5ce8218..fbe6ddbb 100644
--- a/engine/editor/gui/directory_create_dialog.cpp
+++ b/engine/editor/gui/directory_create_dialog.cpp
@@ -31,7 +31,6 @@
 #include "directory_create_dialog.h"
 
 #include "core/io/dir_access.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/themes/editor_scale.h"
@@ -103,12 +102,12 @@ void DirectoryCreateDialog::_on_dir_path_changed() {
 	if (error.is_empty()) {
 		if (path.contains_char('/')) {
 			if (mode == MODE_DIRECTORY) {
-				validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Using slashes in folder names will create subfolders recursively."), EditorValidationPanel::MSG_OK);
+				validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Using slashes in folder names will create subfolders recursively."), EditorValidationPanel::MSG_OK);
 			} else {
-				validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Using slashes in path will create the file in subfolder, creating new subfolders if necessary."), EditorValidationPanel::MSG_OK);
+				validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Using slashes in path will create the file in subfolder, creating new subfolders if necessary."), EditorValidationPanel::MSG_OK);
 			}
 		} else if (mode == MODE_FILE) {
-			validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("File name is valid."), EditorValidationPanel::MSG_OK);
+			validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("File name is valid."), EditorValidationPanel::MSG_OK);
 		}
 	} else {
 		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, error, EditorValidationPanel::MSG_ERROR);
@@ -178,7 +177,7 @@ DirectoryCreateDialog::DirectoryCreateDialog() {
 
 	validation_panel = memnew(EditorValidationPanel);
 	vb->add_child(validation_panel);
-	validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Folder name is valid."));
+	validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Folder name is valid."));
 	validation_panel->set_update_callback(callable_mp(this, &DirectoryCreateDialog::_on_dir_path_changed));
 	validation_panel->set_accept_button(get_ok_button());
 
diff --git a/engine/editor/gui/editor_about.cpp b/engine/editor/gui/editor_about.cpp
index db1e9d43..3b1debe5 100644
--- a/engine/editor/gui/editor_about.cpp
+++ b/engine/editor/gui/editor_about.cpp
@@ -33,8 +33,6 @@
 #include "core/authors.gen.h"
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/credits_roll.h"
@@ -50,7 +48,6 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/style_box.h"
 
 void EditorAbout::_notification(int p_what) {
diff --git a/engine/editor/gui/editor_bottom_panel.cpp b/engine/editor/gui/editor_bottom_panel.cpp
index dfa97723..3961f646 100644
--- a/engine/editor/gui/editor_bottom_panel.cpp
+++ b/engine/editor/gui/editor_bottom_panel.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_bottom_panel.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
@@ -40,8 +39,6 @@
 #include "editor/gui/editor_version_button.h"
 #include "editor/scene/editor_scene_tabs.h"
 #include "editor/settings/editor_command_palette.h"
-#include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/separator.h"
@@ -50,7 +47,7 @@
 void EditorBottomPanel::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-			set_accessibility_region(true);
+			layout_popup = get_popup();
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -63,12 +60,23 @@ void EditorBottomPanel::_notification(int p_what) {
 void EditorBottomPanel::_on_tab_changed(int p_idx) {
 	_update_center_split_offset();
 	_repaint();
-	if (p_idx >= 0 && p_idx < get_tab_count()) {
-		set_accessibility_name(get_tab_title(p_idx));
-	}
 }
 
 void EditorBottomPanel::_theme_changed() {
+	int icon_width = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
+	int margin = bottom_hbox->get_minimum_size().width;
+	if (get_popup()) {
+		margin -= icon_width;
+	}
+
+	// Add margin to make space for the right side popup button.
+	icon_spacer->set_custom_minimum_size(Vector2(icon_width, 0));
+
+	// Need to get stylebox from EditorNode to update theme correctly.
+	Ref<StyleBox> bottom_tabbar_style = EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("tabbar_background"), SNAME("BottomPanel"))->duplicate();
+	bottom_tabbar_style->set_content_margin(is_layout_rtl() ? SIDE_LEFT : SIDE_RIGHT, margin + bottom_tabbar_style->get_content_margin(is_layout_rtl() ? SIDE_RIGHT : SIDE_LEFT));
+	add_theme_style_override("tabbar_background", bottom_tabbar_style);
+
 	if (get_current_tab() == -1) {
 		// Hide panel when not showing anything.
 		remove_theme_style_override(SceneStringName(panel));
@@ -98,7 +106,7 @@ void EditorBottomPanel::_repaint() {
 	if (panel_collapsed && get_popup()) {
 		set_popup(nullptr);
 	} else if (!panel_collapsed && !get_popup()) {
-		set_popup(dock_context_popup);
+		set_popup(layout_popup);
 	}
 	if (!panel_collapsed && (previous_tab != -1)) {
 		return;
@@ -111,6 +119,7 @@ void EditorBottomPanel::_repaint() {
 	center_split->set_dragger_visibility(panel_collapsed ? SplitContainer::DRAGGER_HIDDEN : SplitContainer::DRAGGER_VISIBLE);
 	center_split->set_collapsed(panel_collapsed);
 
+	pin_button->set_visible(!panel_collapsed);
 	expand_button->set_visible(!panel_collapsed);
 	if (expand_button->is_pressed()) {
 		_expand_button_toggled(!panel_collapsed);
@@ -119,40 +128,10 @@ void EditorBottomPanel::_repaint() {
 	}
 }
 
-void EditorBottomPanel::dock_closed(EditorDock *p_dock) {
-	if (p_dock == get_current_tab_control()) {
-		hide_bottom_panel();
-	}
-}
-
-void EditorBottomPanel::dock_focused(EditorDock *p_dock, bool p_was_visible) {
-	if (p_was_visible && p_dock->is_visible()) {
-		hide_bottom_panel();
-	}
-}
-
-DockTabContainer::TabStyle EditorBottomPanel::get_tab_style() const {
-	return (TabStyle)EDITOR_GET("interface/editor/docks/bottom_dock_tab_style").operator int();
-}
-
-bool EditorBottomPanel::can_switch_dock() const {
-	return !is_locked();
-}
-
-void EditorBottomPanel::load_selected_tab(int p_idx) {
-	EditorDock *selected_dock = get_dock(p_idx);
-	if (!selected_dock) {
-		p_idx = -1;
-	}
-	set_block_signals(true);
-	set_current_tab(p_idx);
-	set_block_signals(false);
-}
-
 void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const {
 	Dictionary offsets;
 	for (const KeyValue<String, int> &E : dock_offsets) {
-		offsets[E.key] = E.value / EDSCALE;
+		offsets[E.key] = E.value;
 	}
 	p_config_file->set_value(p_section, "bottom_panel_offsets", offsets);
 }
@@ -162,14 +141,14 @@ void EditorBottomPanel::load_layout_from_config(Ref<ConfigFile> p_config_file, c
 	const LocalVector<Variant> offset_list = offsets.get_key_list();
 
 	for (const Variant &v : offset_list) {
-		dock_offsets[v] = (int)offsets[v] * EDSCALE;
+		dock_offsets[v] = offsets[v];
 	}
 	_update_center_split_offset();
 }
 
 void EditorBottomPanel::make_item_visible(Control *p_item, bool p_visible, bool p_ignore_lock) {
 	// Don't allow changing tabs involuntarily when tabs are locked.
-	if (!p_ignore_lock && lock_panel_switching) {
+	if (!p_ignore_lock && lock_panel_switching && pin_button->is_visible()) {
 		return;
 	}
 
@@ -202,7 +181,7 @@ void EditorBottomPanel::_expand_button_toggled(bool p_pressed) {
 	EditorNode::get_singleton()->update_distraction_free_button_theme();
 	if (p_pressed) {
 		distraction_free->reparent(bottom_hbox);
-		bottom_hbox->move_child(distraction_free, -3);
+		bottom_hbox->move_child(distraction_free, -2);
 	} else {
 		distraction_free->get_parent()->remove_child(distraction_free);
 		EditorSceneTabs::get_singleton()->add_extra_button(distraction_free);
@@ -268,31 +247,25 @@ void EditorBottomPanel::_on_button_visibility_changed(Button *p_button, EditorDo
 	}
 }
 
-EditorBottomPanel::EditorBottomPanel() :
-		DockTabContainer(EditorDock::DOCK_SLOT_BOTTOM) {
-	layout = EditorDock::DOCK_LAYOUT_HORIZONTAL;
-	grid_rect = Rect2i(2, 4, 4, 2);
-
+EditorBottomPanel::EditorBottomPanel() {
 	get_tab_bar()->connect("tab_changed", callable_mp(this, &EditorBottomPanel::_on_tab_changed));
 	set_tabs_position(TabPosition::POSITION_BOTTOM);
 	set_deselect_enabled(true);
-	set_theme_type_variation("BottomPanel");
 
 	bottom_hbox = memnew(HBoxContainer);
 	bottom_hbox->set_mouse_filter(MOUSE_FILTER_IGNORE);
-	get_internal_container()->add_child(bottom_hbox);
+	bottom_hbox->set_anchors_and_offsets_preset(Control::PRESET_RIGHT_WIDE);
+	get_tab_bar()->add_child(bottom_hbox);
+
+	icon_spacer = memnew(Control);
+	icon_spacer->set_mouse_filter(MOUSE_FILTER_IGNORE);
+	bottom_hbox->add_child(icon_spacer);
 
 	bottom_hbox->add_child(memnew(VSeparator));
 
 	editor_toaster = memnew(EditorToaster);
 	bottom_hbox->add_child(editor_toaster);
 
-	// NOTE: This is currently used only for ExportTemplateManager and hard-coded for that task.
-	progress_indicator = memnew(ProgressIndicator);
-	progress_indicator->set_v_size_flags(SIZE_SHRINK_CENTER);
-	progress_indicator->hide();
-	bottom_hbox->add_child(progress_indicator);
-
 	EditorVersionButton *version_btn = memnew(EditorVersionButton(EditorVersionButton::FORMAT_BASIC));
 	// Fade out the version label to be less prominent, but still readable.
 	version_btn->set_self_modulate(Color(1, 1, 1, 0.65));
@@ -303,6 +276,14 @@ EditorBottomPanel::EditorBottomPanel() :
 	Control *h_spacer = memnew(Control);
 	bottom_hbox->add_child(h_spacer);
 
+	pin_button = memnew(Button);
+	bottom_hbox->add_child(pin_button);
+	pin_button->hide();
+	pin_button->set_theme_type_variation("BottomPanelButton");
+	pin_button->set_toggle_mode(true);
+	pin_button->set_tooltip_text(TTRC("Pin Bottom Panel Switching"));
+	pin_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_pin_button_toggled));
+
 	expand_button = memnew(Button);
 	bottom_hbox->add_child(expand_button);
 	expand_button->hide();
@@ -312,13 +293,6 @@ EditorBottomPanel::EditorBottomPanel() :
 	expand_button->set_shortcut(ED_SHORTCUT_AND_COMMAND("editor/bottom_panel_expand", TTRC("Expand Bottom Panel"), KeyModifierMask::SHIFT | Key::F12));
 	expand_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_expand_button_toggled));
 
-	pin_button = memnew(Button);
-	bottom_hbox->add_child(pin_button);
-	pin_button->set_theme_type_variation("BottomPanelButton");
-	pin_button->set_toggle_mode(true);
-	pin_button->set_tooltip_text(TTRC("Pin Bottom Panel Switching"));
-	pin_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_pin_button_toggled));
-
 	callable_mp(this, &EditorBottomPanel::_repaint).call_deferred();
 }
 
@@ -327,30 +301,3 @@ EditorBottomPanel::~EditorBottomPanel() {
 		memdelete(b);
 	}
 }
-
-void ProgressIndicator::_notification(int p_what) {
-	if (p_what == NOTIFICATION_THEME_CHANGED) {
-		const Ref<Texture2D> ring_texture = get_editor_theme_icon(SNAME("ProgressRing"));
-		set_progress_texture(ring_texture);
-		set_tint_progress(get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-		set_under_texture(ring_texture);
-	}
-}
-
-void ProgressIndicator::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("clicked"));
-}
-
-void ProgressIndicator::gui_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEventMouseButton> mb = p_event;
-	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-		emit_signal("clicked");
-	}
-}
-
-ProgressIndicator::ProgressIndicator() {
-	set_fill_mode(FILL_CLOCKWISE);
-	set_tint_under(Color());
-	set_step(0.0);
-	set_max(1.0);
-}
diff --git a/engine/editor/gui/editor_bottom_panel.h b/engine/editor/gui/editor_bottom_panel.h
index e997c1cc..238ed5e6 100644
--- a/engine/editor/gui/editor_bottom_panel.h
+++ b/engine/editor/gui/editor_bottom_panel.h
@@ -30,8 +30,7 @@
 
 #pragma once
 
-#include "editor/docks/dock_tab_container.h"
-#include "scene/gui/texture_progress_bar.h"
+#include "scene/gui/tab_container.h"
 
 class Button;
 class ConfigFile;
@@ -39,27 +38,15 @@ class EditorDock;
 class EditorToaster;
 class HBoxContainer;
 
-class ProgressIndicator : public TextureProgressBar {
-	GDCLASS(ProgressIndicator, TextureProgressBar);
-
-protected:
-	void _notification(int p_what);
-	static void _bind_methods();
-
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-
-public:
-	ProgressIndicator();
-};
-
-class EditorBottomPanel : public DockTabContainer {
-	GDCLASS(EditorBottomPanel, DockTabContainer);
+class EditorBottomPanel : public TabContainer {
+	GDCLASS(EditorBottomPanel, TabContainer);
 
 	HBoxContainer *bottom_hbox = nullptr;
+	Control *icon_spacer = nullptr;
 	EditorToaster *editor_toaster = nullptr;
-	ProgressIndicator *progress_indicator = nullptr;
 	Button *pin_button = nullptr;
 	Button *expand_button = nullptr;
+	Popup *layout_popup = nullptr;
 
 	int previous_tab = -1;
 	bool lock_panel_switching = false;
@@ -80,13 +67,6 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual void dock_closed(EditorDock *p_dock) override;
-	virtual void dock_focused(EditorDock *p_dock, bool p_was_visible) override;
-	virtual void update_visibility() override { show(); } // Never hide bottom panel.
-	virtual TabStyle get_tab_style() const override;
-	virtual bool can_switch_dock() const override;
-	virtual void load_selected_tab(int p_idx) override;
-
 	void save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const;
 	void load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section);
 
@@ -99,8 +79,6 @@ public:
 	void _theme_changed();
 	bool is_locked() const { return lock_panel_switching; }
 
-	ProgressIndicator *get_progress_indicator() { return progress_indicator; }
-
 	void set_bottom_panel_offset(int p_offset);
 	int get_bottom_panel_offset();
 
diff --git a/engine/editor/gui/editor_dir_dialog.cpp b/engine/editor/gui/editor_dir_dialog.cpp
index 93936109..4b9e844e 100644
--- a/engine/editor/gui/editor_dir_dialog.cpp
+++ b/engine/editor/gui/editor_dir_dialog.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_dir_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/docks/filesystem_dock.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/gui/directory_create_dialog.h"
diff --git a/engine/editor/gui/editor_file_dialog.cpp b/engine/editor/gui/editor_file_dialog.cpp
index ef7927d0..74409ae9 100644
--- a/engine/editor/gui/editor_file_dialog.cpp
+++ b/engine/editor/gui/editor_file_dialog.cpp
@@ -31,14 +31,11 @@
 #include "editor_file_dialog.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
 #include "editor/docks/filesystem_dock.h"
+#include "editor/editor_string_names.h"
 #include "editor/file_system/dependency_editor.h"
 #include "editor/settings/editor_settings.h"
-
-#ifndef DISABLE_DEPRECATED
-#include "core/object/class_db.h"
-#endif
+#include "editor/themes/editor_scale.h"
 
 void EditorFileDialog::_item_menu_id_pressed(int p_option) {
 	// Use dependency dialog to delete the entry in the editor, but only for project files.
@@ -71,12 +68,12 @@ bool EditorFileDialog::_should_use_native_popup() const {
 	// Native file dialog on Android, returns a file URI instead of a path and does not support res://, user://, or options. This requires editor-side changes to handle properly, so disabling it for now.
 	return false;
 #else
-	return _can_use_native_popup() && (OS::get_singleton()->is_sandboxed() || EDITOR_GET("interface/editor/appearance/use_native_file_dialogs").operator bool());
+	return _can_use_native_popup() && (OS::get_singleton()->is_sandboxed() || EDITOR_GET("interface/editor/use_native_file_dialogs").operator bool());
 #endif
 }
 
 bool EditorFileDialog::_should_hide_file(const String &p_file) const {
-	if (get_access() != FileDialog::ACCESS_RESOURCES) {
+	if (Engine::get_singleton()->is_project_manager_hint()) {
 		return false;
 	}
 	const String full_path = dir_access->get_current_dir().path_join(p_file);
diff --git a/engine/editor/gui/editor_object_selector.cpp b/engine/editor/gui/editor_object_selector.cpp
index 94d758e8..759510d6 100644
--- a/engine/editor/gui/editor_object_selector.cpp
+++ b/engine/editor/gui/editor_object_selector.cpp
@@ -30,11 +30,10 @@
 
 #include "editor_object_selector.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_data.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "scene/gui/box_container.h"
+#include "editor/themes/editor_scale.h"
 #include "scene/gui/margin_container.h"
 
 Size2 EditorObjectSelector::get_minimum_size() const {
@@ -96,12 +95,11 @@ void EditorObjectSelector::_show_popup() {
 
 	sub_objects_menu->clear();
 
-	Rect2 rect = get_screen_rect();
-	rect.position.y += rect.size.height;
-	rect.size.height = 0;
+	Size2 size = get_size();
+	Point2 gp = get_screen_position();
+	gp.y += size.y;
 
-	sub_objects_menu->set_min_size(Size2(0, 0));
-	sub_objects_menu->popup(rect);
+	sub_objects_menu->popup(Rect2(gp, Size2(size.width, 0)));
 }
 
 void EditorObjectSelector::_about_to_show() {
@@ -220,7 +218,6 @@ EditorObjectSelector::EditorObjectSelector(EditorSelectionHistory *p_history) {
 	current_object_icon = memnew(TextureRect);
 	current_object_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
 	current_object_icon->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
-	current_object_icon->set_v_size_flags(SIZE_SHRINK_CENTER);
 	main_hb->add_child(current_object_icon);
 
 	current_object_label = memnew(Label);
@@ -237,7 +234,6 @@ EditorObjectSelector::EditorObjectSelector(EditorSelectionHistory *p_history) {
 	main_hb->add_child(sub_objects_icon);
 
 	sub_objects_menu = memnew(PopupMenu);
-	sub_objects_menu->set_shrink_width(false);
 	sub_objects_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	add_child(sub_objects_menu);
 	sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorObjectSelector::_about_to_show));
diff --git a/engine/editor/gui/editor_object_selector.h b/engine/editor/gui/editor_object_selector.h
index a08da5eb..7e7ace03 100644
--- a/engine/editor/gui/editor_object_selector.h
+++ b/engine/editor/gui/editor_object_selector.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"
diff --git a/engine/editor/gui/editor_quick_open_dialog.cpp b/engine/editor/gui/editor_quick_open_dialog.cpp
index 24e8f791..76371d22 100644
--- a/engine/editor/gui/editor_quick_open_dialog.cpp
+++ b/engine/editor/gui/editor_quick_open_dialog.cpp
@@ -31,14 +31,11 @@
 #include "editor_quick_open_dialog.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/string/fuzzy_search.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
+#include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_toaster.h"
@@ -149,19 +146,17 @@ String EditorQuickOpenDialog::get_dialog_title(const Vector<StringName> &p_base_
 		return TTR("Select Scene");
 	}
 
-	return vformat(TTR("Select %s"), p_base_types[0]);
+	return TTR("Select") + " " + p_base_types[0];
 }
 
-void EditorQuickOpenDialog::popup_dialog(const Vector<StringName> &p_base_types, const Callable &p_item_selected_callback, bool p_allow_type_switching) {
+void EditorQuickOpenDialog::popup_dialog(const Vector<StringName> &p_base_types, const Callable &p_item_selected_callback) {
 	ERR_FAIL_COND(p_base_types.is_empty());
 	ERR_FAIL_COND(!p_item_selected_callback.is_valid());
 
 	property_object = nullptr;
 	property_path = "";
 	item_selected_callback = p_item_selected_callback;
-	allow_type_switching = p_allow_type_switching;
 
-	is_cycling_items = false;
 	container->init(p_base_types);
 	container->set_instant_preview_toggle_visible(false);
 	_finish_dialog_setup(p_base_types);
@@ -176,7 +171,6 @@ void EditorQuickOpenDialog::popup_dialog_for_property(const Vector<StringName> &
 	property_path = p_path;
 	item_selected_callback = p_item_selected_callback;
 	initial_property_value = property_object->get(property_path);
-	allow_type_switching = false;
 
 	// Reset this, so that the property isn't updated immediately upon opening
 	// the window.
@@ -188,7 +182,6 @@ void EditorQuickOpenDialog::popup_dialog_for_property(const Vector<StringName> &
 }
 
 void EditorQuickOpenDialog::_finish_dialog_setup(const Vector<StringName> &p_base_types) {
-	set_process_shortcut_input(allow_type_switching);
 	get_ok_button()->set_disabled(container->has_nothing_selected());
 	set_title(get_dialog_title(p_base_types));
 	popup_centered_clamped(Size2(780, 650) * EDSCALE, 0.8f);
@@ -237,11 +230,8 @@ void EditorQuickOpenDialog::item_pressed(bool p_double_click) {
 }
 
 void EditorQuickOpenDialog::preview_property() {
-	ERR_FAIL_COND(container->get_selected() == ResourceUID::INVALID_ID);
-	String path = container->get_selected_path();
-
-	Ref<Resource> loaded_resource = ResourceLoader::load(path);
-	ERR_FAIL_COND_MSG(loaded_resource.is_null(), "Cannot load resource from path '" + path + "'.");
+	Ref<Resource> loaded_resource = ResourceLoader::load(container->get_selected());
+	ERR_FAIL_COND_MSG(loaded_resource.is_null(), "Cannot load resource from path '" + container->get_selected() + "'.");
 
 	Resource *res = Object::cast_to<Resource>(property_object);
 	if (res) {
@@ -284,7 +274,7 @@ void EditorQuickOpenDialog::update_property() {
 		ERR_FAIL_MSG(err_msg);
 	}
 
-	item_selected_callback.call(container->get_selected_path());
+	item_selected_callback.call(container->get_selected());
 }
 
 void EditorQuickOpenDialog::cancel_pressed() {
@@ -299,55 +289,6 @@ void EditorQuickOpenDialog::cancel_pressed() {
 	search_box->clear();
 }
 
-void EditorQuickOpenDialog::shortcut_input(const Ref<InputEvent> &p_event) {
-	// If the user is cycling through items (with up/down arrows), confirm selection when releasing the keys.
-	Ref<InputEventWithModifiers> iewm = p_event;
-	if (is_cycling_items && iewm.is_valid() && p_event->is_released() && iewm->get_modifiers_mask().is_empty()) {
-		ok_pressed();
-		return;
-	}
-
-	if (p_event.is_null() || !p_event->is_pressed() || p_event->is_echo()) {
-		return;
-	}
-
-	Vector<StringName> new_base_types;
-	if (EditorSettings *settings = EditorSettings::get_singleton()) {
-		if (settings->is_shortcut("editor/quick_open", p_event)) {
-			new_base_types.push_back("Resource");
-		} else if (settings->is_shortcut("editor/quick_open_scene", p_event)) {
-			new_base_types.push_back("PackedScene");
-		} else if (settings->is_shortcut("editor/quick_open_script", p_event)) {
-			new_base_types.push_back("Script");
-		}
-	}
-
-	if (new_base_types.size() != 1) {
-		return;
-	}
-
-	// Check if we're already showing this dialog type.
-	const Vector<StringName> &current_base_types = container->get_base_types();
-	if (current_base_types.size() == 1 && current_base_types[0] == new_base_types[0]) {
-		// Already showing the requested dialog type, move next.
-		Ref<InputEventKey> down_event = memnew(InputEventKey);
-		down_event->set_keycode(Key::DOWN);
-		down_event->set_pressed(true);
-		container->handle_search_box_input(down_event);
-		is_cycling_items = true;
-	} else {
-		// Switch to the new dialog type.
-		container->init(new_base_types);
-		container->set_instant_preview_toggle_visible(false);
-		is_cycling_items = false;
-		set_title(get_dialog_title(new_base_types));
-		search_box->clear();
-		search_box->grab_focus();
-	}
-
-	set_input_as_handled();
-}
-
 void EditorQuickOpenDialog::_search_box_text_changed(const String &p_query) {
 	container->set_query_and_update(p_query);
 	get_ok_button()->set_disabled(container->has_nothing_selected());
@@ -416,7 +357,7 @@ QuickOpenResultContainer::QuickOpenResultContainer() {
 
 			file_context_menu = memnew(PopupMenu);
 			file_context_menu->add_item(TTR("Show in FileSystem"), FILE_SHOW_IN_FILESYSTEM);
-			file_context_menu->add_item(OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_SHOW), FILE_SHOW_IN_FILE_MANAGER);
+			file_context_menu->add_item(TTR("Show in File Manager"), FILE_SHOW_IN_FILE_MANAGER);
 			file_context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &QuickOpenResultContainer::_menu_option));
 			file_context_menu->hide();
 			scroll_container->add_child(file_context_menu);
@@ -476,15 +417,12 @@ QuickOpenResultContainer::QuickOpenResultContainer() {
 }
 
 void QuickOpenResultContainer::_menu_option(int p_option) {
-	ERR_FAIL_COND(get_selected() == ResourceUID::INVALID_ID);
-	String selected_path = get_selected_path();
-
 	switch (p_option) {
 		case FILE_SHOW_IN_FILESYSTEM: {
-			FileSystemDock::get_singleton()->navigate_to_path(selected_path);
+			FileSystemDock::get_singleton()->navigate_to_path(get_selected());
 		} break;
 		case FILE_SHOW_IN_FILE_MANAGER: {
-			String dir = ProjectSettings::get_singleton()->globalize_path(selected_path);
+			String dir = ProjectSettings::get_singleton()->globalize_path(get_selected());
 			OS::get_singleton()->shell_show_in_file_manager(dir, true);
 		} break;
 	}
@@ -535,146 +473,111 @@ void QuickOpenResultContainer::init(const Vector<StringName> &p_base_types) {
 		E->enable_highlights = enable_highlights;
 	}
 
-	bool history_modified = false;
-
 	if (first_open && history_file->load(_get_cache_file_path()) == OK) {
 		// Load history when opening for the first time.
 		file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object")));
 
+		bool history_modified = false;
 		Vector<String> history_keys = history_file->get_section_keys("selected_history");
 		for (const String &type : history_keys) {
 			const StringName type_name = type;
-			const PackedStringArray history_uids = history_file->get_value("selected_history", type);
+			const PackedStringArray paths = history_file->get_value("selected_history", type);
 
-			PackedStringArray cleaned_text_uids;
-			cleaned_text_uids.resize(history_uids.size());
-
-			Vector<ResourceUID::ID> cleaned_ids;
-			cleaned_ids.resize(history_uids.size());
+			PackedStringArray cleaned_paths;
+			cleaned_paths.resize(paths.size());
 
+			Vector<QuickOpenResultCandidate> loaded_candidates;
+			loaded_candidates.resize(paths.size());
 			{
-				String *text_write = cleaned_text_uids.ptrw();
-				ResourceUID::ID *id_write = cleaned_ids.ptrw();
+				QuickOpenResultCandidate *candidates_write = loaded_candidates.ptrw();
+				String *cleanup_write = cleaned_paths.ptrw();
 				int i = 0;
-				for (String uid : history_uids) {
-#ifndef DISABLE_DEPRECATED
-					if (!uid.begins_with("uid://")) {
-						// uid might be a path here, if config was written by older editor version
-						ResourceUID::ID id = EditorFileSystem::get_singleton()->get_file_uid(uid);
-						if (id == ResourceUID::INVALID_ID) {
+				for (String path : paths) {
+					if (path.begins_with("uid://")) {
+						ResourceUID::ID id = ResourceUID::get_singleton()->text_to_id(path);
+						if (!ResourceUID::get_singleton()->has_id(id)) {
 							continue;
 						}
-						uid = ResourceUID::get_singleton()->id_to_text(id);
+						path = ResourceUID::get_singleton()->get_id_path(id);
 					}
-#endif
 
-					ResourceUID::ID id = ResourceUID::get_singleton()->text_to_id(uid);
-					if (id == ResourceUID::INVALID_ID || !ResourceUID::get_singleton()->has_id(id)) {
+					if (!ResourceLoader::exists(path)) {
 						continue;
 					}
 
-					filetypes.insert(id, type_name);
-					text_write[i] = uid;
-					id_write[i] = id;
+					filetypes.insert(path, type_name);
+					QuickOpenResultCandidate candidate;
+					_setup_candidate(candidate, path);
+					candidates_write[i] = candidate;
+					cleanup_write[i] = path;
 					i++;
 				}
+				loaded_candidates.resize(i);
+				cleaned_paths.resize(i);
+				selected_history.insert(type, loaded_candidates);
 
-				cleaned_text_uids.resize(i);
-				selected_history.insert(type, cleaned_ids);
-
-				if (i < history_uids.size()) {
+				if (i < paths.size()) {
 					// Some paths removed, need to update history.
 					if (i == 0) {
 						history_file->erase_section_key("selected_history", type);
 					} else {
-						history_file->set_value("selected_history", type, cleaned_text_uids);
+						history_file->set_value("selected_history", type, cleaned_paths);
 					}
 					history_modified = true;
 				}
 			}
 		}
-	} else if (!first_open && base_types.size() == 1) {
-		const StringName &type = base_types[0];
-		Vector<ResourceUID::ID> *history = selected_history.getptr(type);
-
-		if (history) {
-			Vector<ResourceUID::ID> clean_history;
-
-			for (const ResourceUID::ID &uid : *history) {
-				if (ResourceUID::get_singleton()->has_id(uid)) {
-					clean_history.push_back(uid);
-				} else {
-					history_modified = true;
-				}
-			}
-
-			if (clean_history.is_empty()) {
-				selected_history.erase(type);
-			} else if (history_modified) {
-				*history = clean_history;
-			}
+		if (history_modified) {
+			history_file->save(_get_cache_file_path());
 		}
 	}
 
-	if (history_modified) {
-		history_file->save(_get_cache_file_path());
-	}
-
 	_create_initial_results();
 }
 
-void QuickOpenResultContainer::_sort_uids(int p_max_results) {
+void QuickOpenResultContainer::_sort_filepaths(int p_max_results) {
 	struct FilepathComparator {
-		bool operator()(const ResourceUID::ID &p_lhs, const ResourceUID::ID &p_rhs) const {
-			String lhs_path = ResourceUID::get_singleton()->get_id_path(p_lhs);
-			String rhs_path = ResourceUID::get_singleton()->get_id_path(p_rhs);
-
+		bool operator()(const String &p_lhs, const String &p_rhs) const {
 			// Sort on (length, alphanumeric) to prioritize shorter filepaths
-			return lhs_path.length() == rhs_path.length() ? lhs_path < rhs_path : lhs_path.length() < rhs_path.length();
+			return p_lhs.length() == p_rhs.length() ? p_lhs < p_rhs : p_lhs.length() < p_rhs.length();
 		}
 	};
 
-	SortArray<ResourceUID::ID, FilepathComparator> sorter{};
-
-	if ((int)uids.size() > p_max_results) {
-		sorter.partial_sort(0, uids.size(), p_max_results, uids.ptr());
+	SortArray<String, FilepathComparator> sorter;
+	if (filepaths.size() > p_max_results) {
+		sorter.partial_sort(0, filepaths.size(), p_max_results, filepaths.ptrw());
 	} else {
-		sorter.sort(uids.ptr(), uids.size());
+		sorter.sort(filepaths.ptrw(), filepaths.size());
 	}
 }
 
 void QuickOpenResultContainer::_create_initial_results() {
 	file_type_icons.clear();
 	file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object")));
-	uids.clear();
+	filepaths.clear();
 	filetypes.clear();
 	history_set.clear();
-
-	Vector<ResourceUID::ID> *history = _get_history();
+	Vector<QuickOpenResultCandidate> *history = _get_history();
 	if (history) {
-		for (const ResourceUID::ID &uid : *history) {
-			history_set.insert(uid);
+		for (const QuickOpenResultCandidate &candidate : *history) {
+			history_set.insert(candidate.file_path);
 		}
 	}
-
-	_find_uids_in_folder(EditorFileSystem::get_singleton()->get_filesystem(), include_addons_toggle->is_pressed());
-	_sort_uids(result_items.size());
-	max_total_results = MIN(uids.size(), result_items.size());
+	_find_filepaths_in_folder(EditorFileSystem::get_singleton()->get_filesystem(), include_addons_toggle->is_pressed());
+	_sort_filepaths(result_items.size());
+	max_total_results = MIN(filepaths.size(), result_items.size());
 	update_results();
 }
 
-void QuickOpenResultContainer::_find_uids_in_folder(EditorFileSystemDirectory *p_directory, bool p_include_addons) {
+void QuickOpenResultContainer::_find_filepaths_in_folder(EditorFileSystemDirectory *p_directory, bool p_include_addons) {
 	for (int i = 0; i < p_directory->get_subdir_count(); i++) {
 		if (p_include_addons || p_directory->get_name() != "addons") {
-			_find_uids_in_folder(p_directory->get_subdir(i), p_include_addons);
+			_find_filepaths_in_folder(p_directory->get_subdir(i), p_include_addons);
 		}
 	}
 
 	for (int i = 0; i < p_directory->get_file_count(); i++) {
-		ResourceUID::ID uid = p_directory->get_file_uid(i);
-		if (uid == ResourceUID::INVALID_ID) {
-			continue;
-		}
+		String file_path = p_directory->get_file_path(i);
 
 		const StringName engine_type = p_directory->get_file_type(i);
 		const StringName script_type = p_directory->get_file_resource_script_class(i);
@@ -686,8 +589,8 @@ void QuickOpenResultContainer::_find_uids_in_folder(EditorFileSystemDirectory *p
 			bool is_valid = ClassDB::is_parent_class(engine_type, parent_type) || (!is_engine_type && EditorNode::get_editor_data().script_class_is_parent(script_type, parent_type));
 
 			if (is_valid) {
-				uids.push_back(uid);
-				filetypes.insert(uid, actual_type);
+				filepaths.append(file_path);
+				filetypes.insert(file_path, actual_type);
 				break; // Stop testing base types as soon as we get a match.
 			}
 		}
@@ -699,53 +602,26 @@ void QuickOpenResultContainer::set_query_and_update(const String &p_query) {
 	update_results();
 }
 
-Vector<ResourceUID::ID> *QuickOpenResultContainer::_get_history() {
+Vector<QuickOpenResultCandidate> *QuickOpenResultContainer::_get_history() {
 	if (base_types.size() == 1) {
 		return selected_history.getptr(base_types[0]);
 	}
 	return nullptr;
 }
 
-QuickOpenResultCandidate QuickOpenResultCandidate::from_uid(const ResourceUID::ID &p_uid, bool &r_success) {
-	if (p_uid == ResourceUID::INVALID_ID || !ResourceUID::get_singleton()->has_id(p_uid)) {
-		r_success = false;
-		return QuickOpenResultCandidate();
-	}
-
-	QuickOpenResultCandidate candidate;
-	candidate.uid = p_uid;
-	candidate.result = nullptr;
-	r_success = true;
-	return candidate;
-}
-
-QuickOpenResultCandidate QuickOpenResultCandidate::from_result(const FuzzySearchResult &p_result, bool &r_success) {
-	ResourceUID::ID uid = EditorFileSystem::get_singleton()->get_file_uid(p_result.target);
-
-	QuickOpenResultCandidate candidate = from_uid(uid, r_success);
-	if (!r_success) {
-		return QuickOpenResultCandidate();
-	}
-
-	candidate.result = &p_result;
-	return candidate;
-}
-
-void QuickOpenResultContainer::_add_candidate(QuickOpenResultCandidate &p_candidate) {
-	ERR_FAIL_COND(!ResourceUID::get_singleton()->has_id(p_candidate.uid));
-
+void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_candidate, const String &p_filepath) {
+	p_candidate.file_path = ResourceUID::ensure_path(p_filepath);
+	p_candidate.result = nullptr;
 	StringName actual_type;
 	{
-		StringName *actual_type_ptr = filetypes.getptr(p_candidate.uid);
+		StringName *actual_type_ptr = filetypes.getptr(p_filepath);
 		if (actual_type_ptr) {
 			actual_type = *actual_type_ptr;
 		} else {
-			ERR_PRINT(vformat("EditorQuickOpenDialog: No type for path %s.", ResourceUID::get_singleton()->get_id_path(p_candidate.uid)));
+			ERR_PRINT(vformat("EditorQuickOpenDialog: No type for path %s.", p_candidate.file_path));
 		}
 	}
-
-	String file_path = ResourceUID::get_singleton()->get_id_path(p_candidate.uid);
-	EditorResourcePreview::PreviewItem item = EditorResourcePreview::get_singleton()->get_resource_preview_if_available(file_path);
+	EditorResourcePreview::PreviewItem item = EditorResourcePreview::get_singleton()->get_resource_preview_if_available(p_candidate.file_path);
 	if (item.preview.is_valid()) {
 		p_candidate.thumbnail = item.preview;
 	} else if (file_type_icons.has(actual_type)) {
@@ -756,54 +632,46 @@ void QuickOpenResultContainer::_add_candidate(QuickOpenResultCandidate &p_candid
 	} else {
 		p_candidate.thumbnail = *file_type_icons.getptr(SNAME("__default_icon"));
 	}
+}
 
-	candidates.push_back(p_candidate);
-	candidates_uids.insert(p_candidate.uid);
+void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_candidate, const FuzzySearchResult &p_result) {
+	_setup_candidate(p_candidate, p_result.target);
+	p_candidate.result = &p_result;
 }
 
 void QuickOpenResultContainer::update_results() {
 	candidates.clear();
-	candidates_uids.clear();
-
 	if (query.is_empty()) {
 		_use_default_candidates();
 	} else {
 		_score_and_sort_candidates();
 	}
-
 	_update_result_items(MIN(candidates.size(), max_total_results), 0);
 }
 
 void QuickOpenResultContainer::_use_default_candidates() {
-	HashSet<ResourceUID::ID> existing_uids;
-
-	Vector<ResourceUID::ID> *history = _get_history();
+	HashSet<String> existing_paths;
+	Vector<QuickOpenResultCandidate> *history = _get_history();
 	if (history) {
-		for (const ResourceUID::ID &uid : *history) {
-			bool success;
-			QuickOpenResultCandidate candidate = QuickOpenResultCandidate::from_uid(uid, success);
-			if (!success) {
-				continue;
-			}
-			_add_candidate(candidate);
+		candidates.append_array(*history);
+		for (const QuickOpenResultCandidate &candi : *history) {
+			existing_paths.insert(candi.file_path);
 		}
 	}
+	int i = candidates.size();
 
-	for (const ResourceUID::ID &uid : uids) {
-		if (candidates.size() >= max_total_results) {
+	candidates.resize(MIN(max_total_results, filepaths.size()));
+	QuickOpenResultCandidate *candidates_w = candidates.ptrw();
+	int count = candidates.size();
+
+	for (const String &filepath : filepaths) {
+		if (i >= count) {
 			break;
 		}
-		if (candidates_uids.has(uid)) {
+		if (existing_paths.has(filepath)) {
 			continue;
 		}
-
-		bool success;
-		QuickOpenResultCandidate candidate = QuickOpenResultCandidate::from_uid(uid, success);
-		if (!success) {
-			continue;
-		}
-
-		_add_candidate(candidate);
+		_setup_candidate(candidates_w[i++], filepath);
 	}
 }
 
@@ -816,28 +684,15 @@ void QuickOpenResultContainer::_update_fuzzy_search_results() {
 	int max_misses = EDITOR_GET("filesystem/quick_open_dialog/max_fuzzy_misses");
 	fuzzy_search.allow_subsequences = fuzzy_matching;
 	fuzzy_search.max_misses = fuzzy_matching ? max_misses : 0;
-
-	PackedStringArray paths;
-	paths.reserve_exact(uids.size());
-
-	for (const ResourceUID::ID &uid : uids) {
-		paths.push_back(ResourceUID::get_singleton()->get_id_path(uid));
-	}
-
-	fuzzy_search.search_all(paths, search_results);
+	fuzzy_search.search_all(filepaths, search_results);
 }
 
 void QuickOpenResultContainer::_score_and_sort_candidates() {
 	_update_fuzzy_search_results();
-
+	candidates.resize(search_results.size());
+	QuickOpenResultCandidate *candidates_write = candidates.ptrw();
 	for (const FuzzySearchResult &result : search_results) {
-		bool success;
-		QuickOpenResultCandidate candidate = QuickOpenResultCandidate::from_result(result, success);
-		if (!success) {
-			continue;
-		}
-
-		_add_candidate(candidate);
+		_setup_candidate(*candidates_write++, result);
 	}
 }
 
@@ -863,7 +718,7 @@ void QuickOpenResultContainer::_update_result_items(int p_new_visible_results_co
 	no_results_container->set_visible(!any_results);
 
 	if (!any_results) {
-		if (uids.is_empty()) {
+		if (filepaths.is_empty()) {
 			no_results_label->set_text(TTR("No files found for this type"));
 		} else {
 			no_results_label->set_text(TTR("No results found"));
@@ -960,8 +815,8 @@ void QuickOpenResultContainer::_select_item(int p_index) {
 	}
 
 	result_items[selection_index]->highlight_item(true);
-	bool in_history = history_set.has(candidates[selection_index].uid);
-	file_details_path->set_text(get_selected_path() + (in_history ? TTR(" (recently opened)") : ""));
+	bool in_history = history_set.has(candidates[selection_index].file_path);
+	file_details_path->set_text(get_selected() + (in_history ? TTR(" (recently opened)") : ""));
 
 	emit_signal(SNAME("selection_changed"));
 
@@ -1071,20 +926,9 @@ bool QuickOpenResultContainer::has_nothing_selected() const {
 	return selection_index < 0;
 }
 
-ResourceUID::ID QuickOpenResultContainer::get_selected() const {
-	ERR_FAIL_COND_V_MSG(has_nothing_selected(), ResourceUID::INVALID_ID, "Tried to get selected file, but nothing was selected.");
-	return candidates[selection_index].uid;
-}
-
-String QuickOpenResultContainer::get_selected_path() const {
-	ERR_FAIL_COND_V_MSG(has_nothing_selected(), "", "Tried to get selected file path, but nothing was selected.");
-	String path = ResourceUID::get_singleton()->get_id_path(candidates[selection_index].uid);
-	ERR_FAIL_COND_V_MSG(path.is_empty(), "", "Failed to get selected file path.");
-	return path;
-}
-
-const Vector<StringName> &QuickOpenResultContainer::get_base_types() const {
-	return base_types;
+String QuickOpenResultContainer::get_selected() const {
+	ERR_FAIL_COND_V_MSG(has_nothing_selected(), String(), "Tried to get selected file, but nothing was selected.");
+	return candidates[selection_index].file_path;
 }
 
 QuickOpenDisplayMode QuickOpenResultContainer::get_adaptive_display_mode(const Vector<StringName> &p_base_types) {
@@ -1127,39 +971,40 @@ void QuickOpenResultContainer::save_selected_item() {
 	}
 
 	const StringName &base_type = base_types[0];
-	ResourceUID::ID selected = get_selected();
-	Vector<ResourceUID::ID> *type_history = selected_history.getptr(base_type);
+	QuickOpenResultCandidate &selected = candidates.write[selection_index];
+	Vector<QuickOpenResultCandidate> *type_history = selected_history.getptr(base_type);
 
 	if (!type_history) {
-		selected_history.insert(base_type, Vector<ResourceUID::ID>());
+		selected_history.insert(base_type, Vector<QuickOpenResultCandidate>());
 		type_history = selected_history.getptr(base_type);
 	} else {
 		for (int i = 0; i < type_history->size(); i++) {
-			if (selected == type_history->get(i)) {
+			if (selected.file_path == type_history->get(i).file_path) {
 				type_history->remove_at(i);
 				break;
 			}
 		}
 	}
 
-	history_set.insert(selected);
+	selected.result = nullptr;
+	history_set.insert(selected.file_path);
 	type_history->insert(0, selected);
 	if (type_history->size() > MAX_HISTORY_SIZE) {
 		type_history->resize(MAX_HISTORY_SIZE);
 	}
 
-	PackedStringArray history_uids;
-	history_uids.resize(type_history->size());
+	PackedStringArray paths;
+	paths.resize(type_history->size());
 	{
-		String *uids_write = history_uids.ptrw();
+		String *paths_write = paths.ptrw();
 
 		int i = 0;
-		for (const ResourceUID::ID &uid : *type_history) {
-			uids_write[i] = ResourceUID::get_singleton()->id_to_text(uid);
+		for (const QuickOpenResultCandidate &candidate : *type_history) {
+			paths_write[i] = _get_uid_string(candidate.file_path);
 			i++;
 		}
 	}
-	history_file->set_value("selected_history", base_type, history_uids);
+	history_file->set_value("selected_history", base_type, paths);
 	history_file->save(_get_cache_file_path());
 }
 
@@ -1355,10 +1200,8 @@ QuickOpenResultListItem::QuickOpenResultListItem() {
 
 void QuickOpenResultListItem::set_content(const QuickOpenResultCandidate &p_candidate, bool p_highlight) {
 	thumbnail->set_texture(p_candidate.thumbnail);
-
-	String file_path = ResourceUID::get_singleton()->get_id_path(p_candidate.uid);
-	name->set_text(file_path.get_file());
-	path->set_text(file_path.get_base_dir());
+	name->set_text(p_candidate.file_path.get_file());
+	path->set_text(p_candidate.file_path.get_base_dir());
 	name->reset_highlights();
 	path->reset_highlights();
 
@@ -1428,10 +1271,8 @@ QuickOpenResultGridItem::QuickOpenResultGridItem() {
 
 void QuickOpenResultGridItem::set_content(const QuickOpenResultCandidate &p_candidate, bool p_highlight) {
 	thumbnail->set_texture(p_candidate.thumbnail);
-
-	String file_path = ResourceUID::get_singleton()->get_id_path(p_candidate.uid);
-	name->set_text(file_path.get_file());
-	name->set_tooltip_text(file_path);
+	name->set_text(p_candidate.file_path.get_file());
+	name->set_tooltip_text(p_candidate.file_path);
 	name->reset_highlights();
 
 	if (p_highlight && p_candidate.result != nullptr) {
diff --git a/engine/editor/gui/editor_quick_open_dialog.h b/engine/editor/gui/editor_quick_open_dialog.h
index ea5f7ff9..025b0f4e 100644
--- a/engine/editor/gui/editor_quick_open_dialog.h
+++ b/engine/editor/gui/editor_quick_open_dialog.h
@@ -60,12 +60,9 @@ enum class QuickOpenDisplayMode {
 };
 
 struct QuickOpenResultCandidate {
-	ResourceUID::ID uid;
+	String file_path;
 	Ref<Texture2D> thumbnail;
 	const FuzzySearchResult *result = nullptr;
-
-	static QuickOpenResultCandidate from_uid(const ResourceUID::ID &p_uid, bool &r_success);
-	static QuickOpenResultCandidate from_result(const FuzzySearchResult &p_result, bool &r_success);
 };
 
 class HighlightedLabel : public Label {
@@ -98,9 +95,7 @@ public:
 	void update_results();
 
 	bool has_nothing_selected() const;
-	ResourceUID::ID get_selected() const;
-	String get_selected_path() const;
-	const Vector<StringName> &get_base_types() const;
+	String get_selected() const;
 
 	bool is_instant_preview_enabled() const;
 	void set_instant_preview_toggle_visible(bool p_visible);
@@ -118,13 +113,12 @@ private:
 
 	Vector<FuzzySearchResult> search_results;
 	Vector<StringName> base_types;
-	LocalVector<ResourceUID::ID> uids;
-	AHashMap<ResourceUID::ID, StringName> filetypes;
+	Vector<String> filepaths;
+	AHashMap<String, StringName> filetypes;
 	Vector<QuickOpenResultCandidate> candidates;
-	HashSet<ResourceUID::ID> candidates_uids;
 
-	AHashMap<StringName, Vector<ResourceUID::ID>> selected_history;
-	HashSet<ResourceUID::ID> history_set;
+	AHashMap<StringName, Vector<QuickOpenResultCandidate>> selected_history;
+	HashSet<String> history_set;
 
 	String query;
 	int selection_index = -1;
@@ -157,12 +151,13 @@ private:
 	static QuickOpenDisplayMode get_adaptive_display_mode(const Vector<StringName> &p_base_types);
 
 	void _ensure_result_vector_capacity();
-	void _sort_uids(int p_max_results);
+	void _sort_filepaths(int p_max_results);
 	void _create_initial_results();
-	void _find_uids_in_folder(EditorFileSystemDirectory *p_directory, bool p_include_addons);
+	void _find_filepaths_in_folder(EditorFileSystemDirectory *p_directory, bool p_include_addons);
 
-	Vector<ResourceUID::ID> *_get_history();
-	void _add_candidate(QuickOpenResultCandidate &p_candidate);
+	Vector<QuickOpenResultCandidate> *_get_history();
+	void _setup_candidate(QuickOpenResultCandidate &p_candidate, const String &p_filepath);
+	void _setup_candidate(QuickOpenResultCandidate &p_candidate, const FuzzySearchResult &p_result);
 	void _update_fuzzy_search_results();
 	void _use_default_candidates();
 	void _score_and_sort_candidates();
@@ -261,14 +256,13 @@ class EditorQuickOpenDialog : public AcceptDialog {
 	GDCLASS(EditorQuickOpenDialog, AcceptDialog);
 
 public:
-	void popup_dialog(const Vector<StringName> &p_base_types, const Callable &p_item_selected_callback, bool p_allow_type_switching = false);
+	void popup_dialog(const Vector<StringName> &p_base_types, const Callable &p_item_selected_callback);
 	void popup_dialog_for_property(const Vector<StringName> &p_base_types, Object *p_obj, const StringName &p_path, const Callable &p_item_selected_callback);
 	EditorQuickOpenDialog();
 
 protected:
 	virtual void cancel_pressed() override;
 	virtual void ok_pressed() override;
-	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
 	void item_pressed(bool p_double_click);
 	void selection_changed();
 
@@ -284,8 +278,6 @@ private:
 	StringName property_path;
 	Variant initial_property_value;
 	bool initial_selection_performed = false;
-	bool allow_type_switching = false;
-	bool is_cycling_items = false;
 	bool _is_instant_preview_active() const;
 	void _search_box_text_changed(const String &p_query);
 	void _finish_dialog_setup(const Vector<StringName> &p_base_types);
diff --git a/engine/editor/gui/editor_spin_slider.cpp b/engine/editor/gui/editor_spin_slider.cpp
index f0e569d4..9865b5f5 100644
--- a/engine/editor/gui/editor_spin_slider.cpp
+++ b/engine/editor/gui/editor_spin_slider.cpp
@@ -30,13 +30,9 @@
 
 #include "editor_spin_slider.h"
 
-#include "core/config/engine.h"
 #include "core/input/input.h"
 #include "core/math/expression.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
@@ -95,12 +91,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 				}
 				_grab_start();
 			} else {
-				bool grabbing = grabbing_spinner;
 				_grab_end();
-
-				if (deferred_drag_mode && grabbing) {
-					_notify_shared_value_changed(); // Need to be emitted at the end, since the signal doesn't emitted in `set_value_no_signal` method.
-				}
 			}
 		} else if (mb->get_button_index() == MouseButton::RIGHT) {
 			if (mb->is_pressed() && is_grabbing()) {
@@ -124,7 +115,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 			grabbing_spinner_dist_cache += diff_x * grabbing_spinner_speed;
 
 			if (!grabbing_spinner && Math::abs(grabbing_spinner_dist_cache) > 4 * grabbing_spinner_speed * EDSCALE) {
-				Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+				Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 				grabbing_spinner = true;
 			}
 
@@ -141,13 +132,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 				const double default_float_step = EDITOR_GET("interface/inspector/default_float_step");
 				const double drag_step = MAX(get_step(), default_float_step);
 				const double new_value = pre_grab_value + drag_step * grabbing_spinner_dist_cache;
-
-				double val = (mm->is_command_or_control_pressed() && !editing_integer) ? Math::round(new_value) : new_value;
-				if (deferred_drag_mode) {
-					set_value_no_signal(val);
-				} else {
-					set_value(val);
-				}
+				set_value((mm->is_command_or_control_pressed() && !editing_integer) ? Math::round(new_value) : new_value);
 			}
 		} else if (updown_offset != -1) {
 			bool new_hover = (!is_layout_rtl() && mm->get_position().x > updown_offset) || (is_layout_rtl() && mm->get_position().x < updown_offset);
@@ -184,7 +169,7 @@ void EditorSpinSlider::_grab_start() {
 void EditorSpinSlider::_grab_end() {
 	if (grabbing_spinner_attempt) {
 		if (grabbing_spinner) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			Input::get_singleton()->warp_mouse(grabbing_spinner_mouse_pos);
 			mouse_over_grabber = true;
 			queue_redraw();
@@ -511,7 +496,7 @@ void EditorSpinSlider::_notification(int p_what) {
 		case NOTIFICATION_EXIT_TREE: {
 			if (grabbing_spinner) {
 				grabber->hide();
-				Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+				Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 				Input::get_singleton()->warp_mouse(grabbing_spinner_mouse_pos);
 				grabbing_spinner = false;
 				grabbing_spinner_attempt = false;
@@ -596,10 +581,6 @@ String EditorSpinSlider::get_suffix() const {
 }
 
 void EditorSpinSlider::_evaluate_input_text() {
-	if (value_input->get_text().is_empty()) {
-		set_value(0);
-		return;
-	}
 	const String &lang = _get_locale();
 
 	Ref<Expression> expr;
@@ -708,14 +689,6 @@ bool EditorSpinSlider::is_grabbing() const {
 	return grabbing_grabber || grabbing_spinner;
 }
 
-void EditorSpinSlider::set_deferred_drag_mode_enabled(bool p_enabled) {
-	deferred_drag_mode = p_enabled;
-}
-
-bool EditorSpinSlider::is_deferred_drag_mode_enabled() const {
-	return deferred_drag_mode;
-}
-
 void EditorSpinSlider::_focus_entered(bool p_hide_focus) {
 	if (read_only) {
 		return;
@@ -754,9 +727,6 @@ void EditorSpinSlider::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_editing_integer", "editing_integer"), &EditorSpinSlider::set_editing_integer);
 	ClassDB::bind_method(D_METHOD("is_editing_integer"), &EditorSpinSlider::is_editing_integer);
 
-	ClassDB::bind_method(D_METHOD("set_deferred_drag_mode_enabled", "enabled"), &EditorSpinSlider::set_deferred_drag_mode_enabled, DEFVAL(true));
-	ClassDB::bind_method(D_METHOD("is_deferred_drag_mode_enabled"), &EditorSpinSlider::is_deferred_drag_mode_enabled);
-
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "label"), "set_label", "get_label");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "suffix"), "set_suffix", "get_suffix");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "read_only"), "set_read_only", "is_read_only");
@@ -766,7 +736,6 @@ void EditorSpinSlider::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hide_slider"), "set_hide_slider", "is_hiding_slider");
 #endif
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editing_integer"), "set_editing_integer", "is_editing_integer");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "deferred_drag_mode"), "set_deferred_drag_mode_enabled", "is_deferred_drag_mode_enabled");
 
 	BIND_ENUM_CONSTANT(CONTROL_STATE_DEFAULT);
 	BIND_ENUM_CONSTANT(CONTROL_STATE_PREFER_SLIDER);
diff --git a/engine/editor/gui/editor_spin_slider.h b/engine/editor/gui/editor_spin_slider.h
index c4635362..dbb8149f 100644
--- a/engine/editor/gui/editor_spin_slider.h
+++ b/engine/editor/gui/editor_spin_slider.h
@@ -66,7 +66,6 @@ class EditorSpinSlider : public Range {
 	uint64_t value_input_closed_frame = 0;
 	bool value_input_dirty = false;
 	bool value_input_focus_visible = false;
-	bool deferred_drag_mode = false;
 
 public:
 	enum ControlState {
@@ -138,8 +137,6 @@ public:
 	bool is_flat() const;
 
 	bool is_grabbing() const;
-	void set_deferred_drag_mode_enabled(bool p_enabled = true);
-	bool is_deferred_drag_mode_enabled() const;
 
 	void setup_and_show() { _focus_entered(); }
 	LineEdit *get_line_edit();
diff --git a/engine/editor/gui/editor_title_bar.cpp b/engine/editor/gui/editor_title_bar.cpp
index 6e15c9ab..145d85b3 100644
--- a/engine/editor/gui/editor_title_bar.cpp
+++ b/engine/editor/gui/editor_title_bar.cpp
@@ -30,11 +30,6 @@
 
 #include "editor_title_bar.h"
 
-#include "core/object/callable_mp.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-#include "servers/display/display_server.h"
-
 void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	if (!can_move) {
 		return;
@@ -59,7 +54,7 @@ void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 		if (w) {
 			if (mb->get_button_index() == MouseButton::LEFT) {
 				if (mb->is_pressed()) {
-					if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_WINDOW_DRAG)) {
+					if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_WINDOW_DRAG)) {
 						DisplayServer::get_singleton()->window_start_drag(w->get_window_id());
 					} else {
 						click_pos = DisplayServer::get_singleton()->mouse_get_position() - w->get_position();
diff --git a/engine/editor/gui/editor_title_bar.h b/engine/editor/gui/editor_title_bar.h
index d0f77e25..0041c0fe 100644
--- a/engine/editor/gui/editor_title_bar.h
+++ b/engine/editor/gui/editor_title_bar.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/gui/box_container.h"
+#include "scene/main/window.h"
 
 class EditorTitleBar : public HBoxContainer {
 	GDCLASS(EditorTitleBar, HBoxContainer);
diff --git a/engine/editor/gui/editor_toaster.cpp b/engine/editor/gui/editor_toaster.cpp
index abff2708..13974e31 100644
--- a/engine/editor/gui/editor_toaster.cpp
+++ b/engine/editor/gui/editor_toaster.cpp
@@ -30,9 +30,6 @@
 
 #include "editor_toaster.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
@@ -40,7 +37,6 @@
 #include "scene/gui/label.h"
 #include "scene/gui/panel_container.h"
 #include "scene/resources/style_box_flat.h"
-#include "servers/display/display_server.h"
 
 EditorToaster *EditorToaster::singleton = nullptr;
 
@@ -168,7 +164,7 @@ void EditorToaster::_error_handler_impl(const String &p_file, int p_line, const
 	bool in_dev = false;
 #endif
 
-	int show_all_setting = EDITOR_GET("interface/editor/behavior/show_internal_errors_in_toast_notifications");
+	int show_all_setting = EDITOR_GET("interface/editor/show_internal_errors_in_toast_notifications");
 
 	if (p_editor_notify || (show_all_setting == 0 && in_dev) || show_all_setting == 1) {
 		String err_str = !p_errorexp.is_empty() ? p_errorexp : p_error;
diff --git a/engine/editor/gui/editor_validation_panel.cpp b/engine/editor/gui/editor_validation_panel.cpp
index 7ae0ae2c..11a77632 100644
--- a/engine/editor/gui/editor_validation_panel.cpp
+++ b/engine/editor/gui/editor_validation_panel.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_validation_panel.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
@@ -43,7 +42,7 @@ void EditorValidationPanel::_update() {
 	}
 
 	valid = true;
-	update_callback.call();
+	update_callback.callv(Array());
 
 	if (accept_button) {
 		accept_button->set_disabled(!valid);
@@ -53,25 +52,11 @@ void EditorValidationPanel::_update() {
 
 void EditorValidationPanel::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			if (is_visible_in_tree()) {
-				update();
-			} else {
-				pending_update = true;
-			}
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			theme_cache.valid_color = get_theme_color(SNAME("success_color"), EditorStringName(Editor));
 			theme_cache.warning_color = get_theme_color(SNAME("warning_color"), EditorStringName(Editor));
 			theme_cache.error_color = get_theme_color(SNAME("error_color"), EditorStringName(Editor));
 		} break;
-
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			if (is_visible_in_tree() && pending_update) {
-				_update();
-			}
-		} break;
 	}
 }
 
@@ -80,11 +65,10 @@ void EditorValidationPanel::add_line(int p_id, const String &p_valid_message) {
 
 	Label *label = memnew(Label);
 	label->set_focus_mode(FOCUS_ACCESSIBILITY);
+	message_container->add_child(label);
 	label->set_custom_minimum_size(Size2(200 * EDSCALE, 0));
 	label->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
 	label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
-	label->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	message_container->add_child(label);
 
 	valid_messages[p_id] = p_valid_message;
 	labels[p_id] = label;
@@ -105,10 +89,7 @@ void EditorValidationPanel::update() {
 		return;
 	}
 	pending_update = true;
-
-	if (is_visible_in_tree()) {
-		callable_mp(this, &EditorValidationPanel::_update).call_deferred();
-	}
+	callable_mp(this, &EditorValidationPanel::_update).call_deferred();
 }
 
 void EditorValidationPanel::set_message(int p_id, const String &p_text, MessageType p_type, bool p_auto_prefix) {
@@ -122,9 +103,9 @@ void EditorValidationPanel::set_message(int p_id, const String &p_text, MessageT
 	label->show();
 
 	if (p_auto_prefix) {
-		label->set_text(String(U"•  ") + TTR(p_text));
+		label->set_text(String(U"•  ") + p_text);
 	} else {
-		label->set_text(TTR(p_text));
+		label->set_text(p_text);
 	}
 
 	switch (p_type) {
diff --git a/engine/editor/gui/editor_version_button.cpp b/engine/editor/gui/editor_version_button.cpp
index b0a2db53..17c82b78 100644
--- a/engine/editor/gui/editor_version_button.cpp
+++ b/engine/editor/gui/editor_version_button.cpp
@@ -32,7 +32,6 @@
 
 #include "core/os/time.h"
 #include "core/version.h"
-#include "servers/display/display_server.h"
 
 String _get_version_string(EditorVersionButton::VersionFormat p_format) {
 	String main;
diff --git a/engine/editor/gui/editor_zoom_widget.cpp b/engine/editor/gui/editor_zoom_widget.cpp
index c7c9b300..610fbcb5 100644
--- a/engine/editor/gui/editor_zoom_widget.cpp
+++ b/engine/editor/gui/editor_zoom_widget.cpp
@@ -30,9 +30,6 @@
 
 #include "editor_zoom_widget.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/gui/filter_line_edit.cpp b/engine/editor/gui/filter_line_edit.cpp
deleted file mode 100644
index 93dbed91..00000000
--- a/engine/editor/gui/filter_line_edit.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************/
-/*  filter_line_edit.cpp                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "filter_line_edit.h"
-
-void FilterLineEdit::_notification(int p_what) {
-	if (p_what == NOTIFICATION_THEME_CHANGED) {
-		set_right_icon(get_editor_theme_icon(SNAME("Search")));
-	}
-}
-
-void FilterLineEdit::gui_input(const Ref<InputEvent> &p_event) {
-	ERR_FAIL_NULL(forward_control);
-
-	Ref<InputEventKey> key = p_event;
-	if (key.is_null()) {
-		LineEdit::gui_input(p_event);
-		return;
-	}
-
-	// Redirect navigational key events to the control.
-	if (key->is_action(SNAME("ui_up"), true) || key->is_action(SNAME("ui_down"), true) || key->is_action(SNAME("ui_page_up")) || key->is_action(SNAME("ui_page_down"))) {
-		forward_control->gui_input(key);
-		accept_event();
-		return;
-	}
-	LineEdit::gui_input(p_event);
-}
-
-void FilterLineEdit::set_forward_control(Control *p_control) {
-	ERR_FAIL_NULL(p_control);
-	forward_control = p_control;
-}
-
-FilterLineEdit::FilterLineEdit() {
-	set_clear_button_enabled(true);
-}
diff --git a/engine/editor/gui/progress_dialog.cpp b/engine/editor/gui/progress_dialog.cpp
index de137375..ecc34fb0 100644
--- a/engine/editor/gui/progress_dialog.cpp
+++ b/engine/editor/gui/progress_dialog.cpp
@@ -30,13 +30,12 @@
 
 #include "progress_dialog.h"
 
-#include "core/object/callable_mp.h"
 #include "core/os/os.h"
+#include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
 #include "scene/gui/panel_container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/display/display_server.h"
 
@@ -287,7 +286,7 @@ ProgressDialog::ProgressDialog() {
 	// We want to cover the entire screen to prevent the user from interacting with the Editor.
 	set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 	// Be sure it's the top most component.
-	set_z_index(RSE::CANVAS_ITEM_Z_MAX);
+	set_z_index(RS::CANVAS_ITEM_Z_MAX);
 	singleton = this;
 	hide();
 
diff --git a/engine/editor/gui/touch_actions_panel.cpp b/engine/editor/gui/touch_actions_panel.cpp
index a2017eb7..854a9f6a 100644
--- a/engine/editor/gui/touch_actions_panel.cpp
+++ b/engine/editor/gui/touch_actions_panel.cpp
@@ -31,14 +31,13 @@
 #include "touch_actions_panel.h"
 
 #include "core/input/input.h"
-#include "core/object/callable_mp.h"
+#include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/style_box_flat.h"
-#include "servers/display/display_server.h"
 
 void TouchActionsPanel::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/editor/gui/window_wrapper.cpp b/engine/editor/gui/window_wrapper.cpp
index faba981d..833e3ec7 100644
--- a/engine/editor/gui/window_wrapper.cpp
+++ b/engine/editor/gui/window_wrapper.cpp
@@ -30,8 +30,6 @@
 
 #include "window_wrapper.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/progress_dialog.h"
@@ -42,10 +40,39 @@
 #include "scene/gui/panel.h"
 #include "scene/gui/popup.h"
 #include "scene/main/window.h"
-#include "servers/display/display_server.h"
 
 // WindowWrapper
 
+// Capture all shortcut events not handled by other nodes.
+class ShortcutBin : public Node {
+	GDCLASS(ShortcutBin, Node);
+
+	virtual void _notification(int what) {
+		switch (what) {
+			case NOTIFICATION_READY:
+				set_process_shortcut_input(true);
+				break;
+		}
+	}
+
+	virtual void shortcut_input(const Ref<InputEvent> &p_event) override {
+		if (!get_window()->is_visible()) {
+			return;
+		}
+		Window *grandparent_window = get_window()->get_parent_visible_window();
+		ERR_FAIL_NULL(grandparent_window);
+
+		if (Object::cast_to<InputEventKey>(p_event.ptr()) || Object::cast_to<InputEventShortcut>(p_event.ptr())) {
+			// HACK: Propagate the window input to the editor main window to handle global shortcuts.
+			grandparent_window->push_input(p_event);
+
+			if (grandparent_window->is_input_handled()) {
+				get_viewport()->set_input_as_handled();
+			}
+		}
+	}
+};
+
 Rect2 WindowWrapper::_get_default_window_rect() const {
 	// Assume that the control rect is the desired one for the window.
 	return wrapped_control->get_screen_rect();
@@ -209,7 +236,7 @@ void WindowWrapper::restore_window_from_saved_position(const Rect2 p_window_rect
 	int screen = p_screen;
 	Rect2 restored_screen_rect = p_screen_rect;
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
 		window_rect = Rect2i();
 		restored_screen_rect = Rect2i();
 	}
@@ -342,18 +369,20 @@ WindowWrapper::WindowWrapper() {
 	window = memnew(Window);
 	window_id = window->get_instance_id();
 	window->set_wrap_controls(true);
-	window->set_propagate_shortcuts_to_parent(true);
+
+	add_child(window);
 	window->hide();
 
 	window->connect("close_requested", callable_mp(this, &WindowWrapper::_window_close_request));
 	window->connect("size_changed", callable_mp(this, &WindowWrapper::_window_size_changed));
 
+	ShortcutBin *capturer = memnew(ShortcutBin);
+	window->add_child(capturer);
+
 	window_background = memnew(Panel);
 	window_background->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
 	window->add_child(window_background);
 
-	add_child(window);
-
 	ProgressDialog::get_singleton()->add_host_window(window_id);
 }
 
diff --git a/engine/editor/gui/window_wrapper.h b/engine/editor/gui/window_wrapper.h
index dfe585ac..e3ca68d6 100644
--- a/engine/editor/gui/window_wrapper.h
+++ b/engine/editor/gui/window_wrapper.h
@@ -31,12 +31,11 @@
 #pragma once
 
 #include "core/math/rect2.h"
-#include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
+#include "scene/gui/menu_button.h"
 
-class HBoxContainer;
-class Popup;
 class Window;
+class HBoxContainer;
 
 class WindowWrapper : public MarginContainer {
 	GDCLASS(WindowWrapper, MarginContainer);
diff --git a/engine/editor/icons/BlitMaterial.svg b/engine/editor/icons/BlitMaterial.svg
deleted file mode 100644
index b46db60c..00000000
--- a/engine/editor/icons/BlitMaterial.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><linearGradient xlink:href="#a" id="b" x1="15.347" x2="15.347" y1="3.168" y2="17.103" gradientTransform="matrix(1.00467 0 0 1.04022 -7.419 -2.544)" gradientUnits="userSpaceOnUse"/></defs><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#b)" d="m 2.9291085,10.340767 c -0.2642273,0.312066 -0.4219599,0.759362 -0.4219599,1.287796 0,1.693483 -3.15264355,-0.18516 -0.3385726,2.777396 0.8881251,0.936201 2.6663848,0.696949 3.55451,-0.237171 a 2.3408729,2.4237201 0 0 0 0,-3.386967 C 4.6179529,9.6178118 3.5128197,9.6542196 2.9301132,10.340767 Z M 5.2398414,8.6348009 7.651041,11.131336 14.482773,4.0578184 a 1.7228275,1.783801 0 0 0 -2.4112,-2.5485469 z"/></svg>
diff --git a/engine/editor/icons/CenterView.svg b/engine/editor/icons/CenterView.svg
index 9b3e8253..82b494db 100644
--- a/engine/editor/icons/CenterView.svg
+++ b/engine/editor/icons/CenterView.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" stroke-linejoin="round" stroke-width="1.3" d="M 6.03125 0.96875 L 4.96875 2.03125 L 7.46875 4.53125 A 0.750075 0.750075 0 0 0 8.53125 4.53125 L 11.03125 2.03125 L 9.96875 0.96875 L 8 2.9375 L 6.03125 0.96875 z M 2.03125 4.96875 L 0.96875 6.03125 L 2.9375 8 L 0.96875 9.96875 L 2.03125 11.03125 L 4.53125 8.53125 A 0.750075 0.750075 0 0 0 4.53125 7.46875 L 2.03125 4.96875 z M 13.96875 4.96875 L 11.46875 7.46875 A 0.750075 0.750075 0 0 0 11.46875 8.53125 L 13.96875 11.03125 L 15.03125 9.96875 L 13.0625 8 L 15.03125 6.03125 L 13.96875 4.96875 z M 7.2949219 6.5878906 C 6.9038179 6.5878906 6.5878906 6.9038179 6.5878906 7.2949219 L 6.5878906 8.7050781 C 6.5878906 9.096182 6.9038179 9.4121094 7.2949219 9.4121094 L 8.7050781 9.4121094 C 9.096182 9.4121094 9.4121094 9.096182 9.4121094 8.7050781 L 9.4121094 7.2949219 C 9.4121094 6.9038179 9.096182 6.5878906 8.7050781 6.5878906 L 7.2949219 6.5878906 z M 8 11.248047 A 0.750075 0.750075 0 0 0 7.46875 11.46875 L 4.96875 13.96875 L 6.03125 15.03125 L 8 13.0625 L 9.96875 15.03125 L 11.03125 13.96875 L 8.53125 11.46875 A 0.750075 0.750075 0 0 0 8 11.248047 z" paint-order="stroke markers fill"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="4" height="4" x="6" y="6" fill="#e0e0e0" rx="1"/><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="1.5" d="M1.5 5.5 4 8l-2.5 2.5m13 0L12 8l2.5-2.5m-4-4L8 4 5.5 1.5m0 13L8 12l2.5 2.5"/></svg>
diff --git a/engine/editor/icons/DrawableTexture2D.svg b/engine/editor/icons/DrawableTexture2D.svg
deleted file mode 100644
index 695d709c..00000000
--- a/engine/editor/icons/DrawableTexture2D.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 2,1 C 1.4477153,1 1,1.4477153 1,2 v 12 c 0,0.552285 0.4477153,1 1,1 h 12 c 0.552285,0 1,-0.447715 1,-1 V 2 C 15,1.4477153 14.552285,1 14,1 Z m 1,2 h 10 v 8 H 3 Z"/><path fill="#e0e0e0" d="M5 5V4H6V5H7V6H6V7H5V6H4V5ZM10 8V7h1v1h1v1h-1v1H10V9H9V8Z"/></svg>
diff --git a/engine/editor/icons/Error.svg b/engine/editor/icons/Error.svg
index d0a831b0..a52f7b67 100644
--- a/engine/editor/icons/Error.svg
+++ b/engine/editor/icons/Error.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4" fill="#ff5f5f"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ff5f5f"/></svg>
diff --git a/engine/editor/icons/ErrorWarning.svg b/engine/editor/icons/ErrorWarning.svg
index 0aee304c..de49f24e 100644
--- a/engine/editor/icons/ErrorWarning.svg
+++ b/engine/editor/icons/ErrorWarning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M8 12a1 1 0 0 1 0-8z"/><path fill="#ffdd65" d="M8 4a1 1 0 0 1 0 8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#ff5f5f" d="M4 8a1 1 0 0 1 0-8z"/><path fill="#ffdd65" d="M4 0a1 1 0 0 1 0 8z"/></svg>
diff --git a/engine/editor/icons/GuiViewportHdiagsplitter.svg b/engine/editor/icons/GuiViewportHdiagsplitter.svg
new file mode 100644
index 00000000..ad55722d
--- /dev/null
+++ b/engine/editor/icons/GuiViewportHdiagsplitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="34"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2V32M2 2h60"/></svg>
diff --git a/engine/editor/icons/GuiViewportVdiagsplitter.svg b/engine/editor/icons/GuiViewportVdiagsplitter.svg
new file mode 100644
index 00000000..d5f035b4
--- /dev/null
+++ b/engine/editor/icons/GuiViewportVdiagsplitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="34" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 32H2m30-30v60"/></svg>
diff --git a/engine/editor/icons/GuiViewportVhsplitter.svg b/engine/editor/icons/GuiViewportVhsplitter.svg
new file mode 100644
index 00000000..ae3746ea
--- /dev/null
+++ b/engine/editor/icons/GuiViewportVhsplitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2v60M2 32h60"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityHidden.svg b/engine/editor/icons/GuiVisibilityHidden.svg
index 56e51f41..acc728df 100644
--- a/engine/editor/icons/GuiVisibilityHidden.svg
+++ b/engine/editor/icons/GuiVisibilityHidden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".996" fill-rule="evenodd" d="m2.9609 7.7266-1.9219.54883c.31999 1.12.8236 2.0593 1.4316 2.8398l-.83398.58377 1.4141 1.163875.84375-.84375c.98585.74762 2.0766.800875 3.1055.980875v.9999h2v-.9999c1.0288-.17998 2.1196-.233275 3.1055-.980875l.84375.84375 1.4141-1.163875-.83398-.58377c.60804-.78055 1.1117-1.7199 1.4316-2.8398l-1.9219-.54883c-.8756 3.0646-3.5391 4.2734-5.0391 4.2734s-4.1635-1.2088-5.0391-4.2734z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2.96 7.727-1.921.548c.32 1.12.824 2.06 1.432 2.84l-.834.834 1.414 1.414.843-.843c.986.747 2.077 1.206 3.106 1.386V15h2v-1.094c1.029-.18 2.12-.639 3.105-1.386l.844.843 1.414-1.414-.834-.834a8.285 8.285 0 0 0 1.432-2.84l-1.922-.548C12.163 10.79 9.499 12 7.999 12s-4.163-1.209-5.038-4.273z"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityVisible.svg b/engine/editor/icons/GuiVisibilityVisible.svg
index b88f86ee..8e64200a 100644
--- a/engine/editor/icons/GuiVisibilityVisible.svg
+++ b/engine/editor/icons/GuiVisibilityVisible.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 3C5.5 3 2.5 4 1.05 7.7a1 1 0 0 0 0 .6C2.5 12 5.5 13 8 13s5.5-1 6.95-4.7a1 1 0 0 0 0-.6C13.5 4 10.5 3 8 3zm0 1.25a3.75 3.75 0 1 1 0 7.5 3.75 3.75 0 0 1 0-7.5zM8 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityXray.svg b/engine/editor/icons/GuiVisibilityXray.svg
index 6ed0797d..c9389b3a 100644
--- a/engine/editor/icons/GuiVisibilityXray.svg
+++ b/engine/editor/icons/GuiVisibilityXray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="m8 3c-2.4999975 0-5.4992202.9992224-6.9492188 4.6992188a1 1 0 0 0 0 .6015624c1.4499986 3.6999968 4.4492213 4.6992188 6.9492188 4.6992188.0077113 0 .0157167.000019.0234375 0v-1.251953a3.75 3.75 0 0 1 -.0234375.001953 3.75 3.75 0 0 1 0-7.5 3.75 3.75 0 0 1 .0234375.0019531v-1.2519531c-.0077208-.0000191-.0157262 0-.0234375 0zm0 3a2 2 0 0 0 0 4 2 2 0 0 0 .0234375-.0019531v-3.9960938a2 2 0 0 0 -.0234375-.0019531z"/><path fill-opacity=".392" d="m8.0234375 3v1.2519531c4.8386485.1562247 4.8386485 7.3398689 0 7.4960939v1.251953c2.4953415-.0062 5.4802555-1.010635 6.9257815-4.6992188.06174-.195768.06174-.4057944 0-.6015624-1.445526-3.6885836-4.43044-4.6930526-6.9257815-4.6992188zm0 3.0039062v3.9921876c2.6287135-.000462 2.6480165-3.9877285 0-3.9921876z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".4" d="M8 14c2.557 0 5.79-1.948 6.955-5.705a1 1 0 0 0 0-.55C13.837 3.789 10.5 2 8 2v2a4 4 0 0 1 0 8zm0-4a2 2 0 0 0 0-4z"/><path d="M8 2C5.443 2 2.21 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14v-2a4 4 0 0 1 0-8zm0 4a2 2 0 0 0 0 4z"/></g></svg>
diff --git a/engine/editor/icons/MeshLibraryEditor.svg b/engine/editor/icons/MeshLibraryEditor.svg
deleted file mode 100644
index 23620f29..00000000
--- a/engine/editor/icons/MeshLibraryEditor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.729 2A2 2 0 1 0 2 4.73v6.542A2 2 0 1 0 4.73 14H7v-2H4.728A2 2 0 0 0 4 11.27V5.414l3 3V8a2 2 0 0 1 .809-1.606L5.414 4h5.858a2 2 0 0 0 .728.73V6a2 2 0 0 1 1 .271A2 2 0 0 1 14 6V4.728A2 2 0 1 0 11.27 2zM9 8v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8z"/></svg>
diff --git a/engine/editor/icons/Output.svg b/engine/editor/icons/Output.svg
index 6eaa3a93..9c45386b 100644
--- a/engine/editor/icons/Output.svg
+++ b/engine/editor/icons/Output.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4" fill="#e0e0e0"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#e0e0e0"/></svg>
diff --git a/engine/editor/icons/PickerShapeCircle.svg b/engine/editor/icons/PickerShapeCircle.svg
index 24acec76..a655ac1f 100644
--- a/engine/editor/icons/PickerShapeCircle.svg
+++ b/engine/editor/icons/PickerShapeCircle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
diff --git a/engine/editor/icons/PickerShapeRectangle.svg b/engine/editor/icons/PickerShapeRectangle.svg
index c6bacb4a..47d2aef8 100644
--- a/engine/editor/icons/PickerShapeRectangle.svg
+++ b/engine/editor/icons/PickerShapeRectangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
diff --git a/engine/editor/icons/PickerShapeRectangleWheel.svg b/engine/editor/icons/PickerShapeRectangleWheel.svg
index f431db31..ccd74907 100644
--- a/engine/editor/icons/PickerShapeRectangleWheel.svg
+++ b/engine/editor/icons/PickerShapeRectangleWheel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#fff" stroke-width="1.75"/><path fill="#fff" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#eaeaea" stroke-width="1.75"/><path fill="#eaeaea" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
diff --git a/engine/editor/icons/ProgressRing.svg b/engine/editor/icons/ProgressRing.svg
deleted file mode 100644
index 21c65c84..00000000
--- a/engine/editor/icons/ProgressRing.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="none" stroke="#fff" stroke-width="4"/></svg>
diff --git a/engine/editor/icons/ProjectDowngrade.svg b/engine/editor/icons/ProjectDowngrade.svg
deleted file mode 100644
index 34abaf97..00000000
--- a/engine/editor/icons/ProjectDowngrade.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd"><path fill="none" d="M0 0H16V16H0z"/><path fill="none" stroke="#FFDD65" stroke-linecap="round" stroke-width="2.8" d="M 2.4,5.4 8,11 13.6,5.4"/></svg>
diff --git a/engine/editor/icons/ProjectDowngradeMajor.svg b/engine/editor/icons/ProjectDowngradeMajor.svg
deleted file mode 100644
index dc59e033..00000000
--- a/engine/editor/icons/ProjectDowngradeMajor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd"><path fill="none" d="M0 0H16V16H0z"/><path fill="none" stroke="#FFDD65" stroke-linecap="round" stroke-width="2.8" d="M2.4 8.4 8 14 13.6 8.4M2.4 1.8350515l5.6 5.6 5.6-5.6"/></svg>
diff --git a/engine/editor/icons/ProjectUpgrade.svg b/engine/editor/icons/ProjectUpgrade.svg
deleted file mode 100644
index 15e3dcca..00000000
--- a/engine/editor/icons/ProjectUpgrade.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd"><path fill="none" d="M0 0H16V16H0z"/><path fill="none" stroke="#699CE8" stroke-linecap="round" stroke-width="2.8" d="M 2.4,9.6 8,4 13.6,9.6"/></svg>
diff --git a/engine/editor/icons/ProjectUpgradeMajor.svg b/engine/editor/icons/ProjectUpgradeMajor.svg
deleted file mode 100644
index c37c6297..00000000
--- a/engine/editor/icons/ProjectUpgradeMajor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd"><path fill="none" d="M0 0H16V16H0z"/><path fill="none" stroke="#699CE8" stroke-linecap="round" stroke-width="2.8" d="M2.4 7.599999 8 2 13.6 7.599999M2.4 14.164948l5.6-5.6 5.6 5.6"/></svg>
diff --git a/engine/editor/icons/Trackball.svg b/engine/editor/icons/Trackball.svg
deleted file mode 100644
index 0b6ffe5c..00000000
--- a/engine/editor/icons/Trackball.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-599.5 337.5 16 16"><path fill="#e0e0e0" d="M-584.606 338.605c-.21-.211-.596-.462-1.235-.462-.958 0-2.324.603-3.859 1.632-.568-.179-1.173-.275-1.8-.275-3.313 0-6 2.687-6 6 0 .628.097 1.232.276 1.801-1.44 2.15-2.135 4.129-1.17 5.094.21.211.596.462 1.235.462 1.761 0 4.885-1.985 7.957-5.059 3.32-3.32 6.175-7.612 4.596-9.193zm-12.553 12.751c-.113 0-.164-.02-.17-.02-.137-.224.083-1.11.876-2.454.211.308.448.597.711.859l1.585-1.585c0 .001-.001.001-.001.002.846-.636 1.811-1.458 2.835-2.482 1.024-1.023 1.846-1.987 2.48-2.833l1.586-1.586c-.262-.262-.549-.498-.855-.708.989-.586 1.794-.906 2.271-.906.113 0 .164.02.17.02.261.425-.752 3.234-4.593 7.074-2.999 3-5.791 4.619-6.895 4.619zM-591.099 351.479c2.991-.198 5.378-2.584 5.578-5.575-.998 1.277-2.018 2.351-2.621 2.954-.538.538-1.631 1.585-2.957 2.621z"/></svg>
diff --git a/engine/editor/icons/VCSCommit.svg b/engine/editor/icons/VCSCommit.svg
deleted file mode 100644
index 80956368..00000000
--- a/engine/editor/icons/VCSCommit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.5" d="m 8.25,10.49996 c 1.380712,0 2.5,-1.1193927 2.5,-2.5002338 h 3.5 v 0 m -3.5,0 C 10.75,5.7721009 8.057154,4.6569057 6.4823232,6.2318837 4.9074925,7.8068618 6.0225834,10.49996 8.25,10.49996 M 1.75,7.9997262 h 3.5 v 0 m -3.5,0"/></svg>
diff --git a/engine/editor/icons/VirtualJoystick.svg b/engine/editor/icons/VirtualJoystick.svg
deleted file mode 100644
index c8972f4f..00000000
--- a/engine/editor/icons/VirtualJoystick.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m8 14A1 1 0 008 2 1 1 0 008 14M8 3A1 1 0 118 13 1 1 0 118 3M8 6A1 1 0 008 10 1 1 0 008 6"/></svg>
diff --git a/engine/editor/icons/Warning.svg b/engine/editor/icons/Warning.svg
index dcc0dd99..747c1bcb 100644
--- a/engine/editor/icons/Warning.svg
+++ b/engine/editor/icons/Warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4" fill="#ffdd65"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ffdd65"/></svg>
diff --git a/engine/editor/import/3d/editor_import_collada.cpp b/engine/editor/import/3d/editor_import_collada.cpp
index fb2a3004..f7614076 100644
--- a/engine/editor/import/3d/editor_import_collada.cpp
+++ b/engine/editor/import/3d/editor_import_collada.cpp
@@ -31,8 +31,6 @@
 #include "editor_import_collada.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/templates/rb_set.h"
 #include "editor/import/3d/collada.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
@@ -921,7 +919,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 			uint64_t mesh_flags = 0;
 
 			if (p_use_compression) {
-				mesh_flags = RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+				mesh_flags = RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 			}
 
 			// We can't generate tangents without UVs, so create dummy tangents.
@@ -959,10 +957,10 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 				if (has_weights) {
 					Vector<float> weights;
 					Vector<int> bones;
-					weights.resize(RSE::ARRAY_WEIGHTS_SIZE);
-					bones.resize(RSE::ARRAY_WEIGHTS_SIZE);
+					weights.resize(RS::ARRAY_WEIGHTS_SIZE);
+					bones.resize(RS::ARRAY_WEIGHTS_SIZE);
 					//float sum=0.0;
-					for (int l = 0; l < RSE::ARRAY_WEIGHTS_SIZE; l++) {
+					for (int l = 0; l < RS::ARRAY_WEIGHTS_SIZE; l++) {
 						if (l < vertex_array[k].weights.size()) {
 							weights.write[l] = vertex_array[k].weights[l].weight;
 							bones.write[l] = vertex_array[k].weights[l].bone_idx;
@@ -1006,7 +1004,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 
 			if (p_mesh->get_blend_shape_count() != 0 || p_skin_controller || is_mesh_2d) {
 				// Can't compress if attributes missing or if using vertex weights.
-				mesh_flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+				mesh_flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 			}
 
 			////////////////////////////
@@ -1014,9 +1012,9 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 			////////////////////////////
 
 			Array d = surftool->commit_to_arrays();
-			d.resize(RSE::ARRAY_MAX);
+			d.resize(RS::ARRAY_MAX);
 
-			if (mesh_flags & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES && (generate_dummy_tangents || generate_tangents)) {
+			if (mesh_flags & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES && (generate_dummy_tangents || generate_tangents)) {
 				// Compression is enabled, so let's validate that the normals and tangents are correct.
 				Vector<Vector3> normals = d[Mesh::ARRAY_NORMAL];
 				Vector<float> tangents = d[Mesh::ARRAY_TANGENT];
@@ -1024,7 +1022,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 					Vector3 tan = Vector3(tangents[vert * 4 + 0], tangents[vert * 4 + 1], tangents[vert * 4 + 2]);
 					if (std::abs(tan.dot(normals[vert])) > 0.0001) {
 						// Tangent is not perpendicular to the normal, so we can't use compression.
-						mesh_flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+						mesh_flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 					}
 				}
 			}
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
index 7d658d60..938c924f 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_renamer.h"
 
-#include "core/io/resource_importer.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
@@ -96,7 +95,9 @@ void PostImportPluginSkeletonRenamer::_internal_process(InternalImportCategory p
 		TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 		while (nodes.size()) {
 			AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-			for (const StringName &name : ap->get_sorted_animation_list()) {
+			List<StringName> anims;
+			ap->get_animation_list(&anims);
+			for (const StringName &name : anims) {
 				Ref<Animation> anim = ap->get_animation(name);
 				int len = anim->get_track_count();
 				for (int i = 0; i < len; i++) {
@@ -207,7 +208,9 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
 			TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 			while (nodes.size()) {
 				AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-				for (const StringName &name : ap->get_sorted_animation_list()) {
+				List<StringName> anims;
+				ap->get_animation_list(&anims);
+				for (const StringName &name : anims) {
 					Ref<Animation> anim = ap->get_animation(name);
 					int track_len = anim->get_track_count();
 					for (int i = 0; i < track_len; i++) {
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
index 1ecb5b7e..9d11a51c 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/import/3d/resource_importer_scene.h"
+#include "resource_importer_scene.h"
 
 class PostImportPluginSkeletonRenamer : public EditorScenePostImportPlugin {
 	GDCLASS(PostImportPluginSkeletonRenamer, EditorScenePostImportPlugin);
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
index 0d98c9e3..1e15b16d 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_rest_fixer.h"
 
-#include "core/io/resource_importer.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/retarget_modifier_3d.h"
@@ -168,7 +167,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 				TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 				while (nodes.size()) {
 					AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-					for (const StringName &name : ap->get_sorted_animation_list()) {
+					List<StringName> anims;
+					ap->get_animation_list(&anims);
+					for (const StringName &name : anims) {
 						Ref<Animation> anim = ap->get_animation(name);
 						int track_len = anim->get_track_count();
 						for (int i = 0; i < track_len; i++) {
@@ -234,7 +235,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 			TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 			while (nodes.size()) {
 				AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-				for (const StringName &name : ap->get_sorted_animation_list()) {
+				List<StringName> anims;
+				ap->get_animation_list(&anims);
+				for (const StringName &name : anims) {
 					if (String(name).contains_char('/')) {
 						continue; // Avoid animation library which may be created by importer dynamically.
 					}
@@ -404,7 +407,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 					TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 					while (nodes.size()) {
 						AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-						for (const StringName &name : ap->get_sorted_animation_list()) {
+						List<StringName> anims;
+						ap->get_animation_list(&anims);
+						for (const StringName &name : anims) {
 							Ref<Animation> anim = ap->get_animation(name);
 							int track_len = anim->get_track_count();
 							for (int i = 0; i < track_len; i++) {
@@ -574,7 +579,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 					String general_skeleton_pathname = UNIQUE_NODE_PREFIX + profile_skeleton->get_name();
 					while (nodes.size()) {
 						AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-						for (const StringName &name : ap->get_sorted_animation_list()) {
+						List<StringName> anims;
+						ap->get_animation_list(&anims);
+						for (const StringName &name : anims) {
 							Ref<Animation> anim = ap->get_animation(name);
 							int track_len = anim->get_track_count();
 							for (int i = 0; i < track_len; i++) {
@@ -597,7 +604,7 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 											Vector<StringName> names = anim->track_get_path(i).get_names();
 											names.remove_at(0);
 											for (int j = 0; j < names.size(); j++) {
-												path_string += "/" + names[j].operator String();
+												path_string += "/" + names[i].operator String();
 											}
 										}
 										if (anim->track_get_path(i).get_subname_count() > 0) {
@@ -708,7 +715,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 				while (nodes.size()) {
 					AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
 					ERR_CONTINUE(!ap);
-					for (const StringName &name : ap->get_sorted_animation_list()) {
+					List<StringName> anims;
+					ap->get_animation_list(&anims);
+					for (const StringName &name : anims) {
 						Ref<Animation> anim = ap->get_animation(name);
 						int track_len = anim->get_track_count();
 						for (int i = 0; i < track_len; i++) {
@@ -837,7 +846,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 			TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 			while (nodes.size()) {
 				AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
-				for (const StringName &name : ap->get_sorted_animation_list()) {
+				List<StringName> anims;
+				ap->get_animation_list(&anims);
+				for (const StringName &name : anims) {
 					Ref<Animation> anim = ap->get_animation(name);
 					int track_len = anim->get_track_count();
 					for (int i = 0; i < track_len; i++) {
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
index dd7e3205..ee45e17c 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/import/3d/resource_importer_scene.h"
+#include "resource_importer_scene.h"
 
 class PostImportPluginSkeletonRestFixer : public EditorScenePostImportPlugin {
 	GDCLASS(PostImportPluginSkeletonRestFixer, EditorScenePostImportPlugin);
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
index 62eaaee7..c6befa13 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_track_organizer.h"
 
-#include "core/io/resource_importer.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/bone_map.h"
@@ -70,11 +69,13 @@ void PostImportPluginSkeletonTrackOrganizer::internal_process(InternalImportCate
 		TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
 		while (nodes.size()) {
 			AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
+			List<StringName> anims;
+			ap->get_animation_list(&anims);
 
 			Ref<AnimationLibrary> unmapped_al;
 			unmapped_al.instantiate();
 
-			for (const StringName &name : ap->get_sorted_animation_list()) {
+			for (const StringName &name : anims) {
 				Ref<Animation> anim = ap->get_animation(name);
 				int track_len = anim->get_track_count();
 				Vector<int> remove_indices;
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
index baa25aa1..7d017ac2 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/import/3d/resource_importer_scene.h"
+#include "resource_importer_scene.h"
 
 class PostImportPluginSkeletonTrackOrganizer : public EditorScenePostImportPlugin {
 	GDCLASS(PostImportPluginSkeletonTrackOrganizer, EditorScenePostImportPlugin);
diff --git a/engine/editor/import/3d/resource_importer_obj.cpp b/engine/editor/import/3d/resource_importer_obj.cpp
index 7c57e8dd..5abd00d6 100644
--- a/engine/editor/import/3d/resource_importer_obj.cpp
+++ b/engine/editor/import/3d/resource_importer_obj.cpp
@@ -31,7 +31,6 @@
 #include "resource_importer_obj.h"
 
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
@@ -400,7 +399,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 				}
 			}
 		} else if (/*l.begins_with("g ") ||*/ l.begins_with("usemtl ") || (l.begins_with("o ") || f->eof_reached())) { //commit group to mesh
-			uint64_t mesh_flags = RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+			uint64_t mesh_flags = RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 
 			if (p_disable_compression) {
 				mesh_flags = 0;
@@ -446,7 +445,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 
 				Array array = surf_tool->commit_to_arrays();
 
-				if (mesh_flags & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES && generate_tangents && uses_uvs) {
+				if (mesh_flags & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES && generate_tangents && uses_uvs) {
 					// Compression is enabled, so let's validate that the normals and generated tangents are correct.
 					Vector<Vector3> norms = array[Mesh::ARRAY_NORMAL];
 					Vector<float> tangents = array[Mesh::ARRAY_TANGENT];
@@ -455,7 +454,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 						Vector3 tan = Vector3(tangents[vert * 4 + 0], tangents[vert * 4 + 1], tangents[vert * 4 + 2]);
 						if (std::abs(tan.dot(norms[vert])) > 0.0001) {
 							// Tangent is not perpendicular to the normal, so we can't use compression.
-							mesh_flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+							mesh_flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 						}
 					}
 				}
diff --git a/engine/editor/import/3d/resource_importer_obj.h b/engine/editor/import/3d/resource_importer_obj.h
index 4a46deec..ee7eed8c 100644
--- a/engine/editor/import/3d/resource_importer_obj.h
+++ b/engine/editor/import/3d/resource_importer_obj.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/import/3d/resource_importer_scene.h"
+#include "resource_importer_scene.h"
 
 class EditorOBJImporter : public EditorSceneFormatImporter {
 	GDCLASS(EditorOBJImporter, EditorSceneFormatImporter);
diff --git a/engine/editor/import/3d/resource_importer_scene.cpp b/engine/editor/import/3d/resource_importer_scene.cpp
index cddb8418..fc686d01 100644
--- a/engine/editor/import/3d/resource_importer_scene.cpp
+++ b/engine/editor/import/3d/resource_importer_scene.cpp
@@ -32,9 +32,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/io/dir_access.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
@@ -57,7 +55,6 @@
 #include "scene/resources/animation.h"
 #include "scene/resources/bone_map.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/physics_material.h"
 #include "scene/resources/resource_format_text.h"
 
 void EditorSceneFormatImporter::get_extensions(List<String> *r_extensions) const {
@@ -618,7 +615,7 @@ void _populate_scalable_nodes_collection(Node *p_node, ScalableNodeCollection &p
 	}
 	AnimationPlayer *animation_player = Object::cast_to<AnimationPlayer>(p_node);
 	if (animation_player) {
-		LocalVector<StringName> animation_list;
+		List<StringName> animation_list;
 		animation_player->get_animation_list(&animation_list);
 
 		for (const StringName &E : animation_list) {
@@ -704,7 +701,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, HashMap<R
 
 		bool nodes_were_renamed = r_node_renames.size() != 0;
 
-		LocalVector<StringName> anims;
+		List<StringName> anims;
 		ap->get_animation_list(&anims);
 		for (const StringName &E : anims) {
 			Ref<Animation> anim = ap->get_animation(E);
@@ -828,23 +825,19 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, HashMap<R
 			p_node = sb;
 			CollisionShape3D *colshape = memnew(CollisionShape3D);
 			if (empty_draw_type == "CUBE") {
-				Ref<BoxShape3D> boxShape;
-				boxShape.instantiate();
+				BoxShape3D *boxShape = memnew(BoxShape3D);
 				boxShape->set_size(Vector3(2, 2, 2));
 				colshape->set_shape(boxShape);
 			} else if (empty_draw_type == "SINGLE_ARROW") {
-				Ref<SeparationRayShape3D> rayShape;
-				rayShape.instantiate();
+				SeparationRayShape3D *rayShape = memnew(SeparationRayShape3D);
 				rayShape->set_length(1);
 				colshape->set_shape(rayShape);
 				Object::cast_to<Node3D>(sb)->rotate_x(Math::PI / 2);
 			} else if (empty_draw_type == "IMAGE") {
-				Ref<WorldBoundaryShape3D> world_boundary_shape;
-				world_boundary_shape.instantiate();
+				WorldBoundaryShape3D *world_boundary_shape = memnew(WorldBoundaryShape3D);
 				colshape->set_shape(world_boundary_shape);
 			} else {
-				Ref<SphereShape3D> sphereShape;
-				sphereShape.instantiate();
+				SphereShape3D *sphereShape = memnew(SphereShape3D);
 				sphereShape->set_radius(1);
 				colshape->set_shape(sphereShape);
 			}
@@ -1085,7 +1078,7 @@ Node *ResourceImporterScene::_pre_fix_animations(Node *p_node, Node *p_root, con
 
 	if (Object::cast_to<AnimationPlayer>(p_node)) {
 		AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node);
-		LocalVector<StringName> anims;
+		List<StringName> anims;
 		ap->get_animation_list(&anims);
 
 		AnimationImportTracks import_tracks_mode[TRACK_CHANNEL_MAX] = {
@@ -1133,7 +1126,7 @@ Node *ResourceImporterScene::_post_fix_animations(Node *p_node, Node *p_root, co
 
 	if (Object::cast_to<AnimationPlayer>(p_node)) {
 		AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node);
-		LocalVector<StringName> anims;
+		List<StringName> anims;
 		ap->get_animation_list(&anims);
 
 		if (p_remove_immutable_tracks) {
@@ -1510,10 +1503,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 				for (int node_i = 0; node_i < children.size(); node_i++) {
 					AnimationPlayer *anim_player = cast_to<AnimationPlayer>(children[node_i]);
 					ERR_CONTINUE(anim_player == nullptr);
-					LocalVector<StringName> anim_list;
+					List<StringName> anim_list;
 					anim_player->get_animation_list(&anim_list);
 					if (anim_list.size() == 1) {
-						selected_animation_name = anim_list[0];
+						selected_animation_name = anim_list.front()->get();
 					}
 					rest_animation = anim_player->get_animation(selected_animation_name);
 					if (rest_animation.is_valid()) {
@@ -1526,10 +1519,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 				if (rest_animation.is_null()) {
 					Ref<AnimationLibrary> library(external_object);
 					if (library.is_valid()) {
-						LocalVector<StringName> anim_list;
+						List<StringName> anim_list;
 						library->get_animation_list(&anim_list);
 						if (anim_list.size() == 1) {
-							selected_animation_name = String(anim_list[0]);
+							selected_animation_name = String(anim_list.front()->get());
 						}
 						rest_animation = library->get_animation(selected_animation_name);
 					}
@@ -1605,7 +1598,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 								post_importer_plugins.write[j]->internal_process(EditorScenePostImportPlugin::INTERNAL_IMPORT_CATEGORY_MATERIAL, p_root, p_node, mat, matdata);
 							}
 						}
-						if (!mat_id.is_empty() && p_material_data.has(mat_id) && extract_mat != 0) {
+						if (!mat_id.is_empty() && extract_mat != 0) {
 							String ext = material_extension[p_options.has("materials/extract_format") ? (int)p_options["materials/extract_format"] : 0];
 							String path = spath.path_join(mat_id.validate_filename() + ext);
 							String uid_path = ResourceUID::path_to_uid(path);
@@ -1879,7 +1872,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 		}
 
 		if (post_importer_plugins.size()) {
-			LocalVector<StringName> anims;
+			List<StringName> anims;
 			ap->get_animation_list(&anims);
 			for (const StringName &name : anims) {
 				if (p_animation_data.has(name)) {
@@ -2104,7 +2097,7 @@ void ResourceImporterScene::_create_slices(AnimationPlayer *ap, Ref<Animation> a
 }
 
 void ResourceImporterScene::_optimize_animations(AnimationPlayer *anim, float p_max_vel_error, float p_max_ang_error, int p_prc_error) {
-	LocalVector<StringName> anim_names;
+	List<StringName> anim_names;
 	anim->get_animation_list(&anim_names);
 	for (const StringName &E : anim_names) {
 		Ref<Animation> a = anim->get_animation(E);
@@ -2113,7 +2106,7 @@ void ResourceImporterScene::_optimize_animations(AnimationPlayer *anim, float p_
 }
 
 void ResourceImporterScene::_compress_animations(AnimationPlayer *anim, int p_page_size_kb) {
-	LocalVector<StringName> anim_names;
+	List<StringName> anim_names;
 	anim->get_animation_list(&anim_names);
 	for (const StringName &E : anim_names) {
 		Ref<Animation> a = anim->get_animation(E);
@@ -2125,17 +2118,17 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 	switch (p_category) {
 		case INTERNAL_IMPORT_CATEGORY_NODE: {
 			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "node/node_type", PROPERTY_HINT_TYPE_STRING, "Node"), ""));
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), Variant()));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), Variant()));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "generate/physics", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/navmesh", PROPERTY_HINT_ENUM, "Disabled,Mesh + NavMesh,NavMesh Only"), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/body_type", PROPERTY_HINT_ENUM, "StaticBody3D,RigidBody3D,Area3D"), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/shape_type", PROPERTY_HINT_ENUM, "Decompose Convex (Slow),Single Convex (Average),Trimesh (Slow),Box (Fast),Sphere (Fast),Cylinder (Average),Capsule (Fast),Automatic", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 7));
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "physics/physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "physics/physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), Variant()));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), 1));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), 1));
 
@@ -2210,7 +2203,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 			}
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE: {
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), Variant()));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "optimizer/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), true));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "optimizer/max_velocity_error", PROPERTY_HINT_RANGE, "0,1,0.01"), 0.01));
@@ -2223,7 +2216,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "import_tracks/scale", PROPERTY_HINT_ENUM, "IfPresent,IfPresentForAll,Never"), 1));
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_SKELETON_3D_NODE: {
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "node/script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), Variant()));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "rest_pose/load_pose", PROPERTY_HINT_ENUM, "Default Pose,Use AnimationPlayer,Load External Animation", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "rest_pose/external_animation_library", PROPERTY_HINT_RESOURCE_TYPE, "Animation,AnimationLibrary", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Variant()));
@@ -2253,7 +2246,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 							Variant::STRING, U"rest_pose//no_animation_chosen",
 							PROPERTY_HINT_MULTILINE_TEXT, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY),
 					Variant(no_animation_warning)));
-			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "retarget/bone_map", PROPERTY_HINT_RESOURCE_TYPE, BoneMap::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Variant()));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "retarget/bone_map", PROPERTY_HINT_RESOURCE_TYPE, "BoneMap", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Variant()));
 		} break;
 		default: {
 		}
@@ -2390,10 +2383,10 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor
 					Ref<AnimationLibrary> library(res);
 					String selected_animation_name = p_options["rest_pose/selected_animation"];
 					if (library.is_valid()) {
-						LocalVector<StringName> anim_list;
+						List<StringName> anim_list;
 						library->get_animation_list(&anim_list);
 						if (anim_list.size() == 1) {
-							selected_animation_name = String(anim_list[0]);
+							selected_animation_name = String(anim_list.front()->get());
 						}
 						if (library->has_animation(selected_animation_name)) {
 							anim = library->get_animation(selected_animation_name);
@@ -2508,7 +2501,7 @@ bool ResourceImporterScene::get_internal_option_update_view_required(InternalImp
 void ResourceImporterScene::get_import_options(const String &p_path, List<ImportOption> *r_options, int p_preset) const {
 	r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_type", PROPERTY_HINT_TYPE_STRING, "Node"), ""));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_name"), ""));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "nodes/root_script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()), Variant()));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "nodes/root_script", PROPERTY_HINT_RESOURCE_TYPE, "Script"), Variant()));
 
 	List<String> script_extensions;
 	ResourceLoader::get_recognized_extensions_for_type("Script", &script_extensions);
@@ -2824,7 +2817,7 @@ void ResourceImporterScene::_copy_meta(Object *p_src_object, Object *p_dst_objec
 }
 
 void ResourceImporterScene::_optimize_track_usage(AnimationPlayer *p_player, AnimationImportTracks *p_track_actions) {
-	LocalVector<StringName> anims;
+	List<StringName> anims;
 	p_player->get_animation_list(&anims);
 	Node *parent = p_player->get_parent();
 	ERR_FAIL_NULL(parent);
@@ -3339,10 +3332,10 @@ Error ResourceImporterScene::import(ResourceUID::ID p_source_id, const String &p
 		for (int i = 0; i < scene->get_child_count(); i++) {
 			AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(scene->get_child(i));
 			if (ap) {
-				LocalVector<StringName> libs;
+				List<StringName> libs;
 				ap->get_animation_library_list(&libs);
 				if (libs.size()) {
-					library = ap->get_animation_library(libs[0]);
+					library = ap->get_animation_library(libs.front()->get());
 					break;
 				}
 			}
diff --git a/engine/editor/import/3d/scene_import_settings.cpp b/engine/editor/import/3d/scene_import_settings.cpp
index 94c0d7c5..1e3f9530 100644
--- a/engine/editor/import/3d/scene_import_settings.cpp
+++ b/engine/editor/import/3d/scene_import_settings.cpp
@@ -31,9 +31,6 @@
 #include "scene_import_settings.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_importer.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
@@ -48,9 +45,7 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/timer.h"
 #include "scene/resources/3d/importer_mesh.h"
-#include "scene/resources/sky.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/display/display_server.h"
 
 class SceneImportSettingsData : public Object {
 	GDCLASS(SceneImportSettingsData, Object)
@@ -81,7 +76,7 @@ class SceneImportSettingsData : public Object {
 				SceneImportSettingsDialog::get_singleton()->request_generate_collider();
 			}
 
-			Ref<ResourceImporterScene> resource_importer_scene = SceneImportSettingsDialog::get_singleton()->get_resource_importer_scene();
+			ResourceImporterScene *resource_importer_scene = SceneImportSettingsDialog::get_singleton()->get_resource_importer_scene();
 			if (category == ResourceImporterScene::INTERNAL_IMPORT_CATEGORY_MAX) {
 				if (resource_importer_scene->get_option_visibility(path, p_name, current)) {
 					SceneImportSettingsDialog::get_singleton()->update_view();
@@ -144,10 +139,10 @@ class SceneImportSettingsData : public Object {
 						hint_string = anim->get_name();
 					}
 					if (library.is_valid()) {
-						LocalVector<StringName> anim_names;
+						List<StringName> anim_names;
 						library->get_animation_list(&anim_names);
 						if (anim_names.size() == 1) {
-							(*settings)["rest_pose/selected_animation"] = String(anim_names[0]);
+							(*settings)["rest_pose/selected_animation"] = String(anim_names.front()->get());
 						}
 						for (StringName anim_name : anim_names) {
 							hint_string += "," + anim_name; // Include preceding, as a catch-all.
@@ -166,7 +161,7 @@ class SceneImportSettingsData : public Object {
 		if (hide_options) {
 			return;
 		}
-		Ref<ResourceImporterScene> resource_importer_scene = SceneImportSettingsDialog::get_singleton()->get_resource_importer_scene();
+		ResourceImporterScene *resource_importer_scene = SceneImportSettingsDialog::get_singleton()->get_resource_importer_scene();
 		for (const ResourceImporter::ImportOption &E : options) {
 			PropertyInfo option = E.option;
 			if (category == ResourceImporterScene::INTERNAL_IMPORT_CATEGORY_MAX) {
@@ -467,7 +462,9 @@ void SceneImportSettingsDialog::_fill_scene(Node *p_node, TreeItem *p_parent_ite
 	AnimationPlayer *anim_node = Object::cast_to<AnimationPlayer>(p_node);
 	if (anim_node) {
 		Vector<String> animation_list;
-		for (const StringName &E : anim_node->get_sorted_animation_list()) {
+		List<StringName> animations;
+		anim_node->get_animation_list(&animations);
+		for (const StringName &E : animations) {
 			_fill_animation(scene_tree, anim_node->get_animation(E), E, item);
 			animation_list.append(E);
 		}
@@ -1025,7 +1022,7 @@ void SceneImportSettingsDialog::_inspector_property_edited(const String &p_name)
 		if (!animation_map.has(selected_id)) {
 			return;
 		}
-		HashMap<StringName, Variant> settings(animation_map[selected_id].settings);
+		HashMap<StringName, Variant> settings = animation_map[selected_id].settings;
 		if (settings.has(p_name)) {
 			animation_loop_mode = static_cast<Animation::LoopMode>((int)settings[p_name]);
 		} else {
@@ -1109,7 +1106,7 @@ void SceneImportSettingsDialog::_reset_animation(const String &p_animation_name)
 		animation_pingpong = false;
 
 		if (animation_map.has(p_animation_name)) {
-			HashMap<StringName, Variant> settings(animation_map[p_animation_name].settings);
+			HashMap<StringName, Variant> settings = animation_map[p_animation_name].settings;
 			if (settings.has("settings/loop_mode")) {
 				animation_loop_mode = static_cast<Animation::LoopMode>((int)settings["settings/loop_mode"]);
 			}
@@ -1260,8 +1257,8 @@ void SceneImportSettingsDialog::_viewport_input(const Ref<InputEvent> &p_input)
 		(*rot_x) = CLAMP((*rot_x), -Math::PI / 2, Math::PI / 2);
 		_update_camera();
 	}
-	if (mm.is_valid() && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CURSOR_SHAPE)) {
-		DisplayServer::get_singleton()->cursor_set_shape(DisplayServerEnums::CursorShape::CURSOR_ARROW);
+	if (mm.is_valid() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) {
+		DisplayServer::get_singleton()->cursor_set_shape(DisplayServer::CursorShape::CURSOR_ARROW);
 	}
 	Ref<InputEventMouseButton> mb = p_input;
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::WHEEL_DOWN) {
@@ -1996,10 +1993,9 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	update_view_timer->set_one_shot(true);
 	update_view_timer->connect("timeout", callable_mp(this, &SceneImportSettingsDialog::_update_view_gizmos));
 	add_child(update_view_timer);
-
-	EditorNode::get_singleton()->register_hdr_viewport(base_viewport);
 }
 
 SceneImportSettingsDialog::~SceneImportSettingsDialog() {
 	memdelete(scene_import_settings_data);
+	memdelete(_resource_importer_scene);
 }
diff --git a/engine/editor/import/3d/scene_import_settings.h b/engine/editor/import/3d/scene_import_settings.h
index 842c5c1c..6aae7a99 100644
--- a/engine/editor/import/3d/scene_import_settings.h
+++ b/engine/editor/import/3d/scene_import_settings.h
@@ -204,7 +204,7 @@ class SceneImportSettingsDialog : public ConfirmationDialog {
 	HashMap<StringName, Variant> defaults;
 
 	SceneImportSettingsData *scene_import_settings_data = nullptr;
-	Ref<ResourceImporterScene> _resource_importer_scene;
+	ResourceImporterScene *_resource_importer_scene = nullptr;
 
 	void _re_import();
 
@@ -244,7 +244,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	const Ref<ResourceImporterScene> &get_resource_importer_scene() const { return _resource_importer_scene; }
+	ResourceImporterScene *get_resource_importer_scene() const { return _resource_importer_scene; }
 	void request_generate_collider();
 	void update_view();
 	void open_settings(const String &p_path, const String &p_scene_import_type = "PackedScene");
diff --git a/engine/editor/import/audio_stream_import_settings.cpp b/engine/editor/import/audio_stream_import_settings.cpp
index ab110380..f7014742 100644
--- a/engine/editor/import/audio_stream_import_settings.cpp
+++ b/engine/editor/import/audio_stream_import_settings.cpp
@@ -30,13 +30,11 @@
 
 #include "audio_stream_import_settings.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
-#include "servers/rendering/rendering_server.h"
 
 AudioStreamImportSettingsDialog *AudioStreamImportSettingsDialog::singleton = nullptr;
 
diff --git a/engine/editor/import/dynamic_font_import_settings.cpp b/engine/editor/import/dynamic_font_import_settings.cpp
index daea3f00..8aa76b7a 100644
--- a/engine/editor/import/dynamic_font_import_settings.cpp
+++ b/engine/editor/import/dynamic_font_import_settings.cpp
@@ -30,15 +30,14 @@
 
 #include "dynamic_font_import_settings.h"
 
+#include "unicode_ranges.inc"
+
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "core/string/translation.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
-#include "editor/import/unicode_ranges.inc"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
@@ -145,21 +144,7 @@ void DynamicFontImportSettingsDialog::_main_prop_changed(const String &p_edited_
 		} else if (p_edited_property == "modulate_color_glyphs") {
 			font_preview->set_modulate_color_glyphs(import_settings_data->get("modulate_color_glyphs"));
 		} else if (p_edited_property == "hinting") {
-			int hinting = import_settings_data->get("hinting").operator int();
-			if (hinting == 3) { // Light (Except Pixel Fonts)
-				if (is_pixel) {
-					hinting = TextServer::HINTING_NONE;
-				} else {
-					hinting = TextServer::HINTING_LIGHT;
-				}
-			} else if (hinting == 4) { // Normal (Except Pixel Fonts)
-				if (is_pixel) {
-					hinting = TextServer::HINTING_NONE;
-				} else {
-					hinting = TextServer::HINTING_NORMAL;
-				}
-			}
-			font_preview->set_hinting((TextServer::Hinting)hinting);
+			font_preview->set_hinting((TextServer::Hinting)import_settings_data->get("hinting").operator int());
 		} else if (p_edited_property == "subpixel_positioning") {
 			int font_subpixel_positioning = import_settings_data->get("subpixel_positioning").operator int();
 			if (font_subpixel_positioning == 4 /* Auto (Except Pixel Fonts) */) {
@@ -954,21 +939,7 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 		font_preview->set_allow_system_fallback(import_settings_data->get("allow_system_fallback"));
 		font_preview->set_force_autohinter(import_settings_data->get("force_autohinter"));
 		font_preview->set_modulate_color_glyphs(import_settings_data->get("modulate_color_glyphs"));
-		int hinting = import_settings_data->get("hinting").operator int();
-		if (hinting == 3) { // Light (Except Pixel Fonts)
-			if (is_pixel) {
-				hinting = TextServer::HINTING_NONE;
-			} else {
-				hinting = TextServer::HINTING_LIGHT;
-			}
-		} else if (hinting == 4) { // Normal (Except Pixel Fonts)
-			if (is_pixel) {
-				hinting = TextServer::HINTING_NONE;
-			} else {
-				hinting = TextServer::HINTING_NORMAL;
-			}
-		}
-		font_preview->set_hinting((TextServer::Hinting)hinting);
+		font_preview->set_hinting((TextServer::Hinting)import_settings_data->get("hinting").operator int());
 		int font_subpixel_positioning = import_settings_data->get("subpixel_positioning").operator int();
 		if (font_subpixel_positioning == 4 /* Auto (Except Pixel Fonts) */) {
 			if (is_pixel) {
@@ -1010,7 +981,7 @@ DynamicFontImportSettingsDialog::DynamicFontImportSettingsDialog() {
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "allow_system_fallback"), true));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "force_autohinter"), false));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "modulate_color_glyphs"), false));
-	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal,Light (Except Pixel Fonts),Normal (Except Pixel Fonts)"), 3));
+	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), 1));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel,Auto (Except Pixel Fonts)"), 4));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), true));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_RANGE, "0,10,0.1"), 0.0));
diff --git a/engine/editor/import/dynamic_font_import_settings.h b/engine/editor/import/dynamic_font_import_settings.h
index 9c36a824..df4cbe29 100644
--- a/engine/editor/import/dynamic_font_import_settings.h
+++ b/engine/editor/import/dynamic_font_import_settings.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/resource_importer.h"
+
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
diff --git a/engine/editor/import/editor_atlas_packer.cpp b/engine/editor/import/editor_atlas_packer.cpp
index d7fc6580..94de4d1d 100644
--- a/engine/editor/import/editor_atlas_packer.cpp
+++ b/engine/editor/import/editor_atlas_packer.cpp
@@ -31,7 +31,6 @@
 #include "editor_atlas_packer.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/math/math_funcs_binary.h"
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
 #include "scene/resources/bit_map.h"
@@ -172,8 +171,8 @@ void EditorAtlasPacker::chart_pack(Vector<Chart> &charts, int &r_width, int &r_h
 
 	bitmaps.sort();
 
-	int atlas_max_width = Math::nearest_power_of_2_templated(p_atlas_max_size) / divide_by;
-	int atlas_w = Math::nearest_power_of_2_templated(max_w);
+	int atlas_max_width = nearest_power_of_2_templated(p_atlas_max_size) / divide_by;
+	int atlas_w = nearest_power_of_2_templated(max_w);
 	int atlas_h;
 	while (true) {
 		atlas_h = 0;
diff --git a/engine/editor/import/editor_import_plugin.cpp b/engine/editor/import/editor_import_plugin.cpp
index 1ac4097f..a399801a 100644
--- a/engine/editor/import/editor_import_plugin.cpp
+++ b/engine/editor/import/editor_import_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_import_plugin.h"
 
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_file_system.h"
 
diff --git a/engine/editor/import/fbx_importer_manager.cpp b/engine/editor/import/fbx_importer_manager.cpp
index dcfed306..94af76cd 100644
--- a/engine/editor/import/fbx_importer_manager.cpp
+++ b/engine/editor/import/fbx_importer_manager.cpp
@@ -31,8 +31,6 @@
 #include "fbx_importer_manager.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/import/import_defaults_editor.cpp b/engine/editor/import/import_defaults_editor.cpp
index 89abbe27..2cebe0c9 100644
--- a/engine/editor/import/import_defaults_editor.cpp
+++ b/engine/editor/import/import_defaults_editor.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_importer.h"
-#include "core/object/callable_mp.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/editor_sectioned_inspector.h"
 #include "editor/settings/action_map_editor.h"
diff --git a/engine/editor/import/resource_importer_bmfont.cpp b/engine/editor/import/resource_importer_bmfont.cpp
index b8ddf842..0c7fe8b2 100644
--- a/engine/editor/import/resource_importer_bmfont.cpp
+++ b/engine/editor/import/resource_importer_bmfont.cpp
@@ -32,8 +32,6 @@
 
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
-#include "scene/resources/font.h"
-#include "servers/text/text_server.h"
 
 String ResourceImporterBMFont::get_importer_name() const {
 	return "font_data_bmfont";
diff --git a/engine/editor/import/resource_importer_bmfont.h b/engine/editor/import/resource_importer_bmfont.h
index 402f7d21..871d893d 100644
--- a/engine/editor/import/resource_importer_bmfont.h
+++ b/engine/editor/import/resource_importer_bmfont.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "core/io/resource_importer.h"
+#include "scene/resources/font.h"
+#include "servers/text/text_server.h"
 
 class ResourceImporterBMFont : public ResourceImporter {
 	GDCLASS(ResourceImporterBMFont, ResourceImporter);
diff --git a/engine/editor/import/resource_importer_dynamic_font.cpp b/engine/editor/import/resource_importer_dynamic_font.cpp
index b0312152..40691b74 100644
--- a/engine/editor/import/resource_importer_dynamic_font.cpp
+++ b/engine/editor/import/resource_importer_dynamic_font.cpp
@@ -31,7 +31,6 @@
 #include "resource_importer_dynamic_font.h"
 
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "scene/resources/font.h"
@@ -125,7 +124,7 @@ void ResourceImporterDynamicFont::get_import_options(const String &p_path, List<
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "allow_system_fallback"), true));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "force_autohinter"), false));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "modulate_color_glyphs"), false));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal,Light (Except Pixel Fonts),Normal (Except Pixel Fonts)"), 3));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), 1));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel,Auto (Except Pixel Fonts)"), 4));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), true));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_RANGE, "0,10,0.1"), 0.0));
@@ -188,10 +187,11 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 	font->set_force_autohinter(autohinter);
 	font->set_modulate_color_glyphs(modulate_color_glyphs);
 	font->set_allow_system_fallback(allow_system_fallback);
+	font->set_hinting((TextServer::Hinting)hinting);
 	font->set_oversampling(oversampling);
 	font->set_fallbacks(fallbacks);
 
-	if (subpixel_positioning == 4 || hinting == 3 || hinting == 4) /* Dected Pixel Fonts */ {
+	if (subpixel_positioning == 4 /* Auto (Except Pixel Fonts) */) {
 		Array rids = font->get_rids();
 		if (!rids.is_empty()) {
 			PackedInt32Array glyphs = TS->font_get_supported_glyphs(rids[0]);
@@ -218,32 +218,14 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 					break;
 				}
 			}
-			if (subpixel_positioning == 4) { // Auto (Except Pixel Fonts)
-				if (is_pixel && !glyphs.is_empty()) {
-					print_line(vformat("%s: Pixel font detected, disabling subpixel positioning.", p_source_file));
-					subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_DISABLED;
-				} else {
-					subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
-				}
-			}
-			if (hinting == 3) { // Light (Except Pixel Fonts)
-				if (is_pixel && !glyphs.is_empty()) {
-					print_line(vformat("%s: Pixel font detected, disabling hinting.", p_source_file));
-					hinting = TextServer::HINTING_NONE;
-				} else {
-					hinting = TextServer::HINTING_LIGHT;
-				}
-			} else if (hinting == 4) { // Normal (Except Pixel Fonts)
-				if (is_pixel && !glyphs.is_empty()) {
-					print_line(vformat("%s: Pixel font detected, disabling hinting.", p_source_file));
-					hinting = TextServer::HINTING_NONE;
-				} else {
-					hinting = TextServer::HINTING_NORMAL;
-				}
+			if (is_pixel && !glyphs.is_empty()) {
+				print_line(vformat("%s: Pixel font detected, disabling subpixel positioning.", p_source_file));
+				subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_DISABLED;
+			} else {
+				subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
 			}
 		}
 	}
-	font->set_hinting((TextServer::Hinting)hinting);
 	font->set_subpixel_positioning((TextServer::SubpixelPositioning)subpixel_positioning);
 	font->set_keep_rounding_remainders(keep_rounding_remainders);
 
diff --git a/engine/editor/import/resource_importer_image.h b/engine/editor/import/resource_importer_image.h
index d690d807..b5fbd411 100644
--- a/engine/editor/import/resource_importer_image.h
+++ b/engine/editor/import/resource_importer_image.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class ResourceImporterImage : public ResourceImporter {
diff --git a/engine/editor/import/resource_importer_imagefont.cpp b/engine/editor/import/resource_importer_imagefont.cpp
index b3617380..9181ca83 100644
--- a/engine/editor/import/resource_importer_imagefont.cpp
+++ b/engine/editor/import/resource_importer_imagefont.cpp
@@ -32,8 +32,6 @@
 
 #include "core/io/image_loader.h"
 #include "core/io/resource_saver.h"
-#include "scene/resources/font.h"
-#include "servers/text/text_server.h"
 
 String ResourceImporterImageFont::get_importer_name() const {
 	return "font_data_image";
diff --git a/engine/editor/import/resource_importer_imagefont.h b/engine/editor/import/resource_importer_imagefont.h
index a1ac1c52..3ef86c17 100644
--- a/engine/editor/import/resource_importer_imagefont.h
+++ b/engine/editor/import/resource_importer_imagefont.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "core/io/resource_importer.h"
+#include "scene/resources/font.h"
+#include "servers/text/text_server.h"
 
 class ResourceImporterImageFont : public ResourceImporter {
 	GDCLASS(ResourceImporterImageFont, ResourceImporter);
diff --git a/engine/editor/import/resource_importer_shader_file.cpp b/engine/editor/import/resource_importer_shader_file.cpp
index 118eb97e..25bd1061 100644
--- a/engine/editor/import/resource_importer_shader_file.cpp
+++ b/engine/editor/import/resource_importer_shader_file.cpp
@@ -32,7 +32,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/shader/shader_file_editor_plugin.h"
 #include "servers/rendering/rendering_device_binds.h"
diff --git a/engine/editor/import/resource_importer_svg.cpp b/engine/editor/import/resource_importer_svg.cpp
index d638919d..dfe29c5a 100644
--- a/engine/editor/import/resource_importer_svg.cpp
+++ b/engine/editor/import/resource_importer_svg.cpp
@@ -31,7 +31,6 @@
 #include "resource_importer_svg.h"
 
 #include "core/io/file_access.h"
-#include "core/io/resource_saver.h"
 #include "scene/resources/dpi_texture.h"
 
 String ResourceImporterSVG::get_importer_name() const {
@@ -70,8 +69,6 @@ void ResourceImporterSVG::get_import_options(const String &p_path, List<ImportOp
 	r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "base_scale", PROPERTY_HINT_RANGE, "0.001,100,0.001"), 1.0));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "saturation", PROPERTY_HINT_RANGE, "0.0,1.0,0.01"), 1.0));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::DICTIONARY, "color_map"), Dictionary()));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "fix_alpha_border"), false));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "premult_alpha"), false));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "compress"), true));
 }
 
@@ -84,16 +81,12 @@ Error ResourceImporterSVG::import(ResourceUID::ID p_source_id, const String &p_s
 
 	double base_scale = p_options["base_scale"];
 	double saturation = p_options["saturation"];
-	bool fix_alpha_border = p_options["fix_alpha_border"];
-	bool premult_alpha = p_options["premult_alpha"];
 	Dictionary color_map = p_options["color_map"];
 
 	dpi_tex->set_base_scale(base_scale);
 	dpi_tex->set_saturation(saturation);
 	dpi_tex->set_color_map(color_map);
 	dpi_tex->set_source(source);
-	dpi_tex->set_fix_alpha_border(fix_alpha_border);
-	dpi_tex->set_premult_alpha(premult_alpha);
 
 	ERR_FAIL_COND_V_MSG(dpi_tex->get_rid().is_null(), ERR_CANT_OPEN, vformat("Failed loading SVG, unsupported or invalid SVG data in \"%s\".", p_source_file));
 
diff --git a/engine/editor/import/resource_importer_texture.cpp b/engine/editor/import/resource_importer_texture.cpp
index da01ef73..db2d760e 100644
--- a/engine/editor/import/resource_importer_texture.cpp
+++ b/engine/editor/import/resource_importer_texture.cpp
@@ -33,14 +33,16 @@
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
+#include "core/version.h"
 #include "editor/file_system/editor_file_system.h"
+#include "editor/gui/editor_toaster.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/resources/compressed_texture.h"
 
-void ResourceImporterTexture::_texture_reimport_roughness(const Ref<CompressedTexture2D> &p_tex, const String &p_normal_path, RSE::TextureDetectRoughnessChannel p_channel) {
+void ResourceImporterTexture::_texture_reimport_roughness(const Ref<CompressedTexture2D> &p_tex, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_channel) {
 	ERR_FAIL_COND(p_tex.is_null());
 
 	MutexLock lock(singleton->mutex);
diff --git a/engine/editor/import/resource_importer_texture.h b/engine/editor/import/resource_importer_texture.h
index 04083920..bca73dbb 100644
--- a/engine/editor/import/resource_importer_texture.h
+++ b/engine/editor/import/resource_importer_texture.h
@@ -33,7 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class CompressedTexture2D;
 
@@ -74,12 +74,12 @@ protected:
 	struct MakeInfo {
 		int flags = 0;
 		String normal_path_for_roughness;
-		RSE::TextureDetectRoughnessChannel channel_for_roughness = RSE::TEXTURE_DETECT_ROUGHNESS_R;
+		RS::TextureDetectRoughnessChannel channel_for_roughness = RS::TEXTURE_DETECT_ROUGHNESS_R;
 	};
 
 	HashMap<StringName, MakeInfo> make_flags;
 
-	static void _texture_reimport_roughness(const Ref<CompressedTexture2D> &p_tex, const String &p_normal_path, RSE::TextureDetectRoughnessChannel p_channel);
+	static void _texture_reimport_roughness(const Ref<CompressedTexture2D> &p_tex, const String &p_normal_path, RenderingServer::TextureDetectRoughnessChannel p_channel);
 	static void _texture_reimport_3d(const Ref<CompressedTexture2D> &p_tex);
 	static void _texture_reimport_normal(const Ref<CompressedTexture2D> &p_tex);
 
diff --git a/engine/editor/import/resource_importer_texture_atlas.cpp b/engine/editor/import/resource_importer_texture_atlas.cpp
index 9b734bef..a439b1c6 100644
--- a/engine/editor/import/resource_importer_texture_atlas.cpp
+++ b/engine/editor/import/resource_importer_texture_atlas.cpp
@@ -30,11 +30,11 @@
 
 #include "resource_importer_texture_atlas.h"
 
+#include "atlas_import_failed.xpm"
 #include "core/config/project_settings.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/geometry_2d.h"
-#include "editor/import/atlas_import_failed.xpm"
 #include "editor/import/editor_atlas_packer.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/bit_map.h"
diff --git a/engine/editor/import/resource_importer_wav.cpp b/engine/editor/import/resource_importer_wav.cpp
index 365dea1f..1abaf6dd 100644
--- a/engine/editor/import/resource_importer_wav.cpp
+++ b/engine/editor/import/resource_importer_wav.cpp
@@ -31,7 +31,6 @@
 #include "resource_importer_wav.h"
 
 #include "core/io/resource_saver.h"
-#include "scene/resources/audio_stream_wav.h"
 
 String ResourceImporterWAV::get_importer_name() const {
 	return "wav";
diff --git a/engine/editor/import/resource_importer_wav.h b/engine/editor/import/resource_importer_wav.h
index 28f431b7..ba51db61 100644
--- a/engine/editor/import/resource_importer_wav.h
+++ b/engine/editor/import/resource_importer_wav.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/resource_importer.h"
+#include "scene/resources/audio_stream_wav.h"
 
 class ResourceImporterWAV : public ResourceImporter {
 	GDCLASS(ResourceImporterWAV, ResourceImporter);
diff --git a/engine/editor/import/unicode_ranges.inc b/engine/editor/import/unicode_ranges.inc
index 5e9c52bc..20e01b11 100644
--- a/engine/editor/import/unicode_ranges.inc
+++ b/engine/editor/import/unicode_ranges.inc
@@ -34,7 +34,7 @@
 #define UNICODE_RANGES_INC
 
 // Unicode Character Blocks
-// Source: https://www.unicode.org/Public/17.0.0/ucd/Blocks.txt
+// Source: https://www.unicode.org/Public/16.0.0/ucd/Blocks.txt
 
 struct UniRange {
 	int32_t start;
@@ -233,7 +233,6 @@ static UniRange unicode_ranges[] = {
 	{ 0x108E0, 0x108FF, U"Hatran" },
 	{ 0x10900, 0x1091F, U"Phoenician" },
 	{ 0x10920, 0x1093F, U"Lydian" },
-	{ 0x10940, 0x1095F, U"Sidetic" },
 	{ 0x10980, 0x1099F, U"Meroitic Hieroglyphs" },
 	{ 0x109A0, 0x109FF, U"Meroitic Cursive" },
 	{ 0x10A00, 0x10A5F, U"Kharoshthi" },
@@ -285,13 +284,11 @@ static UniRange unicode_ranges[] = {
 	{ 0x11AB0, 0x11ABF, U"Unified Canadian Aboriginal Syllabics Extended-A" },
 	{ 0x11AC0, 0x11AFF, U"Pau Cin Hau" },
 	{ 0x11B00, 0x11B5F, U"Devanagari Extended-A" },
-	{ 0x11B60, 0x11B7F, U"Sharada Supplement" },
 	{ 0x11BC0, 0x11BFF, U"Sunuwar" },
 	{ 0x11C00, 0x11C6F, U"Bhaiksuki" },
 	{ 0x11C70, 0x11CBF, U"Marchen" },
 	{ 0x11D00, 0x11D5F, U"Masaram Gondi" },
 	{ 0x11D60, 0x11DAF, U"Gunjala Gondi" },
-	{ 0x11DB0, 0x11DEF, U"Tolong Siki" },
 	{ 0x11EE0, 0x11EFF, U"Makasar" },
 	{ 0x11F00, 0x11F5F, U"Kawi" },
 	{ 0x11FB0, 0x11FBF, U"Lisu Supplement" },
@@ -311,14 +308,12 @@ static UniRange unicode_ranges[] = {
 	{ 0x16B00, 0x16B8F, U"Pahawh Hmong" },
 	{ 0x16D40, 0x16D7F, U"Kirat Rai" },
 	{ 0x16E40, 0x16E9F, U"Medefaidrin" },
-	{ 0x16EA0, 0x16EDF, U"Beria Erfe" },
 	{ 0x16F00, 0x16F9F, U"Miao" },
 	{ 0x16FE0, 0x16FFF, U"Ideographic Symbols and Punctuation" },
 	{ 0x17000, 0x187FF, U"Tangut" },
 	{ 0x18800, 0x18AFF, U"Tangut Components" },
 	{ 0x18B00, 0x18CFF, U"Khitan Small Script" },
 	{ 0x18D00, 0x18D7F, U"Tangut Supplement" },
-	{ 0x18D80, 0x18DFF, U"Tangut Components Supplement" },
 	{ 0x1AFF0, 0x1AFFF, U"Kana Extended-B" },
 	{ 0x1B000, 0x1B0FF, U"Kana Supplement" },
 	{ 0x1B100, 0x1B12F, U"Kana Extended-A" },
@@ -327,7 +322,6 @@ static UniRange unicode_ranges[] = {
 	{ 0x1BC00, 0x1BC9F, U"Duployan" },
 	{ 0x1BCA0, 0x1BCAF, U"Shorthand Format Controls" },
 	{ 0x1CC00, 0x1CEBF, U"Symbols for Legacy Computing Supplement" },
-	{ 0x1CEC0, 0x1CEFF, U"Miscellaneous Symbols Supplement" },
 	{ 0x1CF00, 0x1CFCF, U"Znamenny Musical Notation" },
 	{ 0x1D000, 0x1D0FF, U"Byzantine Musical Symbols" },
 	{ 0x1D100, 0x1D1FF, U"Musical Symbols" },
@@ -346,7 +340,6 @@ static UniRange unicode_ranges[] = {
 	{ 0x1E2C0, 0x1E2FF, U"Wancho" },
 	{ 0x1E4D0, 0x1E4FF, U"Nag Mundari" },
 	{ 0x1E5D0, 0x1E5FF, U"Ol Onal" },
-	{ 0x1E6C0, 0x1E6FF, U"Tai Yo" },
 	{ 0x1E7E0, 0x1E7FF, U"Ethiopic Extended-B" },
 	{ 0x1E800, 0x1E8DF, U"Mende Kikakui" },
 	{ 0x1E900, 0x1E95F, U"Adlam" },
@@ -378,7 +371,6 @@ static UniRange unicode_ranges[] = {
 	{ 0x2F800, 0x2FA1F, U"CJK Compatibility Ideographs Supplement" },
 	{ 0x30000, 0x3134F, U"CJK Unified Ideographs Extension G" },
 	{ 0x31350, 0x323AF, U"CJK Unified Ideographs Extension H" },
-	{ 0x323B0, 0x3347F, U"CJK Unified Ideographs Extension J" },
 	{ 0xF0000, 0xFFFFF, U"Supplementary Private Use Area-A" },
 	{ 0x100000, 0x10FFFF, U"Supplementary Private Use Area-B" },
 	{ 0x10FFFF, 0x10FFFF, String() }
diff --git a/engine/editor/inspector/add_metadata_dialog.cpp b/engine/editor/inspector/add_metadata_dialog.cpp
index 1c16cec2..0ad1f239 100644
--- a/engine/editor/inspector/add_metadata_dialog.cpp
+++ b/engine/editor/inspector/add_metadata_dialog.cpp
@@ -30,7 +30,6 @@
 
 #include "add_metadata_dialog.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/gui/editor_variant_type_selectors.h"
 #include "editor/themes/editor_scale.h"
@@ -65,7 +64,7 @@ AddMetadataDialog::AddMetadataDialog() {
 
 	validation_panel = memnew(EditorValidationPanel);
 	vbc->add_child(validation_panel);
-	validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Metadata name is valid."));
+	validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Metadata name is valid."));
 	validation_panel->set_update_callback(callable_mp(this, &AddMetadataDialog::_check_meta_name));
 	validation_panel->set_accept_button(get_ok_button());
 
@@ -105,12 +104,12 @@ void AddMetadataDialog::_check_meta_name() {
 	const String meta_name = add_meta_name->get_text();
 
 	if (meta_name.is_empty()) {
-		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Metadata name can't be empty."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Metadata name can't be empty."), EditorValidationPanel::MSG_ERROR);
 	} else if (!meta_name.is_valid_ascii_identifier()) {
-		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Metadata name must be a valid identifier."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Metadata name must be a valid identifier."), EditorValidationPanel::MSG_ERROR);
 	} else if (_existing_metas.find(meta_name)) {
 		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, vformat(TTR("Metadata with name \"%s\" already exists."), meta_name), EditorValidationPanel::MSG_ERROR);
 	} else if (meta_name[0] == '_') {
-		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Names starting with _ are reserved for editor-only metadata."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Names starting with _ are reserved for editor-only metadata."), EditorValidationPanel::MSG_ERROR);
 	}
 }
diff --git a/engine/editor/inspector/editor_context_menu_plugin.cpp b/engine/editor/inspector/editor_context_menu_plugin.cpp
index ed1aea6f..a8a22aaf 100644
--- a/engine/editor/inspector/editor_context_menu_plugin.cpp
+++ b/engine/editor/inspector/editor_context_menu_plugin.cpp
@@ -31,7 +31,6 @@
 #include "editor_context_menu_plugin.h"
 
 #include "core/input/shortcut.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/resources/texture.h"
diff --git a/engine/editor/inspector/editor_context_menu_plugin.h b/engine/editor/inspector/editor_context_menu_plugin.h
index 5847aa2a..49142c99 100644
--- a/engine/editor/inspector/editor_context_menu_plugin.h
+++ b/engine/editor/inspector/editor_context_menu_plugin.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 
 class InputEvent;
diff --git a/engine/editor/inspector/editor_inspector.compat.inc b/engine/editor/inspector/editor_inspector.compat.inc
index b623f408..53c410ba 100644
--- a/engine/editor/inspector/editor_inspector.compat.inc
+++ b/engine/editor/inspector/editor_inspector.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "editor_inspector.h"
-
-#include "core/object/class_db.h"
-
 void EditorInspectorPlugin::_add_property_editor_bind_compat_92322(const String &p_for_property, Control *p_prop, bool p_add_to_end) {
 	add_property_editor(p_for_property, p_prop, p_add_to_end, "");
 }
diff --git a/engine/editor/inspector/editor_inspector.cpp b/engine/editor/inspector/editor_inspector.cpp
index 5a4f0fa5..18b952ee 100644
--- a/engine/editor/inspector/editor_inspector.cpp
+++ b/engine/editor/inspector/editor_inspector.cpp
@@ -31,17 +31,10 @@
 #include "editor_inspector.h"
 #include "editor_inspector.compat.inc"
 
-#include "core/input/input.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/variant/typed_dictionary.h" // IWYU pragma: keep. For EditorDebuggerRemoteObjects.
 #include "editor/debugger/editor_debugger_inspector.h"
-#include "editor/debugger/editor_debugger_node.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/docks/inspector_dock.h"
-#include "editor/editor_interface.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -60,15 +53,11 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/scene_string_names.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 void EditorInspectorActionButton::_notification(int p_what) {
 	switch (p_what) {
@@ -299,40 +288,18 @@ void EditorProperty::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			bool use_help_bit = EDITOR_GET("interface/accessibility/property_descriptions");
-			String tooltip = get_tooltip_text();
-			if (use_help_bit && !tooltip.is_empty()) {
-				if (has_doc_tooltip) {
-					String symbol = tooltip;
-					String prologue;
-					const EditorInspector *inspector = get_parent_inspector();
-					if (inspector) {
-						const String custom_description = inspector->get_custom_property_description(tooltip);
-						if (!custom_description.is_empty()) {
-							if (!prologue.is_empty()) {
-								prologue += '\n';
-							}
-							prologue += custom_description;
-						}
-					}
-					AccessibilityServer::get_singleton()->update_set_description(ae, EditorHelpBit::get_as_plain_text(symbol, prologue));
-				} else {
-					AccessibilityServer::get_singleton()->update_set_description(ae, tooltip);
-				}
-			}
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Property: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Property: %s"), label));
 
-			AccessibilityServer::get_singleton()->update_set_name(ae, vformat(TTR("Property: %s"), label));
-			AccessibilityServer::get_singleton()->update_set_value(ae, vformat(TTR("Property: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorProperty::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &EditorProperty::_accessibility_action_click));
 
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_MENU);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorProperty::_accessibility_action_menu));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &EditorProperty::_accessibility_action_click));
-
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_READONLY, read_only);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, read_only);
 			if (checkable) {
-				AccessibilityServer::get_singleton()->update_set_checked(ae, checked);
+				DisplayServer::get_singleton()->accessibility_update_set_checked(ae, checked);
 			}
 		} break;
 
@@ -725,28 +692,6 @@ void EditorProperty::_notification(int p_what) {
 				get_parent()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorProperty::_update_property_bg));
 				_update_property_bg();
 			}
-
-			Node *parent = get_parent();
-			Node *prev_parent = nullptr;
-			while (parent && parent != inspector) {
-				if (prev_parent && parent->get_meta(SNAME("_has_categories"), false).operator bool()) {
-					for (int i = prev_parent->get_index() - 1; i >= 0; i--) {
-						EditorInspectorCategory *category = Object::cast_to<EditorInspectorCategory>(parent->get_child(i));
-						if (category) {
-							category->register_property(this);
-							break;
-						}
-					}
-					break;
-				}
-
-				EditorInspectorSection *section = Object::cast_to<EditorInspectorSection>(parent);
-				if (section) {
-					section->register_property(this);
-				}
-				prev_parent = parent;
-				parent = parent->get_parent();
-			}
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
@@ -788,8 +733,7 @@ StringName EditorProperty::get_edited_property() const {
 Variant EditorProperty::get_edited_property_display_value() const {
 	ERR_FAIL_NULL_V(object, Variant());
 	Control *control = Object::cast_to<Control>(object);
-	// If checked but it's empty, it means that the set value has just been undone, and should show the default value as well.
-	if (control && checkable && (!checked || get_edited_property_value() == Variant()) && String(property).begins_with("theme_override_")) {
+	if (checkable && !checked && control && String(property).begins_with("theme_override_")) {
 		return control->get_used_theme_item(property);
 	} else {
 		return get_edited_property_value();
@@ -1306,7 +1250,6 @@ bool EditorProperty::is_cache_valid() const {
 	}
 	return true;
 }
-
 void EditorProperty::update_cache() {
 	cache.clear();
 	if (object && property != StringName()) {
@@ -1317,15 +1260,6 @@ void EditorProperty::update_cache() {
 		}
 	}
 }
-
-void EditorProperty::set_deferred_drag_mode_enabled(bool p_enabled) {
-	deferred_drag_mode = p_enabled;
-}
-
-bool EditorProperty::is_deferred_drag_mode_enabled() const {
-	return deferred_drag_mode;
-}
-
 Variant EditorProperty::get_drag_data(const Point2 &p_point) {
 	if (property == StringName()) {
 		return Variant();
@@ -1481,21 +1415,17 @@ Control *EditorProperty::make_custom_tooltip(const String &p_text) const {
 void EditorProperty::menu_option(int p_option) {
 	switch (p_option) {
 		case MENU_COPY_VALUE: {
-			EditorInspector::set_property_clipboard(EditorInspector::PropertyClipboard::Type::PROPERTY, object->get(property));
+			EditorInspector::set_property_clipboard(object->get(property));
 		} break;
 		case MENU_PASTE_VALUE: {
-			if (EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::PROPERTY) {
-				return;
-			}
-
 			EditorPropertyResource *epr = Object::cast_to<EditorPropertyResource>(this);
 			if (epr) {
-				const Ref<Resource> res = EditorInspector::get_property_clipboard_value();
+				const Ref<Resource> res = InspectorDock::get_inspector_singleton()->get_property_clipboard();
 				if (res.is_valid() && !epr->get_resource_picker()->is_resource_allowed(res)) {
 					return;
 				}
 			}
-			emit_changed(property, EditorInspector::get_property_clipboard_value());
+			emit_changed(property, EditorInspector::get_property_clipboard());
 		} break;
 		case MENU_COPY_PROPERTY_PATH: {
 			DisplayServer::get_singleton()->clipboard_set(property_path);
@@ -1607,7 +1537,7 @@ void EditorProperty::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("property_favorited", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "favorited")));
 	ADD_SIGNAL(MethodInfo("property_pinned", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "pinned")));
 	ADD_SIGNAL(MethodInfo("property_can_revert_changed", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::BOOL, "can_revert")));
-	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static())));
+	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
 	ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::STRING_NAME, "property"), PropertyInfo(Variant::INT, "id")));
 	ADD_SIGNAL(MethodInfo("selected", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::INT, "focusable_idx")));
 
@@ -1650,9 +1580,9 @@ void EditorProperty::_update_popup() {
 	}
 	menu->add_icon_shortcut(theme_cache.copy_icon, ED_GET_SHORTCUT("property_editor/copy_value"), MENU_COPY_VALUE);
 	menu->add_icon_shortcut(theme_cache.paste_icon, ED_GET_SHORTCUT("property_editor/paste_value"), MENU_PASTE_VALUE);
-	menu->set_item_disabled(-1, read_only || EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::PROPERTY);
 	menu->add_icon_shortcut(theme_cache.copy_node_path_icon, ED_GET_SHORTCUT("property_editor/copy_property_path"), MENU_COPY_PROPERTY_PATH);
-	menu->set_item_disabled(-1, internal);
+	menu->set_item_disabled(MENU_PASTE_VALUE, is_read_only());
+	menu->set_item_disabled(MENU_COPY_PROPERTY_PATH, internal);
 
 	if (can_favorite || !pin_hidden) {
 		menu->add_separator();
@@ -1784,36 +1714,17 @@ void EditorInspectorCategory::_notification(int p_what) {
 			connect(SceneStringName(theme_changed), callable_mp(this, &EditorInspectorCategory::_theme_changed));
 		} break;
 
-		case NOTIFICATION_ENTER_TREE: {
-			VBoxContainer *parent_vbox = Object::cast_to<VBoxContainer>(get_parent());
-			if (parent_vbox) {
-				parent_vbox->set_meta(SNAME("_has_categories"), true);
-			}
-		} break;
-
 		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			bool use_help_bit = EDITOR_GET("interface/accessibility/property_descriptions");
-			String tooltip = get_tooltip_text();
-			if (use_help_bit && !tooltip.is_empty()) {
-				if (!doc_class_name.is_empty()) {
-					String symbol = tooltip;
-					String prologue;
-					AccessibilityServer::get_singleton()->update_set_description(ae, EditorHelpBit::get_as_plain_text(symbol, prologue));
-				} else {
-					AccessibilityServer::get_singleton()->update_set_description(ae, tooltip);
-				}
-			}
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Category: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Category: %s"), label));
 
-			AccessibilityServer::get_singleton()->update_set_name(ae, vformat(TTR("Category: %s"), label));
-			AccessibilityServer::get_singleton()->update_set_value(ae, vformat(TTR("Category: %s"), label));
-
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_MENU);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorInspectorCategory::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorInspectorCategory::_accessibility_action_menu));
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -1932,35 +1843,6 @@ Size2 EditorInspectorCategory::get_minimum_size() const {
 
 void EditorInspectorCategory::_handle_menu_option(int p_option) {
 	switch (p_option) {
-		case MENU_COPY_VALUE: {
-			Dictionary clipboard;
-			for (const EditorProperty *property : category_properties) {
-				clipboard[property->get_edited_property()] = property->get_edited_property_value();
-			}
-			EditorInspector::set_property_clipboard(EditorInspector::PropertyClipboard::Type::CATEGORY, clipboard);
-		} break;
-
-		case MENU_PASTE_VALUE: {
-			if (EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::CATEGORY) {
-				break;
-			}
-			const Dictionary clipboard = EditorInspector::get_property_clipboard_value();
-
-			EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-			ur->create_action(TTR("Paste category properties"));
-			for (EditorProperty *property : category_properties) {
-				if (property->is_read_only()) {
-					continue;
-				}
-				const StringName &property_name = property->get_edited_property();
-				if (clipboard.has(property_name)) {
-					ur->add_do_property(property->get_edited_object(), property_name, clipboard[property_name]);
-					ur->add_undo_property(property->get_edited_object(), property_name, property->get_edited_property_value());
-				}
-			}
-			ur->commit_action();
-		} break;
-
 		case MENU_OPEN_DOCS: {
 			ScriptEditor::get_singleton()->goto_help("class:" + doc_class_name);
 			EditorNode::get_singleton()->get_editor_main_screen()->select(EditorMainScreen::EDITOR_SCRIPT);
@@ -1983,9 +1865,6 @@ void EditorInspectorCategory::_popup_context_menu(const Point2i &p_position) {
 		if (is_favorite) {
 			menu->add_item(TTRC("Unfavorite All"), MENU_UNFAVORITE_ALL);
 		} else {
-			menu->add_icon_item(theme_cache.icon_copy, TTRC("Copy Category Values"), MENU_COPY_VALUE);
-			menu->add_icon_item(theme_cache.icon_paste, TTRC("Paste Category Values"), MENU_PASTE_VALUE);
-
 			menu->add_item(TTRC("Open Documentation"), MENU_OPEN_DOCS);
 			menu->set_item_disabled(-1, !EditorHelp::get_doc_data()->class_list.has(doc_class_name));
 		}
@@ -1994,10 +1873,6 @@ void EditorInspectorCategory::_popup_context_menu(const Point2i &p_position) {
 		add_child(menu);
 	}
 
-	if (!is_favorite) {
-		menu->set_item_disabled(MENU_PASTE_VALUE, EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::CATEGORY);
-	}
-
 	if (menu_icon_dirty) {
 		if (is_favorite) {
 			menu->set_item_icon(menu->get_item_index(MENU_UNFAVORITE_ALL), theme_cache.icon_unfavorite);
@@ -2110,34 +1985,12 @@ void EditorInspectorSection::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			bool use_help_bit = EDITOR_GET("interface/accessibility/property_descriptions");
-			String tooltip = get_tooltip_text();
-			if (use_help_bit && !tooltip.is_empty()) {
-				if (checkable) {
-					String symbol = tooltip;
-					String prologue;
-					const EditorInspector *inspector = _get_parent_inspector();
-					if (inspector) {
-						const String custom_description = inspector->get_custom_property_description(tooltip);
-						if (!custom_description.is_empty()) {
-							if (!prologue.is_empty()) {
-								prologue += '\n';
-							}
-							prologue += custom_description;
-						}
-					}
-					AccessibilityServer::get_singleton()->update_set_description(ae, EditorHelpBit::get_as_plain_text(symbol, prologue));
-				} else {
-					AccessibilityServer::get_singleton()->update_set_description(ae, tooltip);
-				}
-			}
-
-			AccessibilityServer::get_singleton()->update_set_name(ae, vformat(TTR("Section: %s"), label));
-			AccessibilityServer::get_singleton()->update_set_value(ae, vformat(TTR("Section: %s"), label));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &EditorInspectorSection::_accessibility_action_collapse));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &EditorInspectorSection::_accessibility_action_expand));
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Section: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Section: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &EditorInspectorSection::_accessibility_action_collapse));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &EditorInspectorSection::_accessibility_action_expand));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -2236,8 +2089,8 @@ void EditorInspectorSection::_notification(int p_what) {
 				Ref<Texture2D> key = theme_cache.icon_gui_animation_key;
 				if (keying && key.is_valid()) {
 					Point2 key_position;
-					key_position.x = (rtl ? margin_end : (get_size().width - key->get_width() - margin_end)) - theme_cache.padding_size / 2;
-					keying_rect = Rect2(key_position.x - theme_cache.padding_size / 2, 0, key->get_width() + theme_cache.padding_size, header_height);
+					key_position.x = (rtl ? margin_end : (get_size().width - key->get_width() - margin_end)) - theme_cache.key_padding_size / 2;
+					keying_rect = Rect2(key_position.x - theme_cache.key_padding_size / 2, 0, key->get_width() + theme_cache.key_padding_size, header_height);
 
 					Color key_color(1, 1, 1);
 					if (keying_hover) {
@@ -2245,7 +2098,8 @@ void EditorInspectorSection::_notification(int p_what) {
 						key_color.g *= 1.2;
 						key_color.b *= 1.2;
 
-						draw_style_box(theme_cache.icon_hover, keying_rect);
+						Ref<StyleBox> sb_hover = theme_cache.key_hover;
+						draw_style_box(sb_hover, keying_rect);
 					}
 					key_position.y = (header_height - key->get_height()) / 2;
 
@@ -2270,7 +2124,7 @@ void EditorInspectorSection::_notification(int p_what) {
 						checkbox_position.x = label_position.x - checkbox->get_width() - 2 * EDSCALE;
 					}
 					checkbox_position.y = (header_height - checkbox->get_height()) / 2;
-					label_position.y = light_font->get_ascent(light_font_size) + (header_height - light_font->get_height(light_font_size)) / 2;
+					label_position.y = light_font->get_ascent(light_font_size) + (header_height - label_size.height) / 2.0;
 
 					check_rect = Rect2(checkbox_position.x, 0, checkbox->get_width() + label_size.width + 2 * EDSCALE, header_height);
 
@@ -2292,30 +2146,6 @@ void EditorInspectorSection::_notification(int p_what) {
 					check_rect = Rect2();
 				}
 
-				// - Revert.
-				const Ref<Texture2D> &revert = theme_cache.icon_gui_revert;
-				if (can_revert && revert.is_valid()) {
-					Point2 revert_position;
-					revert_position.x = (rtl ? margin_end : (get_size().width - revert->get_width() - margin_end)) - theme_cache.padding_size / 2;
-					revert_rect = Rect2(revert_position.x - theme_cache.padding_size / 2, 0, revert->get_width() + theme_cache.padding_size, header_height);
-
-					Color revert_color(1, 1, 1);
-					if (revert_hover) {
-						revert_color.r *= 1.2;
-						revert_color.g *= 1.2;
-						revert_color.b *= 1.2;
-
-						draw_style_box(theme_cache.icon_hover, revert_rect);
-					}
-
-					revert_position.y = (header_height - revert->get_height()) / 2;
-
-					draw_texture(revert, revert_position, revert_color);
-					margin_end += revert_rect.size.width + theme_cache.horizontal_separation;
-				} else {
-					revert_rect = Rect2();
-				}
-
 				int available = get_size().width - (margin_start + margin_end);
 
 				// - Count of revertable properties.
@@ -2392,9 +2222,8 @@ void EditorInspectorSection::_notification(int p_what) {
 				dropping_unfold_timer->stop();
 			}
 
-			if (header_hover || revert_hover || check_hover || keying_hover) {
+			if (header_hover || check_hover || keying_hover) {
 				header_hover = false;
-				revert_hover = false;
 				check_hover = false;
 				keying_hover = false;
 				queue_redraw();
@@ -2402,8 +2231,8 @@ void EditorInspectorSection::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/timers")) {
-				dropping_unfold_timer->set_wait_time(EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds"));
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
+				dropping_unfold_timer->set_wait_time(EDITOR_GET("interface/editor/dragging_hover_wait_seconds"));
 			}
 		} break;
 	}
@@ -2482,10 +2311,9 @@ Control *EditorInspectorSection::make_custom_tooltip(const String &p_text) const
 	return nullptr;
 }
 
-void EditorInspectorSection::setup(const String &p_inspector_path, const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable, int p_indent_depth, int p_level) {
+void EditorInspectorSection::setup(const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable, int p_indent_depth, int p_level) {
 	section = p_section;
 	label = p_label;
-	inspector_path = p_inspector_path;
 	object = p_object;
 	bg_color = p_bg_color;
 	foldable = p_foldable;
@@ -2511,12 +2339,6 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
 	if (mm.is_valid()) {
 		Vector2 mpos = mm->get_position();
 
-		bool new_revert_hover = revert_rect.has_point(mpos);
-		if (new_revert_hover != revert_hover) {
-			revert_hover = new_revert_hover;
-			queue_redraw();
-		}
-
 		bool new_check_hover = check_rect.has_point(mpos);
 		if (new_check_hover != check_hover) {
 			check_hover = new_check_hover;
@@ -2564,12 +2386,7 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
 
 		accept_event();
 
-		bool is_valid_revert = false;
-		if (can_revert && revert_rect.has_point(pos)) {
-			Variant revert_value = EditorPropertyRevert::get_property_revert_value(object, related_enable_property, &is_valid_revert);
-			ERR_FAIL_COND(!is_valid_revert);
-		}
-		if (is_valid_revert || (checkable && check_rect.has_point(pos))) {
+		if (checkable && check_rect.has_point(pos)) {
 			checked = !checked;
 			emit_signal(SNAME("section_toggled_by_user"), related_enable_property, checked);
 			if (checked) {
@@ -2587,12 +2404,6 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
 				fold();
 			}
 		}
-	} else if ((!checkable || checked) && !inspector_path.is_empty() && mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) {
-		accept_event();
-		_update_popup();
-		menu->set_position(get_screen_position() + get_local_mouse_position());
-		menu->reset_size();
-		menu->popup();
 	} else if (mb.is_valid() && !mb->is_pressed()) {
 		queue_redraw();
 	}
@@ -2733,57 +2544,6 @@ void EditorInspectorSection::update_property() {
 
 	if (valid) {
 		set_checked(value_checked.operator bool());
-
-		bool new_can_revert = EditorPropertyRevert::can_property_revert(object, related_enable_property, &value_checked);
-		if (new_can_revert != can_revert) {
-			can_revert = new_can_revert;
-			queue_redraw();
-		}
-	}
-}
-
-void EditorInspectorSection::_update_popup() {
-	if (!menu) {
-		menu = memnew(PopupMenu);
-		add_child(menu);
-		menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorInspectorSection::menu_option));
-
-		menu->add_icon_item(theme_cache.icon_copy, TTRC("Copy Section Values"), MENU_COPY_VALUE);
-		menu->add_icon_item(theme_cache.icon_paste, TTRC("Paste Section Values"), MENU_PASTE_VALUE);
-	}
-	menu->set_item_disabled(MENU_PASTE_VALUE, EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::SECTION);
-}
-
-void EditorInspectorSection::menu_option(int p_option) const {
-	switch (p_option) {
-		case MENU_COPY_VALUE: {
-			Dictionary clipboard;
-			for (const EditorProperty *property : section_properties) {
-				clipboard[property->get_edited_property()] = property->get_edited_property_value();
-			}
-			EditorInspector::set_property_clipboard(EditorInspector::PropertyClipboard::Type::SECTION, clipboard);
-		} break;
-
-		case MENU_PASTE_VALUE: {
-			if (EditorInspector::get_property_clipboard_type() != EditorInspector::PropertyClipboard::Type::SECTION) {
-				break;
-			}
-			const Dictionary clipboard = EditorInspector::get_property_clipboard_value();
-
-			EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-			ur->create_action(TTR("Paste section properties"));
-			for (EditorProperty *property : section_properties) {
-				if (property->is_read_only()) {
-					continue;
-				}
-				const StringName &property_name = property->get_edited_property();
-				if (clipboard.has(property_name)) {
-					ur->add_do_property(property->get_edited_object(), property_name, clipboard[property_name]);
-					ur->add_undo_property(property->get_edited_object(), property_name, property->get_edited_property_value());
-				}
-			}
-			ur->commit_action();
-		} break;
 	}
 }
 
@@ -2804,7 +2564,7 @@ EditorInspectorSection::EditorInspectorSection() {
 	vbox->set_theme_type_variation(SNAME("EditorPropertyContainer"));
 
 	dropping_unfold_timer = memnew(Timer);
-	dropping_unfold_timer->set_wait_time(EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds"));
+	dropping_unfold_timer->set_wait_time(EDITOR_GET("interface/editor/dragging_hover_wait_seconds"));
 	dropping_unfold_timer->set_one_shot(true);
 	add_child(dropping_unfold_timer);
 	dropping_unfold_timer->connect("timeout", callable_mp(this, &EditorInspectorSection::unfold));
@@ -3503,13 +3263,13 @@ void ArrayPanelContainer::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			AccessibilityServer::get_singleton()->update_set_name(ae, get_meta("text"));
-			AccessibilityServer::get_singleton()->update_set_value(ae, get_meta("text"));
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_meta("text"));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, get_meta("text"));
 
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_MENU);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &ArrayPanelContainer::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &ArrayPanelContainer::_accessibility_action_menu));
 		} break;
 	}
 }
@@ -3524,8 +3284,8 @@ void EditorInspectorArray::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_name(ae, vformat(TTR("Array: %s"), get_label()));
-			AccessibilityServer::get_singleton()->update_set_value(ae, vformat(TTR("Array: %s"), get_label()));
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Array: %s"), get_label()));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Array: %s"), get_label()));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -3578,7 +3338,7 @@ void EditorInspectorArray::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("page_change_request"));
 }
 
-void EditorInspectorArray::setup_with_move_element_function(Object *p_object, const String &p_category, const String &p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_is_const, bool p_numbered, int p_page_length, const String &p_add_item_text) {
+void EditorInspectorArray::setup_with_move_element_function(Object *p_object, const String &p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_is_const, bool p_numbered, int p_page_length, const String &p_add_item_text) {
 	count_property = "";
 	mode = MODE_USE_MOVE_ARRAY_ELEMENT_FUNCTION;
 	array_element_prefix = p_array_element_prefix;
@@ -3588,12 +3348,12 @@ void EditorInspectorArray::setup_with_move_element_function(Object *p_object, co
 	page_length = p_page_length;
 	numbered = p_numbered;
 
-	EditorInspectorSection::setup(p_category + "/" + p_label.to_lower(), String(p_array_element_prefix) + "_array", p_label, p_object, p_bg_color, p_foldable, 0);
+	EditorInspectorSection::setup(String(p_array_element_prefix) + "_array", p_label, p_object, p_bg_color, p_foldable, 0);
 
 	_setup();
 }
 
-void EditorInspectorArray::setup_with_count_property(Object *p_object, const String &p_category, const String &p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_is_const, bool p_numbered, int p_page_length, const String &p_add_item_text, const String &p_swap_method) {
+void EditorInspectorArray::setup_with_count_property(Object *p_object, const String &p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable, bool p_is_const, bool p_numbered, int p_page_length, const String &p_add_item_text, const String &p_swap_method) {
 	count_property = p_count_property;
 	mode = MODE_USE_COUNT_PROPERTY;
 	array_element_prefix = p_array_element_prefix;
@@ -3605,7 +3365,7 @@ void EditorInspectorArray::setup_with_count_property(Object *p_object, const Str
 	swap_method = p_swap_method;
 
 	add_button->set_text(p_add_item_text);
-	EditorInspectorSection::setup(p_category + "/" + p_label.to_lower(), String(count_property) + "_array", p_label, p_object, p_bg_color, p_foldable, 0);
+	EditorInspectorSection::setup(String(count_property) + "_array", p_label, p_object, p_bg_color, p_foldable, 0);
 
 	_setup();
 }
@@ -3816,7 +3576,7 @@ void EditorInspector::initialize_section_theme(EditorInspectorSection::ThemeCach
 	p_cache.vertical_separation = p_control->get_theme_constant(SNAME("separation"), SNAME("EditorPropertyContainer"));
 	p_cache.inspector_margin = p_control->get_theme_constant(SNAME("inspector_margin"), EditorStringName(Editor));
 	p_cache.indent_size = p_control->get_theme_constant(SNAME("indent_size"), SNAME("EditorInspectorSection"));
-	p_cache.padding_size = int(EDITOR_GET("interface/theme/base_spacing")) * 2;
+	p_cache.key_padding_size = int(EDITOR_GET("interface/theme/base_spacing")) * 2;
 
 	p_cache.warning_color = p_control->get_theme_color(SNAME("warning_color"), EditorStringName(Editor));
 	p_cache.prop_subsection = p_control->get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor));
@@ -3837,15 +3597,12 @@ void EditorInspector::initialize_section_theme(EditorInspectorSection::ThemeCach
 	p_cache.arrow = p_control->get_theme_icon(SNAME("arrow"), SNAME("Tree"));
 	p_cache.arrow_collapsed = p_control->get_theme_icon(SNAME("arrow_collapsed"), SNAME("Tree"));
 	p_cache.arrow_collapsed_mirrored = p_control->get_theme_icon(SNAME("arrow_collapsed_mirrored"), SNAME("Tree"));
-	p_cache.icon_gui_revert = p_control->get_editor_theme_icon(SNAME("ReloadSmall"));
 	p_cache.icon_gui_checked = p_control->get_editor_theme_icon(SNAME("GuiChecked"));
 	p_cache.icon_gui_unchecked = p_control->get_editor_theme_icon(SNAME("GuiUnchecked"));
 	p_cache.icon_gui_animation_key = p_control->get_editor_theme_icon(SNAME("Key"));
-	p_cache.icon_copy = p_control->get_editor_theme_icon(SNAME("ActionCopy"));
-	p_cache.icon_paste = p_control->get_editor_theme_icon(SNAME("ActionPaste"));
 
 	p_cache.indent_box = p_control->get_theme_stylebox(SNAME("indent_box"), SNAME("EditorInspectorSection"));
-	p_cache.icon_hover = p_control->get_theme_stylebox(SceneStringName(hover), SceneStringName(FlatButton));
+	p_cache.key_hover = p_control->get_theme_stylebox(SceneStringName(hover), SceneStringName(FlatButton));
 }
 
 void EditorInspector::initialize_category_theme(EditorInspectorCategory::ThemeCache &p_cache, Control *p_control) {
@@ -3864,9 +3621,6 @@ void EditorInspector::initialize_category_theme(EditorInspectorCategory::ThemeCa
 	p_cache.bold_font = p_control->get_theme_font(SNAME("bold"), EditorStringName(EditorFonts));
 	p_cache.bold_font_size = p_control->get_theme_font_size(SNAME("bold_size"), EditorStringName(EditorFonts));
 
-	p_cache.icon_copy = p_control->get_editor_theme_icon(SNAME("ActionCopy"));
-	p_cache.icon_paste = p_control->get_editor_theme_icon(SNAME("ActionPaste"));
-
 	p_cache.icon_favorites = p_control->get_editor_theme_icon(SNAME("Favorites"));
 	p_cache.icon_unfavorite = p_control->get_editor_theme_icon(SNAME("Unfavorite"));
 	p_cache.icon_help = p_control->get_editor_theme_icon(SNAME("Help"));
@@ -4090,11 +3844,6 @@ void EditorInspector::update_tree() {
 		return;
 	}
 
-	if (!is_visible_in_tree()) {
-		update_tree_pending = true;
-		return;
-	}
-
 	bool root_inspector_was_following_focus = get_root_inspector()->is_following_focus();
 	if (root_inspector_was_following_focus) {
 		// Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating.
@@ -4166,11 +3915,6 @@ void EditorInspector::update_tree() {
 	}
 
 	String filter = search_box ? search_box->get_text() : "";
-	// If the inspector filter is active, make everything unfold.
-	bool old_use_folding_state = use_folding;
-	if (!filter.is_empty()) {
-		use_folding = false;
-	}
 	String group;
 	String group_base;
 	EditorInspectorSection *group_togglable_property = nullptr;
@@ -4193,14 +3937,17 @@ void EditorInspector::update_tree() {
 	bool sub_inspectors_enabled = EDITOR_GET("interface/inspector/open_resources_in_current_inspector");
 
 	if (!valid_plugins.is_empty()) {
+		// Show early to avoid sizing problems.
+		begin_vbox->show();
+
 		for (Ref<EditorInspectorPlugin> &ped : valid_plugins) {
 			ped->parse_begin(object);
 			_parse_added_editors(begin_vbox, nullptr, ped);
 		}
 
-		// Show if any of the editors were added to the beginning.
-		if (begin_vbox->get_child_count() > 0) {
-			begin_vbox->show();
+		// Hide it again if no editors were added to the beginning.
+		if (begin_vbox->get_child_count() == 0) {
+			begin_vbox->hide();
 		}
 	}
 
@@ -4551,7 +4298,7 @@ void EditorInspector::update_tree() {
 
 				Color c = sscolor;
 				c.a /= level;
-				section->setup((doc_name.is_empty() ? acc_path : String(doc_name) + (acc_path.is_empty() ? "" : "/" + acc_path)), acc_path, label, object, c, use_folding, section_depth, level);
+				section->setup(acc_path, label, object, c, use_folding, section_depth, level);
 				section->set_tooltip_text(tooltip);
 
 				section->connect("section_toggled_by_user", callable_mp(this, &EditorInspector::_section_toggled_by_user));
@@ -4618,7 +4365,7 @@ void EditorInspector::update_tree() {
 				String array_label = path.contains_char('/') ? path.substr(path.rfind_char('/') + 1) : path;
 				array_label = EditorPropertyNameProcessor::get_singleton()->process_name(property_label_string, property_name_style, p.name, doc_name);
 				int page = per_array_page.has(array_element_prefix) ? per_array_page[array_element_prefix] : 0;
-				editor_inspector_array->setup_with_move_element_function(object, p.hint_string, array_label, array_element_prefix, page, c, use_folding);
+				editor_inspector_array->setup_with_move_element_function(object, array_label, array_element_prefix, page, c, use_folding);
 				editor_inspector_array->connect("page_change_request", callable_mp(this, &EditorInspector::_page_change_request).bind(array_element_prefix));
 			} else if (p.type == Variant::INT) {
 				// Setup the array to use the count property and built-in functions to create/move/delete elements.
@@ -4627,7 +4374,7 @@ void EditorInspector::update_tree() {
 					editor_inspector_array = memnew(EditorInspectorArray(all_read_only));
 					int page = per_array_page.has(array_element_prefix) ? per_array_page[array_element_prefix] : 0;
 
-					editor_inspector_array->setup_with_count_property(object, p.hint_string, class_name_components[0], p.name, array_element_prefix, page, c, foldable, movable, is_const, numbered, page_size, add_button_text, swap_method);
+					editor_inspector_array->setup_with_count_property(object, class_name_components[0], p.name, array_element_prefix, page, c, foldable, movable, is_const, numbered, page_size, add_button_text, swap_method);
 					editor_inspector_array->connect("page_change_request", callable_mp(this, &EditorInspector::_page_change_request).bind(array_element_prefix));
 				}
 			}
@@ -4867,15 +4614,11 @@ void EditorInspector::update_tree() {
 				}
 
 				if (p.name.begins_with("metadata/")) {
-					if (property_read_only || all_read_only) {
-						ep->set_deletable(false);
-					} else {
-						Variant _default = Variant();
-						if (node != nullptr) {
-							_default = PropertyUtils::get_property_default_value(node, p.name, nullptr, &sstack, false, nullptr, nullptr);
-						}
-						ep->set_deletable(_default == Variant());
+					Variant _default = Variant();
+					if (node != nullptr) {
+						_default = PropertyUtils::get_property_default_value(node, p.name, nullptr, &sstack, false, nullptr, nullptr);
 					}
+					ep->set_deletable(_default == Variant());
 				} else {
 					ep->set_deletable(deletable_properties);
 				}
@@ -4978,8 +4721,7 @@ void EditorInspector::update_tree() {
 				get_root_inspector()->get_v_scroll_bar()->connect(SceneStringName(value_changed), callable_mp(section, &EditorInspectorSection::reset_timer).unbind(1));
 				favorites_groups_vbox->add_child(section);
 				parent_vbox = section->get_vbox();
-
-				section->setup("", "", section_name, object, sscolor, false);
+				section->setup("", section_name, object, sscolor, false);
 				section->set_tooltip_text(tooltip);
 
 				if (togglable_editor_inspector_sections.has(section_name)) {
@@ -5018,7 +4760,7 @@ void EditorInspector::update_tree() {
 					get_root_inspector()->get_v_scroll_bar()->connect(SceneStringName(value_changed), callable_mp(section, &EditorInspectorSection::reset_timer).unbind(1));
 					vbox->add_child(section);
 					vbox = section->get_vbox();
-					section->setup("", "", section_name, object, sscolor, false);
+					section->setup("", section_name, object, sscolor, false);
 					section->set_tooltip_text(tooltip);
 
 					if (togglable_editor_inspector_sections.has(KV.key + "/" + section_name)) {
@@ -5123,7 +4865,6 @@ void EditorInspector::update_tree() {
 	if (root_inspector_was_following_focus) {
 		get_root_inspector()->set_follow_focus(true);
 	}
-	use_folding = old_use_folding_state;
 }
 
 void EditorInspector::update_property(const String &p_prop) {
@@ -5207,7 +4948,7 @@ void EditorInspector::edit(Object *p_object) {
 		}
 		object->connect(CoreStringName(property_list_changed), callable_mp(this, &EditorInspector::_changed_callback));
 
-		can_favorite = Object::cast_to<Node>(object) || Object::cast_to<Resource>(object) || Object::cast_to<MultiNodeEdit>(object);
+		can_favorite = Object::cast_to<Node>(object) || Object::cast_to<Resource>(object);
 		_update_current_favorites();
 
 		update_tree();
@@ -5803,8 +5544,7 @@ void EditorInspector::_update_current_favorites() {
 	}
 
 	// Fetch built-in properties.
-	const MultiNodeEdit *multi_node_edit = Object::cast_to<MultiNodeEdit>(object);
-	StringName class_name = multi_node_edit ? multi_node_edit->get_edited_class_name() : object->get_class_name();
+	StringName class_name = object->get_class_name();
 	for (const KeyValue<String, PackedStringArray> &KV : favorites) {
 		if (ClassDB::is_parent_class(class_name, KV.key)) {
 			current_favorites.append_array(KV.value);
@@ -5817,8 +5557,7 @@ void EditorInspector::_set_property_favorited(const String &p_path, bool p_favor
 		return;
 	}
 
-	const MultiNodeEdit *mne = Object::cast_to<MultiNodeEdit>(object);
-	StringName validate_name = mne ? mne->get_edited_class_name() : object->get_class_name();
+	StringName validate_name = object->get_class_name();
 	StringName class_name;
 
 	String theme_property;
@@ -6023,7 +5762,7 @@ void EditorInspector::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (use_settings_name_style && EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localization/localize_settings")) {
+			if (use_settings_name_style && EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localize_settings")) {
 				EditorPropertyNameProcessor::Style style = EditorPropertyNameProcessor::get_settings_style();
 				if (property_name_style != style) {
 					property_name_style = style;
@@ -6072,7 +5811,7 @@ void EditorInspector::add_custom_property_description(const String &p_class, con
 String EditorInspector::get_custom_property_description(const String &p_property) const {
 	HashMap<String, String>::ConstIterator E = custom_property_descriptions.find(p_property);
 	if (E) {
-		return TTR(E->value);
+		return E->value;
 	}
 	return "";
 }
@@ -6098,9 +5837,12 @@ void EditorInspector::set_restrict_to_basic_settings(bool p_restrict) {
 	update_tree();
 }
 
-void EditorInspector::set_property_clipboard(EditorInspector::PropertyClipboard::Type p_type, const Variant &p_value) {
-	property_clipboard.type = p_type;
-	property_clipboard.value = p_value;
+void EditorInspector::set_property_clipboard(const Variant &p_value) {
+	property_clipboard = p_value;
+}
+
+Variant EditorInspector::get_property_clipboard() {
+	return property_clipboard;
 }
 
 void EditorInspector::_show_add_meta_dialog() {
@@ -6162,7 +5904,7 @@ void EditorInspector::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("property_selected", PropertyInfo(Variant::STRING, "property")));
 	ADD_SIGNAL(MethodInfo("property_keyed", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::NIL, "value", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT), PropertyInfo(Variant::BOOL, "advance")));
 	ADD_SIGNAL(MethodInfo("property_deleted", PropertyInfo(Variant::STRING, "property")));
-	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static()), PropertyInfo(Variant::STRING, "path")));
+	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), PropertyInfo(Variant::STRING, "path")));
 	ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::INT, "id")));
 	ADD_SIGNAL(MethodInfo("property_edited", PropertyInfo(Variant::STRING, "property")));
 	ADD_SIGNAL(MethodInfo("property_toggled", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::BOOL, "checked")));
@@ -6171,6 +5913,8 @@ void EditorInspector::_bind_methods() {
 }
 
 EditorInspector::EditorInspector() {
+	object = nullptr;
+
 	base_vbox = memnew(VBoxContainer);
 	base_vbox->set_theme_type_variation(SNAME("EditorInspectorContainer"));
 	base_vbox->set_h_size_flags(SIZE_EXPAND_FILL);
diff --git a/engine/editor/inspector/editor_inspector.h b/engine/editor/inspector/editor_inspector.h
index bc0d8914..5e9df77e 100644
--- a/engine/editor/inspector/editor_inspector.h
+++ b/engine/editor/inspector/editor_inspector.h
@@ -195,7 +195,6 @@ private:
 	bool selectable = true;
 	bool selected = false;
 	int selected_focusable;
-	bool deferred_drag_mode = false;
 
 	float split_ratio;
 
@@ -278,7 +277,7 @@ public:
 	void set_draw_warning(bool p_draw_warning);
 	bool is_draw_warning() const;
 
-	virtual void set_keying(bool p_keying);
+	void set_keying(bool p_keying);
 	bool is_keying() const;
 
 	virtual bool is_colored(ColorationMode p_mode) { return false; }
@@ -309,9 +308,6 @@ public:
 	virtual void update_cache();
 	virtual bool is_cache_valid() const;
 
-	virtual void set_deferred_drag_mode_enabled(bool p_enabled = true);
-	bool is_deferred_drag_mode_enabled() const;
-
 	void set_selectable(bool p_selectable);
 	bool is_selectable() const;
 
@@ -381,8 +377,6 @@ class EditorInspectorCategory : public Control {
 
 	// Right-click context menu options.
 	enum ClassMenuOption {
-		MENU_COPY_VALUE,
-		MENU_PASTE_VALUE,
 		MENU_OPEN_DOCS,
 		MENU_UNFAVORITE_ALL,
 	};
@@ -397,8 +391,6 @@ class EditorInspectorCategory : public Control {
 		Ref<Font> bold_font;
 		int bold_font_size = 0;
 
-		Ref<Texture2D> icon_copy;
-		Ref<Texture2D> icon_paste;
 		Ref<Texture2D> icon_favorites;
 		Ref<Texture2D> icon_unfavorite;
 		Ref<Texture2D> icon_help;
@@ -415,8 +407,6 @@ class EditorInspectorCategory : public Control {
 	bool is_favorite = false;
 	bool menu_icon_dirty = true;
 
-	LocalVector<EditorProperty *> category_properties;
-
 	void _handle_menu_option(int p_option);
 	void _popup_context_menu(const Point2i &p_position);
 	void _update_icon();
@@ -435,8 +425,6 @@ public:
 	void set_property_info(const PropertyInfo &p_info);
 	void set_doc_class_name(const String &p_name);
 
-	void register_property(EditorProperty *p_property) { category_properties.push_back(p_property); }
-
 	virtual Size2 get_minimum_size() const override;
 	virtual Control *make_custom_tooltip(const String &p_text) const override;
 
@@ -448,14 +436,8 @@ class EditorInspectorSection : public Container {
 
 	friend class EditorInspector;
 
-	enum MenuItems {
-		MENU_COPY_VALUE,
-		MENU_PASTE_VALUE,
-	};
-
 	String label;
 	String section;
-	String inspector_path;
 	Color bg_color;
 	bool vbox_added = false; // Optimization.
 	bool foldable = false;
@@ -469,8 +451,6 @@ class EditorInspectorSection : public Container {
 	Timer *dropping_unfold_timer = nullptr;
 	bool dropping_for_unfold = false;
 
-	Rect2 revert_rect;
-	bool revert_hover = false;
 	Rect2 check_rect;
 	bool check_hover = false;
 	Rect2 keying_rect;
@@ -479,12 +459,7 @@ class EditorInspectorSection : public Container {
 
 	bool checkbox_only = false;
 
-	PopupMenu *menu = nullptr;
-
 	HashSet<StringName> revertable_properties;
-	bool can_revert = false;
-
-	LocalVector<EditorProperty *> section_properties;
 
 	void _test_unfold();
 	int _get_header_height();
@@ -498,7 +473,7 @@ class EditorInspectorSection : public Container {
 		int vertical_separation = 0;
 		int inspector_margin = 0;
 		int indent_size = 0;
-		int padding_size = 0;
+		int key_padding_size = 0;
 
 		Color warning_color;
 		Color prop_subsection;
@@ -519,15 +494,12 @@ class EditorInspectorSection : public Container {
 		Ref<Texture2D> arrow;
 		Ref<Texture2D> arrow_collapsed;
 		Ref<Texture2D> arrow_collapsed_mirrored;
-		Ref<Texture2D> icon_gui_revert;
 		Ref<Texture2D> icon_gui_checked;
 		Ref<Texture2D> icon_gui_unchecked;
 		Ref<Texture2D> icon_gui_animation_key;
-		Ref<Texture2D> icon_copy;
-		Ref<Texture2D> icon_paste;
 
 		Ref<StyleBoxFlat> indent_box;
-		Ref<StyleBoxFlat> icon_hover;
+		Ref<StyleBoxFlat> key_hover;
 	} theme_cache;
 
 protected:
@@ -545,10 +517,9 @@ public:
 	virtual Size2 get_minimum_size() const override;
 	virtual Control *make_custom_tooltip(const String &p_text) const override;
 
-	void setup(const String &p_inspector_path, const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable, int p_indent_depth = 0, int p_level = 1);
+	void setup(const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable, int p_indent_depth = 0, int p_level = 1);
 	String get_section() const;
 	String get_label() const { return label; }
-	String get_inspector_path() const { return inspector_path; }
 	VBoxContainer *get_vbox();
 	void unfold();
 	void fold();
@@ -564,11 +535,6 @@ public:
 	void _property_edited(const String &p_property);
 	void update_property();
 
-	void _update_popup();
-	void menu_option(int p_option) const;
-
-	void register_property(EditorProperty *p_property) { section_properties.push_back(p_property); }
-
 	EditorInspectorSection();
 	~EditorInspectorSection();
 };
@@ -688,8 +654,8 @@ protected:
 	static void _bind_methods();
 
 public:
-	void setup_with_move_element_function(Object *p_object, const String &p_category, const String &p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_is_const = false, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "");
-	void setup_with_count_property(Object *p_object, const String &p_category, const String &p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_is_const = false, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "", const String &p_swap_method = "");
+	void setup_with_move_element_function(Object *p_object, const String &p_label, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_is_const = false, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "");
+	void setup_with_count_property(Object *p_object, const String &p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_is_const = false, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "", const String &p_swap_method = "");
 	VBoxContainer *get_vbox(int p_index);
 
 	void show_menu(int p_index, const Vector2 &p_offset);
@@ -730,21 +696,6 @@ class EditorInspector : public ScrollContainer {
 
 	friend class EditorPropertyResource;
 
-public:
-	struct PropertyClipboard {
-		enum class Type {
-			EMPTY,
-			PROPERTY,
-			SECTION,
-			CATEGORY,
-		};
-		Type type = Type::EMPTY;
-		Variant value;
-
-		PropertyClipboard() {}
-	};
-
-private:
 	enum {
 		MAX_PLUGINS = 1024
 	};
@@ -825,7 +776,8 @@ private:
 
 	String property_prefix; // Used for sectioned inspector.
 	String object_class;
-	static inline PropertyClipboard property_clipboard;
+
+	static inline Variant property_clipboard;
 
 	bool restrict_to_basic = false;
 
@@ -893,9 +845,8 @@ public:
 	static void initialize_category_theme(EditorInspectorCategory::ThemeCache &p_cache, Control *p_control);
 	static void initialize_property_theme(EditorProperty::ThemeCache &p_cache, Control *p_control);
 
-	static void set_property_clipboard(PropertyClipboard::Type p_type, const Variant &p_value);
-	static PropertyClipboard::Type get_property_clipboard_type() { return property_clipboard.type; }
-	static Variant get_property_clipboard_value() { return property_clipboard.value; }
+	static void set_property_clipboard(const Variant &p_value);
+	static Variant get_property_clipboard();
 
 	bool is_main_editor_inspector() const;
 	String get_selected_path() const;
diff --git a/engine/editor/inspector/editor_preview_plugins.cpp b/engine/editor/inspector/editor_preview_plugins.cpp
index 083e9d2a..52a31773 100644
--- a/engine/editor/inspector/editor_preview_plugins.cpp
+++ b/engine/editor/inspector/editor_preview_plugins.cpp
@@ -33,7 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
@@ -46,7 +45,6 @@
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/rendering/rendering_server.h"
 
 void post_process_preview(Ref<Image> p_image) {
 	if (p_image->get_format() != Image::FORMAT_RGBA8) {
@@ -363,7 +361,7 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
 	scenario = RS::get_singleton()->scenario_create();
 
 	viewport = RS::get_singleton()->viewport_create();
-	RS::get_singleton()->viewport_set_update_mode(viewport, RSE::VIEWPORT_UPDATE_DISABLED);
+	RS::get_singleton()->viewport_set_update_mode(viewport, RS::VIEWPORT_UPDATE_DISABLED);
 	RS::get_singleton()->viewport_set_scenario(viewport, scenario);
 	RS::get_singleton()->viewport_set_size(viewport, 128, 128);
 	RS::get_singleton()->viewport_set_transparent_background(viewport, true);
@@ -433,27 +431,27 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
 				Vector3(x0 * zr0, z0, y0 * zr0)
 			};
 
-#define ADD_POINT(m_idx) \
-	normals.push_back(v[m_idx]); \
-	vertices.push_back(v[m_idx] * radius); \
-	{ \
-		Vector2 uv; \
-		if (j >= lons / 2) { \
+#define ADD_POINT(m_idx)                                                                               \
+	normals.push_back(v[m_idx]);                                                                       \
+	vertices.push_back(v[m_idx] * radius);                                                             \
+	{                                                                                                  \
+		Vector2 uv;                                                                                    \
+		if (j >= lons / 2) {                                                                           \
 			uv = Vector2(Math::atan2(-v[m_idx].x, -v[m_idx].z), Math::atan2(v[m_idx].y, -v[m_idx].z)); \
-		} else { \
-			uv = Vector2(Math::atan2(v[m_idx].x, v[m_idx].z), Math::atan2(-v[m_idx].y, v[m_idx].z)); \
-		} \
-		uv /= Math::PI; \
-		uv *= 4.0; \
-		uv = uv * 0.5 + Vector2(0.5, 0.5); \
-		uvs.push_back(uv); \
-	} \
-	{ \
-		Vector3 t = tt.xform(v[m_idx]); \
-		tangents.push_back(t.x); \
-		tangents.push_back(t.y); \
-		tangents.push_back(t.z); \
-		tangents.push_back(1.0); \
+		} else {                                                                                       \
+			uv = Vector2(Math::atan2(v[m_idx].x, v[m_idx].z), Math::atan2(-v[m_idx].y, v[m_idx].z));   \
+		}                                                                                              \
+		uv /= Math::PI;                                                                                \
+		uv *= 4.0;                                                                                     \
+		uv = uv * 0.5 + Vector2(0.5, 0.5);                                                             \
+		uvs.push_back(uv);                                                                             \
+	}                                                                                                  \
+	{                                                                                                  \
+		Vector3 t = tt.xform(v[m_idx]);                                                                \
+		tangents.push_back(t.x);                                                                       \
+		tangents.push_back(t.y);                                                                       \
+		tangents.push_back(t.z);                                                                       \
+		tangents.push_back(1.0);                                                                       \
 	}
 
 			ADD_POINT(0);
@@ -467,12 +465,12 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
 	}
 
 	Array arr;
-	arr.resize(RSE::ARRAY_MAX);
-	arr[RSE::ARRAY_VERTEX] = vertices;
-	arr[RSE::ARRAY_NORMAL] = normals;
-	arr[RSE::ARRAY_TANGENT] = tangents;
-	arr[RSE::ARRAY_TEX_UV] = uvs;
-	RS::get_singleton()->mesh_add_surface_from_arrays(sphere, RSE::PRIMITIVE_TRIANGLES, arr);
+	arr.resize(RS::ARRAY_MAX);
+	arr[RS::ARRAY_VERTEX] = vertices;
+	arr[RS::ARRAY_NORMAL] = normals;
+	arr[RS::ARRAY_TANGENT] = tangents;
+	arr[RS::ARRAY_TEX_UV] = uvs;
+	RS::get_singleton()->mesh_add_surface_from_arrays(sphere, RS::PRIMITIVE_TRIANGLES, arr);
 }
 
 EditorMaterialPreviewPlugin::~EditorMaterialPreviewPlugin() {
@@ -783,7 +781,7 @@ EditorMeshPreviewPlugin::EditorMeshPreviewPlugin() {
 	scenario = RS::get_singleton()->scenario_create();
 
 	viewport = RS::get_singleton()->viewport_create();
-	RS::get_singleton()->viewport_set_update_mode(viewport, RSE::VIEWPORT_UPDATE_DISABLED);
+	RS::get_singleton()->viewport_set_update_mode(viewport, RS::VIEWPORT_UPDATE_DISABLED);
 	RS::get_singleton()->viewport_set_scenario(viewport, scenario);
 	RS::get_singleton()->viewport_set_size(viewport, 128, 128);
 	RS::get_singleton()->viewport_set_transparent_background(viewport, true);
@@ -808,7 +806,7 @@ EditorMeshPreviewPlugin::EditorMeshPreviewPlugin() {
 
 	light2 = RS::get_singleton()->directional_light_create();
 	RS::get_singleton()->light_set_color(light2, Color(0.7, 0.7, 0.7));
-	//RS::get_singleton()->light_set_color(light2, RSE::LIGHT_COLOR_SPECULAR, Color(0.0, 0.0, 0.0));
+	//RS::get_singleton()->light_set_color(light2, RS::LIGHT_COLOR_SPECULAR, Color(0.0, 0.0, 0.0));
 	light_instance2 = RS::get_singleton()->instance_create2(light2, scenario);
 
 	RS::get_singleton()->instance_set_transform(light_instance2, Transform3D().looking_at(Vector3(0, 1, 0), Vector3(0, 0, 1)));
@@ -899,7 +897,7 @@ Ref<Texture2D> EditorFontPreviewPlugin::generate(const Ref<Resource> &p_from, co
 
 EditorFontPreviewPlugin::EditorFontPreviewPlugin() {
 	viewport = RS::get_singleton()->viewport_create();
-	RS::get_singleton()->viewport_set_update_mode(viewport, RSE::VIEWPORT_UPDATE_DISABLED);
+	RS::get_singleton()->viewport_set_update_mode(viewport, RS::VIEWPORT_UPDATE_DISABLED);
 	RS::get_singleton()->viewport_set_size(viewport, 128, 128);
 	RS::get_singleton()->viewport_set_active(viewport, true);
 	viewport_texture = RS::get_singleton()->viewport_get_texture(viewport);
diff --git a/engine/editor/inspector/editor_properties.cpp b/engine/editor/inspector/editor_properties.cpp
index c1dd6248..2f316e89 100644
--- a/engine/editor/inspector/editor_properties.cpp
+++ b/engine/editor/inspector/editor_properties.cpp
@@ -32,10 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
-#include "core/io/marshalls.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/docks/scene_tree_dock.h"
@@ -50,7 +46,7 @@
 #include "editor/inspector/editor_resource_picker.h"
 #include "editor/inspector/property_selector.h"
 #include "editor/scene/scene_tree_editor.h"
-#include "editor/script/syntax_highlighters.h"
+#include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/settings/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
@@ -60,14 +56,10 @@
 #include "scene/gui/color_picker.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/text_edit.h"
-#include "scene/gui/texture_button.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/sky.h"
 #include "scene/resources/visual_shader_nodes.h"
-#include "servers/display/display_server.h"
 
 ///////////////////// NIL /////////////////////////
 
@@ -103,10 +95,6 @@ void EditorPropertyVariant::_popup_edit_menu() {
 	change_type->popup();
 }
 
-void EditorPropertyVariant::_object_id_selected(const StringName &p_property, ObjectID p_id) {
-	emit_signal(SNAME("object_id_selected"), p_property, p_id);
-}
-
 void EditorPropertyVariant::_set_read_only(bool p_read_only) {
 	edit_button->set_disabled(p_read_only);
 	if (sub_property) {
@@ -135,14 +123,7 @@ void EditorPropertyVariant::update_property() {
 		}
 
 		if (current_type == Variant::OBJECT) {
-			Object *obj = value.get_validated_object();
-			if (Object::cast_to<EncodedObjectAsID>(obj)) {
-				EditorPropertyObjectID *editor = memnew(EditorPropertyObjectID);
-				editor->setup("Object");
-				sub_property = editor;
-			} else {
-				sub_property = EditorInspector::instantiate_property_editor(nullptr, current_type, "", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static(), PROPERTY_USAGE_NONE);
-			}
+			sub_property = EditorInspector::instantiate_property_editor(nullptr, current_type, "", PROPERTY_HINT_RESOURCE_TYPE, "Resource", PROPERTY_USAGE_NONE);
 		} else {
 			sub_property = EditorInspector::instantiate_property_editor(nullptr, current_type, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE);
 		}
@@ -155,7 +136,6 @@ void EditorPropertyVariant::update_property() {
 		sub_property->set_read_only(is_read_only());
 		sub_property->set_h_size_flags(SIZE_EXPAND_FILL);
 		sub_property->connect(SNAME("property_changed"), callable_mp((EditorProperty *)this, &EditorProperty::emit_changed));
-		sub_property->connect(SNAME("object_id_selected"), callable_mp(this, &EditorPropertyVariant::_object_id_selected));
 		content->add_child(sub_property);
 		content->move_child(sub_property, 0);
 		sub_property->update_property();
@@ -581,7 +561,6 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
 	option_button->set_h_size_flags(SIZE_EXPAND_FILL);
 	option_button->set_clip_text(true);
 	option_button->set_flat(true);
-	option_button->set_search_bar_enabled_on_item_count(10);
 	option_button->set_theme_type_variation(SNAME("EditorInspectorButton"));
 	option_button->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	default_layout->add_child(option_button);
@@ -989,7 +968,6 @@ EditorPropertyEnum::EditorPropertyEnum() {
 	options->set_flat(true);
 	options->set_theme_type_variation(SNAME("EditorInspectorButton"));
 	options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	options->set_search_bar_enabled_on_item_count(10);
 	add_child(options);
 	add_focusable(options);
 	options->connect(SceneStringName(item_selected), callable_mp(this, &EditorPropertyEnum::_option_selected));
@@ -1039,10 +1017,6 @@ void EditorPropertyFlags::setup(const Vector<String> &p_options) {
 		Vector<String> text_split = option.split(":");
 		if (text_split.size() != 1) {
 			current_val = text_split[1].to_int();
-			// Skip entries like "None:0" (it's not an actual flag).
-			if (current_val == 0) {
-				continue;
-			}
 		} else {
 			current_val = 1u << i;
 		}
@@ -1077,10 +1051,8 @@ void EditorPropertyLayersGrid::_rename_pressed(int p_menu) {
 	// Show rename popup for active layer.
 	ERR_FAIL_INDEX(renamed_layer_index, names.size());
 	String name = names[renamed_layer_index];
-	rename_dialog->set_title(vformat(TTR("Renaming Layer %d:"), renamed_layer_index + 1));
+	rename_dialog->set_title(vformat(TTR("Renaming layer %d:"), renamed_layer_index + 1));
 	rename_dialog_text->set_text(name);
-	// Indicate that leaving it blank reverts back to "Layer [Number]".
-	rename_dialog_text->set_placeholder(vformat(TTR("Layer %d"), renamed_layer_index + 1));
 	rename_dialog_text->select(0, name.length());
 	rename_dialog->popup_centered(Size2(300, 80) * EDSCALE);
 	rename_dialog_text->grab_focus();
@@ -1088,13 +1060,15 @@ void EditorPropertyLayersGrid::_rename_pressed(int p_menu) {
 
 void EditorPropertyLayersGrid::_rename_operation_confirm() {
 	String new_name = rename_dialog_text->get_text().strip_edges();
-	if (new_name.contains_char('/') || new_name.contains_char('\\') || new_name.contains_char(':')) {
+	if (new_name.length() == 0) {
+		EditorNode::get_singleton()->show_warning(TTR("No name provided."));
+		return;
+	} else if (new_name.contains_char('/') || new_name.contains_char('\\') || new_name.contains_char(':')) {
 		EditorNode::get_singleton()->show_warning(TTR("Name contains invalid characters."));
 		return;
 	}
-
 	names.set(renamed_layer_index, new_name);
-	tooltips.set(renamed_layer_index, new_name + "\n" + vformat(TTR("Bit %d, Value %d"), renamed_layer_index, 1u << renamed_layer_index));
+	tooltips.set(renamed_layer_index, new_name + "\n" + vformat(TTR("Bit %d, value %d"), renamed_layer_index, 1u << renamed_layer_index));
 	emit_signal(SNAME("rename_confirmed"), renamed_layer_index, new_name);
 }
 
@@ -1109,7 +1083,7 @@ EditorPropertyLayersGrid::EditorPropertyLayersGrid() {
 	rename_dialog->register_text_enter(rename_dialog_text);
 	rename_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorPropertyLayersGrid::_rename_operation_confirm));
 	layer_rename = memnew(PopupMenu);
-	layer_rename->add_item(TTR("Rename Layer"), 0);
+	layer_rename->add_item(TTR("Rename layer"), 0);
 	add_child(layer_rename);
 	layer_rename->connect(SceneStringName(id_pressed), callable_mp(this, &EditorPropertyLayersGrid::_rename_pressed));
 }
@@ -1253,6 +1227,15 @@ void EditorPropertyLayersGrid::gui_input(const Ref<InputEvent> &p_ev) {
 
 void EditorPropertyLayersGrid::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Layers grid property editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			Size2 grid_size = get_grid_size();
 			grid_size.x = get_size().x;
@@ -1582,12 +1565,6 @@ void EditorPropertyInteger::_value_changed(int64_t val) {
 	emit_changed(get_edited_property(), val);
 }
 
-void EditorPropertyInteger::set_deferred_drag_mode_enabled(bool p_enabled) {
-	EditorProperty::set_deferred_drag_mode_enabled(p_enabled);
-
-	spin->set_deferred_drag_mode_enabled(p_enabled);
-}
-
 void EditorPropertyInteger::update_property() {
 	int64_t val = get_edited_property_display_value();
 	spin->set_value_no_signal(val);
@@ -1624,24 +1601,12 @@ EditorPropertyInteger::EditorPropertyInteger() {
 
 ///////////////////// OBJECT ID /////////////////////////
 
-ObjectID EditorPropertyObjectID::_get_object_id() const {
-	const Variant value = get_edited_property_value();
-	if (value.get_type() == Variant::OBJECT) {
-		Object *obj = value.get_validated_object();
-		EncodedObjectAsID *obj_as_id = Object::cast_to<EncodedObjectAsID>(obj);
-		if (obj_as_id) {
-			return obj_as_id->get_object_id();
-		}
-	}
-	return value;
+void EditorPropertyObjectID::_set_read_only(bool p_read_only) {
+	edit->set_disabled(p_read_only);
 }
 
 void EditorPropertyObjectID::_edit_pressed() {
-	emit_signal(SNAME("object_id_selected"), get_edited_property(), _get_object_id());
-}
-
-void EditorPropertyObjectID::_set_read_only(bool p_read_only) {
-	edit->set_disabled(p_read_only);
+	emit_signal(SNAME("object_id_selected"), get_edited_property(), get_edited_property_value());
 }
 
 void EditorPropertyObjectID::update_property() {
@@ -1650,10 +1615,10 @@ void EditorPropertyObjectID::update_property() {
 		type = "Object";
 	}
 
-	const ObjectID id = _get_object_id();
+	ObjectID id = get_edited_property_value();
 	if (id.is_valid()) {
-		edit->set_text(type + ": " + uitos(id));
-		edit->set_tooltip_text(type + ": " + uitos(id));
+		edit->set_text(type + " ID: " + uitos(id));
+		edit->set_tooltip_text(type + " ID: " + uitos(id));
 		edit->set_disabled(false);
 		edit->set_button_icon(EditorNode::get_singleton()->get_class_icon(type));
 	} else {
@@ -1737,12 +1702,6 @@ void EditorPropertyFloat::_value_changed(double val) {
 	emit_changed(get_edited_property(), val);
 }
 
-void EditorPropertyFloat::set_deferred_drag_mode_enabled(bool p_enabled) {
-	EditorProperty::set_deferred_drag_mode_enabled(p_enabled);
-
-	spin->set_deferred_drag_mode_enabled(p_enabled);
-}
-
 void EditorPropertyFloat::update_property() {
 	double val = get_edited_property_value();
 	if (radians_as_degrees) {
@@ -3218,17 +3177,13 @@ void EditorPropertyNodePath::update_property() {
 	const Node *target_node = base_node->get_node(p);
 	ERR_FAIL_NULL(target_node);
 
-	String new_text = target_node->get_name();
-	if (new_text.contains_char('@')) {
+	if (String(target_node->get_name()).contains_char('@')) {
 		assign->set_button_icon(Ref<Texture2D>());
 		assign->set_text(String(p));
 		return;
 	}
 
-	if (p.get_subname_count() > 0) {
-		new_text += ":" + p.get_concatenated_subnames();
-	}
-	assign->set_text(new_text);
+	assign->set_text(target_node->get_name());
 	assign->set_button_icon(EditorNode::get_singleton()->get_object_icon(target_node));
 }
 
@@ -3748,13 +3703,6 @@ void EditorPropertyResource::fold_resource() {
 	}
 }
 
-void EditorPropertyResource::set_keying(bool p_keying) {
-	EditorProperty::set_keying(p_keying);
-	if (sub_inspector) {
-		sub_inspector->set_keying(p_keying);
-	}
-}
-
 bool EditorPropertyResource::is_colored(ColorationMode p_mode) {
 	switch (p_mode) {
 		case COLORATION_CONTAINER_RESOURCE:
@@ -3883,7 +3831,7 @@ static EditorProperty *get_input_action_editor(const String &p_hint_text, bool i
 	ProjectSettings::get_singleton()->get_property_list(&pinfo);
 	Vector<String> hints = p_hint_text.remove_char(' ').split(",", false);
 
-	HashMap<String, List<Ref<InputEvent>>> builtins(InputMap::get_singleton()->get_builtins());
+	HashMap<String, List<Ref<InputEvent>>> builtins = InputMap::get_singleton()->get_builtins();
 	bool show_builtin = hints.has("show_builtin");
 
 	for (const PropertyInfo &pi : pinfo) {
@@ -4012,7 +3960,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 				Vector<String> options;
 				Vector<String> option_names;
 				if (p_hint_text.begins_with(";")) {
-					// This is not supported officially. Only for `interface/editor/localization/editor_language`.
+					// This is not supported officially. Only for `interface/editor/editor_language`.
 					for (const String &option : p_hint_text.split(";", false)) {
 						options.append(option.get_slicec('/', 0));
 						option_names.append(option.get_slicec('/', 1));
@@ -4158,6 +4106,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 		} break;
 		case Variant::BASIS: {
 			EditorPropertyBasis *editor = memnew(EditorPropertyBasis);
+			EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, default_float_step);
 			editor->setup(_parse_range_hint(p_hint, p_hint_text, default_float_step));
 			return editor;
 		} break;
diff --git a/engine/editor/inspector/editor_properties.h b/engine/editor/inspector/editor_properties.h
index ca29e796..6cc35a37 100644
--- a/engine/editor/inspector/editor_properties.h
+++ b/engine/editor/inspector/editor_properties.h
@@ -81,7 +81,6 @@ class EditorPropertyVariant : public EditorProperty {
 
 	void _change_type(int p_to_type);
 	void _popup_edit_menu();
-	void _object_id_selected(const StringName &p_property, ObjectID p_id);
 
 protected:
 	virtual void _set_read_only(bool p_read_only) override;
@@ -405,7 +404,6 @@ protected:
 	virtual void _set_read_only(bool p_read_only) override;
 
 public:
-	virtual void set_deferred_drag_mode_enabled(bool p_enabled = true) override;
 	virtual void update_property() override;
 	void setup(const EditorPropertyRangeHint &p_range_hint);
 	EditorPropertyInteger();
@@ -415,8 +413,6 @@ class EditorPropertyObjectID : public EditorProperty {
 	GDCLASS(EditorPropertyObjectID, EditorProperty);
 	Button *edit = nullptr;
 	String base_type;
-
-	ObjectID _get_object_id() const;
 	void _edit_pressed();
 
 protected:
@@ -459,7 +455,6 @@ protected:
 	virtual void _set_read_only(bool p_read_only) override;
 
 public:
-	virtual void set_deferred_drag_mode_enabled(bool p_enabled = true) override;
 	virtual void update_property() override;
 	void setup(const EditorPropertyRangeHint &p_range_hint);
 	EditorPropertyFloat();
@@ -780,8 +775,6 @@ public:
 	void set_use_filter(bool p_use);
 	void fold_resource();
 
-	virtual void set_keying(bool p_keying) override;
-
 	virtual bool is_colored(ColorationMode p_mode) override;
 
 	EditorPropertyResource();
diff --git a/engine/editor/inspector/editor_properties_array_dict.cpp b/engine/editor/inspector/editor_properties_array_dict.cpp
index 88f3286b..b746c040 100644
--- a/engine/editor/inspector/editor_properties_array_dict.cpp
+++ b/engine/editor/inspector/editor_properties_array_dict.cpp
@@ -32,9 +32,6 @@
 
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -47,7 +44,6 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/main/scene_tree.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;
@@ -778,19 +774,6 @@ Node *EditorPropertyArray::get_base_node() {
 
 void EditorPropertyArray::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_THEME_CHANGED: {
-			for (Slot &slot : slots) {
-				if (slot.edit_button) {
-					slot.edit_button->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
-				}
-				if (slot.reorder_button) {
-					slot.reorder_button->set_button_icon(get_editor_theme_icon(SNAME("TripleBar")));
-				}
-				if (slot.remove_button) {
-					slot.remove_button->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
-				}
-			}
-		} break;
 		case NOTIFICATION_DRAG_BEGIN: {
 			if (is_visible_in_tree()) {
 				if (_is_drop_valid(get_viewport()->gui_get_drag_data())) {
@@ -950,7 +933,7 @@ void EditorPropertyArray::_reorder_button_down(int p_slot_index) {
 	reorder_to_index = reorder_slot.index;
 	// Ideally it'd to be able to show the mouse but I had issues with
 	// Control's `mouse_exit()`/`mouse_entered()` signals not getting called.
-	Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+	Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 }
 
 void EditorPropertyArray::_reorder_button_up() {
@@ -971,7 +954,7 @@ void EditorPropertyArray::_reorder_button_up() {
 		emit_changed(get_edited_property(), array);
 	}
 
-	Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+	Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 
 	ERR_FAIL_NULL(reorder_slot.reorder_button);
 	reorder_slot.reorder_button->warp_mouse(reorder_slot.reorder_button->get_size() / 2.0f);
@@ -1175,7 +1158,7 @@ void EditorPropertyDictionary::_change_type_menu(int p_index) {
 }
 
 void EditorPropertyDictionary::setup(PropertyHint p_hint, const String &p_hint_string) {
-	PackedStringArray types = p_hint_string.split(";", true, 1);
+	PackedStringArray types = p_hint_string.split(";");
 	if (types.size() > 0 && !types[0].is_empty()) {
 		String key = types[0];
 		int hint_key_subtype_separator = key.find_char(':');
@@ -1517,15 +1500,6 @@ void EditorPropertyDictionary::_resource_selected(const String &p_path, Ref<Reso
 void EditorPropertyDictionary::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
-			for (Slot &slot : slots) {
-				if (slot.edit_button) {
-					slot.edit_button->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
-				}
-				if (slot.remove_button) {
-					slot.remove_button->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
-				}
-			}
-
 			if (button_add_item) {
 				add_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("DictionaryAddItem")));
 			}
diff --git a/engine/editor/inspector/editor_properties_vector.cpp b/engine/editor/inspector/editor_properties_vector.cpp
index e6fec732..f9648193 100644
--- a/engine/editor/inspector/editor_properties_vector.cpp
+++ b/engine/editor/inspector/editor_properties_vector.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_properties_vector.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/settings/editor_settings.h"
@@ -92,7 +91,10 @@ void EditorPropertyVectorN::update_property() {
 			spin_sliders[i]->set_value_no_signal(val.get(i));
 		}
 	}
-	_update_ratio();
+
+	if (!is_grabbed) {
+		_update_ratio();
+	}
 }
 
 void EditorPropertyVectorN::_update_ratio() {
@@ -117,6 +119,13 @@ void EditorPropertyVectorN::_store_link(bool p_linked) {
 	EditorSettings::get_singleton()->set_project_metadata("linked_properties", key, p_linked);
 }
 
+void EditorPropertyVectorN::_grab_changed(bool p_grab) {
+	if (p_grab) {
+		_update_ratio();
+	}
+	is_grabbed = p_grab;
+}
+
 void EditorPropertyVectorN::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
@@ -220,6 +229,8 @@ EditorPropertyVectorN::EditorPropertyVectorN(Variant::Type p_type, bool p_force_
 			spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
 		}
 		spin[i]->connect(SceneStringName(value_changed), callable_mp(this, &EditorPropertyVectorN::_value_changed).bind(String(COMPONENT_LABELS[i])));
+		spin[i]->connect(SNAME("grabbed"), callable_mp(this, &EditorPropertyVectorN::_grab_changed).bind(true));
+		spin[i]->connect(SNAME("ungrabbed"), callable_mp(this, &EditorPropertyVectorN::_grab_changed).bind(false));
 		add_focusable(spin[i]);
 	}
 
@@ -240,14 +251,6 @@ EditorPropertyVectorN::EditorPropertyVectorN(Variant::Type p_type, bool p_force_
 	}
 }
 
-void EditorPropertyVectorN::set_deferred_drag_mode_enabled(bool p_enabled) {
-	EditorProperty::set_deferred_drag_mode_enabled(p_enabled);
-
-	for (int i = 0; i < component_count; i++) {
-		spin_sliders[i]->set_deferred_drag_mode_enabled(p_enabled);
-	}
-}
-
 EditorPropertyVector2::EditorPropertyVector2(bool p_force_wide) :
 		EditorPropertyVectorN(Variant::VECTOR2, p_force_wide, EDITOR_GET("interface/inspector/horizontal_vector2_editing")) {}
 
diff --git a/engine/editor/inspector/editor_properties_vector.h b/engine/editor/inspector/editor_properties_vector.h
index 63444bd1..265e422f 100644
--- a/engine/editor/inspector/editor_properties_vector.h
+++ b/engine/editor/inspector/editor_properties_vector.h
@@ -47,11 +47,13 @@ class EditorPropertyVectorN : public EditorProperty {
 	Vector<EditorSpinSlider *> spin_sliders;
 	TextureButton *linked = nullptr;
 	Vector<double> ratio;
+	bool is_grabbed = false;
 
 	bool radians_as_degrees = false;
 
 	void _update_ratio();
 	void _store_link(bool p_linked);
+	void _grab_changed(bool p_grab);
 	void _value_changed(double p_val, const String &p_name);
 
 protected:
@@ -59,7 +61,6 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual void set_deferred_drag_mode_enabled(bool p_enabled = true) override;
 	virtual void update_property() override;
 	void setup(const EditorPropertyRangeHint &p_range_hint, bool p_link = false, bool p_is_int = false);
 	EditorPropertyVectorN(Variant::Type p_type, bool p_force_wide, bool p_horizontal);
diff --git a/engine/editor/inspector/editor_property_name_processor.cpp b/engine/editor/inspector/editor_property_name_processor.cpp
index 270a23bd..be040b7b 100644
--- a/engine/editor/inspector/editor_property_name_processor.cpp
+++ b/engine/editor/inspector/editor_property_name_processor.cpp
@@ -50,7 +50,7 @@ EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_settings_sty
 	if (!EditorSettings::get_singleton()) {
 		return STYLE_LOCALIZED;
 	}
-	const bool translate = EDITOR_GET("interface/editor/localization/localize_settings");
+	const bool translate = EDITOR_GET("interface/editor/localize_settings");
 	return translate ? STYLE_LOCALIZED : STYLE_CAPITALIZED;
 }
 
@@ -167,7 +167,6 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
 	capitalize_string_remaps["bptc"] = "BPTC";
 	capitalize_string_remaps["bvh"] = "BVH";
 	capitalize_string_remaps["ca"] = "CA";
-	capitalize_string_remaps["colr"] = "COLR";
 	capitalize_string_remaps["ccdik"] = "CCDIK";
 	capitalize_string_remaps["cd"] = "CD";
 	capitalize_string_remaps["cpu"] = "CPU";
diff --git a/engine/editor/inspector/editor_resource_picker.cpp b/engine/editor/inspector/editor_resource_picker.cpp
index 1f92e30f..0e0ad0f9 100644
--- a/engine/editor/inspector/editor_resource_picker.cpp
+++ b/engine/editor/inspector/editor_resource_picker.cpp
@@ -30,11 +30,6 @@
 
 #include "editor_resource_picker.h"
 
-#include "core/input/input.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/filesystem_dock.h"
@@ -54,7 +49,6 @@
 #include "scene/property_utils.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/image_texture.h"
-#include "servers/rendering/rendering_server.h"
 
 static bool _has_sub_resources(const Ref<Resource> &p_res) {
 	List<PropertyInfo> property_list;
@@ -323,13 +317,11 @@ void EditorResourcePicker::_update_menu_items() {
 			edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Search")), TTR("Inspect"), OBJ_MENU_INSPECT);
 		} else {
 			edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Edit")), TTR("Edit"), OBJ_MENU_INSPECT);
-			edit_menu->set_item_disabled(-1, force_allow_unique);
 		}
 
 		if (is_editable()) {
 			if (!_is_custom_type_script()) {
 				edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Clear")), TTR("Clear"), OBJ_MENU_CLEAR);
-				edit_menu->set_item_disabled(-1, force_allow_unique);
 			}
 			bool unique_enabled = _is_uniqueness_enabled();
 			edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Duplicate")), TTR("Make Unique"), OBJ_MENU_MAKE_UNIQUE);
@@ -343,9 +335,9 @@ void EditorResourcePicker::_update_menu_items() {
 
 			if (!unique_enabled) {
 				if (EditorNode::get_singleton()->is_resource_internal_to_scene(edited_resource) && EditorNode::get_singleton()->get_resource_count(edited_resource) == 1) {
-					edit_menu->set_item_tooltip(-1, TTR("This Resource is already unique.") + "\n" + drag_and_drop_text);
+					edit_menu->set_item_tooltip(-1, String(TTRC("This Resource is already unique.")) + "\n" + drag_and_drop_text);
 				} else if (_has_parent_resource().is_valid()) {
-					edit_menu->set_item_tooltip(-1, TTR("In order to duplicate it, make its parent Resource unique.") + "\n" + drag_and_drop_text);
+					edit_menu->set_item_tooltip(-1, String(TTRC("In order to duplicate it, make its parent Resource unique.")) + "\n" + drag_and_drop_text);
 				}
 			} else {
 				edit_menu->set_item_tooltip(-1, drag_and_drop_text);
@@ -364,9 +356,7 @@ void EditorResourcePicker::_update_menu_items() {
 			}
 
 			edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Save")), TTR("Save"), OBJ_MENU_SAVE);
-			edit_menu->set_item_disabled(-1, force_allow_unique);
 			edit_menu->add_icon_item(get_editor_theme_icon(SNAME("Save")), TTR("Save As..."), OBJ_MENU_SAVE_AS);
-			edit_menu->set_item_disabled(-1, force_allow_unique);
 		}
 
 		if (edited_resource->get_path().is_resource_file()) {
@@ -400,11 +390,11 @@ void EditorResourcePicker::_update_menu_items() {
 		edit_menu->add_separator();
 
 		if (edited_resource.is_valid()) {
-			edit_menu->add_item(TTRC("Copy"), OBJ_MENU_COPY);
+			edit_menu->add_item(TTR("Copy"), OBJ_MENU_COPY);
 		}
 
 		if (paste_valid) {
-			edit_menu->add_item(TTRC("Paste"), OBJ_MENU_PASTE);
+			edit_menu->add_item(TTR("Paste"), OBJ_MENU_PASTE);
 			edit_menu->add_item(TTRC("Paste as Unique"), OBJ_MENU_PASTE_AS_UNIQUE);
 		}
 	}
@@ -656,7 +646,7 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) {
 		int idx = 0;
 
 		_ensure_allowed_types();
-		HashSet<StringName> allowed_types(allowed_types_without_convert);
+		HashSet<StringName> allowed_types = allowed_types_without_convert;
 		if (!allowed_types.is_empty()) {
 			edit_menu->add_separator(TTRC("New"));
 		}
@@ -874,26 +864,45 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const {
 		return true;
 	}
 
-	Ref<Resource> res = _get_dropped_resource(p_drag_data);
-	if (res.is_null()) {
-		return false;
+	Dictionary drag_data = p_drag_data;
+
+	Ref<Resource> res;
+	if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
+		if (se) {
+			res = se->get_edited_resource();
+		}
+	} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
+		res = drag_data["resource"];
+	} else if (drag_data.has("type") && String(drag_data["type"]) == "files") {
+		Vector<String> files = drag_data["files"];
+
+		if (files.size() == 1) {
+			if (ResourceLoader::exists(files[0])) {
+				// TODO: Extract the typename of the dropped filepath's resource in a more performant way, without fully loading it.
+				res = ResourceLoader::load(files[0]);
+			}
+		}
 	}
 
 	_ensure_allowed_types();
-	HashSet<StringName> allowed_types(allowed_types_with_convert);
+	HashSet<StringName> allowed_types = allowed_types_with_convert;
 
-	String res_type = _get_resource_type(res);
+	if (res.is_valid()) {
+		String res_type = _get_resource_type(res);
 
-	if (_is_type_valid(res_type, allowed_types)) {
-		return true;
-	}
-
-	if (res->get_script()) {
-		StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
-		if (_is_type_valid(custom_class, allowed_types)) {
+		if (_is_type_valid(res_type, allowed_types)) {
 			return true;
 		}
+
+		if (res->get_script()) {
+			StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
+			if (_is_type_valid(custom_class, allowed_types)) {
+				return true;
+			}
+		}
 	}
+
 	return false;
 }
 
@@ -927,36 +936,6 @@ bool EditorResourcePicker::_is_custom_type_script() const {
 	return false;
 }
 
-Ref<Resource> EditorResourcePicker::_get_dropped_resource(const Variant &p_data) const {
-	Dictionary drag_data = p_data;
-	const String type = drag_data.get("type", "");
-	if (type.is_empty()) {
-		return Ref<Resource>();
-	}
-
-	Ref<Resource> res;
-	if (type == "script_list_element") {
-		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
-		if (se) {
-			return se->get_edited_resource();
-		}
-	} else if (type == "shader_list_element") {
-		return ResourceCache::get_ref(drag_data["file_path"]);
-	} else if (type == "resource") {
-		return drag_data["resource"];
-	} else if (type == "files") {
-		Vector<String> files = drag_data["files"];
-
-		if (files.size() == 1) {
-			if (ResourceLoader::exists(files[0])) {
-				// TODO: Extract the typename of the dropped filepath's resource in a more performant way, without fully loading it.
-				return ResourceLoader::load(files[0]);
-			}
-		}
-	}
-	return Ref<Resource>();
-}
-
 Variant EditorResourcePicker::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	if (edited_resource.is_valid()) {
 		Dictionary drag_data = EditorNode::get_singleton()->drag_resource(edited_resource, p_from);
@@ -972,10 +951,31 @@ bool EditorResourcePicker::can_drop_data_fw(const Point2 &p_point, const Variant
 }
 
 void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-	Ref<Resource> dropped_resource = _get_dropped_resource(p_data);
+	ERR_FAIL_COND(!_is_drop_valid(p_data));
+
+	Dictionary drag_data = p_data;
+
+	Ref<Resource> dropped_resource;
+	if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
+		if (se) {
+			dropped_resource = se->get_edited_resource();
+		}
+	} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
+		dropped_resource = drag_data["resource"];
+	}
+
+	if (dropped_resource.is_null() && drag_data.has("type") && String(drag_data["type"]) == "files") {
+		Vector<String> files = drag_data["files"];
+
+		if (files.size() == 1) {
+			dropped_resource = ResourceLoader::load(files[0]);
+		}
+	}
+
 	if (dropped_resource.is_valid()) {
 		_ensure_allowed_types();
-		HashSet<StringName> allowed_types(allowed_types_without_convert);
+		HashSet<StringName> allowed_types = allowed_types_without_convert;
 
 		String res_type = _get_resource_type(dropped_resource);
 
@@ -1045,12 +1045,12 @@ void EditorResourcePicker::_bind_methods() {
 	GDVIRTUAL_BIND(_handle_menu_selected, "id");
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "base_type"), "set_base_type", "get_base_type");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static(), PROPERTY_USAGE_NONE), "set_edited_resource", "get_edited_resource");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource", PROPERTY_USAGE_NONE), "set_edited_resource", "get_edited_resource");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode");
 
-	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static()), PropertyInfo(Variant::BOOL, "inspect")));
-	ADD_SIGNAL(MethodInfo("resource_changed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static())));
+	ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), PropertyInfo(Variant::BOOL, "inspect")));
+	ADD_SIGNAL(MethodInfo("resource_changed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
 }
 
 void EditorResourcePicker::_notification(int p_what) {
@@ -1119,7 +1119,7 @@ void EditorResourcePicker::set_base_type(const String &p_base_type) {
 	// Keep the value, but warn the user that there is a potential mistake.
 	if (!base_type.is_empty() && edited_resource.is_valid()) {
 		_ensure_allowed_types();
-		HashSet<StringName> allowed_types(allowed_types_with_convert);
+		HashSet<StringName> allowed_types = allowed_types_with_convert;
 
 		StringName custom_class;
 		bool is_custom = false;
@@ -1141,7 +1141,7 @@ String EditorResourcePicker::get_base_type() const {
 
 Vector<String> EditorResourcePicker::get_allowed_types() const {
 	_ensure_allowed_types();
-	HashSet<StringName> allowed_types(allowed_types_without_convert);
+	HashSet<StringName> allowed_types = allowed_types_without_convert;
 
 	Vector<String> types;
 	types.resize(allowed_types.size());
@@ -1163,7 +1163,7 @@ bool EditorResourcePicker::is_resource_allowed(const Ref<Resource> &p_resource)
 
 	if (!base_type.is_empty()) {
 		_ensure_allowed_types();
-		HashSet<StringName> allowed_types(allowed_types_with_convert);
+		HashSet<StringName> allowed_types = allowed_types_with_convert;
 
 		StringName custom_class;
 		bool is_custom = false;
@@ -1564,7 +1564,7 @@ void EditorScriptPicker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_script_owner", "owner_node"), &EditorScriptPicker::set_script_owner);
 	ClassDB::bind_method(D_METHOD("get_script_owner"), &EditorScriptPicker::get_script_owner);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "script_owner", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static(), PROPERTY_USAGE_NONE), "set_script_owner", "get_script_owner");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "script_owner", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_script_owner", "get_script_owner");
 }
 
 // EditorShaderPicker
diff --git a/engine/editor/inspector/editor_resource_picker.h b/engine/editor/inspector/editor_resource_picker.h
index 731de229..c76e2f73 100644
--- a/engine/editor/inspector/editor_resource_picker.h
+++ b/engine/editor/inspector/editor_resource_picker.h
@@ -112,7 +112,6 @@ class EditorResourcePicker : public HBoxContainer {
 	bool _is_drop_valid(const Dictionary &p_drag_data) const;
 	bool _is_type_valid(const String &p_type_name, const HashSet<StringName> &p_allowed_types) const;
 	bool _is_custom_type_script() const;
-	Ref<Resource> _get_dropped_resource(const Variant &p_data) const;
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
diff --git a/engine/editor/inspector/editor_resource_preview.cpp b/engine/editor/inspector/editor_resource_preview.cpp
index 16736361..e1ccf220 100644
--- a/engine/editor/inspector/editor_resource_preview.cpp
+++ b/engine/editor/inspector/editor_resource_preview.cpp
@@ -34,21 +34,14 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/variant/variant_utility.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/image_texture.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
@@ -109,7 +102,7 @@ void EditorResourcePreviewGenerator::DrawRequester::request_and_wait(RID p_viewp
 		RID root_vp = st->get_root()->get_viewport_rid();
 		RenderingServer::get_singleton()->viewport_set_active(root_vp, false);
 
-		RS::get_singleton()->viewport_set_update_mode(p_viewport, RSE::VIEWPORT_UPDATE_ONCE);
+		RS::get_singleton()->viewport_set_update_mode(p_viewport, RS::VIEWPORT_UPDATE_ONCE);
 		RS::get_singleton()->draw(false);
 
 		// Let main viewport and children be drawn again.
@@ -129,7 +122,7 @@ void EditorResourcePreviewGenerator::request_draw_and_wait(RID viewport) const {
 }
 
 void EditorResourcePreviewGenerator::DrawRequester::_prepare_draw(RID p_viewport) {
-	RS::get_singleton()->viewport_set_update_mode(p_viewport, RSE::VIEWPORT_UPDATE_ONCE);
+	RS::get_singleton()->viewport_set_update_mode(p_viewport, RS::VIEWPORT_UPDATE_ONCE);
 	RS::get_singleton()->request_frame_drawn_callback(callable_mp(this, &EditorResourcePreviewGenerator::DrawRequester::_post_semaphore));
 }
 
diff --git a/engine/editor/inspector/editor_resource_tooltip_plugins.cpp b/engine/editor/inspector/editor_resource_tooltip_plugins.cpp
index e92b9e4a..f35549cc 100644
--- a/engine/editor/inspector/editor_resource_tooltip_plugins.cpp
+++ b/engine/editor/inspector/editor_resource_tooltip_plugins.cpp
@@ -30,9 +30,6 @@
 
 #include "editor_resource_tooltip_plugins.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
diff --git a/engine/editor/inspector/editor_resource_tooltip_plugins.h b/engine/editor/inspector/editor_resource_tooltip_plugins.h
index 5ec8e74d..5e6ddc3e 100644
--- a/engine/editor/inspector/editor_resource_tooltip_plugins.h
+++ b/engine/editor/inspector/editor_resource_tooltip_plugins.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "scene/gui/control.h"
 
diff --git a/engine/editor/inspector/editor_sectioned_inspector.cpp b/engine/editor/inspector/editor_sectioned_inspector.cpp
index 5d23bf83..1e715d8d 100644
--- a/engine/editor/inspector/editor_sectioned_inspector.cpp
+++ b/engine/editor/inspector/editor_sectioned_inspector.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_sectioned_inspector.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/editor_property_name_processor.h"
diff --git a/engine/editor/inspector/input_event_editor_plugin.cpp b/engine/editor/inspector/input_event_editor_plugin.cpp
index 2ff6c88a..6d3e4da2 100644
--- a/engine/editor/inspector/input_event_editor_plugin.cpp
+++ b/engine/editor/inspector/input_event_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "input_event_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/settings/event_listener_line_edit.h"
 #include "editor/settings/input_event_configuration_dialog.h"
diff --git a/engine/editor/inspector/multi_node_edit.cpp b/engine/editor/inspector/multi_node_edit.cpp
index 0840b6d5..9cef60d5 100644
--- a/engine/editor/inspector/multi_node_edit.cpp
+++ b/engine/editor/inspector/multi_node_edit.cpp
@@ -31,11 +31,8 @@
 #include "multi_node_edit.h"
 
 #include "core/math/math_fieldwise.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "scene/property_utils.h"
 
 bool MultiNodeEdit::_set(const StringName &p_name, const Variant &p_value) {
 	return _set_impl(p_name, p_value, "");
@@ -204,7 +201,7 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const {
 		}
 	}
 
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "scripts", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, "scripts", PROPERTY_HINT_RESOURCE_TYPE, "Script"));
 }
 
 String MultiNodeEdit::_get_editor_name() const {
@@ -244,16 +241,7 @@ bool MultiNodeEdit::_property_get_revert(const StringName &p_name, Variant &r_pr
 			continue;
 		}
 
-		// Check if property can revert before using class default.
-		if (node->property_can_revert(p_name)) {
-			r_property = node->property_get_revert(p_name);
-		} else {
-			bool is_valid = false;
-			r_property = PropertyUtils::get_property_default_value(node, p_name, &is_valid);
-			if (!is_valid) {
-				r_property = ClassDB::class_get_default_property_value(node->get_class_name(), p_name);
-			}
-		}
+		r_property = ClassDB::class_get_default_property_value(node->get_class_name(), p_name);
 		return true;
 	}
 
diff --git a/engine/editor/inspector/property_selector.cpp b/engine/editor/inspector/property_selector.cpp
index 3684005f..027fb11b 100644
--- a/engine/editor/inspector/property_selector.cpp
+++ b/engine/editor/inspector/property_selector.cpp
@@ -30,14 +30,10 @@
 
 #include "property_selector.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"
-#include "editor/editor_string_names.h"
-#include "editor/gui/filter_line_edit.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/tree.h"
 
@@ -45,6 +41,32 @@ void PropertySelector::_text_changed(const String &p_newtext) {
 	_update_search();
 }
 
+void PropertySelector::_sbox_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			search_options->gui_input(key);
+			search_box->accept_event();
+
+			TreeItem *root = search_options->get_root();
+			if (!root->get_first_child()) {
+				return;
+			}
+
+			TreeItem *current = search_options->get_selected();
+
+			TreeItem *item = search_options->get_next_selected(root);
+			while (item) {
+				item->deselect(0);
+				item = search_options->get_next_selected(item);
+			}
+
+			current->select(0);
+		}
+	}
+}
+
 void PropertySelector::_update_search() {
 	if (properties) {
 		set_title(TTRC("Select Property"));
@@ -62,10 +84,6 @@ void PropertySelector::_update_search() {
 	// Allow using spaces in place of underscores in the search string (makes the search more fault-tolerant).
 	const String search_text = search_box->get_text().replace_char(' ', '_');
 
-	// Set up font.
-	bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-	Ref<Font> monospace_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
-
 	if (properties) {
 		List<PropertyInfo> props;
 
@@ -128,9 +146,6 @@ void PropertySelector::_update_search() {
 
 			TreeItem *item = search_options->create_item(category ? category : root);
 			item->set_text(0, E.name);
-			if (use_monospace_font) {
-				item->set_custom_font(0, monospace_font);
-			}
 			item->set_metadata(0, E.name);
 			item->set_icon(0, search_options->get_editor_theme_icon(Variant::get_type_name(E.type)));
 
@@ -292,9 +307,6 @@ void PropertySelector::_update_search() {
 			}
 
 			item->set_text(0, desc);
-			if (use_monospace_font) {
-				item->set_custom_font(0, monospace_font);
-			}
 			item->set_metadata(0, name);
 			item->set_selectable(0, true);
 
@@ -493,11 +505,6 @@ void PropertySelector::_create_subproperty(TreeItem *p_parent_item, const String
 
 	TreeItem *item = search_options->create_item(p_parent_item);
 	item->set_text(0, p_name);
-
-	bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-	if (use_monospace_font) {
-		item->set_custom_font(0, get_theme_font(SNAME("source"), EditorStringName(EditorFonts)));
-	}
 	item->set_metadata(0, String(p_parent_item->get_metadata(0)) + ":" + p_name);
 	item->set_icon(0, search_options->get_editor_theme_icon(Variant::get_type_name(p_type)));
 
@@ -663,13 +670,14 @@ PropertySelector::PropertySelector() {
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
 
-	search_box = memnew(FilterLineEdit);
+	search_box = memnew(LineEdit);
 	search_box->set_accessibility_name(TTRC("Search:"));
-	vbc->add_margin_child(TTRC("Search:"), search_box);
+	search_box->set_clear_button_enabled(true);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &PropertySelector::_text_changed));
+	search_box->connect(SceneStringName(gui_input), callable_mp(this, &PropertySelector::_sbox_input));
+	vbc->add_margin_child(TTRC("Search:"), search_box);
 
 	search_options = memnew(Tree);
-	search_box->set_forward_control(search_options);
 	search_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	search_options->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
 	MarginContainer *mc = vbc->add_margin_child(TTRC("Matches:"), search_options, true);
diff --git a/engine/editor/inspector/property_selector.h b/engine/editor/inspector/property_selector.h
index 05a51814..014007e6 100644
--- a/engine/editor/inspector/property_selector.h
+++ b/engine/editor/inspector/property_selector.h
@@ -33,7 +33,6 @@
 #include "scene/gui/dialogs.h"
 
 class EditorHelpBit;
-class FilterLineEdit;
 class LineEdit;
 class Tree;
 class TreeItem;
@@ -41,10 +40,11 @@ class TreeItem;
 class PropertySelector : public ConfirmationDialog {
 	GDCLASS(PropertySelector, ConfirmationDialog);
 
-	FilterLineEdit *search_box = nullptr;
+	LineEdit *search_box = nullptr;
 	Tree *search_options = nullptr;
 
 	void _text_changed(const String &p_newtext);
+	void _sbox_input(const Ref<InputEvent> &p_event);
 	void _update_search();
 	void _confirmed();
 	void _item_selected();
diff --git a/engine/editor/inspector/sub_viewport_preview_editor_plugin.cpp b/engine/editor/inspector/sub_viewport_preview_editor_plugin.cpp
index 9999d176..479d58cf 100644
--- a/engine/editor/inspector/sub_viewport_preview_editor_plugin.cpp
+++ b/engine/editor/inspector/sub_viewport_preview_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "sub_viewport_preview_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "scene/main/viewport.h"
 
 bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) {
diff --git a/engine/editor/inspector/tool_button_editor_plugin.cpp b/engine/editor/inspector/tool_button_editor_plugin.cpp
index 65ddf43d..ab2936dd 100644
--- a/engine/editor/inspector/tool_button_editor_plugin.cpp
+++ b/engine/editor/inspector/tool_button_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "tool_button_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/inspector/multi_node_edit.h"
 
diff --git a/engine/editor/plugins/editor_plugin.compat.inc b/engine/editor/plugins/editor_plugin.compat.inc
index 5eeaec9d..7edf9386 100644
--- a/engine/editor/plugins/editor_plugin.compat.inc
+++ b/engine/editor/plugins/editor_plugin.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "editor_plugin.h"
-
-#include "core/object/class_db.h"
-
 Button *EditorPlugin::_add_control_to_bottom_panel_compat_88081(Control *p_control, const String &p_title) {
 	return add_control_to_bottom_panel(p_control, p_title, nullptr);
 }
@@ -47,4 +43,4 @@ void EditorPlugin::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_control_to_dock", "slot", "control"), &EditorPlugin::_add_control_to_dock_compat_88081);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/editor/plugins/editor_plugin.cpp b/engine/editor/plugins/editor_plugin.cpp
index be0bb7e8..243a4cbc 100644
--- a/engine/editor/plugins/editor_plugin.cpp
+++ b/engine/editor/plugins/editor_plugin.cpp
@@ -31,9 +31,6 @@
 #include "editor_plugin.h"
 #include "editor_plugin.compat.inc"
 
-#include "core/io/resource_importer.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/docks/editor_dock.h"
@@ -708,10 +705,10 @@ void EditorPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_enable_plugin);
 	GDVIRTUAL_BIND(_disable_plugin);
 
-	ADD_SIGNAL(MethodInfo("scene_changed", PropertyInfo(Variant::OBJECT, "scene_root", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("scene_changed", PropertyInfo(Variant::OBJECT, "scene_root", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 	ADD_SIGNAL(MethodInfo("scene_closed", PropertyInfo(Variant::STRING, "filepath")));
 	ADD_SIGNAL(MethodInfo("main_screen_changed", PropertyInfo(Variant::STRING, "screen_name")));
-	ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static())));
+	ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
 	ADD_SIGNAL(MethodInfo("scene_saved", PropertyInfo(Variant::STRING, "filepath")));
 	ADD_SIGNAL(MethodInfo("project_settings_changed"));
 
@@ -728,7 +725,6 @@ void EditorPlugin::_bind_methods() {
 	BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_LEFT);
 	BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_RIGHT);
 
-#ifndef DISABLE_DEPRECATED
 	BIND_ENUM_CONSTANT(DOCK_SLOT_NONE);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UL);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BL);
@@ -740,7 +736,6 @@ void EditorPlugin::_bind_methods() {
 	BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BR);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_BOTTOM);
 	BIND_ENUM_CONSTANT(DOCK_SLOT_MAX);
-#endif
 
 	BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_PASS);
 	BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_STOP);
diff --git a/engine/editor/plugins/editor_plugin.h b/engine/editor/plugins/editor_plugin.h
index 381f6503..58af2ee7 100644
--- a/engine/editor/plugins/editor_plugin.h
+++ b/engine/editor/plugins/editor_plugin.h
@@ -31,10 +31,10 @@
 #pragma once
 
 #include "core/io/config_file.h"
+#include "editor/docks/dock_constants.h"
 #include "editor/inspector/editor_context_menu_plugin.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/gui/control.h"
-#include "scene/main/node.h"
 
 class Node3D;
 class Button;
@@ -88,21 +88,19 @@ public:
 		CONTAINER_PROJECT_SETTING_TAB_RIGHT,
 	};
 
-#ifndef DISABLE_DEPRECATED
 	enum DockSlot {
-		DOCK_SLOT_NONE = -1,
-		DOCK_SLOT_LEFT_UL,
-		DOCK_SLOT_LEFT_BL,
-		DOCK_SLOT_LEFT_UR,
-		DOCK_SLOT_LEFT_BR,
-		DOCK_SLOT_RIGHT_UL,
-		DOCK_SLOT_RIGHT_BL,
-		DOCK_SLOT_RIGHT_UR,
-		DOCK_SLOT_RIGHT_BR,
-		DOCK_SLOT_BOTTOM,
-		DOCK_SLOT_MAX
+		DOCK_SLOT_NONE = DockConstants::DOCK_SLOT_NONE,
+		DOCK_SLOT_LEFT_UL = DockConstants::DOCK_SLOT_LEFT_UL,
+		DOCK_SLOT_LEFT_BL = DockConstants::DOCK_SLOT_LEFT_BL,
+		DOCK_SLOT_LEFT_UR = DockConstants::DOCK_SLOT_LEFT_UR,
+		DOCK_SLOT_LEFT_BR = DockConstants::DOCK_SLOT_LEFT_BR,
+		DOCK_SLOT_RIGHT_UL = DockConstants::DOCK_SLOT_RIGHT_UL,
+		DOCK_SLOT_RIGHT_BL = DockConstants::DOCK_SLOT_RIGHT_BL,
+		DOCK_SLOT_RIGHT_UR = DockConstants::DOCK_SLOT_RIGHT_UR,
+		DOCK_SLOT_RIGHT_BR = DockConstants::DOCK_SLOT_RIGHT_BR,
+		DOCK_SLOT_BOTTOM = DockConstants::DOCK_SLOT_BOTTOM,
+		DOCK_SLOT_MAX = DockConstants::DOCK_SLOT_MAX
 	};
-#endif
 
 	enum AfterGUIInput {
 		AFTER_GUI_INPUT_PASS,
@@ -270,10 +268,8 @@ public:
 	void disable_plugin();
 };
 
-#ifndef DISABLE_DEPRECATED
-VARIANT_ENUM_CAST(EditorPlugin::DockSlot);
-#endif
 VARIANT_ENUM_CAST(EditorPlugin::CustomControlContainer);
+VARIANT_ENUM_CAST(EditorPlugin::DockSlot);
 VARIANT_ENUM_CAST(EditorPlugin::AfterGUIInput);
 
 typedef EditorPlugin *(*EditorPluginCreateFunc)();
diff --git a/engine/editor/plugins/editor_plugin_settings.cpp b/engine/editor/plugins/editor_plugin_settings.cpp
index b19cc923..a1152be6 100644
--- a/engine/editor/plugins/editor_plugin_settings.cpp
+++ b/engine/editor/plugins/editor_plugin_settings.cpp
@@ -30,15 +30,14 @@
 
 #include "editor_plugin_settings.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
@@ -116,18 +115,15 @@ void EditorPluginSettings::update_plugins() {
 
 				TreeItem *item = plugin_list->create_item(root);
 				item->set_text(COLUMN_NAME, name);
-				item->set_auto_translate_mode(COLUMN_NAME, AUTO_TRANSLATE_MODE_DISABLED);
 				if (!is_enabled) {
 					item->set_custom_color(COLUMN_NAME, disabled_color);
 				}
 				item->set_tooltip_text(COLUMN_NAME, vformat(TTR("Name: %s\nPath: %s\nMain Script: %s\n\n%s"), name, path, scr, wrapped_description));
 				item->set_metadata(COLUMN_NAME, path);
 				item->set_text(COLUMN_VERSION, version);
-				item->set_auto_translate_mode(COLUMN_VERSION, AUTO_TRANSLATE_MODE_DISABLED);
 				item->set_custom_font(COLUMN_VERSION, get_theme_font("source", EditorStringName(EditorFonts)));
 				item->set_metadata(COLUMN_VERSION, scr);
 				item->set_text(COLUMN_AUTHOR, author);
-				item->set_auto_translate_mode(COLUMN_AUTHOR, AUTO_TRANSLATE_MODE_DISABLED);
 				item->set_metadata(COLUMN_AUTHOR, description);
 				item->set_cell_mode(COLUMN_STATUS, TreeItem::CELL_MODE_CHECK);
 				item->set_text(COLUMN_STATUS, TTRC("On"));
diff --git a/engine/editor/plugins/editor_resource_conversion_plugin.cpp b/engine/editor/plugins/editor_resource_conversion_plugin.cpp
index 349a75a7..3209b576 100644
--- a/engine/editor/plugins/editor_resource_conversion_plugin.cpp
+++ b/engine/editor/plugins/editor_resource_conversion_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_resource_conversion_plugin.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void EditorResourceConversionPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_converts_to);
 	GDVIRTUAL_BIND(_handles, "resource");
diff --git a/engine/editor/plugins/editor_resource_conversion_plugin.h b/engine/editor/plugins/editor_resource_conversion_plugin.h
index 65718429..758ced16 100644
--- a/engine/editor/plugins/editor_resource_conversion_plugin.h
+++ b/engine/editor/plugins/editor_resource_conversion_plugin.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 class EditorResourceConversionPlugin : public RefCounted {
 	GDCLASS(EditorResourceConversionPlugin, RefCounted);
diff --git a/engine/editor/plugins/plugin_config_dialog.cpp b/engine/editor/plugins/plugin_config_dialog.cpp
index 1cc605be..23cfd228 100644
--- a/engine/editor/plugins/plugin_config_dialog.cpp
+++ b/engine/editor/plugins/plugin_config_dialog.cpp
@@ -32,9 +32,6 @@
 
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "core/object/script_language.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
@@ -110,15 +107,15 @@ void PluginConfigDialog::_on_canceled() {
 
 void PluginConfigDialog::_on_required_text_changed() {
 	if (name_edit->get_text().is_empty()) {
-		validation_panel->set_message(MSG_ID_PLUGIN, TTRC("Plugin name cannot be blank."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_PLUGIN, TTR("Plugin name cannot be blank."), EditorValidationPanel::MSG_ERROR);
 	}
 	if (subfolder_edit->is_visible()) {
 		if (!subfolder_edit->get_text().is_empty() && !subfolder_edit->get_text().is_valid_filename()) {
-			validation_panel->set_message(MSG_ID_SUBFOLDER, TTRC("Subfolder name is not a valid folder name."), EditorValidationPanel::MSG_ERROR);
+			validation_panel->set_message(MSG_ID_SUBFOLDER, TTR("Subfolder name is not a valid folder name."), EditorValidationPanel::MSG_ERROR);
 		} else {
 			String path = "res://addons/" + _get_subfolder();
 			if (!_edit_mode && DirAccess::exists(path)) { // Only show this error if in "create" mode.
-				validation_panel->set_message(MSG_ID_SUBFOLDER, TTRC("Subfolder cannot be one which already exists."), EditorValidationPanel::MSG_ERROR);
+				validation_panel->set_message(MSG_ID_SUBFOLDER, TTR("Subfolder cannot be one which already exists."), EditorValidationPanel::MSG_ERROR);
 			}
 		}
 	} else {
@@ -135,7 +132,7 @@ void PluginConfigDialog::_on_required_text_changed() {
 		validation_panel->set_message(MSG_ID_SCRIPT, vformat(TTR("Script extension must match chosen language extension (.%s)."), ext), EditorValidationPanel::MSG_ERROR);
 	}
 	if (language->get_name() == "GDScript") {
-		validation_panel->set_message(MSG_ID_ENABLE_WARNINGS, TTRC("Consider enabling GDScript warnings for this plugin by adding an entry for it to the project setting Debug > GDScript > Warnings > Directory Rules."), EditorValidationPanel::MSG_INFO);
+		validation_panel->set_message(MSG_ID_ENABLE_WARNINGS, TTR("Consider enabling GDScript warnings for this plugin by adding an entry for it to the project setting Debug > GDScript > Warnings > Directory Rules."), EditorValidationPanel::MSG_INFO);
 	}
 }
 
@@ -319,10 +316,11 @@ PluginConfigDialog::PluginConfigDialog() {
 
 	validation_panel = memnew(EditorValidationPanel);
 	vbox->add_child(validation_panel);
-	validation_panel->add_line(MSG_ID_PLUGIN, TTRC("Plugin name is valid."));
-	validation_panel->add_line(MSG_ID_SCRIPT, TTRC("Script extension is valid."));
-	validation_panel->add_line(MSG_ID_SUBFOLDER, TTRC("Subfolder name is valid."));
-	validation_panel->add_line(MSG_ID_ENABLE_WARNINGS);
+	validation_panel->add_line(MSG_ID_PLUGIN, TTR("Plugin name is valid."));
+	validation_panel->add_line(MSG_ID_SCRIPT, TTR("Script extension is valid."));
+	validation_panel->add_line(MSG_ID_SUBFOLDER, TTR("Subfolder name is valid."));
+	validation_panel->add_line(MSG_ID_ACTIVE, "");
+	validation_panel->add_line(MSG_ID_ENABLE_WARNINGS, "");
 	validation_panel->set_update_callback(callable_mp(this, &PluginConfigDialog::_on_required_text_changed));
 	validation_panel->set_accept_button(get_ok_button());
 
diff --git a/engine/editor/plugins/plugin_config_dialog.h b/engine/editor/plugins/plugin_config_dialog.h
index 63ede500..1e1218fe 100644
--- a/engine/editor/plugins/plugin_config_dialog.h
+++ b/engine/editor/plugins/plugin_config_dialog.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "scene/gui/check_box.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
@@ -45,6 +46,7 @@ class PluginConfigDialog : public ConfirmationDialog {
 		MSG_ID_PLUGIN,
 		MSG_ID_SUBFOLDER,
 		MSG_ID_SCRIPT,
+		MSG_ID_ACTIVE,
 		MSG_ID_ENABLE_WARNINGS,
 	};
 
diff --git a/engine/editor/project_manager/engine_update_label.cpp b/engine/editor/project_manager/engine_update_label.cpp
index 26617e0c..f4d4cf0e 100644
--- a/engine/editor/project_manager/engine_update_label.cpp
+++ b/engine/editor/project_manager/engine_update_label.cpp
@@ -31,10 +31,6 @@
 #include "engine_update_label.h"
 
 #include "core/io/json.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
-#include "core/version.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/main/http_request.h"
@@ -83,16 +79,14 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 	}
 
 	UpdateMode update_mode = UpdateMode(int(EDITOR_GET("network/connection/check_for_updates")));
-	if (update_mode == UpdateMode::AUTO) {
-		if (_get_version_type(GODOT_VERSION_STATUS) == VersionType::STABLE) {
-			update_mode = UpdateMode::NEWEST_STABLE;
-		} else {
-			update_mode = UpdateMode::NEWEST_UNSTABLE;
-		}
-	}
 	bool stable_only = update_mode == UpdateMode::NEWEST_STABLE || update_mode == UpdateMode::NEWEST_PATCH;
 
+	const Dictionary current_version_info = Engine::get_singleton()->get_version_info();
+	int current_major = current_version_info.get("major", 0);
+	int current_minor = current_version_info.get("minor", 0);
+	int current_patch = current_version_info.get("patch", 0);
 	available_newer_version = String();
+
 	for (const Variant &data_bit : version_array) {
 		const Dictionary version_info = data_bit;
 
@@ -104,7 +98,7 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 		}
 
 		int minor = version_bits[1].to_int();
-		if (version_bits[0].to_int() != GODOT_VERSION_MAJOR || minor < GODOT_VERSION_MINOR) {
+		if (version_bits[0].to_int() != current_major || minor < current_minor) {
 			continue;
 		}
 
@@ -113,11 +107,11 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 			patch = version_bits[2].to_int();
 		}
 
-		if (minor == GODOT_VERSION_MINOR && patch < GODOT_VERSION_PATCH) {
+		if (minor == current_minor && patch < current_patch) {
 			continue;
 		}
 
-		if (update_mode == UpdateMode::NEWEST_PATCH && minor > GODOT_VERSION_MINOR) {
+		if (update_mode == UpdateMode::NEWEST_PATCH && minor > current_minor) {
 			continue;
 		}
 
@@ -132,7 +126,7 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 		int release_index;
 		VersionType release_type = _get_version_type(release_string, &release_index);
 
-		if (minor > GODOT_VERSION_MINOR || patch > GODOT_VERSION_PATCH) {
+		if (minor > current_minor || patch > current_patch) {
 			if (stable_only && release_type != VersionType::STABLE) {
 				continue;
 			}
@@ -142,7 +136,7 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 		}
 
 		int current_version_index;
-		VersionType current_version_type = _get_version_type(GODOT_VERSION_STATUS, &current_version_index);
+		VersionType current_version_type = _get_version_type(current_version_info.get("status", "unknown"), &current_version_index);
 
 		if (int(release_type) > int(current_version_type)) {
 			break;
@@ -191,20 +185,20 @@ void EngineUpdateLabel::_set_status(UpdateStatus p_status) {
 			} else {
 				_set_message(TTR("Update checks disabled."), theme_cache.disabled_color);
 			}
-			set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode::LIVE_OFF);
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_OFF);
 			set_tooltip_text("");
 			break;
 		}
 
 		case UpdateStatus::ERROR: {
 			set_disabled(false);
-			set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode::LIVE_POLITE);
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_POLITE);
 			set_tooltip_text(TTR("An error has occurred. Click to try again."));
 		} break;
 
 		case UpdateStatus::UPDATE_AVAILABLE: {
 			set_disabled(false);
-			set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode::LIVE_POLITE);
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_POLITE);
 			set_tooltip_text(TTR("Click to open download page."));
 		} break;
 
diff --git a/engine/editor/project_manager/engine_update_label.h b/engine/editor/project_manager/engine_update_label.h
index 57a20250..a424064e 100644
--- a/engine/editor/project_manager/engine_update_label.h
+++ b/engine/editor/project_manager/engine_update_label.h
@@ -40,7 +40,6 @@ class EngineUpdateLabel : public LinkButton {
 public:
 	enum class UpdateMode {
 		DISABLED,
-		AUTO,
 		NEWEST_UNSTABLE,
 		NEWEST_STABLE,
 		NEWEST_PATCH,
@@ -87,7 +86,7 @@ private:
 	void _set_message(const String &p_message, const Color &p_color);
 	void _set_status(UpdateStatus p_status);
 
-	VersionType _get_version_type(const String &p_string, int *r_index = nullptr) const;
+	VersionType _get_version_type(const String &p_string, int *r_index) const;
 	String _extract_sub_string(const String &p_line) const;
 
 protected:
diff --git a/engine/editor/project_manager/project_dialog.cpp b/engine/editor/project_manager/project_dialog.cpp
index 028ec1fa..0ce640d5 100644
--- a/engine/editor/project_manager/project_dialog.cpp
+++ b/engine/editor/project_manager/project_dialog.cpp
@@ -33,9 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/zip_io.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -51,8 +48,6 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 void ProjectDialog::_set_message(const String &p_msg, MessageType p_type, InputType p_input_type) {
 	msg->set_text(p_msg);
@@ -1098,7 +1093,7 @@ ProjectDialog::ProjectDialog() {
 
 	msg = memnew(Label);
 	msg->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
-	msg->set_accessibility_live(AccessibilityServerEnums::LIVE_POLITE);
+	msg->set_accessibility_live(DisplayServer::LIVE_POLITE);
 	msg->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	msg->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	msg->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
diff --git a/engine/editor/project_manager/project_list.cpp b/engine/editor/project_manager/project_list.cpp
index c8b6d1d7..6c8741e2 100644
--- a/engine/editor/project_manager/project_list.cpp
+++ b/engine/editor/project_manager/project_list.cpp
@@ -31,11 +31,7 @@
 #include "project_list.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/dir_access.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
@@ -53,8 +49,6 @@
 #include "scene/gui/texture_button.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/image_texture.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
 
 void ProjectListItemControl::_notification(int p_what) {
 	switch (p_what) {
@@ -72,24 +66,6 @@ void ProjectListItemControl::_notification(int p_what) {
 			project_title->end_bulk_theme_override();
 
 			project_path->add_theme_color_override(SceneStringName(font_color), get_theme_color(SceneStringName(font_color), SNAME("ProjectList")));
-
-			switch (version_match_type) {
-				case VersionMatchType::PROJECT_USES_OLDER_MAJOR:
-					project_different_version->set_texture(get_editor_theme_icon(SNAME("ProjectUpgradeMajor")));
-					break;
-				case VersionMatchType::PROJECT_USES_OLDER_MINOR:
-					project_different_version->set_texture(get_editor_theme_icon(SNAME("ProjectUpgrade")));
-					break;
-				case VersionMatchType::PROJECT_USES_NEWER_MAJOR:
-					project_different_version->set_texture(get_editor_theme_icon(SNAME("ProjectDowngradeMajor")));
-					break;
-				case VersionMatchType::PROJECT_USES_NEWER_MINOR:
-					project_different_version->set_texture(get_editor_theme_icon(SNAME("ProjectDowngrade")));
-					break;
-				default:
-					break;
-			}
-
 			project_unsupported_features->set_texture(get_editor_theme_icon(SNAME("NodeWarning")));
 
 			favorite_focus_color = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
@@ -129,21 +105,21 @@ void ProjectListItemControl::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX_OPTION);
-			AccessibilityServer::get_singleton()->update_set_name(ae, TTR("Project") + " " + project_title->get_text());
-			AccessibilityServer::get_singleton()->update_set_value(ae, project_title->get_text());
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, TTR("Project") + " " + project_title->get_text());
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, project_title->get_text());
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &ProjectListItemControl::_accessibility_action_open));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ProjectListItemControl::_accessibility_action_scroll_into_view));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ProjectListItemControl::_accessibility_action_focus));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ProjectListItemControl::_accessibility_action_blur));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &ProjectListItemControl::_accessibility_action_open));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ProjectListItemControl::_accessibility_action_scroll_into_view));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ProjectListItemControl::_accessibility_action_focus));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ProjectListItemControl::_accessibility_action_blur));
 
 			ProjectList *pl = get_list();
 			if (pl) {
-				AccessibilityServer::get_singleton()->update_set_list_item_index(ae, pl->get_index(this));
+				DisplayServer::get_singleton()->accessibility_update_set_list_item_index(ae, pl->get_index(this));
 			}
-			AccessibilityServer::get_singleton()->update_set_list_item_level(ae, 0);
-			AccessibilityServer::get_singleton()->update_set_list_item_selected(ae, is_selected);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_level(ae, 0);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(ae, is_selected);
 		} break;
 
 		case NOTIFICATION_FOCUS_ENTER: {
@@ -153,6 +129,7 @@ void ProjectListItemControl::_notification(int p_what) {
 				if (idx >= 0) {
 					// has_focus(true) is false on mouse-initiated focus, true on keyboard navigation.
 					pl->select_project(idx, !has_focus(true));
+					pl->ensure_project_visible(idx);
 
 					pl->emit_signal(SNAME(ProjectList::SIGNAL_SELECTION_CHANGED));
 				}
@@ -286,7 +263,6 @@ void ProjectListItemControl::set_project_version(const String &p_info) {
 void ProjectListItemControl::set_unsupported_features(PackedStringArray p_features) {
 	if (p_features.size() > 0) {
 		String tooltip_text = "";
-		bool unknown_version = false;
 		for (int i = 0; i < p_features.size(); i++) {
 			if (ProjectList::project_feature_looks_like_version(p_features[i])) {
 				PackedStringArray project_version_split = p_features[i].split(".");
@@ -295,67 +271,18 @@ void ProjectListItemControl::set_unsupported_features(PackedStringArray p_featur
 					project_version_major = project_version_split[0].to_int();
 					project_version_minor = project_version_split[1].to_int();
 				}
-
-				version_match_type = VersionMatchType::PROJECT_USES_SAME;
-				if (project_version_major > GODOT_VERSION_MAJOR) {
-					version_match_type = VersionMatchType::PROJECT_USES_NEWER_MAJOR;
-				} else if (project_version_major < GODOT_VERSION_MAJOR) {
-					version_match_type = VersionMatchType::PROJECT_USES_OLDER_MAJOR;
-				} else {
-					// Project is same major version.
-					// Is it the same minor version, or an upgrade or downgrade?
-					if (project_version_minor > GODOT_VERSION_MINOR) {
-						version_match_type = VersionMatchType::PROJECT_USES_NEWER_MINOR;
-					} else if (project_version_minor < GODOT_VERSION_MINOR) {
-						version_match_type = VersionMatchType::PROJECT_USES_OLDER_MINOR;
-					}
-				}
-
-				if (version_match_type != VersionMatchType::PROJECT_USES_SAME) {
-					String project_version_tooltip_text = TTR("This project was last edited in a different Godot version: ") + p_features[i] + "\n";
-					if (version_match_type == VersionMatchType::PROJECT_USES_OLDER_MAJOR || version_match_type == VersionMatchType::PROJECT_USES_OLDER_MINOR) {
-						project_version_tooltip_text += vformat(TTR("Opening it will upgrade it to Godot %s.%s."), GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR) + "\n";
-					} else if (version_match_type == VersionMatchType::PROJECT_USES_NEWER_MAJOR || version_match_type == VersionMatchType::PROJECT_USES_NEWER_MINOR) {
-						project_version_tooltip_text += vformat(TTR("Opening it will downgrade it to Godot %s.%s."), GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR) + "\n";
-						project_version_tooltip_text += TTR("Downgrading projects is not recommended.") + "\n";
-					}
-					project_different_version->set_focus_mode(FOCUS_ACCESSIBILITY);
-					project_different_version->set_tooltip_text(project_version_tooltip_text);
-					project_different_version->show();
-				} else {
-					project_different_version->hide();
-				}
-			} else {
-				if (p_features[i] == "3.x") {
-					version_match_type = VersionMatchType::PROJECT_USES_OLDER_MAJOR;
-					String project_version_tooltip_text = TTR("This project was last edited in a different Godot version: ") + p_features[i] + "\n";
-					project_version_tooltip_text += vformat(TTR("Opening it will upgrade it to Godot %s.%s."), GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR) + "\n";
-					project_different_version->set_focus_mode(FOCUS_ACCESSIBILITY);
-					project_different_version->set_tooltip_text(project_version_tooltip_text);
-					project_different_version->show();
-				} else if (p_features[i] == TTR("Unknown version")) {
-					unknown_version = true;
-					project_different_version->hide();
+				if (GODOT_VERSION_MAJOR != project_version_major || GODOT_VERSION_MINOR <= project_version_minor) {
+					// Don't show a warning if the project was last edited in a previous minor version.
+					tooltip_text += TTR("This project was last edited in a different Godot version: ") + p_features[i] + "\n";
 				}
+				p_features.remove_at(i);
+				i--;
 			}
-
-			p_features.remove_at(i);
-			i--;
-		}
-
-		// This is actually triggered when the project.godot file's config_version
-		// is less than 4, so perhaps it'd be more accurate to say the engine configuration
-		// file's version is not supported...? If the config/features array includes
-		// a proper version number, it will be displayed alongside the "unknown version"
-		// warning otherwise.
-		if (unknown_version) {
-			tooltip_text += TTR("This project uses an unknown version of Godot.") + "\n";
 		}
 		if (p_features.size() > 0) {
 			String unsupported_features_str = String(", ").join(p_features);
 			tooltip_text += TTR("This project uses features unsupported by the current build:") + "\n" + unsupported_features_str;
 		}
-
 		if (tooltip_text.is_empty()) {
 			return;
 		}
@@ -364,7 +291,6 @@ void ProjectListItemControl::set_unsupported_features(PackedStringArray p_featur
 		project_unsupported_features->set_tooltip_text(tooltip_text);
 		project_unsupported_features->show();
 	} else {
-		project_different_version->hide();
 		project_unsupported_features->hide();
 	}
 }
@@ -400,13 +326,13 @@ void ProjectListItemControl::set_is_missing(bool p_missing) {
 		explore_button->set_button_icon(get_editor_theme_icon(SNAME("FileBroken")));
 		explore_button->set_tooltip_text(TTRC("Error: Project is missing on the filesystem."));
 	} else {
-#if defined(ANDROID_ENABLED) || defined(WEB_ENABLED)
+#if !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
+		explore_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
+		explore_button->set_tooltip_text(TTRC("Show in File Manager"));
+#else
 		// Opening the system file manager is not supported on the Android and web editors.
 		explore_button->hide();
-#else // !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
-		explore_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
-		explore_button->set_tooltip_text(OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN));
-#endif // defined(ANDROID_ENABLED) || defined(WEB_ENABLED)
+#endif
 	}
 }
 
@@ -509,12 +435,6 @@ ProjectListItemControl::ProjectListItemControl() {
 		path_hb->add_child(project_unsupported_features);
 		project_unsupported_features->hide();
 
-		project_different_version = memnew(TextureRect);
-		project_different_version->set_name("ProjectDifferentVersion");
-		project_different_version->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
-		path_hb->add_child(project_different_version);
-		project_different_version->hide();
-
 		project_version = memnew(Label);
 		project_version->set_focus_mode(FOCUS_ACCESSIBILITY);
 		project_version->set_name("ProjectVersion");
@@ -568,15 +488,6 @@ struct ProjectListComparator {
 	}
 };
 
-String ProjectList::Item::get_last_edited_string() const {
-	if (missing) {
-		return TTR("Missing Date");
-	}
-
-	OS::TimeZoneInfo tz = OS::get_singleton()->get_time_zone_info();
-	return Time::get_singleton()->get_datetime_string_from_unix_time(last_edited + tz.bias * 60, true);
-}
-
 // Helpers.
 
 bool ProjectList::project_feature_looks_like_version(const String &p_feature) {
@@ -624,9 +535,9 @@ void ProjectList::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX);
-			AccessibilityServer::get_singleton()->update_set_list_item_count(ae, _projects.size());
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_MULTISELECTABLE, false);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, _projects.size());
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE, false);
 		}
 	}
 }
@@ -1286,8 +1197,8 @@ void ProjectList::_open_menu(const Vector2 &p_at, Control *p_hb) {
 		project_context_menu->add_item(TTRC("Run Project"), MENU_RUN);
 		project_context_menu->add_separator();
 #if !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
-		project_context_menu->add_item(OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN), MENU_SHOW_IN_FILE_MANAGER);
-#endif // !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
+		project_context_menu->add_item(TTRC("Show in File Manager"), MENU_SHOW_IN_FILE_MANAGER);
+#endif
 		project_context_menu->add_item(TTRC("Copy Path"), MENU_COPY_PATH);
 		project_context_menu->add_separator();
 		project_context_menu->add_item(TTRC("Rename"), MENU_RENAME);
@@ -1298,7 +1209,7 @@ void ProjectList::_open_menu(const Vector2 &p_at, Control *p_hb) {
 		project_context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ProjectList::_menu_option));
 		_update_menu_icons();
 	}
-	clicked_project.control->grab_focus(true);
+	select_project(clicked_index, true);
 
 	for (int id : Vector<int>{
 				 MENU_EDIT,
diff --git a/engine/editor/project_manager/project_list.h b/engine/editor/project_manager/project_list.h
index 2c8ecac5..c38d0947 100644
--- a/engine/editor/project_manager/project_list.h
+++ b/engine/editor/project_manager/project_list.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/config_file.h"
+#include "core/os/time.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/scroll_container.h"
 
@@ -55,7 +56,6 @@ class ProjectListItemControl : public HBoxContainer {
 	Label *last_edited_info = nullptr;
 	Label *project_version = nullptr;
 	TextureRect *project_unsupported_features = nullptr;
-	TextureRect *project_different_version = nullptr;
 	HBoxContainer *tag_container = nullptr;
 	Button *touch_menu_button = nullptr;
 
@@ -68,16 +68,6 @@ class ProjectListItemControl : public HBoxContainer {
 	bool is_hovering = false;
 	bool is_favorite = false;
 
-	enum class VersionMatchType {
-		PROJECT_USES_SAME,
-		PROJECT_USES_OLDER_MAJOR,
-		PROJECT_USES_OLDER_MINOR,
-		PROJECT_USES_NEWER_MAJOR,
-		PROJECT_USES_NEWER_MINOR,
-	};
-
-	VersionMatchType version_match_type = VersionMatchType::PROJECT_USES_SAME;
-
 	void _update_favorite_button_focus_color();
 	void _favorite_button_pressed();
 	void _explore_button_pressed();
@@ -202,7 +192,14 @@ public:
 			return path == l.path;
 		}
 
-		String get_last_edited_string() const;
+		String get_last_edited_string() const {
+			if (missing) {
+				return TTR("Missing Date");
+			}
+
+			OS::TimeZoneInfo tz = OS::get_singleton()->get_time_zone_info();
+			return Time::get_singleton()->get_datetime_string_from_unix_time(last_edited + tz.bias * 60, true);
+		}
 	};
 
 private:
diff --git a/engine/editor/project_manager/project_manager.cpp b/engine/editor/project_manager/project_manager.cpp
index 0366fa98..7a589dd1 100644
--- a/engine/editor/project_manager/project_manager.cpp
+++ b/engine/editor/project_manager/project_manager.cpp
@@ -30,13 +30,10 @@
 
 #include "project_manager.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/version.h"
@@ -66,7 +63,6 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 #include "servers/display/display_server.h"
@@ -104,7 +100,7 @@ void ProjectManager::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_READY: {
-			DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/display/keep_screen_on"));
+			DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/keep_screen_on"));
 			const int default_sorting = (int)EDITOR_GET("project_manager/sorting_order");
 			filter_option->select(default_sorting);
 			project_list->set_order_option(default_sorting, false);
@@ -1198,7 +1194,7 @@ void ProjectManager::_perform_full_project_conversion() {
 	args.push_back(path);
 	args.push_back("--convert-3to4");
 	args.push_back("--rendering-driver");
-	args.push_back(OS::get_singleton()->get_current_rendering_driver_name());
+	args.push_back(Main::get_rendering_driver_name());
 
 	Error err = OS::get_singleton()->create_instance(args);
 	ERR_FAIL_COND(err);
@@ -1302,8 +1298,8 @@ void ProjectManager::_files_dropped(PackedStringArray p_files) {
 }
 
 void ProjectManager::_titlebar_resized() {
-	DisplayServer::get_singleton()->window_set_window_buttons_offset(Vector2i(title_bar->get_global_position().y + title_bar->get_size().y / 2, title_bar->get_global_position().y + title_bar->get_size().y / 2), DisplayServerEnums::MAIN_WINDOW_ID);
-	const Vector3i &margin = DisplayServer::get_singleton()->window_get_safe_title_margins(DisplayServerEnums::MAIN_WINDOW_ID);
+	DisplayServer::get_singleton()->window_set_window_buttons_offset(Vector2i(title_bar->get_global_position().y + title_bar->get_size().y / 2, title_bar->get_global_position().y + title_bar->get_size().y / 2), DisplayServer::MAIN_WINDOW_ID);
+	const Vector3i &margin = DisplayServer::get_singleton()->window_get_safe_title_margins(DisplayServer::MAIN_WINDOW_ID);
 	if (left_menu_spacer) {
 		int w = (root_container->is_layout_rtl()) ? margin.y : margin.x;
 		left_menu_spacer->set_custom_minimum_size(Size2(w, 0));
@@ -1346,7 +1342,7 @@ ProjectManager::ProjectManager() {
 			Input::get_singleton()->set_use_accumulated_input(use_accumulated_input);
 		}
 
-		int display_scale = EDITOR_GET("interface/editor/appearance/display_scale");
+		int display_scale = EDITOR_GET("interface/editor/display_scale");
 
 		switch (display_scale) {
 			case 0:
@@ -1372,7 +1368,7 @@ ProjectManager::ProjectManager() {
 				EditorScale::set_scale(2.0);
 				break;
 			default:
-				EditorScale::set_scale(EDITOR_GET("interface/editor/appearance/custom_display_scale"));
+				EditorScale::set_scale(EDITOR_GET("interface/editor/custom_display_scale"));
 				break;
 		}
 		FileDialog::set_get_icon_callback(callable_mp_static(ProjectManager::_file_dialog_get_icon));
@@ -1381,7 +1377,7 @@ ProjectManager::ProjectManager() {
 		FileDialog::set_default_show_hidden_files(EDITOR_GET("filesystem/file_dialog/show_hidden_files"));
 		FileDialog::set_default_display_mode((FileDialog::DisplayMode)EDITOR_GET("filesystem/file_dialog/display_mode").operator int());
 
-		int swap_cancel_ok = EDITOR_GET("interface/editor/appearance/accept_dialog_cancel_ok_buttons");
+		int swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
 		if (swap_cancel_ok != 0) { // 0 is auto, set in register_scene based on DisplayServer.
 			// Swap on means OK first.
 			AcceptDialog::set_swap_cancel_ok(swap_cancel_ok == 2);
@@ -1398,7 +1394,7 @@ ProjectManager::ProjectManager() {
 
 	// Initialize UI.
 	{
-		int pm_root_dir = EDITOR_GET("interface/editor/localization/ui_layout_direction");
+		int pm_root_dir = EDITOR_GET("interface/editor/ui_layout_direction");
 		Control::set_root_layout_direction(pm_root_dir);
 		Window::set_root_layout_direction(pm_root_dir);
 
@@ -1425,7 +1421,7 @@ ProjectManager::ProjectManager() {
 	root_container->add_child(main_vbox);
 
 	// Title bar.
-	bool can_expand = bool(EDITOR_GET("interface/editor/appearance/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EXTEND_TO_TITLE);
+	bool can_expand = bool(EDITOR_GET("interface/editor/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EXTEND_TO_TITLE);
 
 	{
 		title_bar = memnew(EditorTitleBar);
@@ -1450,7 +1446,7 @@ ProjectManager::ProjectManager() {
 		left_hbox->add_child(title_bar_logo);
 		title_bar_logo->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_show_about));
 
-		bool global_menu = !bool(EDITOR_GET("interface/editor/appearance/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+		bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
 		if (global_menu) {
 			MenuBar *main_menu_bar = memnew(MenuBar);
 			main_menu_bar->set_start_index(0); // Main menu, add to the start of global menu.
@@ -1548,7 +1544,7 @@ ProjectManager::ProjectManager() {
 			hb->add_child(scan_btn);
 
 			loading_label = memnew(Label(TTRC("Loading, please wait...")));
-			loading_label->set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode::LIVE_ASSERTIVE);
+			loading_label->set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_ASSERTIVE);
 			loading_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			loading_label->hide();
 			hb->add_child(loading_label);
@@ -1834,7 +1830,7 @@ ProjectManager::ProjectManager() {
 		ask_update_backup->set_h_size_flags(SIZE_SHRINK_CENTER);
 		ask_update_vb->add_child(ask_update_backup);
 		ask_update_settings->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_with_migration));
-		int ed_swap_cancel_ok = EDITOR_GET("interface/editor/appearance/accept_dialog_cancel_ok_buttons");
+		int ed_swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
 		if (ed_swap_cancel_ok == 0) {
 			ed_swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
 		}
@@ -1970,7 +1966,7 @@ ProjectManager::ProjectManager() {
 	// Extend menu bar to window title.
 	if (can_expand) {
 		DisplayServer::get_singleton()->process_events();
-		DisplayServer::get_singleton()->window_set_flag(DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE, true, DisplayServerEnums::MAIN_WINDOW_ID);
+		DisplayServer::get_singleton()->window_set_flag(DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE, true, DisplayServer::MAIN_WINDOW_ID);
 		title_bar->set_can_move_window(true);
 		title_bar->connect(SceneStringName(item_rect_changed), callable_mp(this, &ProjectManager::_titlebar_resized));
 	}
diff --git a/engine/editor/project_manager/quick_settings_dialog.cpp b/engine/editor/project_manager/quick_settings_dialog.cpp
index 5345faf0..53e186cc 100644
--- a/engine/editor/project_manager/quick_settings_dialog.cpp
+++ b/engine/editor/project_manager/quick_settings_dialog.cpp
@@ -30,8 +30,7 @@
 
 #include "quick_settings_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
+#include "core/string/translation_server.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_properties.h"
@@ -43,7 +42,6 @@
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
-#include "servers/display/display_server.h"
 
 void QuickSettingsDialog::_fetch_setting_values() {
 #ifndef ANDROID_ENABLED
@@ -61,7 +59,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
 		EditorSettings::get_singleton()->get_property_list(&editor_settings_properties);
 
 		for (const PropertyInfo &pi : editor_settings_properties) {
-			if (pi.name == "interface/editor/localization/editor_language") {
+			if (pi.name == "interface/editor/editor_language") {
 #ifndef ANDROID_ENABLED
 				editor_languages = pi.hint_string.split(";", false);
 #endif
@@ -69,7 +67,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
 				editor_styles = pi.hint_string.split(",");
 			} else if (pi.name == "interface/theme/color_preset") {
 				editor_themes = pi.hint_string.split(",");
-			} else if (pi.name == "interface/editor/appearance/display_scale") {
+			} else if (pi.name == "interface/editor/display_scale") {
 				editor_scales = pi.hint_string.split(",");
 			} else if (pi.name == "network/connection/network_mode") {
 				editor_network_modes = pi.hint_string.split(",");
@@ -86,7 +84,7 @@ void QuickSettingsDialog::_update_current_values() {
 #ifndef ANDROID_ENABLED
 	// Language options.
 	{
-		const String current_lang = EDITOR_GET("interface/editor/localization/editor_language");
+		const String current_lang = EDITOR_GET("interface/editor/editor_language");
 
 		for (int i = 0; i < editor_languages.size(); i++) {
 			const String &lang_value = editor_languages[i].get_slicec('/', 0);
@@ -128,7 +126,7 @@ void QuickSettingsDialog::_update_current_values() {
 
 	// Scale options.
 	{
-		const int current_scale = EDITOR_GET("interface/editor/appearance/display_scale");
+		const int current_scale = EDITOR_GET("interface/editor/display_scale");
 
 		for (int i = 0; i < editor_scales.size(); i++) {
 			const String &scale_value = editor_scales[i];
@@ -197,7 +195,7 @@ void QuickSettingsDialog::_add_setting_control(const String &p_text, Control *p_
 #ifndef ANDROID_ENABLED
 void QuickSettingsDialog::_language_selected(int p_id) {
 	const String selected_language = language_option_button->get_item_metadata(p_id);
-	_set_setting_value("interface/editor/localization/editor_language", selected_language);
+	_set_setting_value("interface/editor/editor_language", selected_language);
 }
 #endif
 
@@ -214,7 +212,7 @@ void QuickSettingsDialog::_theme_selected(int p_id) {
 }
 
 void QuickSettingsDialog::_scale_selected(int p_id) {
-	_set_setting_value("interface/editor/appearance/display_scale", p_id, true);
+	_set_setting_value("interface/editor/display_scale", p_id, true);
 }
 
 void QuickSettingsDialog::_network_mode_selected(int p_id) {
@@ -241,7 +239,7 @@ void QuickSettingsDialog::_set_setting_value(const String &p_setting, const Vari
 		restart_required_label->show();
 
 		if (!restart_required_button) {
-			int ed_swap_cancel_ok = EDITOR_GET("interface/editor/appearance/accept_dialog_cancel_ok_buttons");
+			int ed_swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
 			if (ed_swap_cancel_ok == 0) {
 				ed_swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
 			}
diff --git a/engine/editor/project_upgrade/project_converter_3_to_4.cpp b/engine/editor/project_upgrade/project_converter_3_to_4.cpp
index e9fb7d94..456941dd 100644
--- a/engine/editor/project_upgrade/project_converter_3_to_4.cpp
+++ b/engine/editor/project_upgrade/project_converter_3_to_4.cpp
@@ -35,9 +35,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
-#include "core/os/keyboard.h"
 #include "core/os/time.h"
 #include "core/templates/list.h"
 #include "editor/project_upgrade/renames_map_3_to_4.h"
@@ -134,16 +132,16 @@ public:
 	RegEx keyword_csharp_mastersync = RegEx("\\[MasterSync(Attribute)?(\\(\\))?\\]");
 
 	// Colors.
-	LocalVector<Ref<RegEx>> color_regexes;
+	LocalVector<RegEx *> color_regexes;
 	LocalVector<String> color_renamed;
 
 	RegEx color_hexadecimal_short_constructor = RegEx("Color\\(\"#?([a-fA-F0-9]{1})([a-fA-F0-9]{3})\\b");
 	RegEx color_hexadecimal_full_constructor = RegEx("Color\\(\"#?([a-fA-F0-9]{2})([a-fA-F0-9]{6})\\b");
 
 	// Classes.
-	LocalVector<Ref<RegEx>> class_tscn_regexes;
-	LocalVector<Ref<RegEx>> class_gd_regexes;
-	LocalVector<Ref<RegEx>> class_shader_regexes;
+	LocalVector<RegEx *> class_tscn_regexes;
+	LocalVector<RegEx *> class_gd_regexes;
+	LocalVector<RegEx *> class_shader_regexes;
 
 	// Keycode.
 	RegEx input_map_keycode = RegEx("\\b,\"((physical_)?)scancode\":(\\d+)\\b");
@@ -160,7 +158,7 @@ public:
 	// Animation suffixes.
 	RegEx animation_suffix = RegEx("([\"'])([a-zA-Z0-9_-]+)(-(?:loop|cycle))([\"'])");
 
-	LocalVector<Ref<RegEx>> class_regexes;
+	LocalVector<RegEx *> class_regexes;
 
 	RegEx class_temp_tscn = RegEx("\\bTEMP_RENAMED_CLASS.tscn\\b");
 	RegEx class_temp_gd = RegEx("\\bTEMP_RENAMED_CLASS.gd\\b");
@@ -171,19 +169,19 @@ public:
 	LocalVector<String> class_temp_shader_renames;
 
 	// Common.
-	LocalVector<Ref<RegEx>> enum_regexes;
-	LocalVector<Ref<RegEx>> gdscript_function_regexes;
-	LocalVector<Ref<RegEx>> project_settings_regexes;
-	LocalVector<Ref<RegEx>> project_godot_regexes;
-	LocalVector<Ref<RegEx>> input_map_regexes;
-	LocalVector<Ref<RegEx>> gdscript_properties_regexes;
-	LocalVector<Ref<RegEx>> gdscript_signals_regexes;
-	LocalVector<Ref<RegEx>> shaders_regexes;
-	LocalVector<Ref<RegEx>> builtin_types_regexes;
-	LocalVector<Ref<RegEx>> theme_override_regexes;
-	LocalVector<Ref<RegEx>> csharp_function_regexes;
-	LocalVector<Ref<RegEx>> csharp_properties_regexes;
-	LocalVector<Ref<RegEx>> csharp_signal_regexes;
+	LocalVector<RegEx *> enum_regexes;
+	LocalVector<RegEx *> gdscript_function_regexes;
+	LocalVector<RegEx *> project_settings_regexes;
+	LocalVector<RegEx *> project_godot_regexes;
+	LocalVector<RegEx *> input_map_regexes;
+	LocalVector<RegEx *> gdscript_properties_regexes;
+	LocalVector<RegEx *> gdscript_signals_regexes;
+	LocalVector<RegEx *> shaders_regexes;
+	LocalVector<RegEx *> builtin_types_regexes;
+	LocalVector<RegEx *> theme_override_regexes;
+	LocalVector<RegEx *> csharp_function_regexes;
+	LocalVector<RegEx *> csharp_properties_regexes;
+	LocalVector<RegEx *> csharp_signal_regexes;
 
 	RegExContainer() {
 		// Common.
@@ -265,6 +263,56 @@ public:
 			}
 		}
 	}
+	~RegExContainer() {
+		for (RegEx *regex : color_regexes) {
+			memdelete(regex);
+		}
+		for (unsigned int i = 0; i < class_tscn_regexes.size(); i++) {
+			memdelete(class_tscn_regexes[i]);
+			memdelete(class_gd_regexes[i]);
+			memdelete(class_shader_regexes[i]);
+			memdelete(class_regexes[i]);
+		}
+		for (RegEx *regex : enum_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : gdscript_function_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : project_settings_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : project_godot_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : input_map_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : gdscript_properties_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : gdscript_signals_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : shaders_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : builtin_types_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : theme_override_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : csharp_function_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : csharp_properties_regexes) {
+			memdelete(regex);
+		}
+		for (RegEx *regex : csharp_signal_regexes) {
+			memdelete(regex);
+		}
+	}
 };
 
 ProjectConverter3To4::ProjectConverter3To4(int p_maximum_file_size_kb, int p_maximum_line_length) {
@@ -722,7 +770,7 @@ bool ProjectConverter3To4::test_conversion_with_regex(const String &name, const
 	return true;
 }
 
-bool ProjectConverter3To4::test_conversion_basic(const String &name, const String &expected, const char *array[][2], LocalVector<Ref<RegEx>> &regex_cache, const String &what) {
+bool ProjectConverter3To4::test_conversion_basic(const String &name, const String &expected, const char *array[][2], LocalVector<RegEx *> &regex_cache, const String &what) {
 	Vector<SourceLine> got = split_lines(name);
 
 	rename_common(array, regex_cache, got);
@@ -2862,7 +2910,7 @@ Vector<String> ProjectConverter3To4::check_for_custom_rename(Vector<String> &lin
 	return found_renames;
 }
 
-void ProjectConverter3To4::rename_common(const char *array[][2], LocalVector<Ref<RegEx>> &cached_regexes, Vector<SourceLine> &source_lines) {
+void ProjectConverter3To4::rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<SourceLine> &source_lines) {
 	for (SourceLine &source_line : source_lines) {
 		if (source_line.is_comment) {
 			continue;
@@ -2879,7 +2927,7 @@ void ProjectConverter3To4::rename_common(const char *array[][2], LocalVector<Ref
 	}
 }
 
-Vector<String> ProjectConverter3To4::check_for_rename_common(const char *array[][2], LocalVector<Ref<RegEx>> &cached_regexes, Vector<String> &lines) {
+Vector<String> ProjectConverter3To4::check_for_rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines) {
 	Vector<String> found_renames;
 
 	int current_line = 1;
diff --git a/engine/editor/project_upgrade/project_converter_3_to_4.h b/engine/editor/project_upgrade/project_converter_3_to_4.h
index 02b0b0fe..0f7be9b6 100644
--- a/engine/editor/project_upgrade/project_converter_3_to_4.h
+++ b/engine/editor/project_upgrade/project_converter_3_to_4.h
@@ -42,8 +42,6 @@ struct SourceLine {
 };
 
 class RegEx;
-template <typename T>
-class Ref;
 
 class ProjectConverter3To4 {
 	class RegExContainer;
@@ -87,8 +85,8 @@ class ProjectConverter3To4 {
 	void custom_rename(Vector<SourceLine> &source_lines, const String &from, const String &to);
 	Vector<String> check_for_custom_rename(Vector<String> &lines, const String &from, const String &to);
 
-	void rename_common(const char *array[][2], LocalVector<Ref<RegEx>> &cached_regexes, Vector<SourceLine> &source_lines);
-	Vector<String> check_for_rename_common(const char *array[][2], LocalVector<Ref<RegEx>> &cached_regexes, Vector<String> &lines);
+	void rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<SourceLine> &source_lines);
+	Vector<String> check_for_rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines);
 
 	Vector<String> check_for_files();
 
@@ -107,7 +105,7 @@ class ProjectConverter3To4 {
 	bool test_single_array(const char *array[][2], bool ignore_second_check = false);
 	bool test_conversion_gdscript_builtin(const String &name, const String &expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &, bool), const String &what, const RegExContainer &reg_container, bool builtin);
 	bool test_conversion_with_regex(const String &name, const String &expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &), const String &what, const RegExContainer &reg_container);
-	bool test_conversion_basic(const String &name, const String &expected, const char *array[][2], LocalVector<Ref<RegEx>> &regex_cache, const String &what);
+	bool test_conversion_basic(const String &name, const String &expected, const char *array[][2], LocalVector<RegEx *> &regex_cache, const String &what);
 	bool test_array_names();
 	bool test_conversion(RegExContainer &reg_container);
 
diff --git a/engine/editor/project_upgrade/project_upgrade_tool.cpp b/engine/editor/project_upgrade/project_upgrade_tool.cpp
index a74ed9a7..61a94c85 100644
--- a/engine/editor/project_upgrade/project_upgrade_tool.cpp
+++ b/engine/editor/project_upgrade/project_upgrade_tool.cpp
@@ -32,10 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/scene/editor_scene_tabs.h"
diff --git a/engine/editor/project_upgrade/project_upgrade_tool.h b/engine/editor/project_upgrade/project_upgrade_tool.h
index b7176aec..1ab4307c 100644
--- a/engine/editor/project_upgrade/project_upgrade_tool.h
+++ b/engine/editor/project_upgrade/project_upgrade_tool.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 
 class ConfirmationDialog;
 class EditorFileSystemDirectory;
diff --git a/engine/editor/project_upgrade/renames_map_3_to_4.cpp b/engine/editor/project_upgrade/renames_map_3_to_4.cpp
index 31a6a194..278d57d7 100644
--- a/engine/editor/project_upgrade/renames_map_3_to_4.cpp
+++ b/engine/editor/project_upgrade/renames_map_3_to_4.cpp
@@ -478,7 +478,6 @@ const char *RenamesMap3To4::gdscript_function_renames[][2] = {
 	{ "region_bake_navmesh", "region_bake_navigation_mesh" }, // Navigation3DServer
 	{ "region_set_navmesh", "region_set_navigation_mesh" }, // Navigation3DServer
 	{ "region_set_navpoly", "region_set_navigation_polygon" }, // Navigation2DServer
-	{ "reload_scripts", "reload_open_files" }, // ScriptEditor
 	{ "remove_animation", "remove_animation_library" }, // AnimationPlayer
 	{ "remove_color_override", "remove_theme_color_override" }, // Control
 	{ "remove_constant_override", "remove_theme_constant_override" }, // Control
diff --git a/engine/editor/register_editor_types.cpp b/engine/editor/register_editor_types.cpp
index 1e1e55cd..769411b4 100644
--- a/engine/editor/register_editor_types.cpp
+++ b/engine/editor/register_editor_types.cpp
@@ -30,12 +30,7 @@
 
 #include "register_editor_types.h"
 
-#include "core/config/engine.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
-#include "core/os/os.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/audio/audio_stream_editor_plugin.h"
 #include "editor/audio/audio_stream_randomizer_editor_plugin.h"
@@ -88,7 +83,6 @@
 #include "editor/scene/2d/physics/collision_polygon_2d_editor_plugin.h"
 #include "editor/scene/2d/physics/collision_shape_2d_editor_plugin.h"
 #include "editor/scene/2d/polygon_2d_editor_plugin.h"
-#include "editor/scene/2d/scene_paint_2d_editor_plugin.h"
 #include "editor/scene/2d/skeleton_2d_editor_plugin.h"
 #include "editor/scene/2d/sprite_2d_editor_plugin.h"
 #include "editor/scene/2d/tiles/tiles_editor_plugin.h"
@@ -115,7 +109,6 @@
 #include "editor/scene/gui/margin_container_editor_plugin.h"
 #include "editor/scene/gui/style_box_editor_plugin.h"
 #include "editor/scene/gui/theme_editor_plugin.h"
-#include "editor/scene/gui/virtual_joystick_editor_plugin.h"
 #include "editor/scene/material_editor_plugin.h"
 #include "editor/scene/packed_scene_editor_plugin.h"
 #include "editor/scene/resource_preloader_editor_plugin.h"
@@ -129,7 +122,6 @@
 #include "editor/script/editor_script.h"
 #include "editor/script/editor_script_plugin.h"
 #include "editor/script/script_editor_plugin.h"
-#include "editor/script/syntax_highlighters.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_feature_profile.h"
 #include "editor/settings/editor_settings.h"
@@ -137,8 +129,6 @@
 #include "editor/shader/shader_file_editor_plugin.h"
 #include "editor/translations/editor_translation_parser.h"
 #include "editor/version_control/editor_vcs_interface.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "editor/scene/2d/parallax_background_editor_plugin.h"
 #include "editor/scene/3d/skeleton_ik_3d_editor_plugin.h"
@@ -153,14 +143,14 @@ void register_editor_types() {
 	EditorStringNames::create();
 
 	GDREGISTER_CLASS(EditorPaths);
-	GDREGISTER_VIRTUAL_CLASS(EditorPlugin);
+	GDREGISTER_CLASS(EditorPlugin);
 	GDREGISTER_CLASS(EditorTranslationParserPlugin);
 	GDREGISTER_CLASS(EditorImportPlugin);
 	GDREGISTER_CLASS(EditorScript);
 	GDREGISTER_CLASS(EditorDock);
 	GDREGISTER_CLASS(EditorSelection);
 	GDREGISTER_CLASS(EditorFileDialog);
-	GDREGISTER_VIRTUAL_CLASS(EditorSettings);
+	GDREGISTER_CLASS(EditorSettings);
 	GDREGISTER_ABSTRACT_CLASS(EditorToaster);
 	GDREGISTER_CLASS(EditorNode3DGizmo);
 	GDREGISTER_CLASS(EditorNode3DGizmoPlugin);
@@ -201,7 +191,7 @@ void register_editor_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorFileSystemImportFormatSupportQuery);
 
 	GDREGISTER_CLASS(EditorScenePostImport);
-	GDREGISTER_VIRTUAL_CLASS(EditorCommandPalette);
+	GDREGISTER_CLASS(EditorCommandPalette);
 	GDREGISTER_CLASS(EditorDebuggerPlugin);
 	GDREGISTER_ABSTRACT_CLASS(EditorDebuggerSession);
 
@@ -266,7 +256,6 @@ void register_editor_types() {
 	EditorPlugins::add_by_type<TextureRegionEditorPlugin>();
 	EditorPlugins::add_by_type<ThemeEditorPlugin>();
 	EditorPlugins::add_by_type<ToolButtonEditorPlugin>();
-	EditorPlugins::add_by_type<VirtualJoystickEditorPlugin>();
 	EditorPlugins::add_by_type<VoxelGIEditorPlugin>();
 #ifndef DISABLE_DEPRECATED
 	EditorPlugins::add_by_type<SkeletonIK3DEditorPlugin>();
@@ -287,7 +276,6 @@ void register_editor_types() {
 	EditorPlugins::add_by_type<Sprite2DEditorPlugin>();
 	EditorPlugins::add_by_type<TileSetEditorPlugin>();
 	EditorPlugins::add_by_type<TileMapEditorPlugin>();
-	EditorPlugins::add_by_type<ScenePaint2DEditorPlugin>();
 #ifndef DISABLE_DEPRECATED
 	EditorPlugins::add_by_type<ParallaxBackgroundEditorPlugin>();
 #endif
diff --git a/engine/editor/run/editor_run.cpp b/engine/editor/run/editor_run.cpp
index 83998765..847e4c7d 100644
--- a/engine/editor/run/editor_run.cpp
+++ b/engine/editor/run/editor_run.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
-#include "core/os/os.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_node.h"
 #include "editor/run/run_instances_dialog.h"
@@ -178,7 +177,7 @@ Error EditorRun::run(const String &p_scene, const String &p_write_movie, const V
 			print_line(String(" ").join(output));
 		}
 
-		ProcessID pid = 0;
+		OS::ProcessID pid = 0;
 		Error err = OS::get_singleton()->create_instance(instance_args, &pid);
 		ERR_FAIL_COND_V(err, err);
 		if (pid != 0) {
@@ -203,8 +202,8 @@ bool EditorRun::request_screenshot(const Callable &p_callback) {
 	}
 }
 
-bool EditorRun::has_child_process(ProcessID p_pid) const {
-	for (const ProcessID &E : pids) {
+bool EditorRun::has_child_process(OS::ProcessID p_pid) const {
+	for (const OS::ProcessID &E : pids) {
 		if (E == p_pid) {
 			return true;
 		}
@@ -212,7 +211,7 @@ bool EditorRun::has_child_process(ProcessID p_pid) const {
 	return false;
 }
 
-void EditorRun::stop_child_process(ProcessID p_pid) {
+void EditorRun::stop_child_process(OS::ProcessID p_pid) {
 	if (has_child_process(p_pid)) {
 		OS::get_singleton()->kill(p_pid);
 		pids.erase(p_pid);
@@ -221,7 +220,7 @@ void EditorRun::stop_child_process(ProcessID p_pid) {
 
 void EditorRun::stop() {
 	if (status != STATUS_STOP && pids.size() > 0) {
-		for (const ProcessID &E : pids) {
+		for (const OS::ProcessID &E : pids) {
 			OS::get_singleton()->kill(E);
 		}
 		pids.clear();
@@ -231,7 +230,7 @@ void EditorRun::stop() {
 	running_scene = "";
 }
 
-ProcessID EditorRun::get_current_process() const {
+OS::ProcessID EditorRun::get_current_process() const {
 	if (pids.front() == nullptr) {
 		return 0;
 	}
@@ -287,7 +286,7 @@ EditorRun::WindowPlacement EditorRun::get_window_placement() {
 
 	int window_placement = EDITOR_GET("run/window_placement/rect");
 	if (screen_rect != Rect2()) {
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_HIDPI)) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_HIDPI)) {
 			bool hidpi_proj = GET_CONFIG_WITH_OVERRIDE("display", "window/dpi/allow_hidpi");
 			int display_scale = 1;
 
diff --git a/engine/editor/run/editor_run.h b/engine/editor/run/editor_run.h
index 7c6b7909..07bd00f5 100644
--- a/engine/editor/run/editor_run.h
+++ b/engine/editor/run/editor_run.h
@@ -30,13 +30,7 @@
 
 #pragma once
 
-#include "core/math/vector2i.h"
-#include "core/os/process_id.h"
-#include "core/string/ustring.h"
-#include "core/templates/list.h"
-#include "core/variant/callable.h"
-
-#include <climits> // INT_MAX
+#include "core/os/os.h"
 
 typedef void (*EditorRunInstanceStarting)(int p_index, List<String> &r_arguments);
 typedef bool (*EditorRunInstanceRequestScreenshot)(const Callable &p_callback);
@@ -49,7 +43,7 @@ public:
 		STATUS_STOP
 	};
 
-	List<ProcessID> pids;
+	List<OS::ProcessID> pids;
 
 	struct WindowPlacement {
 		int screen = 0;
@@ -74,10 +68,10 @@ public:
 	void run_native_notify() { status = STATUS_PLAY; }
 	void stop();
 
-	void stop_child_process(ProcessID p_pid);
-	bool has_child_process(ProcessID p_pid) const;
+	void stop_child_process(OS::ProcessID p_pid);
+	bool has_child_process(OS::ProcessID p_pid) const;
 	int get_child_process_count() const { return pids.size(); }
-	ProcessID get_current_process() const;
+	OS::ProcessID get_current_process() const;
 
 	static bool request_screenshot(const Callable &p_callback);
 
diff --git a/engine/editor/run/editor_run_bar.cpp b/engine/editor/run/editor_run_bar.cpp
index aa2dd483..98fdc138 100644
--- a/engine/editor/run/editor_run_bar.cpp
+++ b/engine/editor/run/editor_run_bar.cpp
@@ -30,16 +30,11 @@
 
 #include "editor_run_bar.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "editor/export/editor_export_platform.h"
-#include "editor/export/editor_export_preset.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_quick_open_dialog.h"
 #include "editor/gui/editor_toaster.h"
@@ -52,7 +47,6 @@
 #include "scene/gui/button.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/main/scene_tree.h"
 
 #ifndef XR_DISABLED
 #include "servers/xr/xr_server.h"
@@ -484,11 +478,11 @@ Error EditorRunBar::start_native_device(int p_device_id) const {
 	return run_native->start_run_native(p_device_id);
 }
 
-ProcessID EditorRunBar::has_child_process(ProcessID p_pid) const {
+OS::ProcessID EditorRunBar::has_child_process(OS::ProcessID p_pid) const {
 	return editor_run.has_child_process(p_pid);
 }
 
-void EditorRunBar::stop_child_process(ProcessID p_pid) {
+void EditorRunBar::stop_child_process(OS::ProcessID p_pid) {
 	if (!has_child_process(p_pid)) {
 		return;
 	}
@@ -499,7 +493,7 @@ void EditorRunBar::stop_child_process(ProcessID p_pid) {
 	}
 }
 
-ProcessID EditorRunBar::get_current_process() const {
+OS::ProcessID EditorRunBar::get_current_process() const {
 	return editor_run.get_current_process();
 }
 
diff --git a/engine/editor/run/editor_run_bar.h b/engine/editor/run/editor_run_bar.h
index 98df6e1f..5d383c6b 100644
--- a/engine/editor/run/editor_run_bar.h
+++ b/engine/editor/run/editor_run_bar.h
@@ -30,17 +30,16 @@
 
 #pragma once
 
-#include "core/os/process_id.h"
+#include "editor/export/editor_export.h"
 #include "editor/run/editor_run.h"
 #include "scene/gui/margin_container.h"
 
-class AcceptDialog;
 class Button;
-class EditorExportPreset;
 class EditorRunNative;
-class HBoxContainer;
 class MenuButton;
 class PanelContainer;
+class HBoxContainer;
+class AcceptDialog;
 
 class EditorRunBar : public MarginContainer {
 	GDCLASS(EditorRunBar, MarginContainer);
@@ -130,9 +129,9 @@ public:
 
 	Error start_native_device(int p_device_id) const;
 
-	ProcessID has_child_process(ProcessID p_pid) const;
-	void stop_child_process(ProcessID p_pid);
-	ProcessID get_current_process() const;
+	OS::ProcessID has_child_process(OS::ProcessID p_pid) const;
+	void stop_child_process(OS::ProcessID p_pid);
+	OS::ProcessID get_current_process() const;
 
 	void set_movie_maker_enabled(bool p_enabled);
 	bool is_movie_maker_enabled() const;
diff --git a/engine/editor/run/editor_run_native.cpp b/engine/editor/run/editor_run_native.cpp
index a1c42d22..f4311cf3 100644
--- a/engine/editor/run/editor_run_native.cpp
+++ b/engine/editor/run/editor_run_native.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_run_native.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_node.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/editor_export_platform.h"
@@ -51,19 +49,20 @@ void EditorRunNative::_notification(int p_what) {
 				PopupMenu *popup = remote_debug->get_popup();
 				popup->clear();
 				int device_shortcut_id = 1;
-				for (int i = 0; i < EditorExport::get_singleton()->get_export_platform_count(); i++) {
-					Ref<EditorExportPlatform> eep = EditorExport::get_singleton()->get_export_platform(i);
-					Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(eep);
-					if (preset.is_null()) {
+				for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+					Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_export_preset(i);
+					Ref<EditorExportPlatform> eep = preset->get_platform();
+					if (eep.is_null()) {
 						continue;
 					}
+					const int platform_idx = EditorExport::get_singleton()->get_export_platform_index_by_name(eep->get_name());
 					const int device_count = MIN(eep->get_options_count(), 9000);
 					String error;
-					if (device_count > 0) {
+					if (device_count > 0 && preset->is_runnable()) {
 						popup->add_icon_item(eep->get_run_icon(), eep->get_name(), -1);
 						popup->set_item_disabled(-1, true);
 						for (int j = 0; j < device_count; j++) {
-							popup->add_icon_item(eep->get_option_icon(j), eep->get_option_label(j), EditorExport::encode_platform_device_id(i, j));
+							popup->add_icon_item(eep->get_option_icon(j), eep->get_option_label(j), EditorExport::encode_platform_device_id(platform_idx, j));
 							popup->set_item_tooltip(-1, eep->get_option_tooltip(j));
 							popup->set_item_indent(-1, 2);
 							if (device_shortcut_id <= 4 && eep->is_option_runnable(j)) {
@@ -107,7 +106,16 @@ Error EditorRunNative::start_run_native(int p_id) {
 	Ref<EditorExportPlatform> eep = EditorExport::get_singleton()->get_export_platform(platform);
 	ERR_FAIL_COND_V(eep.is_null(), ERR_UNAVAILABLE);
 
-	Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(eep);
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == eep) {
+			preset = ep;
+			break;
+		}
+	}
+
 	if (preset.is_null()) {
 		EditorNode::get_singleton()->show_warning(TTR("No runnable export preset found for this platform.\nPlease add a runnable preset in the Export menu or define an existing preset as runnable."));
 		return ERR_UNAVAILABLE;
@@ -168,7 +176,7 @@ void EditorRunNative::resume_run_native() {
 }
 
 void EditorRunNative::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("native_run", PropertyInfo(Variant::OBJECT, "preset", PROPERTY_HINT_RESOURCE_TYPE, EditorExportPreset::get_class_static())));
+	ADD_SIGNAL(MethodInfo("native_run", PropertyInfo(Variant::OBJECT, "preset", PROPERTY_HINT_RESOURCE_TYPE, "EditorExportPreset")));
 }
 
 bool EditorRunNative::is_deploy_debug_remote_enabled() const {
diff --git a/engine/editor/run/embedded_process.cpp b/engine/editor/run/embedded_process.cpp
index c702e2fe..ea20155f 100644
--- a/engine/editor/run/embedded_process.cpp
+++ b/engine/editor/run/embedded_process.cpp
@@ -31,16 +31,11 @@
 #include "embedded_process.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
 
 void EmbeddedProcessBase::_notification(int p_what) {
 	switch (p_what) {
@@ -191,12 +186,12 @@ int EmbeddedProcess::get_embedded_pid() const {
 	return current_process_id;
 }
 
-void EmbeddedProcess::embed_process(ProcessID p_pid) {
+void EmbeddedProcess::embed_process(OS::ProcessID p_pid) {
 	if (!window) {
 		return;
 	}
 
-	ERR_FAIL_COND_MSG(!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_WINDOW_EMBEDDING), "Embedded process not supported by this display server.");
+	ERR_FAIL_COND_MSG(!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_WINDOW_EMBEDDING), "Embedded process not supported by this display server.");
 
 	if (current_process_id != 0) {
 		// Stop embedding the last process.
@@ -372,7 +367,7 @@ void EmbeddedProcess::_check_mouse_over() {
 	}
 
 	// Don't grab the focus if mouse over another window.
-	DisplayServerEnums::WindowID window_id_over = DisplayServer::get_singleton()->get_window_at_screen_position(mouse_position);
+	DisplayServer::WindowID window_id_over = DisplayServer::get_singleton()->get_window_at_screen_position(mouse_position);
 	if (window_id_over > 0 && window_id_over != window->get_window_id()) {
 		return;
 	}
@@ -380,8 +375,8 @@ void EmbeddedProcess::_check_mouse_over() {
 	// Check if there's an exclusive popup, an open menu, or a tooltip.
 	// We don't want to grab focus to prevent the game window from coming to the front of the modal window
 	// or the open menu from closing when the mouse cursor moves outside the menu and over the embedded game.
-	Vector<DisplayServerEnums::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
-	for (const DisplayServerEnums::WindowID &window_id : wl) {
+	Vector<DisplayServer::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
+	for (const DisplayServer::WindowID &window_id : wl) {
 		Window *w = Window::get_from_id(window_id);
 		if (w && (w->is_exclusive() || w->get_flag(Window::FLAG_POPUP))) {
 			return;
@@ -396,7 +391,7 @@ void EmbeddedProcess::_check_mouse_over() {
 }
 
 void EmbeddedProcess::_check_focused_process_id() {
-	ProcessID process_id = DisplayServer::get_singleton()->get_focused_process_id();
+	OS::ProcessID process_id = DisplayServer::get_singleton()->get_focused_process_id();
 	if (process_id != focused_process_id) {
 		focused_process_id = process_id;
 		if (focused_process_id == current_process_id) {
@@ -431,8 +426,8 @@ void EmbeddedProcess::_check_focused_process_id() {
 }
 
 Window *EmbeddedProcess::_get_current_modal_window() {
-	Vector<DisplayServerEnums::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
-	for (const DisplayServerEnums::WindowID &window_id : wl) {
+	Vector<DisplayServer::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
+	for (const DisplayServer::WindowID &window_id : wl) {
 		Window *w = Window::get_from_id(window_id);
 		if (!w) {
 			continue;
@@ -445,7 +440,8 @@ Window *EmbeddedProcess::_get_current_modal_window() {
 	return nullptr;
 }
 
-EmbeddedProcess::EmbeddedProcess() {
+EmbeddedProcess::EmbeddedProcess() :
+		EmbeddedProcessBase() {
 	timer_embedding = memnew(Timer);
 	timer_embedding->set_wait_time(0.1);
 	timer_embedding->set_one_shot(true);
diff --git a/engine/editor/run/embedded_process.h b/engine/editor/run/embedded_process.h
index 7fdb9c4b..f7d04be9 100644
--- a/engine/editor/run/embedded_process.h
+++ b/engine/editor/run/embedded_process.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/os/process_id.h"
 #include "scene/gui/control.h"
 
 class ScriptEditorDebugger;
@@ -64,7 +63,7 @@ public:
 	virtual bool is_embedding_completed() const = 0;
 	virtual bool is_embedding_in_progress() const = 0;
 	virtual bool is_process_focused() const = 0;
-	virtual void embed_process(ProcessID p_pid) = 0;
+	virtual void embed_process(OS::ProcessID p_pid) = 0;
 	virtual int get_embedded_pid() const = 0;
 	virtual void reset() = 0;
 	virtual void reset_timers() = 0;
@@ -87,8 +86,8 @@ class EmbeddedProcess : public EmbeddedProcessBase {
 
 	bool application_has_focus = true;
 	uint64_t last_application_focus_time = 0;
-	ProcessID focused_process_id = 0;
-	ProcessID current_process_id = 0;
+	OS::ProcessID focused_process_id = 0;
+	OS::ProcessID current_process_id = 0;
 	bool embedding_grab_focus = false;
 	bool embedding_completed = false;
 	uint64_t start_embedding_time = 0;
@@ -118,7 +117,7 @@ public:
 	bool is_embedding_in_progress() const override;
 	bool is_embedding_completed() const override;
 	bool is_process_focused() const override;
-	void embed_process(ProcessID p_pid) override;
+	void embed_process(OS::ProcessID p_pid) override;
 	int get_embedded_pid() const override;
 	void reset() override;
 	void reset_timers() override;
diff --git a/engine/editor/run/game_view_plugin.cpp b/engine/editor/run/game_view_plugin.cpp
index bf4b33e5..77a8ca80 100644
--- a/engine/editor/run/game_view_plugin.cpp
+++ b/engine/editor/run/game_view_plugin.cpp
@@ -32,9 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/process_id.h"
+#include "core/debugger/engine_debugger.h"
 #include "core/string/translation_server.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
@@ -56,8 +54,6 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/separator.h"
-#include "scene/main/scene_tree.h"
-#include "servers/display/display_server.h"
 
 void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 	if (!is_feature_enabled) {
@@ -66,7 +62,6 @@ void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 
 	Dictionary settings;
 	settings["debugger/max_node_selection"] = EDITOR_GET("debugger/max_node_selection");
-	settings["editors/2d/selection_rectangle_color"] = EDITOR_GET("editors/2d/selection_rectangle_color");
 	settings["editors/panning/2d_editor_panning_scheme"] = EDITOR_GET("editors/panning/2d_editor_panning_scheme");
 	settings["editors/panning/simple_panning"] = EDITOR_GET("editors/panning/simple_panning");
 	settings["editors/panning/warped_mouse_panning"] = EDITOR_GET("editors/panning/warped_mouse_panning");
@@ -75,52 +70,18 @@ void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 	settings["canvas_item_editor/pan_view"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("canvas_item_editor/pan_view"));
 	settings["box_selection_fill_color"] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("box_selection_fill_color"), EditorStringName(Editor));
 	settings["box_selection_stroke_color"] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("box_selection_stroke_color"), EditorStringName(Editor));
-#ifndef _3D_DISABLED
 	settings["editors/3d/default_fov"] = EDITOR_GET("editors/3d/default_fov");
 	settings["editors/3d/default_z_near"] = EDITOR_GET("editors/3d/default_z_near");
 	settings["editors/3d/default_z_far"] = EDITOR_GET("editors/3d/default_z_far");
 	settings["editors/3d/navigation/invert_x_axis"] = EDITOR_GET("editors/3d/navigation/invert_x_axis");
 	settings["editors/3d/navigation/invert_y_axis"] = EDITOR_GET("editors/3d/navigation/invert_y_axis");
 	settings["editors/3d/navigation/warped_mouse_panning"] = EDITOR_GET("editors/3d/navigation/warped_mouse_panning");
-	settings["editors/3d/navigation/pan_mouse_button"] = EDITOR_GET("editors/3d/navigation/pan_mouse_button");
-	settings["editors/3d/freelook/freelook_navigation_scheme"] = EDITOR_GET("editors/3d/freelook/freelook_navigation_scheme");
 	settings["editors/3d/freelook/freelook_base_speed"] = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
 	settings["editors/3d/freelook/freelook_sensitivity"] = EDITOR_GET("editors/3d/freelook/freelook_sensitivity");
-	settings["editors/3d/freelook/freelook_inertia"] = EDITOR_GET("editors/3d/freelook/freelook_inertia");
-	settings["editors/3d/freelook/freelook_speed_zoom_link"] = EDITOR_GET("editors/3d/freelook/freelook_speed_zoom_link");
-	settings["editors/3d/freelook/freelook_invert_y_axis"] = EDITOR_GET("editors/3d/freelook/freelook_invert_y_axis");
-	settings["editors/3d/navigation/orbit_mouse_button"] = EDITOR_GET("editors/3d/navigation/orbit_mouse_button");
 	settings["editors/3d/navigation_feel/orbit_sensitivity"] = EDITOR_GET("editors/3d/navigation_feel/orbit_sensitivity");
-	settings["editors/3d/navigation_feel/orbit_inertia"] = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
-	settings["editors/3d/navigation/zoom_style"] = EDITOR_GET("editors/3d/navigation/zoom_style");
-	settings["editors/3d/navigation_feel/zoom_inertia"] = EDITOR_GET("editors/3d/navigation_feel/zoom_inertia");
-	settings["editors/3d/navigation/zoom_mouse_button"] = EDITOR_GET("editors/3d/navigation/zoom_mouse_button");
 	settings["editors/3d/navigation_feel/translation_sensitivity"] = EDITOR_GET("editors/3d/navigation_feel/translation_sensitivity");
-	settings["editors/3d/navigation_feel/translation_inertia"] = EDITOR_GET("editors/3d/navigation_feel/translation_inertia");
-	settings["editors/3d/navigation_feel/angle_snap_threshold"] = EDITOR_GET("editors/3d/navigation_feel/angle_snap_threshold");
-	settings["editors/3d/navigation/emulate_3_button_mouse"] = EDITOR_GET("editors/3d/navigation/emulate_3_button_mouse");
-	settings["editors/3d/navigation/emulate_numpad"] = EDITOR_GET("editors/3d/navigation/emulate_numpad");
 	settings["editors/3d/selection_box_color"] = EDITOR_GET("editors/3d/selection_box_color");
-	settings["spatial_editor/decrease_fov"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/decrease_fov"));
-	settings["spatial_editor/increase_fov"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/increase_fov"));
-	settings["spatial_editor/reset_fov"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/reset_fov"));
-	settings["spatial_editor/viewport_pan_modifier_1"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_pan_modifier_1"));
-	settings["spatial_editor/viewport_pan_modifier_2"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_pan_modifier_2"));
-	settings["spatial_editor/viewport_orbit_modifier_1"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_orbit_modifier_1"));
-	settings["spatial_editor/viewport_orbit_modifier_2"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_orbit_modifier_2"));
-	settings["spatial_editor/viewport_orbit_snap_modifier_1"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_orbit_snap_modifier_1"));
-	settings["spatial_editor/viewport_orbit_snap_modifier_2"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_orbit_snap_modifier_2"));
-	settings["spatial_editor/viewport_zoom_modifier_1"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_zoom_modifier_1"));
-	settings["spatial_editor/viewport_zoom_modifier_2"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/viewport_zoom_modifier_2"));
-	settings["spatial_editor/freelook_forward"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_forward"));
-	settings["spatial_editor/freelook_backwards"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_backwards"));
-	settings["spatial_editor/freelook_left"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_left"));
-	settings["spatial_editor/freelook_right"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_right"));
-	settings["spatial_editor/freelook_up"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_up"));
-	settings["spatial_editor/freelook_down"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_down"));
-	settings["spatial_editor/freelook_speed_modifier"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_speed_modifier"));
-	settings["spatial_editor/freelook_slow_modifier"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("spatial_editor/freelook_slow_modifier"));
-#endif // _3D_DISABLED
+	settings["editors/3d/freelook/freelook_base_speed"] = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
 
 	Array setup_data;
 	setup_data.append(settings);
@@ -285,17 +246,6 @@ void GameViewDebugger::set_camera_manipulate_mode(EditorDebuggerNode::CameraOver
 	}
 }
 
-void GameViewDebugger::report_window_focused(bool p_focused) {
-	Array message;
-	message.append(p_focused);
-
-	for (Ref<EditorDebuggerSession> &I : sessions) {
-		if (I->is_active()) {
-			I->send_message("scene:report_window_focused", message);
-		}
-	}
-}
-
 void GameViewDebugger::reset_camera_2d_position() {
 	for (Ref<EditorDebuggerSession> &I : sessions) {
 		if (I->is_active()) {
@@ -511,7 +461,7 @@ void GameView::_play_pressed() {
 		return;
 	}
 
-	ProcessID current_process_id = EditorRunBar::get_singleton()->get_current_process();
+	OS::ProcessID current_process_id = EditorRunBar::get_singleton()->get_current_process();
 	if (current_process_id == 0) {
 		return;
 	}
@@ -613,9 +563,7 @@ void GameView::_update_debugger_buttons() {
 	suspend_button->set_disabled(empty);
 	camera_override_button->set_disabled(empty);
 	speed_state_button->set_disabled(empty);
-	bool disabled = time_scale_index == DEFAULT_TIME_SCALE_INDEX;
-
-	reset_speed_button->set_disabled(empty || disabled);
+	reset_speed_button->set_disabled(empty);
 
 	PopupMenu *menu = camera_override_menu->get_popup();
 
@@ -730,11 +678,12 @@ void GameView::_embed_options_menu_menu_id_pressed(int p_id) {
 }
 
 void GameView::_reset_time_scales() {
+	if (!is_visible_in_tree()) {
+		return;
+	}
 	time_scale_index = DEFAULT_TIME_SCALE_INDEX;
 	debugger->reset_time_scale();
-	if (is_inside_tree()) {
-		_update_speed_buttons();
-	}
+	_update_speed_buttons();
 }
 
 void GameView::_speed_state_menu_pressed(int p_id) {
@@ -774,7 +723,7 @@ void GameView::_update_speed_state_size() {
 }
 
 GameView::EmbedAvailability GameView::_get_embed_available() {
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_WINDOW_EMBEDDING)) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_WINDOW_EMBEDDING)) {
 		return EMBED_NOT_AVAILABLE_FEATURE_NOT_SUPPORTED;
 	}
 	if (get_tree()->get_root()->is_embedding_subwindows()) {
@@ -801,14 +750,14 @@ GameView::EmbedAvailability GameView::_get_embed_available() {
 		return EMBED_NOT_AVAILABLE_MAXIMIZED;
 	}
 
-	DisplayServerEnums::WindowMode window_mode = (DisplayServerEnums::WindowMode)(GLOBAL_GET("display/window/size/mode").operator int());
-	if (window_mode == DisplayServerEnums::WindowMode::WINDOW_MODE_MINIMIZED) {
+	DisplayServer::WindowMode window_mode = (DisplayServer::WindowMode)(GLOBAL_GET("display/window/size/mode").operator int());
+	if (window_mode == DisplayServer::WindowMode::WINDOW_MODE_MINIMIZED) {
 		return EMBED_NOT_AVAILABLE_MINIMIZED;
 	}
-	if (window_mode == DisplayServerEnums::WindowMode::WINDOW_MODE_MAXIMIZED) {
+	if (window_mode == DisplayServer::WindowMode::WINDOW_MODE_MAXIMIZED) {
 		return EMBED_NOT_AVAILABLE_MAXIMIZED;
 	}
-	if (window_mode == DisplayServerEnums::WindowMode::WINDOW_MODE_FULLSCREEN || window_mode == DisplayServerEnums::WindowMode::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (window_mode == DisplayServer::WindowMode::WINDOW_MODE_FULLSCREEN || window_mode == DisplayServer::WindowMode::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		return EMBED_NOT_AVAILABLE_FULLSCREEN;
 	}
 
@@ -996,7 +945,7 @@ void GameView::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_READY: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_WINDOW_EMBEDDING)) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_WINDOW_EMBEDDING)) {
 				// Embedding available.
 				int game_mode = EDITOR_GET("run/window_placement/game_embed_mode");
 				switch (game_mode) {
@@ -1035,14 +984,6 @@ void GameView::_notification(int p_what) {
 
 			_update_ui();
 		} break;
-
-		case NOTIFICATION_WM_WINDOW_FOCUS_IN:
-		case NOTIFICATION_WM_WINDOW_FOCUS_OUT: {
-			if (embed_on_play) {
-				debugger->report_window_focused(p_what == NOTIFICATION_WM_WINDOW_FOCUS_IN);
-			}
-		} break;
-
 		case NOTIFICATION_WM_POSITION_CHANGED: {
 			if (window_wrapper->get_window_enabled()) {
 				_update_floating_window_settings();
@@ -1158,7 +1099,7 @@ void GameView::_update_arguments_for_instance(int p_idx, List<String> &r_argumen
 
 	// Add the editor window's native ID so the started game can directly set it as its parent.
 	List<String>::Element *N = r_arguments.insert_before(user_args_element, "--wid");
-	N = r_arguments.insert_after(N, itos(DisplayServer::get_singleton()->window_get_native_handle(DisplayServerEnums::WINDOW_HANDLE, get_window()->get_window_id())));
+	N = r_arguments.insert_after(N, itos(DisplayServer::get_singleton()->window_get_native_handle(DisplayServer::WINDOW_HANDLE, get_window()->get_window_id())));
 
 #if MACOS_ENABLED
 	N = r_arguments.insert_after(N, "--embedded");
@@ -1624,7 +1565,8 @@ GameViewPluginBase::GameViewPluginBase() {
 #endif
 }
 
-GameViewPlugin::GameViewPlugin() {
+GameViewPlugin::GameViewPlugin() :
+		GameViewPluginBase() {
 #ifndef ANDROID_ENABLED
 	Ref<GameViewDebugger> game_view_debugger;
 	game_view_debugger.instantiate();
diff --git a/engine/editor/run/game_view_plugin.h b/engine/editor/run/game_view_plugin.h
index a42a4bf9..90fc3493 100644
--- a/engine/editor/run/game_view_plugin.h
+++ b/engine/editor/run/game_view_plugin.h
@@ -34,7 +34,7 @@
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/editor_main_screen.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/debugger/runtime_node_select.h"
+#include "scene/debugger/scene_debugger.h"
 #include "scene/gui/box_container.h"
 
 class EmbeddedProcessBase;
@@ -101,8 +101,6 @@ public:
 	void set_camera_override(bool p_enabled);
 	void set_camera_manipulate_mode(EditorDebuggerNode::CameraOverride p_mode);
 
-	void report_window_focused(bool p_focused);
-
 	void reset_camera_2d_position();
 	void reset_camera_3d_position();
 
diff --git a/engine/editor/run/run_instances_dialog.cpp b/engine/editor/run/run_instances_dialog.cpp
index 41b62173..72d60474 100644
--- a/engine/editor/run/run_instances_dialog.cpp
+++ b/engine/editor/run/run_instances_dialog.cpp
@@ -31,8 +31,6 @@
 #include "run_instances_dialog.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
diff --git a/engine/editor/scene/2d/abstract_polygon_2d_editor.cpp b/engine/editor/scene/2d/abstract_polygon_2d_editor.cpp
index 3b6e79b5..5a6994f1 100644
--- a/engine/editor/scene/2d/abstract_polygon_2d_editor.cpp
+++ b/engine/editor/scene/2d/abstract_polygon_2d_editor.cpp
@@ -31,7 +31,6 @@
 #include "abstract_polygon_2d_editor.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -41,7 +40,6 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/main/scene_tree.h"
 
 bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const {
 	return polygon == p_vertex.polygon && vertex == p_vertex.vertex;
diff --git a/engine/editor/scene/2d/abstract_polygon_2d_editor.h b/engine/editor/scene/2d/abstract_polygon_2d_editor.h
index b94e2118..25068cd4 100644
--- a/engine/editor/scene/2d/abstract_polygon_2d_editor.h
+++ b/engine/editor/scene/2d/abstract_polygon_2d_editor.h
@@ -167,6 +167,7 @@ public:
 	virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return polygon_editor->forward_gui_input(p_event); }
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { polygon_editor->forward_canvas_draw_over_viewport(p_overlay); }
 
+	bool has_main_screen() const override { return false; }
 	virtual String get_plugin_name() const override { return klass; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
diff --git a/engine/editor/scene/2d/camera_2d_editor_plugin.cpp b/engine/editor/scene/2d/camera_2d_editor_plugin.cpp
index 8c41c35c..55158c44 100644
--- a/engine/editor/scene/2d/camera_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/camera_2d_editor_plugin.cpp
@@ -31,12 +31,12 @@
 #include "camera_2d_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
+#include "editor/themes/editor_scale.h"
 #include "scene/2d/camera_2d.h"
+#include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"
 
 void Camera2DEditor::edit(Camera2D *p_camera) {
diff --git a/engine/editor/scene/2d/parallax_background_editor_plugin.cpp b/engine/editor/scene/2d/parallax_background_editor_plugin.cpp
index c1d315e2..f079bef8 100644
--- a/engine/editor/scene/2d/parallax_background_editor_plugin.cpp
+++ b/engine/editor/scene/2d/parallax_background_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "parallax_background_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/engine/editor/scene/2d/parallax_background_editor_plugin.h b/engine/editor/scene/2d/parallax_background_editor_plugin.h
index c2564c47..99a160ff 100644
--- a/engine/editor/scene/2d/parallax_background_editor_plugin.h
+++ b/engine/editor/scene/2d/parallax_background_editor_plugin.h
@@ -55,6 +55,7 @@ protected:
 
 public:
 	virtual String get_plugin_name() const override { return "ParallaxBackground"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/2d/particles_2d_editor_plugin.cpp b/engine/editor/scene/2d/particles_2d_editor_plugin.cpp
index 402bdacd..5daee85c 100644
--- a/engine/editor/scene/2d/particles_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/particles_2d_editor_plugin.cpp
@@ -31,8 +31,6 @@
 #include "particles_2d_editor_plugin.h"
 
 #include "core/io/image_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -41,6 +39,7 @@
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/spin_box.h"
diff --git a/engine/editor/scene/2d/path_2d_editor_plugin.cpp b/engine/editor/scene/2d/path_2d_editor_plugin.cpp
index dd894bff..f6652056 100644
--- a/engine/editor/scene/2d/path_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/path_2d_editor_plugin.cpp
@@ -30,17 +30,15 @@
 
 #include "path_2d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
+#include "editor/themes/editor_scale.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 void Path2DEditor::_notification(int p_what) {
 	switch (p_what) {
@@ -503,7 +501,7 @@ void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 
 		handles_array[Mesh::ARRAY_VERTEX] = Vector<Vector2>(debug_handle_lines);
 
-		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_LINES, handles_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_LINES, handles_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 		rs->canvas_item_add_mesh(vpc->get_canvas_item(), debug_mesh_rid, Transform2D(), Color(0.5, 0.5, 0.5, 1.0));
 	}
 
@@ -518,7 +516,7 @@ void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 	rs->multimesh_set_visible_instances(debug_handle_curve_multimesh_rid, 0);
 	if (handle_curve_count > 0) {
 		if (rs->multimesh_get_instance_count(debug_handle_curve_multimesh_rid) != int(handle_curve_count)) {
-			rs->multimesh_allocate_data(debug_handle_curve_multimesh_rid, handle_curve_count, RSE::MULTIMESH_TRANSFORM_2D);
+			rs->multimesh_allocate_data(debug_handle_curve_multimesh_rid, handle_curve_count, RS::MULTIMESH_TRANSFORM_2D);
 		}
 
 		Vector<float> multimesh_buffer;
@@ -551,7 +549,7 @@ void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 	rs->multimesh_set_visible_instances(debug_handle_sharp_multimesh_rid, 0);
 	if (handle_sharp_count > 0) {
 		if (rs->multimesh_get_instance_count(debug_handle_sharp_multimesh_rid) != int(handle_sharp_count)) {
-			rs->multimesh_allocate_data(debug_handle_sharp_multimesh_rid, handle_sharp_count, RSE::MULTIMESH_TRANSFORM_2D);
+			rs->multimesh_allocate_data(debug_handle_sharp_multimesh_rid, handle_sharp_count, RS::MULTIMESH_TRANSFORM_2D);
 		}
 
 		Vector<float> multimesh_buffer;
@@ -584,7 +582,7 @@ void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 	rs->multimesh_set_visible_instances(debug_handle_smooth_multimesh_rid, 0);
 	if (handle_smooth_count > 0) {
 		if (rs->multimesh_get_instance_count(debug_handle_smooth_multimesh_rid) != int(handle_smooth_count)) {
-			rs->multimesh_allocate_data(debug_handle_smooth_multimesh_rid, handle_smooth_count, RSE::MULTIMESH_TRANSFORM_2D);
+			rs->multimesh_allocate_data(debug_handle_smooth_multimesh_rid, handle_smooth_count, RS::MULTIMESH_TRANSFORM_2D);
 		}
 
 		Vector<float> multimesh_buffer;
@@ -959,12 +957,12 @@ Path2DEditor::Path2DEditor() {
 		index_array_ptrw[5] = 3;
 
 		Array mesh_arrays;
-		mesh_arrays.resize(RSE::ARRAY_MAX);
-		mesh_arrays[RSE::ARRAY_VERTEX] = vertex_array;
-		mesh_arrays[RSE::ARRAY_TEX_UV] = uv_array;
-		mesh_arrays[RSE::ARRAY_INDEX] = index_array;
+		mesh_arrays.resize(RS::ARRAY_MAX);
+		mesh_arrays[RS::ARRAY_VERTEX] = vertex_array;
+		mesh_arrays[RS::ARRAY_TEX_UV] = uv_array;
+		mesh_arrays[RS::ARRAY_INDEX] = index_array;
 
-		rs->mesh_add_surface_from_arrays(debug_handle_mesh_rid, RSE::PRIMITIVE_TRIANGLES, mesh_arrays, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+		rs->mesh_add_surface_from_arrays(debug_handle_mesh_rid, RS::PRIMITIVE_TRIANGLES, mesh_arrays, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 
 		debug_handle_curve_multimesh_rid = rs->multimesh_create();
 		debug_handle_sharp_multimesh_rid = rs->multimesh_create();
diff --git a/engine/editor/scene/2d/path_2d_editor_plugin.h b/engine/editor/scene/2d/path_2d_editor_plugin.h
index 2bd8a621..08e81d18 100644
--- a/engine/editor/scene/2d/path_2d_editor_plugin.h
+++ b/engine/editor/scene/2d/path_2d_editor_plugin.h
@@ -148,6 +148,7 @@ public:
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { path2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
 
 	virtual String get_plugin_name() const override { return "Path2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/2d/physics/cast_2d_editor_plugin.cpp b/engine/editor/scene/2d/physics/cast_2d_editor_plugin.cpp
index 729222e7..79b91a0a 100644
--- a/engine/editor/scene/2d/physics/cast_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/physics/cast_2d_editor_plugin.cpp
@@ -30,13 +30,11 @@
 
 #include "cast_2d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "scene/2d/physics/ray_cast_2d.h"
 #include "scene/2d/physics/shape_cast_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void Cast2DEditor::_notification(int p_what) {
diff --git a/engine/editor/scene/2d/physics/cast_2d_editor_plugin.h b/engine/editor/scene/2d/physics/cast_2d_editor_plugin.h
index 1a57b3a9..d9a742e7 100644
--- a/engine/editor/scene/2d/physics/cast_2d_editor_plugin.h
+++ b/engine/editor/scene/2d/physics/cast_2d_editor_plugin.h
@@ -65,6 +65,7 @@ public:
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { cast_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
 
 	virtual String get_plugin_name() const override { return "Cast2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool visible) override;
diff --git a/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp b/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp
index fd96fd54..495c024a 100644
--- a/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp
@@ -30,14 +30,11 @@
 
 #include "collision_shape_2d_editor_plugin.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/2d/capsule_shape_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"
@@ -469,7 +466,7 @@ void CollisionShape2DEditor::_shape_changed() {
 
 	current_shape = node->get_shape();
 
-	if (current_shape.is_valid() && !EditorNode::get_singleton()->is_resource_read_only(current_shape)) {
+	if (current_shape.is_valid()) {
 		current_shape->connect_changed(callable_mp(canvas_item_editor, &CanvasItemEditor::update_viewport));
 	} else {
 		return;
diff --git a/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.h b/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.h
index 56501fa6..e9ed6e26 100644
--- a/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.h
+++ b/engine/editor/scene/2d/physics/collision_shape_2d_editor_plugin.h
@@ -105,6 +105,7 @@ public:
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { collision_shape_2d_editor->forward_canvas_draw_over_viewport(p_overlay); }
 
 	virtual String get_plugin_name() const override { return "CollisionShape2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_obj) override;
 	virtual bool handles(Object *p_obj) const override;
 	virtual void make_visible(bool visible) override;
diff --git a/engine/editor/scene/2d/polygon_2d_editor_plugin.cpp b/engine/editor/scene/2d/polygon_2d_editor_plugin.cpp
index 6f6b7fab..79dfafc5 100644
--- a/engine/editor/scene/2d/polygon_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/polygon_2d_editor_plugin.cpp
@@ -32,9 +32,6 @@
 
 #include "core/input/input_event.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
@@ -56,8 +53,6 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/view_panner.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
 
 Node2D *Polygon2DEditor::_get_node() const {
 	return node;
@@ -112,7 +107,7 @@ void Polygon2DEditor::_notification(int p_what) {
 		}
 		case NOTIFICATION_ENTER_TREE: {
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(polygon_edit, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_READY: {
diff --git a/engine/editor/scene/2d/scene_paint_2d_editor_plugin.cpp b/engine/editor/scene/2d/scene_paint_2d_editor_plugin.cpp
deleted file mode 100644
index 5fcd513b..00000000
--- a/engine/editor/scene/2d/scene_paint_2d_editor_plugin.cpp
+++ /dev/null
@@ -1,933 +0,0 @@
-/**************************************************************************/
-/*  scene_paint_2d_editor_plugin.cpp                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "scene_paint_2d_editor_plugin.h"
-
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "editor/docks/filesystem_dock.h"
-#include "editor/docks/inspector_dock.h"
-#include "editor/docks/scene_tree_dock.h"
-#include "editor/editor_main_screen.h"
-#include "editor/editor_node.h"
-#include "editor/editor_undo_redo_manager.h"
-#include "editor/scene/canvas_item_editor_plugin.h"
-#include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/2d/tile_map_layer.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/tree.h"
-
-void ScenePaint2DEditor::_can_handle(bool p_is_node_2d, bool p_edit) {
-	if ((p_is_node_2d || pinned) && is_tool_selected && _is_node_valid()) {
-		toolbar->show();
-	} else {
-		toolbar->hide();
-		if (p_edit) {
-			_edit(nullptr);
-		}
-	}
-}
-
-void ScenePaint2DEditor::_edit(Object *p_object) {
-	if (is_tool_selected) {
-		TileMapLayer *edited_layer = Object::cast_to<TileMapLayer>(p_object);
-		if (edited_layer) {
-			Ref<TileSet> tile_set = edited_layer->get_tile_set();
-			if (tile_set.is_valid()) {
-				grid = true;
-				grid_step = tile_set->get_tile_size();
-			}
-		} else {
-			grid = CanvasItemEditor::get_singleton()->is_grid_visible();
-			grid_step = CanvasItemEditor::get_singleton()->get_grid_step();
-		}
-	}
-
-	cache_node = Object::cast_to<Node2D>(p_object);
-	if (_is_node_valid() && (pinned || input_tool == INPUT_TOOL_PICK)) {
-		if (input_tool == INPUT_TOOL_PICK) {
-			SceneTreeDock::get_singleton()->set_selection(Vector<Node *>{ node });
-		}
-		return;
-	}
-
-	_update_node(p_object);
-}
-
-void ScenePaint2DEditor::_update_node(Object *p_object) {
-	if (p_object == nullptr) {
-		p_object = cache_node;
-	}
-
-	// If the object is not a Node2D, hide the toolbar unless pinned.
-	Node2D *node_2d = Object::cast_to<Node2D>(p_object);
-	_can_handle(node_2d, false);
-
-	node = cache_node;
-	_update_draw_overlay();
-	input_tool = INPUT_TOOL_NONE;
-}
-
-bool ScenePaint2DEditor::_is_node_valid() {
-	return node && node->is_inside_tree();
-}
-
-void ScenePaint2DEditor::_draw_overlay() {
-	if (!is_visible_in_tree() || !is_tool_selected || !_is_node_valid()) {
-		_clear_instance(true);
-		return;
-	}
-	if (grid) {
-		// Draw grid
-		{
-			Color grid_color = EDITOR_GET("editors/tiles_editor/grid_color");
-			CanvasItemEditor *canvas_editor = CanvasItemEditor::get_singleton();
-			Transform2D xform = canvas_editor->get_canvas_transform() * node->get_global_transform();
-			Transform2D xform_inv = xform.affine_inverse();
-			Size2 viewport_size = custom_overlay->get_size();
-			Vector2 corners[4] = {
-				xform_inv.xform(Vector2(0, 0)),
-				xform_inv.xform(Vector2(viewport_size.x, 0)),
-				xform_inv.xform(Vector2(viewport_size.x, viewport_size.y)),
-				xform_inv.xform(Vector2(0, viewport_size.y))
-			};
-			Rect2 bounds(corners[0], Vector2());
-			for (int i = 1; i < 4; i++) {
-				bounds.expand_to(corners[i]);
-			}
-			int start_x = Math::floor(bounds.position.x / grid_step.x) * grid_step.x;
-			int end_x = Math::ceil((bounds.position.x + bounds.size.x) / grid_step.x) * grid_step.x;
-			int start_y = Math::floor(bounds.position.y / grid_step.y) * grid_step.y;
-			int end_y = Math::ceil((bounds.position.y + bounds.size.y) / grid_step.y) * grid_step.y;
-			Vector2 hint_distance = xform.get_scale() * grid_step;
-			float scale_fade = MIN(1.0, (MIN(hint_distance.x, hint_distance.y) - 5) / 5);
-			if (scale_fade > 0) {
-				grid_color.a *= scale_fade;
-				for (int x = start_x; x <= end_x; x += grid_step.x) {
-					Vector2 from = xform.xform(Vector2(x, start_y));
-					Vector2 to = xform.xform(Vector2(x, end_y));
-					custom_overlay->draw_line(from, to, grid_color);
-				}
-				for (int y = start_y; y <= end_y; y += grid_step.y) {
-					Vector2 from = xform.xform(Vector2(start_x, y));
-					Vector2 to = xform.xform(Vector2(end_x, y));
-					custom_overlay->draw_line(from, to, grid_color);
-				}
-			}
-		}
-		// Draw preview cell
-		if ((!instance || !instance->is_visible()) && paint_mode != PAINT_MODE_FREE) {
-			CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-			Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-			Vector2 mouse_canvas = viewport->get_local_mouse_position();
-			Vector2 mouse_local = xform.affine_inverse().xform(mouse_canvas);
-			Vector2 snapped_local = Vector2(
-					Math::floor(mouse_local.x / grid_step.x) * grid_step.x,
-					Math::floor(mouse_local.y / grid_step.y) * grid_step.y);
-			Vector2 corners[4] = {
-				snapped_local, snapped_local + Vector2(grid_step.x, 0),
-				snapped_local + Vector2(grid_step.x, grid_step.y),
-				snapped_local + Vector2(0, grid_step.y)
-			};
-			for (int i = 0; i < 4; i++) {
-				corners[i] = xform.xform(corners[i]);
-			}
-			Color rect_color = input_tool == INPUT_TOOL_ERASE ? Color(0, 0, 0, 0.3) : Color(1, 1, 1, 0.3);
-			Vector<Vector2> points;
-			points.push_back(corners[0]);
-			points.push_back(corners[1]);
-			points.push_back(corners[2]);
-			points.push_back(corners[3]);
-			custom_overlay->draw_polygon(points, Vector<Color>({ rect_color }));
-		}
-	}
-	// instance
-	if (_is_instance_valid() && input_tool != INPUT_TOOL_ERASE && input_tool != INPUT_TOOL_PICK && input_tool != INPUT_TOOL_QUICK_PICK) {
-		_add_instance(true);
-	} else if (!_is_instance_valid() || input_tool == INPUT_TOOL_ERASE || input_tool == INPUT_TOOL_PICK || input_tool == INPUT_TOOL_QUICK_PICK) {
-		_clear_instance(true);
-	}
-	if (instance) {
-		CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-		Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-		Vector2 mouse_canvas = viewport->get_local_mouse_position();
-		Vector2 mouse_local = xform.affine_inverse().xform(mouse_canvas);
-		Vector2 final_local;
-		if (paint_mode == PAINT_MODE_FREE) {
-			final_local = mouse_local;
-		} else {
-			Vector2 snapped_local;
-			if (paint_mode == PAINT_MODE_SNAP_GRID_CELL_CENTER) {
-				snapped_local = Vector2(
-						Math::floor(mouse_local.x / grid_step.x) * grid_step.x,
-						Math::floor(mouse_local.y / grid_step.y) * grid_step.y);
-			} else if (paint_mode == PAINT_MODE_SNAP_GRID) {
-				snapped_local = Vector2(
-						Math::round(mouse_local.x / grid_step.x) * grid_step.x,
-						Math::round(mouse_local.y / grid_step.y) * grid_step.y);
-			}
-			final_local = (paint_mode != PAINT_MODE_FREE)
-					? (paint_mode == PAINT_MODE_SNAP_GRID ? snapped_local : (snapped_local + grid_step / 2.0))
-					: mouse_local;
-		}
-		instance_container->set_position(xform.xform(final_local));
-		instance_container->set_rotation(xform.get_rotation());
-		instance_container->set_scale(xform.get_scale());
-		_edit_properties();
-	}
-}
-
-void ScenePaint2DEditor::_add_instance(bool p_show) {
-	if (p_show && instance_container) {
-		instance_container->show();
-	} else if (selected_scene && instance_container && !instance) {
-		HashMap<const Node *, Node *> duplimap;
-		instance = Object::cast_to<Node2D>(selected_scene->duplicate_from_editor(duplimap));
-		instance_container->add_child(instance, true);
-		instance->set_position(Point2());
-	}
-}
-
-void ScenePaint2DEditor::_clear_instance(bool p_hide) {
-	if (p_hide && instance_container) {
-		instance_container->hide();
-	} else if (instance) {
-		instance->queue_free();
-		instance = nullptr;
-	}
-}
-
-void ScenePaint2DEditor::_update_instance() {
-	if (_is_instance_valid()) {
-		_clear_instance();
-	}
-	if (!_is_instance_valid()) {
-		_add_instance();
-	}
-}
-
-bool ScenePaint2DEditor::_is_instance_valid() {
-	return instance && instance->is_inside_tree();
-}
-
-void ScenePaint2DEditor::_update_draw_overlay() {
-	if (custom_overlay) {
-		custom_overlay->queue_redraw();
-	}
-}
-
-void ScenePaint2DEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
-	if (!is_visible_in_tree() || !is_tool_selected) {
-		return;
-	}
-
-	// Hack: Ignore accidentally painting while panning with 'pan_view'. When holding 'pan_view', the tool doesn't change.
-	if (ED_IS_SHORTCUT("canvas_item_editor/pan_view", p_event) && p_event->is_pressed()) {
-		input_tool = INPUT_TOOL_PAN;
-	}
-
-	Ref<InputEventKey> k = p_event;
-
-	if (k.is_valid()) {
-		if (k->get_keycode() == Key::CMD_OR_CTRL) {
-			input_tool = k->is_pressed() ? INPUT_TOOL_QUICK_PICK : INPUT_TOOL_NONE;
-			scene_picker_button->set_pressed_no_signal(input_tool == INPUT_TOOL_QUICK_PICK);
-		} else if (k->get_keycode() == Key::ALT) {
-			paint_mode = k->is_pressed() ? quick_paint_mode : _reload_paint_mode();
-			_update_paint_mode();
-		} else if (k->get_keycode() == Key::SHIFT && paint_mode != PAINT_MODE_FREE) {
-			bool is_checked = advanced_settings_popup->is_item_checked(MENU_ITEM_ALLOW_OVERLAPPING);
-			allow_overlapping = k->is_pressed() ? !is_checked : is_checked;
-		}
-	}
-
-	Ref<InputEventMouseButton> mb = p_event;
-
-	if (mb.is_valid() && input_tool != INPUT_TOOL_PAN) {
-		if (input_tool == INPUT_TOOL_PICK || input_tool == INPUT_TOOL_QUICK_PICK) {
-			if (mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-				callable_mp(this, &ScenePaint2DEditor::_update_scene_picker).call_deferred(PICK_CANVAS_ITEM);
-			}
-		} else if (mb->is_pressed()) {
-			if (mb->get_button_index() == MouseButton::LEFT) {
-				if (!node) {
-					EditorNode::get_singleton()->show_warning(
-							"No target node selected. Please select a Node2D compatible node in the SceneTree where painted scenes will be added.");
-					return;
-				} else if (!selected_scene) {
-					EditorNode::get_singleton()->show_warning(
-							"No scene selected for painting. Use the Scene Picker from the toolbar to choose a scene before painting.");
-					return;
-				} else if (!FileAccess::exists(selected_scene->get_scene_file_path())) {
-					EditorNode::get_singleton()->show_warning(
-							vformat("The selected scene '%s' no longer exists on disk. Please select a valid scene to paint.",
-									selected_scene->get_scene_file_path()));
-					_set_picked_scene(nullptr);
-					return;
-				}
-				input_tool = INPUT_TOOL_PAINT;
-				_add_node_at_pos();
-				accept_event();
-			} else if (mb->get_button_index() == MouseButton::RIGHT) {
-				if (mb->is_double_click()) {
-					_set_picked_scene(nullptr);
-					return;
-				}
-				input_tool = INPUT_TOOL_ERASE;
-				_remove_node_at_pos();
-				accept_event();
-			}
-		} else if (mb->is_released()) {
-			if (mb->get_button_index() == MouseButton::LEFT || mb->get_button_index() == MouseButton::RIGHT) {
-				input_tool = INPUT_TOOL_NONE;
-			}
-		}
-	}
-
-	Ref<InputEventMouseMotion> mm = p_event;
-
-	if (mm.is_valid()) {
-		if (input_tool == INPUT_TOOL_PAINT) {
-			_add_node_at_pos();
-			accept_event();
-		} else if (input_tool == INPUT_TOOL_ERASE) {
-			_remove_node_at_pos();
-			accept_event();
-		}
-	}
-	_update_draw_overlay();
-}
-
-void ScenePaint2DEditor::_add_node_at_pos() {
-	if (!_is_node_valid() || !_is_instance_valid()) {
-		return;
-	}
-
-	Vector2 cell_pos = _get_mouse_grid_cell();
-	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-	Vector2 pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(viewport->get_local_mouse_position());
-
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	if (paint_mode != PAINT_MODE_FREE) {
-		Vector2 offset = node->get_global_transform().basis_xform(grid_step / 2.0);
-		pos = paint_mode == PAINT_MODE_SNAP_GRID ? cell_pos : (cell_pos + offset);
-
-		if (!allow_overlapping) {
-			Vector<CanvasItemEditor::SelectResult> results;
-			canvas_item_editor->find_canvas_items_at_pos(pos, node, results);
-			for (const CanvasItemEditor::SelectResult &result : results) {
-				Node2D *root = _get_node_root(result.item);
-				if (_is_scene_painted(root)) {
-					if (pos == root->get_position()) {
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	HashMap<const Node *, Node *> duplimap;
-	Node2D *node_2d = Object::cast_to<Node2D>(instance->duplicate_from_editor(duplimap));
-	if (!node_2d) {
-		return;
-	}
-
-	if (scene) {
-		node->add_child(node_2d, true);
-		node_2d->set_owner(scene);
-		node_2d->set_meta("_scene_painted", true);
-		node_2d->set_global_position(pos);
-
-		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-		undo_redo->create_action(TTR("Paint Node(s)"), UndoRedo::MERGE_ALL);
-		undo_redo->add_do_reference(node_2d);
-		undo_redo->add_do_method(node, "add_child", node_2d, true);
-		undo_redo->add_do_method(node_2d, "set_owner", scene);
-		undo_redo->add_do_method(node_2d, "set_meta", "_scene_painted", true);
-		undo_redo->add_do_method(node_2d, "set_global_position", pos);
-		undo_redo->add_undo_method(node, "remove_child", node_2d);
-		undo_redo->commit_action(false);
-	}
-
-	CanvasItemEditor::get_singleton()->update_viewport();
-}
-
-void ScenePaint2DEditor::_remove_node_at_pos() {
-	if (!_is_node_valid()) {
-		return;
-	}
-
-	Vector2 cell_pos = _get_mouse_grid_cell();
-	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-	Vector2 pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(viewport->get_local_mouse_position());
-
-	if (paint_mode != PAINT_MODE_FREE) {
-		Vector2 offset = node->get_global_transform().basis_xform(grid_step / 2.0);
-		pos = paint_mode == PAINT_MODE_SNAP_GRID ? cell_pos : (cell_pos + offset);
-	}
-
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	Vector<CanvasItemEditor::SelectResult> results;
-	canvas_item_editor->find_canvas_items_at_pos(pos, node, results);
-
-	for (const CanvasItemEditor::SelectResult &result : results) {
-		Node2D *root = _get_node_root(result.item);
-		if (!_is_scene_painted(root)) {
-			continue;
-		}
-
-		Node2D *node_2d = root;
-		Vector2 node_pos = node_2d->get_global_position();
-		node->remove_child(node_2d);
-
-		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-		undo_redo->create_action(TTR("Erase Node(s)"), UndoRedo::MERGE_ALL);
-		undo_redo->add_do_method(node, "remove_child", node_2d);
-		undo_redo->add_undo_reference(node_2d);
-		undo_redo->add_undo_method(node, "add_child", node_2d, true);
-		undo_redo->add_undo_method(node_2d, "set_owner", scene);
-		undo_redo->add_undo_method(node_2d, "set_meta", "_scene_painted", true);
-		undo_redo->add_undo_method(node_2d, "set_global_position", node_pos);
-		undo_redo->commit_action(false);
-	}
-}
-
-Vector2 ScenePaint2DEditor::_get_mouse_grid_cell() {
-	if (!_is_node_valid()) {
-		return Vector2();
-	}
-	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-	Vector2 pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(viewport->get_local_mouse_position());
-	Vector2 local = node->get_global_transform().affine_inverse().xform(pos);
-	Vector2 snapped;
-	if (paint_mode == PAINT_MODE_SNAP_GRID_CELL_CENTER) {
-		snapped = Vector2(
-				Math::floor(local.x / grid_step.x) * grid_step.x,
-				Math::floor(local.y / grid_step.y) * grid_step.y);
-	} else if (paint_mode == PAINT_MODE_SNAP_GRID) {
-		snapped = Vector2(
-				Math::round(local.x / grid_step.x) * grid_step.x,
-				Math::round(local.y / grid_step.y) * grid_step.y);
-	}
-
-	return node->get_global_transform().xform(snapped);
-}
-
-void ScenePaint2DEditor::_edit_properties() {
-	if (!_is_instance_valid() || !edit_properties) {
-		InspectorDock::get_singleton()->set_info("", "", false);
-		return;
-	}
-	InspectorDock::get_inspector_singleton()->edit(instance);
-	InspectorDock::get_singleton()->set_info(
-			TTR("Editing instance properties"),
-			TTR("Edit the properties of the scene instance being painted.\nEdited properties will be stored locally in the current scene. If overused, this can significantly increase the scene's size and its loading time."), true);
-}
-
-void ScenePaint2DEditor::_scene_picker_toggled(bool p_pressed) {
-	input_tool = p_pressed ? INPUT_TOOL_PICK : INPUT_TOOL_NONE;
-}
-
-void ScenePaint2DEditor::_file_system_input(const Ref<InputEvent> &p_event) {
-	if (input_tool != INPUT_TOOL_PICK || input_tool == INPUT_TOOL_QUICK_PICK) {
-		input_tool = INPUT_TOOL_NONE;
-		scene_picker_button->set_pressed(false);
-		return;
-	}
-
-	Ref<InputEventMouseButton> mb = p_event;
-	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-		callable_mp(this, &ScenePaint2DEditor::_update_scene_picker).call_deferred(PICK_FILE_SYSTEM);
-	}
-}
-
-void ScenePaint2DEditor::_scene_tree_input(const Ref<InputEvent> &p_event) {
-	if (input_tool != INPUT_TOOL_PICK || input_tool == INPUT_TOOL_QUICK_PICK) {
-		input_tool = INPUT_TOOL_NONE;
-		scene_picker_button->set_pressed(false);
-		return;
-	}
-
-	Ref<InputEventMouseButton> mb = p_event;
-	if (mb.is_valid() && mb->is_released() && mb->get_button_index() == MouseButton::LEFT) {
-		callable_mp(this, &ScenePaint2DEditor::_update_scene_picker).call_deferred(PICK_SCENE_TREE);
-	}
-}
-
-void ScenePaint2DEditor::_recent_item_selected(int p_idx) {
-	recent_idx = p_idx;
-	if (recent_idx == recent_scenes_button->get_item_count() - 1) {
-		_set_picked_scene(nullptr);
-		recent_scenes_button->select(-1);
-		EditorSettings::get_singleton()->set_project_metadata("scene_paint_2d_editor", "recent_scenes", PackedStringArray());
-		return;
-	}
-	callable_mp(this, &ScenePaint2DEditor::_update_scene_picker).call_deferred(PICK_RECENT_LIST);
-}
-
-bool ScenePaint2DEditor::_is_selected_scene_valid(Node2D *p_node) const {
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	return p_node && p_node->is_instance() && p_node != scene;
-}
-
-bool ScenePaint2DEditor::_is_scene_painted(Node2D *p_node) const {
-	return p_node && p_node->has_meta("_scene_painted") && p_node->get_parent() == node;
-}
-
-Node2D *ScenePaint2DEditor::_get_node_root(Node *p_node) const {
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	Node2D *item = Object::cast_to<Node2D>(p_node);
-	if (!item) {
-		return nullptr;
-	}
-	Node2D *root = item;
-	while (root && root->get_owner() != scene) {
-		root = Object::cast_to<Node2D>(root->get_parent());
-	}
-	return root;
-}
-
-void ScenePaint2DEditor::_set_pinned(bool p_pinned, Node *p_pinned_node) {
-	pinned = p_pinned;
-	pin_node_button->set_pressed_no_signal(pinned);
-	String tooltip_text = TTR("Pin the current node.\nWhen enabled, the painting parent node will not change when selecting other nodes in the scene.");
-	if (p_pinned_node && pinned) {
-		tooltip_text += vformat(TTR("\nPinned Node: %s"), EditorNode::get_singleton()->get_edited_scene()->get_path_to(p_pinned_node));
-	}
-	pin_node_button->set_tooltip_text(tooltip_text);
-}
-
-void ScenePaint2DEditor::_pinned_toggled(bool p_pressed) {
-	Node *selected_node = nullptr;
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	if (p_pressed) {
-		pinned_nodes[scene] = node;
-	} else {
-		pinned_nodes.erase(scene);
-		selected_node = SceneTreeDock::get_singleton()->get_tree_editor()->get_selected();
-	}
-	_set_pinned(p_pressed, pinned_nodes[scene]);
-	_update_node(selected_node);
-}
-
-void ScenePaint2DEditor::_scene_changed() {
-	input_tool = INPUT_TOOL_NONE;
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	if (pinned_nodes.has(scene)) {
-		Node *pinned_node = pinned_nodes[scene];
-		if (pinned_node && pinned_node->is_inside_tree()) {
-			_set_pinned(true, pinned_node);
-			cache_node = Object::cast_to<Node2D>(pinned_node);
-		} else {
-			pinned_nodes.erase(scene);
-			_set_pinned(false);
-		}
-	} else {
-		_set_pinned(false);
-		cache_node = Object::cast_to<Node2D>(SceneTreeDock::get_singleton()->get_tree_editor()->get_selected());
-	}
-	_update_node();
-}
-
-void ScenePaint2DEditor::_update_scene_picker(int p_mode) {
-	if (!is_tool_selected) {
-		return;
-	}
-
-	Node2D *node_2d = nullptr;
-	PickMode pick_mode = (PickMode)p_mode;
-	switch (pick_mode) {
-		case PICK_FILE_SYSTEM: {
-			String scene_path = FileSystemDock::get_singleton()->get_current_path();
-			Ref<PackedScene> scene = ResourceLoader::load(scene_path);
-			if (scene.is_null()) {
-				return;
-			}
-			Ref<SceneState> scene_state = scene->get_state();
-			String type;
-			while (scene_state.is_valid() && type.is_empty()) {
-				ERR_FAIL_COND(scene_state->get_node_count() < 1);
-				type = scene_state->get_node_type(0);
-				scene_state = scene_state->get_base_scene_state();
-			}
-			ERR_FAIL_COND_EDMSG(type.is_empty(), "The selected scene is invalid.");
-			bool extends_current_class = ClassDB::is_parent_class(type, "Node2D");
-			if (scene.is_valid() && extends_current_class) {
-				node_2d = Object::cast_to<Node2D>(scene->instantiate());
-			}
-		} break;
-		case PICK_SCENE_TREE: {
-			node_2d = Object::cast_to<Node2D>(SceneTreeDock::get_singleton()->get_tree_editor()->get_selected());
-		} break;
-		case PICK_CANVAS_ITEM: {
-			CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-			Vector2 pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(viewport->get_local_mouse_position());
-			Vector<CanvasItemEditor::SelectResult> results;
-			Node *scene = EditorNode::get_singleton()->get_edited_scene();
-			canvas_item_editor->find_canvas_items_at_pos(pos, scene, results);
-			for (const CanvasItemEditor::SelectResult &result : results) {
-				Node2D *root = _get_node_root(result.item);
-				if (_is_selected_scene_valid(root)) {
-					node_2d = root;
-					break;
-				}
-			}
-		} break;
-		case PICK_RECENT_LIST: {
-			String scene_path = recent_scenes_button->get_item_metadata(recent_idx);
-			if (!ResourceLoader::exists(scene_path)) {
-				EditorNode::get_singleton()->show_accept(
-						TTR("The selected scene could not be found. It may have been moved or deleted."),
-						TTR("OK"));
-				PackedStringArray rc = EditorSettings::get_singleton()->get_project_metadata("scene_paint_2d_editor", "recent_scenes", PackedStringArray());
-				rc.erase(scene_path);
-				EditorSettings::get_singleton()->set_project_metadata("scene_paint_2d_editor", "recent_scenes", rc);
-				callable_mp(this, &ScenePaint2DEditor::_update_recent_scenes).call_deferred();
-				return;
-			}
-			Ref<PackedScene> scene = ResourceLoader::load(scene_path);
-			if (scene.is_valid()) {
-				node_2d = Object::cast_to<Node2D>(scene->instantiate());
-			}
-		}
-	}
-
-	if (_is_selected_scene_valid(node_2d)) {
-		_set_picked_scene(node_2d);
-	}
-}
-
-void ScenePaint2DEditor::_edit_properties_toggled(bool p_pressed) {
-	edit_properties = p_pressed;
-	edit_properties_button->set_pressed_no_signal(edit_properties);
-	if (!edit_properties) {
-		Node *selected_node = SceneTreeDock::get_singleton()->get_tree_editor()->get_selected();
-		if (selected_node) {
-			InspectorDock::get_inspector_singleton()->edit(selected_node);
-		} else if (node) {
-			InspectorDock::get_inspector_singleton()->edit(node);
-		}
-	}
-	_edit_properties();
-}
-
-void ScenePaint2DEditor::_advanced_settings_pressed() {
-	Vector2 pos = advanced_settings_button->get_screen_position() + advanced_settings_button->get_size();
-	advanced_settings_popup->set_position(pos - Vector2(advanced_settings_popup->get_contents_minimum_size().width / 2, 0));
-	advanced_settings_popup->reset_size();
-	advanced_settings_popup->popup();
-	advanced_settings_popup->grab_focus();
-}
-
-void ScenePaint2DEditor::_advanced_settings_id_pressed(int p_id) {
-	switch (p_id) {
-		case MENU_ITEM_FREE_PAINT_MODE:
-		case MENU_ITEM_SNAP_TO_GRID_PAINT_MODE:
-		case MENU_ITEM_SNAP_TO_GRID_CELL_CENTER_PAINT_MODE: {
-			_paint_mode_changed(advanced_settings_popup->get_item_metadata(p_id));
-		} break;
-		case MENU_ITEM_ALLOW_OVERLAPPING: {
-			bool is_cheked = !advanced_settings_popup->is_item_checked(p_id);
-			advanced_settings_popup->set_item_checked(p_id, is_cheked);
-			allow_overlapping = is_cheked;
-		} break;
-	}
-}
-
-void ScenePaint2DEditor::_grid_toggled(bool p_toggled) {
-	grid = p_toggled;
-	_update_draw_overlay();
-}
-
-void ScenePaint2DEditor::_paint_mode_changed(int p_mode) {
-	if (paint_mode != p_mode) {
-		quick_paint_mode = paint_mode;
-	}
-	paint_mode = (PaintMode)p_mode;
-	set_meta("_paint_mode", p_mode);
-	_update_paint_mode();
-	_update_draw_overlay();
-}
-
-void ScenePaint2DEditor::_update_paint_mode() {
-	switch (paint_mode) {
-		case PAINT_MODE_FREE:
-			advanced_settings_button->set_button_icon(get_editor_theme_icon(SNAME("SnapDisable")));
-			break;
-		case PAINT_MODE_SNAP_GRID:
-			advanced_settings_button->set_button_icon(get_editor_theme_icon(SNAME("SnapGrid")));
-			break;
-		case PAINT_MODE_SNAP_GRID_CELL_CENTER:
-			advanced_settings_button->set_button_icon(get_editor_theme_icon(SNAME("Snap")));
-			break;
-	}
-	advanced_settings_popup->set_item_disabled(MENU_ITEM_ALLOW_OVERLAPPING, paint_mode == PAINT_MODE_FREE);
-}
-
-ScenePaint2DEditor::PaintMode ScenePaint2DEditor::_reload_paint_mode() {
-	return (PaintMode)get_meta("_paint_mode", 0);
-}
-
-void ScenePaint2DEditor::_grid_step_changed() {
-	grid_step = CanvasItemEditor::get_singleton()->get_grid_step();
-}
-
-void ScenePaint2DEditor::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_THEME_CHANGED: {
-			pin_node_button->set_button_icon(get_editor_theme_icon(SNAME("Pin")));
-			scene_picker_button->set_button_icon(get_editor_theme_icon(SNAME("ColorPick")));
-			edit_properties_button->set_button_icon(get_editor_theme_icon(SNAME("Tools")));
-			advanced_settings_button->set_button_icon(get_editor_theme_icon(SNAME("SnapDisable")));
-			advanced_settings_popup->add_theme_style_override(SceneStringName(panel),
-					get_theme_stylebox(SceneStringName(panel), SNAME("AcceptDialog")));
-			advanced_settings_popup->set_item_icon(MENU_ITEM_FREE_PAINT_MODE,
-					get_editor_theme_icon(SNAME("SnapDisable")));
-			advanced_settings_popup->set_item_icon(MENU_ITEM_SNAP_TO_GRID_PAINT_MODE,
-					get_editor_theme_icon(SNAME("SnapGrid")));
-			advanced_settings_popup->set_item_icon(MENU_ITEM_SNAP_TO_GRID_CELL_CENTER_PAINT_MODE,
-					get_editor_theme_icon(SNAME("Snap")));
-		} break;
-
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			_update_draw_overlay();
-		} break;
-
-		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
-			input_tool = INPUT_TOOL_NONE;
-		} break;
-	}
-}
-
-void ScenePaint2DEditor::_set_picked_scene(Node2D *p_scene) {
-	selected_scene = p_scene;
-	scene_picker_button->set_pressed(false);
-	input_tool = INPUT_TOOL_NONE;
-	if (!selected_scene) {
-		recent_scenes_button->select(-1);
-	}
-	String scene_path = selected_scene ? selected_scene->get_scene_file_path() : String();
-	callable_mp(this, &ScenePaint2DEditor::_add_to_recent_scenes).call_deferred(scene_path);
-	callable_mp(this, &ScenePaint2DEditor::_update_instance).call_deferred();
-}
-
-void ScenePaint2DEditor::_add_to_recent_scenes(const String &p_scene) {
-	if (p_scene.is_empty()) {
-		return;
-	}
-	PackedStringArray rc = EditorSettings::get_singleton()->get_project_metadata("scene_paint_2d_editor", "recent_scenes", PackedStringArray());
-	String uid = ResourceUID::path_to_uid(p_scene);
-	rc.erase(uid);
-	rc.insert(0, uid);
-	if (rc.size() > 10) {
-		rc.resize(10);
-	}
-
-	EditorSettings::get_singleton()->set_project_metadata("scene_paint_2d_editor", "recent_scenes", rc);
-	_update_recent_scenes();
-}
-
-void ScenePaint2DEditor::_update_recent_scenes() {
-	PackedStringArray rc = EditorSettings::get_singleton()->get_project_metadata("scene_paint_2d_editor", "recent_scenes", PackedStringArray());
-	recent_scenes_button->clear();
-
-	if (rc.is_empty()) {
-		recent_scenes_button->add_item(TTRC("No Recent Scenes"), -1);
-		recent_scenes_button->set_item_disabled(-1, true);
-		recent_scenes_button->get_popup()->set_item_as_radio_checkable(-1, false);
-	} else {
-		for (const String &uid : rc) {
-			String path = ResourceUID::ensure_path(uid);
-			recent_scenes_button->add_item(path.get_file());
-			recent_scenes_button->set_item_tooltip(-1, path);
-			recent_scenes_button->set_item_metadata(-1, uid);
-			recent_scenes_button->get_popup()->set_item_as_radio_checkable(-1, false);
-		}
-		recent_scenes_button->add_separator();
-		recent_scenes_button->add_item(TTRC("Clear Recent Scenes"), -1);
-		recent_scenes_button->get_popup()->set_item_as_radio_checkable(-1, false);
-	}
-	recent_scenes_button->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
-	if (!selected_scene) {
-		recent_scenes_button->select(-1);
-	}
-}
-
-void ScenePaint2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
-	if (!custom_overlay) {
-		custom_overlay = memnew(Control);
-		custom_overlay->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-		custom_overlay->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
-		custom_overlay->set_clip_contents(true);
-		custom_overlay->set_draw_behind_parent(true);
-		p_overlay->add_child(custom_overlay);
-		custom_overlay->connect(SceneStringName(draw), callable_mp(this, &ScenePaint2DEditor::_draw_overlay));
-	}
-	if (!instance_container) {
-		instance_container = memnew(Node2D);
-		instance_container->set_modulate(Color(1, 1, 1, 0.3));
-		custom_overlay->add_child(instance_container);
-	}
-}
-
-ScenePaint2DEditor::ScenePaint2DEditor() {
-	toolbar = memnew(HBoxContainer);
-	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
-	canvas_item_editor->add_control_to_menu_panel(toolbar);
-	toolbar->hide();
-
-	pin_node_button = memnew(Button);
-	pin_node_button->set_toggle_mode(true);
-	pin_node_button->set_accessibility_name(TTRC("Pin Node"));
-	pin_node_button->set_theme_type_variation(SceneStringName(FlatButton));
-	pin_node_button->set_tooltip_text(TTRC("Pin the current node.\nWhen enabled, the painting parent node will not change when selecting other nodes in the scene."));
-	pin_node_button->connect(SceneStringName(toggled), callable_mp(this, &ScenePaint2DEditor::_pinned_toggled));
-	pin_node_button->set_shortcut(ED_SHORTCUT("scene_painter/pin_node", TTRC("Pin Node"), Key::P));
-	pin_node_button->set_shortcut_context(canvas_item_editor);
-	toolbar->add_child(pin_node_button);
-
-	scene_picker_button = memnew(Button);
-	scene_picker_button->set_toggle_mode(true);
-	scene_picker_button->set_accessibility_name(TTRC("Scene Picker"));
-	scene_picker_button->set_theme_type_variation(SceneStringName(FlatButton));
-	scene_picker_button->set_tooltip_text(TTRC("Toggle scene picker mode.\nWhen enabled, you can select scenes from the FileSystem dock, Scene dock, or 2D editor's viewport.\nHolding Ctrl enables picking from the 2D editor's viewport."));
-	scene_picker_button->connect(SceneStringName(toggled), callable_mp(this, &ScenePaint2DEditor::_scene_picker_toggled));
-	scene_picker_button->set_shortcut(ED_SHORTCUT("scene_painter/scene_picker", TTRC("Scene Picker"), Key::I));
-	scene_picker_button->set_shortcut_context(CanvasItemEditor::get_singleton());
-	toolbar->add_child(scene_picker_button);
-
-	recent_scenes_button = memnew(OptionButton);
-	recent_scenes_button->set_theme_type_variation(SceneStringName(FlatButton));
-	recent_scenes_button->set_custom_minimum_size(Vector2(128 * EDSCALE, 0));
-	recent_scenes_button->set_fit_to_longest_item(false);
-	recent_scenes_button->connect(SceneStringName(item_selected), callable_mp(this, &ScenePaint2DEditor::_recent_item_selected));
-	toolbar->add_child(recent_scenes_button);
-
-	PopupMenu *popup = recent_scenes_button->get_popup();
-	popup->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	popup->connect("about_to_popup", callable_mp(this, &ScenePaint2DEditor::_update_recent_scenes));
-
-	edit_properties_button = memnew(Button);
-	edit_properties_button->set_toggle_mode(true);
-	edit_properties_button->set_accessibility_name(TTRC("Edit Properties"));
-	edit_properties_button->set_theme_type_variation(SceneStringName(FlatButton));
-	edit_properties_button->set_tooltip_text(TTRC("Edit properties of the selected scene."));
-	edit_properties_button->connect(SceneStringName(toggled), callable_mp(this, &ScenePaint2DEditor::_edit_properties_toggled));
-	edit_properties_button->set_shortcut(ED_SHORTCUT("scene_painter/edit_properties", TTRC("Edit Properties"), Key::O));
-	edit_properties_button->set_shortcut_context(CanvasItemEditor::get_singleton());
-	toolbar->add_child(edit_properties_button);
-
-	advanced_settings_button = memnew(Button);
-	advanced_settings_button->set_accessibility_name(TTRC("Advanced Settings"));
-	advanced_settings_button->set_theme_type_variation(SceneStringName(FlatButton));
-	advanced_settings_button->set_tooltip_text(TTRC("Open advanced settings.\nHolding alt temporarily switches to previously used paint mode."));
-	advanced_settings_button->connect(SceneStringName(pressed), callable_mp(this, &ScenePaint2DEditor::_advanced_settings_pressed));
-	toolbar->add_child(advanced_settings_button);
-
-	advanced_settings_popup = memnew(PopupMenu);
-	add_child(advanced_settings_popup);
-
-	advanced_settings_popup->add_item(TTRC("Free Paint"), MENU_ITEM_FREE_PAINT_MODE);
-	advanced_settings_popup->set_item_metadata(-1, PAINT_MODE_FREE);
-	advanced_settings_popup->set_item_tooltip(-1, TTRC("Enable free painting without snapping."));
-	advanced_settings_popup->add_item(TTRC("Snap to Grid"), MENU_ITEM_SNAP_TO_GRID_PAINT_MODE);
-	advanced_settings_popup->set_item_metadata(-1, PAINT_MODE_SNAP_GRID);
-	advanced_settings_popup->set_item_tooltip(-1, TTRC("Enable snapping to grid when painting."));
-	advanced_settings_popup->add_item(TTRC("Snap to Grid Cell Center"), MENU_ITEM_SNAP_TO_GRID_CELL_CENTER_PAINT_MODE);
-	advanced_settings_popup->set_item_metadata(-1, PAINT_MODE_SNAP_GRID_CELL_CENTER);
-	advanced_settings_popup->set_item_tooltip(-1, TTRC("Enable snapping to grid cell center when painting."));
-	advanced_settings_popup->add_separator();
-	advanced_settings_popup->add_check_item(TTRC("Allow Overlapping"), MENU_ITEM_ALLOW_OVERLAPPING);
-	advanced_settings_popup->set_item_tooltip(-1, TTRC("Allow painting over existing painted scenes.\nHolding shift temporarily toggles this option."));
-	advanced_settings_popup->set_item_disabled(-1, true);
-
-	advanced_settings_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ScenePaint2DEditor::_advanced_settings_id_pressed));
-}
-
-void ScenePaint2DEditorPlugin::_canvas_item_tool_changed(int p_tool) {
-	scene_paint_2d_editor->is_tool_selected = (CanvasItemEditor::Tool)p_tool == CanvasItemEditor::TOOL_SCENE_PAINT;
-	Node *selected_node = SceneTreeDock::get_singleton()->get_tree_editor()->get_selected();
-	if (!selected_node) {
-		make_visible(false);
-		return;
-	}
-	scene_paint_2d_editor->_set_picked_scene(nullptr);
-	scene_paint_2d_editor->_edit(Object::cast_to<Node2D>(selected_node));
-	scene_paint_2d_editor->input_tool = ScenePaint2DEditor::InputTool::INPUT_TOOL_NONE;
-	scene_paint_2d_editor->_edit_properties_toggled(false);
-	make_visible(true);
-}
-
-void ScenePaint2DEditorPlugin::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_ENTER_TREE: {
-			CanvasItemEditor::get_singleton()->connect("canvas_item_tool_changed", callable_mp(this, &ScenePaint2DEditorPlugin::_canvas_item_tool_changed));
-			CanvasItemEditor::get_singleton()->connect("snap_changed", callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_grid_step_changed));
-			CanvasItemEditor::get_singleton()->connect("grid_visibility_changed", callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_grid_toggled));
-			FileSystemDock::get_singleton()->get_tree_control()->connect(SceneStringName(gui_input), callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_file_system_input));
-			FileSystemDock::get_singleton()->get_list_control()->connect(SceneStringName(gui_input), callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_file_system_input));
-			SceneTreeDock::get_singleton()->get_tree_editor()->get_scene_tree()->connect(SceneStringName(gui_input), callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_scene_tree_input));
-			EditorNode::get_singleton()->connect("scene_changed", callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_scene_changed));
-			scene_paint_2d_editor->viewport = CanvasItemEditor::get_singleton()->get_viewport_control();
-			scene_paint_2d_editor->viewport->connect(SceneStringName(draw), callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_update_draw_overlay));
-			scene_paint_2d_editor->viewport->connect(SceneStringName(gui_input), callable_mp(scene_paint_2d_editor, &ScenePaint2DEditor::_gui_input_viewport));
-		} break;
-	}
-}
-
-void ScenePaint2DEditorPlugin::edit(Object *p_object) {
-	scene_paint_2d_editor->_edit(p_object);
-}
-
-bool ScenePaint2DEditorPlugin::handles(Object *p_object) const {
-	is_node_2d = bool(Object::cast_to<Node2D>(p_object));
-	return is_node_2d;
-}
-
-void ScenePaint2DEditorPlugin::make_visible(bool p_visible) {
-	if (p_visible) {
-		scene_paint_2d_editor->_can_handle(is_node_2d, false);
-	} else {
-		scene_paint_2d_editor->_can_handle(is_node_2d, true);
-	}
-}
-
-void ScenePaint2DEditorPlugin::forward_canvas_draw_over_viewport(Control *p_overlay) {
-	scene_paint_2d_editor->forward_canvas_draw_over_viewport(p_overlay);
-}
-
-ScenePaint2DEditorPlugin::ScenePaint2DEditorPlugin() {
-	scene_paint_2d_editor = memnew(ScenePaint2DEditor);
-	EditorNode::get_singleton()->get_gui_base()->add_child(scene_paint_2d_editor);
-	make_visible(false);
-}
diff --git a/engine/editor/scene/2d/scene_paint_2d_editor_plugin.h b/engine/editor/scene/2d/scene_paint_2d_editor_plugin.h
deleted file mode 100644
index f513d957..00000000
--- a/engine/editor/scene/2d/scene_paint_2d_editor_plugin.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*  scene_paint_2d_editor_plugin.h                                        */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "editor/plugins/editor_plugin.h"
-
-class Node2D;
-class HBoxContainer;
-class BaseButton;
-class CheckBox;
-class SpinBox;
-class ItemList;
-class OptionButton;
-
-class ScenePaint2DEditor : public Control {
-	GDCLASS(ScenePaint2DEditor, Control);
-
-	friend class ScenePaint2DEditorPlugin;
-
-	enum PaintMode {
-		PAINT_MODE_FREE,
-		PAINT_MODE_SNAP_GRID,
-		PAINT_MODE_SNAP_GRID_CELL_CENTER,
-	};
-
-	enum PickMode {
-		PICK_FILE_SYSTEM,
-		PICK_SCENE_TREE,
-		PICK_CANVAS_ITEM,
-		PICK_RECENT_LIST,
-	};
-
-	enum InputTool {
-		INPUT_TOOL_NONE,
-		INPUT_TOOL_PAINT,
-		INPUT_TOOL_ERASE,
-		INPUT_TOOL_PAN,
-		INPUT_TOOL_PICK,
-		INPUT_TOOL_QUICK_PICK,
-	};
-
-	enum MenuItem {
-		MENU_ITEM_FREE_PAINT_MODE,
-		MENU_ITEM_SNAP_TO_GRID_PAINT_MODE,
-		MENU_ITEM_SNAP_TO_GRID_CELL_CENTER_PAINT_MODE,
-		MENU_ITEM_ALLOW_OVERLAPPING = 4,
-	};
-
-	bool pinned = false;
-	bool edit_properties = false;
-	bool grid = false;
-	bool is_tool_selected = false;
-	bool allow_overlapping = false;
-
-	PaintMode paint_mode = PAINT_MODE_FREE;
-	PaintMode quick_paint_mode = PAINT_MODE_SNAP_GRID_CELL_CENTER;
-	InputTool input_tool = INPUT_TOOL_NONE;
-
-	Size2i grid_step = Size2i(16, 16);
-
-	int recent_idx = -1;
-
-	PopupMenu *advanced_settings_popup = nullptr;
-	Control *custom_overlay = nullptr;
-	Control *viewport = nullptr;
-	HashMap<Node *, Node *> pinned_nodes;
-
-	Node2D *cache_node = nullptr;
-	Node2D *node = nullptr;
-	Node2D *instance = nullptr;
-	Node2D *instance_container = nullptr;
-
-	HBoxContainer *toolbar = nullptr;
-
-	Button *pin_node_button = nullptr;
-	Button *scene_picker_button = nullptr;
-	OptionButton *recent_scenes_button = nullptr;
-	Button *edit_properties_button = nullptr;
-
-	Button *advanced_settings_button = nullptr;
-
-	Node2D *selected_scene = nullptr;
-
-	void _can_handle(bool p_is_node_2d, bool p_edit);
-
-	void _edit(Object *p_object);
-
-	void _update_node(Object *p_object = nullptr);
-	bool _is_node_valid();
-
-	void _add_instance(bool p_show = false);
-	void _clear_instance(bool p_hide = false);
-	void _update_instance();
-	bool _is_instance_valid();
-
-	void _draw_overlay();
-	void _update_draw_overlay();
-
-	void _gui_input_viewport(const Ref<InputEvent> &p_event);
-	void _add_node_at_pos();
-	void _remove_node_at_pos();
-
-	Vector2 _get_mouse_grid_cell();
-
-	void _set_pinned(bool p_pinned, Node *p_pinned_node = nullptr);
-	void _pinned_toggled(bool p_pressed);
-	void _scene_changed();
-
-	void _scene_picker_toggled(bool p_pressed);
-	void _update_scene_picker(int p_mode);
-	void _file_system_input(const Ref<InputEvent> &p_event);
-	void _scene_tree_input(const Ref<InputEvent> &p_event);
-	void _recent_item_selected(int p_idx);
-	void _set_picked_scene(Node2D *p_scene);
-
-	void _add_to_recent_scenes(const String &p_scene);
-	void _update_recent_scenes();
-
-	bool _is_selected_scene_valid(Node2D *p_node) const;
-	bool _is_scene_painted(Node2D *p_node) const;
-	Node2D *_get_node_root(Node *p_node) const;
-
-	void _edit_properties_toggled(bool p_pressed);
-	void _edit_properties();
-
-	void _advanced_settings_pressed();
-	void _advanced_settings_id_pressed(int p_id);
-	void _grid_toggled(bool p_toggled);
-	void _paint_mode_changed(int p_mode);
-	void _update_paint_mode();
-	PaintMode _reload_paint_mode();
-	void _grid_step_changed();
-
-protected:
-	void _notification(int p_what);
-
-public:
-	void forward_canvas_draw_over_viewport(Control *p_overlay);
-
-	ScenePaint2DEditor();
-};
-
-class ScenePaint2DEditorPlugin : public EditorPlugin {
-	GDCLASS(ScenePaint2DEditorPlugin, EditorPlugin);
-
-	ScenePaint2DEditor *scene_paint_2d_editor = nullptr;
-
-	mutable bool is_node_2d = false;
-
-	void _canvas_item_tool_changed(int p_tool);
-
-protected:
-	void _notification(int p_what);
-
-public:
-	virtual void edit(Object *p_object) override;
-	virtual bool handles(Object *p_object) const override;
-	virtual void make_visible(bool p_visible) override;
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override;
-
-	ScenePaint2DEditorPlugin();
-};
diff --git a/engine/editor/scene/2d/skeleton_2d_editor_plugin.cpp b/engine/editor/scene/2d/skeleton_2d_editor_plugin.cpp
index 91b4bad2..10f6621f 100644
--- a/engine/editor/scene/2d/skeleton_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/skeleton_2d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "skeleton_2d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/engine/editor/scene/2d/skeleton_2d_editor_plugin.h b/engine/editor/scene/2d/skeleton_2d_editor_plugin.h
index 00be8d01..07376b8b 100644
--- a/engine/editor/scene/2d/skeleton_2d_editor_plugin.h
+++ b/engine/editor/scene/2d/skeleton_2d_editor_plugin.h
@@ -69,6 +69,7 @@ class Skeleton2DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "Skeleton2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/2d/sprite_2d_editor_plugin.cpp b/engine/editor/scene/2d/sprite_2d_editor_plugin.cpp
index 5cc71fe6..3c77d83d 100644
--- a/engine/editor/scene/2d/sprite_2d_editor_plugin.cpp
+++ b/engine/editor/scene/2d/sprite_2d_editor_plugin.cpp
@@ -31,8 +31,6 @@
 #include "sprite_2d_editor_plugin.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -48,11 +46,8 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/bit_map.h"
 #include "scene/resources/mesh.h"
-
-#include <thirdparty/clipper2/include/clipper2/clipper.h>
+#include "thirdparty/clipper2/include/clipper2/clipper.h"
 
 #define PRECISION 1
 
@@ -580,7 +575,7 @@ void Sprite2DEditor::_notification(int p_what) {
 		}
 		case NOTIFICATION_ENTER_TREE: {
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(debug_uv_dialog->get_child(0), EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(debug_uv_dialog, EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 		case NOTIFICATION_THEME_CHANGED: {
 			options->set_button_icon(get_editor_theme_icon(SNAME("Sprite2D")));
diff --git a/engine/editor/scene/2d/sprite_2d_editor_plugin.h b/engine/editor/scene/2d/sprite_2d_editor_plugin.h
index 708be9f2..decc223f 100644
--- a/engine/editor/scene/2d/sprite_2d_editor_plugin.h
+++ b/engine/editor/scene/2d/sprite_2d_editor_plugin.h
@@ -131,6 +131,7 @@ class Sprite2DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "Sprite2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/2d/tiles/atlas_merging_dialog.cpp b/engine/editor/scene/2d/tiles/atlas_merging_dialog.cpp
index a0e7fb84..e27e687f 100644
--- a/engine/editor/scene/2d/tiles/atlas_merging_dialog.cpp
+++ b/engine/editor/scene/2d/tiles/atlas_merging_dialog.cpp
@@ -30,9 +30,6 @@
 
 #include "atlas_merging_dialog.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
diff --git a/engine/editor/scene/2d/tiles/tile_atlas_view.cpp b/engine/editor/scene/2d/tiles/tile_atlas_view.cpp
index 6af4317b..cec020af 100644
--- a/engine/editor/scene/2d/tiles/tile_atlas_view.cpp
+++ b/engine/editor/scene/2d/tiles/tile_atlas_view.cpp
@@ -30,8 +30,6 @@
 
 #include "tile_atlas_view.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/tile_map_layer.h"
@@ -39,8 +37,6 @@
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
 
 void TileAtlasView::gui_input(const Ref<InputEvent> &p_event) {
 	if (panner->gui_input(p_event, get_global_rect())) {
@@ -312,7 +308,7 @@ RID TileAtlasView::_get_canvas_item_to_draw(const TileData *p_for_data, const Ca
 		RID ci_rid = RS::get_singleton()->canvas_item_create();
 		RS::get_singleton()->canvas_item_set_parent(ci_rid, p_base_item->get_canvas_item());
 		RS::get_singleton()->canvas_item_set_material(ci_rid, mat->get_rid());
-		RS::get_singleton()->canvas_item_set_default_texture_filter(ci_rid, RSE::CanvasItemTextureFilter(p_base_item->get_texture_filter_in_tree()));
+		RS::get_singleton()->canvas_item_set_default_texture_filter(ci_rid, RS::CanvasItemTextureFilter(p_base_item->get_texture_filter_in_tree()));
 		p_material_map[mat] = ci_rid;
 		return ci_rid;
 	}
@@ -616,7 +612,7 @@ void TileAtlasView::_notification(int p_what) {
 		}
 		case NOTIFICATION_ENTER_TREE: {
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -652,7 +648,7 @@ TileAtlasView::TileAtlasView() {
 	button_center_view->connect(SceneStringName(pressed), callable_mp(this, &TileAtlasView::_center_view));
 	button_center_view->set_flat(true);
 	button_center_view->set_disabled(true);
-	button_center_view->set_tooltip_text(TTRC("Center View"));
+	button_center_view->set_tooltip_text(TTR("Center View"));
 	add_child(button_center_view);
 
 	panner.instantiate();
@@ -669,7 +665,7 @@ TileAtlasView::TileAtlasView() {
 
 	missing_source_label = memnew(Label);
 	missing_source_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	missing_source_label->set_text(TTRC("The selected atlas source has no valid texture. Assign a texture in the TileSet bottom tab."));
+	missing_source_label->set_text(TTR("The selected atlas source has no valid texture. Assign a texture in the TileSet bottom tab."));
 	center_container->add_child(missing_source_label);
 
 	margin_container = memnew(MarginContainer);
@@ -693,7 +689,7 @@ TileAtlasView::TileAtlasView() {
 	// Base tiles.
 	Label *base_tile_label = memnew(Label);
 	base_tile_label->set_mouse_filter(Control::MOUSE_FILTER_PASS);
-	base_tile_label->set_text(TTRC("Base Tiles"));
+	base_tile_label->set_text(TTR("Base Tiles"));
 	base_tile_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	left_vbox->add_child(base_tile_label);
 
@@ -736,7 +732,7 @@ TileAtlasView::TileAtlasView() {
 	// Alternative tiles.
 	Label *alternative_tiles_label = memnew(Label);
 	alternative_tiles_label->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
-	alternative_tiles_label->set_text(TTRC("Alternative Tiles"));
+	alternative_tiles_label->set_text(TTR("Alternative Tiles"));
 	alternative_tiles_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	right_vbox->add_child(alternative_tiles_label);
 
diff --git a/engine/editor/scene/2d/tiles/tile_data_editors.cpp b/engine/editor/scene/2d/tiles/tile_data_editors.cpp
index adc5541f..ec9f4935 100644
--- a/engine/editor/scene/2d/tiles/tile_data_editors.cpp
+++ b/engine/editor/scene/2d/tiles/tile_data_editors.cpp
@@ -30,27 +30,27 @@
 
 #include "tile_data_editors.h"
 
+#include "tile_set_editor.h"
+
 #include "core/math/geometry_2d.h"
 #include "core/math/random_pcg.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_properties.h"
-#include "editor/scene/2d/tiles/tile_set_editor.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
-#include "scene/main/scene_tree.h"
+
 #include "servers/navigation_2d/navigation_server_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 void TileDataEditor::_tile_set_changed_plan_update() {
 	_tile_set_changed_update_needed = true;
diff --git a/engine/editor/scene/2d/tiles/tile_data_editors.h b/engine/editor/scene/2d/tiles/tile_data_editors.h
index 6945bfd1..47fdf403 100644
--- a/engine/editor/scene/2d/tiles/tile_data_editors.h
+++ b/engine/editor/scene/2d/tiles/tile_data_editors.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
+#include "tile_atlas_view.h"
+
 #include "editor/inspector/editor_properties.h"
-#include "editor/scene/2d/tiles/tile_atlas_view.h"
 #include "scene/gui/box_container.h"
 
 class Label;
diff --git a/engine/editor/scene/2d/tiles/tile_map_layer_editor.cpp b/engine/editor/scene/2d/tiles/tile_map_layer_editor.cpp
index 9115f6ad..9d8bd5b9 100644
--- a/engine/editor/scene/2d/tiles/tile_map_layer_editor.cpp
+++ b/engine/editor/scene/2d/tiles/tile_map_layer_editor.cpp
@@ -30,18 +30,12 @@
 
 #include "tile_map_layer_editor.h"
 
-#include "core/input/input.h"
-#include "core/math/geometry_2d.h"
-#include "core/math/random_pcg.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/keyboard.h"
-#include "core/os/os.h"
+#include "tiles_editor_plugin.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_resource_preview.h"
 #include "editor/inspector/multi_node_edit.h"
-#include "editor/scene/2d/tiles/tiles_editor_plugin.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
@@ -50,7 +44,11 @@
 #include "scene/2d/tile_map_layer.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/split_container.h"
-#include "scene/main/scene_tree.h"
+
+#include "core/input/input.h"
+#include "core/math/geometry_2d.h"
+#include "core/math/random_pcg.h"
+#include "core/os/keyboard.h"
 
 void SwitchSeparator::set_vertical(bool p_vertical) {
 	h_separator->set_visible(p_vertical);
@@ -136,7 +134,7 @@ void TileMapLayerEditorTilesPlugin::_update_transform_buttons() {
 
 	if (tile_set->get_tile_shape() != TileSet::TILE_SHAPE_SQUARE && selection_pattern->get_size() != Vector2i(1, 1)) {
 		_set_transform_buttons_state({ transform_button_flip_h, transform_button_flip_v }, { transform_button_rotate_left, transform_button_rotate_right },
-				TTRC("Can't rotate patterns when using non-square tile grid."));
+				TTR("Can't rotate patterns when using non-square tile grid."));
 	} else {
 		_set_transform_buttons_state({ transform_button_rotate_left, transform_button_rotate_right, transform_button_flip_h, transform_button_flip_v }, {}, "");
 	}
@@ -153,16 +151,6 @@ void TileMapLayerEditorTilesPlugin::_set_transform_buttons_state(const Vector<Bu
 	}
 }
 
-void TileMapLayerEditorTilesPlugin::_update_translation() {
-	paint_tool_button->set_tooltip_text(TTR("Shift: Draw line.") + "\n" + vformat(TTR("%s+Shift: Draw rectangle."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)));
-
-	if (scene_tiles_list->is_visible_in_tree()) {
-		_update_scenes_collection_view();
-		_update_tile_set_sources_list();
-	}
-	_update_patterns_list();
-}
-
 Vector<TileMapLayerSubEditorPlugin::TabData> TileMapLayerEditorTilesPlugin::get_tabs() const {
 	Vector<TileMapLayerSubEditorPlugin::TabData> tabs;
 	Vector<Control *> toolbar_controls;
@@ -2214,7 +2202,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	paint_tool_button->set_toggle_mode(true);
 	paint_tool_button->set_button_group(tool_buttons_group);
 	paint_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/paint_tool"));
-	paint_tool_button->set_tooltip_auto_translate_mode(Node::AUTO_TRANSLATE_MODE_DISABLED);
+	paint_tool_button->set_tooltip_text(TTR("Shift: Draw line.") + "\n" + vformat(TTR("%s+Shift: Draw rectangle."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)));
 	paint_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
 	paint_tool_button->set_accessibility_name(TTRC("Paint Tool"));
 	tilemap_tiles_tools_buttons->add_child(paint_tool_button);
@@ -2262,7 +2250,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	picker_button->set_toggle_mode(true);
 	picker_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/picker"));
 	Key key = OS::prefer_meta_over_ctrl() ? Key::META : Key::CTRL;
-	picker_button->set_tooltip_text(vformat(TTRC("Alternatively hold %s with other tools to pick tile."), find_keycode_name(key)));
+	picker_button->set_tooltip_text(vformat(TTR("Alternatively hold %s with other tools to pick tile."), find_keycode_name(key)));
 	picker_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
 	picker_button->set_accessibility_name(TTRC("Pick"));
 	tools_settings->add_child(picker_button);
@@ -2321,7 +2309,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	// Continuous checkbox.
 	bucket_contiguous_checkbox = memnew(CheckBox);
 	bucket_contiguous_checkbox->set_flat(true);
-	bucket_contiguous_checkbox->set_text(TTRC("Contiguous"));
+	bucket_contiguous_checkbox->set_text(TTR("Contiguous"));
 	bucket_contiguous_checkbox->set_pressed(true);
 	bucket_contiguous_checkbox->hide();
 	tools_settings->add_child(bucket_contiguous_checkbox);
@@ -2330,7 +2318,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	random_tile_toggle = memnew(Button);
 	random_tile_toggle->set_theme_type_variation(SceneStringName(FlatButton));
 	random_tile_toggle->set_toggle_mode(true);
-	random_tile_toggle->set_tooltip_text(TTRC("Place Random Tile"));
+	random_tile_toggle->set_tooltip_text(TTR("Place Random Tile"));
 	random_tile_toggle->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_random_tile_checkbox_toggled));
 	tools_settings->add_child(random_tile_toggle);
 
@@ -2339,15 +2327,15 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	scatter_controls_container->set_vertical(false);
 
 	scatter_label = memnew(Label);
-	scatter_label->set_tooltip_text(TTRC("Modifies the chance of painting nothing instead of a randomly selected tile."));
-	scatter_label->set_text(TTRC("Scattering:"));
+	scatter_label->set_tooltip_text(TTR("Modifies the chance of painting nothing instead of a randomly selected tile."));
+	scatter_label->set_text(TTR("Scattering:"));
 	scatter_controls_container->add_child(scatter_label);
 
 	scatter_spinbox = memnew(SpinBox);
 	scatter_spinbox->set_min(0.0);
 	scatter_spinbox->set_max(1000);
 	scatter_spinbox->set_step(0.001);
-	scatter_spinbox->set_tooltip_text(TTRC("Modifies the chance of painting nothing instead of a randomly selected tile."));
+	scatter_spinbox->set_tooltip_text(TTR("Modifies the chance of painting nothing instead of a randomly selected tile."));
 	scatter_spinbox->get_line_edit()->add_theme_constant_override("minimum_character_width", 4);
 	scatter_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_scattering_spinbox_changed));
 	scatter_spinbox->set_accessibility_name(TTRC("Scattering:"));
@@ -2368,11 +2356,11 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	tiles_bottom_panel->connect(SceneStringName(theme_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_theme));
 	tiles_bottom_panel->connect(SceneStringName(visibility_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_stop_dragging));
 	tiles_bottom_panel->connect(SceneStringName(visibility_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_tab_changed));
-	tiles_bottom_panel->set_name(TTRC("Tiles"));
+	tiles_bottom_panel->set_name(TTR("Tiles"));
 
 	missing_source_label = memnew(Label);
 	missing_source_label->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
-	missing_source_label->set_text(TTRC("This TileMap's TileSet has no Tile Source configured. Go to the TileSet bottom panel to add one."));
+	missing_source_label->set_text(TTR("This TileMap's TileSet has no Tile Source configured. Go to the TileSet bottom panel to add one."));
 	missing_source_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	missing_source_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	missing_source_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@@ -2398,16 +2386,16 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	source_sort_button = memnew(MenuButton);
 	source_sort_button->set_flat(false);
 	source_sort_button->set_theme_type_variation("FlatMenuButton");
-	source_sort_button->set_tooltip_text(TTRC("Sort sources"));
+	source_sort_button->set_tooltip_text(TTR("Sort sources"));
 	source_sort_button->set_h_size_flags(Control::SIZE_SHRINK_END);
 	source_sort_button->set_v_size_flags(Control::SIZE_SHRINK_END);
 
 	PopupMenu *p = source_sort_button->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_set_source_sort));
-	p->add_radio_check_item(TTRC("Sort by ID (Ascending)"), TilesEditorUtils::SOURCE_SORT_ID);
-	p->add_radio_check_item(TTRC("Sort by ID (Descending)"), TilesEditorUtils::SOURCE_SORT_ID_REVERSE);
-	p->add_radio_check_item(TTRC("Sort by Name (Ascending)"), TilesEditorUtils::SOURCE_SORT_NAME);
-	p->add_radio_check_item(TTRC("Sort by Name (Descending)"), TilesEditorUtils::SOURCE_SORT_NAME_REVERSE);
+	p->add_radio_check_item(TTR("Sort by ID (Ascending)"), TilesEditorUtils::SOURCE_SORT_ID);
+	p->add_radio_check_item(TTR("Sort by ID (Descending)"), TilesEditorUtils::SOURCE_SORT_ID_REVERSE);
+	p->add_radio_check_item(TTR("Sort by Name (Ascending)"), TilesEditorUtils::SOURCE_SORT_NAME);
+	p->add_radio_check_item(TTR("Sort by Name (Descending)"), TilesEditorUtils::SOURCE_SORT_NAME_REVERSE);
 	p->set_item_checked(TilesEditorUtils::SOURCE_SORT_ID, true);
 
 	sources_list = memnew(TileSetSourceItemList);
@@ -2454,7 +2442,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	// Invalid source label.
 	invalid_source_label = memnew(Label);
 	invalid_source_label->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
-	invalid_source_label->set_text(TTRC("Invalid source selected."));
+	invalid_source_label->set_text(TTR("Invalid source selected."));
 	invalid_source_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	invalid_source_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	invalid_source_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
@@ -2464,7 +2452,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 
 	// --- Bottom panel patterns ---
 	patterns_mc = memnew(MarginContainer);
-	patterns_mc->set_name(TTRC("Patterns"));
+	patterns_mc->set_name(TTR("Patterns"));
 	patterns_mc->connect(SceneStringName(visibility_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_tab_changed));
 
 	int thumbnail_size = 64;
@@ -2484,8 +2472,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 
 	patterns_help_label = memnew(Label);
 	patterns_help_label->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
-	patterns_help_label->set_text(TTRC("Drag and drop or paste a TileMap selection here to store a pattern."));
-	patterns_help_label->set_auto_translate_mode(Node::AUTO_TRANSLATE_MODE_ALWAYS);
+	patterns_help_label->set_text(TTR("Drag and drop or paste a TileMap selection here to store a pattern."));
 	patterns_help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	patterns_help_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_HCENTER_WIDE);
@@ -2493,9 +2480,6 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 
 	// Update.
 	_update_source_display();
-
-	_update_translation();
-	EditorSettings::get_singleton()->connect("_translation_changed", callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_translation));
 }
 
 void TileMapLayerEditorTerrainsPlugin::tile_set_changed() {
@@ -3392,13 +3376,13 @@ void TileMapLayerEditorTerrainsPlugin::_update_tiles_list() {
 
 		// Add the two first generic modes
 		int item_index = terrains_tile_list->add_icon_item(main_box_container->get_editor_theme_icon(SNAME("TerrainConnect")));
-		terrains_tile_list->set_item_tooltip(item_index, TTRC("Connect mode: paints a terrain, then connects it with the surrounding tiles with the same terrain."));
+		terrains_tile_list->set_item_tooltip(item_index, TTR("Connect mode: paints a terrain, then connects it with the surrounding tiles with the same terrain."));
 		Dictionary list_metadata_dict;
 		list_metadata_dict["type"] = SELECTED_TYPE_CONNECT;
 		terrains_tile_list->set_item_metadata(item_index, list_metadata_dict);
 
 		item_index = terrains_tile_list->add_icon_item(main_box_container->get_editor_theme_icon(SNAME("TerrainPath")));
-		terrains_tile_list->set_item_tooltip(item_index, TTRC("Path mode: paints a terrain, then connects it to the previous tile painted within the same stroke."));
+		terrains_tile_list->set_item_tooltip(item_index, TTR("Path mode: paints a terrain, then connects it to the previous tile painted within the same stroke."));
 		list_metadata_dict = Dictionary();
 		list_metadata_dict["type"] = SELECTED_TYPE_PATH;
 		terrains_tile_list->set_item_metadata(item_index, list_metadata_dict);
@@ -3479,10 +3463,6 @@ void TileMapLayerEditorTerrainsPlugin::_update_theme() {
 	_update_tiles_list();
 }
 
-void TileMapLayerEditorTerrainsPlugin::_update_translation() {
-	_update_terrains_tree();
-}
-
 void TileMapLayerEditorTerrainsPlugin::edit(ObjectID p_edited_tile_map_layer_id) {
 	_stop_dragging(); // Avoids staying in a wrong drag state.
 
@@ -3625,13 +3605,10 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	// Continuous checkbox.
 	bucket_contiguous_checkbox = memnew(CheckBox);
 	bucket_contiguous_checkbox->set_flat(true);
-	bucket_contiguous_checkbox->set_text(TTRC("Contiguous"));
+	bucket_contiguous_checkbox->set_text(TTR("Contiguous"));
 	bucket_contiguous_checkbox->set_pressed(true);
 	bucket_contiguous_checkbox->hide();
 	tools_settings->add_child(bucket_contiguous_checkbox);
-
-	_update_translation();
-	EditorSettings::get_singleton()->connect("_translation_changed", callable_mp(this, &TileMapLayerEditorTerrainsPlugin::_update_translation));
 }
 
 TileMapLayer *TileMapLayerEditor::_get_edited_layer() const {
@@ -3703,10 +3680,7 @@ void TileMapLayerEditor::_notification(int p_what) {
 				custom_overlay->set_visible(is_visible_in_tree());
 			}
 			if (is_visible()) {
-				// Fix: Don't change the tool if we are in scene paint mode.
-				if (CanvasItemEditor::get_singleton()->get_current_tool() != CanvasItemEditor::TOOL_SCENE_PAINT) {
-					CanvasItemEditor::get_singleton()->set_current_tool(CanvasItemEditor::TOOL_SELECT);
-				}
+				CanvasItemEditor::get_singleton()->set_current_tool(CanvasItemEditor::TOOL_SELECT);
 			}
 		} break;
 
@@ -3743,14 +3717,6 @@ void TileMapLayerEditor::_notification(int p_what) {
 				toggle_highlight_selected_layer_button->set_pressed_no_signal(EDITOR_GET("editors/tiles_editor/highlight_selected_layer"));
 			}
 		} break;
-
-		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
-			// Simulate mouse released event to stop drawing when editor focus exits.
-			Ref<InputEventMouseButton> release;
-			release.instantiate();
-			release->set_button_index(MouseButton::LEFT);
-			forward_canvas_gui_input(release);
-		} break;
 	}
 }
 
@@ -3828,7 +3794,7 @@ void TileMapLayerEditor::_update_layers_selector() {
 			layers_selection_button->set_disabled(false);
 			if (layers_selection_button->get_item_count() == 0) {
 				layers_selection_button->set_disabled(true);
-				layers_selection_button->set_text(TTRC("No Layers"));
+				layers_selection_button->set_text(TTR("No Layers"));
 			}
 
 			// Disable next/previous if there's one or less layers.
@@ -3955,7 +3921,7 @@ void TileMapLayerEditor::_advanced_menu_button_id_pressed(int p_id) {
 
 	if (p_id == ADVANCED_MENU_REPLACE_WITH_PROXIES) { // Replace Tile Proxies
 		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-		undo_redo->create_action(TTRC("Replace Tiles with Proxies"));
+		undo_redo->create_action(TTR("Replace Tiles with Proxies"));
 		TypedArray<Vector2i> used_cells = edited_layer->get_used_cells();
 		for (int i = 0; i < used_cells.size(); i++) {
 			Vector2i cell_coords = used_cells[i];
@@ -3980,7 +3946,7 @@ void TileMapLayerEditor::_advanced_menu_button_id_pressed(int p_id) {
 		ERR_FAIL_NULL(edited_scene_root);
 
 		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-		undo_redo->create_action(TTRC("Extract TileMap layers as individual TileMapLayer nodes"));
+		undo_redo->create_action(TTR("Extract TileMap layers as individual TileMapLayer nodes"));
 
 		TileMap *tile_map = Object::cast_to<TileMap>(edited_layer->get_parent());
 		for (int i = 0; i < tile_map->get_layers_count(); i++) {
@@ -4014,16 +3980,16 @@ void TileMapLayerEditor::_update_bottom_panel() {
 
 	// Update state labels.
 	if (is_multi_node_edit) {
-		cant_edit_label->set_text(TTRC("Can't edit multiple layers at once."));
+		cant_edit_label->set_text(TTR("Can't edit multiple layers at once."));
 		cant_edit_label->show();
 	} else if (!edited_layer) {
-		cant_edit_label->set_text(TTRC("The selected TileMap has no layer to edit."));
+		cant_edit_label->set_text(TTR("The selected TileMap has no layer to edit."));
 		cant_edit_label->show();
 	} else if (!edited_layer->is_enabled() || !edited_layer->is_visible_in_tree()) {
-		cant_edit_label->set_text(TTRC("The edited layer is disabled or invisible"));
+		cant_edit_label->set_text(TTR("The edited layer is disabled or invisible"));
 		cant_edit_label->show();
 	} else if (tile_set.is_null()) {
-		cant_edit_label->set_text(TTRC("The edited TileMap or TileMapLayer node has no TileSet resource.\nCreate or load a TileSet resource in the Tile Set property in the inspector."));
+		cant_edit_label->set_text(TTR("The edited TileMap or TileMapLayer node has no TileSet resource.\nCreate or load a TileSet resource in the Tile Set property in the inspector."));
 		cant_edit_label->show();
 	} else {
 		cant_edit_label->hide();
@@ -4587,26 +4553,26 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	layers_selection_button = memnew(OptionButton);
 	layers_selection_button->set_custom_minimum_size(Size2(200, 0));
 	layers_selection_button->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
-	layers_selection_button->set_tooltip_text(TTRC("TileMap Layers"));
+	layers_selection_button->set_tooltip_text(TTR("TileMap Layers"));
 	layers_selection_button->connect(SceneStringName(item_selected), callable_mp(this, &TileMapLayerEditor::_layers_selection_item_selected));
 	layer_selection_hbox->add_child(layers_selection_button);
 
 	select_previous_layer = memnew(Button);
 	select_previous_layer->set_theme_type_variation(SceneStringName(FlatButton));
-	select_previous_layer->set_tooltip_text(TTRC("Select previous layer"));
+	select_previous_layer->set_tooltip_text(TTR("Select previous layer"));
 	select_previous_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_previous_layer_pressed));
 	layer_selection_hbox->add_child(select_previous_layer);
 
 	select_next_layer = memnew(Button);
 	select_next_layer->set_theme_type_variation(SceneStringName(FlatButton));
-	select_next_layer->set_tooltip_text(TTRC("Select next layer"));
+	select_next_layer->set_tooltip_text(TTR("Select next layer"));
 	select_next_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_next_layer_pressed));
 	layer_selection_hbox->add_child(select_next_layer);
 
 	select_all_layers = memnew(Button);
 	select_all_layers->set_theme_type_variation(SceneStringName(FlatButton));
 	select_all_layers->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_all_layers_pressed));
-	select_all_layers->set_tooltip_text(TTRC("Select all TileMapLayers in scene"));
+	select_all_layers->set_tooltip_text(TTR("Select all TileMapLayers in scene"));
 	layer_selection_hbox->add_child(select_all_layers);
 
 	// Highlighting selected layer.
@@ -4614,7 +4580,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	toggle_highlight_selected_layer_button->set_theme_type_variation(SceneStringName(FlatButton));
 	toggle_highlight_selected_layer_button->set_toggle_mode(true);
 	toggle_highlight_selected_layer_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_highlight_selected_layer_button_toggled));
-	toggle_highlight_selected_layer_button->set_tooltip_text(TTRC("Highlight Selected TileMap Layer"));
+	toggle_highlight_selected_layer_button->set_tooltip_text(TTR("Highlight Selected TileMap Layer"));
 	tile_map_toolbar->add_child(toggle_highlight_selected_layer_button);
 
 	layer_selector_separator = memnew(SwitchSeparator);
@@ -4625,7 +4591,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	toggle_grid_button = memnew(Button);
 	toggle_grid_button->set_theme_type_variation(SceneStringName(FlatButton));
 	toggle_grid_button->set_toggle_mode(true);
-	toggle_grid_button->set_tooltip_text(TTRC("Toggle grid visibility."));
+	toggle_grid_button->set_tooltip_text(TTR("Toggle grid visibility."));
 	toggle_grid_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_on_grid_toggled));
 	tile_map_toolbar->add_child(toggle_grid_button);
 
@@ -4634,8 +4600,8 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	advanced_menu_button->set_flat(false);
 	advanced_menu_button->set_tooltip_text(TTRC("Advanced settings."));
 	advanced_menu_button->set_theme_type_variation(SceneStringName(FlatButton));
-	advanced_menu_button->get_popup()->add_item(TTRC("Automatically Replace Tiles with Proxies"), ADVANCED_MENU_REPLACE_WITH_PROXIES);
-	advanced_menu_button->get_popup()->add_item(TTRC("Extract TileMap layers as individual TileMapLayer nodes"), ADVANCED_MENU_EXTRACT_TILE_MAP_LAYERS);
+	advanced_menu_button->get_popup()->add_item(TTR("Automatically Replace Tiles with Proxies"), ADVANCED_MENU_REPLACE_WITH_PROXIES);
+	advanced_menu_button->get_popup()->add_item(TTR("Extract TileMap layers as individual TileMapLayer nodes"), ADVANCED_MENU_EXTRACT_TILE_MAP_LAYERS);
 	advanced_menu_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileMapLayerEditor::_advanced_menu_button_id_pressed));
 	tile_map_toolbar->add_child(advanced_menu_button);
 
diff --git a/engine/editor/scene/2d/tiles/tile_map_layer_editor.h b/engine/editor/scene/2d/tiles/tile_map_layer_editor.h
index 13b5f049..f4df2dff 100644
--- a/engine/editor/scene/2d/tiles/tile_map_layer_editor.h
+++ b/engine/editor/scene/2d/tiles/tile_map_layer_editor.h
@@ -30,14 +30,15 @@
 
 #pragma once
 
+#include "scene/gui/margin_container.h"
+#include "tile_atlas_view.h"
+
 #include "core/os/thread.h"
 #include "editor/docks/editor_dock.h"
-#include "editor/scene/2d/tiles/tile_atlas_view.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
@@ -139,7 +140,6 @@ private:
 	void _update_toolbar();
 	void _update_transform_buttons();
 	void _set_transform_buttons_state(const Vector<Button *> &p_enabled_buttons, const Vector<Button *> &p_disabled_buttons, const String &p_why_disabled);
-	void _update_translation();
 
 	///// Tilemap editing. /////
 	bool has_mouse = false;
@@ -345,7 +345,6 @@ private:
 	void _update_terrains_tree();
 	void _update_tiles_list();
 	void _update_theme();
-	void _update_translation();
 
 	// Update callback
 	virtual void tile_set_changed() override;
diff --git a/engine/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp b/engine/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
index 5d51dfc9..bc221f07 100644
--- a/engine/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
+++ b/engine/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
@@ -30,8 +30,6 @@
 
 #include "tile_proxies_manager_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_properties_vector.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
index a80f2d21..62d42115 100644
--- a/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
+++ b/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
@@ -30,23 +30,24 @@
 
 #include "tile_set_atlas_source_editor.h"
 
-#include "core/input/input.h"
-#include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/keyboard.h"
+#include "tiles_editor_plugin.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/scene/2d/tiles/tile_set_editor.h"
-#include "editor/scene/2d/tiles/tiles_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
+
+#include "core/math/geometry_2d.h"
+#include "core/os/keyboard.h"
+
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) {
@@ -103,10 +104,10 @@ bool TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::_get(const StringN
 }
 
 void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::_get_property_list(List<PropertyInfo> *p_list) const {
-	p_list->push_back(PropertyInfo(Variant::NIL, TTRC("Atlas"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
+	p_list->push_back(PropertyInfo(Variant::NIL, TTR("Atlas"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 	p_list->push_back(PropertyInfo(Variant::INT, PNAME("id"), PROPERTY_HINT_RANGE, "0," + itos(INT_MAX) + ",1"));
 	p_list->push_back(PropertyInfo(Variant::STRING, PNAME("name")));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("texture"), PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("texture"), PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"));
 	p_list->push_back(PropertyInfo(Variant::VECTOR2I, PNAME("margins"), PROPERTY_HINT_NONE, "suffix:px"));
 	p_list->push_back(PropertyInfo(Variant::VECTOR2I, PNAME("separation"), PROPERTY_HINT_NONE, "suffix:px"));
 	p_list->push_back(PropertyInfo(Variant::VECTOR2I, PNAME("texture_region_size"), PROPERTY_HINT_NONE, "suffix:px"));
@@ -398,15 +399,15 @@ void TileSetAtlasSourceEditor::AtlasTileProxyObject::_get_property_list(List<Pro
 	// ID and size related properties.
 	if (tiles.size() == 1) {
 		if (tiles.front()->get().alternative == 0) {
-			p_list->push_back(PropertyInfo(Variant::NIL, TTRC("Base Tile"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
+			p_list->push_back(PropertyInfo(Variant::NIL, TTR("Base Tile"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 			p_list->push_back(PropertyInfo(Variant::VECTOR2I, PNAME("atlas_coords")));
 			p_list->push_back(PropertyInfo(Variant::VECTOR2I, PNAME("size_in_atlas")));
 		} else {
-			p_list->push_back(PropertyInfo(Variant::NIL, TTRC("Alternative Tile"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
+			p_list->push_back(PropertyInfo(Variant::NIL, TTR("Alternative Tile"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 			p_list->push_back(PropertyInfo(Variant::INT, PNAME("alternative_id")));
 		}
 	} else {
-		p_list->push_back(PropertyInfo(Variant::NIL, TTRC("Tiles"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
+		p_list->push_back(PropertyInfo(Variant::NIL, TTR("Tiles"), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
 	}
 
 	// Animation.
@@ -563,17 +564,7 @@ void TileSetAtlasSourceEditor::_update_tile_id_label() {
 
 void TileSetAtlasSourceEditor::_update_source_inspector() {
 	// Update the proxy object.
-	Object *edited = atlas_source_inspector->get_edited_object();
-	if (edited) {
-		Ref<TileSetAtlasSourceProxyObject> proxy(edited);
-		if (proxy.is_valid() && proxy->get_edited() == tile_set_atlas_source) {
-			return; // Already inspecting it.
-		}
-	}
-	atlas_source_proxy_object.instantiate();
-	atlas_source_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetAtlasSourceEditor::_atlas_source_proxy_object_changed).bind(atlas_source_proxy_object));
 	atlas_source_proxy_object->edit(tile_set, tile_set_atlas_source, tile_set_atlas_source_id);
-	atlas_source_inspector->edit(atlas_source_proxy_object.ptr());
 }
 
 void TileSetAtlasSourceEditor::_update_fix_selected_and_hovered_tiles() {
@@ -609,10 +600,7 @@ void TileSetAtlasSourceEditor::_update_tile_inspector() {
 	// Update visibility.
 	if (tools_button_group->get_pressed_button() == tool_select_button) {
 		if (!selection.is_empty()) {
-			tile_proxy_object.instantiate(this);
-			tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetAtlasSourceEditor::_tile_proxy_object_changed));
 			tile_proxy_object->edit(tile_set_atlas_source, selection);
-			tile_inspector->edit(tile_proxy_object.ptr());
 		}
 		tile_inspector->set_visible(!selection.is_empty());
 		tile_inspector_no_tile_selected_label->set_visible(selection.is_empty());
@@ -638,20 +626,20 @@ void TileSetAtlasSourceEditor::_update_tile_data_editors() {
 	TreeItem *root = tile_data_editors_tree->create_item();
 
 	TreeItem *group;
-#define ADD_TILE_DATA_EDITOR_GROUP(text) \
+#define ADD_TILE_DATA_EDITOR_GROUP(text)               \
 	group = tile_data_editors_tree->create_item(root); \
-	group->set_custom_bg_color(0, group_color); \
-	group->set_selectable(0, false); \
-	group->set_disable_folding(true); \
+	group->set_custom_bg_color(0, group_color);        \
+	group->set_selectable(0, false);                   \
+	group->set_disable_folding(true);                  \
 	group->set_text(0, text);
 
 	TreeItem *item;
-#define ADD_TILE_DATA_EDITOR(parent, text, property) \
+#define ADD_TILE_DATA_EDITOR(parent, text, property)    \
 	item = tile_data_editors_tree->create_item(parent); \
-	item->set_text(0, text); \
-	item->set_metadata(0, property); \
-	if (property == previously_selected) { \
-		item->select(0); \
+	item->set_text(0, text);                            \
+	item->set_metadata(0, property);                    \
+	if (property == previously_selected) {              \
+		item->select(0);                                \
 	}
 
 	// Theming.
@@ -987,7 +975,7 @@ void TileSetAtlasSourceEditor::_update_atlas_view() {
 			help_label->set_text(TTR("Hold Ctrl to create multiple tiles.") + "\n" + TTR("Hold Shift to create big tiles."));
 		} else if (tools_button_group->get_pressed_button() == tool_select_button) {
 			help_label->set_visible(true);
-			help_label->set_text(TTR("Hold Shift to select multiple regions."));
+			help_label->set_text(TTRC("Hold Shift to select multiple regions."));
 		} else {
 			help_label->set_visible(false);
 		}
@@ -1072,7 +1060,7 @@ void TileSetAtlasSourceEditor::_update_toolbar() {
 
 void TileSetAtlasSourceEditor::_update_buttons() {
 	tool_paint_button->set_disabled(read_only);
-	tool_paint_button->set_tooltip_text(read_only ? TTRC("TileSet is in read-only mode. Make the resource unique to edit TileSet properties.") : TTRC("Paint properties."));
+	tool_paint_button->set_tooltip_text(read_only ? TTR("TileSet is in read-only mode. Make the resource unique to edit TileSet properties.") : TTR("Paint properties."));
 	tools_settings_erase_button->set_disabled(read_only);
 	tool_advanced_menu_button->set_disabled(read_only);
 }
@@ -1504,6 +1492,9 @@ void TileSetAtlasSourceEditor::_end_dragging() {
 			Rect2i region = Rect2i(start_base_tiles_coords, new_base_tiles_coords - start_base_tiles_coords).abs();
 			region.size += Vector2i(1, 1);
 
+			undo_redo->create_action(TTR("Select tiles"));
+			undo_redo->add_undo_method(this, "_set_selection_from_array", _get_selection_as_array());
+
 			// Determine if we clear, then add or remove to the selection.
 			bool add_to_selection = true;
 			if (Input::get_singleton()->is_key_pressed(Key::SHIFT)) {
@@ -1534,6 +1525,8 @@ void TileSetAtlasSourceEditor::_end_dragging() {
 			_update_tile_inspector();
 			_update_tile_id_label();
 			_update_current_tile_data_editor();
+			undo_redo->add_do_method(this, "_set_selection_from_array", _get_selection_as_array());
+			undo_redo->commit_action(false);
 		} break;
 		case DRAG_TYPE_MAY_POPUP_MENU: {
 			Vector2 mouse_local_pos = tile_atlas_control->get_local_mouse_position();
@@ -1545,8 +1538,12 @@ void TileSetAtlasSourceEditor::_end_dragging() {
 			// Set the selection if needed.
 			if (selection.size() <= 1) {
 				if (selected.tile != TileSetSource::INVALID_ATLAS_COORDS) {
+					undo_redo->create_action(TTR("Select tiles"));
+					undo_redo->add_undo_method(this, "_set_selection_from_array", _get_selection_as_array());
 					selection.clear();
 					selection.insert(selected);
+					undo_redo->add_do_method(this, "_set_selection_from_array", _get_selection_as_array());
+					undo_redo->commit_action(false);
 					_update_tile_inspector();
 					_update_tile_id_label();
 					_update_current_tile_data_editor();
@@ -2130,13 +2127,13 @@ void TileSetAtlasSourceEditor::_tile_proxy_object_changed(const String &p_what)
 	_update_atlas_view();
 }
 
-void TileSetAtlasSourceEditor::_atlas_source_proxy_object_changed(const String &p_what, const Ref<TileSetAtlasSourceProxyObject> &p_object) {
-	if (p_what == "texture" && !p_object->get("texture").is_null()) {
+void TileSetAtlasSourceEditor::_atlas_source_proxy_object_changed(const String &p_what) {
+	if (p_what == "texture" && !atlas_source_proxy_object->get("texture").is_null()) {
 		atlases_to_auto_create_tiles.clear();
-		atlases_to_auto_create_tiles.append(p_object->get_edited());
+		atlases_to_auto_create_tiles.append(tile_set_atlas_source);
 		confirm_auto_create_tiles->popup_centered();
 	} else if (p_what == "id") {
-		emit_signal(SNAME("source_id_changed"), p_object->get_id());
+		emit_signal(SNAME("source_id_changed"), atlas_source_proxy_object->get_id());
 	}
 }
 
@@ -2431,39 +2428,33 @@ void TileSetAtlasSourceEditor::_auto_remove_tiles() {
 void TileSetAtlasSourceEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "id", TTRC("The tile's unique identifier within this TileSet. Each tile stores its source ID, so changing one may make tiles invalid."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "name", TTRC("The human-readable name for the atlas. Use a descriptive name here for organizational purposes (such as \"terrain\", \"decoration\", etc.)."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "texture", TTRC("The image from which the tiles will be created."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "margins", TTRC("The margins on the image's edges that should not be selectable as tiles (in pixels). Increasing this can be useful if you download a tilesheet image that has margins on the edges (e.g. for attribution)."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "separation", TTRC("The separation between each tile on the atlas in pixels. Increasing this can be useful if the tilesheet image you're using contains guides (such as outlines between every tile)."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "texture_region_size", TTRC("The size of each tile on the atlas in pixels. In most cases, this should match the tile size defined in the TileMap property (although this is not strictly necessary)."));
-			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "use_texture_padding", TTRC("If checked, adds a 1-pixel transparent edge around each tile to prevent texture bleeding when filtering is enabled. It's recommended to leave this enabled unless you're running into rendering issues due to texture padding."));
+			atlas_source_inspector->edit(atlas_source_proxy_object);
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "id", TTR("The tile's unique identifier within this TileSet. Each tile stores its source ID, so changing one may make tiles invalid."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "name", TTR("The human-readable name for the atlas. Use a descriptive name here for organizational purposes (such as \"terrain\", \"decoration\", etc.)."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "texture", TTR("The image from which the tiles will be created."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "margins", TTR("The margins on the image's edges that should not be selectable as tiles (in pixels). Increasing this can be useful if you download a tilesheet image that has margins on the edges (e.g. for attribution)."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "separation", TTR("The separation between each tile on the atlas in pixels. Increasing this can be useful if the tilesheet image you're using contains guides (such as outlines between every tile)."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "texture_region_size", TTR("The size of each tile on the atlas in pixels. In most cases, this should match the tile size defined in the TileMap property (although this is not strictly necessary)."));
+			atlas_source_inspector->add_custom_property_description("TileSetAtlasSourceProxyObject", "use_texture_padding", TTR("If checked, adds a 1-pixel transparent edge around each tile to prevent texture bleeding when filtering is enabled. It's recommended to leave this enabled unless you're running into rendering issues due to texture padding."));
 
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "atlas_coords", TTRC("The position of the tile's top-left corner in the atlas. The position and size must be within the atlas and can't overlap another tile.\nEach painted tile has associated atlas coords, so changing this property may cause your TileMaps to not display properly."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "size_in_atlas", TTRC("The unit size of the tile."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_columns", TTRC("Number of columns for the animation grid. If number of columns is lower than number of frames, the animation will automatically adjust row count."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_separation", TTRC("The space (in tiles) between each frame of the animation."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_speed", TTRC("Animation speed in frames per second."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_mode", TTRC("Determines how animation will start. In \"Default\" mode all tiles start animating at the same frame. In \"Random Start Times\" mode, each tile starts animation with a random offset."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "flip_h", TTRC("If [code]true[/code], the tile is horizontally flipped."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "flip_v", TTRC("If [code]true[/code], the tile is vertically flipped."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "transpose", TTRC("If [code]true[/code], the tile is rotated 90 degrees [i]counter-clockwise[/i] and then flipped vertically. In practice, this means that to rotate a tile by 90 degrees clockwise without flipping it, you should enable [b]Flip H[/b] and [b]Transpose[/b]. To rotate a tile by 180 degrees clockwise, enable [b]Flip H[/b] and [b]Flip V[/b]. To rotate a tile by 270 degrees clockwise, enable [b]Flip V[/b] and [b]Transpose[/b]."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "texture_origin", TTRC("The origin to use for drawing the tile. This can be used to visually offset the tile compared to the base tile."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "modulate", TTRC("The color multiplier to use when rendering the tile."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "material", TTRC("The material to use for this tile. This can be used to apply a different blend mode or custom shaders to a single tile."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "z_index", TTRC("The sorting order for this tile. Higher values will make the tile render in front of others on the same layer. The index is relative to the TileMap's own Z index."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "y_sort_origin", TTRC("The vertical offset to use for tile sorting based on its Y coordinate (in pixels). This allows using layers as if they were on different height for top-down games. Adjusting this can help alleviate issues with sorting certain tiles. Only effective if Y Sort Enabled is true on the TileMap layer the tile is placed on."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "terrain_set", TTRC("The index of the terrain set this tile belongs to. [code]-1[/code] means it will not be used in terrains."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "terrain", TTRC("The index of the terrain inside the terrain set this tile belongs to. [code]-1[/code] means it will not be used in terrains."));
-			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "probability", TTRC("The relative probability of this tile appearing when painting with \"Place Random Tile\" enabled."));
-		} break;
-
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			outside_tiles_warning->set_tooltip_text(vformat(TTR("The current atlas source has tiles outside the texture.\nYou can clear it using \"%s\" option in the 3 dots menu."), TTR("Remove Tiles Outside the Texture")));
-			if (tile_set.is_valid()) {
-				_update_tile_data_editors();
-				_update_atlas_view();
-			}
+			tile_inspector->edit(tile_proxy_object);
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "atlas_coords", TTR("The position of the tile's top-left corner in the atlas. The position and size must be within the atlas and can't overlap another tile.\nEach painted tile has associated atlas coords, so changing this property may cause your TileMaps to not display properly."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "size_in_atlas", TTR("The unit size of the tile."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_columns", TTR("Number of columns for the animation grid. If number of columns is lower than number of frames, the animation will automatically adjust row count."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_separation", TTR("The space (in tiles) between each frame of the animation."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_speed", TTR("Animation speed in frames per second."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "animation_mode", TTR("Determines how animation will start. In \"Default\" mode all tiles start animating at the same frame. In \"Random Start Times\" mode, each tile starts animation with a random offset."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "flip_h", TTR("If [code]true[/code], the tile is horizontally flipped."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "flip_v", TTR("If [code]true[/code], the tile is vertically flipped."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "transpose", TTR("If [code]true[/code], the tile is rotated 90 degrees [i]counter-clockwise[/i] and then flipped vertically. In practice, this means that to rotate a tile by 90 degrees clockwise without flipping it, you should enable [b]Flip H[/b] and [b]Transpose[/b]. To rotate a tile by 180 degrees clockwise, enable [b]Flip H[/b] and [b]Flip V[/b]. To rotate a tile by 270 degrees clockwise, enable [b]Flip V[/b] and [b]Transpose[/b]."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "texture_origin", TTR("The origin to use for drawing the tile. This can be used to visually offset the tile compared to the base tile."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "modulate", TTR("The color multiplier to use when rendering the tile."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "material", TTR("The material to use for this tile. This can be used to apply a different blend mode or custom shaders to a single tile."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "z_index", TTR("The sorting order for this tile. Higher values will make the tile render in front of others on the same layer. The index is relative to the TileMap's own Z index."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "y_sort_origin", TTR("The vertical offset to use for tile sorting based on its Y coordinate (in pixels). This allows using layers as if they were on different height for top-down games. Adjusting this can help alleviate issues with sorting certain tiles. Only effective if Y Sort Enabled is true on the TileMap layer the tile is placed on."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "terrain_set", TTR("The index of the terrain set this tile belongs to. [code]-1[/code] means it will not be used in terrains."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "terrain", TTR("The index of the terrain inside the terrain set this tile belongs to. [code]-1[/code] means it will not be used in terrains."));
+			tile_inspector->add_custom_property_description("AtlasTileProxyObject", "probability", TTR("The relative probability of this tile appearing when painting with \"Place Random Tile\" enabled."));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -2552,31 +2543,34 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	middle_vbox_container->add_child(toolbox);
 
 	tool_setup_atlas_source_button = memnew(Button);
-	tool_setup_atlas_source_button->set_text(TTRC("Setup"));
+	tool_setup_atlas_source_button->set_text(TTR("Setup"));
 	tool_setup_atlas_source_button->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_setup_atlas_source_button->set_toggle_mode(true);
 	tool_setup_atlas_source_button->set_pressed(true);
 	tool_setup_atlas_source_button->set_button_group(tools_button_group);
-	tool_setup_atlas_source_button->set_tooltip_text(TTRC("Atlas setup. Add/Remove tiles tool (use the shift key to create big tiles, control for rectangle editing)."));
+	tool_setup_atlas_source_button->set_tooltip_text(TTR("Atlas setup. Add/Remove tiles tool (use the shift key to create big tiles, control for rectangle editing)."));
 	toolbox->add_child(tool_setup_atlas_source_button);
 
 	tool_select_button = memnew(Button);
-	tool_select_button->set_text(TTRC("Select"));
+	tool_select_button->set_text(TTR("Select"));
 	tool_select_button->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_select_button->set_toggle_mode(true);
 	tool_select_button->set_pressed(false);
 	tool_select_button->set_button_group(tools_button_group);
-	tool_select_button->set_tooltip_text(TTRC("Select tiles."));
+	tool_select_button->set_tooltip_text(TTR("Select tiles."));
 	toolbox->add_child(tool_select_button);
 
 	tool_paint_button = memnew(Button);
-	tool_paint_button->set_text(TTRC("Paint"));
+	tool_paint_button->set_text(TTR("Paint"));
 	tool_paint_button->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_paint_button->set_toggle_mode(true);
 	tool_paint_button->set_button_group(tools_button_group);
 	toolbox->add_child(tool_paint_button);
 
 	// Tile inspector.
+	tile_proxy_object = memnew(AtlasTileProxyObject(this));
+	tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetAtlasSourceEditor::_tile_proxy_object_changed));
+
 	tile_inspector = memnew(EditorInspector);
 	tile_inspector->set_v_size_flags(SIZE_EXPAND_FILL);
 	tile_inspector->set_show_categories(false, true);
@@ -2591,7 +2585,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	tile_inspector_no_tile_selected_label->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
 	tile_inspector_no_tile_selected_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	tile_inspector_no_tile_selected_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
-	tile_inspector_no_tile_selected_label->set_text(TTRC("No tiles selected.\nSelect one or more tiles from the palette to edit its properties."));
+	tile_inspector_no_tile_selected_label->set_text(TTR("No tiles selected.\nSelect one or more tiles from the palette to edit its properties."));
 	middle_vbox_container->add_child(tile_inspector_no_tile_selected_label);
 
 	// Property values palette.
@@ -2608,7 +2602,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	tile_data_editors_popup = memnew(Popup);
 
 	tile_data_editors_label = memnew(Label);
-	tile_data_editors_label->set_text(TTRC("Paint Properties:"));
+	tile_data_editors_label->set_text(TTR("Paint Properties:"));
 	tile_data_editors_label->set_theme_type_variation("HeaderSmall");
 	tile_data_editors_vbox->add_child(tile_data_editors_label);
 
@@ -2631,6 +2625,9 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	tile_data_editors_vbox->add_child(tile_data_painting_editor_container);
 
 	// Atlas source inspector.
+	atlas_source_proxy_object = memnew(TileSetAtlasSourceProxyObject());
+	atlas_source_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetAtlasSourceEditor::_atlas_source_proxy_object_changed));
+
 	atlas_source_inspector = memnew(EditorInspector);
 	atlas_source_inspector->set_v_size_flags(SIZE_EXPAND_FILL);
 	atlas_source_inspector->set_show_categories(false, true);
@@ -2659,15 +2656,15 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	tool_advanced_menu_button = memnew(MenuButton);
 	tool_advanced_menu_button->set_flat(false);
 	tool_advanced_menu_button->set_theme_type_variation("FlatMenuButton");
-	tool_advanced_menu_button->get_popup()->add_item(TTRC("Create Tiles in Non-Transparent Texture Regions"), ADVANCED_AUTO_CREATE_TILES);
-	tool_advanced_menu_button->get_popup()->add_item(TTRC("Remove Tiles in Fully Transparent Texture Regions"), ADVANCED_AUTO_REMOVE_TILES);
-	tool_advanced_menu_button->get_popup()->add_item(TTRC("Remove Tiles Outside the Texture"), ADVANCED_CLEANUP_TILES);
+	tool_advanced_menu_button->get_popup()->add_item(TTR("Create Tiles in Non-Transparent Texture Regions"), ADVANCED_AUTO_CREATE_TILES);
+	tool_advanced_menu_button->get_popup()->add_item(TTR("Remove Tiles in Fully Transparent Texture Regions"), ADVANCED_AUTO_REMOVE_TILES);
+	tool_advanced_menu_button->get_popup()->add_item(TTR("Remove Tiles Outside the Texture"), ADVANCED_CLEANUP_TILES);
 	tool_advanced_menu_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetAtlasSourceEditor::_menu_option));
 	tool_settings->add_child(tool_advanced_menu_button);
 
 	outside_tiles_warning = memnew(TextureRect);
 	outside_tiles_warning->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
-	outside_tiles_warning->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	outside_tiles_warning->set_tooltip_text(vformat(TTR("The current atlas source has tiles outside the texture.\nYou can clear it using \"%s\" option in the 3 dots menu."), TTR("Remove Tiles Outside the Texture")));
 	outside_tiles_warning->hide();
 	tool_settings->add_child(outside_tiles_warning);
 
@@ -2706,17 +2703,16 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	help_label->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
 	help_label->set_vertical_alignment(VERTICAL_ALIGNMENT_BOTTOM);
 	help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
-	help_label->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	tile_atlas_view->add_child(help_label);
 
 	base_tile_popup_menu = memnew(PopupMenu);
 	base_tile_popup_menu->add_shortcut(ED_GET_SHORTCUT("tiles_editor/delete"), TILE_DELETE);
-	base_tile_popup_menu->add_item(TTRC("Create an Alternative Tile"), TILE_CREATE_ALTERNATIVE);
+	base_tile_popup_menu->add_item(TTR("Create an Alternative Tile"), TILE_CREATE_ALTERNATIVE);
 	base_tile_popup_menu->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetAtlasSourceEditor::_menu_option));
 	tile_atlas_view->add_child(base_tile_popup_menu);
 
 	empty_base_tile_popup_menu = memnew(PopupMenu);
-	empty_base_tile_popup_menu->add_item(TTRC("Create a Tile"), TILE_CREATE);
+	empty_base_tile_popup_menu->add_item(TTR("Create a Tile"), TILE_CREATE);
 	empty_base_tile_popup_menu->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetAtlasSourceEditor::_menu_option));
 	tile_atlas_view->add_child(empty_base_tile_popup_menu);
 
@@ -2751,10 +2747,10 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 
 	// -- Dialogs --
 	confirm_auto_create_tiles = memnew(AcceptDialog);
-	confirm_auto_create_tiles->set_title(TTRC("Auto Create Tiles in Non-Transparent Texture Regions?"));
-	confirm_auto_create_tiles->set_text(TTRC("The atlas's texture was modified.\nWould you like to automatically create tiles in the atlas?"));
-	confirm_auto_create_tiles->set_ok_button_text(TTRC("Yes"));
-	confirm_auto_create_tiles->add_cancel_button()->set_text(TTRC("No"));
+	confirm_auto_create_tiles->set_title(TTR("Auto Create Tiles in Non-Transparent Texture Regions?"));
+	confirm_auto_create_tiles->set_text(TTR("The atlas's texture was modified.\nWould you like to automatically create tiles in the atlas?"));
+	confirm_auto_create_tiles->set_ok_button_text(TTR("Yes"));
+	confirm_auto_create_tiles->add_cancel_button()->set_text(TTR("No"));
 	confirm_auto_create_tiles->connect(SceneStringName(confirmed), callable_mp(this, &TileSetAtlasSourceEditor::_auto_create_tiles));
 	confirm_auto_create_tiles->connect("canceled", callable_mp(this, &TileSetAtlasSourceEditor::_cancel_auto_create_tiles));
 	add_child(confirm_auto_create_tiles);
@@ -2765,6 +2761,9 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 }
 
 TileSetAtlasSourceEditor::~TileSetAtlasSourceEditor() {
+	memdelete(tile_proxy_object);
+	memdelete(atlas_source_proxy_object);
+
 	// Remove listener for old objects, so the TileSet doesn't
 	// try to call the destroyed TileSetAtlasSourceEditor.
 	if (tile_set.is_valid()) {
diff --git a/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.h b/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.h
index 31742948..2407e287 100644
--- a/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.h
+++ b/engine/editor/scene/2d/tiles/tile_set_atlas_source_editor.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "editor/scene/2d/tiles/tile_atlas_view.h"
-#include "editor/scene/2d/tiles/tile_data_editors.h"
+#include "tile_atlas_view.h"
+#include "tile_data_editors.h"
+
 #include "scene/gui/split_container.h"
 #include "scene/resources/2d/tile_set.h"
 
@@ -59,8 +60,8 @@ public:
 	};
 
 	// -- Proxy object for an atlas source, needed by the inspector --
-	class TileSetAtlasSourceProxyObject : public RefCounted {
-		GDCLASS(TileSetAtlasSourceProxyObject, RefCounted);
+	class TileSetAtlasSourceProxyObject : public Object {
+		GDCLASS(TileSetAtlasSourceProxyObject, Object);
 
 	private:
 		Ref<TileSet> tile_set;
@@ -82,8 +83,8 @@ public:
 	};
 
 	// -- Proxy object for a tile, needed by the inspector --
-	class AtlasTileProxyObject : public RefCounted {
-		GDCLASS(AtlasTileProxyObject, RefCounted);
+	class AtlasTileProxyObject : public Object {
+		GDCLASS(AtlasTileProxyObject, Object);
 
 	private:
 		TileSetAtlasSourceEditor *tiles_set_atlas_source_editor = nullptr;
@@ -100,7 +101,7 @@ public:
 
 	public:
 		Ref<TileSetAtlasSource> get_edited_tile_set_atlas_source() const { return tile_set_atlas_source; }
-		RBSet<TileSelection> get_edited_tiles() const { return RBSet<TileSelection>(tiles); }
+		RBSet<TileSelection> get_edited_tiles() const { return tiles; }
 
 		// Update the proxied object.
 		void edit(Ref<TileSetAtlasSource> p_tile_set_atlas_source, const RBSet<TileSelection> &p_tiles = RBSet<TileSelection>());
@@ -146,13 +147,13 @@ private:
 	void _tile_data_editors_tree_selected();
 
 	// -- Inspector --
-	Ref<AtlasTileProxyObject> tile_proxy_object;
+	AtlasTileProxyObject *tile_proxy_object = nullptr;
 	EditorInspector *tile_inspector = nullptr;
 	Label *tile_inspector_no_tile_selected_label = nullptr;
 	String selected_property;
 	void _inspector_property_selected(const String &p_property);
 
-	Ref<TileSetAtlasSourceProxyObject> atlas_source_proxy_object;
+	TileSetAtlasSourceProxyObject *atlas_source_proxy_object = nullptr;
 	EditorInspector *atlas_source_inspector = nullptr;
 
 	// -- Atlas view --
@@ -283,7 +284,7 @@ private:
 
 	void _tile_set_changed();
 	void _tile_proxy_object_changed(const String &p_what);
-	void _atlas_source_proxy_object_changed(const String &p_what, const Ref<TileSetAtlasSourceProxyObject> &p_object);
+	void _atlas_source_proxy_object_changed(const String &p_what);
 
 	void _undo_redo_inspector_callback(Object *p_undo_redo, Object *p_edited, const String &p_property, const Variant &p_new_value);
 
diff --git a/engine/editor/scene/2d/tiles/tile_set_editor.cpp b/engine/editor/scene/2d/tiles/tile_set_editor.cpp
index e2f8613c..acde17e6 100644
--- a/engine/editor/scene/2d/tiles/tile_set_editor.cpp
+++ b/engine/editor/scene/2d/tiles/tile_set_editor.cpp
@@ -30,19 +30,18 @@
 
 #include "tile_set_editor.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "tile_data_editors.h"
+#include "tiles_editor_plugin.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector/editor_inspector.h"
-#include "editor/scene/2d/tiles/tile_data_editors.h"
-#include "editor/scene/2d/tiles/tiles_editor_plugin.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
@@ -366,13 +365,6 @@ void TileSetEditor::_set_source_sort(int p_sort) {
 
 void TileSetEditor::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			_update_sources_list();
-			if (tile_set.is_valid()) {
-				_update_patterns_list();
-			}
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			sources_delete_button->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 			sources_add_button->set_button_icon(get_editor_theme_icon(SNAME("Add")));
@@ -545,14 +537,6 @@ void TileSetEditor::_move_tile_set_array_element(Object *p_undo_redo, Object *p_
 		}
 	}
 
-	// Terrain sets have a variable number of properties.
-	// Clearing terrain properties is needed to ensure UNDO works correctly.
-	if (p_array_prefix == "terrain_set_" && p_from_index >= 0 && p_to_pos >= 0) {
-		for (int i = begin; i < end; i++) {
-			undo_redo_man->add_undo_method(ed_tile_set, "clear_terrains", i);
-		}
-	}
-
 	// Save layers' properties.
 	List<PropertyInfo> properties;
 	ed_tile_set->get_property_list(&properties);
@@ -843,8 +827,8 @@ TileSetEditor::TileSetEditor() {
 	tabs_bar->set_theme_type_variation("TabBarInner");
 	tabs_bar->set_tab_alignment(TabBar::ALIGNMENT_CENTER);
 	tabs_bar->set_clip_tabs(false);
-	tabs_bar->add_tab(TTRC("Tile Sources"));
-	tabs_bar->add_tab(TTRC("Patterns"));
+	tabs_bar->add_tab(TTR("Tile Sources"));
+	tabs_bar->add_tab(TTR("Patterns"));
 	tabs_bar->connect("tab_changed", callable_mp(this, &TileSetEditor::_tab_changed));
 
 	tile_set_toolbar = memnew(HBoxContainer);
@@ -859,7 +843,7 @@ TileSetEditor::TileSetEditor() {
 	//// Tiles ////
 	// Split container.
 	split_container = memnew(HSplitContainer);
-	split_container->set_name(TTRC("Tiles"));
+	split_container->set_name(TTR("Tiles"));
 	split_container->set_h_size_flags(SIZE_EXPAND_FILL);
 	split_container->set_v_size_flags(SIZE_EXPAND_FILL);
 	main_vb->add_child(split_container);
@@ -875,14 +859,14 @@ TileSetEditor::TileSetEditor() {
 	source_sort_button = memnew(MenuButton);
 	source_sort_button->set_flat(false);
 	source_sort_button->set_theme_type_variation(SceneStringName(FlatButton));
-	source_sort_button->set_tooltip_text(TTRC("Sort Sources"));
+	source_sort_button->set_tooltip_text(TTR("Sort Sources"));
 
 	PopupMenu *p = source_sort_button->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_set_source_sort));
-	p->add_radio_check_item(TTRC("Sort by ID (Ascending)"), TilesEditorUtils::SOURCE_SORT_ID);
-	p->add_radio_check_item(TTRC("Sort by ID (Descending)"), TilesEditorUtils::SOURCE_SORT_ID_REVERSE);
-	p->add_radio_check_item(TTRC("Sort by Name (Ascending)"), TilesEditorUtils::SOURCE_SORT_NAME);
-	p->add_radio_check_item(TTRC("Sort by Name (Descending)"), TilesEditorUtils::SOURCE_SORT_NAME_REVERSE);
+	p->add_radio_check_item(TTR("Sort by ID (Ascending)"), TilesEditorUtils::SOURCE_SORT_ID);
+	p->add_radio_check_item(TTR("Sort by ID (Descending)"), TilesEditorUtils::SOURCE_SORT_ID_REVERSE);
+	p->add_radio_check_item(TTR("Sort by Name (Ascending)"), TilesEditorUtils::SOURCE_SORT_NAME);
+	p->add_radio_check_item(TTR("Sort by Name (Descending)"), TilesEditorUtils::SOURCE_SORT_NAME_REVERSE);
 	p->set_item_checked(TilesEditorUtils::SOURCE_SORT_ID, true);
 
 	sources_list = memnew(TileSetSourceItemList);
@@ -906,18 +890,18 @@ TileSetEditor::TileSetEditor() {
 	sources_add_button = memnew(MenuButton);
 	sources_add_button->set_flat(false);
 	sources_add_button->set_theme_type_variation(SceneStringName(FlatButton));
-	sources_add_button->get_popup()->add_item(TTRC("Atlas"));
-	sources_add_button->get_popup()->set_item_tooltip(-1, TTRC("A palette of tiles made from a texture."));
-	sources_add_button->get_popup()->add_item(TTRC("Scenes Collection"));
-	sources_add_button->get_popup()->set_item_tooltip(-1, TTRC("A collection of scenes that can be instantiated and placed as tiles."));
+	sources_add_button->get_popup()->add_item(TTR("Atlas"));
+	sources_add_button->get_popup()->set_item_tooltip(-1, TTR("A palette of tiles made from a texture."));
+	sources_add_button->get_popup()->add_item(TTR("Scenes Collection"));
+	sources_add_button->get_popup()->set_item_tooltip(-1, TTR("A collection of scenes that can be instantiated and placed as tiles."));
 	sources_add_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_source_add_id_pressed));
 	sources_bottom_actions->add_child(sources_add_button);
 
 	sources_advanced_menu_button = memnew(MenuButton);
 	sources_advanced_menu_button->set_flat(false);
 	sources_advanced_menu_button->set_theme_type_variation(SceneStringName(FlatButton));
-	sources_advanced_menu_button->get_popup()->add_item(TTRC("Open Atlas Merging Tool"));
-	sources_advanced_menu_button->get_popup()->add_item(TTRC("Manage Tile Proxies"));
+	sources_advanced_menu_button->get_popup()->add_item(TTR("Open Atlas Merging Tool"));
+	sources_advanced_menu_button->get_popup()->add_item(TTR("Manage Tile Proxies"));
 	sources_advanced_menu_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_sources_advanced_menu_id_pressed));
 	sources_advanced_menu_button->set_accessibility_name(TTRC("Advanced"));
 	sources_bottom_actions->add_child(sources_advanced_menu_button);
@@ -938,7 +922,7 @@ TileSetEditor::TileSetEditor() {
 	// No source selected.
 	no_source_selected_label = memnew(Label);
 	no_source_selected_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	no_source_selected_label->set_text(TTRC("No TileSet source selected. Select or create a TileSet source.\nYou can create a new source by using the Add button on the left or by dropping a tileset texture onto the source list."));
+	no_source_selected_label->set_text(TTR("No TileSet source selected. Select or create a TileSet source.\nYou can create a new source by using the Add button on the left or by dropping a tileset texture onto the source list."));
 	no_source_selected_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	no_source_selected_label->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	no_source_selected_label->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -985,7 +969,7 @@ TileSetEditor::TileSetEditor() {
 
 	patterns_help_label = memnew(Label);
 	patterns_help_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	patterns_help_label->set_text(TTRC("Add new patterns in the TileMap editing mode."));
+	patterns_help_label->set_text(TTR("Add new patterns in the TileMap editing mode."));
 	patterns_help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	patterns_help_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_HCENTER_WIDE);
@@ -1010,7 +994,7 @@ void TileSourceInspectorPlugin::_show_id_edit_dialog(Object *p_for_source) {
 		VBoxContainer *vbox = memnew(VBoxContainer);
 		id_edit_dialog->add_child(vbox);
 
-		Label *label = memnew(Label(TTRC("Warning: Modifying a source ID will result in all TileMaps using that source to reference an invalid source instead. This may result in unexpected data loss. Change this ID carefully.")));
+		Label *label = memnew(Label(TTR("Warning: Modifying a source ID will result in all TileMaps using that source to reference an invalid source instead. This may result in unexpected data loss. Change this ID carefully.")));
 		label->set_autowrap_mode(TextServer::AUTOWRAP_WORD);
 		// Workaround too tall popup window due to text autowrapping. See GH-83546.
 		label->set_custom_minimum_size(Vector2i(400, 0));
@@ -1053,7 +1037,7 @@ bool TileSourceInspectorPlugin::parse_property(Object *p_object, const Variant::
 		id_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		hbox->add_child(id_label);
 
-		Button *button = memnew(Button(TTRC("Edit")));
+		Button *button = memnew(Button(TTR("Edit")));
 		button->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		hbox->add_child(button);
 		button->connect(SceneStringName(pressed), callable_mp(this, &TileSourceInspectorPlugin::_show_id_edit_dialog).bind(p_object));
diff --git a/engine/editor/scene/2d/tiles/tile_set_editor.h b/engine/editor/scene/2d/tiles/tile_set_editor.h
index e819b80a..4ea9bcda 100644
--- a/engine/editor/scene/2d/tiles/tile_set_editor.h
+++ b/engine/editor/scene/2d/tiles/tile_set_editor.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
+#include "atlas_merging_dialog.h"
 #include "editor/docks/editor_dock.h"
-#include "editor/scene/2d/tiles/atlas_merging_dialog.h"
-#include "editor/scene/2d/tiles/tile_proxies_manager_dialog.h"
-#include "editor/scene/2d/tiles/tile_set_atlas_source_editor.h"
-#include "editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/resources/2d/tile_set.h"
+#include "tile_proxies_manager_dialog.h"
+#include "tile_set_atlas_source_editor.h"
+#include "tile_set_scenes_collection_source_editor.h"
 
 class AcceptDialog;
 class SpinBox;
diff --git a/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp b/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
index bc2f07e5..2ebf5862 100644
--- a/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
+++ b/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
@@ -30,9 +30,6 @@
 
 #include "tile_set_scenes_collection_source_editor.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_file_system.h"
@@ -41,6 +38,7 @@
 #include "editor/scene/2d/tiles/tile_set_editor.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+
 #include "scene/gui/button.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
@@ -192,7 +190,7 @@ void TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_get_property_li
 	}
 
 	p_list->push_back(PropertyInfo(Variant::INT, "id", PROPERTY_HINT_NONE, ""));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "scene", PROPERTY_HINT_RESOURCE_TYPE, PackedScene::get_class_static()));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, "scene", PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"));
 	p_list->push_back(PropertyInfo(Variant::BOOL, "display_placeholder", PROPERTY_HINT_NONE, ""));
 }
 
@@ -214,9 +212,9 @@ void TileSetScenesCollectionSourceEditor::SceneTileProxyObject::_bind_methods()
 	ADD_SIGNAL(MethodInfo("changed", PropertyInfo(Variant::STRING, "what")));
 }
 
-void TileSetScenesCollectionSourceEditor::_scenes_collection_source_proxy_object_changed(const String &p_what, const Ref<TileSetScenesCollectionProxyObject> &p_object) {
+void TileSetScenesCollectionSourceEditor::_scenes_collection_source_proxy_object_changed(const String &p_what) {
 	if (p_what == "id") {
-		emit_signal(SNAME("source_id_changed"), p_object->get_id());
+		emit_signal(SNAME("source_id_changed"), scenes_collection_source_proxy_object->get_id());
 	}
 }
 
@@ -280,10 +278,7 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
 
 void TileSetScenesCollectionSourceEditor::_update_source_inspector() {
 	// Update the proxy object.
-	scenes_collection_source_proxy_object.instantiate();
-	scenes_collection_source_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_scenes_collection_source_proxy_object_changed).bind(scenes_collection_source_proxy_object));
 	scenes_collection_source_proxy_object->edit(tile_set, *tile_set_scenes_collection_source, tile_set_source_id);
-	scenes_collection_source_inspector->edit(scenes_collection_source_proxy_object.ptr());
 }
 
 void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
@@ -292,12 +287,8 @@ void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
 
 	// Update the proxy object.
 	if (has_atlas_tile_selected) {
-		tile_proxy_object.instantiate(this);
-		tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_update_scenes_list).unbind(1));
-		tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_update_action_buttons).unbind(1));
 		int scene_id = scene_tiles_list->get_item_metadata(selected_indices[0]);
 		tile_proxy_object->edit(*tile_set_scenes_collection_source, scene_id);
-		tile_inspector->edit(tile_proxy_object.ptr());
 	}
 
 	// Update visibility.
@@ -366,16 +357,14 @@ void TileSetScenesCollectionSourceEditor::_update_scenes_list() {
 void TileSetScenesCollectionSourceEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-			scenes_collection_source_inspector->add_custom_property_description("TileSetScenesCollectionProxyObject", "id", TTRC("The tile's unique identifier within this TileSet. Each tile stores its source ID, so changing one may make tiles invalid."));
-			scenes_collection_source_inspector->add_custom_property_description("TileSetScenesCollectionProxyObject", "name", TTRC("The human-readable name for the scene collection. Use a descriptive name here for organizational purposes (such as \"obstacles\", \"decoration\", etc.)."));
+			scenes_collection_source_inspector->edit(scenes_collection_source_proxy_object);
+			scenes_collection_source_inspector->add_custom_property_description("TileSetScenesCollectionProxyObject", "id", TTR("The tile's unique identifier within this TileSet. Each tile stores its source ID, so changing one may make tiles invalid."));
+			scenes_collection_source_inspector->add_custom_property_description("TileSetScenesCollectionProxyObject", "name", TTR("The human-readable name for the scene collection. Use a descriptive name here for organizational purposes (such as \"obstacles\", \"decoration\", etc.)."));
 
-			tile_inspector->add_custom_property_description("SceneTileProxyObject", "id", TTRC("ID of the scene tile in the collection. Each painted tile has associated ID, so changing this property may cause your TileMaps to not display properly."));
-			tile_inspector->add_custom_property_description("SceneTileProxyObject", "scene", TTRC("Absolute path to the scene associated with this tile."));
-			tile_inspector->add_custom_property_description("SceneTileProxyObject", "display_placeholder", TTRC("If [code]true[/code], a placeholder marker will be displayed on top of the scene's preview. The marker is displayed anyway if the scene has no valid preview."));
-		} break;
-
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			_update_scenes_list();
+			tile_inspector->edit(tile_proxy_object);
+			tile_inspector->add_custom_property_description("SceneTileProxyObject", "id", TTR("ID of the scene tile in the collection. Each painted tile has associated ID, so changing this property may cause your TileMaps to not display properly."));
+			tile_inspector->add_custom_property_description("SceneTileProxyObject", "scene", TTR("Absolute path to the scene associated with this tile."));
+			tile_inspector->add_custom_property_description("SceneTileProxyObject", "display_placeholder", TTR("If [code]true[/code], a placeholder marker will be displayed on top of the scene's preview. The marker is displayed anyway if the scene has no valid preview."));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -536,9 +525,12 @@ TileSetScenesCollectionSourceEditor::TileSetScenesCollectionSourceEditor() {
 	// Scenes collection source inspector.
 	scenes_collection_source_inspector_label = memnew(Label);
 	scenes_collection_source_inspector_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	scenes_collection_source_inspector_label->set_text(TTRC("Scenes collection properties:"));
+	scenes_collection_source_inspector_label->set_text(TTR("Scenes collection properties:"));
 	middle_vbox_container->add_child(scenes_collection_source_inspector_label);
 
+	scenes_collection_source_proxy_object = memnew(TileSetScenesCollectionProxyObject());
+	scenes_collection_source_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_scenes_collection_source_proxy_object_changed));
+
 	scenes_collection_source_inspector = memnew(EditorInspector);
 	scenes_collection_source_inspector->set_vertical_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
 	scenes_collection_source_inspector->set_use_doc_hints(true);
@@ -546,10 +538,14 @@ TileSetScenesCollectionSourceEditor::TileSetScenesCollectionSourceEditor() {
 
 	// Tile inspector.
 	tile_inspector_label = memnew(Label);
-	tile_inspector_label->set_text(TTRC("Tile properties:"));
+	tile_inspector_label->set_text(TTR("Tile properties:"));
 	tile_inspector_label->hide();
 	middle_vbox_container->add_child(tile_inspector_label);
 
+	tile_proxy_object = memnew(SceneTileProxyObject(this));
+	tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_update_scenes_list).unbind(1));
+	tile_proxy_object->connect(CoreStringName(changed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_update_action_buttons).unbind(1));
+
 	tile_inspector = memnew(EditorInspector);
 	tile_inspector->set_vertical_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
 	tile_inspector->set_use_doc_hints(true);
@@ -590,3 +586,8 @@ TileSetScenesCollectionSourceEditor::TileSetScenesCollectionSourceEditor() {
 
 	EditorInspector::add_inspector_plugin(memnew(TileSourceInspectorPlugin));
 }
+
+TileSetScenesCollectionSourceEditor::~TileSetScenesCollectionSourceEditor() {
+	memdelete(scenes_collection_source_proxy_object);
+	memdelete(tile_proxy_object);
+}
diff --git a/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h b/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h
index 65293d05..cc4b68b3 100644
--- a/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h
+++ b/engine/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h
@@ -44,8 +44,8 @@ class TileSetScenesCollectionSourceEditor : public HBoxContainer {
 
 private:
 	// -- Proxy object for an atlas source, needed by the inspector --
-	class TileSetScenesCollectionProxyObject : public RefCounted {
-		GDCLASS(TileSetScenesCollectionProxyObject, RefCounted);
+	class TileSetScenesCollectionProxyObject : public Object {
+		GDCLASS(TileSetScenesCollectionProxyObject, Object);
 
 	private:
 		Ref<TileSet> tile_set;
@@ -66,8 +66,8 @@ private:
 	};
 
 	// -- Proxy object for a tile, needed by the inspector --
-	class SceneTileProxyObject : public RefCounted {
-		GDCLASS(SceneTileProxyObject, RefCounted);
+	class SceneTileProxyObject : public Object {
+		GDCLASS(SceneTileProxyObject, Object);
 
 	private:
 		TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr;
@@ -102,12 +102,12 @@ private:
 	bool tile_set_scenes_collection_source_changed_needs_update = false;
 
 	// Source inspector.
-	Ref<TileSetScenesCollectionProxyObject> scenes_collection_source_proxy_object;
+	TileSetScenesCollectionProxyObject *scenes_collection_source_proxy_object = nullptr;
 	Label *scenes_collection_source_inspector_label = nullptr;
 	EditorInspector *scenes_collection_source_inspector = nullptr;
 
 	// Tile inspector.
-	Ref<SceneTileProxyObject> tile_proxy_object;
+	SceneTileProxyObject *tile_proxy_object = nullptr;
 	Label *tile_inspector_label = nullptr;
 	EditorInspector *tile_inspector = nullptr;
 
@@ -117,7 +117,7 @@ private:
 	EditorFileDialog *scene_select_dialog = nullptr;
 
 	void _tile_set_scenes_collection_source_changed();
-	void _scenes_collection_source_proxy_object_changed(const String &p_what, const Ref<TileSetScenesCollectionProxyObject> &p_object);
+	void _scenes_collection_source_proxy_object_changed(const String &p_what);
 	void _scene_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_idx);
 	void _scenes_list_item_activated(int p_index);
 
@@ -142,4 +142,5 @@ protected:
 public:
 	void edit(Ref<TileSet> p_tile_set, TileSetScenesCollectionSource *p_tile_set_scenes_collection_source, int p_source_id);
 	TileSetScenesCollectionSourceEditor();
+	~TileSetScenesCollectionSourceEditor();
 };
diff --git a/engine/editor/scene/2d/tiles/tiles_editor_plugin.cpp b/engine/editor/scene/2d/tiles/tiles_editor_plugin.cpp
index 891d1539..14c47477 100644
--- a/engine/editor/scene/2d/tiles/tiles_editor_plugin.cpp
+++ b/engine/editor/scene/2d/tiles/tiles_editor_plugin.cpp
@@ -30,25 +30,25 @@
 
 #include "tiles_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
+#include "tile_set_editor.h"
+
 #include "core/os/mutex.h"
-#include "core/os/os.h"
+
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/multi_node_edit.h"
-#include "editor/scene/2d/tiles/tile_set_editor.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
+#include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/tile_map.h"
 #include "scene/2d/tile_map_layer.h"
+#include "scene/gui/button.h"
 #include "scene/gui/control.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/tile_set.h"
 #include "scene/resources/image_texture.h"
-#include "servers/rendering/rendering_server.h"
 
 TilesEditorUtils *TilesEditorUtils::singleton = nullptr;
 TileMapEditorPlugin *tile_map_plugin_singleton = nullptr;
@@ -290,7 +290,7 @@ void TilesEditorUtils::draw_selection_rect(CanvasItem *p_ci, const Rect2 &p_rect
 	p_ci->draw_set_transform(p_rect.position, 0, Vector2(1, 1) / scale);
 	RS::get_singleton()->canvas_item_add_nine_patch(
 			p_ci->get_canvas_item(), Rect2(Vector2(), p_rect.size * scale), Rect2(), selection_texture->get_rid(),
-			Vector2(2, 2), Vector2(2, 2), RSE::NINE_PATCH_STRETCH, RSE::NINE_PATCH_STRETCH, false, p_color);
+			Vector2(2, 2), Vector2(2, 2), RS::NINE_PATCH_STRETCH, RS::NINE_PATCH_STRETCH, false, p_color);
 	p_ci->draw_set_transform_matrix(Transform2D());
 }
 
diff --git a/engine/editor/scene/2d/tiles/tiles_editor_plugin.h b/engine/editor/scene/2d/tiles/tiles_editor_plugin.h
index 61aa41c5..ebd438b0 100644
--- a/engine/editor/scene/2d/tiles/tiles_editor_plugin.h
+++ b/engine/editor/scene/2d/tiles/tiles_editor_plugin.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "core/os/semaphore.h"
 #include "editor/plugins/editor_plugin.h"
-#include "editor/scene/2d/tiles/tile_map_layer_editor.h"
-#include "editor/scene/2d/tiles/tile_set_editor.h"
+
+#include "tile_map_layer_editor.h"
+#include "tile_set_editor.h"
 
 class TilesEditorUtils : public Object {
 	GDCLASS(TilesEditorUtils, Object);
diff --git a/engine/editor/scene/3d/bone_map_editor_plugin.cpp b/engine/editor/scene/3d/bone_map_editor_plugin.cpp
index f955d4ae..2fe61bac 100644
--- a/engine/editor/scene/3d/bone_map_editor_plugin.cpp
+++ b/engine/editor/scene/3d/bone_map_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "bone_map_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/import/3d/post_import_plugin_skeleton_renamer.h"
 #include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h"
 #include "editor/import/3d/post_import_plugin_skeleton_track_organizer.h"
@@ -42,7 +40,6 @@
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/resources/texture.h"
 
 #include "modules/regex/regex.h"
 
diff --git a/engine/editor/scene/3d/bone_map_editor_plugin.h b/engine/editor/scene/3d/bone_map_editor_plugin.h
index 4a217be9..777d2f66 100644
--- a/engine/editor/scene/3d/bone_map_editor_plugin.h
+++ b/engine/editor/scene/3d/bone_map_editor_plugin.h
@@ -33,12 +33,13 @@
 #include "editor/editor_node.h"
 #include "editor/inspector/editor_properties.h"
 #include "editor/plugins/editor_plugin.h"
+
 #include "scene/3d/skeleton_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/texture_button.h"
 #include "scene/resources/bone_map.h"
+#include "scene/resources/texture.h"
 
 class AspectRatioContainer;
 
diff --git a/engine/editor/scene/3d/camera_3d_editor_plugin.cpp b/engine/editor/scene/3d/camera_3d_editor_plugin.cpp
index 43144ea7..4dc3cdfe 100644
--- a/engine/editor/scene/3d/camera_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/camera_3d_editor_plugin.cpp
@@ -31,14 +31,10 @@
 #include "camera_3d_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
-#include "editor/scene/3d/node_3d_editor_plugin.h"
-#include "scene/gui/aspect_ratio_container.h"
-#include "scene/gui/foldable_container.h"
-#include "scene/gui/subviewport_container.h"
+#include "node_3d_editor_plugin.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/main/viewport.h"
-#include "servers/rendering/rendering_server.h"
 
 void Camera3DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
@@ -83,53 +79,24 @@ Camera3DEditor::Camera3DEditor() {
 	preview->connect(SceneStringName(pressed), callable_mp(this, &Camera3DEditor::_pressed));
 }
 
-bool Camera3DPreview::camera_preview_folded = false;
-
 void Camera3DPreview::_update_sub_viewport_size() {
-	const Size2i camera_size = Node3DEditor::get_camera_viewport_size(camera);
-	centering_container->set_ratio(camera_size.aspect());
+	sub_viewport->set_size(Node3DEditor::get_camera_viewport_size(camera));
 }
 
-void Camera3DPreview::_toggle_folding(bool p_folded) {
-	camera_preview_folded = p_folded;
-}
-
-Camera3DPreview::Camera3DPreview(Camera3D *p_camera) {
-	camera = p_camera;
-
-	FoldableContainer *folder = memnew(FoldableContainer);
-	folder->set_title(TTRC("Camera Preview"));
-	folder->set_title_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
-	folder->set_folded(camera_preview_folded);
-	folder->connect("folding_changed", callable_mp(this, &Camera3DPreview::_toggle_folding));
-	add_child(folder);
-
-	centering_container = memnew(AspectRatioContainer);
-	centering_container->set_custom_minimum_size(Size2(0.0, 256.0) * EDSCALE);
-	folder->add_child(centering_container);
-
-	SubViewportContainer *sub_viewport_container = memnew(SubViewportContainer);
-	sub_viewport_container->set_stretch(true);
-	sub_viewport_container->set_texture_filter(TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
-	centering_container->add_child(sub_viewport_container);
-
-	sub_viewport = memnew(SubViewport);
-	sub_viewport_container->add_child(sub_viewport);
-
+Camera3DPreview::Camera3DPreview(Camera3D *p_camera) :
+		TexturePreview(nullptr, false), camera(p_camera), sub_viewport(memnew(SubViewport)) {
 	RenderingServer::get_singleton()->viewport_attach_camera(sub_viewport->get_viewport_rid(), camera->get_camera());
+	add_child(sub_viewport);
 
-	EditorNode::get_singleton()->register_hdr_viewport(sub_viewport);
+	TextureRect *display = get_texture_display();
+	display->set_texture(sub_viewport->get_texture());
+	sub_viewport->connect("size_changed", callable_mp((CanvasItem *)display, &CanvasItem::queue_redraw));
+	sub_viewport->get_texture()->connect_changed(callable_mp((TexturePreview *)this, &Camera3DPreview::_update_texture_display_ratio));
 
-	ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Camera3DPreview::_project_settings_changed));
+	ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Camera3DPreview::_update_sub_viewport_size));
 	_update_sub_viewport_size();
 }
 
-void Camera3DPreview::_project_settings_changed() {
-	if (ProjectSettings::get_singleton()->check_changed_settings_in_group("display/window/size")) {
-		_update_sub_viewport_size();
-	}
-}
-
 bool EditorInspectorPluginCamera3DPreview::can_handle(Object *p_object) {
 	return Object::cast_to<Camera3D>(p_object) != nullptr;
 }
diff --git a/engine/editor/scene/3d/camera_3d_editor_plugin.h b/engine/editor/scene/3d/camera_3d_editor_plugin.h
index 806e7ae6..a0eab384 100644
--- a/engine/editor/scene/3d/camera_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/camera_3d_editor_plugin.h
@@ -33,6 +33,7 @@
 #include "editor/plugins/editor_plugin.h"
 #include "editor/scene/texture/texture_editor_plugin.h"
 
+class Camera3D;
 class SubViewport;
 
 class Camera3DEditor : public Control {
@@ -51,18 +52,13 @@ public:
 	Camera3DEditor();
 };
 
-class Camera3DPreview : public MarginContainer {
-	GDCLASS(Camera3DPreview, MarginContainer);
+class Camera3DPreview : public TexturePreview {
+	GDCLASS(Camera3DPreview, TexturePreview);
 
 	Camera3D *camera = nullptr;
-	AspectRatioContainer *centering_container = nullptr;
 	SubViewport *sub_viewport = nullptr;
 
-	static bool camera_preview_folded;
-
 	void _update_sub_viewport_size();
-	void _project_settings_changed();
-	void _toggle_folding(bool p_folded);
 
 public:
 	Camera3DPreview(Camera3D *p_camera);
@@ -81,6 +77,7 @@ class Camera3DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "Camera3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
index 10cedf75..9361d3b4 100644
--- a/engine/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_stream_player_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -164,14 +163,14 @@ void AudioStreamPlayer3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 				radius = MIN(radius, player->get_max_distance());
 			}
 
-#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y, m_y) \
-	points_ptrw[index++] = Vector3(m_from_x, -m_from_y - m_y, 0); \
-	points_ptrw[index++] = Vector3(m_to_x, -m_to_y - m_y, 0); \
-	points_ptrw[index++] = Vector3(m_from_x, m_from_y + m_y, 0); \
-	points_ptrw[index++] = Vector3(m_to_x, m_to_y + m_y, 0); \
+#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y, m_y)   \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y - m_y, 0);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y - m_y, 0);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y + m_y, 0);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y + m_y, 0);       \
 	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y - m_y, 0); \
-	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y - m_y, 0); \
-	points_ptrw[index++] = Vector3(-m_from_x, m_from_y + m_y, 0); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y - m_y, 0);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y + m_y, 0);  \
 	points_ptrw[index++] = Vector3(-m_to_x, m_to_y + m_y, 0);
 
 			// Number of points in an octant. So there will be 8 * points_in_octant points in total.
@@ -252,14 +251,14 @@ void AudioStreamPlayer3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 			uint32_t index = 0;
 			float previous_x = radius;
 			float previous_y = 0.f;
-#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y) \
-	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, m_y); \
-	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, m_y); \
-	points_ptrw[index++] = Vector3(m_from_x, m_from_y, m_y); \
-	points_ptrw[index++] = Vector3(m_to_x, m_to_y, m_y); \
+#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, m_y);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, m_y);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y, m_y);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y, m_y);       \
 	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y, m_y); \
-	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, m_y); \
-	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, m_y); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, m_y);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, m_y);  \
 	points_ptrw[index++] = Vector3(-m_to_x, m_to_y, m_y);
 
 			for (uint32_t i = 0; i < points_in_octant; i++) {
diff --git a/engine/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp
index 66f7ed33..61bbf5f6 100644
--- a/engine/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/camera_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "camera_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -153,25 +152,25 @@ void Camera3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	const Size2 size_factor = viewport_aspect > 1.0 ? Size2(1.0, 1.0 / viewport_aspect) : Size2(viewport_aspect, 1.0);
 
 #define ADD_TRIANGLE(m_a, m_b, m_c) \
-	{ \
-		lines.push_back(m_a); \
-		lines.push_back(m_b); \
-		lines.push_back(m_b); \
-		lines.push_back(m_c); \
-		lines.push_back(m_c); \
-		lines.push_back(m_a); \
+	{                               \
+		lines.push_back(m_a);       \
+		lines.push_back(m_b);       \
+		lines.push_back(m_b);       \
+		lines.push_back(m_c);       \
+		lines.push_back(m_c);       \
+		lines.push_back(m_a);       \
 	}
 
 #define ADD_QUAD(m_a, m_b, m_c, m_d) \
-	{ \
-		lines.push_back(m_a); \
-		lines.push_back(m_b); \
-		lines.push_back(m_b); \
-		lines.push_back(m_c); \
-		lines.push_back(m_c); \
-		lines.push_back(m_d); \
-		lines.push_back(m_d); \
-		lines.push_back(m_a); \
+	{                                \
+		lines.push_back(m_a);        \
+		lines.push_back(m_b);        \
+		lines.push_back(m_b);        \
+		lines.push_back(m_c);        \
+		lines.push_back(m_c);        \
+		lines.push_back(m_d);        \
+		lines.push_back(m_d);        \
+		lines.push_back(m_a);        \
 	}
 
 	switch (camera->get_projection()) {
diff --git a/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp
index d464b978..bbdc674f 100644
--- a/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.cpp
@@ -31,8 +31,6 @@
 #include "chain_ik_3d_gizmo_plugin.h"
 
 #include "editor/settings/editor_settings.h"
-#include "scene/3d/iterate_ik_3d.h"
-#include "scene/resources/surface_tool.h"
 
 ChainIK3DGizmoPlugin::SelectionMaterials ChainIK3DGizmoPlugin::selection_materials;
 
diff --git a/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h b/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h
index cd99bb4a..d29d109c 100644
--- a/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h
+++ b/engine/editor/scene/3d/gizmos/chain_ik_3d_gizmo_plugin.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
-#include "editor/scene/3d/node_3d_editor_gizmos.h"
+#include "editor/plugins/editor_plugin.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "scene/3d/iterate_ik_3d.h"
 
-class ChainIK3D;
-class SurfaceTool;
+#include "scene/resources/surface_tool.h"
 
 class ChainIK3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(ChainIK3DGizmoPlugin, EditorNode3DGizmoPlugin);
diff --git a/engine/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp
index 0c7e1ebb..286909a3 100644
--- a/engine/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/fog_volume_gizmo_plugin.cpp
@@ -94,7 +94,7 @@ void FogVolumeGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	p_gizmo->clear();
 
-	if (fog_volume->get_shape() != RSE::FOG_VOLUME_SHAPE_WORLD) {
+	if (fog_volume->get_shape() != RS::FOG_VOLUME_SHAPE_WORLD) {
 		const Ref<Material> material =
 				get_material("shape_material", p_gizmo);
 		const Ref<Material> material_internal =
diff --git a/engine/editor/scene/3d/gizmos/gizmo_3d_helper.cpp b/engine/editor/scene/3d/gizmos/gizmo_3d_helper.cpp
index 1c49f5ca..57f27e45 100644
--- a/engine/editor/scene/3d/gizmos/gizmo_3d_helper.cpp
+++ b/engine/editor/scene/3d/gizmos/gizmo_3d_helper.cpp
@@ -30,8 +30,6 @@
 
 #include "gizmo_3d_helper.h"
 
-#include "core/input/input.h"
-#include "core/math/geometry_3d.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
@@ -144,36 +142,26 @@ void Gizmo3DHelper::box_commit_handle(const String &p_action_name, bool p_cancel
 
 Vector<Vector3> Gizmo3DHelper::cylinder_get_handles(real_t p_height, real_t p_radius) {
 	Vector<Vector3> handles;
+	handles.push_back(Vector3(p_radius, 0, 0));
 	handles.push_back(Vector3(0, p_height * 0.5, 0));
 	handles.push_back(Vector3(0, p_height * -0.5, 0));
-	handles.push_back(Vector3(p_radius, 0, 0));
 	return handles;
 }
 
-String Gizmo3DHelper::_cylinder_or_capsule_or_cone_frustum_get_handle_name(int p_id) const {
-	if (p_id < 2) {
-		return "Height";
-	} else {
+String Gizmo3DHelper::cylinder_get_handle_name(int p_id) const {
+	if (p_id == 0) {
 		return "Radius";
+	} else {
+		return "Height";
 	}
 }
 
-void Gizmo3DHelper::_cylinder_or_capsule_or_cone_frustum_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius_top, real_t &r_radius_bottom, Vector3 &r_position, bool p_is_capsule, bool p_is_frustum) {
-	ERR_FAIL_COND(p_is_capsule && p_is_frustum);
+void Gizmo3DHelper::_cylinder_or_capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position, bool p_is_capsule) {
+	real_t initial_radius = initial_value.operator Vector2().x;
+	real_t initial_height = initial_value.operator Vector2().y;
 
-	real_t initial_radius_top, initial_radius_bottom, initial_height;
-	if (p_is_frustum) {
-		initial_radius_top = initial_value.operator Vector3().x;
-		initial_radius_bottom = initial_value.operator Vector3().y;
-		initial_height = initial_value.operator Vector3().z;
-	} else {
-		initial_radius_top = initial_value.operator Vector2().x;
-		initial_radius_bottom = initial_radius_top;
-		initial_height = initial_value.operator Vector2().y;
-	}
-
-	int sign = p_id == 1 ? -1 : 1;
-	int axis = p_id >= 2 ? 0 : 1;
+	int sign = p_id == 2 ? -1 : 1;
+	int axis = p_id == 0 ? 0 : 1;
 
 	Vector3 axis_vector;
 	axis_vector[axis] = sign;
@@ -186,7 +174,20 @@ void Gizmo3DHelper::_cylinder_or_capsule_or_cone_frustum_set_handle(const Vector
 		d = Math::snapped(d, Node3DEditor::get_singleton()->get_translate_snap());
 	}
 
-	if (p_id < 2) {
+	if (p_id == 0) {
+		// Adjust radius.
+		if (d < 0.001) {
+			d = 0.001;
+		}
+		r_radius = d;
+		r_cylinder_position = initial_transform.get_origin();
+
+		if (p_is_capsule) {
+			r_height = MAX(initial_height, r_radius * 2.0);
+		} else {
+			r_height = initial_height;
+		}
+	} else if (p_id == 1 || p_id == 2) {
 		// Adjust height.
 		if (Input::get_singleton()->is_key_pressed(Key::ALT)) {
 			r_height = d * 2.0;
@@ -200,41 +201,17 @@ void Gizmo3DHelper::_cylinder_or_capsule_or_cone_frustum_set_handle(const Vector
 
 		// Adjust position.
 		if (Input::get_singleton()->is_key_pressed(Key::ALT)) {
-			r_position = initial_transform.get_origin();
+			r_cylinder_position = initial_transform.get_origin();
 		} else {
 			Vector3 offset;
 			offset[axis] = (r_height - initial_height) * 0.5 * sign;
-			r_position = initial_transform.xform(offset);
+			r_cylinder_position = initial_transform.xform(offset);
 		}
 
 		if (p_is_capsule) {
-			r_radius_top = MIN(initial_radius_top, r_height / 2.0);
-			r_radius_bottom = r_radius_top;
+			r_radius = MIN(initial_radius, r_height / 2.0);
 		} else {
-			r_radius_top = initial_radius_top;
-			r_radius_bottom = initial_radius_bottom;
-		}
-	} else {
-		// Adjust radius.
-		if (d < 0.001) {
-			d = 0.001;
-		}
-		if (!p_is_frustum) {
-			r_radius_top = d;
-			r_radius_bottom = d;
-		} else {
-			real_t diff = d - (initial_radius_bottom + initial_radius_top) / 2.0;
-			diff = MAX(MAX(-initial_radius_bottom + 0.001, -initial_radius_top + 0.001), diff);
-			r_radius_top = initial_radius_top + diff;
-			r_radius_bottom = initial_radius_bottom + diff;
-		}
-
-		r_position = initial_transform.get_origin();
-
-		if (p_is_capsule) {
-			r_height = MAX(initial_height, r_radius_top * 2.0);
-		} else {
-			r_height = initial_height;
+			r_radius = initial_radius;
 		}
 	}
 }
@@ -255,7 +232,7 @@ void Gizmo3DHelper::cylinder_commit_handle(int p_id, const String &p_radius_acti
 	}
 
 	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-	ur->create_action(p_id < 2 ? p_height_action_name : p_radius_action_name);
+	ur->create_action(p_id == 0 ? p_radius_action_name : p_height_action_name);
 	ur->add_do_property(p_radius_object, p_radius_property, p_radius_object->get(p_radius_property));
 	ur->add_undo_property(p_radius_object, p_radius_property, initial_value.operator Vector2().x);
 	ur->add_do_property(p_height_object, p_height_property, p_height_object->get(p_height_property));
@@ -264,43 +241,3 @@ void Gizmo3DHelper::cylinder_commit_handle(int p_id, const String &p_radius_acti
 	ur->add_undo_property(p_position_object, p_position_property, initial_transform.get_origin());
 	ur->commit_action();
 }
-
-Vector<Vector3> Gizmo3DHelper::cone_frustum_get_handles(real_t p_height, real_t p_radius_top, real_t p_radius_bottom) {
-	Vector<Vector3> handles;
-	handles.push_back(Vector3(0, p_height * 0.5, 0));
-	handles.push_back(Vector3(0, p_height * -0.5, 0));
-	handles.push_back(Vector3((p_radius_top + p_radius_bottom) / 2.0, 0, 0));
-	return handles;
-}
-
-void Gizmo3DHelper::cone_frustum_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object, Object *p_radius_top_object, Object *p_radius_bottom_object, const StringName &p_position_property, const StringName &p_height_property, const StringName &p_radius_top_property, const StringName &p_radius_bottom_property) {
-	if (!p_height_object) {
-		p_height_object = p_position_object;
-	}
-	if (!p_radius_top_object) {
-		p_radius_top_object = p_position_object;
-	}
-	if (!p_radius_bottom_object) {
-		p_radius_bottom_object = p_position_object;
-	}
-
-	if (p_cancel) {
-		p_radius_top_object->set(p_radius_top_property, initial_value.operator Vector3().x);
-		p_radius_bottom_object->set(p_radius_bottom_property, initial_value.operator Vector3().y);
-		p_height_object->set(p_height_property, initial_value.operator Vector3().z);
-		p_position_object->set(p_position_property, initial_transform.get_origin());
-		return;
-	}
-
-	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-	ur->create_action(p_id < 2 ? p_height_action_name : p_radius_action_name);
-	ur->add_do_property(p_radius_top_object, p_radius_top_property, p_radius_top_object->get(p_radius_top_property));
-	ur->add_do_property(p_radius_bottom_object, p_radius_bottom_property, p_radius_bottom_object->get(p_radius_bottom_property));
-	ur->add_undo_property(p_radius_top_object, p_radius_top_property, initial_value.operator Vector3().x);
-	ur->add_undo_property(p_radius_bottom_object, p_radius_bottom_property, initial_value.operator Vector3().y);
-	ur->add_do_property(p_height_object, p_height_property, p_height_object->get(p_height_property));
-	ur->add_undo_property(p_height_object, p_height_property, initial_value.operator Vector3().z);
-	ur->add_do_property(p_position_object, p_position_property, p_position_object->get(p_position_property));
-	ur->add_undo_property(p_position_object, p_position_property, initial_transform.get_origin());
-	ur->commit_action();
-}
diff --git a/engine/editor/scene/3d/gizmos/gizmo_3d_helper.h b/engine/editor/scene/3d/gizmos/gizmo_3d_helper.h
index 37b7e56b..f5183741 100644
--- a/engine/editor/scene/3d/gizmos/gizmo_3d_helper.h
+++ b/engine/editor/scene/3d/gizmos/gizmo_3d_helper.h
@@ -41,8 +41,7 @@ class Gizmo3DHelper : public RefCounted {
 	Transform3D initial_transform;
 
 private:
-	void _cylinder_or_capsule_or_cone_frustum_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius_top, real_t &r_radius_bottom, Vector3 &r_position, bool p_is_capsule, bool p_is_frustum);
-	String _cylinder_or_capsule_or_cone_frustum_get_handle_name(int p_id) const;
+	void _cylinder_or_capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position, bool p_is_capsule);
 
 public:
 	/**
@@ -51,7 +50,6 @@ public:
 	 * Depending on the type of gizmo that will be used, different formats for the `p_initial_value` are required:
 	 * Box: The size of the box as `Vector3`
 	 * Cylinder or Capsule: A `Vector2` of the form `Vector2(radius, height)`
-	 * Cone frustum: A `Vector3` of the form `Vector3(radius_top, radius_bottom, height)`
 	 */
 	void initialize_handle_action(const Variant &p_initial_value, const Transform3D &p_initial_transform);
 	void get_segment(Camera3D *p_camera, const Point2 &p_point, Vector3 *r_segment);
@@ -66,31 +64,20 @@ public:
 	// Cylinder
 
 	Vector<Vector3> cylinder_get_handles(real_t p_height, real_t p_radius);
-	_FORCE_INLINE_ String cylinder_get_handle_name(int p_id) { return _cylinder_or_capsule_or_cone_frustum_get_handle_name(p_id); }
+	String cylinder_get_handle_name(int p_id) const;
 	_FORCE_INLINE_ void cylinder_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position) {
-		real_t radius_bottom;
-		_cylinder_or_capsule_or_cone_frustum_set_handle(p_segment, p_id, r_height, r_radius, radius_bottom, r_cylinder_position, false, false);
+		_cylinder_or_capsule_set_handle(p_segment, p_id, r_height, r_radius, r_cylinder_position, false);
 	}
 	void cylinder_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object = nullptr, Object *p_radius_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_height_property = "height", const StringName &p_radius_property = "radius");
 
 	// Capsule
 
 	_FORCE_INLINE_ Vector<Vector3> capsule_get_handles(real_t p_height, real_t p_radius) { return cylinder_get_handles(p_height, p_radius); }
-	_FORCE_INLINE_ String capsule_get_handle_name(int p_id) { return _cylinder_or_capsule_or_cone_frustum_get_handle_name(p_id); }
+	_FORCE_INLINE_ String capsule_get_handle_name(int p_id) { return cylinder_get_handle_name(p_id); }
 	_FORCE_INLINE_ void capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_capsule_position) {
-		real_t radius_bottom;
-		_cylinder_or_capsule_or_cone_frustum_set_handle(p_segment, p_id, r_height, r_radius, radius_bottom, r_capsule_position, true, false);
+		_cylinder_or_capsule_set_handle(p_segment, p_id, r_height, r_radius, r_capsule_position, true);
 	}
 	_FORCE_INLINE_ void capsule_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object = nullptr, Object *p_radius_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_height_property = "height", const StringName &p_radius_property = "radius") {
 		cylinder_commit_handle(p_id, p_radius_action_name, p_height_action_name, p_cancel, p_position_object, p_height_object, p_radius_object, p_position_property, p_height_property, p_radius_property);
 	}
-
-	// Cone frustum
-
-	Vector<Vector3> cone_frustum_get_handles(real_t p_height, real_t p_radius_top, real_t p_radius_bottom);
-	_FORCE_INLINE_ String cone_frustum_get_handle_name(int p_id) { return _cylinder_or_capsule_or_cone_frustum_get_handle_name(p_id); }
-	_FORCE_INLINE_ void cone_frustum_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius_top, real_t &r_radius_bottom, Vector3 &r_frustum_position) {
-		_cylinder_or_capsule_or_cone_frustum_set_handle(p_segment, p_id, r_height, r_radius_top, r_radius_bottom, r_frustum_position, false, true);
-	}
-	void cone_frustum_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object = nullptr, Object *p_radius_top_object = nullptr, Object *p_radius_bottom_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_height_property = "height", const StringName &p_radius_top_property = "top_radius", const StringName &p_radius_bottom_property = "bottom_radius");
 };
diff --git a/engine/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
index d74d130c..54dd9ca4 100644
--- a/engine/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "gpu_particles_collision_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/gizmos/gizmo_3d_helper.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
@@ -168,34 +167,34 @@ void GPUParticlesCollision3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	if (Object::cast_to<GPUParticlesCollisionSphere3D>(cs) || Object::cast_to<GPUParticlesAttractorSphere3D>(cs)) {
 		float radius = cs->call("get_radius");
 
-#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y) \
-	points_ptrw[index++] = Vector3(m_from_x, m_y, m_from_y); \
-	points_ptrw[index++] = Vector3(m_to_x, m_y, m_to_y); \
-	points_ptrw[index++] = Vector3(m_from_x, m_y, -m_from_y); \
-	points_ptrw[index++] = Vector3(m_to_x, m_y, -m_to_y); \
-	points_ptrw[index++] = Vector3(-m_from_x, m_y, m_from_y); \
-	points_ptrw[index++] = Vector3(-m_to_x, m_y, m_to_y); \
+#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, m_y, m_from_y);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_y, m_to_y);       \
+	points_ptrw[index++] = Vector3(m_from_x, m_y, -m_from_y);  \
+	points_ptrw[index++] = Vector3(m_to_x, m_y, -m_to_y);      \
+	points_ptrw[index++] = Vector3(-m_from_x, m_y, m_from_y);  \
+	points_ptrw[index++] = Vector3(-m_to_x, m_y, m_to_y);      \
 	points_ptrw[index++] = Vector3(-m_from_x, m_y, -m_from_y); \
 	points_ptrw[index++] = Vector3(-m_to_x, m_y, -m_to_y);
 
-#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y) \
-	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, 0); \
-	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, 0); \
-	points_ptrw[index++] = Vector3(m_from_x, m_from_y, 0); \
-	points_ptrw[index++] = Vector3(m_to_x, m_to_y, 0); \
+#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, 0);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, 0);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y, 0);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y, 0);       \
 	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y, 0); \
-	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, 0); \
-	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, 0); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, 0);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, 0);  \
 	points_ptrw[index++] = Vector3(-m_to_x, m_to_y, 0);
 
-#define PUSH_QUARTER_YZ(m_from_x, m_from_y, m_to_x, m_to_y) \
-	points_ptrw[index++] = Vector3(0, -m_from_y, m_from_x); \
-	points_ptrw[index++] = Vector3(0, -m_to_y, m_to_x); \
-	points_ptrw[index++] = Vector3(0, m_from_y, m_from_x); \
-	points_ptrw[index++] = Vector3(0, m_to_y, m_to_x); \
+#define PUSH_QUARTER_YZ(m_from_x, m_from_y, m_to_x, m_to_y)  \
+	points_ptrw[index++] = Vector3(0, -m_from_y, m_from_x);  \
+	points_ptrw[index++] = Vector3(0, -m_to_y, m_to_x);      \
+	points_ptrw[index++] = Vector3(0, m_from_y, m_from_x);   \
+	points_ptrw[index++] = Vector3(0, m_to_y, m_to_x);       \
 	points_ptrw[index++] = Vector3(0, -m_from_y, -m_from_x); \
-	points_ptrw[index++] = Vector3(0, -m_to_y, -m_to_x); \
-	points_ptrw[index++] = Vector3(0, m_from_y, -m_from_x); \
+	points_ptrw[index++] = Vector3(0, -m_to_y, -m_to_x);     \
+	points_ptrw[index++] = Vector3(0, m_from_y, -m_from_x);  \
 	points_ptrw[index++] = Vector3(0, m_to_y, -m_to_x);
 
 		// Number of points in an octant. So there will be 8 * points_in_octant points in total.
diff --git a/engine/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp
index 3e0eaced..6154d8f7 100644
--- a/engine/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/light_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "light_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/engine/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp
index 6954201e..88dbea6a 100644
--- a/engine/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.cpp
@@ -209,10 +209,10 @@ void LightmapGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		}
 
 		Array array;
-		array.resize(RSE::ARRAY_MAX);
-		array[RSE::ARRAY_VERTEX] = Vector<Vector3>(vertices);
-		array[RSE::ARRAY_INDEX] = Vector<int>(indices);
-		array[RSE::ARRAY_COLOR] = Vector<Color>(colors);
+		array.resize(RS::ARRAY_MAX);
+		array[RS::ARRAY_VERTEX] = Vector<Vector3>(vertices);
+		array[RS::ARRAY_INDEX] = Vector<int>(indices);
+		array[RS::ARRAY_COLOR] = Vector<Color>(colors);
 
 		Ref<ArrayMesh> mesh;
 		mesh.instantiate();
diff --git a/engine/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp
index 56499f1e..47140b7f 100644
--- a/engine/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/marker_3d_gizmo_plugin.cpp
@@ -63,20 +63,22 @@ Marker3DGizmoPlugin::Marker3DGizmoPlugin() {
 	const Color color_x = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("axis_x_color"), EditorStringName(Editor));
 	cursor_colors.push_back(color_x);
 	cursor_colors.push_back(color_x);
-	cursor_colors.push_back(color_x.darkened(0.5));
-	cursor_colors.push_back(color_x.darkened(0.5));
+	// FIXME: Use less strong darkening factor once GH-48573 is fixed.
+	// The current darkening factor compensates for lines being too bright in the 3D editor.
+	cursor_colors.push_back(color_x.lerp(Color(0, 0, 0), 0.75));
+	cursor_colors.push_back(color_x.lerp(Color(0, 0, 0), 0.75));
 
 	const Color color_y = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("axis_y_color"), EditorStringName(Editor));
 	cursor_colors.push_back(color_y);
 	cursor_colors.push_back(color_y);
-	cursor_colors.push_back(color_y.darkened(0.5));
-	cursor_colors.push_back(color_y.darkened(0.5));
+	cursor_colors.push_back(color_y.lerp(Color(0, 0, 0), 0.75));
+	cursor_colors.push_back(color_y.lerp(Color(0, 0, 0), 0.75));
 
 	const Color color_z = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("axis_z_color"), EditorStringName(Editor));
 	cursor_colors.push_back(color_z);
 	cursor_colors.push_back(color_z);
-	cursor_colors.push_back(color_z.darkened(0.5));
-	cursor_colors.push_back(color_z.darkened(0.5));
+	cursor_colors.push_back(color_z.lerp(Color(0, 0, 0), 0.75));
+	cursor_colors.push_back(color_z.lerp(Color(0, 0, 0), 0.75));
 
 	Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
 	mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
@@ -86,7 +88,7 @@ Marker3DGizmoPlugin::Marker3DGizmoPlugin() {
 	mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 
 	Array d;
-	d.resize(RSE::ARRAY_MAX);
+	d.resize(RS::ARRAY_MAX);
 	d[Mesh::ARRAY_VERTEX] = cursor_points;
 	d[Mesh::ARRAY_COLOR] = cursor_colors;
 	pos3d_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINES, d);
diff --git a/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp
index 01839170..e65050d7 100644
--- a/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.cpp
@@ -51,104 +51,6 @@ bool MeshInstance3DGizmoPlugin::can_be_hidden() const {
 	return false;
 }
 
-String MeshInstance3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
-	MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
-
-	if (Object::cast_to<CapsuleMesh>(*mesh->get_mesh())) {
-		return helper->capsule_get_handle_name(p_id);
-	}
-
-	if (Object::cast_to<CylinderMesh>(*mesh->get_mesh())) {
-		return helper->cone_frustum_get_handle_name(p_id);
-	}
-
-	if (Object::cast_to<BoxMesh>(*mesh->get_mesh())) {
-		return helper->box_get_handle_name(p_id);
-	}
-
-	return "";
-}
-
-Variant MeshInstance3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
-	MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
-
-	const Ref<CapsuleMesh> capsule_mesh = mesh->get_mesh();
-	if (capsule_mesh.is_valid()) {
-		return Vector2(capsule_mesh->get_radius(), capsule_mesh->get_height());
-	}
-
-	const Ref<CylinderMesh> cylinder_mesh = mesh->get_mesh();
-	if (cylinder_mesh.is_valid()) {
-		return Vector3(cylinder_mesh->get_top_radius(), cylinder_mesh->get_bottom_radius(), cylinder_mesh->get_height());
-	}
-
-	const Ref<BoxMesh> box_mesh = mesh->get_mesh();
-	if (box_mesh.is_valid()) {
-		return box_mesh->get_size();
-	}
-
-	return Variant();
-}
-
-void MeshInstance3DGizmoPlugin::begin_handle_action(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) {
-	helper->initialize_handle_action(get_handle_value(p_gizmo, p_id, p_secondary), p_gizmo->get_node_3d()->get_global_transform());
-}
-
-void MeshInstance3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) {
-	MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
-
-	Vector3 segment[2];
-	helper->get_segment(p_camera, p_point, segment);
-
-	const Ref<CapsuleMesh> capsule_mesh = mesh->get_mesh();
-	if (capsule_mesh.is_valid()) {
-		real_t height, radius;
-		Vector3 position;
-		helper->capsule_set_handle(segment, p_id, height, radius, position);
-		capsule_mesh->set_height(height);
-		capsule_mesh->set_radius(radius);
-		mesh->set_global_position(position);
-	}
-
-	const Ref<CylinderMesh> cylinder_mesh = mesh->get_mesh();
-	if (cylinder_mesh.is_valid()) {
-		real_t height, radius_top, radius_bottom;
-		Vector3 position;
-		helper->cone_frustum_set_handle(segment, p_id, height, radius_top, radius_bottom, position);
-		cylinder_mesh->set_height(height);
-		cylinder_mesh->set_top_radius(radius_top);
-		cylinder_mesh->set_bottom_radius(radius_bottom);
-		mesh->set_global_position(position);
-	}
-
-	const Ref<BoxMesh> box_mesh = mesh->get_mesh();
-	if (box_mesh.is_valid()) {
-		Vector3 box_size, position;
-		helper->box_set_handle(segment, p_id, box_size, position);
-		box_mesh->set_size(box_size);
-		mesh->set_global_position(position);
-	}
-}
-
-void MeshInstance3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
-	MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
-
-	const Ref<CapsuleMesh> capsule_mesh = mesh->get_mesh();
-	if (capsule_mesh.is_valid()) {
-		helper->cylinder_commit_handle(p_id, TTR("Change Capsule Mesh Radius"), TTR("Change Capsule Mesh Height"), p_cancel, mesh, *capsule_mesh, *capsule_mesh);
-	}
-
-	const Ref<CylinderMesh> cylinder_mesh = mesh->get_mesh();
-	if (cylinder_mesh.is_valid()) {
-		helper->cone_frustum_commit_handle(p_id, TTR("Change Cylinder Mesh Radius"), TTR("Change Cylinder Mesh Height"), p_cancel, mesh, *cylinder_mesh, *cylinder_mesh, *cylinder_mesh);
-	}
-
-	const Ref<BoxMesh> box_mesh = mesh->get_mesh();
-	if (box_mesh.is_valid()) {
-		helper->box_commit_handle(TTR("Change Box Mesh Size"), p_cancel, mesh, *box_mesh);
-	}
-}
-
 void MeshInstance3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	MeshInstance3D *mesh = Object::cast_to<MeshInstance3D>(p_gizmo->get_node_3d());
 
@@ -156,8 +58,6 @@ void MeshInstance3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	Ref<Mesh> m = mesh->get_mesh();
 
-	const Ref<Material> handles_material = get_material("handles");
-
 	if (m.is_null()) {
 		return; //none
 	}
@@ -181,22 +81,4 @@ void MeshInstance3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	if (tm.is_valid()) {
 		p_gizmo->add_collision_triangles(tm);
 	}
-
-	const Ref<CapsuleMesh> capsule_mesh = mesh->get_mesh();
-	if (capsule_mesh.is_valid()) {
-		const Vector<Vector3> handles = helper->capsule_get_handles(capsule_mesh->get_height(), capsule_mesh->get_radius());
-		p_gizmo->add_handles(handles, handles_material);
-	}
-
-	const Ref<CylinderMesh> cylinder_mesh = mesh->get_mesh();
-	if (cylinder_mesh.is_valid()) {
-		const Vector<Vector3> handles = helper->cone_frustum_get_handles(cylinder_mesh->get_height(), cylinder_mesh->get_top_radius(), cylinder_mesh->get_bottom_radius());
-		p_gizmo->add_handles(handles, handles_material);
-	}
-
-	const Ref<BoxMesh> box_mesh = mesh->get_mesh();
-	if (box_mesh.is_valid()) {
-		const Vector<Vector3> handles = helper->box_get_handles(box_mesh->get_size());
-		p_gizmo->add_handles(handles, handles_material);
-	}
 }
diff --git a/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h b/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h
index f4763f79..7589aa95 100644
--- a/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h
+++ b/engine/editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h
@@ -30,29 +30,15 @@
 
 #pragma once
 
-#include "editor/scene/3d/gizmos/gizmo_3d_helper.h"
 #include "editor/scene/3d/node_3d_editor_gizmos.h"
 
 class MeshInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(MeshInstance3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
-	Ref<Gizmo3DHelper> helper;
-
 public:
 	bool has_gizmo(Node3D *p_spatial) override;
 	String get_gizmo_name() const override;
 	int get_priority() const override;
 	bool can_be_hidden() const override;
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
-
-	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const override;
-	Variant get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const override;
-	void begin_handle_action(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) override;
-	void set_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, Camera3D *p_camera, const Point2 &p_point) override;
-	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
-
-	MeshInstance3DGizmoPlugin() {
-		helper.instantiate();
-		create_handle_material("handles");
-	}
 };
diff --git a/engine/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp
index d157b755..0c57fac8 100644
--- a/engine/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "occluder_instance_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp
index 8012bfb4..5183115c 100644
--- a/engine/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.cpp
@@ -30,6 +30,10 @@
 
 #include "particles_3d_emission_shape_gizmo_plugin.h"
 
+#include "editor/editor_node.h"
+#include "editor/editor_string_names.h"
+#include "editor/editor_undo_redo_manager.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/cpu_particles_3d.h"
 #include "scene/3d/gpu_particles_3d.h"
diff --git a/engine/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp
index 4d1d12bd..052d75cc 100644
--- a/engine/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp
@@ -33,7 +33,6 @@
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/physics/collision_polygon_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/surface_tool.h"
 
 CollisionObject3DGizmoPlugin::CollisionObject3DGizmoPlugin() {
diff --git a/engine/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp
index 78cb7a79..5300ecd6 100644
--- a/engine/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp
@@ -224,9 +224,9 @@ void CollisionPolygon3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		Array a;
 		a.resize(Mesh::ARRAY_MAX);
-		a[RSE::ARRAY_VERTEX] = verts;
-		a[RSE::ARRAY_COLOR] = colors;
-		a[RSE::ARRAY_INDEX] = indices;
+		a[RS::ARRAY_VERTEX] = verts;
+		a[RS::ARRAY_COLOR] = colors;
+		a[RS::ARRAY_INDEX] = indices;
 		array_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 
 		p_gizmo->add_mesh(array_mesh, material_arraymesh);
diff --git a/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp
index a48206f0..898f3a40 100644
--- a/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp
@@ -32,11 +32,9 @@
 
 #include "core/math/convex_hull.h"
 #include "core/math/geometry_3d.h"
-#include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/gizmos/gizmo_3d_helper.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
-#include "editor/settings/editor_settings.h"
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
@@ -51,8 +49,6 @@
 CollisionShape3DGizmoPlugin::CollisionShape3DGizmoPlugin() {
 	helper.instantiate();
 
-	show_only_when_selected = EDITOR_GET("editors/3d_gizmos/gizmo_settings/show_collision_shapes_only_when_selected");
-
 	create_collision_material("shape_material", 2.0);
 	create_collision_material("shape_material_arraymesh", 0.0625);
 
@@ -311,12 +307,6 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		return;
 	}
 
-	if (show_only_when_selected && !p_gizmo->is_selected()) {
-		return;
-	}
-
-	bool shape_readonly = EditorNode::get_singleton()->is_resource_read_only(s);
-
 	const Ref<StandardMaterial3D> material =
 			get_material(!cs->is_disabled() ? "shape_material" : "shape_material_disabled", p_gizmo);
 	const Ref<StandardMaterial3D> material_arraymesh =
@@ -336,34 +326,34 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		Ref<SphereShape3D> sp = s;
 		float radius = sp->get_radius();
 
-#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, to_y); \
-	points_ptrw[index++] = Vector3(from_x, y, -from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, -to_y); \
-	points_ptrw[index++] = Vector3(-from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(-to_x, y, to_y); \
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
 	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
 	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
 
-#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0); \
-	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0); \
-	points_ptrw[index++] = Vector3(from_x, from_y + y, 0); \
-	points_ptrw[index++] = Vector3(to_x, to_y + y, 0); \
+#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0);  \
+	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0);      \
+	points_ptrw[index++] = Vector3(from_x, from_y + y, 0);   \
+	points_ptrw[index++] = Vector3(to_x, to_y + y, 0);       \
 	points_ptrw[index++] = Vector3(-from_x, -from_y - y, 0); \
-	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0); \
-	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0); \
+	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0);     \
+	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0);  \
 	points_ptrw[index++] = Vector3(-to_x, to_y + y, 0);
 
-#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(0, -from_y - y, from_x); \
-	points_ptrw[index++] = Vector3(0, -to_y - y, to_x); \
-	points_ptrw[index++] = Vector3(0, from_y + y, from_x); \
-	points_ptrw[index++] = Vector3(0, to_y + y, to_x); \
+#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, from_x);  \
+	points_ptrw[index++] = Vector3(0, -to_y - y, to_x);      \
+	points_ptrw[index++] = Vector3(0, from_y + y, from_x);   \
+	points_ptrw[index++] = Vector3(0, to_y + y, to_x);       \
 	points_ptrw[index++] = Vector3(0, -from_y - y, -from_x); \
-	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x); \
-	points_ptrw[index++] = Vector3(0, from_y + y, -from_x); \
+	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x);     \
+	points_ptrw[index++] = Vector3(0, from_y + y, -from_x);  \
 	points_ptrw[index++] = Vector3(0, to_y + y, -to_x);
 
 		// Number of points in an octant. So there will be 8 * points_in_octant * 2 points in total for one circle.
@@ -405,11 +395,9 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		p_gizmo->add_lines(points, material, false, collision_color);
 		p_gizmo->add_collision_segments(points);
-		if (!shape_readonly) {
-			Vector<Vector3> handles;
-			handles.push_back(Vector3(radius, 0, 0));
-			p_gizmo->add_handles(handles, handles_material);
-		}
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(radius, 0, 0));
+		p_gizmo->add_handles(handles, handles_material);
 	}
 
 	if (Object::cast_to<BoxShape3D>(*s)) {
@@ -430,9 +418,7 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 		p_gizmo->add_lines(lines, material, false, collision_color);
 		p_gizmo->add_collision_segments(lines);
-		if (!shape_readonly) {
-			p_gizmo->add_handles(handles, handles_material);
-		}
+		p_gizmo->add_handles(handles, handles_material);
 	}
 
 	if (Object::cast_to<CapsuleShape3D>(*s)) {
@@ -466,34 +452,34 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		points_ptrw[index++] = Vector3(-radius, y_value, 0.f);
 		points_ptrw[index++] = Vector3(-radius, -y_value, 0.f);
 
-#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, to_y); \
-	points_ptrw[index++] = Vector3(from_x, y, -from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, -to_y); \
-	points_ptrw[index++] = Vector3(-from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(-to_x, y, to_y); \
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
 	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
 	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
 
-#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0); \
-	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0); \
-	points_ptrw[index++] = Vector3(from_x, from_y + y, 0); \
-	points_ptrw[index++] = Vector3(to_x, to_y + y, 0); \
+#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0);  \
+	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0);      \
+	points_ptrw[index++] = Vector3(from_x, from_y + y, 0);   \
+	points_ptrw[index++] = Vector3(to_x, to_y + y, 0);       \
 	points_ptrw[index++] = Vector3(-from_x, -from_y - y, 0); \
-	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0); \
-	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0); \
+	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0);     \
+	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0);  \
 	points_ptrw[index++] = Vector3(-to_x, to_y + y, 0);
 
-#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(0, -from_y - y, from_x); \
-	points_ptrw[index++] = Vector3(0, -to_y - y, to_x); \
-	points_ptrw[index++] = Vector3(0, from_y + y, from_x); \
-	points_ptrw[index++] = Vector3(0, to_y + y, to_x); \
+#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, from_x);  \
+	points_ptrw[index++] = Vector3(0, -to_y - y, to_x);      \
+	points_ptrw[index++] = Vector3(0, from_y + y, from_x);   \
+	points_ptrw[index++] = Vector3(0, to_y + y, to_x);       \
 	points_ptrw[index++] = Vector3(0, -from_y - y, -from_x); \
-	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x); \
-	points_ptrw[index++] = Vector3(0, from_y + y, -from_x); \
+	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x);     \
+	points_ptrw[index++] = Vector3(0, from_y + y, -from_x);  \
 	points_ptrw[index++] = Vector3(0, to_y + y, -to_x);
 
 		float previous_x = radius;
@@ -531,10 +517,8 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		p_gizmo->add_lines(points, material, false, collision_color);
 		p_gizmo->add_collision_segments(points);
 
-		if (!shape_readonly) {
-			Vector<Vector3> handles = helper->capsule_get_handles(cs2->get_height(), cs2->get_radius());
-			p_gizmo->add_handles(handles, handles_material);
-		}
+		Vector<Vector3> handles = helper->capsule_get_handles(cs2->get_height(), cs2->get_radius());
+		p_gizmo->add_handles(handles, handles_material);
 	}
 
 	if (Object::cast_to<CylinderShape3D>(*s)) {
@@ -542,13 +526,13 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		float radius = cs2->get_radius();
 		float height = cs2->get_height();
 
-#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y) \
-	points_ptrw[index++] = Vector3(from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, to_y); \
-	points_ptrw[index++] = Vector3(from_x, y, -from_y); \
-	points_ptrw[index++] = Vector3(to_x, y, -to_y); \
-	points_ptrw[index++] = Vector3(-from_x, y, from_y); \
-	points_ptrw[index++] = Vector3(-to_x, y, to_y); \
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
 	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
 	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
 
@@ -600,10 +584,8 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		p_gizmo->add_lines(points, material, false, collision_color);
 		p_gizmo->add_collision_segments(points);
 
-		if (!shape_readonly) {
-			Vector<Vector3> handles = helper->cylinder_get_handles(cs2->get_height(), cs2->get_radius());
-			p_gizmo->add_handles(handles, handles_material);
-		}
+		Vector<Vector3> handles = helper->cylinder_get_handles(cs2->get_height(), cs2->get_radius());
+		p_gizmo->add_handles(handles, handles_material);
 	}
 
 	if (Object::cast_to<WorldBoundaryShape3D>(*s)) {
@@ -673,11 +655,9 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		};
 		p_gizmo->add_lines(points, material, false, collision_color);
 		p_gizmo->add_collision_segments(points);
-		if (!shape_readonly) {
-			Vector<Vector3> handles;
-			handles.push_back(Vector3(0, 0, rs->get_length()));
-			p_gizmo->add_handles(handles, handles_material);
-		}
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(0, 0, rs->get_length()));
+		p_gizmo->add_handles(handles, handles_material);
 	}
 
 	if (Object::cast_to<HeightMapShape3D>(*s)) {
@@ -687,7 +667,3 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		p_gizmo->add_lines(lines, material, false, collision_color);
 	}
 }
-
-void CollisionShape3DGizmoPlugin::set_show_only_when_selected(bool p_enabled) {
-	show_only_when_selected = p_enabled;
-}
diff --git a/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h b/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h
index 43d9ce1e..e63c6fd7 100644
--- a/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h
+++ b/engine/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h
@@ -41,14 +41,11 @@ class CollisionShape3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 
 	Ref<Gizmo3DHelper> helper;
 
-	inline static bool show_only_when_selected = false;
-
 public:
 	bool has_gizmo(Node3D *p_spatial) override;
 	String get_gizmo_name() const override;
 	int get_priority() const override;
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
-	static void set_show_only_when_selected(bool p_enabled);
 
 	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const override;
 	Variant get_handle_value(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const override;
diff --git a/engine/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
index e186ffa9..fc63e2b4 100644
--- a/engine/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "joint_3d_gizmo_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/physics/joints/cone_twist_joint_3d.h"
@@ -656,12 +655,12 @@ void Joint3DGizmoPlugin::CreateGeneric6DOFJointGizmo(
 				break;
 		}
 
-#define ADD_VTX(x, y, z) \
-	{ \
-		Vector3 v; \
-		v[a1] = (x); \
-		v[a2] = (y); \
-		v[a3] = (z); \
+#define ADD_VTX(x, y, z)                                         \
+	{                                                            \
+		Vector3 v;                                               \
+		v[a1] = (x);                                             \
+		v[a2] = (y);                                             \
+		v[a3] = (z);                                             \
 		r_points.push_back(p_offset.translated_local(v).origin); \
 	}
 
diff --git a/engine/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp
index 6e05448f..d6f53b32 100644
--- a/engine/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp
@@ -31,7 +31,6 @@
 #include "ray_cast_3d_gizmo_plugin.h"
 
 #include "scene/3d/physics/ray_cast_3d.h"
-#include "scene/main/scene_tree.h"
 
 RayCast3DGizmoPlugin::RayCast3DGizmoPlugin() {
 	const Color gizmo_color = SceneTree::get_singleton()->get_debug_collisions_color();
diff --git a/engine/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp
index 421bb11b..3c755497 100644
--- a/engine/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp
@@ -31,7 +31,6 @@
 #include "shape_cast_3d_gizmo_plugin.h"
 
 #include "scene/3d/physics/shape_cast_3d.h"
-#include "scene/main/scene_tree.h"
 
 ShapeCast3DGizmoPlugin::ShapeCast3DGizmoPlugin() {
 	const Color gizmo_color = SceneTree::get_singleton()->get_debug_collisions_color();
diff --git a/engine/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp
index 7158afc3..ceec5d9b 100644
--- a/engine/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp
@@ -32,7 +32,6 @@
 
 #include "editor/editor_undo_redo_manager.h"
 #include "scene/3d/physics/soft_body_3d.h"
-#include "scene/main/scene_tree.h"
 
 SoftBody3DGizmoPlugin::SoftBody3DGizmoPlugin() {
 	Color gizmo_color = SceneTree::get_singleton()->get_debug_collisions_color();
diff --git a/engine/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp
index 70065bbe..191d9f88 100644
--- a/engine/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp
@@ -31,7 +31,6 @@
 #include "spring_arm_3d_gizmo_plugin.h"
 
 #include "scene/3d/physics/spring_arm_3d.h"
-#include "scene/main/scene_tree.h"
 
 void SpringArm3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_node_3d());
diff --git a/engine/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp
index c810d1d3..6ca495af 100644
--- a/engine/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp
@@ -31,7 +31,6 @@
 #include "vehicle_body_3d_gizmo_plugin.h"
 
 #include "scene/3d/physics/vehicle_body_3d.h"
-#include "scene/main/scene_tree.h"
 
 VehicleWheel3DGizmoPlugin::VehicleWheel3DGizmoPlugin() {
 	Color gizmo_color = SceneTree::get_singleton()->get_debug_collisions_color();
diff --git a/engine/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp
index 06fe9bc2..5310076e 100644
--- a/engine/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "reflection_probe_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
index e1fd5446..f4d06c80 100644
--- a/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
@@ -31,12 +31,9 @@
 #include "spring_bone_3d_gizmo_plugin.h"
 
 #include "editor/settings/editor_settings.h"
-#include "scene/3d/spring_bone_collision_3d.h"
 #include "scene/3d/spring_bone_collision_capsule_3d.h"
 #include "scene/3d/spring_bone_collision_plane_3d.h"
 #include "scene/3d/spring_bone_collision_sphere_3d.h"
-#include "scene/3d/spring_bone_simulator_3d.h"
-#include "scene/resources/surface_tool.h"
 
 // SpringBoneSimulator3D
 
diff --git a/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h b/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
index 69c51909..f38b998c 100644
--- a/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
+++ b/engine/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "editor/scene/3d/node_3d_editor_gizmos.h"
-
-class SpringBoneCollision3D;
-class SpringBoneSimulator3D;
-class SurfaceTool;
+#include "editor/plugins/editor_plugin.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "scene/3d/spring_bone_collision_3d.h"
+#include "scene/3d/spring_bone_simulator_3d.h"
+#include "scene/resources/surface_tool.h"
 
 class SpringBoneSimulator3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(SpringBoneSimulator3DGizmoPlugin, EditorNode3DGizmoPlugin);
diff --git a/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp
index 0cb3aab1..9ae8e053 100644
--- a/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.cpp
@@ -31,8 +31,6 @@
 #include "two_bone_ik_3d_gizmo_plugin.h"
 
 #include "editor/settings/editor_settings.h"
-#include "scene/3d/two_bone_ik_3d.h"
-#include "scene/resources/surface_tool.h"
 
 TwoBoneIK3DGizmoPlugin::SelectionMaterials TwoBoneIK3DGizmoPlugin::selection_materials;
 
diff --git a/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h b/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h
index a6ab4355..bec19b39 100644
--- a/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h
+++ b/engine/editor/scene/3d/gizmos/two_bone_ik_3d_gizmo_plugin.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
-#include "editor/scene/3d/node_3d_editor_gizmos.h"
+#include "editor/plugins/editor_plugin.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
+#include "scene/3d/two_bone_ik_3d.h"
 
-class TwoBoneIK3D;
-class SurfaceTool;
+#include "scene/resources/surface_tool.h"
 
 class TwoBoneIK3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 	GDCLASS(TwoBoneIK3DGizmoPlugin, EditorNode3DGizmoPlugin);
diff --git a/engine/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp b/engine/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp
index 3bb2f3e3..9b1cc54b 100644
--- a/engine/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp
+++ b/engine/editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "visible_on_screen_notifier_3d_gizmo_plugin.h"
 
-#include "core/math/geometry_3d.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp b/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp
index b71c6738..f32e31b1 100644
--- a/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp
+++ b/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp
@@ -30,14 +30,10 @@
 
 #include "gpu_particles_collision_sdf_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "scene/3d/gpu_particles_collision_3d.h"
-#include "scene/main/scene_tree.h"
 
 void GPUParticlesCollisionSDF3DEditorPlugin::_bake() {
 	if (col_sdf) {
diff --git a/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h b/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h
index 244b17e9..f7959d9b 100644
--- a/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h
+++ b/engine/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h
@@ -31,10 +31,11 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/3d/gpu_particles_collision_3d.h"
+#include "scene/resources/material.h"
 
 struct EditorProgress;
 class EditorFileDialog;
-class GPUParticlesCollisionSDF3D;
 class HBoxContainer;
 
 class GPUParticlesCollisionSDF3DEditorPlugin : public EditorPlugin {
@@ -60,6 +61,7 @@ protected:
 
 public:
 	virtual String get_plugin_name() const override { return "GPUParticlesCollisionSDF3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/lightmap_gi_editor_plugin.cpp b/engine/editor/scene/3d/lightmap_gi_editor_plugin.cpp
index 5ff45153..166511e5 100644
--- a/engine/editor/scene/3d/lightmap_gi_editor_plugin.cpp
+++ b/engine/editor/scene/3d/lightmap_gi_editor_plugin.cpp
@@ -30,17 +30,9 @@
 
 #include "lightmap_gi_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "scene/3d/lightmap_gi.h"
-#include "scene/main/scene_tree.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For lightmapper_rd.
 
diff --git a/engine/editor/scene/3d/lightmap_gi_editor_plugin.h b/engine/editor/scene/3d/lightmap_gi_editor_plugin.h
index 91c27d4c..c690807e 100644
--- a/engine/editor/scene/3d/lightmap_gi_editor_plugin.h
+++ b/engine/editor/scene/3d/lightmap_gi_editor_plugin.h
@@ -31,10 +31,11 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/3d/lightmap_gi.h"
+#include "scene/resources/material.h"
 
 struct EditorProgress;
 class EditorFileDialog;
-class LightmapGI;
 
 class LightmapGIEditorPlugin : public EditorPlugin {
 	GDCLASS(LightmapGIEditorPlugin, EditorPlugin);
@@ -56,6 +57,7 @@ protected:
 
 public:
 	virtual String get_plugin_name() const override { return "LightmapGI"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/material_3d_conversion_plugins.cpp b/engine/editor/scene/3d/material_3d_conversion_plugins.cpp
index f38ec93c..b36340ea 100644
--- a/engine/editor/scene/3d/material_3d_conversion_plugins.cpp
+++ b/engine/editor/scene/3d/material_3d_conversion_plugins.cpp
@@ -33,7 +33,6 @@
 #include "editor/scene/material_editor_plugin.h"
 #include "scene/resources/3d/fog_material.h"
 #include "scene/resources/3d/sky_material.h"
-#include "servers/rendering/rendering_server.h"
 
 String StandardMaterial3DConversionPlugin::converts_to() const {
 	return "ShaderMaterial";
diff --git a/engine/editor/scene/3d/mesh_editor_plugin.cpp b/engine/editor/scene/3d/mesh_editor_plugin.cpp
index 8bac7ea3..92b7f67d 100644
--- a/engine/editor/scene/3d/mesh_editor_plugin.cpp
+++ b/engine/editor/scene/3d/mesh_editor_plugin.cpp
@@ -31,8 +31,6 @@
 #include "mesh_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/main/viewport.h"
@@ -165,8 +163,6 @@ MeshEditor::MeshEditor() {
 
 	rot_x = 0;
 	rot_y = 0;
-
-	EditorNode::get_singleton()->register_hdr_viewport(viewport);
 }
 
 ///////////////////////
diff --git a/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp b/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp
index ab5e649f..4a5374c3 100644
--- a/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "mesh_instance_3d_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -46,7 +44,6 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
@@ -368,8 +365,10 @@ void MeshInstance3DEditor::_create_collision_shape() {
 
 	for (Node *E : selection) {
 		if (placement_option == SHAPE_PLACEMENT_SIBLING && E == get_tree()->get_edited_scene_root()) {
-			err_dialog->set_text(TTR("Can't create a collision shape as sibling for the scene root."));
-			err_dialog->popup_centered();
+			if (verbose) {
+				err_dialog->set_text(TTR("Can't create a collision shape as sibling for the scene root."));
+				err_dialog->popup_centered();
+			}
 			continue;
 		}
 
diff --git a/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.h b/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.h
index b5d81e41..0f22ceb1 100644
--- a/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/mesh_instance_3d_editor_plugin.h
@@ -130,6 +130,7 @@ class MeshInstance3DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "MeshInstance3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/mesh_library_editor_plugin.cpp b/engine/editor/scene/3d/mesh_library_editor_plugin.cpp
index 75a9426e..c5fd51c4 100644
--- a/engine/editor/scene/3d/mesh_library_editor_plugin.cpp
+++ b/engine/editor/scene/3d/mesh_library_editor_plugin.cpp
@@ -30,409 +30,34 @@
 
 #include "mesh_library_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
-#include "editor/editor_undo_redo_manager.h"
+#include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/gui/editor_zoom_widget.h"
-#include "editor/gui/filter_line_edit.h"
-#include "editor/inspector/editor_inspector.h"
-#include "editor/inspector/editor_resource_preview.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_scale.h"
+#include "main/main.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
-#include "scene/gui/button.h"
-#include "scene/gui/item_list.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
-#include "scene/main/timer.h"
-#include "scene/resources/3d/mesh_library.h"
 #include "scene/resources/packed_scene.h"
 
-bool MeshLibraryEditor::MeshLibraryItem::_set(const StringName &p_name, const Variant &p_value) {
-	ERR_FAIL_COND_V(mesh_library.is_null(), false);
-	ERR_FAIL_COND_V(mesh_id == -1, false);
-	ERR_FAIL_COND_V(!mesh_library->has_item(mesh_id), false);
-
-	if (p_name == "name") {
-		mesh_library->set_item_name(mesh_id, p_value);
-	} else if (p_name == "mesh") {
-		mesh_library->set_item_mesh(mesh_id, p_value);
-	} else if (p_name == "mesh_transform") {
-		mesh_library->set_item_mesh_transform(mesh_id, p_value);
-	} else if (p_name == "mesh_cast_shadow") {
-		switch ((int)p_value) {
-			case 0: {
-				mesh_library->set_item_mesh_cast_shadow(mesh_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF);
-			} break;
-			case 1: {
-				mesh_library->set_item_mesh_cast_shadow(mesh_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
-			} break;
-			case 2: {
-				mesh_library->set_item_mesh_cast_shadow(mesh_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
-			} break;
-			case 3: {
-				mesh_library->set_item_mesh_cast_shadow(mesh_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
-			} break;
-			default: {
-				mesh_library->set_item_mesh_cast_shadow(mesh_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
-			} break;
-		}
-#ifndef PHYSICS_3D_DISABLED
-	} else if (p_name == "shapes") {
-		mesh_library->call("set_item_shapes", mesh_id, p_value);
-#endif // PHYSICS_3D_DISABLED
-	} else if (p_name == "preview") {
-		mesh_library->set_item_preview(mesh_id, p_value);
-	} else if (p_name == "navigation_mesh") {
-		mesh_library->set_item_navigation_mesh(mesh_id, p_value);
-	} else if (p_name == "navigation_mesh_transform") {
-		mesh_library->set_item_navigation_mesh_transform(mesh_id, p_value);
-	} else if (p_name == "navigation_layers") {
-		mesh_library->set_item_navigation_layers(mesh_id, p_value);
-	} else {
-		return false;
-	}
-
-	return false;
-}
-
-bool MeshLibraryEditor::MeshLibraryItem::_get(const StringName &p_name, Variant &r_ret) const {
-	ERR_FAIL_COND_V(mesh_library.is_null(), false);
-	ERR_FAIL_COND_V(mesh_id == -1, false);
-	ERR_FAIL_COND_V(!mesh_library->has_item(mesh_id), false);
-
-	if (p_name == "name") {
-		r_ret = mesh_library->get_item_name(mesh_id);
-	} else if (p_name == "mesh") {
-		r_ret = mesh_library->get_item_mesh(mesh_id);
-	} else if (p_name == "mesh_transform") {
-		r_ret = mesh_library->get_item_mesh_transform(mesh_id);
-	} else if (p_name == "mesh_cast_shadow") {
-		r_ret = (int)mesh_library->get_item_mesh_cast_shadow(mesh_id);
-#ifndef PHYSICS_3D_DISABLED
-	} else if (p_name == "shapes") {
-		r_ret = mesh_library->call("get_item_shapes", mesh_id);
-#endif // PHYSICS_3D_DISABLED
-	} else if (p_name == "navigation_mesh") {
-		r_ret = mesh_library->get_item_navigation_mesh(mesh_id);
-	} else if (p_name == "navigation_mesh_transform") {
-		r_ret = mesh_library->get_item_navigation_mesh_transform(mesh_id);
-	} else if (p_name == "navigation_layers") {
-		r_ret = mesh_library->get_item_navigation_layers(mesh_id);
-	} else if (p_name == "preview") {
-		r_ret = mesh_library->get_item_preview(mesh_id);
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void MeshLibraryEditor::MeshLibraryItem::_get_property_list(List<PropertyInfo> *p_list) const {
-	if (mesh_id == -1 || mesh_library.is_null() || !mesh_library->has_item(mesh_id)) {
-		return;
-	}
-
-	p_list->push_back(PropertyInfo(Variant::STRING, PNAME("name")));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("mesh"), PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()));
-	p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, PNAME("mesh_transform"), PROPERTY_HINT_NONE, "suffix:m"));
-	p_list->push_back(PropertyInfo(Variant::INT, PNAME("mesh_cast_shadow"), PROPERTY_HINT_ENUM, "Off,On,Double-Sided,Shadows Only"));
-	p_list->push_back(PropertyInfo(Variant::ARRAY, PNAME("shapes")));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("navigation_mesh"), PROPERTY_HINT_RESOURCE_TYPE, NavigationMesh::get_class_static()));
-	p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, PNAME("navigation_mesh_transform"), PROPERTY_HINT_NONE, "suffix:m"));
-	p_list->push_back(PropertyInfo(Variant::INT, PNAME("navigation_layers"), PROPERTY_HINT_LAYERS_3D_NAVIGATION));
-	p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("preview"), PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_DEFAULT));
-}
-
-////////////////
-
 void MeshLibraryEditor::edit(const Ref<MeshLibrary> &p_mesh_library) {
-	if (mesh_library.is_valid()) {
-		mesh_library->disconnect_changed(callable_mp(update_items_delay, &Timer::start));
-	}
-
-	selected_item = -1;
-
 	mesh_library = p_mesh_library;
 	if (mesh_library.is_valid()) {
-		// Avoid updating multiple times at once.
-		mesh_library->connect_changed(callable_mp(update_items_delay, &Timer::start).bind(UPDATE_ITEMS_DELAY_TIMEOUT));
-		_update_mesh_items();
+		menu->get_popup()->set_item_disabled(menu->get_popup()->get_item_index(MENU_OPTION_UPDATE_FROM_SCENE), !mesh_library->has_meta("_editor_source_scene"));
 	}
 }
 
-Error MeshLibraryEditor::update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge, bool p_apply_xforms) {
-	_import_scene(p_base_scene, ml, p_merge, p_apply_xforms);
-	return OK;
-}
-
-void MeshLibraryEditor::_update_mesh_items(bool p_reselect, Ref<MeshLibrary> p_lib_check) {
-	if (p_lib_check.is_valid() && mesh_library != p_lib_check) {
-		return;
-	}
-
-	mesh_library->set_edited(true);
-	mesh_items->clear();
-	remove_item->set_disabled(true);
-	update_items_delay->stop();
-
-	if (mesh_library->get_item_count() == 0) {
-		_select_item(-1);
-
-		item_split->hide();
-		empty_lib->show();
-
-		return;
-	}
-
-	empty_lib->hide();
-	item_split->show();
-
-	float min_size = EDITOR_GET("editors/grid_map/preview_size");
-	min_size *= EDSCALE;
-	mesh_items->set_fixed_column_width(min_size * MAX(zoom_widget->get_zoom(), 1.5));
-	mesh_items->set_fixed_icon_size(Size2(min_size, min_size));
-
-	Vector<int> ids;
-	ids = mesh_library->get_item_list();
-
-	struct _CGMEItemSort {
-		String name;
-		int id = 0;
-		_FORCE_INLINE_ bool operator<(const _CGMEItemSort &r_it) const { return name < r_it.name; }
-	};
-
-	List<_CGMEItemSort> il;
-	for (const int &E : ids) {
-		_CGMEItemSort is;
-		is.id = E;
-		is.name = mesh_library->get_item_name(E);
-		il.push_back(is);
-	}
-	il.sort();
-
-	int item = 0;
-	bool selection_found = false;
-	String filter = search_box->get_text().strip_edges();
-	for (_CGMEItemSort &E : il) {
-		int id = E.id;
-		String name = mesh_library->get_item_name(id);
-
-		if (!filter.is_empty() && !filter.is_subsequence_ofn(name)) {
-			if (selected_item == id) {
-				selection_found = true;
-			}
-
-			continue;
-		}
-
-		if (name.is_empty()) {
-			name = "#" + itos(id);
-		}
-
-		mesh_items->add_item("");
-
-		Ref<Texture2D> preview = mesh_library->get_item_preview(id);
-		if (preview.is_valid()) {
-			mesh_items->set_item_icon(item, preview);
-			mesh_items->set_item_tooltip(item, name);
-		} else {
-			Ref<Mesh> mesh = mesh_library->get_item_mesh(id);
-			if (mesh.is_valid()) {
-				// Fallback to the item's mesh preview.
-				EditorResourcePreview::get_singleton()->queue_edited_resource_preview(mesh, callable_mp(this, &MeshLibraryEditor::_update_resource_preview).bind(item));
-			}
-		}
-
-		mesh_items->set_item_text(item, name);
-		mesh_items->set_item_metadata(item, id);
-
-		if (selected_item == id) {
-			selection_found = true;
-
-			if (p_reselect) {
-				_select_item(id);
-				mesh_items->select(item);
-				remove_item->set_disabled(false);
-			}
-		}
-
-		item++;
-	}
-
-	if (!selection_found) {
-		if (p_reselect && item > 0) {
-			_select_item(mesh_items->get_item_metadata(0));
-			mesh_items->select(0);
-			remove_item->set_disabled(false);
-		} else {
-			_select_item(-1);
-		}
-	}
-}
-
-void MeshLibraryEditor::_update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_idx) {
-	if (p_idx < mesh_items->get_item_count()) {
-		mesh_items->set_item_icon(p_idx, p_preview);
-	}
-}
-
-void MeshLibraryEditor::_select_item(int p_id, Ref<MeshLibrary> p_lib_check) {
-	if (p_lib_check.is_valid() && mesh_library != p_lib_check) {
-		return;
-	}
-
-	selected_item = p_id;
-	if (selected_item == -1) {
-		inspector->edit(nullptr);
-		return;
-	}
-
-	Object *edited = inspector->get_edited_object();
-	if (edited) {
-		Ref<MeshLibraryItem> item(edited);
-		if (item->mesh_id == selected_item) {
-			return; // Already inspecting it.
-		}
-	}
-
-	mesh_library_item.instantiate();
-	mesh_library_item->mesh_library = mesh_library;
-	mesh_library_item->mesh_id = selected_item;
-	inspector->edit(*mesh_library_item);
-}
-
-void MeshLibraryEditor::_select_item_and_button(int p_id, Ref<MeshLibrary> p_lib_check) {
-	if (p_lib_check.is_valid() && mesh_library != p_lib_check) {
-		return;
-	}
-
-	_select_item(p_id);
-
-	for (int i = 0; i < mesh_items->get_item_count(); i++) {
-		int id = mesh_items->get_item_metadata(i);
-		if (id == p_id) {
-			mesh_items->select(i);
-			remove_item->set_disabled(false);
-			return;
-		}
-	}
-}
-
-void MeshLibraryEditor::_select_prev_item_and_button(int p_id, Ref<MeshLibrary> p_lib_check) {
-	int idx = -1;
-	for (int i = 0; i < mesh_items->get_item_count(); i++) {
-		int id = mesh_items->get_item_metadata(i);
-		if (id == p_id) {
-			idx = MAX(i - 1, 0);
-			break;
-		}
-	}
-
-	if (idx == -1 && mesh_items->get_item_count() > 0) {
-		idx = 0;
-	}
-
-	if (idx > -1) {
-		int id = mesh_items->get_item_metadata(idx);
-		_select_item(id);
-		mesh_items->select(idx);
-		remove_item->set_disabled(false);
-	}
-}
-
-void MeshLibraryEditor::_mesh_items_cbk(int p_idx) {
-	int id = mesh_items->get_item_metadata(p_idx);
-	_select_item(id);
-	remove_item->set_disabled(false);
-}
-
-void MeshLibraryEditor::_menu_cbk(int p_option) {
-	switch (p_option) {
-		case MENU_OPTION_ADD_ITEM: {
-			EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-			undo_redo->create_action(TTR("Add MeshLibrary item"));
-
-			int to_create = mesh_library->get_last_unused_item_id();
-			undo_redo->add_do_method(*mesh_library, "create_item", to_create);
-			undo_redo->add_undo_method(*mesh_library, "remove_item", to_create);
-
-			undo_redo->add_do_method(this, "_update_mesh_items", false, *mesh_library);
-			undo_redo->add_undo_method(this, "_update_mesh_items", false, *mesh_library);
-
-			undo_redo->add_do_method(this, "_select_item_and_button", to_create, *mesh_library);
-			if (mesh_library->get_item_count() > 0) {
-				undo_redo->add_undo_method(this, "_select_prev_item_and_button", to_create, *mesh_library);
-			}
-
-			undo_redo->commit_action();
-		} break;
-
+void MeshLibraryEditor::_menu_remove_confirm() {
+	switch (option) {
 		case MENU_OPTION_REMOVE_ITEM: {
-			EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-			undo_redo->create_action(TTR("Remove MeshLibrary item"));
-
-			if (mesh_library->get_item_count() - 1 > 0) {
-				undo_redo->add_do_method(this, "_select_prev_item_and_button", selected_item, *mesh_library);
-			}
-
-			undo_redo->add_do_method(*mesh_library, "remove_item", selected_item);
-
-			Ref<Mesh> mesh = mesh_library->get_item_mesh(selected_item);
-			int mesh_shadow = mesh_library->get_item_mesh_cast_shadow(selected_item);
-			Transform3D mesh_transform = mesh_library->get_item_mesh_transform(selected_item);
-			String mesh_name = mesh_library->get_item_name(selected_item);
-			int nav_layers = mesh_library->get_item_navigation_layers(selected_item);
-			Ref<NavigationMesh> nav_mesh = mesh_library->get_item_navigation_mesh(selected_item);
-			Transform3D nav_mesh_transform = mesh_library->get_item_navigation_mesh_transform(selected_item);
-			Ref<Texture2D> preview = mesh_library->get_item_preview(selected_item);
-			Array shapes = mesh_library->call("get_item_shapes", selected_item);
-
-			undo_redo->add_undo_method(*mesh_library, "create_item", selected_item);
-			undo_redo->add_undo_method(*mesh_library, "set_item_mesh", selected_item, mesh);
-			undo_redo->add_undo_method(*mesh_library, "set_item_mesh_cast_shadow", selected_item, mesh_shadow);
-			undo_redo->add_undo_method(*mesh_library, "set_item_mesh_transform", selected_item, mesh_transform);
-			undo_redo->add_undo_method(*mesh_library, "set_item_name", selected_item, mesh_name);
-			undo_redo->add_undo_method(*mesh_library, "set_item_navigation_layers", selected_item, nav_layers);
-			undo_redo->add_undo_method(*mesh_library, "set_item_navigation_mesh", selected_item, nav_mesh);
-			undo_redo->add_undo_method(*mesh_library, "set_item_navigation_mesh_transform", selected_item, nav_mesh_transform);
-			undo_redo->add_undo_method(*mesh_library, "set_item_preview", selected_item, preview);
-			undo_redo->add_undo_method(*mesh_library, "set_item_shapes", selected_item, shapes);
-
-			undo_redo->add_do_method(this, "_update_mesh_items", true, *mesh_library);
-			undo_redo->add_undo_method(this, "_update_mesh_items", false, *mesh_library);
-
-			undo_redo->add_undo_method(this, "_select_item_and_button", selected_item, *mesh_library);
-
-			undo_redo->commit_action();
-		} break;
-
-		case MENU_OPTION_IMPORT_FROM_SCENE: {
-			apply_xforms = false;
-			import_update = false;
-			file->popup_file_dialog();
-		} break;
-
-		case MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS: {
-			apply_xforms = true;
-			import_update = false;
-			file->popup_file_dialog();
-		} break;
-
-		case MENU_OPTION_UPDATE_FROM_SCENE: {
-			import_update = true;
-			cd_update->set_text(vformat(TTR("Update from existing scene?:\n%s"), String(mesh_library->get_meta("_editor_source_scene"))));
-			cd_update->popup_centered(Size2(500, 60));
+			mesh_library->remove_item(to_erase);
 		} break;
+		default: {
+		};
 	}
 }
 
@@ -450,28 +75,31 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library,
 	}
 
 	HashMap<int, MeshInstance3D *> mesh_instances;
+
 	for (int i = 0; i < p_scene->get_child_count(); i++) {
 		_import_scene_parse_node(p_library, mesh_instances, p_scene->get_child(i), p_merge, p_apply_xforms);
 	}
 
-	// Generate previews.
+	//generate previews!
 
-	Vector<Ref<Mesh>> meshes;
-	Vector<Transform3D> transforms;
-	Vector<int> ids = p_library->get_item_list();
-	for (const int &E : ids) {
-		if (mesh_instances.find(E)) {
-			meshes.push_back(p_library->get_item_mesh(E));
-			transforms.push_back(mesh_instances[E]->get_transform());
+	if (true) {
+		Vector<Ref<Mesh>> meshes;
+		Vector<Transform3D> transforms;
+		Vector<int> ids = p_library->get_item_list();
+		for (int i = 0; i < ids.size(); i++) {
+			if (mesh_instances.find(ids[i])) {
+				meshes.push_back(p_library->get_item_mesh(ids[i]));
+				transforms.push_back(mesh_instances[ids[i]]->get_transform());
+			}
 		}
-	}
 
-	Vector<Ref<Texture2D>> textures = EditorInterface::get_singleton()->make_mesh_previews(meshes, &transforms, EDITOR_GET("editors/grid_map/preview_size"));
-	int idx = 0;
-	for (const int &E : ids) {
-		if (mesh_instances.find(E)) {
-			p_library->set_item_preview(E, textures[idx]);
-			idx++;
+		Vector<Ref<Texture2D>> textures = EditorInterface::get_singleton()->make_mesh_previews(meshes, &transforms, EDITOR_GET("editors/grid_map/preview_size"));
+		int j = 0;
+		for (int i = 0; i < ids.size(); i++) {
+			if (mesh_instances.find(ids[i])) {
+				p_library->set_item_preview(ids[i], textures[j]);
+				j++;
+			}
 		}
 	}
 }
@@ -479,33 +107,23 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library,
 void MeshLibraryEditor::_import_scene_cbk(const String &p_str) {
 	Ref<PackedScene> ps = ResourceLoader::load(p_str, "PackedScene");
 	ERR_FAIL_COND(ps.is_null());
-
 	Node *scene = ps->instantiate();
+
 	ERR_FAIL_NULL_MSG(scene, "Cannot create an instance from PackedScene '" + p_str + "'.");
 
-	// Preserve the data from the current library.
-	Ref<MeshLibrary> old_lib;
-	old_lib = mesh_library->duplicate();
-
-	_import_scene(scene, mesh_library, import_update, apply_xforms);
+	_import_scene(scene, mesh_library, option == MENU_OPTION_UPDATE_FROM_SCENE, apply_xforms);
 
 	memdelete(scene);
 	mesh_library->set_meta("_editor_source_scene", p_str);
 
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Import MeshLibrary from scene"));
-	undo_redo->add_do_method(*mesh_library, "copy_from_resource", *mesh_library->duplicate());
-	undo_redo->add_undo_method(*mesh_library, "copy_from_resource", old_lib);
-	undo_redo->commit_action(false);
-
-	import_scene->get_popup()->set_item_disabled(import_scene->get_popup()->get_item_index(MENU_OPTION_UPDATE_FROM_SCENE), false);
+	menu->get_popup()->set_item_disabled(menu->get_popup()->get_item_index(MENU_OPTION_UPDATE_FROM_SCENE), false);
 }
 
 void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, HashMap<int, MeshInstance3D *> &p_mesh_instances, Node *p_node, bool p_merge, bool p_apply_xforms) {
 	MeshInstance3D *mesh_instance_node = Object::cast_to<MeshInstance3D>(p_node);
 
 	if (!mesh_instance_node) {
-		// No MeshInstance so search deeper.
+		// No MeshInstance so search deeper ...
 		for (int i = 0; i < p_node->get_child_count(); i++) {
 			_import_scene_parse_node(p_library, p_mesh_instances, p_node->get_child(i), p_merge, p_apply_xforms);
 		}
@@ -539,19 +157,19 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has
 	GeometryInstance3D::ShadowCastingSetting gi3d_cast_shadows_setting = mesh_instance_node->get_cast_shadows_setting();
 	switch (gi3d_cast_shadows_setting) {
 		case GeometryInstance3D::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF: {
-			p_library->set_item_mesh_cast_shadow(item_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF);
+			p_library->set_item_mesh_cast_shadow(item_id, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF);
 		} break;
 		case GeometryInstance3D::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON: {
-			p_library->set_item_mesh_cast_shadow(item_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
+			p_library->set_item_mesh_cast_shadow(item_id, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
 		} break;
 		case GeometryInstance3D::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED: {
-			p_library->set_item_mesh_cast_shadow(item_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
+			p_library->set_item_mesh_cast_shadow(item_id, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
 		} break;
 		case GeometryInstance3D::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY: {
-			p_library->set_item_mesh_cast_shadow(item_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
+			p_library->set_item_mesh_cast_shadow(item_id, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
 		} break;
 		default: {
-			p_library->set_item_mesh_cast_shadow(item_id, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
+			p_library->set_item_mesh_cast_shadow(item_id, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
 		} break;
 	}
 
@@ -607,199 +225,110 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has
 	}
 }
 
-void MeshLibraryEditor::_icon_size_changed(float p_value) {
-	mesh_items->set_icon_scale(p_value);
-	_update_mesh_items();
+Error MeshLibraryEditor::update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge, bool p_apply_xforms) {
+	_import_scene(p_base_scene, ml, p_merge, p_apply_xforms);
+	return OK;
 }
 
-void MeshLibraryEditor::_mesh_items_input(const Ref<InputEvent> &p_event) {
-	// Zoom in/out using Ctrl + mouse wheel.
-	const Ref<InputEventMouseButton> mb = p_event;
-	if (mb.is_valid() && mb->is_pressed() && mb->is_command_or_control_pressed()) {
-		if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_UP) {
-			zoom_widget->set_zoom(zoom_widget->get_zoom() + 0.2);
-			zoom_widget->emit_signal(SNAME("zoom_changed"), zoom_widget->get_zoom());
-			accept_event();
-		}
-
-		if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_DOWN) {
-			zoom_widget->set_zoom(zoom_widget->get_zoom() - 0.2);
-			zoom_widget->emit_signal(SNAME("zoom_changed"), zoom_widget->get_zoom());
-			accept_event();
-		}
+void MeshLibraryEditor::_menu_cbk(int p_option) {
+	option = p_option;
+	switch (p_option) {
+		case MENU_OPTION_ADD_ITEM: {
+			mesh_library->create_item(mesh_library->get_last_unused_item_id());
+		} break;
+		case MENU_OPTION_REMOVE_ITEM: {
+			String p = InspectorDock::get_inspector_singleton()->get_selected_path();
+			if (p.begins_with("item") && p.get_slice_count("/") >= 2) {
+				to_erase = p.get_slicec('/', 1).to_int();
+				cd_remove->set_text(vformat(TTR("Remove item %d?"), to_erase));
+				cd_remove->popup_centered(Size2(300, 60));
+			}
+		} break;
+		case MENU_OPTION_IMPORT_FROM_SCENE: {
+			apply_xforms = false;
+			file->popup_file_dialog();
+		} break;
+		case MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS: {
+			apply_xforms = true;
+			file->popup_file_dialog();
+		} break;
+		case MENU_OPTION_UPDATE_FROM_SCENE: {
+			cd_update->set_text(vformat(TTR("Update from existing scene?:\n%s"), String(mesh_library->get_meta("_editor_source_scene"))));
+			cd_update->popup_centered(Size2(500, 60));
+		} break;
 	}
 }
 
-void MeshLibraryEditor::_notification(int p_what) {
-	if (p_what == NOTIFICATION_THEME_CHANGED) {
-		add_item->set_button_icon(get_editor_theme_icon(SNAME("Add")));
-		remove_item->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
-	}
-}
-
-void MeshLibraryEditor::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_update_mesh_items", "reselect"), &MeshLibraryEditor::_update_mesh_items, DEFVAL(true));
-	ClassDB::bind_method(D_METHOD("_select_item_and_button", "id", "library"), &MeshLibraryEditor::_select_item_and_button, DEFVAL(Ref<MeshLibrary>()));
-	ClassDB::bind_method(D_METHOD("_select_prev_item_and_button", "id", "library"), &MeshLibraryEditor::_select_prev_item_and_button, DEFVAL(Ref<MeshLibrary>()));
-}
-
 MeshLibraryEditor::MeshLibraryEditor() {
-	set_name(TTRC("MeshLibrary"));
-	set_icon_name("MeshLibraryEditor");
-	set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
-	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
-	set_global(false);
-	set_transient(true);
-	set_custom_minimum_size(Size2(0, 200 * EDSCALE));
-
-	VBoxContainer *vb = memnew(VBoxContainer);
-	add_child(vb);
-
-	HBoxContainer *toolbar = memnew(HBoxContainer);
-	vb->add_child(toolbar);
-
-	add_item = memnew(Button);
-	add_item->set_text(TTRC("Add"));
-	add_item->set_theme_type_variation(SceneStringName(FlatButton));
-	add_item->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_cbk).bind(MENU_OPTION_ADD_ITEM));
-	toolbar->add_child(add_item);
-
-	remove_item = memnew(Button);
-	remove_item->set_text(TTRC("Remove"));
-	remove_item->set_disabled(true);
-	remove_item->set_theme_type_variation(SceneStringName(FlatButton));
-	remove_item->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_cbk).bind(MENU_OPTION_REMOVE_ITEM));
-	toolbar->add_child(remove_item);
-
-	toolbar->add_child(memnew(VSeparator));
-
-	import_scene = memnew(MenuButton);
-	import_scene->set_text(TTRC("Import"));
-	import_scene->set_flat(false);
-	import_scene->set_theme_type_variation(SceneStringName(FlatButton));
-	toolbar->add_child(import_scene);
-
-	import_scene->get_popup()->add_item(TTRC("Import from Scene (Ignore Transforms)"), MENU_OPTION_IMPORT_FROM_SCENE);
-	import_scene->get_popup()->add_item(TTRC("Import from Scene (Apply Transforms)"), MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS);
-	import_scene->get_popup()->add_separator();
-	import_scene->get_popup()->add_item(TTRC("Update from Scene"), MENU_OPTION_UPDATE_FROM_SCENE);
-	import_scene->get_popup()->set_item_disabled(-1, true);
-	import_scene->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &MeshLibraryEditor::_menu_cbk));
-
-	toolbar->add_spacer();
-
-	update_items_delay = memnew(Timer);
-	update_items_delay->set_wait_time(UPDATE_ITEMS_DELAY_TIMEOUT);
-	update_items_delay->set_one_shot(true);
-	update_items_delay->connect("timeout", callable_mp(this, &MeshLibraryEditor::_update_mesh_items).bind(true, Ref<MeshLibrary>()));
-	add_child(update_items_delay);
-
-	search_box = memnew(FilterLineEdit);
-	search_box->set_placeholder(TTRC("Filter Meshes"));
-	search_box->set_accessibility_name(TTRC("Filter Meshes"));
-	search_box->add_theme_constant_override("minimum_character_width", 10);
-	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
-	toolbar->add_child(search_box);
-	search_box->connect(SceneStringName(text_changed), callable_mp(update_items_delay, &Timer::start).bind(UPDATE_ITEMS_DELAY_TIMEOUT).unbind(1));
-
-	zoom_widget = memnew(EditorZoomWidget);
-	zoom_widget->setup_zoom_limits(0.2, 4);
-	zoom_widget->connect("zoom_changed", callable_mp(this, &MeshLibraryEditor::_icon_size_changed));
-	zoom_widget->set_shortcut_context(this);
-	toolbar->add_child(zoom_widget);
-
-	item_split = memnew(HSplitContainer);
-	item_split->set_v_size_flags(SIZE_EXPAND_FILL);
-	vb->add_child(item_split);
-	item_split->hide();
-
-	mesh_items = memnew(ItemList);
-	mesh_items->set_max_columns(0);
-	mesh_items->set_icon_mode(ItemList::ICON_MODE_TOP);
-	mesh_items->set_max_text_lines(2);
-	mesh_items->set_theme_type_variation("ItemListSecondary");
-	mesh_items->set_h_size_flags(SIZE_EXPAND_FILL);
-	mesh_items->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
-	mesh_items->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	item_split->add_child(mesh_items);
-	mesh_items->connect(SceneStringName(item_selected), callable_mp(this, &MeshLibraryEditor::_mesh_items_cbk));
-	mesh_items->connect(SceneStringName(gui_input), callable_mp(this, &MeshLibraryEditor::_mesh_items_input));
-
-	search_box->set_forward_control(mesh_items);
-
-	inspector = memnew(EditorInspector);
-	inspector->set_use_doc_hints(true);
-	inspector->set_theme_type_variation("ScrollContainerSecondary");
-	inspector->set_h_size_flags(SIZE_EXPAND_FILL);
-	inspector->set_stretch_ratio(0.3);
-	inspector->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
-	item_split->add_child(inspector);
-
-	inspector->add_custom_property_description("MeshLibraryItem", "name", TTRC("The item's name, shown in the editor. It can also be used to look up the item later using [method MeshLibrary.find_item_by_name]."));
-	inspector->add_custom_property_description("MeshLibraryItem", "mesh", TTRC("The item's mesh. Used by other parts of the engine (e.g. [GridMap], which displays them in a 3D tile)."));
-	inspector->add_custom_property_description("MeshLibraryItem", "mesh_transform", TTRC("The transform to apply to the item's mesh."));
-	inspector->add_custom_property_description("MeshLibraryItem", "mesh_cast_shadow", TTRC("The shadow casting mode used by the item's mesh. See [enum RenderingServer.ShadowCastingSetting]"));
-	inspector->add_custom_property_description("MeshLibraryItem", "shapes", TTRC("The item's collision shapes.\nThe array should consist of [Shape3D] objects, each followed by a [Transform3D] that will be applied to it. For shapes that should not have a transform, use [constant Transform3D.IDENTITY]."));
-	inspector->add_custom_property_description("MeshLibraryItem", "navigation_mesh", TTRC("The item's navigation mesh."));
-	inspector->add_custom_property_description("MeshLibraryItem", "navigation_mesh_transform", TTRC("The transform to apply to the item's navigation mesh."));
-	inspector->add_custom_property_description("MeshLibraryItem", "navigation_layers", TTRC("The item's navigation layers bitmask."));
-	inspector->add_custom_property_description("MeshLibraryItem", "preview", TTRC("The texture to use as the item's preview icon in the editor."));
-
-	empty_lib = memnew(Label);
-	empty_lib->set_text(TTRC("No items found inside the MeshLibrary.\nYou can add some by using the Add button on the left, or by exporting them from a scene file via the Export menu."));
-	empty_lib->set_focus_mode(FOCUS_ACCESSIBILITY);
-	empty_lib->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
-	empty_lib->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
-	empty_lib->set_v_size_flags(SIZE_EXPAND_FILL);
-	empty_lib->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	empty_lib->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
-	vb->add_child(empty_lib);
-	empty_lib->hide();
-
 	file = memnew(EditorFileDialog);
 	file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
+	//not for now?
 	List<String> extensions;
 	ResourceLoader::get_recognized_extensions_for_type("PackedScene", &extensions);
 	file->clear_filters();
-	file->set_title(TTRC("Import Scene"));
+	file->set_title(TTR("Import Scene"));
 	for (const String &extension : extensions) {
 		file->add_filter("*." + extension, extension.to_upper());
 	}
 	add_child(file);
 	file->connect("file_selected", callable_mp(this, &MeshLibraryEditor::_import_scene_cbk));
 
+	menu = memnew(MenuButton);
+	Node3DEditor::get_singleton()->add_control_to_menu_panel(menu);
+	menu->set_position(Point2(1, 1));
+	menu->set_text(TTR("MeshLibrary"));
+	menu->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MeshLibrary"), EditorStringName(EditorIcons)));
+	menu->set_flat(false);
+	menu->set_theme_type_variation("FlatMenuButtonNoIconTint");
+	menu->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
+	menu->get_popup()->add_item(TTR("Remove Selected Item"), MENU_OPTION_REMOVE_ITEM);
+	menu->get_popup()->add_separator();
+	menu->get_popup()->add_item(TTR("Import from Scene (Ignore Transforms)"), MENU_OPTION_IMPORT_FROM_SCENE);
+	menu->get_popup()->add_item(TTR("Import from Scene (Apply Transforms)"), MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS);
+	menu->get_popup()->add_item(TTR("Update from Scene"), MENU_OPTION_UPDATE_FROM_SCENE);
+	menu->get_popup()->set_item_disabled(menu->get_popup()->get_item_index(MENU_OPTION_UPDATE_FROM_SCENE), true);
+	menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &MeshLibraryEditor::_menu_cbk));
+	menu->hide();
+
+	cd_remove = memnew(ConfirmationDialog);
+	add_child(cd_remove);
+	cd_remove->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_remove_confirm));
 	cd_update = memnew(ConfirmationDialog);
 	add_child(cd_update);
-	cd_update->set_ok_button_text(TTRC("Apply without Transforms"));
+	cd_update->set_ok_button_text(TTR("Apply without Transforms"));
 	cd_update->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_update_confirm).bind(false));
-	cd_update->add_button(TTRC("Apply with Transforms"))->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_update_confirm).bind(true));
+	cd_update->add_button(TTR("Apply with Transforms"))->connect(SceneStringName(pressed), callable_mp(this, &MeshLibraryEditor::_menu_update_confirm).bind(true));
 }
 
-////////////////
-
 void MeshLibraryEditorPlugin::edit(Object *p_node) {
-	Ref<MeshLibrary> ml = Object::cast_to<MeshLibrary>(p_node);
-	if (ml.is_valid()) {
-		mesh_library_editor->edit(ml);
+	if (Object::cast_to<MeshLibrary>(p_node)) {
+		mesh_library_editor->edit(Object::cast_to<MeshLibrary>(p_node));
+		mesh_library_editor->show();
+	} else {
+		mesh_library_editor->edit(Ref<MeshLibrary>());
+		mesh_library_editor->hide();
 	}
 }
 
-bool MeshLibraryEditorPlugin::handles(Object *p_object) const {
-	return p_object && p_object->is_class("MeshLibrary");
+bool MeshLibraryEditorPlugin::handles(Object *p_node) const {
+	return p_node->is_class("MeshLibrary");
 }
 
 void MeshLibraryEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
-		mesh_library_editor->make_visible();
+		mesh_library_editor->show();
+		mesh_library_editor->get_menu_button()->show();
 	} else {
-		mesh_library_editor->close();
+		mesh_library_editor->hide();
+		mesh_library_editor->get_menu_button()->hide();
 	}
 }
 
 MeshLibraryEditorPlugin::MeshLibraryEditorPlugin() {
-	singleton = this;
-
 	mesh_library_editor = memnew(MeshLibraryEditor);
-	EditorDockManager::get_singleton()->add_dock(mesh_library_editor);
-	mesh_library_editor->close();
+
+	EditorNode::get_singleton()->get_gui_base()->add_child(mesh_library_editor);
+	mesh_library_editor->set_anchors_and_offsets_preset(Control::PRESET_TOP_WIDE);
+	mesh_library_editor->set_end(Point2(0, 22));
+	mesh_library_editor->hide();
 }
diff --git a/engine/editor/scene/3d/mesh_library_editor_plugin.h b/engine/editor/scene/3d/mesh_library_editor_plugin.h
index 1e4d21ed..91756e3d 100644
--- a/engine/editor/scene/3d/mesh_library_editor_plugin.h
+++ b/engine/editor/scene/3d/mesh_library_editor_plugin.h
@@ -30,37 +30,25 @@
 
 #pragma once
 
-#include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/resources/3d/mesh_library.h"
 
-class ConfirmationDialog;
 class EditorFileDialog;
-class EditorInspector;
-class EditorZoomWidget;
-class FilterLineEdit;
-class HSplitContainer;
-class ItemList;
+class ConfirmationDialog;
 class MenuButton;
 class MeshInstance3D;
-class MeshLibrary;
-class Timer;
 
-class MeshLibraryEditor : public EditorDock {
-	GDCLASS(MeshLibraryEditor, EditorDock);
+class MeshLibraryEditor : public Control {
+	GDCLASS(MeshLibraryEditor, Control);
 
-	class MeshLibraryItem : public RefCounted {
-		GDCLASS(MeshLibraryItem, RefCounted);
+	Ref<MeshLibrary> mesh_library;
 
-		friend MeshLibraryEditor;
-
-		Ref<MeshLibrary> mesh_library;
-		int mesh_id = -1;
-
-	protected:
-		bool _set(const StringName &p_name, const Variant &p_value);
-		bool _get(const StringName &p_name, Variant &r_ret) const;
-		void _get_property_list(List<PropertyInfo> *p_list) const;
-	};
+	MenuButton *menu = nullptr;
+	ConfirmationDialog *cd_remove = nullptr;
+	ConfirmationDialog *cd_update = nullptr;
+	EditorFileDialog *file = nullptr;
+	bool apply_xforms = false;
+	int to_erase = 0;
 
 	enum {
 		MENU_OPTION_ADD_ITEM,
@@ -70,53 +58,18 @@ class MeshLibraryEditor : public EditorDock {
 		MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS
 	};
 
-	const float UPDATE_ITEMS_DELAY_TIMEOUT = 0.1;
-
-	Ref<MeshLibrary> mesh_library;
-	Ref<MeshLibraryItem> mesh_library_item; // Keep a reference to avoid crashes.
-	int selected_item = -1;
-
-	Button *add_item = nullptr;
-	Button *remove_item = nullptr;
-	MenuButton *import_scene = nullptr;
-	FilterLineEdit *search_box = nullptr;
-	EditorZoomWidget *zoom_widget = nullptr;
-	HSplitContainer *item_split = nullptr;
-	ItemList *mesh_items = nullptr;
-	EditorInspector *inspector = nullptr;
-	Label *empty_lib = nullptr;
-	Timer *update_items_delay = nullptr;
-
-	EditorFileDialog *file = nullptr;
-	ConfirmationDialog *cd_update = nullptr;
-
-	bool apply_xforms = false;
-	bool import_update = false;
-
-	void _update_mesh_items(bool p_reselect = true, Ref<MeshLibrary> p_lib_check = Ref<MeshLibrary>());
-	void _update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_idx);
-
-	void _select_item(int p_id, Ref<MeshLibrary> p_lib_check = Ref<MeshLibrary>());
-	void _select_item_and_button(int p_id, Ref<MeshLibrary> p_lib_check = Ref<MeshLibrary>());
-	void _select_prev_item_and_button(int p_id, Ref<MeshLibrary> p_lib_check = Ref<MeshLibrary>());
-
-	void _mesh_items_cbk(int p_idx);
-	void _mesh_items_input(const Ref<InputEvent> &p_event);
-
+	int option = 0;
+	void _import_scene_cbk(const String &p_str);
 	void _menu_cbk(int p_option);
+	void _menu_remove_confirm();
 	void _menu_update_confirm(bool p_apply_xforms);
 
-	void _import_scene_cbk(const String &p_str);
 	static void _import_scene(Node *p_scene, Ref<MeshLibrary> p_library, bool p_merge, bool p_apply_xforms);
 	static void _import_scene_parse_node(Ref<MeshLibrary> p_library, HashMap<int, MeshInstance3D *> &p_mesh_instances, Node *p_node, bool p_merge, bool p_apply_xforms);
 
-	void _icon_size_changed(float p_value);
-
-private:
-	void _notification(int p_what);
-	static void _bind_methods();
-
 public:
+	MenuButton *get_menu_button() const { return menu; }
+
 	void edit(const Ref<MeshLibrary> &p_mesh_library);
 	static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge = true, bool p_apply_xforms = false);
 
@@ -126,17 +79,14 @@ public:
 class MeshLibraryEditorPlugin : public EditorPlugin {
 	GDCLASS(MeshLibraryEditorPlugin, EditorPlugin);
 
-	static inline MeshLibraryEditorPlugin *singleton = nullptr;
-
 	MeshLibraryEditor *mesh_library_editor = nullptr;
 
 public:
-	_FORCE_INLINE_ static MeshLibraryEditorPlugin *get_singleton() { return singleton; }
-
+	virtual String get_plugin_name() const override { return "MeshLibrary"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_node) override;
 	virtual bool handles(Object *p_node) const override;
 	virtual void make_visible(bool p_visible) override;
 
 	MeshLibraryEditorPlugin();
-	~MeshLibraryEditorPlugin() { singleton = nullptr; }
 };
diff --git a/engine/editor/scene/3d/multimesh_editor_plugin.cpp b/engine/editor/scene/3d/multimesh_editor_plugin.cpp
index f6b832cf..3c74db35 100644
--- a/engine/editor/scene/3d/multimesh_editor_plugin.cpp
+++ b/engine/editor/scene/3d/multimesh_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "multimesh_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/templates/rb_map.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
diff --git a/engine/editor/scene/3d/multimesh_editor_plugin.h b/engine/editor/scene/3d/multimesh_editor_plugin.h
index e2b9d35d..b1ec83ff 100644
--- a/engine/editor/scene/3d/multimesh_editor_plugin.h
+++ b/engine/editor/scene/3d/multimesh_editor_plugin.h
@@ -91,6 +91,7 @@ class MultiMeshEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "MultiMesh"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/node_3d_editor_gizmos.cpp b/engine/editor/scene/3d/node_3d_editor_gizmos.cpp
index 1dc49709..18499d2f 100644
--- a/engine/editor/scene/3d/node_3d_editor_gizmos.cpp
+++ b/engine/editor/scene/3d/node_3d_editor_gizmos.cpp
@@ -32,14 +32,11 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/primitive_meshes.h"
-#include "servers/rendering/rendering_server.h"
 
 #define HANDLE_HALF_SIZE 9.5
 
@@ -221,11 +218,11 @@ void EditorNode3DGizmo::Instance::create_instance(Node3D *p_base, bool p_hidden)
 	if (extra_margin) {
 		RS::get_singleton()->instance_set_extra_visibility_margin(instance, 1);
 	}
-	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(instance, RSE::SHADOW_CASTING_SETTING_OFF);
+	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(instance, RS::SHADOW_CASTING_SETTING_OFF);
 	int layer = p_hidden ? 0 : 1 << Node3DEditorViewport::GIZMO_EDIT_LAYER;
 	RS::get_singleton()->instance_set_layer_mask(instance, layer); //gizmos are 26
-	RS::get_singleton()->instance_geometry_set_flag(instance, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(instance, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+	RS::get_singleton()->instance_geometry_set_flag(instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+	RS::get_singleton()->instance_geometry_set_flag(instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 }
 
 void EditorNode3DGizmo::add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material, const Transform3D &p_xform, const Ref<SkinReference> &p_skin_reference) {
@@ -368,6 +365,14 @@ void EditorNode3DGizmo::add_unscaled_billboard(const Ref<Material> &p_material,
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 	mesh->surface_set_material(0, p_material);
 
+	float md = 0;
+	for (int i = 0; i < vs.size(); i++) {
+		md = MAX(0, vs[i].length());
+	}
+	if (md) {
+		mesh->set_custom_aabb(AABB(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0));
+	}
+
 	selectable_icon_size = p_scale;
 	mesh->set_custom_aabb(AABB(Vector3(-selectable_icon_size, -selectable_icon_size, -selectable_icon_size) * 100.0f, Vector3(selectable_icon_size, selectable_icon_size, selectable_icon_size) * 200.0f));
 
@@ -420,8 +425,8 @@ void EditorNode3DGizmo::add_handles(const Vector<Vector3> &p_handles, const Ref<
 	Ref<ArrayMesh> mesh = memnew(ArrayMesh);
 
 	Array a;
-	a.resize(RSE::ARRAY_MAX);
-	a[RSE::ARRAY_VERTEX] = p_handles;
+	a.resize(RS::ARRAY_MAX);
+	a[RS::ARRAY_VERTEX] = p_handles;
 	Vector<Color> colors;
 	{
 		colors.resize(p_handles.size());
@@ -441,7 +446,7 @@ void EditorNode3DGizmo::add_handles(const Vector<Vector3> &p_handles, const Ref<
 			w[i] = col;
 		}
 	}
-	a[RSE::ARRAY_COLOR] = colors;
+	a[RS::ARRAY_COLOR] = colors;
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_POINTS, a);
 	mesh->surface_set_material(0, p_material);
 
@@ -482,17 +487,17 @@ void EditorNode3DGizmo::add_solid_box(const Ref<Material> &p_material, Vector3 p
 	ERR_FAIL_NULL(spatial_node);
 
 	Array arrays;
-	arrays.resize(RSE::ARRAY_MAX);
+	arrays.resize(RS::ARRAY_MAX);
 	BoxMesh::create_mesh_array(arrays, p_size);
 
-	PackedVector3Array vertex = arrays[RSE::ARRAY_VERTEX];
+	PackedVector3Array vertex = arrays[RS::ARRAY_VERTEX];
 	Vector3 *w = vertex.ptrw();
 
 	for (int i = 0; i < vertex.size(); ++i) {
 		w[i] += p_position;
 	}
 
-	arrays[RSE::ARRAY_VERTEX] = vertex;
+	arrays[RS::ARRAY_VERTEX] = vertex;
 
 	Ref<ArrayMesh> m;
 	m.instantiate();
diff --git a/engine/editor/scene/3d/node_3d_editor_gizmos.h b/engine/editor/scene/3d/node_3d_editor_gizmos.h
index b36c0864..70225785 100644
--- a/engine/editor/scene/3d/node_3d_editor_gizmos.h
+++ b/engine/editor/scene/3d/node_3d_editor_gizmos.h
@@ -102,7 +102,6 @@ public:
 	void add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material = Ref<Material>(), const Transform3D &p_xform = Transform3D(), const Ref<SkinReference> &p_skin_reference = Ref<SkinReference>());
 	void add_collision_segments(const Vector<Vector3> &p_lines);
 	void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh);
-	const LocalVector<Ref<TriangleMesh>> &get_collision_meshes() const { return collision_meshes; }
 	void add_unscaled_billboard(const Ref<Material> &p_material, real_t p_scale = 1, const Color &p_modulate = Color(1, 1, 1));
 	void add_handles(const Vector<Vector3> &p_handles, const Ref<Material> &p_material, const Vector<int> &p_ids = Vector<int>(), bool p_billboard = false, bool p_secondary = false);
 	void add_solid_box(const Ref<Material> &p_material, Vector3 p_size, Vector3 p_position = Vector3(), const Transform3D &p_xform = Transform3D());
diff --git a/engine/editor/scene/3d/node_3d_editor_plugin.cpp b/engine/editor/scene/3d/node_3d_editor_plugin.cpp
index 3dafc64e..75e4bf74 100644
--- a/engine/editor/scene/3d/node_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -33,14 +33,9 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/input/input_map.h"
-#include "core/io/resource_loader.h"
-#include "core/math/geometry_3d.h"
 #include "core/math/math_funcs.h"
 #include "core/math/projection.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/debugger/editor_debugger_node.h"
@@ -103,37 +98,34 @@
 #include "scene/gui/center_container.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/subviewport_container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/sky_material.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/sky.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/rendering/rendering_server.h"
+
+constexpr real_t DISTANCE_DEFAULT = 4;
 
 constexpr real_t GIZMO_ARROW_SIZE = 0.35;
 constexpr real_t GIZMO_RING_HALF_WIDTH = 0.1;
 constexpr real_t GIZMO_PLANE_SIZE = 0.2;
 constexpr real_t GIZMO_PLANE_DST = 0.3;
 constexpr real_t GIZMO_CIRCLE_SIZE = 1.1;
-
+constexpr real_t GIZMO_VIEW_ROTATION_SIZE = 1.25;
 constexpr real_t GIZMO_SCALE_OFFSET = GIZMO_CIRCLE_SIZE + 0.3;
 constexpr real_t GIZMO_ARROW_OFFSET = GIZMO_CIRCLE_SIZE + 0.3;
 
-constexpr real_t TRACKBALL_SENSITIVITY = 0.005;
-constexpr int TRACKBALL_SPHERE_RINGS = 16;
-constexpr int TRACKBALL_SPHERE_SECTORS = 32;
-constexpr real_t TRACKBALL_HIGHLIGHT_ALPHA = 0.01;
-constexpr int GIZMO_HIGHLIGHT_AXIS_VIEW_ROTATION = 15;
-
-constexpr float VERTEX_SNAP_THRESHOLD = 30.0f;
-constexpr int GIZMO_HIGHLIGHT_AXIS_TRACKBALL = 16;
-
+constexpr real_t ZOOM_FREELOOK_MIN = 0.01;
+constexpr real_t ZOOM_FREELOOK_MULTIPLIER = 1.08;
 constexpr real_t ZOOM_FREELOOK_INDICATOR_DELAY_S = 1.5;
 
+#ifdef REAL_T_IS_DOUBLE
+constexpr double ZOOM_FREELOOK_MAX = 1'000'000'000'000;
+#else
+constexpr float ZOOM_FREELOOK_MAX = 10'000;
+#endif
+
 constexpr real_t MIN_Z = 0.01;
 constexpr real_t MAX_Z = 1000000.0;
 
@@ -162,7 +154,7 @@ void ViewportNavigationControl::_notification(int p_what) {
 }
 
 void ViewportNavigationControl::_draw() {
-	if (nav_mode == View3DController::NAV_MODE_NONE) {
+	if (nav_mode == Node3DEditorViewport::NAVIGATION_NONE) {
 		return;
 	}
 
@@ -195,8 +187,8 @@ void ViewportNavigationControl::_process_click(int p_index, Vector2 p_position,
 		}
 	} else {
 		focused_index = -1;
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			Input::get_singleton()->warp_mouse(focused_mouse_start);
 		}
 	}
@@ -204,8 +196,8 @@ void ViewportNavigationControl::_process_click(int p_index, Vector2 p_position,
 
 void ViewportNavigationControl::_process_drag(int p_index, Vector2 p_position, Vector2 p_relative_position) {
 	if (focused_index == p_index) {
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_VISIBLE) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_VISIBLE) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 			focused_mouse_start = p_position;
 		}
 		focused_pos += p_relative_position;
@@ -222,7 +214,7 @@ void ViewportNavigationControl::gui_input(const Ref<InputEvent> &p_event) {
 
 	const Ref<InputEventMouseMotion> mouse_motion = p_event;
 	if (mouse_motion.is_valid()) {
-		_process_drag(100, mouse_motion->get_global_position(), viewport->view_3d_controller->get_warped_mouse_motion(mouse_motion, viewport->surface->get_global_rect()));
+		_process_drag(100, mouse_motion->get_global_position(), viewport->_get_warped_mouse_motion(mouse_motion));
 	}
 
 	// Touch events
@@ -245,12 +237,14 @@ void ViewportNavigationControl::_update_navigation() {
 	Vector2 delta = focused_pos - (get_size() / 2.0);
 	Vector2 delta_normalized = delta.normalized();
 	switch (nav_mode) {
-		case View3DController::NAV_MODE_MOVE: {
+		case Node3DEditorViewport::NavigationMode::NAVIGATION_MOVE: {
 			real_t speed_multiplier = MIN(delta.length() / (get_size().x * 100.0), 3.0);
-			real_t speed = viewport->view_3d_controller->get_freelook_speed() * speed_multiplier;
+			real_t speed = viewport->freelook_speed * speed_multiplier;
+
+			const Node3DEditorViewport::FreelookNavigationScheme navigation_scheme = (Node3DEditorViewport::FreelookNavigationScheme)EDITOR_GET("editors/3d/freelook/freelook_navigation_scheme").operator int();
 
 			Vector3 forward;
-			if (viewport->view_3d_controller->get_freelook_scheme() == View3DController::FreelookScheme::FREELOOK_FULLY_AXIS_LOCKED) {
+			if (navigation_scheme == Node3DEditorViewport::FreelookNavigationScheme::FREELOOK_FULLY_AXIS_LOCKED) {
 				// Forward/backward keys will always go straight forward/backward, never moving on the Y axis.
 				forward = Vector3(0, 0, delta_normalized.y).rotated(Vector3(0, 1, 0), viewport->camera->get_rotation().y);
 			} else {
@@ -262,37 +256,37 @@ void ViewportNavigationControl::_update_navigation() {
 
 			const Vector3 direction = forward + right;
 			const Vector3 motion = direction * speed;
-			viewport->view_3d_controller->cursor.pos += motion;
-			viewport->view_3d_controller->cursor.eye_pos += motion;
+			viewport->cursor.pos += motion;
+			viewport->cursor.eye_pos += motion;
 		} break;
 
-		case View3DController::NAV_MODE_LOOK: {
+		case Node3DEditorViewport::NavigationMode::NAVIGATION_LOOK: {
 			real_t speed_multiplier = MIN(delta.length() / (get_size().x * 2.5), 3.0);
-			real_t speed = viewport->view_3d_controller->get_freelook_speed() * speed_multiplier;
-			viewport->view_3d_controller->cursor_look(nullptr, delta_normalized * speed);
+			real_t speed = viewport->freelook_speed * speed_multiplier;
+			viewport->_nav_look(nullptr, delta_normalized * speed);
 		} break;
 
-		case View3DController::NAV_MODE_PAN: {
+		case Node3DEditorViewport::NAVIGATION_PAN: {
 			real_t speed_multiplier = MIN(delta.length() / (get_size().x), 3.0);
-			real_t speed = viewport->view_3d_controller->get_freelook_speed() * speed_multiplier;
-			viewport->view_3d_controller->cursor_pan(nullptr, -delta_normalized * speed);
+			real_t speed = viewport->freelook_speed * speed_multiplier;
+			viewport->_nav_pan(nullptr, -delta_normalized * speed);
 		} break;
-		case View3DController::NAV_MODE_ZOOM: {
+		case Node3DEditorViewport::NAVIGATION_ZOOM: {
 			real_t speed_multiplier = MIN(delta.length() / (get_size().x), 3.0);
-			real_t speed = viewport->view_3d_controller->get_freelook_speed() * speed_multiplier;
-			viewport->view_3d_controller->cursor_zoom(nullptr, delta_normalized * speed);
+			real_t speed = viewport->freelook_speed * speed_multiplier;
+			viewport->_nav_zoom(nullptr, delta_normalized * speed);
 		} break;
-		case View3DController::NAV_MODE_ORBIT: {
+		case Node3DEditorViewport::NAVIGATION_ORBIT: {
 			real_t speed_multiplier = MIN(delta.length() / (get_size().x), 3.0);
-			real_t speed = viewport->view_3d_controller->get_freelook_speed() * speed_multiplier;
-			viewport->view_3d_controller->cursor_orbit(nullptr, delta_normalized * speed);
+			real_t speed = viewport->freelook_speed * speed_multiplier;
+			viewport->_nav_orbit(nullptr, delta_normalized * speed);
 		} break;
-		case View3DController::NAV_MODE_NONE: {
+		case Node3DEditorViewport::NAVIGATION_NONE: {
 		} break;
 	}
 }
 
-void ViewportNavigationControl::set_navigation_mode(View3DController::NavigationMode p_nav_mode) {
+void ViewportNavigationControl::set_navigation_mode(Node3DEditorViewport::NavigationMode p_nav_mode) {
 	nav_mode = p_nav_mode;
 }
 
@@ -404,7 +398,7 @@ void ViewportRotationControl::_draw_axis(const Axis2D &p_axis) {
 void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) {
 	const Vector2 center = get_size() / 2.0;
 	const real_t radius = get_size().x / 2.0 - AXIS_CIRCLE_RADIUS - 2.0 * EDSCALE;
-	const Basis camera_basis = viewport->view_3d_controller->to_camera_transform().get_basis().inverse();
+	const Basis camera_basis = viewport->to_camera_transform(viewport->cursor).get_basis().inverse();
 
 	for (int i = 0; i < 3; ++i) {
 		Vector3 axis_3d = camera_basis.get_column(i);
@@ -453,8 +447,8 @@ void ViewportRotationControl::_process_click(int p_index, Vector2 p_position, bo
 			_update_focus();
 		}
 		orbiting_index = -1;
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			Input::get_singleton()->warp_mouse(orbiting_mouse_start);
 		}
 	}
@@ -464,12 +458,12 @@ void ViewportRotationControl::_process_drag(Ref<InputEventWithModifiers> p_event
 	Point2 mouse_pos = get_local_mouse_position();
 	const bool movement_threshold_passed = original_mouse_pos.distance_to(mouse_pos) > 4 * EDSCALE;
 	if (orbiting_index == p_index && gizmo_activated && movement_threshold_passed) {
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_VISIBLE) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_VISIBLE) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 			orbiting_mouse_start = p_position;
-			saved_cursor = viewport->view_3d_controller->cursor;
+			viewport->previous_cursor = viewport->cursor;
 		}
-		viewport->view_3d_controller->cursor_orbit(p_event, p_relative_position);
+		viewport->_nav_orbit(p_event, p_relative_position);
 		focused_axis = -1;
 	} else {
 		_update_focus();
@@ -483,10 +477,10 @@ void ViewportRotationControl::gui_input(const Ref<InputEvent> &p_event) {
 	const Ref<InputEventKey> k = p_event;
 
 	if (k.is_valid() && k->is_action_pressed(SNAME("ui_cancel"), false, true)) {
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			Input::get_singleton()->warp_mouse(orbiting_mouse_start);
-			viewport->view_3d_controller->cursor = saved_cursor;
+			viewport->cursor = viewport->previous_cursor;
 			gizmo_activated = false;
 		}
 	}
@@ -502,10 +496,10 @@ void ViewportRotationControl::gui_input(const Ref<InputEvent> &p_event) {
 				grab_focus();
 			}
 		} else if (mb->get_button_index() == MouseButton::RIGHT) {
-			if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
-				Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+			if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
+				Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 				Input::get_singleton()->warp_mouse(orbiting_mouse_start);
-				viewport->view_3d_controller->cursor = saved_cursor;
+				viewport->cursor = viewport->previous_cursor;
 				gizmo_activated = false;
 			}
 		}
@@ -513,7 +507,7 @@ void ViewportRotationControl::gui_input(const Ref<InputEvent> &p_event) {
 
 	const Ref<InputEventMouseMotion> mm = p_event;
 	if (mm.is_valid()) {
-		_process_drag(mm, 100, mm->get_global_position(), viewport->view_3d_controller->get_warped_mouse_motion(mm, viewport->surface->get_global_rect()));
+		_process_drag(mm, 100, mm->get_global_position(), viewport->_get_warped_mouse_motion(mm));
 	}
 
 	// Touch events
@@ -559,9 +553,9 @@ void ViewportRotationControl::set_viewport(Node3DEditorViewport *p_viewport) {
 void Node3DEditorViewport::_view_settings_confirmed(real_t p_interp_delta) {
 	// Set FOV override multiplier back to the default, so that the FOV
 	// setting specified in the View menu is correctly applied.
-	view_3d_controller->cursor.fov_scale = 1.0;
+	cursor.fov_scale = 1.0;
 
-	view_3d_controller->update_camera(p_interp_delta);
+	_update_camera(p_interp_delta);
 }
 
 void Node3DEditorViewport::_update_navigation_controls_visibility() {
@@ -574,7 +568,112 @@ void Node3DEditorViewport::_update_navigation_controls_visibility() {
 }
 
 bool Node3DEditorViewport::_is_rotation_arc_visible() const {
-	return _edit.mode == TRANSFORM_ROTATE && !Math::is_zero_approx(_edit.accumulated_rotation_angle) && _edit.gizmo_initiated;
+	return _edit.mode == TRANSFORM_ROTATE && _edit.accumulated_rotation_angle != 0.0 && _edit.gizmo_initiated;
+}
+
+void Node3DEditorViewport::_update_camera(real_t p_interp_delta) {
+	bool is_orthogonal = camera->get_projection() == Camera3D::PROJECTION_ORTHOGONAL;
+
+	Cursor old_camera_cursor = camera_cursor;
+	camera_cursor = cursor;
+
+	if (p_interp_delta > 0) {
+		//-------
+		// Perform smoothing
+
+		if (is_freelook_active()) {
+			// Higher inertia should increase "lag" (lerp with factor between 0 and 1)
+			// Inertia of zero should produce instant movement (lerp with factor of 1) in this case it returns a really high value and gets clamped to 1.
+			const real_t inertia = EDITOR_GET("editors/3d/freelook/freelook_inertia");
+			real_t factor = (1.0 / inertia) * p_interp_delta;
+
+			// We interpolate a different point here, because in freelook mode the focus point (cursor.pos) orbits around eye_pos
+			camera_cursor.eye_pos = old_camera_cursor.eye_pos.lerp(cursor.eye_pos, CLAMP(factor, 0, 1));
+
+			const real_t orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
+			camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
+			camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
+
+			if (Math::abs(camera_cursor.x_rot - cursor.x_rot) < 0.1) {
+				camera_cursor.x_rot = cursor.x_rot;
+			}
+
+			if (Math::abs(camera_cursor.y_rot - cursor.y_rot) < 0.1) {
+				camera_cursor.y_rot = cursor.y_rot;
+			}
+
+			Vector3 forward = to_camera_transform(camera_cursor).basis.xform(Vector3(0, 0, -1));
+			camera_cursor.pos = camera_cursor.eye_pos + forward * camera_cursor.distance;
+
+		} else {
+			const real_t orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
+			const real_t translation_inertia = EDITOR_GET("editors/3d/navigation_feel/translation_inertia");
+			const real_t zoom_inertia = EDITOR_GET("editors/3d/navigation_feel/zoom_inertia");
+
+			camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
+			camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
+
+			if (Math::abs(camera_cursor.x_rot - cursor.x_rot) < 0.1) {
+				camera_cursor.x_rot = cursor.x_rot;
+			}
+
+			if (Math::abs(camera_cursor.y_rot - cursor.y_rot) < 0.1) {
+				camera_cursor.y_rot = cursor.y_rot;
+			}
+
+			camera_cursor.pos = old_camera_cursor.pos.lerp(cursor.pos, MIN(1.f, p_interp_delta * (1 / translation_inertia)));
+			camera_cursor.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN((real_t)1.0, p_interp_delta * (1 / zoom_inertia)));
+		}
+	}
+
+	//-------
+	// Apply camera transform
+
+	real_t tolerance = 0.001;
+	bool equal = true;
+	if (!Math::is_equal_approx(old_camera_cursor.x_rot, camera_cursor.x_rot, tolerance) || !Math::is_equal_approx(old_camera_cursor.y_rot, camera_cursor.y_rot, tolerance)) {
+		equal = false;
+	} else if (!old_camera_cursor.pos.is_equal_approx(camera_cursor.pos)) {
+		equal = false;
+	} else if (!Math::is_equal_approx(old_camera_cursor.distance, camera_cursor.distance, tolerance)) {
+		equal = false;
+	} else if (!Math::is_equal_approx(old_camera_cursor.fov_scale, camera_cursor.fov_scale, tolerance)) {
+		equal = false;
+	}
+
+	if (!equal || p_interp_delta == 0 || is_orthogonal != orthogonal) {
+		last_camera_transform = to_camera_transform(camera_cursor);
+		camera->set_global_transform(last_camera_transform);
+
+		if (orthogonal) {
+			float half_fov = Math::deg_to_rad(get_fov()) / 2.0;
+			float height = 2.0 * cursor.distance * Math::tan(half_fov);
+			camera->set_orthogonal(height, get_znear(), get_zfar());
+		} else {
+			camera->set_perspective(get_fov(), get_znear(), get_zfar());
+		}
+
+		update_transform_gizmo_view();
+		rotation_control->queue_redraw();
+		position_control->queue_redraw();
+		look_control->queue_redraw();
+		spatial_editor->update_grid();
+	}
+}
+
+Transform3D Node3DEditorViewport::to_camera_transform(const Cursor &p_cursor) const {
+	Transform3D camera_transform;
+	camera_transform.translate_local(p_cursor.pos);
+	camera_transform.basis.rotate(Vector3(1, 0, 0), -p_cursor.x_rot);
+	camera_transform.basis.rotate(Vector3(0, 1, 0), -p_cursor.y_rot);
+
+	if (orthogonal) {
+		camera_transform.translate_local(0, 0, (get_zfar() - get_znear()) / 2.0);
+	} else {
+		camera_transform.translate_local(0, 0, p_cursor.distance);
+	}
+
+	return camera_transform;
 }
 
 int Node3DEditorViewport::get_selected_count() const {
@@ -628,10 +727,6 @@ void Node3DEditorViewport::cancel_transform() {
 		sp->set_global_transform(se->original);
 	}
 
-	for (const KeyValue<Node3D *, Transform3D> &pair : _edit.children_original_globals) {
-		pair.key->set_global_transform(pair.value);
-	}
-
 	collision_reposition = false;
 	finish_transform();
 	set_message(TTRC("Transform Aborted."), 3);
@@ -652,7 +747,7 @@ float Node3DEditorViewport::get_zfar() const {
 }
 
 float Node3DEditorViewport::get_fov() const {
-	return CLAMP(spatial_editor->get_fov() * view_3d_controller->cursor.fov_scale, MIN_FOV, MAX_FOV);
+	return CLAMP(spatial_editor->get_fov() * cursor.fov_scale, MIN_FOV, MAX_FOV);
 }
 
 Transform3D Node3DEditorViewport::_get_camera_transform() const {
@@ -680,10 +775,6 @@ Vector3 Node3DEditorViewport::get_ray(const Vector2 &p_pos) const {
 }
 
 void Node3DEditorViewport::_clear_selected() {
-	if (previewing) {
-		return;
-	}
-
 	_edit.gizmo = Ref<EditorNode3DGizmo>();
 	_edit.gizmo_handle = -1;
 	_edit.gizmo_handle_secondary = false;
@@ -704,11 +795,6 @@ void Node3DEditorViewport::_clear_selected() {
 }
 
 void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
-	if (previewing) {
-		clicked = ObjectID();
-		return;
-	}
-
 	Node *node = ObjectDB::get_instance<Node3D>(clicked);
 	Node3D *selected = Object::cast_to<Node3D>(node);
 	clicked = ObjectID();
@@ -834,280 +920,6 @@ ObjectID Node3DEditorViewport::_select_ray(const Point2 &p_pos) const {
 	return closest;
 }
 
-float Node3DEditorViewport::_min_screen_dist_to_aabb(const AABB &p_aabb, const Transform3D &p_transform, const Point2 &p_cursor) const {
-	Vector3 first_corner = p_transform.xform(p_aabb.get_endpoint(0));
-	if (camera->is_position_behind(first_corner)) {
-		return 0.0f;
-	}
-	Point2 screen_min = camera->unproject_position(first_corner);
-	Point2 screen_max = screen_min;
-
-	for (int i = 1; i < 8; i++) {
-		Vector3 world_corner = p_transform.xform(p_aabb.get_endpoint(i));
-		if (camera->is_position_behind(world_corner)) {
-			return 0.0f;
-		}
-		Point2 s = camera->unproject_position(world_corner);
-		screen_min = screen_min.min(s);
-		screen_max = screen_max.max(s);
-	}
-
-	float dx = MAX(screen_min.x - p_cursor.x, MAX(0.0f, p_cursor.x - screen_max.x));
-	float dy = MAX(screen_min.y - p_cursor.y, MAX(0.0f, p_cursor.y - screen_max.y));
-	return Math::sqrt(dx * dx + dy * dy);
-}
-
-bool Node3DEditorViewport::_find_closest_vertex_on_node(const Point2 &p_screen_pos, Node3D *p_node, float &r_closest_screen_dist, Vector3 &r_vertex_world) const {
-	bool found = false;
-
-	Transform3D gt = p_node->get_global_transform();
-	Vector<Ref<Node3DGizmo>> gizmos = p_node->get_gizmos();
-
-	for (int i = 0; i < gizmos.size(); i++) {
-		Ref<EditorNode3DGizmo> seg = gizmos[i];
-		if (seg.is_null()) {
-			continue;
-		}
-
-		const LocalVector<Ref<TriangleMesh>> &meshes = seg->get_collision_meshes();
-		for (const Ref<TriangleMesh> &tm : meshes) {
-			if (tm.is_null() || !tm->is_valid()) {
-				continue;
-			}
-
-			const Vector<TriangleMesh::BVH> &bvh = tm->get_bvh();
-			const Vector<TriangleMesh::Triangle> &triangles = tm->get_triangles();
-			const Vector<Vector3> &vertices = tm->get_vertices();
-
-			if (bvh.is_empty()) {
-				continue;
-			}
-
-			// Traverse the TriangleMesh BVH, pruning branches whose screen-space
-			// AABB is farther than the current best.
-			LocalVector<int> stack;
-			stack.push_back(bvh.size() - 1);
-
-			while (!stack.is_empty()) {
-				int node_idx = stack[stack.size() - 1];
-				stack.resize(stack.size() - 1);
-
-				const TriangleMesh::BVH &b = bvh[node_idx];
-
-				if (_min_screen_dist_to_aabb(b.aabb, gt, p_screen_pos) >= r_closest_screen_dist) {
-					continue;
-				}
-
-				if (b.face_index >= 0) {
-					const TriangleMesh::Triangle &tri = triangles[b.face_index];
-					for (int vi = 0; vi < 3; vi++) {
-						Vector3 world_v = gt.xform(vertices[tri.indices[vi]]);
-						if (camera->is_position_behind(world_v)) {
-							continue;
-						}
-						Vector2 screen_v = camera->unproject_position(world_v);
-						float dist = screen_v.distance_to(p_screen_pos);
-						if (dist < r_closest_screen_dist) {
-							r_closest_screen_dist = dist;
-							r_vertex_world = world_v;
-							found = true;
-						}
-					}
-				} else {
-					stack.push_back(b.left);
-					stack.push_back(b.right);
-				}
-			}
-		}
-	}
-
-	return found;
-}
-
-bool Node3DEditorViewport::_find_closest_vertex_in_scene(const Point2 &p_screen_pos, float p_threshold, Vector3 &r_vertex_world, const HashMap<ObjectID, Vector3> *p_exclude) {
-	float closest_screen_dist = p_threshold;
-	bool found = false;
-
-	Point2 min_pos(p_screen_pos.x - p_threshold, p_screen_pos.y - p_threshold);
-	Point2 max_pos(p_screen_pos.x + p_threshold, p_screen_pos.y + p_threshold);
-	Vector<Node3D *> nodes_with_gizmos = Node3DEditor::get_singleton()->gizmo_bvh_frustum_query(_build_screen_frustum(min_pos, max_pos));
-
-	for (Node3D *spat : nodes_with_gizmos) {
-		if (!spat) {
-			continue;
-		}
-
-		if (!Object::cast_to<GeometryInstance3D>(spat)) {
-			continue;
-		}
-
-		if (p_exclude) {
-			bool should_skip = false;
-			Node *current = spat;
-			while (current) {
-				if (p_exclude->has(current->get_instance_id())) {
-					should_skip = true;
-					break;
-				}
-				current = current->get_parent();
-			}
-			if (should_skip) {
-				continue;
-			}
-		}
-
-		if (_find_closest_vertex_on_node(p_screen_pos, spat, closest_screen_dist, r_vertex_world)) {
-			found = true;
-		}
-	}
-
-	return found;
-}
-
-void Node3DEditorViewport::_vertex_snap_commit() {
-	for (const KeyValue<ObjectID, Vector3> &E : vertex_snap_original_positions) {
-		Node3D *node = ObjectDB::get_instance<Node3D>(E.key);
-		if (node) {
-			vertex_snap_source += node->get_global_position() - E.value;
-			break;
-		}
-	}
-
-	HashMap<ObjectID, Vector3> original_positions;
-	for (const KeyValue<ObjectID, Vector3> &E : vertex_snap_original_positions) {
-		original_positions[E.key] = E.value;
-	}
-	vertex_snap_dragging = false;
-	vertex_snap_has_target = false;
-	vertex_snap_original_positions.clear();
-	if (!vertex_snap_mode) {
-		vertex_snap_has_source = false;
-		set_message("");
-	}
-	surface->queue_redraw();
-
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("Vertex Snap"));
-	for (const KeyValue<ObjectID, Vector3> &E : original_positions) {
-		Node3D *node = ObjectDB::get_instance<Node3D>(E.key);
-		if (node) {
-			undo_redo->add_do_method(node, "set_global_position", node->get_global_position());
-			undo_redo->add_undo_method(node, "set_global_position", E.value);
-		}
-	}
-	undo_redo->commit_action(false);
-	_reset_follow_mode_count();
-}
-
-void Node3DEditorViewport::_vertex_snap_cancel() {
-	vertex_snap_mode = false;
-	vertex_snap_keycode = Key::NONE;
-	vertex_snap_dragging = false;
-	vertex_snap_has_source = false;
-	vertex_snap_has_target = false;
-
-	for (const KeyValue<ObjectID, Vector3> &E : vertex_snap_original_positions) {
-		Node3D *node = ObjectDB::get_instance<Node3D>(E.key);
-		if (node) {
-			node->set_global_position(E.value);
-		}
-	}
-	vertex_snap_original_positions.clear();
-	set_message(TTR("Vertex Snap Canceled."), 3);
-	surface->queue_redraw();
-}
-
-bool Node3DEditorViewport::_is_vertex_occluded(const Vector3 &p_world_pos, const Vector2 &p_screen_pos) const {
-	Vector3 ray_pos = get_ray_pos(p_screen_pos);
-	float vertex_dist = ray_pos.distance_to(p_world_pos);
-	Vector<Node3D *> hits = Node3DEditor::get_singleton()->gizmo_bvh_ray_query(ray_pos, ray_pos + get_ray(p_screen_pos) * camera->get_far());
-	for (Node3D *spat : hits) {
-		if (!spat) {
-			continue;
-		}
-		Vector<Ref<Node3DGizmo>> gizmos = spat->get_gizmos();
-		for (int i = 0; i < gizmos.size(); i++) {
-			Ref<EditorNode3DGizmo> seg = gizmos[i];
-			if (seg.is_null()) {
-				continue;
-			}
-			Vector3 point, normal;
-			if (seg->intersect_ray(camera, p_screen_pos, point, normal)) {
-				if (ray_pos.distance_to(point) < vertex_dist - 0.01f) {
-					return true;
-				}
-			}
-		}
-	}
-	return false;
-}
-
-static bool _node_has_geometry(Node *p_node) {
-	if (Object::cast_to<GeometryInstance3D>(p_node)) {
-		return true;
-	}
-	for (int i = 0; i < p_node->get_child_count(); i++) {
-		if (_node_has_geometry(p_node->get_child(i))) {
-			return true;
-		}
-	}
-	return false;
-}
-
-void Node3DEditorViewport::_vertex_snap_update_source(const Point2 &p_screen_pos) {
-	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-	if (selection.is_empty()) {
-		vertex_snap_has_source = false;
-		return;
-	}
-
-	float threshold = VERTEX_SNAP_THRESHOLD * EDSCALE;
-	Vector3 vw;
-	bool found = false;
-
-	if (spatial_editor->is_vertex_snap_origin_mode()) {
-		found = _find_closest_vertex_in_scene(p_screen_pos, threshold, vw);
-	} else {
-		bool selection_has_geometry = false;
-		for (Node *E : selection) {
-			Node3D *sp = Object::cast_to<Node3D>(E);
-			if (!sp) {
-				continue;
-			}
-
-			LocalVector<Node3D *> descendants;
-			descendants.push_back(sp);
-			while (!descendants.is_empty()) {
-				Node3D *node = descendants[descendants.size() - 1];
-				descendants.resize(descendants.size() - 1);
-				if (Object::cast_to<GeometryInstance3D>(node)) {
-					selection_has_geometry = true;
-				}
-				if (_find_closest_vertex_on_node(p_screen_pos, node, threshold, vw)) {
-					found = true;
-				}
-				for (int i = 0; i < node->get_child_count(); i++) {
-					Node3D *child = Object::cast_to<Node3D>(node->get_child(i));
-					if (child) {
-						descendants.push_back(child);
-					}
-				}
-			}
-		}
-
-		if (!found && !selection_has_geometry) {
-			found = _find_closest_vertex_in_scene(p_screen_pos, threshold, vw);
-		}
-	}
-
-	if (found) {
-		vertex_snap_source = vw;
-		vertex_snap_has_source = true;
-	} else {
-		vertex_snap_has_source = false;
-	}
-}
-
 void Node3DEditorViewport::_find_items_at_pos(const Point2 &p_pos, Vector<_RayResult> &r_results, bool p_include_locked_nodes) {
 	Vector3 ray = get_ray(p_pos);
 	Vector3 pos = get_ray_pos(p_pos);
@@ -1167,7 +979,7 @@ void Node3DEditorViewport::_find_items_at_pos(const Point2 &p_pos, Vector<_RayRe
 
 Vector3 Node3DEditorViewport::_get_screen_to_space(const Vector3 &p_vector3) {
 	Projection cm;
-	if (view_3d_controller->is_orthogonal()) {
+	if (orthogonal) {
 		cm.set_orthogonal(camera->get_size(), get_size().aspect(), get_znear() + p_vector3.z, get_zfar());
 	} else {
 		cm.set_perspective(get_fov(), get_size().aspect(), get_znear() + p_vector3.z, get_zfar());
@@ -1175,56 +987,64 @@ Vector3 Node3DEditorViewport::_get_screen_to_space(const Vector3 &p_vector3) {
 	Vector2 screen_he = cm.get_viewport_half_extents();
 
 	Transform3D camera_transform;
-	camera_transform.translate_local(view_3d_controller->cursor.pos);
-	camera_transform.basis.rotate(Vector3(1, 0, 0), -view_3d_controller->cursor.x_rot);
-	camera_transform.basis.rotate(Vector3(0, 1, 0), -view_3d_controller->cursor.y_rot);
-	camera_transform.translate_local(0, 0, view_3d_controller->cursor.distance);
+	camera_transform.translate_local(cursor.pos);
+	camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
+	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
+	camera_transform.translate_local(0, 0, cursor.distance);
 
 	return camera_transform.xform(Vector3(((p_vector3.x / get_size().width) * 2.0 - 1.0) * screen_he.x, ((1.0 - (p_vector3.y / get_size().height)) * 2.0 - 1.0) * screen_he.y, -(get_znear() + p_vector3.z)));
 }
 
-Vector<Plane> Node3DEditorViewport::_build_screen_frustum(const Point2 &p_min, const Point2 &p_max) {
+void Node3DEditorViewport::_select_region() {
+	if (cursor.region_begin == cursor.region_end) {
+		if (!clicked_wants_append) {
+			_clear_selected();
+		}
+		return; //nothing really
+	}
+
 	const real_t z_offset = MAX(0.0, 5.0 - get_znear());
+
 	Vector3 box[4] = {
-		Vector3(p_min.x, p_min.y, z_offset),
-		Vector3(p_max.x, p_min.y, z_offset),
-		Vector3(p_max.x, p_max.y, z_offset),
-		Vector3(p_min.x, p_max.y, z_offset),
+		Vector3(
+				MIN(cursor.region_begin.x, cursor.region_end.x),
+				MIN(cursor.region_begin.y, cursor.region_end.y),
+				z_offset),
+		Vector3(
+				MAX(cursor.region_begin.x, cursor.region_end.x),
+				MIN(cursor.region_begin.y, cursor.region_end.y),
+				z_offset),
+		Vector3(
+				MAX(cursor.region_begin.x, cursor.region_end.x),
+				MAX(cursor.region_begin.y, cursor.region_end.y),
+				z_offset),
+		Vector3(
+				MIN(cursor.region_begin.x, cursor.region_end.x),
+				MAX(cursor.region_begin.y, cursor.region_end.y),
+				z_offset)
 	};
 
 	Vector<Plane> frustum;
+
 	Vector3 cam_pos = _get_camera_position();
+
 	for (int i = 0; i < 4; i++) {
 		Vector3 a = _get_screen_to_space(box[i]);
 		Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
-		if (view_3d_controller->is_orthogonal()) {
+		if (orthogonal) {
 			frustum.push_back(Plane((a - b).normalized(), a));
 		} else {
 			frustum.push_back(Plane(a, b, cam_pos));
 		}
 	}
+
 	Plane near_plane = Plane(-_get_camera_normal(), cam_pos);
 	near_plane.d -= get_znear();
 	frustum.push_back(near_plane);
+
 	Plane far_plane = -near_plane;
 	far_plane.d += get_zfar();
 	frustum.push_back(far_plane);
-	return frustum;
-}
-
-void Node3DEditorViewport::_select_region() {
-	View3DController::Cursor cursor = view_3d_controller->cursor;
-
-	if (cursor.region_begin == cursor.region_end) {
-		if (!clicked_wants_append) {
-			_clear_selected();
-		}
-		return;
-	}
-
-	Point2 region_min = cursor.region_begin.min(cursor.region_end);
-	Point2 region_max = cursor.region_begin.max(cursor.region_end);
-	Vector<Plane> frustum = _build_screen_frustum(region_min, region_max);
 
 	if (spatial_editor->get_single_selected_node()) {
 		Node3D *single_selected = spatial_editor->get_single_selected_node();
@@ -1364,18 +1184,67 @@ void Node3DEditorViewport::_select_region() {
 	}
 }
 
-void Node3DEditorViewport::_view_state_changed() {
-	if (view_3d_controller->get_orthogonal_mode() == View3DController::ORTHOGONAL_AUTO) {
-		_menu_option(VIEW_ORTHOGONAL);
-		view_3d_controller->force_auto_orthogonal();
-	} else if (view_3d_controller->get_orthogonal_mode() == View3DController::ORTHOGONAL_DISABLED) {
-		_menu_option(VIEW_PERSPECTIVE);
-	}
-	_update_name();
-}
-
 void Node3DEditorViewport::_update_name() {
-	view_display_menu->set_text(view_3d_controller->get_view_type_name());
+	String name;
+
+	switch (view_type) {
+		case VIEW_TYPE_USER: {
+			if (orthogonal) {
+				name = TTR("Orthogonal");
+			} else {
+				name = TTR("Perspective");
+			}
+		} break;
+		case VIEW_TYPE_TOP: {
+			if (orthogonal) {
+				name = TTR("Top Orthogonal");
+			} else {
+				name = TTR("Top Perspective");
+			}
+		} break;
+		case VIEW_TYPE_BOTTOM: {
+			if (orthogonal) {
+				name = TTR("Bottom Orthogonal");
+			} else {
+				name = TTR("Bottom Perspective");
+			}
+		} break;
+		case VIEW_TYPE_LEFT: {
+			if (orthogonal) {
+				name = TTR("Left Orthogonal");
+			} else {
+				name = TTR("Left Perspective");
+			}
+		} break;
+		case VIEW_TYPE_RIGHT: {
+			if (orthogonal) {
+				name = TTR("Right Orthogonal");
+			} else {
+				name = TTR("Right Perspective");
+			}
+		} break;
+		case VIEW_TYPE_FRONT: {
+			if (orthogonal) {
+				name = TTR("Front Orthogonal");
+			} else {
+				name = TTR("Front Perspective");
+			}
+		} break;
+		case VIEW_TYPE_REAR: {
+			if (orthogonal) {
+				name = TTR("Rear Orthogonal");
+			} else {
+				name = TTR("Rear Perspective");
+			}
+		} break;
+	}
+
+	if (orthogonal && auto_orthogonal) {
+		// TRANSLATORS: This will be appended to the view name when Auto Orthogonal is enabled.
+		name += " " + TTR("[auto]");
+	}
+
+	view_display_menu->set_text(name);
 	view_display_menu->reset_size();
 }
 
@@ -1416,24 +1285,6 @@ void Node3DEditorViewport::_compute_edit(const Point2 &p_point) {
 			sel_item->original = sel_item->sp->get_global_gizmo_transform();
 		}
 	}
-
-	if (spatial_editor->is_preserve_children_transform_enabled() && _edit.children_original_globals.is_empty()) {
-		const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-		for (Node *E : selection) {
-			Node3D *sp = Object::cast_to<Node3D>(E);
-			if (!sp) {
-				continue;
-			}
-
-			int child_count = sp->get_child_count();
-			for (int i = 0; i < child_count; i++) {
-				Node3D *child = Object::cast_to<Node3D>(sp->get_child(i));
-				if (child) {
-					_edit.children_original_globals[child] = child->get_global_transform();
-				}
-			}
-		}
-	}
 }
 
 static Key _get_key_modifier_setting(const String &p_property) {
@@ -1553,7 +1404,6 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
 	if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE) {
 		int col_axis = -1;
 		bool view_rotation_selected = false;
-		bool trackball_selected = false;
 
 		Vector3 hit_position;
 		Vector3 hit_normal;
@@ -1599,47 +1449,28 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
 			Vector3 closest_point_on_ray = ray_pos + ray * ray_length_to_center;
 			real_t distance_ray_to_center = closest_point_on_ray.distance_to(gt.origin);
 
-			real_t view_rotation_radius = gizmo_scale * spatial_editor->gizmo_view_rotation_scale;
+			real_t view_rotation_radius = gizmo_scale * GIZMO_VIEW_ROTATION_SIZE;
 			real_t circumference_tolerance = gizmo_scale * GIZMO_RING_HALF_WIDTH;
 
 			if (Math::abs(distance_ray_to_center - view_rotation_radius) < circumference_tolerance &&
 					ray_length_to_center > 0) {
 				view_rotation_selected = true;
-			} else if (spatial_editor->is_trackball_enabled() && distance_ray_to_center < gizmo_scale * (GIZMO_CIRCLE_SIZE - GIZMO_RING_HALF_WIDTH) && ray_length_to_center > 0) {
-				trackball_selected = true;
 			}
 		}
 
 		if (view_rotation_selected) {
 			if (p_highlight_only) {
-				spatial_editor->select_gizmo_highlight_axis(GIZMO_HIGHLIGHT_AXIS_VIEW_ROTATION);
+				spatial_editor->select_gizmo_highlight_axis(15);
 			} else {
 				_edit.mode = TRANSFORM_ROTATE;
 				_compute_edit(p_screenpos);
 				_edit.plane = TRANSFORM_VIEW;
 				_edit.accumulated_rotation_angle = 0.0;
-				_edit.rotation_angle = 0.0;
 				_edit.rotation_axis = _get_camera_normal();
 				_edit.view_axis_local = spatial_editor->get_gizmo_transform().basis.xform_inv(_get_camera_normal()).normalized();
 				_edit.gizmo_initiated = true;
 			}
 			return true;
-		} else if (trackball_selected) {
-			if (p_highlight_only) {
-				spatial_editor->select_gizmo_highlight_axis(GIZMO_HIGHLIGHT_AXIS_TRACKBALL);
-			} else {
-				_edit.mode = TRANSFORM_ROTATE;
-				_compute_edit(p_screenpos);
-				_edit.plane = TRANSFORM_VIEW;
-				_edit.is_trackball = true;
-				_edit.show_rotation_line = false;
-				_edit.accumulated_rotation_angle = 0.0;
-				_edit.rotation_angle = 0.0;
-				_edit.rotation_axis = _get_camera_normal();
-				_edit.gizmo_initiated = true;
-				spatial_editor->select_gizmo_highlight_axis(-1);
-			}
-			return true;
 		} else if (col_axis != -1) {
 			if (p_highlight_only) {
 				spatial_editor->select_gizmo_highlight_axis(col_axis + 3);
@@ -1649,7 +1480,6 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
 				_compute_edit(p_screenpos);
 				_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis);
 				_edit.accumulated_rotation_angle = 0.0;
-				_edit.rotation_angle = 0.0;
 				_edit.rotation_axis = gt.basis.get_column(col_axis).normalized();
 				_edit.gizmo_initiated = true;
 			}
@@ -1735,39 +1565,17 @@ void Node3DEditorViewport::_transform_gizmo_apply(Node3D *p_node, const Transfor
 		return;
 	}
 
-	bool preserve_children = spatial_editor->is_preserve_children_transform_enabled();
-
-	Vector<Transform3D> children_global_transforms;
-	Vector<Node3D *> node3d_children;
-
-	if (preserve_children) {
-		int child_count = p_node->get_child_count();
-		for (int i = 0; i < child_count; i++) {
-			Node3D *child = Object::cast_to<Node3D>(p_node->get_child(i));
-			if (child) {
-				children_global_transforms.push_back(child->get_global_transform());
-				node3d_children.push_back(child);
-			}
-		}
-	}
-
 	if (p_local) {
 		p_node->set_transform(p_transform);
 	} else {
 		p_node->set_global_transform(p_transform);
 	}
-
-	if (preserve_children) {
-		for (int i = 0; i < node3d_children.size(); i++) {
-			node3d_children[i]->set_global_transform(children_global_transforms[i]);
-		}
-	}
 }
 
 Transform3D Node3DEditorViewport::_compute_transform(TransformMode p_mode, const Transform3D &p_original, const Transform3D &p_original_local, Vector3 p_motion, double p_extra, bool p_local, bool p_orthogonal, bool p_view_axis) {
 	switch (p_mode) {
 		case TRANSFORM_SCALE: {
-			if (spatial_editor->is_snap_enabled()) {
+			if (_edit.snap || spatial_editor->is_snap_enabled()) {
 				p_motion.snapf(p_extra);
 			}
 			Transform3D s;
@@ -1788,7 +1596,7 @@ Transform3D Node3DEditorViewport::_compute_transform(TransformMode p_mode, const
 			return s;
 		}
 		case TRANSFORM_TRANSLATE: {
-			if (spatial_editor->is_snap_enabled()) {
+			if (_edit.snap || spatial_editor->is_snap_enabled()) {
 				p_motion.snapf(p_extra);
 			}
 
@@ -1858,7 +1666,7 @@ void Node3DEditorViewport::_reset_transform(TransformType p_type) {
 }
 
 void Node3DEditorViewport::_surface_mouse_enter() {
-	if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
+	if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
 		return;
 	}
 
@@ -1923,7 +1731,6 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 	} else if (!selection_results.is_empty()) {
 		NodePath root_path = get_tree()->get_edited_scene_root()->get_path();
 		StringName root_name = root_path.get_name(root_path.get_name_count() - 1);
-		int icon_max_width = EditorNode::get_singleton()->get_editor_theme()->get_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 
 		for (int i = 0; i < selection_results.size(); i++) {
 			Node3D *spat = selection_results[i];
@@ -1956,7 +1763,6 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 			}
 			selection_menu->add_item((String)spat->get_name() + suffix);
 			selection_menu->set_item_icon(i, icon);
-			selection_menu->set_item_icon_max_width(i, icon_max_width);
 			selection_menu->set_item_metadata(i, node_path);
 			selection_menu->set_item_tooltip(i, String(spat->get_name()) + "\nType: " + spat->get_class() + "\nPath: " + node_path);
 		}
@@ -1970,7 +1776,7 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 
 // Helper function to redirect mouse events to the active freelook viewport
 static bool _redirect_freelook_input(const Ref<InputEvent> &p_event, Node3DEditorViewport *p_exclude_viewport = nullptr) {
-	if (Input::get_singleton()->get_mouse_mode() != Input::MouseMode::MOUSE_MODE_CAPTURED) {
+	if (Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED) {
 		return false;
 	}
 
@@ -2002,7 +1808,7 @@ void Node3DEditorViewport::input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseMotion> m = p_event;
 
 	if (m.is_valid()) {
-		_edit.mouse_pos += view_3d_controller->get_warped_mouse_motion(p_event, surface->get_global_rect());
+		_edit.mouse_pos += _get_warped_mouse_motion(p_event);
 		update_transform(_get_key_modifier(m) == Key::SHIFT);
 	}
 }
@@ -2017,116 +1823,15 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 	}
 
-	if (get_viewport()->gui_get_drag_data()) {
-		// Disable all input actions during drag-and-drop.
+	if (previewing || get_viewport()->gui_get_drag_data()) {
+		// Disable all input actions when previewing a camera or during drag-and-drop.
 		return;
 	}
 
-	if (k.is_valid()) {
-		if (!vertex_snap_mode && !vertex_snap_dragging && k->is_pressed() && _edit.mode == TRANSFORM_NONE && ED_IS_SHORTCUT("spatial_editor/vertex_snap", p_event)) {
-			vertex_snap_mode = true;
-			vertex_snap_keycode = k->get_physical_keycode() != Key::NONE ? k->get_physical_keycode() : k->get_keycode();
-			_disable_follow_mode();
-			set_message(TTR("Vertex Snap"));
-			_vertex_snap_update_source(_edit.mouse_pos);
-			surface->queue_redraw();
-		} else if (vertex_snap_mode && !k->is_pressed() && k->get_physical_keycode() == vertex_snap_keycode) {
-			vertex_snap_mode = false;
-			vertex_snap_keycode = Key::NONE;
-			if (!vertex_snap_dragging) {
-				vertex_snap_has_source = false;
-				vertex_snap_has_target = false;
-				set_message("");
-				surface->queue_redraw();
-			}
-		} else if ((vertex_snap_mode || vertex_snap_dragging) && k->is_pressed() && k->get_keycode() == Key::ESCAPE) {
-			if (vertex_snap_dragging) {
-				_vertex_snap_cancel();
-			} else {
-				vertex_snap_has_source = false;
-				surface->queue_redraw();
-			}
-			vertex_snap_mode = false;
-			vertex_snap_keycode = Key::NONE;
-			set_message("");
-			return;
-		}
-	}
-
 	if (_redirect_freelook_input(p_event, this)) {
 		return;
 	}
 
-	{
-		Ref<InputEventMouseButton> vb = p_event;
-		if ((vertex_snap_mode || vertex_snap_dragging) && vb.is_valid()) {
-			if (vb->get_button_index() == MouseButton::RIGHT && vb->is_pressed() && vertex_snap_dragging) {
-				_vertex_snap_cancel();
-				return;
-			}
-			if (vb->get_button_index() == MouseButton::LEFT) {
-				if (vb->is_pressed()) {
-					const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-					bool use_origin_snap = spatial_editor->is_vertex_snap_origin_mode();
-
-					if (!use_origin_snap) {
-						bool has_geometry = false;
-						for (Node *E : selection) {
-							if (_node_has_geometry(E)) {
-								has_geometry = true;
-								break;
-							}
-						}
-						if (!has_geometry) {
-							use_origin_snap = true;
-						}
-					}
-
-					if (use_origin_snap || !vertex_snap_has_source) {
-						_vertex_snap_update_source(vb->get_position());
-					}
-
-					if (vertex_snap_has_source && !selection.is_empty()) {
-						vertex_snap_original_positions.clear();
-						for (Node *E : selection) {
-							Node3D *sp = Object::cast_to<Node3D>(E);
-							if (sp) {
-								vertex_snap_original_positions[sp->get_instance_id()] = sp->get_global_position();
-							}
-						}
-
-						if (!use_origin_snap) {
-							vertex_snap_dragging = true;
-							Vector3 cam_normal = camera->get_global_transform().basis.get_column(2);
-							vertex_snap_drag_plane = Plane(cam_normal, vertex_snap_source);
-						} else {
-							EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-							undo_redo->create_action(TTR("Vertex Snap"));
-							for (const KeyValue<ObjectID, Vector3> &E2 : vertex_snap_original_positions) {
-								Node3D *node = ObjectDB::get_instance<Node3D>(E2.key);
-								if (node) {
-									node->set_global_position(vertex_snap_source);
-									undo_redo->add_do_method(node, "set_global_position", vertex_snap_source);
-									undo_redo->add_undo_method(node, "set_global_position", E2.value);
-								}
-							}
-							undo_redo->commit_action(false);
-							vertex_snap_original_positions.clear();
-							spatial_editor->update_transform_gizmo();
-							_reset_follow_mode_count();
-						}
-						surface->queue_redraw();
-					}
-				} else {
-					if (vertex_snap_dragging) {
-						_vertex_snap_commit();
-					}
-				}
-				return;
-			}
-		}
-	}
-
 	EditorPlugin::AfterGUIInput after = EditorPlugin::AFTER_GUI_INPUT_PASS;
 	{
 		EditorNode *en = EditorNode::get_singleton();
@@ -2160,38 +1865,45 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 	}
 
-	// Several parts of the 3D navigation are handled here.
-	bool was_navigating = view_3d_controller->is_navigating();
-	view_3d_controller->gui_input(p_event, surface->get_global_rect());
-	if (was_navigating && !view_3d_controller->is_navigating()) {
-		return;
-	}
-
 	Ref<InputEventMouseButton> b = p_event;
 
 	if (b.is_valid()) {
 		emit_signal(SNAME("clicked"));
 
-		View3DController::NavigationMouseButton orbit_mouse_preference = (View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/orbit_mouse_button").operator int();
-		View3DController::NavigationMouseButton pan_mouse_preference = (View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/pan_mouse_button").operator int();
-		View3DController::NavigationMouseButton zoom_mouse_preference = (View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/zoom_mouse_button").operator int();
+		ViewportNavMouseButton orbit_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/orbit_mouse_button").operator int();
+		ViewportNavMouseButton pan_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/pan_mouse_button").operator int();
+		ViewportNavMouseButton zoom_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/zoom_mouse_button").operator int();
 
+		const real_t zoom_factor = 1 + (ZOOM_FREELOOK_MULTIPLIER - 1) * b->get_factor();
 		switch (b->get_button_index()) {
+			case MouseButton::WHEEL_UP: {
+				if (is_freelook_active()) {
+					scale_freelook_speed(zoom_factor);
+				} else {
+					scale_cursor_distance(1.0 / zoom_factor);
+				}
+			} break;
+			case MouseButton::WHEEL_DOWN: {
+				if (is_freelook_active()) {
+					scale_freelook_speed(1.0 / zoom_factor);
+				} else {
+					scale_cursor_distance(zoom_factor);
+				}
+			} break;
 			case MouseButton::RIGHT: {
 				if (b->is_pressed()) {
 					if (_edit.gizmo.is_valid()) {
 						// Restore.
 						_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_initial_value, true);
 						_edit.gizmo = Ref<EditorNode3DGizmo>();
-						set_message("");
 					}
 
 					if (_edit.mode == TRANSFORM_NONE) {
-						if (orbit_mouse_preference == View3DController::NAV_MOUSE_BUTTON_RIGHT && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
+						if (orbit_mouse_preference == NAVIGATION_RIGHT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
 							break;
-						} else if (pan_mouse_preference == View3DController::NAV_MOUSE_BUTTON_RIGHT && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
+						} else if (pan_mouse_preference == NAVIGATION_RIGHT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
 							break;
-						} else if (zoom_mouse_preference == View3DController::NAV_MOUSE_BUTTON_RIGHT && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
+						} else if (zoom_mouse_preference == NAVIGATION_RIGHT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
 							break;
 						}
 					}
@@ -2207,16 +1919,16 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					}
 
 					const Key mod = _get_key_modifier(b);
-					if (!view_3d_controller->is_orthogonal() && !(previewing && !pilot_preview_enabled)) {
+					if (!orthogonal) {
 						if (mod == _get_key_modifier_setting("editors/3d/freelook/freelook_activation_modifier")) {
-							view_3d_controller->set_freelook_enabled(true);
+							set_freelook_active(true);
 						}
 					}
 				} else {
-					view_3d_controller->set_freelook_enabled(false);
+					set_freelook_active(false);
 				}
 
-				if (view_3d_controller->is_freelook_enabled() && !surface->has_focus()) {
+				if (freelook_active && !surface->has_focus()) {
 					// Focus usually doesn't trigger on right-click, but in case of freelook it should,
 					// otherwise using keyboard navigation would misbehave
 					surface->grab_focus();
@@ -2225,11 +1937,11 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			} break;
 			case MouseButton::MIDDLE: {
 				if (b->is_pressed() && _edit.mode != TRANSFORM_NONE) {
-					if (orbit_mouse_preference == View3DController::NAV_MOUSE_BUTTON_MIDDLE && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
+					if (orbit_mouse_preference == NAVIGATION_MIDDLE_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
 						break;
-					} else if (pan_mouse_preference == View3DController::NAV_MOUSE_BUTTON_MIDDLE && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
+					} else if (pan_mouse_preference == NAVIGATION_MIDDLE_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
 						break;
-					} else if (zoom_mouse_preference == View3DController::NAV_MOUSE_BUTTON_MIDDLE && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
+					} else if (zoom_mouse_preference == NAVIGATION_MIDDLE_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
 						break;
 					}
 
@@ -2237,7 +1949,8 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 						case TRANSFORM_VIEW: {
 							_edit.plane = TRANSFORM_X_AXIS;
 							set_message(TTR("X-Axis Transform."), 2);
-							view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+							view_type = VIEW_TYPE_USER;
+							_update_name();
 						} break;
 						case TRANSFORM_X_AXIS: {
 							_edit.plane = TRANSFORM_Y_AXIS;
@@ -2270,11 +1983,11 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 						commit_transform();
 						break; // just commit the edit, stop processing the event so we don't deselect the object
 					}
-					if (orbit_mouse_preference == View3DController::NAV_MOUSE_BUTTON_LEFT && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
+					if (orbit_mouse_preference == NAVIGATION_LEFT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2")) {
 						break;
-					} else if (pan_mouse_preference == View3DController::NAV_MOUSE_BUTTON_LEFT && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
+					} else if (pan_mouse_preference == NAVIGATION_LEFT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2")) {
 						break;
-					} else if (zoom_mouse_preference == View3DController::NAV_MOUSE_BUTTON_LEFT && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
+					} else if (zoom_mouse_preference == NAVIGATION_LEFT_MOUSE && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2")) {
 						break;
 					}
 
@@ -2291,6 +2004,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 
 					_edit.mouse_pos = b->get_position();
 					_edit.original_mouse_pos = b->get_position();
+					_edit.snap = spatial_editor->is_snap_enabled();
 					_edit.mode = TRANSFORM_NONE;
 					_edit.original = spatial_editor->get_gizmo_transform(); // To prevent to break when flipping with scale.
 
@@ -2431,12 +2145,10 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 								}
 							}
 
-							if (!previewing) {
-								// Default to region select.
-								view_3d_controller->cursor.region_select = true;
-								view_3d_controller->cursor.region_begin = b->get_position();
-								view_3d_controller->cursor.region_end = b->get_position();
-							}
+							// Default to region select.
+							cursor.region_select = true;
+							cursor.region_begin = b->get_position();
+							cursor.region_end = b->get_position();
 							break;
 						}
 					}
@@ -2487,9 +2199,6 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 						ruler_start_point->set_visible(false);
 						ruler_end_point->set_visible(false);
 						ruler_label->set_visible(false);
-						ruler_label_x->set_visible(false);
-						ruler_label_y->set_visible(false);
-						ruler_label_z->set_visible(false);
 						collision_reposition = false;
 						break;
 					}
@@ -2504,7 +2213,6 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 							selected_node->update_gizmos();
 						}
 						_edit.gizmo = Ref<EditorNode3DGizmo>();
-						set_message("");
 						break;
 					}
 
@@ -2513,13 +2221,13 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 
 						if (clicked.is_valid() && _edit.mode == TRANSFORM_NONE) {
 							_select_clicked(false);
-						} else if (view_3d_controller->cursor.region_select) {
+						} else if (cursor.region_select) {
 							_select_region();
 							surface->queue_redraw();
 						}
 
 						movement_threshold_passed = false;
-						view_3d_controller->cursor.region_select = false;
+						cursor.region_select = false;
 					}
 
 					if (!_edit.instant && _edit.mode != TRANSFORM_NONE) {
@@ -2553,53 +2261,34 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 	}
 
+	Vector<ShortcutCheckSet> shortcut_check_sets;
+
+	if (Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED) {
+		ViewportNavMouseButton orbit_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/orbit_mouse_button").operator int();
+		ViewportNavMouseButton pan_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/pan_mouse_button").operator int();
+		ViewportNavMouseButton zoom_mouse_preference = (ViewportNavMouseButton)EDITOR_GET("editors/3d/navigation/zoom_mouse_button").operator int();
+		bool orbit_mod_pressed = _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_modifier_2");
+		bool pan_mod_pressed = _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_pan_modifier_2");
+		bool zoom_mod_pressed = _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_zoom_modifier_2");
+		int orbit_mod_input_count = _get_shortcut_input_count("spatial_editor/viewport_orbit_modifier_1") + _get_shortcut_input_count("spatial_editor/viewport_orbit_modifier_2");
+		int pan_mod_input_count = _get_shortcut_input_count("spatial_editor/viewport_pan_modifier_1") + _get_shortcut_input_count("spatial_editor/viewport_pan_modifier_2");
+		int zoom_mod_input_count = _get_shortcut_input_count("spatial_editor/viewport_zoom_modifier_1") + _get_shortcut_input_count("spatial_editor/viewport_zoom_modifier_2");
+		bool orbit_not_empty = !_is_shortcut_empty("spatial_editor/viewport_orbit_modifier_1") || !_is_shortcut_empty("spatial_editor/viewport_orbit_modifier_2");
+		bool pan_not_empty = !_is_shortcut_empty("spatial_editor/viewport_pan_modifier_1") || !_is_shortcut_empty("spatial_editor/viewport_pan_modifier_2");
+		bool zoom_not_empty = !_is_shortcut_empty("spatial_editor/viewport_zoom_modifier_1") || !_is_shortcut_empty("spatial_editor/viewport_zoom_modifier_2");
+		shortcut_check_sets.push_back(ShortcutCheckSet(orbit_mod_pressed, orbit_not_empty, orbit_mod_input_count, orbit_mouse_preference, NAVIGATION_ORBIT));
+		shortcut_check_sets.push_back(ShortcutCheckSet(pan_mod_pressed, pan_not_empty, pan_mod_input_count, pan_mouse_preference, NAVIGATION_PAN));
+		shortcut_check_sets.push_back(ShortcutCheckSet(zoom_mod_pressed, zoom_not_empty, zoom_mod_input_count, zoom_mouse_preference, NAVIGATION_ZOOM));
+		shortcut_check_sets.sort_custom<ShortcutCheckSetComparator>();
+	}
+
 	Ref<InputEventMouseMotion> m = p_event;
 
 	// Instant transforms process mouse motion in input() to handle wrapping.
 	if (m.is_valid() && !_edit.instant) {
 		_edit.mouse_pos = m->get_position();
 
-		if (vertex_snap_mode || vertex_snap_dragging) {
-			if (!vertex_snap_dragging) {
-				_vertex_snap_update_source(m->get_position());
-			} else {
-				const float vertex_snap_threshold = VERTEX_SNAP_THRESHOLD * EDSCALE;
-				bool has_displacement = false;
-				Vector3 displacement;
-
-				Vector3 target;
-				if (_find_closest_vertex_in_scene(m->get_position(), vertex_snap_threshold, target, &vertex_snap_original_positions)) {
-					vertex_snap_target = target;
-					vertex_snap_has_target = true;
-					displacement = target - vertex_snap_source;
-					has_displacement = true;
-					set_message(TTR("Vertex Snap (Snapped)"));
-				} else {
-					vertex_snap_has_target = false;
-					Vector3 ray_pos = get_ray_pos(m->get_position());
-					Vector3 ray_dir = get_ray(m->get_position());
-					Vector3 intersection;
-					if (vertex_snap_drag_plane.intersects_ray(ray_pos, ray_dir, &intersection)) {
-						displacement = intersection - vertex_snap_source;
-						has_displacement = true;
-					}
-					set_message(TTR("Vertex Snap"));
-				}
-
-				if (has_displacement) {
-					for (const KeyValue<ObjectID, Vector3> &E : vertex_snap_original_positions) {
-						Node3D *node = ObjectDB::get_instance<Node3D>(E.key);
-						if (node) {
-							node->set_global_position(E.value + displacement);
-						}
-					}
-				}
-			}
-			surface->queue_redraw();
-			return;
-		}
-
-		if (!view_3d_controller->is_freelook_enabled() && spatial_editor->get_single_selected_node()) {
+		if (spatial_editor->get_single_selected_node()) {
 			Vector<Ref<Node3DGizmo>> gizmos = spatial_editor->get_single_selected_node()->get_gizmos();
 
 			Ref<EditorNode3DGizmo> found_gizmo;
@@ -2633,48 +2322,160 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		if (!view_3d_controller->is_freelook_enabled() && transform_gizmo_visible && spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {
+		if (transform_gizmo_visible && spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {
 			_transform_gizmo_select(_edit.mouse_pos, true);
 		}
 
+		NavigationMode nav_mode = NAVIGATION_NONE;
+
 		if (_edit.gizmo.is_valid()) {
 			_edit.gizmo->set_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, camera, m->get_position());
 			Variant v = _edit.gizmo->get_handle_value(_edit.gizmo_handle, _edit.gizmo_handle_secondary);
 			String n = _edit.gizmo->get_handle_name(_edit.gizmo_handle, _edit.gizmo_handle_secondary);
 			set_message(n + ": " + String(v));
 
-		} else {
-			movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::LEFT)) {
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_LEFT_MOUSE, shortcut_check_sets, false);
+			if (change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			} else {
+				movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
 
-			if ((selection_in_progress || clicked_wants_append || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT) && movement_threshold_passed && clicked.is_valid() && !previewing) {
-				view_3d_controller->cursor.region_select = true;
-				view_3d_controller->cursor.region_begin = _edit.original_mouse_pos;
-				clicked = ObjectID();
-			}
-
-			if (view_3d_controller->cursor.region_select) {
-				view_3d_controller->cursor.region_end = m->get_position();
-				surface->queue_redraw();
-				return;
-			}
-
-			if (clicked.is_valid() && movement_threshold_passed && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE)) {
-				bool is_select_mode = (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM);
-				bool is_clicked_selected = editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked));
-
-				if (_edit.mode == TRANSFORM_NONE && (is_select_mode || is_clicked_selected)) {
-					_compute_edit(_edit.original_mouse_pos);
+				if ((selection_in_progress || clicked_wants_append || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT) && movement_threshold_passed && clicked.is_valid()) {
+					cursor.region_select = true;
+					cursor.region_begin = _edit.original_mouse_pos;
 					clicked = ObjectID();
-					_edit.mode = TRANSFORM_TRANSLATE;
+				}
+
+				if (cursor.region_select) {
+					cursor.region_end = m->get_position();
+					surface->queue_redraw();
+					return;
+				}
+
+				if (clicked.is_valid() && movement_threshold_passed && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE)) {
+					bool is_select_mode = (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM);
+					bool is_clicked_selected = editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked));
+
+					if (_edit.mode == TRANSFORM_NONE && (is_select_mode || is_clicked_selected)) {
+						_compute_edit(_edit.original_mouse_pos);
+						clicked = ObjectID();
+						_edit.mode = TRANSFORM_TRANSLATE;
+					}
+				}
+
+				if (_edit.mode == TRANSFORM_NONE || _edit.numeric_input != 0 || _edit.numeric_next_decimal != 0) {
+					return;
+				}
+
+				if (!selection_in_progress) {
+					update_transform(_get_key_modifier(m) == Key::SHIFT);
 				}
 			}
-
-			if (_edit.mode == TRANSFORM_NONE || _edit.numeric_input != 0 || _edit.numeric_next_decimal != 0) {
-				return;
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) || freelook_active) {
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_RIGHT_MOUSE, shortcut_check_sets, false);
+			if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) && change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			} else if (freelook_active) {
+				nav_mode = NAVIGATION_LOOK;
+			} else if (orthogonal) {
+				nav_mode = NAVIGATION_PAN;
 			}
 
-			if (!selection_in_progress) {
-				update_transform(_get_key_modifier(m) == Key::SHIFT);
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::MIDDLE)) {
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_MIDDLE_MOUSE, shortcut_check_sets, false);
+			if (change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			}
+
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::MB_XBUTTON1)) {
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_MOUSE_4, shortcut_check_sets, false);
+			if (change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			}
+
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::MB_XBUTTON2)) {
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_MOUSE_5, shortcut_check_sets, false);
+			if (change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			}
+
+		} else if (EDITOR_GET("editors/3d/navigation/emulate_3_button_mouse")) {
+			// Handle trackpad (no external mouse) use case
+			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_LEFT_MOUSE, shortcut_check_sets, true);
+			if (change_nav_from_shortcut != NAVIGATION_NONE) {
+				nav_mode = change_nav_from_shortcut;
+			}
+		}
+
+		switch (nav_mode) {
+			case NAVIGATION_PAN: {
+				_nav_pan(m, _get_warped_mouse_motion(m));
+
+			} break;
+
+			case NAVIGATION_ZOOM: {
+				_nav_zoom(m, m->get_relative());
+
+			} break;
+
+			case NAVIGATION_ORBIT: {
+				_nav_orbit(m, _get_warped_mouse_motion(m));
+
+			} break;
+
+			case NAVIGATION_LOOK: {
+				_nav_look(m, _get_warped_mouse_motion(m));
+
+			} break;
+
+			default: {
+			}
+		}
+	}
+
+	Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
+	if (magnify_gesture.is_valid()) {
+		if (is_freelook_active()) {
+			scale_freelook_speed(magnify_gesture->get_factor());
+		} else {
+			scale_cursor_distance(1.0 / magnify_gesture->get_factor());
+		}
+	}
+
+	Ref<InputEventPanGesture> pan_gesture = p_event;
+	if (pan_gesture.is_valid()) {
+		NavigationMode nav_mode = NAVIGATION_NONE;
+
+		for (const ShortcutCheckSet &shortcut_check_set : shortcut_check_sets) {
+			if (shortcut_check_set.mod_pressed) {
+				nav_mode = shortcut_check_set.result_nav_mode;
+				break;
+			}
+		}
+
+		switch (nav_mode) {
+			case NAVIGATION_PAN: {
+				_nav_pan(pan_gesture, -pan_gesture->get_delta());
+
+			} break;
+
+			case NAVIGATION_ZOOM: {
+				_nav_zoom(pan_gesture, pan_gesture->get_delta());
+
+			} break;
+
+			case NAVIGATION_ORBIT: {
+				_nav_orbit(pan_gesture, -pan_gesture->get_delta());
+
+			} break;
+
+			case NAVIGATION_LOOK: {
+				_nav_look(pan_gesture, pan_gesture->get_delta());
+
+			} break;
+
+			default: {
 			}
 		}
 	}
@@ -2741,8 +2542,8 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 
 		if (_edit.mode == TRANSFORM_NONE) {
-			if (_edit.gizmo.is_null() && view_3d_controller->is_freelook_enabled() && k->get_keycode() == Key::ESCAPE) {
-				view_3d_controller->set_freelook_enabled(false);
+			if (_edit.gizmo.is_null() && is_freelook_active() && k->get_keycode() == Key::ESCAPE) {
+				set_freelook_active(false);
 				return;
 			}
 
@@ -2750,9 +2551,8 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 				// Restore.
 				_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_initial_value, true);
 				_edit.gizmo = Ref<EditorNode3DGizmo>();
-				set_message("");
 			}
-			if (k->get_keycode() == Key::ESCAPE && !view_3d_controller->cursor.region_select && !k->is_echo()) {
+			if (k->get_keycode() == Key::ESCAPE && !cursor.region_select && !k->is_echo()) {
 				_clear_selected();
 				return;
 			}
@@ -2797,6 +2597,11 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 				return;
 			}
 		}
+		if (ED_IS_SHORTCUT("spatial_editor/snap", event_mod)) {
+			if (_edit.mode != TRANSFORM_NONE) {
+				_edit.snap = !_edit.snap;
+			}
+		}
 		if (ED_IS_SHORTCUT("spatial_editor/bottom_view", event_mod)) {
 			_menu_option(VIEW_BOTTOM);
 		}
@@ -2817,37 +2622,41 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_down", event_mod)) {
 			// Clamp rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
-			view_3d_controller->cursor.x_rot = CLAMP(view_3d_controller->cursor.x_rot - Math::PI / 12.0, -1.57, 1.57);
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+			cursor.x_rot = CLAMP(cursor.x_rot - Math::PI / 12.0, -1.57, 1.57);
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			view_type = VIEW_TYPE_USER;
+			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_up", event_mod)) {
 			// Clamp rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
-			view_3d_controller->cursor.x_rot = CLAMP(view_3d_controller->cursor.x_rot + Math::PI / 12.0, -1.57, 1.57);
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+			cursor.x_rot = CLAMP(cursor.x_rot + Math::PI / 12.0, -1.57, 1.57);
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			view_type = VIEW_TYPE_USER;
+			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_right", event_mod)) {
-			view_3d_controller->cursor.y_rot -= Math::PI / 12.0;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+			cursor.y_rot -= Math::PI / 12.0;
+			cursor.unsnapped_y_rot = cursor.y_rot;
+			view_type = VIEW_TYPE_USER;
+			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_left", event_mod)) {
-			view_3d_controller->cursor.y_rot += Math::PI / 12.0;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+			cursor.y_rot += Math::PI / 12.0;
+			cursor.unsnapped_y_rot = cursor.y_rot;
+			view_type = VIEW_TYPE_USER;
+			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_180", event_mod)) {
-			view_3d_controller->cursor.y_rot += Math::PI;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+			cursor.y_rot += Math::PI;
+			cursor.unsnapped_y_rot = cursor.y_rot;
+			view_type = VIEW_TYPE_USER;
+			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/focus_origin", event_mod)) {
 			_menu_option(VIEW_CENTER_TO_ORIGIN);
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/focus_selection", event_mod)) {
 			_menu_option(VIEW_CENTER_TO_SELECTION);
-			times_focused_consecutively += 1;
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/align_transform_with_view", event_mod)) {
 			_menu_option(VIEW_ALIGN_TRANSFORM_WITH_VIEW);
@@ -2881,7 +2690,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		if (ED_IS_SHORTCUT("spatial_editor/cancel_transform", event_mod) && _edit.mode != TRANSFORM_NONE) {
 			cancel_transform();
 		}
-		if (!view_3d_controller->is_freelook_enabled() && !k->is_echo()) {
+		if (!is_freelook_active() && !k->is_echo()) {
 			if (ED_IS_SHORTCUT("spatial_editor/reset_transform_position", event_mod)) {
 				_reset_transform(TransformType::POSITION);
 			}
@@ -2899,29 +2708,12 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					begin_transform(TRANSFORM_TRANSLATE, true);
 				}
 			}
-			if (ED_IS_SHORTCUT("spatial_editor/instant_rotate", event_mod)) {
-				if (_edit.mode == TRANSFORM_ROTATE && _edit.instant) {
-					_edit.is_trackball = !_edit.is_trackball;
-					_edit.show_rotation_line = !_edit.is_trackball;
-					_edit.plane = TRANSFORM_VIEW;
-					_edit.original_mouse_pos = _edit.mouse_pos;
-					if (_edit.is_trackball) {
-						set_message(TTR("Trackball Rotation"));
-					} else {
-						_edit.initial_click_vector = Vector3();
-						_edit.previous_rotation_vector = Vector3();
-						_edit.accumulated_rotation_angle = 0.0;
-						_edit.rotation_angle = 0.0;
-						set_message(vformat(TTR("Rotating %s degrees."), String::num(0, 0)));
-					}
-					surface->queue_redraw();
-				} else if (_edit.mode != TRANSFORM_ROTATE) {
-					if (_edit.mode == TRANSFORM_NONE) {
-						begin_transform(TRANSFORM_ROTATE, true);
-					} else if (_edit.instant || collision_reposition) {
-						commit_transform();
-						begin_transform(TRANSFORM_ROTATE, true);
-					}
+			if (ED_IS_SHORTCUT("spatial_editor/instant_rotate", event_mod) && _edit.mode != TRANSFORM_ROTATE) {
+				if (_edit.mode == TRANSFORM_NONE) {
+					begin_transform(TRANSFORM_ROTATE, true);
+				} else if (_edit.instant || collision_reposition) {
+					commit_transform();
+					begin_transform(TRANSFORM_ROTATE, true);
 				}
 			}
 			if (ED_IS_SHORTCUT("spatial_editor/instant_scale", event_mod) && _edit.mode != TRANSFORM_SCALE) {
@@ -2946,11 +2738,12 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		// Freelook doesn't work in orthogonal mode or when previewing without pilot mode.
-		if (!view_3d_controller->is_orthogonal() && !(previewing && !pilot_preview_enabled) && ED_IS_SHORTCUT("spatial_editor/freelook_toggle", event_mod)) {
-			view_3d_controller->set_freelook_enabled(!view_3d_controller->is_freelook_enabled());
+		// Freelook doesn't work in orthogonal mode.
+		if (!orthogonal && ED_IS_SHORTCUT("spatial_editor/freelook_toggle", event_mod)) {
+			set_freelook_active(!is_freelook_active());
+
 		} else if (k->get_keycode() == Key::ESCAPE) {
-			view_3d_controller->set_freelook_enabled(false);
+			set_freelook_active(false);
 		}
 
 		if (k->get_keycode() == Key::SPACE) {
@@ -2958,53 +2751,295 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 				emit_signal(SNAME("toggle_maximize_view"), this);
 			}
 		}
+
+		if (ED_IS_SHORTCUT("spatial_editor/decrease_fov", event_mod)) {
+			scale_fov(-0.05);
+		}
+
+		if (ED_IS_SHORTCUT("spatial_editor/increase_fov", event_mod)) {
+			scale_fov(0.05);
+		}
+
+		if (ED_IS_SHORTCUT("spatial_editor/reset_fov", event_mod)) {
+			reset_fov();
+		}
 	}
 
-	// Freelook uses most of the useful shortcuts, like save, so its OK
+	// freelook uses most of the useful shortcuts, like save, so its ok
 	// to consider freelook active as end of the line for future events.
-	if (view_3d_controller->is_freelook_enabled()) {
+	if (freelook_active) {
 		accept_event();
 	}
 }
 
-void Node3DEditorViewport::_cursor_interpolated() {
-	last_camera_transform = view_3d_controller->interp_to_camera_transform();
+int Node3DEditorViewport::_get_shortcut_input_count(const String &p_name) {
+	Ref<Shortcut> check_shortcut = ED_GET_SHORTCUT(p_name);
 
-	if (previewing_camera && previewing && pilot_preview_enabled) {
-		previewing->set_global_transform(last_camera_transform);
-	} else if (!previewing_camera) {
-		camera->set_global_transform(last_camera_transform);
-	}
+	ERR_FAIL_COND_V_MSG(check_shortcut.is_null(), 0, "The Shortcut was null, possible name mismatch.");
 
-	if (view_3d_controller->is_orthogonal()) {
-		float half_fov = Math::deg_to_rad(get_fov()) / 2.0;
-		float height = 2.0 * view_3d_controller->cursor.distance * Math::tan(half_fov);
-		camera->set_orthogonal(height, get_znear(), get_zfar());
-	} else {
-		camera->set_perspective(get_fov(), get_znear(), get_zfar());
-	}
-
-	view_3d_controller->set_z_near(get_znear());
-	view_3d_controller->set_z_far(get_zfar());
-
-	update_transform_gizmo_view();
-	rotation_control->queue_redraw();
-	position_control->queue_redraw();
-	look_control->queue_redraw();
-	surface->queue_redraw();
-	spatial_editor->update_grid();
+	return check_shortcut->get_events().size();
 }
 
-void Node3DEditorViewport::_cursor_distance_scaled() {
+Node3DEditorViewport::NavigationMode Node3DEditorViewport::_get_nav_mode_from_shortcut_check(ViewportNavMouseButton p_mouse_button, Vector<ShortcutCheckSet> p_shortcut_check_sets, bool p_use_not_empty) {
+	if (p_use_not_empty) {
+		for (const ShortcutCheckSet &shortcut_check_set : p_shortcut_check_sets) {
+			if (shortcut_check_set.mod_pressed && shortcut_check_set.shortcut_not_empty) {
+				return shortcut_check_set.result_nav_mode;
+			}
+		}
+	} else {
+		for (const ShortcutCheckSet &shortcut_check_set : p_shortcut_check_sets) {
+			if (shortcut_check_set.mouse_preference == p_mouse_button && shortcut_check_set.mod_pressed) {
+				return shortcut_check_set.result_nav_mode;
+			}
+		}
+	}
+
+	return NAVIGATION_NONE;
+}
+
+void Node3DEditorViewport::_nav_pan(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
+	const NavigationScheme nav_scheme = (NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
+	const real_t translation_sensitivity = EDITOR_GET("editors/3d/navigation_feel/translation_sensitivity");
+
+	real_t pan_speed = translation_sensitivity / 150.0;
+	if (p_event.is_valid() && nav_scheme == NAVIGATION_MAYA && p_event->is_shift_pressed()) {
+		pan_speed *= 10;
+	}
+
+	Transform3D camera_transform;
+
+	camera_transform.translate_local(cursor.pos);
+	camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
+	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
+	const bool invert_x_axis = EDITOR_GET("editors/3d/navigation/invert_x_axis");
+	const bool invert_y_axis = EDITOR_GET("editors/3d/navigation/invert_y_axis");
+	Vector3 translation(
+			(invert_x_axis ? -1 : 1) * -p_relative.x * pan_speed,
+			(invert_y_axis ? -1 : 1) * p_relative.y * pan_speed,
+			0);
+	translation *= cursor.distance / DISTANCE_DEFAULT;
+	camera_transform.translate_local(translation);
+	cursor.pos = camera_transform.origin;
+}
+
+void Node3DEditorViewport::_nav_zoom(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
+	const NavigationScheme nav_scheme = (NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
+
+	real_t zoom_speed = 1 / 80.0;
+	if (p_event.is_valid() && nav_scheme == NAVIGATION_MAYA && p_event->is_shift_pressed()) {
+		zoom_speed *= 10;
+	}
+
+	NavigationZoomStyle zoom_style = (NavigationZoomStyle)EDITOR_GET("editors/3d/navigation/zoom_style").operator int();
+	if (zoom_style == NAVIGATION_ZOOM_HORIZONTAL) {
+		if (p_relative.x > 0) {
+			scale_cursor_distance(1 - p_relative.x * zoom_speed);
+		} else if (p_relative.x < 0) {
+			scale_cursor_distance(1.0 / (1 + p_relative.x * zoom_speed));
+		}
+	} else {
+		if (p_relative.y > 0) {
+			scale_cursor_distance(1 + p_relative.y * zoom_speed);
+		} else if (p_relative.y < 0) {
+			scale_cursor_distance(1.0 / (1 - p_relative.y * zoom_speed));
+		}
+	}
+}
+
+void Node3DEditorViewport::_nav_orbit(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
+	if (lock_rotation) {
+		_nav_pan(p_event, p_relative);
+		return;
+	}
+
+	const real_t degrees_per_pixel = EDITOR_GET("editors/3d/navigation_feel/orbit_sensitivity");
+	const real_t radians_per_pixel = Math::deg_to_rad(degrees_per_pixel);
+	const bool invert_y_axis = EDITOR_GET("editors/3d/navigation/invert_y_axis");
+	const bool invert_x_axis = EDITOR_GET("editors/3d/navigation/invert_x_axis");
+
+	cursor.unsnapped_x_rot += p_relative.y * radians_per_pixel * (invert_y_axis ? -1 : 1);
+	cursor.unsnapped_x_rot = CLAMP(cursor.unsnapped_x_rot, -1.57, 1.57);
+	cursor.unsnapped_y_rot += p_relative.x * radians_per_pixel * (invert_x_axis ? -1 : 1);
+
+	cursor.x_rot = cursor.unsnapped_x_rot;
+	cursor.y_rot = cursor.unsnapped_y_rot;
+
+	bool snap_modifier_configured = !_is_shortcut_empty("spatial_editor/viewport_orbit_snap_modifier_1") || !_is_shortcut_empty("spatial_editor/viewport_orbit_snap_modifier_2");
+
+	if (snap_modifier_configured && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_snap_modifier_1") && _is_nav_modifier_pressed("spatial_editor/viewport_orbit_snap_modifier_2")) {
+		const real_t snap_angle = Math::deg_to_rad(45.0);
+		const real_t snap_threshold = Math::deg_to_rad((real_t)EDITOR_GET("editors/3d/navigation_feel/angle_snap_threshold"));
+
+		real_t x_rot_snapped = Math::snapped(cursor.unsnapped_x_rot, snap_angle);
+		real_t y_rot_snapped = Math::snapped(cursor.unsnapped_y_rot, snap_angle);
+
+		real_t x_dist = Math::abs(cursor.unsnapped_x_rot - x_rot_snapped);
+		real_t y_dist = Math::abs(cursor.unsnapped_y_rot - y_rot_snapped);
+
+		if (x_dist < snap_threshold && y_dist < snap_threshold) {
+			cursor.x_rot = x_rot_snapped;
+			cursor.y_rot = y_rot_snapped;
+
+			real_t y_rot_wrapped = Math::wrapf(y_rot_snapped, (real_t)-Math::PI, (real_t)Math::PI);
+
+			if (Math::abs(x_rot_snapped) < snap_threshold) {
+				if (Math::abs(y_rot_wrapped) < snap_threshold) {
+					view_type = VIEW_TYPE_FRONT;
+				} else if (Math::abs(Math::abs(y_rot_wrapped) - Math::PI) < snap_threshold) {
+					view_type = VIEW_TYPE_REAR;
+				} else if (Math::abs(y_rot_wrapped - Math::PI / 2.0) < snap_threshold) {
+					view_type = VIEW_TYPE_LEFT;
+				} else if (Math::abs(y_rot_wrapped + Math::PI / 2.0) < snap_threshold) {
+					view_type = VIEW_TYPE_RIGHT;
+				} else {
+					// Only switch to ortho for 90-degree views.
+					return;
+				}
+				_set_auto_orthogonal();
+				_update_name();
+			} else if (Math::abs(Math::abs(x_rot_snapped) - Math::PI / 2.0) < snap_threshold) {
+				if (Math::abs(y_rot_wrapped) < snap_threshold ||
+						Math::abs(Math::abs(y_rot_wrapped) - Math::PI) < snap_threshold ||
+						Math::abs(y_rot_wrapped - Math::PI / 2.0) < snap_threshold ||
+						Math::abs(y_rot_wrapped + Math::PI / 2.0) < snap_threshold) {
+					view_type = x_rot_snapped > 0 ? VIEW_TYPE_TOP : VIEW_TYPE_BOTTOM;
+					_set_auto_orthogonal();
+					_update_name();
+				}
+			}
+
+			return;
+		}
+	}
+
+	view_type = VIEW_TYPE_USER;
+	if (orthogonal && auto_orthogonal) {
+		_menu_option(VIEW_PERSPECTIVE);
+	}
+}
+
+void Node3DEditorViewport::_nav_look(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
+	if (orthogonal) {
+		_nav_pan(p_event, p_relative);
+		return;
+	}
+
+	if (orthogonal && auto_orthogonal) {
+		_menu_option(VIEW_PERSPECTIVE);
+	}
+
+	// Scale mouse sensitivity with camera FOV scale when zoomed in to make it easier to point at things.
+	const real_t degrees_per_pixel = real_t(EDITOR_GET("editors/3d/freelook/freelook_sensitivity")) * MIN(1.0, cursor.fov_scale);
+	const real_t radians_per_pixel = Math::deg_to_rad(degrees_per_pixel);
+	const bool invert_y_axis = EDITOR_GET("editors/3d/navigation/invert_y_axis");
+
+	// Note: do NOT assume the camera has the "current" transform, because it is interpolated and may have "lag".
+	const Transform3D prev_camera_transform = to_camera_transform(cursor);
+
+	if (invert_y_axis) {
+		cursor.x_rot -= p_relative.y * radians_per_pixel;
+	} else {
+		cursor.x_rot += p_relative.y * radians_per_pixel;
+	}
+	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
+	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
+	cursor.unsnapped_x_rot = cursor.x_rot;
+
+	cursor.y_rot += p_relative.x * radians_per_pixel;
+	cursor.unsnapped_y_rot = cursor.y_rot;
+
+	// Look is like the opposite of Orbit: the focus point rotates around the camera
+	Transform3D camera_transform = to_camera_transform(cursor);
+	Vector3 pos = camera_transform.xform(Vector3(0, 0, 0));
+	Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0));
+	Vector3 diff = prev_pos - pos;
+	cursor.pos += diff;
+
+	view_type = VIEW_TYPE_USER;
+	_update_name();
+}
+
+void Node3DEditorViewport::set_freelook_active(bool active_now) {
+	if (!freelook_active && active_now) {
+		// Sync camera cursor to cursor to "cut" interpolation jumps due to changing referential
+		cursor = camera_cursor;
+
+		// Make sure eye_pos is synced, because freelook referential is eye pos rather than orbit pos
+		Vector3 forward = to_camera_transform(cursor).basis.xform(Vector3(0, 0, -1));
+		cursor.eye_pos = cursor.pos - cursor.distance * forward;
+		// Also sync the camera cursor, otherwise switching to freelook will be trippy if inertia is active
+		camera_cursor.eye_pos = cursor.eye_pos;
+
+		if (EDITOR_GET("editors/3d/freelook/freelook_speed_zoom_link")) {
+			// Re-adjust freelook speed from the current zoom level
+			real_t base_speed = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
+			freelook_speed = base_speed * cursor.distance;
+		}
+
+		previous_mouse_position = get_local_mouse_position();
+
+		spatial_editor->set_freelook_viewport(this);
+
+		// Hide mouse like in an FPS (warping doesn't work)
+		Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
+
+	} else if (freelook_active && !active_now) {
+		// Sync camera cursor to cursor to "cut" interpolation jumps due to changing referential
+		cursor = camera_cursor;
+
+		spatial_editor->set_freelook_viewport(nullptr);
+
+		// Restore mouse
+		Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
+
+		// Restore the previous mouse position when leaving freelook mode.
+		// This is done because leaving `Input.MOUSE_MODE_CAPTURED` will center the cursor
+		// due to OS limitations.
+		warp_mouse(previous_mouse_position);
+	}
+
+	freelook_active = active_now;
+}
+
+void Node3DEditorViewport::scale_fov(real_t p_fov_offset) {
+	cursor.fov_scale = CLAMP(cursor.fov_scale + p_fov_offset, 0.1, 2.5);
+	surface->queue_redraw();
+}
+
+void Node3DEditorViewport::reset_fov() {
+	cursor.fov_scale = 1.0;
+	surface->queue_redraw();
+}
+
+void Node3DEditorViewport::scale_cursor_distance(real_t scale) {
+	real_t min_distance = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN);
+	real_t max_distance = MIN(camera->get_far() / 4, ZOOM_FREELOOK_MAX);
+	if (unlikely(min_distance > max_distance)) {
+		cursor.distance = (min_distance + max_distance) / 2;
+	} else {
+		cursor.distance = CLAMP(cursor.distance * scale, min_distance, max_distance);
+	}
+
+	if (cursor.distance == max_distance || cursor.distance == min_distance) {
+		zoom_failed_attempts_count++;
+	} else {
+		zoom_failed_attempts_count = 0;
+	}
+
 	zoom_indicator_delay = ZOOM_FREELOOK_INDICATOR_DELAY_S;
 	surface->queue_redraw();
 }
 
-void Node3DEditorViewport::_freelook_changed() {
-	spatial_editor->set_freelook_viewport(view_3d_controller->is_freelook_enabled() ? this : nullptr);
-}
+void Node3DEditorViewport::scale_freelook_speed(real_t scale) {
+	real_t min_speed = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN);
+	real_t max_speed = MIN(camera->get_far() / 4, ZOOM_FREELOOK_MAX);
+	if (unlikely(min_speed > max_speed)) {
+		freelook_speed = (min_speed + max_speed) / 2;
+	} else {
+		freelook_speed = CLAMP(freelook_speed * scale, min_speed, max_speed);
+	}
 
-void Node3DEditorViewport::_freelook_speed_scaled() {
 	zoom_indicator_delay = ZOOM_FREELOOK_INDICATOR_DELAY_S;
 	surface->queue_redraw();
 }
@@ -3021,6 +3056,81 @@ bool Node3DEditorViewport::_is_shortcut_empty(const String &p_name) {
 	return check_shortcut->get_events().is_empty();
 }
 
+Point2 Node3DEditorViewport::_get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const {
+	Point2 relative;
+	if (bool(EDITOR_GET("editors/3d/navigation/warped_mouse_panning"))) {
+		relative = Input::get_singleton()->warp_mouse_motion(p_ev_mouse_motion, surface->get_global_rect());
+	} else {
+		relative = p_ev_mouse_motion->get_relative();
+	}
+	return relative;
+}
+
+void Node3DEditorViewport::_update_freelook(real_t delta) {
+	if (!is_freelook_active()) {
+		return;
+	}
+
+	const FreelookNavigationScheme navigation_scheme = (FreelookNavigationScheme)EDITOR_GET("editors/3d/freelook/freelook_navigation_scheme").operator int();
+
+	Vector3 forward;
+	if (navigation_scheme == FREELOOK_FULLY_AXIS_LOCKED) {
+		// Forward/backward keys will always go straight forward/backward, never moving on the Y axis.
+		forward = Vector3(0, 0, -1).rotated(Vector3(0, 1, 0), camera->get_rotation().y);
+	} else {
+		// Forward/backward keys will be relative to the camera pitch.
+		forward = camera->get_transform().basis.xform(Vector3(0, 0, -1));
+	}
+
+	const Vector3 right = camera->get_transform().basis.xform(Vector3(1, 0, 0));
+
+	Vector3 up;
+	if (navigation_scheme == FREELOOK_PARTIALLY_AXIS_LOCKED || navigation_scheme == FREELOOK_FULLY_AXIS_LOCKED) {
+		// Up/down keys will always go up/down regardless of camera pitch.
+		up = Vector3(0, 1, 0);
+	} else {
+		// Up/down keys will be relative to the camera pitch.
+		up = camera->get_transform().basis.xform(Vector3(0, 1, 0));
+	}
+
+	Vector3 direction;
+
+	// Use actions from the inputmap, as this is the only way to reliably detect input in this method.
+	// See #54469 for more discussion and explanation.
+	Input *inp = Input::get_singleton();
+	if (inp->is_action_pressed("spatial_editor/freelook_left")) {
+		direction -= right;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_right")) {
+		direction += right;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_forward")) {
+		direction += forward;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_backwards")) {
+		direction -= forward;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_up")) {
+		direction += up;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_down")) {
+		direction -= up;
+	}
+
+	real_t speed = freelook_speed;
+
+	if (inp->is_action_pressed("spatial_editor/freelook_speed_modifier")) {
+		speed *= 3.0;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_slow_modifier")) {
+		speed *= 0.333333;
+	}
+
+	const Vector3 motion = direction * speed * delta;
+	cursor.pos += motion;
+	cursor.eye_pos += motion;
+}
+
 void Node3DEditorViewport::set_message(const String &p_message, float p_time) {
 	message = p_message;
 	message_time = p_time;
@@ -3063,6 +3173,9 @@ void Node3DEditorViewport::_project_settings_changed() {
 	const bool transparent_background = GLOBAL_GET("rendering/viewport/transparent_background");
 	viewport->set_transparent_background(transparent_background);
 
+	const bool use_hdr_2d = GLOBAL_GET("rendering/viewport/hdr_2d");
+	viewport->set_use_hdr_2d(use_hdr_2d);
+
 	const bool use_debanding = GLOBAL_GET("rendering/anti_aliasing/quality/use_debanding");
 	viewport->set_use_debanding(use_debanding);
 
@@ -3121,6 +3234,9 @@ void Node3DEditorViewport::_notification(int p_what) {
 			_update_centered_labels();
 			message_time = MIN(message_time, 0.001); // Make it disappear.
 
+			Key key = OS::prefer_meta_over_ctrl() ? Key::META : Key::CTRL;
+			preview_material_label_desc->set_text(vformat(TTR("Drag and drop to override the material of any geometry node.\nHold %s when dropping to override a specific surface."), find_keycode_name(key)));
+
 			const int item_count = display_submenu->get_item_count();
 			for (int i = 0; i < item_count; i++) {
 				const Array item_data = display_submenu->get_item_metadata(i);
@@ -3171,11 +3287,11 @@ void Node3DEditorViewport::_notification(int p_what) {
 			set_physics_process(vp_visible);
 
 			if (vp_visible) {
-				view_3d_controller->set_orthogonal(view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL)));
-				view_3d_controller->update_camera();
+				orthogonal = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL));
 				_update_name();
+				_update_camera(0);
 			} else {
-				view_3d_controller->set_freelook_enabled(false);
+				set_freelook_active(false);
 			}
 			callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view).call_deferred();
 		} break;
@@ -3191,280 +3307,16 @@ void Node3DEditorViewport::_notification(int p_what) {
 
 				geometry->clear_surfaces();
 				geometry->surface_begin(Mesh::PRIMITIVE_LINES);
-
-				Vector3 center = (start_pos + end_pos) / 2;
-				Vector3 camera_dir = (camera->get_transform().origin - center).normalized();
-				real_t offset_distance = 0.01;
-
-				geometry->surface_add_vertex(start_pos + camera_dir * offset_distance);
-				geometry->surface_add_vertex(end_pos + camera_dir * offset_distance);
+				geometry->surface_add_vertex(start_pos);
+				geometry->surface_add_vertex(end_pos);
 				geometry->surface_end();
 
-				geometry_xray->clear_surfaces();
-				geometry_xray->surface_begin(Mesh::PRIMITIVE_LINES);
-				geometry_xray->surface_add_vertex(start_pos);
-				geometry_xray->surface_add_vertex(end_pos);
-				geometry_xray->surface_end();
-
 				float distance = start_pos.distance_to(end_pos);
-				if (distance < 0.001) {
-					distance = 0.0;
-				}
 				ruler_label->set_text(TranslationServer::get_singleton()->format_number(vformat("%.3f m", distance), _get_locale()));
 
+				Vector3 center = (start_pos + end_pos) / 2;
 				Vector2 screen_position = camera->unproject_position(center) - (ruler_label->get_custom_minimum_size() / 2);
 				ruler_label->set_position(screen_position);
-
-				bool show_components = Input::get_singleton()->is_key_pressed(Key::SHIFT);
-
-				if (show_components) {
-					Ref<ImmediateMesh> triangle_mesh = ruler_triangle_lines->get_mesh();
-					Ref<ImmediateMesh> triangle_mesh_xray = ruler_triangle_lines_xray->get_mesh();
-
-					if (triangle_mesh.is_valid() && triangle_mesh_xray.is_valid()) {
-						Vector3 delta = end_pos - start_pos;
-						delta = delta.abs();
-						const real_t threshold = 0.001;
-						if (delta.x < threshold) {
-							delta.x = 0.0;
-						}
-						if (delta.y < threshold) {
-							delta.y = 0.0;
-						}
-						if (delta.z < threshold) {
-							delta.z = 0.0;
-						}
-
-						Vector3 corner_point;
-						Color first_line_color;
-						Color second_line_color;
-
-						Color axis_x_color = get_theme_color(SNAME("axis_x_color"), EditorStringName(Editor));
-						Color axis_y_color = get_theme_color(SNAME("axis_y_color"), EditorStringName(Editor));
-						Color axis_z_color = get_theme_color(SNAME("axis_z_color"), EditorStringName(Editor));
-
-						if (delta.x > 0.0 && delta.y > 0.0 && delta.z == 0.0) {
-							// XY plane
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-							first_line_color = axis_x_color;
-							second_line_color = axis_y_color;
-						} else if (delta.x > 0.0 && delta.z > 0.0 && delta.y == 0.0) {
-							// XZ plane
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-							first_line_color = axis_x_color;
-							second_line_color = axis_z_color;
-						} else if (delta.y > 0.0 && delta.z > 0.0 && delta.x == 0.0) {
-							// YZ plane
-							corner_point = Vector3(start_pos.x, start_pos.y, end_pos.z);
-							first_line_color = axis_z_color;
-							second_line_color = axis_y_color;
-						} else if (delta.x > 0.0 && delta.y > 0.0 && delta.z > 0.0) {
-							// All three axes
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-							first_line_color = axis_x_color;
-							second_line_color = axis_y_color;
-						} else {
-							corner_point = end_pos;
-							first_line_color = axis_x_color;
-							second_line_color = axis_x_color;
-						}
-
-						triangle_mesh->clear_surfaces();
-						triangle_mesh->surface_begin(Mesh::PRIMITIVE_LINES);
-
-						Vector3 triangle_camera_dir = (camera->get_transform().origin - center).normalized();
-						real_t triangle_offset_distance = 0.01;
-
-						triangle_mesh->surface_set_color(first_line_color);
-						triangle_mesh->surface_add_vertex(start_pos + triangle_camera_dir * triangle_offset_distance);
-						triangle_mesh->surface_set_color(first_line_color);
-						triangle_mesh->surface_add_vertex(corner_point + triangle_camera_dir * triangle_offset_distance);
-						triangle_mesh->surface_set_color(second_line_color);
-						triangle_mesh->surface_add_vertex(corner_point + triangle_camera_dir * triangle_offset_distance);
-						triangle_mesh->surface_set_color(second_line_color);
-						triangle_mesh->surface_add_vertex(end_pos + triangle_camera_dir * triangle_offset_distance);
-
-						triangle_mesh->surface_end();
-
-						Color first_line_color_xray = first_line_color;
-						Color second_line_color_xray = second_line_color;
-						first_line_color_xray.a = 0.15;
-						second_line_color_xray.a = 0.15;
-
-						triangle_mesh_xray->clear_surfaces();
-						triangle_mesh_xray->surface_begin(Mesh::PRIMITIVE_LINES);
-
-						triangle_mesh_xray->surface_set_color(first_line_color_xray);
-						triangle_mesh_xray->surface_add_vertex(start_pos);
-						triangle_mesh_xray->surface_set_color(first_line_color_xray);
-						triangle_mesh_xray->surface_add_vertex(corner_point);
-						triangle_mesh_xray->surface_set_color(second_line_color_xray);
-						triangle_mesh_xray->surface_add_vertex(corner_point);
-						triangle_mesh_xray->surface_set_color(second_line_color_xray);
-						triangle_mesh_xray->surface_add_vertex(end_pos);
-
-						triangle_mesh_xray->surface_end();
-					}
-				} else {
-					Ref<ImmediateMesh> triangle_mesh = ruler_triangle_lines->get_mesh();
-					Ref<ImmediateMesh> triangle_mesh_xray = ruler_triangle_lines_xray->get_mesh();
-
-					if (triangle_mesh.is_valid()) {
-						triangle_mesh->clear_surfaces();
-					}
-					if (triangle_mesh_xray.is_valid()) {
-						triangle_mesh_xray->clear_surfaces();
-					}
-				}
-
-				if (show_components) {
-					Vector3 delta = end_pos - start_pos;
-					delta = delta.abs();
-					const real_t threshold = 0.001;
-					if (delta.x < threshold) {
-						delta.x = 0.0;
-					}
-					if (delta.y < threshold) {
-						delta.y = 0.0;
-					}
-					if (delta.z < threshold) {
-						delta.z = 0.0;
-					}
-
-					int active_axes = 0;
-					if (delta.x > 0.0) {
-						active_axes++;
-					}
-					if (delta.y > 0.0) {
-						active_axes++;
-					}
-					if (delta.z > 0.0) {
-						active_axes++;
-					}
-
-					String x_text = delta.x > 0.0 ? TranslationServer::get_singleton()->format_number(vformat("X: %.3f m", delta.x), _get_locale()) : "";
-					String y_text = delta.y > 0.0 ? TranslationServer::get_singleton()->format_number(vformat("Y: %.3f m", delta.y), _get_locale()) : "";
-					String z_text = delta.z > 0.0 ? TranslationServer::get_singleton()->format_number(vformat("Z: %.3f m", delta.z), _get_locale()) : "";
-
-					Color axis_x_color = get_theme_color(SNAME("axis_x_color"), EditorStringName(Editor));
-					Color axis_y_color = get_theme_color(SNAME("axis_y_color"), EditorStringName(Editor));
-					Color axis_z_color = get_theme_color(SNAME("axis_z_color"), EditorStringName(Editor));
-
-					Vector3 corner_point;
-
-					if (active_axes >= 2) {
-						if (delta.z == 0.0) {
-							// XY plane
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_x_color);
-							ruler_label_x->set_text(x_text);
-							ruler_label_x->set_visible(true);
-							Vector2 x_pos = camera->unproject_position((start_pos + corner_point) / 2) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(x_pos);
-
-							ruler_label_y->add_theme_color_override(SceneStringName(font_color), axis_y_color);
-							ruler_label_y->set_text(y_text);
-							ruler_label_y->set_visible(true);
-							Vector2 y_pos = camera->unproject_position((corner_point + end_pos) / 2) - (ruler_label_y->get_custom_minimum_size() / 2);
-							ruler_label_y->set_position(y_pos);
-
-							ruler_label_z->set_visible(false);
-						} else if (delta.y == 0.0) {
-							// XZ plane
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_x_color);
-							ruler_label_x->set_text(x_text);
-							ruler_label_x->set_visible(true);
-							Vector2 x_pos = camera->unproject_position((start_pos + corner_point) / 2) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(x_pos);
-
-							ruler_label_y->add_theme_color_override(SceneStringName(font_color), axis_z_color);
-							ruler_label_y->set_text(z_text);
-							ruler_label_y->set_visible(true);
-							Vector2 z_pos = camera->unproject_position((corner_point + end_pos) / 2) - (ruler_label_y->get_custom_minimum_size() / 2);
-							ruler_label_y->set_position(z_pos);
-
-							ruler_label_z->set_visible(false);
-						} else if (delta.x == 0.0) {
-							// YZ plane
-							corner_point = Vector3(start_pos.x, start_pos.y, end_pos.z);
-
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_z_color);
-							ruler_label_x->set_text(z_text);
-							ruler_label_x->set_visible(true);
-							Vector2 z_pos = camera->unproject_position((start_pos + corner_point) / 2) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(z_pos);
-
-							ruler_label_y->add_theme_color_override(SceneStringName(font_color), axis_y_color);
-							ruler_label_y->set_text(y_text);
-							ruler_label_y->set_visible(true);
-							Vector2 y_pos = camera->unproject_position((corner_point + end_pos) / 2) - (ruler_label_y->get_custom_minimum_size() / 2);
-							ruler_label_y->set_position(y_pos);
-
-							ruler_label_z->set_visible(false);
-						} else {
-							// All three axes
-							corner_point = Vector3(end_pos.x, start_pos.y, start_pos.z);
-
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_x_color);
-							ruler_label_x->set_text(x_text);
-							ruler_label_x->set_visible(true);
-							Vector2 x_pos = camera->unproject_position((start_pos + corner_point) / 2) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(x_pos);
-
-							ruler_label_y->add_theme_color_override(SceneStringName(font_color), axis_y_color);
-							ruler_label_y->set_text(y_text);
-							ruler_label_y->set_visible(true);
-							Vector2 y_pos = camera->unproject_position((corner_point + end_pos) / 2) - (ruler_label_y->get_custom_minimum_size() / 2);
-							ruler_label_y->set_position(y_pos);
-
-							ruler_label_z->add_theme_color_override(SceneStringName(font_color), axis_z_color);
-							ruler_label_z->set_text(z_text);
-							ruler_label_z->set_visible(true);
-							Vector2 z_pos = camera->unproject_position(center + Vector3(0, 0, -0.5)) - (ruler_label_z->get_custom_minimum_size() / 2);
-							ruler_label_z->set_position(z_pos);
-						}
-					} else if (active_axes == 1) {
-						corner_point = end_pos;
-
-						if (delta.x > 0.0) {
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_x_color);
-							ruler_label_x->set_text(x_text);
-							ruler_label_x->set_visible(true);
-							Vector2 pos = camera->unproject_position(center) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(pos);
-							ruler_label_y->set_visible(false);
-							ruler_label_z->set_visible(false);
-						} else if (delta.y > 0.0) {
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_y_color);
-							ruler_label_x->set_text(y_text);
-							ruler_label_x->set_visible(true);
-							Vector2 pos = camera->unproject_position(center) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(pos);
-							ruler_label_y->set_visible(false);
-							ruler_label_z->set_visible(false);
-						} else {
-							ruler_label_x->add_theme_color_override(SceneStringName(font_color), axis_z_color);
-							ruler_label_x->set_text(z_text);
-							ruler_label_x->set_visible(true);
-							Vector2 pos = camera->unproject_position(center) - (ruler_label_x->get_custom_minimum_size() / 2);
-							ruler_label_x->set_position(pos);
-							ruler_label_y->set_visible(false);
-							ruler_label_z->set_visible(false);
-						}
-					} else {
-						ruler_label_x->set_visible(false);
-						ruler_label_y->set_visible(false);
-						ruler_label_z->set_visible(false);
-					}
-
-				} else {
-					ruler_label_x->set_visible(false);
-					ruler_label_y->set_visible(false);
-					ruler_label_z->set_visible(false);
-				}
 			}
 
 			real_t delta = get_process_delta_time();
@@ -3477,24 +3329,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 				}
 			}
 
-			if (view_3d_controller->is_freelook_enabled()) {
-				view_3d_controller->update_freelook(delta);
-				_disable_follow_mode();
-			}
-
-			if (focused_node_id.is_valid() && get_selected_count() > 0 && times_focused_consecutively >= 2 && times_focused_consecutively % 2 == 0) {
-				Node *focused_node = ObjectDB::get_instance<Node>(focused_node_id);
-				if (focused_node) {
-					follow_mode->set_text(vformat(TTR("Following %s"), focused_node->get_name()));
-					follow_mode->set_button_icon(get_editor_theme_icon(focused_node->get_class()));
-					follow_mode->show();
-					focus_selection();
-				} else {
-					_disable_follow_mode();
-				}
-			} else {
-				follow_mode->hide();
-			}
+			_update_freelook(delta);
 
 			Node *scene_root = SceneTreeDock::get_singleton()->get_editor_data()->get_edited_scene_root();
 			if (previewing_cinema && scene_root != nullptr) {
@@ -3516,9 +3351,9 @@ void Node3DEditorViewport::_notification(int p_what) {
 			if (_camera_moved_externally()) {
 				// If camera moved after this plugin last set it, presumably a tool script has moved it, accept the new camera transform as the cursor position.
 				_apply_camera_transform_to_cursor();
-				view_3d_controller->update_camera();
+				_update_camera(0);
 			} else {
-				view_3d_controller->update_camera(delta);
+				_update_camera(delta);
 			}
 
 			const HashMap<ObjectID, Object *> &selection = editor_selection->get_selection();
@@ -3708,7 +3543,8 @@ void Node3DEditorViewport::_notification(int p_what) {
 					if (!ruler->is_inside_tree()) {
 						double snap = EDITOR_GET("interface/inspector/default_float_step");
 						int snap_step_decimals = Math::range_step_decimals(snap);
-						set_message(vformat(TTR("Translating: %s"), vformat("%.*v", snap_step_decimals, selected_node->get_global_position())));
+						set_message(TTR("Translating:") + " (" + String::num(selected_node->get_global_position().x, snap_step_decimals) + ", " +
+								String::num(selected_node->get_global_position().y, snap_step_decimals) + ", " + String::num(selected_node->get_global_position().z, snap_step_decimals) + ")");
 					}
 
 					selected_node->set_global_position(spatial_editor->snap_point(_get_instance_position(_edit.mouse_pos, selected_node)));
@@ -3718,9 +3554,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 						ruler_start_point->set_visible(true);
 						ruler_end_point->set_visible(true);
 						ruler_label->set_visible(true);
-						ruler_label_x->set_visible(false);
-						ruler_label_y->set_visible(false);
-						ruler_label_z->set_visible(false);
 					}
 				}
 			}
@@ -3732,7 +3565,8 @@ void Node3DEditorViewport::_notification(int p_what) {
 				preview_node_pos = spatial_editor->snap_point(_get_instance_position(preview_node_viewport_pos, preview_node));
 				double snap = EDITOR_GET("interface/inspector/default_float_step");
 				int snap_step_decimals = Math::range_step_decimals(snap);
-				set_message(vformat(TTR("Instantiating: %s"), vformat("%.*v", snap_step_decimals, preview_node_pos)));
+				set_message(TTR("Instantiating:") + " (" + String::num(preview_node_pos.x, snap_step_decimals) + ", " +
+						String::num(preview_node_pos.y, snap_step_decimals) + ", " + String::num(preview_node_pos.z, snap_step_decimals) + ")");
 				Transform3D preview_gl_transform = Transform3D(Basis(), preview_node_pos);
 				preview_node->set_global_transform(preview_gl_transform);
 				if (!preview_node->is_visible()) {
@@ -3744,8 +3578,8 @@ void Node3DEditorViewport::_notification(int p_what) {
 
 		case NOTIFICATION_APPLICATION_FOCUS_OUT:
 		case NOTIFICATION_WM_WINDOW_FOCUS_OUT: {
-			view_3d_controller->set_freelook_enabled(false);
-			view_3d_controller->cursor.region_select = false;
+			set_freelook_active(false);
+			cursor.region_select = false;
 			surface->queue_redraw();
 
 			// Commit the drag if the window is focused out.
@@ -3762,7 +3596,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 
 				spatial_editor->get_single_selected_node()->update_gizmos();
 				_edit.gizmo = Ref<EditorNode3DGizmo>();
-				set_message("");
 			}
 		} break;
 
@@ -3786,7 +3619,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 
 			view_display_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHlDarkBackground")));
 			preview_camera->set_button_icon(get_editor_theme_icon(SNAME("Camera3DDarkBackground")));
-			pilot_camera->set_button_icon(get_editor_theme_icon(SNAME("3D")));
 			Control *gui_base = EditorNode::get_singleton()->get_gui_base();
 
 			const Ref<StyleBox> &information_3d_stylebox = gui_base->get_theme_stylebox(SNAME("Information3dViewport"), EditorStringName(EditorStyles));
@@ -3795,8 +3627,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 			override_label_colors(view_display_menu);
 			override_button_stylebox(translation_preview_button, information_3d_stylebox);
 			override_label_colors(translation_preview_button);
-			override_button_stylebox(follow_mode, information_3d_stylebox);
-			override_label_colors(follow_mode);
 			override_button_stylebox(preview_camera, information_3d_stylebox);
 			override_label_colors(preview_camera);
 
@@ -3804,12 +3634,8 @@ void Node3DEditorViewport::_notification(int p_what) {
 			frame_time_gradient->set_color(1, get_theme_color(SNAME("warning_color_dark_background"), EditorStringName(Editor)));
 			frame_time_gradient->set_color(2, get_theme_color(SNAME("error_color_dark_background"), EditorStringName(Editor)));
 
-			override_button_stylebox(pilot_camera, information_3d_stylebox);
-			override_label_colors(pilot_camera);
-
 			info_panel->add_theme_style_override(SceneStringName(panel), information_3d_stylebox);
 			override_label_colors(info_label);
-			tooltip_panel->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
 
 			frame_time_panel->add_theme_style_override(SceneStringName(panel), information_3d_stylebox);
 			// Set a minimum width to prevent the width from changing all the time
@@ -3827,21 +3653,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 			ruler_label->add_theme_constant_override("outline_size", 4 * EDSCALE);
 			ruler_label->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
 			ruler_label->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
-
-			ruler_label_x->add_theme_color_override("font_outline_color", Color(0.0, 0.0, 0.0, 1.0));
-			ruler_label_x->add_theme_constant_override("outline_size", 4 * EDSCALE);
-			ruler_label_x->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
-			ruler_label_x->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
-
-			ruler_label_y->add_theme_color_override("font_outline_color", Color(0.0, 0.0, 0.0, 1.0));
-			ruler_label_y->add_theme_constant_override("outline_size", 4 * EDSCALE);
-			ruler_label_y->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
-			ruler_label_y->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
-
-			ruler_label_z->add_theme_color_override("font_outline_color", Color(0.0, 0.0, 0.0, 1.0));
-			ruler_label_z->add_theme_constant_override("outline_size", 4 * EDSCALE);
-			ruler_label_z->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
-			ruler_label_z->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
 		} break;
 
 		case NOTIFICATION_DRAG_END: {
@@ -3855,8 +3666,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			_update_view_3d_controller();
-
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("editors/3d")) {
 				_update_navigation_controls_visibility();
 			}
@@ -3864,64 +3673,6 @@ void Node3DEditorViewport::_notification(int p_what) {
 	}
 }
 
-void Node3DEditorViewport::_update_view_3d_controller(bool p_update_all) {
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FOV_DECREASE, ED_GET_SHORTCUT("spatial_editor/decrease_fov"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FOV_INCREASE, ED_GET_SHORTCUT("spatial_editor/increase_fov"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FOV_RESET, ED_GET_SHORTCUT("spatial_editor/reset_fov"));
-
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_PAN_MOD_1, ED_GET_SHORTCUT("spatial_editor/viewport_pan_modifier_1"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_PAN_MOD_2, ED_GET_SHORTCUT("spatial_editor/viewport_pan_modifier_2"));
-
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ORBIT_MOD_1, ED_GET_SHORTCUT("spatial_editor/viewport_orbit_modifier_1"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ORBIT_MOD_2, ED_GET_SHORTCUT("spatial_editor/viewport_orbit_modifier_2"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ORBIT_SNAP_MOD_1, ED_GET_SHORTCUT("spatial_editor/viewport_orbit_snap_modifier_1"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ORBIT_SNAP_MOD_2, ED_GET_SHORTCUT("spatial_editor/viewport_orbit_snap_modifier_2"));
-
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_FORWARD, ED_GET_SHORTCUT("spatial_editor/freelook_forward"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_BACKWARDS, ED_GET_SHORTCUT("spatial_editor/freelook_backwards"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_LEFT, ED_GET_SHORTCUT("spatial_editor/freelook_left"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_RIGHT, ED_GET_SHORTCUT("spatial_editor/freelook_right"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_UP, ED_GET_SHORTCUT("spatial_editor/freelook_up"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_DOWN, ED_GET_SHORTCUT("spatial_editor/freelook_down"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_SPEED_MOD, ED_GET_SHORTCUT("spatial_editor/freelook_speed_modifier"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_FREELOOK_SLOW_MOD, ED_GET_SHORTCUT("spatial_editor/freelook_slow_modifier"));
-
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ZOOM_MOD_1, ED_GET_SHORTCUT("spatial_editor/viewport_zoom_modifier_1"));
-	view_3d_controller->set_shortcut(View3DController::SHORTCUT_ZOOM_MOD_2, ED_GET_SHORTCUT("spatial_editor/viewport_zoom_modifier_2"));
-
-	if (p_update_all || EditorSettings::get_singleton()->check_changed_settings_in_group("editors/3d")) {
-		view_3d_controller->set_pan_mouse_button((View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/pan_mouse_button").operator int());
-
-		view_3d_controller->set_orbit_sensitivity(EDITOR_GET("editors/3d/navigation_feel/orbit_sensitivity"));
-		view_3d_controller->set_orbit_inertia(EDITOR_GET("editors/3d/navigation_feel/orbit_inertia"));
-		view_3d_controller->set_orbit_mouse_button((View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/orbit_mouse_button").operator int());
-
-		view_3d_controller->set_zoom_style((View3DController::ZoomStyle)EDITOR_GET("editors/3d/navigation/zoom_style").operator int());
-		view_3d_controller->set_zoom_inertia(EDITOR_GET("editors/3d/navigation_feel/zoom_inertia"));
-		view_3d_controller->set_zoom_mouse_button((View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/zoom_mouse_button").operator int());
-
-		view_3d_controller->set_freelook_scheme((View3DController::FreelookScheme)EDITOR_GET("editors/3d/freelook/freelook_navigation_scheme").operator int());
-		view_3d_controller->set_freelook_base_speed(EDITOR_GET("editors/3d/freelook/freelook_base_speed"));
-		view_3d_controller->set_freelook_sensitivity(EDITOR_GET("editors/3d/freelook/freelook_sensitivity"));
-		view_3d_controller->set_freelook_inertia(EDITOR_GET("editors/3d/freelook/freelook_inertia"));
-		view_3d_controller->set_freelook_speed_zoom_link(EDITOR_GET("editors/3d/freelook/freelook_speed_zoom_link"));
-		view_3d_controller->set_freelook_invert_y_axis(EDITOR_GET("editors/3d/freelook/freelook_invert_y_axis"));
-
-		view_3d_controller->set_translation_sensitivity(EDITOR_GET("editors/3d/navigation_feel/translation_sensitivity"));
-		view_3d_controller->set_translation_inertia(EDITOR_GET("editors/3d/navigation_feel/translation_inertia"));
-
-		view_3d_controller->set_angle_snap_threshold(EDITOR_GET("editors/3d/navigation_feel/angle_snap_threshold"));
-
-		view_3d_controller->set_emulate_3_button_mouse(EDITOR_GET("editors/3d/navigation/emulate_3_button_mouse"));
-		view_3d_controller->set_emulate_numpad(EDITOR_GET("editors/3d/navigation/emulate_numpad"));
-
-		view_3d_controller->set_invert_x_axis(EDITOR_GET("editors/3d/navigation/invert_x_axis"));
-		view_3d_controller->set_invert_y_axis(EDITOR_GET("editors/3d/navigation/invert_y_axis"));
-
-		view_3d_controller->set_warped_mouse_panning((View3DController::NavigationMouseButton)EDITOR_GET("editors/3d/navigation/warped_mouse_panning").operator int());
-	}
-}
-
 static void draw_indicator_bar(Control &p_surface, real_t p_fill, const Ref<Texture2D> p_icon, const Ref<Font> p_font, int p_font_size, const String &p_text, const Color &p_color) {
 	// Adjust bar size from control height
 	const Vector2 surface_size = p_surface.get_size();
@@ -3956,8 +3707,6 @@ void Node3DEditorViewport::_draw() {
 		get_theme_stylebox(SNAME("FocusViewport"), EditorStringName(EditorStyles))->draw(surface->get_canvas_item(), r);
 	}
 
-	View3DController::Cursor cursor = view_3d_controller->cursor;
-
 	if (cursor.region_select && movement_threshold_passed) {
 		const Rect2 selection_rect = Rect2(cursor.region_begin, cursor.region_end - cursor.region_begin);
 
@@ -3983,46 +3732,13 @@ void Node3DEditorViewport::_draw() {
 		font->draw_string(ci, msgpos, message, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1, 1, 1, 1));
 	}
 
-	if ((vertex_snap_mode || vertex_snap_dragging) && vertex_snap_has_source) {
-		const float circle_radius = 6.0f * EDSCALE;
-		const float outline_width = 2.0f * EDSCALE;
-		const float occluded_alpha = 0.30f;
-
-		Vector3 source_display = vertex_snap_source;
-		if (vertex_snap_dragging) {
-			for (const KeyValue<ObjectID, Vector3> &E : vertex_snap_original_positions) {
-				Node3D *node = ObjectDB::get_instance<Node3D>(E.key);
-				if (node) {
-					source_display = vertex_snap_source + (node->get_global_position() - E.value);
-					break;
-				}
-			}
-		}
-
-		if (!camera->is_position_behind(source_display)) {
-			Vector2 screen_pos = camera->unproject_position(source_display);
-			bool occluded = _is_vertex_occluded(source_display, screen_pos);
-			float alpha = occluded ? occluded_alpha : 1.0f;
-			surface->draw_circle(screen_pos, circle_radius + outline_width, Color(0, 0, 0, 0.6 * alpha), true, -1.0, true);
-			surface->draw_circle(screen_pos, circle_radius, Color(1, 1, 0, alpha), true, -1.0, true);
-		}
-
-		if (vertex_snap_dragging && vertex_snap_has_target && !camera->is_position_behind(vertex_snap_target)) {
-			Vector2 screen_pos = camera->unproject_position(vertex_snap_target);
-			bool occluded = _is_vertex_occluded(vertex_snap_target, screen_pos);
-			float alpha = occluded ? occluded_alpha : 1.0f;
-			surface->draw_circle(screen_pos, circle_radius + outline_width, Color(0, 0, 0, 0.6 * alpha), true, -1.0, true);
-			surface->draw_circle(screen_pos, circle_radius, Color(0, 1, 0, alpha), true, -1.0, true);
-		}
-	}
-
 	if (_edit.mode == TRANSFORM_ROTATE) {
 		Point2 center = point_to_screen(_edit.center);
 
 		Color handle_color;
 		switch (_edit.plane) {
 			case TRANSFORM_VIEW:
-				handle_color = get_theme_color(SNAME("axis_view_plane_color"), EditorStringName(Editor));
+				handle_color = Color(1.0, 1.0, 1.0, 1.0);
 				break;
 			case TRANSFORM_X_AXIS:
 				handle_color = get_theme_color(SNAME("axis_x_color"), EditorStringName(Editor));
@@ -4038,7 +3754,7 @@ void Node3DEditorViewport::_draw() {
 				break;
 		}
 
-		if (!_edit.is_trackball && _is_rotation_arc_visible() && !_edit.initial_click_vector.is_zero_approx()) {
+		if (_is_rotation_arc_visible() && !_edit.initial_click_vector.is_zero_approx()) {
 			Vector3 up = _edit.rotation_axis;
 			Vector3 right = _edit.initial_click_vector;
 
@@ -4046,7 +3762,7 @@ void Node3DEditorViewport::_draw() {
 			right.normalize();
 			Vector3 forward = up.cross(right);
 
-			real_t rotation_radius = (_edit.plane == TRANSFORM_VIEW) ? spatial_editor->gizmo_view_rotation_scale : GIZMO_CIRCLE_SIZE;
+			real_t rotation_radius = (_edit.plane == TRANSFORM_VIEW) ? GIZMO_VIEW_ROTATION_SIZE : GIZMO_CIRCLE_SIZE;
 
 			const int circle_segments = 64;
 			Vector<Point2> circle_points;
@@ -4057,19 +3773,18 @@ void Node3DEditorViewport::_draw() {
 				circle_points.push_back(point_2d);
 			}
 
-			Color circle_color = handle_color.from_hsv(handle_color.get_h(), handle_color.get_s() * 0.6, 1.0, 0.8);
+			Color circle_color = (_edit.plane == TRANSFORM_VIEW) ? Color(1.0, 1.0, 1.0, 0.8) : handle_color.from_hsv(handle_color.get_h(), 0.6, 1.0, 0.8);
 			for (int i = 0; i < circle_points.size() - 1; i++) {
 				RenderingServer::get_singleton()->canvas_item_add_line(
 						ci,
 						circle_points[i],
 						circle_points[i + 1],
 						circle_color,
-						Math::round(2 * EDSCALE),
-						true);
+						Math::round(2 * EDSCALE));
 			}
 
 			const int segments = 64;
-			float display_angle = _edit.rotation_angle;
+			float display_angle = _edit.display_rotation_angle;
 
 			float abs_angle = Math::abs(display_angle);
 			if (abs_angle > Math::TAU) {
@@ -4097,11 +3812,12 @@ void Node3DEditorViewport::_draw() {
 				Vector3 point1_3d = _edit.center + gizmo_scale * rotation_radius * (right * Math::cos(angle1) + forward * Math::sin(angle1));
 				Vector3 point2_3d = _edit.center + gizmo_scale * rotation_radius * (right * Math::cos(angle2) + forward * Math::sin(angle2));
 
+				Point2 center_2d = center;
 				Point2 point1_2d = point_to_screen(point1_3d);
 				Point2 point2_2d = point_to_screen(point2_3d);
 
 				Vector<Point2> triangle_points;
-				triangle_points.push_back(center);
+				triangle_points.push_back(center_2d);
 				triangle_points.push_back(point1_2d);
 				triangle_points.push_back(point2_2d);
 
@@ -4113,7 +3829,7 @@ void Node3DEditorViewport::_draw() {
 				RenderingServer::get_singleton()->canvas_item_add_polygon(ci, triangle_points, triangle_colors);
 			}
 
-			Color edge_color = handle_color.from_hsv(handle_color.get_h(), handle_color.get_s() * 0.8, 1.0, 0.7);
+			Color edge_color = (_edit.plane == TRANSFORM_VIEW) ? Color(1.0, 1.0, 1.0, 0.7) : handle_color.from_hsv(handle_color.get_h(), 0.8, 1.0, 0.7);
 
 			Vector3 start_point_3d = _edit.center + gizmo_scale * rotation_radius * right;
 			Point2 start_point_2d = point_to_screen(start_point_3d);
@@ -4122,28 +3838,26 @@ void Node3DEditorViewport::_draw() {
 					center,
 					start_point_2d,
 					edge_color,
-					Math::round(2 * EDSCALE),
-					true);
+					Math::round(2 * EDSCALE));
 
-			Vector3 end_point_3d = _edit.center + gizmo_scale * rotation_radius * (right * Math::cos(display_angle) + forward * Math::sin(display_angle));
+			Vector3 end_point_3d = _edit.center + gizmo_scale * rotation_radius * (right * Math::cos(_edit.accumulated_rotation_angle) + forward * Math::sin(_edit.accumulated_rotation_angle));
 			Point2 end_point_2d = point_to_screen(end_point_3d);
 			RenderingServer::get_singleton()->canvas_item_add_line(
 					ci,
 					center,
 					end_point_2d,
 					edge_color,
-					Math::round(2 * EDSCALE),
-					true);
+					Math::round(2 * EDSCALE));
+		}
 
-			if (_edit.show_rotation_line) {
-				handle_color = handle_color.from_hsv(handle_color.get_h(), handle_color.get_s() * 0.25, 1.0, handle_color.a);
-				RenderingServer::get_singleton()->canvas_item_add_line(
-						ci,
-						_edit.mouse_pos,
-						center,
-						handle_color,
-						Math::round(2 * EDSCALE));
-			}
+		if (_edit.show_rotation_line) {
+			handle_color = handle_color.from_hsv(handle_color.get_h(), 0.25, 1.0, 1);
+			RenderingServer::get_singleton()->canvas_item_add_line(
+					ci,
+					_edit.mouse_pos,
+					center,
+					handle_color,
+					Math::round(2 * EDSCALE));
 		}
 	}
 	if (previewing) {
@@ -4174,15 +3888,14 @@ void Node3DEditorViewport::_draw() {
 
 	} else {
 		if (zoom_indicator_delay > 0.0) {
-			if (view_3d_controller->is_freelook_enabled()) {
-				// Show speed.
+			if (is_freelook_active()) {
+				// Show speed
 
-				real_t min_speed = MAX(camera->get_near() * 4, View3DControllerConsts::ZOOM_FREELOOK_MIN);
-				real_t max_speed = MIN(camera->get_far() / 4, View3DControllerConsts::ZOOM_FREELOOK_MAX);
+				real_t min_speed = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN);
+				real_t max_speed = MIN(camera->get_far() / 4, ZOOM_FREELOOK_MAX);
 				real_t scale_length = (max_speed - min_speed);
 
 				if (!Math::is_zero_approx(scale_length)) {
-					float freelook_speed = view_3d_controller->get_freelook_speed();
 					real_t logscale_t = 1.0 - Math::log1p(freelook_speed - min_speed) / Math::log1p(scale_length);
 
 					// Display the freelook speed to help the user get a better sense of scale.
@@ -4196,12 +3909,13 @@ void Node3DEditorViewport::_draw() {
 							vformat("%s m/s", String::num(freelook_speed).pad_decimals(precision)),
 							Color(1.0, 0.95, 0.7));
 				}
+
 			} else {
 				// Show zoom
 				zoom_limit_label->set_visible(zoom_failed_attempts_count > 15);
 
-				real_t min_distance = MAX(camera->get_near() * 4, View3DControllerConsts::ZOOM_FREELOOK_MIN);
-				real_t max_distance = MIN(camera->get_far() / 4, View3DControllerConsts::ZOOM_FREELOOK_MAX);
+				real_t min_distance = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN);
+				real_t max_distance = MIN(camera->get_far() / 4, ZOOM_FREELOOK_MAX);
 				real_t scale_length = (max_distance - min_distance);
 
 				if (!Math::is_zero_approx(scale_length)) {
@@ -4224,87 +3938,101 @@ void Node3DEditorViewport::_draw() {
 }
 
 bool Node3DEditorViewport::_camera_moved_externally() {
-	if (previewing_camera && previewing) {
-		if (pilot_preview_enabled) {
-			Transform3D t = previewing->get_global_transform();
-			return !t.is_equal_approx(last_camera_transform);
-		}
-		return false;
-	}
 	Transform3D t = camera->get_global_transform();
 	return !t.is_equal_approx(last_camera_transform);
 }
 
 void Node3DEditorViewport::_apply_camera_transform_to_cursor() {
-	if (previewing_camera && previewing) {
-		if (pilot_preview_enabled) {
-			_sync_cursor_from_transform(previewing->get_global_transform());
-		}
-		return;
+	// Effectively the reverse of to_camera_transform, use camera transform to set cursor position and rotation.
+	const Transform3D camera_transform = camera->get_camera_transform();
+	const Basis basis = camera_transform.basis;
+
+	real_t distance;
+	if (orthogonal) {
+		distance = (get_zfar() - get_znear()) / 2.0;
+	} else {
+		distance = cursor.distance;
 	}
-	_sync_cursor_from_transform(camera->get_camera_transform());
+
+	cursor.pos = camera_transform.origin - basis.get_column(2) * distance;
+
+	cursor.x_rot = -camera_transform.basis.get_euler().x;
+	cursor.y_rot = -camera_transform.basis.get_euler().y;
+	cursor.unsnapped_x_rot = cursor.x_rot;
+	cursor.unsnapped_y_rot = cursor.y_rot;
 }
 
 void Node3DEditorViewport::_menu_option(int p_option) {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	switch (p_option) {
 		case VIEW_TOP: {
-			view_3d_controller->cursor.y_rot = 0;
-			view_3d_controller->cursor.x_rot = Math::PI / 2.0;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
+			cursor.y_rot = 0;
+			cursor.x_rot = Math::PI / 2.0;
+			cursor.unsnapped_y_rot = cursor.y_rot;
+			cursor.unsnapped_x_rot = cursor.x_rot;
 			set_message(TTR("Top View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_TOP);
+			view_type = VIEW_TYPE_TOP;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_BOTTOM: {
-			view_3d_controller->cursor.y_rot = 0;
-			view_3d_controller->cursor.x_rot = -Math::PI / 2.0;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
+			cursor.y_rot = 0;
+			cursor.x_rot = -Math::PI / 2.0;
+			cursor.unsnapped_y_rot = cursor.y_rot;
+			cursor.unsnapped_x_rot = cursor.x_rot;
 			set_message(TTR("Bottom View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_BOTTOM);
+			view_type = VIEW_TYPE_BOTTOM;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_LEFT: {
-			view_3d_controller->cursor.x_rot = 0;
-			view_3d_controller->cursor.y_rot = Math::PI / 2.0;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
+			cursor.x_rot = 0;
+			cursor.y_rot = Math::PI / 2.0;
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			cursor.unsnapped_y_rot = cursor.y_rot;
 			set_message(TTR("Left View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_LEFT);
+			view_type = VIEW_TYPE_LEFT;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_RIGHT: {
-			view_3d_controller->cursor.x_rot = 0;
-			view_3d_controller->cursor.y_rot = -Math::PI / 2.0;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
+			cursor.x_rot = 0;
+			cursor.y_rot = -Math::PI / 2.0;
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			cursor.unsnapped_y_rot = cursor.y_rot;
 			set_message(TTR("Right View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_RIGHT);
+			view_type = VIEW_TYPE_RIGHT;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_FRONT: {
-			view_3d_controller->cursor.x_rot = 0;
-			view_3d_controller->cursor.y_rot = 0;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
+			cursor.x_rot = 0;
+			cursor.y_rot = 0;
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			cursor.unsnapped_y_rot = cursor.y_rot;
 			set_message(TTR("Front View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_FRONT);
+			view_type = VIEW_TYPE_FRONT;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_REAR: {
-			view_3d_controller->cursor.x_rot = 0;
-			view_3d_controller->cursor.y_rot = Math::PI;
-			view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-			view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
+			cursor.x_rot = 0;
+			cursor.y_rot = Math::PI;
+			cursor.unsnapped_x_rot = cursor.x_rot;
+			cursor.unsnapped_y_rot = cursor.y_rot;
 			set_message(TTR("Rear View."), 2);
-			view_3d_controller->set_view_type(View3DController::VIEW_TYPE_REAR);
+			view_type = VIEW_TYPE_REAR;
+			_set_auto_orthogonal();
+			_update_name();
 
 		} break;
 		case VIEW_CENTER_TO_ORIGIN: {
-			view_3d_controller->cursor.pos = Vector3(0, 0, 0);
-			_disable_follow_mode();
+			cursor.pos = Vector3(0, 0, 0);
 
 		} break;
 		case VIEW_CENTER_TO_SELECTION: {
@@ -4333,9 +4061,9 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 				}
 
 				Transform3D xform = camera_transform;
-				if (view_3d_controller->is_orthogonal()) {
-					Vector3 offset = camera_transform.basis.xform(Vector3(0, 0, view_3d_controller->cursor.distance));
-					xform.origin = view_3d_controller->cursor.pos + offset;
+				if (orthogonal) {
+					Vector3 offset = camera_transform.basis.xform(Vector3(0, 0, cursor.distance));
+					xform.origin = cursor.pos + offset;
 				} else {
 					xform.scale_basis(sp->get_scale());
 				}
@@ -4407,22 +4135,24 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 		case VIEW_PERSPECTIVE: {
 			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
 			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), false);
-			view_3d_controller->set_orthogonal(false);
+			orthogonal = false;
+			auto_orthogonal = false;
 			callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view).call_deferred();
-			view_3d_controller->update_camera();
+			_update_camera(0);
 			_update_name();
 
 		} break;
 		case VIEW_ORTHOGONAL: {
 			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), false);
 			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), true);
-			view_3d_controller->set_orthogonal(true);
+			orthogonal = true;
+			auto_orthogonal = false;
 			callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view).call_deferred();
-			view_3d_controller->update_camera();
+			_update_camera(0);
 			_update_name();
 		} break;
 		case VIEW_SWITCH_PERSPECTIVE_ORTHOGONAL: {
-			_menu_option(view_3d_controller->is_orthogonal() ? VIEW_PERSPECTIVE : VIEW_ORTHOGONAL);
+			_menu_option(orthogonal ? VIEW_PERSPECTIVE : VIEW_ORTHOGONAL);
 
 		} break;
 		case VIEW_AUTO_ORTHOGONAL: {
@@ -4430,8 +4160,10 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			view_display_menu->get_popup()->set_item_checked(idx, current);
-			view_3d_controller->set_auto_orthogonal_allowed(current);
-			_update_name();
+			if (auto_orthogonal) {
+				auto_orthogonal = false;
+				_update_name();
+			}
 		} break;
 		case VIEW_LOCK_ROTATION: {
 			int idx = view_display_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
@@ -4631,6 +4363,13 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 	}
 }
 
+void Node3DEditorViewport::_set_auto_orthogonal() {
+	if (!orthogonal && view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL))) {
+		_menu_option(VIEW_ORTHOGONAL);
+		auto_orthogonal = true;
+	}
+}
+
 void Node3DEditorViewport::_preview_exited_scene() {
 	preview_camera->disconnect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
 	preview_camera->set_pressed(false);
@@ -4645,22 +4384,6 @@ void Node3DEditorViewport::_preview_camera_property_changed() {
 	}
 }
 
-void Node3DEditorViewport::_sync_cursor_from_transform(const Transform3D &p_transform) {
-	const Basis basis = p_transform.basis;
-
-	view_3d_controller->cursor.eye_pos = p_transform.origin;
-	view_3d_controller->cursor.x_rot = -basis.get_euler().x;
-	view_3d_controller->cursor.y_rot = -basis.get_euler().y;
-	view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
-	view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
-
-	real_t distance = view_3d_controller->cursor.distance;
-	if (view_3d_controller->is_orthogonal()) {
-		distance = (get_zfar() - get_znear()) / 2.0;
-	}
-	view_3d_controller->cursor.pos = p_transform.origin - basis.get_column(2) * distance;
-}
-
 void Node3DEditorViewport::_update_centered_labels() {
 	if (cinema_label->is_visible()) {
 		cinema_label->reset_size();
@@ -4683,37 +4406,37 @@ void Node3DEditorViewport::_init_gizmo_instance(int p_idx) {
 		RS::get_singleton()->instance_set_base(move_gizmo_instance[i], spatial_editor->get_move_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(move_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(move_gizmo_instance[i], false);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(move_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
 		move_plane_gizmo_instance[i] = RS::get_singleton()->instance_create();
 		RS::get_singleton()->instance_set_base(move_plane_gizmo_instance[i], spatial_editor->get_move_plane_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(move_plane_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(move_plane_gizmo_instance[i], false);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_plane_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_plane_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(move_plane_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
 		scale_gizmo_instance[i] = RS::get_singleton()->instance_create();
 		RS::get_singleton()->instance_set_base(scale_gizmo_instance[i], spatial_editor->get_scale_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(scale_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(scale_gizmo_instance[i], false);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(scale_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
 		scale_plane_gizmo_instance[i] = RS::get_singleton()->instance_create();
 		RS::get_singleton()->instance_set_base(scale_plane_gizmo_instance[i], spatial_editor->get_scale_plane_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(scale_plane_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(scale_plane_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
 		axis_gizmo_instance[i] = RS::get_singleton()->instance_create();
 	}
@@ -4722,10 +4445,10 @@ void Node3DEditorViewport::_init_gizmo_instance(int p_idx) {
 		RS::get_singleton()->instance_set_base(axis_gizmo_instance[i], spatial_editor->get_axis_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(axis_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(axis_gizmo_instance[i], true);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(axis_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(axis_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(axis_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(axis_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(axis_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(axis_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(axis_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 	}
 
 	for (int i = 0; i < 4; i++) {
@@ -4733,21 +4456,11 @@ void Node3DEditorViewport::_init_gizmo_instance(int p_idx) {
 		RS::get_singleton()->instance_set_base(rotate_gizmo_instance[i], spatial_editor->get_rotate_gizmo(i)->get_rid());
 		RS::get_singleton()->instance_set_scenario(rotate_gizmo_instance[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], false);
-		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(rotate_gizmo_instance[i], RSE::SHADOW_CASTING_SETTING_OFF);
+		RS::get_singleton()->instance_geometry_set_cast_shadows_setting(rotate_gizmo_instance[i], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(rotate_gizmo_instance[i], layer);
-		RS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 	}
-
-	// Create trackball sphere instance
-	trackball_sphere_instance = RS::get_singleton()->instance_create();
-	RS::get_singleton()->instance_set_base(trackball_sphere_instance, spatial_editor->get_trackball_sphere_gizmo()->get_rid());
-	RS::get_singleton()->instance_set_scenario(trackball_sphere_instance, get_tree()->get_root()->get_world_3d()->get_scenario());
-	RS::get_singleton()->instance_set_visible(trackball_sphere_instance, false);
-	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(trackball_sphere_instance, RSE::SHADOW_CASTING_SETTING_OFF);
-	RS::get_singleton()->instance_set_layer_mask(trackball_sphere_instance, layer);
-	RS::get_singleton()->instance_geometry_set_flag(trackball_sphere_instance, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(trackball_sphere_instance, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 }
 
 void Node3DEditorViewport::_finish_gizmo_instances() {
@@ -4762,27 +4475,12 @@ void Node3DEditorViewport::_finish_gizmo_instances() {
 	}
 	// Rotation white outline
 	RS::get_singleton()->free_rid(rotate_gizmo_instance[3]);
-
-	RS::get_singleton()->free_rid(trackball_sphere_instance);
-}
-
-void Node3DEditorViewport::_disable_follow_mode() {
-	// Exit follow mode by resetting the number of times the follow shortcut was used consecutively.
-	times_focused_consecutively = 0;
-}
-
-void Node3DEditorViewport::_reset_follow_mode_count() {
-	bool is_in_follow_mode = times_focused_consecutively >= 2 && times_focused_consecutively % 2 == 0;
-	if (!is_in_follow_mode) {
-		times_focused_consecutively = 0;
-	}
 }
 
 void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) {
 	ERR_FAIL_COND(p_activate && !preview);
 	ERR_FAIL_COND(!p_activate && !previewing);
 
-	emit_signal(SNAME("clicked"));
 	previewing_camera = p_activate;
 	_update_navigation_controls_visibility();
 
@@ -4794,14 +4492,6 @@ void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) {
 		if (!preview) {
 			preview_camera->hide();
 		}
-		pilot_camera->hide();
-		pilot_preview_enabled = false;
-		pilot_camera->set_pressed(false);
-
-		_apply_camera_transform_to_cursor();
-		view_3d_controller->update_camera(0);
-		last_camera_transform = camera->get_global_transform();
-
 		surface->queue_redraw();
 
 	} else {
@@ -4809,28 +4499,10 @@ void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) {
 		previewing->connect(SceneStringName(tree_exiting), callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
 		previewing->connect(CoreStringName(property_list_changed), callable_mp(this, &Node3DEditorViewport::_preview_camera_property_changed));
 		RS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace
-
-		_sync_cursor_from_transform(preview->get_global_transform());
-		view_3d_controller->update_camera(0);
-
-		pilot_camera->show();
-
-		if (Input::get_singleton()->is_key_pressed(Key::SHIFT)) {
-			pilot_camera->set_pressed(true);
-		}
-
 		surface->queue_redraw();
 	}
 }
 
-void Node3DEditorViewport::_toggle_pilot_preview(bool p_activate) {
-	pilot_preview_enabled = p_activate;
-	if (p_activate && previewing) {
-		_sync_cursor_from_transform(previewing->get_global_transform());
-		view_3d_controller->update_camera(0);
-	}
-}
-
 void Node3DEditorViewport::_toggle_cinema_preview(bool p_activate) {
 	previewing_cinema = p_activate;
 	_update_navigation_controls_visibility();
@@ -4882,25 +4554,6 @@ void Node3DEditorViewport::set_can_preview(Camera3D *p_preview) {
 	}
 }
 
-void Node3DEditorViewport::switch_preview_camera(Camera3D *p_new_camera) {
-	if (!previewing_camera || !previewing || !p_new_camera || p_new_camera == previewing) {
-		return;
-	}
-
-	previewing->disconnect(SceneStringName(tree_exiting), callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
-	previewing->disconnect(CoreStringName(property_list_changed), callable_mp(this, &Node3DEditorViewport::_preview_camera_property_changed));
-
-	previewing = p_new_camera;
-	previewing->connect(SceneStringName(tree_exiting), callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
-	previewing->connect(CoreStringName(property_list_changed), callable_mp(this, &Node3DEditorViewport::_preview_camera_property_changed));
-	RS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), p_new_camera->get_camera());
-
-	_sync_cursor_from_transform(p_new_camera->get_global_transform());
-	view_3d_controller->update_camera(0);
-
-	surface->queue_redraw();
-}
-
 void Node3DEditorViewport::update_transform_gizmo_view() {
 	if (!is_visible_in_tree()) {
 		return;
@@ -4940,8 +4593,8 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 			MIN(viewport_base_height, subviewport_container->get_size().height) / viewport_base_height;
 	Vector3 scale = Vector3(1, 1, 1) * gizmo_scale;
 
-	// If the determinant is zero, we should disable the gizmo from being rendered,
-	// this prevents supplying bad values to the renderer and then having to filter it out again.
+	// if the determinant is zero, we should disable the gizmo from being rendered
+	// this prevents supplying bad values to the renderer and then having to filter it out again
 	if (xform.basis.determinant() == 0) {
 		for (int i = 0; i < 3; i++) {
 			RenderingServer::get_singleton()->instance_set_visible(move_gizmo_instance[i], false);
@@ -4949,7 +4602,6 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 			RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], false);
 			RenderingServer::get_singleton()->instance_set_visible(scale_gizmo_instance[i], false);
 			RenderingServer::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false);
-			RenderingServer::get_singleton()->instance_set_visible(axis_gizmo_instance[i], false);
 		}
 		RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], false);
 		return;
@@ -4961,7 +4613,6 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 
 	bool keep_gizmo_visible = arc_visible && ((local_coords && (show_gizmo_flags & Node3DEditor::TRANSFORM_MODE_LOCAL)) || (!local_coords && (show_gizmo_flags & Node3DEditor::TRANSFORM_MODE_GLOBAL)));
 	bool hide_gizmo_during_rotation = arc_visible && !keep_gizmo_visible;
-	bool hide_gizmo_during_trackball = (_edit.mode == TRANSFORM_ROTATE && _edit.is_trackball);
 
 	int arc_replaces_ring = -1;
 	if (keep_gizmo_visible) {
@@ -4983,7 +4634,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 		}
 	}
 
-	bool show_gizmo = spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible && !collision_reposition && !hide_gizmo_during_rotation && !hide_gizmo_during_trackball;
+	bool show_gizmo = spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible && !collision_reposition && !hide_gizmo_during_rotation;
 	bool show_rotate_gizmo = show_gizmo && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE);
 
 	for (int i = 0; i < 3; i++) {
@@ -5009,62 +4660,48 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 	Transform3D view_rotation_xform = xform;
 	view_rotation_xform.orthonormalize();
 	bool shrink_view_ring = arc_replaces_ring >= 0 && arc_replaces_ring < 3;
-	Vector3 view_ring_scale = shrink_view_ring ? scale * spatial_editor->gizmo_view_rotation_shrink : scale;
+	Vector3 view_ring_scale = shrink_view_ring ? scale * (GIZMO_CIRCLE_SIZE / GIZMO_VIEW_ROTATION_SIZE) : scale;
 	view_rotation_xform.basis.scale(view_ring_scale);
 	RenderingServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[3], view_rotation_xform);
 	RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], show_rotate_gizmo && arc_replaces_ring != 3);
 
-	bool can_show_trackball = spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible && !collision_reposition && !hide_gizmo_during_rotation;
-	bool show_trackball_sphere = can_show_trackball && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_TRANSFORM || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE) && !hide_gizmo_during_trackball;
-	RenderingServer::get_singleton()->instance_set_transform(trackball_sphere_instance, view_rotation_xform);
-	RenderingServer::get_singleton()->instance_set_visible(trackball_sphere_instance, show_trackball_sphere);
-
-	bool show_axes = spatial_editor->is_gizmo_visible() && _edit.mode != TRANSFORM_NONE && !hide_gizmo_during_trackball;
+	bool show_axes = spatial_editor->is_gizmo_visible() && _edit.mode != TRANSFORM_NONE;
 	RenderingServer *rs = RenderingServer::get_singleton();
 	rs->instance_set_visible(axis_gizmo_instance[0], show_axes && (_edit.plane == TRANSFORM_X_AXIS || _edit.plane == TRANSFORM_XY || _edit.plane == TRANSFORM_XZ));
 	rs->instance_set_visible(axis_gizmo_instance[1], show_axes && (_edit.plane == TRANSFORM_Y_AXIS || _edit.plane == TRANSFORM_XY || _edit.plane == TRANSFORM_YZ));
 	rs->instance_set_visible(axis_gizmo_instance[2], show_axes && (_edit.plane == TRANSFORM_Z_AXIS || _edit.plane == TRANSFORM_XZ || _edit.plane == TRANSFORM_YZ));
 }
 
-void Node3DEditorViewport::update_transform_gizmo_highlight() {
-	if (!is_visible_in_tree() || !Rect2(Vector2(), surface->get_size()).has_point(surface->get_local_mouse_position())) {
-		return;
-	}
-	_transform_gizmo_select(surface->get_local_mouse_position(), true);
-}
-
 void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 	if (p_state.has("position")) {
-		view_3d_controller->cursor.pos = p_state["position"];
+		cursor.pos = p_state["position"];
 	}
 	if (p_state.has("x_rotation")) {
-		view_3d_controller->cursor.x_rot = p_state["x_rotation"];
-		view_3d_controller->cursor.unsnapped_x_rot = view_3d_controller->cursor.x_rot;
+		cursor.x_rot = p_state["x_rotation"];
+		cursor.unsnapped_x_rot = cursor.x_rot;
 	}
 	if (p_state.has("y_rotation")) {
-		view_3d_controller->cursor.y_rot = p_state["y_rotation"];
-		view_3d_controller->cursor.unsnapped_y_rot = view_3d_controller->cursor.y_rot;
+		cursor.y_rot = p_state["y_rotation"];
+		cursor.unsnapped_y_rot = cursor.y_rot;
 	}
 	if (p_state.has("distance")) {
-		view_3d_controller->cursor.distance = p_state["distance"];
+		cursor.distance = p_state["distance"];
 	}
 	if (p_state.has("orthogonal")) {
 		bool orth = p_state["orthogonal"];
 		_menu_option(orth ? VIEW_ORTHOGONAL : VIEW_PERSPECTIVE);
 	}
 	if (p_state.has("view_type")) {
-		view_3d_controller->set_view_type(View3DController::ViewType(p_state["view_type"].operator int()));
+		view_type = ViewType(p_state["view_type"].operator int());
+		_update_name();
+	}
+	if (p_state.has("auto_orthogonal")) {
+		auto_orthogonal = p_state["auto_orthogonal"];
+		_update_name();
 	}
 	if (p_state.has("auto_orthogonal_enabled")) {
 		bool enabled = p_state["auto_orthogonal_enabled"];
 		view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), enabled);
-		view_3d_controller->set_auto_orthogonal_allowed(enabled);
-	}
-	if (p_state.has("auto_orthogonal")) {
-		if (p_state["auto_orthogonal"]) {
-			view_3d_controller->force_auto_orthogonal();
-			_update_name();
-		}
 	}
 	if (p_state.has("display_mode")) {
 		int display = p_state["display_mode"];
@@ -5178,12 +4815,6 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 			_update_navigation_controls_visibility();
 			preview_camera->set_pressed(true);
 			preview_camera->show();
-			pilot_camera->show();
-
-			camera->set_global_transform(view_3d_controller->to_camera_transform());
-
-			_sync_cursor_from_transform(previewing->get_global_transform());
-			view_3d_controller->update_camera(0);
 		}
 	}
 	preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
@@ -5191,14 +4822,14 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 
 Dictionary Node3DEditorViewport::get_state() const {
 	Dictionary d;
-	d["position"] = view_3d_controller->cursor.pos;
-	d["x_rotation"] = view_3d_controller->cursor.x_rot;
-	d["y_rotation"] = view_3d_controller->cursor.y_rot;
-	d["distance"] = view_3d_controller->cursor.distance;
+	d["position"] = cursor.pos;
+	d["x_rotation"] = cursor.x_rot;
+	d["y_rotation"] = cursor.y_rot;
+	d["distance"] = cursor.distance;
 	d["use_environment"] = camera->get_environment().is_valid();
 	d["orthogonal"] = camera->get_projection() == Camera3D::PROJECTION_ORTHOGONAL;
-	d["view_type"] = view_3d_controller->get_view_type();
-	d["auto_orthogonal"] = view_3d_controller->get_orthogonal_mode() == View3DController::ORTHOGONAL_AUTO;
+	d["view_type"] = view_type;
+	d["auto_orthogonal"] = auto_orthogonal;
 	d["auto_orthogonal_enabled"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL));
 
 	// Find selected display mode.
@@ -5229,7 +4860,7 @@ Dictionary Node3DEditorViewport::get_state() const {
 	if (previewing) {
 		d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
 	}
-	d["lock_rotation"] = view_3d_controller->is_locking_rotation();
+	d["lock_rotation"] = lock_rotation;
 
 	return d;
 }
@@ -5240,13 +4871,16 @@ void Node3DEditorViewport::_bind_methods() {
 }
 
 void Node3DEditorViewport::reset() {
-	view_3d_controller->set_orthogonal(false);
-	view_3d_controller->set_view_type(View3DController::VIEW_TYPE_USER);
+	orthogonal = false;
+	auto_orthogonal = false;
+	lock_rotation = false;
 	message_time = 0;
 	message = "";
 	last_message = "";
+	view_type = VIEW_TYPE_USER;
 
-	view_3d_controller->cursor = View3DController::Cursor();
+	cursor = Cursor();
+	_update_name();
 }
 
 void Node3DEditorViewport::focus_selection() {
@@ -5254,10 +4888,6 @@ void Node3DEditorViewport::focus_selection() {
 	int count = 0;
 
 	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-	focused_node_id = ObjectID();
-	if (!selection.is_empty()) {
-		focused_node_id = selection.front()->get()->get_instance_id();
-	}
 
 	for (Node *node : selection) {
 		Node3D *node_3d = Object::cast_to<Node3D>(node);
@@ -5291,7 +4921,7 @@ void Node3DEditorViewport::focus_selection() {
 		center /= count;
 	}
 
-	view_3d_controller->cursor.pos = center;
+	cursor.pos = center;
 }
 
 void Node3DEditorViewport::assign_pending_data_pointers(Node3D *p_preview_node, AABB *p_preview_bounds, AcceptDialog *p_accept) {
@@ -5384,7 +5014,7 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos, Node3D
 
 	// Plane facing the camera using fallback distance.
 	if (is_orthogonal) {
-		plane = Plane(world_ray, view_3d_controller->cursor.pos - world_ray * (view_3d_controller->cursor.distance - FALLBACK_DISTANCE));
+		plane = Plane(world_ray, cursor.pos - world_ray * (cursor.distance - FALLBACK_DISTANCE));
 	} else {
 		plane = Plane(world_ray, world_pos + world_ray * FALLBACK_DISTANCE);
 	}
@@ -5505,13 +5135,12 @@ void Node3DEditorViewport::_create_preview_node(const Vector<String> &files) con
 	}
 	if (add_preview) {
 		EditorNode::get_singleton()->get_scene_root()->add_child(preview_node);
-		*preview_bounds = _calculate_spatial_bounds(preview_node);
 	}
+
+	*preview_bounds = _calculate_spatial_bounds(preview_node);
 }
 
 void Node3DEditorViewport::_remove_preview_node() {
-	tooltip_panel->hide();
-
 	set_message("");
 	if (preview_node->get_parent()) {
 		for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
@@ -5612,7 +5241,8 @@ void Node3DEditorViewport::_reset_preview_material() const {
 }
 
 void Node3DEditorViewport::_remove_preview_material() {
-	tooltip_panel->hide();
+	preview_material_label->hide();
+	preview_material_label_desc->hide();
 
 	spatial_editor->set_preview_material(Ref<Material>());
 	spatial_editor->set_preview_reset_material(Ref<Material>());
@@ -5813,180 +5443,116 @@ void Node3DEditorViewport::_perform_drop_data() {
 	}
 }
 
-void Node3DEditorViewport::_show_tooltip(const String &p_title, const String &p_description) const {
-	tooltip_panel->set_text(
-			vformat("[font_size=%s][b][color=%s]%s[/color][/b][/font_size]\n%s",
-					get_theme_default_font_size() + 2,
-					get_theme_color(SNAME("accent_color"), EditorStringName(Editor)).to_html(false),
-					p_title, p_description));
-	tooltip_panel->show();
-}
-
 bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-	if (previewing) {
-		return false;
-	}
-
 	if (p_point == Vector2(Math::INF, Math::INF)) {
-		tooltip_panel->hide();
 		return false;
 	}
 	preview_node_viewport_pos = p_point;
 
-	Dictionary d = p_data;
-	if (!d.has("type") || String(d["type"]) != "files") {
-		tooltip_panel->hide();
+	bool can_instantiate = false;
+	bool is_cyclical_dep = false;
+	String error_file;
+
+	if (!preview_node->is_inside_tree() && spatial_editor->get_preview_material().is_null()) {
+		Dictionary d = p_data;
+		if (d.has("type") && (String(d["type"]) == "files")) {
+			Vector<String> files = d["files"];
+
+			// Track whether a type other than PackedScene is valid to stop checking them and only
+			// continue to check if the rest of the scenes are valid (don't have cyclic dependencies).
+			bool is_other_valid = false;
+			// Check if at least one of the dragged files is a mesh, material, texture or scene.
+			for (int i = 0; i < files.size(); i++) {
+				const String &res_type = ResourceLoader::get_resource_type(files[i]);
+				bool is_scene = ClassDB::is_parent_class(res_type, "PackedScene");
+				bool is_mesh = ClassDB::is_parent_class(res_type, "Mesh");
+				bool is_material = ClassDB::is_parent_class(res_type, "Material");
+				bool is_texture = ClassDB::is_parent_class(res_type, "Texture");
+				bool is_audio = ClassDB::is_parent_class(res_type, "AudioStream");
+
+				if (is_mesh || is_scene || is_material || is_texture || is_audio) {
+					Ref<Resource> res = ResourceLoader::load(files[i]);
+					if (res.is_null()) {
+						continue;
+					}
+					Ref<PackedScene> scn = res;
+					Ref<Mesh> mesh = res;
+					Ref<Material> mat = res;
+					Ref<Texture2D> tex = res;
+					Ref<AudioStream> audio = res;
+					if (scn.is_valid()) {
+						Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
+						if (!instantiated_scene) {
+							continue;
+						}
+						Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
+						if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
+							memdelete(instantiated_scene);
+							can_instantiate = false;
+							is_cyclical_dep = true;
+							error_file = files[i].get_file();
+							break;
+						}
+						memdelete(instantiated_scene);
+					} else if (!is_other_valid && mat.is_valid()) {
+						Ref<BaseMaterial3D> base_mat = res;
+						Ref<ShaderMaterial> shader_mat = res;
+
+						if (base_mat.is_null() && shader_mat.is_null()) {
+							continue;
+						}
+
+						spatial_editor->set_preview_material(mat);
+						is_other_valid = true;
+						continue;
+					} else if (!is_other_valid && mesh.is_valid()) {
+						// Let the mesh pass.
+						is_other_valid = true;
+					} else if (!is_other_valid && tex.is_valid()) {
+						Ref<StandardMaterial3D> new_mat = memnew(StandardMaterial3D);
+						new_mat->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, tex);
+
+						spatial_editor->set_preview_material(new_mat);
+						is_other_valid = true;
+						continue;
+					} else if (!is_other_valid && audio.is_valid()) {
+						is_other_valid = true;
+					} else {
+						continue;
+					}
+					can_instantiate = true;
+				}
+			}
+			if (can_instantiate) {
+				_create_preview_node(files);
+				preview_node->hide();
+			}
+		}
+	} else {
+		if (preview_node->is_inside_tree()) {
+			can_instantiate = true;
+		}
+	}
+
+	if (is_cyclical_dep) {
+		set_message(vformat(TTR("Can't instantiate: %s."), vformat(TTR("Circular dependency found at %s"), error_file)));
 		return false;
 	}
-	Vector<String> files = d["files"];
 
-	// If we already have a preview material or preview node,
-	// We just need to update them.
-	if (spatial_editor->get_preview_material().is_valid()) {
-		ObjectID new_preview_material_target = _select_ray(p_point);
-		return _apply_preview_material(new_preview_material_target, p_point);
-	}
-
-	if (preview_node->is_inside_tree()) {
-		preview_node_viewport_pos = p_point;
+	if (can_instantiate) {
 		update_preview_node = true;
 		return true;
 	}
 
-	// If we don't already have a preview material or preview node,
-	// it means that this is the first time we are visiting this function.
-	// In that case, we need to check that the file(s) are droppable.
-	bool is_cyclical_dep = false;
-	String error_file;
+	if (spatial_editor->get_preview_material().is_valid()) {
+		preview_material_label->show();
+		preview_material_label_desc->show();
 
-	enum {
-		SCENE = 1 << 0,
-		TEXTURE = 1 << 1,
-		AUDIO = 1 << 2,
-		MESH = 1 << 3,
-		MATERIAL = 1 << 4,
-	};
-	int instantiate_type = 0;
-
-	// Track whether a type other than PackedScene is valid to stop checking them and only
-	// continue to check if the rest of the scenes are valid (don't have cyclic dependencies).
-	bool is_other_valid = false;
-	// Check if at least one of the dragged files is a mesh, material, texture, or scene.
-	for (int i = 0; i < files.size(); i++) {
-		const String &res_type = ResourceLoader::get_resource_type(files[i]);
-		bool is_scene = ClassDB::is_parent_class(res_type, "PackedScene");
-		bool is_mesh = ClassDB::is_parent_class(res_type, "Mesh");
-		bool is_material = ClassDB::is_parent_class(res_type, "Material");
-		bool is_texture = ClassDB::is_parent_class(res_type, "Texture");
-		bool is_audio = ClassDB::is_parent_class(res_type, "AudioStream");
-
-		if (is_mesh || is_scene || is_material || is_texture || is_audio) {
-			Ref<Resource> res = ResourceLoader::load(files[i]);
-			if (res.is_null()) {
-				continue;
-			}
-			Ref<PackedScene> scn = res;
-			Ref<Mesh> mesh = res;
-			Ref<Material> mat = res;
-			Ref<Texture2D> tex = res;
-			Ref<AudioStream> audio = res;
-			if (scn.is_valid()) {
-				Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
-				if (!instantiated_scene) {
-					continue;
-				}
-				Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-				if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
-					memdelete(instantiated_scene);
-					is_cyclical_dep = true;
-					error_file = files[i].get_file();
-					break;
-				}
-				memdelete(instantiated_scene);
-				instantiate_type |= SCENE;
-			} else if (!is_other_valid && mat.is_valid()) {
-				Ref<BaseMaterial3D> base_mat = res;
-				Ref<ShaderMaterial> shader_mat = res;
-
-				if (base_mat.is_null() && shader_mat.is_null()) {
-					continue;
-				}
-
-				spatial_editor->set_preview_material(mat);
-				is_other_valid = true;
-				instantiate_type |= MATERIAL;
-				continue;
-			} else if (!is_other_valid && mesh.is_valid()) {
-				// Let the mesh pass.
-				is_other_valid = true;
-				instantiate_type |= MESH;
-			} else if (!is_other_valid && tex.is_valid()) {
-				Ref<StandardMaterial3D> new_mat;
-				new_mat.instantiate();
-				new_mat->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, tex);
-
-				spatial_editor->set_preview_material(new_mat);
-				is_other_valid = true;
-				instantiate_type |= TEXTURE;
-				continue;
-			} else if (!is_other_valid && audio.is_valid()) {
-				is_other_valid = true;
-				instantiate_type |= AUDIO;
-			} else {
-				continue;
-			}
-		}
+		ObjectID new_preview_material_target = _select_ray(p_point);
+		return _apply_preview_material(new_preview_material_target, p_point);
 	}
 
-	String title = TTRN("Can't drop the file...", "Can't drop the files...", files.size());
-	if (is_cyclical_dep) {
-		_show_tooltip(title, vformat(TTR("Circular dependency found at %s."), error_file));
-		return false;
-	}
-
-	if (instantiate_type == 0) {
-		_show_tooltip(title, TTR("File format is not supported."));
-		return false;
-	}
-
-	// Only droppable file(s), on first frame, will make it to this point.
-	// Hence it is a good place to create the previews and tooltips.
-	_create_preview_node(files);
-	preview_node->hide();
-
-	String desc = "[ul]" +
-			TTRN("[b]Default:[/b] Add as sibling of selected node (except when root is selected).",
-					"[b]Default:[/b] Add as siblings of selected node (except when root is selected).",
-					files.size()) +
-			"\n" +
-			TTRN("[b]Hold Shift:[/b] Add as child of selected node.",
-					"[b]Hold Shift:[/b] Add as children of selected node.",
-					files.size()) +
-			"\n" +
-			TTRN("[b]Hold Alt:[/b] Add as child of root node.",
-					"[b]Hold Alt:[/b] Add as children of root node.",
-					files.size());
-
-	if (files.size() > 1) {
-		title = TTR("Dropping multiple files...");
-	} else if (instantiate_type & SCENE) {
-		title = TTR("Dropping a Scene file...");
-	} else if (instantiate_type & MESH) {
-		title = TTR("Dropping a Mesh file...");
-	} else if (instantiate_type & AUDIO) {
-		title = TTR("Dropping an Audio file...");
-	} else if (instantiate_type & MATERIAL || instantiate_type & TEXTURE) {
-		title = TTR("Dropping a Material...");
-		desc = "[ul]";
-		desc += vformat(TTR("[b]Default:[/b] Place in Geometry's Material Override slot.") +
-						"\n" + TTR("[b]Hold %s:[/b] Place in Mesh's Surface Material Override slot."),
-				keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL));
-	}
-	desc += "[/ul]";
-
-	_show_tooltip(title, desc);
-
-	return true;
+	return false;
 }
 
 void Node3DEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
@@ -6030,38 +5596,18 @@ void Node3DEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_
 }
 
 void Node3DEditorViewport::begin_transform(TransformMode p_mode, bool instant) {
-	if (previewing) {
-		return;
-	}
-
 	if (get_selected_count() > 0) {
-		_edit.children_original_globals.clear();
-
 		_edit.mode = p_mode;
 		_compute_edit(_edit.mouse_pos);
 		_edit.instant = instant;
+		_edit.snap = spatial_editor->is_snap_enabled();
 		_edit.initial_click_vector = Vector3();
 		_edit.previous_rotation_vector = Vector3();
 		_edit.accumulated_rotation_angle = 0.0;
-		_edit.rotation_angle = 0.0;
+		_edit.display_rotation_angle = 0.0;
 		_edit.gizmo_initiated = false;
-		switch (p_mode) {
-			case TRANSFORM_ROTATE:
-				_edit.show_rotation_line = true;
-				set_message(vformat(TTR("Rotating %s degrees."), String::num(0, 0)));
-				break;
-			case TRANSFORM_TRANSLATE:
-				set_message(vformat(TTR("Translating: %s"), vformat("%.0v", Vector3())));
-				break;
-			case TRANSFORM_SCALE:
-				set_message(vformat(TTR("Scaling: %s"), vformat("%.0v", Vector3())));
-				break;
-			default:
-				break;
-		}
 		update_transform_gizmo_view();
 		set_process_input(instant);
-		surface->queue_redraw();
 	}
 }
 
@@ -6094,23 +5640,10 @@ void Node3DEditorViewport::commit_transform() {
 		undo_redo->add_do_method(sp, "set_transform", sp->get_local_gizmo_transform());
 		undo_redo->add_undo_method(sp, "set_transform", se->original_local);
 	}
-
-	if (!_edit.children_original_globals.is_empty()) {
-		for (const KeyValue<Node3D *, Transform3D> &pair : _edit.children_original_globals) {
-			Node3D *child = pair.key;
-			Transform3D original_global = pair.value;
-			Transform3D current_global = child->get_global_transform();
-
-			undo_redo->add_do_method(child, "set_global_transform", current_global);
-			undo_redo->add_undo_method(child, "set_global_transform", original_global);
-		}
-	}
-
 	undo_redo->commit_action();
 
 	collision_reposition = false;
 	finish_transform();
-	_reset_follow_mode_count();
 	set_message("");
 }
 
@@ -6243,14 +5776,15 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 
 			motion /= click.distance_to(_edit.center);
 
-			if (spatial_editor->is_snap_enabled()) {
+			if (_edit.snap || spatial_editor->is_snap_enabled()) {
 				snap = spatial_editor->get_scale_snap() / 100;
 			}
 			Vector3 motion_snapped = motion;
 			motion_snapped.snapf(snap);
 			// This might not be necessary anymore after issue #288 is solved (in 4.0?).
 			// TRANSLATORS: Refers to changing the scale of a node in the 3D editor.
-			set_message(vformat(TTR("Scaling: %s"), vformat("%.*v", snap_step_decimals, motion_snapped)));
+			set_message(TTR("Scaling:") + " (" + String::num(motion_snapped.x, snap_step_decimals) + ", " +
+					String::num(motion_snapped.y, snap_step_decimals) + ", " + String::num(motion_snapped.z, snap_step_decimals) + ")");
 			if (local_coords) {
 				// TODO: needed?
 				motion = _edit.original.basis.inverse().xform(motion);
@@ -6311,13 +5845,14 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 				}
 			}
 
-			if (spatial_editor->is_snap_enabled()) {
+			if (_edit.snap || spatial_editor->is_snap_enabled()) {
 				snap = spatial_editor->get_translate_snap();
 			}
 			Vector3 motion_snapped = motion;
 			motion_snapped.snapf(snap);
 			// TRANSLATORS: Refers to changing the position of a node in the 3D editor.
-			set_message(vformat(TTR("Translating: %s"), vformat("%.*v", snap_step_decimals, motion_snapped)));
+			set_message(TTR("Translating:") + " (" + String::num(motion_snapped.x, snap_step_decimals) + ", " +
+					String::num(motion_snapped.y, snap_step_decimals) + ", " + String::num(motion_snapped.z, snap_step_decimals) + ")");
 			if (local_coords) {
 				motion = spatial_editor->get_gizmo_transform().basis.inverse().xform(motion);
 			}
@@ -6338,35 +5873,6 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 				plane = Plane(_get_camera_normal(), _edit.center);
 			}
 
-			if (_edit.is_trackball) {
-				Vector2 motion_delta = _edit.mouse_pos - _edit.original_mouse_pos;
-				real_t sensitivity = TRACKBALL_SENSITIVITY * EDSCALE;
-				Vector2 rotation_input = motion_delta * sensitivity;
-
-				Transform3D cam_transform = view_3d_controller->to_camera_transform();
-				Vector3 cam_right = cam_transform.basis.get_column(0).normalized();
-				Vector3 cam_up = cam_transform.basis.get_column(1).normalized();
-				Vector3 rotation_axis = cam_up * rotation_input.x + cam_right * rotation_input.y;
-
-				real_t rotation_angle = rotation_axis.length();
-				if (rotation_angle > 0.0f) {
-					rotation_axis /= rotation_angle;
-
-					if (spatial_editor->is_snap_enabled()) {
-						double snap_step = spatial_editor->get_rotate_snap();
-						double angle_deg = Math::rad_to_deg(rotation_angle);
-						angle_deg = Math::snapped(angle_deg, snap_step);
-						rotation_angle = Math::deg_to_rad(angle_deg);
-					}
-
-					double angle_deg = Math::rad_to_deg(rotation_angle);
-					set_message(vformat(TTR("Rotating %s degrees."), String::num(angle_deg, 2)));
-
-					apply_transform(rotation_axis, rotation_angle);
-				}
-				break;
-			}
-
 			Vector3 local_axis;
 			Vector3 global_axis;
 			switch (_edit.plane) {
@@ -6415,42 +5921,44 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 				}
 				_edit.previous_rotation_vector = current_rotation_vector;
 				_edit.accumulated_rotation_angle = 0.0;
-				_edit.rotation_angle = 0.0;
+				_edit.display_rotation_angle = 0.0;
 			}
 
 			static const float orthogonal_threshold = Math::cos(Math::deg_to_rad(85.0f));
 			bool axis_is_orthogonal = Math::abs(plane.normal.dot(global_axis)) < orthogonal_threshold;
 
+			double angle = 0.0f;
+			if (axis_is_orthogonal) {
+				_edit.show_rotation_line = false;
+				Vector3 projection_axis = plane.normal.cross(global_axis);
+				Vector3 delta = intersection - click;
+				float projection = delta.dot(projection_axis);
+				angle = (projection * (Math::PI / 2.0f)) / (gizmo_scale * GIZMO_CIRCLE_SIZE);
+			} else {
+				_edit.show_rotation_line = true;
+				Vector3 click_axis = (click - _edit.center).normalized();
+				angle = click_axis.signed_angle_to(current_rotation_vector, global_axis);
+			}
+
 			if (_edit.previous_rotation_vector != Vector3()) {
 				double delta_angle = _edit.previous_rotation_vector.signed_angle_to(current_rotation_vector, global_axis);
 				_edit.accumulated_rotation_angle += delta_angle;
 			}
 			_edit.previous_rotation_vector = current_rotation_vector;
 
-			if (spatial_editor->is_snap_enabled()) {
+			bool snapping = _edit.snap || spatial_editor->is_snap_enabled();
+			if (snapping) {
 				snap = spatial_editor->get_rotate_snap();
-				snap_step_decimals = Math::range_step_decimals(snap);
-			}
-
-			if (axis_is_orthogonal) {
-				_edit.show_rotation_line = false;
-				Vector3 projection_axis = plane.normal.cross(global_axis);
-				Vector3 delta = intersection - click;
-				float projection = delta.dot(projection_axis);
-				double orth_angle = (projection * (Math::PI / 2.0f)) / (gizmo_scale * GIZMO_CIRCLE_SIZE);
-				_edit.rotation_angle = spatial_editor->is_snap_enabled()
-						? Math::deg_to_rad(Math::snapped(Math::rad_to_deg(orth_angle), snap))
-						: orth_angle;
+				_edit.display_rotation_angle = Math::deg_to_rad(Math::snapped(Math::rad_to_deg(_edit.accumulated_rotation_angle), snap));
 			} else {
-				_edit.show_rotation_line = true;
-				_edit.rotation_angle = spatial_editor->is_snap_enabled()
-						? Math::deg_to_rad(Math::snapped(Math::rad_to_deg(_edit.accumulated_rotation_angle), snap))
-						: _edit.accumulated_rotation_angle;
+				_edit.display_rotation_angle = _edit.accumulated_rotation_angle;
 			}
-			set_message(vformat(TTR("Rotating %s degrees."), String::num(Math::rad_to_deg(_edit.rotation_angle), snap_step_decimals)));
+			angle = Math::snapped(Math::rad_to_deg(angle), snap);
+			set_message(vformat(TTR("Rotating %s degrees."), String::num(angle, snap_step_decimals)));
+			angle = Math::deg_to_rad(angle);
 
 			Vector3 compute_axis = local_coords ? local_axis : global_axis;
-			apply_transform(compute_axis, _edit.rotation_angle);
+			apply_transform(compute_axis, angle);
 		} break;
 		default: {
 		}
@@ -6527,13 +6035,11 @@ void Node3DEditorViewport::finish_transform() {
 	_edit.numeric_input = 0;
 	_edit.numeric_next_decimal = 0;
 	_edit.numeric_negate = false;
-	_edit.is_trackball = false;
 	_edit.initial_click_vector = Vector3();
 	_edit.previous_rotation_vector = Vector3();
 	_edit.accumulated_rotation_angle = 0.0;
-	_edit.rotation_angle = 0.0;
+	_edit.display_rotation_angle = 0.0;
 	_edit.gizmo_initiated = false;
-	_edit.children_original_globals.clear();
 	spatial_editor->set_local_coords_enabled(_edit.original_local);
 	spatial_editor->update_transform_gizmo();
 	surface->queue_redraw();
@@ -6561,14 +6067,10 @@ void Node3DEditorViewport::shortcut_changed_callback(const Ref<Shortcut> p_short
 	for (int i = 0; i < p_shortcut->get_events().size(); i++) {
 		im->action_add_event(p_shortcut_path, p_shortcut->get_events()[i]);
 	}
-
-	if (view_3d_controller.is_valid()) {
-		_update_view_3d_controller();
-	}
 }
 
 void Node3DEditorViewport::_set_lock_view_rotation(bool p_lock_rotation) {
-	view_3d_controller->set_lock_rotation(p_lock_rotation);
+	lock_rotation = p_lock_rotation;
 	int idx = view_display_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
 	view_display_menu->get_popup()->set_item_checked(idx, p_lock_rotation);
 	if (p_lock_rotation) {
@@ -6611,6 +6113,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 
 	_edit.mode = TRANSFORM_NONE;
 	_edit.plane = TRANSFORM_VIEW;
+	_edit.snap = true;
 	_edit.show_rotation_line = true;
 	_edit.instant = false;
 	_edit.gizmo_handle = -1;
@@ -6618,8 +6121,10 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 
 	index = p_index;
 	editor_selection = EditorNode::get_singleton()->get_editor_selection();
-	editor_selection->connect("selection_changed", callable_mp(this, &Node3DEditorViewport::_reset_follow_mode_count));
 
+	orthogonal = false;
+	auto_orthogonal = false;
+	lock_rotation = false;
 	message_time = 0;
 	zoom_indicator_delay = 0.0;
 
@@ -6768,7 +6273,6 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	view_display_menu->get_popup()->add_separator();
 	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_origin"), VIEW_CENTER_TO_ORIGIN);
 	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_selection"), VIEW_CENTER_TO_SELECTION);
-	view_display_menu->get_popup()->set_item_tooltip(-1, TTR("Press Focus Selection twice to start following the selection as it moves. Press it yet another time to stop following the selection."));
 	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_transform_with_view"), VIEW_ALIGN_TRANSFORM_WITH_VIEW);
 	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_rotation_with_view"), VIEW_ALIGN_ROTATION_WITH_VIEW);
 	view_display_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &Node3DEditorViewport::_menu_option));
@@ -6796,15 +6300,8 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	translation_preview_button = memnew(EditorTranslationPreviewButton);
 	hbox->add_child(translation_preview_button);
 
-	follow_mode = memnew(Button);
-	follow_mode->set_tooltip_text(TTR("Click to stop following this node as it moves."));
-	follow_mode->hide();
-	vbox->add_child(follow_mode);
-	follow_mode->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditorViewport::_disable_follow_mode));
-
 	preview_camera = memnew(CheckBox);
 	preview_camera->set_text(TTRC("Preview"));
-	preview_camera->set_tooltip_text(TTRC("Preview through the selected camera.\nHold Shift while clicking to also enable Pilot mode."));
 	// Using Control even on macOS to avoid conflict with Quick Open shortcut.
 	preview_camera->set_shortcut(ED_SHORTCUT("spatial_editor/toggle_camera_preview", TTRC("Toggle Camera Preview"), KeyModifierMask::CTRL | Key::P));
 	vbox->add_child(preview_camera);
@@ -6812,16 +6309,6 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	preview_camera->set_theme_type_variation("CheckBoxNoIconTint");
 	preview_camera->hide();
 	preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
-
-	pilot_camera = memnew(CheckBox);
-	pilot_camera->set_text(TTRC("Pilot"));
-	pilot_camera->set_tooltip_text(TTRC("Enable pilot mode for the preview camera.\nAllows WASD movement and mouse look when in preview mode."));
-	pilot_camera->set_shortcut(ED_SHORTCUT("spatial_editor/toggle_pilot_preview", TTRC("Toggle Pilot Mode in Preview")));
-	vbox->add_child(pilot_camera);
-	pilot_camera->set_h_size_flags(0);
-	pilot_camera->set_theme_type_variation("CheckBoxNoIconTint");
-	pilot_camera->hide();
-	pilot_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_pilot_preview));
 	previewing = nullptr;
 	gizmo_scale = 1.0;
 
@@ -6875,21 +6362,22 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	zoom_limit_label->hide();
 	bottom_center_vbox->add_child(zoom_limit_label);
 
-	tooltip_panel = memnew(RichTextLabel);
-	vbox->add_child(tooltip_panel);
-	tooltip_panel->hide();
-	tooltip_panel->set_h_grow_direction(GROW_DIRECTION_BEGIN);
-	tooltip_panel->set_v_grow_direction(GROW_DIRECTION_BEGIN);
-	tooltip_panel->set_mouse_filter(MOUSE_FILTER_IGNORE);
-	tooltip_panel->set_focus_mode(FOCUS_ACCESSIBILITY);
-	tooltip_panel->set_use_bbcode(true);
-	tooltip_panel->set_fit_content(true);
-	tooltip_panel->set_scroll_active(false);
-	tooltip_panel->set_tab_size(1);
-	tooltip_panel->set_autowrap_mode(TextServer::AUTOWRAP_OFF);
-	tooltip_panel->set_anchors_and_offsets_preset(LayoutPreset::PRESET_TOP_LEFT);
-	tooltip_panel->add_theme_color_override(SceneStringName(font_color), Color(0.8f, 0.8f, 0.8f, 1));
-	tooltip_panel->add_theme_constant_override("paragraph_separation", 5);
+	preview_material_label = memnew(Label);
+	preview_material_label->set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_LEFT);
+	preview_material_label->set_offset(Side::SIDE_TOP, -70 * EDSCALE);
+	preview_material_label->set_text(TTRC("Overriding material..."));
+	preview_material_label->add_theme_color_override(SceneStringName(font_color), Color(1, 1, 1, 1));
+	preview_material_label->hide();
+	surface->add_child(preview_material_label);
+
+	preview_material_label_desc = memnew(Label);
+	preview_material_label_desc->set_focus_mode(FOCUS_ACCESSIBILITY);
+	preview_material_label_desc->set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_LEFT);
+	preview_material_label_desc->set_offset(Side::SIDE_TOP, -50 * EDSCALE);
+	preview_material_label_desc->add_theme_color_override(SceneStringName(font_color), Color(0.8, 0.8, 0.8, 1));
+	preview_material_label_desc->add_theme_constant_override("line_spacing", 0);
+	preview_material_label_desc->hide();
+	surface->add_child(preview_material_label_desc);
 
 	frame_time_gradient = memnew(Gradient);
 	// The color is set when the theme changes.
@@ -6903,7 +6391,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	const int navigation_control_size = 150;
 
 	position_control = memnew(ViewportNavigationControl);
-	position_control->set_navigation_mode(View3DController::NAV_MODE_MOVE);
+	position_control->set_navigation_mode(Node3DEditorViewport::NAVIGATION_MOVE);
 	position_control->set_custom_minimum_size(Size2(navigation_control_size, navigation_control_size) * EDSCALE);
 	position_control->set_h_size_flags(SIZE_SHRINK_END);
 	position_control->set_anchor_and_offset(SIDE_LEFT, ANCHOR_BEGIN, 0);
@@ -6914,7 +6402,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	surface->add_child(position_control);
 
 	look_control = memnew(ViewportNavigationControl);
-	look_control->set_navigation_mode(View3DController::NAV_MODE_LOOK);
+	look_control->set_navigation_mode(Node3DEditorViewport::NAVIGATION_LOOK);
 	look_control->set_custom_minimum_size(Size2(navigation_control_size, navigation_control_size) * EDSCALE);
 	look_control->set_h_size_flags(SIZE_SHRINK_END);
 	look_control->set_anchor_and_offset(SIDE_LEFT, ANCHOR_END, -navigation_control_size * EDSCALE);
@@ -6953,6 +6441,9 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 
 	accept = nullptr;
 
+	freelook_active = false;
+	freelook_speed = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
+
 	selection_menu = memnew(PopupMenu);
 	add_child(selection_menu);
 	selection_menu->set_min_size(Size2(100, 0) * EDSCALE);
@@ -6988,242 +6479,346 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 
 	geometry.instantiate();
 
-	geometry_xray.instantiate();
-
 	ruler_line = memnew(MeshInstance3D);
 	ruler_line->set_mesh(geometry);
 	ruler_line->set_material_override(ruler_material);
 
 	ruler_line_xray = memnew(MeshInstance3D);
-	ruler_line_xray->set_mesh(geometry_xray);
+	ruler_line_xray->set_mesh(geometry);
 	ruler_line_xray->set_material_override(ruler_material_xray);
 
-	ruler_triangle_material.instantiate();
-	ruler_triangle_material->set_albedo(Color(1.0, 1.0, 1.0, 1.0));
-	ruler_triangle_material->set_flag(BaseMaterial3D::FLAG_DISABLE_FOG, true);
-	ruler_triangle_material->set_shading_mode(BaseMaterial3D::SHADING_MODE_UNSHADED);
-	ruler_triangle_material->set_depth_draw_mode(BaseMaterial3D::DEPTH_DRAW_DISABLED);
-	ruler_triangle_material->set_flag(BaseMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
-
-	ruler_triangle_material_xray.instantiate();
-	ruler_triangle_material_xray->set_albedo(Color(1.0, 1.0, 1.0, 0.15));
-	ruler_triangle_material_xray->set_flag(BaseMaterial3D::FLAG_DISABLE_FOG, true);
-	ruler_triangle_material_xray->set_shading_mode(BaseMaterial3D::SHADING_MODE_UNSHADED);
-	ruler_triangle_material_xray->set_flag(BaseMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
-	ruler_triangle_material_xray->set_transparency(BaseMaterial3D::TRANSPARENCY_ALPHA);
-	ruler_triangle_material_xray->set_render_priority(BaseMaterial3D::RENDER_PRIORITY_MAX);
-	ruler_triangle_material_xray->set_flag(BaseMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
-
-	ruler_triangle_lines = memnew(MeshInstance3D);
-	Ref<ImmediateMesh> triangle_mesh;
-	triangle_mesh.instantiate();
-	ruler_triangle_lines->set_mesh(triangle_mesh);
-	ruler_triangle_lines->set_material_override(ruler_triangle_material);
-
-	ruler_triangle_lines_xray = memnew(MeshInstance3D);
-	Ref<ImmediateMesh> triangle_mesh_xray;
-	triangle_mesh_xray.instantiate();
-	ruler_triangle_lines_xray->set_mesh(triangle_mesh_xray);
-	ruler_triangle_lines_xray->set_material_override(ruler_triangle_material_xray);
-
 	ruler_label = memnew(Label);
 	ruler_label->set_visible(false);
 
-	ruler_label_x = memnew(Label);
-	ruler_label_x->set_visible(false);
-
-	ruler_label_y = memnew(Label);
-	ruler_label_y->set_visible(false);
-
-	ruler_label_z = memnew(Label);
-	ruler_label_z->set_visible(false);
-
 	ruler->add_child(ruler_start_point);
 	ruler->add_child(ruler_end_point);
 	ruler->add_child(ruler_line);
 	ruler->add_child(ruler_line_xray);
-	ruler->add_child(ruler_triangle_lines);
-	ruler->add_child(ruler_triangle_lines_xray);
 
 	viewport->add_child(ruler_label);
-	viewport->add_child(ruler_label_x);
-	viewport->add_child(ruler_label_y);
-	viewport->add_child(ruler_label_z);
-
-	view_3d_controller.instantiate();
-	view_3d_controller->connect("view_state_changed", callable_mp(this, &Node3DEditorViewport::_view_state_changed));
-	view_3d_controller->connect("fov_scaled", callable_mp((CanvasItem *)surface, &CanvasItem::queue_redraw));
-	view_3d_controller->connect("freelook_changed", callable_mp(this, &Node3DEditorViewport::_freelook_changed));
-	view_3d_controller->connect("freelook_speed_scaled", callable_mp(this, &Node3DEditorViewport::_freelook_speed_scaled));
-	view_3d_controller->connect("cursor_panned", callable_mp(this, &Node3DEditorViewport::_disable_follow_mode));
-	view_3d_controller->connect("cursor_interpolated", callable_mp(this, &Node3DEditorViewport::_cursor_interpolated));
-	view_3d_controller->connect("cursor_distance_scaled", callable_mp(this, &Node3DEditorViewport::_cursor_distance_scaled));
-	_update_view_3d_controller(true);
 
+	view_type = VIEW_TYPE_USER;
 	_update_name();
-
-	EditorNode::get_singleton()->register_hdr_viewport(viewport);
 }
 
 Node3DEditorViewport::~Node3DEditorViewport() {
 	memdelete(ruler);
+	memdelete(frame_time_gradient);
 }
 
 //////////////////////////////////////////////////////////////
 
-void Node3DEditorViewportContainer::_update_split_drag_margin() {
-	if (view != VIEW_USE_4_VIEWPORTS && view != VIEW_USE_3_VIEWPORTS) {
+void Node3DEditorViewportContainer::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	if (_redirect_freelook_input(p_event)) {
 		return;
 	}
-	// Also for 3 viewports view since the first split container is used to remember the offset.
-	first_split->set_split_offset(second_split->get_split_offset());
 
-	if (view == VIEW_USE_4_VIEWPORTS) {
-		// Extend to cover the first split on top.
-		second_split->set_drag_area_margin_begin(second_split->get_size().y - get_size().y);
+	Ref<InputEventMouseButton> mb = p_event;
+
+	if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT) {
+		if (mb->is_pressed()) {
+			Vector2 size = get_size();
+
+			int h_sep = get_theme_constant(SNAME("separation"), SNAME("HSplitContainer"));
+			int v_sep = get_theme_constant(SNAME("separation"), SNAME("VSplitContainer"));
+
+			int mid_w = size.width * ratio_h;
+			int mid_h = size.height * ratio_v;
+
+			dragging_h = mb->get_position().x > (mid_w - h_sep / 2) && mb->get_position().x < (mid_w + h_sep / 2);
+			dragging_v = mb->get_position().y > (mid_h - v_sep / 2) && mb->get_position().y < (mid_h + v_sep / 2);
+
+			drag_begin_pos = mb->get_position();
+			drag_begin_ratio.x = ratio_h;
+			drag_begin_ratio.y = ratio_v;
+
+			switch (view) {
+				case VIEW_USE_1_VIEWPORT: {
+					dragging_h = false;
+					dragging_v = false;
+
+				} break;
+				case VIEW_USE_2_VIEWPORTS: {
+					dragging_h = false;
+
+				} break;
+				case VIEW_USE_2_VIEWPORTS_ALT: {
+					dragging_v = false;
+
+				} break;
+				case VIEW_USE_3_VIEWPORTS:
+				case VIEW_USE_3_VIEWPORTS_ALT:
+				case VIEW_USE_4_VIEWPORTS: {
+					// Do nothing.
+
+				} break;
+			}
+		} else {
+			dragging_h = false;
+			dragging_v = false;
+		}
+	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+
+	if (mm.is_valid()) {
+		if (view == VIEW_USE_3_VIEWPORTS || view == VIEW_USE_3_VIEWPORTS_ALT || view == VIEW_USE_4_VIEWPORTS) {
+			Vector2 size = get_size();
+
+			int h_sep = get_theme_constant(SNAME("separation"), SNAME("HSplitContainer"));
+			int v_sep = get_theme_constant(SNAME("separation"), SNAME("VSplitContainer"));
+
+			int mid_w = size.width * ratio_h;
+			int mid_h = size.height * ratio_v;
+
+			bool was_hovering_h = hovering_h;
+			bool was_hovering_v = hovering_v;
+			hovering_h = mm->get_position().x > (mid_w - h_sep / 2) && mm->get_position().x < (mid_w + h_sep / 2);
+			hovering_v = mm->get_position().y > (mid_h - v_sep / 2) && mm->get_position().y < (mid_h + v_sep / 2);
+
+			if (was_hovering_h != hovering_h || was_hovering_v != hovering_v) {
+				queue_redraw();
+			}
+		}
+
+		if (dragging_h) {
+			real_t new_ratio = drag_begin_ratio.x + (mm->get_position().x - drag_begin_pos.x) / get_size().width;
+			new_ratio = CLAMP(new_ratio, 40 / get_size().width, (get_size().width - 40) / get_size().width);
+			ratio_h = new_ratio;
+			queue_sort();
+			queue_redraw();
+		}
+		if (dragging_v) {
+			real_t new_ratio = drag_begin_ratio.y + (mm->get_position().y - drag_begin_pos.y) / get_size().height;
+			new_ratio = CLAMP(new_ratio, 40 / get_size().height, (get_size().height - 40) / get_size().height);
+			ratio_v = new_ratio;
+			queue_sort();
+			queue_redraw();
+		}
 	}
 }
 
 void Node3DEditorViewportContainer::_notification(int p_what) {
 	switch (p_what) {
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
+		case NOTIFICATION_MOUSE_ENTER:
+		case NOTIFICATION_MOUSE_EXIT: {
+			mouseover = (p_what == NOTIFICATION_MOUSE_ENTER);
+			queue_redraw();
+		} break;
+
+		case NOTIFICATION_DRAW: {
+			if (mouseover && Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED) {
+				Ref<Texture2D> h_grabber = get_theme_icon(SNAME("grabber"), SNAME("HSplitContainer"));
+				Ref<Texture2D> v_grabber = get_theme_icon(SNAME("grabber"), SNAME("VSplitContainer"));
+
+				Ref<Texture2D> hdiag_grabber = get_editor_theme_icon(SNAME("GuiViewportHdiagsplitter"));
+				Ref<Texture2D> vdiag_grabber = get_editor_theme_icon(SNAME("GuiViewportVdiagsplitter"));
+				Ref<Texture2D> vh_grabber = get_editor_theme_icon(SNAME("GuiViewportVhsplitter"));
+
+				Vector2 size = get_size();
+
+				int h_sep = get_theme_constant(SNAME("separation"), SNAME("HSplitContainer"));
+
+				int v_sep = get_theme_constant(SNAME("separation"), SNAME("VSplitContainer"));
+
+				int mid_w = size.width * ratio_h;
+				int mid_h = size.height * ratio_v;
+
+				int size_left = mid_w - h_sep / 2;
+				int size_bottom = size.height - mid_h - v_sep / 2;
+
+				switch (view) {
+					case VIEW_USE_1_VIEWPORT: {
+						// Nothing to show.
+
+					} break;
+					case VIEW_USE_2_VIEWPORTS: {
+						draw_texture(v_grabber, Vector2((size.width - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
+						set_default_cursor_shape(CURSOR_VSPLIT);
+
+					} break;
+					case VIEW_USE_2_VIEWPORTS_ALT: {
+						draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, (size.height - h_grabber->get_height()) / 2));
+						set_default_cursor_shape(CURSOR_HSPLIT);
+
+					} break;
+					case VIEW_USE_3_VIEWPORTS: {
+						if ((hovering_v && hovering_h && !dragging_v && !dragging_h) || (dragging_v && dragging_h)) {
+							draw_texture(hdiag_grabber, Vector2(mid_w - hdiag_grabber->get_width() / 2, mid_h - v_grabber->get_height() / 4));
+							set_default_cursor_shape(CURSOR_DRAG);
+						} else if ((hovering_v && !dragging_h) || dragging_v) {
+							draw_texture(v_grabber, Vector2((size.width - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
+							set_default_cursor_shape(CURSOR_VSPLIT);
+						} else if (hovering_h || dragging_h) {
+							draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, mid_h + v_grabber->get_height() / 2 + (size_bottom - h_grabber->get_height()) / 2));
+							set_default_cursor_shape(CURSOR_HSPLIT);
+						}
+
+					} break;
+					case VIEW_USE_3_VIEWPORTS_ALT: {
+						if ((hovering_v && hovering_h && !dragging_v && !dragging_h) || (dragging_v && dragging_h)) {
+							draw_texture(vdiag_grabber, Vector2(mid_w - vdiag_grabber->get_width() + v_grabber->get_height() / 4, mid_h - vdiag_grabber->get_height() / 2));
+							set_default_cursor_shape(CURSOR_DRAG);
+						} else if ((hovering_v && !dragging_h) || dragging_v) {
+							draw_texture(v_grabber, Vector2((size_left - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
+							set_default_cursor_shape(CURSOR_VSPLIT);
+						} else if (hovering_h || dragging_h) {
+							draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, (size.height - h_grabber->get_height()) / 2));
+							set_default_cursor_shape(CURSOR_HSPLIT);
+						}
+
+					} break;
+					case VIEW_USE_4_VIEWPORTS: {
+						Vector2 half(mid_w, mid_h);
+						if ((hovering_v && hovering_h && !dragging_v && !dragging_h) || (dragging_v && dragging_h)) {
+							draw_texture(vh_grabber, half - vh_grabber->get_size() / 2.0);
+							set_default_cursor_shape(CURSOR_DRAG);
+						} else if ((hovering_v && !dragging_h) || dragging_v) {
+							draw_texture(v_grabber, half - v_grabber->get_size() / 2.0);
+							set_default_cursor_shape(CURSOR_VSPLIT);
+						} else if (hovering_h || dragging_h) {
+							draw_texture(h_grabber, half - h_grabber->get_size() / 2.0);
+							set_default_cursor_shape(CURSOR_HSPLIT);
+						}
+
+					} break;
+				}
+			}
+		} break;
+
+		case NOTIFICATION_SORT_CHILDREN: {
+			Node3DEditorViewport *viewports[4];
+			int vc = 0;
+			for (int i = 0; i < get_child_count(); i++) {
+				viewports[vc] = Object::cast_to<Node3DEditorViewport>(get_child(i));
+				if (viewports[vc]) {
+					vc++;
+				}
+			}
+
+			ERR_FAIL_COND(vc != 4);
+
+			Size2 size = get_size();
+
+			if (size.x < 10 || size.y < 10) {
+				for (int i = 0; i < 4; i++) {
+					viewports[i]->hide();
+				}
 				return;
 			}
-			[[fallthrough]];
-		}
-		case NOTIFICATION_READY: {
-			bool touch_optimizations = EDITOR_GET("interface/touchscreen/enable_touch_optimizations");
-			main_split->set_touch_dragger_enabled(touch_optimizations);
-			first_split->set_touch_dragger_enabled(touch_optimizations);
-			second_split->set_touch_dragger_enabled(touch_optimizations);
+			int h_sep = get_theme_constant(SNAME("separation"), SNAME("HSplitContainer"));
+
+			int v_sep = get_theme_constant(SNAME("separation"), SNAME("VSplitContainer"));
+
+			int mid_w = size.width * ratio_h;
+			int mid_h = size.height * ratio_v;
+
+			int size_left = mid_w - h_sep / 2;
+			int size_right = size.width - mid_w - h_sep / 2;
+
+			int size_top = mid_h - v_sep / 2;
+			int size_bottom = size.height - mid_h - v_sep / 2;
+
+			switch (view) {
+				case VIEW_USE_1_VIEWPORT: {
+					viewports[0]->show();
+					for (int i = 1; i < 4; i++) {
+						viewports[i]->hide();
+					}
+
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), size));
+
+				} break;
+				case VIEW_USE_2_VIEWPORTS: {
+					for (int i = 0; i < 4; i++) {
+						if (i == 1 || i == 3) {
+							viewports[i]->hide();
+						} else {
+							viewports[i]->show();
+						}
+					}
+
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size.width, size_top)));
+					fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size.width, size_bottom)));
+
+				} break;
+				case VIEW_USE_2_VIEWPORTS_ALT: {
+					for (int i = 0; i < 4; i++) {
+						if (i == 1 || i == 3) {
+							viewports[i]->hide();
+						} else {
+							viewports[i]->show();
+						}
+					}
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size.height)));
+					fit_child_in_rect(viewports[2], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size.height)));
+
+				} break;
+				case VIEW_USE_3_VIEWPORTS: {
+					for (int i = 0; i < 4; i++) {
+						if (i == 1) {
+							viewports[i]->hide();
+						} else {
+							viewports[i]->show();
+						}
+					}
+
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size.width, size_top)));
+					fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
+					fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, mid_h + v_sep / 2), Vector2(size_right, size_bottom)));
+
+				} break;
+				case VIEW_USE_3_VIEWPORTS_ALT: {
+					for (int i = 0; i < 4; i++) {
+						if (i == 1) {
+							viewports[i]->hide();
+						} else {
+							viewports[i]->show();
+						}
+					}
+
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size_top)));
+					fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
+					fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size.height)));
+
+				} break;
+				case VIEW_USE_4_VIEWPORTS: {
+					for (int i = 0; i < 4; i++) {
+						viewports[i]->show();
+					}
+
+					fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size_top)));
+					fit_child_in_rect(viewports[1], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size_top)));
+					fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
+					fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, mid_h + v_sep / 2), Vector2(size_right, size_bottom)));
+
+				} break;
+			}
 		} break;
 	}
 }
 
 void Node3DEditorViewportContainer::set_view(View p_view) {
 	view = p_view;
-
-	Node3DEditorViewport *viewports[4];
-	for (uint32_t i = 0; i < 4; i++) {
-		viewports[i] = Node3DEditor::get_singleton()->get_editor_viewport(i);
-		ERR_FAIL_NULL(viewports[i]);
-	}
-
-	const bool previous_main_vertical = !first_split->is_vertical();
-	const float horizontal_offset = previous_main_vertical ? first_split->get_split_offset() : main_split->get_split_offset();
-	const float vertical_offset = previous_main_vertical ? main_split->get_split_offset() : first_split->get_split_offset();
-
-	first_split->set_dragging_enabled(true);
-	second_split->set_drag_area_margin_begin(0);
-	viewports[0]->show();
-
-	switch (view) {
-		case VIEW_USE_1_VIEWPORT: {
-			for (int i = 1; i < 4; i++) {
-				viewports[i]->hide();
-			}
-			second_split->hide();
-		} break;
-		case VIEW_USE_2_VIEWPORTS:
-		case VIEW_USE_2_VIEWPORTS_ALT: {
-			viewports[1]->show();
-			viewports[2]->hide();
-			viewports[3]->hide();
-			second_split->hide();
-			const bool is_vertical = view == VIEW_USE_2_VIEWPORTS;
-			if (first_split->is_vertical() != is_vertical) {
-				first_split->set_vertical(is_vertical);
-				first_split->set_split_offset(is_vertical ? vertical_offset : horizontal_offset);
-				main_split->set_split_offset(is_vertical ? horizontal_offset : vertical_offset); // Store the other offset here for later.
-			}
-		} break;
-		case VIEW_USE_3_VIEWPORTS:
-		case VIEW_USE_3_VIEWPORTS_ALT: {
-			// Default mode has two on bottom (second_split). Alt mode has two on the left (first_split).
-			const bool main_vertical = view == VIEW_USE_3_VIEWPORTS;
-			viewports[1]->set_visible(!main_vertical);
-			viewports[2]->show();
-			viewports[3]->set_visible(main_vertical);
-			second_split->show();
-			main_split->set_vertical(main_vertical);
-			main_split->set_split_offset(main_vertical ? vertical_offset : horizontal_offset);
-			first_split->set_vertical(!main_vertical);
-			first_split->set_split_offset(main_vertical ? horizontal_offset : vertical_offset);
-			second_split->set_split_offset(main_vertical ? horizontal_offset : vertical_offset);
-		} break;
-		case VIEW_USE_4_VIEWPORTS: {
-			for (int i = 1; i < 4; i++) {
-				viewports[i]->show();
-			}
-			second_split->show();
-			main_split->set_vertical(true);
-			main_split->set_split_offset(vertical_offset);
-			first_split->set_vertical(false);
-			first_split->set_split_offset(horizontal_offset);
-			second_split->set_split_offset(horizontal_offset);
-
-			first_split->set_dragging_enabled(false);
-			_update_split_drag_margin();
-		} break;
-	}
+	queue_sort();
 }
 
 Node3DEditorViewportContainer::View Node3DEditorViewportContainer::get_view() {
 	return view;
 }
 
-void Node3DEditorViewportContainer::add_viewport(Node3DEditorViewport *p_viewport, int p_index) {
-	if (p_index <= 1) {
-		first_split->add_child(p_viewport);
-	} else {
-		second_split->add_child(p_viewport);
-		if (p_index == 3) {
-			// Connect to the second split's child to update the drag margin immediately whenever the split offset changes.
-			p_viewport->connect(SceneStringName(resized), callable_mp(this, &Node3DEditorViewportContainer::_update_split_drag_margin));
-		}
-	}
-}
-
-Dictionary Node3DEditorViewportContainer::get_split_state() const {
-	Dictionary state;
-	state["main"] = Math::round(main_split->get_split_offset() / EDSCALE);
-	state["first"] = Math::round(first_split->get_split_offset() / EDSCALE);
-	state["second"] = Math::round(second_split->get_split_offset() / EDSCALE);
-	return state;
-}
-
-void Node3DEditorViewportContainer::set_split_state(const Dictionary &p_state) {
-	if (p_state.has("main")) {
-		main_split->set_split_offset(int(p_state["main"]) * EDSCALE);
-	}
-	if (p_state.has("first")) {
-		first_split->set_split_offset(int(p_state["first"]) * EDSCALE);
-	}
-	if (p_state.has("second")) {
-		second_split->set_split_offset(int(p_state["second"]) * EDSCALE);
-	}
-}
-
 Node3DEditorViewportContainer::Node3DEditorViewportContainer() {
 	set_clip_contents(true);
-
-	main_split = memnew(SplitContainer);
-	main_split->set_drag_nested_intersections(true);
-
-	first_split = memnew(SplitContainer);
-	first_split->set_h_size_flags(SIZE_EXPAND_FILL);
-	first_split->set_v_size_flags(SIZE_EXPAND_FILL);
-	first_split->set_drag_nested_intersections(true);
-
-	second_split = memnew(SplitContainer);
-	second_split->set_h_size_flags(SIZE_EXPAND_FILL);
-	second_split->set_v_size_flags(SIZE_EXPAND_FILL);
-	second_split->set_drag_nested_intersections(true);
-
-	main_split->add_child(first_split);
-	main_split->add_child(second_split);
-	add_child(main_split);
+	view = VIEW_USE_1_VIEWPORT;
+	mouseover = false;
+	ratio_h = 0.5;
+	ratio_v = 0.5;
+	hovering_v = false;
+	hovering_h = false;
+	dragging_v = false;
+	dragging_h = false;
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -7257,15 +6852,12 @@ void Node3DEditor::select_gizmo_highlight_axis(int p_axis) {
 	for (int i = 0; i < 4; i++) {
 		bool highlight;
 		if (i == 3) {
-			highlight = (p_axis == GIZMO_HIGHLIGHT_AXIS_VIEW_ROTATION);
+			highlight = (p_axis == 15);
 		} else {
 			highlight = (i + 3) == p_axis;
 		}
 		rotate_gizmo[i]->surface_set_material(0, highlight ? rotate_gizmo_color_hl[i] : rotate_gizmo_color[i]);
 	}
-
-	bool highlight_trackball = (p_axis == GIZMO_HIGHLIGHT_AXIS_TRACKBALL);
-	trackball_sphere_gizmo->surface_set_material(0, highlight_trackball ? trackball_sphere_material_hl : trackball_sphere_material);
 }
 
 void Node3DEditor::update_transform_gizmo() {
@@ -7367,18 +6959,18 @@ Object *Node3DEditor::_get_editor_data(Object *p_what) {
 			sp->get_world_3d()->get_scenario());
 	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
 			si->sbox_instance,
-			RSE::SHADOW_CASTING_SETTING_OFF);
+			RS::SHADOW_CASTING_SETTING_OFF);
 	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
 			si->sbox_instance_offset,
-			RSE::SHADOW_CASTING_SETTING_OFF);
+			RS::SHADOW_CASTING_SETTING_OFF);
 	// Use the Edit layer to hide the selection box when View Gizmos is disabled, since it is a bit distracting.
 	// It's still possible to approximately guess what is selected by looking at the manipulation gizmo position.
 	RS::get_singleton()->instance_set_layer_mask(si->sbox_instance, 1 << Node3DEditorViewport::GIZMO_EDIT_LAYER);
 	RS::get_singleton()->instance_set_layer_mask(si->sbox_instance_offset, 1 << Node3DEditorViewport::GIZMO_EDIT_LAYER);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_offset, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_offset, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_offset, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_offset, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 	si->sbox_instance_xray = RenderingServer::get_singleton()->instance_create2(
 			selection_box_xray->get_rid(),
 			sp->get_world_3d()->get_scenario());
@@ -7387,18 +6979,18 @@ Object *Node3DEditor::_get_editor_data(Object *p_what) {
 			sp->get_world_3d()->get_scenario());
 	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
 			si->sbox_instance_xray,
-			RSE::SHADOW_CASTING_SETTING_OFF);
+			RS::SHADOW_CASTING_SETTING_OFF);
 	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(
 			si->sbox_instance_xray_offset,
-			RSE::SHADOW_CASTING_SETTING_OFF);
+			RS::SHADOW_CASTING_SETTING_OFF);
 	// Use the Edit layer to hide the selection box when View Gizmos is disabled, since it is a bit distracting.
 	// It's still possible to approximately guess what is selected by looking at the manipulation gizmo position.
 	RS::get_singleton()->instance_set_layer_mask(si->sbox_instance_xray, 1 << Node3DEditorViewport::GIZMO_EDIT_LAYER);
 	RS::get_singleton()->instance_set_layer_mask(si->sbox_instance_xray_offset, 1 << Node3DEditorViewport::GIZMO_EDIT_LAYER);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray_offset, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray_offset, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray_offset, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+	RS::get_singleton()->instance_geometry_set_flag(si->sbox_instance_xray_offset, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
 	return si;
 }
@@ -7471,13 +7063,11 @@ Dictionary Node3DEditor::get_state() const {
 	Dictionary d;
 
 	d["snap_enabled"] = snap_enabled;
-	d["trackball_enabled"] = trackball_enabled;
 	d["translate_snap"] = snap_translate_value;
 	d["rotate_snap"] = snap_rotate_value;
 	d["scale_snap"] = snap_scale_value;
 
 	d["local_coords"] = tool_option_button[TOOL_OPT_LOCAL_COORDS]->is_pressed();
-	d["preserve_children_transform"] = tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->is_pressed();
 
 	int vc = 0;
 	if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) {
@@ -7495,7 +7085,6 @@ Dictionary Node3DEditor::get_state() const {
 	}
 
 	d["viewport_mode"] = vc;
-	d["viewport_splits"] = viewport_base->get_split_state();
 	Array vpdata;
 	for (int i = 0; i < 4; i++) {
 		vpdata.push_back(viewports[i]->get_state());
@@ -7503,7 +7092,6 @@ Dictionary Node3DEditor::get_state() const {
 
 	d["viewports"] = vpdata;
 
-	d["vertex_snap_origin_mode"] = vertex_snap_origin_mode;
 	d["show_grid"] = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_GRID));
 	d["show_origin"] = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN));
 	d["fov"] = get_fov();
@@ -7555,11 +7143,6 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 		tool_option_button[TOOL_OPT_USE_SNAP]->set_pressed(d["snap_enabled"]);
 	}
 
-	if (d.has("trackball_enabled")) {
-		trackball_enabled = d["trackball_enabled"];
-		tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_pressed(d["trackball_enabled"]);
-	}
-
 	if (d.has("translate_snap")) {
 		snap_translate_value = d["translate_snap"];
 	}
@@ -7574,18 +7157,6 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 
 	_snap_update();
 
-	if (d.has("preserve_children_transform")) {
-		tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_pressed(d["preserve_children_transform"]);
-	}
-
-	if (d.has("vertex_snap_origin_mode")) {
-		vertex_snap_origin_mode = d["vertex_snap_origin_mode"];
-		int idx_vertex = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_VERTEX);
-		int idx_origin = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_ORIGIN);
-		transform_menu->get_popup()->set_item_checked(idx_vertex, !vertex_snap_origin_mode);
-		transform_menu->get_popup()->set_item_checked(idx_origin, vertex_snap_origin_mode);
-	}
-
 	if (d.has("local_coords")) {
 		tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["local_coords"]);
 		update_transform_gizmo();
@@ -7618,9 +7189,6 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 	if (d.has("fov")) {
 		settings_fov->set_value(double(d["fov"]));
 	}
-	if (d.has("viewport_splits")) {
-		viewport_base->set_split_state(d["viewport_splits"]);
-	}
 
 	if (d.has("viewports")) {
 		Array vp = d["viewports"];
@@ -7761,15 +7329,6 @@ void Node3DEditor::_snap_update() {
 	snap_scale->set_value(snap_scale_value);
 }
 
-void Node3DEditor::_update_vertex_snap_tooltips() {
-	String snap_key = ED_GET_SHORTCUT("spatial_editor/vertex_snap")->get_as_text();
-	PopupMenu *p = transform_menu->get_popup();
-	p->set_item_tooltip(p->get_item_index(MENU_VERTEX_SNAP_BASE_VERTEX),
-			vformat(TTR("Hold %s to highlight a vertex on the currently selected node,\nthen drag to move the node and snap it to vertices on neighboring nodes.\n\nFor nodes without a vertex-based representation,\nSnap Origin to Vertex is always used instead."), snap_key));
-	p->set_item_tooltip(p->get_item_index(MENU_VERTEX_SNAP_BASE_ORIGIN),
-			vformat(TTR("Hold %s to highlight another node's vertex,\nthen click to teleport the selected node to the highlighted vertex."), snap_key));
-}
-
 void Node3DEditor::_xform_dialog_action() {
 	Transform3D t;
 	//translation
@@ -7832,55 +7391,6 @@ void Node3DEditor::_menu_item_toggled(bool pressed, int p_option) {
 			tool_option_button[TOOL_OPT_USE_SNAP]->set_pressed(pressed);
 			snap_enabled = pressed;
 		} break;
-
-		case MENU_TOOL_USE_TRACKBALL: {
-			tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_pressed(pressed);
-			trackball_enabled = pressed;
-			for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
-				viewports[i]->update_transform_gizmo_highlight();
-			}
-		} break;
-
-		case MENU_TOOL_PRESERVE_CHILDREN_TRANSFORM: {
-			tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_pressed(pressed);
-			if (pressed) {
-				EditorNode::get_editor_data().add_undo_redo_inspector_hook_callback(callable_mp(this, &Node3DEditor::_undo_redo_inspector_callback));
-			} else {
-				EditorNode::get_editor_data().remove_undo_redo_inspector_hook_callback(callable_mp(this, &Node3DEditor::_undo_redo_inspector_callback));
-			}
-		} break;
-	}
-}
-
-void Node3DEditor::_undo_redo_inspector_callback(Object *p_undo_redo, Object *p_edited, const String &p_property, const Variant &p_new_value) {
-	Node3D *node = Object::cast_to<Node3D>(p_edited);
-	if (!node) {
-		return;
-	}
-
-	static const char *transform_properties[] = { "position", "rotation", "scale", "quaternion", "basis", "transform", nullptr };
-	bool is_transform_prop = false;
-	for (int i = 0; transform_properties[i]; i++) {
-		if (p_property == transform_properties[i]) {
-			is_transform_prop = true;
-			break;
-		}
-	}
-	if (!is_transform_prop) {
-		return;
-	}
-
-	EditorUndoRedoManager *undo_redo = Object::cast_to<EditorUndoRedoManager>(p_undo_redo);
-	ERR_FAIL_NULL(undo_redo);
-
-	int child_count = node->get_child_count();
-	for (int i = 0; i < child_count; i++) {
-		Node3D *child = Object::cast_to<Node3D>(node->get_child(i));
-		if (child) {
-			Transform3D child_global = child->get_global_transform();
-			undo_redo->add_do_method(child, "set_global_transform", child_global);
-			undo_redo->add_undo_method(child, "set_global_transform", child_global);
-		}
 	}
 }
 
@@ -7932,20 +7442,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 		case MENU_TRANSFORM_CONFIGURE_SNAP: {
 			snap_dialog->popup_centered(Size2(200, 180));
 		} break;
-		case MENU_VERTEX_SNAP_BASE_VERTEX: {
-			vertex_snap_origin_mode = false;
-			int idx_vertex = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_VERTEX);
-			int idx_origin = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_ORIGIN);
-			transform_menu->get_popup()->set_item_checked(idx_vertex, true);
-			transform_menu->get_popup()->set_item_checked(idx_origin, false);
-		} break;
-		case MENU_VERTEX_SNAP_BASE_ORIGIN: {
-			vertex_snap_origin_mode = true;
-			int idx_vertex = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_VERTEX);
-			int idx_origin = transform_menu->get_popup()->get_item_index(MENU_VERTEX_SNAP_BASE_ORIGIN);
-			transform_menu->get_popup()->set_item_checked(idx_vertex, false);
-			transform_menu->get_popup()->set_item_checked(idx_origin, true);
-		} break;
 		case MENU_TRANSFORM_DIALOG: {
 			for (int i = 0; i < 3; i++) {
 				xform_translate[i]->set_text("0");
@@ -8232,17 +7728,17 @@ void fragment() {
 		origin_points.set(5, Vector3(0.0, 0.5, 0.0));
 
 		Array d;
-		d.resize(RSE::ARRAY_MAX);
-		d[RSE::ARRAY_VERTEX] = origin_points;
+		d.resize(RS::ARRAY_MAX);
+		d[RenderingServer::ARRAY_VERTEX] = origin_points;
 
 		origin_mesh = RenderingServer::get_singleton()->mesh_create();
 
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(origin_mesh, RSE::PRIMITIVE_TRIANGLES, d);
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(origin_mesh, RenderingServer::PRIMITIVE_TRIANGLES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(origin_mesh, 0, origin_mat->get_rid());
 
 		origin_multimesh = RenderingServer::get_singleton()->multimesh_create();
 		RenderingServer::get_singleton()->multimesh_set_mesh(origin_multimesh, origin_mesh);
-		RenderingServer::get_singleton()->multimesh_allocate_data(origin_multimesh, 12, RSE::MultimeshTransformFormat::MULTIMESH_TRANSFORM_3D, true, false);
+		RenderingServer::get_singleton()->multimesh_allocate_data(origin_multimesh, 12, RS::MultimeshTransformFormat::MULTIMESH_TRANSFORM_3D, true, false);
 		RenderingServer::get_singleton()->multimesh_set_visible_instances(origin_multimesh, -1);
 
 		LocalVector<float> distances;
@@ -8289,10 +7785,10 @@ void fragment() {
 
 		origin_instance = RenderingServer::get_singleton()->instance_create2(origin_multimesh, get_tree()->get_root()->get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_layer_mask(origin_instance, 1 << Node3DEditorViewport::GIZMO_GRID_LAYER);
-		RS::get_singleton()->instance_geometry_set_flag(origin_instance, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(origin_instance, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(origin_instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(origin_instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 
-		RenderingServer::get_singleton()->instance_geometry_set_cast_shadows_setting(origin_instance, RSE::SHADOW_CASTING_SETTING_OFF);
+		RenderingServer::get_singleton()->instance_geometry_set_cast_shadows_setting(origin_instance, RS::SHADOW_CASTING_SETTING_OFF);
 
 		Ref<Shader> grid_shader = memnew(Shader);
 		grid_shader->set_code(R"(
@@ -8366,14 +7862,16 @@ void fragment() {
 					col = get_theme_color(SNAME("axis_z_color"), EditorStringName(Editor));
 					break;
 				case 3:
-					col = get_theme_color(SNAME("axis_view_plane_color"), EditorStringName(Editor));
+					col = Color(0.75, 0.75, 0.75, 1.0);
 					break;
 				default:
 					col = Color();
 					break;
 			}
 
-			col.a = col.a * (float)EDITOR_GET("editors/3d/manipulator_gizmo_opacity");
+			if (i < 3) {
+				col.a = EDITOR_GET("editors/3d/manipulator_gizmo_opacity");
+			}
 
 			if (i < 3) {
 				move_gizmo[i].instantiate();
@@ -8385,7 +7883,7 @@ void fragment() {
 
 			rotate_gizmo[i].instantiate();
 
-			const Color albedo = col.from_hsv(col.get_h(), col.get_s() * 0.25, 1.0, 1);
+			const Color albedo = col.from_hsv(col.get_h(), 0.25, 1.0, 1);
 
 			Ref<StandardMaterial3D> mat;
 			Ref<StandardMaterial3D> mat_hl;
@@ -8512,7 +8010,7 @@ void fragment() {
 				for (int j = 0; j < n; ++j) {
 					Basis basis = Basis(ivec, j * step);
 
-					real_t circle_size = (i == 3) ? gizmo_view_rotation_scale : GIZMO_CIRCLE_SIZE;
+					real_t circle_size = (i == 3) ? GIZMO_VIEW_ROTATION_SIZE : GIZMO_CIRCLE_SIZE;
 					Vector3 vertex = basis.xform(ivec2 * circle_size);
 
 					for (int k = 0; k < m; ++k) {
@@ -8623,7 +8121,9 @@ void fragment() {
 				rotate_gizmo[i]->surface_set_material(0, rotate_mat);
 
 				Ref<ShaderMaterial> rotate_mat_hl = rotate_mat->duplicate();
-				rotate_mat_hl->set_shader_parameter("albedo", albedo);
+				// For view rotation, use bright white; for axes, use highlight color.
+				Color highlight_color = (i == 3) ? Color(1.0, 1.0, 1.0, 1.0) : albedo;
+				rotate_mat_hl->set_shader_parameter("albedo", highlight_color);
 				rotate_gizmo_color_hl[i] = rotate_mat_hl;
 			}
 
@@ -8717,7 +8217,7 @@ void fragment() {
 					surftool->commit(scale_plane_gizmo[i]);
 
 					Ref<StandardMaterial3D> plane_mat_hl = plane_mat->duplicate();
-					plane_mat_hl->set_albedo(col.from_hsv(col.get_h(), col.get_s() * 0.25, 1.0, 1));
+					plane_mat_hl->set_albedo(col.from_hsv(col.get_h(), 0.25, 1.0, 1));
 					plane_gizmo_color_hl[i] = plane_mat_hl; // needed, so we can draw planes from both sides.
 				}
 
@@ -8741,62 +8241,6 @@ void fragment() {
 		}
 	}
 
-	// Create trackball sphere
-	{
-		trackball_sphere_gizmo.instantiate();
-		Ref<SurfaceTool> surftool;
-		surftool.instantiate();
-		surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
-
-		const int sphere_rings = TRACKBALL_SPHERE_RINGS;
-		const int sphere_sectors = TRACKBALL_SPHERE_SECTORS;
-		const real_t sphere_radius = GIZMO_CIRCLE_SIZE;
-
-		for (int r = 0; r <= sphere_rings; ++r) {
-			for (int s = 0; s <= sphere_sectors; ++s) {
-				real_t ring_angle = Math::PI * r / sphere_rings;
-				real_t sector_angle = 2.0 * Math::PI * s / sphere_sectors;
-
-				Vector3 vertex(
-						sphere_radius * Math::sin(ring_angle) * Math::cos(sector_angle),
-						sphere_radius * Math::cos(ring_angle),
-						sphere_radius * Math::sin(ring_angle) * Math::sin(sector_angle));
-
-				surftool->set_normal(vertex.normalized());
-				surftool->add_vertex(vertex);
-			}
-		}
-
-		for (int r = 0; r < sphere_rings; ++r) {
-			for (int s = 0; s < sphere_sectors; ++s) {
-				int current = r * (sphere_sectors + 1) + s;
-				int next = current + sphere_sectors + 1;
-
-				surftool->add_index(current);
-				surftool->add_index(next);
-				surftool->add_index(current + 1);
-
-				surftool->add_index(current + 1);
-				surftool->add_index(next);
-				surftool->add_index(next + 1);
-			}
-		}
-
-		trackball_sphere_material.instantiate();
-		trackball_sphere_material->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
-		trackball_sphere_material->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
-		trackball_sphere_material->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
-		trackball_sphere_material->set_cull_mode(StandardMaterial3D::CULL_DISABLED);
-		trackball_sphere_material->set_albedo(Color(1.0, 1.0, 1.0, 0.0));
-		trackball_sphere_material->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
-
-		trackball_sphere_material_hl = trackball_sphere_material->duplicate();
-		trackball_sphere_material_hl->set_albedo(Color(1.0, 1.0, 1.0, TRACKBALL_HIGHLIGHT_ALPHA));
-
-		surftool->set_material(trackball_sphere_material);
-		surftool->commit(trackball_sphere_gizmo);
-	}
-
 	_generate_selection_boxes();
 }
 
@@ -9021,20 +8465,20 @@ void Node3DEditor::_init_grid() {
 		// Create a mesh from the pushed vector points and colors.
 		grid[c] = RenderingServer::get_singleton()->mesh_create();
 		Array d;
-		d.resize(RSE::ARRAY_MAX);
-		d[RSE::ARRAY_VERTEX] = (Vector<Vector3>)grid_points[c];
-		d[RSE::ARRAY_COLOR] = (Vector<Color>)grid_colors[c];
-		d[RSE::ARRAY_NORMAL] = (Vector<Vector3>)grid_normals[c];
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(grid[c], RSE::PRIMITIVE_LINES, d);
+		d.resize(RS::ARRAY_MAX);
+		d[RenderingServer::ARRAY_VERTEX] = (Vector<Vector3>)grid_points[c];
+		d[RenderingServer::ARRAY_COLOR] = (Vector<Color>)grid_colors[c];
+		d[RenderingServer::ARRAY_NORMAL] = (Vector<Vector3>)grid_normals[c];
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(grid[c], RenderingServer::PRIMITIVE_LINES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(grid[c], 0, grid_mat[c]->get_rid());
 		grid_instance[c] = RenderingServer::get_singleton()->instance_create2(grid[c], get_tree()->get_root()->get_world_3d()->get_scenario());
 
 		// Yes, the end of this line is supposed to be a.
 		RenderingServer::get_singleton()->instance_set_visible(grid_instance[c], grid_visible[a]);
-		RenderingServer::get_singleton()->instance_geometry_set_cast_shadows_setting(grid_instance[c], RSE::SHADOW_CASTING_SETTING_OFF);
+		RenderingServer::get_singleton()->instance_geometry_set_cast_shadows_setting(grid_instance[c], RS::SHADOW_CASTING_SETTING_OFF);
 		RS::get_singleton()->instance_set_layer_mask(grid_instance[c], 1 << Node3DEditorViewport::GIZMO_GRID_LAYER);
-		RS::get_singleton()->instance_geometry_set_flag(grid_instance[c], RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-		RS::get_singleton()->instance_geometry_set_flag(grid_instance[c], RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		RS::get_singleton()->instance_geometry_set_flag(grid_instance[c], RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+		RS::get_singleton()->instance_geometry_set_flag(grid_instance[c], RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
 	}
 }
 
@@ -9485,8 +8929,6 @@ void Node3DEditor::_update_theme() {
 
 	tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_button_icon(get_editor_theme_icon(SNAME("Object")));
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_button_icon(get_editor_theme_icon(SNAME("Snap")));
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_button_icon(get_editor_theme_icon(SNAME("Trackball")));
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_button_icon(get_editor_theme_icon(SNAME("Pin")));
 
 	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_editor_theme_icon(SNAME("Panels1")));
 	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_editor_theme_icon(SNAME("Panels2")));
@@ -9512,16 +8954,12 @@ void Node3DEditor::_update_theme() {
 void Node3DEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_TRANSLATION_CHANGED: {
-			const String show_list_tooltip = TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.");
-			tool_button[TOOL_MODE_TRANSFORM]->set_tooltip_text(vformat(TTR("%s+Drag: Rotate selected node around pivot."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + show_list_tooltip);
-			tool_button[TOOL_MODE_MOVE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + show_list_tooltip);
-			tool_button[TOOL_MODE_ROTATE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + show_list_tooltip);
-			tool_button[TOOL_MODE_SCALE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + show_list_tooltip);
-			tool_button[TOOL_MODE_SELECT]->set_tooltip_text(show_list_tooltip);
-			tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip_text(TTR("Show list of selectable nodes at position clicked.") + "\n" + show_list_tooltip);
-			tool_button[TOOL_RULER]->set_tooltip_text(TTR("LMB+Drag: Measure the distance between two points in 3D space.") + "\n" + show_list_tooltip);
+			tool_button[TOOL_MODE_TRANSFORM]->set_tooltip_text(vformat(TTR("%s+Drag: Rotate selected node around pivot."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + TTR("(Available in all modes.)"));
+			tool_button[TOOL_MODE_MOVE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+			tool_button[TOOL_MODE_ROTATE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+			tool_button[TOOL_MODE_SCALE]->set_tooltip_text(vformat(TTR("%s+Drag: Use snap."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+			tool_button[TOOL_MODE_SELECT]->set_tooltip_text(TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + TTR("(Available in all modes.)"));
 			_update_gizmos_menu();
-			_update_vertex_snap_tooltips();
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -9542,6 +8980,15 @@ void Node3DEditor::_notification(int p_what) {
 			ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::update_all_gizmos).bind(Variant()));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "3D editor")));
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			_update_theme();
 			_register_all_gizmos();
@@ -9584,11 +9031,6 @@ void Node3DEditor::_notification(int p_what) {
 				}
 				update_gizmo_opacity();
 			}
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("editors/3d_gizmos/gizmo_settings")) {
-				CollisionShape3DGizmoPlugin::set_show_only_when_selected(EDITOR_GET("editors/3d_gizmos/gizmo_settings/show_collision_shapes_only_when_selected"));
-				update_all_gizmos();
-			}
-			_update_vertex_snap_tooltips();
 		} break;
 
 		case NOTIFICATION_PHYSICS_PROCESS: {
@@ -9686,8 +9128,6 @@ void Node3DEditor::set_can_preview(Camera3D *p_preview) {
 	for (int i = 0; i < 4; i++) {
 		viewports[i]->set_can_preview(p_preview);
 	}
-
-	viewports[last_used_viewport]->switch_preview_camera(p_preview);
 }
 
 VSplitContainer *Node3DEditor::get_shader_split() {
@@ -10074,7 +9514,7 @@ void Node3DEditor::_load_default_preview_settings() {
 	if (OS::get_singleton()->get_current_rendering_method() != "gl_compatibility" && OS::get_singleton()->get_current_rendering_method() != "dummy") {
 		environ_glow_button->set_pressed_no_signal(true);
 	}
-	environ_tonemap_button->set_pressed_no_signal(false);
+	environ_tonemap_button->set_pressed_no_signal(true);
 	environ_ao_button->set_pressed_no_signal(false);
 	environ_gi_button->set_pressed_no_signal(false);
 	sun_shadow_max_distance->set_value_no_signal(100);
@@ -10306,18 +9746,20 @@ void Node3DEditor::PreviewSunEnvPopup::shortcut_input(const Ref<InputEvent> &p_e
 Node3DEditor::Node3DEditor() {
 	gizmo.visible = true;
 	gizmo.scale = 1.0;
-	float vp_radius = (float)EDITOR_GET("editors/3d/view_plane_rotation_gizmo_scale");
-	gizmo_view_rotation_scale = GIZMO_CIRCLE_SIZE * vp_radius;
-	gizmo_view_rotation_shrink = 1.0 / vp_radius;
 
 	viewport_environment.instantiate();
 	VBoxContainer *vbc = this;
 
+	custom_camera = nullptr;
 	ERR_FAIL_COND_MSG(singleton != nullptr, "A Node3DEditor singleton already exists.");
 	singleton = this;
 	editor_selection = EditorNode::get_singleton()->get_editor_selection();
 	editor_selection->add_editor_plugin(this);
 
+	snap_enabled = false;
+	snap_key_enabled = false;
+	tool_mode = TOOL_MODE_TRANSFORM;
+
 	MarginContainer *toolbar_margin = memnew(MarginContainer);
 	toolbar_margin->set_theme_type_variation("MainToolBarMargin");
 	vbc->add_child(toolbar_margin);
@@ -10390,8 +9832,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_MODE_LIST_SELECT]->set_toggle_mode(true);
 	tool_button[TOOL_MODE_LIST_SELECT]->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_button[TOOL_MODE_LIST_SELECT]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_LIST_SELECT));
-	tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip_text(TTR("Show list of selectable nodes at position clicked.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
-	tool_button[TOOL_MODE_LIST_SELECT]->set_accessibility_name(TTRC("Show List of Selectable Nodes"));
+	tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip_text(TTRC("Show list of selectable nodes at position clicked."));
 
 	tool_button[TOOL_LOCK_SELECTED] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_LOCK_SELECTED]);
@@ -10434,7 +9875,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_RULER]->set_toggle_mode(true);
 	tool_button[TOOL_RULER]->set_theme_type_variation("FlatButton");
 	tool_button[TOOL_RULER]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_RULER));
-	tool_button[TOOL_RULER]->set_tooltip_text(TTRC("LMB+Drag: Measure distance between two points.\nShift+LMB+Drag: Show component measurements."));
+	tool_button[TOOL_RULER]->set_tooltip_text(TTRC("LMB+Drag: Measure the distance between two points in 3D space."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_RULER]->set_shortcut(ED_SHORTCUT("spatial_editor/measure", TTRC("Ruler Mode"), Key::M));
 	tool_button[TOOL_RULER]->set_accessibility_name(TTRC("Ruler Mode"));
@@ -10459,25 +9900,6 @@ Node3DEditor::Node3DEditor() {
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut_context(this);
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_accessibility_name(TTRC("Use Snap"));
 
-	tool_option_button[TOOL_OPT_USE_TRACKBALL] = memnew(Button);
-	main_menu_hbox->add_child(tool_option_button[TOOL_OPT_USE_TRACKBALL]);
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_toggle_mode(true);
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_theme_type_variation(SceneStringName(FlatButton));
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_USE_TRACKBALL));
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_shortcut(ED_SHORTCUT("spatial_editor/trackball", TTRC("Use Trackball"), Key::U));
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_shortcut_context(this);
-	tool_option_button[TOOL_OPT_USE_TRACKBALL]->set_accessibility_name(TTRC("Use Trackball"));
-
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM] = memnew(Button);
-	main_menu_hbox->add_child(tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]);
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_toggle_mode(true);
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_theme_type_variation(SceneStringName(FlatButton));
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_PRESERVE_CHILDREN_TRANSFORM));
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_shortcut(ED_SHORTCUT("spatial_editor/preserve_children_transform", TTRC("Preserve Children Transform"), Key::P));
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_shortcut_context(this);
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_accessibility_name(TTRC("Preserve Children Transform"));
-	tool_option_button[TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->set_tooltip_text(TTRC("When enabled, transforming a node will preserve the global transform of its children.\nThis also applies when editing transform properties in the Inspector."));
-
 	main_menu_hbox->add_child(memnew(VSeparator));
 	sun_button = memnew(Button);
 	sun_button->set_tooltip_text(TTRC("Toggle preview sunlight.\nIf a DirectionalLight3D node is added to the scene, preview sunlight is disabled."));
@@ -10556,13 +9978,6 @@ Node3DEditor::Node3DEditor() {
 	p->add_shortcut(ED_SHORTCUT("spatial_editor/snap_to_floor", TTRC("Snap Object to Floor"), Key::PAGEDOWN), MENU_SNAP_TO_FLOOR);
 	p->add_shortcut(ED_SHORTCUT("spatial_editor/transform_dialog", TTRC("Transform Dialog...")), MENU_TRANSFORM_DIALOG);
 
-	p->add_separator();
-	ED_SHORTCUT("spatial_editor/vertex_snap", TTRC("Vertex Snap"), Key::B);
-	p->add_radio_check_item(TTRC("Snap Vertex to Vertex"), MENU_VERTEX_SNAP_BASE_VERTEX);
-	p->set_item_checked(p->get_item_index(MENU_VERTEX_SNAP_BASE_VERTEX), true);
-	p->add_radio_check_item(TTRC("Snap Origin to Vertex"), MENU_VERTEX_SNAP_BASE_ORIGIN);
-	_update_vertex_snap_tooltips();
-
 	p->add_separator();
 	p->add_shortcut(ED_SHORTCUT("spatial_editor/configure_snap", TTRC("Configure Snap...")), MENU_TRANSFORM_CONFIGURE_SNAP);
 
@@ -10641,10 +10056,7 @@ Node3DEditor::Node3DEditor() {
 		viewports[i]->connect("toggle_maximize_view", callable_mp(this, &Node3DEditor::_toggle_maximize_view));
 		viewports[i]->connect("clicked", callable_mp(this, &Node3DEditor::_viewport_clicked).bind(i));
 		viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept);
-		viewports[i]->set_h_size_flags(SIZE_EXPAND_FILL);
-		viewports[i]->set_v_size_flags(SIZE_EXPAND_FILL);
-		viewports[i]->set_custom_minimum_size(Size2(39, 39));
-		viewport_base->add_viewport(viewports[i], i);
+		viewport_base->add_child(viewports[i]);
 	}
 
 	/* SNAP DIALOG */
diff --git a/engine/editor/scene/3d/node_3d_editor_plugin.h b/engine/editor/scene/3d/node_3d_editor_plugin.h
index 63beb2b4..2c366f80 100644
--- a/engine/editor/scene/3d/node_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/node_3d_editor_plugin.h
@@ -34,10 +34,8 @@
 #include "editor/plugins/editor_plugin.h"
 #include "editor/scene/3d/node_3d_editor_gizmos.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/debugger/view_3d_controller.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/margin_container.h"
 #include "scene/gui/spin_box.h"
 #include "scene/resources/gradient.h"
 #include "scene/resources/immediate_mesh.h"
@@ -58,8 +56,6 @@ class Node3DEditorViewport;
 class OptionButton;
 class PanelContainer;
 class ProceduralSkyMaterial;
-class RichTextLabel;
-class SplitContainer;
 class SubViewport;
 class SubViewportContainer;
 class VSeparator;
@@ -89,7 +85,6 @@ class ViewportRotationControl : public Control {
 	Vector<int> axis_menu_options;
 	Vector2i orbiting_mouse_start;
 	Point2 original_mouse_pos;
-	View3DController::Cursor saved_cursor;
 	int orbiting_index = -1;
 	int focused_axis = -2;
 	bool gizmo_activated = false;
@@ -178,6 +173,16 @@ class Node3DEditorViewport : public Control {
 		VIEW_MAX
 	};
 
+	enum ViewType {
+		VIEW_TYPE_USER,
+		VIEW_TYPE_TOP,
+		VIEW_TYPE_BOTTOM,
+		VIEW_TYPE_LEFT,
+		VIEW_TYPE_RIGHT,
+		VIEW_TYPE_FRONT,
+		VIEW_TYPE_REAR,
+	};
+
 public:
 	static constexpr int32_t GIZMO_BASE_LAYER = 27;
 	static constexpr int32_t GIZMO_EDIT_LAYER = 26;
@@ -186,6 +191,28 @@ public:
 
 	static constexpr int32_t FRAME_TIME_HISTORY = 20;
 
+	enum NavigationScheme {
+		NAVIGATION_GODOT = 0,
+		NAVIGATION_MAYA = 1,
+		NAVIGATION_MODO = 2,
+		NAVIGATION_CUSTOM = 3,
+		NAVIGATION_TABLET = 4,
+	};
+
+	enum FreelookNavigationScheme {
+		FREELOOK_DEFAULT,
+		FREELOOK_PARTIALLY_AXIS_LOCKED,
+		FREELOOK_FULLY_AXIS_LOCKED,
+	};
+
+	enum ViewportNavMouseButton {
+		NAVIGATION_LEFT_MOUSE,
+		NAVIGATION_MIDDLE_MOUSE,
+		NAVIGATION_RIGHT_MOUSE,
+		NAVIGATION_MOUSE_4,
+		NAVIGATION_MOUSE_5,
+	};
+
 private:
 	double cpu_time_history[FRAME_TIME_HISTORY];
 	int cpu_time_history_index;
@@ -196,22 +223,16 @@ private:
 	Node3D *ruler_start_point = nullptr;
 	Node3D *ruler_end_point = nullptr;
 	Ref<ImmediateMesh> geometry;
-	Ref<ImmediateMesh> geometry_xray;
 	MeshInstance3D *ruler_line = nullptr;
 	MeshInstance3D *ruler_line_xray = nullptr;
 	Label *ruler_label = nullptr;
 	Ref<StandardMaterial3D> ruler_material;
 	Ref<StandardMaterial3D> ruler_material_xray;
-	Ref<StandardMaterial3D> ruler_triangle_material;
-	Ref<StandardMaterial3D> ruler_triangle_material_xray;
-	MeshInstance3D *ruler_triangle_lines = nullptr;
-	MeshInstance3D *ruler_triangle_lines_xray = nullptr;
-	Label *ruler_label_x = nullptr;
-	Label *ruler_label_y = nullptr;
-	Label *ruler_label_z = nullptr;
 
 	int index;
+	ViewType view_type;
 	void _menu_option(int p_option);
+	void _set_auto_orthogonal();
 	Node3D *preview_node = nullptr;
 	bool update_preview_node = false;
 	Point2 preview_node_viewport_pos;
@@ -223,14 +244,10 @@ private:
 	Node *target_node = nullptr;
 	Point2 drop_pos;
 
-	ObjectID focused_node_id;
-
 	EditorSelection *editor_selection = nullptr;
 
 	Button *translation_preview_button = nullptr;
-	Button *follow_mode = nullptr;
 	CheckBox *preview_camera = nullptr;
-	CheckBox *pilot_camera = nullptr;
 	SubViewportContainer *subviewport_container = nullptr;
 
 	MenuButton *view_display_menu = nullptr;
@@ -240,19 +257,16 @@ private:
 	SubViewport *viewport = nullptr;
 	Camera3D *camera = nullptr;
 	bool transforming = false;
+	bool orthogonal;
+	bool auto_orthogonal;
+	bool lock_rotation;
 	bool transform_gizmo_visible = true;
 	bool collision_reposition = false;
 	real_t gizmo_scale;
 
-	bool vertex_snap_mode = false;
-	Key vertex_snap_keycode = Key::NONE;
-	bool vertex_snap_dragging = false;
-	Vector3 vertex_snap_source;
-	Plane vertex_snap_drag_plane;
-	Vector3 vertex_snap_target;
-	bool vertex_snap_has_target = false;
-	bool vertex_snap_has_source = false;
-	HashMap<ObjectID, Vector3> vertex_snap_original_positions;
+	bool freelook_active;
+	real_t freelook_speed;
+	Vector2 previous_mouse_position;
 
 	PanelContainer *info_panel = nullptr;
 	Label *info_label = nullptr;
@@ -260,14 +274,15 @@ private:
 	Label *locked_label = nullptr;
 	Label *zoom_limit_label = nullptr;
 
-	RichTextLabel *tooltip_panel = nullptr;
+	Label *preview_material_label = nullptr;
+	Label *preview_material_label_desc = nullptr;
 
 	VBoxContainer *top_right_vbox = nullptr;
 	VBoxContainer *bottom_center_vbox = nullptr;
 	ViewportNavigationControl *position_control = nullptr;
 	ViewportNavigationControl *look_control = nullptr;
 	ViewportRotationControl *rotation_control = nullptr;
-	Ref<Gradient> frame_time_gradient;
+	Gradient *frame_time_gradient = nullptr;
 	PanelContainer *frame_time_panel = nullptr;
 	VBoxContainer *frame_time_vbox = nullptr;
 	Label *cpu_time_label = nullptr;
@@ -280,8 +295,6 @@ private:
 		_FORCE_INLINE_ bool operator<(const _RayResult &p_rr) const { return depth < p_rr.depth; }
 	};
 
-	void _view_state_changed();
-
 	void _update_name();
 	void _compute_edit(const Point2 &p_point);
 	void _clear_selected();
@@ -290,14 +303,6 @@ private:
 	ObjectID _select_ray(const Point2 &p_pos) const;
 	void _find_items_at_pos(const Point2 &p_pos, Vector<_RayResult> &r_results, bool p_include_locked);
 
-	float _min_screen_dist_to_aabb(const AABB &p_aabb, const Transform3D &p_transform, const Point2 &p_cursor) const;
-	bool _find_closest_vertex_on_node(const Point2 &p_screen_pos, Node3D *p_node, float &r_closest_screen_dist, Vector3 &r_vertex_world) const;
-	bool _find_closest_vertex_in_scene(const Point2 &p_screen_pos, float p_threshold, Vector3 &r_vertex_world, const HashMap<ObjectID, Vector3> *p_exclude = nullptr);
-	void _vertex_snap_update_source(const Point2 &p_screen_pos);
-	void _vertex_snap_commit();
-	void _vertex_snap_cancel();
-	bool _is_vertex_occluded(const Vector3 &p_world_pos, const Vector2 &p_screen_pos) const;
-
 	Transform3D _get_camera_transform() const;
 	int get_selected_count() const;
 	void cancel_transform();
@@ -306,21 +311,24 @@ private:
 	Vector3 _get_camera_position() const;
 	Vector3 _get_camera_normal() const;
 	Vector3 _get_screen_to_space(const Vector3 &p_vector3);
-	Vector<Plane> _build_screen_frustum(const Point2 &p_min, const Point2 &p_max);
 
 	void _select_region();
 	bool _transform_gizmo_select(const Vector2 &p_screenpos, bool p_highlight_only = false);
 	void _transform_gizmo_apply(Node3D *p_node, const Transform3D &p_transform, bool p_local);
 
+	void _nav_pan(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative);
+	void _nav_zoom(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative);
+	void _nav_orbit(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative);
+	void _nav_look(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative);
+
 	bool _is_shortcut_empty(const String &p_name);
 	bool _is_nav_modifier_pressed(const String &p_name);
+	int _get_shortcut_input_count(const String &p_name);
 
 	float get_znear() const;
 	float get_zfar() const;
 	float get_fov() const;
 
-	void _show_tooltip(const String &p_title, const String &p_description) const;
-
 	ObjectID clicked;
 	ObjectID material_target;
 	Vector<Node3D *> selection_results;
@@ -331,6 +339,19 @@ private:
 
 	PopupMenu *selection_menu = nullptr;
 
+	enum NavigationZoomStyle {
+		NAVIGATION_ZOOM_VERTICAL,
+		NAVIGATION_ZOOM_HORIZONTAL
+	};
+
+	enum NavigationMode {
+		NAVIGATION_NONE,
+		NAVIGATION_PAN,
+		NAVIGATION_ZOOM,
+		NAVIGATION_ORBIT,
+		NAVIGATION_LOOK,
+		NAVIGATION_MOVE
+	};
 	enum TransformMode {
 		TRANSFORM_NONE,
 		TRANSFORM_ROTATE,
@@ -361,8 +382,8 @@ private:
 		Vector3 center;
 		Point2 mouse_pos;
 		Point2 original_mouse_pos;
+		bool snap = false;
 		bool show_rotation_line = false;
-		bool is_trackball = false;
 		Ref<EditorNode3DGizmo> gizmo;
 		int gizmo_handle = 0;
 		bool gizmo_handle_secondary = false;
@@ -382,28 +403,70 @@ private:
 		Vector3 rotation_axis;
 		Vector3 view_axis_local;
 		double accumulated_rotation_angle = 0.0;
-		double rotation_angle = 0.0;
+		double display_rotation_angle = 0.0;
 		Vector3 initial_click_vector;
 		Vector3 previous_rotation_vector;
 		bool gizmo_initiated = false;
-
-		HashMap<Node3D *, Transform3D> children_original_globals;
 	} _edit;
 
-	Ref<View3DController> view_3d_controller;
-	void _update_view_3d_controller(bool p_update_all = true);
+	struct Cursor {
+		Vector3 pos;
+		real_t x_rot, y_rot, distance, fov_scale;
+		real_t unsnapped_x_rot, unsnapped_y_rot;
+		Vector3 eye_pos; // Used in freelook mode
+		bool region_select;
+		Point2 region_begin, region_end;
 
-	void _cursor_interpolated();
-	void _cursor_distance_scaled();
+		Cursor() {
+			// These rotations place the camera in +X +Y +Z, aka south east, facing north west.
+			x_rot = 0.5;
+			y_rot = -0.5;
+			unsnapped_x_rot = x_rot;
+			unsnapped_y_rot = y_rot;
+			distance = 4;
+			fov_scale = 1.0;
+			region_select = false;
+		}
+	};
+	// Viewport camera supports movement smoothing,
+	// so one cursor is the real cursor, while the other can be an interpolated version.
+	Cursor cursor; // Immediate cursor
+	Cursor camera_cursor; // That one may be interpolated (don't modify this one except for smoothing purposes)
+	Cursor previous_cursor; // Storing previous cursor state for canceling purposes
 
-	void _freelook_changed();
-	void _freelook_speed_scaled();
+	void scale_fov(real_t p_fov_offset);
+	void reset_fov();
+	void scale_cursor_distance(real_t scale);
+
+	struct ShortcutCheckSet {
+		bool mod_pressed = false;
+		bool shortcut_not_empty = true;
+		int input_count = 0;
+		ViewportNavMouseButton mouse_preference = NAVIGATION_LEFT_MOUSE;
+		NavigationMode result_nav_mode = NAVIGATION_NONE;
+
+		ShortcutCheckSet() {}
+
+		ShortcutCheckSet(bool p_mod_pressed, bool p_shortcut_not_empty, int p_input_count, const ViewportNavMouseButton &p_mouse_preference, const NavigationMode &p_result_nav_mode) :
+				mod_pressed(p_mod_pressed), shortcut_not_empty(p_shortcut_not_empty), input_count(p_input_count), mouse_preference(p_mouse_preference), result_nav_mode(p_result_nav_mode) {
+		}
+	};
+
+	struct ShortcutCheckSetComparator {
+		_FORCE_INLINE_ bool operator()(const ShortcutCheckSet &A, const ShortcutCheckSet &B) const {
+			return A.input_count > B.input_count;
+		}
+	};
+
+	NavigationMode _get_nav_mode_from_shortcut_check(ViewportNavMouseButton p_mouse_button, Vector<ShortcutCheckSet> p_shortcut_check_sets, bool p_use_not_empty);
+
+	void set_freelook_active(bool active_now);
+	void scale_freelook_speed(real_t scale);
 
 	real_t zoom_indicator_delay;
 	int zoom_failed_attempts_count = 0;
 
 	RID move_gizmo_instance[3], move_plane_gizmo_instance[3], rotate_gizmo_instance[4], scale_gizmo_instance[3], scale_plane_gizmo_instance[3], axis_gizmo_instance[3];
-	RID trackball_sphere_instance;
 
 	String last_message;
 	String message;
@@ -412,7 +475,9 @@ private:
 	void set_message(const String &p_message, float p_time = 5);
 
 	void _view_settings_confirmed(real_t p_interp_delta);
+	void _update_camera(real_t p_interp_delta);
 	void _update_navigation_controls_visibility();
+	Transform3D to_camera_transform(const Cursor &p_cursor) const;
 	void _draw();
 
 	// These allow tool scripts to set the 3D cursor location by updating the camera transform.
@@ -427,6 +492,7 @@ private:
 
 	void input(const Ref<InputEvent> &p_event) override;
 	void _sinput(const Ref<InputEvent> &p_event);
+	void _update_freelook(real_t delta);
 	Node3DEditor *spatial_editor = nullptr;
 
 	Camera3D *previewing = nullptr;
@@ -434,23 +500,18 @@ private:
 
 	bool previewing_camera = false;
 	bool previewing_cinema = false;
-	int times_focused_consecutively = 0;
-	bool pilot_preview_enabled = false;
 	bool _is_node_locked(const Node *p_node) const;
 	void _preview_exited_scene();
 	void _preview_camera_property_changed();
-	void _sync_cursor_from_transform(const Transform3D &p_transform);
 	void _update_centered_labels();
-	void _disable_follow_mode();
-	void _reset_follow_mode_count();
 	void _toggle_camera_preview(bool);
-	void _toggle_pilot_preview(bool);
 	void _toggle_cinema_preview(bool);
 	void _init_gizmo_instance(int p_idx);
 	void _finish_gizmo_instances();
 	void _selection_result_pressed(int);
 	void _selection_menu_hide();
 	void _list_select(Ref<InputEventMouseButton> b);
+	Point2 _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const;
 
 	Vector3 _get_instance_position(const Point2 &p_pos, Node3D *p_node) const;
 	static AABB _calculate_spatial_bounds(const Node3D *p_parent, bool p_omit_top_level = false, const Transform3D *p_bounds_orientation = nullptr);
@@ -472,7 +533,7 @@ private:
 
 	void _project_settings_changed();
 
-	Transform3D _compute_transform(TransformMode p_mode, const Transform3D &p_original, const Transform3D &p_original_local, Vector3 p_motion, double p_extra, bool p_local, bool p_orthogonal, bool p_view_axis);
+	Transform3D _compute_transform(TransformMode p_mode, const Transform3D &p_original, const Transform3D &p_original_local, Vector3 p_motion, double p_extra, bool p_local, bool p_orthogonal, bool p_view_axis = false);
 
 	void _reset_transform(TransformType p_type);
 
@@ -504,13 +565,12 @@ protected:
 public:
 	void update_surface() { surface->queue_redraw(); }
 	void update_transform_gizmo_view();
-	void update_transform_gizmo_highlight();
 
 	void set_can_preview(Camera3D *p_preview);
-	void switch_preview_camera(Camera3D *p_new_camera);
 	void set_state(const Dictionary &p_state);
 	Dictionary get_state() const;
 	void reset();
+	bool is_freelook_active() const { return freelook_active; }
 
 	Vector3 get_ray_pos(const Vector2 &p_pos) const;
 	Vector3 get_ray(const Vector2 &p_pos) const;
@@ -555,8 +615,8 @@ public:
 	~Node3DEditorSelectedItem();
 };
 
-class Node3DEditorViewportContainer : public MarginContainer {
-	GDCLASS(Node3DEditorViewportContainer, MarginContainer);
+class Node3DEditorViewportContainer : public Container {
+	GDCLASS(Node3DEditorViewportContainer, Container);
 
 public:
 	enum View {
@@ -569,12 +629,20 @@ public:
 	};
 
 private:
-	View view = VIEW_USE_1_VIEWPORT;
-	SplitContainer *main_split = nullptr;
-	SplitContainer *first_split = nullptr;
-	SplitContainer *second_split = nullptr;
+	View view;
+	bool mouseover;
+	real_t ratio_h;
+	real_t ratio_v;
 
-	void _update_split_drag_margin();
+	bool hovering_v;
+	bool hovering_h;
+
+	bool dragging_v;
+	bool dragging_h;
+	Vector2 drag_begin_pos;
+	Vector2 drag_begin_ratio;
+
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
 protected:
 	void _notification(int p_what);
@@ -583,11 +651,6 @@ public:
 	void set_view(View p_view);
 	View get_view();
 
-	void add_viewport(Node3DEditorViewport *p_viewport, int p_index);
-
-	Dictionary get_split_state() const;
-	void set_split_state(const Dictionary &p_state);
-
 	Node3DEditorViewportContainer();
 };
 
@@ -615,8 +678,6 @@ public:
 	enum ToolOptions {
 		TOOL_OPT_LOCAL_COORDS,
 		TOOL_OPT_USE_SNAP,
-		TOOL_OPT_USE_TRACKBALL,
-		TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM,
 		TOOL_OPT_MAX
 	};
 
@@ -625,9 +686,6 @@ public:
 		TRANSFORM_MODE_LOCAL = 2,
 	};
 
-	real_t gizmo_view_rotation_scale = 1.0;
-	real_t gizmo_view_rotation_shrink = 1.0;
-
 private:
 	EditorSelection *editor_selection = nullptr;
 
@@ -641,7 +699,7 @@ private:
 
 	/////
 
-	ToolMode tool_mode = TOOL_MODE_TRANSFORM;
+	ToolMode tool_mode;
 
 	RID origin_mesh;
 	RID origin_multimesh;
@@ -657,15 +715,12 @@ private:
 	Vector3 grid_camera_last_update_position;
 
 	Ref<ArrayMesh> move_gizmo[3], move_plane_gizmo[3], rotate_gizmo[4], scale_gizmo[3], scale_plane_gizmo[3], axis_gizmo[3];
-	Ref<ArrayMesh> trackball_sphere_gizmo;
 	Ref<StandardMaterial3D> gizmo_color[3];
 	Ref<StandardMaterial3D> plane_gizmo_color[3];
 	Ref<ShaderMaterial> rotate_gizmo_color[4];
 	Ref<StandardMaterial3D> gizmo_color_hl[3];
 	Ref<StandardMaterial3D> plane_gizmo_color_hl[3];
 	Ref<ShaderMaterial> rotate_gizmo_color_hl[4];
-	Ref<StandardMaterial3D> trackball_sphere_material;
-	Ref<StandardMaterial3D> trackball_sphere_material_hl;
 
 	Ref<Node3DGizmo> current_hover_gizmo;
 	int current_hover_gizmo_handle;
@@ -673,9 +728,9 @@ private:
 
 	DynamicBVH gizmo_bvh;
 
-	real_t snap_translate_value = 0;
-	real_t snap_rotate_value = 0;
-	real_t snap_scale_value = 0;
+	real_t snap_translate_value;
+	real_t snap_rotate_value;
+	real_t snap_scale_value;
 
 	Ref<ArrayMesh> active_selection_box_xray;
 	Ref<ArrayMesh> active_selection_box;
@@ -719,8 +774,6 @@ private:
 		MENU_TOOL_LIST_SELECT,
 		MENU_TOOL_LOCAL_COORDS,
 		MENU_TOOL_USE_SNAP,
-		MENU_TOOL_USE_TRACKBALL,
-		MENU_TOOL_PRESERVE_CHILDREN_TRANSFORM,
 		MENU_TRANSFORM_CONFIGURE_SNAP,
 		MENU_TRANSFORM_DIALOG,
 		MENU_VIEW_USE_1_VIEWPORT,
@@ -739,8 +792,6 @@ private:
 		MENU_UNGROUP_SELECTED,
 		MENU_SNAP_TO_FLOOR,
 		MENU_RULER,
-		MENU_VERTEX_SNAP_BASE_VERTEX,
-		MENU_VERTEX_SNAP_BASE_ORIGIN,
 	};
 
 	Button *tool_button[TOOL_MAX];
@@ -756,15 +807,12 @@ private:
 	ConfirmationDialog *xform_dialog = nullptr;
 	ConfirmationDialog *settings_dialog = nullptr;
 
-	bool snap_enabled = false;
-	bool snap_key_enabled = false;
-	bool vertex_snap_origin_mode = false;
+	bool snap_enabled;
+	bool snap_key_enabled;
 	EditorSpinSlider *snap_translate = nullptr;
 	EditorSpinSlider *snap_rotate = nullptr;
 	EditorSpinSlider *snap_scale = nullptr;
 
-	bool trackball_enabled = false;
-
 	LineEdit *xform_translate[3];
 	LineEdit *xform_rotate[3];
 	LineEdit *xform_scale[3];
@@ -777,7 +825,6 @@ private:
 
 	void _snap_changed();
 	void _snap_update();
-	void _update_vertex_snap_tooltips();
 	void _xform_dialog_action();
 	void _menu_item_pressed(int p_option);
 	void _menu_item_toggled(bool pressed, int p_option);
@@ -916,8 +963,6 @@ private:
 
 	void _update_theme();
 
-	void _undo_redo_inspector_callback(Object *p_undo_redo, Object *p_edited, const String &p_property, const Variant &p_new_value);
-
 protected:
 	void _notification(int p_what);
 	//void _gui_input(InputEvent p_event);
@@ -942,22 +987,17 @@ public:
 	ToolMode get_tool_mode() const { return tool_mode; }
 	bool are_local_coords_enabled() const { return tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->is_pressed(); }
 	void set_local_coords_enabled(bool on) const { tool_option_button[Node3DEditor::TOOL_OPT_LOCAL_COORDS]->set_pressed(on); }
-	bool is_preserve_children_transform_enabled() const { return tool_option_button[Node3DEditor::TOOL_OPT_PRESERVE_CHILDREN_TRANSFORM]->is_pressed(); }
 	bool is_snap_enabled() const { return snap_enabled ^ snap_key_enabled; }
-	bool is_vertex_snap_origin_mode() const { return vertex_snap_origin_mode; }
 	real_t get_translate_snap() const;
 	real_t get_rotate_snap() const;
 	real_t get_scale_snap() const;
 
-	bool is_trackball_enabled() const { return trackball_enabled; }
-
 	Ref<ArrayMesh> get_move_gizmo(int idx) const { return move_gizmo[idx]; }
 	Ref<ArrayMesh> get_axis_gizmo(int idx) const { return axis_gizmo[idx]; }
 	Ref<ArrayMesh> get_move_plane_gizmo(int idx) const { return move_plane_gizmo[idx]; }
 	Ref<ArrayMesh> get_rotate_gizmo(int idx) const { return rotate_gizmo[idx]; }
 	Ref<ArrayMesh> get_scale_gizmo(int idx) const { return scale_gizmo[idx]; }
 	Ref<ArrayMesh> get_scale_plane_gizmo(int idx) const { return scale_plane_gizmo[idx]; }
-	Ref<ArrayMesh> get_trackball_sphere_gizmo() const { return trackball_sphere_gizmo; }
 
 	void update_grid();
 	void update_transform_gizmo();
@@ -1072,7 +1112,7 @@ class ViewportNavigationControl : public Control {
 	Vector2 focused_pos;
 	bool hovered = false;
 	int focused_index = -1;
-	View3DController::NavigationMode nav_mode = View3DController::NavigationMode::NAV_MODE_NONE;
+	Node3DEditorViewport::NavigationMode nav_mode = Node3DEditorViewport::NavigationMode::NAVIGATION_NONE;
 
 	const float AXIS_CIRCLE_RADIUS = 30.0f * EDSCALE;
 
@@ -1085,6 +1125,6 @@ protected:
 	void _update_navigation();
 
 public:
-	void set_navigation_mode(View3DController::NavigationMode p_nav_mode);
+	void set_navigation_mode(Node3DEditorViewport::NavigationMode p_nav_mode);
 	void set_viewport(Node3DEditorViewport *p_viewport);
 };
diff --git a/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp b/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
index 4117b2e2..912ad922 100644
--- a/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
@@ -30,13 +30,9 @@
 
 #include "occluder_instance_3d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "scene/3d/occluder_instance_3d.h"
-#include "scene/main/scene_tree.h"
 
 void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) {
 	if (occluder_instance) {
diff --git a/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.h b/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.h
index 3251a4b1..4768a6e4 100644
--- a/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/occluder_instance_3d_editor_plugin.h
@@ -31,9 +31,10 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/3d/occluder_instance_3d.h"
+#include "scene/resources/material.h"
 
 class EditorFileDialog;
-class OccluderInstance3D;
 
 class OccluderInstance3DEditorPlugin : public EditorPlugin {
 	GDCLASS(OccluderInstance3DEditorPlugin, EditorPlugin);
@@ -52,6 +53,7 @@ protected:
 
 public:
 	virtual String get_plugin_name() const override { return "OccluderInstance3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/particles_3d_editor_plugin.cpp b/engine/editor/scene/3d/particles_3d_editor_plugin.cpp
index 32f62885..ff372333 100644
--- a/engine/editor/scene/3d/particles_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/particles_3d_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "particles_3d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/scene_tree_editor.h"
diff --git a/engine/editor/scene/3d/path_3d_editor_plugin.cpp b/engine/editor/scene/3d/path_3d_editor_plugin.cpp
index 654bf24b..28e0fa7c 100644
--- a/engine/editor/scene/3d/path_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/path_3d_editor_plugin.cpp
@@ -32,18 +32,14 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/debugger/view_3d_controller.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/curve.h"
 
 String Path3DGizmo::get_handle_name(int p_id, bool p_secondary) const {
@@ -118,29 +114,6 @@ void Path3DGizmo::set_handle(int p_id, bool p_secondary, Camera3D *p_camera, con
 		Vector3 inters;
 		// Special case for primary handle, the handle id equals control point id.
 		const int idx = p_id;
-		if (!Path3DEditorPlugin::singleton->_edit.waiting_handle_physics || !Path3DEditorPlugin::singleton->_edit.in_physics_frame) {
-			Path3DEditorPlugin::singleton->_edit.waiting_handle_physics = true;
-			Path3DEditorPlugin::singleton->_edit.gizmo_handle = p_id;
-			Path3DEditorPlugin::singleton->_edit.gizmo_handle_secondary = p_secondary;
-			Path3DEditorPlugin::singleton->_edit.gizmo_camera = p_camera;
-			Path3DEditorPlugin::singleton->_edit.mouse_pos = p_point;
-			return;
-			// Only continue if inside physics frame and waiting for physics.
-		}
-		if (Path3DEditorPlugin::singleton->snap_to_collider) {
-			PhysicsDirectSpaceState3D *ss = p_camera->get_world_3d()->get_direct_space_state();
-
-			PhysicsDirectSpaceState3D::RayParameters ray_params;
-			ray_params.from = ray_from;
-			ray_params.to = ray_from + ray_dir * p_camera->get_far();
-			PhysicsDirectSpaceState3D::RayResult result;
-			if (ss->intersect_ray(ray_params, result)) {
-				Vector3 local = gi.xform(result.position);
-				c->set_point_position(idx, local);
-				return;
-			}
-			// Will continue and do the plane intersect_ray if doesn't hit anything.
-		}
 		if (p.intersects_ray(ray_from, ray_dir, &inters)) {
 			if (Node3DEditor::get_singleton()->is_snap_enabled()) {
 				float snap = Node3DEditor::get_singleton()->get_translate_snap();
@@ -249,10 +222,6 @@ void Path3DGizmo::commit_handle(int p_id, bool p_secondary, const Variant &p_res
 		return;
 	}
 
-	if (!Path3DEditorPlugin::singleton) {
-		return;
-	}
-
 	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 
 	// Primary handles: position.
@@ -605,13 +574,6 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
 	Ref<InputEventMouseButton> mb = p_event;
 
 	if (mb.is_valid()) {
-		if (mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
-			View3DController::NavigationScheme nav_scheme = (View3DController::NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
-			if ((nav_scheme == View3DController::NAV_SCHEME_MAYA || nav_scheme == View3DController::NAV_SCHEME_MODO) && mb->is_alt_pressed()) {
-				return EditorPlugin::AFTER_GUI_INPUT_PASS;
-			}
-		}
-
 		Point2 mbpos(mb->get_position().x, mb->get_position().y);
 
 		Node3DEditorViewport *viewport = nullptr;
@@ -707,21 +669,10 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
 				} else {
 					origin = gt.xform(c->get_point_position(c->get_point_count() - 1));
 				}
-
+				Plane p(p_camera->get_transform().basis.get_column(2), origin);
 				Vector3 ray_from = viewport->get_ray_pos(mbpos);
 				Vector3 ray_dir = viewport->get_ray(mbpos);
 
-				if (snap_to_collider) {
-					_edit.click_ray_pos = ray_from;
-					_edit.click_ray_dir = ray_dir * p_camera->get_far();
-					_edit.gizmo_camera = p_camera;
-					_edit.origin = origin;
-					_edit.waiting_point_physics = true;
-					return EditorPlugin::AFTER_GUI_INPUT_STOP;
-				}
-
-				Plane p(p_camera->get_transform().basis.get_column(2), origin);
-
 				Vector3 inters;
 				if (p.intersects_ray(ray_from, ray_dir, &inters)) {
 					ur->create_action(TTR("Add Point to Curve"));
@@ -780,23 +731,8 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
 	return EditorPlugin::AFTER_GUI_INPUT_PASS;
 }
 
-void Path3DEditorPlugin::update_handles() {
-	if (_edit.gizmo.is_valid()) {
-		callable_mp(_edit.gizmo.ptr(), &Path3DGizmo::redraw).call_deferred();
-	}
-}
-
 void Path3DEditorPlugin::edit(Object *p_object) {
-	if (path) {
-		path->disconnect("curve_changed", callable_mp(this, &Path3DEditorPlugin::_update_toolbar));
-	}
-
 	path = Object::cast_to<Path3D>(p_object);
-
-	if (path) {
-		path->connect("curve_changed", callable_mp(this, &Path3DEditorPlugin::_update_toolbar));
-	}
-
 	_update_toolbar();
 	update_overlays();
 }
@@ -812,7 +748,6 @@ void Path3DEditorPlugin::make_visible(bool p_visible) {
 		topmenu_bar->hide();
 		path = nullptr;
 	}
-	set_physics_process(p_visible);
 }
 
 void Path3DEditorPlugin::_mode_changed(int p_mode) {
@@ -856,11 +791,6 @@ void Path3DEditorPlugin::_handle_option_pressed(int p_option) {
 			mirror_handle_length = !is_checked;
 			pm->set_item_checked(HANDLE_OPTION_LENGTH, mirror_handle_length);
 		} break;
-		case HANDLE_OPTION_SNAP_COLLIDER: {
-			bool is_checked = pm->is_item_checked(HANDLE_OPTION_SNAP_COLLIDER);
-			snap_to_collider = !is_checked;
-			pm->set_item_checked(HANDLE_OPTION_SNAP_COLLIDER, snap_to_collider);
-		} break;
 	}
 }
 
@@ -954,55 +884,6 @@ void Path3DEditorPlugin::_notification(int p_what) {
 
 			path->update_gizmos();
 		} break;
-		case NOTIFICATION_PHYSICS_PROCESS: {
-			if (_edit.waiting_point_physics) {
-				_edit.waiting_point_physics = false;
-				const Transform3D gt = path->get_global_transform();
-				const Transform3D it = gt.affine_inverse();
-				Ref<Curve3D> c = path->get_curve();
-				EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-				PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
-				if (ss) {
-					PhysicsDirectSpaceState3D::RayParameters ray_params;
-					PhysicsDirectSpaceState3D::RayResult result;
-					ray_params.from = _edit.click_ray_pos;
-					ray_params.to = ray_params.from + _edit.click_ray_dir;
-					bool hit_something = false;
-					Vector3 inters;
-					if (ss->intersect_ray(ray_params, result)) {
-						inters = result.position;
-						hit_something = true;
-					} else {
-						Plane p(_edit.gizmo_camera->get_transform().basis.get_column(2), _edit.origin);
-						if (p.intersects_ray(ray_params.from, _edit.click_ray_dir, &inters)) {
-							hit_something = true;
-						}
-					}
-					if (hit_something) {
-						ur->create_action(TTR("Add Point to Curve"));
-						ur->add_do_method(c.ptr(), "add_point", it.xform(inters), Vector3(), Vector3(), -1);
-						ur->add_undo_method(c.ptr(), "remove_point", c->get_point_count());
-						ur->commit_action();
-					}
-				}
-			}
-			if (_edit.waiting_handle_physics) {
-				_edit.in_physics_frame = true;
-
-				// Find gizmo reference.
-				Vector<Ref<Node3DGizmo>> gizmos = path->get_gizmos();
-				for (Ref<EditorNode3DGizmo> seg : gizmos) {
-					if (seg.is_valid()) {
-						_edit.gizmo = seg;
-						break;
-					}
-				}
-
-				_edit.gizmo->set_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_camera, _edit.mouse_pos);
-				_edit.in_physics_frame = false;
-				_edit.waiting_handle_physics = false;
-			}
-		}
 	}
 }
 
@@ -1108,8 +989,6 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	menu->set_item_checked(HANDLE_OPTION_ANGLE, mirror_handle_angle);
 	menu->add_check_item(TTR("Mirror Handle Lengths"));
 	menu->set_item_checked(HANDLE_OPTION_LENGTH, mirror_handle_length);
-	menu->add_check_item(TTR("Snap to Colliders"));
-	menu->set_item_checked(HANDLE_OPTION_SNAP_COLLIDER, snap_to_collider);
 	menu->connect(SceneStringName(id_pressed), callable_mp(this, &Path3DEditorPlugin::_handle_option_pressed));
 
 	curve_edit->set_pressed_no_signal(true);
@@ -1147,41 +1026,54 @@ void Path3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	Ref<StandardMaterial3D> first_pt_handle_material = get_material("first_pt_handle", p_gizmo);
 	Ref<StandardMaterial3D> last_pt_handle_material = get_material("last_pt_handle", p_gizmo);
 	Ref<StandardMaterial3D> closed_pt_handle_material = get_material("closed_pt_handle", p_gizmo);
-	Ref<StandardMaterial3D> selected_pt_handle_material = get_material("selected_pt_handle", p_gizmo);
 
 	first_pt_handle_material->set_albedo(Color(0.2, 1.0, 0.0));
 	last_pt_handle_material->set_albedo(Color(1.0, 0.2, 0.0));
 	closed_pt_handle_material->set_albedo(Color(1.0, 0.8, 0.0));
-	selected_pt_handle_material->set_albedo(Color(0.2, 0.5, 1.0));
 
-	PackedInt32Array selected_points = p_gizmo->get_subgizmo_selection();
-	PackedVector3Array first_pt;
-	PackedVector3Array last_pt;
-	PackedVector3Array common_pt;
-	PackedVector3Array selected_pt;
-	int last = curve->get_point_count() - 1;
-	for (int i = 0; i <= last; i++) {
-		if (selected_points.has(i)) {
-			selected_pt.push_back(curve->get_point_position(i));
-		} else if (i == 0) {
-			first_pt.push_back(curve->get_point_position(i));
-		} else if (i == last) {
-			last_pt.push_back(curve->get_point_position(i));
-		} else {
-			common_pt.push_back(curve->get_point_position(i));
+	PackedVector3Array handles;
+
+	if (Path3DEditorPlugin::singleton->curve_edit->is_pressed()) {
+		for (int idx = 0; idx < curve->get_point_count(); ++idx) {
+			// Collect handles.
+			const Vector3 pos = curve->get_point_position(idx);
+
+			handles.append(pos);
 		}
 	}
-	if (first_pt.size()) {
-		p_gizmo->add_vertices(first_pt, curve->is_closed() ? closed_pt_handle_material : first_pt_handle_material, Mesh::PRIMITIVE_POINTS);
-	}
-	if (last_pt.size()) {
-		p_gizmo->add_vertices(last_pt, curve->is_closed() ? handle_material : last_pt_handle_material, Mesh::PRIMITIVE_POINTS);
-	}
-	if (common_pt.size()) {
-		p_gizmo->add_vertices(common_pt, handle_material, Mesh::PRIMITIVE_POINTS);
-	}
-	if (selected_pt.size()) {
-		p_gizmo->add_vertices(selected_pt, selected_pt_handle_material, Mesh::PRIMITIVE_POINTS);
+
+	if (handles.size()) {
+		// Point count.
+		const int pc = handles.size();
+
+		// Initialize arrays for first point.
+		PackedVector3Array first_pt;
+		first_pt.append(handles[0]);
+
+		// Initialize arrays and add handle for last point if needed.
+		if (pc > 1) {
+			PackedVector3Array last_pt;
+			last_pt.append(handles[handles.size() - 1]);
+			handles.remove_at(handles.size() - 1);
+			if (curve->is_closed()) {
+				p_gizmo->add_vertices(last_pt, handle_material, Mesh::PRIMITIVE_POINTS);
+			} else {
+				p_gizmo->add_vertices(last_pt, last_pt_handle_material, Mesh::PRIMITIVE_POINTS);
+			}
+		}
+
+		// Add handle for first point.
+		handles.remove_at(0);
+		if (curve->is_closed()) {
+			p_gizmo->add_vertices(first_pt, closed_pt_handle_material, Mesh::PRIMITIVE_POINTS);
+		} else {
+			p_gizmo->add_vertices(first_pt, first_pt_handle_material, Mesh::PRIMITIVE_POINTS);
+		}
+
+		// Add handles for remaining intermediate points.
+		if (!handles.is_empty()) {
+			p_gizmo->add_vertices(handles, handle_material, Mesh::PRIMITIVE_POINTS);
+		}
 	}
 }
 
@@ -1191,22 +1083,15 @@ int Path3DGizmoPlugin::subgizmos_intersect_ray(const EditorNode3DGizmo *p_gizmo,
 	Ref<Curve3D> curve = path->get_curve();
 	ERR_FAIL_COND_V(curve.is_null(), -1);
 
-	int ret = -1;
 	if (Path3DEditorPlugin::singleton->curve_edit->is_pressed()) {
 		for (int idx = 0; idx < curve->get_point_count(); ++idx) {
 			Vector3 pos = path->get_global_transform().xform(curve->get_point_position(idx));
 			if (p_camera->unproject_position(pos).distance_to(p_point) < 20) {
-				ret = idx;
-				break;
+				return idx;
 			}
 		}
 	}
-
-	if (Path3DEditorPlugin::singleton) {
-		Path3DEditorPlugin::singleton->update_handles();
-	}
-
-	return ret;
+	return -1;
 }
 
 Vector<int> Path3DGizmoPlugin::subgizmos_intersect_frustum(const EditorNode3DGizmo *p_gizmo, const Camera3D *p_camera, const Vector<Plane> &p_frustum) const {
@@ -1234,10 +1119,6 @@ Vector<int> Path3DGizmoPlugin::subgizmos_intersect_frustum(const EditorNode3DGiz
 		}
 	}
 
-	if (Path3DEditorPlugin::singleton) {
-		Path3DEditorPlugin::singleton->update_handles();
-	}
-
 	return contained_points;
 }
 
@@ -1311,6 +1192,5 @@ Path3DGizmoPlugin::Path3DGizmoPlugin() {
 	create_handle_material("first_pt_handle", false, EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("EditorPathSmoothHandle"), EditorStringName(EditorIcons)));
 	create_handle_material("last_pt_handle", false, EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("EditorPathSmoothHandle"), EditorStringName(EditorIcons)));
 	create_handle_material("closed_pt_handle", false, EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("EditorPathSmoothHandle"), EditorStringName(EditorIcons)));
-	create_handle_material("selected_pt_handle", false, EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("EditorPathSmoothHandle"), EditorStringName(EditorIcons)));
 	create_handle_material("sec_handles", false, EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("EditorCurveHandle"), EditorStringName(EditorIcons)));
 }
diff --git a/engine/editor/scene/3d/path_3d_editor_plugin.h b/engine/editor/scene/3d/path_3d_editor_plugin.h
index b9357357..7a6bff07 100644
--- a/engine/editor/scene/3d/path_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/path_3d_editor_plugin.h
@@ -148,7 +148,6 @@ class Path3DEditorPlugin : public EditorPlugin {
 	bool handle_clicked = false;
 	bool mirror_handle_angle = true;
 	bool mirror_handle_length = true;
-	bool snap_to_collider = true;
 
 	void _create_curve();
 	void _confirm_clear_points();
@@ -158,8 +157,7 @@ class Path3DEditorPlugin : public EditorPlugin {
 
 	enum HandleOption {
 		HANDLE_OPTION_ANGLE,
-		HANDLE_OPTION_LENGTH,
-		HANDLE_OPTION_SNAP_COLLIDER,
+		HANDLE_OPTION_LENGTH
 	};
 
 protected:
@@ -169,12 +167,11 @@ protected:
 public:
 	Path3D *get_edited_path() { return path; }
 
-	void update_handles();
-
 	inline static Path3DEditorPlugin *singleton = nullptr;
 	virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
 
 	virtual String get_plugin_name() const override { return "Path3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
@@ -185,20 +182,4 @@ public:
 	void set_handle_clicked(bool clicked) { handle_clicked = clicked; }
 
 	Path3DEditorPlugin();
-
-private:
-	struct EditData {
-		Vector3 click_ray_dir;
-		Vector3 click_ray_pos;
-		Vector3 origin;
-		Point2 mouse_pos;
-		bool show_rotation_line = false;
-		Ref<Path3DGizmo> gizmo;
-		int gizmo_handle = 0;
-		bool gizmo_handle_secondary = false;
-		Camera3D *gizmo_camera;
-		bool waiting_point_physics = false;
-		bool waiting_handle_physics = false;
-		bool in_physics_frame = false;
-	} _edit;
 };
diff --git a/engine/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp b/engine/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp
index 89a890aa..84348f72 100644
--- a/engine/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/physics/physical_bone_3d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "physical_bone_3d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
diff --git a/engine/editor/scene/3d/polygon_3d_editor_plugin.cpp b/engine/editor/scene/3d/polygon_3d_editor_plugin.cpp
index 5e719c53..6ef45384 100644
--- a/engine/editor/scene/3d/polygon_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/polygon_3d_editor_plugin.cpp
@@ -32,8 +32,6 @@
 
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -42,11 +40,6 @@
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/immediate_mesh.h"
-#include "scene/resources/material.h"
-#include "scene/resources/mesh.h"
 
 void Polygon3DEditor::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/editor/scene/3d/polygon_3d_editor_plugin.h b/engine/editor/scene/3d/polygon_3d_editor_plugin.h
index 86e1b93f..f95e591f 100644
--- a/engine/editor/scene/3d/polygon_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/polygon_3d_editor_plugin.h
@@ -31,14 +31,13 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/physics/collision_polygon_3d.h"
 #include "scene/gui/box_container.h"
+#include "scene/resources/immediate_mesh.h"
 
-class ArrayMesh;
 class CanvasItemEditor;
-class ImmediateMesh;
 class MenuButton;
-class MeshInstance3D;
-class StandardMaterial3D;
 
 class Polygon3DEditor : public HBoxContainer {
 	GDCLASS(Polygon3DEditor, HBoxContainer);
@@ -103,6 +102,7 @@ public:
 	virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return polygon_editor->forward_3d_gui_input(p_camera, p_event); }
 
 	virtual String get_plugin_name() const override { return "Polygon3DEditor"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/root_motion_editor_plugin.cpp b/engine/editor/scene/3d/root_motion_editor_plugin.cpp
index 49eda8ab..c6f1f45a 100644
--- a/engine/editor/scene/3d/root_motion_editor_plugin.cpp
+++ b/engine/editor/scene/3d/root_motion_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "root_motion_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/skeleton_3d.h"
@@ -67,7 +66,10 @@ void EditorPropertyRootMotion::_node_assign() {
 
 	HashSet<String> paths;
 	{
-		for (const StringName &E : mixer->get_sorted_animation_list()) {
+		List<StringName> animations;
+		mixer->get_animation_list(&animations);
+
+		for (const StringName &E : animations) {
 			Ref<Animation> anim = mixer->get_animation(E);
 			for (int i = 0; i < anim->get_track_count(); i++) {
 				String pathname = anim->track_get_path(i).get_concatenated_names();
diff --git a/engine/editor/scene/3d/skeleton_3d_editor_plugin.cpp b/engine/editor/scene/3d/skeleton_3d_editor_plugin.cpp
index 342b0bee..330cf2a8 100644
--- a/engine/editor/scene/3d/skeleton_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/skeleton_3d_editor_plugin.cpp
@@ -30,10 +30,7 @@
 
 #include "skeleton_3d_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -49,14 +46,13 @@
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/skeleton_profile.h"
 #include "scene/resources/surface_tool.h"
 
 void BonePropertiesEditor::create_editors() {
 	section = memnew(EditorInspectorSection);
-	section->setup("", "trf_properties", label, this, Color(0.0f, 0.0f, 0.0f), true);
+	section->setup("trf_properties", label, this, Color(0.0f, 0.0f, 0.0f), true);
 	section->unfold();
 	add_child(section);
 
@@ -111,7 +107,7 @@ void BonePropertiesEditor::create_editors() {
 
 	// Transform/Matrix section.
 	rest_section = memnew(EditorInspectorSection);
-	rest_section->setup("", "trf_properties_transform", "Rest", this, Color(0.0f, 0.0f, 0.0f), true);
+	rest_section->setup("trf_properties_transform", "Rest", this, Color(0.0f, 0.0f, 0.0f), true);
 	section->get_vbox()->add_child(rest_section);
 
 	// Transform/Matrix property.
@@ -123,7 +119,7 @@ void BonePropertiesEditor::create_editors() {
 
 	// Bone Metadata property
 	meta_section = memnew(EditorInspectorSection);
-	meta_section->setup("", "bone_meta", TTR("Bone Metadata"), this, Color(.0f, .0f, .0f), true);
+	meta_section->setup("bone_meta", TTR("Bone Metadata"), this, Color(.0f, .0f, .0f), true);
 	section->get_vbox()->add_child(meta_section);
 
 	EditorInspectorActionButton *add_metadata_button = memnew(EditorInspectorActionButton(TTRC("Add Bone Metadata"), SNAME("Add")));
@@ -623,8 +619,7 @@ PhysicalBone3D *Skeleton3DEditor::create_physical_bone(int bone_id, int bone_chi
 	const real_t half_height(child_rest.origin.length() * 0.5);
 	const real_t radius(half_height * 0.2);
 
-	Ref<CapsuleShape3D> bone_shape_capsule;
-	bone_shape_capsule.instantiate();
+	CapsuleShape3D *bone_shape_capsule = memnew(CapsuleShape3D);
 	bone_shape_capsule->set_height(half_height * 2);
 	bone_shape_capsule->set_radius(radius);
 
@@ -752,18 +747,13 @@ Variant Skeleton3DEditor::get_drag_data_fw(const Point2 &p_point, Control *p_fro
 
 	set_drag_preview(vb);
 	Dictionary drag_data;
-	drag_data["type"] = "skeleton_bone";
-	drag_data["source"] = selected->get_instance_id();
+	drag_data["type"] = "nodes";
+	drag_data["node"] = selected;
 
 	return drag_data;
 }
 
 bool Skeleton3DEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
-	Dictionary drag_data = p_data;
-	if (!drag_data.has("type") || drag_data["type"] != "skeleton_bone" || !drag_data.has("source")) {
-		return false;
-	}
-
 	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? joint_tree->get_selected() : joint_tree->get_item_at_position(p_point);
 	if (!target) {
 		return false;
@@ -774,13 +764,13 @@ bool Skeleton3DEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_
 		return false;
 	}
 
-	TreeItem *selected = ObjectDB::get_instance<TreeItem>(drag_data["source"]);
-	if (!selected || selected->get_tree() != joint_tree || target == selected) {
+	TreeItem *selected = Object::cast_to<TreeItem>(Dictionary(p_data)["node"]);
+	if (target == selected) {
 		return false;
 	}
 
-	const String selected_path = selected->get_metadata(0);
-	if (!selected_path.begins_with("bones/")) {
+	const String path2 = target->get_metadata(0);
+	if (!path2.begins_with("bones/")) {
 		return false;
 	}
 
@@ -792,22 +782,11 @@ void Skeleton3DEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 		return;
 	}
 
-	Dictionary drag_data = p_data;
-
 	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? joint_tree->get_selected() : joint_tree->get_item_at_position(p_point);
-	TreeItem *selected = ObjectDB::get_instance<TreeItem>(drag_data["source"]);
-	if (!target || !selected || selected->get_tree() != joint_tree || !skeleton) {
-		return;
-	}
+	TreeItem *selected = Object::cast_to<TreeItem>(Dictionary(p_data)["node"]);
 
-	const String target_path = target->get_metadata(0);
-	const String selected_path = selected->get_metadata(0);
-	if (!target_path.begins_with("bones/") || !selected_path.begins_with("bones/")) {
-		return;
-	}
-
-	const BoneId target_boneidx = target_path.get_slicec('/', 1).to_int();
-	const BoneId selected_boneidx = selected_path.get_slicec('/', 1).to_int();
+	const BoneId target_boneidx = String(target->get_metadata(0)).get_slicec('/', 1).to_int();
+	const BoneId selected_boneidx = String(selected->get_metadata(0)).get_slicec('/', 1).to_int();
 
 	move_skeleton_bone(skeleton->get_path(), selected_boneidx, target_boneidx);
 }
@@ -1182,7 +1161,7 @@ void Skeleton3DEditor::create_editors() {
 
 	// Bone tree.
 	bones_section = memnew(EditorInspectorSection);
-	bones_section->setup("", "bones", "Bones", skeleton, Color(0.0f, 0.0, 0.0f), true);
+	bones_section->setup("bones", "Bones", skeleton, Color(0.0f, 0.0, 0.0f), true);
 	add_child(bones_section);
 	bones_section->unfold();
 
@@ -1194,6 +1173,7 @@ void Skeleton3DEditor::create_editors() {
 	joint_tree = memnew(Tree);
 	joint_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	joint_tree->set_columns(1);
+	joint_tree->set_focus_mode(Control::FOCUS_NONE);
 	joint_tree->set_select_mode(Tree::SELECT_SINGLE);
 	joint_tree->set_hide_root(true);
 	joint_tree->set_v_size_flags(SIZE_EXPAND_FILL);
diff --git a/engine/editor/scene/3d/skeleton_3d_editor_plugin.h b/engine/editor/scene/3d/skeleton_3d_editor_plugin.h
index 4a27c120..ac5fc19c 100644
--- a/engine/editor/scene/3d/skeleton_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/skeleton_3d_editor_plugin.h
@@ -268,11 +268,12 @@ public:
 class Skeleton3DEditorPlugin : public EditorPlugin {
 	GDCLASS(Skeleton3DEditorPlugin, EditorPlugin);
 
-	Ref<EditorInspectorPluginSkeleton> skeleton_plugin;
+	EditorInspectorPluginSkeleton *skeleton_plugin = nullptr;
 
 public:
 	virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
 
+	bool has_main_screen() const override { return false; }
 	virtual bool handles(Object *p_object) const override;
 
 	virtual String get_plugin_name() const override { return "Skeleton3D"; }
diff --git a/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp b/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
index 8811b5ca..f09ab022 100644
--- a/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
+++ b/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "skeleton_ik_3d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "scene/3d/skeleton_ik_3d.h"
diff --git a/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.h b/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.h
index b02aed70..75a278a0 100644
--- a/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.h
+++ b/engine/editor/scene/3d/skeleton_ik_3d_editor_plugin.h
@@ -46,6 +46,7 @@ class SkeletonIK3DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "SkeletonIK3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/3d/voxel_gi_editor_plugin.cpp b/engine/editor/scene/3d/voxel_gi_editor_plugin.cpp
index 7ef0187a..c4ff434f 100644
--- a/engine/editor/scene/3d/voxel_gi_editor_plugin.cpp
+++ b/engine/editor/scene/3d/voxel_gi_editor_plugin.cpp
@@ -30,14 +30,10 @@
 
 #include "voxel_gi_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "scene/main/scene_tree.h"
 
 void VoxelGIEditorPlugin::_bake() {
 	if (voxel_gi) {
diff --git a/engine/editor/scene/3d/voxel_gi_editor_plugin.h b/engine/editor/scene/3d/voxel_gi_editor_plugin.h
index 14bbe487..5ec92963 100644
--- a/engine/editor/scene/3d/voxel_gi_editor_plugin.h
+++ b/engine/editor/scene/3d/voxel_gi_editor_plugin.h
@@ -60,6 +60,7 @@ protected:
 
 public:
 	virtual String get_plugin_name() const override { return "VoxelGI"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/canvas_item_editor_plugin.cpp b/engine/editor/scene/canvas_item_editor_plugin.cpp
index c6e13fc8..cdb1f02b 100644
--- a/engine/editor/scene/canvas_item_editor_plugin.cpp
+++ b/engine/editor/scene/canvas_item_editor_plugin.cpp
@@ -30,12 +30,8 @@
 
 #include "canvas_item_editor_plugin.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
@@ -64,19 +60,15 @@
 #include "scene/gui/base_button.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/subviewport_container.h"
-#include "scene/gui/texture_button.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/style_box_texture.h"
-#include "servers/rendering/rendering_server.h"
 
 #define DRAG_THRESHOLD (8 * EDSCALE)
 constexpr real_t SCALE_HANDLE_DISTANCE = 25;
@@ -368,7 +360,7 @@ void CanvasItemEditor::_snap_other_nodes(
 		}
 	}
 	for (int i = 0; i < p_current->get_child_count(); i++) {
-		_snap_other_nodes(p_value, p_transform_to_snap, r_current_snap, r_current_snap_target, p_snap_target, List<const CanvasItem *>(p_exceptions), p_current->get_child(i));
+		_snap_other_nodes(p_value, p_transform_to_snap, r_current_snap, r_current_snap_target, p_snap_target, p_exceptions, p_current->get_child(i));
 	}
 }
 
@@ -455,7 +447,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig
 				p_target, to_snap_transform,
 				output, snap_target,
 				SNAP_TARGET_OTHER_NODE,
-				List<const CanvasItem *>(exceptions),
+				exceptions,
 				get_tree()->get_edited_scene_root());
 	}
 
@@ -523,11 +515,11 @@ void CanvasItemEditor::shortcut_input(const Ref<InputEvent> &p_ev) {
 	}
 
 	if (k.is_valid()) {
-		if (!k->is_echo() && (k->get_keycode() == Key::CTRL || k->get_keycode() == Key::ALT || k->get_keycode() == Key::SHIFT)) {
+		if (k->get_keycode() == Key::CTRL || k->get_keycode() == Key::ALT || k->get_keycode() == Key::SHIFT) {
 			viewport->queue_redraw();
 		}
 
-		if (k->is_pressed() && !k->is_command_or_control_pressed() && !k->is_echo() && (grid_snap_active || is_grid_visible())) {
+		if (k->is_pressed() && !k->is_command_or_control_pressed() && !k->is_echo() && (grid_snap_active || _is_grid_visible())) {
 			if (multiply_grid_step_shortcut.is_valid() && multiply_grid_step_shortcut->matches_event(p_ev)) {
 				// Multiply the grid size
 				grid_step_multiplier = MIN(grid_step_multiplier + 1, 12);
@@ -640,7 +632,7 @@ Rect2 CanvasItemEditor::_get_encompassing_rect(const Node *p_node) {
 	return rect;
 }
 
-void CanvasItemEditor::find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
+void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<_SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
 	if (!p_node) {
 		return;
 	}
@@ -663,12 +655,12 @@ void CanvasItemEditor::find_canvas_items_at_pos(const Point2 &p_pos, Node *p_nod
 	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
 		if (ci) {
 			if (!ci->is_set_as_top_level()) {
-				find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), xform);
+				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), xform);
 			} else {
-				find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, ci->get_transform(), xform);
+				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, ci->get_transform(), xform);
 			}
 		} else {
-			find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, Transform2D(), xform);
+			_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, Transform2D(), xform);
 		}
 	}
 
@@ -681,7 +673,7 @@ void CanvasItemEditor::find_canvas_items_at_pos(const Point2 &p_pos, Node *p_nod
 		if (ci->_edit_is_selected_on_click(xform.xform(p_pos), local_grab_distance)) {
 			Node2D *node = Object::cast_to<Node2D>(ci);
 
-			SelectResult res;
+			_SelectResult res;
 			res.item = ci;
 			res.z_index = node ? node->get_z_index() : 0;
 			res.has_z = node;
@@ -690,10 +682,10 @@ void CanvasItemEditor::find_canvas_items_at_pos(const Point2 &p_pos, Node *p_nod
 	}
 }
 
-void CanvasItemEditor::_get_canvas_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items, bool p_allow_locked) {
+void CanvasItemEditor::_get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, bool p_allow_locked) {
 	Node *scene = EditorNode::get_singleton()->get_edited_scene();
 
-	find_canvas_items_at_pos(p_pos, scene, r_items);
+	_find_canvas_items_at_pos(p_pos, scene, r_items);
 
 	//Remove invalid results
 	for (int i = 0; i < r_items.size(); i++) {
@@ -975,7 +967,6 @@ void CanvasItemEditor::_snap_changed() {
 
 	grid_step_multiplier = 0;
 	viewport->queue_redraw();
-	emit_signal("snap_changed");
 }
 
 void CanvasItemEditor::_selection_result_pressed(int p_result) {
@@ -1036,7 +1027,7 @@ void CanvasItemEditor::_add_node_pressed(int p_result) {
 				nodes.resize(selection_results.size());
 
 				int i = 0;
-				for (const SelectResult &result : selection_results) {
+				for (const _SelectResult &result : selection_results) {
 					nodes[i] = result.item;
 					i++;
 				}
@@ -1064,7 +1055,7 @@ void CanvasItemEditor::_reset_create_position() {
 	node_create_position = Point2();
 }
 
-bool CanvasItemEditor::is_grid_visible() const {
+bool CanvasItemEditor::_is_grid_visible() const {
 	switch (grid_visibility) {
 		case GRID_VISIBILITY_SHOW:
 			return true;
@@ -1090,7 +1081,6 @@ void CanvasItemEditor::_on_grid_menu_id_pressed(int p_id) {
 			grid_visibility = (GridVisibility)p_id;
 			viewport->queue_redraw();
 			view_menu->get_popup()->hide();
-			emit_signal("grid_visibility_changed", is_grid_visible());
 			return;
 	}
 
@@ -1117,7 +1107,6 @@ void CanvasItemEditor::_on_grid_menu_id_pressed(int p_id) {
 		}
 	}
 	viewport->queue_redraw();
-	emit_signal("grid_visibility_changed", is_grid_visible());
 }
 
 void CanvasItemEditor::_reset_transform(TransformType p_type) {
@@ -2476,9 +2465,9 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		if (b.is_valid() && b->is_pressed() && b->get_button_index() == MouseButton::RIGHT && tool != TOOL_SCENE_PAINT) {
+		if (b.is_valid() && b->is_pressed() && b->get_button_index() == MouseButton::RIGHT) {
 			add_node_menu->clear();
-			add_node_menu->add_icon_item(get_editor_theme_icon(SNAME("Add")), TTRC("Add 2D Node Here..."), ADD_NODE);
+			add_node_menu->add_icon_item(get_editor_theme_icon(SNAME("Add")), TTRC("Add Node Here..."), ADD_NODE);
 			add_node_menu->add_icon_item(get_editor_theme_icon(SNAME("Instance")), TTRC("Instantiate Scene Here..."), ADD_INSTANCE);
 			for (Node *node : SceneTreeDock::get_singleton()->get_node_clipboard()) {
 				if (Object::cast_to<CanvasItem>(node)) {
@@ -2533,7 +2522,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 			// Find the item to select.
 			CanvasItem *ci = nullptr;
 
-			Vector<SelectResult> selection = Vector<SelectResult>();
+			Vector<_SelectResult> selection = Vector<_SelectResult>();
 			// Retrieve the canvas items.
 			_get_canvas_items_at_pos(click, selection);
 			if (!selection.is_empty()) {
@@ -2698,7 +2687,7 @@ bool CanvasItemEditor::_gui_input_hover(const Ref<InputEvent> &p_event) {
 		Point2 click = transform.affine_inverse().xform(m->get_position());
 
 		// Checks if the hovered items changed, redraw the viewport if so
-		Vector<SelectResult> hovering_results_items;
+		Vector<_SelectResult> hovering_results_items;
 		_get_canvas_items_at_pos(click, hovering_results_items);
 		hovering_results_items.sort();
 
@@ -3241,7 +3230,7 @@ void CanvasItemEditor::_draw_rulers() {
 
 	// The rule transform
 	Transform2D ruler_transform;
-	if (grid_snap_active || is_grid_visible()) {
+	if (grid_snap_active || _is_grid_visible()) {
 		List<CanvasItem *> selection = _get_edited_canvas_items();
 		if (snap_relative && selection.size() > 0) {
 			ruler_transform.translate_local(_get_encompassing_rect_from_list(selection).position);
@@ -3323,7 +3312,7 @@ void CanvasItemEditor::_draw_rulers() {
 }
 
 void CanvasItemEditor::_draw_grid() {
-	if (is_grid_visible()) {
+	if (_is_grid_visible()) {
 		// Draw the grid
 		Vector2 real_grid_offset;
 		const List<CanvasItem *> selection = _get_edited_canvas_items();
@@ -3809,8 +3798,14 @@ void CanvasItemEditor::_draw_selection() {
 				xform.xform(rect.position + Vector2(0, rect.size.y))
 			};
 
+			Color c = Color(1, 0.6, 0.4, 0.7);
+
+			if (item_locked) {
+				c = Color(0.7, 0.7, 0.7, 0.7);
+			}
+
 			for (int i = 0; i < 4; i++) {
-				viewport->draw_line(endpoints[i], endpoints[(i + 1) % 4], item_locked ? locked_selection_rectangle_color : selection_rectangle_color, Math::round(2 * EDSCALE));
+				viewport->draw_line(endpoints[i], endpoints[(i + 1) % 4], c, Math::round(2 * EDSCALE));
 			}
 		} else {
 			Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
@@ -4311,7 +4306,6 @@ void CanvasItemEditor::set_current_tool(Tool p_tool) {
 void CanvasItemEditor::_update_editor_settings() {
 	button_center_view->set_button_icon(get_editor_theme_icon(SNAME("CenterView")));
 	select_button->set_button_icon(get_editor_theme_icon(SNAME("ToolSelect")));
-	scene_paint_button->set_button_icon(get_editor_theme_icon(SNAME("Paint")));
 	select_sb->set_texture(get_editor_theme_icon(SNAME("EditorRect2D")));
 	list_select_button->set_button_icon(get_editor_theme_icon(SNAME("ListSelect")));
 	move_button->set_button_icon(get_editor_theme_icon(SNAME("ToolMove")));
@@ -4344,15 +4338,12 @@ void CanvasItemEditor::_update_editor_settings() {
 	key_auto_insert_button->add_theme_color_override("icon_pressed_color", key_auto_color.lerp(Color(1, 0, 0), 0.55));
 	animation_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
 
-	selection_rectangle_color = EDITOR_GET("editors/2d/selection_rectangle_color");
-	locked_selection_rectangle_color = EDITOR_GET("editors/2d/locked_selection_rectangle_color");
-
 	context_toolbar_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("ContextualToolbar"), EditorStringName(EditorStyles)));
 
 	simple_panning = EDITOR_GET("editors/panning/simple_panning");
 	panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/2d_editor_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), simple_panning);
 	panner->set_scroll_speed(EDITOR_GET("editors/panning/2d_editor_pan_speed"));
-	panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+	panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 	panner->set_zoom_style((ViewPanner::ZoomStyle)EDITOR_GET("editors/panning/zoom_style").operator int());
 
 	// Compute the ruler width here so we can reuse the result throughout the various draw functions.
@@ -4373,15 +4364,8 @@ void CanvasItemEditor::_project_settings_changed() {
 void CanvasItemEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_TRANSLATION_CHANGED: {
-			const String show_list_tooltip = TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.");
-			select_button->set_tooltip_text(vformat(TTR("%s+Drag: Rotate selected node around pivot."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+Drag: Move selected node.") + "\n" + vformat(TTR("%s+Alt+Drag: Scale selected node."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("V: Set selected node's pivot position.") + "\n" + show_list_tooltip + "\n" + TTR("RMB: Add node at position clicked."));
-			move_button->set_tooltip_text(show_list_tooltip);
-			rotate_button->set_tooltip_text(show_list_tooltip);
-			scale_button->set_tooltip_text(TTR("Shift: Scale proportionally.") + "\n" + show_list_tooltip);
-			list_select_button->set_tooltip_text(TTR("Show list of selectable nodes at position clicked.") + "\n" + show_list_tooltip);
-			pivot_button->set_tooltip_text(TTR("Click to change object's pivot.") + "\n" + TTR("Shift: Set temporary pivot.") + "\n" + TTR("Click this button while holding Shift to put the temporary pivot in the center of the selected nodes.") + "\n" + show_list_tooltip);
-			pan_button->set_tooltip_text(TTR("You can also use Pan View shortcut (Space by default) to pan in any mode.") + "\n" + show_list_tooltip);
-			ruler_button->set_tooltip_text(TTR("LMB+Drag: Measure the distance between two points in 2D space.") + "\n" + show_list_tooltip);
+			select_button->set_tooltip_text(vformat(TTR("%s+Drag: Rotate selected node around pivot."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("Alt+Drag: Move selected node.") + "\n" + vformat(TTR("%s+Alt+Drag: Scale selected node."), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL)) + "\n" + TTR("V: Set selected node's pivot position.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + TTR("(Available in all modes.)") + "\n" + TTR("RMB: Add node at position clicked."));
+			pivot_button->set_tooltip_text(TTR("Click to change object's pivot.") + "\n" + TTR("Shift: Set temporary pivot.") + "\n" + TTR("Click this button while holding Shift to put the temporary pivot in the center of the selected nodes."));
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -4390,6 +4374,15 @@ void CanvasItemEditor::_notification(int p_what) {
 			ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &CanvasItemEditor::_project_settings_changed));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Canvas item editor")));
+		} break;
+
 		case NOTIFICATION_PROCESS: {
 			// Update the viewport if the canvas_item changes
 			List<CanvasItem *> selection = _get_edited_canvas_items(true);
@@ -4508,32 +4501,6 @@ void CanvasItemEditor::_selection_changed() {
 		temp_pivot = Vector2(Math::INF, Math::INF);
 		viewport->queue_redraw();
 	}
-
-	// Check to redraw to clear anything drawn from visible selections if no selections are visible.
-	bool has_visible = false;
-	for (const KeyValue<ObjectID, Object *> &E : editor_selection->get_selection()) {
-		CanvasItem *ci = ObjectDB::get_instance<CanvasItem>(E.key);
-		if (!ci || !ci->is_visible_in_tree()) {
-			continue;
-		}
-
-		Viewport *vp = ci->get_viewport();
-		if (vp && !vp->is_visible_subviewport()) {
-			continue;
-		}
-
-		CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
-		if (se) {
-			has_visible = true;
-			break;
-		}
-	}
-	if (had_visible_selection != has_visible) {
-		if (!has_visible) {
-			viewport->queue_redraw();
-		}
-		had_visible_selection = has_visible;
-	}
 }
 
 void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
@@ -4680,7 +4647,6 @@ void CanvasItemEditor::_button_toggle_smart_snap(bool p_status) {
 void CanvasItemEditor::_button_toggle_grid_snap(bool p_status) {
 	grid_snap_active = p_status;
 	viewport->queue_redraw();
-	emit_signal("grid_visibility_changed", is_grid_visible());
 }
 
 void CanvasItemEditor::_button_tool_select(int p_index) {
@@ -4688,7 +4654,7 @@ void CanvasItemEditor::_button_tool_select(int p_index) {
 		_commit_drag();
 	}
 
-	Button *tb[TOOL_MAX] = { select_button, scene_paint_button, list_select_button, move_button, scale_button, rotate_button, pivot_button, pan_button, ruler_button };
+	Button *tb[TOOL_MAX] = { select_button, list_select_button, move_button, scale_button, rotate_button, pivot_button, pan_button, ruler_button };
 	for (int i = 0; i < TOOL_MAX; i++) {
 		tb[i]->set_pressed(i == p_index);
 	}
@@ -4709,7 +4675,6 @@ void CanvasItemEditor::_button_tool_select(int p_index) {
 
 	viewport->queue_redraw();
 	_update_cursor();
-	emit_signal("canvas_item_tool_changed", tool);
 }
 
 void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, bool p_scale, bool p_on_existing) {
@@ -5262,11 +5227,8 @@ void CanvasItemEditor::_bind_methods() {
 
 	ClassDB::bind_method("_set_owner_for_node_and_children", &CanvasItemEditor::_set_owner_for_node_and_children);
 
-	ADD_SIGNAL(MethodInfo("snap_changed"));
-	ADD_SIGNAL(MethodInfo("grid_visibility_changed", PropertyInfo(Variant::BOOL, "visible")));
 	ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
 	ADD_SIGNAL(MethodInfo("item_group_status_changed"));
-	ADD_SIGNAL(MethodInfo("canvas_item_tool_changed", PropertyInfo(Variant::INT, "tool")));
 }
 
 Dictionary CanvasItemEditor::get_state() const {
@@ -5748,15 +5710,6 @@ CanvasItemEditor::CanvasItemEditor() {
 	select_button->set_shortcut_context(this);
 	select_button->set_accessibility_name(TTRC("Select Mode"));
 
-	scene_paint_button = memnew(Button);
-	scene_paint_button->set_theme_type_variation(SceneStringName(FlatButton));
-	main_menu_hbox->add_child(scene_paint_button);
-	scene_paint_button->set_toggle_mode(true);
-	scene_paint_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_SCENE_PAINT));
-	scene_paint_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/scene_paint_mode", TTRC("Scene Paint Mode"), Key::B, true));
-	scene_paint_button->set_shortcut_context(this);
-	scene_paint_button->set_accessibility_name(TTRC("Scene Paint Mode"));
-
 	main_menu_hbox->add_child(memnew(VSeparator));
 
 	move_button = memnew(Button);
@@ -5766,7 +5719,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	move_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_MOVE));
 	move_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/move_mode", TTRC("Move Mode"), Key::W, true));
 	move_button->set_shortcut_context(this);
-	move_button->set_accessibility_name(TTRC("Move Mode"));
+	move_button->set_tooltip_text(TTRC("Move Mode"));
 
 	rotate_button = memnew(Button);
 	rotate_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5775,7 +5728,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	rotate_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_ROTATE));
 	rotate_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/rotate_mode", TTRC("Rotate Mode"), Key::E, true));
 	rotate_button->set_shortcut_context(this);
-	rotate_button->set_accessibility_name(TTRC("Rotate Mode"));
+	rotate_button->set_tooltip_text(TTRC("Rotate Mode"));
 
 	scale_button = memnew(Button);
 	scale_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5784,6 +5737,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	scale_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_SCALE));
 	scale_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/scale_mode", TTRC("Scale Mode"), Key::R, true));
 	scale_button->set_shortcut_context(this);
+	scale_button->set_tooltip_text(TTRC("Shift: Scale proportionally."));
 	scale_button->set_accessibility_name(TTRC("Scale Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
@@ -5793,7 +5747,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	main_menu_hbox->add_child(list_select_button);
 	list_select_button->set_toggle_mode(true);
 	list_select_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_LIST_SELECT));
-	list_select_button->set_accessibility_name(TTRC("List Selectable Nodes"));
+	list_select_button->set_tooltip_text(TTRC("Show list of selectable nodes at position clicked."));
 
 	pivot_button = memnew(Button);
 	pivot_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
@@ -5810,6 +5764,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	pan_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_PAN));
 	pan_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/pan_mode", TTRC("Pan Mode"), Key::G));
 	pan_button->set_shortcut_context(this);
+	pan_button->set_tooltip_text(TTRC("You can also use Pan View shortcut (Space by default) to pan in any mode."));
 	pan_button->set_accessibility_name(TTRC("Pan View"));
 
 	ruler_button = memnew(Button);
@@ -5819,7 +5774,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	ruler_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_RULER));
 	ruler_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/ruler_mode", TTRC("Ruler Mode"), Key::M));
 	ruler_button->set_shortcut_context(this);
-	ruler_button->set_accessibility_name(TTRC("Ruler Mode"));
+	ruler_button->set_tooltip_text(TTRC("Ruler Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -5838,6 +5793,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	main_menu_hbox->add_child(smart_snap_button);
 	smart_snap_button->set_toggle_mode(true);
 	smart_snap_button->connect(SceneStringName(toggled), callable_mp(this, &CanvasItemEditor::_button_toggle_smart_snap));
+	smart_snap_button->set_tooltip_text(TTRC("Toggle smart snapping."));
 	smart_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_smart_snap", TTRC("Use Smart Snap"), KeyModifierMask::SHIFT | Key::S));
 	smart_snap_button->set_shortcut_context(this);
 
@@ -5846,6 +5802,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	main_menu_hbox->add_child(grid_snap_button);
 	grid_snap_button->set_toggle_mode(true);
 	grid_snap_button->connect(SceneStringName(toggled), callable_mp(this, &CanvasItemEditor::_button_toggle_grid_snap));
+	grid_snap_button->set_tooltip_text(TTRC("Toggle grid snapping."));
 	grid_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_grid_snap", TTRC("Use Grid Snap"), KeyModifierMask::SHIFT | Key::G));
 	grid_snap_button->set_shortcut_context(this);
 
@@ -5962,7 +5919,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	grid_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/toggle_grid", TTRC("Toggle Grid"), KeyModifierMask::CMD_OR_CTRL | Key::APOSTROPHE));
 	p->add_submenu_node_item(TTRC("Grid"), grid_menu);
 
-	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTRC("Show Helpers"), KeyModifierMask::SHIFT | Key::H), SHOW_HELPERS);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTRC("Show Helpers"), Key::H), SHOW_HELPERS);
 	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTRC("Show Rulers")), SHOW_RULERS);
 	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTRC("Show Guides"), Key::Y), SHOW_GUIDES);
 	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_origin", TTRC("Show Origin")), SHOW_ORIGIN);
@@ -6137,13 +6094,13 @@ void CanvasItemEditorPlugin::make_visible(bool p_visible) {
 		canvas_item_editor->show();
 		canvas_item_editor->set_process(true);
 		RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), false);
-		RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RSE::VIEWPORT_ENVIRONMENT_ENABLED);
+		RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_ENABLED);
 
 	} else {
 		canvas_item_editor->hide();
 		canvas_item_editor->set_process(false);
 		RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), true);
-		RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RSE::VIEWPORT_ENVIRONMENT_DISABLED);
+		RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_DISABLED);
 	}
 }
 
@@ -6186,7 +6143,7 @@ void CanvasItemEditorViewport::_on_select_texture_node_type(Object *selected) {
 	CheckBox *check = Object::cast_to<CheckBox>(selected);
 	String type = check->get_text();
 	texture_node_type_selector->set_title(vformat(TTR("Add %s"), type));
-	tooltip_panel->set_text(vformat(TTR("Adding %s..."), type));
+	label->set_text(vformat(TTR("Adding %s..."), type));
 }
 
 void CanvasItemEditorViewport::_on_change_type_confirmed() {
@@ -6206,7 +6163,6 @@ void CanvasItemEditorViewport::_on_change_type_closed() {
 
 void CanvasItemEditorViewport::_create_preview(const Vector<String> &files) const {
 	bool add_preview = false;
-
 	for (int i = 0; i < files.size(); i++) {
 		Ref<Resource> res = ResourceLoader::load(files[i]);
 		ERR_CONTINUE(res.is_null());
@@ -6250,7 +6206,6 @@ void CanvasItemEditorViewport::_remove_preview() {
 		canvas_item_editor->message = "";
 		canvas_item_editor->update_viewport();
 	}
-	tooltip_panel->hide();
 	if (preview_node->get_parent()) {
 		for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
 			Node *node = preview_node->get_child(i);
@@ -6258,6 +6213,9 @@ void CanvasItemEditorViewport::_remove_preview() {
 			preview_node->remove_child(node);
 		}
 		EditorNode::get_singleton()->get_scene_root()->remove_child(preview_node);
+
+		label->hide();
+		label_desc->hide();
 	}
 }
 
@@ -6515,23 +6473,13 @@ void CanvasItemEditorViewport::_perform_drop_data() {
 	}
 }
 
-void CanvasItemEditorViewport::_show_tooltip(const String &p_title, const String &p_description) const {
-	tooltip_panel->set_text(
-			vformat("[font_size=%s][b][color=%s]%s[/color][/b][/font_size]\n%s",
-					get_theme_default_font_size() + 2,
-					get_theme_color(SNAME("accent_color"), EditorStringName(Editor)).to_html(false),
-					p_title, p_description));
-	tooltip_panel->show();
-}
-
 bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
 	if (p_point == Vector2(Math::INF, Math::INF)) {
-		tooltip_panel->hide();
 		return false;
 	}
 	Dictionary d = p_data;
 	if (!d.has("type") || (String(d["type"]) != "files")) {
-		tooltip_panel->hide();
+		label->hide();
 		return false;
 	}
 
@@ -6551,9 +6499,9 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
 	};
 	int instantiate_type = 0;
 
-	String error_message;
 	for (const String &path : files) {
 		const String &res_type = ResourceLoader::get_resource_type(path);
+		String error_message;
 
 		if (ClassDB::is_parent_class(res_type, "PackedScene")) {
 			Ref<PackedScene> scn = ResourceLoader::load(path);
@@ -6565,7 +6513,6 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
 			}
 			if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
 				error_message = vformat(TTR("Circular dependency found at %s."), path.get_file());
-				break;
 			}
 			memdelete(instantiated_scene);
 			instantiate_type |= SCENE;
@@ -6576,16 +6523,15 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
 		if (ClassDB::is_parent_class(res_type, "AudioStream")) {
 			instantiate_type |= AUDIO;
 		}
-	}
 
-	String title = TTRN("Can't drop the file...", "Can't drop the files...", files.size());
-	if (!error_message.is_empty()) {
-		_show_tooltip(title, error_message);
-		canvas_item_editor->update_viewport();
-		return false;
+		if (!error_message.is_empty()) {
+			// TRANSLATORS: The placeholder is the error message.
+			canvas_item_editor->message = vformat(TTR("Can't instantiate: %s"), error_message);
+			canvas_item_editor->update_viewport();
+			return false;
+		}
 	}
 	if (instantiate_type == 0) {
-		_show_tooltip(title, TTR("This file format is not supported."));
 		return false;
 	}
 
@@ -6611,35 +6557,31 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
 	}
 	canvas_item_editor->update_viewport();
 
-	String desc = "[ul]" +
-			TTRN("[b]Default:[/b] Add as sibling of selected node (except when root is selected).",
-					"[b]Default:[/b] Add as siblings of selected node (except when root is selected).",
-					files.size()) +
-			"\n" +
-			TTRN("[b]Hold Shift:[/b] Add as child of selected node.",
-					"[b]Hold Shift:[/b] Add as children of selected node.",
-					files.size()) +
-			"\n" +
-			TTRN("[b]Hold Alt:[/b] Add as child of root node.",
-					"[b]Hold Alt:[/b] Add as children of root node.",
-					files.size());
-
-	if (files.size() > 1) {
-		title = TTR("Dropping multiple files...");
-	} else if (instantiate_type & SCENE) {
-		title = TTR("Dropping a Scene file...");
-	} else if (instantiate_type & AUDIO) {
-		title = TTR("Dropping an Audio file...");
-	} else if (instantiate_type & TEXTURE) {
+	if (instantiate_type & TEXTURE && instantiate_type & AUDIO) {
 		// TRANSLATORS: The placeholders are the types of nodes being instantiated.
-		title = vformat(TTR("Dropping a Texture file as a %s node..."), default_texture_node_type);
+		label->set_text(vformat(TTR("Adding %s and %s..."), default_texture_node_type, "AudioStreamPlayer2D"));
+	} else {
+		String node_type;
+		if (instantiate_type & TEXTURE) {
+			node_type = default_texture_node_type;
+		} else if (instantiate_type & AUDIO) {
+			node_type = "AudioStreamPlayer2D";
+		}
+		if (!node_type.is_empty()) {
+			// TRANSLATORS: The placeholder is the type of node being instantiated.
+			label->set_text(vformat(TTR("Adding %s..."), node_type));
+		}
 	}
-	if (instantiate_type & TEXTURE) {
-		desc += "\n" + TTR("[b]Hold Alt + Shift:[/b] Add Texture as a different node type.");
-	}
-	desc += "[/ul]";
+	label->set_visible(instantiate_type & ~SCENE);
 
-	_show_tooltip(title, desc);
+	String desc = TTR("Drag and drop to add as sibling of selected node (except when root is selected).") +
+			"\n" + TTR("Hold Shift when dropping to add as child of selected node.") +
+			"\n" + TTR("Hold Alt when dropping to add as child of root node.");
+	if (instantiate_type & TEXTURE) {
+		desc += "\n" + TTR("Hold Alt + Shift when dropping to add as different node type.");
+	}
+	label_desc->set_text(desc);
+	label_desc->show();
 
 	return true;
 }
@@ -6718,9 +6660,8 @@ void CanvasItemEditorViewport::_update_theme() {
 		CheckBox *check = Object::cast_to<CheckBox>(btn);
 		check->set_button_icon(get_editor_theme_icon(check->get_text()));
 	}
-	Control *gui_base = EditorNode::get_singleton()->get_gui_base();
-	const Ref<StyleBox> &information_3d_stylebox = gui_base->get_theme_stylebox(SNAME("Information3dViewport"), EditorStringName(EditorStyles));
-	tooltip_panel->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
+
+	label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
 }
 
 void CanvasItemEditorViewport::_notification(int p_what) {
@@ -6790,21 +6731,20 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_it
 		check->connect("button_down", callable_mp(this, &CanvasItemEditorViewport::_on_select_texture_node_type).bind(check));
 	}
 
-	tooltip_panel = memnew(RichTextLabel);
-	canvas_item_editor->get_controls_container()->add_child(tooltip_panel);
-	tooltip_panel->hide();
-	tooltip_panel->set_h_grow_direction(GROW_DIRECTION_BEGIN);
-	tooltip_panel->set_v_grow_direction(GROW_DIRECTION_BEGIN);
-	tooltip_panel->set_mouse_filter(MOUSE_FILTER_IGNORE);
-	tooltip_panel->set_focus_mode(FOCUS_ACCESSIBILITY);
-	tooltip_panel->set_use_bbcode(true);
-	tooltip_panel->set_fit_content(true);
-	tooltip_panel->set_scroll_active(false);
-	tooltip_panel->set_tab_size(0);
-	tooltip_panel->set_autowrap_mode(TextServer::AUTOWRAP_OFF);
-	tooltip_panel->set_anchors_and_offsets_preset(LayoutPreset::PRESET_TOP_LEFT);
-	tooltip_panel->add_theme_color_override(SceneStringName(font_color), Color(0.8f, 0.8f, 0.8f, 1));
-	tooltip_panel->add_theme_constant_override("paragraph_separation", 5);
+	label = memnew(Label);
+	label->add_theme_color_override("font_shadow_color", Color(0, 0, 0, 1));
+	label->add_theme_constant_override("shadow_outline_size", 1 * EDSCALE);
+	label->hide();
+	canvas_item_editor->get_controls_container()->add_child(label);
+
+	label_desc = memnew(Label);
+	label_desc->set_focus_mode(FOCUS_ACCESSIBILITY);
+	label_desc->add_theme_color_override(SceneStringName(font_color), Color(0.6f, 0.6f, 0.6f, 1));
+	label_desc->add_theme_color_override("font_shadow_color", Color(0.2f, 0.2f, 0.2f, 1));
+	label_desc->add_theme_constant_override("shadow_outline_size", 1 * EDSCALE);
+	label_desc->add_theme_constant_override("line_spacing", 0);
+	label_desc->hide();
+	canvas_item_editor->get_controls_container()->add_child(label_desc);
 
 	RS::get_singleton()->canvas_set_disable_scale(true);
 }
diff --git a/engine/editor/scene/canvas_item_editor_plugin.h b/engine/editor/scene/canvas_item_editor_plugin.h
index 29ea7e5f..2726b47f 100644
--- a/engine/editor/scene/canvas_item_editor_plugin.h
+++ b/engine/editor/scene/canvas_item_editor_plugin.h
@@ -45,7 +45,6 @@ class HScrollBar;
 class HSplitContainer;
 class MenuButton;
 class PanelContainer;
-class RichTextLabel;
 class StyleBoxTexture;
 class Timer;
 class ViewPanner;
@@ -78,7 +77,6 @@ class CanvasItemEditor : public VBoxContainer {
 public:
 	enum Tool {
 		TOOL_SELECT,
-		TOOL_SCENE_PAINT,
 		TOOL_LIST_SELECT,
 		TOOL_MOVE,
 		TOOL_SCALE,
@@ -236,7 +234,6 @@ private:
 	real_t resample_delay = 0.3;
 
 	bool selected_from_canvas = false;
-	bool had_visible_selection = false;
 
 	// Defaults are defined in clear().
 	Point2 grid_offset;
@@ -244,9 +241,6 @@ private:
 	Vector2i primary_grid_step;
 	int grid_step_multiplier = 0;
 
-	Color selection_rectangle_color;
-	Color locked_selection_rectangle_color;
-
 	real_t snap_rotation_step = 0.0;
 	real_t snap_rotation_offset = 0.0;
 	real_t snap_scale_step = 0.0;
@@ -282,21 +276,18 @@ private:
 	real_t grab_distance = 0.0;
 	bool simple_panning = false;
 
-	MenuOption last_option = SNAP_USE;
+	MenuOption last_option;
 
-public:
-	struct SelectResult {
+	struct _SelectResult {
 		CanvasItem *item = nullptr;
 		real_t z_index = 0;
 		bool has_z = true;
-		_FORCE_INLINE_ bool operator<(const SelectResult &p_rr) const {
+		_FORCE_INLINE_ bool operator<(const _SelectResult &p_rr) const {
 			return has_z && p_rr.has_z ? p_rr.z_index < z_index : p_rr.has_z;
 		}
 	};
-
-private:
-	Vector<SelectResult> selection_results;
-	Vector<SelectResult> selection_results_menu;
+	Vector<_SelectResult> selection_results;
+	Vector<_SelectResult> selection_results_menu;
 
 	struct _HoverResult {
 		Point2 position;
@@ -339,7 +330,6 @@ private:
 	Button *select_button = nullptr;
 
 	Button *move_button = nullptr;
-	Button *scene_paint_button = nullptr;
 	Button *scale_button = nullptr;
 	Button *rotate_button = nullptr;
 
@@ -415,9 +405,10 @@ private:
 
 	bool _is_node_locked(const Node *p_node) const;
 	bool _is_node_movable(const Node *p_node, bool p_popup_warning = false);
-	void _get_canvas_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items, bool p_allow_locked = false);
-	void _find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_node, List<CanvasItem *> *r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
+	void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<_SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
+	void _get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, bool p_allow_locked = false);
 
+	void _find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_node, List<CanvasItem *> *r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
 	bool _select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append);
 
 	ConfirmationDialog *snap_dialog = nullptr;
@@ -443,6 +434,7 @@ private:
 	void _adjust_new_node_position(Node *p_node);
 	void _reset_create_position();
 	void _update_editor_settings();
+	bool _is_grid_visible() const;
 	void _prepare_grid_menu();
 	void _on_grid_menu_id_pressed(int p_id);
 	void _reset_transform(TransformType p_type);
@@ -608,16 +600,11 @@ public:
 
 	Control *get_controls_container() { return controls_vb; }
 
-	void find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
-
 	void update_viewport();
 
 	Tool get_current_tool() { return tool; }
 	void set_current_tool(Tool p_tool);
 
-	bool is_grid_visible() const;
-	Vector2 get_grid_step() const { return grid_step; }
-
 	void edit(CanvasItem *p_canvas_item);
 
 	void focus_selection();
@@ -672,7 +659,8 @@ class CanvasItemEditorViewport : public Control {
 	Control *preview_node = nullptr;
 	AcceptDialog *accept = nullptr;
 	AcceptDialog *texture_node_type_selector = nullptr;
-	RichTextLabel *tooltip_panel = nullptr;
+	Label *label = nullptr;
+	Label *label_desc = nullptr;
 	Ref<ButtonGroup> button_group;
 
 	void _on_mouse_exit();
@@ -692,8 +680,6 @@ class CanvasItemEditorViewport : public Control {
 	void _show_texture_node_type_selector();
 	void _update_theme();
 
-	void _show_tooltip(const String &p_title, const String &p_description) const;
-
 protected:
 	void _notification(int p_what);
 
diff --git a/engine/editor/scene/connections_dialog.cpp b/engine/editor/scene/connections_dialog.cpp
index 2f44d09b..d0083bbe 100644
--- a/engine/editor/scene/connections_dialog.cpp
+++ b/engine/editor/scene/connections_dialog.cpp
@@ -31,8 +31,6 @@
 #include "connections_dialog.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/hash_set.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/scene_tree_dock.h"
@@ -56,8 +54,6 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/spin_box.h"
-#include "scene/main/scene_tree.h"
-#include "servers/display/display_server.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
 	if (p_node != p_root && p_node->get_owner() != p_root) {
@@ -300,14 +296,9 @@ StringName ConnectDialog::generate_method_callback_name(Object *p_source, const
 }
 
 void ConnectDialog::_create_method_tree_items(const List<MethodInfo> &p_methods, TreeItem *p_parent_item) {
-	bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-	Ref<Font> monospace_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
 	for (const MethodInfo &mi : p_methods) {
 		TreeItem *method_item = method_tree->create_item(p_parent_item);
 		method_item->set_text(0, get_signature(mi));
-		if (use_monospace_font) {
-			method_item->set_custom_font(0, monospace_font);
-		}
 		method_item->set_metadata(0, mi.name);
 	}
 }
@@ -527,18 +518,6 @@ void ConnectDialog::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			method_search->set_right_icon(get_editor_theme_icon("Search"));
 			open_method_tree->set_button_icon(get_editor_theme_icon("Edit"));
-
-			bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-			Ref<Font> monospace_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
-
-			if (use_monospace_font) {
-				from_signal->add_theme_font_override(SceneStringName(font), monospace_font);
-				dst_method->add_theme_font_override(SceneStringName(font), monospace_font);
-			} else {
-				from_signal->remove_theme_font_override(SceneStringName(font));
-				dst_method->remove_theme_font_override(SceneStringName(font));
-			}
-
 		} break;
 	}
 }
@@ -1555,9 +1534,6 @@ void ConnectionsDock::update_tree() {
 	StringName native_base = selected_object->get_class();
 	Ref<Script> script_base = selected_object->get_script();
 
-	bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-	Ref<Font> monospace_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
-
 	while (native_base != StringName()) {
 		String class_name;
 		String doc_class_name;
@@ -1618,18 +1594,6 @@ void ConnectionsDock::update_tree() {
 
 			ClassDB::get_signal_list(native_base, &class_signals, true);
 
-			// Hide underscored native signals as they are meant to be private.
-			for (List<MethodInfo>::Element *E = class_signals.front(); E;) {
-				List<MethodInfo>::Element *N = E->next();
-				const MethodInfo &mi = E->get();
-
-				if (mi.name.is_empty() || mi.name[0] == '_') {
-					class_signals.erase(E);
-				}
-
-				E = N;
-			}
-
 			native_base = ClassDB::get_parent_class(native_base);
 		}
 
@@ -1667,10 +1631,6 @@ void ConnectionsDock::update_tree() {
 			String signame = connect_dialog->get_signature(mi, &argnames);
 			signal_item->set_text(0, signame);
 
-			if (use_monospace_font) {
-				signal_item->set_custom_font(0, monospace_font);
-			}
-
 			if (signame == prev_selected) {
 				signal_item->select(0);
 				prev_selected = "";
@@ -1730,9 +1690,6 @@ void ConnectionsDock::update_tree() {
 				connection_item->set_text(0, path);
 				connection_item->set_metadata(0, connection);
 				connection_item->set_icon(0, get_editor_theme_icon(SNAME("Slot")));
-				if (use_monospace_font) {
-					connection_item->set_custom_font(0, monospace_font);
-				}
 
 				if (_is_connection_inherited(connection)) {
 					// The scene inherits this connection.
diff --git a/engine/editor/scene/curve_editor_plugin.cpp b/engine/editor/scene/curve_editor_plugin.cpp
index 7d67db33..1628491b 100644
--- a/engine/editor/scene/curve_editor_plugin.cpp
+++ b/engine/editor/scene/curve_editor_plugin.cpp
@@ -30,17 +30,15 @@
 
 #include "curve_editor_plugin.h"
 
+#include "canvas_item_editor_plugin.h"
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
-#include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/flow_container.h"
@@ -130,6 +128,14 @@ void CurveEdit::_notification(int p_what) {
 			tangent_hover_radius = Math::round(BASE_TANGENT_HOVER_RADIUS * get_theme_default_base_scale() * gizmo_scale);
 			tangent_length = Math::round(BASE_TANGENT_LENGTH * get_theme_default_base_scale());
 		} break;
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Curve editor")));
+		} break;
 		case NOTIFICATION_DRAW: {
 			_redraw();
 		} break;
diff --git a/engine/editor/scene/editor_scene_tabs.cpp b/engine/editor/scene/editor_scene_tabs.cpp
index 65784f0a..ea5da9e0 100644
--- a/engine/editor/scene/editor_scene_tabs.cpp
+++ b/engine/editor/scene/editor_scene_tabs.cpp
@@ -31,10 +31,6 @@
 #include "editor_scene_tabs.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
@@ -169,8 +165,8 @@ void EditorSceneTabs::_reposition_active_tab(int p_to_index) {
 }
 
 void EditorSceneTabs::_update_context_menu() {
-#define DISABLE_LAST_OPTION_IF(m_condition) \
-	if (m_condition) { \
+#define DISABLE_LAST_OPTION_IF(m_condition)                   \
+	if (m_condition) {                                        \
 		scene_tabs_context_menu->set_item_disabled(-1, true); \
 	}
 
@@ -182,21 +178,21 @@ void EditorSceneTabs::_update_context_menu() {
 
 	scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/new_scene"), EditorNode::SCENE_NEW_SCENE);
 	if (tab_id >= 0) {
-		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/save_scene"), SCENE_SAVE_SCENE);
+		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/save_scene"), EditorNode::SCENE_SAVE_SCENE);
 		DISABLE_LAST_OPTION_IF(no_root_node);
-		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/save_scene_as"), SCENE_SAVE_AS_SCENE);
+		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/save_scene_as"), EditorNode::SCENE_SAVE_AS_SCENE);
 		DISABLE_LAST_OPTION_IF(no_root_node);
 	}
 
-	bool has_unsaved_scenes = false;
+	bool can_save_all_scenes = false;
 	for (int i = 0; i < EditorNode::get_editor_data().get_edited_scene_count(); i++) {
-		if (EditorNode::get_singleton()->is_scene_unsaved(i)) {
-			has_unsaved_scenes = true;
+		if (!EditorNode::get_editor_data().get_scene_path(i).is_empty() && EditorNode::get_editor_data().get_edited_scene_root(i)) {
+			can_save_all_scenes = true;
 			break;
 		}
 	}
 	scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/save_all_scenes"), EditorNode::SCENE_SAVE_ALL_SCENES);
-	DISABLE_LAST_OPTION_IF(!has_unsaved_scenes);
+	DISABLE_LAST_OPTION_IF(!can_save_all_scenes);
 
 	if (tab_id >= 0) {
 		const String scene_path = EditorNode::get_editor_data().get_scene_path(tab_id);
@@ -207,11 +203,11 @@ void EditorSceneTabs::_update_context_menu() {
 		DISABLE_LAST_OPTION_IF(!ResourceLoader::exists(scene_path));
 		scene_tabs_context_menu->add_item(TTR("Play This Scene"), SCENE_RUN);
 		DISABLE_LAST_OPTION_IF(no_root_node);
-		scene_tabs_context_menu->add_item(TTR("Set as Main Scene"), SCENE_SET_AS_MAIN_SCENE);
+		scene_tabs_context_menu->add_item(TTR("Set as Main Scene"), EditorNode::SCENE_TAB_SET_AS_MAIN_SCENE);
 		DISABLE_LAST_OPTION_IF(no_root_node || (!main_scene_path.is_empty() && ResourceUID::ensure_path(main_scene_path) == scene_path));
 
 		scene_tabs_context_menu->add_separator();
-		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/close_scene"), SCENE_CLOSE);
+		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/close_scene"), EditorNode::SCENE_CLOSE);
 		scene_tabs_context_menu->set_item_text(-1, TTR("Close Tab"));
 		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/reopen_closed_scene"), EditorNode::SCENE_OPEN_PREV);
 		scene_tabs_context_menu->set_item_text(-1, TTR("Undo Close Tab"));
@@ -240,10 +236,6 @@ void EditorSceneTabs::_update_context_menu() {
 	last_hovered_tab = tab_id;
 }
 
-int EditorSceneTabs::get_option_tab() const {
-	return last_hovered_tab >= 0 ? last_hovered_tab : scene_tabs->get_current_tab();
-}
-
 void EditorSceneTabs::_custom_menu_option(int p_option) {
 	if (p_option >= EditorContextMenuPlugin::BASE_ID) {
 		EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_SCENE_TABS, p_option, last_hovered_tab >= 0 ? EditorNode::get_editor_data().get_scene_path(last_hovered_tab) : String());
@@ -442,6 +434,7 @@ EditorSceneTabs::EditorSceneTabs() {
 	tabbar_panel->add_child(tabbar_container);
 
 	scene_tabs = memnew(TabBar);
+	scene_tabs->set_select_with_rmb(true);
 	scene_tabs->add_tab("unsaved");
 	scene_tabs->set_tab_close_display_policy((TabBar::CloseButtonDisplayPolicy)EDITOR_GET("interface/scene_tabs/display_close_button").operator int());
 	scene_tabs->set_max_tab_width(int(EDITOR_GET("interface/scene_tabs/maximum_width")) * EDSCALE);
diff --git a/engine/editor/scene/editor_scene_tabs.h b/engine/editor/scene/editor_scene_tabs.h
index 8d38ebb7..910c29e9 100644
--- a/engine/editor/scene/editor_scene_tabs.h
+++ b/engine/editor/scene/editor_scene_tabs.h
@@ -48,12 +48,8 @@ class EditorSceneTabs : public MarginContainer {
 
 public:
 	enum {
-		SCENE_SAVE_SCENE = 1000, // Prevents conflicts with EditorNode options.
-		SCENE_SAVE_AS_SCENE,
-		SCENE_SHOW_IN_FILESYSTEM,
+		SCENE_SHOW_IN_FILESYSTEM = 1000, // Prevents conflicts with EditorNode options.
 		SCENE_RUN,
-		SCENE_SET_AS_MAIN_SCENE,
-		SCENE_CLOSE,
 		SCENE_CLOSE_OTHERS,
 		SCENE_CLOSE_RIGHT,
 	};
@@ -106,7 +102,6 @@ public:
 
 	void set_current_tab(int p_tab);
 	int get_current_tab() const;
-	int get_option_tab() const;
 
 	void update_scene_tabs();
 
diff --git a/engine/editor/scene/gradient_editor_plugin.cpp b/engine/editor/scene/gradient_editor_plugin.cpp
index 66dc7276..dd6f7efa 100644
--- a/engine/editor/scene/gradient_editor_plugin.cpp
+++ b/engine/editor/scene/gradient_editor_plugin.cpp
@@ -30,9 +30,6 @@
 
 #include "gradient_editor_plugin.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -547,6 +544,14 @@ void GradientEdit::_notification(int p_what) {
 			draw_spacing = BASE_SPACING * get_theme_default_base_scale();
 			handle_width = BASE_HANDLE_WIDTH * get_theme_default_base_scale();
 		} break;
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Gradient editor")));
+		} break;
 		case NOTIFICATION_DRAW: {
 			_redraw();
 		} break;
diff --git a/engine/editor/scene/group_settings_editor.cpp b/engine/editor/scene/group_settings_editor.cpp
index adaa8fd1..35f33c7a 100644
--- a/engine/editor/scene/group_settings_editor.cpp
+++ b/engine/editor/scene/group_settings_editor.cpp
@@ -31,10 +31,6 @@
 #include "group_settings_editor.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
@@ -130,9 +126,9 @@ void GroupSettingsEditor::_check_rename() {
 	}
 
 	if (new_name.is_empty()) {
-		rename_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group can't be empty."), EditorValidationPanel::MSG_ERROR);
+		rename_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group can't be empty."), EditorValidationPanel::MSG_ERROR);
 	} else if (ProjectSettings::get_singleton()->has_global_group(new_name)) {
-		rename_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group already exists."), EditorValidationPanel::MSG_ERROR);
+		rename_validation_panel->set_message(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group already exists."), EditorValidationPanel::MSG_ERROR);
 	}
 }
 
@@ -193,7 +189,7 @@ void GroupSettingsEditor::_group_name_text_changed(const String &p_name) {
 void GroupSettingsEditor::_modify_references(const StringName &p_name, const StringName &p_new_name, bool p_is_rename) {
 	HashSet<String> scenes;
 
-	HashMap<StringName, HashSet<StringName>> scene_groups_cache(ProjectSettings::get_singleton()->get_scene_groups_cache());
+	HashMap<StringName, HashSet<StringName>> scene_groups_cache = ProjectSettings::get_singleton()->get_scene_groups_cache();
 	for (const KeyValue<StringName, HashSet<StringName>> &E : scene_groups_cache) {
 		if (E.value.has(p_name)) {
 			scenes.insert(E.key);
@@ -453,7 +449,7 @@ void GroupSettingsEditor::_show_rename_dialog() {
 		rename_group_dialog->register_text_enter(rename_group);
 
 		rename_validation_panel = memnew(EditorValidationPanel);
-		rename_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTRC("Group name is valid."));
+		rename_validation_panel->add_line(EditorValidationPanel::MSG_ID_DEFAULT, TTR("Group name is valid."));
 		rename_validation_panel->set_update_callback(callable_mp(this, &GroupSettingsEditor::_check_rename));
 		rename_validation_panel->set_accept_button(rename_group_dialog->get_ok_button());
 
diff --git a/engine/editor/scene/gui/control_editor_plugin.cpp b/engine/editor/scene/gui/control_editor_plugin.cpp
index cef6bc84..d7baf7f8 100644
--- a/engine/editor/scene/gui/control_editor_plugin.cpp
+++ b/engine/editor/scene/gui/control_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "control_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
@@ -588,7 +586,7 @@ void ControlEditorPresetPicker::_add_row_button(HBoxContainer *p_row, const int
 	b->set_custom_minimum_size(Size2i(36, 36) * EDSCALE);
 	b->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	b->set_tooltip_text(p_name);
-	b->set_theme_type_variation(SceneStringName(FlatButton));
+	b->set_flat(true);
 	p_row->add_child(b);
 	b->connect(SceneStringName(pressed), callable_mp(this, &ControlEditorPresetPicker::_preset_button_pressed).bind(p_preset));
 
@@ -601,32 +599,8 @@ void ControlEditorPresetPicker::_add_separator(BoxContainer *p_box, Separator *p
 	p_box->add_child(p_separator);
 }
 
-void ControlEditorPresetPicker::_update_preset_button_state(int p_preset) {
-	for (KeyValue<int, Button *> &E : preset_buttons) {
-		Button *button = E.value;
-
-		if (!button) {
-			continue;
-		}
-
-		button->begin_bulk_theme_override();
-
-		if (E.key == p_preset) {
-			const Color pressed_color = get_theme_color(SNAME("icon_pressed_color"), "Button");
-			button->add_theme_color_override(SNAME("icon_normal_color"), pressed_color);
-			button->add_theme_color_override(SNAME("icon_hover_color"), pressed_color);
-		} else {
-			button->remove_theme_color_override(SNAME("icon_normal_color"));
-			button->remove_theme_color_override(SNAME("icon_hover_color"));
-		}
-
-		button->end_bulk_theme_override();
-	}
-}
-
 void AnchorPresetPicker::_preset_button_pressed(const int p_preset) {
 	emit_signal("anchors_preset_selected", p_preset);
-	_update_preset_button_state(p_preset);
 }
 
 void AnchorPresetPicker::_notification(int p_notification) {
@@ -657,10 +631,6 @@ void AnchorPresetPicker::_notification(int p_notification) {
 	}
 }
 
-void AnchorPresetPicker::set_selected_preset(int p_preset) {
-	_update_preset_button_state(p_preset);
-}
-
 void AnchorPresetPicker::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("anchors_preset_selected", PropertyInfo(Variant::INT, "preset")));
 }
@@ -724,7 +694,6 @@ void SizeFlagPresetPicker::_preset_button_pressed(const int p_preset) {
 	}
 
 	emit_signal("size_flags_selected", flags);
-	_update_preset_button_state(p_preset);
 }
 
 void SizeFlagPresetPicker::_expand_button_pressed() {
@@ -746,10 +715,6 @@ void SizeFlagPresetPicker::set_allowed_flags(Vector<SizeFlags> &p_flags) {
 	}
 }
 
-void SizeFlagPresetPicker::set_selected_preset(int p_preset) {
-	_update_preset_button_state(p_preset);
-}
-
 void SizeFlagPresetPicker::set_expand_flag(bool p_expand) {
 	expand_button->set_pressed(p_expand);
 }
@@ -972,99 +937,6 @@ List<Control *> ControlEditorToolbar::_get_edited_controls() {
 	return selection;
 }
 
-void ControlEditorToolbar::_update_anchor_selection_ui(bool p_pressed) {
-	if (!p_pressed) {
-		return;
-	}
-
-	int nb_valid_controls = 0;
-	int first_preset = -1;
-	bool all_preset_same = true;
-
-	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-	for (Node *E : selection) {
-		Control *control = Object::cast_to<Control>(E);
-		if (!control) {
-			continue;
-		}
-		if (Object::cast_to<Container>(control->get_parent())) {
-			continue;
-		}
-
-		nb_valid_controls++;
-
-		const Dictionary &state = control->_edit_get_state();
-		const int lm = state["layout_mode"];
-
-		if (lm != LayoutMode::LAYOUT_MODE_ANCHORS && lm != LayoutMode::LAYOUT_MODE_UNCONTROLLED) {
-			all_preset_same = false;
-			break;
-		}
-
-		const int preset = state["anchors_layout_preset"];
-
-		if (first_preset == -1) {
-			first_preset = preset;
-		} else if (preset != first_preset) {
-			all_preset_same = false;
-			break;
-		}
-	}
-
-	anchors_picker->set_selected_preset((all_preset_same && nb_valid_controls > 0) ? first_preset : -1);
-}
-
-void ControlEditorToolbar::_update_container_sizing_selection_ui(bool p_pressed) {
-	if (!p_pressed) {
-		return;
-	}
-
-	bool all_h_shrink_fill_same = true;
-	bool all_v_shrink_fill_same = true;
-	bool all_h_expand = true;
-	bool all_v_expand = true;
-	int first_h_flags = -1;
-	int first_v_flags = -1;
-
-	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
-	for (Node *E : selection) {
-		Control *control = Object::cast_to<Control>(E);
-		if (!control) {
-			continue;
-		}
-
-		const int h_flags = control->get_h_size_flags();
-		const int v_flags = control->get_v_size_flags();
-		const int h_shrink_fill = h_flags & ~(Control::SIZE_EXPAND);
-		const int v_shrink_fill = v_flags & ~(Control::SIZE_EXPAND);
-
-		if (first_h_flags == -1) {
-			first_h_flags = h_shrink_fill;
-		} else if (h_shrink_fill != first_h_flags) {
-			all_h_shrink_fill_same = false;
-		}
-
-		if (first_v_flags == -1) {
-			first_v_flags = v_shrink_fill;
-		} else if (v_shrink_fill != first_v_flags) {
-			all_v_shrink_fill_same = false;
-		}
-
-		if (!(h_flags & Control::SIZE_EXPAND)) {
-			all_h_expand = false;
-		}
-		if (!(v_flags & Control::SIZE_EXPAND)) {
-			all_v_expand = false;
-		}
-	}
-
-	container_h_picker->set_selected_preset(all_h_shrink_fill_same ? first_h_flags : -1);
-	container_v_picker->set_selected_preset(all_v_shrink_fill_same ? first_v_flags : -1);
-
-	container_h_picker->set_expand_flag(all_h_expand);
-	container_v_picker->set_expand_flag(all_v_expand);
-}
-
 void ControlEditorToolbar::_selection_changed() {
 	// Update toolbar visibility.
 	bool has_controls = false;
@@ -1178,6 +1050,30 @@ void ControlEditorToolbar::_selection_changed() {
 			container_h_picker->set_allowed_flags(allowed_all_flags);
 			container_v_picker->set_allowed_flags(allowed_all_flags);
 		}
+
+		// Update expand toggles.
+		int nb_valid_controls = 0;
+		int nb_h_expand = 0;
+		int nb_v_expand = 0;
+
+		const List<Node *> &selection = editor_selection->get_top_selected_node_list();
+		for (Node *E : selection) {
+			Control *control = Object::cast_to<Control>(E);
+			if (!control) {
+				continue;
+			}
+
+			nb_valid_controls++;
+			if (control->get_h_size_flags() & Control::SIZE_EXPAND) {
+				nb_h_expand++;
+			}
+			if (control->get_v_size_flags() & Control::SIZE_EXPAND) {
+				nb_v_expand++;
+			}
+		}
+
+		container_h_picker->set_expand_flag(nb_valid_controls == nb_h_expand);
+		container_v_picker->set_expand_flag(nb_valid_controls == nb_v_expand);
 	} else {
 		containers_button->set_visible(false);
 	}
@@ -1197,13 +1093,12 @@ ControlEditorToolbar::ControlEditorToolbar() {
 	// Anchor and offset tools.
 	anchors_button = memnew(ControlEditorPopupButton);
 	anchors_button->set_tooltip_text(TTR("Presets for the anchor and offset values of a Control node."));
-	anchors_button->connect(SceneStringName(toggled), callable_mp(this, &ControlEditorToolbar::_update_anchor_selection_ui));
 	add_child(anchors_button);
 
 	Label *anchors_label = memnew(Label);
 	anchors_label->set_text(TTR("Anchor preset"));
 	anchors_button->get_popup_hbox()->add_child(anchors_label);
-	anchors_picker = memnew(AnchorPresetPicker);
+	AnchorPresetPicker *anchors_picker = memnew(AnchorPresetPicker);
 	anchors_picker->set_h_size_flags(SIZE_SHRINK_CENTER);
 	anchors_button->get_popup_hbox()->add_child(anchors_picker);
 	anchors_picker->connect("anchors_preset_selected", callable_mp(this, &ControlEditorToolbar::_anchors_preset_selected));
@@ -1228,7 +1123,6 @@ ControlEditorToolbar::ControlEditorToolbar() {
 	// Container tools.
 	containers_button = memnew(ControlEditorPopupButton);
 	containers_button->set_tooltip_text(TTR("Sizing settings for children of a Container node."));
-	containers_button->connect(SceneStringName(toggled), callable_mp(this, &ControlEditorToolbar::_update_container_sizing_selection_ui));
 	add_child(containers_button);
 
 	Label *container_h_label = memnew(Label);
@@ -1261,79 +1155,11 @@ ControlEditorToolbar *ControlEditorToolbar::singleton = nullptr;
 
 // Editor plugin.
 
-void ControlOffsetTransformPreview::edit(Control *p_control) {
-	if (p_control == selected_control) {
-		return;
-	}
-
-	const Callable update_overlays = callable_mp(plugin, &EditorPlugin::update_overlays);
-
-	if (selected_control) {
-		selected_control->disconnect(SceneStringName(draw), update_overlays);
-	}
-
-	selected_control = p_control;
-
-	if (selected_control) {
-		selected_control->connect(SceneStringName(draw), update_overlays);
-	}
-
-	plugin->update_overlays();
-}
-
-void ControlOffsetTransformPreview::forward_canvas_draw_over_viewport(Control *p_overlay) const {
-	if (!selected_control || !selected_control->is_offset_transform_enabled() || selected_control->is_offset_transform_visual_only()) {
-		return;
-	}
-
-	Point2 top_left = Point2();
-	Point2 bottom_right = selected_control->get_size();
-	Point2 top_right = Point2(bottom_right.x, top_left.y);
-	Point2 bottom_left = Point2(top_left.x, bottom_right.y);
-
-	Transform2D control_transform_without_offset = selected_control->get_global_transform() * selected_control->get_offset_transform().affine_inverse();
-	top_left = control_transform_without_offset.xform(top_left);
-	bottom_right = control_transform_without_offset.xform(bottom_right);
-	top_right = control_transform_without_offset.xform(top_right);
-	bottom_left = control_transform_without_offset.xform(bottom_left);
-
-	Transform2D canvas_transform = CanvasItemEditor::get_singleton()->get_canvas_transform();
-	top_left = canvas_transform.xform(top_left);
-	bottom_right = canvas_transform.xform(bottom_right);
-	top_right = canvas_transform.xform(top_right);
-	bottom_left = canvas_transform.xform(bottom_left);
-
-	Color color = Color(0.5, 0.5, 0.5, 0.75);
-	p_overlay->draw_dashed_line(top_left, top_right, color, 5.0, 4.0);
-	p_overlay->draw_dashed_line(top_right, bottom_right, color, 5.0, 4.0);
-	p_overlay->draw_dashed_line(bottom_right, bottom_left, color, 5.0, 4.0);
-	p_overlay->draw_dashed_line(bottom_left, top_left, color, 5.0, 4.0);
-}
-
-ControlOffsetTransformPreview::ControlOffsetTransformPreview(EditorPlugin *p_plugin) {
-	plugin = p_plugin;
-}
-
-void ControlEditorPlugin::edit(Object *p_object) {
-	offset_transform_preview->edit(Object::cast_to<Control>(p_object));
-}
-
-bool ControlEditorPlugin::handles(Object *p_object) const {
-	return Object::cast_to<Control>(p_object) != nullptr;
-}
-
-void ControlEditorPlugin::forward_canvas_draw_over_viewport(Control *p_overlay) {
-	offset_transform_preview->forward_canvas_draw_over_viewport(p_overlay);
-}
-
 ControlEditorPlugin::ControlEditorPlugin() {
 	toolbar = memnew(ControlEditorToolbar);
 	toolbar->hide();
 	add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
 
-	offset_transform_preview = memnew(ControlOffsetTransformPreview(this));
-	EditorNode::get_singleton()->get_gui_base()->add_child(offset_transform_preview);
-
 	Ref<EditorInspectorPluginControl> plugin;
 	plugin.instantiate();
 	add_inspector_plugin(plugin);
diff --git a/engine/editor/scene/gui/control_editor_plugin.h b/engine/editor/scene/gui/control_editor_plugin.h
index 675b72f6..b7261770 100644
--- a/engine/editor/scene/gui/control_editor_plugin.h
+++ b/engine/editor/scene/gui/control_editor_plugin.h
@@ -170,7 +170,6 @@ protected:
 
 	void _add_row_button(HBoxContainer *p_row, const int p_preset, const String &p_name);
 	void _add_separator(BoxContainer *p_box, Separator *p_separator);
-	void _update_preset_button_state(int p_preset);
 };
 
 class AnchorPresetPicker : public ControlEditorPresetPicker {
@@ -183,8 +182,6 @@ protected:
 	static void _bind_methods();
 
 public:
-	void set_selected_preset(int p_preset);
-
 	AnchorPresetPicker();
 };
 
@@ -204,7 +201,6 @@ protected:
 
 public:
 	void set_allowed_flags(Vector<SizeFlags> &p_flags);
-	void set_selected_preset(int p_preset);
 	void set_expand_flag(bool p_expand);
 
 	SizeFlagPresetPicker(bool p_vertical);
@@ -219,8 +215,6 @@ class ControlEditorToolbar : public HBoxContainer {
 	ControlEditorPopupButton *containers_button = nullptr;
 	Button *anchor_mode_button = nullptr;
 
-	AnchorPresetPicker *anchors_picker = nullptr;
-
 	SizeFlagPresetPicker *container_h_picker = nullptr;
 	SizeFlagPresetPicker *container_v_picker = nullptr;
 
@@ -231,8 +225,6 @@ class ControlEditorToolbar : public HBoxContainer {
 	void _anchor_mode_toggled(bool p_status);
 	void _container_flags_selected(int p_flags, bool p_vertical);
 	void _expand_flag_toggled(bool p_expand, bool p_vertical);
-	void _update_anchor_selection_ui(bool p_pressed);
-	void _update_container_sizing_selection_ui(bool p_pressed);
 
 	Vector2 _position_to_anchor(const Control *p_control, Vector2 position);
 	bool _is_node_locked(const Node *p_node);
@@ -252,36 +244,14 @@ public:
 	ControlEditorToolbar();
 };
 
-class ControlOffsetTransformPreview : public Control {
-	GDCLASS(ControlOffsetTransformPreview, Control);
-
-	EditorPlugin *plugin = nullptr;
-	Control *selected_control = nullptr;
-
-	friend class ControlEditorPlugin;
-
-public:
-	void edit(Control *p_control);
-
-	void forward_canvas_draw_over_viewport(Control *p_overlay) const;
-
-	ControlOffsetTransformPreview(EditorPlugin *p_plugin);
-};
-
 // Editor plugin.
 class ControlEditorPlugin : public EditorPlugin {
 	GDCLASS(ControlEditorPlugin, EditorPlugin);
 
 	ControlEditorToolbar *toolbar = nullptr;
-	ControlOffsetTransformPreview *offset_transform_preview = nullptr;
 
 public:
 	virtual String get_plugin_name() const override { return "Control"; }
 
-	virtual void edit(Object *p_object) override;
-	virtual bool handles(Object *p_object) const override;
-
-	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override;
-
 	ControlEditorPlugin();
 };
diff --git a/engine/editor/scene/gui/font_config_plugin.cpp b/engine/editor/scene/gui/font_config_plugin.cpp
index dc290fd4..20821d3f 100644
--- a/engine/editor/scene/gui/font_config_plugin.cpp
+++ b/engine/editor/scene/gui/font_config_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "font_config_plugin.h"
 
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "editor/settings/editor_settings.h"
@@ -948,6 +946,8 @@ void FontPreview::_notification(int p_what) {
 	}
 }
 
+void FontPreview::_bind_methods() {}
+
 Size2 FontPreview::get_minimum_size() const {
 	return Vector2(64, 64) * EDSCALE;
 }
diff --git a/engine/editor/scene/gui/font_config_plugin.h b/engine/editor/scene/gui/font_config_plugin.h
index f85fc827..baf7d2e0 100644
--- a/engine/editor/scene/gui/font_config_plugin.h
+++ b/engine/editor/scene/gui/font_config_plugin.h
@@ -128,6 +128,8 @@ class EditorPropertyOTVariation : public EditorProperty {
 	EditorPaginator *paginator = nullptr;
 
 protected:
+	static void _bind_methods() {}
+
 	void _edit_pressed();
 	void _page_changed(int p_page);
 	void _property_changed(const String &p_property, const Variant &p_value, const String &p_name = "", bool p_changing = false);
@@ -204,6 +206,7 @@ class FontPreview : public Control {
 
 protected:
 	void _notification(int p_what);
+	static void _bind_methods();
 
 	Ref<Font> prev_font;
 
@@ -237,6 +240,7 @@ protected:
 	virtual void _add_element() override;
 
 	void _add_font(int p_option);
+	static void _bind_methods() {}
 
 public:
 	EditorPropertyFontNamesArray();
diff --git a/engine/editor/scene/gui/margin_container_editor_plugin.cpp b/engine/editor/scene/gui/margin_container_editor_plugin.cpp
index c25d04b6..138b1ff3 100644
--- a/engine/editor/scene/gui/margin_container_editor_plugin.cpp
+++ b/engine/editor/scene/gui/margin_container_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "margin_container_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 
diff --git a/engine/editor/scene/gui/style_box_editor_plugin.cpp b/engine/editor/scene/gui/style_box_editor_plugin.cpp
index 72ca1af3..8098b9be 100644
--- a/engine/editor/scene/gui/style_box_editor_plugin.cpp
+++ b/engine/editor/scene/gui/style_box_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "style_box_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/resources/style_box_texture.h"
diff --git a/engine/editor/scene/gui/theme_editor_plugin.cpp b/engine/editor/scene/gui/theme_editor_plugin.cpp
index 72d03ea4..557845f4 100644
--- a/engine/editor/scene/gui/theme_editor_plugin.cpp
+++ b/engine/editor/scene/gui/theme_editor_plugin.cpp
@@ -30,9 +30,6 @@
 
 #include "theme_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
@@ -44,7 +41,6 @@
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_spin_slider.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/gui/progress_dialog.h"
 #include "editor/inspector/editor_resource_picker.h"
 #include "editor/settings/editor_command_palette.h"
@@ -2237,6 +2233,17 @@ void ThemeTypeDialog::_add_type_filter_cbk(const String &p_value) {
 	_update_add_type_options(p_value);
 }
 
+void ThemeTypeDialog::_type_filter_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the item list.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			add_type_options->gui_input(key);
+			add_type_filter->accept_event();
+		}
+	}
+}
+
 void ThemeTypeDialog::_add_type_options_cbk(int p_index) {
 	add_type_filter->set_text(add_type_options->get_item_text(p_index));
 	add_type_filter->set_caret_column(add_type_filter->get_text().length());
@@ -2305,10 +2312,11 @@ ThemeTypeDialog::ThemeTypeDialog() {
 	add_type_filter_label->set_text(TTR("Filter the list of types or create a new custom type:"));
 	add_type_vb->add_child(add_type_filter_label);
 
-	add_type_filter = memnew(FilterLineEdit);
+	add_type_filter = memnew(LineEdit);
 	add_type_vb->add_child(add_type_filter);
 	add_type_filter->connect(SceneStringName(text_changed), callable_mp(this, &ThemeTypeDialog::_add_type_filter_cbk));
 	add_type_filter->connect(SceneStringName(text_submitted), callable_mp(this, &ThemeTypeDialog::_add_type_dialog_entered));
+	add_type_filter->connect(SceneStringName(gui_input), callable_mp(this, &ThemeTypeDialog::_type_filter_input));
 
 	Label *add_type_options_label = memnew(Label);
 	add_type_options_label->set_text(TTR("Available Node-based types:"));
@@ -2320,7 +2328,6 @@ ThemeTypeDialog::ThemeTypeDialog() {
 	add_type_vb->add_child(mc);
 
 	add_type_options = memnew(ItemList);
-	add_type_filter->set_forward_control(add_type_options);
 	add_type_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	add_type_options->set_scroll_hint_mode(ItemList::SCROLL_HINT_MODE_BOTH);
 	mc->add_child(add_type_options);
@@ -2675,20 +2682,19 @@ void ThemeTypeEditor::_update_type_items() {
 			if (E.value) {
 				if (edited_theme->has_font(E.key, edited_type)) {
 					item_editor->set_edited_resource(edited_theme->get_font(E.key, edited_type));
-					item_editor->set_force_allow_unique(false);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
 				item_editor->connect("resource_selected", callable_mp(this, &ThemeTypeEditor::_edit_resource_item));
+				item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_font_item_changed).bind(E.key));
 			} else {
 				if (ThemeDB::get_singleton()->get_default_theme()->has_font(E.key, edited_type)) {
 					item_editor->set_edited_resource(ThemeDB::get_singleton()->get_default_theme()->get_font(E.key, edited_type));
-					item_editor->set_force_allow_unique(true);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
+				item_editor->set_editable(false);
 			}
-			item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_font_item_changed).bind(E.key));
 
 			_add_focusable(item_editor);
 			font_items_list->add_child(item_control);
@@ -2749,20 +2755,19 @@ void ThemeTypeEditor::_update_type_items() {
 			if (E.value) {
 				if (edited_theme->has_icon(E.key, edited_type)) {
 					item_editor->set_edited_resource(edited_theme->get_icon(E.key, edited_type));
-					item_editor->set_force_allow_unique(false);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
 				item_editor->connect("resource_selected", callable_mp(this, &ThemeTypeEditor::_edit_resource_item));
+				item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_icon_item_changed).bind(E.key));
 			} else {
 				if (ThemeDB::get_singleton()->get_default_theme()->has_icon(E.key, edited_type)) {
 					item_editor->set_edited_resource(ThemeDB::get_singleton()->get_default_theme()->get_icon(E.key, edited_type));
-					item_editor->set_force_allow_unique(true);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
+				item_editor->set_editable(false);
 			}
-			item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_icon_item_changed).bind(E.key));
 
 			_add_focusable(item_editor);
 			icon_items_list->add_child(item_control);
@@ -2824,11 +2829,11 @@ void ThemeTypeEditor::_update_type_items() {
 			if (E.value) {
 				if (edited_theme->has_stylebox(E.key, edited_type)) {
 					item_editor->set_edited_resource(edited_theme->get_stylebox(E.key, edited_type));
-					item_editor->set_force_allow_unique(false);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
 				item_editor->connect("resource_selected", callable_mp(this, &ThemeTypeEditor::_edit_resource_item));
+				item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_stylebox_item_changed).bind(E.key));
 
 				Button *pin_leader_button = memnew(Button);
 				pin_leader_button->set_flat(true);
@@ -2841,12 +2846,11 @@ void ThemeTypeEditor::_update_type_items() {
 			} else {
 				if (ThemeDB::get_singleton()->get_default_theme()->has_stylebox(E.key, edited_type)) {
 					item_editor->set_edited_resource(ThemeDB::get_singleton()->get_default_theme()->get_stylebox(E.key, edited_type));
-					item_editor->set_force_allow_unique(true);
 				} else {
 					item_editor->set_edited_resource(Ref<Resource>());
 				}
+				item_editor->set_editable(false);
 			}
-			item_editor->connect("resource_changed", callable_mp(this, &ThemeTypeEditor::_stylebox_item_changed).bind(E.key));
 
 			item_control->add_child(item_editor);
 			_add_focusable(item_editor);
@@ -3285,7 +3289,7 @@ void ThemeTypeEditor::_font_item_changed(Ref<Font> p_value, String p_item_name)
 	if (edited_theme->has_font(p_item_name, edited_type)) {
 		ur->add_undo_method(*edited_theme, "set_font", p_item_name, edited_type, edited_theme->get_font(p_item_name, edited_type));
 	} else {
-		ur->add_undo_method(*edited_theme, "clear_font", p_item_name, edited_type);
+		ur->add_undo_method(*edited_theme, "set_font", p_item_name, edited_type, Ref<Font>());
 	}
 
 	ur->add_do_method(this, CoreStringName(call_deferred), "_update_type_items");
@@ -3302,7 +3306,7 @@ void ThemeTypeEditor::_icon_item_changed(Ref<Texture2D> p_value, String p_item_n
 	if (edited_theme->has_icon(p_item_name, edited_type)) {
 		ur->add_undo_method(*edited_theme, "set_icon", p_item_name, edited_type, edited_theme->get_icon(p_item_name, edited_type));
 	} else {
-		ur->add_undo_method(*edited_theme, "clear_icon", p_item_name, edited_type);
+		ur->add_undo_method(*edited_theme, "set_icon", p_item_name, edited_type, Ref<Texture2D>());
 	}
 
 	ur->add_do_method(this, CoreStringName(call_deferred), "_update_type_items");
@@ -3319,7 +3323,7 @@ void ThemeTypeEditor::_stylebox_item_changed(Ref<StyleBox> p_value, String p_ite
 	if (edited_theme->has_stylebox(p_item_name, edited_type)) {
 		ur->add_undo_method(*edited_theme, "set_stylebox", p_item_name, edited_type, edited_theme->get_stylebox(p_item_name, edited_type));
 	} else {
-		ur->add_undo_method(*edited_theme, "clear_stylebox", p_item_name, edited_type);
+		ur->add_undo_method(*edited_theme, "set_stylebox", p_item_name, edited_type, Ref<StyleBox>());
 	}
 
 	ur->add_do_method(this, "_change_pinned_stylebox");
@@ -3968,18 +3972,6 @@ void ThemeEditor::_notification(int p_what) {
 	}
 }
 
-void ThemeEditor::save_layout_to_config(Ref<ConfigFile> &p_layout, const String &p_section) const {
-	const int split_offset = Math::round(main_hs->get_split_offset() / EDSCALE);
-	p_layout->set_value(p_section, "split_offset", split_offset);
-}
-
-void ThemeEditor::load_layout_from_config(const Ref<ConfigFile> &p_layout, const String &p_section) {
-	if (p_layout->has_section_key(p_section, "split_offset")) {
-		const int split_offset = p_layout->get_value(p_section, "split_offset");
-		main_hs->set_split_offset(split_offset * EDSCALE);
-	}
-}
-
 ThemeEditor::ThemeEditor() {
 	set_name(TTRC("Theme"));
 	set_icon_name("ThemeDock");
@@ -4044,7 +4036,7 @@ ThemeEditor::ThemeEditor() {
 	theme_edit_dialog->hide();
 	top_menu->add_child(theme_edit_dialog);
 
-	main_hs = memnew(HSplitContainer);
+	HSplitContainer *main_hs = memnew(HSplitContainer);
 	main_hs->set_v_size_flags(SIZE_EXPAND_FILL);
 	content_vb->add_child(main_hs);
 
diff --git a/engine/editor/scene/gui/theme_editor_plugin.h b/engine/editor/scene/gui/theme_editor_plugin.h
index 450cc939..ca87b2b1 100644
--- a/engine/editor/scene/gui/theme_editor_plugin.h
+++ b/engine/editor/scene/gui/theme_editor_plugin.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_map.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
 #include "editor/scene/gui/theme_editor_preview.h"
@@ -42,8 +41,6 @@
 class Button;
 class CheckButton;
 class EditorFileDialog;
-class FilterLineEdit;
-class HSplitContainer;
 class ItemList;
 class Label;
 class LineEdit;
@@ -298,7 +295,7 @@ class ThemeTypeDialog : public ConfirmationDialog {
 
 	String pre_submitted_value;
 
-	FilterLineEdit *add_type_filter = nullptr;
+	LineEdit *add_type_filter = nullptr;
 	ItemList *add_type_options = nullptr;
 	ConfirmationDialog *add_type_confirmation = nullptr;
 
@@ -308,6 +305,7 @@ class ThemeTypeDialog : public ConfirmationDialog {
 	void _update_add_type_options(const String &p_filter = "");
 
 	void _add_type_filter_cbk(const String &p_value);
+	void _type_filter_input(const Ref<InputEvent> &p_event);
 	void _add_type_options_cbk(int p_index);
 	void _add_type_dialog_entered(const String &p_value);
 	void _add_type_dialog_activated(int p_index);
@@ -456,7 +454,6 @@ class ThemeEditor : public EditorDock {
 
 	Label *theme_name = nullptr;
 	ThemeItemEditorDialog *theme_edit_dialog = nullptr;
-	HSplitContainer *main_hs = nullptr;
 
 	void _theme_save_button_cbk(bool p_save_as);
 	void _theme_edit_button_cbk();
@@ -480,9 +477,6 @@ class ThemeEditor : public EditorDock {
 protected:
 	void _notification(int p_what);
 
-	virtual void save_layout_to_config(Ref<ConfigFile> &p_layout, const String &p_section) const override;
-	virtual void load_layout_from_config(const Ref<ConfigFile> &p_layout, const String &p_section) override;
-
 public:
 	void edit(const Ref<Theme> &p_theme);
 	Ref<Theme> get_edited_theme();
@@ -500,6 +494,7 @@ class ThemeEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "Theme"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/gui/theme_editor_preview.cpp b/engine/editor/scene/gui/theme_editor_preview.cpp
index 67416ea9..fabebc26 100644
--- a/engine/editor/scene/gui/theme_editor_preview.cpp
+++ b/engine/editor/scene/gui/theme_editor_preview.cpp
@@ -31,9 +31,6 @@
 #include "theme_editor_preview.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
diff --git a/engine/editor/scene/gui/theme_editor_preview.h b/engine/editor/scene/gui/theme_editor_preview.h
index 28f56d43..bddcfc44 100644
--- a/engine/editor/scene/gui/theme_editor_preview.h
+++ b/engine/editor/scene/gui/theme_editor_preview.h
@@ -37,7 +37,6 @@ class Button;
 class ColorPickerButton;
 class ColorRect;
 class MarginContainer;
-class PackedScene;
 class ScrollContainer;
 
 class ThemeEditorPreview : public VBoxContainer {
diff --git a/engine/editor/scene/gui/virtual_joystick_editor_plugin.cpp b/engine/editor/scene/gui/virtual_joystick_editor_plugin.cpp
deleted file mode 100644
index 3c3f7a5a..00000000
--- a/engine/editor/scene/gui/virtual_joystick_editor_plugin.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************/
-/*  virtual_joystick_editor_plugin.cpp                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "virtual_joystick_editor_plugin.h"
-
-#include "core/object/callable_mp.h"
-#include "editor/scene/canvas_item_editor_plugin.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/gui/virtual_joystick.h"
-
-void VirtualJoystickEditorPlugin::edit(Object *p_object) {
-	if (virtual_joystick) {
-		virtual_joystick->disconnect(SceneStringName(draw), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
-	}
-
-	virtual_joystick = Object::cast_to<VirtualJoystick>(p_object);
-
-	if (virtual_joystick) {
-		virtual_joystick->connect(SceneStringName(draw), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
-	}
-	CanvasItemEditor::get_singleton()->update_viewport();
-}
-
-bool VirtualJoystickEditorPlugin::handles(Object *p_object) const {
-	return Object::cast_to<VirtualJoystick>(p_object) != nullptr;
-}
-
-void VirtualJoystickEditorPlugin::forward_canvas_draw_over_viewport(Control *p_viewport_control) {
-	if (!virtual_joystick || !virtual_joystick->is_visible_in_tree()) {
-		return;
-	}
-
-	Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * virtual_joystick->get_screen_transform();
-
-	Vector2 center = virtual_joystick->get_joystick_position();
-	float base_radius = virtual_joystick->get_joystick_size() * 0.5f;
-
-	float clampzone_radius = base_radius * virtual_joystick->get_clampzone_ratio();
-	float deadzone_radius = clampzone_radius * virtual_joystick->get_deadzone_ratio();
-
-	// NOTE: This color is copied from Camera2DEditor::forward_canvas_draw_over_viewport.
-	// We may want to unify them somehow in the future.
-	Color clampzone_color = Color(1, 1, 0.25, 0.63);
-	Color deadzone_color = Color(1, 1, 0.25, 0.63);
-
-	int width = Math::round(1 * EDSCALE);
-
-	p_viewport_control->draw_circle(xform.xform(center), clampzone_radius * xform.get_scale().x, clampzone_color, false, width);
-
-	p_viewport_control->draw_circle(xform.xform(center), deadzone_radius * xform.get_scale().x, deadzone_color, false, width);
-}
diff --git a/engine/editor/scene/gui/virtual_joystick_editor_plugin.h b/engine/editor/scene/gui/virtual_joystick_editor_plugin.h
deleted file mode 100644
index 783d6c46..00000000
--- a/engine/editor/scene/gui/virtual_joystick_editor_plugin.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**************************************************************************/
-/*  virtual_joystick_editor_plugin.h                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "editor/plugins/editor_plugin.h"
-
-class CanvasItemEditor;
-class VirtualJoystick;
-
-class VirtualJoystickEditorPlugin : public EditorPlugin {
-	GDCLASS(VirtualJoystickEditorPlugin, EditorPlugin);
-
-	VirtualJoystick *virtual_joystick = nullptr;
-
-public:
-	void forward_canvas_draw_over_viewport(Control *p_viewport_control) override;
-
-	virtual void edit(Object *p_object) override;
-	virtual bool handles(Object *p_object) const override;
-};
diff --git a/engine/editor/scene/material_editor_plugin.cpp b/engine/editor/scene/material_editor_plugin.cpp
index 1d6e593e..a5554ebe 100644
--- a/engine/editor/scene/material_editor_plugin.cpp
+++ b/engine/editor/scene/material_editor_plugin.cpp
@@ -31,7 +31,6 @@
 #include "material_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -43,11 +42,8 @@
 #include "scene/gui/label.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/blit_material.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/particle_process_material.h"
-#include "scene/resources/sky.h"
-#include "servers/rendering/rendering_server.h"
 
 // 3D.
 #include "scene/3d/camera_3d.h"
@@ -400,9 +396,6 @@ MaterialEditor::MaterialEditor() {
 
 	Vector2 stored_rot = EditorSettings::get_singleton()->get_project_metadata("inspector_options", "material_preview_rotation", Vector2());
 	_set_rotation(stored_rot.x, stored_rot.y);
-
-	EditorNode::get_singleton()->register_hdr_viewport(viewport);
-	EditorNode::get_singleton()->register_hdr_viewport(viewport_2d);
 }
 
 ///////////////////////
@@ -506,42 +499,3 @@ Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p
 	ERR_FAIL_COND_V(!Object::cast_to<CanvasItemMaterial>(*p_resource) || !Object::cast_to<CanvasItemMaterial>(*p_resource)->_is_initialized(), Ref<CanvasItemMaterial>());
 	return MaterialEditor::make_shader_material(p_resource);
 }
-
-String BlitMaterialConversionPlugin::converts_to() const {
-	return "ShaderMaterial";
-}
-
-bool BlitMaterialConversionPlugin::handles(const Ref<Resource> &p_resource) const {
-	Ref<BlitMaterial> mat = p_resource;
-	return mat.is_valid();
-}
-
-Ref<Resource> BlitMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const {
-	Ref<BlitMaterial> mat = p_resource;
-	ERR_FAIL_COND_V(mat.is_null(), Ref<Resource>());
-
-	Ref<ShaderMaterial> smat;
-	smat.instantiate();
-
-	Ref<Shader> shader;
-	shader.instantiate();
-
-	String code = RS::get_singleton()->shader_get_code(mat->get_shader_rid());
-
-	shader->set_code(code);
-
-	smat->set_shader(shader);
-
-	List<PropertyInfo> params;
-	RS::get_singleton()->get_shader_parameter_list(mat->get_shader_rid(), &params);
-
-	for (const PropertyInfo &E : params) {
-		Variant value = RS::get_singleton()->material_get_param(mat->get_rid(), E.name);
-		smat->set_shader_parameter(E.name, value);
-	}
-
-	smat->set_render_priority(mat->get_render_priority());
-	smat->set_local_to_scene(mat->is_local_to_scene());
-	smat->set_name(mat->get_name());
-	return smat;
-}
diff --git a/engine/editor/scene/material_editor_plugin.h b/engine/editor/scene/material_editor_plugin.h
index c6c02c8d..f79f748c 100644
--- a/engine/editor/scene/material_editor_plugin.h
+++ b/engine/editor/scene/material_editor_plugin.h
@@ -153,12 +153,3 @@ public:
 	virtual bool handles(const Ref<Resource> &p_resource) const override;
 	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
-
-class BlitMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(BlitMaterialConversionPlugin, EditorResourceConversionPlugin);
-
-public:
-	virtual String converts_to() const override;
-	virtual bool handles(const Ref<Resource> &p_resource) const override;
-	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/editor/scene/packed_scene_editor_plugin.cpp b/engine/editor/scene/packed_scene_editor_plugin.cpp
index e96ee2ff..339331d6 100644
--- a/engine/editor/scene/packed_scene_editor_plugin.cpp
+++ b/engine/editor/scene/packed_scene_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "packed_scene_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 
diff --git a/engine/editor/scene/packed_scene_editor_plugin.h b/engine/editor/scene/packed_scene_editor_plugin.h
index ba22cf75..2463f191 100644
--- a/engine/editor/scene/packed_scene_editor_plugin.h
+++ b/engine/editor/scene/packed_scene_editor_plugin.h
@@ -34,8 +34,6 @@
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
 
-class PackedScene;
-
 class PackedSceneEditor : public VBoxContainer {
 	GDCLASS(PackedSceneEditor, VBoxContainer);
 
diff --git a/engine/editor/scene/particle_process_material_editor_plugin.cpp b/engine/editor/scene/particle_process_material_editor_plugin.cpp
index b5dc7587..cd06fbb4 100644
--- a/engine/editor/scene/particle_process_material_editor_plugin.cpp
+++ b/engine/editor/scene/particle_process_material_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "particle_process_material_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/scene/particles_editor_plugin.cpp b/engine/editor/scene/particles_editor_plugin.cpp
index 5f17b5c0..b2815b00 100644
--- a/engine/editor/scene/particles_editor_plugin.cpp
+++ b/engine/editor/scene/particles_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "particles_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/editor/scene/rename_dialog.cpp b/engine/editor/scene/rename_dialog.cpp
index fbb263a0..bc10fb22 100644
--- a/engine/editor/scene/rename_dialog.cpp
+++ b/engine/editor/scene/rename_dialog.cpp
@@ -30,8 +30,6 @@
 
 #include "rename_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -45,7 +43,6 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/tab_container.h"
-#include "scene/main/scene_tree.h"
 
 #include "modules/regex/regex.h"
 
diff --git a/engine/editor/scene/reparent_dialog.cpp b/engine/editor/scene/reparent_dialog.cpp
index 07475df5..fae52a27 100644
--- a/engine/editor/scene/reparent_dialog.cpp
+++ b/engine/editor/scene/reparent_dialog.cpp
@@ -30,8 +30,6 @@
 
 #include "reparent_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/scene/scene_tree_editor.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
diff --git a/engine/editor/scene/resource_preloader_editor_plugin.cpp b/engine/editor/scene/resource_preloader_editor_plugin.cpp
index dda2c1d9..944c05a7 100644
--- a/engine/editor/scene/resource_preloader_editor_plugin.cpp
+++ b/engine/editor/scene/resource_preloader_editor_plugin.cpp
@@ -31,8 +31,6 @@
 #include "resource_preloader_editor_plugin.h"
 
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
diff --git a/engine/editor/scene/resource_preloader_editor_plugin.h b/engine/editor/scene/resource_preloader_editor_plugin.h
index ea56b56f..a6fe3694 100644
--- a/engine/editor/scene/resource_preloader_editor_plugin.h
+++ b/engine/editor/scene/resource_preloader_editor_plugin.h
@@ -92,6 +92,7 @@ class ResourcePreloaderEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "ResourcePreloader"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/scene_create_dialog.cpp b/engine/editor/scene/scene_create_dialog.cpp
index 30d20736..242ff514 100644
--- a/engine/editor/scene/scene_create_dialog.cpp
+++ b/engine/editor/scene/scene_create_dialog.cpp
@@ -31,8 +31,6 @@
 #include "scene_create_dialog.h"
 
 #include "core/io/dir_access.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/create_dialog.h"
@@ -64,10 +62,10 @@ void SceneCreateDialog::_notification(int p_what) {
 	}
 }
 
-void SceneCreateDialog::config(const String &p_dir, const String &p_scene_name) {
+void SceneCreateDialog::config(const String &p_dir) {
 	directory = p_dir;
 	root_name_edit->set_text("");
-	scene_name_edit->set_text(p_scene_name.get_basename());
+	scene_name_edit->set_text("");
 	callable_mp((Control *)scene_name_edit, &Control::grab_focus).call_deferred(false);
 	validation_panel->update();
 
@@ -104,7 +102,7 @@ void SceneCreateDialog::update_dialog() {
 	scene_name = scene_name_edit->get_text().strip_edges();
 
 	if (scene_name.is_empty()) {
-		validation_panel->set_message(MSG_ID_PATH, TTRC("Scene name is empty."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_PATH, TTR("Scene name is empty."), EditorValidationPanel::MSG_ERROR);
 	}
 
 	if (validation_panel->is_valid()) {
@@ -115,16 +113,16 @@ void SceneCreateDialog::update_dialog() {
 	}
 
 	if (validation_panel->is_valid() && !scene_name.is_valid_filename()) {
-		validation_panel->set_message(MSG_ID_PATH, TTRC("File name invalid."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_PATH, TTR("File name invalid."), EditorValidationPanel::MSG_ERROR);
 	} else if (validation_panel->is_valid() && scene_name[0] == '.') {
-		validation_panel->set_message(MSG_ID_PATH, TTRC("File name begins with a dot."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_PATH, TTR("File name begins with a dot."), EditorValidationPanel::MSG_ERROR);
 	}
 
 	if (validation_panel->is_valid()) {
 		scene_name = directory.path_join(scene_name);
 		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 		if (da->file_exists(scene_name)) {
-			validation_panel->set_message(MSG_ID_PATH, TTRC("File already exists."), EditorValidationPanel::MSG_ERROR);
+			validation_panel->set_message(MSG_ID_PATH, TTR("File already exists."), EditorValidationPanel::MSG_ERROR);
 		}
 	}
 
@@ -149,9 +147,9 @@ void SceneCreateDialog::update_dialog() {
 	}
 
 	if (root_name.is_empty()) {
-		validation_panel->set_message(MSG_ID_ROOT, TTRC("Invalid root node name."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_ROOT, TTR("Invalid root node name."), EditorValidationPanel::MSG_ERROR);
 	} else if (root_name != root_name.validate_node_name()) {
-		validation_panel->set_message(MSG_ID_ROOT, TTRC("Invalid root node name characters have been replaced."), EditorValidationPanel::MSG_WARNING);
+		validation_panel->set_message(MSG_ID_ROOT, TTR("Invalid root node name characters have been replaced."), EditorValidationPanel::MSG_WARNING);
 	}
 }
 
@@ -159,10 +157,6 @@ String SceneCreateDialog::get_scene_path() const {
 	return scene_name;
 }
 
-String SceneCreateDialog::get_root_name() const {
-	return root_name;
-}
-
 Node *SceneCreateDialog::create_scene_root() {
 	ERR_FAIL_NULL_V(node_type_group->get_pressed_button(), nullptr);
 	RootType type = (RootType)node_type_group->get_pressed_button()->get_meta(type_meta).operator int();
@@ -308,8 +302,8 @@ SceneCreateDialog::SceneCreateDialog() {
 
 	validation_panel = memnew(EditorValidationPanel);
 	main_vb->add_child(validation_panel);
-	validation_panel->add_line(MSG_ID_PATH, TTRC("Scene name is valid."));
-	validation_panel->add_line(MSG_ID_ROOT, TTRC("Root node valid."));
+	validation_panel->add_line(MSG_ID_PATH, TTR("Scene name is valid."));
+	validation_panel->add_line(MSG_ID_ROOT, TTR("Root node valid."));
 	validation_panel->set_update_callback(callable_mp(this, &SceneCreateDialog::update_dialog));
 	validation_panel->set_accept_button(get_ok_button());
 
diff --git a/engine/editor/scene/scene_create_dialog.h b/engine/editor/scene/scene_create_dialog.h
index 68375ecc..3252682e 100644
--- a/engine/editor/scene/scene_create_dialog.h
+++ b/engine/editor/scene/scene_create_dialog.h
@@ -89,10 +89,9 @@ protected:
 	void _notification(int p_what);
 
 public:
-	void config(const String &p_dir, const String &p_scene_name = "");
+	void config(const String &p_dir);
 
 	String get_scene_path() const;
-	String get_root_name() const;
 	Node *create_scene_root();
 
 	SceneCreateDialog();
diff --git a/engine/editor/scene/scene_tree_editor.cpp b/engine/editor/scene/scene_tree_editor.cpp
index 505a78d5..78f0f489 100644
--- a/engine/editor/scene/scene_tree_editor.cpp
+++ b/engine/editor/scene/scene_tree_editor.cpp
@@ -30,11 +30,7 @@
 
 #include "scene_tree_editor.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/docks/editor_dock_manager.h"
@@ -44,18 +40,14 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_file_system.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/node_2d.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 
@@ -351,7 +343,7 @@ void SceneTreeEditor::_update_node_subtree(Node *p_node, TreeItem *p_parent, boo
 
 	_update_node(p_node, item, part_of_subscene);
 	I->value.dirty = false;
-	I->value.can_process = is_scene_tree_dock && p_node->can_process();
+	I->value.can_process = p_node->can_process();
 
 	// Force update all our children if we are new or if we were forced to update.
 	bool force_update_children = p_force || is_new;
@@ -475,7 +467,7 @@ void SceneTreeEditor::_update_node(Node *p_node, TreeItem *p_item, bool p_part_o
 		p_item->set_text(0, node_name);
 		p_item->set_selectable(0, marked_selectable);
 		_set_item_custom_color(p_item, get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
-	} else if (is_scene_tree_dock && !p_node->can_process()) {
+	} else if (!p_node->can_process()) {
 		_set_item_custom_color(p_item, get_theme_color(SNAME("font_disabled_color"), EditorStringName(Editor)));
 	} else if (!marked_selectable && !marked_children_selectable) {
 		Node *node = p_node;
@@ -992,17 +984,6 @@ void SceneTreeEditor::_update_tree(bool p_scroll_to_selected) {
 }
 
 bool SceneTreeEditor::_update_filter(TreeItem *p_parent, bool p_scroll_to_selected) {
-	TreeItem *last_selected = nullptr;
-	bool result = _update_filter_helper(p_parent, p_scroll_to_selected, last_selected);
-	if (p_scroll_to_selected && last_selected) {
-		// Scrolling to the first selected in the _update_filter call above followed by the last
-		// selected here is enough to frame all selected items as well as possible.
-		callable_mp(tree, &Tree::scroll_to_item).call_deferred(last_selected, false);
-	}
-	return result;
-}
-
-bool SceneTreeEditor::_update_filter_helper(TreeItem *p_parent, bool p_scroll_to_selected, TreeItem *&r_last_selected) {
 	if (!p_parent) {
 		p_parent = tree->get_root();
 		filter_term_warning.clear();
@@ -1057,8 +1038,7 @@ bool SceneTreeEditor::_update_filter_helper(TreeItem *p_parent, bool p_scroll_to
 	bool keep_for_children = false;
 	for (TreeItem *child = p_parent->get_first_child(); child; child = child->get_next()) {
 		// Always keep if at least one of the children are kept.
-		// Only scroll if we haven't already found a child to scroll to.
-		keep_for_children = _update_filter_helper(child, p_scroll_to_selected && !keep_for_children, r_last_selected) || keep_for_children;
+		keep_for_children = _update_filter(child, p_scroll_to_selected) || keep_for_children;
 	}
 
 	if (!is_root) {
@@ -1130,13 +1110,9 @@ bool SceneTreeEditor::_update_filter_helper(TreeItem *p_parent, bool p_scroll_to
 	if (editor_selection) {
 		Node *n = get_node(p_parent->get_metadata(0));
 		if (selectable) {
-			if (n && editor_selection->is_selected(n)) {
-				if (p_scroll_to_selected) {
-					// Needs to be deferred to account for possible root visibility change.
-					callable_mp(tree, &Tree::scroll_to_item).call_deferred(p_parent, false);
-				} else {
-					r_last_selected = p_parent;
-				}
+			if (p_scroll_to_selected && n && editor_selection->is_selected(n)) {
+				// Needs to be deferred to account for possible root visibility change.
+				callable_mp(tree, &Tree::scroll_to_item).call_deferred(p_parent, false);
 			}
 		}
 	}
@@ -1394,7 +1370,7 @@ void SceneTreeEditor::_notification(int p_what) {
 
 		case NOTIFICATION_THEME_CHANGED: {
 			// Wait for the node to be inspected before triggering the unfolding.
-			tree->add_theme_constant_override("dragging_unfold_wait_msec", (float)EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds") * 1000 * 2);
+			tree->add_theme_constant_override("dragging_unfold_wait_msec", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000 * 2);
 			tree->add_theme_constant_override("icon_max_width", get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
 			[[fallthrough]];
 		}
@@ -1469,10 +1445,11 @@ void SceneTreeEditor::set_selected(Node *p_node, bool p_emit_selected) {
 	if (selected == p_node) {
 		return;
 	}
-	selected = p_node;
 
 	TreeItem *item = p_node ? _find(tree->get_root(), p_node->get_path()) : nullptr;
+
 	if (item) {
+		selected = p_node;
 		if (auto_expand_selected) {
 			// Make visible when it's collapsed.
 			TreeItem *node = item->get_parent();
@@ -1501,6 +1478,11 @@ void SceneTreeEditor::set_selected(Node *p_node, bool p_emit_selected) {
 				tree->ensure_cursor_is_visible();
 			}
 		}
+	} else {
+		if (!p_node) {
+			selected = nullptr;
+		}
+		selected = p_node;
 	}
 
 	if (p_emit_selected) {
@@ -2340,6 +2322,7 @@ void SceneTreeDialog::_notification(int p_what) {
 }
 
 void SceneTreeDialog::_update_valid_type_icons() {
+	filter->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 	for (TextureRect *trect : valid_type_icons) {
 		trect->set_custom_minimum_size(Vector2(get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)), 0));
 		trect->set_texture(trect->get_meta("icon"));
@@ -2366,16 +2349,23 @@ void SceneTreeDialog::_filter_changed(const String &p_filter) {
 	tree->set_filter(p_filter);
 }
 
+void SceneTreeDialog::_on_filter_gui_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			tree->get_scene_tree()->gui_input(key);
+			filter->accept_event();
+		}
+	}
+}
+
 void SceneTreeDialog::_bind_methods() {
 	ClassDB::bind_method("_cancel", &SceneTreeDialog::_cancel);
 
 	ADD_SIGNAL(MethodInfo("selected", PropertyInfo(Variant::NODE_PATH, "path")));
 }
 
-LineEdit *SceneTreeDialog::get_filter_line_edit() {
-	return filter;
-}
-
 SceneTreeDialog::SceneTreeDialog() {
 	set_title(TTRC("Select a Node"));
 	content = memnew(VBoxContainer);
@@ -2384,11 +2374,13 @@ SceneTreeDialog::SceneTreeDialog() {
 	HBoxContainer *filter_hbc = memnew(HBoxContainer);
 	content->add_child(filter_hbc);
 
-	filter = memnew(FilterLineEdit);
+	filter = memnew(LineEdit);
 	filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	filter->set_placeholder(TTRC("Filter Nodes"));
+	filter->set_clear_button_enabled(true);
 	filter->add_theme_constant_override("minimum_character_width", 0);
 	filter->connect(SceneStringName(text_changed), callable_mp(this, &SceneTreeDialog::_filter_changed));
+	filter->connect(SceneStringName(gui_input), callable_mp(this, &SceneTreeDialog::_on_filter_gui_input));
 
 	register_text_enter(filter);
 
@@ -2408,7 +2400,6 @@ SceneTreeDialog::SceneTreeDialog() {
 	content->add_child(mc);
 
 	tree = memnew(SceneTreeEditor(false, false, true));
-	filter->set_forward_control(tree->get_scene_tree());
 	tree->set_update_when_invisible(false);
 	tree->get_scene_tree()->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
 	tree->get_scene_tree()->connect("item_activated", callable_mp(this, &SceneTreeDialog::_select));
diff --git a/engine/editor/scene/scene_tree_editor.h b/engine/editor/scene/scene_tree_editor.h
index cc8ea568..08e06056 100644
--- a/engine/editor/scene/scene_tree_editor.h
+++ b/engine/editor/scene/scene_tree_editor.h
@@ -30,14 +30,12 @@
 
 #pragma once
 
+#include "scene/gui/check_box.h"
+#include "scene/gui/check_button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 
-class CheckBox;
-class CheckButton;
 class EditorSelection;
-class FilterLineEdit;
-class Label;
 class TextureRect;
 class Timer;
 
@@ -147,7 +145,6 @@ class SceneTreeEditor : public Control {
 
 	void _test_update_tree();
 	bool _update_filter(TreeItem *p_parent = nullptr, bool p_scroll_to_selected = false);
-	bool _update_filter_helper(TreeItem *p_parent, bool p_scroll_to_selected, TreeItem *&r_last_selected);
 	bool _node_matches_class_term(const Node *p_item_node, const String &p_term);
 	bool _item_matches_all_terms(TreeItem *p_item, const PackedStringArray &p_terms);
 	void _tree_changed();
@@ -228,7 +225,7 @@ class SceneTreeEditor : public Control {
 	void _revoke_unique_name();
 
 public:
-	// Public for use as signal callback.
+	// Public for use with callable_mp.
 	void _update_tree(bool p_scroll_to_selected = false);
 
 	void rename_node(Node *p_node, const String &p_name, TreeItem *p_item = nullptr);
@@ -274,7 +271,7 @@ class SceneTreeDialog : public ConfirmationDialog {
 
 	VBoxContainer *content = nullptr;
 	SceneTreeEditor *tree = nullptr;
-	FilterLineEdit *filter = nullptr;
+	LineEdit *filter = nullptr;
 	CheckButton *show_all_nodes = nullptr;
 	LocalVector<TextureRect *> valid_type_icons;
 	HBoxContainer *allowed_types_hbox = nullptr;
@@ -283,6 +280,7 @@ class SceneTreeDialog : public ConfirmationDialog {
 	void _cancel();
 	void _selected_changed();
 	void _filter_changed(const String &p_filter);
+	void _on_filter_gui_input(const Ref<InputEvent> &p_event);
 	void _show_all_nodes_changed(bool p_button_pressed);
 
 protected:
@@ -295,7 +293,7 @@ public:
 	void set_valid_types(const Vector<StringName> &p_valid);
 
 	SceneTreeEditor *get_scene_tree() { return tree; }
-	LineEdit *get_filter_line_edit();
+	LineEdit *get_filter_line_edit() { return filter; }
 
 	SceneTreeDialog();
 };
diff --git a/engine/editor/scene/sprite_frames_editor_plugin.cpp b/engine/editor/scene/sprite_frames_editor_plugin.cpp
index 0ff33bdf..6268bb03 100644
--- a/engine/editor/scene/sprite_frames_editor_plugin.cpp
+++ b/engine/editor/scene/sprite_frames_editor_plugin.cpp
@@ -30,10 +30,7 @@
 
 #include "sprite_frames_editor_plugin.h"
 
-#include "core/input/input.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/editor_dock_manager.h"
@@ -56,7 +53,6 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 
 static void _draw_shadowed_line(Control *p_control, const Point2 &p_from, const Size2 &p_size, const Size2 &p_shadow_offset, Color p_color, Color p_shadow_color) {
diff --git a/engine/editor/scene/sprite_frames_editor_plugin.h b/engine/editor/scene/sprite_frames_editor_plugin.h
index 63673b40..923d1919 100644
--- a/engine/editor/scene/sprite_frames_editor_plugin.h
+++ b/engine/editor/scene/sprite_frames_editor_plugin.h
@@ -319,6 +319,7 @@ class SpriteFramesEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "SpriteFrames"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/scene/texture/bit_map_editor_plugin.cpp b/engine/editor/scene/texture/bit_map_editor_plugin.cpp
index ae2e5451..22805d3d 100644
--- a/engine/editor/scene/texture/bit_map_editor_plugin.cpp
+++ b/engine/editor/scene/texture/bit_map_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "bit_map_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/aspect_ratio_container.h"
diff --git a/engine/editor/scene/texture/color_channel_selector.cpp b/engine/editor/scene/texture/color_channel_selector.cpp
index 1f966821..32325b4a 100644
--- a/engine/editor/scene/texture/color_channel_selector.cpp
+++ b/engine/editor/scene/texture/color_channel_selector.cpp
@@ -30,13 +30,11 @@
 
 #include "color_channel_selector.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/resources/style_box.h"
+#include "scene/resources/style_box_flat.h"
 
 ColorChannelSelector::ColorChannelSelector() {
 	toggle_button = memnew(Button);
diff --git a/engine/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp b/engine/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp
index 995a759e..1dfa2a39 100644
--- a/engine/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp
+++ b/engine/editor/scene/texture/gradient_texture_2d_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "gradient_texture_2d_editor_plugin.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/themes/editor_scale.h"
diff --git a/engine/editor/scene/texture/texture_3d_editor_plugin.cpp b/engine/editor/scene/texture/texture_3d_editor_plugin.cpp
index b2ab6c78..174f643b 100644
--- a/engine/editor/scene/texture/texture_3d_editor_plugin.cpp
+++ b/engine/editor/scene/texture/texture_3d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "texture_3d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/texture/color_channel_selector.h"
 #include "editor/themes/editor_scale.h"
@@ -188,7 +187,7 @@ void Texture3DEditor::_update_gui() {
 	}
 
 	const uint32_t components_mask = Image::get_format_component_mask(format);
-	if (Math::is_power_of_2(components_mask)) {
+	if (is_power_of_2(components_mask)) {
 		// Only one channel available, no point in showing a channel selector.
 		channel_selector->hide();
 	} else {
diff --git a/engine/editor/scene/texture/texture_3d_editor_plugin.h b/engine/editor/scene/texture/texture_3d_editor_plugin.h
index 010d48db..36e1cea3 100644
--- a/engine/editor/scene/texture/texture_3d_editor_plugin.h
+++ b/engine/editor/scene/texture/texture_3d_editor_plugin.h
@@ -33,7 +33,6 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/spin_box.h"
-#include "scene/resources/material.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 
diff --git a/engine/editor/scene/texture/texture_editor_plugin.cpp b/engine/editor/scene/texture/texture_editor_plugin.cpp
index ee375ca6..e674c3f4 100644
--- a/engine/editor/scene/texture/texture_editor_plugin.cpp
+++ b/engine/editor/scene/texture/texture_editor_plugin.cpp
@@ -30,32 +30,25 @@
 
 #include "texture_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/texture/color_channel_selector.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/label.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/animated_texture.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/compressed_texture.h"
 #include "scene/resources/dpi_texture.h"
-#include "scene/resources/gradient_texture.h"
 #include "scene/resources/image_texture.h"
-#include "scene/resources/material.h"
 #include "scene/resources/portable_compressed_texture.h"
-#include "scene/resources/texture_rd.h"
-#include "servers/rendering/rendering_device.h"
 
 constexpr const char *texture_2d_shader_code = R"(
 shader_type canvas_item;
 render_mode blend_mix;
 
 instance uniform vec4 u_channel_factors = vec4(1.0);
-instance uniform float lod = 0.0;
 
 vec4 filter_preview_colors(vec4 input_color, vec4 factors) {
 	// Filter RGB.
@@ -76,7 +69,7 @@ vec4 filter_preview_colors(vec4 input_color, vec4 factors) {
 }
 
 void fragment() {
-	COLOR = filter_preview_colors(textureLod(TEXTURE, UV, lod), u_channel_factors);
+	COLOR = filter_preview_colors(texture(TEXTURE, UV), u_channel_factors);
 }
 )";
 
@@ -134,12 +127,25 @@ void TexturePreview::_update_texture_display_ratio() {
 }
 
 static Image::Format get_texture_2d_format(const Ref<Texture2D> &p_texture) {
-	const Ref<Texture2DRD> rd_texture = p_texture;
-	if (rd_texture.is_valid() && RD::get_singleton() && RD::get_singleton()->texture_is_valid(rd_texture->get_texture_rd_rid())) {
-		return rd_texture->get_image()->get_format();
+	const Ref<ImageTexture> image_texture = p_texture;
+	if (image_texture.is_valid()) {
+		return image_texture->get_format();
 	}
 
-	return p_texture->get_format();
+	const Ref<CompressedTexture2D> compressed_texture = p_texture;
+	if (compressed_texture.is_valid()) {
+		return compressed_texture->get_format();
+	}
+
+	const Ref<PortableCompressedTexture2D> portable_compressed_texture = p_texture;
+	if (portable_compressed_texture.is_valid()) {
+		return portable_compressed_texture->get_format();
+	}
+
+	// AtlasTexture?
+
+	// Unknown
+	return Image::FORMAT_MAX;
 }
 
 static int get_texture_mipmaps_count(const Ref<Texture2D> &p_texture) {
@@ -148,8 +154,6 @@ static int get_texture_mipmaps_count(const Ref<Texture2D> &p_texture) {
 	// We are having to download the image only to get its mipmaps count. It would be nice if we didn't have to.
 	Ref<Image> image;
 	Ref<AtlasTexture> at = p_texture;
-	Ref<Texture2DRD> rd_texture = p_texture;
-
 	if (at.is_valid()) {
 		// The AtlasTexture tries to obtain the region from the atlas as an image,
 		// which will fail if it is a compressed format.
@@ -157,11 +161,6 @@ static int get_texture_mipmaps_count(const Ref<Texture2D> &p_texture) {
 		if (atlas.is_valid()) {
 			image = atlas->get_image();
 		}
-	} else if (rd_texture.is_valid()) {
-		if (RD::get_singleton() && RD::get_singleton()->texture_is_valid(rd_texture->get_texture_rd_rid())) {
-			return -1;
-		}
-		image = p_texture->get_image();
 	} else {
 		image = p_texture->get_image();
 	}
@@ -176,21 +175,12 @@ void TexturePreview::_update_metadata_label_text() {
 	const Ref<Texture2D> texture = texture_display->get_texture();
 	ERR_FAIL_COND(texture.is_null());
 
-	Image::Format format;
-	int mipmaps;
-
-	Ref<Image> image = texture->get_image();
-	if (image.is_valid()) {
-		format = image->get_format();
-		mipmaps = image->get_mipmap_count();
-	} else {
-		format = get_texture_2d_format(texture.ptr());
-		mipmaps = get_texture_mipmaps_count(texture);
-	}
+	const Image::Format format = get_texture_2d_format(texture.ptr());
 
 	const String format_name = format != Image::FORMAT_MAX ? Image::get_format_name(format) : texture->get_class();
 
 	const Vector2i resolution = texture->get_size();
+	const int mipmaps = get_texture_mipmaps_count(texture);
 
 	if (format != Image::FORMAT_MAX) {
 		// Avoid signed integer overflow that could occur with huge texture sizes by casting everything to uint64_t.
@@ -239,10 +229,6 @@ void TexturePreview::on_selected_channels_changed() {
 	texture_display->set_instance_shader_parameter("u_channel_factors", channel_selector->get_selected_channel_factors());
 }
 
-void TexturePreview::on_selected_mipmap_changed(double p_value) {
-	texture_display->set_instance_shader_parameter("lod", mipmap_spinbox->get_value());
-}
-
 TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
 	set_custom_minimum_size(Size2(0.0, 256.0) * EDSCALE);
 
@@ -290,23 +276,8 @@ TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
 	const Image::Format format = p_texture.is_valid() ? get_texture_2d_format(p_texture.ptr()) : Image::FORMAT_MAX;
 	const uint32_t components_mask = format != Image::FORMAT_MAX ? Image::get_format_component_mask(format) : 0xf;
 
-	// Setup Mipmap selector.
-	const int mipmaps = get_texture_mipmaps_count(p_texture);
-	if (mipmaps > 0) {
-		mipmap_spinbox = memnew(SpinBox);
-		mipmap_spinbox->set_tooltip_text(TTRC("Mipmap level index selector."));
-		mipmap_spinbox->set_max(mipmaps);
-		mipmap_spinbox->set_modulate(Color(1, 1, 1, 0.8));
-		mipmap_spinbox->set_h_grow_direction(GROW_DIRECTION_BEGIN);
-		mipmap_spinbox->set_h_size_flags(Control::SIZE_SHRINK_END);
-		mipmap_spinbox->set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
-		mipmap_spinbox->set_anchors_preset(Control::PRESET_TOP_RIGHT);
-		mipmap_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &TexturePreview::on_selected_mipmap_changed));
-		add_child(mipmap_spinbox);
-	}
-
 	// Add color channel selector at the bottom left if more than 1 channel is available.
-	if (p_show_metadata && !Math::is_power_of_2(components_mask)) {
+	if (p_show_metadata && !is_power_of_2(components_mask)) {
 		channel_selector = memnew(ColorChannelSelector);
 		channel_selector->connect("selected_channels_changed", callable_mp(this, &TexturePreview::on_selected_channels_changed));
 		channel_selector->set_h_size_flags(Control::SIZE_SHRINK_BEGIN);
@@ -340,27 +311,7 @@ TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
 }
 
 bool EditorInspectorPluginTexture::can_handle(Object *p_object) {
-	if (Object::cast_to<GradientTexture1D>(p_object) || Object::cast_to<GradientTexture2D>(p_object)) {
-		return false;
-	}
-
-	if (Object::cast_to<Image>(p_object) != nullptr ||
-			Object::cast_to<ImageTexture>(p_object) != nullptr ||
-			Object::cast_to<AtlasTexture>(p_object) != nullptr ||
-			Object::cast_to<CompressedTexture2D>(p_object) != nullptr ||
-			Object::cast_to<PortableCompressedTexture2D>(p_object) != nullptr ||
-			Object::cast_to<AnimatedTexture>(p_object) != nullptr ||
-			Object::cast_to<DPITexture>(p_object) != nullptr ||
-			Object::cast_to<Texture2DRD>(p_object) != nullptr) {
-		return true;
-	}
-
-	Ref<Texture2D> texture_2d(Object::cast_to<Texture2D>(p_object));
-	if (texture_2d.is_valid()) {
-		this_image = texture_2d->get_image();
-		return this_image.is_valid();
-	}
-	return false;
+	return Object::cast_to<ImageTexture>(p_object) != nullptr || Object::cast_to<AtlasTexture>(p_object) != nullptr || Object::cast_to<CompressedTexture2D>(p_object) != nullptr || Object::cast_to<PortableCompressedTexture2D>(p_object) != nullptr || Object::cast_to<AnimatedTexture>(p_object) != nullptr || Object::cast_to<DPITexture>(p_object) != nullptr || Object::cast_to<Image>(p_object) != nullptr;
 }
 
 void EditorInspectorPluginTexture::parse_begin(Object *p_object) {
diff --git a/engine/editor/scene/texture/texture_editor_plugin.h b/engine/editor/scene/texture/texture_editor_plugin.h
index c9f0cdc4..d66aa46a 100644
--- a/engine/editor/scene/texture/texture_editor_plugin.h
+++ b/engine/editor/scene/texture/texture_editor_plugin.h
@@ -40,7 +40,6 @@ class ColorRect;
 class TextureRect;
 class ShaderMaterial;
 class ColorChannelSelector;
-class SpinBox;
 
 class TexturePreview : public MarginContainer {
 	GDCLASS(TexturePreview, MarginContainer);
@@ -62,7 +61,6 @@ private:
 	static inline Ref<ShaderMaterial> texture_material;
 
 	ColorChannelSelector *channel_selector = nullptr;
-	SpinBox *mipmap_spinbox = nullptr;
 
 	void _draw_outline();
 	void _update_metadata_label_text();
@@ -70,8 +68,8 @@ private:
 protected:
 	void _notification(int p_what);
 	void _update_texture_display_ratio();
+
 	void on_selected_channels_changed();
-	void on_selected_mipmap_changed(double p_value);
 
 public:
 	static void init_shaders();
@@ -84,8 +82,6 @@ public:
 class EditorInspectorPluginTexture : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin);
 
-	Ref<Image> this_image;
-
 public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual void parse_begin(Object *p_object) override;
diff --git a/engine/editor/scene/texture/texture_layered_editor_plugin.cpp b/engine/editor/scene/texture/texture_layered_editor_plugin.cpp
index 3c2d6fbb..c2a05943 100644
--- a/engine/editor/scene/texture/texture_layered_editor_plugin.cpp
+++ b/engine/editor/scene/texture/texture_layered_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "texture_layered_editor_plugin.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/texture/color_channel_selector.h"
 #include "editor/themes/editor_scale.h"
@@ -153,8 +151,8 @@ void TextureLayeredEditor::gui_input(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventMouseMotion> mm = p_event;
 	if (mm.is_valid() && mm->get_button_mask().has_flag(MouseButtonMask::RIGHT)) {
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_VISIBLE) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_VISIBLE) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 		}
 
 		y_rot += mm->get_relative().x * 0.01;
@@ -165,10 +163,10 @@ void TextureLayeredEditor::gui_input(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::RIGHT) {
-		if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			Input::get_singleton()->warp_mouse(original_mouse_pos);
-		} else if (Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_VISIBLE) {
+		} else if (Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_VISIBLE) {
 			original_mouse_pos = mb->get_global_position();
 		}
 	}
@@ -242,7 +240,7 @@ void TextureLayeredEditor::_update_gui() {
 	info->set_text(texture_info);
 
 	const uint32_t components_mask = Image::get_format_component_mask(format);
-	if (Math::is_power_of_2(components_mask)) {
+	if (is_power_of_2(components_mask)) {
 		// Only one channel available, no point in showing a channel selector.
 		channel_selector->hide();
 	} else {
diff --git a/engine/editor/scene/texture/texture_layered_editor_plugin.h b/engine/editor/scene/texture/texture_layered_editor_plugin.h
index 368caf2a..a8c20f5a 100644
--- a/engine/editor/scene/texture/texture_layered_editor_plugin.h
+++ b/engine/editor/scene/texture/texture_layered_editor_plugin.h
@@ -33,7 +33,6 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/spin_box.h"
-#include "scene/resources/material.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 
diff --git a/engine/editor/scene/texture/texture_region_editor_plugin.cpp b/engine/editor/scene/texture/texture_region_editor_plugin.cpp
index b72346b2..e74eaf5d 100644
--- a/engine/editor/scene/texture/texture_region_editor_plugin.cpp
+++ b/engine/editor/scene/texture/texture_region_editor_plugin.cpp
@@ -31,8 +31,6 @@
 #include "texture_region_editor_plugin.h"
 
 #include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -47,10 +45,8 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/view_panner.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/style_box_texture.h"
-#include "servers/rendering/rendering_server.h"
 
 Transform2D TextureRegionEditor::_get_offset_transform() const {
 	Transform2D mtx;
@@ -845,7 +841,7 @@ void TextureRegionEditor::_notification(int p_what) {
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("editors/panning")) {
 				panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-				panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+				panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 			}
 		} break;
 
@@ -858,7 +854,7 @@ void TextureRegionEditor::_notification(int p_what) {
 			}
 
 			panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
-			panner->setup_warped_panning(this, EDITOR_GET("editors/panning/warped_mouse_panning"));
+			panner->setup_warped_panning(get_viewport(), EDITOR_GET("editors/panning/warped_mouse_panning"));
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
diff --git a/engine/editor/script/editor_script.cpp b/engine/editor/script/editor_script.cpp
index 2f2a1cb2..2dff5ba9 100644
--- a/engine/editor/script/editor_script.cpp
+++ b/engine/editor/script/editor_script.cpp
@@ -30,10 +30,12 @@
 
 #include "editor_script.h"
 
-#include "core/object/class_db.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
+#include "editor/editor_undo_redo_manager.h"
+#include "editor/scene/editor_scene_tabs.h"
 #include "scene/main/node.h"
+#include "scene/resources/packed_scene.h"
 
 #ifndef DISABLE_DEPRECATED
 void EditorScript::add_root_node(Node *p_node) {
diff --git a/engine/editor/script/editor_script.h b/engine/editor/script/editor_script.h
index 3abc22b5..62d6553c 100644
--- a/engine/editor/script/editor_script.h
+++ b/engine/editor/script/editor_script.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 
 class EditorInterface;
diff --git a/engine/editor/script/editor_script_plugin.cpp b/engine/editor/script/editor_script_plugin.cpp
index 11ffda49..98711826 100644
--- a/engine/editor/script/editor_script_plugin.cpp
+++ b/engine/editor/script/editor_script_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_script_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_interface.h"
 #include "editor/script/editor_script.h"
 #include "editor/settings/editor_command_palette.h"
@@ -57,7 +55,7 @@ void EditorScriptPlugin::command_palette_about_to_popup() {
 	commands.clear();
 	ScriptServer::get_indirect_inheriters_list(SNAME("EditorScript"), &commands);
 	for (const StringName &command : commands) {
-		EditorInterface::get_singleton()->get_command_palette()->add_command(String(command).capitalize(), "editor_scripts/" + command, callable_mp(this, &EditorScriptPlugin::run_command).bind(command));
+		EditorInterface::get_singleton()->get_command_palette()->add_command(String(command).capitalize(), "editor_scripts/" + command, callable_mp(this, &EditorScriptPlugin::run_command), varray(command), nullptr);
 	}
 }
 
diff --git a/engine/editor/script/find_in_files.cpp b/engine/editor/script/find_in_files.cpp
index ff340d0c..d4aec5fc 100644
--- a/engine/editor/script/find_in_files.cpp
+++ b/engine/editor/script/find_in_files.cpp
@@ -32,8 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -50,7 +48,6 @@
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
-#include "scene/main/scene_tree.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
 
diff --git a/engine/editor/script/script_create_dialog.cpp b/engine/editor/script/script_create_dialog.cpp
index dec71517..85d28ccc 100644
--- a/engine/editor/script/script_create_dialog.cpp
+++ b/engine/editor/script/script_create_dialog.cpp
@@ -32,10 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
@@ -240,28 +237,28 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must
 	}
 
 	if (p.is_empty()) {
-		return TTRC("Path is empty.");
+		return TTR("Path is empty.");
 	}
 	if (p.get_file().get_basename().is_empty()) {
-		return TTRC("Filename is empty.");
+		return TTR("Filename is empty.");
 	}
 
 	if (!p.get_file().get_basename().is_valid_filename()) {
-		return TTRC("Filename is invalid.");
+		return TTR("Filename is invalid.");
 	}
 	if (p.get_file().begins_with(".")) {
-		return TTRC("Name begins with a dot.");
+		return TTR("Name begins with a dot.");
 	}
 
 	p = ProjectSettings::get_singleton()->localize_path(p);
 	if (!p.begins_with("res://")) {
-		return TTRC("Path is not local.");
+		return TTR("Path is not local.");
 	}
 
 	{
 		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 		if (da->change_dir(p.get_base_dir()) != OK) {
-			return TTRC("Base path is invalid.");
+			return TTR("Base path is invalid.");
 		}
 	}
 
@@ -269,9 +266,9 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must
 		// Check if file exists.
 		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 		if (da->dir_exists(p)) {
-			return TTRC("A directory with the same name exists.");
+			return TTR("A directory with the same name exists.");
 		} else if (p_file_must_exist && !da->file_exists(p)) {
-			return TTRC("File does not exist.");
+			return TTR("File does not exist.");
 		}
 	}
 
@@ -301,10 +298,10 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must
 	}
 
 	if (!found) {
-		return TTRC("Invalid extension.");
+		return TTR("Invalid extension.");
 	}
 	if (!match) {
-		return TTRC("Extension doesn't match chosen language.");
+		return TTR("Extension doesn't match chosen language.");
 	}
 
 	// Let ScriptLanguage do custom validation.
@@ -415,9 +412,6 @@ void ScriptCreateDialog::_load_exist() {
 
 void ScriptCreateDialog::_language_changed(int l) {
 	language = ScriptServer::get_language(l);
-	if (language == nullptr) {
-		return;
-	}
 
 	can_inherit_from_file = language->can_inherit_from_file();
 	supports_built_in = language->supports_builtin_mode();
@@ -532,9 +526,6 @@ void ScriptCreateDialog::_path_changed(const String &p_path) {
 }
 
 void ScriptCreateDialog::_update_template_menu() {
-	if (language == nullptr) {
-		return;
-	}
 	bool is_language_using_templates = language->is_using_templates();
 	template_menu->set_disabled(false);
 	template_menu->clear();
@@ -628,15 +619,15 @@ void ScriptCreateDialog::_update_dialog() {
 	// Is script path/name valid (order from top to bottom)?
 
 	if (!is_built_in && !is_path_valid) {
-		validation_panel->set_message(MSG_ID_SCRIPT, TTRC("Invalid path."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_SCRIPT, TTR("Invalid path."), EditorValidationPanel::MSG_ERROR);
 	}
 
 	if (!is_parent_name_valid && is_new_script_created) {
-		validation_panel->set_message(MSG_ID_SCRIPT, TTRC("Invalid inherited parent name or path."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_SCRIPT, TTR("Invalid inherited parent name or path."), EditorValidationPanel::MSG_ERROR);
 	}
 
 	if (validation_panel->is_valid() && !is_new_script_created) {
-		validation_panel->set_message(MSG_ID_SCRIPT, TTRC("File exists, it will be reused."), EditorValidationPanel::MSG_OK);
+		validation_panel->set_message(MSG_ID_SCRIPT, TTR("File exists, it will be reused."), EditorValidationPanel::MSG_OK);
 	}
 
 	if (!is_built_in && !path_error.is_empty()) {
@@ -666,9 +657,9 @@ void ScriptCreateDialog::_update_dialog() {
 	// Is Script created or loaded from existing file?
 
 	if (is_built_in) {
-		validation_panel->set_message(MSG_ID_BUILT_IN, TTRC("Note: Built-in scripts have some limitations and can't be edited using an external editor."), EditorValidationPanel::MSG_INFO, false);
+		validation_panel->set_message(MSG_ID_BUILT_IN, TTR("Note: Built-in scripts have some limitations and can't be edited using an external editor."), EditorValidationPanel::MSG_INFO, false);
 	} else if (file_path->get_text().get_file().get_basename() == parent_name->get_text()) {
-		validation_panel->set_message(MSG_ID_BUILT_IN, TTRC("Warning: Having the script name be the same as a built-in type is usually not desired."), EditorValidationPanel::MSG_WARNING, false);
+		validation_panel->set_message(MSG_ID_BUILT_IN, TTR("Warning: Having the script name be the same as a built-in type is usually not desired."), EditorValidationPanel::MSG_WARNING, false);
 	}
 
 	path_controls[0]->set_visible(!is_built_in);
@@ -687,16 +678,16 @@ void ScriptCreateDialog::_update_dialog() {
 
 	if (is_new_file) {
 		if (is_built_in) {
-			validation_panel->set_message(MSG_ID_PATH, TTRC("Built-in script (into scene file)."), EditorValidationPanel::MSG_OK);
+			validation_panel->set_message(MSG_ID_PATH, TTR("Built-in script (into scene file)."), EditorValidationPanel::MSG_OK);
 		}
 	} else {
 		template_inactive_message = TTRC("Using existing script file.");
 		if (load_enabled) {
 			if (is_path_valid) {
-				validation_panel->set_message(MSG_ID_PATH, TTRC("Will load an existing script file."), EditorValidationPanel::MSG_OK);
+				validation_panel->set_message(MSG_ID_PATH, TTR("Will load an existing script file."), EditorValidationPanel::MSG_OK);
 			}
 		} else {
-			validation_panel->set_message(MSG_ID_PATH, TTRC("Script file already exists."), EditorValidationPanel::MSG_ERROR);
+			validation_panel->set_message(MSG_ID_PATH, TTR("Script file already exists."), EditorValidationPanel::MSG_ERROR);
 		}
 	}
 
@@ -852,7 +843,7 @@ String ScriptCreateDialog::_get_script_origin_label(const ScriptLanguage::Templa
 void ScriptCreateDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("config", "inherits", "path", "built_in_enabled", "load_enabled"), &ScriptCreateDialog::config, DEFVAL(true), DEFVAL(true));
 
-	ADD_SIGNAL(MethodInfo("script_created", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static())));
+	ADD_SIGNAL(MethodInfo("script_created", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script")));
 }
 
 ScriptCreateDialog::ScriptCreateDialog() {
@@ -869,8 +860,8 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	/* Information Messages Field */
 
 	validation_panel = memnew(EditorValidationPanel);
-	validation_panel->add_line(MSG_ID_SCRIPT, TTRC("Script path/name is valid."));
-	validation_panel->add_line(MSG_ID_PATH, TTRC("Will create a new script file."));
+	validation_panel->add_line(MSG_ID_SCRIPT, TTR("Script path/name is valid."));
+	validation_panel->add_line(MSG_ID_PATH, TTR("Will create a new script file."));
 	validation_panel->add_line(MSG_ID_BUILT_IN);
 	validation_panel->add_line(MSG_ID_TEMPLATE);
 	validation_panel->set_update_callback(callable_mp(this, &ScriptCreateDialog::_update_dialog));
@@ -906,18 +897,8 @@ ScriptCreateDialog::ScriptCreateDialog() {
 			default_language = i;
 		}
 	}
-	if (ScriptServer::get_language_count() == 0) {
-		// Edge Case 1: No scripting languages exist at all.
-		get_ok_button()->set_disabled(true); // Explicitly disable the confirmation button to prevent downstream crashes.
-		language_menu->set_disabled(true);
-		language_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS);
-		language_menu->add_item(TTR("No Scripting Languages Available"));
-	} else if (default_language >= 0) {
-		// Normal Case: GDScript is available, select it.
+	if (default_language >= 0) {
 		language_menu->select(default_language);
-	} else {
-		// Edge Case 2: Languages exist (like C#), but GDScript is disabled.
-		language_menu->select(0);
 	}
 
 	language_menu->connect(SceneStringName(item_selected), callable_mp(this, &ScriptCreateDialog::_language_changed));
diff --git a/engine/editor/script/script_create_dialog.h b/engine/editor/script/script_create_dialog.h
index 61d6b472..92c143a2 100644
--- a/engine/editor/script/script_create_dialog.h
+++ b/engine/editor/script/script_create_dialog.h
@@ -34,6 +34,7 @@
 #include "scene/gui/check_box.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/panel_container.h"
 
 class CreateDialog;
 class EditorFileDialog;
diff --git a/engine/editor/script/script_editor_base.cpp b/engine/editor/script/script_editor_base.cpp
deleted file mode 100644
index 01da1997..00000000
--- a/engine/editor/script/script_editor_base.cpp
+++ /dev/null
@@ -1,713 +0,0 @@
-/**************************************************************************/
-/*  script_editor_base.cpp                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "script_editor_base.h"
-
-#include "core/io/json.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "editor/editor_node.h"
-#include "editor/script/script_editor_plugin.h"
-#include "editor/script/syntax_highlighters.h"
-#include "editor/settings/editor_settings.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/split_container.h"
-#include "servers/display/display_server.h"
-
-void ScriptEditorBase::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("name_changed"));
-
-	// First use in TextEditorBase.
-	ADD_SIGNAL(MethodInfo("edited_script_changed"));
-	ADD_SIGNAL(MethodInfo("search_in_files_requested", PropertyInfo(Variant::STRING, "text")));
-	ClassDB::bind_method(D_METHOD("add_syntax_highlighter", "highlighter"), &ScriptEditorBase::add_syntax_highlighter);
-	ClassDB::bind_method(D_METHOD("get_base_editor"), &ScriptEditorBase::get_base_editor);
-
-	// First use in ScriptTextEditor.
-	ADD_SIGNAL(MethodInfo("request_save_history"));
-	ADD_SIGNAL(MethodInfo("request_help", PropertyInfo(Variant::STRING, "topic")));
-	ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line")));
-	ADD_SIGNAL(MethodInfo("go_to_help", PropertyInfo(Variant::STRING, "what")));
-	ADD_SIGNAL(MethodInfo("request_save_previous_state", PropertyInfo(Variant::DICTIONARY, "state")));
-	ADD_SIGNAL(MethodInfo("replace_in_files_requested", PropertyInfo(Variant::STRING, "text")));
-	ADD_SIGNAL(MethodInfo("go_to_method", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::STRING, "method")));
-}
-
-String ScriptEditorBase::get_name() {
-	String name;
-
-	name = edited_res->get_path().get_file();
-	if (name.is_empty()) {
-		// This appears for newly created built-in text_files before saving the scene.
-		name = TTR("[unsaved]");
-	} else if (edited_res->is_built_in()) {
-		const String &text_file_name = edited_res->get_name();
-		if (!text_file_name.is_empty()) {
-			// If the built-in text_file has a custom resource name defined,
-			// display the built-in text_file name as follows: `ResourceName (scene_file.tscn)`
-			name = vformat("%s (%s)", text_file_name, name.get_slice("::", 0));
-		}
-	}
-
-	if (is_unsaved()) {
-		name += "(*)";
-	}
-
-	return name;
-}
-
-Ref<Texture2D> ScriptEditorBase::get_theme_icon() {
-	return EditorNode::get_singleton()->get_object_icon(edited_res.ptr());
-}
-
-void ScriptEditorBase::tag_saved_version() {
-	edited_file_data.last_modified_time = FileAccess::get_modified_time(edited_file_data.path);
-}
-
-//// TextEditorBase
-
-TextEditorBase *TextEditorBase::EditMenus::_get_active_editor() {
-	return Object::cast_to<TextEditorBase>(ScriptEditor::get_singleton()->get_current_editor());
-}
-
-void TextEditorBase::EditMenus::_edit_option(int p_op) {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-	script_text_editor->_edit_option(p_op);
-}
-
-void TextEditorBase::EditMenus::_prepare_edit_menu() {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-	const CodeEdit *tx = script_text_editor->code_editor->get_text_editor();
-	PopupMenu *popup = edit_menu->get_popup();
-	popup->set_item_disabled(popup->get_item_index(EDIT_UNDO), !tx->has_undo());
-	popup->set_item_disabled(popup->get_item_index(EDIT_REDO), !tx->has_redo());
-}
-
-void TextEditorBase::EditMenus::_update_highlighter_menu() {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-
-	Ref<EditorSyntaxHighlighter> current_highlighter = script_text_editor->get_code_editor()->get_text_editor()->get_syntax_highlighter();
-	highlighter_menu->clear();
-	for (const Ref<EditorSyntaxHighlighter> &highlighter : script_text_editor->highlighters) {
-		highlighter_menu->add_radio_check_item(highlighter->_get_name());
-		highlighter_menu->set_item_checked(-1, highlighter == current_highlighter);
-	}
-}
-
-void TextEditorBase::EditMenus::_change_syntax_highlighter(int p_idx) {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-	ERR_FAIL_INDEX(p_idx, (int)script_text_editor->highlighters.size());
-	script_text_editor->set_syntax_highlighter(script_text_editor->highlighters[p_idx]);
-}
-
-void TextEditorBase::EditMenus::_update_bookmark_list() {
-	bookmarks_menu->clear();
-	bookmarks_menu->reset_size();
-
-	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
-	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/remove_all_bookmarks"), BOOKMARK_REMOVE_ALL);
-	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_next_bookmark"), BOOKMARK_GOTO_NEXT);
-	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
-
-	TextEditorBase *script_text_editor = _get_active_editor();
-	if (script_text_editor == nullptr) {
-		return;
-	}
-
-	PackedInt32Array bookmark_list = script_text_editor->code_editor->get_text_editor()->get_bookmarked_lines();
-	if (bookmark_list.is_empty()) {
-		return;
-	}
-
-	bookmarks_menu->add_separator();
-
-	for (int32_t bookmark : bookmark_list) {
-		// Strip edges to remove spaces or tabs.
-		// Also replace any tabs by spaces, since we can't print tabs in the menu.
-		String line = script_text_editor->code_editor->get_text_editor()->get_line(bookmark).replace("\t", "  ").strip_edges();
-
-		// Limit the size of the line if too big.
-		if (line.length() > 50) {
-			line = line.substr(0, 50);
-		}
-
-		bookmarks_menu->add_item(String::num_int64(bookmark + 1) + " - `" + line + "`");
-		bookmarks_menu->set_item_metadata(-1, bookmark);
-	}
-}
-
-void TextEditorBase::EditMenus::_bookmark_item_pressed(int p_idx) {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-	if (p_idx < 4) { // Any item before the separator.
-		script_text_editor->_edit_option(bookmarks_menu->get_item_id(p_idx));
-	} else {
-		script_text_editor->code_editor->goto_line_centered(bookmarks_menu->get_item_metadata(p_idx));
-	}
-}
-
-TextEditorBase::EditMenus::EditMenus() {
-	edit_menu = memnew(MenuButton);
-	edit_menu->set_flat(false);
-	edit_menu->set_theme_type_variation("FlatMenuButton");
-	edit_menu->set_text(TTRC("Edit"));
-	edit_menu->set_switch_on_hover(true);
-
-	add_child(edit_menu);
-	edit_menu->connect("about_to_popup", callable_mp(this, &EditMenus::_prepare_edit_menu));
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
-	edit_menu->get_popup()->add_separator();
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
-	edit_menu->get_popup()->add_separator();
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_selection"), EDIT_DUPLICATE_SELECTION);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_lines"), EDIT_DUPLICATE_LINES);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_word_wrap"), EDIT_TOGGLE_WORD_WRAP);
-	edit_menu->get_popup()->add_separator();
-	{
-		edit_menu_line = memnew(PopupMenu);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_up"), EDIT_MOVE_LINE_UP);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_down"), EDIT_MOVE_LINE_DOWN);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/delete_line"), EDIT_DELETE_LINE);
-		edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/join_lines"), EDIT_JOIN_LINES);
-		edit_menu_line->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-		edit_menu->get_popup()->add_submenu_node_item(TTRC("Line"), edit_menu_line);
-	}
-	{
-		edit_menu_fold = memnew(PopupMenu);
-		edit_menu_fold->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
-		edit_menu_fold->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_all_lines"), EDIT_FOLD_ALL_LINES);
-		edit_menu_fold->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_all_lines"), EDIT_UNFOLD_ALL_LINES);
-		edit_menu_fold->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-		edit_menu->get_popup()->add_submenu_node_item(TTRC("Folding"), edit_menu_fold);
-	}
-	edit_menu->get_popup()->add_separator();
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_trailing_whitespace"), EDIT_TRIM_TRAILING_WHITESAPCE);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_final_newlines"), EDIT_TRIM_FINAL_NEWLINES);
-	{
-		edit_menu_convert_indent = memnew(PopupMenu);
-		edit_menu_convert_indent->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_spaces"), EDIT_CONVERT_INDENT_TO_SPACES);
-		edit_menu_convert_indent->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_tabs"), EDIT_CONVERT_INDENT_TO_TABS);
-		edit_menu_convert_indent->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-		edit_menu->get_popup()->add_submenu_node_item(TTRC("Indentation"), edit_menu_convert_indent);
-	}
-	edit_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-	edit_menu->get_popup()->add_separator();
-	{
-		edit_menu_convert = memnew(PopupMenu);
-		edit_menu_convert->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
-		edit_menu_convert->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
-		edit_menu_convert->add_shortcut(ED_GET_SHORTCUT("script_text_editor/capitalize"), EDIT_CAPITALIZE);
-		edit_menu_convert->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-		edit_menu->get_popup()->add_submenu_node_item(TTRC("Convert Case"), edit_menu_convert);
-	}
-	highlighter_menu = memnew(PopupMenu);
-	edit_menu->get_popup()->add_submenu_node_item(TTRC("Syntax Highlighter"), highlighter_menu);
-
-	highlighter_menu->connect("about_to_popup", callable_mp(this, &EditMenus::_update_highlighter_menu));
-	highlighter_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_change_syntax_highlighter));
-
-	search_menu = memnew(MenuButton);
-	search_menu->set_flat(false);
-	search_menu->set_theme_type_variation("FlatMenuButton");
-	search_menu->set_text(TTRC("Search"));
-	search_menu->set_switch_on_hover(true);
-
-	add_child(search_menu);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find"), SEARCH_FIND);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_next"), SEARCH_FIND_NEXT);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_previous"), SEARCH_FIND_PREV);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace"), SEARCH_REPLACE);
-	search_menu->get_popup()->add_separator();
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace_in_files"), REPLACE_IN_FILES);
-	search_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-
-	goto_menu = memnew(MenuButton);
-	goto_menu->set_flat(false);
-	goto_menu->set_theme_type_variation("FlatMenuButton");
-	goto_menu->set_text(TTRC("Go To"));
-	goto_menu->set_switch_on_hover(true);
-	add_child(goto_menu);
-	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_line"), SEARCH_GOTO_LINE);
-	goto_menu->get_popup()->add_separator();
-
-	bookmarks_menu = memnew(PopupMenu);
-	goto_menu->get_popup()->add_submenu_node_item(TTRC("Bookmarks"), bookmarks_menu);
-	bookmarks_menu->connect("about_to_popup", callable_mp(this, &EditMenus::_update_bookmark_list));
-	bookmarks_menu->connect("index_pressed", callable_mp(this, &EditMenus::_bookmark_item_pressed));
-
-	goto_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditMenus::_edit_option));
-
-	// Update immediately for shortcuts.
-	_update_bookmark_list();
-}
-
-void TextEditorBase::_make_context_menu(bool p_selection, bool p_foldable, const Vector2 &p_position, bool p_show) {
-	context_menu->clear();
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
-		context_menu->add_item(TTRC("Emoji & Symbols"), EDIT_EMOJI_AND_SYMBOL);
-		context_menu->add_separator();
-	}
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
-	context_menu->add_separator();
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
-	context_menu->add_separator();
-	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
-	context_menu->add_separator();
-	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
-
-	if (p_selection) {
-		context_menu->add_separator();
-		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
-		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
-	}
-
-	if (p_foldable) {
-		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
-	}
-
-	if (p_show) {
-		_show_context_menu(p_position);
-	}
-}
-
-void TextEditorBase::_show_context_menu(const Vector2 &p_position) {
-	const CodeEdit *tx = code_editor->get_text_editor();
-	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_UNDO), !tx->has_undo());
-	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_REDO), !tx->has_redo());
-
-	context_menu->set_position(get_screen_position() + p_position);
-	context_menu->reset_size();
-	context_menu->popup();
-}
-
-void TextEditorBase::_text_edit_gui_input(const Ref<InputEvent> &p_ev) {
-	Ref<InputEventMouseButton> mb = p_ev;
-
-	if (mb.is_valid()) {
-		if (mb->get_button_index() == MouseButton::RIGHT) {
-			CodeEdit *tx = code_editor->get_text_editor();
-
-			tx->apply_ime();
-
-			Point2i pos = tx->get_line_column_at_pos(mb->get_global_position() - tx->get_global_position());
-			int row = pos.y;
-			int col = pos.x;
-
-			tx->set_move_caret_on_right_click_enabled(EDITOR_GET("text_editor/behavior/navigation/move_caret_on_right_click"));
-
-			if (tx->is_move_caret_on_right_click_enabled()) {
-				tx->remove_secondary_carets();
-				if (tx->has_selection()) {
-					int from_line = tx->get_selection_from_line();
-					int to_line = tx->get_selection_to_line();
-					int from_column = tx->get_selection_from_column();
-					int to_column = tx->get_selection_to_column();
-
-					if (row < from_line || row > to_line || (row == from_line && col < from_column) || (row == to_line && col > to_column)) {
-						// Right click is outside the selected text.
-						tx->deselect();
-					}
-				}
-				if (!tx->has_selection()) {
-					tx->set_caret_line(row, true, false, -1);
-					tx->set_caret_column(col);
-				}
-			}
-
-			if (!mb->is_pressed()) {
-				bool can_fold = tx->can_fold_line(row);
-				bool is_folded = tx->is_line_folded(row);
-				_make_context_menu(tx->has_selection(), can_fold || is_folded, get_local_mouse_position());
-			}
-		}
-	}
-
-	Ref<InputEventKey> k = p_ev;
-	if (k.is_valid() && k->is_pressed() && k->is_action("ui_menu", true)) {
-		CodeEdit *tx = code_editor->get_text_editor();
-		int line = tx->get_caret_line();
-		tx->adjust_viewport_to_caret();
-		bool can_fold = tx->can_fold_line(line);
-		bool is_folded = tx->is_line_folded(line);
-		_make_context_menu(tx->has_selection(0), can_fold || is_folded, (get_global_transform().inverse() * tx->get_global_transform()).xform(tx->get_caret_draw_pos(0)));
-		context_menu->grab_focus();
-	}
-}
-
-bool TextEditorBase::_edit_option(int p_op) {
-	CodeEdit *tx = code_editor->get_text_editor();
-	tx->apply_ime();
-
-	switch (p_op) {
-		case EDIT_UNDO: {
-			tx->undo();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_REDO: {
-			tx->redo();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_CUT: {
-			tx->cut();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_COPY: {
-			tx->copy();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_PASTE: {
-			tx->paste();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_SELECT_ALL: {
-			tx->select_all();
-			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
-		} break;
-		case EDIT_MOVE_LINE_UP: {
-			tx->move_lines_up();
-		} break;
-		case EDIT_MOVE_LINE_DOWN: {
-			tx->move_lines_down();
-		} break;
-		case EDIT_INDENT: {
-			tx->indent_lines();
-		} break;
-		case EDIT_UNINDENT: {
-			tx->unindent_lines();
-		} break;
-		case EDIT_DELETE_LINE: {
-			tx->delete_lines();
-		} break;
-		case EDIT_JOIN_LINES: {
-			tx->join_lines();
-		} break;
-		case EDIT_DUPLICATE_SELECTION: {
-			tx->duplicate_selection();
-		} break;
-		case EDIT_DUPLICATE_LINES: {
-			tx->duplicate_lines();
-		} break;
-		case EDIT_TRIM_TRAILING_WHITESAPCE: {
-			trim_trailing_whitespace();
-		} break;
-		case EDIT_TRIM_FINAL_NEWLINES: {
-			trim_final_newlines();
-		} break;
-		case EDIT_CONVERT_INDENT_TO_SPACES: {
-			code_editor->set_indent_using_spaces(true);
-			convert_indent();
-		} break;
-		case EDIT_CONVERT_INDENT_TO_TABS: {
-			code_editor->set_indent_using_spaces(false);
-			convert_indent();
-		} break;
-		case EDIT_TO_UPPERCASE: {
-			_convert_case(CodeTextEditor::UPPER);
-		} break;
-		case EDIT_TO_LOWERCASE: {
-			_convert_case(CodeTextEditor::LOWER);
-		} break;
-		case EDIT_CAPITALIZE: {
-			_convert_case(CodeTextEditor::CAPITALIZE);
-		} break;
-		case EDIT_TOGGLE_WORD_WRAP: {
-			TextEdit::LineWrappingMode wrap = tx->get_line_wrapping_mode();
-			tx->set_line_wrapping_mode(wrap == TextEdit::LINE_WRAPPING_BOUNDARY ? TextEdit::LINE_WRAPPING_NONE : TextEdit::LINE_WRAPPING_BOUNDARY);
-		} break;
-		case SEARCH_FIND: {
-			code_editor->get_find_replace_bar()->popup_search();
-		} break;
-		case SEARCH_FIND_NEXT: {
-			code_editor->get_find_replace_bar()->search_next();
-		} break;
-		case SEARCH_FIND_PREV: {
-			code_editor->get_find_replace_bar()->search_prev();
-		} break;
-		case SEARCH_REPLACE: {
-			code_editor->get_find_replace_bar()->popup_replace();
-		} break;
-		case SEARCH_IN_FILES: {
-			String selected_text = tx->get_selected_text();
-
-			// Yep, because it doesn't make sense to instance this dialog for every single script open...
-			// So this will be delegated to the ScriptEditor.
-			emit_signal(SNAME("search_in_files_requested"), selected_text);
-		} break;
-		case REPLACE_IN_FILES: {
-			String selected_text = tx->get_selected_text();
-			emit_signal(SNAME("replace_in_files_requested"), selected_text);
-		} break;
-		case SEARCH_GOTO_LINE: {
-			goto_line_popup->popup_find_line(code_editor);
-		} break;
-		case BOOKMARK_TOGGLE: {
-			code_editor->toggle_bookmark();
-		} break;
-		case BOOKMARK_GOTO_NEXT: {
-			code_editor->goto_next_bookmark();
-		} break;
-		case BOOKMARK_GOTO_PREV: {
-			code_editor->goto_prev_bookmark();
-		} break;
-		case BOOKMARK_REMOVE_ALL: {
-			code_editor->remove_all_bookmarks();
-		} break;
-		case EDIT_EMOJI_AND_SYMBOL: {
-			tx->show_emoji_and_symbol_picker();
-		} break;
-		case EDIT_TOGGLE_FOLD_LINE: {
-			tx->toggle_foldable_lines_at_carets();
-		} break;
-		case EDIT_FOLD_ALL_LINES: {
-			tx->fold_all_lines();
-		} break;
-		case EDIT_UNFOLD_ALL_LINES: {
-			tx->unfold_all_lines();
-		} break;
-		default: {
-			return false;
-		}
-	}
-	return true;
-}
-
-void TextEditorBase::_load_theme_settings() {
-	code_editor->get_text_editor()->get_syntax_highlighter()->update_cache();
-}
-
-void TextEditorBase::_validate_script() {
-	emit_signal(SNAME("name_changed"));
-	emit_signal(SNAME("edited_script_changed"));
-}
-
-void TextEditorBase::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
-	ERR_FAIL_COND(p_highlighter.is_null());
-
-	highlighters.push_back(p_highlighter);
-}
-
-void TextEditorBase::set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
-	ERR_FAIL_COND(p_highlighter.is_null());
-
-	CodeEdit *te = code_editor->get_text_editor();
-	p_highlighter->_set_edited_resource(edited_res);
-	te->set_syntax_highlighter(p_highlighter);
-}
-
-void TextEditorBase::set_edited_resource(const Ref<Resource> &p_res) {
-	ERR_FAIL_COND(edited_res.is_valid());
-	ERR_FAIL_COND(p_res.is_null());
-
-	edited_res = p_res;
-
-	Ref<TextFile> text_file = edited_res;
-	String text;
-	if (text_file.is_valid()) {
-		text = text_file->get_text();
-	}
-
-	Ref<JSON> json_file = edited_res;
-	if (json_file.is_valid()) {
-		text = json_file->get_parsed_text();
-	}
-
-	code_editor->get_text_editor()->set_text(text);
-	code_editor->get_text_editor()->clear_undo_history();
-	code_editor->get_text_editor()->tag_saved_version();
-
-	emit_signal(SNAME("name_changed"));
-	code_editor->update_line_and_column();
-}
-
-bool TextEditorBase::is_unsaved() {
-	return code_editor->get_text_editor()->get_version() != code_editor->get_text_editor()->get_saved_version() || edited_res->get_path().is_empty(); // In memory.
-}
-
-void TextEditorBase::tag_saved_version() {
-	code_editor->get_text_editor()->tag_saved_version();
-	ScriptEditorBase::tag_saved_version();
-}
-
-void TextEditorBase::reload_text() {
-	ERR_FAIL_COND(edited_res.is_null());
-
-	CodeEdit *te = code_editor->get_text_editor();
-	int column = te->get_caret_column();
-	int row = te->get_caret_line();
-	int h = te->get_h_scroll();
-	int v = te->get_v_scroll();
-
-	Ref<TextFile> text_file = edited_res;
-	if (text_file.is_valid()) {
-		te->set_text(text_file->get_text());
-	}
-
-	Ref<JSON> json_file = edited_res;
-	if (json_file.is_valid()) {
-		te->set_text(json_file->get_parsed_text());
-	}
-
-	Ref<Script> script = edited_res;
-	if (script.is_valid()) {
-		te->set_text(script->get_source_code());
-	}
-
-	te->set_caret_line(row);
-	te->set_caret_column(column);
-	te->set_h_scroll(h);
-	te->set_v_scroll(v);
-
-	te->tag_saved_version();
-
-	code_editor->update_line_and_column();
-	if (editor_enabled) {
-		_validate_script();
-	}
-}
-
-void TextEditorBase::enable_editor() {
-	if (editor_enabled) {
-		return;
-	}
-
-	editor_enabled = true;
-
-	_load_theme_settings();
-
-	_validate_script();
-}
-
-void TextEditorBase::set_tooltip_request_func(const Callable &p_toolip_callback) {
-	Variant args[1] = { this };
-	const Variant *argp[] = { &args[0] };
-	code_editor->get_text_editor()->set_tooltip_request_func(p_toolip_callback.bindp(argp, 1));
-}
-
-void TextEditorBase::set_edit_state(const Variant &p_state) {
-	code_editor->set_edit_state(p_state);
-
-	Dictionary state = p_state;
-	if (state.has("syntax_highlighter")) {
-		for (const Ref<EditorSyntaxHighlighter> &highlighter : highlighters) {
-			if (highlighter->_get_name() == String(state["syntax_highlighter"])) {
-				set_syntax_highlighter(highlighter);
-				break;
-			}
-		}
-	}
-
-	ensure_focus();
-}
-
-TextEditorBase::TextEditorBase() {
-	code_editor = memnew(CodeTextEditor);
-	code_editor->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-	code_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	code_editor->show_toggle_files_button();
-	code_editor->get_text_editor()->set_context_menu_enabled(false);
-	code_editor->get_text_editor()->connect(SceneStringName(gui_input), callable_mp(this, &TextEditorBase::_text_edit_gui_input));
-	code_editor->connect("validate_script", callable_mp(this, &TextEditorBase::_validate_script));
-	code_editor->connect("load_theme_settings", callable_mp(this, &TextEditorBase::_load_theme_settings));
-	code_editor->connect("show_goto_popup", callable_mp(this, &TextEditorBase::_edit_option).bind(SEARCH_GOTO_LINE));
-
-	context_menu = memnew(PopupMenu);
-	context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditorBase::_edit_option));
-	add_child(context_menu);
-
-	goto_line_popup = memnew(GotoLinePopup);
-	add_child(goto_line_popup);
-
-	Ref<EditorPlainTextSyntaxHighlighter> plain_highlighter;
-	plain_highlighter.instantiate();
-	add_syntax_highlighter(plain_highlighter);
-
-	Ref<EditorStandardSyntaxHighlighter> highlighter;
-	highlighter.instantiate();
-	add_syntax_highlighter(highlighter);
-	set_syntax_highlighter(plain_highlighter);
-
-	update_settings();
-}
-
-TextEditorBase::~TextEditorBase() {
-	highlighters.clear();
-}
-
-//// CodeEditorBase
-
-bool CodeEditorBase::_warning_clicked(const Variant &p_line) {
-	if (p_line.get_type() == Variant::INT) {
-		goto_line_centered(p_line.operator int64_t());
-		return true;
-	}
-	return false;
-}
-
-CodeEditorBase::EditMenusCEB::EditMenusCEB() {
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_text_completion_query"), EDIT_COMPLETE);
-	_popup_move_item(EDIT_TRIM_TRAILING_WHITESAPCE, edit_menu->get_popup(), false);
-	edit_menu_line->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT);
-}
-
-CodeEditorBase::CodeEditorBase() {
-	warnings_panel = memnew(RichTextLabel);
-	warnings_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE));
-	warnings_panel->set_h_size_flags(SIZE_EXPAND_FILL);
-	warnings_panel->set_meta_underline(true);
-	warnings_panel->set_selection_enabled(true);
-	warnings_panel->set_context_menu_enabled(true);
-	warnings_panel->set_focus_mode(FOCUS_CLICK);
-	warnings_panel->hide();
-	warnings_panel->connect("meta_clicked", callable_mp(this, &CodeEditorBase::_warning_clicked));
-
-	editor_box = memnew(VSplitContainer);
-	add_child(editor_box);
-	editor_box->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-	editor_box->set_v_size_flags(SIZE_EXPAND_FILL);
-	editor_box->add_child(code_editor);
-	editor_box->add_child(warnings_panel);
-}
diff --git a/engine/editor/script/script_editor_base.h b/engine/editor/script/script_editor_base.h
deleted file mode 100644
index 7ecf5b8c..00000000
--- a/engine/editor/script/script_editor_base.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/**************************************************************************/
-/*  script_editor_base.h                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "editor/gui/code_editor.h"
-#include "scene/gui/box_container.h"
-
-class EditorSyntaxHighlighter;
-class MenuButton;
-class VSplitContainer;
-
-class ScriptEditorBase : public VBoxContainer {
-	GDCLASS(ScriptEditorBase, VBoxContainer);
-
-protected:
-	Ref<Resource> edited_res;
-
-	static void _bind_methods();
-
-public:
-	struct EditedFileData {
-		String path;
-		uint64_t last_modified_time = -1;
-	} edited_file_data;
-
-	virtual String get_name();
-	virtual Ref<Texture2D> get_theme_icon();
-
-	virtual void set_toggle_list_control(Control *p_toggle_list_control) = 0;
-	virtual void update_toggle_files_button() = 0;
-
-	virtual bool show_members_overview() { return false; }
-
-	virtual void set_edited_resource(const Ref<Resource> &p_res) = 0;
-	virtual Ref<Resource> get_edited_resource() const { return edited_res; }
-
-	virtual void apply_code() = 0;
-	virtual void validate_script() = 0;
-	virtual bool is_unsaved() = 0;
-	virtual void tag_saved_version();
-
-	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {}
-	virtual Control *get_base_editor() const { return nullptr; }
-};
-
-typedef ScriptEditorBase *(*CreateScriptEditorFunc)(const Ref<Resource> &p_resource);
-
-class TextEditorBase : public ScriptEditorBase {
-	GDCLASS(TextEditorBase, ScriptEditorBase);
-
-	void _post_init();
-
-protected:
-	enum {
-		EDIT_UNDO,
-		EDIT_REDO,
-		EDIT_CUT,
-		EDIT_COPY,
-		EDIT_PASTE,
-		EDIT_SELECT_ALL,
-		EDIT_TRIM_TRAILING_WHITESAPCE,
-		EDIT_TRIM_FINAL_NEWLINES,
-		EDIT_CONVERT_INDENT_TO_SPACES,
-		EDIT_CONVERT_INDENT_TO_TABS,
-		EDIT_MOVE_LINE_UP,
-		EDIT_MOVE_LINE_DOWN,
-		EDIT_INDENT,
-		EDIT_UNINDENT,
-		EDIT_DELETE_LINE,
-		EDIT_DUPLICATE_SELECTION,
-		EDIT_DUPLICATE_LINES,
-		EDIT_TO_UPPERCASE,
-		EDIT_TO_LOWERCASE,
-		EDIT_CAPITALIZE,
-		EDIT_TOGGLE_FOLD_LINE,
-		EDIT_FOLD_ALL_LINES,
-		EDIT_TOGGLE_WORD_WRAP,
-		EDIT_UNFOLD_ALL_LINES,
-		EDIT_EMOJI_AND_SYMBOL,
-
-		SEARCH_FIND,
-		SEARCH_FIND_NEXT,
-		SEARCH_FIND_PREV,
-		SEARCH_REPLACE,
-		SEARCH_IN_FILES,
-		SEARCH_GOTO_LINE,
-
-		REPLACE_IN_FILES,
-
-		BOOKMARK_TOGGLE,
-		BOOKMARK_GOTO_NEXT,
-		BOOKMARK_GOTO_PREV,
-		BOOKMARK_REMOVE_ALL,
-
-		EDIT_JOIN_LINES,
-
-		BASE_ENUM_COUNT,
-	};
-
-	class EditMenus : public HBoxContainer {
-		GDCLASS(EditMenus, HBoxContainer);
-
-	protected:
-		MenuButton *edit_menu = nullptr;
-		MenuButton *search_menu = nullptr;
-		MenuButton *goto_menu = nullptr;
-		PopupMenu *bookmarks_menu = nullptr;
-		PopupMenu *highlighter_menu = nullptr;
-
-		PopupMenu *edit_menu_line = nullptr;
-		PopupMenu *edit_menu_fold = nullptr;
-		PopupMenu *edit_menu_convert_indent = nullptr;
-		PopupMenu *edit_menu_convert = nullptr;
-
-		TextEditorBase *_get_active_editor();
-		void _edit_option(int p_op);
-		void _prepare_edit_menu();
-		void _update_highlighter_menu();
-		void _change_syntax_highlighter(int p_idx);
-		void _update_bookmark_list();
-		void _bookmark_item_pressed(int p_idx);
-
-	public:
-		EditMenus();
-	};
-
-	static void _popup_move_item(int p_target_id, PopupMenu *r_popup, bool p_move_after = true, int p_idx = -1) {
-		int target_idx = r_popup->get_item_index(p_target_id) + p_move_after;
-		if (target_idx >= 0 && target_idx < r_popup->get_item_count()) {
-			r_popup->set_item_index(p_idx, target_idx);
-		}
-	}
-
-	static inline EditMenus *edit_menus = nullptr;
-
-	bool editor_enabled = false;
-	CodeTextEditor *code_editor = nullptr;
-
-	GotoLinePopup *goto_line_popup = nullptr;
-
-	LocalVector<Ref<EditorSyntaxHighlighter>> highlighters;
-
-	PopupMenu *context_menu = nullptr;
-	MenuButton *search_menu = nullptr;
-
-	void _make_context_menu(bool p_selection, bool p_foldable, const Vector2 &p_position = Vector2(0, 0), bool p_show = true);
-	void _show_context_menu(const Vector2 &p_position);
-
-	virtual void _text_edit_gui_input(const Ref<InputEvent> &p_ev);
-	virtual bool _edit_option(int p_op);
-
-	virtual void _load_theme_settings();
-	virtual void _validate_script();
-
-	void _convert_case(CodeTextEditor::CaseStyle p_case) { code_editor->convert_case(p_case); }
-
-public:
-	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
-	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter);
-
-	virtual void set_edited_resource(const Ref<Resource> &p_res) override;
-
-	virtual bool is_unsaved() override;
-	virtual void tag_saved_version() override;
-
-	virtual void reload_text();
-	virtual void enable_editor();
-
-	virtual Control *get_edit_menu() = 0;
-
-	virtual Control *get_base_editor() const override { return code_editor->get_text_editor(); }
-	virtual CodeTextEditor *get_code_editor() const { return code_editor; }
-
-	virtual void set_tooltip_request_func(const Callable &p_toolip_callback);
-
-	virtual void ensure_focus() { code_editor->get_text_editor()->grab_focus(); }
-	virtual void convert_indent() { code_editor->get_text_editor()->convert_indent(); }
-
-	virtual void trim_trailing_whitespace() { code_editor->trim_trailing_whitespace(); }
-	virtual void trim_final_newlines() { code_editor->trim_final_newlines(); }
-	virtual void insert_final_newline() { code_editor->insert_final_newline(); }
-
-	virtual void goto_line(int p_line, int p_column = 0) { code_editor->goto_line(p_line, p_column); }
-	virtual void goto_line_selection(int p_line, int p_begin, int p_end) { code_editor->goto_line_selection(p_line, p_begin, p_end); }
-	virtual void goto_line_centered(int p_line, int p_column = 0) { code_editor->goto_line_centered(p_line, p_column); }
-	virtual void set_executing_line(int p_line) { code_editor->set_executing_line(p_line); }
-	virtual void clear_executing_line() { code_editor->clear_executing_line(); }
-
-	virtual Variant get_edit_state() { return code_editor->get_edit_state(); }
-	virtual void set_edit_state(const Variant &p_state);
-	virtual Variant get_navigation_state() { return code_editor->get_navigation_state(); }
-
-	virtual void update_settings() { code_editor->update_editor_settings(); }
-	virtual void set_find_replace_bar(FindReplaceBar *p_bar) { code_editor->set_find_replace_bar(p_bar); }
-
-	virtual void validate_script() override { code_editor->validate_script(); }
-
-	virtual void set_toggle_list_control(Control *p_toggle_list_control) override {
-		code_editor->set_toggle_list_control(p_toggle_list_control);
-	}
-	virtual void update_toggle_files_button() override { code_editor->update_toggle_files_button(); }
-
-	TextEditorBase();
-	~TextEditorBase();
-};
-
-class CodeEditorBase : public TextEditorBase {
-	GDCLASS(CodeEditorBase, TextEditorBase);
-
-protected:
-	enum {
-		EDIT_COMPLETE = BASE_ENUM_COUNT,
-		EDIT_TOGGLE_COMMENT,
-
-		CODE_ENUM_COUNT,
-	};
-
-	class EditMenusCEB : public EditMenus {
-		GDCLASS(EditMenusCEB, EditMenus);
-
-	public:
-		EditMenusCEB();
-	};
-
-	VSplitContainer *editor_box = nullptr;
-	RichTextLabel *warnings_panel = nullptr;
-
-	virtual void _code_complete_script(const String &p_code, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_force) = 0;
-	virtual bool _warning_clicked(const Variant &p_line);
-
-public:
-	virtual bool show_members_overview() override { return true; }
-
-	virtual Vector<String> get_functions() { return Vector<String>(); }
-
-	virtual PackedInt32Array get_breakpoints() { return PackedInt32Array(); }
-	virtual void set_breakpoint(int p_line, bool p_enabled) {}
-	virtual void clear_breakpoints() {}
-
-	CodeEditorBase();
-};
diff --git a/engine/editor/script/script_editor_plugin.cpp b/engine/editor/script/script_editor_plugin.cpp
index 65f2c6d2..e6e0d645 100644
--- a/engine/editor/script/script_editor_plugin.cpp
+++ b/engine/editor/script/script_editor_plugin.cpp
@@ -36,17 +36,12 @@
 #include "core/io/file_access.h"
 #include "core/io/json.h"
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/fuzzy_search.h"
-#include "core/variant/dictionary.h"
 #include "core/version.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
-#include "editor/doc/editor_help.h"
 #include "editor/doc/editor_help_search.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
@@ -60,15 +55,12 @@
 #include "editor/gui/code_editor.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/gui/window_wrapper.h"
 #include "editor/inspector/editor_context_menu_plugin.h"
 #include "editor/run/editor_run_bar.h"
 #include "editor/scene/editor_scene_tabs.h"
+#include "editor/script/editor_script.h"
 #include "editor/script/find_in_files.h"
-#include "editor/script/script_text_editor.h"
-#include "editor/script/syntax_highlighters.h"
-#include "editor/script/text_editor.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/shader/shader_editor_plugin.h"
@@ -79,9 +71,304 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
+#include "script_text_editor.h"
 #include "servers/display/display_server.h"
+#include "text_editor.h"
+
+/*** SYNTAX HIGHLIGHTER ****/
+
+String EditorSyntaxHighlighter::_get_name() const {
+	String ret = "Unnamed";
+	GDVIRTUAL_CALL(_get_name, ret);
+	return ret;
+}
+
+PackedStringArray EditorSyntaxHighlighter::_get_supported_languages() const {
+	PackedStringArray ret;
+	GDVIRTUAL_CALL(_get_supported_languages, ret);
+	return ret;
+}
+
+Ref<EditorSyntaxHighlighter> EditorSyntaxHighlighter::_create() const {
+	Ref<EditorSyntaxHighlighter> syntax_highlighter;
+	if (GDVIRTUAL_IS_OVERRIDDEN(_create)) {
+		GDVIRTUAL_CALL(_create, syntax_highlighter);
+	} else {
+		syntax_highlighter.instantiate();
+		if (get_script_instance()) {
+			syntax_highlighter->set_script(get_script_instance()->get_script());
+		}
+	}
+	return syntax_highlighter;
+}
+
+void EditorSyntaxHighlighter::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_get_edited_resource"), &EditorSyntaxHighlighter::_get_edited_resource);
+
+	GDVIRTUAL_BIND(_get_name)
+	GDVIRTUAL_BIND(_get_supported_languages)
+	GDVIRTUAL_BIND(_create)
+}
+
+////
+
+void EditorStandardSyntaxHighlighter::_update_cache() {
+	highlighter->set_text_edit(text_edit);
+	highlighter->clear_keyword_colors();
+	highlighter->clear_member_keyword_colors();
+	highlighter->clear_color_regions();
+
+	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
+	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/function_color"));
+	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
+	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/member_variable_color"));
+
+	/* Engine types. */
+	const Color type_color = EDITOR_GET("text_editor/theme/highlighting/engine_type_color");
+	LocalVector<StringName> types;
+	ClassDB::get_class_list(types);
+	for (const StringName &type : types) {
+		highlighter->add_keyword_color(type, type_color);
+	}
+
+	/* User types. */
+	const Color usertype_color = EDITOR_GET("text_editor/theme/highlighting/user_type_color");
+	LocalVector<StringName> global_classes;
+	ScriptServer::get_global_class_list(global_classes);
+	for (const StringName &class_name : global_classes) {
+		highlighter->add_keyword_color(class_name, usertype_color);
+	}
+
+	/* Autoloads. */
+	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
+	for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
+		const ProjectSettings::AutoloadInfo &info = E.value;
+		if (info.is_singleton) {
+			highlighter->add_keyword_color(info.name, usertype_color);
+		}
+	}
+
+	const ScriptLanguage *scr_lang = script_language;
+	StringName instance_base;
+
+	if (scr_lang == nullptr) {
+		const Ref<Script> scr = _get_edited_resource();
+		if (scr.is_valid()) {
+			scr_lang = scr->get_language();
+			instance_base = scr->get_instance_base_type();
+		}
+	}
+
+	if (scr_lang != nullptr) {
+		/* Core types. */
+		const Color basetype_color = EDITOR_GET("text_editor/theme/highlighting/base_type_color");
+		List<String> core_types;
+		scr_lang->get_core_type_words(&core_types);
+		for (const String &E : core_types) {
+			highlighter->add_keyword_color(E, basetype_color);
+		}
+
+		/* Reserved words. */
+		const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
+		const Color control_flow_keyword_color = EDITOR_GET("text_editor/theme/highlighting/control_flow_keyword_color");
+		for (const String &keyword : scr_lang->get_reserved_words()) {
+			if (scr_lang->is_control_flow_keyword(keyword)) {
+				highlighter->add_keyword_color(keyword, control_flow_keyword_color);
+			} else {
+				highlighter->add_keyword_color(keyword, keyword_color);
+			}
+		}
+
+		/* Member types. */
+		const Color member_variable_color = EDITOR_GET("text_editor/theme/highlighting/member_variable_color");
+		if (instance_base != StringName()) {
+			List<PropertyInfo> plist;
+			ClassDB::get_property_list(instance_base, &plist);
+			for (const PropertyInfo &E : plist) {
+				String prop_name = E.name;
+				if (E.usage & PROPERTY_USAGE_CATEGORY || E.usage & PROPERTY_USAGE_GROUP || E.usage & PROPERTY_USAGE_SUBGROUP) {
+					continue;
+				}
+				if (prop_name.contains_char('/')) {
+					continue;
+				}
+				highlighter->add_member_keyword_color(prop_name, member_variable_color);
+			}
+
+			List<String> clist;
+			ClassDB::get_integer_constant_list(instance_base, &clist);
+			for (const String &E : clist) {
+				highlighter->add_member_keyword_color(E, member_variable_color);
+			}
+		}
+
+		/* Comments */
+		const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
+		for (const String &comment : scr_lang->get_comment_delimiters()) {
+			String beg = comment.get_slicec(' ', 0);
+			String end = comment.get_slice_count(" ") > 1 ? comment.get_slicec(' ', 1) : String();
+			highlighter->add_color_region(beg, end, comment_color, end.is_empty());
+		}
+
+		/* Doc comments */
+		const Color doc_comment_color = EDITOR_GET("text_editor/theme/highlighting/doc_comment_color");
+		for (const String &doc_comment : scr_lang->get_doc_comment_delimiters()) {
+			String beg = doc_comment.get_slicec(' ', 0);
+			String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slicec(' ', 1) : String();
+			highlighter->add_color_region(beg, end, doc_comment_color, end.is_empty());
+		}
+
+		/* Strings */
+		const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
+		for (const String &string : scr_lang->get_string_delimiters()) {
+			String beg = string.get_slicec(' ', 0);
+			String end = string.get_slice_count(" ") > 1 ? string.get_slicec(' ', 1) : String();
+			highlighter->add_color_region(beg, end, string_color, end.is_empty());
+		}
+	}
+}
+
+Ref<EditorSyntaxHighlighter> EditorStandardSyntaxHighlighter::_create() const {
+	Ref<EditorStandardSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instantiate();
+	return syntax_highlighter;
+}
+
+////
+
+Ref<EditorSyntaxHighlighter> EditorPlainTextSyntaxHighlighter::_create() const {
+	Ref<EditorPlainTextSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instantiate();
+	return syntax_highlighter;
+}
+
+////
+
+void EditorJSONSyntaxHighlighter::_update_cache() {
+	highlighter->set_text_edit(text_edit);
+	highlighter->clear_keyword_colors();
+	highlighter->clear_member_keyword_colors();
+	highlighter->clear_color_regions();
+
+	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
+	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
+
+	const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
+	highlighter->add_color_region("\"", "\"", string_color);
+}
+
+Ref<EditorSyntaxHighlighter> EditorJSONSyntaxHighlighter::_create() const {
+	Ref<EditorJSONSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instantiate();
+	return syntax_highlighter;
+}
+
+////
+
+void EditorMarkdownSyntaxHighlighter::_update_cache() {
+	highlighter->set_text_edit(text_edit);
+	highlighter->clear_keyword_colors();
+	highlighter->clear_member_keyword_colors();
+	highlighter->clear_color_regions();
+
+	// Disable automatic symbolic highlights, as these don't make sense for prose.
+	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
+	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
+	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
+	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
+
+	// Headings (any level).
+	const Color function_color = EDITOR_GET("text_editor/theme/highlighting/function_color");
+	highlighter->add_color_region("#", "", function_color);
+
+	// Bold.
+	highlighter->add_color_region("**", "**", function_color);
+	// `__bold__` syntax is not supported as color regions must begin with a symbol,
+	// not a character that is valid in an identifier.
+
+	// Code (both inline code and triple-backticks code blocks).
+	const Color code_color = EDITOR_GET("text_editor/theme/highlighting/engine_type_color");
+	highlighter->add_color_region("`", "`", code_color);
+
+	// Link (both references and inline links with URLs). The URL is not highlighted.
+	const Color link_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
+	highlighter->add_color_region("[", "]", link_color);
+
+	// Quote.
+	const Color quote_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
+	highlighter->add_color_region(">", "", quote_color, true);
+
+	// HTML comment, which is also supported in Markdown.
+	const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
+	highlighter->add_color_region("<!--", "-->", comment_color);
+}
+
+Ref<EditorSyntaxHighlighter> EditorMarkdownSyntaxHighlighter::_create() const {
+	Ref<EditorMarkdownSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instantiate();
+	return syntax_highlighter;
+}
+
+///
+
+void EditorConfigFileSyntaxHighlighter::_update_cache() {
+	highlighter->set_text_edit(text_edit);
+	highlighter->clear_keyword_colors();
+	highlighter->clear_member_keyword_colors();
+	highlighter->clear_color_regions();
+
+	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
+	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
+	// Assume that all function-style syntax is for types such as `Vector2()` and `PackedStringArray()`.
+	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/base_type_color"));
+
+	// Disable member variable highlighting as it's not relevant for ConfigFile.
+	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
+
+	const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
+	highlighter->add_color_region("\"", "\"", string_color);
+
+	// FIXME: Sections in ConfigFile must be at the beginning of a line. Otherwise, it can be an array within a line.
+	const Color function_color = EDITOR_GET("text_editor/theme/highlighting/function_color");
+	highlighter->add_color_region("[", "]", function_color);
+
+	const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
+	highlighter->add_keyword_color("true", keyword_color);
+	highlighter->add_keyword_color("false", keyword_color);
+	highlighter->add_keyword_color("null", keyword_color);
+	highlighter->add_keyword_color("ExtResource", keyword_color);
+	highlighter->add_keyword_color("SubResource", keyword_color);
+
+	const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
+	highlighter->add_color_region(";", "", comment_color);
+}
+
+Ref<EditorSyntaxHighlighter> EditorConfigFileSyntaxHighlighter::_create() const {
+	Ref<EditorConfigFileSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instantiate();
+	return syntax_highlighter;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*** SCRIPT EDITOR ****/
+
+void ScriptEditorBase::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_base_editor"), &ScriptEditorBase::get_base_editor);
+	ClassDB::bind_method(D_METHOD("add_syntax_highlighter", "highlighter"), &ScriptEditorBase::add_syntax_highlighter);
+
+	ADD_SIGNAL(MethodInfo("name_changed"));
+	ADD_SIGNAL(MethodInfo("edited_script_changed"));
+	ADD_SIGNAL(MethodInfo("request_help", PropertyInfo(Variant::STRING, "topic")));
+	ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line")));
+	ADD_SIGNAL(MethodInfo("request_save_history"));
+	ADD_SIGNAL(MethodInfo("request_save_previous_state", PropertyInfo(Variant::DICTIONARY, "state")));
+	ADD_SIGNAL(MethodInfo("go_to_help", PropertyInfo(Variant::STRING, "what")));
+	ADD_SIGNAL(MethodInfo("search_in_files_requested", PropertyInfo(Variant::STRING, "text")));
+	ADD_SIGNAL(MethodInfo("replace_in_files_requested", PropertyInfo(Variant::STRING, "text")));
+	ADD_SIGNAL(MethodInfo("go_to_method", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::STRING, "method")));
+}
 
 void ScriptEditorQuickOpen::popup_dialog(const Vector<String> &p_functions, bool p_dontclear) {
 	popup_centered_ratio(0.6);
@@ -99,6 +386,17 @@ void ScriptEditorQuickOpen::_text_changed(const String &p_newtext) {
 	_update_search();
 }
 
+void ScriptEditorQuickOpen::_sbox_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			search_options->gui_input(key);
+			search_box->accept_event();
+		}
+	}
+}
+
 void ScriptEditorQuickOpen::_update_search() {
 	search_options->clear();
 	TreeItem *root = search_options->create_item();
@@ -132,6 +430,12 @@ void ScriptEditorQuickOpen::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditorQuickOpen::_confirmed));
+
+			search_box->set_clear_button_enabled(true);
+			[[fallthrough]];
+		}
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			search_box->set_right_icon(search_options->get_editor_theme_icon(SNAME("Search")));
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
@@ -145,26 +449,23 @@ void ScriptEditorQuickOpen::_bind_methods() {
 }
 
 ScriptEditorQuickOpen::ScriptEditorQuickOpen() {
-	set_ok_button_text(TTRC("Open"));
-	get_ok_button()->set_disabled(true);
-	set_hide_on_ok(false);
-
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
-
-	search_box = memnew(FilterLineEdit);
+	search_box = memnew(LineEdit);
 	vbc->add_margin_child(TTRC("Search:"), search_box);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &ScriptEditorQuickOpen::_text_changed));
-	register_text_enter(search_box);
-
+	search_box->connect(SceneStringName(gui_input), callable_mp(this, &ScriptEditorQuickOpen::_sbox_input));
 	search_options = memnew(Tree);
-	search_box->set_forward_control(search_options);
+	vbc->add_margin_child(TTRC("Matches:"), search_options, true);
+	set_ok_button_text(TTRC("Open"));
+	get_ok_button()->set_disabled(true);
+	register_text_enter(search_box);
+	set_hide_on_ok(false);
+	search_options->connect("item_activated", callable_mp(this, &ScriptEditorQuickOpen::_confirmed));
 	search_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	search_options->set_hide_root(true);
 	search_options->set_hide_folding(true);
 	search_options->add_theme_constant_override("draw_guides", 1);
-	vbc->add_margin_child(TTRC("Matches:"), search_options, true);
-	search_options->connect("item_activated", callable_mp(this, &ScriptEditorQuickOpen::_confirmed));
 }
 
 /////////////////////////////////
@@ -191,12 +492,28 @@ String ScriptEditor::_get_debug_tooltip(const String &p_text, Node *p_se) {
 	return debug_value;
 }
 
+void ScriptEditor::_breaked(bool p_breaked, bool p_can_debug) {
+	if (external_editor_active) {
+		return;
+	}
+
+	for (int i = 0; i < tab_container->get_tab_count(); i++) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
+		}
+
+		se->set_debugger_active(p_breaked);
+	}
+}
+
 void ScriptEditor::_script_created(Ref<Script> p_script) {
 	EditorNode::get_singleton()->push_item(p_script.operator->());
 }
 
 void ScriptEditor::_goto_script_line2(int p_line) {
-	if (TextEditorBase *current = Object::cast_to<TextEditorBase>(_get_current_editor())) {
+	ScriptEditorBase *current = _get_current_editor();
+	if (current) {
 		current->goto_line(p_line);
 	}
 }
@@ -206,22 +523,46 @@ void ScriptEditor::_goto_script_line(Ref<RefCounted> p_script, int p_line) {
 	if (scr.is_valid() && (scr->has_source_code() || scr->get_path().is_resource_file())) {
 		if (edit(p_script, p_line, 0)) {
 			EditorNode::get_singleton()->push_item(p_script.ptr());
+
+			ScriptEditorBase *current = _get_current_editor();
+			if (ScriptTextEditor *script_text_editor = Object::cast_to<ScriptTextEditor>(current)) {
+				script_text_editor->goto_line_centered(p_line);
+			} else if (current) {
+				current->goto_line(p_line);
+			}
+
+			_save_history();
 		}
 	}
 }
 
-void ScriptEditor::_change_execution(Ref<RefCounted> p_script, int p_line, bool p_set) {
+void ScriptEditor::_set_execution(Ref<RefCounted> p_script, int p_line) {
 	Ref<Script> scr = Object::cast_to<Script>(*p_script);
 	if (scr.is_valid() && (scr->has_source_code() || scr->get_path().is_resource_file())) {
 		for (int i = 0; i < tab_container->get_tab_count(); i++) {
-			if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(tab_container->get_tab_control(i))) {
-				if ((scr.is_valid() && teb->get_edited_resource() == p_script) || teb->get_edited_resource()->get_path() == scr->get_path()) {
-					if (p_set) {
-						teb->set_executing_line(p_line);
-					} else {
-						teb->clear_executing_line();
-					}
-				}
+			ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+			if (!se) {
+				continue;
+			}
+
+			if ((scr.is_valid() && se->get_edited_resource() == p_script) || se->get_edited_resource()->get_path() == scr->get_path()) {
+				se->set_executing_line(p_line);
+			}
+		}
+	}
+}
+
+void ScriptEditor::_clear_execution(Ref<RefCounted> p_script) {
+	Ref<Script> scr = Object::cast_to<Script>(*p_script);
+	if (scr.is_valid() && (scr->has_source_code() || scr->get_path().is_resource_file())) {
+		for (int i = 0; i < tab_container->get_tab_count(); i++) {
+			ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+			if (!se) {
+				continue;
+			}
+
+			if ((scr.is_valid() && se->get_edited_resource() == p_script) || se->get_edited_resource()->get_path() == scr->get_path()) {
+				se->clear_executing_line();
 			}
 		}
 	}
@@ -232,9 +573,9 @@ void ScriptEditor::_set_breakpoint(Ref<RefCounted> p_script, int p_line, bool p_
 	if (scr.is_valid() && (scr->has_source_code() || scr->get_path().is_resource_file())) {
 		// Update if open.
 		for (int i = 0; i < tab_container->get_tab_count(); i++) {
-			CodeEditorBase *ceb = Object::cast_to<CodeEditorBase>(tab_container->get_tab_control(i));
-			if (ceb && ceb->get_edited_resource()->get_path() == scr->get_path()) {
-				ceb->set_breakpoint(p_line, p_enabled);
+			ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+			if (se && se->get_edited_resource()->get_path() == scr->get_path()) {
+				se->set_breakpoint(p_line, p_enabled);
 				return;
 			}
 		}
@@ -261,8 +602,9 @@ void ScriptEditor::_set_breakpoint(Ref<RefCounted> p_script, int p_line, bool p_
 
 void ScriptEditor::_clear_breakpoints() {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (CodeEditorBase *ceb = Object::cast_to<CodeEditorBase>(tab_container->get_tab_control(i))) {
-			ceb->clear_breakpoints();
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			se->clear_breakpoints();
 		}
 	}
 
@@ -312,10 +654,8 @@ void ScriptEditor::_save_history() {
 	if (history_pos >= 0 && history_pos < history.size() && history[history_pos].control == tab_container->get_current_tab_control()) {
 		Node *n = tab_container->get_current_tab_control();
 
-		if (Object::cast_to<TextEditorBase>(n)) {
-			Dictionary nav_state = Object::cast_to<TextEditorBase>(n)->get_navigation_state();
-			nav_state["ensure_caret_visible"] = true;
-			history.write[history_pos].state = nav_state;
+		if (Object::cast_to<ScriptEditorBase>(n)) {
+			history.write[history_pos].state = Object::cast_to<ScriptEditorBase>(n)->get_navigation_state();
 		}
 		if (Object::cast_to<EditorHelp>(n)) {
 			history.write[history_pos].state = Object::cast_to<EditorHelp>(n)->get_scroll();
@@ -359,7 +699,8 @@ void ScriptEditor::_save_previous_state(Dictionary p_state) {
 }
 
 void ScriptEditor::_go_to_tab(int p_idx) {
-	if (ScriptEditorBase *current = _get_current_editor()) {
+	ScriptEditorBase *current = _get_current_editor();
+	if (current) {
 		if (current->is_unsaved()) {
 			current->apply_code();
 		}
@@ -373,10 +714,8 @@ void ScriptEditor::_go_to_tab(int p_idx) {
 	if (history_pos >= 0 && history_pos < history.size() && history[history_pos].control == tab_container->get_current_tab_control()) {
 		Node *n = tab_container->get_current_tab_control();
 
-		if (Object::cast_to<TextEditorBase>(n)) {
-			Dictionary nav_state = Object::cast_to<TextEditorBase>(n)->get_navigation_state();
-			nav_state["ensure_caret_visible"] = true;
-			history.write[history_pos].state = nav_state;
+		if (Object::cast_to<ScriptEditorBase>(n)) {
+			history.write[history_pos].state = Object::cast_to<ScriptEditorBase>(n)->get_navigation_state();
 		}
 		if (Object::cast_to<EditorHelp>(n)) {
 			history.write[history_pos].state = Object::cast_to<EditorHelp>(n)->get_scroll();
@@ -397,10 +736,10 @@ void ScriptEditor::_go_to_tab(int p_idx) {
 
 	c = tab_container->get_current_tab_control();
 
-	if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(c)) {
-		TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb);
-		if (teb && is_visible_in_tree()) {
-			teb->ensure_focus();
+	ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(c);
+	if (seb) {
+		if (is_visible_in_tree()) {
+			seb->ensure_focus();
 		}
 
 		Ref<Script> scr = seb->get_edited_resource();
@@ -408,12 +747,12 @@ void ScriptEditor::_go_to_tab(int p_idx) {
 			notify_script_changed(scr);
 		}
 
-		seb->validate_script();
+		seb->validate();
 	}
 
-	if (EditorHelp *eh = Object::cast_to<EditorHelp>(c)) {
-		script_name_button->set_text(eh->get_class());
-		_calculate_script_name_button_size();
+	EditorHelp *eh = Object::cast_to<EditorHelp>(c);
+	if (eh) {
+		script_name_label->set_text(eh->get_class());
 
 		if (is_visible_in_tree()) {
 			eh->set_focused();
@@ -481,7 +820,11 @@ void ScriptEditor::_open_recent_script(int p_idx) {
 	String path = rc[p_idx];
 	// if its not on disk its a help file or deleted
 	if (FileAccess::exists(path)) {
-		if (_get_recognized_extensions().find(path.get_extension())) {
+		List<String> extensions;
+		ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
+		ResourceLoader::get_recognized_extensions_for_type("JSON", &extensions);
+
+		if (extensions.find(path.get_extension())) {
 			Ref<Resource> scr = ResourceLoader::load(path);
 			if (scr.is_valid()) {
 				edit(scr, true);
@@ -530,7 +873,8 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
 
 	Node *tselected = tab_container->get_tab_control(selected);
 
-	if (ScriptEditorBase *current = Object::cast_to<ScriptEditorBase>(tselected)) {
+	ScriptEditorBase *current = Object::cast_to<ScriptEditorBase>(tselected);
+	if (current) {
 		Ref<Resource> file = current->get_edited_resource();
 		if (p_save && file.is_valid()) {
 			// Do not try to save internal scripts, but prompt to save in-memory
@@ -573,7 +917,8 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
 	}
 
 	int idx = tab_container->get_current_tab();
-	if (TextEditorBase *current = Object::cast_to<TextEditorBase>(tselected)) {
+	if (current) {
+		current->clear_edit_menu();
 		_save_editor_state(current);
 	}
 	memdelete(tselected);
@@ -590,8 +935,7 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
 		} else {
 			_update_selected_editor_menu();
 			_update_online_doc();
-			script_name_button->set_text(String());
-			_calculate_script_name_button_size();
+			script_name_label->set_text(String());
 		}
 
 		_update_history_arrows();
@@ -617,22 +961,26 @@ void ScriptEditor::_close_discard_current_tab(const String &p_str) {
 void ScriptEditor::_close_docs_tab() {
 	int child_count = tab_container->get_tab_count();
 	for (int i = child_count - 1; i >= 0; i--) {
-		if (Object::cast_to<EditorHelp>(tab_container->get_tab_control(i))) {
+		EditorHelp *se = Object::cast_to<EditorHelp>(tab_container->get_tab_control(i));
+
+		if (se) {
 			_close_tab(i, true, false);
 		}
 	}
 }
 
 void ScriptEditor::_copy_script_path() {
-	if (ScriptEditorBase *seb = _get_current_editor()) {
-		Ref<Resource> scr = seb->get_edited_resource();
+	ScriptEditorBase *se = _get_current_editor();
+	if (se) {
+		Ref<Resource> scr = se->get_edited_resource();
 		DisplayServer::get_singleton()->clipboard_set(scr->get_path());
 	}
 }
 
 void ScriptEditor::_copy_script_uid() {
-	if (ScriptEditorBase *seb = _get_current_editor()) {
-		Ref<Resource> scr = seb->get_edited_resource();
+	ScriptEditorBase *se = _get_current_editor();
+	if (se) {
+		Ref<Resource> scr = se->get_edited_resource();
 		ResourceUID::ID uid = ResourceLoader::get_resource_uid(scr->get_path());
 		DisplayServer::get_singleton()->clipboard_set(ResourceUID::get_singleton()->id_to_text(uid));
 	}
@@ -670,11 +1018,11 @@ void ScriptEditor::_queue_close_tabs() {
 		script_close_queue.pop_front();
 
 		tab_container->set_current_tab(idx);
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(idx));
-		if (seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(idx));
+		if (se) {
 			// Maybe there are unsaved changes.
-			if (seb->is_unsaved()) {
-				_ask_close_current_unsaved_tab(seb);
+			if (se->is_unsaved()) {
+				_ask_close_current_unsaved_tab(se);
 				erase_tab_confirm->connect(SceneStringName(visibility_changed), callable_mp(this, &ScriptEditor::_queue_close_tabs), CONNECT_ONE_SHOT);
 				break;
 			}
@@ -694,28 +1042,38 @@ void ScriptEditor::_resave_scripts(const String &p_str) {
 	apply_scripts();
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		Ref<Resource> scr = seb->get_edited_resource();
+		Ref<Resource> scr = se->get_edited_resource();
 
 		if (scr->is_built_in()) {
 			continue; // Internal script, who cares.
 		}
 
-		_auto_format_text(seb);
+		if (trim_trailing_whitespace_on_save) {
+			se->trim_trailing_whitespace();
+		}
+
+		if (trim_final_newlines_on_save) {
+			se->trim_final_newlines();
+		}
+
+		if (convert_indent_on_save) {
+			se->convert_indent();
+		}
 
 		Ref<TextFile> text_file = scr;
 		if (text_file.is_valid()) {
-			seb->apply_code();
+			se->apply_code();
 			_save_text_file(text_file, text_file->get_path());
 			break;
 		} else {
 			EditorNode::get_singleton()->save_resource(scr);
 		}
-		seb->tag_saved_version();
+		se->tag_saved_version();
 	}
 
 	disk_changed->hide();
@@ -723,10 +1081,15 @@ void ScriptEditor::_resave_scripts(const String &p_str) {
 
 void ScriptEditor::_res_saved_callback(const Ref<Resource> &p_res) {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			if (seb->get_edited_resource() == p_res) {
-				seb->tag_saved_version();
-			}
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
+		}
+
+		Ref<Resource> scr = se->get_edited_resource();
+
+		if (scr == p_res) {
+			se->tag_saved_version();
 		}
 	}
 
@@ -749,12 +1112,12 @@ void ScriptEditor::_scene_saved_callback(const String &p_path) {
 
 void ScriptEditor::_mark_built_in_scripts_as_saved(const String &p_parent_path) {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		Ref<Resource> edited_res = seb->get_edited_resource();
+		Ref<Resource> edited_res = se->get_edited_resource();
 		if (!edited_res->is_built_in()) {
 			continue; // External script, who cares.
 		}
@@ -762,7 +1125,7 @@ void ScriptEditor::_mark_built_in_scripts_as_saved(const String &p_parent_path)
 		if (edited_res->get_path().get_slice("::", 0) != p_parent_path) {
 			continue; // Wrong scene.
 		}
-		seb->tag_saved_version();
+		se->tag_saved_version();
 
 		Ref<Script> scr = edited_res;
 		if (scr.is_valid()) {
@@ -810,31 +1173,29 @@ bool ScriptEditor::_test_script_times_on_disk(Ref<Resource> p_for_script) {
 	bool use_autoreload = EDITOR_GET("text_editor/behavior/files/auto_reload_scripts_on_external_change");
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
-			continue;
-		}
-
-		Ref<Resource> edited_res = seb->get_edited_resource();
-		if (p_for_script.is_valid() && edited_res.is_valid() && p_for_script != edited_res) {
-			continue;
-		}
-
-		if (edited_res->is_built_in()) {
-			continue; // Internal script, who cares.
-		}
-
-		uint64_t last_date = seb->edited_file_data.last_modified_time;
-		uint64_t date = FileAccess::get_modified_time(seb->edited_file_data.path);
-
-		if (last_date != date) {
-			TreeItem *ti = disk_changed_list->create_item(r);
-			ti->set_text(0, seb->edited_file_data.path.get_file());
-
-			if (!use_autoreload || seb->is_unsaved()) {
-				need_ask = true;
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			Ref<Resource> edited_res = se->get_edited_resource();
+			if (p_for_script.is_valid() && edited_res.is_valid() && p_for_script != edited_res) {
+				continue;
+			}
+
+			if (edited_res->is_built_in()) {
+				continue; // Internal script, who cares.
+			}
+
+			uint64_t last_date = se->edited_file_data.last_modified_time;
+			uint64_t date = FileAccess::get_modified_time(se->edited_file_data.path);
+
+			if (last_date != date) {
+				TreeItem *ti = disk_changed_list->create_item(r);
+				ti->set_text(0, se->edited_file_data.path.get_file());
+
+				if (!use_autoreload || se->is_unsaved()) {
+					need_ask = true;
+				}
+				need_reload = true;
 			}
-			need_reload = true;
 		}
 	}
 
@@ -952,9 +1313,11 @@ void ScriptEditor::_file_dialog_action(const String &p_file) {
 				EditorNode::get_singleton()->get_editor_main_screen()->select(EditorMainScreen::EDITOR_SCRIPT);
 			}
 			open_file(p_file);
+			file_dialog_option = -1;
 		} break;
 		case FILE_MENU_SAVE_AS: {
-			if (ScriptEditorBase *current = _get_current_editor()) {
+			ScriptEditorBase *current = _get_current_editor();
+			if (current) {
 				Ref<Resource> resource = current->get_edited_resource();
 				String path = ProjectSettings::get_singleton()->localize_path(p_file);
 				Error err = _save_text_file(resource, path);
@@ -979,7 +1342,9 @@ void ScriptEditor::_file_dialog_action(const String &p_file) {
 }
 
 Ref<Script> ScriptEditor::_get_current_script() {
-	if (ScriptEditorBase *current = _get_current_editor()) {
+	ScriptEditorBase *current = _get_current_editor();
+
+	if (current) {
 		Ref<Script> scr = current->get_edited_resource();
 		return scr.is_valid() ? scr : nullptr;
 	} else {
@@ -1007,18 +1372,10 @@ bool ScriptEditor::is_files_panel_toggled() {
 	return list_split->is_visible();
 }
 
-List<String> ScriptEditor::_get_recognized_extensions() {
-	List<String> extensions;
-	for (const String type : { "Script", "JSON" }) {
-		ResourceLoader::get_recognized_extensions_for_type(type, &extensions);
-	}
-	return extensions;
-}
-
 void ScriptEditor::_menu_option(int p_option) {
 	ScriptEditorBase *current = _get_current_editor();
 	switch (p_option) {
-		case FILE_MENU_NEW_SCRIPT: {
+		case FILE_MENU_NEW: {
 			script_create_dialog->config("Node", "new_script", false, false);
 			script_create_dialog->popup_centered();
 		} break;
@@ -1062,9 +1419,12 @@ void ScriptEditor::_menu_option(int p_option) {
 			String path = previous_scripts.back()->get();
 			previous_scripts.pop_back();
 
+			List<String> extensions;
+			ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
+			ResourceLoader::get_recognized_extensions_for_type("JSON", &extensions);
 			bool built_in = !path.is_resource_file();
 
-			if (_get_recognized_extensions().find(path.get_extension()) || built_in) {
+			if (extensions.find(path.get_extension()) || built_in) {
 				if (built_in) {
 					String res_path = path.get_slice("::", 0);
 					EditorNode::get_singleton()->load_scene_or_resource(res_path, false, false);
@@ -1141,7 +1501,8 @@ void ScriptEditor::_menu_option(int p_option) {
 				current->update_toggle_files_button();
 			} else {
 				Control *tab = tab_container->get_current_tab_control();
-				if (EditorHelp *editor_help = Object::cast_to<EditorHelp>(tab)) {
+				EditorHelp *editor_help = Object::cast_to<EditorHelp>(tab);
+				if (editor_help) {
 					editor_help->update_toggle_files_button();
 				}
 			}
@@ -1163,7 +1524,17 @@ void ScriptEditor::_menu_option(int p_option) {
 				save_current_script();
 			} break;
 			case FILE_MENU_SAVE_AS: {
-				_auto_format_text(current);
+				if (trim_trailing_whitespace_on_save) {
+					current->trim_trailing_whitespace();
+				}
+
+				if (trim_final_newlines_on_save) {
+					current->trim_final_newlines();
+				}
+
+				if (convert_indent_on_save) {
+					current->convert_indent();
+				}
 
 				Ref<Resource> resource = current->get_edited_resource();
 				Ref<TextFile> text_file = resource;
@@ -1223,9 +1594,8 @@ void ScriptEditor::_menu_option(int p_option) {
 			} break;
 
 			case FILE_MENU_CLOSE: {
-				ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(current);
-				if (seb && seb->is_unsaved()) {
-					_ask_close_current_unsaved_tab(seb);
+				if (current->is_unsaved()) {
+					_ask_close_current_unsaved_tab(current);
 				} else {
 					_close_current_tab(false);
 				}
@@ -1275,7 +1645,8 @@ void ScriptEditor::_menu_option(int p_option) {
 			} break;
 		}
 	} else {
-		if (EditorHelp *help = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control())) {
+		EditorHelp *help = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control());
+		if (help) {
 			switch (p_option) {
 				case HELP_SEARCH_FIND: {
 					help->popup_search();
@@ -1431,6 +1802,7 @@ void ScriptEditor::_tab_changed(int p_which) {
 void ScriptEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
+			EditorRunBar::get_singleton()->connect("stop_pressed", callable_mp(this, &ScriptEditor::_editor_stop));
 			_apply_editor_settings();
 			[[fallthrough]];
 		}
@@ -1447,8 +1819,6 @@ void ScriptEditor::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			tab_container->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("ScriptEditor"), EditorStringName(EditorStyles)));
 
-			_calculate_script_name_button_size();
-
 			help_search->set_button_icon(get_editor_theme_icon(SNAME("HelpSearch")));
 			site_search->set_button_icon(get_editor_theme_icon(SNAME("ExternalLink")));
 
@@ -1462,14 +1832,6 @@ void ScriptEditor::_notification(int p_what) {
 
 			members_overview_alphabeta_sort_button->set_button_icon(get_editor_theme_icon(SNAME("Sort")));
 
-			bool use_monospace_font = EDITOR_GET("interface/theme/use_monospace_font_for_editor_symbols");
-			Ref<Font> monospace_font = get_theme_font(SNAME("source"), EditorStringName(EditorFonts));
-			if (use_monospace_font) {
-				members_overview->add_theme_font_override(SceneStringName(font), monospace_font);
-			} else {
-				members_overview->remove_theme_font_override(SceneStringName(font));
-			}
-
 			filter_scripts->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 			filter_methods->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 
@@ -1483,7 +1845,7 @@ void ScriptEditor::_notification(int p_what) {
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
 			if (EditorThemeManager::is_generated_theme_outdated() ||
-					EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/fonts") ||
+					EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") ||
 					EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor") ||
 					EditorSettings::get_singleton()->check_changed_settings_in_group("docks/filesystem")) {
 				_apply_editor_settings();
@@ -1533,7 +1895,7 @@ void ScriptEditor::_notification(int p_what) {
 			const bool kb_visible = kb_height > 0;
 
 			if (kb_visible) {
-				if (TextEditorBase *editor = Object::cast_to<TextEditorBase>(_get_current_editor())) {
+				if (ScriptEditorBase *editor = _get_current_editor()) {
 					if (CodeTextEditor *code_editor = editor->get_code_editor()) {
 						if (CodeEdit *text_editor = code_editor->get_text_editor()) {
 							if (!text_editor->has_focus()) {
@@ -1558,6 +1920,11 @@ void ScriptEditor::_notification(int p_what) {
 			menu_hb->set_visible(!kb_visible);
 		} break;
 #endif
+
+		case NOTIFICATION_EXIT_TREE: {
+			EditorRunBar::get_singleton()->disconnect("stop_pressed", callable_mp(this, &ScriptEditor::_editor_stop));
+		} break;
+
 		case NOTIFICATION_APPLICATION_FOCUS_IN: {
 			if (is_inside_tree()) {
 				_test_script_times_on_disk();
@@ -1569,8 +1936,10 @@ void ScriptEditor::_notification(int p_what) {
 
 void ScriptEditor::_close_builtin_scripts_from_scene(const String &p_scene) {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			Ref<Script> scr = seb->get_edited_resource();
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+
+		if (se) {
+			Ref<Script> scr = se->get_edited_resource();
 			if (scr.is_null()) {
 				continue;
 			}
@@ -1596,26 +1965,15 @@ void ScriptEditor::notify_script_changed(const Ref<Script> &p_script) {
 }
 
 Vector<String> ScriptEditor::_get_breakpoints() {
-	List<String> bpoints_list;
-	get_breakpoints(&bpoints_list);
-
 	Vector<String> ret;
-	for (const String &E : bpoints_list) {
-		ret.push_back(E);
-	}
-
-	return ret;
-}
-
-void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
 	HashSet<String> loaded_scripts;
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		CodeEditorBase *ceb = Object::cast_to<CodeEditorBase>(tab_container->get_tab_control(i));
-		if (!ceb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		Ref<Script> scr = ceb->get_edited_resource();
+		Ref<Script> scr = se->get_edited_resource();
 		if (scr.is_null()) {
 			continue;
 		}
@@ -1626,7 +1984,47 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
 			continue;
 		}
 
-		PackedInt32Array bpoints = ceb->get_breakpoints();
+		PackedInt32Array bpoints = se->get_breakpoints();
+		for (int32_t bpoint : bpoints) {
+			ret.push_back(base + ":" + itos((int)bpoint + 1));
+		}
+	}
+
+	// Load breakpoints that are in closed scripts.
+	Vector<String> cached_editors = script_editor_cache->get_sections();
+	for (const String &E : cached_editors) {
+		if (loaded_scripts.has(E)) {
+			continue;
+		}
+
+		Array breakpoints = _get_cached_breakpoints_for_script(E);
+		for (int breakpoint : breakpoints) {
+			ret.push_back(E + ":" + itos((int)breakpoint + 1));
+		}
+	}
+	return ret;
+}
+
+void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
+	HashSet<String> loaded_scripts;
+	for (int i = 0; i < tab_container->get_tab_count(); i++) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
+		}
+
+		Ref<Script> scr = se->get_edited_resource();
+		if (scr.is_null()) {
+			continue;
+		}
+
+		String base = scr->get_path();
+		loaded_scripts.insert(base);
+		if (base.is_empty() || base.begins_with("local://")) {
+			continue;
+		}
+
+		PackedInt32Array bpoints = se->get_breakpoints();
 		for (int32_t bpoint : bpoints) {
 			p_breakpoints->push_back(base + ":" + itos((int)bpoint + 1));
 		}
@@ -1649,33 +2047,38 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
 void ScriptEditor::_members_overview_selected(int p_idx) {
 	int line = members_overview->get_item_metadata(p_idx);
 	ScriptEditorBase *current = _get_current_editor();
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(current)) {
-		teb->goto_line_centered(line);
+	if (ScriptTextEditor *script_text_editor = Object::cast_to<ScriptTextEditor>(current)) {
+		script_text_editor->goto_line_centered(line);
+	} else if (current) {
+		current->goto_line(line);
 	}
 }
 
 void ScriptEditor::_help_overview_selected(int p_idx) {
 	Node *current = tab_container->get_tab_control(tab_container->get_current_tab());
-	if (EditorHelp *eh = Object::cast_to<EditorHelp>(current)) {
-		eh->scroll_to_section(help_overview->get_item_metadata(p_idx));
+	EditorHelp *se = Object::cast_to<EditorHelp>(current);
+	if (!se) {
+		return;
 	}
+	se->scroll_to_section(help_overview->get_item_metadata(p_idx));
 }
 
 void ScriptEditor::_script_selected(int p_idx) {
 	grab_focus_block = !Input::get_singleton()->is_mouse_button_pressed(MouseButton::LEFT); //amazing hack, simply amazing
 
 	_go_to_tab(script_list->get_item_metadata(p_idx));
-	script_name_button->set_text(script_list->get_item_text(p_idx));
-	_calculate_script_name_button_size();
+	script_name_label->set_text(script_list->get_item_text(p_idx));
 	grab_focus_block = false;
 }
 
 void ScriptEditor::ensure_select_current() {
 	if (tab_container->get_tab_count() && tab_container->get_current_tab() >= 0) {
-		if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(_get_current_editor())) {
-			teb->enable_editor();
-			if (teb && !grab_focus_block && is_visible_in_tree()) {
-				teb->ensure_focus();
+		ScriptEditorBase *se = _get_current_editor();
+		if (se) {
+			se->enable_editor(this);
+
+			if (!grab_focus_block && is_visible_in_tree()) {
+				se->ensure_focus();
 			}
 		}
 	}
@@ -1730,8 +2133,8 @@ struct _ScriptEditorItemData {
 };
 
 void ScriptEditor::_update_members_overview_visibility() {
-	ScriptEditorBase *seb = _get_current_editor();
-	if (!seb) {
+	ScriptEditorBase *se = _get_current_editor();
+	if (!se) {
 		members_overview_alphabeta_sort_button->set_visible(false);
 		members_overview->set_visible(false);
 
@@ -1741,7 +2144,7 @@ void ScriptEditor::_update_members_overview_visibility() {
 		return;
 	}
 
-	if (members_overview_enabled && seb->show_members_overview()) {
+	if (members_overview_enabled && se->show_members_overview()) {
 		members_overview_alphabeta_sort_button->set_visible(true);
 		filter_methods->set_visible(true);
 		members_overview->set_visible(true);
@@ -1762,12 +2165,12 @@ void ScriptEditor::_toggle_members_overview_alpha_sort(bool p_alphabetic_sort) {
 void ScriptEditor::_update_members_overview() {
 	members_overview->clear();
 
-	CodeEditorBase *ceb = Object::cast_to<CodeEditorBase>(_get_current_editor());
-	if (!ceb) {
+	ScriptEditorBase *se = _get_current_editor();
+	if (!se) {
 		return;
 	}
 
-	Vector<String> functions = ceb->get_functions();
+	Vector<String> functions = se->get_functions();
 	if (EDITOR_GET("text_editor/script_list/sort_members_outline_alphabetically")) {
 		functions.sort();
 	}
@@ -1807,7 +2210,8 @@ void ScriptEditor::_update_help_overview_visibility() {
 	}
 
 	Node *current = tab_container->get_tab_control(tab_container->get_current_tab());
-	if (!Object::cast_to<EditorHelp>(current)) {
+	EditorHelp *se = Object::cast_to<EditorHelp>(current);
+	if (!se) {
 		help_overview->set_visible(false);
 		return;
 	}
@@ -1832,12 +2236,15 @@ void ScriptEditor::_update_help_overview() {
 	}
 
 	Node *current = tab_container->get_tab_control(tab_container->get_current_tab());
-	if (EditorHelp *eh = Object::cast_to<EditorHelp>(current)) {
-		Vector<Pair<String, int>> sections = eh->get_sections();
-		for (int i = 0; i < sections.size(); i++) {
-			help_overview->add_item(sections[i].first);
-			help_overview->set_item_metadata(i, sections[i].second);
-		}
+	EditorHelp *se = Object::cast_to<EditorHelp>(current);
+	if (!se) {
+		return;
+	}
+
+	Vector<Pair<String, int>> sections = se->get_sections();
+	for (int i = 0; i < sections.size(); i++) {
+		help_overview->add_item(sections[i].first);
+		help_overview->set_item_metadata(i, sections[i].second);
 	}
 }
 
@@ -1913,21 +2320,22 @@ void ScriptEditor::_update_script_names() {
 	Vector<_ScriptEditorItemData> sedata;
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			Ref<Texture2D> icon = seb->get_theme_icon();
-			String path = seb->get_edited_resource()->get_path();
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			Ref<Texture2D> icon = se->get_theme_icon();
+			String path = se->get_edited_resource()->get_path();
 			bool saved = !path.is_empty();
-			String name = seb->get_name();
-			Ref<Script> scr = seb->get_edited_resource();
+			String name = se->get_name();
+			Ref<Script> scr = se->get_edited_resource();
 
 			_ScriptEditorItemData sd;
 			sd.icon = icon;
 			sd.name = name;
 			sd.tooltip = saved ? path : TTR("Unsaved file.");
 			sd.index = i;
-			sd.used = used.has(seb->get_edited_resource());
+			sd.used = used.has(se->get_edited_resource());
 			sd.category = 0;
-			sd.ref = seb;
+			sd.ref = se;
 			if (scr.is_valid()) {
 				sd.tool = scr->is_tool();
 			}
@@ -1960,7 +2368,7 @@ void ScriptEditor::_update_script_names() {
 				} break;
 			}
 			if (!saved) {
-				sd.name = seb->get_name();
+				sd.name = se->get_name();
 			}
 
 			sedata.push_back(sd);
@@ -2084,31 +2492,16 @@ void ScriptEditor::_update_script_names() {
 		if (tab_container->get_current_tab() == sedata_filtered[i].index) {
 			script_list->select(index);
 
-			if (ScriptEditorBase *seb = _get_current_editor()) {
-				if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-					teb->enable_editor();
-				}
+			script_name_label->set_text(sedata_filtered[i].name);
+
+			ScriptEditorBase *se = _get_current_editor();
+			if (se) {
+				se->enable_editor(this);
 				_update_selected_editor_menu();
 			}
 		}
 	}
 
-	bool has_active_tab = false;
-
-	for (const _ScriptEditorItemData &sedata_i : sedata) {
-		if (tab_container->get_current_tab() == sedata_i.index) {
-			script_name_button->set_text(sedata_i.name);
-			script_name_button->show();
-			_calculate_script_name_button_size();
-			has_active_tab = true;
-			break;
-		}
-	}
-
-	if (!has_active_tab) {
-		script_name_button->hide();
-	}
-
 	if (!waiting_update_names) {
 		_update_members_overview();
 		_update_help_overview();
@@ -2128,8 +2521,8 @@ Ref<TextFile> ScriptEditor::_load_text_file(const String &p_path, Error *r_error
 	String local_path = ProjectSettings::get_singleton()->localize_path(p_path);
 	String path = ResourceLoader::path_remap(local_path);
 
-	Ref<TextFile> text_file;
-	text_file.instantiate();
+	TextFile *text_file = memnew(TextFile);
+	Ref<TextFile> text_res(text_file);
 	Error err = text_file->load_text(path);
 
 	ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), "Cannot load text file '" + path + "'.");
@@ -2145,7 +2538,7 @@ Ref<TextFile> ScriptEditor::_load_text_file(const String &p_path, Error *r_error
 		*r_error = OK;
 	}
 
-	return text_file;
+	return text_res;
 }
 
 Error ScriptEditor::_save_text_file(Ref<TextFile> p_text_file, const String &p_path) {
@@ -2213,30 +2606,25 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
 	}
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		if ((scr.is_valid() && seb->get_edited_resource() == p_resource) || seb->get_edited_resource()->get_path() == p_resource->get_path()) {
+		if ((scr.is_valid() && se->get_edited_resource() == p_resource) || se->get_edited_resource()->get_path() == p_resource->get_path()) {
 			if (should_open) {
-				if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-					teb->enable_editor();
+				se->enable_editor(this);
 
-					if (tab_container->get_current_tab() != i) {
-						_go_to_tab(i);
-					}
-
-					if (is_visible_in_tree()) {
-						teb->ensure_focus();
-					}
-
-					if (p_line >= 0) {
-						teb->goto_line_centered(p_line, p_col);
-					}
-				} else if (tab_container->get_current_tab() != i) {
+				if (tab_container->get_current_tab() != i) {
 					_go_to_tab(i);
 				}
+				if (is_visible_in_tree()) {
+					se->ensure_focus();
+				}
+
+				if (p_line >= 0) {
+					se->goto_line(p_line, p_col);
+				}
 			}
 			_update_script_names();
 			script_list->ensure_current_is_visible();
@@ -2245,39 +2633,65 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
 	}
 
 	// doesn't have it, make a new one
-	ScriptEditorBase *seb = nullptr;
+
+	ScriptEditorBase *se = nullptr;
 
 	for (int i = script_editor_func_count - 1; i >= 0; i--) {
-		seb = script_editor_funcs[i](p_resource);
-		if (seb) {
+		se = script_editor_funcs[i](p_resource);
+		if (se) {
 			break;
 		}
 	}
-	ERR_FAIL_NULL_V(seb, false);
+	ERR_FAIL_NULL_V(se, false);
 
-	seb->set_edited_resource(p_resource);
+	se->set_edited_resource(p_resource);
 
-	seb->set_toggle_list_control(get_left_list_split());
-	tab_container->add_child(seb);
+	// Syntax highlighting.
+	bool highlighter_set = false;
+	for (int i = 0; i < syntax_highlighters.size(); i++) {
+		Ref<EditorSyntaxHighlighter> highlighter = syntax_highlighters[i]->_create();
+		if (highlighter.is_null()) {
+			continue;
+		}
+		se->add_syntax_highlighter(highlighter);
 
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-		if (p_grab_focus) {
-			teb->enable_editor();
+		if (highlighter_set) {
+			continue;
 		}
 
-		Control *editor_edit_menu = teb->get_edit_menu();
-		if (editor_edit_menu && !editor_edit_menu->get_parent()) {
-			editor_edit_menu->hide();
-			editor_menus.push_back(editor_edit_menu);
-			menu_hb->add_child(editor_edit_menu);
-			menu_hb->move_child(editor_edit_menu, 1);
-			for (int i = 0; i < editor_edit_menu->get_child_count(); ++i) {
-				Control *c = Object::cast_to<Control>(editor_edit_menu->get_child(i));
-				if (c) {
-					c->set_shortcut_context(this);
-				}
+		PackedStringArray languages = highlighter->_get_supported_languages();
+		// If script try language, else use extension.
+		if (scr.is_valid()) {
+			if (languages.has(scr->get_language()->get_name())) {
+				se->set_syntax_highlighter(highlighter);
+				highlighter_set = true;
 			}
+			continue;
 		}
+
+		if (languages.has(p_resource->get_path().get_extension())) {
+			se->set_syntax_highlighter(highlighter);
+			highlighter_set = true;
+		}
+	}
+
+	tab_container->add_child(se);
+
+	if (p_grab_focus) {
+		se->enable_editor(this);
+	}
+
+	// If we delete a script within the filesystem, the original resource path
+	// is lost, so keep it as `edited_file_data` to figure out the exact tab to delete.
+	se->edited_file_data.path = p_resource->get_path();
+	se->edited_file_data.last_modified_time = FileAccess::get_modified_time(p_resource->get_path());
+
+	se->set_tooltip_request_func(callable_mp(this, &ScriptEditor::_get_debug_tooltip));
+
+	if (se->get_edit_menu()) {
+		se->get_edit_menu()->hide();
+		menu_hb->add_child(se->get_edit_menu());
+		menu_hb->move_child(se->get_edit_menu(), 1);
 	}
 
 	if (p_grab_focus) {
@@ -2285,112 +2699,55 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
 		_add_recent_script(p_resource->get_path());
 	}
 
-	// If we delete a script within the filesystem, the original resource path
-	// is lost, so keep it as `edited_file_data` to figure out the exact tab to delete.
-	seb->edited_file_data.path = p_resource->get_path();
-	seb->edited_file_data.last_modified_time = FileAccess::get_modified_time(p_resource->get_path());
-
-	seb->connect("name_changed", callable_mp(this, &ScriptEditor::_update_script_names));
-	seb->connect("edited_script_changed", callable_mp(this, &ScriptEditor::_script_changed));
-
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-		// Syntax highlighting.
-		bool highlighter_set = false;
-		for (int i = 0; i < syntax_highlighters.size(); i++) {
-			Ref<EditorSyntaxHighlighter> highlighter = syntax_highlighters[i]->_create();
-			if (highlighter.is_null()) {
-				continue;
-			}
-			teb->add_syntax_highlighter(highlighter);
-
-			if (highlighter_set) {
-				continue;
-			}
-
-			PackedStringArray languages = highlighter->_get_supported_languages();
-			// If script try language, else use extension.
-			if (scr.is_valid()) {
-				if (languages.has(scr->get_language()->get_name())) {
-					teb->set_syntax_highlighter(highlighter);
-					highlighter_set = true;
-				}
-				continue;
-			}
-
-			if (languages.has(p_resource->get_path().get_extension())) {
-				teb->set_syntax_highlighter(highlighter);
-				highlighter_set = true;
-			}
-		}
-
-		teb->set_tooltip_request_func(callable_mp(this, &ScriptEditor::_get_debug_tooltip));
-
-		teb->connect("request_help", callable_mp(this, &ScriptEditor::_help_search));
-		teb->connect("request_open_script_at_line", callable_mp(this, &ScriptEditor::_goto_script_line));
-		teb->connect("go_to_help", callable_mp(this, &ScriptEditor::_help_class_goto));
-		teb->connect("request_save_history", callable_mp(this, &ScriptEditor::_save_history));
-		teb->connect("request_save_previous_state", callable_mp(this, &ScriptEditor::_save_previous_state));
-		teb->connect("search_in_files_requested", callable_mp(this, &ScriptEditor::open_find_in_files_dialog));
-		teb->connect("replace_in_files_requested", callable_mp(this, &ScriptEditor::_on_replace_in_files_requested));
-		teb->connect("go_to_method", callable_mp(this, &ScriptEditor::script_goto_method));
-
-		if (script_editor_cache->has_section(p_resource->get_path())) {
-			teb->set_edit_state(script_editor_cache->get_value(p_resource->get_path(), "state"));
-			if (ScriptTextEditor *ste = Object::cast_to<ScriptTextEditor>(teb)) {
-				ste->store_previous_state();
-			}
-		}
-
-		if (CodeTextEditor *cte = teb->get_code_editor()) {
-			cte->set_zoom_factor(zoom_factor);
-			cte->connect("zoomed", callable_mp(this, &ScriptEditor::_set_script_zoom_factor));
-			cte->connect(SceneStringName(visibility_changed), callable_mp(this, &ScriptEditor::_update_code_editor_zoom_factor).bind(cte));
+	if (script_editor_cache->has_section(p_resource->get_path())) {
+		se->set_edit_state(script_editor_cache->get_value(p_resource->get_path(), "state"));
+		ScriptTextEditor *ste = Object::cast_to<ScriptTextEditor>(se);
+		if (ste) {
+			ste->store_previous_state();
 		}
 	}
 
 	_sort_list_on_update = true;
 	_update_script_names();
 	_save_layout();
+	se->connect("name_changed", callable_mp(this, &ScriptEditor::_update_script_names));
+	se->connect("edited_script_changed", callable_mp(this, &ScriptEditor::_script_changed));
+	se->connect("request_help", callable_mp(this, &ScriptEditor::_help_search));
+	se->connect("request_open_script_at_line", callable_mp(this, &ScriptEditor::_goto_script_line));
+	se->connect("go_to_help", callable_mp(this, &ScriptEditor::_help_class_goto));
+	se->connect("request_save_history", callable_mp(this, &ScriptEditor::_save_history));
+	se->connect("request_save_previous_state", callable_mp(this, &ScriptEditor::_save_previous_state));
+	se->connect("search_in_files_requested", callable_mp(this, &ScriptEditor::open_find_in_files_dialog));
+	se->connect("replace_in_files_requested", callable_mp(this, &ScriptEditor::_on_replace_in_files_requested));
+	se->connect("go_to_method", callable_mp(this, &ScriptEditor::script_goto_method));
+
+	CodeTextEditor *cte = se->get_code_editor();
+	if (cte) {
+		cte->set_zoom_factor(zoom_factor);
+		cte->connect("zoomed", callable_mp(this, &ScriptEditor::_set_script_zoom_factor));
+		cte->connect(SceneStringName(visibility_changed), callable_mp(this, &ScriptEditor::_update_code_editor_zoom_factor).bind(cte));
+	}
 
 	//test for modification, maybe the script was not edited but was loaded
 
 	_test_script_times_on_disk(p_resource);
 	_update_modified_scripts_for_external_editor(p_resource);
 
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-		if (p_line >= 0) {
-			teb->goto_line_centered(p_line, p_col);
-		}
+	if (p_line >= 0) {
+		se->goto_line(p_line, p_col);
 	}
 
 	notify_script_changed(p_resource);
 	return true;
 }
 
-void ScriptEditor::reload_open_files() {
-	_test_script_times_on_disk();
-	_update_modified_scripts_for_external_editor();
-}
-
 PackedStringArray ScriptEditor::get_unsaved_scripts() const {
 	PackedStringArray unsaved_list;
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (seb && seb->is_unsaved()) {
-			unsaved_list.append(seb->get_name());
-		}
-	}
-	return unsaved_list;
-}
-
-PackedStringArray ScriptEditor::get_unsaved_files() const {
-	PackedStringArray unsaved_list;
-
-	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (seb && seb->is_unsaved()) {
-			unsaved_list.append(seb->get_edited_resource()->get_path());
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se && se->is_unsaved()) {
+			unsaved_list.append(se->get_name());
 		}
 	}
 	return unsaved_list;
@@ -2402,7 +2759,17 @@ void ScriptEditor::save_current_script() {
 		return;
 	}
 
-	_auto_format_text(current);
+	if (trim_trailing_whitespace_on_save) {
+		current->trim_trailing_whitespace();
+	}
+
+	if (trim_final_newlines_on_save) {
+		current->trim_final_newlines();
+	}
+
+	if (convert_indent_on_save) {
+		current->convert_indent();
+	}
 
 	Ref<Resource> resource = current->get_edited_resource();
 	Ref<TextFile> text_file = resource;
@@ -2429,20 +2796,30 @@ void ScriptEditor::save_all_scripts() {
 	HashSet<String> scenes_to_save;
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		_auto_format_text(seb);
+		if (convert_indent_on_save) {
+			se->convert_indent();
+		}
 
-		if (!seb->is_unsaved()) {
+		if (trim_trailing_whitespace_on_save) {
+			se->trim_trailing_whitespace();
+		}
+
+		if (trim_final_newlines_on_save) {
+			se->trim_final_newlines();
+		}
+
+		if (!se->is_unsaved()) {
 			continue;
 		}
 
-		Ref<Resource> edited_res = seb->get_edited_resource();
+		Ref<Resource> edited_res = se->get_edited_resource();
 		if (edited_res.is_valid()) {
-			seb->apply_code();
+			se->apply_code();
 		}
 
 		Ref<Script> scr = edited_res;
@@ -2482,23 +2859,21 @@ void ScriptEditor::save_all_scripts() {
 
 void ScriptEditor::update_script_times() {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			seb->edited_file_data.last_modified_time = FileAccess::get_modified_time(seb->edited_file_data.path);
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			se->edited_file_data.last_modified_time = FileAccess::get_modified_time(se->edited_file_data.path);
 		}
 	}
 }
 
 void ScriptEditor::apply_scripts() const {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
-
-		if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-			teb->insert_final_newline();
-		}
-		seb->apply_code();
+		se->insert_final_newline();
+		se->apply_code();
 	}
 }
 
@@ -2513,12 +2888,12 @@ void ScriptEditor::reload_scripts(bool p_refresh_only) {
 
 void ScriptEditor::_reload_scripts(bool p_refresh_only) {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		Ref<Resource> edited_res = seb->get_edited_resource();
+		Ref<Resource> edited_res = se->get_edited_resource();
 
 		if (edited_res->is_built_in()) {
 			continue; // Internal script, who cares.
@@ -2526,15 +2901,15 @@ void ScriptEditor::_reload_scripts(bool p_refresh_only) {
 
 		if (p_refresh_only) {
 			// Make sure the modified time is correct.
-			seb->edited_file_data.last_modified_time = FileAccess::get_modified_time(edited_res->get_path());
+			se->edited_file_data.last_modified_time = FileAccess::get_modified_time(edited_res->get_path());
 		} else {
-			uint64_t last_date = seb->edited_file_data.last_modified_time;
+			uint64_t last_date = se->edited_file_data.last_modified_time;
 			uint64_t date = FileAccess::get_modified_time(edited_res->get_path());
 
 			if (last_date == date) {
 				continue;
 			}
-			seb->edited_file_data.last_modified_time = date;
+			se->edited_file_data.last_modified_time = date;
 
 			Ref<Script> scr = edited_res;
 			if (scr.is_valid()) {
@@ -2559,31 +2934,13 @@ void ScriptEditor::_reload_scripts(bool p_refresh_only) {
 			}
 		}
 
-		if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(seb)) {
-			Dictionary state = teb->get_edit_state();
-			teb->reload_text();
-			teb->set_edit_state(state);
-		}
+		se->reload_text();
 	}
 
 	disk_changed->hide();
 	_update_script_names();
 }
 
-void ScriptEditor::_auto_format_text(ScriptEditorBase *p_seb) {
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(p_seb)) {
-		if (trim_trailing_whitespace_on_save) {
-			teb->trim_trailing_whitespace();
-		}
-		if (trim_final_newlines_on_save) {
-			teb->trim_final_newlines();
-		}
-		if (convert_indent_on_save) {
-			teb->convert_indent();
-		}
-	}
-}
-
 void ScriptEditor::open_find_in_files_dialog(const String &text) {
 	find_in_files_dialog->set_find_in_files_mode(FindInFilesDialog::SEARCH_MODE);
 	find_in_files_dialog->set_search_text(text);
@@ -2591,7 +2948,7 @@ void ScriptEditor::open_find_in_files_dialog(const String &text) {
 }
 
 void ScriptEditor::open_script_create_dialog(const String &p_base_name, const String &p_base_path) {
-	_menu_option(FILE_MENU_NEW_SCRIPT);
+	_menu_option(FILE_MENU_NEW);
 	script_create_dialog->config(p_base_name, p_base_path);
 }
 
@@ -2602,7 +2959,10 @@ void ScriptEditor::open_text_file_create_dialog(const String &p_base_path, const
 }
 
 Ref<Resource> ScriptEditor::open_file(const String &p_file) {
-	if (_get_recognized_extensions().find(p_file.get_extension())) {
+	List<String> extensions;
+	ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
+	ResourceLoader::get_recognized_extensions_for_type("JSON", &extensions);
+	if (extensions.find(p_file.get_extension())) {
 		Ref<Resource> scr = ResourceLoader::load(p_file);
 		if (scr.is_null()) {
 			EditorNode::get_singleton()->show_warning(TTR("Could not load file at:") + "\n\n" + p_file, TTR("Error!"));
@@ -2627,18 +2987,15 @@ Ref<Resource> ScriptEditor::open_file(const String &p_file) {
 	return Ref<Resource>();
 }
 
-Error ScriptEditor::close_file(const String &p_file) {
+void ScriptEditor::_editor_stop() {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (seb && seb->get_edited_resource()->get_path() == p_file) {
-			if (seb->is_unsaved()) {
-				seb->get_edited_resource()->reload_from_file();
-			}
-			_close_tab(i, false, _get_current_editor() == seb);
-			return OK;
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
 		}
+
+		se->set_debugger_active(false);
 	}
-	return ERR_FILE_NOT_FOUND;
 }
 
 void ScriptEditor::_add_callback(Object *p_obj, const String &p_function, const PackedStringArray &p_args) {
@@ -2653,12 +3010,15 @@ void ScriptEditor::_add_callback(Object *p_obj, const String &p_function, const
 	EditorNode::get_singleton()->push_item(scr.ptr());
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptTextEditor *ste = Object::cast_to<ScriptTextEditor>(tab_container->get_tab_control(i));
-		if (!ste || ste->get_edited_resource() != scr) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
+		}
+		if (se->get_edited_resource() != scr) {
 			continue;
 		}
 
-		ste->add_callback(p_function, p_args);
+		se->add_callback(p_function, p_args);
 
 		_go_to_tab(i);
 
@@ -2667,9 +3027,6 @@ void ScriptEditor::_add_callback(Object *p_obj, const String &p_function, const
 		// Save the current script so the changes can be picked up by an external editor.
 		if (!scr.ptr()->is_built_in()) { // But only if it's not built-in script.
 			save_current_script();
-		} else {
-			ste->apply_code();
-			scr->reload(true);
 		}
 
 		break;
@@ -2690,9 +3047,7 @@ void ScriptEditor::_save_editor_state(ScriptEditorBase *p_editor) {
 		return;
 	}
 
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(p_editor)) {
-		script_editor_cache->set_value(path, "state", teb->get_edit_state());
-	}
+	script_editor_cache->set_value(path, "state", p_editor->get_edit_state());
 	// This is saved later when we save the editor layout.
 }
 
@@ -2728,9 +3083,12 @@ void ScriptEditor::_apply_editor_settings() {
 	ScriptServer::set_reload_scripts_on_save(EDITOR_GET("text_editor/behavior/files/auto_reload_and_parse_scripts_on_save"));
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(tab_container->get_tab_control(i))) {
-			teb->update_settings();
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
 		}
+
+		se->update_settings();
 	}
 }
 
@@ -2744,9 +3102,9 @@ void ScriptEditor::_files_moved(const String &p_old_file, const String &p_new_fi
 	}
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (seb && seb->edited_file_data.path == p_old_file) {
-			seb->edited_file_data.path = p_new_file;
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se && se->edited_file_data.path == p_old_file) {
+			se->edited_file_data.path = p_new_file;
 			break;
 		}
 	}
@@ -2769,8 +3127,11 @@ void ScriptEditor::_files_moved(const String &p_old_file, const String &p_new_fi
 
 void ScriptEditor::_file_removed(const String &p_removed_file) {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (seb && seb->edited_file_data.path == p_removed_file) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
+		}
+		if (se->edited_file_data.path == p_removed_file) {
 			// The script is deleted with no undo, so just close the tab.
 			_close_tab(i, false, false);
 		}
@@ -2787,8 +3148,9 @@ void ScriptEditor::_file_removed(const String &p_removed_file) {
 }
 
 void ScriptEditor::_update_find_replace_bar() {
-	if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(_get_current_editor())) {
-		teb->set_find_replace_bar(find_replace_bar);
+	ScriptEditorBase *se = _get_current_editor();
+	if (se) {
+		se->set_find_replace_bar(find_replace_bar);
 	} else {
 		find_replace_bar->set_text_edit(nullptr);
 		find_replace_bar->hide();
@@ -2837,11 +3199,13 @@ Variant ScriptEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	String preview_name = "";
 	Ref<Texture2D> preview_icon;
 
-	if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(cur_node)) {
-		preview_name = seb->get_name();
-		preview_icon = seb->get_theme_icon();
+	ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(cur_node);
+	if (se) {
+		preview_name = se->get_name();
+		preview_icon = se->get_theme_icon();
 	}
-	if (EditorHelp *eh = Object::cast_to<EditorHelp>(cur_node)) {
+	EditorHelp *eh = Object::cast_to<EditorHelp>(cur_node);
+	if (eh) {
 		preview_name = eh->get_class();
 		preview_icon = get_editor_theme_icon(SNAME("Help"));
 	}
@@ -2873,7 +3237,12 @@ bool ScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
 	if (String(d["type"]) == "script_list_element") {
 		Node *node = Object::cast_to<Node>(d["script_list_element"]);
 
-		if (Object::cast_to<ScriptEditorBase>(node) || Object::cast_to<EditorHelp>(node)) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(node);
+		if (se) {
+			return true;
+		}
+		EditorHelp *eh = Object::cast_to<EditorHelp>(node);
+		if (eh) {
 			return true;
 		}
 	}
@@ -2885,7 +3254,12 @@ bool ScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
 		}
 		Node *node = get_node((nodes[0]));
 
-		if (Object::cast_to<ScriptEditorBase>(node) || Object::cast_to<EditorHelp>(node)) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(node);
+		if (se) {
+			return true;
+		}
+		EditorHelp *eh = Object::cast_to<EditorHelp>(node);
+		if (eh) {
 			return true;
 		}
 	}
@@ -2936,9 +3310,9 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 	if (String(d["type"]) == "script_list_element") {
 		Node *node = Object::cast_to<Node>(d["script_list_element"]);
 
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(node);
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(node);
 		EditorHelp *eh = Object::cast_to<EditorHelp>(node);
-		if (seb || eh) {
+		if (se || eh) {
 			int new_index = 0;
 			if (script_list->get_item_count() > 0) {
 				int pos = 0;
@@ -2964,9 +3338,9 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 		}
 		Node *node = get_node(nodes[0]);
 
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(node);
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(node);
 		EditorHelp *eh = Object::cast_to<EditorHelp>(node);
-		if (seb || eh) {
+		if (se || eh) {
 			int new_index = 0;
 			if (script_list->get_item_count() > 0) {
 				int pos = 0;
@@ -3034,7 +3408,7 @@ void ScriptEditor::input(const Ref<InputEvent> &p_event) {
 	// the shortcut to be used regardless of the click location.
 	// This feature can be disabled to avoid interfering with other uses of the additional
 	// mouse buttons, such as push-to-talk in a VoIP program.
-	if (EDITOR_GET("interface/editor/input/mouse_extra_buttons_navigate_history")) {
+	if (EDITOR_GET("interface/editor/mouse_extra_buttons_navigate_history")) {
 		const Ref<InputEventMouseButton> mb = p_event;
 
 		// Navigate the script history using additional mouse buttons present on some mice.
@@ -3092,7 +3466,8 @@ void ScriptEditor::shortcut_input(const Ref<InputEvent> &p_event) {
 	Callable custom_callback = EditorContextMenuPluginManager::get_singleton()->match_custom_shortcut(EditorContextMenuPlugin::CONTEXT_SLOT_SCRIPT_EDITOR, p_event);
 	if (custom_callback.is_valid()) {
 		Ref<Resource> resource;
-		if (ScriptEditorBase *current = _get_current_editor()) {
+		ScriptEditorBase *current = _get_current_editor();
+		if (current) {
 			resource = current->get_edited_resource();
 		}
 		EditorContextMenuPluginManager::get_singleton()->invoke_callback(custom_callback, resource);
@@ -3120,8 +3495,8 @@ void ScriptEditor::_make_script_list_context_menu() {
 		return;
 	}
 
-	ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(selected));
-	if (seb) {
+	ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(selected));
+	if (se) {
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/save"), FILE_MENU_SAVE);
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/save_as"), FILE_MENU_SAVE_AS);
 	}
@@ -3131,17 +3506,17 @@ void ScriptEditor::_make_script_list_context_menu() {
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_all"), FILE_MENU_CLOSE_ALL);
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_docs"), FILE_MENU_CLOSE_DOCS);
 	context_menu->add_separator();
-	if (seb) {
-		Ref<Script> scr = seb->get_edited_resource();
+	if (se) {
+		Ref<Script> scr = se->get_edited_resource();
 		if (scr.is_valid() && scr->is_tool()) {
 			context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/reload_script_soft"), FILE_MENU_SOFT_RELOAD_TOOL);
 			context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/run_file"), FILE_MENU_RUN);
 			context_menu->add_separator();
 		}
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/copy_path"), FILE_MENU_COPY_PATH);
-		context_menu->set_item_disabled(-1, seb->get_edited_resource()->get_path().is_empty());
+		context_menu->set_item_disabled(-1, se->get_edited_resource()->get_path().is_empty());
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/copy_uid"), FILE_MENU_COPY_UID);
-		context_menu->set_item_disabled(-1, ResourceLoader::get_resource_uid(seb->get_edited_resource()->get_path()) == ResourceUID::INVALID_ID);
+		context_menu->set_item_disabled(-1, ResourceLoader::get_resource_uid(se->get_edited_resource()->get_path()) == ResourceUID::INVALID_ID);
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/show_in_file_system"), FILE_MENU_SHOW_IN_FILE_SYSTEM);
 		context_menu->add_separator();
 	}
@@ -3161,8 +3536,8 @@ void ScriptEditor::_make_script_list_context_menu() {
 
 	// Context menu plugin.
 	Vector<String> selected_paths;
-	if (seb) {
-		Ref<Resource> scr = seb->get_edited_resource();
+	if (se) {
+		Ref<Resource> scr = se->get_edited_resource();
 		if (scr.is_valid()) {
 			String path = scr->get_path();
 			selected_paths.push_back(path);
@@ -3193,7 +3568,9 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 	restoring_layout = true;
 
 	HashSet<String> loaded_scripts;
-	List<String> extensions = _get_recognized_extensions();
+	List<String> extensions;
+	ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
+	ResourceLoader::get_recognized_extensions_for_type("JSON", &extensions);
 
 	for (const Variant &v : scripts) {
 		String path = v;
@@ -3245,8 +3622,9 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 		}
 
 		if (!script_info.is_empty()) {
-			if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(tab_container->get_tab_control(tab_container->get_tab_count() - 1))) {
-				teb->set_edit_state(script_info["state"]);
+			ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(tab_container->get_tab_count() - 1));
+			if (se) {
+				se->set_edit_state(script_info["state"]);
 			}
 		}
 	}
@@ -3300,8 +3678,8 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 		String selected_script = p_layout->get_value("ScriptEditor", "selected_script");
 		// If the selected script is not in the list of open scripts, select nothing.
 		for (int i = 0; i < tab_container->get_tab_count(); i++) {
-			ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-			if (seb && seb->get_edited_resource()->get_path() == selected_script) {
+			ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+			if (se && se->get_edited_resource()->get_path() == selected_script) {
 				_go_to_tab(i);
 				break;
 			}
@@ -3314,8 +3692,9 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
 	Array helps;
 	String selected_script;
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			const String path = seb->get_edited_resource()->get_path();
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			const String path = se->get_edited_resource()->get_path();
 			if (path.is_empty()) {
 				continue;
 			}
@@ -3324,11 +3703,13 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
 				selected_script = path;
 			}
 
-			_save_editor_state(seb);
+			_save_editor_state(se);
 			scripts.push_back(path);
 		}
 
-		if (EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_tab_control(i))) {
+		EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_tab_control(i));
+
+		if (eh) {
 			helps.push_back(eh->get_class());
 		}
 	}
@@ -3437,25 +3818,33 @@ void ScriptEditor::update_docs_from_script(const Ref<Script> &p_script) {
 }
 
 void ScriptEditor::_update_selected_editor_menu() {
-	TextEditorBase *current_editor = Object::cast_to<TextEditorBase>(_get_current_editor());
-	for (Control *editor_menu : editor_menus) {
-		editor_menu->set_visible(current_editor && editor_menu == current_editor->get_edit_menu());
+	for (int i = 0; i < tab_container->get_tab_count(); i++) {
+		bool current = tab_container->get_current_tab() == i;
+
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se && se->get_edit_menu()) {
+			if (current) {
+				se->get_edit_menu()->show();
+			} else {
+				se->get_edit_menu()->hide();
+			}
+		}
 	}
 
-	PopupMenu *search_popup = script_search_menu->get_popup();
-	search_popup->clear();
-	if (Object::cast_to<EditorHelp>(tab_container->get_current_tab_control())) {
-		search_popup->add_shortcut(ED_SHORTCUT("script_editor/find", TTRC("Find..."), KeyModifierMask::CMD_OR_CTRL | Key::F), HELP_SEARCH_FIND);
-		search_popup->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTRC("Find Next"), Key::F3), HELP_SEARCH_FIND_NEXT);
-		search_popup->add_shortcut(ED_SHORTCUT("script_editor/find_previous", TTRC("Find Previous"), KeyModifierMask::SHIFT | Key::F3), HELP_SEARCH_FIND_PREVIOUS);
-		search_popup->add_separator();
-		search_popup->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
-		search_popup->add_shortcut(ED_GET_SHORTCUT("script_editor/replace_in_files"), REPLACE_IN_FILES);
+	EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control());
+	script_search_menu->get_popup()->clear();
+	if (eh) {
+		script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTRC("Find..."), KeyModifierMask::CMD_OR_CTRL | Key::F), HELP_SEARCH_FIND);
+		script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTRC("Find Next"), Key::F3), HELP_SEARCH_FIND_NEXT);
+		script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_previous", TTRC("Find Previous"), KeyModifierMask::SHIFT | Key::F3), HELP_SEARCH_FIND_PREVIOUS);
+		script_search_menu->get_popup()->add_separator();
+		script_search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
+		script_search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_editor/replace_in_files"), REPLACE_IN_FILES);
 		script_search_menu->show();
 	} else {
 		if (tab_container->get_tab_count() == 0) {
-			search_popup->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
-			search_popup->add_shortcut(ED_GET_SHORTCUT("script_editor/replace_in_files"), REPLACE_IN_FILES);
+			script_search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
+			script_search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_editor/replace_in_files"), REPLACE_IN_FILES);
 			script_search_menu->show();
 		} else {
 			script_search_menu->hide();
@@ -3470,10 +3859,8 @@ void ScriptEditor::_unlock_history() {
 void ScriptEditor::_update_history_pos(int p_new_pos) {
 	Node *n = tab_container->get_current_tab_control();
 
-	if (Object::cast_to<TextEditorBase>(n)) {
-		Dictionary nav_state = Object::cast_to<TextEditorBase>(n)->get_navigation_state();
-		nav_state["ensure_caret_visible"] = true;
-		history.write[history_pos].state = nav_state;
+	if (Object::cast_to<ScriptEditorBase>(n)) {
+		history.write[history_pos].state = Object::cast_to<ScriptEditorBase>(n)->get_navigation_state();
 	}
 	if (Object::cast_to<EditorHelp>(n)) {
 		history.write[history_pos].state = Object::cast_to<EditorHelp>(n)->get_scroll();
@@ -3486,25 +3873,24 @@ void ScriptEditor::_update_history_pos(int p_new_pos) {
 
 	ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(n);
 	if (seb) {
-		if (TextEditorBase *teb = Object::cast_to<TextEditorBase>(n)) {
-			lock_history = true;
-			teb->set_edit_state(history[history_pos].state);
-			// `set_edit_state()` can modify the caret position which might trigger a
-			// request to save the history. Since `TextEdit::caret_changed` is emitted
-			// deferred, we need to defer unlocking of the history as well.
-			callable_mp(this, &ScriptEditor::_unlock_history).call_deferred();
-			teb->ensure_focus();
-		}
+		lock_history = true;
+		seb->set_edit_state(history[history_pos].state);
+		// `set_edit_state()` can modify the caret position which might trigger a
+		// request to save the history. Since `TextEdit::caret_changed` is emitted
+		// deferred, we need to defer unlocking of the history as well.
+		callable_mp(this, &ScriptEditor::_unlock_history).call_deferred();
+		seb->ensure_focus();
 
 		Ref<Script> scr = seb->get_edited_resource();
 		if (scr.is_valid()) {
 			notify_script_changed(scr);
 		}
 
-		seb->validate_script();
+		seb->validate();
 	}
 
-	if (EditorHelp *eh = Object::cast_to<EditorHelp>(n)) {
+	EditorHelp *eh = Object::cast_to<EditorHelp>(n);
+	if (eh) {
 		eh->set_scroll(history[history_pos].state);
 		eh->set_focused();
 	}
@@ -3531,12 +3917,12 @@ Vector<Ref<Script>> ScriptEditor::get_open_scripts() const {
 	Vector<Ref<Script>> out_scripts = Vector<Ref<Script>>();
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
-		if (!seb) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
 			continue;
 		}
 
-		Ref<Script> scr = seb->get_edited_resource();
+		Ref<Script> scr = se->get_edited_resource();
 		if (scr.is_valid()) {
 			out_scripts.push_back(scr);
 		}
@@ -3548,9 +3934,11 @@ Vector<Ref<Script>> ScriptEditor::get_open_scripts() const {
 TypedArray<ScriptEditorBase> ScriptEditor::_get_open_script_editors() const {
 	TypedArray<ScriptEditorBase> script_editors;
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
-		if (ScriptEditorBase *seb = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i))) {
-			script_editors.push_back(seb);
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (!se) {
+			continue;
 		}
+		script_editors.push_back(se);
 	}
 	return script_editors;
 }
@@ -3582,38 +3970,29 @@ void ScriptEditor::set_live_auto_reload_running_scripts(bool p_enabled) {
 	auto_reload_running_scripts = p_enabled;
 }
 
-void ScriptEditor::_calculate_script_name_button_size() {
-	Ref<Font> font = script_name_button->get_theme_font(SceneStringName(font), SNAME("Button"));
-	HorizontalAlignment alignment = script_name_button->get_text_alignment();
-	int font_size = script_name_button->get_theme_font_size(SceneStringName(font_size), SNAME("Button"));
-	String text = script_name_button->get_text();
-	int jst_flags = TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_SKIP_LAST_LINE | TextServer::JUSTIFICATION_DO_NOT_SKIP_SINGLE_LINE;
-	TextServer::Direction direction = TextServer::Direction(script_name_button->get_text_direction());
-	Vector2 text_size = font->get_string_size(text, alignment, -1, font_size, jst_flags, direction, TextServer::ORIENTATION_HORIZONTAL);
-
-	script_name_width = text_size.x + script_name_button->get_theme_stylebox(CoreStringName(normal))->get_content_margin(SIDE_LEFT) + script_name_button->get_theme_stylebox(CoreStringName(normal))->get_content_margin(SIDE_RIGHT);
-	_calculate_script_name_button_ratio();
+void ScriptEditor::_help_search(const String &p_text) {
+	help_search_dialog->popup_dialog(p_text);
 }
 
-void ScriptEditor::_calculate_script_name_button_ratio() {
-	const float total_width = script_name_button_hbox->get_size().width;
-	if (total_width <= 0) {
+void ScriptEditor::_open_script_request(const String &p_path) {
+	Ref<Script> scr = ResourceLoader::load(p_path);
+	if (scr.is_valid()) {
+		script_editor->edit(scr, false);
 		return;
 	}
 
-	// Make the ratios a fraction bigger, to avoid unnecessary trimming.
-	const float extra_ratio = 4 / total_width;
+	Ref<JSON> json = ResourceLoader::load(p_path);
+	if (json.is_valid()) {
+		script_editor->edit(json, false);
+		return;
+	}
 
-	const float script_name_ratio = MIN(1, script_name_width / total_width + extra_ratio);
-	script_name_button->set_stretch_ratio(script_name_ratio);
-
-	float ratio_left = 1 - script_name_ratio;
-	script_name_button_left_spacer->set_stretch_ratio(ratio_left / 2);
-	script_name_button_right_spacer->set_stretch_ratio(ratio_left / 2);
-}
-
-void ScriptEditor::_help_search(const String &p_text) {
-	help_search_dialog->popup_dialog(p_text);
+	Error err;
+	Ref<TextFile> text_file = script_editor->_load_text_file(p_path, &err);
+	if (text_file.is_valid()) {
+		script_editor->edit(text_file, false);
+		return;
+	}
 }
 
 void ScriptEditor::register_syntax_highlighter(const Ref<EditorSyntaxHighlighter> &p_syntax_highlighter) {
@@ -3799,19 +4178,13 @@ void ScriptEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_current_script"), &ScriptEditor::_get_current_script);
 	ClassDB::bind_method(D_METHOD("get_open_scripts"), &ScriptEditor::_get_open_scripts);
 	ClassDB::bind_method(D_METHOD("open_script_create_dialog", "base_name", "base_path"), &ScriptEditor::open_script_create_dialog);
-	ClassDB::bind_method(D_METHOD("reload_open_files"), &ScriptEditor::reload_open_files);
 
 	ClassDB::bind_method(D_METHOD("goto_help", "topic"), &ScriptEditor::goto_help);
 	ClassDB::bind_method(D_METHOD("update_docs_from_script", "script"), &ScriptEditor::update_docs_from_script);
 	ClassDB::bind_method(D_METHOD("clear_docs_from_script", "script"), &ScriptEditor::clear_docs_from_script);
 
-	ClassDB::bind_method(D_METHOD("get_unsaved_files"), &ScriptEditor::get_unsaved_files);
-
-	ClassDB::bind_method(D_METHOD("save_all_scripts"), &ScriptEditor::save_all_scripts);
-	ClassDB::bind_method(D_METHOD("close_file", "path"), &ScriptEditor::close_file);
-
-	ADD_SIGNAL(MethodInfo("editor_script_changed", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static())));
-	ADD_SIGNAL(MethodInfo("script_close", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static())));
+	ADD_SIGNAL(MethodInfo("editor_script_changed", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script")));
+	ADD_SIGNAL(MethodInfo("script_close", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script")));
 }
 
 ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
@@ -3837,7 +4210,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	script_split = memnew(HSplitContainer);
 	main_container->add_child(script_split);
 	script_split->set_v_size_flags(SIZE_EXPAND_FILL);
-	script_split->set_drag_nested_intersections(true);
 
 #ifdef ANDROID_ENABLED
 	virtual_keyboard_spacer = memnew(Control);
@@ -3848,7 +4220,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	list_split = memnew(VSplitContainer);
 	script_split->add_child(list_split);
 	list_split->set_v_size_flags(SIZE_EXPAND_FILL);
-	list_split->set_drag_nested_intersections(true);
 
 	scripts_vbox = memnew(VBoxContainer);
 	scripts_vbox->set_v_size_flags(SIZE_EXPAND_FILL);
@@ -3951,7 +4322,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	file_menu->set_shortcut_context(this);
 	menu_hb->add_child(file_menu);
 
-	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new", TTRC("New Script..."), KeyModifierMask::CMD_OR_CTRL | Key::N), FILE_MENU_NEW_SCRIPT);
+	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new", TTRC("New Script..."), KeyModifierMask::CMD_OR_CTRL | Key::N), FILE_MENU_NEW);
 	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new_textfile", TTRC("New Text File..."), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::N), FILE_MENU_NEW_TEXTFILE);
 	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/open", TTRC("Open...")), FILE_MENU_OPEN);
 	file_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_editor/reopen_closed_script"), FILE_MENU_REOPEN_CLOSED);
@@ -3970,8 +4341,8 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	ED_SHORTCUT_OVERRIDE("script_editor/save_all", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::S);
 	file_menu->get_popup()->add_separator();
 	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_script_soft", TTRC("Soft Reload Tool Script"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::ALT | Key::R), FILE_MENU_SOFT_RELOAD_TOOL);
-	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy_path", TTRC("Copy File Path")), FILE_MENU_COPY_PATH);
-	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy_uid", TTRC("Copy File UID")), FILE_MENU_COPY_UID);
+	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy_path", TTRC("Copy Script Path")), FILE_MENU_COPY_PATH);
+	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy_uid", TTRC("Copy Script UID")), FILE_MENU_COPY_UID);
 	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/show_in_file_system", TTRC("Show in FileSystem")), FILE_MENU_SHOW_IN_FILE_SYSTEM);
 	file_menu->get_popup()->add_separator();
 
@@ -4033,30 +4404,16 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	debugger->connect("goto_script_line", callable_mp(this, &ScriptEditor::_goto_script_line));
 	debugger->connect("set_execution", callable_mp(this, &ScriptEditor::_set_execution));
 	debugger->connect("clear_execution", callable_mp(this, &ScriptEditor::_clear_execution));
+	debugger->connect("breaked", callable_mp(this, &ScriptEditor::_breaked));
 	debugger->connect("breakpoint_set_in_tree", callable_mp(this, &ScriptEditor::_set_breakpoint));
 	debugger->connect("breakpoints_cleared_in_tree", callable_mp(this, &ScriptEditor::_clear_breakpoints));
 
-	script_name_button_hbox = memnew(HBoxContainer);
-	script_name_button_hbox->set_h_size_flags(SIZE_EXPAND_FILL);
-	script_name_button_hbox->add_theme_constant_override("separation", 0);
-	script_name_button_hbox->connect(SceneStringName(item_rect_changed), callable_mp(this, &ScriptEditor::_calculate_script_name_button_ratio));
-	menu_hb->add_child(script_name_button_hbox);
-
-	script_name_button_left_spacer = memnew(Control);
-	script_name_button_left_spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	script_name_button_hbox->add_child(script_name_button_left_spacer);
-
-	script_name_button = memnew(Button);
-	script_name_button->set_flat(true);
-	script_name_button->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
-	script_name_button->set_h_size_flags(SIZE_EXPAND_FILL);
-	script_name_button->set_tooltip_text(TTRC("Navigate to script list."));
-	script_name_button->connect(SceneStringName(pressed), callable_mp(script_list, &ItemList::ensure_current_is_visible));
-	script_name_button_hbox->add_child(script_name_button);
-
-	script_name_button_right_spacer = memnew(Control);
-	script_name_button_right_spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	script_name_button_hbox->add_child(script_name_button_right_spacer);
+	script_name_label = memnew(Label);
+	script_name_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
+	script_name_label->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
+	script_name_label->set_focus_mode(FOCUS_ACCESSIBILITY);
+	script_name_label->set_h_size_flags(SIZE_EXPAND_FILL);
+	menu_hb->add_child(script_name_label);
 
 	site_search = memnew(Button);
 	site_search->set_theme_type_variation(SceneStringName(FlatButton));
@@ -4183,6 +4540,8 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	trim_final_newlines_on_save = EDITOR_GET("text_editor/behavior/files/trim_final_newlines_on_save");
 	convert_indent_on_save = EDITOR_GET("text_editor/behavior/files/convert_indent_on_save");
 
+	ScriptServer::edit_request_func = _open_script_request;
+
 	Ref<EditorJSONSyntaxHighlighter> json_syntax_highlighter;
 	json_syntax_highlighter.instantiate();
 	register_syntax_highlighter(json_syntax_highlighter);
@@ -4292,10 +4651,6 @@ bool ScriptEditorPlugin::open_in_external_editor(const String &p_path, int p_lin
 }
 
 void ScriptEditorPlugin::edit(Object *p_object) {
-	if (!p_object) {
-		return;
-	}
-
 	if (Object::cast_to<Script>(p_object)) {
 		Script *p_script = Object::cast_to<Script>(p_object);
 		String res_path = p_script->get_path().get_slice("::", 0);
@@ -4304,22 +4659,28 @@ void ScriptEditorPlugin::edit(Object *p_object) {
 			EditorNode::get_singleton()->load_scene_or_resource(res_path, false, false);
 		}
 		script_editor->edit(p_script);
-	} else if (Object::cast_to<JSON>(p_object) || Object::cast_to<TextFile>(p_object)) {
-		script_editor->edit(Object::cast_to<Resource>(p_object));
+	} else if (Object::cast_to<JSON>(p_object)) {
+		script_editor->edit(Object::cast_to<JSON>(p_object));
+	} else if (Object::cast_to<TextFile>(p_object)) {
+		script_editor->edit(Object::cast_to<TextFile>(p_object));
 	}
 }
 
 bool ScriptEditorPlugin::handles(Object *p_object) const {
+	if (Object::cast_to<TextFile>(p_object)) {
+		return true;
+	}
+
 	if (Object::cast_to<Script>(p_object)) {
 		return true;
-	} else if (Object::cast_to<JSON>(p_object)) {
+	}
+
+	if (Object::cast_to<JSON>(p_object)) {
 		// This is here to stop resource files of class JSON from getting confused
 		// with json files and being opened in the text editor.
 		if (Object::cast_to<JSON>(p_object)->get_path().get_extension().to_lower() == "json") {
 			return true;
 		}
-	} else if (Object::cast_to<TextFile>(p_object)) {
-		return true;
 	}
 
 	return p_object->is_class("Script");
diff --git a/engine/editor/script/script_editor_plugin.h b/engine/editor/script/script_editor_plugin.h
index 25d87aba..066d4286 100644
--- a/engine/editor/script/script_editor_plugin.h
+++ b/engine/editor/script/script_editor_plugin.h
@@ -30,18 +30,16 @@
 
 #pragma once
 
-#include "core/error/error_list.h"
 #include "core/object/script_language.h"
 #include "editor/plugins/editor_plugin.h"
-#include "editor/script/script_editor_base.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/panel_container.h"
+#include "scene/resources/syntax_highlighter.h"
 #include "scene/resources/text_file.h"
 
 class CodeTextEditor;
 class EditorFileDialog;
 class EditorHelpSearch;
-class FilterLineEdit;
 class FindReplaceBar;
 class HSplitContainer;
 class ItemList;
@@ -51,18 +49,129 @@ class TextureRect;
 class Tree;
 class VSplitContainer;
 class WindowWrapper;
-class EditorSyntaxHighlighter;
-class ScriptEditorBase;
+
+class EditorSyntaxHighlighter : public SyntaxHighlighter {
+	GDCLASS(EditorSyntaxHighlighter, SyntaxHighlighter)
+
+private:
+	Ref<RefCounted> edited_resource;
+
+protected:
+	static void _bind_methods();
+
+	GDVIRTUAL0RC(String, _get_name)
+	GDVIRTUAL0RC(PackedStringArray, _get_supported_languages)
+	GDVIRTUAL0RC(Ref<EditorSyntaxHighlighter>, _create)
+
+public:
+	virtual String _get_name() const;
+	virtual PackedStringArray _get_supported_languages() const;
+
+	void _set_edited_resource(const Ref<Resource> &p_res) { edited_resource = p_res; }
+	Ref<RefCounted> _get_edited_resource() { return edited_resource; }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const;
+};
+
+class EditorStandardSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(EditorStandardSyntaxHighlighter, EditorSyntaxHighlighter)
+
+private:
+	Ref<CodeHighlighter> highlighter;
+	ScriptLanguage *script_language = nullptr; // See GH-89610.
+
+public:
+	virtual void _update_cache() override;
+	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
+
+	virtual String _get_name() const override { return TTR("Standard"); }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
+
+	void _set_script_language(ScriptLanguage *p_script_language) { script_language = p_script_language; }
+
+	EditorStandardSyntaxHighlighter() { highlighter.instantiate(); }
+};
+
+class EditorPlainTextSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(EditorPlainTextSyntaxHighlighter, EditorSyntaxHighlighter)
+
+public:
+	virtual String _get_name() const override { return TTR("Plain Text"); }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
+};
+
+class EditorJSONSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(EditorJSONSyntaxHighlighter, EditorSyntaxHighlighter)
+
+private:
+	Ref<CodeHighlighter> highlighter;
+
+public:
+	virtual void _update_cache() override;
+	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
+
+	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "json" }; }
+	virtual String _get_name() const override { return TTR("JSON"); }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
+
+	EditorJSONSyntaxHighlighter() { highlighter.instantiate(); }
+};
+
+class EditorMarkdownSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(EditorMarkdownSyntaxHighlighter, EditorSyntaxHighlighter)
+
+private:
+	Ref<CodeHighlighter> highlighter;
+
+public:
+	virtual void _update_cache() override;
+	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
+
+	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "md", "markdown" }; }
+	virtual String _get_name() const override { return TTR("Markdown"); }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
+
+	EditorMarkdownSyntaxHighlighter() { highlighter.instantiate(); }
+};
+
+class EditorConfigFileSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(EditorConfigFileSyntaxHighlighter, EditorSyntaxHighlighter)
+
+private:
+	Ref<CodeHighlighter> highlighter;
+
+public:
+	virtual void _update_cache() override;
+	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
+
+	// While not explicitly designed for those formats, this highlighter happens
+	// to handle TSCN, TRES, `project.godot` well. We can expose it in case the
+	// user opens one of these using the script editor (which can be done using
+	// the All Files filter).
+	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "ini", "cfg", "tscn", "tres", "godot" }; }
+	virtual String _get_name() const override { return TTR("ConfigFile"); }
+
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
+
+	EditorConfigFileSyntaxHighlighter() { highlighter.instantiate(); }
+};
+
+///////////////////////////////////////////////////////////////////////////////
 
 class ScriptEditorQuickOpen : public ConfirmationDialog {
 	GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog);
 
-	FilterLineEdit *search_box = nullptr;
+	LineEdit *search_box = nullptr;
 	Tree *search_options = nullptr;
 	String function;
 
 	void _update_search();
 
+	void _sbox_input(const Ref<InputEvent> &p_event);
 	Vector<String> functions;
 
 	void _confirmed();
@@ -77,6 +186,68 @@ public:
 	ScriptEditorQuickOpen();
 };
 
+class EditorDebuggerNode;
+
+class ScriptEditorBase : public VBoxContainer {
+	GDCLASS(ScriptEditorBase, VBoxContainer);
+
+protected:
+	static void _bind_methods();
+
+public:
+	struct EditedFileData {
+		String path;
+		uint64_t last_modified_time = -1;
+	} edited_file_data;
+
+	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) = 0;
+	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) = 0;
+
+	virtual void apply_code() = 0;
+	virtual Ref<Resource> get_edited_resource() const = 0;
+	virtual Vector<String> get_functions() = 0;
+	virtual void set_edited_resource(const Ref<Resource> &p_res) = 0;
+	virtual void enable_editor(Control *p_shortcut_context = nullptr) = 0;
+	virtual void reload_text() = 0;
+	virtual String get_name() = 0;
+	virtual Ref<Texture2D> get_theme_icon() = 0;
+	virtual bool is_unsaved() = 0;
+	virtual Variant get_edit_state() = 0;
+	virtual void set_edit_state(const Variant &p_state) = 0;
+	virtual Variant get_navigation_state() = 0;
+	virtual void goto_line(int p_line, int p_column = 0) = 0;
+	virtual void set_executing_line(int p_line) = 0;
+	virtual void clear_executing_line() = 0;
+	virtual void trim_trailing_whitespace() = 0;
+	virtual void trim_final_newlines() = 0;
+	virtual void insert_final_newline() = 0;
+	virtual void convert_indent() = 0;
+	virtual void ensure_focus() = 0;
+	virtual void tag_saved_version() = 0;
+	virtual void reload(bool p_soft) {}
+	virtual PackedInt32Array get_breakpoints() = 0;
+	virtual void set_breakpoint(int p_line, bool p_enabled) = 0;
+	virtual void clear_breakpoints() = 0;
+	virtual void add_callback(const String &p_function, const PackedStringArray &p_args) = 0;
+	virtual void update_settings() = 0;
+	virtual void set_debugger_active(bool p_active) = 0;
+	virtual void update_toggle_files_button() {}
+
+	virtual bool show_members_overview() = 0;
+
+	virtual void set_tooltip_request_func(const Callable &p_toolip_callback) = 0;
+	virtual Control *get_edit_menu() = 0;
+	virtual void clear_edit_menu() = 0;
+	virtual void set_find_replace_bar(FindReplaceBar *p_bar) = 0;
+
+	virtual Control *get_base_editor() const = 0;
+	virtual CodeTextEditor *get_code_editor() const = 0;
+
+	virtual void validate() = 0;
+};
+
+typedef ScriptEditorBase *(*CreateScriptEditorFunc)(const Ref<Resource> &p_resource);
+
 class EditorScriptCodeCompletionCache;
 class FindInFilesContainer;
 class FindInFilesDialog;
@@ -86,7 +257,7 @@ class ScriptEditor : public PanelContainer {
 
 	enum MenuOptions {
 		// File.
-		FILE_MENU_NEW_SCRIPT,
+		FILE_MENU_NEW,
 		FILE_MENU_NEW_TEXTFILE,
 		FILE_MENU_OPEN,
 		FILE_MENU_REOPEN_CLOSED,
@@ -151,11 +322,11 @@ class ScriptEditor : public PanelContainer {
 
 	HBoxContainer *menu_hb = nullptr;
 	MenuButton *file_menu = nullptr;
+	MenuButton *edit_menu = nullptr;
 	MenuButton *script_search_menu = nullptr;
 	MenuButton *debug_menu = nullptr;
 	PopupMenu *context_menu = nullptr;
 	Timer *autosave_timer = nullptr;
-	LocalVector<Control *> editor_menus;
 
 	PopupMenu *recent_scripts = nullptr;
 	PopupMenu *theme_submenu = nullptr;
@@ -188,11 +359,7 @@ class ScriptEditor : public PanelContainer {
 
 	float zoom_factor = 1.0f;
 
-	HBoxContainer *script_name_button_hbox = nullptr;
-	Control *script_name_button_left_spacer = nullptr;
-	Control *script_name_button_right_spacer = nullptr;
-	Button *script_name_button = nullptr;
-	int script_name_width = 0;
+	Label *script_name_label = nullptr;
 
 	Button *script_back = nullptr;
 	Button *script_forward = nullptr;
@@ -227,8 +394,6 @@ class ScriptEditor : public PanelContainer {
 	List<String> previous_scripts;
 	List<int> script_close_queue;
 
-	List<String> _get_recognized_extensions();
-
 	void _tab_changed(int p_which);
 	void _menu_option(int p_option);
 	void _theme_option(int p_option);
@@ -279,6 +444,8 @@ class ScriptEditor : public PanelContainer {
 
 	void _update_selected_editor_menu();
 
+	void _editor_stop();
+
 	int edit_pass;
 
 	void _add_callback(Object *p_obj, const String &p_function, const PackedStringArray &p_args);
@@ -293,10 +460,10 @@ class ScriptEditor : public PanelContainer {
 
 	void _goto_script_line2(int p_line);
 	void _goto_script_line(Ref<RefCounted> p_script, int p_line);
-	void _change_execution(Ref<RefCounted> p_script, int p_line = -1, bool p_set = false);
-	void _set_execution(Ref<RefCounted> p_script, int p_line) { _change_execution(p_script, p_line, true); }
-	void _clear_execution(Ref<RefCounted> p_script) { _change_execution(p_script); }
+	void _set_execution(Ref<RefCounted> p_script, int p_line);
+	void _clear_execution(Ref<RefCounted> p_script);
 	String _get_debug_tooltip(const String &p_text, Node *p_se);
+	void _breaked(bool p_breaked, bool p_can_debug);
 	void _script_created(Ref<Script> p_script);
 	void _set_breakpoint(Ref<RefCounted> p_script, int p_line, bool p_enabled);
 	void _clear_breakpoints();
@@ -315,7 +482,6 @@ class ScriptEditor : public PanelContainer {
 	void _autosave_scripts();
 	void _update_autosave_timer();
 	void _reload_scripts(bool p_refresh_only = false);
-	void _auto_format_text(ScriptEditorBase *p_seb);
 
 	void _update_members_overview_visibility();
 	void _update_members_overview();
@@ -350,9 +516,6 @@ class ScriptEditor : public PanelContainer {
 	void _script_list_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index);
 	void _make_script_list_context_menu();
 
-	void _calculate_script_name_button_size();
-	void _calculate_script_name_button_ratio();
-
 	void _help_search(const String &p_text);
 
 	void _history_forward();
@@ -394,6 +557,7 @@ class ScriptEditor : public PanelContainer {
 
 	void _window_changed(bool p_visible);
 
+	static void _open_script_request(const String &p_path);
 	void _close_builtin_scripts_from_scene(const String &p_scene);
 
 	static ScriptEditor *script_editor;
@@ -413,7 +577,6 @@ public:
 	void open_script_create_dialog(const String &p_base_name, const String &p_base_path);
 	void open_text_file_create_dialog(const String &p_base_path, const String &p_base_name = "");
 	Ref<Resource> open_file(const String &p_file);
-	Error close_file(const String &p_file);
 
 	void ensure_select_current();
 
@@ -425,8 +588,6 @@ public:
 	Vector<String> _get_breakpoints();
 	void get_breakpoints(List<String> *p_breakpoints);
 
-	void reload_open_files();
-	PackedStringArray get_unsaved_files() const;
 	PackedStringArray get_unsaved_scripts() const;
 	void save_current_script();
 	void save_all_scripts();
@@ -438,8 +599,6 @@ public:
 	void set_scene_root_script(Ref<Script> p_script);
 	Vector<Ref<Script>> get_open_scripts() const;
 
-	ScriptEditorBase *get_current_editor() const { return _get_current_editor(); }
-
 	bool script_goto_method(Ref<Script> p_script, const String &p_method);
 
 	virtual void edited_scene_changed();
diff --git a/engine/editor/script/script_text_editor.cpp b/engine/editor/script/script_text_editor.cpp
index 8091b9b0..d3ae637b 100644
--- a/engine/editor/script/script_text_editor.cpp
+++ b/engine/editor/script/script_text_editor.cpp
@@ -31,13 +31,9 @@
 #include "script_text_editor.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
-#include "core/io/resource_loader.h"
 #include "core/math/expression.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/doc/editor_help.h"
@@ -49,7 +45,6 @@
 #include "editor/inspector/editor_context_menu_plugin.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/multi_node_edit.h"
-#include "editor/script/syntax_highlighters.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
@@ -57,9 +52,6 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/style_box_flat.h"
-#include "servers/rendering/rendering_server.h"
 
 void ConnectionInfoDialog::ok_pressed() {
 }
@@ -135,85 +127,12 @@ ConnectionInfoDialog::ConnectionInfoDialog() {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void ScriptTextEditor::EditMenusSTE::_update_breakpoint_list() {
-	breakpoints_menu->clear();
-	breakpoints_menu->reset_size();
-
-	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_breakpoint"), DEBUG_TOGGLE_BREAKPOINT);
-	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/remove_all_breakpoints"), DEBUG_REMOVE_ALL_BREAKPOINTS);
-	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_next_breakpoint"), DEBUG_GOTO_NEXT_BREAKPOINT);
-	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_breakpoint"), DEBUG_GOTO_PREV_BREAKPOINT);
-
-	TextEditorBase *script_text_editor = _get_active_editor();
-	if (script_text_editor == nullptr) {
-		return;
-	}
-
-	PackedInt32Array breakpoint_list = script_text_editor->get_code_editor()->get_text_editor()->get_breakpointed_lines();
-	if (breakpoint_list.is_empty()) {
-		return;
-	}
-
-	breakpoints_menu->add_separator();
-
-	for (int i = 0; i < breakpoint_list.size(); i++) {
-		// Strip edges to remove spaces or tabs.
-		// Also replace any tabs by spaces, since we can't print tabs in the menu.
-		String line = script_text_editor->get_code_editor()->get_text_editor()->get_line(breakpoint_list[i]).replace("\t", "  ").strip_edges();
-
-		// Limit the size of the line if too big.
-		if (line.length() > 50) {
-			line = line.substr(0, 50);
-		}
-
-		breakpoints_menu->add_item(String::num_int64(breakpoint_list[i] + 1) + " - `" + line + "`");
-		breakpoints_menu->set_item_metadata(-1, breakpoint_list[i]);
-	}
-}
-
-void ScriptTextEditor::EditMenusSTE::_breakpoint_item_pressed(int p_idx) {
-	TextEditorBase *script_text_editor = _get_active_editor();
-	ERR_FAIL_NULL(script_text_editor);
-	if (p_idx < 4) { // Any item before the separator.
-		_edit_option(breakpoints_menu->get_item_id(p_idx));
-	} else {
-		script_text_editor->get_code_editor()->goto_line_centered(breakpoints_menu->get_item_metadata(p_idx));
-	}
-}
-
-ScriptTextEditor::EditMenusSTE::EditMenusSTE() {
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/evaluate_selection"), EDIT_EVALUATE);
-	_popup_move_item(EDIT_DUPLICATE_LINES, edit_menu->get_popup());
-	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_function"), SEARCH_LOCATE_FUNCTION);
-	_popup_move_item(SEARCH_GOTO_LINE, goto_menu->get_popup(), false);
-	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_symbol"), LOOKUP_SYMBOL);
-	_popup_move_item(SEARCH_GOTO_LINE, goto_menu->get_popup());
-
-	edit_menu_fold->add_shortcut(ED_GET_SHORTCUT("script_text_editor/create_code_region"), EDIT_CREATE_CODE_REGION);
-	edit_menu_convert_indent->add_shortcut(ED_GET_SHORTCUT("script_text_editor/auto_indent"), EDIT_AUTO_INDENT);
-
-	search_menu->get_popup()->add_separator();
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/show_tooltip"), SHOW_TOOLTIP_AT_CARET);
-	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/contextual_help"), HELP_CONTEXTUAL);
-
-	breakpoints_menu = memnew(PopupMenu);
-	goto_menu->get_popup()->add_submenu_node_item(TTRC("Breakpoints"), breakpoints_menu);
-	breakpoints_menu->connect("about_to_popup", callable_mp(this, &EditMenusSTE::_update_breakpoint_list));
-	breakpoints_menu->connect("index_pressed", callable_mp(this, &EditMenusSTE::_breakpoint_item_pressed));
-
-	// Update immediately for shortcuts.
-	_update_breakpoint_list();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 Vector<String> ScriptTextEditor::get_functions() {
 	CodeEdit *te = code_editor->get_text_editor();
 	String text = te->get_text();
 	List<String> fnc;
 
-	Ref<Script> script = edited_res;
-	if (script.is_valid() && script->get_language()->validate(text, script->get_path(), &fnc)) {
+	if (script->get_language()->validate(text, script->get_path(), &fnc)) {
 		//if valid rewrite functions to latest
 		functions.clear();
 		for (const String &E : fnc) {
@@ -225,28 +144,29 @@ Vector<String> ScriptTextEditor::get_functions() {
 }
 
 void ScriptTextEditor::apply_code() {
-	Ref<Script> script = edited_res;
-	if (script.is_valid()) {
-		script->set_source_code(code_editor->get_text_editor()->get_text());
-		script->update_exports();
-		if (!pending_dragged_exports.is_empty()) {
-			_assign_dragged_export_variables();
-		}
+	if (script.is_null()) {
+		return;
+	}
+	script->set_source_code(code_editor->get_text_editor()->get_text());
+	script->update_exports();
+	if (!pending_dragged_exports.is_empty()) {
+		_assign_dragged_export_variables();
 	}
 
 	code_editor->get_text_editor()->get_syntax_highlighter()->update_cache();
 }
 
+Ref<Resource> ScriptTextEditor::get_edited_resource() const {
+	return script;
+}
+
 void ScriptTextEditor::set_edited_resource(const Ref<Resource> &p_res) {
+	ERR_FAIL_COND(script.is_valid());
 	ERR_FAIL_COND(p_res.is_null());
-	ERR_FAIL_COND(edited_res.is_valid());
 
-	edited_res = p_res;
+	script = p_res;
 
-	Ref<Script> script = edited_res;
-	ERR_FAIL_COND(script.is_null());
 	code_editor->get_text_editor()->set_text(script->get_source_code());
-
 	code_editor->get_text_editor()->clear_undo_history();
 	code_editor->get_text_editor()->tag_saved_version();
 
@@ -254,25 +174,33 @@ void ScriptTextEditor::set_edited_resource(const Ref<Resource> &p_res) {
 	code_editor->update_line_and_column();
 }
 
-void ScriptTextEditor::enable_editor() {
+void ScriptTextEditor::enable_editor(Control *p_shortcut_context) {
 	if (editor_enabled) {
 		return;
 	}
 
+	editor_enabled = true;
+
 	_enable_code_editor();
 
+	_validate_script();
+
 	if (pending_state != Variant()) {
 		code_editor->set_edit_state(pending_state);
 		pending_state = Variant();
 	}
 
-	TextEditorBase::enable_editor();
+	if (p_shortcut_context) {
+		for (int i = 0; i < edit_hb->get_child_count(); ++i) {
+			Control *c = cast_to<Control>(edit_hb->get_child(i));
+			if (c) {
+				c->set_shortcut_context(p_shortcut_context);
+			}
+		}
+	}
 }
 
 void ScriptTextEditor::_load_theme_settings() {
-	if (!editor_enabled) {
-		return;
-	}
 	CodeEdit *text_edit = code_editor->get_text_editor();
 
 	Color updated_warning_line_color = EDITOR_GET("text_editor/theme/highlighting/warning_color");
@@ -308,16 +236,7 @@ void ScriptTextEditor::_load_theme_settings() {
 		folded_code_region_color = updated_folded_code_region_color;
 	}
 
-	Ref<StyleBoxFlat> drag_info_sb = drag_info_label->get_theme_stylebox(CoreStringName(normal));
-	drag_info_sb->set_bg_color(EDITOR_GET("text_editor/theme/highlighting/completion_background_color"));
-	Color info_color = EDITOR_GET("text_editor/theme/highlighting/text_color");
-	info_color.a = 0.5f;
-	drag_info_sb->set_border_color(info_color);
-	info_color.a = 0.7f;
-	drag_info_label->add_theme_color_override(SceneStringName(font_color), info_color);
-
 	theme_loaded = true;
-	Ref<Script> script = edited_res;
 	if (script.is_valid()) {
 		_set_theme_for_script();
 	}
@@ -331,7 +250,6 @@ void ScriptTextEditor::_set_theme_for_script() {
 	CodeEdit *text_edit = code_editor->get_text_editor();
 	text_edit->get_syntax_highlighter()->update_cache();
 
-	Ref<Script> script = edited_res;
 	Vector<String> strings = script->get_language()->get_string_delimiters();
 	text_edit->clear_string_delimiters();
 	for (const String &string : strings) {
@@ -377,9 +295,9 @@ void ScriptTextEditor::_show_warnings_panel(bool p_show) {
 	warnings_panel->set_visible(p_show);
 }
 
-bool ScriptTextEditor::_warning_clicked(const Variant &p_line) {
-	if (CodeEditorBase::_warning_clicked(p_line)) {
-		return true;
+void ScriptTextEditor::_warning_clicked(const Variant &p_line) {
+	if (p_line.get_type() == Variant::INT) {
+		goto_line_centered(p_line.operator int64_t());
 	} else if (p_line.get_type() == Variant::DICTIONARY) {
 		Dictionary meta = p_line.operator Dictionary();
 		const int line = meta["line"].operator int64_t() - 1;
@@ -404,9 +322,7 @@ bool ScriptTextEditor::_warning_clicked(const Variant &p_line) {
 		}
 
 		_validate_script();
-		return true;
 	}
-	return false;
 }
 
 void ScriptTextEditor::_error_clicked(const Variant &p_line) {
@@ -439,12 +355,30 @@ void ScriptTextEditor::_error_clicked(const Variant &p_line) {
 	}
 }
 
-void ScriptTextEditor::_on_mouse_exited() {
-	drag_info_label->hide();
+void ScriptTextEditor::reload_text() {
+	ERR_FAIL_COND(script.is_null());
+
+	CodeEdit *te = code_editor->get_text_editor();
+	int column = te->get_caret_column();
+	int row = te->get_caret_line();
+	int h = te->get_h_scroll();
+	int v = te->get_v_scroll();
+
+	te->set_text(script->get_source_code());
+	te->set_caret_line(row);
+	te->set_caret_column(column);
+	te->set_h_scroll(h);
+	te->set_v_scroll(v);
+
+	te->tag_saved_version();
+
+	code_editor->update_line_and_column();
+	if (editor_enabled) {
+		_validate_script();
+	}
 }
 
 void ScriptTextEditor::add_callback(const String &p_function, const PackedStringArray &p_args) {
-	Ref<Script> script = edited_res;
 	ScriptLanguage *language = script->get_language();
 	if (!language->can_make_function()) {
 		return;
@@ -471,6 +405,10 @@ void ScriptTextEditor::add_callback(const String &p_function, const PackedString
 	code_editor->get_text_editor()->end_complex_operation();
 }
 
+bool ScriptTextEditor::show_members_overview() {
+	return true;
+}
+
 bool ScriptTextEditor::_is_valid_color_info(const Dictionary &p_info) {
 	if (p_info.get_valid("color").get_type() != Variant::COLOR) {
 		return false;
@@ -765,14 +703,21 @@ void ScriptTextEditor::update_settings() {
 	} else {
 		code_editor->get_text_editor()->set_inline_object_handlers(Callable(), Callable(), Callable());
 	}
-	TextEditorBase::update_settings();
+	code_editor->update_editor_settings();
+}
+
+bool ScriptTextEditor::is_unsaved() {
+	const bool unsaved =
+			code_editor->get_text_editor()->get_version() != code_editor->get_text_editor()->get_saved_version() ||
+			script->get_path().is_empty(); // In memory.
+	return unsaved;
 }
 
 Variant ScriptTextEditor::get_edit_state() {
 	if (pending_state != Variant()) {
 		return pending_state;
 	}
-	return TextEditorBase::get_edit_state();
+	return code_editor->get_edit_state();
 }
 
 void ScriptTextEditor::set_edit_state(const Variant &p_state) {
@@ -785,11 +730,9 @@ void ScriptTextEditor::set_edit_state(const Variant &p_state) {
 
 	Dictionary state = p_state;
 	if (state.has("syntax_highlighter")) {
-		for (const Ref<EditorSyntaxHighlighter> &highlighter : highlighters) {
-			if (highlighter->_get_name() == String(state["syntax_highlighter"])) {
-				set_syntax_highlighter(highlighter);
-				break;
-			}
+		int idx = highlighter_menu->get_item_idx_from_text(state["syntax_highlighter"]);
+		if (idx >= 0) {
+			_change_syntax_highlighter(idx);
 		}
 	}
 
@@ -800,6 +743,10 @@ void ScriptTextEditor::set_edit_state(const Variant &p_state) {
 	}
 }
 
+Variant ScriptTextEditor::get_navigation_state() {
+	return code_editor->get_navigation_state();
+}
+
 Variant ScriptTextEditor::get_previous_state() {
 	return code_editor->get_previous_state();
 }
@@ -808,8 +755,79 @@ void ScriptTextEditor::store_previous_state() {
 	return code_editor->store_previous_state();
 }
 
+void ScriptTextEditor::_convert_case(CodeTextEditor::CaseStyle p_case) {
+	code_editor->convert_case(p_case);
+}
+
+void ScriptTextEditor::trim_trailing_whitespace() {
+	code_editor->trim_trailing_whitespace();
+}
+
+void ScriptTextEditor::trim_final_newlines() {
+	code_editor->trim_final_newlines();
+}
+
+void ScriptTextEditor::insert_final_newline() {
+	code_editor->insert_final_newline();
+}
+
+void ScriptTextEditor::convert_indent() {
+	code_editor->get_text_editor()->convert_indent();
+}
+
+void ScriptTextEditor::tag_saved_version() {
+	code_editor->get_text_editor()->tag_saved_version();
+	edited_file_data.last_modified_time = FileAccess::get_modified_time(edited_file_data.path);
+}
+
+void ScriptTextEditor::goto_line(int p_line, int p_column) {
+	code_editor->goto_line(p_line, p_column);
+}
+
+void ScriptTextEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
+	code_editor->goto_line_selection(p_line, p_begin, p_end);
+}
+
+void ScriptTextEditor::goto_line_centered(int p_line, int p_column) {
+	code_editor->goto_line_centered(p_line, p_column);
+}
+
+void ScriptTextEditor::set_executing_line(int p_line) {
+	code_editor->set_executing_line(p_line);
+}
+
+void ScriptTextEditor::clear_executing_line() {
+	code_editor->clear_executing_line();
+}
+
+void ScriptTextEditor::ensure_focus() {
+	code_editor->get_text_editor()->grab_focus();
+}
+
+String ScriptTextEditor::get_name() {
+	String name;
+
+	name = script->get_path().get_file();
+	if (name.is_empty()) {
+		// This appears for newly created built-in scripts before saving the scene.
+		name = TTR("[unsaved]");
+	} else if (script->is_built_in()) {
+		const String &script_name = script->get_name();
+		if (!script_name.is_empty()) {
+			// If the built-in script has a custom resource name defined,
+			// display the built-in script name as follows: `ResourceName (scene_file.tscn)`
+			name = vformat("%s (%s)", script_name, name.get_slice("::", 0));
+		}
+	}
+
+	if (is_unsaved()) {
+		name += "(*)";
+	}
+
+	return name;
+}
+
 Ref<Texture2D> ScriptTextEditor::get_theme_icon() {
-	Ref<Script> script = edited_res;
 	if (get_parent_control()) {
 		String icon_name = script->get_class();
 		if (script->is_built_in()) {
@@ -849,7 +867,6 @@ void ScriptTextEditor::_validate_script() {
 	depended_errors.clear();
 	safe_lines.clear();
 
-	Ref<Script> script = edited_res;
 	if (!script->get_language()->validate(text, script->get_path(), &fnc, &errors, &warnings, &safe_lines)) {
 		List<ScriptLanguage::ScriptError>::Element *E = errors.front();
 		while (E) {
@@ -893,7 +910,8 @@ void ScriptTextEditor::_validate_script() {
 		_assign_dragged_export_variables();
 	}
 
-	TextEditorBase::_validate_script();
+	emit_signal(SNAME("name_changed"));
+	emit_signal(SNAME("edited_script_changed"));
 }
 
 void ScriptTextEditor::_update_warnings() {
@@ -1042,6 +1060,45 @@ void ScriptTextEditor::_update_errors() {
 	}
 }
 
+void ScriptTextEditor::_update_bookmark_list() {
+	bookmarks_menu->clear();
+	bookmarks_menu->reset_size();
+
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/remove_all_bookmarks"), BOOKMARK_REMOVE_ALL);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_next_bookmark"), BOOKMARK_GOTO_NEXT);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
+
+	PackedInt32Array bookmark_list = code_editor->get_text_editor()->get_bookmarked_lines();
+	if (bookmark_list.is_empty()) {
+		return;
+	}
+
+	bookmarks_menu->add_separator();
+
+	for (int i = 0; i < bookmark_list.size(); i++) {
+		// Strip edges to remove spaces or tabs.
+		// Also replace any tabs by spaces, since we can't print tabs in the menu.
+		String line = code_editor->get_text_editor()->get_line(bookmark_list[i]).replace("\t", "  ").strip_edges();
+
+		// Limit the size of the line if too big.
+		if (line.length() > 50) {
+			line = line.substr(0, 50);
+		}
+
+		bookmarks_menu->add_item(String::num_int64(bookmark_list[i] + 1) + " - `" + line + "`");
+		bookmarks_menu->set_item_metadata(-1, bookmark_list[i]);
+	}
+}
+
+void ScriptTextEditor::_bookmark_item_pressed(int p_idx) {
+	if (p_idx < 4) { // Any item before the separator.
+		_edit_option(bookmarks_menu->get_item_id(p_idx));
+	} else {
+		code_editor->goto_line_centered(bookmarks_menu->get_item_metadata(p_idx));
+	}
+}
+
 static Vector<Node *> _find_all_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
 	Vector<Node *> nodes;
 
@@ -1146,8 +1203,6 @@ void ScriptTextEditor::_code_complete_script(const String &p_code, List<ScriptLa
 	if (color_panel->is_visible()) {
 		return;
 	}
-
-	Ref<Script> script = edited_res;
 	Node *base = get_tree()->get_edited_scene_root();
 	if (base) {
 		base = _find_node_for_script(base, base, script);
@@ -1160,28 +1215,60 @@ void ScriptTextEditor::_code_complete_script(const String &p_code, List<ScriptLa
 	}
 }
 
+void ScriptTextEditor::_update_breakpoint_list() {
+	breakpoints_menu->clear();
+	breakpoints_menu->reset_size();
+
+	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_breakpoint"), DEBUG_TOGGLE_BREAKPOINT);
+	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/remove_all_breakpoints"), DEBUG_REMOVE_ALL_BREAKPOINTS);
+	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_next_breakpoint"), DEBUG_GOTO_NEXT_BREAKPOINT);
+	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_breakpoint"), DEBUG_GOTO_PREV_BREAKPOINT);
+
+	PackedInt32Array breakpoint_list = code_editor->get_text_editor()->get_breakpointed_lines();
+	if (breakpoint_list.is_empty()) {
+		return;
+	}
+
+	breakpoints_menu->add_separator();
+
+	for (int i = 0; i < breakpoint_list.size(); i++) {
+		// Strip edges to remove spaces or tabs.
+		// Also replace any tabs by spaces, since we can't print tabs in the menu.
+		String line = code_editor->get_text_editor()->get_line(breakpoint_list[i]).replace("\t", "  ").strip_edges();
+
+		// Limit the size of the line if too big.
+		if (line.length() > 50) {
+			line = line.substr(0, 50);
+		}
+
+		breakpoints_menu->add_item(String::num_int64(breakpoint_list[i] + 1) + " - `" + line + "`");
+		breakpoints_menu->set_item_metadata(-1, breakpoint_list[i]);
+	}
+}
+
+void ScriptTextEditor::_breakpoint_item_pressed(int p_idx) {
+	if (p_idx < 4) { // Any item before the separator.
+		_edit_option(breakpoints_menu->get_item_id(p_idx));
+	} else {
+		code_editor->goto_line_centered(breakpoints_menu->get_item_metadata(p_idx));
+	}
+}
+
 void ScriptTextEditor::_breakpoint_toggled(int p_row) {
 	const CodeEdit *ce = code_editor->get_text_editor();
 	bool enabled = p_row < ce->get_line_count() && ce->is_line_breakpointed(p_row);
-	EditorDebuggerNode::get_singleton()->set_breakpoint(edited_res->get_path(), p_row + 1, enabled);
+	EditorDebuggerNode::get_singleton()->set_breakpoint(script->get_path(), p_row + 1, enabled);
 }
 
 void ScriptTextEditor::_on_caret_moved() {
 	if (code_editor->is_previewing_navigation_change()) {
 		return;
 	}
-	if (is_layout_pending_in_tree()) {
-		call_on_all_layout_pending_finished(callable_mp(this, &ScriptTextEditor::_on_caret_moved));
-		return;
-	}
-	// When previous_line < 0, it means the user has just switched to this editor from a different one
-	// (which already saved a state in the history). In this case, we should not save this editor's previous state.
 	int current_line = code_editor->get_text_editor()->get_caret_line();
-	if (previous_line >= 0 && Math::abs(current_line - previous_line) >= 10) {
+	if (Math::abs(current_line - previous_line) >= 10) {
 		Dictionary nav_state = get_navigation_state();
 		nav_state["row"] = previous_line;
 		nav_state["scroll_position"] = -1;
-		nav_state["ensure_caret_visible"] = true;
 		emit_signal(SNAME("request_save_previous_state"), nav_state);
 		store_previous_state();
 	}
@@ -1189,7 +1276,6 @@ void ScriptTextEditor::_on_caret_moved() {
 }
 
 void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_column) {
-	Ref<Script> script = edited_res;
 	Node *base = get_tree()->get_edited_scene_root();
 	if (base) {
 		base = _find_node_for_script(base, base, script);
@@ -1308,7 +1394,6 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
 void ScriptTextEditor::_validate_symbol(const String &p_symbol) {
 	CodeEdit *text_edit = code_editor->get_text_editor();
 
-	Ref<Script> script = edited_res;
 	Node *base = get_tree()->get_edited_scene_root();
 	if (base) {
 		base = _find_node_for_script(base, base, script);
@@ -1332,7 +1417,7 @@ void ScriptTextEditor::_validate_symbol(const String &p_symbol) {
 	}
 }
 
-void ScriptTextEditor::_show_symbol_tooltip(const String &p_symbol, int p_row, int p_column, bool p_shortcut) {
+void ScriptTextEditor::_show_symbol_tooltip(const String &p_symbol, int p_row, int p_column) {
 	if (!EDITOR_GET("text_editor/behavior/documentation/enable_tooltips").booleanize()) {
 		return;
 	}
@@ -1343,7 +1428,6 @@ void ScriptTextEditor::_show_symbol_tooltip(const String &p_symbol, int p_row, i
 		return;
 	}
 
-	Ref<Script> script = edited_res;
 	Node *base = get_tree()->get_edited_scene_root();
 	if (base) {
 		base = _find_node_for_script(base, base, script);
@@ -1450,17 +1534,21 @@ void ScriptTextEditor::_show_symbol_tooltip(const String &p_symbol, int p_row, i
 	}
 
 	if (!doc_symbol.is_empty() || !debug_value.is_empty()) {
-		Control *tmp = EditorHelpBitTooltip::make_tooltip(code_editor->get_text_editor(), doc_symbol, debug_value, true, p_shortcut);
+		Control *tmp = EditorHelpBitTooltip::make_tooltip(code_editor->get_text_editor(), doc_symbol, debug_value, true);
 		memdelete(tmp);
 	}
 }
 
 String ScriptTextEditor::_get_absolute_path(const String &rel_path) {
-	String base_path = edited_res->get_path().get_base_dir();
+	String base_path = script->get_path().get_base_dir();
 	String path = base_path.path_join(rel_path);
 	return path.replace("///", "//").simplify_path();
 }
 
+void ScriptTextEditor::update_toggle_files_button() {
+	code_editor->update_toggle_files_button();
+}
+
 void ScriptTextEditor::_update_connected_methods() {
 	CodeEdit *text_edit = code_editor->get_text_editor();
 	text_edit->set_gutter_width(connection_gutter, text_edit->get_line_height());
@@ -1481,7 +1569,6 @@ void ScriptTextEditor::_update_connected_methods() {
 	}
 
 	// Add connection icons to methods.
-	Ref<Script> script = edited_res;
 	Vector<Node *> nodes = _find_all_node_for_script(base, base, script);
 	HashSet<StringName> methods_found;
 	for (int i = 0; i < nodes.size(); i++) {
@@ -1589,7 +1676,7 @@ void ScriptTextEditor::_update_connected_methods() {
 				if (base_class_ptr == nullptr) {
 					break;
 				}
-				base_class = base_class_ptr->gdtype->get_name();
+				base_class = base_class_ptr->name;
 			}
 		}
 
@@ -1651,7 +1738,6 @@ void ScriptTextEditor::_gutter_clicked(int p_line, int p_gutter) {
 			return;
 		}
 
-		Ref<Script> script = edited_res;
 		Vector<Node *> nodes = _find_all_node_for_script(base, base, script);
 		connection_info_dialog->popup_connections(method, nodes);
 	} else if (type == "inherits") {
@@ -1670,11 +1756,73 @@ void ScriptTextEditor::_gutter_clicked(int p_line, int p_gutter) {
 	}
 }
 
-bool ScriptTextEditor::_edit_option(int p_op) {
+void ScriptTextEditor::_edit_option(int p_op) {
 	CodeEdit *tx = code_editor->get_text_editor();
 	tx->apply_ime();
 
 	switch (p_op) {
+		case EDIT_UNDO: {
+			tx->undo();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_REDO: {
+			tx->redo();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_CUT: {
+			tx->cut();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_COPY: {
+			tx->copy();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_PASTE: {
+			tx->paste();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_SELECT_ALL: {
+			tx->select_all();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_MOVE_LINE_UP: {
+			code_editor->get_text_editor()->move_lines_up();
+		} break;
+		case EDIT_MOVE_LINE_DOWN: {
+			code_editor->get_text_editor()->move_lines_down();
+		} break;
+		case EDIT_INDENT: {
+			Ref<Script> scr = script;
+			if (scr.is_null()) {
+				return;
+			}
+			tx->indent_lines();
+		} break;
+		case EDIT_UNINDENT: {
+			Ref<Script> scr = script;
+			if (scr.is_null()) {
+				return;
+			}
+			tx->unindent_lines();
+		} break;
+		case EDIT_DELETE_LINE: {
+			code_editor->get_text_editor()->delete_lines();
+		} break;
+		case EDIT_DUPLICATE_SELECTION: {
+			code_editor->get_text_editor()->duplicate_selection();
+		} break;
+		case EDIT_DUPLICATE_LINES: {
+			code_editor->get_text_editor()->duplicate_lines();
+		} break;
+		case EDIT_TOGGLE_FOLD_LINE: {
+			tx->toggle_foldable_lines_at_carets();
+		} break;
+		case EDIT_FOLD_ALL_LINES: {
+			tx->fold_all_lines();
+		} break;
+		case EDIT_UNFOLD_ALL_LINES: {
+			tx->unfold_all_lines();
+		} break;
 		case EDIT_CREATE_CODE_REGION: {
 			tx->create_code_region();
 		} break;
@@ -1686,9 +1834,9 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 		} break;
 		case EDIT_AUTO_INDENT: {
 			String text = tx->get_text();
-			Ref<Script> scr = edited_res;
+			Ref<Script> scr = script;
 			if (scr.is_null()) {
-				return true;
+				return;
 			}
 
 			tx->begin_complex_operation();
@@ -1722,9 +1870,32 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 			tx->end_multicaret_edit();
 			tx->end_complex_operation();
 		} break;
+		case EDIT_TRIM_TRAILING_WHITESAPCE: {
+			trim_trailing_whitespace();
+		} break;
+		case EDIT_TRIM_FINAL_NEWLINES: {
+			trim_final_newlines();
+		} break;
+		case EDIT_CONVERT_INDENT_TO_SPACES: {
+			code_editor->set_indent_using_spaces(true);
+			convert_indent();
+		} break;
+		case EDIT_CONVERT_INDENT_TO_TABS: {
+			code_editor->set_indent_using_spaces(false);
+			convert_indent();
+		} break;
 		case EDIT_PICK_COLOR: {
 			color_panel->popup();
 		} break;
+		case EDIT_TO_UPPERCASE: {
+			_convert_case(CodeTextEditor::UPPER);
+		} break;
+		case EDIT_TO_LOWERCASE: {
+			_convert_case(CodeTextEditor::LOWER);
+		} break;
+		case EDIT_CAPITALIZE: {
+			_convert_case(CodeTextEditor::CAPITALIZE);
+		} break;
 		case EDIT_EVALUATE: {
 			Expression expression;
 			tx->begin_complex_operation();
@@ -1750,9 +1921,52 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 			}
 			tx->end_complex_operation();
 		} break;
+		case EDIT_TOGGLE_WORD_WRAP: {
+			TextEdit::LineWrappingMode wrap = code_editor->get_text_editor()->get_line_wrapping_mode();
+			code_editor->get_text_editor()->set_line_wrapping_mode(wrap == TextEdit::LINE_WRAPPING_BOUNDARY ? TextEdit::LINE_WRAPPING_NONE : TextEdit::LINE_WRAPPING_BOUNDARY);
+		} break;
+		case SEARCH_FIND: {
+			code_editor->get_find_replace_bar()->popup_search();
+		} break;
+		case SEARCH_FIND_NEXT: {
+			code_editor->get_find_replace_bar()->search_next();
+		} break;
+		case SEARCH_FIND_PREV: {
+			code_editor->get_find_replace_bar()->search_prev();
+		} break;
+		case SEARCH_REPLACE: {
+			code_editor->get_find_replace_bar()->popup_replace();
+		} break;
+		case SEARCH_IN_FILES: {
+			String selected_text = tx->get_selected_text();
+
+			// Yep, because it doesn't make sense to instance this dialog for every single script open...
+			// So this will be delegated to the ScriptEditor.
+			emit_signal(SNAME("search_in_files_requested"), selected_text);
+		} break;
+		case REPLACE_IN_FILES: {
+			String selected_text = tx->get_selected_text();
+
+			emit_signal(SNAME("replace_in_files_requested"), selected_text);
+		} break;
 		case SEARCH_LOCATE_FUNCTION: {
 			quick_open->popup_dialog(get_functions());
 		} break;
+		case SEARCH_GOTO_LINE: {
+			goto_line_popup->popup_find_line(code_editor);
+		} break;
+		case BOOKMARK_TOGGLE: {
+			code_editor->toggle_bookmark();
+		} break;
+		case BOOKMARK_GOTO_NEXT: {
+			code_editor->goto_next_bookmark();
+		} break;
+		case BOOKMARK_GOTO_PREV: {
+			code_editor->goto_prev_bookmark();
+		} break;
+		case BOOKMARK_REMOVE_ALL: {
+			code_editor->remove_all_bookmarks();
+		} break;
 		case DEBUG_TOGGLE_BREAKPOINT: {
 			Vector<int> sorted_carets = tx->get_sorted_carets();
 			int last_line = -1;
@@ -1792,13 +2006,13 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 				int line = bpoints[i];
 				bool dobreak = !tx->is_line_breakpointed(line);
 				tx->set_line_as_breakpoint(line, dobreak);
-				EditorDebuggerNode::get_singleton()->set_breakpoint(edited_res->get_path(), line + 1, dobreak);
+				EditorDebuggerNode::get_singleton()->set_breakpoint(script->get_path(), line + 1, dobreak);
 			}
 		} break;
 		case DEBUG_GOTO_NEXT_BREAKPOINT: {
 			PackedInt32Array bpoints = tx->get_breakpointed_lines();
 			if (bpoints.is_empty()) {
-				return true;
+				return;
 			}
 
 			int current_line = tx->get_caret_line();
@@ -1813,7 +2027,7 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 		case DEBUG_GOTO_PREV_BREAKPOINT: {
 			PackedInt32Array bpoints = tx->get_breakpointed_lines();
 			if (bpoints.is_empty()) {
-				return true;
+				return;
 			}
 
 			int current_line = tx->get_caret_line();
@@ -1825,9 +2039,6 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 			}
 			code_editor->goto_line_centered(bpoints[bpoint_idx]);
 		} break;
-		case SHOW_TOOLTIP_AT_CARET: {
-			_show_symbol_tooltip(tx->get_word_under_caret(), tx->get_caret_line(), tx->get_caret_column(), true);
-		} break;
 		case HELP_CONTEXTUAL: {
 			String text = tx->get_selected_text(0);
 			if (text.is_empty()) {
@@ -1846,20 +2057,18 @@ bool ScriptTextEditor::_edit_option(int p_op) {
 				_lookup_symbol(text, tx->get_caret_line(0), tx->get_caret_column(0));
 			}
 		} break;
+		case EDIT_EMOJI_AND_SYMBOL: {
+			code_editor->get_text_editor()->show_emoji_and_symbol_picker();
+		} break;
 		default: {
-			if (TextEditorBase::_edit_option(p_op)) {
-				return true;
-			}
 			if (p_op >= EditorContextMenuPlugin::BASE_ID) {
 				EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_SCRIPT_EDITOR_CODE, p_op, tx);
 			}
 		}
 	}
-	return true;
 }
 
 void ScriptTextEditor::_edit_option_toggle_inline_comment() {
-	Ref<Script> script = edited_res;
 	if (script.is_null()) {
 		return;
 	}
@@ -1876,6 +2085,32 @@ void ScriptTextEditor::_edit_option_toggle_inline_comment() {
 	code_editor->toggle_inline_comment(delimiter);
 }
 
+void ScriptTextEditor::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
+	ERR_FAIL_COND(p_highlighter.is_null());
+
+	highlighters[p_highlighter->_get_name()] = p_highlighter;
+	highlighter_menu->add_radio_check_item(p_highlighter->_get_name());
+}
+
+void ScriptTextEditor::set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
+	ERR_FAIL_COND(p_highlighter.is_null());
+
+	HashMap<String, Ref<EditorSyntaxHighlighter>>::Iterator el = highlighters.begin();
+	while (el) {
+		int highlighter_index = highlighter_menu->get_item_idx_from_text(el->key);
+		highlighter_menu->set_item_checked(highlighter_index, el->value == p_highlighter);
+		++el;
+	}
+
+	CodeEdit *te = code_editor->get_text_editor();
+	p_highlighter->_set_edited_resource(script);
+	te->set_syntax_highlighter(p_highlighter);
+}
+
+void ScriptTextEditor::_change_syntax_highlighter(int p_idx) {
+	set_syntax_highlighter(highlighters[highlighter_menu->get_item_text(p_idx)]);
+}
+
 void ScriptTextEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -1901,22 +2136,33 @@ void ScriptTextEditor::_notification(int p_what) {
 			inline_color_options->add_theme_font_override("font", code_font);
 			inline_color_options->get_popup()->add_theme_font_override("font", code_font);
 		} break;
-		case NOTIFICATION_DRAG_END: {
-			drag_info_label->hide();
-		} break;
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			if (!is_visible()) {
-				previous_line = -1;
-			}
-		} break;
 	}
 }
 
 Control *ScriptTextEditor::get_edit_menu() {
-	if (!edit_menus) {
-		edit_menus = memnew(EditMenusSTE);
+	return edit_hb;
+}
+
+void ScriptTextEditor::clear_edit_menu() {
+	if (editor_enabled) {
+		memdelete(edit_hb);
 	}
-	return edit_menus;
+}
+
+void ScriptTextEditor::set_find_replace_bar(FindReplaceBar *p_bar) {
+	code_editor->set_find_replace_bar(p_bar);
+}
+
+void ScriptTextEditor::reload(bool p_soft) {
+	CodeEdit *te = code_editor->get_text_editor();
+	Ref<Script> scr = script;
+	if (scr.is_null()) {
+		return;
+	}
+	scr->set_source_code(te->get_text());
+	bool soft = p_soft || ClassDB::is_parent_class(scr->get_instance_base_type(), "EditorPlugin"); // Always soft-reload editor plugins.
+
+	scr->get_language()->reload_tool_script(scr, soft);
 }
 
 PackedInt32Array ScriptTextEditor::get_breakpoints() {
@@ -1931,6 +2177,23 @@ void ScriptTextEditor::clear_breakpoints() {
 	code_editor->get_text_editor()->clear_breakpointed_lines();
 }
 
+void ScriptTextEditor::set_tooltip_request_func(const Callable &p_toolip_callback) {
+	Variant args[1] = { this };
+	const Variant *argp[] = { &args[0] };
+	code_editor->get_text_editor()->set_tooltip_request_func(p_toolip_callback.bindp(argp, 1));
+}
+
+void ScriptTextEditor::set_debugger_active(bool p_active) {
+}
+
+Control *ScriptTextEditor::get_base_editor() const {
+	return code_editor->get_text_editor();
+}
+
+CodeTextEditor *ScriptTextEditor::get_code_editor() const {
+	return code_editor;
+}
+
 Variant ScriptTextEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	return Variant();
 }
@@ -1943,48 +2206,12 @@ bool ScriptTextEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_
 					String(d["type"]) == "nodes" ||
 					String(d["type"]) == "obj_property" ||
 					String(d["type"]) == "files_and_dirs")) {
-		_set_drop_info_text(d);
 		return true;
 	}
 
 	return false;
 }
 
-void ScriptTextEditor::_set_drop_info_text(const Dictionary &p_info) const {
-	if (drag_info_label->is_visible() || !EDITOR_GET("text_editor/appearance/drag_and_drop_info/show_drag_and_drop_info")) {
-		return;
-	}
-
-	String text;
-	String c = keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL);
-	bool drop_as_uid = bool(EDITOR_GET("text_editor/behavior/files/drop_preload_resources_as_uid"));
-	String default_drop_option = drop_as_uid ? TTR("UID path") : TTR("file path");
-	String alternate_drop_option = drop_as_uid ? TTR("file path") : TTR("UID path");
-
-	const String type = p_info.get("type", "");
-
-	if (type == "files" || type == "files_and_dirs" || type == "resource") {
-		Array files = p_info.get("files", Array());
-		text = TTRN("Drop file path.", "Drop file paths.", files.size()) +
-				"\n" + vformat(TTRN("Hold %s: Add const preload by %s.", "Hold %s: Add const preloads by %s.", files.size()), c, default_drop_option) +
-				"\n" + vformat(TTRN("Hold %s+Shift: Add const preload by %s.", "Hold %s+Shift: Add const preloads by %s.", files.size()), c, alternate_drop_option) +
-				"\n" + TTRN("Hold Alt: Add @export var pointing to the resource.", "Hold Alt: Add @export vars pointing to the resources.", files.size());
-	} else if (type == "nodes") {
-		Array nodes = p_info["nodes"];
-		text = TTRN("Drop node path.", "Drop node paths.", nodes.size()) +
-				"\n" + vformat(TTRN("Hold %s: Add @onready var pointing to the node path.", "Hold %s: Add @onready vars pointing to the node paths.", nodes.size()), c) +
-				"\n" + TTRN("Hold Alt: Add @export var pointing to the node.", "Hold Alt: Add @export vars pointing to the nodes.", nodes.size());
-	} else if (type == "obj_property") {
-		text = TTR("Drop property path.");
-	}
-
-	if (!text.is_empty()) {
-		drag_info_label->show();
-		drag_info_label->set_text(text);
-		drag_info_label->set_anchors_and_offsets_preset(Control::PRESET_BOTTOM_RIGHT, Control::PRESET_MODE_MINSIZE, 20 * EDSCALE);
-	}
-}
-
 static Node *_find_script_node(Node *p_current_node, const Ref<Script> &script) {
 	if (p_current_node->get_script() == script) {
 		return p_current_node;
@@ -2181,7 +2408,6 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 			return;
 		}
 
-		Ref<Script> script = edited_res;
 		if (!ClassDB::is_parent_class(script->get_instance_base_type(), "Node")) {
 			EditorToaster::get_singleton()->popup_str(vformat(TTR("Can't drop nodes because script '%s' does not inherit Node."), get_name()), EditorToaster::SEVERITY_WARNING);
 			return;
@@ -2216,13 +2442,14 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 
 				String variable_name = String(node->get_name()).to_snake_case().validate_unicode_identifier();
 				if (use_type) {
-					StringName custom_class_name;
+					StringName class_name = node->get_class_name();
 					Ref<Script> node_script = node->get_script();
-					while (node_script.is_valid() && custom_class_name.is_empty()) {
-						custom_class_name = node_script->get_global_name();
-						node_script = node_script->get_base_script();
+					if (node_script.is_valid()) {
+						StringName global_node_script_name = node_script->get_global_name();
+						if (!global_node_script_name.is_empty()) {
+							class_name = global_node_script_name;
+						}
 					}
-					const StringName class_name = custom_class_name.is_empty() ? node->get_class_name() : custom_class_name;
 					text_to_drop += vformat("@onready var %s: %s = %c%s", variable_name, class_name, is_unique ? '%' : '$', path);
 				} else {
 					text_to_drop += vformat("@onready var %s = %c%s", variable_name, is_unique ? '%' : '$', path);
@@ -2246,15 +2473,16 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 				}
 
 				String variable_name = String(node->get_name()).to_snake_case().validate_unicode_identifier();
-				StringName custom_class_name;
+				StringName class_name = node->get_class_name();
 				Ref<Script> node_script = node->get_script();
-				while (node_script.is_valid() && custom_class_name.is_empty()) {
-					custom_class_name = node_script->get_global_name();
-					node_script = node_script->get_base_script();
+				if (node_script.is_valid()) {
+					StringName global_node_script_name = node_script->get_global_name();
+					if (!global_node_script_name.is_empty()) {
+						class_name = global_node_script_name;
+					}
 				}
-				const StringName class_name = custom_class_name.is_empty() ? node->get_class_name() : custom_class_name;
-				text_to_drop += vformat("@export var %s: %s\n", variable_name, class_name);
 
+				text_to_drop += vformat("@export var %s: %s\n", variable_name, class_name);
 				for (ObjectID obj_id : obj_ids) {
 					pending_dragged_exports.push_back(DraggedExport{ obj_id, variable_name, node, class_name });
 				}
@@ -2314,14 +2542,11 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 	te->insert_text_at_caret(text_to_drop);
 	te->end_complex_operation();
 	te->grab_focus();
-
-	drag_info_label->hide();
 }
 
 Vector<ObjectID> ScriptTextEditor::_get_objects_for_export_assignment() const {
 	Vector<ObjectID> objects;
 	Node *scene_root = get_tree()->get_edited_scene_root();
-	Ref<Script> script = edited_res;
 	bool assign_export_variables = scene_root && ClassDB::is_parent_class(script->get_instance_base_type(), "Node");
 
 	if (!assign_export_variables) {
@@ -2417,9 +2642,9 @@ void ScriptTextEditor::_assign_dragged_export_variables() {
 	}
 }
 
-void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &p_ev) {
-	Ref<InputEventMouseButton> mb = p_ev;
-	Ref<InputEventKey> k = p_ev;
+void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
+	Ref<InputEventMouseButton> mb = ev;
+	Ref<InputEventKey> k = ev;
 	Point2 local_pos;
 	bool create_menu = false;
 
@@ -2469,7 +2694,6 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &p_ev) {
 		if (ScriptServer::is_global_class(word_at_pos) || word_at_pos.is_resource_file()) {
 			open_docs = true;
 		} else {
-			Ref<Script> script = edited_res;
 			Node *base = get_tree()->get_edited_scene_root();
 			if (base) {
 				base = _find_node_for_script(base, base, script);
@@ -2576,16 +2800,45 @@ void ScriptTextEditor::_color_changed(const Color &p_color) {
 	code_editor->get_text_editor()->end_complex_operation();
 }
 
-void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color, bool p_foldable, bool p_open_docs, bool p_goto_definition, const Vector2 &p_position) {
-	TextEditorBase::_make_context_menu(p_selection, p_foldable, p_position, false);
+void ScriptTextEditor::_prepare_edit_menu() {
+	const CodeEdit *tx = code_editor->get_text_editor();
+	PopupMenu *popup = edit_menu->get_popup();
+	popup->set_item_disabled(popup->get_item_index(EDIT_UNDO), !tx->has_undo());
+	popup->set_item_disabled(popup->get_item_index(EDIT_REDO), !tx->has_redo());
+}
+
+void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color, bool p_foldable, bool p_open_docs, bool p_goto_definition, Vector2 p_pos) {
+	context_menu->clear();
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+		context_menu->add_item(TTRC("Emoji & Symbols"), EDIT_EMOJI_AND_SYMBOL);
+		context_menu->add_separator();
+	}
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
+
+	context_menu->add_separator();
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
+
+	context_menu->add_separator();
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
+
+	context_menu->add_separator();
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT);
-	_popup_move_item(EDIT_UNINDENT, context_menu);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
 
 	if (p_selection) {
+		context_menu->add_separator();
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/evaluate_selection"), EDIT_EVALUATE);
-		_popup_move_item(EDIT_TO_LOWERCASE, context_menu);
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/create_code_region"), EDIT_CREATE_CODE_REGION);
-		_popup_move_item(EDIT_EVALUATE, context_menu);
+	}
+	if (p_foldable) {
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
 	}
 
 	if (p_color || p_open_docs || p_goto_definition) {
@@ -2601,14 +2854,298 @@ void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color, bool p
 	const PackedStringArray paths = { String(code_editor->get_text_editor()->get_path()) };
 	EditorContextMenuPluginManager::get_singleton()->add_options_from_plugins(context_menu, EditorContextMenuPlugin::CONTEXT_SLOT_SCRIPT_EDITOR_CODE, paths);
 
-	_show_context_menu(p_position);
+	const CodeEdit *tx = code_editor->get_text_editor();
+	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_UNDO), !tx->has_undo());
+	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_REDO), !tx->has_redo());
+
+	context_menu->set_position(get_screen_position() + p_pos);
+	context_menu->reset_size();
+	context_menu->popup();
+}
+
+void ScriptTextEditor::_enable_code_editor() {
+	ERR_FAIL_COND(code_editor->get_parent());
+
+	VSplitContainer *editor_box = memnew(VSplitContainer);
+	add_child(editor_box);
+	editor_box->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
+	editor_box->set_v_size_flags(SIZE_EXPAND_FILL);
+
+	editor_box->add_child(code_editor);
+	code_editor->connect("show_errors_panel", callable_mp(this, &ScriptTextEditor::_show_errors_panel));
+	code_editor->connect("show_warnings_panel", callable_mp(this, &ScriptTextEditor::_show_warnings_panel));
+	code_editor->connect("validate_script", callable_mp(this, &ScriptTextEditor::_validate_script));
+	code_editor->connect("load_theme_settings", callable_mp(this, &ScriptTextEditor::_load_theme_settings));
+	code_editor->get_text_editor()->connect("symbol_lookup", callable_mp(this, &ScriptTextEditor::_lookup_symbol));
+	code_editor->get_text_editor()->connect("symbol_hovered", callable_mp(this, &ScriptTextEditor::_show_symbol_tooltip));
+	code_editor->get_text_editor()->connect("symbol_validate", callable_mp(this, &ScriptTextEditor::_validate_symbol));
+	code_editor->get_text_editor()->connect("gutter_added", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
+	code_editor->get_text_editor()->connect("gutter_removed", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
+	code_editor->get_text_editor()->connect("gutter_clicked", callable_mp(this, &ScriptTextEditor::_gutter_clicked));
+	code_editor->get_text_editor()->connect("_fold_line_updated", callable_mp(this, &ScriptTextEditor::_update_background_color));
+	code_editor->get_text_editor()->connect(SceneStringName(gui_input), callable_mp(this, &ScriptTextEditor::_text_edit_gui_input));
+	code_editor->show_toggle_files_button();
+	_update_gutter_indexes();
+
+	editor_box->add_child(warnings_panel);
+	warnings_panel->connect("meta_clicked", callable_mp(this, &ScriptTextEditor::_warning_clicked));
+
+	editor_box->add_child(errors_panel);
+	errors_panel->connect("meta_clicked", callable_mp(this, &ScriptTextEditor::_error_clicked));
+
+	add_child(context_menu);
+	context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+
+	add_child(color_panel);
+
+	color_picker = memnew(ColorPicker);
+	color_picker->set_deferred_mode(true);
+	color_picker->connect("color_changed", callable_mp(this, &ScriptTextEditor::_color_changed));
+	color_panel->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(color_picker));
+
+	color_panel->add_child(color_picker);
+
+	quick_open = memnew(ScriptEditorQuickOpen);
+	quick_open->set_title(TTRC("Go to Function"));
+	quick_open->connect("goto_line", callable_mp(this, &ScriptTextEditor::_goto_line));
+	add_child(quick_open);
+
+	goto_line_popup = memnew(GotoLinePopup);
+	add_child(goto_line_popup);
+
+	add_child(connection_info_dialog);
+
+	edit_hb->add_child(edit_menu);
+	edit_menu->connect("about_to_popup", callable_mp(this, &ScriptTextEditor::_prepare_edit_menu));
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_selection"), EDIT_DUPLICATE_SELECTION);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_lines"), EDIT_DUPLICATE_LINES);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/evaluate_selection"), EDIT_EVALUATE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_word_wrap"), EDIT_TOGGLE_WORD_WRAP);
+	edit_menu->get_popup()->add_separator();
+	{
+		PopupMenu *sub_menu = memnew(PopupMenu);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_up"), EDIT_MOVE_LINE_UP);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_down"), EDIT_MOVE_LINE_DOWN);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/delete_line"), EDIT_DELETE_LINE);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT);
+		sub_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+		edit_menu->get_popup()->add_submenu_node_item(TTRC("Line"), sub_menu);
+	}
+	{
+		PopupMenu *sub_menu = memnew(PopupMenu);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_all_lines"), EDIT_FOLD_ALL_LINES);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_all_lines"), EDIT_UNFOLD_ALL_LINES);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/create_code_region"), EDIT_CREATE_CODE_REGION);
+		sub_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+		edit_menu->get_popup()->add_submenu_node_item(TTRC("Folding"), sub_menu);
+	}
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_text_completion_query"), EDIT_COMPLETE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_trailing_whitespace"), EDIT_TRIM_TRAILING_WHITESAPCE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_final_newlines"), EDIT_TRIM_FINAL_NEWLINES);
+	{
+		PopupMenu *sub_menu = memnew(PopupMenu);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_spaces"), EDIT_CONVERT_INDENT_TO_SPACES);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_tabs"), EDIT_CONVERT_INDENT_TO_TABS);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/auto_indent"), EDIT_AUTO_INDENT);
+		sub_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+		edit_menu->get_popup()->add_submenu_node_item(TTRC("Indentation"), sub_menu);
+	}
+	edit_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+	edit_menu->get_popup()->add_separator();
+	{
+		PopupMenu *sub_menu = memnew(PopupMenu);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
+		sub_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/capitalize"), EDIT_CAPITALIZE);
+		sub_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+		edit_menu->get_popup()->add_submenu_node_item(TTRC("Convert Case"), sub_menu);
+	}
+	edit_menu->get_popup()->add_submenu_node_item(TTRC("Syntax Highlighter"), highlighter_menu);
+	highlighter_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_change_syntax_highlighter));
+
+	edit_hb->add_child(search_menu);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find"), SEARCH_FIND);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_next"), SEARCH_FIND_NEXT);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_previous"), SEARCH_FIND_PREV);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace"), SEARCH_REPLACE);
+	search_menu->get_popup()->add_separator();
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace_in_files"), REPLACE_IN_FILES);
+	search_menu->get_popup()->add_separator();
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/contextual_help"), HELP_CONTEXTUAL);
+	search_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+
+	_load_theme_settings();
+
+	edit_hb->add_child(goto_menu);
+	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_function"), SEARCH_LOCATE_FUNCTION);
+	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_line"), SEARCH_GOTO_LINE);
+	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_symbol"), LOOKUP_SYMBOL);
+	goto_menu->get_popup()->add_separator();
+
+	goto_menu->get_popup()->add_submenu_node_item(TTRC("Bookmarks"), bookmarks_menu);
+	_update_bookmark_list();
+	bookmarks_menu->connect("about_to_popup", callable_mp(this, &ScriptTextEditor::_update_bookmark_list));
+	bookmarks_menu->connect("index_pressed", callable_mp(this, &ScriptTextEditor::_bookmark_item_pressed));
+
+	goto_menu->get_popup()->add_submenu_node_item(TTRC("Breakpoints"), breakpoints_menu);
+	_update_breakpoint_list();
+	breakpoints_menu->connect("about_to_popup", callable_mp(this, &ScriptTextEditor::_update_breakpoint_list));
+	breakpoints_menu->connect("index_pressed", callable_mp(this, &ScriptTextEditor::_breakpoint_item_pressed));
+
+	goto_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptTextEditor::_edit_option));
+}
+
+ScriptTextEditor::ScriptTextEditor() {
+	code_editor = memnew(CodeTextEditor);
+	code_editor->set_toggle_list_control(ScriptEditor::get_singleton()->get_left_list_split());
+	code_editor->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
+	code_editor->set_code_complete_func(_code_complete_scripts, this);
+	code_editor->set_v_size_flags(SIZE_EXPAND_FILL);
+
+	code_editor->get_text_editor()->set_draw_breakpoints_gutter(true);
+	code_editor->get_text_editor()->set_draw_executing_lines_gutter(true);
+	code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
+	code_editor->get_text_editor()->connect("caret_changed", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
+	code_editor->connect("navigation_preview_ended", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
+
+	connection_gutter = 1;
+	code_editor->get_text_editor()->add_gutter(connection_gutter);
+	code_editor->get_text_editor()->set_gutter_name(connection_gutter, "connection_gutter");
+	code_editor->get_text_editor()->set_gutter_draw(connection_gutter, false);
+	code_editor->get_text_editor()->set_gutter_overwritable(connection_gutter, true);
+	code_editor->get_text_editor()->set_gutter_type(connection_gutter, TextEdit::GUTTER_TYPE_ICON);
+
+	warnings_panel = memnew(RichTextLabel);
+	warnings_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE));
+	warnings_panel->set_h_size_flags(SIZE_EXPAND_FILL);
+	warnings_panel->set_meta_underline(true);
+	warnings_panel->set_selection_enabled(true);
+	warnings_panel->set_context_menu_enabled(true);
+	warnings_panel->set_focus_mode(FOCUS_CLICK);
+	warnings_panel->hide();
+
+	errors_panel = memnew(RichTextLabel);
+	errors_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE));
+	errors_panel->set_h_size_flags(SIZE_EXPAND_FILL);
+	errors_panel->set_meta_underline(true);
+	errors_panel->set_selection_enabled(true);
+	errors_panel->set_context_menu_enabled(true);
+	errors_panel->set_focus_mode(FOCUS_CLICK);
+	errors_panel->hide();
+
+	update_settings();
+
+	code_editor->get_text_editor()->set_symbol_lookup_on_click_enabled(true);
+	code_editor->get_text_editor()->set_symbol_tooltip_on_hover_enabled(true);
+	code_editor->get_text_editor()->set_context_menu_enabled(false);
+
+	context_menu = memnew(PopupMenu);
+
+	color_panel = memnew(PopupPanel);
+
+	edit_hb = memnew(HBoxContainer);
+
+	edit_menu = memnew(MenuButton);
+	edit_menu->set_flat(false);
+	edit_menu->set_theme_type_variation("FlatMenuButton");
+	edit_menu->set_text(TTRC("Edit"));
+	edit_menu->set_switch_on_hover(true);
+	edit_menu->set_shortcut_context(this);
+
+	highlighter_menu = memnew(PopupMenu);
+
+	Ref<EditorPlainTextSyntaxHighlighter> plain_highlighter;
+	plain_highlighter.instantiate();
+	add_syntax_highlighter(plain_highlighter);
+
+	Ref<EditorStandardSyntaxHighlighter> highlighter;
+	highlighter.instantiate();
+	add_syntax_highlighter(highlighter);
+	set_syntax_highlighter(highlighter);
+
+	search_menu = memnew(MenuButton);
+	search_menu->set_flat(false);
+	search_menu->set_theme_type_variation("FlatMenuButton");
+	search_menu->set_text(TTRC("Search"));
+	search_menu->set_switch_on_hover(true);
+	search_menu->set_shortcut_context(this);
+
+	goto_menu = memnew(MenuButton);
+	goto_menu->set_flat(false);
+	goto_menu->set_theme_type_variation("FlatMenuButton");
+	goto_menu->set_text(TTRC("Go To"));
+	goto_menu->set_switch_on_hover(true);
+	goto_menu->set_shortcut_context(this);
+
+	bookmarks_menu = memnew(PopupMenu);
+	breakpoints_menu = memnew(PopupMenu);
+
+	inline_color_popup = memnew(PopupPanel);
+	add_child(inline_color_popup);
+
+	inline_color_picker = memnew(ColorPicker);
+	inline_color_picker->set_mouse_filter(MOUSE_FILTER_STOP);
+	inline_color_picker->set_deferred_mode(true);
+	inline_color_picker->set_hex_visible(false);
+	inline_color_picker->connect("color_changed", callable_mp(this, &ScriptTextEditor::_picker_color_changed));
+	inline_color_popup->add_child(inline_color_picker);
+
+	inline_color_options = memnew(OptionButton);
+	inline_color_options->set_h_size_flags(SIZE_FILL);
+	inline_color_options->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
+	inline_color_options->set_fit_to_longest_item(false);
+	inline_color_options->connect("item_selected", callable_mp(this, &ScriptTextEditor::_update_color_text).unbind(1));
+	inline_color_picker->get_slider_container()->add_sibling(inline_color_options);
+
+	connection_info_dialog = memnew(ConnectionInfoDialog);
+
+	SET_DRAG_FORWARDING_GCD(code_editor->get_text_editor(), ScriptTextEditor);
+}
+
+ScriptTextEditor::~ScriptTextEditor() {
+	highlighters.clear();
+
+	if (!editor_enabled) {
+		memdelete(code_editor);
+		memdelete(warnings_panel);
+		memdelete(errors_panel);
+		memdelete(context_menu);
+		memdelete(color_panel);
+		memdelete(edit_hb);
+		memdelete(edit_menu);
+		memdelete(highlighter_menu);
+		memdelete(search_menu);
+		memdelete(goto_menu);
+		memdelete(bookmarks_menu);
+		memdelete(breakpoints_menu);
+		memdelete(connection_info_dialog);
+	}
+}
+
+static ScriptEditorBase *create_editor(const Ref<Resource> &p_resource) {
+	if (Object::cast_to<Script>(*p_resource)) {
+		return memnew(ScriptTextEditor);
+	}
+	return nullptr;
 }
 
 void ScriptTextEditor::register_editor() {
 	ED_SHORTCUT("script_text_editor/move_up", TTRC("Move Up"), KeyModifierMask::ALT | Key::UP);
 	ED_SHORTCUT("script_text_editor/move_down", TTRC("Move Down"), KeyModifierMask::ALT | Key::DOWN);
 	ED_SHORTCUT("script_text_editor/delete_line", TTRC("Delete Line"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::K);
-	ED_SHORTCUT("script_text_editor/join_lines", TTRC("Join Lines"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::J);
 
 	// Leave these at zero, same can be accomplished with tab/shift-tab, including selection.
 	// The next/previous in history shortcut in this case makes a lot more sense.
@@ -2646,7 +3183,6 @@ void ScriptTextEditor::register_editor() {
 
 	ED_SHORTCUT("script_text_editor/replace_in_files", TTRC("Replace in Files..."), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::R);
 
-	ED_SHORTCUT("script_text_editor/show_tooltip", TTRC("Show Tooltip"), KeyModifierMask::ALT | Key::SLASH, true);
 	ED_SHORTCUT("script_text_editor/contextual_help", TTRC("Contextual Help"), KeyModifierMask::ALT | Key::F1);
 	ED_SHORTCUT_OVERRIDE("script_text_editor/contextual_help", "macos", KeyModifierMask::ALT | KeyModifierMask::SHIFT | Key::SPACE);
 
@@ -2676,119 +3212,6 @@ void ScriptTextEditor::register_editor() {
 	ScriptEditor::register_create_script_editor_function(create_editor);
 }
 
-void ScriptTextEditor::_enable_code_editor() {
-	code_editor->connect("show_errors_panel", callable_mp(this, &ScriptTextEditor::_show_errors_panel));
-	code_editor->connect("show_warnings_panel", callable_mp(this, &ScriptTextEditor::_show_warnings_panel));
-	code_editor->get_text_editor()->connect("symbol_lookup", callable_mp(this, &ScriptTextEditor::_lookup_symbol));
-	code_editor->get_text_editor()->connect("symbol_hovered", callable_mp(this, &ScriptTextEditor::_show_symbol_tooltip).bind(false));
-	code_editor->get_text_editor()->connect("symbol_validate", callable_mp(this, &ScriptTextEditor::_validate_symbol));
-	code_editor->get_text_editor()->connect("gutter_added", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
-	code_editor->get_text_editor()->connect("gutter_removed", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
-	code_editor->get_text_editor()->connect("gutter_clicked", callable_mp(this, &ScriptTextEditor::_gutter_clicked));
-	code_editor->get_text_editor()->connect("_fold_line_updated", callable_mp(this, &ScriptTextEditor::_update_background_color));
-	_update_gutter_indexes();
-
-	editor_box->add_child(errors_panel);
-	errors_panel->connect("meta_clicked", callable_mp(this, &ScriptTextEditor::_error_clicked));
-
-	add_child(color_panel);
-
-	color_picker = memnew(ColorPicker);
-	color_picker->set_deferred_mode(true);
-	color_picker->connect("color_changed", callable_mp(this, &ScriptTextEditor::_color_changed));
-	color_panel->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(color_picker));
-
-	color_panel->add_child(color_picker);
-
-	quick_open = memnew(ScriptEditorQuickOpen);
-	quick_open->set_title(TTRC("Go to Function"));
-	quick_open->connect("goto_line", callable_mp(this, &ScriptTextEditor::_goto_line));
-	add_child(quick_open);
-
-	add_child(connection_info_dialog);
-}
-
-ScriptTextEditor::ScriptTextEditor() {
-	code_editor->set_code_complete_func(_code_complete_scripts, this);
-	code_editor->get_text_editor()->set_draw_breakpoints_gutter(true);
-	code_editor->get_text_editor()->set_draw_executing_lines_gutter(true);
-	code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
-	code_editor->get_text_editor()->connect("caret_changed", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
-	code_editor->connect("navigation_preview_ended", callable_mp(this, &ScriptTextEditor::_on_caret_moved));
-
-	connection_gutter = 1;
-	code_editor->get_text_editor()->add_gutter(connection_gutter);
-	code_editor->get_text_editor()->set_gutter_name(connection_gutter, "connection_gutter");
-	code_editor->get_text_editor()->set_gutter_draw(connection_gutter, false);
-	code_editor->get_text_editor()->set_gutter_overwritable(connection_gutter, true);
-	code_editor->get_text_editor()->set_gutter_type(connection_gutter, TextEdit::GUTTER_TYPE_ICON);
-
-	errors_panel = memnew(RichTextLabel);
-	errors_panel->set_custom_minimum_size(Size2(0, 100 * EDSCALE));
-	errors_panel->set_h_size_flags(SIZE_EXPAND_FILL);
-	errors_panel->set_meta_underline(true);
-	errors_panel->set_selection_enabled(true);
-	errors_panel->set_context_menu_enabled(true);
-	errors_panel->set_focus_mode(FOCUS_CLICK);
-	errors_panel->hide();
-
-	drag_info_label = memnew(Label);
-	drag_info_label->set_anchors_preset(Control::PRESET_BOTTOM_RIGHT);
-	drag_info_label->set_focus_mode(FOCUS_ACCESSIBILITY);
-	drag_info_label->add_theme_constant_override("line_spacing", 0);
-
-	Ref<StyleBoxFlat> drag_info_sb;
-	drag_info_sb.instantiate();
-	drag_info_sb->set_border_width_all(2 * EDSCALE);
-	drag_info_sb->set_corner_radius_all(5 * EDSCALE);
-	drag_info_sb->set_corner_detail(5);
-	drag_info_sb->set_expand_margin_all(5);
-	drag_info_label->add_theme_style_override(CoreStringName(normal), drag_info_sb);
-
-	code_editor->get_text_editor()->connect(SceneStringName(mouse_exited), callable_mp(this, &ScriptTextEditor::_on_mouse_exited));
-	code_editor->get_text_editor()->add_child(drag_info_label);
-	drag_info_label->hide();
-
-	code_editor->get_text_editor()->set_symbol_lookup_on_click_enabled(true);
-	code_editor->get_text_editor()->set_symbol_tooltip_on_hover_enabled(true);
-
-	color_panel = memnew(PopupPanel);
-
-	inline_color_popup = memnew(PopupPanel);
-	add_child(inline_color_popup);
-
-	inline_color_picker = memnew(ColorPicker);
-	inline_color_picker->set_mouse_filter(MOUSE_FILTER_STOP);
-	inline_color_picker->set_deferred_mode(true);
-	inline_color_picker->set_hex_visible(false);
-	inline_color_picker->connect("color_changed", callable_mp(this, &ScriptTextEditor::_picker_color_changed));
-	inline_color_popup->add_child(inline_color_picker);
-
-	inline_color_options = memnew(OptionButton);
-	inline_color_options->set_h_size_flags(SIZE_FILL);
-	inline_color_options->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
-	inline_color_options->set_fit_to_longest_item(false);
-	inline_color_options->connect("item_selected", callable_mp(this, &ScriptTextEditor::_update_color_text).unbind(1));
-	inline_color_picker->get_slider_container()->add_sibling(inline_color_options);
-
-	connection_info_dialog = memnew(ConnectionInfoDialog);
-
-	update_settings();
-
-	SET_DRAG_FORWARDING_GCD(code_editor->get_text_editor(), ScriptTextEditor);
-}
-
-ScriptTextEditor::~ScriptTextEditor() {
-	if (!editor_enabled) {
-		memdelete(errors_panel);
-		memdelete(color_panel);
-		memdelete(connection_info_dialog);
-	}
-}
-
-ScriptEditorBase *ScriptTextEditor::create_editor(const Ref<Resource> &p_resource) {
-	if (Object::cast_to<Script>(*p_resource)) {
-		return memnew(ScriptTextEditor);
-	}
-	return nullptr;
+void ScriptTextEditor::validate() {
+	code_editor->validate_script();
 }
diff --git a/engine/editor/script/script_text_editor.h b/engine/editor/script/script_text_editor.h
index ed3eec89..db515dc7 100644
--- a/engine/editor/script/script_text_editor.h
+++ b/engine/editor/script/script_text_editor.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
+#include "script_editor_plugin.h"
+
 #include "editor/gui/code_editor.h"
-#include "editor/script/script_editor_base.h"
-#include "editor/script/script_editor_plugin.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
@@ -54,14 +54,17 @@ public:
 	ConnectionInfoDialog();
 };
 
-class ScriptTextEditor : public CodeEditorBase {
-	GDCLASS(ScriptTextEditor, CodeEditorBase);
+class ScriptTextEditor : public ScriptEditorBase {
+	GDCLASS(ScriptTextEditor, ScriptEditorBase);
 
+	CodeTextEditor *code_editor = nullptr;
+	RichTextLabel *warnings_panel = nullptr;
+	RichTextLabel *errors_panel = nullptr;
+
+	Ref<Script> script;
 	Variant pending_state;
 	bool script_is_valid = false;
-
-	RichTextLabel *errors_panel = nullptr;
-	Label *drag_info_label = nullptr;
+	bool editor_enabled = false;
 
 	Vector<String> functions;
 	List<ScriptLanguage::Warning> warnings;
@@ -71,6 +74,16 @@ class ScriptTextEditor : public CodeEditorBase {
 
 	List<Connection> missing_connections;
 
+	HBoxContainer *edit_hb = nullptr;
+
+	MenuButton *edit_menu = nullptr;
+	MenuButton *search_menu = nullptr;
+	MenuButton *goto_menu = nullptr;
+	PopupMenu *bookmarks_menu = nullptr;
+	PopupMenu *breakpoints_menu = nullptr;
+	PopupMenu *highlighter_menu = nullptr;
+	PopupMenu *context_menu = nullptr;
+
 	int inline_color_line = -1;
 	int inline_color_start = -1;
 	int inline_color_end = -1;
@@ -79,6 +92,7 @@ class ScriptTextEditor : public CodeEditorBase {
 	OptionButton *inline_color_options = nullptr;
 	Ref<Texture2D> color_alpha_texture;
 
+	GotoLinePopup *goto_line_popup = nullptr;
 	ScriptEditorQuickOpen *quick_open = nullptr;
 	ConnectionInfoDialog *connection_info_dialog = nullptr;
 
@@ -93,7 +107,7 @@ class ScriptTextEditor : public CodeEditorBase {
 	Color marked_line_color = Color(1, 1, 1);
 	Color warning_line_color = Color(1, 1, 1);
 	Color folded_code_region_color = Color(1, 1, 1);
-	int previous_line = -1; // Previous caret line number when user continuously operates in this editor. Affects history state. Reset to -1 on editor switch.
+	int previous_line = 0;
 
 	PopupPanel *color_panel = nullptr;
 	ColorPicker *color_picker = nullptr;
@@ -103,21 +117,55 @@ class ScriptTextEditor : public CodeEditorBase {
 	bool theme_loaded = false;
 
 	enum {
-		EDIT_AUTO_INDENT = CODE_ENUM_COUNT,
+		EDIT_UNDO,
+		EDIT_REDO,
+		EDIT_CUT,
+		EDIT_COPY,
+		EDIT_PASTE,
+		EDIT_SELECT_ALL,
+		EDIT_COMPLETE,
+		EDIT_AUTO_INDENT,
+		EDIT_TRIM_TRAILING_WHITESAPCE,
+		EDIT_TRIM_FINAL_NEWLINES,
+		EDIT_CONVERT_INDENT_TO_SPACES,
+		EDIT_CONVERT_INDENT_TO_TABS,
+		EDIT_TOGGLE_COMMENT,
+		EDIT_MOVE_LINE_UP,
+		EDIT_MOVE_LINE_DOWN,
+		EDIT_INDENT,
+		EDIT_UNINDENT,
+		EDIT_DELETE_LINE,
+		EDIT_DUPLICATE_SELECTION,
+		EDIT_DUPLICATE_LINES,
 		EDIT_PICK_COLOR,
+		EDIT_TO_UPPERCASE,
+		EDIT_TO_LOWERCASE,
+		EDIT_CAPITALIZE,
 		EDIT_EVALUATE,
+		EDIT_TOGGLE_WORD_WRAP,
+		EDIT_TOGGLE_FOLD_LINE,
+		EDIT_FOLD_ALL_LINES,
 		EDIT_CREATE_CODE_REGION,
-
+		EDIT_UNFOLD_ALL_LINES,
+		SEARCH_FIND,
+		SEARCH_FIND_NEXT,
+		SEARCH_FIND_PREV,
+		SEARCH_REPLACE,
 		SEARCH_LOCATE_FUNCTION,
-
+		SEARCH_GOTO_LINE,
+		SEARCH_IN_FILES,
+		REPLACE_IN_FILES,
+		BOOKMARK_TOGGLE,
+		BOOKMARK_GOTO_NEXT,
+		BOOKMARK_GOTO_PREV,
+		BOOKMARK_REMOVE_ALL,
 		DEBUG_TOGGLE_BREAKPOINT,
 		DEBUG_REMOVE_ALL_BREAKPOINTS,
 		DEBUG_GOTO_NEXT_BREAKPOINT,
 		DEBUG_GOTO_PREV_BREAKPOINT,
-
-		SHOW_TOOLTIP_AT_CARET,
 		HELP_CONTEXTUAL,
 		LOOKUP_SYMBOL,
+		EDIT_EMOJI_AND_SYMBOL,
 	};
 
 	enum COLOR_MODE {
@@ -130,17 +178,6 @@ class ScriptTextEditor : public CodeEditorBase {
 		MODE_MAX
 	};
 
-	class EditMenusSTE : public EditMenusCEB {
-		GDCLASS(EditMenusSTE, EditMenusCEB);
-		PopupMenu *breakpoints_menu = nullptr;
-
-		void _update_breakpoint_list();
-		void _breakpoint_item_pressed(int p_idx);
-
-	public:
-		EditMenusSTE();
-	};
-
 	void _enable_code_editor();
 
 	struct DraggedExport {
@@ -155,25 +192,28 @@ class ScriptTextEditor : public CodeEditorBase {
 	String _get_dropped_resource_as_exported_member(const Ref<Resource> &p_resource, const Vector<ObjectID> &p_script_instance_obj_ids);
 	void _assign_dragged_export_variables();
 
-	static ScriptEditorBase *create_editor(const Ref<Resource> &p_resource);
-
 protected:
+	void _update_breakpoint_list();
+	void _breakpoint_item_pressed(int p_idx);
 	void _breakpoint_toggled(int p_row);
 
 	void _on_caret_moved();
 
+	void _validate_script(); // No longer virtual.
 	void _update_warnings();
 	void _update_errors();
+	void _update_bookmark_list();
+	void _bookmark_item_pressed(int p_idx);
 
 	static void _code_complete_scripts(void *p_ud, const String &p_code, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_force);
-	virtual void _code_complete_script(const String &p_code, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_force) override;
+	void _code_complete_script(const String &p_code, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_force);
 
+	void _load_theme_settings();
 	void _set_theme_for_script();
 	void _show_errors_panel(bool p_show);
 	void _show_warnings_panel(bool p_show);
 	void _error_clicked(const Variant &p_line);
-	virtual bool _warning_clicked(const Variant &p_line) override;
-	void _on_mouse_exited();
+	void _warning_clicked(const Variant &p_line);
 
 	bool _is_valid_color_info(const Dictionary &p_info);
 	Array _inline_object_parse(const String &p_text);
@@ -187,56 +227,87 @@ protected:
 
 	void _notification(int p_what);
 
-	void _edit_option_toggle_inline_comment();
-	void _color_changed(const Color &p_color);
+	HashMap<String, Ref<EditorSyntaxHighlighter>> highlighters;
+	void _change_syntax_highlighter(int p_idx);
 
+	void _edit_option(int p_op);
+	void _edit_option_toggle_inline_comment();
+	void _make_context_menu(bool p_selection, bool p_color, bool p_foldable, bool p_open_docs, bool p_goto_definition, Vector2 p_pos);
+	void _text_edit_gui_input(const Ref<InputEvent> &ev);
+	void _color_changed(const Color &p_color);
+	void _prepare_edit_menu();
+
+	void _goto_line(int p_line) { goto_line(p_line); }
 	void _lookup_symbol(const String &p_symbol, int p_row, int p_column);
 	void _validate_symbol(const String &p_symbol);
 
-	void _show_symbol_tooltip(const String &p_symbol, int p_row, int p_column, bool p_shortcut = false);
+	void _show_symbol_tooltip(const String &p_symbol, int p_row, int p_column);
+
+	void _convert_case(CodeTextEditor::CaseStyle p_case);
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
 
-	void _set_drop_info_text(const Dictionary &p_info) const;
-
 	String _get_absolute_path(const String &rel_path);
 
-	void _goto_line(int p_line) { goto_line(p_line); }
-
-	void _make_context_menu(bool p_selection, bool p_color, bool p_foldable, bool p_open_docs, bool p_goto_definition, const Vector2 &p_pos);
-
-	virtual void _text_edit_gui_input(const Ref<InputEvent> &p_ev) override;
-	virtual bool _edit_option(int p_op) override;
-
-	virtual void _load_theme_settings() override;
-	virtual void _validate_script() override;
-
 public:
 	void _update_connected_methods();
 
+	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+	void update_toggle_files_button() override;
+
 	virtual void apply_code() override;
+	virtual Ref<Resource> get_edited_resource() const override;
 	virtual void set_edited_resource(const Ref<Resource> &p_res) override;
-	virtual void enable_editor() override;
+	virtual void enable_editor(Control *p_shortcut_context = nullptr) override;
 	virtual Vector<String> get_functions() override;
-
-	virtual Control *get_edit_menu() override;
-
+	virtual void reload_text() override;
+	virtual String get_name() override;
 	virtual Ref<Texture2D> get_theme_icon() override;
-
+	virtual bool is_unsaved() override;
 	virtual Variant get_edit_state() override;
 	virtual void set_edit_state(const Variant &p_state) override;
+	virtual Variant get_navigation_state() override;
+	virtual void ensure_focus() override;
+	virtual void trim_trailing_whitespace() override;
+	virtual void trim_final_newlines() override;
+	virtual void insert_final_newline() override;
+	virtual void convert_indent() override;
+	virtual void tag_saved_version() override;
 
+	virtual void goto_line(int p_line, int p_column = 0) override;
+	void goto_line_selection(int p_line, int p_begin, int p_end);
+	void goto_line_centered(int p_line, int p_column = 0);
+	virtual void set_executing_line(int p_line) override;
+	virtual void clear_executing_line() override;
+
+	virtual void reload(bool p_soft) override;
 	virtual PackedInt32Array get_breakpoints() override;
 	virtual void set_breakpoint(int p_line, bool p_enabled) override;
 	virtual void clear_breakpoints() override;
 
-	virtual void add_callback(const String &p_function, const PackedStringArray &p_args);
+	virtual void add_callback(const String &p_function, const PackedStringArray &p_args) override;
 	virtual void update_settings() override;
 
+	virtual bool show_members_overview() override;
+
+	virtual void set_tooltip_request_func(const Callable &p_toolip_callback) override;
+
+	virtual void set_debugger_active(bool p_active) override;
+
+	Control *get_edit_menu() override;
+	virtual void clear_edit_menu() override;
+	virtual void set_find_replace_bar(FindReplaceBar *p_bar) override;
+
 	static void register_editor();
 
+	virtual Control *get_base_editor() const override;
+	virtual CodeTextEditor *get_code_editor() const override;
+
+	virtual void validate() override;
+
 	Variant get_previous_state();
 	void store_previous_state();
 
diff --git a/engine/editor/script/syntax_highlighters.cpp b/engine/editor/script/syntax_highlighters.cpp
deleted file mode 100644
index 6de912ce..00000000
--- a/engine/editor/script/syntax_highlighters.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/**************************************************************************/
-/*  syntax_highlighters.cpp                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "syntax_highlighters.h"
-
-#include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/object/script_language.h"
-#include "editor/settings/editor_settings.h"
-
-String EditorSyntaxHighlighter::_get_name() const {
-	String ret = "Unnamed";
-	GDVIRTUAL_CALL(_get_name, ret);
-	return ret;
-}
-
-PackedStringArray EditorSyntaxHighlighter::_get_supported_languages() const {
-	PackedStringArray ret;
-	GDVIRTUAL_CALL(_get_supported_languages, ret);
-	return ret;
-}
-
-Ref<EditorSyntaxHighlighter> EditorSyntaxHighlighter::_create() const {
-	Ref<EditorSyntaxHighlighter> syntax_highlighter;
-	if (GDVIRTUAL_IS_OVERRIDDEN(_create)) {
-		GDVIRTUAL_CALL(_create, syntax_highlighter);
-	} else {
-		syntax_highlighter.instantiate();
-		if (get_script_instance()) {
-			syntax_highlighter->set_script(get_script_instance()->get_script());
-		}
-	}
-	return syntax_highlighter;
-}
-
-void EditorSyntaxHighlighter::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_get_edited_resource"), &EditorSyntaxHighlighter::_get_edited_resource);
-
-	GDVIRTUAL_BIND(_get_name)
-	GDVIRTUAL_BIND(_get_supported_languages)
-	GDVIRTUAL_BIND(_create)
-}
-
-////
-
-void EditorStandardSyntaxHighlighter::_update_cache() {
-	highlighter->set_text_edit(text_edit);
-	highlighter->clear_keyword_colors();
-	highlighter->clear_member_keyword_colors();
-	highlighter->clear_color_regions();
-
-	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
-	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/function_color"));
-	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
-	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/member_variable_color"));
-
-	/* Engine types. */
-	const Color type_color = EDITOR_GET("text_editor/theme/highlighting/engine_type_color");
-	LocalVector<StringName> types;
-	ClassDB::get_class_list(types);
-	for (const StringName &type : types) {
-		highlighter->add_keyword_color(type, type_color);
-	}
-
-	/* User types. */
-	const Color usertype_color = EDITOR_GET("text_editor/theme/highlighting/user_type_color");
-	LocalVector<StringName> global_classes;
-	ScriptServer::get_global_class_list(global_classes);
-	for (const StringName &class_name : global_classes) {
-		highlighter->add_keyword_color(class_name, usertype_color);
-	}
-
-	/* Autoloads. */
-	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
-	for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
-		const ProjectSettings::AutoloadInfo &info = E.value;
-		if (info.is_singleton) {
-			highlighter->add_keyword_color(info.name, usertype_color);
-		}
-	}
-
-	const ScriptLanguage *scr_lang = script_language;
-	StringName instance_base;
-
-	if (scr_lang == nullptr) {
-		const Ref<Script> scr = _get_edited_resource();
-		if (scr.is_valid()) {
-			scr_lang = scr->get_language();
-			instance_base = scr->get_instance_base_type();
-		}
-	}
-
-	if (scr_lang != nullptr) {
-		/* Core types. */
-		const Color basetype_color = EDITOR_GET("text_editor/theme/highlighting/base_type_color");
-		List<String> core_types;
-		scr_lang->get_core_type_words(&core_types);
-		for (const String &E : core_types) {
-			highlighter->add_keyword_color(E, basetype_color);
-		}
-
-		/* Reserved words. */
-		const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
-		const Color control_flow_keyword_color = EDITOR_GET("text_editor/theme/highlighting/control_flow_keyword_color");
-		for (const String &keyword : scr_lang->get_reserved_words()) {
-			if (scr_lang->is_control_flow_keyword(keyword)) {
-				highlighter->add_keyword_color(keyword, control_flow_keyword_color);
-			} else {
-				highlighter->add_keyword_color(keyword, keyword_color);
-			}
-		}
-
-		/* Member types. */
-		const Color member_variable_color = EDITOR_GET("text_editor/theme/highlighting/member_variable_color");
-		if (instance_base != StringName()) {
-			List<PropertyInfo> plist;
-			ClassDB::get_property_list(instance_base, &plist);
-			for (const PropertyInfo &E : plist) {
-				String prop_name = E.name;
-				if (E.usage & PROPERTY_USAGE_CATEGORY || E.usage & PROPERTY_USAGE_GROUP || E.usage & PROPERTY_USAGE_SUBGROUP) {
-					continue;
-				}
-				if (prop_name.contains_char('/')) {
-					continue;
-				}
-				highlighter->add_member_keyword_color(prop_name, member_variable_color);
-			}
-
-			List<String> clist;
-			ClassDB::get_integer_constant_list(instance_base, &clist);
-			for (const String &E : clist) {
-				highlighter->add_member_keyword_color(E, member_variable_color);
-			}
-		}
-
-		/* Comments */
-		const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
-		for (const String &comment : scr_lang->get_comment_delimiters()) {
-			String beg = comment.get_slicec(' ', 0);
-			String end = comment.get_slice_count(" ") > 1 ? comment.get_slicec(' ', 1) : String();
-			highlighter->add_color_region(beg, end, comment_color, end.is_empty());
-		}
-
-		/* Doc comments */
-		const Color doc_comment_color = EDITOR_GET("text_editor/theme/highlighting/doc_comment_color");
-		for (const String &doc_comment : scr_lang->get_doc_comment_delimiters()) {
-			String beg = doc_comment.get_slicec(' ', 0);
-			String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slicec(' ', 1) : String();
-			highlighter->add_color_region(beg, end, doc_comment_color, end.is_empty());
-		}
-
-		/* Strings */
-		const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
-		for (const String &string : scr_lang->get_string_delimiters()) {
-			String beg = string.get_slicec(' ', 0);
-			String end = string.get_slice_count(" ") > 1 ? string.get_slicec(' ', 1) : String();
-			highlighter->add_color_region(beg, end, string_color, end.is_empty());
-		}
-	}
-}
-
-Ref<EditorSyntaxHighlighter> EditorStandardSyntaxHighlighter::_create() const {
-	Ref<EditorStandardSyntaxHighlighter> syntax_highlighter;
-	syntax_highlighter.instantiate();
-	return syntax_highlighter;
-}
-
-////
-
-Ref<EditorSyntaxHighlighter> EditorPlainTextSyntaxHighlighter::_create() const {
-	Ref<EditorPlainTextSyntaxHighlighter> syntax_highlighter;
-	syntax_highlighter.instantiate();
-	return syntax_highlighter;
-}
-
-////
-
-void EditorJSONSyntaxHighlighter::_update_cache() {
-	highlighter->set_text_edit(text_edit);
-	highlighter->clear_keyword_colors();
-	highlighter->clear_member_keyword_colors();
-	highlighter->clear_color_regions();
-
-	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
-	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
-
-	const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
-	highlighter->add_color_region("\"", "\"", string_color);
-}
-
-Ref<EditorSyntaxHighlighter> EditorJSONSyntaxHighlighter::_create() const {
-	Ref<EditorJSONSyntaxHighlighter> syntax_highlighter;
-	syntax_highlighter.instantiate();
-	return syntax_highlighter;
-}
-
-////
-
-void EditorMarkdownSyntaxHighlighter::_update_cache() {
-	highlighter->set_text_edit(text_edit);
-	highlighter->clear_keyword_colors();
-	highlighter->clear_member_keyword_colors();
-	highlighter->clear_color_regions();
-
-	// Disable automatic symbolic highlights, as these don't make sense for prose.
-	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
-	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
-	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
-	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
-
-	// Headings (any level).
-	const Color function_color = EDITOR_GET("text_editor/theme/highlighting/function_color");
-	highlighter->add_color_region("#", "", function_color);
-
-	// Bold.
-	highlighter->add_color_region("**", "**", function_color);
-	// `__bold__` syntax is not supported as color regions must begin with a symbol,
-	// not a character that is valid in an identifier.
-
-	// Code (both inline code and triple-backticks code blocks).
-	const Color code_color = EDITOR_GET("text_editor/theme/highlighting/engine_type_color");
-	highlighter->add_color_region("`", "`", code_color);
-
-	// Link (both references and inline links with URLs). The URL is not highlighted.
-	const Color link_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
-	highlighter->add_color_region("[", "]", link_color);
-
-	// Quote.
-	const Color quote_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
-	highlighter->add_color_region(">", "", quote_color, true);
-
-	// HTML comment, which is also supported in Markdown.
-	const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
-	highlighter->add_color_region("<!--", "-->", comment_color);
-}
-
-Ref<EditorSyntaxHighlighter> EditorMarkdownSyntaxHighlighter::_create() const {
-	Ref<EditorMarkdownSyntaxHighlighter> syntax_highlighter;
-	syntax_highlighter.instantiate();
-	return syntax_highlighter;
-}
-
-///
-
-void EditorConfigFileSyntaxHighlighter::_update_cache() {
-	highlighter->set_text_edit(text_edit);
-	highlighter->clear_keyword_colors();
-	highlighter->clear_member_keyword_colors();
-	highlighter->clear_color_regions();
-
-	highlighter->set_symbol_color(EDITOR_GET("text_editor/theme/highlighting/symbol_color"));
-	highlighter->set_number_color(EDITOR_GET("text_editor/theme/highlighting/number_color"));
-	// Assume that all function-style syntax is for types such as `Vector2()` and `PackedStringArray()`.
-	highlighter->set_function_color(EDITOR_GET("text_editor/theme/highlighting/base_type_color"));
-
-	// Disable member variable highlighting as it's not relevant for ConfigFile.
-	highlighter->set_member_variable_color(EDITOR_GET("text_editor/theme/highlighting/text_color"));
-
-	const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
-	highlighter->add_color_region("\"", "\"", string_color);
-
-	// FIXME: Sections in ConfigFile must be at the beginning of a line. Otherwise, it can be an array within a line.
-	const Color function_color = EDITOR_GET("text_editor/theme/highlighting/function_color");
-	highlighter->add_color_region("[", "]", function_color);
-
-	const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
-	highlighter->add_keyword_color("true", keyword_color);
-	highlighter->add_keyword_color("false", keyword_color);
-	highlighter->add_keyword_color("null", keyword_color);
-	highlighter->add_keyword_color("ExtResource", keyword_color);
-	highlighter->add_keyword_color("SubResource", keyword_color);
-
-	const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
-	highlighter->add_color_region(";", "", comment_color);
-}
-
-Ref<EditorSyntaxHighlighter> EditorConfigFileSyntaxHighlighter::_create() const {
-	Ref<EditorConfigFileSyntaxHighlighter> syntax_highlighter;
-	syntax_highlighter.instantiate();
-	return syntax_highlighter;
-}
diff --git a/engine/editor/script/syntax_highlighters.h b/engine/editor/script/syntax_highlighters.h
deleted file mode 100644
index 41c33cce..00000000
--- a/engine/editor/script/syntax_highlighters.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**************************************************************************/
-/*  syntax_highlighters.h                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "scene/resources/syntax_highlighter.h"
-
-class EditorSyntaxHighlighter : public SyntaxHighlighter {
-	GDCLASS(EditorSyntaxHighlighter, SyntaxHighlighter)
-
-private:
-	Ref<RefCounted> edited_resource;
-
-protected:
-	static void _bind_methods();
-
-	GDVIRTUAL0RC(String, _get_name)
-	GDVIRTUAL0RC(PackedStringArray, _get_supported_languages)
-	GDVIRTUAL0RC(Ref<EditorSyntaxHighlighter>, _create)
-
-public:
-	virtual String _get_name() const;
-	virtual PackedStringArray _get_supported_languages() const;
-
-	void _set_edited_resource(const Ref<Resource> &p_res) { edited_resource = p_res; }
-	Ref<RefCounted> _get_edited_resource() { return edited_resource; }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const;
-};
-
-class EditorStandardSyntaxHighlighter : public EditorSyntaxHighlighter {
-	GDCLASS(EditorStandardSyntaxHighlighter, EditorSyntaxHighlighter)
-
-private:
-	Ref<CodeHighlighter> highlighter;
-	ScriptLanguage *script_language = nullptr; // See GH-89610.
-
-public:
-	virtual void _update_cache() override;
-	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
-
-	virtual String _get_name() const override { return TTR("Standard"); }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const override;
-
-	void _set_script_language(ScriptLanguage *p_script_language) { script_language = p_script_language; }
-
-	EditorStandardSyntaxHighlighter() { highlighter.instantiate(); }
-};
-
-class EditorPlainTextSyntaxHighlighter : public EditorSyntaxHighlighter {
-	GDCLASS(EditorPlainTextSyntaxHighlighter, EditorSyntaxHighlighter)
-
-public:
-	virtual String _get_name() const override { return TTR("Plain Text"); }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const override;
-};
-
-class EditorJSONSyntaxHighlighter : public EditorSyntaxHighlighter {
-	GDCLASS(EditorJSONSyntaxHighlighter, EditorSyntaxHighlighter)
-
-private:
-	Ref<CodeHighlighter> highlighter;
-
-public:
-	virtual void _update_cache() override;
-	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
-
-	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "json" }; }
-	virtual String _get_name() const override { return TTR("JSON"); }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const override;
-
-	EditorJSONSyntaxHighlighter() { highlighter.instantiate(); }
-};
-
-class EditorMarkdownSyntaxHighlighter : public EditorSyntaxHighlighter {
-	GDCLASS(EditorMarkdownSyntaxHighlighter, EditorSyntaxHighlighter)
-
-private:
-	Ref<CodeHighlighter> highlighter;
-
-public:
-	virtual void _update_cache() override;
-	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
-
-	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "md", "markdown" }; }
-	virtual String _get_name() const override { return TTR("Markdown"); }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const override;
-
-	EditorMarkdownSyntaxHighlighter() { highlighter.instantiate(); }
-};
-
-class EditorConfigFileSyntaxHighlighter : public EditorSyntaxHighlighter {
-	GDCLASS(EditorConfigFileSyntaxHighlighter, EditorSyntaxHighlighter)
-
-private:
-	Ref<CodeHighlighter> highlighter;
-
-public:
-	virtual void _update_cache() override;
-	virtual Dictionary _get_line_syntax_highlighting_impl(int p_line) override { return highlighter->get_line_syntax_highlighting(p_line); }
-
-	// While not explicitly designed for those formats, this highlighter happens
-	// to handle TSCN, TRES, `project.godot` well. We can expose it in case the
-	// user opens one of these using the script editor (which can be done using
-	// the All Files filter).
-	virtual PackedStringArray _get_supported_languages() const override { return PackedStringArray{ "ini", "cfg", "tscn", "tres", "godot" }; }
-	virtual String _get_name() const override { return TTR("ConfigFile"); }
-
-	virtual Ref<EditorSyntaxHighlighter> _create() const override;
-
-	EditorConfigFileSyntaxHighlighter() { highlighter.instantiate(); }
-};
diff --git a/engine/editor/script/text_editor.cpp b/engine/editor/script/text_editor.cpp
index 34be3665..68411a3b 100644
--- a/engine/editor/script/text_editor.cpp
+++ b/engine/editor/script/text_editor.cpp
@@ -31,11 +31,166 @@
 #include "text_editor.h"
 
 #include "core/io/json.h"
-#include "editor/script/script_editor_plugin.h"
+#include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/split_container.h"
+
+void TextEditor::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
+	ERR_FAIL_COND(p_highlighter.is_null());
+
+	highlighters[p_highlighter->_get_name()] = p_highlighter;
+	highlighter_menu->add_radio_check_item(p_highlighter->_get_name());
+}
+
+void TextEditor::set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
+	ERR_FAIL_COND(p_highlighter.is_null());
+
+	HashMap<String, Ref<EditorSyntaxHighlighter>>::Iterator el = highlighters.begin();
+	while (el) {
+		int highlighter_index = highlighter_menu->get_item_idx_from_text(el->key);
+		highlighter_menu->set_item_checked(highlighter_index, el->value == p_highlighter);
+		++el;
+	}
+
+	CodeEdit *te = code_editor->get_text_editor();
+	te->set_syntax_highlighter(p_highlighter);
+}
+
+void TextEditor::_change_syntax_highlighter(int p_idx) {
+	set_syntax_highlighter(highlighters[highlighter_menu->get_item_text(p_idx)]);
+}
+
+void TextEditor::_load_theme_settings() {
+	code_editor->get_text_editor()->get_syntax_highlighter()->update_cache();
+}
+
+String TextEditor::get_name() {
+	String name;
+
+	name = edited_res->get_path().get_file();
+	if (name.is_empty()) {
+		// This appears for newly created built-in text_files before saving the scene.
+		name = TTR("[unsaved]");
+	} else if (edited_res->is_built_in()) {
+		const String &text_file_name = edited_res->get_name();
+		if (!text_file_name.is_empty()) {
+			// If the built-in text_file has a custom resource name defined,
+			// display the built-in text_file name as follows: `ResourceName (scene_file.tscn)`
+			name = vformat("%s (%s)", text_file_name, name.get_slice("::", 0));
+		}
+	}
+
+	if (is_unsaved()) {
+		name += "(*)";
+	}
+
+	return name;
+}
+
+Ref<Texture2D> TextEditor::get_theme_icon() {
+	return EditorNode::get_singleton()->get_object_icon(edited_res.ptr());
+}
+
+Ref<Resource> TextEditor::get_edited_resource() const {
+	return edited_res;
+}
+
+void TextEditor::set_edited_resource(const Ref<Resource> &p_res) {
+	ERR_FAIL_COND(edited_res.is_valid());
+	ERR_FAIL_COND(p_res.is_null());
+
+	edited_res = p_res;
+
+	Ref<TextFile> text_file = edited_res;
+	if (text_file.is_valid()) {
+		code_editor->get_text_editor()->set_text(text_file->get_text());
+	}
+
+	Ref<JSON> json_file = edited_res;
+	if (json_file.is_valid()) {
+		code_editor->get_text_editor()->set_text(json_file->get_parsed_text());
+	}
+
+	code_editor->get_text_editor()->clear_undo_history();
+	code_editor->get_text_editor()->tag_saved_version();
+
+	emit_signal(SNAME("name_changed"));
+	code_editor->update_line_and_column();
+}
+
+void TextEditor::enable_editor(Control *p_shortcut_context) {
+	if (editor_enabled) {
+		return;
+	}
+
+	editor_enabled = true;
+
+	_load_theme_settings();
+
+	_validate_script();
+
+	if (p_shortcut_context) {
+		for (int i = 0; i < edit_hb->get_child_count(); ++i) {
+			Control *c = cast_to<Control>(edit_hb->get_child(i));
+			if (c) {
+				c->set_shortcut_context(p_shortcut_context);
+			}
+		}
+	}
+}
+
+void TextEditor::add_callback(const String &p_function, const PackedStringArray &p_args) {
+}
+
+void TextEditor::set_debugger_active(bool p_active) {
+}
+
+Control *TextEditor::get_base_editor() const {
+	return code_editor->get_text_editor();
+}
+
+CodeTextEditor *TextEditor::get_code_editor() const {
+	return code_editor;
+}
+
+PackedInt32Array TextEditor::get_breakpoints() {
+	return PackedInt32Array();
+}
+
+void TextEditor::reload_text() {
+	ERR_FAIL_COND(edited_res.is_null());
+
+	CodeEdit *te = code_editor->get_text_editor();
+	int column = te->get_caret_column();
+	int row = te->get_caret_line();
+	int h = te->get_h_scroll();
+	int v = te->get_v_scroll();
+
+	Ref<TextFile> text_file = edited_res;
+	if (text_file.is_valid()) {
+		te->set_text(text_file->get_text());
+	}
+
+	Ref<JSON> json_file = edited_res;
+	if (json_file.is_valid()) {
+		te->set_text(json_file->get_parsed_text());
+	}
+
+	te->set_caret_line(row);
+	te->set_caret_column(column);
+	te->set_h_scroll(h);
+	te->set_v_scroll(v);
+
+	te->tag_saved_version();
+
+	code_editor->update_line_and_column();
+	_validate_script();
+}
 
 void TextEditor::_validate_script() {
-	TextEditorBase::_validate_script();
+	emit_signal(SNAME("name_changed"));
+	emit_signal(SNAME("edited_script_changed"));
 
 	Ref<JSON> json_file = edited_res;
 	if (json_file.is_valid()) {
@@ -52,6 +207,41 @@ void TextEditor::_validate_script() {
 	}
 }
 
+void TextEditor::_update_bookmark_list() {
+	bookmarks_menu->clear();
+
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/remove_all_bookmarks"), BOOKMARK_REMOVE_ALL);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_next_bookmark"), BOOKMARK_GOTO_NEXT);
+	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
+
+	PackedInt32Array bookmark_list = code_editor->get_text_editor()->get_bookmarked_lines();
+	if (bookmark_list.is_empty()) {
+		return;
+	}
+
+	bookmarks_menu->add_separator();
+
+	for (int i = 0; i < bookmark_list.size(); i++) {
+		String line = code_editor->get_text_editor()->get_line(bookmark_list[i]).strip_edges();
+		// Limit the size of the line if too big.
+		if (line.length() > 50) {
+			line = line.substr(0, 50);
+		}
+
+		bookmarks_menu->add_item(String::num_int64(bookmark_list[i] + 1) + " - \"" + line + "\"");
+		bookmarks_menu->set_item_metadata(-1, bookmark_list[i]);
+	}
+}
+
+void TextEditor::_bookmark_item_pressed(int p_idx) {
+	if (p_idx < 4) { // Any item before the separator.
+		_edit_option(bookmarks_menu->get_item_id(p_idx));
+	} else {
+		code_editor->goto_line(bookmarks_menu->get_item_metadata(p_idx));
+	}
+}
+
 void TextEditor::apply_code() {
 	Ref<TextFile> text_file = edited_res;
 	if (text_file.is_valid()) {
@@ -65,6 +255,241 @@ void TextEditor::apply_code() {
 	code_editor->get_text_editor()->get_syntax_highlighter()->update_cache();
 }
 
+bool TextEditor::is_unsaved() {
+	const bool unsaved =
+			code_editor->get_text_editor()->get_version() != code_editor->get_text_editor()->get_saved_version() ||
+			edited_res->get_path().is_empty(); // In memory.
+	return unsaved;
+}
+
+Variant TextEditor::get_edit_state() {
+	return code_editor->get_edit_state();
+}
+
+void TextEditor::set_edit_state(const Variant &p_state) {
+	code_editor->set_edit_state(p_state);
+
+	Dictionary state = p_state;
+	if (state.has("syntax_highlighter")) {
+		int idx = highlighter_menu->get_item_idx_from_text(state["syntax_highlighter"]);
+		if (idx >= 0) {
+			_change_syntax_highlighter(idx);
+		}
+	}
+
+	ensure_focus();
+}
+
+Variant TextEditor::get_navigation_state() {
+	return code_editor->get_navigation_state();
+}
+
+void TextEditor::trim_trailing_whitespace() {
+	code_editor->trim_trailing_whitespace();
+}
+
+void TextEditor::trim_final_newlines() {
+	code_editor->trim_final_newlines();
+}
+
+void TextEditor::insert_final_newline() {
+	code_editor->insert_final_newline();
+}
+
+void TextEditor::convert_indent() {
+	code_editor->get_text_editor()->convert_indent();
+}
+
+void TextEditor::tag_saved_version() {
+	code_editor->get_text_editor()->tag_saved_version();
+	edited_file_data.last_modified_time = FileAccess::get_modified_time(edited_file_data.path);
+}
+
+void TextEditor::goto_line(int p_line, int p_column) {
+	code_editor->goto_line(p_line, p_column);
+}
+
+void TextEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
+	code_editor->goto_line_selection(p_line, p_begin, p_end);
+}
+
+void TextEditor::set_executing_line(int p_line) {
+	code_editor->set_executing_line(p_line);
+}
+
+void TextEditor::clear_executing_line() {
+	code_editor->clear_executing_line();
+}
+
+void TextEditor::ensure_focus() {
+	code_editor->get_text_editor()->grab_focus();
+}
+
+Vector<String> TextEditor::get_functions() {
+	return Vector<String>();
+}
+
+bool TextEditor::show_members_overview() {
+	return true;
+}
+
+void TextEditor::update_settings() {
+	code_editor->update_editor_settings();
+}
+
+void TextEditor::set_tooltip_request_func(const Callable &p_toolip_callback) {
+	Variant args[1] = { this };
+	const Variant *argp[] = { &args[0] };
+	code_editor->get_text_editor()->set_tooltip_request_func(p_toolip_callback.bindp(argp, 1));
+}
+
+Control *TextEditor::get_edit_menu() {
+	return edit_hb;
+}
+
+void TextEditor::clear_edit_menu() {
+	memdelete(edit_hb);
+}
+
+void TextEditor::set_find_replace_bar(FindReplaceBar *p_bar) {
+	code_editor->set_find_replace_bar(p_bar);
+}
+
+void TextEditor::_edit_option(int p_op) {
+	CodeEdit *tx = code_editor->get_text_editor();
+	tx->apply_ime();
+
+	switch (p_op) {
+		case EDIT_UNDO: {
+			tx->undo();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_REDO: {
+			tx->redo();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_CUT: {
+			tx->cut();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_COPY: {
+			tx->copy();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_PASTE: {
+			tx->paste();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_SELECT_ALL: {
+			tx->select_all();
+			callable_mp((Control *)tx, &Control::grab_focus).call_deferred(false);
+		} break;
+		case EDIT_MOVE_LINE_UP: {
+			code_editor->get_text_editor()->move_lines_up();
+		} break;
+		case EDIT_MOVE_LINE_DOWN: {
+			code_editor->get_text_editor()->move_lines_down();
+		} break;
+		case EDIT_INDENT: {
+			tx->indent_lines();
+		} break;
+		case EDIT_UNINDENT: {
+			tx->unindent_lines();
+		} break;
+		case EDIT_DELETE_LINE: {
+			code_editor->get_text_editor()->delete_lines();
+		} break;
+		case EDIT_DUPLICATE_SELECTION: {
+			code_editor->get_text_editor()->duplicate_selection();
+		} break;
+		case EDIT_DUPLICATE_LINES: {
+			code_editor->get_text_editor()->duplicate_lines();
+		} break;
+		case EDIT_TOGGLE_FOLD_LINE: {
+			tx->toggle_foldable_lines_at_carets();
+		} break;
+		case EDIT_FOLD_ALL_LINES: {
+			tx->fold_all_lines();
+		} break;
+		case EDIT_UNFOLD_ALL_LINES: {
+			tx->unfold_all_lines();
+		} break;
+		case EDIT_TRIM_TRAILING_WHITESAPCE: {
+			trim_trailing_whitespace();
+		} break;
+		case EDIT_TRIM_FINAL_NEWLINES: {
+			trim_final_newlines();
+		} break;
+		case EDIT_CONVERT_INDENT_TO_SPACES: {
+			code_editor->set_indent_using_spaces(true);
+			convert_indent();
+		} break;
+		case EDIT_CONVERT_INDENT_TO_TABS: {
+			code_editor->set_indent_using_spaces(false);
+			convert_indent();
+		} break;
+		case EDIT_TO_UPPERCASE: {
+			_convert_case(CodeTextEditor::UPPER);
+		} break;
+		case EDIT_TO_LOWERCASE: {
+			_convert_case(CodeTextEditor::LOWER);
+		} break;
+		case EDIT_CAPITALIZE: {
+			_convert_case(CodeTextEditor::CAPITALIZE);
+		} break;
+		case EDIT_TOGGLE_WORD_WRAP: {
+			TextEdit::LineWrappingMode wrap = code_editor->get_text_editor()->get_line_wrapping_mode();
+			code_editor->get_text_editor()->set_line_wrapping_mode(wrap == TextEdit::LINE_WRAPPING_BOUNDARY ? TextEdit::LINE_WRAPPING_NONE : TextEdit::LINE_WRAPPING_BOUNDARY);
+		} break;
+		case SEARCH_FIND: {
+			code_editor->get_find_replace_bar()->popup_search();
+		} break;
+		case SEARCH_FIND_NEXT: {
+			code_editor->get_find_replace_bar()->search_next();
+		} break;
+		case SEARCH_FIND_PREV: {
+			code_editor->get_find_replace_bar()->search_prev();
+		} break;
+		case SEARCH_REPLACE: {
+			code_editor->get_find_replace_bar()->popup_replace();
+		} break;
+		case SEARCH_IN_FILES: {
+			String selected_text = code_editor->get_text_editor()->get_selected_text();
+
+			// Yep, because it doesn't make sense to instance this dialog for every single script open...
+			// So this will be delegated to the ScriptEditor.
+			emit_signal(SNAME("search_in_files_requested"), selected_text);
+		} break;
+		case REPLACE_IN_FILES: {
+			String selected_text = code_editor->get_text_editor()->get_selected_text();
+
+			emit_signal(SNAME("replace_in_files_requested"), selected_text);
+		} break;
+		case SEARCH_GOTO_LINE: {
+			goto_line_popup->popup_find_line(code_editor);
+		} break;
+		case BOOKMARK_TOGGLE: {
+			code_editor->toggle_bookmark();
+		} break;
+		case BOOKMARK_GOTO_NEXT: {
+			code_editor->goto_next_bookmark();
+		} break;
+		case BOOKMARK_GOTO_PREV: {
+			code_editor->goto_prev_bookmark();
+		} break;
+		case BOOKMARK_REMOVE_ALL: {
+			code_editor->remove_all_bookmarks();
+		} break;
+		case EDIT_EMOJI_AND_SYMBOL: {
+			code_editor->get_text_editor()->show_emoji_and_symbol_picker();
+		} break;
+	}
+}
+
+void TextEditor::_convert_case(CodeTextEditor::CaseStyle p_case) {
+	code_editor->convert_case(p_case);
+}
+
 ScriptEditorBase *TextEditor::create_editor(const Ref<Resource> &p_resource) {
 	if (Object::cast_to<TextFile>(*p_resource) || Object::cast_to<JSON>(*p_resource)) {
 		return memnew(TextEditor);
@@ -72,17 +497,233 @@ ScriptEditorBase *TextEditor::create_editor(const Ref<Resource> &p_resource) {
 	return nullptr;
 }
 
-Control *TextEditor::get_edit_menu() {
-	if (!edit_menus) {
-		edit_menus = memnew(EditMenus);
-	}
-	return edit_menus;
-}
-
 void TextEditor::register_editor() {
 	ScriptEditor::register_create_script_editor_function(create_editor);
 }
 
-TextEditor::TextEditor() {
-	add_child(code_editor);
+void TextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
+	Ref<InputEventMouseButton> mb = ev;
+
+	if (mb.is_valid()) {
+		if (mb->get_button_index() == MouseButton::RIGHT) {
+			CodeEdit *tx = code_editor->get_text_editor();
+
+			tx->apply_ime();
+
+			Point2i pos = tx->get_line_column_at_pos(mb->get_global_position() - tx->get_global_position());
+			int row = pos.y;
+			int col = pos.x;
+
+			tx->set_move_caret_on_right_click_enabled(EDITOR_GET("text_editor/behavior/navigation/move_caret_on_right_click"));
+			bool can_fold = tx->can_fold_line(row);
+			bool is_folded = tx->is_line_folded(row);
+
+			if (tx->is_move_caret_on_right_click_enabled()) {
+				tx->remove_secondary_carets();
+				if (tx->has_selection()) {
+					int from_line = tx->get_selection_from_line();
+					int to_line = tx->get_selection_to_line();
+					int from_column = tx->get_selection_from_column();
+					int to_column = tx->get_selection_to_column();
+
+					if (row < from_line || row > to_line || (row == from_line && col < from_column) || (row == to_line && col > to_column)) {
+						// Right click is outside the selected text.
+						tx->deselect();
+					}
+				}
+				if (!tx->has_selection()) {
+					tx->set_caret_line(row, true, false, -1);
+					tx->set_caret_column(col);
+				}
+			}
+
+			if (!mb->is_pressed()) {
+				_make_context_menu(tx->has_selection(), can_fold, is_folded, get_local_mouse_position());
+			}
+		}
+	}
+
+	Ref<InputEventKey> k = ev;
+	if (k.is_valid() && k->is_pressed() && k->is_action("ui_menu", true)) {
+		CodeEdit *tx = code_editor->get_text_editor();
+		int line = tx->get_caret_line(0);
+		tx->adjust_viewport_to_caret(0);
+		_make_context_menu(tx->has_selection(0), tx->can_fold_line(line), tx->is_line_folded(line), (get_global_transform().inverse() * tx->get_global_transform()).xform(tx->get_caret_draw_pos(0)));
+		context_menu->grab_focus();
+	}
+}
+
+void TextEditor::_prepare_edit_menu() {
+	const CodeEdit *tx = code_editor->get_text_editor();
+	PopupMenu *popup = edit_menu->get_popup();
+	popup->set_item_disabled(popup->get_item_index(EDIT_UNDO), !tx->has_undo());
+	popup->set_item_disabled(popup->get_item_index(EDIT_REDO), !tx->has_redo());
+}
+
+void TextEditor::_make_context_menu(bool p_selection, bool p_can_fold, bool p_is_folded, Vector2 p_position) {
+	context_menu->clear();
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+		context_menu->add_item(TTRC("Emoji & Symbols"), EDIT_EMOJI_AND_SYMBOL);
+		context_menu->add_separator();
+	}
+	if (p_selection) {
+		context_menu->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
+		context_menu->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
+	}
+
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
+	context_menu->add_separator();
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
+	context_menu->add_separator();
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_bookmark"), BOOKMARK_TOGGLE);
+
+	if (p_selection) {
+		context_menu->add_separator();
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
+	}
+	if (p_can_fold || p_is_folded) {
+		context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
+	}
+
+	const CodeEdit *tx = code_editor->get_text_editor();
+	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_UNDO), !tx->has_undo());
+	context_menu->set_item_disabled(context_menu->get_item_index(EDIT_REDO), !tx->has_redo());
+
+	context_menu->set_position(get_screen_position() + p_position);
+	context_menu->reset_size();
+	context_menu->popup();
+}
+
+void TextEditor::update_toggle_files_button() {
+	code_editor->update_toggle_files_button();
+}
+
+TextEditor::TextEditor() {
+	code_editor = memnew(CodeTextEditor);
+	add_child(code_editor);
+	code_editor->connect("load_theme_settings", callable_mp(this, &TextEditor::_load_theme_settings));
+	code_editor->connect("validate_script", callable_mp(this, &TextEditor::_validate_script));
+	code_editor->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
+	code_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	code_editor->show_toggle_files_button();
+	code_editor->set_toggle_list_control(ScriptEditor::get_singleton()->get_left_list_split());
+
+	update_settings();
+
+	code_editor->get_text_editor()->set_context_menu_enabled(false);
+	code_editor->get_text_editor()->connect(SceneStringName(gui_input), callable_mp(this, &TextEditor::_text_edit_gui_input));
+
+	context_menu = memnew(PopupMenu);
+	add_child(context_menu);
+	context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_edit_option));
+
+	edit_hb = memnew(HBoxContainer);
+
+	edit_menu = memnew(MenuButton);
+	edit_menu->set_flat(false);
+	edit_menu->set_theme_type_variation("FlatMenuButton");
+	edit_menu->set_shortcut_context(this);
+	edit_hb->add_child(edit_menu);
+	edit_menu->set_text(TTRC("Edit"));
+	edit_menu->set_switch_on_hover(true);
+	edit_menu->connect("about_to_popup", callable_mp(this, &TextEditor::_prepare_edit_menu));
+	edit_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_edit_option));
+
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_undo"), EDIT_UNDO);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_redo"), EDIT_REDO);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_cut"), EDIT_CUT);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_copy"), EDIT_COPY);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_paste"), EDIT_PASTE);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("ui_text_select_all"), EDIT_SELECT_ALL);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_up"), EDIT_MOVE_LINE_UP);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/move_down"), EDIT_MOVE_LINE_DOWN);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/delete_line"), EDIT_DELETE_LINE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_fold_line"), EDIT_TOGGLE_FOLD_LINE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_all_lines"), EDIT_FOLD_ALL_LINES);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_all_lines"), EDIT_UNFOLD_ALL_LINES);
+	edit_menu->get_popup()->add_separator();
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_selection"), EDIT_DUPLICATE_SELECTION);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_lines"), EDIT_DUPLICATE_LINES);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_word_wrap"), EDIT_TOGGLE_WORD_WRAP);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_trailing_whitespace"), EDIT_TRIM_TRAILING_WHITESAPCE);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_final_newlines"), EDIT_TRIM_FINAL_NEWLINES);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_spaces"), EDIT_CONVERT_INDENT_TO_SPACES);
+	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_tabs"), EDIT_CONVERT_INDENT_TO_TABS);
+
+	edit_menu->get_popup()->add_separator();
+	PopupMenu *convert_case = memnew(PopupMenu);
+	edit_menu->get_popup()->add_submenu_node_item(TTRC("Convert Case"), convert_case);
+	convert_case->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_uppercase"), EDIT_TO_UPPERCASE);
+	convert_case->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_to_lowercase"), EDIT_TO_LOWERCASE);
+	convert_case->add_shortcut(ED_GET_SHORTCUT("script_text_editor/capitalize"), EDIT_CAPITALIZE);
+	convert_case->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_edit_option));
+
+	highlighter_menu = memnew(PopupMenu);
+	edit_menu->get_popup()->add_submenu_node_item(TTRC("Syntax Highlighter"), highlighter_menu);
+	highlighter_menu->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_change_syntax_highlighter));
+
+	Ref<EditorPlainTextSyntaxHighlighter> plain_highlighter;
+	plain_highlighter.instantiate();
+	add_syntax_highlighter(plain_highlighter);
+
+	Ref<EditorStandardSyntaxHighlighter> highlighter;
+	highlighter.instantiate();
+	add_syntax_highlighter(highlighter);
+	set_syntax_highlighter(plain_highlighter);
+
+	search_menu = memnew(MenuButton);
+	search_menu->set_flat(false);
+	search_menu->set_theme_type_variation("FlatMenuButton");
+	search_menu->set_shortcut_context(this);
+	edit_hb->add_child(search_menu);
+	search_menu->set_text(TTRC("Search"));
+	search_menu->set_switch_on_hover(true);
+	search_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_edit_option));
+
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find"), SEARCH_FIND);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_next"), SEARCH_FIND_NEXT);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/find_previous"), SEARCH_FIND_PREV);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace"), SEARCH_REPLACE);
+	search_menu->get_popup()->add_separator();
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("editor/find_in_files"), SEARCH_IN_FILES);
+	search_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/replace_in_files"), REPLACE_IN_FILES);
+
+	MenuButton *goto_menu = memnew(MenuButton);
+	goto_menu->set_flat(false);
+	goto_menu->set_theme_type_variation("FlatMenuButton");
+	goto_menu->set_shortcut_context(this);
+	edit_hb->add_child(goto_menu);
+	goto_menu->set_text(TTRC("Go To"));
+	goto_menu->set_switch_on_hover(true);
+	goto_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextEditor::_edit_option));
+
+	goto_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_line"), SEARCH_GOTO_LINE);
+	goto_menu->get_popup()->add_separator();
+
+	bookmarks_menu = memnew(PopupMenu);
+	goto_menu->get_popup()->add_submenu_node_item(TTRC("Bookmarks"), bookmarks_menu);
+	_update_bookmark_list();
+	bookmarks_menu->connect("about_to_popup", callable_mp(this, &TextEditor::_update_bookmark_list));
+	bookmarks_menu->connect("index_pressed", callable_mp(this, &TextEditor::_bookmark_item_pressed));
+
+	goto_line_popup = memnew(GotoLinePopup);
+	add_child(goto_line_popup);
+}
+
+TextEditor::~TextEditor() {
+	highlighters.clear();
+}
+
+void TextEditor::validate() {
+	code_editor->validate_script();
 }
diff --git a/engine/editor/script/text_editor.h b/engine/editor/script/text_editor.h
index e41792c4..f0aa9ac6 100644
--- a/engine/editor/script/text_editor.h
+++ b/engine/editor/script/text_editor.h
@@ -30,24 +30,133 @@
 
 #pragma once
 
-#include "editor/script/script_editor_base.h"
+#include "editor/script/script_editor_plugin.h"
 
-class TextEditor : public TextEditorBase {
-	GDCLASS(TextEditor, TextEditorBase);
+#include "editor/gui/code_editor.h"
+
+class TextEditor : public ScriptEditorBase {
+	GDCLASS(TextEditor, ScriptEditorBase);
 
 	static ScriptEditorBase *create_editor(const Ref<Resource> &p_resource);
 
-	static inline EditMenus *edit_menus = nullptr;
+private:
+	CodeTextEditor *code_editor = nullptr;
+
+	Ref<Resource> edited_res;
+	bool editor_enabled = false;
+
+	HBoxContainer *edit_hb = nullptr;
+	MenuButton *edit_menu = nullptr;
+	PopupMenu *highlighter_menu = nullptr;
+	MenuButton *search_menu = nullptr;
+	PopupMenu *bookmarks_menu = nullptr;
+	PopupMenu *context_menu = nullptr;
+
+	GotoLinePopup *goto_line_popup = nullptr;
+
+	enum {
+		EDIT_UNDO,
+		EDIT_REDO,
+		EDIT_CUT,
+		EDIT_COPY,
+		EDIT_PASTE,
+		EDIT_SELECT_ALL,
+		EDIT_TRIM_TRAILING_WHITESAPCE,
+		EDIT_TRIM_FINAL_NEWLINES,
+		EDIT_CONVERT_INDENT_TO_SPACES,
+		EDIT_CONVERT_INDENT_TO_TABS,
+		EDIT_MOVE_LINE_UP,
+		EDIT_MOVE_LINE_DOWN,
+		EDIT_INDENT,
+		EDIT_UNINDENT,
+		EDIT_DELETE_LINE,
+		EDIT_DUPLICATE_SELECTION,
+		EDIT_DUPLICATE_LINES,
+		EDIT_TO_UPPERCASE,
+		EDIT_TO_LOWERCASE,
+		EDIT_CAPITALIZE,
+		EDIT_TOGGLE_WORD_WRAP,
+		EDIT_TOGGLE_FOLD_LINE,
+		EDIT_FOLD_ALL_LINES,
+		EDIT_UNFOLD_ALL_LINES,
+		SEARCH_FIND,
+		SEARCH_FIND_NEXT,
+		SEARCH_FIND_PREV,
+		SEARCH_REPLACE,
+		SEARCH_IN_FILES,
+		REPLACE_IN_FILES,
+		SEARCH_GOTO_LINE,
+		BOOKMARK_TOGGLE,
+		BOOKMARK_GOTO_NEXT,
+		BOOKMARK_GOTO_PREV,
+		BOOKMARK_REMOVE_ALL,
+		EDIT_EMOJI_AND_SYMBOL,
+	};
 
 protected:
-	virtual void _validate_script() override;
+	void _edit_option(int p_op);
+	void _make_context_menu(bool p_selection, bool p_can_fold, bool p_is_folded, Vector2 p_position);
+	void _text_edit_gui_input(const Ref<InputEvent> &ev);
+	void _prepare_edit_menu();
+
+	HashMap<String, Ref<EditorSyntaxHighlighter>> highlighters;
+	void _change_syntax_highlighter(int p_idx);
+	void _load_theme_settings();
+
+	void _convert_case(CodeTextEditor::CaseStyle p_case);
+
+	void _validate_script();
+
+	void _update_bookmark_list();
+	void _bookmark_item_pressed(int p_idx);
 
 public:
+	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+
+	virtual String get_name() override;
+	virtual Ref<Texture2D> get_theme_icon() override;
+	virtual Ref<Resource> get_edited_resource() const override;
+	virtual void set_edited_resource(const Ref<Resource> &p_res) override;
+	virtual void enable_editor(Control *p_shortcut_context = nullptr) override;
+	virtual void reload_text() override;
 	virtual void apply_code() override;
+	virtual bool is_unsaved() override;
+	virtual Variant get_edit_state() override;
+	virtual void set_edit_state(const Variant &p_state) override;
+	virtual Variant get_navigation_state() override;
+	virtual Vector<String> get_functions() override;
+	virtual PackedInt32Array get_breakpoints() override;
+	virtual void set_breakpoint(int p_line, bool p_enabled) override {}
+	virtual void clear_breakpoints() override {}
+	virtual void goto_line(int p_line, int p_column = 0) override;
+	void goto_line_selection(int p_line, int p_begin, int p_end);
+	virtual void set_executing_line(int p_line) override;
+	virtual void clear_executing_line() override;
+	virtual void trim_trailing_whitespace() override;
+	virtual void trim_final_newlines() override;
+	virtual void insert_final_newline() override;
+	virtual void convert_indent() override;
+	virtual void ensure_focus() override;
+	virtual void tag_saved_version() override;
+	virtual void update_settings() override;
+	virtual bool show_members_overview() override;
+	virtual void set_debugger_active(bool p_active) override;
+	virtual void set_tooltip_request_func(const Callable &p_toolip_callback) override;
+	virtual void add_callback(const String &p_function, const PackedStringArray &p_args) override;
+	void update_toggle_files_button() override;
 
 	virtual Control *get_edit_menu() override;
+	virtual void clear_edit_menu() override;
+	virtual void set_find_replace_bar(FindReplaceBar *p_bar) override;
+
+	virtual void validate() override;
+
+	virtual Control *get_base_editor() const override;
+	virtual CodeTextEditor *get_code_editor() const override;
 
 	static void register_editor();
 
 	TextEditor();
+	~TextEditor();
 };
diff --git a/engine/editor/settings/SCsub b/engine/editor/settings/SCsub
index abab63a6..b3cff5b9 100644
--- a/engine/editor/settings/SCsub
+++ b/engine/editor/settings/SCsub
@@ -4,5 +4,3 @@ from misc.utility.scons_hints import *
 Import("env")
 
 env.add_source_files(env.editor_sources, "*.cpp")
-
-SConscript("gdextension/SCsub")
diff --git a/engine/editor/settings/action_map_editor.cpp b/engine/editor/settings/action_map_editor.cpp
index c720acbd..6e646566 100644
--- a/engine/editor/settings/action_map_editor.cpp
+++ b/engine/editor/settings/action_map_editor.cpp
@@ -30,8 +30,6 @@
 
 #include "action_map_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_event_search_bar.h"
 #include "editor/settings/editor_settings.h"
@@ -172,7 +170,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
 			current_action_name = item->get_meta("__name");
 			current_action_event_index = -1;
 
-			event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name, current_action);
+			event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name);
 		} break;
 		case ActionMapEditor::BUTTON_EDIT_EVENT: {
 			// Action and Action name is located on the parent of the event.
@@ -183,7 +181,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
 
 			Ref<InputEvent> ie = item->get_meta("__event");
 			if (ie.is_valid()) {
-				event_config_dialog->popup_and_configure(ie, current_action_name, current_action);
+				event_config_dialog->popup_and_configure(ie, current_action_name);
 			}
 		} break;
 		case ActionMapEditor::BUTTON_REMOVE_ACTION: {
diff --git a/engine/editor/settings/editor_autoload_settings.cpp b/engine/editor/settings/editor_autoload_settings.cpp
index 2f6d6ab1..4d708e58 100644
--- a/engine/editor/settings/editor_autoload_settings.cpp
+++ b/engine/editor/settings/editor_autoload_settings.cpp
@@ -32,19 +32,12 @@
 
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"
+#include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/scene/scene_create_dialog.h"
 #include "editor/settings/project_settings_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/tree.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 
@@ -54,23 +47,47 @@ void EditorAutoloadSettings::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			List<String> afn;
+			ResourceLoader::get_recognized_extensions_for_type("Script", &afn);
 			ResourceLoader::get_recognized_extensions_for_type("PackedScene", &afn);
 
 			for (const String &E : afn) {
-				scene_file_dialog->add_filter("*." + E);
+				file_dialog->add_filter("*." + E);
 			}
 
-			ResourceLoader::get_recognized_extensions_for_type("Script", &afn);
+			browse_button->set_button_icon(get_editor_theme_icon(SNAME("Folder")));
+		} break;
 
-			for (const String &E : afn) {
-				autoload_file_dialog->add_filter("*." + E);
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			if (!error_message->get_text().is_empty()) {
+				_autoload_text_changed(autoload_add_name->get_text());
 			}
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
-			browse_button->set_button_icon(get_editor_theme_icon(SNAME("FileBrowse")));
-			create_script_autoload->set_button_icon(get_editor_theme_icon(SNAME("Add")));
-			create_scene_autoload->set_button_icon(get_editor_theme_icon(SNAME("Add")));
+			browse_button->set_button_icon(get_editor_theme_icon(SNAME("Folder")));
+			add_autoload->set_button_icon(get_editor_theme_icon(SNAME("Add")));
+		} break;
+
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			FileSystemDock *dock = FileSystemDock::get_singleton();
+
+			if (dock != nullptr) {
+				ScriptCreateDialog *dialog = dock->get_script_create_dialog();
+
+				if (dialog != nullptr) {
+					Callable script_created = callable_mp(this, &EditorAutoloadSettings::_script_created);
+
+					if (is_visible_in_tree()) {
+						if (!dialog->is_connected(SNAME("script_created"), script_created)) {
+							dialog->connect("script_created", script_created);
+						}
+					} else {
+						if (dialog->is_connected(SNAME("script_created"), script_created)) {
+							dialog->disconnect("script_created", script_created);
+						}
+					}
+				}
+			}
 		} break;
 	}
 }
@@ -133,6 +150,25 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, Strin
 	return true;
 }
 
+void EditorAutoloadSettings::_autoload_add() {
+	if (autoload_add_path->get_text().is_empty()) {
+		ScriptCreateDialog *dialog = FileSystemDock::get_singleton()->get_script_create_dialog();
+		String fpath = path;
+		if (!fpath.ends_with("/")) {
+			fpath = fpath.get_base_dir();
+		}
+		dialog->config("Node", fpath.path_join(vformat("%s.gd", autoload_add_name->get_text())), false, false);
+		dialog->popup_centered();
+	} else {
+		if (autoload_add(autoload_add_name->get_text(), autoload_add_path->get_text())) {
+			autoload_add_path->set_text("");
+		}
+
+		autoload_add_name->set_text("");
+		add_autoload->set_disabled(true);
+	}
+}
+
 void EditorAutoloadSettings::_autoload_selected() {
 	TreeItem *ti = tree->get_selected();
 
@@ -249,6 +285,9 @@ void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_colu
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 
 	switch (p_button) {
+		case BUTTON_OPEN: {
+			_autoload_open(ti->get_text(1));
+		} break;
 		case BUTTON_MOVE_UP:
 		case BUTTON_MOVE_DOWN: {
 			TreeItem *swap = nullptr;
@@ -318,6 +357,36 @@ void EditorAutoloadSettings::_autoload_open(const String &fpath) {
 	ProjectSettingsEditor::get_singleton()->hide();
 }
 
+void EditorAutoloadSettings::_autoload_file_callback(const String &p_path) {
+	// Convert the file name to PascalCase, which is the convention for classes in GDScript.
+	const String class_name = p_path.get_file().get_basename().to_pascal_case();
+
+	// If the name collides with a built-in class, prefix the name to make it possible to add without having to edit the name.
+	// The prefix is subjective, but it provides better UX than leaving the Add button disabled :)
+	const String prefix = ClassDB::class_exists(class_name) ? "Global" : "";
+
+	autoload_add_name->set_text(prefix + class_name);
+	add_autoload->set_disabled(false);
+}
+
+void EditorAutoloadSettings::_autoload_text_submitted(const String &p_name) {
+	if (!autoload_add_path->get_text().is_empty() && _autoload_name_is_valid(p_name, nullptr)) {
+		_autoload_add();
+	}
+}
+
+void EditorAutoloadSettings::_autoload_path_text_changed(const String &p_path) {
+	add_autoload->set_disabled(!_autoload_name_is_valid(autoload_add_name->get_text(), nullptr));
+}
+
+void EditorAutoloadSettings::_autoload_text_changed(const String &p_name) {
+	String error_string;
+	bool is_name_valid = _autoload_name_is_valid(p_name, &error_string);
+	add_autoload->set_disabled(!is_name_valid);
+	error_message->set_text(error_string);
+	error_message->set_visible(!autoload_add_name->get_text().is_empty() && !is_name_valid);
+}
+
 Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
 	Node *n = nullptr;
 	if (ResourceLoader::get_resource_type(p_path) == "PackedScene") {
@@ -355,20 +424,6 @@ Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
 
 	return n;
 }
-void EditorAutoloadSettings::_create_script_autoload() {
-	if (!script_create_dialog) {
-		script_create_dialog = memnew(ScriptCreateDialog);
-		add_child(script_create_dialog);
-		script_create_dialog->connect("script_created", callable_mp(this, &EditorAutoloadSettings::_script_created));
-	}
-	script_create_dialog->config("Node", "res://new_autoload_script.gd", false, false);
-	script_create_dialog->popup_centered();
-}
-
-void EditorAutoloadSettings::_create_scene_autoload() {
-	scene_file_dialog->set_current_file("new_autoload_scene.tscn");
-	scene_file_dialog->popup_file_dialog();
-}
 
 void EditorAutoloadSettings::init_autoloads() {
 	for (AutoloadInfo &info : autoload_cache) {
@@ -401,56 +456,6 @@ void EditorAutoloadSettings::init_autoloads() {
 	}
 }
 
-void EditorAutoloadSettings::_autoload_file_selected(const String &p_path) {
-	_add_autoload(p_path.get_file().get_basename(), p_path);
-}
-
-void EditorAutoloadSettings::_scene_file_selected(const String &p_path) {
-	if (!scene_create_dialog) {
-		scene_create_dialog = memnew(SceneCreateDialog);
-		add_child(scene_create_dialog);
-		scene_create_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorAutoloadSettings::_scene_created));
-	}
-	scene_create_dialog->config(p_path.get_base_dir(), p_path.get_file().get_basename());
-	scene_create_dialog->popup_centered();
-}
-
-void EditorAutoloadSettings::_script_created(Ref<Script> p_script) {
-	FileSystemDock::get_singleton()->get_script_create_dialog()->hide();
-	path = p_script->get_path().get_base_dir();
-	_add_autoload(p_script->get_path().get_file().get_basename(), p_script->get_path());
-}
-
-void EditorAutoloadSettings::_scene_created() {
-	Node *root = scene_create_dialog->create_scene_root();
-
-	Ref<PackedScene> ps;
-	ps.instantiate();
-	ps->pack(root);
-
-	Error err = ResourceSaver::save(ps, scene_create_dialog->get_scene_path());
-	if (err != OK) {
-		EditorNode::get_singleton()->show_warning(vformat(TTR("Failed to create scene. Error: %d."), err));
-		return;
-	}
-
-	_add_autoload(scene_create_dialog->get_root_name(), scene_create_dialog->get_scene_path());
-}
-
-void EditorAutoloadSettings::_add_autoload(const String &p_name, const String &p_path) {
-	// Convert the file name to PascalCase, which is the convention for classes in GDScript.
-	String autoload_name = p_name.to_pascal_case();
-
-	// If the name collides with a built-in class, prefix the name to make it possible to add without having to edit the name.
-	// The prefix is subjective, but it provides better UX than throwing an error :)
-	if (ClassDB::class_exists(autoload_name)) {
-		autoload_name += "Global";
-	}
-
-	autoload_name = autoload_name.validate_ascii_identifier();
-	autoload_add(autoload_name, p_path);
-}
-
 void EditorAutoloadSettings::update_autoload() {
 	if (updating_autoload) {
 		return;
@@ -523,7 +528,6 @@ void EditorAutoloadSettings::update_autoload() {
 
 		TreeItem *item = tree->create_item(root);
 		item->set_text(0, name);
-		item->set_auto_translate_mode(0, AUTO_TRANSLATE_MODE_DISABLED); // For tooltip.
 		item->set_editable(0, true);
 
 		item->set_text(1, ResourceUID::ensure_path(scr_path));
@@ -533,6 +537,7 @@ void EditorAutoloadSettings::update_autoload() {
 		item->set_editable(2, true);
 		item->set_text(2, TTRC("Enable"));
 		item->set_checked(2, info.is_singleton);
+		item->add_button(3, get_editor_theme_icon(SNAME("Load")), BUTTON_OPEN);
 		item->add_button(3, get_editor_theme_icon(SNAME("MoveUp")), BUTTON_MOVE_UP);
 		item->add_button(3, get_editor_theme_icon(SNAME("MoveDown")), BUTTON_MOVE_DOWN);
 		item->add_button(3, get_editor_theme_icon(SNAME("Remove")), BUTTON_DELETE);
@@ -594,6 +599,17 @@ void EditorAutoloadSettings::update_autoload() {
 	updating_autoload = false;
 }
 
+void EditorAutoloadSettings::_script_created(Ref<Script> p_script) {
+	FileSystemDock::get_singleton()->get_script_create_dialog()->hide();
+	path = p_script->get_path().get_base_dir();
+	autoload_add_path->set_text(p_script->get_path());
+	_autoload_add();
+}
+
+LineEdit *EditorAutoloadSettings::get_path_box() const {
+	return autoload_add_path;
+}
+
 Variant EditorAutoloadSettings::get_drag_data_fw(const Point2 &p_point, Control *p_control) {
 	if (autoload_cache.size() <= 1) {
 		return false;
@@ -876,30 +892,58 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	HBoxContainer *hbc = memnew(HBoxContainer);
 	add_child(hbc);
 
-	autoload_file_dialog = memnew(EditorFileDialog);
-	autoload_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE);
-	hbc->add_child(autoload_file_dialog);
-	autoload_file_dialog->connect("file_selected", callable_mp(this, &EditorAutoloadSettings::_autoload_file_selected));
+	error_message = memnew(Label);
+	error_message->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	error_message->set_focus_mode(FOCUS_ACCESSIBILITY);
+	error_message->hide();
+	error_message->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
+	error_message->add_theme_color_override(SceneStringName(font_color), EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor)));
+	add_child(error_message);
 
-	scene_file_dialog = memnew(EditorFileDialog);
-	scene_file_dialog->set_file_mode(FileDialog::FILE_MODE_SAVE_FILE);
-	hbc->add_child(scene_file_dialog);
-	scene_file_dialog->connect("file_selected", callable_mp(this, &EditorAutoloadSettings::_scene_file_selected));
+	Label *l = memnew(Label);
+	l->set_text(TTRC("Path:"));
+	hbc->add_child(l);
+
+	autoload_add_path = memnew(LineEdit);
+	hbc->add_child(autoload_add_path);
+	autoload_add_path->set_accessibility_name(TTRC("Autoload Path"));
+	autoload_add_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	autoload_add_path->set_clear_button_enabled(true);
+	autoload_add_path->set_placeholder(TTRC("Set path or press \"Add\" to create a script."));
+	autoload_add_path->connect(SceneStringName(text_changed), callable_mp(this, &EditorAutoloadSettings::_autoload_path_text_changed));
 
 	browse_button = memnew(Button);
-	browse_button->set_text(TTRC("Select Script/Scene"));
 	hbc->add_child(browse_button);
-	browse_button->connect(SceneStringName(pressed), callable_mp(autoload_file_dialog, &FileDialog::popup_file_dialog));
+	browse_button->set_accessibility_name(TTRC("Select Autoload Path"));
+	browse_button->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_browse_autoload_add_path));
 
-	create_script_autoload = memnew(Button);
-	create_script_autoload->set_text(TTRC("Create Script"));
-	hbc->add_child(create_script_autoload);
-	create_script_autoload->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_create_script_autoload));
+	file_dialog = memnew(EditorFileDialog);
+	hbc->add_child(file_dialog);
+	file_dialog->connect("file_selected", callable_mp(this, &EditorAutoloadSettings::_set_autoload_add_path));
+	file_dialog->connect("dir_selected", callable_mp(this, &EditorAutoloadSettings::_set_autoload_add_path));
+	file_dialog->connect("files_selected", callable_mp(this, &EditorAutoloadSettings::_set_autoload_add_path));
 
-	create_scene_autoload = memnew(Button);
-	create_scene_autoload->set_text(TTRC("Create Scene"));
-	hbc->add_child(create_scene_autoload);
-	create_scene_autoload->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_create_scene_autoload));
+	hbc->set_h_size_flags(SIZE_EXPAND_FILL);
+	file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
+	file_dialog->connect("file_selected", callable_mp(this, &EditorAutoloadSettings::_autoload_file_callback));
+
+	l = memnew(Label);
+	l->set_text(TTRC("Node Name:"));
+	hbc->add_child(l);
+
+	autoload_add_name = memnew(LineEdit);
+	autoload_add_name->set_accessibility_name(TTRC("Node Name:"));
+	autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
+	autoload_add_name->connect(SceneStringName(text_submitted), callable_mp(this, &EditorAutoloadSettings::_autoload_text_submitted));
+	autoload_add_name->connect(SceneStringName(text_changed), callable_mp(this, &EditorAutoloadSettings::_autoload_text_changed));
+	hbc->add_child(autoload_add_name);
+
+	add_autoload = memnew(Button);
+	add_autoload->set_text(TTRC("Add"));
+	add_autoload->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_autoload_add));
+	// The button will be enabled once a valid name is entered (either automatically or manually).
+	add_autoload->set_disabled(true);
+	hbc->add_child(add_autoload);
 
 	MarginContainer *mc = memnew(MarginContainer);
 	mc->set_v_size_flags(SIZE_EXPAND_FILL);
@@ -920,20 +964,17 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	tree->set_column_titles_visible(true);
 
 	tree->set_column_title(0, TTRC("Name"));
-	tree->set_column_title_tooltip_text(0, TTRC("Name of the autoload. Double-click to rename."));
 	tree->set_column_title_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
 	tree->set_column_expand(0, true);
 	tree->set_column_expand_ratio(0, 1);
 
 	tree->set_column_title(1, TTRC("Path"));
-	tree->set_column_title_tooltip_text(1, TTRC("Path to the autoload file. Double-click to open it."));
 	tree->set_column_title_alignment(1, HORIZONTAL_ALIGNMENT_LEFT);
 	tree->set_column_expand(1, true);
 	tree->set_column_clip_content(1, true);
 	tree->set_column_expand_ratio(1, 2);
 
 	tree->set_column_title(2, TTRC("Global Variable"));
-	tree->set_column_title_tooltip_text(2, TTRC("If enabled, this autoload can be accessed in scripts using its name."));
 	tree->set_column_expand(2, false);
 
 	tree->set_column_expand(3, false);
@@ -953,3 +994,12 @@ EditorAutoloadSettings::~EditorAutoloadSettings() {
 		}
 	}
 }
+
+void EditorAutoloadSettings::_set_autoload_add_path(const String &p_text) {
+	autoload_add_path->set_text(p_text);
+	autoload_add_path->emit_signal(SceneStringName(text_submitted), p_text);
+}
+
+void EditorAutoloadSettings::_browse_autoload_add_path() {
+	file_dialog->popup_file_dialog();
+}
diff --git a/engine/editor/settings/editor_autoload_settings.h b/engine/editor/settings/editor_autoload_settings.h
index 954e2053..81d31d6e 100644
--- a/engine/editor/settings/editor_autoload_settings.h
+++ b/engine/editor/settings/editor_autoload_settings.h
@@ -31,20 +31,19 @@
 #pragma once
 
 #include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/tree.h"
 
-class Button;
-class FileDialog;
-class SceneCreateDialog;
-class ScriptCreateDialog;
-class Tree;
+class EditorFileDialog;
 
 class EditorAutoloadSettings : public VBoxContainer {
 	GDCLASS(EditorAutoloadSettings, VBoxContainer);
 
 	enum {
+		BUTTON_OPEN,
 		BUTTON_MOVE_UP,
 		BUTTON_MOVE_DOWN,
-		BUTTON_DELETE,
+		BUTTON_DELETE
 	};
 
 	String path = "res://";
@@ -69,36 +68,36 @@ class EditorAutoloadSettings : public VBoxContainer {
 	String selected_autoload;
 
 	Tree *tree = nullptr;
+	LineEdit *autoload_add_name = nullptr;
+	Button *add_autoload = nullptr;
+	LineEdit *autoload_add_path = nullptr;
+	Label *error_message = nullptr;
 	Button *browse_button = nullptr;
-	Button *create_script_autoload = nullptr;
-	Button *create_scene_autoload = nullptr;
-	FileDialog *autoload_file_dialog = nullptr;
-	FileDialog *scene_file_dialog = nullptr;
-	ScriptCreateDialog *script_create_dialog = nullptr;
-	SceneCreateDialog *scene_create_dialog = nullptr;
+	EditorFileDialog *file_dialog = nullptr;
 
 	bool _autoload_name_is_valid(const String &p_name, String *r_error = nullptr);
 
+	void _autoload_add();
 	void _autoload_selected();
 	void _autoload_edited();
 	void _autoload_button_pressed(Object *p_item, int p_column, int p_button, MouseButton p_mouse_button);
 	void _autoload_activated();
+	void _autoload_path_text_changed(const String &p_path);
+	void _autoload_text_submitted(const String &p_name);
+	void _autoload_text_changed(const String &p_name);
 	void _autoload_open(const String &fpath);
+	void _autoload_file_callback(const String &p_path);
 	Node *_create_autoload(const String &p_path);
 
-	void _create_script_autoload();
-	void _create_scene_autoload();
-	void _autoload_file_selected(const String &p_path);
-	void _scene_file_selected(const String &p_path);
-
 	void _script_created(Ref<Script> p_script);
-	void _scene_created();
-	void _add_autoload(const String &p_name, const String &p_path);
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_control);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) const;
 	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control);
 
+	void _set_autoload_add_path(const String &p_text);
+	void _browse_autoload_add_path();
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -109,6 +108,8 @@ public:
 	bool autoload_add(const String &p_name, const String &p_path);
 	void autoload_remove(const String &p_name);
 
+	LineEdit *get_path_box() const;
+
 	EditorAutoloadSettings();
 	~EditorAutoloadSettings();
 };
diff --git a/engine/editor/settings/editor_build_profile.cpp b/engine/editor/settings/editor_build_profile.cpp
index 10f549fb..0ff857f1 100644
--- a/engine/editor/settings/editor_build_profile.cpp
+++ b/engine/editor/settings/editor_build_profile.cpp
@@ -32,10 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/json.h"
-#include "core/io/resource_importer.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
@@ -47,21 +43,17 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 
 const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = {
 	// This maps to SCons build options.
 	"disable_3d",
 	"disable_navigation_2d",
 	"disable_navigation_3d",
-	"accesskit",
-	"sdl",
 	"disable_xr",
 	"module_openxr_enabled",
 	"wayland",
 	"x11",
-	"pulseaudio",
-	"alsa",
 	"rendering_device", // FIXME: There's no scons option to disable rendering device.
 	"forward_plus_renderer",
 	"forward_mobile_renderer",
@@ -87,14 +79,10 @@ const bool EditorBuildProfile::build_option_disabled_by_default[BUILD_OPTION_MAX
 	false, // 3D
 	false, // NAVIGATION_2D
 	false, // NAVIGATION_3D
-	false, // ACCESSKIT
-	false, // SDL
 	false, // XR
 	false, // OPENXR
 	false, // WAYLAND
 	false, // X11
-	false, // PULSEAUDIO
-	false, // ALSA
 	false, // RENDERING_DEVICE
 	false, // FORWARD_RENDERER
 	false, // MOBILE_RENDERER
@@ -120,14 +108,10 @@ const bool EditorBuildProfile::build_option_disable_values[BUILD_OPTION_MAX] = {
 	true, // 3D
 	true, // NAVIGATION_2D
 	true, // NAVIGATION_3D
-	false, // ACCESSKIT
-	false, // SDL
 	true, // XR
 	false, // OPENXR
 	false, // WAYLAND
 	false, // X11
-	false, // PULSEAUDIO
-	false, // ALSA
 	false, // RENDERING_DEVICE
 	false, // FORWARD_RENDERER
 	false, // MOBILE_RENDERER
@@ -153,14 +137,10 @@ const bool EditorBuildProfile::build_option_explicit_use[BUILD_OPTION_MAX] = {
 	false, // 3D
 	false, // NAVIGATION_2D
 	false, // NAVIGATION_3D
-	false, // ACCESSKIT
-	false, // SDL
 	false, // XR
 	false, // OPENXR
 	false, // WAYLAND
 	false, // X11
-	false, // PULSEAUDIO
-	false, // ALSA
 	false, // RENDERING_DEVICE
 	false, // FORWARD_RENDERER
 	false, // MOBILE_RENDERER
@@ -185,14 +165,10 @@ const EditorBuildProfile::BuildOptionCategory EditorBuildProfile::build_option_c
 	BUILD_OPTION_CATEGORY_GENERAL, // 3D
 	BUILD_OPTION_CATEGORY_GENERAL, // NAVIGATION_2D
 	BUILD_OPTION_CATEGORY_GENERAL, // NAVIGATION_3D
-	BUILD_OPTION_CATEGORY_GENERAL, // ACCESSKIT
-	BUILD_OPTION_CATEGORY_GENERAL, // SDL
 	BUILD_OPTION_CATEGORY_GENERAL, // XR
 	BUILD_OPTION_CATEGORY_GENERAL, // OPENXR
 	BUILD_OPTION_CATEGORY_GENERAL, // WAYLAND
 	BUILD_OPTION_CATEGORY_GENERAL, // X11
-	BUILD_OPTION_CATEGORY_GENERAL, // PULSEAUDIO
-	BUILD_OPTION_CATEGORY_GENERAL, // ALSA
 	BUILD_OPTION_CATEGORY_GRAPHICS, // RENDERING_DEVICE
 	BUILD_OPTION_CATEGORY_GRAPHICS, // FORWARD_RENDERER
 	BUILD_OPTION_CATEGORY_GRAPHICS, // MOBILE_RENDERER
@@ -260,7 +236,6 @@ const HashMap<EditorBuildProfile::BuildOption, LocalVector<EditorBuildProfile::B
 	} },
 };
 
-// Should also contain classes not derived from either `Resource` or `Node`.
 const HashMap<EditorBuildProfile::BuildOption, LocalVector<String>> EditorBuildProfile::build_option_classes = {
 	{ BUILD_OPTION_3D, {
 			"Node3D",
@@ -410,14 +385,10 @@ String EditorBuildProfile::get_build_option_name(BuildOption p_build_option) {
 		TTRC("3D Engine"),
 		TTRC("Navigation (2D)"),
 		TTRC("Navigation (3D)"),
-		TTRC("Accessibility Support (AccessKit)"),
-		TTRC("Improved Gamepad Support (SDL)"),
 		TTRC("XR"),
 		TTRC("OpenXR"),
 		TTRC("Wayland"),
 		TTRC("X11"),
-		TTRC("PulseAudio"),
-		TTRC("ALSA"),
 		TTRC("RenderingDevice"),
 		TTRC("Forward+ Renderer"),
 		TTRC("Mobile Renderer"),
@@ -444,27 +415,23 @@ String EditorBuildProfile::get_build_option_description(BuildOption p_build_opti
 	ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, String());
 
 	const char *build_option_descriptions[BUILD_OPTION_MAX] = {
-		TTRC("3D Nodes as well as RenderingServer access to 3D features.\nNote that the Geometry3D singleton remains available even with this item disabled."),
-		TTRC("NavigationServer and capabilities for 2D."),
-		TTRC("NavigationServer and capabilities for 3D."),
-		TTRC("Support for screen readers using the AccessKit library."),
-		TTRC("Improved gamepad support on Windows, macOS, and Linux using the SDL library.\nIf disabled, built-in custom code is used for gamepad support instead, which may be less reliable for certain controller models."),
+		TTRC("3D Nodes as well as RenderingServer access to 3D features."),
+		TTRC("Navigation Server and capabilities for 2D."),
+		TTRC("Navigation Server and capabilities for 3D."),
 		TTRC("XR (AR and VR)."),
 		TTRC("OpenXR standard implementation (requires XR to be enabled)."),
-		TTRC("Wayland display server support (Linux only)."),
-		TTRC("X11 display server support (Linux only)."),
-		TTRC("PulseAudio audio driver (Linux only)."),
-		TTRC("ALSA audio driver (Linux only)."),
-		TTRC("RenderingDevice-based rendering (if disabled, the OpenGL backend is required)."),
+		TTRC("Wayland display (Linux only)."),
+		TTRC("X11 display (Linux only)."),
+		TTRC("RenderingDevice based rendering (if disabled, the OpenGL backend is required)."),
 		TTRC("Forward+ renderer for advanced 3D graphics."),
 		TTRC("Mobile renderer for less advanced 3D graphics."),
 		TTRC("Vulkan backend of RenderingDevice."),
 		TTRC("Direct3D 12 backend of RenderingDevice."),
 		TTRC("Metal backend of RenderingDevice (Apple arm64 only)."),
 		TTRC("OpenGL backend (if disabled, the RenderingDevice backend is required)."),
-		TTRC("PhysicsServer and capabilities for 2D."),
+		TTRC("Physics Server and capabilities for 2D."),
 		TTRC("Godot Physics backend (2D)."),
-		TTRC("PhysicsServer and capabilities for 3D."),
+		TTRC("Physics Server and capabilities for 3D."),
 		TTRC("Godot Physics backend (3D)."),
 		TTRC("Jolt Physics backend (3D only)."),
 		TTRC("Fallback implementation of Text Server\nSupports basic text layouts."),
@@ -472,7 +439,7 @@ String EditorBuildProfile::get_build_option_description(BuildOption p_build_opti
 		TTRC("TrueType, OpenType, Type 1, and WOFF1 font format support using FreeType library (if disabled, WOFF2 support is also disabled)."),
 		TTRC("WOFF2 font format support using FreeType and Brotli libraries."),
 		TTRC("SIL Graphite smart font technology support (supported by Advanced Text Server only)."),
-		TTRC("Multi-channel signed distance field font rendering support using msdfgen library (pre-rendered MSDF fonts can be used even if this option is disabled)."),
+		TTRC("Multi-channel signed distance field font rendering support using msdfgen library (pre-rendered MSDF fonts can be used even if this option disabled)."),
 	};
 
 	return TTRGET(build_option_descriptions[p_build_option]);
@@ -490,17 +457,17 @@ EditorBuildProfile::BuildOptionCategory EditorBuildProfile::get_build_option_cat
 
 LocalVector<EditorBuildProfile::BuildOption> EditorBuildProfile::get_build_option_dependencies(BuildOption p_build_option) {
 	ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, LocalVector<EditorBuildProfile::BuildOption>());
-	return build_option_dependencies.has(p_build_option) ? LocalVector<EditorBuildProfile::BuildOption>(build_option_dependencies[p_build_option]) : LocalVector<EditorBuildProfile::BuildOption>();
+	return build_option_dependencies.has(p_build_option) ? build_option_dependencies[p_build_option] : LocalVector<EditorBuildProfile::BuildOption>();
 }
 
 HashMap<String, LocalVector<Variant>> EditorBuildProfile::get_build_option_settings(BuildOption p_build_option) {
 	ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, (HashMap<String, LocalVector<Variant>>()));
-	return build_option_settings.has(p_build_option) ? HashMap<String, LocalVector<Variant>>(build_option_settings[p_build_option]) : HashMap<String, LocalVector<Variant>>();
+	return build_option_settings.has(p_build_option) ? build_option_settings[p_build_option] : HashMap<String, LocalVector<Variant>>();
 }
 
 LocalVector<String> EditorBuildProfile::get_build_option_classes(BuildOption p_build_option) {
 	ERR_FAIL_INDEX_V(p_build_option, BUILD_OPTION_MAX, LocalVector<String>());
-	return build_option_classes.has(p_build_option) ? LocalVector<String>(build_option_classes[p_build_option]) : LocalVector<String>();
+	return build_option_classes.has(p_build_option) ? build_option_classes[p_build_option] : LocalVector<String>();
 }
 
 String EditorBuildProfile::get_build_option_category_name(BuildOptionCategory p_build_option_category) {
@@ -755,19 +722,17 @@ void EditorBuildProfileManager::_profile_action(int p_action) {
 
 	switch (p_action) {
 		case ACTION_RESET: {
-			confirm_dialog->set_text(TTRC("Reset the edited profile?"));
+			confirm_dialog->set_text(TTR("Reset the edited profile?"));
 			confirm_dialog->popup_centered();
 		} break;
-
 		case ACTION_LOAD: {
 			import_profile->popup_file_dialog();
 		} break;
-
 		case ACTION_SAVE: {
 			if (!profile_path->get_text().is_empty()) {
 				Error err = edited->save_to_file(profile_path->get_text());
 				if (err != OK) {
-					EditorNode::get_singleton()->show_warning(TTRC("File saving failed."));
+					EditorNode::get_singleton()->show_warning(TTR("File saving failed."));
 				}
 				break;
 			}
@@ -777,12 +742,10 @@ void EditorBuildProfileManager::_profile_action(int p_action) {
 			export_profile->popup_file_dialog();
 			export_profile->set_current_file(profile_path->get_text());
 		} break;
-
 		case ACTION_NEW: {
-			confirm_dialog->set_text(TTRC("Create a new profile?"));
+			confirm_dialog->set_text(TTR("Create a new profile?"));
 			confirm_dialog->popup_centered();
 		} break;
-
 		case ACTION_DETECT: {
 			String text = TTR("This will scan all files in the current project to detect used classes.\nNote that the first scan may take a while, specially in larger projects.");
 #ifdef MODULE_MONO_ENABLED
@@ -791,12 +754,6 @@ void EditorBuildProfileManager::_profile_action(int p_action) {
 			confirm_dialog->set_text(text);
 			confirm_dialog->popup_centered();
 		} break;
-
-		case ACTION_CLEAR_CACHE: {
-			confirm_dialog->set_text(TTRC("Clear cache of used classes per file? This will make it so that those files will need to be re-scanned, but it can also help fix problems related to outdated caching."));
-			confirm_dialog->popup_centered();
-		} break;
-
 		case ACTION_MAX: {
 		} break;
 	}
@@ -878,11 +835,9 @@ void EditorBuildProfileManager::_find_files(EditorFileSystemDirectory *p_dir, co
 void EditorBuildProfileManager::_detect_from_project() {
 	EditorNode::get_singleton()->progress_add_task("detect_classes_from_project", TTRC("Scanning Project for Used Classes"), 3, true);
 
-	String cache_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("used_class_cache");
-
 	HashMap<String, DetectedFile> previous_file_cache;
 
-	Ref<FileAccess> f = FileAccess::open(cache_path, FileAccess::READ);
+	Ref<FileAccess> f = FileAccess::open(EditorPaths::get_singleton()->get_project_settings_dir().path_join("used_class_cache"), FileAccess::READ);
 	if (f.is_valid()) {
 		while (!f->eof_reached()) {
 			String l = f->get_line();
@@ -917,34 +872,32 @@ void EditorBuildProfileManager::_detect_from_project() {
 	LocalVector<String> used_build_deps;
 
 	// Find classes and update the disk cache in the process.
-	f = FileAccess::open(cache_path, FileAccess::WRITE);
-	if (f.is_valid()) {
-		for (const KeyValue<String, DetectedFile> &E : updated_file_cache) {
-			String l = E.key + "::" + itos(E.value.timestamp) + "::" + E.value.md5 + "::";
-			for (int i = 0; i < E.value.classes.size(); i++) {
-				String c = E.value.classes[i];
-				if (i > 0) {
-					l += ",";
-				}
-				l += c;
-				used_classes.insert(c);
-			}
-			l += "::";
-			for (int i = 0; i < E.value.build_deps.size(); i++) {
-				String c = E.value.build_deps[i];
-				if (i > 0) {
-					l += ",";
-				}
-				l += c;
-				used_build_deps.push_back(c);
-			}
-			f->store_line(l);
-		}
-		f.unref();
+	f = FileAccess::open(EditorPaths::get_singleton()->get_project_settings_dir().path_join("used_class_cache"), FileAccess::WRITE);
 
-		profile_actions[ACTION_CLEAR_CACHE]->set_disabled(false);
+	for (const KeyValue<String, DetectedFile> &E : updated_file_cache) {
+		String l = E.key + "::" + itos(E.value.timestamp) + "::" + E.value.md5 + "::";
+		for (int i = 0; i < E.value.classes.size(); i++) {
+			String c = E.value.classes[i];
+			if (i > 0) {
+				l += ",";
+			}
+			l += c;
+			used_classes.insert(c);
+		}
+		l += "::";
+		for (int i = 0; i < E.value.build_deps.size(); i++) {
+			String c = E.value.build_deps[i];
+			if (i > 0) {
+				l += ",";
+			}
+			l += c;
+			used_build_deps.push_back(c);
+		}
+		f->store_line(l);
 	}
 
+	f.unref();
+
 	// Add classes that are either necessary for the engine to work properly, or there isn't a way to infer their use.
 
 	// HACK: Some classes are included due to creating clashes with unrelated when disabled.
@@ -952,8 +905,12 @@ void EditorBuildProfileManager::_detect_from_project() {
 	const LocalVector<String> hardcoded_classes = {
 		"Font",
 		"InputEvent",
+		"MainLoop",
+		"Mutex",
 		"ShaderInclude",
+		"ShaderIncludeDB",
 		"StyleBox",
+		"Time",
 		"Window",
 	};
 
@@ -1013,15 +970,8 @@ void EditorBuildProfileManager::_detect_from_project() {
 	ClassDB::get_class_list(all_classes);
 
 	for (const StringName &class_name : all_classes) {
-		if (ClassDB::get_api_type(class_name) != ClassDB::API_CORE) {
-			continue; // This class is editor-only or not from Godot itself.
-		}
-
-		if (class_name != "Resource" && class_name != "Node" && !ClassDB::is_parent_class(class_name, "Resource") && !ClassDB::is_parent_class(class_name, "Node")) {
-			continue;
-		}
-
-		if (all_used_classes.has(class_name)) {
+		if (String(class_name).begins_with("Editor") || ClassDB::get_api_type(class_name) != ClassDB::API_CORE || all_used_classes.has(class_name)) {
+			// This class is valid or editor-only, do nothing.
 			continue;
 		}
 
@@ -1060,7 +1010,7 @@ void EditorBuildProfileManager::_detect_from_project() {
 		const LocalVector<String> classes = EditorBuildProfile::get_build_option_classes(EditorBuildProfile::BuildOption(i));
 		if (!classes.is_empty()) {
 			for (StringName class_name : classes) {
-				if (all_used_classes.has(class_name) && !edited->is_class_disabled(class_name)) {
+				if (!edited->is_class_disabled(class_name)) {
 					skip = true;
 					break;
 				}
@@ -1122,29 +1072,22 @@ void EditorBuildProfileManager::_action_confirm() {
 			edited.instantiate();
 			_update_edited_profile();
 		} break;
-
+		case ACTION_LOAD: {
+		} break;
+		case ACTION_SAVE: {
+		} break;
+		case ACTION_SAVE_AS: {
+		} break;
 		case ACTION_NEW: {
 			profile_path->set_text("");
 			edited.instantiate();
 			_update_edited_profile();
 		} break;
-
 		case ACTION_DETECT: {
 			_detect_from_project();
 			_update_edited_profile();
 		} break;
-
-		case ACTION_CLEAR_CACHE: {
-			String cache_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("used_class_cache");
-			Error err = DirAccess::remove_absolute(cache_path);
-			if (err != OK) {
-				ERR_FAIL_MSG(vformat("Cannot remove cache file: '%s'.", cache_path));
-			} else {
-				profile_actions[ACTION_CLEAR_CACHE]->set_disabled(true);
-			}
-		} break;
-
-		default: {
+		case ACTION_MAX: {
 		} break;
 	}
 }
@@ -1187,9 +1130,10 @@ void EditorBuildProfileManager::_fill_classes_from(TreeItem *p_parent, const Str
 	child_classes.sort_custom<StringName::AlphCompare>();
 
 	for (const StringName &name : child_classes) {
-		if (ClassDB::get_api_type(name) == ClassDB::API_CORE) {
-			_fill_classes_from(class_item, name, p_selected);
+		if (String(name).begins_with("Editor") || ClassDB::get_api_type(name) != ClassDB::API_CORE) {
+			continue;
 		}
+		_fill_classes_from(class_item, name, p_selected);
 	}
 }
 
@@ -1302,7 +1246,7 @@ void EditorBuildProfileManager::_update_edited_profile() {
 	}
 
 	TreeItem *classes = class_list->create_item(root);
-	classes->set_text(0, TTRC("Nodes and Classes:"));
+	classes->set_text(0, TTR("Nodes and Classes:"));
 
 	_fill_classes_from(classes, "Node", class_selected);
 	_fill_classes_from(classes, "Resource", class_selected);
@@ -1370,44 +1314,37 @@ EditorBuildProfileManager::EditorBuildProfileManager() {
 	profile_path->set_editable(true);
 	profile_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
-	profile_actions[ACTION_NEW] = memnew(Button(TTRC("New")));
+	profile_actions[ACTION_NEW] = memnew(Button(TTR("New")));
 	path_hbc->add_child(profile_actions[ACTION_NEW]);
 	profile_actions[ACTION_NEW]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_NEW));
 
-	profile_actions[ACTION_LOAD] = memnew(Button(TTRC("Load")));
+	profile_actions[ACTION_LOAD] = memnew(Button(TTR("Load")));
 	path_hbc->add_child(profile_actions[ACTION_LOAD]);
 	profile_actions[ACTION_LOAD]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_LOAD));
 
-	profile_actions[ACTION_SAVE] = memnew(Button(TTRC("Save")));
+	profile_actions[ACTION_SAVE] = memnew(Button(TTR("Save")));
 	path_hbc->add_child(profile_actions[ACTION_SAVE]);
 	profile_actions[ACTION_SAVE]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_SAVE));
 
-	profile_actions[ACTION_SAVE_AS] = memnew(Button(TTRC("Save As")));
+	profile_actions[ACTION_SAVE_AS] = memnew(Button(TTR("Save As")));
 	path_hbc->add_child(profile_actions[ACTION_SAVE_AS]);
 	profile_actions[ACTION_SAVE_AS]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_SAVE_AS));
 
-	main_vbc->add_margin_child(TTRC("Profile:"), path_hbc);
+	main_vbc->add_margin_child(TTR("Profile:"), path_hbc);
 
 	main_vbc->add_child(memnew(HSeparator));
 
 	HBoxContainer *profiles_hbc = memnew(HBoxContainer);
 
-	profile_actions[ACTION_RESET] = memnew(Button(TTRC("Reset to Defaults")));
+	profile_actions[ACTION_RESET] = memnew(Button(TTR("Reset to Defaults")));
 	profiles_hbc->add_child(profile_actions[ACTION_RESET]);
 	profile_actions[ACTION_RESET]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_RESET));
 
-	profile_actions[ACTION_DETECT] = memnew(Button(TTRC("Detect from Project")));
+	profile_actions[ACTION_DETECT] = memnew(Button(TTR("Detect from Project")));
 	profiles_hbc->add_child(profile_actions[ACTION_DETECT]);
 	profile_actions[ACTION_DETECT]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_DETECT));
 
-	profiles_hbc->add_spacer();
-
-	profile_actions[ACTION_CLEAR_CACHE] = memnew(Button(TTRC("Clear Cache")));
-	profile_actions[ACTION_CLEAR_CACHE]->set_disabled(!FileAccess::exists(EditorPaths::get_singleton()->get_project_settings_dir().path_join("used_class_cache")));
-	profiles_hbc->add_child(profile_actions[ACTION_CLEAR_CACHE]);
-	profile_actions[ACTION_CLEAR_CACHE]->connect(SceneStringName(pressed), callable_mp(this, &EditorBuildProfileManager::_profile_action).bind(ACTION_CLEAR_CACHE));
-
-	main_vbc->add_margin_child(TTRC("Actions:"), profiles_hbc);
+	main_vbc->add_margin_child(TTR("Actions:"), profiles_hbc);
 
 	class_list = memnew(Tree);
 	class_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
@@ -1426,37 +1363,35 @@ EditorBuildProfileManager::EditorBuildProfileManager() {
 	description_bit = memnew(EditorHelpBit);
 	description_bit->set_content_height_limits(80 * EDSCALE, 80 * EDSCALE);
 	description_bit->connect("request_hide", callable_mp(this, &EditorBuildProfileManager::_hide_requested));
-	main_vbc->add_margin_child(TTRC("Description:"), description_bit, false);
+	main_vbc->add_margin_child(TTR("Description:"), description_bit, false);
 
 	confirm_dialog = memnew(ConfirmationDialog);
 	add_child(confirm_dialog);
-	confirm_dialog->set_title(TTRC("Please Confirm:"));
-	confirm_dialog->set_autowrap(true);
-	confirm_dialog->set_min_size(Size2i(420 * EDSCALE, 0));
+	confirm_dialog->set_title(TTR("Please Confirm:"));
 	confirm_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorBuildProfileManager::_action_confirm));
 
 	import_profile = memnew(EditorFileDialog);
 	add_child(import_profile);
 	import_profile->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
-	import_profile->add_filter("*.gdbuild,*.build", TTRC("Engine Compilation Profile"));
+	import_profile->add_filter("*.gdbuild,*.build", TTR("Engine Compilation Profile"));
 	import_profile->connect("file_selected", callable_mp(this, &EditorBuildProfileManager::_import_profile));
-	import_profile->set_title(TTRC("Load Profile"));
+	import_profile->set_title(TTR("Load Profile"));
 	import_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
 
 	export_profile = memnew(EditorFileDialog);
 	add_child(export_profile);
 	export_profile->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
-	export_profile->add_filter("*.gdbuild,*.build", TTRC("Engine Compilation Profile"));
+	export_profile->add_filter("*.gdbuild,*.build", TTR("Engine Compilation Profile"));
 	export_profile->connect("file_selected", callable_mp(this, &EditorBuildProfileManager::_export_profile));
-	export_profile->set_title(TTRC("Export Profile"));
+	export_profile->set_title(TTR("Export Profile"));
 	export_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
 
 	force_detect_classes = memnew(LineEdit);
 	force_detect_classes->set_accessibility_name(TTRC("Forced Classes on Detect:"));
-	main_vbc->add_margin_child(TTRC("Forced Classes on Detect:"), force_detect_classes);
+	main_vbc->add_margin_child(TTR("Forced Classes on Detect:"), force_detect_classes);
 	force_detect_classes->connect(SceneStringName(text_changed), callable_mp(this, &EditorBuildProfileManager::_force_detect_classes_changed));
 
-	set_title(TTRC("Edit Compilation Configuration Profile"));
+	set_title(TTR("Edit Compilation Configuration Profile"));
 
 	singleton = this;
 }
diff --git a/engine/editor/settings/editor_build_profile.h b/engine/editor/settings/editor_build_profile.h
index fb03af9e..4d2c3f21 100644
--- a/engine/editor/settings/editor_build_profile.h
+++ b/engine/editor/settings/editor_build_profile.h
@@ -43,14 +43,10 @@ public:
 		BUILD_OPTION_3D,
 		BUILD_OPTION_NAVIGATION_2D,
 		BUILD_OPTION_NAVIGATION_3D,
-		BUILD_OPTION_ACCESSKIT,
-		BUILD_OPTION_SDL,
 		BUILD_OPTION_XR,
 		BUILD_OPTION_OPENXR,
 		BUILD_OPTION_WAYLAND,
 		BUILD_OPTION_X11,
-		BUILD_OPTION_PULSEAUDIO,
-		BUILD_OPTION_ALSA,
 		BUILD_OPTION_RENDERING_DEVICE,
 		BUILD_OPTION_FORWARD_RENDERER,
 		BUILD_OPTION_MOBILE_RENDERER,
@@ -153,7 +149,6 @@ class EditorBuildProfileManager : public AcceptDialog {
 		ACTION_SAVE,
 		ACTION_SAVE_AS,
 		ACTION_DETECT,
-		ACTION_CLEAR_CACHE,
 		ACTION_MAX
 	};
 
diff --git a/engine/editor/settings/editor_command_palette.cpp b/engine/editor/settings/editor_command_palette.cpp
index 16339563..3c06b0ad 100644
--- a/engine/editor/settings/editor_command_palette.cpp
+++ b/engine/editor/settings/editor_command_palette.cpp
@@ -30,16 +30,14 @@
 
 #include "editor_command_palette.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/gui/filter_line_edit.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/tree.h"
 
@@ -168,6 +166,10 @@ void EditorCommandPalette::_notification(int p_what) {
 			}
 		} break;
 
+		case NOTIFICATION_THEME_CHANGED: {
+			command_search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
+		} break;
+
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
 			if (!EditorSettings::get_singleton()->check_changed_settings_in_group("shortcuts")) {
 				break;
@@ -183,6 +185,17 @@ void EditorCommandPalette::_notification(int p_what) {
 	}
 }
 
+void EditorCommandPalette::_sbox_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			search_options->gui_input(key);
+			command_search_box->accept_event();
+		}
+	}
+}
+
 void EditorCommandPalette::_confirmed() {
 	TreeItem *selected_option = search_options->get_selected();
 	const String command_key = selected_option != nullptr ? selected_option->get_metadata(0) : "";
@@ -218,12 +231,16 @@ void EditorCommandPalette::remove_command(String p_key_name) {
 	commands.erase(p_key_name);
 }
 
-void EditorCommandPalette::add_command(String p_command_name, String p_key_name, Callable p_action, const Ref<Shortcut> &p_shortcut) {
+void EditorCommandPalette::add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, const Ref<Shortcut> &p_shortcut) {
 	ERR_FAIL_COND_MSG(commands.has(p_key_name), "The Command '" + String(p_command_name) + "' already exists. Unable to add it.");
 
+	const Variant **argptrs = (const Variant **)alloca(sizeof(Variant *) * arguments.size());
+	for (int i = 0; i < arguments.size(); i++) {
+		argptrs[i] = &arguments[i];
+	}
 	Command command;
 	command.name = p_command_name;
-	command.callable = p_action;
+	command.callable = p_action.bindp(argptrs, arguments.size());
 	if (p_shortcut.is_null()) {
 		command.shortcut_text = "None";
 	} else {
@@ -273,7 +290,7 @@ void EditorCommandPalette::register_shortcuts_as_command() {
 		Ref<InputEventShortcut> ev;
 		ev.instantiate();
 		ev->set_shortcut(shortcut);
-		add_command(command_name, E.key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input).bind(ev, false), shortcut);
+		add_command(command_name, E.key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), shortcut);
 	}
 	unregistered_shortcuts.clear();
 
@@ -292,7 +309,7 @@ Ref<Shortcut> EditorCommandPalette::add_shortcut_command(const String &p_command
 		Ref<InputEventShortcut> ev;
 		ev.instantiate();
 		ev->set_shortcut(p_shortcut);
-		add_command(p_command, p_key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input).bind(ev, false), p_shortcut);
+		add_command(p_command, p_key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), p_shortcut);
 	} else {
 		const String key_name = String(p_key);
 		const String command_name = String(p_command);
@@ -327,11 +344,13 @@ EditorCommandPalette::EditorCommandPalette() {
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
 
-	command_search_box = memnew(FilterLineEdit);
-	command_search_box->set_placeholder(TTRC("Filter Commands"));
+	command_search_box = memnew(LineEdit);
+	command_search_box->set_placeholder(TTR("Filter Commands"));
 	command_search_box->set_accessibility_name(TTRC("Filter Commands"));
-	command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	command_search_box->connect(SceneStringName(gui_input), callable_mp(this, &EditorCommandPalette::_sbox_input));
 	command_search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorCommandPalette::_update_command_search));
+	command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	command_search_box->set_clear_button_enabled(true);
 	MarginContainer *margin_container_csb = memnew(MarginContainer);
 	margin_container_csb->add_child(command_search_box);
 	vbc->add_child(margin_container_csb);
@@ -344,7 +363,6 @@ EditorCommandPalette::EditorCommandPalette() {
 	vbc->add_child(mc);
 
 	search_options = memnew(Tree);
-	command_search_box->set_forward_control(search_options);
 	search_options->connect("item_activated", callable_mp(this, &EditorCommandPalette::_confirmed));
 	search_options->connect(SceneStringName(item_selected), callable_mp((BaseButton *)get_ok_button(), &BaseButton::set_disabled).bind(false));
 	search_options->connect("nothing_selected", callable_mp((BaseButton *)get_ok_button(), &BaseButton::set_disabled).bind(true));
diff --git a/engine/editor/settings/editor_command_palette.h b/engine/editor/settings/editor_command_palette.h
index 33a8b557..12c0a491 100644
--- a/engine/editor/settings/editor_command_palette.h
+++ b/engine/editor/settings/editor_command_palette.h
@@ -30,17 +30,15 @@
 
 #pragma once
 
+#include "core/input/shortcut.h"
 #include "scene/gui/dialogs.h"
-
-class FilterLineEdit;
-class Shortcut;
-class Tree;
+#include "scene/gui/tree.h"
 
 class EditorCommandPalette : public ConfirmationDialog {
 	GDCLASS(EditorCommandPalette, ConfirmationDialog);
 
 	static EditorCommandPalette *singleton;
-	FilterLineEdit *command_search_box = nullptr;
+	LineEdit *command_search_box = nullptr;
 	Tree *search_options = nullptr;
 
 	struct Command {
@@ -80,6 +78,7 @@ class EditorCommandPalette : public ConfirmationDialog {
 
 	void _update_command_search(const String &search_text);
 	float _score_path(const String &p_search, const String &p_path);
+	void _sbox_input(const Ref<InputEvent> &p_event);
 	void _confirmed();
 	void _add_command(String p_command_name, String p_key_name, Callable p_binded_action, String p_shortcut_text = "None");
 	void _save_history() const;
@@ -93,7 +92,7 @@ protected:
 public:
 	void open_popup();
 	void get_actions_list(List<String> *p_list) const;
-	void add_command(String p_command_name, String p_key_name, Callable p_action, const Ref<Shortcut> &p_shortcut = Ref<Shortcut>());
+	void add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, const Ref<Shortcut> &p_shortcut);
 	void execute_command(const String &p_command_name);
 	void register_shortcuts_as_command();
 	Ref<Shortcut> add_shortcut_command(const String &p_command, const String &p_key, Ref<Shortcut> p_shortcut);
diff --git a/engine/editor/settings/editor_event_search_bar.cpp b/engine/editor/settings/editor_event_search_bar.cpp
index 80f29c46..e65e7d5f 100644
--- a/engine/editor/settings/editor_event_search_bar.cpp
+++ b/engine/editor/settings/editor_event_search_bar.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_event_search_bar.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/settings/event_listener_line_edit.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
diff --git a/engine/editor/settings/editor_feature_profile.cpp b/engine/editor/settings/editor_feature_profile.cpp
index d4ab503b..0e929c3c 100644
--- a/engine/editor/settings/editor_feature_profile.cpp
+++ b/engine/editor/settings/editor_feature_profile.cpp
@@ -32,8 +32,6 @@
 
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
@@ -562,7 +560,7 @@ void EditorFeatureProfileManager::_fill_classes_from(TreeItem *p_parent, const S
 	child_classes.sort_custom<StringName::AlphCompare>();
 
 	for (const StringName &name : child_classes) {
-		if (ClassDB::get_api_type(name) != ClassDB::API_CORE) {
+		if (String(name).begins_with("Editor") || ClassDB::get_api_type(name) != ClassDB::API_CORE) {
 			continue;
 		}
 		_fill_classes_from(class_item, name, p_selected);
diff --git a/engine/editor/settings/editor_folding.cpp b/engine/editor/settings/editor_folding.cpp
index 916d25bc..f65948c2 100644
--- a/engine/editor/settings/editor_folding.cpp
+++ b/engine/editor/settings/editor_folding.cpp
@@ -34,8 +34,6 @@
 #include "core/io/file_access.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/inspector/editor_inspector.h"
-#include "scene/animation/animation_mixer.h"
-#include "scene/resources/animation.h"
 
 Vector<String> EditorFolding::_get_unfolds(const Object *p_object) {
 	Vector<String> sections;
@@ -57,12 +55,6 @@ void EditorFolding::save_resource_folding(const Ref<Resource> &p_resource, const
 	Vector<String> unfolds = _get_unfolds(p_resource.ptr());
 	config->set_value("folding", "sections_unfolded", unfolds);
 
-	Ref<Animation> as_anim = p_resource;
-	if (as_anim.is_valid()) {
-		Vector<String> folded_groups = _get_animation_folds(as_anim.ptr());
-		config->set_value("folding", "animation_groups_folded", folded_groups);
-	}
-
 	String file = p_path.get_file() + "-folding-" + p_path.md5_text() + ".cfg";
 	file = EditorPaths::get_singleton()->get_project_settings_dir().path_join(file);
 	config->save(file);
@@ -94,15 +86,9 @@ void EditorFolding::load_resource_folding(Ref<Resource> p_resource, const String
 		unfolds = config->get_value("folding", "sections_unfolded");
 	}
 	_set_unfolds(p_resource.ptr(), unfolds);
-
-	Ref<Animation> anim = p_resource;
-	if (anim.is_valid() && config->has_section_key("folding", "animation_groups_folded")) {
-		Vector<String> folded_groups = config->get_value("folding", "animation_groups_folded");
-		_set_animation_folds(anim.ptr(), folded_groups);
-	}
 }
 
-void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p_folds, Array &resource_folds, Array &nodes_folded, HashSet<Ref<Resource>> &resources, HashSet<Ref<Animation>> &animations, Array &anim_groups_folded) {
+void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p_folds, Array &resource_folds, Array &nodes_folded, HashSet<Ref<Resource>> &resources) {
 	if (p_root != p_node) {
 		if (!p_node->get_owner()) {
 			return; //not owned, bye
@@ -122,21 +108,6 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p
 		p_folds.push_back(unfolds);
 	}
 
-	const AnimationMixer *anim_mixer = Object::cast_to<AnimationMixer>(p_node);
-	if (anim_mixer) {
-		LocalVector<StringName> anim_names;
-		anim_mixer->get_animation_list(&anim_names);
-		for (const StringName &anim_name : anim_names) {
-			Ref<Animation> anim = anim_mixer->get_animation(anim_name);
-			if (anim.is_valid() && !animations.has(anim) && !anim->get_path().is_empty() && !anim->get_path().is_resource_file()) {
-				Vector<String> anim_folds = _get_animation_folds(anim.ptr());
-				anim_groups_folded.push_back(anim->get_path());
-				anim_groups_folded.push_back(anim_folds);
-				animations.insert(anim);
-			}
-		}
-	}
-
 	List<PropertyInfo> plist;
 	p_node->get_property_list(&plist);
 	for (const PropertyInfo &E : plist) {
@@ -154,7 +125,7 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p
 	}
 
 	for (int i = 0; i < p_node->get_child_count(); i++) {
-		_fill_folds(p_root, p_node->get_child(i), p_folds, resource_folds, nodes_folded, resources, animations, anim_groups_folded);
+		_fill_folds(p_root, p_node->get_child(i), p_folds, resource_folds, nodes_folded, resources);
 	}
 }
 
@@ -172,14 +143,11 @@ void EditorFolding::save_scene_folding(const Node *p_scene, const String &p_path
 	Array unfolds, res_unfolds;
 	HashSet<Ref<Resource>> resources;
 	Array nodes_folded;
-	HashSet<Ref<Animation>> animations;
-	Array anim_groups_folded;
-	_fill_folds(p_scene, p_scene, unfolds, res_unfolds, nodes_folded, resources, animations, anim_groups_folded);
+	_fill_folds(p_scene, p_scene, unfolds, res_unfolds, nodes_folded, resources);
 
 	config->set_value("folding", "node_unfolds", unfolds);
 	config->set_value("folding", "resource_unfolds", res_unfolds);
 	config->set_value("folding", "nodes_folded", nodes_folded);
-	config->set_value("folding", "animation_groups_folded", anim_groups_folded);
 
 	String file = p_path.get_file() + "-folding-" + p_path.md5_text() + ".cfg";
 	file = EditorPaths::get_singleton()->get_project_settings_dir().path_join(file);
@@ -210,14 +178,9 @@ void EditorFolding::load_scene_folding(Node *p_scene, const String &p_path) {
 	if (config->has_section_key("folding", "nodes_folded")) {
 		nodes_folded = config->get_value("folding", "nodes_folded");
 	}
-	Array animation_groups_folded;
-	if (config->has_section_key("folding", "animation_groups_folded")) {
-		animation_groups_folded = config->get_value("folding", "animation_groups_folded");
-	}
 
 	ERR_FAIL_COND(unfolds.size() & 1);
 	ERR_FAIL_COND(res_unfolds.size() & 1);
-	ERR_FAIL_COND(animation_groups_folded.size() & 1);
 
 	for (int i = 0; i < unfolds.size(); i += 2) {
 		NodePath path2 = unfolds[i];
@@ -247,17 +210,6 @@ void EditorFolding::load_scene_folding(Node *p_scene, const String &p_path) {
 			node->set_display_folded(true);
 		}
 	}
-
-	for (int i = 0; i < animation_groups_folded.size(); i += 2) {
-		String path2 = animation_groups_folded[i];
-		Ref<Animation> anim = ResourceCache::get_ref(path2);
-		if (anim.is_null()) {
-			continue;
-		}
-
-		Vector<String> folded_groups = animation_groups_folded[i + 1];
-		_set_animation_folds(anim.ptr(), folded_groups);
-	}
 }
 
 bool EditorFolding::has_folding_data(const String &p_path) {
@@ -342,24 +294,3 @@ void EditorFolding::unfold_scene(Node *p_scene) {
 	HashSet<Ref<Resource>> resources;
 	_do_node_unfolds(p_scene, p_scene, resources);
 }
-
-Vector<String> EditorFolding::_get_animation_folds(const Animation *p_animation) {
-	Vector<String> folded_groups;
-	folded_groups.resize(p_animation->editor_get_folded_groups().size());
-	if (folded_groups.size()) {
-		String *w = folded_groups.ptrw();
-		int idx = 0;
-		for (const StringName &group_name : p_animation->editor_get_folded_groups()) {
-			w[idx++] = group_name;
-		}
-	}
-
-	return folded_groups;
-}
-
-void EditorFolding::_set_animation_folds(Animation *p_animation, const Vector<String> &p_folds) {
-	p_animation->editor_clear_folded_groups();
-	for (const String &group_name : p_folds) {
-		p_animation->editor_add_folded_group(group_name);
-	}
-}
diff --git a/engine/editor/settings/editor_folding.h b/engine/editor/settings/editor_folding.h
index fc0a3cdb..cc41dbd7 100644
--- a/engine/editor/settings/editor_folding.h
+++ b/engine/editor/settings/editor_folding.h
@@ -32,20 +32,15 @@
 
 #include "scene/main/node.h"
 
-class Animation;
-
 class EditorFolding {
 	Vector<String> _get_unfolds(const Object *p_object);
 	void _set_unfolds(Object *p_object, const Vector<String> &p_unfolds);
 
-	void _fill_folds(const Node *p_root, const Node *p_node, Array &p_folds, Array &resource_folds, Array &nodes_folded, HashSet<Ref<Resource>> &resources, HashSet<Ref<Animation>> &animations, Array &anim_groups_folded);
+	void _fill_folds(const Node *p_root, const Node *p_node, Array &p_folds, Array &resource_folds, Array &nodes_folded, HashSet<Ref<Resource>> &resources);
 
 	void _do_object_unfolds(Object *p_object, HashSet<Ref<Resource>> &resources);
 	void _do_node_unfolds(Node *p_root, Node *p_node, HashSet<Ref<Resource>> &resources);
 
-	Vector<String> _get_animation_folds(const Animation *p_animation);
-	void _set_animation_folds(Animation *p_animation, const Vector<String> &p_unfolds);
-
 public:
 	void save_resource_folding(const Ref<Resource> &p_resource, const String &p_path);
 	void load_resource_folding(Ref<Resource> p_resource, const String &p_path);
@@ -53,9 +48,6 @@ public:
 	void save_scene_folding(const Node *p_scene, const String &p_path);
 	void load_scene_folding(Node *p_scene, const String &p_path);
 
-	void save_animation_folding(const Ref<Animation> &p_animation, const String &p_path);
-	void load_animation_folding(Ref<Animation> p_animation, const String &p_path);
-
 	void unfold_scene(Node *p_scene);
 
 	bool has_folding_data(const String &p_path);
diff --git a/engine/editor/settings/editor_layouts_dialog.cpp b/engine/editor/settings/editor_layouts_dialog.cpp
index 622e656c..69fa5a4a 100644
--- a/engine/editor/settings/editor_layouts_dialog.cpp
+++ b/engine/editor/settings/editor_layouts_dialog.cpp
@@ -31,8 +31,6 @@
 #include "editor_layouts_dialog.h"
 
 #include "core/io/config_file.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/item_list.h"
diff --git a/engine/editor/settings/editor_settings.cpp b/engine/editor/settings/editor_settings.cpp
index 58103e5d..0f381c0f 100644
--- a/engine/editor/settings/editor_settings.cpp
+++ b/engine/editor/settings/editor_settings.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_settings.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_event.h"
 #include "core/input/input_map.h"
@@ -41,12 +40,10 @@
 #include "core/io/ip.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/translation_server.h"
-#include "core/templates/rb_set.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_paths.h"
@@ -55,15 +52,13 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "editor/translations/editor_translation.h"
 #include "main/main.h"
+#include "modules/regex/regex.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
-#include "servers/display/display_server.h"
-
-#include "modules/regex/regex.h"
 
 // PRIVATE METHODS
 
@@ -74,13 +69,6 @@ Ref<EditorSettings> EditorSettings::singleton = nullptr;
 bool EditorSettings::_set(const StringName &p_name, const Variant &p_value) {
 	_THREAD_SAFE_METHOD_
 
-#ifndef DISABLE_DEPRECATED
-	const String *renamed = compat_map.getptr(p_name);
-	if (renamed) {
-		return _set(*renamed, p_value);
-	}
-#endif
-
 	bool changed = _set_only(p_name, p_value);
 	if (changed && initialized) {
 		changed_settings.insert(p_name);
@@ -93,7 +81,7 @@ bool EditorSettings::_set(const StringName &p_name, const Variant &p_value) {
 		}
 		emit_signal(SNAME("settings_changed"));
 
-		if (p_name == SNAME("interface/editor/localization/editor_language")) {
+		if (p_name == SNAME("interface/editor/editor_language")) {
 			setup_language(false);
 		}
 	}
@@ -170,13 +158,6 @@ bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value)
 bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
 	_THREAD_SAFE_METHOD_
 
-#ifndef DISABLE_DEPRECATED
-	const String *renamed = compat_map.getptr(p_name);
-	if (renamed) {
-		return _get(*renamed, r_ret);
-	}
-#endif
-
 	if (p_name == "shortcuts") {
 		Array save_array;
 		const HashMap<String, List<Ref<InputEvent>>> &builtin_list = InputMap::get_singleton()->get_builtins();
@@ -222,7 +203,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
 				continue;
 			}
 
-			List<Ref<InputEvent>> events(action_override.value);
+			List<Ref<InputEvent>> events = action_override.value;
 
 			Dictionary action_dict;
 			action_dict["name"] = action_override.key;
@@ -409,15 +390,15 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_THREAD_SAFE_METHOD_
 // Sets up the editor setting with a default value and hint PropertyInfo.
 #define EDITOR_SETTING(m_type, m_property_hint, m_name, m_default_value, m_hint_string) \
-	_initial_set(m_name, m_default_value); \
+	_initial_set(m_name, m_default_value);                                              \
 	hints[m_name] = PropertyInfo(m_type, m_name, m_property_hint, m_hint_string);
 
 #define EDITOR_SETTING_BASIC(m_type, m_property_hint, m_name, m_default_value, m_hint_string) \
-	_initial_set(m_name, m_default_value, true); \
+	_initial_set(m_name, m_default_value, true);                                              \
 	hints[m_name] = PropertyInfo(m_type, m_name, m_property_hint, m_hint_string);
 
 #define EDITOR_SETTING_USAGE(m_type, m_property_hint, m_name, m_default_value, m_hint_string, m_usage) \
-	_initial_set(m_name, m_default_value); \
+	_initial_set(m_name, m_default_value);                                                             \
 	hints[m_name] = PropertyInfo(m_type, m_name, m_property_hint, m_hint_string, m_usage);
 
 	/* Languages */
@@ -453,7 +434,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 		}
 		lang_hint = vformat(";auto/Auto (%s);en/[en] English", TranslationServer::get_singleton()->get_locale_name(best)) + lang_hint;
 
-		EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_ENUM, "interface/editor/localization/editor_language", "auto", lang_hint, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING);
+		EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_ENUM, "interface/editor/editor_language", "auto", lang_hint, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING);
 	}
 
 	// Asset library
@@ -462,21 +443,21 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	/* Interface */
 
 	// Editor
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/localization/localize_settings", true, "")
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/docks/dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/docks/bottom_dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
-	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/localization/ui_layout_direction", 0, "Based on Application Locale,Left-to-Right,Right-to-Left,Based on System Locale", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/localize_settings", true, "")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/bottom_dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
+	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/ui_layout_direction", 0, "Based on Application Locale,Left-to-Right,Right-to-Left,Based on System Locale", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 
 	// Display what the Auto display scale setting effectively corresponds to.
 	const String display_scale_hint_string = vformat("Auto (%d%%),75%%,100%%,125%%,150%%,175%%,200%%,Custom", Math::round(get_auto_display_scale() * 100));
-	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/display_scale", 0, display_scale_hint_string, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
-	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/appearance/custom_display_scale", 1.0, "0.5,3,0.01", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
+	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/display_scale", 0, display_scale_hint_string, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
+	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/custom_display_scale", 1.0, "0.5,3,0.01", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
 
 	String ed_screen_hints = "Auto (Remembers last position):-5,Screen With Mouse Pointer:-4,Screen With Keyboard Focus:-3,Primary Screen:-2";
 	for (int i = 0; i < DisplayServer::get_singleton()->get_screen_count(); i++) {
 		ed_screen_hints += ",Screen " + itos(i + 1) + ":" + itos(i);
 	}
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/editor_screen", EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO, ed_screen_hints)
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/editor_screen", EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO, ed_screen_hints)
 
 #ifdef WINDOWS_ENABLED
 	String tablet_hints = "Use Project Settings:-1";
@@ -487,76 +468,79 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 		}
 		tablet_hints += vformat(",%s:%d", drv_name, i);
 	}
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/input/tablet_driver", -1, tablet_hints);
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/tablet_driver", -1, tablet_hints);
 #else
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/input/tablet_driver", -1, "Default:-1");
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/tablet_driver", -1, "Default:-1");
 #endif
 
 	String project_manager_screen_hints = "Screen With Mouse Pointer:-4,Screen With Keyboard Focus:-3,Primary Screen:-2";
 	for (int i = 0; i < DisplayServer::get_singleton()->get_screen_count(); i++) {
 		project_manager_screen_hints += ",Screen " + itos(i + 1) + ":" + itos(i);
 	}
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/project_manager_screen", EditorSettings::InitialScreen::INITIAL_SCREEN_PRIMARY, project_manager_screen_hints)
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/project_manager_screen", EditorSettings::InitialScreen::INITIAL_SCREEN_PRIMARY, project_manager_screen_hints)
 
 	{
-		const String update_hint = vformat("Disable Update Checks,Auto (%s),Check Newest Preview,Check Newest Stable,Check Newest Patch", (str_compare(GODOT_VERSION_STATUS, "stable") == 0) ? "Stable" : "Preview");
-		EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "network/connection/check_for_updates", EngineUpdateLabel::UpdateMode::AUTO, update_hint);
+		EngineUpdateLabel::UpdateMode default_update_mode = EngineUpdateLabel::UpdateMode::NEWEST_UNSTABLE;
+		if (String(GODOT_VERSION_STATUS) == String("stable")) {
+			default_update_mode = EngineUpdateLabel::UpdateMode::NEWEST_STABLE;
+		}
+		EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "network/connection/check_for_updates", int(default_update_mode), "Disable Update Checks,Check Newest Preview,Check Newest Stable,Check Newest Patch"); // Uses EngineUpdateLabel::UpdateMode.
 	}
 
-	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/appearance/use_embedded_menu", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
-	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/appearance/use_native_file_dialogs", false, "", PROPERTY_USAGE_DEFAULT)
-	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/appearance/expand_to_title", true, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
+	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/use_embedded_menu", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
+	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/use_native_file_dialogs", false, "", PROPERTY_USAGE_DEFAULT)
+	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/expand_to_title", true, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
 
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/fonts/main_font_size", 14, "8,48,1")
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/fonts/code_font_size", 14, "8,48,1")
-	_initial_set("interface/editor/fonts/main_font_custom_opentype_features", "");
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/fonts/code_font_contextual_ligatures", 1, "Enabled,Disable Contextual Alternates (Coding Ligatures),Use Custom OpenType Feature Set")
-	_initial_set("interface/editor/fonts/code_font_custom_opentype_features", "");
-	_initial_set("interface/editor/fonts/code_font_custom_variations", "");
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/fonts/font_antialiasing", 1, "None,Grayscale,LCD Subpixel")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/main_font_size", 14, "8,48,1")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/code_font_size", 14, "8,48,1")
+	_initial_set("interface/editor/main_font_custom_opentype_features", "");
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/code_font_contextual_ligatures", 1, "Enabled,Disable Contextual Alternates (Coding Ligatures),Use Custom OpenType Feature Set")
+	_initial_set("interface/editor/code_font_custom_opentype_features", "");
+	_initial_set("interface/editor/code_font_custom_variations", "");
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/font_antialiasing", 1, "None,Grayscale,LCD Subpixel")
 #ifdef MACOS_ENABLED
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/fonts/font_hinting", 0, "Auto (None),None,Light,Normal")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/font_hinting", 0, "Auto (None),None,Light,Normal")
 #else
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/fonts/font_hinting", 0, "Auto (Light),None,Light,Normal")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/font_hinting", 0, "Auto (Light),None,Light,Normal")
 #endif
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/fonts/font_subpixel_positioning", 1, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel")
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/fonts/font_disable_embedded_bitmaps", true, "");
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/fonts/font_allow_msdf", true, "")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/font_subpixel_positioning", 1, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel")
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/font_disable_embedded_bitmaps", true, "");
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/font_allow_msdf", true, "")
 
-	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/fonts/main_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
-	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/fonts/main_font_bold", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
-	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/fonts/code_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
-	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/timers/dragging_hover_wait_seconds", 0.5, "0.01,10,0.01,or_greater,suffix:s");
-	_initial_set("interface/editor/behavior/separate_distraction_mode", false, true);
-	_initial_set("interface/editor/behavior/automatically_open_screenshots", true, true);
-	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/display/single_window_mode", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
-	_initial_set("interface/editor/input/mouse_extra_buttons_navigate_history", true);
-	_initial_set("interface/editor/behavior/save_each_scene_on_quit", true, true); // Regression
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/behavior/save_on_focus_loss", false, "")
-	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/accept_dialog_cancel_ok_buttons", 0,
+	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
+	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/main_font_bold", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
+	EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/editor/code_font", "", "*.ttf,*.otf,*.woff,*.woff2,*.pfb,*.pfm")
+	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/dragging_hover_wait_seconds", 0.5, "0.01,10,0.01,or_greater,suffix:s");
+	_initial_set("interface/editor/separate_distraction_mode", false, true);
+	_initial_set("interface/editor/automatically_open_screenshots", true, true);
+	EDITOR_SETTING_USAGE(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/single_window_mode", false, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED | PROPERTY_USAGE_EDITOR_BASIC_SETTING)
+	_initial_set("interface/editor/mouse_extra_buttons_navigate_history", true);
+	_initial_set("interface/editor/save_each_scene_on_quit", true, true); // Regression
+	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/save_on_focus_loss", false, "")
+	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/accept_dialog_cancel_ok_buttons", 0,
 			vformat("Auto (%s),Cancel First,OK First", DisplayServer::get_singleton()->get_swap_cancel_ok() ? "OK First" : "Cancel First"),
 			PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
 #ifdef DEV_ENABLED
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/behavior/show_internal_errors_in_toast_notifications", 0, "Auto (Enabled),Enabled,Disabled")
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/show_update_spinner", 0, "Auto (Enabled),Enabled,Disabled")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/show_internal_errors_in_toast_notifications", 0, "Auto (Enabled),Enabled,Disabled")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/show_update_spinner", 0, "Auto (Enabled),Enabled,Disabled")
 #else
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/behavior/show_internal_errors_in_toast_notifications", 0, "Auto (Disabled),Enabled,Disabled")
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/appearance/show_update_spinner", 0, "Auto (Disabled),Enabled,Disabled")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/show_internal_errors_in_toast_notifications", 0, "Auto (Disabled),Enabled,Disabled")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/show_update_spinner", 0, "Auto (Disabled),Enabled,Disabled")
 #endif
 
-	_initial_set("interface/editor/display/keep_screen_on", false, true);
-	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/timers/low_processor_mode_sleep_usec", 6900, "1,100000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
+	_initial_set("interface/editor/keep_screen_on", false, true);
+	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/low_processor_mode_sleep_usec", 6900, "1,100000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 	// Default unfocused usec sleep is for 10 FPS. Allow an unfocused FPS limit
 	// as low as 1 FPS for those who really need low power usage (but don't need
 	// to preview particles or shaders while the editor is unfocused). With very
 	// low FPS limits, the editor can take a small while to become usable after
 	// being focused again, so this should be used at the user's discretion.
-	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/timers/unfocused_low_processor_mode_sleep_usec", 100000, "1,1000000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
+	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/unfocused_low_processor_mode_sleep_usec", 100000, "1,1000000,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/behavior/import_resources_when_unfocused", false, "")
+	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/import_resources_when_unfocused", false, "")
 
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/display/vsync_mode", 1, "Disabled,Enabled,Adaptive,Mailbox")
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/display/update_continuously", false, "")
+	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/vsync_mode", 1, "Disabled,Enabled,Adaptive,Mailbox")
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/update_continuously", false, "")
 
 	bool is_android_editor = false;
 #ifdef ANDROID_ENABLED
@@ -564,8 +548,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 		is_android_editor = true;
 	}
 #endif
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/appearance/collapse_main_menu", is_android_editor, "")
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/collapse_main_menu", is_android_editor, "")
 
+	_initial_set("interface/editors/show_scene_tree_root_selection", true);
 	_initial_set("interface/editors/derive_script_globals_by_name", true);
 	_initial_set("docks/scene_tree/ask_before_revoking_unique_name", true);
 
@@ -587,12 +572,14 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/inspector/open_resources_in_current_inspector", true, "")
 
 	PackedStringArray open_in_new_inspector_defaults;
-	open_in_new_inspector_defaults.push_back("Script"); // Required for the script editor to work.
+	// Required for the script editor to work.
+	open_in_new_inspector_defaults.push_back("Script");
+	// Required for the GridMap editor to work.
+	open_in_new_inspector_defaults.push_back("MeshLibrary");
 	_initial_set("interface/inspector/resources_to_open_in_new_inspector", open_in_new_inspector_defaults);
 
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/accessibility/accessibility_support", 0, "Auto (When Screen Reader is Running),Always Active,Disabled")
 	set_restart_if_changed("interface/accessibility/accessibility_support", true);
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/accessibility/property_descriptions", true, "")
 
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/inspector/default_color_picker_mode", (int32_t)ColorPicker::MODE_RGB, "RGB,HSV,RAW,OKHSL")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_OKHSL_CIRCLE, "HSV Rectangle,HSV Rectangle Wheel,VHS Circle,OKHSL Circle,OK HS Rectangle:5,OK HL Rectangle") // `SHAPE_NONE` is 4.
@@ -616,7 +603,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/corner_radius", 4, "0,6,1")
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/base_spacing", 4, "0,8,1")
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/additional_spacing", 0, "0,8,1")
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/theme/use_monospace_font_for_editor_symbols", true, "")
 	EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/theme/custom_theme", "", "*.res,*.tres,*.theme", PROPERTY_USAGE_DEFAULT)
 
 	// Touchscreen
@@ -624,10 +610,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	bool is_native_touchscreen = has_touchscreen_ui && !OS::get_singleton()->has_feature("xr_editor"); // Disable some touchscreen settings by default for the XR Editor.
 
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_touch_optimizations", is_native_touchscreen, "")
+	set_restart_if_changed("interface/touchscreen/enable_touch_optimizations", true);
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_long_press_as_right_click", is_native_touchscreen, "")
 	set_restart_if_changed("interface/touchscreen/enable_long_press_as_right_click", true);
-	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/haptic_on_long_press", is_native_touchscreen, "")
-	set_restart_if_changed("interface/touchscreen/haptic_on_long_press", true);
 
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_pan_and_scale_gestures", has_touchscreen_ui, "")
 	set_restart_if_changed("interface/touchscreen/enable_pan_and_scale_gestures", true);
@@ -714,8 +699,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("docks/filesystem/always_show_folders", true);
 	_initial_set("docks/filesystem/textfile_extensions", "txt,md,cfg,ini,log,json,yml,yaml,toml,xml");
 	_initial_set("docks/filesystem/other_file_extensions", "ico,icns");
-	_initial_set("docks/filesystem/automatically_open_created_scripts", true);
-	_initial_set("docks/filesystem/ask_before_moving_files", true);
 
 	// Property editor
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "docks/property_editor/auto_refresh_interval", 0.2, "0.01,1,0.001"); // Update 5 times per second by default.
@@ -795,9 +778,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("text_editor/appearance/minimap/show_minimap", true, true);
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/appearance/minimap/minimap_width", 80, "50,250,1")
 
-	// Appearance: Drag Info Label
-	_initial_set("text_editor/appearance/drag_and_drop_info/show_drag_and_drop_info", true, true);
-
 	// Appearance: Lines
 	_initial_set("text_editor/appearance/lines/code_folding", true, true);
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "text_editor/appearance/lines/word_wrap", 0, "None,Boundary")
@@ -806,7 +786,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	// Appearance: Whitespace
 	_initial_set("text_editor/appearance/whitespace/draw_tabs", true, true);
 	_initial_set("text_editor/appearance/whitespace/draw_spaces", false, true);
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/appearance/whitespace/line_spacing", 4, "-10,50,1")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/appearance/whitespace/line_spacing", 4, "0,50,1")
 
 	// Behavior
 	// Behavior: General
@@ -927,7 +907,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "editors/3d_gizmos/gizmo_settings/bone_shape", 1, "Wire,Octahedron");
 	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d_gizmos/gizmo_settings/path3d_tilt_disk_size", 0.8, "0.01,4.0,0.001,or_greater", PROPERTY_USAGE_DEFAULT)
 	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d_gizmos/gizmo_settings/lightmap_gi_probe_size", 0.4, "0.0,1.0,0.001,or_greater", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
-	_initial_set("editors/3d_gizmos/gizmo_settings/show_collision_shapes_only_when_selected", false);
 
 	// If a line is a multiple of this, it uses the primary grid color.
 	// Use a power of 2 value by default as it's more common to use powers of 2 in level design.
@@ -981,21 +960,17 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_inertia", 0.0, "0,1,0.001")
 	EDITOR_SETTING_BASIC(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_base_speed", 5.0, "0,10,0.01,or_greater")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "editors/3d/freelook/freelook_activation_modifier", 0, "None,Shift,Alt,Meta,Ctrl")
-	_initial_set("editors/3d/freelook/freelook_invert_y_axis", false);
 	_initial_set("editors/3d/freelook/freelook_speed_zoom_link", false);
 
 	// 3D: Manipulator
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "editors/3d/manipulator_gizmo_size", 80, "16,160,1");
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/manipulator_gizmo_opacity", 0.9, "0,1,0.01");
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_FLAGS, "editors/3d/show_gizmo_during_rotation", 2, "Global,Local");
-	EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/view_plane_rotation_gizmo_scale", 1.14, "1.0,2.0,0.01,or_greater", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
 
 	// 2D
 	_initial_set("editors/2d/grid_color", Color(1.0, 1.0, 1.0, 0.07), true);
 	_initial_set("editors/2d/guides_color", Color(0.6, 0.0, 0.8), true);
 	_initial_set("editors/2d/smart_snapping_line_color", Color(0.9, 0.1, 0.1), true);
-	_initial_set("editors/2d/selection_rectangle_color", Color(1, 0.6, 0.4, 0.7), true);
-	_initial_set("editors/2d/locked_selection_rectangle_color", Color(0.7, 0.7, 0.7, 0.7), true);
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/2d/bone_width", 5.0, "0.01,20,0.01,or_greater")
 	_initial_set("editors/2d/bone_color1", Color(1.0, 1.0, 1.0, 0.7));
 	_initial_set("editors/2d/bone_color2", Color(0.6, 0.6, 0.6, 0.7));
@@ -1126,14 +1101,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("network/debug/remote_host", "127.0.0.1"); // Hints provided in setup_network
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "network/debug/remote_port", 6007, "1,65535,1")
 
-	/* GDScript Language Server */
-	_initial_set("network/language_server/remote_host", "127.0.0.1"); // Hints provided in setup_network
-	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_RANGE, "network/language_server/remote_port", 6005, "1,65535,1");
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "network/language_server/enable_smart_resolve", true, String());
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "network/language_server/show_native_symbols_in_editor", false, String());
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "network/language_server/use_thread", false, String());
-	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_NONE, "network/language_server/poll_limit_usec", 100000, "");
-
 	/* Debugger/profiler */
 
 	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "debugger/auto_switch_to_remote_scene_tree", false, "")
@@ -1254,72 +1221,12 @@ const String EditorSettings::_get_project_metadata_path() const {
 }
 
 #ifndef DISABLE_DEPRECATED
-void EditorSettings::_handle_setting_compatibility() {
-	// Remove deprecated settings.
+void EditorSettings::_remove_deprecated_settings() {
 	erase("interface/theme/preset");
 	erase("network/connection/engine_version_update_mode");
 	erase("run/output/always_open_output_on_play");
 	erase("run/output/always_close_output_on_stop");
 	erase("text_editor/theme/line_spacing"); // See GH-106137.
-	erase("interface/editors/show_scene_tree_root_selection");
-
-	// Handle renamed settings.
-	_rename_setting("interface/editor/editor_language", "interface/editor/localization/editor_language");
-	_rename_setting("interface/editor/localize_settings", "interface/editor/localization/localize_settings");
-	_rename_setting("interface/editor/dock_tab_style", "interface/editor/docks/dock_tab_style");
-	_rename_setting("interface/editor/bottom_dock_tab_style", "interface/editor/docks/bottom_dock_tab_style");
-	_rename_setting("interface/editor/ui_layout_direction", "interface/editor/localization/ui_layout_direction");
-	_rename_setting("interface/editor/display_scale", "interface/editor/appearance/display_scale");
-	_rename_setting("interface/editor/custom_display_scale", "interface/editor/appearance/custom_display_scale");
-	_rename_setting("interface/editor/editor_screen", "interface/editor/appearance/editor_screen");
-	_rename_setting("interface/editor/tablet_driver", "interface/editor/input/tablet_driver");
-	_rename_setting("interface/editor/project_manager_screen", "interface/editor/appearance/project_manager_screen");
-	_rename_setting("interface/editor/use_embedded_menu", "interface/editor/appearance/use_embedded_menu");
-	_rename_setting("interface/editor/use_native_file_dialogs", "interface/editor/appearance/use_native_file_dialogs");
-	_rename_setting("interface/editor/expand_to_title", "interface/editor/appearance/expand_to_title");
-	_rename_setting("interface/editor/main_font_size", "interface/editor/fonts/main_font_size");
-	_rename_setting("interface/editor/code_font_size", "interface/editor/fonts/code_font_size");
-	_rename_setting("interface/editor/main_font_custom_opentype_features", "interface/editor/fonts/main_font_custom_opentype_features");
-	_rename_setting("interface/editor/code_font_contextual_ligatures", "interface/editor/fonts/code_font_contextual_ligatures");
-	_rename_setting("interface/editor/code_font_custom_opentype_features", "interface/editor/fonts/code_font_custom_opentype_features");
-	_rename_setting("interface/editor/code_font_custom_variations", "interface/editor/fonts/code_font_custom_variations");
-	_rename_setting("interface/editor/font_antialiasing", "interface/editor/fonts/font_antialiasing");
-	_rename_setting("interface/editor/font_hinting", "interface/editor/fonts/font_hinting");
-	_rename_setting("interface/editor/font_subpixel_positioning", "interface/editor/fonts/font_subpixel_positioning");
-	_rename_setting("interface/editor/font_disable_embedded_bitmaps", "interface/editor/fonts/font_disable_embedded_bitmaps");
-	_rename_setting("interface/editor/font_allow_msdf", "interface/editor/fonts/font_allow_msdf");
-	_rename_setting("interface/editor/main_font", "interface/editor/fonts/main_font");
-	_rename_setting("interface/editor/main_font_bold", "interface/editor/fonts/main_font_bold");
-	_rename_setting("interface/editor/code_font", "interface/editor/fonts/code_font");
-	_rename_setting("interface/editor/dragging_hover_wait_seconds", "interface/editor/timers/dragging_hover_wait_seconds");
-	_rename_setting("interface/editor/separate_distraction_mode", "interface/editor/behavior/separate_distraction_mode");
-	_rename_setting("interface/editor/automatically_open_screenshots", "interface/editor/behavior/automatically_open_screenshots");
-	_rename_setting("interface/editor/single_window_mode", "interface/editor/display/single_window_mode");
-	_rename_setting("interface/editor/mouse_extra_buttons_navigate_history", "interface/editor/input/mouse_extra_buttons_navigate_history");
-	_rename_setting("interface/editor/save_each_scene_on_quit", "interface/editor/behavior/save_each_scene_on_quit");
-	_rename_setting("interface/editor/save_on_focus_loss", "interface/editor/behavior/save_on_focus_loss");
-	_rename_setting("interface/editor/accept_dialog_cancel_ok_buttons", "interface/editor/appearance/accept_dialog_cancel_ok_buttons");
-	_rename_setting("interface/editor/show_internal_errors_in_toast_notifications", "interface/editor/behavior/show_internal_errors_in_toast_notifications");
-	_rename_setting("interface/editor/show_update_spinner", "interface/editor/appearance/show_update_spinner");
-	_rename_setting("interface/editor/keep_screen_on", "interface/editor/display/keep_screen_on");
-	_rename_setting("interface/editor/low_processor_mode_sleep_usec", "interface/editor/timers/low_processor_mode_sleep_usec");
-	_rename_setting("interface/editor/unfocused_low_processor_mode_sleep_usec", "interface/editor/timers/unfocused_low_processor_mode_sleep_usec");
-	_rename_setting("interface/editor/import_resources_when_unfocused", "interface/editor/behavior/import_resources_when_unfocused");
-	_rename_setting("interface/editor/vsync_mode", "interface/editor/display/vsync_mode");
-	_rename_setting("interface/editor/update_continuously", "interface/editor/display/update_continuously");
-	_rename_setting("interface/editor/collapse_main_menu", "interface/editor/appearance/collapse_main_menu");
-}
-
-void EditorSettings::_rename_setting(const String &p_old_name, const String &p_new_name) {
-	if (has_setting(p_old_name)) {
-		set_setting(p_new_name, get_setting(p_old_name));
-		erase(p_old_name);
-	}
-	if (ProjectSettings::get_singleton()->has_editor_setting_override(p_old_name)) {
-		ProjectSettings::get_singleton()->set_editor_setting_override(p_new_name, ProjectSettings::get_singleton()->get_editor_setting_override(p_old_name));
-		ProjectSettings::get_singleton()->set_editor_setting_override(p_old_name, Variant());
-	}
-	compat_map[p_old_name] = p_new_name;
 }
 #endif
 
@@ -1399,13 +1306,12 @@ void EditorSettings::create() {
 
 		print_verbose("EditorSettings: Load OK!");
 
-		singleton->init_shortcuts();
 		singleton->setup_language(true);
 		singleton->setup_network();
 		singleton->load_favorites_and_recent_dirs();
 		singleton->update_text_editor_themes_list();
 #ifndef DISABLE_DEPRECATED
-		singleton->_handle_setting_compatibility();
+		singleton->_remove_deprecated_settings();
 #endif
 
 		return;
@@ -1427,16 +1333,11 @@ fail:
 	singleton->set_path(config_file_path, true);
 	singleton->save_changed_setting = true;
 	singleton->_load_defaults(extra_config);
-	singleton->init_shortcuts();
 	singleton->setup_language(true);
 	singleton->setup_network();
 	singleton->update_text_editor_themes_list();
 }
 
-void EditorSettings::init_shortcuts() {
-	ED_SHORTCUT("editor/open_search", TTRC("Focus Search/Filter Bar"), KeyModifierMask::CMD_OR_CTRL | Key::F);
-}
-
 void EditorSettings::setup_language(bool p_initial_setup) {
 	String lang = get_language();
 	if (p_initial_setup) {
@@ -1448,7 +1349,6 @@ void EditorSettings::setup_language(bool p_initial_setup) {
 
 	if (lang == "en") {
 		TranslationServer::get_singleton()->set_locale(lang);
-		emit_signal("_translation_changed");
 		return; // Default, nothing to do.
 	}
 
@@ -1456,7 +1356,6 @@ void EditorSettings::setup_language(bool p_initial_setup) {
 	load_doc_translations(lang);
 
 	TranslationServer::get_singleton()->set_locale(lang);
-	emit_signal("_translation_changed");
 }
 
 void EditorSettings::setup_network() {
@@ -1488,10 +1387,8 @@ void EditorSettings::setup_network() {
 
 	// Add hints with valid IP addresses to remote_host property.
 	add_property_hint(PropertyInfo(Variant::STRING, "network/debug/remote_host", PROPERTY_HINT_ENUM, hint));
-	add_property_hint(PropertyInfo(Variant::STRING, "network/language_server/remote_host", PROPERTY_HINT_ENUM, hint));
 	// Fix potentially invalid remote_host due to network change.
 	set("network/debug/remote_host", selected);
-	set("network/language_server/remote_host", selected);
 }
 
 void EditorSettings::save() {
@@ -1564,11 +1461,7 @@ Variant EditorSettings::get_setting(const String &p_setting) const {
 bool EditorSettings::has_setting(const String &p_setting) const {
 	_THREAD_SAFE_METHOD_
 
-#ifndef DISABLE_DEPRECATED
-	return props.has(p_setting) || compat_map.has(p_setting);
-#else
 	return props.has(p_setting);
-#endif
 }
 
 void EditorSettings::erase(const String &p_setting) {
@@ -1758,7 +1651,7 @@ Vector<String> EditorSettings::get_favorite_folders() const {
 }
 
 HashMap<String, PackedStringArray> EditorSettings::get_favorite_properties() const {
-	return HashMap<String, PackedStringArray>(favorite_properties);
+	return favorite_properties;
 }
 
 void EditorSettings::set_recent_dirs(const Vector<String> &p_recent_dirs, bool p_update_file_dialog) {
@@ -1960,12 +1853,12 @@ String EditorSettings::get_editor_layouts_config() const {
 float EditorSettings::get_auto_display_scale() {
 #ifdef LINUXBSD_ENABLED
 	if (DisplayServer::get_singleton()->get_name() == "Wayland") {
-		float main_window_scale = DisplayServer::get_singleton()->screen_get_scale(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW);
+		float main_window_scale = DisplayServer::get_singleton()->screen_get_scale(DisplayServer::SCREEN_OF_MAIN_WINDOW);
 
 		if (DisplayServer::get_singleton()->get_screen_count() == 1 || Math::fract(main_window_scale) != 0) {
 			// If we have a single screen or the screen of the window is fractional, all
 			// bets are off. At this point, let's just return the current's window scale,
-			// which is special-cased to the scale of `DisplayServerEnums::SCREEN_OF_MAIN_WINDOW`.
+			// which is special-cased to the scale of `SCREEN_OF_MAIN_WINDOW`.
 			return main_window_scale;
 		}
 
@@ -2011,7 +1904,7 @@ float EditorSettings::get_auto_display_scale() {
 }
 
 String EditorSettings::get_language() const {
-	const String language = has_setting("interface/editor/localization/editor_language") ? get("interface/editor/localization/editor_language") : "auto";
+	const String language = has_setting("interface/editor/editor_language") ? get("interface/editor/editor_language") : "auto";
 	if (language != "auto") {
 		return language;
 	}
@@ -2317,7 +2210,7 @@ const Array EditorSettings::get_builtin_action_overrides(const String &p_name) c
 	if (AO) {
 		Array event_array;
 
-		List<Ref<InputEvent>> events_list(AO->value);
+		List<Ref<InputEvent>> events_list = AO->value;
 		for (const Ref<InputEvent> &E : events_list) {
 			event_array.push_back(E);
 		}
@@ -2401,7 +2294,6 @@ void EditorSettings::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("settings_changed"));
 	ADD_SIGNAL(MethodInfo("_favorites_changed"));
-	ADD_SIGNAL(MethodInfo("_translation_changed"));
 
 	BIND_CONSTANT(NOTIFICATION_EDITOR_SETTINGS_CHANGED);
 }
diff --git a/engine/editor/settings/editor_settings.h b/engine/editor/settings/editor_settings.h
index 2cf12c5a..dcb60463 100644
--- a/engine/editor/settings/editor_settings.h
+++ b/engine/editor/settings/editor_settings.h
@@ -60,7 +60,6 @@ public:
 		NETWORK_ONLINE,
 	};
 
-	// Keep values synced with DisplayServerEnums constants.
 	enum InitialScreen {
 		INITIAL_SCREEN_AUTO = -5, // Remembers last screen position.
 		INITIAL_SCREEN_WITH_MOUSE_FOCUS = -4,
@@ -125,9 +124,7 @@ private:
 	static String _guess_exec_args_for_extenal_editor(const String &p_value);
 	const String _get_project_metadata_path() const;
 #ifndef DISABLE_DEPRECATED
-	HashMap<String, String> compat_map;
-	void _handle_setting_compatibility();
-	void _rename_setting(const String &p_old_name, const String &p_new_name);
+	void _remove_deprecated_settings();
 #endif
 
 	// Bind helpers.
@@ -146,7 +143,6 @@ public:
 	static String get_newest_settings_path();
 
 	static void create();
-	void init_shortcuts();
 	void setup_language(bool p_initial_setup);
 	void setup_network();
 	static void save();
@@ -214,9 +210,7 @@ public:
 
 	void notify_changes();
 
-#ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
-#endif
 
 	EditorSettings();
 };
diff --git a/engine/editor/settings/editor_settings_dialog.cpp b/engine/editor/settings/editor_settings_dialog.cpp
index 8306e517..ecd01452 100644
--- a/engine/editor/settings/editor_settings_dialog.cpp
+++ b/engine/editor/settings/editor_settings_dialog.cpp
@@ -30,11 +30,8 @@
 
 #include "editor_settings_dialog.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_log.h"
@@ -48,9 +45,9 @@
 #include "editor/settings/editor_settings.h"
 #include "editor/settings/event_listener_line_edit.h"
 #include "editor/settings/input_event_configuration_dialog.h"
+#include "editor/settings/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/debugger/view_3d_controller.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/tab_container.h"
@@ -68,13 +65,8 @@ void EditorSettingsDialog::_settings_changed() {
 	timer->start();
 }
 
-void EditorSettingsDialog::_settings_property_edited() {
-	Vector<String> changed = EditorSettings::get_singleton()->get_changed_settings();
-	if (changed.is_empty()) {
-		return;
-	}
-
-	const String full_name = changed[changed.size() - 1];
+void EditorSettingsDialog::_settings_property_edited(const String &p_name) {
+	String full_name = inspector->get_full_item_path(p_name);
 
 	// Set theme presets to Custom when controlled settings change.
 
@@ -87,7 +79,7 @@ void EditorSettingsDialog::_settings_property_edited() {
 	} else if (full_name.begins_with("editors/visual_editors/connection_colors") || full_name.begins_with("editors/visual_editors/category_colors")) {
 		EditorSettings::get_singleton()->set_manually("editors/visual_editors/color_theme", "Custom");
 	} else if (full_name == "editors/3d/navigation/orbit_mouse_button" || full_name == "editors/3d/navigation/pan_mouse_button" || full_name == "editors/3d/navigation/zoom_mouse_button" || full_name == "editors/3d/navigation/emulate_3_button_mouse") {
-		EditorSettings::get_singleton()->set_manually("editors/3d/navigation/navigation_scheme", (int)View3DController::NAV_SCHEME_CUSTOM);
+		EditorSettings::get_singleton()->set_manually("editors/3d/navigation/navigation_scheme", (int)Node3DEditorViewport::NAVIGATION_CUSTOM);
 	} else if (full_name == "editors/3d/navigation/navigation_scheme") {
 		update_navigation_preset();
 		_update_shortcuts();
@@ -95,10 +87,10 @@ void EditorSettingsDialog::_settings_property_edited() {
 }
 
 void EditorSettingsDialog::update_navigation_preset() {
-	View3DController::NavigationScheme nav_scheme = (View3DController::NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
-	View3DController::NavigationMouseButton set_orbit_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
-	View3DController::NavigationMouseButton set_pan_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
-	View3DController::NavigationMouseButton set_zoom_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
+	Node3DEditorViewport::NavigationScheme nav_scheme = (Node3DEditorViewport::NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
+	Node3DEditorViewport::ViewportNavMouseButton set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
+	Node3DEditorViewport::ViewportNavMouseButton set_pan_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
+	Node3DEditorViewport::ViewportNavMouseButton set_zoom_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
 	bool set_3_button_mouse = false;
 	Ref<InputEventKey> orbit_mod_key_1;
 	Ref<InputEventKey> orbit_mod_key_2;
@@ -110,11 +102,11 @@ void EditorSettingsDialog::update_navigation_preset() {
 	Ref<InputEventKey> orbit_snap_mod_key_2;
 	bool set_preset = false;
 
-	if (nav_scheme == View3DController::NAV_SCHEME_GODOT) {
+	if (nav_scheme == Node3DEditorViewport::NAVIGATION_GODOT) {
 		set_preset = true;
-		set_orbit_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
-		set_pan_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
-		set_zoom_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
+		set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
+		set_pan_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
+		set_zoom_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
 		set_3_button_mouse = false;
 		orbit_mod_key_1 = InputEventKey::create_reference(Key::NONE);
 		orbit_mod_key_2 = InputEventKey::create_reference(Key::NONE);
@@ -124,11 +116,11 @@ void EditorSettingsDialog::update_navigation_preset() {
 		zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE);
 		orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::ALT);
 		orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE);
-	} else if (nav_scheme == View3DController::NAV_SCHEME_MAYA) {
+	} else if (nav_scheme == Node3DEditorViewport::NAVIGATION_MAYA) {
 		set_preset = true;
-		set_orbit_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
-		set_pan_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
-		set_zoom_mouse_button = View3DController::NAV_MOUSE_BUTTON_RIGHT;
+		set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
+		set_pan_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
+		set_zoom_mouse_button = Node3DEditorViewport::NAVIGATION_RIGHT_MOUSE;
 		set_3_button_mouse = false;
 		orbit_mod_key_1 = InputEventKey::create_reference(Key::ALT);
 		orbit_mod_key_2 = InputEventKey::create_reference(Key::NONE);
@@ -138,11 +130,11 @@ void EditorSettingsDialog::update_navigation_preset() {
 		zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE);
 		orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::NONE);
 		orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE);
-	} else if (nav_scheme == View3DController::NAV_SCHEME_MODO) {
+	} else if (nav_scheme == Node3DEditorViewport::NAVIGATION_MODO) {
 		set_preset = true;
-		set_orbit_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
-		set_pan_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
-		set_zoom_mouse_button = View3DController::NAV_MOUSE_BUTTON_LEFT;
+		set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
+		set_pan_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
+		set_zoom_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;
 		set_3_button_mouse = false;
 		orbit_mod_key_1 = InputEventKey::create_reference(Key::ALT);
 		orbit_mod_key_2 = InputEventKey::create_reference(Key::NONE);
@@ -152,11 +144,11 @@ void EditorSettingsDialog::update_navigation_preset() {
 		zoom_mod_key_2 = InputEventKey::create_reference(Key::CTRL);
 		orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::NONE);
 		orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE);
-	} else if (nav_scheme == View3DController::NAV_SCHEME_TABLET) {
+	} else if (nav_scheme == Node3DEditorViewport::NAVIGATION_TABLET) {
 		set_preset = true;
-		set_orbit_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
-		set_pan_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
-		set_zoom_mouse_button = View3DController::NAV_MOUSE_BUTTON_MIDDLE;
+		set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
+		set_pan_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
+		set_zoom_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE;
 		set_3_button_mouse = true;
 		orbit_mod_key_1 = InputEventKey::create_reference(Key::ALT);
 		orbit_mod_key_2 = InputEventKey::create_reference(Key::NONE);
@@ -242,14 +234,6 @@ void EditorSettingsDialog::popup_edit_settings() {
 	_focus_current_search_box();
 }
 
-void EditorSettingsDialog::set_advanced_mode_enabled(bool p_enabled) {
-	advanced_switch->set_pressed(p_enabled);
-}
-
-void EditorSettingsDialog::set_current_section(const String &p_section) {
-	inspector->set_current_section(p_section);
-}
-
 void EditorSettingsDialog::_undo_redo_callback(void *p_self, const String &p_name) {
 	EditorNode::get_log()->add_message(p_name, EditorLog::MSG_TYPE_EDITOR);
 }
@@ -301,13 +285,9 @@ void EditorSettingsDialog::_notification(int p_what) {
 				inspector->get_inspector()->update_tree();
 			}
 
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localization/localize_settings")) {
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localize_settings")) {
 				inspector->update_category_list();
 			}
-
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
-				inspector->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
-			}
 		} break;
 	}
 }
@@ -329,7 +309,7 @@ void EditorSettingsDialog::shortcut_input(const Ref<InputEvent> &p_event) {
 			}
 		}
 
-		if (ED_IS_SHORTCUT("editor/open_search", p_event)) {
+		if (k->is_match(InputEventKey::create_reference(KeyModifierMask::CMD_OR_CTRL | Key::F))) {
 			_focus_current_search_box();
 			handled = true;
 		}
@@ -378,7 +358,7 @@ bool EditorSettingsDialog::_is_in_project_manager() const {
 void EditorSettingsDialog::_update_builtin_action(const String &p_name, const Array &p_events) {
 	Array old_input_array = EditorSettings::get_singleton()->get_builtin_action_overrides(p_name);
 	if (old_input_array.is_empty()) {
-		List<Ref<InputEvent>> defaults(InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]);
+		List<Ref<InputEvent>> defaults = InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier];
 		old_input_array = _event_list_to_array_helper(defaults);
 	}
 
@@ -433,7 +413,7 @@ void EditorSettingsDialog::_update_shortcut_events(const String &p_path, const A
 	bool path_is_pan_mod = p_path == "spatial_editor/viewport_pan_modifier_1" || p_path == "spatial_editor/viewport_pan_modifier_2";
 	bool path_is_zoom_mod = p_path == "spatial_editor/viewport_zoom_modifier_1" || p_path == "spatial_editor/viewport_zoom_modifier_2";
 	if (path_is_orbit_mod || path_is_pan_mod || path_is_zoom_mod) {
-		EditorSettings::get_singleton()->set_manually("editors/3d/navigation/navigation_scheme", (int)View3DController::NAV_SCHEME_CUSTOM);
+		EditorSettings::get_singleton()->set_manually("editors/3d/navigation/navigation_scheme", (int)Node3DEditorViewport::NAVIGATION_CUSTOM);
 	}
 }
 
@@ -455,7 +435,6 @@ TreeItem *EditorSettingsDialog::_create_shortcut_treeitem(TreeItem *p_parent, co
 	TreeItem *shortcut_item = shortcuts->create_item(p_parent);
 	shortcut_item->set_collapsed(p_is_collapsed);
 	shortcut_item->set_text(0, p_display);
-	shortcut_item->set_tooltip_text(0, p_shortcut_identifier);
 
 	Ref<InputEvent> primary = p_events.size() > 0 ? Ref<InputEvent>(p_events[0]) : Ref<InputEvent>();
 	Ref<InputEvent> secondary = p_events.size() > 1 ? Ref<InputEvent>(p_events[1]) : Ref<InputEvent>();
@@ -520,7 +499,7 @@ TreeItem *EditorSettingsDialog::_create_shortcut_treeitem(TreeItem *p_parent, co
 	return shortcut_item;
 }
 
-bool EditorSettingsDialog::_should_display_shortcut(const String &p_path, const Array &p_events, const String &p_name) const {
+bool EditorSettingsDialog::_should_display_shortcut(const String &p_name, const Array &p_events, bool p_match_localized_name) const {
 	const Ref<InputEvent> search_ev = shortcut_search_bar->get_event();
 	if (search_ev.is_valid()) {
 		bool event_match = false;
@@ -543,10 +522,7 @@ bool EditorSettingsDialog::_should_display_shortcut(const String &p_path, const
 	if (search_text.is_subsequence_ofn(p_name)) {
 		return true;
 	}
-	if (search_text.is_subsequence_ofn(TTR(p_name))) {
-		return true;
-	}
-	if (search_text.is_subsequence_ofn(p_path)) {
+	if (p_match_localized_name && search_text.is_subsequence_ofn(TTR(p_name))) {
 		return true;
 	}
 
@@ -618,7 +594,7 @@ void EditorSettingsDialog::_update_shortcuts() {
 
 		const List<Ref<InputEvent>> &all_default_events = InputMap::get_singleton()->get_builtins_with_feature_overrides_applied().find(action_name)->value;
 		Array action_events = _event_list_to_array_helper(action.inputs);
-		if (!_should_display_shortcut(action_name, action_events)) {
+		if (!_should_display_shortcut(action_name, action_events, false)) {
 			continue;
 		}
 
@@ -681,7 +657,7 @@ void EditorSettingsDialog::_update_shortcuts() {
 		String section_name = E.get_slicec('/', 0);
 		TreeItem *section = sections[section_name];
 
-		if (!_should_display_shortcut(E, sc->get_events(), sc->get_name())) {
+		if (!_should_display_shortcut(sc->get_name(), sc->get_events(), true)) {
 			continue;
 		}
 
@@ -762,7 +738,7 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column
 		case EditorSettingsDialog::SHORTCUT_REVERT: {
 			// Only for "shortcut" types
 			if (is_editing_action) {
-				List<Ref<InputEvent>> defaults(InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier]);
+				List<Ref<InputEvent>> defaults = InputMap::get_singleton()->get_builtins_with_feature_overrides_applied()[current_edited_identifier];
 				Array events = _event_list_to_array_helper(defaults);
 
 				_update_builtin_action(current_edited_identifier, events);
@@ -1000,6 +976,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	inspector->register_advanced_toggle(advanced_switch);
 	inspector->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	tab_general->add_child(inspector);
+	inspector->get_inspector()->connect("property_edited", callable_mp(this, &EditorSettingsDialog::_settings_property_edited));
 	inspector->get_inspector()->connect("restart_requested", callable_mp(this, &EditorSettingsDialog::_editor_restart_request));
 
 	if (EDITOR_GET("interface/touchscreen/enable_touch_optimizations")) {
@@ -1033,9 +1010,6 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	restart_hb->add_child(restart_close_button);
 	restart_container->hide();
 
-	// Needs to be done via the signal instead of the notification, otherwise it happens too late.
-	EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &EditorSettingsDialog::_settings_property_edited));
-
 	// Shortcuts Tab
 
 	tab_shortcuts = memnew(VBoxContainer);
diff --git a/engine/editor/settings/editor_settings_dialog.h b/engine/editor/settings/editor_settings_dialog.h
index 356fb064..87454a6f 100644
--- a/engine/editor/settings/editor_settings_dialog.h
+++ b/engine/editor/settings/editor_settings_dialog.h
@@ -79,7 +79,7 @@ class EditorSettingsDialog : public AcceptDialog {
 	virtual void ok_pressed() override;
 
 	void _settings_changed();
-	void _settings_property_edited();
+	void _settings_property_edited(const String &p_name);
 	void _settings_save();
 
 	virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
@@ -107,7 +107,7 @@ class EditorSettingsDialog : public AcceptDialog {
 	PropertyInfo _create_mouse_shortcut_property_info(const String &p_property_name, const String &p_shortcut_1_name, const String &p_shortcut_2_name);
 	String _get_shortcut_button_string(const String &p_shortcut_name);
 
-	bool _should_display_shortcut(const String &p_path, const Array &p_events, const String &p_name = String()) const;
+	bool _should_display_shortcut(const String &p_name, const Array &p_events, bool p_match_localized_name) const;
 
 	void _update_shortcuts();
 	void _shortcut_button_pressed(Object *p_item, int p_column, int p_idx, MouseButton p_button = MouseButton::LEFT);
@@ -131,8 +131,6 @@ protected:
 public:
 	void popup_edit_settings();
 	static void update_navigation_preset();
-	void set_current_section(const String &p_section);
-	void set_advanced_mode_enabled(bool p_enabled);
 
 	EditorSettingsDialog();
 };
diff --git a/engine/editor/settings/event_listener_line_edit.cpp b/engine/editor/settings/event_listener_line_edit.cpp
index 8cac7873..9854f29e 100644
--- a/engine/editor/settings/event_listener_line_edit.cpp
+++ b/engine/editor/settings/event_listener_line_edit.cpp
@@ -31,11 +31,7 @@
 #include "event_listener_line_edit.h"
 
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "core/os/os.h"
 #include "scene/gui/dialogs.h"
-#include "servers/display/accessibility_server.h"
 
 // Maps to 2*axis if value is neg, or 2*axis+1 if value is pos.
 static const char *_joy_axis_descriptions[(size_t)JoyAxis::MAX * 2] = {
@@ -190,7 +186,7 @@ void EventListenerLineEdit::gui_input(const Ref<InputEvent> &p_event) {
 	}
 
 	accept_event();
-	if (event_to_check.is_null() || !event_to_check->is_pressed() || event_to_check->is_echo() || event_to_check->is_match(event) || !_is_event_allowed(event_to_check)) {
+	if (!event_to_check->is_pressed() || event_to_check->is_echo() || event_to_check->is_match(event) || !_is_event_allowed(event_to_check)) {
 		return;
 	}
 
@@ -237,7 +233,7 @@ void EventListenerLineEdit::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_extra_info(ae, vformat(TTR("Listening for Input. Hold %s to release focus."), InputMap::get_singleton()->get_action_description("ui_cancel")));
+			DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(TTR("Listening for Input. Hold %s to release focus."), InputMap::get_singleton()->get_action_description("ui_cancel")));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -272,7 +268,7 @@ void EventListenerLineEdit::_notification(int p_what) {
 
 void EventListenerLineEdit::_bind_methods() {
 	// `event` is either null or a valid InputEvent that is pressed and non-echo.
-	ADD_SIGNAL(MethodInfo("event_changed", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, InputEvent::get_class_static())));
+	ADD_SIGNAL(MethodInfo("event_changed", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));
 }
 
 EventListenerLineEdit::EventListenerLineEdit() {
diff --git a/engine/editor/settings/gdextension/SCsub b/engine/editor/settings/gdextension/SCsub
deleted file mode 100644
index b3cff5b9..00000000
--- a/engine/editor/settings/gdextension/SCsub
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-from misc.utility.scons_hints import *
-
-Import("env")
-
-env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/engine/editor/settings/gdextension/project_settings_gdextension.cpp b/engine/editor/settings/gdextension/project_settings_gdextension.cpp
deleted file mode 100644
index ec78a2db..00000000
--- a/engine/editor/settings/gdextension/project_settings_gdextension.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/**************************************************************************/
-/*  project_settings_gdextension.cpp                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "project_settings_gdextension.h"
-
-#include "core/config/project_settings.h"
-#include "core/extension/gdextension_manager.h"
-#include "core/io/config_file.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/gui/label.h"
-#include "scene/gui/tree.h"
-
-class GDExtensionPluginCreatorBase;
-
-void ProjectSettingsGDExtension::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_VISIBILITY_CHANGED:
-		case NOTIFICATION_WM_WINDOW_FOCUS_IN: {
-			if (is_visible_in_tree()) {
-				_update_extension_tree();
-			}
-		} break;
-		case NOTIFICATION_READY: {
-			extension_list->connect("button_clicked", callable_mp(this, &ProjectSettingsGDExtension::_cell_button_pressed));
-			extension_list->connect("item_activated", callable_mp(this, &ProjectSettingsGDExtension::_on_item_activated));
-		} break;
-	}
-}
-
-void ProjectSettingsGDExtension::_cell_button_pressed(Object *p_item, int p_column, int p_id, MouseButton p_button) {
-	if (p_button != MouseButton::LEFT) {
-		return;
-	}
-	TreeItem *item = Object::cast_to<TreeItem>(p_item);
-	if (item == nullptr) {
-		return;
-	}
-	if (p_id == COLUMN_RELOAD) {
-		const String path = item->get_metadata(COLUMN_PATH);
-		GDExtensionManager::get_singleton()->reload_extension(path);
-		_update_extension_tree();
-	}
-}
-
-void ProjectSettingsGDExtension::_on_item_activated() {
-	TreeItem *item = extension_list->get_selected();
-	if (item == nullptr) {
-		return;
-	}
-	const String global_path = ProjectSettings::get_singleton()->globalize_path(item->get_metadata(COLUMN_PATH));
-	OS::get_singleton()->shell_open(global_path);
-}
-
-void ProjectSettingsGDExtension::_update_extension_tree() {
-	extension_list->clear();
-	TreeItem *root = extension_list->create_item();
-	GDExtensionManager *gdext_man = GDExtensionManager::get_singleton();
-	const Vector<String> extensions = gdext_man->get_loaded_extensions();
-	for (const String &extension_path : extensions) {
-		const Ref<GDExtension> gdextension = gdext_man->get_extension(extension_path);
-		ERR_CONTINUE(gdextension.is_null());
-		TreeItem *item = extension_list->create_item(root);
-		item->set_text(COLUMN_PATH, extension_path);
-		Ref<ConfigFile> gdext_config;
-		gdext_config.instantiate();
-		Error err = gdext_config->load(extension_path);
-		ERR_CONTINUE(err != OK);
-		item->set_text(COLUMN_MIN_VERSION, gdext_config->get_value("configuration", "compatibility_minimum", ""));
-		item->set_text(COLUMN_MAX_VERSION, gdext_config->get_value("configuration", "compatibility_maximum", ""));
-		if (gdextension->is_reloadable()) {
-			item->add_button(COLUMN_RELOAD, get_editor_theme_icon(SNAME("Reload")), COLUMN_RELOAD, false, TTRC("Reload Extension"));
-		}
-		item->set_metadata(COLUMN_PATH, extension_path);
-	}
-}
-
-ProjectSettingsGDExtension::ProjectSettingsGDExtension() {
-	// Create the title label.
-	HBoxContainer *title_hb = memnew(HBoxContainer);
-	Label *label = memnew(Label(TTRC("Installed GDExtensions:")));
-	label->set_theme_type_variation("HeaderSmall");
-	title_hb->add_child(label);
-	title_hb->add_spacer();
-	add_child(title_hb);
-	// Create the tree.
-	extension_list = memnew(Tree);
-	extension_list->set_v_size_flags(SIZE_EXPAND_FILL);
-	extension_list->set_hide_root(true);
-	extension_list->set_theme_type_variation("TreeTable");
-	extension_list->set_hide_folding(true);
-	// Configure tree columns.
-	extension_list->set_columns(COLUMN_MAX);
-	extension_list->set_column_titles_visible(true);
-	extension_list->set_column_title(COLUMN_PATH, TTRC("Path"));
-	extension_list->set_column_title(COLUMN_MIN_VERSION, TTRC("Min Version"));
-	extension_list->set_column_title(COLUMN_MAX_VERSION, TTRC("Max Version"));
-	extension_list->set_column_title(COLUMN_RELOAD, TTRC("Reload"));
-	extension_list->set_column_title_alignment(COLUMN_PATH, HORIZONTAL_ALIGNMENT_LEFT);
-	extension_list->set_column_title_alignment(COLUMN_MIN_VERSION, HORIZONTAL_ALIGNMENT_LEFT);
-	extension_list->set_column_title_alignment(COLUMN_MAX_VERSION, HORIZONTAL_ALIGNMENT_LEFT);
-	extension_list->set_column_title_alignment(COLUMN_RELOAD, HORIZONTAL_ALIGNMENT_LEFT);
-	extension_list->set_column_expand(COLUMN_PATH, true);
-	extension_list->set_column_expand(COLUMN_MIN_VERSION, false);
-	extension_list->set_column_expand(COLUMN_MAX_VERSION, false);
-	extension_list->set_column_expand(COLUMN_RELOAD, false);
-	extension_list->set_column_clip_content(COLUMN_PATH, true);
-	extension_list->set_column_clip_content(COLUMN_MIN_VERSION, true);
-	extension_list->set_column_clip_content(COLUMN_MAX_VERSION, true);
-	extension_list->set_column_clip_content(COLUMN_RELOAD, true);
-	extension_list->set_column_custom_minimum_width(COLUMN_PATH, 300 * EDSCALE);
-	extension_list->set_column_custom_minimum_width(COLUMN_MIN_VERSION, 100 * EDSCALE);
-	extension_list->set_column_custom_minimum_width(COLUMN_MAX_VERSION, 100 * EDSCALE);
-	extension_list->set_column_custom_minimum_width(COLUMN_RELOAD, 40 * EDSCALE);
-	add_child(extension_list);
-}
diff --git a/engine/editor/settings/gdextension/project_settings_gdextension.h b/engine/editor/settings/gdextension/project_settings_gdextension.h
deleted file mode 100644
index 692dccfe..00000000
--- a/engine/editor/settings/gdextension/project_settings_gdextension.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**************************************************************************/
-/*  project_settings_gdextension.h                                        */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "scene/gui/box_container.h"
-
-class Tree;
-
-class ProjectSettingsGDExtension : public VBoxContainer {
-	GDCLASS(ProjectSettingsGDExtension, VBoxContainer);
-
-	enum {
-		COLUMN_PATH,
-		COLUMN_MIN_VERSION,
-		COLUMN_MAX_VERSION,
-		COLUMN_RELOAD,
-		COLUMN_MAX,
-	};
-
-	Tree *extension_list = nullptr;
-
-	void _cell_button_pressed(Object *p_item, int p_column, int p_id, MouseButton p_button);
-	void _on_item_activated();
-	void _update_extension_tree();
-
-protected:
-	void _notification(int p_what);
-
-public:
-	ProjectSettingsGDExtension();
-};
diff --git a/engine/editor/settings/input_event_configuration_dialog.cpp b/engine/editor/settings/input_event_configuration_dialog.cpp
index 15dcbd5e..1ecfd645 100644
--- a/engine/editor/settings/input_event_configuration_dialog.cpp
+++ b/engine/editor/settings/input_event_configuration_dialog.cpp
@@ -31,7 +31,6 @@
 #include "input_event_configuration_dialog.h"
 
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/event_listener_line_edit.h"
 #include "editor/themes/editor_scale.h"
@@ -44,22 +43,8 @@
 
 void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, const Ref<InputEvent> &p_original_event, bool p_update_input_list_selection) {
 	if (p_event.is_valid()) {
-		// If there is already a binding set, let enter or escape confirm/cancel the popup.
-		if (event.is_valid()) {
-			Ref<InputEventKey> current_key = p_event;
-			// Without this is_visible() check, the gui would not open if the already bound
-			// keybind was escape.
-			if (current_key.is_valid() && is_visible()) {
-				if (current_key->get_physical_keycode() == Key::ENTER) {
-					_ok_pressed();
-					return;
-				}
-				if (current_key->get_physical_keycode() == Key::ESCAPE) {
-					_cancel_pressed();
-					return;
-				}
-			}
-		}
+		event = p_event;
+		original_event = p_original_event;
 
 		// If the event is changed to something which is not the same as the listener,
 		// clear out the event from the listener text box to avoid confusion.
@@ -67,24 +52,10 @@ void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, c
 		if (listener_event.is_valid() && !listener_event->is_match(p_event)) {
 			event_listener->clear_event();
 		}
-		event = p_event;
-		original_event = p_original_event;
+
 		// Update Label
 		event_as_text->set_text(EventListenerLineEdit::get_event_text(event, true));
 
-		bool exists = false;
-		for (const Variant &v : action_events) {
-			Ref<InputEvent> ie = v;
-			if (ie.is_null()) {
-				continue;
-			} else if (ie->is_match(p_event)) {
-				exists = true;
-				break;
-			}
-		}
-		event_exists->set_visible(exists);
-		get_ok_button()->set_disabled(exists);
-
 		Ref<InputEventKey> k = p_event;
 		Ref<InputEventMouseButton> mb = p_event;
 		Ref<InputEventJoypadButton> joyb = p_event;
@@ -224,8 +195,6 @@ void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, c
 		original_event = Ref<InputEvent>();
 		event_listener->clear_event();
 		event_as_text->set_text(TTRC("No Event Configured"));
-		event_exists->set_visible(false);
-		get_ok_button()->set_disabled(false);
 
 		additional_options_container->hide();
 		input_list_tree->deselect_all();
@@ -615,7 +584,6 @@ void InputEventConfigurationDialog::_notification(int p_what) {
 			icon_cache.joypad_axis = get_editor_theme_icon(SNAME("JoyAxis"));
 
 			event_as_text->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
-			event_exists->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
 
 			_update_input_list();
 		} break;
@@ -628,20 +596,8 @@ void InputEventConfigurationDialog::_notification(int p_what) {
 	}
 }
 
-void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event, const String &p_current_action_name, const Dictionary &p_current_action) {
-	action_events = p_current_action.get("events", Array()).duplicate();
-
+void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event, const String &p_current_action_name) {
 	if (p_event.is_valid()) {
-		// Here we remove one instance of the InputEvent being edited so it doesn't immediately get flagged as duplicated in the dialog.
-		for (int i = 0; i < action_events.size(); i++) {
-			Ref<InputEvent> ie = action_events[i];
-			if (ie.is_null()) {
-				continue;
-			} else if (ie->is_match(p_event)) {
-				action_events.remove_at(i);
-				break;
-			}
-		}
 		_set_event(p_event->duplicate(), p_event->duplicate());
 	} else {
 		// Clear Event
@@ -806,7 +762,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
 	location_container = memnew(HBoxContainer);
 	location_container->hide();
 
-	location_container->add_child(memnew(Label(TTRC("Physical Location"))));
+	location_container->add_child(memnew(Label(TTRC("Physical location"))));
 
 	key_location = memnew(OptionButton);
 	key_location->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -816,15 +772,10 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
 	key_location->add_item(String(), (int)KeyLocation::LEFT);
 	key_location->add_item(String(), (int)KeyLocation::RIGHT);
 	key_location->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_key_location_selected));
-	key_location->set_accessibility_name(TTRC("Physical Location"));
+	key_location->set_accessibility_name(TTRC("Physical location"));
 
 	location_container->add_child(key_location);
 	additional_options_container->add_child(location_container);
 
 	main_vbox->add_child(additional_options_container);
-
-	event_exists = memnew(Label(TTRC("Error: This action already contains this input event.")));
-	event_exists->set_theme_type_variation("HeaderSmall");
-	event_exists->set_visible(false);
-	main_vbox->add_child(event_exists);
 }
diff --git a/engine/editor/settings/input_event_configuration_dialog.h b/engine/editor/settings/input_event_configuration_dialog.h
index bc4109cc..06944f81 100644
--- a/engine/editor/settings/input_event_configuration_dialog.h
+++ b/engine/editor/settings/input_event_configuration_dialog.h
@@ -51,7 +51,6 @@ private:
 
 	Ref<InputEvent> event;
 	Ref<InputEvent> original_event;
-	Array action_events;
 
 	bool in_tree_update = false;
 
@@ -107,8 +106,6 @@ private:
 	HBoxContainer *location_container = nullptr;
 	OptionButton *key_location = nullptr;
 
-	Label *event_exists = nullptr;
-
 	void _set_event(const Ref<InputEvent> &p_event, const Ref<InputEvent> &p_original_event, bool p_update_input_list_selection = true);
 	void _on_listen_input_changed(const Ref<InputEvent> &p_event);
 
@@ -132,7 +129,7 @@ protected:
 public:
 	// Pass an existing event to configure it. Alternatively, pass no event to start with a blank configuration.
 	// An action name can be passed for descriptive purposes.
-	void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>(), const String &p_current_action_name = "", const Dictionary &p_current_action = Dictionary());
+	void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>(), const String &p_current_action_name = "");
 	Ref<InputEvent> get_event() const;
 
 	void set_allowed_input_types(int p_type_masks);
diff --git a/engine/editor/settings/project_settings_editor.cpp b/engine/editor/settings/project_settings_editor.cpp
index 1b19d369..99e8f61f 100644
--- a/engine/editor/settings/project_settings_editor.cpp
+++ b/engine/editor/settings/project_settings_editor.cpp
@@ -32,8 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -41,7 +39,6 @@
 #include "editor/gui/editor_variant_type_selectors.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/settings/editor_settings.h"
-#include "editor/settings/gdextension/project_settings_gdextension.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_button.h"
 #include "servers/movie_writer/movie_writer.h"
@@ -414,6 +411,8 @@ void ProjectSettingsEditor::_focus_current_path_box() {
 		current_path_box = property_box;
 	} else if (tab == action_map_editor) {
 		current_path_box = action_map_editor->get_path_box();
+	} else if (tab == autoload_settings) {
+		current_path_box = autoload_settings->get_path_box();
 	} else if (tab == shaders_global_shader_uniforms_editor) {
 		current_path_box = shaders_global_shader_uniforms_editor->get_name_box();
 	} else if (tab == group_settings) {
@@ -614,11 +613,6 @@ void ProjectSettingsEditor::_update_action_map_editor() {
 		String display_name = property_name.substr(String("input/").size() - 1);
 		Dictionary action = GLOBAL_GET(property_name);
 
-		if (!action.has("events")) {
-			WARN_PRINT_ONCE_ED(vformat("Attempted to load invalid input action from setting at \"%s\". The `input/` prefix should only be used for input actions, and cannot be changed in the settings editor. Consider changing the category.", property_name));
-			continue;
-		}
-
 		ActionMapEditor::ActionInfo action_info;
 		action_info.action = action;
 		action_info.editable = true;
@@ -679,12 +673,6 @@ void ProjectSettingsEditor::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			_update_theme();
 		} break;
-
-		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
-				general_settings_inspector->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
-			}
-		} break;
 	}
 }
 
@@ -848,10 +836,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 	plugin_settings->set_name(TTRC("Plugins"));
 	tab_container->add_child(plugin_settings);
 
-	gdextension_settings = memnew(ProjectSettingsGDExtension);
-	gdextension_settings->set_name(TTRC("GDExtension"));
-	tab_container->add_child(gdextension_settings);
-
 	timer = memnew(Timer);
 	timer->set_wait_time(1.5);
 	timer->connect("timeout", callable_mp(this, &ProjectSettingsEditor::_save));
diff --git a/engine/editor/settings/project_settings_editor.h b/engine/editor/settings/project_settings_editor.h
index 53a08bfb..6263f095 100644
--- a/engine/editor/settings/project_settings_editor.h
+++ b/engine/editor/settings/project_settings_editor.h
@@ -46,7 +46,6 @@
 
 class EditorVariantTypeOptionButton;
 class FileSystemDock;
-class ProjectSettingsGDExtension;
 
 class ProjectSettingsEditor : public AcceptDialog {
 	GDCLASS(ProjectSettingsEditor, AcceptDialog);
@@ -71,7 +70,6 @@ class ProjectSettingsEditor : public AcceptDialog {
 	ShaderGlobalsEditor *shaders_global_shader_uniforms_editor = nullptr;
 	GroupSettingsEditor *group_settings = nullptr;
 	EditorPluginSettings *plugin_settings = nullptr;
-	ProjectSettingsGDExtension *gdextension_settings = nullptr;
 
 	LineEdit *search_box = nullptr;
 	CheckButton *advanced = nullptr;
diff --git a/engine/editor/shader/editor_native_shader_source_visualizer.cpp b/engine/editor/shader/editor_native_shader_source_visualizer.cpp
index dbde23d0..16944a8e 100644
--- a/engine/editor/shader/editor_native_shader_source_visualizer.cpp
+++ b/engine/editor/shader/editor_native_shader_source_visualizer.cpp
@@ -30,14 +30,11 @@
 
 #include "editor_native_shader_source_visualizer.h"
 
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/code_edit.h"
-#include "scene/gui/tab_container.h"
-#include "scene/resources/syntax_highlighter.h"
-#include "servers/rendering/rendering_server.h"
+#include "scene/gui/text_edit.h"
 #include "servers/rendering/shader_language.h"
 
 void EditorNativeShaderSourceVisualizer::_load_theme_settings() {
@@ -80,7 +77,7 @@ void EditorNativeShaderSourceVisualizer::_inspect_shader(RID p_shader) {
 		versions = nullptr;
 	}
 
-	RenderingServerTypes::ShaderNativeSourceCode nsc = RS::get_singleton()->shader_get_native_source_code(p_shader);
+	RS::ShaderNativeSourceCode nsc = RS::get_singleton()->shader_get_native_source_code(p_shader);
 
 	_load_theme_settings();
 
diff --git a/engine/editor/shader/editor_native_shader_source_visualizer.h b/engine/editor/shader/editor_native_shader_source_visualizer.h
index 908b7d3e..f75e165c 100644
--- a/engine/editor/shader/editor_native_shader_source_visualizer.h
+++ b/engine/editor/shader/editor_native_shader_source_visualizer.h
@@ -31,9 +31,8 @@
 #pragma once
 
 #include "scene/gui/dialogs.h"
-
-class CodeHighlighter;
-class TabContainer;
+#include "scene/gui/tab_container.h"
+#include "scene/resources/syntax_highlighter.h"
 
 class EditorNativeShaderSourceVisualizer : public AcceptDialog {
 	GDCLASS(EditorNativeShaderSourceVisualizer, AcceptDialog)
diff --git a/engine/editor/shader/editor_shader_language_plugin.h b/engine/editor/shader/editor_shader_language_plugin.h
index 77a9e275..8cbba218 100644
--- a/engine/editor/shader/editor_shader_language_plugin.h
+++ b/engine/editor/shader/editor_shader_language_plugin.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/shader/shader_editor.h"
+#include "shader_editor.h"
 
 class EditorShaderLanguagePlugin : public RefCounted {
 	GDCLASS(EditorShaderLanguagePlugin, RefCounted);
diff --git a/engine/editor/shader/shader_create_dialog.cpp b/engine/editor/shader/shader_create_dialog.cpp
index a5d02f6f..113d8c52 100644
--- a/engine/editor/shader/shader_create_dialog.cpp
+++ b/engine/editor/shader/shader_create_dialog.cpp
@@ -32,17 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_validation_panel.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/shader/editor_shader_language_plugin.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/shader_include.h"
 #include "servers/rendering/shader_types.h"
 
@@ -271,7 +265,7 @@ void ShaderCreateDialog::_browse_path() {
 	file_browse->set_customization_flag_enabled(FileDialog::CUSTOMIZATION_OVERWRITE_WARNING, false);
 	file_browse->clear_filters();
 
-	List<String> extensions(type_data.get(type_menu->get_selected()).extensions);
+	List<String> extensions = type_data.get(type_menu->get_selected()).extensions;
 
 	for (const String &E : extensions) {
 		file_browse->add_filter("*." + E);
@@ -391,25 +385,25 @@ String ShaderCreateDialog::_validate_path(const String &p_path) {
 	String stripped_file_path = p_path.strip_edges();
 
 	if (stripped_file_path.is_empty()) {
-		return TTRC("Path is empty.");
+		return TTR("Path is empty.");
 	}
 	if (stripped_file_path.get_file().get_basename().is_empty()) {
-		return TTRC("Filename is empty.");
+		return TTR("Filename is empty.");
 	}
 
 	stripped_file_path = ProjectSettings::get_singleton()->localize_path(stripped_file_path);
 	if (!stripped_file_path.begins_with("res://")) {
-		return TTRC("Path is not local.");
+		return TTR("Path is not local.");
 	}
 
 	Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 	if (d->change_dir(stripped_file_path.get_base_dir()) != OK) {
-		return TTRC("Invalid base path.");
+		return TTR("Invalid base path.");
 	}
 
 	Ref<DirAccess> f = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 	if (f->dir_exists(stripped_file_path)) {
-		return TTRC("A directory with the same name exists.");
+		return TTR("A directory with the same name exists.");
 	}
 
 	const ShaderCreateDialog::ShaderTypeData &current_type_data = type_data.get(current_type);
@@ -421,17 +415,17 @@ String ShaderCreateDialog::_validate_path(const String &p_path) {
 		}
 	}
 
-	return TTRC("Invalid extension for selected shader type.");
+	return TTR("Invalid extension for selected shader type.");
 }
 
 void ShaderCreateDialog::_update_dialog() {
 	if (!is_built_in && !is_path_valid) {
-		validation_panel->set_message(MSG_ID_SHADER, TTRC("Invalid path."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_SHADER, TTR("Invalid path."), EditorValidationPanel::MSG_ERROR);
 	}
 	if (!is_built_in && !path_error.is_empty()) {
 		validation_panel->set_message(MSG_ID_PATH, path_error, EditorValidationPanel::MSG_ERROR);
 	} else if (validation_panel->is_valid() && !is_new_shader_created) {
-		validation_panel->set_message(MSG_ID_SHADER, TTRC("File exists, it will be reused."), EditorValidationPanel::MSG_OK);
+		validation_panel->set_message(MSG_ID_SHADER, TTR("File exists, it will be reused."), EditorValidationPanel::MSG_OK);
 	}
 	if (!built_in_enabled) {
 		internal->set_pressed(false);
@@ -453,30 +447,30 @@ void ShaderCreateDialog::_update_dialog() {
 	internal->set_disabled(!built_in_enabled);
 
 	if (is_built_in) {
-		validation_panel->set_message(MSG_ID_BUILT_IN, TTRC("Note: Built-in shaders can't be edited using an external editor."), EditorValidationPanel::MSG_INFO, false);
+		validation_panel->set_message(MSG_ID_BUILT_IN, TTR("Note: Built-in shaders can't be edited using an external editor."), EditorValidationPanel::MSG_INFO, false);
 	}
 
 	if (is_built_in) {
 		set_ok_button_text(TTR("Create"));
-		validation_panel->set_message(MSG_ID_PATH, TTRC("Built-in shader (into scene file)."), EditorValidationPanel::MSG_OK);
+		validation_panel->set_message(MSG_ID_PATH, TTR("Built-in shader (into scene file)."), EditorValidationPanel::MSG_OK);
 	} else if (is_new_shader_created) {
 		set_ok_button_text(TTR("Create"));
 	} else if (load_enabled) {
 		set_ok_button_text(TTR("Load"));
 		if (is_path_valid) {
-			validation_panel->set_message(MSG_ID_PATH, TTRC("Will load an existing shader file."), EditorValidationPanel::MSG_OK);
+			validation_panel->set_message(MSG_ID_PATH, TTR("Will load an existing shader file."), EditorValidationPanel::MSG_OK);
 		}
 	} else {
 		set_ok_button_text(TTR("Create"));
-		validation_panel->set_message(MSG_ID_PATH, TTRC("Shader file already exists."), EditorValidationPanel::MSG_ERROR);
+		validation_panel->set_message(MSG_ID_PATH, TTR("Shader file already exists."), EditorValidationPanel::MSG_ERROR);
 	}
 }
 
 void ShaderCreateDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("config", "path", "built_in_enabled", "load_enabled"), &ShaderCreateDialog::config, DEFVAL(true), DEFVAL(true));
 
-	ADD_SIGNAL(MethodInfo("shader_created", PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, Shader::get_class_static())));
-	ADD_SIGNAL(MethodInfo("shader_include_created", PropertyInfo(Variant::OBJECT, "shader_include", PROPERTY_HINT_RESOURCE_TYPE, ShaderInclude::get_class_static())));
+	ADD_SIGNAL(MethodInfo("shader_created", PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader")));
+	ADD_SIGNAL(MethodInfo("shader_include_created", PropertyInfo(Variant::OBJECT, "shader_include", PROPERTY_HINT_RESOURCE_TYPE, "ShaderInclude")));
 }
 
 ShaderCreateDialog::ShaderCreateDialog() {
@@ -490,8 +484,8 @@ ShaderCreateDialog::ShaderCreateDialog() {
 	// Error Fields.
 
 	validation_panel = memnew(EditorValidationPanel);
-	validation_panel->add_line(MSG_ID_SHADER, TTRC("Shader path/name is valid."));
-	validation_panel->add_line(MSG_ID_PATH, TTRC("Will create a new shader file."));
+	validation_panel->add_line(MSG_ID_SHADER, TTR("Shader path/name is valid."));
+	validation_panel->add_line(MSG_ID_PATH, TTR("Will create a new shader file."));
 	validation_panel->add_line(MSG_ID_BUILT_IN);
 	validation_panel->set_update_callback(callable_mp(this, &ShaderCreateDialog::_update_dialog));
 	validation_panel->set_accept_button(get_ok_button());
diff --git a/engine/editor/shader/shader_create_dialog.h b/engine/editor/shader/shader_create_dialog.h
index 064116d8..cc59b48f 100644
--- a/engine/editor/shader/shader_create_dialog.h
+++ b/engine/editor/shader/shader_create_dialog.h
@@ -30,11 +30,13 @@
 
 #pragma once
 
+#include "editor/settings/editor_settings.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/panel_container.h"
 
 class EditorFileDialog;
 class EditorValidationPanel;
diff --git a/engine/editor/shader/shader_editor.h b/engine/editor/shader/shader_editor.h
index f77e3601..ae4e86e1 100644
--- a/engine/editor/shader/shader_editor.h
+++ b/engine/editor/shader/shader_editor.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "scene/gui/margin_container.h"
+#include "scene/gui/control.h"
 #include "scene/resources/shader.h"
 
 class Button;
 class MenuButton;
 
-class ShaderEditor : public MarginContainer {
-	GDCLASS(ShaderEditor, MarginContainer);
+class ShaderEditor : public Control {
+	GDCLASS(ShaderEditor, Control);
 
 public:
 	virtual void edit_shader(const Ref<Shader> &p_shader) = 0;
diff --git a/engine/editor/shader/shader_editor_plugin.cpp b/engine/editor/shader/shader_editor_plugin.cpp
index e66e67df..5170a93b 100644
--- a/engine/editor/shader/shader_editor_plugin.cpp
+++ b/engine/editor/shader/shader_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "shader_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
@@ -40,7 +38,6 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/window_wrapper.h"
 #include "editor/settings/editor_command_palette.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/shader/shader_create_dialog.h"
 #include "editor/shader/text_shader_editor.h"
 #include "editor/shader/text_shader_language_plugin.h"
@@ -49,7 +46,6 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
-#include "servers/display/display_server.h"
 
 Ref<Resource> ShaderEditorPlugin::_get_current_shader() {
 	int index = shader_tabs->get_current_tab();
@@ -673,12 +669,6 @@ Variant ShaderEditorPlugin::get_drag_data_fw(const Point2 &p_point, Control *p_f
 	drag_data["type"] = "shader_list_element";
 	drag_data["shader_list_element"] = idx;
 
-	Ref<Resource> shader = edited_shaders[idx].shader;
-	if (shader.is_null()) {
-		shader = edited_shaders[idx].shader_inc;
-	}
-	drag_data["file_path"] = shader->get_path();
-
 	return drag_data;
 }
 
@@ -853,7 +843,7 @@ void ShaderEditorPlugin::shortcut_input(const Ref<InputEvent> &p_event) {
 	}
 
 	if (make_floating_shortcut.is_valid() && make_floating_shortcut->matches_event(p_event)) {
-		shader_dock->make_floating();
+		EditorDockManager::get_singleton()->make_dock_floating(shader_dock);
 	}
 }
 
@@ -882,7 +872,6 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	files_split = memnew(HSplitContainer);
 	files_split->set_split_offset(200 * EDSCALE);
 	files_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	files_split->set_drag_nested_intersections(true);
 	shader_dock->add_child(files_split);
 
 	context_menu = memnew(PopupMenu);
diff --git a/engine/editor/shader/shader_editor_plugin.h b/engine/editor/shader/shader_editor_plugin.h
index b1b0e8cd..8fcbd25c 100644
--- a/engine/editor/shader/shader_editor_plugin.h
+++ b/engine/editor/shader/shader_editor_plugin.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/resources/shader.h"
 
 class CodeTextEditor;
 class EditorDock;
diff --git a/engine/editor/shader/shader_file_editor_plugin.cpp b/engine/editor/shader/shader_file_editor_plugin.cpp
index c73a5e4e..b00184f3 100644
--- a/engine/editor/shader/shader_file_editor_plugin.cpp
+++ b/engine/editor/shader/shader_file_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "shader_file_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -39,10 +38,12 @@
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/split_container.h"
-#include "servers/rendering/rendering_device_binds.h"
+#include "servers/display/display_server.h"
 
 /*** SHADER SCRIPT EDITOR ****/
 
+/*** SCRIPT EDITOR ******/
+
 void ShaderFileEditor::_update_version(const StringName &p_version_txt, const RD::ShaderStage p_stage) {
 }
 
@@ -274,12 +275,7 @@ ShaderFileEditor::ShaderFileEditor() {
 		"Fragment",
 		"TessControl",
 		"TessEval",
-		"Compute",
-		"Raygen",
-		"AnyHit",
-		"ClosestHit",
-		"Miss",
-		"Intersection",
+		"Compute"
 	};
 
 	stage_hb = memnew(HFlowContainer);
diff --git a/engine/editor/shader/shader_file_editor_plugin.h b/engine/editor/shader/shader_file_editor_plugin.h
index 515393da..031b13b4 100644
--- a/engine/editor/shader/shader_file_editor_plugin.h
+++ b/engine/editor/shader/shader_file_editor_plugin.h
@@ -33,11 +33,10 @@
 #include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/rich_text_label.h"
-#include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 class HFlowContainer;
 class ItemList;
-class RDShaderFile;
 
 class ShaderFileEditor : public EditorDock {
 	GDCLASS(ShaderFileEditor, EditorDock);
@@ -73,6 +72,7 @@ class ShaderFileEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "ShaderFile"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/editor/shader/shader_globals_editor.cpp b/engine/editor/shader/shader_globals_editor.cpp
index a6b4eae7..48a93a92 100644
--- a/engine/editor/shader/shader_globals_editor.cpp
+++ b/engine/editor/shader/shader_globals_editor.cpp
@@ -31,18 +31,15 @@
 #include "shader_globals_editor.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_inspector.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
 
-static const char *global_var_type_names[RSE::GLOBAL_VAR_TYPE_MAX] = {
+static const char *global_var_type_names[RS::GLOBAL_VAR_TYPE_MAX] = {
 	"bool",
 	"bvec2",
 	"bvec3",
@@ -83,10 +80,10 @@ class ShaderGlobalsEditorInterface : public Object {
 		undo_redo->create_action(TTR("Set Shader Global Variable"));
 		undo_redo->add_do_method(RS::get_singleton(), "global_shader_parameter_set", p_name, p_value);
 		undo_redo->add_undo_method(RS::get_singleton(), "global_shader_parameter_set", p_name, p_prev_value);
-		RSE::GlobalShaderParameterType type = RS::get_singleton()->global_shader_parameter_get_type(p_name);
+		RS::GlobalShaderParameterType type = RS::get_singleton()->global_shader_parameter_get_type(p_name);
 		Dictionary gv;
 		gv["type"] = global_var_type_names[type];
-		if (type >= RSE::GLOBAL_VAR_TYPE_SAMPLER2D) {
+		if (type >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
 			Ref<Resource> res = p_value;
 			if (res.is_valid()) {
 				gv["value"] = res->get_path();
@@ -141,105 +138,105 @@ protected:
 			pinfo.name = variables[i];
 
 			switch (RS::get_singleton()->global_shader_parameter_get_type(variables[i])) {
-				case RSE::GLOBAL_VAR_TYPE_BOOL: {
+				case RS::GLOBAL_VAR_TYPE_BOOL: {
 					pinfo.type = Variant::BOOL;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_BVEC2: {
+				case RS::GLOBAL_VAR_TYPE_BVEC2: {
 					pinfo.type = Variant::INT;
 					pinfo.hint = PROPERTY_HINT_FLAGS;
 					pinfo.hint_string = "x,y";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_BVEC3: {
+				case RS::GLOBAL_VAR_TYPE_BVEC3: {
 					pinfo.type = Variant::INT;
 					pinfo.hint = PROPERTY_HINT_FLAGS;
 					pinfo.hint_string = "x,y,z";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_BVEC4: {
+				case RS::GLOBAL_VAR_TYPE_BVEC4: {
 					pinfo.type = Variant::INT;
 					pinfo.hint = PROPERTY_HINT_FLAGS;
 					pinfo.hint_string = "x,y,z,w";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_INT: {
+				case RS::GLOBAL_VAR_TYPE_INT: {
 					pinfo.type = Variant::INT;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_IVEC2: {
+				case RS::GLOBAL_VAR_TYPE_IVEC2: {
 					pinfo.type = Variant::VECTOR2I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_IVEC3: {
+				case RS::GLOBAL_VAR_TYPE_IVEC3: {
 					pinfo.type = Variant::VECTOR3I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_IVEC4: {
+				case RS::GLOBAL_VAR_TYPE_IVEC4: {
 					pinfo.type = Variant::VECTOR4I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_RECT2I: {
+				case RS::GLOBAL_VAR_TYPE_RECT2I: {
 					pinfo.type = Variant::RECT2I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_UINT: {
+				case RS::GLOBAL_VAR_TYPE_UINT: {
 					pinfo.type = Variant::INT;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_UVEC2: {
+				case RS::GLOBAL_VAR_TYPE_UVEC2: {
 					pinfo.type = Variant::VECTOR2I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_UVEC3: {
+				case RS::GLOBAL_VAR_TYPE_UVEC3: {
 					pinfo.type = Variant::VECTOR3I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_UVEC4: {
+				case RS::GLOBAL_VAR_TYPE_UVEC4: {
 					pinfo.type = Variant::VECTOR4I;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+				case RS::GLOBAL_VAR_TYPE_FLOAT: {
 					pinfo.type = Variant::FLOAT;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_VEC2: {
+				case RS::GLOBAL_VAR_TYPE_VEC2: {
 					pinfo.type = Variant::VECTOR2;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_VEC3: {
+				case RS::GLOBAL_VAR_TYPE_VEC3: {
 					pinfo.type = Variant::VECTOR3;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_VEC4: {
+				case RS::GLOBAL_VAR_TYPE_VEC4: {
 					pinfo.type = Variant::VECTOR4;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_RECT2: {
+				case RS::GLOBAL_VAR_TYPE_RECT2: {
 					pinfo.type = Variant::RECT2;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_COLOR: {
+				case RS::GLOBAL_VAR_TYPE_COLOR: {
 					pinfo.type = Variant::COLOR;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_MAT2: {
+				case RS::GLOBAL_VAR_TYPE_MAT2: {
 					pinfo.type = Variant::PACKED_FLOAT32_ARRAY;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_MAT3: {
+				case RS::GLOBAL_VAR_TYPE_MAT3: {
 					pinfo.type = Variant::BASIS;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
+				case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 					pinfo.type = Variant::TRANSFORM2D;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+				case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 					pinfo.type = Variant::TRANSFORM3D;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_MAT4: {
+				case RS::GLOBAL_VAR_TYPE_MAT4: {
 					pinfo.type = Variant::PROJECTION;
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_SAMPLER2D: {
+				case RS::GLOBAL_VAR_TYPE_SAMPLER2D: {
 					pinfo.type = Variant::OBJECT;
 					pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 					pinfo.hint_string = "Texture2D";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
+				case RS::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
 					pinfo.type = Variant::OBJECT;
 					pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 					pinfo.hint_string = "Texture2DArray,CompressedTexture2DArray";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_SAMPLER3D: {
+				case RS::GLOBAL_VAR_TYPE_SAMPLER3D: {
 					pinfo.type = Variant::OBJECT;
 					pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 					pinfo.hint_string = "Texture3D";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
+				case RS::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
 					pinfo.type = Variant::OBJECT;
 					pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 					pinfo.hint_string = "Cubemap,CompressedCubemap";
 				} break;
-				case RSE::GLOBAL_VAR_TYPE_SAMPLEREXT: {
+				case RS::GLOBAL_VAR_TYPE_SAMPLEREXT: {
 					pinfo.type = Variant::OBJECT;
 					pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 					pinfo.hint_string = "ExternalTexture";
@@ -259,66 +256,66 @@ public:
 	}
 };
 
-static Variant create_var(RSE::GlobalShaderParameterType p_type) {
+static Variant create_var(RS::GlobalShaderParameterType p_type) {
 	switch (p_type) {
-		case RSE::GLOBAL_VAR_TYPE_BOOL: {
+		case RS::GLOBAL_VAR_TYPE_BOOL: {
 			return false;
 		}
-		case RSE::GLOBAL_VAR_TYPE_BVEC2: {
+		case RS::GLOBAL_VAR_TYPE_BVEC2: {
 			return 0; //bits
 		}
-		case RSE::GLOBAL_VAR_TYPE_BVEC3: {
+		case RS::GLOBAL_VAR_TYPE_BVEC3: {
 			return 0; //bits
 		}
-		case RSE::GLOBAL_VAR_TYPE_BVEC4: {
+		case RS::GLOBAL_VAR_TYPE_BVEC4: {
 			return 0; //bits
 		}
-		case RSE::GLOBAL_VAR_TYPE_INT: {
+		case RS::GLOBAL_VAR_TYPE_INT: {
 			return 0; //bits
 		}
-		case RSE::GLOBAL_VAR_TYPE_IVEC2: {
+		case RS::GLOBAL_VAR_TYPE_IVEC2: {
 			return Vector2i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_IVEC3: {
+		case RS::GLOBAL_VAR_TYPE_IVEC3: {
 			return Vector3i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_IVEC4: {
+		case RS::GLOBAL_VAR_TYPE_IVEC4: {
 			return Vector4i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_RECT2I: {
+		case RS::GLOBAL_VAR_TYPE_RECT2I: {
 			return Rect2i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_UINT: {
+		case RS::GLOBAL_VAR_TYPE_UINT: {
 			return 0;
 		}
-		case RSE::GLOBAL_VAR_TYPE_UVEC2: {
+		case RS::GLOBAL_VAR_TYPE_UVEC2: {
 			return Vector2i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_UVEC3: {
+		case RS::GLOBAL_VAR_TYPE_UVEC3: {
 			return Vector3i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_UVEC4: {
+		case RS::GLOBAL_VAR_TYPE_UVEC4: {
 			return Vector4i();
 		}
-		case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+		case RS::GLOBAL_VAR_TYPE_FLOAT: {
 			return 0.0;
 		}
-		case RSE::GLOBAL_VAR_TYPE_VEC2: {
+		case RS::GLOBAL_VAR_TYPE_VEC2: {
 			return Vector2();
 		}
-		case RSE::GLOBAL_VAR_TYPE_VEC3: {
+		case RS::GLOBAL_VAR_TYPE_VEC3: {
 			return Vector3();
 		}
-		case RSE::GLOBAL_VAR_TYPE_VEC4: {
+		case RS::GLOBAL_VAR_TYPE_VEC4: {
 			return Vector4();
 		}
-		case RSE::GLOBAL_VAR_TYPE_RECT2: {
+		case RS::GLOBAL_VAR_TYPE_RECT2: {
 			return Rect2();
 		}
-		case RSE::GLOBAL_VAR_TYPE_COLOR: {
+		case RS::GLOBAL_VAR_TYPE_COLOR: {
 			return Color();
 		}
-		case RSE::GLOBAL_VAR_TYPE_MAT2: {
+		case RS::GLOBAL_VAR_TYPE_MAT2: {
 			Vector<float> xform;
 			xform.resize(4);
 			xform.write[0] = 1;
@@ -327,31 +324,31 @@ static Variant create_var(RSE::GlobalShaderParameterType p_type) {
 			xform.write[3] = 1;
 			return xform;
 		}
-		case RSE::GLOBAL_VAR_TYPE_MAT3: {
+		case RS::GLOBAL_VAR_TYPE_MAT3: {
 			return Basis();
 		}
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 			return Transform2D();
 		}
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 			return Transform3D();
 		}
-		case RSE::GLOBAL_VAR_TYPE_MAT4: {
+		case RS::GLOBAL_VAR_TYPE_MAT4: {
 			return Projection();
 		}
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER2D: {
+		case RS::GLOBAL_VAR_TYPE_SAMPLER2D: {
 			return "";
 		}
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
+		case RS::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
 			return "";
 		}
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER3D: {
+		case RS::GLOBAL_VAR_TYPE_SAMPLER3D: {
 			return "";
 		}
-		case RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
+		case RS::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
 			return "";
 		}
-		case RSE::GLOBAL_VAR_TYPE_SAMPLEREXT: {
+		case RS::GLOBAL_VAR_TYPE_SAMPLEREXT: {
 			return "";
 		}
 		default: {
@@ -400,10 +397,10 @@ void ShaderGlobalsEditor::_variable_added() {
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 
-	Variant value = create_var(RSE::GlobalShaderParameterType(variable_type->get_selected()));
+	Variant value = create_var(RS::GlobalShaderParameterType(variable_type->get_selected()));
 
 	undo_redo->create_action(TTR("Add Shader Global Parameter"));
-	undo_redo->add_do_method(RS::get_singleton(), "global_shader_parameter_add", var, RSE::GlobalShaderParameterType(variable_type->get_selected()), value);
+	undo_redo->add_do_method(RS::get_singleton(), "global_shader_parameter_add", var, RS::GlobalShaderParameterType(variable_type->get_selected()), value);
 	undo_redo->add_undo_method(RS::get_singleton(), "global_shader_parameter_remove", var);
 	Dictionary gv;
 	gv["type"] = global_var_type_names[variable_type->get_selected()];
@@ -482,7 +479,7 @@ ShaderGlobalsEditor::ShaderGlobalsEditor() {
 	variable_type->set_h_size_flags(SIZE_EXPAND_FILL);
 	add_menu_hb->add_child(variable_type);
 
-	for (int i = 0; i < RSE::GLOBAL_VAR_TYPE_MAX; i++) {
+	for (int i = 0; i < RS::GLOBAL_VAR_TYPE_MAX; i++) {
 		variable_type->add_item(global_var_type_names[i]);
 	}
 
diff --git a/engine/editor/shader/text_shader_editor.cpp b/engine/editor/shader/text_shader_editor.cpp
index 0c51aeaf..34908f76 100644
--- a/engine/editor/shader/text_shader_editor.cpp
+++ b/engine/editor/shader/text_shader_editor.cpp
@@ -31,11 +31,6 @@
 #include "text_shader_editor.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -44,8 +39,6 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/split_container.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
 
@@ -268,15 +261,15 @@ void ShaderTextEditor::_load_theme_settings() {
 	List<String> built_ins;
 
 	if (shader_inc.is_valid()) {
-		for (int i = 0; i < RSE::SHADER_MAX; i++) {
-			for (const KeyValue<StringName, ShaderLanguage::FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(i))) {
+		for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+			for (const KeyValue<StringName, ShaderLanguage::FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(i))) {
 				for (const KeyValue<StringName, ShaderLanguage::BuiltInInfo> &F : E.value.built_ins) {
 					built_ins.push_back(F.key);
 				}
 			}
 
 			{
-				const Vector<ShaderLanguage::ModeInfo> &render_modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(i));
+				const Vector<ShaderLanguage::ModeInfo> &render_modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(i));
 
 				for (const ShaderLanguage::ModeInfo &mode_info : render_modes) {
 					if (!mode_info.options.is_empty()) {
@@ -290,7 +283,7 @@ void ShaderTextEditor::_load_theme_settings() {
 			}
 
 			{
-				const Vector<ShaderLanguage::ModeInfo> &stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(i));
+				const Vector<ShaderLanguage::ModeInfo> &stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(i));
 
 				for (const ShaderLanguage::ModeInfo &mode_info : stencil_modes) {
 					if (!mode_info.options.is_empty()) {
@@ -304,14 +297,14 @@ void ShaderTextEditor::_load_theme_settings() {
 			}
 		}
 	} else if (shader.is_valid()) {
-		for (const KeyValue<StringName, ShaderLanguage::FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(shader->get_mode()))) {
+		for (const KeyValue<StringName, ShaderLanguage::FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode()))) {
 			for (const KeyValue<StringName, ShaderLanguage::BuiltInInfo> &F : E.value.built_ins) {
 				built_ins.push_back(F.key);
 			}
 		}
 
 		{
-			const Vector<ShaderLanguage::ModeInfo> &shader_modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(shader->get_mode()));
+			const Vector<ShaderLanguage::ModeInfo> &shader_modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode()));
 
 			for (const ShaderLanguage::ModeInfo &mode_info : shader_modes) {
 				if (!mode_info.options.is_empty()) {
@@ -325,7 +318,7 @@ void ShaderTextEditor::_load_theme_settings() {
 		}
 
 		{
-			const Vector<ShaderLanguage::ModeInfo> &stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(shader->get_mode()));
+			const Vector<ShaderLanguage::ModeInfo> &stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(shader->get_mode()));
 
 			for (const ShaderLanguage::ModeInfo &mode_info : stencil_modes) {
 				if (!mode_info.options.is_empty()) {
@@ -386,8 +379,6 @@ void ShaderTextEditor::_check_shader_mode() {
 		mode = Shader::MODE_SKY;
 	} else if (type == "fog") {
 		mode = Shader::MODE_FOG;
-	} else if (type == "texture_blit") {
-		mode = Shader::MODE_TEXTURE_BLIT;
 	} else {
 		mode = Shader::MODE_SPATIAL;
 	}
@@ -401,7 +392,7 @@ void ShaderTextEditor::_check_shader_mode() {
 }
 
 static ShaderLanguage::DataType _get_global_shader_uniform_type(const StringName &p_variable) {
-	RSE::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(p_variable);
+	RS::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(p_variable);
 	return (ShaderLanguage::DataType)RS::global_shader_uniform_type_get_shader_datatype(gvt);
 }
 
@@ -467,9 +458,9 @@ void ShaderTextEditor::_code_complete_script(const String &p_code, List<ScriptLa
 		return;
 	}
 	_check_shader_mode();
-	comp_info.functions = ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(shader->get_mode()));
-	comp_info.render_modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(shader->get_mode()));
-	comp_info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(shader->get_mode()));
+	comp_info.functions = ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(shader->get_mode()));
+	comp_info.render_modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader->get_mode()));
+	comp_info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(shader->get_mode()));
 	comp_info.shader_types = ShaderTypes::get_singleton()->get_types();
 
 	sl.complete(code, comp_info, r_options, calltip);
@@ -585,9 +576,9 @@ void ShaderTextEditor::_validate_script() {
 			comp_info.is_include = true;
 		} else {
 			Shader::Mode mode = shader->get_mode();
-			comp_info.functions = ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(mode));
-			comp_info.render_modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(mode));
-			comp_info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(mode));
+			comp_info.functions = ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(mode));
+			comp_info.render_modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(mode));
+			comp_info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(mode));
 			comp_info.shader_types = ShaderTypes::get_singleton()->get_types();
 		}
 
@@ -795,9 +786,6 @@ void TextShaderEditor::_menu_option(int p_option) {
 		case EDIT_EMOJI_AND_SYMBOL: {
 			code_editor->get_text_editor()->show_emoji_and_symbol_picker();
 		} break;
-		case EDIT_JOIN_LINES: {
-			code_editor->get_text_editor()->join_lines();
-		} break;
 	}
 	if (p_option != SEARCH_FIND && p_option != SEARCH_REPLACE && p_option != SEARCH_GOTO_LINE) {
 		callable_mp((Control *)code_editor->get_text_editor(), &Control::grab_focus).call_deferred(false);
@@ -815,7 +803,7 @@ void TextShaderEditor::_notification(int p_what) {
 	switch (p_what) {
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
 			if (EditorThemeManager::is_generated_theme_outdated() ||
-					EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/fonts") ||
+					EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") ||
 					EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor")) {
 				_apply_editor_settings();
 			}
@@ -1166,7 +1154,7 @@ void TextShaderEditor::_bookmark_item_pressed(int p_idx) {
 
 void TextShaderEditor::_make_context_menu(bool p_selection, Vector2 p_position) {
 	context_menu->clear();
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
 		context_menu->add_item(TTR("Emoji & Symbols"), EDIT_EMOJI_AND_SYMBOL);
 		context_menu->add_separator();
 	}
@@ -1247,7 +1235,6 @@ TextShaderEditor::TextShaderEditor() {
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent"), EDIT_INDENT);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unindent"), EDIT_UNINDENT);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/delete_line"), EDIT_DELETE_LINE);
-	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/join_lines"), EDIT_JOIN_LINES);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_selection"), EDIT_DUPLICATE_SELECTION);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/duplicate_lines"), EDIT_DUPLICATE_LINES);
@@ -1327,7 +1314,6 @@ TextShaderEditor::TextShaderEditor() {
 
 	goto_line_popup = memnew(GotoLinePopup);
 	add_child(goto_line_popup);
-	code_editor->connect("show_goto_popup", callable_mp(this, &TextShaderEditor::_menu_option).bind(SEARCH_GOTO_LINE));
 
 	disk_changed = memnew(ConfirmationDialog);
 
diff --git a/engine/editor/shader/text_shader_editor.h b/engine/editor/shader/text_shader_editor.h
index b53ea903..80a6c83c 100644
--- a/engine/editor/shader/text_shader_editor.h
+++ b/engine/editor/shader/text_shader_editor.h
@@ -134,7 +134,6 @@ class TextShaderEditor : public ShaderEditor {
 		BOOKMARK_REMOVE_ALL,
 		HELP_DOCS,
 		EDIT_EMOJI_AND_SYMBOL,
-		EDIT_JOIN_LINES,
 	};
 
 	HBoxContainer *menu_bar_hbox = nullptr;
@@ -208,5 +207,7 @@ public:
 	void tag_saved_version();
 	ShaderTextEditor *get_code_editor() { return code_editor; }
 
+	virtual Size2 get_minimum_size() const override { return Size2(0, 200); }
+
 	TextShaderEditor();
 };
diff --git a/engine/editor/shader/text_shader_language_plugin.cpp b/engine/editor/shader/text_shader_language_plugin.cpp
index fef40edb..530e8ab8 100644
--- a/engine/editor/shader/text_shader_language_plugin.cpp
+++ b/engine/editor/shader/text_shader_language_plugin.cpp
@@ -30,8 +30,9 @@
 
 #include "text_shader_language_plugin.h"
 
+#include "text_shader_editor.h"
+
 #include "core/string/string_builder.h"
-#include "editor/shader/text_shader_editor.h"
 #include "servers/rendering/shader_types.h"
 
 bool TextShaderLanguagePlugin::handles_shader(const Ref<Shader> &p_shader) const {
@@ -124,13 +125,6 @@ void fog() {
 	// of the associated FogVolume. This means that froxels that just barely touch
 	// a given FogVolume will still be used.
 }
-)";
-			} break;
-			case Shader::MODE_TEXTURE_BLIT: {
-				code += R"(
-void blit() {
-	// Called for each pixel inside the given rect on the DrawableTexture.
-}
 )";
 			} break;
 			case Shader::MODE_MAX: {
diff --git a/engine/editor/shader/visual_shader_editor_plugin.cpp b/engine/editor/shader/visual_shader_editor_plugin.cpp
index b194b50d..1d48c998 100644
--- a/engine/editor/shader/visual_shader_editor_plugin.cpp
+++ b/engine/editor/shader/visual_shader_editor_plugin.cpp
@@ -31,14 +31,9 @@
 #include "visual_shader_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/math/math_defs.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/version_generated.gen.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
@@ -47,7 +42,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/gui/editor_toaster.h"
-#include "editor/gui/filter_line_edit.h"
+#include "editor/inspector/editor_properties.h"
 #include "editor/inspector/editor_properties_vector.h"
 #include "editor/scene/curve_editor_plugin.h"
 #include "editor/scene/material_editor_plugin.h"
@@ -68,18 +63,15 @@
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
-#include "scene/gui/texture_button.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
 #include "scene/resources/curve_texture.h"
-#include "scene/resources/sky.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/visual_shader_nodes.h"
 #include "scene/resources/visual_shader_particle_nodes.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
 
@@ -1739,10 +1731,6 @@ void VisualShaderEditor::_get_current_mode_limits(int &r_begin_type, int &r_end_
 		} break;
 		case Shader::MODE_FOG: {
 			r_begin_type = VisualShader::TYPE_FOG;
-			r_end_type = VisualShader::TYPE_TEXTURE_BLIT;
-		} break;
-		case Shader::MODE_TEXTURE_BLIT: {
-			r_begin_type = VisualShader::TYPE_TEXTURE_BLIT;
 			r_end_type = VisualShader::TYPE_MAX;
 		} break;
 		default: {
@@ -2481,7 +2469,6 @@ void VisualShaderEditor::_set_mode(int p_which) {
 		edit_type_particles->set_visible(false);
 		edit_type_sky->set_visible(true);
 		edit_type_fog->set_visible(false);
-		edit_type_texture_blit->set_visible(false);
 		edit_type = edit_type_sky;
 		custom_mode_box->set_visible(false);
 		varying_button->hide();
@@ -2491,7 +2478,6 @@ void VisualShaderEditor::_set_mode(int p_which) {
 		edit_type_particles->set_visible(false);
 		edit_type_sky->set_visible(false);
 		edit_type_fog->set_visible(true);
-		edit_type_texture_blit->set_visible(false);
 		edit_type = edit_type_fog;
 		custom_mode_box->set_visible(false);
 		varying_button->hide();
@@ -2501,7 +2487,6 @@ void VisualShaderEditor::_set_mode(int p_which) {
 		edit_type_particles->set_visible(true);
 		edit_type_sky->set_visible(false);
 		edit_type_fog->set_visible(false);
-		edit_type_texture_blit->set_visible(false);
 		edit_type = edit_type_particles;
 		if ((edit_type->get_selected() + 3) > VisualShader::TYPE_PROCESS) {
 			custom_mode_box->set_visible(false);
@@ -2510,26 +2495,11 @@ void VisualShaderEditor::_set_mode(int p_which) {
 		}
 		varying_button->hide();
 		mode = MODE_FLAGS_PARTICLES;
-	} else if (p_which == VisualShader::MODE_TEXTURE_BLIT) {
-		edit_type_standard->set_visible(false);
-		edit_type_particles->set_visible(false);
-		edit_type_sky->set_visible(false);
-		edit_type_fog->set_visible(false);
-		edit_type_texture_blit->set_visible(true);
-		edit_type = edit_type_texture_blit;
-		if ((edit_type->get_selected() + 3) > VisualShader::TYPE_PROCESS) {
-			custom_mode_box->set_visible(false);
-		} else {
-			custom_mode_box->set_visible(true);
-		}
-		varying_button->hide();
-		mode = MODE_FLAGS_TEXTURE_BLIT;
 	} else {
 		edit_type_particles->set_visible(false);
 		edit_type_standard->set_visible(true);
 		edit_type_sky->set_visible(false);
 		edit_type_fog->set_visible(false);
-		edit_type_texture_blit->set_visible(false);
 		edit_type = edit_type_standard;
 		custom_mode_box->set_visible(false);
 		varying_button->show();
@@ -2548,9 +2518,6 @@ void VisualShaderEditor::_set_mode(int p_which) {
 		upper_type = VisualShader::TYPE_FOG;
 	} else if (mode & MODE_FLAGS_FOG) {
 		default_type = VisualShader::TYPE_FOG;
-		upper_type = VisualShader::TYPE_TEXTURE_BLIT;
-	} else if (mode & MODE_FLAGS_TEXTURE_BLIT) {
-		default_type = VisualShader::TYPE_TEXTURE_BLIT;
 		upper_type = VisualShader::TYPE_MAX;
 	}
 
@@ -2568,6 +2535,10 @@ void VisualShaderEditor::_set_mode(int p_which) {
 	set_current_shader_type((VisualShader::Type)saved_type);
 }
 
+Size2 VisualShaderEditor::get_minimum_size() const {
+	return Size2(10, 200);
+}
+
 void VisualShaderEditor::update_toggle_files_button() {
 	ERR_FAIL_NULL(toggle_files_list);
 	bool forward = toggle_files_list->is_visible() == is_layout_rtl();
@@ -3407,7 +3378,6 @@ void VisualShaderEditor::_edit_port_default_input(Object *p_button, int p_node,
 	// TODO: Define these properties with actual PropertyInfo and feed it to the property editor widget.
 	property_editor = EditorInspector::instantiate_property_editor(edited_property_holder.ptr(), value.get_type(), "edited_property", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE, true);
 	ERR_FAIL_NULL_MSG(property_editor, "Failed to create property editor for type: " + Variant::get_type_name(value.get_type()));
-	property_editor->set_deferred_drag_mode_enabled();
 
 	// Determine the best size for the popup based on the property type.
 	// This is done here, since the property editors are also used in the inspector where they have different layout requirements, so we can't just change their default minimum size.
@@ -5203,6 +5173,17 @@ void VisualShaderEditor::_show_remove_varying_dialog() {
 	remove_varying_dialog->set_position(remove_varying_dialog->get_position() - difference);
 }
 
+void VisualShaderEditor::_sbox_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the tree.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			members->gui_input(key);
+			node_filter->accept_event();
+		}
+	}
+}
+
 void VisualShaderEditor::_param_filter_changed(const String &p_text) {
 	param_filter_name = p_text;
 
@@ -5295,6 +5276,8 @@ void VisualShaderEditor::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
+			node_filter->set_clear_button_enabled(true);
+
 			// collapse tree by default
 
 			TreeItem *category = members->get_root()->get_first_child();
@@ -5317,6 +5300,7 @@ void VisualShaderEditor::_notification(int p_what) {
 			highend_label->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
 
 			param_filter->set_right_icon(Control::get_editor_theme_icon(SNAME("Search")));
+			node_filter->set_right_icon(Control::get_editor_theme_icon(SNAME("Search")));
 
 			code_preview_button->set_button_icon(Control::get_editor_theme_icon(SNAME("Shader")));
 			shader_preview_button->set_button_icon(Control::get_editor_theme_icon(SNAME("SubViewport")));
@@ -5699,8 +5683,6 @@ void VisualShaderEditor::_type_selected(int p_id) {
 		offset = VisualShader::TYPE_SKY;
 	} else if (mode & MODE_FLAGS_FOG) {
 		offset = VisualShader::TYPE_FOG;
-	} else if (mode & MODE_FLAGS_TEXTURE_BLIT) {
-		offset = VisualShader::TYPE_TEXTURE_BLIT;
 	}
 
 	set_current_shader_type(VisualShader::Type(p_id + offset));
@@ -6390,7 +6372,7 @@ void VisualShaderEditor::_preview_close_requested() {
 }
 
 static ShaderLanguage::DataType _visual_shader_editor_get_global_shader_uniform_type(const StringName &p_variable) {
-	RSE::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(p_variable);
+	RS::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(p_variable);
 	return (ShaderLanguage::DataType)RS::global_shader_uniform_type_get_shader_datatype(gvt);
 }
 
@@ -6405,9 +6387,9 @@ void VisualShaderEditor::_update_preview() {
 	preview_text->set_text(code);
 
 	ShaderLanguage::ShaderCompileInfo info;
-	info.functions = ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(visual_shader->get_mode()));
-	info.render_modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(visual_shader->get_mode()));
-	info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(visual_shader->get_mode()));
+	info.functions = ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(visual_shader->get_mode()));
+	info.render_modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(visual_shader->get_mode()));
+	info.stencil_modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(visual_shader->get_mode()));
 	info.shader_types = ShaderTypes::get_singleton()->get_types();
 	info.global_shader_uniform_type_func = _visual_shader_editor_get_global_shader_uniform_type;
 
@@ -6708,11 +6690,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	edit_type_fog->select(0);
 	edit_type_fog->connect(SceneStringName(item_selected), callable_mp(this, &VisualShaderEditor::_type_selected));
 
-	edit_type_texture_blit = memnew(OptionButton);
-	edit_type_texture_blit->add_item(TTR("Blit"));
-	edit_type_texture_blit->select(0);
-	edit_type_texture_blit->connect(SceneStringName(item_selected), callable_mp(this, &VisualShaderEditor::_type_selected));
-
 	edit_type = edit_type_standard;
 
 	toolbar_hflow->add_child(custom_mode_box);
@@ -6725,8 +6702,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	toolbar_hflow->move_child(edit_type_sky, 0);
 	toolbar_hflow->add_child(edit_type_fog);
 	toolbar_hflow->move_child(edit_type_fog, 0);
-	toolbar_hflow->add_child(edit_type_texture_blit);
-	toolbar_hflow->move_child(edit_type_texture_blit, 0);
 
 	add_node = memnew(Button);
 	add_node->set_theme_type_variation(SceneStringName(FlatButton));
@@ -6933,9 +6908,10 @@ VisualShaderEditor::VisualShaderEditor() {
 	HBoxContainer *filter_hb = memnew(HBoxContainer);
 	members_vb->add_child(filter_hb);
 
-	node_filter = memnew(FilterLineEdit);
+	node_filter = memnew(LineEdit);
 	filter_hb->add_child(node_filter);
 	node_filter->connect(SceneStringName(text_changed), callable_mp(this, &VisualShaderEditor::_member_filter_changed));
+	node_filter->connect(SceneStringName(gui_input), callable_mp(this, &VisualShaderEditor::_sbox_input));
 	node_filter->set_h_size_flags(SIZE_EXPAND_FILL);
 	node_filter->set_placeholder(TTR("Search"));
 
@@ -6947,7 +6923,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	tools->get_popup()->add_item(TTR("Collapse All"), COLLAPSE_ALL);
 
 	members = memnew(Tree);
-	node_filter->set_forward_control(members);
 	members_vb->add_child(members);
 	SET_DRAG_FORWARDING_GCD(members, VisualShaderEditor);
 	members->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // TODO: Implement proper translation switch.
@@ -7175,7 +7150,6 @@ VisualShaderEditor::VisualShaderEditor() {
 
 	add_options.push_back(AddOption("ClipSpaceFar", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "clip_space_far", "CLIP_SPACE_FAR"), { "clip_space_far" }, VisualShaderNode::PORT_TYPE_SCALAR, -1, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("Exposure", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "exposure", "EXPOSURE"), { "exposure" }, VisualShaderNode::PORT_TYPE_SCALAR, -1, Shader::MODE_SPATIAL));
-	add_options.push_back(AddOption("InShadowPass", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "in_shadow_pass", "IN_SHADOW_PASS"), { "in_shadow_pass" }, VisualShaderNode::PORT_TYPE_BOOLEAN, -1, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("InvProjectionMatrix", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "inv_projection_matrix", "INV_PROJECTION_MATRIX"), { "inv_projection_matrix" }, VisualShaderNode::PORT_TYPE_TRANSFORM, -1, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("InvViewMatrix", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "inv_view_matrix", "INV_VIEW_MATRIX"), { "inv_view_matrix" }, VisualShaderNode::PORT_TYPE_TRANSFORM, -1, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("ModelMatrix", "Input/All", "VisualShaderNodeInput", vformat(input_param_shader_modes, "model_matrix", "MODEL_MATRIX"), { "model_matrix" }, VisualShaderNode::PORT_TYPE_TRANSFORM, -1, Shader::MODE_SPATIAL));
@@ -7221,7 +7195,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	const String input_param_for_fragment_shader_mode = TTR("'%s' input parameter for fragment shader mode.") + translation_gdsl;
 	const String input_param_for_sky_shader_mode = TTR("'%s' input parameter for sky shader mode.") + translation_gdsl;
 	const String input_param_for_fog_shader_mode = TTR("'%s' input parameter for fog shader mode.") + translation_gdsl;
-	const String input_param_for_texture_blit_shader_mode = TTR("'%s' input parameter for blit shader mode.") + translation_gdsl;
 	const String input_param_for_light_shader_mode = TTR("'%s' input parameter for light shader mode.") + translation_gdsl;
 	const String input_param_for_vertex_shader_mode = TTR("'%s' input parameter for vertex shader mode.") + translation_gdsl;
 	const String input_param_for_start_shader_mode = TTR("'%s' input parameter for start shader mode.") + translation_gdsl;
@@ -7287,7 +7260,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	add_options.push_back(AddOption("Roughness", "Input/Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "roughness", "ROUGHNESS"), { "roughness" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("ScreenUV", "Input/Light", "VisualShaderNodeInput", vformat(input_param_for_fragment_and_light_shader_modes, "screen_uv", "SCREEN_UV"), { "screen_uv" }, VisualShaderNode::PORT_TYPE_VECTOR_2D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("Specular", "Input/Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "specular", "SPECULAR_LIGHT"), { "specular" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
-	add_options.push_back(AddOption("SpecularAmount", "Input/Light", "VisualShaderNodeInput", vformat(input_param_for_light_shader_mode, "specular_amount", "SPECULAR_AMOUNT"), { "specular_amount" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
 	add_options.push_back(AddOption("View", "Input/Light", "VisualShaderNodeInput", vformat(input_param_for_fragment_and_light_shader_modes, "view", "VIEW"), { "view" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_LIGHT, Shader::MODE_SPATIAL));
 
 	// CANVASITEM INPUTS
@@ -7371,15 +7343,6 @@ VisualShaderEditor::VisualShaderEditor() {
 	add_options.push_back(AddOption("UVW", "Input/Fog", "VisualShaderNodeInput", vformat(input_param_for_fog_shader_mode, "uvw", "UVW"), { "uvw" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FOG, Shader::MODE_FOG));
 	add_options.push_back(AddOption("WorldPosition", "Input/Fog", "VisualShaderNodeInput", vformat(input_param_for_fog_shader_mode, "world_position", "WORLD_POSITION"), { "world_position" }, VisualShaderNode::PORT_TYPE_VECTOR_3D, TYPE_FLAGS_FOG, Shader::MODE_FOG));
 
-	// TEXTURE BLIT INPUTS
-	add_options.push_back(AddOption("UV", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "uv", "UV"), { "uv" }, VisualShaderNode::PORT_TYPE_VECTOR_2D, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Modulate", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Modulate", "MODULATE"), { "Modulate" }, VisualShaderNode::PORT_TYPE_VECTOR_4D, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Fragcoord", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Fragcoord", "FRAGCOORD"), { "Fragcoord" }, VisualShaderNode::PORT_TYPE_VECTOR_4D, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Source Texture", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Source Texture", "source_texture0"), { "Source Texture" }, VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Source Texture 2", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Source Texture 2", "source_texture1"), { "Source Texture 2" }, VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Source Texture 3", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Source Texture 3", "source_texture2"), { "Source Texture 3" }, VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-	add_options.push_back(AddOption("Source Texture 4", "Input/Texture_blit", "VisualShaderNodeInput", vformat(input_param_for_texture_blit_shader_mode, "Source Texture 4", "source_texture3"), { "Source Texture 4" }, VisualShaderNode::PORT_TYPE_SAMPLER, TYPE_FLAGS_BLIT, Shader::MODE_TEXTURE_BLIT));
-
 	// PARTICLES INPUTS
 
 	add_options.push_back(AddOption("CollisionDepth", "Input/Collide", "VisualShaderNodeInput", vformat(input_param_for_collide_shader_mode, "collision_depth", "COLLISION_DEPTH"), { "collision_depth" }, VisualShaderNode::PORT_TYPE_SCALAR, TYPE_FLAGS_COLLIDE, Shader::MODE_PARTICLES));
@@ -8240,7 +8203,6 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
 		if (!prop) {
 			return nullptr;
 		}
-		prop->set_deferred_drag_mode_enabled();
 
 		if (Object::cast_to<EditorPropertyResource>(prop)) {
 			Object::cast_to<EditorPropertyResource>(prop)->set_use_sub_inspector(false);
@@ -8328,7 +8290,7 @@ void EditorPropertyVisualShaderMode::_option_selected(int p_which) {
 	}
 
 	//4. delete varyings (if needed)
-	if (p_which == VisualShader::MODE_PARTICLES || p_which == VisualShader::MODE_SKY || p_which == VisualShader::MODE_FOG || p_which == VisualShader::MODE_TEXTURE_BLIT) {
+	if (p_which == VisualShader::MODE_PARTICLES || p_which == VisualShader::MODE_SKY || p_which == VisualShader::MODE_FOG) {
 		int var_count = visual_shader->get_varyings_count();
 
 		if (var_count > 0) {
diff --git a/engine/editor/shader/visual_shader_editor_plugin.h b/engine/editor/shader/visual_shader_editor_plugin.h
index a094714a..3854315c 100644
--- a/engine/editor/shader/visual_shader_editor_plugin.h
+++ b/engine/editor/shader/visual_shader_editor_plugin.h
@@ -35,14 +35,12 @@
 #include "editor/plugins/editor_resource_conversion_plugin.h"
 #include "editor/shader/shader_editor.h"
 #include "scene/gui/graph_edit.h"
-#include "scene/resources/material.h"
 #include "scene/resources/syntax_highlighter.h"
 #include "scene/resources/visual_shader.h"
 
 class CodeEdit;
 class ColorPicker;
 class CurveEditor;
-class FilterLineEdit;
 class GraphElement;
 class GraphFrame;
 class HFlowContainer;
@@ -234,7 +232,6 @@ class VisualShaderEditor : public ShaderEditor {
 	OptionButton *edit_type_particles = nullptr;
 	OptionButton *edit_type_sky = nullptr;
 	OptionButton *edit_type_fog = nullptr;
-	OptionButton *edit_type_texture_blit = nullptr;
 	CheckBox *custom_mode_box = nullptr;
 	bool custom_mode_enabled = false;
 
@@ -300,7 +297,6 @@ class VisualShaderEditor : public ShaderEditor {
 		MODE_FLAGS_SKY = 2,
 		MODE_FLAGS_PARTICLES = 4,
 		MODE_FLAGS_FOG = 8,
-		MODE_FLAGS_TEXTURE_BLIT = 16,
 	};
 
 	int mode = MODE_FLAGS_SPATIAL_CANVASITEM;
@@ -328,10 +324,6 @@ class VisualShaderEditor : public ShaderEditor {
 		TYPE_FLAGS_FOG = 1,
 	};
 
-	enum TextureBlitTypeFlags {
-		TYPE_FLAGS_BLIT = 1,
-	};
-
 	enum ToolsMenuOptions {
 		EXPAND_ALL,
 		COLLAPSE_ALL
@@ -376,7 +368,7 @@ class VisualShaderEditor : public ShaderEditor {
 
 	Tree *members = nullptr;
 	AcceptDialog *alert = nullptr;
-	FilterLineEdit *node_filter = nullptr;
+	LineEdit *node_filter = nullptr;
 	RichTextLabel *node_desc = nullptr;
 	Label *highend_label = nullptr;
 
@@ -606,6 +598,7 @@ class VisualShaderEditor : public ShaderEditor {
 	void _graph_gui_input(const Ref<InputEvent> &p_event);
 
 	void _member_filter_changed(const String &p_text);
+	void _sbox_input(const Ref<InputEvent> &p_event);
 	void _member_selected();
 	void _member_create();
 	void _member_cancel();
@@ -684,6 +677,7 @@ public:
 	Dictionary get_custom_node_data(Ref<VisualShaderNodeCustom> &p_custom_node);
 	void update_custom_type(const Ref<Resource> &p_resource);
 
+	virtual Size2 get_minimum_size() const override;
 	virtual void update_toggle_files_button() override;
 
 	Ref<VisualShader> get_visual_shader() const { return visual_shader; }
diff --git a/engine/editor/shader/visual_shader_language_plugin.cpp b/engine/editor/shader/visual_shader_language_plugin.cpp
index 7283fc56..2d4d8697 100644
--- a/engine/editor/shader/visual_shader_language_plugin.cpp
+++ b/engine/editor/shader/visual_shader_language_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "visual_shader_language_plugin.h"
 
-#include "editor/shader/visual_shader_editor_plugin.h"
+#include "visual_shader_editor_plugin.h"
 
 bool VisualShaderLanguagePlugin::handles_shader(const Ref<Shader> &p_shader) const {
 	return Object::cast_to<VisualShader>(p_shader.ptr()) != nullptr;
diff --git a/engine/editor/template_builders.py b/engine/editor/template_builders.py
index 54a52467..4dbe0378 100644
--- a/engine/editor/template_builders.py
+++ b/engine/editor/template_builders.py
@@ -62,8 +62,8 @@ def make_templates(target, source, env):
 
     with methods.generated_wrapper(str(target[0])) as file:
         file.write(f"""\
+#include "core/object/object.h"
 #include "core/object/script_language.h"
-#include "core/string/ustring.h"
 
 inline constexpr int TEMPLATES_ARRAY_SIZE = {len(parsed_templates)};
 static const struct ScriptLanguage::ScriptTemplate TEMPLATES[TEMPLATES_ARRAY_SIZE] = {{
diff --git a/engine/editor/themes/editor_color_map.cpp b/engine/editor/themes/editor_color_map.cpp
index 8831d8c1..c7ee2465 100644
--- a/engine/editor/themes/editor_color_map.cpp
+++ b/engine/editor/themes/editor_color_map.cpp
@@ -218,8 +218,6 @@ void EditorColorMap::create() {
 	add_conversion_exception("GuiGraphNodePort");
 	add_conversion_exception("GuiResizer");
 	add_conversion_exception("GuiMiniCheckerboard");
-	add_conversion_exception("PickerCursorBg");
-	add_conversion_exception("CenterView");
 
 	/// Code Editor.
 	add_conversion_exception("GuiTab");
diff --git a/engine/editor/themes/editor_fonts.cpp b/engine/editor/themes/editor_fonts.cpp
index eb4f7bd0..feee4423 100644
--- a/engine/editor/themes/editor_fonts.cpp
+++ b/engine/editor/themes/editor_fonts.cpp
@@ -115,11 +115,11 @@ Ref<FontVariation> make_bold_font(const Ref<Font> &p_font, double p_embolden, Ty
 void editor_register_fonts(const Ref<Theme> &p_theme) {
 	Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 
-	TextServer::FontAntialiasing font_antialiasing = (TextServer::FontAntialiasing)(int)EDITOR_GET("interface/editor/fonts/font_antialiasing");
-	int font_hinting_setting = (int)EDITOR_GET("interface/editor/fonts/font_hinting");
-	TextServer::SubpixelPositioning font_subpixel_positioning = (TextServer::SubpixelPositioning)(int)EDITOR_GET("interface/editor/fonts/font_subpixel_positioning");
-	bool font_disable_embedded_bitmaps = (bool)EDITOR_GET("interface/editor/fonts/font_disable_embedded_bitmaps");
-	bool font_allow_msdf = (bool)EDITOR_GET("interface/editor/fonts/font_allow_msdf");
+	TextServer::FontAntialiasing font_antialiasing = (TextServer::FontAntialiasing)(int)EDITOR_GET("interface/editor/font_antialiasing");
+	int font_hinting_setting = (int)EDITOR_GET("interface/editor/font_hinting");
+	TextServer::SubpixelPositioning font_subpixel_positioning = (TextServer::SubpixelPositioning)(int)EDITOR_GET("interface/editor/font_subpixel_positioning");
+	bool font_disable_embedded_bitmaps = (bool)EDITOR_GET("interface/editor/font_disable_embedded_bitmaps");
+	bool font_allow_msdf = (bool)EDITOR_GET("interface/editor/font_allow_msdf");
 
 	TextServer::Hinting font_hinting;
 	TextServer::Hinting font_mono_hinting;
@@ -152,7 +152,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	}
 
 	// Load built-in fonts.
-	const int default_font_size = int(EDITOR_GET("interface/editor/fonts/main_font_size")) * EDSCALE;
+	const int default_font_size = int(EDITOR_GET("interface/editor/main_font_size")) * EDSCALE;
 	const float embolden_strength = 0.6;
 
 	Ref<Font> default_font = load_internal_font(_font_Inter_Regular, _font_Inter_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false);
@@ -198,13 +198,13 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 
 	TypedArray<Font> fallbacks;
 	Ref<FontFile> arabic_font = load_internal_font(_font_Vazirmatn_Regular, _font_Vazirmatn_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
-	Ref<FontFile> bengali_font = load_internal_font(_font_NotoSansBengali_Regular, _font_NotoSansBengali_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
-	Ref<FontFile> devanagari_font = load_internal_font(_font_NotoSansDevanagari_Regular, _font_NotoSansDevanagari_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
+	Ref<FontFile> bengali_font = load_internal_font(_font_NotoSansBengaliUI_Regular, _font_NotoSansBengaliUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
+	Ref<FontFile> devanagari_font = load_internal_font(_font_NotoSansDevanagariUI_Regular, _font_NotoSansDevanagariUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> georgian_font = load_internal_font(_font_NotoSansGeorgian_Regular, _font_NotoSansGeorgian_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> hebrew_font = load_internal_font(_font_NotoSansHebrew_Regular, _font_NotoSansHebrew_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> malayalam_font = load_internal_font(_font_NotoSansMalayalamUI_Regular, _font_NotoSansMalayalamUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> oriya_font = load_internal_font(_font_NotoSansOriya_Regular, _font_NotoSansOriya_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
-	Ref<FontFile> sinhala_font = load_internal_font(_font_NotoSansSinhala_Regular, _font_NotoSansSinhala_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
+	Ref<FontFile> sinhala_font = load_internal_font(_font_NotoSansSinhalaUI_Regular, _font_NotoSansSinhalaUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> tamil_font = load_internal_font(_font_NotoSansTamilUI_Regular, _font_NotoSansTamilUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> telugu_font = load_internal_font(_font_NotoSansTeluguUI_Regular, _font_NotoSansTeluguUI_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
 	Ref<FontFile> thai_font = load_internal_font(_font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks);
@@ -229,13 +229,13 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 
 	TypedArray<Font> fallbacks_bold;
 	Ref<FontFile> arabic_font_bold = load_internal_font(_font_Vazirmatn_Bold, _font_Vazirmatn_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
-	Ref<FontFile> bengali_font_bold = load_internal_font(_font_NotoSansBengali_Bold, _font_NotoSansBengali_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
-	Ref<FontFile> devanagari_font_bold = load_internal_font(_font_NotoSansDevanagari_Bold, _font_NotoSansDevanagari_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
+	Ref<FontFile> bengali_font_bold = load_internal_font(_font_NotoSansBengaliUI_Bold, _font_NotoSansBengaliUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
+	Ref<FontFile> devanagari_font_bold = load_internal_font(_font_NotoSansDevanagariUI_Bold, _font_NotoSansDevanagariUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> georgian_font_bold = load_internal_font(_font_NotoSansGeorgian_Bold, _font_NotoSansGeorgian_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> hebrew_font_bold = load_internal_font(_font_NotoSansHebrew_Bold, _font_NotoSansHebrew_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> malayalam_font_bold = load_internal_font(_font_NotoSansMalayalamUI_Bold, _font_NotoSansMalayalamUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> oriya_font_bold = load_internal_font(_font_NotoSansOriya_Bold, _font_NotoSansOriya_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
-	Ref<FontFile> sinhala_font_bold = load_internal_font(_font_NotoSansSinhala_Bold, _font_NotoSansSinhala_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
+	Ref<FontFile> sinhala_font_bold = load_internal_font(_font_NotoSansSinhalaUI_Bold, _font_NotoSansSinhalaUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> tamil_font_bold = load_internal_font(_font_NotoSansTamilUI_Bold, _font_NotoSansTamilUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> telugu_font_bold = load_internal_font(_font_NotoSansTeluguUI_Bold, _font_NotoSansTeluguUI_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
 	Ref<FontFile> thai_font_bold = load_internal_font(_font_NotoSansThai_Bold, _font_NotoSansThai_Bold_size, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false, &fallbacks_bold);
@@ -266,9 +266,9 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	default_font_mono->set_fallbacks(fallbacks);
 
 	// Init base font configs and load custom fonts.
-	String custom_font_path = EDITOR_GET("interface/editor/fonts/main_font");
-	String custom_font_path_bold = EDITOR_GET("interface/editor/fonts/main_font_bold");
-	String custom_font_path_source = EDITOR_GET("interface/editor/fonts/code_font");
+	String custom_font_path = EDITOR_GET("interface/editor/main_font");
+	String custom_font_path_bold = EDITOR_GET("interface/editor/main_font_bold");
+	String custom_font_path_source = EDITOR_GET("interface/editor/code_font");
 
 	Ref<FontVariation> default_fc;
 	default_fc.instantiate();
@@ -280,7 +280,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 		}
 		default_fc->set_base_font(custom_font);
 	} else {
-		EditorSettings::get_singleton()->set_manually("interface/editor/fonts/main_font", "");
+		EditorSettings::get_singleton()->set_manually("interface/editor/main_font", "");
 		default_fc->set_opentype_features(default_features);
 		default_fc->set_base_font(default_font);
 	}
@@ -300,7 +300,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 		}
 		default_fc_msdf->set_base_font(custom_font);
 	} else {
-		EditorSettings::get_singleton()->set_manually("interface/editor/fonts/main_font", "");
+		EditorSettings::get_singleton()->set_manually("interface/editor/main_font", "");
 		default_fc_msdf->set_opentype_features(default_features);
 		default_fc_msdf->set_base_font(default_font_msdf);
 	}
@@ -328,7 +328,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 			bold_fc->set_variation_embolden(embolden_strength);
 		}
 	} else {
-		EditorSettings::get_singleton()->set_manually("interface/editor/fonts/main_font_bold", "");
+		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		bold_fc->set_opentype_features(default_features);
 		bold_fc->set_base_font(default_font_bold);
 	}
@@ -358,7 +358,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 			bold_fc_msdf->set_variation_embolden(embolden_strength);
 		}
 	} else {
-		EditorSettings::get_singleton()->set_manually("interface/editor/fonts/main_font_bold", "");
+		EditorSettings::get_singleton()->set_manually("interface/editor/main_font_bold", "");
 		bold_fc_msdf->set_opentype_features(default_features);
 		bold_fc_msdf->set_base_font(default_font_bold_msdf);
 	}
@@ -366,8 +366,8 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	bold_fc_msdf->set_spacing(TextServer::SPACING_BOTTOM, -EDSCALE);
 	bold_fc_msdf->set_variation_opentype(bold_fc_opentype);
 
-	if (!String(EDITOR_GET("interface/editor/fonts/main_font_custom_opentype_features")).is_empty()) {
-		Vector<String> subtag = String(EDITOR_GET("interface/editor/fonts/main_font_custom_opentype_features")).split(",");
+	if (!String(EDITOR_GET("interface/editor/main_font_custom_opentype_features")).is_empty()) {
+		Vector<String> subtag = String(EDITOR_GET("interface/editor/main_font_custom_opentype_features")).split(",");
 		if (!subtag.is_empty()) {
 			Dictionary ftrs;
 			for (int i = 0; i < subtag.size(); i++) {
@@ -395,7 +395,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 		}
 		mono_fc->set_base_font(custom_font);
 	} else {
-		EditorSettings::get_singleton()->set_manually("interface/editor/fonts/code_font", "");
+		EditorSettings::get_singleton()->set_manually("interface/editor/code_font", "");
 		mono_fc->set_base_font(default_font_mono);
 	}
 	mono_fc->set_spacing(TextServer::SPACING_TOP, -EDSCALE);
@@ -404,7 +404,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	Ref<FontVariation> mono_other_fc = mono_fc->duplicate();
 
 	// Enable contextual alternates (coding ligatures) and custom features for the source editor font.
-	int ot_mode = EDITOR_GET("interface/editor/fonts/code_font_contextual_ligatures");
+	int ot_mode = EDITOR_GET("interface/editor/code_font_contextual_ligatures");
 	switch (ot_mode) {
 		case 1: { // Disable ligatures.
 			Dictionary ftrs;
@@ -412,7 +412,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 			mono_fc->set_opentype_features(ftrs);
 		} break;
 		case 2: { // Custom.
-			Vector<String> subtag = String(EDITOR_GET("interface/editor/fonts/code_font_custom_opentype_features")).split(",");
+			Vector<String> subtag = String(EDITOR_GET("interface/editor/code_font_custom_opentype_features")).split(",");
 			Dictionary ftrs;
 			for (int i = 0; i < subtag.size(); i++) {
 				Vector<String> subtag_a = subtag[i].split("=");
@@ -431,20 +431,6 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 		} break;
 	}
 
-	Vector<String> variation_tags = String(EDITOR_GET("interface/editor/fonts/code_font_custom_variations")).split(",");
-	Dictionary variations_mono;
-	for (int i = 0; i < variation_tags.size(); i++) {
-		Vector<String> subtag_a = variation_tags[i].split("=");
-		if (subtag_a.size() == 2) {
-			variations_mono[TS->name_to_tag(subtag_a[0])] = subtag_a[1].to_float();
-		} else if (subtag_a.size() == 1) {
-			variations_mono[TS->name_to_tag(subtag_a[0])] = 1;
-		}
-	}
-	if (!variations_mono.is_empty()) {
-		mono_fc->set_variation_opentype(variations_mono);
-	}
-
 	{
 		// Disable contextual alternates (coding ligatures).
 		Dictionary ftrs;
@@ -545,10 +531,10 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	p_theme->set_font("rotation_control", EditorStringName(EditorFonts), default_fc);
 
 	// Code font
-	p_theme->set_font_size("source_size", EditorStringName(EditorFonts), int(EDITOR_GET("interface/editor/fonts/code_font_size")) * EDSCALE);
+	p_theme->set_font_size("source_size", EditorStringName(EditorFonts), int(EDITOR_GET("interface/editor/code_font_size")) * EDSCALE);
 	p_theme->set_font("source", EditorStringName(EditorFonts), mono_fc);
 
-	p_theme->set_font_size("expression_size", EditorStringName(EditorFonts), (int(EDITOR_GET("interface/editor/fonts/code_font_size")) - 1) * EDSCALE);
+	p_theme->set_font_size("expression_size", EditorStringName(EditorFonts), (int(EDITOR_GET("interface/editor/code_font_size")) - 1) * EDSCALE);
 	p_theme->set_font("expression", EditorStringName(EditorFonts), mono_other_fc);
 
 	p_theme->set_font_size("output_source_size", EditorStringName(EditorFonts), int(EDITOR_GET("run/output/font_size")) * EDSCALE);
diff --git a/engine/editor/themes/editor_icons.cpp b/engine/editor/themes/editor_icons.cpp
index 66e406aa..33ad89b9 100644
--- a/engine/editor/themes/editor_icons.cpp
+++ b/engine/editor/themes/editor_icons.cpp
@@ -35,6 +35,7 @@
 #include "editor/themes/editor_icons.gen.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/dpi_texture.h"
+#include "scene/resources/image_texture.h"
 
 #include "modules/svg/image_loader_svg.h"
 
@@ -104,7 +105,7 @@ void editor_register_icons(const Ref<Theme> &p_theme, bool p_dark_theme, float p
 	Dictionary color_conversion_map = p_dark_theme ? color_conversion_map_dark : color_conversion_map_light;
 
 	// The names of the icons to exclude from the standard color conversion.
-	HashSet<StringName> conversion_exceptions(EditorColorMap::get_color_conversion_exceptions());
+	HashSet<StringName> conversion_exceptions = EditorColorMap::get_color_conversion_exceptions();
 
 	// The names of the icons to exclude when adjusting for saturation.
 	HashSet<StringName> saturation_exceptions;
diff --git a/engine/editor/themes/editor_theme_manager.cpp b/engine/editor/themes/editor_theme_manager.cpp
index ff04e1bd..2f035d6b 100644
--- a/engine/editor/themes/editor_theme_manager.cpp
+++ b/engine/editor/themes/editor_theme_manager.cpp
@@ -32,8 +32,6 @@
 
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
@@ -267,7 +265,7 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
 	config.enable_touch_optimizations = EDITOR_GET("interface/touchscreen/enable_touch_optimizations");
 	config.gizmo_handle_scale = EDITOR_GET("interface/touchscreen/scale_gizmo_handles");
 	config.subresource_hue_tint = EDITOR_GET("docks/property_editor/subresource_hue_tint");
-	config.dragging_hover_wait_msec = (float)EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds") * 1000;
+	config.dragging_hover_wait_msec = (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000;
 
 	// Handle theme style.
 	if (config.preset != "Custom") {
@@ -717,8 +715,9 @@ bool EditorThemeManager::is_generated_theme_outdated() {
 	if (outdated_cache_dirty) {
 		// TODO: We can use this information more intelligently to do partial theme updates and speed things up.
 		outdated_cache = EditorSettings::get_singleton()->check_changed_settings_in_group("interface/theme") ||
-				EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/fonts") ||
-				EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen/enable_touch_optimizations") ||
+				EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/font") ||
+				EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/main_font") ||
+				EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/code_font") ||
 				EditorSettings::get_singleton()->check_changed_settings_in_group("editors/visual_editors") ||
 				EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/theme") ||
 				EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/help/help") ||
diff --git a/engine/editor/themes/theme_classic.cpp b/engine/editor/themes/theme_classic.cpp
index 3e0c84ef..9d584524 100644
--- a/engine/editor/themes/theme_classic.cpp
+++ b/engine/editor/themes/theme_classic.cpp
@@ -40,7 +40,7 @@
 #include "scene/resources/image_texture.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/style_box_line.h"
-#include "scene/resources/style_box_texture.h" // IWYU pragma: keep. Used by `EditorThemeManager::make_stylebox`.
+#include "scene/resources/style_box_texture.h"
 
 void ThemeClassic::populate_shared_styles(const Ref<EditorTheme> &p_theme, EditorThemeManager::ThemeConfiguration &p_config) {
 	// Colors.
@@ -198,7 +198,6 @@ void ThemeClassic::populate_shared_styles(const Ref<EditorTheme> &p_theme, Edito
 		p_theme->set_color("axis_y_color", EditorStringName(Editor), Color(0.53, 0.84, 0.01));
 		p_theme->set_color("axis_z_color", EditorStringName(Editor), Color(0.16, 0.55, 0.96));
 		p_theme->set_color("axis_w_color", EditorStringName(Editor), Color(0.55, 0.55, 0.55));
-		p_theme->set_color("axis_view_plane_color", EditorStringName(Editor), Color(0.75, 0.75, 0.75, 0.33));
 
 		const float prop_color_saturation = p_config.accent_color.get_s() * 0.75;
 		const float prop_color_value = p_config.accent_color.get_v();
@@ -611,6 +610,7 @@ void ThemeClassic::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edi
 			p_theme->set_color("font_disabled_color", "Tree", p_config.font_disabled_color);
 			p_theme->set_color("font_outline_color", "Tree", p_config.font_outline_color);
 			p_theme->set_color("title_button_color", "Tree", p_config.font_color);
+			p_theme->set_color("drop_position_color", "Tree", p_config.accent_color);
 
 			p_theme->set_constant("v_separation", "Tree", p_config.base_margin * EDSCALE);
 			p_theme->set_constant("h_separation", "Tree", (p_config.increased_margin + 2) * EDSCALE);
@@ -660,8 +660,7 @@ void ThemeClassic::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edi
 			p_theme->set_color("relationship_line_color", "Tree", relationship_line_color);
 			p_theme->set_color("parent_hl_line_color", "Tree", parent_line_color);
 			p_theme->set_color("children_hl_line_color", "Tree", children_line_color);
-			p_theme->set_color("drop_on_item_color", "Tree", p_config.accent_color);
-			p_theme->set_color("drop_position_color", "Tree", p_config.icon_normal_color);
+			p_theme->set_color("drop_position_color", "Tree", p_config.accent_color);
 
 			Ref<StyleBoxFlat> style_tree_btn = p_config.base_style->duplicate();
 			style_tree_btn->set_bg_color(p_config.highlight_color);
@@ -1058,13 +1057,6 @@ void ThemeClassic::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edi
 		p_theme->set_icon("favorite_up", "FileDialog", p_theme->get_icon("MoveUp", EditorStringName(EditorIcons)));
 		p_theme->set_icon("favorite_down", "FileDialog", p_theme->get_icon("MoveDown", EditorStringName(EditorIcons)));
 		p_theme->set_icon("create_folder", "FileDialog", p_theme->get_icon("FolderCreate", EditorStringName(EditorIcons)));
-
-		p_theme->set_icon("menu_copy_path", "FileDialog", p_theme->get_icon("ActionCopy", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_delete", "FileDialog", p_theme->get_icon("Remove", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_refresh", "FileDialog", p_theme->get_icon("Reload", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_new_folder", "FileDialog", p_theme->get_icon("Folder", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_show_in_file_manager", "FileDialog", p_theme->get_icon("Filesystem", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_open_bundle", "FileDialog", p_theme->get_icon("FolderBrowse", EditorStringName(EditorIcons)));
 		// Use a different color for folder icons to make them easier to distinguish from files.
 		// On a light theme, the icon will be dark, so we need to lighten it before blending it with the accent color.
 		p_theme->set_color("folder_icon_color", "FileDialog", (p_config.dark_icon_and_font ? Color(1, 1, 1) : Color(4.25, 4.25, 4.25)).lerp(p_config.accent_color, 0.7));
@@ -1126,11 +1118,9 @@ void ThemeClassic::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edi
 			p_theme->set_icon("radio_unchecked_disabled", "PopupMenu", p_theme->get_icon(SNAME("GuiRadioUncheckedDisabled"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu", "PopupMenu", p_theme->get_icon(SNAME("ArrowRight"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu_mirrored", "PopupMenu", p_theme->get_icon(SNAME("ArrowLeft"), EditorStringName(EditorIcons)));
-			p_theme->set_icon("search", "PopupMenu", p_theme->get_icon(SNAME("Search"), EditorStringName(EditorIcons)));
 
 			int v_sep = (p_config.enable_touch_optimizations ? 12 : p_config.forced_even_separation) * EDSCALE;
 			p_theme->set_constant("v_separation", "PopupMenu", v_sep);
-			p_theme->set_constant("search_bar_separation", "PopupMenu", v_sep);
 			p_theme->set_constant("outline_size", "PopupMenu", 0);
 			p_theme->set_constant("item_start_padding", "PopupMenu", p_config.separation_margin);
 			p_theme->set_constant("item_end_padding", "PopupMenu", p_config.separation_margin);
@@ -1533,7 +1523,6 @@ void ThemeClassic::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edi
 		p_theme->set_icon("picker_cursor", "ColorPicker", p_theme->get_icon(SNAME("PickerCursor"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("picker_cursor_bg", "ColorPicker", p_theme->get_icon(SNAME("PickerCursorBg"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("color_script", "ColorPicker", p_theme->get_icon(SNAME("Script"), EditorStringName(EditorIcons)));
-		p_theme->set_icon("color_copy", "ColorPicker", p_theme->get_icon(SNAME("ActionCopy"), EditorStringName(EditorIcons)));
 
 		// ColorPickerButton.
 		p_theme->set_icon("bg", "ColorPickerButton", p_theme->get_icon(SNAME("GuiMiniCheckerboard"), EditorStringName(EditorIcons)));
@@ -2059,10 +2048,6 @@ void ThemeClassic::populate_editor_styles(const Ref<EditorTheme> &p_theme, Edito
 		p_theme->set_type_variation("TreeSecondary", "Tree");
 		p_theme->set_type_variation("ItemListSecondary", "ItemList");
 
-		// EditorAudioBusEffectsTree
-		p_theme->set_type_variation("EditorAudioBusEffectsTree", "Tree");
-		p_theme->set_constant("h_separation", "EditorAudioBusEffectsTree", 0);
-
 		// ForegroundPanel.
 		p_theme->set_type_variation("PanelForeground", "Panel");
 		p_theme->set_stylebox(SceneStringName(panel), "PanelForeground", p_config.base_empty_style);
@@ -2343,10 +2328,7 @@ void ThemeClassic::populate_editor_styles(const Ref<EditorTheme> &p_theme, Edito
 		p_theme->set_color("code_bg_color", "EditorHelp", p_config.dark_color_3);
 		p_theme->set_color("kbd_bg_color", "EditorHelp", p_config.dark_color_1);
 		p_theme->set_color("param_bg_color", "EditorHelp", p_config.dark_color_1);
-		p_theme->set_color("primary_hr_color", "EditorHelp", p_config.base_color.lerp(p_config.mono_color_font, p_config.dark_theme ? 0.14 : 0.24));
-		p_theme->set_color("secondary_hr_color", "EditorHelp", p_config.base_color.lerp(p_config.mono_color_font, p_config.dark_theme ? 0.12 : 0.22));
 		p_theme->set_constant(SceneStringName(line_separation), "EditorHelp", Math::round(6 * EDSCALE));
-		p_theme->set_constant(SceneStringName(paragraph_separation), "EditorHelp", Math::round(10 * EDSCALE));
 		p_theme->set_constant("table_h_separation", "EditorHelp", 16 * EDSCALE);
 		p_theme->set_constant("table_v_separation", "EditorHelp", 6 * EDSCALE);
 		p_theme->set_constant("text_highlight_h_padding", "EditorHelp", 1 * EDSCALE);
diff --git a/engine/editor/themes/theme_modern.cpp b/engine/editor/themes/theme_modern.cpp
index cbcd0db5..20a9f8c8 100644
--- a/engine/editor/themes/theme_modern.cpp
+++ b/engine/editor/themes/theme_modern.cpp
@@ -220,14 +220,13 @@ void ThemeModern::populate_shared_styles(const Ref<EditorTheme> &p_theme, Editor
 
 		// Additional editor colors.
 
-		p_theme->set_color("box_selection_fill_color", EditorStringName(Editor), Color(0.65, 0.65, 0.65, 0.15));
-		p_theme->set_color("box_selection_stroke_color", EditorStringName(Editor), Color(0.55, 0.55, 0.55, 0.55));
+		p_theme->set_color("box_selection_fill_color", EditorStringName(Editor), p_config.mono_color * Color(1, 1, 1, 0.12));
+		p_theme->set_color("box_selection_stroke_color", EditorStringName(Editor), p_config.mono_color * Color(1, 1, 1, 0.4));
 
 		p_theme->set_color("axis_x_color", EditorStringName(Editor), Color(0.96, 0.20, 0.32));
 		p_theme->set_color("axis_y_color", EditorStringName(Editor), Color(0.53, 0.84, 0.01));
 		p_theme->set_color("axis_z_color", EditorStringName(Editor), Color(0.16, 0.55, 0.96));
 		p_theme->set_color("axis_w_color", EditorStringName(Editor), Color(0.55, 0.55, 0.55));
-		p_theme->set_color("axis_view_plane_color", EditorStringName(Editor), Color(0.75, 0.75, 0.75, 0.33));
 
 		p_theme->set_color("property_color_x", EditorStringName(Editor), p_config.dark_icon_and_font ? Color(0.88, 0.38, 0.47) : Color(0.40, 0.04, 0.09));
 		p_theme->set_color("property_color_y", EditorStringName(Editor), p_config.dark_icon_and_font ? Color(0.76, 0.93, 0.40) : Color(0.27, 0.37, 0.06));
@@ -636,6 +635,7 @@ void ThemeModern::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edit
 			p_theme->set_color("font_disabled_color", "Tree", p_config.font_disabled_color);
 			p_theme->set_color("font_outline_color", "Tree", p_config.font_outline_color);
 			p_theme->set_color("title_button_color", "Tree", p_config.font_color);
+			p_theme->set_color("drop_position_color", "Tree", p_config.accent_color);
 
 			int tree_v_sep = p_config.enable_touch_optimizations ? (p_config.separation_margin * 0.9) : Math::pow(p_config.base_margin * 0.175 * EDSCALE, 3);
 			p_theme->set_constant("v_separation", "Tree", tree_v_sep);
@@ -682,7 +682,6 @@ void ThemeModern::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edit
 			p_theme->set_color("relationship_line_color", "Tree", relationship_line_color);
 			p_theme->set_color("parent_hl_line_color", "Tree", highlight_line_color);
 			p_theme->set_color("children_hl_line_color", "Tree", relationship_line_color);
-			p_theme->set_color("drop_on_item_color", "Tree", p_config.accent_color);
 			p_theme->set_color("drop_position_color", "Tree", p_config.icon_normal_color);
 			p_theme->set_color("guide_color", "Tree", Color(1, 1, 1, 0));
 			p_theme->set_color("scroll_hint_color", "Tree", Color(0, 0, 0, p_config.dark_theme ? 1.0 : 0.5));
@@ -1044,13 +1043,6 @@ void ThemeModern::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edit
 		p_theme->set_icon("favorite_up", "FileDialog", p_theme->get_icon("MoveUp", EditorStringName(EditorIcons)));
 		p_theme->set_icon("favorite_down", "FileDialog", p_theme->get_icon("MoveDown", EditorStringName(EditorIcons)));
 		p_theme->set_icon("create_folder", "FileDialog", p_theme->get_icon("FolderCreate", EditorStringName(EditorIcons)));
-
-		p_theme->set_icon("menu_copy_path", "FileDialog", p_theme->get_icon("ActionCopy", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_delete", "FileDialog", p_theme->get_icon("Remove", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_refresh", "FileDialog", p_theme->get_icon("Reload", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_new_folder", "FileDialog", p_theme->get_icon("Folder", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_show_in_file_manager", "FileDialog", p_theme->get_icon("Filesystem", EditorStringName(EditorIcons)));
-		p_theme->set_icon("menu_open_bundle", "FileDialog", p_theme->get_icon("FolderBrowse", EditorStringName(EditorIcons)));
 		// Use a different color for folder icons to make them easier to distinguish from files.
 		// On a light theme, the icon will be dark, so we need to lighten it before blending it with the accent color.
 		p_theme->set_color("folder_icon_color", "FileDialog", (p_config.dark_icon_and_font ? Color(1, 1, 1) : Color(4.25, 4.25, 4.25)).lerp(p_config.accent_color, 0.7));
@@ -1101,12 +1093,10 @@ void ThemeModern::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edit
 			p_theme->set_icon("radio_unchecked_disabled", "PopupMenu", p_theme->get_icon(SNAME("GuiRadioUncheckedDisabled"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu", "PopupMenu", p_theme->get_icon(SNAME("ArrowRight"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu_mirrored", "PopupMenu", p_theme->get_icon(SNAME("ArrowLeft"), EditorStringName(EditorIcons)));
-			p_theme->set_icon("search", "PopupMenu", p_theme->get_icon(SNAME("Search"), EditorStringName(EditorIcons)));
 
 			p_theme->set_constant("h_separation", "PopupMenu", p_config.base_margin * 1.75 * EDSCALE);
 			int v_sep = (p_config.enable_touch_optimizations ? 12 : p_config.base_margin * 1.75) * EDSCALE;
 			p_theme->set_constant("v_separation", "PopupMenu", v_sep);
-			p_theme->set_constant("search_bar_separation", "PopupMenu", v_sep);
 			p_theme->set_constant("outline_size", "PopupMenu", 0);
 			p_theme->set_constant("item_start_padding", "PopupMenu", p_config.popup_margin);
 			p_theme->set_constant("item_end_padding", "PopupMenu", p_config.popup_margin);
@@ -1573,7 +1563,6 @@ void ThemeModern::populate_standard_styles(const Ref<EditorTheme> &p_theme, Edit
 		p_theme->set_icon("picker_cursor", "ColorPicker", p_theme->get_icon(SNAME("PickerCursor"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("picker_cursor_bg", "ColorPicker", p_theme->get_icon(SNAME("PickerCursorBg"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("color_script", "ColorPicker", p_theme->get_icon(SNAME("Script"), EditorStringName(EditorIcons)));
-		p_theme->set_icon("color_copy", "ColorPicker", p_theme->get_icon(SNAME("ActionCopy"), EditorStringName(EditorIcons)));
 
 		// ColorPickerButton.
 		p_theme->set_icon("bg", "ColorPickerButton", p_theme->get_icon(SNAME("GuiMiniCheckerboard"), EditorStringName(EditorIcons)));
@@ -2202,7 +2191,6 @@ void ThemeModern::populate_editor_styles(const Ref<EditorTheme> &p_theme, Editor
 				style_audio_bus_effect_tree->set_border_color(p_config.extra_border_color_2);
 			}
 			p_theme->set_stylebox(SceneStringName(panel), "EditorAudioBusEffectsTree", style_audio_bus_effect_tree);
-			p_theme->set_constant("h_separation", "EditorAudioBusEffectsTree", 0);
 		}
 
 		// ForegroundPanel.
@@ -2654,10 +2642,7 @@ void ThemeModern::populate_editor_styles(const Ref<EditorTheme> &p_theme, Editor
 		p_theme->set_color("code_bg_color", "EditorHelp", _get_base_color(p_config, 1.6, 0.8));
 		p_theme->set_color("kbd_bg_color", "EditorHelp", p_config.dark_color_1);
 		p_theme->set_color("param_bg_color", "EditorHelp", p_config.dark_color_1);
-		p_theme->set_color("primary_hr_color", "EditorHelp", p_config.base_color.lerp(p_config.mono_color_font, p_config.dark_theme ? 0.14 : 0.24));
-		p_theme->set_color("secondary_hr_color", "EditorHelp", p_config.base_color.lerp(p_config.mono_color_font, p_config.dark_theme ? 0.12 : 0.22));
 		p_theme->set_constant(SceneStringName(line_separation), "EditorHelp", Math::round(6 * EDSCALE));
-		p_theme->set_constant(SceneStringName(paragraph_separation), "EditorHelp", Math::round(10 * EDSCALE));
 		p_theme->set_constant("table_h_separation", "EditorHelp", 16 * EDSCALE);
 		p_theme->set_constant("table_v_separation", "EditorHelp", 6 * EDSCALE);
 		p_theme->set_constant("text_highlight_h_padding", "EditorHelp", 1 * EDSCALE);
diff --git a/engine/editor/translations/editor/cs.po b/engine/editor/translations/editor/cs.po
index 67ae9e1e..bb15659f 100644
--- a/engine/editor/translations/editor/cs.po
+++ b/engine/editor/translations/editor/cs.po
@@ -59,13 +59,14 @@
 # GrenewerearE <grenewereare@seznam.cz>, 2025.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # Frostcorn <houskam@gasos-ro.cz>, 2026.
+# Marek Poustka <noskrat@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-05 13:01+0000\n"
-"Last-Translator: Frostcorn <houskam@gasos-ro.cz>\n"
+"PO-Revision-Date: 2026-02-02 01:02+0000\n"
+"Last-Translator: Marek Poustka <noskrat@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot/"
 "cs/>\n"
 "Language: cs\n"
@@ -73,22 +74,160 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
 
+msgid "Failed"
+msgstr "Selhání"
+
+msgid "Unavailable"
+msgstr "Nedostupné"
+
+msgid "Unconfigured"
+msgstr "Nenakonfigurováno"
+
+msgid "Unauthorized"
+msgstr "Neautorizované"
+
+msgid "Parameter out of range"
+msgstr "Parametr mime rozsah"
+
+msgid "Out of memory"
+msgstr "Nedostatek paměti"
+
+msgid "File not found"
+msgstr "Soubor nenalezen"
+
+msgid "File: Bad drive"
+msgstr "Soubor: Špatný disk"
+
+msgid "File: Bad path"
+msgstr "Soubor: Špatná cesta"
+
+msgid "File: Permission denied"
+msgstr "Soubor: Přístup odmítnut"
+
+msgid "File already in use"
+msgstr "Soubor je již používán"
+
+msgid "Can't open file"
+msgstr "Nelze otevřít soubor"
+
+msgid "Can't write file"
+msgstr "Nelze zapsat do souboru"
+
+msgid "Can't read file"
+msgstr "Nelze číst ze souboru"
+
+msgid "File unrecognized"
+msgstr "Soubor nerozpoznán"
+
+msgid "File corrupt"
+msgstr "Soubor poškozen"
+
+msgid "Missing dependencies for file"
+msgstr "Chybí závislosti na soubor"
+
+msgid "End of file"
+msgstr "Konec souboru"
+
+msgid "Can't open"
+msgstr "Nelze otevřít"
+
+msgid "Can't create"
+msgstr "Nelze vytvořit"
+
+msgid "Query failed"
+msgstr "Dotaz selhal"
+
+msgid "Already in use"
+msgstr "Již používáno"
+
 msgid "Locked"
 msgstr "Zamčeno"
 
+msgid "Timeout"
+msgstr "Čas vypršel"
+
+msgid "Can't connect"
+msgstr "Nelze se připojit"
+
+msgid "Can't resolve"
+msgstr "Nelze vyřešit"
+
+msgid "Connection error"
+msgstr "Chyba připojení"
+
+msgid "Can't acquire resource"
+msgstr "Nelze získat zdroj"
+
+msgid "Can't fork"
+msgstr "Nelze rozdělit"
+
+msgid "Invalid data"
+msgstr "Neplatná data"
+
+msgid "Invalid parameter"
+msgstr "Neplatný parametr"
+
+msgid "Already exists"
+msgstr "Již existuje"
+
+msgid "Does not exist"
+msgstr "Neexistuje"
+
+msgid "Can't read database"
+msgstr "Nelze číst z databáze"
+
+msgid "Can't write database"
+msgstr "Nelze zapsat do databáze"
+
+msgid "Compilation failed"
+msgstr "Kompilace selhala"
+
+msgid "Method not found"
+msgstr "Metoda nenalezena"
+
+msgid "Link failed"
+msgstr "Odkaz selhal"
+
+msgid "Script failed"
+msgstr "Skript selhal"
+
+msgid "Cyclic link detected"
+msgstr "Zjištěn cyklický odkaz"
+
+msgid "Invalid declaration"
+msgstr "Neplatná deklarace"
+
+msgid "Duplicate symbol"
+msgstr "Duplikovat symbol"
+
+msgid "Parse error"
+msgstr "Chyba parsování"
+
+msgid "Busy"
+msgstr "Zaneprázdněn"
+
+msgid "Skip"
+msgstr "Přeskočit"
+
 msgid "Help"
 msgstr "Nápověda"
 
+msgid "Bug"
+msgstr "Chyba"
+
+msgid "Printer on fire"
+msgstr "Tiskárna v plamenech"
+
 msgid "unset"
-msgstr "Nenastaveno"
+msgstr "nenastaveno"
 
 msgid "Physical"
-msgstr "Fyzická klávesa"
+msgstr "Fyzický"
 
 msgid "Left Mouse Button"
 msgstr "Levé tlačítko myši"
@@ -139,10 +278,10 @@ msgid "Right Stick Y-Axis, Joystick 1 Y-Axis"
 msgstr "Osa Y pravé páčky, osa Y joysticku 1"
 
 msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
-msgstr "Osa X joysticku 2, levá spoušť, Sony L2, Xbox LT"
+msgstr "Osa X joysticku 2, Levý Trigger, Sony L2, Xbox LT"
 
 msgid "Joystick 2 Y-Axis, Right Trigger, Sony R2, Xbox RT"
-msgstr "Osa Y joysticku 2, pravá spoušť, Sony R2, Xbox RT"
+msgstr "Osa Y joysticku 2, Pravá Trigger, Sony R2, Xbox RT"
 
 msgid "Joystick 3 X-Axis"
 msgstr "Osa X joysticku 3"
@@ -157,7 +296,7 @@ msgid "Joystick 4 Y-Axis"
 msgstr "Osa Y joysticku 4"
 
 msgid "Unknown Joypad Axis"
-msgstr "Neznámá osa joypadu"
+msgstr "Neznámá Osa Joypadu"
 
 msgid "Joypad Motion on Axis %d (%s) with Value %.2f"
 msgstr "Pohyb joypadu na ose %d (%s) s hodnotou %.2f"
@@ -208,7 +347,7 @@ msgid "D-pad Right"
 msgstr "Směrové tlačítko doprava"
 
 msgid "Xbox Share, PS5 Microphone, Nintendo Capture"
-msgstr "Xbox Sdílet, PS5 Mikrofon, Nintendo Capture"
+msgstr "Xbox Sdílet, PS5 Mikrofon, Nintendo Zachytit"
 
 msgid "Xbox Paddle 1"
 msgstr "Xbox pádlo 1"
@@ -226,7 +365,7 @@ msgid "PS4/5 Touchpad"
 msgstr "Dotykový panel PS4/5"
 
 msgid "Joypad Button %d"
-msgstr "Tlačítko joypadu %d"
+msgstr "Tlačítko Joypadu %d"
 
 msgid "Pressure:"
 msgstr "Tlak:"
@@ -238,7 +377,7 @@ msgid "touched"
 msgstr "dotknuto"
 
 msgid "released"
-msgstr "puštěno"
+msgstr "uvolněno"
 
 msgid "Screen %s at (%s) with %s touch points"
 msgstr "Obrazovka %s na (%s) s %s dotykovými body"
@@ -248,7 +387,7 @@ msgid ""
 msgstr "Obrazovka tažena %s dotykovými body na pozici (%s) s rychlostí (%s)"
 
 msgid "Magnify Gesture at (%s) with factor %s"
-msgstr "Gesto zvštření na (%s) s faktorem %s"
+msgstr "Gesto zvětšení na (%s) s faktorem %s"
 
 msgid "Pan Gesture at (%s) with delta (%s)"
 msgstr "Gesto posunu na (%s) s deltou (%s)"
@@ -274,6 +413,9 @@ msgstr "Vybrat"
 msgid "Cancel"
 msgstr "Zrušit"
 
+msgid "Close Dialog"
+msgstr "Zavřít Dialogové okno"
+
 msgid "Focus Next"
 msgstr "Zaměřit další"
 
@@ -323,7 +465,7 @@ msgid "Redo"
 msgstr "Znovu"
 
 msgid "Completion Query"
-msgstr "Doplňovací dotaz"
+msgstr "Dokončovací Dotaz"
 
 msgid "New Line"
 msgstr "Nový řádek"
@@ -344,10 +486,10 @@ msgid "Backspace"
 msgstr "Backspace"
 
 msgid "Backspace Word"
-msgstr "Backspace slova"
+msgstr "Backspace Slovo"
 
 msgid "Backspace all to Left"
-msgstr "Backspace vše vlevo"
+msgstr "Smazat vše nalevo"
 
 msgid "Delete"
 msgstr "Smazat"
@@ -356,7 +498,7 @@ msgid "Delete Word"
 msgstr "Smazat slovo"
 
 msgid "Delete all to Right"
-msgstr "Smazat vše vpravo"
+msgstr "Smazat vše napravo"
 
 msgid "Caret Left"
 msgstr "Kurzor doleva"
@@ -395,25 +537,25 @@ msgid "Caret Document End"
 msgstr "Kurzor na konec dokumentu"
 
 msgid "Caret Add Below"
-msgstr "Přidat kurzor níže"
+msgstr "Kurzor přidat nad"
 
 msgid "Caret Add Above"
-msgstr "Přidat kurzor výše"
+msgstr "Kurzor Přidat pod"
 
 msgid "Scroll Up"
-msgstr "Posun kolečkem myši nahoru"
+msgstr "Skrolovat nahoru"
 
 msgid "Scroll Down"
-msgstr "Posun kolečkem myši dolů"
+msgstr "Skrolovat dolu"
 
 msgid "Select All"
 msgstr "Vybrat vše"
 
 msgid "Select Word Under Caret"
-msgstr "Vybrat slovo pod kurzorem"
+msgstr "Vybrat slovo u kurzoru"
 
 msgid "Add Selection for Next Occurrence"
-msgstr "Přidat další výskyt do výběru"
+msgstr "Přidat výběr pro další výskyt"
 
 msgid "Skip Selection for Next Occurrence"
 msgstr "Přeskočit výběr pro další výskyt"
@@ -422,7 +564,7 @@ msgid "Clear Carets and Selection"
 msgstr "Zrušit kurzory a výběr"
 
 msgid "Toggle Insert Mode"
-msgstr "Přepnout režim přepisování textu"
+msgstr "Přepnout režim vkládání"
 
 msgid "Submit Text"
 msgstr "Potvrdit text"
@@ -433,6 +575,9 @@ msgstr "Duplikovat uzly"
 msgid "Delete Nodes"
 msgstr "Smazat uzly"
 
+msgid "Follow Input Port Connection"
+msgstr "Sledovat vstupní port spojení"
+
 msgid "Follow Output Port Connection"
 msgstr "Sledovat výstupní port spojení"
 
@@ -455,7 +600,10 @@ msgid "Swap Input Direction"
 msgstr "Obrátit směr vstupu"
 
 msgid "Start Unicode Character Input"
-msgstr "Zahájit vstup Unicode znaků"
+msgstr "Zahájit zadání Unicode znaků"
+
+msgid "ColorPicker: Delete Preset"
+msgstr "Výběr Barev: Smazat předvýběr"
 
 msgid "Accessibility: Keyboard Drag and Drop"
 msgstr "Přístupnost: Přetáhnout a pustit pomocí klávesnice"
@@ -473,13 +621,13 @@ msgid "Invalid index of type %s for base type %s"
 msgstr "Neplatný index typu %s pro základní typ %s"
 
 msgid "Invalid named index '%s' for base type %s"
-msgstr "Neplatný pojmenovaný index '%s' pro základní typ %s"
+msgstr "Neplatně pojmenovaný index '%s' pro základní typ %s"
 
 msgid "Invalid arguments to construct '%s'"
 msgstr "Neplatné argumenty pro vytvoření '%s'"
 
 msgid "On call to '%s':"
-msgstr "Při volání '%s':"
+msgstr "Při volání na '%s':"
 
 msgid "Built-in script"
 msgstr "Vestavěný skript"
@@ -515,25 +663,25 @@ msgid "Value:"
 msgstr "Hodnota:"
 
 msgid "Update Selected Key Handles"
-msgstr "Upravit vybrané úchyty klíčů"
+msgstr "Aktualizovat vybrané úchyty klíčů"
 
 msgid "Insert Key Here"
 msgstr "Vložit klíč zde"
 
 msgid "Duplicate Selected Key(s)"
-msgstr "Duplikovat vybrané klíče"
+msgstr "Duplikovat vybraný(é) klíč(e)"
 
 msgid "Cut Selected Key(s)"
-msgstr "Vyjmout vybrané klíče"
+msgstr "Vyjmout vybraný(é) klíč(e)"
 
 msgid "Copy Selected Key(s)"
-msgstr "Kopírovat vybrané klíče"
+msgstr "Kopírovat vybraný(é) klíč(e)"
 
 msgid "Paste Key(s)"
-msgstr "Vložit klíče"
+msgstr "Vložit klíč(e)"
 
 msgid "Delete Selected Key(s)"
-msgstr "Smazat vybrané klíče"
+msgstr "Smazat vybraný(é) klíč(e)"
 
 msgid "Make Handles Free"
 msgstr "Uvolnit úchyty"
@@ -548,7 +696,7 @@ msgid "Make Handles Mirrored"
 msgstr "Udělat úchyty zrcadlené"
 
 msgid "Make Handles Balanced (Auto Tangent)"
-msgstr "Udělat úchyty vyvážené (automatická tečna)"
+msgstr "Udělat úchyty vyvážené (Automatická Tečna)"
 
 msgid "Make Handles Mirrored (Auto Tangent)"
 msgstr "Udělat úchyty zrcadlené (automatická tečna)"
@@ -628,15 +776,30 @@ msgstr "Diskrétní"
 msgid "Capture"
 msgstr "Snímat"
 
+msgid ""
+"Select and move points.\n"
+"RMB: Create point at position clicked.\n"
+"Shift+LMB+Drag: Set the blending position within the space."
+msgstr ""
+"Vybrat a přesunout uzly.\n"
+"Pravé tl. myši: Přidat uzel na místo kliknutí.\n"
+"Shift+Levé tl. myši+Táhnutí: Nastaví polohu prolnutí v prostoru."
+
 msgid "Create points."
 msgstr "Vytvořit body."
 
+msgid "Set the blending position within the space."
+msgstr "Nastavit pozici prolínání v prostoru."
+
 msgid "Erase points."
 msgstr "Vymazat body."
 
 msgid "Enable snap and show grid."
 msgstr "Aktivovat přichytávání a zobrazit mřížku."
 
+msgid "Grid Step"
+msgstr "Krok mřížky"
+
 msgid "Sync:"
 msgstr "Synchronizace:"
 
@@ -646,9 +809,15 @@ msgstr "Prolínání:"
 msgid "Point"
 msgstr "Bod"
 
+msgid "Blend Value"
+msgstr "Hodnota prolnutí"
+
 msgid "Open Editor"
 msgstr "Otevřít editor"
 
+msgid "Min"
+msgstr "Min"
+
 msgid "Max"
 msgstr "Max"
 
@@ -691,15 +860,36 @@ msgstr "Odstranit body a trojúhelníky."
 msgid "Generate blend triangles automatically (instead of manually)"
 msgstr "Vygenerovat prolínací trojúhelníky automaticky (namísto manuálně)"
 
+msgid "Grid X Step"
+msgstr "Krok mřížky X"
+
+msgid "Grid Y Step"
+msgstr "Krok mřížky Y"
+
+msgid "Blend X Value"
+msgstr "Prolnutí X Hodnota"
+
+msgid "Blend Y Value"
+msgstr "Prolnutí Y Hodnota"
+
 msgid "Max Y"
 msgstr "Max Y"
 
+msgid "Y Value"
+msgstr "Hodnota Y"
+
 msgid "Min Y"
 msgstr "Min Y"
 
 msgid "Min X"
 msgstr "Min X"
 
+msgid "X Value"
+msgstr "Hodnota X"
+
+msgid "Max X"
+msgstr "Max X"
+
 msgid "Parameter Changed: %s"
 msgstr "Parametr změněn: %s"
 
@@ -710,7 +900,7 @@ msgid "Edit Filters"
 msgstr "Upravit filtry"
 
 msgid "Output node can't be added to the blend tree."
-msgstr "Výstupní uzly nemohou být přidány do stromu prolnutí."
+msgstr "Výstupní uzel nemůže být přidán do stromu prolnutí."
 
 msgid "Add Node to BlendTree"
 msgstr "Přidat uzel do BlendTree"
@@ -737,7 +927,7 @@ msgid "Delete Node(s)"
 msgstr "Smazat uzly"
 
 msgid "Toggle Filter On/Off"
-msgstr "Přepnout filtr aktivní/neaktivní"
+msgstr "Přepnout filtr Zap/Vyp"
 
 msgid "Change Filter"
 msgstr "Změnit filtr"
@@ -749,7 +939,7 @@ msgid "Invert Filter Selection"
 msgstr "Invertovat výběr filtru"
 
 msgid "Clear Filter Selection"
-msgstr "Promazat výběr filtru"
+msgstr "Vyčistit výběr filtru"
 
 msgid ""
 "Animation player has no valid root node path, so unable to retrieve track "
@@ -789,7 +979,7 @@ msgid "Invert"
 msgstr "Invertovat"
 
 msgid "Clear"
-msgstr "Promazat"
+msgstr "Vyčistit"
 
 msgid "Start of Animation"
 msgstr "Začátek animace"
@@ -819,7 +1009,7 @@ msgid "Animation name contains invalid characters: '/', ':', ',' or '['."
 msgstr "Název animace obsahuje neplatné znaky: '/', ':', ',' nebo '['."
 
 msgid "Animation with the same name already exists."
-msgstr "Akce se stejným názvem již existuje."
+msgstr "Animace se stejným názvem již existuje."
 
 msgid "Enter a library name."
 msgstr "Zadejte název knihovny."
@@ -843,7 +1033,7 @@ msgid "Add Animation to Library: %s"
 msgstr "Přidat animaci do knihovny: %s"
 
 msgid "Add Animation Library: %s"
-msgstr "Přidat knihovnu animací: %s"
+msgstr "Přidat knihovnu animace: %s"
 
 msgid "Load Animation"
 msgstr "Načíst animaci"
@@ -852,21 +1042,21 @@ msgid ""
 "This animation library can't be saved because it does not belong to the "
 "edited scene. Make it unique first."
 msgstr ""
-"Tato knihovna animací nemůže být uložena, protože nenáleží upravované scéně. "
+"Tato knihovna animace nemůže být uložena, protože nenáleží upravované scéně. "
 "Nejdříve z ní udělejte unikátní zdroj."
 
 msgid ""
 "This animation library can't be saved because it was imported from another "
 "file. Make it unique first."
 msgstr ""
-"Tato knihovna animací nemůže být uložena, protože nenáleží upravované scéně. "
-"Nejdříve z ní udělejte unikátní zdroj."
+"Tato knihovna animace nemůže být uložena, protože vyla importována z jiného "
+"souboru. Nejdříve z ní udělejte unikátní zdroj."
 
 msgid "Save Library"
 msgstr "Uložit knihovnu"
 
 msgid "Make Animation Library Unique: %s"
-msgstr "Zunikátnit knihovnu animací: %s"
+msgstr "Utvořit knihovnu animace unikátní: %s"
 
 msgid ""
 "This animation can't be saved because it does not belong to the edited scene. "
@@ -879,21 +1069,44 @@ msgid ""
 "This animation can't be saved because it was imported from another file. Make "
 "it unique first."
 msgstr ""
-"Tato animace nemůže být uložena, protože nenáleží upravované scéně. Nejdříve "
-"z ní udělejte unikátní zdroj."
+"Tato animace nemůže být uložena, protože byla importována z jiného souboru. "
+"Nejdříve z ní udělejte unikátní zdroj."
 
 msgid "Save Animation"
 msgstr "Uložit animaci"
 
 msgid "Make Animation Unique: %s"
-msgstr "Zunikátnit animaci: '%s'"
+msgstr "Utvořit animaci unikátní: %s"
 
 msgid "Save Animation library to File: %s"
-msgstr "Uložit knihovnu animací do souboru: %s"
+msgstr "Uložit knihovnu animace do souboru: %s"
 
 msgid "Save Animation to File: %s"
 msgstr "Uložit animaci do souboru: %s"
 
+msgid ""
+"The file you selected is an imported scene from a 3D model such as glTF or "
+"FBX.\n"
+"\n"
+"In Godot, 3D models can be imported as either scenes or animation libraries, "
+"which is why they show up here.\n"
+"\n"
+"If you want to use animations from this 3D model, open the Advanced Import "
+"Settings\n"
+"dialog and save the animations using Actions... → Set Animation Save Paths,\n"
+"or import the whole scene as a single AnimationLibrary in the Import dock."
+msgstr ""
+"Soubor, který jste vybrali, je importovaná scéna z 3D modelu jako například "
+"glTF nebo FBX.\n"
+"\n"
+"V Godotu se mohou 3D modely importovat buď jako scény nebo jako knihovny "
+"animace, což je důvod, proč se objevují zde.\n"
+"\n"
+"Pokud chcete používat animace z tohoto 3D modelu, otevřete dialog Pokročilé "
+"nastavení importu\n"
+"a uložte animace pomocí Akce... → Nastavit cestu pro ukládání animací,\n"
+" nebo importujte celou scénu jako jednu AnimationLibrary v Importovacím doku."
+
 msgid ""
 "The file you selected is not a valid AnimationLibrary.\n"
 "\n"
@@ -902,7 +1115,7 @@ msgid ""
 msgstr ""
 "Soubor, který jste vybrali, není platná AnimationLibrary.\n"
 "\n"
-"Pokud chcete používat animace z tohoto souboru, uložte je nejprve jako "
+"Pokud se animace nacházejí uvnitř tohoto souboru, uložte je nejprve jako "
 "samostatný soubor."
 
 msgid "Some of the selected libraries were already added to the mixer."
@@ -978,7 +1191,7 @@ msgid "Paste animation to library from clipboard."
 msgstr "Vložit animaci ze schránky do knihovny."
 
 msgid "Save animation library to resource on disk."
-msgstr "Uložit knihovnu animací do zdroje na disku."
+msgstr "Uložit knihovnu animací do zdroje na disk."
 
 msgid "Remove animation library."
 msgstr "Odstranit knihovnu animací."
@@ -987,7 +1200,7 @@ msgid "Copy animation to clipboard."
 msgstr "Kopírovat animaci do schránky."
 
 msgid "Save animation to resource on disk."
-msgstr "Uložit animaci do zdroje na disku."
+msgstr "Uložit animaci do zdroje na disk."
 
 msgid "Remove animation from Library."
 msgstr "Odebrat animaci z knihovny."
@@ -999,7 +1212,7 @@ msgid "New Library"
 msgstr "Nová knihovna"
 
 msgid "Create new empty animation library."
-msgstr "Vytvořit prázdnou knihovnu animací."
+msgstr "Vytvořit novou prázdnou knihovnu animací."
 
 msgid "Load Library"
 msgstr "Načíst knihovnu"
@@ -1056,7 +1269,7 @@ msgid "[Global] (create)"
 msgstr "[Globální] (vytvořit)"
 
 msgid "Pause/Stop Animation"
-msgstr "Zastavit animaci"
+msgstr "Pozastavit/Zastavit animaci"
 
 msgid "Play Animation from Start"
 msgstr "Přehrát animaci od začátku"
@@ -1079,6 +1292,9 @@ msgstr "Průhledné vrstvení vyžaduje RESET animaci."
 msgid "Animation"
 msgstr "Animace"
 
+msgid "Toggle Animation Dock"
+msgstr "Přepnout dokování Animace"
+
 msgid "Animation position (in seconds)."
 msgstr "Pozice animace (v sekundách)."
 
@@ -1146,7 +1362,7 @@ msgid "Force White Modulate"
 msgstr "Vynutit bílou modulaci"
 
 msgid "Include Gizmos (3D)"
-msgstr "Zahrnout gizma (3D)"
+msgstr "Zahrnout Gizma (3D)"
 
 msgid "Pin AnimationPlayer"
 msgstr "Připnout AnimationPlayer"
@@ -1166,12 +1382,27 @@ msgstr "Časy prolnutí:"
 msgid "Next (Auto Queue):"
 msgstr "Další (Automaticky přidat do fronty):"
 
+msgid "Reconnect Transition"
+msgstr "Přepojit přechod"
+
 msgid "Move Node"
 msgstr "Přesunout uzel"
 
 msgid "Transition exists!"
 msgstr "Přechod existuje!"
 
+msgid "Cannot transition to self!"
+msgstr "Přechod k sobě samému není možný!"
+
+msgid "Cannot transition to \"Start\"!"
+msgstr "Přechod na \"Start\" není možný!"
+
+msgid "Cannot transition from \"End\"!"
+msgstr "Přechod od \"Konce\" není možný!"
+
+msgid "Transition from \"%s\" to \"%s\" already exists!"
+msgstr "Přechod z \"%s\" do \"%s\" už existuje!"
+
 msgid "Play/Travel to %s"
 msgstr "Přehrát/Přejít na %s"
 
@@ -1181,6 +1412,9 @@ msgstr "Upravit %s"
 msgid "Add Node and Transition"
 msgstr "Přidat uzel a přechod"
 
+msgid "Transition already exists!"
+msgstr "Přechod již existuje!"
+
 msgid "Add Transition"
 msgstr "Přidat přechod"
 
@@ -1197,7 +1431,7 @@ msgid "Travel"
 msgstr "Cestovat"
 
 msgid "No playback resource set at path: %s."
-msgstr "Na cestě nebyl nalezen žádný zdrojový pro přehrávání: %s."
+msgstr "Žádný zdroj pro přehrávání nenastaven na cestě: %s."
 
 msgid "Node Removed"
 msgstr "Uzel odebrán"
@@ -1216,6 +1450,9 @@ msgstr ""
 "Shift+Levé tl. myši+Táhnutí: Připojí vybraný uzel s jiným, nebo vytvoří nový "
 "uzel, pokud vyberete oblast bez uzlů."
 
+msgid "Select and move nodes."
+msgstr "Vybrat a přesunout uzel."
+
 msgid "Create new nodes."
 msgstr "Vytvořit nové uzly."
 
@@ -1253,22 +1490,22 @@ msgid "Animation Change Call"
 msgstr "Animace: Změnit volání"
 
 msgid "Animation Multi Change Transition"
-msgstr "Animace: Změnit přechod více"
+msgstr "Animace: Změnit více přechodů"
 
 msgid "Animation Multi Change Position3D"
-msgstr "Animace: Změnit Position3D více"
+msgstr "Animace: Změnit více Position3D"
 
 msgid "Animation Multi Change Rotation3D"
-msgstr "Animace: Změnit Rotation3D více"
+msgstr "Animace: Změnit více Rotation3D"
 
 msgid "Animation Multi Change Scale3D"
-msgstr "Animace: Změnit Scale3D více"
+msgstr "Animace: Změnit více Scale3D"
 
 msgid "Animation Multi Change Keyframe Value"
-msgstr "Animace: Změnit hodnotu klíčového snímku více"
+msgstr "Animace: Změnit více hodnot klíčového snímku"
 
 msgid "Animation Multi Change Call"
-msgstr "Animace: Změnit volání více"
+msgstr "Animace: Změnit více volání"
 
 msgid "Change Animation Length"
 msgstr "Změnit délku animace"
@@ -1338,8 +1575,14 @@ msgstr "Délka animace (ve snímcích)"
 msgid "Animation length (seconds)"
 msgstr "Délka animace (v sekundách)"
 
+msgid "Select a new track by type to add to this animation."
+msgstr "Vybrat novou stopu dle typu a přidat do této animace."
+
 msgid "Filter Tracks"
-msgstr "Upravit filtrované stopy"
+msgstr "Filtrovat stopy"
+
+msgid "Filter tracks by entering part of their node name or property."
+msgstr "Filtrovat stopy vložením části jména uzlu nebo vlastnosti."
 
 msgid "Animation Looping"
 msgstr "Smyčka animace"
@@ -1407,6 +1650,25 @@ msgstr "Úchyt do:"
 msgid "Out-Handle:"
 msgstr "Úchyt z:"
 
+msgctxt "Bezier Handle Mode"
+msgid "Free"
+msgstr "Volně"
+
+msgctxt "Bezier Handle Mode"
+msgid "Linear"
+msgstr "Lineárně"
+
+msgctxt "Bezier Handle Mode"
+msgid "Balanced"
+msgstr "Vyrovnaně"
+
+msgctxt "Bezier Handle Mode"
+msgid "Mirrored"
+msgstr "Zrcadlený"
+
+msgid "Handle mode: %s"
+msgstr "Režim úchytu: %s"
+
 msgid "Stream:"
 msgstr "Stream:"
 
@@ -1432,7 +1694,7 @@ msgid "Linear"
 msgstr "Lineární"
 
 msgid "Cubic"
-msgstr "Kubická"
+msgstr "Kubický"
 
 msgid "Linear Angle"
 msgstr "Lineární úhlová"
@@ -1453,16 +1715,19 @@ msgid "Insert Key..."
 msgstr "Vložit klíč..."
 
 msgid "Duplicate Key(s)"
-msgstr "Duplikovat klíče"
+msgstr "Duplikovat klíč(e)"
 
 msgid "Cut Key(s)"
-msgstr "Vyjmout klíče"
+msgstr "Vyjmout klíč(e)"
 
 msgid "Copy Key(s)"
-msgstr "Kopírovat klíče"
+msgstr "Kopírovat klíč(e)"
+
+msgid "Send Key(s) to RESET"
+msgstr "Poslat klíč(e) k RESETU"
 
 msgid "Delete Key(s)"
-msgstr "Odstranit klíče"
+msgstr "Odstranit klíč(e)"
 
 msgid "Change Animation Update Mode"
 msgstr "Změnit režim aktualizace animace"
@@ -1493,7 +1758,7 @@ msgid "Create %d new tracks and insert keys?"
 msgstr "Vytvořit %d nových stop a vložit klíče?"
 
 msgid "Hold Shift when clicking the key icon to skip this dialog."
-msgstr "Pro přeskočení tohoto dialogu držte Shift při kliknutí na ikonu klíče."
+msgstr "Držte Shift při kliknutí na ikonu klíče abyste přeskočili tento dialog."
 
 msgid "Create"
 msgstr "Vytvořit"
@@ -1516,6 +1781,12 @@ msgstr "vlastnost '%s'"
 msgid "Nearest FPS: %d"
 msgstr "Nejbližší FPS: %d"
 
+msgid "Bezier Default Mode"
+msgstr "Výchozí Bezieruv režim"
+
+msgid "Set the default handle mode of new bezier keys."
+msgstr "Nastavit výchozí mód úchytu nových Bezierových klíčů."
+
 msgid "Change Animation Step"
 msgstr "Změnit krok animace"
 
@@ -1526,7 +1797,7 @@ msgid "Blend Shape tracks only apply to MeshInstance3D nodes."
 msgstr "Stopy prolínání tvarů lze použít pouze s uzly MeshInstance3D."
 
 msgid "Position/Rotation/Scale 3D tracks only apply to 3D-based nodes."
-msgstr "Stopy Position/Rotation/Scale 3D platí pouze pro uzly založené na 3D."
+msgstr "Pozice/Rotace/Škálování 3D stop platí pouze pro uzly založené na 3D."
 
 msgid "Add Track"
 msgstr "Přidat stopu"
@@ -1567,7 +1838,7 @@ msgid "Track path is invalid, so can't add a method key."
 msgstr "Cesta stopy je neplatná, nelze přidat klíč metody."
 
 msgid "Add Method Track Key"
-msgstr "Přidat stopu volání metody"
+msgstr "Přidat klíč metody stopy"
 
 msgid "Method not found in object:"
 msgstr "Metoda nebyla v objektu nalezena:"
@@ -1618,7 +1889,7 @@ msgid "Animation Add RESET Keys"
 msgstr "Animace: Přidat RESET klíče"
 
 msgid "Bake Animation as Linear Keys"
-msgstr "Zapečení animace jako lineárních klíčů"
+msgstr "Baking animace jako lineárních klíčů"
 
 msgid "Create Node"
 msgstr "Vytvořit uzel"
@@ -1661,6 +1932,15 @@ msgstr "AnimationPlayer je neaktivní. Přehrávání nebude zpracováno."
 msgid "Select an AnimationPlayer node to create and edit animations."
 msgstr "Pro přidání a úpravu animací vyberte uzel AnimationPlayer."
 
+msgid "Add AnimationPlayer"
+msgstr "Přidat AnimationPlayer"
+
+msgid "Add a new AnimationPlayer node to the scene."
+msgstr "Přidat nový uzel AnimationPlayer do scény."
+
+msgid "Imported Animation"
+msgstr "Importovaná animace"
+
 msgid "Warning: Editing imported animation"
 msgstr "Varování: Upravuje se importovaná animace"
 
@@ -1679,6 +1959,12 @@ msgstr "Varování: AnimationPlayer je neaktivní"
 msgid "Toggle between the bezier curve editor and track editor."
 msgstr "Přepnout mezi editorem Bézierovy křivky a editorem stopy."
 
+msgid "Toggle method names"
+msgstr "Přepnout názvy metod"
+
+msgid "Toggle function names in the track editor."
+msgstr "Přepnout názvy funkcí v editoru stop."
+
 msgid "Only show tracks from nodes selected in tree."
 msgstr "Zobrazit pouze stopy uzlů vybraných ve stromu."
 
@@ -1687,13 +1973,16 @@ msgid ""
 "If disabled, tracks are shown in the order they are added and can be "
 "reordered using drag-and-drop."
 msgstr ""
-"Řadit stopy/skupiny podle abecedy.\n"
-"Pokud je zakázáno, jsou stopy zobrazovány v tom pořadí, v jakém byly přidány, "
-"a mohou být přeuspořádány přetáhnutím."
+"Řadit stopy/skupiny abecedně.\n"
+"Pokud je zakázáno, jsou stopy zobrazovány v pořadí, v jakém byly přidány, a "
+"mohou být přeuspořádány přetažením."
 
 msgid "Group tracks by node or display them as plain list."
 msgstr "Seskupit stopy podle uzlu nebo je zobrazit jako jednoduchý seznam."
 
+msgid "Insert at current time."
+msgstr "Vložit v aktuálním čase."
+
 msgid "Apply snapping to timeline cursor."
 msgstr "Přichytávat na kurzor časové osy."
 
@@ -1712,9 +2001,21 @@ msgstr "Sekundy"
 msgid "FPS"
 msgstr "FPS"
 
+msgid "Snap Mode"
+msgstr "Režim přichycení"
+
+msgid "Zoom"
+msgstr "Přiblížení"
+
 msgid "Fit to panel"
 msgstr "Přizpůsobit panelu"
 
+msgid "Auto Fit"
+msgstr "Automatické přizpůsobení"
+
+msgid "Auto Fit Bezier"
+msgstr "Automatické přizpůsobení Beziera"
+
 msgid "Edit"
 msgstr "Upravit"
 
@@ -1758,7 +2059,7 @@ msgid "Move Last Selected Key to Cursor"
 msgstr "Přesunout poslední vybraný klíč ke kurzoru"
 
 msgid "Delete Selection"
-msgstr "Smazat vyběr"
+msgstr "Smazat výběr"
 
 msgid "Go to Next Step"
 msgstr "Přejít k dalšímu kroku"
@@ -1772,8 +2073,14 @@ msgstr "Přejít k dalšímu klíčovému snímku"
 msgid "Go to Previous Keyframe"
 msgstr "Přejít k předchozímu klíčovému snímku"
 
+msgid "Add tracks to RESET"
+msgstr "Přidat stopu do RESET"
+
+msgid "Apply RESET"
+msgstr "Aplikovat RESET"
+
 msgid "Bake Animation..."
-msgstr "Vypálit animaci..."
+msgstr "Bake animaci..."
 
 msgid "Optimize Animation (no undo)..."
 msgstr "Optimalizovat animaci (nelze vrátit zpět)..."
@@ -1782,13 +2089,19 @@ msgid "Clean-Up Animation (no undo)..."
 msgstr "Pročistit animaci (nelze vrátit zpět)..."
 
 msgid "Pick a node to animate:"
-msgstr "Zvolit uzel pro animaci:"
+msgstr "Zvolit uzel pro animování:"
+
+msgid "Track Property"
+msgstr "Vlastnost stopy"
+
+msgid "Method Key"
+msgstr "Klíč Metody"
 
 msgid "Use Bezier Curves"
 msgstr "Použít Bézierovy křivky"
 
 msgid "Create RESET Track(s)"
-msgstr "Vytvořit RESET stopy"
+msgstr "Vytvořit RESET stop(y)"
 
 msgid "Animation Optimizer"
 msgstr "Optimalizátor animace"
@@ -1815,7 +2128,7 @@ msgid "Remove invalid keys"
 msgstr "Odstranit neplatné klíče"
 
 msgid "Remove unresolved and empty tracks"
-msgstr "Odstranit neurčené a prázdné stopy"
+msgstr "Odstranit nevyřešené a prázdné stopy"
 
 msgid "Clean-up all animations"
 msgstr "Pročistit všechny animace"
@@ -1826,6 +2139,9 @@ msgstr "Pročistit animace (NELZE VRÁTIT ZPĚT!)"
 msgid "Clean-Up"
 msgstr "Pročistit"
 
+msgid "Scale Ratio"
+msgstr "Poměr zvětšení"
+
 msgid "Scale Ratio:"
 msgstr "Poměr zvětšení:"
 
@@ -1841,7 +2157,7 @@ msgstr "Lineární"
 
 msgctxt "Transition Type"
 msgid "Sine"
-msgstr "Sinus"
+msgstr "Sinusový"
 
 msgctxt "Transition Type"
 msgid "Quint"
@@ -1873,7 +2189,7 @@ msgstr "Kruhový"
 
 msgctxt "Transition Type"
 msgid "Bounce"
-msgstr "Skákající"
+msgstr "Skákavý"
 
 msgctxt "Transition Type"
 msgid "Back"
@@ -1886,6 +2202,22 @@ msgstr "Pružinový"
 msgid "Ease Type:"
 msgstr "Typ uhlazení:"
 
+msgctxt "Ease Type"
+msgid "Ease In"
+msgstr "Vyhlazení vnitřní"
+
+msgctxt "Ease Type"
+msgid "Ease Out"
+msgstr "Vyhlazení vnější"
+
+msgctxt "Ease Type"
+msgid "Ease In-Out"
+msgstr "Vyhlazení zvnitřku ven"
+
+msgctxt "Ease Type"
+msgid "Ease Out-In"
+msgstr "Vyhlazení zvnějšku dovnitř"
+
 msgid "FPS:"
 msgstr "FPS:"
 
@@ -1893,7 +2225,7 @@ msgid "Animation Baker"
 msgstr "Vypalovač animace"
 
 msgid "3D Pos/Rot/Scl Track:"
-msgstr "Stopa 3D Pos/Rot/Scl:"
+msgstr "Stopa 3D Pos/Rot/Ška:"
 
 msgid "Blendshape Track:"
 msgstr "Stopa prolínání tvarů:"
@@ -1910,6 +2242,12 @@ msgstr "Vybrat všechny/žádné"
 msgid "Copy Selection"
 msgstr "Kopírovat výběr"
 
+msgid "Key Insertion Error"
+msgstr "Chyba vkládání klíče"
+
+msgid "Imported Animation cannot be edited!"
+msgstr "Importovaná Animace nemůže být upravována!"
+
 msgid "Animation Change Keyframe Time"
 msgstr "Animace: Změnit čas klíčového snímku"
 
@@ -1921,9 +2259,9 @@ msgid ""
 "editor and selecting \"Rename Marker\", in order to make sure that marker "
 "names are all unique."
 msgstr ""
-"Aby bylo zajištěno, že jsou všechny názvy značek unikátní, lze název značky "
-"lze změnit pouze tak, že na ni kliknute pravým tlačítkem myši v editoru "
-"animací a vyberete \"Přejmenovat značku\"."
+"Aby bylo zajištěno, že jsou názvy značek unikátní, lze název značky změnit je "
+"tak, že na ni kliknete pravým tlačítkem myši v editoru animací a vyberete "
+"\"Přejmenovat značku\"."
 
 msgid "Insert Marker..."
 msgstr "Vložit značku..."
@@ -1971,7 +2309,7 @@ msgid "Edit Marker Color"
 msgstr "Upravit barvu značky"
 
 msgid "Multi Edit Marker Color"
-msgstr "Upravit barvu značky více"
+msgstr "Upravit více barev značky"
 
 msgid "Animation Change Marker Time"
 msgstr "Animace: Změnit čas značky"
@@ -1991,12 +2329,21 @@ msgstr "Kořen"
 msgid "AnimationTree"
 msgstr "Strom animace"
 
+msgid "Toggle AnimationTree Dock"
+msgstr "Přepnout dokování Stromu animace"
+
 msgid "Path:"
 msgstr "Cesta:"
 
+msgid "Open asset details"
+msgstr "Otevřít detail zdroje"
+
 msgid "Title"
 msgstr "Název"
 
+msgid "Category"
+msgstr "Kategorie"
+
 msgid "Author"
 msgstr "Autor"
 
@@ -2034,10 +2381,10 @@ msgid "No response."
 msgstr "Žádná odpověď."
 
 msgid "Can't resolve hostname:"
-msgstr "Nelze přeložit název hostitele:"
+msgstr "Nelze vyhodnotit název hostitele:"
 
 msgid "Can't resolve."
-msgstr "Nelze přeložit."
+msgstr "Nelze vyhodnotit."
 
 msgid "Request failed, return code:"
 msgstr "Požadavek se nezdařil, návratový kód:"
@@ -2106,7 +2453,7 @@ msgid "Idle"
 msgstr "Nečinný"
 
 msgid "Install..."
-msgstr "Nainstalovat..."
+msgstr "Instalovat..."
 
 msgid "Retry"
 msgstr "Zkusit znovu"
@@ -2218,6 +2565,9 @@ msgstr "Podpora"
 msgid "Assets ZIP File"
 msgstr "Soubor zdrojů ZIP"
 
+msgid "AssetLib"
+msgstr "Knihovna zdrojů (AssetLib)"
+
 msgid "Error opening asset file for \"%s\" (not in ZIP format)."
 msgstr "Chyba při otevírání balíčku \"%s\" (není ve formátu ZIP)."
 
@@ -2280,15 +2630,24 @@ msgstr "Ukázat obsah zdroje a soubory, které jsou v konfliktu."
 msgid "Contents of the asset:"
 msgstr "Obsah zdroje:"
 
+msgid "Source Files"
+msgstr "Zdrojové soubory"
+
 msgid "Installation preview:"
 msgstr "Náhled instalace:"
 
+msgid "Destination Files"
+msgstr "Cílové soubory"
+
 msgid "Configure Asset Before Installing"
 msgstr "Konfigurovat zdroj před instalací"
 
 msgid "Audio Preview Play/Pause"
 msgstr "Náhled zvuku Přehrát/Pozastavit"
 
+msgid "Play"
+msgstr "Spustit"
+
 msgid "Stop"
 msgstr "Stop"
 
@@ -2328,6 +2687,9 @@ msgstr "Smazat efekt sběrnice"
 msgid "Drag & drop to rearrange."
 msgstr "Přetažením uspořádejte."
 
+msgid "Track Name"
+msgstr "Název stopy"
+
 msgid "Solo"
 msgstr "Sólo"
 
@@ -2338,7 +2700,16 @@ msgid "Bypass"
 msgstr "Obejít"
 
 msgid "Volume"
-msgstr "Objem"
+msgstr "Hlasitost"
+
+msgid "Channel %d, Left VU"
+msgstr "Kanál %d, Levé VU"
+
+msgid "Channel %d, Right VU"
+msgstr "Kanál %d, Pravé VU"
+
+msgid "Effects"
+msgstr "Efekty"
 
 msgid "Send"
 msgstr "Poslat"
@@ -2388,6 +2759,9 @@ msgstr "Otevřít rozvržení zvukové sběrnice"
 msgid "Error saving file: %s"
 msgstr "Chyba při ukládání souboru: %s"
 
+msgid "Toggle Audio Dock"
+msgstr "Přepnout dokování Audia"
+
 msgid "Layout:"
 msgstr "Rozvržení:"
 
@@ -2419,11 +2793,14 @@ msgid "Audio Bus Layout"
 msgstr "Rozvržení zvukové sběrnice"
 
 msgid "Step Into"
-msgstr "Vstoupit do"
+msgstr "Krok vpřed"
 
 msgid "Step Over"
 msgstr "Přeskočit"
 
+msgid "Step Out"
+msgstr "Krok zpět"
+
 msgid "Break"
 msgstr "Přerušit"
 
@@ -2444,13 +2821,13 @@ msgid ""
 "mobile device).\n"
 "You don't need to enable it to use the GDScript debugger locally."
 msgstr ""
-"Když je tato možnost povolena, aplikace se při nasazení jedním kliknutím "
-"pokusí připojit k IP tohoto počítače, aby bylo možné spuštěný projekt ladit.\n"
+"Když je tato volba povolena, aplikace se při nasazení jedním kliknutím pokusí "
+"připojit k IP tohoto počítače, aby bylo možné spuštěný projekt ladit.\n"
 "Určeno pro vzdálené ladění (typicky s mobilním zařízením).\n"
 "Pro místní použití ladicího nástroje GDScriptu není třeba."
 
 msgid "Small Deploy with Network Filesystem"
-msgstr "Tenké nasazení pomocí síťového souborového systému"
+msgstr "Malé nasazení pomocí síťového souborového systému"
 
 msgid ""
 "When this option is enabled, using one-click deploy for Android will only "
@@ -2460,7 +2837,7 @@ msgid ""
 "On Android, deploying will use the USB cable for faster performance. This "
 "option speeds up testing for projects with large assets."
 msgstr ""
-"Když je tato možnost vybrána, použití nasazení jedním kliknutím exportuje "
+"Když je tato volba povolena, použití nasazení jedním kliknutím exportuje "
 "pouze spustitelný soubor bez dat projektu.\n"
 "Souborový systém bude z projektu sdílen editorem po síti.\n"
 "V systému Android bude nasazení používat kabel USB pro rychlejší výkon. Tato "
@@ -2557,14 +2934,26 @@ msgstr ""
 "jestli nezačalo nové sezení mimo editor."
 
 msgid "Customize Run Instances..."
-msgstr "Přizpůsobit instance běhu..."
+msgstr "Přizpůsobit instance spouštění..."
 
 msgid "Set %s"
 msgstr "Nastavit %s"
 
+msgid "Set %s on %d objects"
+msgstr "Nastavit %s na %d objektech"
+
+msgid "Remote %s: %d"
+msgstr "Vzdálený %s: %d"
+
+msgid "Remote %s (%d Selected)"
+msgstr "Vzdálený %s (%d vybráno)"
+
 msgid "Debugger"
 msgstr "Ladicí program"
 
+msgid "Toggle Debugger Dock"
+msgstr "Přepnout dokování panelu Ladění"
+
 msgid "Session %d"
 msgstr "Relace %d"
 
@@ -2577,8 +2966,8 @@ msgid ""
 "Settings."
 msgstr ""
 "Některé vzdálené uzly nebyly vybrány, protože maximální nakonfigurovaný počet "
-"vybraných prvků je %d. To může být změněno v \"debugger/max_node_selection\" "
-"v Nastavení editoru."
+"ve výběru je %d. To může být změněno v \"debugger/max_node_selection\" v "
+"Nastavení editoru."
 
 msgid "Save Branch as Scene..."
 msgstr "Uložit větev jako scénu..."
@@ -2608,8 +2997,11 @@ msgid ""
 "Saving the branch as a scene requires selecting only one node, but you have "
 "selected %d nodes."
 msgstr ""
-"Pro uložení větve jako scény musíte vybrat právě jeden uzel, vy jich ale máte "
-"vybraných více: %d ."
+"Pro uložení větve jako scény musíte vybrat jen jeden uzel, ale vy jste "
+"vybrali %d uzlů."
+
+msgid "Expression to evaluate (Up/Down: Navigate history)"
+msgstr "Výraz pro vyhodnocení (Nahoru/Dolů: historie navigování)"
 
 msgid "Expression to evaluate"
 msgstr "Výraz pro vyhodnocení"
@@ -2678,7 +3070,7 @@ msgid "Inclusive"
 msgstr "Včetně vnořených"
 
 msgid "Self"
-msgstr "Tato funkce"
+msgstr "Vlastní"
 
 msgid ""
 "Inclusive: Includes time from other functions called by this function.\n"
@@ -2691,7 +3083,7 @@ msgstr ""
 "Včetně vnořených: Zahrnuje čas z jiných funkcí volaných touto funkcí.\n"
 "Slouží k odhalení úzkých míst.\n"
 "\n"
-"Tato funkce: Započítává pouze čas strávený v samotné funkci, nikoli v jiných "
+"Vlastní: Započítává pouze čas strávený v samotné funkci, nikoli v jiných "
 "funkcích volaných touto funkcí.\n"
 "Použijte k vyhledání jednotlivých funkcí, které je třeba optimalizovat."
 
@@ -2759,10 +3151,10 @@ msgid "Line %d"
 msgstr "Řádek %d"
 
 msgid "Debug session started."
-msgstr "Ladicí sezení zahájeno."
+msgstr "Ladění zahájeno."
 
 msgid "Debug session closed."
-msgstr "Ladicí sezení ukončeno."
+msgstr "Ladění ukončeno."
 
 msgid "Delete Breakpoint"
 msgstr "Smazat breakpoint"
@@ -2792,7 +3184,7 @@ msgid "Thread:"
 msgstr "Vlákno:"
 
 msgid "Stack Frames"
-msgstr "Rámce zásobníku"
+msgstr "Zásobník snímků"
 
 msgid "Filter Stack Variables"
 msgstr "Filtrovat proměnné zásobníku"
@@ -2821,6 +3213,12 @@ msgstr "Spotřeba video paměti podle zdroje:"
 msgid "Total:"
 msgstr "Celkem:"
 
+msgid "Video RAM Total"
+msgstr "Celkem Video RAM"
+
+msgid "Refresh Video RAM"
+msgstr "Obnova Video RAM"
+
 msgid "Export list to a CSV file"
 msgstr "Exportovat seznam do CSV"
 
@@ -2846,7 +3244,7 @@ msgid "Clicked Control:"
 msgstr "Kliknutý ovládací prvek:"
 
 msgid "Clicked Control Type:"
-msgstr "Typ kliknutého prvku:"
+msgstr "Typ kliknutého ovládacího prvku:"
 
 msgid "Live Edit Root:"
 msgstr "Kořen živých úprav:"
@@ -2867,6 +3265,9 @@ msgstr ""
 "Tato metoda je volána enginem.\n"
 "Lze ji přepsat pro změnu vestavěného chování."
 
+msgid "This method is required to be overridden when extending its base class."
+msgstr "Tuto metodu je nutné přepsat při rozšiřování její základní třídy."
+
 msgid ""
 "This method has no side effects.\n"
 "It does not modify the object in any way."
@@ -2881,6 +3282,9 @@ msgstr ""
 "Tato metoda nepotřebuje ke svému volání instanci objektu.\n"
 "Lze ji zavolat přimo použitím jména třídy."
 
+msgid "This method must be implemented to complete the abstract class."
+msgstr "Tato metoda musí být implementována pro dokončení abstraktní třídy."
+
 msgid "Code snippet copied to clipboard."
 msgstr "Úryvek kódu zkopírován do schránky."
 
@@ -3026,7 +3430,7 @@ msgid "Fonts"
 msgstr "Fonty"
 
 msgid "Font Sizes"
-msgstr "Velikosti fontů"
+msgstr "Velikosti fontu"
 
 msgid "Icons"
 msgstr "Ikony"
@@ -3121,6 +3525,9 @@ msgstr "Kliknutím zkopírujete."
 msgid "Click to open in browser."
 msgstr "Kliknutím otevřete v prohlížeci."
 
+msgid "Toggle Files Panel"
+msgstr "Přepnout dokování panelu skriptů"
+
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -3184,6 +3591,9 @@ msgstr "Místní proměnná"
 msgid "This variable may be changed or removed in future versions."
 msgstr "Tato proměnná může být v budoucích verzích změněna nebo odstraněna."
 
+msgid "Text File"
+msgstr "Textový soubor"
+
 msgid "File"
 msgstr "Soubor"
 
@@ -3208,6 +3618,9 @@ msgstr "Tato cesta neexistuje."
 msgid "Search"
 msgstr "Hledat"
 
+msgid "Search Documentation"
+msgstr "Prohledat dokumentaci"
+
 msgid "Previous Match"
 msgstr "Předchozí shoda"
 
@@ -3239,7 +3652,7 @@ msgid "Operator"
 msgstr "Operátor"
 
 msgid "Search Help"
-msgstr "Hledat v dokumentaci"
+msgstr "Hledat v nápovědě"
 
 msgid "Case Sensitive"
 msgstr "Rozlišovat velká a malá písmena"
@@ -3248,7 +3661,7 @@ msgid "Show Hierarchy"
 msgstr "Zobrazit hierarchii"
 
 msgid "Filter"
-msgstr "Filtr"
+msgstr "Filtrovat"
 
 msgid "Display All"
 msgstr "Zobrazit vše"
@@ -3322,12 +3735,24 @@ msgstr "Posunout dok o jednu záložku doleva."
 msgid "Close this dock."
 msgstr "Zavřít tento dok."
 
+msgid "This dock can't be closed."
+msgstr "Tento dok nemůže být uzavřen."
+
+msgid "This dock does not support floating."
+msgstr "Tento dok nepodporuje plovoucí režim."
+
 msgid "Make this dock floating."
 msgstr "Otevřít jako plovoucí dok."
 
+msgid "Move Tab Left"
+msgstr "Posunout záložku doleva"
+
 msgid "Dock Position"
 msgstr "Pozice doku"
 
+msgid "Move Tab Right"
+msgstr "Posunout záložku doprava"
+
 msgid "Make Floating"
 msgstr "Změnit v plovoucí"
 
@@ -3393,7 +3818,7 @@ msgid ""
 "After renaming to an unknown extension, the file won't be shown in the editor "
 "anymore."
 msgstr ""
-"Tato přípona není editorem rozpoznána.\n"
+"Přípona tohoto souboru není editorem rozpoznána.\n"
 "Chcete-lit soubor přesto přejmenovat, použijte průzkumník souborů operačního "
 "systému.\n"
 "Po přejmenování na neznámou příponu nebude soubor nadále zobrazen v editoru."
@@ -3449,6 +3874,21 @@ msgstr "Přejete si tyto soubory převést na %s? (Tuto operaci nelze vzít zpě
 msgid "Could not create folder: %s"
 msgstr "Nepodařilo se vytvořit složku: %s"
 
+msgid "Copy %d selected item to \"%s\"?"
+msgid_plural "Copy %d selected items to \"%s\"?"
+msgstr[0] "Kopírovat %d vybranou položku do \"%s\"?"
+msgstr[1] "Kopírovat %d vybrané položky do \"%s\"?"
+msgstr[2] "Kopírovat %d vybraných položek do \"%s\"?"
+
+msgid "Move %d selected item to \"%s\"?"
+msgid_plural "Move %d selected items to \"%s\"?"
+msgstr[0] "Přesunout %d vybranou položku do \"%s\"?"
+msgstr[1] "Přesunout %d vybrané položky do \"%s\"?"
+msgstr[2] "Přesunout %d vybraných položek do \"%s\"?"
+
+msgid "Open Scene"
+msgstr "Otevřít scénu"
+
 msgid "New Inherited Scene"
 msgstr "Nová zděděná scéna"
 
@@ -3558,14 +3998,17 @@ msgid "Sort by Type (Descending)"
 msgstr "Seřadit podle typu (sestupně)"
 
 msgid "Sort by Last Modified"
-msgstr "Seřadit od naposledy změněných"
+msgstr "Seřadit od posledně změněných"
 
 msgid "Sort by First Modified"
-msgstr "Seřadit od nejdříve změných"
+msgstr "Seřadit od prvně změněných"
 
 msgid "FileSystem"
 msgstr "Souborový systém"
 
+msgid "Open FileSystem Dock"
+msgstr "Otevřít dok souborového systému"
+
 msgid "Copy Path"
 msgstr "Kopírovat cestu"
 
@@ -3617,6 +4060,15 @@ msgstr "Změnit režim rozdělení"
 msgid "Filter Files"
 msgstr "Filtrovat soubory"
 
+msgid "Directories"
+msgstr "Adresáře"
+
+msgid "Display Mode"
+msgstr "Režim Zobrazení"
+
+msgid "Files"
+msgstr "Soubory"
+
 msgid ""
 "Scanning Files,\n"
 "Please Wait..."
@@ -3624,6 +4076,9 @@ msgstr ""
 "Prohledávání souborů,\n"
 "Čekejte prosím..."
 
+msgid "Filesystem Scan"
+msgstr "Prohledat souborového systému"
+
 msgid "Overwrite"
 msgstr "Přepsat"
 
@@ -3639,6 +4094,9 @@ msgstr "Převést"
 msgid "Groups"
 msgstr "Skupiny"
 
+msgid "Open Groups Dock"
+msgstr "Otevřít dok skupin"
+
 msgid "Scene Groups"
 msgstr "Skupiny scény"
 
@@ -3705,12 +4163,18 @@ msgstr "Přidat novou skupinu."
 msgid "Filter Groups"
 msgstr "Filtrovat skupiny"
 
+msgid "Select one or more nodes to edit their groups."
+msgstr "Vyberte jeden nebo více uzlů pro úpravu jejich skupin."
+
 msgid "The Beginning"
 msgstr "Začátek"
 
 msgid "History"
 msgstr "Historie"
 
+msgid "Open History Dock"
+msgstr "Otevřít dok historie"
+
 msgid "Scene"
 msgstr "Scéna"
 
@@ -3740,12 +4204,15 @@ msgid ""
 msgstr ""
 "Máte čekající změny, které ještě nebyly použity. Klepnutím na tlačítko Znovu "
 "importovat uplatníte změny provedené v možnostech importu.\n"
-"Výběrem jiného zdroje v doku Souborový systém bez předchozího kliknutí na "
+"Výběrem jiného zdroje v doku Souborového systému bez předchozího kliknutí na "
 "tlačítko Znovu importovat se změny provedené v doku Import zruší."
 
 msgid "Import"
 msgstr "Import"
 
+msgid "Open Import Dock"
+msgstr "Otevřít dok importu"
+
 msgid "Import As:"
 msgstr "Importovat jako:"
 
@@ -3782,6 +4249,9 @@ msgid ""
 msgstr ""
 "Následující zdroje budou duplikovány a vloženy do tohoto zdroje/objektu."
 
+msgid "This object has no resources to duplicate."
+msgstr "Tento objekt nemá žádné zdroje k duplikování."
+
 msgid "Failed to load resource."
 msgstr "Selhalo nahrání zdroje."
 
@@ -3801,7 +4271,7 @@ msgid "Capitalized (e.g. \"%s\")"
 msgstr "Velká písmena (např. \"%s\")"
 
 msgid "Localized (e.g. \"Z Index\")"
-msgstr "Přeložit (např. \"Z-Index\")"
+msgstr "Lokalizace (např. \"Z-Index\")"
 
 msgid "Localization not available for current language."
 msgstr "Překlad pro aktuální jazyk není dostupný."
@@ -3818,6 +4288,9 @@ msgstr "Udělat dílčí zdroje unikátní"
 msgid "Inspector"
 msgstr "Inspektor"
 
+msgid "Open Inspector Dock"
+msgstr "Otevřít dok inspektoru"
+
 msgid "Create a new resource in memory and edit it."
 msgstr "Vytvořit nový zdroj v paměti a upravit ho."
 
@@ -3863,6 +4336,9 @@ msgstr "Filtrovat vlastnosti"
 msgid "Manage object properties."
 msgstr "Spravovat vlastnosti objektu."
 
+msgid "Information"
+msgstr "Informace"
+
 msgid "This cannot be undone. Are you sure?"
 msgstr "Toto nelze vrátit zpět. Přejete si pokračovat?"
 
@@ -3882,7 +4358,7 @@ msgid ""
 "Cannot instantiate the scene '%s' because the current scene exists within one "
 "of its nodes."
 msgstr ""
-"Scénu '%s' nelze vytvořit, protože aktuální scéna je jedním z jejích uzlů."
+"Scénu '%s' nelze instancovat, protože aktuální scéna je jedním z jejích uzlů."
 
 msgid "Instantiate Scene"
 msgid_plural "Instantiate Scenes"
@@ -3919,7 +4395,7 @@ msgstr "Duplikovat uzly"
 
 msgid "Can't reparent nodes in inherited scenes, order of nodes can't change."
 msgstr ""
-"Rodičovské uzly ve zděděné scéně nelze změnit. Pořadí uzlů nelze změnit."
+"Rodičovské uzly ve zděděné scéně nelze změnit, pořadí uzlů nelze změnit."
 
 msgid "Node must belong to the edited scene to become root."
 msgstr "Aby se stal kořenovým uzlem, musí uzel patřit k upravované scéně."
@@ -3958,9 +4434,9 @@ msgid ""
 "or create an inherited scene using Scene > New Inherited Scene... instead."
 msgstr ""
 "Nelze uložit větev kořenového uzlu jako instancovanou scénu.\n"
-"Chcete-li vytvořit upravovatelnou kopii současné scény ji duplikujte za "
+"Chcete-li vytvořit upravovatelnou kopii současné scény, duplikujte ji za "
 "pomoci kontextové nabídky doku Souborového systému,\n"
-"nebo vytvořte zděděnou scénu ve Scéna > Nová zděděná scéna..."
+"nebo vytvořte místo toho zděděnou scénu ve Scéna > Nová zděděná scéna..."
 
 msgid ""
 "Can't save the branch of an already instantiated scene.\n"
@@ -3992,12 +4468,19 @@ msgstr ""
 msgid "Save New Scene As..."
 msgstr "Uložit novou scénu jako..."
 
+msgid ""
+"Disabling \"Editable Children\" will cause all properties of this subscene's "
+"descendant nodes to be reverted to their default."
+msgstr ""
+"Zakázání \"Editovatelný Potomek\" způsobí, že všechny vlastnosti uzlů potomků "
+"této scény budou vráceny na původní hodnotu."
+
 msgid ""
 "Enabling \"Load as Placeholder\" will disable \"Editable Children\" and cause "
 "all properties of the node to be reverted to their default."
 msgstr ""
-"Povolení možnosti \"Načíst jako dočasný\" zakáže možnost \"Upravitelní "
-"potomci\" a způsobí, že všechny vlastnosti uzlu budou vráceny na výchozí "
+"Povolení možnosti \"Načíst jako dočasný\" zakáže možnost \"Upravitelný "
+"potomek\" a způsobí, že všechny vlastnosti uzlu budou vráceny na výchozí "
 "hodnoty."
 
 msgid "Make Local"
@@ -4021,6 +4504,9 @@ msgstr "Nový kořen scény"
 msgid "Create Root Node:"
 msgstr "Vytvořit kořenový uzel:"
 
+msgid "Favorite Nodes"
+msgstr "Oblíbené Uzly"
+
 msgid "Toggle the display of favorite nodes."
 msgstr "Přepnout zobrazení oblíbených uzlů."
 
@@ -4140,6 +4626,9 @@ msgstr ""
 msgid "Hide Filtered Out Parents"
 msgstr "Skrýt vyfiltrované rodičovské uzly"
 
+msgid "Show Accessibility Warnings"
+msgstr "Zobrazit varování o přístupnosti"
+
 msgid "All Scene Sub-Resources"
 msgstr "Všechny dílčí zdroje scény"
 
@@ -4157,9 +4646,25 @@ msgstr ""
 msgid "Filter by Type"
 msgstr "Filtrovat podle typu"
 
+msgid ""
+"Selects all Nodes of the given type.\n"
+"Inserts \"type:\". You can also use the shorthand \"t:\"."
+msgstr ""
+"Vybere všechny uzly daného typu.\n"
+"Vložte \"type:\". Může také použít zkratku \"t:\"."
+
 msgid "Filter by Group"
 msgstr "Filtrovat podle skupiny"
 
+msgid ""
+"Selects all Nodes belonging to the given group.\n"
+"If empty, selects any Node belonging to any group.\n"
+"Inserts \"group:\". You can also use the shorthand \"g:\"."
+msgstr ""
+"Vybere všechny uzly patřící do dané skupiny.\n"
+"Ponecháte-li prázdné, vybere jakýkoli uzel patřící do kterékoliv skupiny.\n"
+"Vložte \"skupinu:\". Můžete také použít zkratku \"g:\"."
+
 msgid ""
 "Cannot attach a script: there are no languages registered.\n"
 "This is probably because this editor was built with all language modules "
@@ -4185,11 +4690,14 @@ msgid "<Unnamed> at %s"
 msgstr "<Nepojmenovaný> v %s"
 
 msgid "(used %d times)"
-msgstr "(použito %dkrát)"
+msgstr "(použito %d krát)"
 
 msgid "None"
 msgstr "Žádné"
 
+msgid "Open Scene Dock"
+msgstr "Otevřít dok scény"
+
 msgid "Batch Rename..."
 msgstr "Hromadné přejmenování..."
 
@@ -4281,6 +4789,9 @@ msgstr "Smazat související stopy animace"
 msgid "Clear Inheritance? (No Undo!)"
 msgstr "Vymazat dědičnost? (Nelze vrátit zpět!)"
 
+msgid "Open Signals Dock"
+msgstr "Otevřít dok signálů"
+
 msgid "Paste Params"
 msgstr "Vložit parametry"
 
@@ -4311,9 +4822,15 @@ msgstr "Vytvořit nový %s"
 msgid "Output"
 msgstr "Výstup"
 
+msgid "Toggle Output Dock"
+msgstr "Přepnout dok Výstupu"
+
 msgid "Filter Messages"
 msgstr "Filtrovat zprávy"
 
+msgid "Clear Log"
+msgstr "Vymazat Log"
+
 msgid "Clear Output"
 msgstr "Promazat výstup"
 
@@ -4321,11 +4838,17 @@ msgid ""
 "Collapse duplicate messages into one log entry. Shows number of occurrences."
 msgstr "Sloučit duplicitní zprávy do jednoho záznamu. Zobrazuje počet výskytů."
 
+msgid "Show Search"
+msgstr "Zobrazit Hledání"
+
 msgid "Focus Search/Filter Bar"
 msgstr "Zaměřit pole vyhledávání/filtrování"
 
+msgid "Standard Messages"
+msgstr "Běžné zprávy"
+
 msgid "Toggle visibility of standard output messages."
-msgstr "Přepnout viditelnost standardních výstupních zpráv."
+msgstr "Přepnout viditelnost běžných výstupních zpráv."
 
 msgid "Toggle visibility of errors."
 msgstr "Přepnout viditelnost chyb."
@@ -4336,6 +4859,9 @@ msgstr "Varování"
 msgid "Toggle visibility of warnings."
 msgstr "Přepnout viditelnost varování."
 
+msgid "Editor Messages"
+msgstr "Zprávy Editoru"
+
 msgid "Toggle visibility of editor messages."
 msgstr "Přepnout viditelnost zpráv editoru."
 
@@ -4348,9 +4874,24 @@ msgstr ""
 "přepsána.\n"
 "Odeberte \"%s\" adresář ručně před pokusem o zopakování této operace."
 
+msgid ""
+"This will set up your project for gradle Android builds by installing the "
+"source template to \"%s\".\n"
+"Note that in order to make gradle builds instead of using pre-built APKs, the "
+"\"Use Gradle Build\" option should be enabled in the Android export preset."
+msgstr ""
+"Tímto nastavíte svůj projekt pro sestavení gradle Android instalací zdrojové "
+"šablony \"%s\".\n"
+"Všimněte si, že chcete-li vytvářet sestavení gradle namísto použití předem "
+"sestavených souborů APK, měla by být v předvolbě exportu povolena možnost "
+"\"Použít sestavení Gradle\"."
+
 msgid "Unnamed Project"
 msgstr "Nepojmenovaný projekt"
 
+msgid "%s (Overridden)"
+msgstr "%s (Přepsáno)"
+
 msgid "Recovery Mode is enabled. Editor functionality has been restricted."
 msgstr "Režim obnovy je aktivní. Funkčnost editoru byla omezena."
 
@@ -4372,6 +4913,23 @@ msgstr "Importované zdroje nelze uložit."
 msgid "Error saving resource!"
 msgstr "Chyba při ukládání zdroje!"
 
+msgid ""
+"The text-based resource at path \"%s\" is large on disk (%s), likely because "
+"it has embedded binary data.\n"
+"This slows down resource saving and loading.\n"
+"Consider saving its binary subresource(s) to a binary `.res` file or saving "
+"the resource as a binary `.res` file.\n"
+"This warning can be disabled in the Editor Settings (FileSystem > On Save > "
+"Warn on Saving Large Text Resources)."
+msgstr ""
+"Textový zdroj na cestě \"%s\" je na disku (%s) velký, pravděpodobně proto, že "
+"má vložená binární data.\n"
+"To zpomaluje úsporu zdrojů a načítání.\n"
+"Zvažte uložení jeho binárního podzdroje(ů) do binárního souboru `.res` nebo "
+"uložení zdroje jako binárního souboru `.res`.\n"
+"Toto varování lze deaktivovat v Nastavení editoru (Systém souborů > Při "
+"ukládání > Varovat při ukládání velkých textových zdrojů)."
+
 msgid ""
 "This resource can't be saved because it was imported from another file. Make "
 "it unique first."
@@ -4402,7 +4960,7 @@ msgid "Can't open file '%s'. The file could have been moved or deleted."
 msgstr "Nelze otevřít soubor '%s'. Soubor mohl být přesunut nebo smazán."
 
 msgid "Error while parsing file '%s'."
-msgstr "Chyba při rozboru souboru '%s'."
+msgstr "Chyba při parsování souboru '%s'."
 
 msgid "Scene file '%s' appears to be invalid/corrupt."
 msgstr "Soubor scény '%s' se zdá být neplatný nebo poškozený."
@@ -4426,6 +4984,9 @@ msgstr "Ukládání scény"
 msgid "Analyzing"
 msgstr "Probíhá analýza"
 
+msgid "Creating Thumbnail"
+msgstr "Vytváření miniatury"
+
 msgid "This operation can't be done without a tree root."
 msgstr "Tuto operaci nelze provést bez kořenového uzlu stromu."
 
@@ -4433,7 +4994,7 @@ msgid ""
 "This scene can't be saved because there is a cyclic instance inclusion.\n"
 "Please resolve it and then attempt to save again."
 msgstr ""
-"Tuto scénu nelze uložit, protože obsahuje cyklické vložení instancí.\n"
+"Tuto scénu nelze uložit, protože obsahuje cyklické zahrnutí instance.\n"
 "Vyřešte ho prosím a zkuste scénu uložit znovu."
 
 msgid ""
@@ -4443,6 +5004,23 @@ msgstr ""
 "Scénu se nepodařilo uložit. Pravděpodobně nelze splnit závislosti (instance "
 "nebo dědičnost)."
 
+msgid ""
+"The text-based scene at path \"%s\" is large on disk (%s), likely because it "
+"has embedded binary data.\n"
+"This slows down scene saving and loading.\n"
+"Consider saving its binary subresource(s) to a binary `.res` file or saving "
+"the scene as a binary `.scn` file.\n"
+"This warning can be disabled in the Editor Settings (FileSystem > On Save > "
+"Warn on Saving Large Text Resources)."
+msgstr ""
+"Textování scéna na cestě \"%s\" je na disku (%s) velká, pravděpodobně proto, "
+"že má vložená binární data.\n"
+"To zpomaluje ukládání a načítání scény.\n"
+"Zvažte uložení jeho binárního podzdroje(ů) do binárního souboru `.res` nebo "
+"uložení scény jako binárního souboru `.scn`.\n"
+"Toto varování může být deaktivováno v Nastavení Editoru (Souborový systém > "
+"Při ukládání > Varování při ukládání velkých textových zdrojů)."
+
 msgid "Save scene before running..."
 msgstr "Uložit scénu před spuštěním..."
 
@@ -4571,6 +5149,9 @@ msgstr ""
 msgid "Save Scene As..."
 msgstr "Uložit scénu jako..."
 
+msgid "Save new main scene..."
+msgstr "Uložit novou hlavní scénu..."
+
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Nelze vrátit zpět, když jsou stisknuta tlačítka myši."
 
@@ -4607,12 +5188,21 @@ msgstr "Nelze znovu načíst scénu, která nebyla nikdy uložena."
 msgid "Save & Reload"
 msgstr "Uložit a znovu načíst"
 
+msgid "Save before reloading the scene?"
+msgstr "Uložit před obnovou scény?"
+
 msgid "Stop running project before reloading the current project?"
 msgstr "Zastavit běh projektu předtím, než se projekt znovu načte z disku?"
 
+msgid "Stop & Reload"
+msgstr "Zastavit a znovu načíst"
+
 msgid "Stop running project before exiting the editor?"
 msgstr "Zastavit běh projektu před ukončením editoru?"
 
+msgid "Stop & Quit"
+msgstr "Zastavit a Ukončit"
+
 msgid "Save modified resources before reloading?"
 msgstr "Uložit změněné zdroje před opětovným načtením?"
 
@@ -4647,6 +5237,9 @@ msgstr "Tuto operaci nelze provést bez scény."
 msgid "Export Mesh Library"
 msgstr "Exportovat knihovnu sítí"
 
+msgid "All scenes are already saved."
+msgstr "Všechny scény již byly uloženy."
+
 msgid "Quick Open Color Palette..."
 msgstr "Rychle otevřít paletu barev..."
 
@@ -4723,6 +5316,9 @@ msgstr ""
 "Podpora více oken není dostupná, protože je v Nastavení editoru zakázáno "
 "Rozhraní > Více oken > Povolit."
 
+msgid "No Recent Scenes"
+msgstr "Žádné nedávné scény"
+
 msgid "Clear Recent Scenes"
 msgstr "Promazat nedávné scény"
 
@@ -4791,6 +5387,13 @@ msgstr ""
 "Skript nelze spustit, protože se nejedná o nástrojový skript (nahoře přidejte "
 "anotaci @tool)."
 
+msgid ""
+"Cannot run the script because it's not a tool script (add the [Tool] "
+"attribute above the class definition)."
+msgstr ""
+"Skript nelze spustit, protože se nejedná o nástrojový skript (přidejte "
+"atribut [Tool] nad definici třídy)."
+
 msgid "Cannot run the script because it's not a tool script."
 msgstr "Skript nelze spustit, protože se nejedná o nástrojový skript."
 
@@ -4851,6 +5454,21 @@ msgstr "Opětovné načítání dokončeno."
 msgid "Save & Restart"
 msgstr "Uložit a restartovat"
 
+msgid ""
+"Changing the renderer requires restarting the editor.\n"
+"\n"
+"Choosing Save & Restart will change the renderer to:\n"
+"- Desktop platforms: %s\n"
+"- Mobile platforms: %s\n"
+"- Web platform: %s"
+msgstr ""
+"Změna vykreslovacího nástroje vyžaduje restart editoru.\n"
+"\n"
+"Volbou Uložit a Restartovat změníte způsob vykreslování na:\n"
+"- Desktopové platformy: %s\n"
+"- Mobilní platformy: %s\n"
+"- Webová platforma: %s"
+
 msgid "Forward+"
 msgstr "Forward+"
 
@@ -4858,7 +5476,7 @@ msgid "Mobile"
 msgstr "Mobile"
 
 msgid "Compatibility"
-msgstr "Compatibility"
+msgstr "Kompatibilita"
 
 msgid "Open Recent"
 msgstr "Otevřít nedávné"
@@ -4917,6 +5535,9 @@ msgstr "Konfigurovat importér FBX..."
 msgid "Copies the system info as a single-line text into the clipboard."
 msgstr "Zkopíruje informace o systému do schránky jako jeden řádek textu."
 
+msgid "Main Menu"
+msgstr "Hlavní Menu"
+
 msgid "Lock Selected Node(s)"
 msgstr "Uzamknout vybrané uzly"
 
@@ -4992,6 +5613,9 @@ msgstr "Znovu načíst uloženou scénu"
 msgid "Close Scene"
 msgstr "Zavřít scénu"
 
+msgid "Close All Scenes"
+msgstr "Zavřít všechny scény"
+
 msgid "Editor Settings..."
 msgstr "Nastavení editoru..."
 
@@ -5019,6 +5643,9 @@ msgstr "Průzkumník osiřelých zdrojů..."
 msgid "Engine Compilation Configuration Editor..."
 msgstr "Editor konfigurace kompilace enginu..."
 
+msgid "Upgrade Project Files..."
+msgstr "Aktualizovat soubory projektu..."
+
 msgid "Reload Current Project"
 msgstr "Znovu načíst aktuální projekt"
 
@@ -5061,6 +5688,12 @@ msgstr "O aplikaci Godot..."
 msgid "Support Godot Development"
 msgstr "Podpořit projekt Godot"
 
+msgid "Open 2D Workspace"
+msgstr "Otevřít 2D Pracovní prostor"
+
+msgid "Open 3D Workspace"
+msgstr "Otevřít 3D Pracovní prostor"
+
 msgid "Open Script Editor"
 msgstr "Otevřít editor skriptů"
 
@@ -5079,6 +5712,27 @@ msgstr "Otevřít předchozí editor"
 msgid "Project"
 msgstr "Projekt"
 
+msgid ""
+"Choose a renderer.\n"
+"\n"
+"Notes:\n"
+"- On mobile platforms, the Mobile renderer is used if Forward+ is selected "
+"here.\n"
+"- On the web platform, the Compatibility renderer is always used."
+msgstr ""
+"Zvolte metodu vykreslování.\n"
+"\n"
+"Poznámky:\n"
+"- Zvolíte-li zde Forward+, bude na mobilních platformách použito vykreslování "
+"Mobile.\n"
+"- Na webové platformě se vždy použije vykreslování Compatibility."
+
+msgid "Renderer"
+msgstr "Vykreslovací nástroj"
+
+msgid "Update Mode"
+msgstr "Režim Aktualizace"
+
 msgid "Update Continuously"
 msgstr "Aktualizovat průběžně"
 
@@ -5147,6 +5801,9 @@ msgstr "Chyby načítání"
 msgid "Select Current"
 msgstr "Vybrat aktuální"
 
+msgid "Open Project Settings"
+msgstr "Otevřít Nastavení projektu"
+
 msgid "Ok"
 msgstr "Ok"
 
@@ -5313,6 +5970,9 @@ msgid "At least one system boot time access reason should be selected."
 msgstr ""
 "Měl by být vybrán alespoň jeden důvod pro přístup k času spuštění systému."
 
+msgid "\"Shader Baker\" doesn't work with the Compatibility renderer."
+msgstr "\"Shader Baker\" nefunguje s rendererem kompatibility."
+
 msgid ""
 "The editor is currently using a different renderer than what the target "
 "platform will use. \"Shader Baker\" won't be able to include core shaders. "
@@ -5351,6 +6011,16 @@ msgstr "Nepodařilo se vytvořit adresář: \"%s\""
 msgid "Could not create and open the directory: \"%s\""
 msgstr "Nepodařilo se vytvořit a otevřít adresář: \"%s\""
 
+msgid "Apple Embedded Plugins"
+msgstr "Vestavěné pluginy Apple"
+
+msgid ""
+"Failed to export Apple Embedded plugins with code %d. Please check the output "
+"log."
+msgstr ""
+"Nepodařilo se exportovat vestavěné moduly Apple s kódem %d. Zkontrolujte "
+"prosím výstupní log."
+
 msgid "Could not create a directory at path \"%s\"."
 msgstr "Nepodařilo se vytvořit adresář: \"%s\"."
 
@@ -5399,6 +6069,18 @@ msgstr ""
 "Sestavit .ipa je možné pouze na macOS. Xcode projekt opuštěn bez sestavení "
 "balíčku."
 
+msgid ""
+"Exporting to an Apple Embedded platform when using C#/.NET is experimental "
+"and requires macOS."
+msgstr ""
+"Export pro vestavěnou platformu Apple při využití C#/.NET je experimentální a "
+"vyžaduje macOS."
+
+msgid ""
+"Exporting to an Apple Embedded platform when using C#/.NET is experimental."
+msgstr ""
+"Export pro vestavěnou platformu Apple za použití C#/.NET je experimentální."
+
 msgid "Custom debug template not found."
 msgstr "Vlastní šablona pro ladění nebyla nalezena."
 
@@ -5432,6 +6114,11 @@ msgstr "Instalace selhala, více informací naleznete v logu editoru."
 msgid "Running failed, see editor log for details."
 msgstr "Běh selhal, více informací naleznete v logu editoru."
 
+msgid "\"Shader Baker\" is not supported when using the Compatibility renderer."
+msgstr ""
+"\"Shader Baker\" není při použití vykreslovacího nástroje Compatibility "
+"podporován."
+
 msgid ""
 "The editor is currently using a different renderer than what the target "
 "platform will use. \"Shader Baker\" won't be able to include core shaders. "
@@ -5606,6 +6293,14 @@ msgstr "Žádné šablony pro vývojová sestavení"
 msgid "Official export templates aren't available for development builds."
 msgstr "Oficiální šablony exportu nejsou k dispozici pro vývojová sestavení."
 
+msgid "No templates for double-precision builds"
+msgstr "Žádné šablony pro sestavení s dvojitou přesností"
+
+msgid "Official export templates aren't available for double-precision builds."
+msgstr ""
+"Oficiální šablony exportu nejsou k dispozici pro sestavení s dvojitou "
+"přesností."
+
 msgid "Uncompressing Android Build Sources"
 msgstr "Dekomprese zdrojů sestavení pro Android"
 
@@ -5618,6 +6313,9 @@ msgstr "Aktuální verze:"
 msgid "Export templates are installed and ready to be used."
 msgstr "Exportní šablony jsou nainstalovány a připraveny k použití."
 
+msgid "Installed Path"
+msgstr "Cesta instalace"
+
 msgid "Open Folder"
 msgstr "Otevřít složku"
 
@@ -5633,6 +6331,12 @@ msgstr "Odinstalovat šablony pro aktuální verzi."
 msgid "Download from:"
 msgstr "Stáhnout z:"
 
+msgid "Mirror"
+msgstr "Zrcadlový server"
+
+msgid "Mirror Options"
+msgstr "Možnosti zrcadlového serveru"
+
 msgid "Open in Web Browser"
 msgstr "Otevřít ve webovém prohlížeči"
 
@@ -5697,6 +6401,9 @@ msgstr ""
 "Cílová platforma vyžaduje kompresi textur '%s'. Abyste toto opravili, povolte "
 "'Import %s'."
 
+msgid "Show Project Setting"
+msgstr "Ukázat Nastavení Projektu"
+
 msgid "Runnable"
 msgstr "Spustitelný"
 
@@ -5708,6 +6415,12 @@ msgstr ""
 "Pro správné fungování \"Exportovat vše\" musí mít všechny profily definovanou "
 "cestu pro export."
 
+msgid "Hide encryption key"
+msgstr "Schovat šifrovací klíč"
+
+msgid "Show encryption key"
+msgstr "Zobrazit šifrovací klíč"
+
 msgid "Delete preset '%s'?"
 msgstr "Odstranit profil '%s'?"
 
@@ -5769,6 +6482,9 @@ msgstr "Možnosti"
 msgid "Resources"
 msgstr "Zdroje"
 
+msgid "Export Mode"
+msgstr "Exportní Režim"
+
 msgid "Export all resources in the project"
 msgstr "Exportovat včechny zdroje tohoto projektu"
 
@@ -5797,6 +6513,9 @@ msgstr "Odebrat vizuály"
 msgid "Keep"
 msgstr "Zachovat"
 
+msgid "Include Filters"
+msgstr "Zahrnout Filtry"
+
 msgid ""
 "Filters to export non-resource files/folders\n"
 "(comma-separated, e.g: *.json, *.txt, docs/*)"
@@ -5804,6 +6523,9 @@ msgstr ""
 "Filtry pro export souborů/složek, které nejsou zdroji\n"
 "(oddělené čárkou, např. *.json, *.txt, docs/*)"
 
+msgid "Exclude Filters"
+msgstr "Vyloučit Filtry"
+
 msgid ""
 "Filters to exclude files/folders from project\n"
 "(comma-separated, e.g: *.json, *.txt, docs/*)"
@@ -5811,6 +6533,38 @@ msgstr ""
 "Filtry pro vynechání souborů/složek z projektu\n"
 "(oddělené čárkou, např. *.json, *.txt, docs/*)"
 
+msgid "Patching"
+msgstr "Opravování"
+
+msgid "Enable Delta Encoding"
+msgstr "Povolit Delta kódování"
+
+msgid "Delta Encoding Compression Level"
+msgstr "Level komprese Delta kódování"
+
+msgid "Delta Encoding Minimum Size Reduction"
+msgstr "Minimální zmenšení velikost Delta kódování"
+
+msgid "Delta Encoding Include Filters"
+msgstr "Zahrnuté filtry Delta kódování"
+
+msgid ""
+"Filters to include files/folders from being delta-encoded\n"
+"(comma-separated, e.g: *.gdc, scripts/*)"
+msgstr ""
+"Filtry pro zahrnutí souborů/složek z delta kódování\n"
+"(oddělené čárkou, např. *.gdc, skripty/*)"
+
+msgid "Delta Encoding Exclude Filters"
+msgstr "Zahrnuté filtry Delta kódování"
+
+msgid ""
+"Filters to exclude files/folders from being delta-encoded\n"
+"(comma-separated, e.g: *.ctex, textures/*)"
+msgstr ""
+"Filtry pro vynechání souborů/složek z delta kódování\n"
+"(oddělené čárkou, např. *.ctex, textury/*)"
+
 msgid "Base Packs:"
 msgstr "Základní balíčky:"
 
@@ -5843,7 +6597,7 @@ msgid ""
 "(comma-separated, e.g: *.tscn, *.tres, scenes/*)"
 msgstr ""
 "Filtry pro zahrnutí souborů/složek\n"
-"(oddělené čárkou, např. *.json, *.tres, scenes/*)"
+"(oddělené čárkou, např. *.tscn, *.tres, scény/*)"
 
 msgid ""
 "Filters to exclude files/folders\n"
@@ -5859,7 +6613,7 @@ msgid "Invalid Encryption Key (must be 64 hexadecimal characters long)"
 msgstr "Neplatný šifrovací klíč (musí být dlouhý 64 hexadecimálních znaků)"
 
 msgid "Initialization vector seed"
-msgstr "Seed vektoru inicializace"
+msgstr "Inicializace seedu vektoru"
 
 msgid ""
 "Note: Encryption key needs to be stored in the binary,\n"
@@ -5883,6 +6637,13 @@ msgstr "Binární tokeny (rychlejší načítání)"
 msgid "Compressed binary tokens (smaller files)"
 msgstr "Komprimované binární tokeny (menší soubory)"
 
+msgid ""
+"No presets found.\n"
+"Create one so that its parameters can be edited here."
+msgstr ""
+"Nenalezeny žádné předvolby.\n"
+"Vytvořit jeden tak, aby jeho parametry mohly být upravovány zde."
+
 msgid "Export PCK/ZIP..."
 msgstr "Exportovat PCK/ZIP..."
 
@@ -5924,9 +6685,25 @@ msgstr "Export projektu"
 msgid "Manage Export Templates"
 msgstr "Spravovat exportní šablony"
 
+msgid "Baking shaders"
+msgstr "Baking Shaders"
+
+msgid "Search Replacement For: %s"
+msgstr "Hledat náhradu za: %s"
+
 msgid "Dependencies For:"
 msgstr "Závislosti na:"
 
+msgid ""
+"Scene \"%s\" is currently being edited. Changes will only take effect when "
+"reloaded."
+msgstr ""
+"Scéna \"%s\" je právě upravována. Změny se projeví až po opětovném načtení."
+
+msgid "Resource \"%s\" is in use. Changes will only take effect when reloaded."
+msgstr ""
+"Zdroj \"%s\" je právě používán. Změny se projeví až po opětovném načtení."
+
 msgid "Dependencies"
 msgstr "Závislosti"
 
@@ -5942,8 +6719,14 @@ msgstr "Editor závislostí"
 msgid "Owners of: %s (Total: %d)"
 msgstr "Vlastníci: %s (Dohromady: %d)"
 
+msgid "No owners found for: %s"
+msgstr "Nenalezen žádný vlastník pro: %s"
+
+msgid "Owners List"
+msgstr "Seznam vlastníků"
+
 msgid "Localization remap"
-msgstr "Přepsání lokalizace"
+msgstr "Přemapování lokalizace"
 
 msgid "Localization remap for path '%s' and locale '%s'."
 msgstr "Přemapování lokalizace pro cestu '%s' a jazyk '%s'."
@@ -5978,6 +6761,12 @@ msgstr "Soubory ke smazání:"
 msgid "Dependencies of files to be deleted:"
 msgstr "Závislosti souborů ke smazání:"
 
+msgid "Error loading: %s"
+msgstr "Chyba při načítání: %s"
+
+msgid "Referenced by %s"
+msgstr "Odkazováno od %s"
+
 msgid "Fix Dependencies"
 msgstr "Opravit závislosti"
 
@@ -6069,6 +6858,9 @@ msgstr "Provádění operací po opětovném importu..."
 msgid "Copying files..."
 msgstr "Kopírování souborů..."
 
+msgid "Remapping dependencies..."
+msgstr "Přemapování závislostí..."
+
 msgid "Go to Line"
 msgstr "Jít na řádek"
 
@@ -6084,6 +6876,9 @@ msgstr "Schovat nahrazení"
 msgid "Show Replace"
 msgstr "Zobrazit nahrazení"
 
+msgid "Replace Mode"
+msgstr "Režim Nahrazování"
+
 msgid "Match Case"
 msgstr "Rozlišovat velká a malá písmena"
 
@@ -6107,6 +6902,16 @@ msgctxt "Indentation"
 msgid "Tabs"
 msgstr "Tabulátory"
 
+msgid "Zoom Factor"
+msgstr "Faktor přiblížení"
+
+msgid ""
+"%s+Mouse Wheel, %s/%s: Finetune\n"
+"%s: Reset"
+msgstr ""
+"%s+kolečko myši, %s/%s: Doladit\n"
+"%s: Obnovit"
+
 msgid "Zoom In"
 msgstr "Přiblížit"
 
@@ -6250,6 +7055,9 @@ msgstr "Přispěvatelé do enginu Godot"
 msgid "Double-click to open in browser."
 msgstr "Dvakrát klikněte pro otevření v prohlížeči."
 
+msgid "No distractions for this, close that game first."
+msgstr "Žádné rušivé elementy, nejdříve zavřete tuto hru."
+
 msgid "Thanks from the Godot community!"
 msgstr "Děkujeme za komunitu Godotu!"
 
@@ -6318,6 +7126,15 @@ msgstr "Vybrat zdroj"
 msgid "Select Scene"
 msgstr "Vybrat scénu"
 
+msgid "Recursion detected, Instant Preview failed."
+msgstr "Byla detekována rekurze, okamžitý náhled selhal."
+
+msgid "Instant Preview"
+msgstr "Okamžitý náhled"
+
+msgid "Selected resource will be previewed in the editor before accepting."
+msgstr "Vybraný zdroj bude před přijetím zobrazen v náhledu v editoru."
+
 msgid "Fuzzy Search"
 msgstr "Přibližné vyhledávání"
 
@@ -6345,12 +7162,21 @@ msgstr "Mřížka"
 msgid "List view"
 msgstr "Seznam"
 
+msgid "Hold %s to round to integers."
+msgstr "Podržte %s pro zaokrouhlení na celá čísla."
+
+msgid "Hold Shift for more precise changes."
+msgstr "Pro přesnější změny podržte Shift."
+
 msgid "No notifications."
 msgstr "Žádná oznámení."
 
 msgid "Show notifications."
 msgstr "Zobrazit oznámení."
 
+msgid "Notifications:"
+msgstr "Oznámení:"
+
 msgid "Silence the notifications."
 msgstr "Ztišit oznámení."
 
@@ -6367,9 +7193,24 @@ msgstr ""
 "Datum Git commitu: %s\n"
 "Kliknutím zkopírujete informace o verzi."
 
+msgid "Switch Layout"
+msgstr "Změnit rozvržení"
+
+msgid "Lock Panel"
+msgstr "Zamknutí panelu"
+
+msgid "Switch Embedded Panel Position"
+msgstr "Změnit pozici vestaveného panelu"
+
 msgid "Make this panel floating in the screen %d."
 msgstr "Otevřít tento panel jako plovoucí dok na obrazovce %d."
 
+msgid "Make this panel floating."
+msgstr "Otevřít jako plovoucí panel."
+
+msgid "Right-click to open the screen selector."
+msgstr "Pravé tlačítko otevře výběr obrazovky."
+
 msgid "Select Screen"
 msgstr "Vybrat obrazovku"
 
@@ -6419,6 +7260,9 @@ msgstr ""
 msgid "Error opening scene"
 msgstr "Chyba při otevírání scény"
 
+msgid "Advanced Import Settings for %s '%s'"
+msgstr "Pokročilá nastavení importu pro %s '%s'"
+
 msgid "Select folder to extract material resources"
 msgstr "Vybrat složku pro extrakci materiálových zdrojů"
 
@@ -6584,7 +7428,7 @@ msgid ""
 "Configure the Beats Per Measure (tempo) used for the interactive streams.\n"
 "This is required in order to configure beat information."
 msgstr ""
-"Konfigurovat doby v taktu (tempo) používaný v interaktivních tocích.\n"
+"Konfigurovat dobu taktu (tempo) používaný v interaktivních tocích.\n"
 "Toto je potřeba pro nastavení informací o tempu."
 
 msgid "Beat Count:"
@@ -6674,6 +7518,9 @@ msgstr ""
 msgid "Configuration:"
 msgstr "Konfigurace:"
 
+msgid "Add new font variation configuration."
+msgstr "Přidat novou konfiguraci varianty písma."
+
 msgid "Clear Glyph List"
 msgstr "Promazat seznam glyfů"
 
@@ -6849,6 +7696,16 @@ msgstr "Metadata s názvem \"%s\" již existují."
 msgid "Names starting with _ are reserved for editor-only metadata."
 msgstr "Názvy začínající znakem _ jsou rezervována pouze pro metadata editoru."
 
+msgid "Property: %s"
+msgstr "Vlastnost: %s"
+
+msgid ""
+"Toggling the checkbox is disabled for Resource properties. Modify the "
+"property using the resource picker instead."
+msgstr ""
+"Přepnutí zatržítka pro vlastnosti zdrojů je zakázáno. Upravte místo toho "
+"vlastnost pomocí výběru zdrojů."
+
 msgid "Unfavorite Property"
 msgstr "Odebrat vlastnost z oblíbených"
 
@@ -6871,9 +7728,24 @@ msgid "Pinning a value forces it to be saved even if it's equal to the default."
 msgstr ""
 "Připnutí hodnoty vynutí její uložení, i když bude shodná s výchozí hodnotou."
 
+msgid "Override for Project"
+msgstr "Přepsat pro projektu"
+
+msgid "Delete Property"
+msgstr "Smazat vlastnost"
+
+msgid "Revert Value"
+msgstr "Vrátit hodnotu"
+
+msgid "Category: %s"
+msgstr "Kategorie: %s"
+
 msgid "Unfavorite All"
 msgstr "Odebrat vše z oblíbených"
 
+msgid "Section: %s"
+msgstr "Sekce: %s"
+
 msgid "On"
 msgstr "Zapnout"
 
@@ -6901,6 +7773,9 @@ msgstr "Změnit velikost pole vlastností s prefixem %s"
 msgid "Element %d: %s%d*"
 msgstr "Prvek %d: %s%d*"
 
+msgid "Array: %s"
+msgstr "Pole: %s"
+
 msgid "Insert New Before"
 msgstr "Vložit nový před"
 
@@ -6922,6 +7797,21 @@ msgstr "Změnit velikost pole"
 msgid "New Size:"
 msgstr "Nová velikost:"
 
+msgid "First Page"
+msgstr "První stránka"
+
+msgid "Previous Page"
+msgstr "Přechozí stránka"
+
+msgid "Page Number"
+msgstr "Číslo stránky"
+
+msgid "Next Page"
+msgstr "Další stránka"
+
+msgid "Last Page"
+msgstr "Poslední stránka"
+
 msgid "Element %s"
 msgstr "Prvek %s"
 
@@ -6955,9 +7845,34 @@ msgstr "Kopírovat cestu k vlastnosti"
 msgid "Edit Text:"
 msgstr "Upravit text:"
 
+msgid "Open Text Edit Dialog"
+msgstr "Otevřít dialog editace textu"
+
+msgid "Enum Options"
+msgstr "Možnosti enumerace"
+
+msgid "Custom Value"
+msgstr "Vlastní hodnota"
+
+msgid "Accept Custom Value Edit"
+msgstr "Přijmout úpravu vlastní hodnoty"
+
+msgid "Cancel Custom Value Edit"
+msgstr "Zrušit úpravu vlastní hodnoty"
+
 msgid "Locale"
 msgstr "Jazyk"
 
+msgid "Toggle Display UID"
+msgstr "Přepnout zobrazení UID"
+
+msgid ""
+"Toggles displaying between path and UID.\n"
+"The UID is the actual value of this property."
+msgstr ""
+"Přepnout zobrazení mezi cestou a UID.\n"
+"UID není aktuální hodnotou této vlastnosti."
+
 msgid "Renaming layer %d:"
 msgstr "Přejmenování vrstvy %d:"
 
@@ -6976,9 +7891,20 @@ msgstr "Žádné pojmenované vrstvy"
 msgid "Edit Layer Names"
 msgstr "Upravit názvy vrstev"
 
+msgid "Layers"
+msgstr "Vrstvy"
+
 msgid "<empty>"
 msgstr "<prázdné>"
 
+msgctxt "Ease Type"
+msgid "Linear"
+msgstr "Lineární"
+
+msgctxt "Ease Type"
+msgid "Zero"
+msgstr "Nulový"
+
 msgid "Temporary Euler may be changed implicitly!"
 msgstr "Dočasné Eulerovy úhly mohou být implicitně změněny!"
 
@@ -6997,15 +7923,24 @@ msgstr ""
 msgid "Temporary Euler"
 msgstr "Dočasný Euler"
 
+msgid "Temporary Euler %s"
+msgstr "Dočasný Euler %s"
+
 msgid "Assign..."
 msgstr "Přiřadit..."
 
+msgid "Assign Node"
+msgstr "Přiřadit uzel"
+
 msgid "Copy as Text"
 msgstr "Kopírovat jako text"
 
 msgid "Show Node in Tree"
 msgstr "Ukázat uzel ve stromu"
 
+msgid "Node Path"
+msgstr "Cesta k uzlu"
+
 msgid "Invalid RID"
 msgstr "Neplatné RID"
 
@@ -7089,6 +8024,33 @@ msgstr "Přidat překlad"
 msgid "Lock/Unlock Component Ratio"
 msgstr "Uzamknout/Odemknout poměr komponent"
 
+msgid "This %s is used in %d place."
+msgid_plural "This %s is used in %d places."
+msgstr[0] "Toto %s je používáno na %d místě."
+msgstr[1] "Toto %s je používáno na %d místech."
+msgstr[2] "Toto %s je používáno na %d místech."
+
+msgid "This %s is external to scene."
+msgstr "Tento %s je mimo scénu."
+
+msgid ""
+"The %s cannot be edited in the inspector and can't be made unique directly."
+msgstr ""
+"%s nelze v inspektoru upravovat and nelze jej přímo nastavit jako jedinečné."
+
+msgid "Left-click to make it unique."
+msgstr "Kliknutím levým tlačítkem myši jej učiníte jedinečným."
+
+msgid "It is possible to make its subresources unique."
+msgstr "Je možné, aby jeho dílčí zdroje byly jedinečné."
+
+msgid "Right-click to make them unique."
+msgstr "Klikněte pravým tlačítkem, aby se staly jedinečné."
+
+msgid "In order to duplicate it, make its parent Resource unique."
+msgstr ""
+"Aby jste jej mohli duplikovat, nastavte jeho nadřazený zdroj jako jedinečný."
+
 msgid ""
 "The selected resource (%s) does not match any type expected for this property "
 "(%s)."
@@ -7105,18 +8067,48 @@ msgstr "Otevře rychlou nabídku pro výběr ze seznamu povolených souborů zdr
 msgid "Inspect"
 msgstr "Prozkoumat"
 
+msgid ""
+"Hold %s while drag-and-dropping from the FileSystem dock or another resource "
+"picker to automatically make a dropped resource unique."
+msgstr ""
+"Držte %s při přetahování z doku Souborového systému nebo jiného nástroje pro "
+"výběr zdrojů, čímž se přetažený zdroj automaticky stane jedinečným."
+
+msgid "This Resource is already unique."
+msgstr "Tento zdroj je již jedinečným."
+
 msgid "Make Unique (Recursive)"
 msgstr "Udělat unikátní (Rekurzivně)"
 
+msgid "In order to duplicate recursively, make its parent Resource unique."
+msgstr ""
+"Aby bylo možné rekurzivně duplikovat, nastavte jeho rodičovský Zdroj jako "
+"jedinečný."
+
+msgid "Subresources have already been made unique."
+msgstr "Dílčí zdroje již byly vytvořeny jako jedinečné."
+
+msgid "Paste as Unique"
+msgstr "Vložit jako unikátní"
+
 msgid "Convert to %s"
 msgstr "Převést na %s"
 
 msgid "Select resources to make unique:"
 msgstr "Vybrat zdroje pro zunikátnění:"
 
+msgid "Duplicate resources"
+msgstr "Duplikovat zdroje"
+
 msgid "New"
 msgstr "Nový"
 
+msgid "Number of Linked Resources."
+msgstr "Počet propojených Zrdojů."
+
+msgid "Assign Resource"
+msgstr "Přiřadit Zdroj"
+
 msgid "Quick Load"
 msgstr "Rychlé načtení"
 
@@ -7126,6 +8118,9 @@ msgstr "Nový shader..."
 msgid "Size: %s"
 msgstr "Velikost: %s"
 
+msgid "Invalid file or broken link."
+msgstr "Neplatný soubor nebo nefunkční odkaz."
+
 msgid "Type: %s"
 msgstr "Typ: %s"
 
@@ -7144,6 +8139,9 @@ msgstr "Délka: %0.3fs"
 msgid "Advanced settings are always shown when searching."
 msgstr "Pokročilá nastavení jsou při hledání vždy zobrazena."
 
+msgid "Event Configured"
+msgstr "Událost nakonfigurována"
+
 msgid "Configure"
 msgstr "Konfigurovat"
 
@@ -7162,6 +8160,9 @@ msgstr "Vybrat virtuální metodu"
 msgid "Select Method"
 msgstr "Vybrat metodu"
 
+msgid "The assigned tool button callback can't be used with multiple nodes."
+msgstr "Zpětné volání přiřazeného tlačítka nástroje nelze použít s více uzly."
+
 msgid ""
 "Name: %s\n"
 "Path: %s\n"
@@ -7209,6 +8210,13 @@ msgstr "Podsložka nesmí být jako již existující."
 msgid "Script extension must match chosen language extension (.%s)."
 msgstr "Přípona skriptu se musí shodovat s příponou zvoleného jazyka (.%s)."
 
+msgid ""
+"Consider enabling GDScript warnings for this plugin by adding an entry for it "
+"to the project setting Debug > GDScript > Warnings > Directory Rules."
+msgstr ""
+"Zvažte povolení varování GDScriptu pro tento zásuvný modul přidáním položky "
+"do nastavení projektu Ladění > GDScript > Varování > Pravidla Adresářů."
+
 msgid "Edit a Plugin"
 msgstr "Upravit zásuvný modul"
 
@@ -7377,6 +8385,9 @@ msgid ""
 "recommended."
 msgstr "Vybraná cesta není prázdná. Je silně doporučeno vybrat prázdnou složku."
 
+msgid "Cannot duplicate a project into itself."
+msgstr "Projekt nelze duplikovat sám so sebe."
+
 msgid "New Game Project"
 msgstr "Nový projekt hry"
 
@@ -7402,7 +8413,7 @@ msgid "Less advanced 3D graphics."
 msgstr "Méně pokročilá 3D grafika."
 
 msgid "Less scalable for complex scenes."
-msgstr "Hůře škáluje pro komplexní scény."
+msgstr "Hůře škálovatelný pro komplexní scény."
 
 msgid "Fast rendering of simple scenes."
 msgstr "Rychlé vykreslování jednoduchých scén."
@@ -7451,6 +8462,9 @@ msgstr "Nepodařilo se otevřít balíček, není ve formátu ZIP."
 msgid "The following files failed extraction from package:"
 msgstr "Selhala extrakce následujících souborů z balíčku:"
 
+msgid "Couldn't duplicate project (error %d)."
+msgstr "Nelze duplikovat projekt (chyba %d)."
+
 msgid ""
 "Couldn't load project at '%s' (error %d). It may be missing or corrupted."
 msgstr ""
@@ -7472,6 +8486,9 @@ msgstr "Vytvořit nový projekt"
 msgid "Install Project:"
 msgstr "Nainstalovat projekt:"
 
+msgid "Duplicate Project"
+msgstr "Duplikovat projekt"
+
 msgid "Project Name:"
 msgstr "Název projektu:"
 
@@ -7484,6 +8501,9 @@ msgstr "Cesta k instalaci projektu:"
 msgid "Renderer:"
 msgstr "Vykreslovací nástroj:"
 
+msgid "More information"
+msgstr "Více informací"
+
 msgid ""
 "RenderingDevice-based methods not available on this GPU:\n"
 "%s\n"
@@ -7507,6 +8527,12 @@ msgstr "Git"
 msgid "Edit Now"
 msgstr "Upravovat nyní"
 
+msgid "Project Name"
+msgstr "Název projektu"
+
+msgid "Project Path"
+msgstr "Cesta k projektu"
+
 msgid "This project was last edited in a different Godot version: "
 msgstr "Tento projekt byl naposledy upraven v jiné verzi Godotu: "
 
@@ -7520,9 +8546,15 @@ msgstr "Chyba: Projekt se nevyskytuje v souborovém systému."
 msgid "Toggle Favorite"
 msgstr "Přepnout oblíbené"
 
+msgid "Open in file manager"
+msgstr "Otevřít ve správci souborů"
+
 msgid "Last edited timestamp"
 msgstr "Datum poslední modifikace"
 
+msgid "Unknown version"
+msgstr "Neznámá verze"
+
 msgid "Scanning"
 msgstr "Prohledávání"
 
@@ -7532,12 +8564,21 @@ msgstr "Prohledávání projektů..."
 msgid "Missing Project"
 msgstr "Chybějící projekt"
 
+msgid "Open in Editor (Verbose Mode)"
+msgstr "Otevřít v editoru (Podrobný režim)"
+
+msgid "Open in Editor (Recovery Mode)"
+msgstr "Otevřít v editoru (Režim obnovy)"
+
 msgid "Run Project"
 msgstr "Spustit projekt"
 
 msgid "Manage Tags"
 msgstr "Spravovat štítky"
 
+msgid "Remove from Project List"
+msgstr "Odstranit z listu projektů"
+
 msgid "New Window"
 msgstr "Nové okno"
 
@@ -7805,9 +8846,21 @@ msgstr "Nelze načíst projekt z '%s'. Může chybět nebo být poškozený."
 msgid "Tag name can't be empty."
 msgstr "Název štítku nesmí být prázdný."
 
+msgid "Tag name can't begin or end with underscore."
+msgstr "Název štítku nesmí začínat nebo končit podtržítkem."
+
+msgid "Tag name can't contain consecutive underscores or spaces."
+msgstr "Název štítku nesmí obsahovat souvislá podtržítka nebo mezery."
+
 msgid "These characters are not allowed in tags: %s."
 msgstr "Tyto znaky nejsou ve štítcích povoleny: %s."
 
+msgid "About Godot"
+msgstr "O aplikaci Godot"
+
+msgid "Window"
+msgstr "Okno"
+
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -7857,6 +8910,9 @@ msgstr ""
 msgid "Edit Project"
 msgstr "Upravit projekt"
 
+msgid "Edit in verbose mode"
+msgstr "Upravit v podrobném režimu"
+
 msgid "Edit in recovery mode"
 msgstr "Upravit v režimu obnovy"
 
@@ -7866,6 +8922,9 @@ msgstr "Odstranit projekt"
 msgid "Remove Missing"
 msgstr "Odstranit nenalezené"
 
+msgid "Donate"
+msgstr "Podpořit"
+
 msgid "Asset Library"
 msgstr "Knihovna zdrojů (AssetLib)"
 
@@ -7888,9 +8947,15 @@ msgstr "Upravovat normálně"
 msgid "Edit in Recovery Mode"
 msgstr "Upravit v Režimu obnovy"
 
+msgid "Backup project first"
+msgstr "Nejprve zálohujte projekt"
+
 msgid "Convert Full Project"
 msgstr "Převést celý projekt"
 
+msgid "See Migration Guide"
+msgstr "Čtěte Průvodce migrací"
+
 msgid ""
 "This option will perform full project conversion, updating scenes, resources "
 "and scripts from Godot 3 to work in Godot 4.\n"
@@ -7935,6 +9000,18 @@ msgstr "Vytvořit nový štítek"
 msgid "Tags are capitalized automatically when displayed."
 msgstr "Štítky jsou automaticky zobrazeny s velkým prvním písmenem."
 
+msgid "New Tag Name"
+msgstr "Nový název štítku"
+
+msgid "example_tag (will display as Example Tag)"
+msgstr "příklad_štítku (zobrazí se jako Ukázkový štítek)"
+
+msgid "Create Tag"
+msgstr "Vytvořit štítek"
+
+msgid "Project Tag: %s"
+msgstr "Štítek projektu: %s"
+
 msgid "Restart Now"
 msgstr "Restartovat nyní"
 
@@ -7947,6 +9024,9 @@ msgstr "Jazyk"
 msgid "Style"
 msgstr "Styl"
 
+msgid "Color Preset"
+msgstr "Předvolba barvy"
+
 msgid "Custom preset can be further configured in the editor."
 msgstr "Vlastní předvolby lze dále konfigurovat v editoru."
 
@@ -7962,18 +9042,75 @@ msgstr "Zkontrolovat aktualizace"
 msgid "Directory Naming Convention"
 msgstr "Konvence pojmenování složek"
 
+msgid "Edit All Settings"
+msgstr "Upravit všechna nastavení"
+
 msgid ""
 "Settings changed! The project manager must be restarted for changes to take "
 "effect."
 msgstr ""
 "Nastavení změněna! Pro projevení změn je nutné restartovat správce projektů."
 
+msgid ""
+"Different engine version may have minor differences in various Resources, "
+"like additional fields or removed properties. When upgrading the project to a "
+"new version, such changes can cause diffs when saving scenes or resources, or "
+"reimporting.\n"
+"\n"
+"This tool ensures that such changes are performed all at once. It will:\n"
+"- Regenerate UID cache\n"
+"- Load and re-save every text/binary Resource\n"
+"- Reimport every importable Resource\n"
+"\n"
+"Full upgrade will take considerable amount of time, but afterwards saving/"
+"reimporting any scene/resource should not cause unintended changes."
+msgstr ""
+"Různé verze enginu se můžou drobně lišit v různých Zdrojích jako jsou "
+"například další pole nebo odstraněné vlastnosti. Při upgradu projektu na "
+"novou verzi mohou takové změny způsobit rozdíly při ukládání scén nebo zdrojů "
+"nebo při opětovném importu.\n"
+"\n"
+"Tento nástroj zajišťuje, že se tyto změny provedou najednou. Provede:\n"
+"- Obnovení mezipaměti UID\n"
+"- Načtení a opětovné uložení každého textového/binárního zdroje\n"
+"- Znovu importuje každý importovatelný zdroj\n"
+"\n"
+"Úplná aktualizace zabere značné množství času, ale následné uložneí/opětovný "
+"import jakékoliv scény/zdroje by neměl způsobit nezamýšlené změny."
+
 msgid "Restart & Upgrade"
 msgstr "Restartovat a aktualizovat"
 
+msgid "Updating Project Scenes"
+msgstr "Aktualizace Projektových Scén"
+
+msgid "Re-saving scene:"
+msgstr "Znovu ukládání scény:"
+
+msgid "Updating Project Resources"
+msgstr "Aktualizace Projektových Zdrojů"
+
+msgid "Re-saving resource:"
+msgstr "Přeukládám zdroj:"
+
+msgid "Run the project's main scene."
+msgstr "Spustit hlavní scénu projektu."
+
+msgid "Play the currently edited scene."
+msgstr "Spustit právě upravovanou scénu."
+
 msgid "Play a custom scene."
 msgstr "Přehrát vlastní scénu."
 
+msgid "Reload the played scene that was being edited."
+msgstr "Znovu načíst přehrávanou scénu, která byla upravena."
+
+msgid "Reload the played custom scene."
+msgstr "Znovu načíst přehrávanou vlastní scénu."
+
+msgid "Reload the played main scene."
+msgstr "Znovu načíst přehrávanou hlavní scénu."
+
 msgid ""
 "Movie Maker mode is enabled, but no movie file path has been specified.\n"
 "A default movie file path can be specified in the project settings under the "
@@ -8078,6 +9215,12 @@ msgstr "Spustit v běžném režimu"
 msgid "Run in XR Mode"
 msgstr "Spustit v režimu XR"
 
+msgid "Enable Movie Maker Mode"
+msgstr "Povolit režim Movie Maker"
+
+msgid "Open Movie Maker Settings..."
+msgstr "Otevřít nastavení Movie Maker..."
+
 msgid ""
 "Enable Movie Maker mode.\n"
 "The project will run at stable FPS and the visual and audio output will be "
@@ -8102,6 +9245,15 @@ msgstr ""
 "Přidejte prosím spustitelný profil v nabídce Export nebo definujte existující "
 "profil jako spustitelný."
 
+msgid ""
+"Warning: The CPU architecture \"%s\" is not active in your export preset.\n"
+"\n"
+"Run \"Remote Deploy\" anyway?"
+msgstr ""
+"Varování: Architektura CPU \"%s\" není ve vašem exportu přednastavení.\n"
+"\n"
+"Přesto spustit \"Vzdálené nasazení\"?"
+
 msgid "Deploy to First Device in List"
 msgstr "Nasadit na první zařízení v seznamu"
 
@@ -8117,6 +9269,9 @@ msgstr "Nasadit na čtvrté zařízení v seznamu"
 msgid "Project Run"
 msgstr "Běh projektu"
 
+msgid "Suspend/Resume Embedded Project"
+msgstr "Pozastavení/Obnovení vloženého projektu"
+
 msgid "Next Frame"
 msgstr "Další snímek"
 
@@ -8147,12 +9302,61 @@ msgstr ""
 "Správce oken můžete změnit v Nastavení projektu (Zobrazení > Správce oken > "
 "Ovladač)."
 
+msgid "Game embedding not available when the game starts minimized."
+msgstr "Vložení hry není dostupné pokud se hra spouští minimalizovaná."
+
+msgid ""
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Zvažte přepsání nastavení režimu okna projektu pomocí štítku funkce editoru "
+"Windowed, abyste mohli používat vkládání her a zároveň ponechat exportovaný "
+"projekt beze změny."
+
+msgid "Game embedding not available when the game starts maximized."
+msgstr "Vložení hry není dostupné, když se hra spouští maximalizovaná."
+
+msgid "Game embedding not available when the game starts in fullscreen."
+msgstr "Vložení hry není dostupné, když se hra spouští v plné obrazovce."
+
 msgid "Game embedding not available in single window mode."
 msgstr "Vložení hry není dostupné v režimu jednoho okna."
 
+msgid "Game embedding not available when the game starts in headless mode."
+msgstr "Vložení hry není dostupné pokud se hra spouští v Bezhlavém režimu."
+
+msgid "Unmute game audio."
+msgstr "Zapnout herní zvuk."
+
+msgid "Mute game audio."
+msgstr "Vypnout herní zvuk."
+
+msgid "%s+Alt+RMB: Show list of all nodes at position clicked."
+msgstr "%s+Alt+Pravé tl. myši: Zobrazit seznam všech uzlů na kliknuté pozici."
+
 msgid "Suspend"
 msgstr "Pozastavit"
 
+msgid ""
+"Force pause at SceneTree level. Stops all processing, but you can still "
+"interact with the project."
+msgstr ""
+"Vynutit pozastavení na úrovni stromu scén. Zastaví veškeré zpracování, ale "
+"stále můžete s projektem interagovat."
+
+msgid "Change the game speed."
+msgstr "Změnit rychlost hry."
+
+msgid "Speed State"
+msgstr "Stav rychlosti"
+
+msgid "Reset the game speed."
+msgstr "Obnovit herní rychlost."
+
+msgid "Reset Speed"
+msgstr "Obnovit rychlost"
+
 msgid "Input"
 msgstr "Vstup"
 
@@ -8177,6 +9381,15 @@ msgstr "Zobrazit seznam uzlů na kliknuté pozici, jež je možno označit."
 msgid "Toggle Selection Visibility"
 msgstr "Přepnout viditelnost vybraného"
 
+msgid "Selection Options"
+msgstr "Možnosti výběru"
+
+msgid "Don't Select Locked Nodes"
+msgstr "Nevybírat uzamčené uzly"
+
+msgid "Select Group Over Children"
+msgstr "Vybrat skupinu nad potomky"
+
 msgid "Override the in-game camera."
 msgstr "Přepsat kameru hry."
 
@@ -8204,6 +9417,12 @@ msgstr "Vložit hru při dalším spuštění"
 msgid "Make Game Workspace Floating on Next Play"
 msgstr "Při příštím spuštění otevřít Pracovní prostor hry v plovoucím doku"
 
+msgid "Embedded Window Sizing"
+msgstr "Velikost vloženého okna"
+
+msgid "Fixed Size"
+msgstr "Fixní velikost"
+
 msgid ""
 "Embedded game size is based on project settings.\n"
 "The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
@@ -8213,15 +9432,24 @@ msgstr ""
 "Když je Pracovní prostor hry menší než požadovaná velikost, je použit režim "
 "'Zachovat poměr stran'."
 
+msgid "Keep Aspect Ratio"
+msgstr "Ponechat poměr stran"
+
 msgid "Keep the aspect ratio of the embedded game."
 msgstr "Zachovat poměr stran vložené hry."
 
+msgid "Stretch to Fit"
+msgstr "Roztáhnout na míru"
+
 msgid "Embedded game size stretches to fit the Game Workspace."
 msgstr "Vložená hra je roztažena, aby se vešla do Pracovního prostoru hry."
 
 msgid "Game Workspace"
 msgstr "Pracovní prostor hry"
 
+msgid "Game"
+msgstr "Hra"
+
 msgid "Clear All"
 msgstr "Promazat vše"
 
@@ -8243,6 +9471,9 @@ msgstr "Štítky oddělené čárkami, příklad: demo, steam, event"
 msgid "Enable Multiple Instances"
 msgstr "Povolit více instancí"
 
+msgid "Number of Instances"
+msgstr "Počet instancí"
+
 msgid "Override Main Run Args"
 msgstr "Přepsat hlavní argumenty běhu"
 
@@ -8255,6 +9486,9 @@ msgstr "Přepsat hlavní štítky"
 msgid "Feature Tags"
 msgstr "Štítky funkcí"
 
+msgid "Move Origin to Geometric Center"
+msgstr "Přesunout počátek do geometrického středu"
+
 msgid "Create Polygon"
 msgstr "Vytvořit polygon"
 
@@ -8267,6 +9501,12 @@ msgstr ""
 "Levé tl. myši: Přesunout bod\n"
 "Pravé tl. myši: Vymazat bod"
 
+msgid "Move center of gravity to geometric center."
+msgstr "Přesunout střed gravitace do geometrického středu."
+
+msgid "Move Geometric Center"
+msgstr "Přesunout geometrický střed"
+
 msgid "Edit Polygon"
 msgstr "Upravit polygon"
 
@@ -8279,6 +9519,27 @@ msgstr "Upravit polygon (odstranit bod)"
 msgid "Remove Polygon And Point"
 msgstr "Odstranit polygon a bod"
 
+msgid "Create Polygon Points"
+msgstr "Vytvořit body Polygonu"
+
+msgid "Edit Polygon Points"
+msgstr "Upravit body Polygonu"
+
+msgid "Delete Polygon Points"
+msgstr "Odstranit body Polygonu"
+
+msgid "Edit Camera2D Limits"
+msgstr "Upravit limity Camera2D"
+
+msgid "Snap Camera2D Limits to the Viewport"
+msgstr "Přichytit limity Camera2D k výřezu"
+
+msgid "Camera2D"
+msgstr "Camera2D"
+
+msgid "Snap the Limits to the Viewport"
+msgstr "Přichytit limity k výřezu"
+
 msgid "Create Occluder Polygon"
 msgstr "Vytvořit stínící polygon"
 
@@ -8294,15 +9555,36 @@ msgstr "Generovat obdélník viditelnosti"
 msgid "Load Emission Mask"
 msgstr "Načíst emisní masku"
 
+msgid "Mask Texture"
+msgstr "Maskovací textura"
+
 msgid "Solid Pixels"
 msgstr "Pevné pixely"
 
 msgid "Border Pixels"
 msgstr "Hraniční pixely"
 
+msgid "Mask Mode"
+msgstr "Maskovací režim"
+
+msgid "Generate"
+msgstr "Generovat"
+
+msgid "Texture"
+msgstr "Textura"
+
+msgid "Direction Mode"
+msgstr "Režim směru"
+
+msgid "Direction Texture"
+msgstr "Směrová textura"
+
 msgid "Centered"
 msgstr "Uprostřed"
 
+msgid "Copy Color from Mask Texture"
+msgstr "Kopírovat Barvu z Maskovací Textury"
+
 msgid "Generating Visibility Rect (Waiting for Particle Simulation)"
 msgstr "Generování obdélníku viditelnosti (čekání na simulaci částic)"
 
@@ -8312,6 +9594,28 @@ msgstr "Generování..."
 msgid "Loading emission mask requires ParticleProcessMaterial."
 msgstr "Načtení emisní masky vyžaduje ParticleProcessMaterial."
 
+msgid "Failed to load mask texture."
+msgstr "Selhalo načtení masky textury."
+
+msgid "Failed to convert mask texture to RGBA8."
+msgstr "Konverze masky textury na RGBA8 selhala."
+
+msgid "Mask texture has an invalid size."
+msgstr "Maska textury má špatnou velikost."
+
+msgid "Failed to load direction texture."
+msgstr "Selhalo načtení směrové textury."
+
+msgid "Failed to convert direction texture to RGBA8."
+msgstr "Konverze směrové textury na RGBA8 selhala."
+
+msgid ""
+"Direction texture has an invalid size. It must have the same size as the mask "
+"texture."
+msgstr ""
+"Směrová textura má špatnou velikost. Musí mít stejnou velikost jako maskovací "
+"textura."
+
 msgid "GPUParticles2D"
 msgstr "GPUParticles2D"
 
@@ -8366,6 +9670,9 @@ msgstr "Vybrat body"
 msgid "Shift+Drag: Select Control Points"
 msgstr "Shift+Táhnutí: Vybrat kontrolní body"
 
+msgid "%s+Click: Add Point"
+msgstr "%s+Klik: Přidat bod"
+
 msgid "Left Click: Split Segment (in curve)"
 msgstr "Levý klik: Rozdělit segment (v křivce)"
 
@@ -8456,6 +9763,9 @@ msgstr "Změnit hmotnost kostí"
 msgid "Polygon"
 msgstr "Polygon"
 
+msgid "Toggle Polygon Dock"
+msgstr "Přepnout dok Polygonu"
+
 msgid "Points"
 msgstr "Body"
 
@@ -8504,6 +9814,9 @@ msgstr "Kreslit váhy se zadanou intenzitou."
 msgid "Unpaint weights with specified intensity."
 msgstr "Odebrat váhy se zadanou intnzitou."
 
+msgid "Strength"
+msgstr "Síla"
+
 msgid "Radius:"
 msgstr "Poloměr:"
 
@@ -8621,9 +9934,15 @@ msgstr "Neplatná geometrie, nelze vytvořit stínidlo světla."
 msgid "Create LightOccluder2D Sibling"
 msgstr "Vytvořit sourozence LightOccluder2D"
 
+msgid "Sprite's region needs to be enabled in the inspector."
+msgstr "Region Spritu musí být povolen v inspektoru."
+
 msgid "Sprite2D"
 msgstr "Sprite2D"
 
+msgid "Drag to Resize Region Rect"
+msgstr "Tažením změníte velikost obdélníku oblasti"
+
 msgid "Simplification:"
 msgstr "Zjednodušení:"
 
@@ -8757,6 +10076,9 @@ msgstr "Přichytávání na půlpixely"
 msgid "Grid Snap"
 msgstr "Přichycení na mřížku"
 
+msgid "Subdivision"
+msgstr "Pododdíly"
+
 msgid "Painting Tiles Property"
 msgstr "Kreslení vlastnosti dlaždic"
 
@@ -8836,6 +10158,9 @@ msgstr "Nástroj výběru"
 msgid "Shift: Draw line."
 msgstr "Shift: Kreslit linku."
 
+msgid "%s+Shift: Draw rectangle."
+msgstr "%s+Shift: Kreslit obdélník."
+
 msgid "Paint Tool"
 msgstr "Nástroj kreslení"
 
@@ -8970,6 +10295,9 @@ msgstr ""
 msgid "TileMap"
 msgstr "Mapa dlaždic"
 
+msgid "Open TileMap Dock"
+msgstr "Otevřít dok mapy dlaždic"
+
 msgid "Select Next Tile Map Layer"
 msgstr "Vybrat další vrstvu mapy dlaždic"
 
@@ -8994,6 +10322,9 @@ msgstr "Zvýraznit zvolenou vrstvu mapy dlaždic"
 msgid "Toggle grid visibility."
 msgstr "Přepnout viditelnost mřížky."
 
+msgid "Advanced settings."
+msgstr "Pokročilá nastavení."
+
 msgid "Automatically Replace Tiles with Proxies"
 msgstr "Automaticky vyměnit dlaždice za proxy"
 
@@ -9151,6 +10482,9 @@ msgstr "Pro vytváření více dlaždic držte Ctrl."
 msgid "Hold Shift to create big tiles."
 msgstr "Pro vytváření velikých dlaždic držte Shift."
 
+msgid "Hold Shift to select multiple regions."
+msgstr "Pro vytváření více oblastí držte Shift."
+
 msgid ""
 "TileSet is in read-only mode. Make the resource unique to edit TileSet "
 "properties."
@@ -9445,6 +10779,9 @@ msgstr "Přidat zdroj atlasu"
 msgid "TileSet"
 msgstr "Sada dlaždic"
 
+msgid "Open TileSet Dock"
+msgstr "Otevřít dok mapy dlaždic"
+
 msgid "Tile Sources"
 msgstr "Zdroje dlaždic"
 
@@ -9535,6 +10872,16 @@ msgstr "Nástroj mazání"
 msgid "Picker Tool"
 msgstr "Nástroj výběru"
 
+msgid ""
+"Source ID: %d\n"
+"Texture path: %s"
+msgstr ""
+"Zdrojové ID: %d\n"
+"Cesta k textuře: %s"
+
+msgid "Source ID: %d"
+msgstr "Zdrojové ID: %d"
+
 msgid "Bone Picker:"
 msgstr "Výběr kostí:"
 
@@ -9586,6 +10933,12 @@ msgstr "Změnit výšku tvaru válce"
 msgid "Change Separation Ray Shape Length"
 msgstr "Změnit délku tvaru paprsku oddělení"
 
+msgid "Remove SoftBody3D pinned point %d"
+msgstr "Odebrat připnutý bod %d SoftBody3D"
+
+msgid "Add SoftBody3D pinned point %d"
+msgstr "Přidat připnutý bod %d SoftBody3D"
+
 msgid "Change Probe Size"
 msgstr "Změnit velikost sondy"
 
@@ -9727,6 +11080,12 @@ msgstr "Vypálit světelnou mapu"
 msgid "Select lightmap bake file:"
 msgstr "Vybrat soubor pro vypálení světelných map:"
 
+msgid "First Light"
+msgstr "Primární světlo"
+
+msgid "Second Light"
+msgstr "Sekundární světlo"
+
 msgid "Couldn't create a Trimesh collision shape."
 msgstr "Vytvoření kolizního tvaru z trojúhelníkové sítě se nezdařilo."
 
@@ -9739,6 +11098,27 @@ msgstr "Vytvoření zjednodušeného kolizního tvaru se nezdařilo."
 msgid "Couldn't create any collision shapes."
 msgstr "Nezdařilo se vytvoření žádného kolizního tvaru."
 
+msgid "Couldn't create a bounding box shape."
+msgstr "Nepodařilo se vytvořit tvar ohraničujícího rámečku."
+
+msgid "Couldn't create a capsule shape."
+msgstr "Nepodařilo se vytvořit tvar kapsle."
+
+msgid "Couldn't create a cylinder shape."
+msgstr "Nepodařil se vytvořit válcový tvar."
+
+msgid "Couldn't create a sphere shape."
+msgstr "Nepodařilo se vytvořit kulový tvar."
+
+msgid "Couldn't create a primitive collision shape."
+msgstr "Nepodařilo se vytvořit primitivní í tvar kolize."
+
+msgid "Create %s Collision Shape Sibling"
+msgstr "Vytvořit %s sourozenecký tvar kolize"
+
+msgid "Create %s Static Body Child"
+msgstr "Vytvořit %s statické tělo potomka"
+
 msgid "Trimesh"
 msgstr "Trojúhelníková síť"
 
@@ -9748,9 +11128,30 @@ msgstr "Jediný konvexní tvar"
 msgid "Simplified Convex"
 msgstr "Zjednodušený konvexní tvar"
 
+msgid "Create %s Collision Shape Siblings"
+msgstr "Vytvořit %s sourozeneckých tvarů kolize"
+
+msgid "Create %s Static Body Children"
+msgstr "Vytvořit %s statického těla potomka"
+
 msgid "Multiple Convex"
 msgstr "Více konvexních tvarů"
 
+msgid "Bounding Box"
+msgstr "Ohraničovací rámeček"
+
+msgid "Capsule"
+msgstr "Kapsle"
+
+msgid "Cylinder"
+msgstr "Válec"
+
+msgid "Sphere"
+msgstr "Koule"
+
+msgid "Primitive"
+msgstr "Primitiv"
+
 msgid "Can't create a collision shape as sibling for the scene root."
 msgstr "Nelze vytvořit kolizní tvar jako sourozence kořenového uzlu scény."
 
@@ -9864,6 +11265,9 @@ msgstr "Velikost obrysu:"
 msgid "Create Collision Shape"
 msgstr "Vytvořit kolizní tvar"
 
+msgid "Collision Shape Placement"
+msgstr "Umístění kolizního tvaru"
+
 msgid "Sibling"
 msgstr "Sourozenec"
 
@@ -9886,6 +11290,15 @@ msgstr ""
 "Vytvoří polygonový kolizní tvar.\n"
 "Toto je nejpřesnější (ale nejpomalejší) možnost detekce kolizí."
 
+msgid ""
+"Creates a single convex collision shape.\n"
+"This is the faster than the trimesh or multiple convex option, but is less "
+"accurate for collision detection."
+msgstr ""
+"Vytvoří jeden konvexní kolizní tvar.\n"
+"Toto je rychlejší než trimesh, nebo vícenásobná konvexní možnost, ale je méně "
+"přesná pro detekci kolizí."
+
 msgid ""
 "Creates a simplified convex collision shape.\n"
 "This is similar to single collision shape, but can result in a simpler "
@@ -9895,15 +11308,92 @@ msgstr ""
 "Je podobný jedinému koliznímu tvaru, ale v některých případech může vést k "
 "jednodušší geometrii na úkor přesnosti."
 
+msgid ""
+"Creates multiple convex collision shapes. These are decomposed from the "
+"original mesh.\n"
+"This is a performance and accuracy middle-ground between a single convex "
+"collision and a polygon-based trimesh collision."
+msgstr ""
+"Vytvoří více konvexních kolizních tvarů. Ty jsou rozloženy z původní sítě.\n"
+"Jedná se o kompromis u výkonu a přesnosti mezi jednoduchou konvexní kolizí a "
+"kolizi trimeshové sítě založené na polygonu."
+
+msgid ""
+"Creates an bounding box collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in BoxMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Vytvoří kolizní tvar ohraničujícího rámečku.\n"
+"Pokud tvar není vestavěný BoxMesh, použije se útvar AABB.\n"
+"Toto je rychlejší než možnost konvexního tvaru kolize pro detekci kolize."
+
+msgid ""
+"Creates a capsule collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in CapsuleMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Vytvoří kolizní tvar kapsle.\n"
+"Pokud útvar není vestavěnou CapsuleMesh, použije se síť AABB.\n"
+"Toto je rychlejší než možnost konvexního tvaru kolize pro detekci kolizí."
+
+msgid ""
+"Creates a cylinder collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in CylinderMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Vytvoří kolizní tvar válce.\n"
+"Pokud útvar není vestavěnou CylinderMesh, bude použit útvar AABB.\n"
+"Toto je rychlejší než možnost konvexního tvaru kolize pro detekci kolizí."
+
+msgid ""
+"Creates a sphere collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in SphereMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Vytvoří kolizní tvar koule.\n"
+"Pokud tvar není vestavený SphereMesh, bude použije se útvar AABB.\n"
+"Toto je rychlejší než možnost konvexního tvaru kolize pro detekci kolizí."
+
+msgid ""
+"Creates a box, capsule, cylinder, or sphere primitive collision shape if the "
+"mesh is a primitive.\n"
+"The mesh must use the built-in BoxMesh, CapsuleMesh, CylinderMesh, or "
+"SphereMesh primitive.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Vytvoří primitivní kolizní tvar boxu, kapsle, válce nebo koule, pokud je "
+"útvar primitivní.\n"
+"Útvar musí používat vestavěné BoxMesh, CapsuleMesh, CylinderMesh nebo "
+"SphereMexh primitivy.\n"
+"Toto je rychlejší než možnost konvexního tvaru kolize pro detekci kolizí."
+
+msgid "Alignment Axis"
+msgstr "Osa vyronvání"
+
+msgid "Longest Axis"
+msgstr "Nejdelší osa"
+
+msgid "Create the shape along the longest axis of the mesh's AABB."
+msgstr "Vytvořit tvar podél nejdelší osy útvaru AABB."
+
 msgid "X-Axis"
 msgstr "Osa X"
 
+msgid "Create the shape along the local X-Axis."
+msgstr "Vytvořit tvar podél lokální osy X."
+
 msgid "Y-Axis"
 msgstr "Osa Y"
 
+msgid "Create the shape along the local Y-Axis."
+msgstr "Vytvořit tvar podél lokální osy Y."
+
 msgid "Z-Axis"
 msgstr "Osa Z"
 
+msgid "Create the shape along the local Z-Axis."
+msgstr "Vytvořit tvar podél lokální osy Z."
+
 msgid "UV Channel Debug"
 msgstr "Ladění UV kanálu"
 
@@ -10078,6 +11568,9 @@ msgstr "Zadní perspektivní"
 msgid "[auto]"
 msgstr "[automatické]"
 
+msgid "Reset Transform"
+msgstr "Obnovit transformaci"
+
 msgid "Grouped"
 msgstr "Seskupeno"
 
@@ -10106,6 +11599,35 @@ msgstr ""
 "Přetažením přepíšete materiál libovolného uzlu geometrie.\n"
 "Podržením %s při přetažení přepíšete konkrétní povrch."
 
+msgid ""
+"This debug draw mode is only supported when using the Forward+ or Mobile "
+"renderer."
+msgstr ""
+"Tento ladící režim kreslení je podporován jen při použití Forward+ nebo "
+"Mobile rendereru."
+
+msgid "This debug draw mode is only supported when using the Forward+ renderer."
+msgstr ""
+"Tento ladící režim kreslení je podporován je při použití Forward+ rendereru."
+
+msgid "X: %s"
+msgstr "X: %s"
+
+msgid "Y: %s"
+msgstr "Y: %s"
+
+msgid "Z: %s"
+msgstr "Z: %s"
+
+msgid "Size: %s (%.1fMP)"
+msgstr "Velikost: %s (%.1fMP)"
+
+msgid "Objects: %d"
+msgstr "Objekty: %d"
+
+msgid "Primitives: %d"
+msgstr "Primitivy: %d"
+
 msgid "Draw Calls: %d"
 msgstr "Vykreslovací volání: %d"
 
@@ -10211,21 +11733,55 @@ msgstr "Bezestínový pohled"
 msgid "Directional Shadow Splits"
 msgstr "Směrová rozdělení stínů"
 
+msgid ""
+"Displays directional shadow splits in different colors to make adjusting "
+"split thresholds easier. \n"
+"Red: 1st split (closest to the camera), Green: 2nd split, Blue: 3rd split, "
+"Yellow: 4th split (furthest from the camera)"
+msgstr ""
+"Zobrazí směrové rozdělení stínů v různých barvách, aby se usnadnilo nastavení "
+"prahů rozdělení. \n"
+"Červená: 1. rozdělení (nejblíže ke kameře), Zelená: druhé rozdělení, Modrá: "
+"třetí rozdělení, Žlutá, čtvrté rozdělení (nejdále od kamery)"
+
 msgid "Normal Buffer"
 msgstr "Normální vyrovnávací paměť"
 
 msgid "Shadow Atlas"
 msgstr "Atlas stínů"
 
+msgid ""
+"Displays the shadow atlas used for positional (omni/spot) shadow mapping.\n"
+"Requires a visible OmniLight3D or SpotLight3D node with shadows enabled to "
+"have a visible effect."
+msgstr ""
+"Zobrazí atlas stínů používaný pro poziční (vše/bodové) mapování stínů.\n"
+"Pro viditelný efekt vyžaduje viditelný uzel OmniLight3D nebo SpotLight3D s "
+"povolenými stíny."
+
 msgid "Directional Shadow Map"
 msgstr "Směrová mapa stínů"
 
+msgid ""
+"Displays the shadow map used for directional shadow mapping.\n"
+"Requires a visible DirectionalLight3D node with shadows enabled to have a "
+"visible effect."
+msgstr ""
+"Zobrazí mapu stínů používanou pro směrové mapování stínů.\n"
+"Pro viditelný efekt vyžaduje viditelný uzel DirectionalLight3D s povolenými "
+"stíny."
+
 msgid "Decal Atlas"
 msgstr "Atlas nálepek"
 
 msgid "VoxelGI Lighting"
 msgstr "VoxelGI osvětlení"
 
+msgid ""
+"Requires a visible VoxelGI node that has been baked to have a visible effect."
+msgstr ""
+"Vyžaduje viditelný uzel VoxelGI, který byl baked aby měl viditelný efekt."
+
 msgid "VoxelGI Albedo"
 msgstr "VoxelGI albedo"
 
@@ -10235,45 +11791,134 @@ msgstr "VoxelGI emise"
 msgid "SDFGI Cascades"
 msgstr "SDFGI kaskády"
 
+msgid "Requires SDFGI to be enabled in Environment to have a visible effect."
+msgstr "Pro viditelný efekt vyžaduje povolení SDFGI v prostředí."
+
 msgid "SDFGI Probes"
 msgstr "SDFGI sondy"
 
+msgid ""
+"Left-click a SDFGI probe to display its occlusion information (white = not "
+"occluded, red = fully occluded).\n"
+"Requires SDFGI to be enabled in Environment to have a visible effect."
+msgstr ""
+"Kliknutí levým tlačítkem na sondu SDFGI zobrazíte informaci o okluzi (bílá = "
+"nuzavřená, červená = zvela uzavřená).\n"
+"Pro viditelný efekt vyžaduje povolení SDFGI v prostředí."
+
 msgid "Scene Luminance"
 msgstr "Světelnost scény"
 
+msgid ""
+"Displays the scene luminance computed from the 3D buffer. This is used for "
+"Auto Exposure calculation.\n"
+"Requires Auto Exposure to be enabled in CameraAttributes to have a visible "
+"effect."
+msgstr ""
+"Zobrazuji jas scény vypočítaný z 3D vyrovnávací paměti. To se používá pro "
+"výpočet automatické expozice.\n"
+"Pro viditelný efekt vyžaduje, aby byla v CameraAttributes povolena "
+"automatická expozice."
+
 msgid "SSAO"
 msgstr "Zastínění okolím prostoru obrazovky (SSAO)"
 
+msgid ""
+"Displays the screen-space ambient occlusion buffer. Requires SSAO to be "
+"enabled in Environment to have a visible effect."
+msgstr ""
+"Zobrazuje vyrovnávací paměť okolní okluze v prostoru obrazovky. Pro viditelný "
+"efekt vyžaduje povolení SSAO v prostředí."
+
 msgid "SSIL"
 msgstr "Nepřímé osvětlení prostoru obrazovky (SSIL)"
 
+msgid ""
+"Displays the screen-space indirect lighting buffer. Requires SSIL to be "
+"enabled in Environment to have a visible effect."
+msgstr ""
+"Zobrazuje vyrovnávací paměť nepřímého osvětlení v prostoru. Pro dosažení "
+"viditelného efektu je nutné v prostředí povolit SSIL."
+
 msgid "VoxelGI/SDFGI Buffer"
 msgstr "Vyrovnávací paměť VoxelGI/SDFGI"
 
+msgid "Requires SDFGI or VoxelGI to be enabled to have a visible effect."
+msgstr "Pro dosažení viditelného efektu je nutné povolit SDFGI nebo VoxelGI."
+
 msgid "Disable Mesh LOD"
 msgstr "Deaktivovat LOD sítě"
 
+msgid ""
+"Renders all meshes with their highest level of detail regardless of their "
+"distance from the camera."
+msgstr ""
+"Vykreslí všechny sítě s nejvyšší úrovní detailů bez ohledu na jejich "
+"vzdálenost od kamery."
+
 msgid "OmniLight3D Cluster"
 msgstr "Shluk OmniLight3D"
 
+msgid ""
+"Highlights tiles of pixels that are affected by at least one OmniLight3D."
+msgstr ""
+"Zobrazuje dlaždice pixelů, které jsou ovlivněny alespoň jedním OmniLight3D."
+
 msgid "SpotLight3D Cluster"
 msgstr "Shluk SpotLight3D"
 
+msgid ""
+"Highlights tiles of pixels that are affected by at least one SpotLight3D."
+msgstr ""
+"Zvýrazňuje dlaždice pixelů, které jsou ovlivněny alespoň jedním objektem "
+"SpotLight3D."
+
 msgid "Decal Cluster"
 msgstr "Shluk nálepek"
 
+msgid "Highlights tiles of pixels that are affected by at least one Decal."
+msgstr ""
+"Zobrazuje dlaždice pixelů, které jsou ovlivněny alespoň jedním objektem Decal."
+
 msgid "ReflectionProbe Cluster"
 msgstr "Shluk ReflectionProbe"
 
+msgid ""
+"Highlights tiles of pixels that are affected by at least one ReflectionProbe."
+msgstr ""
+"Zobrazuje dlaždice pixelů, které jsou ovlivněny alespoň jedním objektem "
+"ReflectionProbe."
+
 msgid "Occlusion Culling Buffer"
 msgstr "Vyrovnávací paměť pro vyřazování zakrytých objektů"
 
+msgid ""
+"Represents occluders with black pixels. Requires occlusion culling to be "
+"enabled to have a visible effect."
+msgstr ""
+"Zobrazuje překrývající se objekty černými pixely. Pro viditelný efekt je "
+"nutné povolit Vyřazování zakrytých objektů."
+
 msgid "Motion Vectors"
 msgstr "Pohybové vektory"
 
+msgid ""
+"Represents motion vectors with colored lines in the direction of motion. Gray "
+"dots represent areas with no per-pixel motion."
+msgstr ""
+"Zobrazuje vektory pohyby barevnými čarami ve směru pohybu. Šedé tečky "
+"zobrazují oblasti bez pohybu na pixel."
+
 msgid "Internal Buffer"
 msgstr "Interní vyrovnávací paměť"
 
+msgid ""
+"Shows the scene rendered in linear colorspace before any tonemapping or post-"
+"processing."
+msgstr ""
+"Zobrazuje scénu vykreslenou v lineárním barevném prostoru před jakýmkoliv "
+"mapováním tónů nebo následným zpracováním."
+
 msgid "Display Advanced..."
 msgstr "Zobrazit pokročilé..."
 
@@ -10308,22 +11953,28 @@ msgid "Cinematic Preview"
 msgstr "Filmový náhled"
 
 msgid "Viewport Orbit Modifier 1"
-msgstr "Modifikátor obkroužení průzoru 1"
+msgstr "Modifikátor obkroužení výřezu 1"
 
 msgid "Viewport Orbit Modifier 2"
-msgstr "Modifikátor obkroužení průzoru 2"
+msgstr "Modifikátor obkroužení výřezu 2"
+
+msgid "Viewport Orbit Snap Modifier 1"
+msgstr "Modifikátor uchopení obkroužení výřezu 1"
+
+msgid "Viewport Orbit Snap Modifier 2"
+msgstr "Modifikátor uchopení obkroužení výřezu 2"
 
 msgid "Viewport Pan Modifier 1"
-msgstr "Modifikátor posunu průzoru 1"
+msgstr "Modifikátor posunu výřezu 1"
 
 msgid "Viewport Pan Modifier 2"
-msgstr "Modifikátor posunu průzoru 2"
+msgstr "Modifikátor posunu výřezu 2"
 
 msgid "Viewport Zoom Modifier 1"
-msgstr "Modifikátor přiblížení průzoru 1"
+msgstr "Modifikátor přiblížení výřezu 1"
 
 msgid "Viewport Zoom Modifier 2"
-msgstr "Modifikátor přiblížení průzoru 2"
+msgstr "Modifikátor přiblížení výřezu 2"
 
 msgid "Freelook Left"
 msgstr "Levý volný pohled"
@@ -10388,6 +12039,12 @@ msgstr "Přepnout náhled kamery"
 msgid "View Rotation Locked"
 msgstr "Rotace pohledu uzamknuta"
 
+msgid ""
+"To zoom further, change the camera's clipping planes (View → Settings...)"
+msgstr ""
+"Pro větší přiblížení, změňte roviny oříznutí kamery (Zobrazení -> "
+"Nastavení...)"
+
 msgid "Overriding material..."
 msgstr "Přepsání materiálu..."
 
@@ -10431,6 +12088,9 @@ msgstr "Přidat náhled slunce do scény"
 msgid "Add Preview Environment to Scene"
 msgstr "Přidat náhled prostředí do scény"
 
+msgid "%s+Drag: Rotate selected node around pivot."
+msgstr "%s+Táhnutí: Otočit vybraný uzel kolem pivotu."
+
 msgid "Alt+RMB: Show list of all nodes at position clicked, including locked."
 msgstr ""
 "Alt+Pravé tl. myši: Zobrazit seznam všech uzlů na kliknuté pozici, včetně "
@@ -10439,6 +12099,9 @@ msgstr ""
 msgid "(Available in all modes.)"
 msgstr "(Dostupné ve všech režimech.)"
 
+msgid "%s+Drag: Use snap."
+msgstr "%s+Táhnutí: Přichytávat."
+
 msgid ""
 "Scene contains\n"
 "DirectionalLight3D.\n"
@@ -10460,27 +12123,72 @@ msgstr ""
 "WorldEnvironment.\n"
 "Náhled deaktivován."
 
+msgid "Set Preview Sun Direction"
+msgstr "Nastavit náhled: Směr Slunce"
+
+msgid "Set Preview Sun Altitude"
+msgstr "Nastavit náhled: Výška Slunce"
+
+msgid "Set Preview Sun Azimuth"
+msgstr "Nastavit náhled: Azimut Slunce"
+
+msgid "Set Preview Sun Color"
+msgstr "Nastavit náhled: Barva Slunce"
+
+msgid "Set Preview Sun Energy"
+msgstr "Nastavit náhled: Energie Slunce"
+
+msgid "Set Preview Sun Max Shadow Distance"
+msgstr "Nastavit náhled: Maximální vzdálenost stínu Slunce"
+
+msgid "Set Preview Environment Sky Color"
+msgstr "Nastavit náhled: Barva nebe prostředí"
+
+msgid "Set Preview Environment Ground Color"
+msgstr "Nastavení náhledu: Barva podkladu prostředí"
+
+msgid "Set Preview Environment Energy"
+msgstr "Nastavení náhledu: Energie prostředí"
+
+msgid "Set Preview Environment Ambient Occlusion"
+msgstr "Nastavení náhledu: Zastínění okolím prostředí"
+
+msgid "Set Preview Environment Glow"
+msgstr "Nastavení náhledu: Záře prostředí"
+
+msgid "Set Preview Environment Tonemap"
+msgstr "Nastavení náhledu: Tónová mapa prostředí"
+
+msgid "Set Preview Environment Global Illumination"
+msgstr "Nastavení náhledu: Globální osvětlení prostředí"
+
+msgid "Transform Mode"
+msgstr "Režim Transformace"
+
 msgid "Move Mode"
-msgstr "Režim přesouvání"
+msgstr "Režim Přesouvání"
 
 msgid "Rotate Mode"
-msgstr "Režim otáčení"
+msgstr "Režim Otáčení"
 
 msgid "Scale Mode"
-msgstr "Režim škálování"
+msgstr "Režim Škálování"
 
 msgid "Select Mode"
-msgstr "Režim výběru"
+msgstr "Režim Výběru"
 
 msgid "Lock selected node, preventing selection and movement."
 msgstr "Uzamknout vybraný uzel. Zabrání výběru a přesouvání."
 
 msgid "Lock"
-msgstr "Zámek"
+msgstr "Zamknout"
 
 msgid "Unlock selected node, allowing selection and movement."
 msgstr "Odemknout vybraný uzel. Umožní výběr a přesouvání."
 
+msgid "Unlock"
+msgstr "Odemknout"
+
 msgid ""
 "Groups the selected node with its children. This selects the parent when any "
 "child node is clicked in 2D and 3D view."
@@ -10489,7 +12197,7 @@ msgstr ""
 "podřízený uzek ve 2D a 3D zobrazení, bude vybrán rodič."
 
 msgid "Group"
-msgstr "Skupina"
+msgstr "Seskupit"
 
 msgid ""
 "Ungroups the selected node from its children. Child nodes will be individual "
@@ -10498,6 +12206,9 @@ msgstr ""
 "Oddělí vybraný uzel od jeho potomků. Podřízené uzly budou ve 2D a 3D "
 "zobrazení samostatné položky."
 
+msgid "Ungroup"
+msgstr "Rozdělit seskupení"
+
 msgid "LMB+Drag: Measure the distance between two points in 3D space."
 msgstr "Levé tl. myši+Táhnutí: Měřit vzdálenost mezi dvěma body v 3D prostoru."
 
@@ -10519,6 +12230,9 @@ msgstr ""
 "Je-li do scény přidán uzel DirectionalLight3D, náhled slunečního světla je "
 "deaktivován."
 
+msgid "Toggle preview sunlight."
+msgstr "Přepnout náhled Slunečního světla."
+
 msgid ""
 "Toggle preview environment.\n"
 "If a WorldEnvironment node is added to the scene, preview environment is "
@@ -10527,6 +12241,9 @@ msgstr ""
 "Přepnout náhled prostředí.\n"
 "Je-li do scény přidán uzel WorldEnvironment, náhled prostředí je deaktivován."
 
+msgid "Toggle preview environment."
+msgstr "Přepnout náhled Prostředí."
+
 msgid "Edit Sun and Environment settings."
 msgstr "Upravit nastavení slunce a prostředí."
 
@@ -10600,22 +12317,22 @@ msgid "Configure Snap..."
 msgstr "Nastavit přichytávání..."
 
 msgid "1 Viewport"
-msgstr "1 průzor"
+msgstr "1 Výřez"
 
 msgid "2 Viewports"
-msgstr "2 průzory"
+msgstr "2 Výřezy"
 
 msgid "2 Viewports (Alt)"
-msgstr "2 průzory (alt)"
+msgstr "2 Výřezy (alt)"
 
 msgid "3 Viewports"
-msgstr "3 průzory"
+msgstr "3 výřezy"
 
 msgid "3 Viewports (Alt)"
-msgstr "3 průzory (alt)"
+msgstr "3 výřezy (Alt)"
 
 msgid "4 Viewports"
-msgstr "4 průzory"
+msgstr "4 Výřezy"
 
 msgid "Gizmos"
 msgstr "Gizma"
@@ -10623,14 +12340,32 @@ msgstr "Gizma"
 msgid "View Origin"
 msgstr "Zobrazit počátek"
 
+msgid "Preview Translation"
+msgstr "Náhled překladu"
+
 msgid "Settings..."
 msgstr "Nastavení..."
 
 msgid "Snap Settings"
 msgstr "Nastavení přichycení"
 
+msgid "Translate Snap"
+msgstr "Přeložit přichycené"
+
 msgid "Translate Snap:"
-msgstr "Přichycení transformace:"
+msgstr "Přeložit přichycené:"
+
+msgid "Rotate Snap"
+msgstr "Otočit přichycené"
+
+msgid "Rotate Snap:"
+msgstr "Otočit přichycené:"
+
+msgid "Scale Snap"
+msgstr "Upravit velikost přichynených"
+
+msgid "Scale Snap:"
+msgstr "Upravit velikost přichycených:"
 
 msgid "Viewport Settings"
 msgstr "Nastavení průzoru"
@@ -10714,7 +12449,7 @@ msgid "Sky Color"
 msgstr "Barva nebe"
 
 msgid "Ground Color"
-msgstr "Barva země"
+msgstr "Barva podkladu"
 
 msgid "Sky Energy"
 msgstr "Energie nebe"
@@ -10767,7 +12502,7 @@ msgid "Could not save the new occluder at the specified path:"
 msgstr "Nezdařilo se uložení stínidla na specifikované cestě:"
 
 msgid "Bake Occluders"
-msgstr "Vypálit stínidla"
+msgstr "Bake stínidla"
 
 msgid "Select occluder bake file:"
 msgstr "Vybrat soubor pro vypálení stínidel:"
@@ -10799,6 +12534,9 @@ msgstr "Stěny geometrie neobsahují žádnou plochu."
 msgid "The geometry doesn't contain any faces."
 msgstr "Geometrie neobsahuje žádné stěny."
 
+msgid "Generation Time (sec)"
+msgstr "Čas generování (s)"
+
 msgid "Create Emitter"
 msgstr "Vytvořit emitor"
 
@@ -10910,6 +12648,9 @@ msgstr ""
 "AnimationMixer nemá platnou cestu ke kořenovému uzlu, takže nelze získat "
 "jména stop."
 
+msgid "Assign"
+msgstr "Přiřadit"
+
 msgid "Bone Metadata"
 msgstr "Metadata kosti"
 
@@ -11001,6 +12742,13 @@ msgstr "Vložit klíč (založený na masce) pro všechny kosti."
 msgid "Insert Key (All Bones)"
 msgstr "Vložit klíč (všechny kosti)"
 
+msgid "Insert key (based on mask) for modified bones with an existing track."
+msgstr ""
+"Vložit klíč (založený na masce) pro modifikované kosti s existující stopou."
+
+msgid "Insert new key (based on mask) for all modified bones."
+msgstr "Vložit klíč (založený na masce) pro všechny modifikované kosti."
+
 msgid "Bone Transform"
 msgstr "Transformace kosti"
 
@@ -11028,12 +12776,30 @@ msgstr "Nastavení přichycení"
 msgid "Grid Offset:"
 msgstr "Offset mřížky:"
 
+msgid "X Offset"
+msgstr "Offset X"
+
+msgid "Y Offset"
+msgstr "Offset Y"
+
 msgid "Grid Step:"
 msgstr "Krok mřížky:"
 
+msgid "X Step"
+msgstr "Krok X"
+
 msgid "Primary Line Every:"
 msgstr "Hlavní řádek každý:"
 
+msgid "X Primary Step"
+msgstr "Primární krok X"
+
+msgid "steps"
+msgstr "kroky"
+
+msgid "Y Primary Step"
+msgstr "Primární krok Y"
+
 msgid "Rotation Offset:"
 msgstr "Offset rotace:"
 
@@ -11130,6 +12896,9 @@ msgstr "Rotace:"
 msgid "Alt+Drag: Move selected node."
 msgstr "Alt+Táhnutí: Přesunout vybraný uzel."
 
+msgid "%s+Alt+Drag: Scale selected node."
+msgstr "%s+Alt+Táhnutí: Škálovat vybraný uzel."
+
 msgid "V: Set selected node's pivot position."
 msgstr "V: Nastavit pozici pivotu vybraného uzlu."
 
@@ -11191,6 +12960,9 @@ msgstr "Přiblížení na 1600 %"
 msgid "Shift: Scale proportionally."
 msgstr "Shift: Škálovat proporčně."
 
+msgid "Change Pivot"
+msgstr "Změnit střed (Pivot)"
+
 msgid "Pan Mode"
 msgstr "Režim posouvání"
 
@@ -11286,7 +13058,7 @@ msgid "Show Origin"
 msgstr "Zobrazit počátek"
 
 msgid "Show Viewport"
-msgstr "Zobrazit průzor"
+msgstr "Zobrazit výřez"
 
 msgid "Transformation"
 msgstr "Transformace"
@@ -11297,6 +13069,9 @@ msgstr "Vycentrovat výběr"
 msgid "Frame Selection"
 msgstr "Orámovat výběr"
 
+msgid "Auto Resample CanvasItems"
+msgstr "Automatické převzorkování CanvasItems"
+
 msgid "Preview Canvas Scale"
 msgstr "Měřítko náhledu plátna"
 
@@ -11456,7 +13231,10 @@ msgid "Unbind Signal Arguments:"
 msgstr "Zrušit vazby argumentů signálu:"
 
 msgid "Receiver Method:"
-msgstr "Přijímací metoda:"
+msgstr "Metoda příjemce:"
+
+msgid "Receiver Method"
+msgstr "Metoda příjemce"
 
 msgid "Deferred"
 msgstr "Odloženě"
@@ -11471,6 +13249,12 @@ msgstr "Jednorázový"
 msgid "Disconnects the signal after its first emission."
 msgstr "Odpojí signál po jeho prvním vyvolání."
 
+msgid "Append Source"
+msgstr "Přidat zdroj"
+
+msgid "The source object is automatically sent when the signal is emitted."
+msgstr "Zdrojový objekt je automaticky odeslán při vyslání signálu."
+
 msgid "Cannot connect signal"
 msgstr "Nelze připojit signál"
 
@@ -11504,6 +13288,9 @@ msgstr "Jste si jisti, že chcete odstranit všechna připojení k signálu \"%s
 msgid "Filter Signals"
 msgstr "Filtrovat signály"
 
+msgid "Connections"
+msgstr "Připojení"
+
 msgid "Are you sure you want to remove all connections from this signal?"
 msgstr "Jste si jistí, že chcete odstranit všechna připojení k tomuto signálu?"
 
@@ -11519,6 +13306,9 @@ msgstr "Upravit..."
 msgid "Go to Method"
 msgstr "Přejít na metodu"
 
+msgid "Select a single node or resource to edit its signals."
+msgstr "Vyberte jeden uzel nebo zdroj pro úpravu jeho signálů."
+
 msgid "Load Curve Preset"
 msgstr "Načíst profil křivky"
 
@@ -11555,6 +13345,9 @@ msgstr "Pozvolný výstup"
 msgid "Smoothstep"
 msgstr "Pozvolný krok (smoothstep)"
 
+msgid "Snap Step"
+msgstr "Přichytit Krok"
+
 msgid "Play This Scene"
 msgstr "Spustit tuto scénu"
 
@@ -11576,6 +13369,9 @@ msgstr "Zavřít všechny záložky"
 msgid "Add a new scene."
 msgstr "Přidat novou scénu."
 
+msgid "Show Opened Scenes List"
+msgstr "Zobrazit list otevřených scén"
+
 msgid "Add Gradient Point"
 msgstr "Přidat bod gradientu"
 
@@ -11760,6 +13556,9 @@ msgid ""
 msgstr ""
 "Když je aktivní, přesouvání uzlů Control mění jejich ukotvení namísto offsetů."
 
+msgid "Change Anchors"
+msgstr "Změnit ukotvení"
+
 msgid "Sizing settings for children of a Container node."
 msgstr "Nastavení velikosti pro potomky uzlu Container."
 
@@ -11774,7 +13573,7 @@ msgstr "Přepisuje (%d)"
 
 msgctxt "Locale"
 msgid "Add Script"
-msgstr "Přídat písmo"
+msgstr "Přídat skript"
 
 msgid "Add Locale"
 msgstr "Přidat jazyk"
@@ -11821,6 +13620,9 @@ msgstr "Variace"
 msgid "Unable to preview font"
 msgstr "Není možné zobrazit náhled fontu"
 
+msgid "Toggle margins preview grid."
+msgstr "Přepnout náhled mřížky odsazení."
+
 msgid "Styleboxes"
 msgstr "Styleboxy"
 
@@ -12019,6 +13821,9 @@ msgstr ""
 "Můžete přidat vlastní typ nebo importovat typ s jeho položkami z jiného "
 "motivu."
 
+msgid "Rename Theme Type"
+msgstr "Přejmenovat typ motivu"
+
 msgid "Remove All Color Items"
 msgstr "Odebrat všechny položky barev"
 
@@ -12201,6 +14006,9 @@ msgstr ""
 "Připnout tento Stylebox jako hlavní styl. Úprava jeho vlastností upraví "
 "stejné vlastnosti ve všech ostatních styleboxech tohoto typu."
 
+msgid "Pin this StyleBox as a main style."
+msgstr "Připnout tento Stylebox jako hlavní styl."
+
 msgid "Add Item Type"
 msgstr "Přidat typ položky"
 
@@ -12249,6 +14057,12 @@ msgstr "Nastavit základní typ"
 msgid "Add a type from a list of available types or create a new one."
 msgstr "Přidat typ ze seznamu dostupných nebo vytvořit nový."
 
+msgid "Rename current type."
+msgstr "Přejmenovat současný typ."
+
+msgid "Remove current type."
+msgstr "Odebrat současný typ."
+
 msgid "Show Default"
 msgstr "Zobrazit výchozí"
 
@@ -12277,12 +14091,18 @@ msgstr ""
 msgid "Theme"
 msgstr "Motiv"
 
+msgid "Toggle Theme Dock"
+msgstr "Přepnout dok Motivů"
+
 msgid "Theme:"
 msgstr "Motiv:"
 
 msgid "Manage Items..."
 msgstr "Spravovat položky..."
 
+msgid "Add, remove, organize, and import Theme items."
+msgstr "Přidat, odebrat, organizovat a importovat položky motivů."
+
 msgid "Add Preview"
 msgstr "Přidat náhled"
 
@@ -12371,12 +14191,21 @@ msgstr "Neplatný zdroj PackedScene, musí mít jako kořenový uzel Control."
 msgid "Invalid file, not a PackedScene resource."
 msgstr "Neplatný soubor, nejedná se o zdroj PackedScene."
 
+msgid "Invalid PackedScene resource, could not instantiate it."
+msgstr "Neplatný zdroj PackedScene, nepodařilo se vytvořit její instance."
+
 msgid "Reload the scene to reflect its most actual state."
 msgstr "Znovu načtěte scénu, aby odrážela svůj nejnovější stav."
 
 msgid "Preview is not available for this shader mode."
 msgstr "Náhled není v tomto režimu shaderu dostupný."
 
+msgid "Box"
+msgstr "Krabicový"
+
+msgid "Quad"
+msgstr "Kvadratický"
+
 msgid "Hold Shift to scale around midpoint instead of moving."
 msgstr ""
 "Podržením Shift můžete namísto pohybu použít škálování kolem středového bodu."
@@ -12453,6 +14282,9 @@ msgstr ""
 "Minimální počet číslic počítadla.\n"
 "Chybějící řády budou vyplněny nulami."
 
+msgid "Minimum number of digits for the counter."
+msgstr "Minimální počet číslic počítadla."
+
 msgid "Post-Process"
 msgstr "Následné zpracování"
 
@@ -12507,6 +14339,12 @@ msgstr "Schránka zdroje je prázdná!"
 msgid "Paste Resource"
 msgstr "Vložit zdroj"
 
+msgid "ResourcePreloader"
+msgstr "Přednačtení zdrojů"
+
+msgid "Toggle ResourcePreloader Dock"
+msgstr "Přepnout dok Přednačtení zdrojů"
+
 msgid "Load Resource"
 msgstr "Načíst zdroj"
 
@@ -12534,6 +14372,12 @@ msgstr "Neplatné znaky názvu kořenového uzlu byly nahrazeny."
 msgid "Root Type:"
 msgstr "Typ kořenového uzlu:"
 
+msgid "Other Type"
+msgstr "Jiný Typ"
+
+msgid "Select Node"
+msgstr "Vybrat uzel"
+
 msgid "Scene Name:"
 msgstr "Název scény:"
 
@@ -12731,6 +14575,12 @@ msgstr "Přidat prázdný"
 msgid "Move Frame"
 msgstr "Posunout snímek"
 
+msgid "Cut Animation"
+msgstr "Vyjmout animaci"
+
+msgid "Paste Animation"
+msgstr "Vložit animaci"
+
 msgid "Delete Animation?"
 msgstr "Smazat animaci?"
 
@@ -12743,9 +14593,15 @@ msgstr "Nastavit trvání snímků"
 msgid "SpriteFrames"
 msgstr "Snímky spritu"
 
+msgid "Open SpriteFrames Dock"
+msgstr "Otevřít dok Sprite snímků"
+
 msgid "Animations:"
 msgstr "Animace:"
 
+msgid "Copy Animation"
+msgstr "Kopírovat animaci"
+
 msgid "Delete Animation"
 msgstr "Smazat animaci"
 
@@ -12761,6 +14617,15 @@ msgstr "Tento zdroj nemá žádné animace."
 msgid "Animation Frames:"
 msgstr "Snímky animace:"
 
+msgid "Load Sheet"
+msgstr "Načíst List"
+
+msgid "Empty Before"
+msgstr "Vyprázdnit před"
+
+msgid "Empty After"
+msgstr "Vyprázdnit po"
+
 msgid "Delete Frame"
 msgstr "Smazat snímek"
 
@@ -12770,6 +14635,12 @@ msgstr "Trvání snímku:"
 msgid "Zoom Reset"
 msgstr "Obnovení přiblížení"
 
+msgid "Add Frame from File"
+msgstr "Přidat snímek ze souboru"
+
+msgid "Add Frames from Sprite Sheet"
+msgstr "Přidat snímky ze Sprite Sheet"
+
 msgid "Copy Frame(s)"
 msgstr "Kopírovat snímky"
 
@@ -12830,15 +14701,30 @@ msgstr "Vybrat žádné"
 msgid "Toggle Settings Panel"
 msgstr "Přepnout panel Nastavení"
 
+msgid "Zoom to Fit"
+msgstr "Přiblížit na velikost"
+
 msgid "Horizontal"
 msgstr "Horizontální"
 
 msgid "Vertical"
 msgstr "Vertikální"
 
+msgid "X Size"
+msgstr "Velikost X"
+
+msgid "Y Size"
+msgstr "Velikost Y"
+
 msgid "Separation"
 msgstr "Oddělení"
 
+msgid "X Separation"
+msgstr "Oddělení X"
+
+msgid "Y Separation"
+msgstr "Oddělení Y"
+
 msgid "Offset"
 msgstr "Offset"
 
@@ -12848,6 +14734,9 @@ msgstr "Automatický řez"
 msgid "Create Frames from Sprite Sheet"
 msgstr "Vytvořit snímky z archu spritů"
 
+msgid "Toggle color channel preview selection."
+msgstr "Přepnout barvu výběru náhledu kanálu."
+
 msgid "Move GradientTexture2D Fill Point"
 msgstr "Přesunout bod výplně GradientTexture2D"
 
@@ -12881,12 +14770,30 @@ msgstr "Režim přichycení:"
 msgid "Pixel Snap"
 msgstr "Přichycení na pixely"
 
+msgid "Offset X"
+msgstr "Offset X"
+
+msgid "Offset Y"
+msgstr "Offset Y"
+
 msgid "Step:"
 msgstr "Krok:"
 
+msgid "Step X"
+msgstr "Krok X"
+
+msgid "Step Y"
+msgstr "Krok Y"
+
 msgid "Separation:"
 msgstr "Oddělení:"
 
+msgid "Separation X"
+msgstr "Oddělení X"
+
+msgid "Separation Y"
+msgstr "Oddělení Y"
+
 msgid "Edit Region"
 msgstr "Upravit oblast"
 
@@ -12902,9 +14809,29 @@ msgstr "Najít:"
 msgid "Folder:"
 msgstr "Složka:"
 
+msgid "Select Folder"
+msgstr "Vybrat složku"
+
+msgid "Includes:"
+msgstr "Zahrnuto:"
+
+msgid "Include the files with the following expressions. Use \",\" to separate."
+msgstr ""
+"Zahrnout soubory s následujícími výrazy. Použijte \",\" k jejich oddělení."
+
+msgid "example: scripts,scenes/*/test.gd"
+msgstr "příklady: scripts,scenes/*/test.gd"
+
 msgid "Excludes:"
 msgstr "Nezahrnuje:"
 
+msgid "Exclude the files with the following expressions. Use \",\" to separate."
+msgstr ""
+"Nezahrnovat soubory s následujícími výrazy. Použijte \",\" k jejich oddělení."
+
+msgid "example: res://addons,scenes/test/*.gd"
+msgstr "příklad: res://addons,scenes/test/*.gd"
+
 msgid "Filters:"
 msgstr "Filtry:"
 
@@ -12924,12 +14851,21 @@ msgstr "Nahradit..."
 msgid "Replace in Files"
 msgstr "Nahradit v souborech"
 
+msgid "Keep Results"
+msgstr "Zachovat výsledek"
+
+msgid "Keep these results and show subsequent results in a new window"
+msgstr "Zachovat tyto výsledky a zobrazit další výsledky v novém okně"
+
 msgid "Replace all (no undo)"
 msgstr "Nahradit vše (nelze vrátit zpět)"
 
 msgid "Searching..."
 msgstr "Hledání..."
 
+msgid "Replace all matches in file"
+msgstr "Nahradit všechny shody v souboru"
+
 msgid "Remove result"
 msgstr "Odstranit výsledek"
 
@@ -13042,9 +14978,27 @@ msgstr "Cesta a název skriptu jsou platné."
 msgid "Will create a new script file."
 msgstr "Vytvoří nový soubor skriptu."
 
+msgid "Parent Name"
+msgstr "Název nadřazené složky"
+
+msgid "Search Parent"
+msgstr "Prohledat nadřazenou složku"
+
+msgid "Select Parent"
+msgstr "Vybrat nadřazenou složku"
+
+msgid "Use Template"
+msgstr "Použít šablonu"
+
+msgid "Template"
+msgstr "Šablona"
+
 msgid "Built-in Script:"
 msgstr "Vestavěný skript:"
 
+msgid "Select File"
+msgstr "Vybrat soubor"
+
 msgid "Attach Node Script"
 msgstr "Připojit skript k uzlu"
 
@@ -13060,6 +15014,29 @@ msgstr "Nelze otevřít '%s'. Soubor mohl být přesunut nebo smazán."
 msgid "Close and save changes?"
 msgstr "Zavřít a uložit změny?"
 
+msgid "Importing theme failed. File is not a text editor theme file (.tet)."
+msgstr ""
+"Importování motivu selhalo. Soubor není souborem motivu textového editoru "
+"(.tet)."
+
+msgid ""
+"Importing theme failed. File name cannot be 'Default', 'Custom', or 'Godot 2'."
+msgstr ""
+"Importování motivu selhalo. Název souboru nemůže být 'Default', 'Custom', "
+"nebo 'Godot 2'."
+
+msgid "Importing theme failed. Failed to copy theme file."
+msgstr "Importování motivu selhalo. Chyba při kopírování souboru motivu."
+
+msgid ""
+"Saving theme failed. File name cannot be 'Default', 'Custom', or 'Godot 2'."
+msgstr ""
+"Ukládání motivu selhalo. Název souboru nemůže být 'Default', 'Custom' nebo "
+"'Godot 2'."
+
+msgid "Saving theme failed."
+msgstr "Ukládání motivu selhalo."
+
 msgid "Error writing TextFile:"
 msgstr "Chyba při zapisování do textového souboru:"
 
@@ -13093,6 +15070,9 @@ msgstr "Importovat motiv"
 msgid "Save Theme As..."
 msgstr "Uložit motiv jako..."
 
+msgid "Make the script editor floating."
+msgstr "Otevřít editor skriptu jako plovoucí."
+
 msgid "Open '%s' in Godot online documentation."
 msgstr "Otevřít '%s' v online dokumentaci Godotu."
 
@@ -13162,9 +15142,15 @@ msgstr "Znovu načíst motiv"
 msgid "Close All"
 msgstr "Zavřít vše"
 
+msgid "Close Tabs Below"
+msgstr "Zavřít níže uvedené karty"
+
 msgid "Close Docs"
 msgstr "Zavřít dokumentaci"
 
+msgid "Site Search"
+msgstr "Prohledat stránku"
+
 msgid "Search the reference documentation."
 msgstr "Hledat v referenční dokumentaci."
 
@@ -13216,6 +15202,12 @@ msgstr "JSON"
 msgid "Markdown"
 msgstr "Markdown"
 
+msgid "ConfigFile"
+msgstr "Soubor konfigurace"
+
+msgid "Script"
+msgstr "Skript"
+
 msgid "Connections to method:"
 msgstr "Připojení k metodě:"
 
@@ -13225,6 +15217,9 @@ msgstr "Zdroj"
 msgid "Target"
 msgstr "Cíl"
 
+msgid "Error at ([hint=Line %d, column %d]%d, %d[/hint]):"
+msgstr "Chyba v ([hint=Řádek %d, sloupec %d]%d, %d[/hint]):"
+
 msgid ""
 "Missing connected method '%s' for signal '%s' from node '%s' to node '%s'."
 msgstr ""
@@ -13376,6 +15371,9 @@ msgstr ""
 msgid "An action with the name '%s' already exists."
 msgstr "Akce s názvem '%s' již existuje."
 
+msgid "Built-in actions are always shown when searching."
+msgstr "Vestavěné akce jsou vždy viditelné během prohledávání."
+
 msgid "Action %s"
 msgstr "Akce %s"
 
@@ -13454,6 +15452,9 @@ msgstr "Přeskupit Autoloady"
 msgid "Can't add Autoload:"
 msgstr "Nelze přidat Autoload:"
 
+msgid "%s is an invalid name."
+msgstr "%s je neplatný název."
+
 msgid "%s is an invalid path. File does not exist."
 msgstr "%s je neplatná cesta. Soubor neexistuje."
 
@@ -13463,18 +15464,39 @@ msgstr "%s je neplatná cesta. Není v cestě ke zdrojům (res://)."
 msgid "Add Autoload"
 msgstr "Přidat Autoload"
 
+msgid "Autoload Path"
+msgstr "Cesta Autoloadu"
+
+msgid "Set path or press \"Add\" to create a script."
+msgstr "Nastavte cestu nebo klikněte na \"Přidat\" pro vytvoření skriptu."
+
+msgid "Select Autoload Path"
+msgstr "Vybrat cestu Autoloadu"
+
 msgid "Node Name:"
 msgstr "Název uzlu:"
 
+msgid "Autoloads"
+msgstr "Autoloady"
+
 msgid "Global Variable"
 msgstr "Globální proměnná"
 
 msgid "3D Engine"
 msgstr "3D engine"
 
+msgid "Navigation (2D)"
+msgstr "Navigace (2D)"
+
+msgid "Navigation (3D)"
+msgstr "Navigace (3D)"
+
 msgid "XR"
 msgstr "XR"
 
+msgid "OpenXR"
+msgstr "OpenXR"
+
 msgid "Wayland"
 msgstr "Wayland"
 
@@ -13484,21 +15506,39 @@ msgstr "X11"
 msgid "RenderingDevice"
 msgstr "RenderingDevice"
 
+msgid "Forward+ Renderer"
+msgstr "Vykreslování Forward+"
+
+msgid "Mobile Renderer"
+msgstr "Vykreslování Mobile"
+
 msgid "Vulkan"
 msgstr "Vulkan"
 
 msgid "D3D12"
 msgstr "D3D12"
 
+msgid "Metal"
+msgstr "Metal"
+
 msgid "OpenGL"
 msgstr "OpenGL"
 
+msgid "Physics Server (2D)"
+msgstr "Fyzický server (2D)"
+
 msgid "Godot Physics (2D)"
 msgstr "Godot Fyzika (2D)"
 
+msgid "Physics Server (3D)"
+msgstr "Fyzický server (3D)"
+
 msgid "Godot Physics (3D)"
 msgstr "Godot Fyzika (3D)"
 
+msgid "Jolt Physics"
+msgstr "Fyzika nárazů"
+
 msgid "Text Server: Fallback"
 msgstr "Textový server: Záložní"
 
@@ -13539,6 +15579,30 @@ msgstr "Displej Wayland (pouze pro Linux)."
 msgid "X11 display (Linux only)."
 msgstr "Displej X11 (pouze pro Linux)."
 
+msgid ""
+"RenderingDevice based rendering (if disabled, the OpenGL backend is required)."
+msgstr ""
+"Vykreslování založené na RenderingDevice (je-li zakázáno, je vyžadován OpenGL "
+"back-end)."
+
+msgid "Forward+ renderer for advanced 3D graphics."
+msgstr "Vykreslování Forward+ pro pokročilejší 3D grafiku."
+
+msgid "Mobile renderer for less advanced 3D graphics."
+msgstr "Vykreslování Mobile pro méně pokročilou 3D grafiku."
+
+msgid "Vulkan backend of RenderingDevice."
+msgstr "Back-end Vulkan pro RenderingDevice."
+
+msgid "Direct3D 12 backend of RenderingDevice."
+msgstr "Back-end Direct3D 12 pro RenderingDevice."
+
+msgid "Metal backend of RenderingDevice (Apple arm64 only)."
+msgstr "Back-end Metal pro RenderingDevice (jen pro Apple arm64)."
+
+msgid "OpenGL backend (if disabled, the RenderingDevice backend is required)."
+msgstr "OpenGL back-end (je-li zakázán, je vyžadován back-end RenderingDevice)."
+
 msgid "Physics Server and capabilities for 2D."
 msgstr "Fyzikální Server a schopnosti pro 2D."
 
@@ -13600,6 +15664,9 @@ msgstr "Obecné funkce:"
 msgid "Graphics and Rendering:"
 msgstr "Grafika a Renderování:"
 
+msgid "Physics Systems:"
+msgstr "Fyzikální Systémy:"
+
 msgid "Text Rendering and Font Options:"
 msgstr "Vykreslování textu a možnosti fontů:"
 
@@ -13612,6 +15679,15 @@ msgstr "Ukládání souboru selhalo."
 msgid "Create a new profile?"
 msgstr "Vytvořit nový profil?"
 
+msgid ""
+"This will scan all files in the current project to detect used classes.\n"
+"Note that the first scan may take a while, specially in larger projects."
+msgstr ""
+"Budou prohledány všechny soubory aktuálního projektu pro objevení použitých "
+"tříd.\n"
+"Upozorňujeme že první prohledání může chvíli trvat, zejména u větších "
+"projektů."
+
 msgid ""
 "Warning: Class detection for C# scripts is not currently available, and such "
 "files will be ignored."
@@ -13622,6 +15698,9 @@ msgstr ""
 msgid "Scanning Project for Used Classes"
 msgstr "Skenování Projektu pro Použité Třídy"
 
+msgid "Processing Classes Found"
+msgstr "Zpracovávám nalezené Třídy"
+
 msgid "Nodes and Classes:"
 msgstr "Uzly a třídy:"
 
@@ -13631,6 +15710,9 @@ msgstr "Formát souboru '%s' je neplatný, import přerušen."
 msgid "Error saving profile to path: '%s'."
 msgstr "Chyba při ukládání profilu do cesty: '%s '."
 
+msgid "Profile Path"
+msgstr "Cesta k profilu"
+
 msgid "Profile:"
 msgstr "Profil:"
 
@@ -13674,6 +15756,9 @@ msgstr "Filtrovat příkazy"
 msgid "Filter by Name"
 msgstr "Filtrovat podle jména"
 
+msgid "Action Event"
+msgstr "Událost Akce"
+
 msgid "Clear all search filters."
 msgstr "Promazat všechny filtry vyhledávání."
 
@@ -13683,6 +15768,9 @@ msgstr "3D editor"
 msgid "Scene Tree Editing"
 msgstr "Úpravy stromu scény"
 
+msgid "Node Dock (deprecated)"
+msgstr "Dok Uzlu (zastaralé)"
+
 msgid "FileSystem Dock"
 msgstr "Dok souborového systému"
 
@@ -13695,6 +15783,12 @@ msgstr "Dok historie"
 msgid "Game View"
 msgstr "Zobrazení hry"
 
+msgid "Signals Dock"
+msgstr "Dok Signálů"
+
+msgid "Groups Dock"
+msgstr "Dok Skupin"
+
 msgid "Allows to view and edit 3D scenes."
 msgstr "Umožňuje prohlížet a upravovat 3D scény."
 
@@ -13728,6 +15822,12 @@ msgstr "Poskytuje přehled historie vracení změn editoru a jednotlivých scén
 msgid "Provides tools for selecting and debugging nodes at runtime."
 msgstr "Poskytuje nástroje pro výběr a ladění uzlů při běhu programu."
 
+msgid "Allows to work with signals of the node selected in the Scene dock."
+msgstr "Umožňuje pracovat se signály uzlu vybraného v doku scény."
+
+msgid "Allows to manage groups of the node selected in the Scene dock."
+msgstr "Umožňuje pracovat se skupinami uzlu vybraného v doku scény."
+
 msgid "(current)"
 msgstr "(aktuální)"
 
@@ -13808,6 +15908,15 @@ msgstr "Importovat profily"
 msgid "Manage Editor Feature Profiles"
 msgstr "Spravovat profily funkcí editoru"
 
+msgid "Select Existing Layout:"
+msgstr "Vyberte existující rozvržení:"
+
+msgid "Or enter new layout name."
+msgstr "Nebo zadejte nový název rozvržení."
+
+msgid "New layout name"
+msgstr "Nový název rozvržení"
+
 msgid "Edit Built-in Action: %s"
 msgstr "Upravit vestavěnou akci: %s"
 
@@ -13835,6 +15944,9 @@ msgstr "Filtrovat nastavení"
 msgid "Advanced Settings"
 msgstr "Pokročilá nastavení"
 
+msgid "The Project Manager must be restarted for changes to take effect."
+msgstr "Pro projevení změn je nutné restartovat správce projektů."
+
 msgid "The editor must be restarted for changes to take effect."
 msgstr "Pro projevení změn je nutné restartovat editor."
 
@@ -13844,6 +15956,15 @@ msgstr "Zkratky"
 msgid "Binding"
 msgstr "Vazba"
 
+msgid "Overridden in project"
+msgstr "Přepsán v projektu"
+
+msgid "Go to the override in the Project Settings."
+msgstr "Přejděte na Přepsání v nastavení projektu."
+
+msgid "Remove this override."
+msgstr "Odstranit toto přepsání."
+
 msgid "Left Stick Left, Joystick 0 Left"
 msgstr "Levá páčka doleva, joystick 0 doleva"
 
@@ -13919,6 +16040,9 @@ msgstr "Všechna zařízení"
 msgid "Device"
 msgstr "Zařízení"
 
+msgid "Listening for Input. Hold %s to release focus."
+msgstr "Naslouchání vstupu. Podržením %s uvolníte zaměření."
+
 msgid "Listening for Input"
 msgstr "Poslouchání vstupu"
 
@@ -13940,6 +16064,18 @@ msgstr "Tlačítka joypadu"
 msgid "Joypad Axes"
 msgstr "Osy joypadu"
 
+msgctxt "Key Location"
+msgid "Unspecified"
+msgstr "Nespecifikováno"
+
+msgctxt "Key Location"
+msgid "Left"
+msgstr "Vlevo"
+
+msgctxt "Key Location"
+msgid "Right"
+msgstr "Vpravo"
+
 msgid "Event Configuration for \"%s\""
 msgstr "Nastavení události pro \"%s\""
 
@@ -13977,6 +16113,18 @@ msgstr "Popisek klávesy (Unicode, nerozlišuje velká a malá písmena)"
 msgid "Physical location"
 msgstr "Pozice fyzické klávesy"
 
+msgid "Alt or Option key"
+msgstr "Alt nebo tlačítko Nastavení"
+
+msgid "Shift key"
+msgstr "Tlačítko Shift"
+
+msgid "Control key"
+msgstr "Tlačítko Ctrl"
+
+msgid "Meta/Windows or Command key"
+msgstr "Tlačítko Meta/Windows nebo tlačítko Příkaz (Command)"
+
 msgid "Add Project Setting"
 msgstr "Přidat nastavení projektu"
 
@@ -14007,6 +16155,9 @@ msgstr "Nastavení projektu (project.godot)"
 msgid "Select a Setting or Type its Name"
 msgstr "Vyberte nastavení nebo zadejte jeho název"
 
+msgid "Feature"
+msgstr "Funkce"
+
 msgid "Changed settings will be applied to the editor after restarting."
 msgstr "Změny nastavení se v editoru projeví po restartu."
 
@@ -14049,9 +16200,15 @@ msgstr "N/A"
 msgid "Open Shader / Choose Location"
 msgstr "Otevřít shader / Vybrat umístění"
 
+msgid "Invalid shader type selected."
+msgstr "Vybrán neplatný typ shaderu."
+
 msgid "Invalid base path."
 msgstr "Neplatná cesta umístění."
 
+msgid "Invalid extension for selected shader type."
+msgstr "Neplatné rozšíření pro vybraný typ shaderu."
+
 msgid "Note: Built-in shaders can't be edited using an external editor."
 msgstr "Poznámka: Vestavěné shadery nelze upravovat pomocí externího editoru."
 
@@ -14100,9 +16257,15 @@ msgstr "Otevřít soubor v inspektoru"
 msgid "Inspect Native Shader Code..."
 msgstr "Prozkoumat nativní kód shaderu..."
 
+msgid "Copy Shader Path"
+msgstr "Kopírovat cestu k shaderu"
+
 msgid "Shader Editor"
 msgstr "Editor shaderů"
 
+msgid "Toggle Shader Editor Dock"
+msgstr "Přepnout dok Editoru shaderů"
+
 msgid "No valid shader stages found."
 msgstr "Nebyly nalezeny žádné platné fáze shaderu."
 
@@ -14119,6 +16282,9 @@ msgstr ""
 msgid "ShaderFile"
 msgstr "Soubor shaderu"
 
+msgid "Toggle ShaderFile Dock"
+msgstr "Přepnout dok ShaderFile"
+
 msgid "Set Shader Global Variable"
 msgstr "Nastavit globální proměnnou shaderu"
 
@@ -14134,6 +16300,12 @@ msgstr "Název '%s' je rezervované klíčové slovo shaderového jazyka."
 msgid "Add Shader Global Parameter"
 msgstr "Přidat globální shaderový parametr"
 
+msgid "Error at line %d:"
+msgstr "Chyba na řádku %d:"
+
+msgid "Error at line %d in include %s:%d:"
+msgstr "Chyba na řádku %d v součásti %s:%d:"
+
 msgid "Warnings should be fixed to prevent errors."
 msgstr "Varování by měla být opravena, aby se předešlo chybám."
 
@@ -14210,6 +16382,12 @@ msgstr "Vzorkovač"
 msgid "[default]"
 msgstr "[výchozí]"
 
+msgid "Expand output port"
+msgstr "Rozšířit výstupní port"
+
+msgid "Select preview port"
+msgstr "Vybrat port pro náhled"
+
 msgid ""
 "The 2D preview cannot correctly show the result retrieved from instance "
 "parameter."
@@ -14366,6 +16544,9 @@ msgstr "Nastavit konstantu: %s"
 msgid "Invalid name for varying."
 msgstr "Neplatný název pro interpolovanou proměnnou."
 
+msgid "Varying with that name already exists."
+msgstr "Varianta s tímto názvem již existuje."
+
 msgid "Boolean type cannot be used with `%s` varying mode."
 msgstr "Booleovský typ nelze použít s režimem interpolované proměnné `%s`."
 
@@ -14435,12 +16616,28 @@ msgstr "Kopírovat parametry z materiálu"
 msgid "Paste Parameters To Material"
 msgstr "Vložit parametry do materiálu"
 
+msgid "Forward+/Mobile"
+msgstr "Forward+/Mobile"
+
+msgid ""
+"Only supported in the Forward+ and Mobile rendering methods, not "
+"Compatibility."
+msgstr ""
+"Podporováno jen ve vykreslovacích metodách Forward+ a Mobile, nikoli v režimu "
+"Compatibility."
+
 msgid "Create Shader Node"
 msgstr "Vytvořit shader uzel"
 
 msgid "Create Shader Varying"
 msgstr "Vytvořit interpolovanou proměnnou shaderu"
 
+msgid "Varying Type"
+msgstr "Typ Variace"
+
+msgid "Varying Mode"
+msgstr "Režime Variace"
+
 msgid "Delete Shader Varying"
 msgstr "Odstranit interpolovanou proměnnou shaderu"
 
@@ -15406,12 +17603,30 @@ msgstr ""
 "Přesměrovat připojení volně, lze použít k připojení více vstupních portů k "
 "jednomu výstupnímu portu."
 
+msgid "[None]"
+msgstr "[Žádné]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Upravit vizuální vlastnost: %s"
 
 msgid "Visual Shader Mode Changed"
 msgstr "Režim vizuálního shaderu změněn"
 
+msgid ""
+"Cannot convert VisualShader to GDShader because VisualShader has embedded "
+"subresources."
+msgstr ""
+"Nelze převést VisualShader na GDShader protože VisualShader má vestavěné "
+"podzdroje."
+
+msgid ""
+"Visual Shader conversion cannot convert external dependencies. Resource "
+"references from Nodes will have to be rebound as ShaderParameters on a "
+"Material."
+msgstr ""
+"Konverze Visual Shaderu nemůže převádět externí závislosti. Odkazy na zdroje "
+"z uzlů bude nutné znovu načíst jako ShaderParameters v materiálů."
+
 msgctxt "Locale"
 msgid "Script:"
 msgstr "Písmo:"
@@ -15438,6 +17653,9 @@ msgstr "[Výchozí]"
 msgid "Select a Locale"
 msgstr "Vybrat jazyk"
 
+msgid "Locale Filter"
+msgstr "Lokální filtr"
+
 msgid "Show All Locales"
 msgstr "Zobrazit všechny jazyky"
 
@@ -15453,6 +17671,21 @@ msgstr "Země"
 msgid "Variant"
 msgstr "Varianta"
 
+msgid "Previewing: %s"
+msgstr "Náhled: %s"
+
+msgid "Disable Translation Preview"
+msgstr "Zakázat Překlad náhledu"
+
+msgid "Previewing translation. Click to disable."
+msgstr "Zobrazuji překlad. Klikněte pro zakázání."
+
+msgid "No Translations Configured"
+msgstr "Žádný překlad nebyl nakonfigurován"
+
+msgid "You can add translations in the Project Settings."
+msgstr "Můžete přidat překlady v nastavení projektu."
+
 msgid "Add %d Translation"
 msgid_plural "Add %d Translations"
 msgstr[0] "Přidat %d překlad"
@@ -15480,6 +17713,18 @@ msgstr "Odebrat přemapování zdroje"
 msgid "Remove Resource Remap Option"
 msgstr "Odebrat možnost přemapování zdroje"
 
+msgid "Add %d file for template generation"
+msgid_plural "Add %d files for template generation"
+msgstr[0] "Přidat %d soubor pro generování šablony"
+msgstr[1] "Přidat %d soubory pro generování šablon"
+msgstr[2] "Přidat %d souborů pro generování šablon"
+
+msgid "Remove file from template generation"
+msgstr "Odebrat soubor z generování šablon"
+
+msgid "Rearrange Localization Items"
+msgstr "Změna uspořádání položek překladu"
+
 msgid "Removed"
 msgstr "Odebráno"
 
@@ -15501,13 +17746,22 @@ msgstr "Zdroje:"
 msgid "Remaps by Locale:"
 msgstr "Přemapování podle jazyka:"
 
+msgid "Template Generation"
+msgstr "Generování šablony"
+
 msgid "Files with translation strings:"
 msgstr "Soubory s řetězci překladů:"
 
+msgid "Add Built-in Strings"
+msgstr "Přidat vestavěné řetězce"
+
 msgid "Add strings from built-in components such as certain Control nodes."
 msgstr ""
 "Přidat řetězce z vestavěných komponent, například některých Control uzlů."
 
+msgid "No translatable strings found."
+msgstr "Nebyly nalezeny žádné přeložitelné řetězce."
+
 msgid ""
 "No VCS plugins are available in the project. Install a VCS plugin to use VCS "
 "integration features."
@@ -15602,6 +17856,9 @@ msgstr "Vybrat cestu k soukromému klíči SSH"
 msgid "SSH Passphrase"
 msgstr "Přístupová fráze (heslo) SSH"
 
+msgid "Open Version Control Dock"
+msgstr "Otevřít dok správy verzí"
+
 msgid "Detect new changes"
 msgstr "Detekovat nové změny"
 
@@ -15668,6 +17925,9 @@ msgstr "Stáhnout a sloučit"
 msgid "Push"
 msgstr "Nahrát"
 
+msgid "Extra options"
+msgstr "Další možnosti"
+
 msgid "Force Push"
 msgstr "Nuceně nahrát"
 
@@ -15765,6 +18025,15 @@ msgstr "Změnit vnější poloměr toru"
 msgid "Invalid type argument to convert(), use TYPE_* constants."
 msgstr "Neplatný argument typu pro convert(), použijte konstanty TYPE_*."
 
+msgid "Expected an integer between 0 and 2^32 - 1."
+msgstr "Očekávána celočíselná hodnota mezi 0 a 2^32 -1."
+
+msgid "Expected a string of length 1 (a character)."
+msgstr "Očekáván řetězec s délkou 1 (jeden znak)."
+
+msgid "Range too big."
+msgstr "Rozsah je příliš velký."
+
 msgid "Cannot resize array."
 msgstr "Nelze změnit velikost pole."
 
@@ -15821,6 +18090,9 @@ msgstr "Argument hodnoty je dříve uvolněná instance."
 msgid "Export Scene to glTF 2.0 File"
 msgstr "Exportovat scénu do souboru glTF 2.0"
 
+msgid "Export Settings"
+msgstr "Nastavení exportu"
+
 msgid "glTF 2.0 Scene..."
 msgstr "glTF 2.0 scéna..."
 
@@ -15887,6 +18159,9 @@ msgstr "Mřížková mapa: Smazat výběr"
 msgid "GridMap Fill Selection"
 msgstr "Mřížková mapa: Vyplnit výběr"
 
+msgid "GridMap Move Selection"
+msgstr "Mřížková mapa: Posunout výběr"
+
 msgid "GridMap Paste Selection"
 msgstr "Mřížková mapa: Vložit výběr"
 
@@ -15935,6 +18210,9 @@ msgstr "Y otočení kurzoru"
 msgid "Cursor Rotate Z"
 msgstr "Z otočení kurzoru"
 
+msgid "Change Grid Floor:"
+msgstr "Změnit patro mřížky:"
+
 msgid ""
 "Change Grid Floor:\n"
 "Previous Plane (%s)\n"
@@ -15947,6 +18225,12 @@ msgstr ""
 msgid "Filter Meshes"
 msgstr "Filtrovat sítě"
 
+msgid "View as Thumbnails"
+msgstr "Zobrazit jako miniatury"
+
+msgid "View as List"
+msgstr "Zobrazit jako seznam"
+
 msgid "Give a MeshLibrary resource to this GridMap to use its meshes."
 msgstr "Přiřaďte této mřížkové mapě zdroj MeshLibrary k použití jeho sítě."
 
@@ -15983,6 +18267,15 @@ msgstr "Automatické"
 msgid "Edit Transitions"
 msgstr "Upravit přechody"
 
+msgid "Using any clip → %s."
+msgstr "Použití Jakýkoli klip → %s."
+
+msgid "Using %s → Any clip."
+msgstr "Použití %s → Jakýkoli klip."
+
+msgid "Using all clips → Any clip."
+msgstr "Použít Všechny klipy → Jakýkoli klip."
+
 msgid "No transition available."
 msgstr "Není dostupný žádný přechod."
 
@@ -16145,11 +18438,11 @@ msgstr ""
 
 msgctxt "Network"
 msgid "Down"
-msgstr "Příchozí"
+msgstr "Stahování"
 
 msgctxt "Network"
 msgid "Up"
-msgstr "Odchozí"
+msgstr "Odesílání"
 
 msgid "%d (%s)"
 msgstr "%d (%s)"
@@ -16157,6 +18450,12 @@ msgstr "%d (%s)"
 msgid "%s/s"
 msgstr "%s/s"
 
+msgid "Incoming Bandwidth"
+msgstr "Příchozí Bandwidth"
+
+msgid "Outgoing Bandwidth"
+msgstr "Odchozí Bandwidth"
+
 msgid "Node"
 msgstr "Uzel"
 
@@ -16287,6 +18586,9 @@ msgstr "Nastavit end_position"
 msgid "Create Navigation Polygon"
 msgstr "Vytvořit navigační polygon"
 
+msgid "Bake NavigationPolygon"
+msgstr "Bake NavigationPolygon"
+
 msgid ""
 "Bakes the NavigationPolygon by first parsing the scene for source geometry "
 "and then creating the navigation polygon vertices and polygons."
@@ -16294,6 +18596,9 @@ msgstr ""
 "Vypálí NavigationPolygon tak, že nejprve analyzuje scénu pro zdrojovou "
 "geometrii a poté vytvoří vrcholy a polygony navigačního polygonu."
 
+msgid "Clear NavigationPolygon"
+msgstr "Promazat NavigationPolygon"
+
 msgid "Clears the internal NavigationPolygon outlines, vertices and polygons."
 msgstr "Promaže vnitřní obrysy, vrcholy a polygony NavigationPolygonu."
 
@@ -16303,6 +18608,12 @@ msgstr ""
 "Aby tento uzel mohl fungovat, musí mít nastaven nebo vytvořen zdroj "
 "NavigationPolygon."
 
+msgid "Start Position"
+msgstr "Startovní pozice"
+
+msgid "End Position"
+msgstr "Konečná pozice"
+
 msgid "Change Start Position"
 msgstr "Změnit počáteční pozici"
 
@@ -16342,6 +18653,9 @@ msgstr "Upravit překážku (přesunout vrchol)"
 msgid "Edit Obstacle (Remove Vertex)"
 msgstr "Upravit překážku (odstranit vrchol)"
 
+msgid "Flip"
+msgstr "Přetočit"
+
 msgid "Remove all vertices?"
 msgstr "Odstranit všechny vrcholy?"
 
@@ -16368,6 +18682,9 @@ msgid ""
 msgstr ""
 "Nelze generovat navigační síť, protože zdroj byl importován z jiného typu."
 
+msgid "Bake"
+msgstr "Bake"
+
 msgid "Bake NavigationMesh"
 msgstr "Vypálit NavigationMesh"
 
@@ -16384,9 +18701,262 @@ msgstr "Vymazat NavigationMesh"
 msgid "Clears the internal NavigationMesh vertices and polygons."
 msgstr "Vymaže interní vrcholy a polygony NavigationMesh."
 
+msgid "Baking NavigationMesh ..."
+msgstr "Bake NavigationMesh ..."
+
 msgid "Toggles whether the noise preview is computed in 3D space."
 msgstr "Přepíná, zda se náhled šumu vypočítává ve 3D prostoru."
 
+msgid "Classes"
+msgstr "Třídy"
+
+msgid "Filter Classes"
+msgstr "Filtrovat třídy"
+
+msgid "A Count"
+msgstr "Počet A"
+
+msgid "B Count"
+msgstr "Počet B"
+
+msgid "Delta"
+msgstr "Delta"
+
+msgid "A: %s"
+msgstr "A: %s"
+
+msgid "B: %s"
+msgstr "B: %s"
+
+msgid "Objects"
+msgstr "Objekty"
+
+msgid "A Objects"
+msgstr "A Objekty"
+
+msgid "B Objects"
+msgstr "B Objekty"
+
+msgid "Nodes"
+msgstr "Uzly"
+
+msgid "A Nodes"
+msgstr "Uzel A"
+
+msgid "Combine Diff"
+msgstr "Spojit rozdíly"
+
+msgid "B Nodes"
+msgstr "Uzel B"
+
+msgid "Orphan Nodes"
+msgstr "Sirotčí uzly"
+
+msgid "Snapshot A"
+msgstr "Momentka A"
+
+msgid "Snapshot B"
+msgstr "Momentka B"
+
+msgid "Filter Objects"
+msgstr "Filtrovat objekty"
+
+msgid "Snapshot"
+msgstr "Momentka"
+
+msgid "Inbound References"
+msgstr "Vstupní reference"
+
+msgid "Outbound References"
+msgstr "Výstupní reference"
+
+msgid "Object's class"
+msgstr "Třída Objekty"
+
+msgid "Object"
+msgstr "Objekt"
+
+msgid "Object's name"
+msgstr "Jméno Objektu"
+
+msgid "In"
+msgstr "V"
+
+msgid "Number of inbound references"
+msgstr "Počet vstupních referencí"
+
+msgid "Out"
+msgstr "Ven"
+
+msgid "Number of outbound references"
+msgstr "Počet výstupních referencí"
+
+msgid "A"
+msgstr "A"
+
+msgid "Other object referencing this object"
+msgstr "Jiný objekt odkazující na tento objekt"
+
+msgid "Property of other object referencing this object"
+msgstr "Vlastnost jiného objektu odkazující na tento objekt"
+
+msgid "Property of this object referencing other object"
+msgstr "Vlastnost tohoto objektu odkazující na jiný objekt"
+
+msgid "Other object being referenced"
+msgstr "Jiný odkazovaný objekt"
+
+msgid "RefCounted"
+msgstr "Počet referencí"
+
+msgid "Filter RefCounteds"
+msgstr "Počet filtrovaných referencí"
+
+msgid "Native Refs"
+msgstr "Nativní reference"
+
+msgid "ObjectDB Refs"
+msgstr "Reference ObjectDB"
+
+msgid "Total Refs"
+msgstr "Celkové reference"
+
+msgid "ObjectDB Cycles"
+msgstr "Cykly ObjectDB"
+
+msgid "References not owned by the ObjectDB"
+msgstr "Reference nevlastněné ObjectDB"
+
+msgid "References owned by the ObjectDB"
+msgstr "Reference vlastněné ObjectDB"
+
+msgid "ObjectDB References + Native References"
+msgstr "Reference ObjectDB + Nativní reference"
+
+msgid "Cycles detected in the ObjectDB"
+msgstr "Cykly detekované v ObjectDB"
+
+msgid "Native References: %d"
+msgstr "Reference: %d"
+
+msgid "ObjectDB References: %d"
+msgstr "Reference ObjektDB: %d"
+
+msgid "Total References: %d"
+msgstr "Celkové reference: %d"
+
+msgid "ObjectDB Cycles: %d"
+msgstr "Cykly ObjektDB: %d"
+
+msgid "[center]ObjectDB References[center]"
+msgstr "[center]Reference ObjectDB[center]"
+
+msgid "Duplicate?"
+msgstr "Duplikovat?"
+
+msgid ""
+"Was the same reference returned by multiple getters on the source object?"
+msgstr ""
+"Byla stejná reference vrácena více metodami getter na zdrojovém objektu?"
+
+msgid "Sort By %s (Ascending)"
+msgstr "Seřadit podle %s (vzestupně)"
+
+msgid "Sort By %s (Descending)"
+msgstr "Seřadit podle %s (sestupně)"
+
+msgid "Summary"
+msgstr "Shrnutí"
+
+msgid "ObjectDB Snapshot Summary"
+msgstr "Shrnutí Momentky ObjectDB"
+
+msgid "Press 'Take ObjectDB Snapshot' to snapshot the ObjectDB."
+msgstr "Stiskněte 'Pořídit momentku ObjectDB' pro momentku z ObjectDB."
+
+msgid ""
+"Memory in Godot is either owned natively by the engine or owned by the "
+"ObjectDB."
+msgstr ""
+"Paměť v Godotu je buď nativní vlastněna enginem nebo vlastněna ObjectDB."
+
+msgid "ObjectDB Snapshots capture only memory owned by the ObjectDB."
+msgstr "Momentka ObjectDB zachytí pouze paměť vlastněnou ObjectDB."
+
+msgid "Overview"
+msgstr "Přehled"
+
+msgid "RefCounteds"
+msgstr "RefCounteds"
+
+msgid "Timestamp:"
+msgstr "Časová známka:"
+
+msgid "Game Version:"
+msgstr "Verze hry:"
+
+msgid "Editor Version:"
+msgstr "Verze editoru:"
+
+msgid "Memory Used:"
+msgstr "Využitá paměť:"
+
+msgid "Max Memory Used:"
+msgstr "Maximální využitá paměť:"
+
+msgid "Total Objects:"
+msgstr "Celkové Objekty:"
+
+msgid "Total Nodes:"
+msgstr "Celkem uzlů:"
+
+msgid ""
+"Multiple root nodes [i](possible call to 'remove_child' without 'queue_free')"
+"[/i]"
+msgstr ""
+"Více kořenových uzlů [i](možné volání 'remove_child' bez 'queue_free')[/i]"
+
+msgid ""
+"RefCounted objects only referenced in cycles [i](cycles often indicate a "
+"memory leaks)[/i]"
+msgstr ""
+"Objekty RefCounted na které se odkazuje v cyklech [i](cykly často indikují "
+"úniky paměti)[/i]"
+
+msgid ""
+"Scripted objects not referenced by any other objects [i](unreferenced objects "
+"may indicate a memory leak)[/i]"
+msgstr ""
+"Skriptované objekty, na které neodkazují žádné jiné objekty [i](neodkazované "
+"objekty mohou znamenat únik paměti)[/i]"
+
+msgid "Generating Snapshot"
+msgstr "Generuji momentku"
+
+msgid "Receiving Snapshot (0/%s MiB)"
+msgstr "Získávám momentku (0/%s MiB)"
+
+msgid "Receiving Snapshot (%s/%s MiB)"
+msgstr "Získávám momentku (%s/%s MiB)"
+
+msgid "Visualizing Snapshot"
+msgstr "Vizualizace Momentky"
+
+msgid "Take ObjectDB Snapshot"
+msgstr "Pořídit momentku ObjectDB"
+
+msgid "Invalid snapshot name."
+msgstr "Neplatný název momentky."
+
+msgid "Snapshot rename failed"
+msgstr "Přejmenování momentky selhalo"
+
+msgid "ObjectDB Profiler"
+msgstr "Profiler ObjectDB"
+
+msgid "Diff Against:"
+msgstr "Rozdíl oproti:"
+
 msgid "Rename Action"
 msgstr "Přejmenovat akci"
 
@@ -16396,6 +18966,27 @@ msgstr "Přejmenovat lokalizovaný název akce"
 msgid "Change Action Type"
 msgstr "Změnit typ akce"
 
+msgid ""
+"Internal name of the action. Some XR runtimes don't allow spaces or special "
+"characters."
+msgstr ""
+"Interní název akce. Některé XR runtime nepovolují mezery ani speciální znaky."
+
+msgid "Action Name"
+msgstr "Název Akce"
+
+msgid "Human-readable name of the action. This can be displayed to end users."
+msgstr "Lidsky čitelný název akce. Toto bude zobrazeno koncovému uživateli."
+
+msgid "Action Localized Name"
+msgstr "Lokalizovaný název akce"
+
+msgid "Type of the action"
+msgstr "Typ akce"
+
+msgid "Action Type"
+msgstr "Typ Akce"
+
 msgid "Remove action"
 msgstr "Odstranit akci"
 
@@ -16423,6 +19014,9 @@ msgstr "Odstranit profil interakce"
 msgid "OpenXR Action Map"
 msgstr "Mapa akcí OpenXR"
 
+msgid "Toggle OpenXR Action Map Dock"
+msgstr "Přepnout dok Mapy akcí OpenXR"
+
 msgid "Add Action Set"
 msgstr "Přidat sadu akcí"
 
@@ -16459,12 +19053,39 @@ msgstr "Přidat akci"
 msgid "Delete action"
 msgstr "Smazat akci"
 
+msgid "Fold"
+msgstr "Složka"
+
+msgid "Action Set Name"
+msgstr "Jméno sady akcí"
+
+msgid ""
+"Human-readable name of the action set. This can be displayed to end users."
+msgstr ""
+"Lidsky čitelný název sady akcí. Toto bude zobrazeno koncovému uživateli."
+
+msgid "Action Set Localized Name"
+msgstr "Lokalizovaný název sady akcí"
+
+msgid ""
+"Priority of the action set. If multiple action sets bind to the same input, "
+"the action set with the highest priority will be updated."
+msgstr ""
+"Priorita sady akcí. Pokud se na stejný vstup váže více sad akcí, aktualizuje "
+"se sada akcí s nejvyšší prioritou."
+
+msgid "Action Set Priority"
+msgstr "Priorita sady akcí"
+
 msgid "Add action."
 msgstr "Přidat akci."
 
 msgid "Remove action set."
 msgstr "Odstanit množinu akcí."
 
+msgid "Remove this binding modifier."
+msgstr "Odstranit tento modifikátor vazby."
+
 msgid "Remove binding modifier"
 msgstr "Odstranit modifikátor vazby"
 
@@ -16506,6 +19127,9 @@ msgstr "Haptická"
 msgid "Unknown"
 msgstr "Neznámá"
 
+msgid "Modifiers"
+msgstr "Modifikátory"
+
 msgid "Select an action"
 msgstr "Vybrat akci"
 
@@ -16553,6 +19177,21 @@ msgstr "Maska viditelnosti OpenXR musí mít jako rodičovský uzel XRCamera3D."
 msgid "Building Android Project (gradle)"
 msgstr "Sestavování projektu pro Android (gradle)"
 
+msgid "> Connecting to Gradle Build Environment..."
+msgstr "> Připojování k prostředí Gradle sestavení..."
+
+msgid "Unable to connect to Gradle Build Environment service"
+msgstr "Nepodařilo se připojit ke službě prostředí Gradle sestavení"
+
+msgid "> Starting Gradle build..."
+msgstr "> Zahájeno Gradle sestavení..."
+
+msgid "Failed to execute Gradle command"
+msgstr "Nepodařilo se spustit příkaz Gradle"
+
+msgid "> Copying Gradle artifacts..."
+msgstr "> Kopírování Gradle artefaktů..."
+
 msgid "Package name is missing."
 msgstr "Chybí název balíčku."
 
@@ -16589,6 +19228,18 @@ msgid "\"Use Gradle Build\" must be enabled to use the plugins."
 msgstr ""
 "Chcete-li používat doplňky, musí být povoleno \"Použít Gradle sestavení\"."
 
+msgid "Support for \"Use Gradle Build\" on Android is currently experimental."
+msgstr ""
+"Podpora pro \"Použití sestavení Gradle\" na Androidu je v současnosti "
+"experimentální."
+
+msgid ""
+"\"Compress Native Libraries\" is only valid when \"Use Gradle Build\" is "
+"enabled."
+msgstr ""
+"Volba \"Komprimovat nativní knihovny\" je platná pouze tehdy, když je "
+"povolena možnost \"Použít sestavení Gradle\"."
+
 msgid "\"Export AAB\" is only valid when \"Use Gradle Build\" is enabled."
 msgstr ""
 "\"Exportovat AAB\" je platné pouze v případě, že je povolena možnost \"Použít "
@@ -16625,6 +19276,11 @@ msgstr ""
 msgid "\"Target SDK\" version must be greater or equal to \"Min SDK\" version."
 msgstr "Verze \"Cílové SDK\" musí být vyšší nebo rovna verzi \"Minimální SDK\"."
 
+msgid "\"Use Gradle Build\" is required to add custom theme attributes."
+msgstr ""
+"Pro přidání vlastních atributů šablony je nutné použít \"Použít sestavení "
+"Gradle\"."
+
 msgid "\"Use Gradle Build\" must be enabled to enable \"Show In Android Tv\"."
 msgstr ""
 "Pro povolení \"Zobrazit v Android Tv\" musí být povoleno \"Použít Gradle "
@@ -16640,6 +19296,16 @@ msgstr ""
 "Pro povolení \"Zobrazit v knihovně aplikací\" musí být povoleno \"Použít "
 "Gradle sestavení\"."
 
+msgid "Mirror Android devices"
+msgstr "Zrcadlit zařízení Android"
+
+msgid ""
+"If enabled, \"scrcpy\" is used to start the project and automatically stream "
+"device display (or virtual display) content."
+msgstr ""
+"Pokud je povoleno, použije se \"scrcpy\" ke spuštění projektu a automatickému "
+"streamování obsahu displeje zařízení (nebo virtuálního displeje)."
+
 msgid "Exporting APK..."
 msgstr "Exportování APK..."
 
@@ -16655,6 +19321,13 @@ msgstr "Nepodařilo se nainstalovat na zařízení: %s"
 msgid "Running on device..."
 msgstr "Běží na zařízení..."
 
+msgid ""
+"Could not start scrcpy executable. Configure scrcpy path in the Editor "
+"Settings (Export > Android > scrcpy > Path)."
+msgstr ""
+"Nelze spustit spustitelný soubor scrcpy. Nakonfigurujte cestu k scrcpy v "
+"nastastavení Editoru (Export > Android > scrcpy > Cesta)."
+
 msgid "Could not execute on device."
 msgstr "Nepodařilo se spustit na zařízení."
 
@@ -16751,6 +19424,10 @@ msgstr "Chybí složka 'build-tools'!"
 msgid "Unable to find Android SDK build-tools' apksigner command."
 msgstr "Nelze najít apksigner příkaz nástrojů build-tools Android SDK."
 
+msgid "\"Use Gradle Build\" is required for transparent background on Android"
+msgstr ""
+"Pro průhledné pozadí v Androidu je vyžadováno \"Použít sestavení Gradle\""
+
 msgid ""
 "\"Target SDK\" %d is higher than the default version %d. This may work, but "
 "wasn't tested and may be unstable."
@@ -16782,6 +19459,12 @@ msgstr "Podepisování ladicího APK..."
 msgid "Signing release APK..."
 msgstr "Podepisování APK vydání..."
 
+msgid "Could not find debug keystore, unable to export."
+msgstr "Nepodařilo se najít úložiště klíčů pro debug, nelze exportovat."
+
+msgid "Could not find release keystore, unable to export."
+msgstr "Nepodařilo se najít úložiště klíčů pro release, nelze exportovat."
+
 msgid "Unable to sign apk."
 msgstr "Nepodařilo se podepsat apk."
 
@@ -16823,6 +19506,9 @@ msgstr "Nepodařilo se ověřit podepsané apk."
 msgid "'apksigner' verification of APK failed."
 msgstr "Ověření APK pomocí 'apksigner' selhalo."
 
+msgid "Could not create temporary file!"
+msgstr "Nelze vytvořit dočasný soubor!"
+
 msgid "Exporting for Android"
 msgstr "Export pro systém Android"
 
@@ -16862,6 +19548,12 @@ msgstr ""
 msgid "Unable to overwrite res/*.xml files with project name."
 msgstr "Nepodařilo se přepsat soubory res/*.xml názvem projektu."
 
+msgid "Could not generate sparse pck metadata!"
+msgstr "Nelze generovat sparse pck metadata!"
+
+msgid "Could not write PCK directory!"
+msgstr "Nelze zapsat PCK adresář!"
+
 msgid "Could not export project files to gradle project."
 msgstr "Nelze exportovat soubory projektu do projektu gradle."
 
@@ -17081,6 +19773,21 @@ msgstr "Je povolen přístup ke kalendáři, ale není uveden popis použití."
 msgid "Photo library access is enabled, but usage description is not specified."
 msgstr "Je povolen přístup k knihovně fotek, ale není uveden popis použití."
 
+msgid "Liquid Glass Icons"
+msgstr "Ikony Tekutý Plyn"
+
+msgid "Could not start 'actool' executable."
+msgstr "Nelze spustit spustitelný soubor 'actool'."
+
+msgid "Could not read 'actool' version."
+msgstr "Nelze načíst verzi 'actool'."
+
+msgid "At least version 26.0 of 'actool' is required (version %f found)."
+msgstr "Je potřeba alespoň 'actool' verze 26.0 (nalezena verze %f)."
+
+msgid "Could not export liquid glass icon:"
+msgstr "Nelze exportovat ikonu tekutý plyn:"
+
 msgid "Notarization"
 msgstr "Notářské ověření"
 
@@ -17103,6 +19810,13 @@ msgstr "UUID požadavku pro notářské ověření: \"%s\""
 msgid "The notarization process generally takes less than an hour."
 msgstr "Proces notářského ověření obvykle trvá méně než hodinu."
 
+msgid ""
+"You can check the progress manually by opening a Terminal and running the "
+"following command:"
+msgstr ""
+"Průběh můžete zkontrolovat ručně otevřením terminálu a spuštěním "
+"následujícího příkazu:"
+
 msgid ""
 "Run the following command to staple the notarization ticket to the exported "
 "application (optional):"
@@ -17116,6 +19830,13 @@ msgstr "Nástroje příkazového řádku Xcode nejsou nainstalovány."
 msgid "Could not start xcrun executable."
 msgstr "Nelze spustit program xcrun."
 
+msgid ""
+"See instructions on finding your team ID: https://developer.apple.com/help/"
+"glossary/team-id"
+msgstr ""
+"Pokyny k nalezení ID vašeho týmu: https://developer.apple.com/help/glossary/"
+"team-id"
+
 msgid "Built-in CodeSign failed with error \"%s\"."
 msgstr "Vestavěný CodeSign selhal s chybou \"%s\"."
 
@@ -17464,6 +20185,27 @@ msgstr "Spustit na vzdáleném systému Windows"
 msgid "Run exported project on remote Windows system"
 msgstr "Spustit exportovaný projekt na vzdáleném systému Windows"
 
+msgid ""
+"A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
+"property in order for AnimatedSprite2D to display frames."
+msgstr ""
+"Zdroj SpriteFrames musí být vytvořen nebo nastaven ve vlastnosti \"Snímky "
+"spritu\", aby mohl AnimatedSprite2D zobrazovat snímky."
+
+msgid ""
+"Ancestor \"%s\" clips its children, so this CanvasGroup will not function "
+"properly."
+msgstr ""
+"Předek \"%s\" ořezává své potomky, takže tato skupina CanvasGroup nebude "
+"fungovat správně."
+
+msgid ""
+"Ancestor \"%s\" is a CanvasGroup, so this CanvasGroup will not function "
+"properly."
+msgstr ""
+"Předek \"%s\" je typu CanvasGroup, takže tato skupina CanvasGroup nebude "
+"fungovat správně."
+
 msgid ""
 "Only one visible CanvasModulate is allowed per canvas.\n"
 "When there are more than one, only one of them will be active. Which one is "
@@ -17492,6 +20234,12 @@ msgstr ""
 "Animace Particles2D vyžaduje použití CanvasItemMaterial se zapnutou funkcí "
 "\"Animace částic\"."
 
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile renderer."
+msgstr ""
+"Stopy částic jsou dostupné pouze při použití vykreslovacích nástrojů Forward+ "
+"nebo Mobile."
+
 msgid ""
 "Particle sub-emitters are not available when using the Compatibility renderer."
 msgstr ""
@@ -17539,6 +20287,13 @@ msgstr ""
 msgid "Skew has no effect on the agent radius."
 msgstr "Zkosení nemá na poloměr aktéra žádný vliv."
 
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work. "
+"Please set a property or draw a polygon."
+msgstr ""
+"Aby mohl tento uzel fungovat, musí mít vytvořen nebo nastaven zdroj "
+"NavigationPolygon. Nastavte prosím vlastnost nebo nakreslete polygon."
+
 msgid ""
 "ParallaxLayer node only works when set as child of a ParallaxBackground node."
 msgstr ""
@@ -17557,6 +20312,16 @@ msgstr ""
 "Zvažte možnost přidat CollisionShape2D nebo CollisionPolygon2D jako potomka "
 "abyste definovali jeho tvar."
 
+msgid ""
+"CollisionPolygon2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."
+msgstr ""
+"CollisionPolygon2D slouží pouze jako kontejner tvarů objektu "
+"CollissionObject2D a od něj odvozených uzlů. Použijte ho pouze jako potomka "
+"Area2D, StaticBody2D, RigidBody2D, CharacterBody2D a dalších, pro určení "
+"jejich tvaru."
+
 msgid "An empty CollisionPolygon2D has no effect on collision."
 msgstr "Prázdný CollisionPolygon2D nemá při kolizi žádný efekt."
 
@@ -17635,6 +20400,14 @@ msgstr ""
 "zachoval připojené kosti! Prosím přidejte uzel založený na Joint2D jako "
 "potomka tohoto uzlu!"
 
+msgid ""
+"PhysicsBody2D will not work correctly on a non-interpolated branch of the "
+"SceneTree.\n"
+"Check the node's inherited physics_interpolation_mode."
+msgstr ""
+"PhysicsBody2D nebude správně fungovat na neinterpolované větvi Stromu scény.\n"
+"Zkontrolujte zděděný physics_interpolation_mode uzlu."
+
 msgid ""
 "Size changes to RigidBody2D will be overridden by the physics engine when "
 "running.\n"
@@ -17660,6 +20433,12 @@ msgid "A Bone2D only works with a Skeleton2D or another Bone2D as parent node."
 msgstr ""
 "Uzel Bone2D funguje pouze s nadřazeným uzlem Skeleton2D nebo jiným Bone2D."
 
+msgid ""
+"This bone lacks a proper REST pose. Go to the Skeleton2D node and set one."
+msgstr ""
+"Této kosti chybí správná REST póza. Přejděte na uzel Skeleton2D a nastavte "
+"jej."
+
 msgid ""
 "The TileMap node is deprecated as it is superseded by the use of multiple "
 "TileMapLayer nodes.\n"
@@ -17710,6 +20489,11 @@ msgstr ""
 "Izometrická sada dlaždic pravděpodobně nebude vypadat podle očekávání, pokud "
 "není na mapě dlaždic a všech jejích vrstvách povoleno řazení podle Y."
 
+msgid ""
+"Forward axis and primary rotation axis must not be parallel in setting %s."
+msgstr ""
+"Dopředná osa a primární osa otáčení nesmí být rovnoběžné v nastavení %s."
+
 msgid ""
 "External Skeleton3D node not set! Please set a path to an external Skeleton3D "
 "node."
@@ -17743,6 +20527,11 @@ msgstr ""
 "Animace CPUParticles3D vyžaduje použití StandardMaterial3D, jehož režim "
 "Billboard je nastaven na \"Částicový billboard\"."
 
+msgid "Decals are only available when using the Forward+ or Mobile renderer."
+msgstr ""
+"Nálepky jsou dostupné pouze při využití vykreslovacích nástrojů Forward+ a "
+"Mobile."
+
 msgid ""
 "The decal has no textures loaded into any of its texture properties, and will "
 "therefore not be visible."
@@ -17786,6 +20575,13 @@ msgstr ""
 msgid "Nothing is visible because meshes have not been assigned to draw passes."
 msgstr "Nic není viditelné, protože sítě nebyly přiřazeny do průchodů kreslení."
 
+msgid ""
+"Particles animation requires the usage of a BaseMaterial3D whose Billboard "
+"Mode is set to \"Particle Billboard\"."
+msgstr ""
+"Animace částic vyžaduje použití BaseMaterial3D, jehož Billboard režim je "
+"nastaven na \"Částicový billboard\"."
+
 msgid ""
 "Using Trail meshes with a skin causes Skin to override Trail poses. Suggest "
 "removing the Skin."
@@ -17810,6 +20606,13 @@ msgstr ""
 "Stopy jsou povolené, ale jeden nebo více materiálů sítí buď chybí, nebo "
 "nejsou nastaveny pro vykreslování stop."
 
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderer."
+msgstr ""
+"Dílčí emitory částic jsou dostupné pouze při použití vykreslovacích nástrojů "
+"Forward+ nebo Mobile."
+
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "collision for this GPUParticlesCollisionSDF3D.\n"
@@ -17820,6 +20623,12 @@ msgstr ""
 "Chcete-li toto vyřešit, povolte alespoň jeden bit ve vlastnosti Vypalovací "
 "maska."
 
+msgid ""
+"Detecting settings with no target set! IterateIK3D must have a target to work."
+msgstr ""
+"Zjištěno nastavení bez nastaveného cíle! IteratelK3D musí mít pro fungování "
+"cíl."
+
 msgid "A light's scale does not affect the visual size of the light."
 msgstr "Měřítko světla neovlivní vizuální velikost světla."
 
@@ -18110,6 +20919,14 @@ msgstr "Kloub není připojen k žádnému PhysicsBody3D"
 msgid "Node A and Node B must be different PhysicsBody3Ds"
 msgstr "Uzel A a uzel B musí být dvě různá PhysicsBody3D"
 
+msgid ""
+"PhysicsBody3D will not work correctly on a non-interpolated branch of the "
+"SceneTree.\n"
+"Check the node's inherited physics_interpolation_mode."
+msgstr ""
+"PhysicsBody3D nebude fungovat správně na neinterpolované větvi stromu scén.\n"
+"Zkontrolujte zděděnou physics_interpolation_mode uzlu."
+
 msgid ""
 "Scale changes to RigidBody3D will be overridden by the physics engine when "
 "running.\n"
@@ -18154,6 +20971,12 @@ msgstr ""
 "Není nastaven uzel Skeleton3D! SkeletonModifier3D musí být potomkem "
 "Skeleton3D."
 
+msgid ""
+"Detecting settings with no Path3D set! SplineIK3D must have a Path3D to work."
+msgstr ""
+"Zjištěno nastavení bez nastavené Path3D! SplinelK3D musí mít pro práci "
+"nastavenou Path3D."
+
 msgid "Parent node should be a SpringBoneSimulator3D node."
 msgstr "Rodičovský uzel by měl být uzel SpringBoneSimulator3D."
 
@@ -18164,6 +20987,19 @@ msgstr ""
 "Zdroj SpriteFrames musí být vytvořen nebo nastaven ve vlastnosti \"Sprite "
 "Frames\", aby mohl AnimatedSprite3D zobrazit snímky."
 
+msgid ""
+"Detecting settings with no target set! TwoBoneIK3D must have a target to work."
+msgstr ""
+"Zjištěno nastavení bez nastaveného cíle! TwoBonelK3D musí mít pro práci "
+"nastavenou cestu."
+
+msgid ""
+"Detecting settings with no pole target set! TwoBoneIK3D must have a pole "
+"target to work."
+msgstr ""
+"Zjištěno nastavení bez nastaveného pólového cíle! TwoBonelK3D musí mít pro "
+"práci nastavenou pólovou cestu."
+
 msgid ""
 "The GeometryInstance3D visibility range's End distance is set to a non-zero "
 "value, but is lower than the Begin distance.\n"
@@ -18195,6 +21031,20 @@ msgstr ""
 "vzdáleností, ale vzdálenost přechodu slábnutí je nastavena na 0.\n"
 "Chcete-li to vyřešit, zvyšte koncové odsazení rozsahu viditelnosti nad 0."
 
+msgid ""
+"GeometryInstance3D transparency is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"Průhlednost GeometryInstance3D je dostupná pouze při využití vykreslovací "
+"metody Forward+."
+
+msgid ""
+"GeometryInstance3D visibility range transparency fade is only available when "
+"using the Forward+ renderer."
+msgstr ""
+"Prolínání průhlednosti rozsahu viditelnosti GeometryInstance3D je dostupný "
+"pouze při použití metody vykreslování Forward+."
+
 msgid "Plotting Meshes"
 msgstr "Vykreslení sítí"
 
@@ -18211,6 +21061,11 @@ msgstr ""
 "Uzly VoxelGI zatím nejsou při využití vykreslovacího nástroje Compatibility "
 "podporovány. Podpora bude přidána v budoucím vydání."
 
+msgid "VoxelGI nodes are not supported when using the Dummy renderer."
+msgstr ""
+"Uzly VoxelGI zatím nejsou podporovány při použití základního vykreslovacího "
+"nástroje."
+
 msgid ""
 "No VoxelGI data set, so this node is disabled. Bake static objects to enable "
 "GI."
@@ -18239,6 +21094,13 @@ msgid ""
 "parent."
 msgstr "XRCamera3D nemusí fungovat, jestliže nemá za rodiče uzel XROrigin3D."
 
+msgid ""
+"XRCamera3D should have physics_interpolation_mode set to OFF in order to "
+"avoid jitter."
+msgstr ""
+"Aby se zabránilo chvění, měla by mít XRCamera3D nastavený parametr "
+"physics_interpolation_mode na vypnuto."
+
 msgid ""
 "XRNode3D may not function as expected without an XROrigin3D node as its "
 "parent."
@@ -18252,9 +21114,23 @@ msgstr "Není nastaven název sledovače."
 msgid "No pose is set."
 msgstr "Není nastavena žádná póza."
 
+msgid ""
+"XRNode3D should have physics_interpolation_mode set to OFF in order to avoid "
+"jitter."
+msgstr ""
+"Aby se zabránilo chvění, měl by mít XRNode3Dnastavený parametr "
+"physics_interpolation_mode na vypnuto."
+
 msgid "XROrigin3D requires an XRCamera3D child node."
 msgstr "XROrigin3D musí mít uzel XRCamera3D jako potomka."
 
+msgid ""
+"Changing the scale on the XROrigin3D node is not supported. Change the World "
+"Scale instead."
+msgstr ""
+"Změnu měřítka na uzlu XROrigin3D není podporována. Změňte místo toho měřítko "
+"světa."
+
 msgid ""
 "XR shaders are not enabled in project settings. Stereoscopic output is not "
 "supported unless they are enabled. Please enable `xr/shaders/enabled` to use "
@@ -18279,6 +21155,24 @@ msgstr "Nic není připojeno do vstupu '%s' uzlu '%s'."
 msgid "No root AnimationNode for the graph is set."
 msgstr "Není nastaven žádný kořen grafu AnimationNode."
 
+msgid ""
+"The AnimationTree is inactive.\n"
+"Activate it in the inspector to enable playback; check node warnings if "
+"activation fails."
+msgstr ""
+"AnimationTree je neaktivní.\n"
+"Aktivujte ho v inspektoru pro povolení přehrávání. Pokud se aktivace nezdaří, "
+"zkontrolujte varování uzlu."
+
+msgid ""
+"The AnimationTree node (or one of its parents) has its process mode set to "
+"Disabled.\n"
+"Change the process mode in the inspector to allow playback."
+msgstr ""
+"Uzel AnimationTree (nebo jeden z jeho nadřazených prvků) má režim procesu "
+"nastaven na Zakázáno.\n"
+"Změňte režim procesu v inspektoru pro povolení přehrávání."
+
 msgid ""
 "ButtonGroup is intended to be used only with buttons that have toggle_mode "
 "set to true."
@@ -18286,6 +21180,15 @@ msgstr ""
 "ButtonGroup je určena pro použití použe s tlačítky, jejichž toggle_mode je "
 "nastavený na true."
 
+msgid "The changes to this palette have not been saved to a file."
+msgstr "Změny v této paletě nebyly uloženy do souboru."
+
+msgid "Execute an expression as a color."
+msgstr "Provést výraz jako barvu."
+
+msgid "Load existing color palette."
+msgstr "Načíst existující paletu barev."
+
 msgid "Switch between hexadecimal and code values."
 msgstr "Přepnout mezi hexadecimálními a kódovými hodnotami."
 
@@ -18306,6 +21209,25 @@ msgstr ""
 "Chcete-li tento problém vyřešit, nastavte filtr myši na \"Stop\" nebo "
 "\"Pass\"."
 
+msgid "Accessibility Name must not be empty, or contain only spaces."
+msgstr "Přístupnost: Název nesmí být prázdný nebo obsahovat jen mezery."
+
+msgid "Accessibility Name must not include Node class name."
+msgstr "Přístupnost: Jméno nesmí obsahovat název třídy uzlu."
+
+msgid "Accessibility Name must not include control character."
+msgstr "Přístupnost: Jméno nesmí obsahovat znaky ovladače."
+
+msgid "%s grabbed. Select target and use %s to drop, use %s to cancel."
+msgstr "%s zachyceno. Vyberte cíl a použitím %s ho odložte, použitím %s zrušte."
+
+msgid "%s can be dropped here. Use %s to drop, use %s to cancel."
+msgstr ""
+"%s zde může být odložen. Použijte %s k odložení, použijte %s ke zrušení."
+
+msgid "%s can not be dropped here. Use %s to cancel."
+msgstr "%s zde může být odložen. Použijte %s ke zrušení."
+
 msgid ""
 "Labels with autowrapping enabled must have a custom minimum size configured "
 "to work correctly inside a container."
@@ -18319,6 +21241,13 @@ msgid ""
 msgstr ""
 "Současný font nepodporuje vykreslování jednoho nebo více znaků v tomto Labelu."
 
+msgid ""
+"MSDF font pixel range is too small, some outlines/shadows will not render. "
+"Set MSDF pixel range to be at least %d to render all outlines/shadows."
+msgstr ""
+"Rozsah pixelů písma MSDF je příliš malé, některé obrysy/stíny se nevykreslí. "
+"Nastavte rozsah pixelů MSDF na %d, aby se vykreslily všechny obrysy/stíny."
+
 msgid ""
 "The current theme style has shadows and/or rounded corners for popups, but "
 "those won't display correctly if \"display/window/per_pixel_transparency/"
@@ -18329,6 +21258,14 @@ msgstr ""
 "\"display/window/per_pixel_transparency/allowed\" nebo pokud toto nastavení "
 "není podporováno."
 
+msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater or equal to 0."
+msgstr ""
+"Pokud má \"Exponenciální upravování\" hodnotu true, pak \"Minimální hodnota\" "
+"musí být větší než 0."
+
+msgid "Image alternative text must not be empty."
+msgstr "Alternativní text obrázku nesmí být prázdný."
+
 msgid ""
 "ScrollContainer is intended to work with a single child control.\n"
 "Use a container as child (VBox, HBox, etc.), or a Control and set the custom "
@@ -18338,6 +21275,9 @@ msgstr ""
 "Použijte kontejner (VBox, HBox atd.) nebo uzel Control jako potomka a "
 "nastavte minimální velikost ručně."
 
+msgid "Drag to resize"
+msgstr "Táhnutím změňte velikost"
+
 msgid ""
 "This node doesn't have a SubViewport as child, so it can't display its "
 "intended content.\n"
@@ -18354,6 +21294,26 @@ msgstr ""
 "Výchozí tvar kurzoru myši SubViewportContainer nemá žádný vliv.\n"
 "Zvažte, zda jej neponechat na původní hodnotě `CURSOR_ARROW`."
 
+msgid "Cell %d x %d: either text or alternative text must not be empty."
+msgstr "Buňka %d x %d: buď text nebo alternativní text nesmí být prázdný."
+
+msgid "Button %d in %d x %d: alternative text must not be empty."
+msgstr "Tlačítko %d v %d x %d: alternativní text nesmí být prázdný."
+
+msgid ""
+"Ancestor \"%s\" clips its children, so this node will not be able to clip its "
+"children."
+msgstr ""
+"Předek \"%s\" ořezává svého potomka, takže tento uzel nebude moci ořezávat "
+"své potomky."
+
+msgid ""
+"Ancestor \"%s\" is a CanvasGroup, so this node will not be able to clip its "
+"children."
+msgstr ""
+"Předek \"%s\" je typu CanvasGroup, takže tento uzel nebude moci ořezávat své "
+"potomky."
+
 msgid ""
 "This node was an instance of scene '%s', which was no longer available when "
 "this scene was loaded."
@@ -18420,6 +21380,9 @@ msgstr ""
 "Pro velmi krátké doby čekání zvažte použití procesní smyčky skriptu namísto "
 "spoléhání se na Timer."
 
+msgid "Drag-and-drop data"
+msgstr "Přetáhnout data"
+
 msgid ""
 "The Viewport size must be greater than or equal to 2 pixels on both "
 "dimensions to render anything."
@@ -18513,6 +21476,13 @@ msgstr "Chyba dělení nulou."
 msgid "Modulo by zero error."
 msgstr "Chyba modulo nulou."
 
+msgid ""
+"Invalid number of arguments when calling stage function '%s', which expects "
+"%d argument(s)."
+msgstr ""
+"Neplatný počet argumentů při volání funkce fáze '%s', která očekává %d "
+"argumentů."
+
 msgid ""
 "Invalid argument type when calling stage function '%s', type expected is '%s'."
 msgstr ""
@@ -18549,6 +21519,15 @@ msgstr "Rekurze není povolená."
 msgid "Function '%s' can't be called from source code."
 msgstr "Funkci '%s' nelze volat ze zdrojového kódu."
 
+msgid "No matching function for \"%s\" call:"
+msgstr "Nebyla nalezena odpovídající funkce pro \"%s\" volání:"
+
+msgid ""
+"candidate function \"%s(%s)\" not viable, argument %d should be %s but is %s."
+msgstr ""
+"kandidátská funkce \"%s(%s)\" není funkční, argument %d by měl být %s, ale je "
+"%s."
+
 msgid ""
 "Too few arguments for \"%s(%s)\" call. Expected at least %d but received %d."
 msgstr ""
@@ -18676,6 +21655,24 @@ msgstr ""
 "Interpolovaná proměnná '%s' nemůže být předána pro parametr '%s' v tomto "
 "kontextu."
 
+msgid ""
+"Unable to pass a multiview texture sampler as a parameter to a custom "
+"function. Consider sampling it in the main function and then passing the "
+"vector result to the custom function."
+msgstr ""
+"Nelze předat více-pohledový vzorkovač textur jako parametr vlastní funkci. "
+"Zvažte vzorkování provést v hlavní funkci a pak jí předat výsledný vektor "
+"jako výsledek vlastní funkci."
+
+msgid ""
+"Unable to pass RADIANCE texture sampler as a parameter to a custom function. "
+"Consider sampling it in the main function and then passing the vector result "
+"to the custom function."
+msgstr ""
+"Nelze předat vzorkovač textury RADIANCE jako parametr vlastní funkci. Zvažte "
+"vzorkování provést v hlavní funkci a pak jí předat výsledný vektor vlastní "
+"funkci."
+
 msgid "Unknown identifier in expression: '%s'."
 msgstr "Neznámý identifikátor ve výrazu: '%s'."
 
@@ -18786,6 +21783,9 @@ msgstr "Default case musí být definován pouze jednou."
 msgid "'%s' must be placed within a '%s' block."
 msgstr "'%s' musí být umístěno v bloku '%s'."
 
+msgid "Undefined identifier '%s' in a case label."
+msgstr "Nedefinovaný identifikátor '%s' v popisku případu."
+
 msgid "Expected an unsigned integer constant."
 msgstr "Očekávána celočíselná konstanta bez znaménka."
 
@@ -18844,6 +21844,15 @@ msgstr "Neplatný typ shaderu. Platné typy jsou: %s"
 msgid "Unexpected token: '%s'."
 msgstr "Neočekávaný token: '%s'."
 
+msgid "Duplicated stencil mode reference value: '%s'."
+msgstr "Duplikovaná referenční hodnota režimu šablony: '%s'."
+
+msgid "Stencil mode reference value cannot be negative: '%s'."
+msgstr "Referenční hodnota režimu šablony nemůže být záporná: '%s'."
+
+msgid "Stencil mode reference value cannot be greater than 255: '%s'."
+msgstr "Referenční hodnota režimu šablony nemůže být větší než 255: '%s'."
+
 msgid "Expected a struct identifier."
 msgstr "Očekávaný identifikátor struktury."
 
@@ -18912,9 +21921,21 @@ msgstr "Určení zdrojové barvy je pouze pro typy '%s', '%s' nebo vzorkovače."
 msgid "Duplicated hint: '%s'."
 msgstr "Duplikovaná nápověda: '%s'."
 
+msgid "Source color conversion disabled hint is for '%s', '%s'."
+msgstr "Nápověda k zakázání převodu barev zdroje je pro '%s', '%s'."
+
+msgid "Hint '%s' should be preceded by '%s'."
+msgstr "Nápověda '%s' by měla být uvedena před '%s'."
+
 msgid "Range hint is for '%s' and '%s' only."
 msgstr "Nápověda rozsahu je pouze pro '%s' a '%s'."
 
+msgid "Expected a valid numeric expression."
+msgstr "Očekáván validní číselný výraz."
+
+msgid "Expected a valid numeric expression after ','."
+msgstr "Očekáván validní číselný výraz po ','."
+
 msgid "Enum hint is for '%s' only."
 msgstr "Nápověda výčtu je pouze pro '%s'."
 
@@ -19075,17 +22096,32 @@ msgstr ""
 msgid "uniform buffer"
 msgstr "vyrovnávací paměť pro uniformní proměnné"
 
+msgid "Expected an identifier for stencil mode."
+msgstr "Očekávaný identifikátor pro režim vykreslování."
+
 msgid "Expected an identifier for render mode."
 msgstr "Očekávaný identifikátor pro režim vykreslování."
 
+msgid "Duplicated stencil mode: '%s'."
+msgstr "Duplikovaný režim vykreslování: '%s'."
+
 msgid "Duplicated render mode: '%s'."
 msgstr "Duplikovaný režim vykreslování: '%s'."
 
+msgid ""
+"Redefinition of stencil mode: '%s'. The '%s' mode has already been set to "
+"'%s'."
+msgstr ""
+"Předefinování režimu vykreslování: '%s'. Režim '%s' již byl nastaven na '%s'."
+
 msgid ""
 "Redefinition of render mode: '%s'. The '%s' mode has already been set to '%s'."
 msgstr ""
 "Předefinování režimu vykreslování: '%s'. Režim '%s' již byl nastaven na '%s'."
 
+msgid "Invalid stencil mode: '%s'."
+msgstr "Neplatný režim vykreslování: '%s'."
+
 msgid "Invalid render mode: '%s'."
 msgstr "Neplatný režim renderování: '%s'."
 
diff --git a/engine/editor/translations/editor/eo.po b/engine/editor/translations/editor/eo.po
index 047d053d..ccdc46bc 100644
--- a/engine/editor/translations/editor/eo.po
+++ b/engine/editor/translations/editor/eo.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2026-01-18 16:02+0000\n"
+"PO-Revision-Date: 2026-02-02 01:02+0000\n"
 "Last-Translator: Julián Lacomba <julian_alberto93@yahoo.com.ar>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/godot-engine/"
 "godot/eo/>\n"
@@ -37,11 +37,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "Bone"
 
+msgid "Unavailable"
+msgstr "Ne disponebla"
+
 msgid "Help"
 msgstr "Helpo"
 
@@ -311,7 +314,7 @@ msgid "Backspace all to Left"
 msgstr "Forigi ĉion maldekstran"
 
 msgid "Delete"
-msgstr "Forigi dekstren"
+msgstr "Forigi"
 
 msgid "Delete Word"
 msgstr "Forigi vorton dekstran"
@@ -893,7 +896,7 @@ msgid "Rename..."
 msgstr "Alinomi..."
 
 msgid "Edit Transitions..."
-msgstr "Redakti transpasojn..."
+msgstr "Redakti la transirojn..."
 
 msgid "Remove"
 msgstr "Forigi"
@@ -962,10 +965,16 @@ msgid "Move Node"
 msgstr "Movi nodon"
 
 msgid "Transition exists!"
-msgstr "Transpaso ekzistas!"
+msgstr "La transiro ekzistas!"
+
+msgid "Add Node and Transition"
+msgstr "Aldoni nodon aŭ transiron"
+
+msgid "Transition already exists!"
+msgstr "La transiro jam ekzistas!"
 
 msgid "Add Transition"
-msgstr "Aldoni transpason"
+msgstr "Aldoni transiron"
 
 msgid "Immediate"
 msgstr "Tuja"
@@ -986,7 +995,7 @@ msgid "Node Removed"
 msgstr "Nodon forigis"
 
 msgid "Transition Removed"
-msgstr "Transpason forigis"
+msgstr "La transiro foriĝis"
 
 msgid "Create new nodes."
 msgstr "Krei novajn nodojn."
@@ -995,7 +1004,10 @@ msgid "Connect nodes."
 msgstr "Konekti nodojn."
 
 msgid "Remove selected node or transition."
-msgstr "Forigi elektitan nodon aŭ transpason."
+msgstr "Forigi elektitan nodon aŭ transiron."
+
+msgid "Transition:"
+msgstr "Transiro:"
 
 msgid "Play Mode:"
 msgstr "Reĝimo de ludado:"
@@ -1207,7 +1219,7 @@ msgid "Bezier"
 msgstr "Bézier"
 
 msgid "Audio"
-msgstr "Aŭdio"
+msgstr "Sonbusoj"
 
 msgid "Clipboard is empty!"
 msgstr "La tondujo estas malplena!"
@@ -1463,7 +1475,7 @@ msgid "Select Tracks to Copy"
 msgstr "Elekti trakojn por kopii"
 
 msgid "Select All/None"
-msgstr "Elekti Ĉiujn/Neniujn"
+msgstr "Elekti ĉion/nenion"
 
 msgid "Copy Selection"
 msgstr "Kopii elektaron"
@@ -1478,7 +1490,7 @@ msgid "Change Audio Track Clip End Offset"
 msgstr "Ŝanĝi finan deŝovon de aŭdio-traka eltondaĵo"
 
 msgid "Path:"
-msgstr "Vojo:"
+msgstr "Indiko:"
 
 msgid "License"
 msgstr "Permesilo"
@@ -1616,13 +1628,16 @@ msgid "Loading..."
 msgstr "Ŝargas..."
 
 msgid "All"
-msgstr "Tuta"
+msgstr "Ĉio"
 
 msgid "Install"
 msgstr "Instali"
 
+msgid "Search Templates, Projects, and Demos"
+msgstr "Serĉi ŝablonojn, projektojn aŭ demonstrojn"
+
 msgid "Import..."
-msgstr "Enporti..."
+msgstr "Importi..."
 
 msgid "Plugins..."
 msgstr "Kromprogramoj..."
@@ -1642,11 +1657,14 @@ msgstr "Helpo"
 msgid "Assets ZIP File"
 msgstr "ZIP-dosiero de havaĵoj"
 
+msgid "AssetLib"
+msgstr "Havaĵejo"
+
 msgid "Error opening asset file for \"%s\" (not in ZIP format)."
-msgstr "Eraro dum malfermi pakaĵan dosieron por \"%s\" (ne estas de ZIP-formo)."
+msgstr "Eraro dum la malfermo de la havaĵo «%s» (ĝi ne estas en la ZIP-formo)."
 
 msgid "%s (already exists)"
-msgstr "%s (jam ekzistante)"
+msgstr "%s (jam ekzistas)"
 
 msgid "Uncompressing Assets"
 msgstr "Malkompaktigas havaĵojn"
@@ -1655,7 +1673,7 @@ msgid "The following files failed extraction from asset \"%s\":"
 msgstr "La jenajn dosierojn malsukcesis malkompaktigi el la pakaĵo \"%s\":"
 
 msgid "(and %s more files)"
-msgstr "(kaj %s pli dosieroj)"
+msgstr "(kaj %s pliaj dosieroj)"
 
 msgid "Success!"
 msgstr "Sukceso!"
@@ -1862,6 +1880,12 @@ msgstr "Sencimigi"
 msgid "Save Branch as Scene..."
 msgstr "Konservi la nod(ar)on kiel scenon..."
 
+msgid "Copy Node Path"
+msgstr "Kopii la nodo-vojon"
+
+msgid "Expand/Collapse Branch"
+msgstr "(Mal)kaŝi idojn"
+
 msgid "Toggle Visibility"
 msgstr "Baskuli videblon"
 
@@ -2036,6 +2060,9 @@ msgstr "Fasonaj atributoj"
 msgid "Constants"
 msgstr "Konstantoj"
 
+msgid "Icons"
+msgstr "Piktogramoj"
+
 msgid "This theme property may be changed or removed in future versions."
 msgstr "Ni povus ŝanĝi aŭ forigi ĉi tiun atributon en estonta versio."
 
@@ -2071,6 +2098,9 @@ msgstr ""
 msgid "Editor"
 msgstr "Redaktilo"
 
+msgid "Scripts"
+msgstr "Kodoj"
+
 msgid "Open"
 msgstr "Malfermi"
 
@@ -2116,6 +2146,9 @@ msgstr "Dosierindiko"
 msgid "Directory"
 msgstr "Dosierujo"
 
+msgid "Invalid UID"
+msgstr "Nevalida UID (ununura identigilo)"
+
 msgid "Invalid path"
 msgstr "Nevalida dosierindiko"
 
@@ -2138,7 +2171,7 @@ msgid "Hide"
 msgstr "Kaŝi"
 
 msgid "No match"
-msgstr "Neniu akordo"
+msgstr "Neniu kongruo"
 
 msgid "%d match"
 msgid_plural "%d matches"
@@ -2151,7 +2184,7 @@ msgstr[0] "%d el %d kongruo"
 msgstr[1] "%d el %d kongruoj"
 
 msgid "Search Help"
-msgstr "Serĉi helpon"
+msgstr "Priserĉi helpon"
 
 msgid "Case Sensitive"
 msgstr "Uskleciva"
@@ -2160,7 +2193,7 @@ msgid "Show Hierarchy"
 msgstr "Montri hierarĥion"
 
 msgid "Display All"
-msgstr "Vidigi tutan"
+msgstr "Montri ĉion"
 
 msgid "Classes Only"
 msgstr "Nur klasoj"
@@ -2180,11 +2213,20 @@ msgstr "Nur atributoj"
 msgid "Theme Properties Only"
 msgstr "Nur fasonaj atributoj"
 
+msgid "Search Results"
+msgstr "Serĉorezultoj"
+
 msgid "Member Type"
 msgstr "Tipo de membro"
 
+msgid "Make this dock floating."
+msgstr "Ŝvebigi ĉi tiun panelon."
+
 msgid "Dock Position"
-msgstr "Pozicio de doko"
+msgstr "Pozicio de la panelo"
+
+msgid "Make Floating"
+msgstr "Ŝvebigi ĝin"
 
 msgid "Favorites:"
 msgstr "Ĉemanujo:"
@@ -2212,16 +2254,19 @@ msgid "Cannot move/rename resources root."
 msgstr "Ne eblas movi/alinomi rimedan radikon."
 
 msgid "Error moving:"
-msgstr "Eraro dum movado de:"
+msgstr "Eraro dum la movo de:"
 
 msgid "Error duplicating:"
-msgstr "Eraro dum duplikati:"
+msgstr "Eraro dum duobligo:"
+
+msgid "Error duplicating directory:"
+msgstr "Eraro dum duobligo de dosierujo:"
 
 msgid "No name provided."
-msgstr "Ne nomon provizis."
+msgstr "La nomo estas malplena."
 
 msgid "Name contains invalid characters."
-msgstr "Nomo enhavas malvalidajn signojn."
+msgstr "La nomo enhavas nevalidajn signojn."
 
 msgid "A file or folder with this name already exists."
 msgstr "Dosiero aŭ dosierujo kun ĉi tiu nomo jam ekzistas."
@@ -2233,14 +2278,30 @@ msgstr ""
 "La jenaj dosieroj aŭ dosierujoj konfliktas kun elementoj en la cela loko '%s':"
 
 msgid "Duplicating file:"
-msgstr "Duplikatas dosieron:"
+msgstr "Duobligo de dosiero:"
 
 msgid "Duplicating folder:"
-msgstr "Duplikatas dosierujon:"
+msgstr "Duobligo de dosierujo:"
 
 msgid "Create Folder"
 msgstr "Krei dosierujon"
 
+msgid "Could not create folder: %s"
+msgstr "Ne eblis krei la dosierujon: %s"
+
+msgid "Copy %d selected item to \"%s\"?"
+msgid_plural "Copy %d selected items to \"%s\"?"
+msgstr[0] "Ĉu kopii %d elektitan dosieron ĉi tien: «%s»?"
+msgstr[1] "Ĉu kopii %d elektitajn dosierojn ĉi tien: «%s»?"
+
+msgid "Move %d selected item to \"%s\"?"
+msgid_plural "Move %d selected items to \"%s\"?"
+msgstr[0] "Ĉu movi %d elektitan dosieron al «%s»?"
+msgstr[1] "Ĉu movi %d elektitajn dosierojn al «%s»?"
+
+msgid "Open Scene"
+msgstr "Malfermi la scenon"
+
 msgid "New Inherited Scene"
 msgstr "Nova heredita sceno"
 
@@ -2358,9 +2419,21 @@ msgstr "Ordigi laŭ kreodato"
 msgid "FileSystem"
 msgstr "Dosiersistemo"
 
+msgid "Open FileSystem Dock"
+msgstr "Malfermi la dosiersisteman panelon"
+
 msgid "Copy Path"
 msgstr "Kopii dosierindikon"
 
+msgid "Copy Absolute Path"
+msgstr "Kopii absolutan dosierindikon"
+
+msgid "Copy UID"
+msgstr "Kopii UID (ununuran identigilon)"
+
+msgid "Open in External Program"
+msgstr "Malfermi en eksteran programon"
+
 msgid "Red"
 msgstr "Ruĝa"
 
@@ -2486,7 +2559,7 @@ msgid "Filter Groups"
 msgstr "Filtri la grupojn"
 
 msgid "Select one or more nodes to edit their groups."
-msgstr "Elektu nodon por redakti ĝiajn signalojn aŭ grupojn."
+msgstr "Elektu nodon por redakti ĝiajn grupojn."
 
 msgid "The Beginning"
 msgstr "La komenco"
@@ -2527,6 +2600,9 @@ msgstr "Subrisurcojn unikigi"
 msgid "Inspector"
 msgstr "Inspektilo"
 
+msgid "Open Inspector Dock"
+msgstr "Malfermi la inspektilan panelon"
+
 msgid "Create a new resource in memory and edit it."
 msgstr "Krei novan rimedon en la memoro kaj redakti ĝin."
 
@@ -2551,6 +2627,9 @@ msgstr "Malfermi la dokumentaron pri ĉi tiu objekto."
 msgid "Open Documentation"
 msgstr "Malfermi dokumentaron"
 
+msgid "Filter Properties"
+msgstr "Filtri atributojn"
+
 msgid "Information"
 msgstr "Informoj"
 
@@ -2570,6 +2649,12 @@ msgstr[1] "Kreo de aŭdaĵ-ludiloj (AudioStreamPlayer)"
 msgid "Duplicate Node(s)"
 msgstr "Duobligo de nodo(j)"
 
+msgid "Node must belong to the edited scene to become root."
+msgstr "Nodo povas esti la radiko nur de sia respektiva sceno."
+
+msgid "Instantiated scenes can't become root"
+msgstr "Generitaj scenoj ne povas esti la radiko, sed heredigitaj scenoj"
+
 msgid "Delete %d nodes and any children?"
 msgstr "Ĉu forigi %d nodojn kaj iliajn idojn?"
 
@@ -2588,6 +2673,18 @@ msgstr "Ĉu forigi la nodon «%s»?"
 msgid "Save New Scene As..."
 msgstr "Konservi novan scenon kiel..."
 
+msgid "Make Local"
+msgstr "Fari ĝin loka (Nuligi kiel scenon)"
+
+msgid "Enable Scene Unique Name(s)"
+msgstr "Ŝalti ĉi-scenajn ununurajn nomojn"
+
+msgid "Unique names already used by another node in the scene:"
+msgstr "La jenaj ununuraj nomoj jam estis agorditaj en aliaj nodoj:"
+
+msgid "Disable Scene Unique Name(s)"
+msgstr "Malŝalti ĉi-scenajn ununurajn nomojn"
+
 msgid "New Scene Root"
 msgstr "Nova radiko de sceno"
 
@@ -2639,15 +2736,24 @@ msgstr "<nekonate>"
 msgid "Sub-Resources"
 msgstr "Subrimedoj"
 
+msgid "Access as Unique Name"
+msgstr "Atingo per ununura nomo"
+
 msgid "Clear Inheritance"
 msgstr "Nuligi la heredon"
 
 msgid "Open in Editor"
 msgstr "Malfermi en la redaktilon"
 
+msgid "Editable Children"
+msgstr "Redakteblaj idoj"
+
 msgid "Paste Node(s) as Root"
 msgstr "Alglui la nodo(j)n kiel radikon"
 
+msgid "None"
+msgstr "Nenio"
+
 msgid "Add Child Node..."
 msgstr "Aldoni idan nodon..."
 
@@ -2678,12 +2784,18 @@ msgstr "Aldoni novan patran nodon..."
 msgid "Make Scene Root"
 msgstr "Fari ĝin la scena radiko"
 
+msgid "Toggle Access as Unique Name"
+msgstr "Baskuli la atingon per ununura nomo"
+
 msgid "Delete (No Confirm)"
 msgstr "Forigi (ne konfirmo)"
 
 msgid "Add/Create a New Node."
 msgstr "Aldoni/Krei novan nodon."
 
+msgid "Filter Nodes"
+msgstr "Filtri nodojn"
+
 msgid "Attach a new or existing script to the selected node."
 msgstr "Alfiksi novan aŭ ekzistantan skripton al la elektinta nodo."
 
@@ -2897,12 +3009,25 @@ msgstr "Konservi kaj reŝargi"
 msgid "Save before reloading the scene?"
 msgstr "Ĉu konservi antaŭ ol reŝargi la scenon?"
 
+msgid "Save modified resources before reloading?"
+msgstr "Ĉu konservi modifitajn rimedojn antaŭ ol reŝargi ilin?"
+
 msgid "Save & Quit"
 msgstr "Konservi kaj foriri"
 
+msgid "Save modified resources before closing?"
+msgstr "Ĉu konservi modifitajn rimedojn antaŭ ol fermi ilin?"
+
+msgid "Save changes to the following scene(s) before reloading?"
+msgstr "Ĉu konservi la ŝanĝojn en la jena(j) sceno(j) antaŭ ol reŝargi?"
+
+msgid "Save changes to the following scene(s) before quitting?"
+msgstr "Ĉu konservi la ŝanĝojn en la jena(j) sceno(j) antaŭ ol eliri?"
+
 msgid "Save changes to the following scene(s) before opening Project Manager?"
 msgstr ""
-"Konservi ŝanĝojn al la jena(j) sceno(j) antaŭ malfermi projektan mastrumilon?"
+"Ĉu konservi la ŝanĝojn en la jena(j) sceno(j) antaŭ ol malfermi la projekt-"
+"administrilon?"
 
 msgid "Pick a Main Scene"
 msgstr "Elektu komencan scenon"
@@ -2940,10 +3065,34 @@ msgstr ""
 "Por ŝanĝi ĝin, povas krei novan hereditan scenon."
 
 msgid "Scene '%s' has broken dependencies:"
-msgstr "Sceno '%s' havas rompitajn dependojn:"
+msgstr "La sceno «%s» havas difektitajn dependaĵojn:"
+
+msgid "No Recent Scenes"
+msgstr "Neniu lastatempa sceno"
 
 msgid "Clear Recent Scenes"
-msgstr "Vakigi lastajn scenojn"
+msgstr "Forpreni lastatempajn scenojn"
+
+msgid "Loading editor"
+msgstr "Ŝargado de la redaktilo"
+
+msgid "Loading editor layout..."
+msgstr "Ŝargado de la redaktila aranĝo..."
+
+msgid "Loading docks..."
+msgstr "Ŝargado de la paneloj..."
+
+msgid "Reopening scenes..."
+msgstr "Remalfermo de scenoj..."
+
+msgid "Loading central editor layout..."
+msgstr "Ŝargado de la aranĝo de la centra redaktilo..."
+
+msgid "Loading plugin window layout..."
+msgstr "Ŝargado de la aranĝo de la kromprograma fenestro..."
+
+msgid "Editor layout ready."
+msgstr "La redaktila aranĝo estas preta."
 
 msgid "Save Layout"
 msgstr "Konservi aranĝon"
@@ -3101,6 +3250,9 @@ msgstr "Reŝargi konservitan scenon"
 msgid "Close Scene"
 msgstr "Fermi la scenon"
 
+msgid "Close All Scenes"
+msgstr "Fermi ĉiujn scenojn"
+
 msgid "Editor Settings..."
 msgstr "Agordoj de la redaktilo..."
 
@@ -3114,7 +3266,7 @@ msgid "Export"
 msgstr "Eksporti"
 
 msgid "Orphan Resource Explorer..."
-msgstr "Eksplorilo de orfaj risurcoj..."
+msgstr "Esplori neuzatajn rimedojn..."
 
 msgid "Reload Current Project"
 msgstr "Reŝargi nunan projekton"
@@ -3149,9 +3301,18 @@ msgstr "Pri Godot..."
 msgid "Support Godot Development"
 msgstr "Subteni Godot ellaboradon"
 
+msgid "Open 2D Workspace"
+msgstr "Malfermi la 2D-an scen-redaktilon"
+
+msgid "Open 3D Workspace"
+msgstr "Malfermi la 3D-an scen-redaktilon"
+
 msgid "Open Script Editor"
 msgstr "Malfermi la kod-redaktilon"
 
+msgid "Open Game View"
+msgstr "Malfermi la ludvidejon"
+
 msgid "Open Asset Library"
 msgstr "Malfermi la havaĵejon"
 
@@ -3286,6 +3447,9 @@ msgstr "Mastrumi eksportaj ŝablonoj"
 msgid "Dependencies For:"
 msgstr "Dependaĵoj de:"
 
+msgid "Resource \"%s\" is in use. Changes will only take effect when reloaded."
+msgstr "La rimedo «%s» estas uzata. La ŝanĝoj efektiviĝos post reŝargo."
+
 msgid "Dependencies"
 msgstr "Dependaĵoj"
 
@@ -3298,6 +3462,12 @@ msgstr "Ripari difektitajn"
 msgid "Dependency Editor"
 msgstr "Dependaĵo-redaktilo"
 
+msgid "No owners found for: %s"
+msgstr "Ŝajnas, ke «%s» estas dependaĵo nenie."
+
+msgid "Owners List"
+msgstr "Listo de dependeco"
+
 msgid ""
 "Remove the selected files from the project? (Cannot be undone.)\n"
 "Depending on your filesystem configuration, the files will either be moved to "
@@ -3490,11 +3660,23 @@ msgid "Move"
 msgstr "Movi"
 
 msgid "No sub-resources found."
-msgstr "Ne sub-risurcojn trovis."
+msgstr "Neniu trovita subrimedo."
+
+msgid "Open a list of sub-resources."
+msgstr "Malfermi liston de subrimedoj."
+
+msgid "Search files..."
+msgstr "Serĉi dosierojn..."
 
 msgid "Remove Item"
 msgstr "Forigi elementon"
 
+msgid "Make this panel floating in the screen %d."
+msgstr "Ŝvebigi ĉi tiun panelon en la ekranon %d."
+
+msgid "Make this panel floating."
+msgstr "Ŝvebigi ĉi tiun panelon."
+
 msgid "Importing Scene..."
 msgstr "Enportas scenon..."
 
@@ -3546,6 +3728,9 @@ msgstr "Ŝaltite"
 msgid "Resize Array"
 msgstr "Regrandigi Vicon"
 
+msgid "Add Metadata"
+msgstr "Aldoni metadatenon"
+
 msgid "Edit Text:"
 msgstr "Redakti tekston:"
 
@@ -3656,24 +3841,109 @@ msgid "Language:"
 msgstr "Lingvo:"
 
 msgid "Script Name:"
-msgstr "Nomo de skripto:"
+msgstr "Nomo de la kodo:"
 
 msgid "It would be a good idea to name your project."
 msgstr "Nomi vian projekton estus konsilinde."
 
+msgid "Invalid \".zip\" project file; it is not in ZIP format."
+msgstr "Nevalida ZIP-dosiero: ĝi ne enhavas la ZIP-formon."
+
 msgid ""
 "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file."
 msgstr ""
-"Nevalida projekta \".zip\" dosiero; ĝi ne enhavas dosieron \"project.godot\"."
+"Nevalida ZIP-dosiero por projekto: ĝi ne enhavas la dosieron «project.godot»."
 
 msgid "Valid project found at path."
 msgstr "Valida projekto ĉe tiu indiko."
 
+msgid ""
+"Please choose a \"project.godot\", a directory with one, or a \".zip\" file."
+msgstr "Elektu dosierujon aŭ ZIP-dosieron kun la dosiero «project.godot»."
+
+msgid ""
+"The directory name specified contains invalid characters or trailing "
+"whitespace."
+msgstr "La nombazo enhavas signo(j)n nevalida(j)n aŭ spaceton ĉe ekstremo."
+
+msgid ""
+"You cannot save a project at the selected path. Please create a subfolder or "
+"choose a new path."
+msgstr ""
+"Vi ne povas konservi projekton en tiun dosierindikon. Kreu dosierujon en ĝi "
+"aŭ elektu alian dosierindikon."
+
+msgid "The parent directory of the path specified doesn't exist."
+msgstr "La vojprefikso ne ekzistas."
+
+msgid "The project folder already exists and is empty."
+msgstr "Tiu dosierujo jam ekzistas, sed estas malplena."
+
+msgid "The project folder will be automatically created."
+msgstr "La dosierujo por la projekto aŭtomate kreiĝos."
+
 msgid "The path specified doesn't exist."
 msgstr "La provizinta dosierindiko ne ekzistas."
 
+msgid "The project folder exists and is empty."
+msgstr "Tiu dosierujo ekzistas, sed estas malplena."
+
+msgid ""
+"The selected path is not empty. Choosing an empty folder is highly "
+"recommended."
+msgstr ""
+"Tiu dosierujo ne estas malplena. Malplena dosierujo estas tro rekomendata."
+
+msgid "Cannot duplicate a project into itself."
+msgstr "Projekto ne povas duobliĝi en si mem."
+
 msgid "New Game Project"
-msgstr "Nova luda projekto"
+msgstr "Nova ludprojekto"
+
+msgid "Supports desktop platforms only."
+msgstr "Ludoj nur por komputiloj."
+
+msgid "Advanced 3D graphics available."
+msgstr "Progresinta 3D-a grafikaĵaro."
+
+msgid "Can scale to large complex scenes."
+msgstr "Sufiĉe potenca por grandaj malsimplaj scenoj."
+
+msgid "Uses RenderingDevice backend."
+msgstr "Uzo de la subtavolo RenderingDevice."
+
+msgid "Slower rendering of simple scenes."
+msgstr "Pli malrapida bildigo de simplaj scenoj."
+
+msgid "Supports desktop + mobile platforms."
+msgstr "Ludoj por komputiloj kaj poŝtelefonoj."
+
+msgid "Less advanced 3D graphics."
+msgstr "Meznivela 3D-a grafikaĵaro."
+
+msgid "Less scalable for complex scenes."
+msgstr "Malpli potenca por malsimplaj scenoj."
+
+msgid "Fast rendering of simple scenes."
+msgstr "Rapida bildigo de simplaj scenoj."
+
+msgid "Supports desktop, mobile + web platforms."
+msgstr "Ludoj por komputiloj, poŝtelefonoj kaj foliumiloj."
+
+msgid "Least advanced 3D graphics."
+msgstr "Baza 3D-a grafikaĵaro."
+
+msgid "Intended for low-end/older devices."
+msgstr "Celata al malaltnivelaj aŭ malnovaj aparatoj."
+
+msgid "Uses OpenGL 3 backend (OpenGL 3.3/ES 3.0/WebGL2)."
+msgstr "Uzo de la subtavolo OpenGL 3 (OpenGL 3.3/ES 3.0/WebGL2)."
+
+msgid "Fastest rendering of simple scenes."
+msgstr "Plej rapida bildigo de simplaj scenoj."
+
+msgid "Warning: This folder is not empty"
+msgstr "Averto: Ĉi tiu dosierujo ne estas malplena"
 
 msgid "Couldn't create project.godot in project path."
 msgstr "Ne eblas krei project.godot en projekta dosierindiko."
@@ -3697,17 +3967,31 @@ msgid "Install Project:"
 msgstr "Instali projekton:"
 
 msgid "Project Name:"
-msgstr "Projekta nomo:"
+msgstr "Nomo de la projekto:"
 
 msgid "Project Path:"
 msgstr "Dosierindiko de la projekto:"
 
 msgid "Project Installation Path:"
-msgstr "Dosierindiko de projekta instalo:"
+msgstr "Dosierindiko de la importota la projekto:"
 
 msgid "Renderer:"
 msgstr "Bildigilo:"
 
+msgid "More information"
+msgstr "Pliaj informoj"
+
+msgid "The renderer can be changed later, but scenes may need to be adjusted."
+msgstr ""
+"Vi povos elekti alian bildigilon iam ajn, sed iuj scenoj povus bezoni manan "
+"alĝustigon."
+
+msgid "Version Control Metadata:"
+msgstr "Versitenaj metadatenoj:"
+
+msgid "Git"
+msgstr "Git"
+
 msgid "Edit Now"
 msgstr "Redakti ĝin nun"
 
@@ -3728,7 +4012,7 @@ msgid "Error: Project is missing on the filesystem."
 msgstr "Eraro: La projekto mankas en la dosiersistemo."
 
 msgid "Toggle Favorite"
-msgstr "Baskuli favorata"
+msgstr "(Mal)montri ĉe la supro"
 
 msgid "Open in file manager"
 msgstr "Malfermi en la dosieradministrilon"
@@ -3739,6 +4023,9 @@ msgstr "Dato de la lasta redakto"
 msgid "Unknown version"
 msgstr "Nekonata versio"
 
+msgid "Scanning for projects..."
+msgstr "Esploro de projektoj..."
+
 msgid "Missing Project"
 msgstr "Netrovita projekto"
 
@@ -3751,6 +4038,10 @@ msgstr "Nova fenestro"
 msgid "Missing Date"
 msgstr "Sen dato"
 
+msgctxt "Application"
+msgid "Project Manager"
+msgstr "Projekt-administrilo"
+
 msgid "You don't have any projects yet."
 msgstr "Estas neniu projekto ĉi tie."
 
@@ -3765,6 +4056,15 @@ msgstr ""
 msgid "Are you sure to run %d projects at once?"
 msgstr "Ĉu vi vere volas ruli %d projektojn samtempe?"
 
+msgid ""
+"Warning: This project was last edited in Godot %s. Opening will change it to "
+"Godot %s.\n"
+"\n"
+msgstr ""
+"Averto: Oni redaktis ĉi tiun projekton je la lasta fojo per Godot %s. "
+"Malfermi ĝin adaptos ĝin por Godot %s.\n"
+"\n"
+
 msgid "Open anyway? Project will be modified."
 msgstr "Ĉu egale malfermi ĝin? La projekto ŝanĝiĝos."
 
@@ -3814,6 +4114,9 @@ msgstr "Importi projekton"
 msgid "Scan"
 msgstr "Esplori"
 
+msgid "Scan Projects"
+msgstr "Esplori viajn projektojn"
+
 msgid "Loading, please wait..."
 msgstr "Ŝargas, bonvolu atendi..."
 
@@ -3832,6 +4135,9 @@ msgstr "Forigi la projekton"
 msgid "Remove Missing"
 msgstr "Forpreni netrovitajn"
 
+msgid "Donate"
+msgstr "Donaci monon"
+
 msgid "Asset Library"
 msgstr "Havaĵejo"
 
@@ -3841,15 +4147,51 @@ msgstr "Elektu esplorotan dosierujon"
 msgid "Remove All"
 msgstr "Forpreni ĉiujn"
 
+msgid "Backup project first"
+msgstr "Unue savkopii la projekton"
+
+msgid "Convert Full Project"
+msgstr "Konverti la tutan projekton"
+
+msgid "See Migration Guide"
+msgstr "Gvidilo pri datenmigrado"
+
+msgid "Error"
+msgstr "Eraro"
+
+msgid "Manage Project Tags"
+msgstr "Administri la etidekojn de la projekto"
+
+msgid "Project Tags"
+msgstr "Etidekoj de la projekto"
+
+msgid "Click tag to remove it from the project."
+msgstr "Alklaku etikedon se vi volas forpreni ĝin de la projekto."
+
 msgid "All Tags"
 msgstr "Ĉiuj etikedoj"
 
+msgid "Click tag to add it to the project."
+msgstr "Alklaku etikedon se vi volas aldoni ĝin al la projekto."
+
 msgid "Create New Tag"
 msgstr "Krei etikedon"
 
 msgid "Tags are capitalized automatically when displayed."
 msgstr "Etikedoj aŭtomate vidiĝos kun komenca ĉeflitero."
 
+msgid "New Tag Name"
+msgstr "Nova etikedo"
+
+msgid "example_tag (will display as Example Tag)"
+msgstr "ekzempla_etideko (montriĝote kiel: Ekzempla Etideko)"
+
+msgid "Create Tag"
+msgstr "Krei etidekon"
+
+msgid "Project Tag: %s"
+msgstr "Etikedo de la projekto: %s"
+
 msgid "Restart Now"
 msgstr "Relanĉi nun"
 
@@ -3859,18 +4201,30 @@ msgstr "Bazaj agordoj"
 msgid "Language"
 msgstr "Lingvo"
 
+msgid "Style"
+msgstr "Stilo"
+
+msgid "Color Preset"
+msgstr "Koloraro"
+
 msgid "Custom preset can be further configured in the editor."
 msgstr "Vi povos agordi la koloraron en la redaktilo."
 
 msgid "Display Scale"
 msgstr "Dimensioj de la fenestroj"
 
+msgid "Network Mode"
+msgstr "Sinkronigado kun la retejo de Godot"
+
 msgid "Check for Updates"
 msgstr "Serĉi ĝisdatigojn"
 
 msgid "Directory Naming Convention"
 msgstr "Sintakso por dosierujaj nomoj"
 
+msgid "Edit All Settings"
+msgstr "Vidi ĉiujn agordojn"
+
 msgid "Network Profiler"
 msgstr "Reta Profililo"
 
@@ -3883,6 +4237,12 @@ msgstr ""
 "Bonvolu aldoni ruleblan antaŭagordon per la Eksporto menuo aŭ defini "
 "ekzistantan antaŭagordon kiel rulebla."
 
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Ŝvebigi la ludvidejon antaŭ la sekva ludado"
+
+msgid "Game"
+msgstr "Ludo"
+
 msgid "Create Polygon"
 msgstr "Krei plurlateron"
 
@@ -4043,6 +4403,9 @@ msgstr ""
 "Duonferma okulo: Gizmo estas ankaŭ videbla tra maldiafanaj surfacoj (\"iks-"
 "rada\")."
 
+msgid "%s+Drag: Rotate selected node around pivot."
+msgstr "%s + Treni: Turni la elektitan nodon ĉirkaŭ ĝian pivoton."
+
 msgid "Move Mode"
 msgstr "Movada reĝimo"
 
@@ -4175,6 +4538,12 @@ msgstr "Movi %d CanvasItem-ojn"
 msgid "Move CanvasItem \"%s\" to (%d, %d)"
 msgstr "Movi CanvasItem \"%s\" al (%d, %d)"
 
+msgid "%s+Alt+Drag: Scale selected node."
+msgstr "%s + Alt + Treni: Skali la elektitan nodon."
+
+msgid "V: Set selected node's pivot position."
+msgstr "V: Agordi la pivoton de la elektita nodo."
+
 msgid "Paste Pose"
 msgstr "Alglui pozon"
 
@@ -4377,7 +4746,7 @@ msgid "Disconnect all from signal: '%s'"
 msgstr "Malkonekti ĉiuj de signalo: '%s'"
 
 msgid "Connect..."
-msgstr "Konekti..."
+msgstr "Ligi..."
 
 msgid "Disconnect"
 msgstr "Malkonekti"
@@ -4388,18 +4757,27 @@ msgstr "Konektu la signalo al metodo"
 msgid "Are you sure you want to remove all connections from the \"%s\" signal?"
 msgstr "Ĉu vi certe volas forigi ĉiajn konektojn el la \"%s\" signalo?"
 
+msgid "Filter Signals"
+msgstr "Filtri la signalojn"
+
 msgid "Are you sure you want to remove all connections from this signal?"
 msgstr "Ĉu vi certe volas forigi ĉiajn konektojn el la ĉi tiu signalo?"
 
 msgid "Disconnect All"
 msgstr "Malkonektigi ĉiun"
 
+msgid "Copy Name"
+msgstr "Kopii la nomon"
+
 msgid "Edit..."
 msgstr "Redakti..."
 
 msgid "Go to Method"
 msgstr "Iri al metodo"
 
+msgid "Select a single node or resource to edit its signals."
+msgstr "Elektu nodon por redakti ĝiajn signalojn."
+
 msgid "Load Curve Preset"
 msgstr "Ŝargi antaŭagordon de kurbo"
 
@@ -4428,7 +4806,7 @@ msgid "Close Tab"
 msgstr "Fermi langeton"
 
 msgid "Undo Close Tab"
-msgstr "Malfari ferminton de la langeto"
+msgstr "Malfari fermon de la langeto"
 
 msgid "Close Other Tabs"
 msgstr "Fermi aliajn langetojn"
@@ -4493,6 +4871,9 @@ msgstr "Plene rektangula"
 msgid "Updating the editor"
 msgstr "Eliras la editilo"
 
+msgid "Deselect All"
+msgstr "Malelekti ĉion"
+
 msgid "Theme"
 msgstr "Fasono"
 
@@ -4514,18 +4895,37 @@ msgstr "Uzi regulesprimojn"
 msgid "Substitute"
 msgstr "Anstatŭigi"
 
+msgid "Create New Scene"
+msgstr "Krei novan scenon"
+
 msgid "Toggle Visible"
 msgstr "Baskuli videblon"
 
 msgid "Unlock Node"
 msgstr "Malŝlosi nodon"
 
+msgid "Revoke unique name for node \"%s\"?"
+msgstr "Ĉu malŝalti la ununuran nomon de «%s»?"
+
+msgid "Disable Scene Unique Name"
+msgstr "Malŝalti ĉi-scenan ununuran nomon"
+
 msgid "(Connecting From)"
 msgstr "(Konektas el)"
 
 msgid "Node configuration warning:"
 msgstr "Averto pri uzo de la nodo:"
 
+msgid ""
+"This node can be accessed from anywhere within the scene it belongs to by "
+"using the '%s' prefix in the node path."
+msgstr ""
+"Ĉi tiu nodo estas atingebla ie ajn en ĉi tiu sceno se oni prefiksas ĝian "
+"nomon per «%s»."
+
+msgid "Click to disable this."
+msgstr "Alklaku por malŝalti tion."
+
 msgid "Node has one connection."
 msgid_plural "Node has {num} connections."
 msgstr[0] "La nodo havas signalon."
@@ -4575,6 +4975,9 @@ msgstr "Scenoarbo (nodoj):"
 msgid "Node Configuration Warning!"
 msgstr "Averto pri uzo de la nodo!"
 
+msgid "Revoke"
+msgstr "Malŝalti"
+
 msgid "Don't Ask Again"
 msgstr "Neniam redemandi"
 
@@ -4880,6 +5283,9 @@ msgstr "Kapitaligi"
 msgid "Standard"
 msgstr "Norma"
 
+msgid "Script"
+msgstr "Kodo"
+
 msgid "Connections to method:"
 msgstr "Konektoj al metodo:"
 
@@ -5019,22 +5425,25 @@ msgid "Please Confirm:"
 msgstr "Bonvolu konfirmi:"
 
 msgid "Export Profile"
-msgstr "Eksporti profilo(j)n"
+msgstr "Eksporti la profilon"
 
 msgid "3D Editor"
 msgstr "3D redaktilo"
 
 msgid "Scene Tree Editing"
-msgstr "Redaktado de scenoarbo"
+msgstr "Redakto de la arbo el nodoj"
 
 msgid "FileSystem Dock"
-msgstr "Doko de dosiersistemo"
+msgstr "Panelo de la dosiersistemo"
 
 msgid "Import Dock"
-msgstr "Doko de enporto"
+msgstr "Panelo de importoj"
 
 msgid "History Dock"
-msgstr "Doko de historio"
+msgstr "Panelo de la ŝanĝohistorio"
+
+msgid "Game View"
+msgstr "Ludvidejo"
 
 msgid "Allows to view and edit 3D scenes."
 msgstr "Permesas vidi kaj redakti 3D-scenojn."
@@ -5210,6 +5619,9 @@ msgstr "Rekonservi"
 msgid "Add Node"
 msgstr "Aldoni nodon"
 
+msgid "[None]"
+msgstr "[Nenio]"
+
 msgid "Show All Locales"
 msgstr "Vidigi ĉiajn lokaĵarojn"
 
@@ -5237,6 +5649,18 @@ msgstr "Dosiero:"
 msgid "Modified"
 msgstr "Modifita"
 
+msgid "Edit Transitions"
+msgstr "Redakti la transirojn..."
+
+msgid "Use Transition:"
+msgstr "Uzi transiron:"
+
+msgid "Transition From:"
+msgstr "Transiro el:"
+
+msgid "Transition To:"
+msgstr "Transiro al:"
+
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Ne sufiĉas bitokoj por malĉifri bitokojn, aŭ nevalida formo."
 
diff --git a/engine/editor/translations/editor/es.po b/engine/editor/translations/editor/es.po
index 0d3c2746..dc0ef634 100644
--- a/engine/editor/translations/editor/es.po
+++ b/engine/editor/translations/editor/es.po
@@ -162,8 +162,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-15 02:11+0000\n"
-"Last-Translator: Javier <xavier.ocampos@gmail.com>\n"
+"PO-Revision-Date: 2026-01-28 01:30+0000\n"
+"Last-Translator: Julián Lacomba <julian_alberto93@yahoo.com.ar>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/es/>\n"
 "Language: es\n"
@@ -171,7 +171,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "Aceptar"
@@ -8789,7 +8789,7 @@ msgid "Error: Project is missing on the filesystem."
 msgstr "Error: Proyecto faltante en el sistema de archivos."
 
 msgid "Toggle Favorite"
-msgstr "Act./Desact. Favorito"
+msgstr "Alternar favorito"
 
 msgid "Open in file manager"
 msgstr "Abrir en el gestor de archivos"
@@ -9202,7 +9202,7 @@ msgid "Edit in Recovery Mode"
 msgstr "Editar en Modo de Recuperación"
 
 msgid "Backup project first"
-msgstr "Haz una copia de seguridad del proyecto primero"
+msgstr "Hacer primero una copia de seguridad del proyecto"
 
 msgid "Convert Full Project"
 msgstr "Convertir Proyecto Completo"
@@ -9260,7 +9260,7 @@ msgid "New Tag Name"
 msgstr "Nuevo Nombre de Etiqueta"
 
 msgid "example_tag (will display as Example Tag)"
-msgstr "example_tag (se mostrará como Etiqueta de Ejemplo)"
+msgstr "etiqueta_de_ejemplo (se mostrará como Etiqueta De Ejemplo)"
 
 msgid "Create Tag"
 msgstr "Crear Etiqueta"
diff --git a/engine/editor/translations/editor/fa.po b/engine/editor/translations/editor/fa.po
index e9899158..61815042 100644
--- a/engine/editor/translations/editor/fa.po
+++ b/engine/editor/translations/editor/fa.po
@@ -61,13 +61,14 @@
 # "Mahdi B. Jahani" <kelbowonl@gmail.com>, 2025.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # Mazdak Parnian <mazdak.parniandg@gmail.com>, 2025.
+# Sajjad Zavar <zavarsajjad98@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-12-10 16:35+0000\n"
-"Last-Translator: John Smith <pkafsharix@gmail.com>\n"
+"PO-Revision-Date: 2026-02-12 03:10+0000\n"
+"Last-Translator: Sajjad Zavar <zavarsajjad98@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/fa/>\n"
 "Language: fa\n"
@@ -75,17 +76,158 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.15-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "باشه"
 
+msgid "Failed"
+msgstr "ناموفق"
+
+msgid "Unavailable"
+msgstr "در دسترس نیست"
+
+msgid "Unconfigured"
+msgstr "پیکربندی‌نشده"
+
+msgid "Unauthorized"
+msgstr "غیرمجاز"
+
+msgid "Parameter out of range"
+msgstr "پارامتر خارج از محدوده"
+
+msgid "Out of memory"
+msgstr "کمبود حافظه"
+
+msgid "File not found"
+msgstr "فایل پیدا نشد"
+
+msgid "File: Bad drive"
+msgstr "فایل: درایو نامعتبر"
+
+msgid "File: Bad path"
+msgstr "فایل: مسیر نامعتبر"
+
+msgid "File: Permission denied"
+msgstr "فایل: دسترسی رد شد"
+
+msgid "File already in use"
+msgstr "فایل در حال استفاده است"
+
+msgid "Can't open file"
+msgstr "نمی‌توان فایل را باز کرد"
+
+msgid "Can't write file"
+msgstr "نمی‌توان در فایل نوشت"
+
+msgid "Can't read file"
+msgstr "نمی‌توان فایل را خواند"
+
+msgid "File unrecognized"
+msgstr "فایل ناشناخته است"
+
+msgid "File corrupt"
+msgstr "فایل خراب است"
+
+msgid "Missing dependencies for file"
+msgstr "وابستگی‌های لازم برای فایل وجود ندارد"
+
+msgid "End of file"
+msgstr "پایان فایل"
+
+msgid "Can't open"
+msgstr "نمی‌توان باز کرد"
+
+msgid "Can't create"
+msgstr "نمی‌توان ایجاد کرد"
+
+msgid "Query failed"
+msgstr "کوئری ناموفق"
+
+msgid "Already in use"
+msgstr "در حال استفاده است"
+
 msgid "Locked"
-msgstr "قفلیده"
+msgstr "قفل شده"
+
+msgid "Timeout"
+msgstr "مهلت تمام شد"
+
+msgid "Can't connect"
+msgstr "نمی‌توان اتصال برقرار کرد"
+
+msgid "Can't resolve"
+msgstr "نمی‌توان حل کرد"
+
+msgid "Connection error"
+msgstr "خطای اتصال"
+
+msgid "Can't acquire resource"
+msgstr "نمی‌توان منبع را به‌دست آورد"
+
+msgid "Can't fork"
+msgstr "نمی‌توان فرآیند جدید ایجاد کرد"
+
+msgid "Invalid data"
+msgstr "داده نامعتبر است"
+
+msgid "Invalid parameter"
+msgstr "پارامتر نامعتبر است"
+
+msgid "Already exists"
+msgstr "از قبل وجود دارد"
+
+msgid "Does not exist"
+msgstr "وجود ندارد"
+
+msgid "Can't read database"
+msgstr "نمی‌توان پایگاه‌داده را خواند"
+
+msgid "Can't write database"
+msgstr "نمی‌توان در پایگاه‌داده نوشت"
+
+msgid "Compilation failed"
+msgstr "کامپایل ناموفق بود"
+
+msgid "Method not found"
+msgstr "متد پیدا نشد"
+
+msgid "Link failed"
+msgstr "لینک ناموفق بود"
+
+msgid "Script failed"
+msgstr "اجرای اسکریپت ناموفق بود"
+
+msgid "Cyclic link detected"
+msgstr "پیوند چرخه‌ای شناسایی شد"
+
+msgid "Invalid declaration"
+msgstr "اعلان نامعتبر است"
+
+msgid "Duplicate symbol"
+msgstr "نماد تکراری"
+
+msgid "Parse error"
+msgstr "خطای تجزیه"
+
+msgid "Busy"
+msgstr "مشغول است"
+
+msgid "Skip"
+msgstr "رد شد"
 
 msgid "Help"
 msgstr "راهنما"
 
+msgid "Bug"
+msgstr "باگ"
+
+msgid "Printer on fire"
+msgstr "چاپگر آتش گرفته است"
+
+msgid "unset"
+msgstr "تنظیم نشده"
+
 msgid "Physical"
 msgstr "فیزیکی"
 
@@ -96,19 +238,19 @@ msgid "Right Mouse Button"
 msgstr "دکمهٔ راست موس"
 
 msgid "Middle Mouse Button"
-msgstr "دکمهٔ میانی موس"
+msgstr "دکمهٔ وسط موس"
 
 msgid "Mouse Wheel Up"
-msgstr "بالا غلتاندن موس"
+msgstr "چرخ ماوس به بالا"
 
 msgid "Mouse Wheel Down"
-msgstr "پایین غلتاندن موس"
+msgstr "چرخ ماوس به پایین"
 
 msgid "Mouse Wheel Left"
-msgstr "چپ غلتاندن موس"
+msgstr "چرخ ماوس به چپ"
 
 msgid "Mouse Wheel Right"
-msgstr "راست غلتاندن موس"
+msgstr "چرخ ماوس به راست"
 
 msgid "Mouse Thumb Button 1"
 msgstr "دکمه شست موس ۱"
@@ -120,112 +262,112 @@ msgid "Button"
 msgstr "دکمه"
 
 msgid "Double Click"
-msgstr "جفت کلیک"
+msgstr "دوبار کلیک"
 
 msgid "Mouse motion at position (%s) with velocity (%s)"
-msgstr "جنبش موس در نهشت (%s) با شتاب (%s)"
+msgstr "حرکت ماوس در موقعیت (%s) با سرعت (%s)"
 
 msgid "Left Stick X-Axis, Joystick 0 X-Axis"
-msgstr "محور X استیک چپ، محور X اهرمک ۰"
+msgstr "محور X استیک چپ، محور X جوی‌استیک ۰"
 
 msgid "Left Stick Y-Axis, Joystick 0 Y-Axis"
-msgstr "محور Y استیک چپ، محور Y اهرمک ۰"
+msgstr "محور Y استیک چپ، محور Y جوی‌استیک ۰"
 
 msgid "Right Stick X-Axis, Joystick 1 X-Axis"
-msgstr "محور X استیک راست، محور X اهرمک ۱"
+msgstr "محور X استیک راست، محور X جوی‌استیک ۱"
 
 msgid "Right Stick Y-Axis, Joystick 1 Y-Axis"
-msgstr "محور Y استیک چپ، محور Y اهرمک ۱"
+msgstr "محور Y استیک راست، محور Y جوی‌استیک ۱"
 
 msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
-msgstr "محور X اهرمک ۲، تریگر چپ، L2 سونی، LT اکس‌باکس"
+msgstr "محور X جوی‌استیک ۲، تریگر چپ، سونی L2، ایکس‌باکس LT"
 
 msgid "Joystick 2 Y-Axis, Right Trigger, Sony R2, Xbox RT"
-msgstr "محور Y اهرمک ۲، تریگر چپ، R2 سونی، RT اکس‌باکس"
+msgstr "محور Y جوی‌استیک ۲، تریگر راست، سونی R2، ایکس‌باکس RT"
 
 msgid "Joystick 3 X-Axis"
-msgstr "محور X اهرمک ۳"
+msgstr "محور X جوی‌استیک ۳"
 
 msgid "Joystick 3 Y-Axis"
-msgstr "محور Y اهرمک ۳"
+msgstr "محور X جوی‌استیک ۳"
 
 msgid "Joystick 4 X-Axis"
-msgstr "محور X اهرمک ۴"
+msgstr "محور X جوی‌استیک ۴"
 
 msgid "Joystick 4 Y-Axis"
-msgstr "محور Y اهرمک ۴"
+msgstr "محور Y جوی‌استیک ۴"
 
 msgid "Unknown Joypad Axis"
-msgstr "محور ناشناخته دسته بازی"
+msgstr "محور ناشناختهٔ جوی‌استیک"
 
 msgid "Joypad Motion on Axis %d (%s) with Value %.2f"
-msgstr "جنبش دستهٔ بازی روی محور %d (%s) با ارزش %.2f"
+msgstr "حرکت جوی‌استیک روی محور %d (%s) با مقدار %.2f"
 
 msgid "Bottom Action, Sony Cross, Xbox A, Nintendo B"
-msgstr "کنش پایین، کراس سونی، اکس‌باکس A, نینتندو B"
+msgstr "دکمهٔ پایینی، سونی Cross، ایکس‌باکس A، نینتندو B"
 
 msgid "Right Action, Sony Circle, Xbox B, Nintendo A"
-msgstr "کنش راست، دایره سونی، اکس‌باکس B, نینتندو A"
+msgstr "دکمهٔ راست، سونی Circle، ایکس‌باکس B، نینتندو A"
 
 msgid "Left Action, Sony Square, Xbox X, Nintendo Y"
-msgstr "کنش چپ، مربع سونی، اکس‌باکس X, نینتندو Y"
+msgstr "دکمهٔ چپ، سونی Square، ایکس‌باکس X، نینتندو Y"
 
 msgid "Top Action, Sony Triangle, Xbox Y, Nintendo X"
-msgstr "کنش بالا،مثلث سونی، اکس‌باکس Y، نینتندو X"
+msgstr "دکمهٔ بالا، سونی Triangle، ایکس‌باکس Y، نینتندو X"
 
 msgid "Back, Sony Select, Xbox Back, Nintendo -"
-msgstr "بازگشت، Select سونی، Back اکس‌باکس، - نینتندو"
+msgstr "دکمهٔ Back، سونی Select، ایکس‌باکس Back، نینتندو -"
 
 msgid "Guide, Sony PS, Xbox Home"
-msgstr "راهنما، PS سونی، Home اکس‌باکس"
+msgstr "دکمهٔ Guide، سونی PS، ایکس‌باکس Home"
 
 msgid "Start, Xbox Menu, Nintendo +"
-msgstr "آغاز، گزینگان اکس‌باکس، نینتندو +"
+msgstr "دکمهٔ Start، ایکس‌باکس Menu، نینتندو +"
 
 msgid "Left Stick, Sony L3, Xbox L/LS"
-msgstr "استیک چپ، سونی L3، اکس‌باکس L/LS"
+msgstr "استیک چپ، سونی L3، ایکس‌باکس L/LS"
 
 msgid "Right Stick, Sony R3, Xbox R/RS"
-msgstr "استیک راست، سونی R3، اکس‌باکس R/RS"
+msgstr "استیک راست، سونی R3، ایکس‌باکس R/RS"
 
 msgid "Left Shoulder, Sony L1, Xbox LB"
-msgstr "شانه چپ، سونی L1، اکس‌باکس LB"
+msgstr "شانهٔ چپ، سونی L1، ایکس‌باکس LB"
 
 msgid "Right Shoulder, Sony R1, Xbox RB"
-msgstr "شانه راست، سونی R1، اکس‌باکس RB"
+msgstr "شانهٔ راست، سونی R1، ایکس‌باکس RB"
 
 msgid "D-pad Up"
-msgstr "دی-پد بالا"
+msgstr "جهت‌بالا (D‑pad Up)"
 
 msgid "D-pad Down"
-msgstr "دی-پد پایین"
+msgstr "جهت‌پایین (D‑pad Down)"
 
 msgid "D-pad Left"
-msgstr "دی-پد چپ"
+msgstr "جهت‌چپ (D‑pad Left)"
 
 msgid "D-pad Right"
-msgstr "دی-پد راست"
+msgstr "جهت‌راست (D‑pad Right)"
 
 msgid "Xbox Share, PS5 Microphone, Nintendo Capture"
-msgstr "اکس‌باکس Share, میکروفون پی‌اس۵، نینتندو کپچر"
+msgstr "ایکس‌باکس Share، پلی‌استیشن Microphone، نینتندو Capture"
 
 msgid "Xbox Paddle 1"
-msgstr "اکس‌باکس پدل 1"
+msgstr "پدل ۱ ایکس‌باکس (Xbox Paddle 1)"
 
 msgid "Xbox Paddle 2"
-msgstr "اکس‌باکس پدل 2"
+msgstr "پدل ۲ ایکس‌باکس (Xbox Paddle 2)"
 
 msgid "Xbox Paddle 3"
-msgstr "اکس‌باکس پدل 3"
+msgstr "پدل ۳ ایکس‌باکس (Xbox Paddle 3)"
 
 msgid "Xbox Paddle 4"
-msgstr "اکس‌باکس پدل 4"
+msgstr "پدل ۴ ایکس‌باکس (Xbox Paddle 4)"
 
 msgid "PS4/5 Touchpad"
-msgstr "تاچ‌پدPS4/5"
+msgstr "تاچ‌پد پلی‌استیشن (PS4/PS5 Touchpad)"
 
 msgid "Joypad Button %d"
-msgstr "دکمهٔ %d دستهٔ بازی"
+msgstr "دکمهٔ شمارهٔ %d جوی‌پد"
 
 msgid "Pressure:"
 msgstr "فشار:"
@@ -240,29 +382,29 @@ msgid "released"
 msgstr "منتشر شد"
 
 msgid "Screen %s at (%s) with %s touch points"
-msgstr "نقاط لمس صفحه %s در (%s) با %s"
+msgstr "صفحهٔ %s در مختصات (%s) با %s نقطهٔ لمس"
 
 msgid ""
 "Screen dragged with %s touch points at position (%s) with velocity of (%s)"
-msgstr "صفحه با نقاط لمسی %s در موقعیت (%s) با شتاب (%s) کشیده شد"
+msgstr "صفحه با %s نقطهٔ لمس در موقعیت (%s) کشیده شد و دارای سرعت (%s) بود"
 
 msgid "Magnify Gesture at (%s) with factor %s"
-msgstr "بزرگنمایی ژست در (%s) با فاکتور %s"
+msgstr "ژست بزرگ‌نمایی در مختصات (%s) با ضریب %s"
 
 msgid "Pan Gesture at (%s) with delta (%s)"
-msgstr "ژست قلم در (%s) با دلتای (%s)"
+msgstr "ژست پن در مختصات (%s) با دلتا (%s)"
 
 msgid "MIDI Input on Channel=%s Message=%s"
-msgstr "ورودی MIDI در کانال=%s پیام=%s"
+msgstr "ورودی MIDI در کانال = %s با پیام = %s"
 
 msgid "Input Event with Shortcut=%s"
-msgstr "رویداد درونداد با میانبر=%s"
+msgstr "رویداد ورودی با میان‌بُر = %s"
 
 msgid " or "
 msgstr " یا "
 
 msgid "Action has no bound inputs"
-msgstr "عمل هیچ ورودی محدودی ندارد"
+msgstr "اکشن هیچ ورودیِ متصل‌شده‌ای ندارد"
 
 msgid "Accept"
 msgstr "پذیرش"
@@ -273,11 +415,14 @@ msgstr "انتخاب"
 msgid "Cancel"
 msgstr "لغو"
 
+msgid "Close Dialog"
+msgstr "بستن دیالوگ"
+
 msgid "Focus Next"
-msgstr "تمرکز بعدی"
+msgstr "رفتن به مورد بعدی"
 
 msgid "Focus Prev"
-msgstr "تمرکز قبلی"
+msgstr "رفتن به مورد قبلی"
 
 msgid "Left"
 msgstr "چپ"
@@ -292,28 +437,28 @@ msgid "Down"
 msgstr "پایین"
 
 msgid "Page Up"
-msgstr "Page Up"
+msgstr "صفحه‌بالا (Page Up)"
 
 msgid "Page Down"
-msgstr "Page Down"
+msgstr "صفحه‌پایین (Page Down)"
 
 msgid "Home"
-msgstr "خانه"
+msgstr "خانه (Home)"
 
 msgid "End"
-msgstr "پایان"
+msgstr "پایان (End)"
 
 msgid "Cut"
-msgstr "برش"
+msgstr "بُرش (Cut)"
 
 msgid "Copy"
-msgstr "روگرفت"
+msgstr "کپی (Copy)"
 
 msgid "Paste"
-msgstr "چسباندن"
+msgstr "چسباندن (Paste)"
 
 msgid "Toggle Tab Focus Mode"
-msgstr "روشن/خاموش کردن حالت تمرکز زبانه"
+msgstr "تغییر حالت فوکوس تب"
 
 msgid "Undo"
 msgstr "بازگردانی"
@@ -1201,12 +1346,27 @@ msgstr "زمان درآمیزی:"
 msgid "Next (Auto Queue):"
 msgstr "بعدی (صف خودکار):"
 
+msgid "Reconnect Transition"
+msgstr "اتصال دوبارهٔ گذار"
+
 msgid "Move Node"
 msgstr "حرکت دادن گره"
 
 msgid "Transition exists!"
 msgstr "گذار وجود دارد!"
 
+msgid "Cannot transition to self!"
+msgstr "نمی‌توان به خودِ همان حالت گذار کرد!"
+
+msgid "Cannot transition to \"Start\"!"
+msgstr "نمی‌توان به \"Start\" گذار کرد!"
+
+msgid "Cannot transition from \"End\"!"
+msgstr "نمی‌توان از \"End\" گذار کرد!"
+
+msgid "Transition from \"%s\" to \"%s\" already exists!"
+msgstr "گذار از \"%s\" به \"%s\" از قبل وجود دارد!"
+
 msgid "Play/Travel to %s"
 msgstr "پخش/سفر به %s"
 
@@ -1216,6 +1376,9 @@ msgstr "ویرایش %s"
 msgid "Add Node and Transition"
 msgstr "افزودن گره و گذار"
 
+msgid "Transition already exists!"
+msgstr "گذار وجود دارد!"
+
 msgid "Add Transition"
 msgstr "افزودن گذار"
 
@@ -1252,7 +1415,7 @@ msgstr ""
 "بی‌گره را برگزینید گره‌ای نو می‌سازد."
 
 msgid "Select and move nodes."
-msgstr "انتخاب و جابجایی گره‌ها"
+msgstr "انتخاب و جابجایی گره‌ها."
 
 msgid "Create new nodes."
 msgstr "ساخت گره‌های جدید."
@@ -6176,6 +6339,13 @@ msgstr "توکن‌های دودویی (بارگیری تندتر)"
 msgid "Compressed binary tokens (smaller files)"
 msgstr "توکن‌های دودویی فشرده (پرونده‌های کوچکتر)"
 
+msgid ""
+"No presets found.\n"
+"Create one so that its parameters can be edited here."
+msgstr ""
+"هیچ پریستی پیدا نشد.\n"
+"یکی بسازید تا بتوان پارامترهایش را اینجا ویرایش کرد."
+
 msgid "Export PCK/ZIP..."
 msgstr "برون‌برد PCK/ZIP..."
 
@@ -6220,9 +6390,24 @@ msgstr "مدیریت قالب‌های برون‌برد"
 msgid "Baking shaders"
 msgstr "در حال پخت سایه‌زن‌ها"
 
+msgid "Search Replacement For: %s"
+msgstr "جستجوی جایگزین برای: %s"
+
 msgid "Dependencies For:"
 msgstr "بستگی‌ها برای:"
 
+msgid ""
+"Scene \"%s\" is currently being edited. Changes will only take effect when "
+"reloaded."
+msgstr ""
+"صحنهٔ \"%s\" در حال حاضر در حال ویرایش است. تغییرات فقط پس از بارگذاری دوباره "
+"اعمال می‌شوند."
+
+msgid "Resource \"%s\" is in use. Changes will only take effect when reloaded."
+msgstr ""
+"منبع \"%s\" در حال استفاده است. تغییرات فقط پس از بارگذاری دوباره اعمال "
+"می‌شوند."
+
 msgid "Dependencies"
 msgstr "وابستگی‌ها"
 
@@ -6238,11 +6423,17 @@ msgstr "ویراستار وابستگی"
 msgid "Owners of: %s (Total: %d)"
 msgstr "صاحبان: %s (کل: %d)"
 
+msgid "No owners found for: %s"
+msgstr "هیچ مالکی برای %s پیدا نشد"
+
+msgid "Owners List"
+msgstr "فهرست مالکان"
+
 msgid "Localization remap"
-msgstr "بازنهادن بومی‌سازی"
+msgstr "بازنگاشت بومی‌سازی"
 
 msgid "Localization remap for path '%s' and locale '%s'."
-msgstr "بازنهادن بومی‌سازی برای مسیر '%s' و بوم '%s'."
+msgstr "بازنگاشت بومی‌سازی برای مسیر '%s' و بوم '%s'."
 
 msgid ""
 "Remove the selected files from the project? (Cannot be undone.)\n"
@@ -6275,6 +6466,12 @@ msgstr "پرونده‌ها برای زدوده شدن:"
 msgid "Dependencies of files to be deleted:"
 msgstr "وابستگی‌های پرونده‌ها برای زدوده شدن:"
 
+msgid "Error loading: %s"
+msgstr "خطا در بارگذاری: %s"
+
+msgid "Referenced by %s"
+msgstr "ارجاع‌شده توسط %s"
+
 msgid "Fix Dependencies"
 msgstr "بستگی‌ها را تعمیر کن"
 
@@ -18392,6 +18589,9 @@ msgstr "نبود شرط."
 msgid "Condition evaluation error."
 msgstr "خطای ارزیابی شرط."
 
+msgid "Invalid '%s' directive."
+msgstr "دستورِ '%s' نامعتبر است."
+
 msgid "Shader include file does not exist:"
 msgstr "فایل سایه‌زن موجود نیست:"
 
@@ -18426,6 +18626,9 @@ msgstr "تعداد آرگومان کوچک نامعتبر."
 msgid "Can't find matching branch directive."
 msgstr "دستور شاخه‌ی تطبیق یافت نشد."
 
+msgid "Invalid symbols placed before directive."
+msgstr "نمادهای نامعتبر پیش از دستور قرار گرفته‌اند."
+
 msgid "Unmatched conditional statement."
 msgstr "بیانیه شرطی تطابق ندارد."
 
diff --git a/engine/editor/translations/editor/fi.po b/engine/editor/translations/editor/fi.po
index 63fa13ee..51dea78d 100644
--- a/engine/editor/translations/editor/fi.po
+++ b/engine/editor/translations/editor/fi.po
@@ -32,13 +32,14 @@
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # Leo Peltola <leopeltola@gmail.com>, 2025.
 # sevonj <100710152+sevonj@users.noreply.github.com>, 2025.
+# Aki Ryhänen <aki.ryhanen@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-12-23 01:00+0000\n"
-"Last-Translator: Viljami Lokasaari <v.lokasaari13@gmail.com>\n"
+"PO-Revision-Date: 2026-02-01 00:01+0000\n"
+"Last-Translator: Aki Ryhänen <aki.ryhanen@gmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/fi/>\n"
 "Language: fi\n"
@@ -46,14 +47,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
 
+msgid "File unrecognized"
+msgstr "Tunnistamaton tiedosto"
+
 msgid "Locked"
 msgstr "Lukittu"
 
+msgid "Timeout"
+msgstr "Aikakatkaisu"
+
 msgid "Help"
 msgstr "Ohje"
 
diff --git a/engine/editor/translations/editor/fr.po b/engine/editor/translations/editor/fr.po
index 25677d74..5cc95f16 100644
--- a/engine/editor/translations/editor/fr.po
+++ b/engine/editor/translations/editor/fr.po
@@ -209,13 +209,16 @@
 # MERCRED <augustinseroul@gmail.com>, 2026.
 # Posemartonis <weblate.drainage895@passmail.net>, 2026.
 # Axel Rousseau <axel584@gmail.com>, 2026.
+# Matthieu Rua <mattrua@hotmail.com>, 2026.
+# honoré pellissier <ultrapodkin2@gmail.com>, 2026.
+# LUCASTUCIOUS <peterlucas2804@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-18 16:02+0000\n"
-"Last-Translator: Posemartonis <weblate.drainage895@passmail.net>\n"
+"PO-Revision-Date: 2026-01-29 00:10+0000\n"
+"Last-Translator: LUCASTUCIOUS <peterlucas2804@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/godot/"
 "fr/>\n"
 "Language: fr\n"
@@ -223,7 +226,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
@@ -2980,6 +2983,9 @@ msgstr "Rentrer"
 msgid "Step Over"
 msgstr "Sortir"
 
+msgid "Step Out"
+msgstr "Sortir"
+
 msgid "Break"
 msgstr "Mettre en pause"
 
@@ -5036,6 +5042,9 @@ msgstr "Créer un nouveau %s"
 msgid "Output"
 msgstr "Sortie"
 
+msgid "Toggle Output Dock"
+msgstr "Basculer le dock de Sortie"
+
 msgid "Filter Messages"
 msgstr "Filtrer les messages"
 
@@ -5371,6 +5380,9 @@ msgstr ""
 msgid "Save Scene As..."
 msgstr "Enregistrer la scène sous…"
 
+msgid "Save new main scene..."
+msgstr "Enregistrer la nouvelle scène principale sous…"
+
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Impossible d’annuler lorsque les boutons de la souris sont pressés."
 
@@ -5955,6 +5967,22 @@ msgstr "Ouvrir l’éditeur précédent"
 msgid "Project"
 msgstr "Projet"
 
+msgid ""
+"Choose a renderer.\n"
+"\n"
+"Notes:\n"
+"- On mobile platforms, the Mobile renderer is used if Forward+ is selected "
+"here.\n"
+"- On the web platform, the Compatibility renderer is always used."
+msgstr ""
+"Choisissez une méthode de rendu.\n"
+"\n"
+"Remarques :\n"
+"- Sur les plateformes mobiles, la méthode de rendu « Mobile » est utilisée si "
+"« Forward+ » est sélectionné.\n"
+"- Sur plateforme web, la méthode de rendu « Compatibilité » est toujours "
+"utilisée."
+
 msgid "Renderer"
 msgstr "Moteur de rendu"
 
@@ -6671,6 +6699,12 @@ msgstr ""
 "Tous les préréglages doivent avoir un chemin d’exportation défini pour "
 "pouvoir tous les exporter."
 
+msgid "Hide encryption key"
+msgstr "Cacher les clés de chiffrement"
+
+msgid "Show encryption key"
+msgstr "Montrer les clés de chiffrement"
+
 msgid "Delete preset '%s'?"
 msgstr "Supprimer le préréglage « %s » ?"
 
@@ -9907,6 +9941,12 @@ msgstr "Pixels de bordure"
 msgid "Mask Mode"
 msgstr "Mode masque"
 
+msgid "Generate"
+msgstr "Générer"
+
+msgid "Texture"
+msgstr "Texture"
+
 msgid "Centered"
 msgstr "Centré"
 
@@ -10087,6 +10127,9 @@ msgstr "Peindre les poids de l'os"
 msgid "Polygon"
 msgstr "Polygone"
 
+msgid "Toggle Polygon Dock"
+msgstr "Activer/Désactiver le panneau inférieur du polygone"
+
 msgid "Points"
 msgstr "Points"
 
@@ -11438,6 +11481,12 @@ msgstr "N’a pas pu créer une forme de collision simplifiée."
 msgid "Couldn't create any collision shapes."
 msgstr "Impossible de créer des formes de collision."
 
+msgid "Couldn't create a capsule shape."
+msgstr "Impossible de créer une forme de capsule."
+
+msgid "Couldn't create a cylinder shape."
+msgstr "Impossible de créer une forme de cylindre."
+
 msgid "Couldn't create a sphere shape."
 msgstr "Impossible de créer une forme de sphère."
 
diff --git a/engine/editor/translations/editor/hu.po b/engine/editor/translations/editor/hu.po
index b871a570..a042ef8b 100644
--- a/engine/editor/translations/editor/hu.po
+++ b/engine/editor/translations/editor/hu.po
@@ -51,7 +51,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-23 09:49+0000\n"
+"PO-Revision-Date: 2026-02-13 12:54+0000\n"
 "Last-Translator: Tallyrald <tally.github@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/hu/>\n"
@@ -3493,7 +3493,7 @@ msgid ""
 "or plugin data were saved anyway."
 msgstr ""
 "A jelenlegi jelenetnek nincs gyökér node-ja, de %d módosított külső erőforrás "
-"és/vagy beépülő modul adatai így is mentésre kerültek."
+"és/vagy bővítmény adatai így is mentésre kerültek."
 
 msgid "Save Scene As..."
 msgstr "Scene Mentése Másként..."
@@ -3542,12 +3542,12 @@ msgstr "Mesh könyvtár exportálás"
 
 msgid "Unable to enable addon plugin at: '%s' parsing of config failed."
 msgstr ""
-"Nem sikerült az addon plugin engedélyezése itt: '%s' a konfiguráció elemzése "
-"megbukott."
+"Nem sikerült az addon bővítmény engedélyezése itt: '%s' a konfiguráció "
+"elemzése megbukott."
 
 msgid "Unable to find script field for addon plugin at: '%s'."
 msgstr ""
-"Nem található szkript mező az addon pluginnak a következő helyen: 'res://"
+"Nem található szkript mező az addon bővítményhez a következő helyen: 'res://"
 "addons/%s'."
 
 msgid "Unable to load addon script from path: '%s'."
@@ -3761,7 +3761,7 @@ msgid "Quick Open Script..."
 msgstr "Szkript Gyors Megnyitás..."
 
 msgid "MeshLibrary..."
-msgstr "MeshLibrary-ra..."
+msgstr "MeshLibrary..."
 
 msgid "Reload Saved Scene"
 msgstr "Mentett jelenet újratöltése"
@@ -4116,7 +4116,7 @@ msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB."
 msgstr "32-bites exportokon a beágyazott PCK nem lehet nagyobb mint 4 GiB."
 
 msgid "Plugin \"%s\" is not supported on \"%s\""
-msgstr "A(z) \"%s\" beépülő modul nem támogatott ezen: \"%s\""
+msgstr "A(z) \"%s\" bővítmény nem támogatott ezen: \"%s\""
 
 msgid "Open the folder containing these templates."
 msgstr "A sablonokat tartalmazó mappa megnyitása."
@@ -4469,7 +4469,7 @@ msgstr "Tulajdonosai ennek: %s (Összesen: %d)"
 
 msgid "Localization remap for path '%s' and locale '%s'."
 msgstr ""
-"Lokalizációs újraállítás a(z) \"%s\" útvonalhoz és \"%s\" területi "
+"Lokalizációs átalakítás a(z) \"%s\" útvonalhoz és \"%s\" területi "
 "beállításhoz."
 
 msgid ""
@@ -4530,7 +4530,7 @@ msgid "Scanning file structure..."
 msgstr "Fájlstruktúra vizsgálata..."
 
 msgid "Initializing plugins..."
-msgstr "Beépülő modulok beállítása..."
+msgstr "Bővítmény beállítása..."
 
 msgid "Some extensions need the editor to restart to take effect."
 msgstr "Néhány bővítmény a szerkesztő újraindítása után fog működni."
@@ -5414,14 +5414,14 @@ msgid ""
 "Recovery mode is enabled. Enabled plugins will not run while this mode is "
 "active."
 msgstr ""
-"Visszaállítási Mód engedélyezve. Az engedélyezett beépülő modulok nem futnak, "
+"Visszaállítási Mód engedélyezve. Az engedélyezett bővítmények nem futnak, "
 "amíg ez aktív."
 
 msgid "Installed Plugins:"
 msgstr "Telepített Bővítmények:"
 
 msgid "Plugin name cannot be blank."
-msgstr "A beépülő modul neve nem lehet üres."
+msgstr "A bővítmény neve nem lehet üres."
 
 msgid "Script extension must match chosen language extension (.%s)."
 msgstr ""
@@ -5432,7 +5432,7 @@ msgid ""
 "Consider enabling GDScript warnings for this plugin by adding an entry for it "
 "to the project setting Debug > GDScript > Warnings > Directory Rules."
 msgstr ""
-"Engedélyezhet GDScript figyelmeztetéseket ehhez a beépülő modulhoz a projekt "
+"Engedélyezhet GDScript figyelmeztetéseket ehhez a bővítményhez a projekt "
 "beállításokban egy új bejegyzés segítségével a Hibakeresés > GDScript > "
 "Figyelmeztetések > Könyvtár Szabályok menüpontban."
 
@@ -5446,7 +5446,7 @@ msgid "Plugin Name:"
 msgstr "Bővítmény neve:"
 
 msgid "Required. This name will be displayed in the list of plugins."
-msgstr "Szükséges. Ez a név jelenik meg a beépülő modul listában."
+msgstr "Szükséges. Ez a név jelenik meg a bővítmény listában."
 
 msgid "Subfolder:"
 msgstr "Almappa:"
@@ -5459,15 +5459,15 @@ msgid ""
 msgstr ""
 "Opcionális. A könyvtár neve jellemzően a `snake_case`elnevezést követi "
 "(kerülve a szóközt és a különleges karaktereket).\n"
-"Üresen hagyva a könyvtár neve a beépülő modul `snake_case` formátumú nevét "
-"veszi fel."
+"Üresen hagyva a könyvtár neve a bővítmény `snake_case` formátumú nevét veszi "
+"fel."
 
 msgid ""
 "Optional. This description should be kept relatively short (up to 5 lines).\n"
 "It will display when hovering the plugin in the list of plugins."
 msgstr ""
 "Opcionális. A leírást érdemes rövidre fogni (legfeljebb 5 sor).\n"
-"Az egér föléhúzásakor jelenik meg a beépülő modulok listájában."
+"Az egér föléhúzásakor jelenik meg a bővítmények listájában."
 
 msgid "Author:"
 msgstr "Szerző:"
@@ -5491,7 +5491,7 @@ msgid ""
 "to the plugin."
 msgstr ""
 "Szükséges. A szkripthez használt programnyelv.\n"
-"A beépülő modulok több programnyelvet is használhatnak több szkriptfájl "
+"A bővítmények több programnyelvet is használhatnak több szkriptfájl "
 "hozzáadásával."
 
 msgid "Script Name:"
@@ -6501,10 +6501,10 @@ msgid "Create Polygon & UV"
 msgstr "Sokszög és UV létrehozása"
 
 msgid "Create Internal Vertex"
-msgstr "Belső csúcspont létrehozása"
+msgstr "Belső Vertex létrehozása"
 
 msgid "Remove Internal Vertex"
-msgstr "Belső csúcspont eltávolítása"
+msgstr "Belső Vertex eltávolítása"
 
 msgid "Invalid Polygon (need 3 different vertices)"
 msgstr "Érvénytelen Sokszög (3 különböző csúcsra van szükség)"
@@ -7459,7 +7459,7 @@ msgid "Normals are required for lightmap unwrap."
 msgstr "Lightmap kicsomagoláshoz normálokra van szükség."
 
 msgid "UV Unwrap failed, mesh may not be manifold?"
-msgstr "UV kibontás sikertelen, a mesh talán nem sokrétű?"
+msgstr "UV kibontás sikertelen, a mesh talán nem képezhető le?"
 
 msgid "No mesh to debug."
 msgstr "Nincs mesh a hibakereséshez."
@@ -8417,7 +8417,7 @@ msgid "The geometry doesn't contain any faces."
 msgstr "A geometria nem tartalmaz oldalakat."
 
 msgid "Create Emitter"
-msgstr "Kibocsátó Létrehozása"
+msgstr "Emitter Létrehozása"
 
 msgid "Emission Points:"
 msgstr "Kibocsátási Pontok:"
@@ -8877,7 +8877,7 @@ msgid "Extra Call Arguments:"
 msgstr "További hívási argumentumok:"
 
 msgid "Allows to drop arguments sent by signal emitter."
-msgstr "Eltávolíthatóvá teszi a jeladó által továbbított argumentumokat."
+msgstr "Eltávolíthatóvá teszi a jel emitter által továbbított argumentumokat."
 
 msgid "Receiver Method:"
 msgstr "Fogadó metódus:"
@@ -10359,6 +10359,41 @@ msgstr ""
 "SIL Graphite okos betűtípus technológia támogatás (csak a Fejlett Szöveg "
 "Szerver támogatja)."
 
+msgid ""
+"Multi-channel signed distance field font rendering support using msdfgen "
+"library (pre-rendered MSDF fonts can be used even if this option disabled)."
+msgstr ""
+"Többcsatornás előjeles távolságmező betűtípus renderelés támogatása az "
+"msdfgen könyvtárral (előrenderelt MSDF betűtípusok használhatóak ezen funkció "
+"nélkül is)."
+
+msgid "Graphics and Rendering:"
+msgstr "Grafika és Renderelés:"
+
+msgid "Text Rendering and Font Options:"
+msgstr "Szöveg Renderelés és Betűtípus Opciók:"
+
+msgid ""
+"This will scan all files in the current project to detect used classes.\n"
+"Note that the first scan may take a while, specially in larger projects."
+msgstr ""
+"Ez ellenőrzi az összes fájlt a projektben a használatban lévő osztályok "
+"megkereséséhez.\n"
+"Az első ellenőrzés sokáig tarthat, kifejezetten a nagy projektek esetén."
+
+msgid ""
+"Warning: Class detection for C# scripts is not currently available, and such "
+"files will be ignored."
+msgstr ""
+"Figyelmeztetés: C# szkriptekben az osztály érzékelés jelenleg nem érhető el "
+"és ezek a fájlok figyelmen kívül maradnak."
+
+msgid "Scanning Project for Used Classes"
+msgstr "Projektben Használt Osztályok Ellenőrzése"
+
+msgid "Processing Classes Found"
+msgstr "Talált Osztályok Feldolgozása"
+
 msgid "File '%s' format is invalid, import aborted."
 msgstr "A(z) '%s' fájl formátuma érvénytelen, az importálás megszakítva."
 
@@ -10368,6 +10403,12 @@ msgstr "Hiba történt a profil útvonalba mentése során: '%s'."
 msgid "Export Profile"
 msgstr "Profil exportálása"
 
+msgid "Forced Classes on Detect:"
+msgstr "Kényszerítetten Érzékelt Osztályok:"
+
+msgid "Edit Compilation Configuration Profile"
+msgstr "Építési Konfigurációs Profil Módosítása"
+
 msgid ""
 "Failed to execute command \"%s\":\n"
 "%s."
@@ -10407,6 +10448,36 @@ msgstr "Beépített hozzáférést ad a Csomagtárhoz."
 msgid "Allows editing the node hierarchy in the Scene dock."
 msgstr "Engedélyezi a Node hierarchia szerkesztését a Jelenet dokkban."
 
+msgid ""
+"Allows to work with signals and groups of the node selected in the Scene dock."
+msgstr ""
+"Lehetővé teszi a Jelenet dokkon kijelölt node csoportjaival és a jelekkel "
+"történő munkát."
+
+msgid "Allows to browse the local file system via a dedicated dock."
+msgstr ""
+"Lehetővé teszi a helyi fájlrendszer böngészését egy dedikált dokkon keresztül."
+
+msgid ""
+"Allows to configure import settings for individual assets. Requires the "
+"FileSystem dock to function."
+msgstr ""
+"Lehetővé teszi az egyes eszközök import beállításainak módosítását. A "
+"FileSystem dokkra van szükség hozzá."
+
+msgid "Provides an overview of the editor's and each scene's undo history."
+msgstr "Áttekintést nyújt a szerkesztő és a jelenetek előzményeihez."
+
+msgid "Provides tools for selecting and debugging nodes at runtime."
+msgstr ""
+"Eszközöket biztosít node-ok futásidejű kijelöléséhez és hibakereséséhez."
+
+msgid "(none)"
+msgstr "(egyik sem)"
+
+msgid "Remove currently selected profile, '%s'? Cannot be undone."
+msgstr "A(z) \"%s\" kijelölt profil eltávolítása? Nem vonhbató vissza."
+
 msgid "Profile must be a valid filename and must not contain '.'"
 msgstr ""
 "A profilnak érvényes fájlnévnek kell lennie, és nem tartalmazhatja a \".\" "
@@ -10445,6 +10516,11 @@ msgstr "Elérhető profilok:"
 msgid "Make Current"
 msgstr "Tegye jelenlegivé"
 
+msgid "Create or import a profile to edit available classes and properties."
+msgstr ""
+"Hozzon létre vagy importáljon egy profilt az elérhető osztályok és "
+"tulajdonságok módosításához."
+
 msgid "New profile name:"
 msgstr "Új profilnév:"
 
@@ -10463,27 +10539,156 @@ msgstr "Szerkesztő Beállítások"
 msgid "General"
 msgstr "Általános"
 
+msgid "The Project Manager must be restarted for changes to take effect."
+msgstr ""
+"A változások érvénybe léptetéséhez újra kell indítani a Projekt Menedzsert."
+
+msgid "The editor must be restarted for changes to take effect."
+msgstr "A változások érvénybe léptetéséhez újra kell indítani a szerkesztőt."
+
 msgid "Shortcuts"
 msgstr "Billentyűparancsok"
 
+msgid "Binding"
+msgstr "Billentyűparancs"
+
+msgid "Left Stick Left, Joystick 0 Left"
+msgstr "Bal Kar Balra, Joystick 0 Balra"
+
+msgid "Left Stick Right, Joystick 0 Right"
+msgstr "Bal Kar Jobbra, Joystick 0 Jobbra"
+
+msgid "Left Stick Up, Joystick 0 Up"
+msgstr "Bal Kar Fel, Joystick 0 Fel"
+
+msgid "Left Stick Down, Joystick 0 Down"
+msgstr "Bal Kar Le, Joystick 0 Le"
+
+msgid "Right Stick Left, Joystick 1 Left"
+msgstr "Jobb Kar Balra, Joystick 1 Balra"
+
+msgid "Right Stick Right, Joystick 1 Right"
+msgstr "Jobb Kar Jobbra, Joystick 1 Jobbra"
+
+msgid "Right Stick Up, Joystick 1 Up"
+msgstr "Jobb Kar Fel, Joystick 1 Fel"
+
+msgid "Right Stick Down, Joystick 1 Down"
+msgstr "Jobb Kar Le, Joystick 1 Le"
+
+msgid "Joystick 2 Left"
+msgstr "Joystick 2 Balra"
+
+msgid "Left Trigger, Sony L2, Xbox LT, Joystick 2 Right"
+msgstr "Bal Ravasz, Sony L2, Xbox LT, Joystick 2 Jobbra"
+
+msgid "Joystick 2 Up"
+msgstr "Joystick 2 Fel"
+
+msgid "Right Trigger, Sony R2, Xbox RT, Joystick 2 Down"
+msgstr "Jobb Ravasz, Sony R2, Xbox RT, Joystick 2 Le"
+
+msgid "Joystick 3 Left"
+msgstr "Joystick 3 Balra"
+
+msgid "Joystick 3 Right"
+msgstr "Joystick 3 Jobbra"
+
+msgid "Joystick 3 Up"
+msgstr "Joystick 3 Fel"
+
+msgid "Joystick 3 Down"
+msgstr "Joystick 3 Le"
+
+msgid "Joystick 4 Left"
+msgstr "Joystick 4 Balra"
+
+msgid "Joystick 4 Right"
+msgstr "Joystick 4 Jobbra"
+
+msgid "Joystick 4 Up"
+msgstr "Joystick 4 Fel"
+
+msgid "Joystick 4 Down"
+msgstr "Joystick 4 Le"
+
 msgid "Unicode"
 msgstr "Unicode"
 
+msgid "Joypad Axis %d %s (%s)"
+msgstr "Joypad Tengely %d %s (%s)"
+
 msgid "All Devices"
 msgstr "Minden eszköz"
 
 msgid "Device"
 msgstr "Eszköz"
 
+msgid "Listening for Input. Hold %s to release focus."
+msgstr "Bevitel figyelés. %s nyomvatartásával elengedi a fókuszt."
+
+msgid "No Event Configured"
+msgstr "Nincs Beállított Esemény"
+
+msgid "Keyboard Keys"
+msgstr "Billentyűzet Billentyűk"
+
+msgid "Joypad Axes"
+msgstr "Joypad Tengelyek"
+
 msgid "Device:"
 msgstr "Eszköz:"
 
+msgid ""
+"Automatically remaps between 'Meta' ('Command') and 'Control' depending on "
+"current platform."
+msgstr ""
+"A platformtól függően automatikusan átáll a \"Meta\" (\"Command\") és "
+"\"Control\" gombok között."
+
+msgid "Keycode (Latin Equivalent)"
+msgstr "Billentyűkód (Latin Megfelelő)"
+
+msgid "Physical Keycode (Position on US QWERTY Keyboard)"
+msgstr "Fizikai Billentyűkód (US QWERTY Billentyűzet Pozíció)"
+
+msgid "Key Label (Unicode, Case-Insensitive)"
+msgstr "Billentyűnév (Unicode, Nem Kis-Nagybetű Erzékeny)"
+
+msgid "Shift key"
+msgstr "Shift Billentyű"
+
+msgid "Control key"
+msgstr "Control billentyű"
+
+msgid "Meta/Windows or Command key"
+msgstr "Meta/Windows vagy Command billentyű"
+
 msgid "Delete Item"
 msgstr "Elem törlése"
 
 msgid "Add Input Action"
 msgstr "Beviteli Akció Hozzáadása"
 
+msgid "Change Action deadzone"
+msgstr "Művelet Holttér Változtatás"
+
+msgid "Erase Input Action"
+msgstr "Beviteli Művelet Törlés"
+
+msgid "Update Input Action Order"
+msgstr "Beviteli Művelet Sorrend Frissítés"
+
+msgid "Project Settings (project.godot)"
+msgstr "Projekt Beállítások (project.godot)"
+
+msgid "Select a Setting or Type its Name"
+msgstr "Válasszon Beállítást vagy Írja be a Nevét"
+
+msgid "Changed settings will be applied to the editor after restarting."
+msgstr ""
+"A megváltoztatott beállítások a szerkesztő újraindításakor lépnek érvénybe."
+
 msgid "Input Map"
 msgstr "Beviteli Térkép"
 
@@ -10496,18 +10701,82 @@ msgstr "Automatikus betöltés"
 msgid "Plugins"
 msgstr "Bővítmények"
 
+msgid "Native Shader Source Inspector"
+msgstr "Natív Shader Forrás Elemző"
+
+msgid "Error - Could not create shader include in filesystem."
+msgstr "Hiba - Nem hozható létre shader befoglaló a fájlrendszerben."
+
 msgid "N/A"
 msgstr "N/A"
 
+msgid "Open Shader / Choose Location"
+msgstr "Shader Megnyitása / Hely Kiválasztása"
+
 msgid "Invalid base path."
 msgstr "Érvénytelen Alapútvonal."
 
+msgid "Note: Built-in shaders can't be edited using an external editor."
+msgstr "Megjegyzés: Beépített shader-ek nem módosíthatóak külső szerkesztővel."
+
+msgid "Load Shader Include File..."
+msgstr "Shader Befoglaló Fájl Betöltése..."
+
+msgid "No valid shader stages found."
+msgstr "Nem található érvényes shader szakasz."
+
+msgid "Shader stage compiled without errors."
+msgstr "Shader szakasz építés hiba nélkül befejeződött."
+
+msgid ""
+"File structure for '%s' contains unrecoverable errors:\n"
+"\n"
+msgstr ""
+"A(z) \"%s\" fájl struktúra helyrehozhatatlan hibákat tartalmaz:\n"
+"\n"
+
+msgid "Name '%s' is a reserved shader language keyword."
+msgstr "A(z) \"%s\" név egy lefoglalt shader nyelvi kulcsszó."
+
+msgid "Add Shader Global Parameter"
+msgstr "Globális Shader Paraméter Hozzáadása"
+
+msgid "Warnings should be fixed to prevent errors."
+msgstr "A hibák megelőzése érdekében javasolt javítani a figyelmeztetéseket."
+
 msgid "Reload"
 msgstr "Újratöltés"
 
 msgid "Resave"
 msgstr "Újramentés"
 
+msgid "E constant (2.718282). Represents the base of the natural logarithm."
+msgstr "E konstans (2.718282). A természetes logaritmus alapját jelképezi."
+
+msgid "Epsilon constant (0.00001). Smallest possible scalar number."
+msgstr "Epszilon konstans (0.00001). A létező legkisebb skalár szám."
+
+msgid "Phi constant (1.618034). Golden ratio."
+msgstr "Phi konstans (1.618034). Aranymetszés."
+
+msgid "Pi/4 constant (0.785398) or 45 degrees."
+msgstr "Pi/4 konstans (0.785398) vagy 45 fok."
+
+msgid "Pi/2 constant (1.570796) or 90 degrees."
+msgstr "Pi/2 konstans (1.570796) vagy 90 fok."
+
+msgid "Pi constant (3.141593) or 180 degrees."
+msgstr "Pi konstans (3.141593) vagy 180 fok."
+
+msgid "Tau constant (6.283185) or 360 degrees."
+msgstr "Tau konstans (6.283185) vagy 360 fok."
+
+msgid "Sqrt2 constant (1.414214). Square root of 2."
+msgstr "Sqrt2 konstans (1.414214). 2 gyöke."
+
+msgid "Drag and drop nodes here to attach them."
+msgstr "Csatoláshoz dobjon rá node-okat."
+
 msgid "Add Input"
 msgstr "Bemenet Hozzáadása"
 
@@ -10517,6 +10786,28 @@ msgstr "Kimenet hozzáadása"
 msgid "Float"
 msgstr "valós szám"
 
+msgid "UInt"
+msgstr "UInt"
+
+msgid "Boolean"
+msgstr "Boolean"
+
+msgid "Sampler"
+msgstr "Mintavételező"
+
+msgid ""
+"The 2D preview cannot correctly show the result retrieved from instance "
+"parameter."
+msgstr ""
+"A 2D előnézet nem tudja helyesen megjeleníteni a példány paraméterből vett "
+"eredményt."
+
+msgid "Copy Preview Shader Parameters From Material"
+msgstr "Előnézeti Shader Paraméterek Másolása Anyagból"
+
+msgid "Paste Preview Shader Parameters To Material"
+msgstr "Előnézeti Shader Paraméterek Beillesztése Anyagba"
+
 msgid "Add Input Port"
 msgstr "Bemeneti port hozzáadása"
 
@@ -10529,42 +10820,1093 @@ msgstr "Bemeneti port eltávolítása"
 msgid "Remove Output Port"
 msgstr "Kimeneti port eltávolítása"
 
+msgid "Show Port Preview"
+msgstr "Port Előnézet Mutatása"
+
 msgid "Set Input Default Port"
 msgstr "Alapértelmezett bemeneti port beállítása"
 
+msgid "Add Node to Visual Shader"
+msgstr "Node Hozzáadása Vizuális Shader-hez"
+
+msgid "Add Varying to Visual Shader: %s"
+msgstr "Variáló Hozzáadása Vizuális Shader-hez: %s"
+
+msgid "Remove Varying from Visual Shader: %s"
+msgstr "Variáló Eltávolítása Vizuális Shader-ről: %s"
+
+msgid "Move and Attach VisualShader Node(s) to parent frame"
+msgstr "VisualShader Node(ok) Mozgatása és Csatolása a szülő kerethez"
+
+msgid "Convert Constant Node(s) To Parameter(s)"
+msgstr "Konstans Node(ok) Konvertálása Paraméterré"
+
+msgid "Convert Parameter Node(s) To Constant(s)"
+msgstr "Paraméter Node(ok) Konvertálása Konstanssá"
+
+msgid "Convert Parameter(s) to Constant(s)"
+msgstr "Paraméterek Konvertálása Konstanssá"
+
+msgid "Visual Shader Input Type Changed"
+msgstr "Vizuális Shader Bemenet Típus Változtatás"
+
+msgid "Boolean type cannot be used with `%s` varying mode."
+msgstr "Boolean típus nem használható variáló módban ezzel: \"%s\"."
+
+msgid "Hold %s Key To Swap Connections"
+msgstr "%s Nyomvatartásával Váltás Kapcsolatok Között"
+
+msgid "Vertex"
+msgstr "Vertex"
+
+msgid "Fragment"
+msgstr "Töredék"
+
+msgid "Light"
+msgstr "Fény"
+
+msgid "Sky"
+msgstr "Égbolt"
+
+msgid "Fog"
+msgstr "Köd"
+
+msgid "Show generated shader code."
+msgstr "Generált shader kód mutatása."
+
 msgid "Add Node"
 msgstr "Node hozzáadása"
 
+msgid "Copy Parameters From Material"
+msgstr "Paraméterek Másolása Anyagból"
+
+msgid ""
+"Only supported in the Forward+ and Mobile rendering methods, not "
+"Compatibility."
+msgstr ""
+"Csak a Forward+ és Mobile renderelő módszerekkel támogatott, Compatibility-"
+"vel nem."
+
+msgid "Create Shader Node"
+msgstr "Shader Node Létrehozása"
+
+msgid "Delete Shader Varying"
+msgstr "Shader Variáló Törlése"
+
 msgid "Color function."
 msgstr "Szín függvény."
 
+msgid "Color operator."
+msgstr "Szín operátor."
+
+msgid "Grayscale function."
+msgstr "Szürkeárnyalatos függvény."
+
+msgid "Converts HSV vector to RGB equivalent."
+msgstr "Átalakítja a HSV vektort az RGB megfelelőjére."
+
+msgid "Converts color from linear to sRGB color space."
+msgstr "Átalakítja a lineáris színt sRGB színtérbe."
+
+msgid "Converts RGB vector to HSV equivalent."
+msgstr "Átalakítja az RGB vektort a HSV megfelelőjére."
+
+msgid "Sepia function."
+msgstr "Szépia függvény."
+
+msgid "Converts color from sRGB to linear color space."
+msgstr "Átalakítja az sRGB színt lineáris színtérbe."
+
+msgid "Burn operator."
+msgstr "Beégés operátor."
+
+msgid "Darken operator."
+msgstr "Sötétítés operátor."
+
+msgid "Difference operator."
+msgstr "Különbség operátor."
+
+msgid "Dodge operator."
+msgstr "Kitérés operátor."
+
+msgid "HardLight operator."
+msgstr "HardLight operátor."
+
+msgid "Lighten operator."
+msgstr "Világosító operátor."
+
+msgid "Overlay operator."
+msgstr "Átfedés operátor."
+
+msgid "Screen operator."
+msgstr "Ernyő operátor."
+
+msgid "SoftLight operator."
+msgstr "SoftLight operátor."
+
 msgid "Color constant."
 msgstr "Színállandó."
 
+msgid "(Fragment/Light mode only) Derivative function."
+msgstr "(Csak Töredék/Fény módok) Derivált függvény."
+
+msgid "Returns the boolean result of the %s comparison between two parameters."
+msgstr ""
+"Boolean eredménnyel tér vissza két paraméter közötti %s összehasonlítás után."
+
+msgid "Equal (==)"
+msgstr "Egyenlőség (==)"
+
+msgid "Greater Than (>)"
+msgstr "Nagyobb (>)"
+
+msgid "Greater Than or Equal (>=)"
+msgstr "Nagyobb vagy Egyenlő (>=)"
+
+msgid ""
+"Returns an associated vector if the provided scalars are equal, greater or "
+"less."
+msgstr ""
+"Hozzzárendelt vektort ad vissza, ha a megadott skalárok egyenlőek, nagyobbak "
+"vagy kisebbek."
+
+msgid ""
+"Returns the boolean result of the comparison between INF and a scalar "
+"parameter."
+msgstr ""
+"INF és egy skalár paraméter összehasonlításából származó boolean eredményt ad "
+"vissza."
+
+msgid ""
+"Returns the boolean result of the comparison between NaN and a scalar "
+"parameter."
+msgstr ""
+"NaN és egy skalár paraméter összehasonlításából származó boolean eredményt ad "
+"vissza."
+
+msgid "Less Than (<)"
+msgstr "Kisebb (<)"
+
+msgid "Less Than or Equal (<=)"
+msgstr "Kisebb vagy Egyenlő (<=)"
+
+msgid "Not Equal (!=)"
+msgstr "Nem Egyenlő (!=)"
+
+msgid ""
+"Returns an associated 2D vector if the provided boolean value is true or "
+"false."
+msgstr ""
+"Hozzzárendelt 2D vektort ad vissza, ha a megadott boolean igaz vagy hamis."
+
+msgid ""
+"Returns an associated 3D vector if the provided boolean value is true or "
+"false."
+msgstr ""
+"Hozzzárendelt 3D vektort ad vissza, ha a megadott boolean értéke igaz vagy "
+"hamis."
+
+msgid ""
+"Returns an associated 4D vector if the provided boolean value is true or "
+"false."
+msgstr ""
+"Hozzzárendelt 4D vektort ad vissza, ha a megadott boolean értéke igaz vagy "
+"hamis."
+
+msgid ""
+"Returns an associated boolean if the provided boolean value is true or false."
+msgstr ""
+"Hozzzárendelt boolean-t ad vissza, ha a megadott boolean értéke igaz vagy "
+"hamis."
+
+msgid ""
+"Returns an associated floating-point scalar if the provided boolean value is "
+"true or false."
+msgstr ""
+"Hozzzárendelt lebegőpontos skalárt ad vissza, ha a megadott boolean értéke "
+"igaz vagy hamis."
+
+msgid ""
+"Returns an associated integer scalar if the provided boolean value is true or "
+"false."
+msgstr ""
+"Hozzzárendelt egész skalárt ad vissza, ha a megadott boolean értéke igaz vagy "
+"hamis."
+
+msgid ""
+"Returns an associated transform if the provided boolean value is true or "
+"false."
+msgstr ""
+"Hozzzárendelt transzformációt ad vissza, ha a megadott boolean értéke igaz "
+"vagy hamis."
+
+msgid ""
+"Returns an associated unsigned integer scalar if the provided boolean value "
+"is true or false."
+msgstr ""
+"Hozzzárendelt előjel nélküli egész skalárt ad vissza, ha a megadott boolean "
+"értéke igaz vagy hamis."
+
+msgid "Returns the boolean result of the comparison between two parameters."
+msgstr "Két paraméter közötti összehasonlítás boolean eredményét adja vissza."
+
+msgid ""
+"Returns the boolean result of the comparison between INF (or NaN) and a "
+"scalar parameter."
+msgstr ""
+"INF (vagy NaN) és egy skalár paraméter közötti összehasonlítás boolean "
+"eredményét adja vissza."
+
 msgid "Boolean constant."
-msgstr "Logikai állandó."
+msgstr "Boolean konstans."
+
+msgid "Translated to '%s' in Godot Shading Language."
+msgstr "Godot Shading Nyelvben lefordítva erre: \"%s\"."
+
+msgid "'%s' input parameter for all shader modes."
+msgstr "\"%s\" bemeneti paraméter minden shader módhoz."
 
 msgid "Input parameter."
 msgstr "Bemeneti paraméter."
 
+msgid "'%s' input parameter for vertex and fragment shader modes."
+msgstr "\"%s\" bemeneti paraméter vertex és töredék shader módokhoz."
+
+msgid "'%s' input parameter for fragment and light shader modes."
+msgstr "\"%s\" bemeneti paraméter töredék és fény shader módokhoz."
+
+msgid "'%s' input parameter for fragment shader mode."
+msgstr "\"%s\" bemeneti paraméter töredék shader módhoz."
+
+msgid "'%s' input parameter for sky shader mode."
+msgstr "\"%s\" bemeneti paraméter égbolt shader módhoz."
+
+msgid "'%s' input parameter for fog shader mode."
+msgstr "\"%s\" bemeneti paraméter köd shader módhoz."
+
+msgid "'%s' input parameter for light shader mode."
+msgstr "\"%s\" bemeneti paraméter fény shader módhoz."
+
+msgid "'%s' input parameter for vertex shader mode."
+msgstr "\"%s\" bemeneti paraméter vertex shader módhoz."
+
+msgid "'%s' input parameter for start shader mode."
+msgstr "\"%s\" bemeneti paraméter start shader módhoz."
+
+msgid "'%s' input parameter for process shader mode."
+msgstr "\"%s\" bemeneti paraméter feldolgozás shader módhoz."
+
+msgid "'%s' input parameter for start and process shader modes."
+msgstr "\"%s\" bemeneti paraméter start és feldolgozás shader módokhoz."
+
+msgid "'%s' input parameter for process and collide shader modes."
+msgstr "\"%s\" bemeneti paraméter feldolgozás és ütközés shader módokhoz."
+
+msgid ""
+"A node for help to multiply a position input vector by rotation using "
+"specific axis. Intended to work with emitters."
+msgstr ""
+"Segítő node egy pozíció bemeneti vektor szorzásához adott tengely körüli "
+"forgatással. Emitterekkel való működéshez."
+
+msgid "Returns the absolute value of the parameter."
+msgstr "A paraméter abszolút értékét adja vissza."
+
+msgid "Returns the arc-cosine of the parameter."
+msgstr "A paraméter arkusz koszinuszát adja vissza."
+
+msgid "Returns the inverse hyperbolic cosine of the parameter."
+msgstr "A paraméter inverz hiperbolikus koszinuszát adja vissza."
+
+msgid "Returns the arc-sine of the parameter."
+msgstr "A paraméter arkusz szinuszát adja vissza."
+
+msgid "Returns the inverse hyperbolic sine of the parameter."
+msgstr "A paraméter inverz hiperbolikus szinuszát adja vissza."
+
+msgid "Returns the arc-tangent of the parameter."
+msgstr "A paraméter arkusz tangensét adja vissza."
+
+msgid "Returns the arc-tangent of the parameters."
+msgstr "A paraméterek arkusz tangensét adja vissza."
+
+msgid "Returns the inverse hyperbolic tangent of the parameter."
+msgstr "A paraméter inverz hiperbolikus tangensét adja vissza."
+
+msgid "Returns the result of bitwise NOT (~a) operation on the integer."
+msgstr "Egész számon végzett bitenkénti NOT (~a) művelet értékét adja vissza."
+
+msgid ""
+"Returns the result of bitwise NOT (~a) operation on the unsigned integer."
+msgstr ""
+"Előjel nélküli egész számon végzett bitenkénti NOT (~a) művelet értékét adja "
+"vissza."
+
+msgid ""
+"Finds the nearest integer that is greater than or equal to the parameter."
+msgstr ""
+"Megkeresi a legközelebbi egész számot, ami nagyobb vagy egyenlő a "
+"paraméterrel."
+
+msgid "Constrains a value to lie between two further values."
+msgstr "Egy értéket két további érték közé kényszerít."
+
+msgid "Returns the cosine of the parameter."
+msgstr "A paraméter koszinuszát adja vissza."
+
+msgid "Returns the hyperbolic cosine of the parameter."
+msgstr "A paraméter hiperbolikus koszinuszát adja vissza."
+
+msgid "Converts a quantity in radians to degrees."
+msgstr "Átalakít egy radiánban megadott mennyiséget fokra."
+
+msgid ""
+"(Fragment/Light mode only) (Scalar) Derivative in 'x' using local "
+"differencing."
+msgstr ""
+"(Csak Töredék/Fény mód) (Skalár) \"x\" deriváltja lokális differenciálással."
+
+msgid ""
+"(Fragment/Light mode only) (Scalar) Derivative in 'y' using local "
+"differencing."
+msgstr ""
+"(Csak Töredék/Fény mód) (Skalár) \"y\" deriváltja lokális differenciálással."
+
+msgid "(Scalar) Derivative in 'x' using local differencing."
+msgstr "(Skalár) \"x\" deriváltja lokális differenciálással."
+
+msgid "(Scalar) Derivative in 'y' using local differencing."
+msgstr "(Skalár) \"y\" deriváltja lokális differenciálással."
+
+msgid "Base-e Exponential."
+msgstr "E-alapú Exponenciális."
+
+msgid "Base-2 Exponential."
+msgstr "2-es alapú Exponenciális."
+
+msgid "Finds the nearest integer less than or equal to the parameter."
+msgstr ""
+"Megkeresi a legközelebbi egész számot, ami kisebb vagy egyenlő a paraméterrel."
+
+msgid "Computes the fractional part of the argument."
+msgstr "Kiszámítja az argumentum tört részét."
+
+msgid "Returns the inverse of the square root of the parameter."
+msgstr "A paraméter négyzetgyökének inverzét adja vissza."
+
+msgid "Natural logarithm."
+msgstr "Természetes logaritmus."
+
+msgid "Base-2 logarithm."
+msgstr "2-es alapú logaritmus."
+
+msgid "Returns the greater of two values."
+msgstr "Két érték közül a nagyobbat adja vissza."
+
+msgid "Returns the lesser of two values."
+msgstr "Két érték közül a kisebbet adja vissza."
+
+msgid "Linear interpolation between two scalars."
+msgstr "Két skalár közötti lineáris interpoláció."
+
+msgid "Performs a fused multiply-add operation (a * b + c) on scalars."
+msgstr ""
+"Egyesített szorzás-összeadás műveletet (a * b + c) hajt vége skalárokon."
+
+msgid "Returns the opposite value of the parameter."
+msgstr "A paraméter ellentétes értékét adja vissza."
+
+msgid "1.0 - scalar"
+msgstr "1.0 - skalár"
+
+msgid ""
+"Returns the value of the first parameter raised to the power of the second."
+msgstr "Az első paraméter második hatványra emelt értékét adja vissza."
+
+msgid "Converts a quantity in degrees to radians."
+msgstr "Átalakít egy fokban megadott értéket radiánba."
+
+msgid "1.0 / scalar"
+msgstr "1.0 / skalár"
+
+msgid "Remaps a value from the input range to the output range."
+msgstr "Átalakít egy értéket a bemeneti tartományból a kimeneti tartományba."
+
+msgid "Finds the nearest integer to the parameter."
+msgstr "Megkeresi a paraméterhez legközelebbi egész számot."
+
+msgid "Finds the nearest even integer to the parameter."
+msgstr "Megkeresi a paraméterhez legközelebbi páros egész számot."
+
+msgid "Clamps the value between 0.0 and 1.0."
+msgstr "0.0 és 1.0 közé szorítja az értéket."
+
+msgid "Extracts the sign of the parameter."
+msgstr "Kinyeri a paraméter előjelét."
+
+msgid "Returns the sine of the parameter."
+msgstr "A paraméter szinuszát adja vissza."
+
+msgid "Returns the hyperbolic sine of the parameter."
+msgstr "A paraméter hiperbolikus szinuszát adja vissza."
+
+msgid "Returns the square root of the parameter."
+msgstr "A paraméter négyzetgyökét adja vissza."
+
+msgid ""
+"SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge0' and 1.0 if x is larger than "
+"'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 using "
+"Hermite polynomials."
+msgstr ""
+"SmoothStep függvény ( skalár(edge0), skalár(edge1), skalár(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge0\", akkor 0.0-t, ha \"x\" nagyobb, mint "
+"\"edge1\", akkor 1.0-t ad vissza. Egyébként a visszaadott érték 0.0 és 1.0 "
+"közé interpolálódik a Hermite polinomok használatával."
+
+msgid ""
+"Step function( scalar(edge), scalar(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0."
+msgstr ""
+"Step függvény ( skalár(edge), skalár(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge\", akkor 0.0-t, egyébként 1.0-t ad vissza."
+
+msgid ""
+"(Fragment/Light mode only) (Scalar) Sum of absolute derivative in 'x' and 'y'."
+msgstr ""
+"(Csak Töredék/Fény mód) (Skalár) \"x\" és \"y\" abszolút deriváltjának "
+"összege."
+
+msgid "(Scalar) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Skalár) \"x\" és \"y\" abszolút deriváltjának összege."
+
+msgid "Returns the tangent of the parameter."
+msgstr "A paraméter tangensét adja vissza."
+
+msgid "Returns the hyperbolic tangent of the parameter."
+msgstr "A paraméter hiperbolikus tangensét adja vissza."
+
+msgid "Finds the truncated value of the parameter."
+msgstr "Megkeresi a paraméter levágott értékét."
+
+msgid "Sums two floating-point scalars."
+msgstr "Két lebegőpontos skalár összege."
+
+msgid "Sums two integer scalars."
+msgstr "Két egész skalár összege."
+
+msgid "Sums two unsigned integer scalars."
+msgstr "Két előjel nélküli egész skalár összege."
+
+msgid "Returns the result of bitwise AND (a & b) operation for two integers."
+msgstr ""
+"Két egész számon végzett bitenkénti AND (a & b) művelet értékét adja vissza."
+
+msgid ""
+"Returns the result of bitwise AND (a & b) operation for two unsigned integers."
+msgstr ""
+"Két előjel nélküli egész számon végzett bitenkénti AND (a & b) művelet "
+"értékét adja vissza."
+
+msgid ""
+"Returns the result of bitwise left shift (a << b) operation on the integer."
+msgstr ""
+"Egész számon végzett bitenkénti balra tolás (a << b) művelet értékét adja "
+"vissza."
+
+msgid ""
+"Returns the result of bitwise left shift (a << b) operation on the unsigned "
+"integer."
+msgstr ""
+"Előjel nélküli egész számon végzett bitenkénti balra tolás (a << b) művelet "
+"értékét adja vissza."
+
+msgid "Returns the result of bitwise OR (a | b) operation for two integers."
+msgstr ""
+"Két egész számon végzett bitenkénti OR (a | b) művelet értékét adja vissza."
+
+msgid ""
+"Returns the result of bitwise OR (a | b) operation for two unsigned integers."
+msgstr ""
+"Két előjel nélküli egész számon végzett bitenkénti OR (a | b) művelet értékét "
+"adja vissza."
+
+msgid ""
+"Returns the result of bitwise right shift (a >> b) operation on the integer."
+msgstr ""
+"Egész számon végzett bitenkénti jobbra tolás (a >> b) művelet értékét adja "
+"vissza."
+
+msgid ""
+"Returns the result of bitwise right shift (a >> b) operation on the unsigned "
+"integer."
+msgstr ""
+"Előjel nélküli egész számon végzett bitenkénti jobbra tolás (a >> b) művelet "
+"értékét adja vissza."
+
+msgid "Returns the result of bitwise XOR (a ^ b) operation on the integer."
+msgstr ""
+"Egész számon végzett bitenkénti XOR (a ^ b) művelet értékét adja vissza."
+
+msgid ""
+"Returns the result of bitwise XOR (a ^ b) operation on the unsigned integer."
+msgstr ""
+"Előjel nélküli egész számon végzett bitenkénti XOR (a ^ b) művelet értékét "
+"adja vissza."
+
+msgid "Divides two floating-point scalars."
+msgstr "Két lebegőpontos skalár osztása."
+
+msgid "Divides two integer scalars."
+msgstr "Két egész skalár osztása."
+
+msgid "Divides two unsigned integer scalars."
+msgstr "Két előjel nélküli egész skalár osztása."
+
+msgid "Multiplies two floating-point scalars."
+msgstr "Két lebegőpontos skalár szorzása."
+
+msgid "Multiplies two integer scalars."
+msgstr "Két egész skalár szorzása."
+
+msgid "Multiplies two unsigned integer scalars."
+msgstr "Két előjel nélküli egész skalár szorzása."
+
+msgid "Returns the remainder of the two floating-point scalars."
+msgstr "A két lebegőpontos skalár maradékát adja vissza."
+
+msgid "Returns the remainder of the two integer scalars."
+msgstr "A két egész skalár maradékát adja vissza."
+
+msgid "Returns the remainder of the two unsigned integer scalars."
+msgstr "A két előjel nélküli egész skalár maradékát adja vissza."
+
+msgid "Subtracts two floating-point scalars."
+msgstr "Két lebegőpontos skalár kivonása."
+
+msgid "Subtracts two integer scalars."
+msgstr "Két egész skalár kivonása."
+
+msgid "Subtracts two unsigned integer scalars."
+msgstr "Két előjel nélküli egész skalár kivonása."
+
+msgid "Scalar floating-point parameter."
+msgstr "Lebegőpontos skalár paraméter."
+
+msgid "Scalar unsigned integer parameter."
+msgstr "Előjel nélküli egész skalár paraméter."
+
+msgid "Casts a ray against the screen SDF and returns the distance travelled."
+msgstr "A képernyő SDF-re vetít egy sugarat és visszaadja a megtett út hosszát."
+
+msgid "Converts a SDF to screen UV."
+msgstr "SDF konvertálása képernyő UV-re."
+
+msgid "Performs a SDF texture lookup."
+msgstr "SDF textúra keresést hajt végre."
+
+msgid "Performs a SDF normal texture lookup."
+msgstr "SDF normál textúra keresést hajt végre."
+
+msgid "Function to be applied on texture coordinates."
+msgstr "Textúra koordinátákra alkalmazott függvény."
+
+msgid "Polar coordinates conversion applied on texture coordinates."
+msgstr "Textúra koordinátákra alkalmazott polárkoordináta konverzió."
+
+msgid "Perform the cubic texture lookup."
+msgstr "Köbös textúra keresést hajt végre."
+
+msgid "Perform the curve texture lookup."
+msgstr "Görbe textúra keresést hajt végre."
+
+msgid "Perform the three components curve texture lookup."
+msgstr "Három komponensű görbe textúra keresést hajt végre."
+
+msgid ""
+"Returns the depth value obtained from the depth prepass in a linear space."
+msgstr ""
+"A lináris térbeli mélységi előkészítés (prepass) mélység értékét adja vissza."
+
+msgid "Reconstructs the World Position of the Node from the depth texture."
+msgstr "Helyreállítja a Node Világ Pozícióját a mélységi textúra alapján."
+
+msgid "Unpacks the Screen Normal Texture in World Space"
+msgstr "Kicsomagolja a Képernyő Normál Textúrát a Világ Térben"
+
+msgid "Perform the 2D texture lookup."
+msgstr "2D textúra keresés végrehajtása."
+
+msgid "Perform the 2D-array texture lookup."
+msgstr "2D-tömb textúra keresés végrehajtása."
+
+msgid "Perform the 3D texture lookup."
+msgstr "3D textúra keresés végrehajtása."
+
+msgid "Apply panning function on texture coordinates."
+msgstr "Pásztázó függvény alkalmazása a textúra koordinátákon."
+
+msgid "Apply scaling function on texture coordinates."
+msgstr "Méretező függvény alkalmazása a textúra koordinátákon."
+
+msgid "Cubic texture parameter lookup."
+msgstr "Köbös textúra paraméter keresés."
+
+msgid "2D texture parameter lookup."
+msgstr "2D textúra paraméter keresés."
+
+msgid "2D texture parameter lookup with triplanar."
+msgstr "2D textúra paraméter keresés három síkon."
+
+msgid "2D array of textures parameter lookup."
+msgstr "2D textúra tömb paraméter keresés."
+
+msgid "3D texture parameter lookup."
+msgstr "3D textúra paraméter keresés."
+
+msgid "Transform function."
+msgstr "Transzformációs függvény."
+
+msgid ""
+"Calculate the outer product of a pair of vectors.\n"
+"\n"
+"OuterProduct treats the first parameter 'c' as a column vector (matrix with "
+"one column) and the second parameter 'r' as a row vector (matrix with one "
+"row) and does a linear algebraic matrix multiply 'c * r', yielding a matrix "
+"whose number of rows is the number of components in 'c' and whose number of "
+"columns is the number of components in 'r'."
+msgstr ""
+"Kiszámolja egy vektorpár vektoriális szorzatát.\n"
+"\n"
+"A Vektoriális Szorzat az első paramétert \"c\" oszlopvektorként (egyoszlopos "
+"mátrix), a második paramétert \"r\" sorvektorként (egysoros mátrix) kezeli és "
+"lináris algebrában használt mátrixszorzást alkalmaz \"c * r\", aminek "
+"eredményeképp az eredmény mátrix sorainak száma a \"c\" komponenseinek száma, "
+"az oszlopok száma pedig az \"r\" komponenseinek száma."
+
+msgid "Composes transform from four vectors."
+msgstr "Négy vektorból készít transzformációt."
+
+msgid "Decomposes transform to four vectors."
+msgstr "Négy vektort készít egy transzformációból."
+
+msgid "Calculates the determinant of a transform."
+msgstr "Kiszámítja egy transzformáció determinánsát."
+
+msgid ""
+"Calculates how the object should face the camera to be applied on Model View "
+"Matrix output port for 3D objects."
+msgstr ""
+"Kiszámítja, hogy az objektum hogyan forduljon a kamera felé, ami a 3D "
+"objektum Modell Nézet Mátrix kimenetén kerül alkalmazásra."
+
+msgid "Calculates the inverse of a transform."
+msgstr "Kiszámolja egy transzformáció inverzét."
+
+msgid "Calculates the transpose of a transform."
+msgstr "Kiszámolja egy transzformáció transzponáltját."
+
+msgid "Performs per-component multiplication of two transforms."
+msgstr "Két transzformáció komponensenkénti szorzását hajtja végre."
+
+msgid "Multiplies vector by transform."
+msgstr "Vektorszorzás transzformációval."
+
+msgid "Transform constant."
+msgstr "Transzformáció konstans."
+
+msgid ""
+"The distance fade effect fades out each pixel based on its distance to "
+"another object."
+msgstr ""
+"A távolsági halványítás effekt elhalványítja a pixeleket egy adott "
+"objektumtól mért távolságuk alapján."
+
+msgid ""
+"The proximity fade effect fades out each pixel based on its distance to "
+"another object."
+msgstr ""
+"A közelségi halványítás effekt elhalványítja a pixeleket egy adott "
+"objektumtól mért távolságuk alapján."
+
+msgid "Returns a random value between the minimum and maximum input values."
+msgstr ""
+"Véletlenszerű értéket ad vissza a minimum és maximum bementi étrékek között."
+
+msgid ""
+"Builds a rotation matrix from the given axis and angle, multiply the input "
+"vector by it and returns both this vector and a matrix."
+msgstr ""
+"A megadott tengely és szög alapján forgatási mátrixot hoz létre, megszorozza "
+"vele a bemeneti vektort, majd visszaadja az eredményvektort és a mátrixot is."
+
 msgid "Vector function."
 msgstr "Vektorfüggvény."
 
 msgid "Vector operator."
 msgstr "Vektor operátor."
 
+msgid "Composes vector from scalars."
+msgstr "Skalárokból hoz létre vektort."
+
+msgid "Decomposes vector to scalars."
+msgstr "Vektorból skalárokat hoz létre."
+
+msgid "Composes 2D vector from two scalars."
+msgstr "Két skalárból 2D vektort hoz létre."
+
+msgid "Decomposes 2D vector to two scalars."
+msgstr "2D vektorból két skalárt hoz létre."
+
+msgid "Composes 3D vector from three scalars."
+msgstr "Három skalárból 3D vektort hoz létre."
+
+msgid "Decomposes 3D vector to three scalars."
+msgstr "3D vektorból három skalárt hoz létre."
+
+msgid "Composes 4D vector from four scalars."
+msgstr "Négy skalárból 4D vektort hoz létre."
+
+msgid "Decomposes 4D vector to four scalars."
+msgstr "4D vektorból négy skalárt hoz létre."
+
+msgid "Calculates the cross product of two vectors."
+msgstr "Kiszámítja két vektor vektoriális szorzatát."
+
+msgid ""
+"(Fragment/Light mode only) (Vector) Derivative in 'x' using local "
+"differencing."
+msgstr ""
+"(Csak Töredék/Fény mód) (Vektor) \"x\" deriváltja lokális differenciálással."
+
+msgid ""
+"(Fragment/Light mode only) (Vector) Derivative in 'y' using local "
+"differencing."
+msgstr ""
+"(Csak Töredék/Fény mód) (Vektor) \"y\" deriváltja lokális differenciálással."
+
+msgid "(Vector) Derivative in 'x' using local differencing."
+msgstr "(Vektor) \"x\" deriváltja lokális differenciálással."
+
+msgid "(Vector) Derivative in 'y' using local differencing."
+msgstr "(Vektor) \"y\" deriváltja lokális differenciálással."
+
+msgid "Returns the distance between two points."
+msgstr "Két pont közti távolságot ad vissza."
+
+msgid "Calculates the dot product of two vectors."
+msgstr "Kiszámítja két vektor skaláris szorzatát."
+
+msgid ""
+"Returns the vector that points in the same direction as a reference vector. "
+"The function has three vector parameters : N, the vector to orient, I, the "
+"incident vector, and Nref, the reference vector. If the dot product of I and "
+"Nref is smaller than zero the return value is N. Otherwise -N is returned."
+msgstr ""
+"A referenciavektorral azonos irányba mutató vektort ad vissza. A függvénynek "
+"három vektor paramétere van: N, az irányítandó vektor, I, a sajátvektor, és "
+"Nref, a referencia vektor. Ha I és Nref skaláris szorzata nullánál kisebb, "
+"akkor a visszaadott érték N, egyébként -N."
+
+msgid ""
+"Returns falloff based on the dot product of surface normal and view direction "
+"of camera (pass associated inputs to it)."
+msgstr ""
+"Visszaadja a csökkenés mértékét a felületi normál és a kamera irányának "
+"skaláris szorzata alapján (adja meg a hozzátartozó bemeneteket)."
+
+msgid "Calculates the length of a vector."
+msgstr "Kiszámítja egy vektor hosszát."
+
+msgid "Linear interpolation between two vectors."
+msgstr "Két vektor közötti lineáris interpoláció."
+
+msgid "Linear interpolation between two vectors using scalar."
+msgstr "Két vektor közötti lineáris interpoláció skalárok használatával."
+
+msgid "Performs a fused multiply-add operation (a * b + c) on vectors."
+msgstr ""
+"Egyesített szorzás-összeadás műveletet (a * b + c) hajt vége vektorokon."
+
+msgid "Calculates the normalize product of vector."
+msgstr "Kiszámítja egy vektor normalizált alakját."
+
+msgid "1.0 - vector"
+msgstr "1.0 - vektor"
+
+msgid "1.0 / vector"
+msgstr "1.0 / vektor"
+
+msgid ""
+"Returns the vector that points in the direction of reflection ( a : incident "
+"vector, b : normal vector )."
+msgstr ""
+"Visszaadja a visszaverődés irányába mutató vektort ( a : sajátvektor, b : "
+"normálvektor )."
+
+msgid "Returns the vector that points in the direction of refraction."
+msgstr "Visszaadja a fénytörés irányába mutató vektort."
+
+msgid "Remaps a vector from the input range to the output range."
+msgstr "Átalakít egy vektort a bemeneti tartományból a kimeneti tartományba."
+
+msgid ""
+"Remaps a vector from the input range to the output range. Ranges defined with "
+"scalars."
+msgstr ""
+"Átalakít egy értéket a bemeneti tartományból a kimeneti tartományba. A "
+"tartományok skalárok."
+
+msgid ""
+"SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge0' and 1.0 if 'x' is larger than "
+"'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 using "
+"Hermite polynomials."
+msgstr ""
+"SmoothStep függvény ( vektor(edge0), vektor(edge1), vektor(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge0\", akkor 0.0-t, ha \"x\" nagyobb, mint "
+"\"edge1\", akkor 1.0-t ad vissza. Egyébként a visszaadott érték 0.0 és 1.0 "
+"közé interpolálódik a Hermite polinomok használatával."
+
+msgid ""
+"SmoothStep function( scalar(edge0), scalar(edge1), vector(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge0' and 1.0 if 'x' is larger than "
+"'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 using "
+"Hermite polynomials."
+msgstr ""
+"SmoothStep függvény ( skalár(edge0), skalár(edge1), vektor(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge0\", akkor 0.0-t, ha \"x\" nagyobb, mint "
+"\"edge1\", akkor 1.0-t ad vissza. Egyébként a visszaadott érték 0.0 és 1.0 "
+"közé interpolálódik a Hermite polinomok használatával."
+
+msgid ""
+"Step function( vector(edge), vector(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0."
+msgstr ""
+"Step függvény ( vektor(edge), vektor(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge\", akkor 0.0-t, egyébként 1.0-t ad vissza."
+
+msgid ""
+"Step function( scalar(edge), vector(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0."
+msgstr ""
+"Step függvény ( skalár(edge), vektor(x) ).\n"
+"\n"
+"Ha \"x\" kisebb, mint \"edge\", akkor 0.0-t, egyébként 1.0-t ad vissza."
+
+msgid ""
+"(Fragment/Light mode only) (Vector) Sum of absolute derivative in 'x' and 'y'."
+msgstr ""
+"(Csak Töredék/Fény mód) (Vektor) \"x\" és \"y\" abszolút deriváltjának "
+"összege."
+
+msgid "(Vector) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Vektor) \"x\" és \"y\" abszolút deriváltjának összege."
+
+msgid "Adds 2D vector to 2D vector."
+msgstr "2D vektor hozzáadása 2D vektorhoz."
+
+msgid "Adds 3D vector to 3D vector."
+msgstr "3D vektor hozzáadása 3D vektorhoz."
+
+msgid "Adds 4D vector to 4D vector."
+msgstr "4D vektor hozzáadása 4D vektorhoz."
+
+msgid "Divides 2D vector by 2D vector."
+msgstr "2D vektor osztása 2D vektorral."
+
+msgid "Divides 3D vector by 3D vector."
+msgstr "3D vektor osztása 3D vektorral."
+
+msgid "Divides 4D vector by 4D vector."
+msgstr "4D vektor osztása 4D vektorral."
+
+msgid "Multiplies 2D vector by 2D vector."
+msgstr "2D vektor szorzása 2D vektorral."
+
+msgid "Multiplies 3D vector by 3D vector."
+msgstr "3D vektor szorzása 3D vektorral."
+
+msgid "Multiplies 4D vector by 4D vector."
+msgstr "4D vektor szorzása 4D vektorral."
+
+msgid "Returns the remainder of the two 2D vectors."
+msgstr "A 2D vektorok maradékát adja vissza."
+
+msgid "Returns the remainder of the two 3D vectors."
+msgstr "A 3D vektorok maradékát adja vissza."
+
+msgid "Returns the remainder of the two 4D vectors."
+msgstr "A 4D vektorok maradékát adja vissza."
+
+msgid "Subtracts 2D vector from 2D vector."
+msgstr "2D vektor kivonása 2D vektorból."
+
+msgid "Subtracts 3D vector from 3D vector."
+msgstr "3D vektor kivonása 3D vektorból."
+
+msgid "Subtracts 4D vector from 4D vector."
+msgstr "4D vektor kivonása 4D vektorból."
+
+msgid ""
+"A rectangular area with a description string for better graph organization."
+msgstr "Téglalap alakú terület leírással a jobb grafikon elrendezés érdekében."
+
+msgid ""
+"Custom Godot Shader Language expression, with custom amount of input and "
+"output ports. This is a direct injection of code into the vertex/fragment/"
+"light function, do not use it to write the function declarations inside."
+msgstr ""
+"Egyedi Godot Shader Nyelv kifejezés, állítható mennyiségű bemenettel és "
+"kimenettel. Ez közvetlen kódbeillesztés a vertex/töredék/fény függvénybe, ne "
+"használja függvénydeklarációkra."
+
+msgid ""
+"Custom Godot Shader Language expression, which is placed on top of the "
+"resulted shader. You can place various function definitions inside and call "
+"it later in the Expressions. You can also declare varyings, parameters and "
+"constants."
+msgstr ""
+"Egyedi Godot Shader Nyelv kifejezés, ami az elkészült shader fölé kerül. "
+"Helyezhet bele függvénydefiníciókat és később meghívhatja azokat a "
+"Kifejezésekben. Variálókat, paramétereket és konstansokat is deklarálhat "
+"benne."
+
+msgid "A reference to an existing parameter."
+msgstr "Referencia egy létező paraméterre."
+
+msgid ""
+"Reroute connections freely, can be used to connect multiple input ports to "
+"single output port."
+msgstr ""
+"Szabadon átirányítja a kapcsolatokat, ezzel több bemenet is egyetlen "
+"kimenethez kapcsolható."
+
+msgid "[None]"
+msgstr "[Egyik sem]"
+
+msgid "Visual Shader Mode Changed"
+msgstr "Vizuális Shader Mód Változás"
+
+msgid ""
+"Cannot convert VisualShader to GDShader because VisualShader has embedded "
+"subresources."
+msgstr ""
+"VisualShader nem konvertálható GDShader-re, mert a VisualShader beépülő "
+"alerőforrásokat tartalmaz."
+
+msgid ""
+"Visual Shader conversion cannot convert external dependencies. Resource "
+"references from Nodes will have to be rebound as ShaderParameters on a "
+"Material."
+msgstr ""
+"A Vizuális Shader konverzió külső függőségeket nem tud konvertálni. A Node-ok "
+"erőforrásreferenciáit át kell állítani egy Anyag ShaderParameter-eire."
+
+msgid "Changed Locale Filter Mode"
+msgstr "Területi Beállítás Szűrésmód Változás"
+
+msgid "Show All Locales"
+msgstr "Minden Területi Beállítás Mutatása"
+
+msgid "Show Selected Locales Only"
+msgstr "Csak a Kijelölt Területi Beállítás Mutatása"
+
+msgid "Previewing translation. Click to disable."
+msgstr "Fordítás előnézete. Kattintással letiltható."
+
+msgid "Translation Resource Remap: Add %d Path"
+msgid_plural "Translation Resource Remap: Add %d Paths"
+msgstr[0] "Fordítás Erőforrás Átalakítás: %d Útvonal Hozzáadása"
+msgstr[1] "Fordítás Erőforrás Átalakítás: %d Útvonal Hozzáadása"
+
+msgid "Translation Resource Remap: Add %d Remap"
+msgid_plural "Translation Resource Remap: Add %d Remaps"
+msgstr[0] "Fordítás Erőforrás Átalakítás: %d Beállítás Hozzáadása"
+msgstr[1] "Fordítás Erőforrás Átalakítás: %d Beállítás Hozzáadása"
+
+msgid "Change Resource Remap Language"
+msgstr "Erőforrás Átalakítás Nyelv Változtatása"
+
+msgid "Remove Resource Remap"
+msgstr "Erőforrás Átalakítás Eltávolítása"
+
+msgid "Remove Resource Remap Option"
+msgstr "Erőforrás Átalakítás Opció Eltávolítása"
+
+msgid "Add %d file for template generation"
+msgid_plural "Add %d files for template generation"
+msgstr[0] "%d fájl hozzáadása sablongeneráláshoz"
+msgstr[1] "%d fájl hozzáadása sablongeneráláshoz"
+
+msgid "Remove file from template generation"
+msgstr "Fájl eltávolítása sablongenerálásból"
+
 msgid "Translations"
 msgstr "Fordítások"
 
 msgid "Translations:"
 msgstr "Fordítások:"
 
+msgid "Remaps"
+msgstr "Átalakítások"
+
 msgid "Resources:"
 msgstr "Erőforrások:"
 
+msgid "Remaps by Locale:"
+msgstr "Területi Átalakítások:"
+
+msgid "Files with translation strings:"
+msgstr "Fordítási szövegeket tartalmazó fájlok:"
+
+msgid "Add strings from built-in components such as certain Control nodes."
+msgstr ""
+"Beépített összetevőkből, például bizonyos Control node-okból származó "
+"szövegek hozzáadása."
+
+msgid ""
+"No VCS plugins are available in the project. Install a VCS plugin to use VCS "
+"integration features."
+msgstr ""
+"Nincs elérhető VCS bővítmény a projektben. Tlepítsen egy VCS bővítményt a VCS "
+"integráció igénybevételéhez."
+
+msgid ""
+"Remote settings are empty. VCS features that use the network may not work."
+msgstr ""
+"A távoli beállítások üresek. A hálózatot használó VCS funkciók nem biztos, "
+"hogy működni fognak."
+
+msgid "Commit"
+msgstr "Commit"
+
+msgid "Date:"
+msgstr "Dátum:"
+
+msgid "Subtitle:"
+msgstr "Alcím:"
+
 msgid "File:"
 msgstr "Fájl:"
 
+msgid "Do you want to remove the %s branch?"
+msgstr "El akarja távolítani a(z) %s ágat?"
+
+msgid "Existing VCS metadata files will be overwritten."
+msgstr "A létező VCS metaadat fájlok felülíródnak."
+
 msgid "Password"
 msgstr "Jelszó"
 
@@ -10586,6 +11928,30 @@ msgstr "SSH jelszó"
 msgid "Detect new changes"
 msgstr "Új változások észlelése"
 
+msgid "This operation is IRREVERSIBLE. Your changes will be deleted FOREVER."
+msgstr "Ez a művelet VISSZAFORDÍTHATATLAN. A változtatások ÖRÖKRE elvesznek."
+
+msgid "Commit Message"
+msgstr "Commit Üzenet"
+
+msgid "Commit Changes"
+msgstr "Commit Változások"
+
+msgid "Commit list size"
+msgstr "Commit lista méret"
+
+msgid "Branch Name"
+msgstr "Ág Neve"
+
+msgid "Fetch"
+msgstr "Fetch"
+
+msgid "Pull"
+msgstr "Pull"
+
+msgid "Push"
+msgstr "Push"
+
 msgid "Modified"
 msgstr "Módosított"
 
@@ -10598,9 +11964,289 @@ msgstr "Törölve"
 msgid "Typechange"
 msgstr "Típusmódosítás"
 
+msgid "Unmerged"
+msgstr "Nincs egyesítve"
+
+msgid "View file diffs before committing them to the latest version"
+msgstr ""
+"Fájl különbségek megtekintése, mielőtt a legfrisebb verzióra véglegesítjük"
+
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"A CSGShape3D üres alakzattal rendelkezik.\n"
+"CSGShape3D üres formák általában akkor keletkeznek, ha a mesh nem képezhető "
+"le.\n"
+"A leképezhető mesh szilárd objektumot alkot rések, lyukak vagy elváló élek "
+"nélkül.\n"
+"Minden élnek pontosan két felülethez kell tartoznia."
+
+msgid "CSG operation returned an empty array."
+msgstr "A CSG művelet üres tömböt adott vissza."
+
+msgid ""
+"Can not add a baked mesh as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Égetett mesh nem adható hozzá a jelenet gyökér testvéreként.\n"
+"Mozgassa a CSG gyökér node-ját egy szülő node alá."
+
+msgid "CSG operation returned an empty mesh."
+msgstr "A CSG művelet üres mesh-t adott vissza."
+
+msgid "CSG operation returned an empty shape."
+msgstr "A CSG művelet üres alakzatot adott vissza."
+
+msgid "CSG"
+msgstr "CSG"
+
+msgid "Change CSG Cylinder Height"
+msgstr "CSG Cilinder Magasság Változtatása"
+
+msgid "Change Torus Inner Radius"
+msgstr "Tórusz Belső Sugár Változtatása"
+
+msgid "Change Torus Outer Radius"
+msgstr "Tórusz Külső Sugár Változtatása"
+
+msgid "Range too big."
+msgstr "Túl nagy tartomány."
+
+msgid "Step argument is zero!"
+msgstr "A lépés argumentum nulla!"
+
+msgid "Not a script with an instance."
+msgstr "Nem példányosított szkript."
+
+msgid "Invalid instance dictionary format (missing @path)."
+msgstr "Érvénytelen példány szótár formátum (hiányzó @path)."
+
+msgid "Invalid instance dictionary format (can't load script at @path)."
+msgstr "Érvénytelen példány szótár formátum (nem tölthető be a szkript: @path)."
+
+msgid "Invalid instance dictionary format (invalid script at @path)."
+msgstr "Érvénytelen példány szótár formátum (érvénytelen szkript: @path)."
+
+msgid "Invalid instance dictionary (invalid subclasses)."
+msgstr "Érvénytelen példány szótár (érvénytelen alosztályok)."
+
+msgid "Value of type '%s' can't provide a length."
+msgstr "A(z) \"%s\" típus értéke nem hossz."
+
+msgid ""
+"Invalid type argument for is_instance_of(), use TYPE_* constants for built-in "
+"types."
+msgstr ""
+"Érvénytelen is_instance_of() típus argumentum, használja a beépített TYPE_* "
+"konstanst."
+
+msgid "Type argument is a previously freed instance."
+msgstr "A típus argumentum egy korábban felszabadított példány."
+
+msgid ""
+"Invalid type argument for is_instance_of(), should be a TYPE_* constant, a "
+"class or a script."
+msgstr ""
+"Érvénytelen is_instance_of() típus argumentum, TYPE_* konstans, osztály vagy "
+"skript kell legyen."
+
+msgid "Value argument is a previously freed instance."
+msgstr "Az érték argumentum egy korábban felszabadított példány."
+
+msgid "Export Scene to glTF 2.0 File"
+msgstr "Jelenet Exportálása glTF 2.0 Fájlba"
+
+msgid "Unexpected --version output from Blender executable at: %s."
+msgstr "Váratlan --version kimenet a Blender futtatható állománytól itt: %s."
+
+msgid "Couldn't extract version information from Blender executable at: %s."
+msgstr ""
+"Sikertelen verzió információ kinyerés a Blender futtatható állományból itt: "
+"%s."
+
+msgid ""
+"Found Blender version %d.x, which is too old for this importer (3.0+ is "
+"required)."
+msgstr ""
+"%d.x Blender verzió érzékelve, ami túl régi az importálónak (3.0+ szükséges)."
+
+msgid "Path to Blender executable is valid (Autodetected)."
+msgstr "A Blender futtatható állomány útvonala érvényes (Auto érzékelve)."
+
+msgid ""
+"Blender 3.0+ is required to import '.blend' files.\n"
+"Please provide a valid path to a Blender executable."
+msgstr ""
+"Blender 3.0+ szükséges a \".blend\" fájlok importálásához.\n"
+"Adjon meg egy érvényes útvonalat a Blender futtatható állományhoz."
+
+msgid ""
+"On macOS, this should be the `Contents/MacOS/blender` file within the Blender "
+"`.app` folder."
+msgstr ""
+"MacOS-en ez a `Contents/MacOS/blender` fájl a Blender `.app` mappán belül."
+
+msgid ""
+"Disables Blender '.blend' files import for this project. Can be re-enabled in "
+"Project Settings."
+msgstr ""
+"Kikapcsolja a Blender \".blend\" fájlok importálását ebben a projektben. A "
+"Projekt Beállításokban újra bekapcsolható."
+
+msgid "Disabling '.blend' file import requires restarting the editor."
+msgstr "A \".blend\" fájlok importálása a szerkesztő újraindítását igényli."
+
+msgid "GridMap Delete Selection"
+msgstr "GridMap Szelekció Törlés"
+
+msgid "GridMap Fill Selection"
+msgstr "GridMap Szelekció Kitöltés"
+
+msgid "GridMap Paste Selection"
+msgstr "GridMap Szelekció Beillesztés"
+
+msgid "GridMap Paint"
+msgstr "GridMap Festés"
+
+msgid "Previous Floor"
+msgstr "Előző Padló"
+
+msgid "Next Floor"
+msgstr "Következő Padló"
+
+msgid "Edit X Axis"
+msgstr "X Tengely Módosítása"
+
+msgid "Edit Y Axis"
+msgstr "Y Tengely Módosítása"
+
+msgid "Edit Z Axis"
+msgstr "Z Tengely Módosítása"
+
+msgid "GridMap Settings"
+msgstr "GridMap Beállítások"
+
+msgid "Pick Distance:"
+msgstr "Távolság Választás:"
+
+msgid "Cursor Rotate X"
+msgstr "Kurzor Forgatás X"
+
+msgid "Cursor Rotate Y"
+msgstr "Kurzor Forgatás Y"
+
+msgid "Cursor Rotate Z"
+msgstr "Kurzor Forgatás Z"
+
+msgid ""
+"Change Grid Floor:\n"
+"Previous Plane (%s)\n"
+"Next Plane (%s)"
+msgstr ""
+"Rács Padló Változtatás:\n"
+"Előző Sík (%s)\n"
+"Következő Sík (%s)"
+
+msgid "Give a MeshLibrary resource to this GridMap to use its meshes."
+msgstr "A GridMap mesh-ek használatához adjon hozzá egy MeshLibrary erőforrást."
+
+msgid "Fade-In"
+msgstr "Előtűnés"
+
+msgid "Fade-Out"
+msgstr "Elhalványítás"
+
+msgid "Cross-Fade"
+msgstr "Kettős-Áttűnés"
+
+msgid "Automatic"
+msgstr "Automatikus"
+
+msgid "Using any clip → %s."
+msgstr "Bármely klip → %s."
+
+msgid "Using %s → Any clip."
+msgstr "%s → Bármely klip."
+
+msgid "Using all clips → Any clip."
+msgstr "Minden klip → Bármely klip."
+
+msgid "Clip End"
+msgstr "Klip Vége"
+
+msgctxt "Transition Time Position"
+msgid "Same"
+msgstr "Azonos"
+
+msgid "AudioStreamInteractive Transition Editor"
+msgstr "AudioStreamInteractive Áttűnés Szerkesztő"
+
+msgid "Fade Beats:"
+msgstr "Ütem Áttűnés:"
+
+msgid "Filler Clip:"
+msgstr "Kitöltő Klip:"
+
+msgid "Determining optimal atlas size"
+msgstr "Optimális atlaszméret megállapítása"
+
+msgid "Blitting albedo and emission"
+msgstr "Albedó és kibocsátás Blitting"
+
+msgid "Plotting mesh into acceleration structure %d/%d"
+msgstr "Mesh ábrázolása gyorsítási struktúrába %d/%d"
+
+msgid "Optimizing acceleration structure"
+msgstr "Gyorsítási struktúra optimalizálása"
+
+msgid "Begin Bake"
+msgstr "Égetés Kezdése"
+
+msgid "Class name can't be a reserved keyword"
+msgstr "Az osztály neve nem lehet lefoglalt kulcsszó"
+
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Nincs elég bájt a bájtok dekódolására, vagy hibás formátum."
 
+msgid ""
+"Unable to load .NET runtime, no compatible version was found.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+".NET futtatási környezet betöltése sikertelen, nincs kompatibilis verzió.\n"
+"Projekt létrehozása/módosítása összeomláshoz fog vezetni.\n"
+"\n"
+"Telepítse a .NET SDK 8.0 vagy újabb verzióját a https://get.dot.net címről és "
+"indítsa újra a Godot szoftvert."
+
+msgid ""
+"Unable to find the .NET assemblies directory.\n"
+"Make sure the '%s' directory exists and contains the .NET assemblies."
+msgstr ""
+"A .NET állományok mappája nem található.\n"
+"Ellenőrizze, hogy a \"%s\" mappa létezik és tartalmazza a .NET állományokat."
+
+msgid ""
+"Unable to load .NET runtime, specifically hostfxr.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+".NET futtatási környezet betöltése sikertelen, hostfxr nem található.\n"
+"Projekt létrehozása/módosítása összeomláshoz fog vezetni.\n"
+"\n"
+"Telepítse a .NET SDK 8.0 vagy újabb verzióját a https://get.dot.net címről és "
+"indítsa újra a Godot szoftvert."
+
+msgid "%d (%s)"
+msgstr "%d (%s)"
+
 msgid "%s/s"
 msgstr "%s/s"
 
@@ -10616,23 +12262,857 @@ msgstr "Kimenő RPC"
 msgid "Config"
 msgstr "Konfiguráció"
 
+msgid "Select a replicator node in order to pick a property to add to it."
+msgstr "Tulajdonság hozzáadásához válasszon ki egy replikátor node-ot."
+
+msgid "Property is already being synchronized."
+msgstr "A tulajdonság már szinkronizálódik."
+
+msgid "Add property to synchronizer"
+msgstr "Tulajdonság hozzáadása a szinkronizáláshoz"
+
+msgid "Pick a node to synchronize:"
+msgstr "Válasszon egy node-ot szinkronizáláshoz:"
+
+msgid "Add property to sync..."
+msgstr "Tulajdonság hozzáadása szinkronizáláshoz..."
+
+msgid "Add from path"
+msgstr "Hozzáadás útvonalról"
+
+msgid "Spawn"
+msgstr "Spawn"
+
+msgid ""
+"Add properties using the options above, or\n"
+"drag them from the inspector and drop them here."
+msgstr ""
+"Adjon hozzá tulajdonságokat a fentiek használatával, vagy\n"
+"húzza őket ide az elemzőből."
+
+msgctxt "Replication Mode"
+msgid "Never"
+msgstr "Soha"
+
+msgctxt "Replication Mode"
+msgid "Always"
+msgstr "Mindig"
+
+msgid "The MultiplayerSynchronizer needs a root path."
+msgstr "A MultiplayerSynchronizer gyökér útvonalat igényel."
+
+msgid ""
+"Each MultiplayerSynchronizer can have no more than 64 watched properties."
+msgstr ""
+"Minden MultiplayerSynchronizer maximum 64 megfigyelt tulajdonsággal "
+"rendelkezhet."
+
+msgid "Property of this type not supported."
+msgstr "Ilyen típusú tulajdonság nem támogatott."
+
+msgid ""
+"A valid NodePath must be set in the \"Spawn Path\" property in order for "
+"MultiplayerSpawner to be able to spawn Nodes."
+msgstr ""
+"A MultiplayerSpawner csak akkor tud Node-okat létrehozni, ha érvényes "
+"NodePath van a \"Spawn Útvonal\" tulajdonságban."
+
+msgid ""
+"A valid NodePath must be set in the \"Root Path\" property in order for "
+"MultiplayerSynchronizer to be able to synchronize properties."
+msgstr ""
+"A MultiplayerSynchronizer csak akkor tud tulajdonságokat szinkronizálni, ha "
+"érvényes NodePath van a \"Gyökér Útvonal\" tulajdonságban."
+
 msgid "Create Navigation Polygon"
 msgstr "Navigációs Sokszög Létrehozása"
 
+msgid ""
+"Bakes the NavigationPolygon by first parsing the scene for source geometry "
+"and then creating the navigation polygon vertices and polygons."
+msgstr ""
+"Beégeti a NavigationPolygon-t oly módon, hogy először átnézi a jelenetet "
+"forrás geometriákat keresve, majd létrehozza a navigációs poligon csúcsait és "
+"poligonjait."
+
+msgid "Clears the internal NavigationPolygon outlines, vertices and polygons."
+msgstr "Törli a belső NavigationPolygon körvonalait, csúcsait és poligonjait."
+
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work."
+msgstr ""
+"A node működéséhez beállított NavigationPolygon erőforrásara van szükség."
+
+msgid "Set Obstacle Vertices"
+msgstr "Akadály Csúcsok Beállítása"
+
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "Akadály Módosítás (Kanyar Tükrözés)"
+
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "Akadály Módosítás (Csúcs Hozzáadás)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "Akadály Módosítás (Vertex Mozgatás)"
+
+msgid "Flip"
+msgstr "Tükrözés"
+
 msgid "A NavigationMesh resource must be set or created for this node to work."
 msgstr ""
 "A Node működéséhez hozzá kell rendelni vagy létre kell hozni egy "
 "NavigationMesh erőforrást."
 
+msgid ""
+"Cannot generate navigation mesh because it belongs to a resource which was "
+"imported."
+msgstr ""
+"Navigációs mesh generálása sikertelen, mert importált erőforráshoz tartozik."
+
+msgid ""
+"Cannot generate navigation mesh because the resource was imported from "
+"another type."
+msgstr ""
+"Navigációs mesh generálása sikertelen, mert az erőforrás más típusból volt "
+"importálva."
+
+msgid "Bake"
+msgstr "Égetés"
+
+msgid ""
+"Bakes the NavigationMesh by first parsing the scene for source geometry and "
+"then creating the navigation mesh vertices and polygons."
+msgstr ""
+"Beégeti a NavigationMesh-t oly módon, hogy először átnézi a jelenetet forrás "
+"geometriákat keresve, majd létrehozza a navigációs mesh csúcsait és "
+"poligonjait."
+
+msgid "Clears the internal NavigationMesh vertices and polygons."
+msgstr "Törli a belső NavigationMesh csúcsait és poligonjait."
+
+msgid "Toggles whether the noise preview is computed in 3D space."
+msgstr "A zaj előnézetének 3D térben való kiszámítását kapcsolja."
+
+msgid "Delta"
+msgstr "Delta"
+
+msgid "Combine Diff"
+msgstr "Kombinált Különbség"
+
+msgid "Snapshot A"
+msgstr "Pillanatkép A"
+
+msgid "Snapshot B"
+msgstr "Pillanatkép B"
+
+msgid "Inbound References"
+msgstr "Bejövő Hivatkozások"
+
+msgid "Outbound References"
+msgstr "Kimenő Hivatkozások"
+
+msgid "A"
+msgstr "A"
+
+msgid "Other object referencing this object"
+msgstr "Ezt az objektumot hivatkozó objektum"
+
+msgid "Property of other object referencing this object"
+msgstr "Ezt az objektumot hivatkozó objektum tulajdonsága"
+
+msgid "Property of this object referencing other object"
+msgstr "Ezen objektum más objektumra hivatkozó tulajdonsága"
+
+msgid "Other object being referenced"
+msgstr "A hivatkozott objektum"
+
+msgid "Native Refs"
+msgstr "Natív Hivatkozások"
+
+msgid "ObjectDB Refs"
+msgstr "ObjectDB Hivatkozások"
+
+msgid "Total Refs"
+msgstr "Összes Hivatkozás"
+
+msgid "ObjectDB Cycles"
+msgstr "ObjectDB Ciklusok"
+
+msgid "References not owned by the ObjectDB"
+msgstr "Az ObjectDB által nem birtokolt hivatkozások"
+
+msgid "References owned by the ObjectDB"
+msgstr "Az ObjectDB által birtokolt hivatkozások"
+
+msgid "ObjectDB References + Native References"
+msgstr "ObjectDB Hivatkozások + Natív Hivatkozások"
+
+msgid "Cycles detected in the ObjectDB"
+msgstr "ObjectDB-ben érzékelt ciklusok"
+
+msgid "[center]ObjectDB References[center]"
+msgstr "[center]ObjectDB Hivatkozások[center]"
+
+msgid ""
+"Was the same reference returned by multiple getters on the source object?"
+msgstr "Több getter is ugyanazon hivatkozást adta vissza a forrás objektumon?"
+
+msgid "Sort By %s (Ascending)"
+msgstr "Rendezés: %s (Növekvő)"
+
+msgid "Sort By %s (Descending)"
+msgstr "Rendezés: %s (Csökkenő)"
+
+msgid "Summary"
+msgstr "Összefoglaló"
+
+msgid "ObjectDB Snapshot Summary"
+msgstr "ObjectDB Pillanatkép Összefoglaló"
+
+msgid "Press 'Take ObjectDB Snapshot' to snapshot the ObjectDB."
+msgstr ""
+"Kattintson az \"ObjectDB Pillanatkép Készítés\"-re az ObjectDB "
+"pillanatképéhez."
+
+msgid ""
+"Memory in Godot is either owned natively by the engine or owned by the "
+"ObjectDB."
+msgstr ""
+"A Godot szoftver memórája közvetlenül a motor vagy az ObjectDB tulajdona."
+
+msgid "ObjectDB Snapshots capture only memory owned by the ObjectDB."
+msgstr ""
+"Az ObjectDB Pillanatképek csak az ObjectDB által birtokolt memóriát "
+"tartalmazzák."
+
+msgid ""
+"Multiple root nodes [i](possible call to 'remove_child' without 'queue_free')"
+"[/i]"
+msgstr ""
+"Több gyökér node [i](a \"remove_child\" meghívható \"queue_free\" nélkül)[/i]"
+
+msgid ""
+"RefCounted objects only referenced in cycles [i](cycles often indicate a "
+"memory leaks)[/i]"
+msgstr ""
+"RefCounted objektumok csak ciklusokban vannak hivatkozva [i](a ciklusok "
+"gyakran memóriaszivárgásra utalnak)[/i]"
+
+msgid ""
+"Scripted objects not referenced by any other objects [i](unreferenced objects "
+"may indicate a memory leak)[/i]"
+msgstr ""
+"Szkript objektumok, melyekre nem hivatkozik más objektum [i](hivatkozás "
+"nélküli objektumok memóriaszivárgásra utalhatnak)[/i]"
+
+msgid "Receiving Snapshot (0/%s MiB)"
+msgstr "Pillanatkép Fogadása (0/%s MiB)"
+
+msgid "Receiving Snapshot (%s/%s MiB)"
+msgstr "Pillanatkép Fogadása (%s/%s MiB)"
+
+msgid "Visualizing Snapshot"
+msgstr "Pillanatkép Vizualizálása"
+
+msgid "Take ObjectDB Snapshot"
+msgstr "ObjectDB Pillanatkép Készítése"
+
+msgid "Diff Against:"
+msgstr "Különbség:"
+
+msgid "Rename Actions Localized name"
+msgstr "Művelet Lokalizált Nevének Átnevezése"
+
+msgid ""
+"Internal name of the action. Some XR runtimes don't allow spaces or special "
+"characters."
+msgstr ""
+"A művelet belső neve. Egyes XR környezetek nem engedélyeznek szóközöket vagy "
+"speciális karaktereket."
+
+msgid "Human-readable name of the action. This can be displayed to end users."
+msgstr ""
+"A művelet ember által olvasható neve. Megjeleníthető a végfelhasználóknak."
+
+msgid "Action Localized Name"
+msgstr "Művelet Lokalizált Neve"
+
+msgid "Add interaction profile"
+msgstr "Interakciós profil hozzáadása"
+
+msgid "Save this OpenXR action map."
+msgstr "OpenXR művelettérkép mentése."
+
+msgid "Reset to default OpenXR action map."
+msgstr "Visszaállítás az alapértelmezett OpenXR művelettérképre."
+
+msgid "Rename Action Sets Localized name"
+msgstr "Műveletcsoportok Lokalizált Nevének Átnevezése"
+
+msgid ""
+"Human-readable name of the action set. This can be displayed to end users."
+msgstr ""
+"A műveletcsoport ember által olvasható neve. Megjeleníthető a "
+"végfelhasználóknak."
+
+msgid "Action Set Localized Name"
+msgstr "Műveletcsoport Lokalizált Neve"
+
+msgid ""
+"Priority of the action set. If multiple action sets bind to the same input, "
+"the action set with the highest priority will be updated."
+msgstr ""
+"A műveletcsoport prioritása. Ha több műveletcsoport is ugyanazon bemenetre "
+"van kötve, akkor a legmagasabb prioritású frissül."
+
+msgid "Note: modifiers will only be applied if supported on the host system."
+msgstr ""
+"Megjegyzés: a módosítók csak akkor érvényesülnek, ha a gazdarendszer "
+"támogatja őket."
+
+msgid "Binding modifiers for:"
+msgstr "Társítás módosítók ehhez:"
+
+msgid "Remove action from interaction profile"
+msgstr "Művelet eltávolítása az interakciós profilból"
+
+msgid "Edit binding modifiers"
+msgstr "Társítási módosítók módosítása"
+
+msgid "Note: This interaction profile requires extension %s support."
+msgstr "Megjegyzés: Az interakciós profil %s kiterjesztés támogatást igényel."
+
+msgid "Note: This binding path requires extension %s support."
+msgstr "Megjegyzés: A társítási útvonal %s kiterjesztés támogatást igényel."
+
 msgid "Pose"
 msgstr "Póz"
 
+msgid "Haptic"
+msgstr "Haptikus"
+
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgid "All interaction profiles have been added to the action map."
+msgstr "Minden interakciós profil hozzáadva a művelettérképhez."
+
+msgid ""
+"Cannot use the same SubViewport with multiple OpenXR composition layers. "
+"Clear it from its current layer first."
+msgstr ""
+"Ugyanazon SubViewport nem használható egyszerre több OpenXR kompozíció "
+"rétegen. Először törölje a jelenlegi rétegről."
+
+msgid ""
+"Cannot set SubViewport on an OpenXR composition layer when using an Android "
+"surface."
+msgstr ""
+"Android felület esetén SubViewport nem állítható be OpenXR kompozíció rétegre."
+
+msgid "OpenXR composition layers must have an XROrigin3D node as their parent."
+msgstr ""
+"Az OpenXR kompozíció rétegek XROrigin3D szülő node-dal kell rendelkezzenek."
+
+msgid ""
+"OpenXR composition layers must have orthonormalized transforms (ie. no scale "
+"or shearing)."
+msgstr ""
+"Az OpenXR kompozíció rétegeknek ortonormált transzformációval kell "
+"rendelkezniük (vagyis nem méretezhető (scale) vagy vágható (shear))."
+
+msgid ""
+"Hole punching won't work as expected unless the sort order is less than zero."
+msgstr ""
+"A lyukasztás csak akkor fog megfelelően működni, ha a rendezési sorrend "
+"nullánál kisebb."
+
+msgid "OpenXR visibility mask must have an XRCamera3D node as their parent."
+msgstr ""
+"Az OpenXR láthatósági maszknak XRCamera3D szülő node-dal kell rendelkeznie."
+
+msgid "Building Android Project (gradle)"
+msgstr "Android Projekt Építése (gradle)"
+
+msgid "Unable to connect to Gradle Build Environment service"
+msgstr "Sikertelen kapcsolódás a Gradle Építési Környezet szolgáltatáshoz"
+
+msgid "Package name is missing."
+msgstr "Hiányzó csomagnév."
+
+msgid "Package segments must be of non-zero length."
+msgstr "A csomagszegmensek hossza nullától eltérő kell legyen."
+
+msgid "The character '%s' is not allowed in Android application package names."
+msgstr ""
+"A \"%s\" karakter nem engedélyezett az Android alkalmazások csomagnevében."
+
+msgid "A digit cannot be the first character in a package segment."
+msgstr "A csomagszegmensek első karaktere nem lehet szám."
+
+msgid "The character '%s' cannot be the first character in a package segment."
+msgstr "A csomagszegmensek első karaktere nem lehet \"%s\"."
+
+msgid "The package must have at least one '.' separator."
+msgstr "A csomagnak rendelkeznie kell legalább egy \".\" elválasztóval."
+
 msgid "Error creating keystores directory:"
 msgstr "Hiba a kulcstárolók könyvtárának létrehozásakor"
 
+msgid "Invalid public key for APK expansion."
+msgstr "Érvénytelen nyilvános kulcs az APK bővítéshez."
+
 msgid "Invalid package name:"
 msgstr "Érvénytelen csomagnév:"
 
+msgid "\"Use Gradle Build\" is required to enable \"Swipe to dismiss\"."
+msgstr ""
+"Az \"Elvetés elhúzással\" engedélyezéséhez \"Gradle Használata\" szükséges."
+
+msgid "\"Use Gradle Build\" must be enabled to use the plugins."
+msgstr "A bővítmények használatához \"Gradle Használata\" szükséges."
+
+msgid "Support for \"Use Gradle Build\" on Android is currently experimental."
+msgstr "A \"Gradle Használata\" Androidon jelenleg kísérleti jellegű."
+
+msgid ""
+"\"Compress Native Libraries\" is only valid when \"Use Gradle Build\" is "
+"enabled."
+msgstr ""
+"A \"Natív Könyvtárak Tömörítése\" csak \"Gradle Használata\" mellett érvényes."
+
+msgid "\"Export AAB\" is only valid when \"Use Gradle Build\" is enabled."
+msgstr "Az \"Export AAB\" csak \"Gradle Használata\" mellett érvényes."
+
+msgid "\"Min SDK\" can only be overridden when \"Use Gradle Build\" is enabled."
+msgstr "\"Gradle Használata\" esetén a \"Min SDK\" felülírható."
+
+msgid "\"Min SDK\" should be a valid integer, but got \"%s\" which is invalid."
+msgstr ""
+"A \"Min SDK\" egész szám kell legyen, de \"%s\" szerepel benne, ami "
+"érvénytelen."
+
+msgid ""
+"\"Min SDK\" cannot be lower than %d, which is the version needed by the Godot "
+"library."
+msgstr ""
+"\"Min SDK\" nem lehet kisebb, mint a Godot könyvtár által igényelt verzió: %d."
+
+msgid ""
+"\"Target SDK\" can only be overridden when \"Use Gradle Build\" is enabled."
+msgstr "A \"Cél SDK\" felülírható \"Gradle Használata\" mellett."
+
+msgid ""
+"\"Target SDK\" should be a valid integer, but got \"%s\" which is invalid."
+msgstr ""
+"A \"Cél SDK\" egész szám kell legyen, de \"%s\" szerepel benne, ami "
+"érvénytelen."
+
+msgid "\"Target SDK\" version must be greater or equal to \"Min SDK\" version."
+msgstr ""
+"A \"Cél\" SDK verzió nagyobb vagy egyenlő kell legyen a \"Min SDK\" verzióval."
+
+msgid "\"Use Gradle Build\" is required to add custom theme attributes."
+msgstr "Egyedi téma attribútumok hozzáadásához \"Gradle Használata\" szükséges."
+
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show In Android Tv\"."
+msgstr ""
+"\"Mutatás Android TV-n\" engedélyezéséhez \"Gradle Használata\" szükséges."
+
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show As Launcher App\"."
+msgstr ""
+"A \"Megjelenítés Indító Alkalmazásként\" engedélyezéséhez \"Gradle "
+"Használata\" szükséges."
+
+msgid "\"Use Gradle Build\" must be enabled to disable \"Show In App Library\"."
+msgstr ""
+"A \"Mutatás App Könyvtárban\" kikapcsolásához \"Gradle Használata\" szükséges."
+
+msgid "Mirror Android devices"
+msgstr "Android eszközök tükrözése"
+
+msgid ""
+"If enabled, \"scrcpy\" is used to start the project and automatically stream "
+"device display (or virtual display) content."
+msgstr ""
+"Ha be van kapcsolva, akkor \"scrcpy\" használatával indul el a projekt és "
+"automatikusan átjátssza az eszköz képernyőjének (vagy virtuális "
+"képernyőjének) tartalmát."
+
+msgid ""
+"Could not start scrcpy executable. Configure scrcpy path in the Editor "
+"Settings (Export > Android > scrcpy > Path)."
+msgstr ""
+"A scrcpy nem indítható el. Állítsa be a scrcpy útvonalat a Szerkesztő "
+"Beállításokban (Export > Android > scrcpy > Útvonal)."
+
+msgid "Error: There was a problem validating the keystore username and password"
+msgstr ""
+"Hiba: A kulcstár felhasználónevének és jelszavának érvényesítése problémába "
+"ütközött"
+
+msgid ""
+"Unable to determine the C# project's TFM, it may be incompatible. The export "
+"template only supports '%s'. Make sure the project targets '%s' or consider "
+"using gradle builds instead."
+msgstr ""
+"A C# projekt cél keretrendszere nem meghatározható, lehet, hogy nem "
+"kompatibilis. Az export sablon csak \"%s\"-t támogat. Ellenőrizze, hogy a "
+"projekt a(z) \"%s\"-t célozza vagy használjon gradle építést."
+
+msgid ""
+"C# project targets '%s' but the export template only supports '%s'. Consider "
+"using gradle builds instead."
+msgstr ""
+"A C# projekt célja \"%s\", de az export sablon csak \"%s\"-t támogat. "
+"Használjon helyette gradle építést."
+
+msgid "Exporting to Android when using C#/.NET is experimental."
+msgstr "C#/.NET exportálása Androidra csak kísérleti jellegű."
+
+msgid ""
+"Android build template not installed in the project. Install it from the "
+"Project menu."
+msgstr ""
+"Az Android építési sablon nincs a projektben telepítve. Telepítse a Projekt "
+"menüből."
+
+msgid ""
+"Either Debug Keystore, Debug User AND Debug Password settings must be "
+"configured OR none of them."
+msgstr ""
+"A Kulcstár Hibakeresés, Felhasználó Hibakeresés és Jelszó Hibakeresés "
+"mindegyike egyszerre kötelező (vagy mind üres kell legyen)."
+
+msgid "Debug keystore not configured in the Editor Settings nor in the preset."
+msgstr ""
+"A kulcstár hibakeresés sem a Szerkesztő Beállításokban, sem az "
+"előbeállításban (preset) nincs konfigurálva."
+
+msgid ""
+"Either Release Keystore, Release User AND Release Password settings must be "
+"configured OR none of them."
+msgstr ""
+"A Kulcstár Release, Felhasználó Release és Jelszó Release mindegyike "
+"egyszerre kötelező (vagy mind üres kell legyen)."
+
+msgid "Release keystore incorrectly configured in the export preset."
+msgstr ""
+"A kulcstár release sem a Szerkesztő Beállításokban, sem az export "
+"előbeállításban (preset) nincs konfigurálva."
+
+msgid "A valid Java SDK path is required in Editor Settings."
+msgstr "Érvényes Java SDK útvonal szükséges a Szerkesztő Beállításokban."
+
+msgid "Invalid Java SDK path in Editor Settings."
+msgstr "Érvénytelen Java SDK útvonal a Szerkesztő Beállításokban."
+
+msgid "Unable to find 'java' command using the Java SDK path."
+msgstr "A \"java\" parancs nem található a Java SDK útvonalán."
+
+msgid "Please check the Java SDK directory specified in Editor Settings."
+msgstr "Ellenőrizze a Szerkesztő Beállításokban megadott Java SDK mappát."
+
+msgid "A valid Android SDK path is required in Editor Settings."
+msgstr "Érvényes Android SDK útvonal szükséges a Szerkesztő Beállításokban."
+
+msgid "Invalid Android SDK path in Editor Settings."
+msgstr "Érvénytelen Android SDK útvonal a Szerkesztő Beállításokban."
+
+msgid "Missing 'platform-tools' directory!"
+msgstr "Hiányzó \"platform-tools\" mappa!"
+
+msgid "Unable to find Android SDK platform-tools' adb command."
+msgstr "Nem található az Android SDK platformeszköz adb parancsa."
+
+msgid "Please check in the Android SDK directory specified in Editor Settings."
+msgstr "Ellenőrizze a Szerkesztő Beállításokban megadott Android SDK mappát."
+
+msgid "Missing 'build-tools' directory!"
+msgstr "Hiányzó \"build-tools\" mappa!"
+
+msgid "Unable to find Android SDK build-tools' apksigner command."
+msgstr "Nem található az Android SDK építési eszközök apksigner parancsa."
+
+msgid "\"Use Gradle Build\" is required for transparent background on Android"
+msgstr "Android kötelező a \"Gradle Használata\" az átlátszó hátterekhez"
+
+msgid ""
+"\"Target SDK\" %d is higher than the default version %d. This may work, but "
+"wasn't tested and may be unstable."
+msgstr ""
+"A \"Cél SDK\" %d újabb, mint az alapértelmezett %d verzió. Működhet, de nincs "
+"tesztelve és instabil lehet."
+
+msgid ""
+"The \"%s\" renderer is designed for Desktop devices, and is not suitable for "
+"Android devices."
+msgstr ""
+"A(z) \"%s\" rendermotor Asztali eszközökre van tervezve és nem alkalmas "
+"Android eszközökre."
+
+msgid ""
+"The project name does not meet the requirement for the package name format "
+"and will be updated to \"%s\". Please explicitly specify the package name if "
+"needed."
+msgstr ""
+"A projekt neve nem felel meg a csomagnév feltételeinek és frissülni fog erre: "
+"\"%s\". Ha szükséges, adjon meg egy másik csomagnevet."
+
+msgid "AAB signing is not supported"
+msgstr "AAB aláírás nem támogatott"
+
+msgid ""
+"All 'apksigner' tools located in Android SDK 'build-tools' directory failed "
+"to execute. Please check that you have the correct version installed for your "
+"target sdk version. The resulting APK is unsigned."
+msgstr ""
+"Az Android SDK \"build-tools\" mappájában lévő összes \"apksigner\" eszköz "
+"hibába ütközött. Ellenőrizze, hogy az sdk verzióhoz megfelelő verzió van "
+"telepítve. A létrejött APK nincs aláírva."
+
+msgid ""
+"'apksigner' could not be found. Please check that the command is available in "
+"the Android SDK build-tools directory. The resulting APK is unsigned."
+msgstr ""
+"\"apksigner\" nem található. Ellenőrizze, hogy a parancs elérhető az Android "
+"SDK build-tools mappájában. A létrejött APK nincs aláírva."
+
+msgid "'apksigner' returned with error #%d"
+msgstr "Az \"apksigner\" #%d hibakóddal tért vissza"
+
+msgid "Unable to verify signed apk."
+msgstr "Az aláírt apk nem ellenőrizhető."
+
+msgid "'apksigner' verification of APK failed."
+msgstr "APK ellenőrzése sikertelen \"apksigner\"-rel."
+
+msgid "Invalid filename! Android App Bundle requires the *.aab extension."
+msgstr ""
+"Érvénytelen fájlnév! Az Android App Bundle az *.aab kiterjesztést igényli."
+
+msgid "APK Expansion not compatible with Android App Bundle."
+msgstr "Az APK Bővítés nem kompatibilis az Android App Bundle-lel."
+
+msgid "Invalid filename! Android APK requires the *.apk extension."
+msgstr "Érvénytelen fájlnév! Az Android APK az *.apk kiterjesztést igényli."
+
+msgid "Unsupported export format!"
+msgstr "Nem támogatott export formátum!"
+
+msgid ""
+"Trying to build from a gradle built template, but no version info for it "
+"exists. Please reinstall from the 'Project' menu."
+msgstr ""
+"Építés gradle által készített sablonból, de nincs hozzátartozó "
+"verzióinformáció. Telepítse újra a \"Projekt\" menüből."
+
+msgid ""
+"Java SDK path must be configured in Editor Settings at 'export/android/"
+"java_sdk_path'."
+msgstr ""
+"A Java SDK útvonal beállítása szükséges a Szerkesztő Bállításokban: \"export/"
+"android/java_sdk_path\"."
+
+msgid ""
+"Android SDK path must be configured in Editor Settings at 'export/android/"
+"android_sdk_path'."
+msgstr ""
+"Az Android SDK útvonal beállítása szükséges a Szerkesztő Bállításokban: "
+"\"export/android/android_sdk_path\"."
+
+msgid "Unable to overwrite res/*.xml files with project name."
+msgstr "A projekt nevével nem írhatóak res/*.xml fájlok."
+
+msgid "Could not generate sparse pck metadata!"
+msgstr "Nem sikerült a ritka pck fájl metaadatainak írása!"
+
+msgid "Could not write expansion package file!"
+msgstr "A bővítőcsomag fájl nem írható!"
+
+msgid "Building of Android project failed, check output for the error:"
+msgstr "Az Android projekt építése sikertelen, ellenőrizze a kimeneti hibákat:"
+
+msgid "Moving output"
+msgstr "Kimenet áthelyezése"
+
+msgid ""
+"Missing libraries in the export template for the selected architectures: %s. "
+"Please build a template with all required libraries, or uncheck the missing "
+"architectures in the export preset."
+msgstr ""
+"Hiányzó könyvtárak a kiválasztott architektúra export sablonjában: %s. "
+"Építsen olyan sablonból, amelyben minden könyvtár elérhető vagy ne használja "
+"a hiányzó architektúrákat az export sablonban."
+
+msgid "Aligning APK..."
+msgstr "APK rendezése..."
+
+msgid "Could not unzip temporary unaligned APK."
+msgstr "Az ideiglenes rendezetlen APK kicsomagolása sikertelen."
+
+msgid "Metal renderer require iOS 14+."
+msgstr "iOS 14+ szükséges a Metal rendermotorhoz."
+
+msgid ""
+"Mismatching custom export template executable architecture: found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Eltérő egyedi export sablon futtatási architektúra: \"%s\" érzékelve, elvárt: "
+"\"%s\"."
+
+msgid "Debug Console Export"
+msgstr "Hibakereső Konzol Export"
+
+msgid ""
+"Mismatching custom debug export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Eltérő egyedi hibakereső export sablon futtatási architektúra: \"%s\" "
+"érzékelve, elvárt: \"%s\"."
+
+msgid ""
+"Mismatching custom release export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Eltérő egyedi release export sablon futtatási architektúra: \"%s\" érzékelve, "
+"elvárt: \"%s\"."
+
+msgid "Executable file header corrupted."
+msgstr "Sérült futtatható fájl fejléc."
+
+msgid "32-bit executables cannot have embedded data >= 4 GiB."
+msgstr ""
+"A 32 bites futtatható állományok nem tartalmazhatnak 4 GiB-nál több adatot."
+
+msgid "Executable \"pck\" section not found."
+msgstr "Nem található futtatható \"pck\" szakasz."
+
+msgid "Stop and uninstall"
+msgstr "Leállítás és eltávolítás"
+
+msgid "Run on remote Linux/BSD system"
+msgstr "Futtatás távoli Linux/BSD rendszeren"
+
+msgid "Stop and uninstall running project from the remote system"
+msgstr "A futó projekt távoli rendszeren történő leállítása és eltávolítása"
+
+msgid "Run exported project on remote Linux/BSD system"
+msgstr "Exportált projekt futtatása távoli Linux/BSD rendszeren"
+
+msgid "App Store distribution with ad-hoc code signing is not supported."
+msgstr "Ad-hoc kód aláírással kiadás az App Store-ban nem támogatott."
+
+msgid "Notarization with an ad-hoc signature is not supported."
+msgstr "Hitelesítés ad-hoc aláírással nem támogatott."
+
+msgid "Apple Team ID is required for App Store distribution."
+msgstr "Az App Store-ban kiadáshoz Apple Team ID szükséges."
+
+msgid "Apple Team ID is required for notarization."
+msgstr "Hitelesítéshez Apple Team ID szükséges."
+
+msgid "Provisioning profile is required for App Store distribution."
+msgstr "Az App Store-ban kiadáshoz kiadási profil szükséges."
+
+msgid "Installer signing identity is required for App Store distribution."
+msgstr "Az App Store-ban kiadáshoz telepítő aláíró identitás szükséges."
+
+msgid "App sandbox is required for App Store distribution."
+msgstr "Az App Store-ban kiadáshoz App sandbox szükséges."
+
+msgid ""
+"'rcodesign' doesn't support signing applications with embedded dynamic "
+"libraries (GDExtension or .NET)."
+msgstr ""
+"Az \"rcodesign\" nem támogatja a beépített dinamikus könyvtárakat tartalmazó "
+"applikációk aláírását (GDExtension vagy .NET)."
+
+msgid "Code signing is required for App Store distribution."
+msgstr "Az App Store-ban kiadáshoz kód aláírás szükséges."
+
+msgid "Code signing is required for notarization."
+msgstr "Hitelesítéshez kód aláírás szükséges."
+
+msgid ""
+"Neither Apple ID name nor App Store Connect issuer ID name not specified."
+msgstr "Sem az Apple ID, sem az App Store Connect kiadó ID neve nincs megadva."
+
+msgid ""
+"Both Apple ID name and App Store Connect issuer ID name are specified, only "
+"one should be set at the same time."
+msgstr ""
+"Az Apple ID név és az App Store Connect kiadó ID név is meg van adva, de "
+"egyszerre csak az egyik adható meg."
+
+msgid "Apple ID password not specified."
+msgstr "Nincs megadva az Apple ID jelszó."
+
+msgid "App Store Connect API key ID not specified."
+msgstr "Nincs megadva az App Store Connect API kulcs."
+
+msgid "App Store Connect issuer ID name not specified."
+msgstr "Nincs megadva az App Store Connect kiadó ID neve."
+
+msgid "Microphone access is enabled, but usage description is not specified."
+msgstr "Engedélyezve van a mikrofon hozzáférés, de a használati leírás üres."
+
+msgid "Camera access is enabled, but usage description is not specified."
+msgstr "Engedélyezve van a kamera hozzáférés, de a használati leírás üres."
+
+msgid ""
+"Location information access is enabled, but usage description is not "
+"specified."
+msgstr "Engedélyezve van a helyzetmeghatározás, de a használati leírás üres."
+
+msgid "Address book access is enabled, but usage description is not specified."
+msgstr "Engedélyezve van a címjegyzék hozzáférés, de a használati leírás üres."
+
+msgid "Calendar access is enabled, but usage description is not specified."
+msgstr "Engedélyezve van a naptár hozzáférés, de a használati leírás üres."
+
+msgid "Photo library access is enabled, but usage description is not specified."
+msgstr ""
+"Engedélyezve van a fotó galéria hozzáférés, de a használati leírás üres."
+
+msgid "Liquid Glass Icons"
+msgstr "Liquid Glass ikonok"
+
+msgid "At least version 26.0 of 'actool' is required (version %f found)."
+msgstr "Az \"actool\" legalább 26.0-s verziója szükséges (%f érzékelve)."
+
+msgid ""
+"rcodesign path is not set. Configure rcodesign path in the Editor Settings "
+"(Export > macOS > rcodesign)."
+msgstr ""
+"rcodesign útvonal nincs beállítva. Adja meg az rcodesign útvonalát a "
+"Szerkesztő Beállításokban (Export > macOS > rcodesign)."
+
+msgid "Notarization failed, see editor log for details."
+msgstr "Hitelesítés sikertelen, részletek a szerkesztő naplójában."
+
+msgid "Notarization request UUID: \"%s\""
+msgstr "Hitelesítés kérés UUID: \"%s\""
+
+msgid "The notarization process generally takes less than an hour."
+msgstr "A hitelesítési folyamat jellemzően egy óránál kevesebbet vesz igénybe."
+
+msgid ""
+"You can check the progress manually by opening a Terminal and running the "
+"following command:"
+msgstr ""
+"A folyamatot manuálisan ellenőrizheti az alábbi paranccsal egy Terminálban:"
+
+msgid ""
+"Run the following command to staple the notarization ticket to the exported "
+"application (optional):"
+msgstr ""
+"Futtassa a következő parancsot a hitelesítési jegy exportált applikációhoz "
+"csatolásához (opcionális):"
+
+msgid "Xcode command line tools are not installed."
+msgstr "A parancssori Xcode eszközök nincsenek telepítve."
+
 msgid ""
 "See instructions on finding your team ID: https://developer.apple.com/help/"
 "glossary/team-id"
@@ -10640,12 +13120,346 @@ msgstr ""
 "Lásd az instrukciókat csapat azonosító kód megkereséséhez: https://"
 "developer.apple.com/help/glossary/team-id"
 
+msgid "Built-in CodeSign failed with error \"%s\"."
+msgstr "A beépített CodeSign hibára futott: \"%s\"."
+
+msgid ""
+"Xrcodesign path is not set. Configure rcodesign path in the Editor Settings "
+"(Export > macOS > rcodesign)."
+msgstr ""
+"Az Xrcodesign útvonal nincs beállítva. Adja meg az rcodesign útvonalát a "
+"Szerkesztő Beállításokban (Export > macOS > rcodesign)."
+
+msgid ""
+"Could not start codesign executable, make sure Xcode command line tools are "
+"installed."
+msgstr ""
+"A codesign futtatható állomány nem indítható el, ellenőrizze, hogy az Xcode "
+"parancssori eszközök telepítve vannak-e."
+
+msgid "Relative symlinks are not supported, exported \"%s\" might be broken!"
+msgstr ""
+"A relatív szimbolikus linkek nem támogatottak, az exportált \"%s\" nem "
+"biztos, hogy működik!"
+
+msgid "\"%s\": Info.plist missing or invalid, new Info.plist generated."
+msgstr ""
+"\"%s\": Info.plist hiányzik vagy érvénytelen, új Info.plist generálódott."
+
+msgid "`productbuild` failed."
+msgstr "`productbuild` sikertelen."
+
+msgid "`hdiutil create` failed - file exists."
+msgstr "`hdiutil create` sikertelen - a fájl már létezik."
+
+msgid "`hdiutil create` failed."
+msgstr "`hdiutil create` sikertelen."
+
+msgid ""
+"Relative symlinks are not supported on this OS, the exported project might be "
+"broken!"
+msgstr ""
+"A relatív szimbolikus linkek nem támogatottak ezen az operációs rendszeren, "
+"az exportált projekt nem biztos, hogy működik!"
+
+msgid ""
+"Unable to set Unix permissions for executable \"%s\". Use \"chmod +x\" to set "
+"it after transferring the exported .app to macOS or Linux."
+msgstr ""
+"Unix engedélyek beállítása sikertelen a(z) \"%s\" futtatható állományon. "
+"Használja a \"chmod +x\" parancsot az exportált .app macOS-re vagy Linux-ra "
+"mozgatása után."
+
+msgid ""
+"Requested template binary \"%s\" not found. It might be missing from your "
+"template archive."
+msgstr ""
+"A kért bináris sablon \"%s\" nem található. Lehet, hogy hiányzik a sablon "
+"archívumból."
+
+msgid "Making PKG"
+msgstr "PKG készítés"
+
+msgid ""
+"Ad-hoc signed applications require the 'Disable Library Validation' "
+"entitlement to load dynamic libraries."
+msgstr ""
+"Ad-hoc módon aláírt applikációk esetén dinamikus könyvtárak betöltéséhez a "
+"\"Könyvtár Validáció Letiltás\" jogosultság szükséges."
+
+msgid ""
+"'rcodesign' doesn't support signing applications with embedded dynamic "
+"libraries."
+msgstr ""
+"Az \"rcodesign\" nem támogatja a beépített dinamikus könyvtárakat tartalmazó "
+"applikációk aláírását."
+
+msgid "Code signing bundle"
+msgstr "Kód aláíró csomag"
+
+msgid "Making DMG"
+msgstr "DMG készítés"
+
+msgid "Code signing DMG"
+msgstr "DMG kód aláírás"
+
+msgid "Making PKG installer"
+msgstr "PKG telepítő készítés"
+
+msgid "Making ZIP"
+msgstr "ZIP készítés"
+
+msgid ""
+"Notarization requires the app to be archived first, select the DMG or ZIP "
+"export format instead."
+msgstr ""
+"A hitelesítéshez először archiválni kell az app-ot, válassza helyette a DMG "
+"vagy ZIP export formátumot."
+
+msgid "Sending archive for notarization"
+msgstr "Archívum küldése hitelesítésre"
+
+msgid ""
+"Cannot export for universal or x86_64 if S3TC BPTC texture format is "
+"disabled. Enable it in the Project Settings (Rendering > Textures > VRAM "
+"Compression > Import S3TC BPTC)."
+msgstr ""
+"Univerzálisan vagy x86_64-re exportálás nem lehetséges, ha az S3TC BPTC "
+"textúra formátum le van tiltva. Engedélyezze a Projekt Beállításokban "
+"(Renderelés > Textúrák > VRAM tömörítés > Import S3TC BPTC)."
+
+msgid ""
+"Cannot export for universal or arm64 if ETC2 ASTC texture format is disabled. "
+"Enable it in the Project Settings (Rendering > Textures > VRAM Compression > "
+"Import ETC2 ASTC)."
+msgstr ""
+"Univerzálisan vagy arm64-re exportálás nem lehetséges, ha az ETC2 ASTC "
+"textúra formátum le van tiltva. Engedélyezze a Projekt Beállításokban "
+"(Renderelés > Textúrák > VRAM tömörítés > Import ETC2 ASTC)."
+
+msgid "Notarization: Xcode command line tools are not installed."
+msgstr "Hitelesítés: a parancssori Xcode eszközök nincsenek telepítve."
+
+msgid ""
+"Notarization: rcodesign path is not set. Configure rcodesign path in the "
+"Editor Settings (Export > macOS > rcodesign)."
+msgstr ""
+"Hitelesítés: rcodesign útvonal nincs beállítva. Adja meg az rcodesign "
+"útvonalát a Szerkesztő Beállításokban (Export > macOS > rcodesign)."
+
+msgid ""
+"Warning: Notarization is disabled. The exported project will be blocked by "
+"Gatekeeper if it's downloaded from an unknown source."
+msgstr ""
+"Figyelmeztetés: Hitelesítés letiltva. Az exportált projektet blokkolni fogja "
+"a Gatekeeper, amennyiben ismeretlen forrásból töltik le."
+
+msgid ""
+"Code signing is disabled. The exported project will not run on Macs with "
+"enabled Gatekeeper and Apple Silicon powered Macs."
+msgstr ""
+"Kód alírás letiltva. Az exportált projekt nem fog futni azon Mac gépeken, "
+"amiken a Gatekeeper engedélyezve van, továbbá az Apple Silicon alapú Mac "
+"gépeken."
+
+msgid ""
+"Code signing: Using ad-hoc signature. The exported project will be blocked by "
+"Gatekeeper"
+msgstr ""
+"Kód aláírás: Ad-hoc aláírás van használatban. Az exportált projektet "
+"blokkolni fogja a Gatekeeper"
+
+msgid "Code signing: Xcode command line tools are not installed."
+msgstr "Kód aláírás: A parancssori Xcode eszközök nincsenek telepítve."
+
+msgid ""
+"Code signing: rcodesign path is not set. Configure rcodesign path in the "
+"Editor Settings (Export > macOS > rcodesign)."
+msgstr ""
+"Kód aláírás: rcodesign útvonal nincs beállítva. Adja meg az rcodesign "
+"útvonalát a Szerkesztő Beállításokban (Export > macOS > rcodesign)."
+
+msgid "Run on remote macOS system"
+msgstr "Futtatás távoli macOS rendszeren"
+
+msgid "Run exported project on remote macOS system"
+msgstr "Exportált projekt futtatása távoli macOS rendszeren"
+
+msgid "PWA"
+msgstr "PWA"
+
+msgid ""
+"Exporting to Web is currently not supported in Godot 4 when using C#/.NET. "
+"Use Godot 3 to target Web with C#/Mono instead."
+msgstr ""
+"Exportálás Web platformra jelenleg nem támogatott a Godot 4-ben C#/.NET "
+"használata mellett. Használja a Godot 3-mat a Web platformhoz C#/Mono "
+"segítségével."
+
+msgid ""
+"If this project does not use C#, use a non-C# editor build to export the "
+"project."
+msgstr ""
+"Ha ez a projekt nem használja a C# nyelvet, használja a C# nélküli "
+"szerkesztőt a projekt exportálásához."
+
 msgid "Run in Browser"
 msgstr "Böngészőben futtatás"
 
+msgid "Stop HTTP Server"
+msgstr "HTTP Szerver Leállítás"
+
 msgid "Run exported HTML in the system's default browser."
 msgstr "Az exportált HTML futtatása az alapértelmezett böngészőben."
 
+msgid "Export project again to account for updates."
+msgstr "A frissítések figyelembevételéhez exportálja a projektet újra."
+
+msgid "Icon size \"%d\" is missing."
+msgstr "Ikon méret \"%d\" hiányzik."
+
+msgid "Could not find signtool executable at \"%s\"."
+msgstr "A signtool futtatható állomány nem található itt: \"%s\"."
+
+msgid "Could not find osslsigncode executable at \"%s\"."
+msgstr "Az osslsigncode futtatható állomány nem található itt: \"%s\"."
+
+msgid ""
+"Could not start signtool executable. Configure signtool path in the Editor "
+"Settings (Export > Windows > signtool), or disable \"Codesign\" in the export "
+"preset."
+msgstr ""
+"A signtool futtatható állomány nem indítható el. Adja meg a signtool "
+"útvonalát a Szerkesztő Beállításokban (Export > Windows > signtool), vagy "
+"tiltsa le a \"Codesign\"-t az export előbeállításban (preset)."
+
+msgid ""
+"Could not start osslsigncode executable. Configure signtool path in the "
+"Editor Settings (Export > Windows > osslsigncode), or disable \"Codesign\" in "
+"the export preset."
+msgstr ""
+"Az osslsigncode futtatható állomány nem indítható el. Adja meg a signtool "
+"útvonalát a Szerkesztő Beállításokban (Export > Windows > osslsigncode), vagy "
+"tiltsa le a \"Codesign\"-t az export előbeállításban (preset)."
+
+msgid "Windows executables cannot be >= 4 GiB."
+msgstr "Windows-on a futtatható állományok nem lehetnek 4 GiB-nál nagyobbak."
+
+msgid "Run on remote Windows system"
+msgstr "Futtatás távoli Windows rendszeren"
+
+msgid "Run exported project on remote Windows system"
+msgstr "Exportált projekt futtatása távoli Windows rendszeren"
+
+msgid ""
+"A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
+"property in order for AnimatedSprite2D to display frames."
+msgstr ""
+"Az AnimatedSprite2D \"Sprite Képkockák\" tulajdonságában be kell állítani a "
+"\"SpriteFrames\" erőforrást a képkockák megjelenítéséhez."
+
+msgid ""
+"Ancestor \"%s\" clips its children, so this CanvasGroup will not function "
+"properly."
+msgstr ""
+"A(z) \"%s\" ős és gyermekei összeérnek, ezért a CanvasGroup nem fog jól "
+"működni."
+
+msgid ""
+"Ancestor \"%s\" is a CanvasGroup, so this CanvasGroup will not function "
+"properly."
+msgstr ""
+"A(z) \"%s\" ős egy CanvasGroup, ezért ez a CanvasGroup nem fog jól működni."
+
+msgid ""
+"Only one visible CanvasModulate is allowed per canvas.\n"
+"When there are more than one, only one of them will be active. Which one is "
+"undefined."
+msgstr ""
+"Vásznanként csak egy látható CanvasModulate engedélyezett.\n"
+"Ha egynél több van, akkor is csak egy lesz aktív, de nem ismert, hogy melyik."
+
+msgid ""
+"CPUParticles2D animation requires the usage of a CanvasItemMaterial with "
+"\"Particles Animation\" enabled."
+msgstr ""
+"A CPUParticles2D animációhoz CanvasItemMaterial használata szükséges "
+"engedélyezett \"Részecske Animáció\" opcióval."
+
+msgid ""
+"A material to process the particles is not assigned, so no behavior is "
+"imprinted."
+msgstr ""
+"Nincs anyag beállítva a részecskék feldogozásához, ezért nincs viselkedés "
+"lenyomat."
+
+msgid ""
+"Particles2D animation requires the usage of a CanvasItemMaterial with "
+"\"Particles Animation\" enabled."
+msgstr ""
+"A Particles2D animációhoz CanvasItemMaterial használata szükséges "
+"engedélyezett \"Részecske Animáció\" opcióval."
+
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile renderer."
+msgstr ""
+"A részecske nyomvonalak csak Forward+ vagy Mobile rendermotorok esetén "
+"elérhetőek."
+
+msgid ""
+"Particle sub-emitters are not available when using the Compatibility renderer."
+msgstr ""
+"A részecske al-kibocsátás nem elérhető Compatibility rendermotor esetén."
+
+msgid ""
+"A texture with the shape of the light must be supplied to the \"Texture\" "
+"property."
+msgstr ""
+"A fényforrás alakjával egyező textúra megadása szükséges a \"Textúra\" "
+"tulajdonságban."
+
+msgid ""
+"An occluder polygon must be set (or drawn) for this occluder to take effect."
+msgstr ""
+"Egy occluder sokszög beállítása (vagy rajzolása) szükséges az okklúzió "
+"működéséhez."
+
+msgid "The occluder polygon for this occluder is empty. Please draw a polygon."
+msgstr "Az okklúzióhoz tartozó occluder sokszög üres. Rajzoljon egy sokszöget."
+
+msgid ""
+"The NavigationAgent2D can be used only under a Node2D inheriting parent node."
+msgstr "A NavigationAgent2D csak Node2D-t öröklő szülő node alatt használható."
+
+msgid ""
+"NavigationLink2D start position should be different than the end position to "
+"be useful."
+msgstr ""
+"A NavigationLink2D kezdő pozíciója el kell térjen a végpozíciótól, hogy "
+"hasznos lehessen."
+
+msgid "NavigationObstacle2D does not support negative or zero scaling."
+msgstr "A NavigationObstacle2D nem támogatja a nulla vagy negatív méretezést."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest value along the "
+"two axes of the global scale will be used to scale the radius. This value may "
+"change in unexpected ways when the node is rotated."
+msgstr ""
+"Az ügynök sugara csak egyenletesen méretezhető. A globális skála két "
+"tengelyén lévő legnagyobb érték határozza meg a méretezés sugarát. Ez az "
+"érték váratlan módon változhat, ha a node elfordul."
+
+msgid "Skew has no effect on the agent radius."
+msgstr "A ferdeség (skew) nincs hatással az ügynök sugarára."
+
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work. "
+"Please set a property or draw a polygon."
+msgstr ""
+"A node működéséhez beállított NavigationPolygon erőforrás szükséges. Állítsa "
+"be a tulajdonságot, vagy rajzoljon egy sokszöget."
+
 msgid ""
 "ParallaxLayer node only works when set as child of a ParallaxBackground node."
 msgstr ""
@@ -10656,9 +13470,54 @@ msgid "PathFollow2D only works when set as a child of a Path2D node."
 msgstr ""
 "A PathFollow2D Node csak akkor működik, ha gyermeke egy Path2D Node-nak."
 
+msgid ""
+"This node has no shape, so it can't collide or interact with other objects.\n"
+"Consider adding a CollisionShape2D or CollisionPolygon2D as a child to define "
+"its shape."
+msgstr ""
+"Ennek a node-nak nincs alakja, ezért nem ütközhet és nem léphet interakcióba "
+"más objektumokkal.\n"
+"Az alak definiálásához adjon hozzá gyermekként egy CollisionShape2D-t vagy "
+"CollisionPolygon2D-t."
+
+msgid ""
+"CollisionPolygon2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."
+msgstr ""
+"A CollisionPolygon2D csak CollisionObject2D-t öröklő node ütközési alakzatát "
+"tudja megadni. Csak Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, stb. "
+"gyermekeként használja alakdefiniálásra."
+
 msgid "An empty CollisionPolygon2D has no effect on collision."
 msgstr "Üres CollisionPolygon2D nincs hatással az ütközésekre."
 
+msgid "Invalid polygon. At least 3 points are needed in 'Solids' build mode."
+msgstr ""
+"Érvénytelen sokszög. \"Szilárd\" építési módban legalább 3 pont szükséges ."
+
+msgid "Invalid polygon. At least 2 points are needed in 'Segments' build mode."
+msgstr ""
+"Érvénytelen sokszög. \"Szegmens\" építési módban legalább 2 pont szükséges."
+
+msgid ""
+"The One Way Collision property will be ignored when the collision object is "
+"an Area2D."
+msgstr ""
+"Az Egyirányú Ütközés tulajdonság figyelmen kívül marad, ha az ütköző objektum "
+"egy Area2D."
+
+msgid ""
+"CollisionShape2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node.\n"
+"Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, "
+"CharacterBody2D, etc. to give them a shape."
+msgstr ""
+"A CollisionShape2D csak CollisionObject2D-t öröklő node ütközési alakzatát "
+"tudja megadni.\n"
+"Csak Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, stb. gyermekeként "
+"használja alakdefiniálásra."
+
 msgid ""
 "A shape must be provided for CollisionShape2D to function. Please create a "
 "shape resource for it!"
@@ -10666,12 +13525,445 @@ msgstr ""
 "A CollisionShape2D működéséhez alakot kell hozzárendelni. Hozzon létre hozzá "
 "egy alak erőforrást!"
 
+msgid ""
+"The CollisionShape2D node has limited editing options for polygon-based "
+"shapes. Consider using a CollisionPolygon2D node instead."
+msgstr ""
+"A CollisionShape2D node korlátozott szerkesztési lehetőségekkel rendelkezik "
+"sokszög-alapú formák esetén. Használjon helyette CollisionPolygon2D node-ot."
+
+msgid "Node A and Node B must be PhysicsBody2Ds"
+msgstr "Node A és Node B is PhysicsBody2D kell legyen"
+
+msgid "Node A must be a PhysicsBody2D"
+msgstr "Node A PhysicsBody2D kell legyen"
+
+msgid "Node B must be a PhysicsBody2D"
+msgstr "Node B PhysicsBody2D kell legyen"
+
+msgid "Joint is not connected to two PhysicsBody2Ds"
+msgstr "A csukló nincs hozzákapcsolva két PhysicsBody2D-hez"
+
+msgid "Node A and Node B must be different PhysicsBody2Ds"
+msgstr "Node A és Node B két különböző PhysicsBody2D kell legyen"
+
+msgid ""
+"A PhysicalBone2D only works with a Skeleton2D or another PhysicalBone2D as a "
+"parent node!"
+msgstr ""
+"A PhysicalBone2D működéséhez szülőként Skeleton2D vagy egy másik "
+"PhysicalBone2D szükséges!"
+
+msgid ""
+"A PhysicalBone2D needs to be assigned to a Bone2D node in order to function! "
+"Please set a Bone2D node in the inspector."
+msgstr ""
+"A PhysicalBone2D működéséhez egy hozzárendelt Bone2D node-ra van szükség! "
+"Állítson be egy Bone2D node-ot az elemzőben."
+
+msgid ""
+"A PhysicalBone2D node should have a Joint2D-based child node to keep bones "
+"connected! Please add a Joint2D-based node as a child to this node!"
+msgstr ""
+"A PhysicalBone2D node-nak Joint2D-alapú gyermek node-ra van szüksége a "
+"csontkapcsolatok megtartásához! Adjon hozzá egy gyermek Joint2D node-ot!"
+
+msgid ""
+"PhysicsBody2D will not work correctly on a non-interpolated branch of the "
+"SceneTree.\n"
+"Check the node's inherited physics_interpolation_mode."
+msgstr ""
+"A PhysicsBody2D nem fog jól működni nem-interpolált SceneTree ágon.\n"
+"Ellenőrizze a node örökölt physics_interpolation_mode tulajdonságát."
+
+msgid ""
+"Size changes to RigidBody2D will be overridden by the physics engine when "
+"running.\n"
+"Change the size in children collision shapes instead."
+msgstr ""
+"A RigidBody2D méretváltoztatásait futáskor felül fogja írni a fizika motor.\n"
+"Változtasson helyette a gyermek ütközési alakzatok méretein."
+
+msgid ""
+"This node cannot interact with other objects unless a Shape2D is assigned."
+msgstr ""
+"Ez a node hozzárendelt Shape2D nélkül nem tud kölcsönhatásba lépni más "
+"objektumokkal."
+
 msgid "Path property must point to a valid Node2D node to work."
 msgstr "Az Útvonal tulajdonság egy érvényes Node2D Node-ra kell mutasson."
 
+msgid "This Bone2D chain should end at a Skeleton2D node."
+msgstr "Ennek a Bone2D láncnak egy Skeleton2D node-ban kellene végződnie."
+
+msgid "A Bone2D only works with a Skeleton2D or another Bone2D as parent node."
+msgstr ""
+"A Bone2D működéséhez szülőként Skeleton2D vagy egy másik Bone2D szükséges."
+
+msgid ""
+"This bone lacks a proper REST pose. Go to the Skeleton2D node and set one."
+msgstr ""
+"Ennek a csontnak nincs REST póza. Állítson be egyet a Skeleton2D node-on."
+
+msgid ""
+"The TileMap node is deprecated as it is superseded by the use of multiple "
+"TileMapLayer nodes.\n"
+"To convert a TileMap to a set of TileMapLayer nodes, open the TileMap bottom "
+"panel with this node selected, click the toolbox icon in the top-right corner "
+"and choose \"Extract TileMap layers as individual TileMapLayer nodes\"."
+msgstr ""
+"A TileMap node elavult és több TileMapLayer node használata váltja fel.\n"
+"A TileMap több TileMapLayer-re konvertálásához jelölje ki a node-ot és nyissa "
+"meg az alsó TileMap panelt, kattintson az eszköztár ikonra a jobb-felső "
+"sarokban és válassza a \"TileMap rétegek TileMapLayer node-okba kiemelése\" "
+"opciót."
+
+msgid ""
+"A Y-sorted layer has the same Z-index value as a not Y-sorted layer.\n"
+"This may lead to unwanted behaviors, as a layer that is not Y-sorted will be "
+"Y-sorted as a whole with tiles from Y-sorted layers."
+msgstr ""
+"Egy Y-rendezett réteghez ugyanazon Z-index van beállítva, mint egy nem Y-"
+"rendezett rétegnél.\n"
+"Ez nem kívánt működéshez vezethet, mivel a nem Y-rendezett réteg rendezett "
+"rétegekből származó csempékkel kerül rendezésre."
+
+msgid ""
+"A TileMap layer is set as Y-sorted, but Y-sort is not enabled on the TileMap "
+"node itself."
+msgstr ""
+"A TileMap réteg Y-rendezettre van állítva, de az Y-rendezés nincs "
+"engedélyezve a TileMap node-on."
+
+msgid ""
+"The TileMap node is set as Y-sorted, but Y-sort is not enabled on any of the "
+"TileMap's layers.\n"
+"This may lead to unwanted behaviors, as a layer that is not Y-sorted will be "
+"Y-sorted as a whole."
+msgstr ""
+"A TileMap node Y-rendezettre van állítva, de egyetlen rétegén sincs "
+"bekapcsolva az Y-rendezés.\n"
+"Ez nem kívánt működéshez vezethet, mert a nem Y-rendezett réteg egészben "
+"kerül rendezésre."
+
+msgid ""
+"Isometric TileSet will likely not look as intended without Y-sort enabled for "
+"the TileMap and all of its layers."
+msgstr ""
+"Az izometrikus TileSet valószínűleg nem a kívánt módon jelenik meg Y-rendezés "
+"engedélyezése nélkül a TileMap-en és annak rétegein."
+
+msgid ""
+"Forward axis and primary rotation axis must not be parallel in setting %s."
+msgstr ""
+"A(z) %s beállításban az előre mutató és az elsődleges forgatási tengely "
+"párhuzamos kell legyen."
+
+msgid ""
+"External Skeleton3D node not set! Please set a path to an external Skeleton3D "
+"node."
+msgstr ""
+"A külső Skeleton3D node nincs beállítva! Adjon meg egy útvonalat a külső "
+"Skeleton3D node-hoz."
+
+msgid ""
+"Parent node is not a Skeleton3D node! Please use an external Skeleton3D if "
+"you intend to use the BoneAttachment3D without it being a child of a "
+"Skeleton3D node."
+msgstr ""
+"A szülő node nem Skeleton3D node! Ha Skeleton3D szülő node nélkül szeretne "
+"BoneAttachment3D-t használni, akkor állítson be egy külső Skeleton3D-t."
+
+msgid ""
+"BoneAttachment3D node is not bound to any bones! Please select a bone to "
+"attach this node."
+msgstr ""
+"A BoneAttachment3D node nem tartozik egyetlen csonthoz sem! Csatoljon egy "
+"csontot a node-hoz."
+
+msgid "Nothing is visible because no mesh has been assigned."
+msgstr "Semmi sem látható, mert nincs hozzárendelt mesh."
+
+msgid ""
+"CPUParticles3D animation requires the usage of a StandardMaterial3D whose "
+"Billboard Mode is set to \"Particle Billboard\"."
+msgstr ""
+"A CPUParticles3D animáció olyan StandardMaterial3D használatát igényli, amely "
+"Billboard módja \"Részecske Billboard\"-ra van állítva."
+
+msgid "Decals are only available when using the Forward+ or Mobile renderer."
+msgstr "A Decal-ok csak Forward+ vagy Mobile rendermotor esetén elérhetőek."
+
+msgid ""
+"The decal has no textures loaded into any of its texture properties, and will "
+"therefore not be visible."
+msgstr ""
+"A decal egyetlen textúra tulajdonságában sincs textúra, ezért nem lesz "
+"látható."
+
+msgid ""
+"The decal has a Normal and/or ORM texture, but no Albedo texture is set.\n"
+"An Albedo texture with an alpha channel is required to blend the normal/ORM "
+"maps onto the underlying surface.\n"
+"If you don't want the Albedo texture to be visible, set Albedo Mix to 0."
+msgstr ""
+"A decal normál és/vagy ORM textúrája be van állítva, de az Albedó textúra "
+"nincs.\n"
+"Alfa csatornával rendelkező Albedó textúra szükséges a normál/ORM textúra "
+"mögöttes felületre keveréséhez.\n"
+"Ha nem szeretné az Albedó textúrát láthatóvá tenni, állítsa az Albedó Mix-et "
+"nullára."
+
+msgid ""
+"The decal's Cull Mask has no bits enabled, which means the decal will not "
+"paint objects on any layer.\n"
+"To resolve this, enable at least one bit in the Cull Mask property."
+msgstr ""
+"A decal Cull Mask bitjei üresek, ami azt jelenti, hogy a decal nem jelenít "
+"meg objektumokat egyetlen rétegen sem.\n"
+"Ezt megoldhatja, ha legalább egy bitet beállít a Cull Mask tulajdonságban."
+
+msgid "Fog Volumes are only visible when using the Forward+ renderer."
+msgstr "A Ködtérfogatok csak Forward+ rendermotor használatával láthatóak."
+
+msgid ""
+"Fog Volumes need volumetric fog to be enabled in the scene's Environment in "
+"order to be visible."
+msgstr ""
+"A Ködtérfogatok láthatósága a volumetrikus köd bekapcsolását igényli a "
+"jelenet Környezetében."
+
+msgid "Nothing is visible because meshes have not been assigned to draw passes."
+msgstr ""
+"Semmi sem látható, mert a mesh-ek nincsenek rajzolási lépésekhez rendelve."
+
+msgid ""
+"Particles animation requires the usage of a BaseMaterial3D whose Billboard "
+"Mode is set to \"Particle Billboard\"."
+msgstr ""
+"A részecske animáció olyan StandardMaterial3D használatát igényli, amely "
+"Billboard módja \"Részecske Billboard\"-ra van állítva."
+
+msgid ""
+"Using Trail meshes with a skin causes Skin to override Trail poses. Suggest "
+"removing the Skin."
+msgstr ""
+"Trail mesh esetén a kinézet használata felülírja a követő pózt. A kinézet "
+"eltávolítása javasolt."
+
+msgid "Trails active, but neither Trail meshes or a Skin were found."
+msgstr "A követés aktív, de sem Trail mesh, sem kinézet nem található."
+
+msgid ""
+"Only one Trail mesh is supported. If you want to use more than a single mesh, "
+"a Skin is needed (see documentation)."
+msgstr ""
+"Csak a Trail mesh támogatott. Ha egy mesh-nél többet szeretne használni, "
+"akkor kinézet szükséges (lásd a dokumentációt)."
+
+msgid ""
+"Trails enabled, but one or more mesh materials are either missing or not set "
+"for trails rendering."
+msgstr ""
+"A követés engedélyezett, de egy vagy több anyag hiányzik vagy nem követő "
+"renderelésre van állítva."
+
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderer."
+msgstr ""
+"A részecske al-kibocsátás csak Forward+ és Mobile rendermotor esetén érhető "
+"el."
+
+msgid ""
+"The Bake Mask has no bits enabled, which means baking will not produce any "
+"collision for this GPUParticlesCollisionSDF3D.\n"
+"To resolve this, enable at least one bit in the Bake Mask property."
+msgstr ""
+"Az Égetőmaszkban nincsenek engedélyezett bitek, ami azt jelenti, hogy az "
+"égetés nem eredményez GPUParticlesCollisionSDF3D ütközéseket.\n"
+"Ezt az Égetőmaszk legalább egy bitjének engedélyezésével oldhatja meg."
+
+msgid ""
+"Detecting settings with no target set! IterateIK3D must have a target to work."
+msgstr ""
+"Beállítások érzékelése cél nélkül! Az IterateIK3D-nek célra van szüksége a "
+"működéshez."
+
+msgid "A light's scale does not affect the visual size of the light."
+msgstr "A fényforrás méretezése (scale) nincs hatással a fény látható méretére."
+
+msgid "Projector texture only works with shadows active."
+msgstr "A projekciós textúra csak bekapcsolt árnyékokkal működik."
+
+msgid ""
+"Projector textures are not supported when using the Compatibility renderer "
+"yet. Support will be added in a future release."
+msgstr ""
+"A projekciós textúrák Compatibility rendermotor esetén még nem támogatottak. "
+"Későbbi kiadások fogják majd támogatni."
+
+msgid "A SpotLight3D with an angle wider than 90 degrees cannot cast shadows."
+msgstr "90 foknál szélesebb szögű SpotLight3D nem hozhat létre árnyékokat."
+
+msgid "Finding meshes, lights and probes"
+msgstr "Mesh-ek, fények és szondák keresése"
+
 msgid "Creating probes"
 msgstr "Vizsgálók létrehozása"
 
+msgid "Creating probes from mesh %d/%d"
+msgstr "Szondák létrehozása mesh-ből %d/%d"
+
+msgid "Generating Probe Acceleration Structures"
+msgstr "Szonda Gyorsító Struktúrák Generálása"
+
+msgid ""
+"Lightmaps can only be baked from a GPU that supports the RenderingDevice "
+"backends.\n"
+"Your GPU (%s) does not support RenderingDevice, as it does not support "
+"Vulkan, Direct3D 12, or Metal.\n"
+"Lightmap baking will not be available on this device, although rendering "
+"existing baked lightmaps will work."
+msgstr ""
+"Lightmap csak RenderingDevice háttérfolyamatot támogató GPU segítségével "
+"égethető.\n"
+"Az Ön GPU-ja (%s) nem támogatja a RenderingDevice-t, mert a Vulkan, Direct3D "
+"12 vagy Metal egyike sem támogatott rajta.\n"
+"A lightmap égetés nem lesz elérhető ezen az eszközön, de a létező már "
+"beégetett lightmap-ek működni fognak."
+
+msgid ""
+"The lightmap has no baked shadowmask textures. Please rebake with the "
+"Shadowmask Mode set to anything other than None."
+msgstr ""
+"A lightmap-nek nincs beégetett árnyékmaszk textúrája. Égesse újra az "
+"Árnyékmaszk Mód bármely opciójával (kivéve \"Egyik sem\")."
+
+msgid ""
+"Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will "
+"still work."
+msgstr ""
+"Lightmap nem égethető ezen: %s. A létező beégetett lightmap-ek működni fognak."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time. Rendering existing baked lightmaps will still work."
+msgstr ""
+"Lightmap nem égethető, mert a `lightmapper_rd` modul le volt tiltva a program "
+"fordulásakor. A létező beégetett lightmap-ek működni fognak."
+
+msgid "Forward axis and primary rotation axis must not be parallel."
+msgstr ""
+"Az előre mutató és az elsődleges forgatási tengely nem lehet párhuzamos."
+
+msgid ""
+"The NavigationAgent3D can be used only under a Node3D inheriting parent node."
+msgstr ""
+"A NavigationAgent3D csak Node3D-ből leszármazott szülő node esetén "
+"használható."
+
+msgid ""
+"NavigationLink3D start position should be different than the end position to "
+"be useful."
+msgstr ""
+"A NavigationLink3D kezdő pozíciója el kell térjen a végpozíciótól, hogy "
+"hasznos lehessen."
+
+msgid ""
+"NavigationObstacle3D only takes global rotation around the y-axis into "
+"account. Rotations around the x-axis or z-axis might lead to unexpected "
+"results."
+msgstr ""
+"A NavigationObstacle3D csak a globális y-tengely körüli forgást veszi "
+"figyelembe. Az x- vagy z-tengely körüli forgatás nem várt eredményhez "
+"vezethet."
+
+msgid "NavigationObstacle3D does not support negative or zero scaling."
+msgstr "A NavigationObstacle3D nem támogatja a negatív vagy zéró méretezést."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest scale value along "
+"the three axes will be used."
+msgstr ""
+"Az ügynök sugara csak egyenletesen méretezhető. A három tengely legnagyobb "
+"értékét fogja használni."
+
+msgid ""
+"Occlusion culling is disabled in the Project Settings, which means occlusion "
+"culling won't be performed in the root viewport.\n"
+"To resolve this, open the Project Settings and enable Rendering > Occlusion "
+"Culling > Use Occlusion Culling."
+msgstr ""
+"Az Occlusion culling ki van kapcsolva a Projekt Beállításokban, ezért a "
+"gyökér betekintő occlusion culling nélkül fog működni.\n"
+"Ezt a Projekt Beállításokban a Renderelés > Occlusion Culling > Occlusion "
+"Culling Használata bekapcsolásával oldhatja meg."
+
+msgid ""
+"The Bake Mask has no bits enabled, which means baking will not produce any "
+"occluder meshes for this OccluderInstance3D.\n"
+"To resolve this, enable at least one bit in the Bake Mask property."
+msgstr ""
+"Az Égetőmaszkban nincsenek engedélyezett bitek, ami azt jelenti, hogy az "
+"égetés nem eredményez OccluderInstance3D occluder mesh-eket.\n"
+"Ezt az Égetőmaszk legalább egy bitjének engedélyezésével oldhatja meg."
+
+msgid ""
+"No occluder mesh is defined in the Occluder property, so no occlusion culling "
+"will be performed using this OccluderInstance3D.\n"
+"To resolve this, set the Occluder property to one of the primitive occluder "
+"types or bake the scene meshes by selecting the OccluderInstance3D and "
+"pressing the Bake Occluders button at the top of the 3D editor viewport."
+msgstr ""
+"Nincs definiált occluder mesh az Occluder tulajdonságban, ezért az "
+"OccluderInstance3D nem hajt végre occlusion culling műveleteket.\n"
+"Ezt az Occluder tulajdonság primitív típusra állításával vagy a jelenet mesh-"
+"ek beégetésével oldhatja meg az OccluderInstance3D kijelölésével és az "
+"Occluder Égetés gombra kattintással a 3D szerkesztő betekintőjének tetején."
+
+msgid ""
+"The occluder mesh has less than 3 vertices, so no occlusion culling will be "
+"performed using this OccluderInstance3D.\n"
+"To generate a proper occluder mesh, select the OccluderInstance3D then use "
+"the Bake Occluders button at the top of the 3D editor viewport."
+msgstr ""
+"Az occluder mesh 3-nál kevesebb csúccsal rendelkezik, ezért az "
+"OccluderInstance3D nem hajt végre occlusion culling műveleteket.\n"
+"Occluder mesh generálásához jelölje ki az OccluderInstance3D-t és használja "
+"az Occluder Égetés gombot a 3D szerkesztő betekintőjének tetején."
+
+msgid ""
+"The polygon occluder has less than 3 vertices, so no occlusion culling will "
+"be performed using this OccluderInstance3D.\n"
+"Vertices can be added in the inspector or using the polygon editing tools at "
+"the top of the 3D editor viewport."
+msgstr ""
+"A sokszög occluder 3-nál kevesebb csúccsal rendelkezik, ezért az "
+"OccluderInstance3D nem hajt végre occlusion culling műveleteket.\n"
+"Csúcsokat az elemzőben adhat hozzá vagy a sokszög szerkesztő eszközökkel a 3D "
+"szerkesztő betekintőjének tetején."
+
+msgid "PathFollow3D only works when set as a child of a Path3D node."
+msgstr "A PathFollow3D csak Path3D gyermekeként működik."
+
+msgid ""
+"PathFollow3D's ROTATION_ORIENTED requires \"Up Vector\" to be enabled in its "
+"parent Path3D's Curve resource."
+msgstr ""
+"A PathFollow3D ROTATION_ORIENTED beállítása a \"Fel Vektor\" engedélyezését "
+"igényli a szülő Path3D Görbe erőforrásában."
+
+msgid ""
+"This node has no shape, so it can't collide or interact with other objects.\n"
+"Consider adding a CollisionShape3D or CollisionPolygon3D as a child to define "
+"its shape."
+msgstr ""
+"Ennek a node-nak nincs alakja, ezért nem tud ütközni vagy kölcsönhatásba "
+"lépni más objektumokkal.\n"
+"Adjon hozzá egy CollisionShape3D vagy CollisionPolygon3D gyermeket az alak "
+"meghatározásához."
+
 msgid "Animation not found: '%s'"
 msgstr "Az animáció nem található: '%s'"
 
diff --git a/engine/editor/translations/editor/id.po b/engine/editor/translations/editor/id.po
index afc70406..23fbf7f1 100644
--- a/engine/editor/translations/editor/id.po
+++ b/engine/editor/translations/editor/id.po
@@ -74,13 +74,14 @@
 # Agung Adhinata <adhi0asta@gmail.com>, 2025.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # Dandihk <n00b38d@gmail.com>, 2025.
+# Sapatekno <sapatekno@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-05 13:02+0000\n"
-"Last-Translator: Belang Sumerlang <belangsumerlang@gmail.com>\n"
+"PO-Revision-Date: 2026-02-05 19:02+0000\n"
+"Last-Translator: Sapatekno <sapatekno@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/id/>\n"
 "Language: id\n"
@@ -88,14 +89,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "Oke"
 
+msgid "Out of memory"
+msgstr "Kehabisan memori"
+
+msgid "File: Bad drive"
+msgstr "Berkas: Drive Tidak Terbaca"
+
+msgid "File: Bad path"
+msgstr "Berkas: Lokasi File Tidak Ditemukan"
+
+msgid "File: Permission denied"
+msgstr "Berkas: Izin akses ditolak"
+
+msgid "File unrecognized"
+msgstr "Berkas Tidak Dikenali"
+
+msgid "File corrupt"
+msgstr "Berkas rusak atau tidak valid"
+
 msgid "Locked"
 msgstr "Terkunci"
 
+msgid "Can't write database"
+msgstr "Gagal Menulis ke Basis Data"
+
+msgid "Busy"
+msgstr "Sibuk"
+
+msgid "Skip"
+msgstr "Lewati"
+
 msgid "Help"
 msgstr "Bantuan"
 
diff --git a/engine/editor/translations/editor/it.po b/engine/editor/translations/editor/it.po
index 5734dd24..920d78c3 100644
--- a/engine/editor/translations/editor/it.po
+++ b/engine/editor/translations/editor/it.po
@@ -124,13 +124,14 @@
 # Pietro Marini <pietromarinivr2006@gmail.com>, 2025.
 # shifenis <dedi.ceka99@gmail.com>, 2026.
 # Mirto <mirtorande@gmail.com>, 2026.
+# Alex B <alexius.barresi@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-14 15:11+0000\n"
-"Last-Translator: Mirto <mirtorande@gmail.com>\n"
+"PO-Revision-Date: 2026-01-26 17:42+0000\n"
+"Last-Translator: Alex B <alexius.barresi@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/it/>\n"
 "Language: it\n"
@@ -138,7 +139,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
@@ -848,6 +849,9 @@ msgstr "Cattura"
 msgid "Create points."
 msgstr "Crea punti."
 
+msgid "Set the blending position within the space."
+msgstr "Imposta la posizione di fusione all'interno dello spazio."
+
 msgid "Erase points."
 msgstr "Cancella i punti."
 
diff --git a/engine/editor/translations/editor/ja.po b/engine/editor/translations/editor/ja.po
index 10c0b16e..ec478d9b 100644
--- a/engine/editor/translations/editor/ja.po
+++ b/engine/editor/translations/editor/ja.po
@@ -92,13 +92,15 @@
 # kakeudon17 <tazayuu17@gmail.com>, 2025.
 # Amir Sabbagh <amir420c@gmail.com>, 2025.
 # Acotto <perc.fg.music@gmail.com>, 2025.
+# Rudeus <95301440+7Luminaries@users.noreply.github.com>, 2026.
+# Eloy Robillard <eloy.robillard@proton.me>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-15 02:11+0000\n"
-"Last-Translator: Myeongjin <aranet100@gmail.com>\n"
+"PO-Revision-Date: 2026-02-05 19:02+0000\n"
+"Last-Translator: Eloy Robillard <eloy.robillard@proton.me>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ja/>\n"
 "Language: ja\n"
@@ -106,17 +108,125 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
 
+msgid "Failed"
+msgstr "失敗"
+
+msgid "Unavailable"
+msgstr "利用不可"
+
+msgid "File: Bad drive"
+msgstr "ファイル：ドライブエラー"
+
+msgid "File: Bad path"
+msgstr "ファイル：パスエラー"
+
+msgid "File: Permission denied"
+msgstr "ファイル：アクセス拒否"
+
+msgid "Can't open file"
+msgstr "ファイルを開けません"
+
+msgid "Can't write file"
+msgstr "ファイルの書き込みができません"
+
+msgid "Can't read file"
+msgstr "ファイルの読み込みができません"
+
+msgid "File unrecognized"
+msgstr "未認識のファイル"
+
+msgid "File corrupt"
+msgstr "ファイル破損"
+
+msgid "End of file"
+msgstr "ファイル終端"
+
+msgid "Can't open"
+msgstr "開けません"
+
+msgid "Can't create"
+msgstr "作成不可"
+
+msgid "Query failed"
+msgstr "クエリは失敗しました"
+
+msgid "Already in use"
+msgstr "すでに使用中です"
+
 msgid "Locked"
 msgstr "ロック済み"
 
+msgid "Timeout"
+msgstr "タイムアウト"
+
+msgid "Can't connect"
+msgstr "接続できません"
+
+msgid "Can't resolve"
+msgstr "解決できません"
+
+msgid "Can't acquire resource"
+msgstr "リソースは取得できません"
+
+msgid "Can't fork"
+msgstr "フォークできません"
+
+msgid "Invalid data"
+msgstr "無効なデータ"
+
+msgid "Invalid parameter"
+msgstr "無効な引数"
+
+msgid "Already exists"
+msgstr "すでに存在しています"
+
+msgid "Does not exist"
+msgstr "存在しません"
+
+msgid "Can't read database"
+msgstr "データベースの読み込みができません"
+
+msgid "Can't write database"
+msgstr "データベース書き込み不可"
+
+msgid "Compilation failed"
+msgstr "コンパイルに失敗しました"
+
+msgid "Method not found"
+msgstr "メソッドが見つかりませんでした"
+
+msgid "Link failed"
+msgstr "リンクに失敗しました"
+
+msgid "Script failed"
+msgstr "スクリプトが失敗しました"
+
+msgid "Invalid declaration"
+msgstr "無効な宣言"
+
+msgid "Duplicate symbol"
+msgstr "識別子が重複しています"
+
+msgid "Parse error"
+msgstr "解析エラー"
+
+msgid "Busy"
+msgstr "使用中"
+
+msgid "Skip"
+msgstr "スキップ"
+
 msgid "Help"
 msgstr "ヘルプ"
 
+msgid "Bug"
+msgstr "不具合"
+
 msgid "Printer on fire"
 msgstr "プリンター発火"
 
@@ -1243,6 +1353,18 @@ msgstr "ノードを移動"
 msgid "Transition exists!"
 msgstr "トランジションが存在しています！"
 
+msgid "Cannot transition to self!"
+msgstr "自分自身へのトランザクションは不可能！"
+
+msgid "Cannot transition to \"Start\"!"
+msgstr "\"Start\" へのトランザクションは不可能！"
+
+msgid "Cannot transition from \"End\"!"
+msgstr "\"End\" へのトランザクションは不可能！"
+
+msgid "Transition from \"%s\" to \"%s\" already exists!"
+msgstr "\"%s\" から \"%s\" へのトランザクションは既に存在します！"
+
 msgid "Play/Travel to %s"
 msgstr "再生/移動 %s"
 
@@ -1547,6 +1669,9 @@ msgstr "キーを切り取り"
 msgid "Copy Key(s)"
 msgstr "キーをコピー"
 
+msgid "Send Key(s) to RESET"
+msgstr "キーをRESETに送信"
+
 msgid "Delete Key(s)"
 msgstr "キーを削除"
 
@@ -1884,6 +2009,9 @@ msgstr "次のキーフレームに移動"
 msgid "Go to Previous Keyframe"
 msgstr "前のキーフレームに移動"
 
+msgid "Add tracks to RESET"
+msgstr "RESETにトラックを追加"
+
 msgid "Bake Animation..."
 msgstr "アニメーションをベイク…"
 
@@ -4389,6 +4517,13 @@ msgstr ""
 msgid "Filter by Type"
 msgstr "型で絞り込む"
 
+msgid ""
+"Selects all Nodes of the given type.\n"
+"Inserts \"type:\". You can also use the shorthand \"t:\"."
+msgstr ""
+"特定の型に該当するノードをすべて選択します。\n"
+"\"type:\"を挿入します。\"t:\"で略すこともできす。"
+
 msgid "Filter by Group"
 msgstr "グループで絞り込む"
 
@@ -6182,6 +6317,9 @@ msgstr ""
 "プロジェクトからファイル/フォルダーを除外するフィルター\n"
 "(コンマ区切り、 例: *.json, *.txt, docs/*)"
 
+msgid "Delta Encoding Compression Level"
+msgstr "デルタ圧縮度"
+
 msgid "Base Packs:"
 msgstr "ベースパック:"
 
@@ -6254,6 +6392,13 @@ msgstr "バイナリトークン(高速な読み込み)"
 msgid "Compressed binary tokens (smaller files)"
 msgstr "圧縮されたバイナリトークン (より小さなファイル)"
 
+msgid ""
+"No presets found.\n"
+"Create one so that its parameters can be edited here."
+msgstr ""
+"プリセットが見つかりませんでした。\n"
+"プリセットの引数がここで編集可能になるには新しいプリセットを作成してください。"
+
 msgid "Export PCK/ZIP..."
 msgstr "PCK/Zipのエクスポート..."
 
@@ -6353,6 +6498,9 @@ msgstr "削除されるファイル:"
 msgid "Dependencies of files to be deleted:"
 msgstr "削除されるファイルの依存関係:"
 
+msgid "Referenced by %s"
+msgstr "%s に参照されています"
+
 msgid "Fix Dependencies"
 msgstr "依存関係の修復"
 
@@ -7458,6 +7606,10 @@ msgstr "レイヤー"
 msgid "<empty>"
 msgstr "<空>"
 
+msgctxt "Ease Type"
+msgid "Zero"
+msgstr "ゼロ"
+
 msgid "Temporary Euler may be changed implicitly!"
 msgstr "一時的なオイラーは暗黙的に変更される可能性があります!"
 
@@ -7578,6 +7730,23 @@ msgstr "翻訳を追加"
 msgid "Lock/Unlock Component Ratio"
 msgstr "ロック/アンロック構成比"
 
+msgid "This %s is external to scene."
+msgstr "この %s はシーンの外部に存在します。"
+
+msgid ""
+"The %s cannot be edited in the inspector and can't be made unique directly."
+msgstr ""
+"%s はインスペクターで編集不可であり、直にユニーク化することができません。"
+
+msgid "Left-click to make it unique."
+msgstr "左クリックでユニーク化。"
+
+msgid "It is possible to make its subresources unique."
+msgstr "サブリソースのユニーク化は可能です。"
+
+msgid "In order to duplicate it, make its parent Resource unique."
+msgstr "複製するには親リソースをユニーク化してください。"
+
 msgid ""
 "The selected resource (%s) does not match any type expected for this property "
 "(%s)."
@@ -7596,6 +7765,12 @@ msgstr "検査"
 msgid "Make Unique (Recursive)"
 msgstr "ユニーク化 (再帰的)"
 
+msgid "In order to duplicate recursively, make its parent Resource unique."
+msgstr "再帰的に複製するには親リソースをユニーク化してください。"
+
+msgid "Subresources have already been made unique."
+msgstr "サブリソースはユニーク化済みです。"
+
 msgid "Paste as Unique"
 msgstr "ユニーク化して貼り付け"
 
@@ -8984,6 +9159,9 @@ msgstr "生成中..."
 msgid "Loading emission mask requires ParticleProcessMaterial."
 msgstr "放出マスクの読み込みには ParticleProcessMaterial が必要です。"
 
+msgid "Mask texture has an invalid size."
+msgstr "マスクテクスチャの大きさは無効です。"
+
 msgid "GPUParticles2D"
 msgstr "GPUParticles2D"
 
@@ -10220,6 +10398,13 @@ msgstr "消去ツール"
 msgid "Picker Tool"
 msgstr "ピッカーツール"
 
+msgid ""
+"Source ID: %d\n"
+"Texture path: %s"
+msgstr ""
+"ソースID：%d\n"
+"テクスチャのパス：%s"
+
 msgid "Bone Picker:"
 msgstr "ボーンピッカー:"
 
@@ -10449,6 +10634,12 @@ msgstr "簡略化された凸型シェイプを作成する"
 msgid "Multiple Convex"
 msgstr "複数の凸型シェイプを作成する"
 
+msgid "Capsule"
+msgstr "カプセル"
+
+msgid "Cylinder"
+msgstr "円柱"
+
 msgid "Sphere"
 msgstr "球体"
 
@@ -10599,6 +10790,22 @@ msgstr ""
 "これは単一の凸型コリジョンシェイプと似ていますが、精度を犠牲により単純なジオメ"
 "トリになることがあります。"
 
+msgid ""
+"Creates a box, capsule, cylinder, or sphere primitive collision shape if the "
+"mesh is a primitive.\n"
+"The mesh must use the built-in BoxMesh, CapsuleMesh, CylinderMesh, or "
+"SphereMesh primitive.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"基本meshである場合、箱、カプセル、円柱または球体の基本衝突シェイプを生成しま"
+"す。\n"
+"meshは組み込みのBoxMesh、CapsuleMesh、CylinderMeshまたはSphereMeshを使う必要が"
+"あります。\n"
+"この衝突検出方法は凸形状の衝突シェイプよりも速いです。"
+
+msgid "Longest Axis"
+msgstr "最長軸"
+
 msgid "X-Axis"
 msgstr "X軸"
 
@@ -15046,7 +15253,7 @@ msgid "Listening for Input. Hold %s to release focus."
 msgstr "入力を待っています。フォーカスを解除するには %s を長押ししてください。"
 
 msgid "Listening for Input"
-msgstr "入力を待機しています..."
+msgstr "入力を待機しています"
 
 msgid "Filter by Event"
 msgstr "イベントでフィルタ"
@@ -17537,6 +17744,9 @@ msgstr "内部のNavigationMeshの頂点とポリゴンを消去します。"
 msgid "Toggles whether the noise preview is computed in 3D space."
 msgstr "ノイズプレビューを3D空間で計算するかどうかを切り替えます。"
 
+msgid "Delta"
+msgstr "デルタ"
+
 msgid "Rename Action"
 msgstr "アクション名を変更"
 
diff --git a/engine/editor/translations/editor/ka.po b/engine/editor/translations/editor/ka.po
index af386a55..fb084bdf 100644
--- a/engine/editor/translations/editor/ka.po
+++ b/engine/editor/translations/editor/ka.po
@@ -6,14 +6,14 @@
 # George Dzavashvili <dzavashviligeorge@gmail.com>, 2018.
 # დემეტრე შონია <blender.animation.maker@gmail.com>, 2019.
 # Rati Nikolaishvili <rati.nikolaishvili@gmail.com>, 2019.
-# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023, 2024, 2025.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023, 2024, 2025, 2026.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-10-30 13:39+0000\n"
+"PO-Revision-Date: 2026-02-13 12:54+0000\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ka/>\n"
@@ -22,14 +22,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.14.1-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "დიახ"
 
+msgid "Failed"
+msgstr "ჩავარდა"
+
+msgid "Unavailable"
+msgstr "მიუწვდომელია"
+
+msgid "Parameter out of range"
+msgstr "პარამეტრი შუალედს გარეთაა"
+
+msgid "Out of memory"
+msgstr "მეხსიერება ამოიწურა"
+
+msgid "File not found"
+msgstr "ფაილი აღმოჩენილი არაა"
+
+msgid "File already in use"
+msgstr "ფაილი უკვე გამოიყენება"
+
+msgid "Can't open file"
+msgstr "ფაილის გახსნა შეუძლებელია"
+
+msgid "Can't write file"
+msgstr "ფაილის ჩაწერის შეცდომა"
+
+msgid "Can't read file"
+msgstr "ფაილის წაკითხვის შეცდომა"
+
+msgid "Missing dependencies for file"
+msgstr "ნაკლული დამოკიდებულებები ფაილისთვის"
+
 msgid "Locked"
 msgstr "დაბლოკილი"
 
+msgid "Timeout"
+msgstr "მოლოდინის ვადა"
+
+msgid "Already exists"
+msgstr "უკვე არსებობს"
+
+msgid "Method not found"
+msgstr "მეთოდი აღმოჩენილი არაა"
+
+msgid "Script failed"
+msgstr "სკრიპტის ჩავარდა"
+
+msgid "Invalid declaration"
+msgstr "არასწორი დეკლარაცია"
+
+msgid "Parse error"
+msgstr "დამუშავების შეცდომა"
+
 msgid "Help"
 msgstr "დახმარება"
 
@@ -564,6 +612,9 @@ msgstr "სიღრმე"
 msgid "Close"
 msgstr "დახურვა"
 
+msgid "Reconnect Transition"
+msgstr "თავიდან დაკავშირების გადასვლა"
+
 msgid "Transition exists!"
 msgstr "გარდასვლა არსებობს!"
 
@@ -1089,6 +1140,9 @@ msgstr "ყველაფრის/არაფრის მონიშვნ
 msgid "Copy Selection"
 msgstr "მონიშნულის კოპირება"
 
+msgid "Imported Animation cannot be edited!"
+msgstr "შემოტანილი ანიმაციის ჩასწორება შეუძლებელია!"
+
 msgid "Animation Change Keyframe Time"
 msgstr "ანიმაციის საკვანძო კადრის დროის ცვლილება"
 
@@ -1811,6 +1865,11 @@ msgstr "საქაღალდის შექმნა"
 msgid "Could not create folder: %s"
 msgstr "ვერ შევქმენი საქაღალდე: %s"
 
+msgid "Copy %d selected item to \"%s\"?"
+msgid_plural "Copy %d selected items to \"%s\"?"
+msgstr[0] "დაკოპირდეს %d მონიშნული ელემენტი \"%s\"-ში?"
+msgstr[1] "დაკოპირდეს %d მონიშნული ელემენტი \"%s\"-ში?"
+
 msgid "Open Scene"
 msgstr "სცენის გახსნა"
 
@@ -2242,6 +2301,9 @@ msgstr "შეცდომის პატაკი"
 msgid "Project"
 msgstr "პროექტი"
 
+msgid "Renderer"
+msgstr "რენდერერი"
+
 msgid "Update Continuously"
 msgstr "უწყვეტი განახლება"
 
@@ -2422,6 +2484,9 @@ msgstr "ყველაფრის გატანა"
 msgid "Project Export"
 msgstr "პროექტის გატანა"
 
+msgid "Search Replacement For: %s"
+msgstr "ჩანაცვლების ძებნა რისთვის: %s"
+
 msgid "Dependencies For:"
 msgstr "დამოკიდებულება:"
 
@@ -2467,6 +2532,9 @@ msgstr "წაშლის შეცდომა:"
 msgid "Files to be deleted:"
 msgstr "წაიშლება ფაილები:"
 
+msgid "Error loading: %s"
+msgstr "ჩატვირთვის შეცდომა: %s"
+
 msgid "Fix Dependencies"
 msgstr "დამოკიდებულებების გასწორება"
 
@@ -2689,6 +2757,9 @@ msgstr "ანიმაციის შენახვის ბილიკე
 msgid "Meshes"
 msgstr "ბადეები"
 
+msgid "Materials"
+msgstr "მასალები"
+
 msgid "Status"
 msgstr "სტატუსი"
 
@@ -3034,6 +3105,9 @@ msgstr "შეყვანა"
 msgid "Override the in-game camera."
 msgstr "თამაშის კამერის გადაფარვა."
 
+msgid "Fixed Size"
+msgstr "ფიქსირებული ზომა"
+
 msgid "Game"
 msgstr "თამაში"
 
@@ -3463,6 +3537,12 @@ msgstr "პერსპექტივა"
 msgid "Grouped"
 msgstr "დაჯგუფებული"
 
+msgid "Objects: %d"
+msgstr "ობიექტები: %d"
+
+msgid "Primitives: %d"
+msgstr "პრიმიტივები: %d"
+
 msgid "Translating:"
 msgstr "გადატანა:"
 
@@ -3571,6 +3651,9 @@ msgstr "ტრასფორმირება"
 msgid "Snap Settings"
 msgstr "მიბმის მორგება"
 
+msgid "Rotate Snap:"
+msgstr "მიმაგრების შებრუნება:"
+
 msgid "Perspective VFOV (deg.):"
 msgstr "პერსპექტივის VFOV (გრად.):"
 
@@ -4664,6 +4747,9 @@ msgstr "მიმდინარედ დანიშვნა"
 msgid "Extra Options:"
 msgstr "დამატებითი პარამეტრები:"
 
+msgid "Select Existing Layout:"
+msgstr "არსებული განლაგების არჩევა:"
+
 msgid "New layout name"
 msgstr "ახალი განლაგების სახელი"
 
@@ -5151,6 +5237,9 @@ msgstr "გაერთიანებული"
 msgid "Cannot instantiate GDScript class."
 msgstr "GDScript-ს კლასის ინსტანცირება შეუძლებელია."
 
+msgid "Export Settings"
+msgstr "პარამეტრების გატანა"
+
 msgid "glTF 2.0 Scene..."
 msgstr "glTF 2.0 სცენა..."
 
@@ -5249,6 +5338,18 @@ msgstr "NavigationPolygon-ის შექმნა"
 msgid "Baking NavigationMesh ..."
 msgstr "NavigationMesh-ის გამოცხობა..."
 
+msgid "Total Refs"
+msgstr "მიმართვები სულ"
+
+msgid "Total References: %d"
+msgstr "სულ მიმართვები: %d"
+
+msgid "Duplicate?"
+msgstr "დავადუბლირო?"
+
+msgid "Generating Snapshot"
+msgstr "სწრაფი ასლის გენერაცია"
+
 msgid "Rename Action"
 msgstr "ქმედების სახელის გადარქმევა"
 
diff --git a/engine/editor/translations/editor/ko.po b/engine/editor/translations/editor/ko.po
index 4698a50f..4b82a934 100644
--- a/engine/editor/translations/editor/ko.po
+++ b/engine/editor/translations/editor/ko.po
@@ -86,7 +86,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-22 20:12+0000\n"
+"PO-Revision-Date: 2026-02-09 12:49+0000\n"
 "Last-Translator: Myeongjin <aranet100@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/godot/"
 "ko/>\n"
@@ -110,13 +110,13 @@ msgid "Unconfigured"
 msgstr "구성되지 않음"
 
 msgid "Unauthorized"
-msgstr "인증되지 않음"
+msgstr "권한 없음"
 
 msgid "Parameter out of range"
 msgstr "매개변수 범위를 벗어남"
 
 msgid "Out of memory"
-msgstr "메모리 초과"
+msgstr "메모리 부족"
 
 msgid "File not found"
 msgstr "파일을 찾을 수 없음"
@@ -146,10 +146,10 @@ msgid "File unrecognized"
 msgstr "파일을 인식할 수 없음"
 
 msgid "File corrupt"
-msgstr "파일이 손상됨"
+msgstr "파일 손상"
 
 msgid "Missing dependencies for file"
-msgstr "파일에 종속성이 누락됨"
+msgstr "파일에 종속성 누락"
 
 msgid "End of file"
 msgstr "파일의 끝"
@@ -161,7 +161,7 @@ msgid "Can't create"
 msgstr "만들 수 없음"
 
 msgid "Query failed"
-msgstr "요청 실패"
+msgstr "쿼리 실패"
 
 msgid "Already in use"
 msgstr "이미 사용 중"
@@ -182,7 +182,7 @@ msgid "Connection error"
 msgstr "연결 오류"
 
 msgid "Can't acquire resource"
-msgstr "리소스를 획득할 수 없음"
+msgstr "리소스를 얻을 수 없음"
 
 msgid "Can't fork"
 msgstr "포크할 수 없음"
@@ -960,7 +960,7 @@ msgid "Invert Filter Selection"
 msgstr "필터 선택 반전"
 
 msgid "Clear Filter Selection"
-msgstr "필터 선택 해제"
+msgstr "필터 선택 비우기"
 
 msgid ""
 "Animation player has no valid root node path, so unable to retrieve track "
@@ -985,7 +985,7 @@ msgid "Edit Filtered Tracks:"
 msgstr "필터 트랙 편집:"
 
 msgid "Node Renamed"
-msgstr "노드 이름 바뀜"
+msgstr "노드 이름 바꿈"
 
 msgid "Add Node..."
 msgstr "노드 추가..."
@@ -1024,7 +1024,7 @@ msgid "Library Name:"
 msgstr "라이브러리 이름:"
 
 msgid "Animation name can't be empty."
-msgstr "애니메이션 이름은 비워둘 수 없습니다."
+msgstr "애니메이션 이름은 비워 둘 수 없습니다."
 
 msgid "Animation name contains invalid characters: '/', ':', ',' or '['."
 msgstr "애니메이션 이름에 잘못된 문자가 있습니다: '/', ':', ',', '['."
@@ -2021,7 +2021,7 @@ msgid "Seconds"
 msgstr "초"
 
 msgid "FPS"
-msgstr "초당 프레임"
+msgstr "FPS"
 
 msgid "Snap Mode"
 msgstr "스냅 모드"
@@ -2909,8 +2909,8 @@ msgid ""
 "visible (as a short flash) in the running project.\n"
 "This is useful to troubleshoot low processor mode."
 msgstr ""
-"이 옵션이 활성화되면 실행 중인 프로젝트에서 2D 오브젝트의 다시 그리기 요청이 "
-"(짧은 섬광으로) 시각화됩니다.\n"
+"이 옵션이 활성화되면 실행 중인 프로젝트에서 2D 오브젝트의 리드로우 요청이 (짧"
+"은 섬광으로) 시각화됩니다.\n"
 "이 설정은 저사양 모드에서의 문제 해결에 유용합니다."
 
 msgid "Synchronize Scene Changes"
@@ -3381,7 +3381,7 @@ msgstr ""
 "color]하여 우리를 도와주세요!"
 
 msgid "Top"
-msgstr "위쪽"
+msgstr "위"
 
 msgid "Class:"
 msgstr "클래스:"
@@ -4153,7 +4153,7 @@ msgid "Delete group \"%s\" and all its references?"
 msgstr "그룹 \"%s\"과(와) 모든 참조를 삭제하시겠습니까?"
 
 msgid "Group can't be empty."
-msgstr "그룹은 비워둘 수 없습니다."
+msgstr "그룹은 비워 둘 수 없습니다."
 
 msgid "Group already exists."
 msgstr "그룹이 이미 존재합니다."
@@ -4165,7 +4165,7 @@ msgid "Add a new group."
 msgstr "새로운 그룹을 추가합니다."
 
 msgid "Filter Groups"
-msgstr "그룹 필터링"
+msgstr "그룹 필터"
 
 msgid "Select one or more nodes to edit their groups."
 msgstr "그룹을 편집할 하나 이상의 노드를 선택하세요."
@@ -4595,7 +4595,7 @@ msgid "Sub-Resources"
 msgstr "하위 리소스"
 
 msgid "Access as Unique Name"
-msgstr "고유 이름으로 액세스"
+msgstr "고유 이름으로 접근"
 
 msgid "Clear Inheritance"
 msgstr "상속 비우기"
@@ -4685,7 +4685,7 @@ msgid "Paste Node(s) as Root"
 msgstr "노드를 루트가 되게 붙여넣기"
 
 msgid "<Unnamed> at %s"
-msgstr "%s의 <이름 없음>"
+msgstr "%s에서 <이름 없음>"
 
 msgid "(used %d times)"
 msgstr "(%d회 사용됨)"
@@ -5890,7 +5890,7 @@ msgid "Storing File:"
 msgstr "파일 저장 중:"
 
 msgid "No export template found at the expected path:"
-msgstr "예상된 경로에서 내보내기 템플릿을 찾지 못했습니다:"
+msgstr "예상된 경로에서 찾은 내보내기 템플릿이 없습니다:"
 
 msgid ""
 "Using user provided text server data, text display in the exported project "
@@ -5953,13 +5953,13 @@ msgid "Invalid Identifier:"
 msgstr "잘못된 식별자:"
 
 msgid "At least one file timestamp access reason should be selected."
-msgstr "최소한 하나의 파일 타임스탬프 액세스 이유를 선택해야 합니다."
+msgstr "최소한 하나의 파일 타임스탬프 접근 이유를 선택해야 합니다."
 
 msgid "At least one disk space access reason should be selected."
-msgstr "최소한 하나의 디스크 공간 액세스 이유를 선택해야 합니다."
+msgstr "최소한 하나의 디스크 공간 접근 이유를 선택해야 합니다."
 
 msgid "At least one system boot time access reason should be selected."
-msgstr "최소한 하나의 시스템 부팅 시간 액세스 이유를 선택해야 합니다."
+msgstr "최소한 하나의 시스템 부팅 시간 접근 이유를 선택해야 합니다."
 
 msgid "\"Shader Baker\" doesn't work with the Compatibility renderer."
 msgstr "\"셰이더 베이커\"는 호환성 렌더러로 작동되지 않습니다."
@@ -6029,7 +6029,7 @@ msgid "Could not copy a file at path \"%s\" to \"%s\"."
 msgstr "\"%s\"에서 \"%s\"(으)로 파일을 복사할 수 없습니다."
 
 msgid "Could not access the filesystem."
-msgstr "파일시스템에 액세스할 수 없었습니다."
+msgstr "파일시스템에 접근할 수 없었습니다."
 
 msgid "Failed to create a file at path \"%s\" with code %d."
 msgstr "경로 \"%s\"에서 파일을 만드는 데 코드 %d(으)로 실패했습니다."
@@ -6981,7 +6981,7 @@ msgid "Thank you for choosing Godot Engine!"
 msgstr "Godot 엔진을 선택해주셔서 고맙습니다!"
 
 msgid "Name cannot be empty."
-msgstr "이름은 비워둘 수 없습니다."
+msgstr "이름은 비워 둘 수 없습니다."
 
 msgid "File name can't end with /."
 msgstr "파일 이름은 /로 끝날 수 없습니다."
@@ -6990,7 +6990,7 @@ msgid "File name cannot be empty."
 msgstr "파일 이름은 비워 둘 수 없습니다."
 
 msgid "Folder name cannot be empty."
-msgstr "폴더 이름은 비워둘 수 없습니다."
+msgstr "폴더 이름은 비워 둘 수 없습니다."
 
 msgid "File name contains invalid characters."
 msgstr "파일 이름에 잘못된 문자가 포함되어 있습니다."
@@ -7653,7 +7653,7 @@ msgid "Add Metadata Property for \"%s\""
 msgstr "\"%s\"에 메타데이터 추가하기"
 
 msgid "Metadata name can't be empty."
-msgstr "메타데이터 이름은 비워둘 수 없습니다."
+msgstr "메타데이터 이름은 비워 둘 수 없습니다."
 
 msgid "Metadata name must be a valid identifier."
 msgstr "메타데이터 이름은 올바른 식별자여야 합니다."
@@ -7852,7 +7852,7 @@ msgid "Layer %d"
 msgstr "레이어 %d"
 
 msgid "No Named Layers"
-msgstr "이름붙인 레이어 없음"
+msgstr "이름 붙은 레이어 없음"
 
 msgid "Edit Layer Names"
 msgstr "레이어 이름 변경"
@@ -8151,7 +8151,7 @@ msgid "Create New Plugin"
 msgstr "새 플러그인 만들기"
 
 msgid "Enabled"
-msgstr "활성화됨"
+msgstr "활성화"
 
 msgid "Version"
 msgstr "버전"
@@ -8188,7 +8188,7 @@ msgid "Plugin Name:"
 msgstr "플러그인 이름:"
 
 msgid "Required. This name will be displayed in the list of plugins."
-msgstr "필수. 플러그인 목록에 표시할 이름입니다."
+msgstr "필수. 이 이름은 플러그인의 목록에 표시됩니다."
 
 msgid "Subfolder:"
 msgstr "하위 폴더:"
@@ -8199,28 +8199,28 @@ msgid ""
 "If left empty, the folder will be named after the plugin name converted to "
 "`snake_case`."
 msgstr ""
-"선택. 폴더 이름에는 보통 스네이크 표기법( `snake_case` ) 을 사용하며 띄어쓰기"
-"나 특수문자 사용은 피합니다.\n"
-"공란일 경우, 폴더 이름으로는 스네이크 표기법으로 치환된 플러그인 이름을 사용합"
-"니다."
+"선택. 폴더 이름은 일반적으로 스네이크_표기법(`snake_case`)을 사용해야 합니다 "
+"(띄어쓰기나 특수 문자를 피하세요).\n"
+"비워 두면 플러그인 이름이 `snake_case`로 변환되고 나서 폴더 이름이 됩니다."
 
 msgid ""
 "Optional. This description should be kept relatively short (up to 5 lines).\n"
 "It will display when hovering the plugin in the list of plugins."
 msgstr ""
-"선택. 설명은 최대 5줄 내로 간결하게 작성하여야 합니다.\n"
-"이 설명은 플러그인 목록에서 마우스를 올릴 때 표시됩니다."
+"선택. 이 설명은 비교적 간결하게 (최대 5줄) 유지해야 합니다.\n"
+"이는 플러그인의 목록에서 호버할 때 표시됩니다."
 
 msgid "Author:"
 msgstr "저자:"
 
 msgid "Optional. The author's username, full name, or organization name."
-msgstr "선택. 제작자의 닉네임이나 풀 네임 또는 만든 조직의 이름입니다."
+msgstr "선택. 저자의 사용자 이름, 성명, 또는 조직 이름입니다."
 
 msgid ""
 "Optional. A human-readable version identifier used for informational purposes "
 "only."
-msgstr "선택. 사람이 읽을 수 있는 버전 식별자입니다. 설명 용도로만 사용됩니다."
+msgstr ""
+"선택. 사람이 읽을 수 있는 버전 식별자로 정보 제공 목적으로만 사용됩니다."
 
 msgid "Language:"
 msgstr "언어:"
@@ -8231,7 +8231,7 @@ msgid ""
 "to the plugin."
 msgstr ""
 "필수. 스크립트에 사용할 스크립팅 언어입니다.\n"
-"플러그인에 여러 스크립트를 추가하여 여러 언어를 사용할 수도 있습니다."
+"플러그인에 스크립트를 더 추가하여 여러 언어를 사용할 수도 있음을 참고하세요."
 
 msgid "Script Name:"
 msgstr "스크립트 이름:"
@@ -8240,8 +8240,7 @@ msgid ""
 "Optional. The name of the script file. If left empty, will default to the "
 "subfolder name."
 msgstr ""
-"선택 사항. 스크립트 파일의 이름입니다. 비어 있다면 하위 폴더 이름을 디폴트로 "
-"사용합니다."
+"선택. 스크립트 파일의 이름입니다. 비어 두면 하위 폴더 이름이 디폴트가 됩니다."
 
 msgid "Plugin name is valid."
 msgstr "플러그인 이름이 올바릅니다."
@@ -8796,7 +8795,7 @@ msgstr ""
 "니다."
 
 msgid "Tag name can't be empty."
-msgstr "태그 이름은 비워둘 수 없습니다."
+msgstr "태그 이름은 비워 둘 수 없습니다."
 
 msgid "Tag name can't begin or end with underscore."
 msgstr "태그 이름은 밑줄로 시작하거나 끝날 수 없습니다."
@@ -10035,7 +10034,7 @@ msgid "Painting Tiles Property"
 msgstr "칠하는 타일 속성"
 
 msgid "Painting:"
-msgstr "칠하는 중:"
+msgstr "칠하기:"
 
 msgid "No terrains"
 msgstr "지형 없음"
@@ -10044,16 +10043,16 @@ msgid "No terrain"
 msgstr "지형 없음"
 
 msgid "Painting Terrain Set"
-msgstr "지형 세트 칠하는 중"
+msgstr "지형 세트 칠하기"
 
 msgid "Painting Terrain"
-msgstr "지형 칠하는 중"
+msgstr "지형 칠하기"
 
 msgid "Pick"
 msgstr "집기"
 
 msgid "Drawing Rect:"
-msgstr "사각형 그리는 중:"
+msgstr "사각형 그리기:"
 
 msgid "Can't rotate patterns when using non-square tile grid."
 msgstr "정사각형이 아닌 타일 격자를 사용할 때는 패턴을 회전할 수 없습니다."
@@ -10689,7 +10688,7 @@ msgid ""
 "Would you like to automatically create tiles in the atlas?"
 msgstr ""
 "아틀라스의 텍스처가 수정되었습니다.\n"
-"아틀라스에서 자동으로 타일을 만드시길 원하십니까?"
+"아틀라스에서 자동으로 타일을 만들길 원하십니까?"
 
 msgid "Yes"
 msgstr "예"
@@ -13298,7 +13297,7 @@ msgid "Set Group Description"
 msgstr "그룹 설명 설정"
 
 msgid "Invalid group name. It cannot be empty."
-msgstr "그룹 이름은 비워둘 수 없습니다."
+msgstr "그룹 이름은 비워 둘 수 없습니다."
 
 msgid "A group with the name '%s' already exists."
 msgstr "이름 '%s'을(를) 가진 그룹이 이미 존재합니다."
@@ -14024,7 +14023,7 @@ msgid "Checked Radio Item"
 msgstr "체크된 라디오 항목"
 
 msgid "Named Separator"
-msgstr "이름 있는 분리자"
+msgstr "이름 붙은 분리자"
 
 msgid "Submenu"
 msgstr "하위 메뉴"
@@ -14314,7 +14313,7 @@ msgid ""
 "This node can be accessed from anywhere within the scene it belongs to by "
 "using the '%s' prefix in the node path."
 msgstr ""
-"이 노드는 경로 앞에 '%s' 접두사를 붙이면 씬의 어느 곳에서나 액세스할 수 있습니"
+"이 노드는 경로 앞에 '%s' 접두사를 붙이면 씬의 어느 곳에서나 접근할 수 있습니"
 "다."
 
 msgid "Click to disable this."
@@ -14545,34 +14544,34 @@ msgid "By Row"
 msgstr "행을 기준으로"
 
 msgid "Left to Right, Top to Bottom"
-msgstr "좌에서 우로, 상에서 하로"
+msgstr "왼쪽에서 오른쪽으로, 위에서 아래로"
 
 msgid "Left to Right, Bottom to Top"
-msgstr "좌에서 우로, 하에서 상으로"
+msgstr "왼쪽에서 오른쪽으로, 아래에서 위로"
 
 msgid "Right to Left, Top to Bottom"
-msgstr "우에서 좌로, 상에서 하로"
+msgstr "오른쪽에서 왼쪽으로, 위에서 아래로"
 
 msgid "Right to Left, Bottom to Top"
-msgstr "우에서 좌로, 하에서 상으로"
+msgstr "오른쪽에서 왼쪽으로, 아래에서 위로"
 
 msgid "By Column"
 msgstr "열을 기준으로"
 
 msgid "Top to Bottom, Left to Right"
-msgstr "상에서 하로, 좌에서 우로"
+msgstr "위에서 아래로, 왼쪽에서 오른쪽으로"
 
 msgid "Top to Bottom, Right to Left"
-msgstr "상에서 하로, 우에서 좌로"
+msgstr "위에서 아래로, 오른쪽에서 왼쪽으로"
 
 msgid "Bottom to Top, Left to Right"
-msgstr "하에서 상으로, 좌에서 우로"
+msgstr "아래에서 위로, 왼쪽에서 오른쪽으로"
 
 msgid "Bottom to Top, Right to Left"
-msgstr "하에서 상으로, 우에서 좌로"
+msgstr "아래에서 위로, 오른쪽에서 왼쪽으로"
 
 msgid "Select None"
-msgstr "선택 해제"
+msgstr "없음 선택"
 
 msgid "Toggle Settings Panel"
 msgstr "설정 패널 토글"
@@ -15253,7 +15252,7 @@ msgid "Action %s"
 msgstr "액션 %s"
 
 msgid "Cannot Revert - Action is same as initial"
-msgstr "되돌릴 수 없습니다 - 액션이 초기와 같습니다"
+msgstr "되돌릴 수 없음 - 액션이 초기와 같습니다"
 
 msgid "Revert Action"
 msgstr "액션 되돌리기"
@@ -15265,7 +15264,7 @@ msgid "Remove Action"
 msgstr "액션 제거"
 
 msgid "Cannot Remove Action"
-msgstr "액션을 제거할 수 없습니다"
+msgstr "액션을 제거할 수 없음"
 
 msgid "Edit Event"
 msgstr "이벤트 편집"
@@ -15343,7 +15342,7 @@ msgid "Autoload Path"
 msgstr "오토로드 경로"
 
 msgid "Set path or press \"Add\" to create a script."
-msgstr "경로를 설정하거나 \"추가\"를 눌러 스크립트를 만드세요."
+msgstr "경로를 설정하거나 \"추가\"를 눌러 스크립트를 만듭니다."
 
 msgid "Select Autoload Path"
 msgstr "오토로드 경로 선택"
@@ -15623,10 +15622,10 @@ msgstr ""
 "%s."
 
 msgid "Filter Commands"
-msgstr "명령어 필터"
+msgstr "명령 필터"
 
 msgid "Filter by Name"
-msgstr "이름으로 필터링"
+msgstr "이름으로 필터"
 
 msgid "Action Event"
 msgstr "액션 이벤트"
@@ -15913,13 +15912,13 @@ msgid "Device"
 msgstr "기기"
 
 msgid "Listening for Input. Hold %s to release focus."
-msgstr "입력을 기다립니다. %s을(를) 눌러 포커스를 놓으세요."
+msgstr "입력을 받는 중입니다. %s을(를) 눌러 포커스를 놓으세요."
 
 msgid "Listening for Input"
-msgstr "입력 대기 중"
+msgstr "입력을 받는 중"
 
 msgid "Filter by Event"
-msgstr "이벤트로 필터링"
+msgstr "이벤트로 필터"
 
 msgid "No Event Configured"
 msgstr "구성된 이벤트 없음"
@@ -17764,7 +17763,7 @@ msgid "Modified"
 msgstr "수정됨"
 
 msgid "Renamed"
-msgstr "이름 변경됨"
+msgstr "이름 바꿈"
 
 msgid "Deleted"
 msgstr "삭제됨"
@@ -18364,7 +18363,7 @@ msgid "The MultiplayerSynchronizer needs a root path."
 msgstr "MultiplayerSynchronizer는 루트 경로가 있어야 합니다."
 
 msgid "Property/path must not be empty."
-msgstr "속성/경로는 비워둘 수 없습니다."
+msgstr "속성/경로는 비워 두면 안 됩니다."
 
 msgid "Invalid property path: '%s'"
 msgstr "잘못된 속성 경로: '%s'"
@@ -19939,10 +19938,10 @@ msgid "Invalid icon file \"%s\"."
 msgstr "아이콘 파일 \"%s\"이(가) 올바르지 않습니다."
 
 msgid "Could not find signtool executable at \"%s\"."
-msgstr "\"%s\"에서 signtool 실행 파일을 찾지 못했습니다."
+msgstr "\"%s\"에서 signtool 실행 파일을 찾을 수 없었습니다."
 
 msgid "Could not find osslsigncode executable at \"%s\"."
-msgstr "\"%s\"에서 osslsigncode 실행 파일을 찾지 못했습니다."
+msgstr "\"%s\"에서 osslsigncode 실행 파일을 찾을 수 없었습니다."
 
 msgid "No identity found."
 msgstr "식별자를 찾을 수 없습니다."
@@ -21062,10 +21061,10 @@ msgstr ""
 "초기 값인 `CURSOR_ARROW`로 두는 것이 좋습니다."
 
 msgid "Cell %d x %d: either text or alternative text must not be empty."
-msgstr "셀 %d x %d: 텍스트 또는 대체 텍스트는 비워 둘 수 없습니다."
+msgstr "셀 %d x %d: 텍스트 또는 대체 텍스트는 비워 두면 안 됩니다."
 
 msgid "Button %d in %d x %d: alternative text must not be empty."
-msgstr "버튼 %d (셀 %d x %d): 대체 텍스트는 비워 둘 수 없습니다."
+msgstr "버튼 %d (셀 %d x %d): 대체 텍스트는 비워 두면 안 됩니다."
 
 msgid ""
 "Ancestor \"%s\" clips its children, so this node will not be able to clip its "
diff --git a/engine/editor/translations/editor/nl.po b/engine/editor/translations/editor/nl.po
index 635c667e..096cbead 100644
--- a/engine/editor/translations/editor/nl.po
+++ b/engine/editor/translations/editor/nl.po
@@ -91,13 +91,14 @@
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # penggrin12 <miner.sidor@gmail.com>, 2025.
 # Marijn Scholtus <linkable@gmail.com>, 2026.
+# Flying Piano <flyingpiano27@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-16 10:02+0000\n"
-"Last-Translator: Cas Vankrunkelsven <cas.vankrunkelsven@protonmail.com>\n"
+"PO-Revision-Date: 2026-02-08 06:09+0000\n"
+"Last-Translator: Flying Piano <flyingpiano27@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/godot-engine/godot/"
 "nl/>\n"
 "Language: nl\n"
@@ -105,7 +106,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "Oké"
@@ -934,7 +935,7 @@ msgid "Inspect Filters"
 msgstr "Inspecteer Filters"
 
 msgid "Edit Filters"
-msgstr "Filters berwerken"
+msgstr "Filters bewerken"
 
 msgid "Output node can't be added to the blend tree."
 msgstr "Uitvoerknoop kan niet worden toegevoegd aan de overgangsboom."
@@ -1063,18 +1064,111 @@ msgstr "Er bestaat al een bibliotheek met deze naam."
 msgid "Animation name is valid."
 msgstr "Animatienaam is geldig."
 
+msgid "Global library will be created."
+msgstr "Globale bibliotheek zal worden gecreëerd."
+
+msgid "Library name is valid."
+msgstr "Bibliotheeknaam is geldig."
+
 msgid "Add Animation to Library: %s"
 msgstr "Animatie toevoegen aan bibliotheek: %s"
 
+msgid "Add Animation Library: %s"
+msgstr "Voeg Animatiebibliotheek toe: %s"
+
 msgid "Load Animation"
 msgstr "Animatie laden"
 
+msgid ""
+"This animation library can't be saved because it does not belong to the "
+"edited scene. Make it unique first."
+msgstr ""
+"Deze animatiebibliotheek kan niet opgeslagen worden omdat het niet bij de "
+"bewerkte scène hoort. Maak het eerst uniek."
+
+msgid ""
+"This animation library can't be saved because it was imported from another "
+"file. Make it unique first."
+msgstr ""
+"Deze animatiebibliotheek kan niet opgeslagen worden omdat het vanuit een "
+"ander bestand werd geïmporteerd. Maak het eerst uniek."
+
+msgid "Save Library"
+msgstr "Bibilotheek Opslaan"
+
+msgid "Make Animation Library Unique: %s"
+msgstr "Maak Animatiebibliotheek Uniek: %s"
+
+msgid ""
+"This animation can't be saved because it does not belong to the edited scene. "
+"Make it unique first."
+msgstr ""
+"Deze animatie kan niet opgeslagen worden omdat het niet bij de bewerkte scène "
+"hoort. Maak het eerst uniek."
+
+msgid ""
+"This animation can't be saved because it was imported from another file. Make "
+"it unique first."
+msgstr ""
+"Deze animatie kan niet opgeslagen worden omdat het vanuit een ander bestand "
+"werd geïmporteerd. Maak het eerst uniek."
+
+msgid "Save Animation"
+msgstr "Animatie Opslaan"
+
+msgid "Make Animation Unique: %s"
+msgstr "Animatie Uniek Maken: %s"
+
+msgid "Save Animation library to File: %s"
+msgstr "Animatiebibliotheek naar bestand opslaan: %s"
+
+msgid "Save Animation to File: %s"
+msgstr "Animatie naar bestand opslaan: %s"
+
+msgid ""
+"The file you selected is not a valid AnimationLibrary.\n"
+"\n"
+"If the animations you want are inside of this file, save them to a separate "
+"file first."
+msgstr ""
+"Het bestand dat u selecteerde is geen geldige animatiebibliotheek.\n"
+"\n"
+"Als de animaties zich bevinden in dit bestand, sla ze dan eerst op als een "
+"apart bestand."
+
+msgid "Some of the selected libraries were already added to the mixer."
+msgstr "Enkele geselecteerde bibliotheken waren al toegevoegd aan de mixer."
+
+msgid "Add Animation Libraries"
+msgstr "Voeg Animatiebibliotheken toe"
+
+msgid "Some Animation files were invalid."
+msgstr "Enkele animatiebestanden waren ongeldig."
+
+msgid "Some of the selected animations were already added to the library."
+msgstr "Enkele geselecteerde animaties waren al toegevoegd aan de bibliotheek."
+
+msgid "Load Animations into Library"
+msgstr "Animatie laden in Bibliotheek"
+
+msgid "Load Animation into Library: %s"
+msgstr "Animatie laden in Bibliotheek: %s"
+
+msgid "Rename Animation Library: %s"
+msgstr "Animatiebibliotheek Hernoemen: %s"
+
 msgid "[Global]"
 msgstr "[globaal]"
 
+msgid "Rename Animation: %s"
+msgstr "Animatie Hernoemen: %s"
+
 msgid "Animation Name:"
 msgstr "Animatienaam:"
 
+msgid "No animation resource in clipboard!"
+msgstr "Geen animatiebron in klembord!"
+
 msgid "Pasted Animation"
 msgstr "Geplakte Animatie"
 
@@ -1090,6 +1184,12 @@ msgstr "Maak Uniek"
 msgid "Open in Inspector"
 msgstr "Openen in de Inspecteur"
 
+msgid "Remove Animation Library: %s"
+msgstr "Verwijder Animatiebibliotheek: %s"
+
+msgid "Remove Animation from Library: %s"
+msgstr "Verwijder Animatie van Bibliotheek: %s"
+
 msgid "[built-in]"
 msgstr "[ingebouwd]"
 
@@ -1108,12 +1208,30 @@ msgstr "Laad animatie van bestand en voeg toe aan bibliotheek."
 msgid "Remove animation library."
 msgstr "Verwijder animatie bibliotheek."
 
+msgid "Copy animation to clipboard."
+msgstr "Animatie naar klembord kopiëren."
+
+msgid "Save animation to resource on disk."
+msgstr "Animatie naar bron opslaan op de schijf."
+
 msgid "Remove animation from Library."
 msgstr "Verwijder animatie van Bibliotheek."
 
+msgid "Edit Animation Libraries"
+msgstr "Animatiebibliotheken bewerken:"
+
+msgid "New Library"
+msgstr "Nieuwe Bibliotheek"
+
 msgid "Create new empty animation library."
 msgstr "Creëer nieuwe lege animatie bibliotheek."
 
+msgid "Load Library"
+msgstr "Bibliotheek Laden"
+
+msgid "Load animation library from disk."
+msgstr "Animatiebibliotheek laden vanaf de schijf."
+
 msgid "Resource"
 msgstr "Bron"
 
@@ -1138,12 +1256,18 @@ msgstr "Animatie Hernoemen"
 msgid "Change Animation Name:"
 msgstr "Verander Animatie Naam:"
 
+msgid "Delete Animation '%s'?"
+msgstr "Animatie '%s' wissen?"
+
 msgid "Remove Animation"
 msgstr "Verwijder Animatie"
 
 msgid "Invalid animation name!"
 msgstr "Ongeldige animatienaam!"
 
+msgid "Animation '%s' already exists!"
+msgstr "Animatie '%s' bestaat al!"
+
 msgid "Duplicate Animation"
 msgstr "Dupliceer Animatie"
 
@@ -1153,9 +1277,36 @@ msgstr "Meng met volgende aanpassing"
 msgid "Change Blend Time"
 msgstr "Wijzig overgangstijd"
 
+msgid "[Global] (create)"
+msgstr "[Globaal](creëren)"
+
+msgid "Pause/Stop Animation"
+msgstr "Pauze/Stop Animatie"
+
+msgid "Play Animation from Start"
+msgstr "Speel geselecteerde animatie vanaf het begin"
+
+msgid "Play Animation"
+msgstr "Animatie Afspelen"
+
+msgid "Play Animation Backwards"
+msgstr "Animatie­ Achterwaarts Afspelen"
+
+msgid "Play Animation Backwards from End"
+msgstr "Speel geselecteerde animatie achterwaarts vanaf het einde"
+
+msgid "Duplicated Animation Name:"
+msgstr "Gedupliceerde Animatienaam:"
+
+msgid "Onion skinning requires a RESET animation."
+msgstr "Onion Skinning vereist een RESET animatie."
+
 msgid "Animation"
 msgstr "Animatie"
 
+msgid "Toggle Animation Dock"
+msgstr "Animatiepaneel aan-/uitzetten"
+
 msgid "Animation position (in seconds)."
 msgstr "Animatie positie (in seconden)."
 
@@ -1168,6 +1319,9 @@ msgstr "Animatiehulpmiddelen"
 msgid "New..."
 msgstr "Nieuw…"
 
+msgid "Manage Animations..."
+msgstr "Beheer Animaties..."
+
 msgid "Duplicate..."
 msgstr "Dupliceren..."
 
@@ -1240,12 +1394,36 @@ msgstr "Overgangstijden:"
 msgid "Next (Auto Queue):"
 msgstr "Volgende (Auto wachtrij):"
 
+msgid "Reconnect Transition"
+msgstr "Herconnecteer Overgang"
+
 msgid "Move Node"
 msgstr "Knoop verplaatsen"
 
 msgid "Transition exists!"
 msgstr "Overgang bestaat!"
 
+msgid "Cannot transition to self!"
+msgstr "Kan niet overgaan naar zelf!"
+
+msgid "Cannot transition to \"Start\"!"
+msgstr "Kan niet overgaan naar \"Start\"!"
+
+msgid "Cannot transition from \"End\"!"
+msgstr "Kan niet overgaan van \"Einde\"!"
+
+msgid "Transition from \"%s\" to \"%s\" already exists!"
+msgstr "Overgang van \"%s\" naar \"%s\" bestaat al!"
+
+msgid "Edit %s"
+msgstr "Bewerk %s"
+
+msgid "Add Node and Transition"
+msgstr "Voeg Knoop en Overgang toe"
+
+msgid "Transition already exists!"
+msgstr "Overgang bestaat al!"
+
 msgid "Add Transition"
 msgstr "Voeg vertaling toe"
 
@@ -1270,6 +1448,20 @@ msgstr "Knoop verwijderd"
 msgid "Transition Removed"
 msgstr "Overgang Verwijderd"
 
+msgid ""
+"Select and move nodes.\n"
+"RMB: Add node at position clicked.\n"
+"Shift+LMB+Drag: Connects the selected node with another node or creates a new "
+"node if you select an area without nodes."
+msgstr ""
+"Selecteer en verplaats knopen.\n"
+"rechtermuisknop: voeg knoop op de geklikte positie toe.\n"
+"Shift+linkermuisknop+slepen: Connecteer de geselecteerde knoop met een andere "
+"knoop of maak een nieuwe knoop als je een gebied zonder knoop selecteert."
+
+msgid "Select and move nodes."
+msgstr "Selecteer en verplaats knopen."
+
 msgid "Create new nodes."
 msgstr "Nieuwe knopen maken."
 
@@ -1850,6 +2042,12 @@ msgstr "Naar volgende stap gaan"
 msgid "Go to Previous Step"
 msgstr "Naar vorige stap gaan"
 
+msgid "Add tracks to RESET"
+msgstr "Voeg sporen aan RESET toe"
+
+msgid "Apply RESET"
+msgstr "RESET toepassen"
+
 msgid "Bake Animation..."
 msgstr "Animatie bakken…"
 
@@ -1997,6 +2195,12 @@ msgstr "Alles/niets selecteren"
 msgid "Copy Selection"
 msgstr "Selectie kopiëren"
 
+msgid "Key Insertion Error"
+msgstr "Fout bij het invoeren van de sleutel"
+
+msgid "Imported Animation cannot be edited!"
+msgstr "Geïmporteerde Animatie kan niet worden aangepast!"
+
 msgid "Animation Change Keyframe Time"
 msgstr "Animatie sleutelframe-tijd wijzigen"
 
@@ -2084,6 +2288,12 @@ msgstr "Pad:"
 msgid "Open asset details"
 msgstr "Asset-informatie openen"
 
+msgid "Title"
+msgstr "Titel"
+
+msgid "Category"
+msgstr "Categorie"
+
 msgid "Author"
 msgstr "Auteur"
 
@@ -2168,6 +2378,9 @@ msgstr "SHA256-hash controle mislukt"
 msgid "Asset Download Error:"
 msgstr "Asset-downloadfout:"
 
+msgid "Ready to install!"
+msgstr "Klaar om te installeren!"
+
 msgid "Downloading (%s / %s)..."
 msgstr "Bezig met neerladen (%s / %s)..."
 
@@ -2244,6 +2457,12 @@ msgctxt "Pagination"
 msgid "Last"
 msgstr "Laatste"
 
+msgid "Go Online"
+msgstr "Ga Online"
+
+msgid "Failed to get repository configuration."
+msgstr "Gefaald om de configuratie van de opslagplaats te verkrijgen."
+
 msgid "All"
 msgstr "Alle"
 
@@ -3185,12 +3404,24 @@ msgstr "Openen in Bestandsbeheer"
 msgid "Class"
 msgstr "Klasse"
 
+msgid "Enumeration"
+msgstr "Enumeratie"
+
 msgid "Constant"
 msgstr "Constante"
 
+msgid "Metadata"
+msgstr "Metadata"
+
+msgid "Setting"
+msgstr "Instelling"
+
 msgid "Property"
 msgstr "Eigenschap"
 
+msgid "Internal Property"
+msgstr "Interne eigenschap"
+
 msgid "This property can only be set in the Inspector."
 msgstr "Deze eigenschap kan alleen worden ingesteld in de Inspector."
 
@@ -3206,6 +3437,19 @@ msgstr "Signaal"
 msgid "Annotation"
 msgstr "Annotatie"
 
+msgid "Local Constant"
+msgstr "Lokale Constante"
+
+msgid "Local Variable"
+msgstr "Lokale variabele"
+
+msgid "This variable may be changed or removed in future versions."
+msgstr ""
+"Deze variabele kan in toekomstige versies worden gewijzigd of verwijderd."
+
+msgid "Text File"
+msgstr "Tekst­bestand"
+
 msgid "File"
 msgstr "Bestand"
 
@@ -3339,6 +3583,9 @@ msgstr "Tabblad naar rechts verschuiven"
 msgid "Make Floating"
 msgstr "Maak zwevend"
 
+msgid "Link to: %s"
+msgstr "Link naar: %s"
+
 msgid "Favorites:"
 msgstr "Favorieten:"
 
@@ -3679,6 +3926,12 @@ msgstr "De zojuist bewerkte bron opslaan."
 msgid "Save As..."
 msgstr "Opslaan Als..."
 
+msgid "Extra resource options."
+msgstr "Extra bron opties."
+
+msgid "Edit Resource from Clipboard"
+msgstr "Wijzig Bron vanuit Klembord"
+
 msgid "Copy Resource"
 msgstr "Bron kopiëren"
 
@@ -3691,6 +3944,9 @@ msgstr "Open Godot online documentatie."
 msgid "Open Documentation"
 msgstr "Documentatie openen"
 
+msgid "Manage object properties."
+msgstr "Beheer objecteigenschappen."
+
 msgid "Error loading scene from %s"
 msgstr "Fout bij het laden van scène uit %s"
 
@@ -4680,6 +4936,12 @@ msgstr "Open de map waarin deze templates zitten."
 msgid "Uninstall these templates."
 msgstr "Deze templates verwijderen."
 
+msgid "There are no mirrors available."
+msgstr "Er zijn geen mirrors beschikbaar."
+
+msgid "Retrieving the mirror list..."
+msgstr "Mirrors ophalen..."
+
 msgid "Starting the download..."
 msgstr "Starten van de download..."
 
@@ -4745,6 +5007,9 @@ msgstr "Export Sjablonen Uitpakken"
 msgid "Importing:"
 msgstr "Bezit met importeren:"
 
+msgid "Remove templates for the version '%s'?"
+msgstr "Verwijder sjablonen voor de versie '%s'?"
+
 msgid "Export templates are missing. Download them or install from a file."
 msgstr ""
 "Geen exportsjablonen gevonden. Download de exportsjablonen of installeer ze "
@@ -4791,9 +5056,18 @@ msgstr ""
 "Download en installeer sjablonen voor de huidige versie vanuit de best "
 "mogelijke server."
 
+msgid "Install from File"
+msgstr "Vanuit bestand installeren"
+
 msgid "Install templates from a local file."
 msgstr "Sjablonen importeren Vanuit ZIP-Bestand."
 
+msgid "Cancel the download of the templates."
+msgstr "Annuleer de download van de sjablonen."
+
+msgid "Other Installed Versions:"
+msgstr "Andere Geïnstalleerde Versies:"
+
 msgid "Uninstall Template"
 msgstr "Sjabloon verwijderen"
 
@@ -5361,6 +5635,9 @@ msgstr "Verplaatsen"
 msgid "No sub-resources found."
 msgstr "Geen deel-hulpbronnen gevonden."
 
+msgid "Open a list of sub-resources."
+msgstr "Open een lijst van deel-hulpbronnen."
+
 msgid "Remove Item"
 msgstr "Verwijder Item"
 
diff --git a/engine/editor/translations/editor/pl.po b/engine/editor/translations/editor/pl.po
index fb03566d..c8a52391 100644
--- a/engine/editor/translations/editor/pl.po
+++ b/engine/editor/translations/editor/pl.po
@@ -102,7 +102,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-16 10:01+0000\n"
+"PO-Revision-Date: 2026-02-05 19:02+0000\n"
 "Last-Translator: Tomek <kobewi4e@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/godot/"
 "pl/>\n"
@@ -112,7 +112,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
@@ -4296,7 +4296,7 @@ msgid ""
 "Select a resource file in the filesystem or in the inspector to adjust import "
 "settings."
 msgstr ""
-"Wybierz plik zasobu z systemu plików lub z inspektoraby zmienić ustawienia "
+"Wybierz plik zasobu z systemu plików lub z inspektora, aby zmienić ustawienia "
 "importu."
 
 msgid ""
diff --git a/engine/editor/translations/editor/ru.po b/engine/editor/translations/editor/ru.po
index 761b67f5..45660160 100644
--- a/engine/editor/translations/editor/ru.po
+++ b/engine/editor/translations/editor/ru.po
@@ -205,7 +205,7 @@
 # Kiril Yakymchuk <stbestich@gmail.com>, 2025.
 # ogyrec <ogyrec.off@gmail.com>, 2025.
 # Mister Ky <afanasievsergiy3524@gmail.com>, 2025.
-# JekSun97 <jeksun2022@gmail.com>, 2025.
+# JekSun97 <jeksun2022@gmail.com>, 2025, 2026.
 # sqwirex <nikolaev.alex.080706@mail.ru>, 2025.
 # Account Rush Royale#1 <ghhh5238unq1@gmail.com>, 2025.
 # Igor Shapilov <shatiger@yandex.ru>, 2025.
@@ -232,13 +232,15 @@
 # cofeek-codes <11kormyshev11@gmail.com>, 2025.
 # daodan <karovich16@gmail.com>, 2026.
 # Artyom <artem.natharov@gmail.com>, 2026.
+# MariyaShikunova <mariia@basealt.ru>, 2026.
+# Rémi Verschelde <remi@godotengine.org>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-23 06:34+0000\n"
-"Last-Translator: Artyom <artem.natharov@gmail.com>\n"
+"PO-Revision-Date: 2026-02-13 13:16+0000\n"
+"Last-Translator: Rémi Verschelde <remi@godotengine.org>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ru/>\n"
 "Language: ru\n"
@@ -261,6 +263,9 @@ msgstr "Недоступен"
 msgid "Unconfigured"
 msgstr "Не настроено"
 
+msgid "Unauthorized"
+msgstr "Неавторизовано"
+
 msgid "Parameter out of range"
 msgstr "Параметр вне диапазона"
 
@@ -360,6 +365,9 @@ msgstr "Ошибка компиляции"
 msgid "Method not found"
 msgstr "Метод не найден"
 
+msgid "Link failed"
+msgstr "Ошибка связи"
+
 msgid "Script failed"
 msgstr "Ошибка выполнения скрипта"
 
@@ -378,12 +386,18 @@ msgstr "Ошибка синтаксического анализа"
 msgid "Busy"
 msgstr "Занят"
 
+msgid "Skip"
+msgstr "Пропустить"
+
 msgid "Help"
 msgstr "Справка"
 
 msgid "Bug"
 msgstr "Баг"
 
+msgid "Printer on fire"
+msgstr "Принтер в огне"
+
 msgid "unset"
 msgstr "Не задано"
 
@@ -1838,6 +1852,9 @@ msgctxt "Bezier Handle Mode"
 msgid "Mirrored"
 msgstr "Отзеркаленный"
 
+msgid "Handle mode: %s"
+msgstr "Режим обработки: %s"
+
 msgid "Stream:"
 msgstr "Поток:"
 
@@ -1892,6 +1909,9 @@ msgstr "Вырезать ключ(и)"
 msgid "Copy Key(s)"
 msgstr "Копировать ключ(и)"
 
+msgid "Send Key(s) to RESET"
+msgstr "Отправить ключ(и) для RESET"
+
 msgid "Delete Key(s)"
 msgstr "Удалить ключ(и)"
 
@@ -6929,6 +6949,12 @@ msgstr "Редактор зависимостей"
 msgid "Owners of: %s (Total: %d)"
 msgstr "Владельцы: %s (всего: %d)"
 
+msgid "No owners found for: %s"
+msgstr "Владельцев для %s не найдено"
+
+msgid "Owners List"
+msgstr "Список владельцев"
+
 msgid "Localization remap"
 msgstr "Переназначение локализации"
 
@@ -7333,6 +7359,9 @@ msgstr "Выбрать ресурс"
 msgid "Select Scene"
 msgstr "Выбрать сцену"
 
+msgid "Recursion detected, Instant Preview failed."
+msgstr "Обнаружена рекурсия, предварительный просмотр не удался."
+
 msgid "Instant Preview"
 msgstr "Мгновенный предварительный просмотр"
 
@@ -8248,6 +8277,12 @@ msgstr "Добавить перевод"
 msgid "Lock/Unlock Component Ratio"
 msgstr "Блокировка/разблокировка соотношения компонентов"
 
+msgid "This %s is used in %d place."
+msgid_plural "This %s is used in %d places."
+msgstr[0] "Этот %s используется в %d месте."
+msgstr[1] "Этот %s используется в %d местах."
+msgstr[2] "Этот %s используется в %d местах."
+
 msgid "This %s is external to scene."
 msgstr "Этот %s находится вне сцены."
 
@@ -9328,9 +9363,24 @@ msgstr "Обновление ресурсов проекта"
 msgid "Re-saving resource:"
 msgstr "Повторное сохранение ресурса:"
 
+msgid "Run the project's main scene."
+msgstr "Запустите основную сцену проекта."
+
+msgid "Play the currently edited scene."
+msgstr "Запустить редактируемую в данный момент сцену."
+
 msgid "Play a custom scene."
 msgstr "Запустить произвольную сцену."
 
+msgid "Reload the played scene that was being edited."
+msgstr "Перезагрузить воспроизводимую редактируемую сцену."
+
+msgid "Reload the played custom scene."
+msgstr "Перезагрузить воспроизводимую сцену."
+
+msgid "Reload the played main scene."
+msgstr "Перезагрузить воспроизводимую основную сцену."
+
 msgid ""
 "Movie Maker mode is enabled, but no movie file path has been specified.\n"
 "A default movie file path can be specified in the project settings under the "
@@ -9544,18 +9594,40 @@ msgstr "Встраивание игры недоступно, если игра
 msgid "Game embedding not available in single window mode."
 msgstr "Встраивание игры недоступно в режиме одного окна."
 
+msgid "Game embedding not available when the game starts in headless mode."
+msgstr "Встраивание игры недоступно, если игра запущена в режиме headless."
+
 msgid "Unmute game audio."
 msgstr "Включить звук в игре."
 
 msgid "Mute game audio."
-msgstr "Заглушить аудио игры."
+msgstr "Заглушить звук игры."
+
+msgid "%s+Alt+RMB: Show list of all nodes at position clicked."
+msgstr "%s+Alt+ПКМ: Отобразить список всех узлов в позиции щелчка."
 
 msgid "Suspend"
 msgstr "Приостановить"
 
+msgid ""
+"Force pause at SceneTree level. Stops all processing, but you can still "
+"interact with the project."
+msgstr ""
+"Принудительная пауза на уровне SceneTree. Останавливает всю обработку, но вы "
+"по-прежнему можете взаимодействовать с проектом."
+
+msgid "Change the game speed."
+msgstr "Изменить скорость игры."
+
 msgid "Speed State"
 msgstr "Скорость Игры"
 
+msgid "Reset the game speed."
+msgstr "Сбросить скорость игры."
+
+msgid "Reset Speed"
+msgstr "Сбросить скорость"
+
 msgid "Input"
 msgstr "Ввод"
 
@@ -9580,6 +9652,15 @@ msgstr "Показать список доступных для выбора у
 msgid "Toggle Selection Visibility"
 msgstr "Переключить видимость выделения"
 
+msgid "Selection Options"
+msgstr "Варианты выбора"
+
+msgid "Don't Select Locked Nodes"
+msgstr "Не выбирать заблокированные узлы"
+
+msgid "Select Group Over Children"
+msgstr "Выбирать группу вместо дочерних узлов"
+
 msgid "Override the in-game camera."
 msgstr "Переопределить игровую камеру."
 
@@ -9607,6 +9688,12 @@ msgstr "Встроить игру в Next Play"
 msgid "Make Game Workspace Floating on Next Play"
 msgstr "Сделать игровое рабочее пространство плавающим c Next Play"
 
+msgid "Embedded Window Sizing"
+msgstr "Изменение размера встроенного окна"
+
+msgid "Fixed Size"
+msgstr "Фиксированный размер"
+
 msgid ""
 "Embedded game size is based on project settings.\n"
 "The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
@@ -9616,9 +9703,15 @@ msgstr ""
 "Режим «Сохранить соотношение сторон» используется, когда игровое рабочее "
 "пространство меньше желаемого размера."
 
+msgid "Keep Aspect Ratio"
+msgstr "Сохраняйте соотношение сторон"
+
 msgid "Keep the aspect ratio of the embedded game."
 msgstr "Сохраните соотношение сторон встроенной игры."
 
+msgid "Stretch to Fit"
+msgstr "Растягивать чтобы соответствовать размеру"
+
 msgid "Embedded game size stretches to fit the Game Workspace."
 msgstr ""
 "Размер встроенной игры растягивается в соответствии с размером игрового "
@@ -9735,15 +9828,36 @@ msgstr "Создать прям. видимости"
 msgid "Load Emission Mask"
 msgstr "Загрузить маску излучения"
 
+msgid "Mask Texture"
+msgstr "Текстура маски"
+
 msgid "Solid Pixels"
 msgstr "Залитые пиксели"
 
 msgid "Border Pixels"
 msgstr "Граничные пиксели"
 
+msgid "Mask Mode"
+msgstr "Режим маски"
+
+msgid "Generate"
+msgstr "Сгенерировать"
+
+msgid "Texture"
+msgstr "Текстура"
+
+msgid "Direction Mode"
+msgstr "Режим направления"
+
+msgid "Direction Texture"
+msgstr "Текстура направления"
+
 msgid "Centered"
 msgstr "По центру"
 
+msgid "Copy Color from Mask Texture"
+msgstr "Скопировать цвет из текстуры маски"
+
 msgid "Generating Visibility Rect (Waiting for Particle Simulation)"
 msgstr "Создание прям. видимости (ожидание симуляции частиц)"
 
@@ -9753,6 +9867,21 @@ msgstr "Генерация…"
 msgid "Loading emission mask requires ParticleProcessMaterial."
 msgstr "Для загрузки маски эмиссии требуется ParticleProcessMaterial."
 
+msgid "Failed to load mask texture."
+msgstr "Не удалось загрузить текстуру маски."
+
+msgid "Failed to convert mask texture to RGBA8."
+msgstr "Не удалось преобразовать текстуру маски в формат RGBA8."
+
+msgid "Mask texture has an invalid size."
+msgstr "Текстура маски имеет недопустимый размер."
+
+msgid "Failed to load direction texture."
+msgstr "Не удалось загрузить текстуру направления."
+
+msgid "Failed to convert direction texture to RGBA8."
+msgstr "Не удалось преобразовать текстуру направления в формат RGBA8."
+
 msgid ""
 "Direction texture has an invalid size. It must have the same size as the mask "
 "texture."
@@ -9909,6 +10038,9 @@ msgstr "Покрасить веса костей"
 msgid "Polygon"
 msgstr "Полигон"
 
+msgid "Toggle Polygon Dock"
+msgstr "Переключить нижнюю панель полигонов"
+
 msgid "Points"
 msgstr "Точки"
 
@@ -10445,6 +10577,9 @@ msgstr ""
 msgid "TileMap"
 msgstr "Карта тайлов"
 
+msgid "Open TileMap Dock"
+msgstr "Открыть панель TileMap"
+
 msgid "Select Next Tile Map Layer"
 msgstr "Выбрать следующий слой карты тайлов"
 
@@ -10923,6 +11058,9 @@ msgstr "Добавить источник атласа"
 msgid "TileSet"
 msgstr "Набор тайлов"
 
+msgid "Open TileSet Dock"
+msgstr "Открыть панель TileSet"
+
 msgid "Tile Sources"
 msgstr "Источник плиток"
 
@@ -11257,6 +11395,12 @@ msgstr "Не удалось создать сферическую форму."
 msgid "Couldn't create a primitive collision shape."
 msgstr "Не удалось создать примитивную форму столкновения."
 
+msgid "Create %s Collision Shape Sibling"
+msgstr "Создать соседнюю фигуру столкновения %s"
+
+msgid "Create %s Static Body Child"
+msgstr "Создать %s Дочерний элемент статического тела"
+
 msgid "Trimesh"
 msgstr "Треугольная сетка"
 
@@ -11266,9 +11410,18 @@ msgstr "Одиночная выпуклость"
 msgid "Simplified Convex"
 msgstr "Упрощённая выпуклость"
 
+msgid "Create %s Collision Shape Siblings"
+msgstr "Создать %s Соседние объекты формы столкновения"
+
+msgid "Create %s Static Body Children"
+msgstr "Создать %s Дочерние элементы статического тела"
+
 msgid "Multiple Convex"
 msgstr "Множественная выпуклость"
 
+msgid "Bounding Box"
+msgstr "Ограничивающая рамка"
+
 msgid "Capsule"
 msgstr "Капсула"
 
@@ -11278,6 +11431,9 @@ msgstr "Цилиндр"
 msgid "Sphere"
 msgstr "Сфера"
 
+msgid "Primitive"
+msgstr "Примитив"
+
 msgid "Can't create a collision shape as sibling for the scene root."
 msgstr ""
 "Невозможно создать форму столкновений как одноуровневый элемент для корня "
@@ -11420,6 +11576,15 @@ msgstr ""
 "Создаёт форму столкновений на основе полигонов.\n"
 "Это самый точный (но самый медленный) способ обнаружения столкновений."
 
+msgid ""
+"Creates a single convex collision shape.\n"
+"This is the faster than the trimesh or multiple convex option, but is less "
+"accurate for collision detection."
+msgstr ""
+"Создает единую выпуклую форму столкновения.\n"
+"Это быстрее, чем вариант с тримешей или несколькими выпуклыми формами, но "
+"менее точно для обнаружения столкновений."
+
 msgid ""
 "Creates a simplified convex collision shape.\n"
 "This is similar to single collision shape, but can result in a simpler "
@@ -11429,21 +11594,103 @@ msgstr ""
 "Она похожа на одиночную форму столкновений, но в некоторых случаях может "
 "получиться более простая геометрия, ценой снижения точности."
 
+msgid ""
+"Creates multiple convex collision shapes. These are decomposed from the "
+"original mesh.\n"
+"This is a performance and accuracy middle-ground between a single convex "
+"collision and a polygon-based trimesh collision."
+msgstr ""
+"Создает несколько выпуклых форм столкновения. Они генерируются из исходной "
+"сетки.\n"
+"Это компромиссное решение с точки зрения производительности и точности, "
+"занимающее промежуточное положение между столкновением с одной выпуклой "
+"формой и столкновением на основе полигональных тримешей."
+
+msgid ""
+"Creates an bounding box collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in BoxMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Создает форму столкновения в виде ограничивающего параллелепипеда.\n"
+"Если форма не является встроенной формой BoxMesh, будет использоваться AABB "
+"сетки.\n"
+"Это быстрее, чем вариант с выпуклой формой столкновения для обнаружения "
+"столкновений."
+
+msgid ""
+"Creates a capsule collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in CapsuleMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Создает форму столкновения в виде капсулы.\n"
+"Если форма не является встроенной CapsuleMesh, будет использоваться AABB "
+"сетки.\n"
+"Это быстрее, чем вариант с выпуклой формой столкновения для обнаружения "
+"столкновений."
+
+msgid ""
+"Creates a cylinder collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in CylinderMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Создает цилиндрическую форму столкновения.\n"
+"Если форма не является встроенной CylinderMesh, будет использоваться AABB "
+"сетки.\n"
+"Это быстрее, чем вариант с выпуклой формой столкновения для обнаружения "
+"столкновений."
+
+msgid ""
+"Creates a sphere collision shape.\n"
+"This will use the mesh's AABB if the shape is not a built-in SphereMesh.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Создает сферическую форму столкновения.\n"
+"Если форма не является встроенной SphereMesh, будет использоваться AABB "
+"сетки.\n"
+"Это быстрее, чем вариант с выпуклой формой столкновения для обнаружения "
+"столкновений."
+
+msgid ""
+"Creates a box, capsule, cylinder, or sphere primitive collision shape if the "
+"mesh is a primitive.\n"
+"The mesh must use the built-in BoxMesh, CapsuleMesh, CylinderMesh, or "
+"SphereMesh primitive.\n"
+"This is faster than the convex collision shape option for collision detection."
+msgstr ""
+"Создает примитивную форму столкновения в виде коробки, капсулы, цилиндра или "
+"сферы, если сетка является примитивом.\n"
+"Сетка должна использовать встроенный примитив BoxMesh, CapsuleMesh, "
+"CylinderMesh или SphereMesh.\n"
+"Это быстрее, чем вариант с выпуклой формой столкновения для обнаружения "
+"столкновений."
+
 msgid "Alignment Axis"
 msgstr "Ось Выравнивания"
 
 msgid "Longest Axis"
 msgstr "Самая Длинная Ось"
 
+msgid "Create the shape along the longest axis of the mesh's AABB."
+msgstr "Создайте фигуру вдоль самой длинной оси AABB сетки."
+
 msgid "X-Axis"
 msgstr "Ось X"
 
+msgid "Create the shape along the local X-Axis."
+msgstr "Создайте фигуру вдоль локальной оси X."
+
 msgid "Y-Axis"
 msgstr "Ось Y"
 
+msgid "Create the shape along the local Y-Axis."
+msgstr "Создайте фигуру вдоль локальной оси Y."
+
 msgid "Z-Axis"
 msgstr "Ось Z"
 
+msgid "Create the shape along the local Z-Axis."
+msgstr "Создайте фигуру вдоль локальной оси Z."
+
 msgid "UV Channel Debug"
 msgstr "Отладка UV-канала"
 
@@ -11663,6 +11910,24 @@ msgstr ""
 "Этот режим отладки отрисовки поддерживается только при использовании "
 "рендерера Forward+."
 
+msgid "X: %s"
+msgstr "X: %s"
+
+msgid "Y: %s"
+msgstr "Y: %s"
+
+msgid "Z: %s"
+msgstr "Z: %s"
+
+msgid "Size: %s (%.1fMP)"
+msgstr "Размер: %s (%.1fМП)"
+
+msgid "Objects: %d"
+msgstr "Объекты: %d"
+
+msgid "Primitives: %d"
+msgstr "Примитивы: %d"
+
 msgid "Draw Calls: %d"
 msgstr "Вызовы отрисовки: %d"
 
@@ -11836,6 +12101,16 @@ msgstr ""
 msgid "SDFGI Probes"
 msgstr "Зонды ГОПРсЗ"
 
+msgid ""
+"Left-click a SDFGI probe to display its occlusion information (white = not "
+"occluded, red = fully occluded).\n"
+"Requires SDFGI to be enabled in Environment to have a visible effect."
+msgstr ""
+"Щелкните левой кнопкой мыши по зонду SDFGI, чтобы отобразить информацию о его "
+"перекрытии (белый цвет = не перекрыто, красный цвет = полностью перекрыто).\n"
+"Для видимого эффекта необходимо включить SDFGI в настройках среды "
+"(Environment)."
+
 msgid "Scene Luminance"
 msgstr "Яркость сцены"
 
@@ -12378,9 +12653,24 @@ msgstr "Настройки…"
 msgid "Snap Settings"
 msgstr "Параметры привязки"
 
+msgid "Translate Snap"
+msgstr "Привязка перемещения"
+
 msgid "Translate Snap:"
 msgstr "Привязка перемещения:"
 
+msgid "Rotate Snap"
+msgstr "Привязка вращения"
+
+msgid "Rotate Snap:"
+msgstr "Привязка вращения:"
+
+msgid "Scale Snap"
+msgstr "Привязка масштабирования"
+
+msgid "Scale Snap:"
+msgstr "Привязка масштабирования:"
+
 msgid "Viewport Settings"
 msgstr "Параметры окна просмотра"
 
@@ -12758,6 +13048,13 @@ msgstr "Вставить ключ (на основе маски) для всех
 msgid "Insert Key (All Bones)"
 msgstr "Вставить ключ (все кости)"
 
+msgid "Insert key (based on mask) for modified bones with an existing track."
+msgstr ""
+"Вставить ключ (на основе маски) для измененных костей с существующей дорожкой."
+
+msgid "Insert new key (based on mask) for all modified bones."
+msgstr "Вставьте новый ключ (на основе маски) для всех измененных костей."
+
 msgid "Bone Transform"
 msgstr "Трансформация кости"
 
@@ -12906,6 +13203,9 @@ msgstr "Вращение:"
 msgid "Alt+Drag: Move selected node."
 msgstr "Alt+перетаскивание: перемещение выбранного узла."
 
+msgid "%s+Alt+Drag: Scale selected node."
+msgstr "%s+Alt+Перетаскивание: Масштабирование выбранного узла."
+
 msgid "V: Set selected node's pivot position."
 msgstr "V: задать положение оси выбранного узла."
 
@@ -13076,6 +13376,9 @@ msgstr "Центрировать выбранное"
 msgid "Frame Selection"
 msgstr "Кадрировать выбранное"
 
+msgid "Auto Resample CanvasItems"
+msgstr "Автоматическое изменение размера элементов холста"
+
 msgid "Preview Canvas Scale"
 msgstr "Предпросмотр масштаба холста"
 
@@ -13313,6 +13616,9 @@ msgstr "Редактировать…"
 msgid "Go to Method"
 msgstr "Перейти к методу"
 
+msgid "Select a single node or resource to edit its signals."
+msgstr "Выберите один узел или ресурс, чтобы отредактировать его сигналы."
+
 msgid "Load Curve Preset"
 msgstr "Загрузить предустановку кривых"
 
@@ -13373,6 +13679,9 @@ msgstr "Закрыть все вкладки"
 msgid "Add a new scene."
 msgstr "Добавить новую сцену."
 
+msgid "Show Opened Scenes List"
+msgstr "Показать список открытых сцен"
+
 msgid "Add Gradient Point"
 msgstr "Добавить точку градиента"
 
@@ -14097,12 +14406,18 @@ msgstr ""
 msgid "Theme"
 msgstr "Тема"
 
+msgid "Toggle Theme Dock"
+msgstr "Переключить панель Тема"
+
 msgid "Theme:"
 msgstr "Тема:"
 
 msgid "Manage Items..."
 msgstr "Управление элементами…"
 
+msgid "Add, remove, organize, and import Theme items."
+msgstr "Добавляйте, удаляйте, упорядочивайте и импортируйте элементы темы."
+
 msgid "Add Preview"
 msgstr "Добавить превью"
 
@@ -14343,6 +14658,9 @@ msgstr "Вставить ресурс"
 msgid "ResourcePreloader"
 msgstr "ResourcePreloader (Предварительный загрузчик ресурсов)"
 
+msgid "Toggle ResourcePreloader Dock"
+msgstr "Переключить нижнюю панель «Предзагрузка ресурсов»"
+
 msgid "Load Resource"
 msgstr "Загрузить ресурс"
 
@@ -14573,6 +14891,12 @@ msgstr "Добавить пустоту"
 msgid "Move Frame"
 msgstr "Переместить кадр"
 
+msgid "Cut Animation"
+msgstr "Вырезать анимацию"
+
+msgid "Paste Animation"
+msgstr "Вставить анимацию"
+
 msgid "Delete Animation?"
 msgstr "Удалить анимацию?"
 
@@ -14585,9 +14909,15 @@ msgstr "Задать длительность кадра"
 msgid "SpriteFrames"
 msgstr "Кадры спрайта"
 
+msgid "Open SpriteFrames Dock"
+msgstr "Открыть панель SpriteFrames"
+
 msgid "Animations:"
 msgstr "Анимации:"
 
+msgid "Copy Animation"
+msgstr "Копировать анимацию"
+
 msgid "Delete Animation"
 msgstr "Удалить анимацию"
 
@@ -14621,6 +14951,9 @@ msgstr "Длительность кадра:"
 msgid "Zoom Reset"
 msgstr "Сбросить масштабирование"
 
+msgid "Add Frame from File"
+msgstr "Добавить кадр из файла"
+
 msgid "Add Frames from Sprite Sheet"
 msgstr "Добавить кадры из таблицы спрайтов"
 
@@ -14684,6 +15017,9 @@ msgstr "Ничего не выбирать"
 msgid "Toggle Settings Panel"
 msgstr "Включить или отключить панель настройки"
 
+msgid "Zoom to Fit"
+msgstr "Увеличить для соответствия размеру"
+
 msgid "Horizontal"
 msgstr "По горизонтали"
 
@@ -14831,6 +15167,9 @@ msgstr "Заменить…"
 msgid "Replace in Files"
 msgstr "Заменить в файлах"
 
+msgid "Keep Results"
+msgstr "Хранить результаты"
+
 msgid "Keep these results and show subsequent results in a new window"
 msgstr ""
 "Сохраните эти результаты и отобразите последующие результаты в новом окне"
@@ -14841,6 +15180,9 @@ msgstr "Заменить всё (НЕЛЬЗЯ ОТМЕНИТЬ)"
 msgid "Searching..."
 msgstr "Поиск…"
 
+msgid "Replace all matches in file"
+msgstr "Заменить все совпадения в файле"
+
 msgid "Remove result"
 msgstr "Удалить результат"
 
@@ -15747,6 +16089,9 @@ msgstr "3D-редактор"
 msgid "Scene Tree Editing"
 msgstr "Редактирование дерева сцен"
 
+msgid "Node Dock (deprecated)"
+msgstr "Панель узлов (устарела)"
+
 msgid "FileSystem Dock"
 msgstr "Панель «Файловая система»"
 
@@ -15759,6 +16104,12 @@ msgstr "Панель «История»"
 msgid "Game View"
 msgstr "Просмотр Игры"
 
+msgid "Signals Dock"
+msgstr "Панель Сигналы"
+
+msgid "Groups Dock"
+msgstr "Панель Групп"
+
 msgid "Allows to view and edit 3D scenes."
 msgstr "Позволяет просматривать и редактировать 3D-сцены."
 
@@ -16263,6 +16614,9 @@ msgstr ""
 msgid "ShaderFile"
 msgstr "Файл шейдера"
 
+msgid "Toggle ShaderFile Dock"
+msgstr "Переключить панель ShaderFile"
+
 msgid "Set Shader Global Variable"
 msgstr "Задать глобальную переменную шейдера"
 
@@ -16596,6 +16950,9 @@ msgstr "Копировать параметры из материала"
 msgid "Paste Parameters To Material"
 msgstr "Вставить параметры в материал"
 
+msgid "Forward+/Mobile"
+msgstr "Forward+/Мобильный"
+
 msgid ""
 "Only supported in the Forward+ and Mobile rendering methods, not "
 "Compatibility."
@@ -17690,6 +18047,9 @@ msgstr "Отключить предварительный просмотр пе
 msgid "Previewing translation. Click to disable."
 msgstr "Предварительный просмотр перевода. Нажмите, чтобы отключить."
 
+msgid "No Translations Configured"
+msgstr "Переводы не настроены"
+
 msgid "You can add translations in the Project Settings."
 msgstr "Добавить переводы можно в настройках проекта."
 
@@ -17720,9 +18080,18 @@ msgstr "Удалить переназначение ресурсов"
 msgid "Remove Resource Remap Option"
 msgstr "Удалить параметр переназначения ресурсов"
 
+msgid "Add %d file for template generation"
+msgid_plural "Add %d files for template generation"
+msgstr[0] "Добавить %d файл для создания шаблона"
+msgstr[1] "Добавить %d файла для создания шаблона"
+msgstr[2] "Добавить %d файлов для создания шаблона"
+
 msgid "Remove file from template generation"
 msgstr "Удалить файл из процесса генерации шаблона"
 
+msgid "Rearrange Localization Items"
+msgstr "Переставьте элементы локализации"
+
 msgid "Removed"
 msgstr "Удалено"
 
@@ -18092,6 +18461,9 @@ msgstr "Значение аргумента - это ранее освобожд
 msgid "Export Scene to glTF 2.0 File"
 msgstr "Экспортировать сцену в файл glTF 2.0"
 
+msgid "Export Settings"
+msgstr "Экспорт настроек"
+
 msgid "glTF 2.0 Scene..."
 msgstr "Сцена glTF 2.0…"
 
@@ -18160,6 +18532,9 @@ msgstr "GridMap: удалить выделенное"
 msgid "GridMap Fill Selection"
 msgstr "GridMap: заполнить выделенное"
 
+msgid "GridMap Move Selection"
+msgstr "Перемещение выделения GridMap"
+
 msgid "GridMap Paste Selection"
 msgstr "GridMap: вставить выделенное"
 
@@ -18267,6 +18642,15 @@ msgstr "Автоматически"
 msgid "Edit Transitions"
 msgstr "Редактировать переходы"
 
+msgid "Using any clip → %s."
+msgstr "Использование любого клипа → %s."
+
+msgid "Using %s → Any clip."
+msgstr "Использование %s → Любой клип."
+
+msgid "Using all clips → Any clip."
+msgstr "Использовать все клипы → Любой клип."
+
 msgid "No transition available."
 msgstr "Нет доступных переходов."
 
@@ -18708,18 +19092,102 @@ msgstr "Классы"
 msgid "Filter Classes"
 msgstr "Фильтр Классов"
 
+msgid "A Count"
+msgstr "A Количество"
+
+msgid "B Count"
+msgstr "B Количество"
+
+msgid "Delta"
+msgstr "Дельта"
+
+msgid "A: %s"
+msgstr "A: %s"
+
+msgid "B: %s"
+msgstr "B: %s"
+
+msgid "Objects"
+msgstr "Объекты"
+
+msgid "A Objects"
+msgstr "A Объекты"
+
+msgid "B Objects"
+msgstr "B Объекты"
+
+msgid "Nodes"
+msgstr "Узлы"
+
+msgid "A Nodes"
+msgstr "A Узлы"
+
+msgid "Combine Diff"
+msgstr "Объединить разницу"
+
+msgid "B Nodes"
+msgstr "B Узлы"
+
+msgid "Orphan Nodes"
+msgstr "Осиротевшие узлы"
+
 msgid "Snapshot A"
 msgstr "Привязка A"
 
 msgid "Snapshot B"
 msgstr "Привязка B"
 
+msgid "Filter Objects"
+msgstr "Фильтр объектов"
+
+msgid "Snapshot"
+msgstr "Снимок"
+
+msgid "Inbound References"
+msgstr "Входящие ссылки"
+
+msgid "Outbound References"
+msgstr "Исходящие ссылки"
+
+msgid "Object's class"
+msgstr "Класс объекта"
+
+msgid "Object"
+msgstr "Объект"
+
+msgid "Object's name"
+msgstr "Название объекта"
+
+msgid "In"
+msgstr "В"
+
+msgid "Number of inbound references"
+msgstr "Количество входящих ссылок"
+
+msgid "Out"
+msgstr "Из"
+
+msgid "Number of outbound references"
+msgstr "Количество исходящих ссылок"
+
+msgid "A"
+msgstr "А"
+
+msgid "Other object referencing this object"
+msgstr "Другой объект, ссылающийся на этот объект"
+
+msgid "Property of other object referencing this object"
+msgstr "Свойство другого объекта, ссылающегося на этот объект"
+
 msgid "Property of this object referencing other object"
 msgstr "Свойство этого объекта ссылается на другой объект"
 
 msgid "Other object being referenced"
 msgstr "Другой объект, на который делается ссылка"
 
+msgid "RefCounted"
+msgstr "RefCounted"
+
 msgid "Filter RefCounteds"
 msgstr "Фильтр RefCounted"
 
@@ -18747,6 +19215,18 @@ msgstr "Ссылки на ObjectDB + собственные ссылки"
 msgid "Cycles detected in the ObjectDB"
 msgstr "Обнаружены циклы в ObjectDB"
 
+msgid "Native References: %d"
+msgstr "Нативные ссылки: %d"
+
+msgid "ObjectDB References: %d"
+msgstr "Ссылки на ObjectDB: %d"
+
+msgid "Total References: %d"
+msgstr "Всего ссылок: %d"
+
+msgid "ObjectDB Cycles: %d"
+msgstr "Циклы ObjectDB: %d"
+
 msgid "[center]ObjectDB References[center]"
 msgstr "[center]Ссылки на ObjectDB[center]"
 
@@ -18786,6 +19266,9 @@ msgstr "Снимки ObjectDB фиксируют только память, пр
 msgid "Overview"
 msgstr "Обзор"
 
+msgid "RefCounteds"
+msgstr "RefCounted'ы"
+
 msgid "Timestamp:"
 msgstr "Отметка времени:"
 
@@ -18807,6 +19290,27 @@ msgstr "Всего объектов:"
 msgid "Total Nodes:"
 msgstr "Всего узлов:"
 
+msgid ""
+"Multiple root nodes [i](possible call to 'remove_child' without 'queue_free')"
+"[/i]"
+msgstr ""
+"Несколько корневых узлов [i](возможный вызов 'remove_child' без 'queue_free')"
+"[/i]"
+
+msgid ""
+"RefCounted objects only referenced in cycles [i](cycles often indicate a "
+"memory leaks)[/i]"
+msgstr ""
+"Объекты RefCounted, на которые ссылаются только в циклах [i](циклы часто "
+"указывают на утечку памяти)[/i]"
+
+msgid ""
+"Scripted objects not referenced by any other objects [i](unreferenced objects "
+"may indicate a memory leak)[/i]"
+msgstr ""
+"Скриптовые объекты, на которые не ссылаются другие объекты [i](неиспользуемые "
+"объекты могут указывать на утечку памяти)[/i]"
+
 msgid "Generating Snapshot"
 msgstr "Создание снимка"
 
@@ -18892,6 +19396,9 @@ msgstr "Удалить профиль взаимодействия"
 msgid "OpenXR Action Map"
 msgstr "Карта действий OpenXR"
 
+msgid "Toggle OpenXR Action Map Dock"
+msgstr "Переключить панель задач на OpenXR Action Map"
+
 msgid "Add Action Set"
 msgstr "Добавить набор действий"
 
@@ -19053,6 +19560,21 @@ msgstr "Маска видимости OpenXR должна иметь родит
 msgid "Building Android Project (gradle)"
 msgstr "Сборка проекта Android (gradle)"
 
+msgid "> Connecting to Gradle Build Environment..."
+msgstr "> Подключение к среде сборки Gradle..."
+
+msgid "Unable to connect to Gradle Build Environment service"
+msgstr "Не удалось подключиться к службе среды сборки Gradle"
+
+msgid "> Starting Gradle build..."
+msgstr "> Запуск сборки Gradle..."
+
+msgid "Failed to execute Gradle command"
+msgstr "Не удалось выполнить команду Gradle"
+
+msgid "> Copying Gradle artifacts..."
+msgstr "> Копирование артефактов Gradle..."
+
 msgid "Package name is missing."
 msgstr "Отсутствует имя пакета."
 
@@ -19090,6 +19612,11 @@ msgstr ""
 "Для использования модулей необходимо включить опцию «Использовать сборку "
 "Gradle» (Use Gradle Build)."
 
+msgid "Support for \"Use Gradle Build\" on Android is currently experimental."
+msgstr ""
+"Поддержка функции \"Использовать сборку Gradle\" на Android в настоящее время "
+"находится в экспериментальной стадии."
+
 msgid ""
 "\"Compress Native Libraries\" is only valid when \"Use Gradle Build\" is "
 "enabled."
@@ -19152,6 +19679,17 @@ msgstr ""
 "Для отключения функции \"Показать в библиотеке приложений\" необходимо "
 "включить опцию «Использовать сборку Gradle» (Use Gradle Build)."
 
+msgid "Mirror Android devices"
+msgstr "Зеркало устройств Android"
+
+msgid ""
+"If enabled, \"scrcpy\" is used to start the project and automatically stream "
+"device display (or virtual display) content."
+msgstr ""
+"Если эта функция включена, для запуска проекта и автоматической потоковой "
+"передачи содержимого с экрана устройства (или виртуального дисплея) "
+"используется команда \"scrcpy\"."
+
 msgid "Exporting APK..."
 msgstr "Экспорт APK…"
 
@@ -19167,6 +19705,13 @@ msgstr "Не удалось установить на устройство: %s"
 msgid "Running on device..."
 msgstr "Запуск на устройстве…"
 
+msgid ""
+"Could not start scrcpy executable. Configure scrcpy path in the Editor "
+"Settings (Export > Android > scrcpy > Path)."
+msgstr ""
+"Не удалось запустить исполняемый файл scrcpy. Настройте путь к scrcpy в "
+"параметрах редактора (Экспорт > Android > scrcpy > Путь)."
+
 msgid "Could not execute on device."
 msgstr "Не удалось выполнить на устройстве."
 
@@ -19616,6 +20161,22 @@ msgstr ""
 "Доступ к библиотеке фотографий включён, но описание использования не "
 "приведено."
 
+msgid "Liquid Glass Icons"
+msgstr "Иконки жидкого стекла"
+
+msgid "Could not start 'actool' executable."
+msgstr "Не удалось запустить исполняемый файл 'actool'."
+
+msgid "Could not read 'actool' version."
+msgstr "Не удалось прочитать версию 'actool'."
+
+msgid "At least version 26.0 of 'actool' is required (version %f found)."
+msgstr ""
+"Требуется как минимум версия 26.0 программы 'actool' (найдена версия %f)."
+
+msgid "Could not export liquid glass icon:"
+msgstr "Не удалось экспортировать иконку жидкого стекла:"
+
 msgid "Notarization"
 msgstr "Подтверждение"
 
@@ -20065,6 +20626,12 @@ msgstr ""
 "Для анимации Particles2D требуется использовать CanvasItemMaterial с "
 "включённой опцией «Анимация частиц»."
 
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile renderer."
+msgstr ""
+"Эффект следов частиц доступен только при использовании рендерера Forward+ или "
+"мобильного рендерера."
+
 msgid ""
 "Particle sub-emitters are not available when using the Compatibility renderer."
 msgstr ""
@@ -20363,6 +20930,9 @@ msgstr ""
 "Для анимации CPUParticles3D требуется использовать StandardMaterial3D, в "
 "котором параметр «Режим билборда» установлен в значение «Particle Billboard»."
 
+msgid "Decals are only available when using the Forward+ or Mobile renderer."
+msgstr "Декали доступны только при использовании рендерера Forward+ или Mobile."
+
 msgid ""
 "The decal has no textures loaded into any of its texture properties, and will "
 "therefore not be visible."
@@ -20437,6 +21007,13 @@ msgstr ""
 "Следы включены, но один или несколько материалов сетки отсутствуют или не "
 "установлены для отрисовки следов."
 
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderer."
+msgstr ""
+"Дополнительные источники частиц доступны только при использовании рендерера "
+"Forward+ или Mobile."
+
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "collision for this GPUParticlesCollisionSDF3D.\n"
@@ -20446,6 +21023,12 @@ msgstr ""
 "создаст столкновений для этого GPUParticlesCollisionSDF3D.\n"
 "Чтобы устранить эту проблему, включите хотя бы один бит в свойстве Bake Mask."
 
+msgid ""
+"Detecting settings with no target set! IterateIK3D must have a target to work."
+msgstr ""
+"Обнаружены настройки без заданной цели! Для корректной работы IterateIK3D "
+"необходима заданная цель."
+
 msgid "A light's scale does not affect the visual size of the light."
 msgstr "Масштаб света не влияет на визуальный размер света."
 
@@ -20799,6 +21382,12 @@ msgstr ""
 "Узел Skeleton3D не задан! SkeletonModifier3D должен быть дочерним элементом "
 "Skeleton3D."
 
+msgid ""
+"Detecting settings with no Path3D set! SplineIK3D must have a Path3D to work."
+msgstr ""
+"Обнаружены настройки без заданного Path3D! Для работы SplineIK3D необходим "
+"Path3D."
+
 msgid "Parent node should be a SpringBoneSimulator3D node."
 msgstr "Родительский узел должен быть узлом SpringBoneSimulator3D."
 
@@ -20809,6 +21398,19 @@ msgstr ""
 "Чтобы AnimatedSprite3D отображал кадры, ресурс «Кадры спрайта» должен быть "
 "создан или задан в свойстве «Кадры спрайта»."
 
+msgid ""
+"Detecting settings with no target set! TwoBoneIK3D must have a target to work."
+msgstr ""
+"Обнаружены настройки без заданного целевого объекта! Для работы TwoBoneIK3D "
+"необходимо наличие целевого объекта."
+
+msgid ""
+"Detecting settings with no pole target set! TwoBoneIK3D must have a pole "
+"target to work."
+msgstr ""
+"Обнаружены настройки без заданной целевой точки! Для работы TwoBoneIK3D "
+"необходима целевая точка."
+
 msgid ""
 "The GeometryInstance3D visibility range's End distance is set to a non-zero "
 "value, but is lower than the Begin distance.\n"
@@ -20842,6 +21444,20 @@ msgstr ""
 "Чтобы решить эту проблему, установите конечную границу диапазона видимости в "
 "значение выше нуля."
 
+msgid ""
+"GeometryInstance3D transparency is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"Прозрачность GeometryInstance3D доступна только при использовании рендерера "
+"Forward+."
+
+msgid ""
+"GeometryInstance3D visibility range transparency fade is only available when "
+"using the Forward+ renderer."
+msgstr ""
+"Функция затухания прозрачности в диапазоне видимости GeometryInstance3D "
+"доступна только при использовании рендерера Forward+."
+
 msgid "Plotting Meshes"
 msgstr "Построение сеток"
 
@@ -20922,6 +21538,13 @@ msgstr ""
 msgid "XROrigin3D requires an XRCamera3D child node."
 msgstr "XROrigin3D требуется дочерний узел XROrigin3D."
 
+msgid ""
+"Changing the scale on the XROrigin3D node is not supported. Change the World "
+"Scale instead."
+msgstr ""
+"Изменение масштаба на узле XROrigin3D не поддерживается. Вместо этого "
+"измените мировой масштаб."
+
 msgid ""
 "XR shaders are not enabled in project settings. Stereoscopic output is not "
 "supported unless they are enabled. Please enable `xr/shaders/enabled` to use "
@@ -20946,6 +21569,24 @@ msgstr "Ничего не подключено к входу «%s» узла «%
 msgid "No root AnimationNode for the graph is set."
 msgstr "Не задан корневой AnimationNode для графа."
 
+msgid ""
+"The AnimationTree is inactive.\n"
+"Activate it in the inspector to enable playback; check node warnings if "
+"activation fails."
+msgstr ""
+"AnimationTree неактивен.\n"
+"Активируйте его в инспекторе, чтобы включить воспроизведение; проверьте "
+"предупреждения узла, если активация не удалась."
+
+msgid ""
+"The AnimationTree node (or one of its parents) has its process mode set to "
+"Disabled.\n"
+"Change the process mode in the inspector to allow playback."
+msgstr ""
+"У узла AnimationTree (или одного из его родительских узлов) режим обработки "
+"установлен в значение «Отключено».\n"
+"Измените режим обработки в инспекторе, чтобы разрешить воспроизведение."
+
 msgid ""
 "ButtonGroup is intended to be used only with buttons that have toggle_mode "
 "set to true."
@@ -21018,6 +21659,14 @@ msgstr ""
 "Текущий шрифт не поддерживает рендеринг одного или нескольких символов, "
 "которые используются в тексте этой метки."
 
+msgid ""
+"MSDF font pixel range is too small, some outlines/shadows will not render. "
+"Set MSDF pixel range to be at least %d to render all outlines/shadows."
+msgstr ""
+"Диапазон пикселей шрифта MSDF слишком мал, некоторые контуры/тени не будут "
+"отображаться. Установите диапазон пикселей MSDF не менее %d, чтобы отобразить "
+"все контуры/тени."
+
 msgid ""
 "The current theme style has shadows and/or rounded corners for popups, but "
 "those won't display correctly if \"display/window/per_pixel_transparency/"
@@ -21044,6 +21693,9 @@ msgstr ""
 "Используйте дочерний контейнер (VBox, HBox и т.д.) или Control и установите "
 "минимальный размер вручную."
 
+msgid "Drag to resize"
+msgstr "Перетащите для изменения размера"
+
 msgid ""
 "This node doesn't have a SubViewport as child, so it can't display its "
 "intended content.\n"
@@ -21424,6 +22076,24 @@ msgstr "Не найдена соответствующая функция для
 msgid "Varying '%s' cannot be passed for the '%s' parameter in that context."
 msgstr "Вариация «%s» не может быть передана параметру «%s» в этом контексте."
 
+msgid ""
+"Unable to pass a multiview texture sampler as a parameter to a custom "
+"function. Consider sampling it in the main function and then passing the "
+"vector result to the custom function."
+msgstr ""
+"Не удается передать multiview сэмплер текстуры в качестве параметра "
+"пользовательской функции. Рассмотрите возможность сэмплирования в основной "
+"функции, а затем передачи векторного результата в пользовательскую функцию."
+
+msgid ""
+"Unable to pass RADIANCE texture sampler as a parameter to a custom function. "
+"Consider sampling it in the main function and then passing the vector result "
+"to the custom function."
+msgstr ""
+"Не удается передать сэмплер текстуры RADIANCE в качестве параметра "
+"пользовательской функции. Рекомендуется выполнить сэмплирование в основной "
+"функции, а затем передать векторный результат в пользовательскую функцию."
+
 msgid "Unknown identifier in expression: '%s'."
 msgstr "Неизвестный идентификатор в выражении: «%s»."
 
diff --git a/engine/editor/translations/editor/ta.po b/engine/editor/translations/editor/ta.po
index 67a15686..31d4ffdc 100644
--- a/engine/editor/translations/editor/ta.po
+++ b/engine/editor/translations/editor/ta.po
@@ -6,12 +6,13 @@
 # தமிழ்நேரம் <anishprabu.t@gmail.com>, 2024, 2025.
 # zirzak <gdarlucas@gmail.com>, 2025.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
+# Muhammed Nihal <muhammed.dnihal06@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-10-13 10:09+0000\n"
-"Last-Translator: \"A Thousand Ships (she/her)\" <over999ships@gmail.com>\n"
+"PO-Revision-Date: 2026-01-29 23:25+0000\n"
+"Last-Translator: Muhammed Nihal <muhammed.dnihal06@gmail.com>\n"
 "Language-Team: Tamil <https://hosted.weblate.org/projects/godot-engine/godot/"
 "ta/>\n"
 "Language: ta\n"
@@ -19,11 +20,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.14-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "சரி"
 
+msgid "Failed"
+msgstr "தோல்வியடைந்தது"
+
+msgid "Unavailable"
+msgstr "கிடைக்கவில்லை"
+
+msgid "Unconfigured"
+msgstr "கட்டமைக்கப்படாதது"
+
+msgid "Unauthorized"
+msgstr "அங்கீகரிக்கப்படாத"
+
+msgid "Parameter out of range"
+msgstr "அளவுரு வரம்பிற்கு வெளியே உள்ளது"
+
+msgid "Out of memory"
+msgstr "நினைவகம் இல்லை"
+
+msgid "File not found"
+msgstr "கோப்பு கிடைக்கவில்லை"
+
+msgid "File: Bad drive"
+msgstr "கோப்பு: தவறான இயக்ககம்"
+
+msgid "File: Bad path"
+msgstr "கோப்பு: தவறான பாதை"
+
 msgid "Locked"
 msgstr "பூட்டப்பட்டுள்ளது"
 
diff --git a/engine/editor/translations/editor/th.po b/engine/editor/translations/editor/th.po
index b6d5d977..dcd95802 100644
--- a/engine/editor/translations/editor/th.po
+++ b/engine/editor/translations/editor/th.po
@@ -27,13 +27,14 @@
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
 # RESONA <championkungpvp@gmail.com>, 2025.
 # Wi Chan <mac.wikrom@gmail.com>, 2026.
+# M1ST3RWiCK <suwanruch.s@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-15 07:06+0000\n"
-"Last-Translator: Wi Chan <mac.wikrom@gmail.com>\n"
+"PO-Revision-Date: 2026-02-05 19:01+0000\n"
+"Last-Translator: M1ST3RWiCK <suwanruch.s@gmail.com>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/godot-engine/godot/"
 "th/>\n"
 "Language: th\n"
@@ -41,11 +42,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "ตกลง"
 
+msgid "Failed"
+msgstr "ผิดพลาด"
+
+msgid "Unavailable"
+msgstr "ไม่มีคำอธิบายสำหรับ"
+
+msgid "Unconfigured"
+msgstr "ไม่ได้กำหนดค่า"
+
+msgid "Unauthorized"
+msgstr "ไม่ได้รับอนุญาต"
+
+msgid "Parameter out of range"
+msgstr "พารามิเตอร์อยู่นอกช่วงที่กำหนด"
+
+msgid "Out of memory"
+msgstr "หน่วยความจำไม่เพียงพอ"
+
+msgid "File not found"
+msgstr "ไม่พบไฟล์"
+
 msgid "File already in use"
 msgstr "ไฟล์ถูกใช้งานอยู่แล้ว"
 
diff --git a/engine/editor/translations/editor/tok.po b/engine/editor/translations/editor/tok.po
index 0744df66..2e031736 100644
--- a/engine/editor/translations/editor/tok.po
+++ b/engine/editor/translations/editor/tok.po
@@ -5,14 +5,16 @@
 #
 # Dark King <damir@t1c.ru>, 2024.
 # Julia Allen <juliaallen0626@gmail.com>, 2024.
-# Bee Crankson <ProfB.crankson@gmail.com>, 2025.
+# Bee Crankson <ProfB.crankson@gmail.com>, 2025, 2026.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
+# jan Ipen <minebloxdash@gmail.com>, 2026.
+# cramangako <wljroccio@glow.sch.uk>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-10-13 10:09+0000\n"
-"Last-Translator: \"A Thousand Ships (she/her)\" <over999ships@gmail.com>\n"
+"PO-Revision-Date: 2026-02-09 13:58+0000\n"
+"Last-Translator: cramangako <wljroccio@glow.sch.uk>\n"
 "Language-Team: Toki Pona <https://hosted.weblate.org/projects/godot-engine/"
 "godot/tok/>\n"
 "Language: tok\n"
@@ -20,10 +22,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.14-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Failed"
+msgstr "pakala"
+
+msgid "Unavailable"
+msgstr "lon ala"
+
+msgid "File not found"
+msgstr "mi lukin ala e lipu"
+
+msgid "File already in use"
+msgstr "lipu li lon kin"
+
+msgid "Can't open file"
+msgstr "mi ken ala open e lipu"
+
+msgid "End of file"
+msgstr "pini lipu"
+
+msgid "Can't open"
+msgstr "mi ken ala open"
+
+msgid "Can't create"
+msgstr "mi ken ala pali"
+
+msgid "Query failed"
+msgstr "toki wile li pakala"
+
+msgid "Can't connect"
+msgstr "mi ken ala kulupu"
+
+msgid "Can't resolve"
+msgstr "mi ken ala pini"
+
+msgid "Already exists"
+msgstr "ni li lon kin"
+
+msgid "Does not exist"
+msgstr "ni li lon ala"
+
+msgid "Compilation failed"
+msgstr "mi kulupu e lipu la mi pakala"
+
+msgid "Method not found"
+msgstr "mi lukin ala e nasin"
+
+msgid "Link failed"
+msgstr "linluwi li pakala"
+
+msgid "Script failed"
+msgstr "mi lipu ilo la mi pakala"
+
+msgid "Invalid declaration"
+msgstr "toki ni li ken ala"
+
+msgid "Parse error"
+msgstr "pakala pi sona toki"
 
 msgid "Help"
-msgstr "pona"
+msgstr "wile pona"
 
 msgid "Physical"
 msgstr "lon"
@@ -499,9 +561,15 @@ msgstr "o tawa e ijo pali"
 msgid "Transition exists!"
 msgstr "ante tawa li lon!"
 
+msgid "Transition from \"%s\" to \"%s\" already exists!"
+msgstr "ante tan \"%s\" tawa \"%s\" li lon kin!"
+
 msgid "Edit %s"
 msgstr "o ante e %s"
 
+msgid "Select and move nodes."
+msgstr "o anu o tawa e ijo pali."
+
 msgid "Create new nodes."
 msgstr "o pali sin e ijo pali."
 
@@ -517,6 +585,9 @@ msgstr "suli pi sitelen tawa (sitelen)"
 msgid "Animation length (seconds)"
 msgstr "suli pi sitelen tawa (tenpo)"
 
+msgid "Select node in scene."
+msgstr "o anu e ijo pali lon ma pali."
+
 msgid "Time (s):"
 msgstr "tenpo:"
 
@@ -550,6 +621,9 @@ msgstr "kalama"
 msgid "Create Node"
 msgstr "o pali sin e ijo pali"
 
+msgid "Insert at current time."
+msgstr "o pana lon tenpo ni."
+
 msgid "Seconds"
 msgstr "tenpo Sekon"
 
@@ -566,6 +640,9 @@ msgstr "linja"
 msgid "FPS:"
 msgstr "FPS:"
 
+msgid "Imported Animation cannot be edited!"
+msgstr "sitelen tawa lanpan li ken ala ante!"
+
 msgid "Root"
 msgstr "open"
 
@@ -1008,6 +1085,14 @@ msgstr "sina wile ala wile ante e lipu ni tawa %s? (ni la ni li lon tenpo ale!)"
 msgid "Could not create folder: %s"
 msgstr "mi ken ala pali sin e poki lipu: %s"
 
+msgid "Copy %d selected item to \"%s\"?"
+msgid_plural "Copy %d selected items to \"%s\"?"
+msgstr[0] "sina wile ala wile jasima e ijo %d tawa \"%s\"?"
+
+msgid "Move %d selected item to \"%s\"?"
+msgid_plural "Move %d selected items to \"%s\"?"
+msgstr[0] "sina wile ala wile tawa e ijo %d tawa \"%s\"?"
+
 msgid "Set as Main Scene"
 msgstr "o ma pali lawa e ni"
 
@@ -1186,6 +1271,9 @@ msgstr "meso"
 msgid "Import"
 msgstr "lanpan"
 
+msgid "Open Import Dock"
+msgstr "o open e ma lanpan"
+
 msgid "Failed to load resource."
 msgstr "mi kama lon ala e poki sona."
 
@@ -1271,6 +1359,9 @@ msgstr "ma pali 2D"
 msgid "3D Scene"
 msgstr "ma pali 3D"
 
+msgid "User Interface"
+msgstr "ma pali jan"
+
 msgid "Other Node"
 msgstr "ijo pali ante"
 
@@ -1310,6 +1401,9 @@ msgstr "o open lon ilo ante"
 msgid "Editable Children"
 msgstr "kili pi ken ante"
 
+msgid "Show Accessibility Warnings"
+msgstr "o ken lukin e toki suli"
+
 msgid "None"
 msgstr "ala"
 
@@ -1416,6 +1510,9 @@ msgstr "tenpo ni la ijo %s li lon ala! o toki e lon awen sin."
 msgid "Save Scene As..."
 msgstr "o awen e ma pali sama..."
 
+msgid "Save new main scene..."
+msgstr "o awen e ma pali lawa sin..."
+
 msgid "Save & Reload"
 msgstr "o awen o kama lon sin"
 
@@ -1563,6 +1660,21 @@ msgstr "kama lon sin li pini."
 msgid "Save & Restart"
 msgstr "o awen o open sin"
 
+msgid ""
+"Changing the renderer requires restarting the editor.\n"
+"\n"
+"Choosing Save & Restart will change the renderer to:\n"
+"- Desktop platforms: %s\n"
+"- Mobile platforms: %s\n"
+"- Web platform: %s"
+msgstr ""
+"sina ante e ilo sitelen la ilo ante li wile open sin.\n"
+"\n"
+"sina pilin e \"o awen o open sin\" la ilo sitelen li ante tawa:\n"
+"- ilo ma Desktop: %s\n"
+"- ilo ma Mobile: %s\n"
+"- ilo ma linluwi: %s"
+
 msgid "Forward+"
 msgstr "nasin Forward+"
 
@@ -1779,6 +1891,9 @@ msgstr "nasin pana"
 msgid "Resources"
 msgstr "poki sona"
 
+msgid "Export Mode"
+msgstr "nasin pana"
+
 msgid "Export all resources in the project"
 msgstr "o pana e poki sona ale lon pali"
 
@@ -1819,6 +1934,14 @@ msgstr "nasin pana pi toki GDScript:"
 msgid "Text (easier debugging)"
 msgstr "nimi (sina pipi ala kepeken lili)"
 
+msgid ""
+"Scene \"%s\" is currently being edited. Changes will only take effect when "
+"reloaded."
+msgstr "tenpo ni la ma pali '%s' li ante. lukin sin taso la ante li lon."
+
+msgid "Resource \"%s\" is in use. Changes will only take effect when reloaded."
+msgstr "ijo li kepeken poki sona '%s'. lukin sin taso la ante li lon."
+
 msgid ""
 "Remove the selected files from the project? (Cannot be undone.)\n"
 "Depending on your filesystem configuration, the files will either be moved to "
@@ -1843,6 +1966,9 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "ni li ken ala weka:"
 
+msgid "Error loading: %s"
+msgstr "mi kama lon e %s la pakala li lon"
+
 msgid "Initializing plugins..."
 msgstr "mi open e ilo namako..."
 
@@ -1861,6 +1987,9 @@ msgstr "o tawa linja"
 msgid "Line Number:"
 msgstr "nanpa linja:"
 
+msgid "Zoom Factor"
+msgstr "nanpa suli"
+
 msgid "Reset Zoom"
 msgstr "o ante open e suli lukin"
 
@@ -2005,6 +2134,9 @@ msgstr "mi awen e ni..."
 msgid "Error opening scene"
 msgstr "mi open e ma pali la pakala li lon"
 
+msgid "Advanced Import Settings for %s '%s'"
+msgstr "lawa toki lanpan namako pi %s '%s'"
+
 msgid "Warning: File exists"
 msgstr "toki suli: lipu li lon"
 
@@ -2063,12 +2195,18 @@ msgstr "2D"
 msgid "3D"
 msgstr "3D"
 
+msgid "Property: %s"
+msgstr "nasin ijo: %s"
+
 msgid "Unfavorite Property"
 msgstr "o olin ala e ni"
 
 msgid "Favorite Property"
 msgstr "o olin e ni"
 
+msgid "Delete Property"
+msgstr "o weka e nasin ijo"
+
 msgid "Unfavorite All"
 msgstr "o olin ala e ale"
 
@@ -2293,6 +2431,9 @@ msgid ""
 msgstr ""
 "nasin ni li jo e ijo. mi wile mute e ni: sina anu e poki lipu pi jo ala."
 
+msgid "Cannot duplicate a project into itself."
+msgstr "mi ken ala jasima e pali lon ona."
+
 msgid "New Game Project"
 msgstr "pali musi sin"
 
@@ -2318,6 +2459,9 @@ msgstr "mi ken ala pali sin e project.godot lon nasin pi pali ni."
 msgid "Couldn't create icon.svg in project path."
 msgstr "mi ken ala pali sin e icon.svg lon nasin pi pali ni."
 
+msgid "Couldn't duplicate project (error %d)."
+msgstr "mi ken ala jasima e pali (pakala nanpa %d)."
+
 msgid ""
 "Couldn't load project at '%s' (error %d). It may be missing or corrupted."
 msgstr ""
@@ -2342,6 +2486,12 @@ msgstr "nasin pali:"
 msgid "Edit Now"
 msgstr "o ante lon ni"
 
+msgid "Project Name"
+msgstr "nimi pali"
+
+msgid "Project Path"
+msgstr "nasin pali"
+
 msgid "Error: Project is missing on the filesystem."
 msgstr "pakala: pali li weka lon nasin lipu."
 
@@ -2588,6 +2738,9 @@ msgstr "o ante e pali"
 msgid "Edit in recovery mode"
 msgstr "o ante lon nasin alasa"
 
+msgid "Remove Missing"
+msgstr "o weka e pali weka"
+
 msgid "Edit normally"
 msgstr "o ante lon meso"
 
@@ -2623,6 +2776,12 @@ msgstr "pakala"
 msgid "Manage Project Tags"
 msgstr "o lawa e poki pi pali ni"
 
+msgid "New Tag Name"
+msgstr "nimi poki sin"
+
+msgid "Project Tag: %s"
+msgstr "poki pali: %s"
+
 msgid "Restart Now"
 msgstr "o open sin lon tenpo ni"
 
@@ -2646,6 +2805,9 @@ msgstr "mi awen sin e ma pali:"
 msgid "Re-saving resource:"
 msgstr "mi awen sin e poki sona:"
 
+msgid "Run the project's main scene."
+msgstr "o kepeken e ma pali lawa pi pali ni."
+
 msgid "Recovery Mode is enabled. Disable it to run the project."
 msgstr "nasin alasa li lon. o ala e ona tawa kepeken pali."
 
@@ -2720,6 +2882,9 @@ msgstr "musi li lon ala insa ilo pi ante musi."
 msgid "Embedding is disabled."
 msgstr "lon insa ilo ante li ala."
 
+msgid "%s+Alt+RMB: Show list of all nodes at position clicked."
+msgstr "%s+Alt+RMB: o ken lukin e kulupu pi ijo pali ale lon pilin sina."
+
 msgid "Suspend"
 msgstr "o awen"
 
@@ -2810,6 +2975,9 @@ msgstr "o pali sin e linja lon ijo pali Path2D"
 msgid "Select Points"
 msgstr "o anu e lili"
 
+msgid "%s+Click: Add Point"
+msgstr "%s+pilin: o pana e lili"
+
 msgid "Left Click: Split Segment (in curve)"
 msgstr "pilin soto: o tu e kipisi (lon linja)"
 
@@ -2939,6 +3107,9 @@ msgstr "ilo anu"
 msgid "Shift: Draw line."
 msgstr "Shift: o sitelen e linja."
 
+msgid "%s+Shift: Draw rectangle."
+msgstr "%s+Shift: o sitelen e leko."
+
 msgid "Paint Tool"
 msgstr "ilo sitelen"
 
@@ -3023,6 +3194,9 @@ msgstr "o walo e selo TileMap anu"
 msgid "Toggle grid visibility."
 msgstr "o ante tu e sijelo lukin pi kulupu leko."
 
+msgid "Advanced settings."
+msgstr "lawa toki namako."
+
 msgid "From Source"
 msgstr "tan open"
 
@@ -3077,6 +3251,15 @@ msgstr "o ante e ma lukin pi ilo lukin"
 msgid "Change Camera Size"
 msgstr "o ante e suli pi ilo lukin"
 
+msgid "Couldn't create a capsule shape."
+msgstr "mi ken ala pali e ijo misikeke."
+
+msgid "Couldn't create a cylinder shape."
+msgstr "mi ken ala pali e leko sike."
+
+msgid "Couldn't create a sphere shape."
+msgstr "mi ken ala pali e sike."
+
 msgid "Mesh is empty!"
 msgstr "selo li jo ala!"
 
@@ -3183,6 +3366,24 @@ msgstr "ante pi nasin Y."
 msgid "Z-Axis Transform."
 msgstr "ante pi nasin Z."
 
+msgid "X: %s"
+msgstr "X: %s"
+
+msgid "Y: %s"
+msgstr "Y: %s"
+
+msgid "Z: %s"
+msgstr "Z: %s"
+
+msgid "Size: %s (%.1fMP)"
+msgstr "suli: %s (%.1fMP)"
+
+msgid "Objects: %d"
+msgstr "ijo: %d"
+
+msgid "Primitives: %d"
+msgstr "ijo tan: %d"
+
 msgid "CPU Time: %s ms"
 msgstr "tenpo CPU: ms %s"
 
diff --git a/engine/editor/translations/editor/vi.po b/engine/editor/translations/editor/vi.po
index 944a6058..20a6f473 100644
--- a/engine/editor/translations/editor/vi.po
+++ b/engine/editor/translations/editor/vi.po
@@ -52,13 +52,14 @@
 # ducdat0507 <ducdat0507@gmail.com>, 2025, 2026.
 # Orus Or <orus3732@gmail.com>, 2025.
 # Tâm Mai <tammai.it@gmail.com>, 2025.
+# Nguyen Ngoc Thai <thaidev247@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-05 13:02+0000\n"
-"Last-Translator: ducdat0507 <ducdat0507@gmail.com>\n"
+"PO-Revision-Date: 2026-01-28 01:30+0000\n"
+"Last-Translator: Nguyen Ngoc Thai <thaidev247@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/godot-engine/"
 "godot/vi/>\n"
 "Language: vi\n"
@@ -66,11 +67,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "OK"
 msgstr "OK"
 
+msgid "Failed"
+msgstr "Thất bại"
+
+msgid "Unavailable"
+msgstr "Không khả dụng"
+
+msgid "Unconfigured"
+msgstr "Chưa cấu hình"
+
+msgid "Unauthorized"
+msgstr "Không được phép"
+
+msgid "Parameter out of range"
+msgstr "Tham số ngoài phạm vi"
+
+msgid "Out of memory"
+msgstr "Tràn bộ nhớ"
+
+msgid "File not found"
+msgstr "Không tìm thấy tệp"
+
+msgid "File already in use"
+msgstr "Tệp đã được sử dụng"
+
+msgid "Can't open file"
+msgstr "Không thể mở tệp"
+
+msgid "Can't write file"
+msgstr "Không thể ghi tệp"
+
+msgid "Can't read file"
+msgstr "Không thể đọc tệp"
+
+msgid "File unrecognized"
+msgstr "Tệp không xác định"
+
+msgid "File corrupt"
+msgstr "Tệp bị lỗi"
+
+msgid "End of file"
+msgstr "Kết thúc tệp"
+
+msgid "Can't open"
+msgstr "Không thể mở"
+
+msgid "Can't create"
+msgstr "Không thể tạo"
+
+msgid "Query failed"
+msgstr "Yêu cầu thất bại"
+
+msgid "Already in use"
+msgstr "Đã được sử dụng"
+
+msgid "Locked"
+msgstr "Đã khoá"
+
+msgid "Timeout"
+msgstr "Quá giờ"
+
+msgid "Can't connect"
+msgstr "Không thể kết nối"
+
+msgid "Connection error"
+msgstr "Lỗi kết nối"
+
+msgid "Invalid data"
+msgstr "Dữ liệu không hợp lệ"
+
+msgid "Invalid parameter"
+msgstr "Tham số không hợp lệ"
+
+msgid "Already exists"
+msgstr "Đã tồn tại"
+
+msgid "Does not exist"
+msgstr "Không tồn tại"
+
+msgid "Can't read database"
+msgstr "Không thể đọc cơ sở dữ liệu"
+
+msgid "Can't write database"
+msgstr "Không thể ghi vào cơ sở dữ liệu"
+
+msgid "Compilation failed"
+msgstr "Biên dịch thất bại"
+
+msgid "Method not found"
+msgstr "Không tìm thấy phương thức"
+
+msgid "Link failed"
+msgstr "Liên kết thất bại"
+
 msgid "Help"
 msgstr "Trợ giúp"
 
@@ -1438,6 +1532,9 @@ msgstr "Trong-Handle:"
 msgid "Out-Handle:"
 msgstr "Ngoài-Handle:"
 
+msgid "Handle mode: %s"
+msgstr "Chế độ Tay cầm: %s"
+
 msgid "Stream:"
 msgstr "Chạy:"
 
@@ -3906,6 +4003,17 @@ msgstr "Quản lí bản mẫu xuất"
 msgid "Dependencies For:"
 msgstr "Phần phụ thuộc cho:"
 
+msgid ""
+"Scene \"%s\" is currently being edited. Changes will only take effect when "
+"reloaded."
+msgstr ""
+"Cảnh \"%s\" hiện đang được chỉnh sửa.\n"
+"Các thay đổi chỉ có hiệu lực khi tải lại."
+
+msgid "Resource \"%s\" is in use. Changes will only take effect when reloaded."
+msgstr ""
+"Tài nguyên \"%s\" đang được sử dụng. Thay đổi chỉ có hiệu lực khi tải lại."
+
 msgid "Dependencies"
 msgstr "Các phụ thuộc"
 
@@ -3974,6 +4082,9 @@ msgstr "Sở hữu"
 msgid "Resources Without Explicit Ownership:"
 msgstr "Tài nguyên không có quyền sở hữu rõ ràng:"
 
+msgid "Scanning file structure..."
+msgstr "Đang quét các tệp tin..."
+
 msgid "Initializing plugins..."
 msgstr "Đang khởi tạo plugin..."
 
@@ -4185,6 +4296,12 @@ msgstr "Không tìm thấy tài nguyên phụ."
 msgid "Open a list of sub-resources."
 msgstr "Mở danh sách các tài nguyên con."
 
+msgid "Hold %s to round to integers."
+msgstr "Giữ  %s để làm tròn về số nguyên."
+
+msgid "Hold Shift for more precise changes."
+msgstr "Giữ Shift để chỉnh sửa chính xác hơn."
+
 msgid "No notifications."
 msgstr "Không có thông báo."
 
diff --git a/engine/editor/translations/editor/zh_Hans.po b/engine/editor/translations/editor/zh_Hans.po
index ccffa046..88e908c5 100644
--- a/engine/editor/translations/editor/zh_Hans.po
+++ b/engine/editor/translations/editor/zh_Hans.po
@@ -113,13 +113,14 @@
 # MicroGame0 <MicroGame@petalmail.com>, 2025.
 # Zhen Luo <461652354@qq.com>, 2025, 2026.
 # Owen Wang <owenwangwyx@gmail.com>, 2026.
+# Rudeus <95301440+7Luminaries@users.noreply.github.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2018-01-20 12:15+0200\n"
-"PO-Revision-Date: 2026-01-24 01:46+0000\n"
-"Last-Translator: 风青山 <idleman@yeah.net>\n"
+"PO-Revision-Date: 2026-02-04 18:01+0000\n"
+"Last-Translator: Rudeus <95301440+7Luminaries@users.noreply.github.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -154,7 +155,7 @@ msgid "File not found"
 msgstr "未找到文件"
 
 msgid "File: Bad drive"
-msgstr "文件：坏驱动器"
+msgstr "文件：驱动器错误"
 
 msgid "File: Bad path"
 msgstr "文件：无效路径"
@@ -980,19 +981,19 @@ msgid "Delete Node(s)"
 msgstr "删除节点"
 
 msgid "Toggle Filter On/Off"
-msgstr "开关过滤器"
+msgstr "开关筛选器"
 
 msgid "Change Filter"
-msgstr "修改过滤器"
+msgstr "修改筛选器"
 
 msgid "Fill Selected Filter Children"
-msgstr "填充所选过滤器子级"
+msgstr "填充所选筛选器子级"
 
 msgid "Invert Filter Selection"
-msgstr "反选过滤器"
+msgstr "反选筛选器"
 
 msgid "Clear Filter Selection"
-msgstr "取消选中所有过滤器"
+msgstr "取消选中所有筛选器"
 
 msgid ""
 "Animation player has no valid root node path, so unable to retrieve track "
@@ -1009,10 +1010,10 @@ msgid "Functions"
 msgstr "函数"
 
 msgid "Inspect Filtered Tracks:"
-msgstr "查看轨道过滤器："
+msgstr "查看轨道筛选器："
 
 msgid "Edit Filtered Tracks:"
-msgstr "编辑轨道过滤器："
+msgstr "编辑轨道筛选器："
 
 msgid "Node Renamed"
 msgstr "节点已重命名"
@@ -4584,7 +4585,7 @@ msgid ""
 msgstr "如果启用，则“重设父节点为新节点”会优先在选中节点的中心创建新节点。"
 
 msgid "Hide Filtered Out Parents"
-msgstr "隐藏被过滤的父级"
+msgstr "隐藏被筛选的父级"
 
 msgid "Show Accessibility Warnings"
 msgstr "显示无障碍警告"
@@ -4598,11 +4599,11 @@ msgid ""
 "or group (if prefixed with \"group:\" or \"g:\"). Filtering is case-"
 "insensitive."
 msgstr ""
-"过滤节点，输入部分名称、类型（以“type:”或“t:”开头）、\n"
-"分组（以“group:”或“g:”开头）。过滤器区分大小写。"
+"筛选节点，可输入节点的部分名称、类型（以“type:”或“t:”开头）、\n"
+"分组（以“group:”或“g:”开头）。筛选不区分大小写。"
 
 msgid "Filter by Type"
-msgstr "按类型过滤"
+msgstr "按类型筛选"
 
 msgid ""
 "Selects all Nodes of the given type.\n"
@@ -4612,7 +4613,7 @@ msgstr ""
 "插入\"type:\"。你也可以使用简称\"t:\"。"
 
 msgid "Filter by Group"
-msgstr "按组过滤"
+msgstr "按组筛选"
 
 msgid ""
 "Selects all Nodes belonging to the given group.\n"
@@ -4796,7 +4797,7 @@ msgid "Show Search"
 msgstr "显示搜索"
 
 msgid "Focus Search/Filter Bar"
-msgstr "聚焦搜索/过滤栏"
+msgstr "聚焦搜索/筛选栏"
 
 msgid "Standard Messages"
 msgstr "标准消息"
@@ -5481,7 +5482,7 @@ msgid "Previous Scene Tab"
 msgstr "上一个场景选项卡"
 
 msgid "Focus FileSystem Filter"
-msgstr "聚焦文件系统过滤器"
+msgstr "聚焦文件系统筛选器"
 
 msgid "New Scene"
 msgstr "新建场景"
@@ -5514,7 +5515,7 @@ msgid "MeshLibrary..."
 msgstr "网格库..."
 
 msgid "Reload Saved Scene"
-msgstr "重载已保存场景"
+msgstr "重新加载已保存场景"
 
 msgid "Close Scene"
 msgstr "关闭场景"
@@ -6407,24 +6408,24 @@ msgid "Delta Encoding Minimum Size Reduction"
 msgstr "增量编码最小尺寸压缩"
 
 msgid "Delta Encoding Include Filters"
-msgstr "增量编码包含过滤器"
+msgstr "增量编码包含筛选器"
 
 msgid ""
 "Filters to include files/folders from being delta-encoded\n"
 "(comma-separated, e.g: *.gdc, scripts/*)"
 msgstr ""
-"过滤器以包含不进行增量编码的文件/文件夹\n"
-"(逗号分隔，例如：*.gdc, scripts/*)"
+"用于包含文件/文件夹以进行增量编码的筛选器\n"
+"（逗号分隔，例如：*.gdc, scripts/*）"
 
 msgid "Delta Encoding Exclude Filters"
-msgstr "增量编码排除过滤器"
+msgstr "增量编码排除筛选器"
 
 msgid ""
 "Filters to exclude files/folders from being delta-encoded\n"
 "(comma-separated, e.g: *.ctex, textures/*)"
 msgstr ""
-"过滤器用于排除文件/文件夹进行增量编码\n"
-"(逗号分隔，例如：*.ctex, textures/*)"
+"用于排除文件/文件夹以进行增量编码的筛选器\n"
+"（逗号分隔，例如：*.ctex, textures/*）"
 
 msgid "Base Packs:"
 msgstr "基础包："
@@ -12812,7 +12813,7 @@ msgid "Filter Methods"
 msgstr "筛选方法"
 
 msgid "No method found matching given filters."
-msgstr "没有找到匹配给定过滤器的方法。"
+msgstr "没有找到匹配给定筛选器的方法。"
 
 msgid "Script Methods Only"
 msgstr "仅脚本方法"
@@ -13555,7 +13556,7 @@ msgid "Another Theme"
 msgstr "其他主题"
 
 msgid "Filter the list of types or create a new custom type:"
-msgstr "过滤类型列表或新建自定义类型："
+msgstr "筛选类型列表或新建自定义类型："
 
 msgid "Available Node-based types:"
 msgstr "可用 Node 类型："
@@ -15296,7 +15297,7 @@ msgid "Action Event"
 msgstr "动作事件"
 
 msgid "Clear all search filters."
-msgstr "清除所有搜索过滤器。"
+msgstr "清除所有搜索筛选器。"
 
 msgid "3D Editor"
 msgstr "3D 编辑器"
@@ -18301,7 +18302,7 @@ msgid "ObjectDB Snapshot Summary"
 msgstr "ObjectDB 快照摘要"
 
 msgid "Press 'Take ObjectDB Snapshot' to snapshot the ObjectDB."
-msgstr "请按下“Take ObjectDB Snapshot”来快照 ObjectDB。"
+msgstr "请按下“创建 ObjectDB 快照”来快照 ObjectDB。"
 
 msgid ""
 "Memory in Godot is either owned natively by the engine or owned by the "
diff --git a/engine/editor/translations/editor/zh_Hant.po b/engine/editor/translations/editor/zh_Hant.po
index 8810d1bb..a9ad55de 100644
--- a/engine/editor/translations/editor/zh_Hant.po
+++ b/engine/editor/translations/editor/zh_Hant.po
@@ -63,7 +63,7 @@
 # Oscar Su <oscar517730@gmail.com>, 2025.
 # codetea <codetea@users.noreply.hosted.weblate.org>, 2025.
 # Myeongjin Lee <aranet100@gmail.com>, 2025, 2026.
-# sashimi <kyle2160k@gmail.com>, 2025.
+# sashimi <kyle2160k@gmail.com>, 2025, 2026.
 # 陳間時光（MorningFungame） <morningfungame@gmail.com>, 2025.
 # Stenyin <cbcbccc2003@gmail.com>, 2025.
 # "A Thousand Ships (she/her)" <over999ships@gmail.com>, 2025.
@@ -74,8 +74,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-25 00:39+0000\n"
-"Last-Translator: Wei-Fu Chen <410477jimmy@gmail.com>\n"
+"PO-Revision-Date: 2026-01-29 23:25+0000\n"
+"Last-Translator: sashimi <kyle2160k@gmail.com>\n"
 "Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot/zh_Hant/>\n"
 "Language: zh_Hant\n"
@@ -1318,6 +1318,15 @@ msgstr "移動節點"
 msgid "Transition exists!"
 msgstr "轉場已存在！"
 
+msgid "Cannot transition to self!"
+msgstr "無法轉場至自身！"
+
+msgid "Cannot transition to \"Start\"!"
+msgstr "無法轉場至「Start」！"
+
+msgid "Cannot transition from \"End\"!"
+msgstr "無法轉場至「End」！"
+
 msgid "Play/Travel to %s"
 msgstr "播放/跳轉到 %s"
 
@@ -3515,6 +3524,9 @@ msgstr "將此停靠面板向左移動一個分頁。"
 msgid "Close this dock."
 msgstr "關閉此面板。"
 
+msgid "This dock can't be closed."
+msgstr "此停靠面板不可關閉。"
+
 msgid "Make this dock floating."
 msgstr "將此停靠面板設為浮動。"
 
@@ -6720,7 +6732,7 @@ msgid "Extract"
 msgstr "提取"
 
 msgid "Already Saving"
-msgstr "正在儲存中"
+msgstr "將存為檔案"
 
 msgid ""
 "This mesh already saves to an external resource, no action will be taken."
diff --git a/engine/editor/translations/editor_locale_dialog.cpp b/engine/editor/translations/editor_locale_dialog.cpp
index 34b7e380..d7e8aaf6 100644
--- a/engine/editor/translations/editor_locale_dialog.cpp
+++ b/engine/editor/translations/editor_locale_dialog.cpp
@@ -31,8 +31,6 @@
 #include "editor_locale_dialog.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "core/string/translation_server.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
diff --git a/engine/editor/translations/editor_translation_parser.cpp b/engine/editor/translations/editor_translation_parser.cpp
index 2787b68e..25f00f33 100644
--- a/engine/editor/translations/editor_translation_parser.cpp
+++ b/engine/editor/translations/editor_translation_parser.cpp
@@ -31,7 +31,6 @@
 #include "editor_translation_parser.h"
 
 #include "core/error/error_macros.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 #include "core/object/script_language.h"
 #include "core/templates/hash_set.h"
 
@@ -80,39 +79,14 @@ void EditorTranslationParserPlugin::get_recognized_extensions(List<String> *r_ex
 		for (int i = 0; i < extensions.size(); i++) {
 			r_extensions->push_back(extensions[i]);
 		}
-	} else if (!GDVIRTUAL_IS_OVERRIDDEN(_customize_strings)) {
+	} else {
 		ERR_PRINT("Custom translation parser plugin's \"func get_recognized_extensions()\" is undefined.");
 	}
 }
 
-void EditorTranslationParserPlugin::customize_strings(Vector<Vector<String>> &r_strings) const {
-	if (!GDVIRTUAL_IS_OVERRIDDEN(_customize_strings)) {
-		return;
-	}
-
-	TypedArray<PackedStringArray> new_strings;
-	new_strings.resize(r_strings.size());
-	int i = 0;
-	for (const PackedStringArray &translation : r_strings) {
-		new_strings[i] = translation;
-		i++;
-	}
-
-	GDVIRTUAL_CALL(_customize_strings, new_strings, new_strings);
-
-	r_strings.resize(new_strings.size());
-	PackedStringArray *translation_write = r_strings.ptrw();
-	i = 0;
-	for (const Variant &translation : new_strings) {
-		translation_write[i] = translation;
-		i++;
-	}
-}
-
 void EditorTranslationParserPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_parse_file, "path");
 	GDVIRTUAL_BIND(_get_recognized_extensions);
-	GDVIRTUAL_BIND(_customize_strings, "strings");
 
 #ifndef DISABLE_DEPRECATED
 	GDVIRTUAL_BIND_COMPAT(_parse_file_bind_compat_99297, "path", "msgids", "msgids_context_plural");
@@ -177,12 +151,6 @@ Ref<EditorTranslationParserPlugin> EditorTranslationParser::get_parser(const Str
 	return nullptr;
 }
 
-void EditorTranslationParser::customize_strings(Vector<Vector<String>> &r_strings) const {
-	for (const Ref<EditorTranslationParserPlugin> &parser : custom_parsers) {
-		parser->customize_strings(r_strings);
-	}
-}
-
 void EditorTranslationParser::add_parser(const Ref<EditorTranslationParserPlugin> &p_parser, ParserType p_type) {
 	if (p_type == ParserType::STANDARD) {
 		standard_parsers.push_back(p_parser);
diff --git a/engine/editor/translations/editor_translation_parser.h b/engine/editor/translations/editor_translation_parser.h
index 92f58655..7f0f5d1b 100644
--- a/engine/editor/translations/editor_translation_parser.h
+++ b/engine/editor/translations/editor_translation_parser.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
 
@@ -42,7 +42,6 @@ protected:
 
 	GDVIRTUAL1R(TypedArray<PackedStringArray>, _parse_file, String)
 	GDVIRTUAL0RC(Vector<String>, _get_recognized_extensions)
-	GDVIRTUAL1RC(TypedArray<PackedStringArray>, _customize_strings, TypedArray<PackedStringArray>)
 
 #ifndef DISABLE_DEPRECATED
 	GDVIRTUAL3_COMPAT(_parse_file_bind_compat_99297, _parse_file, String, TypedArray<String>, TypedArray<Array>)
@@ -51,7 +50,6 @@ protected:
 public:
 	virtual Error parse_file(const String &p_path, Vector<Vector<String>> *r_translations);
 	virtual void get_recognized_extensions(List<String> *r_extensions) const;
-	void customize_strings(Vector<Vector<String>> &r_strings) const;
 };
 
 class EditorTranslationParser {
@@ -71,7 +69,6 @@ public:
 	void get_recognized_extensions(List<String> *r_extensions) const;
 	bool can_parse(const String &p_extension) const;
 	Ref<EditorTranslationParserPlugin> get_parser(const String &p_extension) const;
-	void customize_strings(Vector<Vector<String>> &r_strings) const;
 	void add_parser(const Ref<EditorTranslationParserPlugin> &p_parser, ParserType p_type);
 	void remove_parser(const Ref<EditorTranslationParserPlugin> &p_parser, ParserType p_type);
 	void clean_parsers();
diff --git a/engine/editor/translations/editor_translation_preview_button.cpp b/engine/editor/translations/editor_translation_preview_button.cpp
index 655bb1c1..4ab62174 100644
--- a/engine/editor/translations/editor_translation_preview_button.cpp
+++ b/engine/editor/translations/editor_translation_preview_button.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_translation_preview_button.h"
 
-#include "core/object/callable_mp.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_node.h"
 
diff --git a/engine/editor/translations/editor_translation_preview_menu.cpp b/engine/editor/translations/editor_translation_preview_menu.cpp
index 6a33d009..17268bd4 100644
--- a/engine/editor/translations/editor_translation_preview_menu.cpp
+++ b/engine/editor/translations/editor_translation_preview_menu.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_translation_preview_menu.h"
 
-#include "core/object/callable_mp.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_node.h"
 
diff --git a/engine/editor/translations/localization_editor.cpp b/engine/editor/translations/localization_editor.cpp
index ccd1e899..3664460f 100644
--- a/engine/editor/translations/localization_editor.cpp
+++ b/engine/editor/translations/localization_editor.cpp
@@ -31,17 +31,11 @@
 #include "localization_editor.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/gui/editor_toaster.h"
-#include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
-#include "editor/settings/project_settings_editor.h"
 #include "editor/translations/editor_translation_parser.h"
 #include "editor/translations/template_generator.h"
 #include "scene/gui/control.h"
@@ -408,17 +402,6 @@ void LocalizationEditor::_template_generate_open() {
 	template_generate_dialog->popup_file_dialog();
 }
 
-void LocalizationEditor::_template_generate_command() {
-	const String current_path = template_generate_dialog->get_current_path();
-	if (!current_path.is_empty() && current_path.get_file().is_valid_filename()) {
-		_template_generate(current_path);
-		EditorToaster::get_singleton()->popup_str(TTR("Template generated."));
-	} else {
-		ProjectSettingsEditor::get_singleton()->popup_centered();
-		_template_generate_open();
-	}
-}
-
 void LocalizationEditor::_template_add_builtin_toggled() {
 	ProjectSettings::get_singleton()->set_setting("internationalization/locale/translation_add_builtin_strings_to_pot", template_add_builtin->is_pressed());
 	ProjectSettings::get_singleton()->save();
@@ -501,7 +484,7 @@ void LocalizationEditor::_filesystem_files_moved(const String &p_old_file, const
 	if (remaps_changed) {
 		ProjectSettings::get_singleton()->set_setting("internationalization/locale/translation_remaps", remaps);
 		update_translations();
-		emit_signal(localization_changed);
+		emit_signal("localization_changed");
 	}
 }
 
@@ -541,7 +524,7 @@ void LocalizationEditor::_filesystem_file_removed(const String &p_file) {
 
 	if (remaps_changed) {
 		update_translations();
-		emit_signal(localization_changed);
+		emit_signal("localization_changed");
 	}
 }
 
@@ -916,6 +899,4 @@ LocalizationEditor::LocalizationEditor() {
 	for (Tree *tree : trees) {
 		SET_DRAG_FORWARDING_GCD(tree, LocalizationEditor);
 	}
-
-	EditorCommandPalette::get_singleton()->add_command(TTRC("Generate Translation Template"), "editor/template_generator/generate", callable_mp(this, &LocalizationEditor::_template_generate_command));
 }
diff --git a/engine/editor/translations/localization_editor.h b/engine/editor/translations/localization_editor.h
index 771d6578..e7c1b804 100644
--- a/engine/editor/translations/localization_editor.h
+++ b/engine/editor/translations/localization_editor.h
@@ -58,7 +58,7 @@ class LocalizationEditor : public VBoxContainer {
 	Button *template_generate_button = nullptr;
 
 	bool updating_translations = false;
-	StringName localization_changed;
+	String localization_changed;
 
 	LocalVector<Tree *> trees;
 	HashMap<Tree *, String> tree_data_types;
@@ -83,7 +83,6 @@ class LocalizationEditor : public VBoxContainer {
 	void _template_source_delete(Object *p_item, int p_column, int p_button, MouseButton p_mouse_button);
 	void _template_source_file_open();
 	void _template_generate_open();
-	void _template_generate_command();
 	void _template_add_builtin_toggled();
 	void _template_generate(const String &p_file);
 	void _update_template_source_file_extensions();
diff --git a/engine/editor/translations/packed_scene_translation_parser_plugin.cpp b/engine/editor/translations/packed_scene_translation_parser_plugin.cpp
index 0a5926b3..2bb4e1da 100644
--- a/engine/editor/translations/packed_scene_translation_parser_plugin.cpp
+++ b/engine/editor/translations/packed_scene_translation_parser_plugin.cpp
@@ -31,7 +31,6 @@
 #include "packed_scene_translation_parser_plugin.h"
 
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "scene/resources/packed_scene.h"
 
@@ -230,8 +229,6 @@ PackedSceneEditorTranslationParserPlugin::PackedSceneEditorTranslationParserPlug
 	lookup_properties.insert("filters");
 	lookup_properties.insert("script");
 	lookup_properties.insert("item_*/text");
-	lookup_properties.insert("accessibility_name");
-	lookup_properties.insert("accessibility_description");
 
 	// Exception list (to prevent false positives).
 	exception_list.insert("LineEdit", { "text" });
diff --git a/engine/editor/translations/properties/cs.po b/engine/editor/translations/properties/cs.po
index d594ac87..1e40b75d 100644
--- a/engine/editor/translations/properties/cs.po
+++ b/engine/editor/translations/properties/cs.po
@@ -38,7 +38,7 @@
 # Jan Hrubec <janhrubec008@gmail.com>, 2023.
 # Matěj Šroub <matejsroub@gmail.com>, 2023.
 # Marek Douběta <mrocklon420@gmail.com>, 2023.
-# Marek Poustka <noskrat@gmail.com>, 2024.
+# Marek Poustka <noskrat@gmail.com>, 2024, 2026.
 # Dante <jamesbondytc@gmail.com>, 2024.
 # michaloM <michalsvoboda2004@gmail.com>, 2024, 2025.
 # Pythom1234 <tom.fucik@email.cz>, 2025.
@@ -51,8 +51,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-09-14 16:20+0000\n"
-"Last-Translator: Pixeluted <pixeluted@proton.me>\n"
+"PO-Revision-Date: 2026-02-04 18:02+0000\n"
+"Last-Translator: Marek Poustka <noskrat@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot-"
 "properties/cs/>\n"
 "Language: cs\n"
@@ -60,7 +60,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.14-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "Aplikace"
@@ -108,7 +108,10 @@ msgid "Custom User Dir Name"
 msgstr "Název vlastního adresáře uživatele"
 
 msgid "Project Settings Override"
-msgstr "Přepsat nastavení projektu ze souboru"
+msgstr "Přepsat nastavení projektu"
+
+msgid "Disable Project Settings Override"
+msgstr "Zakázat přepsání nastavení projektu"
 
 msgid "Main Loop Type"
 msgstr "Typ hlavní smyčky"
@@ -141,7 +144,7 @@ msgid "Size"
 msgstr "Velikost"
 
 msgid "Viewport Width"
-msgstr "Šířka průzoru"
+msgstr "Šířka výřezu"
 
 msgid "Viewport Height"
 msgstr "Výška výřezu"
@@ -212,6 +215,9 @@ msgstr "Kontrola protichůdných typů interpolace"
 msgid "Compatibility"
 msgstr "Kompatibilita"
 
+msgid "Default Parent Skeleton in Mesh Instance 3D"
+msgstr "Výchozí rodičovská kostra v instanci sítě 3D"
+
 msgid "Audio"
 msgstr "Zvuk"
 
@@ -239,20 +245,23 @@ msgstr "iOS"
 msgid "Session Category"
 msgstr "Kategorie relací"
 
+msgid "Mix with Others"
+msgstr "Mísit s ostatními"
+
 msgid "Subwindows"
 msgstr "Podokna"
 
 msgid "Embed Subwindows"
-msgstr "Vložit podokna"
+msgstr "Vnořená podokna"
 
 msgid "Frame Pacing"
-msgstr "Tempo snímků"
+msgstr "Rychlost snímkování"
 
 msgid "Android"
 msgstr "Android"
 
 msgid "Enable Frame Pacing"
-msgstr "Povolit tempo snímků"
+msgstr "Povolit rychlost snímkování"
 
 msgid "Swappy Mode"
 msgstr "Swappy režim"
@@ -306,7 +315,7 @@ msgid "Zstd"
 msgstr "Zstd"
 
 msgid "Long Distance Matching"
-msgstr "Shoda na dlouhé vzdálenosti"
+msgstr "Párování na dlouhé vzdálenosti"
 
 msgid "Compression Level"
 msgstr "Úroveň komprese"
@@ -336,7 +345,7 @@ msgid "BVH Build Quality"
 msgstr "Kvalita sestavení BVH"
 
 msgid "Jitter Projection"
-msgstr "Variabilní projekce"
+msgstr "Projekce chvění"
 
 msgid "Internationalization"
 msgstr "Internacionalizace"
@@ -348,7 +357,7 @@ msgid "Root Node Layout Direction"
 msgstr "Směr rozvržení kořenového uzlu"
 
 msgid "Root Node Auto Translate"
-msgstr "Automatický posun kořenového uzlu"
+msgstr "Automatický překlad kořenového uzlu"
 
 msgid "GUI"
 msgstr "GUI"
@@ -365,9 +374,15 @@ msgstr "Zpoždění popisků nápovědy (s)"
 msgid "Common"
 msgstr "Společné"
 
+msgid "Drag Threshold"
+msgstr "Práh tažení"
+
 msgid "Snap Controls to Pixels"
 msgstr "Přichytit ovládací prvky k pixelům"
 
+msgid "Show Focus State on Pointer Event"
+msgstr "Zobrazit stav zaměření při události z Pointeru"
+
 msgid "Fonts"
 msgstr "Fonty"
 
@@ -422,6 +437,12 @@ msgstr "Maximální počet deskriptorů na pool"
 msgid "D3D12"
 msgstr "D3D12"
 
+msgid "Max Resource Descriptors"
+msgstr "Maximální počet deskriptorů zdroje"
+
+msgid "Max Sampler Descriptors"
+msgstr "Maximální počet deskriptorů sampleru"
+
 msgid "Agility SDK Version"
 msgstr "Verze Agility SDK"
 
@@ -456,11 +477,26 @@ msgid "Enable Pan and Scale Gestures"
 msgstr "Povolit gesta posunutí a škálování"
 
 msgid "Rotary Input Scroll Axis"
-msgstr "Osa posování otočného vstupu"
+msgstr "Rotační vstupní osa rolování"
+
+msgid "Override Volume Buttons"
+msgstr "Přepsat tlačítko hlasitosti"
+
+msgid "Disable Scroll Deadzone"
+msgstr "Vypnout mrtvou zónu posunu"
 
 msgid "Navigation"
 msgstr "Navigace"
 
+msgid "World"
+msgstr "Svět"
+
+msgid "Map Use Async Iterations"
+msgstr "Mapové užití asynchronních iterací"
+
+msgid "Region Use Async Iterations"
+msgstr "Regionální užití asynchronních iterací"
+
 msgid "Avoidance"
 msgstr "Vyhýbání"
 
diff --git a/engine/editor/translations/properties/fa.po b/engine/editor/translations/properties/fa.po
index a156dfc4..65df9f4d 100644
--- a/engine/editor/translations/properties/fa.po
+++ b/engine/editor/translations/properties/fa.po
@@ -50,13 +50,14 @@
 # Mahan Khalili <mkh-user@users.noreply.hosted.weblate.org>, 2025.
 # ali zia <sampadpars@gmail.com>, 2025.
 # نام <z.xp.xp.900@gmail.com>, 2025.
+# Sajjad Zavar <zavarsajjad98@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-12-23 01:01+0000\n"
-"Last-Translator: نام <z.xp.xp.900@gmail.com>\n"
+"PO-Revision-Date: 2026-02-12 14:11+0000\n"
+"Last-Translator: Sajjad Zavar <zavarsajjad98@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/fa/>\n"
 "Language: fa\n"
@@ -64,7 +65,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "برنامه"
@@ -114,6 +115,9 @@ msgstr "نام دلخواه برای پوشه‌دان کاربر"
 msgid "Project Settings Override"
 msgstr "لغو تنظیمات پروژه"
 
+msgid "Disable Project Settings Override"
+msgstr "غیرفعال کردن Override تنظیمات پروژه"
+
 msgid "Main Loop Type"
 msgstr "گونهٔ چرخهٔ اصلی"
 
@@ -216,6 +220,9 @@ msgstr "بررسی ناسازگاری نوع درون‌یابی زاویه"
 msgid "Compatibility"
 msgstr "سازگاری"
 
+msgid "Default Parent Skeleton in Mesh Instance 3D"
+msgstr "والد پیش‌فرض اسکلت در Mesh Instance 3D"
+
 msgid "Audio"
 msgstr "صدا"
 
@@ -243,6 +250,9 @@ msgstr "آی‌او‌اس"
 msgid "Session Category"
 msgstr "دسته‌بندی نشست"
 
+msgid "Mix with Others"
+msgstr "مخلوط با سایرین"
+
 msgid "Subwindows"
 msgstr "زیر پنجره ها"
 
diff --git a/engine/editor/translations/properties/it.po b/engine/editor/translations/properties/it.po
index b619fa9a..2b21bc66 100644
--- a/engine/editor/translations/properties/it.po
+++ b/engine/editor/translations/properties/it.po
@@ -98,13 +98,14 @@
 # Pietro Marini <pietromarinivr2006@gmail.com>, 2025.
 # shifenis <dedi.ceka99@gmail.com>, 2026.
 # Alex B <alexius.barresi@gmail.com>, 2026.
+# Cristian Zerbinati <cristian.zerbinati@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-18 16:02+0000\n"
-"Last-Translator: Alex B <alexius.barresi@gmail.com>\n"
+"PO-Revision-Date: 2026-02-03 14:02+0000\n"
+"Last-Translator: Cristian Zerbinati <cristian.zerbinati@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/it/>\n"
 "Language: it\n"
@@ -112,7 +113,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "Applicazione"
@@ -423,6 +424,9 @@ msgstr "Ritardo dei tooltip (secondi)"
 msgid "Common"
 msgstr "Comune"
 
+msgid "Drag Threshold"
+msgstr "Soglia di trascinamento"
+
 msgid "Snap Controls to Pixels"
 msgstr "Scatta i nodi Control ai pixel"
 
diff --git a/engine/editor/translations/properties/ja.po b/engine/editor/translations/properties/ja.po
index 31bb073f..b711c748 100644
--- a/engine/editor/translations/properties/ja.po
+++ b/engine/editor/translations/properties/ja.po
@@ -58,7 +58,7 @@
 # Binnaga <polycharacter@gmail.com>, 2024.
 # rion <miyachikozin@gmail.com>, 2025.
 # Bagumeon <bagumelon@gmail.com>, 2025.
-# Viktor Jagebrant <vjagebrant@gmail.com>, 2025.
+# Viktor Jagebrant <vjagebrant@gmail.com>, 2025, 2026.
 # Myeongjin <aranet100@gmail.com>, 2025, 2026.
 # johann carlo florin <join001re2@gmail.com>, 2025.
 msgid ""
@@ -66,8 +66,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-14 21:31+0000\n"
-"Last-Translator: Myeongjin <aranet100@gmail.com>\n"
+"PO-Revision-Date: 2026-01-29 23:26+0000\n"
+"Last-Translator: Viktor Jagebrant <vjagebrant@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/ja/>\n"
 "Language: ja\n"
@@ -75,7 +75,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "アプリ"
@@ -1725,6 +1725,12 @@ msgstr "ネイティブのファイルダイアログを使用"
 msgid "Expand to Title"
 msgstr "タイトルまで展開"
 
+msgid "Main Font Size"
+msgstr "標準フォントサイズ"
+
+msgid "Code Font Size"
+msgstr "コードのフォントサイズ"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "コードフォントコンテキスト合字"
 
diff --git a/engine/editor/translations/properties/ka.po b/engine/editor/translations/properties/ka.po
index 055212ea..2b36944e 100644
--- a/engine/editor/translations/properties/ka.po
+++ b/engine/editor/translations/properties/ka.po
@@ -6,13 +6,13 @@
 # George Dzavashvili <dzavashviligeorge@gmail.com>, 2018.
 # დემეტრე შონია <blender.animation.maker@gmail.com>, 2019.
 # Rati Nikolaishvili <rati.nikolaishvili@gmail.com>, 2019.
-# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023, 2024, 2025.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023, 2024, 2025, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-10-30 13:39+0000\n"
+"PO-Revision-Date: 2026-02-13 12:54+0000\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/ka/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.14.1-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "აპლიკაცია"
@@ -1166,6 +1166,9 @@ msgstr "Rest-ის შემოტანა Reset-ის სახით"
 msgid "Import Script"
 msgstr "სკრიპტის შემოტანა"
 
+msgid "Materials"
+msgstr "მასალები"
+
 msgid "Extract"
 msgstr "ამღება"
 
diff --git a/engine/editor/translations/properties/ko.po b/engine/editor/translations/properties/ko.po
index e0e02ca6..a4256aaa 100644
--- a/engine/editor/translations/properties/ko.po
+++ b/engine/editor/translations/properties/ko.po
@@ -62,7 +62,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-20 09:04+0000\n"
+"PO-Revision-Date: 2026-02-09 12:49+0000\n"
 "Last-Translator: Myeongjin <aranet100@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/godot-"
 "properties/ko/>\n"
@@ -113,10 +113,10 @@ msgid "Use Hidden Project Data Directory"
 msgstr "숨겨진 프로젝트 데이터 디렉터리 사용"
 
 msgid "Use Custom User Dir"
-msgstr "커스텀 유저 디렉터리 사용"
+msgstr "커스텀 사용자 디렉터리 사용"
 
 msgid "Custom User Dir Name"
-msgstr "커스텀 유저 디렉터리 이름"
+msgstr "커스텀 사용자 디렉터리 이름"
 
 msgid "Project Settings Override"
 msgstr "프로젝트 설정 오버라이드"
@@ -1088,7 +1088,7 @@ msgid "Shader Baker"
 msgstr "셰이더 베이커"
 
 msgid "Enabled"
-msgstr "활성화됨"
+msgstr "활성화"
 
 msgid "User Data"
 msgstr "사용자 데이터"
@@ -1505,19 +1505,19 @@ msgid "Skins"
 msgstr "스킨"
 
 msgid "Use Named Skins"
-msgstr "네임드 스킨 사용"
+msgstr "이름 붙은 스킨 사용"
 
 msgid "FPS"
-msgstr "초당 프레임"
+msgstr "FPS"
 
 msgid "Trimming"
 msgstr "다듬기"
 
 msgid "Remove Immutable Tracks"
-msgstr "변경 불가한 트랙 제거"
+msgstr "변경 불가능한 트랙 제거"
 
 msgid "Import Rest as Reset"
-msgstr "레스트를 재설정으로 가져오기"
+msgstr "기본 자세를 재설정으로 가져오기"
 
 msgid "Import Script"
 msgstr "스크립트 가져오기"
@@ -3834,7 +3834,7 @@ msgid "Always Track Local Variables"
 msgstr "로컬 변종 항상 추적"
 
 msgid "Renamed in Godot 4 Hint"
-msgstr "Godot 4 힌트에서 이름 변경됨"
+msgstr "Godot 4 힌트에서 이름 바꿈"
 
 msgid "Unassigned Variable"
 msgstr "할당되지 않은 변수"
@@ -4086,7 +4086,7 @@ msgid "GLB Data"
 msgstr "GLB 데이터"
 
 msgid "Use Named Skin Binds"
-msgstr "네임드 스킨 바인딩 사용"
+msgstr "이름 붙은 스킨 바인딩 사용"
 
 msgid "Buffers"
 msgstr "버퍼"
@@ -7361,13 +7361,13 @@ msgid "Pinned Points"
 msgstr "고정된 점"
 
 msgid "Attachments"
-msgstr "첨부"
+msgstr "부착"
 
 msgid "Point Index"
 msgstr "점 인덱스"
 
 msgid "Spatial Attachment Path"
-msgstr "공간 첨부 경로"
+msgstr "공간 부착 경로"
 
 msgid "Parent Collision Ignore"
 msgstr "부모 콜리전 무시"
@@ -8060,7 +8060,7 @@ msgid "File Mode"
 msgstr "파일 모드"
 
 msgid "Access"
-msgstr "액세스"
+msgstr "접근"
 
 msgid "Root Subfolder"
 msgstr "루트 하위 폴더"
@@ -9720,10 +9720,10 @@ msgid "Effect Callback Type"
 msgstr "효과 콜백 유형"
 
 msgid "Access Resolved Color"
-msgstr "액세스 해결 색상"
+msgstr "접근 해결 색상"
 
 msgid "Access Resolved Depth"
-msgstr "액세스 해결 깊이"
+msgstr "접근 해결 깊이"
 
 msgid "Needs Motion Vectors"
 msgstr "모션 벡터 필요"
@@ -12126,10 +12126,10 @@ msgid "Max Collisions"
 msgstr "최대 콜리전 수"
 
 msgid "Debug Redraw Time"
-msgstr "디버그 다시 그리기 시간"
+msgstr "디버그 리드로우 시간"
 
 msgid "Debug Redraw Color"
-msgstr "디버그 다시 그리기 색상"
+msgstr "디버그 리드로우 색상"
 
 msgid "Tighter Shadow Caster Culling"
 msgstr "더 단단한 섀도우 캐스터 컬링"
diff --git a/engine/editor/translations/properties/pl.po b/engine/editor/translations/properties/pl.po
index 41f98c14..493960b9 100644
--- a/engine/editor/translations/properties/pl.po
+++ b/engine/editor/translations/properties/pl.po
@@ -105,7 +105,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-20 09:04+0000\n"
+"PO-Revision-Date: 2026-02-12 03:09+0000\n"
 "Last-Translator: Tomek <kobewi4e@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/godot-"
 "properties/pl/>\n"
@@ -1630,7 +1630,7 @@ msgid "OpenType Features"
 msgstr "Funkcje OpenType"
 
 msgid "Fallbacks"
-msgstr "Błędy"
+msgstr "Awaryjne"
 
 msgid "Compress"
 msgstr "Skompresuj"
diff --git a/engine/editor/translations/properties/ru.po b/engine/editor/translations/properties/ru.po
index f92eb08b..5a91372c 100644
--- a/engine/editor/translations/properties/ru.po
+++ b/engine/editor/translations/properties/ru.po
@@ -206,13 +206,15 @@
 # penggrin12 <miner.sidor@gmail.com>, 2025.
 # cofeek-codes <11kormyshev11@gmail.com>, 2025.
 # daodan <karovich16@gmail.com>, 2026.
+# XZY <XZY@xyecoc.com>, 2026.
+# MariyaShikunova <mariia@basealt.ru>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2026-01-08 18:01+0000\n"
-"Last-Translator: Aleksandr <sasha7onoff@gmail.com>\n"
+"PO-Revision-Date: 2026-02-12 03:09+0000\n"
+"Last-Translator: MariyaShikunova <mariia@basealt.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/ru/>\n"
 "Language: ru\n"
@@ -221,7 +223,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.15.1\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "Приложение"
@@ -376,6 +378,9 @@ msgstr "Проверить на конфликт типа интерполяци
 msgid "Compatibility"
 msgstr "Совместимость"
 
+msgid "Default Parent Skeleton in Mesh Instance 3D"
+msgstr "Родительский скелет по умолчанию в 3D-экземпляре сетки"
+
 msgid "Audio"
 msgstr "Аудио"
 
@@ -403,6 +408,9 @@ msgstr "iOS"
 msgid "Session Category"
 msgstr "Категория сеанса"
 
+msgid "Mix with Others"
+msgstr "Смешивание с другими"
+
 msgid "Subwindows"
 msgstr "Подокна"
 
@@ -529,9 +537,15 @@ msgstr "Задержка подсказки (сек)"
 msgid "Common"
 msgstr "Общий"
 
+msgid "Drag Threshold"
+msgstr "Пороговое значение перетаскивания"
+
 msgid "Snap Controls to Pixels"
 msgstr "Пиксельная привязка управления"
 
+msgid "Show Focus State on Pointer Event"
+msgstr "Показывать состояние фокуса во время события указателя"
+
 msgid "Fonts"
 msgstr "Шрифты"
 
@@ -586,6 +600,12 @@ msgstr "Макс. кол-во дескрипторов на пул"
 msgid "D3D12"
 msgstr "Direct3D 12"
 
+msgid "Max Resource Descriptors"
+msgstr "Максимальное количество дескрипторов ресурсов"
+
+msgid "Max Sampler Descriptors"
+msgstr "Дескрипторы Max Sampler"
+
 msgid "Agility SDK Version"
 msgstr "Версия Agility SDK"
 
@@ -676,6 +696,9 @@ msgstr "Ошибки слияния границ навигационной се
 msgid "NavMesh Cell Size Mismatch"
 msgstr "Несоответствие размера ячеек навигационной сетки"
 
+msgid "Editor Overrides"
+msgstr "Переопределения редактора"
+
 msgid "Low Processor Usage Mode"
 msgstr "Режим низкой нагрузки процессора"
 
@@ -991,6 +1014,9 @@ msgstr "Коэффициент потоков с низким приоритет
 msgid "Locale"
 msgstr "Локаль"
 
+msgid "Plural Rules Override"
+msgstr "Замена правил множества"
+
 msgid "Test"
 msgstr "Тест"
 
@@ -1003,6 +1029,9 @@ msgstr "Псевдолокализация"
 msgid "Use Pseudolocalization"
 msgstr "Использовать псевдолокализацию"
 
+msgid "Replace with Accents"
+msgstr "Заменить на варианты с диакритикой"
+
 msgid "Double Vowels"
 msgstr "Удвоенные гласные"
 
@@ -1081,15 +1110,36 @@ msgstr "Синхронизация точек останова"
 msgid "Title"
 msgstr "Заголовок"
 
+msgid "Layout Key"
+msgstr "Ключ макета"
+
 msgid "Global"
 msgstr "Глобальный"
 
 msgid "Transient"
 msgstr "Переходность"
 
+msgid "Closable"
+msgstr "Можно закрыть"
+
+msgid "Icon Name"
+msgstr "Имя значка"
+
+msgid "Dock Icon"
+msgstr "Значок панели"
+
+msgid "Force Show Icon"
+msgstr "Принудительное отображение значка"
+
 msgid "Title Color"
 msgstr "Цвет заголовка"
 
+msgid "Dock Shortcut"
+msgstr "Горячая клавиша панели"
+
+msgid "Default Slot"
+msgstr "Слот по умолчанию"
+
 msgid "Available Layouts"
 msgstr "Доступные макеты"
 
@@ -1270,6 +1320,9 @@ msgstr "Только чтение"
 msgid "Flat"
 msgstr "Плоская"
 
+msgid "Control State"
+msgstr "Состояние управления"
+
 msgid "Hide Slider"
 msgstr "Скрыть ползунок"
 
@@ -1720,6 +1773,12 @@ msgstr "Режим масштабирования"
 msgid "Delimiter"
 msgstr "Разделитель"
 
+msgid "Unescape Keys"
+msgstr "Клавиши Unescape"
+
+msgid "Unescape Translations"
+msgstr "Переводы Unescape"
+
 msgid "Character Ranges"
 msgstr "Диапазоны символов"
 
@@ -1846,6 +1905,12 @@ msgstr "SVG"
 msgid "Editor"
 msgstr "Редактор"
 
+msgid "Scale with Editor Scale"
+msgstr "Масштабировать с помощью редактора масштабирования"
+
+msgid "Convert Colors with Editor Theme"
+msgstr "Конвертировать цвета с помощью темы редактора"
+
 msgid "Atlas File"
 msgstr "Файл атласа"
 
@@ -2044,6 +2109,9 @@ msgstr "Локализация"
 msgid "Dock Tab Style"
 msgstr "Стиль вкладки док-станции"
 
+msgid "Bottom Dock Tab Style"
+msgstr "Стиль вкладки нижней панели"
+
 msgid "UI Layout Direction"
 msgstr "Направление макета интерфейса"
 
@@ -2083,6 +2151,9 @@ msgstr "Размер основного шрифта"
 msgid "Code Font Size"
 msgstr "Размер шрифта кода"
 
+msgid "Main Font Custom OpenType Features"
+msgstr "Функции настройки основного шрифта OpenType"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "Лигатуры в шрифте кода"
 
@@ -2116,6 +2187,9 @@ msgstr "Основной жирный шрифт"
 msgid "Code Font"
 msgstr "Шрифт кода"
 
+msgid "Dragging Hover Wait Seconds"
+msgstr "Секунды ожидания при перетаскивании"
+
 msgid "Separate Distraction Mode"
 msgstr "Отдельный переключатель режима «без отвлечения внимания»"
 
@@ -2190,6 +2264,9 @@ msgstr "Показать низкоуровневые возможности Ope
 msgid "Float Drag Speed"
 msgstr "Скорость прокручивания"
 
+msgid "Integer Drag Speed"
+msgstr "Целочисленная скорость перетаскивания"
+
 msgid "Nested Color Mode"
 msgstr "Режим цветa"
 
@@ -2235,6 +2312,12 @@ msgstr "Тема"
 msgid "Follow System Theme"
 msgstr "Следовать теме системы"
 
+msgid "Style"
+msgstr "Стиль"
+
+msgid "Color Preset"
+msgstr "Шаблон цвета"
+
 msgid "Spacing Preset"
 msgstr "Пресет интервала"
 
@@ -2310,6 +2393,9 @@ msgstr "Показать кнопку скрипта"
 msgid "Restore Scenes on Load"
 msgstr "Восстанавливать сцены при загрузке"
 
+msgid "Auto Select Current Scene File"
+msgstr "Автоматический выбор текущего файла сцены"
+
 msgid "Multi Window"
 msgstr "Множественное окно"
 
@@ -2392,6 +2478,9 @@ msgstr "Файловое диалоговое окно"
 msgid "Max Results"
 msgstr "Макс. кол-во результатов"
 
+msgid "Instant Preview"
+msgstr "Мгновенный предварительный просмотр"
+
 msgid "Show Search Highlight"
 msgstr "Показать выделение поиска"
 
@@ -2695,6 +2784,9 @@ msgstr "Завершение"
 msgid "Idle Parse Delay"
 msgstr "Задержка перед анализом синтаксиса"
 
+msgid "Idle Parse Delay with Errors Found"
+msgstr "Задержка перед анализом синтаксиса с ошибками"
+
 msgid "Auto Brace Complete"
 msgstr "Автозакрытие скобок"
 
@@ -2857,6 +2949,9 @@ msgstr "Длина оси кости"
 msgid "Bone Shape"
 msgstr "Форма кости"
 
+msgid "Path3D Tilt Disk Size"
+msgstr "Размер диска наклона Path3D"
+
 msgid "Lightmap GI Probe Size"
 msgstr "Размер Проба GI Карты Освещения"
 
@@ -2941,6 +3036,9 @@ msgstr "Инерция перемещения"
 msgid "Zoom Inertia"
 msgstr "Инерция масштабирования"
 
+msgid "Angle Snap Threshold"
+msgstr "Порог угловой привязки"
+
 msgid "Show Viewport Rotation Gizmo"
 msgstr "Показывать гизмо вращения окна просмотра"
 
@@ -2974,6 +3072,9 @@ msgstr "Размер гизмо манипулятора"
 msgid "Manipulator Gizmo Opacity"
 msgstr "Непрозрачность гизмо манипулятора"
 
+msgid "Show Gizmo During Rotation"
+msgstr "Показывать гизмо вращения окна просмотра"
+
 msgid "Grid Color"
 msgstr "Цвет сетки"
 
@@ -3016,6 +3117,9 @@ msgstr "Коэффициент Скорости Масштабирования"
 msgid "Ruler Width"
 msgstr "Ширина линейки"
 
+msgid "Auto Resample Delay"
+msgstr "Задержка автоматической ресемпировки"
+
 msgid "Bone Mapper"
 msgstr "Размечатель костей"
 
@@ -3454,6 +3558,9 @@ msgstr "XR"
 msgid "OpenXR"
 msgstr "OpenXR"
 
+msgid "Target API Version"
+msgstr "Целевая версия API"
+
 msgid "Default Action Map"
 msgstr "Карта действий по умолчанию"
 
@@ -3505,6 +3612,36 @@ msgstr "Источник данных контроллера отслежива
 msgid "Hand Interaction Profile"
 msgstr "Профиль взаимодействия рук"
 
+msgid "Spatial Entity"
+msgstr "Пространственная сущность"
+
+msgid "Enable Spatial Anchors"
+msgstr "Включить пространственные якори"
+
+msgid "Enable Persistent Anchors"
+msgstr "Включить постоянные якори"
+
+msgid "Enable Builtin Anchor Detection"
+msgstr "Включить встроенное обнаружение якорей"
+
+msgid "Enable Plane Tracking"
+msgstr "Включить отслеживание плоскости"
+
+msgid "Enable Builtin Plane Detection"
+msgstr "Включить встроенное обнаружение плоскостей"
+
+msgid "Enable Marker Tracking"
+msgstr "Включить отслеживание маркеров"
+
+msgid "Enable Builtin Marker Tracking"
+msgstr "Включить отслеживание встроенных маркеров"
+
+msgid "Aruco Dict"
+msgstr "Словарь Aruco"
+
+msgid "April Tag Dict"
+msgstr "Апрельский словарь тегов"
+
 msgid "Eye Gaze Interaction"
 msgstr "Взаимодействие взгляда"
 
@@ -3937,6 +4074,9 @@ msgstr "Избыточная Статическая Разгрузка"
 msgid "Redundant Await"
 msgstr "Избыточное Ожидание"
 
+msgid "Missing Await"
+msgstr "Отсутствующее ожидание"
+
 msgid "Assert Always True"
 msgstr "Утверждать Всегда Верно (Assert Always True)"
 
@@ -4153,6 +4293,9 @@ msgstr "Создать анимации"
 msgid "Animations"
 msgstr "Анимации"
 
+msgid "Handle Binary Image Mode"
+msgstr "Обработка двоичного режима изображения"
+
 msgid "Buffer View"
 msgstr "Представление буфера"
 
@@ -4717,12 +4860,42 @@ msgstr "Включить тактильный отклик"
 msgid "Off Haptic"
 msgstr "Выключить тактильный отклик"
 
+msgid "Relax Frame Interval"
+msgstr "Интервал кадра релаксации"
+
 msgid "On Threshold"
 msgstr "Порог включения"
 
 msgid "Off Threshold"
 msgstr "Порог отключения"
 
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Entity"
+msgstr "Сущность"
+
+msgid "Spatial Tracking State"
+msgstr "Состояние пространственного отслеживания"
+
+msgid "April Dict"
+msgstr "Апрельский диктант"
+
+msgid "Bounds Size"
+msgstr "Размер границ"
+
+msgid "Marker Type"
+msgstr "Тип маркера"
+
+msgid "Marker ID"
+msgstr "ID маркера"
+
+msgid "Plane Alignment"
+msgstr "Выравнивание плоскости"
+
+msgid "Plane Label"
+msgstr "Подпись плоскости"
+
 msgid "Display Refresh Rate"
 msgstr "Частота обновления дисплея"
 
@@ -4738,6 +4911,9 @@ msgstr "Окно просмотра на слое"
 msgid "Use Android Surface"
 msgstr "Использовать область экрана Android"
 
+msgid "Protected Content"
+msgstr "Защищённое содержимое"
+
 msgid "Android Surface Size"
 msgstr "Размер области экрана Android"
 
@@ -4931,6 +5107,18 @@ msgstr "Путь к Android SDK"
 msgid "scrcpy"
 msgstr "scrcpy"
 
+msgid "Virtual Display"
+msgstr "Виртуальный дисплей"
+
+msgid "No Decorations"
+msgstr "Без украшений"
+
+msgid "Local IME"
+msgstr "Локальный IME"
+
+msgid "Screen Size"
+msgstr "Размер экрана"
+
 msgid "Force System User"
 msgstr "Принудительное использование пользователя системы"
 
@@ -5198,9 +5386,15 @@ msgstr "macOS"
 msgid "rcodesign"
 msgstr "rcodesign"
 
+msgid "actool"
+msgstr "actool"
+
 msgid "Distribution Type"
 msgstr "Тип распространения"
 
+msgid "Liquid Glass Icon"
+msgstr "Значок Liquid Glass"
+
 msgid "Copyright Localized"
 msgstr "Локализованные авторские права"
 
@@ -6076,6 +6270,9 @@ msgstr "Стоимость перемещения"
 msgid "Vertices"
 msgstr "Вершины"
 
+msgid "NavigationPolygon"
+msgstr "Полигон навигации"
+
 msgid "Affect Navigation Mesh"
 msgstr "Влияние на сетку навигации"
 
@@ -6569,6 +6766,9 @@ msgstr "Использовать внешний скелет"
 msgid "External Skeleton"
 msgstr "Внешний скелет"
 
+msgid "Mutable Bone Axes"
+msgstr "Сменные костные оси"
+
 msgid "Keep Aspect"
 msgstr "Оставить соотношение сторон"
 
@@ -6711,6 +6911,9 @@ msgstr "Макс. кол-во итераций"
 msgid "Min Distance"
 msgstr "Мин. расстояние"
 
+msgid "Angular Delta Limit"
+msgstr "Угловое дельта-ограничение"
+
 msgid "Deterministic"
 msgstr "Детерминистский алгоритм"
 
@@ -6951,6 +7154,9 @@ msgstr "Данные света"
 msgid "Exclude"
 msgstr "Исключать"
 
+msgid "Chains"
+msgstr "Цепи"
+
 msgid "Target Node"
 msgstr "Целевой узел"
 
@@ -7577,6 +7783,9 @@ msgstr "Кривая исчезания"
 msgid "Break Loop at End"
 msgstr "Разрывать цикл в конце"
 
+msgid "Abort on Reset"
+msgstr "Прервать при сбросе"
+
 msgid "Auto Restart"
 msgstr "Автоматический перезапуск"
 
@@ -7802,6 +8011,9 @@ msgstr "Рисовать номера строк"
 msgid "Zero Pad Line Numbers"
 msgstr "Заполнять номера строк нулями"
 
+msgid "Line Numbers Min Digits"
+msgstr "Номера строк Минимальное количество цифр"
+
 msgid "Draw Fold Gutter"
 msgstr "Рисовать полосу сворачивания"
 
@@ -7913,6 +8125,9 @@ msgstr "Направление роста"
 msgid "Pivot Offset"
 msgstr "Смещение поворота"
 
+msgid "Pivot Offset Ratio"
+msgstr "Коэффициент смещения поворота"
+
 msgid "Container Sizing"
 msgstr "Настройка размера контейнера"
 
@@ -8045,6 +8260,12 @@ msgstr "Включён список недавних"
 msgid "Layout Toggle Enabled"
 msgstr "Включено переключение раскладки"
 
+msgid "Overwrite Warning Enabled"
+msgstr "Предупреждение о перезаписи включено"
+
+msgid "Deleting Enabled"
+msgstr "Удаление включено"
+
 msgid "Last Wrap Alignment"
 msgstr "Выравнивание для последнего переноса"
 
@@ -8135,6 +8356,9 @@ msgstr "Возможно перетаскивание"
 msgid "Selected"
 msgstr "Выделено"
 
+msgid "Scaling Menus"
+msgstr "Масштабирование меню"
+
 msgid "Autoshrink Enabled"
 msgstr "Автосжатие включено"
 
@@ -8180,6 +8404,12 @@ msgstr "Автовысота"
 msgid "Wraparound Items"
 msgstr "Обтекаемые элементы"
 
+msgid "Scroll Hint Mode"
+msgstr "Режим подсказок прокрутки"
+
+msgid "Tile Scroll Hint"
+msgstr "Подсказка о прокрутке плитки"
+
 msgid "Items"
 msgstr "Элементы"
 
@@ -8276,6 +8506,12 @@ msgstr "Рисовать управляющие символы"
 msgid "Select All on Focus"
 msgstr "Выделять всё при фокусе"
 
+msgid "Virtual Keyboard"
+msgstr "Виртуальная клавиатура"
+
+msgid "Show on Focus"
+msgstr "Показать в фокусе"
+
 msgid "Blink"
 msgstr "Мигание"
 
@@ -8300,6 +8536,12 @@ msgstr "Символ"
 msgid "Right Icon"
 msgstr "Значок справа"
 
+msgid "Icon Expand Mode"
+msgstr "Режим разворачивания значков"
+
+msgid "Right Icon Scale"
+msgstr "Масштаб правого значка"
+
 msgid "Underline"
 msgstr "Подчёркивание"
 
@@ -8348,6 +8590,12 @@ msgstr "Идентификатор системного меню"
 msgid "Prefer Native Menu"
 msgstr "Предпочитать нативное меню"
 
+msgid "Shrink Height"
+msgstr "Высота сжатия"
+
+msgid "Shrink Width"
+msgstr "Ширина сжатия"
+
 msgid "Fill Mode"
 msgstr "Режим заполнения"
 
@@ -8456,6 +8704,21 @@ msgstr "Следовать за фокусом"
 msgid "Draw Focus Border"
 msgstr "Рисовать границу фокуса"
 
+msgid "Scrollbar"
+msgstr "Панель прокрутки"
+
+msgid "Scroll Horizontal"
+msgstr "Прокрутка по горизонтали"
+
+msgid "Scroll Vertical"
+msgstr "Прокрутка по вертикали"
+
+msgid "Scroll Horizontal Custom Step"
+msgstr "Прокрутка пользовательского шага по горизонтали"
+
+msgid "Scroll Vertical Custom Step"
+msgstr "Прокрутка пользовательского шага по вертикали"
+
 msgid "Horizontal Scroll Mode"
 msgstr "Режим горизонтальной прокрутки"
 
@@ -8465,6 +8728,9 @@ msgstr "Режим вертикальной прокрутки"
 msgid "Scroll Deadzone"
 msgstr "Мёртвая зона прокрутки"
 
+msgid "Scroll Hint"
+msgstr "Подсказка прокручивания"
+
 msgid "Default Scroll Deadzone"
 msgstr "Мёртвая зона прокрутки по умолчанию"
 
@@ -8486,6 +8752,12 @@ msgstr "Обновлять при изменении текста"
 msgid "Custom Arrow Step"
 msgstr "Пользовательский шаг стрелки"
 
+msgid "Custom Arrow Round"
+msgstr "Пользовательский круглая стрелка"
+
+msgid "Split Offsets"
+msgstr "Смещение разделения"
+
 msgid "Collapsed"
 msgstr "Свёрнуто"
 
@@ -8528,6 +8800,9 @@ msgstr "Выравнивание вкладок"
 msgid "Clip Tabs"
 msgstr "Обрезать вкладки"
 
+msgid "Close with Middle Mouse"
+msgstr "Закрыть щелчком средней кнопки мыши"
+
 msgid "Tab Close Display Policy"
 msgstr "Политика показа кнопки закрытия вкладок"
 
@@ -8540,6 +8815,9 @@ msgstr "Включить прокрутку"
 msgid "Drag to Rearrange Enabled"
 msgstr "Включить перетаскивание для изменения порядка"
 
+msgid "Switch on Drag Hover"
+msgstr "Переключить при наведении"
+
 msgid "Tabs Rearrange Group"
 msgstr ""
 "Перетаскивание вкладок с одинаковым идентификатором изменения порядка группы"
@@ -8547,6 +8825,9 @@ msgstr ""
 msgid "Scroll to Selected"
 msgstr "Прокрутка до выбранной вкладки"
 
+msgid "Select with RMB"
+msgstr "Выбирать с помощью ПКМ"
+
 msgid "Deselect Enabled"
 msgstr "Включить снятие выбора"
 
@@ -8598,6 +8879,9 @@ msgstr "Переходить по нажатию ПКМ"
 msgid "Multiple"
 msgstr "Несколько"
 
+msgid "Word Separators"
+msgstr "Разделители слов"
+
 msgid "Syntax Highlighter"
 msgstr "Подсветка синтаксиса"
 
@@ -8677,6 +8961,9 @@ msgstr "Скрывать стрелку сворачивания"
 msgid "Enable Recursive Folding"
 msgstr "Включить рекурсивное сворачивание"
 
+msgid "Enable Drag Unfolding"
+msgstr "Включить разворачивание перетаскиванием"
+
 msgid "Hide Root"
 msgstr "Скрывать корень"
 
@@ -9040,6 +9327,9 @@ msgstr "Режим очистки"
 msgid "Current Screen"
 msgstr "Текущий экран"
 
+msgid "Nonclient Area"
+msgstr "Область для неклиентов"
+
 msgid "Mouse Passthrough Polygon"
 msgstr "Полигональная область принятия событий мыши"
 
@@ -9665,6 +9955,12 @@ msgstr "Карта тональности"
 msgid "White"
 msgstr "Белый"
 
+msgid "Agx White"
+msgstr "Белый Agx"
+
+msgid "Agx Contrast"
+msgstr "Контраст Agx"
+
 msgid "SSR"
 msgstr "Отражения в экранном пространстве (SSR)"
 
@@ -10435,6 +10731,9 @@ msgstr "Имя параметра"
 msgid "Qualifier"
 msgstr "Квалификатор"
 
+msgid "Instance Index"
+msgstr "Индекс экземпляра"
+
 msgid "Autoshrink"
 msgstr "Автосжатие"
 
@@ -10681,6 +10980,9 @@ msgstr "Цвет результата поиска"
 msgid "Search Result Border Color"
 msgstr "Цвет границ результата поиска"
 
+msgid "Wrap Offset"
+msgstr "Смещение обтекания"
+
 msgid "Breakpoint"
 msgstr "Точка остановки"
 
@@ -10900,6 +11202,18 @@ msgstr "Ширина кнопок"
 msgid "Set Min Buttons Width From Icons"
 msgstr "Установить минимальную ширину кнопки на основе изображения"
 
+msgid "Scroll Hint Vertical"
+msgstr "Подсказка прокручивания вертикально"
+
+msgid "Scroll Hint Horizontal"
+msgstr "Подсказка прокручивания горизонтально"
+
+msgid "Scroll Hint Vertical Color"
+msgstr "Цвет вертикальной подсказки прокручивания"
+
+msgid "Scroll Hint Horizontal Color"
+msgstr "Цвет горизонтальной подсказки прокручивания"
+
 msgid "Embedded Border"
 msgstr "Встроенная граница"
 
@@ -11044,6 +11358,9 @@ msgstr "Отступ перед элементами"
 msgid "Item End Padding"
 msgstr "Отступ после элементов"
 
+msgid "Gutter Compact"
+msgstr "Компактный желоб"
+
 msgid "Panel Selected"
 msgstr "Панель выбрана"
 
@@ -11162,6 +11479,9 @@ msgstr "Цвет линий отношений между выбранным Tre
 msgid "Custom Button Font Highlight"
 msgstr "Цвет текста для ячейки пользовательского режима при наведении"
 
+msgid "Scroll Hint Color"
+msgstr "Цвет подсказки прокручивания"
+
 msgid "Item Margin"
 msgstr "Отступ элемента"
 
@@ -11177,6 +11497,12 @@ msgstr "Внутренний отступ справа для элемента"
 msgid "Inner Item Margin Top"
 msgstr "Внутренний отступ сверху для элемента"
 
+msgid "Check H Separation"
+msgstr "Проверьте разделение H"
+
+msgid "Icon H Separation"
+msgstr "Разделение значков H"
+
 msgid "Button Margin"
 msgstr "Отступ кнопки"
 
@@ -11198,6 +11524,9 @@ msgstr ""
 msgid "Draw Guides"
 msgstr "Рисовать направляющие"
 
+msgid "Dragging Unfold Wait Msec"
+msgstr "Ожидание разворачивания при перетаскивании, мс"
+
 msgid "Scroll Border"
 msgstr "Граница прокрутки"
 
@@ -11255,6 +11584,15 @@ msgstr "Цвет текста других (невыбранных) вкладо
 msgid "Drop Mark Color"
 msgstr "Цвет отметки оставления"
 
+msgid "Icon Selected Color"
+msgstr "Цвет выбранного значка"
+
+msgid "Icon Hovered Color"
+msgstr "Цвет значка при наведении на кнопку"
+
+msgid "Icon Unselected Color"
+msgstr "Цвет не выбранного значка"
+
 msgid "Side Margin"
 msgstr "Отступ сбоку"
 
@@ -11264,6 +11602,9 @@ msgstr "Разделение значков"
 msgid "Button Highlight"
 msgstr "Подсветка кнопок"
 
+msgid "Hover Switch Wait Msec"
+msgstr "Ожидание переключения при наведении, мс"
+
 msgid "SV Width"
 msgstr "Ширина поля выбора насыщенности/значения"
 
@@ -11574,6 +11915,9 @@ msgstr "Масштаб скорости воспроизведения"
 msgid "Playback Mode"
 msgstr "Режим воспроизведения"
 
+msgid "Random Pitch Semitones"
+msgstr "Случайные полутона высоты"
+
 msgid "Random Volume Offset dB"
 msgstr "Случайное смещение громкости, дБ"
 
@@ -11715,6 +12059,9 @@ msgstr "Режим динамиков"
 msgid "Video Quality"
 msgstr "Качество видео"
 
+msgid "Audio Bit Depth"
+msgstr "Глубина аудио в битах"
+
 msgid "OGV"
 msgstr "OGV"
 
@@ -11839,6 +12186,9 @@ msgstr "Включить радиус препятствий"
 msgid "Enable Obstacles Static"
 msgstr "Включить статичные препятствия"
 
+msgid "Navigation Engine"
+msgstr "Движок навигации"
+
 msgid "Default Cell Height"
 msgstr "Высота ячейки по умолчанию"
 
@@ -11875,6 +12225,12 @@ msgstr "Суммарная гравитация"
 msgid "Center of Mass Local"
 msgstr "Локальный центр масс"
 
+msgid "Collide with Bodies"
+msgstr "Сталкивать с телами"
+
+msgid "Collide with Areas"
+msgstr "Сталкивать с областями"
+
 msgid "Canvas Instance ID"
 msgstr "Идентификатор экземпляра холста"
 
@@ -12007,6 +12363,9 @@ msgstr "Импорт S3TC BPTC"
 msgid "Import ETC2 ASTC"
 msgstr "Импорт ETC2 ASTC"
 
+msgid "Compress with GPU"
+msgstr "Сжатие на GPU"
+
 msgid "Cache GPU Compressor"
 msgstr "Кэш-компрессор GPU"
 
diff --git a/engine/editor/translations/properties/vi.po b/engine/editor/translations/properties/vi.po
index 30d003f8..34fdd733 100644
--- a/engine/editor/translations/properties/vi.po
+++ b/engine/editor/translations/properties/vi.po
@@ -32,13 +32,14 @@
 # a <anhkietcb2008@gmail.com>, 2024.
 # Đức Anh Nguyễn <ducnah2132k9@gmail.com>, 2025.
 # Orus Or <orus3732@gmail.com>, 2025.
+# Nguyen Ngoc Thai <thaidev247@gmail.com>, 2026.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-11-10 01:56+0000\n"
-"Last-Translator: Orus Or <orus3732@gmail.com>\n"
+"PO-Revision-Date: 2026-01-28 01:30+0000\n"
+"Last-Translator: Nguyen Ngoc Thai <thaidev247@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/vi/>\n"
 "Language: vi\n"
@@ -46,7 +47,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15-dev\n"
+"X-Generator: Weblate 5.16-dev\n"
 
 msgid "Application"
 msgstr "Ứng dụng"
@@ -195,6 +196,9 @@ msgstr "Kiểm tra Đường dẫn theo dõi không hợp lệ"
 msgid "Check Angle Interpolation Type Conflicting"
 msgstr "Kiểm tra loại nội suy góc xung đột"
 
+msgid "Compatibility"
+msgstr "Chế độ Tương thích"
+
 msgid "Audio"
 msgstr "Âm thanh"
 
diff --git a/engine/editor/translations/template_generator.cpp b/engine/editor/translations/template_generator.cpp
index 03022be1..335f3d5c 100644
--- a/engine/editor/translations/template_generator.cpp
+++ b/engine/editor/translations/template_generator.cpp
@@ -74,12 +74,8 @@ TranslationTemplateGenerator::MessageMap TranslationTemplateGenerator::parse(con
 		}
 	}
 
-	EditorTranslationParser::get_singleton()->customize_strings(raw);
-
 	MessageMap result;
-	for (Vector<String> &entry : raw) {
-		entry.resize(5); // Ensure size, in case the strings were customized.
-
+	for (const Vector<String> &entry : raw) {
 		const String &msgid = entry[0];
 		const String &msgctxt = entry[1];
 		const String &plural = entry[2];
diff --git a/engine/editor/version_control/editor_vcs_interface.cpp b/engine/editor/version_control/editor_vcs_interface.cpp
index e11c226d..4c9eeb97 100644
--- a/engine/editor/version_control/editor_vcs_interface.cpp
+++ b/engine/editor/version_control/editor_vcs_interface.cpp
@@ -30,7 +30,6 @@
 
 #include "editor_vcs_interface.h"
 
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 
 EditorVCSInterface *EditorVCSInterface::singleton = nullptr;
@@ -88,24 +87,8 @@ void EditorVCSInterface::discard_file(const String &p_file_path) {
 	GDVIRTUAL_CALL(_discard_file, p_file_path);
 }
 
-void EditorVCSInterface::commit(const String &p_msg, bool p_amend) {
-	if (GDVIRTUAL_CALL(_commit, p_msg, p_amend)) {
-		return;
-	}
-
-#ifndef DISABLE_DEPRECATED
-	if (GDVIRTUAL_CALL(_commit_bind_compat_117968, p_msg)) {
-		return;
-	}
-#endif
-
-	ERR_PRINT_ONCE("Required virtual method " + get_class() + "::_commit must be overridden before calling.");
-}
-
-bool EditorVCSInterface::allow_amends() {
-	bool result = false;
-	GDVIRTUAL_CALL(_allow_amends, result);
-	return result;
+void EditorVCSInterface::commit(const String &p_msg) {
+	GDVIRTUAL_CALL(_commit, p_msg);
 }
 
 List<EditorVCSInterface::DiffFile> EditorVCSInterface::get_diff(const String &p_identifier, TreeArea p_area) {
@@ -329,8 +312,7 @@ void EditorVCSInterface::_bind_methods() {
 	GDVIRTUAL_BIND(_stage_file, "file_path");
 	GDVIRTUAL_BIND(_unstage_file, "file_path");
 	GDVIRTUAL_BIND(_discard_file, "file_path");
-	GDVIRTUAL_BIND(_commit, "msg", "amend");
-	GDVIRTUAL_BIND(_allow_amends);
+	GDVIRTUAL_BIND(_commit, "msg");
 	GDVIRTUAL_BIND(_get_diff, "identifier", "area");
 	GDVIRTUAL_BIND(_shut_down);
 	GDVIRTUAL_BIND(_get_vcs_name);
@@ -348,10 +330,6 @@ void EditorVCSInterface::_bind_methods() {
 	GDVIRTUAL_BIND(_fetch, "remote");
 	GDVIRTUAL_BIND(_get_line_diff, "file_path", "text");
 
-#ifndef DISABLE_DEPRECATED
-	GDVIRTUAL_BIND_COMPAT(_commit_bind_compat_117968, "msg");
-#endif
-
 	ClassDB::bind_method(D_METHOD("create_diff_line", "new_line_no", "old_line_no", "content", "status"), &EditorVCSInterface::create_diff_line);
 	ClassDB::bind_method(D_METHOD("create_diff_hunk", "old_start", "new_start", "old_lines", "new_lines"), &EditorVCSInterface::create_diff_hunk);
 	ClassDB::bind_method(D_METHOD("create_diff_file", "new_file", "old_file"), &EditorVCSInterface::create_diff_file);
diff --git a/engine/editor/version_control/editor_vcs_interface.h b/engine/editor/version_control/editor_vcs_interface.h
index beca2e49..a0d80d79 100644
--- a/engine/editor/version_control/editor_vcs_interface.h
+++ b/engine/editor/version_control/editor_vcs_interface.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/string/ustring.h"
 #include "core/variant/typed_array.h"
 
@@ -109,8 +109,7 @@ protected:
 	GDVIRTUAL1_REQUIRED(_stage_file, String);
 	GDVIRTUAL1_REQUIRED(_unstage_file, String);
 	GDVIRTUAL1_REQUIRED(_discard_file, String);
-	GDVIRTUAL2(_commit, String, bool);
-	GDVIRTUAL0R(bool, _allow_amends);
+	GDVIRTUAL1_REQUIRED(_commit, String);
 	GDVIRTUAL2R_REQUIRED(TypedArray<Dictionary>, _get_diff, String, int);
 	GDVIRTUAL0R_REQUIRED(bool, _shut_down);
 	GDVIRTUAL0R_REQUIRED(String, _get_vcs_name);
@@ -128,10 +127,6 @@ protected:
 	GDVIRTUAL1_REQUIRED(_fetch, String);
 	GDVIRTUAL2R_REQUIRED(TypedArray<Dictionary>, _get_line_diff, String, String);
 
-#ifndef DISABLE_DEPRECATED
-	GDVIRTUAL1_COMPAT(_commit_bind_compat_117968, _commit, String);
-#endif
-
 public:
 	static EditorVCSInterface *get_singleton();
 	static void set_singleton(EditorVCSInterface *p_singleton);
@@ -149,8 +144,7 @@ public:
 	void stage_file(const String &p_file_path);
 	void unstage_file(const String &p_file_path);
 	void discard_file(const String &p_file_path);
-	void commit(const String &p_msg, bool p_amend);
-	bool allow_amends();
+	void commit(const String &p_msg);
 	List<DiffFile> get_diff(const String &p_identifier, TreeArea p_area);
 	bool shut_down();
 	String get_vcs_name();
diff --git a/engine/editor/version_control/version_control_editor_plugin.cpp b/engine/editor/version_control/version_control_editor_plugin.cpp
index 6907a93b..900f035f 100644
--- a/engine/editor/version_control/version_control_editor_plugin.cpp
+++ b/engine/editor/version_control/version_control_editor_plugin.cpp
@@ -31,11 +31,7 @@
 #include "version_control_editor_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/os/time.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
@@ -82,20 +78,6 @@ void VersionControlEditorPlugin::_notification(int p_what) {
 }
 
 void VersionControlEditorPlugin::_update_theme() {
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("success_color"), EditorStringName(Editor));
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor));
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_editor_theme()->get_color(SceneStringName(font_color), EditorStringName(Editor));
-	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
-
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusSuccess"), EditorStringName(EditorIcons));
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusError"), EditorStringName(EditorIcons));
-	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
-
 	select_public_path_button->set_button_icon(EditorNode::get_singleton()->get_gui_base()->get_editor_theme_icon("Folder"));
 	select_private_path_button->set_button_icon(EditorNode::get_singleton()->get_gui_base()->get_editor_theme_icon("Folder"));
 	refresh_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Reload"), EditorStringName(EditorIcons)));
@@ -106,10 +88,6 @@ void VersionControlEditorPlugin::_update_theme() {
 	pull_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveDown"), EditorStringName(EditorIcons)));
 	push_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveUp"), EditorStringName(EditorIcons)));
 	extra_options->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("GuiTabMenuHl"), EditorStringName(EditorIcons)));
-
-	if (EditorVCSInterface::get_singleton()) {
-		_refresh_stage_area();
-	}
 }
 
 void VersionControlEditorPlugin::_populate_available_vcs_names() {
@@ -204,8 +182,6 @@ bool VersionControlEditorPlugin::_load_plugin(const String &p_name) {
 	_refresh_branch_list();
 	_refresh_remote_list();
 
-	toggle_amend_commit->set_visible(EditorVCSInterface::get_singleton()->allow_amends());
-
 	return true;
 }
 
@@ -282,17 +258,6 @@ void VersionControlEditorPlugin::_refresh_commit_list() {
 		item->set_text(1, commit.author.strip_edges());
 		item->set_metadata(0, meta_data);
 	}
-
-	toggle_amend_commit->set_disabled(commit_info_list.size() == 0);
-
-	if (commit_info_list.size() > 0) {
-		amend_commit_message = commit_info_list.get(0).msg;
-		if (toggle_amend_commit->is_pressed()) {
-			commit_message->set_text(amend_commit_message);
-		}
-	} else {
-		amend_commit_message = "";
-	}
 }
 
 void VersionControlEditorPlugin::_refresh_remote_list() {
@@ -323,17 +288,13 @@ void VersionControlEditorPlugin::_commit() {
 
 	ERR_FAIL_COND_MSG(msg.is_empty(), "No commit message was provided.");
 
-	EditorVCSInterface::get_singleton()->commit(msg, toggle_amend_commit->is_pressed());
+	EditorVCSInterface::get_singleton()->commit(msg);
 
-	if (version_control_dock->get_current_layout() == EditorDock::DOCK_LAYOUT_HORIZONTAL) {
-		version_control_dock->hide();
-	}
+	EditorNode::get_bottom_panel()->make_item_visible(version_control_dock, false);
 
 	commit_message->release_focus();
 	commit_button->release_focus();
-	toggle_amend_commit->set_pressed_no_signal(false);
 	commit_message->set_text("");
-	previous_commit_message = "";
 
 	_refresh_stage_area();
 	_refresh_commit_list();
@@ -341,17 +302,6 @@ void VersionControlEditorPlugin::_commit() {
 	_clear_diff();
 }
 
-void VersionControlEditorPlugin::_toggle_amend_commit(bool p_toggled) {
-	if (p_toggled) {
-		previous_commit_message = commit_message->get_text();
-		commit_message->set_text(amend_commit_message);
-	} else {
-		commit_message->set_text(previous_commit_message);
-		previous_commit_message = "";
-	}
-	_update_commit_button();
-}
-
 void VersionControlEditorPlugin::_branch_item_selected(int p_index) {
 	CHECK_PLUGIN_INITIALIZED();
 
@@ -552,7 +502,7 @@ void VersionControlEditorPlugin::_move_all(Object *p_tree) {
 void VersionControlEditorPlugin::_load_diff(Object *p_tree) {
 	CHECK_PLUGIN_INITIALIZED();
 
-	version_control_dock->make_visible();
+	EditorNode::get_bottom_panel()->make_item_visible(version_control_dock, true, true);
 
 	Tree *tree = Object::cast_to<Tree>(p_tree);
 	if (tree == staged_files) {
@@ -866,11 +816,6 @@ void VersionControlEditorPlugin::_display_diff_unified_view(List<EditorVCSInterf
 
 void VersionControlEditorPlugin::_update_commit_button() {
 	commit_button->set_disabled(commit_message->get_text().strip_edges().is_empty());
-	if (toggle_amend_commit->is_pressed()) {
-		commit_button->set_text(TTR("Amend Commit Changes"));
-	} else {
-		commit_button->set_text(TTR("Commit Changes"));
-	}
 }
 
 void VersionControlEditorPlugin::_remove_branch() {
@@ -978,7 +923,8 @@ void VersionControlEditorPlugin::fetch_available_vcs_plugin_names() {
 
 void VersionControlEditorPlugin::register_editor() {
 	EditorDockManager::get_singleton()->add_dock(version_commit_dock);
-	EditorDockManager::get_singleton()->add_dock(version_control_dock);
+
+	EditorNode::get_bottom_panel()->add_item(TTRC("Version Control"), version_control_dock, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_version_control_bottom_panel", TTRC("Toggle Version Control Bottom Panel")));
 
 	_set_vcs_ui_state(true);
 }
@@ -997,7 +943,7 @@ void VersionControlEditorPlugin::shut_down() {
 	EditorVCSInterface::set_singleton(nullptr);
 
 	EditorDockManager::get_singleton()->remove_dock(version_commit_dock);
-	EditorDockManager::get_singleton()->remove_dock(version_control_dock);
+	EditorNode::get_bottom_panel()->remove_item(version_control_dock);
 
 	_set_vcs_ui_state(false);
 }
@@ -1214,7 +1160,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	version_commit_dock->set_visible(false);
 	version_commit_dock->set_name(TTRC("Commit"));
 	version_commit_dock->set_layout_key("VersionCommit");
-	version_commit_dock->set_icon_name("VCSCommit");
+	version_commit_dock->set_icon_name("VcsBranches");
 	version_commit_dock->set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("docks/open_version_control", TTRC("Open Version Control Dock")));
 	version_commit_dock->set_default_slot(EditorDock::DOCK_SLOT_RIGHT_UL);
 
@@ -1266,20 +1212,16 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	stage_all_button->set_tooltip_text(TTR("Stage all changes"));
 	unstage_title->add_child(stage_all_button);
 
-	MarginContainer *mc = memnew(MarginContainer);
-	mc->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
-	mc->set_theme_type_variation("NoBorderHorizontal");
-	unstage_area->add_child(mc);
-
 	unstaged_files = memnew(Tree);
+	unstaged_files->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
+	unstaged_files->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
 	unstaged_files->set_select_mode(Tree::SELECT_ROW);
 	unstaged_files->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(unstaged_files));
 	unstaged_files->connect(SNAME("item_activated"), callable_mp(this, &VersionControlEditorPlugin::_item_activated).bind(unstaged_files));
 	unstaged_files->connect(SNAME("button_clicked"), callable_mp(this, &VersionControlEditorPlugin::_cell_button_pressed));
 	unstaged_files->create_item();
 	unstaged_files->set_hide_root(true);
-	unstaged_files->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
-	mc->add_child(unstaged_files);
+	unstage_area->add_child(unstaged_files);
 
 	VBoxContainer *stage_area = memnew(VBoxContainer);
 	stage_area->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@@ -1300,25 +1242,23 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	unstage_all_button->set_tooltip_text(TTR("Unstage all changes"));
 	stage_title->add_child(unstage_all_button);
 
-	mc = memnew(MarginContainer);
-	mc->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
-	mc->set_theme_type_variation("NoBorderHorizontal");
-	stage_area->add_child(mc);
-
 	staged_files = memnew(Tree);
+	staged_files->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
+	staged_files->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
 	staged_files->set_select_mode(Tree::SELECT_ROW);
 	staged_files->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(staged_files));
 	staged_files->connect(SNAME("button_clicked"), callable_mp(this, &VersionControlEditorPlugin::_cell_button_pressed));
 	staged_files->connect(SNAME("item_activated"), callable_mp(this, &VersionControlEditorPlugin::_item_activated).bind(staged_files));
 	staged_files->create_item();
 	staged_files->set_hide_root(true);
-	staged_files->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
-	mc->add_child(staged_files);
+	stage_area->add_child(staged_files);
 
 	// Editor crashes if bind is null
 	unstage_all_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_move_all).bind(staged_files));
 	stage_all_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_move_all).bind(unstaged_files));
 
+	dock_vb->add_child(memnew(HSeparator));
+
 	VBoxContainer *commit_area = memnew(VBoxContainer);
 	dock_vb->add_child(commit_area);
 
@@ -1340,21 +1280,11 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 
 	ED_SHORTCUT("version_control/commit", TTRC("Commit"), KeyModifierMask::CMD_OR_CTRL | Key::ENTER);
 
-	HBoxContainer *hbox = memnew(HBoxContainer);
-	commit_area->add_child(hbox);
-
 	commit_button = memnew(Button);
-	commit_button->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
 	commit_button->set_text(TTR("Commit Changes"));
 	commit_button->set_disabled(true);
 	commit_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_commit));
-	hbox->add_child(commit_button);
-
-	toggle_amend_commit = memnew(CheckButton);
-	toggle_amend_commit->set_text(TTR("Amend"));
-	toggle_amend_commit->set_pressed_no_signal(false);
-	toggle_amend_commit->connect(SceneStringName(toggled), callable_mp(this, &VersionControlEditorPlugin::_toggle_amend_commit));
-	hbox->add_child(toggle_amend_commit);
+	commit_area->add_child(commit_button);
 
 	dock_vb->add_child(memnew(HSeparator));
 
@@ -1377,22 +1307,21 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	commit_list_size_button->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_set_commit_list_size));
 	commit_list_hbc->add_child(commit_list_size_button);
 
-	mc = memnew(MarginContainer);
-	mc->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
-	mc->set_theme_type_variation("NoBorderHorizontal");
-	dock_vb->add_child(mc);
-
 	commit_list = memnew(Tree);
+	commit_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	commit_list->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
 	commit_list->set_custom_minimum_size(Size2(200, 160));
 	commit_list->create_item();
 	commit_list->set_hide_root(true);
 	commit_list->set_select_mode(Tree::SELECT_ROW);
-	commit_list->set_columns(2); // Commit message and author.
+	commit_list->set_columns(2); // Commit msg, author
 	commit_list->set_column_custom_minimum_width(0, 40);
 	commit_list->set_column_custom_minimum_width(1, 20);
-	commit_list->set_scroll_hint_mode(Tree::SCROLL_HINT_MODE_BOTH);
+	commit_list->set_theme_type_variation("TreeSecondary");
 	commit_list->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(commit_list));
-	mc->add_child(commit_list);
+	dock_vb->add_child(commit_list);
+
+	dock_vb->add_child(memnew(HSeparator));
 
 	HFlowContainer *menu_bar = memnew(HFlowContainer);
 	menu_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -1554,25 +1483,29 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = TTR("Typechange");
 	change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = TTR("Unmerged");
 
-	version_control_dock = memnew(EditorDock);
-	version_control_dock->set_name(TTRC("Version Control"));
-	version_control_dock->set_icon_name("VcsBranches");
-	version_control_dock->set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_version_control_bottom_panel", TTRC("Toggle Version Control Dock")));
-	version_control_dock->set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
-	version_control_dock->set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
-	version_control_dock->set_global(false);
-	version_control_dock->set_transient(true);
-	version_control_dock->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
-	version_commit_dock->connect("opened", callable_mp(EditorDockManager::get_singleton(), &EditorDockManager::open_dock).bind(version_control_dock, false));
-	version_commit_dock->connect("closed", callable_mp(EditorDockManager::get_singleton(), &EditorDockManager::close_dock).bind(version_control_dock));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("success_color"), EditorStringName(Editor));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_editor_theme()->get_color(SceneStringName(font_color), EditorStringName(Editor));
+	change_type_to_color[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor));
 
-	VBoxContainer *vbc = memnew(VBoxContainer);
-	version_control_dock->add_child(vbc);
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusSuccess"), EditorStringName(EditorIcons));
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusError"), EditorStringName(EditorIcons));
+	change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("StatusWarning"), EditorStringName(EditorIcons));
+
+	version_control_dock = memnew(VBoxContainer);
+	version_control_dock->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	version_control_dock->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
+	version_control_dock->hide();
 
 	HBoxContainer *diff_heading = memnew(HBoxContainer);
 	diff_heading->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	diff_heading->set_tooltip_text(TTR("View file diffs before committing them to the latest version"));
-	vbc->add_child(diff_heading);
+	version_control_dock->add_child(diff_heading);
 
 	diff_title = memnew(Label);
 	diff_title->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
@@ -1596,7 +1529,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	diff->set_use_bbcode(true);
 	diff->set_selection_enabled(true);
 	diff->set_context_menu_enabled(true);
-	vbc->add_child(diff);
+	version_control_dock->add_child(diff);
 
 	_update_set_up_warning("");
 	EditorNode::get_singleton()->get_gui_base()->connect(SceneStringName(theme_changed), callable_mp(this, &VersionControlEditorPlugin::_update_theme));
diff --git a/engine/editor/version_control/version_control_editor_plugin.h b/engine/editor/version_control/version_control_editor_plugin.h
index 20daf02e..1b4f5470 100644
--- a/engine/editor/version_control/version_control_editor_plugin.h
+++ b/engine/editor/version_control/version_control_editor_plugin.h
@@ -130,12 +130,8 @@ private:
 	Button *refresh_button = nullptr;
 	TextEdit *commit_message = nullptr;
 	Button *commit_button = nullptr;
-	CheckButton *toggle_amend_commit = nullptr;
 
-	String amend_commit_message;
-	String previous_commit_message;
-
-	EditorDock *version_control_dock = nullptr;
+	VBoxContainer *version_control_dock = nullptr;
 	Label *diff_title = nullptr;
 	RichTextLabel *diff = nullptr;
 	OptionButton *diff_view_type_select = nullptr;
@@ -162,7 +158,6 @@ private:
 	void _force_push();
 	void _fetch();
 	void _commit();
-	void _toggle_amend_commit(bool p_toggled);
 	void _confirm_discard_all();
 	void _discard_all();
 	void _refresh_stage_area();
diff --git a/engine/gles3_builders.py b/engine/gles3_builders.py
index a2c4d226..24f7320a 100644
--- a/engine/gles3_builders.py
+++ b/engine/gles3_builders.py
@@ -9,11 +9,6 @@ class GLES3HeaderStruct:
     def __init__(self):
         self.vertex_lines = []
         self.fragment_lines = []
-        self.raygen_lines = []
-        self.any_hit_lines = []
-        self.closest_hit_lines = []
-        self.miss_lines = []
-        self.intersection_lines = []
         self.uniforms = []
         self.fbos = []
         self.texunits = []
@@ -29,11 +24,6 @@ class GLES3HeaderStruct:
         self.line_offset = 0
         self.vertex_offset = 0
         self.fragment_offset = 0
-        self.raygen_offset = 0
-        self.any_hit_offset = 0
-        self.closest_hit_offset = 0
-        self.miss_offset = 0
-        self.intersection_offset = 0
         self.variant_defines = []
         self.variant_names = []
         self.specialization_names = []
@@ -97,41 +87,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct,
                 header_data.fragment_offset = header_data.line_offset
                 continue
 
-            if line.find("#[raygen]") != -1:
-                header_data.reading = "raygen"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.raygen_offset = header_data.line_offset
-                continue
-
-            if line.find("#[any_hit]") != -1:
-                header_data.reading = "any_hit"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.any_hit_offset = header_data.line_offset
-                continue
-
-            if line.find("#[closest_hit]") != -1:
-                header_data.reading = "closest_hit"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.closest_hit_offset = header_data.line_offset
-                continue
-
-            if line.find("#[miss]") != -1:
-                header_data.reading = "miss"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.miss_offset = header_data.line_offset
-                continue
-
-            if line.find("#[intersection]") != -1:
-                header_data.reading = "intersection"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.intersection_offset = header_data.line_offset
-                continue
-
             while line.find("#include ") != -1:
                 includeline = line.replace("#include ", "").strip()[1:-1]
 
@@ -226,16 +181,6 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct,
                 header_data.vertex_lines += [line]
             if header_data.reading == "fragment":
                 header_data.fragment_lines += [line]
-            if header_data.reading == "raygen":
-                header_data.raygen_lines += [line]
-            if header_data.reading == "any_hit":
-                header_data.any_hit_lines += [line]
-            if header_data.reading == "closest_hit":
-                header_data.closest_hit_lines += [line]
-            if header_data.reading == "miss":
-                header_data.miss_lines += [line]
-            if header_data.reading == "intersection":
-                header_data.intersection_lines += [line]
 
             line = fs.readline()
             header_data.line_offset += 1
diff --git a/engine/glsl_builders.py b/engine/glsl_builders.py
index ce4545f6..dbe9d5ad 100644
--- a/engine/glsl_builders.py
+++ b/engine/glsl_builders.py
@@ -10,31 +10,16 @@ class RDHeaderStruct:
         self.vertex_lines = []
         self.fragment_lines = []
         self.compute_lines = []
-        self.raygen_lines = []
-        self.any_hit_lines = []
-        self.closest_hit_lines = []
-        self.miss_lines = []
-        self.intersection_lines = []
 
         self.vertex_included_files = []
         self.fragment_included_files = []
         self.compute_included_files = []
-        self.raygen_included_files = []
-        self.any_hit_included_files = []
-        self.closest_hit_included_files = []
-        self.miss_included_files = []
-        self.intersection_included_files = []
 
         self.reading = ""
         self.line_offset = 0
         self.vertex_offset = 0
         self.fragment_offset = 0
         self.compute_offset = 0
-        self.raygen_offset = 0
-        self.any_hit_offset = 0
-        self.closest_hit_offset = 0
-        self.miss_offset = 0
-        self.intersection_offset = 0
 
 
 def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth: int) -> RDHeaderStruct:
@@ -67,41 +52,6 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth:
                 header_data.compute_offset = header_data.line_offset
                 continue
 
-            if line.find("#[raygen]") != -1:
-                header_data.reading = "raygen"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.raygen_offset = header_data.line_offset
-                continue
-
-            if line.find("#[any_hit]") != -1:
-                header_data.reading = "any_hit"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.any_hit_offset = header_data.line_offset
-                continue
-
-            if line.find("#[closest_hit]") != -1:
-                header_data.reading = "closest_hit"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.closest_hit_offset = header_data.line_offset
-                continue
-
-            if line.find("#[miss]") != -1:
-                header_data.reading = "miss"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.miss_offset = header_data.line_offset
-                continue
-
-            if line.find("#[intersection]") != -1:
-                header_data.reading = "intersection"
-                line = fs.readline()
-                header_data.line_offset += 1
-                header_data.intersection_offset = header_data.line_offset
-                continue
-
             while line.find("#include ") != -1:
                 includeline = line.replace("#include ", "").strip()[1:-1]
 
@@ -123,31 +73,6 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth:
                     header_data.compute_included_files += [included_file]
                     if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
                         print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
-                elif included_file not in header_data.raygen_included_files and header_data.reading == "raygen":
-                    header_data.raygen_included_files += [included_file]
-                    if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
-                        print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
-                elif included_file not in header_data.any_hit_included_files and header_data.reading == "any_hit":
-                    header_data.any_hit_included_files += [included_file]
-                    if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
-                        print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
-                elif (
-                    included_file not in header_data.closest_hit_included_files and header_data.reading == "closest_hit"
-                ):
-                    header_data.closest_hit_included_files += [included_file]
-                    if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
-                        print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
-                elif included_file not in header_data.miss_included_files and header_data.reading == "miss":
-                    header_data.miss_included_files += [included_file]
-                    if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
-                        print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
-                elif (
-                    included_file not in header_data.intersection_included_files
-                    and header_data.reading == "intersection"
-                ):
-                    header_data.intersection_included_files += [included_file]
-                    if include_file_in_rd_header(included_file, header_data, depth + 1) is None:
-                        print_error(f'In file "{filename}": #include "{includeline}" could not be found!"')
 
                 line = fs.readline()
 
@@ -159,16 +84,6 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth:
                 header_data.fragment_lines += [line]
             if header_data.reading == "compute":
                 header_data.compute_lines += [line]
-            if header_data.reading == "raygen":
-                header_data.raygen_lines += [line]
-            if header_data.reading == "any_hit":
-                header_data.any_hit_lines += [line]
-            if header_data.reading == "closest_hit":
-                header_data.closest_hit_lines += [line]
-            if header_data.reading == "miss":
-                header_data.miss_lines += [line]
-            if header_data.reading == "intersection":
-                header_data.intersection_lines += [line]
 
             line = fs.readline()
             header_data.line_offset += 1
@@ -176,19 +91,6 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth:
     return header_data
 
 
-def build_rd_header_lines_for_raytracing_stage(lines, stage: str):
-    if lines:
-        return f"""\
-		static const char _{stage}_code[] = {{
-{to_raw_cstring(lines)}
-		}};
-"""
-    else:
-        return f"""\
-		static const char *_{stage}_code = nullptr;
-"""
-
-
 def build_rd_header(filename: str, shader: str) -> None:
     include_file_in_rd_header(shader, header_data := RDHeaderStruct(), 0)
     class_name = os.path.basename(shader).replace(".glsl", "").title().replace("_", "").replace(".", "") + "ShaderRD"
@@ -202,29 +104,13 @@ public:
 	{class_name}() {{
 """)
 
-        if (
-            header_data.raygen_lines
-            or header_data.any_hit_lines
-            or header_data.closest_hit_lines
-            or header_data.miss_lines
-            or header_data.intersection_lines
-        ):
-            file.write(build_rd_header_lines_for_raytracing_stage(header_data.raygen_lines, "raygen"))
-            file.write(build_rd_header_lines_for_raytracing_stage(header_data.any_hit_lines, "any_hit"))
-            file.write(build_rd_header_lines_for_raytracing_stage(header_data.closest_hit_lines, "closest_hit"))
-            file.write(build_rd_header_lines_for_raytracing_stage(header_data.miss_lines, "miss"))
-            file.write(build_rd_header_lines_for_raytracing_stage(header_data.intersection_lines, "intersection"))
-            file.write(f"""\
-		setup_raytracing(_raygen_code, _any_hit_code, _closest_hit_code, _miss_code, _intersection_code, "{class_name}");
-""")
-        elif header_data.compute_lines:
+        if header_data.compute_lines:
             file.write(f"""\
 		static const char *_vertex_code = nullptr;
 		static const char *_fragment_code = nullptr;
 		static const char _compute_code[] = {{
 {to_raw_cstring(header_data.compute_lines)}
 		}};
-		setup(_vertex_code, _fragment_code, _compute_code, "{class_name}");
 """)
         else:
             file.write(f"""\
@@ -235,12 +121,12 @@ public:
 {to_raw_cstring(header_data.fragment_lines)}
 		}};
 		static const char *_compute_code = nullptr;
-		setup(_vertex_code, _fragment_code, _compute_code, "{class_name}");
 """)
 
-        file.write("""\
-	}
-};
+        file.write(f"""\
+		setup(_vertex_code, _fragment_code, _compute_code, "{class_name}");
+	}}
+}};
 """)
 
 
diff --git a/engine/main/main.cpp b/engine/main/main.cpp
index 68035f50..1c8d5a4c 100644
--- a/engine/main/main.cpp
+++ b/engine/main/main.cpp
@@ -30,7 +30,6 @@
 
 #include "main.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_globals.h"
 #include "core/crypto/crypto.h"
@@ -46,24 +45,23 @@
 #include "core/io/file_access_zip.h"
 #include "core/io/image.h"
 #include "core/io/image_loader.h"
+#include "core/io/ip.h"
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
-#include "core/os/process_id.h"
 #include "core/os/time.h"
 #include "core/profiling/profiling.h"
 #include "core/register_core_types.h"
 #include "core/string/translation_server.h"
-#include "core/variant/variant_parser.h"
 #include "core/version.h"
 #include "drivers/register_driver_types.h"
 #include "main/app_icon.gen.h"
 #include "main/main_timer_sync.h"
 #include "main/performance.h"
 #include "main/splash.gen.h"
+#include "modules/register_module_types.h"
+#include "platform/register_platform_apis.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/property_list_helper.h"
@@ -73,22 +71,17 @@
 #include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio/audio_server.h"
 #include "servers/camera/camera_server.h"
-#include "servers/display/accessibility_server.h"
 #include "servers/display/display_server.h"
 #include "servers/movie_writer/movie_writer.h"
 #include "servers/register_server_types.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/text/text_server.h"
 #include "servers/text/text_server_dummy.h"
 
-#include "modules/register_module_types.h"
-#include "platform/register_platform_apis.h"
-
 // 2D
 #ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_2d/navigation_server_2d.h"
+#include "servers/navigation_2d/navigation_server_2d_dummy.h"
 #endif // NAVIGATION_2D_DISABLED
 
 #ifndef PHYSICS_2D_DISABLED
@@ -99,6 +92,7 @@
 // 3D
 #ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_3d/navigation_server_3d.h"
+#include "servers/navigation_3d/navigation_server_3d_dummy.h"
 #endif // NAVIGATION_3D_DISABLED
 
 #ifndef PHYSICS_3D_DISABLED
@@ -111,7 +105,6 @@
 #endif // XR_DISABLED
 
 #ifdef TESTS_ENABLED
-#include "servers/rendering/dummy/rasterizer_dummy.h"
 #include "tests/test_main.h"
 #endif
 
@@ -180,7 +173,6 @@ static SteamTracker *steam_tracker = nullptr;
 // Initialized in setup2()
 static AudioServer *audio_server = nullptr;
 static CameraServer *camera_server = nullptr;
-static AccessibilityServer *accessibility_server = nullptr;
 static DisplayServer *display_server = nullptr;
 static RenderingServer *rendering_server = nullptr;
 static TextServerManager *tsman = nullptr;
@@ -204,13 +196,14 @@ static bool _start_success = false;
 String display_driver = "";
 String tablet_driver = "";
 String text_driver = "";
+String rendering_driver = "";
+String rendering_method = "";
 static int text_driver_idx = -1;
 static int audio_driver_idx = -1;
 
 // Engine config/tools
 
-static AccessibilityServerEnums::AccessibilityMode accessibility_mode = AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_AUTO;
-static String accessibility_driver_name;
+static DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
 static bool accessibility_mode_set = false;
 static bool single_window = false;
 static bool editor = false;
@@ -220,7 +213,7 @@ static String locale;
 static String log_file;
 static bool show_help = false;
 static uint64_t quit_after = 0;
-static ProcessID editor_pid = 0;
+static OS::ProcessID editor_pid = 0;
 #ifdef TOOLS_ENABLED
 static bool found_project = false;
 static bool recovery_mode = false;
@@ -239,13 +232,13 @@ static bool single_threaded_scene = false;
 
 // Display
 
-static DisplayServerEnums::WindowMode window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
-static DisplayServerEnums::ScreenOrientation window_orientation = DisplayServerEnums::SCREEN_LANDSCAPE;
-static DisplayServerEnums::VSyncMode window_vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
+static DisplayServer::WindowMode window_mode = DisplayServer::WINDOW_MODE_WINDOWED;
+static DisplayServer::ScreenOrientation window_orientation = DisplayServer::SCREEN_LANDSCAPE;
+static DisplayServer::VSyncMode window_vsync_mode = DisplayServer::VSYNC_ENABLED;
 static uint32_t window_flags = 0;
 static Size2i window_size = Size2i(1152, 648);
 
-static int init_screen = DisplayServerEnums::SCREEN_PRIMARY;
+static int init_screen = DisplayServer::SCREEN_PRIMARY;
 static bool init_fullscreen = false;
 static bool init_maximized = false;
 static bool init_windowed = false;
@@ -415,7 +408,6 @@ void finalize_display() {
 	memdelete(rendering_server);
 
 	memdelete(display_server);
-	memdelete(accessibility_server);
 }
 
 void initialize_theme_db() {
@@ -642,7 +634,6 @@ void Main::print_help(const char *p_binary) {
 #endif
 	print_help_option("--wid <window_id>", "Request parented to window.\n");
 	print_help_option("--accessibility <mode>", "Select accessibility mode ['auto' (when screen reader is running, default), 'always', 'disabled'].\n");
-	print_help_option("--accessibility-driver <driver>", "Select accessibility driver ['accesskit', 'dummy'].\n");
 
 	print_help_title("Debug options");
 	print_help_option("-d, --debug", "Debug (local stdout debugger).\n");
@@ -732,12 +723,7 @@ void Main::print_help(const char *p_binary) {
 	OS::get_singleton()->print("\n");
 }
 
-#ifndef TESTS_ENABLED
-Error Main::test_setup() {
-	ERR_FAIL_V(ERR_UNAVAILABLE);
-}
-void Main::test_cleanup() {}
-#else
+#ifdef TESTS_ENABLED
 // The order is the same as in `Main::setup()`, only core and some editor types
 // are initialized here. This also combines `Main::setup2()` initialization.
 Error Main::test_setup() {
@@ -746,8 +732,6 @@ Error Main::test_setup() {
 
 	OS::get_singleton()->initialize();
 
-	CoreGlobals::print_ready = true;
-
 	engine = memnew(Engine);
 
 	register_core_types();
@@ -804,13 +788,6 @@ Error Main::test_setup() {
 	translation_server->load_project_translations(translation_server->get_main_domain());
 	ResourceLoader::load_translation_remaps(); //load remaps for resources
 
-	message_queue = memnew(MessageQueue);
-
-	RasterizerDummy::make_current();
-	rendering_server = memnew(RenderingServerDefault());
-	rendering_server->init();
-	rendering_server->set_render_loop_enabled(false);
-
 	// Initialize ThemeDB early so that scene types can register their theme items.
 	// Default theme will be initialized later, after modules and ScriptServer are ready.
 	initialize_theme_db();
@@ -881,9 +858,6 @@ Error Main::test_setup() {
 void Main::test_cleanup() {
 	ERR_FAIL_COND(!_start_success);
 
-	// Printing in the usual way can become problematic during/after cleanup.
-	CoreGlobals::print_ready = false;
-
 	for (int i = 0; i < TextServerManager::get_singleton()->get_interface_count(); i++) {
 		TextServerManager::get_singleton()->get_interface(i)->cleanup();
 	}
@@ -907,17 +881,6 @@ void Main::test_cleanup() {
 
 	finalize_theme_db();
 
-	if (rendering_server) {
-		rendering_server->sync();
-		rendering_server->global_shader_parameters_clear();
-		rendering_server->finish();
-		memdelete(rendering_server);
-	}
-	if (message_queue) {
-		message_queue->flush();
-		memdelete(message_queue);
-	}
-
 #ifndef NAVIGATION_2D_DISABLED
 	NavigationServer2DManager::finalize_server();
 	NavigationServer2DManager::finalize_server_manager();
@@ -969,7 +932,7 @@ void Main::test_cleanup() {
 
 	OS::get_singleton()->finalize_core();
 }
-#endif // TESTS_ENABLED
+#endif
 
 int Main::test_entrypoint(int argc, char *argv[], bool &tests_need_run) {
 	for (int x = 0; x < argc; x++) {
@@ -1031,8 +994,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 
 	OS::get_singleton()->initialize();
 
-	CoreGlobals::print_ready = true;
-
 #if !defined(OVERRIDE_PATH_ENABLED) && !defined(TOOLS_ENABLED)
 	String old_cwd = OS::get_singleton()->get_cwd();
 #if defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
@@ -1122,10 +1083,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	bool delta_smoothing_override = false;
 	bool load_shell_env = false;
 
-	String rendering_driver = "";
-	String rendering_method = "";
-	OS::RenderingSource rendering_driver_source = OS::RenderingSource::RENDERING_SOURCE_DEFAULT;
-	OS::RenderingSource rendering_method_source = OS::RenderingSource::RENDERING_SOURCE_DEFAULT;
 	String default_renderer = "";
 	String default_renderer_mobile = "";
 	String renderer_hints = "";
@@ -1323,7 +1280,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		} else if (arg == "--rendering-driver") {
 			if (N) {
 				rendering_driver = N->get();
-				rendering_driver_source = OS::RenderingSource::RENDERING_SOURCE_COMMANDLINE;
 				N = N->next();
 			} else {
 				OS::get_singleton()->print("Missing rendering driver argument, aborting.\n");
@@ -1331,10 +1287,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			}
 		} else if (arg == "-f" || arg == "--fullscreen") { // force fullscreen
 			init_fullscreen = true;
-			window_mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+			window_mode = DisplayServer::WINDOW_MODE_FULLSCREEN;
 		} else if (arg == "-m" || arg == "--maximized") { // force maximized window
 			init_maximized = true;
-			window_mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+			window_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 		} else if (arg == "-w" || arg == "--windowed") { // force windowed window
 
 			init_windowed = true;
@@ -1398,13 +1354,13 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			if (N) {
 				String string = N->get();
 				if (string == "auto") {
-					accessibility_mode = AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_AUTO;
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
 					accessibility_mode_set = true;
 				} else if (string == "always") {
-					accessibility_mode = AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_ALWAYS;
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_ALWAYS;
 					accessibility_mode_set = true;
 				} else if (string == "disabled") {
-					accessibility_mode = AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_DISABLED;
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED;
 					accessibility_mode_set = true;
 				} else {
 					OS::get_singleton()->print("Accessibility mode argument not recognized, aborting.\n");
@@ -1415,15 +1371,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 				OS::get_singleton()->print("Missing accessibility mode argument, aborting.\n");
 				goto error;
 			}
-		} else if (arg == "--accessibility-driver") {
-			if (N) {
-				String string = N->get();
-				accessibility_driver_name = string;
-				N = N->next();
-			} else {
-				OS::get_singleton()->print("Missing accessibility driver argument, aborting.\n");
-				goto error;
-			}
 		} else if (arg == "-t" || arg == "--always-on-top") { // force always-on-top window
 
 			init_always_on_top = true;
@@ -2203,7 +2150,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		main_args.push_back("--editor");
 		if (!init_windowed && !init_fullscreen) {
 			init_maximized = true;
-			window_mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+			window_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 		}
 	}
 
@@ -2389,11 +2336,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 
 		Array force_angle_list;
 
-#define FORCE_ANGLE(m_vendor, m_name) \
-	{ \
-		Dictionary device; \
-		device["vendor"] = m_vendor; \
-		device["name"] = m_name; \
+#define FORCE_ANGLE(m_vendor, m_name)       \
+	{                                       \
+		Dictionary device;                  \
+		device["vendor"] = m_vendor;        \
+		device["name"] = m_name;            \
 		force_angle_list.push_back(device); \
 	}
 
@@ -2625,7 +2572,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	// Default to ProjectSettings default if nothing set on the command line.
 	if (rendering_method.is_empty()) {
 		rendering_method = GLOBAL_GET("rendering/renderer/rendering_method");
-		rendering_method_source = OS::RenderingSource::RENDERING_SOURCE_PROJECT_SETTING;
 	}
 
 	if (rendering_driver.is_empty()) {
@@ -2633,18 +2579,16 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			rendering_driver = "dummy";
 		} else if (rendering_method == "gl_compatibility") {
 			rendering_driver = GLOBAL_GET("rendering/gl_compatibility/driver");
-			rendering_driver_source = OS::RenderingSource::RENDERING_SOURCE_PROJECT_SETTING;
 		} else {
 			rendering_driver = GLOBAL_GET("rendering/rendering_device/driver");
-			rendering_driver_source = OS::RenderingSource::RENDERING_SOURCE_PROJECT_SETTING;
 		}
 	}
 
 	// always convert to lower case for consistency in the code
 	rendering_driver = rendering_driver.to_lower();
 
-	OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, rendering_driver_source);
-	OS::get_singleton()->set_current_rendering_method(rendering_method, rendering_method_source);
+	OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
+	OS::get_singleton()->set_current_rendering_method(rendering_method);
 
 #ifdef TOOLS_ENABLED
 	if (!force_res && project_manager) {
@@ -2674,33 +2618,33 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		}
 
 		if (!bool(GLOBAL_GET("display/window/size/resizable"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_RESIZE_DISABLED_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/minimize_disabled"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_MINIMIZE_DISABLED_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/maximize_disabled"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_MAXIMIZE_DISABLED_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/borderless"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_BORDERLESS_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/always_on_top"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/transparent"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_TRANSPARENT_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_TRANSPARENT_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/extend_to_title"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/no_focus"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_NO_FOCUS_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_NO_FOCUS_BIT;
 		}
 		if (bool(GLOBAL_GET("display/window/size/sharp_corners"))) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_SHARP_CORNERS_BIT;
 		}
-		window_mode = (DisplayServerEnums::WindowMode)(GLOBAL_GET("display/window/size/mode").operator int());
+		window_mode = (DisplayServer::WindowMode)(GLOBAL_GET("display/window/size/mode").operator int());
 		int initial_position_type = GLOBAL_GET("display/window/size/initial_position_type").operator int();
 		if (initial_position_type == Window::WINDOW_INITIAL_POSITION_ABSOLUTE) { // Absolute.
 			if (!init_use_custom_pos) {
@@ -2709,7 +2653,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			}
 		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_PRIMARY_SCREEN || initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_MAIN_WINDOW_SCREEN) { // Center of Primary Screen.
 			if (!init_use_custom_screen) {
-				init_screen = DisplayServerEnums::SCREEN_PRIMARY;
+				init_screen = DisplayServer::SCREEN_PRIMARY;
 				init_use_custom_screen = true;
 			}
 		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_OTHER_SCREEN) { // Center of Other Screen.
@@ -2719,12 +2663,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			}
 		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_MOUSE_FOCUS) { // Center of Screen With Mouse Pointer.
 			if (!init_use_custom_screen) {
-				init_screen = DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS;
+				init_screen = DisplayServer::SCREEN_WITH_MOUSE_FOCUS;
 				init_use_custom_screen = true;
 			}
 		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_KEYBOARD_FOCUS) { // Center of Screen With Keyboard Focus.
 			if (!init_use_custom_screen) {
-				init_screen = DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS;
+				init_screen = DisplayServer::SCREEN_WITH_KEYBOARD_FOCUS;
 				init_use_custom_screen = true;
 			}
 		}
@@ -2807,12 +2751,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	}
 
 	{
-		window_orientation = DisplayServerEnums::ScreenOrientation(int(GLOBAL_DEF_BASIC("display/window/handheld/orientation", DisplayServerEnums::ScreenOrientation::SCREEN_LANDSCAPE)));
+		window_orientation = DisplayServer::ScreenOrientation(int(GLOBAL_DEF_BASIC("display/window/handheld/orientation", DisplayServer::ScreenOrientation::SCREEN_LANDSCAPE)));
 	}
 	{
-		window_vsync_mode = DisplayServerEnums::VSyncMode(int(GLOBAL_DEF_BASIC("display/window/vsync/vsync_mode", DisplayServerEnums::VSyncMode::VSYNC_ENABLED)));
+		window_vsync_mode = DisplayServer::VSyncMode(int(GLOBAL_DEF_BASIC("display/window/vsync/vsync_mode", DisplayServer::VSyncMode::VSYNC_ENABLED)));
 		if (disable_vsync) {
-			window_vsync_mode = DisplayServerEnums::VSyncMode::VSYNC_DISABLED;
+			window_vsync_mode = DisplayServer::VSyncMode::VSYNC_DISABLED;
 		}
 	}
 
@@ -2853,8 +2797,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/environment_blend_mode", PROPERTY_HINT_ENUM, "Opaque,Additive,Alpha"), "0");
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/foveation_level", PROPERTY_HINT_ENUM, "Off,Low,Medium,High"), "0");
 	GLOBAL_DEF_BASIC("xr/openxr/foveation_dynamic", false);
-	GLOBAL_DEF_BASIC("xr/openxr/foveation_eye_tracked", true);
-	GLOBAL_DEF_BASIC("xr/openxr/foveation_with_subsampled_images", true);
 
 	GLOBAL_DEF_BASIC("xr/openxr/submit_depth_buffer", false);
 	GLOBAL_DEF_BASIC("xr/openxr/startup_alert", true);
@@ -2879,7 +2821,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "xr/openxr/extensions/spatial_entity/april_tag_dict", PROPERTY_HINT_ENUM, "4x4H5,5x5H9,6x6H10,6x6H11"), "3");
 	GLOBAL_DEF_RST_BASIC("xr/openxr/extensions/eye_gaze_interaction", false);
 	GLOBAL_DEF_BASIC("xr/openxr/extensions/render_model", false);
-	GLOBAL_DEF_BASIC("xr/openxr/extensions/user_presence", false);
 
 	// OpenXR Binding modifier settings
 	GLOBAL_DEF_BASIC("xr/openxr/binding_modifiers/analog_threshold", false);
@@ -3057,9 +2998,9 @@ Error Main::setup2(bool p_show_boot_logo) {
 					bool ac_found = false;
 
 					if (editor) {
-						screen_property = "interface/editor/appearance/editor_screen";
+						screen_property = "interface/editor/editor_screen";
 					} else if (project_manager) {
-						screen_property = "interface/editor/appearance/project_manager_screen";
+						screen_property = "interface/editor/project_manager_screen";
 					} else {
 						// Skip.
 						screen_found = true;
@@ -3092,13 +3033,13 @@ Error Main::setup2(bool p_show_boot_logo) {
 							if (!ac_found && assign == "interface/accessibility/accessibility_support") {
 								accessibility_mode_editor = value;
 								ac_found = true;
-							} else if (!init_expand_to_title_found && assign == "interface/editor/appearance/expand_to_title") {
+							} else if (!init_expand_to_title_found && assign == "interface/editor/expand_to_title") {
 								init_expand_to_title = value;
 								init_expand_to_title_found = true;
-							} else if (!init_display_scale_found && assign == "interface/editor/appearance/display_scale") {
+							} else if (!init_display_scale_found && assign == "interface/editor/display_scale") {
 								init_display_scale = value;
 								init_display_scale_found = true;
-							} else if (!init_custom_scale_found && assign == "interface/editor/appearance/custom_display_scale") {
+							} else if (!init_custom_scale_found && assign == "interface/editor/custom_display_scale") {
 								init_custom_scale = value;
 								init_custom_scale_found = true;
 							} else if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") {
@@ -3109,7 +3050,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 									prefer_wayland = value;
 								}
 								prefer_wayland_found = true;
-							} else if (!tablet_found && assign == "interface/editor/input/tablet_driver") {
+							} else if (!tablet_found && assign == "interface/editor/tablet_driver") {
 								tablet_driver_editor = value;
 								tablet_found = true;
 							}
@@ -3146,13 +3087,13 @@ Error Main::setup2(bool p_show_boot_logo) {
 				String mode = config->get_value("EditorWindow", "mode", "maximized");
 				window_size = config->get_value("EditorWindow", "size", window_size);
 				if (mode == "windowed") {
-					window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+					window_mode = DisplayServer::WINDOW_MODE_WINDOWED;
 					init_windowed = true;
 				} else if (mode == "fullscreen") {
-					window_mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+					window_mode = DisplayServer::WINDOW_MODE_FULLSCREEN;
 					init_fullscreen = true;
 				} else {
-					window_mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+					window_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 					init_maximized = true;
 				}
 
@@ -3164,7 +3105,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 		}
 
 		if (init_screen == EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO) {
-			init_screen = DisplayServerEnums::SCREEN_PRIMARY;
+			init_screen = DisplayServer::SCREEN_PRIMARY;
 		}
 
 		OS::get_singleton()->benchmark_end_measure("Startup", "Initialize Early Settings");
@@ -3253,93 +3194,46 @@ Error Main::setup2(bool p_show_boot_logo) {
 		Color boot_bg_color = GLOBAL_DEF_BASIC("application/boot_splash/bg_color", boot_splash_bg_color);
 		DisplayServer::set_early_window_clear_color_override(true, boot_bg_color);
 
-		DisplayServerEnums::Context context;
+		DisplayServer::Context context;
 		if (editor) {
-			context = DisplayServerEnums::CONTEXT_EDITOR;
+			context = DisplayServer::CONTEXT_EDITOR;
 		} else if (project_manager) {
-			context = DisplayServerEnums::CONTEXT_PROJECTMAN;
+			context = DisplayServer::CONTEXT_PROJECTMAN;
 		} else {
-			context = DisplayServerEnums::CONTEXT_ENGINE;
+			context = DisplayServer::CONTEXT_ENGINE;
 		}
 
 		if (init_embed_parent_window_id) {
 			// Reset flags and other settings to be sure it's borderless and windowed. The position and size should have been initialized correctly
 			// from --position and --resolution parameters.
-			window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
-			window_flags = DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT;
+			window_mode = DisplayServer::WINDOW_MODE_WINDOWED;
+			window_flags = DisplayServer::WINDOW_FLAG_BORDERLESS_BIT;
 			if (bool(GLOBAL_GET("display/window/size/transparent"))) {
-				window_flags |= DisplayServerEnums::WINDOW_FLAG_TRANSPARENT_BIT;
+				window_flags |= DisplayServer::WINDOW_FLAG_TRANSPARENT_BIT;
 			}
 		}
 
 #ifdef TOOLS_ENABLED
 		if ((project_manager || editor) && init_expand_to_title) {
-			window_flags |= DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE_BIT;
+			window_flags |= DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE_BIT;
 		}
 #endif
 
 		if (!accessibility_mode_set) {
 #ifdef TOOLS_ENABLED
 			if (editor || project_manager || cmdline_tool) {
-				accessibility_mode = (AccessibilityServerEnums::AccessibilityMode)accessibility_mode_editor;
+				accessibility_mode = (DisplayServer::AccessibilityMode)accessibility_mode_editor;
 			} else {
 #else
 			{
 #endif
-				accessibility_mode = (AccessibilityServerEnums::AccessibilityMode)GLOBAL_GET("accessibility/general/accessibility_support").operator int64_t();
-			}
-		}
-		if (accessibility_driver_name.is_empty()) {
-			if (!editor && !project_manager) {
-				accessibility_driver_name = GLOBAL_GET("accessibility/general/accessibility_driver");
-			} else {
-				accessibility_driver_name = "accesskit";
-			}
-		}
-		if (display_driver == NULL_DISPLAY_DRIVER || display_driver == EMBEDDED_DISPLAY_DRIVER || accessibility_mode == AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_DISABLED) {
-			accessibility_driver_name = "dummy";
-		}
-		int accessibility_driver_idx = -1;
-
-		if (accessibility_driver_name.is_empty() || accessibility_driver_name == "default") {
-			accessibility_driver_idx = 0;
-		} else {
-			for (int i = 0; i < AccessibilityServer::get_create_function_count(); i++) {
-				String name = AccessibilityServer::get_create_function_name(i);
-				if (accessibility_driver_name == name) {
-					accessibility_driver_idx = i;
-					break;
-				}
-			}
-
-			if (accessibility_driver_idx < 0) {
-				// If the requested driver wasn't found, pick the first entry.
-				// If all else failed it would be the headless server.
-				accessibility_driver_idx = 0;
+				accessibility_mode = (DisplayServer::AccessibilityMode)GLOBAL_GET("accessibility/general/accessibility_support").operator int64_t();
 			}
 		}
+		DisplayServer::accessibility_set_mode(accessibility_mode);
 
+		// rendering_driver now held in static global String in main and initialized in setup()
 		Error err;
-		accessibility_server = AccessibilityServer::create(accessibility_driver_idx, err);
-		if (err != OK || accessibility_server == nullptr) {
-			String last_name = AccessibilityServer::get_create_function_name(accessibility_driver_idx);
-
-			for (int i = 0; i < AccessibilityServer::get_create_function_count(); i++) {
-				if (i == accessibility_driver_idx) {
-					continue; // Don't try the same twice.
-				}
-				String name = AccessibilityServer::get_create_function_name(i);
-				WARN_VERBOSE(vformat("Accessibility driver %s failed, falling back to %s.", last_name, name));
-
-				accessibility_server = AccessibilityServer::create(i, err);
-				if (err == OK && accessibility_server != nullptr) {
-					break;
-				}
-			}
-		}
-		accessibility_server->set_mode(accessibility_mode);
-
-		String rendering_driver = OS::get_singleton()->get_current_rendering_driver_name();
 		display_server = DisplayServer::create(display_driver_idx, rendering_driver, window_mode, window_vsync_mode, window_flags, window_position, window_size, init_screen, context, init_embed_parent_window_id, err);
 		if (err != OK || display_server == nullptr) {
 			String last_name = DisplayServer::get_create_function_name(display_driver_idx);
@@ -3421,20 +3315,20 @@ Error Main::setup2(bool p_show_boot_logo) {
 					break;
 			}
 			if (!(force_res || use_custom_res)) {
-				display_server->window_set_size(Size2(window_size) * ui_scale, DisplayServerEnums::MAIN_WINDOW_ID);
+				display_server->window_set_size(Size2(window_size) * ui_scale, DisplayServer::MAIN_WINDOW_ID);
 			}
-			if (display_server->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS) && !display_server->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS)) {
+			if (display_server->has_feature(DisplayServer::FEATURE_SUBWINDOWS) && !display_server->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
 				Size2 real_size = DisplayServer::get_singleton()->window_get_size();
 				Rect2i scr_rect = display_server->screen_get_usable_rect(init_screen);
-				display_server->window_set_position(scr_rect.position + (scr_rect.size - real_size) / 2, DisplayServerEnums::MAIN_WINDOW_ID);
+				display_server->window_set_position(scr_rect.position + (scr_rect.size - real_size) / 2, DisplayServer::MAIN_WINDOW_ID);
 			}
 		}
 #endif
-		if (display_server->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS)) {
-			display_server->show_window(DisplayServerEnums::MAIN_WINDOW_ID);
+		if (display_server->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) {
+			display_server->show_window(DisplayServer::MAIN_WINDOW_ID);
 		}
 
-		if (display_server->has_feature(DisplayServerEnums::FEATURE_ORIENTATION)) {
+		if (display_server->has_feature(DisplayServer::FEATURE_ORIENTATION)) {
 			display_server->screen_set_orientation(window_orientation);
 		}
 
@@ -3453,7 +3347,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 	if (editor && init_windowed) {
 		// We still need to check we are actually in windowed mode, because
 		// certain platform might only support one fullscreen window.
-		if (DisplayServer::get_singleton()->window_get_mode() == DisplayServerEnums::WINDOW_MODE_WINDOWED) {
+		if (DisplayServer::get_singleton()->window_get_mode() == DisplayServer::WINDOW_MODE_WINDOWED) {
 			Vector2i current_size = DisplayServer::get_singleton()->window_get_size();
 			Vector2i current_pos = DisplayServer::get_singleton()->window_get_position();
 			int screen = DisplayServer::get_singleton()->window_get_current_screen();
@@ -3474,16 +3368,16 @@ Error Main::setup2(bool p_show_boot_logo) {
 	if (GLOBAL_GET("debug/settings/stdout/print_fps") || print_fps) {
 		// Print requested V-Sync mode at startup to diagnose the printed FPS not going above the monitor refresh rate.
 		switch (window_vsync_mode) {
-			case DisplayServerEnums::VSyncMode::VSYNC_DISABLED:
+			case DisplayServer::VSyncMode::VSYNC_DISABLED:
 				print_line("Requested V-Sync mode: Disabled");
 				break;
-			case DisplayServerEnums::VSyncMode::VSYNC_ENABLED:
+			case DisplayServer::VSyncMode::VSYNC_ENABLED:
 				print_line("Requested V-Sync mode: Enabled - FPS will likely be capped to the monitor refresh rate.");
 				break;
-			case DisplayServerEnums::VSyncMode::VSYNC_ADAPTIVE:
+			case DisplayServer::VSyncMode::VSYNC_ADAPTIVE:
 				print_line("Requested V-Sync mode: Adaptive");
 				break;
-			case DisplayServerEnums::VSyncMode::VSYNC_MAILBOX:
+			case DisplayServer::VSyncMode::VSYNC_MAILBOX:
 				print_line("Requested V-Sync mode: Mailbox");
 				break;
 		}
@@ -3603,12 +3497,12 @@ Error Main::setup2(bool p_show_boot_logo) {
 			if (init_windowed) {
 				//do none..
 			} else if (init_maximized) {
-				DisplayServer::get_singleton()->window_set_mode(DisplayServerEnums::WINDOW_MODE_MAXIMIZED);
+				DisplayServer::get_singleton()->window_set_mode(DisplayServer::WINDOW_MODE_MAXIMIZED);
 			} else if (init_fullscreen) {
-				DisplayServer::get_singleton()->window_set_mode(DisplayServerEnums::WINDOW_MODE_FULLSCREEN);
+				DisplayServer::get_singleton()->window_set_mode(DisplayServer::WINDOW_MODE_FULLSCREEN);
 			}
 			if (init_always_on_top) {
-				DisplayServer::get_singleton()->window_set_flag(DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP, true);
+				DisplayServer::get_singleton()->window_set_flag(DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP, true);
 			}
 		}
 
@@ -3824,7 +3718,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 				GLOBAL_GET("display/mouse_cursor/custom_image"));
 		if (cursor.is_valid()) {
 			Vector2 hotspot = GLOBAL_GET("display/mouse_cursor/custom_image_hotspot");
-			Input::get_singleton()->set_custom_mouse_cursor(cursor, Input::CursorShape::CURSOR_ARROW, hotspot);
+			Input::get_singleton()->set_custom_mouse_cursor(cursor, Input::CURSOR_ARROW, hotspot);
 		}
 	}
 
@@ -3906,7 +3800,7 @@ void Main::setup_boot_logo() {
 	if (show_logo) { //boot logo!
 		const bool boot_logo_image = GLOBAL_DEF_BASIC("application/boot_splash/show_image", true);
 
-		const RSE::SplashStretchMode boot_stretch_mode = GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "application/boot_splash/stretch_mode", PROPERTY_HINT_ENUM, "Disabled,Keep,Keep Width,Keep Height,Cover,Ignore"), 1);
+		const RenderingServer::SplashStretchMode boot_stretch_mode = GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "application/boot_splash/stretch_mode", PROPERTY_HINT_ENUM, "Disabled,Keep,Keep Width,Keep Height,Cover,Ignore"), 1);
 		const bool boot_logo_filter = GLOBAL_DEF_BASIC("application/boot_splash/use_filter", true);
 		String boot_logo_path = GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "application/boot_splash/image", PROPERTY_HINT_FILE, "*.png"), String());
 
@@ -3960,12 +3854,12 @@ void Main::setup_boot_logo() {
 			MAIN_PRINT("Main: ClearColor");
 			RenderingServer::get_singleton()->set_default_clear_color(boot_bg_color);
 			MAIN_PRINT("Main: Image");
-			RenderingServer::get_singleton()->set_boot_image_with_stretch(splash, boot_bg_color, RSE::SPLASH_STRETCH_MODE_DISABLED);
+			RenderingServer::get_singleton()->set_boot_image_with_stretch(splash, boot_bg_color, RenderingServer::SPLASH_STRETCH_MODE_DISABLED);
 #endif
 		}
 
 #if defined(TOOLS_ENABLED) && defined(MACOS_ENABLED)
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ICON) && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
 			Ref<Image> icon = memnew(Image(app_icon_png));
 			DisplayServer::get_singleton()->set_icon(icon);
 		}
@@ -3975,6 +3869,10 @@ void Main::setup_boot_logo() {
 			GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
 }
 
+String Main::get_rendering_driver_name() {
+	return rendering_driver;
+}
+
 String Main::get_locale_override() {
 	return locale;
 }
@@ -4462,7 +4360,7 @@ int Main::start() {
 
 		bool embed_subwindows = GLOBAL_GET("display/window/subwindows/embed_subwindows");
 
-		if (single_window || (!project_manager && !editor && embed_subwindows) || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS)) {
+		if (single_window || (!project_manager && !editor && embed_subwindows) || !DisplayServer::get_singleton()->has_feature(DisplayServer::Feature::FEATURE_SUBWINDOWS)) {
 			sml->get_root()->set_embedding_subwindows(true);
 		}
 
@@ -4473,7 +4371,7 @@ int Main::start() {
 			if (!game_path.is_empty() || !script.is_empty()) {
 				//autoload
 				OS::get_singleton()->benchmark_begin_measure("Startup", "Load Autoloads");
-				HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
+				HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
 				//first pass, add the constants so they exist before any script is loaded
 				for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
@@ -4667,12 +4565,12 @@ int Main::start() {
 
 #ifdef TOOLS_ENABLED
 		if (editor) {
-			bool editor_embed_subwindows = EDITOR_GET("interface/editor/display/single_window_mode");
+			bool editor_embed_subwindows = EDITOR_GET("interface/editor/single_window_mode");
 
 			if (editor_embed_subwindows) {
 				sml->get_root()->set_embedding_subwindows(true);
 			}
-			restore_editor_window_layout = EDITOR_GET("interface/editor/appearance/editor_screen").operator int() == EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO;
+			restore_editor_window_layout = EDITOR_GET("interface/editor/editor_screen").operator int() == EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO;
 		}
 #endif
 
@@ -4749,7 +4647,7 @@ int Main::start() {
 				}
 #endif
 				String mac_icon_path = GLOBAL_GET("application/config/macos_native_icon");
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_ICON) && !mac_icon_path.is_empty() && !has_icon) {
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_ICON) && !mac_icon_path.is_empty() && !has_icon) {
 					DisplayServer::get_singleton()->set_native_icon(mac_icon_path);
 					has_icon = true;
 				}
@@ -4757,14 +4655,14 @@ int Main::start() {
 
 #ifdef WINDOWS_ENABLED
 				String win_icon_path = GLOBAL_GET("application/config/windows_native_icon");
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_ICON) && !win_icon_path.is_empty()) {
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_ICON) && !win_icon_path.is_empty()) {
 					DisplayServer::get_singleton()->set_native_icon(win_icon_path);
 					has_icon = true;
 				}
 #endif
 
 				String icon_path = GLOBAL_GET("application/config/icon");
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ICON) && !icon_path.is_empty() && !has_icon) {
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && !icon_path.is_empty() && !has_icon) {
 					Ref<Image> icon;
 					icon.instantiate();
 					if (ImageLoader::load_image(icon_path, icon) == OK) {
@@ -4807,7 +4705,7 @@ int Main::start() {
 #endif
 	}
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ICON) && !has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && !has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
 		Ref<Image> icon = memnew(Image(app_icon_png));
 		DisplayServer::get_singleton()->set_icon(icon);
 	}
@@ -5195,9 +5093,6 @@ void Main::cleanup(bool p_force) {
 		ERR_FAIL_COND(!_start_success);
 	}
 
-	// Printing in the usual way can become problematic during/after cleanup.
-	CoreGlobals::print_ready = false;
-
 #ifdef DEBUG_ENABLED
 	if (input) {
 		input->flush_frame_parsed_events();
diff --git a/engine/main/main.h b/engine/main/main.h
index 1a875a5e..653461ea 100644
--- a/engine/main/main.h
+++ b/engine/main/main.h
@@ -71,10 +71,13 @@ public:
 	static int test_entrypoint(int argc, char *argv[], bool &tests_need_run);
 	static Error setup(const char *execpath, int argc, char *argv[], bool p_second_phase = true);
 	static Error setup2(bool p_show_boot_logo = true); // The thread calling setup2() will effectively become the main thread.
+	static String get_rendering_driver_name();
 	static String get_locale_override();
 	static void setup_boot_logo();
+#ifdef TESTS_ENABLED
 	static Error test_setup();
 	static void test_cleanup();
+#endif
 	static int start();
 
 	static bool iteration();
@@ -86,18 +89,18 @@ public:
 };
 
 // Test main override is for the testing behavior.
-#define TEST_MAIN_OVERRIDE \
-	bool run_test = false; \
+#define TEST_MAIN_OVERRIDE                                         \
+	bool run_test = false;                                         \
 	int return_code = Main::test_entrypoint(argc, argv, run_test); \
-	if (run_test) { \
-		godot_cleanup_profiler(); \
-		return return_code; \
+	if (run_test) {                                                \
+		godot_cleanup_profiler();                                  \
+		return return_code;                                        \
 	}
 
-#define TEST_MAIN_PARAM_OVERRIDE(argc, argv) \
-	bool run_test = false; \
+#define TEST_MAIN_PARAM_OVERRIDE(argc, argv)                       \
+	bool run_test = false;                                         \
 	int return_code = Main::test_entrypoint(argc, argv, run_test); \
-	if (run_test) { \
-		godot_cleanup_profiler(); \
-		return return_code; \
+	if (run_test) {                                                \
+		godot_cleanup_profiler();                                  \
+		return return_code;                                        \
 	}
diff --git a/engine/main/main_builders.py b/engine/main/main_builders.py
index 78041ce4..a184dafd 100644
--- a/engine/main/main_builders.py
+++ b/engine/main/main_builders.py
@@ -9,8 +9,6 @@ def make_splash(target, source, env):
     with methods.generated_wrapper(str(target[0])) as file:
         # Use a neutral gray color to better fit various kinds of projects.
         file.write(f"""\
-#include "core/math/color.h"
-
 static const Color boot_splash_bg_color = Color(0.14, 0.14, 0.14);
 inline constexpr const unsigned char boot_splash_png[] = {{
 	{methods.format_buffer(buffer, 1)}
@@ -25,8 +23,6 @@ def make_splash_editor(target, source, env):
         # The editor splash background color is taken from the default editor theme's background color.
         # This helps achieve a visually "smoother" transition between the splash screen and the editor.
         file.write(f"""\
-#include "core/math/color.h"
-
 static const Color boot_splash_editor_bg_color = Color(0.125, 0.145, 0.192);
 inline constexpr const unsigned char boot_splash_editor_png[] = {{
 	{methods.format_buffer(buffer, 1)}
diff --git a/engine/main/main_timer_sync.cpp b/engine/main/main_timer_sync.cpp
index b4c5ab07..ed6786cd 100644
--- a/engine/main/main_timer_sync.cpp
+++ b/engine/main/main_timer_sync.cpp
@@ -33,13 +33,6 @@
 #include "core/os/os.h"
 #include "servers/display/display_server.h"
 
-// Uncomment this define to get more debugging logs for the delta smoothing.
-// #define GODOT_DEBUG_DELTA_SMOOTHER
-#ifdef GODOT_DEBUG_DELTA_SMOOTHER
-#include "core/string/print_string.h"
-#include "core/string/string.h"
-#endif
-
 void MainFrameTime::clamp_process_step(double min_process_step, double max_process_step) {
 	if (process_step < min_process_step) {
 		process_step = min_process_step;
@@ -50,20 +43,6 @@ void MainFrameTime::clamp_process_step(double min_process_step, double max_proce
 
 /////////////////////////////////
 
-void MainTimerSync::DeltaSmoother::made_new_estimate() {
-	_hits_above_estimated = 0;
-	_hits_at_estimated = 0;
-	_hits_below_estimated = 0;
-	_hits_one_above_estimated = 0;
-	_hits_one_below_estimated = 0;
-
-	_estimate_complete = false;
-
-#ifdef GODOT_DEBUG_DELTA_SMOOTHER
-	print_line("estimated fps " + itos(_estimated_fps));
-#endif
-}
-
 void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta) {
 	// the calling code should prevent 0 or negative values of delta
 	// (preventing divide by zero)
@@ -233,6 +212,8 @@ bool MainTimerSync::DeltaSmoother::fps_allows_smoothing(int64_t p_delta) {
 				double fps = 1000000.0 / time_passed;
 				double ratio = fps / (double)_estimated_fps;
 
+				//print_line("ratio : " + String(Variant(ratio)));
+
 				if ((ratio > 0.95) && (ratio < 1.05)) {
 					_measurement_allows_smoothing = true;
 				} else {
@@ -262,8 +243,8 @@ int64_t MainTimerSync::DeltaSmoother::smooth_delta(int64_t p_delta) {
 	}
 
 	// only attempt smoothing if vsync is selected
-	DisplayServerEnums::VSyncMode vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID);
-	if (vsync_mode != DisplayServerEnums::VSYNC_ENABLED) {
+	DisplayServer::VSyncMode vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServer::MAIN_WINDOW_ID);
+	if (vsync_mode != DisplayServer::VSYNC_ENABLED) {
 		return p_delta;
 	}
 
@@ -307,6 +288,7 @@ int64_t MainTimerSync::DeltaSmoother::smooth_delta(int64_t p_delta) {
 	units = MAX(units, 1);
 
 	_leftover_time -= units * _vsync_delta;
+	// print_line("units " + itos(units) + ", leftover " + itos(_leftover_time/1000) + " ms");
 
 	return units * _vsync_delta;
 }
diff --git a/engine/main/main_timer_sync.h b/engine/main/main_timer_sync.h
index 0e7bc2b0..59dac84b 100644
--- a/engine/main/main_timer_sync.h
+++ b/engine/main/main_timer_sync.h
@@ -30,7 +30,10 @@
 
 #pragma once
 
-#include <cstdint>
+#include "core/config/engine.h"
+
+// Uncomment this define to get more debugging logs for the delta smoothing.
+// #define GODOT_DEBUG_DELTA_SMOOTHER
 
 struct MainFrameTime {
 	double process_step; // delta time to advance during process()
@@ -47,7 +50,6 @@ class MainTimerSync {
 		int64_t smooth_delta(int64_t p_delta);
 
 	private:
-		void made_new_estimate();
 		void update_refresh_rate_estimator(int64_t p_delta);
 		bool fps_allows_smoothing(int64_t p_delta);
 
@@ -85,6 +87,21 @@ class MainTimerSync {
 		// to prevent spurious values
 		int64_t _estimator_total_delta = 0;
 		int32_t _estimator_delta_readings = 0;
+
+		void made_new_estimate() {
+			_hits_above_estimated = 0;
+			_hits_at_estimated = 0;
+			_hits_below_estimated = 0;
+			_hits_one_above_estimated = 0;
+			_hits_one_below_estimated = 0;
+
+			_estimate_complete = false;
+
+#ifdef GODOT_DEBUG_DELTA_SMOOTHER
+			print_line("estimated fps " + itos(_estimated_fps));
+#endif
+		}
+
 	} _delta_smoother;
 
 	// wall clock time measured on the main thread
diff --git a/engine/main/performance.compat.inc b/engine/main/performance.compat.inc
index 4d5436ef..5046590e 100644
--- a/engine/main/performance.compat.inc
+++ b/engine/main/performance.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "performance.h"
-
-#include "core/object/class_db.h"
-
 void Performance::_add_custom_monitor_bind_compat_110433(const StringName &p_id, const Callable &p_callable, const Vector<Variant> &p_args) {
 	add_custom_monitor(p_id, p_callable, p_args, MONITOR_TYPE_QUANTITY);
 }
@@ -42,4 +38,4 @@ void Performance::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_custom_monitor", "id", "callable", "arguments"), &Performance::_add_custom_monitor_bind_compat_110433, DEFVAL(Array()));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/main/performance.cpp b/engine/main/performance.cpp
index 93d9e66b..0e32c9a8 100644
--- a/engine/main/performance.cpp
+++ b/engine/main/performance.cpp
@@ -31,8 +31,6 @@
 #include "performance.h"
 #include "performance.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/typed_array.h"
 #include "scene/main/node.h"
@@ -263,27 +261,27 @@ double Performance::get_monitor(Monitor p_monitor) const {
 		case OBJECT_ORPHAN_NODE_COUNT:
 			return _get_orphan_node_count();
 		case RENDER_TOTAL_OBJECTS_IN_FRAME:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME);
 		case RENDER_TOTAL_PRIMITIVES_IN_FRAME:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME);
 		case RENDER_TOTAL_DRAW_CALLS_IN_FRAME:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME);
 		case RENDER_VIDEO_MEM_USED:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_VIDEO_MEM_USED);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_VIDEO_MEM_USED);
 		case RENDER_TEXTURE_MEM_USED:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_TEXTURE_MEM_USED);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_TEXTURE_MEM_USED);
 		case RENDER_BUFFER_MEM_USED:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_BUFFER_MEM_USED);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_BUFFER_MEM_USED);
 		case PIPELINE_COMPILATIONS_CANVAS:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS);
 		case PIPELINE_COMPILATIONS_MESH:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_MESH);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_MESH);
 		case PIPELINE_COMPILATIONS_SURFACE:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE);
 		case PIPELINE_COMPILATIONS_DRAW:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
 		case PIPELINE_COMPILATIONS_SPECIALIZATION:
-			return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
+			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
 #ifndef PHYSICS_2D_DISABLED
 		case PHYSICS_2D_ACTIVE_OBJECTS:
 			return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ACTIVE_OBJECTS);
diff --git a/engine/main/performance.h b/engine/main/performance.h
index 989ec745..f3d0668f 100644
--- a/engine/main/performance.h
+++ b/engine/main/performance.h
@@ -30,9 +30,8 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 #include "core/templates/hash_map.h"
-#include "core/variant/type_info.h"
 
 #define PERF_WARN_OFFLINE_FUNCTION
 #define PERF_WARN_PROCESS_SYNC
diff --git a/engine/main/steam_tracker.cpp b/engine/main/steam_tracker.cpp
index 871df333..864453d7 100644
--- a/engine/main/steam_tracker.cpp
+++ b/engine/main/steam_tracker.cpp
@@ -33,7 +33,6 @@
 #include "steam_tracker.h"
 
 #include "core/io/file_access.h"
-#include "core/os/os.h"
 
 // https://partner.steamgames.com/doc/sdk/api#initialization_and_shutdown
 
diff --git a/engine/main/steam_tracker.h b/engine/main/steam_tracker.h
index a461bb21..2e111c71 100644
--- a/engine/main/steam_tracker.h
+++ b/engine/main/steam_tracker.h
@@ -32,6 +32,8 @@
 
 #if defined(STEAMAPI_ENABLED)
 
+#include "core/os/os.h"
+
 // SteamTracker is used to load SteamAPI dynamic library and initialize
 // the interface, this notifies Steam that Godot editor is running and
 // allow tracking of the usage time of child instances of the engine
diff --git a/engine/methods.py b/engine/methods.py
index 6fe6b2fb..3caabfce 100644
--- a/engine/methods.py
+++ b/engine/methods.py
@@ -673,8 +673,7 @@ def is_apple_clang(env):
         return False
     try:
         version = (
-            subprocess
-            .check_output(shlex.split(env.subst(env["CXX"]), posix=False) + ["--version"])
+            subprocess.check_output(shlex.split(env.subst(env["CXX"]), posix=False) + ["--version"])
             .strip()
             .decode("utf-8")
         )
@@ -1152,7 +1151,7 @@ def generate_vs_project(env, original_args, project_name="godot"):
         sys.modules.pop("msvs")
 
     extensions = {}
-    extensions["headers"] = [".h", ".hh", ".hpp", ".hxx", ".inc", ".inl"]
+    extensions["headers"] = [".h", ".hh", ".hpp", ".hxx", ".inc"]
     extensions["sources"] = [".c", ".cc", ".cpp", ".cxx", ".m", ".mm", ".java"]
     extensions["others"] = [".natvis", ".glsl", ".rc"]
 
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/Info.plist b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/Info.plist
deleted file mode 100644
index 5c352d09..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/Info.plist
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64_x86_64-simulator/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64_x86_64-simulator/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.debug.xcframework/ios-arm64_x86_64-simulator/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/Info.plist b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/Info.plist
deleted file mode 100644
index 5c352d09..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/Info.plist
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64_x86_64-simulator/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64_x86_64-simulator/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.ios.release.xcframework/ios-arm64_x86_64-simulator/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/Info.plist b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/Info.plist
deleted file mode 100644
index 25f87359..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/Info.plist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64-simulator/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64-simulator/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64-simulator/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.debug.xcframework/xros-arm64/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/Info.plist b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/Info.plist
deleted file mode 100644
index 25f87359..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/Info.plist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libgodot_camera.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64-simulator/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64-simulator/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64-simulator/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64/empty b/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64/empty
deleted file mode 100644
index bd3e8943..00000000
--- a/engine/misc/dist/apple_embedded_xcode/libgodot_camera.visionos.release.xcframework/xros-arm64/empty
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file to make dylibs folder exported
diff --git a/engine/misc/dist/html/editor.html b/engine/misc/dist/html/editor.html
index fc4f0491..79e68b50 100644
--- a/engine/misc/dist/html/editor.html
+++ b/engine/misc/dist/html/editor.html
@@ -14,49 +14,20 @@
 		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 		<meta name="msapplication-starturl" content="/latest">
 		<meta property="og:site_name" content="Godot Engine Web Editor">
-		<meta property="og:url" name="twitter:url" content="https://editor.godotengine.org/releases/stable/">
+		<meta property="og:url" name="twitter:url" content="https://editor.godotengine.org/releases/latest/">
 		<meta property="og:title" name="twitter:title" content="Free and open source 2D and 3D game engine">
 		<meta property="og:description" name="twitter:description" content="Use the Godot Engine editor directly in your web browser, without having to install anything.">
-		<meta property="og:image" name="twitter:image" content="https://godotengine.org/assets/share-image.webp">
+		<meta property="og:image" name="twitter:image" content="https://godotengine.org/themes/godotengine/assets/og_image.png">
 		<meta property="og:type" content="website">
 		<meta name="twitter:card" content="summary">
 		<link id="-gd-engine-icon" rel="icon" type="image/png" href="favicon.png">
 		<link rel="apple-touch-icon" type="image/png" href="favicon.png">
 		<link rel="manifest" href="manifest.json">
-		<link rel="preload" href="inter-regular.woff2" as="font" crossorigin="anonymous">
-		<link rel="preload" href="inter-bold.woff2" as="font" crossorigin="anonymous">
 		<title>Godot Engine Web Editor (___GODOT_VERSION___)</title>
 		<style>
-/* Use Inter in the same configuration as used in the editor (e.g. alternate lowercase `l`). */
-@font-face {
-	font-family: "Inter";
-	src: url("inter-regular.woff2");
-	font-weight: 400;
-	font-style: normal;
-	font-display: swap;
-}
-
-@font-face {
-	font-family: "Inter";
-	src: url("inter-bold.woff2");
-	font-weight: 700;
-	font-style: normal;
-	font-display: swap;
-}
-
-html,
-body,
-button,
-input {
-	/* Apply a modern sans-serif font stack in case the Inter font fails to load. */
-	font-family: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-	font-size: 14px;
-	font-feature-settings: "calt" 0, "ss04" 1, "tnum" 1;
-}
-
-*:focus-visible {
+*:focus {
 	/* More visible outline for better keyboard navigation. */
-	outline: 0.1875rem solid #538dda;
+	outline: 0.125rem solid hsl(220, 100%, 62.5%);
 	/* Make the outline always appear above other elements. */
 	/* Otherwise, one of its sides can be hidden by tabs in the Download and More layouts. */
 	position: relative;
@@ -64,19 +35,15 @@ input {
 
 body {
 	touch-action: none;
+	font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 	margin: 0;
 	border: 0 none;
 	padding: 0;
-	font-size: 14px;
 	text-align: center;
-	background-color: #262626;
+	background-color: #333b4f;
 	overflow: hidden;
 }
 
-h2 {
-	font-size: 21px;
-}
-
 a {
 	color: hsl(205, 100%, 75%);
 	text-decoration-color: hsla(205, 100%, 75%, 0.3);
@@ -109,27 +76,25 @@ a:active {
 }
 
 .welcome-modal-content {
-	background-color: #262626;
+	background-color: #333b4f;
 	box-shadow: 0 0.25rem 0.25rem hsla(0, 0%, 0%, 0.5);
 	line-height: 1.5;
 	max-width: 38rem;
 	margin: 4rem auto 0 auto;
 	color: white;
 	border-radius: 0.5rem;
-	padding: 0.125rem 1.25rem 1.25rem 1.25rem;
+	padding: 1rem 1rem 2rem 1rem;
 }
 
 #tabs-buttons {
-	/* Remove spacing between items. */
-	font-size: 0;
-
 	/* Match the default background color of the editor window for a seamless appearance. */
-	background-color: #141414;
+	background-color: #202531;
 }
 
 #tab-game {
-	/* Match the default background color of the editor window for a seamless appearance. */
-	background-color: #141414;
+	/* Use a pure black background to better distinguish the running project */
+	/* from the editor window, and to use a more neutral background color (no tint). */
+	background-color: black;
 	/* Make the background span the entire page height. */
 	min-height: 100vh;
 }
@@ -149,68 +114,43 @@ a:active {
 }
 
 .godot {
-	color: #d0d0d0;
-	background-color: #1b1b1b;
+	color: #e0e0e0;
+	background-color: #3b3943;
 	background-image: linear-gradient(to bottom, #403e48, #35333c);
-	border: 1px solid #484848;
-	box-shadow: 0 0 1px 1px #141414;
+	border: 1px solid #45434e;
+	box-shadow: 0 0 1px 1px #2f2d35;
 }
 
 .btn {
 	appearance: none;
-	color: #d0d0d0;
-	background-color: #424242;
-	border: 1px solid #484848;
-	/* Vertically center button text. */
-	padding: 0.4375rem 0.5625rem 0.5rem;
+	color: #e0e0e0;
+	background-color: #262c3b;
+	border: 1px solid #202531;
+	padding: 0.5rem 1rem;
 	margin: 0 0.5rem;
-	border-radius: 0.25rem;
 }
 
 .btn:not(:disabled):hover {
-	color: #e4e4e4;
-	background-color: #4d4d4d;
-	border-color: #535353;
+	color: #e0e1e5;
+	border-color: #666c7b;
 }
 
 .btn:active {
-	color: #e5e5e5;
-	background-color: #505050;
-	border-color: #565656;
+	border-color: #699ce8;
+	color: #699ce8;
 }
 
 .btn:disabled {
-	color: #7f7f7f;
-	background-color: #3a3a3a;
-	border-color: #3a3a3a;
-}
-
-.btn.tab-btn,
-.btn.close-btn {
-	/* Match tab colors from the default editor theme. */
-	background-color: transparent;
-	border-color: transparent;
-}
-
-.btn.tab-btn:not(:disabled):hover,
-.btn.close-btn:not(:disabled):hover {
-	background-color: #212121;
-	border-color: #212121;
+	color: #aaa;
+	border-color: #242937;
 }
 
 .btn.tab-btn {
-	/* Round top corners only. */
-	border-radius: 0.25rem 0.25rem 0 0;
-}
-
-.btn.next-to-close-btn {
-	/* Round top-left corner only. */
-	border-radius: 0.25rem 0 0 0;
+	padding: 0.3rem 1rem;
 }
 
 .btn.close-btn {
-	/* Round top-right corner only. */
-	border-radius: 0 0.25rem 0 0;
+	padding: 0.3rem 1rem;
 	margin-left: -0.75rem;
 	font-weight: 700;
 }
@@ -303,21 +243,14 @@ a:active {
 				<h2 id="welcome-modal-title" class="welcome-modal-title">Important - Please read before continuing</h2>
 				<div id="welcome-modal-description">
 					<p>
-						The Godot Web Editor has some limitations compared to the native version.<br>
+						The Godot Web Editor has some limitations compared to the native version.
 						Its main focus is education and experimentation;
 						<strong>it is not recommended for production</strong>.
 					</p>
-					<p>
-						For a more optimal experience, <a
-							href="https://godotengine.org/download/"
-							target="_blank"
-							rel="noopener"
-						>download</a> the native Godot Editor.
-					</p>
 					<p>
 						Refer to the
 						<a
-							href="https://docs.godotengine.org/en/stable/tutorials/editor/using_the_web_editor.html"
+							href="https://docs.godotengine.org/en/latest/tutorials/editor/using_the_web_editor.html"
 							target="_blank"
 							rel="noopener"
 						>Web editor documentation</a> for usage instructions and limitations.
@@ -333,7 +266,7 @@ a:active {
 						If you are self-hosting the web editor,
 						refer to
 						<a
-							href="https://docs.godotengine.org/en/stable/tutorials/export/exporting_for_web.html"
+							href="https://docs.godotengine.org/en/latest/tutorials/export/exporting_for_web.html"
 							target="_blank"
 							rel="noopener"
 						>Exporting for the Web</a> for more information.
@@ -341,16 +274,16 @@ a:active {
 				</div>
 				<div style="text-align: center">
 					<button id="welcome-modal-dismiss" class="btn" type="button" onclick="closeWelcomeModal(true)" style="margin-top: 1rem">
-						OK - Don't Show Again
+						OK, don't show again
 					</button>
 				</div>
 			</div>
 		</div>
 		<div id="tabs-buttons">
 			<button id="btn-tab-loader" class="btn tab-btn" onclick="showTab('loader')">Loader</button>
-			<button id="btn-tab-editor" class="btn tab-btn next-to-close-btn" disabled="disabled" onclick="showTab('editor')">Editor</button>
+			<button id="btn-tab-editor" class="btn tab-btn" disabled="disabled" onclick="showTab('editor')">Editor</button>
 			<button id="btn-close-editor" class="btn close-btn" disabled="disabled" onclick="closeEditor()">×</button>
-			<button id="btn-tab-game" class="btn tab-btn next-to-close-btn" disabled="disabled" onclick="showTab('game')">Game</button>
+			<button id="btn-tab-game" class="btn tab-btn" disabled="disabled" onclick="showTab('game')">Game</button>
 			<button id="btn-close-game" class="btn close-btn" disabled="disabled" onclick="closeGame()">×</button>
 			<button id="btn-tab-update" class="btn tab-btn" style="display: none;">Update</button>
 		</div>
@@ -358,21 +291,32 @@ a:active {
 			<div id="tab-loader">
 				<div style="color: #e0e0e0;" id="persistence">
 					<br >
-					<img src="logo.svg" alt="Godot Engine logo" width="1024" height="414" style="width: auto; height: auto; max-width: min(85%, 50vh); max-height: 200px">
+					<img src="logo.svg" alt="Godot Engine logo" width="1024" height="414" style="width: auto; height: auto; max-width: min(85%, 50vh); max-height: 250px">
 					<br >
-					___GODOT_VERSION___ - <a href="/releases/">Change version</a>
+					___GODOT_VERSION___
+					<br >
+					<a href="/releases/">Need an old version?</a>
+					<br >
+					<br >
+					<br >
+					<label for="videoMode" style="margin-right: 1rem">Video driver:</label>
+					<select id="videoMode">
+						<option value="" selected="selected">Auto</option>
+						<option value="opengl3">WebGL 2</option>
+					</select>
 					<br >
 					<br >
 					<label for="zip-file" style="margin-right: 1rem">Preload project ZIP:</label>
-					<input id="zip-file" type="file" name="files" style="margin-bottom: 0.5rem">
-					<br>
-					<a href="demo.zip" id="zip-demo">(Try this for example)</a>
+					<input id="zip-file" type="file" name="files" style="margin-bottom: 1rem">
 					<br >
-					<button id="startButton" class="btn" style="margin-top: 2rem; margin-bottom: 3rem; font-weight: 700">Start Godot Editor</button>
+					<a href="demo.zip">(Try this for example)</a>
 					<br >
-					<button class="btn" onclick="clearPersistence()" style="margin-bottom: 1.5rem">Clear Persistent Data</button>
 					<br >
-					<a href="https://docs.godotengine.org/en/stable/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
+					<button id="startButton" class="btn" style="margin-bottom: 4rem; font-weight: 700">Start Godot editor</button>
+					<br >
+					<button class="btn" onclick="clearPersistence()" style="margin-bottom: 1.5rem">Clear persistent data</button>
+					<br >
+					<a href="https://docs.godotengine.org/en/latest/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
 				</div>
 			</div>
 			<div id="tab-editor" style="display: none;">
@@ -479,6 +423,7 @@ let editor = null;
 let game = null;
 let setStatusMode;
 let setStatusNotice;
+let video_driver = '';
 
 function clearPersistence() { // eslint-disable-line no-unused-vars
 	function deleteDB(path) {
@@ -507,6 +452,11 @@ function clearPersistence() { // eslint-disable-line no-unused-vars
 	});
 }
 
+function selectVideoMode() {
+	const select = document.getElementById('videoMode');
+	video_driver = select.selectedOptions[0].value;
+}
+
 const tabs = [
 	document.getElementById('tab-loader'),
 	document.getElementById('tab-editor'),
@@ -687,6 +637,9 @@ function startEditor(zip) {
 			return v === '--project-manager';
 		}).length !== 0;
 		const is_game = !is_editor && !is_project_manager;
+		if (video_driver) {
+			args.push('--rendering-driver', video_driver);
+		}
 
 		if (is_game) {
 			if (game) {
@@ -783,9 +736,13 @@ function startEditor(zip) {
 			} catch (e) {
 				// File exists
 			}
+			selectVideoMode();
 			showTab('editor');
 			setLoaderEnabled(false);
 			const args = ['--project-manager', '--single-window'];
+			if (video_driver) {
+				args.push('--rendering-driver', video_driver);
+			}
 			editor.start({ 'args': args, 'persistentDrops': true }).then(function () {
 				setStatusMode('hidden');
 				initializing = false;
@@ -811,24 +768,6 @@ document.getElementById('startButton').onclick = function () {
 		startEditor(zip);
 	});
 };
-
-const zipFile = document.getElementById('zip-file');
-const zipDemo = document.getElementById('zip-demo');
-
-function updateZipDemoDisplay() {
-	console.log(zipFile.files.length);
-	// Hide "Try this for example" link when a file is selected.
-	zipDemo.style.display = zipFile.files.length === 0 ? 'inline' : 'none';
-}
-
-zipFile.addEventListener('change', (_pEvent) => {
-	updateZipDemoDisplay();
-});
-
-document.addEventListener('DOMContentLoaded', () => {
-	// Handle situation when a file is already specified on load (e.g. after a page refresh).
-	updateZipDemoDisplay();
-});
 		</script>
 	</body>
 </html>
diff --git a/engine/misc/dist/macos_tools.app/Contents/Info.plist b/engine/misc/dist/macos_tools.app/Contents/Info.plist
index 0c7faac6..1627b1cb 100644
--- a/engine/misc/dist/macos_tools.app/Contents/Info.plist
+++ b/engine/misc/dist/macos_tools.app/Contents/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7</string>
+	<string>4.6.3</string>
 	<key>CFBundleSignature</key>
 	<string>GODO</string>
 	<key>CFBundleVersion</key>
-	<string>4.7</string>
+	<string>4.6.3</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Microphone access is required to capture audio.</string>
 	<key>NSCameraUsageDescription</key>
diff --git a/engine/misc/dist/windows/godot.iss b/engine/misc/dist/windows/godot.iss
index 3aad2bd7..1ca94645 100644
--- a/engine/misc/dist/windows/godot.iss
+++ b/engine/misc/dist/windows/godot.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Godot Engine"
-#define MyAppVersion "4.7"
+#define MyAppVersion "4.6.3"
 #define MyAppPublisher "Godot Engine contributors"
 #define MyAppURL "https://godotengine.org/"
 #define MyAppExeName "godot.exe"
diff --git a/engine/misc/error_suppressions/tsan.txt b/engine/misc/error_suppressions/tsan.txt
index 00cfb3f1..83be638b 100644
--- a/engine/misc/error_suppressions/tsan.txt
+++ b/engine/misc/error_suppressions/tsan.txt
@@ -3,7 +3,7 @@
 
 deadlock:modules/text_server_adv/text_server_adv.cpp
 deadlock:modules/text_server_fb/text_server_fb.cpp
-deadlock:tests/core/templates/test_command_queue.cpp
+deadlock:tests/core/templates/test_command_queue.h
 race:modules/navigation_2d/nav_map_2d.cpp
 race:modules/navigation_3d/nav_map_3d.cpp
 race:thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp
diff --git a/engine/misc/extension_api_validation/4.1-stable_4.2-stable/GH-80954.txt b/engine/misc/extension_api_validation/4.1-stable_4.2-stable/GH-80954.txt
index 3d807244..a18b428c 100644
--- a/engine/misc/extension_api_validation/4.1-stable_4.2-stable/GH-80954.txt
+++ b/engine/misc/extension_api_validation/4.1-stable_4.2-stable/GH-80954.txt
@@ -1,5 +1,5 @@
 GH-80954
 --------
-Validate extension JSON: Error: Field 'classes/Font/methods/find_variation/arguments': size changed value in new API, from 4 to 11.
+Validate extension JSON: Error: Field 'classes/Font/methods/find_variation/arguments': size changed value in new API, from 4 to 9.
 
 Added optional arguments. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.2-stable_4.3-stable/GH-87668.txt b/engine/misc/extension_api_validation/4.2-stable_4.3-stable/GH-87668.txt
index aea01b14..282a83be 100644
--- a/engine/misc/extension_api_validation/4.2-stable_4.3-stable/GH-87668.txt
+++ b/engine/misc/extension_api_validation/4.2-stable_4.3-stable/GH-87668.txt
@@ -1,5 +1,5 @@
 GH-87668
 --------
-Validate extension JSON: Error: Field 'classes/Font/methods/find_variation/arguments': size changed value in new API, from 8 to 11.
+Validate extension JSON: Error: Field 'classes/Font/methods/find_variation/arguments': size changed value in new API, from 8 to 9.
 
 Added optional "baseline_offset" argument. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107167.txt b/engine/misc/extension_api_validation/4.5-stable/GH-107167.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107167.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-107167.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107954.txt b/engine/misc/extension_api_validation/4.5-stable/GH-107954.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107954.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-107954.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-109302.txt b/engine/misc/extension_api_validation/4.5-stable/GH-109302.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-109302.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-109302.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110120.txt b/engine/misc/extension_api_validation/4.5-stable/GH-110120.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110120.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-110120.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110250.txt b/engine/misc/extension_api_validation/4.5-stable/GH-110250.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110250.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-110250.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110433.txt b/engine/misc/extension_api_validation/4.5-stable/GH-110433.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110433.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-110433.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110767.txt b/engine/misc/extension_api_validation/4.5-stable/GH-110767.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110767.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-110767.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110867.txt b/engine/misc/extension_api_validation/4.5-stable/GH-110867.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110867.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-110867.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111117.txt b/engine/misc/extension_api_validation/4.5-stable/GH-111117.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111117.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-111117.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111212.txt b/engine/misc/extension_api_validation/4.5-stable/GH-111212.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111212.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-111212.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111439.txt b/engine/misc/extension_api_validation/4.5-stable/GH-111439.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111439.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-111439.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112290.txt b/engine/misc/extension_api_validation/4.5-stable/GH-112290.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112290.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-112290.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112379.txt b/engine/misc/extension_api_validation/4.5-stable/GH-112379.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112379.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-112379.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112539.txt b/engine/misc/extension_api_validation/4.5-stable/GH-112539.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112539.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-112539.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113172.txt b/engine/misc/extension_api_validation/4.5-stable/GH-113172.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113172.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-113172.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113459.txt b/engine/misc/extension_api_validation/4.5-stable/GH-113459.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113459.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-113459.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-114053.txt b/engine/misc/extension_api_validation/4.5-stable/GH-114053.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-114053.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-114053.txt
diff --git a/engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-90411.txt b/engine/misc/extension_api_validation/4.5-stable/GH-90411.txt
similarity index 100%
rename from engine/misc/extension_api_validation/4.5-stable_4.6-stable/GH-90411.txt
rename to engine/misc/extension_api_validation/4.5-stable/GH-90411.txt
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-104736.txt b/engine/misc/extension_api_validation/4.6-stable/GH-104736.txt
deleted file mode 100644
index 655436d4..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-104736.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-104736
----------
-Validate extension JSON: Error: Field 'classes/PhysicsServer2D/methods/body_set_shape_as_one_way_collision/arguments': size changed value in new API, from 4 to 5.
-Validate extension JSON: Error: Field 'classes/PhysicsServer2DExtension/methods/_body_set_shape_as_one_way_collision/arguments': size changed value in new API, from 4 to 5.
-
-Argument added. Compatibility methods registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-109004.txt b/engine/misc/extension_api_validation/4.6-stable/GH-109004.txt
deleted file mode 100644
index ef6853d0..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-109004.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-109004
----------
-Validate extension JSON: API was removed: classes/ImageTexture/methods/get_format
-Validate extension JSON: API was removed: classes/PortableCompressedTexture2D/methods/get_format
-
-The above are now members of the base class Texture2D.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-109142.txt b/engine/misc/extension_api_validation/4.6-stable/GH-109142.txt
deleted file mode 100644
index 1bff8456..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-109142.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GH-109142
----------
-
-Validate extension JSON: Error: Field 'classes/CPUParticles3D/methods/request_particles_process/arguments': size changed value in new API, from 1 to 2.
-Validate extension JSON: Error: Field 'classes/CPUParticles2D/methods/request_particles_process/arguments': size changed value in new API, from 1 to 2.
-Validate extension JSON: Error: Field 'classes/GPUParticles2D/methods/request_particles_process/arguments': size changed value in new API, from 1 to 2.
-Validate extension JSON: Error: Field 'classes/GPUParticles3D/methods/request_particles_process/arguments': size changed value in new API, from 1 to 2.
-Validate extension JSON: Error: Field 'classes/RenderingServer/methods/particles_request_process_time/arguments': size changed value in new API, from 2 to 3.
-
-Optional argument added. Compatibility methods registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-109892.txt b/engine/misc/extension_api_validation/4.6-stable/GH-109892.txt
deleted file mode 100644
index df16cc19..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-109892.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-109892
----------
-
-Validate extension JSON: Error: Field 'classes/Object/enums/ConnectFlags': is_bitfield changed value in new API, from false to true.
-
-The enum above is now corrected to be a bitfield.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-110369.txt b/engine/misc/extension_api_validation/4.6-stable/GH-110369.txt
deleted file mode 100644
index 090b0d7e..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-110369.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-110369
---------------
-Validate extension JSON: Error: Field 'classes/AnimationNodeBlendSpace2D/methods/add_blend_point/arguments': size changed value in new API, from 3 to 4.
-Validate extension JSON: Error: Field 'classes/AnimationNodeBlendSpace1D/methods/add_blend_point/arguments': size changed value in new API, from 3 to 4.
-
-Added "name" parameter, to functionally replace index reference for points. Compatibility methods registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-114355.txt b/engine/misc/extension_api_validation/4.6-stable/GH-114355.txt
deleted file mode 100644
index 6ee0a84f..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-114355.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-GH-114355
----------
-Validate extension JSON: API was removed: classes/AudioEffectSpectrumAnalyzer/methods/set_tap_back_pos
-Validate extension JSON: API was removed: classes/AudioEffectSpectrumAnalyzer/methods/get_tap_back_pos
-Validate extension JSON: API was removed: classes/AudioEffectSpectrumAnalyzer/properties/tap_back_pos
-
-Removed this property because it caused buggy behavior for no discernible benefit.
-Compatibility methods registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-115799.txt b/engine/misc/extension_api_validation/4.6-stable/GH-115799.txt
deleted file mode 100644
index 124bfa4c..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-115799.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-GH-115799
----------
-Validate extension JSON: Error: Field 'classes/RenderingServer/methods/viewport_set_size/arguments': size changed value in new API, from 3 to 4.
-
-Optional argument added. Compatibility method registered.
-
-Validate extension JSON: Error: Field 'classes/Viewport/methods/is_using_xr': is_const changed value in new API, from false to true.
-
-Changed to const. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-115946.txt b/engine/misc/extension_api_validation/4.6-stable/GH-115946.txt
deleted file mode 100644
index 5285cc95..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-115946.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GH-115946
----------
-Validate extension JSON: Error: Field 'classes/ZIPPacker/methods/start_file/arguments': size changed value in new API, from 1 to 3.
-
-Optional argument added. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-116394.txt b/engine/misc/extension_api_validation/4.6-stable/GH-116394.txt
deleted file mode 100644
index 1e36d5c2..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-116394.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-116394
----------
-Validate extension JSON: Error: Field 'classes/Animation/methods/get_length/return_value': meta changed value in new API, from "float" to "double".
-Validate extension JSON: Error: Field 'classes/Animation/methods/set_length/arguments/0': meta changed value in new API, from "float" to "double".
-
-Return type and parameter changed from real_t to double to match internals. No compatibility methods registered because GDExtension FFI already uses double.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-116839.txt b/engine/misc/extension_api_validation/4.6-stable/GH-116839.txt
deleted file mode 100644
index 8457d18b..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-116839.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GH-116839
----------
-Validate extension JSON: Error: Field 'classes/Control/methods/get_accessibility_live/return_value': type changed value in new API, from "enum::DisplayServer.AccessibilityLiveMode" to "enum::AccessibilityServer.AccessibilityLiveMode".
-Validate extension JSON: Error: Field 'classes/Control/methods/set_accessibility_live/arguments/0': type changed value in new API, from "enum::DisplayServer.AccessibilityLiveMode" to "enum::AccessibilityServer.AccessibilityLiveMode".
-
-Enum moved to AccessibilityServer. Compatibility methods registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-117149.txt b/engine/misc/extension_api_validation/4.6-stable/GH-117149.txt
deleted file mode 100644
index 54b67b0a..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-117149.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GH-117149
----------
-Validate extension JSON: Error: Field 'classes/Font/methods/find_variation/arguments': size changed value in new API, from 9 to 11.
-
-Optional "palette_index" and "custom_colors" arguments added. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-117800.txt b/engine/misc/extension_api_validation/4.6-stable/GH-117800.txt
deleted file mode 100644
index 3b92354e..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-117800.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GH-117800
---------------
-
-Validate extension JSON: Error: Field 'classes/Image/methods/save_exr/arguments': size changed value in new API, from 2 to 4.
-Validate extension JSON: Error: Field 'classes/Image/methods/save_exr_to_buffer/arguments': size changed value in new API, from 1 to 3.
-
-Added color_image and max_linear_value parameters to Image.save_exr functions for saving HDR screenshots. Use default values for existing behavior.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-117968.txt b/engine/misc/extension_api_validation/4.6-stable/GH-117968.txt
deleted file mode 100644
index df65c21e..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-117968.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GH-117968
----------
-Validate extension JSON: Error: Field 'classes/EditorVCSInterface/methods/_commit/arguments': size changed value in new API, from 1 to 2.
-
-Added "amend" parameter. Compatibility method registered.
diff --git a/engine/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt b/engine/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt
deleted file mode 100644
index 179085d9..00000000
--- a/engine/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file should contain expected output of --validate-extension-api when run against the extension_api.json of the 4.6-stable tag.
-# Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored.
-# They should instead be used to justify these changes and describe how users should work around these changes.
-
-GH-{PR_NUMBER}
---------------
-
-Validate extension ....
-Validate extension ....
-
-Description of changes.
diff --git a/engine/misc/scripts/char_range_fetch.py b/engine/misc/scripts/char_range_fetch.py
index 336d31b6..0f135b2b 100755
--- a/engine/misc/scripts/char_range_fetch.py
+++ b/engine/misc/scripts/char_range_fetch.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 # Script used to dump char ranges for specific properties from
-# the Unicode Character Database to the `char_range.cpp` file.
+# the Unicode Character Database to the `char_range.inc` file.
 # NOTE: This script is deliberately not integrated into the build system;
 # you should run it manually whenever you want to update the data.
 from __future__ import annotations
@@ -16,7 +16,7 @@ if __name__ == "__main__":
 
 from methods import generate_copyright_header
 
-URL: Final[str] = "https://www.unicode.org/Public/17.0.0/ucd/DerivedCoreProperties.txt"
+URL: Final[str] = "https://www.unicode.org/Public/16.0.0/ucd/DerivedCoreProperties.txt"
 
 
 xid_start: list[tuple[int, int]] = []
@@ -89,8 +89,7 @@ def parse_unicode_data() -> None:
 
 
 def make_array(array_name: str, range_list: list[tuple[int, int]]) -> str:
-    result: str = f"\n\nconst int {array_name}_size = {len(range_list)};\n"
-    result += f"const CharRange {array_name}[{array_name}_size] = {{\n"
+    result: str = f"\n\nconstexpr inline CharRange {array_name}[] = {{\n"
 
     for start, end in range_list:
         result += f"\t{{ 0x{start:x}, 0x{end:x} }},\n"
@@ -103,16 +102,22 @@ def make_array(array_name: str, range_list: list[tuple[int, int]]) -> str:
 def generate_char_range_inc() -> None:
     parse_unicode_data()
 
-    source: str = generate_copyright_header("char_range.cpp")
+    source: str = generate_copyright_header("char_range.inc")
 
     source += f"""
 // This file was generated using the `misc/scripts/char_range_fetch.py` script.
 
-#include "core/string/char_utils.h"
+#pragma once
+
+#include "core/typedefs.h"
 
 // Unicode Derived Core Properties
-// Source: {URL}\
-"""
+// Source: {URL}
+
+struct CharRange {{
+\tchar32_t start;
+\tchar32_t end;
+}};"""
 
     source += make_array("xid_start", xid_start)
     source += make_array("xid_continue", xid_continue)
@@ -122,11 +127,11 @@ def generate_char_range_inc() -> None:
 
     source += "\n"
 
-    char_range_path: str = os.path.join(os.path.dirname(__file__), "../../core/string/char_range.cpp")
+    char_range_path: str = os.path.join(os.path.dirname(__file__), "../../core/string/char_range.inc")
     with open(char_range_path, "w", newline="\n") as f:
         f.write(source)
 
-    print("`char_range.cpp` generated successfully.")
+    print("`char_range.inc` generated successfully.")
 
 
 if __name__ == "__main__":
diff --git a/engine/misc/scripts/check_ci_log.py b/engine/misc/scripts/check_ci_log.py
index 171783e7..fb8f4a58 100755
--- a/engine/misc/scripts/check_ci_log.py
+++ b/engine/misc/scripts/check_ci_log.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import os
 import sys
 
 if len(sys.argv) < 2:
@@ -46,10 +45,7 @@ if file_contents.find("ERROR: LeakSanitizer:") != -1:
 # this possibility should also be handled as a potential error, even if
 # LeakSanitizer doesn't report anything
 
-if (
-    file_contents.find("ObjectDB instance was leaked at exit") != -1
-    or file_contents.find("ObjectDB instances were leaked at exit") != -1
-):
+if file_contents.find("ObjectDB instances leaked at exit") != -1:
     print("ERROR: Memory leak was found")
     sys.exit(54)
 
@@ -61,12 +57,6 @@ if file_contents.find("Assertion failed") != -1:
     print("ERROR: Assertion failed in project, check execution log for more info")
     sys.exit(55)
 
-if os.environ.get("GODOT_CHECK_CI_LOG_ALL_ERRORS"):
-    # If any occurrence of "ERROR:" is found in the log, we consider it a failure.
-    if file_contents.find("ERROR:") != -1:
-        print("ERROR: 'ERROR:' found in log and GODOT_CHECK_CI_LOG_ALL_ERRORS is set.")
-        sys.exit(56)
-
 # For now Godot leaks a lot of rendering stuff so for now we just show info
 # about it and this needs to be re-enabled after fixing this memory leaks.
 
diff --git a/engine/misc/scripts/install_accesskit.py b/engine/misc/scripts/install_accesskit.py
deleted file mode 100755
index 2d2789b7..00000000
--- a/engine/misc/scripts/install_accesskit.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ != "__main__":
-    raise SystemExit(f'Utility script "{__file__}" should not be used as a module!')
-
-import os
-import shutil
-import sys
-import urllib.request
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
-
-
-# Base Godot dependencies path
-# If cross-compiling (no LOCALAPPDATA), we install in `bin`
-deps_folder = os.getenv("LOCALAPPDATA")
-if deps_folder:
-    deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
-else:
-    deps_folder = os.path.join("bin", "build_deps")
-
-# AccessKit
-ac_version = "0.21.2"
-
-# Create dependencies folder
-if not os.path.exists(deps_folder):
-    os.makedirs(deps_folder)
-
-ac_filename = "accesskit-c-" + ac_version + ".zip"
-ac_archive = os.path.join(deps_folder, "accesskit.zip")
-ac_folder = os.path.join(deps_folder, "accesskit")
-
-if os.path.isfile(ac_archive):
-    os.remove(ac_archive)
-
-print(f"Downloading AccessKit {ac_filename} ...")
-urllib.request.urlretrieve(
-    f"https://github.com/godotengine/godot-accesskit-c-static/releases/download/{ac_version}/{ac_filename}",
-    ac_archive,
-)
-if os.path.exists(ac_folder):
-    print(f"Removing existing local AccessKit installation in {ac_folder} ...")
-    shutil.rmtree(ac_folder)
-print(f"Extracting AccessKit {ac_filename} to {ac_folder} ...")
-shutil.unpack_archive(ac_archive, deps_folder)
-os.remove(ac_archive)
-os.rename(os.path.join(deps_folder, "accesskit-c-" + ac_version), ac_folder)
-
-print("AccessKit installed successfully.\n")
diff --git a/engine/misc/scripts/install_angle.py b/engine/misc/scripts/install_angle.py
deleted file mode 100755
index abfafcec..00000000
--- a/engine/misc/scripts/install_angle.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import platform
-import shutil
-import sys
-import urllib.request
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
-
-from misc.utility.color import Ansi, color_print
-
-# Base Godot dependencies path
-# If cross-compiling (no LOCALAPPDATA), we install in `bin`
-deps_folder = os.getenv("LOCALAPPDATA")
-if deps_folder:
-    deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
-else:
-    deps_folder = os.path.join("bin", "build_deps")
-
-# ANGLE
-# Check for latest version: https://github.com/godotengine/godot-angle-static/releases/latest
-angle_version = "chromium/7219"
-angle_folder = os.path.join(deps_folder, "angle")
-
-# Create dependencies folder
-if not os.path.exists(deps_folder):
-    os.makedirs(deps_folder)
-
-# Mesa NIR
-print(f"Downloading ANGLE {angle_version} ...")
-archs = [
-    "arm64-llvm",
-    "x86_32-gcc",
-    "x86_32-llvm",
-    "x86_64-gcc",
-    "x86_64-llvm",
-]
-if platform.system() == "Windows":
-    # Only download MSVC libraries if we can build using it.
-    archs.append("arm64-msvc")
-    archs.append("x86_32-msvc")
-    archs.append("x86_64-msvc")
-elif platform.system() == "Darwin":
-    # Only download macOS/iOS libraries if we can build for these platforms.
-    archs.append("arm64-ios")
-    archs.append("arm64-ios-sim")
-    archs.append("arm64-macos")
-    archs.append("x86_64-macos")
-
-for arch in archs:
-    angle_filename = f"godot-angle-static-{arch}-release.zip"
-    angle_archive = os.path.join(deps_folder, angle_filename)
-    angle_folder = os.path.join(deps_folder, f"angle-{arch}")
-
-    if os.path.isfile(angle_archive):
-        os.remove(angle_archive)
-    print(f"Downloading ANGLE {angle_filename} ...")
-    urllib.request.urlretrieve(
-        f"https://github.com/godotengine/godot-angle-static/releases/download/{angle_version}/{angle_filename}",
-        angle_archive,
-    )
-    if os.path.exists(angle_folder):
-        print(f"Removing existing local ANGLE installation in {angle_folder} ...")
-        shutil.rmtree(angle_folder)
-    print(f"Extracting ANGLE {angle_filename} to {angle_folder} ...")
-    shutil.unpack_archive(angle_archive, angle_folder)
-    os.remove(angle_archive)
-print("ANGLE installed successfully.\n")
-
-# Complete message
-color_print(f'{Ansi.GREEN}All ANGLE components were installed to "{deps_folder}" successfully!')
-color_print(f'{Ansi.GREEN}You can now build Godot with statically linked ANGLE by running "scons angle=yes".')
diff --git a/engine/misc/scripts/install_winrt.py b/engine/misc/scripts/install_winrt.py
deleted file mode 100755
index ce69929c..00000000
--- a/engine/misc/scripts/install_winrt.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ != "__main__":
-    raise SystemExit(f'Utility script "{__file__}" should not be used as a module!')
-
-import os
-import shutil
-import sys
-import urllib.request
-
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
-
-
-# Base Godot dependencies path
-# If cross-compiling (no LOCALAPPDATA), we install in `bin`
-deps_folder = os.getenv("LOCALAPPDATA")
-if deps_folder:
-    deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
-else:
-    deps_folder = os.path.join("bin", "build_deps")
-
-# WinRT
-winrt_version = "72"
-
-# Create dependencies folder
-if not os.path.exists(deps_folder):
-    os.makedirs(deps_folder)
-
-winrt_filename = "winrt-headers.zip"
-winrt_archive = os.path.join(deps_folder, winrt_filename)
-winrt_folder = os.path.join(deps_folder, "winrt_mingw")
-
-if os.path.isfile(winrt_archive):
-    os.remove(winrt_archive)
-
-print(f"Downloading WinRT {winrt_filename} ...")
-urllib.request.urlretrieve(
-    f"https://github.com/bruvzg/winrt_mingw/releases/download/{winrt_version}/{winrt_filename}",
-    winrt_archive,
-)
-if os.path.exists(winrt_folder):
-    print(f"Removing existing local WinRT installation in {winrt_folder} ...")
-    shutil.rmtree(winrt_folder)
-print(f"Extracting WinRT {winrt_filename} to {winrt_folder} ...")
-shutil.unpack_archive(winrt_archive, winrt_folder)
-os.remove(winrt_archive)
-
-print("WinRT installed successfully.\n")
diff --git a/engine/misc/scripts/ucaps_fetch.py b/engine/misc/scripts/ucaps_fetch.py
index d173dfa1..84d33abd 100755
--- a/engine/misc/scripts/ucaps_fetch.py
+++ b/engine/misc/scripts/ucaps_fetch.py
@@ -16,7 +16,7 @@ if __name__ == "__main__":
 
 from methods import generate_copyright_header
 
-URL: Final[str] = "https://www.unicode.org/Public/17.0.0/ucd/UnicodeData.txt"
+URL: Final[str] = "https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt"
 
 
 lower_to_upper: list[tuple[str, str]] = []
diff --git a/engine/misc/scripts/unicode_ranges_fetch.py b/engine/misc/scripts/unicode_ranges_fetch.py
index e84ca754..40c7b874 100755
--- a/engine/misc/scripts/unicode_ranges_fetch.py
+++ b/engine/misc/scripts/unicode_ranges_fetch.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 # Script used to dump char ranges from
-# the Unicode Character Database to the `unicode_ranges.inc` file.
+# the Unicode Character Database to the `char_range.inc` file.
 # NOTE: This script is deliberately not integrated into the build system;
 # you should run it manually whenever you want to update the data.
 from __future__ import annotations
@@ -16,7 +16,7 @@ if __name__ == "__main__":
 
 from methods import generate_copyright_header
 
-URL: Final[str] = "https://www.unicode.org/Public/17.0.0/ucd/Blocks.txt"
+URL: Final[str] = "https://www.unicode.org/Public/16.0.0/ucd/Blocks.txt"
 
 
 ranges: list[tuple[str, str, str]] = []
diff --git a/engine/misc/scripts/validate_codeowners.py b/engine/misc/scripts/validate_codeowners.py
deleted file mode 100755
index 8b74e177..00000000
--- a/engine/misc/scripts/validate_codeowners.py
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ != "__main__":
-    raise SystemExit(f'Utility script "{__file__}" should not be used as a module!')
-
-import argparse
-import re
-import subprocess
-import sys
-
-sys.path.insert(0, "./")
-
-try:
-    from methods import print_error, print_info
-except ImportError:
-    raise SystemExit(f"Utility script {__file__} must be run from repository root!")
-
-
-def glob_to_regex(glob: str) -> re.Pattern[str]:
-    """Convert a CODEOWNERS glob to a RegEx pattern."""
-
-    # Heavily inspired by: https://github.com/hmarr/codeowners/blob/main/match.go
-
-    # Handle specific edgecases first.
-    if "***" in glob:
-        raise SyntaxError("Pattern cannot contain three consecutive asterisks")
-    if glob == "/":
-        raise SyntaxError('Standalone "/" will not match anything')
-    if not glob:
-        raise ValueError("Empty pattern")
-
-    segments = glob.split("/")
-    if not segments[0]:
-        # Leading slash; relative to root.
-        segments = segments[1:]
-    else:
-        # Check for single-segment pattern, which matches relative to any descendent path.
-        #  This is equivalent to a leading `**/`.
-        if len(segments) == 1 or (len(segments) == 2 and not segments[1]):
-            if segments[0] != "**":
-                segments.insert(0, "**")
-
-    if len(segments) > 1 and not segments[-1]:
-        # A trailing slash is equivalent to `/**`.
-        segments[-1] = "**"
-
-    last_index = len(segments) - 1
-    need_slash = False
-    pattern = r"\A"
-
-    for index, segment in enumerate(segments):
-        if segment == "**":
-            if index == 0 and index == last_index:
-                pattern += r".+"  # Pattern is just `**`; match everything.
-            elif index == 0:
-                pattern += r"(?:.+/)?"  # Pattern starts with `**`; match any leading path segment.
-                need_slash = False
-            elif index == last_index:
-                pattern += r"/.*"  # Pattern ends with `**`; match any trailing path segment.
-            else:
-                pattern += r"(?:/.+)?"  # Pattern contains `**`; match zero or more path segments.
-                need_slash = True
-
-        elif segment == "*":
-            if need_slash:
-                pattern += "/"
-            # Regular wildcard; match any non-separator characters.
-            pattern += r"[^/]+"
-            need_slash = True
-
-        else:
-            if need_slash:
-                pattern += "/"
-
-            escape = False
-            for char in segment:
-                if escape:
-                    escape = False
-                    pattern += re.escape(char)
-                    continue
-                elif char == "\\":
-                    escape = True
-                elif char == "*":
-                    # Multi-character wildcard.
-                    pattern += r"[^/]*"
-                elif char == "?":
-                    # Single-character wildcard.
-                    pattern += r"[^/]"
-                else:
-                    # Regular character
-                    pattern += re.escape(char)
-
-            if index == last_index:
-                pattern += r"(?:/.*)?"  # No trailing slash; match descendent paths.
-            need_slash = True
-
-    pattern += r"\Z"
-    return re.compile(pattern)
-
-
-RE_CODEOWNERS = re.compile(r"^(?P<code>[^#](?:\\ |[^\s])+) +(?P<owners>(?:[^#][^\s]+ ?)+)")
-
-
-def parse_codeowners() -> list[tuple[re.Pattern[str], list[str]]]:
-    codeowners = []
-    with open(".github/CODEOWNERS", encoding="utf-8", newline="\n") as file:
-        for line in reversed(file.readlines()):  # Lower items have higher precedence.
-            if match := RE_CODEOWNERS.match(line):
-                codeowners.append((glob_to_regex(match["code"]), match["owners"].split()))
-    return codeowners
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Utility script for validating CODEOWNERS assignment.")
-    parser.add_argument("files", nargs="*", help="A list of files to validate. If excluded, checks all owned files.")
-    parser.add_argument("-u", "--unowned", action="store_true", help="Only output files without an owner.")
-    args = parser.parse_args()
-
-    files: list[str] = args.files
-    if not files:
-        files = subprocess.run(["git", "ls-files"], text=True, capture_output=True).stdout.splitlines()
-
-    ret = 0
-    codeowners = parse_codeowners()
-
-    for file in files:
-        matched = False
-        for code, owners in codeowners:
-            if code.match(file):
-                matched = True
-                if not args.unowned:
-                    print_info(f"{file}: {owners}")
-                break
-        if not matched:
-            print_error(f"{file}: <UNOWNED>")
-            ret += 1
-
-    return ret
-
-
-try:
-    raise SystemExit(main())
-except KeyboardInterrupt:
-    import os
-    import signal
-
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-    os.kill(os.getpid(), signal.SIGINT)
diff --git a/engine/misc/scripts/validate_extension_api.sh b/engine/misc/scripts/validate_extension_api.sh
index b17f1edc..ffcbd053 100755
--- a/engine/misc/scripts/validate_extension_api.sh
+++ b/engine/misc/scripts/validate_extension_api.sh
@@ -69,7 +69,7 @@ while read -r dir; do
     get_expected_output "$dir"
 
     # Download the reference extension_api.json
-    wget -nv --retry-on-http-error=503 --tries=5 --timeout=60 -cO "$reference_file" "https://raw.githubusercontent.com/godotengine/godot-headers/godot-$reference_tag/extension_api.json" || has_problems=1
+    wget -nv --retry-on-http-error=503 --tries=5 --timeout=60 -cO "$reference_file" "https://raw.githubusercontent.com/godotengine/godot-cpp/godot-$reference_tag/gdextension/extension_api.json" || has_problems=1
     # Validate the current API against the reference
     "$1" --headless --validate-extension-api "$reference_file" 2>&1 | tee "$validate" | awk '!/^Validate extension JSON:/' - || true
     # Collect the expected and actual validation errors
diff --git a/engine/misc/scripts/validate_includes.py b/engine/misc/scripts/validate_includes.py
deleted file mode 100755
index dcedd330..00000000
--- a/engine/misc/scripts/validate_includes.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ != "__main__":
-    raise ImportError(f'Utility script "{__file__}" should not be used as a module!')
-
-import os
-from pathlib import Path
-
-if Path(os.getcwd()).as_posix() != (ROOT := Path(__file__).parent.parent.parent).as_posix():
-    raise RuntimeError(f'Utility script "{__file__}" must be run from the repository root!')
-
-import argparse
-import re
-from dataclasses import dataclass
-
-BASE_FOLDER = Path(__file__).resolve().parent.parent.parent
-RE_INCLUDES = re.compile(
-    r"^#(?P<keyword>include|import) "  # Both `include` and `import` keywords valid.
-    r'(?P<sequence>[<"])'  # Handle both styles of char wrappers. Does NOT handle macro expansion.
-    r'(?P<path>.+?)[>"]',  # Resolve path of include itself. Can safely assume the sequence matches.
-    re.RegexFlag.MULTILINE,
-)
-
-
-@dataclass
-class IncludeData:
-    path: str
-    is_angle: bool
-    is_import: bool
-
-    @staticmethod
-    def from_match(match: re.Match[str]):
-        items = match.groupdict()
-        return IncludeData(
-            items["path"],
-            items["sequence"] == "<",
-            items["keyword"] == "import",
-        )
-
-    def copy(self):
-        return IncludeData(self.path, self.is_angle, self.is_import)
-
-    def __str__(self):
-        return "#{keyword} {rbracket}{path}{lbracket}".format(
-            keyword="import" if self.is_import else "include",
-            rbracket="<" if self.is_angle else '"',
-            path=self.path,
-            lbracket=">" if self.is_angle else '"',
-        )
-
-
-def validate_includes(path: Path) -> int:
-    ret = 0
-    content = path.read_text(encoding="utf-8")
-
-    for data in map(IncludeData.from_match, RE_INCLUDES.finditer(content)):
-        original_data = data.copy()
-
-        if "\\" in data.path:
-            data.path = data.path.replace("\\", "/")
-
-        if data.path.startswith("thirdparty/"):
-            data.is_angle = True
-
-        if (relative_path := path.parent / data.path).exists():
-            # Relative includes are only permitted under certain circumstances.
-
-            if relative_path.name.split(".")[0] == path.name.split(".")[0]:
-                # Identical leading names permitted
-                pass
-
-            elif ("modules" in relative_path.parts and "modules" in path.parts) or (
-                "platform" in relative_path.parts and "platform" in path.parts
-            ):
-                # Modules and platforms can use relative includes if constrained to the module/platform itself.
-                pass
-
-            else:
-                data.path = relative_path.resolve().relative_to(BASE_FOLDER).as_posix()
-
-        if original_data != data:
-            content = content.replace(f"{original_data}", f"{data}")
-            ret += 1
-
-    if ret:
-        with open(path, "w", encoding="utf-8", newline="\n") as file:
-            file.write(content)
-
-    return ret
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Validate C/C++ includes, correcting if necessary")
-    parser.add_argument("files", nargs="+", help="A list of files to validate")
-    args = parser.parse_args()
-
-    ret = 0
-
-    for file in map(Path, args.files):
-        ret += validate_includes(file)
-
-    return ret
-
-
-try:
-    raise SystemExit(main())
-except KeyboardInterrupt:
-    import signal
-
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-    os.kill(os.getpid(), signal.SIGINT)
diff --git a/engine/modules/SCsub b/engine/modules/SCsub
index 69dfadfa..e987dde0 100644
--- a/engine/modules/SCsub
+++ b/engine/modules/SCsub
@@ -52,6 +52,7 @@ for name, path in env.module_list.items():
 
 # Generate header to be included in `tests/test_main.cpp` to run module-specific tests.
 if env["tests"]:
+    env.Append(CPPDEFINES=["TESTS_ENABLED"])
     env.CommandNoCache("modules_tests.gen.h", test_headers, env.Run(modules_builders.modules_tests_builder))
 
 # libmodules.a with only register_module_types.
diff --git a/engine/modules/bcdec/image_decompress_bcdec.cpp b/engine/modules/bcdec/image_decompress_bcdec.cpp
index dfc805d9..272db0e2 100644
--- a/engine/modules/bcdec/image_decompress_bcdec.cpp
+++ b/engine/modules/bcdec/image_decompress_bcdec.cpp
@@ -34,7 +34,7 @@
 #include "core/string/print_string.h"
 
 #define BCDEC_IMPLEMENTATION
-#include <thirdparty/misc/bcdec.h>
+#include "thirdparty/misc/bcdec.h"
 
 inline void bcdec_bc6h_half_s(const void *compressedBlock, void *decompressedBlock, int destinationPitch) {
 	bcdec_bc6h_half(compressedBlock, decompressedBlock, destinationPitch, true);
diff --git a/engine/modules/betsy/image_compress_betsy.cpp b/engine/modules/betsy/image_compress_betsy.cpp
index 7a620c4e..e689d7dd 100644
--- a/engine/modules/betsy/image_compress_betsy.cpp
+++ b/engine/modules/betsy/image_compress_betsy.cpp
@@ -30,28 +30,16 @@
 
 #include "image_compress_betsy.h"
 
+#include "core/config/project_settings.h"
+
+#include "betsy_bc1.h"
+
 #include "alpha_stitch.glsl.gen.h"
 #include "bc1.glsl.gen.h"
 #include "bc4.glsl.gen.h"
 #include "bc6h.glsl.gen.h"
-#include "betsy_bc1.h"
 #include "rgb_to_rgba.glsl.gen.h"
-
-#include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_context_driver.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_server.h"
-
-#if defined(VULKAN_ENABLED)
-#include "drivers/vulkan/rendering_context_driver_vulkan.h"
-#endif
-#if defined(METAL_ENABLED)
-#include "drivers/metal/rendering_context_driver_metal.h"
-#endif
 
 static Mutex betsy_mutex;
 static BetsyCompressor *betsy = nullptr;
diff --git a/engine/modules/betsy/image_compress_betsy.h b/engine/modules/betsy/image_compress_betsy.h
index 1eae8086..15b58894 100644
--- a/engine/modules/betsy/image_compress_betsy.h
+++ b/engine/modules/betsy/image_compress_betsy.h
@@ -32,11 +32,18 @@
 
 #include "core/io/image.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
 
-class RDShaderFile;
-class RenderingDevice;
-class RenderingContextDriver;
+#include "servers/rendering/rendering_device_binds.h"
+#include "servers/rendering/rendering_server_default.h"
+
+#if defined(VULKAN_ENABLED)
+#include "drivers/vulkan/rendering_context_driver_vulkan.h"
+#endif
+#if defined(METAL_ENABLED)
+#include "drivers/metal/rendering_context_driver_metal.h"
+#endif
 
 enum BetsyFormat {
 	BETSY_FORMAT_BC1,
diff --git a/engine/modules/camera/SCsub b/engine/modules/camera/SCsub
index 22555f29..750dc7c3 100644
--- a/engine/modules/camera/SCsub
+++ b/engine/modules/camera/SCsub
@@ -6,25 +6,19 @@ Import("env_modules")
 
 env_camera = env_modules.Clone()
 
-if env["platform"] in ["windows", "macos", "linuxbsd", "android", "ios", "visionos"]:
+if env["platform"] in ["windows", "macos", "linuxbsd", "android"]:
     env_camera.add_source_files(env.modules_sources, "register_types.cpp")
 
 if env["platform"] == "windows":
     env_camera.add_source_files(env.modules_sources, "camera_win.cpp")
 
 elif env["platform"] == "macos":
-    env_camera.add_source_files(env.modules_sources, "camera_apple.mm")
+    env_camera.add_source_files(env.modules_sources, "camera_macos.mm")
 
 elif env["platform"] == "android":
     env_camera.add_source_files(env.modules_sources, "camera_android.cpp")
     env.Append(LIBS=["camera2ndk", "mediandk"])
 
-elif env["platform"] in ["ios", "visionos"]:
-    ext_module_source = ["camera_apple.mm"]
-    ext_camera_lib = env_camera.add_library("#bin/libgodot_camera", ext_module_source)
-    env.Append(LIBS_EXTERNAL=[ext_camera_lib])
-    env.Append(MODULES_EXTERNAL=["_camera"])
-
 elif env["platform"] == "linuxbsd":
     env_camera.add_source_files(env.modules_sources, "camera_linux.cpp")
     env_camera.add_source_files(env.modules_sources, "camera_feed_linux.cpp")
diff --git a/engine/modules/camera/camera_android.cpp b/engine/modules/camera/camera_android.cpp
index f1ef9941..5fbeda0e 100644
--- a/engine/modules/camera/camera_android.cpp
+++ b/engine/modules/camera/camera_android.cpp
@@ -31,7 +31,6 @@
 #include "camera_android.h"
 
 #include "core/os/os.h"
-
 #include "platform/android/display_server_android.h"
 #include "platform/android/java_godot_io_wrapper.h"
 #include "platform/android/os_android.h"
@@ -73,7 +72,7 @@ public:
 
 #ifndef IF_EQUAL_RETURN
 #define MAKE_FORMAT_CONST(suffix) AIMAGE_FORMAT_##suffix
-#define IF_EQUAL_RETURN(param, val) \
+#define IF_EQUAL_RETURN(param, val)      \
 	if (MAKE_FORMAT_CONST(val) == param) \
 	return #val
 #endif
@@ -90,7 +89,8 @@ String GetFormatName(const int32_t &format) {
 // CameraFeedAndroid - Subclass for our camera feed on Android
 
 CameraFeedAndroid::CameraFeedAndroid(ACameraManager *manager, ACameraMetadata *metadata, const char *id,
-		CameraFeed::FeedPosition position, int32_t orientation) {
+		CameraFeed::FeedPosition position, int32_t orientation) :
+		CameraFeed() {
 	this->manager = manager;
 	this->metadata = metadata;
 	this->orientation = orientation;
diff --git a/engine/modules/camera/camera_android.h b/engine/modules/camera/camera_android.h
index ebd392a6..7cdc1248 100644
--- a/engine/modules/camera/camera_android.h
+++ b/engine/modules/camera/camera_android.h
@@ -40,7 +40,6 @@
 #include <camera/NdkCameraManager.h>
 #include <camera/NdkCameraMetadataTags.h>
 #include <media/NdkImageReader.h>
-
 #include <optional>
 
 enum class CameraFacing {
diff --git a/engine/modules/camera/camera_feed_linux.cpp b/engine/modules/camera/camera_feed_linux.cpp
index 70490a01..8c3f717f 100644
--- a/engine/modules/camera/camera_feed_linux.cpp
+++ b/engine/modules/camera/camera_feed_linux.cpp
@@ -350,7 +350,8 @@ bool CameraFeedLinux::set_format(int p_index, const Dictionary &p_parameters) {
 	return true;
 }
 
-CameraFeedLinux::CameraFeedLinux(const String &p_device_name) {
+CameraFeedLinux::CameraFeedLinux(const String &p_device_name) :
+		CameraFeed() {
 	device_name = p_device_name;
 	_query_device(device_name);
 }
diff --git a/engine/modules/camera/camera_linux.h b/engine/modules/camera/camera_linux.h
index f1920b72..ca1eeb0a 100644
--- a/engine/modules/camera/camera_linux.h
+++ b/engine/modules/camera/camera_linux.h
@@ -32,7 +32,6 @@
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "core/templates/safe_refcount.h"
 #include "servers/camera/camera_server.h"
 
 class CameraLinux : public CameraServer {
diff --git a/engine/modules/camera/camera_apple.h b/engine/modules/camera/camera_macos.h
similarity index 93%
rename from engine/modules/camera/camera_apple.h
rename to engine/modules/camera/camera_macos.h
index 82b5e7de..9713b66d 100644
--- a/engine/modules/camera/camera_apple.h
+++ b/engine/modules/camera/camera_macos.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  camera_apple.h                                                        */
+/*  camera_macos.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -35,11 +35,11 @@
 
 #include "servers/camera/camera_server.h"
 
-class CameraApple : public CameraServer {
-	GDSOFTCLASS(CameraApple, CameraServer);
+class CameraMacOS : public CameraServer {
+	GDSOFTCLASS(CameraMacOS, CameraServer);
 
 public:
-	CameraApple() = default;
+	CameraMacOS() = default;
 
 	void update_feeds();
 	void set_monitoring_feeds(bool p_monitoring_feeds) override;
diff --git a/engine/modules/camera/camera_apple.mm b/engine/modules/camera/camera_macos.mm
similarity index 77%
rename from engine/modules/camera/camera_apple.mm
rename to engine/modules/camera/camera_macos.mm
index 5943bbd6..7e3b78e2 100644
--- a/engine/modules/camera/camera_apple.mm
+++ b/engine/modules/camera/camera_macos.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  camera_apple.mm                                                       */
+/*  camera_macos.mm                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -31,14 +31,11 @@
 ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!!
 // If you fix something here, make sure you fix it there as well!
 
-#import "camera_apple.h"
+#import "camera_macos.h"
 
 #include "servers/camera/camera_feed.h"
 
 #import <AVFoundation/AVFoundation.h>
-#ifdef IOS_ENABLED
-#import <UIKit/UIKit.h>
-#endif
 
 //////////////////////////////////////////////////////////////////////////
 // MyCaptureSession - This is a little helper class so we can capture our frames
@@ -66,30 +63,23 @@
 		width[1] = 0;
 		height[1] = 0;
 
-#ifdef IOS_ENABLED
-		if ([p_device lockForConfiguration:&error]) {
-			if ([p_device isFocusModeSupported:AVCaptureFocusModeContinuousAutoFocus]) {
-				[p_device setFocusMode:AVCaptureFocusModeContinuousAutoFocus];
-			}
-			if ([p_device isExposureModeSupported:AVCaptureExposureModeContinuousAutoExposure]) {
-				[p_device setExposureMode:AVCaptureExposureModeContinuousAutoExposure];
-			}
-			if ([p_device isWhiteBalanceModeSupported:AVCaptureWhiteBalanceModeContinuousAutoWhiteBalance]) {
-				[p_device setWhiteBalanceMode:AVCaptureWhiteBalanceModeContinuousAutoWhiteBalance];
-			}
+#ifdef APPLE_EMBEDDED_ENABLED
+		[p_device lockForConfiguration:&error];
 
-			[p_device unlockForConfiguration];
-		}
-#endif // IOS_ENABLED
+		[p_device setFocusMode:AVCaptureFocusModeLocked];
+		[p_device setExposureMode:AVCaptureExposureModeLocked];
+		[p_device setWhiteBalanceMode:AVCaptureWhiteBalanceModeLocked];
+
+		[p_device unlockForConfiguration];
+#endif // APPLE_EMBEDDED_ENABLED
 
 		[self beginConfiguration];
 
-#ifdef IOS_ENABLED
+#ifdef APPLE_EMBEDDED_ENABLED
 		self.sessionPreset = AVCaptureSessionPreset1280x720;
-#endif // IOS_ENABLED
-
-		input = [[AVCaptureDeviceInput alloc] initWithDevice:p_device error:&error];
+#endif // APPLE_EMBEDDED_ENABLED
 
+		input = [AVCaptureDeviceInput deviceInputWithDevice:p_device error:&error];
 		if (!input) {
 			print_line("Couldn't get input device for camera");
 			[self commitConfiguration];
@@ -229,28 +219,6 @@
 	// set our texture...
 	feed->set_ycbcr_images(img[0], img[1]);
 
-#ifdef IOS_ENABLED
-	UIInterfaceOrientation orientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
-
-	Transform2D display_transform;
-	switch (orientation) {
-		case UIInterfaceOrientationPortrait: {
-			display_transform = Transform2D(0.0, -1.0, -1.0, 0.0, 1.0, 1.0);
-		} break;
-		case UIInterfaceOrientationLandscapeRight: {
-			display_transform = Transform2D(1.0, 0.0, 0.0, -1.0, 0.0, 1.0);
-		} break;
-		case UIInterfaceOrientationLandscapeLeft: {
-			display_transform = Transform2D(-1.0, 0.0, 0.0, 1.0, 1.0, 0.0);
-		} break;
-		default: {
-			display_transform = Transform2D(0.0, 1.0, 1.0, 0.0, 0.0, 0.0);
-		} break;
-	}
-
-	feed->set_transform(display_transform);
-#endif // IOS_ENABLED
-
 	// and unlock
 	CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
 }
@@ -258,10 +226,10 @@
 @end
 
 //////////////////////////////////////////////////////////////////////////
-// CameraFeedApple - Subclass for camera feeds in macOS
+// CameraFeedMacOS - Subclass for camera feeds in macOS
 
-class CameraFeedApple : public CameraFeed {
-	GDSOFTCLASS(CameraFeedApple, CameraFeed);
+class CameraFeedMacOS : public CameraFeed {
+	GDSOFTCLASS(CameraFeedMacOS, CameraFeed);
 
 private:
 	AVCaptureDevice *device;
@@ -270,8 +238,8 @@ private:
 public:
 	AVCaptureDevice *get_device() const;
 
-	CameraFeedApple();
-	~CameraFeedApple();
+	CameraFeedMacOS();
+	~CameraFeedMacOS();
 
 	void set_device(AVCaptureDevice *p_device);
 
@@ -279,23 +247,22 @@ public:
 	void deactivate_feed() override;
 };
 
-AVCaptureDevice *CameraFeedApple::get_device() const {
+AVCaptureDevice *CameraFeedMacOS::get_device() const {
 	return device;
 }
 
-CameraFeedApple::CameraFeedApple() {
+CameraFeedMacOS::CameraFeedMacOS() {
 	device = nullptr;
 	capture_session = nullptr;
-	transform = Transform2D(1.0, 0.0, 0.0, 1.0, 0.0, 0.0); /* should re-orientate this based on device orientation */
 }
 
-CameraFeedApple::~CameraFeedApple() {
+CameraFeedMacOS::~CameraFeedMacOS() {
 	if (is_active()) {
 		deactivate_feed();
 	}
 }
 
-void CameraFeedApple::set_device(AVCaptureDevice *p_device) {
+void CameraFeedMacOS::set_device(AVCaptureDevice *p_device) {
 	device = p_device;
 
 	// get some info
@@ -309,14 +276,14 @@ void CameraFeedApple::set_device(AVCaptureDevice *p_device) {
 	};
 }
 
-bool CameraFeedApple::activate_feed() {
+bool CameraFeedMacOS::activate_feed() {
 	if (capture_session) {
 		// Already recording.
 		return true;
 	}
 
 	// Start camera capture, check permission.
-	if (@available(macOS 10.14, iOS 14.0, visionOS 1.0, *)) {
+	if (@available(macOS 10.14, *)) {
 		AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
 		if (status == AVAuthorizationStatusAuthorized) {
 			capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
@@ -344,7 +311,7 @@ bool CameraFeedApple::activate_feed() {
 	}
 }
 
-void CameraFeedApple::deactivate_feed() {
+void CameraFeedMacOS::deactivate_feed() {
 	// end camera capture if we have one
 	if (capture_session) {
 		[capture_session cleanup];
@@ -357,7 +324,7 @@ void CameraFeedApple::deactivate_feed() {
 // when devices are connected/disconnected
 
 @interface MyDeviceNotifications : NSObject {
-	CameraApple *camera_server;
+	CameraMacOS *camera_server;
 }
 
 @end
@@ -368,7 +335,7 @@ void CameraFeedApple::deactivate_feed() {
 	camera_server->update_feeds();
 }
 
-- (id)initForServer:(CameraApple *)p_server {
+- (id)initForServer:(CameraMacOS *)p_server {
 	if (self = [super init]) {
 		camera_server = p_server;
 
@@ -389,31 +356,13 @@ void CameraFeedApple::deactivate_feed() {
 MyDeviceNotifications *device_notifications = nil;
 
 //////////////////////////////////////////////////////////////////////////
-// CameraApple - Subclass for our camera server on macOS
+// CameraMacOS - Subclass for our camera server on macOS
 
-void CameraApple::update_feeds() {
+void CameraMacOS::update_feeds() {
 	NSArray<AVCaptureDevice *> *devices = nullptr;
-#ifdef APPLE_EMBEDDED_ENABLED
-	{
-		NSMutableArray *deviceTypes = [NSMutableArray array];
-		if (@available(iOS 14.0, visionOS 2.1, *)) {
-			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
-		}
-#ifdef IOS_ENABLED
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTelephotoCamera];
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInDualCamera];
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInDualWideCamera];
-		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTripleCamera];
-#endif // IOS_ENABLED
-		AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
-		devices = session.devices;
-	}
-#else // APPLE_EMBEDDED_ENABLED
 #if defined(__x86_64__)
 	if (@available(macOS 10.15, *)) {
-#endif // __x86_64__
+#endif
 		AVCaptureDeviceDiscoverySession *session;
 		if (@available(macOS 14.0, *)) {
 			session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternal, AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeContinuityCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
@@ -425,12 +374,11 @@ void CameraApple::update_feeds() {
 	} else {
 		devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
 	}
-#endif // __x86_64__
-#endif // APPLE_EMBEDDED_ENABLED
+#endif
 
 	// Deactivate feeds that are gone before removing them.
 	for (int i = feeds.size() - 1; i >= 0; i--) {
-		Ref<CameraFeedApple> feed = (Ref<CameraFeedApple>)feeds[i];
+		Ref<CameraFeedMacOS> feed = (Ref<CameraFeedMacOS>)feeds[i];
 		if (feed.is_null()) {
 			continue;
 		}
@@ -446,7 +394,7 @@ void CameraApple::update_feeds() {
 	for (AVCaptureDevice *device in devices) {
 		bool found = false;
 		for (int i = 0; i < feeds.size() && !found; i++) {
-			Ref<CameraFeedApple> feed = (Ref<CameraFeedApple>)feeds[i];
+			Ref<CameraFeedMacOS> feed = (Ref<CameraFeedMacOS>)feeds[i];
 			if (feed.is_null()) {
 				continue;
 			}
@@ -456,7 +404,7 @@ void CameraApple::update_feeds() {
 		};
 
 		if (!found) {
-			Ref<CameraFeedApple> newfeed;
+			Ref<CameraFeedMacOS> newfeed;
 			newfeed.instantiate();
 			newfeed->set_device(device);
 
@@ -466,7 +414,7 @@ void CameraApple::update_feeds() {
 	emit_signal(SNAME(CameraServer::feeds_updated_signal_name));
 }
 
-void CameraApple::set_monitoring_feeds(bool p_monitoring_feeds) {
+void CameraMacOS::set_monitoring_feeds(bool p_monitoring_feeds) {
 	if (p_monitoring_feeds == monitoring_feeds) {
 		return;
 	}
@@ -483,14 +431,3 @@ void CameraApple::set_monitoring_feeds(bool p_monitoring_feeds) {
 		device_notifications = nil;
 	}
 }
-
-#ifdef APPLE_EMBEDDED_ENABLED
-
-void register_camera_external_module() {
-	CameraServer::make_default<CameraApple>();
-}
-
-void unregister_camera_external_module() {
-}
-
-#endif // APPLE_EMBEDDED_ENABLED
diff --git a/engine/modules/camera/camera_win.cpp b/engine/modules/camera/camera_win.cpp
index 5cff8702..7871595d 100644
--- a/engine/modules/camera/camera_win.cpp
+++ b/engine/modules/camera/camera_win.cpp
@@ -30,8 +30,6 @@
 
 #include "camera_win.h"
 
-#include "servers/camera/camera_feed.h"
-
 ///@TODO sorry guys, I got about 80% through implementing this using DirectShow only
 // to find out Microsoft deprecated half the API and its replacement is as confusing
 // as they could make it. Joey suggested looking into libuvc which offers a more direct
diff --git a/engine/modules/camera/camera_win.h b/engine/modules/camera/camera_win.h
index 9d98766a..60b4858a 100644
--- a/engine/modules/camera/camera_win.h
+++ b/engine/modules/camera/camera_win.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "servers/camera/camera_feed.h"
 #include "servers/camera/camera_server.h"
 
 class CameraWindows : public CameraServer {
diff --git a/engine/modules/camera/config.py b/engine/modules/camera/config.py
index 7bcf7655..d699d4e4 100644
--- a/engine/modules/camera/config.py
+++ b/engine/modules/camera/config.py
@@ -3,14 +3,7 @@ def can_build(env, platform):
 
     if sys.platform.startswith("freebsd") or sys.platform.startswith("openbsd"):
         return False
-    return (
-        platform == "macos"
-        or platform == "windows"
-        or platform == "linuxbsd"
-        or platform == "android"
-        or platform == "ios"
-        or platform == "visionos"
-    )
+    return platform == "macos" or platform == "windows" or platform == "linuxbsd" or platform == "android"
 
 
 def configure(env):
diff --git a/engine/modules/camera/register_types.cpp b/engine/modules/camera/register_types.cpp
index 5f4969de..c56ddfe8 100644
--- a/engine/modules/camera/register_types.cpp
+++ b/engine/modules/camera/register_types.cpp
@@ -37,7 +37,7 @@
 #include "camera_win.h"
 #endif
 #if defined(MACOS_ENABLED)
-#include "camera_apple.h"
+#include "camera_macos.h"
 #endif
 #if defined(ANDROID_ENABLED)
 #include "camera_android.h"
@@ -55,7 +55,7 @@ void initialize_camera_module(ModuleInitializationLevel p_level) {
 	CameraServer::make_default<CameraWindows>();
 #endif
 #if defined(MACOS_ENABLED)
-	CameraServer::make_default<CameraApple>();
+	CameraServer::make_default<CameraMacOS>();
 #endif
 #if defined(ANDROID_ENABLED)
 	CameraServer::make_default<CameraAndroid>();
diff --git a/engine/modules/csg/csg_shape.cpp b/engine/modules/csg/csg_shape.cpp
index 914937ab..13226a83 100644
--- a/engine/modules/csg/csg_shape.cpp
+++ b/engine/modules/csg/csg_shape.cpp
@@ -30,27 +30,18 @@
 
 #include "csg_shape.h"
 
-#include "core/config/engine.h"
-#include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/navigation_mesh.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifdef DEV_ENABLED
 #include "core/io/json.h"
 #endif // DEV_ENABLED
-
+#include "core/math/geometry_2d.h"
+#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation_mesh.h"
 #ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
 
 #include <manifold/manifold.h>
 
-#include <cfloat> // FLT_EPSILON
-
 #ifndef NAVIGATION_3D_DISABLED
 Callable CSGShape3D::_navmesh_source_geometry_parsing_callback;
 RID CSGShape3D::_navmesh_source_geometry_parser;
@@ -204,26 +195,6 @@ void CSGShape3D::set_collision_priority(real_t p_priority) {
 real_t CSGShape3D::get_collision_priority() const {
 	return collision_priority;
 }
-
-void CSGShape3D::set_autosmooth(bool p_smooth) {
-	autosmooth = p_smooth;
-	_make_dirty();
-	notify_property_list_changed();
-}
-
-bool CSGShape3D::is_autosmooth() const {
-	return autosmooth;
-}
-
-void CSGShape3D::set_smoothing_angle(const float p_angle) {
-	smoothing_angle = p_angle;
-	_make_dirty();
-}
-
-float CSGShape3D::get_smoothing_angle() const {
-	return smoothing_angle;
-}
-
 #endif // PHYSICS_3D_DISABLED
 
 bool CSGShape3D::is_root_shape() const {
@@ -605,14 +576,10 @@ void CSGShape3D::update_shape() {
 	CSGBrush *n = _get_brush();
 	ERR_FAIL_NULL_MSG(n, "Cannot get CSGBrush.");
 
+	AHashMap<Vector3, Vector3> vec_map;
+
 	Vector<int> face_count;
 	face_count.resize(n->materials.size() + 1);
-
-	Vector<Vector3> smooth_faces;
-	LocalVector<Vector3> smooth_vertex;
-	smooth_faces.resize(n->faces.size());
-	smooth_vertex.resize(n->faces.size() * 3);
-
 	for (int i = 0; i < face_count.size(); i++) {
 		face_count.write[i] = 0;
 	}
@@ -622,72 +589,23 @@ void CSGShape3D::update_shape() {
 		ERR_CONTINUE(mat < -1 || mat >= face_count.size());
 		int idx = mat == -1 ? face_count.size() - 1 : mat;
 
-		Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
+		if (n->faces[i].smooth) {
+			Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
+
+			for (int j = 0; j < 3; j++) {
+				Vector3 v = n->faces[i].vertices[j];
+				Vector3 *vec = vec_map.getptr(v);
+				if (vec) {
+					*vec += p.normal;
+				} else {
+					vec_map.insert(v, p.normal);
+				}
+			}
+		}
 
-		smooth_faces.write[i] = p.normal;
-		// Not sure if resize populates the LocalVector.
-		smooth_vertex[i * 3 + 0] = Vector3(p.normal);
-		smooth_vertex[i * 3 + 1] = Vector3(p.normal);
-		smooth_vertex[i * 3 + 2] = Vector3(p.normal);
-		// We could use a AHashMap Vector3, int to store the number of connections of each vertex position and end the loop earlier. But I'm not sure if the performance gains outweigh the cost.
 		face_count.write[idx]++;
 	}
 
-	if (autosmooth) {
-		// We could add a `use_groups` property later to only apply autosmooth on smooth faces or respect smoothing groups in some way.
-		if (smoothing_angle > 0.1) {
-			float smooth_angle_rad = Math::cos(Math::deg_to_rad(smoothing_angle));
-			for (int i = 0; i < smooth_faces.size(); i++) {
-				for (int k = 0; k < 3; k++) {
-					int curr_vert = i * 3 + k;
-					Vector3 vert_a = n->faces[i].vertices[k];
-					for (int j = i + 1; j < smooth_faces.size(); j++) {
-						// Compare the angles of faces instead of vertices.
-						if (smooth_faces[i].dot(smooth_faces[j]) > smooth_angle_rad) {
-							for (int h = 0; h < 3; h++) {
-								Vector3 vert_b = n->faces[j].vertices[h];
-								if (vert_a == vert_b) {
-									int curr_j = j * 3 + h;
-									smooth_vertex[curr_vert] += smooth_faces[j];
-									smooth_vertex[curr_j] += smooth_faces[i];
-									break;
-								}
-							}
-						}
-					}
-					smooth_vertex[curr_vert].normalize();
-				}
-			}
-		}
-	} else {
-		for (int i = 0; i < smooth_faces.size(); i++) {
-			bool face_is_smooth = n->faces[i].smooth;
-			if (face_is_smooth) {
-				for (int k = 0; k < 3; k++) {
-					Vector3 vert_a = n->faces[i].vertices[k];
-					int curr_vert = i * 3 + k;
-					// Skip the other vertices of the face as they will never occupy the same position.
-					for (int j = i + 1; j < smooth_faces.size(); j++) {
-						// Preparing for when and if we replace Vector of bool for Vector of int smoothing groups. for now, face_is_smooth is always true.
-						if (face_is_smooth == n->faces[j].smooth) {
-							for (int h = 0; h < 3; h++) {
-								Vector3 vert_b = n->faces[j].vertices[h];
-								if (vert_a == vert_b) {
-									int curr_j = j * 3 + h;
-									smooth_vertex[curr_vert] += smooth_faces[j];
-									smooth_vertex[curr_j] += smooth_faces[i];
-									// Skip the other 2 vertices as only one vertex of each face can connect with one vertex of other face.
-									break;
-								}
-							}
-						}
-					}
-					smooth_vertex[curr_vert].normalize();
-				}
-			}
-		}
-	}
-
 	Vector<ShapeUpdateSurface> surfaces;
 
 	surfaces.resize(face_count.size());
@@ -729,12 +647,19 @@ void CSGShape3D::update_shape() {
 
 			int last = surfaces[idx].last_added;
 
-			int face_pos_i = i * 3;
+			Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
 
 			for (int j = 0; j < 3; j++) {
 				Vector3 v = n->faces[i].vertices[j];
 
-				Vector3 normal = smooth_vertex[face_pos_i + j];
+				Vector3 normal = p.normal;
+
+				if (n->faces[i].smooth) {
+					Vector3 *ptr = vec_map.getptr(v);
+					if (ptr) {
+						normal = ptr->normalized();
+					}
+				}
 
 				if (n->faces[i].invert) {
 					normal = -normal;
@@ -803,8 +728,6 @@ void CSGShape3D::update_shape() {
 
 	set_base(root_mesh->get_rid());
 
-	update_gizmos();
-
 #ifndef PHYSICS_3D_DISABLED
 	_update_collision_faces();
 #endif // PHYSICS_3D_DISABLED
@@ -1030,19 +953,6 @@ void CSGShape3D::_validate_property(PropertyInfo &p_property) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-
-	if (p_property.name == "smoothing_angle") {
-		if (!autosmooth || (is_inside_tree() && !is_root_shape())) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	}
-
-	if (p_property.name == "autosmooth") {
-		if (is_inside_tree() && !is_root_shape()) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	}
-
 	bool is_collision_prefixed = p_property.name.begins_with("collision_");
 	if ((is_collision_prefixed || p_property.name.begins_with("use_collision")) && is_inside_tree() && !is_root_shape()) {
 		//hide collision if not root
@@ -1127,15 +1037,6 @@ void CSGShape3D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("bake_static_mesh"), &CSGShape3D::bake_static_mesh);
 
-	ClassDB::bind_method(D_METHOD("set_autosmooth", "autosmooth"), &CSGShape3D::set_autosmooth);
-	ClassDB::bind_method(D_METHOD("is_autosmooth"), &CSGShape3D::is_autosmooth);
-
-	ClassDB::bind_method(D_METHOD("set_smoothing_angle", "smoothing_angle"), &CSGShape3D::set_smoothing_angle);
-	ClassDB::bind_method(D_METHOD("get_smoothing_angle"), &CSGShape3D::get_smoothing_angle);
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autosmooth"), "set_autosmooth", "is_autosmooth");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "smoothing_angle", PROPERTY_HINT_RANGE, "0,180,0.1,degrees"), "set_smoothing_angle", "get_smoothing_angle");
-
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "Union,Intersection,Subtraction"), "set_operation", "get_operation");
 #ifndef DISABLE_DEPRECATED
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "snap", PROPERTY_HINT_RANGE, "0.000001,1,0.000001,suffix:m", PROPERTY_USAGE_NONE), "set_snap", "get_snap");
diff --git a/engine/modules/csg/csg_shape.h b/engine/modules/csg/csg_shape.h
index 247c58f0..da3ee688 100644
--- a/engine/modules/csg/csg_shape.h
+++ b/engine/modules/csg/csg_shape.h
@@ -39,9 +39,8 @@
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
-#include <thirdparty/misc/mikktspace.h>
+#include "thirdparty/misc/mikktspace.h"
 
-class Mesh;
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
 
@@ -68,9 +67,6 @@ private:
 	bool last_visible = false;
 	float snap = 0.001;
 
-	bool autosmooth = false;
-	float smoothing_angle = 50.0;
-
 #ifndef PHYSICS_3D_DISABLED
 	bool use_collision = false;
 	uint32_t collision_layer = 1;
@@ -162,12 +158,6 @@ public:
 	void set_collision_priority(real_t p_priority);
 	real_t get_collision_priority() const;
 
-	void set_autosmooth(bool p_smooth);
-	bool is_autosmooth() const;
-
-	void set_smoothing_angle(const float p_angle);
-	float get_smoothing_angle() const;
-
 #ifndef DISABLE_DEPRECATED
 	void set_snap(float p_snap);
 	float get_snap() const;
diff --git a/engine/modules/csg/doc_classes/CSGBox3D.xml b/engine/modules/csg/doc_classes/CSGBox3D.xml
index b152177d..f56cb355 100644
--- a/engine/modules/csg/doc_classes/CSGBox3D.xml
+++ b/engine/modules/csg/doc_classes/CSGBox3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGBox3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGBox3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG Box shape.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGCombiner3D.xml b/engine/modules/csg/doc_classes/CSGCombiner3D.xml
index 58896587..d785b2f8 100644
--- a/engine/modules/csg/doc_classes/CSGCombiner3D.xml
+++ b/engine/modules/csg/doc_classes/CSGCombiner3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCombiner3D" inherits="CSGShape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGCombiner3D" inherits="CSGShape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG node that allows you to combine other CSG modifiers.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGCylinder3D.xml b/engine/modules/csg/doc_classes/CSGCylinder3D.xml
index 848df1bf..f722b569 100644
--- a/engine/modules/csg/doc_classes/CSGCylinder3D.xml
+++ b/engine/modules/csg/doc_classes/CSGCylinder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCylinder3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGCylinder3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG Cylinder shape.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGMesh3D.xml b/engine/modules/csg/doc_classes/CSGMesh3D.xml
index 1dae96b7..3dad3ef7 100644
--- a/engine/modules/csg/doc_classes/CSGMesh3D.xml
+++ b/engine/modules/csg/doc_classes/CSGMesh3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGMesh3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGMesh3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG Mesh shape that uses a mesh resource.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGPolygon3D.xml b/engine/modules/csg/doc_classes/CSGPolygon3D.xml
index e2ba329a..2f26f13a 100644
--- a/engine/modules/csg/doc_classes/CSGPolygon3D.xml
+++ b/engine/modules/csg/doc_classes/CSGPolygon3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPolygon3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGPolygon3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Extrudes a 2D polygon shape to create a 3D mesh.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGPrimitive3D.xml b/engine/modules/csg/doc_classes/CSGPrimitive3D.xml
index 5602cbfb..6afbf4a3 100644
--- a/engine/modules/csg/doc_classes/CSGPrimitive3D.xml
+++ b/engine/modules/csg/doc_classes/CSGPrimitive3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPrimitive3D" inherits="CSGShape3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGPrimitive3D" inherits="CSGShape3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Base class for CSG primitives.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGShape3D.xml b/engine/modules/csg/doc_classes/CSGShape3D.xml
index 49ab3c7e..848c7b72 100644
--- a/engine/modules/csg/doc_classes/CSGShape3D.xml
+++ b/engine/modules/csg/doc_classes/CSGShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGShape3D" inherits="GeometryInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGShape3D" inherits="GeometryInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The CSG base class.
 	</brief_description>
@@ -74,10 +74,6 @@
 		</method>
 	</methods>
 	<members>
-		<member name="autosmooth" type="bool" setter="set_autosmooth" getter="is_autosmooth" default="false">
-			Enables automatic smoothing. This overrides any smoothing on the CSG node and instead uses [member smoothing_angle] to calculate normals based on the angle between faces.
-			Children of a [CSGCombiner3D] node will be treated as a single mesh.
-		</member>
 		<member name="calculate_tangents" type="bool" setter="set_calculate_tangents" getter="is_calculating_tangents" default="true">
 			Calculate tangents for the CSG shape which allows the use of normal and height maps. This is only applied on the root shape, this setting is ignored on any child. Setting this to [code]false[/code] can speed up shape generation slightly.
 		</member>
@@ -95,10 +91,6 @@
 		<member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape3D.Operation" default="0">
 			The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent.
 		</member>
-		<member name="smoothing_angle" type="float" setter="set_smoothing_angle" getter="get_smoothing_angle" default="50.0">
-			When autosmooth is enabled, faces with an angle between them greater than this will be smoothed, while faces with a smaller angle will remain sharp.
-			Note: An angle lower than 0.1 will cause all smoothing to be disabled, this can be used to increase performance.
-		</member>
 		<member name="snap" type="float" setter="set_snap" getter="get_snap" deprecated="The CSG library no longer uses snapping.">
 			This property does nothing.
 		</member>
diff --git a/engine/modules/csg/doc_classes/CSGSphere3D.xml b/engine/modules/csg/doc_classes/CSGSphere3D.xml
index 644e0223..a1197944 100644
--- a/engine/modules/csg/doc_classes/CSGSphere3D.xml
+++ b/engine/modules/csg/doc_classes/CSGSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGSphere3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGSphere3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG Sphere shape.
 	</brief_description>
diff --git a/engine/modules/csg/doc_classes/CSGTorus3D.xml b/engine/modules/csg/doc_classes/CSGTorus3D.xml
index 73280568..9bef522b 100644
--- a/engine/modules/csg/doc_classes/CSGTorus3D.xml
+++ b/engine/modules/csg/doc_classes/CSGTorus3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGTorus3D" inherits="CSGPrimitive3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSGTorus3D" inherits="CSGPrimitive3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A CSG Torus shape.
 	</brief_description>
diff --git a/engine/modules/csg/editor/csg_gizmos.cpp b/engine/modules/csg/editor/csg_gizmos.cpp
index 945e4513..d26e0ad0 100644
--- a/engine/modules/csg/editor/csg_gizmos.cpp
+++ b/engine/modules/csg/editor/csg_gizmos.cpp
@@ -30,8 +30,6 @@
 
 #include "csg_gizmos.h"
 
-#include "core/math/geometry_3d.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/gizmos/gizmo_3d_helper.h"
@@ -42,7 +40,6 @@
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
-#include "scene/main/scene_tree.h"
 
 void CSGShapeEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
@@ -419,14 +416,17 @@ void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	Ref<Material> handles_material = get_material("handles");
 
 	p_gizmo->add_lines(lines, material);
+	p_gizmo->add_collision_segments(lines);
 
-	Ref<ArrayMesh> collision_mesh;
-	collision_mesh.instantiate();
-	Array collision_array;
-	collision_array.resize(Mesh::ARRAY_MAX);
-	collision_array[Mesh::ARRAY_VERTEX] = faces;
-	collision_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, collision_array);
-	p_gizmo->add_collision_triangles(collision_mesh->generate_triangle_mesh());
+	if (cs->is_root_shape()) {
+		Array csg_meshes = cs->get_meshes();
+		if (csg_meshes.size() == 2) {
+			Ref<Mesh> csg_mesh = csg_meshes[1];
+			if (csg_mesh.is_valid()) {
+				p_gizmo->add_collision_triangles(csg_mesh->generate_triangle_mesh());
+			}
+		}
+	}
 
 	if (p_gizmo->is_selected()) {
 		// Draw a translucent representation of the CSG node
diff --git a/engine/modules/csg/register_types.cpp b/engine/modules/csg/register_types.cpp
index 57347ef9..b157e329 100644
--- a/engine/modules/csg/register_types.cpp
+++ b/engine/modules/csg/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "csg_shape.h"
 
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/csg_gizmos.h"
 #endif
diff --git a/engine/modules/csg/tests/test_csg.h b/engine/modules/csg/tests/test_csg.h
index 4476947e..73860051 100644
--- a/engine/modules/csg/tests/test_csg.h
+++ b/engine/modules/csg/tests/test_csg.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
+#include "../csg.h"
 #include "../csg_shape.h"
 
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 #include "tests/test_macros.h"
 
 namespace TestCSG {
diff --git a/engine/modules/dds/dds_enums.h b/engine/modules/dds/dds_enums.h
index 176c6c5c..aa5fcf9d 100644
--- a/engine/modules/dds/dds_enums.h
+++ b/engine/modules/dds/dds_enums.h
@@ -164,8 +164,6 @@ enum DDSFormat {
 	DDS_LUMINANCE,
 	DDS_LUMINANCE_ALPHA,
 	DDS_LUMINANCE_ALPHA_4,
-	DDS_RG8,
-	DDS_R8,
 	DDS_MAX
 };
 
@@ -225,6 +223,4 @@ static const DDSFormatInfo dds_format_info[DDS_MAX] = {
 	{ "GRAYSCALE", false, 1, 1, Image::FORMAT_L8 },
 	{ "GRAYSCALE_ALPHA", false, 1, 2, Image::FORMAT_LA8 },
 	{ "GRAYSCALE_ALPHA_4", false, 1, 1, Image::FORMAT_LA8 },
-	{ "RG8", false, 1, 2, Image::FORMAT_RG8 },
-	{ "R8", false, 1, 1, Image::FORMAT_R8 },
 };
diff --git a/engine/modules/dds/register_types.cpp b/engine/modules/dds/register_types.cpp
index ec60d8e3..fc831b9f 100644
--- a/engine/modules/dds/register_types.cpp
+++ b/engine/modules/dds/register_types.cpp
@@ -33,8 +33,6 @@
 #include "image_saver_dds.h"
 #include "texture_loader_dds.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "scene/resources/texture.h"
 
 static Ref<ResourceFormatDDS> resource_loader_dds;
diff --git a/engine/modules/dds/tests/test_dds.h b/engine/modules/dds/tests/test_dds.h
index 90507590..3029bc9c 100644
--- a/engine/modules/dds/tests/test_dds.h
+++ b/engine/modules/dds/tests/test_dds.h
@@ -34,8 +34,8 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
 #include "core/io/image.h"
+#include "tests/core/config/test_project_settings.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
diff --git a/engine/modules/dds/texture_loader_dds.cpp b/engine/modules/dds/texture_loader_dds.cpp
index 8db4f6a9..8cc3f54a 100644
--- a/engine/modules/dds/texture_loader_dds.cpp
+++ b/engine/modules/dds/texture_loader_dds.cpp
@@ -34,7 +34,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
@@ -76,9 +75,7 @@ DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
 		case DXGI_R32_FLOAT: {
 			return DDS_R32F;
 		}
-		case DXGI_R8_UNORM: {
-			return DDS_R8;
-		}
+		case DXGI_R8_UNORM:
 		case DXGI_A8_UNORM: {
 			return DDS_LUMINANCE;
 		}
@@ -92,7 +89,7 @@ DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
 			return DDS_R16I;
 		}
 		case DXGI_R8G8_UNORM: {
-			return DDS_RG8;
+			return DDS_LUMINANCE_ALPHA;
 		}
 		case DXGI_R9G9B9E5: {
 			return DDS_RGB9E5;
@@ -651,10 +648,6 @@ static Vector<Ref<Image>> _dds_load_images_from_buffer(Ref<FileAccess> p_f, DDSF
 				r_dds_format = DDS_BGRX8;
 			} else if (format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) {
 				r_dds_format = DDS_RGBX8;
-			} else if (format_rgb_bits == 8 && format_red_mask == 0xff && format_green_mask == 0 && format_blue_mask == 0) {
-				r_dds_format = DDS_R8;
-			} else if (format_rgb_bits == 16 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0) {
-				r_dds_format = DDS_RG8;
 			}
 		}
 
diff --git a/engine/modules/enet/doc_classes/ENetConnection.xml b/engine/modules/enet/doc_classes/ENetConnection.xml
index f21f4cfa..940d3be7 100644
--- a/engine/modules/enet/doc_classes/ENetConnection.xml
+++ b/engine/modules/enet/doc_classes/ENetConnection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ENetConnection" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ENetConnection" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A wrapper class for an [url=http://enet.bespin.org/group__host.html]ENetHost[/url].
 	</brief_description>
diff --git a/engine/modules/enet/doc_classes/ENetMultiplayerPeer.xml b/engine/modules/enet/doc_classes/ENetMultiplayerPeer.xml
index 4f4d5ff5..c49d16eb 100644
--- a/engine/modules/enet/doc_classes/ENetMultiplayerPeer.xml
+++ b/engine/modules/enet/doc_classes/ENetMultiplayerPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ENetMultiplayerPeer" inherits="MultiplayerPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ENetMultiplayerPeer" inherits="MultiplayerPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A MultiplayerPeer implementation using the [url=http://enet.bespin.org/index.html]ENet[/url] library.
 	</brief_description>
diff --git a/engine/modules/enet/doc_classes/ENetPacketPeer.xml b/engine/modules/enet/doc_classes/ENetPacketPeer.xml
index f5858ff1..266ce8d9 100644
--- a/engine/modules/enet/doc_classes/ENetPacketPeer.xml
+++ b/engine/modules/enet/doc_classes/ENetPacketPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ENetPacketPeer" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ENetPacketPeer" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A wrapper class for an [url=http://enet.bespin.org/group__peer.html]ENetPeer[/url].
 	</brief_description>
diff --git a/engine/modules/enet/enet_connection.cpp b/engine/modules/enet/enet_connection.cpp
index a88ed5c4..9b764b1a 100644
--- a/engine/modules/enet/enet_connection.cpp
+++ b/engine/modules/enet/enet_connection.cpp
@@ -34,7 +34,6 @@
 
 #include "core/io/compression.h"
 #include "core/io/ip.h"
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void ENetConnection::broadcast(enet_uint8 p_channel, ENetPacket *p_packet) {
diff --git a/engine/modules/enet/enet_multiplayer_peer.cpp b/engine/modules/enet/enet_multiplayer_peer.cpp
index 837a2cdb..da41378b 100644
--- a/engine/modules/enet/enet_multiplayer_peer.cpp
+++ b/engine/modules/enet/enet_multiplayer_peer.cpp
@@ -30,8 +30,6 @@
 
 #include "enet_multiplayer_peer.h"
 
-#include "core/object/class_db.h"
-
 void ENetMultiplayerPeer::set_target_peer(int p_peer) {
 	target_peer = p_peer;
 }
@@ -479,7 +477,7 @@ void ENetMultiplayerPeer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_host"), &ENetMultiplayerPeer::get_host);
 	ClassDB::bind_method(D_METHOD("get_peer", "id"), &ENetMultiplayerPeer::get_peer);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "host", PROPERTY_HINT_RESOURCE_TYPE, ENetConnection::get_class_static(), PROPERTY_USAGE_NONE), "", "get_host");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "host", PROPERTY_HINT_RESOURCE_TYPE, "ENetConnection", PROPERTY_USAGE_NONE), "", "get_host");
 }
 
 ENetMultiplayerPeer::ENetMultiplayerPeer() {
diff --git a/engine/modules/enet/enet_multiplayer_peer.h b/engine/modules/enet/enet_multiplayer_peer.h
index a6d882f1..e56df733 100644
--- a/engine/modules/enet/enet_multiplayer_peer.h
+++ b/engine/modules/enet/enet_multiplayer_peer.h
@@ -32,6 +32,7 @@
 
 #include "enet_connection.h"
 
+#include "core/crypto/crypto.h"
 #include "scene/main/multiplayer_peer.h"
 
 #include <enet/enet.h>
diff --git a/engine/modules/enet/enet_packet_peer.cpp b/engine/modules/enet/enet_packet_peer.cpp
index 36a00d51..9ec68465 100644
--- a/engine/modules/enet/enet_packet_peer.cpp
+++ b/engine/modules/enet/enet_packet_peer.cpp
@@ -30,8 +30,6 @@
 
 #include "enet_packet_peer.h"
 
-#include "core/object/class_db.h"
-
 void ENetPacketPeer::peer_disconnect(int p_data) {
 	ERR_FAIL_NULL(peer);
 	enet_peer_disconnect(peer, p_data);
@@ -184,9 +182,6 @@ int ENetPacketPeer::get_packet_flags() const {
 
 void ENetPacketPeer::_on_disconnect() {
 	if (peer) {
-#ifdef GODOT_ENET
-		enet_peer_socket_destroy(peer);
-#endif
 		peer->data = nullptr;
 	}
 	peer = nullptr;
@@ -261,9 +256,6 @@ void ENetPacketPeer::_bind_methods() {
 ENetPacketPeer::ENetPacketPeer(ENetPeer *p_peer) {
 	peer = p_peer;
 	peer->data = this;
-#ifdef GODOT_ENET
-	enet_peer_socket_bind(peer);
-#endif
 }
 
 ENetPacketPeer::~ENetPacketPeer() {
diff --git a/engine/modules/enet/register_types.cpp b/engine/modules/enet/register_types.cpp
index 6c87de79..5787f9c2 100644
--- a/engine/modules/enet/register_types.cpp
+++ b/engine/modules/enet/register_types.cpp
@@ -35,7 +35,6 @@
 #include "enet_packet_peer.h"
 
 #include "core/error/error_macros.h"
-#include "core/object/class_db.h"
 
 static bool enet_ok = false;
 
diff --git a/engine/modules/fbx/doc_classes/EditorSceneFormatImporterFBX2GLTF.xml b/engine/modules/fbx/doc_classes/EditorSceneFormatImporterFBX2GLTF.xml
index 6f2778ca..3bf4e7dd 100644
--- a/engine/modules/fbx/doc_classes/EditorSceneFormatImporterFBX2GLTF.xml
+++ b/engine/modules/fbx/doc_classes/EditorSceneFormatImporterFBX2GLTF.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneFormatImporterFBX2GLTF" inherits="EditorSceneFormatImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="EditorSceneFormatImporterFBX2GLTF" inherits="EditorSceneFormatImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Importer for the [code].fbx[/code] scene file format.
 	</brief_description>
diff --git a/engine/modules/fbx/doc_classes/EditorSceneFormatImporterUFBX.xml b/engine/modules/fbx/doc_classes/EditorSceneFormatImporterUFBX.xml
index 0a9b603a..cab58b64 100644
--- a/engine/modules/fbx/doc_classes/EditorSceneFormatImporterUFBX.xml
+++ b/engine/modules/fbx/doc_classes/EditorSceneFormatImporterUFBX.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneFormatImporterUFBX" inherits="EditorSceneFormatImporter" api_type="editor" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="EditorSceneFormatImporterUFBX" inherits="EditorSceneFormatImporter" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Import FBX files using the ufbx library.
 	</brief_description>
diff --git a/engine/modules/fbx/doc_classes/FBXDocument.xml b/engine/modules/fbx/doc_classes/FBXDocument.xml
index 810aec33..db1d77c0 100644
--- a/engine/modules/fbx/doc_classes/FBXDocument.xml
+++ b/engine/modules/fbx/doc_classes/FBXDocument.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FBXDocument" inherits="GLTFDocument" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="FBXDocument" inherits="GLTFDocument" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Handles FBX documents.
 	</brief_description>
diff --git a/engine/modules/fbx/doc_classes/FBXState.xml b/engine/modules/fbx/doc_classes/FBXState.xml
index 91fcb2a3..88c23181 100644
--- a/engine/modules/fbx/doc_classes/FBXState.xml
+++ b/engine/modules/fbx/doc_classes/FBXState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FBXState" inherits="GLTFState" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="FBXState" inherits="GLTFState" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
index a58556a3..db2b4f97 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
+++ b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
@@ -30,12 +30,9 @@
 
 #include "editor_scene_importer_fbx2gltf.h"
 
-#include "editor_scene_importer_ufbx.h"
-
 #include "core/config/project_settings.h"
-#include "core/io/resource_importer.h"
-#include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
+#include "editor_scene_importer_ufbx.h"
 
 #include "modules/gltf/gltf_document.h"
 
diff --git a/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp b/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
index 091621be..a0d1bd93 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
+++ b/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
@@ -34,7 +34,6 @@
 #include "editor_scene_importer_fbx2gltf.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_importer.h"
 
 void EditorSceneFormatImporterUFBX::get_extensions(List<String> *r_extensions) const {
 	r_extensions->push_back("fbx");
diff --git a/engine/modules/fbx/fbx_document.cpp b/engine/modules/fbx/fbx_document.cpp
index da57edaf..7ad89d1c 100644
--- a/engine/modules/fbx/fbx_document.cpp
+++ b/engine/modules/fbx/fbx_document.cpp
@@ -30,14 +30,12 @@
 
 #include "fbx_document.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/config_file.h"
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
 #include "core/io/image.h"
-#include "core/io/resource_loader.h"
 #include "core/math/color.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/camera_3d.h"
diff --git a/engine/modules/fbx/fbx_state.cpp b/engine/modules/fbx/fbx_state.cpp
index 37e2b23e..0b42a865 100644
--- a/engine/modules/fbx/fbx_state.cpp
+++ b/engine/modules/fbx/fbx_state.cpp
@@ -30,8 +30,6 @@
 
 #include "fbx_state.h"
 
-#include "core/object/class_db.h"
-
 void FBXState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_allow_geometry_helper_nodes"), &FBXState::get_allow_geometry_helper_nodes);
 	ClassDB::bind_method(D_METHOD("set_allow_geometry_helper_nodes", "allow"), &FBXState::set_allow_geometry_helper_nodes);
diff --git a/engine/modules/fbx/fbx_state.h b/engine/modules/fbx/fbx_state.h
index 94e93fac..dff450c7 100644
--- a/engine/modules/fbx/fbx_state.h
+++ b/engine/modules/fbx/fbx_state.h
@@ -32,7 +32,9 @@
 
 #include "modules/gltf/gltf_defines.h"
 #include "modules/gltf/gltf_state.h"
+#include "modules/gltf/structures/gltf_skeleton.h"
 #include "modules/gltf/structures/gltf_skin.h"
+#include "modules/gltf/structures/gltf_texture.h"
 
 #include <ufbx.h>
 
diff --git a/engine/modules/fbx/register_types.cpp b/engine/modules/fbx/register_types.cpp
index 4bb19752..c1a2bd5b 100644
--- a/engine/modules/fbx/register_types.cpp
+++ b/engine/modules/fbx/register_types.cpp
@@ -30,17 +30,13 @@
 
 #include "register_types.h"
 
+#include "../gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "fbx_document.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
-#include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scene_importer_fbx2gltf.h"
 #include "editor/editor_scene_importer_ufbx.h"
-//
+
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 
@@ -59,8 +55,8 @@ static void _editor_init() {
 #endif // TOOLS_ENABLED
 
 #define FBX_REGISTER_DOCUMENT_EXTENSION(m_doc_ext_class) \
-	Ref<m_doc_ext_class> extension_##m_doc_ext_class; \
-	extension_##m_doc_ext_class.instantiate(); \
+	Ref<m_doc_ext_class> extension_##m_doc_ext_class;    \
+	extension_##m_doc_ext_class.instantiate();           \
 	FBXDocument::register_gltf_document_extension(extension_##m_doc_ext_class);
 
 void initialize_fbx_module(ModuleInitializationLevel p_level) {
diff --git a/engine/modules/gdscript/SCsub b/engine/modules/gdscript/SCsub
index f39b1a0f..8f50bf95 100644
--- a/engine/modules/gdscript/SCsub
+++ b/engine/modules/gdscript/SCsub
@@ -25,6 +25,5 @@ if env.editor_build:
 
 
 if env["tests"]:
-    # TODO: Handle test creation magic without needing to pass macro.
     env_gdscript.Append(CPPDEFINES=["TESTS_ENABLED"])
     env_gdscript.add_source_files(env.modules_sources, "./tests/*.cpp")
diff --git a/engine/modules/gdscript/config.py b/engine/modules/gdscript/config.py
index 25278db6..ecd33a5d 100644
--- a/engine/modules/gdscript/config.py
+++ b/engine/modules/gdscript/config.py
@@ -11,10 +11,7 @@ def get_doc_classes():
     return [
         "@GDScript",
         "GDScript",
-        "GDScriptLanguageProtocol",
         "GDScriptSyntaxHighlighter",
-        "GDScriptTextDocument",
-        "GDScriptWorkspace",
     ]
 
 
diff --git a/engine/modules/gdscript/doc_classes/@GDScript.xml b/engine/modules/gdscript/doc_classes/@GDScript.xml
index 635560a7..28b0ca55 100644
--- a/engine/modules/gdscript/doc_classes/@GDScript.xml
+++ b/engine/modules/gdscript/doc_classes/@GDScript.xml
@@ -133,7 +133,7 @@
 				- A constant from the [enum Variant.Type] enumeration, for example [constant TYPE_INT].
 				- An [Object]-derived class which exists in [ClassDB], for example [Node].
 				- A [Script] (you can use any class, including inner one).
-				Unlike the right operand of the [code]is[/code] operator, [param type] can be a non-constant value. The [code]is[/code] operator supports more features (such as typed arrays and dictionaries). Use the operator instead of this method if you do not need to check the type dynamically.
+				Unlike the right operand of the [code]is[/code] operator, [param type] can be a non-constant value. The [code]is[/code] operator supports more features (such as typed arrays). Use the operator instead of this method if you do not need to check the type dynamically.
 				[b]Examples:[/b]
 				[codeblock]
 				print(is_instance_of(a, TYPE_INT))
@@ -142,7 +142,7 @@
 				print(is_instance_of(a, MyClass.InnerClass))
 				[/codeblock]
 				[b]Note:[/b] If [param value] and/or [param type] are freed objects (see [method @GlobalScope.is_instance_valid]), or [param type] is not one of the above options, this method will raise a runtime error.
-				See also [method @GlobalScope.typeof], [method Object.is_class], [method Object.get_script], [method Array.is_same_typed] (and other [Array] methods), [method Dictionary.is_same_typed] (and other [Dictionary] methods).
+				See also [method @GlobalScope.typeof], [method type_exists], [method Array.is_same_typed] (and other [Array] methods).
 			</description>
 		</method>
 		<method name="len">
@@ -266,7 +266,7 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="type_exists" deprecated="Use [method ClassDB.class_exists] instead.">
+		<method name="type_exists">
 			<return type="bool" />
 			<param index="0" name="type" type="StringName" />
 			<description>
diff --git a/engine/modules/gdscript/doc_classes/GDScript.xml b/engine/modules/gdscript/doc_classes/GDScript.xml
index 636c7975..c3fa59dc 100644
--- a/engine/modules/gdscript/doc_classes/GDScript.xml
+++ b/engine/modules/gdscript/doc_classes/GDScript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScript" inherits="Script" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GDScript" inherits="Script" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A script implemented in the GDScript programming language.
 	</brief_description>
diff --git a/engine/modules/gdscript/doc_classes/GDScriptLanguageProtocol.xml b/engine/modules/gdscript/doc_classes/GDScriptLanguageProtocol.xml
deleted file mode 100644
index 400154ef..00000000
--- a/engine/modules/gdscript/doc_classes/GDScriptLanguageProtocol.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScriptLanguageProtocol" inherits="JSONRPC" api_type="editor" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
-	<brief_description>
-		GDScript language server.
-	</brief_description>
-	<description>
-		Provides access to certain features that are implemented in the language server.
-		[b]Note:[/b] This class is not a language server client that can be used to access LSP functionality. It only provides access to a limited set of features that is implemented using the same technical foundation as the language server.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="get_text_document" deprecated="[GDScriptTextDocument] is deprecated.">
-			<return type="GDScriptTextDocument" />
-			<description>
-				Returns the language server's [GDScriptTextDocument] instance.
-			</description>
-		</method>
-		<method name="get_workspace">
-			<return type="GDScriptWorkspace" />
-			<description>
-				Returns the language server's [GDScriptWorkspace] instance.
-			</description>
-		</method>
-		<method name="initialize" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Dictionary" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="initialized" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-		<method name="is_initialized" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if the language server was initialized by a language server client, [code]false[/code] otherwise.
-			</description>
-		</method>
-		<method name="is_smart_resolve_enabled" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if the language server is providing the smart resolve feature, [code]false[/code] otherwise. The feature can be configured through the editor settings.
-			</description>
-		</method>
-		<method name="notify_client" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="void" />
-			<param index="0" name="method" type="String" />
-			<param index="1" name="params" type="Variant" default="null" />
-			<param index="2" name="client_id" type="int" default="-1" />
-			<description>
-			</description>
-		</method>
-		<method name="on_client_connected" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="int" enum="Error" />
-			<description>
-			</description>
-		</method>
-		<method name="on_client_disconnected" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="void" />
-			<param index="0" name="client_id" type="int" />
-			<description>
-			</description>
-		</method>
-	</methods>
-</class>
diff --git a/engine/modules/gdscript/doc_classes/GDScriptSyntaxHighlighter.xml b/engine/modules/gdscript/doc_classes/GDScriptSyntaxHighlighter.xml
index 099bb2d1..63a92229 100644
--- a/engine/modules/gdscript/doc_classes/GDScriptSyntaxHighlighter.xml
+++ b/engine/modules/gdscript/doc_classes/GDScriptSyntaxHighlighter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScriptSyntaxHighlighter" inherits="EditorSyntaxHighlighter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GDScriptSyntaxHighlighter" inherits="EditorSyntaxHighlighter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A GDScript syntax highlighter that can be used with [TextEdit] and [CodeEdit] nodes.
 	</brief_description>
diff --git a/engine/modules/gdscript/doc_classes/GDScriptTextDocument.xml b/engine/modules/gdscript/doc_classes/GDScriptTextDocument.xml
deleted file mode 100644
index 9a6eb185..00000000
--- a/engine/modules/gdscript/doc_classes/GDScriptTextDocument.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScriptTextDocument" inherits="RefCounted" api_type="editor" deprecated="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
-	<brief_description>
-		Document related language server functionality.
-	</brief_description>
-	<description>
-		Provides language server functionality related to documents.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="codeLens" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="colorPresentation" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="completion" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="declaration" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Variant" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="definition" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="didChange" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-		<method name="didClose" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-		<method name="didOpen" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-		<method name="didSave" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-		<method name="documentLink" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="documentSymbol" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="foldingRange" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="hover" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Variant" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="nativeSymbol" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Variant" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="prepareRename" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Variant" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="references" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Array" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="rename" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Dictionary" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="resolve" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Dictionary" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="show_native_symbol_in_editor" deprecated="Use [method ScriptEditor.goto_help] instead.">
-			<return type="void" />
-			<param index="0" name="symbol_id" type="String" />
-			<description>
-			</description>
-		</method>
-		<method name="signatureHelp" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="Variant" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="willSaveWaitUntil" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Variant" />
-			<description>
-			</description>
-		</method>
-	</methods>
-</class>
diff --git a/engine/modules/gdscript/doc_classes/GDScriptWorkspace.xml b/engine/modules/gdscript/doc_classes/GDScriptWorkspace.xml
deleted file mode 100644
index e49f4031..00000000
--- a/engine/modules/gdscript/doc_classes/GDScriptWorkspace.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScriptWorkspace" inherits="RefCounted" api_type="editor" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
-	<brief_description>
-		Workspace related language server functionality.
-	</brief_description>
-	<description>
-		Provides language server functionality related to the workspace.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="apply_new_signal" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="void" />
-			<param index="0" name="obj" type="Object" />
-			<param index="1" name="function" type="String" />
-			<param index="2" name="args" type="PackedStringArray" />
-			<description>
-			</description>
-		</method>
-		<method name="didDeleteFiles" deprecated="Accessing LSP endpoints directly might lead to unwanted side effects. Connect to the server via TCP, like a regular language server client.">
-			<return type="void" />
-			<param index="0" name="params" type="Dictionary" />
-			<description>
-			</description>
-		</method>
-		<method name="generate_script_api">
-			<return type="Dictionary" />
-			<param index="0" name="path" type="String" />
-			<description>
-				Returns the interface of the script in a machine-readable format.
-			</description>
-		</method>
-		<method name="get_file_path">
-			<return type="String" />
-			<param index="0" name="uri" type="String" />
-			<description>
-				Converts a URI to a file path.
-			</description>
-		</method>
-		<method name="get_file_uri" qualifiers="const">
-			<return type="String" />
-			<param index="0" name="path" type="String" />
-			<description>
-				Converts a file path to a URI.
-			</description>
-		</method>
-		<method name="parse_local_script" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="int" enum="Error" />
-			<param index="0" name="path" type="String" />
-			<description>
-			</description>
-		</method>
-		<method name="parse_script" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="int" enum="Error" />
-			<param index="0" name="path" type="String" />
-			<param index="1" name="content" type="String" />
-			<description>
-			</description>
-		</method>
-		<method name="publish_diagnostics" deprecated="Might result in unwanted side effects for connected clients.">
-			<return type="void" />
-			<param index="0" name="path" type="String" />
-			<description>
-			</description>
-		</method>
-	</methods>
-</class>
diff --git a/engine/modules/gdscript/editor/gdscript_docgen.cpp b/engine/modules/gdscript/editor/gdscript_docgen.cpp
index 8357887b..3d57db7f 100644
--- a/engine/modules/gdscript/editor/gdscript_docgen.cpp
+++ b/engine/modules/gdscript/editor/gdscript_docgen.cpp
@@ -33,7 +33,6 @@
 #include "../gdscript.h"
 
 #include "core/config/project_settings.h"
-#include "core/doc_data.h"
 
 HashMap<String, String> GDScriptDocGen::singletons;
 
@@ -316,11 +315,6 @@ String GDScriptDocGen::docvalue_from_expression(const GDP::ExpressionNode *p_exp
 			const GDP::IdentifierNode *id = static_cast<const GDP::IdentifierNode *>(p_expression);
 			return id->name;
 		} break;
-		case GDP::Node::LAMBDA: {
-			const GDP::LambdaNode *lambda = static_cast<const GDP::LambdaNode *>(p_expression);
-			const GDP::IdentifierNode *id = lambda->function->identifier;
-			return id != nullptr ? id->name : "<anonymous lambda>";
-		} break;
 		default: {
 			// Nothing to do.
 		} break;
@@ -439,9 +433,10 @@ void GDScriptDocGen::_generate_docs(GDScript *p_script, const GDP::ClassNode *p_
 					method_doc.qualifiers += "static";
 				}
 
-				if (func_name == "_init" || func_name == "_static_init") {
+				if (func_name == "_init") {
 					method_doc.return_type = "void";
-				} else if (!m_func->get_datatype().is_variant()) {
+				} else if (m_func->return_type) {
+					// `m_func->return_type->get_datatype()` is a metatype.
 					_doctype_from_gdtype(m_func->get_datatype(), method_doc.return_type, method_doc.return_enum, true);
 				} else if (!m_func->body->has_return) {
 					// If no `return` statement, then return type is `void`, not `Variant`.
diff --git a/engine/modules/gdscript/editor/gdscript_docgen.h b/engine/modules/gdscript/editor/gdscript_docgen.h
index 5975c4b7..360906fe 100644
--- a/engine/modules/gdscript/editor/gdscript_docgen.h
+++ b/engine/modules/gdscript/editor/gdscript_docgen.h
@@ -32,6 +32,8 @@
 
 #include "../gdscript_parser.h"
 
+#include "core/doc_data.h"
+
 class GDScriptDocGen {
 	using GDP = GDScriptParser;
 	using GDType = GDP::DataType;
diff --git a/engine/modules/gdscript/editor/gdscript_highlighter.cpp b/engine/modules/gdscript/editor/gdscript_highlighter.cpp
index 45435f53..a6f03409 100644
--- a/engine/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/engine/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -35,8 +35,8 @@
 
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
-#include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
+#include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/text_edit.h"
 
 Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_line) {
diff --git a/engine/modules/gdscript/editor/gdscript_highlighter.h b/engine/modules/gdscript/editor/gdscript_highlighter.h
index 0cec1a52..e6116d74 100644
--- a/engine/modules/gdscript/editor/gdscript_highlighter.h
+++ b/engine/modules/gdscript/editor/gdscript_highlighter.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "editor/script/syntax_highlighters.h"
+#include "editor/script/script_editor_plugin.h"
 
 class GDScriptSyntaxHighlighter : public EditorSyntaxHighlighter {
 	GDCLASS(GDScriptSyntaxHighlighter, EditorSyntaxHighlighter)
diff --git a/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp b/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
index 9e7a54cc..7026797c 100644
--- a/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
+++ b/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
@@ -450,7 +450,6 @@ GDScriptEditorTranslationParserPlugin::GDScriptEditorTranslationParserPlugin() {
 	first_arg_patterns.insert("add_radio_check_item");
 	first_arg_patterns.insert("add_separator");
 	first_arg_patterns.insert("add_submenu_item");
-	first_arg_patterns.insert("add_submenu_node_item");
 
 	second_arg_patterns.insert("set_tab_title");
 	second_arg_patterns.insert("add_icon_check_item");
diff --git a/engine/modules/gdscript/gdscript.cpp b/engine/modules/gdscript/gdscript.cpp
index d286f797..8b133961 100644
--- a/engine/modules/gdscript/gdscript.cpp
+++ b/engine/modules/gdscript/gdscript.cpp
@@ -38,10 +38,6 @@
 #include "gdscript_tokenizer_buffer.h"
 #include "gdscript_warning.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/gdscript_docgen.h"
 #endif
@@ -54,6 +50,7 @@
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/io/file_access.h"
+
 #include "scene/resources/packed_scene.h"
 #include "scene/scene_string_names.h"
 
@@ -227,17 +224,16 @@ Variant GDScript::_new(const Variant **p_args, int p_argcount, Callable::CallErr
 	ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant());
 	if (_baseptr->native.ptr()) {
 		owner = _baseptr->native->instantiate();
-
-		RefCounted *r = Object::cast_to<RefCounted>(owner);
-		if (r) {
-			ref = Ref<RefCounted>(r);
-		}
 	} else {
-		ref = memnew(RefCounted); // By default, no base means use reference.
-		owner = ref.ptr();
+		owner = memnew(RefCounted); //by default, no base means use reference
 	}
 	ERR_FAIL_NULL_V_MSG(owner, Variant(), "Can't inherit from a virtual class.");
 
+	RefCounted *r = Object::cast_to<RefCounted>(owner);
+	if (r) {
+		ref = Ref<RefCounted>(r);
+	}
+
 	GDScriptInstance *instance = _create_instance(p_args, p_argcount, owner, r_error);
 	if (!instance) {
 		if (ref.is_null()) {
@@ -648,7 +644,7 @@ void GDScript::_update_exports_down(bool p_base_exports_changed) {
 		return;
 	}
 
-	HashSet<ObjectID> copy(inheriters_cache); //might get modified
+	HashSet<ObjectID> copy = inheriters_cache; //might get modified
 
 	for (const ObjectID &E : copy) {
 		Object *id = ObjectDB::get_instance(E);
@@ -824,10 +820,10 @@ Error GDScript::reload(bool p_keep_state) {
 	}
 	if (err) {
 		if (EngineDebugger::is_active()) {
-			GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), parser.get_errors().front()->get().start_line, "Parser Error: " + parser.get_errors().front()->get().message);
+			GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), parser.get_errors().front()->get().line, "Parser Error: " + parser.get_errors().front()->get().message);
 		}
 		// TODO: Show all error messages.
-		_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_errors().front()->get().start_line, ("Parse Error: " + parser.get_errors().front()->get().message).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
+		_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_errors().front()->get().line, ("Parse Error: " + parser.get_errors().front()->get().message).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
 		reloading = false;
 		return ERR_PARSE_ERROR;
 	}
@@ -837,12 +833,12 @@ Error GDScript::reload(bool p_keep_state) {
 
 	if (err) {
 		if (EngineDebugger::is_active()) {
-			GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), parser.get_errors().front()->get().start_line, "Parser Error: " + parser.get_errors().front()->get().message);
+			GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), parser.get_errors().front()->get().line, "Parser Error: " + parser.get_errors().front()->get().message);
 		}
 
 		const List<GDScriptParser::ParserError>::Element *e = parser.get_errors().front();
 		while (e != nullptr) {
-			_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), e->get().start_line, ("Parse Error: " + e->get().message).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
+			_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), e->get().line, ("Parse Error: " + e->get().message).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
 			e = e->next();
 		}
 		reloading = false;
@@ -931,6 +927,10 @@ const Variant GDScript::get_rpc_config() const {
 	return rpc_config;
 }
 
+void GDScript::unload_static() const {
+	GDScriptCache::remove_script(fully_qualified_name);
+}
+
 Variant GDScript::callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	GDScript *top = this;
 	while (top) {
@@ -945,19 +945,9 @@ Variant GDScript::callp(const StringName &p_method, const Variant **p_args, int
 		top = top->base.ptr();
 	}
 
-	{
-		Variant ret = Script::callp(p_method, p_args, p_argcount, r_error);
-		if (r_error.error != Callable::CallError::CALL_ERROR_INVALID_METHOD) {
-			return ret;
-		}
-	}
+	//none found, regular
 
-	if (native.is_valid()) {
-		return native->callp(p_method, p_args, p_argcount, r_error);
-	}
-
-	r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
-	return Variant();
+	return Script::callp(p_method, p_args, p_argcount, r_error);
 }
 
 bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
@@ -1105,15 +1095,7 @@ void GDScript::set_path(const String &p_path, bool p_take_over) {
 	String old_path = path;
 	path = p_path;
 	path_valid = true;
-
-	String old_base = GDScript::canonicalize_path(old_path);
-	if (!old_base.is_empty() && fully_qualified_name.begins_with(old_base)) {
-		fully_qualified_name = GDScript::canonicalize_path(p_path) + fully_qualified_name.substr(old_base.length());
-	}
-
-	if (is_root_script()) {
-		GDScriptCache::move_script(old_path, p_path);
-	}
+	GDScriptCache::move_script(old_path, p_path);
 
 	for (KeyValue<StringName, Ref<GDScript>> &kv : subclasses) {
 		kv.value->set_path(p_path, p_take_over);
@@ -2892,3 +2874,170 @@ Ref<GDScript> GDScriptLanguage::get_orphan_subclass(const String &p_qualified_na
 	}
 	return Ref<GDScript>(Object::cast_to<GDScript>(obj));
 }
+
+Ref<GDScript> GDScriptLanguage::get_script_by_fully_qualified_name(const String &p_name) {
+	{
+		MutexLock lock(mutex);
+
+		SelfList<GDScript> *elem = script_list.first();
+		while (elem) {
+			GDScript *scr = elem->self();
+			if (scr->fully_qualified_name == p_name) {
+				return scr;
+			}
+			elem = elem->next();
+		}
+	}
+
+	Ref<GDScript> scr;
+	scr.instantiate();
+	scr->fully_qualified_name = p_name;
+	return scr;
+}
+
+/*************** RESOURCE ***************/
+
+Ref<Resource> ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	Error err;
+	bool ignoring = p_cache_mode == CACHE_MODE_IGNORE || p_cache_mode == CACHE_MODE_IGNORE_DEEP;
+	Ref<GDScript> scr = GDScriptCache::get_full_script(p_original_path, err, "", ignoring);
+
+	if (err && scr.is_valid()) {
+		// If !scr.is_valid(), the error was likely from scr->load_source_code(), which already generates an error.
+		ERR_PRINT_ED(vformat(R"(Failed to load script "%s" with error "%s".)", p_original_path, error_names[err]));
+	}
+
+	if (r_error) {
+		// Don't fail loading because of parsing error.
+		*r_error = scr.is_valid() ? OK : err;
+	}
+
+	return scr;
+}
+
+void ResourceFormatLoaderGDScript::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("gd");
+	p_extensions->push_back("gdc");
+}
+
+bool ResourceFormatLoaderGDScript::handles_type(const String &p_type) const {
+	return (p_type == "Script" || p_type == "GDScript");
+}
+
+String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) const {
+	String el = p_path.get_extension().to_lower();
+	if (el == "gd" || el == "gdc") {
+		return "GDScript";
+	}
+	return "";
+}
+
+void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::READ);
+	ERR_FAIL_COND_MSG(file.is_null(), "Cannot open file '" + p_path + "'.");
+
+	String source = file->get_as_utf8_string();
+	if (source.is_empty()) {
+		return;
+	}
+
+	GDScriptParser parser;
+	if (OK != parser.parse(source, p_path, false)) {
+		return;
+	}
+
+	for (const String &E : parser.get_dependencies()) {
+		p_dependencies->push_back(E);
+	}
+}
+
+void ResourceFormatLoaderGDScript::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
+	Ref<GDScript> scr = ResourceLoader::load(p_path);
+	if (scr.is_null()) {
+		return;
+	}
+
+	const String source = scr->get_source_code();
+	GDScriptTokenizerText tokenizer;
+	tokenizer.set_source_code(source);
+	GDScriptTokenizer::Token current = tokenizer.scan();
+	while (current.type != GDScriptTokenizer::Token::TK_EOF) {
+		if (!current.is_identifier()) {
+			current = tokenizer.scan();
+			continue;
+		}
+
+		int insert_idx = 0;
+		for (int i = 0; i < current.start_line - 1; i++) {
+			insert_idx = source.find("\n", insert_idx) + 1;
+		}
+		// Insert the "cursor" character, needed for the lookup to work.
+		const String source_with_cursor = source.insert(insert_idx + current.start_column, String::chr(0xFFFF));
+
+		ScriptLanguage::LookupResult result;
+		if (scr->get_language()->lookup_code(source_with_cursor, current.get_identifier(), p_path, nullptr, result) == OK) {
+			if (!result.class_name.is_empty() && ClassDB::class_exists(result.class_name)) {
+				r_classes->insert(result.class_name);
+			}
+
+			if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY) {
+				PropertyInfo prop;
+				if (ClassDB::get_property_info(result.class_name, result.class_member, &prop)) {
+					if (!prop.class_name.is_empty() && ClassDB::class_exists(prop.class_name)) {
+						r_classes->insert(prop.class_name);
+					}
+					if (!prop.hint_string.is_empty() && ClassDB::class_exists(prop.hint_string)) {
+						r_classes->insert(prop.hint_string);
+					}
+				}
+			} else if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD) {
+				MethodInfo met;
+				if (ClassDB::get_method_info(result.class_name, result.class_member, &met)) {
+					if (!met.return_val.class_name.is_empty() && ClassDB::class_exists(met.return_val.class_name)) {
+						r_classes->insert(met.return_val.class_name);
+					}
+					if (!met.return_val.hint_string.is_empty() && ClassDB::class_exists(met.return_val.hint_string)) {
+						r_classes->insert(met.return_val.hint_string);
+					}
+				}
+			}
+		}
+
+		current = tokenizer.scan();
+	}
+}
+
+Error ResourceFormatSaverGDScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Ref<GDScript> sqscr = p_resource;
+	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
+
+	String source = sqscr->get_source_code();
+
+	{
+		Error err;
+		Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
+
+		ERR_FAIL_COND_V_MSG(err, err, "Cannot save GDScript file '" + p_path + "'.");
+
+		file->store_string(source);
+		if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
+			return ERR_CANT_CREATE;
+		}
+	}
+
+	if (ScriptServer::is_reload_scripts_on_save_enabled()) {
+		GDScriptLanguage::get_singleton()->reload_tool_script(p_resource, true);
+	}
+
+	return OK;
+}
+
+void ResourceFormatSaverGDScript::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	if (Object::cast_to<GDScript>(*p_resource)) {
+		p_extensions->push_back("gd");
+	}
+}
+
+bool ResourceFormatSaverGDScript::recognize(const Ref<Resource> &p_resource) const {
+	return Object::cast_to<GDScript>(*p_resource) != nullptr;
+}
diff --git a/engine/modules/gdscript/gdscript.h b/engine/modules/gdscript/gdscript.h
index ed6eabd6..a0be2552 100644
--- a/engine/modules/gdscript/gdscript.h
+++ b/engine/modules/gdscript/gdscript.h
@@ -35,6 +35,8 @@
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/doc_data.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "core/object/script_language.h"
 #include "core/templates/rb_set.h"
 
@@ -337,6 +339,8 @@ public:
 
 	virtual const Variant get_rpc_config() const override;
 
+	void unload_static() const;
+
 #ifdef TOOLS_ENABLED
 	virtual bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
 #endif
@@ -596,6 +600,7 @@ public:
 	virtual Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
 	virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) override;
 	virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::ScriptError> *r_errors = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const override;
+	virtual Script *create_script() const override;
 	virtual bool supports_builtin_mode() const override;
 	virtual bool supports_documentation() const override;
 	virtual bool can_inherit_from_file() const override { return true; }
@@ -654,6 +659,29 @@ public:
 	void add_orphan_subclass(const String &p_qualified_name, const ObjectID &p_subclass);
 	Ref<GDScript> get_orphan_subclass(const String &p_qualified_name);
 
+	Ref<GDScript> get_script_by_fully_qualified_name(const String &p_name);
+
 	GDScriptLanguage();
 	~GDScriptLanguage();
 };
+
+class ResourceFormatLoaderGDScript : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderGDScript, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+	virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false) override;
+	virtual void get_classes_used(const String &p_path, HashSet<StringName> *r_classes) override;
+};
+
+class ResourceFormatSaverGDScript : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverGDScript, ResourceFormatSaver);
+
+public:
+	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	virtual bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/modules/gdscript/gdscript_analyzer.cpp b/engine/modules/gdscript/gdscript_analyzer.cpp
index 80177676..28d4dd5d 100644
--- a/engine/modules/gdscript/gdscript_analyzer.cpp
+++ b/engine/modules/gdscript/gdscript_analyzer.cpp
@@ -113,8 +113,6 @@ static GDScriptParser::DataType make_native_meta_type(const StringName &p_class_
 	return type;
 }
 
-// WARNING: Use this function **only** to create non-GDScript script metatypes. Otherwise, `check_type_compatibility()`
-// may return an incorrect result due to the assumption "A script type cannot be a subtype of a GDScript class".
 static GDScriptParser::DataType make_script_meta_type(const Ref<Script> &p_script) {
 	GDScriptParser::DataType type;
 	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
@@ -1690,13 +1688,13 @@ void GDScriptAnalyzer::resolve_annotation(GDScriptParser::AnnotationNode *p_anno
 
 		reduce_expression(argument);
 
-		bool is_argument_value_reduced = false;
-		Variant value = make_expression_reduced_value(argument, is_argument_value_reduced);
-		if (!is_argument_value_reduced) {
+		if (!argument->is_constant) {
 			push_error(vformat(R"(Argument %d of annotation "%s" isn't a constant expression.)", i + 1, p_annotation->name), argument);
 			return;
 		}
 
+		Variant value = argument->reduced_value;
+
 		if (value.get_type() != argument_info.type) {
 #ifdef DEBUG_ENABLED
 			if (argument_info.type == Variant::INT && value.get_type() == Variant::FLOAT) {
@@ -1875,9 +1873,7 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
 		if (!p_is_lambda && get_function_signature(p_function, false, base_type, function_name, parent_return_type, parameters_types, default_par_count, method_flags, &native_base)) {
 			bool valid = p_function->is_static == method_flags.has_flag(METHOD_FLAG_STATIC);
 
-			if (p_function->return_type == nullptr) {
-				p_function->set_datatype(parent_return_type);
-			} else {
+			if (p_function->return_type != nullptr) {
 				// Check return type covariance.
 				GDScriptParser::DataType return_type = p_function->get_datatype();
 				if (return_type.is_variant()) {
@@ -2055,7 +2051,7 @@ void GDScriptAnalyzer::decide_suite_type(GDScriptParser::Node *p_suite, GDScript
 	}
 }
 
-void GDScriptAnalyzer::resolve_suite(GDScriptParser::SuiteNode *p_suite, bool p_is_root) {
+void GDScriptAnalyzer::resolve_suite(GDScriptParser::SuiteNode *p_suite) {
 	for (int i = 0; i < p_suite->statements.size(); i++) {
 		GDScriptParser::Node *stmt = p_suite->statements[i];
 		// Apply annotations.
@@ -2064,7 +2060,7 @@ void GDScriptAnalyzer::resolve_suite(GDScriptParser::SuiteNode *p_suite, bool p_
 			E->apply(parser, stmt, nullptr); // TODO: Provide `p_class`.
 		}
 
-		resolve_node(stmt, p_is_root);
+		resolve_node(stmt);
 		resolve_pending_lambda_bodies();
 		decide_suite_type(p_suite, stmt);
 	}
@@ -2260,7 +2256,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 	GDScriptParser::DataType list_type;
 
 	if (p_for->list) {
-		reduce_expression(p_for->list);
+		resolve_node(p_for->list, false);
 
 		bool is_range = false;
 		if (p_for->list->type == GDScriptParser::Node::CALL) {
@@ -2377,7 +2373,8 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 }
 
 void GDScriptAnalyzer::resolve_while(GDScriptParser::WhileNode *p_while) {
-	reduce_expression(p_while->condition);
+	resolve_node(p_while->condition, false);
+
 	resolve_suite(p_while->loop);
 	p_while->set_datatype(p_while->loop->get_datatype());
 }
@@ -2426,7 +2423,7 @@ void GDScriptAnalyzer::resolve_match_branch(GDScriptParser::MatchBranchNode *p_m
 	}
 
 	if (p_match_branch->guard_body) {
-		resolve_suite(p_match_branch->guard_body, false);
+		resolve_suite(p_match_branch->guard_body);
 	}
 
 	resolve_suite(p_match_branch->block);
@@ -2515,22 +2512,19 @@ void GDScriptAnalyzer::resolve_match_pattern(GDScriptParser::PatternNode *p_matc
 }
 
 void GDScriptAnalyzer::resolve_return(GDScriptParser::ReturnNode *p_return) {
-	const bool has_expected_type = parser->current_function != nullptr;
-	const GDScriptParser::DataType expected_type = has_expected_type ? parser->current_function->get_datatype() : GDScriptParser::DataType();
-
 	GDScriptParser::DataType result;
 
-	if (p_return->return_value == nullptr) {
-		// Return type is `null` by default.
-		result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
-		result.kind = GDScriptParser::DataType::BUILTIN;
-		result.builtin_type = Variant::NIL;
-		result.is_constant = true;
-	} else {
-		const bool is_void_function = has_expected_type && expected_type.is_hard_type() && expected_type.kind == GDScriptParser::DataType::BUILTIN && expected_type.builtin_type == Variant::NIL;
-		const bool is_call = p_return->return_value->type == GDScriptParser::Node::CALL;
+	GDScriptParser::DataType expected_type;
+	bool has_expected_type = parser->current_function != nullptr;
+	if (has_expected_type) {
+		expected_type = parser->current_function->get_datatype();
+	}
+
+	if (p_return->return_value != nullptr) {
+		bool is_void_function = has_expected_type && expected_type.is_hard_type() && expected_type.kind == GDScriptParser::DataType::BUILTIN && expected_type.builtin_type == Variant::NIL;
+		bool is_call = p_return->return_value->type == GDScriptParser::Node::CALL;
 		if (is_void_function && is_call) {
-			// Pretend the call is a root expression to allow those that are `void`.
+			// Pretend the call is a root expression to allow those that are "void".
 			reduce_call(static_cast<GDScriptParser::CallNode *>(p_return->return_value), false, true);
 		} else {
 			reduce_expression(p_return->return_value);
@@ -2564,30 +2558,28 @@ void GDScriptAnalyzer::resolve_return(GDScriptParser::ReturnNode *p_return) {
 			}
 			result = p_return->return_value->get_datatype();
 		}
+	} else {
+		// Return type is null by default.
+		result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+		result.kind = GDScriptParser::DataType::BUILTIN;
+		result.builtin_type = Variant::NIL;
+		result.is_constant = true;
 	}
 
-	if (has_expected_type && !expected_type.is_variant() && expected_type.is_hard_type()) {
+	if (has_expected_type && !expected_type.is_variant()) {
 		if (result.is_variant() || !result.is_hard_type()) {
-			p_return->use_conversion = true;
 			mark_node_unsafe(p_return);
 			if (!is_type_compatible(expected_type, result, true, p_return)) {
 				downgrade_node_type_source(p_return);
 			}
 		} else if (!is_type_compatible(expected_type, result, true, p_return)) {
-			if (is_type_compatible(result, expected_type)) {
-				p_return->use_conversion = true;
-				mark_node_unsafe(p_return);
-			} else {
+			mark_node_unsafe(p_return);
+			if (!is_type_compatible(result, expected_type)) {
 				push_error(vformat(R"(Cannot return value of type "%s" because the function return type is "%s".)", result.to_string(), expected_type.to_string()), p_return);
 			}
-		} else {
-			if (!is_type_compatible(expected_type, result)) {
-				p_return->use_conversion = true;
-			}
 #ifdef DEBUG_ENABLED
-			if (expected_type.builtin_type == Variant::INT && result.builtin_type == Variant::FLOAT) {
-				parser->push_warning(p_return, GDScriptWarning::NARROWING_CONVERSION);
-			}
+		} else if (expected_type.builtin_type == Variant::INT && result.builtin_type == Variant::FLOAT) {
+			parser->push_warning(p_return, GDScriptWarning::NARROWING_CONVERSION);
 #endif // DEBUG_ENABLED
 		}
 	}
@@ -2887,7 +2879,8 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
 					if (id_type.is_hard_type()) {
 						switch (id_type.kind) {
 							case GDScriptParser::DataType::BUILTIN:
-								need_warn = !Variant::is_type_shared(id_type.builtin_type);
+								// TODO: Change `Variant::is_type_shared()` to include packed arrays?
+								need_warn = !Variant::is_type_shared(id_type.builtin_type) && id_type.builtin_type < Variant::PACKED_BYTE_ARRAY;
 								break;
 							case GDScriptParser::DataType::ENUM:
 								need_warn = true;
@@ -3120,10 +3113,7 @@ void GDScriptAnalyzer::reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_o
 	}
 #endif // DEBUG_ENABLED
 
-	if (p_binary_op->left_operand->is_constant &&
-			p_binary_op->right_operand->is_constant &&
-			!p_binary_op->left_operand->reduced_value.is_shared() &&
-			!p_binary_op->right_operand->reduced_value.is_shared()) {
+	if (p_binary_op->left_operand->is_constant && p_binary_op->right_operand->is_constant) {
 		p_binary_op->is_constant = true;
 		if (p_binary_op->variant_op < Variant::OP_MAX) {
 			bool valid = false;
@@ -3267,9 +3257,30 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
 			call_type.kind = GDScriptParser::DataType::BUILTIN;
 			call_type.builtin_type = builtin_type;
 
-			// Reference types are not suited for compile-time construction.
-			// Because in this case they would be the same reference in all constructed values.
-			if (all_is_constant && !Variant::is_type_shared(builtin_type)) {
+			bool safe_to_fold = true;
+			switch (builtin_type) {
+				// Those are stored by reference so not suited for compile-time construction.
+				// Because in this case they would be the same reference in all constructed values.
+				case Variant::OBJECT:
+				case Variant::DICTIONARY:
+				case Variant::ARRAY:
+				case Variant::PACKED_BYTE_ARRAY:
+				case Variant::PACKED_INT32_ARRAY:
+				case Variant::PACKED_INT64_ARRAY:
+				case Variant::PACKED_FLOAT32_ARRAY:
+				case Variant::PACKED_FLOAT64_ARRAY:
+				case Variant::PACKED_STRING_ARRAY:
+				case Variant::PACKED_VECTOR2_ARRAY:
+				case Variant::PACKED_VECTOR3_ARRAY:
+				case Variant::PACKED_COLOR_ARRAY:
+				case Variant::PACKED_VECTOR4_ARRAY:
+					safe_to_fold = false;
+					break;
+				default:
+					break;
+			}
+
+			if (all_is_constant && safe_to_fold) {
 				// Construct here.
 				Vector<const Variant *> args;
 				for (int i = 0; i < p_call->arguments.size(); i++) {
@@ -5201,9 +5212,9 @@ void GDScriptAnalyzer::reduce_type_test(GDScriptParser::TypeTestNode *p_type_tes
 		p_type_test->is_constant = true;
 		p_type_test->reduced_value = false;
 
-		if (!is_type_compatible_strict_collections(test_type, operand_type)) {
+		if (!is_type_compatible(test_type, operand_type)) {
 			push_error(vformat(R"(Expression is of type "%s" so it can't be of type "%s".)", operand_type.to_string(), test_type.to_string()), p_type_test->operand);
-		} else if (is_type_compatible_strict_collections(test_type, type_from_variant(p_type_test->operand->reduced_value, p_type_test->operand))) {
+		} else if (is_type_compatible(test_type, type_from_variant(p_type_test->operand->reduced_value, p_type_test->operand))) {
 			p_type_test->reduced_value = test_type.builtin_type != Variant::OBJECT || !p_type_test->operand->reduced_value.is_null();
 		}
 
@@ -5253,33 +5264,25 @@ void GDScriptAnalyzer::reduce_unary_op(GDScriptParser::UnaryOpNode *p_unary_op)
 	p_unary_op->set_datatype(result);
 }
 
-Variant GDScriptAnalyzer::make_expression_reduced_value(GDScriptParser::ExpressionNode *p_expression, bool &r_is_reduced) {
+Variant GDScriptAnalyzer::make_expression_reduced_value(GDScriptParser::ExpressionNode *p_expression, bool &is_reduced) {
 	if (p_expression == nullptr) {
 		return Variant();
 	}
 
 	if (p_expression->is_constant) {
-		r_is_reduced = true;
+		is_reduced = true;
 		return p_expression->reduced_value;
 	}
 
 	switch (p_expression->type) {
 		case GDScriptParser::Node::ARRAY:
-			return make_array_reduced_value(static_cast<GDScriptParser::ArrayNode *>(p_expression), r_is_reduced);
+			return make_array_reduced_value(static_cast<GDScriptParser::ArrayNode *>(p_expression), is_reduced);
 		case GDScriptParser::Node::DICTIONARY:
-			return make_dictionary_reduced_value(static_cast<GDScriptParser::DictionaryNode *>(p_expression), r_is_reduced);
+			return make_dictionary_reduced_value(static_cast<GDScriptParser::DictionaryNode *>(p_expression), is_reduced);
 		case GDScriptParser::Node::SUBSCRIPT:
-			return make_subscript_reduced_value(static_cast<GDScriptParser::SubscriptNode *>(p_expression), r_is_reduced);
+			return make_subscript_reduced_value(static_cast<GDScriptParser::SubscriptNode *>(p_expression), is_reduced);
 		case GDScriptParser::Node::CALL:
-			return make_call_reduced_value(static_cast<GDScriptParser::CallNode *>(p_expression), r_is_reduced);
-		case GDScriptParser::Node::BINARY_OPERATOR:
-			return make_binary_op_reduced_value(static_cast<GDScriptParser::BinaryOpNode *>(p_expression), r_is_reduced);
-		case GDScriptParser::Node::TERNARY_OPERATOR:
-			return make_ternary_op_reduced_value(static_cast<GDScriptParser::TernaryOpNode *>(p_expression), r_is_reduced);
-		case GDScriptParser::Node::CAST:
-			return make_cast_reduced_value(static_cast<GDScriptParser::CastNode *>(p_expression), r_is_reduced);
-		case GDScriptParser::Node::TYPE_TEST:
-			return make_type_test_reduced_value(static_cast<GDScriptParser::TypeTestNode *>(p_expression), r_is_reduced);
+			return make_call_reduced_value(static_cast<GDScriptParser::CallNode *>(p_expression), is_reduced);
 		default:
 			break;
 	}
@@ -5287,7 +5290,7 @@ Variant GDScriptAnalyzer::make_expression_reduced_value(GDScriptParser::Expressi
 	return Variant();
 }
 
-Variant GDScriptAnalyzer::make_array_reduced_value(GDScriptParser::ArrayNode *p_array, bool &r_is_reduced) {
+Variant GDScriptAnalyzer::make_array_reduced_value(GDScriptParser::ArrayNode *p_array, bool &is_reduced) {
 	Array array = p_array->get_datatype().has_container_element_type(0) ? make_array_from_element_datatype(p_array->get_datatype().get_container_element_type(0)) : Array();
 
 	array.resize(p_array->elements.size());
@@ -5305,11 +5308,11 @@ Variant GDScriptAnalyzer::make_array_reduced_value(GDScriptParser::ArrayNode *p_
 
 	array.make_read_only();
 
-	r_is_reduced = true;
+	is_reduced = true;
 	return array;
 }
 
-Variant GDScriptAnalyzer::make_dictionary_reduced_value(GDScriptParser::DictionaryNode *p_dictionary, bool &r_is_reduced) {
+Variant GDScriptAnalyzer::make_dictionary_reduced_value(GDScriptParser::DictionaryNode *p_dictionary, bool &is_reduced) {
 	Dictionary dictionary = p_dictionary->get_datatype().has_container_element_types()
 			? make_dictionary_from_element_datatype(p_dictionary->get_datatype().get_container_element_type_or_variant(0), p_dictionary->get_datatype().get_container_element_type_or_variant(1))
 			: Dictionary();
@@ -5334,11 +5337,11 @@ Variant GDScriptAnalyzer::make_dictionary_reduced_value(GDScriptParser::Dictiona
 
 	dictionary.make_read_only();
 
-	r_is_reduced = true;
+	is_reduced = true;
 	return dictionary;
 }
 
-Variant GDScriptAnalyzer::make_subscript_reduced_value(GDScriptParser::SubscriptNode *p_subscript, bool &r_is_reduced) {
+Variant GDScriptAnalyzer::make_subscript_reduced_value(GDScriptParser::SubscriptNode *p_subscript, bool &is_reduced) {
 	if (p_subscript->base == nullptr || p_subscript->index == nullptr) {
 		return Variant();
 	}
@@ -5353,7 +5356,7 @@ Variant GDScriptAnalyzer::make_subscript_reduced_value(GDScriptParser::Subscript
 		bool is_valid = false;
 		Variant value = base_value.get_named(p_subscript->attribute->name, is_valid);
 		if (is_valid) {
-			r_is_reduced = true;
+			is_reduced = true;
 			return value;
 		} else {
 			return Variant();
@@ -5368,7 +5371,7 @@ Variant GDScriptAnalyzer::make_subscript_reduced_value(GDScriptParser::Subscript
 		bool is_valid = false;
 		Variant value = base_value.get(index_value, &is_valid);
 		if (is_valid) {
-			r_is_reduced = true;
+			is_reduced = true;
 			return value;
 		} else {
 			return Variant();
@@ -5376,7 +5379,7 @@ Variant GDScriptAnalyzer::make_subscript_reduced_value(GDScriptParser::Subscript
 	}
 }
 
-Variant GDScriptAnalyzer::make_call_reduced_value(GDScriptParser::CallNode *p_call, bool &r_is_reduced) {
+Variant GDScriptAnalyzer::make_call_reduced_value(GDScriptParser::CallNode *p_call, bool &is_reduced) {
 	if (p_call->get_callee_type() == GDScriptParser::Node::IDENTIFIER) {
 		Variant::Type type = Variant::NIL;
 		if (p_call->function_name == SNAME("Array")) {
@@ -5404,6 +5407,7 @@ Variant GDScriptAnalyzer::make_call_reduced_value(GDScriptParser::CallNode *p_ca
 		Callable::CallError ce;
 		Variant::construct(type, result, argptrs, args.size(), ce);
 		if (ce.error) {
+			push_error(vformat(R"(Failed to construct "%s".)", Variant::get_type_name(type)), p_call);
 			return Variant();
 		}
 
@@ -5415,146 +5419,13 @@ Variant GDScriptAnalyzer::make_call_reduced_value(GDScriptParser::CallNode *p_ca
 			dictionary.make_read_only();
 		}
 
-		r_is_reduced = true;
+		is_reduced = true;
 		return result;
 	}
 
 	return Variant();
 }
 
-Variant GDScriptAnalyzer::make_binary_op_reduced_value(GDScriptParser::BinaryOpNode *p_binary_op, bool &r_is_reduced) {
-	if (p_binary_op->variant_op == Variant::OP_MAX) {
-		return Variant();
-	}
-
-	bool is_left_op_value_reduced = false;
-	Variant left_op_value = make_expression_reduced_value(p_binary_op->left_operand, is_left_op_value_reduced);
-	if (!is_left_op_value_reduced) {
-		return Variant();
-	}
-
-	bool is_right_op_value_reduced = false;
-	Variant right_op_value = make_expression_reduced_value(p_binary_op->right_operand, is_right_op_value_reduced);
-	if (!is_right_op_value_reduced) {
-		return Variant();
-	}
-
-	Variant result;
-	bool valid = false;
-	Variant::evaluate(p_binary_op->variant_op, left_op_value, right_op_value, result, valid);
-	if (!valid) {
-		return Variant();
-	}
-
-	if (result.get_type() == Variant::ARRAY) {
-		Array array = result;
-		array.make_read_only();
-	} else if (result.get_type() == Variant::DICTIONARY) {
-		Dictionary dictionary = result;
-		dictionary.make_read_only();
-	}
-
-	r_is_reduced = true;
-	return result;
-}
-
-Variant GDScriptAnalyzer::make_ternary_op_reduced_value(GDScriptParser::TernaryOpNode *p_ternary_op, bool &r_is_reduced) {
-	bool is_condition_value_reduced = false;
-	Variant condition_value = make_expression_reduced_value(p_ternary_op->condition, is_condition_value_reduced);
-	if (!is_condition_value_reduced) {
-		return Variant();
-	}
-
-	bool is_true_expr_value_reduced = false;
-	Variant true_expr_value = make_expression_reduced_value(p_ternary_op->true_expr, is_true_expr_value_reduced);
-	if (!is_true_expr_value_reduced) {
-		return Variant();
-	}
-
-	bool is_false_expr_value_reduced = false;
-	Variant false_expr_value = make_expression_reduced_value(p_ternary_op->false_expr, is_false_expr_value_reduced);
-	if (!is_false_expr_value_reduced) {
-		return Variant();
-	}
-
-	r_is_reduced = true;
-	return condition_value.booleanize() ? true_expr_value : false_expr_value;
-}
-
-Variant GDScriptAnalyzer::make_cast_reduced_value(GDScriptParser::CastNode *p_cast, bool &r_is_reduced) {
-	bool is_operand_value_reduced = false;
-	Variant operand_value = make_expression_reduced_value(p_cast->operand, is_operand_value_reduced);
-	if (!is_operand_value_reduced) {
-		return Variant();
-	}
-
-	GDScriptParser::DataType cast_type = type_from_metatype(resolve_datatype(p_cast->cast_type));
-
-	if (!cast_type.is_set()) {
-		return Variant();
-	}
-
-	if (cast_type.is_variant()) {
-		r_is_reduced = true;
-		return operand_value;
-	}
-
-	if (cast_type.kind == GDScriptParser::DataType::BUILTIN || cast_type.kind == GDScriptParser::DataType::ENUM) {
-		Variant result;
-		const Variant *argptr = &operand_value;
-		Callable::CallError ce;
-		Variant::construct(cast_type.builtin_type, result, &argptr, 1, ce);
-		if (ce.error) {
-			return Variant();
-		}
-
-		if (result.get_type() == Variant::ARRAY) {
-			Array array = cast_type.has_container_element_type(0) ? make_array_from_element_datatype(cast_type.get_container_element_type(0)) : Array();
-			array.assign(result);
-			array.make_read_only();
-			result = array;
-		} else if (result.get_type() == Variant::DICTIONARY) {
-			Dictionary dictionary = cast_type.has_container_element_types()
-					? make_dictionary_from_element_datatype(cast_type.get_container_element_type_or_variant(0), cast_type.get_container_element_type_or_variant(1))
-					: Dictionary();
-			dictionary.assign(result);
-			dictionary.make_read_only();
-			result = dictionary;
-		}
-
-		r_is_reduced = true;
-		return result;
-	}
-
-	return Variant();
-}
-
-Variant GDScriptAnalyzer::make_type_test_reduced_value(GDScriptParser::TypeTestNode *p_type_test, bool &r_is_reduced) {
-	bool is_operand_value_reduced = false;
-	Variant operand_value = make_expression_reduced_value(p_type_test->operand, is_operand_value_reduced);
-	if (!is_operand_value_reduced) {
-		return Variant();
-	}
-
-	GDScriptParser::DataType test_type = type_from_metatype(p_type_test->test_type->get_datatype());
-	if (!test_type.is_set()) {
-		return Variant();
-	}
-
-	GDScriptParser::DataType operand_type = type_from_variant(operand_value, p_type_test->operand);
-	if (!operand_type.is_set()) {
-		return Variant();
-	}
-
-	bool result = false;
-	if (is_type_compatible_strict_collections(test_type, operand_type)) {
-		result = test_type.builtin_type != Variant::OBJECT || !operand_value.is_null();
-	}
-
-	r_is_reduced = true;
-	return result;
-}
-
 Array GDScriptAnalyzer::make_array_from_element_datatype(const GDScriptParser::DataType &p_element_datatype, const GDScriptParser::Node *p_source_node) {
 	Array array;
 
@@ -5652,57 +5523,6 @@ Variant GDScriptAnalyzer::make_variable_default_value(GDScriptParser::VariableNo
 	return result;
 }
 
-GDScriptParser::DataType GDScriptAnalyzer::type_from_script(const Ref<Script> &p_script, const GDScriptParser::Node *p_source, bool p_is_meta_type) {
-	ERR_FAIL_COND_V(!p_script.is_valid(), GDScriptParser::DataType());
-
-	GDScriptParser::DataType result;
-	result.is_constant = true;
-	result.kind = GDScriptParser::DataType::NATIVE;
-	result.builtin_type = Variant::OBJECT;
-	result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT; // Constant has explicit type.
-	result.is_meta_type = p_is_meta_type;
-
-	Ref<GDScript> gds = p_script;
-	if (gds.is_valid()) {
-		// This might be an inner class, so we want to get the parser for the root.
-		// But still get the inner class from that tree.
-		String script_path = gds->get_script_path();
-		Ref<GDScriptParserRef> ref = parser->get_depended_parser_for(script_path);
-		if (ref.is_null()) {
-			push_error(vformat(R"(Could not find script "%s".)", script_path), p_source);
-			GDScriptParser::DataType error_type;
-			error_type.kind = GDScriptParser::DataType::VARIANT;
-			return error_type;
-		}
-		Error err = ref->raise_status(GDScriptParserRef::INHERITANCE_SOLVED);
-		GDScriptParser::ClassNode *found = nullptr;
-		if (err == OK) {
-			found = ref->get_parser()->find_class(gds->fully_qualified_name);
-			if (found != nullptr) {
-				err = resolve_class_inheritance(found, p_source);
-			}
-		}
-		if (err || found == nullptr) {
-			push_error(vformat(R"(Could not resolve script "%s".)", script_path), p_source);
-			GDScriptParser::DataType error_type;
-			error_type.kind = GDScriptParser::DataType::VARIANT;
-			return error_type;
-		}
-
-		result.kind = GDScriptParser::DataType::CLASS;
-		result.native_type = found->get_datatype().native_type;
-		result.class_type = found;
-		result.script_path = ref->get_parser()->script_path;
-	} else {
-		result.kind = GDScriptParser::DataType::SCRIPT;
-		result.native_type = p_script->get_instance_base_type();
-		result.script_path = p_script->get_path();
-	}
-	result.script_type = p_script;
-
-	return result;
-}
-
 GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_value, const GDScriptParser::Node *p_source) {
 	GDScriptParser::DataType result;
 	result.is_constant = true;
@@ -5713,7 +5533,7 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_va
 	if (p_value.get_type() == Variant::ARRAY) {
 		const Array &array = p_value;
 		if (array.get_typed_script()) {
-			result.set_container_element_type(0, type_from_metatype(type_from_script(array.get_typed_script(), p_source, true)));
+			result.set_container_element_type(0, type_from_metatype(make_script_meta_type(array.get_typed_script())));
 		} else if (array.get_typed_class_name()) {
 			result.set_container_element_type(0, type_from_metatype(make_native_meta_type(array.get_typed_class_name())));
 		} else if (array.get_typed_builtin() != Variant::NIL) {
@@ -5722,14 +5542,14 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_va
 	} else if (p_value.get_type() == Variant::DICTIONARY) {
 		const Dictionary &dict = p_value;
 		if (dict.get_typed_key_script()) {
-			result.set_container_element_type(0, type_from_metatype(type_from_script(dict.get_typed_key_script(), p_source, true)));
+			result.set_container_element_type(0, type_from_metatype(make_script_meta_type(dict.get_typed_key_script())));
 		} else if (dict.get_typed_key_class_name()) {
 			result.set_container_element_type(0, type_from_metatype(make_native_meta_type(dict.get_typed_key_class_name())));
 		} else if (dict.get_typed_key_builtin() != Variant::NIL) {
 			result.set_container_element_type(0, type_from_metatype(make_builtin_meta_type((Variant::Type)dict.get_typed_key_builtin())));
 		}
 		if (dict.get_typed_value_script()) {
-			result.set_container_element_type(1, type_from_metatype(type_from_script(dict.get_typed_value_script(), p_source, true)));
+			result.set_container_element_type(1, type_from_metatype(make_script_meta_type(dict.get_typed_value_script())));
 		} else if (dict.get_typed_value_class_name()) {
 			result.set_container_element_type(1, type_from_metatype(make_native_meta_type(dict.get_typed_value_class_name())));
 		} else if (dict.get_typed_value_builtin() != Variant::NIL) {
@@ -5746,16 +5566,50 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_va
 		result.native_type = obj->get_class_name();
 
 		Ref<Script> scr = p_value; // Check if value is a script itself.
-		bool is_meta_type;
 		if (scr.is_valid()) {
-			is_meta_type = true;
+			result.is_meta_type = true;
 		} else {
-			is_meta_type = false;
+			result.is_meta_type = false;
 			scr = obj->get_script();
 		}
-
 		if (scr.is_valid()) {
-			result = type_from_script(scr, p_source, is_meta_type);
+			Ref<GDScript> gds = scr;
+			if (gds.is_valid()) {
+				// This might be an inner class, so we want to get the parser for the root.
+				// But still get the inner class from that tree.
+				String script_path = gds->get_script_path();
+				Ref<GDScriptParserRef> ref = parser->get_depended_parser_for(script_path);
+				if (ref.is_null()) {
+					push_error(vformat(R"(Could not find script "%s".)", script_path), p_source);
+					GDScriptParser::DataType error_type;
+					error_type.kind = GDScriptParser::DataType::VARIANT;
+					return error_type;
+				}
+				Error err = ref->raise_status(GDScriptParserRef::INHERITANCE_SOLVED);
+				GDScriptParser::ClassNode *found = nullptr;
+				if (err == OK) {
+					found = ref->get_parser()->find_class(gds->fully_qualified_name);
+					if (found != nullptr) {
+						err = resolve_class_inheritance(found, p_source);
+					}
+				}
+				if (err || found == nullptr) {
+					push_error(vformat(R"(Could not resolve script "%s".)", script_path), p_source);
+					GDScriptParser::DataType error_type;
+					error_type.kind = GDScriptParser::DataType::VARIANT;
+					return error_type;
+				}
+
+				result.kind = GDScriptParser::DataType::CLASS;
+				result.native_type = found->get_datatype().native_type;
+				result.class_type = found;
+				result.script_path = ref->get_parser()->script_path;
+			} else {
+				result.kind = GDScriptParser::DataType::SCRIPT;
+				result.native_type = scr->get_instance_base_type();
+				result.script_path = scr->get_path();
+			}
+			result.script_type = scr;
 		} else {
 			result.kind = GDScriptParser::DataType::NATIVE;
 			if (result.native_type == GDScriptNativeClass::get_class_static()) {
@@ -6296,21 +6150,6 @@ bool GDScriptAnalyzer::is_type_compatible(const GDScriptParser::DataType &p_targ
 	return check_type_compatibility(p_target, p_source, p_allow_implicit_conversion, p_source_node);
 }
 
-// NOTE:`is_type_compatible()` considers typed arrays/dictionaries compatible with untyped ones (but the operation is unsafe).
-// However, in the case of constant expressions, this leads to incorrect results.
-bool GDScriptAnalyzer::is_type_compatible_strict_collections(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source) {
-	if (p_target.builtin_type == Variant::ARRAY && p_source.builtin_type == Variant::ARRAY) {
-		if (p_target.has_container_element_type(0) && !p_source.has_container_element_type(0)) {
-			return false;
-		}
-	} else if (p_target.builtin_type == Variant::DICTIONARY && p_source.builtin_type == Variant::DICTIONARY) {
-		if (p_target.has_container_element_types() && !p_source.has_container_element_types()) {
-			return false;
-		}
-	}
-	return is_type_compatible(p_target, p_source);
-}
-
 // TODO: Add safe/unsafe return variable (for variant cases)
 bool GDScriptAnalyzer::check_type_compatibility(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source, bool p_allow_implicit_conversion, const GDScriptParser::Node *p_source_node) {
 	// These return "true" so it doesn't affect users negatively.
@@ -6538,7 +6377,7 @@ void GDScriptAnalyzer::resolve_pending_lambda_bodies() {
 	GDScriptParser::LambdaNode *previous_lambda = current_lambda;
 	bool previous_static_context = static_context;
 
-	List<GDScriptParser::LambdaNode *> lambdas = std::move(pending_body_resolution_lambdas);
+	List<GDScriptParser::LambdaNode *> lambdas = pending_body_resolution_lambdas;
 	pending_body_resolution_lambdas.clear();
 
 	for (GDScriptParser::LambdaNode *lambda : lambdas) {
diff --git a/engine/modules/gdscript/gdscript_analyzer.h b/engine/modules/gdscript/gdscript_analyzer.h
index 94df53d5..b966fb29 100644
--- a/engine/modules/gdscript/gdscript_analyzer.h
+++ b/engine/modules/gdscript/gdscript_analyzer.h
@@ -33,6 +33,7 @@
 #include "gdscript_cache.h"
 #include "gdscript_parser.h"
 
+#include "core/object/object.h"
 #include "core/object/ref_counted.h"
 
 class GDScriptAnalyzer {
@@ -80,7 +81,7 @@ class GDScriptAnalyzer {
 	void resolve_function_signature(GDScriptParser::FunctionNode *p_function, const GDScriptParser::Node *p_source = nullptr, bool p_is_lambda = false);
 	void resolve_function_body(GDScriptParser::FunctionNode *p_function, bool p_is_lambda = false);
 	void resolve_node(GDScriptParser::Node *p_node, bool p_is_root = true);
-	void resolve_suite(GDScriptParser::SuiteNode *p_suite, bool p_is_root = true);
+	void resolve_suite(GDScriptParser::SuiteNode *p_suite);
 	void resolve_assignable(GDScriptParser::AssignableNode *p_assignable, const char *p_kind);
 	void resolve_variable(GDScriptParser::VariableNode *p_variable, bool p_is_local);
 	void resolve_constant(GDScriptParser::ConstantNode *p_constant, bool p_is_local);
@@ -115,24 +116,15 @@ class GDScriptAnalyzer {
 	void reduce_type_test(GDScriptParser::TypeTestNode *p_type_test);
 	void reduce_unary_op(GDScriptParser::UnaryOpNode *p_unary_op);
 
-	// These methods provide a fallback mechanism for constant folding in constant contexts (constant initializers,
-	// annotation arguments) and allow constant folding even when the normal constant folding mechanism does not consider
-	// an expression to be constant (usually due to the presence of `[...]` and `{...}` constructs in it).
-	// These methods assume that the normal expression reduction mechanism has already been performed.
-	Variant make_expression_reduced_value(GDScriptParser::ExpressionNode *p_expression, bool &r_is_reduced);
-	Variant make_array_reduced_value(GDScriptParser::ArrayNode *p_array, bool &r_is_reduced);
-	Variant make_dictionary_reduced_value(GDScriptParser::DictionaryNode *p_dictionary, bool &r_is_reduced);
-	Variant make_subscript_reduced_value(GDScriptParser::SubscriptNode *p_subscript, bool &r_is_reduced);
-	Variant make_call_reduced_value(GDScriptParser::CallNode *p_call, bool &r_is_reduced);
-	Variant make_binary_op_reduced_value(GDScriptParser::BinaryOpNode *p_binary_op, bool &r_is_reduced);
-	Variant make_ternary_op_reduced_value(GDScriptParser::TernaryOpNode *p_ternary_op, bool &r_is_reduced);
-	Variant make_cast_reduced_value(GDScriptParser::CastNode *p_cast, bool &r_is_reduced);
-	Variant make_type_test_reduced_value(GDScriptParser::TypeTestNode *p_type_test, bool &r_is_reduced);
+	Variant make_expression_reduced_value(GDScriptParser::ExpressionNode *p_expression, bool &is_reduced);
+	Variant make_array_reduced_value(GDScriptParser::ArrayNode *p_array, bool &is_reduced);
+	Variant make_dictionary_reduced_value(GDScriptParser::DictionaryNode *p_dictionary, bool &is_reduced);
+	Variant make_subscript_reduced_value(GDScriptParser::SubscriptNode *p_subscript, bool &is_reduced);
+	Variant make_call_reduced_value(GDScriptParser::CallNode *p_call, bool &is_reduced);
 
 	// Helpers.
 	Array make_array_from_element_datatype(const GDScriptParser::DataType &p_element_datatype, const GDScriptParser::Node *p_source_node = nullptr);
 	Dictionary make_dictionary_from_element_datatype(const GDScriptParser::DataType &p_key_element_datatype, const GDScriptParser::DataType &p_value_element_datatype, const GDScriptParser::Node *p_source_node = nullptr);
-	GDScriptParser::DataType type_from_script(const Ref<Script> &p_script, const GDScriptParser::Node *p_source, bool p_is_meta_type);
 	GDScriptParser::DataType type_from_variant(const Variant &p_value, const GDScriptParser::Node *p_source);
 	GDScriptParser::DataType type_from_property(const PropertyInfo &p_property, bool p_is_arg = false, bool p_is_readonly = false) const;
 	GDScriptParser::DataType make_global_class_meta_type(const StringName &p_class_name, const GDScriptParser::Node *p_source);
@@ -146,7 +138,6 @@ class GDScriptAnalyzer {
 	void update_array_literal_element_type(GDScriptParser::ArrayNode *p_array, const GDScriptParser::DataType &p_element_type);
 	void update_dictionary_literal_element_type(GDScriptParser::DictionaryNode *p_dictionary, const GDScriptParser::DataType &p_key_element_type, const GDScriptParser::DataType &p_value_element_type);
 	bool is_type_compatible(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source, bool p_allow_implicit_conversion = false, const GDScriptParser::Node *p_source_node = nullptr);
-	bool is_type_compatible_strict_collections(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source);
 	void push_error(const String &p_message, const GDScriptParser::Node *p_origin = nullptr);
 	void mark_node_unsafe(const GDScriptParser::Node *p_node);
 	void downgrade_node_type_source(GDScriptParser::Node *p_node);
diff --git a/engine/modules/gdscript/gdscript_byte_codegen.cpp b/engine/modules/gdscript/gdscript_byte_codegen.cpp
index 1b5da0ea..feb40bb5 100644
--- a/engine/modules/gdscript/gdscript_byte_codegen.cpp
+++ b/engine/modules/gdscript/gdscript_byte_codegen.cpp
@@ -30,7 +30,7 @@
 
 #include "gdscript_byte_codegen.h"
 
-#include "core/object/class_db.h"
+#include "core/debugger/engine_debugger.h"
 
 uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) {
 	function->_argument_count++;
@@ -189,7 +189,7 @@ GDScriptFunction *GDScriptByteCodeGenerator::write_end() {
 			opcodes.write[temporaries[i].bytecode_indices[j]] = stack_index | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
 		}
 		if (temporaries[i].type != Variant::NIL) {
-			function->temporary_slots.push_back(Pair(stack_index, temporaries[i].type));
+			function->temporary_slots[stack_index] = temporaries[i].type;
 		}
 	}
 
@@ -200,9 +200,6 @@ GDScriptFunction *GDScriptByteCodeGenerator::write_end() {
 		for (const KeyValue<Variant, int> &K : constant_map) {
 			function->constants.write[K.value] = K.key;
 		}
-		for (const KeyValue<StringName, int> &K : local_constants) {
-			function->constant_map.insert(K.key, function->constants[K.value]);
-		}
 	} else {
 		function->_constants_ptr = nullptr;
 		function->_constant_count = 0;
@@ -1834,30 +1831,23 @@ void GDScriptByteCodeGenerator::write_newline(int p_line) {
 	}
 }
 
-void GDScriptByteCodeGenerator::write_return(const Address &p_return_value, bool p_use_conversion) {
-	if (!p_use_conversion) {
-		append_opcode(GDScriptFunction::OPCODE_RETURN);
-		append(p_return_value);
-		return;
-	}
+void GDScriptByteCodeGenerator::write_return(const Address &p_return_value) {
+	if (!function->return_type.has_type() || p_return_value.type.has_type()) {
+		// Either the function is untyped or the return value is also typed.
 
-	switch (function->return_type.kind) {
-		case GDScriptDataType::VARIANT: {
-			ERR_PRINT("Compiler bug: Unresolved return.");
-
-			// Shouldn't get here, but fail-safe to a regular return.
-			append_opcode(GDScriptFunction::OPCODE_RETURN);
-			append(p_return_value);
-		} break;
-		case GDScriptDataType::BUILTIN: {
-			if (function->return_type.builtin_type == Variant::ARRAY && function->return_type.has_container_element_type(0)) {
+		// If this is a typed function, then we need to check for potential conversions.
+		if (function->return_type.has_type()) {
+			if (function->return_type.kind == GDScriptDataType::BUILTIN && function->return_type.builtin_type == Variant::ARRAY && function->return_type.has_container_element_type(0)) {
+				// Typed array.
 				const GDScriptDataType &element_type = function->return_type.get_container_element_type(0);
 				append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_ARRAY);
 				append(p_return_value);
 				append(get_constant_pos(element_type.script_type) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS));
 				append(element_type.builtin_type);
 				append(element_type.native_type);
-			} else if (function->return_type.builtin_type == Variant::DICTIONARY && function->return_type.has_container_element_types()) {
+			} else if (function->return_type.kind == GDScriptDataType::BUILTIN && function->return_type.builtin_type == Variant::DICTIONARY &&
+					function->return_type.has_container_element_types()) {
+				// Typed dictionary.
 				const GDScriptDataType &key_type = function->return_type.get_container_element_type_or_variant(0);
 				const GDScriptDataType &value_type = function->return_type.get_container_element_type_or_variant(1);
 				append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_DICTIONARY);
@@ -1868,29 +1858,72 @@ void GDScriptByteCodeGenerator::write_return(const Address &p_return_value, bool
 				append(key_type.native_type);
 				append(value_type.builtin_type);
 				append(value_type.native_type);
-			} else {
+			} else if (function->return_type.kind == GDScriptDataType::BUILTIN && p_return_value.type.kind == GDScriptDataType::BUILTIN && function->return_type.builtin_type != p_return_value.type.builtin_type) {
+				// Add conversion.
 				append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_BUILTIN);
 				append(p_return_value);
 				append(function->return_type.builtin_type);
+			} else {
+				// Just assign.
+				append_opcode(GDScriptFunction::OPCODE_RETURN);
+				append(p_return_value);
 			}
-		} break;
-		case GDScriptDataType::NATIVE: {
-			append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_NATIVE);
+		} else {
+			append_opcode(GDScriptFunction::OPCODE_RETURN);
 			append(p_return_value);
-			int class_idx = GDScriptLanguage::get_singleton()->get_global_map()[function->return_type.native_type];
-			Variant nc = GDScriptLanguage::get_singleton()->get_global_array()[class_idx];
-			class_idx = get_constant_pos(nc) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS);
-			append(class_idx);
-		} break;
-		case GDScriptDataType::SCRIPT:
-		case GDScriptDataType::GDSCRIPT: {
-			Variant script = function->return_type.script_type;
-			int script_idx = get_constant_pos(script) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS);
+		}
+	} else {
+		switch (function->return_type.kind) {
+			case GDScriptDataType::BUILTIN: {
+				if (function->return_type.builtin_type == Variant::ARRAY && function->return_type.has_container_element_type(0)) {
+					const GDScriptDataType &element_type = function->return_type.get_container_element_type(0);
+					append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_ARRAY);
+					append(p_return_value);
+					append(get_constant_pos(element_type.script_type) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS));
+					append(element_type.builtin_type);
+					append(element_type.native_type);
+				} else if (function->return_type.builtin_type == Variant::DICTIONARY && function->return_type.has_container_element_types()) {
+					const GDScriptDataType &key_type = function->return_type.get_container_element_type_or_variant(0);
+					const GDScriptDataType &value_type = function->return_type.get_container_element_type_or_variant(1);
+					append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_DICTIONARY);
+					append(p_return_value);
+					append(get_constant_pos(key_type.script_type) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS));
+					append(get_constant_pos(value_type.script_type) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS));
+					append(key_type.builtin_type);
+					append(key_type.native_type);
+					append(value_type.builtin_type);
+					append(value_type.native_type);
+				} else {
+					append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_BUILTIN);
+					append(p_return_value);
+					append(function->return_type.builtin_type);
+				}
+			} break;
+			case GDScriptDataType::NATIVE: {
+				append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_NATIVE);
+				append(p_return_value);
+				int class_idx = GDScriptLanguage::get_singleton()->get_global_map()[function->return_type.native_type];
+				Variant nc = GDScriptLanguage::get_singleton()->get_global_array()[class_idx];
+				class_idx = get_constant_pos(nc) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS);
+				append(class_idx);
+			} break;
+			case GDScriptDataType::GDSCRIPT:
+			case GDScriptDataType::SCRIPT: {
+				Variant script = function->return_type.script_type;
+				int script_idx = get_constant_pos(script) | (GDScriptFunction::ADDR_TYPE_CONSTANT << GDScriptFunction::ADDR_BITS);
 
-			append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_SCRIPT);
-			append(p_return_value);
-			append(script_idx);
-		} break;
+				append_opcode(GDScriptFunction::OPCODE_RETURN_TYPED_SCRIPT);
+				append(p_return_value);
+				append(script_idx);
+			} break;
+			default: {
+				ERR_PRINT("Compiler bug: unresolved return.");
+
+				// Shouldn't get here, but fail-safe to a regular return;
+				append_opcode(GDScriptFunction::OPCODE_RETURN);
+				append(p_return_value);
+			} break;
+		}
 	}
 }
 
diff --git a/engine/modules/gdscript/gdscript_byte_codegen.h b/engine/modules/gdscript/gdscript_byte_codegen.h
index 3abd2258..c2aac171 100644
--- a/engine/modules/gdscript/gdscript_byte_codegen.h
+++ b/engine/modules/gdscript/gdscript_byte_codegen.h
@@ -552,7 +552,7 @@ public:
 	virtual void write_continue() override;
 	virtual void write_breakpoint() override;
 	virtual void write_newline(int p_line) override;
-	virtual void write_return(const Address &p_return_value, bool p_use_conversion) override;
+	virtual void write_return(const Address &p_return_value) override;
 	virtual void write_assert(const Address &p_test, const Address &p_message) override;
 
 	virtual ~GDScriptByteCodeGenerator();
diff --git a/engine/modules/gdscript/gdscript_cache.cpp b/engine/modules/gdscript/gdscript_cache.cpp
index efa4ff3d..2ad4db78 100644
--- a/engine/modules/gdscript/gdscript_cache.cpp
+++ b/engine/modules/gdscript/gdscript_cache.cpp
@@ -36,7 +36,6 @@
 #include "gdscript_parser.h"
 
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/templates/vector.h"
 
 GDScriptParserRef::Status GDScriptParserRef::get_status() const {
@@ -69,10 +68,6 @@ Error GDScriptParserRef::raise_status(Status p_new_status) {
 	ERR_FAIL_COND_V(clearing, ERR_BUG);
 	ERR_FAIL_COND_V(parser == nullptr && status != EMPTY, ERR_BUG);
 
-	if (p_new_status < status) {
-		return OK;
-	}
-
 	while (result == OK && p_new_status > status) {
 		switch (status) {
 			case EMPTY: {
@@ -260,7 +255,7 @@ void GDScriptCache::remove_parser(const String &p_path) {
 	singleton->parser_map.erase(p_path);
 
 	// Have to copy while iterating, because parser_inverse_dependencies is modified.
-	HashSet<String> ideps(singleton->parser_inverse_dependencies[p_path]);
+	HashSet<String> ideps = singleton->parser_inverse_dependencies[p_path];
 	singleton->parser_inverse_dependencies.erase(p_path);
 	for (String idep_path : ideps) {
 		remove_parser(idep_path);
@@ -428,7 +423,7 @@ Error GDScriptCache::finish_compiling(const String &p_owner) {
 	singleton->full_gdscript_cache[p_owner] = script;
 	singleton->shallow_gdscript_cache.erase(p_owner);
 
-	HashSet<String> depends(singleton->dependencies[p_owner]);
+	HashSet<String> depends = singleton->dependencies[p_owner];
 
 	Error err = OK;
 	for (const String &E : depends) {
diff --git a/engine/modules/gdscript/gdscript_cache.h b/engine/modules/gdscript/gdscript_cache.h
index 7a964423..bcd2d202 100644
--- a/engine/modules/gdscript/gdscript_cache.h
+++ b/engine/modules/gdscript/gdscript_cache.h
@@ -78,9 +78,11 @@ public:
 	~GDScriptParserRef();
 };
 
+#ifdef TESTS_ENABLED
 namespace GDScriptTests {
 class TestGDScriptCacheAccessor;
 }
+#endif // TESTS_ENABLED
 
 class GDScriptCache {
 	// String key is full path.
@@ -95,7 +97,9 @@ class GDScriptCache {
 	friend class GDScript;
 	friend class GDScriptParserRef;
 	friend class GDScriptInstance;
+#ifdef TESTS_ENABLED
 	friend class GDScriptTests::TestGDScriptCacheAccessor;
+#endif // TESTS_ENABLED
 
 	static GDScriptCache *singleton;
 
diff --git a/engine/modules/gdscript/gdscript_codegen.h b/engine/modules/gdscript/gdscript_codegen.h
index 84e4551e..2ff31d51 100644
--- a/engine/modules/gdscript/gdscript_codegen.h
+++ b/engine/modules/gdscript/gdscript_codegen.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "gdscript_function.h"
+#include "gdscript_utility_functions.h"
 
 #include "core/string/string_name.h"
 #include "core/variant/variant.h"
@@ -159,7 +160,7 @@ public:
 	virtual void write_continue() = 0;
 	virtual void write_breakpoint() = 0;
 	virtual void write_newline(int p_line) = 0;
-	virtual void write_return(const Address &p_return_value, bool p_use_conversion) = 0;
+	virtual void write_return(const Address &p_return_value) = 0;
 	virtual void write_assert(const Address &p_test, const Address &p_message) = 0;
 
 	virtual ~GDScriptCodeGenerator() {}
diff --git a/engine/modules/gdscript/gdscript_compiler.cpp b/engine/modules/gdscript/gdscript_compiler.cpp
index 46fcff16..44e2daac 100644
--- a/engine/modules/gdscript/gdscript_compiler.cpp
+++ b/engine/modules/gdscript/gdscript_compiler.cpp
@@ -38,8 +38,8 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
+
+#include "scene/scene_string_names.h"
 
 bool GDScriptCompiler::_is_class_member_property(CodeGen &codegen, const StringName &p_name) {
 	if (codegen.function_node && codegen.function_node->is_static) {
@@ -419,7 +419,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
 					if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) {
 						// If it's an autoload singleton, we postpone to load it at runtime.
 						// This is so one autoload doesn't try to load another before it's compiled.
-						HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
+						HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 						if (autoloads.has(identifier) && autoloads[identifier].is_singleton) {
 							GDScriptCodeGenerator::Address global = codegen.add_temporary(_gdtype_from_datatype(in->get_datatype(), codegen.script));
 							int idx = GDScriptLanguage::get_singleton()->get_global_map()[identifier];
@@ -2169,10 +2169,10 @@ Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::Sui
 				}
 
 				if (return_n->void_return) {
-					// Always return `null`, even if the expression is a call to a `void` function.
-					gen->write_return(codegen.add_constant(Variant()), false);
+					// Always return "null", even if the expression is a call to a void function.
+					gen->write_return(codegen.add_constant(Variant()));
 				} else {
-					gen->write_return(return_value, return_n->use_conversion);
+					gen->write_return(return_value);
 				}
 				if (return_value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
 					codegen.generator->pop_temporary();
@@ -2796,26 +2796,23 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 					return err;
 				}
 			} else if (!base->is_valid()) {
-				String base_qualified_name = base->fully_qualified_name;
-				String base_path = base->path;
-
 				Error err = OK;
-				Ref<GDScript> base_root = GDScriptCache::get_shallow_script(base_path, err, p_script->path);
+				Ref<GDScript> base_root = GDScriptCache::get_shallow_script(base->path, err, p_script->path);
 				if (err) {
-					_set_error(vformat(R"(Could not parse base class "%s" from "%s": %s)", base_qualified_name, base_path, error_names[err]), nullptr);
+					_set_error(vformat(R"(Could not parse base class "%s" from "%s": %s)", base->fully_qualified_name, base->path, error_names[err]), nullptr);
 					return err;
 				}
 				if (base_root.is_valid()) {
-					base = Ref<GDScript>(base_root->find_class(base_qualified_name));
+					base = Ref<GDScript>(base_root->find_class(base->fully_qualified_name));
 				}
 				if (base.is_null()) {
-					_set_error(vformat(R"(Could not find class "%s" in "%s".)", base_qualified_name, base_path), nullptr);
+					_set_error(vformat(R"(Could not find class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr);
 					return ERR_COMPILATION_FAILED;
 				}
 
 				err = _prepare_compilation(base.ptr(), p_class->base_type.class_type, p_keep_state);
 				if (err) {
-					_set_error(vformat(R"(Could not populate class members of base class "%s" in "%s".)", base_qualified_name, base_path), nullptr);
+					_set_error(vformat(R"(Could not populate class members of base class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr);
 					return err;
 				}
 			}
@@ -2863,11 +2860,9 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 						}
 						break;
 				}
+				minfo.data_type = _gdtype_from_datatype(variable->get_datatype(), p_script);
 
-				const GDScriptParser::DataType variable_type = variable->get_datatype();
-				minfo.data_type = _gdtype_from_datatype(variable_type, p_script);
-
-				PropertyInfo prop_info = variable_type.to_property_info(name);
+				PropertyInfo prop_info = variable->get_datatype().to_property_info(name);
 				PropertyInfo export_info = variable->export_info;
 
 				if (variable->exported) {
@@ -2878,28 +2873,6 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 					prop_info.hint = export_info.hint;
 					prop_info.hint_string = export_info.hint_string;
 					prop_info.usage = export_info.usage;
-				} else {
-					// Enum hint doesn't really belong to the data type information, so we don't want to add it to
-					// `GDScriptParser::DataType::to_property_info()`. However, we still want to add this metadata
-					// for unexported properties so they display nicely in the Remote Tree Inspector.
-					if (variable_type.kind == GDScriptParser::DataType::ENUM && !variable_type.is_meta_type) {
-						prop_info.hint = PROPERTY_HINT_ENUM;
-
-						String enum_hint_string;
-						bool first = true;
-						for (const KeyValue<StringName, int64_t> &E : variable_type.enum_values) {
-							if (first) {
-								first = false;
-							} else {
-								enum_hint_string += ",";
-							}
-							enum_hint_string += E.key.operator String().capitalize().xml_escape();
-							enum_hint_string += ":";
-							enum_hint_string += String::num_int64(E.value).xml_escape();
-						}
-
-						prop_info.hint_string = enum_hint_string;
-					}
 				}
 				prop_info.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
 				minfo.property_info = prop_info;
diff --git a/engine/modules/gdscript/gdscript_compiler.h b/engine/modules/gdscript/gdscript_compiler.h
index ce832f24..fcd23425 100644
--- a/engine/modules/gdscript/gdscript_compiler.h
+++ b/engine/modules/gdscript/gdscript_compiler.h
@@ -129,7 +129,7 @@ class GDScriptCompiler {
 		}
 
 		void start_block() {
-			HashMap<StringName, GDScriptCodeGenerator::Address> old_locals(locals);
+			HashMap<StringName, GDScriptCodeGenerator::Address> old_locals = locals;
 			locals_stack.push_back(old_locals);
 			generator->start_block();
 		}
diff --git a/engine/modules/gdscript/gdscript_disassembler.cpp b/engine/modules/gdscript/gdscript_disassembler.cpp
index 80e02acd..56b9f1dc 100644
--- a/engine/modules/gdscript/gdscript_disassembler.cpp
+++ b/engine/modules/gdscript/gdscript_disassembler.cpp
@@ -33,7 +33,6 @@
 #include "gdscript.h"
 #include "gdscript_function.h"
 
-#include "core/object/method_bind.h"
 #include "core/string/string_builder.h"
 
 static String _get_variant_string(const Variant &p_variant) {
@@ -1117,56 +1116,56 @@ void GDScriptFunction::disassemble(const Vector<String> &p_code_lines) const {
 				incr += 3;
 			} break;
 
-#define DISASSEMBLE_ITERATE(m_type) \
-	case OPCODE_ITERATE_##m_type: { \
-		text += "for-loop (typed "; \
-		text += #m_type; \
-		text += ") "; \
-		text += DADDR(3); \
-		text += " in "; \
-		text += DADDR(2); \
-		text += " counter "; \
-		text += DADDR(1); \
-		text += " end "; \
+#define DISASSEMBLE_ITERATE(m_type)      \
+	case OPCODE_ITERATE_##m_type: {      \
+		text += "for-loop (typed ";      \
+		text += #m_type;                 \
+		text += ") ";                    \
+		text += DADDR(3);                \
+		text += " in ";                  \
+		text += DADDR(2);                \
+		text += " counter ";             \
+		text += DADDR(1);                \
+		text += " end ";                 \
 		text += itos(_code_ptr[ip + 4]); \
-		incr += 5; \
+		incr += 5;                       \
 	} break
 
 #define DISASSEMBLE_ITERATE_BEGIN(m_type) \
 	case OPCODE_ITERATE_BEGIN_##m_type: { \
-		text += "for-init (typed "; \
-		text += #m_type; \
-		text += ") "; \
-		text += DADDR(3); \
-		text += " in "; \
-		text += DADDR(2); \
-		text += " counter "; \
-		text += DADDR(1); \
-		text += " end "; \
-		text += itos(_code_ptr[ip + 4]); \
-		incr += 5; \
+		text += "for-init (typed ";       \
+		text += #m_type;                  \
+		text += ") ";                     \
+		text += DADDR(3);                 \
+		text += " in ";                   \
+		text += DADDR(2);                 \
+		text += " counter ";              \
+		text += DADDR(1);                 \
+		text += " end ";                  \
+		text += itos(_code_ptr[ip + 4]);  \
+		incr += 5;                        \
 	} break
 
 #define DISASSEMBLE_ITERATE_TYPES(m_macro) \
-	m_macro(INT); \
-	m_macro(FLOAT); \
-	m_macro(VECTOR2); \
-	m_macro(VECTOR2I); \
-	m_macro(VECTOR3); \
-	m_macro(VECTOR3I); \
-	m_macro(STRING); \
-	m_macro(DICTIONARY); \
-	m_macro(ARRAY); \
-	m_macro(PACKED_BYTE_ARRAY); \
-	m_macro(PACKED_INT32_ARRAY); \
-	m_macro(PACKED_INT64_ARRAY); \
-	m_macro(PACKED_FLOAT32_ARRAY); \
-	m_macro(PACKED_FLOAT64_ARRAY); \
-	m_macro(PACKED_STRING_ARRAY); \
-	m_macro(PACKED_VECTOR2_ARRAY); \
-	m_macro(PACKED_VECTOR3_ARRAY); \
-	m_macro(PACKED_COLOR_ARRAY); \
-	m_macro(PACKED_VECTOR4_ARRAY); \
+	m_macro(INT);                          \
+	m_macro(FLOAT);                        \
+	m_macro(VECTOR2);                      \
+	m_macro(VECTOR2I);                     \
+	m_macro(VECTOR3);                      \
+	m_macro(VECTOR3I);                     \
+	m_macro(STRING);                       \
+	m_macro(DICTIONARY);                   \
+	m_macro(ARRAY);                        \
+	m_macro(PACKED_BYTE_ARRAY);            \
+	m_macro(PACKED_INT32_ARRAY);           \
+	m_macro(PACKED_INT64_ARRAY);           \
+	m_macro(PACKED_FLOAT32_ARRAY);         \
+	m_macro(PACKED_FLOAT64_ARRAY);         \
+	m_macro(PACKED_STRING_ARRAY);          \
+	m_macro(PACKED_VECTOR2_ARRAY);         \
+	m_macro(PACKED_VECTOR3_ARRAY);         \
+	m_macro(PACKED_COLOR_ARRAY);           \
+	m_macro(PACKED_VECTOR4_ARRAY);         \
 	m_macro(OBJECT)
 
 			case OPCODE_ITERATE_BEGIN: {
@@ -1257,11 +1256,11 @@ void GDScriptFunction::disassemble(const Vector<String> &p_code_lines) const {
 
 #define DISASSEMBLE_TYPE_ADJUST(m_v_type) \
 	case OPCODE_TYPE_ADJUST_##m_v_type: { \
-		text += "type adjust ("; \
-		text += #m_v_type; \
-		text += ") "; \
-		text += DADDR(1); \
-		incr += 2; \
+		text += "type adjust (";          \
+		text += #m_v_type;                \
+		text += ") ";                     \
+		text += DADDR(1);                 \
+		incr += 2;                        \
 	} break
 
 				DISASSEMBLE_TYPE_ADJUST(BOOL);
diff --git a/engine/modules/gdscript/gdscript_editor.cpp b/engine/modules/gdscript/gdscript_editor.cpp
index 6ff00e6f..ad8e8afb 100644
--- a/engine/modules/gdscript/gdscript_editor.cpp
+++ b/engine/modules/gdscript/gdscript_editor.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "gdscript.h"
+
 #include "gdscript_analyzer.h"
 #include "gdscript_parser.h"
 #include "gdscript_tokenizer.h"
@@ -42,9 +43,7 @@
 #include "core/config/engine.h"
 #include "core/core_constants.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/math/expression.h"
-#include "core/object/class_db.h"
 #include "core/variant/container_type_validate.h"
 
 #ifdef TOOLS_ENABLED
@@ -170,8 +169,8 @@ bool GDScriptLanguage::validate(const String &p_script, const String &p_path, Li
 			for (const GDScriptParser::ParserError &pe : parser.get_errors()) {
 				ScriptLanguage::ScriptError e;
 				e.path = p_path;
-				e.line = pe.start_line;
-				e.column = pe.start_column;
+				e.line = pe.line;
+				e.column = pe.column;
 				e.message = pe.message;
 				r_errors->push_back(e);
 			}
@@ -181,8 +180,8 @@ bool GDScriptLanguage::validate(const String &p_script, const String &p_path, Li
 				for (const GDScriptParser::ParserError &pe : depended_parser->get_errors()) {
 					ScriptLanguage::ScriptError e;
 					e.path = E.key;
-					e.line = pe.start_line;
-					e.column = pe.start_column;
+					e.line = pe.line;
+					e.column = pe.column;
 					e.message = pe.message;
 					r_errors->push_back(e);
 				}
@@ -247,6 +246,10 @@ int GDScriptLanguage::find_function(const String &p_function, const String &p_co
 	return -1;
 }
 
+Script *GDScriptLanguage::create_script() const {
+	return memnew(GDScript);
+}
+
 /* DEBUGGER FUNCTIONS */
 
 thread_local int GDScriptLanguage::_debug_parse_err_line = -1;
@@ -342,12 +345,7 @@ void GDScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p
 	f->debug_get_stack_member_state(*cl->line, &locals);
 	for (const Pair<StringName, int> &E : locals) {
 		p_locals->push_back(E.first);
-
-		if (f->constant_map.has(E.first)) {
-			p_values->push_back(f->constant_map[E.first]);
-		} else {
-			p_values->push_back(cl->stack[E.second]);
-		}
+		p_values->push_back(cl->stack[E.second]);
 	}
 }
 
@@ -478,7 +476,7 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const
 		MethodInfo mi;
 		mi.name = "preload";
 		mi.arguments.push_back(PropertyInfo(Variant::STRING, "path"));
-		mi.return_val = PropertyInfo(Variant::OBJECT, "", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static());
+		mi.return_val = PropertyInfo(Variant::OBJECT, "", PROPERTY_HINT_RESOURCE_TYPE, "Resource");
 		p_functions->push_back(mi);
 	}
 	{
@@ -940,7 +938,7 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
 			ScriptLanguage::CodeCompletionOption hint1("attenuation", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
 			hint1.insert_text = hint1.display.quote(p_quote_style);
 			r_result.insert(hint1.display, hint1);
-			ScriptLanguage::CodeCompletionOption hint2("positive_only", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
+			ScriptLanguage::CodeCompletionOption hint2("inout", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
 			hint2.insert_text = hint2.display.quote(p_quote_style);
 			r_result.insert(hint2.display, hint2);
 		}
@@ -1125,7 +1123,7 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio
 	}
 
 	// Autoload singletons
-	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
+	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
 	for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
 		const ProjectSettings::AutoloadInfo &info = E.value;
@@ -3345,7 +3343,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 			_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
 		}
 
-		MethodInfo mi(PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static()), "preload", PropertyInfo(Variant::STRING, "path"));
+		MethodInfo mi(PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), "preload", PropertyInfo(Variant::STRING, "path"));
 		r_arghint = _make_arguments_hint(mi, p_argidx);
 		return;
 	} else if (p_call->type != GDScriptParser::Node::CALL) {
@@ -3466,7 +3464,6 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 
 	switch (completion_context.type) {
 		case GDScriptParser::COMPLETION_NONE:
-		case GDScriptParser::COMPLETION_DECLARATION:
 			break;
 		case GDScriptParser::COMPLETION_ANNOTATION: {
 			List<MethodInfo> annotations;
@@ -4414,8 +4411,6 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 		case GDScriptParser::COMPLETION_METHOD:
 		case GDScriptParser::COMPLETION_ASSIGN:
 		case GDScriptParser::COMPLETION_CALL_ARGUMENTS:
-		case GDScriptParser::COMPLETION_DECLARATION:
-		case GDScriptParser::COMPLETION_INHERIT_TYPE:
 		case GDScriptParser::COMPLETION_IDENTIFIER:
 		case GDScriptParser::COMPLETION_PROPERTY_METHOD:
 		case GDScriptParser::COMPLETION_SUBSCRIPT: {
@@ -4608,14 +4603,8 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 			}
 		} break;
 		case GDScriptParser::COMPLETION_OVERRIDE_METHOD: {
-			// This logic applies to any method declaration (override or not),
-			// but shows parent documentation on virtual method overrides.
 			GDScriptParser::DataType base_type = context.current_class->base_type;
-			if (_lookup_symbol_from_base(base_type, p_symbol, r_result) == OK) {
-				return OK;
-			}
 
-			base_type = context.current_class->get_datatype();
 			if (_lookup_symbol_from_base(base_type, p_symbol, r_result) == OK) {
 				return OK;
 			}
diff --git a/engine/modules/gdscript/gdscript_function.cpp b/engine/modules/gdscript/gdscript_function.cpp
index 2925e2d5..03c7e7df 100644
--- a/engine/modules/gdscript/gdscript_function.cpp
+++ b/engine/modules/gdscript/gdscript_function.cpp
@@ -32,125 +32,6 @@
 
 #include "gdscript.h"
 
-#include "core/object/class_db.h"
-
-bool GDScriptDataType::is_type(const Variant &p_variant, bool p_allow_implicit_conversion) const {
-	switch (kind) {
-		case VARIANT: {
-			return true;
-		} break;
-		case BUILTIN: {
-			Variant::Type var_type = p_variant.get_type();
-			bool valid = builtin_type == var_type;
-			if (valid && builtin_type == Variant::ARRAY && has_container_element_type(0)) {
-				Array array = p_variant;
-				if (array.is_typed()) {
-					const GDScriptDataType &elem_type = container_element_types[0];
-					Variant::Type array_builtin_type = (Variant::Type)array.get_typed_builtin();
-					StringName array_native_type = array.get_typed_class_name();
-					Ref<Script> array_script_type_ref = array.get_typed_script();
-
-					if (array_script_type_ref.is_valid()) {
-						valid = (elem_type.kind == SCRIPT || elem_type.kind == GDSCRIPT) && elem_type.script_type == array_script_type_ref.ptr();
-					} else if (array_native_type != StringName()) {
-						valid = elem_type.kind == NATIVE && elem_type.native_type == array_native_type;
-					} else {
-						valid = elem_type.kind == BUILTIN && elem_type.builtin_type == array_builtin_type;
-					}
-				} else {
-					valid = false;
-				}
-			} else if (valid && builtin_type == Variant::DICTIONARY && has_container_element_types()) {
-				Dictionary dictionary = p_variant;
-				if (dictionary.is_typed()) {
-					if (dictionary.is_typed_key()) {
-						GDScriptDataType key = get_container_element_type_or_variant(0);
-						Variant::Type key_builtin_type = (Variant::Type)dictionary.get_typed_key_builtin();
-						StringName key_native_type = dictionary.get_typed_key_class_name();
-						Ref<Script> key_script_type_ref = dictionary.get_typed_key_script();
-
-						if (key_script_type_ref.is_valid()) {
-							valid = (key.kind == SCRIPT || key.kind == GDSCRIPT) && key.script_type == key_script_type_ref.ptr();
-						} else if (key_native_type != StringName()) {
-							valid = key.kind == NATIVE && key.native_type == key_native_type;
-						} else {
-							valid = key.kind == BUILTIN && key.builtin_type == key_builtin_type;
-						}
-					}
-
-					if (valid && dictionary.is_typed_value()) {
-						GDScriptDataType value = get_container_element_type_or_variant(1);
-						Variant::Type value_builtin_type = (Variant::Type)dictionary.get_typed_value_builtin();
-						StringName value_native_type = dictionary.get_typed_value_class_name();
-						Ref<Script> value_script_type_ref = dictionary.get_typed_value_script();
-
-						if (value_script_type_ref.is_valid()) {
-							valid = (value.kind == SCRIPT || value.kind == GDSCRIPT) && value.script_type == value_script_type_ref.ptr();
-						} else if (value_native_type != StringName()) {
-							valid = value.kind == NATIVE && value.native_type == value_native_type;
-						} else {
-							valid = value.kind == BUILTIN && value.builtin_type == value_builtin_type;
-						}
-					}
-				} else {
-					valid = false;
-				}
-			} else if (!valid && p_allow_implicit_conversion) {
-				valid = Variant::can_convert_strict(var_type, builtin_type);
-			}
-			return valid;
-		} break;
-		case NATIVE: {
-			if (p_variant.get_type() == Variant::NIL) {
-				return true;
-			}
-			if (p_variant.get_type() != Variant::OBJECT) {
-				return false;
-			}
-
-			bool was_freed = false;
-			Object *obj = p_variant.get_validated_object_with_check(was_freed);
-			if (!obj) {
-				return !was_freed;
-			}
-
-			if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
-				return false;
-			}
-			return true;
-		} break;
-		case SCRIPT:
-		case GDSCRIPT: {
-			if (p_variant.get_type() == Variant::NIL) {
-				return true;
-			}
-			if (p_variant.get_type() != Variant::OBJECT) {
-				return false;
-			}
-
-			bool was_freed = false;
-			Object *obj = p_variant.get_validated_object_with_check(was_freed);
-			if (!obj) {
-				return !was_freed;
-			}
-
-			Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;
-			bool valid = false;
-			while (base.is_valid()) {
-				if (base == script_type) {
-					valid = true;
-					break;
-				}
-				base = base->get_base_script();
-			}
-			return valid;
-		} break;
-	}
-	return false;
-}
-
-/////////////////////
-
 Variant GDScriptFunction::get_constant(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, constants.size(), "<errconst>");
 	return constants[p_idx];
@@ -325,7 +206,7 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
 			return Variant();
 #endif
 		}
-		// Do these now to avoid locking again after the call.
+		// Do these now to avoid locking again after the call
 		scripts_list.remove_from_list();
 		instances_list.remove_from_list();
 	}
@@ -334,9 +215,26 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
 	Callable::CallError err;
 	Variant ret = function->call(nullptr, nullptr, 0, err, &state);
 
-	function = nullptr; // Cleaned up.
+	bool completed = true;
+
+	// If the return value is a GDScriptFunctionState reference,
+	// then the function did await again after resuming.
+	if (ret.is_ref_counted()) {
+		GDScriptFunctionState *gdfs = Object::cast_to<GDScriptFunctionState>(ret);
+		if (gdfs && gdfs->function == function) {
+			completed = false;
+			// Keep the first state alive via reference.
+			gdfs->first_state = first_state.is_valid() ? first_state : Ref<GDScriptFunctionState>(this);
+		}
+	}
+
+	function = nullptr; //cleaned up;
 	state.result = Variant();
 
+	if (completed) {
+		_clear_stack();
+	}
+
 	return ret;
 }
 
@@ -379,6 +277,5 @@ GDScriptFunctionState::~GDScriptFunctionState() {
 		MutexLock lock(GDScriptLanguage::singleton->mutex);
 		scripts_list.remove_from_list();
 		instances_list.remove_from_list();
-		_clear_stack();
 	}
 }
diff --git a/engine/modules/gdscript/gdscript_function.h b/engine/modules/gdscript/gdscript_function.h
index 8171a0f1..664ac2a0 100644
--- a/engine/modules/gdscript/gdscript_function.h
+++ b/engine/modules/gdscript/gdscript_function.h
@@ -64,7 +64,120 @@ public:
 
 	_FORCE_INLINE_ bool has_type() const { return kind != VARIANT; }
 
-	bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const;
+	bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const {
+		switch (kind) {
+			case VARIANT: {
+				return true;
+			} break;
+			case BUILTIN: {
+				Variant::Type var_type = p_variant.get_type();
+				bool valid = builtin_type == var_type;
+				if (valid && builtin_type == Variant::ARRAY && has_container_element_type(0)) {
+					Array array = p_variant;
+					if (array.is_typed()) {
+						const GDScriptDataType &elem_type = container_element_types[0];
+						Variant::Type array_builtin_type = (Variant::Type)array.get_typed_builtin();
+						StringName array_native_type = array.get_typed_class_name();
+						Ref<Script> array_script_type_ref = array.get_typed_script();
+
+						if (array_script_type_ref.is_valid()) {
+							valid = (elem_type.kind == SCRIPT || elem_type.kind == GDSCRIPT) && elem_type.script_type == array_script_type_ref.ptr();
+						} else if (array_native_type != StringName()) {
+							valid = elem_type.kind == NATIVE && elem_type.native_type == array_native_type;
+						} else {
+							valid = elem_type.kind == BUILTIN && elem_type.builtin_type == array_builtin_type;
+						}
+					} else {
+						valid = false;
+					}
+				} else if (valid && builtin_type == Variant::DICTIONARY && has_container_element_types()) {
+					Dictionary dictionary = p_variant;
+					if (dictionary.is_typed()) {
+						if (dictionary.is_typed_key()) {
+							GDScriptDataType key = get_container_element_type_or_variant(0);
+							Variant::Type key_builtin_type = (Variant::Type)dictionary.get_typed_key_builtin();
+							StringName key_native_type = dictionary.get_typed_key_class_name();
+							Ref<Script> key_script_type_ref = dictionary.get_typed_key_script();
+
+							if (key_script_type_ref.is_valid()) {
+								valid = (key.kind == SCRIPT || key.kind == GDSCRIPT) && key.script_type == key_script_type_ref.ptr();
+							} else if (key_native_type != StringName()) {
+								valid = key.kind == NATIVE && key.native_type == key_native_type;
+							} else {
+								valid = key.kind == BUILTIN && key.builtin_type == key_builtin_type;
+							}
+						}
+
+						if (valid && dictionary.is_typed_value()) {
+							GDScriptDataType value = get_container_element_type_or_variant(1);
+							Variant::Type value_builtin_type = (Variant::Type)dictionary.get_typed_value_builtin();
+							StringName value_native_type = dictionary.get_typed_value_class_name();
+							Ref<Script> value_script_type_ref = dictionary.get_typed_value_script();
+
+							if (value_script_type_ref.is_valid()) {
+								valid = (value.kind == SCRIPT || value.kind == GDSCRIPT) && value.script_type == value_script_type_ref.ptr();
+							} else if (value_native_type != StringName()) {
+								valid = value.kind == NATIVE && value.native_type == value_native_type;
+							} else {
+								valid = value.kind == BUILTIN && value.builtin_type == value_builtin_type;
+							}
+						}
+					} else {
+						valid = false;
+					}
+				} else if (!valid && p_allow_implicit_conversion) {
+					valid = Variant::can_convert_strict(var_type, builtin_type);
+				}
+				return valid;
+			} break;
+			case NATIVE: {
+				if (p_variant.get_type() == Variant::NIL) {
+					return true;
+				}
+				if (p_variant.get_type() != Variant::OBJECT) {
+					return false;
+				}
+
+				bool was_freed = false;
+				Object *obj = p_variant.get_validated_object_with_check(was_freed);
+				if (!obj) {
+					return !was_freed;
+				}
+
+				if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
+					return false;
+				}
+				return true;
+			} break;
+			case SCRIPT:
+			case GDSCRIPT: {
+				if (p_variant.get_type() == Variant::NIL) {
+					return true;
+				}
+				if (p_variant.get_type() != Variant::OBJECT) {
+					return false;
+				}
+
+				bool was_freed = false;
+				Object *obj = p_variant.get_validated_object_with_check(was_freed);
+				if (!obj) {
+					return !was_freed;
+				}
+
+				Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;
+				bool valid = false;
+				while (base.is_valid()) {
+					if (base == script_type) {
+						valid = true;
+						break;
+					}
+					base = base->get_base_script();
+				}
+				return valid;
+			} break;
+		}
+		return false;
+	}
 
 	bool can_contain_object() const {
 		if (kind == BUILTIN) {
@@ -360,13 +473,12 @@ private:
 
 	SelfList<GDScriptFunction> function_list{ this };
 	mutable Variant nil;
-	TightLocalVector<Pair<int, Variant::Type>> temporary_slots;
+	HashMap<int, Variant::Type> temporary_slots;
 	List<StackDebug> stack_debug;
 
 	Vector<int> code;
 	Vector<int> default_arguments;
 	Vector<Variant> constants;
-	HashMap<StringName, Variant> constant_map;
 	Vector<StringName> global_names;
 	Vector<Variant::ValidatedOperatorEvaluator> operator_funcs;
 	Vector<Variant::ValidatedSetter> setters;
@@ -505,6 +617,7 @@ class GDScriptFunctionState : public RefCounted {
 	GDScriptFunction *function = nullptr;
 	GDScriptFunction::CallState state;
 	Variant _signal_callback(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
+	Ref<GDScriptFunctionState> first_state;
 
 	SelfList<GDScriptFunctionState> scripts_list;
 	SelfList<GDScriptFunctionState> instances_list;
diff --git a/engine/modules/gdscript/gdscript_parser.cpp b/engine/modules/gdscript/gdscript_parser.cpp
index 8fb0e926..d3407944 100644
--- a/engine/modules/gdscript/gdscript_parser.cpp
+++ b/engine/modules/gdscript/gdscript_parser.cpp
@@ -36,7 +36,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
-#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef DEBUG_ENABLED
@@ -236,22 +235,12 @@ void GDScriptParser::push_error(const String &p_message, const Node *p_origin) {
 	// TODO: Improve error reporting by pointing at source code.
 	// TODO: Errors might point at more than one place at once (e.g. show previous declaration).
 	panic_mode = true;
-	ParserError err;
-	err.message = p_message;
-
+	// TODO: Improve positional information.
 	if (p_origin == nullptr) {
-		err.start_line = previous.start_line;
-		err.start_column = previous.start_column;
-		err.end_line = previous.end_line;
-		err.end_column = previous.end_column;
+		errors.push_back({ p_message, previous.start_line, previous.start_column });
 	} else {
-		err.start_line = p_origin->start_line;
-		err.start_column = p_origin->start_column;
-		err.end_line = p_origin->end_line;
-		err.end_column = p_origin->end_column;
+		errors.push_back({ p_message, p_origin->start_line, p_origin->start_column });
 	}
-
-	errors.push_back(err);
 }
 
 #ifdef DEBUG_ENABLED
@@ -290,9 +279,7 @@ void GDScriptParser::apply_pending_warnings() {
 		warning.code = pw.code;
 		warning.symbols = pw.symbols;
 		warning.start_line = pw.source->start_line;
-		warning.start_column = pw.source->start_column;
 		warning.end_line = pw.source->end_line;
-		warning.end_column = pw.source->end_column;
 
 		if (pw.treated_as_error) {
 			push_error(warning.get_message() + String(" (Warning treated as error.)"), pw.source);
@@ -704,12 +691,12 @@ void GDScriptParser::parse_program() {
 	current_class = head;
 	bool can_have_class_or_extends = true;
 
-#define PUSH_PENDING_ANNOTATIONS_TO_HEAD \
-	if (!annotation_stack.is_empty()) { \
+#define PUSH_PENDING_ANNOTATIONS_TO_HEAD                 \
+	if (!annotation_stack.is_empty()) {                  \
 		for (AnnotationNode *annot : annotation_stack) { \
-			head->annotations.push_back(annot); \
-		} \
-		annotation_stack.clear(); \
+			head->annotations.push_back(annot);          \
+		}                                                \
+		annotation_stack.clear();                        \
 	}
 
 	while (!check(GDScriptTokenizer::Token::TK_EOF)) {
@@ -938,8 +925,6 @@ bool GDScriptParser::has_class(const GDScriptParser::ClassNode *p_class) const {
 GDScriptParser::ClassNode *GDScriptParser::parse_class(bool p_is_static) {
 	ClassNode *n_class = alloc_node<ClassNode>();
 
-	make_completion_context(COMPLETION_DECLARATION, n_class);
-
 	ClassNode *previous_class = current_class;
 	current_class = n_class;
 	n_class->outer = previous_class;
@@ -996,12 +981,6 @@ void GDScriptParser::parse_class_name() {
 		current_class->fqcn = String(current_class->identifier->name);
 	}
 
-	if (script_path.begins_with("res://") && script_path.contains("::")) {
-		push_error(R"("class_name" isn't allowed in built-in scripts.)");
-	}
-
-	make_completion_context(COMPLETION_DECLARATION, current_class);
-
 	if (match(GDScriptTokenizer::Token::EXTENDS)) {
 		// Allow extends on the same line.
 		parse_extends();
@@ -1235,8 +1214,6 @@ GDScriptParser::VariableNode *GDScriptParser::parse_variable(bool p_is_static) {
 GDScriptParser::VariableNode *GDScriptParser::parse_variable(bool p_is_static, bool p_allow_property) {
 	VariableNode *variable = alloc_node<VariableNode>();
 
-	make_completion_context(COMPLETION_DECLARATION, variable);
-
 	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected variable name after "var".)")) {
 		complete_extents(variable);
 		return nullptr;
@@ -1473,8 +1450,6 @@ void GDScriptParser::parse_property_getter(VariableNode *p_variable) {
 GDScriptParser::ConstantNode *GDScriptParser::parse_constant(bool p_is_static) {
 	ConstantNode *constant = alloc_node<ConstantNode>();
 
-	make_completion_context(COMPLETION_DECLARATION, constant);
-
 	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected constant name after "const".)")) {
 		complete_extents(constant);
 		return nullptr;
@@ -1543,8 +1518,6 @@ GDScriptParser::ParameterNode *GDScriptParser::parse_parameter() {
 GDScriptParser::SignalNode *GDScriptParser::parse_signal(bool p_is_static) {
 	SignalNode *signal = alloc_node<SignalNode>();
 
-	make_completion_context(COMPLETION_DECLARATION, signal);
-
 	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected signal name after "signal".)")) {
 		complete_extents(signal);
 		return nullptr;
@@ -1591,8 +1564,6 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum(bool p_is_static) {
 	EnumNode *enum_node = alloc_node<EnumNode>();
 	bool named = false;
 
-	make_completion_context(COMPLETION_DECLARATION, enum_node);
-
 	if (match(GDScriptTokenizer::Token::IDENTIFIER)) {
 		enum_node->identifier = parse_identifier();
 		named = true;
@@ -3483,9 +3454,8 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
 		if (!check(GDScriptTokenizer::Token::PERIOD)) {
 			make_completion_context(COMPLETION_SUPER, call);
 		}
-		if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
-			push_multiline(true);
-			advance();
+		push_multiline(true);
+		if (match(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
 			// Implicit call to the parent method of the same name.
 			if (current_function == nullptr) {
 				push_error(R"(Cannot use implicit "super" call outside of a function.)");
@@ -3502,18 +3472,15 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
 			consume(GDScriptTokenizer::Token::PERIOD, R"(Expected "." or "(" after "super".)");
 			make_completion_context(COMPLETION_SUPER_METHOD, call);
 			if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected function name after ".".)")) {
+				pop_multiline();
 				complete_extents(call);
 				return nullptr;
 			}
 			IdentifierNode *identifier = parse_identifier();
 			call->callee = identifier;
 			call->function_name = identifier->name;
-
-			if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
-				push_multiline(true);
-				advance();
-			} else {
-				push_error(R"(Expected "(" after function name.)");
+			if (!consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after function name.)")) {
+				pop_multiline();
 				complete_extents(call);
 				return nullptr;
 			}
@@ -3935,24 +3902,20 @@ enum DocLineState {
 	DOC_LINE_IN_KBD,
 };
 
-static void _process_doc_line(const String &p_line, String &r_text, const String &p_space_prefix, DocLineState &r_state) {
+static String _process_doc_line(const String &p_line, const String &p_text, const String &p_space_prefix, DocLineState &r_state) {
 	String line = p_line;
 	if (r_state == DOC_LINE_NORMAL) {
-		line = line.lstrip(" \t");
+		line = line.strip_edges(true, false);
 	} else {
 		line = line.trim_prefix(p_space_prefix);
 	}
 
 	String line_join;
-	if (!r_text.is_empty()) {
+	if (!p_text.is_empty()) {
 		if (r_state == DOC_LINE_NORMAL) {
-			if (r_text.ends_with("[/codeblock]")) {
+			if (p_text.ends_with("[/codeblock]")) {
 				line_join = "\n";
-			} else if (r_text.ends_with("[br]")) {
-				// We want to replace `[br][br]` with `\n` (paragraph), so we move the trailing `[br]` here.
-				r_text = r_text.left(-4); // `-len("[br]")`.
-				line = "[br]" + line;
-			} else if (!r_text.ends_with("\n")) {
+			} else if (!p_text.ends_with("[br]")) {
 				line_join = " ";
 			}
 		} else {
@@ -3982,14 +3945,7 @@ static void _process_doc_line(const String &p_line, String &r_text, const String
 				from = rb_pos + 1;
 
 				String tag = line.substr(lb_pos + 1, rb_pos - lb_pos - 1);
-				if (tag == "br") {
-					if (line.substr(from, 4) == "[br]") { // `len("[br]")`.
-						// Replace `[br][br]` with `\n` (paragraph).
-						result += line.substr(buffer_start, lb_pos - buffer_start) + '\n';
-						from += 4; // `len("[br]")`.
-						buffer_start = from;
-					}
-				} else if (tag == "code" || tag.begins_with("code ")) {
+				if (tag == "code" || tag.begins_with("code ")) {
 					r_state = DOC_LINE_IN_CODE;
 				} else if (tag == "codeblock" || tag.begins_with("codeblock ")) {
 					if (lb_pos == 0) {
@@ -4057,10 +4013,10 @@ static void _process_doc_line(const String &p_line, String &r_text, const String
 
 	result += line.substr(buffer_start);
 	if (r_state == DOC_LINE_NORMAL) {
-		result = result.rstrip(" \t");
+		result = result.strip_edges(false, true);
 	}
 
-	r_text += line_join + result;
+	return line_join + result;
 }
 
 bool GDScriptParser::has_comment(int p_line, bool p_must_be_doc) {
@@ -4123,7 +4079,7 @@ GDScriptParser::MemberDocData GDScriptParser::parse_doc_comment(int p_line, bool
 			}
 		}
 
-		_process_doc_line(doc_line, result.description, space_prefix, state);
+		result.description += _process_doc_line(doc_line, result.description, space_prefix, state);
 	}
 
 	return result;
@@ -4233,9 +4189,9 @@ GDScriptParser::ClassDocData GDScriptParser::parse_class_doc_comment(int p_line,
 		}
 
 		if (is_in_brief) {
-			_process_doc_line(doc_line, result.brief, space_prefix, state);
+			result.brief += _process_doc_line(doc_line, result.brief, space_prefix, state);
 		} else {
-			_process_doc_line(doc_line, result.description, space_prefix, state);
+			result.description += _process_doc_line(doc_line, result.description, space_prefix, state);
 		}
 	}
 
@@ -4832,10 +4788,10 @@ bool GDScriptParser::export_annotations(AnnotationNode *p_annotation, Node *p_ta
 					String enum_hint_string;
 					bool first = true;
 					for (const KeyValue<StringName, int64_t> &E : export_type.enum_values) {
-						if (first) {
-							first = false;
-						} else {
+						if (!first) {
 							enum_hint_string += ",";
+						} else {
+							first = false;
 						}
 						enum_hint_string += E.key.operator String().capitalize().xml_escape();
 						enum_hint_string += ":";
@@ -4909,10 +4865,10 @@ bool GDScriptParser::export_annotations(AnnotationNode *p_annotation, Node *p_ta
 						String enum_hint_string;
 						bool first = true;
 						for (const KeyValue<StringName, int64_t> &E : export_type.enum_values) {
-							if (first) {
-								first = false;
-							} else {
+							if (!first) {
 								enum_hint_string += ",";
+							} else {
+								first = false;
 							}
 							enum_hint_string += E.key.operator String().capitalize().xml_escape();
 							enum_hint_string += ":";
@@ -5132,14 +5088,14 @@ bool GDScriptParser::warning_ignore_annotation(AnnotationNode *p_annotation, Nod
 			int end_line = p_target->end_line;
 
 			switch (p_target->type) {
-#define SIMPLE_CASE(m_type, m_class, m_property) \
-	case m_type: { \
+#define SIMPLE_CASE(m_type, m_class, m_property)          \
+	case m_type: {                                        \
 		m_class *node = static_cast<m_class *>(p_target); \
-		if (node->m_property == nullptr) { \
-			end_line = node->start_line; \
-		} else { \
-			end_line = node->m_property->end_line; \
-		} \
+		if (node->m_property == nullptr) {                \
+			end_line = node->start_line;                  \
+		} else {                                          \
+			end_line = node->m_property->end_line;        \
+		}                                                 \
 	} break;
 
 				// Can contain properties (set/get).
diff --git a/engine/modules/gdscript/gdscript_parser.h b/engine/modules/gdscript/gdscript_parser.h
index e4e6c15f..2427481a 100644
--- a/engine/modules/gdscript/gdscript_parser.h
+++ b/engine/modules/gdscript/gdscript_parser.h
@@ -269,10 +269,7 @@ public:
 		// };
 		// Type type = NO_ERROR;
 		String message;
-		int start_line = 0;
-		int start_column = 0;
-		int end_line = 0;
-		int end_column = 0;
+		int line = 0, column = 0;
 	};
 
 #ifdef TOOLS_ENABLED
@@ -340,10 +337,8 @@ public:
 		};
 
 		Type type = NONE;
-		int start_line = 0;
-		int start_column = 0;
-		int end_line = 0;
-		int end_column = 0;
+		int start_line = 0, end_line = 0;
+		int start_column = 0, end_column = 0;
 		Node *next = nullptr;
 		List<AnnotationNode *> annotations;
 
@@ -1047,7 +1042,6 @@ public:
 	struct ReturnNode : public Node {
 		ExpressionNode *return_value = nullptr;
 		bool void_return = false;
-		bool use_conversion = false;
 
 		ReturnNode() {
 			type = RETURN;
@@ -1114,10 +1108,8 @@ public:
 			StringName name;
 			FunctionNode *source_function = nullptr;
 
-			int start_line = 0;
-			int start_column = 0;
-			int end_line = 0;
-			int end_column = 0;
+			int start_line = 0, end_line = 0;
+			int start_column = 0, end_column = 0;
 
 			DataType get_datatype() const;
 			String get_name() const;
@@ -1298,7 +1290,7 @@ public:
 		COMPLETION_ATTRIBUTE_METHOD, // After id.| to look for methods.
 		COMPLETION_BUILT_IN_TYPE_CONSTANT_OR_STATIC_METHOD, // Constants inside a built-in type (e.g. Color.BLUE) or static methods (e.g. Color.html).
 		COMPLETION_CALL_ARGUMENTS, // Complete with nodes, input actions, enum values (or usual expressions).
-		COMPLETION_DECLARATION, // Potential declaration (var, const, class, etc.).
+		// TODO: COMPLETION_DECLARATION, // Potential declaration (var, const, func).
 		COMPLETION_GET_NODE, // Get node with $ notation.
 		COMPLETION_IDENTIFIER, // List available identifiers in scope.
 		COMPLETION_INHERIT_TYPE, // Type after extends. Exclude non-viable types (built-ins, enums, void). Includes subtypes using the argument index.
diff --git a/engine/modules/gdscript/gdscript_resource_format.cpp b/engine/modules/gdscript/gdscript_resource_format.cpp
deleted file mode 100644
index 2d6582f3..00000000
--- a/engine/modules/gdscript/gdscript_resource_format.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************/
-/*  gdscript_resource_format.cpp                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "gdscript_resource_format.h"
-
-#include "gdscript_cache.h"
-#include "gdscript_parser.h"
-
-#include "core/io/file_access.h"
-#include "core/object/class_db.h"
-
-Ref<Resource> ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	Error err;
-	bool ignoring = p_cache_mode == CACHE_MODE_IGNORE || p_cache_mode == CACHE_MODE_IGNORE_DEEP;
-	Ref<GDScript> scr = GDScriptCache::get_full_script(p_original_path, err, "", ignoring);
-
-	if (err && scr.is_valid()) {
-		// If !scr.is_valid(), the error was likely from scr->load_source_code(), which already generates an error.
-		ERR_PRINT_ED(vformat(R"(Failed to load script "%s" with error "%s".)", p_original_path, error_names[err]));
-	}
-
-	if (r_error) {
-		// Don't fail loading because of parsing error.
-		*r_error = scr.is_valid() ? OK : err;
-	}
-
-	return scr;
-}
-
-void ResourceFormatLoaderGDScript::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("gd");
-	p_extensions->push_back("gdc");
-}
-
-bool ResourceFormatLoaderGDScript::handles_type(const String &p_type) const {
-	return (p_type == "Script" || p_type == "GDScript");
-}
-
-String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) const {
-	String el = p_path.get_extension().to_lower();
-	if (el == "gd" || el == "gdc") {
-		return "GDScript";
-	}
-	return "";
-}
-
-void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
-	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::READ);
-	ERR_FAIL_COND_MSG(file.is_null(), "Cannot open file '" + p_path + "'.");
-
-	String source = file->get_as_utf8_string();
-	if (source.is_empty()) {
-		return;
-	}
-
-	GDScriptParser parser;
-	if (OK != parser.parse(source, p_path, false)) {
-		return;
-	}
-
-	for (const String &E : parser.get_dependencies()) {
-		p_dependencies->push_back(E);
-	}
-}
-
-void ResourceFormatLoaderGDScript::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
-	Ref<GDScript> scr = ResourceLoader::load(p_path);
-	if (scr.is_null()) {
-		return;
-	}
-
-	const String source = scr->get_source_code();
-	GDScriptTokenizerText tokenizer;
-	tokenizer.set_source_code(source);
-	GDScriptTokenizer::Token current = tokenizer.scan();
-	while (current.type != GDScriptTokenizer::Token::TK_EOF) {
-		if (!current.is_identifier()) {
-			current = tokenizer.scan();
-			continue;
-		}
-
-		int insert_idx = 0;
-		for (int i = 0; i < current.start_line - 1; i++) {
-			insert_idx = source.find("\n", insert_idx) + 1;
-		}
-		// Insert the "cursor" character, needed for the lookup to work.
-		const String source_with_cursor = source.insert(insert_idx + current.start_column, String::chr(0xFFFF));
-
-		ScriptLanguage::LookupResult result;
-		if (scr->get_language()->lookup_code(source_with_cursor, current.get_identifier(), p_path, nullptr, result) == OK) {
-			if (!result.class_name.is_empty() && ClassDB::class_exists(result.class_name)) {
-				r_classes->insert(result.class_name);
-			}
-
-			if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY) {
-				PropertyInfo prop;
-				if (ClassDB::get_property_info(result.class_name, result.class_member, &prop)) {
-					if (!prop.class_name.is_empty() && ClassDB::class_exists(prop.class_name)) {
-						r_classes->insert(prop.class_name);
-					}
-					if (!prop.hint_string.is_empty() && ClassDB::class_exists(prop.hint_string)) {
-						r_classes->insert(prop.hint_string);
-					}
-				}
-			} else if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD) {
-				MethodInfo met;
-				if (ClassDB::get_method_info(result.class_name, result.class_member, &met)) {
-					if (!met.return_val.class_name.is_empty() && ClassDB::class_exists(met.return_val.class_name)) {
-						r_classes->insert(met.return_val.class_name);
-					}
-					if (!met.return_val.hint_string.is_empty() && ClassDB::class_exists(met.return_val.hint_string)) {
-						r_classes->insert(met.return_val.hint_string);
-					}
-				}
-			}
-		}
-
-		current = tokenizer.scan();
-	}
-}
-
-Error ResourceFormatSaverGDScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Ref<GDScript> sqscr = p_resource;
-	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
-
-	String source = sqscr->get_source_code();
-
-	{
-		Error err;
-		Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
-
-		ERR_FAIL_COND_V_MSG(err, err, "Cannot save GDScript file '" + p_path + "'.");
-
-		file->store_string(source);
-		if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
-			return ERR_CANT_CREATE;
-		}
-	}
-
-	if (ScriptServer::is_reload_scripts_on_save_enabled()) {
-		GDScriptLanguage::get_singleton()->reload_tool_script(p_resource, true);
-	}
-
-	return OK;
-}
-
-void ResourceFormatSaverGDScript::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	if (Object::cast_to<GDScript>(*p_resource)) {
-		p_extensions->push_back("gd");
-	}
-}
-
-bool ResourceFormatSaverGDScript::recognize(const Ref<Resource> &p_resource) const {
-	return Object::cast_to<GDScript>(*p_resource) != nullptr;
-}
diff --git a/engine/modules/gdscript/gdscript_resource_format.h b/engine/modules/gdscript/gdscript_resource_format.h
deleted file mode 100644
index 8fdc1136..00000000
--- a/engine/modules/gdscript/gdscript_resource_format.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************/
-/*  gdscript_resource_format.h                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-
-class ResourceFormatLoaderGDScript : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderGDScript, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-	virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false) override;
-	virtual void get_classes_used(const String &p_path, HashSet<StringName> *r_classes) override;
-};
-
-class ResourceFormatSaverGDScript : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverGDScript, ResourceFormatSaver);
-
-public:
-	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	virtual bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/modules/gdscript/gdscript_tokenizer.cpp b/engine/modules/gdscript/gdscript_tokenizer.cpp
index ad1e359f..a6a3262b 100644
--- a/engine/modules/gdscript/gdscript_tokenizer.cpp
+++ b/engine/modules/gdscript/gdscript_tokenizer.cpp
@@ -372,6 +372,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
 		if (start_line == line) {
 			// Single line token.
 			if (cursor_line == start_line && cursor_column >= start_column && cursor_column <= last_column) {
+				token.cursor_position = cursor_column - start_column;
 				if (cursor_column == start_column) {
 					token.cursor_place = CURSOR_BEGINNING;
 				} else if (cursor_column < column) {
@@ -384,6 +385,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
 			// Multi line token.
 			if (cursor_line == start_line && cursor_column >= start_column) {
 				// Is in first line.
+				token.cursor_position = cursor_column - start_column;
 				if (cursor_column == start_column) {
 					token.cursor_place = CURSOR_BEGINNING;
 				} else {
@@ -391,6 +393,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
 				}
 			} else if (cursor_line == line && cursor_column <= last_column) {
 				// Is in last line.
+				token.cursor_position = cursor_column - start_column;
 				if (cursor_column < column) {
 					token.cursor_place = CURSOR_MIDDLE;
 				} else {
@@ -398,7 +401,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
 				}
 			} else if (cursor_line > start_line && cursor_line < line) {
 				// Is in middle line.
-				token.cursor_place = CURSOR_MIDDLE;
+				token.cursor_position = CURSOR_MIDDLE;
 			}
 		}
 	}
@@ -483,66 +486,66 @@ GDScriptTokenizer::Token GDScriptTokenizerText::annotation() {
 	return annotation;
 }
 
-#define KEYWORDS(KEYWORD_GROUP, KEYWORD) \
-	KEYWORD_GROUP('a') \
-	KEYWORD("as", Token::AS) \
-	KEYWORD("and", Token::AND) \
-	KEYWORD("assert", Token::ASSERT) \
-	KEYWORD("await", Token::AWAIT) \
-	KEYWORD_GROUP('b') \
-	KEYWORD("break", Token::BREAK) \
+#define KEYWORDS(KEYWORD_GROUP, KEYWORD)     \
+	KEYWORD_GROUP('a')                       \
+	KEYWORD("as", Token::AS)                 \
+	KEYWORD("and", Token::AND)               \
+	KEYWORD("assert", Token::ASSERT)         \
+	KEYWORD("await", Token::AWAIT)           \
+	KEYWORD_GROUP('b')                       \
+	KEYWORD("break", Token::BREAK)           \
 	KEYWORD("breakpoint", Token::BREAKPOINT) \
-	KEYWORD_GROUP('c') \
-	KEYWORD("class", Token::CLASS) \
+	KEYWORD_GROUP('c')                       \
+	KEYWORD("class", Token::CLASS)           \
 	KEYWORD("class_name", Token::CLASS_NAME) \
-	KEYWORD("const", Token::TK_CONST) \
-	KEYWORD("continue", Token::CONTINUE) \
-	KEYWORD_GROUP('e') \
-	KEYWORD("elif", Token::ELIF) \
-	KEYWORD("else", Token::ELSE) \
-	KEYWORD("enum", Token::ENUM) \
-	KEYWORD("extends", Token::EXTENDS) \
-	KEYWORD_GROUP('f') \
-	KEYWORD("for", Token::FOR) \
-	KEYWORD("func", Token::FUNC) \
-	KEYWORD_GROUP('i') \
-	KEYWORD("if", Token::IF) \
-	KEYWORD("in", Token::TK_IN) \
-	KEYWORD("is", Token::IS) \
-	KEYWORD_GROUP('m') \
-	KEYWORD("match", Token::MATCH) \
-	KEYWORD_GROUP('n') \
-	KEYWORD("namespace", Token::NAMESPACE) \
-	KEYWORD("not", Token::NOT) \
-	KEYWORD_GROUP('o') \
-	KEYWORD("or", Token::OR) \
-	KEYWORD_GROUP('p') \
-	KEYWORD("pass", Token::PASS) \
-	KEYWORD("preload", Token::PRELOAD) \
-	KEYWORD_GROUP('r') \
-	KEYWORD("return", Token::RETURN) \
-	KEYWORD_GROUP('s') \
-	KEYWORD("self", Token::SELF) \
-	KEYWORD("signal", Token::SIGNAL) \
-	KEYWORD("static", Token::STATIC) \
-	KEYWORD("super", Token::SUPER) \
-	KEYWORD_GROUP('t') \
-	KEYWORD("trait", Token::TRAIT) \
-	KEYWORD_GROUP('v') \
-	KEYWORD("var", Token::VAR) \
-	KEYWORD("void", Token::TK_VOID) \
-	KEYWORD_GROUP('w') \
-	KEYWORD("while", Token::WHILE) \
-	KEYWORD("when", Token::WHEN) \
-	KEYWORD_GROUP('y') \
-	KEYWORD("yield", Token::YIELD) \
-	KEYWORD_GROUP('I') \
-	KEYWORD("INF", Token::CONST_INF) \
-	KEYWORD_GROUP('N') \
-	KEYWORD("NAN", Token::CONST_NAN) \
-	KEYWORD_GROUP('P') \
-	KEYWORD("PI", Token::CONST_PI) \
-	KEYWORD_GROUP('T') \
+	KEYWORD("const", Token::TK_CONST)        \
+	KEYWORD("continue", Token::CONTINUE)     \
+	KEYWORD_GROUP('e')                       \
+	KEYWORD("elif", Token::ELIF)             \
+	KEYWORD("else", Token::ELSE)             \
+	KEYWORD("enum", Token::ENUM)             \
+	KEYWORD("extends", Token::EXTENDS)       \
+	KEYWORD_GROUP('f')                       \
+	KEYWORD("for", Token::FOR)               \
+	KEYWORD("func", Token::FUNC)             \
+	KEYWORD_GROUP('i')                       \
+	KEYWORD("if", Token::IF)                 \
+	KEYWORD("in", Token::TK_IN)              \
+	KEYWORD("is", Token::IS)                 \
+	KEYWORD_GROUP('m')                       \
+	KEYWORD("match", Token::MATCH)           \
+	KEYWORD_GROUP('n')                       \
+	KEYWORD("namespace", Token::NAMESPACE)   \
+	KEYWORD("not", Token::NOT)               \
+	KEYWORD_GROUP('o')                       \
+	KEYWORD("or", Token::OR)                 \
+	KEYWORD_GROUP('p')                       \
+	KEYWORD("pass", Token::PASS)             \
+	KEYWORD("preload", Token::PRELOAD)       \
+	KEYWORD_GROUP('r')                       \
+	KEYWORD("return", Token::RETURN)         \
+	KEYWORD_GROUP('s')                       \
+	KEYWORD("self", Token::SELF)             \
+	KEYWORD("signal", Token::SIGNAL)         \
+	KEYWORD("static", Token::STATIC)         \
+	KEYWORD("super", Token::SUPER)           \
+	KEYWORD_GROUP('t')                       \
+	KEYWORD("trait", Token::TRAIT)           \
+	KEYWORD_GROUP('v')                       \
+	KEYWORD("var", Token::VAR)               \
+	KEYWORD("void", Token::TK_VOID)          \
+	KEYWORD_GROUP('w')                       \
+	KEYWORD("while", Token::WHILE)           \
+	KEYWORD("when", Token::WHEN)             \
+	KEYWORD_GROUP('y')                       \
+	KEYWORD("yield", Token::YIELD)           \
+	KEYWORD_GROUP('I')                       \
+	KEYWORD("INF", Token::CONST_INF)         \
+	KEYWORD_GROUP('N')                       \
+	KEYWORD("NAN", Token::CONST_NAN)         \
+	KEYWORD_GROUP('P')                       \
+	KEYWORD("PI", Token::CONST_PI)           \
+	KEYWORD_GROUP('T')                       \
 	KEYWORD("TAU", Token::CONST_TAU)
 
 #define MIN_KEYWORD_LENGTH 2
@@ -604,18 +607,18 @@ GDScriptTokenizer::Token GDScriptTokenizerText::potential_identifier() {
 
 	// Define some helper macros for the switch case.
 #define KEYWORD_GROUP_CASE(char) \
-	break; \
+	break;                       \
 	case char:
-#define KEYWORD(keyword, token_type) \
-	{ \
-		const int keyword_length = sizeof(keyword) - 1; \
-		static_assert(keyword_length <= MAX_KEYWORD_LENGTH, "There's a keyword longer than the defined maximum length"); \
+#define KEYWORD(keyword, token_type)                                                                                      \
+	{                                                                                                                     \
+		const int keyword_length = sizeof(keyword) - 1;                                                                   \
+		static_assert(keyword_length <= MAX_KEYWORD_LENGTH, "There's a keyword longer than the defined maximum length");  \
 		static_assert(keyword_length >= MIN_KEYWORD_LENGTH, "There's a keyword shorter than the defined minimum length"); \
-		if (keyword_length == len && name == keyword) { \
-			Token kw = make_token(token_type); \
-			kw.literal = name; \
-			return kw; \
-		} \
+		if (keyword_length == len && name == keyword) {                                                                   \
+			Token kw = make_token(token_type);                                                                            \
+			kw.literal = name;                                                                                            \
+			return kw;                                                                                                    \
+		}                                                                                                                 \
 	}
 
 	// Find if it's a keyword.
diff --git a/engine/modules/gdscript/gdscript_tokenizer.h b/engine/modules/gdscript/gdscript_tokenizer.h
index 4133db8f..f57cd4cd 100644
--- a/engine/modules/gdscript/gdscript_tokenizer.h
+++ b/engine/modules/gdscript/gdscript_tokenizer.h
@@ -165,10 +165,8 @@ public:
 
 		Type type = EMPTY;
 		Variant literal;
-		int start_line = 0;
-		int start_column = 0;
-		int end_line = 0;
-		int end_column = 0;
+		int start_line = 0, end_line = 0, start_column = 0, end_column = 0;
+		int cursor_position = -1;
 		CursorPlace cursor_place = CURSOR_NONE;
 		String source;
 
@@ -227,16 +225,13 @@ class GDScriptTokenizerText : public GDScriptTokenizer {
 	String source;
 	const char32_t *_source = nullptr;
 	const char32_t *_current = nullptr;
-	int line = 0;
-	int column = 0;
-	int cursor_line = -1;
-	int cursor_column = -1;
+	int line = -1, column = -1;
+	int cursor_line = -1, cursor_column = -1;
 	int tab_size = 4;
 
 	// Keep track of multichar tokens.
 	const char32_t *_start = nullptr;
-	int start_line = 0;
-	int start_column = 0;
+	int start_line = 0, start_column = 0;
 
 	// Info cache.
 	bool line_continuation = false; // Whether this line is a continuation of the previous, like when using '\'.
diff --git a/engine/modules/gdscript/gdscript_utility_functions.cpp b/engine/modules/gdscript/gdscript_utility_functions.cpp
index 5241295c..3c40f42f 100644
--- a/engine/modules/gdscript/gdscript_utility_functions.cpp
+++ b/engine/modules/gdscript/gdscript_utility_functions.cpp
@@ -41,36 +41,36 @@
 
 #ifdef DEBUG_ENABLED
 
-#define DEBUG_VALIDATE_ARG_COUNT(m_min_count, m_max_count) \
-	if (unlikely(p_arg_count < m_min_count)) { \
-		*r_ret = Variant(); \
-		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; \
-		r_error.expected = m_min_count; \
-		return; \
-	} \
-	if (unlikely(p_arg_count > m_max_count)) { \
-		*r_ret = Variant(); \
+#define DEBUG_VALIDATE_ARG_COUNT(m_min_count, m_max_count)                  \
+	if (unlikely(p_arg_count < m_min_count)) {                              \
+		*r_ret = Variant();                                                 \
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;  \
+		r_error.expected = m_min_count;                                     \
+		return;                                                             \
+	}                                                                       \
+	if (unlikely(p_arg_count > m_max_count)) {                              \
+		*r_ret = Variant();                                                 \
 		r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS; \
-		r_error.expected = m_max_count; \
-		return; \
+		r_error.expected = m_max_count;                                     \
+		return;                                                             \
 	}
 
-#define DEBUG_VALIDATE_ARG_TYPE(m_arg, m_type) \
+#define DEBUG_VALIDATE_ARG_TYPE(m_arg, m_type)                                       \
 	if (unlikely(!Variant::can_convert_strict(p_args[m_arg]->get_type(), m_type))) { \
-		*r_ret = Variant(); \
-		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; \
-		r_error.argument = m_arg; \
-		r_error.expected = m_type; \
-		return; \
+		*r_ret = Variant();                                                          \
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;            \
+		r_error.argument = m_arg;                                                    \
+		r_error.expected = m_type;                                                   \
+		return;                                                                      \
 	}
 
-#define DEBUG_VALIDATE_ARG_CUSTOM(m_arg, m_type, m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
-		*r_ret = m_msg; \
+#define DEBUG_VALIDATE_ARG_CUSTOM(m_arg, m_type, m_cond, m_msg)           \
+	if (unlikely(m_cond)) {                                               \
+		*r_ret = m_msg;                                                   \
 		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; \
-		r_error.argument = m_arg; \
-		r_error.expected = m_type; \
-		return; \
+		r_error.argument = m_arg;                                         \
+		r_error.expected = m_type;                                        \
+		return;                                                           \
 	}
 
 #else // !DEBUG_ENABLED
@@ -81,20 +81,20 @@
 
 #endif // DEBUG_ENABLED
 
-#define VALIDATE_ARG_CUSTOM(m_arg, m_type, m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
-		*r_ret = m_msg; \
+#define VALIDATE_ARG_CUSTOM(m_arg, m_type, m_cond, m_msg)                 \
+	if (unlikely(m_cond)) {                                               \
+		*r_ret = m_msg;                                                   \
 		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; \
-		r_error.argument = m_arg; \
-		r_error.expected = m_type; \
-		return; \
+		r_error.argument = m_arg;                                         \
+		r_error.expected = m_type;                                        \
+		return;                                                           \
 	}
 
-#define GDFUNC_FAIL_COND_MSG(m_cond, m_msg) \
-	if (unlikely(m_cond)) { \
-		*r_ret = m_msg; \
+#define GDFUNC_FAIL_COND_MSG(m_cond, m_msg)                             \
+	if (unlikely(m_cond)) {                                             \
+		*r_ret = m_msg;                                                 \
 		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; \
-		return; \
+		return;                                                         \
 	}
 
 struct GDScriptUtilityFunctionsDefinitions {
@@ -109,13 +109,13 @@ struct GDScriptUtilityFunctionsDefinitions {
 
 		Variant::construct(Variant::Type(type), *r_ret, p_args, 1, r_error);
 	}
+#endif // DISABLE_DEPRECATED
 
 	static inline void type_exists(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
 		DEBUG_VALIDATE_ARG_COUNT(1, 1);
 		DEBUG_VALIDATE_ARG_TYPE(0, Variant::STRING_NAME);
 		*r_ret = ClassDB::class_exists(*p_args[0]);
 	}
-#endif // DISABLE_DEPRECATED
 
 	static inline void _char(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
 		DEBUG_VALIDATE_ARG_COUNT(1, 1);
@@ -527,19 +527,19 @@ static void _register_function(const StringName &p_name, const MethodInfo &p_met
 	utility_function_name_table.push_back(p_name);
 }
 
-#define REGISTER_FUNC(m_func, m_is_const, m_return, m_args, m_is_vararg, m_default_args) \
-	{ \
-		String name(#m_func); \
-		if (name.begins_with("_")) { \
-			name = name.substr(1); \
-		} \
-		MethodInfo info = m_args; \
-		info.name = name; \
-		info.return_val = m_return; \
-		info.default_arguments = m_default_args; \
-		if (m_is_vararg) { \
-			info.flags |= METHOD_FLAG_VARARG; \
-		} \
+#define REGISTER_FUNC(m_func, m_is_const, m_return, m_args, m_is_vararg, m_default_args)         \
+	{                                                                                            \
+		String name(#m_func);                                                                    \
+		if (name.begins_with("_")) {                                                             \
+			name = name.substr(1);                                                               \
+		}                                                                                        \
+		MethodInfo info = m_args;                                                                \
+		info.name = name;                                                                        \
+		info.return_val = m_return;                                                              \
+		info.default_arguments = m_default_args;                                                 \
+		if (m_is_vararg) {                                                                       \
+			info.flags |= METHOD_FLAG_VARARG;                                                    \
+		}                                                                                        \
 		_register_function(name, info, GDScriptUtilityFunctionsDefinitions::m_func, m_is_const); \
 	}
 
@@ -571,8 +571,8 @@ void GDScriptUtilityFunctions::register_functions() {
 	/* clang-format off */
 #ifndef DISABLE_DEPRECATED
 	REGISTER_FUNC( convert,        true,  RETVAR,             ARGS( ARGVAR("what"), ARGTYPE("type") ), false, varray(     ));
-	REGISTER_FUNC( type_exists,    true,  RET(BOOL),          ARGS( ARG("type", STRING_NAME)        ), false, varray(     ));
 #endif // DISABLE_DEPRECATED
+	REGISTER_FUNC( type_exists,    true,  RET(BOOL),          ARGS( ARG("type", STRING_NAME)        ), false, varray(     ));
 	REGISTER_FUNC( _char,          true,  RET(STRING),        ARGS( ARG("code", INT)                ), false, varray(     ));
 	REGISTER_FUNC( ord,            true,  RET(INT),           ARGS( ARG("char", STRING)             ), false, varray(     ));
 	REGISTER_FUNC( range,          false, RET(ARRAY),         NOARGS,                                  true,  varray(     ));
diff --git a/engine/modules/gdscript/gdscript_vm.cpp b/engine/modules/gdscript/gdscript_vm.cpp
index 6b8b0b6c..7ad2ae09 100644
--- a/engine/modules/gdscript/gdscript_vm.cpp
+++ b/engine/modules/gdscript/gdscript_vm.cpp
@@ -32,7 +32,6 @@
 #include "gdscript_function.h"
 #include "gdscript_lambda_callable.h"
 
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/profiling/profiling.h"
 
@@ -252,167 +251,167 @@ void (*type_init_function_table[])(Variant *) = {
 };
 
 #if defined(__GNUC__) || defined(__clang__)
-#define OPCODES_TABLE \
-	static const void *switch_table_ops[] = { \
-		&&OPCODE_OPERATOR, \
-		&&OPCODE_OPERATOR_VALIDATED, \
-		&&OPCODE_TYPE_TEST_BUILTIN, \
-		&&OPCODE_TYPE_TEST_ARRAY, \
-		&&OPCODE_TYPE_TEST_DICTIONARY, \
-		&&OPCODE_TYPE_TEST_NATIVE, \
-		&&OPCODE_TYPE_TEST_SCRIPT, \
-		&&OPCODE_SET_KEYED, \
-		&&OPCODE_SET_KEYED_VALIDATED, \
-		&&OPCODE_SET_INDEXED_VALIDATED, \
-		&&OPCODE_GET_KEYED, \
-		&&OPCODE_GET_KEYED_VALIDATED, \
-		&&OPCODE_GET_INDEXED_VALIDATED, \
-		&&OPCODE_SET_NAMED, \
-		&&OPCODE_SET_NAMED_VALIDATED, \
-		&&OPCODE_GET_NAMED, \
-		&&OPCODE_GET_NAMED_VALIDATED, \
-		&&OPCODE_SET_MEMBER, \
-		&&OPCODE_GET_MEMBER, \
-		&&OPCODE_SET_STATIC_VARIABLE, \
-		&&OPCODE_GET_STATIC_VARIABLE, \
-		&&OPCODE_ASSIGN, \
-		&&OPCODE_ASSIGN_NULL, \
-		&&OPCODE_ASSIGN_TRUE, \
-		&&OPCODE_ASSIGN_FALSE, \
-		&&OPCODE_ASSIGN_TYPED_BUILTIN, \
-		&&OPCODE_ASSIGN_TYPED_ARRAY, \
-		&&OPCODE_ASSIGN_TYPED_DICTIONARY, \
-		&&OPCODE_ASSIGN_TYPED_NATIVE, \
-		&&OPCODE_ASSIGN_TYPED_SCRIPT, \
-		&&OPCODE_CAST_TO_BUILTIN, \
-		&&OPCODE_CAST_TO_NATIVE, \
-		&&OPCODE_CAST_TO_SCRIPT, \
-		&&OPCODE_CONSTRUCT, \
-		&&OPCODE_CONSTRUCT_VALIDATED, \
-		&&OPCODE_CONSTRUCT_ARRAY, \
-		&&OPCODE_CONSTRUCT_TYPED_ARRAY, \
-		&&OPCODE_CONSTRUCT_DICTIONARY, \
-		&&OPCODE_CONSTRUCT_TYPED_DICTIONARY, \
-		&&OPCODE_CALL, \
-		&&OPCODE_CALL_RETURN, \
-		&&OPCODE_CALL_ASYNC, \
-		&&OPCODE_CALL_UTILITY, \
-		&&OPCODE_CALL_UTILITY_VALIDATED, \
-		&&OPCODE_CALL_GDSCRIPT_UTILITY, \
-		&&OPCODE_CALL_BUILTIN_TYPE_VALIDATED, \
-		&&OPCODE_CALL_SELF_BASE, \
-		&&OPCODE_CALL_METHOD_BIND, \
-		&&OPCODE_CALL_METHOD_BIND_RET, \
-		&&OPCODE_CALL_BUILTIN_STATIC, \
-		&&OPCODE_CALL_NATIVE_STATIC, \
-		&&OPCODE_CALL_NATIVE_STATIC_VALIDATED_RETURN, \
+#define OPCODES_TABLE                                    \
+	static const void *switch_table_ops[] = {            \
+		&&OPCODE_OPERATOR,                               \
+		&&OPCODE_OPERATOR_VALIDATED,                     \
+		&&OPCODE_TYPE_TEST_BUILTIN,                      \
+		&&OPCODE_TYPE_TEST_ARRAY,                        \
+		&&OPCODE_TYPE_TEST_DICTIONARY,                   \
+		&&OPCODE_TYPE_TEST_NATIVE,                       \
+		&&OPCODE_TYPE_TEST_SCRIPT,                       \
+		&&OPCODE_SET_KEYED,                              \
+		&&OPCODE_SET_KEYED_VALIDATED,                    \
+		&&OPCODE_SET_INDEXED_VALIDATED,                  \
+		&&OPCODE_GET_KEYED,                              \
+		&&OPCODE_GET_KEYED_VALIDATED,                    \
+		&&OPCODE_GET_INDEXED_VALIDATED,                  \
+		&&OPCODE_SET_NAMED,                              \
+		&&OPCODE_SET_NAMED_VALIDATED,                    \
+		&&OPCODE_GET_NAMED,                              \
+		&&OPCODE_GET_NAMED_VALIDATED,                    \
+		&&OPCODE_SET_MEMBER,                             \
+		&&OPCODE_GET_MEMBER,                             \
+		&&OPCODE_SET_STATIC_VARIABLE,                    \
+		&&OPCODE_GET_STATIC_VARIABLE,                    \
+		&&OPCODE_ASSIGN,                                 \
+		&&OPCODE_ASSIGN_NULL,                            \
+		&&OPCODE_ASSIGN_TRUE,                            \
+		&&OPCODE_ASSIGN_FALSE,                           \
+		&&OPCODE_ASSIGN_TYPED_BUILTIN,                   \
+		&&OPCODE_ASSIGN_TYPED_ARRAY,                     \
+		&&OPCODE_ASSIGN_TYPED_DICTIONARY,                \
+		&&OPCODE_ASSIGN_TYPED_NATIVE,                    \
+		&&OPCODE_ASSIGN_TYPED_SCRIPT,                    \
+		&&OPCODE_CAST_TO_BUILTIN,                        \
+		&&OPCODE_CAST_TO_NATIVE,                         \
+		&&OPCODE_CAST_TO_SCRIPT,                         \
+		&&OPCODE_CONSTRUCT,                              \
+		&&OPCODE_CONSTRUCT_VALIDATED,                    \
+		&&OPCODE_CONSTRUCT_ARRAY,                        \
+		&&OPCODE_CONSTRUCT_TYPED_ARRAY,                  \
+		&&OPCODE_CONSTRUCT_DICTIONARY,                   \
+		&&OPCODE_CONSTRUCT_TYPED_DICTIONARY,             \
+		&&OPCODE_CALL,                                   \
+		&&OPCODE_CALL_RETURN,                            \
+		&&OPCODE_CALL_ASYNC,                             \
+		&&OPCODE_CALL_UTILITY,                           \
+		&&OPCODE_CALL_UTILITY_VALIDATED,                 \
+		&&OPCODE_CALL_GDSCRIPT_UTILITY,                  \
+		&&OPCODE_CALL_BUILTIN_TYPE_VALIDATED,            \
+		&&OPCODE_CALL_SELF_BASE,                         \
+		&&OPCODE_CALL_METHOD_BIND,                       \
+		&&OPCODE_CALL_METHOD_BIND_RET,                   \
+		&&OPCODE_CALL_BUILTIN_STATIC,                    \
+		&&OPCODE_CALL_NATIVE_STATIC,                     \
+		&&OPCODE_CALL_NATIVE_STATIC_VALIDATED_RETURN,    \
 		&&OPCODE_CALL_NATIVE_STATIC_VALIDATED_NO_RETURN, \
-		&&OPCODE_CALL_METHOD_BIND_VALIDATED_RETURN, \
-		&&OPCODE_CALL_METHOD_BIND_VALIDATED_NO_RETURN, \
-		&&OPCODE_AWAIT, \
-		&&OPCODE_AWAIT_RESUME, \
-		&&OPCODE_CREATE_LAMBDA, \
-		&&OPCODE_CREATE_SELF_LAMBDA, \
-		&&OPCODE_JUMP, \
-		&&OPCODE_JUMP_IF, \
-		&&OPCODE_JUMP_IF_NOT, \
-		&&OPCODE_JUMP_TO_DEF_ARGUMENT, \
-		&&OPCODE_JUMP_IF_SHARED, \
-		&&OPCODE_RETURN, \
-		&&OPCODE_RETURN_TYPED_BUILTIN, \
-		&&OPCODE_RETURN_TYPED_ARRAY, \
-		&&OPCODE_RETURN_TYPED_DICTIONARY, \
-		&&OPCODE_RETURN_TYPED_NATIVE, \
-		&&OPCODE_RETURN_TYPED_SCRIPT, \
-		&&OPCODE_ITERATE_BEGIN, \
-		&&OPCODE_ITERATE_BEGIN_INT, \
-		&&OPCODE_ITERATE_BEGIN_FLOAT, \
-		&&OPCODE_ITERATE_BEGIN_VECTOR2, \
-		&&OPCODE_ITERATE_BEGIN_VECTOR2I, \
-		&&OPCODE_ITERATE_BEGIN_VECTOR3, \
-		&&OPCODE_ITERATE_BEGIN_VECTOR3I, \
-		&&OPCODE_ITERATE_BEGIN_STRING, \
-		&&OPCODE_ITERATE_BEGIN_DICTIONARY, \
-		&&OPCODE_ITERATE_BEGIN_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_BYTE_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_INT32_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_INT64_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_FLOAT32_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_FLOAT64_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_STRING_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR2_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR3_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_COLOR_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR4_ARRAY, \
-		&&OPCODE_ITERATE_BEGIN_OBJECT, \
-		&&OPCODE_ITERATE_BEGIN_RANGE, \
-		&&OPCODE_ITERATE, \
-		&&OPCODE_ITERATE_INT, \
-		&&OPCODE_ITERATE_FLOAT, \
-		&&OPCODE_ITERATE_VECTOR2, \
-		&&OPCODE_ITERATE_VECTOR2I, \
-		&&OPCODE_ITERATE_VECTOR3, \
-		&&OPCODE_ITERATE_VECTOR3I, \
-		&&OPCODE_ITERATE_STRING, \
-		&&OPCODE_ITERATE_DICTIONARY, \
-		&&OPCODE_ITERATE_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_BYTE_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_INT32_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_INT64_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_FLOAT32_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_FLOAT64_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_STRING_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_VECTOR2_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_VECTOR3_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_COLOR_ARRAY, \
-		&&OPCODE_ITERATE_PACKED_VECTOR4_ARRAY, \
-		&&OPCODE_ITERATE_OBJECT, \
-		&&OPCODE_ITERATE_RANGE, \
-		&&OPCODE_STORE_GLOBAL, \
-		&&OPCODE_STORE_NAMED_GLOBAL, \
-		&&OPCODE_TYPE_ADJUST_BOOL, \
-		&&OPCODE_TYPE_ADJUST_INT, \
-		&&OPCODE_TYPE_ADJUST_FLOAT, \
-		&&OPCODE_TYPE_ADJUST_STRING, \
-		&&OPCODE_TYPE_ADJUST_VECTOR2, \
-		&&OPCODE_TYPE_ADJUST_VECTOR2I, \
-		&&OPCODE_TYPE_ADJUST_RECT2, \
-		&&OPCODE_TYPE_ADJUST_RECT2I, \
-		&&OPCODE_TYPE_ADJUST_VECTOR3, \
-		&&OPCODE_TYPE_ADJUST_VECTOR3I, \
-		&&OPCODE_TYPE_ADJUST_TRANSFORM2D, \
-		&&OPCODE_TYPE_ADJUST_VECTOR4, \
-		&&OPCODE_TYPE_ADJUST_VECTOR4I, \
-		&&OPCODE_TYPE_ADJUST_PLANE, \
-		&&OPCODE_TYPE_ADJUST_QUATERNION, \
-		&&OPCODE_TYPE_ADJUST_AABB, \
-		&&OPCODE_TYPE_ADJUST_BASIS, \
-		&&OPCODE_TYPE_ADJUST_TRANSFORM3D, \
-		&&OPCODE_TYPE_ADJUST_PROJECTION, \
-		&&OPCODE_TYPE_ADJUST_COLOR, \
-		&&OPCODE_TYPE_ADJUST_STRING_NAME, \
-		&&OPCODE_TYPE_ADJUST_NODE_PATH, \
-		&&OPCODE_TYPE_ADJUST_RID, \
-		&&OPCODE_TYPE_ADJUST_OBJECT, \
-		&&OPCODE_TYPE_ADJUST_CALLABLE, \
-		&&OPCODE_TYPE_ADJUST_SIGNAL, \
-		&&OPCODE_TYPE_ADJUST_DICTIONARY, \
-		&&OPCODE_TYPE_ADJUST_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_BYTE_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_INT32_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_INT64_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_FLOAT32_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_FLOAT64_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_STRING_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR2_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR3_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_COLOR_ARRAY, \
-		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR4_ARRAY, \
-		&&OPCODE_ASSERT, \
-		&&OPCODE_BREAKPOINT, \
-		&&OPCODE_LINE, \
-		&&OPCODE_END \
-	}; \
+		&&OPCODE_CALL_METHOD_BIND_VALIDATED_RETURN,      \
+		&&OPCODE_CALL_METHOD_BIND_VALIDATED_NO_RETURN,   \
+		&&OPCODE_AWAIT,                                  \
+		&&OPCODE_AWAIT_RESUME,                           \
+		&&OPCODE_CREATE_LAMBDA,                          \
+		&&OPCODE_CREATE_SELF_LAMBDA,                     \
+		&&OPCODE_JUMP,                                   \
+		&&OPCODE_JUMP_IF,                                \
+		&&OPCODE_JUMP_IF_NOT,                            \
+		&&OPCODE_JUMP_TO_DEF_ARGUMENT,                   \
+		&&OPCODE_JUMP_IF_SHARED,                         \
+		&&OPCODE_RETURN,                                 \
+		&&OPCODE_RETURN_TYPED_BUILTIN,                   \
+		&&OPCODE_RETURN_TYPED_ARRAY,                     \
+		&&OPCODE_RETURN_TYPED_DICTIONARY,                \
+		&&OPCODE_RETURN_TYPED_NATIVE,                    \
+		&&OPCODE_RETURN_TYPED_SCRIPT,                    \
+		&&OPCODE_ITERATE_BEGIN,                          \
+		&&OPCODE_ITERATE_BEGIN_INT,                      \
+		&&OPCODE_ITERATE_BEGIN_FLOAT,                    \
+		&&OPCODE_ITERATE_BEGIN_VECTOR2,                  \
+		&&OPCODE_ITERATE_BEGIN_VECTOR2I,                 \
+		&&OPCODE_ITERATE_BEGIN_VECTOR3,                  \
+		&&OPCODE_ITERATE_BEGIN_VECTOR3I,                 \
+		&&OPCODE_ITERATE_BEGIN_STRING,                   \
+		&&OPCODE_ITERATE_BEGIN_DICTIONARY,               \
+		&&OPCODE_ITERATE_BEGIN_ARRAY,                    \
+		&&OPCODE_ITERATE_BEGIN_PACKED_BYTE_ARRAY,        \
+		&&OPCODE_ITERATE_BEGIN_PACKED_INT32_ARRAY,       \
+		&&OPCODE_ITERATE_BEGIN_PACKED_INT64_ARRAY,       \
+		&&OPCODE_ITERATE_BEGIN_PACKED_FLOAT32_ARRAY,     \
+		&&OPCODE_ITERATE_BEGIN_PACKED_FLOAT64_ARRAY,     \
+		&&OPCODE_ITERATE_BEGIN_PACKED_STRING_ARRAY,      \
+		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR2_ARRAY,     \
+		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR3_ARRAY,     \
+		&&OPCODE_ITERATE_BEGIN_PACKED_COLOR_ARRAY,       \
+		&&OPCODE_ITERATE_BEGIN_PACKED_VECTOR4_ARRAY,     \
+		&&OPCODE_ITERATE_BEGIN_OBJECT,                   \
+		&&OPCODE_ITERATE_BEGIN_RANGE,                    \
+		&&OPCODE_ITERATE,                                \
+		&&OPCODE_ITERATE_INT,                            \
+		&&OPCODE_ITERATE_FLOAT,                          \
+		&&OPCODE_ITERATE_VECTOR2,                        \
+		&&OPCODE_ITERATE_VECTOR2I,                       \
+		&&OPCODE_ITERATE_VECTOR3,                        \
+		&&OPCODE_ITERATE_VECTOR3I,                       \
+		&&OPCODE_ITERATE_STRING,                         \
+		&&OPCODE_ITERATE_DICTIONARY,                     \
+		&&OPCODE_ITERATE_ARRAY,                          \
+		&&OPCODE_ITERATE_PACKED_BYTE_ARRAY,              \
+		&&OPCODE_ITERATE_PACKED_INT32_ARRAY,             \
+		&&OPCODE_ITERATE_PACKED_INT64_ARRAY,             \
+		&&OPCODE_ITERATE_PACKED_FLOAT32_ARRAY,           \
+		&&OPCODE_ITERATE_PACKED_FLOAT64_ARRAY,           \
+		&&OPCODE_ITERATE_PACKED_STRING_ARRAY,            \
+		&&OPCODE_ITERATE_PACKED_VECTOR2_ARRAY,           \
+		&&OPCODE_ITERATE_PACKED_VECTOR3_ARRAY,           \
+		&&OPCODE_ITERATE_PACKED_COLOR_ARRAY,             \
+		&&OPCODE_ITERATE_PACKED_VECTOR4_ARRAY,           \
+		&&OPCODE_ITERATE_OBJECT,                         \
+		&&OPCODE_ITERATE_RANGE,                          \
+		&&OPCODE_STORE_GLOBAL,                           \
+		&&OPCODE_STORE_NAMED_GLOBAL,                     \
+		&&OPCODE_TYPE_ADJUST_BOOL,                       \
+		&&OPCODE_TYPE_ADJUST_INT,                        \
+		&&OPCODE_TYPE_ADJUST_FLOAT,                      \
+		&&OPCODE_TYPE_ADJUST_STRING,                     \
+		&&OPCODE_TYPE_ADJUST_VECTOR2,                    \
+		&&OPCODE_TYPE_ADJUST_VECTOR2I,                   \
+		&&OPCODE_TYPE_ADJUST_RECT2,                      \
+		&&OPCODE_TYPE_ADJUST_RECT2I,                     \
+		&&OPCODE_TYPE_ADJUST_VECTOR3,                    \
+		&&OPCODE_TYPE_ADJUST_VECTOR3I,                   \
+		&&OPCODE_TYPE_ADJUST_TRANSFORM2D,                \
+		&&OPCODE_TYPE_ADJUST_VECTOR4,                    \
+		&&OPCODE_TYPE_ADJUST_VECTOR4I,                   \
+		&&OPCODE_TYPE_ADJUST_PLANE,                      \
+		&&OPCODE_TYPE_ADJUST_QUATERNION,                 \
+		&&OPCODE_TYPE_ADJUST_AABB,                       \
+		&&OPCODE_TYPE_ADJUST_BASIS,                      \
+		&&OPCODE_TYPE_ADJUST_TRANSFORM3D,                \
+		&&OPCODE_TYPE_ADJUST_PROJECTION,                 \
+		&&OPCODE_TYPE_ADJUST_COLOR,                      \
+		&&OPCODE_TYPE_ADJUST_STRING_NAME,                \
+		&&OPCODE_TYPE_ADJUST_NODE_PATH,                  \
+		&&OPCODE_TYPE_ADJUST_RID,                        \
+		&&OPCODE_TYPE_ADJUST_OBJECT,                     \
+		&&OPCODE_TYPE_ADJUST_CALLABLE,                   \
+		&&OPCODE_TYPE_ADJUST_SIGNAL,                     \
+		&&OPCODE_TYPE_ADJUST_DICTIONARY,                 \
+		&&OPCODE_TYPE_ADJUST_ARRAY,                      \
+		&&OPCODE_TYPE_ADJUST_PACKED_BYTE_ARRAY,          \
+		&&OPCODE_TYPE_ADJUST_PACKED_INT32_ARRAY,         \
+		&&OPCODE_TYPE_ADJUST_PACKED_INT64_ARRAY,         \
+		&&OPCODE_TYPE_ADJUST_PACKED_FLOAT32_ARRAY,       \
+		&&OPCODE_TYPE_ADJUST_PACKED_FLOAT64_ARRAY,       \
+		&&OPCODE_TYPE_ADJUST_PACKED_STRING_ARRAY,        \
+		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR2_ARRAY,       \
+		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR3_ARRAY,       \
+		&&OPCODE_TYPE_ADJUST_PACKED_COLOR_ARRAY,         \
+		&&OPCODE_TYPE_ADJUST_PACKED_VECTOR4_ARRAY,       \
+		&&OPCODE_ASSERT,                                 \
+		&&OPCODE_BREAKPOINT,                             \
+		&&OPCODE_LINE,                                   \
+		&&OPCODE_END                                     \
+	};                                                   \
 	static_assert(std_size(switch_table_ops) == (OPCODE_END + 1), "Opcodes in jump table aren't the same as opcodes in enum.");
 
 #define OPCODE(m_op) \
@@ -425,7 +424,7 @@ void (*type_init_function_table[])(Variant *) = {
 #define OPCODE_SWITCH(m_test) goto *switch_table_ops[m_test];
 
 #ifdef DEBUG_ENABLED
-#define DISPATCH_OPCODE \
+#define DISPATCH_OPCODE          \
 	last_opcode = _code_ptr[ip]; \
 	goto *switch_table_ops[last_opcode]
 #else // !DEBUG_ENABLED
@@ -443,7 +442,7 @@ void (*type_init_function_table[])(Variant *) = {
 #define DISPATCH_OPCODE continue
 
 #ifdef _MSC_VER
-#define OPCODE_SWITCH(m_test) \
+#define OPCODE_SWITCH(m_test)       \
 	__assume(m_test <= OPCODE_END); \
 	switch (m_test)
 #else // !_MSC_VER
@@ -543,9 +542,9 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 	int line = _initial_line;
 
 	if (p_state) {
-		// Use existing (supplied) state (awaited).
+		//use existing (supplied) state (awaited)
 		stack = (Variant *)p_state->stack.ptr();
-		instruction_args = (Variant **)&p_state->stack.ptr()[sizeof(Variant) * p_state->stack_size]; // `ptr()` to avoid bounds check.
+		instruction_args = (Variant **)&p_state->stack.ptr()[sizeof(Variant) * p_state->stack_size]; //ptr() to avoid bounds check
 		line = p_state->line;
 		ip = p_state->ip;
 		alloca_size = p_state->stack.size();
@@ -553,11 +552,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		p_instance = p_state->instance;
 		defarg = p_state->defarg;
 
-		// Responsibility for the stack is moved from `GDScriptFunctionState` to this method. So, we reset `p_state->stack_size`
-		// to prevent `GDScriptFunctionState::_clear_stack()` from clearing the stack again.
-		// NOTE: Strictly speaking, ownership doesn't move. However, we can be sure that `p_state->stack` won't be cleared
-		// before the current call completes, and that `p_state` won't be resumed again.
-		p_state->stack_size = 0;
 	} else {
 		if (p_argcount != _argument_count) {
 			if (p_argcount > _argument_count) {
@@ -648,8 +642,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			instruction_args = nullptr;
 		}
 
-		for (const Pair<int, Variant::Type> &E : temporary_slots) {
-			type_init_function_table[E.second](&stack[E.first]);
+		for (const KeyValue<int, Variant::Type> &E : temporary_slots) {
+			type_init_function_table[E.value](&stack[E.key]);
 		}
 	}
 
@@ -660,11 +654,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		memnew_placement(&stack[ADDR_STACK_SELF], Variant);
 		script = _script;
 	}
-
-	// We must call a `Variant` constructor here, as accessing an object without doing so is undefined behavior.
-	memnew_placement(&stack[ADDR_STACK_CLASS], Variant);
-	VariantInternal::object_assign_without_ref_unsafe(&stack[ADDR_STACK_CLASS], script);
-
+	memnew_placement(&stack[ADDR_STACK_CLASS], Variant(script));
 	memnew_placement(&stack[ADDR_STACK_NIL], Variant);
 
 	String err_text;
@@ -673,61 +663,61 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 	GDScriptLanguage::get_singleton()->enter_function(&call_level, p_instance, this, stack, &ip, &line);
 
 #ifdef DEBUG_ENABLED
-#define GD_ERR_BREAK(m_cond) \
-	{ \
-		if (unlikely(m_cond)) { \
+#define GD_ERR_BREAK(m_cond)                                                                                           \
+	{                                                                                                                  \
+		if (unlikely(m_cond)) {                                                                                        \
 			_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "Condition ' " _STR(m_cond) " ' is true. Breaking..:"); \
-			OPCODE_BREAK; \
-		} \
+			OPCODE_BREAK;                                                                                              \
+		}                                                                                                              \
 	}
 
 #define CHECK_SPACE(m_space) \
 	GD_ERR_BREAK((ip + m_space) > _code_size)
 
-#define GET_VARIANT_PTR(m_v, m_code_ofs) \
-	Variant *m_v; \
-	{ \
-		int address = _code_ptr[ip + 1 + (m_code_ofs)]; \
-		int address_type = (address & ADDR_TYPE_MASK) >> ADDR_BITS; \
-		if (unlikely(address_type < 0 || address_type >= ADDR_TYPE_MAX)) { \
-			err_text = "Bad address type."; \
-			OPCODE_BREAK; \
-		} \
-		int address_index = address & ADDR_MASK; \
+#define GET_VARIANT_PTR(m_v, m_code_ofs)                                                            \
+	Variant *m_v;                                                                                   \
+	{                                                                                               \
+		int address = _code_ptr[ip + 1 + (m_code_ofs)];                                             \
+		int address_type = (address & ADDR_TYPE_MASK) >> ADDR_BITS;                                 \
+		if (unlikely(address_type < 0 || address_type >= ADDR_TYPE_MAX)) {                          \
+			err_text = "Bad address type.";                                                         \
+			OPCODE_BREAK;                                                                           \
+		}                                                                                           \
+		int address_index = address & ADDR_MASK;                                                    \
 		if (unlikely(address_index < 0 || address_index >= variant_address_limits[address_type])) { \
-			if (address_type == ADDR_TYPE_MEMBER && !p_instance) { \
-				err_text = "Cannot access member without instance."; \
-			} else { \
-				err_text = "Bad address index."; \
-			} \
-			OPCODE_BREAK; \
-		} \
-		m_v = &variant_addresses[address_type][address_index]; \
-		if (unlikely(!m_v)) \
-			OPCODE_BREAK; \
+			if (address_type == ADDR_TYPE_MEMBER && !p_instance) {                                  \
+				err_text = "Cannot access member without instance.";                                \
+			} else {                                                                                \
+				err_text = "Bad address index.";                                                    \
+			}                                                                                       \
+			OPCODE_BREAK;                                                                           \
+		}                                                                                           \
+		m_v = &variant_addresses[address_type][address_index];                                      \
+		if (unlikely(!m_v))                                                                         \
+			OPCODE_BREAK;                                                                           \
 	}
 
 #else // !DEBUG_ENABLED
 #define GD_ERR_BREAK(m_cond)
 #define CHECK_SPACE(m_space)
 
-#define GET_VARIANT_PTR(m_v, m_code_ofs) \
-	Variant *m_v; \
-	{ \
-		int address = _code_ptr[ip + 1 + (m_code_ofs)]; \
+#define GET_VARIANT_PTR(m_v, m_code_ofs)                                                        \
+	Variant *m_v;                                                                               \
+	{                                                                                           \
+		int address = _code_ptr[ip + 1 + (m_code_ofs)];                                         \
 		m_v = &variant_addresses[(address & ADDR_TYPE_MASK) >> ADDR_BITS][address & ADDR_MASK]; \
-		if (unlikely(!m_v)) \
-			OPCODE_BREAK; \
+		if (unlikely(!m_v))                                                                     \
+			OPCODE_BREAK;                                                                       \
 	}
 
 #endif // DEBUG_ENABLED
 
-#define LOAD_INSTRUCTION_ARGS \
-	int instr_arg_count = _code_ptr[ip + 1]; \
+#define LOAD_INSTRUCTION_ARGS                   \
+	int instr_arg_count = _code_ptr[ip + 1];    \
 	for (int i = 0; i < instr_arg_count; i++) { \
-		GET_VARIANT_PTR(v, i + 1); \
-		instruction_args[i] = v; \
-	} \
+		GET_VARIANT_PTR(v, i + 1);              \
+		instruction_args[i] = v;                \
+	}                                           \
 	ip += 1; // Offset to skip instruction argcount.
 
 #define GET_INSTRUCTION_ARG(m_v, m_idx) \
@@ -2822,8 +2812,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 						Variant::construct(ret_type, retvalue, const_cast<const Variant **>(&r), 1, ce);
 					} else {
 #ifdef DEBUG_ENABLED
-						err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-								_get_var_type(r), Variant::get_type_name(ret_type));
+						err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+								Variant::get_type_name(r->get_type()), Variant::get_type_name(ret_type));
 #endif // DEBUG_ENABLED
 
 						// Construct a base type anyway so type constraints are met.
@@ -2852,9 +2842,9 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				if (r->get_type() != Variant::ARRAY) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "Array[%s]".)",
-							_get_var_type(r), Variant::get_type_name(builtin_type));
-#endif // DEBUG_ENABLED
+					err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "Array[%s]".)",
+							Variant::get_type_name(r->get_type()), Variant::get_type_name(builtin_type));
+#endif
 					OPCODE_BREAK;
 				}
 
@@ -2862,7 +2852,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				if (array->get_typed_builtin() != ((uint32_t)builtin_type) || array->get_typed_class_name() != native_type || array->get_typed_script() != *script_type) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "Array[%s]".)",
+					err_text = vformat(R"(Trying to return an array of type "%s" where expected return type is "Array[%s]".)",
 							_get_var_type(r), _get_element_type(builtin_type, native_type, *script_type));
 #endif // DEBUG_ENABLED
 					OPCODE_BREAK;
@@ -2894,7 +2884,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				if (r->get_type() != Variant::DICTIONARY) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "Dictionary[%s, %s]".)",
+					err_text = vformat(R"(Trying to return a value of type "%s" where expected return type is "Dictionary[%s, %s]".)",
 							_get_var_type(r), _get_element_type(key_builtin_type, key_native_type, *key_script_type),
 							_get_element_type(value_builtin_type, value_native_type, *value_script_type));
 #endif // DEBUG_ENABLED
@@ -2906,7 +2896,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				if (dictionary->get_typed_key_builtin() != ((uint32_t)key_builtin_type) || dictionary->get_typed_key_class_name() != key_native_type || dictionary->get_typed_key_script() != *key_script_type ||
 						dictionary->get_typed_value_builtin() != ((uint32_t)value_builtin_type) || dictionary->get_typed_value_class_name() != value_native_type || dictionary->get_typed_value_script() != *value_script_type) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "Dictionary[%s, %s]".)",
+					err_text = vformat(R"(Trying to return a dictionary of type "%s" where expected return type is "Dictionary[%s, %s]".)",
 							_get_var_type(r), _get_element_type(key_builtin_type, key_native_type, *key_script_type),
 							_get_element_type(value_builtin_type, value_native_type, *value_script_type));
 #endif // DEBUG_ENABLED
@@ -2930,10 +2920,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				GD_ERR_BREAK(!nc);
 
 				if (r->get_type() != Variant::OBJECT && r->get_type() != Variant::NIL) {
-#ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-							_get_var_type(r), nc->get_name());
-#endif // DEBUG_ENABLED
+					err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+							Variant::get_type_name(r->get_type()), nc->get_name());
 					OPCODE_BREAK;
 				}
 
@@ -2950,8 +2938,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #endif // DEBUG_ENABLED
 				if (ret_obj && !ClassDB::is_parent_class(ret_obj->get_class_name(), nc->get_name())) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-							_get_var_type(r), nc->get_name());
+					err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+							ret_obj->get_class_name(), nc->get_name());
 #endif // DEBUG_ENABLED
 					OPCODE_BREAK;
 				}
@@ -2973,8 +2961,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				if (r->get_type() != Variant::OBJECT && r->get_type() != Variant::NIL) {
 #ifdef DEBUG_ENABLED
-					err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-							_get_var_type(r), GDScript::debug_get_script_name(Ref<Script>(base_type)));
+					err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+							Variant::get_type_name(r->get_type()), GDScript::debug_get_script_name(Ref<Script>(base_type)));
 #endif // DEBUG_ENABLED
 					OPCODE_BREAK;
 				}
@@ -2995,8 +2983,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 					ScriptInstance *ret_inst = ret_obj->get_script_instance();
 					if (!ret_inst) {
 #ifdef DEBUG_ENABLED
-						err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-								_get_var_type(r), GDScript::debug_get_script_name(Ref<GDScript>(base_type)));
+						err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+								ret_obj->get_class_name(), GDScript::debug_get_script_name(Ref<GDScript>(base_type)));
 #endif // DEBUG_ENABLED
 						OPCODE_BREAK;
 					}
@@ -3014,8 +3002,8 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 					if (!valid) {
 #ifdef DEBUG_ENABLED
-						err_text = vformat(R"(Trying to return a value of type "%s" from a function whose return type is "%s".)",
-								_get_var_type(r), GDScript::debug_get_script_name(Ref<GDScript>(base_type)));
+						err_text = vformat(R"(Trying to return value of type "%s" from a function whose return type is "%s".)",
+								GDScript::debug_get_script_name(ret_obj->get_script_instance()->get_script()), GDScript::debug_get_script_name(Ref<GDScript>(base_type)));
 #endif // DEBUG_ENABLED
 						OPCODE_BREAK;
 					}
@@ -3313,25 +3301,25 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 #define OPCODE_ITERATE_BEGIN_PACKED_ARRAY(m_var_type, m_elem_type, m_get_func, m_var_ret_type, m_ret_type, m_ret_get_func) \
-	OPCODE(OPCODE_ITERATE_BEGIN_PACKED_##m_var_type##_ARRAY) { \
-		CHECK_SPACE(8); \
-		GET_VARIANT_PTR(counter, 0); \
-		GET_VARIANT_PTR(container, 1); \
-		Vector<m_elem_type> *array = VariantInternal::m_get_func(container); \
-		VariantInternal::initialize(counter, Variant::INT); \
-		*VariantInternal::get_int(counter) = 0; \
-		if (!array->is_empty()) { \
-			GET_VARIANT_PTR(iterator, 2); \
-			VariantInternal::initialize(iterator, Variant::m_var_ret_type); \
-			m_ret_type *it = VariantInternal::m_ret_get_func(iterator); \
-			*it = array->get(0); \
-			ip += 5; \
-		} else { \
-			int jumpto = _code_ptr[ip + 4]; \
-			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size); \
-			ip = jumpto; \
-		} \
-	} \
+	OPCODE(OPCODE_ITERATE_BEGIN_PACKED_##m_var_type##_ARRAY) {                                                             \
+		CHECK_SPACE(8);                                                                                                    \
+		GET_VARIANT_PTR(counter, 0);                                                                                       \
+		GET_VARIANT_PTR(container, 1);                                                                                     \
+		Vector<m_elem_type> *array = VariantInternal::m_get_func(container);                                               \
+		VariantInternal::initialize(counter, Variant::INT);                                                                \
+		*VariantInternal::get_int(counter) = 0;                                                                            \
+		if (!array->is_empty()) {                                                                                          \
+			GET_VARIANT_PTR(iterator, 2);                                                                                  \
+			VariantInternal::initialize(iterator, Variant::m_var_ret_type);                                                \
+			m_ret_type *it = VariantInternal::m_ret_get_func(iterator);                                                    \
+			*it = array->get(0);                                                                                           \
+			ip += 5;                                                                                                       \
+		} else {                                                                                                           \
+			int jumpto = _code_ptr[ip + 4];                                                                                \
+			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);                                                               \
+			ip = jumpto;                                                                                                   \
+		}                                                                                                                  \
+	}                                                                                                                      \
 	DISPATCH_OPCODE
 
 			OPCODE_ITERATE_BEGIN_PACKED_ARRAY(BYTE, uint8_t, get_byte_array, INT, int64_t, get_int);
@@ -3681,24 +3669,24 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 			DISPATCH_OPCODE;
 
-#define OPCODE_ITERATE_PACKED_ARRAY(m_var_type, m_elem_type, m_get_func, m_ret_get_func) \
-	OPCODE(OPCODE_ITERATE_PACKED_##m_var_type##_ARRAY) { \
-		CHECK_SPACE(4); \
-		GET_VARIANT_PTR(counter, 0); \
-		GET_VARIANT_PTR(container, 1); \
+#define OPCODE_ITERATE_PACKED_ARRAY(m_var_type, m_elem_type, m_get_func, m_ret_get_func)            \
+	OPCODE(OPCODE_ITERATE_PACKED_##m_var_type##_ARRAY) {                                            \
+		CHECK_SPACE(4);                                                                             \
+		GET_VARIANT_PTR(counter, 0);                                                                \
+		GET_VARIANT_PTR(container, 1);                                                              \
 		const Vector<m_elem_type> *array = VariantInternal::m_get_func((const Variant *)container); \
-		int64_t *idx = VariantInternal::get_int(counter); \
-		(*idx)++; \
-		if (*idx >= array->size()) { \
-			int jumpto = _code_ptr[ip + 4]; \
-			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size); \
-			ip = jumpto; \
-		} else { \
-			GET_VARIANT_PTR(iterator, 2); \
-			*VariantInternal::m_ret_get_func(iterator) = array->get(*idx); \
-			ip += 5; \
-		} \
-	} \
+		int64_t *idx = VariantInternal::get_int(counter);                                           \
+		(*idx)++;                                                                                   \
+		if (*idx >= array->size()) {                                                                \
+			int jumpto = _code_ptr[ip + 4];                                                         \
+			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);                                        \
+			ip = jumpto;                                                                            \
+		} else {                                                                                    \
+			GET_VARIANT_PTR(iterator, 2);                                                           \
+			*VariantInternal::m_ret_get_func(iterator) = array->get(*idx);                          \
+			ip += 5;                                                                                \
+		}                                                                                           \
+	}                                                                                               \
 	DISPATCH_OPCODE
 
 			OPCODE_ITERATE_PACKED_ARRAY(BYTE, uint8_t, get_byte_array, get_int);
@@ -3822,13 +3810,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 			DISPATCH_OPCODE;
 
-#define OPCODE_TYPE_ADJUST(m_v_type, m_c_type) \
-	OPCODE(OPCODE_TYPE_ADJUST_##m_v_type) { \
-		CHECK_SPACE(2); \
-		GET_VARIANT_PTR(arg, 0); \
+#define OPCODE_TYPE_ADJUST(m_v_type, m_c_type)    \
+	OPCODE(OPCODE_TYPE_ADJUST_##m_v_type) {       \
+		CHECK_SPACE(2);                           \
+		GET_VARIANT_PTR(arg, 0);                  \
 		VariantTypeAdjust<m_c_type>::adjust(arg); \
-		ip += 2; \
-	} \
+		ip += 2;                                  \
+	}                                             \
 	DISPATCH_OPCODE
 
 			OPCODE_TYPE_ADJUST(BOOL, bool);
@@ -4011,14 +3999,15 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 	// This ensures the call stack can be properly shown when using `await`, showing what resumed the function.
 	if (!p_state || awaited) {
 		GDScriptLanguage::get_singleton()->exit_function();
+
+		// Free stack, except reserved addresses.
+		for (int i = FIXED_ADDRESSES_MAX; i < _stack_size; i++) {
+			stack[i].~Variant();
+		}
 	}
 
-	// We deliberately avoid calling the destructor for `ADDR_STACK_CLASS`, since we initialized it
-	// without incrementing any reference count that it might have.
-	stack[ADDR_STACK_SELF].~Variant();
-	stack[ADDR_STACK_NIL].~Variant();
-
-	for (int i = FIXED_ADDRESSES_MAX; i < _stack_size; i++) {
+	// Always free reserved addresses, since they are never copied.
+	for (int i = 0; i < FIXED_ADDRESSES_MAX; i++) {
 		stack[i].~Variant();
 	}
 
diff --git a/engine/modules/gdscript/gdscript_warning.cpp b/engine/modules/gdscript/gdscript_warning.cpp
index 9dbabba8..9761f4c2 100644
--- a/engine/modules/gdscript/gdscript_warning.cpp
+++ b/engine/modules/gdscript/gdscript_warning.cpp
@@ -30,7 +30,6 @@
 
 #include "gdscript_warning.h"
 
-#include "core/object/property_info.h"
 #include "core/variant/variant.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/engine/modules/gdscript/gdscript_warning.h b/engine/modules/gdscript/gdscript_warning.h
index ebb61824..e4f22c85 100644
--- a/engine/modules/gdscript/gdscript_warning.h
+++ b/engine/modules/gdscript/gdscript_warning.h
@@ -32,11 +32,10 @@
 
 #ifdef DEBUG_ENABLED
 
+#include "core/object/object.h"
+#include "core/string/ustring.h"
 #include "core/templates/vector.h"
 
-class String;
-struct PropertyInfo;
-
 class GDScriptWarning {
 public:
 	enum WarnLevel {
@@ -159,10 +158,7 @@ public:
 	static_assert(std_size(default_warning_levels) == WARNING_MAX, "Amount of default levels does not match the amount of warnings.");
 
 	Code code = WARNING_MAX;
-	int start_line = 0;
-	int start_column = 0;
-	int end_line = 0;
-	int end_column = 0;
+	int start_line = -1, end_line = -1;
 	Vector<String> symbols;
 
 	String get_name() const;
diff --git a/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp b/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 9d6333d4..5c684c84 100644
--- a/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -32,11 +32,10 @@
 
 #include "../gdscript.h"
 #include "../gdscript_analyzer.h"
+#include "editor/settings/editor_settings.h"
 #include "gdscript_language_protocol.h"
 #include "gdscript_workspace.h"
 
-#include "editor/settings/editor_settings.h"
-
 int get_indent_size() {
 	if (EditorSettings::get_singleton()) {
 		return EditorSettings::get_singleton()->get_setting("text_editor/behavior/indent/size");
@@ -136,12 +135,18 @@ void ExtendGDScriptParser::update_diagnostics() {
 		diagnostic.severity = LSP::DiagnosticSeverity::Error;
 		diagnostic.message = error.message;
 		diagnostic.source = "gdscript";
-
-		GodotRange godot_range(
-				GodotPosition(error.start_line, error.start_column),
-				GodotPosition(error.end_line, error.end_column));
-
-		diagnostic.range = godot_range.to_lsp(get_lines());
+		diagnostic.code = -1;
+		LSP::Range range;
+		LSP::Position pos;
+		const PackedStringArray line_array = get_lines();
+		int line = CLAMP(LINE_NUMBER_TO_INDEX(error.line), 0, line_array.size() - 1);
+		const String &line_text = line_array[line];
+		pos.line = line;
+		pos.character = line_text.length() - line_text.strip_edges(true, false).length();
+		range.start = pos;
+		range.end = range.start;
+		range.end.character = line_text.strip_edges(false).length();
+		diagnostic.range = range;
 		diagnostics.push_back(diagnostic);
 	}
 
@@ -151,12 +156,17 @@ void ExtendGDScriptParser::update_diagnostics() {
 		diagnostic.severity = LSP::DiagnosticSeverity::Warning;
 		diagnostic.message = "(" + warning.get_name() + "): " + warning.get_message();
 		diagnostic.source = "gdscript";
-
-		GodotRange godot_range(
-				GodotPosition(warning.start_line, warning.start_column),
-				GodotPosition(warning.end_line, warning.end_column));
-
-		diagnostic.range = godot_range.to_lsp(get_lines());
+		diagnostic.code = warning.code;
+		LSP::Range range;
+		LSP::Position pos;
+		int line = LINE_NUMBER_TO_INDEX(warning.start_line);
+		const String &line_text = get_lines()[line];
+		pos.line = line;
+		pos.character = line_text.length() - line_text.strip_edges(true, false).length();
+		range.start = pos;
+		range.end = pos;
+		range.end.character = line_text.strip_edges(false).length();
+		diagnostic.range = range;
 		diagnostics.push_back(diagnostic);
 	}
 }
@@ -860,6 +870,30 @@ const List<LSP::DocumentLink> &ExtendGDScriptParser::get_document_links() const
 	return document_links;
 }
 
+const Array &ExtendGDScriptParser::get_member_completions() {
+	if (member_completions.is_empty()) {
+		for (const KeyValue<String, const LSP::DocumentSymbol *> &E : members) {
+			const LSP::DocumentSymbol *symbol = E.value;
+			LSP::CompletionItem item = symbol->make_completion_item();
+			item.data = JOIN_SYMBOLS(path, E.key);
+			member_completions.push_back(item.to_json());
+		}
+
+		for (const KeyValue<String, ClassMembers> &E : inner_classes) {
+			const ClassMembers *inner_class = &E.value;
+
+			for (const KeyValue<String, const LSP::DocumentSymbol *> &F : *inner_class) {
+				const LSP::DocumentSymbol *symbol = F.value;
+				LSP::CompletionItem item = symbol->make_completion_item();
+				item.data = JOIN_SYMBOLS(path, JOIN_SYMBOLS(E.key, F.key));
+				member_completions.push_back(item.to_json());
+			}
+		}
+	}
+
+	return member_completions;
+}
+
 Dictionary ExtendGDScriptParser::dump_function_api(const GDScriptParser::FunctionNode *p_func) const {
 	ERR_FAIL_NULL_V(p_func, Dictionary());
 	Dictionary func;
diff --git a/engine/modules/gdscript/language_server/gdscript_extend_parser.h b/engine/modules/gdscript/language_server/gdscript_extend_parser.h
index ecc8b264..cbc79764 100644
--- a/engine/modules/gdscript/language_server/gdscript_extend_parser.h
+++ b/engine/modules/gdscript/language_server/gdscript_extend_parser.h
@@ -42,6 +42,14 @@
 #define COLUMN_NUMBER_TO_INDEX(p_column) ((p_column) - 1)
 #endif
 
+#ifndef SYMBOL_SEPARATOR
+#define SYMBOL_SEPARATOR "::"
+#endif
+
+#ifndef JOIN_SYMBOLS
+#define JOIN_SYMBOLS(p_path, name) ((p_path) + SYMBOL_SEPARATOR + (name))
+#endif
+
 typedef HashMap<String, const LSP::DocumentSymbol *> ClassMembers;
 
 /**
@@ -126,6 +134,8 @@ class ExtendGDScriptParser : public GDScriptParser {
 
 	const LSP::DocumentSymbol *search_symbol_defined_at_line(int p_line, const LSP::DocumentSymbol &p_parent, const String &p_symbol_name = "") const;
 
+	Array member_completions;
+
 public:
 	_FORCE_INLINE_ const String &get_path() const { return path; }
 	_FORCE_INLINE_ const Vector<String> &get_lines() const { return lines; }
diff --git a/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp b/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
index fda5f053..2d01c49c 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
@@ -30,27 +30,23 @@
 
 #include "gdscript_language_protocol.h"
 
-#include "godot_lsp.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
+#include "modules/gdscript/language_server/godot_lsp.h"
 
-#define LSP_CLIENT_V(m_ret_val) \
+#define LSP_CLIENT_V(m_ret_val)                                    \
 	ERR_FAIL_COND_V(latest_client_id == LSP_NO_CLIENT, m_ret_val); \
-	ERR_FAIL_COND_V(!clients.has(latest_client_id), m_ret_val); \
-	Ref<LSPeer> client = clients.get(latest_client_id); \
+	ERR_FAIL_COND_V(!clients.has(latest_client_id), m_ret_val);    \
+	Ref<LSPeer> client = clients.get(latest_client_id);            \
 	ERR_FAIL_COND_V(!client.is_valid(), m_ret_val);
 
-#define LSP_CLIENT \
-	ERR_FAIL_COND(latest_client_id == LSP_NO_CLIENT); \
-	ERR_FAIL_COND(!clients.has(latest_client_id)); \
+#define LSP_CLIENT                                      \
+	ERR_FAIL_COND(latest_client_id == LSP_NO_CLIENT);   \
+	ERR_FAIL_COND(!clients.has(latest_client_id));      \
 	Ref<LSPeer> client = clients.get(latest_client_id); \
 	ERR_FAIL_COND(!client.is_valid());
 
@@ -152,9 +148,6 @@ Error GDScriptLanguageProtocol::on_client_connected() {
 
 void GDScriptLanguageProtocol::on_client_disconnected(const int &p_client_id) {
 	clients.erase(p_client_id);
-	if (clients.is_empty()) {
-		scene_cache.clear();
-	}
 	EditorNode::get_log()->add_message("[LSP] Disconnected", EditorLog::MSG_TYPE_EDITOR);
 }
 
@@ -178,18 +171,15 @@ String GDScriptLanguageProtocol::format_output(const String &p_text) {
 }
 
 void GDScriptLanguageProtocol::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_text_document"), &GDScriptLanguageProtocol::get_text_document);
-	ClassDB::bind_method(D_METHOD("get_workspace"), &GDScriptLanguageProtocol::get_workspace);
-	ClassDB::bind_method(D_METHOD("is_smart_resolve_enabled"), &GDScriptLanguageProtocol::is_smart_resolve_enabled);
-	ClassDB::bind_method(D_METHOD("is_initialized"), &GDScriptLanguageProtocol::is_initialized);
-
-#ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("initialize", "params"), &GDScriptLanguageProtocol::initialize);
 	ClassDB::bind_method(D_METHOD("initialized", "params"), &GDScriptLanguageProtocol::initialized);
 	ClassDB::bind_method(D_METHOD("on_client_connected"), &GDScriptLanguageProtocol::on_client_connected);
-	ClassDB::bind_method(D_METHOD("on_client_disconnected", "client_id"), &GDScriptLanguageProtocol::on_client_disconnected);
+	ClassDB::bind_method(D_METHOD("on_client_disconnected"), &GDScriptLanguageProtocol::on_client_disconnected);
 	ClassDB::bind_method(D_METHOD("notify_client", "method", "params", "client_id"), &GDScriptLanguageProtocol::notify_client, DEFVAL(Variant()), DEFVAL(-1));
-#endif // !DISABLE_DEPRECATED
+	ClassDB::bind_method(D_METHOD("is_smart_resolve_enabled"), &GDScriptLanguageProtocol::is_smart_resolve_enabled);
+	ClassDB::bind_method(D_METHOD("get_text_document"), &GDScriptLanguageProtocol::get_text_document);
+	ClassDB::bind_method(D_METHOD("get_workspace"), &GDScriptLanguageProtocol::get_workspace);
+	ClassDB::bind_method(D_METHOD("is_initialized"), &GDScriptLanguageProtocol::is_initialized);
 }
 
 Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
@@ -249,6 +239,7 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 
 	if (!_initialized) {
 		workspace->initialize();
+		text_document->initialize();
 		_initialized = true;
 	}
 
@@ -279,8 +270,6 @@ void GDScriptLanguageProtocol::poll(int p_limit_usec) {
 		on_client_connected();
 	}
 
-	scene_cache.poll();
-
 	HashMap<int, Ref<LSPeer>>::Iterator E = clients.begin();
 	while (E != clients.end()) {
 		Ref<LSPeer> peer = E->value;
@@ -327,7 +316,6 @@ void GDScriptLanguageProtocol::stop() {
 		peer->connection->disconnect_from_host();
 	}
 
-	scene_cache.clear();
 	server->stop();
 }
 
@@ -460,8 +448,6 @@ void GDScriptLanguageProtocol::lsp_did_open(const Dictionary &p_params) {
 
 	client->managed_files[path] = document;
 	client->parse_script(path);
-
-	scene_cache.request_load(path);
 }
 
 void GDScriptLanguageProtocol::lsp_did_change(const Dictionary &p_params) {
@@ -507,8 +493,6 @@ void GDScriptLanguageProtocol::lsp_did_close(const Dictionary &p_params) {
 
 	/// A close notification requires a previous open notification to be sent.
 	ERR_FAIL_COND_MSG(!was_opened, "LSP: Client is closing file without opening it.");
-
-	scene_cache.unload(path);
 }
 
 void GDScriptLanguageProtocol::resolve_related_symbols(const LSP::TextDocumentPositionParams &p_doc_pos, List<const LSP::DocumentSymbol *> &r_list) {
@@ -574,7 +558,6 @@ GDScriptLanguageProtocol::GDScriptLanguageProtocol() {
 	SET_DOCUMENT_METHOD(didSave);
 
 	SET_DOCUMENT_METHOD(documentSymbol);
-	SET_DOCUMENT_METHOD(documentHighlight);
 	SET_DOCUMENT_METHOD(completion);
 	SET_DOCUMENT_METHOD(rename);
 	SET_DOCUMENT_METHOD(prepareRename);
diff --git a/engine/modules/gdscript/language_server/gdscript_language_protocol.h b/engine/modules/gdscript/language_server/gdscript_language_protocol.h
index 897fe11e..c0f30cb9 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_protocol.h
+++ b/engine/modules/gdscript/language_server/gdscript_language_protocol.h
@@ -32,7 +32,6 @@
 
 #include "gdscript_text_document.h"
 #include "gdscript_workspace.h"
-#include "scene_cache.h"
 
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
@@ -47,7 +46,9 @@
 class GDScriptLanguageProtocol : public JSONRPC {
 	GDCLASS(GDScriptLanguageProtocol, JSONRPC)
 
+#ifdef TESTS_ENABLED
 	friend class TestGDScriptLanguageProtocolInitializer;
+#endif
 
 private:
 	struct LSPeer : RefCounted {
@@ -91,7 +92,6 @@ private:
 	static GDScriptLanguageProtocol *singleton;
 
 	HashMap<int, Ref<LSPeer>> clients;
-	SceneCache scene_cache;
 	Ref<TCPServer> server;
 	int latest_client_id = LSP_NO_CLIENT;
 	int next_client_id = 0;
@@ -119,8 +119,6 @@ public:
 	_FORCE_INLINE_ static GDScriptLanguageProtocol *get_singleton() { return singleton; }
 	_FORCE_INLINE_ Ref<GDScriptWorkspace> get_workspace() { return workspace; }
 	_FORCE_INLINE_ Ref<GDScriptTextDocument> get_text_document() { return text_document; }
-	_FORCE_INLINE_ SceneCache *get_scene_cache() { return &scene_cache; }
-
 	_FORCE_INLINE_ bool is_initialized() const { return _initialized; }
 
 	void poll(int p_limit_usec);
diff --git a/engine/modules/gdscript/language_server/gdscript_language_server.cpp b/engine/modules/gdscript/language_server/gdscript_language_server.cpp
index 2648781b..aeff4d4e 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_server.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_language_server.cpp
@@ -30,8 +30,6 @@
 
 #include "gdscript_language_server.h"
 
-#include "gdscript_language_protocol.h"
-
 #include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
@@ -40,6 +38,14 @@
 int GDScriptLanguageServer::port_override = -1;
 
 GDScriptLanguageServer::GDScriptLanguageServer() {
+	// TODO: Move to editor_settings.cpp
+	_EDITOR_DEF("network/language_server/remote_host", host);
+	_EDITOR_DEF("network/language_server/remote_port", port);
+	_EDITOR_DEF("network/language_server/enable_smart_resolve", true);
+	_EDITOR_DEF("network/language_server/show_native_symbols_in_editor", false);
+	_EDITOR_DEF("network/language_server/use_thread", use_thread);
+	_EDITOR_DEF("network/language_server/poll_limit_usec", poll_limit_usec);
+
 	set_process_internal(true);
 }
 
@@ -56,7 +62,7 @@ void GDScriptLanguageServer::_notification(int p_what) {
 			}
 
 			if (started && !use_thread) {
-				GDScriptLanguageProtocol::get_singleton()->poll(poll_limit_usec);
+				protocol.poll(poll_limit_usec);
 			}
 		} break;
 
@@ -82,7 +88,7 @@ void GDScriptLanguageServer::thread_main(void *p_userdata) {
 	GDScriptLanguageServer *self = static_cast<GDScriptLanguageServer *>(p_userdata);
 	while (self->thread_running) {
 		// Poll 20 times per second
-		GDScriptLanguageProtocol::get_singleton()->poll(self->poll_limit_usec);
+		self->protocol.poll(self->poll_limit_usec);
 		OS::get_singleton()->delay_usec(50000);
 	}
 }
@@ -92,18 +98,15 @@ void GDScriptLanguageServer::start() {
 	port = (GDScriptLanguageServer::port_override > -1) ? GDScriptLanguageServer::port_override : (int)_EDITOR_GET("network/language_server/remote_port");
 	use_thread = (bool)_EDITOR_GET("network/language_server/use_thread");
 	poll_limit_usec = (int)_EDITOR_GET("network/language_server/poll_limit_usec");
-	const Error status = GDScriptLanguageProtocol::get_singleton()->start(port, IPAddress(host));
-	if (status != OK) {
-		EditorNode::get_log()->add_message("--- Failed to start GDScript language server on port " + itos(port) + ": " + error_names[status] + " ---", EditorLog::MSG_TYPE_EDITOR);
-		return;
+	if (protocol.start(port, IPAddress(host)) == OK) {
+		EditorNode::get_log()->add_message("--- GDScript language server started on port " + itos(port) + " ---", EditorLog::MSG_TYPE_EDITOR);
+		if (use_thread) {
+			thread_running = true;
+			thread.start(GDScriptLanguageServer::thread_main, this);
+		}
+		set_process_internal(!use_thread);
+		started = true;
 	}
-	EditorNode::get_log()->add_message("--- GDScript language server started on port " + itos(port) + " ---", EditorLog::MSG_TYPE_EDITOR);
-	if (use_thread) {
-		thread_running = true;
-		thread.start(GDScriptLanguageServer::thread_main, this);
-	}
-	set_process_internal(!use_thread);
-	started = true;
 }
 
 void GDScriptLanguageServer::stop() {
@@ -112,7 +115,7 @@ void GDScriptLanguageServer::stop() {
 		thread_running = false;
 		thread.wait_to_finish();
 	}
-	GDScriptLanguageProtocol::get_singleton()->stop();
+	protocol.stop();
 	started = false;
 	EditorNode::get_log()->add_message("--- GDScript language server stopped ---", EditorLog::MSG_TYPE_EDITOR);
 }
diff --git a/engine/modules/gdscript/language_server/gdscript_language_server.h b/engine/modules/gdscript/language_server/gdscript_language_server.h
index 8eb8bee6..12541ec5 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_server.h
+++ b/engine/modules/gdscript/language_server/gdscript_language_server.h
@@ -30,23 +30,24 @@
 
 #pragma once
 
+#include "gdscript_language_protocol.h"
+
 #include "editor/plugins/editor_plugin.h"
 
 class GDScriptLanguageServer : public EditorPlugin {
 	GDCLASS(GDScriptLanguageServer, EditorPlugin);
 
+	GDScriptLanguageProtocol protocol;
+
 	Thread thread;
 	bool thread_running = false;
 	// There is no notification when the editor is initialized. We need to poll till we attempted to start the server.
 	bool start_attempted = false;
 	bool started = false;
-
-	// Defaults located in editor_settings.cpp
 	bool use_thread = false;
-	String host;
-	int port = 0;
-	int poll_limit_usec = 0;
-
+	String host = "127.0.0.1";
+	int port = 6005;
+	int poll_limit_usec = 100000;
 	static void thread_main(void *p_userdata);
 
 private:
diff --git a/engine/modules/gdscript/language_server/gdscript_text_document.cpp b/engine/modules/gdscript/language_server/gdscript_text_document.cpp
index 2db9aba7..ad0ccb33 100644
--- a/engine/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -34,38 +34,32 @@
 #include "gdscript_extend_parser.h"
 #include "gdscript_language_protocol.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "editor/script/script_editor_plugin.h"
+#include "editor/script/script_text_editor.h"
 #include "editor/settings/editor_settings.h"
 #include "servers/display/display_server.h"
 
 void GDScriptTextDocument::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("show_native_symbol_in_editor", "symbol_id"), &GDScriptTextDocument::show_native_symbol_in_editor);
-
-#ifndef DISABLE_DEPRECATED
-	ClassDB::bind_method(D_METHOD("didOpen", "params"), &GDScriptTextDocument::didOpen);
-	ClassDB::bind_method(D_METHOD("didClose", "params"), &GDScriptTextDocument::didClose);
-	ClassDB::bind_method(D_METHOD("didChange", "params"), &GDScriptTextDocument::didChange);
-	ClassDB::bind_method(D_METHOD("willSaveWaitUntil", "params"), &GDScriptTextDocument::willSaveWaitUntil);
-	ClassDB::bind_method(D_METHOD("didSave", "params"), &GDScriptTextDocument::didSave);
-	ClassDB::bind_method(D_METHOD("nativeSymbol", "params"), &GDScriptTextDocument::nativeSymbol);
-	ClassDB::bind_method(D_METHOD("documentSymbol", "params"), &GDScriptTextDocument::documentSymbol);
-	ClassDB::bind_method(D_METHOD("completion", "params"), &GDScriptTextDocument::completion);
-	ClassDB::bind_method(D_METHOD("resolve", "params"), &GDScriptTextDocument::resolve);
-	ClassDB::bind_method(D_METHOD("rename", "params"), &GDScriptTextDocument::rename);
-	ClassDB::bind_method(D_METHOD("prepareRename", "params"), &GDScriptTextDocument::prepareRename);
-	ClassDB::bind_method(D_METHOD("references", "params"), &GDScriptTextDocument::references);
-	ClassDB::bind_method(D_METHOD("foldingRange", "params"), &GDScriptTextDocument::foldingRange);
-	ClassDB::bind_method(D_METHOD("codeLens", "params"), &GDScriptTextDocument::codeLens);
-	ClassDB::bind_method(D_METHOD("documentLink", "params"), &GDScriptTextDocument::documentLink);
-	ClassDB::bind_method(D_METHOD("colorPresentation", "params"), &GDScriptTextDocument::colorPresentation);
-	ClassDB::bind_method(D_METHOD("hover", "params"), &GDScriptTextDocument::hover);
-	ClassDB::bind_method(D_METHOD("definition", "params"), &GDScriptTextDocument::definition);
-	ClassDB::bind_method(D_METHOD("declaration", "params"), &GDScriptTextDocument::declaration);
-	ClassDB::bind_method(D_METHOD("signatureHelp", "params"), &GDScriptTextDocument::signatureHelp);
-#endif // !DISABLE_DEPRECATED
+	ClassDB::bind_method(D_METHOD("didOpen"), &GDScriptTextDocument::didOpen);
+	ClassDB::bind_method(D_METHOD("didClose"), &GDScriptTextDocument::didClose);
+	ClassDB::bind_method(D_METHOD("didChange"), &GDScriptTextDocument::didChange);
+	ClassDB::bind_method(D_METHOD("willSaveWaitUntil"), &GDScriptTextDocument::willSaveWaitUntil);
+	ClassDB::bind_method(D_METHOD("didSave"), &GDScriptTextDocument::didSave);
+	ClassDB::bind_method(D_METHOD("nativeSymbol"), &GDScriptTextDocument::nativeSymbol);
+	ClassDB::bind_method(D_METHOD("documentSymbol"), &GDScriptTextDocument::documentSymbol);
+	ClassDB::bind_method(D_METHOD("completion"), &GDScriptTextDocument::completion);
+	ClassDB::bind_method(D_METHOD("resolve"), &GDScriptTextDocument::resolve);
+	ClassDB::bind_method(D_METHOD("rename"), &GDScriptTextDocument::rename);
+	ClassDB::bind_method(D_METHOD("prepareRename"), &GDScriptTextDocument::prepareRename);
+	ClassDB::bind_method(D_METHOD("references"), &GDScriptTextDocument::references);
+	ClassDB::bind_method(D_METHOD("foldingRange"), &GDScriptTextDocument::foldingRange);
+	ClassDB::bind_method(D_METHOD("codeLens"), &GDScriptTextDocument::codeLens);
+	ClassDB::bind_method(D_METHOD("documentLink"), &GDScriptTextDocument::documentLink);
+	ClassDB::bind_method(D_METHOD("colorPresentation"), &GDScriptTextDocument::colorPresentation);
+	ClassDB::bind_method(D_METHOD("hover"), &GDScriptTextDocument::hover);
+	ClassDB::bind_method(D_METHOD("definition"), &GDScriptTextDocument::definition);
+	ClassDB::bind_method(D_METHOD("declaration"), &GDScriptTextDocument::declaration);
+	ClassDB::bind_method(D_METHOD("signatureHelp"), &GDScriptTextDocument::signatureHelp);
+	ClassDB::bind_method(D_METHOD("show_native_symbol_in_editor"), &GDScriptTextDocument::show_native_symbol_in_editor);
 }
 
 void GDScriptTextDocument::didOpen(const Variant &p_param) {
@@ -128,6 +122,21 @@ void GDScriptTextDocument::notify_client_show_symbol(const LSP::DocumentSymbol *
 	GDScriptLanguageProtocol::get_singleton()->notify_client("gdscript/show_native_symbol", symbol->to_json(true));
 }
 
+void GDScriptTextDocument::initialize() {
+	if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
+		for (const KeyValue<StringName, ClassMembers> &E : GDScriptLanguageProtocol::get_singleton()->get_workspace()->native_members) {
+			const ClassMembers &members = E.value;
+
+			for (const KeyValue<String, const LSP::DocumentSymbol *> &F : members) {
+				const LSP::DocumentSymbol *symbol = members.get(F.key);
+				LSP::CompletionItem item = symbol->make_completion_item();
+				item.data = JOIN_SYMBOLS(String(E.key), F.key);
+				native_member_completions.push_back(item.to_json());
+			}
+		}
+	}
+}
+
 Variant GDScriptTextDocument::nativeSymbol(const Dictionary &p_params) {
 	Variant ret;
 
@@ -156,25 +165,6 @@ Array GDScriptTextDocument::documentSymbol(const Dictionary &p_params) {
 	return arr;
 }
 
-Array GDScriptTextDocument::documentHighlight(const Dictionary &p_params) {
-	Array arr;
-	LSP::TextDocumentPositionParams params;
-	params.load(p_params);
-
-	const LSP::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
-	if (symbol) {
-		String path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(params.textDocument.uri);
-		Vector<LSP::Location> usages = GDScriptLanguageProtocol::get_singleton()->get_workspace()->find_usages_in_file(*symbol, path);
-
-		for (const LSP::Location &usage : usages) {
-			LSP::DocumentHighlight highlight;
-			highlight.range = usage.range;
-			arr.push_back(highlight.to_json());
-		}
-	}
-	return arr;
-}
-
 Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 	Array arr;
 
@@ -299,6 +289,33 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
 	if (data.get_type() == Variant::DICTIONARY) {
 		params.load(p_params["data"]);
 		symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == LSP::CompletionItemKind::Method || item.kind == LSP::CompletionItemKind::Function);
+
+	} else if (data.is_string()) {
+		String query = data;
+
+		Vector<String> param_symbols = query.split(SYMBOL_SEPARATOR, false);
+
+		if (param_symbols.size() >= 2) {
+			StringName class_name = param_symbols[0];
+			const String &member_name = param_symbols[param_symbols.size() - 1];
+			String inner_class_name;
+			if (param_symbols.size() >= 3) {
+				inner_class_name = param_symbols[1];
+			}
+
+			if (const ClassMembers *members = GDScriptLanguageProtocol::get_singleton()->get_workspace()->native_members.getptr(class_name)) {
+				if (const LSP::DocumentSymbol *const *member = members->getptr(member_name)) {
+					symbol = *member;
+				}
+			}
+
+			if (!symbol) {
+				ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_parse_result(class_name);
+				if (parser) {
+					symbol = parser->get_member_symbol(member_name, inner_class_name);
+				}
+			}
+		}
 	}
 
 	if (symbol) {
diff --git a/engine/modules/gdscript/language_server/gdscript_text_document.h b/engine/modules/gdscript/language_server/gdscript_text_document.h
index 2e229b75..86cd675b 100644
--- a/engine/modules/gdscript/language_server/gdscript_text_document.h
+++ b/engine/modules/gdscript/language_server/gdscript_text_document.h
@@ -44,6 +44,8 @@ protected:
 
 	Ref<FileAccess> file_checker;
 
+	Array native_member_completions;
+
 private:
 	Array find_symbols(const LSP::TextDocumentPositionParams &p_location, List<const LSP::DocumentSymbol *> &r_list);
 	void notify_client_show_symbol(const LSP::DocumentSymbol *symbol);
@@ -60,7 +62,6 @@ public:
 
 	Variant nativeSymbol(const Dictionary &p_params);
 	Array documentSymbol(const Dictionary &p_params);
-	Array documentHighlight(const Dictionary &p_params);
 	Array completion(const Dictionary &p_params);
 	Dictionary resolve(const Dictionary &p_params);
 	Dictionary rename(const Dictionary &p_params);
@@ -75,5 +76,7 @@ public:
 	Variant declaration(const Dictionary &p_params);
 	Variant signatureHelp(const Dictionary &p_params);
 
+	void initialize();
+
 	GDScriptTextDocument();
 };
diff --git a/engine/modules/gdscript/language_server/gdscript_workspace.cpp b/engine/modules/gdscript/language_server/gdscript_workspace.cpp
index b757cc97..39fc21eb 100644
--- a/engine/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -35,26 +35,25 @@
 #include "gdscript_language_protocol.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/resources/packed_scene.h"
 
 void GDScriptWorkspace::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("apply_new_signal", "obj", "function", "args"), &GDScriptWorkspace::apply_new_signal);
+	ClassDB::bind_method(D_METHOD("apply_new_signal"), &GDScriptWorkspace::apply_new_signal);
 	ClassDB::bind_method(D_METHOD("get_file_path", "uri"), &GDScriptWorkspace::get_file_path);
 	ClassDB::bind_method(D_METHOD("get_file_uri", "path"), &GDScriptWorkspace::get_file_uri);
+	ClassDB::bind_method(D_METHOD("publish_diagnostics", "path"), &GDScriptWorkspace::publish_diagnostics);
 	ClassDB::bind_method(D_METHOD("generate_script_api", "path"), &GDScriptWorkspace::generate_script_api);
 
 #ifndef DISABLE_DEPRECATED
-	ClassDB::bind_method(D_METHOD("didDeleteFiles", "params"), &GDScriptWorkspace::didDeleteFiles);
+	ClassDB::bind_method(D_METHOD("didDeleteFiles"), &GDScriptWorkspace::didDeleteFiles);
 	ClassDB::bind_method(D_METHOD("parse_script", "path", "content"), &GDScriptWorkspace::parse_script);
-	ClassDB::bind_method(D_METHOD("parse_local_script", "path"), &GDScriptWorkspace::parse_local_script);
-	ClassDB::bind_method(D_METHOD("publish_diagnostics", "path"), &GDScriptWorkspace::publish_diagnostics);
+	ClassDB::bind_method(D_METHOD("parse_local_script", "path"), &GDScriptWorkspace::parse_script);
 #endif
 }
 
@@ -593,6 +592,51 @@ void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
 	GDScriptLanguageProtocol::get_singleton()->notify_client("textDocument/publishDiagnostics", params);
 }
 
+void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners) {
+	if (!efsd) {
+		return;
+	}
+
+	for (int i = 0; i < efsd->get_subdir_count(); i++) {
+		_get_owners(efsd->get_subdir(i), p_path, owners);
+	}
+
+	for (int i = 0; i < efsd->get_file_count(); i++) {
+		Vector<String> deps = efsd->get_file_deps(i);
+		bool found = false;
+		for (int j = 0; j < deps.size(); j++) {
+			if (deps[j] == p_path) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			continue;
+		}
+
+		owners.push_back(efsd->get_file_path(i));
+	}
+}
+
+Node *GDScriptWorkspace::_get_owner_scene_node(String p_path) {
+	Node *owner_scene_node = nullptr;
+	List<String> owners;
+
+	_get_owners(EditorFileSystem::get_singleton()->get_filesystem(), p_path, owners);
+
+	for (const String &owner : owners) {
+		NodePath owner_path = owner;
+		Ref<Resource> owner_res = ResourceLoader::load(String(owner_path));
+		if (Object::cast_to<PackedScene>(owner_res.ptr())) {
+			Ref<PackedScene> owner_packed_scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*owner_res));
+			owner_scene_node = owner_packed_scene->instantiate();
+			break;
+		}
+	}
+
+	return owner_scene_node;
+}
+
 void GDScriptWorkspace::completion(const LSP::CompletionParams &p_params, List<ScriptLanguage::CodeCompletionOption> *r_options) {
 	String path = get_file_path(p_params.textDocument.uri);
 	String call_hint;
@@ -600,7 +644,7 @@ void GDScriptWorkspace::completion(const LSP::CompletionParams &p_params, List<S
 
 	const ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_parse_result(path);
 	if (parser) {
-		Node *owner_scene_node = GDScriptLanguageProtocol::get_singleton()->get_scene_cache()->get(path);
+		Node *owner_scene_node = _get_owner_scene_node(path);
 
 		Array stack;
 		Node *current = nullptr;
@@ -626,6 +670,9 @@ void GDScriptWorkspace::completion(const LSP::CompletionParams &p_params, List<S
 
 		String code = parser->get_text_for_completion(p_params.position);
 		GDScriptLanguage::get_singleton()->complete_code(code, path, current, r_options, forced, call_hint);
+		if (owner_scene_node) {
+			memdelete(owner_scene_node);
+		}
 	}
 }
 
diff --git a/engine/modules/gdscript/language_server/gdscript_workspace.h b/engine/modules/gdscript/language_server/gdscript_workspace.h
index 823e1485..7386f45c 100644
--- a/engine/modules/gdscript/language_server/gdscript_workspace.h
+++ b/engine/modules/gdscript/language_server/gdscript_workspace.h
@@ -30,18 +30,22 @@
 
 #pragma once
 
+#include "core/error/error_macros.h"
 #include "gdscript_extend_parser.h"
 #include "godot_lsp.h"
 
-#include "core/error/error_macros.h"
 #include "core/variant/variant.h"
+#include "editor/file_system/editor_file_system.h"
 
 class GDScriptWorkspace : public RefCounted {
 	GDCLASS(GDScriptWorkspace, RefCounted);
 
 private:
+	void _get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners);
+	Node *_get_owner_scene_node(String p_path);
+
 #ifndef DISABLE_DEPRECATED
-	void didDeleteFiles(const Dictionary &p_params) {}
+	void didDeleteFiles() {}
 	Error parse_script(const String &p_path, const String &p_content) {
 		WARN_DEPRECATED;
 		return Error::FAILED;
diff --git a/engine/modules/gdscript/language_server/godot_lsp.h b/engine/modules/gdscript/language_server/godot_lsp.h
index 2c5d58b3..542d763a 100644
--- a/engine/modules/gdscript/language_server/godot_lsp.h
+++ b/engine/modules/gdscript/language_server/godot_lsp.h
@@ -34,15 +34,6 @@
 #include "core/object/class_db.h"
 #include "core/templates/list.h"
 
-// Enable additional LSP related logging.
-//#define DEBUG_LSP
-
-#ifdef DEBUG_LSP
-#define LOG_LSP(...) print_line("[ LSP -", __FILE__, ":", __LINE__, "-", __func__, "] -", ##__VA_ARGS__)
-#else
-#define LOG_LSP(...)
-#endif
-
 namespace LSP {
 
 typedef String DocumentUri;
@@ -1077,12 +1068,8 @@ struct CompletionItem {
 			dict["insertText"] = insertText;
 		}
 		if (resolved) {
-			if (!detail.is_empty()) {
-				dict["detail"] = detail;
-			}
-			if (!documentation.value.is_empty()) {
-				dict["documentation"] = documentation.to_json();
-			}
+			dict["detail"] = detail;
+			dict["documentation"] = documentation.to_json();
 			dict["deprecated"] = deprecated;
 			dict["preselect"] = preselect;
 			if (!sortText.is_empty()) {
@@ -1298,6 +1285,48 @@ struct DocumentSymbol {
 		}
 		return markdown;
 	}
+
+	_FORCE_INLINE_ CompletionItem make_completion_item(bool resolved = false) const {
+		LSP::CompletionItem item;
+		item.label = name;
+
+		if (resolved) {
+			item.documentation = render();
+		}
+
+		switch (kind) {
+			case LSP::SymbolKind::Enum:
+				item.kind = LSP::CompletionItemKind::Enum;
+				break;
+			case LSP::SymbolKind::Class:
+				item.kind = LSP::CompletionItemKind::Class;
+				break;
+			case LSP::SymbolKind::Property:
+				item.kind = LSP::CompletionItemKind::Property;
+				break;
+			case LSP::SymbolKind::Method:
+			case LSP::SymbolKind::Function:
+				item.kind = LSP::CompletionItemKind::Method;
+				break;
+			case LSP::SymbolKind::Event:
+				item.kind = LSP::CompletionItemKind::Event;
+				break;
+			case LSP::SymbolKind::Constant:
+				item.kind = LSP::CompletionItemKind::Constant;
+				break;
+			case LSP::SymbolKind::Variable:
+				item.kind = LSP::CompletionItemKind::Variable;
+				break;
+			case LSP::SymbolKind::File:
+				item.kind = LSP::CompletionItemKind::File;
+				break;
+			default:
+				item.kind = LSP::CompletionItemKind::Text;
+				break;
+		}
+
+		return item;
+	}
 };
 
 struct ApplyWorkspaceEditParams {
@@ -1737,7 +1766,7 @@ struct ServerCapabilities {
 	/**
 	 * The server provides document highlight support.
 	 */
-	bool documentHighlightProvider = true;
+	bool documentHighlightProvider = false;
 
 	/**
 	 * The server provides document symbol support.
@@ -2094,26 +2123,4 @@ static String marked_documentation(const String &p_bbcode) {
 	}
 	return markdown;
 }
-
-/**
- * A document highlight is a range inside a text document which deserves
- * special attention. Usually a document highlight is visualized by changing
- * the background color of its range.
- */
-struct DocumentHighlight {
-	/**
-	 * The range this highlight applies to.
-	 */
-	Range range;
-
-	_FORCE_INLINE_ Dictionary to_json() const {
-		Dictionary dict;
-		dict["range"] = range.to_json();
-		return dict;
-	}
-
-	_FORCE_INLINE_ void load(const Dictionary &p_params) {
-		range.load(p_params["range"]);
-	}
-};
 } // namespace LSP
diff --git a/engine/modules/gdscript/language_server/scene_cache.cpp b/engine/modules/gdscript/language_server/scene_cache.cpp
deleted file mode 100644
index 04164830..00000000
--- a/engine/modules/gdscript/language_server/scene_cache.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************/
-/*  scene_cache.cpp                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "scene_cache.h"
-
-#include "godot_lsp.h"
-
-#include "core/io/resource_loader.h"
-#include "editor/file_system/editor_file_system.h"
-#include "scene/resources/packed_scene.h"
-
-void SceneCache::_get_owner_paths(EditorFileSystemDirectory *p_dir, const String &p_script_path, LocalVector<String> &r_owner_paths) {
-	if (!p_dir) {
-		return;
-	}
-
-	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
-		_get_owner_paths(p_dir->get_subdir(i), p_script_path, r_owner_paths);
-	}
-
-	for (int i = 0; i < p_dir->get_file_count(); i++) {
-		if (p_dir->get_file_deps(i).has(p_script_path)) {
-			r_owner_paths.push_back(p_dir->get_file_path(i));
-		}
-	}
-}
-
-void SceneCache::_finalize_scene_load() {
-	ERR_FAIL_COND(current_loaded_owner.is_empty() || script_path_queue.is_empty());
-
-	Ref<PackedScene> scene_res = ResourceLoader::load_threaded_get(current_loaded_owner);
-
-	if (scene_res.is_valid()) {
-		cache[script_path_queue[0]] = scene_res->instantiate();
-	} else {
-		cache[script_path_queue[0]] = nullptr;
-	}
-
-	LOG_LSP("Scene cached for script:", script_path_queue[0]);
-	LOG_LSP("pending_script_queue length:", script_path_queue.size() - 1);
-
-	script_path_queue.remove_at(0);
-	current_loaded_owner = String();
-}
-
-void SceneCache::poll() {
-	if (current_loaded_owner.is_empty()) {
-		// No load ongoing, start the next one.
-
-		if (EditorFileSystem::get_singleton()->is_scanning() || script_path_queue.is_empty()) {
-			return;
-		}
-
-		LocalVector<String> owners;
-		_get_owner_paths(EditorFileSystem::get_singleton()->get_filesystem(), script_path_queue[0], owners);
-		for (const String &owner : owners) {
-			if (ResourceLoader::load_threaded_request(owner) == Error::OK) {
-				current_loaded_owner = owner;
-				LOG_LSP("Scene load started for:", current_loaded_owner);
-				break;
-			}
-		}
-
-		if (current_loaded_owner.is_empty()) {
-			cache[script_path_queue[0]] = nullptr;
-			LOG_LSP("No scene found for script:", script_path_queue[0]);
-			script_path_queue.remove_at(0);
-			LOG_LSP("pending_script_queue length:", script_path_queue.size());
-		}
-	} else {
-		ERR_FAIL_COND(script_path_queue.is_empty());
-
-		// There is an ongoing load. Check the status.
-
-		ResourceLoader::ThreadLoadStatus status = ResourceLoader::load_threaded_get_status(current_loaded_owner);
-
-		if (status == ResourceLoader::THREAD_LOAD_IN_PROGRESS) {
-			return;
-		}
-
-		if (status == ResourceLoader::THREAD_LOAD_LOADED) {
-			_finalize_scene_load();
-		} else {
-			LOG_LSP("Scene load failure for:", current_loaded_owner);
-			cache[script_path_queue[0]] = nullptr;
-
-			script_path_queue.remove_at(0);
-			current_loaded_owner = String();
-		}
-	}
-}
-
-Node *SceneCache::get(const String &p_script_path) {
-	if (!script_path_queue.is_empty() && script_path_queue[0] == p_script_path && !current_loaded_owner.is_empty()) {
-		_finalize_scene_load();
-	} else {
-		script_path_queue.erase(p_script_path);
-	}
-
-	if (Node **entry = cache.getptr(p_script_path)) {
-		return *entry;
-	}
-
-	// Fallback to blocking load. This could happen if the open request was only recently sent.
-	// TODO: This could also happen when multiple clients are connected.
-
-	LocalVector<String> owners;
-	_get_owner_paths(EditorFileSystem::get_singleton()->get_filesystem(), p_script_path, owners);
-	for (const String &owner : owners) {
-		Ref<PackedScene> scene = ResourceLoader::load(owner);
-		if (scene.is_valid()) {
-			Node *instance = scene->instantiate();
-			cache[p_script_path] = instance;
-			return instance;
-		}
-	}
-
-	cache[p_script_path] = nullptr;
-	return nullptr;
-}
-
-void SceneCache::request_load(const String &p_script_path) {
-	if (!cache.has(p_script_path) && !script_path_queue.has(p_script_path)) {
-		script_path_queue.push_back(p_script_path);
-		LOG_LSP("Scene load requested for:", p_script_path);
-		LOG_LSP("pending_script_queue length:", script_path_queue.size());
-	}
-}
-
-void SceneCache::unload(const String &p_script_path) {
-	if (!script_path_queue.is_empty() && script_path_queue[0] == p_script_path && !current_loaded_owner.is_empty()) {
-		_ALLOW_DISCARD_ ResourceLoader::load_threaded_get(current_loaded_owner);
-
-		script_path_queue.remove_at(0);
-		current_loaded_owner = String();
-	} else {
-		script_path_queue.erase(p_script_path);
-	}
-
-	if (!cache.has(p_script_path)) {
-		return;
-	}
-	memdelete_notnull(cache[p_script_path]);
-	cache.erase(p_script_path);
-	LOG_LSP("Cache cleared for path:", p_script_path);
-}
-
-void SceneCache::clear() {
-	if (!current_loaded_owner.is_empty()) {
-		_ALLOW_DISCARD_ ResourceLoader::load_threaded_get(current_loaded_owner);
-		current_loaded_owner = String();
-	}
-	script_path_queue.clear();
-	for (const KeyValue<String, Node *> &E : cache) {
-		memdelete_notnull(E.value);
-	}
-	cache.clear();
-	LOG_LSP("Cache cleared.");
-}
diff --git a/engine/modules/gdscript/language_server/scene_cache.h b/engine/modules/gdscript/language_server/scene_cache.h
deleted file mode 100644
index 908e4e8f..00000000
--- a/engine/modules/gdscript/language_server/scene_cache.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**************************************************************************/
-/*  scene_cache.h                                                         */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/string/ustring.h"
-#include "core/templates/hash_map.h"
-#include "core/templates/local_vector.h"
-
-class Node;
-class EditorFileSystemDirectory;
-class PackedScene;
-
-/**
- * Used to load and cache scene instances for LSP autocompletion.
- *
- * This implementation is not thread safe.
- */
-class SceneCache {
-	// Always contains the path to the scene which is currently loaded via the `ResourceLoader`.
-	// If this is not empty, `script_path_queue` must have at least one element.
-	String current_loaded_owner;
-	LocalVector<String> script_path_queue;
-
-	HashMap<String, Node *> cache;
-
-	void _get_owner_paths(EditorFileSystemDirectory *p_dir, const String &p_script_path, LocalVector<String> &r_owner_paths);
-	void _finalize_scene_load();
-
-public:
-	void poll();
-
-	void clear();
-	void request_load(const String &p_script_path);
-	void unload(const String &p_script_path);
-
-	Node *get(const String &p_script_path);
-};
diff --git a/engine/modules/gdscript/register_types.cpp b/engine/modules/gdscript/register_types.cpp
index a7b34272..f0f5e46e 100644
--- a/engine/modules/gdscript/register_types.cpp
+++ b/engine/modules/gdscript/register_types.cpp
@@ -33,17 +33,14 @@
 #include "gdscript.h"
 #include "gdscript_cache.h"
 #include "gdscript_parser.h"
-#include "gdscript_resource_format.h"
 #include "gdscript_tokenizer_buffer.h"
 #include "gdscript_utility_functions.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/gdscript_highlighter.h"
 #include "editor/gdscript_translation_parser_plugin.h"
-#include "editor/script/script_editor_plugin.h"
 
 #ifndef GDSCRIPT_NO_LSP
-#include "language_server/gdscript_language_protocol.h"
 #include "language_server/gdscript_language_server.h"
 #endif
 #endif // TOOLS_ENABLED
@@ -54,8 +51,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
@@ -130,6 +125,13 @@ static void _editor_init() {
 	gdscript_syntax_highlighter.instantiate();
 	ScriptEditor::get_singleton()->register_syntax_highlighter(gdscript_syntax_highlighter);
 #endif
+
+#ifndef GDSCRIPT_NO_LSP
+	register_lsp_types();
+	GDScriptLanguageServer *lsp_plugin = memnew(GDScriptLanguageServer);
+	EditorNode::get_singleton()->add_editor_plugin(lsp_plugin);
+	Engine::get_singleton()->add_singleton(Engine::Singleton("GDScriptLanguageProtocol", GDScriptLanguageProtocol::get_singleton()));
+#endif // !GDSCRIPT_NO_LSP
 }
 
 #endif // TOOLS_ENABLED
@@ -160,15 +162,6 @@ void initialize_gdscript_module(ModuleInitializationLevel p_level) {
 		EditorTranslationParser::get_singleton()->add_parser(gdscript_translation_parser_plugin, EditorTranslationParser::STANDARD);
 	} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
 		GDREGISTER_CLASS(GDScriptSyntaxHighlighter);
-#ifndef GDSCRIPT_NO_LSP
-		register_lsp_types();
-		memnew(GDScriptLanguageProtocol);
-		EditorPlugins::add_by_type<GDScriptLanguageServer>();
-
-		Engine::Singleton singleton("GDScriptLanguageProtocol", GDScriptLanguageProtocol::get_singleton());
-		singleton.editor_only = true;
-		Engine::get_singleton()->add_singleton(singleton);
-#endif // !GDSCRIPT_NO_LSP
 	}
 #endif // TOOLS_ENABLED
 }
@@ -199,9 +192,6 @@ void uninitialize_gdscript_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
 		EditorTranslationParser::get_singleton()->remove_parser(gdscript_translation_parser_plugin, EditorTranslationParser::STANDARD);
 		gdscript_translation_parser_plugin.unref();
-#ifndef GDSCRIPT_NO_LSP
-		memdelete(GDScriptLanguageProtocol::get_singleton());
-#endif // GDSCRIPT_NO_LSP
 	}
 #endif // TOOLS_ENABLED
 }
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner.cpp b/engine/modules/gdscript/tests/gdscript_test_runner.cpp
index 4728976b..07861790 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner.cpp
+++ b/engine/modules/gdscript/tests/gdscript_test_runner.cpp
@@ -39,19 +39,17 @@
 #include "core/config/project_settings.h"
 #include "core/core_globals.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_uid.h"
-#include "core/object/class_db.h"
+#include "core/io/file_access_pack.h"
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "scene/resources/packed_scene.h"
+
 #include "tests/test_macros.h"
 
 namespace GDScriptTests {
 
 void init_autoloads() {
-	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
+	HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
 	// First pass, add the constants so they exist before any script is loaded.
 	for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) {
@@ -577,7 +575,7 @@ GDScriptTest::TestResult GDScriptTest::execute_test_code(bool p_is_generating) {
 
 		StringBuilder error_string;
 		for (const GDScriptParser::ParserError &error : parser.get_errors()) {
-			error_string.append(vformat(">> ERROR at line %d: %s\n", error.start_line, error.message));
+			error_string.append(vformat(">> ERROR at line %d: %s\n", error.line, error.message));
 		}
 		result.output += error_string.as_string();
 		if (!p_is_generating) {
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner.h b/engine/modules/gdscript/tests/gdscript_test_runner.h
index 9d8475e7..1e464198 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner.h
+++ b/engine/modules/gdscript/tests/gdscript_test_runner.h
@@ -30,9 +30,10 @@
 
 #pragma once
 
+#include "../gdscript.h"
+
 #include "core/error/error_macros.h"
 #include "core/string/print_string.h"
-#include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner_suite.h b/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
index bc098db5..2eba3d9c 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
+++ b/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
@@ -30,18 +30,12 @@
 
 #pragma once
 
-#include "../gdscript_cache.h"
 #include "gdscript_test_runner.h"
 
-#include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
+#include "modules/gdscript/gdscript_cache.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
-#ifdef TOOLS_ENABLED
-#include "core/os/os.h"
-#endif
-
 namespace GDScriptTests {
 
 class TestGDScriptCacheAccessor {
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.gd b/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.gd
deleted file mode 100644
index a2d0a973..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.gd
+++ /dev/null
@@ -1,18 +0,0 @@
-class A:
-	func return_variant() -> Variant: return null
-	func return_void() -> void: pass
-	func return_int() -> int: return 123
-	func return_int_array(_string_array: Array[String]) -> Array[int]: return []
-	func return_int_dict(_string_dict: Dictionary[String, String]) -> Dictionary[int, int]: return {}
-	func return_node(_resource: Resource) -> Node: return null
-
-class B extends A:
-	func return_variant(): pass
-	func return_void(): return 1
-	func return_int(): return "abc"
-	func return_int_array(string_array: Array[String]): return string_array
-	func return_int_dict(string_dict: Dictionary[String, String]): return string_dict
-	func return_node(resource: Resource): return resource
-
-func test():
-	pass
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.out b/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.out
deleted file mode 100644
index f4c8abde..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/errors/untyped_override_return_incompatible_type.out
+++ /dev/null
@@ -1,8 +0,0 @@
-GDTEST_ANALYZER_ERROR
->> ERROR at line 10: Not all code paths return a value.
->> ERROR at line 11: A void function cannot return a value.
->> ERROR at line 12: Cannot return a value of type "String" as "int".
->> ERROR at line 12: Cannot return value of type "String" because the function return type is "int".
->> ERROR at line 13: Cannot return value of type "Array[String]" because the function return type is "Array[int]".
->> ERROR at line 14: Cannot return value of type "Dictionary[String, String]" because the function return type is "Dictionary[int, int]".
->> ERROR at line 15: Cannot return value of type "Resource" because the function return type is "Node".
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.gd
deleted file mode 100644
index deb9ed2c..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.gd
+++ /dev/null
@@ -1,69 +0,0 @@
-const UNTYPED_ARRAY: Variant = [1000]
-const TYPED_ARRAY: Variant = [2000] as Array[int]
-const UNTYPED_DICT: Variant = {1000: 1000}
-const TYPED_DICT: Variant = {2000: 2000} as Dictionary[int, int]
-
-const TEST_STRING_INDEX = "data"[0]
-const TEST_VECTOR2_ATTR = Vector2(1, 2).x
-const TEST_ARRAY_INDEX = [100, 200][0]
-const TEST_DICT_ATTR = {a = 1, b = 2}.a
-
-const TEST_CALL_ARRAY = Array()
-const TEST_CALL_DICT = Dictionary()
-
-const TEST_BINARY_OP = [1] + [2]
-const TEST_TERNARY_OP = [123] if [true] else [456]
-
-const TEST_CAST_UNTYPED_ARRAY = [11] as Array
-const TEST_CAST_TYPED_ARRAY = [22] as Array[int]
-const TEST_CAST_UNTYPED_DICT = {11: 111} as Dictionary
-const TEST_CAST_TYPED_DICT = {22: 222} as Dictionary[int, int]
-
-const TEST_TYPE_TEST_LITERAL_UNTYPED_ARRAY = [33] is Array
-const TEST_TYPE_TEST_LITERAL_TYPED_ARRAY = [44] is Array[int]
-const TEST_TYPE_TEST_LITERAL_UNTYPED_DICT = {33: 333} is Dictionary
-const TEST_TYPE_TEST_LITERAL_TYPED_DICT = {44: 444} is Dictionary[int, int]
-
-const TEST_TYPE_TEST_UNTYPED_UNTYPED_ARRAY = UNTYPED_ARRAY is Array
-const TEST_TYPE_TEST_UNTYPED_TYPED_ARRAY = UNTYPED_ARRAY is Array[int]
-const TEST_TYPE_TEST_UNTYPED_UNTYPED_DICT = UNTYPED_DICT is Dictionary
-const TEST_TYPE_TEST_UNTYPED_TYPED_DICT = UNTYPED_DICT is Dictionary[int, int]
-
-const TEST_TYPE_TEST_TYPED_UNTYPED_ARRAY = TYPED_ARRAY is Array
-const TEST_TYPE_TEST_TYPED_TYPED_ARRAY = TYPED_ARRAY is Array[int]
-const TEST_TYPE_TEST_TYPED_UNTYPED_DICT = TYPED_DICT is Dictionary
-const TEST_TYPE_TEST_TYPED_TYPED_DICT = TYPED_DICT is Dictionary[int, int]
-
-@export_custom(
-	PROPERTY_HINT_TYPE_STRING,
-	"%d/%d:Zero,One,Two" % [TYPE_INT, PROPERTY_HINT_ENUM],
-)
-var test_export_custom: Array
-
-func test():
-	var script: Script = get_script()
-	var constants: Dictionary = script.get_script_constant_map()
-	for constant: StringName in constants:
-		if constant.begins_with("TEST_"):
-			print("const %s = %s" % [constant, var_to_str(constants[constant]).replace("\n", "")])
-			if constants[constant] is Array:
-				var array: Array = constants[constant]
-				Utils.check(array.is_read_only())
-				array = get(constant)
-				Utils.check(array.is_read_only())
-			elif constants[constant] is Dictionary:
-				var dict: Dictionary = constants[constant]
-				Utils.check(dict.is_read_only())
-				dict = get(constant)
-				Utils.check(dict.is_read_only())
-
-	for property in get_property_list():
-		if str(property.name).begins_with("test_"):
-			Utils.print_property_extended_info(property, self)
-
-	# GH-96152
-	const ARRAY = [42]
-	const CONST_CONCAT = ARRAY + ARRAY
-	var var_concat := ARRAY + ARRAY
-	prints(CONST_CONCAT, CONST_CONCAT.is_read_only())
-	prints(var_concat, var_concat.is_read_only())
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.out b/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.out
deleted file mode 100644
index 8b6c6aaa..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/constant_expressions.out
+++ /dev/null
@@ -1,29 +0,0 @@
-GDTEST_OK
-const TEST_STRING_INDEX = "d"
-const TEST_VECTOR2_ATTR = 1.0
-const TEST_ARRAY_INDEX = 100
-const TEST_DICT_ATTR = 1
-const TEST_CALL_ARRAY = []
-const TEST_CALL_DICT = {}
-const TEST_BINARY_OP = [1, 2]
-const TEST_TERNARY_OP = [123]
-const TEST_CAST_UNTYPED_ARRAY = [11]
-const TEST_CAST_TYPED_ARRAY = Array[int]([22])
-const TEST_CAST_UNTYPED_DICT = {11: 111}
-const TEST_CAST_TYPED_DICT = Dictionary[int, int]({22: 222})
-const TEST_TYPE_TEST_LITERAL_UNTYPED_ARRAY = true
-const TEST_TYPE_TEST_LITERAL_TYPED_ARRAY = false
-const TEST_TYPE_TEST_LITERAL_UNTYPED_DICT = true
-const TEST_TYPE_TEST_LITERAL_TYPED_DICT = false
-const TEST_TYPE_TEST_UNTYPED_UNTYPED_ARRAY = true
-const TEST_TYPE_TEST_UNTYPED_TYPED_ARRAY = false
-const TEST_TYPE_TEST_UNTYPED_UNTYPED_DICT = true
-const TEST_TYPE_TEST_UNTYPED_TYPED_DICT = false
-const TEST_TYPE_TEST_TYPED_UNTYPED_ARRAY = true
-const TEST_TYPE_TEST_TYPED_TYPED_ARRAY = true
-const TEST_TYPE_TEST_TYPED_UNTYPED_DICT = true
-const TEST_TYPE_TEST_TYPED_TYPED_DICT = true
-var test_export_custom: Array = []
-  hint=TYPE_STRING hint_string="<int>/<ENUM>:Zero,One,Two" usage=DEFAULT|SCRIPT_VARIABLE class_name=&""
-[42, 42] true
-[42, 42] false
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/function_return_type_covariance.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/function_return_type_covariance.gd
index 84bcdf2c..4de50b67 100644
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/function_return_type_covariance.gd
+++ b/engine/modules/gdscript/tests/scripts/analyzer/features/function_return_type_covariance.gd
@@ -24,9 +24,9 @@ class B extends A:
 	func untyped_to_node() -> Node: return null
 
 	func void_to_untyped(): pass
-	func variant_to_untyped(): return null
-	func int_to_untyped(): return 0
-	func node_to_untyped(): return null
+	func variant_to_untyped(): pass
+	func int_to_untyped(): pass
+	func node_to_untyped(): pass
 
 func test():
 	pass
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/type_test_usage.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/type_test_usage.gd
index 088006ed..6999a161 100644
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/type_test_usage.gd
+++ b/engine/modules/gdscript/tests/scripts/analyzer/features/type_test_usage.gd
@@ -19,24 +19,6 @@ func test():
 	Utils.check((const_builtin is float) == false)
 	Utils.check(is_instance_of(const_builtin, TYPE_FLOAT) == false)
 
-	var untyped_array: Variant = []
-	Utils.check((untyped_array is Variant) == true)
-	Utils.check((untyped_array is Array) == true)
-	Utils.check(is_instance_of(untyped_array, TYPE_ARRAY) == true)
-	Utils.check((untyped_array is Array[int]) == false)
-	Utils.check((untyped_array is Array[float]) == false)
-	Utils.check((untyped_array is int) == false)
-	Utils.check(is_instance_of(untyped_array, TYPE_INT) == false)
-
-	const const_untyped_array: Variant = []
-	Utils.check((const_untyped_array is Variant) == true)
-	Utils.check((const_untyped_array is Array) == true)
-	Utils.check(is_instance_of(const_untyped_array, TYPE_ARRAY) == true)
-	Utils.check((const_untyped_array is Array[int]) == false)
-	Utils.check((const_untyped_array is Array[float]) == false)
-	Utils.check((const_untyped_array is int) == false)
-	Utils.check(is_instance_of(const_untyped_array, TYPE_INT) == false)
-
 	var int_array: Variant = [] as Array[int]
 	Utils.check((int_array is Variant) == true)
 	Utils.check((int_array is Array) == true)
@@ -46,7 +28,7 @@ func test():
 	Utils.check((int_array is int) == false)
 	Utils.check(is_instance_of(int_array, TYPE_INT) == false)
 
-	const const_int_array: Variant = [] as Array[int]
+	var const_int_array: Variant = [] as Array[int]
 	Utils.check((const_int_array is Variant) == true)
 	Utils.check((const_int_array is Array) == true)
 	Utils.check(is_instance_of(const_int_array, TYPE_ARRAY) == true)
@@ -65,7 +47,7 @@ func test():
 	Utils.check((b_array is int) == false)
 	Utils.check(is_instance_of(b_array, TYPE_INT) == false)
 
-	const const_b_array: Variant = [] as Array[B]
+	var const_b_array: Variant = [] as Array[B]
 	Utils.check((const_b_array is Variant) == true)
 	Utils.check((const_b_array is Array) == true)
 	Utils.check(is_instance_of(const_b_array, TYPE_ARRAY) == true)
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.gd
deleted file mode 100644
index ca10a5cb..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.gd
+++ /dev/null
@@ -1,43 +0,0 @@
-class A:
-	func return_float() -> float: return 1.0
-	func return_int_as_float(_x: int) -> float: return 1.0
-	func return_variant_as_float(_x: Variant) -> float: return 1.0
-	func return_float_array() -> Array[float]: return [1.0]
-	func return_untyped_array_as_float_array(_array: Array) -> Array[float]: return [1.0]
-	func return_float_dict() -> Dictionary[float, float]: return {1.0: 1.0}
-	func return_untyped_dict_as_float_dict(_dict: Dictionary) -> Dictionary[float, float]: return {1.0: 1.0}
-	func return_object_as_node(_object: Object) -> Node: return null
-
-class B extends A:
-	func return_float(): return 2
-	func return_int_as_float(x: int): return x
-	func return_variant_as_float(x: Variant): return x
-	func return_float_array(): return [2]
-	func return_untyped_array_as_float_array(array: Array): return array
-	func return_float_dict(): return {2: 2}
-	func return_untyped_dict_as_float_dict(dict: Dictionary): return dict
-	func return_object_as_node(object: Object): return object
-
-func output(value: Variant) -> void:
-	if value is Object:
-		var object: Object = value
-		print("<%s>" % object.get_class())
-	else:
-		print(var_to_str(value).replace("\n", ""))
-
-func test():
-	var b := B.new()
-	var float_array: Array[float] = [2]
-	var float_dict: Dictionary[float, float] = {2: 2}
-	var node := Node.new()
-
-	output(b.return_float())
-	output(b.return_int_as_float(2))
-	output(b.return_variant_as_float(2))
-	output(b.return_float_array())
-	output(b.return_untyped_array_as_float_array(float_array))
-	output(b.return_float_dict())
-	output(b.return_untyped_dict_as_float_dict(float_dict))
-	output(b.return_object_as_node(node))
-
-	node.free()
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.out b/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.out
deleted file mode 100644
index d9f5f2ef..00000000
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/untyped_override_return_compatible_type.out
+++ /dev/null
@@ -1,9 +0,0 @@
-GDTEST_OK
-2.0
-2.0
-2.0
-Array[float]([2.0])
-Array[float]([2.0])
-Dictionary[float, float]({2.0: 2.0})
-Dictionary[float, float]({2.0: 2.0})
-<Node>
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.gd
index aac33440..a8641e4f 100644
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.gd
+++ b/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.gd
@@ -1,6 +1,6 @@
 class BaseClass:
 	func _get_property_list():
-		return [{"property" : "definition"}]
+		return {"property" : "definition"}
 
 class SuperClassMethodsRecognized extends BaseClass:
 	func _init():
@@ -11,7 +11,7 @@ class SuperMethodsRecognized extends BaseClass:
 	func _get_property_list():
 		# Recognizes super method.
 		var result = super()
-		result[0]["new"] = "new"
+		result["new"] = "new"
 		return result
 
 func test():
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.out b/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.out
index 1b4da2cd..ccff6601 100644
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.out
+++ b/engine/modules/gdscript/tests/scripts/analyzer/features/virtual_method_implemented.out
@@ -1,3 +1,3 @@
 GDTEST_OK
-[{ "property": "definition" }]
-[{ "property": "definition", "new": "new" }]
+{ "property": "definition" }
+{ "property": "definition", "new": "new" }
diff --git a/engine/modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.gd b/engine/modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.gd
index eb751c4d..333950d6 100644
--- a/engine/modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.gd
+++ b/engine/modules/gdscript/tests/scripts/analyzer/features/warning_ignore_warnings.gd
@@ -149,7 +149,7 @@ func test_unsafe_void_return() -> void:
 
 @warning_ignore("native_method_override")
 func get_class():
-	return ""
+	pass
 
 # We don't want to execute it because of errors, just analyze.
 func test():
diff --git a/engine/modules/gdscript/tests/scripts/parser/features/export_variable.gd b/engine/modules/gdscript/tests/scripts/parser/features/export_variable.gd
index 0d3cfc55..8aa449f6 100644
--- a/engine/modules/gdscript/tests/scripts/parser/features/export_variable.gd
+++ b/engine/modules/gdscript/tests/scripts/parser/features/export_variable.gd
@@ -5,8 +5,6 @@ extends Node
 const PreloadedGlobalClass = preload("./export_variable_global.notest.gd")
 const PreloadedUnnamedClass = preload("./export_variable_unnamed.notest.gd")
 
-enum CustomEnum {A, B, C}
-
 # Built-in types.
 @export var test_weak_int = 1
 @export var test_hard_int: int = 2
@@ -18,21 +16,8 @@ enum CustomEnum {A, B, C}
 @export_node_path("Sprite2D", "Sprite3D", "Control", "Node") var test_node_path := ^"hello"
 
 # Enums.
-@export var test_side_weak = SIDE_LEFT
-@export var test_atm_weak = AUTO_TRANSLATE_MODE_INHERIT
-@export var test_custom_enum_weak = CustomEnum.A
-
-@export var test_side_hard: Side
-@export var test_atm_hard: AutoTranslateMode
-@export var test_custom_enum_hard: CustomEnum
-
-var test_side_weak_no_export = SIDE_LEFT
-var test_atm_weak_no_export = AUTO_TRANSLATE_MODE_INHERIT
-var test_custom_enum_weak_no_export = CustomEnum.A
-
-var test_side_hard_no_export: Side
-var test_atm_hard_no_export: AutoTranslateMode
-var test_custom_enum_hard_no_export: CustomEnum
+@export var test_side: Side
+@export var test_atm: AutoTranslateMode
 
 # Resources and nodes.
 @export var test_image: Image
diff --git a/engine/modules/gdscript/tests/scripts/parser/features/export_variable.out b/engine/modules/gdscript/tests/scripts/parser/features/export_variable.out
index 00dbe74f..c0bf4d6e 100644
--- a/engine/modules/gdscript/tests/scripts/parser/features/export_variable.out
+++ b/engine/modules/gdscript/tests/scripts/parser/features/export_variable.out
@@ -15,30 +15,10 @@ var test_color_no_alpha: Color = Color(0, 0, 0, 1)
   hint=COLOR_NO_ALPHA hint_string="" usage=DEFAULT|SCRIPT_VARIABLE class_name=&""
 var test_node_path: NodePath = NodePath("hello")
   hint=NODE_PATH_VALID_TYPES hint_string="Sprite2D,Sprite3D,Control,Node" usage=DEFAULT|SCRIPT_VARIABLE class_name=&""
-var test_side_weak: Side = 0
+var test_side: Side = 0
   hint=ENUM hint_string="Side Left:0,Side Top:1,Side Right:2,Side Bottom:3" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Side"
-var test_atm_weak: Node.AutoTranslateMode = 0
+var test_atm: Node.AutoTranslateMode = 0
   hint=ENUM hint_string="Auto Translate Mode Inherit:0,Auto Translate Mode Always:1,Auto Translate Mode Disabled:2" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Node.AutoTranslateMode"
-var test_custom_enum_weak: ExportVariableTest.CustomEnum = 0
-  hint=ENUM hint_string="A:0,B:1,C:2" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"ExportVariableTest.CustomEnum"
-var test_side_hard: Side = 0
-  hint=ENUM hint_string="Side Left:0,Side Top:1,Side Right:2,Side Bottom:3" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Side"
-var test_atm_hard: Node.AutoTranslateMode = 0
-  hint=ENUM hint_string="Auto Translate Mode Inherit:0,Auto Translate Mode Always:1,Auto Translate Mode Disabled:2" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Node.AutoTranslateMode"
-var test_custom_enum_hard: ExportVariableTest.CustomEnum = 0
-  hint=ENUM hint_string="A:0,B:1,C:2" usage=DEFAULT|SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"ExportVariableTest.CustomEnum"
-var test_side_weak_no_export: Variant = 0
-  hint=ENUM hint_string="Side Left:0,Side Top:1,Side Right:2,Side Bottom:3" usage=SCRIPT_VARIABLE|NIL_IS_VARIANT class_name=&""
-var test_atm_weak_no_export: Variant = 0
-  hint=ENUM hint_string="Auto Translate Mode Inherit:0,Auto Translate Mode Always:1,Auto Translate Mode Disabled:2" usage=SCRIPT_VARIABLE|NIL_IS_VARIANT class_name=&""
-var test_custom_enum_weak_no_export: Variant = 0
-  hint=ENUM hint_string="A:0,B:1,C:2" usage=SCRIPT_VARIABLE|NIL_IS_VARIANT class_name=&""
-var test_side_hard_no_export: Side = 0
-  hint=ENUM hint_string="Side Left:0,Side Top:1,Side Right:2,Side Bottom:3" usage=SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Side"
-var test_atm_hard_no_export: Node.AutoTranslateMode = 0
-  hint=ENUM hint_string="Auto Translate Mode Inherit:0,Auto Translate Mode Always:1,Auto Translate Mode Disabled:2" usage=SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"Node.AutoTranslateMode"
-var test_custom_enum_hard_no_export: ExportVariableTest.CustomEnum = 0
-  hint=ENUM hint_string="A:0,B:1,C:2" usage=SCRIPT_VARIABLE|CLASS_IS_ENUM class_name=&"ExportVariableTest.CustomEnum"
 var test_image: Image = null
   hint=RESOURCE_TYPE hint_string="Image" usage=DEFAULT|SCRIPT_VARIABLE class_name=&"Image"
 var test_timer: Timer = null
diff --git a/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.gd b/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.gd
deleted file mode 100644
index 1cf2f34b..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.gd
+++ /dev/null
@@ -1,43 +0,0 @@
-class A:
-	func return_int(_variant: Variant) -> int: return 123
-	func return_int_array(_variant: Variant) -> Array[int]: return [1]
-	func return_int_dict(_variant: Variant) -> Dictionary[int, int]: return {1: 1}
-	func return_node(_variant: Variant) -> Node: return null
-
-class B extends A:
-	func return_int(variant: Variant): return variant
-	func return_int_array(variant: Variant): return variant
-	func return_int_dict(variant: Variant): return variant
-	func return_node(variant: Variant): return variant
-
-func output(value: Variant) -> void:
-	if value is Object:
-		var object: Object = value
-		print("<%s>" % object.get_class())
-	else:
-		print(var_to_str(value).replace("\n", ""))
-
-func test():
-	var b := B.new()
-
-	output(b.return_int("abc"))
-	output(b.return_int_array("abc"))
-	output(b.return_int_dict("abc"))
-	output(b.return_node("abc"))
-
-	var resource := Resource.new()
-
-	output(b.return_int(resource))
-	output(b.return_int_array(resource))
-	output(b.return_int_dict(resource))
-	output(b.return_node(resource))
-
-	var untyped_array: Array
-	var string_array: Array[String]
-	var untyped_dict: Dictionary
-	var string_dict: Dictionary[String, String]
-
-	output(b.return_int_array(untyped_array))
-	output(b.return_int_array(string_array))
-	output(b.return_int_dict(untyped_dict))
-	output(b.return_int_dict(string_dict))
diff --git a/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.out b/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.out
deleted file mode 100644
index d0277d62..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/errors/untyped_override_return_incompatible_value.out
+++ /dev/null
@@ -1,25 +0,0 @@
-GDTEST_RUNTIME_ERROR
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:8 on B.return_int(): Trying to return a value of type "String" from a function whose return type is "int".
-0
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:9 on B.return_int_array(): Trying to return a value of type "String" from a function whose return type is "Array[int]".
-Array[int]([])
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:10 on B.return_int_dict(): Trying to return a value of type "String" from a function whose return type is "Dictionary[int, int]".
-Dictionary[int, int]({})
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:11 on B.return_node(): Trying to return a value of type "String" from a function whose return type is "Node".
-null
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:8 on B.return_int(): Trying to return a value of type "Resource" from a function whose return type is "int".
-0
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:9 on B.return_int_array(): Trying to return a value of type "Resource" from a function whose return type is "Array[int]".
-Array[int]([])
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:10 on B.return_int_dict(): Trying to return a value of type "Resource" from a function whose return type is "Dictionary[int, int]".
-Dictionary[int, int]({})
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:11 on B.return_node(): Trying to return a value of type "Resource" from a function whose return type is "Node".
-null
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:9 on B.return_int_array(): Trying to return a value of type "Array" from a function whose return type is "Array[int]".
-Array[int]([])
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:9 on B.return_int_array(): Trying to return a value of type "Array[String]" from a function whose return type is "Array[int]".
-Array[int]([])
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:10 on B.return_int_dict(): Trying to return a value of type "Dictionary" from a function whose return type is "Dictionary[int, int]".
-Dictionary[int, int]({})
->> SCRIPT ERROR at runtime/errors/untyped_override_return_incompatible_value.gd:10 on B.return_int_dict(): Trying to return a value of type "Dictionary[String, String]" from a function whose return type is "Dictionary[int, int]".
-Dictionary[int, int]({})
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.gd b/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.gd
deleted file mode 100644
index d0823074..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.gd
+++ /dev/null
@@ -1,9 +0,0 @@
-class_name TestCallNativeStatic
-extends JSON
-
-func test():
-	var s: GDScript = get_script()
-	@warning_ignore("unsafe_method_access")
-	print(s.stringify("test"))
-	print(s.call(&"stringify", "test"))
-	print(TestCallNativeStatic.stringify("test"))
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.out b/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.out
deleted file mode 100644
index 453e12ab..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/call_native_static_base_method_runtime.out
+++ /dev/null
@@ -1,4 +0,0 @@
-GDTEST_OK
-"test"
-"test"
-"test"
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.gd b/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.gd
deleted file mode 100644
index e6bdd2dc..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.gd
+++ /dev/null
@@ -1,78 +0,0 @@
-class Instance:
-	func _init() -> void:
-		print("Instance _init")
-
-	func _to_string() -> String:
-		return "<Instance>"
-
-	func _notification(what: int) -> void:
-		if what == NOTIFICATION_PREDELETE:
-			print("Instance predelete")
-
-# GH-116706
-
-class LocalOwner:
-	signal never_emitted()
-
-	func _init() -> void:
-		print("LocalOwner _init")
-
-	func _notification(what: int) -> void:
-		if what == NOTIFICATION_PREDELETE:
-			print("LocalOwner predelete")
-
-	func interrupted_coroutine() -> void:
-		print("interrupted_coroutine begin")
-		var _instance := Instance.new()
-		await never_emitted
-		print("interrupted_coroutine end")
-
-func subtest_order():
-	print("subtest_order begin")
-	var local_owner := LocalOwner.new()
-	@warning_ignore("missing_await")
-	local_owner.interrupted_coroutine()
-	local_owner = null
-	print("subtest_order end")
-
-# GH-117049
-
-signal tick()
-
-func await_before_and_after() -> void:
-	await tick
-	var packed_array: PackedStringArray = ["abc"]
-	var instance := Instance.new()
-	await tick
-	prints(packed_array, instance)
-
-func await_two_after() -> void:
-	var packed_array: PackedStringArray = ["abc"]
-	var instance := Instance.new()
-	await tick
-	await tick
-	prints(packed_array, instance)
-
-func subtest_resume():
-	print("subtest_resume begin")
-
-	@warning_ignore("missing_await")
-	await_before_and_after()
-	tick.emit()
-	tick.emit()
-
-	print("---")
-
-	@warning_ignore("missing_await")
-	await_two_after()
-	tick.emit()
-	tick.emit()
-
-	print("subtest_resume end")
-
-# ===
-
-func test():
-	subtest_order()
-	print("===")
-	subtest_resume()
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.out b/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.out
deleted file mode 100644
index abd9a969..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/coroutine_clearing.out
+++ /dev/null
@@ -1,18 +0,0 @@
-GDTEST_OK
-subtest_order begin
-LocalOwner _init
-interrupted_coroutine begin
-Instance _init
-LocalOwner predelete
-Instance predelete
-subtest_order end
-===
-subtest_resume begin
-Instance _init
-["abc"] <Instance>
-Instance predelete
----
-Instance _init
-["abc"] <Instance>
-Instance predelete
-subtest_resume end
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.gd b/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.gd
index b4508eda..59bdb6ec 100644
--- a/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.gd
+++ b/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.gd
@@ -6,7 +6,7 @@ func test():
 	print(var_to_str(COLOR))
 	print(var_to_str(color))
 
-	var string := "A"
-	var string_name := &"A"
-	print(ord(string))
-	print(ord(string_name))
+	var string := "Node"
+	var string_name := &"Node"
+	print(type_exists(string))
+	print(type_exists(string_name))
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.out b/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.out
index 7c66e2fc..00913faa 100644
--- a/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.out
+++ b/engine/modules/gdscript/tests/scripts/runtime/features/gdscript_utility_implicit_conversion.out
@@ -1,5 +1,5 @@
 GDTEST_OK
 Color(1, 0, 0, 1)
 Color(1, 0, 0, 1)
-65
-65
+true
+true
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.gd b/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.gd
deleted file mode 100644
index 3594463e..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.gd
+++ /dev/null
@@ -1,31 +0,0 @@
-var a: Array = [1]:
-	set(v):
-		prints("set a", v)
-		a = v
-	get:
-		prints("get a")
-		return a
-
-var b: PackedByteArray = [1]:
-	set(v):
-		prints("set b", v)
-		b = v
-	get:
-		prints("get b")
-		return b
-
-var c: PackedVector2Array = [Vector2.ONE]:
-	set(v):
-		prints("set c", v)
-		c = v
-	get:
-		prints("get c")
-		return c
-
-func test():
-	a[0] = 2
-	print(a)
-	b[0] = 2
-	print(b)
-	c[0].x = 2
-	print(c)
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.out b/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.out
deleted file mode 100644
index e35147eb..00000000
--- a/engine/modules/gdscript/tests/scripts/runtime/features/setter_chain_shared_types_2.out
+++ /dev/null
@@ -1,10 +0,0 @@
-GDTEST_OK
-get a
-get a
-[2]
-get b
-get b
-[2]
-get c
-get c
-[(2.0, 1.0)]
diff --git a/engine/modules/gdscript/tests/scripts/utils.notest.gd b/engine/modules/gdscript/tests/scripts/utils.notest.gd
index 1ae18631..7567a2ac 100644
--- a/engine/modules/gdscript/tests/scripts/utils.notest.gd
+++ b/engine/modules/gdscript/tests/scripts/utils.notest.gd
@@ -10,18 +10,19 @@ static func check(condition: Variant) -> void:
 		return
 
 	printerr("Check failed. Backtrace (most recent call first):")
-	var stack: Array = get_stack()
-	var dir: String
-	for i: int in stack.size():
-		var frame: Dictionary = stack[i]
-		if i == 0:
-			dir = str(frame.source).trim_suffix("utils.notest.gd")
-		else:
-			printerr("  %s:%d @ %s()" % [
-				str(frame.source).trim_prefix(dir),
-				frame.line,
-				frame.function,
-			])
+	for stack: ScriptBacktrace in Engine.capture_script_backtraces():
+		if stack.get_language_name() == "GDScript":
+			var dir: String
+			for i: int in stack.get_frame_count():
+				if i == 0:
+					dir = stack.get_frame_file(i).trim_suffix("utils.notest.gd")
+				else:
+					printerr("  %s:%d @ %s()" % [
+						stack.get_frame_file(i).trim_prefix(dir),
+						stack.get_frame_line(i),
+						stack.get_frame_function(i),
+					])
+			break
 
 
 static func get_type(property: Dictionary, is_return: bool = false) -> String:
diff --git a/engine/modules/gdscript/tests/test_completion.h b/engine/modules/gdscript/tests/test_completion.h
index bfa27e0e..3d022789 100644
--- a/engine/modules/gdscript/tests/test_completion.h
+++ b/engine/modules/gdscript/tests/test_completion.h
@@ -32,6 +32,8 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "tests/test_macros.h"
+
 #include "../gdscript.h"
 #include "gdscript_test_runner.h"
 
@@ -39,16 +41,14 @@
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
 #include "core/variant/dictionary.h"
 #include "core/variant/variant.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
-#include "tests/test_macros.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 
 namespace GDScriptTests {
 
diff --git a/engine/modules/gdscript/tests/test_gdscript.cpp b/engine/modules/gdscript/tests/test_gdscript.cpp
index ea2c6658..bde44d7d 100644
--- a/engine/modules/gdscript/tests/test_gdscript.cpp
+++ b/engine/modules/gdscript/tests/test_gdscript.cpp
@@ -35,7 +35,6 @@
 #include "../gdscript_parser.h"
 #include "../gdscript_tokenizer.h"
 #include "../gdscript_tokenizer_buffer.h"
-#include "gdscript_test_runner.h"
 
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
@@ -176,7 +175,7 @@ static void test_parser(const String &p_code, const String &p_script_path, const
 	if (err != OK) {
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		for (const GDScriptParser::ParserError &error : errors) {
-			print_line(vformat("%02d:%02d: %s", error.start_line, error.start_column, error.message));
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
 		}
 	}
 
@@ -186,7 +185,7 @@ static void test_parser(const String &p_code, const String &p_script_path, const
 	if (err != OK) {
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		for (const GDScriptParser::ParserError &error : errors) {
-			print_line(vformat("%02d:%02d: %s", error.start_line, error.start_column, error.message));
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
 		}
 	}
 
@@ -262,7 +261,7 @@ static void test_compiler(const String &p_code, const String &p_script_path, con
 		print_line("Error in parser:");
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		for (const GDScriptParser::ParserError &error : errors) {
-			print_line(vformat("%02d:%02d: %s", error.start_line, error.start_column, error.message));
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
 		}
 		return;
 	}
@@ -274,7 +273,7 @@ static void test_compiler(const String &p_code, const String &p_script_path, con
 		print_line("Error in analyzer:");
 		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
 		for (const GDScriptParser::ParserError &error : errors) {
-			print_line(vformat("%02d:%02d: %s", error.start_line, error.start_column, error.message));
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
 		}
 		return;
 	}
diff --git a/engine/modules/gdscript/tests/test_gdscript.h b/engine/modules/gdscript/tests/test_gdscript.h
index 7d26abee..4330b05b 100644
--- a/engine/modules/gdscript/tests/test_gdscript.h
+++ b/engine/modules/gdscript/tests/test_gdscript.h
@@ -30,6 +30,10 @@
 
 #pragma once
 
+#include "gdscript_test_runner.h"
+
+#include "tests/test_macros.h"
+
 namespace GDScriptTests {
 
 enum TestType {
diff --git a/engine/modules/gdscript/tests/test_lsp.h b/engine/modules/gdscript/tests/test_lsp.h
index 33de0fac..0c727afe 100644
--- a/engine/modules/gdscript/tests/test_lsp.h
+++ b/engine/modules/gdscript/tests/test_lsp.h
@@ -32,22 +32,27 @@
 
 #ifdef TOOLS_ENABLED
 
-#ifndef GDSCRIPT_NO_LSP
+#include "modules/modules_enabled.gen.h" // For jsonrpc.
+
+#ifdef MODULE_JSONRPC_ENABLED
+
+#include "tests/test_macros.h"
 
-#include "../gdscript_analyzer.h"
 #include "../language_server/gdscript_extend_parser.h"
 #include "../language_server/gdscript_language_protocol.h"
 #include "../language_server/gdscript_workspace.h"
 #include "../language_server/godot_lsp.h"
-#include "gdscript_test_runner.h"
 
 #include "core/io/dir_access.h"
-#include "editor/file_system/editor_file_system.h"
-#include "tests/test_macros.h"
+#include "core/io/file_access_pack.h"
+#include "core/os/os.h"
+#include "editor/doc/editor_help.h"
+#include "editor/editor_node.h"
 
+#include "modules/gdscript/gdscript_analyzer.h"
 #include "modules/regex/regex.h"
 
-#include <thirdparty/doctest/doctest.h>
+#include "thirdparty/doctest/doctest.h"
 
 class TestGDScriptLanguageProtocolInitializer {
 public:
@@ -101,8 +106,6 @@ GDScriptLanguageProtocol *initialize(const String &p_root) {
 	String absolute_root = dir->get_current_dir();
 	init_language(absolute_root);
 
-	// Recreate the singleton for each test, to ensure a clean state.
-	memdelete_notnull(GDScriptLanguageProtocol::get_singleton());
 	GDScriptLanguageProtocol *proto = memnew(GDScriptLanguageProtocol);
 	TestGDScriptLanguageProtocolInitializer::setup_client();
 
@@ -494,6 +497,7 @@ func f():
 			test_resolve_symbols(uri, all_test_data, all_test_data);
 		}
 
+		memdelete(proto);
 		memdelete(efs);
 		finish_language();
 	}
@@ -532,6 +536,7 @@ func f():
 			REQUIRE(cls.documentation.contains("t3"));
 		}
 
+		memdelete(proto);
 		memdelete(efs);
 		finish_language();
 	}
@@ -602,6 +607,6 @@ func f():
 
 } // namespace GDScriptTests
 
-#endif // GDSCRIPT_NO_LSP
+#endif // MODULE_JSONRPC_ENABLED
 
 #endif // TOOLS_ENABLED
diff --git a/engine/modules/glslang/SCsub b/engine/modules/glslang/SCsub
index 38c60e94..19e054ff 100644
--- a/engine/modules/glslang/SCsub
+++ b/engine/modules/glslang/SCsub
@@ -52,6 +52,7 @@ if env["builtin_glslang"]:
         "SPIRV/Logger.cpp",
         "SPIRV/SpvBuilder.cpp",
         "SPIRV/SpvPostProcess.cpp",
+        "SPIRV/SPVRemapper.cpp",
         "SPIRV/SpvTools.cpp",
     ]
 
diff --git a/engine/modules/glslang/register_types.cpp b/engine/modules/glslang/register_types.cpp
index 96a7b035..2fd5b7cc 100644
--- a/engine/modules/glslang/register_types.cpp
+++ b/engine/modules/glslang/register_types.cpp
@@ -30,13 +30,9 @@
 
 #include "register_types.h"
 
-#include "shader_compile.h"
-
 #include "core/config/engine.h"
-
-#ifdef D3D12_ENABLED
 #include "core/os/os.h"
-#endif
+#include "shader_compile.h"
 
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
 
@@ -53,12 +49,7 @@ Vector<uint8_t> compile_glslang_shader(RenderingDeviceCommons::ShaderStage p_sta
 		EShLangFragment,
 		EShLangTessControl,
 		EShLangTessEvaluation,
-		EShLangCompute,
-		EShLangRayGen,
-		EShLangAnyHit,
-		EShLangClosestHit,
-		EShLangMiss,
-		EShLangIntersect,
+		EShLangCompute
 	};
 
 	int ClientInputSemanticsVersion = 100; // maps to, say, #define VULKAN 100
diff --git a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
index 1e0f9215..5d78aa44 100644
--- a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
+++ b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneFormatImporterBlend" inherits="EditorSceneFormatImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="EditorSceneFormatImporterBlend" inherits="EditorSceneFormatImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Importer for Blender's [code].blend[/code] scene file format.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterGLTF.xml b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterGLTF.xml
index b25f326c..2293e75a 100644
--- a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterGLTF.xml
+++ b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterGLTF.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneFormatImporterGLTF" inherits="EditorSceneFormatImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="EditorSceneFormatImporterGLTF" inherits="EditorSceneFormatImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/gltf/doc_classes/GLTFAccessor.xml b/engine/modules/gltf/doc_classes/GLTFAccessor.xml
index 279a0137..3e869e65 100644
--- a/engine/modules/gltf/doc_classes/GLTFAccessor.xml
+++ b/engine/modules/gltf/doc_classes/GLTFAccessor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFAccessor" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFAccessor" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF accessor.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFAnimation.xml b/engine/modules/gltf/doc_classes/GLTFAnimation.xml
index b5e4e692..f11dea8e 100644
--- a/engine/modules/gltf/doc_classes/GLTFAnimation.xml
+++ b/engine/modules/gltf/doc_classes/GLTFAnimation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFAnimation" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFAnimation" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/gltf/doc_classes/GLTFBufferView.xml b/engine/modules/gltf/doc_classes/GLTFBufferView.xml
index a2ae9883..d488b5bc 100644
--- a/engine/modules/gltf/doc_classes/GLTFBufferView.xml
+++ b/engine/modules/gltf/doc_classes/GLTFBufferView.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFBufferView" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFBufferView" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF buffer view.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFCamera.xml b/engine/modules/gltf/doc_classes/GLTFCamera.xml
index 0b446726..57ddd0bd 100644
--- a/engine/modules/gltf/doc_classes/GLTFCamera.xml
+++ b/engine/modules/gltf/doc_classes/GLTFCamera.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFCamera" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFCamera" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF camera.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFDocument.xml b/engine/modules/gltf/doc_classes/GLTFDocument.xml
index 409347da..ee7d91c2 100644
--- a/engine/modules/gltf/doc_classes/GLTFDocument.xml
+++ b/engine/modules/gltf/doc_classes/GLTFDocument.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFDocument" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFDocument" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Class for importing and exporting glTF files in and out of Godot.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFDocumentExtension.xml b/engine/modules/gltf/doc_classes/GLTFDocumentExtension.xml
index ec59eca1..abdbce7e 100644
--- a/engine/modules/gltf/doc_classes/GLTFDocumentExtension.xml
+++ b/engine/modules/gltf/doc_classes/GLTFDocumentExtension.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFDocumentExtension" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFDocumentExtension" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		[GLTFDocument] extension class.
 	</brief_description>
 	<description>
 		Extends the functionality of the [GLTFDocument] class by allowing you to run arbitrary code at various stages of glTF import or export.
 		To use, make a new class extending GLTFDocumentExtension, override any methods you need, make an instance of your class, and register it using [method GLTFDocument.register_gltf_document_extension].
-		[b]Note:[/b] All GLTFDocumentExtension classes are duplicated when beginning the import or export process. Except for configuration values, these classes must be stateless in order to function properly. If you need to store data, use the [code]set_additional_data[/code] and [code]get_additional_data[/code] methods in [GLTFState] or [GLTFNode].
+		[b]Note:[/b] Like GLTFDocument itself, all GLTFDocumentExtension classes must be stateless in order to function properly. If you need to store data, use the [code]set_additional_data[/code] and [code]get_additional_data[/code] methods in [GLTFState] or [GLTFNode].
 	</description>
 	<tutorials>
 		<link title="Runtime file loading and saving">$DOCS_URL/tutorials/io/runtime_file_loading_and_saving.html</link>
diff --git a/engine/modules/gltf/doc_classes/GLTFDocumentExtensionConvertImporterMesh.xml b/engine/modules/gltf/doc_classes/GLTFDocumentExtensionConvertImporterMesh.xml
index b736fda8..04075cab 100644
--- a/engine/modules/gltf/doc_classes/GLTFDocumentExtensionConvertImporterMesh.xml
+++ b/engine/modules/gltf/doc_classes/GLTFDocumentExtensionConvertImporterMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFDocumentExtensionConvertImporterMesh" inherits="GLTFDocumentExtension" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFDocumentExtensionConvertImporterMesh" inherits="GLTFDocumentExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/gltf/doc_classes/GLTFLight.xml b/engine/modules/gltf/doc_classes/GLTFLight.xml
index b8212fcf..062125e2 100644
--- a/engine/modules/gltf/doc_classes/GLTFLight.xml
+++ b/engine/modules/gltf/doc_classes/GLTFLight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFLight" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFLight" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF light.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFMesh.xml b/engine/modules/gltf/doc_classes/GLTFMesh.xml
index 0f0f97f1..439078ff 100644
--- a/engine/modules/gltf/doc_classes/GLTFMesh.xml
+++ b/engine/modules/gltf/doc_classes/GLTFMesh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFMesh" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFMesh" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		GLTFMesh represents a glTF mesh.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFNode.xml b/engine/modules/gltf/doc_classes/GLTFNode.xml
index 5475402f..b5f004cf 100644
--- a/engine/modules/gltf/doc_classes/GLTFNode.xml
+++ b/engine/modules/gltf/doc_classes/GLTFNode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFNode" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFNode" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		glTF node class.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml b/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
index 10f97aad..434ca0db 100644
--- a/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
+++ b/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFObjectModelProperty" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFObjectModelProperty" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Describes how to access a property as defined in the glTF object model.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml b/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
index ca69846f..fdee3a98 100644
--- a/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
+++ b/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFPhysicsBody" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFPhysicsBody" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF physics body.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml b/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
index 14c90c3c..588e4dd0 100644
--- a/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
+++ b/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFPhysicsShape" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFPhysicsShape" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF physics shape.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFSkeleton.xml b/engine/modules/gltf/doc_classes/GLTFSkeleton.xml
index 4b7995c5..2dd3a374 100644
--- a/engine/modules/gltf/doc_classes/GLTFSkeleton.xml
+++ b/engine/modules/gltf/doc_classes/GLTFSkeleton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFSkeleton" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFSkeleton" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/gltf/doc_classes/GLTFSkin.xml b/engine/modules/gltf/doc_classes/GLTFSkin.xml
index d62c2f6c..0835a2d5 100644
--- a/engine/modules/gltf/doc_classes/GLTFSkin.xml
+++ b/engine/modules/gltf/doc_classes/GLTFSkin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFSkin" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFSkin" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/gltf/doc_classes/GLTFSpecGloss.xml b/engine/modules/gltf/doc_classes/GLTFSpecGloss.xml
index 2ae81223..11151f53 100644
--- a/engine/modules/gltf/doc_classes/GLTFSpecGloss.xml
+++ b/engine/modules/gltf/doc_classes/GLTFSpecGloss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFSpecGloss" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFSpecGloss" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Archived glTF extension for specular/glossy materials.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFState.xml b/engine/modules/gltf/doc_classes/GLTFState.xml
index f60fb330..628cfbde 100644
--- a/engine/modules/gltf/doc_classes/GLTFState.xml
+++ b/engine/modules/gltf/doc_classes/GLTFState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFState" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFState" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents all data of a glTF file.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFTexture.xml b/engine/modules/gltf/doc_classes/GLTFTexture.xml
index bae1251b..2a868a8b 100644
--- a/engine/modules/gltf/doc_classes/GLTFTexture.xml
+++ b/engine/modules/gltf/doc_classes/GLTFTexture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFTexture" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFTexture" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		GLTFTexture represents a texture in a glTF file.
 	</brief_description>
diff --git a/engine/modules/gltf/doc_classes/GLTFTextureSampler.xml b/engine/modules/gltf/doc_classes/GLTFTextureSampler.xml
index b030d8b1..d00ab463 100644
--- a/engine/modules/gltf/doc_classes/GLTFTextureSampler.xml
+++ b/engine/modules/gltf/doc_classes/GLTFTextureSampler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GLTFTextureSampler" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GLTFTextureSampler" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Represents a glTF texture sampler
 	</brief_description>
diff --git a/engine/modules/gltf/editor/editor_import_blend_runner.cpp b/engine/modules/gltf/editor/editor_import_blend_runner.cpp
index 250a4358..d8213660 100644
--- a/engine/modules/gltf/editor/editor_import_blend_runner.cpp
+++ b/engine/modules/gltf/editor/editor_import_blend_runner.cpp
@@ -31,9 +31,6 @@
 #include "editor_import_blend_runner.h"
 
 #include "core/io/http_client.h"
-#include "core/io/xml_parser.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
@@ -182,10 +179,6 @@ Error EditorImportBlendRunner::start_blender(const String &p_python_script, bool
 	return err;
 }
 
-bool EditorImportBlendRunner::is_running() {
-	return blender_pid != 0 && OS::get_singleton()->is_process_running(blender_pid);
-}
-
 Error EditorImportBlendRunner::do_import(const Dictionary &p_options) {
 	if (is_using_rpc()) {
 		Error err = do_import_rpc(p_options);
diff --git a/engine/modules/gltf/editor/editor_import_blend_runner.h b/engine/modules/gltf/editor/editor_import_blend_runner.h
index afc2e686..c2a087b7 100644
--- a/engine/modules/gltf/editor/editor_import_blend_runner.h
+++ b/engine/modules/gltf/editor/editor_import_blend_runner.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/http_client.h"
-#include "core/os/process_id.h"
+#include "core/os/os.h"
 #include "scene/main/node.h"
 #include "scene/main/timer.h"
 
@@ -48,7 +48,7 @@ class EditorImportBlendRunner : public Node {
 
 protected:
 	int rpc_port = 0;
-	ProcessID blender_pid = 0;
+	OS::ProcessID blender_pid = 0;
 	Error start_blender(const String &p_python_script, bool p_blocking);
 	Error do_import_direct(const Dictionary &p_options);
 	Error do_import_rpc(const Dictionary &p_options);
@@ -56,7 +56,7 @@ protected:
 public:
 	static EditorImportBlendRunner *get_singleton() { return singleton; }
 
-	bool is_running();
+	bool is_running() { return blender_pid != 0 && OS::get_singleton()->is_process_running(blender_pid); }
 	bool is_using_rpc() { return rpc_port != 0; }
 	Error do_import(const Dictionary &p_options);
 	HTTPClient::Status connect_blender_rpc(const Ref<HTTPClient> &p_client, int p_timeout_usecs);
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
index a2ae3446..579c8a03 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
@@ -32,7 +32,6 @@
 
 #include "editor_scene_exporter_gltf_settings.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/gui/editor_file_dialog.h"
@@ -40,12 +39,15 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/dialogs.h"
-#include "scene/main/scene_tree.h"
 
 String SceneExporterGLTFPlugin::get_plugin_name() const {
 	return "ConvertGLTF2";
 }
 
+bool SceneExporterGLTFPlugin::has_main_screen() const {
+	return false;
+}
+
 SceneExporterGLTFPlugin::SceneExporterGLTFPlugin() {
 	_gltf_document.instantiate();
 	// Set up the file dialog.
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
index 2f09666d..2ba89595 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
@@ -56,5 +56,6 @@ class SceneExporterGLTFPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override;
+	bool has_main_screen() const override;
 	SceneExporterGLTFPlugin();
 };
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp b/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
index dc4e90ec..187828a6 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
@@ -30,9 +30,6 @@
 
 #include "editor_scene_exporter_gltf_settings.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 const uint32_t PROP_EDITOR_SCRIPT_VAR = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_SCRIPT_VARIABLE;
 
 bool EditorSceneExporterGLTFSettings::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/engine/modules/gltf/editor/editor_scene_importer_blend.cpp b/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
index 2f2b03dd..b9b20408 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
+++ b/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
@@ -35,9 +35,6 @@
 #include "editor_import_blend_runner.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_importer.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
@@ -45,7 +42,6 @@
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
 #include "scene/gui/line_edit.h"
-#include "servers/display/display_server.h"
 
 #ifdef WINDOWS_ENABLED
 #include <shlwapi.h>
diff --git a/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp b/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
index a40ac999..2b5249cf 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
+++ b/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
@@ -33,8 +33,6 @@
 #include "../gltf_defines.h"
 #include "../gltf_document.h"
 
-#include "core/io/resource_importer.h"
-
 void EditorSceneFormatImporterGLTF::get_extensions(List<String> *r_extensions) const {
 	r_extensions->push_back("gltf");
 	r_extensions->push_back("glb");
diff --git a/engine/modules/gltf/extensions/gltf_document_extension.cpp b/engine/modules/gltf/extensions/gltf_document_extension.cpp
index 733c075c..1e912047 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension.cpp
+++ b/engine/modules/gltf/extensions/gltf_document_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "gltf_document_extension.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void GLTFDocumentExtension::_bind_methods() {
 	// Import process.
 	GDVIRTUAL_BIND(_import_preflight, "state", "extensions");
diff --git a/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp b/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp
index cd624d1b..b60998da 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp
+++ b/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp
@@ -52,13 +52,6 @@ MeshInstance3D *GLTFDocumentExtensionConvertImporterMesh::convert_importer_mesh_
 	mesh_instance_node_3d->set_skin(p_importer_mesh_instance_3d->get_skin());
 	mesh_instance_node_3d->set_skeleton_path(p_importer_mesh_instance_3d->get_skeleton_path());
 	mesh_instance_node_3d->set_visible(p_importer_mesh_instance_3d->is_visible());
-	mesh_instance_node_3d->set_layer_mask(p_importer_mesh_instance_3d->get_layer_mask());
-	mesh_instance_node_3d->set_cast_shadows_setting(p_importer_mesh_instance_3d->get_cast_shadows_setting());
-	mesh_instance_node_3d->set_visibility_range_begin(p_importer_mesh_instance_3d->get_visibility_range_begin());
-	mesh_instance_node_3d->set_visibility_range_begin_margin(p_importer_mesh_instance_3d->get_visibility_range_begin_margin());
-	mesh_instance_node_3d->set_visibility_range_end(p_importer_mesh_instance_3d->get_visibility_range_end());
-	mesh_instance_node_3d->set_visibility_range_end_margin(p_importer_mesh_instance_3d->get_visibility_range_end_margin());
-	mesh_instance_node_3d->set_visibility_range_fade_mode(p_importer_mesh_instance_3d->get_visibility_range_fade_mode());
 	p_importer_mesh_instance_3d->replace_by(mesh_instance_node_3d);
 	_copy_meta(p_importer_mesh_instance_3d, mesh_instance_node_3d);
 	// Convert the mesh data in the mesh resource.
diff --git a/engine/modules/gltf/extensions/gltf_light.cpp b/engine/modules/gltf/extensions/gltf_light.cpp
index 025efa77..93cb358f 100644
--- a/engine/modules/gltf/extensions/gltf_light.cpp
+++ b/engine/modules/gltf/extensions/gltf_light.cpp
@@ -31,12 +31,8 @@
 #include "gltf_light.h"
 
 #include "../structures/gltf_object_model_property.h"
-
-#include "core/object/class_db.h"
 #include "scene/3d/light_3d.h"
 
-#include <cfloat> // FLT_MAX
-
 void GLTFLight::_bind_methods() {
 	ClassDB::bind_static_method("GLTFLight", D_METHOD("from_node", "light_node"), &GLTFLight::from_node);
 	ClassDB::bind_method(D_METHOD("to_node"), &GLTFLight::to_node);
@@ -251,7 +247,7 @@ Dictionary GLTFLight::to_dictionary() const {
 }
 
 Variant GLTFLight::get_additional_data(const StringName &p_extension_name) {
-	return additional_data.get(p_extension_name, Variant());
+	return additional_data[p_extension_name];
 }
 
 void GLTFLight::set_additional_data(const StringName &p_extension_name, Variant p_additional_data) {
diff --git a/engine/modules/gltf/extensions/gltf_spec_gloss.cpp b/engine/modules/gltf/extensions/gltf_spec_gloss.cpp
index 3c75cba2..52a5f353 100644
--- a/engine/modules/gltf/extensions/gltf_spec_gloss.cpp
+++ b/engine/modules/gltf/extensions/gltf_spec_gloss.cpp
@@ -31,7 +31,6 @@
 #include "gltf_spec_gloss.h"
 
 #include "core/io/image.h"
-#include "core/object/class_db.h"
 
 void GLTFSpecGloss::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_diffuse_img"), &GLTFSpecGloss::get_diffuse_img);
diff --git a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp
index 9077e594..d36f166e 100644
--- a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp
+++ b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp
@@ -30,9 +30,6 @@
 
 #include "gltf_document_extension_physics.h"
 
-#include "gltf_physics_body.h"
-#include "gltf_physics_shape.h"
-
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/rigid_body_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
diff --git a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
index b29df1e4..25385841 100644
--- a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
+++ b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "../gltf_document_extension.h"
+#include "gltf_physics_body.h"
+#include "gltf_physics_shape.h"
 
 class GLTFDocumentExtensionPhysics : public GLTFDocumentExtension {
 	GDCLASS(GLTFDocumentExtensionPhysics, GLTFDocumentExtension);
diff --git a/engine/modules/gltf/extensions/physics/gltf_physics_body.cpp b/engine/modules/gltf/extensions/physics/gltf_physics_body.cpp
index 24fea604..3a12a157 100644
--- a/engine/modules/gltf/extensions/physics/gltf_physics_body.cpp
+++ b/engine/modules/gltf/extensions/physics/gltf_physics_body.cpp
@@ -30,7 +30,6 @@
 
 #include "gltf_physics_body.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/physics/animatable_body_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
diff --git a/engine/modules/gltf/extensions/physics/gltf_physics_body.h b/engine/modules/gltf/extensions/physics/gltf_physics_body.h
index 0de2c638..b6916140 100644
--- a/engine/modules/gltf/extensions/physics/gltf_physics_body.h
+++ b/engine/modules/gltf/extensions/physics/gltf_physics_body.h
@@ -30,8 +30,7 @@
 
 #pragma once
 
-#include "core/io/resource.h"
-#include "scene/3d/physics/collision_object_3d.h"
+#include "scene/3d/physics/physics_body_3d.h"
 
 // GLTFPhysicsBody is an intermediary between Godot's physics body nodes
 // and the OMI_physics_body extension.
diff --git a/engine/modules/gltf/extensions/physics/gltf_physics_shape.cpp b/engine/modules/gltf/extensions/physics/gltf_physics_shape.cpp
index d39f7515..a940febf 100644
--- a/engine/modules/gltf/extensions/physics/gltf_physics_shape.cpp
+++ b/engine/modules/gltf/extensions/physics/gltf_physics_shape.cpp
@@ -30,8 +30,9 @@
 
 #include "gltf_physics_shape.h"
 
+#include "../../gltf_state.h"
+
 #include "core/math/convex_hull.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
@@ -72,7 +73,7 @@ void GLTFPhysicsShape::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_trigger"), "set_is_trigger", "get_is_trigger");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mesh_index"), "set_mesh_index", "get_mesh_index");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "importer_mesh", PROPERTY_HINT_RESOURCE_TYPE, ImporterMesh::get_class_static()), "set_importer_mesh", "get_importer_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "importer_mesh", PROPERTY_HINT_RESOURCE_TYPE, "ImporterMesh"), "set_importer_mesh", "get_importer_mesh");
 }
 
 String GLTFPhysicsShape::get_shape_type() const {
diff --git a/engine/modules/gltf/gltf_document.cpp b/engine/modules/gltf/gltf_document.cpp
index 7d37c9da..563d53d8 100644
--- a/engine/modules/gltf/gltf_document.cpp
+++ b/engine/modules/gltf/gltf_document.cpp
@@ -36,7 +36,6 @@
 #include "gltf_template_convert.h"
 #include "skin_tool.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/config_file.h"
@@ -44,11 +43,10 @@
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
 #include "core/io/json.h"
-#include "core/io/resource_loader.h"
 #include "core/io/stream_peer.h"
-#include "core/object/class_db.h"
 #include "core/object/object_id.h"
 #include "core/version.h"
+#include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
@@ -1438,7 +1436,7 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> p_state) {
 		TypedArray<Material> instance_materials;
 
 		for (int j = 0; j < primitives.size(); j++) {
-			uint64_t flags = RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+			uint64_t flags = RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 			Dictionary mesh_prim = primitives[j];
 
 			Array array;
@@ -1747,7 +1745,7 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> p_state) {
 			}
 
 			if (p_state->force_disable_compression || is_mesh_2d || !a.has("POSITION") || !a.has("NORMAL") || mesh_prim.has("targets") || (a.has("JOINTS_0") || a.has("JOINTS_1"))) {
-				flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+				flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 			}
 
 			Ref<SurfaceTool> mesh_surface_tool;
@@ -1763,19 +1761,19 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> p_state) {
 			}
 			array = mesh_surface_tool->commit_to_arrays();
 
-			if ((flags & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && a.has("NORMAL") && (a.has("TANGENT") || generate_tangents)) {
+			if ((flags & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && a.has("NORMAL") && (a.has("TANGENT") || generate_tangents)) {
 				// Compression is enabled, so let's validate that the normals and tangents are correct.
 				Vector<Vector3> normals = array[Mesh::ARRAY_NORMAL];
 				Vector<float> tangents = array[Mesh::ARRAY_TANGENT];
 				if (unlikely(tangents.size() < normals.size() * 4)) {
 					ERR_PRINT("glTF import: Mesh " + itos(i) + " has invalid tangents.");
-					flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+					flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 				} else {
 					for (int vert = 0; vert < normals.size(); vert++) {
 						Vector3 tan = Vector3(tangents[vert * 4 + 0], tangents[vert * 4 + 1], tangents[vert * 4 + 2]);
 						if (std::abs(tan.dot(normals[vert])) > 0.0001) {
 							// Tangent is not perpendicular to the normal, so we can't use compression.
-							flags &= ~RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+							flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
 						}
 					}
 				}
@@ -3519,7 +3517,9 @@ Error GLTFDocument::_serialize_animations(Ref<GLTFState> p_state) {
 	}
 	for (int32_t player_i = 0; player_i < p_state->animation_players.size(); player_i++) {
 		AnimationPlayer *animation_player = p_state->animation_players[player_i];
-		for (const StringName &animation_name : animation_player->get_sorted_animation_list()) {
+		List<StringName> animations;
+		animation_player->get_animation_list(&animations);
+		for (const StringName &animation_name : animations) {
 			_convert_animation(p_state, animation_player, animation_name);
 		}
 	}
@@ -4290,8 +4290,7 @@ void GLTFDocument::_convert_grid_map_to_gltf(GridMap *p_grid_map, GLTFNodeIndex
 #else
 	const Array &cells = p_grid_map->get_used_cells();
 	for (int32_t k = 0; k < cells.size(); k++) {
-		Ref<GLTFNode> new_gltf_node;
-		new_gltf_node.instantiate();
+		GLTFNode *new_gltf_node = memnew(GLTFNode);
 		p_gltf_node->children.push_back(p_state->nodes.size());
 		p_state->nodes.push_back(new_gltf_node);
 		Vector3 cell_location = cells[k];
@@ -5950,16 +5949,6 @@ GLTFNodeIndex GLTFDocument::_node_and_or_bone_to_gltf_node_index(Ref<GLTFState>
 	ERR_FAIL_V_MSG(-1, vformat("glTF: A node was animated, but it wasn't found in the GLTFState. Ensure that all nodes referenced by the AnimationPlayer are in the scene you are exporting."));
 }
 
-template <typename T>
-static inline Error _try_interpolate_value_track(const Ref<Animation> &p_godot_animation, int32_t p_godot_anim_track_index, double p_time, T &r_value) {
-	Variant val = p_godot_animation->value_track_interpolate(p_godot_anim_track_index, p_time, false);
-	if (val.get_type() != GetTypeInfo<T>::VARIANT_TYPE) {
-		return ERR_INVALID_PARAMETER;
-	}
-	r_value = val;
-	return OK;
-}
-
 bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAnimation::NodeTrack &p_gltf_node_track, const Ref<Animation> &p_godot_animation, int32_t p_godot_anim_track_index, Vector<double> &p_times) {
 	GLTFAnimation::Interpolation gltf_interpolation = GLTFAnimation::godot_to_gltf_interpolation(p_godot_animation, p_godot_anim_track_index);
 	const Animation::TrackType track_type = p_godot_animation->track_get_type(p_godot_anim_track_index);
@@ -6099,7 +6088,7 @@ bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAni
 					bool last = false;
 					while (true) {
 						Vector3 position;
-						Error err = _try_interpolate_value_track(p_godot_animation, p_godot_anim_track_index, time, position);
+						Error err = p_godot_animation->try_position_track_interpolate(p_godot_anim_track_index, time, &position);
 						if (err == OK) {
 							p_gltf_node_track.position_track.values.push_back(position);
 							p_gltf_node_track.position_track.times.push_back(time);
@@ -6135,17 +6124,7 @@ bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAni
 					bool last = false;
 					while (true) {
 						Quaternion rotation;
-						Error err;
-						if (node_prop == "quaternion") {
-							err = _try_interpolate_value_track(p_godot_animation, p_godot_anim_track_index, time, rotation);
-						} else {
-							Vector3 rotation_euler;
-							err = _try_interpolate_value_track(p_godot_animation, p_godot_anim_track_index, time, rotation_euler);
-							if (node_prop == "rotation_degrees") {
-								rotation_euler *= Math::TAU / 360.0;
-							}
-							rotation = Quaternion::from_euler(rotation_euler);
-						}
+						Error err = p_godot_animation->try_rotation_track_interpolate(p_godot_anim_track_index, time, &rotation);
 						if (err == OK) {
 							p_gltf_node_track.rotation_track.values.push_back(rotation);
 							p_gltf_node_track.rotation_track.times.push_back(time);
@@ -6191,7 +6170,7 @@ bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAni
 					bool last = false;
 					while (true) {
 						Vector3 scale;
-						Error err = _try_interpolate_value_track(p_godot_animation, p_godot_anim_track_index, time, scale);
+						Error err = p_godot_animation->try_scale_track_interpolate(p_godot_anim_track_index, time, &scale);
 						if (err == OK) {
 							p_gltf_node_track.scale_track.values.push_back(scale);
 							p_gltf_node_track.scale_track.times.push_back(time);
@@ -6236,12 +6215,17 @@ bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAni
 					double time = 0.0;
 					bool last = false;
 					while (true) {
-						Transform3D transform;
-						Error err = _try_interpolate_value_track(p_godot_animation, p_godot_anim_track_index, time, transform);
+						Vector3 position;
+						Quaternion rotation;
+						Vector3 scale;
+						Error err = p_godot_animation->try_position_track_interpolate(p_godot_anim_track_index, time, &position);
+						if (err == OK) {
+							err = p_godot_animation->try_rotation_track_interpolate(p_godot_anim_track_index, time, &rotation);
+							if (err == OK) {
+								err = p_godot_animation->try_scale_track_interpolate(p_godot_anim_track_index, time, &scale);
+							}
+						}
 						if (err == OK) {
-							Vector3 position = transform.get_origin();
-							Quaternion rotation = transform.basis.get_rotation_quaternion();
-							Vector3 scale = transform.basis.get_scale();
 							p_gltf_node_track.position_track.values.push_back(position);
 							p_gltf_node_track.position_track.times.push_back(time);
 							p_gltf_node_track.rotation_track.values.push_back(rotation);
@@ -6551,13 +6535,9 @@ Error GLTFDocument::_parse(Ref<GLTFState> p_state, const String &p_path, Ref<Fil
 	document_extensions.clear();
 	for (Ref<GLTFDocumentExtension> ext : all_document_extensions) {
 		ERR_CONTINUE(ext.is_null());
-		Ref<GLTFDocumentExtension> ext_dup = ext;
-		if (ClassDB::is_class_exposed(ext->get_class_name())) {
-			ext_dup = ext->duplicate();
-		}
-		err = ext_dup->import_preflight(p_state, p_state->json["extensionsUsed"]);
+		err = ext->import_preflight(p_state, p_state->json["extensionsUsed"]);
 		if (err == OK) {
-			document_extensions.push_back(ext_dup);
+			document_extensions.push_back(ext);
 		}
 	}
 
@@ -7121,13 +7101,9 @@ Error GLTFDocument::append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint
 	document_extensions.clear();
 	for (Ref<GLTFDocumentExtension> ext : all_document_extensions) {
 		ERR_CONTINUE(ext.is_null());
-		Ref<GLTFDocumentExtension> ext_dup = ext;
-		if (ClassDB::is_class_exposed(ext->get_class_name())) {
-			ext_dup = ext->duplicate();
-		}
-		Error err = ext_dup->export_preflight(state, p_node);
+		Error err = ext->export_preflight(state, p_node);
 		if (err == OK) {
-			document_extensions.push_back(ext_dup);
+			document_extensions.push_back(ext);
 		}
 	}
 	// Add the root node(s) and their descendants to the state.
diff --git a/engine/modules/gltf/gltf_state.compat.inc b/engine/modules/gltf/gltf_state.compat.inc
index e26916e7..31892797 100644
--- a/engine/modules/gltf/gltf_state.compat.inc
+++ b/engine/modules/gltf/gltf_state.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gltf_state.h"
-
-#include "core/object/class_db.h"
-
 // Non-const getters for compatibility.
 int32_t GLTFState::_get_handle_binary_image_bind_compat_113172() {
 	return get_handle_binary_image();
diff --git a/engine/modules/gltf/gltf_state.cpp b/engine/modules/gltf/gltf_state.cpp
index 667b5e5c..2ef87441 100644
--- a/engine/modules/gltf/gltf_state.cpp
+++ b/engine/modules/gltf/gltf_state.cpp
@@ -33,8 +33,6 @@
 
 #include "gltf_template_convert.h"
 
-#include "core/object/class_db.h"
-
 void GLTFState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_used_extension", "extension_name", "required"), &GLTFState::add_used_extension);
 	ClassDB::bind_method(D_METHOD("append_data_to_buffers", "data", "deduplication"), &GLTFState::append_data_to_buffers);
@@ -446,7 +444,7 @@ void GLTFState::set_filename(const String &p_filename) {
 }
 
 Variant GLTFState::get_additional_data(const StringName &p_extension_name) const {
-	return additional_data.get(p_extension_name, Variant());
+	return additional_data[p_extension_name];
 }
 
 void GLTFState::set_additional_data(const StringName &p_extension_name, Variant p_additional_data) {
diff --git a/engine/modules/gltf/register_types.cpp b/engine/modules/gltf/register_types.cpp
index b8c4c458..8a211649 100644
--- a/engine/modules/gltf/register_types.cpp
+++ b/engine/modules/gltf/register_types.cpp
@@ -38,13 +38,8 @@
 #include "gltf_state.h"
 #include "structures/gltf_object_model_property.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 #ifndef PHYSICS_3D_DISABLED
 #include "extensions/physics/gltf_document_extension_physics.h"
-#include "extensions/physics/gltf_physics_body.h"
-#include "extensions/physics/gltf_physics_shape.h"
 #endif // PHYSICS_3D_DISABLED
 
 #ifdef TOOLS_ENABLED
@@ -52,7 +47,7 @@
 #include "editor/editor_scene_exporter_gltf_plugin.h"
 #include "editor/editor_scene_importer_blend.h"
 #include "editor/editor_scene_importer_gltf.h"
-//
+
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
@@ -104,8 +99,8 @@ static void _editor_init() {
 #endif // TOOLS_ENABLED
 
 #define GLTF_REGISTER_DOCUMENT_EXTENSION(m_doc_ext_class) \
-	Ref<m_doc_ext_class> extension_##m_doc_ext_class; \
-	extension_##m_doc_ext_class.instantiate(); \
+	Ref<m_doc_ext_class> extension_##m_doc_ext_class;     \
+	extension_##m_doc_ext_class.instantiate();            \
 	GLTFDocument::register_gltf_document_extension(extension_##m_doc_ext_class);
 
 void initialize_gltf_module(ModuleInitializationLevel p_level) {
diff --git a/engine/modules/gltf/skin_tool.cpp b/engine/modules/gltf/skin_tool.cpp
index 3bb87aa0..04cc6d2a 100644
--- a/engine/modules/gltf/skin_tool.cpp
+++ b/engine/modules/gltf/skin_tool.cpp
@@ -30,8 +30,6 @@
 
 #include "skin_tool.h"
 
-#include "core/math/disjoint_set.h"
-
 SkinNodeIndex SkinTool::_find_highest_node(Vector<Ref<GLTFNode>> &r_nodes, const Vector<GLTFNodeIndex> &p_subset) {
 	int highest = -1;
 	SkinNodeIndex best_node = -1;
diff --git a/engine/modules/gltf/skin_tool.h b/engine/modules/gltf/skin_tool.h
index a95c8b99..c3604f2f 100644
--- a/engine/modules/gltf/skin_tool.h
+++ b/engine/modules/gltf/skin_tool.h
@@ -31,10 +31,12 @@
 #pragma once
 
 #include "gltf_defines.h"
+
 #include "structures/gltf_node.h"
 #include "structures/gltf_skeleton.h"
 #include "structures/gltf_skin.h"
 
+#include "core/math/disjoint_set.h"
 #include "core/templates/rb_set.h"
 
 using SkinNodeIndex = int;
diff --git a/engine/modules/gltf/structures/gltf_accessor.compat.inc b/engine/modules/gltf/structures/gltf_accessor.compat.inc
index cdc63045..3155b7d7 100644
--- a/engine/modules/gltf/structures/gltf_accessor.compat.inc
+++ b/engine/modules/gltf/structures/gltf_accessor.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gltf_accessor.h"
-
-#include "core/object/class_db.h"
-
 // 32-bit versions for compatibility.
 
 GLTFBufferViewIndex GLTFAccessor::_get_buffer_view_bind_compat_106220() {
diff --git a/engine/modules/gltf/structures/gltf_accessor.cpp b/engine/modules/gltf/structures/gltf_accessor.cpp
index b6931035..ff9aee09 100644
--- a/engine/modules/gltf/structures/gltf_accessor.cpp
+++ b/engine/modules/gltf/structures/gltf_accessor.cpp
@@ -33,8 +33,6 @@
 
 #include "../gltf_state.h"
 
-#include "core/object/class_db.h"
-
 void GLTFAccessor::_bind_methods() {
 	BIND_ENUM_CONSTANT(TYPE_SCALAR);
 	BIND_ENUM_CONSTANT(TYPE_VEC2);
diff --git a/engine/modules/gltf/structures/gltf_accessor.h b/engine/modules/gltf/structures/gltf_accessor.h
index 9dcb7e60..c20e1334 100644
--- a/engine/modules/gltf/structures/gltf_accessor.h
+++ b/engine/modules/gltf/structures/gltf_accessor.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "../gltf_defines.h"
+
 #include "gltf_buffer_view.h"
 
 class GLTFAccessor : public Resource {
diff --git a/engine/modules/gltf/structures/gltf_animation.cpp b/engine/modules/gltf/structures/gltf_animation.cpp
index d62a7b9e..3d0ac602 100644
--- a/engine/modules/gltf/structures/gltf_animation.cpp
+++ b/engine/modules/gltf/structures/gltf_animation.cpp
@@ -30,8 +30,6 @@
 
 #include "gltf_animation.h"
 
-#include "core/object/class_db.h"
-
 void GLTFAnimation::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFAnimation::get_original_name);
 	ClassDB::bind_method(D_METHOD("set_original_name", "original_name"), &GLTFAnimation::set_original_name);
@@ -104,7 +102,7 @@ GLTFAnimation::GLTFAnimation() {
 }
 
 Variant GLTFAnimation::get_additional_data(const StringName &p_extension_name) {
-	return additional_data.get(p_extension_name, Variant());
+	return additional_data[p_extension_name];
 }
 
 void GLTFAnimation::set_additional_data(const StringName &p_extension_name, Variant p_additional_data) {
diff --git a/engine/modules/gltf/structures/gltf_buffer_view.compat.inc b/engine/modules/gltf/structures/gltf_buffer_view.compat.inc
index 817c8fcc..93624947 100644
--- a/engine/modules/gltf/structures/gltf_buffer_view.compat.inc
+++ b/engine/modules/gltf/structures/gltf_buffer_view.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gltf_buffer_view.h"
-
-#include "core/object/class_db.h"
-
 GLTFBufferIndex GLTFBufferView::_get_buffer_bind_compat_86907() {
 	return get_buffer();
 }
diff --git a/engine/modules/gltf/structures/gltf_buffer_view.cpp b/engine/modules/gltf/structures/gltf_buffer_view.cpp
index 443d534e..832934de 100644
--- a/engine/modules/gltf/structures/gltf_buffer_view.cpp
+++ b/engine/modules/gltf/structures/gltf_buffer_view.cpp
@@ -33,8 +33,6 @@
 
 #include "../gltf_state.h"
 
-#include "core/object/class_db.h"
-
 void GLTFBufferView::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("load_buffer_view_data", "state"), &GLTFBufferView::load_buffer_view_data);
 
@@ -156,15 +154,10 @@ GLTFBufferViewIndex GLTFBufferView::write_new_buffer_view_into_state(const Ref<G
 	// This is used by accessors. The byte offset of an accessor MUST be a multiple of the accessor's component size.
 	// https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#data-alignment
 	int64_t byte_offset = state_buffer.size();
-	int64_t padding_bytes = 0;
 	if (byte_offset % p_alignment != 0) {
-		padding_bytes = p_alignment - (byte_offset % p_alignment);
-		byte_offset += padding_bytes;
+		byte_offset += p_alignment - (byte_offset % p_alignment);
 	}
 	state_buffer.resize(byte_offset + input_data_size);
-	if (padding_bytes > 0) {
-		memset(state_buffer.ptrw() + (byte_offset - padding_bytes), 0, padding_bytes);
-	}
 	uint8_t *buffer_ptr = state_buffer.ptrw();
 	memcpy(buffer_ptr + byte_offset, p_input_data.ptr(), input_data_size);
 	state_buffers.set(p_buffer_index, state_buffer);
diff --git a/engine/modules/gltf/structures/gltf_camera.cpp b/engine/modules/gltf/structures/gltf_camera.cpp
index 3d8462f6..33cef291 100644
--- a/engine/modules/gltf/structures/gltf_camera.cpp
+++ b/engine/modules/gltf/structures/gltf_camera.cpp
@@ -31,8 +31,6 @@
 #include "gltf_camera.h"
 
 #include "gltf_object_model_property.h"
-
-#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 
 void GLTFCamera::_bind_methods() {
diff --git a/engine/modules/gltf/structures/gltf_mesh.cpp b/engine/modules/gltf/structures/gltf_mesh.cpp
index faeeb8c0..615193fc 100644
--- a/engine/modules/gltf/structures/gltf_mesh.cpp
+++ b/engine/modules/gltf/structures/gltf_mesh.cpp
@@ -30,7 +30,6 @@
 
 #include "gltf_mesh.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/importer_mesh.h"
 
 void GLTFMesh::_bind_methods() {
@@ -84,7 +83,7 @@ void GLTFMesh::set_blend_weights(const Vector<float> &p_blend_weights) {
 }
 
 Variant GLTFMesh::get_additional_data(const StringName &p_extension_name) {
-	return additional_data.get(p_extension_name, Variant());
+	return additional_data[p_extension_name];
 }
 
 void GLTFMesh::set_additional_data(const StringName &p_extension_name, Variant p_additional_data) {
diff --git a/engine/modules/gltf/structures/gltf_mesh.h b/engine/modules/gltf/structures/gltf_mesh.h
index 78cf626f..f176d50e 100644
--- a/engine/modules/gltf/structures/gltf_mesh.h
+++ b/engine/modules/gltf/structures/gltf_mesh.h
@@ -32,7 +32,6 @@
 
 #include "../gltf_defines.h"
 
-#include "core/variant/typed_array.h"
 #include "scene/resources/3d/importer_mesh.h"
 
 class GLTFMesh : public Resource {
diff --git a/engine/modules/gltf/structures/gltf_node.cpp b/engine/modules/gltf/structures/gltf_node.cpp
index dc4f2815..c260e958 100644
--- a/engine/modules/gltf/structures/gltf_node.cpp
+++ b/engine/modules/gltf/structures/gltf_node.cpp
@@ -32,8 +32,6 @@
 
 #include "../gltf_state.h"
 
-#include "core/object/class_db.h"
-
 void GLTFNode::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFNode::get_original_name);
 	ClassDB::bind_method(D_METHOD("set_original_name", "original_name"), &GLTFNode::set_original_name);
@@ -200,7 +198,7 @@ void GLTFNode::set_visible(bool p_visible) {
 }
 
 Variant GLTFNode::get_additional_data(const StringName &p_extension_name) {
-	return additional_data.get(p_extension_name, Variant());
+	return additional_data[p_extension_name];
 }
 
 bool GLTFNode::has_additional_data(const StringName &p_extension_name) {
diff --git a/engine/modules/gltf/structures/gltf_object_model_property.cpp b/engine/modules/gltf/structures/gltf_object_model_property.cpp
index 561401d2..6e2c08b4 100644
--- a/engine/modules/gltf/structures/gltf_object_model_property.cpp
+++ b/engine/modules/gltf/structures/gltf_object_model_property.cpp
@@ -32,8 +32,6 @@
 
 #include "../gltf_template_convert.h"
 
-#include "core/object/class_db.h"
-
 void GLTFObjectModelProperty::_bind_methods() {
 	BIND_ENUM_CONSTANT(GLTF_OBJECT_MODEL_TYPE_UNKNOWN);
 	BIND_ENUM_CONSTANT(GLTF_OBJECT_MODEL_TYPE_BOOL);
@@ -67,8 +65,8 @@ void GLTFObjectModelProperty::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_variant_type", "variant_type"), &GLTFObjectModelProperty::set_variant_type);
 	ClassDB::bind_method(D_METHOD("set_types", "variant_type", "obj_model_type"), &GLTFObjectModelProperty::set_types);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gltf_to_godot_expression", PROPERTY_HINT_RESOURCE_TYPE, Expression::get_class_static()), "set_gltf_to_godot_expression", "get_gltf_to_godot_expression"); // Ref<Expression>
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "godot_to_gltf_expression", PROPERTY_HINT_RESOURCE_TYPE, Expression::get_class_static()), "set_godot_to_gltf_expression", "get_godot_to_gltf_expression"); // Ref<Expression>
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gltf_to_godot_expression", PROPERTY_HINT_RESOURCE_TYPE, "Expression"), "set_gltf_to_godot_expression", "get_gltf_to_godot_expression"); // Ref<Expression>
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "godot_to_gltf_expression", PROPERTY_HINT_RESOURCE_TYPE, "Expression"), "set_godot_to_gltf_expression", "get_godot_to_gltf_expression"); // Ref<Expression>
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "node_paths", PROPERTY_HINT_TYPE_STRING, "NodePath"), "set_node_paths", "get_node_paths"); // TypedArray<NodePath>
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "object_model_type"), "set_object_model_type", "get_object_model_type"); // GLTFObjectModelType
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_STRING_ARRAY, "json_pointers"), "set_json_pointers", "get_json_pointers"); // TypedArray<PackedStringArray>
diff --git a/engine/modules/gltf/structures/gltf_object_model_property.h b/engine/modules/gltf/structures/gltf_object_model_property.h
index da6aa450..04162650 100644
--- a/engine/modules/gltf/structures/gltf_object_model_property.h
+++ b/engine/modules/gltf/structures/gltf_object_model_property.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
-#include "gltf_accessor.h"
-
 #include "core/math/expression.h"
 #include "core/variant/typed_array.h"
+#include "gltf_accessor.h"
 
 // Object model: https://github.com/KhronosGroup/glTF/blob/main/specification/2.0/ObjectModel.adoc
 // KHR_animation_pointer: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_animation_pointer
diff --git a/engine/modules/gltf/structures/gltf_skeleton.cpp b/engine/modules/gltf/structures/gltf_skeleton.cpp
index ba0609c1..040f3ce9 100644
--- a/engine/modules/gltf/structures/gltf_skeleton.cpp
+++ b/engine/modules/gltf/structures/gltf_skeleton.cpp
@@ -32,7 +32,6 @@
 
 #include "../gltf_template_convert.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/bone_attachment_3d.h"
 
 void GLTFSkeleton::_bind_methods() {
diff --git a/engine/modules/gltf/structures/gltf_skin.cpp b/engine/modules/gltf/structures/gltf_skin.cpp
index 188ae57a..b569f53b 100644
--- a/engine/modules/gltf/structures/gltf_skin.cpp
+++ b/engine/modules/gltf/structures/gltf_skin.cpp
@@ -32,7 +32,6 @@
 
 #include "../gltf_template_convert.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 #include "scene/resources/3d/skin.h"
 
@@ -67,7 +66,7 @@ void GLTFSkin::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "skeleton"), "set_skeleton", "get_skeleton"); // int
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "joint_i_to_bone_i", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL), "set_joint_i_to_bone_i", "get_joint_i_to_bone_i"); // RBMap<int,
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "joint_i_to_name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL), "set_joint_i_to_name", "get_joint_i_to_name"); // RBMap<int,
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "godot_skin", PROPERTY_HINT_RESOURCE_TYPE, Skin::get_class_static()), "set_godot_skin", "get_godot_skin"); // Ref<Skin>
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "godot_skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_godot_skin", "get_godot_skin"); // Ref<Skin>
 }
 
 GLTFNodeIndex GLTFSkin::get_skin_root() {
diff --git a/engine/modules/gltf/structures/gltf_texture.cpp b/engine/modules/gltf/structures/gltf_texture.cpp
index f8dc86f6..67010f3b 100644
--- a/engine/modules/gltf/structures/gltf_texture.cpp
+++ b/engine/modules/gltf/structures/gltf_texture.cpp
@@ -30,8 +30,6 @@
 
 #include "gltf_texture.h"
 
-#include "core/object/class_db.h"
-
 void GLTFTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_src_image"), &GLTFTexture::get_src_image);
 	ClassDB::bind_method(D_METHOD("set_src_image", "src_image"), &GLTFTexture::set_src_image);
diff --git a/engine/modules/gltf/structures/gltf_texture_sampler.cpp b/engine/modules/gltf/structures/gltf_texture_sampler.cpp
index 4a6b9a6d..8653bd83 100644
--- a/engine/modules/gltf/structures/gltf_texture_sampler.cpp
+++ b/engine/modules/gltf/structures/gltf_texture_sampler.cpp
@@ -30,8 +30,6 @@
 
 #include "gltf_texture_sampler.h"
 
-#include "core/object/class_db.h"
-
 void GLTFTextureSampler::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_mag_filter"), &GLTFTextureSampler::get_mag_filter);
 	ClassDB::bind_method(D_METHOD("set_mag_filter", "filter_mode"), &GLTFTextureSampler::set_mag_filter);
diff --git a/engine/modules/gltf/tests/test_gltf.h b/engine/modules/gltf/tests/test_gltf.h
index d346fb89..f37f1b14 100644
--- a/engine/modules/gltf/tests/test_gltf.h
+++ b/engine/modules/gltf/tests/test_gltf.h
@@ -34,19 +34,23 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "../editor/editor_scene_importer_gltf.h"
-#include "../gltf_document.h"
-#include "../gltf_state.h"
-
-#include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
-#include "core/object/class_db.h"
+#include "core/os/os.h"
+#include "drivers/png/image_loader_png.h"
 #include "editor/import/3d/resource_importer_scene.h"
 #include "editor/import/resource_importer_texture.h"
+#include "editor/inspector/editor_resource_preview.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/skeleton_3d.h"
+#include "scene/main/window.h"
+#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/compressed_texture.h"
-#include "scene/resources/compressed_texture_resource_format.h"
+#include "scene/resources/material.h"
 #include "scene/resources/packed_scene.h"
-#include "tests/test_utils.h"
+#include "tests/core/config/test_project_settings.h"
+
+#include "modules/gltf/editor/editor_scene_importer_gltf.h"
+#include "modules/gltf/gltf_document.h"
+#include "modules/gltf/gltf_state.h"
 
 namespace TestGltf {
 
diff --git a/engine/modules/gltf/tests/test_gltf_extras.h b/engine/modules/gltf/tests/test_gltf_extras.h
index 8c078b83..219d92b2 100644
--- a/engine/modules/gltf/tests/test_gltf_extras.h
+++ b/engine/modules/gltf/tests/test_gltf_extras.h
@@ -31,19 +31,22 @@
 #pragma once
 
 #include "test_gltf.h"
+#include "tests/test_macros.h"
 
 #ifdef TOOLS_ENABLED
 
-#include "../editor/editor_scene_importer_gltf.h"
-
+#include "core/os/os.h"
 #include "editor/import/3d/resource_importer_scene.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/material.h"
-#include "tests/test_macros.h"
+#include "scene/resources/packed_scene.h"
+
+#include "modules/gltf/editor/editor_scene_importer_gltf.h"
+#include "modules/gltf/gltf_document.h"
+#include "modules/gltf/gltf_state.h"
 
 namespace TestGltf {
 
diff --git a/engine/modules/gltf/tests/test_gltf_images.h b/engine/modules/gltf/tests/test_gltf_images.h
index b82760a6..ffb4947d 100644
--- a/engine/modules/gltf/tests/test_gltf_images.h
+++ b/engine/modules/gltf/tests/test_gltf_images.h
@@ -30,15 +30,12 @@
 
 #pragma once
 
-#ifdef TOOLS_ENABLED
-
 #include "test_gltf.h"
 
+#ifdef TOOLS_ENABLED
+
 #include "editor/file_system/editor_file_system.h"
-#include "editor/inspector/editor_resource_preview.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-#include "scene/resources/3d/primitive_meshes.cpp"
+#include "editor/file_system/editor_paths.h"
 #include "scene/resources/image_texture.h"
 
 namespace TestGltf {
diff --git a/engine/modules/godot_physics_2d/godot_area_2d.cpp b/engine/modules/godot_physics_2d/godot_area_2d.cpp
index bd67a8e9..d6c78670 100644
--- a/engine/modules/godot_physics_2d/godot_area_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_area_2d.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "godot_area_2d.h"
-
 #include "godot_body_2d.h"
 #include "godot_space_2d.h"
 
diff --git a/engine/modules/godot_physics_2d/godot_area_pair_2d.cpp b/engine/modules/godot_physics_2d/godot_area_pair_2d.cpp
index d04842f7..ca12e30c 100644
--- a/engine/modules/godot_physics_2d/godot_area_pair_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_area_pair_2d.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "godot_area_pair_2d.h"
-
 #include "godot_collision_solver_2d.h"
 
 bool GodotAreaPair2D::setup(real_t p_step) {
diff --git a/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp b/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
index c108b9fb..3cb3f8ee 100644
--- a/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
@@ -221,8 +221,7 @@ bool GodotBodyPair2D::_test_ccd(real_t p_step, GodotBody2D *p_A, int p_shape_A,
 
 	// Check one-way collision based on motion direction.
 	if (p_A->get_shape(p_shape_A)->allows_one_way_collision() && p_B->is_shape_set_as_one_way_collision(p_shape_B)) {
-		Vector2 direction = predicted_xform_B.basis_xform(p_B->get_shape_one_way_collision_direction(p_shape_B)).normalized();
-
+		Vector2 direction = predicted_xform_B.columns[1].normalized();
 		if (direction.dot(mnormal) < CMP_EPSILON) {
 			collided = false;
 			oneway_disabled = true;
@@ -319,8 +318,7 @@ bool GodotBodyPair2D::setup(real_t p_step) {
 
 	if (!prev_collided) {
 		if (shape_B_ptr->allows_one_way_collision() && A->is_shape_set_as_one_way_collision(shape_A)) {
-			Vector2 direction = xform_A.basis_xform(A->get_shape_one_way_collision_direction(shape_A)).normalized();
-
+			Vector2 direction = xform_A.columns[1].normalized();
 			bool valid = false;
 			for (int i = 0; i < contact_count; i++) {
 				Contact &c = contacts[i];
@@ -338,8 +336,7 @@ bool GodotBodyPair2D::setup(real_t p_step) {
 		}
 
 		if (shape_A_ptr->allows_one_way_collision() && B->is_shape_set_as_one_way_collision(shape_B)) {
-			Vector2 direction = xform_B.basis_xform(B->get_shape_one_way_collision_direction(shape_B)).normalized();
-
+			Vector2 direction = xform_B.columns[1].normalized();
 			bool valid = false;
 			for (int i = 0; i < contact_count; i++) {
 				Contact &c = contacts[i];
diff --git a/engine/modules/godot_physics_2d/godot_broad_phase_2d.h b/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
index f0502884..65c99872 100644
--- a/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
+++ b/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 
 class GodotCollisionObject2D;
diff --git a/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp b/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp
index 02d23482..59623a26 100644
--- a/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp
+++ b/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "godot_broad_phase_2d_bvh.h"
-
 #include "godot_collision_object_2d.h"
 
 GodotBroadPhase2D::ID GodotBroadPhase2DBVH::create(GodotCollisionObject2D *p_object, int p_subindex, const Rect2 &p_aabb, bool p_static) {
diff --git a/engine/modules/godot_physics_2d/godot_collision_object_2d.cpp b/engine/modules/godot_physics_2d/godot_collision_object_2d.cpp
index d2fbeb64..9851cac1 100644
--- a/engine/modules/godot_physics_2d/godot_collision_object_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_collision_object_2d.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "godot_collision_object_2d.h"
-
 #include "godot_physics_server_2d.h"
 #include "godot_space_2d.h"
 
@@ -42,7 +41,6 @@ void GodotCollisionObject2D::add_shape(GodotShape2D *p_shape, const Transform2D
 	s.disabled = p_disabled;
 	s.one_way_collision = false;
 	s.one_way_collision_margin = 0;
-	s.one_way_collision_direction = Vector2(0, 1);
 	shapes.push_back(s);
 	p_shape->add_owner(this);
 
diff --git a/engine/modules/godot_physics_2d/godot_collision_object_2d.h b/engine/modules/godot_physics_2d/godot_collision_object_2d.h
index d1de665b..71d3f37c 100644
--- a/engine/modules/godot_physics_2d/godot_collision_object_2d.h
+++ b/engine/modules/godot_physics_2d/godot_collision_object_2d.h
@@ -34,6 +34,7 @@
 #include "godot_shape_2d.h"
 
 #include "core/templates/self_list.h"
+#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotSpace2D;
 
@@ -60,7 +61,6 @@ private:
 		bool disabled = false;
 		bool one_way_collision = false;
 		real_t one_way_collision_margin = 0.0;
-		Vector2 one_way_collision_direction = Vector2(0.0, 1.0);
 	};
 
 	Vector<Shape> shapes;
@@ -139,11 +139,10 @@ public:
 		return shapes[p_idx].disabled;
 	}
 
-	_FORCE_INLINE_ void set_shape_as_one_way_collision(int p_idx, bool p_one_way_collision, real_t p_margin, const Vector2 &p_direction) {
+	_FORCE_INLINE_ void set_shape_as_one_way_collision(int p_idx, bool p_one_way_collision, real_t p_margin) {
 		CRASH_BAD_INDEX(p_idx, shapes.size());
 		shapes.write[p_idx].one_way_collision = p_one_way_collision;
 		shapes.write[p_idx].one_way_collision_margin = p_margin;
-		shapes.write[p_idx].one_way_collision_direction = p_direction;
 	}
 	_FORCE_INLINE_ bool is_shape_set_as_one_way_collision(int p_idx) const {
 		CRASH_BAD_INDEX(p_idx, shapes.size());
@@ -155,11 +154,6 @@ public:
 		return shapes[p_idx].one_way_collision_margin;
 	}
 
-	Vector2 get_shape_one_way_collision_direction(int p_idx) const {
-		CRASH_BAD_INDEX(p_idx, shapes.size());
-		return shapes[p_idx].one_way_collision_direction;
-	}
-
 	void set_collision_mask(uint32_t p_mask) {
 		collision_mask = p_mask;
 		_shape_changed();
diff --git a/engine/modules/godot_physics_2d/godot_collision_solver_2d.cpp b/engine/modules/godot_physics_2d/godot_collision_solver_2d.cpp
index 637a0679..a1acbe9c 100644
--- a/engine/modules/godot_physics_2d/godot_collision_solver_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_collision_solver_2d.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "godot_collision_solver_2d.h"
-
 #include "godot_collision_solver_2d_sat.h"
 
 #define collision_solver sat_2d_calculate_penetration
diff --git a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
index 96f0c2ce..ba86ffb8 100644
--- a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
+++ b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
@@ -374,9 +374,9 @@ public:
 
 /****** SAT TESTS *******/
 
-#define TEST_POINT(m_a, m_b) \
-	((!separator.test_axis(((m_a) - (m_b)).normalized())) || \
-			(castA && !separator.test_axis(((m_a) + p_motion_a - (m_b)).normalized())) || \
+#define TEST_POINT(m_a, m_b)                                                                \
+	((!separator.test_axis(((m_a) - (m_b)).normalized())) ||                                \
+			(castA && !separator.test_axis(((m_a) + p_motion_a - (m_b)).normalized())) ||   \
 			(castB && !separator.test_axis(((m_a) - ((m_b) + p_motion_b)).normalized())) || \
 			(castA && castB && !separator.test_axis(((m_a) + p_motion_a - ((m_b) + p_motion_b)).normalized())))
 
diff --git a/engine/modules/godot_physics_2d/godot_physics_server_2d.cpp b/engine/modules/godot_physics_2d/godot_physics_server_2d.cpp
index ba456228..56bc32b4 100644
--- a/engine/modules/godot_physics_2d/godot_physics_server_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_physics_server_2d.cpp
@@ -34,6 +34,7 @@
 #include "godot_broad_phase_2d_bvh.h"
 #include "godot_collision_solver_2d.h"
 
+#include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/os/os.h"
 
@@ -655,13 +656,13 @@ void GodotPhysicsServer2D::body_set_shape_disabled(RID p_body, int p_shape_idx,
 	body->set_shape_disabled(p_shape_idx, p_disabled);
 }
 
-void GodotPhysicsServer2D::body_set_shape_as_one_way_collision(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin, const Vector2 &p_direction) {
+void GodotPhysicsServer2D::body_set_shape_as_one_way_collision(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin) {
 	GodotBody2D *body = body_owner.get_or_null(p_body);
 	ERR_FAIL_NULL(body);
 	ERR_FAIL_INDEX(p_shape_idx, body->get_shape_count());
 	FLUSH_QUERY_CHECK(body);
 
-	body->set_shape_as_one_way_collision(p_shape_idx, p_enable, p_margin, p_direction);
+	body->set_shape_as_one_way_collision(p_shape_idx, p_enable, p_margin);
 }
 
 void GodotPhysicsServer2D::body_set_continuous_collision_detection_mode(RID p_body, CCDMode p_mode) {
diff --git a/engine/modules/godot_physics_2d/godot_physics_server_2d.h b/engine/modules/godot_physics_2d/godot_physics_server_2d.h
index c9130c55..2826718e 100644
--- a/engine/modules/godot_physics_2d/godot_physics_server_2d.h
+++ b/engine/modules/godot_physics_2d/godot_physics_server_2d.h
@@ -185,7 +185,7 @@ public:
 	virtual void body_clear_shapes(RID p_body) override;
 
 	virtual void body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) override;
-	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin, const Vector2 &p_direction) override;
+	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin) override;
 
 	virtual void body_attach_object_instance_id(RID p_body, ObjectID p_id) override;
 	virtual ObjectID body_get_object_instance_id(RID p_body) const override;
diff --git a/engine/modules/godot_physics_2d/godot_shape_2d.h b/engine/modules/godot_physics_2d/godot_shape_2d.h
index 80ac63eb..1403589a 100644
--- a/engine/modules/godot_physics_2d/godot_shape_2d.h
+++ b/engine/modules/godot_physics_2d/godot_shape_2d.h
@@ -128,19 +128,19 @@ public:
 };
 
 //let the optimizer do the magic
-#define DEFAULT_PROJECT_RANGE_CAST \
+#define DEFAULT_PROJECT_RANGE_CAST                                                                                                                                  \
 	virtual void project_range_castv(const Vector2 &p_cast, const Vector2 &p_normal, const Transform2D &p_transform, real_t &r_min, real_t &r_max) const override { \
-		project_range_cast(p_cast, p_normal, p_transform, r_min, r_max); \
-	} \
-	_FORCE_INLINE_ void project_range_cast(const Vector2 &p_cast, const Vector2 &p_normal, const Transform2D &p_transform, real_t &r_min, real_t &r_max) const { \
-		real_t mina, maxa; \
-		real_t minb, maxb; \
-		Transform2D ofsb = p_transform; \
-		ofsb.columns[2] += p_cast; \
-		project_range(p_normal, p_transform, mina, maxa); \
-		project_range(p_normal, ofsb, minb, maxb); \
-		r_min = MIN(mina, minb); \
-		r_max = MAX(maxa, maxb); \
+		project_range_cast(p_cast, p_normal, p_transform, r_min, r_max);                                                                                            \
+	}                                                                                                                                                               \
+	_FORCE_INLINE_ void project_range_cast(const Vector2 &p_cast, const Vector2 &p_normal, const Transform2D &p_transform, real_t &r_min, real_t &r_max) const {    \
+		real_t mina, maxa;                                                                                                                                          \
+		real_t minb, maxb;                                                                                                                                          \
+		Transform2D ofsb = p_transform;                                                                                                                             \
+		ofsb.columns[2] += p_cast;                                                                                                                                  \
+		project_range(p_normal, p_transform, mina, maxa);                                                                                                           \
+		project_range(p_normal, ofsb, minb, maxb);                                                                                                                  \
+		r_min = MIN(mina, minb);                                                                                                                                    \
+		r_max = MAX(maxa, maxb);                                                                                                                                    \
 	}
 
 class GodotWorldBoundaryShape2D : public GodotShape2D {
diff --git a/engine/modules/godot_physics_2d/godot_space_2d.cpp b/engine/modules/godot_physics_2d/godot_space_2d.cpp
index 1d7ce01c..b3d7cea4 100644
--- a/engine/modules/godot_physics_2d/godot_space_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_space_2d.cpp
@@ -30,12 +30,12 @@
 
 #include "godot_space_2d.h"
 
-#include "godot_area_pair_2d.h"
-#include "godot_body_pair_2d.h"
 #include "godot_collision_solver_2d.h"
 #include "godot_physics_server_2d.h"
 
 #include "core/config/project_settings.h"
+#include "godot_area_pair_2d.h"
+#include "godot_body_pair_2d.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001
 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05
@@ -637,7 +637,7 @@ bool GodotSpace2D::test_body_motion(GodotBody2D *p_body, const PhysicsServer2D::
 					Transform2D col_obj_shape_xform = col_obj->get_transform() * col_obj->get_shape_transform(shape_idx);
 
 					if (body_shape->allows_one_way_collision() && col_obj->is_shape_set_as_one_way_collision(shape_idx)) {
-						cbk.valid_dir = col_obj_shape_xform.basis_xform(col_obj->get_shape_one_way_collision_direction(shape_idx)).normalized();
+						cbk.valid_dir = col_obj_shape_xform.columns[1].normalized();
 
 						real_t owc_margin = col_obj->get_shape_one_way_collision_margin(shape_idx);
 						cbk.valid_depth = MAX(owc_margin, margin); //user specified, but never less than actual margin or it won't work
@@ -802,8 +802,7 @@ bool GodotSpace2D::test_body_motion(GodotBody2D *p_body, const PhysicsServer2D::
 				//test initial overlap
 				if (GodotCollisionSolver2D::solve(body_shape, body_shape_xform, Vector2(), against_shape, col_obj_shape_xform, Vector2(), nullptr, nullptr, nullptr, 0)) {
 					if (body_shape->allows_one_way_collision() && col_obj->is_shape_set_as_one_way_collision(col_shape_idx)) {
-						Vector2 direction = col_obj_shape_xform.basis_xform(col_obj->get_shape_one_way_collision_direction(col_shape_idx)).normalized();
-
+						Vector2 direction = col_obj_shape_xform.columns[1].normalized();
 						if (motion_normal.dot(direction) < 0) {
 							continue;
 						}
@@ -853,7 +852,8 @@ bool GodotSpace2D::test_body_motion(GodotBody2D *p_body, const PhysicsServer2D::
 					cbk.amount = 0;
 					cbk.passed = 0;
 					cbk.ptr = cd;
-					cbk.valid_dir = col_obj_shape_xform.basis_xform(col_obj->get_shape_one_way_collision_direction(col_shape_idx)).normalized();
+					cbk.valid_dir = col_obj_shape_xform.columns[1].normalized();
+
 					cbk.valid_depth = 10e20;
 
 					Vector2 sep = motion_normal; //important optimization for this to work fast enough
@@ -943,7 +943,7 @@ bool GodotSpace2D::test_body_motion(GodotBody2D *p_body, const PhysicsServer2D::
 				Transform2D col_obj_shape_xform = col_obj->get_transform() * col_obj->get_shape_transform(shape_idx);
 
 				if (body_shape->allows_one_way_collision() && col_obj->is_shape_set_as_one_way_collision(shape_idx)) {
-					rcd.valid_dir = col_obj_shape_xform.basis_xform(col_obj->get_shape_one_way_collision_direction(shape_idx)).normalized();
+					rcd.valid_dir = col_obj_shape_xform.columns[1].normalized();
 
 					real_t owc_margin = col_obj->get_shape_one_way_collision_margin(shape_idx);
 					rcd.valid_depth = MAX(owc_margin, margin); //user specified, but never less than actual margin or it won't work
diff --git a/engine/modules/godot_physics_2d/godot_step_2d.cpp b/engine/modules/godot_physics_2d/godot_step_2d.cpp
index d68f81a1..8bdaed38 100644
--- a/engine/modules/godot_physics_2d/godot_step_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_step_2d.cpp
@@ -30,10 +30,9 @@
 
 #include "godot_step_2d.h"
 
-#include "godot_constraint_2d.h"
-
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
+#include "godot_constraint_2d.h"
 
 #define BODY_ISLAND_COUNT_RESERVE 128
 #define BODY_ISLAND_SIZE_RESERVE 512
diff --git a/engine/modules/godot_physics_2d/register_types.cpp b/engine/modules/godot_physics_2d/register_types.cpp
index 830f0d5c..9c79b8ba 100644
--- a/engine/modules/godot_physics_2d/register_types.cpp
+++ b/engine/modules/godot_physics_2d/register_types.cpp
@@ -30,10 +30,8 @@
 
 #include "register_types.h"
 
-#include "godot_physics_server_2d.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
+#include "godot_physics_server_2d.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/physics_2d/physics_server_2d_wrap_mt.h"
 
diff --git a/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp b/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
index 1bbd1289..bc69ef1d 100644
--- a/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
@@ -33,8 +33,6 @@
 #include "godot_collision_solver_3d.h"
 #include "godot_space_3d.h"
 
-#include <cfloat> // FLT_MAX
-
 #define MIN_VELOCITY 0.0001
 #define MAX_BIAS_ROTATION (Math::PI / 8)
 
diff --git a/engine/modules/godot_physics_3d/godot_broad_phase_3d.h b/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
index 5f149bc7..852dde34 100644
--- a/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
+++ b/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/math/aabb.h"
+#include "core/math/math_funcs.h"
 
 class GodotCollisionObject3D;
 
diff --git a/engine/modules/godot_physics_3d/godot_collision_object_3d.h b/engine/modules/godot_physics_3d/godot_collision_object_3d.h
index 9bd67d79..d20f941e 100644
--- a/engine/modules/godot_physics_3d/godot_collision_object_3d.h
+++ b/engine/modules/godot_physics_3d/godot_collision_object_3d.h
@@ -34,6 +34,7 @@
 #include "godot_shape_3d.h"
 
 #include "core/templates/self_list.h"
+#include "servers/physics_3d/physics_server_3d.h"
 
 #ifdef DEBUG_ENABLED
 #define MAX_OBJECT_DISTANCE 3.1622776601683791e+18
diff --git a/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp b/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
index fd62f618..071ae66a 100644
--- a/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
@@ -30,10 +30,11 @@
 
 #include "godot_collision_solver_3d.h"
 
-#include "gjk_epa.h"
 #include "godot_collision_solver_3d_sat.h"
 #include "godot_soft_body_3d.h"
 
+#include "gjk_epa.h"
+
 #define collision_solver sat_calculate_penetration
 //#define collision_solver gjk_epa_calculate_penetration
 
diff --git a/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp b/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
index 67b237e1..fc8dff51 100644
--- a/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
@@ -143,8 +143,8 @@ void GodotSoftBody3D::set_mesh(RID p_mesh) {
 	Array arrays = RenderingServer::get_singleton()->mesh_surface_get_arrays(soft_mesh, 0);
 	ERR_FAIL_COND(arrays.is_empty());
 
-	const Vector<int> &indices = arrays[RSE::ARRAY_INDEX];
-	const Vector<Vector3> &vertices = arrays[RSE::ARRAY_VERTEX];
+	const Vector<int> &indices = arrays[RenderingServer::ARRAY_INDEX];
+	const Vector<Vector3> &vertices = arrays[RenderingServer::ARRAY_VERTEX];
 	ERR_FAIL_COND_MSG(indices.is_empty(), "Soft body's mesh needs to have indices");
 	ERR_FAIL_COND_MSG(vertices.is_empty(), "Soft body's mesh needs to have vertices");
 
diff --git a/engine/modules/godot_physics_3d/godot_space_3d.cpp b/engine/modules/godot_physics_3d/godot_space_3d.cpp
index 04c27626..9f7bd5c3 100644
--- a/engine/modules/godot_physics_3d/godot_space_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_space_3d.cpp
@@ -30,12 +30,12 @@
 
 #include "godot_space_3d.h"
 
-#include "godot_area_pair_3d.h"
-#include "godot_body_pair_3d.h"
 #include "godot_collision_solver_3d.h"
 #include "godot_physics_server_3d.h"
 
 #include "core/config/project_settings.h"
+#include "godot_area_pair_3d.h"
+#include "godot_body_pair_3d.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001
 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05
diff --git a/engine/modules/godot_physics_3d/godot_step_3d.cpp b/engine/modules/godot_physics_3d/godot_step_3d.cpp
index f8ddf5e0..7b5afcb9 100644
--- a/engine/modules/godot_physics_3d/godot_step_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_step_3d.cpp
@@ -30,7 +30,7 @@
 
 #include "godot_step_3d.h"
 
-#include "godot_constraint_3d.h"
+#include "godot_joint_3d.h"
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
diff --git a/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h b/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
index 3bd7b0d3..d6218e19 100644
--- a/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
@@ -49,8 +49,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "core/math/basis.h"
-#include "core/math/vector3.h"
+#include "core/math/transform_3d.h"
 
 class GodotJacobianEntry3D {
 public:
diff --git a/engine/modules/godot_physics_3d/register_types.cpp b/engine/modules/godot_physics_3d/register_types.cpp
index 19292f9f..0aae731e 100644
--- a/engine/modules/godot_physics_3d/register_types.cpp
+++ b/engine/modules/godot_physics_3d/register_types.cpp
@@ -31,9 +31,6 @@
 #include "register_types.h"
 
 #include "godot_physics_server_3d.h"
-
-#include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
 #include "servers/physics_3d/physics_server_3d.h"
 #include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
diff --git a/engine/modules/gridmap/doc_classes/GridMap.xml b/engine/modules/gridmap/doc_classes/GridMap.xml
index 680ab6cd..56e9900a 100644
--- a/engine/modules/gridmap/doc_classes/GridMap.xml
+++ b/engine/modules/gridmap/doc_classes/GridMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GridMap" inherits="Node3D" api_type="core" keywords="tilemap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GridMap" inherits="Node3D" keywords="tilemap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Node for 3D tile-based maps.
 	</brief_description>
@@ -216,9 +216,6 @@
 		<member name="collision_priority" type="float" setter="set_collision_priority" getter="get_collision_priority" default="1.0">
 			The priority used to solve colliding when occurring penetration. The higher the priority is, the lower the penetration into the object will be. This can for example be used to prevent the player from breaking through the boundaries of a level.
 		</member>
-		<member name="collision_visibility_mode" type="int" setter="set_collision_visibility_mode" getter="get_collision_visibility_mode" enum="GridMap.DebugVisibilityMode" default="0">
-			Show or hide the [GridMap]'s collision shapes. If set to [constant DEBUG_VISIBILITY_MODE_DEFAULT], this depends on the show collision debug settings.
-		</member>
 		<member name="mesh_library" type="MeshLibrary" setter="set_mesh_library" getter="get_mesh_library">
 			The assigned [MeshLibrary].
 		</member>
@@ -243,14 +240,5 @@
 		<constant name="INVALID_CELL_ITEM" value="-1">
 			Invalid cell item that can be used in [method set_cell_item] to clear cells (or represent an empty cell in [method get_cell_item]).
 		</constant>
-		<constant name="DEBUG_VISIBILITY_MODE_DEFAULT" value="0" enum="DebugVisibilityMode">
-			Hide the collisions debug shapes in the editor, and use the debug settings to determine their visibility in game (i.e. [member SceneTree.debug_collisions_hint] or [member SceneTree.debug_navigation_hint]).
-		</constant>
-		<constant name="DEBUG_VISIBILITY_MODE_FORCE_SHOW" value="1" enum="DebugVisibilityMode">
-			Always show the collisions debug shapes.
-		</constant>
-		<constant name="DEBUG_VISIBILITY_MODE_FORCE_HIDE" value="2" enum="DebugVisibilityMode">
-			Always hide the collisions debug shapes.
-		</constant>
 	</constants>
 </class>
diff --git a/engine/modules/gridmap/doc_classes/GridMapEditorPlugin.xml b/engine/modules/gridmap/doc_classes/GridMapEditorPlugin.xml
index f578f57a..fdda0341 100644
--- a/engine/modules/gridmap/doc_classes/GridMapEditorPlugin.xml
+++ b/engine/modules/gridmap/doc_classes/GridMapEditorPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GridMapEditorPlugin" inherits="EditorPlugin" api_type="editor" keywords="tilemap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="GridMapEditorPlugin" inherits="EditorPlugin" keywords="tilemap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Editor for [GridMap] nodes.
 	</brief_description>
diff --git a/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp b/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
index ea90a036..f484b5e0 100644
--- a/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -30,35 +30,25 @@
 
 #include "grid_map_editor_plugin.h"
 
-#include "core/input/input.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_zoom_widget.h"
-#include "editor/gui/filter_line_edit.h"
-#include "editor/inspector/editor_resource_preview.h"
-#include "editor/scene/3d/mesh_library_editor_plugin.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/debugger/view_3d_controller.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "servers/rendering/rendering_server.h"
 
 void GridMapEditor::_configure() {
 	if (!node) {
@@ -130,20 +120,13 @@ void GridMapEditor::_menu_option(int p_option) {
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 			} else if (_has_selection()) {
-				EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-				undo_redo->create_action(TTR("GridMap Rotate"));
-
 				Array cells = _get_selected_cells();
 				for (int i = 0; i < cells.size(); i++) {
 					Vector3i cell = cells[i];
 					r = node->get_basis_with_orthogonal_index(node->get_cell_item_orientation(cell));
 					r.rotate(rotation_axis, rotation_angle);
-					undo_redo->add_do_method(node, "set_cell_item", cell, node->get_cell_item(cell), node->get_orthogonal_index_from_basis(r));
-					undo_redo->add_undo_method(node, "set_cell_item", cell, node->get_cell_item(cell), node->get_cell_item_orientation(cell));
+					node->set_cell_item(cell, node->get_cell_item(cell), node->get_orthogonal_index_from_basis(r));
 				}
-
-				undo_redo->commit_action();
-
 			} else {
 				r = node->get_basis_with_orthogonal_index(cursor_rot);
 				r.rotate(rotation_axis, rotation_angle);
@@ -307,22 +290,14 @@ void GridMapEditor::_validate_selection() {
 }
 
 void GridMapEditor::_set_selection(bool p_active, const Vector3 &p_begin, const Vector3 &p_end) {
-	bool was_active = selection.active;
-	Vector3 begin_old = selection.begin;
-	Vector3 end_old = selection.end;
-
 	selection.active = p_active;
 	selection.begin = p_begin;
 	selection.end = p_end;
 	selection.click = p_begin;
 	selection.current = p_end;
 
-	if (is_inside_tree()) {
+	if (is_visible_in_tree()) {
 		_update_selection_transform();
-
-		if (was_active != selection.active || begin_old != selection.begin || end_old != selection.end) {
-			emit_signal(SNAME("overlay_update_requested"));
-		}
 	}
 }
 
@@ -361,25 +336,6 @@ Array GridMapEditor::_get_selected_cells() const {
 	return ret;
 }
 
-String GridMapEditor::_get_cursor_coordinates() const {
-	String text;
-	if (cursor_visible || !set_items.is_empty() || !clipboard_items.is_empty()) {
-		if (selection.active) {
-			if (selection.begin == selection.end) {
-				text = vformat(String::utf8(u8"(%d, %d, %d)  \u2317  (%d, %d, %d)"),
-						(int)cursor_gridpos.x, (int)cursor_gridpos.y, (int)cursor_gridpos.z, (int)selection.begin.x, (int)selection.begin.y, (int)selection.begin.z);
-			} else {
-				text = vformat(String::utf8(u8"(%d, %d, %d)  \u2317  (%d, %d, %d) \u2192 (%d, %d, %d)"),
-						(int)cursor_gridpos.x, (int)cursor_gridpos.y, (int)cursor_gridpos.z, (int)selection.begin.x, (int)selection.begin.y, (int)selection.begin.z, (int)selection.end.x, (int)selection.end.y, (int)selection.end.z);
-			}
-		} else {
-			text = vformat("(%d, %d, %d)",
-					(int)cursor_gridpos.x, (int)cursor_gridpos.y, (int)cursor_gridpos.z);
-		}
-	}
-	return text;
-}
-
 bool GridMapEditor::do_input_action(Camera3D *p_camera, const Point2 &p_point, bool p_click) {
 	if (!spatial_editor) {
 		return false;
@@ -423,7 +379,6 @@ bool GridMapEditor::do_input_action(Camera3D *p_camera, const Point2 &p_point, b
 		}
 	}
 
-	Vector3 old_cursor_gridpos = cursor_gridpos;
 	Vector3 cell_size = node->get_cell_size();
 
 	for (int i = 0; i < 3; i++) {
@@ -438,10 +393,6 @@ bool GridMapEditor::do_input_action(Camera3D *p_camera, const Point2 &p_point, b
 		}
 	}
 
-	if (old_cursor_gridpos != cursor_gridpos) {
-		emit_signal(SNAME("overlay_update_requested"));
-	}
-
 	RS::get_singleton()->instance_set_transform(grid_instance[edit_axis], node->get_global_transform() * edit_grid_xform);
 
 	if (cursor_instance.is_valid()) {
@@ -592,16 +543,15 @@ void GridMapEditor::_delete_selection_with_undo() {
 	undo_redo->commit_action();
 }
 
-void GridMapEditor::_clear_selection_with_undo() {
-	if (!selection.active) {
-		return;
-	}
-
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action(TTR("GridMap Clear Selection"));
-	undo_redo->add_do_method(this, "_set_selection", false, Vector3(), Vector3());
-	undo_redo->add_undo_method(this, "_set_selection", true, selection.begin, selection.end);
-	undo_redo->commit_action();
+void GridMapEditor::_setup_paste_mode() {
+	input_action = INPUT_PASTE;
+	paste_indicator.click = selection.click;
+	paste_indicator.current = cursor_gridpos;
+	paste_indicator.begin = selection.begin;
+	paste_indicator.end = selection.end;
+	paste_indicator.distance_from_cursor = cursor_gridpos - paste_indicator.begin;
+	paste_indicator.orientation = 0;
+	_update_paste_indicator();
 }
 
 void GridMapEditor::_fill_selection() {
@@ -625,17 +575,6 @@ void GridMapEditor::_fill_selection() {
 	undo_redo->commit_action();
 }
 
-void GridMapEditor::_setup_paste_mode() {
-	input_action = INPUT_PASTE;
-	paste_indicator.click = selection.click;
-	paste_indicator.current = cursor_gridpos;
-	paste_indicator.begin = selection.begin;
-	paste_indicator.end = selection.end;
-	paste_indicator.distance_from_cursor = cursor_gridpos - paste_indicator.begin;
-	paste_indicator.orientation = 0;
-	_update_paste_indicator();
-}
-
 void GridMapEditor::_clear_clipboard_data() {
 	for (const ClipboardItem &E : clipboard_items) {
 		if (E.instance.is_null()) {
@@ -707,12 +646,12 @@ void GridMapEditor::_update_paste_indicator() {
 		}
 		xf = Transform3D();
 		xf.origin = (paste_indicator.current - paste_indicator.distance_from_cursor + center) * node->get_cell_size();
-		xf.basis = rot;
+		xf.basis = rot * xf.basis;
 		xf.translate_local(item.grid_offset * node->get_cell_size());
 
 		Basis item_rot;
 		item_rot = node->get_basis_with_orthogonal_index(item.orientation);
-		xf.basis *= item_rot * node->get_cell_scale();
+		xf.basis = item_rot * xf.basis * node->get_cell_scale();
 
 		RenderingServer::get_singleton()->instance_set_transform(item.instance, node->get_global_transform() * xf);
 	}
@@ -761,26 +700,7 @@ void GridMapEditor::_do_paste() {
 		orm = rot * orm;
 
 		undo_redo->add_do_method(node, "set_cell_item", position, item.cell_item, node->get_orthogonal_index_from_basis(orm));
-
-		int prev_idx = node->get_cell_item(position);
-		bool used_for_preview = false;
-
-		if (clipboard_is_move && prev_idx == GridMap::INVALID_CELL_ITEM) {
-			// If no cell is present, it could be because it was removed to show it in the preview.
-			// Search through the clipboard to check if one of them was in that same position.
-			for (const ClipboardItem &prev_item : clipboard_items) {
-				Vector3 prev_position = paste_indicator.begin + prev_item.grid_offset;
-				if (position == prev_position) {
-					used_for_preview = true;
-					undo_redo->add_undo_method(node, "set_cell_item", position, prev_item.cell_item, prev_item.orientation);
-					break;
-				}
-			}
-		}
-
-		if (!used_for_preview) {
-			undo_redo->add_undo_method(node, "set_cell_item", position, prev_idx, node->get_cell_item_orientation(position));
-		}
+		undo_redo->add_undo_method(node, "set_cell_item", position, node->get_cell_item(position), node->get_cell_item_orientation(position));
 	}
 
 	if (reselect) {
@@ -816,7 +736,7 @@ void GridMapEditor::_show_viewports_transform_gizmo(bool p_value) {
 EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
 	// If the mouse is currently captured, we are most likely in freelook mode.
 	// In this case, disable shortcuts to avoid conflicts with freelook navigation.
-	if (!node || Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
+	if (!node || Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
 		return EditorPlugin::AFTER_GUI_INPUT_PASS;
 	}
 
@@ -856,7 +776,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 				_cancel_pending_move();
 				return EditorPlugin::AFTER_GUI_INPUT_STOP;
 			} else if (selection.active) {
-				_clear_selection_with_undo();
+				_set_selection(false);
 				return EditorPlugin::AFTER_GUI_INPUT_STOP;
 			} else {
 				input_action = INPUT_NONE;
@@ -879,8 +799,8 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 			return EditorPlugin::AFTER_GUI_INPUT_STOP;
 		}
 		for (int i = 0; i < options->get_popup()->get_item_count(); ++i) {
-			const Ref<Shortcut> &option_shortcut = options->get_popup()->get_item_shortcut(i);
-			if (option_shortcut.is_valid() && option_shortcut->matches_event(p_event)) {
+			const Ref<Shortcut> &shortcut = options->get_popup()->get_item_shortcut(i);
+			if (shortcut.is_valid() && shortcut->matches_event(p_event)) {
 				// Consume input to avoid conflicts with other plugins.
 				accept_event();
 				_menu_option(options->get_popup()->get_item_id(i));
@@ -896,7 +816,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 				floor->set_value(floor->get_value() + mb->get_factor());
 			}
 
-			return EditorPlugin::AFTER_GUI_INPUT_STOP;
+			return EditorPlugin::AFTER_GUI_INPUT_STOP; // Eaten.
 		} else if (mb->get_button_index() == MouseButton::WHEEL_DOWN && (mb->is_command_or_control_pressed())) {
 			if (mb->is_pressed()) {
 				floor->set_value(floor->get_value() - mb->get_factor());
@@ -906,8 +826,8 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 
 		if (mb->is_pressed()) {
 			if (mb->get_button_index() == MouseButton::LEFT) {
-				View3DController::NavigationScheme nav_scheme = (View3DController::NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
-				if ((nav_scheme == View3DController::NAV_SCHEME_MAYA || nav_scheme == View3DController::NAV_SCHEME_MODO) && mb->is_alt_pressed()) {
+				Node3DEditorViewport::NavigationScheme nav_scheme = (Node3DEditorViewport::NavigationScheme)EDITOR_GET("editors/3d/navigation/navigation_scheme").operator int();
+				if ((nav_scheme == Node3DEditorViewport::NAVIGATION_MAYA || nav_scheme == Node3DEditorViewport::NAVIGATION_MODO) && mb->is_alt_pressed()) {
 					return EditorPlugin::AFTER_GUI_INPUT_PASS;
 				}
 
@@ -933,23 +853,25 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 				}
 			} else if (mb->get_button_index() == MouseButton::RIGHT) {
 				if (input_action == INPUT_PASTE) {
-					_cancel_pending_move();
+					_clear_clipboard_data();
+					input_action = INPUT_NONE;
+					_update_paste_indicator();
 					return EditorPlugin::AFTER_GUI_INPUT_STOP;
 				} else if (selection.active) {
-					_clear_selection_with_undo();
+					_set_selection(false);
 					if (input_action == INPUT_SELECT) {
 						input_action = INPUT_NONE;
 					}
 					return EditorPlugin::AFTER_GUI_INPUT_STOP;
 				}
-
-				return EditorPlugin::AFTER_GUI_INPUT_PASS; // Allow freelook to be enabled.
 			} else {
 				return EditorPlugin::AFTER_GUI_INPUT_PASS;
 			}
 
-			do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true);
-			return EditorPlugin::AFTER_GUI_INPUT_STOP;
+			if (do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true)) {
+				return EditorPlugin::AFTER_GUI_INPUT_STOP;
+			}
+			return EditorPlugin::AFTER_GUI_INPUT_PASS;
 		} else {
 			if ((mb->get_button_index() == MouseButton::LEFT && input_action == INPUT_ERASE) || (mb->get_button_index() == MouseButton::LEFT && input_action == INPUT_PAINT)) {
 				if (set_items.size()) {
@@ -977,7 +899,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 			if (valid_mb_press && mb->get_button_index() == MouseButton::LEFT) {
 				valid_mb_press = false;
 
-				if (input_action == INPUT_SELECT && selection.active && (selection.begin != last_selection.begin || selection.end != last_selection.end)) {
+				if (input_action == INPUT_SELECT) {
 					EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 					undo_redo->create_action(TTR("GridMap Selection"));
 					undo_redo->add_do_method(this, "_set_selection", selection.active, selection.begin, selection.end);
@@ -1054,21 +976,30 @@ void GridMapEditor::_text_changed(const String &p_text) {
 	update_palette();
 }
 
+void GridMapEditor::_sbox_input(const Ref<InputEvent> &p_event) {
+	// Redirect navigational key events to the item list.
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid()) {
+		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
+			mesh_library_palette->gui_input(key);
+			search_box->accept_event();
+		}
+	}
+}
+
 void GridMapEditor::_mesh_library_palette_input(const Ref<InputEvent> &p_ie) {
 	const Ref<InputEventMouseButton> mb = p_ie;
 
-	// Zoom in/out using Ctrl + mouse wheel.
+	// Zoom in/out using Ctrl + mouse wheel
 	if (mb.is_valid() && mb->is_pressed() && mb->is_command_or_control_pressed()) {
 		if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_UP) {
 			zoom_widget->set_zoom(zoom_widget->get_zoom() + 0.2);
 			zoom_widget->emit_signal(SNAME("zoom_changed"), zoom_widget->get_zoom());
-			accept_event();
 		}
 
 		if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_DOWN) {
 			zoom_widget->set_zoom(zoom_widget->get_zoom() - 0.2);
 			zoom_widget->emit_signal(SNAME("zoom_changed"), zoom_widget->get_zoom());
-			accept_event();
 		}
 	}
 }
@@ -1139,14 +1070,7 @@ void GridMapEditor::update_palette() {
 		if (preview.is_valid()) {
 			mesh_library_palette->set_item_icon(item, preview);
 			mesh_library_palette->set_item_tooltip(item, name);
-		} else {
-			Ref<Mesh> mesh = mesh_library->get_item_mesh(id);
-			if (mesh.is_valid()) {
-				// Fallback to the item's mesh preview.
-				EditorResourcePreview::get_singleton()->queue_edited_resource_preview(mesh, callable_mp(this, &GridMapEditor::_update_resource_preview).bind(item));
-			}
 		}
-
 		mesh_library_palette->set_item_text(item, name);
 		mesh_library_palette->set_item_metadata(item, id);
 
@@ -1158,12 +1082,6 @@ void GridMapEditor::update_palette() {
 	}
 }
 
-void GridMapEditor::_update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_idx) {
-	if (p_idx < mesh_library_palette->get_item_count()) {
-		mesh_library_palette->set_item_icon(p_idx, p_preview);
-	}
-}
-
 void GridMapEditor::_update_mesh_library() {
 	ERR_FAIL_NULL(node);
 
@@ -1177,17 +1095,8 @@ void GridMapEditor::_update_mesh_library() {
 		return;
 	}
 
-	MeshLibraryEditorPlugin *mesh_library_editor_plugin = MeshLibraryEditorPlugin::get_singleton();
 	if (mesh_library.is_valid()) {
 		mesh_library->connect_changed(callable_mp(this, &GridMapEditor::update_palette));
-
-		if (mesh_library_editor_plugin) {
-			mesh_library_editor_plugin->edit(*mesh_library);
-			mesh_library_editor_plugin->make_visible(true);
-		}
-	} else if (mesh_library_editor_plugin) {
-		mesh_library_editor_plugin->edit(nullptr);
-		mesh_library_editor_plugin->make_visible(false);
 	}
 
 	update_palette();
@@ -1309,10 +1218,10 @@ void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
 		}
 
 		Array d;
-		d.resize(RSE::ARRAY_MAX);
-		d[RSE::ARRAY_VERTEX] = grid_points[i];
-		d[RSE::ARRAY_COLOR] = grid_colors[i];
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], RSE::PRIMITIVE_LINES, d);
+		d.resize(RS::ARRAY_MAX);
+		d[RS::ARRAY_VERTEX] = grid_points[i];
+		d[RS::ARRAY_COLOR] = grid_colors[i];
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], RenderingServer::PRIMITIVE_LINES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid());
 	}
 }
@@ -1330,7 +1239,7 @@ void GridMapEditor::_update_theme() {
 	rotate_x_button->set_button_icon(get_theme_icon(SNAME("RotateLeft"), EditorStringName(EditorIcons)));
 	rotate_y_button->set_button_icon(get_theme_icon(SNAME("ToolRotate"), EditorStringName(EditorIcons)));
 	rotate_z_button->set_button_icon(get_theme_icon(SNAME("RotateRight"), EditorStringName(EditorIcons)));
-	clear_rotation_button->set_button_icon(get_theme_icon(SNAME("UndoRedo"), EditorStringName(EditorIcons)));
+	search_box->set_right_icon(get_theme_icon(SNAME("Search"), EditorStringName(EditorIcons)));
 	mode_thumbnail->set_button_icon(get_theme_icon(SNAME("FileThumbnail"), EditorStringName(EditorIcons)));
 	mode_list->set_button_icon(get_theme_icon(SNAME("FileList"), EditorStringName(EditorIcons)));
 	options->set_button_icon(get_theme_icon(SNAME("Tools"), EditorStringName(EditorIcons)));
@@ -1378,7 +1287,6 @@ void GridMapEditor::_notification(int p_what) {
 			RenderingServer::get_singleton()->free_rid(selection_instance);
 			RenderingServer::get_singleton()->free_rid(paste_instance);
 			cursor_instance = RID();
-			cursor_visible = false;
 			selection_instance = RID();
 			paste_instance = RID();
 		} break;
@@ -1412,8 +1320,8 @@ void GridMapEditor::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
-			if (input_action == INPUT_PAINT || input_action == INPUT_ERASE || input_action == INPUT_SELECT) {
-				// Simulate mouse released event to stop drawing when editor focus exits.
+			if (input_action == INPUT_PAINT) {
+				// Simulate mouse released event to stop drawing when editor focus exists.
 				Ref<InputEventMouseButton> release;
 				release.instantiate();
 				release->set_button_index(MouseButton::LEFT);
@@ -1447,7 +1355,7 @@ void GridMapEditor::_update_cursor_instance() {
 			Ref<Mesh> mesh = node->get_mesh_library()->get_item_mesh(selected_palette);
 			if (mesh.is_valid() && mesh->get_rid().is_valid()) {
 				cursor_instance = RenderingServer::get_singleton()->instance_create2(mesh->get_rid(), scenario);
-				RSE::ShadowCastingSetting cast_shadows = (RSE::ShadowCastingSetting)node->get_mesh_library()->get_item_mesh_cast_shadow(selected_palette);
+				RS::ShadowCastingSetting cast_shadows = (RS::ShadowCastingSetting)node->get_mesh_library()->get_item_mesh_cast_shadow(selected_palette);
 				RS::get_singleton()->instance_geometry_set_cast_shadows_setting(cursor_instance, cast_shadows);
 			}
 		}
@@ -1465,20 +1373,10 @@ void GridMapEditor::_update_cursor_instance() {
 		cursor_instance = RenderingServer::get_singleton()->instance_create2(cursor_mesh, scenario);
 	}
 
-	bool was_visible = cursor_visible;
-
 	if (cursor_instance.is_valid()) {
 		// Make the cursor translucent so that it can be distinguished from already-placed tiles.
 		RenderingServer::get_singleton()->instance_geometry_set_transparency(cursor_instance, 0.5);
-		cursor_visible = true;
-	} else {
-		cursor_visible = false;
 	}
-
-	if (was_visible != cursor_visible) {
-		emit_signal(SNAME("overlay_update_requested"));
-	}
-
 	_update_cursor_transform();
 }
 
@@ -1511,28 +1409,16 @@ void GridMapEditor::_floor_mouse_exited() {
 void GridMapEditor::_bind_methods() {
 	ClassDB::bind_method("_configure", &GridMapEditor::_configure);
 	ClassDB::bind_method("_set_selection", &GridMapEditor::_set_selection);
-
-	ADD_SIGNAL(MethodInfo("overlay_update_requested"));
 }
 
 GridMapEditor::GridMapEditor() {
-	set_name(TTRC("GridMap"));
-	set_icon_name("GridMapDock");
-	set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_grid_map_bottom_panel", TTRC("Toggle GridMap Dock")));
-	set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
-	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
-	set_global(false);
-	set_transient(true);
-	set_custom_minimum_size(Size2(0, 200 * EDSCALE));
-	set_theme_type_variation("NoBorderBottomPanel");
-
 	ED_SHORTCUT("grid_map/previous_floor", TTRC("Previous Floor"), Key::KEY_1, true);
 	ED_SHORTCUT("grid_map/next_floor", TTRC("Next Floor"), Key::KEY_3, true);
 	ED_SHORTCUT("grid_map/edit_x_axis", TTRC("Edit X Axis"), KeyModifierMask::SHIFT + Key::Z, true);
 	ED_SHORTCUT("grid_map/edit_y_axis", TTRC("Edit Y Axis"), KeyModifierMask::SHIFT + Key::X, true);
 	ED_SHORTCUT("grid_map/edit_z_axis", TTRC("Edit Z Axis"), KeyModifierMask::SHIFT + Key::C, true);
 	ED_SHORTCUT("grid_map/keep_selected", TTRC("Keep Selection"));
-	ED_SHORTCUT("grid_map/clear_rotation", TTRC("Clear Rotation"), KeyModifierMask::ALT | Key::G, true);
+	ED_SHORTCUT("grid_map/clear_rotation", TTRC("Clear Rotation"));
 
 	options = memnew(MenuButton);
 	options->set_theme_type_variation(SceneStringName(FlatButton));
@@ -1565,12 +1451,9 @@ GridMapEditor::GridMapEditor() {
 
 	options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &GridMapEditor::_menu_option));
 
-	VBoxContainer *main_vb = memnew(VBoxContainer);
-	add_child(main_vb);
-
 	toolbar = memnew(HBoxContainer);
+	add_child(toolbar);
 	toolbar->set_h_size_flags(SIZE_EXPAND_FILL);
-	main_vb->add_child(toolbar);
 
 	HBoxContainer *mode_buttons = memnew(HBoxContainer);
 	toolbar->add_child(mode_buttons);
@@ -1710,15 +1593,6 @@ GridMapEditor::GridMapEditor() {
 	rotation_buttons->add_child(rotate_z_button);
 	viewport_shortcut_buttons.push_back(rotate_z_button);
 
-	clear_rotation_button = memnew(Button);
-	clear_rotation_button->set_theme_type_variation(SceneStringName(FlatButton));
-	clear_rotation_button->set_shortcut(ED_GET_SHORTCUT("grid_map/clear_rotation"));
-	clear_rotation_button->set_accessibility_name(TTRC("Cursor Reset Rotation"));
-	clear_rotation_button->connect(SceneStringName(pressed),
-			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_CLEAR_ROTATION));
-	rotation_buttons->add_child(clear_rotation_button);
-	viewport_shortcut_buttons.push_back(clear_rotation_button);
-
 	// Wide empty separation control. (like BoxContainer::add_spacer())
 	Control *c = memnew(Control);
 	c->set_mouse_filter(MOUSE_FILTER_PASS);
@@ -1737,13 +1611,14 @@ GridMapEditor::GridMapEditor() {
 	floor->connect(SceneStringName(mouse_exited), callable_mp(this, &GridMapEditor::_floor_mouse_exited));
 	floor->get_line_edit()->connect(SceneStringName(mouse_exited), callable_mp(this, &GridMapEditor::_floor_mouse_exited));
 
-	search_box = memnew(FilterLineEdit);
+	search_box = memnew(LineEdit);
 	search_box->add_theme_constant_override("minimum_character_width", 10);
-	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	search_box->set_placeholder(TTRC("Filter Meshes"));
 	search_box->set_accessibility_name(TTRC("Filter Meshes"));
+	search_box->set_clear_button_enabled(true);
 	toolbar->add_child(search_box);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &GridMapEditor::_text_changed));
+	search_box->connect(SceneStringName(gui_input), callable_mp(this, &GridMapEditor::_sbox_input));
 
 	zoom_widget = memnew(EditorZoomWidget);
 	toolbar->add_child(zoom_widget);
@@ -1775,12 +1650,15 @@ GridMapEditor::GridMapEditor() {
 
 	toolbar->add_child(options);
 
+	MarginContainer *mc = memnew(MarginContainer);
+	mc->set_theme_type_variation("NoBorderBottomPanel");
+	mc->set_v_size_flags(SIZE_EXPAND_FILL);
+	add_child(mc);
+
 	mesh_library_palette = memnew(ItemList);
-	search_box->set_forward_control(mesh_library_palette);
 	mesh_library_palette->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	mesh_library_palette->set_scroll_hint_mode(ItemList::SCROLL_HINT_MODE_BOTH);
-	mesh_library_palette->set_v_size_flags(SIZE_EXPAND_FILL);
-	main_vb->add_child(mesh_library_palette);
+	mc->add_child(mesh_library_palette);
 	mesh_library_palette->connect(SceneStringName(gui_input), callable_mp(this, &GridMapEditor::_mesh_library_palette_input));
 	mesh_library_palette->connect(SceneStringName(item_selected), callable_mp(this, &GridMapEditor::_item_selected_cbk));
 
@@ -1873,7 +1751,7 @@ GridMapEditor::GridMapEditor() {
 		}
 
 		Array d;
-		d.resize(RSE::ARRAY_MAX);
+		d.resize(RS::ARRAY_MAX);
 
 		default_color = Color(0.0, 0.565, 1.0); // blue 0.7, 0.7, 1.0
 		erase_color = Color(1.0, 0.2, 0.2); // red
@@ -1911,34 +1789,34 @@ GridMapEditor::GridMapEditor() {
 		selection_floor_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 		selection_floor_mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
 
-		d[RSE::ARRAY_VERTEX] = triangles;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(cursor_mesh, RSE::PRIMITIVE_TRIANGLES, d);
+		d[RS::ARRAY_VERTEX] = triangles;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(cursor_mesh, RS::PRIMITIVE_TRIANGLES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(cursor_mesh, 0, cursor_inner_mat->get_rid());
 
-		d[RSE::ARRAY_VERTEX] = lines;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(cursor_mesh, RSE::PRIMITIVE_LINES, d);
+		d[RS::ARRAY_VERTEX] = lines;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(cursor_mesh, RS::PRIMITIVE_LINES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(cursor_mesh, 1, cursor_outer_mat->get_rid());
 
-		d[RSE::ARRAY_VERTEX] = triangles;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RSE::PRIMITIVE_TRIANGLES, d);
+		d[RS::ARRAY_VERTEX] = triangles;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RS::PRIMITIVE_TRIANGLES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(selection_mesh, 0, inner_mat->get_rid());
 
-		d[RSE::ARRAY_VERTEX] = lines;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RSE::PRIMITIVE_LINES, d);
+		d[RS::ARRAY_VERTEX] = lines;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RS::PRIMITIVE_LINES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(selection_mesh, 1, outer_mat->get_rid());
 
-		d[RSE::ARRAY_VERTEX] = triangles;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RSE::PRIMITIVE_TRIANGLES, d);
+		d[RS::ARRAY_VERTEX] = triangles;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RS::PRIMITIVE_TRIANGLES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(paste_mesh, 0, inner_mat->get_rid());
 
-		d[RSE::ARRAY_VERTEX] = lines;
-		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RSE::PRIMITIVE_LINES, d);
+		d[RS::ARRAY_VERTEX] = lines;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RS::PRIMITIVE_LINES, d);
 		RenderingServer::get_singleton()->mesh_surface_set_material(paste_mesh, 1, outer_mat->get_rid());
 
 		for (int i = 0; i < 3; i++) {
-			d[RSE::ARRAY_VERTEX] = square[i];
+			d[RS::ARRAY_VERTEX] = square[i];
 			selection_level_mesh[i] = RS::get_singleton()->mesh_create();
-			RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_level_mesh[i], RSE::PRIMITIVE_LINES, d);
+			RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_level_mesh[i], RS::PRIMITIVE_LINES, d);
 			RenderingServer::get_singleton()->mesh_surface_set_material(selection_level_mesh[i], 0, selection_floor_mat->get_rid());
 		}
 	}
@@ -1993,14 +1871,19 @@ void GridMapEditorPlugin::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			grid_map_editor = memnew(GridMapEditor);
-			EditorDockManager::get_singleton()->add_dock(grid_map_editor);
-			grid_map_editor->close();
-			grid_map_editor->connect(SNAME("overlay_update_requested"), callable_mp((EditorPlugin *)this, &EditorPlugin::update_overlays));
+			grid_map_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+			grid_map_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+			grid_map_editor->set_custom_minimum_size(Size2(0, 200) * EDSCALE);
+			grid_map_editor->hide();
+
+			panel_button = EditorNode::get_bottom_panel()->add_item(TTRC("GridMap"), grid_map_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_grid_map_bottom_panel", TTRC("Toggle GridMap Bottom Panel")));
+			panel_button->hide();
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-			EditorDockManager::get_singleton()->remove_dock(grid_map_editor);
+			EditorNode::get_bottom_panel()->remove_item(grid_map_editor);
 			memdelete_notnull(grid_map_editor);
 			grid_map_editor = nullptr;
+			panel_button = nullptr;
 		} break;
 	}
 }
@@ -2016,21 +1899,6 @@ void GridMapEditorPlugin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_selected_palette_item"), &GridMapEditorPlugin::get_selected_palette_item);
 }
 
-void GridMapEditorPlugin::forward_3d_draw_over_viewport(Control *p_overlay) {
-	Point2 msgpos = Point2(20 * EDSCALE, p_overlay->get_size().y - 20 * EDSCALE);
-	String text = grid_map_editor->_get_cursor_coordinates();
-	if (text.is_empty()) {
-		return;
-	}
-
-	Ref<Font> font = p_overlay->get_theme_font(SceneStringName(font), SNAME("Label"));
-	int font_size = p_overlay->get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
-
-	p_overlay->draw_string(font, msgpos + Point2(1, 1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
-	p_overlay->draw_string(font, msgpos + Point2(-1, -1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
-	p_overlay->draw_string(font, msgpos, text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1, 1, 1, 1));
-}
-
 void GridMapEditorPlugin::edit(Object *p_object) {
 	ERR_FAIL_NULL(grid_map_editor);
 	grid_map_editor->edit(Object::cast_to<GridMap>(p_object));
@@ -2048,15 +1916,17 @@ void GridMapEditorPlugin::make_visible(bool p_visible) {
 			grid_map_editor->select_mode_button->set_pressed(true);
 		}
 		grid_map_editor->_on_tool_mode_changed();
-		grid_map_editor->make_visible();
+		panel_button->show();
+		EditorNode::get_bottom_panel()->make_item_visible(grid_map_editor);
 		grid_map_editor->set_process(true);
 	} else {
 		grid_map_editor->_cancel_pending_move();
 		grid_map_editor->_show_viewports_transform_gizmo(true);
-		grid_map_editor->close();
+		panel_button->hide();
+		if (grid_map_editor->is_visible_in_tree()) {
+			EditorNode::get_bottom_panel()->hide_bottom_panel();
+		}
 		grid_map_editor->set_process(false);
-
-		MeshLibraryEditorPlugin::get_singleton()->make_visible(false);
 	}
 }
 
diff --git a/engine/modules/gridmap/editor/grid_map_editor_plugin.h b/engine/modules/gridmap/editor/grid_map_editor_plugin.h
index 5e9e8764..6e3bc71c 100644
--- a/engine/modules/gridmap/editor/grid_map_editor_plugin.h
+++ b/engine/modules/gridmap/editor/grid_map_editor_plugin.h
@@ -32,24 +32,21 @@
 
 #include "../grid_map.h"
 
-#include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/spin_box.h"
 
-class Button;
 class ConfirmationDialog;
-class FilterLineEdit;
-class HSlider;
-class ItemList;
 class MenuButton;
 class Node3DEditorPlugin;
 class ButtonGroup;
 class EditorZoomWidget;
 class BaseButton;
-class SpinBox;
 
-class GridMapEditor : public EditorDock {
-	GDCLASS(GridMapEditor, EditorDock);
+class GridMapEditor : public VBoxContainer {
+	GDCLASS(GridMapEditor, VBoxContainer);
 
 	static constexpr int32_t GRID_CURSOR_SIZE = 50;
 
@@ -93,12 +90,11 @@ class GridMapEditor : public EditorDock {
 	Button *rotate_x_button = nullptr;
 	Button *rotate_y_button = nullptr;
 	Button *rotate_z_button = nullptr;
-	Button *clear_rotation_button = nullptr;
 
 	EditorZoomWidget *zoom_widget = nullptr;
 	Button *mode_thumbnail = nullptr;
 	Button *mode_list = nullptr;
-	FilterLineEdit *search_box = nullptr;
+	LineEdit *search_box = nullptr;
 	HSlider *size_slider = nullptr;
 	ConfirmationDialog *settings_dialog = nullptr;
 	VBoxContainer *settings_vbc = nullptr;
@@ -219,12 +215,11 @@ class GridMapEditor : public EditorDock {
 	ItemList *mesh_library_palette = nullptr;
 	Label *info_message = nullptr;
 
-	void update_grid(); // Change which and where the grid is displayed.
+	void update_grid(); // Change which and where the grid is displayed
 	void _draw_grids(const Vector3 &cell_size);
 	void _configure();
 	void _menu_option(int);
 	void update_palette();
-	void _update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, int p_idx);
 	void _update_mesh_library();
 	void _set_display_mode(int p_mode);
 	void _item_selected_cbk(int idx);
@@ -234,6 +229,7 @@ class GridMapEditor : public EditorDock {
 	void _update_theme();
 
 	void _text_changed(const String &p_text);
+	void _sbox_input(const Ref<InputEvent> &p_event);
 	void _mesh_library_palette_input(const Ref<InputEvent> &p_ie);
 
 	void _icon_size_changed(float p_value);
@@ -251,15 +247,12 @@ class GridMapEditor : public EditorDock {
 	bool _has_selection() const;
 	Array _get_selected_cells() const;
 
-	String _get_cursor_coordinates() const;
-
 	void _floor_changed(float p_value);
 	void _floor_mouse_exited();
 
 	void _delete_selection();
 	void _delete_selection_with_undo();
 	void _fill_selection();
-	void _clear_selection_with_undo();
 	void _setup_paste_mode();
 
 	bool do_input_action(Camera3D *p_camera, const Point2 &p_point, bool p_click);
@@ -282,17 +275,16 @@ class GridMapEditorPlugin : public EditorPlugin {
 	GDCLASS(GridMapEditorPlugin, EditorPlugin);
 
 	GridMapEditor *grid_map_editor = nullptr;
-
-	void _overlay_update_requested();
+	Button *panel_button = nullptr;
 
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
 public:
-	virtual void forward_3d_draw_over_viewport(Control *p_overlay) override;
 	virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); }
 	virtual String get_plugin_name() const override { return "GridMap"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/modules/gridmap/grid_map.cpp b/engine/modules/gridmap/grid_map.cpp
index a5ab441f..9e71ac8e 100644
--- a/engine/modules/gridmap/grid_map.cpp
+++ b/engine/modules/gridmap/grid_map.cpp
@@ -30,12 +30,8 @@
 
 #include "grid_map.h"
 
-#include "core/config/engine.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/mesh_library.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/surface_tool.h"
@@ -43,6 +39,7 @@
 
 #ifndef PHYSICS_3D_DISABLED
 #include "core/math/convex_hull.h"
+#include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
@@ -219,18 +216,6 @@ real_t GridMap::get_collision_priority() const {
 	return collision_priority;
 }
 
-void GridMap::set_collision_visibility_mode(DebugVisibilityMode p_visibility_mode) {
-	if (collision_visibility_mode == p_visibility_mode) {
-		return;
-	}
-	collision_visibility_mode = p_visibility_mode;
-	_recreate_octant_data();
-}
-
-GridMap::DebugVisibilityMode GridMap::get_collision_visibility_mode() const {
-	return collision_visibility_mode;
-}
-
 void GridMap::set_physics_material(Ref<PhysicsMaterial> p_material) {
 	physics_material = p_material;
 	_update_physics_bodies_characteristics();
@@ -413,23 +398,12 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 			PhysicsServer3D::get_singleton()->body_set_param(g->static_body, PhysicsServer3D::BODY_PARAM_BOUNCE, physics_material->computed_bounce());
 		}
 #endif // PHYSICS_3D_DISABLED
-		bool debug_collisions = false;
-		switch (collision_visibility_mode) {
-			case DEBUG_VISIBILITY_MODE_DEFAULT: {
-				SceneTree *st = SceneTree::get_singleton();
-				debug_collisions = st && !Engine::get_singleton()->is_editor_hint() && st->is_debugging_collisions_hint();
-			} break;
-			case DEBUG_VISIBILITY_MODE_FORCE_HIDE: {
-				debug_collisions = false;
-			} break;
-			case DEBUG_VISIBILITY_MODE_FORCE_SHOW: {
-				debug_collisions = true;
-			} break;
-		}
-		if (debug_collisions) {
-			g->collision_debug = RS::get_singleton()->mesh_create();
-			g->collision_debug_instance = RS::get_singleton()->instance_create();
-			RS::get_singleton()->instance_set_base(g->collision_debug_instance, g->collision_debug);
+		SceneTree *st = SceneTree::get_singleton();
+
+		if (st && st->is_debugging_collisions_hint()) {
+			g->collision_debug = RenderingServer::get_singleton()->mesh_create();
+			g->collision_debug_instance = RenderingServer::get_singleton()->instance_create();
+			RenderingServer::get_singleton()->instance_set_base(g->collision_debug_instance, g->collision_debug);
 		}
 
 		octant_map[octantkey] = g;
@@ -795,7 +769,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 			Octant::MultimeshInstance mmi;
 
 			RID mm = RS::get_singleton()->multimesh_create();
-			RS::get_singleton()->multimesh_allocate_data(mm, E.value.size(), RSE::MULTIMESH_TRANSFORM_3D);
+			RS::get_singleton()->multimesh_allocate_data(mm, E.value.size(), RS::MULTIMESH_TRANSFORM_3D);
 			RS::get_singleton()->multimesh_set_mesh(mm, mesh_library->get_item_mesh(E.key)->get_rid());
 
 			int idx = 0;
@@ -822,7 +796,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 				RS::get_singleton()->instance_set_transform(instance, get_global_transform());
 			}
 
-			RSE::ShadowCastingSetting cast_shadows = (RSE::ShadowCastingSetting)mesh_library->get_item_mesh_cast_shadow(E.key);
+			RS::ShadowCastingSetting cast_shadows = (RS::ShadowCastingSetting)mesh_library->get_item_mesh_cast_shadow(E.key);
 			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(instance, cast_shadows);
 
 			mmi.multimesh = mm;
@@ -843,11 +817,11 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		}
 
 		Array arr;
-		arr.resize(RSE::ARRAY_MAX);
-		arr[RSE::ARRAY_VERTEX] = col_debug;
-		arr[RSE::ARRAY_COLOR] = colors;
+		arr.resize(RS::ARRAY_MAX);
+		arr[RS::ARRAY_VERTEX] = col_debug;
+		arr[RS::ARRAY_COLOR] = colors;
 
-		RS::get_singleton()->mesh_add_surface_from_arrays(g.collision_debug, RSE::PRIMITIVE_LINES, arr);
+		RS::get_singleton()->mesh_add_surface_from_arrays(g.collision_debug, RS::PRIMITIVE_LINES, arr);
 		if (st) {
 			RS::get_singleton()->mesh_surface_set_material(g.collision_debug, 0, st->get_debug_collision_material()->get_rid());
 		}
@@ -1140,7 +1114,7 @@ void GridMap::_queue_octants_dirty() {
 
 void GridMap::_recreate_octant_data() {
 	recreating_octants = true;
-	HashMap<IndexKey, Cell, IndexKey> cell_copy(cell_map);
+	HashMap<IndexKey, Cell, IndexKey> cell_copy = cell_map;
 	_clear_internal();
 	for (const KeyValue<IndexKey, Cell> &E : cell_copy) {
 		set_cell_item(Vector3i(E.key), E.value.item, E.value.rot);
@@ -1213,9 +1187,6 @@ void GridMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_collision_priority", "priority"), &GridMap::set_collision_priority);
 	ClassDB::bind_method(D_METHOD("get_collision_priority"), &GridMap::get_collision_priority);
 
-	ClassDB::bind_method(D_METHOD("set_collision_visibility_mode", "visibility_mode"), &GridMap::set_collision_visibility_mode);
-	ClassDB::bind_method(D_METHOD("get_collision_visibility_mode"), &GridMap::get_collision_visibility_mode);
-
 	ClassDB::bind_method(D_METHOD("set_physics_material", "material"), &GridMap::set_physics_material);
 	ClassDB::bind_method(D_METHOD("get_physics_material"), &GridMap::get_physics_material);
 #endif // PHYSICS_3D_DISABLED
@@ -1273,9 +1244,9 @@ void GridMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear_baked_meshes"), &GridMap::clear_baked_meshes);
 	ClassDB::bind_method(D_METHOD("make_baked_meshes", "gen_lightmap_uv", "lightmap_uv_texel_size"), &GridMap::make_baked_meshes, DEFVAL(false), DEFVAL(0.1));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh_library", PROPERTY_HINT_RESOURCE_TYPE, MeshLibrary::get_class_static()), "set_mesh_library", "get_mesh_library");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh_library", PROPERTY_HINT_RESOURCE_TYPE, "MeshLibrary"), "set_mesh_library", "get_mesh_library");
 #ifndef PHYSICS_3D_DISABLED
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), "set_physics_material", "get_physics_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material", "get_physics_material");
 #endif // PHYSICS_3D_DISABLED
 	ADD_GROUP("Cell", "cell_");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "cell_size", PROPERTY_HINT_NONE, "suffix:m"), "set_cell_size", "get_cell_size");
@@ -1289,7 +1260,6 @@ void GridMap::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_layer", "get_collision_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_priority"), "set_collision_priority", "get_collision_priority");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_collision_visibility_mode", "get_collision_visibility_mode");
 #endif // PHYSICS_3D_DISABLED
 	ADD_GROUP("Navigation", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bake_navigation"), "set_bake_navigation", "is_baking_navigation");
@@ -1298,10 +1268,6 @@ void GridMap::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("cell_size_changed", PropertyInfo(Variant::VECTOR3, "cell_size")));
 	ADD_SIGNAL(MethodInfo(CoreStringName(changed)));
-
-	BIND_ENUM_CONSTANT(DEBUG_VISIBILITY_MODE_DEFAULT);
-	BIND_ENUM_CONSTANT(DEBUG_VISIBILITY_MODE_FORCE_SHOW);
-	BIND_ENUM_CONSTANT(DEBUG_VISIBILITY_MODE_FORCE_HIDE);
 }
 
 void GridMap::set_cell_scale(float p_scale) {
@@ -1543,14 +1509,14 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 				case PhysicsServer3D::SHAPE_SPHERE: {
 					real_t radius = data;
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					SphereMesh::create_mesh_array(arr, radius, radius * 2.0);
 					p_source_geometry_data->add_mesh_array(arr, shapes[i]);
 				} break;
 				case PhysicsServer3D::SHAPE_BOX: {
 					Vector3 extents = data;
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					BoxMesh::create_mesh_array(arr, extents * 2.0);
 					p_source_geometry_data->add_mesh_array(arr, shapes[i]);
 				} break;
@@ -1559,7 +1525,7 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 					real_t radius = dict["radius"];
 					real_t height = dict["height"];
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					CapsuleMesh::create_mesh_array(arr, radius, height);
 					p_source_geometry_data->add_mesh_array(arr, shapes[i]);
 				} break;
@@ -1568,7 +1534,7 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 					real_t radius = dict["radius"];
 					real_t height = dict["height"];
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					CylinderMesh::create_mesh_array(arr, radius, radius, height);
 					p_source_geometry_data->add_mesh_array(arr, shapes[i]);
 				} break;
diff --git a/engine/modules/gridmap/grid_map.h b/engine/modules/gridmap/grid_map.h
index d4f022c2..fdbef70c 100644
--- a/engine/modules/gridmap/grid_map.h
+++ b/engine/modules/gridmap/grid_map.h
@@ -32,6 +32,7 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/mesh_library.h"
+#include "scene/resources/multimesh.h"
 
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
@@ -42,12 +43,6 @@ class PhysicsMaterial;
 class GridMap : public Node3D {
 	GDCLASS(GridMap, Node3D);
 
-	enum DebugVisibilityMode {
-		DEBUG_VISIBILITY_MODE_DEFAULT,
-		DEBUG_VISIBILITY_MODE_FORCE_SHOW,
-		DEBUG_VISIBILITY_MODE_FORCE_HIDE,
-	};
-
 	enum {
 		MAP_DIRTY_TRANSFORMS = 1,
 		MAP_DIRTY_INSTANCES = 2,
@@ -163,7 +158,6 @@ class GridMap : public Node3D {
 	uint32_t collision_layer = 1;
 	uint32_t collision_mask = 1;
 	real_t collision_priority = 1.0;
-	DebugVisibilityMode collision_visibility_mode = DEBUG_VISIBILITY_MODE_DEFAULT;
 	Ref<PhysicsMaterial> physics_material;
 #endif // PHYSICS_3D_DISABLED
 	bool bake_navigation = false;
@@ -189,10 +183,10 @@ class GridMap : public Node3D {
 	void _recreate_octant_data();
 
 	struct BakeLight {
-		RSE::LightType type = RSE::LightType::LIGHT_DIRECTIONAL;
+		RS::LightType type = RS::LightType::LIGHT_DIRECTIONAL;
 		Vector3 pos;
 		Vector3 dir;
-		float param[RSE::LIGHT_PARAM_MAX] = {};
+		float param[RS::LIGHT_PARAM_MAX] = {};
 	};
 
 	_FORCE_INLINE_ Vector3 _octant_get_offset(const OctantKey &p_key) const {
@@ -263,9 +257,6 @@ public:
 	void set_collision_priority(real_t p_priority);
 	real_t get_collision_priority() const;
 
-	void set_collision_visibility_mode(DebugVisibilityMode p_visibility_mode);
-	DebugVisibilityMode get_collision_visibility_mode() const;
-
 	void set_physics_material(Ref<PhysicsMaterial> p_material);
 	Ref<PhysicsMaterial> get_physics_material() const;
 
@@ -337,5 +328,3 @@ public:
 	GridMap();
 	~GridMap();
 };
-
-VARIANT_ENUM_CAST(GridMap::DebugVisibilityMode);
diff --git a/engine/modules/gridmap/icons/GridMapDock.svg b/engine/modules/gridmap/icons/GridMapDock.svg
deleted file mode 100644
index 7aeea66c..00000000
--- a/engine/modules/gridmap/icons/GridMapDock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1-6 3v8l6 3 6-3v-2l-2-1-4 2-2-1v-4l2-1v-2l2-1zm4 2-2 1v2l2 1 2-1v-2z"/></svg>
diff --git a/engine/modules/gridmap/register_types.cpp b/engine/modules/gridmap/register_types.cpp
index a68fcace..c98086aa 100644
--- a/engine/modules/gridmap/register_types.cpp
+++ b/engine/modules/gridmap/register_types.cpp
@@ -49,7 +49,7 @@ void initialize_gridmap_module(ModuleInitializationLevel p_level) {
 	}
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
-		GDREGISTER_VIRTUAL_CLASS(GridMapEditorPlugin);
+		GDREGISTER_CLASS(GridMapEditorPlugin);
 		EditorPlugins::add_by_type<GridMapEditorPlugin>();
 	}
 #endif
diff --git a/engine/modules/interactive_music/audio_stream_interactive.cpp b/engine/modules/interactive_music/audio_stream_interactive.cpp
index 71192681..78283339 100644
--- a/engine/modules/interactive_music/audio_stream_interactive.cpp
+++ b/engine/modules/interactive_music/audio_stream_interactive.cpp
@@ -30,9 +30,7 @@
 
 #include "audio_stream_interactive.h"
 
-#include "core/config/engine.h"
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 
 AudioStreamInteractive::AudioStreamInteractive() {
 }
@@ -439,7 +437,7 @@ void AudioStreamInteractive::_validate_property(PropertyInfo &r_property) const
 			r_property.usage = PROPERTY_USAGE_INTERNAL;
 		} else if (prop == "clip_" + itos(clip) + "/next_clip") {
 			if (clips[clip].auto_advance != AUTO_ADVANCE_ENABLED) {
-				r_property.usage = PROPERTY_USAGE_NONE;
+				r_property.usage = 0;
 			} else if (Engine::get_singleton()->is_editor_hint()) {
 #ifdef TOOLS_ENABLED
 				r_property.hint_string = _get_streams_hint();
@@ -487,7 +485,7 @@ void AudioStreamInteractive::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "clip_count", PROPERTY_HINT_RANGE, "1," + itos(MAX_CLIPS), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ARRAY, "Clips,clip_,page_size=999,unfoldable,numbered,swap_method=_inspector_array_swap_clip,add_button_text=" + String(TTRC("Add Clip"))), "set_clip_count", "get_clip_count");
 	for (int i = 0; i < MAX_CLIPS; i++) {
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING_NAME, "clip_" + itos(i) + "/name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_clip_name", "get_clip_name", i);
-		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "clip_" + itos(i) + "/stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_clip_stream", "get_clip_stream", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "clip_" + itos(i) + "/stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_clip_stream", "get_clip_stream", i);
 		ADD_PROPERTYI(PropertyInfo(Variant::INT, "clip_" + itos(i) + "/auto_advance", PROPERTY_HINT_ENUM, "Disabled,Enabled,ReturnToHold", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_clip_auto_advance", "get_clip_auto_advance", i);
 		ADD_PROPERTYI(PropertyInfo(Variant::INT, "clip_" + itos(i) + "/next_clip", PROPERTY_HINT_ENUM, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_clip_auto_advance_next_clip", "get_clip_auto_advance_next_clip", i);
 	}
diff --git a/engine/modules/interactive_music/audio_stream_playlist.cpp b/engine/modules/interactive_music/audio_stream_playlist.cpp
index 02e3a3d9..276efecf 100644
--- a/engine/modules/interactive_music/audio_stream_playlist.cpp
+++ b/engine/modules/interactive_music/audio_stream_playlist.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream_playlist.h"
 
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 
 Ref<AudioStreamPlayback> AudioStreamPlaylist::instantiate_playback() {
 	Ref<AudioStreamPlaybackPlaylist> playback_playlist;
@@ -129,8 +128,9 @@ bool AudioStreamPlaylist::has_loop() const {
 }
 
 void AudioStreamPlaylist::_validate_property(PropertyInfo &r_property) const {
-	if (r_property.name != "stream_count" && r_property.name.begins_with("stream_")) {
-		int stream = r_property.name.get_slicec('/', 0).get_slicec('_', 1).to_int();
+	String prop = r_property.name;
+	if (prop != "stream_count" && prop.begins_with("stream_")) {
+		int stream = prop.get_slicec('/', 0).get_slicec('_', 1).to_int();
 		if (stream >= stream_count) {
 			r_property.usage = PROPERTY_USAGE_INTERNAL;
 		}
@@ -162,7 +162,7 @@ void AudioStreamPlaylist::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "stream_count", PROPERTY_HINT_RANGE, "0," + itos(MAX_STREAMS), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ARRAY, "Streams,stream_,unfoldable,page_size=999,add_button_text=" + String(TTRC("Add Stream"))), "set_stream_count", "get_stream_count");
 
 	for (int i = 0; i < MAX_STREAMS; i++) {
-		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "stream_" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_list_stream", "get_list_stream", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "stream_" + itos(i), PROPERTY_HINT_RESOURCE_TYPE, "AudioStream", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_list_stream", "get_list_stream", i);
 	}
 
 	BIND_CONSTANT(MAX_STREAMS);
diff --git a/engine/modules/interactive_music/audio_stream_synchronized.cpp b/engine/modules/interactive_music/audio_stream_synchronized.cpp
index e3c7d14a..d486f0a3 100644
--- a/engine/modules/interactive_music/audio_stream_synchronized.cpp
+++ b/engine/modules/interactive_music/audio_stream_synchronized.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream_synchronized.h"
 
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 
 AudioStreamSynchronized::AudioStreamSynchronized() {
 }
@@ -166,7 +165,7 @@ void AudioStreamSynchronized::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "stream_count", PROPERTY_HINT_RANGE, "0," + itos(MAX_STREAMS), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ARRAY, "Streams,stream_,unfoldable,page_size=999,add_button_text=" + String(TTRC("Add Stream"))), "set_stream_count", "get_stream_count");
 
 	for (int i = 0; i < MAX_STREAMS; i++) {
-		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "stream_" + itos(i) + "/stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_sync_stream", "get_sync_stream", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "stream_" + itos(i) + "/stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_sync_stream", "get_sync_stream", i);
 		ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "stream_" + itos(i) + "/volume", PROPERTY_HINT_RANGE, "-60,12,0.01,suffix:db", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_sync_stream_volume", "get_sync_stream_volume", i);
 	}
 
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamInteractive.xml b/engine/modules/interactive_music/doc_classes/AudioStreamInteractive.xml
index 7200098d..d47d6ecd 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamInteractive.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamInteractive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamInteractive" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamInteractive" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Audio stream that can playback music interactively, combining clips and a transition table.
 	</brief_description>
@@ -8,7 +8,6 @@
 		The way this is used is by filling a number of clips, then configuring the transition table. From there, clips are selected for playback and the music will smoothly go from the current to the new one while using the corresponding transition rule defined in the transition table.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_transition">
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackInteractive.xml b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackInteractive.xml
index 1746cd68..86b608b0 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackInteractive.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackInteractive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackInteractive" inherits="AudioStreamPlayback" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamPlaybackInteractive" inherits="AudioStreamPlayback" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Playback component of [AudioStreamInteractive].
 	</brief_description>
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackPlaylist.xml b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackPlaylist.xml
index b80c7f90..25535630 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackPlaylist.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackPlaylist.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackPlaylist" inherits="AudioStreamPlayback" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamPlaybackPlaylist" inherits="AudioStreamPlayback" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Playback class used for [AudioStreamPlaylist].
 	</brief_description>
 	<description>
-		Playback component of [AudioStreamPlaylist]. Handles the playback of multiple [AudioStream]s in sequence.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackSynchronized.xml b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackSynchronized.xml
index 9ebd1e2f..adaae0fe 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackSynchronized.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamPlaybackSynchronized.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackSynchronized" inherits="AudioStreamPlayback" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamPlaybackSynchronized" inherits="AudioStreamPlayback" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
-		Playback class used for [AudioStreamSynchronized].
 	</brief_description>
 	<description>
-		Playback component of [AudioStreamSynchronized]. Handles the playback of multiple [AudioStream]s in synchrony.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamPlaylist.xml b/engine/modules/interactive_music/doc_classes/AudioStreamPlaylist.xml
index 52d6dbc1..eb7e1806 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamPlaylist.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamPlaylist.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaylist" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamPlaylist" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		[AudioStream] that includes sub-streams and plays them back like a playlist.
 	</brief_description>
 	<description>
-		An audio stream that can play back sub-streams in sequence. Streams can be added to the Playlist with [method set_list_stream], and shuffled with [member shuffle].
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_bpm" qualifiers="const">
diff --git a/engine/modules/interactive_music/doc_classes/AudioStreamSynchronized.xml b/engine/modules/interactive_music/doc_classes/AudioStreamSynchronized.xml
index 630ccfa1..e554eaeb 100644
--- a/engine/modules/interactive_music/doc_classes/AudioStreamSynchronized.xml
+++ b/engine/modules/interactive_music/doc_classes/AudioStreamSynchronized.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamSynchronized" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamSynchronized" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Stream that can be fitted with sub-streams, which will be played in-sync.
 	</brief_description>
@@ -7,7 +7,6 @@
 		This is a stream that can be fitted with sub-streams, which will be played in-sync. The streams begin at exactly the same time when play is pressed, and will end when the last of them ends. If one of the sub-streams loops, then playback will continue.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_sync_stream" qualifiers="const">
diff --git a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
index b0c9ff94..2a24364a 100644
--- a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
+++ b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
@@ -31,10 +31,6 @@
 #include "audio_stream_interactive_editor_plugin.h"
 
 #include "../audio_stream_interactive.h"
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -44,7 +40,6 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
-#include "scene/resources/style_box_flat.h"
 
 void AudioStreamInteractiveTransitionEditor::_notification(int p_what) {
 	if (p_what == NOTIFICATION_READY || p_what == NOTIFICATION_THEME_CHANGED) {
@@ -275,8 +270,7 @@ void AudioStreamInteractiveTransitionEditor::edit(Object *p_obj) {
 	filler_clip->clear();
 	filler_clip->add_item(TTR("Disabled"), -1);
 
-	const Ref<StyleBoxFlat> &sb_title = tree->get_theme_stylebox(SNAME("title_button_normal"), SNAME("Tree"));
-	const Color header_color = sb_title.is_valid() ? sb_title->get_bg_color() : Color(0, 0, 0, 0);
+	Color header_color = get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor));
 
 	int max_w = 0;
 
@@ -335,11 +329,9 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
 	tree = memnew(Tree);
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	tree->set_hide_root(true);
-	tree->set_hide_folding(true);
 	tree->add_theme_constant_override("draw_guides", 1);
 	tree->set_select_mode(Tree::SELECT_MULTI);
 	tree->set_custom_minimum_size(Size2(400, 0) * EDSCALE);
-	tree->set_theme_type_variation("TreeSecondary");
 	split->add_child(tree);
 
 	tree->set_h_size_flags(Control::SIZE_EXPAND_FILL);
diff --git a/engine/modules/interactive_music/register_types.cpp b/engine/modules/interactive_music/register_types.cpp
index 91dbd2fb..6175ea64 100644
--- a/engine/modules/interactive_music/register_types.cpp
+++ b/engine/modules/interactive_music/register_types.cpp
@@ -33,7 +33,6 @@
 #include "audio_stream_interactive.h"
 #include "audio_stream_playlist.h"
 #include "audio_stream_synchronized.h"
-
 #include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.cpp
index 584cb5c7..b7504a9d 100644
--- a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.cpp
@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include <Jolt/Physics/Constraints/SwingTwistConstraint.h>
+#include "Jolt/Physics/Constraints/SwingTwistConstraint.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
index df25f5f1..e7b9cec3 100644
--- a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
+#include "Jolt/Physics/Body/Body.h"
 
 class JoltConeTwistJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::ConeTwistJointParam Parameter;
diff --git a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.cpp
index 765e054c..70ede596 100644
--- a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.cpp
@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include <Jolt/Physics/Constraints/SixDOFConstraint.h>
+#include "Jolt/Physics/Constraints/SixDOFConstraint.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
index 56e61196..5ae94910 100644
--- a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Constraints/SixDOFConstraint.h>
+#include "Jolt/Physics/Constraints/SixDOFConstraint.h"
 
 class JoltGeneric6DOFJoint3D final : public JoltJoint3D {
 	typedef Vector3::Axis Axis;
diff --git a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.cpp
index 2e7d4fd5..49689731 100644
--- a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.cpp
@@ -36,8 +36,8 @@
 
 #include "core/config/engine.h"
 
-#include <Jolt/Physics/Constraints/FixedConstraint.h>
-#include <Jolt/Physics/Constraints/HingeConstraint.h>
+#include "Jolt/Physics/Constraints/FixedConstraint.h"
+#include "Jolt/Physics/Constraints/HingeConstraint.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
index cb8635bc..8344c830 100644
--- a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Constraints/SliderConstraint.h>
+#include "Jolt/Physics/Constraints/SliderConstraint.h"
 
 class JoltHingeJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::HingeJointParam Parameter;
diff --git a/engine/modules/jolt_physics/joints/jolt_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_joint_3d.h
index 78c0dbbf..859d906f 100644
--- a/engine/modules/jolt_physics/joints/jolt_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_joint_3d.h
@@ -32,9 +32,9 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Constraints/Constraint.h>
+#include "Jolt/Physics/Constraints/Constraint.h"
 
 class JoltBody3D;
 class JoltSpace3D;
diff --git a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.cpp
index 470f33b8..0d76dc32 100644
--- a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.cpp
@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include <Jolt/Physics/Constraints/PointConstraint.h>
+#include "Jolt/Physics/Constraints/PointConstraint.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
index d81957fc..a6b3743f 100644
--- a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
@@ -32,9 +32,9 @@
 
 #include "jolt_joint_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Constraints/SliderConstraint.h>
+#include "Jolt/Physics/Constraints/SliderConstraint.h"
 
 class JoltPinJoint3D final : public JoltJoint3D {
 	static JPH::Constraint *_build_pin(JPH::Body *p_jolt_body_a, JPH::Body *p_jolt_body_b, const Transform3D &p_shifted_ref_a, const Transform3D &p_shifted_ref_b);
diff --git a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.cpp
index 3ca1ac29..004c3e85 100644
--- a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.cpp
@@ -34,8 +34,8 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include <Jolt/Physics/Constraints/FixedConstraint.h>
-#include <Jolt/Physics/Constraints/SliderConstraint.h>
+#include "Jolt/Physics/Constraints/FixedConstraint.h"
+#include "Jolt/Physics/Constraints/SliderConstraint.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
index 43e76f37..8f82afbe 100644
--- a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Constraints/SliderConstraint.h>
+#include "Jolt/Physics/Constraints/SliderConstraint.h"
 
 class JoltSliderJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::SliderJointParam Parameter;
diff --git a/engine/modules/jolt_physics/jolt_globals.cpp b/engine/modules/jolt_physics/jolt_globals.cpp
index 76dcf17b..9b419ca6 100644
--- a/engine/modules/jolt_physics/jolt_globals.cpp
+++ b/engine/modules/jolt_physics/jolt_globals.cpp
@@ -35,15 +35,12 @@
 #include "shapes/jolt_custom_ray_shape.h"
 #include "shapes/jolt_custom_user_data_shape.h"
 
-#include "core/os/memory.h"
-
-#ifdef JPH_ENABLE_ASSERTS
+#include "core/string/print_string.h"
 #include "core/variant/variant.h"
-#endif
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/RegisterTypes.h>
+#include "Jolt/RegisterTypes.h"
 
 #include <cstdarg>
 
diff --git a/engine/modules/jolt_physics/jolt_physics_server_3d.cpp b/engine/modules/jolt_physics/jolt_physics_server_3d.cpp
index 3b68594b..cfb1f3b6 100644
--- a/engine/modules/jolt_physics/jolt_physics_server_3d.cpp
+++ b/engine/modules/jolt_physics/jolt_physics_server_3d.cpp
@@ -39,6 +39,7 @@
 #include "objects/jolt_area_3d.h"
 #include "objects/jolt_body_3d.h"
 #include "objects/jolt_soft_body_3d.h"
+#include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 #include "shapes/jolt_box_shape_3d.h"
 #include "shapes/jolt_capsule_shape_3d.h"
 #include "shapes/jolt_concave_polygon_shape_3d.h"
@@ -51,7 +52,6 @@
 #include "spaces/jolt_job_system.h"
 #include "spaces/jolt_physics_direct_space_state_3d.h"
 #include "spaces/jolt_space_3d.h"
-#include "spaces/jolt_temp_allocator.h"
 
 JoltPhysicsServer3D::JoltPhysicsServer3D(bool p_on_separate_thread) :
 		on_separate_thread(p_on_separate_thread) {
@@ -181,7 +181,7 @@ real_t JoltPhysicsServer3D::shape_get_custom_solver_bias(RID p_shape) const {
 }
 
 RID JoltPhysicsServer3D::space_create() {
-	JoltSpace3D *space = memnew(JoltSpace3D(job_system, temp_allocator));
+	JoltSpace3D *space = memnew(JoltSpace3D(job_system));
 	RID rid = space_owner.make_rid(space);
 	space->set_rid(rid);
 
@@ -1605,15 +1605,9 @@ void JoltPhysicsServer3D::set_active(bool p_active) {
 
 void JoltPhysicsServer3D::init() {
 	job_system = new JoltJobSystem();
-	temp_allocator = new JoltTempAllocator();
 }
 
 void JoltPhysicsServer3D::finish() {
-	if (temp_allocator != nullptr) {
-		delete temp_allocator;
-		temp_allocator = nullptr;
-	}
-
 	if (job_system != nullptr) {
 		delete job_system;
 		job_system = nullptr;
diff --git a/engine/modules/jolt_physics/jolt_physics_server_3d.h b/engine/modules/jolt_physics/jolt_physics_server_3d.h
index a8db19b8..f29d97a9 100644
--- a/engine/modules/jolt_physics/jolt_physics_server_3d.h
+++ b/engine/modules/jolt_physics/jolt_physics_server_3d.h
@@ -40,7 +40,6 @@ class JoltJoint3D;
 class JoltShape3D;
 class JoltSoftBody3D;
 class JoltSpace3D;
-class JoltTempAllocator;
 
 class JoltPhysicsServer3D final : public PhysicsServer3D {
 	GDCLASS(JoltPhysicsServer3D, PhysicsServer3D)
@@ -57,7 +56,6 @@ class JoltPhysicsServer3D final : public PhysicsServer3D {
 	HashSet<JoltSpace3D *> active_spaces;
 
 	JoltJobSystem *job_system = nullptr;
-	JoltTempAllocator *temp_allocator = nullptr;
 
 	bool on_separate_thread = false;
 	bool active = true;
diff --git a/engine/modules/jolt_physics/jolt_project_settings.cpp b/engine/modules/jolt_physics/jolt_project_settings.cpp
index 43d66422..5d58a5fd 100644
--- a/engine/modules/jolt_physics/jolt_project_settings.cpp
+++ b/engine/modules/jolt_physics/jolt_project_settings.cpp
@@ -31,7 +31,7 @@
 #include "jolt_project_settings.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
+#include "core/object/callable_method_pointer.h"
 
 void JoltProjectSettings::register_settings() {
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/simulation/velocity_steps", PROPERTY_HINT_RANGE, U"2,16,or_greater"), 10);
diff --git a/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h b/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
index 7a19255c..269f1f59 100644
--- a/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
+++ b/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
@@ -34,10 +34,10 @@
 
 #include "core/io/file_access.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Core/StreamIn.h>
-#include <Jolt/Core/StreamOut.h>
+#include "Jolt/Core/StreamIn.h"
+#include "Jolt/Core/StreamOut.h"
 
 class JoltStreamOutputWrapper final : public JPH::StreamOut {
 	Ref<FileAccess> file_access;
diff --git a/engine/modules/jolt_physics/misc/jolt_type_conversions.h b/engine/modules/jolt_physics/misc/jolt_type_conversions.h
index 52bf9a73..19abfe86 100644
--- a/engine/modules/jolt_physics/misc/jolt_type_conversions.h
+++ b/engine/modules/jolt_physics/misc/jolt_type_conversions.h
@@ -37,14 +37,14 @@
 #include "core/math/transform_3d.h"
 #include "core/string/ustring.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Core/Color.h>
-#include <Jolt/Geometry/AABox.h>
-#include <Jolt/Geometry/Plane.h>
-#include <Jolt/Math/Mat44.h>
-#include <Jolt/Math/Quat.h>
-#include <Jolt/Math/Vec3.h>
+#include "Jolt/Core/Color.h"
+#include "Jolt/Geometry/AABox.h"
+#include "Jolt/Geometry/Plane.h"
+#include "Jolt/Math/Mat44.h"
+#include "Jolt/Math/Quat.h"
+#include "Jolt/Math/Vec3.h"
 
 _FORCE_INLINE_ Vector3 to_godot(const JPH::Vec3 &p_vec) {
 	return Vector3((real_t)p_vec.GetX(), (real_t)p_vec.GetY(), (real_t)p_vec.GetZ());
diff --git a/engine/modules/jolt_physics/objects/jolt_area_3d.cpp b/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
index 75c46231..674c151f 100644
--- a/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "jolt_area_3d.h"
 
+#include "../jolt_project_settings.h"
 #include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../shapes/jolt_shape_3d.h"
@@ -39,6 +40,16 @@
 #include "jolt_group_filter.h"
 #include "jolt_soft_body_3d.h"
 
+namespace {
+
+constexpr double AREA_DEFAULT_WIND_MAGNITUDE = 0.0;
+constexpr double AREA_DEFAULT_WIND_ATTENUATION = 0.0;
+
+const Vector3 AREA_DEFAULT_WIND_SOURCE = Vector3();
+const Vector3 AREA_DEFAULT_WIND_DIRECTION = Vector3();
+
+} // namespace
+
 JPH::BroadPhaseLayer JoltArea3D::_get_broad_phase_layer() const {
 	return monitorable ? JoltBroadPhaseLayer::AREA_DETECTABLE : JoltBroadPhaseLayer::AREA_UNDETECTABLE;
 }
@@ -98,7 +109,7 @@ void JoltArea3D::_dequeue_call_queries() {
 }
 
 void JoltArea3D::_add_shape_pair(Overlap &p_overlap, const JPH::BodyID &p_body_id, const JPH::SubShapeID &p_other_shape_id, const JPH::SubShapeID &p_self_shape_id) {
-	const JoltObject3D *other_object = space->try_get_object(p_body_id);
+	const JoltShapedObject3D *other_object = space->try_get_shaped(p_body_id);
 	ERR_FAIL_NULL(other_object);
 
 	p_overlap.rid = other_object->get_rid();
@@ -106,12 +117,8 @@ void JoltArea3D::_add_shape_pair(Overlap &p_overlap, const JPH::BodyID &p_body_i
 
 	HashMap<ShapeIDPair, ShapeIndexPair, ShapeIDPair>::Iterator shape_pair = p_overlap.shape_pairs.find(ShapeIDPair(p_other_shape_id, p_self_shape_id));
 	if (shape_pair == p_overlap.shape_pairs.end()) {
-		int other_shape_index = 0;
-		int self_shape_index = find_shape_index(p_self_shape_id);
-		if (const JoltShapedObject3D *other_shaped = other_object->as_shaped()) {
-			other_shape_index = other_shaped->find_shape_index(p_other_shape_id);
-		}
-
+		const int other_shape_index = other_object->find_shape_index(p_other_shape_id);
+		const int self_shape_index = find_shape_index(p_self_shape_id);
 		shape_pair = p_overlap.shape_pairs.insert(ShapeIDPair(p_other_shape_id, p_self_shape_id), ShapeIndexPair(other_shape_index, self_shape_index));
 	}
 
@@ -122,6 +129,7 @@ void JoltArea3D::_add_shape_pair(Overlap &p_overlap, const JPH::BodyID &p_body_i
 
 bool JoltArea3D::_remove_shape_pair(Overlap &p_overlap, const JPH::SubShapeID &p_other_shape_id, const JPH::SubShapeID &p_self_shape_id) {
 	HashMap<ShapeIDPair, ShapeIndexPair, ShapeIDPair>::Iterator shape_pair = p_overlap.shape_pairs.find(ShapeIDPair(p_other_shape_id, p_self_shape_id));
+
 	if (shape_pair == p_overlap.shape_pairs.end()) {
 		return false;
 	}
@@ -190,18 +198,14 @@ void JoltArea3D::_report_event(const Callable &p_callback, PhysicsServer3D::Area
 }
 
 void JoltArea3D::_notify_body_entered(const JPH::BodyID &p_body_id) {
-	if (JoltBody3D *body = space->try_get_body(p_body_id)) {
-		body->add_area(this);
-	} else if (JoltSoftBody3D *soft_body = space->try_get_soft_body(p_body_id)) {
-		soft_body->add_area(this);
+	if (JoltBody3D *other_body = space->try_get_body(p_body_id)) {
+		other_body->add_area(this);
 	}
 }
 
 void JoltArea3D::_notify_body_exited(const JPH::BodyID &p_body_id) {
-	if (JoltBody3D *body = space->try_get_body(p_body_id)) {
-		body->remove_area(this);
-	} else if (JoltSoftBody3D *soft_body = space->try_get_soft_body(p_body_id)) {
-		soft_body->remove_area(this);
+	if (JoltBody3D *other_body = space->try_get_body(p_body_id)) {
+		other_body->remove_area(this);
 	}
 }
 
@@ -230,6 +234,12 @@ void JoltArea3D::_update_group_filter() {
 	jolt_body->GetCollisionGroup().SetGroupFilter(JoltGroupFilter::instance);
 }
 
+void JoltArea3D::_update_default_gravity() {
+	if (is_default_area()) {
+		space->get_physics_system().SetGravity(to_jolt(gravity_vector) * gravity);
+	}
+}
+
 void JoltArea3D::_space_changing() {
 	JoltShapedObject3D::_space_changing();
 
@@ -241,6 +251,7 @@ void JoltArea3D::_space_changed() {
 	JoltShapedObject3D::_space_changed();
 
 	_update_group_filter();
+	_update_default_gravity();
 }
 
 void JoltArea3D::_events_changed() {
@@ -259,11 +270,25 @@ void JoltArea3D::_monitorable_changed() {
 	_update_object_layer();
 }
 
+void JoltArea3D::_gravity_changed() {
+	_update_default_gravity();
+}
+
 JoltArea3D::JoltArea3D() :
 		JoltShapedObject3D(OBJECT_TYPE_AREA),
 		call_queries_element(this) {
 }
 
+bool JoltArea3D::is_default_area() const {
+	return space != nullptr && space->get_default_area() == this;
+}
+
+void JoltArea3D::set_default_area(bool p_value) {
+	if (p_value) {
+		_update_default_gravity();
+	}
+}
+
 void JoltArea3D::set_transform(Transform3D p_transform) {
 	JOLT_ENSURE_SCALE_NOT_ZERO(p_transform, vformat("An invalid transform was passed to area '%s'.", to_string()));
 
@@ -317,17 +342,16 @@ Variant JoltArea3D::get_param(PhysicsServer3D::AreaParameter p_param) const {
 			return get_priority();
 		}
 		case PhysicsServer3D::AREA_PARAM_WIND_FORCE_MAGNITUDE: {
-			// This parameter is named incorrectly. It's actually a pressure.
-			return get_wind_pressure();
+			return AREA_DEFAULT_WIND_MAGNITUDE;
 		}
 		case PhysicsServer3D::AREA_PARAM_WIND_SOURCE: {
-			return get_wind_source();
+			return AREA_DEFAULT_WIND_SOURCE;
 		}
 		case PhysicsServer3D::AREA_PARAM_WIND_DIRECTION: {
-			return get_wind_direction();
+			return AREA_DEFAULT_WIND_DIRECTION;
 		}
 		case PhysicsServer3D::AREA_PARAM_WIND_ATTENUATION_FACTOR: {
-			return get_wind_attenuation_factor();
+			return AREA_DEFAULT_WIND_ATTENUATION;
 		}
 		default: {
 			ERR_FAIL_V_MSG(Variant(), vformat("Unhandled area parameter: '%d'. This should not happen. Please report this.", p_param));
@@ -368,17 +392,24 @@ void JoltArea3D::set_param(PhysicsServer3D::AreaParameter p_param, const Variant
 			set_priority(p_value);
 		} break;
 		case PhysicsServer3D::AREA_PARAM_WIND_FORCE_MAGNITUDE: {
-			// This parameter is named incorrectly. It's actually a pressure.
-			set_wind_pressure(p_value);
+			if (!Math::is_equal_approx((double)p_value, AREA_DEFAULT_WIND_MAGNITUDE)) {
+				WARN_PRINT(vformat("Invalid wind force magnitude for '%s'. Area wind force magnitude is not supported when using Jolt Physics. Any such value will be ignored.", to_string()));
+			}
 		} break;
 		case PhysicsServer3D::AREA_PARAM_WIND_SOURCE: {
-			set_wind_source(p_value);
+			if (!((Vector3)p_value).is_equal_approx(AREA_DEFAULT_WIND_SOURCE)) {
+				WARN_PRINT(vformat("Invalid wind source for '%s'. Area wind source is not supported when using Jolt Physics. Any such value will be ignored.", to_string()));
+			}
 		} break;
 		case PhysicsServer3D::AREA_PARAM_WIND_DIRECTION: {
-			set_wind_direction(p_value);
+			if (!((Vector3)p_value).is_equal_approx(AREA_DEFAULT_WIND_DIRECTION)) {
+				WARN_PRINT(vformat("Invalid wind direction for '%s'. Area wind direction is not supported when using Jolt Physics. Any such value will be ignored.", to_string()));
+			}
 		} break;
 		case PhysicsServer3D::AREA_PARAM_WIND_ATTENUATION_FACTOR: {
-			set_wind_attenuation_factor(p_value);
+			if (!Math::is_equal_approx((double)p_value, AREA_DEFAULT_WIND_ATTENUATION)) {
+				WARN_PRINT(vformat("Invalid wind attenuation for '%s'. Area wind attenuation is not supported when using Jolt Physics. Any such value will be ignored.", to_string()));
+			}
 		} break;
 		default: {
 			ERR_FAIL_MSG(vformat("Unhandled area parameter: '%d'. This should not happen. Please report this.", p_param));
@@ -421,7 +452,7 @@ bool JoltArea3D::can_monitor(const JoltBody3D &p_other) const {
 }
 
 bool JoltArea3D::can_monitor(const JoltSoftBody3D &p_other) const {
-	return is_monitoring_bodies() && (collision_mask & p_other.get_collision_layer()) != 0;
+	return false;
 }
 
 bool JoltArea3D::can_monitor(const JoltArea3D &p_other) const {
@@ -433,13 +464,67 @@ bool JoltArea3D::can_interact_with(const JoltBody3D &p_other) const {
 }
 
 bool JoltArea3D::can_interact_with(const JoltSoftBody3D &p_other) const {
-	return can_monitor(p_other);
+	return false;
 }
 
 bool JoltArea3D::can_interact_with(const JoltArea3D &p_other) const {
 	return can_monitor(p_other) || p_other.can_monitor(*this);
 }
 
+Vector3 JoltArea3D::get_velocity_at_position(const Vector3 &p_position) const {
+	return Vector3();
+}
+
+void JoltArea3D::set_point_gravity(bool p_enabled) {
+	if (point_gravity == p_enabled) {
+		return;
+	}
+
+	point_gravity = p_enabled;
+
+	_gravity_changed();
+}
+
+void JoltArea3D::set_gravity(float p_gravity) {
+	if (gravity == p_gravity) {
+		return;
+	}
+
+	gravity = p_gravity;
+
+	_gravity_changed();
+}
+
+void JoltArea3D::set_point_gravity_distance(float p_distance) {
+	if (point_gravity_distance == p_distance) {
+		return;
+	}
+
+	point_gravity_distance = p_distance;
+
+	_gravity_changed();
+}
+
+void JoltArea3D::set_gravity_mode(OverrideMode p_mode) {
+	if (gravity_mode == p_mode) {
+		return;
+	}
+
+	gravity_mode = p_mode;
+
+	_gravity_changed();
+}
+
+void JoltArea3D::set_gravity_vector(const Vector3 &p_vector) {
+	if (gravity_vector == p_vector) {
+		return;
+	}
+
+	gravity_vector = p_vector;
+
+	_gravity_changed();
+}
+
 Vector3 JoltArea3D::compute_gravity(const Vector3 &p_position) const {
 	if (!point_gravity) {
 		return gravity_vector * gravity;
diff --git a/engine/modules/jolt_physics/objects/jolt_area_3d.h b/engine/modules/jolt_physics/objects/jolt_area_3d.h
index 569a7b8f..5fa74301 100644
--- a/engine/modules/jolt_physics/objects/jolt_area_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_area_3d.h
@@ -101,8 +101,6 @@ private:
 	OverlapsById areas_by_id;
 
 	Vector3 gravity_vector = Vector3(0, -1, 0);
-	Vector3 wind_source;
-	Vector3 wind_direction;
 
 	Callable body_monitor_callback;
 	Callable area_monitor_callback;
@@ -112,8 +110,6 @@ private:
 	float point_gravity_distance = 0.0f;
 	float linear_damp = 0.1f;
 	float angular_damp = 0.1f;
-	float wind_pressure = 0.0f;
-	float wind_attenuation_factor = 0.0f;
 
 	OverrideMode gravity_mode = PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED;
 	OverrideMode linear_damp_mode = PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED;
@@ -148,6 +144,7 @@ private:
 
 	void _update_sleeping();
 	void _update_group_filter();
+	void _update_default_gravity();
 
 	virtual void _space_changing() override;
 	virtual void _space_changed() override;
@@ -155,10 +152,14 @@ private:
 	void _body_monitoring_changed();
 	void _area_monitoring_changed();
 	void _monitorable_changed();
+	void _gravity_changed();
 
 public:
 	JoltArea3D();
 
+	bool is_default_area() const;
+	void set_default_area(bool p_value);
+
 	void set_transform(Transform3D p_transform);
 
 	Variant get_param(PhysicsServer3D::AreaParameter p_param) const;
@@ -185,21 +186,21 @@ public:
 	virtual bool can_interact_with(const JoltSoftBody3D &p_other) const override;
 	virtual bool can_interact_with(const JoltArea3D &p_other) const override;
 
-	virtual Vector3 get_velocity_at_position(const Vector3 &p_position) const override { return Vector3(); }
+	virtual Vector3 get_velocity_at_position(const Vector3 &p_position) const override;
 
 	virtual bool reports_contacts() const override { return false; }
 
 	bool is_point_gravity() const { return point_gravity; }
-	void set_point_gravity(bool p_enabled) { point_gravity = p_enabled; }
+	void set_point_gravity(bool p_enabled);
 
 	float get_priority() const { return priority; }
 	void set_priority(float p_priority) { priority = p_priority; }
 
 	float get_gravity() const { return gravity; }
-	void set_gravity(float p_gravity) { gravity = p_gravity; }
+	void set_gravity(float p_gravity);
 
 	float get_point_gravity_distance() const { return point_gravity_distance; }
-	void set_point_gravity_distance(float p_distance) { point_gravity_distance = p_distance; }
+	void set_point_gravity_distance(float p_distance);
 
 	float get_linear_damp() const { return linear_damp; }
 	void set_area_linear_damp(float p_damp) { linear_damp = p_damp; }
@@ -208,7 +209,7 @@ public:
 	void set_area_angular_damp(float p_damp) { angular_damp = p_damp; }
 
 	OverrideMode get_gravity_mode() const { return gravity_mode; }
-	void set_gravity_mode(OverrideMode p_mode) { gravity_mode = p_mode; }
+	void set_gravity_mode(OverrideMode p_mode);
 
 	OverrideMode get_linear_damp_mode() const { return linear_damp_mode; }
 	void set_linear_damp_mode(OverrideMode p_mode) { linear_damp_mode = p_mode; }
@@ -217,19 +218,7 @@ public:
 	void set_angular_damp_mode(OverrideMode p_mode) { angular_damp_mode = p_mode; }
 
 	Vector3 get_gravity_vector() const { return gravity_vector; }
-	void set_gravity_vector(const Vector3 &p_vector) { gravity_vector = p_vector; }
-
-	float get_wind_pressure() const { return wind_pressure; }
-	void set_wind_pressure(float p_wind_pressure) { wind_pressure = p_wind_pressure; }
-
-	float get_wind_attenuation_factor() const { return wind_attenuation_factor; }
-	void set_wind_attenuation_factor(float p_wind_attenuation_factor) { wind_attenuation_factor = p_wind_attenuation_factor; }
-
-	const Vector3 &get_wind_source() const { return wind_source; }
-	void set_wind_source(const Vector3 &p_wind_source) { wind_source = p_wind_source; }
-
-	const Vector3 &get_wind_direction() const { return wind_direction; }
-	void set_wind_direction(const Vector3 &p_wind_direction) { wind_direction = p_wind_direction; }
+	void set_gravity_vector(const Vector3 &p_vector);
 
 	Vector3 compute_gravity(const Vector3 &p_position) const;
 
@@ -247,37 +236,4 @@ public:
 
 	virtual bool has_custom_center_of_mass() const override { return false; }
 	virtual Vector3 get_center_of_mass_custom() const override { return Vector3(); }
-
-	// Incorporates the value provided by `p_getter` into `p_value` according to the override mode `p_mode`.
-	// Returns true if further calls to this function should stop (i.e. value has been replaced entirely).
-	template <typename TValue, typename TGetter>
-	static bool apply_override(TValue &p_value, PhysicsServer3D::AreaSpaceOverrideMode p_mode, TGetter &&p_getter);
 };
-
-template <typename TValue, typename TGetter>
-inline bool JoltArea3D::apply_override(TValue &p_value, PhysicsServer3D::AreaSpaceOverrideMode p_mode, TGetter &&p_getter) {
-	switch (p_mode) {
-		case PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED: {
-			return false;
-		}
-		case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE: {
-			p_value += p_getter();
-			return false;
-		}
-		case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE_REPLACE: {
-			p_value += p_getter();
-			return true;
-		}
-		case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE: {
-			p_value = p_getter();
-			return true;
-		}
-		case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE_COMBINE: {
-			p_value = p_getter();
-			return false;
-		}
-		default: {
-			ERR_FAIL_V_MSG(false, vformat("Unhandled override mode: '%d'. This should not happen. Please report this.", p_mode));
-		}
-	}
-}
diff --git a/engine/modules/jolt_physics/objects/jolt_body_3d.cpp b/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
index 85250c52..b4ec9aeb 100644
--- a/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
@@ -42,6 +42,38 @@
 #include "jolt_physics_direct_body_state_3d.h"
 #include "jolt_soft_body_3d.h"
 
+namespace {
+
+template <typename TValue, typename TGetter>
+bool integrate(TValue &p_value, PhysicsServer3D::AreaSpaceOverrideMode p_mode, TGetter &&p_getter) {
+	switch (p_mode) {
+		case PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED: {
+			return false;
+		}
+		case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE: {
+			p_value += p_getter();
+			return false;
+		}
+		case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE_REPLACE: {
+			p_value += p_getter();
+			return true;
+		}
+		case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE: {
+			p_value = p_getter();
+			return true;
+		}
+		case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE_COMBINE: {
+			p_value = p_getter();
+			return false;
+		}
+		default: {
+			ERR_FAIL_V_MSG(false, vformat("Unhandled override mode: '%d'. This should not happen. Please report this.", p_mode));
+		}
+	}
+}
+
+} // namespace
+
 JPH::BroadPhaseLayer JoltBody3D::_get_broad_phase_layer() const {
 	switch (mode) {
 		case PhysicsServer3D::BODY_MODE_STATIC: {
@@ -287,7 +319,7 @@ void JoltBody3D::_update_gravity(JPH::Body &p_jolt_body) {
 	bool gravity_done = false;
 
 	for (const JoltArea3D *area : areas) {
-		gravity_done = JoltArea3D::apply_override(gravity, area->get_gravity_mode(), [&]() {
+		gravity_done = integrate(gravity, area->get_gravity_mode(), [&]() {
 			return area->compute_gravity(position);
 		});
 
@@ -300,7 +332,7 @@ void JoltBody3D::_update_gravity(JPH::Body &p_jolt_body) {
 		gravity += space->get_default_area()->compute_gravity(position);
 	}
 
-	gravity *= p_jolt_body.GetMotionPropertiesUnchecked()->GetGravityFactor();
+	gravity *= gravity_scale;
 }
 
 void JoltBody3D::_update_damp() {
@@ -316,13 +348,13 @@ void JoltBody3D::_update_damp() {
 
 	for (const JoltArea3D *area : areas) {
 		if (!linear_damp_done) {
-			linear_damp_done = JoltArea3D::apply_override(total_linear_damp, area->get_linear_damp_mode(), [&]() {
+			linear_damp_done = integrate(total_linear_damp, area->get_linear_damp_mode(), [&]() {
 				return area->get_linear_damp();
 			});
 		}
 
 		if (!angular_damp_done) {
-			angular_damp_done = JoltArea3D::apply_override(total_angular_damp, area->get_angular_damp_mode(), [&]() {
+			angular_damp_done = integrate(total_angular_damp, area->get_angular_damp_mode(), [&]() {
 				return area->get_angular_damp();
 			});
 		}
@@ -1215,20 +1247,14 @@ void JoltBody3D::set_friction(float p_friction) {
 	}
 }
 
-float JoltBody3D::get_gravity_scale() const {
-	if (!in_space()) {
-		return jolt_settings->mGravityFactor;
-	} else {
-		return jolt_body->GetMotionPropertiesUnchecked()->GetGravityFactor();
-	}
-}
-
 void JoltBody3D::set_gravity_scale(float p_scale) {
-	if (!in_space()) {
-		jolt_settings->mGravityFactor = p_scale;
-	} else {
-		jolt_body->GetMotionPropertiesUnchecked()->SetGravityFactor(p_scale);
+	if (gravity_scale == p_scale) {
+		return;
 	}
+
+	gravity_scale = p_scale;
+
+	_motion_changed();
 }
 
 void JoltBody3D::set_linear_damp(float p_damp) {
diff --git a/engine/modules/jolt_physics/objects/jolt_body_3d.h b/engine/modules/jolt_physics/objects/jolt_body_3d.h
index 057b65d7..6067b840 100644
--- a/engine/modules/jolt_physics/objects/jolt_body_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_body_3d.h
@@ -92,6 +92,7 @@ private:
 	float angular_damp = 0.0f;
 	float total_linear_damp = 0.0f;
 	float total_angular_damp = 0.0f;
+	float gravity_scale = 1.0f;
 	float collision_priority = 1.0f;
 
 	int contact_count = 0;
@@ -275,7 +276,7 @@ public:
 	float get_friction() const;
 	void set_friction(float p_friction);
 
-	float get_gravity_scale() const;
+	float get_gravity_scale() const { return gravity_scale; }
 	void set_gravity_scale(float p_scale);
 
 	Vector3 get_gravity() const { return gravity; }
diff --git a/engine/modules/jolt_physics/objects/jolt_group_filter.cpp b/engine/modules/jolt_physics/objects/jolt_group_filter.cpp
index 272794f3..b06ce8c6 100644
--- a/engine/modules/jolt_physics/objects/jolt_group_filter.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_group_filter.cpp
@@ -30,6 +30,8 @@
 
 #include "jolt_group_filter.h"
 
+#include "jolt_area_3d.h"
+#include "jolt_body_3d.h"
 #include "jolt_object_3d.h"
 
 bool JoltGroupFilter::CanCollide(const JPH::CollisionGroup &p_group1, const JPH::CollisionGroup &p_group2) const {
diff --git a/engine/modules/jolt_physics/objects/jolt_group_filter.h b/engine/modules/jolt_physics/objects/jolt_group_filter.h
index 6bcee5c7..7bfa405b 100644
--- a/engine/modules/jolt_physics/objects/jolt_group_filter.h
+++ b/engine/modules/jolt_physics/objects/jolt_group_filter.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/CollisionGroup.h>
-#include <Jolt/Physics/Collision/GroupFilter.h>
+#include "Jolt/Physics/Collision/CollisionGroup.h"
+#include "Jolt/Physics/Collision/GroupFilter.h"
 
 class JoltObject3D;
 
diff --git a/engine/modules/jolt_physics/objects/jolt_object_3d.cpp b/engine/modules/jolt_physics/objects/jolt_object_3d.cpp
index 63d3526b..b32fee41 100644
--- a/engine/modules/jolt_physics/objects/jolt_object_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_object_3d.cpp
@@ -31,6 +31,8 @@
 #include "jolt_object_3d.h"
 
 #include "../jolt_physics_server_3d.h"
+#include "../jolt_project_settings.h"
+#include "../spaces/jolt_layers.h"
 #include "../spaces/jolt_space_3d.h"
 #include "jolt_group_filter.h"
 
diff --git a/engine/modules/jolt_physics/objects/jolt_object_3d.h b/engine/modules/jolt_physics/objects/jolt_object_3d.h
index 24092bcd..fb338f4e 100644
--- a/engine/modules/jolt_physics/objects/jolt_object_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_object_3d.h
@@ -35,13 +35,14 @@
 #include "core/math/vector3.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
+#include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
-#include <Jolt/Physics/Collision/ObjectLayer.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include "Jolt/Physics/Collision/ObjectLayer.h"
 
 class JoltArea3D;
 class JoltBody3D;
@@ -60,6 +61,8 @@ public:
 	};
 
 protected:
+	LocalVector<JoltShapeInstance3D> shapes;
+
 	RID rid;
 	ObjectID instance_id;
 	JoltSpace3D *space = nullptr;
diff --git a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
index f5e2e4a2..1e42dff8 100644
--- a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
@@ -32,12 +32,13 @@
 
 #include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
+#include "../shapes/jolt_custom_double_sided_shape.h"
 #include "../shapes/jolt_shape_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include <Jolt/Physics/Collision/Shape/EmptyShape.h>
-#include <Jolt/Physics/Collision/Shape/MutableCompoundShape.h>
-#include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h>
+#include "Jolt/Physics/Collision/Shape/EmptyShape.h"
+#include "Jolt/Physics/Collision/Shape/MutableCompoundShape.h"
+#include "Jolt/Physics/Collision/Shape/StaticCompoundShape.h"
 
 bool JoltShapedObject3D::_is_big() const {
 	// This number is completely arbitrary, and mostly just needs to capture `WorldBoundaryShape3D`, which needs to be kept out of the normal broadphase layers.
@@ -194,6 +195,7 @@ JoltShapedObject3D::JoltShapedObject3D(ObjectType p_object_type) :
 	jolt_settings->mRestitution = 0.0f;
 	jolt_settings->mLinearDamping = 0.0f;
 	jolt_settings->mAngularDamping = 0.0f;
+	jolt_settings->mGravityFactor = 0.0f;
 }
 
 JoltShapedObject3D::~JoltShapedObject3D() {
@@ -285,7 +287,7 @@ JPH::ShapeRefC JoltShapedObject3D::build_shapes(bool p_optimize_compound) {
 
 	if (new_shape == nullptr) {
 		if (has_custom_center_of_mass()) {
-			new_shape = new JPH::EmptyShape(to_jolt(get_center_of_mass_custom()));
+			new_shape = JPH::EmptyShapeSettings(to_jolt(get_center_of_mass_custom())).Create().Get();
 		} else {
 			new_shape = new JPH::EmptyShape();
 		}
diff --git a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
index ec26713b..6cf4b7e6 100644
--- a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
@@ -34,10 +34,10 @@
 
 #include "core/templates/self_list.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Body/BodyCreationSettings.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Body/BodyCreationSettings.h"
 
 class JoltShapedObject3D : public JoltObject3D {
 	friend class JoltShape3D;
@@ -46,8 +46,6 @@ protected:
 	SelfList<JoltShapedObject3D> shapes_changed_element;
 	SelfList<JoltShapedObject3D> needs_optimization_element;
 
-	LocalVector<JoltShapeInstance3D> shapes;
-
 	Vector3 scale = Vector3(1, 1, 1);
 
 	JPH::ShapeRefC jolt_shape;
diff --git a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
index 4d32f0aa..67e7ebb3 100644
--- a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
@@ -38,10 +38,9 @@
 #include "jolt_body_3d.h"
 #include "jolt_group_filter.h"
 
-#include "core/config/engine.h"
 #include "servers/rendering/rendering_server.h"
 
-#include <Jolt/Physics/SoftBody/SoftBodyMotionProperties.h>
+#include "Jolt/Physics/SoftBody/SoftBodyMotionProperties.h"
 
 namespace {
 
@@ -131,10 +130,10 @@ JPH::SoftBodySharedSettings *JoltSoftBody3D::_create_shared_settings() {
 	const Array mesh_data = rendering->mesh_surface_get_arrays(mesh, 0);
 	ERR_FAIL_COND_V(mesh_data.is_empty(), nullptr);
 
-	const PackedInt32Array mesh_indices = mesh_data[RSE::ARRAY_INDEX];
+	const PackedInt32Array mesh_indices = mesh_data[RenderingServer::ARRAY_INDEX];
 	ERR_FAIL_COND_V(mesh_indices.is_empty(), nullptr);
 
-	const PackedVector3Array mesh_vertices = mesh_data[RSE::ARRAY_VERTEX];
+	const PackedVector3Array mesh_vertices = mesh_data[RenderingServer::ARRAY_VERTEX];
 	ERR_FAIL_COND_V(mesh_vertices.is_empty(), nullptr);
 
 	JPH::SoftBodySharedSettings *settings = new JPH::SoftBodySharedSettings();
@@ -189,32 +188,9 @@ JPH::SoftBodySharedSettings *JoltSoftBody3D::_create_shared_settings() {
 	pin_vertices(*this, pinned_vertices, mesh_to_physics, physics_vertices);
 
 	// Since Godot's stiffness is input as a coefficient between 0 and 1, and Jolt uses actual stiffness for its
-	// edge constraints, we must map one to the other.
-	//
-	// Godot uses classic PBD edge constraints, which have a stiffness parameter k that is used in the position correction formula as follows:
-	// delta_x1 = -k * w1 / (w1 + w2) * (l - l0) / l * (x2 - x1)
-	// where k is the stiffness, w1 and w2 are the inverse masses of the two vertices, l is the current length of the edge = |x2 - x1|, l0 is the rest length of the edge, and x1 and x2 are the vertex positions.
-	//
-	// Note that the actual formula used in Godot physics seems to use an approximation of this which avoids calculating the square root:
-	// delta_x1 = -k * w1 / (w1 + w2) * (l^2 - l0^2) / (l^2 + l0^2) * (x2 - x1)
-	//
-	// Jolt uses XPBD which goes as follows:
-	// delta_x1 = -w1 / (w1 + w2 + compliance / dt^2) * (l - l0) / l * (x2 - x1)
-	// where compliance is the inverse of stiffness and dt is the timestep.
-	//
-	// We can derive Jolt's compliance from Godot's stiffness by evaluating:
-	// k * w1 / (w1 + w2) = w1 / (w1 + w2 + compliance / dt^2)
-	// which simplifies to:
-	// compliance = dt^2 * (1 / k - 1) * (w1 + w2)
-
-	// Assuming that the vertices have the same mass:
-	const float w1_plus_w2 = 2.0f * physics_vertices.size() / mass;
-
-	// Calculate time step of a single XPBD iteration
-	const float dt = 1.0f / Engine::get_singleton()->get_user_physics_ticks_per_second() / simulation_precision;
-
-	// Now calculate the compliance
-	const float inverse_stiffness = dt * dt * (1.0f / stiffness_coefficient - 1.0f) * w1_plus_w2;
+	// edge constraints, we crudely map one to the other with an arbitrary constant.
+	const float stiffness = MAX(Math::pow(stiffness_coefficient, 3.0f) * 100000.0f, 0.000001f);
+	const float inverse_stiffness = 1.0f / stiffness;
 
 	JPH::SoftBodySharedSettings::VertexAttributes vertex_attrib;
 	vertex_attrib.mCompliance = vertex_attrib.mShearCompliance = inverse_stiffness;
@@ -229,87 +205,6 @@ JPH::SoftBodySharedSettings *JoltSoftBody3D::_create_shared_settings() {
 	return settings;
 }
 
-void JoltSoftBody3D::_apply_environmental_forces(float p_step, JPH::Body &p_jolt_body) {
-	// Get approximation of the center of the soft body.
-	Vector3 com_position = to_godot(p_jolt_body.GetCenterOfMassPosition());
-
-	// Calculate gravity and which areas affect the soft body through wind.
-	bool gravity_done = false;
-	Vector3 gravity;
-	LocalVector<JoltArea3D *> wind_areas;
-	for (JoltArea3D *area : areas) {
-		if (!gravity_done) {
-			gravity_done = JoltArea3D::apply_override(gravity, area->get_gravity_mode(), [&]() {
-				return area->compute_gravity(com_position);
-			});
-		}
-
-		if (area->get_wind_pressure() > CMP_EPSILON) {
-			wind_areas.push_back(area);
-		}
-	}
-
-	// Add default gravity.
-	if (!gravity_done) {
-		gravity += space->get_default_area()->compute_gravity(com_position);
-	}
-
-	// Apply gravity to soft body. Note that this only works so long as vertices have uniform mass (excluding pinned vertices).
-	p_jolt_body.AddForce(to_jolt(gravity) * mass);
-
-	if (!wind_areas.is_empty()) {
-		JPH::SoftBodyMotionProperties &motion_properties = static_cast<JPH::SoftBodyMotionProperties &>(*p_jolt_body.GetMotionPropertiesUnchecked());
-		JPH::Array<JPH::SoftBodyVertex> &physics_vertices = motion_properties.GetVertices();
-
-		for (const JPH::SoftBodySharedSettings::Face &physics_face : motion_properties.GetFaces()) {
-			JPH::SoftBodyVertex &physics_vertex0 = physics_vertices[physics_face.mVertex[0]];
-			JPH::SoftBodyVertex &physics_vertex1 = physics_vertices[physics_face.mVertex[1]];
-			JPH::SoftBodyVertex &physics_vertex2 = physics_vertices[physics_face.mVertex[2]];
-
-			// Calculate the triangle centroid.
-			Vector3 v0 = to_godot(physics_vertex0.mPosition);
-			Vector3 v1 = to_godot(physics_vertex1.mPosition);
-			Vector3 v2 = to_godot(physics_vertex2.mPosition);
-			Vector3 centroid = com_position + (v0 + v1 + v2) * real_t(1.0 / 3.0);
-
-			// Calculate the triangle normal.
-			Vector3 normal = (v2 - v0).cross(v1 - v0);
-			real_t normal_length = normal.length();
-			if (normal_length > real_t(1.0e-6)) { // If the normal is near zero, the area is near zero so we can skip this triangle.
-				normal /= normal_length;
-
-				// Area is half the length of the cross product of two sides.
-				real_t triangle_area = real_t(0.5) * normal_length;
-
-				// Accumulate wind forces from all wind areas.
-				Vector3 wind_force;
-				for (const JoltArea3D *area : wind_areas) {
-					const Vector3 &wind_direction = area->get_wind_direction();
-					const Vector3 &wind_source = area->get_wind_source();
-
-					// Calculate attenuation factor based on distance from wind source to triangle centroid.
-					// We do not allow a projection below 1 to ensure that we never amplify and to avoid NaNs when the value would be negative.
-					real_t projection_toward_centroid = MAX((centroid - wind_source).dot(wind_direction), real_t(1.0));
-					real_t attenuation_over_distance = Math::pow(projection_toward_centroid, -real_t(area->get_wind_attenuation_factor()));
-
-					// Calculate force magnitude.
-					real_t force_magnitude = area->get_wind_pressure() * triangle_area;
-
-					// Calculate the resulting wind force on the triangle by projecting wind direction onto triangle normal.
-					// Divide by 3 to distribute force equally over each vertex.
-					wind_force += (force_magnitude * attenuation_over_distance * real_t(1.0 / 3.0) * normal.dot(wind_direction)) * normal;
-				}
-
-				// Apply the force as an impulse over the timestep.
-				JPH::Vec3 impulse = to_jolt(wind_force * p_step);
-				physics_vertex0.mVelocity += impulse * physics_vertex0.mInvMass;
-				physics_vertex1.mVelocity += impulse * physics_vertex1.mInvMass;
-				physics_vertex2.mVelocity += impulse * physics_vertex2.mInvMass;
-			}
-		}
-	}
-}
-
 void JoltSoftBody3D::_update_mass() {
 	if (!in_space()) {
 		return;
@@ -318,7 +213,7 @@ void JoltSoftBody3D::_update_mass() {
 	JPH::SoftBodyMotionProperties &motion_properties = static_cast<JPH::SoftBodyMotionProperties &>(*jolt_body->GetMotionPropertiesUnchecked());
 	JPH::Array<JPH::SoftBodyVertex> &physics_vertices = motion_properties.GetVertices();
 
-	const float inverse_vertex_mass = (float)physics_vertices.size() / mass;
+	const float inverse_vertex_mass = mass == 0.0f ? 1.0f : (float)physics_vertices.size() / mass;
 
 	for (JPH::SoftBodyVertex &vertex : physics_vertices) {
 		vertex.mInvMass = inverse_vertex_mass;
@@ -382,7 +277,6 @@ void JoltSoftBody3D::_simulation_precision_changed() {
 }
 
 void JoltSoftBody3D::_mass_changed() {
-	_update_mass();
 	wake_up();
 }
 
@@ -413,14 +307,6 @@ void JoltSoftBody3D::_motion_changed() {
 	wake_up();
 }
 
-void JoltSoftBody3D::_transform_changed() {
-	wake_up();
-}
-
-void JoltSoftBody3D::_areas_changed() {
-	wake_up();
-}
-
 JoltSoftBody3D::JoltSoftBody3D() :
 		JoltObject3D(OBJECT_TYPE_SOFT_BODY) {
 	jolt_settings->mRestitution = 0.0f;
@@ -452,25 +338,6 @@ bool JoltSoftBody3D::has_collision_exception(const RID &p_excepted_body) const {
 	return exceptions.find(p_excepted_body) >= 0;
 }
 
-void JoltSoftBody3D::add_area(JoltArea3D *p_area) {
-	int i = 0;
-	for (; i < (int)areas.size(); i++) {
-		if (p_area->get_priority() > areas[i]->get_priority()) {
-			break;
-		}
-	}
-
-	areas.insert(i, p_area);
-
-	_areas_changed();
-}
-
-void JoltSoftBody3D::remove_area(JoltArea3D *p_area) {
-	areas.erase(p_area);
-
-	_areas_changed();
-}
-
 bool JoltSoftBody3D::can_interact_with(const JoltBody3D &p_other) const {
 	return (can_collide_with(p_other) || p_other.can_collide_with(*this)) && !has_collision_exception(p_other.get_rid()) && !p_other.has_collision_exception(rid);
 }
@@ -487,10 +354,6 @@ Vector3 JoltSoftBody3D::get_velocity_at_position(const Vector3 &p_position) cons
 	return Vector3();
 }
 
-void JoltSoftBody3D::pre_step(float p_step, JPH::Body &p_jolt_body) {
-	_apply_environmental_forces(p_step, p_jolt_body);
-}
-
 void JoltSoftBody3D::set_mesh(const RID &p_mesh) {
 	if (unlikely(mesh == p_mesh)) {
 		return;
@@ -592,13 +455,11 @@ void JoltSoftBody3D::set_simulation_precision(int p_precision) {
 }
 
 void JoltSoftBody3D::set_mass(float p_mass) {
-	ERR_FAIL_COND(p_mass <= 0.0); // A mass of zero would result in infinite inverse mass.
-
 	if (unlikely(mass == p_mass)) {
 		return;
 	}
 
-	mass = p_mass;
+	mass = MAX(p_mass, 0.0f);
 
 	_mass_changed();
 }
@@ -721,8 +582,7 @@ void JoltSoftBody3D::set_transform(const Transform3D &p_transform) {
 		vertex.mPosition = vertex.mPreviousPosition = relative_transform.Multiply3x3(vertex.mPosition);
 		vertex.mVelocity = JPH::Vec3::sZero();
 	}
-
-	_transform_changed();
+	wake_up();
 }
 
 AABB JoltSoftBody3D::get_bounds() const {
diff --git a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
index 5584a818..eb347899 100644
--- a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
@@ -34,27 +34,24 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/SoftBody/SoftBodyCreationSettings.h>
-#include <Jolt/Physics/SoftBody/SoftBodySharedSettings.h>
+#include "Jolt/Physics/SoftBody/SoftBodyCreationSettings.h"
+#include "Jolt/Physics/SoftBody/SoftBodySharedSettings.h"
 
-class JoltArea3D;
 class JoltSpace3D;
 
 class JoltSoftBody3D final : public JoltObject3D {
 	HashSet<int> pinned_vertices;
-
-	LocalVector<int> mesh_to_physics;
-	LocalVector<JoltArea3D *> areas;
-	LocalVector<Vector3> normals;
 	LocalVector<RID> exceptions;
+	LocalVector<Vector3> normals;
 
 	RID mesh;
+	LocalVector<int> mesh_to_physics;
 
 	JPH::SoftBodyCreationSettings *jolt_settings = new JPH::SoftBodyCreationSettings();
 
-	float mass = 1.0f;
+	float mass = 0.0f;
 	float pressure = 0.0f;
 	float linear_damping = 0.01f;
 	float stiffness_coefficient = 0.5f;
@@ -72,8 +69,6 @@ class JoltSoftBody3D final : public JoltObject3D {
 
 	JPH::SoftBodySharedSettings *_create_shared_settings();
 
-	void _apply_environmental_forces(float p_step, JPH::Body &p_jolt_body);
-
 	void _update_mass();
 	void _update_pressure();
 	void _update_damping();
@@ -91,8 +86,6 @@ class JoltSoftBody3D final : public JoltObject3D {
 	void _vertices_changed();
 	void _exceptions_changed();
 	void _motion_changed();
-	void _transform_changed();
-	void _areas_changed();
 
 public:
 	JoltSoftBody3D();
@@ -104,9 +97,6 @@ public:
 
 	const LocalVector<RID> &get_collision_exceptions() const { return exceptions; }
 
-	void add_area(JoltArea3D *p_area);
-	void remove_area(JoltArea3D *p_area);
-
 	virtual bool can_interact_with(const JoltBody3D &p_other) const override;
 	virtual bool can_interact_with(const JoltSoftBody3D &p_other) const override;
 	virtual bool can_interact_with(const JoltArea3D &p_other) const override;
@@ -115,8 +105,6 @@ public:
 
 	virtual Vector3 get_velocity_at_position(const Vector3 &p_position) const override;
 
-	virtual void pre_step(float p_step, JPH::Body &p_jolt_body) override;
-
 	void set_mesh(const RID &p_mesh);
 
 	bool is_pickable() const { return pickable; }
diff --git a/engine/modules/jolt_physics/register_types.cpp b/engine/modules/jolt_physics/register_types.cpp
index 51aadf06..f24033df 100644
--- a/engine/modules/jolt_physics/register_types.cpp
+++ b/engine/modules/jolt_physics/register_types.cpp
@@ -34,8 +34,6 @@
 #include "jolt_physics_server_3d.h"
 #include "jolt_project_settings.h"
 
-#include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
 #include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
 PhysicsServer3D *create_jolt_physics_server() {
diff --git a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
index 14120f60..652f5309 100644
--- a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/BoxShape.h>
+#include "Jolt/Physics/Collision/Shape/BoxShape.h"
 
 JPH::ShapeRefC JoltBoxShape3D::_build() const {
 	const float min_half_extent = (float)half_extents[half_extents.min_axis_index()];
diff --git a/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.cpp
index d4b27422..a38cb6bd 100644
--- a/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/CapsuleShape.h>
+#include "Jolt/Physics/Collision/Shape/CapsuleShape.h"
 
 JPH::ShapeRefC JoltCapsuleShape3D::_build() const {
 	ERR_FAIL_COND_V_MSG(radius <= 0.0f, nullptr, vformat("Failed to build Jolt Physics capsule shape with %s. Its radius must be greater than 0. This shape belongs to %s.", to_string(), _owners_to_string()));
diff --git a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
index e2a2c1ef..c8c8add1 100644
--- a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/MeshShape.h>
+#include "Jolt/Physics/Collision/Shape/MeshShape.h"
 
 JPH::ShapeRefC JoltConcavePolygonShape3D::_build() const {
 	const int vertex_count = (int)faces.size();
diff --git a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
index b81e96d5..033c4a50 100644
--- a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/ConvexHullShape.h>
+#include "Jolt/Physics/Collision/Shape/ConvexHullShape.h"
 
 JPH::ShapeRefC JoltConvexPolygonShape3D::_build() const {
 	const int vertex_count = (int)vertices.size();
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
index ad29418e..b22ae82d 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
@@ -30,10 +30,12 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "jolt_custom_shape_type.h"
 
-#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
-#include <Jolt/Physics/Collision/TransformedShape.h>
+#include "Jolt/Jolt.h"
+
+#include "Jolt/Physics/Collision/Shape/DecoratedShape.h"
+#include "Jolt/Physics/Collision/TransformedShape.h"
 
 class JoltCustomDecoratedShapeSettings : public JPH::DecoratedShapeSettings {
 public:
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
index 56eae37a..ef24d886 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
@@ -30,10 +30,12 @@
 
 #include "jolt_custom_double_sided_shape.h"
 
+#include "../jolt_project_settings.h"
+
 #include "core/error/error_macros.h"
 
-#include <Jolt/Physics/Collision/CollisionDispatch.h>
-#include <Jolt/Physics/Collision/RayCast.h>
+#include "Jolt/Physics/Collision/CollisionDispatch.h"
+#include "Jolt/Physics/Collision/RayCast.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
index fcf39e6a..79201ed3 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
@@ -34,10 +34,10 @@
 
 #include "core/error/error_macros.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/Shape/ConvexShape.h>
-#include <Jolt/Physics/Collision/TransformedShape.h>
+#include "Jolt/Physics/Collision/Shape/ConvexShape.h"
+#include "Jolt/Physics/Collision/TransformedShape.h"
 
 class JoltCustomMotionShape final : public JPH::ConvexShape {
 	mutable JPH::ConvexShape::SupportBuffer inner_support_buffer;
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.cpp b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.cpp
index 192a5392..c00e43b4 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.cpp
@@ -32,14 +32,12 @@
 
 #include "../spaces/jolt_query_collectors.h"
 
-#include "core/error/error_macros.h"
-
-#include <Jolt/Physics/Collision/CastResult.h>
-#include <Jolt/Physics/Collision/RayCast.h>
-#include <Jolt/Physics/Collision/TransformedShape.h>
+#include "Jolt/Physics/Collision/CastResult.h"
+#include "Jolt/Physics/Collision/RayCast.h"
+#include "Jolt/Physics/Collision/TransformedShape.h"
 
 #ifdef JPH_DEBUG_RENDERER
-#include <Jolt/Renderer/DebugRenderer.h>
+#include "Jolt/Renderer/DebugRenderer.h"
 #endif
 
 namespace {
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
index 99c3ebff..fb0f95a0 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
@@ -32,9 +32,9 @@
 
 #include "jolt_custom_shape_type.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/Shape/ConvexShape.h>
+#include "Jolt/Physics/Collision/Shape/ConvexShape.h"
 
 class JoltCustomRayShapeSettings final : public JPH::ConvexShapeSettings {
 public:
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h b/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
index 973f2b1e..5e22c507 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/Shape/Shape.h>
+#include "Jolt/Physics/Collision/Shape/Shape.h"
 
 namespace JoltCustomShapeSubType {
 
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.cpp b/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.cpp
index c7ce6f30..53637ebe 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.cpp
@@ -32,8 +32,8 @@
 
 #include "core/error/error_macros.h"
 
-#include <Jolt/Physics/Collision/CollisionDispatch.h>
-#include <Jolt/Physics/Collision/ShapeCast.h>
+#include "Jolt/Physics/Collision/CollisionDispatch.h"
+#include "Jolt/Physics/Collision/ShapeCast.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
index d60b5666..3467f0b2 100644
--- a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/CylinderShape.h>
+#include "Jolt/Physics/Collision/Shape/CylinderShape.h"
 
 JPH::ShapeRefC JoltCylinderShape3D::_build() const {
 	const float half_height = height / 2.0f;
diff --git a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
index ec7a9998..2855ec88 100644
--- a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
@@ -33,8 +33,8 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/HeightFieldShape.h>
-#include <Jolt/Physics/Collision/Shape/MeshShape.h>
+#include "Jolt/Physics/Collision/Shape/HeightFieldShape.h"
+#include "Jolt/Physics/Collision/Shape/MeshShape.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_shape_3d.cpp
index fe9b2bad..8bd1977b 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_3d.cpp
@@ -35,12 +35,12 @@
 #include "jolt_custom_double_sided_shape.h"
 #include "jolt_custom_user_data_shape.h"
 
-#include <Jolt/Physics/Collision/Shape/MutableCompoundShape.h>
-#include <Jolt/Physics/Collision/Shape/OffsetCenterOfMassShape.h>
-#include <Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h>
-#include <Jolt/Physics/Collision/Shape/ScaledShape.h>
-#include <Jolt/Physics/Collision/Shape/SphereShape.h>
-#include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h>
+#include "Jolt/Physics/Collision/Shape/MutableCompoundShape.h"
+#include "Jolt/Physics/Collision/Shape/OffsetCenterOfMassShape.h"
+#include "Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h"
+#include "Jolt/Physics/Collision/Shape/ScaledShape.h"
+#include "Jolt/Physics/Collision/Shape/SphereShape.h"
+#include "Jolt/Physics/Collision/Shape/StaticCompoundShape.h"
 
 namespace {
 
@@ -75,7 +75,7 @@ void JoltShape3D::remove_owner(JoltShapedObject3D *p_owner) {
 void JoltShape3D::remove_self() {
 	// `remove_owner` will be called when we `remove_shape`, so we need to copy the map since the
 	// iterator would be invalidated from underneath us.
-	const HashMap<JoltShapedObject3D *, int> ref_counts_by_owner_copy(ref_counts_by_owner);
+	const HashMap<JoltShapedObject3D *, int> ref_counts_by_owner_copy = ref_counts_by_owner;
 
 	for (const KeyValue<JoltShapedObject3D *, int> &E : ref_counts_by_owner_copy) {
 		E.key->remove_shape(this);
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
index fd227484..e60a220f 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
@@ -32,9 +32,9 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/Shape/Shape.h>
+#include "Jolt/Physics/Collision/Shape/Shape.h"
 
 class JoltShapedObject3D;
 
@@ -95,25 +95,25 @@ public:
 
 #ifdef DEBUG_ENABLED
 
-#define JOLT_ENSURE_SCALE_NOT_ZERO(m_transform, m_msg) \
-	if (unlikely((m_transform).basis.determinant() == 0.0f)) { \
-		WARN_PRINT(vformat("%s " \
+#define JOLT_ENSURE_SCALE_NOT_ZERO(m_transform, m_msg)                                                         \
+	if (unlikely((m_transform).basis.determinant() == 0.0f)) {                                                 \
+		WARN_PRINT(vformat("%s "                                                                               \
 						   "The basis of the transform was singular, which is not supported by Jolt Physics. " \
-						   "This is likely caused by one or more axes having a scale of zero. " \
-						   "The basis (and thus its scale) will be treated as identity.", \
-				m_msg)); \
-\
-		(m_transform).basis = Basis(); \
-	} else \
+						   "This is likely caused by one or more axes having a scale of zero. "                \
+						   "The basis (and thus its scale) will be treated as identity.",                      \
+				m_msg));                                                                                       \
+                                                                                                               \
+		(m_transform).basis = Basis();                                                                         \
+	} else                                                                                                     \
 		((void)0)
 
-#define ERR_PRINT_INVALID_SCALE_MSG(m_scale, m_valid_scale, m_msg) \
-	if (unlikely(!JoltShape3D::is_scale_valid(m_scale, valid_scale))) { \
-		ERR_PRINT(vformat("%s " \
+#define ERR_PRINT_INVALID_SCALE_MSG(m_scale, m_valid_scale, m_msg)                               \
+	if (unlikely(!JoltShape3D::is_scale_valid(m_scale, valid_scale))) {                          \
+		ERR_PRINT(vformat("%s "                                                                  \
 						  "A scale of %v is not supported by Jolt Physics for this shape/body. " \
-						  "The scale will instead be treated as %v.", \
-				m_msg, m_scale, valid_scale)); \
-	} else \
+						  "The scale will instead be treated as %v.",                            \
+				m_msg, m_scale, valid_scale));                                                   \
+	} else                                                                                       \
 		((void)0)
 
 #else
@@ -124,10 +124,10 @@ public:
 
 #endif
 
-#define JOLT_ENSURE_SCALE_VALID(m_shape, m_scale, m_msg) \
-	if (true) { \
+#define JOLT_ENSURE_SCALE_VALID(m_shape, m_scale, m_msg)                             \
+	if (true) {                                                                      \
 		const Vector3 valid_scale = JoltShape3D::make_scale_valid(m_shape, m_scale); \
-		ERR_PRINT_INVALID_SCALE_MSG(m_scale, valid_scale, m_msg); \
-		(m_scale) = valid_scale; \
-	} else \
+		ERR_PRINT_INVALID_SCALE_MSG(m_scale, valid_scale, m_msg);                    \
+		(m_scale) = valid_scale;                                                     \
+	} else                                                                           \
 		((void)0)
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.cpp
index 0878d897..6320002b 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "jolt_shape_3d.h"
 
-#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
+#include "Jolt/Physics/Collision/Shape/DecoratedShape.h"
 
 JoltShapeInstance3D::ShapeReference::ShapeReference(JoltShapedObject3D *p_parent, JoltShape3D *p_shape) :
 		parent(p_parent),
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
index cc5eaf36..e601ccd6 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
@@ -32,9 +32,9 @@
 
 #include "core/math/transform_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/Shape/Shape.h>
+#include "Jolt/Physics/Collision/Shape/Shape.h"
 
 class JoltShapedObject3D;
 class JoltShape3D;
diff --git a/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.cpp
index ec72fe3f..cc0ffd92 100644
--- a/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.cpp
@@ -32,7 +32,7 @@
 
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/SphereShape.h>
+#include "Jolt/Physics/Collision/Shape/SphereShape.h"
 
 JPH::ShapeRefC JoltSphereShape3D::_build() const {
 	ERR_FAIL_COND_V_MSG(radius <= 0.0f, nullptr, vformat("Failed to build Jolt Physics sphere shape with %s. Its radius must be greater than 0. This shape belongs to %s.", to_string(), _owners_to_string()));
diff --git a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
index d8186290..7f6ba20e 100644
--- a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include <Jolt/Physics/Collision/Shape/PlaneShape.h>
+#include "Jolt/Physics/Collision/Shape/PlaneShape.h"
 
 JPH::ShapeRefC JoltWorldBoundaryShape3D::_build() const {
 	const Plane normalized_plane = plane.normalized();
diff --git a/engine/modules/jolt_physics/spaces/jolt_body_activation_listener_3d.h b/engine/modules/jolt_physics/spaces/jolt_body_activation_listener_3d.h
index 71187a90..f2c3c5f0 100644
--- a/engine/modules/jolt_physics/spaces/jolt_body_activation_listener_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_body_activation_listener_3d.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/BodyActivationListener.h>
+#include "Jolt/Physics/Body/BodyActivationListener.h"
 
 class JoltBodyActivationListener3D final
 		: public JPH::BodyActivationListener {
diff --git a/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h b/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
index 2e33507a..986ed295 100644
--- a/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
+++ b/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
 
 #include <cstdint>
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
index 68377a00..30b29925 100644
--- a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
@@ -37,14 +37,14 @@
 #include "../objects/jolt_soft_body_3d.h"
 #include "jolt_space_3d.h"
 
-#include <Jolt/Physics/Collision/EstimateCollisionResponse.h>
-#include <Jolt/Physics/SoftBody/SoftBodyManifold.h>
+#include "Jolt/Physics/Collision/EstimateCollisionResponse.h"
+#include "Jolt/Physics/SoftBody/SoftBodyManifold.h"
 
 void JoltContactListener3D::OnContactAdded(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::ContactManifold &p_manifold, JPH::ContactSettings &p_settings) {
 	_try_override_collision_response(p_body1, p_body2, p_settings);
 	_try_apply_surface_velocities(p_body1, p_body2, p_settings);
 	_try_add_contacts(p_body1, p_body2, p_manifold, p_settings);
-	_try_evaluate_area_overlap(p_body1, p_body2, p_manifold.mSubShapeID1, p_manifold.mSubShapeID2);
+	_try_evaluate_area_overlap(p_body1, p_body2, p_manifold);
 
 #ifdef DEBUG_ENABLED
 	_try_add_debug_contacts(p_body1, p_body2, p_manifold);
@@ -55,7 +55,7 @@ void JoltContactListener3D::OnContactPersisted(const JPH::Body &p_body1, const J
 	_try_override_collision_response(p_body1, p_body2, p_settings);
 	_try_apply_surface_velocities(p_body1, p_body2, p_settings);
 	_try_add_contacts(p_body1, p_body2, p_manifold, p_settings);
-	_try_evaluate_area_overlap(p_body1, p_body2, p_manifold.mSubShapeID1, p_manifold.mSubShapeID2);
+	_try_evaluate_area_overlap(p_body1, p_body2, p_manifold);
 
 #ifdef DEBUG_ENABLED
 	_try_add_debug_contacts(p_body1, p_body2, p_manifold);
@@ -74,21 +74,18 @@ void JoltContactListener3D::OnContactRemoved(const JPH::SubShapeIDPair &p_shape_
 
 JPH::SoftBodyValidateResult JoltContactListener3D::OnSoftBodyContactValidate(const JPH::Body &p_soft_body, const JPH::Body &p_other_body, JPH::SoftBodyContactSettings &p_settings) {
 	_try_override_collision_response(p_soft_body, p_other_body, p_settings);
+
 	return JPH::SoftBodyValidateResult::AcceptContact;
 }
 
-void JoltContactListener3D::OnSoftBodyContactAdded(const JPH::Body &p_soft_body, const JPH::SoftBodyManifold &p_manifold) {
-	for (JPH::uint i = 0; i < p_manifold.GetNumSensorContacts(); i++) {
-		if (JPH::Body *other_jolt_body = space->try_get_jolt_body(p_manifold.GetSensorContactBodyID(i))) {
-			_try_evaluate_area_overlap(p_soft_body, *other_jolt_body, JPH::SubShapeID(), JPH::SubShapeID());
-		}
-	}
-
 #ifdef DEBUG_ENABLED
+
+void JoltContactListener3D::OnSoftBodyContactAdded(const JPH::Body &p_soft_body, const JPH::SoftBodyManifold &p_manifold) {
 	_try_add_debug_contacts(p_soft_body, p_manifold);
-#endif
 }
 
+#endif
+
 bool JoltContactListener3D::_try_override_collision_response(const JPH::Body &p_jolt_body1, const JPH::Body &p_jolt_body2, JPH::ContactSettings &p_settings) {
 	if (p_jolt_body1.IsSensor() || p_jolt_body2.IsSensor()) {
 		return false;
@@ -250,13 +247,37 @@ bool JoltContactListener3D::_try_add_contacts(const JPH::Body &p_jolt_body1, con
 	return true;
 }
 
-bool JoltContactListener3D::_try_evaluate_area_overlap(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::SubShapeID &p_shape_id1, const JPH::SubShapeID &p_shape_id2) {
+bool JoltContactListener3D::_try_evaluate_area_overlap(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::ContactManifold &p_manifold) {
 	if (!p_body1.IsSensor() && !p_body2.IsSensor()) {
 		return false;
 	}
 
-	const JPH::SubShapeIDPair shape_pair1(p_body1.GetID(), p_shape_id1, p_body2.GetID(), p_shape_id2);
-	const JPH::SubShapeIDPair shape_pair2(p_body2.GetID(), p_shape_id2, p_body1.GetID(), p_shape_id1);
+	auto has_shifted = [](const JoltShapedObject3D &p_object, const JPH::SubShapeID &p_sub_shape_id) {
+		return p_object.get_previous_jolt_shape() != nullptr && p_object.get_jolt_shape()->GetSubShapeUserData(p_sub_shape_id) != p_object.get_previous_jolt_shape()->GetSubShapeUserData(p_sub_shape_id);
+	};
+
+	auto evaluate = [&](const JoltArea3D &p_area, const auto &p_object, const JPH::SubShapeIDPair &p_shape_pair) {
+		const MutexLock write_lock(write_mutex);
+
+		if (p_area.can_monitor(p_object)) {
+			if (!area_overlaps.has(p_shape_pair)) {
+				area_overlaps.insert(p_shape_pair);
+				area_enters.insert(p_shape_pair);
+			} else if (has_shifted(p_area, p_shape_pair.GetSubShapeID1()) || has_shifted(p_object, p_shape_pair.GetSubShapeID2())) {
+				// A shape has taken on the `JPH::SubShapeID` value of another shape, likely because of the other shape having been replaced or moved
+				// in some way, so we force the area to refresh its internal mappings by exiting and entering this shape pair.
+				area_exits.insert(p_shape_pair);
+				area_enters.insert(p_shape_pair);
+			}
+		} else {
+			if (area_overlaps.erase(p_shape_pair)) {
+				area_exits.insert(p_shape_pair);
+			}
+		}
+	};
+
+	const JPH::SubShapeIDPair shape_pair1(p_body1.GetID(), p_manifold.mSubShapeID1, p_body2.GetID(), p_manifold.mSubShapeID2);
+	const JPH::SubShapeIDPair shape_pair2(p_body2.GetID(), p_manifold.mSubShapeID2, p_body1.GetID(), p_manifold.mSubShapeID1);
 
 	const JoltObject3D *object1 = reinterpret_cast<JoltObject3D *>(p_body1.GetUserData());
 	const JoltObject3D *object2 = reinterpret_cast<JoltObject3D *>(p_body2.GetUserData());
@@ -267,20 +288,13 @@ bool JoltContactListener3D::_try_evaluate_area_overlap(const JPH::Body &p_body1,
 	const JoltBody3D *body1 = object1->as_body();
 	const JoltBody3D *body2 = object2->as_body();
 
-	const JoltSoftBody3D *soft_body1 = object1->as_soft_body();
-	const JoltSoftBody3D *soft_body2 = object2->as_soft_body();
-
 	if (area1 != nullptr && area2 != nullptr) {
-		_evaluate_area_overlap(*area1, *area2, shape_pair1);
-		_evaluate_area_overlap(*area2, *area1, shape_pair2);
+		evaluate(*area1, *area2, shape_pair1);
+		evaluate(*area2, *area1, shape_pair2);
 	} else if (area1 != nullptr && body2 != nullptr) {
-		_evaluate_area_overlap(*area1, *body2, shape_pair1);
+		evaluate(*area1, *body2, shape_pair1);
 	} else if (area2 != nullptr && body1 != nullptr) {
-		_evaluate_area_overlap(*area2, *body1, shape_pair2);
-	} else if (area1 != nullptr && soft_body2 != nullptr) {
-		_evaluate_area_overlap(*area1, *soft_body2, shape_pair1);
-	} else if (area2 != nullptr && soft_body1 != nullptr) {
-		_evaluate_area_overlap(*area2, *soft_body1, shape_pair2);
+		evaluate(*area2, *body1, shape_pair2);
 	}
 
 	return true;
@@ -288,6 +302,7 @@ bool JoltContactListener3D::_try_evaluate_area_overlap(const JPH::Body &p_body1,
 
 bool JoltContactListener3D::_try_remove_contacts(const JPH::SubShapeIDPair &p_shape_pair) {
 	const MutexLock write_lock(write_mutex);
+
 	return manifolds_by_shape_pair.erase(p_shape_pair);
 }
 
@@ -399,61 +414,6 @@ bool JoltContactListener3D::_try_add_debug_contacts(const JPH::Body &p_soft_body
 
 #endif
 
-bool JoltContactListener3D::_has_shape_shifted(const JoltShapedObject3D &p_object, const JPH::SubShapeID &p_sub_shape_id) {
-	return p_object.get_previous_jolt_shape() != nullptr && p_object.get_jolt_shape()->GetSubShapeUserData(p_sub_shape_id) != p_object.get_previous_jolt_shape()->GetSubShapeUserData(p_sub_shape_id);
-}
-
-void JoltContactListener3D::_evaluate_area_overlap(const JoltArea3D &p_area, const JoltArea3D &p_other_area, const JPH::SubShapeIDPair &p_shape_pair) {
-	const MutexLock write_lock(write_mutex);
-
-	if (p_area.can_monitor(p_other_area)) {
-		if (!area_overlaps.has(p_shape_pair)) {
-			area_overlaps.insert(p_shape_pair);
-			area_enters.insert(p_shape_pair);
-		} else if (_has_shape_shifted(p_area, p_shape_pair.GetSubShapeID1()) || _has_shape_shifted(p_other_area, p_shape_pair.GetSubShapeID2())) {
-			// A shape has taken on the `JPH::SubShapeID` value of another shape, likely because of the other shape having been replaced or moved
-			// in some way, so we force the area to refresh its internal mappings by exiting and entering this shape pair.
-			area_exits.insert(p_shape_pair);
-			area_enters.insert(p_shape_pair);
-		}
-	} else {
-		if (area_overlaps.erase(p_shape_pair)) {
-			area_exits.insert(p_shape_pair);
-		}
-	}
-}
-
-void JoltContactListener3D::_evaluate_area_overlap(const JoltArea3D &p_area, const JoltBody3D &p_body, const JPH::SubShapeIDPair &p_shape_pair) {
-	const MutexLock write_lock(write_mutex);
-
-	if (p_area.can_monitor(p_body)) {
-		if (!area_overlaps.has(p_shape_pair)) {
-			area_overlaps.insert(p_shape_pair);
-			area_enters.insert(p_shape_pair);
-		} else if (_has_shape_shifted(p_area, p_shape_pair.GetSubShapeID1()) || _has_shape_shifted(p_body, p_shape_pair.GetSubShapeID2())) {
-			// A shape has taken on the `JPH::SubShapeID` value of another shape, likely because of the other shape having been replaced or moved
-			// in some way, so we force the area to refresh its internal mappings by exiting and entering this shape pair.
-			area_exits.insert(p_shape_pair);
-			area_enters.insert(p_shape_pair);
-		}
-	} else {
-		if (area_overlaps.erase(p_shape_pair)) {
-			area_exits.insert(p_shape_pair);
-		}
-	}
-}
-
-void JoltContactListener3D::_evaluate_area_overlap(const JoltArea3D &p_area, const JoltSoftBody3D &p_body, const JPH::SubShapeIDPair &p_shape_pair) {
-	const MutexLock write_lock(write_mutex);
-
-	if (p_area.can_monitor(p_body)) {
-		area_soft_body_overlaps.push_back(p_shape_pair);
-		if (!area_exits.erase(p_shape_pair)) {
-			area_enters.insert(p_shape_pair);
-		}
-	}
-}
-
 void JoltContactListener3D::_flush_contacts() {
 	for (KeyValue<JPH::SubShapeIDPair, Manifold> &E : manifolds_by_shape_pair) {
 		const JPH::SubShapeIDPair &shape_pair = E.key;
@@ -544,18 +504,7 @@ void JoltContactListener3D::_flush_area_exits() {
 	area_exits.clear();
 }
 
-void JoltContactListener3D::_clear_area_soft_body_overlaps() {
-	area_exits.reserve(area_soft_body_overlaps.size());
-	for (const JPH::SubShapeIDPair &shape_pair : area_soft_body_overlaps) {
-		area_exits.insert(shape_pair);
-	}
-
-	area_soft_body_overlaps.clear();
-}
-
 void JoltContactListener3D::pre_step() {
-	_clear_area_soft_body_overlaps();
-
 #ifdef DEBUG_ENABLED
 	debug_contact_count = 0;
 #endif
diff --git a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
index bbc2b568..ad4ce475 100644
--- a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
@@ -35,18 +35,18 @@
 #include "core/templates/hash_set.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/local_vector.h"
+#include "core/templates/safe_refcount.h"
 #include "core/variant/variant.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Collision/ContactListener.h>
-#include <Jolt/Physics/SoftBody/SoftBodyContactListener.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Collision/ContactListener.h"
+#include "Jolt/Physics/SoftBody/SoftBodyContactListener.h"
+
+#include <new>
 
-class JoltArea3D;
-class JoltBody3D;
 class JoltShapedObject3D;
-class JoltSoftBody3D;
 class JoltSpace3D;
 
 class JoltContactListener3D final
@@ -87,7 +87,6 @@ class JoltContactListener3D final
 	HashSet<JPH::SubShapeIDPair, ShapePairHasher> area_overlaps;
 	HashSet<JPH::SubShapeIDPair, ShapePairHasher> area_enters;
 	HashSet<JPH::SubShapeIDPair, ShapePairHasher> area_exits;
-	LocalVector<JPH::SubShapeIDPair> area_soft_body_overlaps;
 	Mutex write_mutex;
 	JoltSpace3D *space = nullptr;
 
@@ -101,13 +100,16 @@ class JoltContactListener3D final
 	virtual void OnContactRemoved(const JPH::SubShapeIDPair &p_shape_pair) override;
 
 	virtual JPH::SoftBodyValidateResult OnSoftBodyContactValidate(const JPH::Body &p_soft_body, const JPH::Body &p_other_body, JPH::SoftBodyContactSettings &p_settings) override;
+
+#ifdef DEBUG_ENABLED
 	virtual void OnSoftBodyContactAdded(const JPH::Body &p_soft_body, const JPH::SoftBodyManifold &p_manifold) override;
+#endif
 
 	bool _try_override_collision_response(const JPH::Body &p_jolt_body1, const JPH::Body &p_jolt_body2, JPH::ContactSettings &p_settings);
 	bool _try_override_collision_response(const JPH::Body &p_jolt_soft_body, const JPH::Body &p_jolt_other_body, JPH::SoftBodyContactSettings &p_settings);
 	bool _try_apply_surface_velocities(const JPH::Body &p_jolt_body1, const JPH::Body &p_jolt_body2, JPH::ContactSettings &p_settings);
 	bool _try_add_contacts(const JPH::Body &p_jolt_body1, const JPH::Body &p_jolt_body2, const JPH::ContactManifold &p_manifold, JPH::ContactSettings &p_settings);
-	bool _try_evaluate_area_overlap(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::SubShapeID &p_shape_id1, const JPH::SubShapeID &p_shape_id2);
+	bool _try_evaluate_area_overlap(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::ContactManifold &p_manifold);
 	bool _try_remove_contacts(const JPH::SubShapeIDPair &p_shape_pair);
 	bool _try_remove_area_overlap(const JPH::SubShapeIDPair &p_shape_pair);
 
@@ -116,16 +118,9 @@ class JoltContactListener3D final
 	bool _try_add_debug_contacts(const JPH::Body &p_soft_body, const JPH::SoftBodyManifold &p_manifold);
 #endif
 
-	bool _has_shape_shifted(const JoltShapedObject3D &p_object, const JPH::SubShapeID &p_sub_shape_id);
-
-	void _evaluate_area_overlap(const JoltArea3D &p_area, const JoltArea3D &p_other_area, const JPH::SubShapeIDPair &p_shape_pair);
-	void _evaluate_area_overlap(const JoltArea3D &p_area, const JoltBody3D &p_body, const JPH::SubShapeIDPair &p_shape_pair);
-	void _evaluate_area_overlap(const JoltArea3D &p_area, const JoltSoftBody3D &p_body, const JPH::SubShapeIDPair &p_shape_pair);
-
 	void _flush_contacts();
 	void _flush_area_enters();
 	void _flush_area_exits();
-	void _clear_area_soft_body_overlaps();
 
 public:
 	explicit JoltContactListener3D(JoltSpace3D *p_space) :
diff --git a/engine/modules/jolt_physics/spaces/jolt_job_system.cpp b/engine/modules/jolt_physics/spaces/jolt_job_system.cpp
index fc28ce2c..73da9aa1 100644
--- a/engine/modules/jolt_physics/spaces/jolt_job_system.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_job_system.cpp
@@ -30,12 +30,14 @@
 
 #include "jolt_job_system.h"
 
+#include "../jolt_project_settings.h"
+
 #include "core/debugger/engine_debugger.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 
-#include <Jolt/Physics/PhysicsSettings.h>
+#include "Jolt/Physics/PhysicsSettings.h"
 
 void JoltJobSystem::Job::_execute(void *p_user_data) {
 	Job *job = static_cast<Job *>(p_user_data);
diff --git a/engine/modules/jolt_physics/spaces/jolt_job_system.h b/engine/modules/jolt_physics/spaces/jolt_job_system.h
index 372d1615..a64f8d42 100644
--- a/engine/modules/jolt_physics/spaces/jolt_job_system.h
+++ b/engine/modules/jolt_physics/spaces/jolt_job_system.h
@@ -33,10 +33,10 @@
 #include "core/os/spin_lock.h"
 #include "core/templates/hash_map.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Core/FixedSizeFreeList.h>
-#include <Jolt/Core/JobSystemWithBarrier.h>
+#include "Jolt/Core/FixedSizeFreeList.h"
+#include "Jolt/Core/JobSystemWithBarrier.h"
 
 #include <atomic>
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_layers.cpp b/engine/modules/jolt_physics/spaces/jolt_layers.cpp
index 324d1c41..14c3afff 100644
--- a/engine/modules/jolt_physics/spaces/jolt_layers.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_layers.cpp
@@ -30,6 +30,7 @@
 
 #include "jolt_layers.h"
 
+#include "../jolt_project_settings.h"
 #include "jolt_broad_phase_layer.h"
 
 #include "core/error/error_macros.h"
diff --git a/engine/modules/jolt_physics/spaces/jolt_layers.h b/engine/modules/jolt_physics/spaces/jolt_layers.h
index b95b0d7c..59f49b52 100644
--- a/engine/modules/jolt_physics/spaces/jolt_layers.h
+++ b/engine/modules/jolt_physics/spaces/jolt_layers.h
@@ -33,10 +33,10 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
-#include <Jolt/Physics/Collision/ObjectLayer.h>
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include "Jolt/Physics/Collision/ObjectLayer.h"
 
 class JoltLayers final
 		: public JPH::BroadPhaseLayerInterface,
diff --git a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.cpp
index 804a627e..db60046f 100644
--- a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.cpp
@@ -35,6 +35,7 @@
 #include "../shapes/jolt_custom_motion_shape.h"
 #include "../shapes/jolt_custom_ray_shape.h"
 #include "../shapes/jolt_custom_shape_type.h"
+#include "../shapes/jolt_shape_3d.h"
 #include "jolt_broad_phase_layer.h"
 #include "jolt_space_3d.h"
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
index f4e9967a..8b44c892 100644
--- a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
@@ -34,13 +34,13 @@
 #include "core/templates/hash_set.h"
 #include "core/templates/rid.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Body/BodyFilter.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
-#include <Jolt/Physics/Collision/ObjectLayer.h>
-#include <Jolt/Physics/Collision/ShapeFilter.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Body/BodyFilter.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include "Jolt/Physics/Collision/ObjectLayer.h"
+#include "Jolt/Physics/Collision/ShapeFilter.h"
 
 class JoltBody3D;
 class JoltPhysicsServer3D;
diff --git a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
index d117a7eb..e62e7289 100644
--- a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
@@ -44,16 +44,16 @@
 #include "jolt_query_filter_3d.h"
 #include "jolt_space_3d.h"
 
-#include <Jolt/Geometry/GJKClosestPoint.h>
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Body/BodyFilter.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h>
-#include <Jolt/Physics/Collision/CastResult.h>
-#include <Jolt/Physics/Collision/CollidePointResult.h>
-#include <Jolt/Physics/Collision/NarrowPhaseQuery.h>
-#include <Jolt/Physics/Collision/RayCast.h>
-#include <Jolt/Physics/Collision/Shape/MeshShape.h>
-#include <Jolt/Physics/PhysicsSystem.h>
+#include "Jolt/Geometry/GJKClosestPoint.h"
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Body/BodyFilter.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h"
+#include "Jolt/Physics/Collision/CastResult.h"
+#include "Jolt/Physics/Collision/CollidePointResult.h"
+#include "Jolt/Physics/Collision/NarrowPhaseQuery.h"
+#include "Jolt/Physics/Collision/RayCast.h"
+#include "Jolt/Physics/Collision/Shape/MeshShape.h"
+#include "Jolt/Physics/PhysicsSystem.h"
 
 bool JoltPhysicsDirectSpaceState3D::_cast_motion_impl(const JPH::Shape &p_jolt_shape, const Transform3D &p_transform_com, const Vector3 &p_scale, const Vector3 &p_motion, bool p_use_edge_removal, bool p_ignore_overlaps, const JPH::CollideShapeSettings &p_settings, const JPH::BroadPhaseLayerFilter &p_broad_phase_layer_filter, const JPH::ObjectLayerFilter &p_object_layer_filter, const JPH::BodyFilter &p_body_filter, const JPH::ShapeFilter &p_shape_filter, real_t &r_closest_safe, real_t &r_closest_unsafe) const {
 	r_closest_safe = 1.0f;
@@ -100,7 +100,7 @@ bool JoltPhysicsDirectSpaceState3D::_cast_motion_impl(const JPH::Shape &p_jolt_s
 			eier_settings.mActiveEdgeMode = JPH::EActiveEdgeMode::CollideWithAll;
 			eier_settings.mCollectFacesMode = JPH::ECollectFacesMode::CollectFaces;
 
-			JPH::InternalEdgeRemovingCollector eier_collector(collector, JPH::cDefaultInternalEdgeRemovalVertexToleranceSq);
+			JPH::InternalEdgeRemovingCollector eier_collector(collector);
 			other_shape.CollideShape(&motion_shape, scale, transform_com, eier_settings, base_offset, eier_collector, p_shape_filter);
 			eier_collector.Flush();
 		} else {
diff --git a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
index d28af77b..3dd9eda0 100644
--- a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
@@ -32,15 +32,15 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Body/BodyFilter.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
-#include <Jolt/Physics/Collision/ContactListener.h>
-#include <Jolt/Physics/Collision/ObjectLayer.h>
-#include <Jolt/Physics/Collision/Shape/Shape.h>
-#include <Jolt/Physics/Collision/ShapeFilter.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Body/BodyFilter.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include "Jolt/Physics/Collision/ContactListener.h"
+#include "Jolt/Physics/Collision/ObjectLayer.h"
+#include "Jolt/Physics/Collision/Shape/Shape.h"
+#include "Jolt/Physics/Collision/ShapeFilter.h"
 
 class JoltBody3D;
 class JoltShape3D;
diff --git a/engine/modules/jolt_physics/spaces/jolt_query_collectors.h b/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
index 9de4cb72..10fa1d20 100644
--- a/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
+++ b/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
@@ -30,11 +30,14 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "../jolt_project_settings.h"
+#include "jolt_space_3d.h"
 
-#include <Jolt/Core/STLLocalAllocator.h>
-#include <Jolt/Physics/Collision/InternalEdgeRemovingCollector.h>
-#include <Jolt/Physics/Collision/Shape/Shape.h>
+#include "Jolt/Jolt.h"
+
+#include "Jolt/Core/STLLocalAllocator.h"
+#include "Jolt/Physics/Collision/InternalEdgeRemovingCollector.h"
+#include "Jolt/Physics/Collision/Shape/Shape.h"
 
 template <typename TBase, int TDefaultCapacity>
 class JoltQueryCollectorAll final : public TBase {
diff --git a/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h b/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
index e0cadf46..0d89b6c8 100644
--- a/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
@@ -33,12 +33,12 @@
 #include "core/templates/hash_set.h"
 #include "core/templates/rid.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Physics/Body/Body.h>
-#include <Jolt/Physics/Body/BodyFilter.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
-#include <Jolt/Physics/Collision/ObjectLayer.h>
+#include "Jolt/Physics/Body/Body.h"
+#include "Jolt/Physics/Body/BodyFilter.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include "Jolt/Physics/Collision/ObjectLayer.h"
 
 class JoltPhysicsDirectSpaceState3D;
 class JoltSpace3D;
diff --git a/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
index 1236ad04..402b0748 100644
--- a/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
@@ -36,20 +36,22 @@
 #include "../misc/jolt_stream_wrappers.h"
 #include "../objects/jolt_area_3d.h"
 #include "../objects/jolt_body_3d.h"
+#include "../shapes/jolt_custom_shape_type.h"
 #include "../shapes/jolt_shape_3d.h"
 #include "jolt_body_activation_listener_3d.h"
 #include "jolt_contact_listener_3d.h"
 #include "jolt_layers.h"
 #include "jolt_physics_direct_space_state_3d.h"
+#include "jolt_temp_allocator.h"
 
 #include "core/io/file_access.h"
 #include "core/os/time.h"
 #include "core/string/print_string.h"
 #include "core/variant/variant_utility.h"
 
-#include <Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h>
-#include <Jolt/Physics/Collision/CollisionCollectorImpl.h>
-#include <Jolt/Physics/PhysicsScene.h>
+#include "Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h"
+#include "Jolt/Physics/Collision/CollisionCollectorImpl.h"
+#include "Jolt/Physics/PhysicsScene.h"
 
 namespace {
 
@@ -83,23 +85,9 @@ void JoltSpace3D::_pre_step(float p_step) {
 		JoltObject3D *object = reinterpret_cast<JoltObject3D *>(jolt_body->GetUserData());
 		object->pre_step(p_step, *jolt_body);
 	}
-
-	const JPH::BodyID *active_soft_bodies = physics_system->GetActiveBodiesUnsafe(JPH::EBodyType::SoftBody);
-	const JPH::uint32 active_soft_body_count = physics_system->GetNumActiveBodies(JPH::EBodyType::SoftBody);
-
-	for (JPH::uint32 i = 0; i < active_soft_body_count; i++) {
-		JPH::Body *jolt_body = lock_iface.TryGetBody(active_soft_bodies[i]);
-		JoltObject3D *object = reinterpret_cast<JoltObject3D *>(jolt_body->GetUserData());
-		object->pre_step(p_step, *jolt_body);
-	}
-
-	physics_system->SetBodyActivationListener(body_activation_listener);
 }
 
 void JoltSpace3D::_post_step(float p_step) {
-	// We only want a listener during the step, as it will otherwise be called when pending bodies are flushed, which causes issues (e.g. GH-115322).
-	physics_system->SetBodyActivationListener(nullptr);
-
 	contact_listener->post_step();
 
 	while (shapes_changed_list.first()) {
@@ -109,9 +97,9 @@ void JoltSpace3D::_post_step(float p_step) {
 	}
 }
 
-JoltSpace3D::JoltSpace3D(JPH::JobSystem *p_job_system, JPH::TempAllocator *p_temp_allocator) :
+JoltSpace3D::JoltSpace3D(JPH::JobSystem *p_job_system) :
 		job_system(p_job_system),
-		temp_allocator(p_temp_allocator),
+		temp_allocator(new JoltTempAllocator()),
 		layers(new JoltLayers()),
 		contact_listener(new JoltContactListener3D(this)),
 		body_activation_listener(new JoltBodyActivationListener3D()),
@@ -185,6 +173,11 @@ JoltSpace3D::~JoltSpace3D() {
 		delete layers;
 		layers = nullptr;
 	}
+
+	if (temp_allocator != nullptr) {
+		delete temp_allocator;
+		temp_allocator = nullptr;
+	}
 }
 
 void JoltSpace3D::step(float p_step) {
@@ -193,6 +186,8 @@ void JoltSpace3D::step(float p_step) {
 
 	_pre_step(p_step);
 
+	physics_system->SetBodyActivationListener(body_activation_listener);
+
 	const JPH::EPhysicsUpdateError update_error = physics_system->Update(p_step, 1, temp_allocator, job_system);
 
 	if ((update_error & JPH::EPhysicsUpdateError::ManifoldCacheFull) != JPH::EPhysicsUpdateError::None) {
@@ -216,6 +211,9 @@ void JoltSpace3D::step(float p_step) {
 				JoltProjectSettings::max_contact_constraints));
 	}
 
+	// We only want a listener during the step, as it will otherwise be called when pending bodies are flushed, which causes issues (e.g. GH-115322).
+	physics_system->SetBodyActivationListener(nullptr);
+
 	_post_step(p_step);
 
 	stepping = false;
@@ -384,6 +382,22 @@ JoltPhysicsDirectSpaceState3D *JoltSpace3D::get_direct_state() {
 	return direct_state;
 }
 
+void JoltSpace3D::set_default_area(JoltArea3D *p_area) {
+	if (default_area == p_area) {
+		return;
+	}
+
+	if (default_area != nullptr) {
+		default_area->set_default_area(false);
+	}
+
+	default_area = p_area;
+
+	if (default_area != nullptr) {
+		default_area->set_default_area(true);
+	}
+}
+
 JPH::Body *JoltSpace3D::add_object(const JoltObject3D &p_object, const JPH::BodyCreationSettings &p_settings, bool p_sleeping) {
 	JPH::BodyInterface &body_iface = get_body_iface();
 	JPH::Body *jolt_body = body_iface.CreateBody(p_settings);
@@ -569,7 +583,8 @@ void JoltSpace3D::dump_debug_snapshot(const String &p_dir) {
 		const JoltObject3D *object = reinterpret_cast<const JoltObject3D *>(settings.mUserData);
 
 		if (const JoltBody3D *body = object->as_body()) {
-			// Since we apply our own damping, while leaving Jolt's own values at zero, we need to transfer over the correct values.
+			// Since we do our own integration of gravity and damping, while leaving Jolt's own values at zero, we need to transfer over the correct values.
+			settings.mGravityFactor = body->get_gravity_scale();
 			settings.mLinearDamping = body->get_total_linear_damp();
 			settings.mAngularDamping = body->get_total_angular_damp();
 		}
diff --git a/engine/modules/jolt_physics/spaces/jolt_space_3d.h b/engine/modules/jolt_physics/spaces/jolt_space_3d.h
index deb36ac9..58ec8ed9 100644
--- a/engine/modules/jolt_physics/spaces/jolt_space_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_space_3d.h
@@ -32,15 +32,15 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Core/JobSystem.h>
-#include <Jolt/Core/TempAllocator.h>
-#include <Jolt/Physics/Body/BodyInterface.h>
-#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h>
-#include <Jolt/Physics/Collision/NarrowPhaseQuery.h>
-#include <Jolt/Physics/Constraints/Constraint.h>
-#include <Jolt/Physics/PhysicsSystem.h>
+#include "Jolt/Core/JobSystem.h"
+#include "Jolt/Core/TempAllocator.h"
+#include "Jolt/Physics/Body/BodyInterface.h"
+#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h"
+#include "Jolt/Physics/Collision/NarrowPhaseQuery.h"
+#include "Jolt/Physics/Constraints/Constraint.h"
+#include "Jolt/Physics/PhysicsSystem.h"
 
 class JoltArea3D;
 class JoltBody3D;
@@ -85,7 +85,7 @@ class JoltSpace3D {
 	void _post_step(float p_step);
 
 public:
-	explicit JoltSpace3D(JPH::JobSystem *p_job_system, JPH::TempAllocator *p_temp_allocator);
+	explicit JoltSpace3D(JPH::JobSystem *p_job_system);
 	~JoltSpace3D();
 
 	void step(float p_step);
@@ -127,7 +127,7 @@ public:
 	JoltPhysicsDirectSpaceState3D *get_direct_state();
 
 	JoltArea3D *get_default_area() const { return default_area; }
-	void set_default_area(JoltArea3D *p_area) { default_area = p_area; }
+	void set_default_area(JoltArea3D *p_area);
 
 	float get_last_step() const { return last_step; }
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
index f3df36fc..097c981d 100644
--- a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
@@ -52,7 +52,7 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WIT
 
 #include "core/variant/variant.h"
 
-#include <Jolt/Core/Memory.h>
+#include "Jolt/Core/Memory.h"
 
 namespace {
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
index 03db87fe..f6fe47eb 100644
--- a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
+++ b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include <Jolt/Jolt.h>
+#include "Jolt/Jolt.h"
 
-#include <Jolt/Core/TempAllocator.h>
+#include "Jolt/Core/TempAllocator.h"
 
 #include <cstdint>
 
diff --git a/engine/modules/jpg/image_loader_libjpeg_turbo.cpp b/engine/modules/jpg/image_loader_libjpeg_turbo.cpp
index 8a56d837..f5b93e9c 100644
--- a/engine/modules/jpg/image_loader_libjpeg_turbo.cpp
+++ b/engine/modules/jpg/image_loader_libjpeg_turbo.cpp
@@ -34,7 +34,7 @@
 
 Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {
 	tjhandle tj_instance = tj3Init(TJINIT_DECOMPRESS);
-	if (tj_instance == nullptr) {
+	if (tj_instance == NULL) {
 		return FAILED;
 	}
 
@@ -48,8 +48,7 @@ Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer,
 	const TJCS colorspace = (TJCS)tj3Get(tj_instance, TJPARAM_COLORSPACE);
 
 	if (tj3Get(tj_instance, TJPARAM_PRECISION) > 8) {
-		// TODO: Proceed anyway and convert to rgb8?
-		ERR_PRINT("JPEGTurbo: JPEG files with precision > 8 are not currently supported.");
+		// Proceed anyway and convert to rgb8?
 		tj3Destroy(tj_instance);
 		return ERR_UNAVAILABLE;
 	}
@@ -59,12 +58,8 @@ Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer,
 	if (colorspace == TJCS_GRAY) {
 		tj_pixel_format = TJPF_GRAY;
 		gd_pixel_format = Image::FORMAT_L8;
-	} else if (colorspace == TJCS_CMYK || colorspace == TJCS_YCCK) {
-		ERR_PRINT("JPEGTurbo: JPEG files with CMYK or YCCK colorspaces are not currently supported.");
-		tj3Destroy(tj_instance);
-		return ERR_UNAVAILABLE;
 	} else {
-		// Other color spaces should be RGB.
+		// Force everything else (RGB, CMYK etc) into RGB8.
 		tj_pixel_format = TJPF_RGB;
 		gd_pixel_format = Image::FORMAT_RGB8;
 	}
@@ -128,7 +123,7 @@ static Vector<uint8_t> _jpeg_turbo_buffer_save_func(const Ref<Image> &p_img, flo
 	}
 
 	tjhandle tj_instance = tj3Init(TJINIT_COMPRESS);
-	ERR_FAIL_COND_V_MSG(tj_instance == nullptr, output, "Couldn't create tjhandle");
+	ERR_FAIL_COND_V_MSG(tj_instance == NULL, output, "Couldn't create tjhandle");
 
 	if (tj3Set(tj_instance, TJPARAM_QUALITY, (int)(p_quality * 100)) < 0) {
 		tj3Destroy(tj_instance);
@@ -148,7 +143,7 @@ static Vector<uint8_t> _jpeg_turbo_buffer_save_func(const Ref<Image> &p_img, flo
 	// If the godot image format is `Image::FORMAT_L8` we could set the appropriate
 	// color space here rather than defaulting to RGB.
 
-	unsigned char *jpeg_buff = nullptr;
+	unsigned char *jpeg_buff = NULL;
 	size_t jpeg_size = 0;
 	int code = tj3Compress8(
 			tj_instance,
diff --git a/engine/modules/jpg/movie_writer_mjpeg.cpp b/engine/modules/jpg/movie_writer_mjpeg.cpp
index fdd90c03..0114c134 100644
--- a/engine/modules/jpg/movie_writer_mjpeg.cpp
+++ b/engine/modules/jpg/movie_writer_mjpeg.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "movie_writer_mjpeg.h"
-
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 
diff --git a/engine/modules/jpg/register_types.cpp b/engine/modules/jpg/register_types.cpp
index 9af3d426..fe5a46be 100644
--- a/engine/modules/jpg/register_types.cpp
+++ b/engine/modules/jpg/register_types.cpp
@@ -33,8 +33,6 @@
 #include "image_loader_libjpeg_turbo.h"
 #include "movie_writer_mjpeg.h"
 
-#include "core/object/class_db.h"
-
 static Ref<ImageLoaderLibJPEGTurbo> image_loader_libjpeg_turbo;
 static MovieWriterMJPEG *writer_mjpeg = nullptr;
 
diff --git a/engine/modules/jsonrpc/SCsub b/engine/modules/jsonrpc/SCsub
index 7892e03f..923567b1 100644
--- a/engine/modules/jsonrpc/SCsub
+++ b/engine/modules/jsonrpc/SCsub
@@ -8,4 +8,8 @@ env_jsonrpc = env_modules.Clone()
 env_jsonrpc.add_source_files(env.modules_sources, "*.cpp")
 
 if env["tests"]:
+    env_jsonrpc.Append(CPPDEFINES=["TESTS_ENABLED"])
     env_jsonrpc.add_source_files(env.modules_sources, "./tests/*.cpp")
+
+    if env["disable_exceptions"]:
+        env_jsonrpc.Append(CPPDEFINES=["DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS"])
diff --git a/engine/modules/jsonrpc/jsonrpc.compat.inc b/engine/modules/jsonrpc/jsonrpc.compat.inc
index 16d40998..ad56dc61 100644
--- a/engine/modules/jsonrpc/jsonrpc.compat.inc
+++ b/engine/modules/jsonrpc/jsonrpc.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "jsonrpc.h"
-
-#include "core/object/class_db.h"
-
 void JSONRPC::_set_scope_bind_compat_104890(const String &p_scope, Object *p_obj) {
 	ERR_PRINT("JSONRPC::set_scope is not supported anymore. Upgrade to JSONRPC::set_method.");
 }
@@ -42,4 +38,4 @@ void JSONRPC::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("set_scope", "scope", "target"), &JSONRPC::_set_scope_bind_compat_104890);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/modules/jsonrpc/jsonrpc.cpp b/engine/modules/jsonrpc/jsonrpc.cpp
index b94a2a12..ae463287 100644
--- a/engine/modules/jsonrpc/jsonrpc.cpp
+++ b/engine/modules/jsonrpc/jsonrpc.cpp
@@ -32,7 +32,6 @@
 #include "jsonrpc.compat.inc"
 
 #include "core/io/json.h"
-#include "core/object/class_db.h"
 
 JSONRPC::JSONRPC() {
 }
diff --git a/engine/modules/jsonrpc/jsonrpc.h b/engine/modules/jsonrpc/jsonrpc.h
index eac5b1dd..254bb3fc 100644
--- a/engine/modules/jsonrpc/jsonrpc.h
+++ b/engine/modules/jsonrpc/jsonrpc.h
@@ -30,8 +30,7 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/variant/type_info.h"
+#include "core/object/class_db.h"
 #include "core/variant/variant.h"
 
 class JSONRPC : public Object {
diff --git a/engine/modules/jsonrpc/tests/test_jsonrpc.h b/engine/modules/jsonrpc/tests/test_jsonrpc.h
index b334d194..9e855d8e 100644
--- a/engine/modules/jsonrpc/tests/test_jsonrpc.h
+++ b/engine/modules/jsonrpc/tests/test_jsonrpc.h
@@ -30,12 +30,11 @@
 
 #pragma once
 
-#include "../jsonrpc.h"
-
-#include "core/object/callable_mp.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
+#include "../jsonrpc.h"
+
 namespace TestJSONRPC {
 
 void check_invalid(const Dictionary &p_dict);
diff --git a/engine/modules/ktx/register_types.cpp b/engine/modules/ktx/register_types.cpp
index 65c717c8..afc57e9e 100644
--- a/engine/modules/ktx/register_types.cpp
+++ b/engine/modules/ktx/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "texture_loader_ktx.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 static Ref<ResourceFormatKTX> resource_loader_ktx;
diff --git a/engine/modules/ktx/texture_loader_ktx.cpp b/engine/modules/ktx/texture_loader_ktx.cpp
index 83eb4f1b..f71444f7 100644
--- a/engine/modules/ktx/texture_loader_ktx.cpp
+++ b/engine/modules/ktx/texture_loader_ktx.cpp
@@ -32,7 +32,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/modules/ktx/texture_loader_ktx.h b/engine/modules/ktx/texture_loader_ktx.h
index 3eac093b..8da18063 100644
--- a/engine/modules/ktx/texture_loader_ktx.h
+++ b/engine/modules/ktx/texture_loader_ktx.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/resource_loader.h"
+#include "scene/resources/texture.h"
 
 class ResourceFormatKTX : public ResourceFormatLoader {
 	GDSOFTCLASS(ResourceFormatKTX, ResourceFormatLoader);
diff --git a/engine/modules/lightmapper_rd/lightmapper_rd.cpp b/engine/modules/lightmapper_rd/lightmapper_rd.cpp
index 6699d4f2..a51a9a15 100644
--- a/engine/modules/lightmapper_rd/lightmapper_rd.cpp
+++ b/engine/modules/lightmapper_rd/lightmapper_rd.cpp
@@ -30,6 +30,7 @@
 
 #include "lightmapper_rd.h"
 
+#include "core/string/print_string.h"
 #include "lm_blendseams.glsl.gen.h"
 #include "lm_compute.glsl.gen.h"
 #include "lm_raster.glsl.gen.h"
@@ -37,14 +38,9 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/math/geometry_2d.h"
-#include "core/math/geometry_3d.h"
-#include "core/os/os.h"
-#include "core/string/print_string.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
-#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 #if defined(VULKAN_ENABLED)
@@ -229,7 +225,7 @@ void LightmapperRD::_sort_triangle_clusters(uint32_t p_cluster_size, uint32_t p_
 				break;
 		}
 
-		uint32_t left_cluster_count = Math::next_power_of_2(p_count / 2);
+		uint32_t left_cluster_count = next_power_of_2(p_count / 2);
 		left_cluster_count = MAX(left_cluster_count, p_cluster_size);
 		left_cluster_count = MIN(left_cluster_count, p_count);
 		_sort_triangle_clusters(p_cluster_size, p_cluster_index, p_index_start, left_cluster_count, p_triangle_sort, p_cluster_aabb);
@@ -260,8 +256,8 @@ Lightmapper::BakeError LightmapperRD::_blit_meshes_into_atlas(int p_max_texture_
 		atlas_size = atlas_size.max(s + Size2i(2, 2).maxi(p_denoiser_range) * p_supersampling_factor);
 	}
 
-	int max = Math::nearest_power_of_2_templated(atlas_size.width);
-	max = MAX(max, Math::nearest_power_of_2_templated(atlas_size.height));
+	int max = nearest_power_of_2_templated(atlas_size.width);
+	max = MAX(max, nearest_power_of_2_templated(atlas_size.height));
 
 	if (max > p_max_texture_size) {
 		return BAKE_ERROR_TEXTURE_EXCEEDS_MAX_SIZE;
@@ -499,7 +495,7 @@ void LightmapperRD::_create_acceleration_structures(RenderingDevice *rd, Size2i
 			t.max_bounds[1] = taabb.position.y + MAX(taabb.size.y, 0.0001);
 			t.max_bounds[2] = taabb.position.z + MAX(taabb.size.z, 0.0001);
 
-			t.cull_mode = RSE::CULL_MODE_BACK;
+			t.cull_mode = RS::CULL_MODE_BACK;
 
 			RID material = mi.data.material[i];
 			if (material.is_valid()) {
@@ -1019,7 +1015,7 @@ LightmapperRD::BakeError LightmapperRD::_denoise(RenderingDevice *p_rd, Ref<RDSh
 	// We denoise in fixed size regions and synchronize execution to avoid GPU timeouts.
 	// We use a region with 1/4 the amount of pixels if we're denoising SH lightmaps, as
 	// all four of them are denoised in the shader in one dispatch.
-	const int user_region_size = Math::nearest_power_of_2_templated(int(GLOBAL_GET("rendering/lightmapping/bake_performance/region_size")));
+	const int user_region_size = nearest_power_of_2_templated(int(GLOBAL_GET("rendering/lightmapping/bake_performance/region_size")));
 	const int max_region_size = p_bake_sh ? user_region_size / 2 : user_region_size;
 	int x_regions = Math::division_round_up(p_atlas_size.width, max_region_size);
 	int y_regions = Math::division_round_up(p_atlas_size.height, max_region_size);
@@ -1172,19 +1168,19 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 	RID shadowmask_tex;
 	RID shadowmask_tex2;
 
-#define FREE_TEXTURES \
-	rd->free_rid(albedo_array_tex); \
-	rd->free_rid(emission_array_tex); \
-	rd->free_rid(normal_tex); \
-	rd->free_rid(position_tex); \
-	rd->free_rid(unocclude_tex); \
-	rd->free_rid(light_source_tex); \
-	rd->free_rid(light_accum_tex2); \
-	rd->free_rid(light_accum_tex); \
+#define FREE_TEXTURES                    \
+	rd->free_rid(albedo_array_tex);      \
+	rd->free_rid(emission_array_tex);    \
+	rd->free_rid(normal_tex);            \
+	rd->free_rid(position_tex);          \
+	rd->free_rid(unocclude_tex);         \
+	rd->free_rid(light_source_tex);      \
+	rd->free_rid(light_accum_tex2);      \
+	rd->free_rid(light_accum_tex);       \
 	rd->free_rid(light_environment_tex); \
-	if (p_bake_shadowmask) { \
-		rd->free_rid(shadowmask_tex); \
-		rd->free_rid(shadowmask_tex2); \
+	if (p_bake_shadowmask) {             \
+		rd->free_rid(shadowmask_tex);    \
+		rd->free_rid(shadowmask_tex2);   \
 	}
 
 	{ // create all textures
@@ -1289,16 +1285,16 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 
 	Vector<int> slice_seam_count;
 
-#define FREE_BUFFERS \
-	rd->free_rid(bake_parameters_buffer); \
-	rd->free_rid(vertex_buffer); \
-	rd->free_rid(triangle_buffer); \
-	rd->free_rid(lights_buffer); \
+#define FREE_BUFFERS                       \
+	rd->free_rid(bake_parameters_buffer);  \
+	rd->free_rid(vertex_buffer);           \
+	rd->free_rid(triangle_buffer);         \
+	rd->free_rid(lights_buffer);           \
 	rd->free_rid(triangle_indices_buffer); \
-	rd->free_rid(cluster_indices_buffer); \
-	rd->free_rid(cluster_aabbs_buffer); \
-	rd->free_rid(grid_texture); \
-	rd->free_rid(seams_buffer); \
+	rd->free_rid(cluster_indices_buffer);  \
+	rd->free_rid(cluster_aabbs_buffer);    \
+	rd->free_rid(grid_texture);            \
+	rd->free_rid(seams_buffer);            \
 	rd->free_rid(probe_positions_buffer);
 
 	const uint32_t cluster_size = 16;
@@ -1540,9 +1536,9 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 	}
 #endif
 
-#define FREE_RASTER_RESOURCES \
+#define FREE_RASTER_RESOURCES       \
 	rd->free_rid(rasterize_shader); \
-	rd->free_rid(sampler); \
+	rd->free_rid(sampler);          \
 	rd->free_rid(raster_depth_buffer);
 
 	/* Plot direct light */
@@ -1601,9 +1597,9 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 
 	RID compute_base_uniform_set = rd->uniform_set_create(base_uniforms, compute_shader_primary, 0);
 
-#define FREE_COMPUTE_RESOURCES \
+#define FREE_COMPUTE_RESOURCES              \
 	rd->free_rid(compute_shader_unocclude); \
-	rd->free_rid(compute_shader_primary); \
+	rd->free_rid(compute_shader_primary);   \
 	rd->free_rid(compute_shader_secondary); \
 	rd->free_rid(compute_shader_light_probes);
 
@@ -1686,7 +1682,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 		}
 	}
 
-	const int max_region_size = Math::nearest_power_of_2_templated(int(GLOBAL_GET("rendering/lightmapping/bake_performance/region_size")));
+	const int max_region_size = nearest_power_of_2_templated(int(GLOBAL_GET("rendering/lightmapping/bake_performance/region_size")));
 	const int x_regions = Math::division_round_up(atlas_size.width, max_region_size);
 	const int y_regions = Math::division_round_up(atlas_size.height, max_region_size);
 
@@ -2182,7 +2178,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
 
 	ERR_FAIL_COND_V(blendseams_triangle_raster_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
 
-#define FREE_BLENDSEAMS_RESOURCES \
+#define FREE_BLENDSEAMS_RESOURCES                \
 	rd->free_rid(blendseams_line_raster_shader); \
 	rd->free_rid(blendseams_triangle_raster_shader);
 
diff --git a/engine/modules/lightmapper_rd/lightmapper_rd.h b/engine/modules/lightmapper_rd/lightmapper_rd.h
index d4e6ed5b..01113181 100644
--- a/engine/modules/lightmapper_rd/lightmapper_rd.h
+++ b/engine/modules/lightmapper_rd/lightmapper_rd.h
@@ -32,10 +32,10 @@
 
 #include "core/templates/local_vector.h"
 #include "scene/3d/lightmapper.h"
+#include "scene/resources/mesh.h"
+#include "servers/rendering/rendering_device.h"
 
-class RenderingDevice;
 class RDShaderFile;
-
 class LightmapperRD : public Lightmapper {
 	GDCLASS(LightmapperRD, Lightmapper)
 
diff --git a/engine/modules/lightmapper_rd/register_types.cpp b/engine/modules/lightmapper_rd/register_types.cpp
index 80b36e33..b00fe167 100644
--- a/engine/modules/lightmapper_rd/register_types.cpp
+++ b/engine/modules/lightmapper_rd/register_types.cpp
@@ -33,11 +33,10 @@
 #include "lightmapper_rd.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "scene/3d/lightmapper.h"
 
 #ifndef _3D_DISABLED
-static Ref<Lightmapper> create_lightmapper_rd() {
+static Lightmapper *create_lightmapper_rd() {
 	return memnew(LightmapperRD);
 }
 #endif
diff --git a/engine/modules/mbedtls/SCsub b/engine/modules/mbedtls/SCsub
index fbfa4eb3..6183fa59 100644
--- a/engine/modules/mbedtls/SCsub
+++ b/engine/modules/mbedtls/SCsub
@@ -139,8 +139,12 @@ module_obj = []
 env_mbed_tls.add_source_files(module_obj, "*.cpp")
 
 if env["tests"]:
+    env_mbed_tls.Append(CPPDEFINES=["TESTS_ENABLED"])
     env_mbed_tls.add_source_files(module_obj, "./tests/*.cpp")
 
+    if env["disable_exceptions"]:
+        env_mbed_tls.Append(CPPDEFINES=["DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS"])
+
 env.modules_sources += module_obj
 
 # Needed to force rebuilding the module files when the thirdparty library is updated.
diff --git a/engine/modules/mbedtls/crypto_mbedtls.cpp b/engine/modules/mbedtls/crypto_mbedtls.cpp
index b0483381..127504bf 100644
--- a/engine/modules/mbedtls/crypto_mbedtls.cpp
+++ b/engine/modules/mbedtls/crypto_mbedtls.cpp
@@ -33,7 +33,6 @@
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #include <mbedtls/debug.h>
@@ -321,7 +320,10 @@ void CryptoMbedTLS::initialize_crypto() {
 void CryptoMbedTLS::finalize_crypto() {
 	Crypto::_create = nullptr;
 	Crypto::_load_default_certificates = nullptr;
-	default_certs = nullptr;
+	if (default_certs) {
+		memdelete(default_certs);
+		default_certs = nullptr;
+	}
 	X509CertificateMbedTLS::finalize();
 	CryptoKeyMbedTLS::finalize();
 	HMACContextMbedTLS::finalize();
@@ -341,17 +343,17 @@ CryptoMbedTLS::~CryptoMbedTLS() {
 	mbedtls_entropy_free(&entropy);
 }
 
-Ref<X509CertificateMbedTLS> CryptoMbedTLS::default_certs;
+X509CertificateMbedTLS *CryptoMbedTLS::default_certs = nullptr;
 
-Ref<X509CertificateMbedTLS> CryptoMbedTLS::get_default_certificates() {
+X509CertificateMbedTLS *CryptoMbedTLS::get_default_certificates() {
 	return default_certs;
 }
 
 void CryptoMbedTLS::load_default_certificates(const String &p_path) {
-	ERR_FAIL_COND(default_certs.is_valid());
+	ERR_FAIL_COND(default_certs != nullptr);
 
 	default_certs = memnew(X509CertificateMbedTLS);
-	ERR_FAIL_COND(default_certs.is_null());
+	ERR_FAIL_NULL(default_certs);
 
 	if (!p_path.is_empty()) {
 		// Use certs defined in project settings.
diff --git a/engine/modules/mbedtls/crypto_mbedtls.h b/engine/modules/mbedtls/crypto_mbedtls.h
index 803dd805..2db47ebe 100644
--- a/engine/modules/mbedtls/crypto_mbedtls.h
+++ b/engine/modules/mbedtls/crypto_mbedtls.h
@@ -132,13 +132,13 @@ class CryptoMbedTLS : public Crypto {
 private:
 	mbedtls_entropy_context entropy;
 	mbedtls_ctr_drbg_context ctr_drbg;
-	static Ref<X509CertificateMbedTLS> default_certs;
+	static X509CertificateMbedTLS *default_certs;
 
 public:
 	static Crypto *create(bool p_notify_postinitialize = true);
 	static void initialize_crypto();
 	static void finalize_crypto();
-	static Ref<X509CertificateMbedTLS> get_default_certificates();
+	static X509CertificateMbedTLS *get_default_certificates();
 	static void load_default_certificates(const String &p_path);
 	static mbedtls_md_type_t md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size);
 
diff --git a/engine/modules/mbedtls/dtls_server_mbedtls.cpp b/engine/modules/mbedtls/dtls_server_mbedtls.cpp
index 1351a1d7..c1fd7429 100644
--- a/engine/modules/mbedtls/dtls_server_mbedtls.cpp
+++ b/engine/modules/mbedtls/dtls_server_mbedtls.cpp
@@ -32,8 +32,6 @@
 
 #include "packet_peer_mbed_dtls.h"
 
-#include "core/object/class_db.h"
-
 Error DTLSServerMbedTLS::setup(Ref<TLSOptions> p_options) {
 	ERR_FAIL_COND_V(p_options.is_null() || !p_options->is_server(), ERR_INVALID_PARAMETER);
 	ERR_FAIL_COND_V(cookies->setup() != OK, ERR_ALREADY_IN_USE);
diff --git a/engine/modules/mbedtls/packet_peer_mbed_dtls.cpp b/engine/modules/mbedtls/packet_peer_mbed_dtls.cpp
index 3316ac85..8c568d35 100644
--- a/engine/modules/mbedtls/packet_peer_mbed_dtls.cpp
+++ b/engine/modules/mbedtls/packet_peer_mbed_dtls.cpp
@@ -30,8 +30,6 @@
 
 #include "packet_peer_mbed_dtls.h"
 
-#include "core/object/class_db.h"
-
 int PacketPeerMbedDTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
 	if (buf == nullptr || len == 0) {
 		return 0;
diff --git a/engine/modules/mbedtls/register_types.cpp b/engine/modules/mbedtls/register_types.cpp
index 13e00839..aff1fad3 100644
--- a/engine/modules/mbedtls/register_types.cpp
+++ b/engine/modules/mbedtls/register_types.cpp
@@ -36,12 +36,15 @@
 #include "stream_peer_mbedtls.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
 
 #if MBEDTLS_VERSION_MAJOR >= 3
 #include <psa/crypto.h>
 #endif
 
+#ifdef TESTS_ENABLED
+#include "tests/test_crypto_mbedtls.h"
+#endif
+
 #ifdef GODOT_MBEDTLS_THREADING_ALT
 extern "C" {
 void godot_mbedtls_mutex_init(mbedtls_threading_mutex_t *p_mutex) {
diff --git a/engine/modules/mbedtls/stream_peer_mbedtls.cpp b/engine/modules/mbedtls/stream_peer_mbedtls.cpp
index 0f23ceb2..dfdad46d 100644
--- a/engine/modules/mbedtls/stream_peer_mbedtls.cpp
+++ b/engine/modules/mbedtls/stream_peer_mbedtls.cpp
@@ -31,7 +31,6 @@
 #include "stream_peer_mbedtls.h"
 
 #include "core/io/stream_peer_tcp.h"
-#include "core/object/class_db.h"
 
 int StreamPeerMbedTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
 	if (buf == nullptr || len == 0) {
diff --git a/engine/modules/mbedtls/tests/test_crypto_mbedtls.h b/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
index ec0acefc..c171a25b 100644
--- a/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
+++ b/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
@@ -30,7 +30,9 @@
 
 #pragma once
 
+#include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"
+
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
diff --git a/engine/modules/mbedtls/tls_context_mbedtls.cpp b/engine/modules/mbedtls/tls_context_mbedtls.cpp
index 9c791c50..68956391 100644
--- a/engine/modules/mbedtls/tls_context_mbedtls.cpp
+++ b/engine/modules/mbedtls/tls_context_mbedtls.cpp
@@ -193,17 +193,17 @@ Error TLSContextMbedTLS::init_client(int p_transport, const String &p_hostname,
 		mbedtls_ssl_set_hostname(&tls, cn.utf8().get_data());
 	}
 
-	Ref<X509CertificateMbedTLS> cas;
+	X509CertificateMbedTLS *cas = nullptr;
 
 	if (p_options->get_trusted_ca_chain().is_valid()) {
 		// Locking CA certificates
 		certs = p_options->get_trusted_ca_chain();
 		certs->lock();
-		cas = certs;
+		cas = certs.ptr();
 	} else {
 		// Fall back to default certificates (no need to lock those).
 		cas = CryptoMbedTLS::get_default_certificates();
-		if (cas.is_null()) {
+		if (cas == nullptr) {
 			clear();
 			ERR_FAIL_V_MSG(ERR_UNCONFIGURED, "SSL module failed to initialize!");
 		}
diff --git a/engine/modules/meshoptimizer/register_types.cpp b/engine/modules/meshoptimizer/register_types.cpp
index a709993a..ebfe5d9c 100644
--- a/engine/modules/meshoptimizer/register_types.cpp
+++ b/engine/modules/meshoptimizer/register_types.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/resources/surface_tool.h"
 
-#include <thirdparty/meshoptimizer/meshoptimizer.h>
+#include "thirdparty/meshoptimizer/meshoptimizer.h"
 
 void initialize_meshoptimizer_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
diff --git a/engine/modules/mobile_vr/doc_classes/MobileVRInterface.xml b/engine/modules/mobile_vr/doc_classes/MobileVRInterface.xml
index 5db420b1..00981e8a 100644
--- a/engine/modules/mobile_vr/doc_classes/MobileVRInterface.xml
+++ b/engine/modules/mobile_vr/doc_classes/MobileVRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MobileVRInterface" inherits="XRInterface" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="MobileVRInterface" inherits="XRInterface" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Generic mobile VR implementation.
 	</brief_description>
diff --git a/engine/modules/mobile_vr/mobile_vr_interface.cpp b/engine/modules/mobile_vr/mobile_vr_interface.cpp
index 39dfae30..9a64df21 100644
--- a/engine/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/engine/modules/mobile_vr/mobile_vr_interface.cpp
@@ -31,10 +31,9 @@
 #include "mobile_vr_interface.h"
 
 #include "core/input/input.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/renderer_compositor.h"
 
 StringName MobileVRInterface::get_name() const {
 	return "Native mobile";
@@ -510,10 +509,10 @@ Projection MobileVRInterface::get_projection_for_view(uint32_t p_view, double p_
 	return eye;
 }
 
-Vector<RenderingServerTypes::BlitToScreen> MobileVRInterface::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
+Vector<BlitToScreen> MobileVRInterface::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
 	_THREAD_SAFE_METHOD_
 
-	Vector<RenderingServerTypes::BlitToScreen> blit_to_screen;
+	Vector<BlitToScreen> blit_to_screen;
 
 	// We must have a valid render target.
 	ERR_FAIL_COND_V(!p_render_target.is_valid(), blit_to_screen);
@@ -529,7 +528,7 @@ Vector<RenderingServerTypes::BlitToScreen> MobileVRInterface::post_draw_viewport
 	Rect2 modified_screen_rect = Rect2(p_screen_rect.position + offset_rect.position * p_screen_rect.size, p_screen_rect.size * offset_rect.size);
 
 	// and add our blits
-	RenderingServerTypes::BlitToScreen blit;
+	BlitToScreen blit;
 	blit.render_target = p_render_target;
 	blit.multi_view.use_layer = true;
 	blit.lens_distortion.apply = true;
diff --git a/engine/modules/mobile_vr/mobile_vr_interface.h b/engine/modules/mobile_vr/mobile_vr_interface.h
index 10c8f4de..f09be911 100644
--- a/engine/modules/mobile_vr/mobile_vr_interface.h
+++ b/engine/modules/mobile_vr/mobile_vr_interface.h
@@ -165,7 +165,7 @@ public:
 	virtual Transform3D get_camera_transform() override;
 	virtual Transform3D get_transform_for_view(uint32_t p_view, const Transform3D &p_cam_transform) override;
 	virtual Projection get_projection_for_view(uint32_t p_view, double p_aspect, double p_z_near, double p_z_far) override;
-	virtual Vector<RenderingServerTypes::BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
 
 	virtual void process() override;
 
diff --git a/engine/modules/mobile_vr/register_types.cpp b/engine/modules/mobile_vr/register_types.cpp
index 0a55a009..4ae0c65a 100644
--- a/engine/modules/mobile_vr/register_types.cpp
+++ b/engine/modules/mobile_vr/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "mobile_vr_interface.h"
 
-#include "core/object/class_db.h"
-
 Ref<MobileVRInterface> mobile_vr;
 
 void initialize_mobile_vr_module(ModuleInitializationLevel p_level) {
diff --git a/engine/modules/modules_builders.py b/engine/modules/modules_builders.py
index 7823984e..318f0c6d 100644
--- a/engine/modules/modules_builders.py
+++ b/engine/modules/modules_builders.py
@@ -15,20 +15,24 @@ def modules_enabled_builder(target, source, env):
 def register_module_types_builder(target, source, env):
     modules = source[0].read()
     mod_inc = "\n".join([f'#include "{value}/register_types.h"' for value in modules.values()])
-    mod_init = "\n".join([
-        f"""\
+    mod_init = "\n".join(
+        [
+            f"""\
 #ifdef MODULE_{key.upper()}_ENABLED
 	initialize_{key}_module(p_level);
 #endif"""
-        for key in modules.keys()
-    ])
-    mod_uninit = "\n".join([
-        f"""\
+            for key in modules.keys()
+        ]
+    )
+    mod_uninit = "\n".join(
+        [
+            f"""\
 #ifdef MODULE_{key.upper()}_ENABLED
 	uninitialize_{key}_module(p_level);
 #endif"""
-        for key in modules.keys()
-    ])
+            for key in modules.keys()
+        ]
+    )
     with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
@@ -36,9 +40,7 @@ def register_module_types_builder(target, source, env):
 
 #include "modules/modules_enabled.gen.h"
 
-// IWYU pragma: begin_keep.
 {mod_inc}
-// IWYU pragma: end_keep.
 
 void initialize_modules(ModuleInitializationLevel p_level) {{
 {mod_init}
@@ -54,7 +56,5 @@ void uninitialize_modules(ModuleInitializationLevel p_level) {{
 def modules_tests_builder(target, source, env):
     headers = sorted([os.path.relpath(src.path, methods.base_folder).replace("\\", "/") for src in source])
     with methods.generated_wrapper(str(target[0])) as file:
-        file.write("// IWYU pragma: begin_keep.\n")
         for header in headers:
             file.write(f'#include "{header}"\n')
-        file.write("// IWYU pragma: end_keep.\n")
diff --git a/engine/modules/mono/build_scripts/build_assemblies.py b/engine/modules/mono/build_scripts/build_assemblies.py
index f74c3ebc..79b7abe6 100755
--- a/engine/modules/mono/build_scripts/build_assemblies.py
+++ b/engine/modules/mono/build_scripts/build_assemblies.py
@@ -183,11 +183,13 @@ def run_msbuild(tools: ToolsLocation, sln: str, chdir_to: str, msbuild_args: lis
         # The (Csc/Vbc/Fsc)ToolExe environment variables are required when
         # building with Mono's MSBuild. They must point to the batch files
         # in Mono's bin directory to make sure they are executed with Mono.
-        msbuild_env.update({
-            "CscToolExe": os.path.join(tools.mono_bin_dir, "csc.bat"),
-            "VbcToolExe": os.path.join(tools.mono_bin_dir, "vbc.bat"),
-            "FscToolExe": os.path.join(tools.mono_bin_dir, "fsharpc.bat"),
-        })
+        msbuild_env.update(
+            {
+                "CscToolExe": os.path.join(tools.mono_bin_dir, "csc.bat"),
+                "VbcToolExe": os.path.join(tools.mono_bin_dir, "vbc.bat"),
+                "FscToolExe": os.path.join(tools.mono_bin_dir, "fsharpc.bat"),
+            }
+        )
 
     # We want to control cwd when running msbuild, because that's where the search for global.json begins.
     return subprocess.call(args, env=msbuild_env, cwd=chdir_to)
diff --git a/engine/modules/mono/class_db_api_json.cpp b/engine/modules/mono/class_db_api_json.cpp
index d9b84f0c..5f92fcbd 100644
--- a/engine/modules/mono/class_db_api_json.cpp
+++ b/engine/modules/mono/class_db_api_json.cpp
@@ -35,6 +35,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/json.h"
+#include "core/version.h"
 
 void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 	Dictionary classes_dict;
@@ -50,9 +51,9 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 		}
 
 		Dictionary class_dict;
-		classes_dict[t->gdtype->get_name()] = class_dict;
+		classes_dict[t->name] = class_dict;
 
-		class_dict["inherits"] = t->gdtype->get_super_type_name();
+		class_dict["inherits"] = t->inherits;
 
 		{ //methods
 
@@ -121,7 +122,7 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			for (const KeyValue<StringName, int64_t> &F : t->gdtype->get_integer_constant_map(true)) {
+			for (const KeyValue<StringName, int64_t> &F : t->constant_map) {
 				snames.push_back(F.key);
 			}
 
@@ -134,7 +135,7 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 				constants.push_back(constant_dict);
 
 				constant_dict["name"] = F;
-				constant_dict["value"] = t->gdtype->get_integer_constant_map(true)[F];
+				constant_dict["value"] = t->constant_map[F];
 			}
 
 			if (!constants.is_empty()) {
@@ -146,7 +147,7 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			for (const KeyValue<StringName, const MethodInfo *> &F : t->gdtype->get_signal_map(true)) {
+			for (const KeyValue<StringName, MethodInfo> &F : t->signal_map) {
 				snames.push_back(F.key);
 			}
 
@@ -158,7 +159,7 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 				Dictionary signal_dict;
 				signals.push_back(signal_dict);
 
-				const MethodInfo &mi = *t->gdtype->get_signal_map(true)[F];
+				MethodInfo &mi = t->signal_map[F];
 				signal_dict["name"] = F;
 
 				Array arguments;
diff --git a/engine/modules/mono/config.py b/engine/modules/mono/config.py
index 24d028a9..0573fc66 100644
--- a/engine/modules/mono/config.py
+++ b/engine/modules/mono/config.py
@@ -1,4 +1,7 @@
 def can_build(env, platform):
+    if env["arch"].startswith("rv"):
+        return False
+
     if env.editor_build:
         env.module_add_dependencies("mono", ["regex"])
 
diff --git a/engine/modules/mono/csharp_script.cpp b/engine/modules/mono/csharp_script.cpp
index b3be32af..e06090c4 100644
--- a/engine/modules/mono/csharp_script.cpp
+++ b/engine/modules/mono/csharp_script.cpp
@@ -30,18 +30,14 @@
 
 #include "csharp_script.h"
 
-#include "godotsharp_defs.h"
 #include "godotsharp_dirs.h"
+#include "managed_callable.h"
 #include "mono_gd/gd_mono_cache.h"
 #include "signal_awaiter_utils.h"
 #include "utils/macros.h"
 #include "utils/naming_utils.h"
-#include "utils/string_utils.h"
-
-#ifdef GD_MONO_HOT_RELOAD
-#include "managed_callable.h"
 #include "utils/path_utils.h"
-#endif
+#include "utils/string_utils.h"
 
 #ifdef DEBUG_ENABLED
 #include "class_db_api_json.h"
@@ -52,12 +48,10 @@
 #include "editor/script_templates/templates.gen.h"
 #endif
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 #include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
@@ -65,20 +59,24 @@
 
 #ifdef TOOLS_ENABLED
 #include "core/os/keyboard.h"
+#include "editor/docks/inspector_dock.h"
+#include "editor/docks/signals_dock.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
-
-#ifdef GD_MONO_HOT_RELOAD
-#include "editor/docks/inspector_dock.h"
-#include "editor/docks/signals_dock.h"
-#endif
 #endif
 
 // Types that will be skipped over (in favor of their base types) when setting up instance bindings.
 // This must be a superset of `ignored_types` in bindings_generator.cpp.
 const Vector<String> ignored_types = {};
 
+#ifdef TOOLS_ENABLED
+static bool _create_project_solution_if_needed() {
+	CRASH_COND(CSharpLanguage::get_singleton()->get_godotsharp_editor() == nullptr);
+	return CSharpLanguage::get_singleton()->get_godotsharp_editor()->call("CreateProjectSolutionIfNeeded");
+}
+#endif
+
 CSharpLanguage *CSharpLanguage::singleton = nullptr;
 
 GDExtensionInstanceBindingCallbacks CSharpLanguage::_instance_binding_callbacks = {
@@ -402,6 +400,10 @@ String CSharpLanguage::validate_path(const String &p_path) const {
 	return "";
 }
 
+Script *CSharpLanguage::create_script() const {
+	return memnew(CSharpScript);
+}
+
 bool CSharpLanguage::supports_builtin_mode() const {
 	return false;
 }
@@ -1151,12 +1153,12 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
 	// workaround to allow GDExtension classes to be used from C# so long as they're only used through base classes that
 	// are registered from the engine. This will likely need to be removed whenever proper support for GDExtension
 	// classes is added to C#. See #75955 for more details.
-	while (classinfo && (!classinfo->exposed || classinfo->gdextension || ignored_types.has(classinfo->gdtype->get_name()))) {
+	while (classinfo && (!classinfo->exposed || classinfo->gdextension || ignored_types.has(classinfo->name))) {
 		classinfo = classinfo->inherits_ptr;
 	}
 
 	ERR_FAIL_NULL_V(classinfo, false);
-	type_name = classinfo->gdtype->get_name();
+	type_name = classinfo->name;
 
 	bool parent_is_object_class = ClassDB::is_parent_class(p_object->get_class_name(), type_name);
 	ERR_FAIL_COND_V_MSG(!parent_is_object_class, false,
@@ -2819,3 +2821,123 @@ void CSharpScript::get_members(HashSet<StringName> *p_members) {
 	}
 #endif // DEBUG_ENABLED
 }
+
+/*************** RESOURCE ***************/
+
+Ref<Resource> ResourceFormatLoaderCSharpScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	if (r_error) {
+		*r_error = ERR_FILE_CANT_OPEN;
+	}
+
+	// TODO ignore anything inside bin/ and obj/ in tools builds?
+
+	String real_path = p_path;
+	if (p_path.begins_with("csharp://")) {
+		// This is a virtual path used by generic types, extract the real path.
+		real_path = "res://" + p_path.trim_prefix("csharp://");
+		real_path = real_path.substr(0, real_path.rfind_char(':'));
+	}
+
+	Ref<CSharpScript> scr;
+
+	if (GDMonoCache::godot_api_cache_updated) {
+		GDMonoCache::managed_callbacks.ScriptManagerBridge_GetOrCreateScriptBridgeForPath(&p_path, &scr);
+		ERR_FAIL_COND_V_MSG(scr.is_null(), Ref<Resource>(), "Could not create C# script '" + real_path + "'.");
+	} else {
+		scr.instantiate();
+	}
+
+#ifdef DEBUG_ENABLED
+	Error err = scr->load_source_code(real_path);
+	ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), "Cannot load C# script file '" + real_path + "'.");
+#endif // DEBUG_ENABLED
+
+	// Only one instance of a C# script is allowed to exist.
+	ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(),
+			"The C# script path is different from the path it was registered in the C# dictionary.");
+
+	Ref<Resource> existing = ResourceCache::get_ref(p_path);
+	switch (p_cache_mode) {
+		case ResourceFormatLoader::CACHE_MODE_IGNORE:
+		case ResourceFormatLoader::CACHE_MODE_IGNORE_DEEP:
+			break;
+		case ResourceFormatLoader::CACHE_MODE_REUSE:
+			if (existing.is_null()) {
+				scr->set_path(p_original_path);
+			} else {
+				scr = existing;
+			}
+			break;
+		case ResourceFormatLoader::CACHE_MODE_REPLACE:
+		case ResourceFormatLoader::CACHE_MODE_REPLACE_DEEP:
+			scr->set_path(p_original_path, true);
+			break;
+	}
+
+	scr->reload();
+
+	if (r_error) {
+		*r_error = OK;
+	}
+
+	return scr;
+}
+
+void ResourceFormatLoaderCSharpScript::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("cs");
+}
+
+bool ResourceFormatLoaderCSharpScript::handles_type(const String &p_type) const {
+	return p_type == "Script" || p_type == CSharpLanguage::get_singleton()->get_type();
+}
+
+String ResourceFormatLoaderCSharpScript::get_resource_type(const String &p_path) const {
+	return p_path.has_extension("cs") ? CSharpLanguage::get_singleton()->get_type() : "";
+}
+
+Error ResourceFormatSaverCSharpScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Ref<CSharpScript> sqscr = p_resource;
+	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
+
+	String source = sqscr->get_source_code();
+
+#ifdef TOOLS_ENABLED
+	if (!FileAccess::exists(p_path)) {
+		// The file does not yet exist, let's assume the user just created this script. In such
+		// cases we need to check whether the solution and csproj were already created or not.
+		if (!_create_project_solution_if_needed()) {
+			ERR_PRINT("C# project could not be created; cannot add file: '" + p_path + "'.");
+		}
+	}
+#endif
+
+	{
+		Error err;
+		Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
+		ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot save C# script file '" + p_path + "'.");
+
+		file->store_string(source);
+
+		if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
+			return ERR_CANT_CREATE;
+		}
+	}
+
+#ifdef TOOLS_ENABLED
+	if (ScriptServer::is_reload_scripts_on_save_enabled()) {
+		CSharpLanguage::get_singleton()->reload_tool_script(p_resource, false);
+	}
+#endif
+
+	return OK;
+}
+
+void ResourceFormatSaverCSharpScript::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	if (Object::cast_to<CSharpScript>(p_resource.ptr())) {
+		p_extensions->push_back("cs");
+	}
+}
+
+bool ResourceFormatSaverCSharpScript::recognize(const Ref<Resource> &p_resource) const {
+	return Object::cast_to<CSharpScript>(p_resource.ptr()) != nullptr;
+}
diff --git a/engine/modules/mono/csharp_script.h b/engine/modules/mono/csharp_script.h
index 366f2be7..e98d8bf4 100644
--- a/engine/modules/mono/csharp_script.h
+++ b/engine/modules/mono/csharp_script.h
@@ -34,6 +34,8 @@
 #include "mono_gd/gd_mono.h"
 
 #include "core/doc_data.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "core/object/script_language.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/self_list.h"
@@ -511,6 +513,7 @@ public:
 		return true;
 	}
 	String validate_path(const String &p_path) const override;
+	Script *create_script() const override;
 	bool supports_builtin_mode() const override;
 	/* TODO? */ int find_function(const String &p_function, const String &p_code) const override {
 		return -1;
@@ -582,3 +585,22 @@ public:
 	CSharpLanguage();
 	~CSharpLanguage();
 };
+
+class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderCSharpScript, ResourceFormatLoader);
+
+public:
+	Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	void get_recognized_extensions(List<String> *p_extensions) const override;
+	bool handles_type(const String &p_type) const override;
+	String get_resource_type(const String &p_path) const override;
+};
+
+class ResourceFormatSaverCSharpScript : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverCSharpScript, ResourceFormatSaver);
+
+public:
+	Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/modules/mono/csharp_script_resource_format.cpp b/engine/modules/mono/csharp_script_resource_format.cpp
deleted file mode 100644
index 61f6772b..00000000
--- a/engine/modules/mono/csharp_script_resource_format.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/**************************************************************************/
-/*  csharp_script_resource_format.cpp                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "csharp_script_resource_format.h"
-
-#include "mono_gd/gd_mono_cache.h"
-
-#include "core/io/file_access.h"
-
-#ifdef TOOLS_ENABLED
-static bool _create_project_solution_if_needed() {
-	CRASH_COND(CSharpLanguage::get_singleton()->get_godotsharp_editor() == nullptr);
-	return CSharpLanguage::get_singleton()->get_godotsharp_editor()->call("CreateProjectSolutionIfNeeded");
-}
-#endif
-
-Ref<Resource> ResourceFormatLoaderCSharpScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	// TODO ignore anything inside bin/ and obj/ in tools builds?
-
-	String real_path = p_path;
-	if (p_path.begins_with("csharp://")) {
-		// This is a virtual path used by generic types, extract the real path.
-		real_path = "res://" + p_path.trim_prefix("csharp://");
-		real_path = real_path.substr(0, real_path.rfind_char(':'));
-	}
-
-	Ref<CSharpScript> scr;
-
-	if (GDMonoCache::godot_api_cache_updated) {
-		GDMonoCache::managed_callbacks.ScriptManagerBridge_GetOrCreateScriptBridgeForPath(&p_path, &scr);
-		ERR_FAIL_COND_V_MSG(scr.is_null(), Ref<Resource>(), "Could not create C# script '" + real_path + "'.");
-	} else {
-		scr.instantiate();
-	}
-
-#ifdef DEBUG_ENABLED
-	Error err = scr->load_source_code(real_path);
-	ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), "Cannot load C# script file '" + real_path + "'.");
-#endif // DEBUG_ENABLED
-
-	// Only one instance of a C# script is allowed to exist.
-	ERR_FAIL_COND_V_MSG(!scr->get_path().is_empty() && scr->get_path() != p_original_path, Ref<Resource>(),
-			"The C# script path is different from the path it was registered in the C# dictionary.");
-
-	Ref<Resource> existing = ResourceCache::get_ref(p_path);
-	switch (p_cache_mode) {
-		case ResourceFormatLoader::CACHE_MODE_IGNORE:
-		case ResourceFormatLoader::CACHE_MODE_IGNORE_DEEP:
-			break;
-		case ResourceFormatLoader::CACHE_MODE_REUSE:
-			if (existing.is_null()) {
-				scr->set_path(p_original_path);
-			} else {
-				scr = existing;
-			}
-			break;
-		case ResourceFormatLoader::CACHE_MODE_REPLACE:
-		case ResourceFormatLoader::CACHE_MODE_REPLACE_DEEP:
-			scr->set_path(p_original_path, true);
-			break;
-	}
-
-	scr->reload();
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return scr;
-}
-
-void ResourceFormatLoaderCSharpScript::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("cs");
-}
-
-bool ResourceFormatLoaderCSharpScript::handles_type(const String &p_type) const {
-	return p_type == "Script" || p_type == CSharpLanguage::get_singleton()->get_type();
-}
-
-String ResourceFormatLoaderCSharpScript::get_resource_type(const String &p_path) const {
-	return p_path.has_extension("cs") ? CSharpLanguage::get_singleton()->get_type() : "";
-}
-
-Error ResourceFormatSaverCSharpScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Ref<CSharpScript> sqscr = p_resource;
-	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
-
-	String source = sqscr->get_source_code();
-
-#ifdef TOOLS_ENABLED
-	if (!FileAccess::exists(p_path)) {
-		// The file does not yet exist, let's assume the user just created this script. In such
-		// cases we need to check whether the solution and csproj were already created or not.
-		if (!_create_project_solution_if_needed()) {
-			ERR_PRINT("C# project could not be created; cannot add file: '" + p_path + "'.");
-		}
-	}
-#endif
-
-	{
-		Error err;
-		Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
-		ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot save C# script file '" + p_path + "'.");
-
-		file->store_string(source);
-
-		if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
-			return ERR_CANT_CREATE;
-		}
-	}
-
-#ifdef TOOLS_ENABLED
-	if (ScriptServer::is_reload_scripts_on_save_enabled()) {
-		CSharpLanguage::get_singleton()->reload_tool_script(p_resource, false);
-	}
-#endif
-
-	return OK;
-}
-
-void ResourceFormatSaverCSharpScript::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	if (Object::cast_to<CSharpScript>(p_resource.ptr())) {
-		p_extensions->push_back("cs");
-	}
-}
-
-bool ResourceFormatSaverCSharpScript::recognize(const Ref<Resource> &p_resource) const {
-	return Object::cast_to<CSharpScript>(p_resource.ptr()) != nullptr;
-}
diff --git a/engine/modules/mono/csharp_script_resource_format.h b/engine/modules/mono/csharp_script_resource_format.h
deleted file mode 100644
index a01c750f..00000000
--- a/engine/modules/mono/csharp_script_resource_format.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/
-/*  csharp_script_resource_format.h                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-
-class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderCSharpScript, ResourceFormatLoader);
-
-public:
-	Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	void get_recognized_extensions(List<String> *p_extensions) const override;
-	bool handles_type(const String &p_type) const override;
-	String get_resource_type(const String &p_path) const override;
-};
-
-class ResourceFormatSaverCSharpScript : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverCSharpScript, ResourceFormatSaver);
-
-public:
-	Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/modules/mono/doc_classes/CSharpScript.xml b/engine/modules/mono/doc_classes/CSharpScript.xml
index a238b625..7e14259d 100644
--- a/engine/modules/mono/doc_classes/CSharpScript.xml
+++ b/engine/modules/mono/doc_classes/CSharpScript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSharpScript" inherits="Script" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="CSharpScript" inherits="Script" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A script implemented in the C# programming language, saved with the [code].cs[/code] extension (Mono-enabled builds only).
 	</brief_description>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
index b3d8bf3d..92dc80d5 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
@@ -7,7 +7,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>Godot.NET.Sdk</PackageId>
-    <Version>4.7.0</Version>
+    <Version>4.6.3</Version>
     <PackageVersion>$(PackageVersion_Godot_NET_Sdk)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
index e0fd2bca..80749a9e 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
@@ -25,7 +25,7 @@
 
   <!-- C# source generators -->
   <ItemGroup Condition=" '$(DisableImplicitGodotGeneratorReferences)' != 'true' ">
-    <PackageReference Include="Godot.SourceGenerators" IsImplicitlyDefined="true" Version="$(PackageVersion_Godot_SourceGenerators)" ReferenceOutputAssembly="false" PrivateAssets="all" />
+    <PackageReference Include="Godot.SourceGenerators" IsImplicitlyDefined="true" Version="$(PackageVersion_Godot_SourceGenerators)" />
   </ItemGroup>
 
   <!-- Godot API references -->
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/EventSignals_ScriptSignals.generated.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/EventSignals_ScriptSignals.generated.cs
index 9ddb4ab8..5af859c0 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/EventSignals_ScriptSignals.generated.cs
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/EventSignals_ScriptSignals.generated.cs
@@ -34,7 +34,7 @@ partial class EventSignals
 }
     protected void EmitSignalMySignal(string @str, int @num)
     {
-        EmitSignal(SignalName.MySignal, [@str, @num]);
+        EmitSignal(SignalName.MySignal, @str, @num);
     }
     /// <inheritdoc/>
     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
index 1a4f8bb2..fce5ff48 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
@@ -10,7 +10,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>Godot.SourceGenerators</PackageId>
-    <Version>4.7.0</Version>
+    <Version>4.6.3</Version>
     <PackageVersion>$(PackageVersion_Godot_SourceGenerators)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs
index e711614f..a860ce8f 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs
@@ -303,25 +303,20 @@ namespace Godot.SourceGenerators
                 }
                 source.Append(")\n");
                 source.Append("    {\n");
-                source.Append($"        EmitSignal(SignalName.{signalName}, [");
+                source.Append($"        EmitSignal(SignalName.{signalName}");
                 foreach (var paramSymbol in invokeMethodSymbol.Parameters)
                 {
-                    if (paramSymbol.Ordinal != 0)
-                    {
-                        source.Append(", ");
-                    }
-
                     // Enums must be converted to the underlying type before they can be implicitly converted to Variant
                     if (paramSymbol.Type.TypeKind == TypeKind.Enum)
                     {
                         var underlyingType = ((INamedTypeSymbol)paramSymbol.Type).EnumUnderlyingType!;
-                        source.Append($"({underlyingType.FullQualifiedNameIncludeGlobal()})@{paramSymbol.Name}");
+                        source.Append($", ({underlyingType.FullQualifiedNameIncludeGlobal()})@{paramSymbol.Name}");
                         continue;
                     }
 
-                    source.Append($"@{paramSymbol.Name}");
+                    source.Append($", @{paramSymbol.Name}");
                 }
-                source.Append("]);\n");
+                source.Append(");\n");
                 source.Append("    }\n");
             }
 
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs b/engine/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
index db582510..3428962a 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
@@ -154,17 +154,7 @@ namespace GodotTools.Build
             arguments.Add(buildInfo.OnlyClean ? "clean" : "build");
 
             // C# Project
-            string projectPath = buildInfo.Project;
-            if (OperatingSystem.IsWindows())
-            {
-                // On Windows, when using a network share path, the path may start with "//"
-                // which MSBuild will treat like a switch. Convert to "\\" to make it an absolute path.
-                if (projectPath.StartsWith("//"))
-                {
-                    projectPath = "\\\\" + projectPath.Substring(2);
-                }
-            }
-            arguments.Add(projectPath);
+            arguments.Add(buildInfo.Project);
 
             // `dotnet clean` doesn't recognize these options
             if (!buildInfo.OnlyClean)
@@ -205,17 +195,7 @@ namespace GodotTools.Build
             arguments.Add("publish"); // `dotnet publish` command
 
             // C# Project
-            string projectPath = buildInfo.Project;
-            if (OperatingSystem.IsWindows())
-            {
-                // On Windows, when using a network share path, the path may start with "//"
-                // which MSBuild will treat like a switch. Convert to "\\" to make it an absolute path.
-                if (projectPath.StartsWith("//"))
-                {
-                    projectPath = "\\\\" + projectPath.Substring(2);
-                }
-            }
-            arguments.Add(projectPath);
+            arguments.Add(buildInfo.Project);
 
             // Restore
             // `dotnet publish` restores by default, unless requested not to
diff --git a/engine/modules/mono/editor/bindings_generator.cpp b/engine/modules/mono/editor/bindings_generator.cpp
index 666ee8b2..056f77f6 100644
--- a/engine/modules/mono/editor/bindings_generator.cpp
+++ b/engine/modules/mono/editor/bindings_generator.cpp
@@ -39,6 +39,7 @@
 
 #include "core/config/engine.h"
 #include "core/core_constants.h"
+#include "core/io/compression.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/os.h"
@@ -1574,43 +1575,43 @@ void BindingsGenerator::_generate_array_extensions(StringBuilder &p_output) {
 	// The class where we put the extensions doesn't matter, so just use "GD".
 	p_output.append("public static partial class " BINDINGS_GLOBAL_SCOPE_CLASS "\n{");
 
-#define ARRAY_IS_EMPTY(m_type) \
-	p_output.append("\n" INDENT1 "/// <summary>\n"); \
+#define ARRAY_IS_EMPTY(m_type)                                                                          \
+	p_output.append("\n" INDENT1 "/// <summary>\n");                                                    \
 	p_output.append(INDENT1 "/// Returns true if this " #m_type " array is empty or doesn't exist.\n"); \
-	p_output.append(INDENT1 "/// </summary>\n"); \
-	p_output.append(INDENT1 "/// <param name=\"instance\">The " #m_type " array check.</param>\n"); \
-	p_output.append(INDENT1 "/// <returns>Whether or not the array is empty.</returns>\n"); \
-	p_output.append(INDENT1 "public static bool IsEmpty(this " #m_type "[] instance)\n"); \
-	p_output.append(OPEN_BLOCK_L1); \
-	p_output.append(INDENT2 "return instance == null || instance.Length == 0;\n"); \
+	p_output.append(INDENT1 "/// </summary>\n");                                                        \
+	p_output.append(INDENT1 "/// <param name=\"instance\">The " #m_type " array check.</param>\n");     \
+	p_output.append(INDENT1 "/// <returns>Whether or not the array is empty.</returns>\n");             \
+	p_output.append(INDENT1 "public static bool IsEmpty(this " #m_type "[] instance)\n");               \
+	p_output.append(OPEN_BLOCK_L1);                                                                     \
+	p_output.append(INDENT2 "return instance == null || instance.Length == 0;\n");                      \
 	p_output.append(INDENT1 CLOSE_BLOCK);
 
-#define ARRAY_JOIN(m_type) \
-	p_output.append("\n" INDENT1 "/// <summary>\n"); \
-	p_output.append(INDENT1 "/// Converts this " #m_type " array to a string delimited by the given string.\n"); \
-	p_output.append(INDENT1 "/// </summary>\n"); \
-	p_output.append(INDENT1 "/// <param name=\"instance\">The " #m_type " array to convert.</param>\n"); \
-	p_output.append(INDENT1 "/// <param name=\"delimiter\">The delimiter to use between items.</param>\n"); \
-	p_output.append(INDENT1 "/// <returns>A single string with all items.</returns>\n"); \
+#define ARRAY_JOIN(m_type)                                                                                          \
+	p_output.append("\n" INDENT1 "/// <summary>\n");                                                                \
+	p_output.append(INDENT1 "/// Converts this " #m_type " array to a string delimited by the given string.\n");    \
+	p_output.append(INDENT1 "/// </summary>\n");                                                                    \
+	p_output.append(INDENT1 "/// <param name=\"instance\">The " #m_type " array to convert.</param>\n");            \
+	p_output.append(INDENT1 "/// <param name=\"delimiter\">The delimiter to use between items.</param>\n");         \
+	p_output.append(INDENT1 "/// <returns>A single string with all items.</returns>\n");                            \
 	p_output.append(INDENT1 "public static string Join(this " #m_type "[] instance, string delimiter = \", \")\n"); \
-	p_output.append(OPEN_BLOCK_L1); \
-	p_output.append(INDENT2 "return String.Join(delimiter, instance);\n"); \
+	p_output.append(OPEN_BLOCK_L1);                                                                                 \
+	p_output.append(INDENT2 "return String.Join(delimiter, instance);\n");                                          \
 	p_output.append(INDENT1 CLOSE_BLOCK);
 
-#define ARRAY_STRINGIFY(m_type) \
-	p_output.append("\n" INDENT1 "/// <summary>\n"); \
-	p_output.append(INDENT1 "/// Converts this " #m_type " array to a string with brackets.\n"); \
-	p_output.append(INDENT1 "/// </summary>\n"); \
+#define ARRAY_STRINGIFY(m_type)                                                                          \
+	p_output.append("\n" INDENT1 "/// <summary>\n");                                                     \
+	p_output.append(INDENT1 "/// Converts this " #m_type " array to a string with brackets.\n");         \
+	p_output.append(INDENT1 "/// </summary>\n");                                                         \
 	p_output.append(INDENT1 "/// <param name=\"instance\">The " #m_type " array to convert.</param>\n"); \
-	p_output.append(INDENT1 "/// <returns>A single string with all items.</returns>\n"); \
-	p_output.append(INDENT1 "public static string Stringify(this " #m_type "[] instance)\n"); \
-	p_output.append(OPEN_BLOCK_L1); \
-	p_output.append(INDENT2 "return \"[\" + instance.Join() + \"]\";\n"); \
+	p_output.append(INDENT1 "/// <returns>A single string with all items.</returns>\n");                 \
+	p_output.append(INDENT1 "public static string Stringify(this " #m_type "[] instance)\n");            \
+	p_output.append(OPEN_BLOCK_L1);                                                                      \
+	p_output.append(INDENT2 "return \"[\" + instance.Join() + \"]\";\n");                                \
 	p_output.append(INDENT1 CLOSE_BLOCK);
 
-#define ARRAY_ALL(m_type) \
+#define ARRAY_ALL(m_type)  \
 	ARRAY_IS_EMPTY(m_type) \
-	ARRAY_JOIN(m_type) \
+	ARRAY_JOIN(m_type)     \
 	ARRAY_STRINGIFY(m_type)
 
 	ARRAY_ALL(byte);
@@ -4255,12 +4256,12 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 
 		// Populate signals
 
-		const AHashMap<StringName, const MethodInfo *> &signal_map = class_info->gdtype->get_signal_map(true);
+		const AHashMap<StringName, MethodInfo> &signal_map = class_info->signal_map;
 
-		for (const KeyValue<StringName, const MethodInfo *> &E : signal_map) {
+		for (const KeyValue<StringName, MethodInfo> &E : signal_map) {
 			SignalInterface isignal;
 
-			const MethodInfo &method_info = *E.value;
+			const MethodInfo &method_info = E.value;
 
 			if (method_info.name.begins_with("_")) {
 				// Signals starting with an underscore are internal and not meant to be exposed.
@@ -4351,10 +4352,10 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 		List<String> constants;
 		ClassDB::get_integer_constant_list(type_cname, &constants, true);
 
-		const AHashMap<StringName, const GDType::EnumInfo *> &enum_map = class_info->gdtype->get_enum_map(true);
+		const HashMap<StringName, ClassDB::ClassInfo::EnumInfo> &enum_map = class_info->enum_map;
 
-		for (const KeyValue<StringName, const GDType::EnumInfo *> &kv : enum_map) {
-			StringName enum_proxy_cname = kv.key;
+		for (const KeyValue<StringName, ClassDB::ClassInfo::EnumInfo> &E : enum_map) {
+			StringName enum_proxy_cname = E.key;
 			String enum_proxy_name = pascal_to_pascal_case(enum_proxy_cname.operator String());
 			if (itype.find_property_by_proxy_name(enum_proxy_name) || itype.find_method_by_proxy_name(enum_proxy_name) || itype.find_signal_by_proxy_name(enum_proxy_name)) {
 				// In case the enum name conflicts with other PascalCase members,
@@ -4363,12 +4364,15 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				enum_proxy_name += "Enum";
 				enum_proxy_cname = StringName(enum_proxy_name);
 			}
-			EnumInterface ienum(enum_proxy_cname, enum_proxy_name, kv.value->is_bitfield);
-			for (const KeyValue<StringName, int64_t> &kv_case : kv.value->values) {
-				String constant_name = kv_case.key.operator String();
-				constants.erase(kv_case.key);
+			EnumInterface ienum(enum_proxy_cname, enum_proxy_name, E.value.is_bitfield);
+			const List<StringName> &enum_constants = E.value.constants;
+			for (const StringName &constant_cname : enum_constants) {
+				String constant_name = constant_cname.operator String();
+				int64_t *value = class_info->constant_map.getptr(constant_cname);
+				ERR_FAIL_NULL_V(value, false);
+				constants.erase(constant_name);
 
-				ConstantInterface iconstant(constant_name, snake_to_pascal_case(constant_name, true), kv_case.value);
+				ConstantInterface iconstant(constant_name, snake_to_pascal_case(constant_name, true), *value);
 
 				iconstant.const_doc = nullptr;
 				for (int i = 0; i < itype.class_doc->constants.size(); i++) {
@@ -4401,7 +4405,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 
 			TypeInterface enum_itype;
 			enum_itype.is_enum = true;
-			enum_itype.name = itype.name + "." + String(kv.key);
+			enum_itype.name = itype.name + "." + String(E.key);
 			enum_itype.cname = StringName(enum_itype.name);
 			enum_itype.proxy_name = itype.proxy_name + "." + enum_proxy_name;
 			TypeInterface::postsetup_enum_type(enum_itype);
@@ -4409,7 +4413,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 		}
 
 		for (const String &constant_name : constants) {
-			const int64_t *value = class_info->gdtype->get_integer_constant_map(true).getptr(StringName(constant_name));
+			int64_t *value = class_info->constant_map.getptr(StringName(constant_name));
 			ERR_FAIL_NULL_V(value, false);
 
 			String constant_proxy_name = snake_to_pascal_case(constant_name, true);
@@ -4735,12 +4739,12 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 
 	TypeInterface itype;
 
-#define INSERT_STRUCT_TYPE(m_type, m_proxy_name) \
-	{ \
+#define INSERT_STRUCT_TYPE(m_type, m_proxy_name)                                          \
+	{                                                                                     \
 		itype = TypeInterface::create_value_type(String(#m_type), String(#m_proxy_name)); \
-		itype.cs_in_expr = "&%0"; \
-		itype.cs_in_expr_is_unsafe = true; \
-		builtin_types.insert(itype.cname, itype); \
+		itype.cs_in_expr = "&%0";                                                         \
+		itype.cs_in_expr_is_unsafe = true;                                                \
+		builtin_types.insert(itype.cname, itype);                                         \
 	}
 
 	INSERT_STRUCT_TYPE(Vector2, Vector2)
@@ -4777,21 +4781,21 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 	{
 		// C interface for 'uint32_t' is the same as that of enums. Remember to apply
 		// any of the changes done here to 'TypeInterface::postsetup_enum_type' as well.
-#define INSERT_INT_TYPE(m_name, m_int_struct_name) \
-	{ \
-		itype = TypeInterface::create_value_type(String(m_name)); \
-		if (itype.name != "long" && itype.name != "ulong") { \
-			itype.c_in = "%5%0 %1_in = %1;\n"; \
-			itype.c_out = "%5return (%0)(%1);\n"; \
-			itype.c_type = "long"; \
-			itype.c_arg_in = "&%s_in"; \
-		} else { \
-			itype.c_arg_in = "&%s"; \
-		} \
-		itype.c_type_in = itype.name; \
-		itype.c_type_out = itype.name; \
+#define INSERT_INT_TYPE(m_name, m_int_struct_name)                                             \
+	{                                                                                          \
+		itype = TypeInterface::create_value_type(String(m_name));                              \
+		if (itype.name != "long" && itype.name != "ulong") {                                   \
+			itype.c_in = "%5%0 %1_in = %1;\n";                                                 \
+			itype.c_out = "%5return (%0)(%1);\n";                                              \
+			itype.c_type = "long";                                                             \
+			itype.c_arg_in = "&%s_in";                                                         \
+		} else {                                                                               \
+			itype.c_arg_in = "&%s";                                                            \
+		}                                                                                      \
+		itype.c_type_in = itype.name;                                                          \
+		itype.c_type_out = itype.name;                                                         \
 		itype.c_in_vararg = "%5using godot_variant %1_in = VariantUtils.CreateFromInt(%1);\n"; \
-		builtin_types.insert(itype.cname, itype); \
+		builtin_types.insert(itype.cname, itype);                                              \
 	}
 
 		// The expected type for all integers in ptrcall is 'int64_t', so that's what we use for 'c_type'
@@ -4963,22 +4967,22 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 	itype.is_span_compatible = true;
 	builtin_types.insert(itype.cname, itype);
 
-#define INSERT_ARRAY_FULL(m_name, m_type, m_managed_type, m_proxy_t) \
-	{ \
-		itype = TypeInterface(); \
-		itype.name = #m_name; \
-		itype.cname = itype.name; \
-		itype.proxy_name = #m_proxy_t "[]"; \
-		itype.cs_type = itype.proxy_name; \
+#define INSERT_ARRAY_FULL(m_name, m_type, m_managed_type, m_proxy_t)                \
+	{                                                                               \
+		itype = TypeInterface();                                                    \
+		itype.name = #m_name;                                                       \
+		itype.cname = itype.name;                                                   \
+		itype.proxy_name = #m_proxy_t "[]";                                         \
+		itype.cs_type = itype.proxy_name;                                           \
 		itype.c_in = "%5using %0 %1_in = " C_METHOD_MONOARRAY_TO(m_type) "(%1);\n"; \
-		itype.c_out = "%5return " C_METHOD_MONOARRAY_FROM(m_type) "(%1);\n"; \
-		itype.c_arg_in = "&%s_in"; \
-		itype.c_type = #m_managed_type; \
-		itype.c_type_in = "ReadOnlySpan<" #m_proxy_t ">"; \
-		itype.c_type_out = itype.proxy_name; \
-		itype.c_type_is_disposable_struct = true; \
-		itype.is_span_compatible = true; \
-		builtin_types.insert(itype.name, itype); \
+		itype.c_out = "%5return " C_METHOD_MONOARRAY_FROM(m_type) "(%1);\n";        \
+		itype.c_arg_in = "&%s_in";                                                  \
+		itype.c_type = #m_managed_type;                                             \
+		itype.c_type_in = "ReadOnlySpan<" #m_proxy_t ">";                           \
+		itype.c_type_out = itype.proxy_name;                                        \
+		itype.c_type_is_disposable_struct = true;                                   \
+		itype.is_span_compatible = true;                                            \
+		builtin_types.insert(itype.name, itype);                                    \
 	}
 
 #define INSERT_ARRAY(m_type, m_managed_type, m_proxy_t) INSERT_ARRAY_FULL(m_type, m_type, m_managed_type, m_proxy_t)
diff --git a/engine/modules/mono/editor/code_completion.cpp b/engine/modules/mono/editor/code_completion.cpp
index 940dd82e..b9936b8c 100644
--- a/engine/modules/mono/editor/code_completion.cpp
+++ b/engine/modules/mono/editor/code_completion.cpp
@@ -31,14 +31,11 @@
 #include "code_completion.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/control.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/theme/theme_db.h"
 
 namespace gdmono {
@@ -126,7 +123,7 @@ PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_scr
 		case CompletionKind::NODE_PATHS: {
 			{
 				// Autoloads.
-				HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads(ProjectSettings::get_singleton()->get_autoload_list());
+				HashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
 				for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
 					const ProjectSettings::AutoloadInfo &info = E.value;
diff --git a/engine/modules/mono/editor/editor_internal_calls.cpp b/engine/modules/mono/editor/editor_internal_calls.cpp
index c3c2ba24..927adbe0 100644
--- a/engine/modules/mono/editor/editor_internal_calls.cpp
+++ b/engine/modules/mono/editor/editor_internal_calls.cpp
@@ -30,19 +30,13 @@
 
 #include "editor_internal_calls.h"
 
+#include "../csharp_script.h"
 #include "../godotsharp_dirs.h"
 #include "../interop_types.h"
+#include "../utils/macos_utils.h"
 #include "../utils/path_utils.h"
 #include "code_completion.h"
 
-#ifdef GD_MONO_HOT_RELOAD
-#include "../csharp_script.h"
-#endif
-
-#ifdef MACOS_ENABLED
-#include "../utils/macos_utils.h"
-#endif
-
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 #include "core/version.h"
@@ -57,10 +51,6 @@
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
 
-#ifdef GD_MONO_HOT_RELOAD
-#include "core/object/callable_mp.h"
-#endif
-
 #ifdef UNIX_ENABLED
 #include <unistd.h> // access
 #endif
diff --git a/engine/modules/mono/editor/hostfxr_resolver.cpp b/engine/modules/mono/editor/hostfxr_resolver.cpp
index cc316b4c..f3a07180 100644
--- a/engine/modules/mono/editor/hostfxr_resolver.cpp
+++ b/engine/modules/mono/editor/hostfxr_resolver.cpp
@@ -69,6 +69,7 @@ SOFTWARE.
 #include "core/os/os.h"
 
 #ifdef WINDOWS_ENABLED
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
index fc913931..959a6b4b 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -609,41 +609,6 @@ namespace Godot.Collections
             }
         }
 
-        /// <summary>
-        /// Adds the elements of the specified array to the end of this <see cref="Array"/>.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">
-        /// The array is read-only.
-        /// </exception>
-        /// <param name="array">The array of <see cref="Variant"/> items to add.</param>
-        public void AddRange<[MustBeVariant] T>(T[] array)
-        {
-            AddRange<T>(array.AsSpan());
-        }
-
-        /// <summary>
-        /// Adds the elements of the specified collection to the end of this <see cref="Array"/>.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">
-        /// The array is read-only.
-        /// </exception>
-        /// <param name="span">The span of <see cref="Variant"/> items to add.</param>
-        public void AddRange<[MustBeVariant] T>(ReadOnlySpan<T> span)
-        {
-            ThrowIfReadOnly();
-            if (span.Length == 0)
-            {
-                return;
-            }
-
-            int oldCount = Count;
-            Resize(Count + span.Length);
-            foreach (ref readonly T item in span)
-            {
-                this[oldCount++] = Variant.From(item);
-            }
-        }
-
         /// <summary>
         /// Finds the index of an existing value using binary search.
         /// If the value is not present in the array, it returns the bitwise
@@ -1716,46 +1681,6 @@ namespace Godot.Collections
             }
         }
 
-        /// <summary>
-        /// Adds the elements of the specified array to the end of this <see cref="Array{T}"/>.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">
-        /// The array is read-only.
-        /// </exception>
-        /// <exception cref="ArgumentNullException">
-        /// The <paramref name="array"/> is <see langword="null"/>.
-        /// </exception>
-        /// <param name="array">The array of <see cref="Variant"/> items to add.</param>
-        public void AddRange(T[] array)
-        {
-            AddRange(array.AsSpan());
-        }
-
-        /// <summary>
-        /// Adds the elements of the specified span to the end of this <see cref="Array{T}"/>.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">
-        /// The array is read-only.
-        /// </exception>
-        /// <param name="span">The span of <see cref="Variant"/> items to add.</param>
-        public void AddRange(ReadOnlySpan<T> span)
-        {
-            ThrowIfReadOnly();
-
-            if (span.Length == 0)
-            {
-                return;
-            }
-
-            int oldCount = Count;
-            Resize(Count + span.Length);
-
-            foreach (ref readonly T item in span)
-            {
-                this[oldCount++] = item;
-            }
-        }
-
         /// <summary>
         /// Finds the index of an existing value using binary search.
         /// If the value is not present in the array, it returns the bitwise
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
index 42413eb5..b12c82b3 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
@@ -926,7 +926,7 @@ namespace Godot
                 return false;
 
             int from = 0;
-            if (instance.Length != 1 && (instance[0] == '+' || instance[0] == '-'))
+            if (instance.Length != 1 && instance[0] == '+' || instance[0] == '-')
             {
                 from++;
             }
@@ -935,24 +935,26 @@ namespace Godot
             {
                 if (instance.Length < 3)
                     return false;
-                if (instance[from] != '0' || (instance[from + 1] != 'x' && instance[from + 1] != 'X'))
+                if (instance[from] != '0' || instance[from + 1] != 'x' || instance[from + 1] != 'X')
                     return false;
                 from += 2;
             }
 
-            if (from == instance.Length)
-                return false;
-
             for (int i = from; i < instance.Length; i++)
             {
                 char c = instance[i];
-                if (char.IsAsciiHexDigit(c))
+                if (IsHexDigit(c))
                     continue;
 
                 return false;
             }
 
             return true;
+
+            static bool IsHexDigit(char c)
+            {
+                return char.IsDigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+            }
         }
 
         /// <summary>
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
index 474fdc9c..beb6460b 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
@@ -19,7 +19,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>GodotSharp</PackageId>
-    <Version>4.7.0</Version>
+    <Version>4.6.3</Version>
     <PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
index 011b74e5..74266fae 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
@@ -15,7 +15,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>GodotSharpEditor</PackageId>
-    <Version>4.7.0</Version>
+    <Version>4.6.3</Version>
     <PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/glue/runtime_interop.cpp b/engine/modules/mono/glue/runtime_interop.cpp
index 2026407c..b1f52e15 100644
--- a/engine/modules/mono/glue/runtime_interop.cpp
+++ b/engine/modules/mono/glue/runtime_interop.cpp
@@ -35,19 +35,17 @@
 #include "../managed_callable.h"
 #include "../mono_gd/gd_mono_cache.h"
 #include "../signal_awaiter_utils.h"
+#include "../utils/path_utils.h"
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
-#include "core/io/compression.h"
 #include "core/io/marshalls.h"
-#include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
 #include "core/object/method_bind.h"
 #include "core/os/os.h"
 #include "core/string/string_name.h"
-#include "core/variant/variant_parser.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/file_system/editor_file_system.h"
diff --git a/engine/modules/mono/godotsharp_dirs.cpp b/engine/modules/mono/godotsharp_dirs.cpp
index 12aa9b45..aed7effb 100644
--- a/engine/modules/mono/godotsharp_dirs.cpp
+++ b/engine/modules/mono/godotsharp_dirs.cpp
@@ -31,26 +31,17 @@
 #include "godotsharp_dirs.h"
 
 #include "mono_gd/gd_mono.h"
-
-#ifndef TOOLS_ENABLED
 #include "utils/path_utils.h"
-#endif
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
 
 #ifdef TOOLS_ENABLED
+#include "core/version.h"
 #include "editor/file_system/editor_paths.h"
 #endif
 
-#ifndef TOOLS_ENABLED
-#include "core/config/engine.h"
-#ifndef ANDROID_ENABLED
-#include "core/io/file_access.h"
-#endif
-#endif
-
 namespace GodotSharpDirs {
 
 String _get_expected_build_config() {
diff --git a/engine/modules/mono/managed_callable.h b/engine/modules/mono/managed_callable.h
index 0e90537a..380c26bd 100644
--- a/engine/modules/mono/managed_callable.h
+++ b/engine/modules/mono/managed_callable.h
@@ -32,13 +32,10 @@
 
 #include "mono_gc_handle.h"
 
-#include "core/variant/callable.h"
-
-#ifdef GD_MONO_HOT_RELOAD
 #include "core/os/mutex.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/self_list.h"
-#endif
+#include "core/variant/callable.h"
 
 class ManagedCallable : public CallableCustom {
 	friend class CSharpLanguage;
diff --git a/engine/modules/mono/mono_gc_handle.h b/engine/modules/mono/mono_gc_handle.h
index 8ee609fa..014b190e 100644
--- a/engine/modules/mono/mono_gc_handle.h
+++ b/engine/modules/mono/mono_gc_handle.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#include "core/typedefs.h"
-
-#ifdef DEBUG_ENABLED
-#include "core/error/error_macros.h"
-#endif
+#include "core/object/ref_counted.h"
 
 namespace gdmono {
 
diff --git a/engine/modules/mono/mono_gd/gd_mono.cpp b/engine/modules/mono/mono_gd/gd_mono.cpp
index 8805ab6f..14dd433c 100644
--- a/engine/modules/mono/mono_gd/gd_mono.cpp
+++ b/engine/modules/mono/mono_gd/gd_mono.cpp
@@ -30,6 +30,7 @@
 
 #include "gd_mono.h"
 
+#include "../csharp_script.h"
 #include "../glue/runtime_interop.h"
 #include "../godotsharp_dirs.h"
 #include "../thirdparty/coreclr_delegates.h"
@@ -37,17 +38,13 @@
 #include "../utils/path_utils.h"
 #include "gd_mono_cache.h"
 
-#ifdef DEBUG_ENABLED
-#include "core/object/class_db.h"
-#endif
-
 #ifdef TOOLS_ENABLED
 #include "../editor/hostfxr_resolver.h"
 #include "../editor/semver.h"
 #endif
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/debugger/engine_debugger.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/os.h"
@@ -744,23 +741,6 @@ void GDMono::_init_godot_api_hashes() {
 #endif // DEBUG_ENABLED
 }
 
-#ifdef DEBUG_ENABLED
-uint64_t GDMono::get_api_core_hash() {
-	if (api_core_hash == 0) {
-		api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
-	}
-	return api_core_hash;
-}
-#ifdef TOOLS_ENABLED
-uint64_t GDMono::get_api_editor_hash() {
-	if (api_editor_hash == 0) {
-		api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
-	}
-	return api_editor_hash;
-}
-#endif // TOOLS_ENABLED
-#endif // DEBUG_ENABLED
-
 #ifdef TOOLS_ENABLED
 bool GDMono::_load_project_assembly() {
 	String assembly_name = Path::get_csharp_project_name();
diff --git a/engine/modules/mono/mono_gd/gd_mono.h b/engine/modules/mono/mono_gd/gd_mono.h
index b03ca499..87650076 100644
--- a/engine/modules/mono/mono_gd/gd_mono.h
+++ b/engine/modules/mono/mono_gd/gd_mono.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/string/ustring.h"
+#include "../godotsharp_defs.h"
 
-#include <cstdint>
+#include "core/io/config_file.h"
 
 #ifndef GD_CLR_STDCALL
 #ifdef WIN32
@@ -94,9 +93,19 @@ protected:
 
 public:
 #ifdef DEBUG_ENABLED
-	uint64_t get_api_core_hash();
+	uint64_t get_api_core_hash() {
+		if (api_core_hash == 0) {
+			api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
+		}
+		return api_core_hash;
+	}
 #ifdef TOOLS_ENABLED
-	uint64_t get_api_editor_hash();
+	uint64_t get_api_editor_hash() {
+		if (api_editor_hash == 0) {
+			api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
+		}
+		return api_editor_hash;
+	}
 #endif // TOOLS_ENABLED
 #endif // DEBUG_ENABLED
 
diff --git a/engine/modules/mono/mono_gd/gd_mono_cache.cpp b/engine/modules/mono/mono_gd/gd_mono_cache.cpp
index 465d085b..5292bcd1 100644
--- a/engine/modules/mono/mono_gd/gd_mono_cache.cpp
+++ b/engine/modules/mono/mono_gd/gd_mono_cache.cpp
@@ -40,11 +40,11 @@ bool godot_api_cache_updated = false;
 void update_godot_api_cache(const ManagedCallbacks &p_managed_callbacks) {
 	int checked_count = 0;
 
-#define CHECK_CALLBACK_NOT_NULL_IMPL(m_var, m_class, m_method) \
-	{ \
-		ERR_FAIL_NULL_MSG(m_var, \
+#define CHECK_CALLBACK_NOT_NULL_IMPL(m_var, m_class, m_method)                             \
+	{                                                                                      \
+		ERR_FAIL_NULL_MSG(m_var,                                                           \
 				"Mono Cache: Managed callback for '" #m_class "_" #m_method "' is null."); \
-		checked_count += 1; \
+		checked_count += 1;                                                                \
 	}
 
 #define CHECK_CALLBACK_NOT_NULL(m_class, m_method) CHECK_CALLBACK_NOT_NULL_IMPL(p_managed_callbacks.m_class##_##m_method, m_class, m_method)
diff --git a/engine/modules/mono/register_types.cpp b/engine/modules/mono/register_types.cpp
index b259117c..d77a3e76 100644
--- a/engine/modules/mono/register_types.cpp
+++ b/engine/modules/mono/register_types.cpp
@@ -31,11 +31,8 @@
 #include "register_types.h"
 
 #include "csharp_script.h"
-#include "csharp_script_resource_format.h"
 
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
+#include "core/config/engine.h"
 
 CSharpLanguage *script_language_cs = nullptr;
 Ref<ResourceFormatLoaderCSharpScript> resource_loader_cs;
diff --git a/engine/modules/mono/signal_awaiter_utils.h b/engine/modules/mono/signal_awaiter_utils.h
index 018fe16d..1354c3a4 100644
--- a/engine/modules/mono/signal_awaiter_utils.h
+++ b/engine/modules/mono/signal_awaiter_utils.h
@@ -30,12 +30,10 @@
 
 #pragma once
 
+#include "csharp_script.h"
 #include "mono_gc_handle.h"
 
-#include "core/object/object_id.h"
-#include "core/string/string_name.h"
-#include "core/string/ustring.h"
-#include "core/variant/callable.h"
+#include "core/object/ref_counted.h"
 
 Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signal, Object *p_target, GCHandleIntPtr p_awaiter_handle_ptr);
 
diff --git a/engine/modules/mono/utils/macros.h b/engine/modules/mono/utils/macros.h
index 770c2ca9..3208b85e 100644
--- a/engine/modules/mono/utils/macros.h
+++ b/engine/modules/mono/utils/macros.h
@@ -40,8 +40,8 @@
 #define GD_UNREACHABLE() __builtin_unreachable()
 #else
 #define GD_UNREACHABLE() \
-	CRASH_NOW(); \
-	do { \
+	CRASH_NOW();         \
+	do {                 \
 	} while (true)
 #endif
 
diff --git a/engine/modules/mono/utils/path_utils.cpp b/engine/modules/mono/utils/path_utils.cpp
index 47a13883..f9bb3542 100644
--- a/engine/modules/mono/utils/path_utils.cpp
+++ b/engine/modules/mono/utils/path_utils.cpp
@@ -31,17 +31,20 @@
 #include "path_utils.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/os.h"
 
 #include <cstdlib>
 
 #ifdef WINDOWS_ENABLED
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #define ENV_PATH_SEP ";"
 #else
 #include <unistd.h>
+#include <climits>
 
 #define ENV_PATH_SEP ":"
 #endif
diff --git a/engine/modules/mono/utils/string_utils.cpp b/engine/modules/mono/utils/string_utils.cpp
index c9c3f8db..e679abc9 100644
--- a/engine/modules/mono/utils/string_utils.cpp
+++ b/engine/modules/mono/utils/string_utils.cpp
@@ -33,6 +33,7 @@
 #include "core/io/file_access.h"
 
 #include <cstdio>
+#include <cstdlib>
 
 namespace {
 
diff --git a/engine/modules/mono/utils/string_utils.h b/engine/modules/mono/utils/string_utils.h
index 482ad235..a0d7d044 100644
--- a/engine/modules/mono/utils/string_utils.h
+++ b/engine/modules/mono/utils/string_utils.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/string/ustring.h"
+#include "core/variant/variant.h"
 
 #include <cstdarg>
 
diff --git a/engine/modules/mp3/audio_stream_mp3.cpp b/engine/modules/mp3/audio_stream_mp3.cpp
index 84303dfa..4eb49420 100644
--- a/engine/modules/mp3/audio_stream_mp3.cpp
+++ b/engine/modules/mp3/audio_stream_mp3.cpp
@@ -33,11 +33,9 @@
 #define DR_MP3_NO_STDIO
 
 #include "audio_stream_mp3.h"
-
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
 
-#include <thirdparty/dr_libs/dr_bridge.h>
+#include "thirdparty/dr_libs/dr_bridge.h"
 
 int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) {
 	if (!active) {
diff --git a/engine/modules/mp3/audio_stream_mp3.h b/engine/modules/mp3/audio_stream_mp3.h
index 15f3a475..9ffe48b9 100644
--- a/engine/modules/mp3/audio_stream_mp3.h
+++ b/engine/modules/mp3/audio_stream_mp3.h
@@ -32,7 +32,7 @@
 
 #include "servers/audio/audio_stream.h"
 
-#include <thirdparty/dr_libs/dr_mp3.h>
+#include "thirdparty/dr_libs/dr_mp3.h"
 
 class AudioStreamMP3;
 
diff --git a/engine/modules/mp3/doc_classes/AudioStreamMP3.xml b/engine/modules/mp3/doc_classes/AudioStreamMP3.xml
index 94ee68bb..6eb665b0 100644
--- a/engine/modules/mp3/doc_classes/AudioStreamMP3.xml
+++ b/engine/modules/mp3/doc_classes/AudioStreamMP3.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamMP3" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamMP3" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		MP3 audio stream driver.
 	</brief_description>
 	<description>
-		MP3 audio stream driver. See [member data] if you want to load an MP3 file at run-time. More info can be found in [ResourceImporterMP3].
+		MP3 audio stream driver. See [member data] if you want to load an MP3 file at run-time.
 		[b]Note:[/b] This class can optionally support legacy MP1 and MP2 formats, provided that the engine is compiled with the [code]minimp3_extra_formats=yes[/code] SCons option. These extra formats are not enabled by default.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
-		<link title="Runtime file loading and saving">$DOCS_URL/tutorials/io/runtime_file_loading_and_saving.html</link>
 	</tutorials>
 	<methods>
 		<method name="load_from_buffer" qualifiers="static">
@@ -29,13 +27,10 @@
 	</methods>
 	<members>
 		<member name="bar_beats" type="int" setter="set_bar_beats" getter="get_bar_beats" default="4">
-			The number of beats within a single bar in the audio track.
 		</member>
 		<member name="beat_count" type="int" setter="set_beat_count" getter="get_beat_count" default="0">
-			The length of the audio track, in beats. The actual duration of the audio file might be longer than what is indicated by this property. It defines the end of the audio for looping, [AudioStreamPlaylist], and [AudioStreamInteractive].
 		</member>
 		<member name="bpm" type="float" setter="set_bpm" getter="get_bpm" default="0.0">
-			The tempo of the audio track, measured in beats per minute.
 		</member>
 		<member name="data" type="PackedByteArray" setter="set_data" getter="get_data" default="PackedByteArray()">
 			Contains the audio data in bytes.
@@ -60,7 +55,7 @@
 			[/codeblocks]
 		</member>
 		<member name="loop" type="bool" setter="set_loop" getter="has_loop" default="false">
-			If [code]true[/code], the stream will play again from the specified [member loop_offset] once it reaches the end of the audio track, or once it reaches the end of the last beat according to the amount specified in [member beat_count]. Useful for ambient sounds and background music.
+			If [code]true[/code], the stream will automatically loop when it reaches the end.
 		</member>
 		<member name="loop_offset" type="float" setter="set_loop_offset" getter="get_loop_offset" default="0.0">
 			Time in seconds at which the stream starts after being looped.
diff --git a/engine/modules/mp3/doc_classes/ResourceImporterMP3.xml b/engine/modules/mp3/doc_classes/ResourceImporterMP3.xml
index 01b576bd..fc0ec368 100644
--- a/engine/modules/mp3/doc_classes/ResourceImporterMP3.xml
+++ b/engine/modules/mp3/doc_classes/ResourceImporterMP3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterMP3" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ResourceImporterMP3" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Imports an MP3 audio file for playback.
 	</brief_description>
@@ -13,19 +13,19 @@
 	</tutorials>
 	<members>
 		<member name="bar_beats" type="int" setter="" getter="" default="4">
-			The number of beats within a single bar in the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The number of bars within a single beat in the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member bar_beats] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="beat_count" type="int" setter="" getter="" default="0">
-			The length of the audio track, in beats. The actual duration of the audio file might be longer than what is indicated by this property. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The beat count of the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member beat_count] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="bpm" type="float" setter="" getter="" default="0">
-			The tempo of the audio track, measured in beats per minute. This should match the BPM measure that was used to compose the track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The beats per minute of the audio track. This should match the BPM measure that was used to compose the track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member bpm] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="loop" type="bool" setter="" getter="" default="false">
-			If enabled, the audio will begin playing either from the beginning or from [member loop_offset], after playback ends by either reaching the end of the audio or reaching the end of the last beat according to the amount specified in [member beat_count].
+			If enabled, the audio will begin playing at the beginning after playback ends by reaching the end of the audio.
 			[b]Note:[/b] In [AudioStreamPlayer], the [signal AudioStreamPlayer.finished] signal won't be emitted for looping audio when it reaches the end of the audio file, as the audio will keep playing indefinitely.
 		</member>
 		<member name="loop_offset" type="float" setter="" getter="" default="0">
diff --git a/engine/modules/mp3/register_types.cpp b/engine/modules/mp3/register_types.cpp
index 65bbe93a..79a780f3 100644
--- a/engine/modules/mp3/register_types.cpp
+++ b/engine/modules/mp3/register_types.cpp
@@ -32,13 +32,10 @@
 
 #include "audio_stream_mp3.h"
 
-#include "core/io/resource_importer.h"
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
-#include "resource_importer_mp3.h"
-
+#include "core/config/engine.h"
 #include "editor/editor_node.h"
+#include "resource_importer_mp3.h"
 
 static void _editor_init() {
 	Ref<ResourceImporterMP3> mp3_import;
diff --git a/engine/modules/mp3/resource_importer_mp3.cpp b/engine/modules/mp3/resource_importer_mp3.cpp
index 36ea6ca3..00e25f5a 100644
--- a/engine/modules/mp3/resource_importer_mp3.cpp
+++ b/engine/modules/mp3/resource_importer_mp3.cpp
@@ -30,8 +30,7 @@
 
 #include "resource_importer_mp3.h"
 
-#include "audio_stream_mp3.h"
-
+#include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/modules/mp3/resource_importer_mp3.h b/engine/modules/mp3/resource_importer_mp3.h
index bec3e095..8a8b7809 100644
--- a/engine/modules/mp3/resource_importer_mp3.h
+++ b/engine/modules/mp3/resource_importer_mp3.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "audio_stream_mp3.h"
+
 #include "core/io/resource_importer.h"
 
 class ResourceImporterMP3 : public ResourceImporter {
diff --git a/engine/modules/multiplayer/SCsub b/engine/modules/multiplayer/SCsub
index fa467ff7..f9f4e579 100644
--- a/engine/modules/multiplayer/SCsub
+++ b/engine/modules/multiplayer/SCsub
@@ -15,4 +15,8 @@ if env.editor_build:
 env.modules_sources += module_obj
 
 if env["tests"]:
+    env_mp.Append(CPPDEFINES=["TESTS_ENABLED"])
     env_mp.add_source_files(env.modules_sources, "./tests/*.cpp")
+
+    if env["disable_exceptions"]:
+        env_mp.Append(CPPDEFINES=["DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS"])
diff --git a/engine/modules/multiplayer/doc_classes/MultiplayerSpawner.xml b/engine/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
index 779d6275..198e2378 100644
--- a/engine/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
+++ b/engine/modules/multiplayer/doc_classes/MultiplayerSpawner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerSpawner" inherits="Node" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="MultiplayerSpawner" inherits="Node" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Automatically replicates spawnable nodes from the authority to other multiplayer peers.
 	</brief_description>
diff --git a/engine/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml b/engine/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
index 2613c0c3..74c2194e 100644
--- a/engine/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
+++ b/engine/modules/multiplayer/doc_classes/MultiplayerSynchronizer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MultiplayerSynchronizer" inherits="Node" api_type="core" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="MultiplayerSynchronizer" inherits="Node" keywords="network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Synchronizes properties from the multiplayer authority to the remote peers.
 	</brief_description>
diff --git a/engine/modules/multiplayer/doc_classes/OfflineMultiplayerPeer.xml b/engine/modules/multiplayer/doc_classes/OfflineMultiplayerPeer.xml
index 22f65d18..9c574040 100644
--- a/engine/modules/multiplayer/doc_classes/OfflineMultiplayerPeer.xml
+++ b/engine/modules/multiplayer/doc_classes/OfflineMultiplayerPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OfflineMultiplayerPeer" inherits="MultiplayerPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OfflineMultiplayerPeer" inherits="MultiplayerPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A [MultiplayerPeer] which is always connected and acts as a server.
 	</brief_description>
diff --git a/engine/modules/multiplayer/doc_classes/SceneMultiplayer.xml b/engine/modules/multiplayer/doc_classes/SceneMultiplayer.xml
index 21ffb859..3277f1ff 100644
--- a/engine/modules/multiplayer/doc_classes/SceneMultiplayer.xml
+++ b/engine/modules/multiplayer/doc_classes/SceneMultiplayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SceneMultiplayer" inherits="MultiplayerAPI" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="SceneMultiplayer" inherits="MultiplayerAPI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		High-level multiplayer API implementation.
 	</brief_description>
diff --git a/engine/modules/multiplayer/doc_classes/SceneReplicationConfig.xml b/engine/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
index 76c8d56b..f2a9ed3e 100644
--- a/engine/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
+++ b/engine/modules/multiplayer/doc_classes/SceneReplicationConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SceneReplicationConfig" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="SceneReplicationConfig" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration for properties to synchronize with a [MultiplayerSynchronizer].
 	</brief_description>
diff --git a/engine/modules/multiplayer/editor/editor_network_profiler.cpp b/engine/modules/multiplayer/editor/editor_network_profiler.cpp
index dc8612d7..b9f0bb10 100644
--- a/engine/modules/multiplayer/editor/editor_network_profiler.cpp
+++ b/engine/modules/multiplayer/editor/editor_network_profiler.cpp
@@ -30,9 +30,6 @@
 
 #include "editor_network_profiler.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
 #include "editor/settings/editor_settings.h"
@@ -40,7 +37,6 @@
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/split_container.h"
 #include "scene/main/timer.h"
 
 void EditorNetworkProfiler::_bind_methods() {
diff --git a/engine/modules/multiplayer/editor/editor_network_profiler.h b/engine/modules/multiplayer/editor/editor_network_profiler.h
index 241b726b..2bbe3fc7 100644
--- a/engine/modules/multiplayer/editor/editor_network_profiler.h
+++ b/engine/modules/multiplayer/editor/editor_network_profiler.h
@@ -36,6 +36,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
+#include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 
 class Timer;
diff --git a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.cpp b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
index fcc68d3c..eb7e25af 100644
--- a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
+++ b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
@@ -34,12 +34,10 @@
 #include "editor_network_profiler.h"
 #include "replication_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
-#include "scene/main/scene_tree.h"
+#include "editor/gui/editor_bottom_panel.h"
+#include "editor/settings/editor_command_palette.h"
 
 void MultiplayerEditorDebugger::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("open_request", PropertyInfo(Variant::STRING, "path")));
@@ -118,8 +116,8 @@ void MultiplayerEditorDebugger::setup_session(int p_session_id) {
 
 MultiplayerEditorPlugin::MultiplayerEditorPlugin() {
 	repl_editor = memnew(ReplicationEditor);
-	EditorDockManager::get_singleton()->add_dock(repl_editor);
-	repl_editor->close();
+	button = EditorNode::get_bottom_panel()->add_item(TTRC("Replication"), repl_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_replication_bottom_panel", TTRC("Toggle Replication Bottom Panel")));
+	button->hide();
 	repl_editor->get_pin()->connect(SceneStringName(pressed), callable_mp(this, &MultiplayerEditorPlugin::_pinned));
 	debugger.instantiate();
 	debugger->connect("open_request", callable_mp(this, &MultiplayerEditorPlugin::_open_request));
@@ -144,14 +142,20 @@ void MultiplayerEditorPlugin::_notification(int p_what) {
 void MultiplayerEditorPlugin::_node_removed(Node *p_node) {
 	if (p_node && p_node == repl_editor->get_current()) {
 		repl_editor->edit(nullptr);
-		repl_editor->close();
+		if (repl_editor->is_visible_in_tree()) {
+			EditorNode::get_bottom_panel()->hide_bottom_panel();
+		}
+		button->hide();
 		repl_editor->get_pin()->set_pressed(false);
 	}
 }
 
 void MultiplayerEditorPlugin::_pinned() {
 	if (!repl_editor->get_pin()->is_pressed() && repl_editor->get_current() == nullptr) {
-		repl_editor->close();
+		if (repl_editor->is_visible_in_tree()) {
+			EditorNode::get_bottom_panel()->hide_bottom_panel();
+		}
+		button->hide();
 	}
 }
 
@@ -165,8 +169,12 @@ bool MultiplayerEditorPlugin::handles(Object *p_object) const {
 
 void MultiplayerEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
-		repl_editor->make_visible();
+		button->show();
+		EditorNode::get_bottom_panel()->make_item_visible(repl_editor);
 	} else if (!repl_editor->get_pin()->is_pressed()) {
-		repl_editor->close();
+		if (repl_editor->is_visible_in_tree()) {
+			EditorNode::get_bottom_panel()->hide_bottom_panel();
+		}
+		button->hide();
 	}
 }
diff --git a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
index 53534f52..3832a6d3 100644
--- a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
+++ b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
@@ -58,6 +58,7 @@ class MultiplayerEditorPlugin : public EditorPlugin {
 	GDCLASS(MultiplayerEditorPlugin, EditorPlugin);
 
 private:
+	Button *button = nullptr;
 	ReplicationEditor *repl_editor = nullptr;
 	Ref<MultiplayerEditorDebugger> debugger;
 
diff --git a/engine/modules/multiplayer/editor/replication_editor.cpp b/engine/modules/multiplayer/editor/replication_editor.cpp
index 351bbdc6..bb9799e9 100644
--- a/engine/modules/multiplayer/editor/replication_editor.cpp
+++ b/engine/modules/multiplayer/editor/replication_editor.cpp
@@ -32,14 +32,11 @@
 
 #include "../multiplayer_synchronizer.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/property_selector.h"
 #include "editor/scene/scene_tree_editor.h"
-#include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
@@ -155,13 +152,6 @@ void ReplicationEditor::_pick_node_property_selected(String p_name) {
 
 /// ReplicationEditor
 ReplicationEditor::ReplicationEditor() {
-	set_name(TTRC("Replication"));
-	set_icon_name("ReplicationDock");
-	set_dock_shortcut(ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_replication_bottom_panel", TTRC("Toggle Replication Dock")));
-	set_default_slot(EditorDock::DOCK_SLOT_BOTTOM);
-	set_available_layouts(EditorDock::DOCK_LAYOUT_HORIZONTAL | EditorDock::DOCK_LAYOUT_FLOATING);
-	set_global(false);
-	set_transient(true);
 	set_v_size_flags(SIZE_EXPAND_FILL);
 	set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 
diff --git a/engine/modules/multiplayer/editor/replication_editor.h b/engine/modules/multiplayer/editor/replication_editor.h
index 046fca43..7e78f275 100644
--- a/engine/modules/multiplayer/editor/replication_editor.h
+++ b/engine/modules/multiplayer/editor/replication_editor.h
@@ -32,8 +32,8 @@
 
 #include "../scene_replication_config.h"
 
-#include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/box_container.h"
 
 class ConfirmationDialog;
 class MultiplayerSynchronizer;
@@ -44,8 +44,8 @@ class TreeItem;
 class PropertySelector;
 class SceneTreeDialog;
 
-class ReplicationEditor : public EditorDock {
-	GDCLASS(ReplicationEditor, EditorDock);
+class ReplicationEditor : public VBoxContainer {
+	GDCLASS(ReplicationEditor, VBoxContainer);
 
 private:
 	MultiplayerSynchronizer *current = nullptr;
diff --git a/engine/modules/multiplayer/icons/ReplicationDock.svg b/engine/modules/multiplayer/icons/ReplicationDock.svg
deleted file mode 100644
index 6ede3a2f..00000000
--- a/engine/modules/multiplayer/icons/ReplicationDock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 10-2 4-2-4ZM12 14l-2-4-2 4Z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M4.936 7.429a4 4 0 0 1 6.128 0M1.872 4.858a8 8 0 0 1 12.256 0"/></svg>
diff --git a/engine/modules/multiplayer/multiplayer_spawner.cpp b/engine/modules/multiplayer/multiplayer_spawner.cpp
index 0e8b6dfe..9b081b0f 100644
--- a/engine/modules/multiplayer/multiplayer_spawner.cpp
+++ b/engine/modules/multiplayer/multiplayer_spawner.cpp
@@ -30,10 +30,7 @@
 
 #include "multiplayer_spawner.h"
 
-#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef TOOLS_ENABLED
@@ -178,8 +175,8 @@ void MultiplayerSpawner::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_spawn_function", "spawn_function"), &MultiplayerSpawner::set_spawn_function);
 	ADD_PROPERTY(PropertyInfo(Variant::CALLABLE, "spawn_function", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_spawn_function", "get_spawn_function");
 
-	ADD_SIGNAL(MethodInfo("despawned", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("spawned", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("despawned", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("spawned", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 }
 
 void MultiplayerSpawner::_update_spawn_node() {
diff --git a/engine/modules/multiplayer/multiplayer_synchronizer.cpp b/engine/modules/multiplayer/multiplayer_synchronizer.cpp
index 295bcca8..ced4719a 100644
--- a/engine/modules/multiplayer/multiplayer_synchronizer.cpp
+++ b/engine/modules/multiplayer/multiplayer_synchronizer.cpp
@@ -31,7 +31,6 @@
 #include "multiplayer_synchronizer.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 Object *MultiplayerSynchronizer::_get_prop_target(Object *p_obj, const NodePath &p_path) {
@@ -271,7 +270,7 @@ void MultiplayerSynchronizer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "root_path"), "set_root_path", "get_root_path");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "replication_interval", PROPERTY_HINT_RANGE, "0,5,0.001,suffix:s"), "set_replication_interval", "get_replication_interval");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "delta_interval", PROPERTY_HINT_RANGE, "0,5,0.001,suffix:s"), "set_delta_interval", "get_delta_interval");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "replication_config", PROPERTY_HINT_RESOURCE_TYPE, SceneReplicationConfig::get_class_static(), PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_replication_config", "get_replication_config");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "replication_config", PROPERTY_HINT_RESOURCE_TYPE, "SceneReplicationConfig", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_replication_config", "get_replication_config");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_update_mode", PROPERTY_HINT_ENUM, "Idle,Physics,None"), "set_visibility_update_mode", "get_visibility_update_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "public_visibility"), "set_visibility_public", "is_visibility_public");
 
@@ -373,7 +372,7 @@ void MultiplayerSynchronizer::set_multiplayer_authority(int p_peer_id, bool p_re
 
 Error MultiplayerSynchronizer::_watch_changes(uint64_t p_usec) {
 	ERR_FAIL_COND_V(replication_config.is_null(), FAILED);
-	const List<NodePath> props(replication_config->get_watch_properties());
+	const List<NodePath> props = replication_config->get_watch_properties();
 	if (props.size() != watchers.size()) {
 		watchers.resize(props.size());
 	}
@@ -437,7 +436,7 @@ List<Variant> MultiplayerSynchronizer::get_delta_state(uint64_t p_cur_usec, uint
 List<NodePath> MultiplayerSynchronizer::get_delta_properties(uint64_t p_indexes) {
 	List<NodePath> out;
 	ERR_FAIL_COND_V(replication_config.is_null(), out);
-	const List<NodePath> watch_props(replication_config->get_watch_properties());
+	const List<NodePath> watch_props = replication_config->get_watch_properties();
 	int idx = 0;
 	for (const NodePath &prop : watch_props) {
 		if ((p_indexes & (1ULL << idx++)) == 0) {
diff --git a/engine/modules/multiplayer/register_types.cpp b/engine/modules/multiplayer/register_types.cpp
index d9d58645..03a63246 100644
--- a/engine/modules/multiplayer/register_types.cpp
+++ b/engine/modules/multiplayer/register_types.cpp
@@ -37,8 +37,6 @@
 #include "scene_replication_interface.h"
 #include "scene_rpc_interface.h"
 
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/multiplayer_editor_plugin.h"
 #endif
diff --git a/engine/modules/multiplayer/scene_cache_interface.cpp b/engine/modules/multiplayer/scene_cache_interface.cpp
index 6e5575bc..9764f8af 100644
--- a/engine/modules/multiplayer/scene_cache_interface.cpp
+++ b/engine/modules/multiplayer/scene_cache_interface.cpp
@@ -33,9 +33,7 @@
 #include "scene_multiplayer.h"
 
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
 SceneCacheInterface::NodeCache &SceneCacheInterface::_track(Node *p_node) {
diff --git a/engine/modules/multiplayer/scene_multiplayer.cpp b/engine/modules/multiplayer/scene_multiplayer.cpp
index 80d188d8..24b3ad47 100644
--- a/engine/modules/multiplayer/scene_multiplayer.cpp
+++ b/engine/modules/multiplayer/scene_multiplayer.cpp
@@ -32,8 +32,6 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/engine/modules/multiplayer/scene_multiplayer.h b/engine/modules/multiplayer/scene_multiplayer.h
index d95c89c4..23a21678 100644
--- a/engine/modules/multiplayer/scene_multiplayer.h
+++ b/engine/modules/multiplayer/scene_multiplayer.h
@@ -182,7 +182,7 @@ public:
 	Error send_bytes(Vector<uint8_t> p_data, int p_to = MultiplayerPeer::TARGET_PEER_BROADCAST, MultiplayerPeer::TransferMode p_mode = MultiplayerPeer::TRANSFER_MODE_RELIABLE, int p_channel = 0);
 	String get_rpc_md5(const Object *p_obj);
 
-	const HashSet<int> get_connected_peers() const { return HashSet<int>(connected_peers); }
+	const HashSet<int> get_connected_peers() const { return connected_peers; }
 
 	void set_remote_sender_override(int p_id) { remote_sender_override = p_id; }
 	void set_refuse_new_connections(bool p_refuse);
diff --git a/engine/modules/multiplayer/scene_replication_config.cpp b/engine/modules/multiplayer/scene_replication_config.cpp
index cd8a565c..de4337de 100644
--- a/engine/modules/multiplayer/scene_replication_config.cpp
+++ b/engine/modules/multiplayer/scene_replication_config.cpp
@@ -30,8 +30,6 @@
 
 #include "scene_replication_config.h"
 
-#include "core/object/class_db.h"
-
 bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
 
diff --git a/engine/modules/multiplayer/scene_replication_interface.cpp b/engine/modules/multiplayer/scene_replication_interface.cpp
index 6db7f1e2..6517787e 100644
--- a/engine/modules/multiplayer/scene_replication_interface.cpp
+++ b/engine/modules/multiplayer/scene_replication_interface.cpp
@@ -34,11 +34,10 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "scene/main/node.h"
 
-#define MAKE_ROOM(m_amount) \
+#define MAKE_ROOM(m_amount)             \
 	if (packet_cache.size() < m_amount) \
 		packet_cache.resize(m_amount);
 
@@ -143,7 +142,7 @@ void SceneReplicationInterface::on_network_process() {
 	// Process syncs.
 	uint64_t usec = OS::get_singleton()->get_ticks_usec();
 	for (KeyValue<int, PeerInfo> &E : peers_info) {
-		const HashSet<ObjectID> to_sync(E.value.sync_nodes);
+		const HashSet<ObjectID> to_sync = E.value.sync_nodes;
 		if (to_sync.is_empty()) {
 			continue; // Nothing to sync
 		}
@@ -250,7 +249,7 @@ Error SceneReplicationInterface::on_replication_start(Object *p_obj, Variant p_c
 		if (pending_buffer_size > 0) {
 			ERR_FAIL_COND_V(!node || !sync->get_replication_config_ptr(), ERR_UNCONFIGURED);
 			int consumed = 0;
-			const List<NodePath> props(sync->get_replication_config_ptr()->get_spawn_properties());
+			const List<NodePath> props = sync->get_replication_config_ptr()->get_spawn_properties();
 			Vector<Variant> vars;
 			vars.resize(props.size());
 			Error err = MultiplayerAPI::decode_and_decompress_variants(vars, pending_buffer, pending_buffer_size, consumed);
@@ -387,7 +386,7 @@ Error SceneReplicationInterface::_update_spawn_visibility(int p_peer, const Obje
 	ERR_FAIL_NULL_V(spawner, ERR_BUG);
 	ERR_FAIL_COND_V(!_has_authority(spawner), ERR_BUG);
 	ERR_FAIL_COND_V(!tracked_nodes.has(p_oid), ERR_BUG);
-	const HashSet<ObjectID> synchronizers(tracked_nodes[p_oid].synchronizers);
+	const HashSet<ObjectID> synchronizers = tracked_nodes[p_oid].synchronizers;
 	bool is_visible = true;
 	for (const ObjectID &sid : synchronizers) {
 		MultiplayerSynchronizer *sync = get_id_as<MultiplayerSynchronizer>(sid);
@@ -491,7 +490,7 @@ Error SceneReplicationInterface::_make_spawn_packet(Node *p_node, MultiplayerSpa
 	// Prepare spawn state.
 	List<NodePath> state_props;
 	List<uint32_t> sync_ids;
-	const HashSet<ObjectID> synchronizers(tnode->synchronizers);
+	const HashSet<ObjectID> synchronizers = tnode->synchronizers;
 	for (const ObjectID &sid : synchronizers) {
 		MultiplayerSynchronizer *sync = get_id_as<MultiplayerSynchronizer>(sid);
 		if (!_has_authority(sync)) {
@@ -824,7 +823,7 @@ void SceneReplicationInterface::_send_sync(int p_peer, const HashSet<ObjectID> &
 		int size;
 		Vector<Variant> vars;
 		Vector<const Variant *> varp;
-		const List<NodePath> props(sync->get_replication_config_ptr()->get_sync_properties());
+		const List<NodePath> props = sync->get_replication_config_ptr()->get_sync_properties();
 		Error err = MultiplayerSynchronizer::get_state(props, node, vars, varp);
 		ERR_CONTINUE_MSG(err != OK, "Unable to retrieve sync state.");
 		err = MultiplayerAPI::encode_and_compress_variants(varp.ptrw(), varp.size(), nullptr, size);
@@ -883,7 +882,7 @@ Error SceneReplicationInterface::on_sync_receive(int p_from, const uint8_t *p_bu
 			ofs += size;
 			continue;
 		}
-		const List<NodePath> props(sync->get_replication_config_ptr()->get_sync_properties());
+		const List<NodePath> props = sync->get_replication_config_ptr()->get_sync_properties();
 		Vector<Variant> vars;
 		vars.resize(props.size());
 		int consumed;
diff --git a/engine/modules/multiplayer/scene_rpc_interface.cpp b/engine/modules/multiplayer/scene_rpc_interface.cpp
index 0938e34e..68e17791 100644
--- a/engine/modules/multiplayer/scene_rpc_interface.cpp
+++ b/engine/modules/multiplayer/scene_rpc_interface.cpp
@@ -34,10 +34,8 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
 #include "scene/main/multiplayer_api.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
 // The RPC meta is composed by a single byte that contains (starting from the least significant bit):
@@ -348,7 +346,7 @@ void SceneRPCInterface::_send_rpc(Node *p_node, int p_to, uint16_t p_rpc_id, con
 	// Create base packet, lots of hardcode because it must be tight.
 	int ofs = 0;
 
-#define MAKE_ROOM(m_amount) \
+#define MAKE_ROOM(m_amount)             \
 	if (packet_cache.size() < m_amount) \
 		packet_cache.resize(m_amount);
 
diff --git a/engine/modules/multiplayer/tests/test_multiplayer_spawner.h b/engine/modules/multiplayer/tests/test_multiplayer_spawner.h
index d1303a0c..a2969c63 100644
--- a/engine/modules/multiplayer/tests/test_multiplayer_spawner.h
+++ b/engine/modules/multiplayer/tests/test_multiplayer_spawner.h
@@ -30,14 +30,11 @@
 
 #pragma once
 
-#include "../multiplayer_spawner.h"
-
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
+#include "../multiplayer_spawner.h"
+
 namespace TestMultiplayerSpawner {
 class Wasp : public Node {
 	GDCLASS(Wasp, Node);
diff --git a/engine/modules/multiplayer/tests/test_scene_multiplayer.h b/engine/modules/multiplayer/tests/test_scene_multiplayer.h
index c4d4a2e1..afb4dc94 100644
--- a/engine/modules/multiplayer/tests/test_scene_multiplayer.h
+++ b/engine/modules/multiplayer/tests/test_scene_multiplayer.h
@@ -30,16 +30,11 @@
 
 #pragma once
 
-#include "../scene_multiplayer.h"
-
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
-#include "scene/2d/node_2d.h"
-#include "scene/main/scene_tree.h"
-#include "tests/signal_watcher.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
+#include "../scene_multiplayer.h"
+
 namespace TestSceneMultiplayer {
 TEST_CASE("[Multiplayer][SceneMultiplayer] Defaults") {
 	Ref<SceneMultiplayer> scene_multiplayer;
diff --git a/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp
index 8ab4bfba..2ddf92ec 100644
--- a/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp
+++ b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp
@@ -32,50 +32,49 @@
 
 #include "core/os/mutex.h"
 #include "scene/main/node.h"
-
 #include <cstdint>
 
 #ifdef CLIPPER2_ENABLED
 #include "nav_mesh_generator_2d.h"
 #endif // CLIPPER2_ENABLED
 
-#define COMMAND_1(F_NAME, T_0, D_0) \
-	struct MERGE(F_NAME, _command_2d) : public SetCommand2D { \
-		T_0 d_0; \
-		MERGE(F_NAME, _command_2d) \
-		(T_0 p_d_0) : \
-				d_0(p_d_0) {} \
+#define COMMAND_1(F_NAME, T_0, D_0)                                     \
+	struct MERGE(F_NAME, _command_2d) : public SetCommand2D {           \
+		T_0 d_0;                                                        \
+		MERGE(F_NAME, _command_2d)                                      \
+		(T_0 p_d_0) :                                                   \
+				d_0(p_d_0) {}                                           \
 		virtual void exec(GodotNavigationServer2D *p_server) override { \
-			p_server->MERGE(_cmd_, F_NAME)(d_0); \
-		} \
-	}; \
-	void GodotNavigationServer2D::F_NAME(T_0 D_0) { \
-		auto cmd = memnew(MERGE(F_NAME, _command_2d)( \
-				D_0)); \
-		add_command(cmd); \
-	} \
+			p_server->MERGE(_cmd_, F_NAME)(d_0);                        \
+		}                                                               \
+	};                                                                  \
+	void GodotNavigationServer2D::F_NAME(T_0 D_0) {                     \
+		auto cmd = memnew(MERGE(F_NAME, _command_2d)(                   \
+				D_0));                                                  \
+		add_command(cmd);                                               \
+	}                                                                   \
 	void GodotNavigationServer2D::MERGE(_cmd_, F_NAME)(T_0 D_0)
 
-#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1) \
-	struct MERGE(F_NAME, _command_2d) : public SetCommand2D { \
-		T_0 d_0; \
-		T_1 d_1; \
-		MERGE(F_NAME, _command_2d) \
-		( \
-				T_0 p_d_0, \
-				T_1 p_d_1) : \
-				d_0(p_d_0), \
-				d_1(p_d_1) {} \
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)                           \
+	struct MERGE(F_NAME, _command_2d) : public SetCommand2D {           \
+		T_0 d_0;                                                        \
+		T_1 d_1;                                                        \
+		MERGE(F_NAME, _command_2d)                                      \
+		(                                                               \
+				T_0 p_d_0,                                              \
+				T_1 p_d_1) :                                            \
+				d_0(p_d_0),                                             \
+				d_1(p_d_1) {}                                           \
 		virtual void exec(GodotNavigationServer2D *p_server) override { \
-			p_server->MERGE(_cmd_, F_NAME)(d_0, d_1); \
-		} \
-	}; \
-	void GodotNavigationServer2D::F_NAME(T_0 D_0, T_1 D_1) { \
-		auto cmd = memnew(MERGE(F_NAME, _command_2d)( \
-				D_0, \
-				D_1)); \
-		add_command(cmd); \
-	} \
+			p_server->MERGE(_cmd_, F_NAME)(d_0, d_1);                   \
+		}                                                               \
+	};                                                                  \
+	void GodotNavigationServer2D::F_NAME(T_0 D_0, T_1 D_1) {            \
+		auto cmd = memnew(MERGE(F_NAME, _command_2d)(                   \
+				D_0,                                                    \
+				D_1));                                                  \
+		add_command(cmd);                                               \
+	}                                                                   \
 	void GodotNavigationServer2D::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
 void GodotNavigationServer2D::init() {
@@ -83,7 +82,7 @@ void GodotNavigationServer2D::init() {
 	navmesh_generator_2d = memnew(NavMeshGenerator2D);
 	ERR_FAIL_NULL_MSG(navmesh_generator_2d, "Failed to init NavMeshGenerator2D.");
 	RWLockRead read_lock(geometry_parser_rwlock);
-	navmesh_generator_2d->set_generator_parsers(LocalVector<NavMeshGeometryParser2D *>(generator_parsers));
+	navmesh_generator_2d->set_generator_parsers(generator_parsers);
 #endif // CLIPPER2_ENABLED
 	// TODO
 }
@@ -252,7 +251,7 @@ TypedArray<RID> GodotNavigationServer2D::map_get_obstacles(RID p_map) const {
 	TypedArray<RID> obstacles_rids;
 	const NavMap2D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, obstacles_rids);
-	const LocalVector<NavObstacle2D *> obstacles(map->get_obstacles());
+	const LocalVector<NavObstacle2D *> obstacles = map->get_obstacles();
 	obstacles_rids.resize(obstacles.size());
 	for (uint32_t i = 0; i < obstacles.size(); i++) {
 		obstacles_rids[i] = obstacles[i]->get_self();
diff --git a/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
index 21055920..1dd521b0 100644
--- a/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
+++ b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
@@ -48,11 +48,11 @@
 #define MERGE_INTERNAL(A, B) A##B
 #define MERGE(A, B) MERGE_INTERNAL(A, B)
 
-#define COMMAND_1(F_NAME, T_0, D_0) \
+#define COMMAND_1(F_NAME, T_0, D_0)        \
 	virtual void F_NAME(T_0 D_0) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0)
 
-#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1) \
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)       \
 	virtual void F_NAME(T_0 D_0, T_1 D_1) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
diff --git a/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp b/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp
index 65532c05..1fbc82aa 100644
--- a/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp
+++ b/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp
@@ -31,6 +31,8 @@
 #include "nav_map_builder_2d.h"
 
 #include "../nav_link_2d.h"
+#include "../nav_map_2d.h"
+#include "../nav_region_2d.h"
 #include "../triangle2.h"
 #include "nav_map_iteration_2d.h"
 #include "nav_region_iteration_2d.h"
diff --git a/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h b/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h
index dd0fe803..313374b2 100644
--- a/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h
+++ b/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
+#include "../nav_rid_2d.h"
 #include "../nav_utils_2d.h"
 #include "nav_mesh_queries_2d.h"
 
 #include "core/math/math_defs.h"
-#include "core/os/rw_lock.h"
 #include "core/os/semaphore.h"
 
 class NavLinkIteration2D;
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
index 8f1aebf0..24d496ee 100644
--- a/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
+++ b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
@@ -33,14 +33,11 @@
 #include "nav_mesh_generator_2d.h"
 
 #include "core/config/project_settings.h"
-#include "scene/2d/node_2d.h"
-#include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 
-#include <thirdparty/clipper2/include/clipper2/clipper.h>
-#include <thirdparty/misc/polypartition.h>
+#include "thirdparty/clipper2/include/clipper2/clipper.h"
+#include "thirdparty/misc/polypartition.h"
 
 NavMeshGenerator2D *NavMeshGenerator2D::singleton = nullptr;
 Mutex NavMeshGenerator2D::baking_navmesh_mutex;
@@ -243,7 +240,7 @@ void NavMeshGenerator2D::generator_parse_geometry_node(Ref<NavigationPolygon> p_
 	}
 }
 
-void NavMeshGenerator2D::set_generator_parsers(const LocalVector<NavMeshGeometryParser2D *> &p_parsers) {
+void NavMeshGenerator2D::set_generator_parsers(LocalVector<NavMeshGeometryParser2D *> p_parsers) {
 	RWLockWrite write_lock(generator_parsers_rwlock);
 	generator_parsers = p_parsers;
 }
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
index 17df0397..f2bd2f89 100644
--- a/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
+++ b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
@@ -32,8 +32,9 @@
 
 #ifdef CLIPPER2_ENABLED
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/templates/rid_owner.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 class Node;
@@ -90,7 +91,7 @@ public:
 	static void cleanup();
 	static void finish();
 
-	static void set_generator_parsers(const LocalVector<NavMeshGeometryParser2D *> &p_parsers);
+	static void set_generator_parsers(LocalVector<NavMeshGeometryParser2D *> p_parsers);
 
 	static void parse_source_geometry_data(Ref<NavigationPolygon> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable());
 	static void bake_from_source_geometry_data(Ref<NavigationPolygon> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, const Callable &p_callback = Callable());
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
index 70c715d1..8252ba9c 100644
--- a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
+++ b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
@@ -36,7 +36,6 @@
 #include "nav_region_iteration_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/templates/rb_map.h"
 
 using namespace Nav2D;
 
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h
index 3de361cd..22fc6e9b 100644
--- a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h
+++ b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h
@@ -33,6 +33,7 @@
 #include "../nav_utils_2d.h"
 
 #include "core/templates/a_hash_map.h"
+
 #include "servers/nav_heap.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 #include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
diff --git a/engine/modules/navigation_2d/2d/nav_region_builder_2d.cpp b/engine/modules/navigation_2d/2d/nav_region_builder_2d.cpp
index d0cabb55..7973762d 100644
--- a/engine/modules/navigation_2d/2d/nav_region_builder_2d.cpp
+++ b/engine/modules/navigation_2d/2d/nav_region_builder_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "nav_region_builder_2d.h"
 
+#include "../nav_map_2d.h"
+#include "../nav_region_2d.h"
 #include "../triangle2.h"
 #include "nav_region_iteration_2d.h"
 
diff --git a/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h b/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h
index a6cfcb12..329f4a67 100644
--- a/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h
+++ b/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h
@@ -32,6 +32,7 @@
 
 #include "../nav_utils_2d.h"
 #include "nav_base_iteration_2d.h"
+#include "scene/resources/2d/navigation_polygon.h"
 
 #include "core/math/rect2.h"
 
diff --git a/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp b/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp
index 63b79981..d3f427e5 100644
--- a/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp
+++ b/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp
@@ -30,12 +30,10 @@
 
 #include "navigation_link_2d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void NavigationLink2DEditor::_notification(int p_what) {
diff --git a/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.h b/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.h
index 2a4e0032..d9715a71 100644
--- a/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.h
+++ b/engine/modules/navigation_2d/editor/navigation_link_2d_editor_plugin.h
@@ -67,6 +67,7 @@ public:
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) override { editor->forward_canvas_draw_over_viewport(p_overlay); }
 
 	virtual String get_plugin_name() const override { return "NavigationLink2D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp b/engine/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp
index 928d6998..b9ed1bd2 100644
--- a/engine/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp
+++ b/engine/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_region_2d_editor_plugin.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/settings/editor_settings.h"
diff --git a/engine/modules/navigation_2d/nav_agent_2d.h b/engine/modules/navigation_2d/nav_agent_2d.h
index db1df666..a8bee213 100644
--- a/engine/modules/navigation_2d/nav_agent_2d.h
+++ b/engine/modules/navigation_2d/nav_agent_2d.h
@@ -32,10 +32,8 @@
 
 #include "nav_rid_2d.h"
 
-#include "core/math/vector2.h"
+#include "core/object/class_db.h"
 #include "core/templates/self_list.h"
-#include "core/variant/callable.h"
-#include "core/variant/dictionary.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
 #include <Agent2d.h>
diff --git a/engine/modules/navigation_2d/nav_base_2d.h b/engine/modules/navigation_2d/nav_base_2d.h
index 406ad231..1380a49b 100644
--- a/engine/modules/navigation_2d/nav_base_2d.h
+++ b/engine/modules/navigation_2d/nav_base_2d.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "nav_rid_2d.h"
+#include "nav_utils_2d.h"
 
-#include "core/object/object_id.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavMap2D;
diff --git a/engine/modules/navigation_2d/nav_link_2d.h b/engine/modules/navigation_2d/nav_link_2d.h
index 27292a9a..91d0f208 100644
--- a/engine/modules/navigation_2d/nav_link_2d.h
+++ b/engine/modules/navigation_2d/nav_link_2d.h
@@ -34,8 +34,6 @@
 #include "nav_base_2d.h"
 #include "nav_utils_2d.h"
 
-#include "core/os/rw_lock.h"
-
 class NavLinkIteration2D : public NavBaseIteration2D {
 	GDCLASS(NavLinkIteration2D, NavBaseIteration2D);
 
diff --git a/engine/modules/navigation_2d/nav_map_2d.cpp b/engine/modules/navigation_2d/nav_map_2d.cpp
index 51c42933..e0419200 100644
--- a/engine/modules/navigation_2d/nav_map_2d.cpp
+++ b/engine/modules/navigation_2d/nav_map_2d.cpp
@@ -40,7 +40,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 #include <Obstacle2d.h>
@@ -56,16 +55,16 @@ using namespace Nav2D;
 #define NAVMAP_ITERATION_ZERO_ERROR_MSG()
 #endif // DEBUG_ENABLED
 
-#define GET_MAP_ITERATION() \
-	iteration_slot_rwlock.read_lock(); \
+#define GET_MAP_ITERATION()                                                   \
+	iteration_slot_rwlock.read_lock();                                        \
 	NavMapIteration2D &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead2D iteration_read_lock(map_iteration); \
+	NavMapIterationRead2D iteration_read_lock(map_iteration);                 \
 	iteration_slot_rwlock.read_unlock();
 
-#define GET_MAP_ITERATION_CONST() \
-	iteration_slot_rwlock.read_lock(); \
+#define GET_MAP_ITERATION_CONST()                                                   \
+	iteration_slot_rwlock.read_lock();                                              \
 	const NavMapIteration2D &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead2D iteration_read_lock(map_iteration); \
+	NavMapIterationRead2D iteration_read_lock(map_iteration);                       \
 	iteration_slot_rwlock.read_unlock();
 
 void NavMap2D::set_cell_size(real_t p_cell_size) {
diff --git a/engine/modules/navigation_2d/nav_map_2d.h b/engine/modules/navigation_2d/nav_map_2d.h
index b58be559..d1a52372 100644
--- a/engine/modules/navigation_2d/nav_map_2d.h
+++ b/engine/modules/navigation_2d/nav_map_2d.h
@@ -37,7 +37,6 @@
 
 #include "core/math/math_defs.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/rw_lock.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
 #include <KdTree2d.h>
diff --git a/engine/modules/navigation_2d/nav_obstacle_2d.h b/engine/modules/navigation_2d/nav_obstacle_2d.h
index e2204b63..b18d095f 100644
--- a/engine/modules/navigation_2d/nav_obstacle_2d.h
+++ b/engine/modules/navigation_2d/nav_obstacle_2d.h
@@ -32,9 +32,8 @@
 
 #include "nav_rid_2d.h"
 
-#include "core/math/vector2.h"
+#include "core/object/class_db.h"
 #include "core/templates/self_list.h"
-#include "core/templates/vector.h"
 
 class NavAgent2D;
 class NavMap2D;
diff --git a/engine/modules/navigation_2d/nav_region_2d.cpp b/engine/modules/navigation_2d/nav_region_2d.cpp
index 3b59082c..e5c61426 100644
--- a/engine/modules/navigation_2d/nav_region_2d.cpp
+++ b/engine/modules/navigation_2d/nav_region_2d.cpp
@@ -30,11 +30,11 @@
 
 #include "nav_region_2d.h"
 
+#include "nav_map_2d.h"
+
 #include "2d/nav_mesh_queries_2d.h"
 #include "2d/nav_region_builder_2d.h"
 #include "2d/nav_region_iteration_2d.h"
-#include "nav_map_2d.h"
-
 #include "core/config/project_settings.h"
 
 using namespace Nav2D;
diff --git a/engine/modules/navigation_2d/nav_region_2d.h b/engine/modules/navigation_2d/nav_region_2d.h
index 7dd41910..f30b9756 100644
--- a/engine/modules/navigation_2d/nav_region_2d.h
+++ b/engine/modules/navigation_2d/nav_region_2d.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "2d/nav_region_iteration_2d.h"
 #include "nav_base_2d.h"
 #include "nav_utils_2d.h"
 
-#include "core/object/worker_thread_pool.h"
 #include "core/os/rw_lock.h"
 #include "scene/resources/2d/navigation_polygon.h"
 
+#include "2d/nav_region_iteration_2d.h"
+
 class NavRegion2D : public NavBase2D {
 	RWLock region_rwlock;
 
diff --git a/engine/modules/navigation_2d/nav_utils_2d.h b/engine/modules/navigation_2d/nav_utils_2d.h
index 7d22551d..4c33c166 100644
--- a/engine/modules/navigation_2d/nav_utils_2d.h
+++ b/engine/modules/navigation_2d/nav_utils_2d.h
@@ -30,12 +30,12 @@
 
 #pragma once
 
-#include "core/math/vector2.h"
+#include "core/math/vector3.h"
+#include "core/object/ref_counted.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rid.h"
-
-#include <cfloat> // FLT_MAX
+#include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavBaseIteration2D;
 
diff --git a/engine/modules/navigation_2d/register_types.cpp b/engine/modules/navigation_2d/register_types.cpp
index ac2cf432..3fa09165 100644
--- a/engine/modules/navigation_2d/register_types.cpp
+++ b/engine/modules/navigation_2d/register_types.cpp
@@ -32,7 +32,7 @@
 
 #include "2d/godot_navigation_server_2d.h"
 
-#include "core/object/callable_mp.h"
+#include "core/config/engine.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
index c2186d89..35b076c8 100644
--- a/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
+++ b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
@@ -30,54 +30,54 @@
 
 #include "godot_navigation_server_3d.h"
 
-#include "nav_mesh_generator_3d.h"
-
 #include "core/os/mutex.h"
 #include "scene/main/node.h"
 
+#include "nav_mesh_generator_3d.h"
+
 using namespace NavigationDefaults3D;
 
 /// Creates a struct for each function and a function that once called creates
 /// an instance of that struct with the submitted parameters.
 /// Then, that struct is stored in an array; the `sync` function consume that array.
 
-#define COMMAND_1(F_NAME, T_0, D_0) \
-	struct MERGE(F_NAME, _command_3d) : public SetCommand3D { \
-		T_0 d_0; \
-		MERGE(F_NAME, _command_3d) \
-		(T_0 p_d_0) : \
-				d_0(p_d_0) {} \
+#define COMMAND_1(F_NAME, T_0, D_0)                                   \
+	struct MERGE(F_NAME, _command_3d) : public SetCommand3D {         \
+		T_0 d_0;                                                      \
+		MERGE(F_NAME, _command_3d)                                    \
+		(T_0 p_d_0) :                                                 \
+				d_0(p_d_0) {}                                         \
 		virtual void exec(GodotNavigationServer3D *server) override { \
-			server->MERGE(_cmd_, F_NAME)(d_0); \
-		} \
-	}; \
-	void GodotNavigationServer3D::F_NAME(T_0 D_0) { \
-		auto cmd = memnew(MERGE(F_NAME, _command_3d)( \
-				D_0)); \
-		add_command(cmd); \
-	} \
+			server->MERGE(_cmd_, F_NAME)(d_0);                        \
+		}                                                             \
+	};                                                                \
+	void GodotNavigationServer3D::F_NAME(T_0 D_0) {                   \
+		auto cmd = memnew(MERGE(F_NAME, _command_3d)(                 \
+				D_0));                                                \
+		add_command(cmd);                                             \
+	}                                                                 \
 	void GodotNavigationServer3D::MERGE(_cmd_, F_NAME)(T_0 D_0)
 
-#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1) \
-	struct MERGE(F_NAME, _command_3d) : public SetCommand3D { \
-		T_0 d_0; \
-		T_1 d_1; \
-		MERGE(F_NAME, _command_3d) \
-		( \
-				T_0 p_d_0, \
-				T_1 p_d_1) : \
-				d_0(p_d_0), \
-				d_1(p_d_1) {} \
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)                         \
+	struct MERGE(F_NAME, _command_3d) : public SetCommand3D {         \
+		T_0 d_0;                                                      \
+		T_1 d_1;                                                      \
+		MERGE(F_NAME, _command_3d)                                    \
+		(                                                             \
+				T_0 p_d_0,                                            \
+				T_1 p_d_1) :                                          \
+				d_0(p_d_0),                                           \
+				d_1(p_d_1) {}                                         \
 		virtual void exec(GodotNavigationServer3D *server) override { \
-			server->MERGE(_cmd_, F_NAME)(d_0, d_1); \
-		} \
-	}; \
-	void GodotNavigationServer3D::F_NAME(T_0 D_0, T_1 D_1) { \
-		auto cmd = memnew(MERGE(F_NAME, _command_3d)( \
-				D_0, \
-				D_1)); \
-		add_command(cmd); \
-	} \
+			server->MERGE(_cmd_, F_NAME)(d_0, d_1);                   \
+		}                                                             \
+	};                                                                \
+	void GodotNavigationServer3D::F_NAME(T_0 D_0, T_1 D_1) {          \
+		auto cmd = memnew(MERGE(F_NAME, _command_3d)(                 \
+				D_0,                                                  \
+				D_1));                                                \
+		add_command(cmd);                                             \
+	}                                                                 \
 	void GodotNavigationServer3D::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
 GodotNavigationServer3D::GodotNavigationServer3D() {}
@@ -333,7 +333,7 @@ TypedArray<RID> GodotNavigationServer3D::map_get_obstacles(RID p_map) const {
 	TypedArray<RID> obstacles_rids;
 	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, obstacles_rids);
-	const LocalVector<NavObstacle3D *> obstacles(map->get_obstacles());
+	const LocalVector<NavObstacle3D *> obstacles = map->get_obstacles();
 	obstacles_rids.resize(obstacles.size());
 	for (uint32_t i = 0; i < obstacles.size(); i++) {
 		obstacles_rids[i] = obstacles[i]->get_self();
diff --git a/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
index a6ba9b54..58ec1993 100644
--- a/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
+++ b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
@@ -48,11 +48,11 @@
 #define MERGE_INTERNAL(A, B) A##B
 #define MERGE(A, B) MERGE_INTERNAL(A, B)
 
-#define COMMAND_1(F_NAME, T_0, D_0) \
+#define COMMAND_1(F_NAME, T_0, D_0)        \
 	virtual void F_NAME(T_0 D_0) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0)
 
-#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1) \
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)       \
 	virtual void F_NAME(T_0 D_0, T_1 D_1) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
diff --git a/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp b/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
index 47964db5..cbe5e837 100644
--- a/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
@@ -31,6 +31,8 @@
 #include "nav_map_builder_3d.h"
 
 #include "../nav_link_3d.h"
+#include "../nav_map_3d.h"
+#include "../nav_region_3d.h"
 #include "nav_map_iteration_3d.h"
 #include "nav_region_iteration_3d.h"
 
diff --git a/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h b/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
index 008ad091..2efade40 100644
--- a/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
+#include "../nav_rid_3d.h"
 #include "../nav_utils_3d.h"
 #include "nav_mesh_queries_3d.h"
 
 #include "core/math/math_defs.h"
-#include "core/os/rw_lock.h"
 #include "core/os/semaphore.h"
 
 class NavLinkIteration3D;
diff --git a/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
index 200794df..569a3f50 100644
--- a/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
@@ -33,7 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/os/thread.h"
 #include "scene/3d/node_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 
@@ -273,7 +272,7 @@ void NavMeshGenerator3D::generator_parse_geometry_node(const Ref<NavigationMesh>
 	}
 }
 
-void NavMeshGenerator3D::set_generator_parsers(const LocalVector<NavMeshGeometryParser3D *> &p_parsers) {
+void NavMeshGenerator3D::set_generator_parsers(LocalVector<NavMeshGeometryParser3D *> p_parsers) {
 	RWLockWrite write_lock(generator_parsers_rwlock);
 	generator_parsers = p_parsers;
 }
diff --git a/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
index 47570ea1..2ca18163 100644
--- a/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/templates/rid_owner.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 class Node;
@@ -109,7 +110,7 @@ public:
 	static void cleanup();
 	static void finish();
 
-	static void set_generator_parsers(const LocalVector<NavMeshGeometryParser3D *> &p_parsers);
+	static void set_generator_parsers(LocalVector<NavMeshGeometryParser3D *> p_parsers);
 
 	static void parse_source_geometry_data(Ref<NavigationMesh> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable());
 	static void bake_from_source_geometry_data(Ref<NavigationMesh> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, const Callable &p_callback = Callable());
diff --git a/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
index 0173b79b..5e636e97 100644
--- a/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
@@ -34,8 +34,8 @@
 #include "../nav_map_3d.h"
 #include "nav_region_iteration_3d.h"
 
+#include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
-#include "core/templates/rb_map.h"
 
 using namespace Nav3D;
 
diff --git a/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
index 20d3898e..af18db86 100644
--- a/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
@@ -33,6 +33,7 @@
 #include "../nav_utils_3d.h"
 
 #include "core/templates/a_hash_map.h"
+
 #include "servers/nav_heap.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 #include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
diff --git a/engine/modules/navigation_3d/3d/nav_region_builder_3d.cpp b/engine/modules/navigation_3d/3d/nav_region_builder_3d.cpp
index 33dd8d2c..bcc91bcc 100644
--- a/engine/modules/navigation_3d/3d/nav_region_builder_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_region_builder_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "nav_region_builder_3d.h"
 
+#include "../nav_map_3d.h"
+#include "../nav_region_3d.h"
 #include "nav_region_iteration_3d.h"
 
 #include "core/config/project_settings.h"
diff --git a/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h b/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
index cef7edf6..8c0ed392 100644
--- a/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
@@ -32,6 +32,7 @@
 
 #include "../nav_utils_3d.h"
 #include "nav_base_iteration_3d.h"
+#include "scene/resources/navigation_mesh.h"
 
 #include "core/math/aabb.h"
 
diff --git a/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp b/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
index 21024f41..23d5e654 100644
--- a/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
+++ b/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
@@ -30,8 +30,6 @@
 
 #include "navigation_mesh_generator.h"
 
-#include "core/object/class_db.h"
-#include "scene/main/node.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
diff --git a/engine/modules/navigation_3d/3d/navigation_mesh_generator.h b/engine/modules/navigation_3d/3d/navigation_mesh_generator.h
index 22b0a5f6..eaf2221a 100644
--- a/engine/modules/navigation_3d/3d/navigation_mesh_generator.h
+++ b/engine/modules/navigation_3d/3d/navigation_mesh_generator.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/resources/navigation_mesh.h"
 
 class NavigationMeshSourceGeometryData3D;
diff --git a/engine/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h b/engine/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h
index da912c78..2c644cc8 100644
--- a/engine/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h
+++ b/engine/modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "navigation_link_3d_gizmo_plugin.h"
-
 #include "editor/plugins/editor_plugin.h"
 
+#include "navigation_link_3d_gizmo_plugin.h"
+
 class NavigationLink3DEditorPlugin : public EditorPlugin {
 	GDCLASS(NavigationLink3DEditorPlugin, EditorPlugin);
 
@@ -41,6 +41,7 @@ class NavigationLink3DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "NavigationLink3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 
diff --git a/engine/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp b/engine/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
index 00e4271d..7259ea14 100644
--- a/engine/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
+++ b/engine/modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
@@ -96,21 +96,21 @@ void NavigationLink3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		// Draw axis-aligned circle.
 		switch (up_axis) {
 			case Vector3::AXIS_X:
-#define PUSH_OCTANT(_position, a, b) \
-	lines_ptrw[index++] = _position + Vector3(0, a.x, a.y); \
-	lines_ptrw[index++] = _position + Vector3(0, x, y); \
-	lines_ptrw[index++] = _position + Vector3(0, -a.x, a.y); \
-	lines_ptrw[index++] = _position + Vector3(0, x, y); \
-	lines_ptrw[index++] = _position + Vector3(0, a.x, -a.y); \
-	lines_ptrw[index++] = _position + Vector3(0, x, -y); \
+#define PUSH_OCTANT(_position, a, b)                          \
+	lines_ptrw[index++] = _position + Vector3(0, a.x, a.y);   \
+	lines_ptrw[index++] = _position + Vector3(0, x, y);       \
+	lines_ptrw[index++] = _position + Vector3(0, -a.x, a.y);  \
+	lines_ptrw[index++] = _position + Vector3(0, x, y);       \
+	lines_ptrw[index++] = _position + Vector3(0, a.x, -a.y);  \
+	lines_ptrw[index++] = _position + Vector3(0, x, -y);      \
 	lines_ptrw[index++] = _position + Vector3(0, -a.x, -a.y); \
-	lines_ptrw[index++] = _position + Vector3(0, x, y); \
-	lines_ptrw[index++] = _position + Vector3(0, a.y, a.x); \
-	lines_ptrw[index++] = _position + Vector3(0, y, x); \
-	lines_ptrw[index++] = _position + Vector3(0, -a.y, a.x); \
-	lines_ptrw[index++] = _position + Vector3(0, -y, x); \
-	lines_ptrw[index++] = _position + Vector3(0, a.y, -a.x); \
-	lines_ptrw[index++] = _position + Vector3(0, y, -x); \
+	lines_ptrw[index++] = _position + Vector3(0, x, y);       \
+	lines_ptrw[index++] = _position + Vector3(0, a.y, a.x);   \
+	lines_ptrw[index++] = _position + Vector3(0, y, x);       \
+	lines_ptrw[index++] = _position + Vector3(0, -a.y, a.x);  \
+	lines_ptrw[index++] = _position + Vector3(0, -y, x);      \
+	lines_ptrw[index++] = _position + Vector3(0, a.y, -a.x);  \
+	lines_ptrw[index++] = _position + Vector3(0, y, -x);      \
 	lines_ptrw[index++] = _position + Vector3(0, -a.y, -a.x); \
 	lines_ptrw[index++] = _position + Vector3(0, -y, -x);
 
@@ -119,21 +119,21 @@ void NavigationLink3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 #undef PUSH_OCTANT
 				break;
 			case Vector3::AXIS_Y:
-#define PUSH_OCTANT(_position, a, b) \
-	lines_ptrw[index++] = _position + Vector3(a.x, 0, a.y); \
-	lines_ptrw[index++] = _position + Vector3(x, 0, y); \
-	lines_ptrw[index++] = _position + Vector3(-a.x, 0, a.y); \
-	lines_ptrw[index++] = _position + Vector3(-x, 0, y); \
-	lines_ptrw[index++] = _position + Vector3(a.x, 0, -a.y); \
-	lines_ptrw[index++] = _position + Vector3(x, 0, -y); \
+#define PUSH_OCTANT(_position, a, b)                          \
+	lines_ptrw[index++] = _position + Vector3(a.x, 0, a.y);   \
+	lines_ptrw[index++] = _position + Vector3(x, 0, y);       \
+	lines_ptrw[index++] = _position + Vector3(-a.x, 0, a.y);  \
+	lines_ptrw[index++] = _position + Vector3(-x, 0, y);      \
+	lines_ptrw[index++] = _position + Vector3(a.x, 0, -a.y);  \
+	lines_ptrw[index++] = _position + Vector3(x, 0, -y);      \
 	lines_ptrw[index++] = _position + Vector3(-a.x, 0, -a.y); \
-	lines_ptrw[index++] = _position + Vector3(-x, 0, -y); \
-	lines_ptrw[index++] = _position + Vector3(a.y, 0, a.x); \
-	lines_ptrw[index++] = _position + Vector3(y, 0, x); \
-	lines_ptrw[index++] = _position + Vector3(-a.y, 0, a.x); \
-	lines_ptrw[index++] = _position + Vector3(-y, 0, x); \
-	lines_ptrw[index++] = _position + Vector3(a.y, 0, -a.x); \
-	lines_ptrw[index++] = _position + Vector3(y, 0, -x); \
+	lines_ptrw[index++] = _position + Vector3(-x, 0, -y);     \
+	lines_ptrw[index++] = _position + Vector3(a.y, 0, a.x);   \
+	lines_ptrw[index++] = _position + Vector3(y, 0, x);       \
+	lines_ptrw[index++] = _position + Vector3(-a.y, 0, a.x);  \
+	lines_ptrw[index++] = _position + Vector3(-y, 0, x);      \
+	lines_ptrw[index++] = _position + Vector3(a.y, 0, -a.x);  \
+	lines_ptrw[index++] = _position + Vector3(y, 0, -x);      \
 	lines_ptrw[index++] = _position + Vector3(-a.y, 0, -a.x); \
 	lines_ptrw[index++] = _position + Vector3(-y, 0, -x);
 
@@ -142,21 +142,21 @@ void NavigationLink3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 #undef PUSH_OCTANT
 				break;
 			case Vector3::AXIS_Z:
-#define PUSH_OCTANT(_position, a, b) \
-	lines_ptrw[index++] = _position + Vector3(a.x, a.y, 0); \
-	lines_ptrw[index++] = _position + Vector3(x, y, 0); \
-	lines_ptrw[index++] = _position + Vector3(-a.x, a.y, 0); \
-	lines_ptrw[index++] = _position + Vector3(-x, y, 0); \
-	lines_ptrw[index++] = _position + Vector3(a.x, -a.y, 0); \
-	lines_ptrw[index++] = _position + Vector3(x, -y, 0); \
+#define PUSH_OCTANT(_position, a, b)                          \
+	lines_ptrw[index++] = _position + Vector3(a.x, a.y, 0);   \
+	lines_ptrw[index++] = _position + Vector3(x, y, 0);       \
+	lines_ptrw[index++] = _position + Vector3(-a.x, a.y, 0);  \
+	lines_ptrw[index++] = _position + Vector3(-x, y, 0);      \
+	lines_ptrw[index++] = _position + Vector3(a.x, -a.y, 0);  \
+	lines_ptrw[index++] = _position + Vector3(x, -y, 0);      \
 	lines_ptrw[index++] = _position + Vector3(-a.x, -a.y, 0); \
-	lines_ptrw[index++] = _position + Vector3(-x, -y, 0); \
-	lines_ptrw[index++] = _position + Vector3(a.y, a.x, 0); \
-	lines_ptrw[index++] = _position + Vector3(y, x, 0); \
-	lines_ptrw[index++] = _position + Vector3(-a.y, a.x, 0); \
-	lines_ptrw[index++] = _position + Vector3(-y, x, 0); \
-	lines_ptrw[index++] = _position + Vector3(a.y, -a.x, 0); \
-	lines_ptrw[index++] = _position + Vector3(y, -x, 0); \
+	lines_ptrw[index++] = _position + Vector3(-x, -y, 0);     \
+	lines_ptrw[index++] = _position + Vector3(a.y, a.x, 0);   \
+	lines_ptrw[index++] = _position + Vector3(y, x, 0);       \
+	lines_ptrw[index++] = _position + Vector3(-a.y, a.x, 0);  \
+	lines_ptrw[index++] = _position + Vector3(-y, x, 0);      \
+	lines_ptrw[index++] = _position + Vector3(a.y, -a.x, 0);  \
+	lines_ptrw[index++] = _position + Vector3(y, -x, 0);      \
 	lines_ptrw[index++] = _position + Vector3(-a.y, -a.x, 0); \
 	lines_ptrw[index++] = _position + Vector3(-y, -x, 0);
 
diff --git a/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
index 59542c2c..1800c4df 100644
--- a/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
+++ b/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
@@ -30,9 +30,7 @@
 
 #include "navigation_obstacle_3d_editor_plugin.h"
 
-#include "core/input/input.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -41,9 +39,7 @@
 #include "scene/3d/navigation/navigation_obstacle_3d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 bool NavigationObstacle3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<NavigationObstacle3D>(p_spatial) != nullptr;
@@ -756,7 +752,7 @@ void NavigationObstacle3DEditorPlugin::redraw() {
 
 	point_lines_mesh_array[Mesh::ARRAY_VERTEX] = point_lines_mesh_vertices;
 
-	rs->mesh_add_surface_from_arrays(point_lines_mesh_rid, RSE::PRIMITIVE_LINES, point_lines_mesh_array);
+	rs->mesh_add_surface_from_arrays(point_lines_mesh_rid, RS::PRIMITIVE_LINES, point_lines_mesh_array);
 	rs->instance_set_surface_override_material(point_lines_instance_rid, 0, line_material->get_rid());
 	const Vector3 safe_scale = obstacle_node->get_global_basis().get_scale().abs().maxf(0.001);
 	const Transform3D gt = Transform3D(Basis().scaled(safe_scale).rotated(Vector3(0.0, 1.0, 0.0), obstacle_node->get_global_rotation().y), obstacle_node->get_global_position());
@@ -783,7 +779,7 @@ void NavigationObstacle3DEditorPlugin::redraw() {
 
 	point_handle_mesh_array[Mesh::ARRAY_VERTEX] = point_handle_mesh_vertices;
 
-	rs->mesh_add_surface_from_arrays(point_handle_mesh_rid, RSE::PRIMITIVE_POINTS, point_handle_mesh_array);
+	rs->mesh_add_surface_from_arrays(point_handle_mesh_rid, RS::PRIMITIVE_POINTS, point_handle_mesh_array);
 	rs->instance_set_surface_override_material(point_handles_instance_rid, 0, handle_material->get_rid());
 	rs->instance_set_transform(point_handles_instance_rid, gt);
 }
diff --git a/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h b/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h
index c80c3188..cd529386 100644
--- a/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h
+++ b/engine/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h
@@ -124,6 +124,7 @@ public:
 	virtual EditorPlugin::AfterGUIInput forward_3d_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;
 
 	virtual String get_plugin_name() const override { return "NavigationObstacle3DEditor"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
index cbcf1a92..27f13414 100644
--- a/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
+++ b/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "navigation_region_3d_editor_plugin.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/multi_node_edit.h"
@@ -41,7 +39,6 @@
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
-#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 void NavigationRegion3DEditor::_node_removed(Node *p_node) {
@@ -268,7 +265,7 @@ void NavigationRegion3DEditorPlugin::edit(Object *p_object) {
 		NavigationRegion3D *region = Object::cast_to<NavigationRegion3D>(p_object);
 		if (region) {
 			regions.push_back(region);
-			navigation_region_editor->edit(std::move(regions));
+			navigation_region_editor->edit(regions);
 			return;
 		}
 	}
@@ -284,7 +281,7 @@ void NavigationRegion3DEditorPlugin::edit(Object *p_object) {
 		}
 	}
 
-	navigation_region_editor->edit(std::move(regions));
+	navigation_region_editor->edit(regions);
 }
 
 bool NavigationRegion3DEditorPlugin::handles(Object *p_object) const {
diff --git a/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h b/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h
index 78a26611..3dc98ec1 100644
--- a/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h
+++ b/engine/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "navigation_region_3d_gizmo_plugin.h"
-
 #include "editor/plugins/editor_plugin.h"
 
+#include "navigation_region_3d_gizmo_plugin.h"
+
 class AcceptDialog;
 class Button;
 class ConfirmationDialog;
@@ -91,6 +91,7 @@ class NavigationRegion3DEditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "NavigationRegion3D"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/modules/navigation_3d/nav_agent_3d.h b/engine/modules/navigation_3d/nav_agent_3d.h
index b45368cc..fc3be0c2 100644
--- a/engine/modules/navigation_3d/nav_agent_3d.h
+++ b/engine/modules/navigation_3d/nav_agent_3d.h
@@ -32,10 +32,8 @@
 
 #include "nav_rid_3d.h"
 
-#include "core/math/vector3.h"
+#include "core/object/class_db.h"
 #include "core/templates/self_list.h"
-#include "core/variant/callable.h"
-#include "core/variant/dictionary.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
 #include <Agent2d.h>
diff --git a/engine/modules/navigation_3d/nav_base_3d.h b/engine/modules/navigation_3d/nav_base_3d.h
index 03c8aeaa..08934362 100644
--- a/engine/modules/navigation_3d/nav_base_3d.h
+++ b/engine/modules/navigation_3d/nav_base_3d.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "nav_rid_3d.h"
+#include "nav_utils_3d.h"
 
-#include "core/object/object_id.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavMap3D;
diff --git a/engine/modules/navigation_3d/nav_link_3d.h b/engine/modules/navigation_3d/nav_link_3d.h
index 67544c16..e6b54d2f 100644
--- a/engine/modules/navigation_3d/nav_link_3d.h
+++ b/engine/modules/navigation_3d/nav_link_3d.h
@@ -34,8 +34,6 @@
 #include "nav_base_3d.h"
 #include "nav_utils_3d.h"
 
-#include "core/os/rw_lock.h"
-
 class NavLinkIteration3D : public NavBaseIteration3D {
 	GDCLASS(NavLinkIteration3D, NavBaseIteration3D);
 
diff --git a/engine/modules/navigation_3d/nav_map_3d.cpp b/engine/modules/navigation_3d/nav_map_3d.cpp
index cfc767ca..010bd8fa 100644
--- a/engine/modules/navigation_3d/nav_map_3d.cpp
+++ b/engine/modules/navigation_3d/nav_map_3d.cpp
@@ -40,7 +40,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 #include <Obstacle2d.h>
@@ -56,16 +55,16 @@ using namespace Nav3D;
 #define NAVMAP_ITERATION_ZERO_ERROR_MSG()
 #endif // DEBUG_ENABLED
 
-#define GET_MAP_ITERATION() \
-	iteration_slot_rwlock.read_lock(); \
+#define GET_MAP_ITERATION()                                                   \
+	iteration_slot_rwlock.read_lock();                                        \
 	NavMapIteration3D &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead3D iteration_read_lock(map_iteration); \
+	NavMapIterationRead3D iteration_read_lock(map_iteration);                 \
 	iteration_slot_rwlock.read_unlock();
 
-#define GET_MAP_ITERATION_CONST() \
-	iteration_slot_rwlock.read_lock(); \
+#define GET_MAP_ITERATION_CONST()                                                   \
+	iteration_slot_rwlock.read_lock();                                              \
 	const NavMapIteration3D &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead3D iteration_read_lock(map_iteration); \
+	NavMapIterationRead3D iteration_read_lock(map_iteration);                       \
 	iteration_slot_rwlock.read_unlock();
 
 void NavMap3D::set_up(Vector3 p_up) {
diff --git a/engine/modules/navigation_3d/nav_map_3d.h b/engine/modules/navigation_3d/nav_map_3d.h
index 34d11ee4..0f18dd34 100644
--- a/engine/modules/navigation_3d/nav_map_3d.h
+++ b/engine/modules/navigation_3d/nav_map_3d.h
@@ -37,7 +37,6 @@
 
 #include "core/math/math_defs.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/rw_lock.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
 #include <KdTree2d.h>
diff --git a/engine/modules/navigation_3d/nav_obstacle_3d.h b/engine/modules/navigation_3d/nav_obstacle_3d.h
index 4ffd1619..fe5a9528 100644
--- a/engine/modules/navigation_3d/nav_obstacle_3d.h
+++ b/engine/modules/navigation_3d/nav_obstacle_3d.h
@@ -32,7 +32,7 @@
 
 #include "nav_rid_3d.h"
 
-#include "core/math/vector3.h"
+#include "core/object/class_db.h"
 #include "core/templates/self_list.h"
 
 class NavAgent3D;
diff --git a/engine/modules/navigation_3d/nav_region_3d.cpp b/engine/modules/navigation_3d/nav_region_3d.cpp
index 60edc7d3..f4c2a46e 100644
--- a/engine/modules/navigation_3d/nav_region_3d.cpp
+++ b/engine/modules/navigation_3d/nav_region_3d.cpp
@@ -30,11 +30,11 @@
 
 #include "nav_region_3d.h"
 
+#include "nav_map_3d.h"
+
 #include "3d/nav_mesh_queries_3d.h"
 #include "3d/nav_region_builder_3d.h"
 #include "3d/nav_region_iteration_3d.h"
-#include "nav_map_3d.h"
-
 #include "core/config/project_settings.h"
 
 using namespace Nav3D;
diff --git a/engine/modules/navigation_3d/nav_region_3d.h b/engine/modules/navigation_3d/nav_region_3d.h
index a9da756c..756aefc4 100644
--- a/engine/modules/navigation_3d/nav_region_3d.h
+++ b/engine/modules/navigation_3d/nav_region_3d.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "3d/nav_region_iteration_3d.h"
 #include "nav_base_3d.h"
 #include "nav_utils_3d.h"
 
-#include "core/object/worker_thread_pool.h"
 #include "core/os/rw_lock.h"
 #include "scene/resources/navigation_mesh.h"
 
+#include "3d/nav_region_iteration_3d.h"
+
 class NavRegion3D : public NavBase3D {
 	RWLock region_rwlock;
 
diff --git a/engine/modules/navigation_3d/nav_utils_3d.h b/engine/modules/navigation_3d/nav_utils_3d.h
index 62e5aeed..d18fb92c 100644
--- a/engine/modules/navigation_3d/nav_utils_3d.h
+++ b/engine/modules/navigation_3d/nav_utils_3d.h
@@ -31,11 +31,11 @@
 #pragma once
 
 #include "core/math/vector3.h"
+#include "core/object/ref_counted.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rid.h"
-
-#include <cfloat> // FLT_MAX
+#include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavBaseIteration3D;
 
diff --git a/engine/modules/navigation_3d/register_types.cpp b/engine/modules/navigation_3d/register_types.cpp
index f93839f6..e2ccd21b 100644
--- a/engine/modules/navigation_3d/register_types.cpp
+++ b/engine/modules/navigation_3d/register_types.cpp
@@ -43,8 +43,6 @@
 #endif
 
 #include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 #ifndef DISABLE_DEPRECATED
diff --git a/engine/modules/noise/doc_classes/FastNoiseLite.xml b/engine/modules/noise/doc_classes/FastNoiseLite.xml
index 58797529..21fbb18b 100644
--- a/engine/modules/noise/doc_classes/FastNoiseLite.xml
+++ b/engine/modules/noise/doc_classes/FastNoiseLite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="FastNoiseLite" inherits="Noise" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="FastNoiseLite" inherits="Noise" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Generates noise using the FastNoiseLite library.
 	</brief_description>
diff --git a/engine/modules/noise/doc_classes/Noise.xml b/engine/modules/noise/doc_classes/Noise.xml
index a3a4aee1..7d74c84f 100644
--- a/engine/modules/noise/doc_classes/Noise.xml
+++ b/engine/modules/noise/doc_classes/Noise.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Noise" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="Noise" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Abstract base class for noise generators.
 	</brief_description>
diff --git a/engine/modules/noise/doc_classes/NoiseTexture2D.xml b/engine/modules/noise/doc_classes/NoiseTexture2D.xml
index 0b7a737e..3f4afc51 100644
--- a/engine/modules/noise/doc_classes/NoiseTexture2D.xml
+++ b/engine/modules/noise/doc_classes/NoiseTexture2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NoiseTexture2D" inherits="Texture2D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="NoiseTexture2D" inherits="Texture2D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A 2D texture filled with noise generated by a [Noise] object.
 	</brief_description>
diff --git a/engine/modules/noise/doc_classes/NoiseTexture3D.xml b/engine/modules/noise/doc_classes/NoiseTexture3D.xml
index 3aaf5b45..e8e205bc 100644
--- a/engine/modules/noise/doc_classes/NoiseTexture3D.xml
+++ b/engine/modules/noise/doc_classes/NoiseTexture3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NoiseTexture3D" inherits="Texture3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="NoiseTexture3D" inherits="Texture3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A 3D texture filled with noise generated by a [Noise] object.
 	</brief_description>
diff --git a/engine/modules/noise/editor/noise_editor_plugin.cpp b/engine/modules/noise/editor/noise_editor_plugin.cpp
index 38c354ea..4a922438 100644
--- a/engine/modules/noise/editor/noise_editor_plugin.cpp
+++ b/engine/modules/noise/editor/noise_editor_plugin.cpp
@@ -33,7 +33,6 @@
 #include "../noise.h"
 #include "../noise_texture_2d.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
diff --git a/engine/modules/noise/fastnoise_lite.cpp b/engine/modules/noise/fastnoise_lite.cpp
index 42f00ce8..c31bcffc 100644
--- a/engine/modules/noise/fastnoise_lite.cpp
+++ b/engine/modules/noise/fastnoise_lite.cpp
@@ -31,7 +31,6 @@
 #include "fastnoise_lite.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 _FastNoiseLite::FractalType FastNoiseLite::_convert_domain_warp_fractal_type_enum(DomainWarpFractalType p_domain_warp_fractal_type) {
 	_FastNoiseLite::FractalType type;
@@ -483,24 +482,18 @@ void FastNoiseLite::_validate_property(PropertyInfo &p_property) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-	if (p_property.name.begins_with("cellular")) {
-		if (get_noise_type() != TYPE_CELLULAR) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
+	if (p_property.name.begins_with("cellular") && get_noise_type() != TYPE_CELLULAR) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		return;
 	}
 
-	if (p_property.name != "fractal_type" && p_property.name.begins_with("fractal")) {
-		if (get_fractal_type() == FRACTAL_NONE) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
+	if (p_property.name != "fractal_type" && p_property.name.begins_with("fractal") && get_fractal_type() == FRACTAL_NONE) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		return;
 	}
 
-	if (p_property.name == "fractal_ping_pong_strength") {
-		if (get_fractal_type() != FRACTAL_PING_PONG) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
+	if (p_property.name == "fractal_ping_pong_strength" && get_fractal_type() != FRACTAL_PING_PONG) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		return;
 	}
 }
diff --git a/engine/modules/noise/fastnoise_lite.h b/engine/modules/noise/fastnoise_lite.h
index 3e74cb0f..6e35aeb1 100644
--- a/engine/modules/noise/fastnoise_lite.h
+++ b/engine/modules/noise/fastnoise_lite.h
@@ -32,7 +32,7 @@
 
 #include "noise.h"
 
-#include <thirdparty/misc/FastNoiseLite.h>
+#include "thirdparty/misc/FastNoiseLite.h"
 
 typedef fastnoiselite::FastNoiseLite _FastNoiseLite;
 
diff --git a/engine/modules/noise/noise.cpp b/engine/modules/noise/noise.cpp
index 5c5f5184..c8d6d78a 100644
--- a/engine/modules/noise/noise.cpp
+++ b/engine/modules/noise/noise.cpp
@@ -30,10 +30,6 @@
 
 #include "noise.h"
 
-#include "core/object/class_db.h"
-
-#include <cfloat> // FLT_MAX
-
 Vector<Ref<Image>> Noise::_get_seamless_image(int p_width, int p_height, int p_depth, bool p_invert, bool p_in_3d_space, real_t p_blend_skirt, bool p_normalize) const {
 	ERR_FAIL_COND_V(p_width <= 0 || p_height <= 0 || p_depth <= 0, Vector<Ref<Image>>());
 
diff --git a/engine/modules/noise/noise_texture_2d.cpp b/engine/modules/noise/noise_texture_2d.cpp
index c09d1584..c0f74dd8 100644
--- a/engine/modules/noise/noise_texture_2d.cpp
+++ b/engine/modules/noise/noise_texture_2d.cpp
@@ -32,9 +32,6 @@
 
 #include "noise.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 NoiseTexture2D::NoiseTexture2D() {
@@ -90,8 +87,8 @@ void NoiseTexture2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,2048,1,or_greater,suffix:px"), "set_width", "get_width");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater,suffix:px"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "generate_mipmaps"), "set_generate_mipmaps", "is_generating_mipmaps");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, Noise::get_class_static()), "set_noise", "get_noise");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_ramp", "get_color_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "Noise"), "set_noise", "get_noise");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_ramp", "get_color_ramp");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "invert"), "set_invert", "get_invert");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "in_3d_space"), "set_in_3d_space", "is_in_3d_space");
@@ -109,7 +106,9 @@ void NoiseTexture2D::_validate_property(PropertyInfo &p_property) const {
 		if (!as_normal_map) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-	} else if (p_property.name == "seamless_blend_skirt") {
+	}
+
+	if (p_property.name == "seamless_blend_skirt") {
 		if (!seamless) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
diff --git a/engine/modules/noise/noise_texture_3d.cpp b/engine/modules/noise/noise_texture_3d.cpp
index 81283b08..11762671 100644
--- a/engine/modules/noise/noise_texture_3d.cpp
+++ b/engine/modules/noise/noise_texture_3d.cpp
@@ -32,9 +32,6 @@
 
 #include "noise.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 NoiseTexture3D::NoiseTexture3D() {
@@ -79,8 +76,8 @@ void NoiseTexture3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,2048,1,or_greater,suffix:px"), "set_width", "get_width");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater,suffix:px"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "depth", PROPERTY_HINT_RANGE, "1,2048,1,or_greater,suffix:px"), "set_depth", "get_depth");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, Noise::get_class_static()), "set_noise", "get_noise");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_ramp", "get_color_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "Noise"), "set_noise", "get_noise");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_ramp", "get_color_ramp");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "invert"), "set_invert", "get_invert");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "normalize"), "set_normalize", "is_normalized");
diff --git a/engine/modules/noise/register_types.cpp b/engine/modules/noise/register_types.cpp
index 9c25ee08..363b7bdc 100644
--- a/engine/modules/noise/register_types.cpp
+++ b/engine/modules/noise/register_types.cpp
@@ -35,8 +35,6 @@
 #include "noise_texture_2d.h"
 #include "noise_texture_3d.h"
 
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/noise_editor_plugin.h"
 #endif
diff --git a/engine/modules/noise/tests/test_fastnoise_lite.h b/engine/modules/noise/tests/test_fastnoise_lite.h
index 2b011a80..8b031690 100644
--- a/engine/modules/noise/tests/test_fastnoise_lite.h
+++ b/engine/modules/noise/tests/test_fastnoise_lite.h
@@ -63,13 +63,13 @@ Vector<Pair<size_t, size_t>> find_approx_equal_vec_pairs(std::initializer_list<V
 	return result;
 }
 
-#define CHECK_ARGS_APPROX_PAIRWISE_DISTINCT_VECS(...) \
-	{ \
-		Vector<Pair<size_t, size_t>> equal_pairs = find_approx_equal_vec_pairs({ __VA_ARGS__ }); \
-		for (Pair<size_t, size_t> p : equal_pairs) { \
+#define CHECK_ARGS_APPROX_PAIRWISE_DISTINCT_VECS(...)                                                              \
+	{                                                                                                              \
+		Vector<Pair<size_t, size_t>> equal_pairs = find_approx_equal_vec_pairs({ __VA_ARGS__ });                   \
+		for (Pair<size_t, size_t> p : equal_pairs) {                                                               \
 			MESSAGE("Argument with index ", p.first, " is approximately equal to argument with index ", p.second); \
-		} \
-		CHECK_MESSAGE(equal_pairs.size() == 0, "All arguments should be pairwise distinct."); \
+		}                                                                                                          \
+		CHECK_MESSAGE(equal_pairs.size() == 0, "All arguments should be pairwise distinct.");                      \
 	}
 
 Vector<real_t> get_noise_samples_1d(const FastNoiseLite &p_noise, size_t p_count = 32) {
diff --git a/engine/modules/noise/tests/test_noise_texture_2d.h b/engine/modules/noise/tests/test_noise_texture_2d.h
index 6d6686a0..e0908d75 100644
--- a/engine/modules/noise/tests/test_noise_texture_2d.h
+++ b/engine/modules/noise/tests/test_noise_texture_2d.h
@@ -30,11 +30,8 @@
 
 #pragma once
 
-#include "../fastnoise_lite.h"
 #include "../noise_texture_2d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/message_queue.h"
 #include "tests/test_macros.h"
 
 namespace TestNoiseTexture2D {
diff --git a/engine/modules/noise/tests/test_noise_texture_3d.h b/engine/modules/noise/tests/test_noise_texture_3d.h
index 6bb78d92..eb9cc544 100644
--- a/engine/modules/noise/tests/test_noise_texture_3d.h
+++ b/engine/modules/noise/tests/test_noise_texture_3d.h
@@ -30,11 +30,8 @@
 
 #pragma once
 
-#include "../fastnoise_lite.h"
 #include "../noise_texture_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/message_queue.h"
 #include "tests/test_macros.h"
 
 namespace TestNoiseTexture3D {
diff --git a/engine/modules/objectdb_profiler/editor/data_viewers/class_view.cpp b/engine/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
index f4346669..c33a39dc 100644
--- a/engine/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
+++ b/engine/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
@@ -32,8 +32,6 @@
 
 #include "shared_controls.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/split_container.h"
diff --git a/engine/modules/objectdb_profiler/editor/data_viewers/node_view.cpp b/engine/modules/objectdb_profiler/editor/data_viewers/node_view.cpp
index 119bf9a6..9bef5c31 100644
--- a/engine/modules/objectdb_profiler/editor/data_viewers/node_view.cpp
+++ b/engine/modules/objectdb_profiler/editor/data_viewers/node_view.cpp
@@ -30,7 +30,6 @@
 
 #include "node_view.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_button.h"
diff --git a/engine/modules/objectdb_profiler/editor/data_viewers/object_view.cpp b/engine/modules/objectdb_profiler/editor/data_viewers/object_view.cpp
index 5784a79a..aef84232 100644
--- a/engine/modules/objectdb_profiler/editor/data_viewers/object_view.cpp
+++ b/engine/modules/objectdb_profiler/editor/data_viewers/object_view.cpp
@@ -30,7 +30,6 @@
 
 #include "object_view.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/rich_text_label.h"
diff --git a/engine/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp b/engine/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp
index 8fed31c3..b84d663a 100644
--- a/engine/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp
+++ b/engine/modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp
@@ -30,12 +30,10 @@
 
 #include "refcounted_view.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
-#include "scene/main/scene_tree.h"
 
 SnapshotRefCountedView::SnapshotRefCountedView() {
 	set_name(TTRC("RefCounted"));
diff --git a/engine/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp b/engine/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp
index c1c24e29..9bf026d1 100644
--- a/engine/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp
+++ b/engine/modules/objectdb_profiler/editor/data_viewers/shared_controls.cpp
@@ -30,7 +30,6 @@
 
 #include "shared_controls.h"
 
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
diff --git a/engine/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp b/engine/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp
index 2b69d5a1..32526c7e 100644
--- a/engine/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp
+++ b/engine/modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp
@@ -38,8 +38,6 @@
 #include "data_viewers/summary_view.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
 #include "core/os/time.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
@@ -52,7 +50,6 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/main/scene_tree.h"
 
 // ObjectDB snapshots are very large. In remote_debugger_peer.cpp, the max in_buf and out_buf size is 8mb.
 // Snapshots are typically larger than that, so we send them 6mb at a time. Leaving 2mb for other data.
@@ -273,7 +270,7 @@ void ObjectDBProfilerPanel::_snapshot_rmb(const Vector2 &p_pos, MouseButton p_bu
 	rmb_menu->clear(false);
 
 	rmb_menu->add_icon_item(get_editor_theme_icon(SNAME("Rename")), TTRC("Rename"), OdbProfilerMenuOptions::ODB_MENU_RENAME);
-	rmb_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN), OdbProfilerMenuOptions::ODB_MENU_SHOW_IN_FOLDER);
+	rmb_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTRC("Show in File Manager"), OdbProfilerMenuOptions::ODB_MENU_SHOW_IN_FOLDER);
 	rmb_menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTRC("Delete"), OdbProfilerMenuOptions::ODB_MENU_DELETE);
 
 	rmb_menu->set_position(snapshot_list->get_screen_position() + p_pos);
diff --git a/engine/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp b/engine/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
index c0500faa..96a50706 100644
--- a/engine/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
+++ b/engine/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
@@ -32,8 +32,6 @@
 
 #include "objectdb_profiler_panel.h"
 
-#include "core/object/callable_mp.h"
-
 bool ObjectDBProfilerDebuggerPlugin::has_capture(const String &p_capture) const {
 	return p_capture == "snapshot";
 }
diff --git a/engine/modules/objectdb_profiler/editor/snapshot_data.cpp b/engine/modules/objectdb_profiler/editor/snapshot_data.cpp
index c62b90c1..b29369d0 100644
--- a/engine/modules/objectdb_profiler/editor/snapshot_data.cpp
+++ b/engine/modules/objectdb_profiler/editor/snapshot_data.cpp
@@ -32,10 +32,8 @@
 
 #include "core/core_bind.h"
 #include "core/io/compression.h"
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 
 #if defined(MODULE_GDSCRIPT_ENABLED) && defined(DEBUG_ENABLED)
 #include "modules/gdscript/gdscript.h"
@@ -277,11 +275,11 @@ void GameStateSnapshot::_get_rc_cycles(
 
 		SnapshotDataObject *next = objects[next_child.value];
 		if (next != nullptr && next->is_class(RefCounted::get_class_static()) && !next->is_class(WeakRef::get_class_static()) && !p_traversed_objs.has(next)) {
-			HashSet<SnapshotDataObject *> traversed_copy(p_traversed_objs);
+			HashSet<SnapshotDataObject *> traversed_copy = p_traversed_objs;
 			if (p_obj != p_source_obj) {
 				traversed_copy.insert(p_obj);
 			}
-			_get_rc_cycles(next, p_source_obj, std::move(traversed_copy), r_ret_val, child_path);
+			_get_rc_cycles(next, p_source_obj, traversed_copy, r_ret_val, child_path);
 		}
 	}
 }
@@ -312,9 +310,10 @@ void GameStateSnapshot::recompute_references() {
 		if (!obj.value->is_class(RefCounted::get_class_static()) || obj.value->is_class(WeakRef::get_class_static())) {
 			continue;
 		}
+		HashSet<SnapshotDataObject *> traversed_objs;
 		LocalVector<String> cycles;
 
-		_get_rc_cycles(obj.value, obj.value, HashSet<SnapshotDataObject *>(), cycles, "");
+		_get_rc_cycles(obj.value, obj.value, traversed_objs, cycles, "");
 		Array cycles_array;
 		for (const String &cycle : cycles) {
 			cycles_array.push_back(cycle);
diff --git a/engine/modules/objectdb_profiler/snapshot_collector.cpp b/engine/modules/objectdb_profiler/snapshot_collector.cpp
index 13ded9c7..530ca525 100644
--- a/engine/modules/objectdb_profiler/snapshot_collector.cpp
+++ b/engine/modules/objectdb_profiler/snapshot_collector.cpp
@@ -36,8 +36,7 @@
 #include "core/os/time.h"
 #include "core/version.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h" // IWYU pragma: keep. Used via `get_root()`.
+#include "scene/main/window.h"
 
 void SnapshotCollector::initialize() {
 	pending_snapshots.clear();
diff --git a/engine/modules/objectdb_profiler/snapshot_collector.h b/engine/modules/objectdb_profiler/snapshot_collector.h
index c2cec612..8afdf83b 100644
--- a/engine/modules/objectdb_profiler/snapshot_collector.h
+++ b/engine/modules/objectdb_profiler/snapshot_collector.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "core/variant/dictionary.h"
-#include "scene/debugger/scene_debugger_object.h"
+#include "scene/debugger/scene_debugger.h"
 
 struct SnapshotDataTransportObject : public SceneDebuggerObject {
-	SnapshotDataTransportObject() {}
+	SnapshotDataTransportObject() :
+			SceneDebuggerObject() {}
 	SnapshotDataTransportObject(Object *p_obj) :
 			SceneDebuggerObject(p_obj) {}
 
diff --git a/engine/modules/ogg/doc_classes/OggPacketSequence.xml b/engine/modules/ogg/doc_classes/OggPacketSequence.xml
index b2a54b28..75dcf5a2 100644
--- a/engine/modules/ogg/doc_classes/OggPacketSequence.xml
+++ b/engine/modules/ogg/doc_classes/OggPacketSequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OggPacketSequence" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OggPacketSequence" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A sequence of Ogg packets.
 	</brief_description>
diff --git a/engine/modules/ogg/doc_classes/OggPacketSequencePlayback.xml b/engine/modules/ogg/doc_classes/OggPacketSequencePlayback.xml
index 64a62b55..e363e67e 100644
--- a/engine/modules/ogg/doc_classes/OggPacketSequencePlayback.xml
+++ b/engine/modules/ogg/doc_classes/OggPacketSequencePlayback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OggPacketSequencePlayback" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OggPacketSequencePlayback" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/ogg/ogg_packet_sequence.cpp b/engine/modules/ogg/ogg_packet_sequence.cpp
index 538fa4c3..1e6a9bbb 100644
--- a/engine/modules/ogg/ogg_packet_sequence.cpp
+++ b/engine/modules/ogg/ogg_packet_sequence.cpp
@@ -30,7 +30,6 @@
 
 #include "ogg_packet_sequence.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void OggPacketSequence::push_page(int64_t p_granule_pos, const Vector<PackedByteArray> &p_data) {
diff --git a/engine/modules/ogg/register_types.cpp b/engine/modules/ogg/register_types.cpp
index 46a8f875..218a2535 100644
--- a/engine/modules/ogg/register_types.cpp
+++ b/engine/modules/ogg/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "ogg_packet_sequence.h"
 
-#include "core/object/class_db.h"
-
 void initialize_ogg_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;
diff --git a/engine/modules/openxr/action_map/openxr_action.cpp b/engine/modules/openxr/action_map/openxr_action.cpp
index 64ab7f1e..6b62f5dc 100644
--- a/engine/modules/openxr/action_map/openxr_action.cpp
+++ b/engine/modules/openxr/action_map/openxr_action.cpp
@@ -32,8 +32,6 @@
 
 #include "openxr_action_set.h"
 
-#include "core/object/class_db.h"
-
 void OpenXRAction::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_localized_name", "localized_name"), &OpenXRAction::set_localized_name);
 	ClassDB::bind_method(D_METHOD("get_localized_name"), &OpenXRAction::get_localized_name);
diff --git a/engine/modules/openxr/action_map/openxr_action_map.cpp b/engine/modules/openxr/action_map/openxr_action_map.cpp
index 5bfec556..ed1135d7 100644
--- a/engine/modules/openxr/action_map/openxr_action_map.cpp
+++ b/engine/modules/openxr/action_map/openxr_action_map.cpp
@@ -30,14 +30,10 @@
 
 #include "openxr_action_map.h"
 
-#include "openxr_interaction_profile_metadata.h"
-
-#include "core/object/class_db.h"
-
 void OpenXRActionMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_action_sets", "action_sets"), &OpenXRActionMap::set_action_sets);
 	ClassDB::bind_method(D_METHOD("get_action_sets"), &OpenXRActionMap::get_action_sets);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "action_sets", PROPERTY_HINT_RESOURCE_TYPE, OpenXRActionSet::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_action_sets", "get_action_sets");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "action_sets", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRActionSet", PROPERTY_USAGE_NO_EDITOR), "set_action_sets", "get_action_sets");
 
 	ClassDB::bind_method(D_METHOD("get_action_set_count"), &OpenXRActionMap::get_action_set_count);
 	ClassDB::bind_method(D_METHOD("find_action_set", "name"), &OpenXRActionMap::find_action_set);
@@ -47,7 +43,7 @@ void OpenXRActionMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_interaction_profiles", "interaction_profiles"), &OpenXRActionMap::set_interaction_profiles);
 	ClassDB::bind_method(D_METHOD("get_interaction_profiles"), &OpenXRActionMap::get_interaction_profiles);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "interaction_profiles", PROPERTY_HINT_RESOURCE_TYPE, OpenXRInteractionProfile::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_interaction_profiles", "get_interaction_profiles");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "interaction_profiles", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRInteractionProfile", PROPERTY_USAGE_NO_EDITOR), "set_interaction_profiles", "get_interaction_profiles");
 
 	ClassDB::bind_method(D_METHOD("get_interaction_profile_count"), &OpenXRActionMap::get_interaction_profile_count);
 	ClassDB::bind_method(D_METHOD("find_interaction_profile", "name"), &OpenXRActionMap::find_interaction_profile);
@@ -557,13 +553,17 @@ void OpenXRActionMap::create_default_action_sets() {
 	profile->add_new_binding(grip_pose, "/user/hand/left/input/grip/pose,/user/hand/right/input/grip/pose");
 	profile->add_new_binding(palm_pose, "/user/hand/left/input/grip_surface/pose,/user/hand/right/input/grip_surface/pose");
 
-	// Use pinch as trigger.
-	profile->add_new_binding(trigger, "/user/hand/left/input/pinch_ext/value,/user/hand/right/input/pinch_ext/value");
-	profile->add_new_binding(trigger_click, "/user/hand/left/input/pinch_ext/value,/user/hand/right/input/pinch_ext/value");
+	// Use pinch as primary.
+	profile->add_new_binding(primary, "/user/hand/left/input/pinch_ext/value,/user/hand/right/input/pinch_ext/value");
+	profile->add_new_binding(primary_click, "/user/hand/left/input/pinch_ext/ready_ext,/user/hand/right/input/pinch_ext/ready_ext");
 
-	// Use grasp as grip.
+	// Use activation as secondary.
+	profile->add_new_binding(secondary, "/user/hand/left/input/aim_activate_ext/value,/user/hand/right/input/aim_activate_ext/value");
+	profile->add_new_binding(secondary_click, "/user/hand/left/input/aim_activate_ext/ready_ext,/user/hand/right/input/aim_activate_ext/ready_ext");
+
+	// We link grasp to our grip.
 	profile->add_new_binding(grip, "/user/hand/left/input/grasp_ext/value,/user/hand/right/input/grasp_ext/value");
-	profile->add_new_binding(grip_click, "/user/hand/left/input/grasp_ext/value,/user/hand/right/input/grasp_ext/value");
+	profile->add_new_binding(grip_click, "/user/hand/left/input/grasp_ext/ready_ext,/user/hand/right/input/grasp_ext/ready_ext");
 	add_interaction_profile(profile);
 }
 
diff --git a/engine/modules/openxr/action_map/openxr_action_set.cpp b/engine/modules/openxr/action_map/openxr_action_set.cpp
index 14f14a95..f7142869 100644
--- a/engine/modules/openxr/action_map/openxr_action_set.cpp
+++ b/engine/modules/openxr/action_map/openxr_action_set.cpp
@@ -30,8 +30,6 @@
 
 #include "openxr_action_set.h"
 
-#include "core/object/class_db.h"
-
 void OpenXRActionSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_localized_name", "localized_name"), &OpenXRActionSet::set_localized_name);
 	ClassDB::bind_method(D_METHOD("get_localized_name"), &OpenXRActionSet::get_localized_name);
@@ -44,7 +42,7 @@ void OpenXRActionSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_action_count"), &OpenXRActionSet::get_action_count);
 	ClassDB::bind_method(D_METHOD("set_actions", "actions"), &OpenXRActionSet::set_actions);
 	ClassDB::bind_method(D_METHOD("get_actions"), &OpenXRActionSet::get_actions);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "actions", PROPERTY_HINT_RESOURCE_TYPE, OpenXRAction::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_actions", "get_actions");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "actions", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRAction", PROPERTY_USAGE_NO_EDITOR), "set_actions", "get_actions");
 
 	ClassDB::bind_method(D_METHOD("add_action", "action"), &OpenXRActionSet::add_action);
 	ClassDB::bind_method(D_METHOD("remove_action", "action"), &OpenXRActionSet::remove_action);
diff --git a/engine/modules/openxr/action_map/openxr_binding_modifier.cpp b/engine/modules/openxr/action_map/openxr_binding_modifier.cpp
index 661fc100..3a1c5776 100644
--- a/engine/modules/openxr/action_map/openxr_binding_modifier.cpp
+++ b/engine/modules/openxr/action_map/openxr_binding_modifier.cpp
@@ -30,8 +30,6 @@
 
 #include "openxr_binding_modifier.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void OpenXRBindingModifier::_bind_methods() {
 	GDVIRTUAL_BIND(_get_description);
 	GDVIRTUAL_BIND(_get_ip_modification);
diff --git a/engine/modules/openxr/action_map/openxr_binding_modifier.h b/engine/modules/openxr/action_map/openxr_binding_modifier.h
index ef45d3e5..29298c23 100644
--- a/engine/modules/openxr/action_map/openxr_binding_modifier.h
+++ b/engine/modules/openxr/action_map/openxr_binding_modifier.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "../action_map/openxr_action.h"
 #include "core/io/resource.h"
 
 // Part of implementation for:
diff --git a/engine/modules/openxr/action_map/openxr_haptic_feedback.cpp b/engine/modules/openxr/action_map/openxr_haptic_feedback.cpp
index abb47309..583e4d4f 100644
--- a/engine/modules/openxr/action_map/openxr_haptic_feedback.cpp
+++ b/engine/modules/openxr/action_map/openxr_haptic_feedback.cpp
@@ -30,8 +30,6 @@
 
 #include "openxr_haptic_feedback.h"
 
-#include "core/object/class_db.h"
-
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRHapticBase
 
diff --git a/engine/modules/openxr/action_map/openxr_haptic_feedback.h b/engine/modules/openxr/action_map/openxr_haptic_feedback.h
index 7e1db4b2..af5760b4 100644
--- a/engine/modules/openxr/action_map/openxr_haptic_feedback.h
+++ b/engine/modules/openxr/action_map/openxr_haptic_feedback.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/io/resource.h"
-
 #include <openxr/openxr.h>
 
 class OpenXRHapticBase : public Resource {
diff --git a/engine/modules/openxr/action_map/openxr_interaction_profile.cpp b/engine/modules/openxr/action_map/openxr_interaction_profile.cpp
index 8a091c83..b1e4478f 100644
--- a/engine/modules/openxr/action_map/openxr_interaction_profile.cpp
+++ b/engine/modules/openxr/action_map/openxr_interaction_profile.cpp
@@ -30,14 +30,10 @@
 
 #include "openxr_interaction_profile.h"
 
-#include "openxr_interaction_profile_metadata.h"
-
-#include "core/object/class_db.h"
-
 void OpenXRIPBinding::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_action", "action"), &OpenXRIPBinding::set_action);
 	ClassDB::bind_method(D_METHOD("get_action"), &OpenXRIPBinding::get_action);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "action", PROPERTY_HINT_RESOURCE_TYPE, OpenXRAction::get_class_static()), "set_action", "get_action");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "action", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRAction"), "set_action", "get_action");
 
 	ClassDB::bind_method(D_METHOD("set_binding_path", "binding_path"), &OpenXRIPBinding::set_binding_path);
 	ClassDB::bind_method(D_METHOD("get_binding_path"), &OpenXRIPBinding::get_binding_path);
@@ -47,7 +43,7 @@ void OpenXRIPBinding::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_binding_modifier", "index"), &OpenXRIPBinding::get_binding_modifier);
 	ClassDB::bind_method(D_METHOD("set_binding_modifiers", "binding_modifiers"), &OpenXRIPBinding::set_binding_modifiers);
 	ClassDB::bind_method(D_METHOD("get_binding_modifiers"), &OpenXRIPBinding::get_binding_modifiers);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "binding_modifiers", PROPERTY_HINT_RESOURCE_TYPE, OpenXRActionBindingModifier::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_binding_modifiers", "get_binding_modifiers");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "binding_modifiers", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRActionBindingModifier", PROPERTY_USAGE_NO_EDITOR), "set_binding_modifiers", "get_binding_modifiers");
 
 	// Deprecated
 #ifndef DISABLE_DEPRECATED
@@ -233,13 +229,13 @@ void OpenXRInteractionProfile::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_binding", "index"), &OpenXRInteractionProfile::get_binding);
 	ClassDB::bind_method(D_METHOD("set_bindings", "bindings"), &OpenXRInteractionProfile::set_bindings);
 	ClassDB::bind_method(D_METHOD("get_bindings"), &OpenXRInteractionProfile::get_bindings);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "bindings", PROPERTY_HINT_RESOURCE_TYPE, OpenXRIPBinding::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_bindings", "get_bindings");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "bindings", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRIPBinding", PROPERTY_USAGE_NO_EDITOR), "set_bindings", "get_bindings");
 
 	ClassDB::bind_method(D_METHOD("get_binding_modifier_count"), &OpenXRInteractionProfile::get_binding_modifier_count);
 	ClassDB::bind_method(D_METHOD("get_binding_modifier", "index"), &OpenXRInteractionProfile::get_binding_modifier);
 	ClassDB::bind_method(D_METHOD("set_binding_modifiers", "binding_modifiers"), &OpenXRInteractionProfile::set_binding_modifiers);
 	ClassDB::bind_method(D_METHOD("get_binding_modifiers"), &OpenXRInteractionProfile::get_binding_modifiers);
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "binding_modifiers", PROPERTY_HINT_RESOURCE_TYPE, OpenXRIPBindingModifier::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_binding_modifiers", "get_binding_modifiers");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "binding_modifiers", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRIPBindingModifier", PROPERTY_USAGE_NO_EDITOR), "set_binding_modifiers", "get_binding_modifiers");
 }
 
 Ref<OpenXRInteractionProfile> OpenXRInteractionProfile::new_profile(const char *p_input_profile_path) {
diff --git a/engine/modules/openxr/action_map/openxr_interaction_profile.h b/engine/modules/openxr/action_map/openxr_interaction_profile.h
index 119191da..bfb192bd 100644
--- a/engine/modules/openxr/action_map/openxr_interaction_profile.h
+++ b/engine/modules/openxr/action_map/openxr_interaction_profile.h
@@ -32,6 +32,7 @@
 
 #include "openxr_action.h"
 #include "openxr_binding_modifier.h"
+#include "openxr_interaction_profile_metadata.h"
 
 #include "core/io/resource.h"
 
diff --git a/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp b/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
index f5ea1628..e3d28594 100644
--- a/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
+++ b/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
@@ -32,8 +32,6 @@
 
 #include "../openxr_api.h"
 
-#include "core/object/class_db.h"
-
 OpenXRInteractionProfileMetadata *OpenXRInteractionProfileMetadata::singleton = nullptr;
 
 OpenXRInteractionProfileMetadata::OpenXRInteractionProfileMetadata() {
diff --git a/engine/modules/openxr/config.py b/engine/modules/openxr/config.py
index eac756df..98b5d7bf 100644
--- a/engine/modules/openxr/config.py
+++ b/engine/modules/openxr/config.py
@@ -75,7 +75,6 @@ def get_doc_classes():
         "OpenXRSpatialPlaneTrackingCapability",
         "OpenXRSpatialMarkerTrackingCapability",
         "OpenXRAndroidThreadSettingsExtension",
-        "OpenXRUserPresenceExtension",
     ]
 
 
diff --git a/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml b/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
index 00121d4e..6dfc4bed 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRAPIExtension" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRAPIExtension" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Makes the OpenXR API available for GDExtension.
 	</brief_description>
@@ -149,18 +149,6 @@
 				Returns the ID of the system, which is an [url=https://registry.khronos.org/OpenXR/specs/1.0/man/html/XrSystemId.html]XrSystemId[/url] cast to an integer.
 			</description>
 		</method>
-		<method name="get_view_configuration" qualifiers="const">
-			<return type="int" />
-			<description>
-				Returns the view configuration type, which is an [url=https://registry.khronos.org/OpenXR/specs/1.0/man/html/XrViewConfigurationType.html]XrViewConfigurationType[/url] cast to an integer.
-			</description>
-		</method>
-		<method name="get_view_count" qualifiers="const">
-			<return type="int" />
-			<description>
-				Returns the number of views. It is usually two, one for each eye, but may differ with different view configurations.
-			</description>
-		</method>
 		<method name="insert_debug_label">
 			<return type="void" />
 			<param index="0" name="label_name" type="String" />
@@ -257,14 +245,6 @@
 				[b]Note:[/b] This cannot be called after the OpenXR session has started. However, it can be called in [method OpenXRExtensionWrapper._on_session_created].
 			</description>
 		</method>
-		<method name="register_projection_layer_extension">
-			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
-			<description>
-				Registers the given extension as modifying [code]XrCompositionLayerProjection[/code] via the [method OpenXRExtensionWrapper._set_projection_layer_and_get_next_pointer] virtual method.
-				[b]Note:[/b] This cannot be called after the OpenXR session has started. However, it can be called in [method OpenXRExtensionWrapper._on_session_created].
-			</description>
-		</method>
 		<method name="register_projection_views_extension">
 			<return type="void" />
 			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
@@ -347,14 +327,6 @@
 				[b]Note:[/b] This cannot be called while the OpenXR session is still running.
 			</description>
 		</method>
-		<method name="unregister_projection_layer_extension">
-			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
-			<description>
-				Unregisters the given extension as modifying [code]XrCompositionLayerProjection[/code].
-				[b]Note:[/b] This cannot be called while the OpenXR session is still running.
-			</description>
-		</method>
 		<method name="unregister_projection_views_extension">
 			<return type="void" />
 			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
diff --git a/engine/modules/openxr/doc_classes/OpenXRAction.xml b/engine/modules/openxr/doc_classes/OpenXRAction.xml
index 70095f63..2a9f255f 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAction.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRAction" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRAction" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		An OpenXR action.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRActionBindingModifier.xml b/engine/modules/openxr/doc_classes/OpenXRActionBindingModifier.xml
index c0b9f82b..817c6a93 100644
--- a/engine/modules/openxr/doc_classes/OpenXRActionBindingModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRActionBindingModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRActionBindingModifier" inherits="OpenXRBindingModifier" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRActionBindingModifier" inherits="OpenXRBindingModifier" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Binding modifier that applies on individual actions related to an interaction profile.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRActionMap.xml b/engine/modules/openxr/doc_classes/OpenXRActionMap.xml
index dcebb2fc..b8711635 100644
--- a/engine/modules/openxr/doc_classes/OpenXRActionMap.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRActionMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRActionMap" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRActionMap" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Collection of [OpenXRActionSet] and [OpenXRInteractionProfile] resources for the OpenXR module.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRActionSet.xml b/engine/modules/openxr/doc_classes/OpenXRActionSet.xml
index 9ad44d72..03dc33d7 100644
--- a/engine/modules/openxr/doc_classes/OpenXRActionSet.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRActionSet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRActionSet" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRActionSet" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Collection of [OpenXRAction] resources that make up an action set.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml b/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
index c0f2a9f0..87f7828e 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRAnalogThresholdModifier" inherits="OpenXRActionBindingModifier" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRAnalogThresholdModifier" inherits="OpenXRActionBindingModifier" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The analog threshold binding modifier can modify a float input to a boolean input with specified thresholds.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRAnchorTracker.xml b/engine/modules/openxr/doc_classes/OpenXRAnchorTracker.xml
index ecf418be..bed90d70 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAnchorTracker.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAnchorTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRAnchorTracker" inherits="OpenXRSpatialEntityTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRAnchorTracker" inherits="OpenXRSpatialEntityTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Positional tracker for our spatial entity anchor extension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRAndroidThreadSettingsExtension.xml b/engine/modules/openxr/doc_classes/OpenXRAndroidThreadSettingsExtension.xml
index f55a6bdc..af685f7a 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAndroidThreadSettingsExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAndroidThreadSettingsExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRAndroidThreadSettingsExtension" inherits="OpenXRExtensionWrapper" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRAndroidThreadSettingsExtension" inherits="OpenXRExtensionWrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Wraps the [url=https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_KHR_android_thread_settings]XR_KHR_android_thread_settings[/url] extension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRBindingModifier.xml b/engine/modules/openxr/doc_classes/OpenXRBindingModifier.xml
index 283d1e06..1e999abb 100644
--- a/engine/modules/openxr/doc_classes/OpenXRBindingModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRBindingModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRBindingModifier" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRBindingModifier" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Binding modifier base class.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRBindingModifierEditor.xml b/engine/modules/openxr/doc_classes/OpenXRBindingModifierEditor.xml
index fd8d62d5..4997e3f7 100644
--- a/engine/modules/openxr/doc_classes/OpenXRBindingModifierEditor.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRBindingModifierEditor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRBindingModifierEditor" inherits="PanelContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRBindingModifierEditor" inherits="PanelContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Binding modifier editor.
 	</brief_description>
@@ -24,6 +24,9 @@
 			</description>
 		</method>
 	</methods>
+	<members>
+		<member name="size_flags_horizontal" type="int" setter="set_h_size_flags" getter="get_h_size_flags" overrides="Control" enum="Control.SizeFlags" is_bitfield="true" default="3" />
+	</members>
 	<signals>
 		<signal name="binding_modifier_removed">
 			<param index="0" name="binding_modifier_editor" type="Object" />
diff --git a/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml b/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
index 3983b325..8921f8ed 100644
--- a/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRCompositionLayer" inherits="Node3D" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRCompositionLayer" inherits="Node3D" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The parent class of all OpenXR composition layer nodes.
 	</brief_description>
@@ -46,10 +46,6 @@
 			Enables a technique called "hole punching", which allows putting the composition layer behind the main projection layer (i.e. setting [member sort_order] to a negative value) while "punching a hole" through everything rendered by Godot so that the layer is still visible.
 			This can be used to create the illusion that the composition layer exists in the same 3D space as everything rendered by Godot, allowing objects to appear to pass both behind or in front of the composition layer.
 		</member>
-		<member name="eye_visibility" type="int" setter="set_eye_visibility" getter="get_eye_visibility" enum="OpenXRCompositionLayer.EyeVisibility" default="0">
-			The eye(s) the composition layer is visible to.
-			[b]Note:[/b] Not all composition layer types or runtimes support restricting visibility to a single eye.
-		</member>
 		<member name="layer_viewport" type="SubViewport" setter="set_layer_viewport" getter="get_layer_viewport">
 			The [SubViewport] to render on the composition layer.
 		</member>
@@ -165,14 +161,5 @@
 		<constant name="SWIZZLE_ONE" value="5" enum="Swizzle">
 			Maps a color channel to the value of one.
 		</constant>
-		<constant name="EYE_VISIBILITY_BOTH" value="0" enum="EyeVisibility">
-			The layer is visible to both the left and right eyes.
-		</constant>
-		<constant name="EYE_VISIBILITY_LEFT" value="1" enum="EyeVisibility">
-			The layer is visible only to the left eye.
-		</constant>
-		<constant name="EYE_VISIBILITY_RIGHT" value="2" enum="EyeVisibility">
-			The layer is visible only to the right eye.
-		</constant>
 	</constants>
 </class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerCylinder.xml b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerCylinder.xml
index f137b1e3..7e2e6b62 100644
--- a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerCylinder.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerCylinder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRCompositionLayerCylinder" inherits="OpenXRCompositionLayer" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRCompositionLayerCylinder" inherits="OpenXRCompositionLayer" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		An OpenXR composition layer that is rendered as an internal slice of a cylinder.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerEquirect.xml b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerEquirect.xml
index e1d45733..945eab2a 100644
--- a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerEquirect.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerEquirect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRCompositionLayerEquirect" inherits="OpenXRCompositionLayer" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRCompositionLayerEquirect" inherits="OpenXRCompositionLayer" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		An OpenXR composition layer that is rendered as an internal slice of a sphere.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerQuad.xml b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerQuad.xml
index 0bae2476..6632f90e 100644
--- a/engine/modules/openxr/doc_classes/OpenXRCompositionLayerQuad.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRCompositionLayerQuad.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRCompositionLayerQuad" inherits="OpenXRCompositionLayer" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRCompositionLayerQuad" inherits="OpenXRCompositionLayer" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		An OpenXR composition layer that is rendered as a quad.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml b/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
index 33110a5d..4e55ff55 100644
--- a/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRDpadBindingModifier" inherits="OpenXRIPBindingModifier" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRDpadBindingModifier" inherits="OpenXRIPBindingModifier" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The DPad binding modifier converts an axis input to a dpad output.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml
index 621d4b60..f216ad91 100644
--- a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRExtensionWrapper" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRExtensionWrapper" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Allows implementing OpenXR extensions with GDExtension.
 	</brief_description>
@@ -276,14 +276,6 @@
 				Add additional data structures when the OpenXR instance is created. [param xr_version] specifies the OpenXR version we're instantiating.
 			</description>
 		</method>
-		<method name="_set_projection_layer_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures to [code]XrCompositionLayerProjection[/code].
-				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_projection_layer_extension].
-			</description>
-		</method>
 		<method name="_set_projection_views_and_get_next_pointer" qualifiers="virtual">
 			<return type="int" />
 			<param index="0" name="view_index" type="int" />
diff --git a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
index 84e05c7b..7887658b 100644
--- a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRExtensionWrapperExtension" inherits="OpenXRExtensionWrapper" api_type="core" deprecated="Use [OpenXRExtensionWrapper] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRExtensionWrapperExtension" inherits="OpenXRExtensionWrapper" deprecated="Use [OpenXRExtensionWrapper] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Allows implementing OpenXR extensions with GDExtension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRFrameSynthesisExtension.xml b/engine/modules/openxr/doc_classes/OpenXRFrameSynthesisExtension.xml
index 575bed89..bde5c08d 100644
--- a/engine/modules/openxr/doc_classes/OpenXRFrameSynthesisExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRFrameSynthesisExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRFrameSynthesisExtension" inherits="OpenXRExtensionWrapper" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRFrameSynthesisExtension" inherits="OpenXRExtensionWrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The OpenXR Frame synthesis extension allows for advanced reprojection at low(er) framerates.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml b/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml
index daffecea..9ed104ab 100644
--- a/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRFutureExtension" inherits="OpenXRExtensionWrapper" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRFutureExtension" inherits="OpenXRExtensionWrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		The OpenXR Future extension allows for asynchronous APIs to be used.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml b/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml
index b1d0da84..c8fea868 100644
--- a/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRFutureResult" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRFutureResult" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Result object tracking the asynchronous result of an OpenXR Future object.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRHand.xml b/engine/modules/openxr/doc_classes/OpenXRHand.xml
index 8183668c..23d932dd 100644
--- a/engine/modules/openxr/doc_classes/OpenXRHand.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRHand.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRHand" inherits="Node3D" api_type="core" deprecated="Use [XRHandModifier3D] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRHand" inherits="Node3D" deprecated="Use [XRHandModifier3D] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Node supporting hand and finger tracking in OpenXR.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRHapticBase.xml b/engine/modules/openxr/doc_classes/OpenXRHapticBase.xml
index ddaceab0..c23d8658 100644
--- a/engine/modules/openxr/doc_classes/OpenXRHapticBase.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRHapticBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRHapticBase" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRHapticBase" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		OpenXR Haptic feedback base class.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRHapticVibration.xml b/engine/modules/openxr/doc_classes/OpenXRHapticVibration.xml
index 593068f7..f147abb1 100644
--- a/engine/modules/openxr/doc_classes/OpenXRHapticVibration.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRHapticVibration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRHapticVibration" inherits="OpenXRHapticBase" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRHapticVibration" inherits="OpenXRHapticBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Vibration haptic feedback.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRIPBinding.xml b/engine/modules/openxr/doc_classes/OpenXRIPBinding.xml
index a4aec83e..5b027aca 100644
--- a/engine/modules/openxr/doc_classes/OpenXRIPBinding.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRIPBinding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRIPBinding" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRIPBinding" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Defines a binding between an [OpenXRAction] and an XR input or output.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRIPBindingModifier.xml b/engine/modules/openxr/doc_classes/OpenXRIPBindingModifier.xml
index fb2350c0..8ec5f0a4 100644
--- a/engine/modules/openxr/doc_classes/OpenXRIPBindingModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRIPBindingModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRIPBindingModifier" inherits="OpenXRBindingModifier" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRIPBindingModifier" inherits="OpenXRBindingModifier" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Binding modifier that applies directly on an interaction profile.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInteractionProfile.xml b/engine/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
index 6db54ba8..d786739b 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInteractionProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRInteractionProfile" inherits="Resource" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRInteractionProfile" inherits="Resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Suggested bindings object for OpenXR.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditor.xml b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditor.xml
index de4cfac8..0155d74b 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditor.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRInteractionProfileEditor" inherits="OpenXRInteractionProfileEditorBase" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRInteractionProfileEditor" inherits="OpenXRInteractionProfileEditorBase" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Default OpenXR interaction profile editor.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditorBase.xml b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditorBase.xml
index 80745aca..49298c68 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditorBase.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileEditorBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRInteractionProfileEditorBase" inherits="HBoxContainer" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRInteractionProfileEditorBase" inherits="HBoxContainer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Base class for editing interaction profiles.
 	</brief_description>
@@ -18,4 +18,8 @@
 			</description>
 		</method>
 	</methods>
+	<members>
+		<member name="size_flags_horizontal" type="int" setter="set_h_size_flags" getter="get_h_size_flags" overrides="Control" enum="Control.SizeFlags" is_bitfield="true" default="3" />
+		<member name="size_flags_vertical" type="int" setter="set_v_size_flags" getter="get_v_size_flags" overrides="Control" enum="Control.SizeFlags" is_bitfield="true" default="3" />
+	</members>
 </class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileMetadata.xml b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileMetadata.xml
index 9c70402a..6eb98f39 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInteractionProfileMetadata.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInteractionProfileMetadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRInteractionProfileMetadata" inherits="Object" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRInteractionProfileMetadata" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Meta class registering supported devices in OpenXR.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInterface.xml b/engine/modules/openxr/doc_classes/OpenXRInterface.xml
index e9b1938d..9c506de9 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInterface.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRInterface" inherits="XRInterface" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRInterface" inherits="XRInterface" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Our OpenXR interface.
 	</brief_description>
@@ -126,19 +126,6 @@
 				[b]Note:[/b] This only returns a valid value after OpenXR has been initialized.
 			</description>
 		</method>
-		<method name="is_user_presence_supported" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if OpenXR's user presence extension is supported and enabled.
-				[b]Note:[/b] This only returns a valid value after OpenXR has been initialized.
-			</description>
-		</method>
-		<method name="is_user_present" qualifiers="const">
-			<return type="bool" />
-			<description>
-				Returns [code]true[/code] if system has detected the presence of a user in the XR experience.
-			</description>
-		</method>
 		<method name="set_action_set_active">
 			<return type="void" />
 			<param index="0" name="name" type="String" />
@@ -176,12 +163,11 @@
 		</member>
 		<member name="foveation_dynamic" type="bool" setter="set_foveation_dynamic" getter="get_foveation_dynamic" default="false">
 			If [code]true[/code], enables dynamic foveation adjustment. The interface must be initialized before this is accessible. If enabled, foveation will automatically be adjusted between low and [member foveation_level].
+			[b]Note:[/b] Only works on the Compatibility renderer.
 		</member>
 		<member name="foveation_level" type="int" setter="set_foveation_level" getter="get_foveation_level" default="0">
 			The foveation level, from [code]0[/code] (off) to [code]3[/code] (high). The interface must be initialized before this is accessible.
-		</member>
-		<member name="foveation_with_subsampled_images" type="bool" setter="set_foveation_with_subsampled_images" getter="get_foveation_with_subsampled_images" default="false">
-			If [code]true[/code], enables subsampled images with foveation, which can provide a performance boost on Vulkan.
+			[b]Note:[/b] Only works on the Compatibility renderer.
 		</member>
 		<member name="render_target_size_multiplier" type="float" setter="set_render_target_size_multiplier" getter="get_render_target_size_multiplier" default="1.0">
 			The render size multiplier for the current HMD. Must be set before the interface has been initialized.
@@ -259,13 +245,6 @@
 				Informs our OpenXR session is now visible, for example output is sent to the HMD but we don't receive XR input.
 			</description>
 		</signal>
-		<signal name="user_presence_changed">
-			<param index="0" name="is_user_present" type="bool" />
-			<description>
-				Signal emitted when the user presence value changes.
-				[b]Note:[/b] This signal will not be emitted during application startup and application shutdown. Developers should assume user presence is gained on startup and lost on shutdown.
-			</description>
-		</signal>
 	</signals>
 	<constants>
 		<constant name="SESSION_STATE_UNKNOWN" value="0" enum="SessionState">
diff --git a/engine/modules/openxr/doc_classes/OpenXRMarkerTracker.xml b/engine/modules/openxr/doc_classes/OpenXRMarkerTracker.xml
index 1016572a..9d7d4741 100644
--- a/engine/modules/openxr/doc_classes/OpenXRMarkerTracker.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRMarkerTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRMarkerTracker" inherits="OpenXRSpatialEntityTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRMarkerTracker" inherits="OpenXRSpatialEntityTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Spatial entity tracker for our spatial entity marker tracking extension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRPlaneTracker.xml b/engine/modules/openxr/doc_classes/OpenXRPlaneTracker.xml
index 5bc79cfe..28348878 100644
--- a/engine/modules/openxr/doc_classes/OpenXRPlaneTracker.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRPlaneTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRPlaneTracker" inherits="OpenXRSpatialEntityTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRPlaneTracker" inherits="OpenXRSpatialEntityTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Spatial entity tracker for our spatial entity plane tracking extension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRRenderModel.xml b/engine/modules/openxr/doc_classes/OpenXRRenderModel.xml
index 6bf289bb..e9f531e2 100644
--- a/engine/modules/openxr/doc_classes/OpenXRRenderModel.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRRenderModel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRRenderModel" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRRenderModel" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		This node will display an OpenXR render model.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRRenderModelExtension.xml b/engine/modules/openxr/doc_classes/OpenXRRenderModelExtension.xml
index 1d8a7c1f..97264017 100644
--- a/engine/modules/openxr/doc_classes/OpenXRRenderModelExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRRenderModelExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRRenderModelExtension" inherits="OpenXRExtensionWrapper" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRRenderModelExtension" inherits="OpenXRExtensionWrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		This class implements the OpenXR Render Model Extension.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRRenderModelManager.xml b/engine/modules/openxr/doc_classes/OpenXRRenderModelManager.xml
index fb40682e..4814dba9 100644
--- a/engine/modules/openxr/doc_classes/OpenXRRenderModelManager.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRRenderModelManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRRenderModelManager" inherits="Node3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRRenderModelManager" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Helper node that will automatically manage displaying render models.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialAnchorCapability.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialAnchorCapability.xml
index c740bbe9..49febe6a 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialAnchorCapability.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialAnchorCapability.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialAnchorCapability" inherits="OpenXRExtensionWrapper" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialAnchorCapability" inherits="OpenXRExtensionWrapper" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Implementation for handling spatial entity anchor logic.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAnchor.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAnchor.xml
index 80704933..023e48f4 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAnchor.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAnchor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationAnchor" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationAnchor" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for spatial anchors.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAprilTag.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAprilTag.xml
index 3652f99e..02daeeb3 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAprilTag.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAprilTag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationAprilTag" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationAprilTag" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for April tag markers.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAruco.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAruco.xml
index 81fd62fe..a3da2fe6 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAruco.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationAruco.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationAruco" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationAruco" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for Aruco markers.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationBaseHeader.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationBaseHeader.xml
index 58198d7d..d09dbe91 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationBaseHeader.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationBaseHeader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationBaseHeader" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationBaseHeader" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Wrapper base class for OpenXR Spatial Capability Configuration headers.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationMicroQrCode.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationMicroQrCode.xml
index 7794a13e..c21282b2 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationMicroQrCode.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationMicroQrCode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationMicroQrCode" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationMicroQrCode" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for QR code markers.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationPlaneTracking.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationPlaneTracking.xml
index 2b0bc086..e7d37184 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationPlaneTracking.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationPlaneTracking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationPlaneTracking" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationPlaneTracking" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for plane tracking.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationQrCode.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationQrCode.xml
index f8ab010f..fd0764fa 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationQrCode.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialCapabilityConfigurationQrCode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialCapabilityConfigurationQrCode" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialCapabilityConfigurationQrCode" inherits="OpenXRSpatialCapabilityConfigurationBaseHeader" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for micro QR code markers.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentAnchorList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentAnchorList.xml
index 06a7b1f7..a855133d 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentAnchorList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentAnchorList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentAnchorList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentAnchorList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries anchor result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded2DList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded2DList.xml
index 6c47d329..3c8d071d 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded2DList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded2DList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentBounded2DList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentBounded2DList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries bounded2d result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded3DList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded3DList.xml
index 3396d085..6f2f7c76 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded3DList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentBounded3DList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentBounded3DList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentBounded3DList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries bounded3d result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentData.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentData.xml
index 1a9ada11..87fd37f0 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentData.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentData" inherits="RefCounted" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentData" inherits="RefCounted" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing OpenXR spatial entity component data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMarkerList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMarkerList.xml
index c0eff2f8..43a6840a 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMarkerList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMarkerList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentMarkerList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentMarkerList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries marker result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh2DList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh2DList.xml
index ebea36ad..db300348 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh2DList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh2DList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentMesh2DList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentMesh2DList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries mesh2d result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh3DList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh3DList.xml
index bb2d4cbc..7dfd6086 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh3DList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentMesh3DList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentMesh3DList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentMesh3DList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries mesh3d result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentParentList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentParentList.xml
index 0ed876c6..f64fed9a 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentParentList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentParentList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentParentList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentParentList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries parent result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPersistenceList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPersistenceList.xml
index 8d29d806..f665b778 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPersistenceList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPersistenceList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentPersistenceList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentPersistenceList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the query persistence result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneAlignmentList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneAlignmentList.xml
index 1594406c..a5a37521 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneAlignmentList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneAlignmentList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentPlaneAlignmentList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentPlaneAlignmentList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries plane alignment result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneSemanticLabelList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneSemanticLabelList.xml
index 725c6817..b2557d4b 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneSemanticLabelList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPlaneSemanticLabelList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentPlaneSemanticLabelList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentPlaneSemanticLabelList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries plane semantic label result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPolygon2DList.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPolygon2DList.xml
index 150436a2..db5b9b0c 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPolygon2DList.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialComponentPolygon2DList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialComponentPolygon2DList" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialComponentPolygon2DList" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the queries polygon2d result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialContextPersistenceConfig.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialContextPersistenceConfig.xml
index 717b673c..52b7dc83 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialContextPersistenceConfig.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialContextPersistenceConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialContextPersistenceConfig" inherits="OpenXRStructureBase" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialContextPersistenceConfig" inherits="OpenXRStructureBase" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Configuration header for spatial persistence.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialEntityExtension.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialEntityExtension.xml
index 995222ae..db60ac3d 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialEntityExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialEntityExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialEntityExtension" inherits="OpenXRExtensionWrapper" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialEntityExtension" inherits="OpenXRExtensionWrapper" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		OpenXR extension that handles spatial entities.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialEntityTracker.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialEntityTracker.xml
index 1b054ad2..ca14b99e 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialEntityTracker.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialEntityTracker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialEntityTracker" inherits="XRPositionalTracker" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialEntityTracker" inherits="XRPositionalTracker" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Base class for Positional trackers managed by OpenXR's spatial entity extensions.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialMarkerTrackingCapability.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialMarkerTrackingCapability.xml
index 564e6b0f..dc5eae16 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialMarkerTrackingCapability.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialMarkerTrackingCapability.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialMarkerTrackingCapability" inherits="OpenXRExtensionWrapper" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialMarkerTrackingCapability" inherits="OpenXRExtensionWrapper" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Implementation for handling spatial entity marker tracking logic.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialPlaneTrackingCapability.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialPlaneTrackingCapability.xml
index b369db9b..7b51f326 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialPlaneTrackingCapability.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialPlaneTrackingCapability.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialPlaneTrackingCapability" inherits="OpenXRExtensionWrapper" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialPlaneTrackingCapability" inherits="OpenXRExtensionWrapper" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Implementation for handling spatial entity plane tracking logic.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRSpatialQueryResultData.xml b/engine/modules/openxr/doc_classes/OpenXRSpatialQueryResultData.xml
index 26c61b7e..4955df94 100644
--- a/engine/modules/openxr/doc_classes/OpenXRSpatialQueryResultData.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRSpatialQueryResultData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRSpatialQueryResultData" inherits="OpenXRSpatialComponentData" api_type="core" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRSpatialQueryResultData" inherits="OpenXRSpatialComponentData" experimental="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing the main query result data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRStructureBase.xml b/engine/modules/openxr/doc_classes/OpenXRStructureBase.xml
index 984feb63..db8408f1 100644
--- a/engine/modules/openxr/doc_classes/OpenXRStructureBase.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRStructureBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRStructureBase" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRStructureBase" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Object for storing OpenXR structure data.
 	</brief_description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRVisibilityMask.xml b/engine/modules/openxr/doc_classes/OpenXRVisibilityMask.xml
index 9dc0d914..90ee889c 100644
--- a/engine/modules/openxr/doc_classes/OpenXRVisibilityMask.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRVisibilityMask.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRVisibilityMask" inherits="VisualInstance3D" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRVisibilityMask" inherits="VisualInstance3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Draws a stereo correct visibility mask.
 	</brief_description>
diff --git a/engine/modules/openxr/editor/openxr_action_editor.cpp b/engine/modules/openxr/editor/openxr_action_editor.cpp
index 88836121..eb455843 100644
--- a/engine/modules/openxr/editor/openxr_action_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_editor.cpp
@@ -30,8 +30,6 @@
 
 #include "openxr_action_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 
diff --git a/engine/modules/openxr/editor/openxr_action_editor.h b/engine/modules/openxr/editor/openxr_action_editor.h
index bec4dc45..6c1d0d5a 100644
--- a/engine/modules/openxr/editor/openxr_action_editor.h
+++ b/engine/modules/openxr/editor/openxr_action_editor.h
@@ -37,6 +37,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/text_edit.h"
 
 class OpenXRActionEditor : public HBoxContainer {
 	GDCLASS(OpenXRActionEditor, HBoxContainer);
diff --git a/engine/modules/openxr/editor/openxr_action_map_editor.cpp b/engine/modules/openxr/editor/openxr_action_map_editor.cpp
index b53e54d8..6edb076d 100644
--- a/engine/modules/openxr/editor/openxr_action_map_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_map_editor.cpp
@@ -32,15 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/separator.h"
 
 HashMap<String, String> OpenXRActionMapEditor::interaction_profile_editors;
 HashMap<String, String> OpenXRActionMapEditor::binding_modifier_editors;
diff --git a/engine/modules/openxr/editor/openxr_action_set_editor.cpp b/engine/modules/openxr/editor/openxr_action_set_editor.cpp
index b7770ea9..ac96718f 100644
--- a/engine/modules/openxr/editor/openxr_action_set_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_set_editor.cpp
@@ -30,17 +30,15 @@
 
 #include "openxr_action_set_editor.h"
 
-#include "openxr_action_editor.h"
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/themes/editor_scale.h"
+#include "openxr_action_editor.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/panel_container.h"
+#include "scene/gui/text_edit.h"
 
 void OpenXRActionSetEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_do_set_name", "name"), &OpenXRActionSetEditor::_do_set_name);
diff --git a/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp b/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
index d4da9b4a..7befdbef 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
@@ -30,10 +30,6 @@
 
 #include "openxr_binding_modifier_editor.h"
 
-#include "../action_map/openxr_interaction_profile_metadata.h"
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "scene/gui/option_button.h"
 
diff --git a/engine/modules/openxr/editor/openxr_binding_modifier_editor.h b/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
index cf9b0f78..44a322ae 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
+++ b/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "../action_map/openxr_action_map.h"
+#include "../action_map/openxr_action_set.h"
 #include "../action_map/openxr_binding_modifier.h"
-
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_inspector.h"
 #include "scene/gui/box_container.h"
diff --git a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
index 8374a6d2..e38b7b64 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
@@ -29,12 +29,9 @@
 /**************************************************************************/
 
 #include "openxr_binding_modifiers_dialog.h"
-
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "openxr_action_map_editor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/themes/editor_scale.h"
 
 void OpenXRBindingModifiersDialog::_bind_methods() {
diff --git a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
index 871920e9..b13bea2d 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
+++ b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
@@ -32,8 +32,7 @@
 
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_interaction_profile.h"
-#include "openxr_binding_modifier_editor.h"
-
+#include "../editor/openxr_binding_modifier_editor.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/create_dialog.h"
 #include "scene/gui/box_container.h"
diff --git a/engine/modules/openxr/editor/openxr_editor_plugin.cpp b/engine/modules/openxr/editor/openxr_editor_plugin.cpp
index 85444631..4fc9c733 100644
--- a/engine/modules/openxr/editor/openxr_editor_plugin.cpp
+++ b/engine/modules/openxr/editor/openxr_editor_plugin.cpp
@@ -35,7 +35,6 @@
 
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
-
 #include "platform/android/export/export_plugin.h"
 
 #include <openxr/openxr.h>
diff --git a/engine/modules/openxr/editor/openxr_editor_plugin.h b/engine/modules/openxr/editor/openxr_editor_plugin.h
index 74effd33..b034b94a 100644
--- a/engine/modules/openxr/editor/openxr_editor_plugin.h
+++ b/engine/modules/openxr/editor/openxr_editor_plugin.h
@@ -67,6 +67,7 @@ class OpenXREditorPlugin : public EditorPlugin {
 
 public:
 	virtual String get_plugin_name() const override { return "OpenXRPlugin"; }
+	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_node) override;
 	virtual bool handles(Object *p_node) const override;
 	virtual void make_visible(bool p_visible) override;
diff --git a/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
index f3db8e9a..a48d1751 100644
--- a/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
@@ -29,11 +29,7 @@
 /**************************************************************************/
 
 #include "openxr_interaction_profile_editor.h"
-
 #include "../openxr_api.h"
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/engine/modules/openxr/editor/openxr_interaction_profile_editor.h b/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
index 752dc8d2..e2b00add 100644
--- a/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
+++ b/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
@@ -33,10 +33,9 @@
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_interaction_profile.h"
 #include "../action_map/openxr_interaction_profile_metadata.h"
-#include "openxr_binding_modifiers_dialog.h"
-#include "openxr_select_action_dialog.h"
-
+#include "../editor/openxr_binding_modifiers_dialog.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "openxr_select_action_dialog.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 
diff --git a/engine/modules/openxr/editor/openxr_select_action_dialog.cpp b/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
index f4defaf6..314ec8e3 100644
--- a/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
@@ -30,13 +30,7 @@
 
 #include "openxr_select_action_dialog.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/label.h"
-#include "scene/gui/scroll_container.h"
 
 void OpenXRSelectActionDialog::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("action_selected", PropertyInfo(Variant::STRING, "action")));
diff --git a/engine/modules/openxr/editor/openxr_select_action_dialog.h b/engine/modules/openxr/editor/openxr_select_action_dialog.h
index e80fe2e9..85a7fcf0 100644
--- a/engine/modules/openxr/editor/openxr_select_action_dialog.h
+++ b/engine/modules/openxr/editor/openxr_select_action_dialog.h
@@ -32,10 +32,14 @@
 
 #include "../action_map/openxr_action_map.h"
 
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-
-class VBoxContainer;
-class ScrollContainer;
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/text_edit.h"
 
 class OpenXRSelectActionDialog : public ConfirmationDialog {
 	GDCLASS(OpenXRSelectActionDialog, ConfirmationDialog);
diff --git a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
index 50ba2cfb..cda0cec2 100644
--- a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
@@ -33,8 +33,6 @@
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
 #include "editor/themes/editor_scale.h"
 
 void OpenXRSelectInteractionProfileDialog::_bind_methods() {
diff --git a/engine/modules/openxr/editor/openxr_select_runtime.cpp b/engine/modules/openxr/editor/openxr_select_runtime.cpp
index 4852e208..5e80511b 100644
--- a/engine/modules/openxr/editor/openxr_select_runtime.cpp
+++ b/engine/modules/openxr/editor/openxr_select_runtime.cpp
@@ -31,13 +31,12 @@
 #include "openxr_select_runtime.h"
 
 #ifdef WINDOWS_ENABLED
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp b/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
index 654027bf..2ddc03e9 100644
--- a/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
@@ -30,14 +30,12 @@
 
 #include "openxr_android_thread_settings_extension.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/string/print_string.h"
 #include "servers/rendering/rendering_server.h"
 
 #ifdef XR_USE_PLATFORM_ANDROID
 #include "../openxr_api.h"
-
 #include <unistd.h>
 #endif
 
diff --git a/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.h b/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.h
index f05c40d6..b686fa10 100644
--- a/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.h
+++ b/engine/modules/openxr/extensions/openxr_android_thread_settings_extension.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
-#include "openxr_extension_wrapper.h"
-
+#include "../openxr_interface.h"
 #include "core/templates/hash_map.h"
 
+#include "openxr_extension_wrapper.h"
+
 #ifdef XR_USE_PLATFORM_ANDROID
 #include "../util.h"
-
 #include <jni.h>
 #include <openxr/openxr_platform.h>
 #endif
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp b/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
index 6bcff216..23d0eb4c 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
@@ -30,79 +30,18 @@
 
 #include "openxr_composition_layer_extension.h"
 
-#include "openxr_fb_update_swapchain_extension.h"
-
-#include "core/object/callable_mp.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_globals.h"
-#include "servers/xr/xr_server.h"
-
-#include "platform/android/api/java_class_wrapper.h"
-
 #ifdef ANDROID_ENABLED
 #include <openxr/openxr.h>
 #include <openxr/openxr_platform.h>
 #endif
 
+#include "openxr_fb_update_swapchain_extension.h"
+#include "platform/android/api/java_class_wrapper.h"
+#include "servers/rendering/rendering_server_globals.h"
+
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRCompositionLayerExtension
 
-#define OPENXR_LAYER_FUNC1_IMPL(m_name, m_arg1) \
-	void OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1) { \
-		CompositionLayer *layer = composition_layer_owner.get_or_null(p_layer); \
-		ERR_FAIL_NULL(layer); \
-		layer->m_name(p1); \
-	} \
-	void OpenXRCompositionLayerExtension::composition_layer_##m_name(RID p_layer, m_arg1 p1) { \
-		RenderingServer::get_singleton()->call_on_render_thread(callable_mp(this, &OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt).bind(p_layer, p1)); \
-	}
-
-#define OPENXR_LAYER_FUNC2_IMPL(m_name, m_arg1, m_arg2) \
-	void OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1, m_arg2 p2) { \
-		CompositionLayer *layer = composition_layer_owner.get_or_null(p_layer); \
-		ERR_FAIL_NULL(layer); \
-		layer->m_name(p1, p2); \
-	} \
-	void OpenXRCompositionLayerExtension::composition_layer_##m_name(RID p_layer, m_arg1 p1, m_arg2 p2) { \
-		RenderingServer::get_singleton()->call_on_render_thread(callable_mp(this, &OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt).bind(p_layer, p1, p2)); \
-	}
-
-OPENXR_LAYER_FUNC2_IMPL(set_viewport, RID, const Size2i &);
-OPENXR_LAYER_FUNC2_IMPL(set_use_android_surface, bool, const Size2i &);
-OPENXR_LAYER_FUNC1_IMPL(set_sort_order, int);
-OPENXR_LAYER_FUNC1_IMPL(set_alpha_blend, bool);
-OPENXR_LAYER_FUNC1_IMPL(set_transform, const Transform3D &);
-OPENXR_LAYER_FUNC1_IMPL(set_protected_content, bool);
-OPENXR_LAYER_FUNC1_IMPL(set_extension_property_values, Dictionary);
-
-OPENXR_LAYER_FUNC1_IMPL(set_min_filter, Filter);
-OPENXR_LAYER_FUNC1_IMPL(set_mag_filter, Filter);
-OPENXR_LAYER_FUNC1_IMPL(set_mipmap_mode, MipmapMode);
-OPENXR_LAYER_FUNC1_IMPL(set_horizontal_wrap, Wrap);
-OPENXR_LAYER_FUNC1_IMPL(set_vertical_wrap, Wrap);
-OPENXR_LAYER_FUNC1_IMPL(set_red_swizzle, Swizzle);
-OPENXR_LAYER_FUNC1_IMPL(set_blue_swizzle, Swizzle);
-OPENXR_LAYER_FUNC1_IMPL(set_green_swizzle, Swizzle);
-OPENXR_LAYER_FUNC1_IMPL(set_alpha_swizzle, Swizzle);
-OPENXR_LAYER_FUNC1_IMPL(set_max_anisotropy, float);
-OPENXR_LAYER_FUNC1_IMPL(set_border_color, const Color &);
-OPENXR_LAYER_FUNC1_IMPL(set_pose_space, PoseSpace);
-OPENXR_LAYER_FUNC1_IMPL(set_eye_visibility, EyeVisibility);
-
-OPENXR_LAYER_FUNC1_IMPL(set_quad_size, const Size2 &);
-
-OPENXR_LAYER_FUNC1_IMPL(set_cylinder_radius, float);
-OPENXR_LAYER_FUNC1_IMPL(set_cylinder_aspect_ratio, float);
-OPENXR_LAYER_FUNC1_IMPL(set_cylinder_central_angle, float);
-
-OPENXR_LAYER_FUNC1_IMPL(set_equirect_radius, float);
-OPENXR_LAYER_FUNC1_IMPL(set_equirect_central_horizontal_angle, float);
-OPENXR_LAYER_FUNC1_IMPL(set_equirect_upper_vertical_angle, float);
-OPENXR_LAYER_FUNC1_IMPL(set_equirect_lower_vertical_angle, float);
-
-#undef OPENXR_LAYER_FUNC1_IMPL
-#undef OPENXR_LAYER_FUNC2_IMPL
-
 OpenXRCompositionLayerExtension *OpenXRCompositionLayerExtension::singleton = nullptr;
 
 OpenXRCompositionLayerExtension *OpenXRCompositionLayerExtension::get_singleton() {
@@ -343,42 +282,25 @@ void OpenXRCompositionLayerExtension::CompositionLayer::set_alpha_blend(bool p_a
 }
 
 void OpenXRCompositionLayerExtension::CompositionLayer::set_transform(const Transform3D &p_transform) {
-	Transform3D xf;
-
-	if (pose_space == POSE_HEAD_LOCKED) {
-		// Local transform relative to the head/camera.
-		xf = p_transform;
-	} else {
-		// Relative to the XROrigin3D, so we need to apply the reference frame.
-		Transform3D reference_frame = XRServer::get_singleton()->get_reference_frame();
-		xf = reference_frame.inverse() * p_transform;
-	}
-
-	Quaternion quat(xf.basis.orthonormalized());
-
-	// Prevent invalid quaternion
-	if (Math::is_zero_approx(quat.length())) {
-		quat = Quaternion(); // identity quaternion
-	}
+	Transform3D reference_frame = XRServer::get_singleton()->get_reference_frame();
+	Transform3D transform = reference_frame.inverse() * p_transform;
+	Quaternion quat(transform.basis.orthonormalized());
 
 	XrPosef pose = {
 		{ (float)quat.x, (float)quat.y, (float)quat.z, (float)quat.w },
-		{ (float)xf.origin.x, (float)xf.origin.y, (float)xf.origin.z }
+		{ (float)transform.origin.x, (float)transform.origin.y, (float)transform.origin.z }
 	};
 
 	switch (composition_layer.type) {
 		case XR_TYPE_COMPOSITION_LAYER_QUAD: {
 			composition_layer_quad.pose = pose;
 		} break;
-
 		case XR_TYPE_COMPOSITION_LAYER_CYLINDER_KHR: {
 			composition_layer_cylinder.pose = pose;
 		} break;
-
 		case XR_TYPE_COMPOSITION_LAYER_EQUIRECT2_KHR: {
 			composition_layer_equirect.pose = pose;
 		} break;
-
 		default: {
 			ERR_PRINT(vformat("Cannot set transform on unsupported composition layer type: %s", composition_layer.type));
 		}
@@ -445,50 +367,6 @@ void OpenXRCompositionLayerExtension::CompositionLayer::set_border_color(const C
 	swapchain_state_is_dirty = true;
 }
 
-void OpenXRCompositionLayerExtension::CompositionLayer::set_pose_space(PoseSpace p_pose_space) {
-	pose_space = p_pose_space;
-}
-
-void OpenXRCompositionLayerExtension::CompositionLayer::set_eye_visibility(EyeVisibility p_eye_visibility) {
-	XrEyeVisibility eye_visibility;
-
-	switch (p_eye_visibility) {
-		case EYE_VISIBILITY_BOTH: {
-			eye_visibility = XR_EYE_VISIBILITY_BOTH;
-		} break;
-
-		case EYE_VISIBILITY_LEFT: {
-			eye_visibility = XR_EYE_VISIBILITY_LEFT;
-		} break;
-
-		case EYE_VISIBILITY_RIGHT: {
-			eye_visibility = XR_EYE_VISIBILITY_RIGHT;
-		} break;
-
-		default: {
-			eye_visibility = XR_EYE_VISIBILITY_BOTH;
-		}
-	}
-
-	switch (composition_layer.type) {
-		case XR_TYPE_COMPOSITION_LAYER_QUAD: {
-			composition_layer_quad.eyeVisibility = eye_visibility;
-		} break;
-
-		case XR_TYPE_COMPOSITION_LAYER_CYLINDER_KHR: {
-			composition_layer_cylinder.eyeVisibility = eye_visibility;
-		} break;
-
-		case XR_TYPE_COMPOSITION_LAYER_EQUIRECT2_KHR: {
-			composition_layer_equirect.eyeVisibility = eye_visibility;
-		} break;
-
-		default: {
-			ERR_PRINT(vformat("%s does not support setting eye visibility.", composition_layer.type));
-		}
-	}
-}
-
 void OpenXRCompositionLayerExtension::CompositionLayer::set_quad_size(const Size2 &p_size) {
 	ERR_FAIL_COND(composition_layer.type != XR_TYPE_COMPOSITION_LAYER_QUAD);
 	composition_layer_quad.size = { (float)p_size.x, (float)p_size.y };
@@ -557,10 +435,10 @@ void OpenXRCompositionLayerExtension::CompositionLayer::on_pre_render() {
 	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
 
 	if (subviewport.viewport.is_valid() && openxr_api && openxr_api->is_running()) {
-		RSE::ViewportUpdateMode update_mode = rs->viewport_get_update_mode(subviewport.viewport);
-		if (update_mode == RSE::VIEWPORT_UPDATE_ONCE || update_mode == RSE::VIEWPORT_UPDATE_ALWAYS) {
+		RS::ViewportUpdateMode update_mode = rs->viewport_get_update_mode(subviewport.viewport);
+		if (update_mode == RS::VIEWPORT_UPDATE_ONCE || update_mode == RS::VIEWPORT_UPDATE_ALWAYS) {
 			// Update our XR swapchain
-			if (update_and_acquire_swapchain(update_mode == RSE::VIEWPORT_UPDATE_ONCE)) {
+			if (update_and_acquire_swapchain(update_mode == RS::VIEWPORT_UPDATE_ONCE)) {
 				// Render to our XR swapchain image.
 				RID rt = rs->viewport_get_render_target(subviewport.viewport);
 				RSG::texture_storage->render_target_set_override(rt, get_current_swapchain_texture(), RID(), RID(), RID());
@@ -600,42 +478,26 @@ XrCompositionLayerBaseHeader *OpenXRCompositionLayerExtension::CompositionLayer:
 		return nullptr;
 	}
 
-	// Update the layer's reference space
-	switch (pose_space) {
-		case POSE_WORLD_LOCKED: {
-			layer_reference_space = openxr_api->get_play_space();
-			break;
-		}
-
-		case POSE_HEAD_LOCKED: {
-			layer_reference_space = openxr_api->get_view_space();
-			break;
-		}
-		default: {
-			return nullptr;
-		}
-	}
-
 	// Update the layer struct for the swapchain.
 	switch (composition_layer.type) {
 		case XR_TYPE_COMPOSITION_LAYER_QUAD: {
-			composition_layer_quad.space = layer_reference_space;
+			composition_layer_quad.space = openxr_api->get_play_space();
 			composition_layer_quad.subImage = subimage;
 		} break;
 
 		case XR_TYPE_COMPOSITION_LAYER_CYLINDER_KHR: {
-			composition_layer_cylinder.space = layer_reference_space;
+			composition_layer_cylinder.space = openxr_api->get_play_space();
 			composition_layer_cylinder.subImage = subimage;
 		} break;
 
 		case XR_TYPE_COMPOSITION_LAYER_EQUIRECT2_KHR: {
-			composition_layer_equirect.space = layer_reference_space;
+			composition_layer_equirect.space = openxr_api->get_play_space();
 			composition_layer_equirect.subImage = subimage;
 		} break;
 
 		default: {
 			return nullptr;
-		}
+		} break;
 	}
 
 	if (extension_property_values_changed) {
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_extension.h b/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
index 22b12ae7..a476a2d2 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
+++ b/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
@@ -30,9 +30,10 @@
 
 #pragma once
 
-#include "../openxr_api.h"
 #include "openxr_extension_wrapper.h"
 
+#include "../openxr_api.h"
+
 #ifdef ANDROID_ENABLED
 #include <jni.h>
 
@@ -43,6 +44,28 @@ typedef XrResult(XRAPI_PTR *PFN_xrCreateSwapchainAndroidSurfaceKHR)(XrSession se
 
 class JavaObject;
 
+// This extension provides access to composition layers for displaying 2D content through the XR compositor.
+
+#define OPENXR_LAYER_FUNC1(m_name, m_arg1)                                                                                                                                \
+	void _composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1) {                                                                                                       \
+		CompositionLayer *layer = composition_layer_owner.get_or_null(p_layer);                                                                                           \
+		ERR_FAIL_NULL(layer);                                                                                                                                             \
+		layer->m_name(p1);                                                                                                                                                \
+	}                                                                                                                                                                     \
+	void composition_layer_##m_name(RID p_layer, m_arg1 p1) {                                                                                                             \
+		RenderingServer::get_singleton()->call_on_render_thread(callable_mp(this, &OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt).bind(p_layer, p1)); \
+	}
+
+#define OPENXR_LAYER_FUNC2(m_name, m_arg1, m_arg2)                                                                                                                            \
+	void _composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1, m_arg2 p2) {                                                                                                \
+		CompositionLayer *layer = composition_layer_owner.get_or_null(p_layer);                                                                                               \
+		ERR_FAIL_NULL(layer);                                                                                                                                                 \
+		layer->m_name(p1, p2);                                                                                                                                                \
+	}                                                                                                                                                                         \
+	void composition_layer_##m_name(RID p_layer, m_arg1 p1, m_arg2 p2) {                                                                                                      \
+		RenderingServer::get_singleton()->call_on_render_thread(callable_mp(this, &OpenXRCompositionLayerExtension::_composition_layer_##m_name##_rt).bind(p_layer, p1, p2)); \
+	}
+
 // OpenXRCompositionLayerExtension enables the extensions related to this functionality
 class OpenXRCompositionLayerExtension : public OpenXRExtensionWrapper {
 	GDCLASS(OpenXRCompositionLayerExtension, OpenXRExtensionWrapper);
@@ -84,18 +107,6 @@ public:
 		SWIZZLE_ONE,
 	};
 
-	// Must be identical to EyeVisibility enum definition in OpenXRCompositionLayer.
-	enum EyeVisibility {
-		EYE_VISIBILITY_BOTH,
-		EYE_VISIBILITY_LEFT,
-		EYE_VISIBILITY_RIGHT,
-	};
-
-	enum PoseSpace {
-		POSE_WORLD_LOCKED,
-		POSE_HEAD_LOCKED,
-	};
-
 	struct SwapchainState {
 		Filter min_filter = Filter::FILTER_LINEAR;
 		Filter mag_filter = Filter::FILTER_LINEAR;
@@ -132,52 +143,36 @@ public:
 	void composition_layer_register(RID p_layer);
 	void composition_layer_unregister(RID p_layer);
 
-	// This extension provides access to composition layers for displaying 2D content through the XR compositor.
-	// Declarations are made here, and implementations in the .cpp, to avoid having to include RenderingServer in a header.
+	OPENXR_LAYER_FUNC2(set_viewport, RID, const Size2i &);
+	OPENXR_LAYER_FUNC2(set_use_android_surface, bool, const Size2i &);
+	OPENXR_LAYER_FUNC1(set_sort_order, int);
+	OPENXR_LAYER_FUNC1(set_alpha_blend, bool);
+	OPENXR_LAYER_FUNC1(set_transform, const Transform3D &);
+	OPENXR_LAYER_FUNC1(set_protected_content, bool);
+	OPENXR_LAYER_FUNC1(set_extension_property_values, Dictionary);
 
-#define OPENXR_LAYER_FUNC1_DECL(m_name, m_arg1) \
-	void _composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1); \
-	void composition_layer_##m_name(RID p_layer, m_arg1 p1);
+	OPENXR_LAYER_FUNC1(set_min_filter, Filter);
+	OPENXR_LAYER_FUNC1(set_mag_filter, Filter);
+	OPENXR_LAYER_FUNC1(set_mipmap_mode, MipmapMode);
+	OPENXR_LAYER_FUNC1(set_horizontal_wrap, Wrap);
+	OPENXR_LAYER_FUNC1(set_vertical_wrap, Wrap);
+	OPENXR_LAYER_FUNC1(set_red_swizzle, Swizzle);
+	OPENXR_LAYER_FUNC1(set_blue_swizzle, Swizzle);
+	OPENXR_LAYER_FUNC1(set_green_swizzle, Swizzle);
+	OPENXR_LAYER_FUNC1(set_alpha_swizzle, Swizzle);
+	OPENXR_LAYER_FUNC1(set_max_anisotropy, float);
+	OPENXR_LAYER_FUNC1(set_border_color, const Color &);
 
-#define OPENXR_LAYER_FUNC2_DECL(m_name, m_arg1, m_arg2) \
-	void _composition_layer_##m_name##_rt(RID p_layer, m_arg1 p1, m_arg2 p2); \
-	void composition_layer_##m_name(RID p_layer, m_arg1 p1, m_arg2 p2);
+	OPENXR_LAYER_FUNC1(set_quad_size, const Size2 &);
 
-	OPENXR_LAYER_FUNC2_DECL(set_viewport, RID, const Size2i &);
-	OPENXR_LAYER_FUNC2_DECL(set_use_android_surface, bool, const Size2i &);
-	OPENXR_LAYER_FUNC1_DECL(set_sort_order, int);
-	OPENXR_LAYER_FUNC1_DECL(set_alpha_blend, bool);
-	OPENXR_LAYER_FUNC1_DECL(set_transform, const Transform3D &);
-	OPENXR_LAYER_FUNC1_DECL(set_protected_content, bool);
-	OPENXR_LAYER_FUNC1_DECL(set_extension_property_values, Dictionary);
+	OPENXR_LAYER_FUNC1(set_cylinder_radius, float);
+	OPENXR_LAYER_FUNC1(set_cylinder_aspect_ratio, float);
+	OPENXR_LAYER_FUNC1(set_cylinder_central_angle, float);
 
-	OPENXR_LAYER_FUNC1_DECL(set_min_filter, Filter);
-	OPENXR_LAYER_FUNC1_DECL(set_mag_filter, Filter);
-	OPENXR_LAYER_FUNC1_DECL(set_mipmap_mode, MipmapMode);
-	OPENXR_LAYER_FUNC1_DECL(set_horizontal_wrap, Wrap);
-	OPENXR_LAYER_FUNC1_DECL(set_vertical_wrap, Wrap);
-	OPENXR_LAYER_FUNC1_DECL(set_red_swizzle, Swizzle);
-	OPENXR_LAYER_FUNC1_DECL(set_blue_swizzle, Swizzle);
-	OPENXR_LAYER_FUNC1_DECL(set_green_swizzle, Swizzle);
-	OPENXR_LAYER_FUNC1_DECL(set_alpha_swizzle, Swizzle);
-	OPENXR_LAYER_FUNC1_DECL(set_max_anisotropy, float);
-	OPENXR_LAYER_FUNC1_DECL(set_border_color, const Color &);
-	OPENXR_LAYER_FUNC1_DECL(set_pose_space, PoseSpace);
-	OPENXR_LAYER_FUNC1_DECL(set_eye_visibility, EyeVisibility);
-
-	OPENXR_LAYER_FUNC1_DECL(set_quad_size, const Size2 &);
-
-	OPENXR_LAYER_FUNC1_DECL(set_cylinder_radius, float);
-	OPENXR_LAYER_FUNC1_DECL(set_cylinder_aspect_ratio, float);
-	OPENXR_LAYER_FUNC1_DECL(set_cylinder_central_angle, float);
-
-	OPENXR_LAYER_FUNC1_DECL(set_equirect_radius, float);
-	OPENXR_LAYER_FUNC1_DECL(set_equirect_central_horizontal_angle, float);
-	OPENXR_LAYER_FUNC1_DECL(set_equirect_upper_vertical_angle, float);
-	OPENXR_LAYER_FUNC1_DECL(set_equirect_lower_vertical_angle, float);
-
-#undef OPENXR_LAYER_FUNC1_DECL
-#undef OPENXR_LAYER_FUNC2_DECL
+	OPENXR_LAYER_FUNC1(set_equirect_radius, float);
+	OPENXR_LAYER_FUNC1(set_equirect_central_horizontal_angle, float);
+	OPENXR_LAYER_FUNC1(set_equirect_upper_vertical_angle, float);
+	OPENXR_LAYER_FUNC1(set_equirect_lower_vertical_angle, float);
 
 	Ref<JavaObject> composition_layer_get_android_surface(RID p_layer);
 
@@ -230,9 +225,6 @@ private:
 		} android_surface;
 #endif
 
-		PoseSpace pose_space = POSE_WORLD_LOCKED;
-		XrSpace layer_reference_space = XR_NULL_HANDLE;
-
 		bool use_android_surface = false;
 		bool protected_content = false;
 		Size2i swapchain_size;
@@ -260,8 +252,6 @@ private:
 		void set_alpha_swizzle(Swizzle p_mode);
 		void set_max_anisotropy(float p_value);
 		void set_border_color(const Color &p_color);
-		void set_pose_space(PoseSpace p_pose_space);
-		void set_eye_visibility(EyeVisibility p_eye_visibility);
 
 		void set_quad_size(const Size2 &p_size);
 
@@ -300,5 +290,6 @@ VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::Filter);
 VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::MipmapMode);
 VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::Wrap);
 VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::Swizzle);
-VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::PoseSpace);
-VARIANT_ENUM_CAST(OpenXRCompositionLayerExtension::EyeVisibility);
+
+#undef OPENXR_LAYER_FUNC1
+#undef OPENXR_LAYER_FUNC2
diff --git a/engine/modules/openxr/extensions/openxr_debug_utils_extension.cpp b/engine/modules/openxr/extensions/openxr_debug_utils_extension.cpp
index de2f6a78..9aeaa12d 100644
--- a/engine/modules/openxr/extensions/openxr_debug_utils_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_debug_utils_extension.cpp
@@ -31,7 +31,6 @@
 #include "openxr_debug_utils_extension.h"
 
 #include "../openxr_api.h"
-
 #include "core/config/project_settings.h"
 #include "core/string/print_string.h"
 
diff --git a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.cpp b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
index 181ea6c3..dfca2bed 100644
--- a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
@@ -29,11 +29,8 @@
 /**************************************************************************/
 
 #include "openxr_dpad_binding_extension.h"
-
 #include "../openxr_api.h"
-
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 
 // Implementation for:
 // https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_EXT_dpad_binding
@@ -75,7 +72,7 @@ bool OpenXRDPadBindingExtension::is_available() {
 void OpenXRDpadBindingModifier::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_action_set", "action_set"), &OpenXRDpadBindingModifier::set_action_set);
 	ClassDB::bind_method(D_METHOD("get_action_set"), &OpenXRDpadBindingModifier::get_action_set);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "action_set", PROPERTY_HINT_RESOURCE_TYPE, OpenXRActionSet::get_class_static()), "set_action_set", "get_action_set");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "action_set", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRActionSet"), "set_action_set", "get_action_set");
 
 	ClassDB::bind_method(D_METHOD("set_input_path", "input_path"), &OpenXRDpadBindingModifier::set_input_path);
 	ClassDB::bind_method(D_METHOD("get_input_path"), &OpenXRDpadBindingModifier::get_input_path);
@@ -103,11 +100,11 @@ void OpenXRDpadBindingModifier::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_on_haptic", "haptic"), &OpenXRDpadBindingModifier::set_on_haptic);
 	ClassDB::bind_method(D_METHOD("get_on_haptic"), &OpenXRDpadBindingModifier::get_on_haptic);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "on_haptic", PROPERTY_HINT_RESOURCE_TYPE, OpenXRHapticBase::get_class_static()), "set_on_haptic", "get_on_haptic");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "on_haptic", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRHapticBase"), "set_on_haptic", "get_on_haptic");
 
 	ClassDB::bind_method(D_METHOD("set_off_haptic", "haptic"), &OpenXRDpadBindingModifier::set_off_haptic);
 	ClassDB::bind_method(D_METHOD("get_off_haptic"), &OpenXRDpadBindingModifier::get_off_haptic);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "off_haptic", PROPERTY_HINT_RESOURCE_TYPE, OpenXRHapticBase::get_class_static()), "set_off_haptic", "get_off_haptic");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "off_haptic", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRHapticBase"), "set_off_haptic", "get_off_haptic");
 }
 
 OpenXRDpadBindingModifier::OpenXRDpadBindingModifier() {
diff --git a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
index c8b60f4a..128ae20a 100644
--- a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
+++ b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
@@ -33,6 +33,7 @@
 #include "../action_map/openxr_action_set.h"
 #include "../action_map/openxr_binding_modifier.h"
 #include "../action_map/openxr_haptic_feedback.h"
+#include "../util.h"
 #include "openxr_extension_wrapper.h"
 
 class OpenXRDPadBindingExtension : public OpenXRExtensionWrapper {
diff --git a/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp b/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
index 11c338b6..58df171f 100644
--- a/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
+++ b/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
@@ -33,8 +33,6 @@
 #include "../openxr_api.h"
 #include "../openxr_api_extension.h"
 
-#include "core/object/class_db.h"
-
 void OpenXRExtensionWrapper::_bind_methods() {
 	GDVIRTUAL_BIND(_get_requested_extensions, "xr_version");
 	GDVIRTUAL_BIND(_set_system_properties_and_get_next_pointer, "next_pointer");
@@ -45,7 +43,6 @@ void OpenXRExtensionWrapper::_bind_methods() {
 	GDVIRTUAL_BIND(_set_projection_views_and_get_next_pointer, "view_index", "next_pointer");
 	GDVIRTUAL_BIND(_set_frame_wait_info_and_get_next_pointer, "next_pointer");
 	GDVIRTUAL_BIND(_set_frame_end_info_and_get_next_pointer, "next_pointer");
-	GDVIRTUAL_BIND(_set_projection_layer_and_get_next_pointer, "next_pointer");
 	GDVIRTUAL_BIND(_set_view_locate_info_and_get_next_pointer, "next_pointer");
 	GDVIRTUAL_BIND(_set_reference_space_create_info_and_get_next_pointer, "reference_space_type", "next_pointer");
 	GDVIRTUAL_BIND(_prepare_view_configuration, "view_count");
@@ -213,16 +210,6 @@ void *OpenXRExtensionWrapper::set_frame_end_info_and_get_next_pointer(void *p_ne
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapper::set_projection_layer_and_get_next_pointer(void *p_next_pointer) {
-	uint64_t pointer = 0;
-
-	if (GDVIRTUAL_CALL(_set_projection_layer_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
-		return reinterpret_cast<void *>(pointer);
-	}
-
-	return nullptr;
-}
-
 void OpenXRExtensionWrapper::prepare_view_configuration(uint32_t p_view_count) {
 	GDVIRTUAL_CALL(_prepare_view_configuration, p_view_count);
 }
diff --git a/engine/modules/openxr/extensions/openxr_extension_wrapper.h b/engine/modules/openxr/extensions/openxr_extension_wrapper.h
index 2fb83736..34af812b 100644
--- a/engine/modules/openxr/extensions/openxr_extension_wrapper.h
+++ b/engine/modules/openxr/extensions/openxr_extension_wrapper.h
@@ -32,8 +32,8 @@
 
 #include "core/error/error_macros.h"
 #include "core/math/projection.h"
-#include "core/object/gdvirtual.gen.h"
-#include "core/object/ref_counted.h"
+#include "core/object/class_db.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/templates/hash_map.h"
 #include "core/templates/rid.h"
 #include "core/variant/native_ptr.h"
@@ -87,8 +87,6 @@ public:
 	virtual void *set_frame_wait_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrWaitFrame
 	virtual void *set_view_locate_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrLocateViews
 	virtual void *set_frame_end_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrEndFrame
-	// This will only be called for extensions registered via OpenXRAPI::register_projection_layer_extension().
-	virtual void *set_projection_layer_and_get_next_pointer(void *p_next_pointer); // Add additional data structures to XrCompositionLayerProjection
 
 	virtual void prepare_view_configuration(uint32_t p_view_count);
 	virtual void *set_view_configuration_and_get_next_pointer(uint32_t p_view, void *p_next_pointer); // Add additional data structures when calling xrEnumerateViewConfiguration
@@ -103,7 +101,6 @@ public:
 	GDVIRTUAL2R(uint64_t, _set_projection_views_and_get_next_pointer, int, GDExtensionPtr<void>);
 	GDVIRTUAL1R(uint64_t, _set_frame_wait_info_and_get_next_pointer, GDExtensionPtr<void>);
 	GDVIRTUAL1R(uint64_t, _set_frame_end_info_and_get_next_pointer, GDExtensionPtr<void>);
-	GDVIRTUAL1R(uint64_t, _set_projection_layer_and_get_next_pointer, GDExtensionPtr<void>);
 	GDVIRTUAL1R(uint64_t, _set_view_locate_info_and_get_next_pointer, GDExtensionPtr<void>);
 	GDVIRTUAL2R(uint64_t, _set_reference_space_create_info_and_get_next_pointer, int, GDExtensionPtr<void>);
 	GDVIRTUAL0R(int, _get_composition_layer_count);
diff --git a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
index 151e1989..402ac95d 100644
--- a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
+++ b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
@@ -30,12 +30,12 @@
 
 #include "openxr_eye_gaze_interaction.h"
 
-#include "../action_map/openxr_interaction_profile_metadata.h"
-#include "../openxr_api.h"
-
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 
+#include "../action_map/openxr_interaction_profile_metadata.h"
+#include "../openxr_api.h"
+
 OpenXREyeGazeInteractionExtension *OpenXREyeGazeInteractionExtension::singleton = nullptr;
 
 OpenXREyeGazeInteractionExtension *OpenXREyeGazeInteractionExtension::get_singleton() {
diff --git a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp
index d1d8aa04..fc229cbe 100644
--- a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "openxr_fb_display_refresh_rate_extension.h"
-
 #include "../openxr_interface.h"
 
 OpenXRDisplayRefreshRateExtension *OpenXRDisplayRefreshRateExtension::singleton = nullptr;
diff --git a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
index 4c6b9442..c184314f 100644
--- a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
@@ -35,6 +35,7 @@
 // While this is an FB extension it has been adopted by most runtimes and
 // will likely become core in the near future.
 
+#include "../openxr_api.h"
 #include "../util.h"
 #include "openxr_extension_wrapper.h"
 
diff --git a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.cpp b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.cpp
index d156e6e4..25a1498e 100644
--- a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.cpp
@@ -29,13 +29,10 @@
 /**************************************************************************/
 
 #include "openxr_fb_foveation_extension.h"
-
-#include "../openxr_platform_inc.h"
+#include "core/config/project_settings.h"
 #include "openxr_eye_gaze_interaction.h"
 
-#include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "servers/rendering/rendering_server.h"
+#include "../openxr_platform_inc.h"
 
 OpenXRFBFoveationExtension *OpenXRFBFoveationExtension::singleton = nullptr;
 
@@ -51,13 +48,9 @@ OpenXRFBFoveationExtension::OpenXRFBFoveationExtension(const String &p_rendering
 	if (fov_level >= 0 && fov_level < 4) {
 		foveation_level = XrFoveationLevelFB(fov_level);
 	}
-
 	bool fov_dyn = GLOBAL_GET("xr/openxr/foveation_dynamic");
 	foveation_dynamic = fov_dyn ? XR_FOVEATION_DYNAMIC_LEVEL_ENABLED_FB : XR_FOVEATION_DYNAMIC_DISABLED_FB;
 
-	foveation_with_subsampled_images_enabled = GLOBAL_GET("xr/openxr/foveation_with_subsampled_images");
-	foveation_with_subsampled_images_active = foveation_with_subsampled_images_enabled;
-
 	swapchain_create_info_foveation_fb.type = XR_TYPE_SWAPCHAIN_CREATE_INFO_FOVEATION_FB;
 	swapchain_create_info_foveation_fb.next = nullptr;
 	swapchain_create_info_foveation_fb.flags = 0;
@@ -73,7 +66,7 @@ OpenXRFBFoveationExtension::OpenXRFBFoveationExtension(const String &p_rendering
 #ifdef VULKAN_ENABLED
 	meta_vulkan_swapchain_create_info.type = XR_TYPE_VULKAN_SWAPCHAIN_CREATE_INFO_META;
 	meta_vulkan_swapchain_create_info.next = nullptr;
-	meta_vulkan_swapchain_create_info.additionalCreateFlags = 0;
+	meta_vulkan_swapchain_create_info.additionalCreateFlags = VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM;
 	meta_vulkan_swapchain_create_info.additionalUsageFlags = 0;
 #endif
 
@@ -98,12 +91,8 @@ HashMap<String, bool *> OpenXRFBFoveationExtension::get_requested_extensions(XrV
 #ifdef XR_USE_GRAPHICS_API_VULKAN
 	if (rendering_driver == "vulkan") {
 		request_extensions[XR_FB_FOVEATION_VULKAN_EXTENSION_NAME] = &fb_foveation_vulkan_ext;
+		request_extensions[XR_META_FOVEATION_EYE_TRACKED_EXTENSION_NAME] = &meta_foveation_eye_tracked_ext;
 		request_extensions[XR_META_VULKAN_SWAPCHAIN_CREATE_INFO_EXTENSION_NAME] = &meta_vulkan_swapchain_create_info_ext;
-
-		bool fov_eye_tracked = GLOBAL_GET("xr/openxr/foveation_eye_tracked");
-		if (fov_eye_tracked) {
-			request_extensions[XR_META_FOVEATION_EYE_TRACKED_EXTENSION_NAME] = &meta_foveation_eye_tracked_ext;
-		}
 	}
 #endif // XR_USE_GRAPHICS_API_VULKAN
 
@@ -158,15 +147,7 @@ void *OpenXRFBFoveationExtension::set_swapchain_create_info_and_get_next_pointer
 		next = &swapchain_create_info_foveation_fb;
 
 #ifdef VULKAN_ENABLED
-		if (meta_vulkan_swapchain_create_info_ext) {
-			meta_vulkan_swapchain_create_info.additionalCreateFlags = 0;
-			if (meta_foveation_eye_tracked_ext && meta_foveation_eye_tracked_properties.supportsFoveationEyeTracked) {
-				meta_vulkan_swapchain_create_info.additionalCreateFlags |= VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM;
-			}
-			if (foveation_with_subsampled_images_enabled && foveation_with_subsampled_images_active) {
-				meta_vulkan_swapchain_create_info.additionalCreateFlags |= VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT;
-			}
-
+		if (meta_foveation_eye_tracked_ext && meta_vulkan_swapchain_create_info_ext && meta_foveation_eye_tracked_properties.supportsFoveationEyeTracked) {
 			meta_vulkan_swapchain_create_info.next = next;
 			next = &meta_vulkan_swapchain_create_info;
 		}
@@ -242,18 +223,6 @@ void OpenXRFBFoveationExtension::get_fragment_density_offsets(LocalVector<Vector
 	}
 }
 
-void OpenXRFBFoveationExtension::set_foveation_with_subsampled_images_enabled(bool p_enabled) {
-	foveation_with_subsampled_images_enabled = p_enabled;
-}
-
-bool OpenXRFBFoveationExtension::is_foveation_with_subsampled_images_enabled() const {
-	return is_enabled() && meta_vulkan_swapchain_create_info_ext && foveation_with_subsampled_images_enabled;
-}
-
-void OpenXRFBFoveationExtension::set_foveation_with_subsampled_images_active(bool p_active) {
-	foveation_with_subsampled_images_active = p_active;
-}
-
 void OpenXRFBFoveationExtension::_update_profile_rt() {
 	// Must be called from rendering thread!
 	ERR_NOT_ON_RENDER_THREAD;
@@ -313,11 +282,3 @@ void OpenXRFBFoveationExtension::_update_profile_rt() {
 		print_line("OpenXR: Unable to destroy the foveation profile [", openxr_api->get_error_string(result), "]");
 	}
 }
-
-void OpenXRFBFoveationExtension::update_profile() {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp(this, &OpenXRFBFoveationExtension::_update_profile_rt));
-}
diff --git a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
index 88a56e02..3ccd01b8 100644
--- a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
@@ -35,12 +35,12 @@
 // Other Android based devices are implementing this as well, see:
 // https://github.khronos.org/OpenXR-Inventory/extension_support.html#XR_FB_foveation
 
+#include "../openxr_api.h"
 #include "../util.h"
 #include "openxr_extension_wrapper.h"
 #include "openxr_fb_update_swapchain_extension.h"
 
-// Always include this as late as possible.
-#include "../openxr_platform_inc.h" // IWYU pragma: keep.
+#include "../openxr_platform_inc.h"
 
 class OpenXRFBFoveationExtension : public OpenXRExtensionWrapper {
 	GDCLASS(OpenXRFBFoveationExtension, OpenXRExtensionWrapper);
@@ -75,11 +75,6 @@ public:
 	bool is_foveation_eye_tracked_enabled() const;
 	void get_fragment_density_offsets(LocalVector<Vector2i> &r_offsets);
 
-	void set_foveation_with_subsampled_images_enabled(bool p_enabled);
-	bool is_foveation_with_subsampled_images_enabled() const;
-
-	void set_foveation_with_subsampled_images_active(bool p_active);
-
 private:
 	static OpenXRFBFoveationExtension *singleton;
 
@@ -94,12 +89,16 @@ private:
 	// Configuration
 	XrFoveationLevelFB foveation_level = XR_FOVEATION_LEVEL_NONE_FB;
 	XrFoveationDynamicFB foveation_dynamic = XR_FOVEATION_DYNAMIC_DISABLED_FB;
-	bool foveation_with_subsampled_images_enabled = false;
-	bool foveation_with_subsampled_images_active = false;
 
 	void _update_profile_rt();
 
-	void update_profile();
+	void update_profile() {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp(this, &OpenXRFBFoveationExtension::_update_profile_rt));
+	}
 
 	// Enable foveation on this swapchain
 	XrSwapchainCreateInfoFoveationFB swapchain_create_info_foveation_fb;
diff --git a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
index 36c7d6bd..9f3ce85a 100644
--- a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
@@ -70,7 +70,7 @@ HashMap<String, bool *> OpenXRFBUpdateSwapchainExtension::get_requested_extensio
 #ifdef XR_USE_GRAPHICS_API_VULKAN
 		request_extensions[XR_FB_SWAPCHAIN_UPDATE_STATE_VULKAN_EXTENSION_NAME] = &fb_swapchain_update_state_vulkan_ext;
 #endif
-	} else if (rendering_driver == "opengl3" || rendering_driver == "opengl3_es") {
+	} else if (rendering_driver == "opengl3") {
 #ifdef XR_USE_GRAPHICS_API_OPENGL_ES
 		request_extensions[XR_FB_SWAPCHAIN_UPDATE_STATE_OPENGL_ES_EXTENSION_NAME] = &fb_swapchain_update_state_opengles_ext;
 #endif
@@ -146,7 +146,7 @@ void OpenXRFBUpdateSwapchainExtension::update_swapchain_state(XrSwapchain p_swap
 			return;
 		}
 #endif
-	} else if (rendering_driver == "opengl3" || rendering_driver == "opengl3_es") {
+	} else if (rendering_driver == "opengl3") {
 #ifdef XR_USE_GRAPHICS_API_OPENGL_ES
 		if (!fb_swapchain_update_state_ext || !fb_swapchain_update_state_opengles_ext) {
 			return;
diff --git a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
index 95839da9..f79bac7e 100644
--- a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
@@ -35,6 +35,7 @@
 // Other Android based devices are implementing this as well, see:
 // https://github.khronos.org/OpenXR-Inventory/extension_support.html#XR_FB_swapchain_update_state
 
+#include "../openxr_api.h"
 #include "../util.h"
 #include "openxr_composition_layer_extension.h"
 #include "openxr_extension_wrapper.h"
diff --git a/engine/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp b/engine/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
index 86624a58..f547d23e 100644
--- a/engine/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
@@ -31,8 +31,6 @@
 #include "openxr_frame_synthesis_extension.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_server.h"
 
@@ -81,29 +79,25 @@ HashMap<String, bool *> OpenXRFrameSynthesisExtension::get_requested_extensions(
 }
 
 void OpenXRFrameSynthesisExtension::on_instance_created(const XrInstance p_instance) {
-	// Register this as a projection view extension
-	if (frame_synthesis_ext) {
-		OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
-		ERR_FAIL_NULL(openxr_api);
-		openxr_api->register_projection_views_extension(this);
-	}
-
 	// Enable this if our extension was successfully enabled
 	enabled = frame_synthesis_ext;
 	render_state.enabled = frame_synthesis_ext;
+
+	// Register this as a projection view extension
+	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
+	ERR_FAIL_NULL(openxr_api);
+	openxr_api->register_projection_views_extension(this);
 }
 
 void OpenXRFrameSynthesisExtension::on_instance_destroyed() {
-	// Unregister this as a projection view extension.
-	if (frame_synthesis_ext) {
-		OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
-		ERR_FAIL_NULL(openxr_api);
-		openxr_api->unregister_projection_views_extension(this);
-	}
-
 	frame_synthesis_ext = false;
 	enabled = false;
 	render_state.enabled = false;
+
+	// Unregister this as a projection view extension.
+	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
+	ERR_FAIL_NULL(openxr_api);
+	openxr_api->unregister_projection_views_extension(this);
 }
 
 void OpenXRFrameSynthesisExtension::prepare_view_configuration(uint32_t p_view_count) {
@@ -199,13 +193,11 @@ void OpenXRFrameSynthesisExtension::on_main_swapchains_created() {
 		} else {
 			WARN_PRINT("OpenXR: Frame synthesis not supported for this rendering method!");
 			frame_synthesis_ext = false;
-			openxr_api->unregister_projection_views_extension(this);
 			return;
 		}
 	} else {
 		WARN_PRINT("OpenXR: Frame synthesis not supported for this rendering driver!");
 		frame_synthesis_ext = false;
-		openxr_api->unregister_projection_views_extension(this);
 		return;
 	}
 
diff --git a/engine/modules/openxr/extensions/openxr_future_extension.cpp b/engine/modules/openxr/extensions/openxr_future_extension.cpp
index 1e79dc04..e88b1a94 100644
--- a/engine/modules/openxr/extensions/openxr_future_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_future_extension.cpp
@@ -32,8 +32,6 @@
 
 #include "../openxr_api.h"
 
-#include "core/object/class_db.h"
-
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRFutureResult
 
@@ -45,7 +43,7 @@ void OpenXRFutureResult::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_result_value", "result_value"), &OpenXRFutureResult::set_result_value);
 	ClassDB::bind_method(D_METHOD("get_result_value"), &OpenXRFutureResult::get_result_value);
 
-	ADD_SIGNAL(MethodInfo("completed", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, OpenXRFutureResult::get_class_static())));
+	ADD_SIGNAL(MethodInfo("completed", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRFutureResult")));
 
 	BIND_ENUM_CONSTANT(RESULT_RUNNING);
 	BIND_ENUM_CONSTANT(RESULT_FINISHED);
diff --git a/engine/modules/openxr/extensions/openxr_future_extension.h b/engine/modules/openxr/extensions/openxr_future_extension.h
index cbb47d31..dfb434b8 100644
--- a/engine/modules/openxr/extensions/openxr_future_extension.h
+++ b/engine/modules/openxr/extensions/openxr_future_extension.h
@@ -46,9 +46,8 @@
 */
 
 #include "../util.h"
-#include "openxr_extension_wrapper.h"
-
 #include "core/object/ref_counted.h"
+#include "openxr_extension_wrapper.h"
 
 #include <openxr/openxr.h>
 
diff --git a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
index 499c28b0..a0d30097 100644
--- a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
@@ -32,7 +32,6 @@
 
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
-
 #include "core/config/project_settings.h"
 
 #include <openxr/openxr.h>
diff --git a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
index 3dd2e00f..7a301b38 100644
--- a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
+++ b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
@@ -31,9 +31,8 @@
 #pragma once
 
 #include "../util.h"
-#include "openxr_extension_wrapper.h"
-
 #include "core/math/quaternion.h"
+#include "openxr_extension_wrapper.h"
 #include "servers/xr/xr_hand_tracker.h"
 
 class OpenXRHandTrackingExtension : public OpenXRExtensionWrapper {
diff --git a/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.cpp
deleted file mode 100644
index e8560ae9..00000000
--- a/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************************/
-/*  openxr_khr_generic_controller_extension.cpp                           */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "openxr_khr_generic_controller_extension.h"
-
-#include "../action_map/openxr_interaction_profile_metadata.h"
-#include "../openxr_api.h"
-
-HashMap<String, bool *> OpenXRKHRGenericController::get_requested_extensions(XrVersion p_version) {
-	HashMap<String, bool *> request_extensions;
-
-	request_extensions[XR_KHR_GENERIC_CONTROLLER_EXTENSION_NAME] = &generic_controller_ext;
-
-	return request_extensions;
-}
-
-bool OpenXRKHRGenericController::is_available() const {
-	return generic_controller_ext;
-}
-
-void OpenXRKHRGenericController::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(openxr_metadata);
-
-	{ // KHR Generic controller
-		const String profile_path = "/interaction_profiles/khr/generic_controller";
-		openxr_metadata->register_interaction_profile("Generic controller", profile_path, XR_KHR_GENERIC_CONTROLLER_EXTENSION_NAME);
-		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			openxr_metadata->register_io_path(profile_path, "Primary click", user_path, user_path + "/input/primary/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			openxr_metadata->register_io_path(profile_path, "Secondary click", user_path, user_path + "/input/secondary/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-
-			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", XR_EXT_DPAD_BINDING_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_BOOL);
-			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", XR_EXT_DPAD_BINDING_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_BOOL);
-			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", XR_EXT_DPAD_BINDING_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_BOOL);
-			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", XR_EXT_DPAD_BINDING_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_BOOL);
-
-			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-
-			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			openxr_metadata->register_io_path(profile_path, "Grip surface pose", user_path, user_path + "/input/grip_surface/pose", XR_EXT_PALM_POSE_EXTENSION_NAME "," XR_KHR_MAINTENANCE1_EXTENSION_NAME "," XR_OPENXR_1_1_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-
-			openxr_metadata->register_io_path(profile_path, "Pinch pose", user_path, user_path + "/input/pinch_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-			openxr_metadata->register_io_path(profile_path, "Poke pose", user_path, user_path + "/input/poke_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-
-			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
-		}
-	}
-}
diff --git a/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.h b/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.h
deleted file mode 100644
index 4249f903..00000000
--- a/engine/modules/openxr/extensions/openxr_khr_generic_controller_extension.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************/
-/*  openxr_khr_generic_controller_extension.h                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "openxr_extension_wrapper.h"
-
-class OpenXRKHRGenericController : public OpenXRExtensionWrapper {
-	GDCLASS(OpenXRKHRGenericController, OpenXRExtensionWrapper);
-
-public:
-	virtual HashMap<String, bool *> get_requested_extensions(XrVersion p_version) override;
-
-	bool is_available() const;
-
-	virtual void on_register_metadata() override;
-
-private:
-	bool generic_controller_ext = false;
-};
diff --git a/engine/modules/openxr/extensions/openxr_render_model_extension.cpp b/engine/modules/openxr/extensions/openxr_render_model_extension.cpp
index 91154d2b..c5d8089f 100644
--- a/engine/modules/openxr/extensions/openxr_render_model_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_render_model_extension.cpp
@@ -32,9 +32,9 @@
 
 #ifdef MODULE_GLTF_ENABLED
 #include "../openxr_api.h"
+#include "../openxr_interface.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "core/string/print_string.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/engine/modules/openxr/extensions/openxr_render_model_extension.h b/engine/modules/openxr/extensions/openxr_render_model_extension.h
index 35b14736..c164ae12 100644
--- a/engine/modules/openxr/extensions/openxr_render_model_extension.h
+++ b/engine/modules/openxr/extensions/openxr_render_model_extension.h
@@ -35,14 +35,12 @@
 #ifdef MODULE_GLTF_ENABLED
 #include "../openxr_uuid.h"
 #include "../util.h"
-#include "openxr_extension_wrapper.h"
-
 #include "core/templates/rid_owner.h"
+#include "modules/gltf/gltf_document.h"
+#include "openxr_extension_wrapper.h"
 #include "scene/3d/node_3d.h"
 #include "servers/xr/xr_pose.h"
 
-#include "modules/gltf/gltf_document.h"
-
 #include <openxr/openxr.h>
 
 class OpenXRRenderModelData : public RefCounted {
diff --git a/engine/modules/openxr/extensions/openxr_user_presence_extension.cpp b/engine/modules/openxr/extensions/openxr_user_presence_extension.cpp
deleted file mode 100644
index 226ff0f3..00000000
--- a/engine/modules/openxr/extensions/openxr_user_presence_extension.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/**************************************************************************/
-/*  openxr_user_presence_extension.cpp                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "openxr_user_presence_extension.h"
-
-#include "../openxr_interface.h"
-
-#include "core/config/project_settings.h"
-
-OpenXRUserPresenceExtension *OpenXRUserPresenceExtension::singleton = nullptr;
-
-OpenXRUserPresenceExtension *OpenXRUserPresenceExtension::get_singleton() {
-	return singleton;
-}
-
-OpenXRUserPresenceExtension::OpenXRUserPresenceExtension() {
-	singleton = this;
-}
-
-OpenXRUserPresenceExtension::~OpenXRUserPresenceExtension() {
-	singleton = nullptr;
-}
-
-HashMap<String, bool *> OpenXRUserPresenceExtension::get_requested_extensions(XrVersion p_version) {
-	HashMap<String, bool *> request_extensions;
-	if (GLOBAL_GET("xr/openxr/extensions/user_presence")) {
-		request_extensions[XR_EXT_USER_PRESENCE_EXTENSION_NAME] = &available;
-	}
-	return request_extensions;
-}
-
-void *OpenXRUserPresenceExtension::set_system_properties_and_get_next_pointer(void *p_next_pointer) {
-	if (!available) {
-		return p_next_pointer;
-	}
-
-	properties.type = XR_TYPE_SYSTEM_USER_PRESENCE_PROPERTIES_EXT;
-	properties.next = p_next_pointer;
-	properties.supportsUserPresence = false;
-
-	return &properties;
-}
-
-bool OpenXRUserPresenceExtension::is_active() const {
-	return available && properties.supportsUserPresence;
-}
-
-void OpenXRUserPresenceExtension::on_state_ready() {
-	user_present = true;
-}
-
-void OpenXRUserPresenceExtension::on_state_stopping() {
-	user_present = false;
-}
-
-bool OpenXRUserPresenceExtension::on_event_polled(const XrEventDataBuffer &event) {
-	if (!is_active() || event.type != XR_TYPE_EVENT_DATA_USER_PRESENCE_CHANGED_EXT) {
-		return false;
-	}
-
-	const XrEventDataUserPresenceChangedEXT *user_presence_changed_event = (XrEventDataUserPresenceChangedEXT *)&event;
-	if (user_present != (bool)user_presence_changed_event->isUserPresent) {
-		user_present = user_presence_changed_event->isUserPresent;
-		OpenXRInterface *xr_interface = OpenXRAPI::get_singleton()->get_xr_interface();
-		if (xr_interface) {
-			xr_interface->emit_signal(SNAME("user_presence_changed"), user_present);
-		}
-	}
-	return true;
-}
-
-bool OpenXRUserPresenceExtension::is_user_present() const {
-	return user_present;
-}
diff --git a/engine/modules/openxr/extensions/openxr_user_presence_extension.h b/engine/modules/openxr/extensions/openxr_user_presence_extension.h
deleted file mode 100644
index bf7c408b..00000000
--- a/engine/modules/openxr/extensions/openxr_user_presence_extension.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**************************************************************************/
-/*  openxr_user_presence_extension.h                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "openxr_extension_wrapper.h"
-
-// When supported, the user presence extension allows an application to detect and respond to change
-// of user presence, such as when the user has taken off or put on an XR headset.
-//
-// See: https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_EXT_user_presence
-// for more information.
-
-class OpenXRUserPresenceExtension : public OpenXRExtensionWrapper {
-	GDCLASS(OpenXRUserPresenceExtension, OpenXRExtensionWrapper);
-
-protected:
-	static void _bind_methods() {}
-
-public:
-	static OpenXRUserPresenceExtension *get_singleton();
-
-	OpenXRUserPresenceExtension();
-	virtual ~OpenXRUserPresenceExtension() override;
-
-	virtual HashMap<String, bool *> get_requested_extensions(XrVersion p_version) override;
-	virtual void *set_system_properties_and_get_next_pointer(void *p_next_pointer) override;
-
-	virtual void on_state_ready() override;
-	virtual void on_state_stopping() override;
-
-	virtual bool on_event_polled(const XrEventDataBuffer &event) override;
-
-	bool is_user_present() const;
-	bool is_active() const;
-
-private:
-	static OpenXRUserPresenceExtension *singleton;
-
-	bool available = false;
-	XrSystemUserPresencePropertiesEXT properties;
-
-	bool user_present = true;
-};
diff --git a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
index 4f404603..39c9506f 100644
--- a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
@@ -29,13 +29,10 @@
 /**************************************************************************/
 
 #include "openxr_valve_analog_threshold_extension.h"
-
 #include "../action_map/openxr_action_set.h"
 #include "../action_map/openxr_interaction_profile.h"
 #include "../openxr_api.h"
 
-#include "core/object/class_db.h"
-
 // Implementation for:
 // https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_VALVE_analog_threshold
 
@@ -84,11 +81,11 @@ void OpenXRAnalogThresholdModifier::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_on_haptic", "haptic"), &OpenXRAnalogThresholdModifier::set_on_haptic);
 	ClassDB::bind_method(D_METHOD("get_on_haptic"), &OpenXRAnalogThresholdModifier::get_on_haptic);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "on_haptic", PROPERTY_HINT_RESOURCE_TYPE, OpenXRHapticBase::get_class_static()), "set_on_haptic", "get_on_haptic");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "on_haptic", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRHapticBase"), "set_on_haptic", "get_on_haptic");
 
 	ClassDB::bind_method(D_METHOD("set_off_haptic", "haptic"), &OpenXRAnalogThresholdModifier::set_off_haptic);
 	ClassDB::bind_method(D_METHOD("get_off_haptic"), &OpenXRAnalogThresholdModifier::get_off_haptic);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "off_haptic", PROPERTY_HINT_RESOURCE_TYPE, OpenXRHapticBase::get_class_static()), "set_off_haptic", "get_off_haptic");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "off_haptic", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRHapticBase"), "set_off_haptic", "get_off_haptic");
 }
 
 OpenXRAnalogThresholdModifier::OpenXRAnalogThresholdModifier() {
diff --git a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
index 1abffe84..3d614a06 100644
--- a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
+++ b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
@@ -32,6 +32,8 @@
 
 #include "../action_map/openxr_binding_modifier.h"
 #include "../action_map/openxr_haptic_feedback.h"
+#include "../util.h"
+#include "core/io/resource.h"
 #include "openxr_extension_wrapper.h"
 
 class OpenXRValveAnalogThresholdExtension : public OpenXRExtensionWrapper {
diff --git a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.cpp b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
index ac3e4673..434ced8c 100644
--- a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.cpp
@@ -31,7 +31,6 @@
 #include "openxr_visibility_mask_extension.h"
 
 #include "../openxr_api.h"
-
 #include "core/string/print_string.h"
 #include "core/variant/array.h"
 #include "core/variant/variant.h"
@@ -278,12 +277,12 @@ void OpenXRVisibilityMaskExtension::_update_mesh() {
 
 		// Update our mesh.
 		Array arr;
-		arr.resize(RSE::ARRAY_MAX);
-		arr[RSE::ARRAY_VERTEX] = vertices;
-		arr[RSE::ARRAY_INDEX] = indices;
+		arr.resize(RS::ARRAY_MAX);
+		arr[RS::ARRAY_VERTEX] = vertices;
+		arr[RS::ARRAY_INDEX] = indices;
 
 		rendering_server->mesh_clear(mesh);
-		rendering_server->mesh_add_surface_from_arrays(mesh, RSE::PRIMITIVE_TRIANGLES, arr);
+		rendering_server->mesh_add_surface_from_arrays(mesh, RS::PRIMITIVE_TRIANGLES, arr);
 		rendering_server->mesh_surface_set_material(mesh, 0, material);
 
 		// Set no longer dirty.
diff --git a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
index 13167d0c..e07bcbd0 100644
--- a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
+++ b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
@@ -31,9 +31,10 @@
 #pragma once
 
 #include "../util.h"
-#include "openxr_extension_wrapper.h"
 
 #include "core/templates/vector.h"
+#include "openxr_extension_wrapper.h"
+#include "scene/resources/mesh.h"
 
 // The OpenXR visibility mask extension provides a mesh for each eye that
 // can be used as a mask to determine which part of our rendered result
diff --git a/engine/modules/openxr/extensions/platform/openxr_android_extension.cpp b/engine/modules/openxr/extensions/platform/openxr_android_extension.cpp
index 460d3556..8c5e0341 100644
--- a/engine/modules/openxr/extensions/platform/openxr_android_extension.cpp
+++ b/engine/modules/openxr/extensions/platform/openxr_android_extension.cpp
@@ -30,13 +30,12 @@
 
 #include "openxr_android_extension.h"
 
-#include "../../openxr_api.h" // IWYU pragma: keep. `XR_FAILED` macro.
+#include "../../openxr_api.h"
+
 #include "java_godot_wrapper.h"
 #include "os_android.h"
 #include "thread_jandroid.h"
 
-#include "core/os/os.h"
-
 #include <openxr/openxr.h>
 #include <openxr/openxr_platform.h>
 
diff --git a/engine/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp b/engine/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
index 2652eb7f..f982b3fb 100644
--- a/engine/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
+++ b/engine/modules/openxr/extensions/platform/openxr_d3d12_extension.cpp
@@ -34,7 +34,6 @@
 
 #include "../../openxr_util.h"
 
-#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 
@@ -316,8 +315,8 @@ void OpenXRD3D12Extension::cleanup_swapchain_graphics_data(void **p_swapchain_gr
 }
 
 #define ENUM_TO_STRING_CASE(e) \
-	case e: { \
-		return String(#e); \
+	case e: {                  \
+		return String(#e);     \
 	} break;
 
 String OpenXRD3D12Extension::get_swapchain_format_name(int64_t p_swapchain_format) const {
diff --git a/engine/modules/openxr/extensions/platform/openxr_metal_extension.h b/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
index 2a639d66..c71be519 100644
--- a/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
@@ -30,13 +30,14 @@
 
 #pragma once
 
+#include "../../openxr_api.h"
 #include "../../util.h"
 #include "../openxr_extension_wrapper.h"
 
 #include "core/templates/vector.h"
 
 // Always include this as late as possible.
-#include "../../openxr_platform_inc.h" // IWYU pragma: keep.
+#include "../../openxr_platform_inc.h"
 
 class OpenXRMetalExtension : public OpenXRGraphicsExtensionWrapper {
 public:
diff --git a/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm b/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
index 75160170..58921e2a 100644
--- a/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
+++ b/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
@@ -30,12 +30,10 @@
 
 #import "openxr_metal_extension.h"
 
-#include "../../openxr_api.h"
 #include "../../openxr_util.h"
 
 #import "drivers/metal/rendering_device_driver_metal.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 HashMap<String, bool *> OpenXRMetalExtension::get_requested_extensions(XrVersion p_version) {
 	HashMap<String, bool *> request_extensions;
@@ -124,8 +122,8 @@ void OpenXRMetalExtension::get_usable_depth_formats(Vector<int64_t> &p_usable_sw
 }
 
 #define ENUM_TO_STRING_CASE(m_e) \
-	case m_e: { \
-		return String(#m_e); \
+	case m_e: {                  \
+		return String(#m_e);     \
 	} break;
 
 String OpenXRMetalExtension::get_swapchain_format_name(int64_t p_swapchain_format) const {
diff --git a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
index 27eb5124..4bcc1103 100644
--- a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
+++ b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
@@ -32,11 +32,12 @@
 
 #ifdef GLES3_ENABLED
 
-#include "../../openxr_api.h"
 #include "../../openxr_util.h"
 
+#include "drivers/gles3/effects/copy_effects.h"
 #include "drivers/gles3/storage/texture_storage.h"
-#include "servers/display/display_server.h"
+#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 // OpenXR requires us to submit sRGB textures so that it recognizes the content
 // as being in sRGB color space. We do fall back on "normal" textures but this
@@ -58,7 +59,7 @@
 HashMap<String, bool *> OpenXROpenGLExtension::get_requested_extensions(XrVersion p_version) {
 	HashMap<String, bool *> request_extensions;
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	request_extensions[XR_KHR_OPENGL_ES_ENABLE_EXTENSION_NAME] = nullptr;
 #else
 	request_extensions[XR_KHR_OPENGL_ENABLE_EXTENSION_NAME] = nullptr;
@@ -74,7 +75,7 @@ void OpenXROpenGLExtension::on_instance_created(const XrInstance p_instance) {
 	// Obtain pointers to functions we're accessing here.
 	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	EXT_INIT_XR_FUNC(xrGetOpenGLESGraphicsRequirementsKHR);
 #else
 	EXT_INIT_XR_FUNC(xrGetOpenGLGraphicsRequirementsKHR);
@@ -88,7 +89,7 @@ bool OpenXROpenGLExtension::check_graphics_api_support(XrVersion p_desired_versi
 	XrSystemId system_id = OpenXRAPI::get_singleton()->get_system_id();
 	XrInstance instance = OpenXRAPI::get_singleton()->get_instance();
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	XrGraphicsRequirementsOpenGLESKHR opengl_requirements;
 	opengl_requirements.type = XR_TYPE_GRAPHICS_REQUIREMENTS_OPENGL_ES_KHR;
 	opengl_requirements.next = nullptr;
@@ -158,15 +159,15 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex
 	graphics_binding_gl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_WIN32_KHR,
 	graphics_binding_gl.next = p_next_pointer;
 
-	graphics_binding_gl.hDC = (HDC)display_server->window_get_native_handle(DisplayServerEnums::WINDOW_VIEW);
-	graphics_binding_gl.hGLRC = (HGLRC)display_server->window_get_native_handle(DisplayServerEnums::OPENGL_CONTEXT);
+	graphics_binding_gl.hDC = (HDC)display_server->window_get_native_handle(DisplayServer::WINDOW_VIEW);
+	graphics_binding_gl.hGLRC = (HGLRC)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT);
 #elif defined(ANDROID_ENABLED)
 	graphics_binding_gl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_ES_ANDROID_KHR;
 	graphics_binding_gl.next = p_next_pointer;
 
-	graphics_binding_gl.display = (void *)display_server->window_get_native_handle(DisplayServerEnums::DISPLAY_HANDLE);
+	graphics_binding_gl.display = (void *)display_server->window_get_native_handle(DisplayServer::DISPLAY_HANDLE);
 	graphics_binding_gl.config = (EGLConfig)0; // https://github.com/KhronosGroup/OpenXR-SDK-Source/blob/master/src/tests/hello_xr/graphicsplugin_opengles.cpp#L122
-	graphics_binding_gl.context = (void *)display_server->window_get_native_handle(DisplayServerEnums::OPENGL_CONTEXT);
+	graphics_binding_gl.context = (void *)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT);
 #else
 #if defined(EGL_ENABLED) && defined(WAYLAND_ENABLED)
 	if (display_server->get_name() == "Wayland") {
@@ -176,9 +177,9 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex
 		graphics_binding_egl.next = p_next_pointer;
 
 		graphics_binding_egl.getProcAddress = eglGetProcAddress;
-		graphics_binding_egl.display = (void *)display_server->window_get_native_handle(DisplayServerEnums::EGL_DISPLAY);
-		graphics_binding_egl.config = (void *)display_server->window_get_native_handle(DisplayServerEnums::EGL_CONFIG);
-		graphics_binding_egl.context = (void *)display_server->window_get_native_handle(DisplayServerEnums::OPENGL_CONTEXT);
+		graphics_binding_egl.display = (void *)display_server->window_get_native_handle(DisplayServer::EGL_DISPLAY);
+		graphics_binding_egl.config = (void *)display_server->window_get_native_handle(DisplayServer::EGL_CONFIG);
+		graphics_binding_egl.context = (void *)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT);
 
 		return &graphics_binding_egl;
 	}
@@ -187,17 +188,17 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex
 	graphics_binding_gl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR;
 	graphics_binding_gl.next = p_next_pointer;
 
-	void *display_handle = (void *)display_server->window_get_native_handle(DisplayServerEnums::DISPLAY_HANDLE);
-	void *glxcontext_handle = (void *)display_server->window_get_native_handle(DisplayServerEnums::OPENGL_CONTEXT);
-	void *glxdrawable_handle = (void *)display_server->window_get_native_handle(DisplayServerEnums::WINDOW_HANDLE);
-	void *glx_fbconfig_handle = (void *)display_server->window_get_native_handle(DisplayServerEnums::GLX_FBCONFIG);
-	VisualID glx_visualid = (VisualID)display_server->window_get_native_handle(DisplayServerEnums::GLX_VISUALID);
+	void *display_handle = (void *)display_server->window_get_native_handle(DisplayServer::DISPLAY_HANDLE);
+	void *glxcontext_handle = (void *)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT);
+	void *glxdrawable_handle = (void *)display_server->window_get_native_handle(DisplayServer::WINDOW_HANDLE);
 
 	graphics_binding_gl.xDisplay = (Display *)display_handle;
 	graphics_binding_gl.glxContext = (GLXContext)glxcontext_handle;
 	graphics_binding_gl.glxDrawable = (GLXDrawable)glxdrawable_handle;
-	graphics_binding_gl.glxFBConfig = (GLXFBConfig)glx_fbconfig_handle;
-	graphics_binding_gl.visualid = glx_visualid;
+
+	// spec says to use proper values but runtimes don't care
+	graphics_binding_gl.visualid = 0;
+	graphics_binding_gl.glxFBConfig = nullptr;
 #endif
 #endif
 
@@ -231,14 +232,14 @@ bool OpenXROpenGLExtension::get_swapchain_image_data(XrSwapchain p_swapchain, in
 		return false;
 	}
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	LocalVector<XrSwapchainImageOpenGLESKHR> images;
 #else
 	LocalVector<XrSwapchainImageOpenGLKHR> images;
 #endif
 	images.resize(swapchain_length);
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	for (XrSwapchainImageOpenGLESKHR &image : images) {
 		image.type = XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_ES_KHR;
 #else
@@ -269,7 +270,7 @@ bool OpenXROpenGLExtension::get_swapchain_image_data(XrSwapchain p_swapchain, in
 
 	for (uint64_t i = 0; i < swapchain_length; i++) {
 		RID texture_rid = texture_storage->texture_create_from_native_handle(
-				p_array_size == 1 ? RSE::TEXTURE_TYPE_2D : RSE::TEXTURE_TYPE_LAYERED,
+				p_array_size == 1 ? RS::TEXTURE_TYPE_2D : RS::TEXTURE_TYPE_LAYERED,
 				format,
 				images[i].image,
 				p_width,
@@ -326,14 +327,14 @@ void OpenXROpenGLExtension::cleanup_swapchain_graphics_data(void **p_swapchain_g
 }
 
 #define ENUM_TO_STRING_CASE(e) \
-	case e: { \
-		return String(#e); \
+	case e: {                  \
+		return String(#e);     \
 	} break;
 
 String OpenXROpenGLExtension::get_swapchain_format_name(int64_t p_swapchain_format) const {
 	// These are somewhat different per platform, will need to weed some stuff out...
 	switch (p_swapchain_format) {
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 		// using definitions from GLES3/gl3.h
 
 		ENUM_TO_STRING_CASE(GL_RGBA4)
diff --git a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
index 9166a6c0..25261f80 100644
--- a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
@@ -32,13 +32,14 @@
 
 #ifdef GLES3_ENABLED
 
+#include "../../openxr_api.h"
 #include "../../util.h"
 #include "../openxr_extension_wrapper.h"
 
 #include "core/templates/vector.h"
 
 // Always include this as late as possible.
-#include "../../openxr_platform_inc.h" // IWYU pragma: keep.
+#include "../../openxr_platform_inc.h"
 
 class OpenXROpenGLExtension : public OpenXRGraphicsExtensionWrapper {
 public:
@@ -83,7 +84,7 @@ private:
 
 	bool check_graphics_api_support(XrVersion p_desired_version);
 
-#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef ANDROID_ENABLED
 	EXT_PROTO_XRRESULT_FUNC3(xrGetOpenGLESGraphicsRequirementsKHR, (XrInstance), p_instance, (XrSystemId), p_system_id, (XrGraphicsRequirementsOpenGLESKHR *), p_graphics_requirements)
 #else
 	EXT_PROTO_XRRESULT_FUNC3(xrGetOpenGLGraphicsRequirementsKHR, (XrInstance), p_instance, (XrSystemId), p_system_id, (XrGraphicsRequirementsOpenGLKHR *), p_graphics_requirements)
diff --git a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
index a0262ecf..374b81e3 100644
--- a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
+++ b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.cpp
@@ -34,8 +34,10 @@
 #include "../openxr_fb_foveation_extension.h"
 
 #include "core/string/print_string.h"
-#include "servers/rendering/rendering_device.h"
+#include "servers/rendering/renderer_rd/effects/copy_effects.h"
+#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 HashMap<String, bool *> OpenXRVulkanExtension::get_requested_extensions(XrVersion p_version) {
 	HashMap<String, bool *> request_extensions;
@@ -227,15 +229,6 @@ void OpenXRVulkanExtension::get_fragment_density_offsets(LocalVector<VkOffset2D>
 	}
 }
 
-bool OpenXRVulkanExtension::use_subsampled_images() {
-	OpenXRFBFoveationExtension *fb_foveation = OpenXRFBFoveationExtension::get_singleton();
-	if (fb_foveation == nullptr) {
-		return false;
-	}
-
-	return fb_foveation->is_foveation_with_subsampled_images_enabled();
-}
-
 XrGraphicsBindingVulkanKHR OpenXRVulkanExtension::graphics_binding_vulkan;
 
 void *OpenXRVulkanExtension::set_session_create_and_get_next_pointer(void *p_next_pointer) {
@@ -508,8 +501,8 @@ void OpenXRVulkanExtension::cleanup_swapchain_graphics_data(void **p_swapchain_g
 }
 
 #define ENUM_TO_STRING_CASE(e) \
-	case e: { \
-		return String(#e); \
+	case e: {                  \
+		return String(#e);     \
 	} break;
 
 String OpenXRVulkanExtension::get_swapchain_format_name(int64_t p_swapchain_format) const {
diff --git a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
index 08394cf8..37168dd9 100644
--- a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "../../openxr_api.h"
 #include "../../util.h"
 #include "../openxr_extension_wrapper.h"
 
@@ -37,7 +38,7 @@
 #include "drivers/vulkan/vulkan_hooks.h"
 
 // Always include this as late as possible.
-#include "../../openxr_platform_inc.h" // IWYU pragma: keep.
+#include "../../openxr_platform_inc.h"
 
 class OpenXRVulkanExtension : public OpenXRGraphicsExtensionWrapper, VulkanHooks {
 public:
@@ -53,7 +54,6 @@ public:
 	virtual bool get_physical_device(VkPhysicalDevice *r_device) override final;
 	virtual bool create_vulkan_device(const VkDeviceCreateInfo *p_device_create_info, VkDevice *r_device) override final;
 	virtual void set_direct_queue_family_and_index(uint32_t p_queue_family_index, uint32_t p_queue_index) override final;
-	virtual bool use_subsampled_images() override final;
 	virtual bool use_fragment_density_offsets() override final;
 	virtual void get_fragment_density_offsets(LocalVector<VkOffset2D> &r_offets, const Vector2i &p_granularity) override final;
 
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
index 644e1419..ff28662d 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
@@ -32,11 +32,8 @@
 
 #include "../../openxr_api.h"
 #include "../../openxr_util.h"
-#include "openxr_spatial_entity_extension.h"
-
+#include "../openxr_future_extension.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.h b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.h
index 285380f3..6b2c0d5f 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.h
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.h
@@ -30,12 +30,9 @@
 
 #pragma once
 
-#include "../../openxr_structure.h"
-#include "../openxr_extension_wrapper.h"
-#include "../openxr_future_extension.h"
+#include "../../openxr_util.h"
 #include "openxr_spatial_entities.h"
-
-#include "core/templates/rid_owner.h"
+#include "openxr_spatial_entity_extension.h"
 
 // Anchor capability configuration
 class OpenXRSpatialCapabilityConfigurationAnchor : public OpenXRSpatialCapabilityConfigurationBaseHeader {
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
index 8b7765a6..a15c8c2f 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
@@ -31,13 +31,9 @@
 #include "openxr_spatial_entities.h"
 
 #include "../../openxr_api.h"
-#include "../../openxr_util.h"
+#include "core/variant/native_ptr.h"
 #include "openxr_spatial_entity_extension.h"
 
-#include "core/object/class_db.h"
-
-#include <openxr/openxr.h>
-
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialCapabilityConfigurationBaseHeader
 
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.h b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.h
index 2be8949f..93cd7dca 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.h
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
+#include "../../openxr_structure.h"
+#include "../openxr_future_extension.h"
 #include "scene/resources/mesh.h"
 #include "servers/xr/xr_positional_tracker.h"
 
-#include <openxr/openxr.h>
-
 #define XR_NULL_ENTITY 0x7FFFFFFF
 
 // Wrapper class for XrSpatialCapabilityConfigurationBaseHeaderEXT
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
index 4d3cb177..e77d2a75 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
@@ -31,11 +31,8 @@
 #include "openxr_spatial_entity_extension.h"
 
 #include "../../openxr_api.h"
-#include "../../openxr_util.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRSpatialEntityExtension
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.h b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.h
index fe021df6..f5811b63 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.h
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.h
@@ -30,13 +30,11 @@
 
 #pragma once
 
-#include "../../openxr_structure.h"
+#include "../../openxr_util.h"
 #include "../openxr_extension_wrapper.h"
-#include "../openxr_future_extension.h"
-#include "openxr_spatial_entities.h"
-
 #include "core/templates/rid_owner.h"
 #include "core/variant/typed_array.h"
+#include "openxr_spatial_entities.h"
 
 // Spatial entity extension
 class OpenXRSpatialEntityExtension : public OpenXRExtensionWrapper {
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
index 9c87a683..b387ba94 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
@@ -31,11 +31,8 @@
 #include "openxr_spatial_marker_tracking.h"
 
 #include "../../openxr_api.h"
-#include "openxr_spatial_entity_extension.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "openxr_spatial_entity_extension.h"
 #include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.h b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.h
index 324e680b..b9e0d616 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.h
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "../openxr_extension_wrapper.h"
-#include "../openxr_future_extension.h"
 #include "openxr_spatial_entities.h"
 
 // QrCode marker tracking capability configuration
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
index 59b02f77..e22e613a 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
@@ -31,11 +31,7 @@
 #include "openxr_spatial_plane_tracking.h"
 
 #include "../../openxr_api.h"
-#include "openxr_spatial_entity_extension.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
@@ -451,9 +447,9 @@ Ref<Mesh> OpenXRPlaneTracker::get_mesh() {
 		}
 
 		// Build our array with data.
-		arr.resize(RSE::ARRAY_MAX);
-		arr[RSE::ARRAY_VERTEX] = vertices;
-		arr[RSE::ARRAY_INDEX] = mesh.indices;
+		arr.resize(RS::ARRAY_MAX);
+		arr[RS::ARRAY_VERTEX] = vertices;
+		arr[RS::ARRAY_INDEX] = mesh.indices;
 
 		// Create our array mesh.
 		array_mesh.instantiate();
diff --git a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.h b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.h
index af4ed58a..7100f920 100644
--- a/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.h
+++ b/engine/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.h
@@ -30,10 +30,8 @@
 
 #pragma once
 
-#include "../openxr_extension_wrapper.h"
-#include "../openxr_future_extension.h"
 #include "openxr_spatial_entities.h"
-
+#include "openxr_spatial_entity_extension.h"
 #include "scene/resources/3d/shape_3d.h"
 
 // Plane tracking capability configuration
diff --git a/engine/modules/openxr/openxr_api.cpp b/engine/modules/openxr/openxr_api.cpp
index e9fabe70..759eec82 100644
--- a/engine/modules/openxr/openxr_api.cpp
+++ b/engine/modules/openxr/openxr_api.cpp
@@ -30,24 +30,16 @@
 
 #include "openxr_api.h"
 
-#include "action_map/openxr_interaction_profile_metadata.h"
 #include "openxr_interface.h"
 #include "openxr_util.h"
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
 #include "core/os/memory.h"
 #include "core/profiling/profiling.h"
 #include "core/version.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_globals.h"
 
-#ifdef ANDROID_ENABLED
-#include "core/os/os.h"
-#endif
-
-#include "openxr_platform_inc.h" // IWYU pragma: keep.
+#include "openxr_platform_inc.h"
 
 #ifdef VULKAN_ENABLED
 #include "extensions/platform/openxr_vulkan_extension.h"
@@ -1281,7 +1273,7 @@ bool OpenXRAPI::obtain_swapchain_formats() {
 		print_verbose(String("Using color swap chain format:") + get_swapchain_format_name(color_swapchain_format));
 	}
 
-	if (submit_depth_buffer) {
+	{
 		// Build a vector with swapchain formats we want to use, from best fit to worst
 		Vector<int64_t> usable_swapchain_formats;
 		depth_swapchain_format = 0;
@@ -1295,11 +1287,9 @@ bool OpenXRAPI::obtain_swapchain_formats() {
 			}
 		}
 
-		if (depth_swapchain_format == 0) {
-			WARN_PRINT("OpenXR: No usable depth swap chain format available!");
-		} else {
-			print_verbose(String("Using depth swap chain format:") + get_swapchain_format_name(depth_swapchain_format));
-		}
+		ERR_FAIL_COND_V_MSG(depth_swapchain_format == 0, false, "OpenXR: No usable depth swap chain format available!");
+
+		print_verbose(String("Using depth swap chain format:") + get_swapchain_format_name(depth_swapchain_format));
 	}
 
 	return true;
@@ -1310,6 +1300,21 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
 	ERR_FAIL_NULL_V(graphics_extension, false);
 	ERR_FAIL_COND_V(session == XR_NULL_HANDLE, false);
 
+	/*
+		TODO: We need to improve on this, for now we're taking our old approach of creating our main swapchains and substituting
+		those for the ones Godot normally creates.
+		This however means we can only use swapchains for our main XR view.
+
+		It would have been nicer if we could override the swapchain creation in Godot with ours but we have a timing issue here.
+		We can't create XR swapchains until after our XR session is fully instantiated, yet Godot creates its swapchain much earlier.
+
+		We only creates a swapchain for the main output here.
+		Additional swapchains may be created through our composition layer extension.
+
+		Finally an area we need to expand upon is that Foveated rendering is only enabled for the swap chain we create,
+		as we render 3D content into internal buffers that are copied into the swapchain, we do now have (basic) VRS support
+	*/
+
 	render_state.main_swapchain_size = p_size;
 	uint32_t sample_count = 1;
 
@@ -1325,7 +1330,7 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
 	// We create our depth swapchain if:
 	// - we've enabled submitting depth buffer
 	// - we support our depth layer extension
-	// Note: Application Space Warp and Frame Synthesis use a separate lower resolution depth buffer.
+	// - we have our spacewarp extension (not yet implemented)
 	if (depth_swapchain_format != 0 && submit_depth_buffer && OpenXRCompositionLayerDepthExtension::get_singleton()->is_available()) {
 		if (!render_state.main_swapchains[OPENXR_SWAPCHAIN_DEPTH].create(0, XR_SWAPCHAIN_USAGE_SAMPLED_BIT | XR_SWAPCHAIN_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, depth_swapchain_format, render_state.main_swapchain_size.width, render_state.main_swapchain_size.height, sample_count, view_configuration_views.size())) {
 			return false;
@@ -1334,6 +1339,12 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
 		set_object_name(XR_OBJECT_TYPE_SWAPCHAIN, uint64_t(render_state.main_swapchains[OPENXR_SWAPCHAIN_DEPTH].get_swapchain()), "Main depth swapchain");
 	}
 
+	// We create our velocity swapchain if:
+	// - we have our spacewarp extension (not yet implemented)
+	{
+		// TBD
+	}
+
 	for (uint32_t i = 0; i < render_state.views.size(); i++) {
 		render_state.projection_views[i].subImage.swapchain = render_state.main_swapchains[OPENXR_SWAPCHAIN_COLOR].get_swapchain();
 		render_state.projection_views[i].subImage.imageArrayIndex = i;
@@ -1569,7 +1580,7 @@ void OpenXRAPI::set_form_factor(XrFormFactor p_form_factor) {
 	form_factor = p_form_factor;
 }
 
-uint32_t OpenXRAPI::get_view_count() const {
+uint32_t OpenXRAPI::get_view_count() {
 	return view_configuration_views.size();
 }
 
@@ -1726,7 +1737,7 @@ bool OpenXRAPI::initialize(const String &p_rendering_driver) {
 		// shouldn't be possible...
 		ERR_FAIL_V(false);
 #endif
-	} else if (p_rendering_driver == "opengl3" || p_rendering_driver == "opengl3_es") {
+	} else if (p_rendering_driver == "opengl3") {
 #if defined(GLES3_ENABLED) && !defined(MACOS_ENABLED)
 		graphics_extension = memnew(OpenXROpenGLExtension);
 		register_extension_wrapper(graphics_extension);
@@ -2276,68 +2287,6 @@ void OpenXRAPI::_update_main_swapchain_size_rt() {
 #endif
 }
 
-void OpenXRAPI::allocate_view_buffers(uint32_t p_view_count, bool p_submit_depth_buffer) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_allocate_view_buffers_rt).bind(p_view_count, p_submit_depth_buffer));
-}
-
-void OpenXRAPI::set_render_session_running(bool p_is_running) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_session_running_rt).bind(p_is_running));
-}
-
-void OpenXRAPI::set_render_display_info(XrTime p_predicted_display_time, bool p_should_render) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_display_info_rt).bind(p_predicted_display_time, p_should_render));
-}
-
-void OpenXRAPI::set_render_play_space(XrSpace p_play_space) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_play_space_rt).bind(uint64_t(p_play_space)));
-}
-
-void OpenXRAPI::set_render_environment_blend_mode(XrEnvironmentBlendMode p_mode) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_environment_blend_mode_rt).bind((int32_t)p_mode));
-}
-
-void OpenXRAPI::set_render_state_multiplier(double p_render_target_size_multiplier) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_state_multiplier_rt).bind(p_render_target_size_multiplier));
-}
-
-void OpenXRAPI::set_render_state_render_region(const Rect2i &p_render_region) {
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_state_render_region_rt).bind(p_render_region));
-}
-
-void OpenXRAPI::update_main_swapchain_size() {
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_update_main_swapchain_size_rt));
-}
-
 bool OpenXRAPI::process() {
 	ERR_FAIL_COND_V(instance == XR_NULL_HANDLE, false);
 
@@ -2435,6 +2384,15 @@ void OpenXRAPI::pre_render() {
 	// Process any swapchains that were queued to be freed
 	OpenXRSwapChainInfo::free_queued();
 
+	Size2i swapchain_size = get_recommended_target_size();
+	if (swapchain_size != render_state.main_swapchain_size) {
+		// Out with the old.
+		free_main_swapchains();
+
+		// In with the new.
+		create_main_swapchains(swapchain_size);
+	}
+
 	void *view_locate_info_next_pointer = nullptr;
 	for (OpenXRExtensionWrapper *extension : frame_info_extensions) {
 		void *np = extension->set_view_locate_info_and_get_next_pointer(view_locate_info_next_pointer);
@@ -2522,39 +2480,6 @@ bool OpenXRAPI::pre_draw_viewport(RID p_render_target) {
 		return false;
 	}
 
-	Size2i swapchain_size = get_recommended_target_size();
-	bool should_recreate_swapchain = (swapchain_size != render_state.main_swapchain_size);
-
-	OpenXRFBFoveationExtension *fov_ext = OpenXRFBFoveationExtension::get_singleton();
-	if (fov_ext) {
-		bool subsampled_images_enabled = fov_ext->is_foveation_with_subsampled_images_enabled();
-
-		// Mark subsampled images as enabled on the render target (so we try to use them).
-		RSG::texture_storage->render_target_set_subsampled_enabled(p_render_target, subsampled_images_enabled);
-
-		// But check if they are "allowed", because they may not work if we are using
-		// any incompatible rendering features.
-		bool subsampled_images_allowed = RSG::texture_storage->render_target_is_subsampled_allowed(p_render_target);
-		fov_ext->set_foveation_with_subsampled_images_active(subsampled_images_allowed);
-
-		bool use_subsampled_images = subsampled_images_enabled && subsampled_images_allowed;
-		if (render_state.use_subsampled_images != use_subsampled_images) {
-			render_state.use_subsampled_images = use_subsampled_images;
-			if (!subsampled_images_allowed) {
-				WARN_PRINT("Foveation with subsampled images was enabled, but rendering features are in use that have forced it to be disabled.");
-			}
-			should_recreate_swapchain = true;
-		}
-	}
-
-	if (should_recreate_swapchain) {
-		// Out with the old.
-		free_main_swapchains();
-
-		// In with the new.
-		create_main_swapchains(swapchain_size);
-	}
-
 	// Acquire our images
 	for (int i = 0; i < OPENXR_SWAPCHAIN_MAX; i++) {
 		if (!render_state.main_swapchains[i].is_image_acquired() && render_state.main_swapchains[i].get_swapchain() != XR_NULL_HANDLE) {
@@ -2749,15 +2674,6 @@ void OpenXRAPI::end_frame() {
 		layer_flags |= XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT;
 	}
 
-	void *projection_layer_next_pointer = nullptr;
-	for (OpenXRExtensionWrapper *extension : projection_layer_extensions) {
-		void *np = extension->set_projection_layer_and_get_next_pointer(projection_layer_next_pointer);
-		if (np != nullptr) {
-			projection_layer_next_pointer = np;
-		}
-	}
-
-	render_state.projection_layer.next = projection_layer_next_pointer;
 	render_state.projection_layer.layerFlags = layer_flags;
 	render_state.projection_layer.space = render_state.play_space;
 	render_state.projection_layer.viewCount = (uint32_t)render_state.projection_views.size();
@@ -2908,21 +2824,6 @@ void OpenXRAPI::set_foveation_dynamic(bool p_foveation_dynamic) {
 	}
 }
 
-bool OpenXRAPI::get_foveation_with_subsampled_images() const {
-	OpenXRFBFoveationExtension *fov_ext = OpenXRFBFoveationExtension::get_singleton();
-	if (fov_ext != nullptr) {
-		return fov_ext->is_foveation_with_subsampled_images_enabled();
-	}
-	return false;
-}
-
-void OpenXRAPI::set_foveation_with_subsampled_images(bool p_enabled) {
-	OpenXRFBFoveationExtension *fov_ext = OpenXRFBFoveationExtension::get_singleton();
-	if (fov_ext != nullptr) {
-		fov_ext->set_foveation_with_subsampled_images_enabled(p_enabled);
-	}
-}
-
 Size2 OpenXRAPI::get_play_space_bounds() const {
 	Size2 ret;
 
@@ -3023,7 +2924,6 @@ OpenXRAPI::OpenXRAPI() {
 OpenXRAPI::~OpenXRAPI() {
 	composition_layer_providers.clear();
 	frame_info_extensions.clear();
-	projection_layer_extensions.clear();
 	supported_extensions.clear();
 	layer_properties.clear();
 
@@ -4078,14 +3978,6 @@ void OpenXRAPI::unregister_frame_info_extension(OpenXRExtensionWrapper *p_extens
 	frame_info_extensions.erase(p_extension);
 }
 
-void OpenXRAPI::register_projection_layer_extension(OpenXRExtensionWrapper *p_extension) {
-	projection_layer_extensions.append(p_extension);
-}
-
-void OpenXRAPI::unregister_projection_layer_extension(OpenXRExtensionWrapper *p_extension) {
-	projection_layer_extensions.erase(p_extension);
-}
-
 const Vector<XrEnvironmentBlendMode> OpenXRAPI::get_supported_environment_blend_modes() {
 	return supported_environment_blend_modes;
 }
diff --git a/engine/modules/openxr/openxr_api.h b/engine/modules/openxr/openxr_api.h
index f241b54d..f1733391 100644
--- a/engine/modules/openxr/openxr_api.h
+++ b/engine/modules/openxr/openxr_api.h
@@ -41,6 +41,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/vector.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_pose.h"
 
 #include <openxr/openxr.h>
@@ -106,9 +107,6 @@ private:
 	// frame info extensions
 	Vector<OpenXRExtensionWrapper *> frame_info_extensions;
 
-	// projection layer extensions
-	Vector<OpenXRExtensionWrapper *> projection_layer_extensions;
-
 	// view configuration
 	LocalVector<XrViewConfigurationType> supported_view_configuration_types;
 
@@ -364,7 +362,6 @@ private:
 		LocalVector<XrCompositionLayerProjectionView> projection_views;
 		LocalVector<XrCompositionLayerDepthInfoKHR> depth_views; // Only used by Composition Layer Depth Extension if available
 		bool submit_depth_buffer = false; // if set to true we submit depth buffers to OpenXR if a suitable extension is enabled.
-		bool use_subsampled_images = true; // We need to default to true for the warning to be shown if we fallback immediately at startup.
 		bool view_pose_valid = false;
 
 		double z_near = 0.0;
@@ -392,16 +389,68 @@ private:
 	static void _set_render_state_render_region_rt(const Rect2i &p_render_region);
 	static void _update_main_swapchain_size_rt();
 
-	void allocate_view_buffers(uint32_t p_view_count, bool p_submit_depth_buffer);
-	void set_render_session_running(bool p_is_running);
-	void set_render_display_info(XrTime p_predicted_display_time, bool p_should_render);
-	void set_render_play_space(XrSpace p_play_space);
-	void set_render_environment_blend_mode(XrEnvironmentBlendMode p_mode);
-	void set_render_state_multiplier(double p_render_target_size_multiplier);
-	void set_render_state_render_region(const Rect2i &p_render_region);
+	_FORCE_INLINE_ void allocate_view_buffers(uint32_t p_view_count, bool p_submit_depth_buffer) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_allocate_view_buffers_rt).bind(p_view_count, p_submit_depth_buffer));
+	}
+
+	_FORCE_INLINE_ void set_render_session_running(bool p_is_running) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_session_running_rt).bind(p_is_running));
+	}
+
+	_FORCE_INLINE_ void set_render_display_info(XrTime p_predicted_display_time, bool p_should_render) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_display_info_rt).bind(p_predicted_display_time, p_should_render));
+	}
+
+	_FORCE_INLINE_ void set_render_play_space(XrSpace p_play_space) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_play_space_rt).bind(uint64_t(p_play_space)));
+	}
+
+	_FORCE_INLINE_ void set_render_environment_blend_mode(XrEnvironmentBlendMode p_mode) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_environment_blend_mode_rt).bind((int32_t)p_mode));
+	}
+
+	_FORCE_INLINE_ void set_render_state_multiplier(double p_render_target_size_multiplier) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_state_multiplier_rt).bind(p_render_target_size_multiplier));
+	}
+
+	_FORCE_INLINE_ void set_render_state_render_region(const Rect2i &p_render_region) {
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_set_render_state_render_region_rt).bind(p_render_region));
+	}
 
 public:
-	void update_main_swapchain_size();
+	_FORCE_INLINE_ void update_main_swapchain_size() {
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&OpenXRAPI::_update_main_swapchain_size_rt));
+	}
 
 	XrVersion get_openxr_version() const { return openxr_version; }
 	XrInstance get_instance() const { return instance; }
@@ -453,7 +502,7 @@ public:
 	void set_form_factor(XrFormFactor p_form_factor);
 	XrFormFactor get_form_factor() const { return form_factor; }
 
-	uint32_t get_view_count() const;
+	uint32_t get_view_count();
 	void set_view_configuration(XrViewConfigurationType p_view_configuration);
 	XrViewConfigurationType get_view_configuration() const { return view_configuration; }
 
@@ -472,7 +521,6 @@ public:
 	void finish();
 
 	_FORCE_INLINE_ XrSpace get_play_space() const { return play_space; }
-	_FORCE_INLINE_ XrSpace get_view_space() const { return view_space; }
 	_FORCE_INLINE_ XrTime get_predicted_display_time() { return frame_state.predictedDisplayTime; }
 	_FORCE_INLINE_ XrTime get_next_frame_time() { return frame_state.predictedDisplayTime + frame_state.predictedDisplayPeriod; }
 	_FORCE_INLINE_ bool can_render() {
@@ -525,9 +573,6 @@ public:
 	bool get_foveation_dynamic() const;
 	void set_foveation_dynamic(bool p_foveation_dynamic);
 
-	bool get_foveation_with_subsampled_images() const;
-	void set_foveation_with_subsampled_images(bool p_enabled);
-
 	// Play space.
 	Size2 get_play_space_bounds() const;
 
@@ -586,9 +631,6 @@ public:
 	void register_frame_info_extension(OpenXRExtensionWrapper *p_extension);
 	void unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension);
 
-	void register_projection_layer_extension(OpenXRExtensionWrapper *p_extension);
-	void unregister_projection_layer_extension(OpenXRExtensionWrapper *p_extension);
-
 	const Vector<XrEnvironmentBlendMode> get_supported_environment_blend_modes();
 
 	bool is_environment_blend_mode_supported(XrEnvironmentBlendMode p_blend_mode) const;
diff --git a/engine/modules/openxr/openxr_api_extension.compat.inc b/engine/modules/openxr/openxr_api_extension.compat.inc
index 3ebbda64..23739799 100644
--- a/engine/modules/openxr/openxr_api_extension.compat.inc
+++ b/engine/modules/openxr/openxr_api_extension.compat.inc
@@ -31,9 +31,6 @@
 #ifndef DISABLE_DEPRECATED
 
 #include "extensions/openxr_extension_wrapper_extension.h"
-#include "openxr_api_extension.h"
-
-#include "core/object/class_db.h"
 
 void OpenXRAPIExtension::_register_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
 	register_composition_layer_provider(p_extension);
diff --git a/engine/modules/openxr/openxr_api_extension.cpp b/engine/modules/openxr/openxr_api_extension.cpp
index f21bba75..750d9bb9 100644
--- a/engine/modules/openxr/openxr_api_extension.cpp
+++ b/engine/modules/openxr/openxr_api_extension.cpp
@@ -29,13 +29,9 @@
 /**************************************************************************/
 
 #include "openxr_api_extension.h"
-#include "openxr_api_extension.compat.inc"
 
 #include "extensions/openxr_extension_wrapper.h"
-#include "openxr_api.h"
-
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h" // ERR_NOT_ON_RENDER_THREAD_V
+#include "openxr_api_extension.compat.inc"
 
 void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_openxr_version"), &OpenXRAPIExtension::get_openxr_version);
@@ -54,9 +50,6 @@ void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("end_debug_label_region"), &OpenXRAPIExtension::end_debug_label_region);
 	ClassDB::bind_method(D_METHOD("insert_debug_label", "label_name"), &OpenXRAPIExtension::insert_debug_label);
 
-	ClassDB::bind_method(D_METHOD("get_view_count"), &OpenXRAPIExtension::get_view_count);
-	ClassDB::bind_method(D_METHOD("get_view_configuration"), &OpenXRAPIExtension::get_view_configuration);
-
 	ClassDB::bind_method(D_METHOD("is_initialized"), &OpenXRAPIExtension::is_initialized);
 	ClassDB::bind_method(D_METHOD("is_running"), &OpenXRAPIExtension::is_running);
 
@@ -80,9 +73,6 @@ void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("register_frame_info_extension", "extension"), &OpenXRAPIExtension::register_frame_info_extension);
 	ClassDB::bind_method(D_METHOD("unregister_frame_info_extension", "extension"), &OpenXRAPIExtension::unregister_frame_info_extension);
 
-	ClassDB::bind_method(D_METHOD("register_projection_layer_extension", "extension"), &OpenXRAPIExtension::register_projection_layer_extension);
-	ClassDB::bind_method(D_METHOD("unregister_projection_layer_extension", "extension"), &OpenXRAPIExtension::unregister_projection_layer_extension);
-
 	ClassDB::bind_method(D_METHOD("get_render_state_z_near"), &OpenXRAPIExtension::get_render_state_z_near);
 	ClassDB::bind_method(D_METHOD("get_render_state_z_far"), &OpenXRAPIExtension::get_render_state_z_far);
 
@@ -193,16 +183,6 @@ void OpenXRAPIExtension::insert_debug_label(const String &p_label_name) {
 	OpenXRAPI::get_singleton()->insert_debug_label(p_label_name);
 }
 
-uint32_t OpenXRAPIExtension::get_view_count() const {
-	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), 0);
-	return (uint32_t)OpenXRAPI::get_singleton()->get_view_count();
-}
-
-uint64_t OpenXRAPIExtension::get_view_configuration() const {
-	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), 0);
-	return (uint64_t)OpenXRAPI::get_singleton()->get_view_configuration();
-}
-
 bool OpenXRAPIExtension::is_initialized() {
 	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), false);
 	return OpenXRAPI::get_singleton()->is_initialized();
@@ -288,16 +268,6 @@ void OpenXRAPIExtension::unregister_frame_info_extension(OpenXRExtensionWrapper
 	OpenXRAPI::get_singleton()->unregister_frame_info_extension(p_extension);
 }
 
-void OpenXRAPIExtension::register_projection_layer_extension(OpenXRExtensionWrapper *p_extension) {
-	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
-	OpenXRAPI::get_singleton()->register_projection_layer_extension(p_extension);
-}
-
-void OpenXRAPIExtension::unregister_projection_layer_extension(OpenXRExtensionWrapper *p_extension) {
-	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
-	OpenXRAPI::get_singleton()->unregister_projection_layer_extension(p_extension);
-}
-
 double OpenXRAPIExtension::get_render_state_z_near() {
 	ERR_NOT_ON_RENDER_THREAD_V(0.0);
 	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), 0.0);
diff --git a/engine/modules/openxr/openxr_api_extension.h b/engine/modules/openxr/openxr_api_extension.h
index bd4ee3e3..63dd1c2f 100644
--- a/engine/modules/openxr/openxr_api_extension.h
+++ b/engine/modules/openxr/openxr_api_extension.h
@@ -30,12 +30,12 @@
 
 #pragma once
 
+#include "openxr_api.h"
+
 #include "core/object/ref_counted.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 
-#include <openxr/openxr.h>
-
 class OpenXRExtensionWrapper;
 class OpenXRExtensionWrapperExtension;
 
@@ -77,9 +77,6 @@ public:
 	void end_debug_label_region();
 	void insert_debug_label(const String &p_label_name);
 
-	uint32_t get_view_count() const;
-	uint64_t get_view_configuration() const;
-
 	bool is_initialized();
 	bool is_running();
 
@@ -103,9 +100,6 @@ public:
 	void register_frame_info_extension(OpenXRExtensionWrapper *p_extension);
 	void unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension);
 
-	void register_projection_layer_extension(OpenXRExtensionWrapper *p_extension);
-	void unregister_projection_layer_extension(OpenXRExtensionWrapper *p_extension);
-
 	double get_render_state_z_near();
 	double get_render_state_z_far();
 
diff --git a/engine/modules/openxr/openxr_interface.cpp b/engine/modules/openxr/openxr_interface.cpp
index 38e7916a..26949e78 100644
--- a/engine/modules/openxr/openxr_interface.cpp
+++ b/engine/modules/openxr/openxr_interface.cpp
@@ -30,18 +30,13 @@
 
 #include "openxr_interface.h"
 
-#include "action_map/openxr_action_map.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
+
 #include "extensions/openxr_eye_gaze_interaction.h"
 #include "extensions/openxr_hand_interaction_extension.h"
 #include "extensions/openxr_performance_settings_extension.h"
-#include "extensions/openxr_user_presence_extension.h"
-
-#include "core/config/engine.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/renderer_compositor.h"
 
 #include <openxr/openxr.h>
 
@@ -63,12 +58,6 @@ void OpenXRInterface::_bind_methods() {
 	// State
 	ClassDB::bind_method(D_METHOD("get_session_state"), &OpenXRInterface::get_session_state);
 
-	// User presence
-	ADD_SIGNAL(MethodInfo("user_presence_changed", PropertyInfo(Variant::BOOL, "is_user_present")));
-
-	ClassDB::bind_method(D_METHOD("is_user_presence_supported"), &OpenXRInterface::is_user_presence_supported);
-	ClassDB::bind_method(D_METHOD("is_user_present"), &OpenXRInterface::is_user_present);
-
 	// Display refresh rate
 	ClassDB::bind_method(D_METHOD("get_display_refresh_rate"), &OpenXRInterface::get_display_refresh_rate);
 	ClassDB::bind_method(D_METHOD("set_display_refresh_rate", "refresh_rate"), &OpenXRInterface::set_display_refresh_rate);
@@ -90,10 +79,6 @@ void OpenXRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_foveation_dynamic", "foveation_dynamic"), &OpenXRInterface::set_foveation_dynamic);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "foveation_dynamic"), "set_foveation_dynamic", "get_foveation_dynamic");
 
-	ClassDB::bind_method(D_METHOD("get_foveation_with_subsampled_images"), &OpenXRInterface::get_foveation_with_subsampled_images);
-	ClassDB::bind_method(D_METHOD("set_foveation_with_subsampled_images", "enabled"), &OpenXRInterface::set_foveation_with_subsampled_images);
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "foveation_with_subsampled_images"), "set_foveation_with_subsampled_images", "get_foveation_with_subsampled_images");
-
 	// Action sets
 	ClassDB::bind_method(D_METHOD("is_action_set_active", "name"), &OpenXRInterface::is_action_set_active);
 	ClassDB::bind_method(D_METHOD("set_action_set_active", "name", "active"), &OpenXRInterface::set_action_set_active);
@@ -1030,22 +1015,6 @@ void OpenXRInterface::set_foveation_dynamic(bool p_foveation_dynamic) {
 	}
 }
 
-bool OpenXRInterface::get_foveation_with_subsampled_images() const {
-	if (openxr_api == nullptr) {
-		return false;
-	} else {
-		return openxr_api->get_foveation_with_subsampled_images();
-	}
-}
-
-void OpenXRInterface::set_foveation_with_subsampled_images(bool p_enabled) {
-	if (openxr_api == nullptr) {
-		return;
-	} else {
-		openxr_api->set_foveation_with_subsampled_images(p_enabled);
-	}
-}
-
 Size2 OpenXRInterface::get_render_target_size() {
 	if (openxr_api == nullptr) {
 		return Size2();
@@ -1277,13 +1246,13 @@ bool OpenXRInterface::pre_draw_viewport(RID p_render_target) {
 	}
 }
 
-Vector<RenderingServerTypes::BlitToScreen> OpenXRInterface::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
-	Vector<RenderingServerTypes::BlitToScreen> blit_to_screen;
+Vector<BlitToScreen> OpenXRInterface::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
+	Vector<BlitToScreen> blit_to_screen;
 
 #ifndef ANDROID_ENABLED
 	// If separate HMD we should output one eye to screen
 	if (p_screen_rect != Rect2()) {
-		RenderingServerTypes::BlitToScreen blit;
+		BlitToScreen blit;
 
 		blit.render_target = p_render_target;
 		blit.multi_view.use_layer = true;
@@ -1479,26 +1448,6 @@ OpenXRInterface::SessionState OpenXRInterface::get_session_state() {
 	return SESSION_STATE_UNKNOWN;
 }
 
-/** User Presence. */
-bool OpenXRInterface::is_user_presence_supported() const {
-	if (!openxr_api || !openxr_api->is_initialized()) {
-		return false;
-	} else {
-		OpenXRUserPresenceExtension *user_presence_ext = OpenXRUserPresenceExtension::get_singleton();
-		return user_presence_ext && user_presence_ext->is_active();
-	}
-}
-
-bool OpenXRInterface::is_user_present() const {
-	// If extension is unavailable or unsupported, we default to user is present.
-	if (!is_user_presence_supported()) {
-		return true;
-	} else {
-		OpenXRUserPresenceExtension *user_presence_ext = OpenXRUserPresenceExtension::get_singleton();
-		return user_presence_ext->is_user_present();
-	}
-}
-
 /** Hand tracking. */
 void OpenXRInterface::set_motion_range(const Hand p_hand, const HandMotionRange p_motion_range) {
 	ERR_FAIL_INDEX(p_hand, HAND_MAX);
diff --git a/engine/modules/openxr/openxr_interface.h b/engine/modules/openxr/openxr_interface.h
index d79a05f3..425ea46e 100644
--- a/engine/modules/openxr/openxr_interface.h
+++ b/engine/modules/openxr/openxr_interface.h
@@ -53,12 +53,12 @@
 // As some data is setup before we start rendering, and cleaned up
 // after we've stopped, that is accessed directly from both threads.
 
+#include "action_map/openxr_action_map.h"
 #include "extensions/openxr_hand_tracking_extension.h"
 #include "openxr_api.h"
 
 #include "servers/xr/xr_controller_tracker.h"
 #include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_vrs.h"
 
 // declare some default strings
 #define INTERACTION_PROFILE_NONE "/interaction_profiles/none"
@@ -170,9 +170,6 @@ public:
 	bool get_foveation_dynamic() const;
 	void set_foveation_dynamic(bool p_foveation_dynamic);
 
-	bool get_foveation_with_subsampled_images() const;
-	void set_foveation_with_subsampled_images(bool p_enabled);
-
 	float get_vrs_min_radius() const;
 	void set_vrs_min_radius(float p_vrs_min_radius);
 
@@ -196,7 +193,7 @@ public:
 	virtual void process() override;
 	virtual void pre_render() override;
 	bool pre_draw_viewport(RID p_render_target) override;
-	virtual Vector<RenderingServerTypes::BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
 	virtual void end_frame() override;
 
 	virtual bool is_passthrough_supported() override;
@@ -235,10 +232,6 @@ public:
 
 	SessionState get_session_state();
 
-	/** User presence. */
-	bool is_user_presence_supported() const;
-	bool is_user_present() const;
-
 	/** Hand tracking. */
 	enum Hand {
 		HAND_LEFT,
diff --git a/engine/modules/openxr/openxr_platform_inc.h b/engine/modules/openxr/openxr_platform_inc.h
index 112b8f05..20a6c25f 100644
--- a/engine/modules/openxr/openxr_platform_inc.h
+++ b/engine/modules/openxr/openxr_platform_inc.h
@@ -33,8 +33,6 @@
 // In various places we need to include platform definitions but we can't
 // include these in our normal header files as we'll end up with issues.
 
-// IWYU pragma: begin_keep
-
 #ifdef VULKAN_ENABLED
 #define XR_USE_GRAPHICS_API_VULKAN
 #include "drivers/vulkan/rendering_context_driver_vulkan.h"
@@ -57,7 +55,7 @@
 #endif // ANDROID_ENABLED
 #if defined(LINUXBSD_ENABLED) && defined(EGL_ENABLED)
 #ifdef GLAD_ENABLED
-#include <thirdparty/glad/glad/egl.h>
+#include "thirdparty/glad/glad/egl.h"
 #else
 #include <EGL/egl.h>
 #endif // GLAD_ENABLED
@@ -65,8 +63,8 @@
 #ifdef X11_ENABLED
 #define GL_GLEXT_PROTOTYPES 1
 #define GL3_PROTOTYPES 1
-#include <thirdparty/glad/glad/gl.h>
-#include <thirdparty/glad/glad/glx.h>
+#include "thirdparty/glad/glad/gl.h"
+#include "thirdparty/glad/glad/glx.h"
 #endif // X11_ENABLED
 #endif // defined(GLES3_ENABLED) && !defined(MACOS_ENABLED)
 
@@ -80,9 +78,9 @@
 #endif // X11_ENABLED
 
 #ifdef WINDOWS_ENABLED
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#include <unknwn.h> // codespell:ignore unknwn
+// Including windows.h here is absolutely evil, we shouldn't be doing this outside of platform
+// however due to the way the openxr headers are put together, we have no choice.
+#include <windows.h>
 #endif // WINDOWS_ENABLED
 
 #ifdef ANDROID_ENABLED
@@ -92,5 +90,3 @@
 
 // Include platform dependent structs.
 #include <openxr/openxr_platform.h>
-
-// IWYU pragma: end_keep
diff --git a/engine/modules/openxr/openxr_structure.cpp b/engine/modules/openxr/openxr_structure.cpp
index 390b732c..dc46b33b 100644
--- a/engine/modules/openxr/openxr_structure.cpp
+++ b/engine/modules/openxr/openxr_structure.cpp
@@ -30,15 +30,13 @@
 
 #include "openxr_structure.h"
 
-#include "core/object/class_db.h"
-
 void OpenXRStructureBase::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_structure_type"), &OpenXRStructureBase::_get_structure_type);
 
 	ClassDB::bind_method(D_METHOD("set_next", "entity"), &OpenXRStructureBase::set_next);
 	ClassDB::bind_method(D_METHOD("get_next"), &OpenXRStructureBase::get_next);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next", PROPERTY_HINT_RESOURCE_TYPE, OpenXRStructureBase::get_class_static()), "set_next", "get_next");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRStructureBase"), "set_next", "get_next");
 
 	GDVIRTUAL_BIND(_get_header, "next");
 }
diff --git a/engine/modules/openxr/openxr_structure.h b/engine/modules/openxr/openxr_structure.h
index 235bf986..057052db 100644
--- a/engine/modules/openxr/openxr_structure.h
+++ b/engine/modules/openxr/openxr_structure.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
-
-#include <openxr/openxr.h>
+#include "openxr_util.h"
+#include "util.h"
 
 // Base class for XrStructureType based headers
 class OpenXRStructureBase : public RefCounted {
diff --git a/engine/modules/openxr/openxr_util.cpp b/engine/modules/openxr/openxr_util.cpp
index 98ae209d..2feb7f1d 100644
--- a/engine/modules/openxr/openxr_util.cpp
+++ b/engine/modules/openxr/openxr_util.cpp
@@ -245,11 +245,11 @@ void OpenXRUtil::XrMatrix4x4f_CreateProjection(XrMatrix4x4f *result, const float
 
 // Creates a projection matrix based on the specified FOV.
 void OpenXRUtil::XrMatrix4x4f_CreateProjectionFov(XrMatrix4x4f *result, const XrFovf fov, const float nearZ, const float farZ) {
-	const float tanLeft = Math::tan(fov.angleLeft);
-	const float tanRight = Math::tan(fov.angleRight);
+	const float tanLeft = std::tan(fov.angleLeft);
+	const float tanRight = std::tan(fov.angleRight);
 
-	const float tanDown = Math::tan(fov.angleDown);
-	const float tanUp = Math::tan(fov.angleUp);
+	const float tanDown = std::tan(fov.angleDown);
+	const float tanUp = std::tan(fov.angleUp);
 
 	XrMatrix4x4f_CreateProjection(result, tanLeft, tanRight, tanUp, tanDown, nearZ, farZ);
 }
diff --git a/engine/modules/openxr/openxr_util.h b/engine/modules/openxr/openxr_util.h
index 57a50522..28e8fe82 100644
--- a/engine/modules/openxr/openxr_util.h
+++ b/engine/modules/openxr/openxr_util.h
@@ -36,10 +36,10 @@
 #include <openxr/openxr_reflection.h>
 
 #define XR_ENUM_CASE_STR(name, val) \
-	case name: \
+	case name:                      \
 		return #name;
-#define XR_ENUM_SWITCH(enumType, var) \
-	switch (var) { \
+#define XR_ENUM_SWITCH(enumType, var)                                                                                           \
+	switch (var) {                                                                                                              \
 		XR_LIST_ENUM_##enumType(XR_ENUM_CASE_STR) default : return "Unknown " #enumType ": " + String::num_int64(int64_t(var)); \
 	}
 
diff --git a/engine/modules/openxr/register_types.cpp b/engine/modules/openxr/register_types.cpp
index 90daacfd..0b73fcd6 100644
--- a/engine/modules/openxr/register_types.cpp
+++ b/engine/modules/openxr/register_types.cpp
@@ -30,6 +30,8 @@
 
 #include "register_types.h"
 
+#include "modules/modules_enabled.gen.h"
+
 #include "action_map/openxr_action.h"
 #include "action_map/openxr_action_map.h"
 #include "action_map/openxr_action_set.h"
@@ -39,19 +41,21 @@
 #include "openxr_api_extension.h"
 #include "openxr_interface.h"
 
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-
-#include "modules/modules_enabled.gen.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "extensions/openxr_extension_wrapper_extension.h"
-
 #include "scene/openxr_hand.h"
 #endif // DISABLE_DEPRECATED
 
+#include "scene/openxr_composition_layer.h"
+#include "scene/openxr_composition_layer_cylinder.h"
+#include "scene/openxr_composition_layer_equirect.h"
+#include "scene/openxr_composition_layer_quad.h"
+#ifdef MODULE_GLTF_ENABLED
+#include "scene/openxr_render_model.h"
+#include "scene/openxr_render_model_manager.h"
+#endif
+#include "scene/openxr_visibility_mask.h"
+
 #include "extensions/openxr_android_thread_settings_extension.h"
 #include "extensions/openxr_composition_layer_depth_extension.h"
 #include "extensions/openxr_composition_layer_extension.h"
@@ -66,7 +70,6 @@
 #include "extensions/openxr_htc_controller_extension.h"
 #include "extensions/openxr_htc_vive_tracker_extension.h"
 #include "extensions/openxr_huawei_controller_extension.h"
-#include "extensions/openxr_khr_generic_controller_extension.h"
 #include "extensions/openxr_local_floor_extension.h"
 #include "extensions/openxr_meta_controller_extension.h"
 #include "extensions/openxr_ml2_controller_extension.h"
@@ -74,29 +77,19 @@
 #include "extensions/openxr_palm_pose_extension.h"
 #include "extensions/openxr_performance_settings_extension.h"
 #include "extensions/openxr_pico_controller_extension.h"
-#include "extensions/openxr_user_presence_extension.h"
+#ifdef MODULE_GLTF_ENABLED
+#include "extensions/openxr_render_model_extension.h"
+#endif
 #include "extensions/openxr_valve_analog_threshold_extension.h"
 #include "extensions/openxr_valve_controller_extension.h"
 #include "extensions/openxr_visibility_mask_extension.h"
 #include "extensions/openxr_wmr_controller_extension.h"
-#include "extensions/spatial_entities/openxr_spatial_anchor.h"
 #include "extensions/spatial_entities/openxr_spatial_entity_extension.h"
+
+#include "extensions/spatial_entities/openxr_spatial_anchor.h"
 #include "extensions/spatial_entities/openxr_spatial_marker_tracking.h"
 #include "extensions/spatial_entities/openxr_spatial_plane_tracking.h"
 
-#include "scene/openxr_composition_layer.h"
-#include "scene/openxr_composition_layer_cylinder.h"
-#include "scene/openxr_composition_layer_equirect.h"
-#include "scene/openxr_composition_layer_quad.h"
-#include "scene/openxr_visibility_mask.h"
-
-#ifdef MODULE_GLTF_ENABLED
-#include "extensions/openxr_render_model_extension.h"
-
-#include "scene/openxr_render_model.h"
-#include "scene/openxr_render_model_manager.h"
-#endif
-
 #ifdef TOOLS_ENABLED
 #include "editor/openxr_editor_plugin.h"
 #endif
@@ -105,11 +98,15 @@
 #include "extensions/platform/openxr_android_extension.h"
 #endif
 
+#include "core/config/project_settings.h"
+#include "main/main.h"
+
 #ifdef TOOLS_ENABLED
+#include "editor/editor_node.h"
+
 #include "editor/openxr_binding_modifier_editor.h"
 #include "editor/openxr_interaction_profile_editor.h"
-//
-#include "editor/editor_node.h"
+
 #endif
 
 static OpenXRAPI *openxr_api = nullptr;
@@ -177,7 +174,6 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRVisibilityMaskExtension));
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRPerformanceSettingsExtension));
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRValveControllerExtension));
-			OpenXRAPI::register_extension_wrapper(memnew(OpenXRKHRGenericController));
 
 			// Futures extension has to be registered as a singleton so extensions can access it.
 			OpenXRFutureExtension *future_extension = memnew(OpenXRFutureExtension);
@@ -218,10 +214,6 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 			OpenXRAPI::register_extension_wrapper(android_thread_settings);
 			Engine::get_singleton()->add_singleton(Engine::Singleton("OpenXRAndroidThreadSettingsExtension", android_thread_settings));
 
-			// Register user presence extension as a singleton
-			OpenXRUserPresenceExtension *user_presence_extension = memnew(OpenXRUserPresenceExtension);
-			OpenXRAPI::register_extension_wrapper(user_presence_extension);
-
 			// register gated extensions
 			if (int(GLOBAL_GET("xr/openxr/extensions/debug_utils")) > 0) {
 				OpenXRAPI::register_extension_wrapper(memnew(OpenXRDebugUtilsExtension));
@@ -245,7 +237,7 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 			openxr_api = memnew(OpenXRAPI);
 			ERR_FAIL_NULL(openxr_api);
 
-			if (!openxr_api->initialize(OS::get_singleton()->get_current_rendering_driver_name())) {
+			if (!openxr_api->initialize(Main::get_rendering_driver_name())) {
 				const char *init_error_message =
 						"OpenXR was requested but failed to start.\n"
 						"HMD was not detected or a required feature was not supported.\n\n"
@@ -353,8 +345,8 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
 		GDREGISTER_ABSTRACT_CLASS(OpenXRInteractionProfileEditorBase);
-		GDREGISTER_VIRTUAL_CLASS(OpenXRInteractionProfileEditor);
-		GDREGISTER_VIRTUAL_CLASS(OpenXRBindingModifierEditor);
+		GDREGISTER_CLASS(OpenXRInteractionProfileEditor);
+		GDREGISTER_CLASS(OpenXRBindingModifierEditor);
 
 		EditorNode::add_init_callback(_editor_init);
 	}
diff --git a/engine/modules/openxr/scene/openxr_composition_layer.cpp b/engine/modules/openxr/scene/openxr_composition_layer.cpp
index 852eeabf..a6fe5ae8 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer.cpp
@@ -34,9 +34,6 @@
 #include "../openxr_api.h"
 #include "../openxr_interface.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "scene/main/viewport.h"
@@ -67,9 +64,9 @@ OpenXRCompositionLayer::OpenXRCompositionLayer() {
 	}
 
 	XRServer::get_singleton()->connect("reference_frame_changed", callable_mp(this, &OpenXRCompositionLayer::update_transform));
-	XRServer::get_singleton()->connect("world_origin_changed", callable_mp(this, &OpenXRCompositionLayer::update_transform));
 
 	set_process_internal(true);
+	set_notify_local_transform(true);
 
 	if (Engine::get_singleton()->is_editor_hint()) {
 		// In the editor, create the fallback right away.
@@ -149,9 +146,6 @@ void OpenXRCompositionLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_border_color", "color"), &OpenXRCompositionLayer::set_border_color);
 	ClassDB::bind_method(D_METHOD("get_border_color"), &OpenXRCompositionLayer::get_border_color);
 
-	ClassDB::bind_method(D_METHOD("set_eye_visibility", "eye_visibility"), &OpenXRCompositionLayer::set_eye_visibility);
-	ClassDB::bind_method(D_METHOD("get_eye_visibility"), &OpenXRCompositionLayer::get_eye_visibility);
-
 	ClassDB::bind_method(D_METHOD("intersects_ray", "origin", "direction"), &OpenXRCompositionLayer::intersects_ray);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "layer_viewport", PROPERTY_HINT_NODE_TYPE, "SubViewport"), "set_layer_viewport", "get_layer_viewport");
@@ -161,7 +155,6 @@ void OpenXRCompositionLayer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sort_order", PROPERTY_HINT_NONE, ""), "set_sort_order", "get_sort_order");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "alpha_blend", PROPERTY_HINT_NONE, ""), "set_alpha_blend", "get_alpha_blend");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enable_hole_punch", PROPERTY_HINT_NONE, ""), "set_enable_hole_punch", "get_enable_hole_punch");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "eye_visibility", PROPERTY_HINT_ENUM, "Both,Left,Right"), "set_eye_visibility", "get_eye_visibility");
 
 	ADD_GROUP("Swapchain State", "swapchain_state_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_min_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Cubic"), "set_min_filter", "get_min_filter");
@@ -197,17 +190,13 @@ void OpenXRCompositionLayer::_bind_methods() {
 	BIND_ENUM_CONSTANT(SWIZZLE_ALPHA);
 	BIND_ENUM_CONSTANT(SWIZZLE_ZERO);
 	BIND_ENUM_CONSTANT(SWIZZLE_ONE);
-
-	BIND_ENUM_CONSTANT(EYE_VISIBILITY_BOTH);
-	BIND_ENUM_CONSTANT(EYE_VISIBILITY_LEFT);
-	BIND_ENUM_CONSTANT(EYE_VISIBILITY_RIGHT);
 }
 
 bool OpenXRCompositionLayer::_should_use_fallback_node() {
 	if (Engine::get_singleton()->is_editor_hint() || openxr_api == nullptr) {
 		return true;
 	} else if (openxr_session_running) {
-		return enable_hole_punch || !is_natively_supported();
+		return enable_hole_punch || (!is_natively_supported() && !use_android_surface);
 	}
 	return false;
 }
@@ -221,7 +210,7 @@ void OpenXRCompositionLayer::_create_fallback_node() {
 }
 
 void OpenXRCompositionLayer::_remove_fallback_node() {
-	ERR_FAIL_COND(fallback == nullptr);
+	ERR_FAIL_COND(fallback != nullptr);
 	remove_child(fallback);
 	fallback->queue_free();
 	fallback = nullptr;
@@ -256,7 +245,7 @@ void OpenXRCompositionLayer::_clear_composition_layer() {
 }
 
 void OpenXRCompositionLayer::_viewport_size_changed() {
-	if (layer_viewport && openxr_session_running && composition_layer_extension && is_natively_supported() && is_visible_in_tree() && is_inside_tree()) {
+	if (layer_viewport && openxr_session_running && composition_layer_extension && is_natively_supported() && is_visible() && is_inside_tree()) {
 		composition_layer_extension->composition_layer_set_viewport(composition_layer, layer_viewport->get_viewport_rid(), layer_viewport->get_size());
 	}
 }
@@ -281,32 +270,7 @@ void OpenXRCompositionLayer::_on_openxr_session_stopping() {
 
 void OpenXRCompositionLayer::update_transform() {
 	if (composition_layer_extension) {
-		XRCamera3D *ancestor_camera = _get_xrcamera3d_ancestor();
-		bool parent_is_xr_camera = Object::cast_to<XRCamera3D>(get_parent()) != nullptr;
-		bool parent_is_xr_origin = Object::cast_to<XROrigin3D>(get_parent()) != nullptr;
-		OpenXRCompositionLayerExtension::PoseSpace new_pose_space;
-
-		// Automatically set the PoseSpace to POSE_HEAD_LOCKED if layer has an XRCamera3D ancestor.
-		if (ancestor_camera) {
-			new_pose_space = OpenXRCompositionLayerExtension::PoseSpace::POSE_HEAD_LOCKED;
-		} else {
-			new_pose_space = OpenXRCompositionLayerExtension::PoseSpace::POSE_WORLD_LOCKED;
-		}
-
-		Transform3D xf;
-		if (parent_is_xr_origin || parent_is_xr_camera) {
-			xf = get_transform();
-		} else {
-			if (ancestor_camera) {
-				xf = ancestor_camera->get_global_transform().affine_inverse() * get_global_transform();
-			} else {
-				xf = XRServer::get_singleton()->get_world_origin().affine_inverse() * get_global_transform();
-			}
-		}
-
-		// Pose space must be set first, as composition_layer_set_transform() depends on it.
-		composition_layer_extension->composition_layer_set_pose_space(composition_layer, new_pose_space);
-		composition_layer_extension->composition_layer_set_transform(composition_layer, xf);
+		composition_layer_extension->composition_layer_set_transform(composition_layer, get_transform());
 	}
 }
 
@@ -315,7 +279,7 @@ void OpenXRCompositionLayer::update_fallback_mesh() {
 }
 
 bool OpenXRCompositionLayer::_should_register() {
-	return !registered && openxr_session_running && is_inside_tree() && is_visible_in_tree() && is_natively_supported();
+	return !registered && openxr_session_running && is_inside_tree() && is_visible() && is_natively_supported();
 }
 
 bool OpenXRCompositionLayer::is_viewport_in_use(SubViewport *p_viewport) {
@@ -361,8 +325,7 @@ void OpenXRCompositionLayer::set_layer_viewport(SubViewport *p_viewport) {
 
 	if (fallback) {
 		_reset_fallback_material();
-	}
-	if (openxr_session_running && composition_layer_extension && is_visible_in_tree() && is_inside_tree() && is_natively_supported()) {
+	} else if (openxr_session_running && composition_layer_extension && is_visible() && is_inside_tree()) {
 		if (layer_viewport) {
 			composition_layer_extension->composition_layer_set_viewport(composition_layer, layer_viewport->get_viewport_rid(), layer_viewport->get_size());
 		} else {
@@ -643,20 +606,6 @@ Color OpenXRCompositionLayer::get_border_color() const {
 	return border_color;
 }
 
-void OpenXRCompositionLayer::set_eye_visibility(EyeVisibility p_eye_visibility) {
-	if (eye_visibility == p_eye_visibility) {
-		return;
-	}
-	eye_visibility = p_eye_visibility;
-	if (composition_layer_extension) {
-		composition_layer_extension->composition_layer_set_eye_visibility(composition_layer, (OpenXRCompositionLayerExtension::EyeVisibility)p_eye_visibility);
-	}
-}
-
-OpenXRCompositionLayer::EyeVisibility OpenXRCompositionLayer::get_eye_visibility() const {
-	return eye_visibility;
-}
-
 Ref<JavaObject> OpenXRCompositionLayer::get_android_surface() {
 	if (composition_layer_extension) {
 		return composition_layer_extension->composition_layer_get_android_surface(composition_layer);
@@ -727,38 +676,24 @@ void OpenXRCompositionLayer::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (is_natively_supported() && openxr_session_running && is_inside_tree()) {
-				if (is_visible_in_tree()) {
+				if (is_visible()) {
 					_setup_composition_layer();
-					update_transform();
 				} else {
 					_clear_composition_layer();
 				}
 			}
 			update_configuration_warnings();
 		} break;
-		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED:
-		case NOTIFICATION_TRANSFORM_CHANGED: {
+		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: {
 			update_transform();
 			update_configuration_warnings();
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 			if (layer_viewport && is_viewport_in_use(layer_viewport)) {
 				_clear_composition_layer();
-			} else if (openxr_session_running && is_visible_in_tree()) {
+			} else if (openxr_session_running && is_visible()) {
 				_setup_composition_layer();
 			}
-			update_transform();
-		} break;
-		case NOTIFICATION_PARENTED: {
-			// Enables NOTIFICATION_LOCAL_TRANSFORM_CHANGED when XROrigin3D or XRCamera3D are the parents
-			// since that notification happens less frequently than NOTIFICATION_TRANSFORM_CHANGED.
-			bool parent_is_xr_camera = Object::cast_to<XRCamera3D>(get_parent()) != nullptr;
-			bool parent_is_xr_origin = Object::cast_to<XROrigin3D>(get_parent()) != nullptr;
-			bool enable_local_transform_notification = parent_is_xr_camera || parent_is_xr_origin;
-			set_notify_local_transform(enable_local_transform_notification);
-			set_notify_transform(!enable_local_transform_notification);
-
-			update_transform();
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 			// This will clean up existing resources.
@@ -821,22 +756,16 @@ void OpenXRCompositionLayer::_validate_property(PropertyInfo &p_property) const
 	}
 }
 
-XRCamera3D *OpenXRCompositionLayer::_get_xrcamera3d_ancestor() const {
-	Node *parent = get_parent();
-	while (parent != nullptr) {
-		XRCamera3D *camera = Object::cast_to<XRCamera3D>(parent);
-		if (camera != nullptr) {
-			return camera;
-		}
-
-		parent = parent->get_parent();
-	}
-	return nullptr;
-}
-
 PackedStringArray OpenXRCompositionLayer::get_configuration_warnings() const {
 	PackedStringArray warnings = Node3D::get_configuration_warnings();
 
+	if (is_visible() && is_inside_tree()) {
+		XROrigin3D *origin = Object::cast_to<XROrigin3D>(get_parent());
+		if (origin == nullptr) {
+			warnings.push_back(RTR("OpenXR composition layers must have an XROrigin3D node as their parent."));
+		}
+	}
+
 	if (!get_transform().basis.is_orthonormal()) {
 		warnings.push_back(RTR("OpenXR composition layers must have orthonormalized transforms (ie. no scale or shearing)."));
 	}
diff --git a/engine/modules/openxr/scene/openxr_composition_layer.h b/engine/modules/openxr/scene/openxr_composition_layer.h
index b4ea026d..1af849a9 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer.h
@@ -30,17 +30,16 @@
 
 #pragma once
 
-#include "scene/3d/node_3d.h"
-
 #include <openxr/openxr.h>
 
+#include "scene/3d/node_3d.h"
+
 class JavaObject;
 class MeshInstance3D;
 class Mesh;
 class OpenXRAPI;
 class OpenXRCompositionLayerExtension;
 class SubViewport;
-class XRCamera3D;
 
 class OpenXRCompositionLayer : public Node3D {
 	GDCLASS(OpenXRCompositionLayer, Node3D);
@@ -79,13 +78,6 @@ public:
 		SWIZZLE_ONE,
 	};
 
-	// Must be identical to EyeVisibility enum definition in OpenXRCompositionLayerExtension.
-	enum EyeVisibility {
-		EYE_VISIBILITY_BOTH,
-		EYE_VISIBILITY_LEFT,
-		EYE_VISIBILITY_RIGHT,
-	};
-
 protected:
 	RID composition_layer;
 
@@ -114,7 +106,6 @@ private:
 	Swizzle alpha_swizzle = SWIZZLE_ALPHA;
 	float max_anisotropy = 1.0;
 	Color border_color = { 0.0, 0.0, 0.0, 0.0 };
-	EyeVisibility eye_visibility = EYE_VISIBILITY_BOTH;
 
 	bool _should_use_fallback_node();
 	void _create_fallback_node();
@@ -126,8 +117,6 @@ private:
 
 	void _viewport_size_changed();
 
-	XRCamera3D *_get_xrcamera3d_ancestor() const;
-
 protected:
 	OpenXRAPI *openxr_api = nullptr;
 	OpenXRCompositionLayerExtension *composition_layer_extension = nullptr;
@@ -214,9 +203,6 @@ public:
 	void set_border_color(const Color &p_color);
 	Color get_border_color() const;
 
-	void set_eye_visibility(EyeVisibility p_eye_visibility);
-	EyeVisibility get_eye_visibility() const;
-
 	virtual PackedStringArray get_configuration_warnings() const override;
 
 	virtual Vector2 intersects_ray(const Vector3 &p_origin, const Vector3 &p_direction) const;
@@ -228,4 +214,3 @@ VARIANT_ENUM_CAST(OpenXRCompositionLayer::Filter)
 VARIANT_ENUM_CAST(OpenXRCompositionLayer::MipmapMode)
 VARIANT_ENUM_CAST(OpenXRCompositionLayer::Wrap)
 VARIANT_ENUM_CAST(OpenXRCompositionLayer::Swizzle)
-VARIANT_ENUM_CAST(OpenXRCompositionLayer::EyeVisibility)
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
index 1f25f093..fc38e6a6 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
@@ -31,8 +31,8 @@
 #include "openxr_composition_layer_cylinder.h"
 
 #include "../extensions/openxr_composition_layer_extension.h"
+#include "../openxr_interface.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerCylinder::OpenXRCompositionLayerCylinder() {
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
index c8b256ba..a0d8c94a 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "openxr_composition_layer.h"
-
 #include <openxr/openxr.h>
 
+#include "openxr_composition_layer.h"
+
 class OpenXRCompositionLayerCylinder : public OpenXRCompositionLayer {
 	GDCLASS(OpenXRCompositionLayerCylinder, OpenXRCompositionLayer);
 
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp b/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
index ff54dcc6..2cd15c56 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
@@ -31,8 +31,8 @@
 #include "openxr_composition_layer_equirect.h"
 
 #include "../extensions/openxr_composition_layer_extension.h"
+#include "../openxr_interface.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerEquirect::OpenXRCompositionLayerEquirect() {
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_equirect.h b/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
index 93171046..059ff457 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "openxr_composition_layer.h"
-
 #include <openxr/openxr.h>
 
+#include "openxr_composition_layer.h"
+
 class OpenXRCompositionLayerEquirect : public OpenXRCompositionLayer {
 	GDCLASS(OpenXRCompositionLayerEquirect, OpenXRCompositionLayer);
 
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_quad.cpp b/engine/modules/openxr/scene/openxr_composition_layer_quad.cpp
index f28a0cd9..4017bc2a 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_quad.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer_quad.cpp
@@ -31,8 +31,8 @@
 #include "openxr_composition_layer_quad.h"
 
 #include "../extensions/openxr_composition_layer_extension.h"
+#include "../openxr_interface.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
 OpenXRCompositionLayerQuad::OpenXRCompositionLayerQuad() {
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_quad.h b/engine/modules/openxr/scene/openxr_composition_layer_quad.h
index ffebeea8..aebddae3 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_quad.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_quad.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "openxr_composition_layer.h"
-
 #include <openxr/openxr.h>
 
+#include "openxr_composition_layer.h"
+
 class OpenXRCompositionLayerQuad : public OpenXRCompositionLayer {
 	GDCLASS(OpenXRCompositionLayerQuad, OpenXRCompositionLayer);
 
diff --git a/engine/modules/openxr/scene/openxr_hand.cpp b/engine/modules/openxr/scene/openxr_hand.cpp
index 4825ff05..76775899 100644
--- a/engine/modules/openxr/scene/openxr_hand.cpp
+++ b/engine/modules/openxr/scene/openxr_hand.cpp
@@ -33,7 +33,6 @@
 #include "../extensions/openxr_hand_tracking_extension.h"
 #include "../openxr_api.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/engine/modules/openxr/scene/openxr_render_model.cpp b/engine/modules/openxr/scene/openxr_render_model.cpp
index 690ff741..14a977ad 100644
--- a/engine/modules/openxr/scene/openxr_render_model.cpp
+++ b/engine/modules/openxr/scene/openxr_render_model.cpp
@@ -33,10 +33,10 @@
 #ifdef MODULE_GLTF_ENABLED
 
 #include "../extensions/openxr_render_model_extension.h"
-
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/xr/xr_nodes.h"
+#include "scene/resources/3d/primitive_meshes.h"
 
 void OpenXRRenderModel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_top_level_path"), &OpenXRRenderModel::get_top_level_path);
diff --git a/engine/modules/openxr/scene/openxr_render_model_manager.cpp b/engine/modules/openxr/scene/openxr_render_model_manager.cpp
index 3a1f1d51..ae726a56 100644
--- a/engine/modules/openxr/scene/openxr_render_model_manager.cpp
+++ b/engine/modules/openxr/scene/openxr_render_model_manager.cpp
@@ -31,15 +31,10 @@
 #include "openxr_render_model_manager.h"
 
 #ifdef MODULE_GLTF_ENABLED
-
 #include "../extensions/openxr_render_model_extension.h"
-#include "../openxr_api.h"
-#include "openxr_render_model.h"
 
-#include "core/config/engine.h"
+#include "../openxr_api.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "servers/xr/xr_server.h"
 
@@ -52,8 +47,8 @@ void OpenXRRenderModelManager::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_make_local_to_pose", "make_local_to_pose"), &OpenXRRenderModelManager::set_make_local_to_pose);
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "make_local_to_pose", PROPERTY_HINT_ENUM_SUGGESTION, "aim,grip"), "set_make_local_to_pose", "get_make_local_to_pose");
 
-	ADD_SIGNAL(MethodInfo("render_model_added", PropertyInfo(Variant::OBJECT, "render_model", PROPERTY_HINT_RESOURCE_TYPE, OpenXRRenderModel::get_class_static())));
-	ADD_SIGNAL(MethodInfo("render_model_removed", PropertyInfo(Variant::OBJECT, "render_model", PROPERTY_HINT_RESOURCE_TYPE, OpenXRRenderModel::get_class_static())));
+	ADD_SIGNAL(MethodInfo("render_model_added", PropertyInfo(Variant::OBJECT, "render_model", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRRenderModel")));
+	ADD_SIGNAL(MethodInfo("render_model_removed", PropertyInfo(Variant::OBJECT, "render_model", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRRenderModel")));
 
 	BIND_ENUM_CONSTANT(RENDER_MODEL_TRACKER_ANY);
 	BIND_ENUM_CONSTANT(RENDER_MODEL_TRACKER_NONE_SET);
diff --git a/engine/modules/openxr/scene/openxr_render_model_manager.h b/engine/modules/openxr/scene/openxr_render_model_manager.h
index 1b7a1343..63c68a02 100644
--- a/engine/modules/openxr/scene/openxr_render_model_manager.h
+++ b/engine/modules/openxr/scene/openxr_render_model_manager.h
@@ -33,8 +33,10 @@
 #include "modules/modules_enabled.gen.h"
 
 #ifdef MODULE_GLTF_ENABLED
+#include "openxr_render_model.h"
 
 #include "scene/3d/node_3d.h"
+#include "scene/resources/packed_scene.h"
 #include "servers/xr/xr_positional_tracker.h"
 
 #include <openxr/openxr.h>
@@ -83,5 +85,4 @@ protected:
 };
 
 VARIANT_ENUM_CAST(OpenXRRenderModelManager::RenderModelTracker);
-
 #endif // MODULE_GLTF_ENABLED
diff --git a/engine/modules/openxr/scene/openxr_visibility_mask.cpp b/engine/modules/openxr/scene/openxr_visibility_mask.cpp
index 5f112945..b3006923 100644
--- a/engine/modules/openxr/scene/openxr_visibility_mask.cpp
+++ b/engine/modules/openxr/scene/openxr_visibility_mask.cpp
@@ -32,10 +32,10 @@
 
 #include "../extensions/openxr_visibility_mask_extension.h"
 #include "../openxr_interface.h"
-
-#include "core/object/callable_mp.h"
 #include "scene/3d/xr/xr_nodes.h"
-#include "servers/rendering/rendering_server.h"
+
+void OpenXRVisibilityMask::_bind_methods() {
+}
 
 void OpenXRVisibilityMask::_notification(int p_what) {
 	switch (p_what) {
@@ -94,7 +94,7 @@ OpenXRVisibilityMask::OpenXRVisibilityMask() {
 		openxr_interface->connect("session_stopping", callable_mp(this, &OpenXRVisibilityMask::_on_openxr_session_stopping));
 	}
 
-	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(get_instance(), RSE::SHADOW_CASTING_SETTING_OFF);
+	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(get_instance(), RS::SHADOW_CASTING_SETTING_OFF);
 }
 
 OpenXRVisibilityMask::~OpenXRVisibilityMask() {
diff --git a/engine/modules/openxr/scene/openxr_visibility_mask.h b/engine/modules/openxr/scene/openxr_visibility_mask.h
index 06edfb81..419d7b76 100644
--- a/engine/modules/openxr/scene/openxr_visibility_mask.h
+++ b/engine/modules/openxr/scene/openxr_visibility_mask.h
@@ -36,6 +36,8 @@ class OpenXRVisibilityMask : public VisualInstance3D {
 	GDCLASS(OpenXRVisibilityMask, VisualInstance3D);
 
 protected:
+	static void _bind_methods();
+
 	void _notification(int p_what);
 
 	void _on_openxr_session_begun();
diff --git a/engine/modules/openxr/util.h b/engine/modules/openxr/util.h
index 7d1d8140..062dec65 100644
--- a/engine/modules/openxr/util.h
+++ b/engine/modules/openxr/util.h
@@ -32,23 +32,23 @@
 
 #define UNPACK(...) __VA_ARGS__
 
-#define INIT_XR_FUNC_V(openxr_api, name) \
-	if constexpr (true) { \
-		XrResult get_instance_proc_addr_result; \
+#define INIT_XR_FUNC_V(openxr_api, name)                                                                              \
+	if constexpr (true) {                                                                                             \
+		XrResult get_instance_proc_addr_result;                                                                       \
 		get_instance_proc_addr_result = openxr_api->get_instance_proc_addr(#name, (PFN_xrVoidFunction *)&name##_ptr); \
-		ERR_FAIL_COND_V(XR_FAILED(get_instance_proc_addr_result), false); \
-	} else \
+		ERR_FAIL_COND_V(XR_FAILED(get_instance_proc_addr_result), false);                                             \
+	} else                                                                                                            \
 		((void)0)
 
 #define EXT_INIT_XR_FUNC_V(name) INIT_XR_FUNC_V(OpenXRAPI::get_singleton(), name)
 #define OPENXR_API_INIT_XR_FUNC_V(name) INIT_XR_FUNC_V(this, name)
 
-#define INIT_XR_FUNC(openxr_api, name) \
-	if constexpr (true) { \
-		XrResult get_instance_proc_addr_result; \
+#define INIT_XR_FUNC(openxr_api, name)                                                                                \
+	if constexpr (true) {                                                                                             \
+		XrResult get_instance_proc_addr_result;                                                                       \
 		get_instance_proc_addr_result = openxr_api->get_instance_proc_addr(#name, (PFN_xrVoidFunction *)&name##_ptr); \
-		ERR_FAIL_COND(XR_FAILED(get_instance_proc_addr_result)); \
-	} else \
+		ERR_FAIL_COND(XR_FAILED(get_instance_proc_addr_result));                                                      \
+	} else                                                                                                            \
 		((void)0)
 
 #define EXT_INIT_XR_FUNC(name) INIT_XR_FUNC(OpenXRAPI::get_singleton(), name)
@@ -59,70 +59,70 @@
 
 #define EXT_TRY_INIT_XR_FUNC(name) TRY_INIT_XR_FUNC(OpenXRAPI::get_singleton(), name)
 #define OPENXR_TRY_API_INIT_XR_FUNC(name) TRY_INIT_XR_FUNC(this, name)
-#define GDEXTENSION_INIT_XR_FUNC(name) \
-	if constexpr (true) { \
+#define GDEXTENSION_INIT_XR_FUNC(name)                                                              \
+	if constexpr (true) {                                                                           \
 		name##_ptr = reinterpret_cast<PFN_##name>(get_openxr_api()->get_instance_proc_addr(#name)); \
-		ERR_FAIL_NULL(name##_ptr); \
-	} else \
+		ERR_FAIL_NULL(name##_ptr);                                                                  \
+	} else                                                                                          \
 		((void)0)
 
-#define GDEXTENSION_INIT_XR_FUNC_V(name) \
-	if constexpr (true) { \
+#define GDEXTENSION_INIT_XR_FUNC_V(name)                                                            \
+	if constexpr (true) {                                                                           \
 		name##_ptr = reinterpret_cast<PFN_##name>(get_openxr_api()->get_instance_proc_addr(#name)); \
-		ERR_FAIL_NULL_V(name##_ptr, false); \
-	} else \
+		ERR_FAIL_NULL_V(name##_ptr, false);                                                         \
+	} else                                                                                          \
 		((void)0)
 
-#define EXT_PROTO_XRRESULT_FUNC1(func_name, arg1_type, arg1) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC1(func_name, arg1_type, arg1)                    \
+	PFN_##func_name func_name##_ptr = nullptr;                                  \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1); \
+		if (!func_name##_ptr) {                                                 \
+			return XR_ERROR_HANDLE_INVALID;                                     \
+		}                                                                       \
+		return (*func_name##_ptr)(p_##arg1);                                    \
 	}
 
-#define EXT_PROTO_XRRESULT_FUNC2(func_name, arg1_type, arg1, arg2_type, arg2) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC2(func_name, arg1_type, arg1, arg2_type, arg2)                              \
+	PFN_##func_name func_name##_ptr = nullptr;                                                             \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1, UNPACK arg2_type p_##arg2) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1, p_##arg2); \
+		if (!func_name##_ptr) {                                                                            \
+			return XR_ERROR_HANDLE_INVALID;                                                                \
+		}                                                                                                  \
+		return (*func_name##_ptr)(p_##arg1, p_##arg2);                                                     \
 	}
 
-#define EXT_PROTO_XRRESULT_FUNC3(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC3(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3)                                        \
+	PFN_##func_name func_name##_ptr = nullptr;                                                                                        \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1, UNPACK arg2_type p_##arg2, UNPACK arg3_type p_##arg3) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3); \
+		if (!func_name##_ptr) {                                                                                                       \
+			return XR_ERROR_HANDLE_INVALID;                                                                                           \
+		}                                                                                                                             \
+		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3);                                                                      \
 	}
 
-#define EXT_PROTO_XRRESULT_FUNC4(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC4(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4)                                                  \
+	PFN_##func_name func_name##_ptr = nullptr;                                                                                                                   \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1, UNPACK arg2_type p_##arg2, UNPACK arg3_type p_##arg3, UNPACK arg4_type p_##arg4) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4); \
+		if (!func_name##_ptr) {                                                                                                                                  \
+			return XR_ERROR_HANDLE_INVALID;                                                                                                                      \
+		}                                                                                                                                                        \
+		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4);                                                                                       \
 	}
 
-#define EXT_PROTO_XRRESULT_FUNC5(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4, arg5_type, arg5) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC5(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4, arg5_type, arg5)                                                            \
+	PFN_##func_name func_name##_ptr = nullptr;                                                                                                                                              \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1, UNPACK arg2_type p_##arg2, UNPACK arg3_type p_##arg3, UNPACK arg4_type p_##arg4, UNPACK arg5_type p_##arg5) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4, p_##arg5); \
+		if (!func_name##_ptr) {                                                                                                                                                             \
+			return XR_ERROR_HANDLE_INVALID;                                                                                                                                                 \
+		}                                                                                                                                                                                   \
+		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4, p_##arg5);                                                                                                        \
 	}
 
-#define EXT_PROTO_XRRESULT_FUNC6(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4, arg5_type, arg5, arg6_type, arg6) \
-	PFN_##func_name func_name##_ptr = nullptr; \
+#define EXT_PROTO_XRRESULT_FUNC6(func_name, arg1_type, arg1, arg2_type, arg2, arg3_type, arg3, arg4_type, arg4, arg5_type, arg5, arg6_type, arg6)                                                                      \
+	PFN_##func_name func_name##_ptr = nullptr;                                                                                                                                                                         \
 	XRAPI_ATTR XrResult XRAPI_CALL func_name(UNPACK arg1_type p_##arg1, UNPACK arg2_type p_##arg2, UNPACK arg3_type p_##arg3, UNPACK arg4_type p_##arg4, UNPACK arg5_type p_##arg5, UNPACK arg6_type p_##arg6) const { \
-		if (!func_name##_ptr) { \
-			return XR_ERROR_HANDLE_INVALID; \
-		} \
-		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4, p_##arg5, p_##arg6); \
+		if (!func_name##_ptr) {                                                                                                                                                                                        \
+			return XR_ERROR_HANDLE_INVALID;                                                                                                                                                                            \
+		}                                                                                                                                                                                                              \
+		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4, p_##arg5, p_##arg6);                                                                                                                         \
 	}
diff --git a/engine/modules/raycast/lightmap_raycaster_embree.cpp b/engine/modules/raycast/lightmap_raycaster_embree.cpp
index eb8fd34f..84d9e19a 100644
--- a/engine/modules/raycast/lightmap_raycaster_embree.cpp
+++ b/engine/modules/raycast/lightmap_raycaster_embree.cpp
@@ -36,7 +36,7 @@
 #include <pmmintrin.h>
 #endif
 
-Ref<LightmapRaycaster> LightmapRaycasterEmbree::create_embree_raycaster() {
+LightmapRaycaster *LightmapRaycasterEmbree::create_embree_raycaster() {
 	return memnew(LightmapRaycasterEmbree);
 }
 
diff --git a/engine/modules/raycast/lightmap_raycaster_embree.h b/engine/modules/raycast/lightmap_raycaster_embree.h
index f561aa91..3335e943 100644
--- a/engine/modules/raycast/lightmap_raycaster_embree.h
+++ b/engine/modules/raycast/lightmap_raycaster_embree.h
@@ -69,7 +69,7 @@ public:
 	virtual void set_mesh_filter(const HashSet<int> &p_mesh_ids) override;
 	virtual void clear_mesh_filter() override;
 
-	static Ref<LightmapRaycaster> create_embree_raycaster();
+	static LightmapRaycaster *create_embree_raycaster();
 	static void make_default_raycaster();
 
 	LightmapRaycasterEmbree();
diff --git a/engine/modules/raycast/raycast_occlusion_cull.cpp b/engine/modules/raycast/raycast_occlusion_cull.cpp
index 1c402ad0..a6c865fc 100644
--- a/engine/modules/raycast/raycast_occlusion_cull.cpp
+++ b/engine/modules/raycast/raycast_occlusion_cull.cpp
@@ -30,11 +30,9 @@
 
 #include "raycast_occlusion_cull.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/math/projection.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
+#include "core/templates/local_vector.h"
 
 #ifdef __SSE2__
 #include <pmmintrin.h>
@@ -633,7 +631,7 @@ RID RaycastOcclusionCull::buffer_get_debug_texture(RID p_buffer) {
 
 ////////////////////////////////////////////////////////
 
-void RaycastOcclusionCull::set_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality) {
+void RaycastOcclusionCull::set_build_quality(RS::ViewportOcclusionCullingBuildQuality p_quality) {
 	if (build_quality == p_quality) {
 		return;
 	}
@@ -659,7 +657,7 @@ RaycastOcclusionCull::RaycastOcclusionCull() {
 	raycast_singleton = this;
 	int default_quality = GLOBAL_GET("rendering/occlusion_culling/bvh_build_quality");
 	_jitter_enabled = GLOBAL_GET("rendering/occlusion_culling/jitter_projection");
-	build_quality = RSE::ViewportOcclusionCullingBuildQuality(default_quality);
+	build_quality = RS::ViewportOcclusionCullingBuildQuality(default_quality);
 }
 
 RaycastOcclusionCull::~RaycastOcclusionCull() {
diff --git a/engine/modules/raycast/raycast_occlusion_cull.h b/engine/modules/raycast/raycast_occlusion_cull.h
index 4dae3e92..51c1a196 100644
--- a/engine/modules/raycast/raycast_occlusion_cull.h
+++ b/engine/modules/raycast/raycast_occlusion_cull.h
@@ -30,15 +30,13 @@
 
 #pragma once
 
-#include "core/templates/hash_set.h"
+#include "core/math/projection.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_scene_occlusion_cull.h"
 
 #include <embree4/rtcore.h>
 
-struct Projection;
-
 class RaycastOcclusionCull : public RendererSceneOcclusionCull {
 	typedef RTCRayHit16 CameraRayTile;
 
@@ -159,7 +157,7 @@ private:
 	RID_PtrOwner<Occluder> occluder_owner;
 	HashMap<RID, Scenario> scenarios;
 	HashMap<RID, RaycastHZBuffer> buffers;
-	RSE::ViewportOcclusionCullingBuildQuality build_quality;
+	RS::ViewportOcclusionCullingBuildQuality build_quality;
 	bool _jitter_enabled = false;
 
 	void _init_embree();
@@ -186,7 +184,7 @@ public:
 
 	virtual RID buffer_get_debug_texture(RID p_buffer) override;
 
-	virtual void set_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality) override;
+	virtual void set_build_quality(RS::ViewportOcclusionCullingBuildQuality p_quality) override;
 
 	RaycastOcclusionCull();
 	~RaycastOcclusionCull();
diff --git a/engine/modules/raycast/static_raycaster_embree.cpp b/engine/modules/raycast/static_raycaster_embree.cpp
index aca30633..a6ad3403 100644
--- a/engine/modules/raycast/static_raycaster_embree.cpp
+++ b/engine/modules/raycast/static_raycaster_embree.cpp
@@ -38,7 +38,7 @@
 
 RTCDevice StaticRaycasterEmbree::embree_device;
 
-Ref<StaticRaycaster> StaticRaycasterEmbree::create_embree_raycaster() {
+StaticRaycaster *StaticRaycasterEmbree::create_embree_raycaster() {
 	return memnew(StaticRaycasterEmbree);
 }
 
diff --git a/engine/modules/raycast/static_raycaster_embree.h b/engine/modules/raycast/static_raycaster_embree.h
index 410a2352..a0b66b5c 100644
--- a/engine/modules/raycast/static_raycaster_embree.h
+++ b/engine/modules/raycast/static_raycaster_embree.h
@@ -55,7 +55,7 @@ public:
 	virtual void set_mesh_filter(const HashSet<int> &p_mesh_ids) override;
 	virtual void clear_mesh_filter() override;
 
-	static Ref<StaticRaycaster> create_embree_raycaster();
+	static StaticRaycaster *create_embree_raycaster();
 	static void make_default_raycaster();
 	static void free();
 
diff --git a/engine/modules/regex/doc_classes/RegEx.xml b/engine/modules/regex/doc_classes/RegEx.xml
index f4ac69e9..76a763d4 100644
--- a/engine/modules/regex/doc_classes/RegEx.xml
+++ b/engine/modules/regex/doc_classes/RegEx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RegEx" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="RegEx" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Class for searching text for patterns using regular expressions.
 	</brief_description>
diff --git a/engine/modules/regex/doc_classes/RegExMatch.xml b/engine/modules/regex/doc_classes/RegExMatch.xml
index 394d2efa..82182f0d 100644
--- a/engine/modules/regex/doc_classes/RegExMatch.xml
+++ b/engine/modules/regex/doc_classes/RegExMatch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RegExMatch" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="RegExMatch" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Contains the results of a [RegEx] search.
 	</brief_description>
diff --git a/engine/modules/regex/regex.compat.inc b/engine/modules/regex/regex.compat.inc
index 321f27b1..0c380655 100644
--- a/engine/modules/regex/regex.compat.inc
+++ b/engine/modules/regex/regex.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "regex.h"
-
-#include "core/object/class_db.h"
-
 Ref<RegEx> RegEx::_create_from_string_bind_compat_95212(const String &p_pattern) {
 	return create_from_string(p_pattern, true);
 }
@@ -47,4 +43,4 @@ void RegEx::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("compile", "pattern"), &RegEx::_compile_bind_compat_95212);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/modules/regex/regex.cpp b/engine/modules/regex/regex.cpp
index 4d199515..3c6acfbc 100644
--- a/engine/modules/regex/regex.cpp
+++ b/engine/modules/regex/regex.cpp
@@ -31,7 +31,6 @@
 #include "regex.h"
 #include "regex.compat.inc"
 
-#include "core/object/class_db.h"
 #include "core/os/memory.h"
 
 extern "C" {
diff --git a/engine/modules/regex/tests/test_regex.h b/engine/modules/regex/tests/test_regex.h
index dfd530c6..eb08eab9 100644
--- a/engine/modules/regex/tests/test_regex.h
+++ b/engine/modules/regex/tests/test_regex.h
@@ -33,6 +33,7 @@
 #include "../regex.h"
 
 #include "core/string/ustring.h"
+
 #include "tests/test_macros.h"
 
 namespace TestRegEx {
diff --git a/engine/modules/svg/SCsub b/engine/modules/svg/SCsub
index 92ab5f2d..da9f37e8 100644
--- a/engine/modules/svg/SCsub
+++ b/engine/modules/svg/SCsub
@@ -13,7 +13,6 @@ thirdparty_obj = []
 thirdparty_dir = "#thirdparty/thorvg/"
 thirdparty_sources = [
     # common
-    "src/common/tvgColor.cpp",
     "src/common/tvgCompressor.cpp",
     "src/common/tvgMath.cpp",
     "src/common/tvgStr.cpp",
@@ -32,6 +31,7 @@ thirdparty_sources = [
     # "src/renderer/tvgAnimation.cpp",
     "src/renderer/tvgCanvas.cpp",
     "src/renderer/tvgFill.cpp",
+    # "src/renderer/tvgGlCanvas.cpp",
     "src/renderer/tvgInitializer.cpp",
     "src/renderer/tvgLoader.cpp",
     "src/renderer/tvgPaint.cpp",
@@ -40,8 +40,10 @@ thirdparty_sources = [
     # "src/renderer/tvgSaver.cpp",
     "src/renderer/tvgScene.cpp",
     "src/renderer/tvgShape.cpp",
+    "src/renderer/tvgSwCanvas.cpp",
     "src/renderer/tvgTaskScheduler.cpp",
     "src/renderer/tvgText.cpp",
+    # "src/renderer/tvgWgCanvas.cpp",
     # renderer sw_engine
     "src/renderer/sw_engine/tvgSwFill.cpp",
     "src/renderer/sw_engine/tvgSwImage.cpp",
diff --git a/engine/modules/svg/image_loader_svg.cpp b/engine/modules/svg/image_loader_svg.cpp
index 13bda431..ca4c02e8 100644
--- a/engine/modules/svg/image_loader_svg.cpp
+++ b/engine/modules/svg/image_loader_svg.cpp
@@ -30,6 +30,7 @@
 
 #include "image_loader_svg.h"
 
+#include "core/os/memory.h"
 #include "core/variant/variant.h"
 
 #include <thorvg.h>
@@ -79,11 +80,10 @@ Ref<Image> ImageLoaderSVG::load_mem_svg(const uint8_t *p_svg, int p_size, float
 Error ImageLoaderSVG::create_image_from_utf8_buffer(Ref<Image> p_image, const uint8_t *p_buffer, int p_buffer_size, float p_scale, bool p_upsample) {
 	ERR_FAIL_COND_V_MSG(Math::is_zero_approx(p_scale), ERR_INVALID_PARAMETER, "ImageLoaderSVG: Can't load SVG with a scale of 0.");
 
-	tvg::Picture *picture = tvg::Picture::gen();
+	std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
 
-	tvg::Result result = picture->load((const char *)p_buffer, p_buffer_size, "svg", nullptr, true);
+	tvg::Result result = picture->load((const char *)p_buffer, p_buffer_size, "svg", true);
 	if (result != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		return ERR_INVALID_DATA;
 	}
 	float fw, fh;
@@ -103,22 +103,21 @@ Error ImageLoaderSVG::create_image_from_utf8_buffer(Ref<Image> p_image, const ui
 
 	picture->size(width, height);
 
-	std::unique_ptr<tvg::SwCanvas> sw_canvas(tvg::SwCanvas::gen());
+	std::unique_ptr<tvg::SwCanvas> sw_canvas = tvg::SwCanvas::gen();
 	Vector<uint8_t> buffer;
 	buffer.resize(sizeof(uint32_t) * width * height);
 
-	tvg::Result res = sw_canvas->target((uint32_t *)buffer.ptrw(), width, width, height, tvg::ColorSpace::ABGR8888S);
+	tvg::Result res = sw_canvas->target((uint32_t *)buffer.ptrw(), width, width, height, tvg::SwCanvas::ABGR8888S);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FAILED, vformat("ImageLoaderSVG: Couldn't set target on ThorVG canvas, error code %d.", res));
 	}
 
-	res = sw_canvas->add(picture);
+	res = sw_canvas->push(std::move(picture));
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FAILED, vformat("ImageLoaderSVG: Couldn't insert ThorVG picture on canvas, error code %d.", res));
 	}
 
-	res = sw_canvas->draw(true);
+	res = sw_canvas->draw();
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FAILED, vformat("ImageLoaderSVG: Couldn't draw ThorVG pictures on canvas, error code %d.", res));
 	}
@@ -130,6 +129,8 @@ Error ImageLoaderSVG::create_image_from_utf8_buffer(Ref<Image> p_image, const ui
 
 	p_image->set_data(width, height, false, Image::FORMAT_RGBA8, buffer);
 
+	res = sw_canvas->clear(true);
+
 	return OK;
 }
 
diff --git a/engine/modules/svg/register_types.cpp b/engine/modules/svg/register_types.cpp
index 6c4a3afb..82d816d8 100644
--- a/engine/modules/svg/register_types.cpp
+++ b/engine/modules/svg/register_types.cpp
@@ -47,7 +47,9 @@ void initialize_svg_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 
-	if (tvg::Initializer::init(TVG_THREADS) != tvg::Result::Success) {
+	tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+
+	if (tvg::Initializer::init(tvgEngine, TVG_THREADS) != tvg::Result::Success) {
 		return;
 	}
 
@@ -67,5 +69,5 @@ void uninitialize_svg_module(ModuleInitializationLevel p_level) {
 
 	ImageLoader::remove_image_format_loader(image_loader_svg);
 	image_loader_svg.unref();
-	tvg::Initializer::term();
+	tvg::Initializer::term(tvg::CanvasEngine::Sw);
 }
diff --git a/engine/modules/text_server_adv/SCsub b/engine/modules/text_server_adv/SCsub
index 11116127..2c1fed6c 100644
--- a/engine/modules/text_server_adv/SCsub
+++ b/engine/modules/text_server_adv/SCsub
@@ -99,7 +99,6 @@ if env["builtin_harfbuzz"]:
         # "src/hb-subset-cff-common.cc",
         # "src/hb-subset-cff1.cc",
         # "src/hb-subset-cff2.cc",
-        # "src/hb-subset-cff2-to-cff1.cc",
         # "src/hb-subset-input.cc",
         # "src/hb-subset-instancer-iup.cc",
         # "src/hb-subset-instancer-solver.cc",
@@ -110,30 +109,9 @@ if env["builtin_harfbuzz"]:
         # "src/hb-subset-table-layout.cc",
         # "src/hb-subset-table-other.cc",
         # "src/hb-subset-table-var.cc",
-        "src/hb-raster.cc",
-        "src/hb-raster-draw.cc",
-        "src/hb-raster-image.cc",
-        "src/hb-raster-paint.cc",
-        "src/hb-raster-svg-base.cc",
-        "src/hb-raster-svg-bbox.cc",
-        "src/hb-raster-svg-color.cc",
-        "src/hb-raster-svg-clip.cc",
-        "src/hb-raster-svg-defs.cc",
-        "src/hb-raster-svg-defs-scan.cc",
-        "src/hb-raster-svg-gradient.cc",
-        "src/hb-raster-svg-fill.cc",
-        "src/hb-raster-svg-render.cc",
-        "src/hb-raster-svg-parse.cc",
-        "src/hb-raster-svg-use.cc",
-        "src/hb-vector-svg-draw.cc",
-        "src/hb-vector-svg-paint.cc",
-        "src/hb-vector-svg-path.cc",
-        "src/hb-vector-svg-subset.cc",
-        "src/hb-vector-svg-utils.cc",
         "src/hb-subset.cc",
         "src/hb-ucd.cc",
         "src/hb-unicode.cc",
-        "src/hb-zlib.cc",
         # "src/hb-uniscribe.cc",
         "src/OT/Var/VARC/VARC.cc",
     ]
@@ -150,7 +128,7 @@ if env["builtin_harfbuzz"]:
 
     env_harfbuzz.Prepend(CPPPATH=["#thirdparty/harfbuzz/src"])
 
-    env_harfbuzz.Append(CPPDEFINES=["HAVE_ICU", "HAVE_ZLIB", "HAVE_PNG"])
+    env_harfbuzz.Append(CPPDEFINES=["HAVE_ICU"])
     if env["builtin_icu4c"]:
         env_harfbuzz.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
         env_harfbuzz.Append(
diff --git a/engine/modules/text_server_adv/doc_classes/TextServerAdvanced.xml b/engine/modules/text_server_adv/doc_classes/TextServerAdvanced.xml
index 76a8db8c..b4932559 100644
--- a/engine/modules/text_server_adv/doc_classes/TextServerAdvanced.xml
+++ b/engine/modules/text_server_adv/doc_classes/TextServerAdvanced.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServerAdvanced" inherits="TextServerExtension" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="TextServerAdvanced" inherits="TextServerExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		An advanced text server with support for BiDi, complex text layout, and contextual OpenType features. Used in Godot by default.
 	</brief_description>
diff --git a/engine/modules/text_server_adv/gdextension_build/SConstruct b/engine/modules/text_server_adv/gdextension_build/SConstruct
new file mode 100644
index 00000000..2b39f54d
--- /dev/null
+++ b/engine/modules/text_server_adv/gdextension_build/SConstruct
@@ -0,0 +1,769 @@
+#!/usr/bin/env python
+# ruff: noqa: F821
+
+import methods
+
+# For the reference:
+# - CCFLAGS are compilation flags shared between C and C++
+# - CFLAGS are for C-specific compilation flags
+# - CXXFLAGS are for C++-specific compilation flags
+# - CPPFLAGS are for pre-processor flags
+# - CPPDEFINES are for pre-processor defines
+# - LINKFLAGS are for linking flags
+
+env = SConscript("./godot-cpp/SConstruct")
+env.__class__.disable_warnings = methods.disable_warnings
+
+opts = Variables([], ARGUMENTS)
+opts.Add(BoolVariable("brotli_enabled", "Use Brotli library", True))
+opts.Add(BoolVariable("freetype_enabled", "Use FreeType library", True))
+opts.Add(BoolVariable("msdfgen_enabled", "Use MSDFgen library (require FreeType)", True))
+opts.Add(BoolVariable("graphite_enabled", "Use Graphite library (require FreeType)", True))
+opts.Add(BoolVariable("thorvg_enabled", "Use ThorVG library (require FreeType)", True))
+opts.Add(BoolVariable("static_icu_data", "Use built-in ICU data", True))
+opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False))
+
+opts.Update(env)
+
+if env["platform"] == "windows" and not env["use_mingw"]:
+    env.AppendUnique(CCFLAGS=["/utf-8"])  # Force to use Unicode encoding.
+
+# ThorVG
+if env["thorvg_enabled"] and env["freetype_enabled"]:
+    env_tvg = env.Clone()
+    env_tvg.disable_warnings()
+
+    thirdparty_tvg_dir = "../../../thirdparty/thorvg/"
+    thirdparty_tvg_sources = [
+        # common
+        "src/common/tvgCompressor.cpp",
+        "src/common/tvgLines.cpp",
+        "src/common/tvgMath.cpp",
+        "src/common/tvgStr.cpp",
+        # SVG parser
+        "src/loaders/svg/tvgSvgCssStyle.cpp",
+        "src/loaders/svg/tvgSvgLoader.cpp",
+        "src/loaders/svg/tvgSvgPath.cpp",
+        "src/loaders/svg/tvgSvgSceneBuilder.cpp",
+        "src/loaders/svg/tvgSvgUtil.cpp",
+        "src/loaders/svg/tvgXmlParser.cpp",
+        "src/loaders/raw/tvgRawLoader.cpp",
+        # image loaders
+        "src/loaders/external_png/tvgPngLoader.cpp",
+        "src/loaders/jpg/tvgJpgd.cpp",
+        "src/loaders/jpg/tvgJpgLoader.cpp",
+        # renderer common
+        "src/renderer/tvgAccessor.cpp",
+        # "src/renderer/tvgAnimation.cpp",
+        "src/renderer/tvgCanvas.cpp",
+        "src/renderer/tvgFill.cpp",
+        # "src/renderer/tvgGlCanvas.cpp",
+        "src/renderer/tvgInitializer.cpp",
+        "src/renderer/tvgLoader.cpp",
+        "src/renderer/tvgPaint.cpp",
+        "src/renderer/tvgPicture.cpp",
+        "src/renderer/tvgRender.cpp",
+        # "src/renderer/tvgSaver.cpp",
+        "src/renderer/tvgScene.cpp",
+        "src/renderer/tvgShape.cpp",
+        "src/renderer/tvgSwCanvas.cpp",
+        "src/renderer/tvgTaskScheduler.cpp",
+        "src/renderer/tvgText.cpp",
+        # "src/renderer/tvgWgCanvas.cpp",
+        # renderer sw_engine
+        "src/renderer/sw_engine/tvgSwFill.cpp",
+        "src/renderer/sw_engine/tvgSwImage.cpp",
+        "src/renderer/sw_engine/tvgSwMath.cpp",
+        "src/renderer/sw_engine/tvgSwMemPool.cpp",
+        "src/renderer/sw_engine/tvgSwRaster.cpp",
+        "src/renderer/sw_engine/tvgSwRenderer.cpp",
+        "src/renderer/sw_engine/tvgSwRle.cpp",
+        "src/renderer/sw_engine/tvgSwShape.cpp",
+        "src/renderer/sw_engine/tvgSwStroke.cpp",
+    ]
+    thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources]
+
+    env_tvg.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
+            "../../../thirdparty/thorvg/src/renderer/sw_engine",
+            "../../../thirdparty/thorvg/src/loaders/svg",
+            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/loaders/external_png",
+            "../../../thirdparty/thorvg/src/loaders/jpg",
+            "../../../thirdparty/libpng",
+        ]
+    )
+
+    # Enable ThorVG static object linking.
+    env_tvg.Append(CPPDEFINES=["TVG_STATIC"])
+
+    env.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
+        ]
+    )
+    env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])
+
+    lib = env_tvg.Library(
+        f"tvg_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_tvg_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# MSDFGEN
+if env["msdfgen_enabled"] and env["freetype_enabled"]:
+    env_msdfgen = env.Clone()
+    env_msdfgen.disable_warnings()
+
+    thirdparty_msdfgen_dir = "../../../thirdparty/msdfgen/"
+    thirdparty_msdfgen_sources = [
+        "core/Contour.cpp",
+        "core/DistanceMapping.cpp",
+        "core/EdgeHolder.cpp",
+        "core/MSDFErrorCorrection.cpp",
+        "core/Projection.cpp",
+        "core/Scanline.cpp",
+        "core/Shape.cpp",
+        "core/contour-combiners.cpp",
+        "core/convergent-curve-ordering.cpp",
+        "core/edge-coloring.cpp",
+        "core/edge-segments.cpp",
+        "core/edge-selectors.cpp",
+        "core/equation-solver.cpp",
+        # "core/export-svg.cpp",
+        "core/msdf-error-correction.cpp",
+        "core/msdfgen.cpp",
+        "core/rasterization.cpp",
+        "core/render-sdf.cpp",
+        # "core/save-bmp.cpp",
+        # "core/save-fl32.cpp",
+        # "core/save-rgba.cpp",
+        # "core/save-tiff.cpp",
+        "core/sdf-error-estimation.cpp",
+        "core/shape-description.cpp",
+    ]
+    thirdparty_msdfgen_sources = [thirdparty_msdfgen_dir + file for file in thirdparty_msdfgen_sources]
+
+    env_msdfgen.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
+    env_msdfgen.Append(CPPPATH=["../../../thirdparty/freetype/include", "../../../thirdparty/msdfgen"])
+    env.Append(CPPPATH=["../../../thirdparty/msdfgen"])
+    env.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
+    env.Append(CPPDEFINES=["MODULE_MSDFGEN_ENABLED"])
+
+    lib = env_msdfgen.Library(
+        f"msdfgen_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_msdfgen_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# FreeType
+if env["freetype_enabled"]:
+    env_freetype = env.Clone()
+    env_freetype.disable_warnings()
+
+    thirdparty_freetype_dir = "../../../thirdparty/freetype/"
+    thirdparty_freetype_sources = [
+        "src/autofit/autofit.c",
+        "src/base/ftbase.c",
+        "src/base/ftbbox.c",
+        "src/base/ftbdf.c",
+        "src/base/ftbitmap.c",
+        "src/base/ftcid.c",
+        "src/base/ftdebug.c",
+        "src/base/ftfstype.c",
+        "src/base/ftgasp.c",
+        "src/base/ftglyph.c",
+        "src/base/ftgxval.c",
+        "src/base/ftinit.c",
+        "src/base/ftmm.c",
+        "src/base/ftotval.c",
+        "src/base/ftpatent.c",
+        "src/base/ftpfr.c",
+        "src/base/ftstroke.c",
+        "src/base/ftsynth.c",
+        "src/base/ftsystem.c",
+        "src/base/fttype1.c",
+        "src/base/ftwinfnt.c",
+        "src/bdf/bdf.c",
+        "src/bzip2/ftbzip2.c",
+        "src/cache/ftcache.c",
+        "src/cff/cff.c",
+        "src/cid/type1cid.c",
+        "src/gxvalid/gxvalid.c",
+        "src/gzip/ftgzip.c",
+        "src/lzw/ftlzw.c",
+        "src/otvalid/otvalid.c",
+        "src/pcf/pcf.c",
+        "src/pfr/pfr.c",
+        "src/psaux/psaux.c",
+        "src/pshinter/pshinter.c",
+        "src/psnames/psnames.c",
+        "src/raster/raster.c",
+        "src/sdf/sdf.c",
+        "src/svg/svg.c",
+        "src/smooth/smooth.c",
+        "src/truetype/truetype.c",
+        "src/type1/type1.c",
+        "src/type42/type42.c",
+        "src/winfonts/winfnt.c",
+        "src/sfnt/sfnt.c",
+    ]
+    thirdparty_freetype_sources = [thirdparty_freetype_dir + file for file in thirdparty_freetype_sources]
+
+    thirdparty_png_dir = "../../../thirdparty/libpng/"
+    thirdparty_png_sources = [
+        "png.c",
+        "pngerror.c",
+        "pngget.c",
+        "pngmem.c",
+        "pngpread.c",
+        "pngread.c",
+        "pngrio.c",
+        "pngrtran.c",
+        "pngrutil.c",
+        "pngset.c",
+        "pngtrans.c",
+        "pngwio.c",
+        "pngwrite.c",
+        "pngwtran.c",
+        "pngwutil.c",
+    ]
+    thirdparty_freetype_sources += [thirdparty_png_dir + file for file in thirdparty_png_sources]
+
+    thirdparty_zlib_dir = "../../../thirdparty/zlib/"
+    thirdparty_zlib_sources = [
+        "adler32.c",
+        "compress.c",
+        "crc32.c",
+        "deflate.c",
+        "inffast.c",
+        "inflate.c",
+        "inftrees.c",
+        "trees.c",
+        "uncompr.c",
+        "zutil.c",
+    ]
+    thirdparty_freetype_sources += [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
+
+    if env["brotli_enabled"]:
+        thirdparty_brotli_dir = "../../../thirdparty/brotli/"
+        thirdparty_brotli_sources = [
+            "common/constants.c",
+            "common/context.c",
+            "common/dictionary.c",
+            "common/platform.c",
+            "common/shared_dictionary.c",
+            "common/transform.c",
+            "dec/bit_reader.c",
+            "dec/decode.c",
+            "dec/huffman.c",
+            "dec/state.c",
+        ]
+        thirdparty_freetype_sources += [thirdparty_brotli_dir + file for file in thirdparty_brotli_sources]
+        env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
+        env_freetype.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
+        env.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
+
+    env_freetype.Append(CPPPATH=[thirdparty_freetype_dir + "/include", thirdparty_zlib_dir, thirdparty_png_dir])
+    env.Append(CPPPATH=[thirdparty_freetype_dir + "/include"])
+
+    env_freetype.Append(
+        CPPDEFINES=[
+            "FT2_BUILD_LIBRARY",
+            "FT_CONFIG_OPTION_USE_PNG",
+            "FT_CONFIG_OPTION_SYSTEM_ZLIB",
+        ]
+    )
+    if env.dev_build:
+        env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"])
+
+    env.Append(CPPDEFINES=["MODULE_FREETYPE_ENABLED"])
+
+    lib = env_freetype.Library(
+        f"freetype_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_freetype_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# HarfBuzz
+env_harfbuzz = env.Clone()
+env_harfbuzz.disable_warnings()
+
+thirdparty_harfbuzz_dir = "../../../thirdparty/harfbuzz/"
+thirdparty_harfbuzz_sources = [
+    "src/hb-aat-layout.cc",
+    "src/hb-aat-map.cc",
+    "src/hb-blob.cc",
+    "src/hb-buffer-serialize.cc",
+    "src/hb-buffer-verify.cc",
+    "src/hb-buffer.cc",
+    # "src/hb-cairo-utils.cc",
+    # "src/hb-cairo.cc",
+    "src/hb-common.cc",
+    # "src/hb-coretext-font.cc",
+    # "src/hb-coretext-shape.cc",
+    # "src/hb-directwrite.cc",
+    "src/hb-draw.cc",
+    "src/hb-face-builder.cc",
+    "src/hb-face.cc",
+    "src/hb-fallback-shape.cc",
+    "src/hb-font.cc",
+    # "src/hb-gdi.cc",
+    # "src/hb-glib.cc",
+    # "src/hb-gobject-structs.cc",
+    "src/hb-icu.cc",
+    "src/hb-map.cc",
+    "src/hb-number.cc",
+    "src/hb-ot-cff1-table.cc",
+    "src/hb-ot-cff2-table.cc",
+    "src/hb-ot-color.cc",
+    "src/hb-ot-face.cc",
+    "src/hb-ot-font.cc",
+    "src/hb-ot-layout.cc",
+    "src/hb-ot-map.cc",
+    "src/hb-ot-math.cc",
+    "src/hb-ot-meta.cc",
+    "src/hb-ot-metrics.cc",
+    "src/hb-ot-name.cc",
+    "src/hb-ot-shaper-arabic.cc",
+    "src/hb-ot-shaper-default.cc",
+    "src/hb-ot-shaper-hangul.cc",
+    "src/hb-ot-shaper-hebrew.cc",
+    "src/hb-ot-shaper-indic-table.cc",
+    "src/hb-ot-shaper-indic.cc",
+    "src/hb-ot-shaper-khmer.cc",
+    "src/hb-ot-shaper-myanmar.cc",
+    "src/hb-ot-shaper-syllabic.cc",
+    "src/hb-ot-shaper-thai.cc",
+    "src/hb-ot-shaper-use.cc",
+    "src/hb-ot-shaper-vowel-constraints.cc",
+    "src/hb-ot-shape-fallback.cc",
+    "src/hb-ot-shape-normalize.cc",
+    "src/hb-ot-shape.cc",
+    "src/hb-ot-tag.cc",
+    "src/hb-ot-var.cc",
+    "src/hb-outline.cc",
+    "src/hb-paint-bounded.cc",
+    "src/hb-paint-extents.cc",
+    "src/hb-paint.cc",
+    "src/hb-set.cc",
+    "src/hb-shape-plan.cc",
+    "src/hb-shape.cc",
+    "src/hb-shaper.cc",
+    "src/hb-static.cc",
+    "src/hb-style.cc",
+    "src/hb-subset-cff-common.cc",
+    "src/hb-subset-cff1.cc",
+    "src/hb-subset-cff2.cc",
+    "src/hb-subset-input.cc",
+    "src/hb-subset-instancer-iup.cc",
+    "src/hb-subset-instancer-solver.cc",
+    "src/hb-subset-plan.cc",
+    "src/hb-subset-serialize.cc",
+    "src/hb-subset.cc",
+    "src/hb-ucd.cc",
+    "src/hb-unicode.cc",
+    # "src/hb-uniscribe.cc",
+    "src/OT/Var/VARC/VARC.cc",
+]
+
+if env["freetype_enabled"]:
+    thirdparty_harfbuzz_sources += [
+        "src/hb-ft.cc",
+        "src/hb-graphite2.cc",
+    ]
+thirdparty_harfbuzz_sources = [thirdparty_harfbuzz_dir + file for file in thirdparty_harfbuzz_sources]
+
+env_harfbuzz.Append(
+    CPPPATH=[
+        "../../../thirdparty/harfbuzz/src",
+        "../../../thirdparty/icu4c/common/",
+        "../../../thirdparty/icu4c/i18n/",
+    ]
+)
+
+if env["freetype_enabled"]:
+    env_harfbuzz.Append(
+        CPPPATH=[
+            "../../../thirdparty/freetype/include",
+            "../../../thirdparty/graphite/include",
+        ]
+    )
+
+if env["platform"] == "android" or env["platform"] == "linuxbsd":
+    env_harfbuzz.Append(CPPDEFINES=["HAVE_PTHREAD"])
+
+env_harfbuzz.Append(
+    CPPDEFINES=[
+        "U_STATIC_IMPLEMENTATION",
+        ("U_HAVE_LIB_SUFFIX", 1),
+        ("U_LIB_SUFFIX_C_NAME", "_godot"),
+        "HAVE_ICU_BUILTIN",
+        "HAVE_ICU",
+    ]
+)
+
+if env["freetype_enabled"]:
+    env_harfbuzz.Append(
+        CPPDEFINES=[
+            "HAVE_FREETYPE",
+            "HAVE_GRAPHITE2",
+            "GRAPHITE2_STATIC",
+        ]
+    )
+
+env.Append(CPPPATH=["../../../thirdparty/harfbuzz/src"])
+
+lib = env_harfbuzz.Library(
+    f"harfbuzz_builtin{env['suffix']}{env['LIBSUFFIX']}",
+    thirdparty_harfbuzz_sources,
+)
+env.Prepend(LIBS=[lib])
+
+# Graphite
+if env["graphite_enabled"] and env["freetype_enabled"]:
+    env_graphite = env.Clone()
+    env_graphite.disable_warnings()
+
+    thirdparty_graphite_dir = "../../../thirdparty/graphite/"
+    thirdparty_graphite_sources = [
+        "src/gr_char_info.cpp",
+        "src/gr_face.cpp",
+        "src/gr_features.cpp",
+        "src/gr_font.cpp",
+        "src/gr_logging.cpp",
+        "src/gr_segment.cpp",
+        "src/gr_slot.cpp",
+        "src/CmapCache.cpp",
+        "src/Code.cpp",
+        "src/Collider.cpp",
+        "src/Decompressor.cpp",
+        "src/Face.cpp",
+        #'src/FileFace.cpp',
+        "src/FeatureMap.cpp",
+        "src/Font.cpp",
+        "src/GlyphCache.cpp",
+        "src/GlyphFace.cpp",
+        "src/Intervals.cpp",
+        "src/Justifier.cpp",
+        "src/NameTable.cpp",
+        "src/Pass.cpp",
+        "src/Position.cpp",
+        "src/Segment.cpp",
+        "src/Silf.cpp",
+        "src/Slot.cpp",
+        "src/Sparse.cpp",
+        "src/TtfUtil.cpp",
+        "src/UtfCodec.cpp",
+        "src/FileFace.cpp",
+        "src/json.cpp",
+    ]
+    if env["platform"] != "windows" or env["use_mingw"]:
+        thirdparty_graphite_sources += ["src/direct_machine.cpp"]
+    else:
+        thirdparty_graphite_sources += ["src/call_machine.cpp"]
+
+    thirdparty_graphite_sources = [thirdparty_graphite_dir + file for file in thirdparty_graphite_sources]
+
+    env_graphite.Append(CPPPATH=["../../../thirdparty/graphite/src", "../../../thirdparty/graphite/include"])
+    env_graphite.Append(
+        CPPDEFINES=[
+            "GRAPHITE2_STATIC",
+            "GRAPHITE2_NTRACING",
+            "GRAPHITE2_NFILEFACE",
+        ]
+    )
+
+    lib = env_graphite.Library(
+        f"graphite_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_graphite_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# ICU
+env_icu = env.Clone()
+env_icu.disable_warnings()
+
+thirdparty_icu_dir = "../../../thirdparty/icu4c/"
+thirdparty_icu_sources = [
+    "common/appendable.cpp",
+    "common/bmpset.cpp",
+    "common/brkeng.cpp",
+    "common/brkiter.cpp",
+    "common/bytesinkutil.cpp",
+    "common/bytestream.cpp",
+    "common/bytestrie.cpp",
+    "common/bytestriebuilder.cpp",
+    "common/bytestrieiterator.cpp",
+    "common/caniter.cpp",
+    "common/characterproperties.cpp",
+    "common/chariter.cpp",
+    "common/charstr.cpp",
+    "common/cmemory.cpp",
+    "common/cstr.cpp",
+    "common/cstring.cpp",
+    "common/cwchar.cpp",
+    "common/dictbe.cpp",
+    "common/dictionarydata.cpp",
+    "common/dtintrv.cpp",
+    "common/edits.cpp",
+    "common/emojiprops.cpp",
+    "common/errorcode.cpp",
+    "common/filteredbrk.cpp",
+    "common/filterednormalizer2.cpp",
+    "common/fixedstring.cpp",
+    "common/icudataver.cpp",
+    "common/icuplug.cpp",
+    "common/loadednormalizer2impl.cpp",
+    "common/localebuilder.cpp",
+    "common/localematcher.cpp",
+    "common/localeprioritylist.cpp",
+    "common/locavailable.cpp",
+    "common/locbased.cpp",
+    "common/locdispnames.cpp",
+    "common/locdistance.cpp",
+    "common/locdspnm.cpp",
+    "common/locid.cpp",
+    "common/loclikely.cpp",
+    "common/loclikelysubtags.cpp",
+    "common/locmap.cpp",
+    "common/locresdata.cpp",
+    "common/locutil.cpp",
+    "common/lsr.cpp",
+    "common/lstmbe.cpp",
+    "common/messagepattern.cpp",
+    "common/mlbe.cpp",
+    "common/normalizer2.cpp",
+    "common/normalizer2impl.cpp",
+    "common/normlzr.cpp",
+    "common/parsepos.cpp",
+    "common/patternprops.cpp",
+    "common/pluralmap.cpp",
+    "common/propname.cpp",
+    "common/propsvec.cpp",
+    "common/punycode.cpp",
+    "common/putil.cpp",
+    "common/rbbi.cpp",
+    "common/rbbi_cache.cpp",
+    "common/rbbidata.cpp",
+    "common/rbbinode.cpp",
+    "common/rbbirb.cpp",
+    "common/rbbiscan.cpp",
+    "common/rbbisetb.cpp",
+    "common/rbbistbl.cpp",
+    "common/rbbitblb.cpp",
+    "common/resbund.cpp",
+    "common/resbund_cnv.cpp",
+    "common/resource.cpp",
+    "common/restrace.cpp",
+    "common/ruleiter.cpp",
+    "common/schriter.cpp",
+    "common/serv.cpp",
+    "common/servlk.cpp",
+    "common/servlkf.cpp",
+    "common/servls.cpp",
+    "common/servnotf.cpp",
+    "common/servrbf.cpp",
+    "common/servslkf.cpp",
+    "common/sharedobject.cpp",
+    "common/simpleformatter.cpp",
+    "common/static_unicode_sets.cpp",
+    "common/stringpiece.cpp",
+    "common/stringtriebuilder.cpp",
+    "common/uarrsort.cpp",
+    "common/ubidi.cpp",
+    "common/ubidi_props.cpp",
+    "common/ubidiln.cpp",
+    "common/ubiditransform.cpp",
+    "common/ubidiwrt.cpp",
+    "common/ubrk.cpp",
+    "common/ucase.cpp",
+    "common/ucasemap.cpp",
+    "common/ucasemap_titlecase_brkiter.cpp",
+    "common/ucat.cpp",
+    "common/uchar.cpp",
+    "common/ucharstrie.cpp",
+    "common/ucharstriebuilder.cpp",
+    "common/ucharstrieiterator.cpp",
+    "common/uchriter.cpp",
+    "common/ucln_cmn.cpp",
+    "common/ucmndata.cpp",
+    "common/ucnv.cpp",
+    "common/ucnv2022.cpp",
+    "common/ucnv_bld.cpp",
+    "common/ucnv_cb.cpp",
+    "common/ucnv_cnv.cpp",
+    "common/ucnv_ct.cpp",
+    "common/ucnv_err.cpp",
+    "common/ucnv_ext.cpp",
+    "common/ucnv_io.cpp",
+    "common/ucnv_lmb.cpp",
+    "common/ucnv_set.cpp",
+    "common/ucnv_u16.cpp",
+    "common/ucnv_u32.cpp",
+    "common/ucnv_u7.cpp",
+    "common/ucnv_u8.cpp",
+    "common/ucnvbocu.cpp",
+    "common/ucnvdisp.cpp",
+    "common/ucnvhz.cpp",
+    "common/ucnvisci.cpp",
+    "common/ucnvlat1.cpp",
+    "common/ucnvmbcs.cpp",
+    "common/ucnvscsu.cpp",
+    "common/ucnvsel.cpp",
+    "common/ucol_swp.cpp",
+    "common/ucptrie.cpp",
+    "common/ucurr.cpp",
+    "common/udata.cpp",
+    "common/udatamem.cpp",
+    "common/udataswp.cpp",
+    "common/uenum.cpp",
+    "common/uhash.cpp",
+    "common/uhash_us.cpp",
+    "common/uidna.cpp",
+    "common/uinit.cpp",
+    "common/uinvchar.cpp",
+    "common/uiter.cpp",
+    "common/ulist.cpp",
+    "common/uloc.cpp",
+    "common/uloc_keytype.cpp",
+    "common/uloc_tag.cpp",
+    "common/ulocale.cpp",
+    "common/ulocbuilder.cpp",
+    "common/umapfile.cpp",
+    "common/umath.cpp",
+    "common/umutablecptrie.cpp",
+    "common/umutex.cpp",
+    "common/unames.cpp",
+    "common/unifiedcache.cpp",
+    "common/unifilt.cpp",
+    "common/unifunct.cpp",
+    "common/uniset.cpp",
+    "common/uniset_closure.cpp",
+    "common/uniset_props.cpp",
+    "common/unisetspan.cpp",
+    "common/unistr.cpp",
+    "common/unistr_case.cpp",
+    "common/unistr_case_locale.cpp",
+    "common/unistr_cnv.cpp",
+    "common/unistr_props.cpp",
+    "common/unistr_titlecase_brkiter.cpp",
+    "common/unorm.cpp",
+    "common/unormcmp.cpp",
+    "common/uobject.cpp",
+    "common/uprops.cpp",
+    "common/ures_cnv.cpp",
+    "common/uresbund.cpp",
+    "common/uresdata.cpp",
+    "common/usc_impl.cpp",
+    "common/uscript.cpp",
+    "common/uscript_props.cpp",
+    "common/uset.cpp",
+    "common/uset_props.cpp",
+    "common/usetiter.cpp",
+    # "common/ushape.cpp",
+    "common/usprep.cpp",
+    "common/ustack.cpp",
+    "common/ustr_cnv.cpp",
+    "common/ustr_titlecase_brkiter.cpp",
+    "common/ustr_wcs.cpp",
+    "common/ustrcase.cpp",
+    "common/ustrcase_locale.cpp",
+    "common/ustrenum.cpp",
+    "common/ustrfmt.cpp",
+    "common/ustring.cpp",
+    "common/ustrtrns.cpp",
+    "common/utext.cpp",
+    "common/utf_impl.cpp",
+    "common/util.cpp",
+    "common/util_props.cpp",
+    "common/utrace.cpp",
+    "common/utrie.cpp",
+    "common/utrie2.cpp",
+    "common/utrie2_builder.cpp",
+    "common/utrie_swap.cpp",
+    "common/uts46.cpp",
+    "common/utypes.cpp",
+    "common/uvector.cpp",
+    "common/uvectr32.cpp",
+    "common/uvectr64.cpp",
+    "common/wintz.cpp",
+    "i18n/scriptset.cpp",
+    "i18n/ucln_in.cpp",
+    "i18n/uspoof.cpp",
+    "i18n/uspoof_impl.cpp",
+]
+thirdparty_icu_sources = [thirdparty_icu_dir + file for file in thirdparty_icu_sources]
+
+if env["static_icu_data"]:
+    env_icu.Depends("../../../thirdparty/icu4c/icudata.gen.h", "../../../thirdparty/icu4c/icudt_godot.dat")
+    env_icu.Command(
+        "../../../thirdparty/icu4c/icudata.gen.h", "../../../thirdparty/icu4c/icudt_godot.dat", methods.make_icu_data
+    )
+    env.Append(CPPDEFINES=["ICU_STATIC_DATA"])
+    env.Append(CPPPATH=["../../../thirdparty/icu4c/"])
+else:
+    thirdparty_icu_sources += ["../icu_data/icudata_stub.cpp"]
+
+env_icu.Append(CPPPATH=["../../../thirdparty/icu4c/common/", "../../../thirdparty/icu4c/i18n/"])
+env_icu.Append(
+    CPPDEFINES=[
+        "U_STATIC_IMPLEMENTATION",
+        "U_COMMON_IMPLEMENTATION",
+        "UCONFIG_NO_COLLATION",
+        "UCONFIG_NO_CONVERSION",
+        "UCONFIG_NO_FORMATTING",
+        "UCONFIG_NO_SERVICE",
+        "UCONFIG_NO_IDNA",
+        "UCONFIG_NO_FILE_IO",
+        "UCONFIG_NO_TRANSLITERATION",
+        ("PKGDATA_MODE", "static"),
+        ("U_ENABLE_DYLOAD", 0),
+        ("U_HAVE_LIB_SUFFIX", 1),
+        ("U_LIB_SUFFIX_C_NAME", "_godot"),
+    ]
+)
+env.Append(
+    CPPDEFINES=[
+        "U_STATIC_IMPLEMENTATION",
+        ("U_HAVE_LIB_SUFFIX", 1),
+        ("U_LIB_SUFFIX_C_NAME", "_godot"),
+    ]
+)
+env.Append(CPPPATH=["../../../thirdparty/icu4c/common/", "../../../thirdparty/icu4c/i18n/"])
+
+if env["platform"] == "windows":
+    env.Append(LIBS=["advapi32"])
+
+lib = env_icu.Library(f"icu_builtin{env['suffix']}{env['LIBSUFFIX']}", thirdparty_icu_sources)
+env.Append(LIBS=[lib])
+
+env.Append(CPPDEFINES=["GDEXTENSION"])
+env.Append(CPPPATH=["../"])
+sources = Glob("../*.cpp")
+
+if env["platform"] == "macos":
+    methods.write_macos_plist(
+        f"./bin/libtextserver_advanced.macos.{env['target']}.framework",
+        f"libtextserver_advanced.macos.{env['target']}",
+        "org.godotengine.textserver_advanced",
+        "ICU / HarfBuzz / Graphite Text Server",
+    )
+    library = env.SharedLibrary(
+        f"./bin/libtextserver_advanced.macos.{env['target']}.framework/libtextserver_advanced.macos.{env['target']}",
+        source=sources,
+    )
+else:
+    library = env.SharedLibrary(
+        f"./bin/libtextserver_advanced{env['suffix']}{env['SHLIBSUFFIX']}",
+        source=sources,
+    )
+
+Default(library)
+
+methods.prepare_timer()
diff --git a/engine/modules/text_server_adv/gdextension_build/methods.py b/engine/modules/text_server_adv/gdextension_build/methods.py
new file mode 100644
index 00000000..c12b8c8a
--- /dev/null
+++ b/engine/modules/text_server_adv/gdextension_build/methods.py
@@ -0,0 +1,84 @@
+def disable_warnings(self):
+    # 'self' is the environment
+    if self["platform"] == "windows" and not self["use_mingw"]:
+        # We have to remove existing warning level defines before appending /w,
+        # otherwise we get: "warning D9025 : overriding '/W3' with '/w'"
+        WARN_FLAGS = ["/Wall", "/W4", "/W3", "/W2", "/W1", "/W0"]
+        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if x not in WARN_FLAGS]
+        self["CFLAGS"] = [x for x in self["CFLAGS"] if x not in WARN_FLAGS]
+        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if x not in WARN_FLAGS]
+        self.AppendUnique(CCFLAGS=["/w"])
+    else:
+        self.AppendUnique(CCFLAGS=["-w"])
+
+
+def prepare_timer():
+    import atexit
+    import time
+
+    def print_elapsed_time(time_at_start: float):
+        time_elapsed = time.time() - time_at_start
+        time_formatted = time.strftime("%H:%M:%S", time.gmtime(time_elapsed))
+        time_centiseconds = round((time_elapsed % 1) * 100)
+        print(f"[Time elapsed: {time_formatted}.{time_centiseconds}]")
+
+    atexit.register(print_elapsed_time, time.time())
+
+
+def make_icu_data(target, source, env):
+    dst = target[0].srcnode().abspath
+    with open(dst, "w", encoding="utf-8", newline="\n") as g:
+        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
+        g.write("/* (C) 2016 and later: Unicode, Inc. and others. */\n")
+        g.write("/* License & terms of use: https://www.unicode.org/copyright.html */\n")
+        g.write("#ifndef _ICU_DATA_H\n")
+        g.write("#define _ICU_DATA_H\n")
+        g.write('#include "unicode/utypes.h"\n')
+        g.write('#include "unicode/udata.h"\n')
+        g.write('#include "unicode/uversion.h"\n')
+
+        with open(source[0].srcnode().abspath, "rb") as f:
+            buf = f.read()
+
+        g.write('extern "C" U_EXPORT const size_t U_ICUDATA_SIZE = ' + str(len(buf)) + ";\n")
+        g.write('extern "C" U_EXPORT const unsigned char U_ICUDATA_ENTRY_POINT[] = {\n')
+        for i in range(len(buf)):
+            g.write("\t" + str(buf[i]) + ",\n")
+
+        g.write("};\n")
+        g.write("#endif")
+
+
+def write_macos_plist(target, binary_name, identifier, name):
+    import os
+
+    os.makedirs(f"{target}/Resource/", exist_ok=True)
+    with open(f"{target}/Resource/Info.plist", "w", encoding="utf-8", newline="\n") as f:
+        f.write(f"""\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>{binary_name}</string>
+	<key>CFBundleIdentifier</key>
+	<string>{identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>{name}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>
+""")
diff --git a/engine/modules/text_server_adv/gdextension_build/text_server_adv.gdextension b/engine/modules/text_server_adv/gdextension_build/text_server_adv.gdextension
new file mode 100644
index 00000000..bcf3661a
--- /dev/null
+++ b/engine/modules/text_server_adv/gdextension_build/text_server_adv.gdextension
@@ -0,0 +1,25 @@
+[configuration]
+
+entry_symbol = "textserver_advanced_init"
+compatibility_minimum = 4.1
+
+[libraries]
+
+linux.x86_64.debug = "bin/libtextserver_advanced.linux.template_debug.x86_64.so"
+linux.x86_64.release = "bin/libtextserver_advanced.linux.template_release.x86_64.so"
+linux.x86_32.debug = "bin/libtextserver_advanced.linux.template_debug.x86_32.so"
+linux.x86_32.release = "bin/libtextserver_advanced.linux.template_release.x86_32.so"
+linux.arm64.debug = "bin/libtextserver_advanced.linux.template_debug.arm64.so"
+linux.arm64.release = "bin/libtextserver_advanced.linux.template_release.arm64.so"
+linux.rv64.debug = "bin/libtextserver_advanced.linux.template_debug.rv64.so"
+linux.rv64.release = "bin/libtextserver_advanced.linux.template_release.rv64.so"
+
+windows.x86_64.debug = "bin/libtextserver_advanced.windows.template_debug.x86_64.dll"
+windows.x86_64.release = "bin/libtextserver_advanced.windows.template_release.x86_64.dll"
+windows.x86_32.debug = "bin/libtextserver_advanced.windows.template_debug.x86_32.dll"
+windows.x86_32.release = "bin/libtextserver_advanced.windows.template_release.x86_32.dll"
+windows.arm64.debug = "bin/libtextserver_advanced.windows.template_debug.arm64.dll"
+windows.arm64.release = "bin/libtextserver_advanced.windows.template_release.arm64.dll"
+
+macos.debug = "bin/libtextserver_advanced.macos.template_debug.framework"
+macos.release = "bin/libtextserver_advanced.macos.template_release.framework"
diff --git a/engine/modules/text_server_adv/register_types.cpp b/engine/modules/text_server_adv/register_types.cpp
index bd318a16..ba67fef7 100644
--- a/engine/modules/text_server_adv/register_types.cpp
+++ b/engine/modules/text_server_adv/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "text_server_adv.h"
 
-#include "core/object/class_db.h"
-
 void initialize_text_server_adv_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		return;
@@ -53,3 +51,27 @@ void uninitialize_text_server_adv_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 }
+
+#ifdef GDEXTENSION
+
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/defs.hpp>
+#include <godot_cpp/core/memory.hpp>
+
+using namespace godot;
+
+extern "C" {
+
+GDExtensionBool GDE_EXPORT textserver_advanced_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
+
+	init_obj.register_initializer(&initialize_text_server_adv_module);
+	init_obj.register_terminator(&uninitialize_text_server_adv_module);
+	init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SERVERS);
+
+	return init_obj.init();
+}
+
+} // ! extern "C"
+
+#endif // ! GDEXTENSION
diff --git a/engine/modules/text_server_adv/register_types.h b/engine/modules/text_server_adv/register_types.h
index fb33953c..bf1f7d9f 100644
--- a/engine/modules/text_server_adv/register_types.h
+++ b/engine/modules/text_server_adv/register_types.h
@@ -30,7 +30,12 @@
 
 #pragma once
 
+#ifdef GDEXTENSION
+#include <godot_cpp/core/class_db.hpp>
+using namespace godot;
+#elif defined(GODOT_MODULE)
 #include "modules/register_module_types.h"
+#endif
 
 void initialize_text_server_adv_module(ModuleInitializationLevel p_level);
 void uninitialize_text_server_adv_module(ModuleInitializationLevel p_level);
diff --git a/engine/modules/text_server_adv/script_iterator.h b/engine/modules/text_server_adv/script_iterator.h
index 7528b407..5d140b5a 100644
--- a/engine/modules/text_server_adv/script_iterator.h
+++ b/engine/modules/text_server_adv/script_iterator.h
@@ -30,17 +30,32 @@
 
 #pragma once
 
+#ifdef GDEXTENSION
+
+// Headers for building as GDExtension plug-in.
+#include <godot_cpp/godot.hpp>
+#include <godot_cpp/templates/vector.hpp>
+#include <godot_cpp/variant/string.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+
+// Headers for building as built-in module.
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 
-#include <hb-icu.h>
-#include <hb.h>
+#endif
+
 #include <unicode/uchar.h>
 #include <unicode/uloc.h>
 #include <unicode/uscript.h>
 #include <unicode/ustring.h>
 #include <unicode/utypes.h>
 
+#include <hb-icu.h>
+#include <hb.h>
+
 class ScriptIterator {
 	static const int PAREN_STACK_DEPTH = 128;
 	static const int EMOJI_STACK_DEPTH = 32;
diff --git a/engine/modules/text_server_adv/text_server_adv.cpp b/engine/modules/text_server_adv/text_server_adv.cpp
index 39795755..550f4b86 100644
--- a/engine/modules/text_server_adv/text_server_adv.cpp
+++ b/engine/modules/text_server_adv/text_server_adv.cpp
@@ -30,18 +30,35 @@
 
 #include "text_server_adv.h"
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/classes/file_access.hpp>
+#include <godot_cpp/classes/os.hpp>
+#include <godot_cpp/classes/project_settings.hpp>
+#include <godot_cpp/classes/rendering_server.hpp>
+#include <godot_cpp/classes/translation_server.hpp>
+#include <godot_cpp/core/error_macros.hpp>
+
+using namespace godot;
+
+#define GLOBAL_GET(m_var) ProjectSettings::get_singleton()->get_setting_with_override(m_var)
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/file_access.h"
-#include "core/math/math_funcs_binary.h"
-#include "core/object/callable_mp.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/image_texture.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 
+#endif
+
 // Built-in ICU data.
 
 #ifdef ICU_STATIC_DATA
@@ -363,7 +380,11 @@ bool TextServerAdvanced::_has_feature(Feature p_feature) const {
 }
 
 String TextServerAdvanced::_get_name() const {
+#ifdef GDEXTENSION
+	return "ICU / HarfBuzz / Graphite (GDExtension)";
+#elif defined(GODOT_MODULE)
 	return "ICU / HarfBuzz / Graphite (Built-in)";
+#endif
 }
 
 int64_t TextServerAdvanced::_get_features() const {
@@ -849,17 +870,17 @@ _FORCE_INLINE_ TextServerAdvanced::FontTexturePosition TextServerAdvanced::find_
 		// Could not find texture to fit, create one.
 		int texsize = MAX(p_data->size.x * 0.125, 256);
 
-		texsize = Math::next_power_of_2((uint32_t)texsize);
+		texsize = next_power_of_2((uint32_t)texsize);
 		if (p_msdf) {
 			texsize = MIN(texsize, 2048);
 		} else {
 			texsize = MIN(texsize, 1024);
 		}
 		if (mw > texsize) { // Special case, adapt to it?
-			texsize = Math::next_power_of_2((uint32_t)mw);
+			texsize = next_power_of_2((uint32_t)mw);
 		}
 		if (mh > texsize) { // Special case, adapt to it?
-			texsize = Math::next_power_of_2((uint32_t)mh);
+			texsize = next_power_of_2((uint32_t)mh);
 		}
 
 		ShelfPackTexture tex = ShelfPackTexture(texsize, texsize);
@@ -1085,72 +1106,6 @@ _FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_msdf(
 #endif
 
 #ifdef MODULE_FREETYPE_ENABLED
-#if HB_VERSION_ATLEAST(13, 0, 0)
-_FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_hb_bitmap(FontForSizeAdvanced *p_data, int p_rect_margin, hb_raster_image_t *p_image, const hb_raster_extents_t &p_ext, const Vector2 &p_advance, bool p_bgra) const {
-	FontGlyph chr;
-	chr.advance = p_advance * p_data->scale;
-	chr.found = true;
-
-	int w = p_ext.width;
-	int h = p_ext.height;
-
-	if (w == 0 || h == 0 || p_image == nullptr) {
-		chr.texture_idx = -1;
-		chr.uv_rect = Rect2();
-		chr.rect = Rect2();
-		return chr;
-	}
-
-	int color_size = p_bgra ? 4 : 2;
-
-	int mw = w + p_rect_margin * 4;
-	int mh = h + p_rect_margin * 4;
-
-	ERR_FAIL_COND_V(mw > 4096, FontGlyph());
-	ERR_FAIL_COND_V(mh > 4096, FontGlyph());
-
-	Image::Format require_format = color_size == 4 ? Image::FORMAT_RGBA8 : Image::FORMAT_LA8;
-
-	FontTexturePosition tex_pos = find_texture_pos_for_glyph(p_data, color_size, require_format, mw, mh, false);
-	ERR_FAIL_COND_V(tex_pos.index < 0, FontGlyph());
-
-	const uint8_t *img_src = hb_raster_image_get_buffer(p_image);
-
-	// Fit character in char texture.
-	ShelfPackTexture &tex = p_data->textures.write[tex_pos.index];
-
-	{
-		uint8_t *wr = tex.image->ptrw();
-
-		for (int i = 0; i < h; i++) {
-			for (int j = 0; j < w; j++) {
-				int ofs = ((i + tex_pos.y + p_rect_margin * 2) * tex.texture_w + j + tex_pos.x + p_rect_margin * 2) * color_size;
-				ERR_FAIL_COND_V(ofs >= tex.image->get_data_size(), FontGlyph());
-				if (p_bgra) {
-					int ofs_color = i * p_ext.stride + (j << 2);
-					wr[ofs + 2] = img_src[ofs_color + 0];
-					wr[ofs + 1] = img_src[ofs_color + 1];
-					wr[ofs + 0] = img_src[ofs_color + 2];
-					wr[ofs + 3] = img_src[ofs_color + 3];
-				} else {
-					wr[ofs + 0] = 255; // grayscale as 1
-					wr[ofs + 1] = img_src[i * p_ext.stride + j];
-				}
-			}
-		}
-	}
-
-	tex.dirty = true;
-
-	chr.texture_idx = tex_pos.index;
-
-	chr.uv_rect = Rect2(tex_pos.x + p_rect_margin, tex_pos.y + p_rect_margin, w + p_rect_margin * 2, h + p_rect_margin * 2);
-	chr.rect.position = Vector2(p_ext.x_origin - p_rect_margin, p_ext.y_origin - p_rect_margin) * p_data->scale;
-	chr.rect.size = chr.uv_rect.size * p_data->scale;
-	return chr;
-}
-#endif
-
 _FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_bitmap(FontForSizeAdvanced *p_data, int p_rect_margin, FT_Bitmap p_bitmap, int p_yofs, int p_xofs, const Vector2 &p_advance, bool p_bgra) const {
 	FontGlyph chr;
 	chr.advance = p_advance * p_data->scale;
@@ -1159,7 +1114,7 @@ _FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_bitma
 	int w = p_bitmap.width;
 	int h = p_bitmap.rows;
 
-	if (w == 0 || h == 0 || p_bitmap.buffer == nullptr) {
+	if (w == 0 || h == 0) {
 		chr.texture_idx = -1;
 		chr.uv_rect = Rect2();
 		chr.rect = Rect2();
@@ -1310,7 +1265,7 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 
 #ifdef MODULE_FREETYPE_ENABLED
 	FontGlyph gl;
-	if (p_font_data->face) {
+	if (fd->face) {
 		FT_Int32 flags = FT_LOAD_DEFAULT;
 
 		bool outline = p_size.y > 0;
@@ -1328,17 +1283,17 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 		if (p_font_data->force_autohinter) {
 			flags |= FT_LOAD_FORCE_AUTOHINT;
 		}
-		if (outline || (p_font_data->disable_embedded_bitmaps && !FT_HAS_COLOR(p_font_data->face))) {
+		if (outline || (p_font_data->disable_embedded_bitmaps && !FT_HAS_COLOR(fd->face))) {
 			flags |= FT_LOAD_NO_BITMAP;
-		} else if (FT_HAS_COLOR(p_font_data->face)) {
+		} else if (FT_HAS_COLOR(fd->face)) {
 			flags |= FT_LOAD_COLOR;
 		}
 
 		FT_Fixed v, h;
-		FT_Get_Advance(p_font_data->face, glyph_index, flags, &h);
-		FT_Get_Advance(p_font_data->face, glyph_index, flags | FT_LOAD_VERTICAL_LAYOUT, &v);
+		FT_Get_Advance(fd->face, glyph_index, flags, &h);
+		FT_Get_Advance(fd->face, glyph_index, flags | FT_LOAD_VERTICAL_LAYOUT, &v);
 
-		int error = FT_Load_Glyph(p_font_data->face, glyph_index, flags);
+		int error = FT_Load_Glyph(fd->face, glyph_index, flags);
 		if (error) {
 			E = fd->glyph_map.insert(p_glyph, FontGlyph());
 			r_glyph = E->value;
@@ -1348,21 +1303,21 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 		if (!p_font_data->msdf) {
 			if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
 				FT_Pos xshift = (int)((p_glyph >> 27) & 3) << 4;
-				FT_Outline_Translate(&p_font_data->face->glyph->outline, xshift, 0);
+				FT_Outline_Translate(&fd->face->glyph->outline, xshift, 0);
 			} else if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
 				FT_Pos xshift = (int)((p_glyph >> 27) & 3) << 5;
-				FT_Outline_Translate(&p_font_data->face->glyph->outline, xshift, 0);
+				FT_Outline_Translate(&fd->face->glyph->outline, xshift, 0);
 			}
 		}
 
 		if (p_font_data->embolden != 0.f) {
 			FT_Pos strength = p_font_data->embolden * p_size.x / 16; // 26.6 fractional units (1 / 64).
-			FT_Outline_Embolden(&p_font_data->face->glyph->outline, strength);
+			FT_Outline_Embolden(&fd->face->glyph->outline, strength);
 		}
 
 		if (p_font_data->transform != Transform2D()) {
 			FT_Matrix mat = { FT_Fixed(p_font_data->transform[0][0] * 65536), FT_Fixed(p_font_data->transform[0][1] * 65536), FT_Fixed(p_font_data->transform[1][0] * 65536), FT_Fixed(p_font_data->transform[1][1] * 65536) }; // 16.16 fractional units (1 / 65536).
-			FT_Outline_Transform(&p_font_data->face->glyph->outline, &mat);
+			FT_Outline_Transform(&fd->face->glyph->outline, &mat);
 		}
 
 		FT_Render_Mode aa_mode = FT_RENDER_MODE_NORMAL;
@@ -1400,93 +1355,22 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 			} break;
 		}
 
-		FT_GlyphSlot slot = p_font_data->face->glyph;
-		bool fix_edge = (slot->format == FT_GLYPH_FORMAT_SVG); // Need to check before FT_Render_Glyph as it will change format to bitmap.
-		bool from_bitmap = (slot->format == FT_GLYPH_FORMAT_BITMAP);
+		FT_GlyphSlot slot = fd->face->glyph;
+		bool from_svg = (slot->format == FT_GLYPH_FORMAT_SVG); // Need to check before FT_Render_Glyph as it will change format to bitmap.
 		if (!outline) {
-			if (p_font_data->msdf) {
+			if (!p_font_data->msdf) {
+				error = FT_Render_Glyph(slot, aa_mode);
+			}
+			if (!error) {
+				if (p_font_data->msdf) {
 #ifdef MODULE_MSDFGEN_ENABLED
-				gl = rasterize_msdf(p_font_data, fd, p_font_data->msdf_range, rect_range, &slot->outline, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0);
+					gl = rasterize_msdf(p_font_data, fd, p_font_data->msdf_range, rect_range, &slot->outline, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0);
 #else
-				fd->glyph_map[p_glyph] = FontGlyph();
-				ERR_FAIL_V_MSG(false, "Compiled without MSDFGEN support!");
+					fd->glyph_map[p_glyph] = FontGlyph();
+					ERR_FAIL_V_MSG(false, "Compiled without MSDFGEN support!");
 #endif
-			} else {
-#if HB_VERSION_ATLEAST(13, 0, 0)
-				if (p_font_data->hb_rdr && p_font_data->hb_mono && p_font_data->antialiasing == FONT_ANTIALIASING_GRAY && !from_bitmap) {
-					bool is_rasterized = false;
-					float xshift = 0.0;
-					if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
-						xshift = float((int)((p_glyph >> 27) & 3) << 4);
-					} else if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
-						xshift = float((int)((p_glyph >> 27) & 3) << 5);
-					}
-					xshift += (p_font_data->embolden * double(p_size.x) / 64.0);
-					if (fd->color_paint) {
-						hb_raster_paint_reset(p_font_data->hb_rdr);
-						if (p_font_data->transform != Transform2D()) {
-							hb_raster_paint_set_transform(p_font_data->hb_rdr, p_font_data->transform[0][0], p_font_data->transform[1][0], p_font_data->transform[0][1], -p_font_data->transform[1][1], 0.f, 0.f);
-						} else {
-							hb_raster_paint_set_transform(p_font_data->hb_rdr, 1.f, 0.f, 0.f, -1.f, 0.f, 0.f);
-						}
-						hb_raster_paint_set_scale_factor(p_font_data->hb_rdr, 64.0, 64.0);
-						hb_raster_paint_clear_custom_palette_colors(p_font_data->hb_rdr);
-						if (!p_font_data->palette_custom_colors_hb.is_empty()) {
-							for (int col = 0; col < p_font_data->palette_custom_colors_hb.size(); col++) {
-								if (p_font_data->palette_custom_colors_hb[col] != 0) {
-									hb_raster_paint_set_custom_palette_color(p_font_data->hb_rdr, col, p_font_data->palette_custom_colors_hb[col]);
-								}
-							}
-						}
-						bool ok = hb_raster_paint_glyph(p_font_data->hb_rdr, fd->hb_handle, (hb_codepoint_t)glyph_index, xshift, 0, p_font_data->palette_index, (hb_color_t)0xFFFFFFFF);
-						if (ok) {
-							is_rasterized = true;
-							fix_edge = false;
-							hb_raster_image_t *img = hb_raster_paint_render(p_font_data->hb_rdr);
-							hb_raster_extents_t ext = { 0, 0, 0, 0, 0 };
-							if (img) {
-								hb_raster_image_get_extents(img, &ext);
-								gl = rasterize_hb_bitmap(fd, rect_range, img, ext, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, true);
-								hb_raster_paint_recycle_image(p_font_data->hb_rdr, img);
-							} else {
-								gl = rasterize_hb_bitmap(fd, rect_range, nullptr, ext, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, true);
-							}
-						}
-					}
-					if (!is_rasterized && !fix_edge) {
-						hb_raster_draw_reset(p_font_data->hb_mono);
-						if (p_font_data->transform != Transform2D()) {
-							hb_raster_draw_set_transform(p_font_data->hb_mono, p_font_data->transform[0][0], p_font_data->transform[1][0], p_font_data->transform[0][1], -p_font_data->transform[1][1], 0.f, 0.f);
-						} else {
-							hb_raster_draw_set_transform(p_font_data->hb_mono, 1.f, 0.f, 0.f, -1.f, 0.f, 0.f);
-						}
-						hb_raster_draw_set_scale_factor(p_font_data->hb_mono, 64.0, 64.0);
-						hb_raster_draw_glyph(p_font_data->hb_mono, fd->hb_handle, (hb_codepoint_t)glyph_index, xshift, 0);
-						hb_raster_image_t *img = hb_raster_draw_render(p_font_data->hb_mono);
-						hb_raster_extents_t ext = { 0, 0, 0, 0, 0 };
-						if (img) {
-							is_rasterized = true;
-							hb_raster_image_get_extents(img, &ext);
-							gl = rasterize_hb_bitmap(fd, rect_range, img, ext, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, false);
-							hb_raster_draw_recycle_image(p_font_data->hb_mono, img);
-						} else {
-							gl = rasterize_hb_bitmap(fd, rect_range, nullptr, ext, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, false);
-						}
-					}
-					if (!is_rasterized) {
-						error = FT_Render_Glyph(slot, aa_mode);
-						if (!error) {
-							gl = rasterize_bitmap(fd, rect_range, slot->bitmap, slot->bitmap_top, slot->bitmap_left, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, bgra);
-						}
-					}
 				} else {
-#else
-				{
-#endif
-					error = FT_Render_Glyph(slot, aa_mode);
-					if (!error) {
-						gl = rasterize_bitmap(fd, rect_range, slot->bitmap, slot->bitmap_top, slot->bitmap_left, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, bgra);
-					}
+					gl = rasterize_bitmap(fd, rect_range, slot->bitmap, slot->bitmap_top, slot->bitmap_left, Vector2((h + (1 << 9)) >> 10, (v + (1 << 9)) >> 10) / 64.0, bgra);
 				}
 			}
 		} else {
@@ -1500,7 +1384,7 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 			FT_Glyph glyph;
 			FT_BitmapGlyph glyph_bitmap;
 
-			if (FT_Get_Glyph(p_font_data->face->glyph, &glyph) != 0) {
+			if (FT_Get_Glyph(fd->face->glyph, &glyph) != 0) {
 				goto cleanup_stroker;
 			}
 			if (FT_Glyph_Stroke(&glyph, stroker, 1) != 0) {
@@ -1517,7 +1401,7 @@ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data, const Vector2i
 		cleanup_stroker:
 			FT_Stroker_Done(stroker);
 		}
-		gl.fix_edge = fix_edge;
+		gl.from_svg = from_svg;
 		E = fd->glyph_map.insert(p_glyph, gl);
 		r_glyph = E->value;
 		return gl.found;
@@ -1533,11 +1417,6 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 
 	HashMap<Vector2i, FontForSizeAdvanced *>::Iterator E = p_font_data->cache.find(p_size);
 	if (E) {
-#ifdef MODULE_FREETYPE_ENABLED
-		if (E->value->fsize != nullptr) {
-			FT_Activate_Size(E->value->fsize);
-		}
-#endif
 		r_cache_for_size = E->value;
 		// Size used directly, remove from oversampling list.
 		if (p_oversampling == 0 && E->value->viewport_oversampling != 0) {
@@ -1572,36 +1451,31 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 #endif
 			}
 
-			if (p_font_data->face == nullptr) {
-				memset(&p_font_data->stream, 0, sizeof(FT_StreamRec));
-				p_font_data->stream.base = (unsigned char *)p_font_data->data_ptr;
-				p_font_data->stream.size = p_font_data->data_size;
-				p_font_data->stream.pos = 0;
+			memset(&fd->stream, 0, sizeof(FT_StreamRec));
+			fd->stream.base = (unsigned char *)p_font_data->data_ptr;
+			fd->stream.size = p_font_data->data_size;
+			fd->stream.pos = 0;
 
-				FT_Open_Args fargs;
-				memset(&fargs, 0, sizeof(FT_Open_Args));
-				fargs.memory_base = (unsigned char *)p_font_data->data_ptr;
-				fargs.memory_size = p_font_data->data_size;
-				fargs.flags = FT_OPEN_MEMORY;
-				fargs.stream = &p_font_data->stream;
+			FT_Open_Args fargs;
+			memset(&fargs, 0, sizeof(FT_Open_Args));
+			fargs.memory_base = (unsigned char *)p_font_data->data_ptr;
+			fargs.memory_size = p_font_data->data_size;
+			fargs.flags = FT_OPEN_MEMORY;
+			fargs.stream = &fd->stream;
 
-				error = FT_Open_Face(ft_library, &fargs, p_font_data->face_index, &p_font_data->face);
-				if (error) {
-					if (p_font_data->face) {
-						FT_Done_Face(p_font_data->face);
-						p_font_data->face = nullptr;
-					}
-					memdelete(fd);
-					if (p_silent) {
-						return false;
-					} else {
-						ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "' (face_index=" + String::num_int64(p_font_data->face_index) + ").");
-					}
+			error = FT_Open_Face(ft_library, &fargs, p_font_data->face_index, &fd->face);
+			if (error) {
+				if (fd->face) {
+					FT_Done_Face(fd->face);
+					fd->face = nullptr;
+				}
+				memdelete(fd);
+				if (p_silent) {
+					return false;
+				} else {
+					ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "' (face_index=" + String::num_int64(p_font_data->face_index) + ").");
 				}
 			}
-
-			FT_New_Size(p_font_data->face, &fd->fsize);
-			FT_Activate_Size(fd->fsize);
 		}
 
 		double sz = double(fd->size.x) / 64.0;
@@ -1609,43 +1483,39 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 			sz = p_font_data->msdf_source_size;
 		}
 
-		if (FT_HAS_COLOR(p_font_data->face) && p_font_data->face->num_fixed_sizes > 0) {
+		if (FT_HAS_COLOR(fd->face) && fd->face->num_fixed_sizes > 0) {
 			int best_match = 0;
-			int diff = Math::abs(sz - ((int64_t)p_font_data->face->available_sizes[0].width));
-			fd->scale = sz / p_font_data->face->available_sizes[0].width;
-			for (int i = 1; i < p_font_data->face->num_fixed_sizes; i++) {
-				int ndiff = Math::abs(sz - ((int64_t)p_font_data->face->available_sizes[i].width));
+			int diff = Math::abs(sz - ((int64_t)fd->face->available_sizes[0].width));
+			fd->scale = sz / fd->face->available_sizes[0].width;
+			for (int i = 1; i < fd->face->num_fixed_sizes; i++) {
+				int ndiff = Math::abs(sz - ((int64_t)fd->face->available_sizes[i].width));
 				if (ndiff < diff) {
 					best_match = i;
 					diff = ndiff;
-					fd->scale = sz / p_font_data->face->available_sizes[i].width;
+					fd->scale = sz / fd->face->available_sizes[i].width;
 				}
 			}
-			FT_Select_Size(p_font_data->face, best_match);
+			FT_Select_Size(fd->face, best_match);
 		} else {
 			FT_Size_RequestRec req;
 			req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
-			req.width = MIN(2048.0, sz) * 64.0;
-			req.height = MIN(2048.0, sz) * 64.0;
+			req.width = sz * 64.0;
+			req.height = sz * 64.0;
 			req.horiResolution = 0;
 			req.vertResolution = 0;
 
-			FT_Request_Size(p_font_data->face, &req);
-			if (p_font_data->face->size->metrics.y_ppem != 0) {
-				fd->scale = sz / (double)p_font_data->face->size->metrics.y_ppem;
+			FT_Request_Size(fd->face, &req);
+			if (fd->face->size->metrics.y_ppem != 0) {
+				fd->scale = sz / (double)fd->face->size->metrics.y_ppem;
 			}
 		}
 
-		fd->hb_handle = hb_ft_font_create(p_font_data->face, nullptr);
+		fd->hb_handle = hb_ft_font_create(fd->face, nullptr);
 
-		if (p_font_data->embolden != 0.0) {
-			hb_font_set_synthetic_bold(fd->hb_handle, p_font_data->embolden / 16.0, p_font_data->embolden / 16.0, true);
-		}
-
-		fd->ascent = (p_font_data->face->size->metrics.ascender / 64.0) * fd->scale;
-		fd->descent = (-p_font_data->face->size->metrics.descender / 64.0) * fd->scale;
-		fd->underline_position = (-FT_MulFix(p_font_data->face->underline_position, p_font_data->face->size->metrics.y_scale) / 64.0) * fd->scale;
-		fd->underline_thickness = (FT_MulFix(p_font_data->face->underline_thickness, p_font_data->face->size->metrics.y_scale) / 64.0) * fd->scale;
+		fd->ascent = (fd->face->size->metrics.ascender / 64.0) * fd->scale;
+		fd->descent = (-fd->face->size->metrics.descender / 64.0) * fd->scale;
+		fd->underline_position = (-FT_MulFix(fd->face->underline_position, fd->face->size->metrics.y_scale) / 64.0) * fd->scale;
+		fd->underline_thickness = (FT_MulFix(fd->face->underline_thickness, fd->face->size->metrics.y_scale) / 64.0) * fd->scale;
 
 #if HB_VERSION_ATLEAST(3, 3, 0)
 		hb_font_set_synthetic_slant(fd->hb_handle, p_font_data->transform[0][1]);
@@ -1653,63 +1523,16 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 #ifndef _MSC_VER
 #warning Building with HarfBuzz < 3.3.0, synthetic slant offset correction disabled.
 #endif
-#endif
-#if HB_VERSION_ATLEAST(13, 0, 0)
-		fd->hb_face = hb_font_get_face(fd->hb_handle);
-		fd->color_paint = (hb_ot_color_has_paint(fd->hb_face) || hb_ot_color_has_layers(fd->hb_face));
 #endif
 
 		if (!p_font_data->face_init) {
-			const static hb_language_t english = hb_language_from_string("en", -1);
-#if HB_VERSION_ATLEAST(13, 0, 0)
-			hb_face_t *hb_face = fd->hb_face;
-
-			if (!p_font_data->hb_rdr) {
-				p_font_data->hb_rdr = hb_raster_paint_create_or_fail();
-			}
-			if (!p_font_data->hb_mono) {
-				p_font_data->hb_mono = hb_raster_draw_create_or_fail();
-			}
-
-			p_font_data->palette_names.clear();
-			p_font_data->palette_colors.clear();
-
-			unsigned int pal_count = hb_ot_color_palette_get_count(hb_face);
-			for (unsigned int pal = 0; pal < pal_count; pal++) {
-				String pal_name;
-				Vector<Color> pal_colors;
-				// Get name.
-				hb_ot_name_id_t name_id = hb_ot_color_palette_get_name_id(hb_face, pal);
-				if (name_id == HB_OT_NAME_ID_INVALID) {
-					pal_name = vformat("Palette %d", pal + 1);
-				} else {
-					unsigned int text_size = hb_ot_name_get_utf32(hb_face, name_id, english, nullptr, nullptr) + 1;
-					pal_name.resize_uninitialized(text_size);
-					hb_ot_name_get_utf32(hb_face, name_id, english, &text_size, (uint32_t *)pal_name.ptrw());
-				}
-				// Get colors.
-				unsigned int color_count = 0;
-				color_count = hb_ot_color_palette_get_colors(hb_face, pal, 0, &color_count, nullptr);
-				Vector<hb_color_t> pal_colors_hb;
-				pal_colors_hb.resize_uninitialized(color_count);
-				hb_ot_color_palette_get_colors(hb_face, pal, 0, &color_count, pal_colors_hb.ptrw());
-				for (unsigned int col = 0; col < color_count; col++) {
-					Color c = Color::from_rgba8(hb_color_get_red(pal_colors_hb[col]), hb_color_get_green(pal_colors_hb[col]), hb_color_get_blue(pal_colors_hb[col]), hb_color_get_alpha(pal_colors_hb[col]));
-					pal_colors.push_back(c);
-				}
-
-				p_font_data->palette_names.push_back(pal_name);
-				p_font_data->palette_colors.push_back(pal_colors);
-			}
-#else
-			hb_face_t *hb_face = hb_font_get_face(fd->hb_handle);
-#endif
 			// When a font does not provide a `family_name`, FreeType tries to synthesize one based on other names.
 			// FreeType automatically converts non-ASCII characters to "?" in the synthesized name.
 			// To avoid that behavior, use the format-specific name directly if available.
-
+			hb_face_t *hb_face = hb_font_get_face(fd->hb_handle);
 			unsigned int num_entries = 0;
 			const hb_ot_name_entry_t *names = hb_ot_name_list_names(hb_face, &num_entries);
+			const hb_language_t english = hb_language_from_string("en", -1);
 			for (unsigned int i = 0; i < num_entries; i++) {
 				if (names[i].name_id != HB_OT_NAME_ID_FONT_FAMILY) {
 					continue;
@@ -1721,22 +1544,22 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 				p_font_data->font_name.resize_uninitialized(text_size);
 				hb_ot_name_get_utf32(hb_face, names[i].name_id, names[i].language, &text_size, (uint32_t *)p_font_data->font_name.ptrw());
 			}
-			if (p_font_data->font_name.is_empty() && p_font_data->face->family_name != nullptr) {
-				p_font_data->font_name = String::utf8((const char *)p_font_data->face->family_name);
+			if (p_font_data->font_name.is_empty() && fd->face->family_name != nullptr) {
+				p_font_data->font_name = String::utf8((const char *)fd->face->family_name);
 			}
-			if (p_font_data->face->style_name != nullptr) {
-				p_font_data->style_name = String::utf8((const char *)p_font_data->face->style_name);
+			if (fd->face->style_name != nullptr) {
+				p_font_data->style_name = String::utf8((const char *)fd->face->style_name);
 			}
 			p_font_data->weight = _font_get_weight_by_name(p_font_data->style_name.to_lower());
 			p_font_data->stretch = _font_get_stretch_by_name(p_font_data->style_name.to_lower());
 			p_font_data->style_flags = 0;
-			if ((p_font_data->face->style_flags & FT_STYLE_FLAG_BOLD) || p_font_data->weight >= 700) {
+			if ((fd->face->style_flags & FT_STYLE_FLAG_BOLD) || p_font_data->weight >= 700) {
 				p_font_data->style_flags.set_flag(FONT_BOLD);
 			}
-			if ((p_font_data->face->style_flags & FT_STYLE_FLAG_ITALIC) || _is_ital_style(p_font_data->style_name.to_lower())) {
+			if ((fd->face->style_flags & FT_STYLE_FLAG_ITALIC) || _is_ital_style(p_font_data->style_name.to_lower())) {
 				p_font_data->style_flags.set_flag(FONT_ITALIC);
 			}
-			if (p_font_data->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) {
+			if (fd->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) {
 				p_font_data->style_flags.set_flag(FONT_FIXED_WIDTH);
 			}
 
@@ -1762,7 +1585,7 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 			}
 
 			// Get supported scripts from OS2 table.
-			TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(p_font_data->face, FT_SFNT_OS2);
+			TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(fd->face, FT_SFNT_OS2);
 			if (os2) {
 				if ((os2->ulUnicodeRange1 & 1L << 4) || (os2->ulUnicodeRange1 & 1L << 5) || (os2->ulUnicodeRange1 & 1L << 6) || (os2->ulUnicodeRange1 & 1L << 31) || (os2->ulUnicodeRange2 & 1L << 0) || (os2->ulUnicodeRange2 & 1L << 1) || (os2->ulUnicodeRange2 & 1L << 2) || (os2->ulUnicodeRange2 & 1L << 3) || (os2->ulUnicodeRange2 & 1L << 4) || (os2->ulUnicodeRange2 & 1L << 5) || (os2->ulUnicodeRange2 & 1L << 6) || (os2->ulUnicodeRange2 & 1L << 7) || (os2->ulUnicodeRange2 & 1L << 8) || (os2->ulUnicodeRange2 & 1L << 9) || (os2->ulUnicodeRange2 & 1L << 10) || (os2->ulUnicodeRange2 & 1L << 11) || (os2->ulUnicodeRange2 & 1L << 12) || (os2->ulUnicodeRange2 & 1L << 13) || (os2->ulUnicodeRange2 & 1L << 14) || (os2->ulUnicodeRange2 & 1L << 15) || (os2->ulUnicodeRange2 & 1L << 30) || (os2->ulUnicodeRange3 & 1L << 0) || (os2->ulUnicodeRange3 & 1L << 1) || (os2->ulUnicodeRange3 & 1L << 2) || (os2->ulUnicodeRange3 & 1L << 4) || (os2->ulUnicodeRange3 & 1L << 5) || (os2->ulUnicodeRange3 & 1L << 18) || (os2->ulUnicodeRange3 & 1L << 24) || (os2->ulUnicodeRange3 & 1L << 25) || (os2->ulUnicodeRange3 & 1L << 26) || (os2->ulUnicodeRange3 & 1L << 27) || (os2->ulUnicodeRange3 & 1L << 28) || (os2->ulUnicodeRange4 & 1L << 3) || (os2->ulUnicodeRange4 & 1L << 6) || (os2->ulUnicodeRange4 & 1L << 15) || (os2->ulUnicodeRange4 & 1L << 23) || (os2->ulUnicodeRange4 & 1L << 24) || (os2->ulUnicodeRange4 & 1L << 26)) {
 					p_font_data->supported_scripts.insert(HB_SCRIPT_COMMON);
@@ -1991,7 +1814,7 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 					if (U_SUCCESS(icu_err) && len > 0) {
 						String sample = String::utf16(sample_buf.ptr(), len);
 						for (int ch = 0; ch < sample.length(); ch++) {
-							if (FT_Get_Char_Index(p_font_data->face, sample[ch]) == 0) {
+							if (FT_Get_Char_Index(fd->face, sample[ch]) == 0) {
 								failed_scripts.push_back(scr_tag);
 								break;
 							}
@@ -2066,9 +1889,9 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 
 			// Read OpenType variations.
 			p_font_data->supported_varaitions.clear();
-			if (p_font_data->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+			if (fd->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
 				FT_MM_Var *amaster;
-				FT_Get_MM_Var(p_font_data->face, &amaster);
+				FT_Get_MM_Var(fd->face, &amaster);
 				for (FT_UInt i = 0; i < amaster->num_axis; i++) {
 					p_font_data->supported_varaitions[(int32_t)amaster->axis[i].tag] = Vector3i(amaster->axis[i].minimum / 65536, amaster->axis[i].maximum / 65536, amaster->axis[i].def / 65536);
 				}
@@ -2081,8 +1904,8 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 		if (p_font_data->font_name == ".Apple Color Emoji UI" || p_font_data->font_name == "Apple Color Emoji") {
 			// The baseline offset is missing from the Apple Color Emoji UI font data, so add it manually.
 			// This issue doesn't occur with other system emoji fonts.
-			if (!FT_Load_Glyph(p_font_data->face, FT_Get_Char_Index(p_font_data->face, 0x1F92E), FT_LOAD_DEFAULT | FT_LOAD_COLOR)) {
-				if (p_font_data->face->glyph->metrics.horiBearingY == p_font_data->face->glyph->metrics.height) {
+			if (!FT_Load_Glyph(fd->face, FT_Get_Char_Index(fd->face, 0x1F92E), FT_LOAD_DEFAULT | FT_LOAD_COLOR)) {
+				if (fd->face->glyph->metrics.horiBearingY == fd->face->glyph->metrics.height) {
 					p_font_data->baseline_offset = 0.15;
 				}
 			}
@@ -2090,16 +1913,16 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 #endif
 
 		// Write variations.
-		if (p_font_data->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+		if (fd->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
 			FT_MM_Var *amaster;
 
-			FT_Get_MM_Var(p_font_data->face, &amaster);
+			FT_Get_MM_Var(fd->face, &amaster);
 
 			Vector<hb_variation_t> hb_vars;
 			Vector<FT_Fixed> coords;
 			coords.resize(amaster->num_axis);
 
-			FT_Get_Var_Design_Coordinates(p_font_data->face, coords.size(), coords.ptrw());
+			FT_Get_Var_Design_Coordinates(fd->face, coords.size(), coords.ptrw());
 
 			for (FT_UInt i = 0; i < amaster->num_axis; i++) {
 				hb_variation_t var;
@@ -2122,7 +1945,7 @@ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_font_data, const
 				hb_vars.push_back(var);
 			}
 
-			FT_Set_Var_Design_Coordinates(p_font_data->face, coords.size(), coords.ptrw());
+			FT_Set_Var_Design_Coordinates(fd->face, coords.size(), coords.ptrw());
 			hb_font_set_variations(fd->hb_handle, hb_vars.is_empty() ? nullptr : &hb_vars[0], hb_vars.size());
 			FT_Done_MM_Var(ft_library, amaster);
 		}
@@ -2224,7 +2047,7 @@ bool TextServerAdvanced::_font_is_color(const RID &p_font_rid) const {
 	FontForSizeAdvanced *ffsd = nullptr;
 	ERR_FAIL_COND_V(!_ensure_cache_for_size(fd, size, ffsd), false);
 #ifdef MODULE_FREETYPE_ENABLED
-	return fd->face && FT_HAS_COLOR(fd->face);
+	return ffsd->face && FT_HAS_COLOR(ffsd->face);
 #else
 	return false;
 #endif
@@ -2240,7 +2063,7 @@ hb_font_t *TextServerAdvanced::_font_get_hb_handle(const RID &p_font_rid, int64_
 	FontForSizeAdvanced *ffsd = nullptr;
 	ERR_FAIL_COND_V(!_ensure_cache_for_size(fd, size, ffsd), nullptr);
 #ifdef MODULE_FREETYPE_ENABLED
-	r_is_color = fd->face && FT_HAS_COLOR(fd->face);
+	r_is_color = ffsd->face && FT_HAS_COLOR(ffsd->face);
 #else
 	r_is_color = false;
 #endif
@@ -2791,90 +2614,6 @@ bool TextServerAdvanced::_font_is_modulate_color_glyphs(const RID &p_font_rid) c
 	return fd->modulate_color_glyphs;
 }
 
-int64_t TextServerAdvanced::_font_get_palette_count(const RID &p_font_rid) const {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, 0);
-
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	return fd->palette_names.size();
-#else
-	return 0;
-#endif
-}
-
-String TextServerAdvanced::_font_get_palette_name(const RID &p_font_rid, int64_t p_index) const {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, String());
-
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	ERR_FAIL_INDEX_V(p_index, fd->palette_names.size(), String());
-	return fd->palette_names[p_index];
-#else
-	return String();
-#endif
-}
-
-Vector<Color> TextServerAdvanced::_font_get_palette_colors(const RID &p_font_rid, int64_t p_index) const {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, Vector<Color>());
-
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	ERR_FAIL_INDEX_V(p_index, fd->palette_names.size(), Vector<Color>());
-	return fd->palette_colors[p_index];
-#else
-	return Vector<Color>();
-#endif
-}
-
-void TextServerAdvanced::_font_set_palette_custom_colors(const RID &p_font_rid, const Vector<Color> &p_colors) {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL(fd);
-
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	if (fd->palette_custom_colors != p_colors) {
-		fd->palette_custom_colors = p_colors;
-		fd->palette_custom_colors_hb.resize_uninitialized(p_colors.size());
-		for (int col = 0; col < fd->palette_custom_colors.size(); col++) {
-			const Color &c = fd->palette_custom_colors[col];
-			fd->palette_custom_colors_hb.write[col] = HB_COLOR(c.get_b8(), c.get_g8(), c.get_r8(), c.get_a8());
-		}
-		_font_clear_cache(fd);
-	}
-#endif
-}
-
-Vector<Color> TextServerAdvanced::_font_get_palette_custom_colors(const RID &p_font_rid) const {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, Vector<Color>());
-
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	return fd->palette_custom_colors;
-#else
-	return Vector<Color>();
-#endif
-}
-
-int64_t TextServerAdvanced::_font_get_used_palette(const RID &p_font_rid) const {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, 0);
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	return fd->palette_index;
-#else
-	return 0;
-#endif
-}
-
-void TextServerAdvanced::_font_set_used_palette(const RID &p_font_rid, int64_t p_index) {
-	FontAdvanced *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL(fd);
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	if (fd->palette_index != p_index) {
-		fd->palette_index = p_index;
-		_font_clear_cache(fd);
-	}
-#endif
-}
-
 void TextServerAdvanced::_font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	FontAdvanced *fd = _get_font_data(p_font_rid);
 	ERR_FAIL_NULL(fd);
@@ -3291,7 +3030,7 @@ void TextServerAdvanced::_font_set_scale(const RID &p_font_rid, int64_t p_size,
 	ERR_FAIL_COND(!_ensure_cache_for_size(fd, size, ffsd));
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (ffsd->face) {
 		return; // Do not override scale for dynamic fonts, it's calculated automatically.
 	}
 #endif
@@ -3776,26 +3515,28 @@ RID TextServerAdvanced::_font_get_glyph_texture_rid(const RID &p_font_rid, const
 
 	ERR_FAIL_COND_V(fgl.texture_idx < -1 || fgl.texture_idx >= ffsd->textures.size(), RID());
 
-	if (fgl.texture_idx != -1) {
-		if (ffsd->textures[fgl.texture_idx].dirty) {
-			ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-			Ref<Image> img = tex.image;
-			if (fgl.fix_edge) {
-				// Same as the "fix alpha border" process option when importing SVGs
-				img->fix_alpha_edges();
+	if (RenderingServer::get_singleton() != nullptr) {
+		if (fgl.texture_idx != -1) {
+			if (ffsd->textures[fgl.texture_idx].dirty) {
+				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
+				if (fd->mipmaps && !img->has_mipmaps()) {
+					img = tex.image->duplicate();
+					img->generate_mipmaps();
+				}
+				if (tex.texture.is_null()) {
+					tex.texture = ImageTexture::create_from_image(img);
+				} else {
+					tex.texture->update(img);
+				}
+				tex.dirty = false;
 			}
-			if (fd->mipmaps && !img->has_mipmaps()) {
-				img = tex.image->duplicate();
-				img->generate_mipmaps();
-			}
-			if (tex.texture.is_null()) {
-				tex.texture = ImageTexture::create_from_image(img);
-			} else {
-				tex.texture->update(img);
-			}
-			tex.dirty = false;
+			return ffsd->textures[fgl.texture_idx].texture->get_rid();
 		}
-		return ffsd->textures[fgl.texture_idx].texture->get_rid();
 	}
 
 	return RID();
@@ -3826,26 +3567,28 @@ Size2 TextServerAdvanced::_font_get_glyph_texture_size(const RID &p_font_rid, co
 
 	ERR_FAIL_COND_V(fgl.texture_idx < -1 || fgl.texture_idx >= ffsd->textures.size(), Size2());
 
-	if (fgl.texture_idx != -1) {
-		if (ffsd->textures[fgl.texture_idx].dirty) {
-			ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-			Ref<Image> img = tex.image;
-			if (fgl.fix_edge) {
-				// Same as the "fix alpha border" process option when importing SVGs
-				img->fix_alpha_edges();
+	if (RenderingServer::get_singleton() != nullptr) {
+		if (fgl.texture_idx != -1) {
+			if (ffsd->textures[fgl.texture_idx].dirty) {
+				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
+				if (fd->mipmaps && !img->has_mipmaps()) {
+					img = tex.image->duplicate();
+					img->generate_mipmaps();
+				}
+				if (tex.texture.is_null()) {
+					tex.texture = ImageTexture::create_from_image(img);
+				} else {
+					tex.texture->update(img);
+				}
+				tex.dirty = false;
 			}
-			if (fd->mipmaps && !img->has_mipmaps()) {
-				img = tex.image->duplicate();
-				img->generate_mipmaps();
-			}
-			if (tex.texture.is_null()) {
-				tex.texture = ImageTexture::create_from_image(img);
-			} else {
-				tex.texture->update(img);
-			}
-			tex.dirty = false;
+			return ffsd->textures[fgl.texture_idx].texture->get_size();
 		}
-		return ffsd->textures[fgl.texture_idx].texture->get_size();
 	}
 
 	return Size2();
@@ -3867,17 +3610,17 @@ Dictionary TextServerAdvanced::_font_get_glyph_contours(const RID &p_font_rid, i
 
 	int32_t index = p_index & 0xffffff; // Remove subpixel shifts.
 
-	int error = FT_Load_Glyph(fd->face, index, FT_LOAD_NO_BITMAP | (fd->force_autohinter ? FT_LOAD_FORCE_AUTOHINT : 0));
+	int error = FT_Load_Glyph(ffsd->face, index, FT_LOAD_NO_BITMAP | (fd->force_autohinter ? FT_LOAD_FORCE_AUTOHINT : 0));
 	ERR_FAIL_COND_V(error, Dictionary());
 
 	if (fd->embolden != 0.f) {
 		FT_Pos strength = fd->embolden * size.x / 16; // 26.6 fractional units (1 / 64).
-		FT_Outline_Embolden(&fd->face->glyph->outline, strength);
+		FT_Outline_Embolden(&ffsd->face->glyph->outline, strength);
 	}
 
 	if (fd->transform != Transform2D()) {
 		FT_Matrix mat = { FT_Fixed(fd->transform[0][0] * 65536), FT_Fixed(fd->transform[0][1] * 65536), FT_Fixed(fd->transform[1][0] * 65536), FT_Fixed(fd->transform[1][1] * 65536) }; // 16.16 fractional units (1 / 65536).
-		FT_Outline_Transform(&fd->face->glyph->outline, &mat);
+		FT_Outline_Transform(&ffsd->face->glyph->outline, &mat);
 	}
 
 	double scale = (1.0 / 64.0) * ffsd->scale;
@@ -3890,13 +3633,13 @@ Dictionary TextServerAdvanced::_font_get_glyph_contours(const RID &p_font_rid, i
 			scale = scale * Math::round((double)p_size / (double)fd->fixed_size);
 		}
 	}
-	for (short i = 0; i < fd->face->glyph->outline.n_points; i++) {
-		points.push_back(Vector3(fd->face->glyph->outline.points[i].x * scale, -fd->face->glyph->outline.points[i].y * scale, FT_CURVE_TAG(fd->face->glyph->outline.tags[i])));
+	for (short i = 0; i < ffsd->face->glyph->outline.n_points; i++) {
+		points.push_back(Vector3(ffsd->face->glyph->outline.points[i].x * scale, -ffsd->face->glyph->outline.points[i].y * scale, FT_CURVE_TAG(ffsd->face->glyph->outline.tags[i])));
 	}
-	for (short i = 0; i < fd->face->glyph->outline.n_contours; i++) {
-		contours.push_back(fd->face->glyph->outline.contours[i]);
+	for (short i = 0; i < ffsd->face->glyph->outline.n_contours; i++) {
+		contours.push_back(ffsd->face->glyph->outline.contours[i]);
 	}
-	bool orientation = (FT_Outline_Get_Orientation(&fd->face->glyph->outline) == FT_ORIENTATION_FILL_RIGHT);
+	bool orientation = (FT_Outline_Get_Orientation(&ffsd->face->glyph->outline) == FT_ORIENTATION_FILL_RIGHT);
 
 	Dictionary out;
 	out["points"] = points;
@@ -3987,9 +3730,9 @@ Vector2 TextServerAdvanced::_font_get_kerning(const RID &p_font_rid, int64_t p_s
 		}
 	} else {
 #ifdef MODULE_FREETYPE_ENABLED
-		if (fd->face) {
+		if (ffsd->face) {
 			FT_Vector delta;
-			FT_Get_Kerning(fd->face, p_glyph_pair.x, p_glyph_pair.y, FT_KERNING_DEFAULT, &delta);
+			FT_Get_Kerning(ffsd->face, p_glyph_pair.x, p_glyph_pair.y, FT_KERNING_DEFAULT, &delta);
 			if (fd->msdf) {
 				return Vector2(delta.x, delta.y) * (double)p_size / (double)fd->msdf_source_size;
 			} else if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE && size.x != p_size * 64) {
@@ -4019,11 +3762,11 @@ int64_t TextServerAdvanced::_font_get_glyph_index(const RID &p_font_rid, int64_t
 	ERR_FAIL_COND_V(!_ensure_cache_for_size(fd, size, ffsd), 0);
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (ffsd->face) {
 		if (p_variation_selector) {
-			return FT_Face_GetCharVariantIndex(fd->face, p_char, p_variation_selector);
+			return FT_Face_GetCharVariantIndex(ffsd->face, p_char, p_variation_selector);
 		} else {
-			return FT_Get_Char_Index(fd->face, p_char);
+			return FT_Get_Char_Index(ffsd->face, p_char);
 		}
 	} else {
 		return (int64_t)p_char;
@@ -4044,7 +3787,7 @@ int64_t TextServerAdvanced::_font_get_char_from_glyph_index(const RID &p_font_ri
 
 #ifdef MODULE_FREETYPE_ENABLED
 	if (ffsd->inv_glyph_map.is_empty()) {
-		FT_Face face = fd->face;
+		FT_Face face = ffsd->face;
 		FT_UInt gindex;
 		FT_ULong charcode = FT_Get_First_Char(face, &gindex);
 		while (gindex != 0) {
@@ -4081,8 +3824,8 @@ bool TextServerAdvanced::_font_has_char(const RID &p_font_rid, int64_t p_char) c
 	}
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
-		return FT_Get_Char_Index(fd->face, p_char) != 0;
+	if (ffsd->face) {
+		return FT_Get_Char_Index(ffsd->face, p_char) != 0;
 	}
 #endif
 	return ffsd->glyph_map.has((int32_t)p_char);
@@ -4102,14 +3845,14 @@ String TextServerAdvanced::_font_get_supported_chars(const RID &p_font_rid) cons
 
 	String chars;
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (ffsd->face) {
 		FT_UInt gindex;
-		FT_ULong charcode = FT_Get_First_Char(fd->face, &gindex);
+		FT_ULong charcode = FT_Get_First_Char(ffsd->face, &gindex);
 		while (gindex != 0) {
 			if (charcode != 0) {
 				chars = chars + String::chr(charcode);
 			}
-			charcode = FT_Get_Next_Char(fd->face, charcode, &gindex);
+			charcode = FT_Get_Next_Char(ffsd->face, charcode, &gindex);
 		}
 		return chars;
 	}
@@ -4135,12 +3878,12 @@ PackedInt32Array TextServerAdvanced::_font_get_supported_glyphs(const RID &p_fon
 
 	PackedInt32Array glyphs;
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (at_size && at_size->face) {
 		FT_UInt gindex;
-		FT_ULong charcode = FT_Get_First_Char(fd->face, &gindex);
+		FT_ULong charcode = FT_Get_First_Char(at_size->face, &gindex);
 		while (gindex != 0) {
 			glyphs.push_back(gindex);
-			charcode = FT_Get_Next_Char(fd->face, charcode, &gindex);
+			charcode = FT_Get_Next_Char(at_size->face, charcode, &gindex);
 		}
 		return glyphs;
 	}
@@ -4166,8 +3909,8 @@ void TextServerAdvanced::_font_render_range(const RID &p_font_rid, const Vector2
 	ERR_FAIL_COND(!_ensure_cache_for_size(fd, size, ffsd));
 	for (int64_t i = p_start; i <= p_end; i++) {
 #ifdef MODULE_FREETYPE_ENABLED
-		int32_t idx = FT_Get_Char_Index(fd->face, i);
-		if (fd->face) {
+		int32_t idx = FT_Get_Char_Index(ffsd->face, i);
+		if (ffsd->face) {
 			FontGlyph fgl;
 			if (fd->msdf) {
 				_ensure_glyph(fd, size, (int32_t)idx, fgl);
@@ -4201,7 +3944,7 @@ void TextServerAdvanced::_font_render_glyph(const RID &p_font_rid, const Vector2
 	ERR_FAIL_COND(!_ensure_cache_for_size(fd, size, ffsd));
 #ifdef MODULE_FREETYPE_ENABLED
 	int32_t idx = p_index & 0xffffff; // Remove subpixel shifts.
-	if (fd->face) {
+	if (ffsd->face) {
 		FontGlyph fgl;
 		if (fd->msdf) {
 			_ensure_glyph(fd, size, (int32_t)idx, fgl);
@@ -4268,7 +4011,7 @@ void TextServerAdvanced::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 	bool lcd_aa = false;
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (!fd->msdf && fd->face) {
+	if (!fd->msdf && ffsd->face) {
 		// LCD layout, bits 24, 25, 26
 		if (fd->antialiasing == FONT_ANTIALIASING_LCD) {
 			TextServer::FontLCDSubpixelLayout layout = lcd_subpixel_layout.get();
@@ -4299,68 +4042,71 @@ void TextServerAdvanced::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (!fd->modulate_color_glyphs && fd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (!fd->modulate_color_glyphs && ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
-			if (ffsd->textures[fgl.texture_idx].dirty) {
-				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-				Ref<Image> img = tex.image;
-				if (fgl.fix_edge) {
-					// Same as the "fix alpha border" process option when importing SVGs
-					img->fix_alpha_edges();
-				}
-				if (fd->mipmaps && !img->has_mipmaps()) {
-					img = tex.image->duplicate();
-					img->generate_mipmaps();
-				}
-				if (tex.texture.is_null()) {
-					tex.texture = ImageTexture::create_from_image(img);
-				} else {
-					tex.texture->update(img);
-				}
-				tex.dirty = false;
-			}
-			if (fd->msdf) {
-				Point2 cpos = p_pos;
-				cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
-				Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
-				ffsd->textures[fgl.texture_idx].texture->draw_msdf_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, 0, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
-			} else {
-				Point2 cpos = p_pos;
-				double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
-				if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
-					cpos.x = cpos.x + 0.125;
-				} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
-					cpos.x = cpos.x + 0.25;
-				}
-				if (scale == 1.0) {
-					cpos.y = Math::floor(cpos.y);
-					cpos.x = Math::floor(cpos.x);
-				}
-				Vector2 gpos = fgl.rect.position;
-				Size2 csize = fgl.rect.size;
-				if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
-					if (size.x != p_size * 64) {
-						if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
-							double gl_scale = (double)p_size / (double)fd->fixed_size;
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						} else {
-							double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						}
+			if (RenderingServer::get_singleton() != nullptr) {
+				if (ffsd->textures[fgl.texture_idx].dirty) {
+					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+					Ref<Image> img = tex.image;
+					if (fgl.from_svg) {
+						// Same as the "fix alpha border" process option when importing SVGs
+						img->fix_alpha_edges();
 					}
-				} else {
-					gpos /= oversampling_factor;
-					csize /= oversampling_factor;
+					if (fd->mipmaps && !img->has_mipmaps()) {
+						img = tex.image->duplicate();
+						img->generate_mipmaps();
+					}
+					if (tex.texture.is_null()) {
+						tex.texture = ImageTexture::create_from_image(img);
+					} else {
+						tex.texture->update(img);
+					}
+					tex.dirty = false;
 				}
-				cpos += gpos;
-				if (lcd_aa) {
-					ffsd->textures[fgl.texture_idx].texture->draw_lcd_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate);
+				RID texture = ffsd->textures[fgl.texture_idx].texture->get_rid();
+				if (fd->msdf) {
+					Point2 cpos = p_pos;
+					cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
+					Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
+					RenderingServer::get_singleton()->canvas_item_add_msdf_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, 0, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
 				} else {
-					ffsd->textures[fgl.texture_idx].texture->draw_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, false, false);
+					Point2 cpos = p_pos;
+					double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
+					if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
+						cpos.x = cpos.x + 0.125;
+					} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
+						cpos.x = cpos.x + 0.25;
+					}
+					if (scale == 1.0) {
+						cpos.y = Math::floor(cpos.y);
+						cpos.x = Math::floor(cpos.x);
+					}
+					Vector2 gpos = fgl.rect.position;
+					Size2 csize = fgl.rect.size;
+					if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
+						if (size.x != p_size * 64) {
+							if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
+								double gl_scale = (double)p_size / (double)fd->fixed_size;
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							} else {
+								double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							}
+						}
+					} else {
+						gpos /= oversampling_factor;
+						csize /= oversampling_factor;
+					}
+					cpos += gpos;
+					if (lcd_aa) {
+						RenderingServer::get_singleton()->canvas_item_add_lcd_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate);
+					} else {
+						RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, false, false);
+					}
 				}
 			}
 		}
@@ -4411,7 +4157,7 @@ void TextServerAdvanced::_font_draw_glyph_outline(const RID &p_font_rid, const R
 	bool lcd_aa = false;
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (!fd->msdf && fd->face) {
+	if (!fd->msdf && ffsd->face) {
 		// LCD layout, bits 24, 25, 26
 		if (fd->antialiasing == FONT_ANTIALIASING_LCD) {
 			TextServer::FontLCDSubpixelLayout layout = lcd_subpixel_layout.get();
@@ -4442,64 +4188,67 @@ void TextServerAdvanced::_font_draw_glyph_outline(const RID &p_font_rid, const R
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (fd->face && fd->cache[size]->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (ffsd->face && fd->cache[size]->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
-			if (ffsd->textures[fgl.texture_idx].dirty) {
-				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-				Ref<Image> img = tex.image;
-				if (fd->mipmaps && !img->has_mipmaps()) {
-					img = tex.image->duplicate();
-					img->generate_mipmaps();
-				}
-				if (tex.texture.is_null()) {
-					tex.texture = ImageTexture::create_from_image(img);
-				} else {
-					tex.texture->update(img);
-				}
-				tex.dirty = false;
-			}
-			if (fd->msdf) {
-				Point2 cpos = p_pos;
-				cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
-				Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
-				ffsd->textures[fgl.texture_idx].texture->draw_msdf_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, p_outline_size, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
-			} else {
-				Point2 cpos = p_pos;
-				double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
-				if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
-					cpos.x = cpos.x + 0.125;
-				} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
-					cpos.x = cpos.x + 0.25;
-				}
-				if (scale == 1.0) {
-					cpos.y = Math::floor(cpos.y);
-					cpos.x = Math::floor(cpos.x);
-				}
-				Vector2 gpos = fgl.rect.position;
-				Size2 csize = fgl.rect.size;
-				if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
-					if (size.x != p_size * 64) {
-						if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
-							double gl_scale = (double)p_size / (double)fd->fixed_size;
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						} else {
-							double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						}
+			if (RenderingServer::get_singleton() != nullptr) {
+				if (ffsd->textures[fgl.texture_idx].dirty) {
+					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+					Ref<Image> img = tex.image;
+					if (fd->mipmaps && !img->has_mipmaps()) {
+						img = tex.image->duplicate();
+						img->generate_mipmaps();
 					}
-				} else {
-					gpos /= oversampling_factor;
-					csize /= oversampling_factor;
+					if (tex.texture.is_null()) {
+						tex.texture = ImageTexture::create_from_image(img);
+					} else {
+						tex.texture->update(img);
+					}
+					tex.dirty = false;
 				}
-				cpos += gpos;
-				if (lcd_aa) {
-					ffsd->textures[fgl.texture_idx].texture->draw_lcd_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate);
+				RID texture = ffsd->textures[fgl.texture_idx].texture->get_rid();
+				if (fd->msdf) {
+					Point2 cpos = p_pos;
+					cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
+					Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
+					RenderingServer::get_singleton()->canvas_item_add_msdf_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, p_outline_size, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
 				} else {
-					ffsd->textures[fgl.texture_idx].texture->draw_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, false, false);
+					Point2 cpos = p_pos;
+					double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
+					if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
+						cpos.x = cpos.x + 0.125;
+					} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
+						cpos.x = cpos.x + 0.25;
+					}
+					if (scale == 1.0) {
+						cpos.y = Math::floor(cpos.y);
+						cpos.x = Math::floor(cpos.x);
+					}
+					Vector2 gpos = fgl.rect.position;
+					Size2 csize = fgl.rect.size;
+					if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
+						if (size.x != p_size * 64) {
+							if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
+								double gl_scale = (double)p_size / (double)fd->fixed_size;
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							} else {
+								double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							}
+						}
+					} else {
+						gpos /= oversampling_factor;
+						csize /= oversampling_factor;
+					}
+					cpos += gpos;
+					if (lcd_aa) {
+						RenderingServer::get_singleton()->canvas_item_add_lcd_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate);
+					} else {
+						RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, false, false);
+					}
 				}
 			}
 		}
@@ -6024,7 +5773,12 @@ RID TextServerAdvanced::_find_sys_font_for_text(const RID &p_fdef, const String
 
 	String locale = (p_language.is_empty()) ? TranslationServer::get_singleton()->get_tool_locale() : p_language;
 	PackedStringArray fallback_font_name = OS::get_singleton()->get_system_font_path_for_text(font_name, p_text, locale, p_script_code, font_weight, font_stretch, font_style & TextServer::FONT_ITALIC);
+#ifdef GDEXTENSION
+	for (int fb = 0; fb < fallback_font_name.size(); fb++) {
+		const String &E = fallback_font_name[fb];
+#elif defined(GODOT_MODULE)
 	for (const String &E : fallback_font_name) {
+#endif
 		SystemFontKey key = SystemFontKey(E, font_style & TextServer::FONT_ITALIC, font_weight, font_stretch, p_fdef, this);
 		if (system_fonts.has(key)) {
 			const SystemFontCache &sysf_cache = system_fonts[key];
@@ -6137,7 +5891,7 @@ RID TextServerAdvanced::_find_sys_font_for_text(const RID &p_fdef, const String
 					Vector2i size = _get_size(fd, 16);
 					FontForSizeAdvanced *ffsd = nullptr;
 					if (_ensure_cache_for_size(fd, size, ffsd)) {
-						if (ffsd && (FT_HAS_COLOR(fd->face) || !FT_IS_SCALABLE(fd->face))) {
+						if (ffsd && (FT_HAS_COLOR(ffsd->face) || !FT_IS_SCALABLE(ffsd->face))) {
 							fb_use_msdf = false;
 						}
 					}
@@ -7943,7 +7697,11 @@ String TextServerAdvanced::_strip_diacritics(const String &p_string) const {
 	String result;
 	for (int i = 0; i < normalized_string.length(); i++) {
 		if (u_getCombiningClass(normalized_string[i]) == 0) {
+#ifdef GDEXTENSION
+			result = result + String::chr(normalized_string[i]);
+#elif defined(GODOT_MODULE)
 			result = result + normalized_string[i];
+#endif
 		}
 	}
 	return result;
@@ -8391,6 +8149,7 @@ void TextServerAdvanced::_update_settings() {
 
 TextServerAdvanced::TextServerAdvanced() {
 	os_locale = OS::get_singleton()->get_locale();
+
 	_insert_feature_sets();
 	_bmp_create_font_funcs();
 	_update_settings();
diff --git a/engine/modules/text_server_adv/text_server_adv.h b/engine/modules/text_server_adv/text_server_adv.h
index 0b1306e4..c8c3fd6a 100644
--- a/engine/modules/text_server_adv/text_server_adv.h
+++ b/engine/modules/text_server_adv/text_server_adv.h
@@ -37,7 +37,51 @@
 
 #include "script_iterator.h"
 
-#include "core/extension/ext_wrappers.gen.h"
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/godot.hpp>
+
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/ext_wrappers.gen.inc>
+#include <godot_cpp/core/mutex_lock.hpp>
+
+#include <godot_cpp/variant/array.hpp>
+#include <godot_cpp/variant/dictionary.hpp>
+#include <godot_cpp/variant/packed_int32_array.hpp>
+#include <godot_cpp/variant/packed_string_array.hpp>
+#include <godot_cpp/variant/packed_vector2_array.hpp>
+#include <godot_cpp/variant/rect2.hpp>
+#include <godot_cpp/variant/rid.hpp>
+#include <godot_cpp/variant/string.hpp>
+#include <godot_cpp/variant/typed_array.hpp>
+#include <godot_cpp/variant/vector2.hpp>
+#include <godot_cpp/variant/vector2i.hpp>
+
+#include <godot_cpp/classes/text_server.hpp>
+#include <godot_cpp/classes/text_server_extension.hpp>
+#include <godot_cpp/classes/text_server_manager.hpp>
+
+#include <godot_cpp/classes/caret_info.hpp>
+#include <godot_cpp/classes/global_constants_binds.hpp>
+#include <godot_cpp/classes/glyph.hpp>
+#include <godot_cpp/classes/image.hpp>
+#include <godot_cpp/classes/image_texture.hpp>
+#include <godot_cpp/classes/ref.hpp>
+#include <godot_cpp/classes/worker_thread_pool.hpp>
+
+#include <godot_cpp/templates/hash_map.hpp>
+#include <godot_cpp/templates/hash_set.hpp>
+#include <godot_cpp/templates/rid_owner.hpp>
+#include <godot_cpp/templates/safe_refcount.hpp>
+#include <godot_cpp/templates/vector.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
+#include "core/extension/ext_wrappers.gen.inc"
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/safe_refcount.h"
@@ -46,10 +90,12 @@
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 
+#endif
+
 // Thirdparty headers.
 
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
-#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
+#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
 #endif
 
@@ -67,7 +113,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
 #include <unicode/utypes.h>
 
 GODOT_GCC_WARNING_POP
-#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
+#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
 GODOT_CLANG_WARNING_POP
 #endif
 
@@ -79,7 +125,6 @@ GODOT_CLANG_WARNING_POP
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 #include FT_BBOX_H
-#include FT_SIZES_H
 #include FT_MODULE_H
 #include FT_CONFIG_OPTIONS_H
 #if !defined(FT_CONFIG_OPTION_USE_BROTLI) && !defined(_MSC_VER)
@@ -91,9 +136,6 @@ GODOT_CLANG_WARNING_POP
 
 #include <hb-icu.h>
 #include <hb.h>
-#if HB_VERSION_ATLEAST(13, 0, 0)
-#include <hb-raster.h>
-#endif
 
 /*************************************************************************/
 
@@ -231,7 +273,7 @@ class TextServerAdvanced : public TextServerExtension {
 		Rect2 rect;
 		Rect2 uv_rect;
 		Vector2 advance;
-		bool fix_edge = false;
+		bool from_svg = false;
 	};
 
 	struct FontAdvanced;
@@ -252,13 +294,10 @@ class TextServerAdvanced : public TextServerExtension {
 		HashMap<int32_t, FontGlyph> glyph_map;
 		HashMap<Vector2i, Vector2> kerning_map;
 		hb_font_t *hb_handle = nullptr;
-#if HB_VERSION_ATLEAST(13, 0, 0)
-		hb_face_t *hb_face = nullptr;
-		bool color_paint = false;
-#endif
 
 #ifdef MODULE_FREETYPE_ENABLED
-		FT_Size fsize = nullptr;
+		FT_Face face = nullptr;
+		FT_StreamRec stream;
 #endif
 
 		~FontForSizeAdvanced() {
@@ -266,8 +305,8 @@ class TextServerAdvanced : public TextServerExtension {
 				hb_font_destroy(hb_handle);
 			}
 #ifdef MODULE_FREETYPE_ENABLED
-			if (fsize != nullptr) {
-				FT_Done_Size(fsize);
+			if (face != nullptr) {
+				FT_Done_Face(face);
 			}
 #endif
 		}
@@ -318,17 +357,6 @@ class TextServerAdvanced : public TextServerExtension {
 
 		HashMap<Vector2i, FontForSizeAdvanced *> cache;
 
-#if HB_VERSION_ATLEAST(13, 0, 0)
-		Vector<String> palette_names;
-		Vector<PackedColorArray> palette_colors;
-		PackedColorArray palette_custom_colors;
-		Vector<hb_color_t> palette_custom_colors_hb;
-		unsigned int palette_index = 0;
-
-		hb_raster_paint_t *hb_rdr = nullptr;
-		hb_raster_draw_t *hb_mono = nullptr;
-#endif
-
 		bool face_init = false;
 		HashSet<uint32_t> supported_scripts;
 		Dictionary supported_features;
@@ -344,29 +372,11 @@ class TextServerAdvanced : public TextServerExtension {
 		size_t data_size;
 		int face_index = 0;
 
-#ifdef MODULE_FREETYPE_ENABLED
-		FT_Face face = nullptr;
-		FT_StreamRec stream;
-#endif
-
 		~FontAdvanced() {
 			for (const KeyValue<Vector2i, FontForSizeAdvanced *> &E : cache) {
 				memdelete(E.value);
 			}
 			cache.clear();
-#if HB_VERSION_ATLEAST(13, 0, 0)
-			if (hb_rdr != nullptr) {
-				hb_raster_paint_destroy(hb_rdr);
-			}
-			if (hb_mono != nullptr) {
-				hb_raster_draw_destroy(hb_mono);
-			}
-#endif
-#ifdef MODULE_FREETYPE_ENABLED
-			if (face != nullptr) {
-				FT_Done_Face(face);
-			}
-#endif
 		}
 	};
 
@@ -376,9 +386,6 @@ class TextServerAdvanced : public TextServerExtension {
 #endif
 #ifdef MODULE_FREETYPE_ENABLED
 	_FORCE_INLINE_ FontGlyph rasterize_bitmap(FontForSizeAdvanced *p_data, int p_rect_margin, FT_Bitmap p_bitmap, int p_yofs, int p_xofs, const Vector2 &p_advance, bool p_bgra) const;
-#if HB_VERSION_ATLEAST(13, 0, 0)
-	_FORCE_INLINE_ FontGlyph rasterize_hb_bitmap(FontForSizeAdvanced *p_data, int p_rect_margin, hb_raster_image_t *p_image, const hb_raster_extents_t &p_ext, const Vector2 &p_advance, bool p_bgra) const;
-#endif
 #endif
 	bool _ensure_glyph(FontAdvanced *p_font_data, const Vector2i &p_size, int32_t p_glyph, FontGlyph &r_glyph, uint32_t p_oversampling = 0) const;
 	bool _ensure_cache_for_size(FontAdvanced *p_font_data, const Vector2i &p_size, FontForSizeAdvanced *&r_cache_for_size, bool p_silent = false, uint32_t p_oversampling = 0) const;
@@ -899,14 +906,6 @@ public:
 	MODBIND2(font_set_modulate_color_glyphs, const RID &, bool);
 	MODBIND1RC(bool, font_is_modulate_color_glyphs, const RID &);
 
-	MODBIND1RC(int64_t, font_get_palette_count, const RID &);
-	MODBIND2RC(String, font_get_palette_name, const RID &, int64_t);
-	MODBIND2RC(Vector<Color>, font_get_palette_colors, const RID &, int64_t);
-	MODBIND2(font_set_palette_custom_colors, const RID &, const Vector<Color> &);
-	MODBIND1RC(Vector<Color>, font_get_palette_custom_colors, const RID &);
-	MODBIND1RC(int64_t, font_get_used_palette, const RID &);
-	MODBIND2(font_set_used_palette, const RID &, int64_t);
-
 	MODBIND2(font_set_subpixel_positioning, const RID &, SubpixelPositioning);
 	MODBIND1RC(SubpixelPositioning, font_get_subpixel_positioning, const RID &);
 
diff --git a/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp b/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
index af855e17..f9f6c8b8 100644
--- a/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
+++ b/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
@@ -30,14 +30,29 @@
 
 #include "thorvg_svg_in_ot.h"
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/classes/xml_parser.hpp>
+#include <godot_cpp/core/mutex_lock.hpp>
+#include <godot_cpp/godot.hpp>
+#include <godot_cpp/templates/vector.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/error/error_macros.h"
 #include "core/io/xml_parser.h"
 #include "core/os/memory.h"
+#include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
 
 #include "modules/modules_enabled.gen.h" // For svg, freetype.
+#endif
 
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
@@ -45,6 +60,8 @@
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
+#include <cstdlib>
+
 FT_Error tvg_svg_in_ot_init(FT_Pointer *p_state) {
 	*p_state = memnew(TVG_State);
 
@@ -163,7 +180,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 				if (!is_in_defs && parser->has_attribute("id")) {
 					const String &gl_name = parser->get_named_attribute_value("id");
 					if (gl_name.begins_with("glyph")) {
+#ifdef GDEXTENSION
+						int dot_pos = gl_name.find(".");
+#else
 						int dot_pos = gl_name.find_char('.');
+#endif // GDEXTENSION
 						int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int();
 
 						TVG_NodeCache node_cache = TVG_NodeCache();
@@ -201,12 +222,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 			cache.embox_y = embox_y;
 		}
 
-		tvg::Picture *picture = tvg::Picture::gen();
+		std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
 		gl_state.xml_code = xml_body.utf8();
 
-		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", nullptr, false);
+		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
 		}
 
@@ -217,7 +237,6 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 
 		result = picture->size(embox_x * aspect_x, embox_y * aspect_y);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
@@ -239,13 +258,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 
 		result = picture->size(embox_x * aspect_x * x_svg_to_out, embox_y * aspect_y * y_svg_to_out);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
 		result = picture->transform(gl_state.m);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 		}
 
@@ -254,8 +271,6 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 		gl_state.x = (double(p_slot->metrics.horiAdvance) / 64.0 - gl_state.w) / 2.0;
 		gl_state.y = -Math::ceil(gl_state.h * yoff);
 
-		tvg::Paint::rel(picture);
-
 		gl_state.ready = true;
 	}
 
@@ -310,30 +325,26 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) {
 	GL_State &gl_state = state->glyph_map[p_slot->glyph_index];
 	ERR_FAIL_COND_V_MSG(!gl_state.ready, FT_Err_Invalid_SVG_Document, "SVG glyph not ready.");
 
-	tvg::Picture *picture = tvg::Picture::gen();
-	tvg::Result res = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", nullptr, false);
+	std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
+	tvg::Result res = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering).");
 	}
 	res = picture->size(gl_state.w, gl_state.h);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 	}
 	res = picture->transform(gl_state.m);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 	}
 
-	std::unique_ptr<tvg::SwCanvas> sw_canvas(tvg::SwCanvas::gen());
-	res = sw_canvas->target((uint32_t *)p_slot->bitmap.buffer, (int)p_slot->bitmap.width, (int)p_slot->bitmap.width, (int)p_slot->bitmap.rows, tvg::ColorSpace::ARGB8888S);
+	std::unique_ptr<tvg::SwCanvas> sw_canvas = tvg::SwCanvas::gen();
+	res = sw_canvas->target((uint32_t *)p_slot->bitmap.buffer, (int)p_slot->bitmap.width, (int)p_slot->bitmap.width, (int)p_slot->bitmap.rows, tvg::SwCanvas::ARGB8888S);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_Outline, "Failed to create SVG canvas.");
 	}
-	res = sw_canvas->add(picture);
+	res = sw_canvas->push(std::move(picture));
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_Outline, "Failed to set SVG canvas source.");
 	}
diff --git a/engine/modules/text_server_adv/thorvg_svg_in_ot.h b/engine/modules/text_server_adv/thorvg_svg_in_ot.h
index 986c364e..ebb0f8fb 100644
--- a/engine/modules/text_server_adv/thorvg_svg_in_ot.h
+++ b/engine/modules/text_server_adv/thorvg_svg_in_ot.h
@@ -30,12 +30,25 @@
 
 #pragma once
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/core/mutex_lock.hpp>
+#include <godot_cpp/godot.hpp>
+#include <godot_cpp/templates/hash_map.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/os/mutex.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/typedefs.h"
 
 #include "modules/modules_enabled.gen.h" // For svg, freetype.
+#endif
 
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
diff --git a/engine/modules/text_server_fb/doc_classes/TextServerFallback.xml b/engine/modules/text_server_fb/doc_classes/TextServerFallback.xml
index 50b09f91..22e51de4 100644
--- a/engine/modules/text_server_fb/doc_classes/TextServerFallback.xml
+++ b/engine/modules/text_server_fb/doc_classes/TextServerFallback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextServerFallback" inherits="TextServerExtension" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="TextServerFallback" inherits="TextServerExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A fallback implementation of Godot's text server, without support for BiDi and complex text layout.
 	</brief_description>
diff --git a/engine/modules/text_server_fb/gdextension_build/SConstruct b/engine/modules/text_server_fb/gdextension_build/SConstruct
new file mode 100644
index 00000000..a8d11261
--- /dev/null
+++ b/engine/modules/text_server_fb/gdextension_build/SConstruct
@@ -0,0 +1,312 @@
+#!/usr/bin/env python
+# ruff: noqa: F821
+
+import methods
+
+# For the reference:
+# - CCFLAGS are compilation flags shared between C and C++
+# - CFLAGS are for C-specific compilation flags
+# - CXXFLAGS are for C++-specific compilation flags
+# - CPPFLAGS are for pre-processor flags
+# - CPPDEFINES are for pre-processor defines
+# - LINKFLAGS are for linking flags
+
+env = SConscript("./godot-cpp/SConstruct")
+env.__class__.disable_warnings = methods.disable_warnings
+
+opts = Variables([], ARGUMENTS)
+opts.Add(BoolVariable("brotli_enabled", "Use Brotli library", True))
+opts.Add(BoolVariable("freetype_enabled", "Use FreeType library", True))
+opts.Add(BoolVariable("msdfgen_enabled", "Use MSDFgen library (require FreeType)", True))
+opts.Add(BoolVariable("thorvg_enabled", "Use ThorVG library (require FreeType)", True))
+opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False))
+
+opts.Update(env)
+
+# ThorVG
+if env["thorvg_enabled"] and env["freetype_enabled"]:
+    env_tvg = env.Clone()
+    env_tvg.disable_warnings()
+
+    thirdparty_tvg_dir = "../../../thirdparty/thorvg/"
+    thirdparty_tvg_sources = [
+        # common
+        "src/common/tvgCompressor.cpp",
+        "src/common/tvgLines.cpp",
+        "src/common/tvgMath.cpp",
+        "src/common/tvgStr.cpp",
+        # SVG parser
+        "src/loaders/svg/tvgSvgCssStyle.cpp",
+        "src/loaders/svg/tvgSvgLoader.cpp",
+        "src/loaders/svg/tvgSvgPath.cpp",
+        "src/loaders/svg/tvgSvgSceneBuilder.cpp",
+        "src/loaders/svg/tvgSvgUtil.cpp",
+        "src/loaders/svg/tvgXmlParser.cpp",
+        "src/loaders/raw/tvgRawLoader.cpp",
+        # image loaders
+        "src/loaders/external_png/tvgPngLoader.cpp",
+        "src/loaders/jpg/tvgJpgd.cpp",
+        "src/loaders/jpg/tvgJpgLoader.cpp",
+        # renderer common
+        "src/renderer/tvgAccessor.cpp",
+        # "src/renderer/tvgAnimation.cpp",
+        "src/renderer/tvgCanvas.cpp",
+        "src/renderer/tvgFill.cpp",
+        # "src/renderer/tvgGlCanvas.cpp",
+        "src/renderer/tvgInitializer.cpp",
+        "src/renderer/tvgLoader.cpp",
+        "src/renderer/tvgPaint.cpp",
+        "src/renderer/tvgPicture.cpp",
+        "src/renderer/tvgRender.cpp",
+        # "src/renderer/tvgSaver.cpp",
+        "src/renderer/tvgScene.cpp",
+        "src/renderer/tvgShape.cpp",
+        "src/renderer/tvgSwCanvas.cpp",
+        "src/renderer/tvgTaskScheduler.cpp",
+        "src/renderer/tvgText.cpp",
+        # "src/renderer/tvgWgCanvas.cpp",
+        # renderer sw_engine
+        "src/renderer/sw_engine/tvgSwFill.cpp",
+        "src/renderer/sw_engine/tvgSwImage.cpp",
+        "src/renderer/sw_engine/tvgSwMath.cpp",
+        "src/renderer/sw_engine/tvgSwMemPool.cpp",
+        "src/renderer/sw_engine/tvgSwRaster.cpp",
+        "src/renderer/sw_engine/tvgSwRenderer.cpp",
+        "src/renderer/sw_engine/tvgSwRle.cpp",
+        "src/renderer/sw_engine/tvgSwShape.cpp",
+        "src/renderer/sw_engine/tvgSwStroke.cpp",
+    ]
+    thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources]
+
+    env_tvg.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
+            "../../../thirdparty/thorvg/src/renderer/sw_engine",
+            "../../../thirdparty/thorvg/src/loaders/svg",
+            "../../../thirdparty/thorvg/src/loaders/raw",
+            "../../../thirdparty/thorvg/src/loaders/external_png",
+            "../../../thirdparty/thorvg/src/loaders/jpg",
+            "../../../thirdparty/libpng",
+        ]
+    )
+
+    # Enable ThorVG static object linking.
+    env_tvg.Append(CPPDEFINES=["TVG_STATIC"])
+
+    env.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/common",
+            "../../../thirdparty/thorvg/src/renderer",
+        ]
+    )
+    env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])
+
+    lib = env_tvg.Library(
+        f"tvg_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_tvg_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# MSDFGEN
+if env["msdfgen_enabled"] and env["freetype_enabled"]:
+    env_msdfgen = env.Clone()
+    env_msdfgen.disable_warnings()
+
+    thirdparty_msdfgen_dir = "../../../thirdparty/msdfgen/"
+    thirdparty_msdfgen_sources = [
+        "core/Contour.cpp",
+        "core/DistanceMapping.cpp",
+        "core/EdgeHolder.cpp",
+        "core/MSDFErrorCorrection.cpp",
+        "core/Projection.cpp",
+        "core/Scanline.cpp",
+        "core/Shape.cpp",
+        "core/contour-combiners.cpp",
+        "core/convergent-curve-ordering.cpp",
+        "core/edge-coloring.cpp",
+        "core/edge-segments.cpp",
+        "core/edge-selectors.cpp",
+        "core/equation-solver.cpp",
+        # "core/export-svg.cpp",
+        "core/msdf-error-correction.cpp",
+        "core/msdfgen.cpp",
+        "core/rasterization.cpp",
+        "core/render-sdf.cpp",
+        # "core/save-bmp.cpp",
+        # "core/save-fl32.cpp",
+        # "core/save-rgba.cpp",
+        # "core/save-tiff.cpp",
+        "core/sdf-error-estimation.cpp",
+        "core/shape-description.cpp",
+    ]
+    thirdparty_msdfgen_sources = [thirdparty_msdfgen_dir + file for file in thirdparty_msdfgen_sources]
+
+    env_msdfgen.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
+    env_msdfgen.Append(CPPPATH=["../../../thirdparty/freetype/include", "../../../thirdparty/msdfgen"])
+    env.Append(CPPPATH=["../../../thirdparty/msdfgen"])
+    env.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
+    env.Append(CPPDEFINES=["MODULE_MSDFGEN_ENABLED"])
+
+    lib = env_msdfgen.Library(
+        f"msdfgen_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_msdfgen_sources,
+    )
+    env.Append(LIBS=[lib])
+
+# FreeType
+if env["freetype_enabled"]:
+    env_freetype = env.Clone()
+    env_freetype.disable_warnings()
+
+    thirdparty_freetype_dir = "../../../thirdparty/freetype/"
+    thirdparty_freetype_sources = [
+        "src/autofit/autofit.c",
+        "src/base/ftbase.c",
+        "src/base/ftbbox.c",
+        "src/base/ftbdf.c",
+        "src/base/ftbitmap.c",
+        "src/base/ftcid.c",
+        "src/base/ftdebug.c",
+        "src/base/ftfstype.c",
+        "src/base/ftgasp.c",
+        "src/base/ftglyph.c",
+        "src/base/ftgxval.c",
+        "src/base/ftinit.c",
+        "src/base/ftmm.c",
+        "src/base/ftotval.c",
+        "src/base/ftpatent.c",
+        "src/base/ftpfr.c",
+        "src/base/ftstroke.c",
+        "src/base/ftsynth.c",
+        "src/base/ftsystem.c",
+        "src/base/fttype1.c",
+        "src/base/ftwinfnt.c",
+        "src/bdf/bdf.c",
+        "src/bzip2/ftbzip2.c",
+        "src/cache/ftcache.c",
+        "src/cff/cff.c",
+        "src/cid/type1cid.c",
+        "src/gxvalid/gxvalid.c",
+        "src/gzip/ftgzip.c",
+        "src/lzw/ftlzw.c",
+        "src/otvalid/otvalid.c",
+        "src/pcf/pcf.c",
+        "src/pfr/pfr.c",
+        "src/psaux/psaux.c",
+        "src/pshinter/pshinter.c",
+        "src/psnames/psnames.c",
+        "src/raster/raster.c",
+        "src/sdf/sdf.c",
+        "src/svg/svg.c",
+        "src/smooth/smooth.c",
+        "src/truetype/truetype.c",
+        "src/type1/type1.c",
+        "src/type42/type42.c",
+        "src/winfonts/winfnt.c",
+        "src/sfnt/sfnt.c",
+    ]
+    thirdparty_freetype_sources = [thirdparty_freetype_dir + file for file in thirdparty_freetype_sources]
+
+    thirdparty_png_dir = "../../../thirdparty/libpng/"
+    thirdparty_png_sources = [
+        "png.c",
+        "pngerror.c",
+        "pngget.c",
+        "pngmem.c",
+        "pngpread.c",
+        "pngread.c",
+        "pngrio.c",
+        "pngrtran.c",
+        "pngrutil.c",
+        "pngset.c",
+        "pngtrans.c",
+        "pngwio.c",
+        "pngwrite.c",
+        "pngwtran.c",
+        "pngwutil.c",
+    ]
+    thirdparty_freetype_sources += [thirdparty_png_dir + file for file in thirdparty_png_sources]
+
+    thirdparty_zlib_dir = "../../../thirdparty/zlib/"
+    thirdparty_zlib_sources = [
+        "adler32.c",
+        "compress.c",
+        "crc32.c",
+        "deflate.c",
+        "inffast.c",
+        "inflate.c",
+        "inftrees.c",
+        "trees.c",
+        "uncompr.c",
+        "zutil.c",
+    ]
+    thirdparty_freetype_sources += [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
+
+    if env["brotli_enabled"]:
+        thirdparty_brotli_dir = "../../../thirdparty/brotli/"
+        thirdparty_brotli_sources = [
+            "common/constants.c",
+            "common/context.c",
+            "common/dictionary.c",
+            "common/platform.c",
+            "common/shared_dictionary.c",
+            "common/transform.c",
+            "dec/bit_reader.c",
+            "dec/decode.c",
+            "dec/huffman.c",
+            "dec/state.c",
+        ]
+        thirdparty_freetype_sources += [thirdparty_brotli_dir + file for file in thirdparty_brotli_sources]
+        env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
+        env_freetype.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
+        env.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
+
+    env_freetype.Append(CPPPATH=[thirdparty_freetype_dir + "/include", thirdparty_zlib_dir, thirdparty_png_dir])
+    env.Append(CPPPATH=[thirdparty_freetype_dir + "/include"])
+
+    env_freetype.Append(
+        CPPDEFINES=[
+            "FT2_BUILD_LIBRARY",
+            "FT_CONFIG_OPTION_USE_PNG",
+            "FT_CONFIG_OPTION_SYSTEM_ZLIB",
+        ]
+    )
+    if env.dev_build:
+        env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"])
+
+    env.Append(CPPDEFINES=["MODULE_FREETYPE_ENABLED"])
+
+    lib = env_freetype.Library(
+        f"freetype_builtin{env['suffix']}{env['LIBSUFFIX']}",
+        thirdparty_freetype_sources,
+    )
+    env.Append(LIBS=[lib])
+
+
+env.Append(CPPDEFINES=["GDEXTENSION"])
+env.Append(CPPPATH=["../"])
+sources = Glob("../*.cpp")
+
+if env["platform"] == "macos":
+    methods.write_macos_plist(
+        f"./bin/libtextserver_fallback.macos.{env['target']}.framework",
+        f"libtextserver_fallback.macos.{env['target']}",
+        "org.godotengine.textserver_fallback",
+        "Fallback Text Server",
+    )
+    library = env.SharedLibrary(
+        f"./bin/libtextserver_fallback.macos.{env['target']}.framework/libtextserver_fallback.macos.{env['target']}",
+        source=sources,
+    )
+else:
+    library = env.SharedLibrary(
+        f"./bin/libtextserver_fallback{env['suffix']}{env['SHLIBSUFFIX']}",
+        source=sources,
+    )
+
+Default(library)
+
+methods.prepare_timer()
diff --git a/engine/modules/text_server_fb/gdextension_build/methods.py b/engine/modules/text_server_fb/gdextension_build/methods.py
new file mode 100644
index 00000000..f39c1c46
--- /dev/null
+++ b/engine/modules/text_server_fb/gdextension_build/methods.py
@@ -0,0 +1,60 @@
+def disable_warnings(self):
+    # 'self' is the environment
+    if self["platform"] == "windows" and not self["use_mingw"]:
+        # We have to remove existing warning level defines before appending /w,
+        # otherwise we get: "warning D9025 : overriding '/W3' with '/w'"
+        WARN_FLAGS = ["/Wall", "/W4", "/W3", "/W2", "/W1", "/W0"]
+        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if x not in WARN_FLAGS]
+        self["CFLAGS"] = [x for x in self["CFLAGS"] if x not in WARN_FLAGS]
+        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if x not in WARN_FLAGS]
+        self.AppendUnique(CCFLAGS=["/w"])
+    else:
+        self.AppendUnique(CCFLAGS=["-w"])
+
+
+def prepare_timer():
+    import atexit
+    import time
+
+    def print_elapsed_time(time_at_start: float):
+        time_elapsed = time.time() - time_at_start
+        time_formatted = time.strftime("%H:%M:%S", time.gmtime(time_elapsed))
+        time_centiseconds = round((time_elapsed % 1) * 100)
+        print(f"[Time elapsed: {time_formatted}.{time_centiseconds}]")
+
+    atexit.register(print_elapsed_time, time.time())
+
+
+def write_macos_plist(target, binary_name, identifier, name):
+    import os
+
+    os.makedirs(f"{target}/Resource/", exist_ok=True)
+    with open(f"{target}/Resource/Info.plist", "w", encoding="utf-8", newline="\n") as f:
+        f.write(f"""\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>{binary_name}</string>
+	<key>CFBundleIdentifier</key>
+	<string>{identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>{name}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>
+""")
diff --git a/engine/modules/text_server_fb/gdextension_build/text_server_fb.gdextension b/engine/modules/text_server_fb/gdextension_build/text_server_fb.gdextension
new file mode 100644
index 00000000..58a92e40
--- /dev/null
+++ b/engine/modules/text_server_fb/gdextension_build/text_server_fb.gdextension
@@ -0,0 +1,24 @@
+[configuration]
+
+entry_symbol = "textserver_fallback_init"
+
+[libraries]
+
+linux.x86_64.debug = "bin/libtextserver_fallback.linux.template_debug.x86_64.so"
+linux.x86_64.release = "bin/libtextserver_fallback.linux.template_release.x86_64.so"
+linux.x86_32.debug = "bin/libtextserver_fallback.linux.template_debug.x86_32.so"
+linux.x86_32.release = "bin/libtextserver_fallback.linux.template_release.x86_32.so"
+linux.arm64.debug = "bin/libtextserver_fallback.linux.template_debug.arm64.so"
+linux.arm64.release = "bin/libtextserver_fallback.linux.template_release.arm64.so"
+linux.rv64.debug = "bin/libtextserver_fallback.linux.template_debug.rv64.so"
+linux.rv64.release = "bin/libtextserver_fallback.linux.template_release.rv64.so"
+
+windows.x86_64.debug = "bin/libtextserver_fallback.windows.template_debug.x86_64.dll"
+windows.x86_64.release = "bin/libtextserver_fallback.windows.template_release.x86_64.dll"
+windows.x86_32.debug = "bin/libtextserver_fallback.windows.template_debug.x86_32.dll"
+windows.x86_32.release = "bin/libtextserver_fallback.windows.template_release.x86_32.dll"
+windows.arm64.debug = "bin/libtextserver_fallback.windows.template_debug.arm64.dll"
+windows.arm64.release = "bin/libtextserver_fallback.windows.template_release.arm64.dll"
+
+macos.debug = "bin/libtextserver_fallback.macos.template_debug.framework"
+macos.release = "bin/libtextserver_fallback.macos.template_release.framework"
diff --git a/engine/modules/text_server_fb/register_types.cpp b/engine/modules/text_server_fb/register_types.cpp
index cab46e7b..3dd359f0 100644
--- a/engine/modules/text_server_fb/register_types.cpp
+++ b/engine/modules/text_server_fb/register_types.cpp
@@ -32,8 +32,6 @@
 
 #include "text_server_fb.h"
 
-#include "core/object/class_db.h"
-
 void initialize_text_server_fb_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		return;
@@ -53,3 +51,27 @@ void uninitialize_text_server_fb_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 }
+
+#ifdef GDEXTENSION
+
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/defs.hpp>
+#include <godot_cpp/core/memory.hpp>
+
+using namespace godot;
+
+extern "C" {
+
+GDExtensionBool GDE_EXPORT textserver_fallback_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
+
+	init_obj.register_initializer(&initialize_text_server_fb_module);
+	init_obj.register_terminator(&uninitialize_text_server_fb_module);
+	init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SERVERS);
+
+	return init_obj.init();
+}
+
+} // ! extern "C"
+
+#endif // ! GDEXTENSION
diff --git a/engine/modules/text_server_fb/register_types.h b/engine/modules/text_server_fb/register_types.h
index b3042f1e..dd3c4a16 100644
--- a/engine/modules/text_server_fb/register_types.h
+++ b/engine/modules/text_server_fb/register_types.h
@@ -30,7 +30,12 @@
 
 #pragma once
 
+#ifdef GDEXTENSION
+#include <godot_cpp/core/class_db.hpp>
+using namespace godot;
+#elif defined(GODOT_MODULE)
 #include "modules/register_module_types.h"
+#endif
 
 void initialize_text_server_fb_module(ModuleInitializationLevel p_level);
 void uninitialize_text_server_fb_module(ModuleInitializationLevel p_level);
diff --git a/engine/modules/text_server_fb/text_server_fb.cpp b/engine/modules/text_server_fb/text_server_fb.cpp
index 447fc627..9d99c3a0 100644
--- a/engine/modules/text_server_fb/text_server_fb.cpp
+++ b/engine/modules/text_server_fb/text_server_fb.cpp
@@ -30,18 +30,36 @@
 
 #include "text_server_fb.h"
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/classes/file_access.hpp>
+#include <godot_cpp/classes/os.hpp>
+#include <godot_cpp/classes/project_settings.hpp>
+#include <godot_cpp/classes/rendering_server.hpp>
+#include <godot_cpp/classes/translation_server.hpp>
+#include <godot_cpp/core/error_macros.hpp>
+
+#define OT_TAG(m_c1, m_c2, m_c3, m_c4) ((int32_t)((((uint32_t)(m_c1) & 0xff) << 24) | (((uint32_t)(m_c2) & 0xff) << 16) | (((uint32_t)(m_c3) & 0xff) << 8) | ((uint32_t)(m_c4) & 0xff)))
+
+using namespace godot;
+
+#define GLOBAL_GET(m_var) ProjectSettings::get_singleton()->get_setting_with_override(m_var)
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/file_access.h"
-#include "core/math/math_funcs_binary.h"
-#include "core/object/callable_mp.h"
-#include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 
+#endif
+
 // Thirdparty headers.
 
 #ifdef MODULE_MSDFGEN_ENABLED
@@ -86,7 +104,11 @@ bool TextServerFallback::_has_feature(Feature p_feature) const {
 }
 
 String TextServerFallback::_get_name() const {
+#ifdef GDEXTENSION
+	return "Fallback (GDExtension)";
+#elif defined(GODOT_MODULE)
 	return "Fallback (Built-in)";
+#endif
 }
 
 int64_t TextServerFallback::_get_features() const {
@@ -265,7 +287,7 @@ _FORCE_INLINE_ TextServerFallback::FontTexturePosition TextServerFallback::find_
 		// Could not find texture to fit, create one.
 		int texsize = MAX(p_data->size.x * 0.125, 256);
 
-		texsize = Math::next_power_of_2((uint32_t)texsize);
+		texsize = next_power_of_2((uint32_t)texsize);
 
 		if (p_msdf) {
 			texsize = MIN(texsize, 2048);
@@ -273,10 +295,10 @@ _FORCE_INLINE_ TextServerFallback::FontTexturePosition TextServerFallback::find_
 			texsize = MIN(texsize, 1024);
 		}
 		if (mw > texsize) { // Special case, adapt to it?
-			texsize = Math::next_power_of_2((uint32_t)mw);
+			texsize = next_power_of_2((uint32_t)mw);
 		}
 		if (mh > texsize) { // Special case, adapt to it?
-			texsize = Math::next_power_of_2((uint32_t)mh);
+			texsize = next_power_of_2((uint32_t)mh);
 		}
 
 		ShelfPackTexture tex = ShelfPackTexture(texsize, texsize);
@@ -659,7 +681,7 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
 
 #ifdef MODULE_FREETYPE_ENABLED
 	FontGlyph gl;
-	if (p_font_data->face) {
+	if (fd->face) {
 		FT_Int32 flags = FT_LOAD_DEFAULT;
 
 		bool outline = p_size.y > 0;
@@ -677,19 +699,19 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
 		if (p_font_data->force_autohinter) {
 			flags |= FT_LOAD_FORCE_AUTOHINT;
 		}
-		if (outline || (p_font_data->disable_embedded_bitmaps && !FT_HAS_COLOR(p_font_data->face))) {
+		if (outline || (p_font_data->disable_embedded_bitmaps && !FT_HAS_COLOR(fd->face))) {
 			flags |= FT_LOAD_NO_BITMAP;
-		} else if (FT_HAS_COLOR(p_font_data->face)) {
+		} else if (FT_HAS_COLOR(fd->face)) {
 			flags |= FT_LOAD_COLOR;
 		}
 
-		glyph_index = FT_Get_Char_Index(p_font_data->face, glyph_index);
+		glyph_index = FT_Get_Char_Index(fd->face, glyph_index);
 
 		FT_Fixed v, h;
-		FT_Get_Advance(p_font_data->face, glyph_index, flags, &h);
-		FT_Get_Advance(p_font_data->face, glyph_index, flags | FT_LOAD_VERTICAL_LAYOUT, &v);
+		FT_Get_Advance(fd->face, glyph_index, flags, &h);
+		FT_Get_Advance(fd->face, glyph_index, flags | FT_LOAD_VERTICAL_LAYOUT, &v);
 
-		int error = FT_Load_Glyph(p_font_data->face, glyph_index, flags);
+		int error = FT_Load_Glyph(fd->face, glyph_index, flags);
 		if (error) {
 			E = fd->glyph_map.insert(p_glyph, FontGlyph());
 			r_glyph = E->value;
@@ -699,21 +721,21 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
 		if (!p_font_data->msdf) {
 			if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE * 64)) {
 				FT_Pos xshift = (int)((p_glyph >> 27) & 3) << 4;
-				FT_Outline_Translate(&p_font_data->face->glyph->outline, xshift, 0);
+				FT_Outline_Translate(&fd->face->glyph->outline, xshift, 0);
 			} else if ((p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (p_font_data->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && p_size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE * 64)) {
 				FT_Pos xshift = (int)((p_glyph >> 27) & 3) << 5;
-				FT_Outline_Translate(&p_font_data->face->glyph->outline, xshift, 0);
+				FT_Outline_Translate(&fd->face->glyph->outline, xshift, 0);
 			}
 		}
 
 		if (p_font_data->embolden != 0.f) {
 			FT_Pos strength = p_font_data->embolden * p_size.x / 16; // 26.6 fractional units (1 / 64).
-			FT_Outline_Embolden(&p_font_data->face->glyph->outline, strength);
+			FT_Outline_Embolden(&fd->face->glyph->outline, strength);
 		}
 
 		if (p_font_data->transform != Transform2D()) {
 			FT_Matrix mat = { FT_Fixed(p_font_data->transform[0][0] * 65536), FT_Fixed(p_font_data->transform[0][1] * 65536), FT_Fixed(p_font_data->transform[1][0] * 65536), FT_Fixed(p_font_data->transform[1][1] * 65536) }; // 16.16 fractional units (1 / 65536).
-			FT_Outline_Transform(&p_font_data->face->glyph->outline, &mat);
+			FT_Outline_Transform(&fd->face->glyph->outline, &mat);
 		}
 
 		FT_Render_Mode aa_mode = FT_RENDER_MODE_NORMAL;
@@ -751,7 +773,7 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
 			} break;
 		}
 
-		FT_GlyphSlot slot = p_font_data->face->glyph;
+		FT_GlyphSlot slot = fd->face->glyph;
 		bool from_svg = (slot->format == FT_GLYPH_FORMAT_SVG); // Need to check before FT_Render_Glyph as it will change format to bitmap.
 		if (!outline) {
 			if (!p_font_data->msdf) {
@@ -780,7 +802,7 @@ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, const Vector2i
 			FT_Glyph glyph;
 			FT_BitmapGlyph glyph_bitmap;
 
-			if (FT_Get_Glyph(p_font_data->face->glyph, &glyph) != 0) {
+			if (FT_Get_Glyph(fd->face->glyph, &glyph) != 0) {
 				goto cleanup_stroker;
 			}
 			if (FT_Glyph_Stroke(&glyph, stroker, 1) != 0) {
@@ -813,11 +835,6 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 
 	HashMap<Vector2i, FontForSizeFallback *>::Iterator E = p_font_data->cache.find(p_size);
 	if (E) {
-#ifdef MODULE_FREETYPE_ENABLED
-		if (E->value->fsize != nullptr) {
-			FT_Activate_Size(E->value->fsize);
-		}
-#endif
 		r_cache_for_size = E->value;
 		// Size used directly, remove from oversampling list.
 		if (p_oversampling == 0 && E->value->viewport_oversampling != 0) {
@@ -853,44 +870,39 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 #endif
 			}
 
-			if (p_font_data->face == nullptr) {
-				memset(&p_font_data->stream, 0, sizeof(FT_StreamRec));
-				p_font_data->stream.base = (unsigned char *)p_font_data->data_ptr;
-				p_font_data->stream.size = p_font_data->data_size;
-				p_font_data->stream.pos = 0;
+			memset(&fd->stream, 0, sizeof(FT_StreamRec));
+			fd->stream.base = (unsigned char *)p_font_data->data_ptr;
+			fd->stream.size = p_font_data->data_size;
+			fd->stream.pos = 0;
 
-				FT_Open_Args fargs;
-				memset(&fargs, 0, sizeof(FT_Open_Args));
-				fargs.memory_base = (unsigned char *)p_font_data->data_ptr;
-				fargs.memory_size = p_font_data->data_size;
-				fargs.flags = FT_OPEN_MEMORY;
-				fargs.stream = &p_font_data->stream;
+			FT_Open_Args fargs;
+			memset(&fargs, 0, sizeof(FT_Open_Args));
+			fargs.memory_base = (unsigned char *)p_font_data->data_ptr;
+			fargs.memory_size = p_font_data->data_size;
+			fargs.flags = FT_OPEN_MEMORY;
+			fargs.stream = &fd->stream;
 
-				int max_index = 0;
-				FT_Face tmp_face = nullptr;
-				error = FT_Open_Face(ft_library, &fargs, -1, &tmp_face);
-				if (tmp_face && error == 0) {
-					max_index = tmp_face->num_faces - 1;
-				}
-				if (tmp_face) {
-					FT_Done_Face(tmp_face);
-				}
-
-				error = FT_Open_Face(ft_library, &fargs, CLAMP(p_font_data->face_index, 0, max_index), &p_font_data->face);
-				if (error) {
-					FT_Done_Face(p_font_data->face);
-					p_font_data->face = nullptr;
-					memdelete(fd);
-					if (p_silent) {
-						return false;
-					} else {
-						ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "'.");
-					}
-				}
+			int max_index = 0;
+			FT_Face tmp_face = nullptr;
+			error = FT_Open_Face(ft_library, &fargs, -1, &tmp_face);
+			if (tmp_face && error == 0) {
+				max_index = tmp_face->num_faces - 1;
+			}
+			if (tmp_face) {
+				FT_Done_Face(tmp_face);
 			}
 
-			FT_New_Size(p_font_data->face, &fd->fsize);
-			FT_Activate_Size(fd->fsize);
+			error = FT_Open_Face(ft_library, &fargs, CLAMP(p_font_data->face_index, 0, max_index), &fd->face);
+			if (error) {
+				FT_Done_Face(fd->face);
+				fd->face = nullptr;
+				memdelete(fd);
+				if (p_silent) {
+					return false;
+				} else {
+					ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "'.");
+				}
+			}
 		}
 
 		double sz = double(fd->size.x) / 64.0;
@@ -898,47 +910,47 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 			sz = p_font_data->msdf_source_size;
 		}
 
-		if (FT_HAS_COLOR(p_font_data->face) && p_font_data->face->num_fixed_sizes > 0) {
+		if (FT_HAS_COLOR(fd->face) && fd->face->num_fixed_sizes > 0) {
 			int best_match = 0;
-			int diff = Math::abs(sz - ((int64_t)p_font_data->face->available_sizes[0].width));
-			fd->scale = sz / p_font_data->face->available_sizes[0].width;
-			for (int i = 1; i < p_font_data->face->num_fixed_sizes; i++) {
-				int ndiff = Math::abs(sz - ((int64_t)p_font_data->face->available_sizes[i].width));
+			int diff = Math::abs(sz - ((int64_t)fd->face->available_sizes[0].width));
+			fd->scale = sz / fd->face->available_sizes[0].width;
+			for (int i = 1; i < fd->face->num_fixed_sizes; i++) {
+				int ndiff = Math::abs(sz - ((int64_t)fd->face->available_sizes[i].width));
 				if (ndiff < diff) {
 					best_match = i;
 					diff = ndiff;
-					fd->scale = sz / p_font_data->face->available_sizes[i].width;
+					fd->scale = sz / fd->face->available_sizes[i].width;
 				}
 			}
-			FT_Select_Size(p_font_data->face, best_match);
+			FT_Select_Size(fd->face, best_match);
 		} else {
 			FT_Size_RequestRec req;
 			req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
-			req.width = MIN(2048.0, sz) * 64.0;
-			req.height = MIN(2048.0, sz) * 64.0;
+			req.width = sz * 64.0;
+			req.height = sz * 64.0;
 			req.horiResolution = 0;
 			req.vertResolution = 0;
 
-			FT_Request_Size(p_font_data->face, &req);
-			if (p_font_data->face->size->metrics.y_ppem != 0) {
-				fd->scale = sz / (double)p_font_data->face->size->metrics.y_ppem;
+			FT_Request_Size(fd->face, &req);
+			if (fd->face->size->metrics.y_ppem != 0) {
+				fd->scale = sz / (double)fd->face->size->metrics.y_ppem;
 			}
 		}
 
-		fd->ascent = (p_font_data->face->size->metrics.ascender / 64.0) * fd->scale;
-		fd->descent = (-p_font_data->face->size->metrics.descender / 64.0) * fd->scale;
-		fd->underline_position = (-FT_MulFix(p_font_data->face->underline_position, p_font_data->face->size->metrics.y_scale) / 64.0) * fd->scale;
-		fd->underline_thickness = (FT_MulFix(p_font_data->face->underline_thickness, p_font_data->face->size->metrics.y_scale) / 64.0) * fd->scale;
+		fd->ascent = (fd->face->size->metrics.ascender / 64.0) * fd->scale;
+		fd->descent = (-fd->face->size->metrics.descender / 64.0) * fd->scale;
+		fd->underline_position = (-FT_MulFix(fd->face->underline_position, fd->face->size->metrics.y_scale) / 64.0) * fd->scale;
+		fd->underline_thickness = (FT_MulFix(fd->face->underline_thickness, fd->face->size->metrics.y_scale) / 64.0) * fd->scale;
 
 		if (!p_font_data->face_init) {
 			// When a font does not provide a `family_name`, FreeType tries to synthesize one based on other names.
 			// FreeType automatically converts non-ASCII characters to "?" in the synthesized name.
 			// To avoid that behavior, use the format-specific name directly if available.
-			if (FT_IS_SFNT(p_font_data->face)) {
-				int name_count = FT_Get_Sfnt_Name_Count(p_font_data->face);
+			if (FT_IS_SFNT(fd->face)) {
+				int name_count = FT_Get_Sfnt_Name_Count(fd->face);
 				for (int i = 0; i < name_count; i++) {
 					FT_SfntName sfnt_name;
-					if (FT_Get_Sfnt_Name(p_font_data->face, i, &sfnt_name) != 0) {
+					if (FT_Get_Sfnt_Name(fd->face, i, &sfnt_name) != 0) {
 						continue;
 					}
 					if (sfnt_name.name_id != TT_NAME_ID_FONT_FAMILY && sfnt_name.name_id != TT_NAME_ID_TYPOGRAPHIC_FAMILY) {
@@ -963,29 +975,29 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 					}
 				}
 			}
-			if (p_font_data->font_name.is_empty() && p_font_data->face->family_name != nullptr) {
-				p_font_data->font_name = String::utf8((const char *)p_font_data->face->family_name);
+			if (p_font_data->font_name.is_empty() && fd->face->family_name != nullptr) {
+				p_font_data->font_name = String::utf8((const char *)fd->face->family_name);
 			}
-			if (p_font_data->face->style_name != nullptr) {
-				p_font_data->style_name = String::utf8((const char *)p_font_data->face->style_name);
+			if (fd->face->style_name != nullptr) {
+				p_font_data->style_name = String::utf8((const char *)fd->face->style_name);
 			}
 			p_font_data->weight = _font_get_weight_by_name(p_font_data->style_name.to_lower());
 			p_font_data->stretch = _font_get_stretch_by_name(p_font_data->style_name.to_lower());
 			p_font_data->style_flags = 0;
-			if ((p_font_data->face->style_flags & FT_STYLE_FLAG_BOLD) || p_font_data->weight >= 700) {
+			if ((fd->face->style_flags & FT_STYLE_FLAG_BOLD) || p_font_data->weight >= 700) {
 				p_font_data->style_flags.set_flag(FONT_BOLD);
 			}
-			if ((p_font_data->face->style_flags & FT_STYLE_FLAG_ITALIC) || _is_ital_style(p_font_data->style_name.to_lower())) {
+			if ((fd->face->style_flags & FT_STYLE_FLAG_ITALIC) || _is_ital_style(p_font_data->style_name.to_lower())) {
 				p_font_data->style_flags.set_flag(FONT_ITALIC);
 			}
-			if (p_font_data->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) {
+			if (fd->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) {
 				p_font_data->style_flags.set_flag(FONT_FIXED_WIDTH);
 			}
 			// Read OpenType variations.
 			p_font_data->supported_varaitions.clear();
-			if (p_font_data->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+			if (fd->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
 				FT_MM_Var *amaster;
-				FT_Get_MM_Var(p_font_data->face, &amaster);
+				FT_Get_MM_Var(fd->face, &amaster);
 				for (FT_UInt i = 0; i < amaster->num_axis; i++) {
 					p_font_data->supported_varaitions[(int32_t)amaster->axis[i].tag] = Vector3i(amaster->axis[i].minimum / 65536, amaster->axis[i].maximum / 65536, amaster->axis[i].def / 65536);
 				}
@@ -998,8 +1010,8 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 		if (p_font_data->font_name == ".Apple Color Emoji UI" || p_font_data->font_name == "Apple Color Emoji") {
 			// The baseline offset is missing from the Apple Color Emoji UI font data, so add it manually.
 			// This issue doesn't occur with other system emoji fonts.
-			if (!FT_Load_Glyph(p_font_data->face, FT_Get_Char_Index(p_font_data->face, 0x1F92E), FT_LOAD_DEFAULT | FT_LOAD_COLOR)) {
-				if (p_font_data->face->glyph->metrics.horiBearingY == p_font_data->face->glyph->metrics.height) {
+			if (!FT_Load_Glyph(fd->face, FT_Get_Char_Index(fd->face, 0x1F92E), FT_LOAD_DEFAULT | FT_LOAD_COLOR)) {
+				if (fd->face->glyph->metrics.horiBearingY == fd->face->glyph->metrics.height) {
 					p_font_data->baseline_offset = 0.15;
 				}
 			}
@@ -1007,15 +1019,15 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 #endif
 
 		// Write variations.
-		if (p_font_data->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+		if (fd->face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
 			FT_MM_Var *amaster;
 
-			FT_Get_MM_Var(p_font_data->face, &amaster);
+			FT_Get_MM_Var(fd->face, &amaster);
 
 			Vector<FT_Fixed> coords;
 			coords.resize(amaster->num_axis);
 
-			FT_Get_Var_Design_Coordinates(p_font_data->face, coords.size(), coords.ptrw());
+			FT_Get_Var_Design_Coordinates(fd->face, coords.size(), coords.ptrw());
 
 			for (FT_UInt i = 0; i < amaster->num_axis; i++) {
 				// Reset to default.
@@ -1034,7 +1046,7 @@ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const
 				}
 			}
 
-			FT_Set_Var_Design_Coordinates(p_font_data->face, coords.size(), coords.ptrw());
+			FT_Set_Var_Design_Coordinates(fd->face, coords.size(), coords.ptrw());
 			FT_Done_MM_Var(ft_library, amaster);
 		}
 #else
@@ -1549,51 +1561,6 @@ bool TextServerFallback::_font_is_modulate_color_glyphs(const RID &p_font_rid) c
 	return fd->modulate_color_glyphs;
 }
 
-int64_t TextServerFallback::_font_get_palette_count(const RID &p_font_rid) const {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, 0);
-
-	return 0;
-}
-
-String TextServerFallback::_font_get_palette_name(const RID &p_font_rid, int64_t p_index) const {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, String());
-
-	return String();
-}
-
-Vector<Color> TextServerFallback::_font_get_palette_colors(const RID &p_font_rid, int64_t p_index) const {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, Vector<Color>());
-
-	return Vector<Color>();
-}
-
-void TextServerFallback::_font_set_palette_custom_colors(const RID &p_font_rid, const Vector<Color> &p_colors) {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL(fd);
-}
-
-Vector<Color> TextServerFallback::_font_get_palette_custom_colors(const RID &p_font_rid) const {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, Vector<Color>());
-
-	return Vector<Color>();
-}
-
-int64_t TextServerFallback::_font_get_used_palette(const RID &p_font_rid) const {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL_V(fd, 0);
-
-	return 0;
-}
-
-void TextServerFallback::_font_set_used_palette(const RID &p_font_rid, int64_t p_index) {
-	FontFallback *fd = _get_font_data(p_font_rid);
-	ERR_FAIL_NULL(fd);
-}
-
 void TextServerFallback::_font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	FontFallback *fd = _get_font_data(p_font_rid);
 	ERR_FAIL_NULL(fd);
@@ -2010,7 +1977,7 @@ void TextServerFallback::_font_set_scale(const RID &p_font_rid, int64_t p_size,
 	FontForSizeFallback *ffsd = nullptr;
 	ERR_FAIL_COND(!_ensure_cache_for_size(fd, size, ffsd));
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (ffsd->face) {
 		return; // Do not override scale for dynamic fonts, it's calculated automatically.
 	}
 #endif
@@ -2481,26 +2448,28 @@ RID TextServerFallback::_font_get_glyph_texture_rid(const RID &p_font_rid, const
 
 	ERR_FAIL_COND_V(fgl.texture_idx < -1 || fgl.texture_idx >= ffsd->textures.size(), RID());
 
-	if (fgl.texture_idx != -1) {
-		if (ffsd->textures[fgl.texture_idx].dirty) {
-			ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-			Ref<Image> img = tex.image;
-			if (fgl.from_svg) {
-				// Same as the "fix alpha border" process option when importing SVGs
-				img->fix_alpha_edges();
+	if (RenderingServer::get_singleton() != nullptr) {
+		if (fgl.texture_idx != -1) {
+			if (ffsd->textures[fgl.texture_idx].dirty) {
+				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
+				if (fd->mipmaps && !img->has_mipmaps()) {
+					img = tex.image->duplicate();
+					img->generate_mipmaps();
+				}
+				if (tex.texture.is_null()) {
+					tex.texture = ImageTexture::create_from_image(img);
+				} else {
+					tex.texture->update(img);
+				}
+				tex.dirty = false;
 			}
-			if (fd->mipmaps && !img->has_mipmaps()) {
-				img = tex.image->duplicate();
-				img->generate_mipmaps();
-			}
-			if (tex.texture.is_null()) {
-				tex.texture = ImageTexture::create_from_image(img);
-			} else {
-				tex.texture->update(img);
-			}
-			tex.dirty = false;
+			return ffsd->textures[fgl.texture_idx].texture->get_rid();
 		}
-		return ffsd->textures[fgl.texture_idx].texture->get_rid();
 	}
 
 	return RID();
@@ -2531,26 +2500,28 @@ Size2 TextServerFallback::_font_get_glyph_texture_size(const RID &p_font_rid, co
 
 	ERR_FAIL_COND_V(fgl.texture_idx < -1 || fgl.texture_idx >= ffsd->textures.size(), Size2());
 
-	if (fgl.texture_idx != -1) {
-		if (ffsd->textures[fgl.texture_idx].dirty) {
-			ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-			Ref<Image> img = tex.image;
-			if (fgl.from_svg) {
-				// Same as the "fix alpha border" process option when importing SVGs
-				img->fix_alpha_edges();
+	if (RenderingServer::get_singleton() != nullptr) {
+		if (fgl.texture_idx != -1) {
+			if (ffsd->textures[fgl.texture_idx].dirty) {
+				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
+				if (fd->mipmaps && !img->has_mipmaps()) {
+					img = tex.image->duplicate();
+					img->generate_mipmaps();
+				}
+				if (tex.texture.is_null()) {
+					tex.texture = ImageTexture::create_from_image(img);
+				} else {
+					tex.texture->update(img);
+				}
+				tex.dirty = false;
 			}
-			if (fd->mipmaps && !img->has_mipmaps()) {
-				img = tex.image->duplicate();
-				img->generate_mipmaps();
-			}
-			if (tex.texture.is_null()) {
-				tex.texture = ImageTexture::create_from_image(img);
-			} else {
-				tex.texture->update(img);
-			}
-			tex.dirty = false;
+			return ffsd->textures[fgl.texture_idx].texture->get_size();
 		}
-		return ffsd->textures[fgl.texture_idx].texture->get_size();
 	}
 
 	return Size2();
@@ -2572,17 +2543,17 @@ Dictionary TextServerFallback::_font_get_glyph_contours(const RID &p_font_rid, i
 
 	int32_t index = p_index & 0xffffff; // Remove subpixel shifts.
 
-	int error = FT_Load_Glyph(fd->face, FT_Get_Char_Index(fd->face, index), FT_LOAD_NO_BITMAP | (fd->force_autohinter ? FT_LOAD_FORCE_AUTOHINT : 0));
+	int error = FT_Load_Glyph(ffsd->face, FT_Get_Char_Index(ffsd->face, index), FT_LOAD_NO_BITMAP | (fd->force_autohinter ? FT_LOAD_FORCE_AUTOHINT : 0));
 	ERR_FAIL_COND_V(error, Dictionary());
 
 	if (fd->embolden != 0.f) {
 		FT_Pos strength = fd->embolden * size.x / 16; // 26.6 fractional units (1 / 64).
-		FT_Outline_Embolden(&fd->face->glyph->outline, strength);
+		FT_Outline_Embolden(&ffsd->face->glyph->outline, strength);
 	}
 
 	if (fd->transform != Transform2D()) {
 		FT_Matrix mat = { FT_Fixed(fd->transform[0][0] * 65536), FT_Fixed(fd->transform[0][1] * 65536), FT_Fixed(fd->transform[1][0] * 65536), FT_Fixed(fd->transform[1][1] * 65536) }; // 16.16 fractional units (1 / 65536).
-		FT_Outline_Transform(&fd->face->glyph->outline, &mat);
+		FT_Outline_Transform(&ffsd->face->glyph->outline, &mat);
 	}
 
 	double scale = (1.0 / 64.0) * ffsd->scale;
@@ -2595,13 +2566,13 @@ Dictionary TextServerFallback::_font_get_glyph_contours(const RID &p_font_rid, i
 			scale = scale * Math::round((double)p_size / (double)fd->fixed_size);
 		}
 	}
-	for (short i = 0; i < fd->face->glyph->outline.n_points; i++) {
-		points.push_back(Vector3(fd->face->glyph->outline.points[i].x * scale, -fd->face->glyph->outline.points[i].y * scale, FT_CURVE_TAG(fd->face->glyph->outline.tags[i])));
+	for (short i = 0; i < ffsd->face->glyph->outline.n_points; i++) {
+		points.push_back(Vector3(ffsd->face->glyph->outline.points[i].x * scale, -ffsd->face->glyph->outline.points[i].y * scale, FT_CURVE_TAG(ffsd->face->glyph->outline.tags[i])));
 	}
-	for (short i = 0; i < fd->face->glyph->outline.n_contours; i++) {
-		contours.push_back(fd->face->glyph->outline.contours[i]);
+	for (short i = 0; i < ffsd->face->glyph->outline.n_contours; i++) {
+		contours.push_back(ffsd->face->glyph->outline.contours[i]);
 	}
-	bool orientation = (FT_Outline_Get_Orientation(&fd->face->glyph->outline) == FT_ORIENTATION_FILL_RIGHT);
+	bool orientation = (FT_Outline_Get_Orientation(&ffsd->face->glyph->outline) == FT_ORIENTATION_FILL_RIGHT);
 
 	Dictionary out;
 	out["points"] = points;
@@ -2692,11 +2663,11 @@ Vector2 TextServerFallback::_font_get_kerning(const RID &p_font_rid, int64_t p_s
 		}
 	} else {
 #ifdef MODULE_FREETYPE_ENABLED
-		if (fd->face) {
+		if (ffsd->face) {
 			FT_Vector delta;
-			int32_t glyph_a = FT_Get_Char_Index(fd->face, p_glyph_pair.x);
-			int32_t glyph_b = FT_Get_Char_Index(fd->face, p_glyph_pair.y);
-			FT_Get_Kerning(fd->face, glyph_a, glyph_b, FT_KERNING_DEFAULT, &delta);
+			int32_t glyph_a = FT_Get_Char_Index(ffsd->face, p_glyph_pair.x);
+			int32_t glyph_b = FT_Get_Char_Index(ffsd->face, p_glyph_pair.y);
+			FT_Get_Kerning(ffsd->face, glyph_a, glyph_b, FT_KERNING_DEFAULT, &delta);
 			if (fd->msdf) {
 				return Vector2(delta.x, delta.y) * (double)p_size / (double)fd->msdf_source_size;
 			} else if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE && size.x != p_size * 64) {
@@ -2739,8 +2710,8 @@ bool TextServerFallback::_font_has_char(const RID &p_font_rid, int64_t p_char) c
 	}
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
-		return FT_Get_Char_Index(fd->face, p_char) != 0;
+	if (ffsd->face) {
+		return FT_Get_Char_Index(ffsd->face, p_char) != 0;
 	}
 #endif
 	return ffsd->glyph_map.has((int32_t)p_char);
@@ -2760,14 +2731,14 @@ String TextServerFallback::_font_get_supported_chars(const RID &p_font_rid) cons
 
 	String chars;
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (ffsd->face) {
 		FT_UInt gindex;
-		FT_ULong charcode = FT_Get_First_Char(fd->face, &gindex);
+		FT_ULong charcode = FT_Get_First_Char(ffsd->face, &gindex);
 		while (gindex != 0) {
 			if (charcode != 0) {
 				chars = chars + String::chr(charcode);
 			}
-			charcode = FT_Get_Next_Char(fd->face, charcode, &gindex);
+			charcode = FT_Get_Next_Char(ffsd->face, charcode, &gindex);
 		}
 		return chars;
 	}
@@ -2793,12 +2764,12 @@ PackedInt32Array TextServerFallback::_font_get_supported_glyphs(const RID &p_fon
 
 	PackedInt32Array glyphs;
 #ifdef MODULE_FREETYPE_ENABLED
-	if (fd->face) {
+	if (at_size && at_size->face) {
 		FT_UInt gindex;
-		FT_ULong charcode = FT_Get_First_Char(fd->face, &gindex);
+		FT_ULong charcode = FT_Get_First_Char(at_size->face, &gindex);
 		while (gindex != 0) {
 			glyphs.push_back(gindex);
-			charcode = FT_Get_Next_Char(fd->face, charcode, &gindex);
+			charcode = FT_Get_Next_Char(at_size->face, charcode, &gindex);
 		}
 		return glyphs;
 	}
@@ -2825,7 +2796,7 @@ void TextServerFallback::_font_render_range(const RID &p_font_rid, const Vector2
 	for (int64_t i = p_start; i <= p_end; i++) {
 #ifdef MODULE_FREETYPE_ENABLED
 		int32_t idx = i;
-		if (fd->face) {
+		if (ffsd->face) {
 			FontGlyph fgl;
 			if (fd->msdf) {
 				_ensure_glyph(fd, size, (int32_t)idx, fgl);
@@ -2859,7 +2830,7 @@ void TextServerFallback::_font_render_glyph(const RID &p_font_rid, const Vector2
 	ERR_FAIL_COND(!_ensure_cache_for_size(fd, size, ffsd));
 #ifdef MODULE_FREETYPE_ENABLED
 	int32_t idx = p_index & 0xffffff; // Remove subpixel shifts.
-	if (fd->face) {
+	if (ffsd->face) {
 		FontGlyph fgl;
 		if (fd->msdf) {
 			_ensure_glyph(fd, size, (int32_t)idx, fgl);
@@ -2926,7 +2897,7 @@ void TextServerFallback::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 	bool lcd_aa = false;
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (!fd->msdf && fd->face) {
+	if (!fd->msdf && ffsd->face) {
 		// LCD layout, bits 24, 25, 26
 		if (fd->antialiasing == FONT_ANTIALIASING_LCD) {
 			TextServer::FontLCDSubpixelLayout layout = lcd_subpixel_layout.get();
@@ -2957,68 +2928,71 @@ void TextServerFallback::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (!fd->modulate_color_glyphs && fd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (!fd->modulate_color_glyphs && ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
-			if (ffsd->textures[fgl.texture_idx].dirty) {
-				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-				Ref<Image> img = tex.image;
-				if (fgl.from_svg) {
-					// Same as the "fix alpha border" process option when importing SVGs
-					img->fix_alpha_edges();
-				}
-				if (fd->mipmaps && !img->has_mipmaps()) {
-					img = tex.image->duplicate();
-					img->generate_mipmaps();
-				}
-				if (tex.texture.is_null()) {
-					tex.texture = ImageTexture::create_from_image(img);
-				} else {
-					tex.texture->update(img);
-				}
-				tex.dirty = false;
-			}
-			if (fd->msdf) {
-				Point2 cpos = p_pos;
-				cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
-				Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
-				ffsd->textures[fgl.texture_idx].texture->draw_msdf_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, 0, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
-			} else {
-				Point2 cpos = p_pos;
-				double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
-				if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE)) {
-					cpos.x = cpos.x + 0.125;
-				} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE)) {
-					cpos.x = cpos.x + 0.25;
-				}
-				if (scale == 1.0) {
-					cpos.y = Math::floor(cpos.y);
-					cpos.x = Math::floor(cpos.x);
-				}
-				Vector2 gpos = fgl.rect.position;
-				Size2 csize = fgl.rect.size;
-				if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
-					if (size.x != p_size * 64) {
-						if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
-							double gl_scale = (double)p_size / (double)fd->fixed_size;
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						} else {
-							double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						}
+			if (RenderingServer::get_singleton() != nullptr) {
+				if (ffsd->textures[fgl.texture_idx].dirty) {
+					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+					Ref<Image> img = tex.image;
+					if (fgl.from_svg) {
+						// Same as the "fix alpha border" process option when importing SVGs
+						img->fix_alpha_edges();
 					}
-				} else {
-					gpos /= oversampling_factor;
-					csize /= oversampling_factor;
+					if (fd->mipmaps && !img->has_mipmaps()) {
+						img = tex.image->duplicate();
+						img->generate_mipmaps();
+					}
+					if (tex.texture.is_null()) {
+						tex.texture = ImageTexture::create_from_image(img);
+					} else {
+						tex.texture->update(img);
+					}
+					tex.dirty = false;
 				}
-				cpos += gpos;
-				if (lcd_aa) {
-					ffsd->textures[fgl.texture_idx].texture->draw_lcd_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate);
+				RID texture = ffsd->textures[fgl.texture_idx].texture->get_rid();
+				if (fd->msdf) {
+					Point2 cpos = p_pos;
+					cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
+					Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
+					RenderingServer::get_singleton()->canvas_item_add_msdf_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, 0, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
 				} else {
-					ffsd->textures[fgl.texture_idx].texture->draw_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, false, false);
+					Point2 cpos = p_pos;
+					double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
+					if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE)) {
+						cpos.x = cpos.x + 0.125;
+					} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE)) {
+						cpos.x = cpos.x + 0.25;
+					}
+					if (scale == 1.0) {
+						cpos.y = Math::floor(cpos.y);
+						cpos.x = Math::floor(cpos.x);
+					}
+					Vector2 gpos = fgl.rect.position;
+					Size2 csize = fgl.rect.size;
+					if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
+						if (size.x != p_size * 64) {
+							if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
+								double gl_scale = (double)p_size / (double)fd->fixed_size;
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							} else {
+								double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							}
+						}
+					} else {
+						gpos /= oversampling_factor;
+						csize /= oversampling_factor;
+					}
+					cpos += gpos;
+					if (lcd_aa) {
+						RenderingServer::get_singleton()->canvas_item_add_lcd_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate);
+					} else {
+						RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, false, false);
+					}
 				}
 			}
 		}
@@ -3069,7 +3043,7 @@ void TextServerFallback::_font_draw_glyph_outline(const RID &p_font_rid, const R
 	bool lcd_aa = false;
 
 #ifdef MODULE_FREETYPE_ENABLED
-	if (!fd->msdf && fd->face) {
+	if (!fd->msdf && ffsd->face) {
 		// LCD layout, bits 24, 25, 26
 		if (fd->antialiasing == FONT_ANTIALIASING_LCD) {
 			TextServer::FontLCDSubpixelLayout layout = lcd_subpixel_layout.get();
@@ -3100,64 +3074,67 @@ void TextServerFallback::_font_draw_glyph_outline(const RID &p_font_rid, const R
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (fd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
-			if (ffsd->textures[fgl.texture_idx].dirty) {
-				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
-				Ref<Image> img = tex.image;
-				if (fd->mipmaps && !img->has_mipmaps()) {
-					img = tex.image->duplicate();
-					img->generate_mipmaps();
-				}
-				if (tex.texture.is_null()) {
-					tex.texture = ImageTexture::create_from_image(img);
-				} else {
-					tex.texture->update(img);
-				}
-				tex.dirty = false;
-			}
-			if (fd->msdf) {
-				Point2 cpos = p_pos;
-				cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
-				Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
-				ffsd->textures[fgl.texture_idx].texture->draw_msdf_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, p_outline_size, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
-			} else {
-				Point2 cpos = p_pos;
-				double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
-				if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE)) {
-					cpos.x = cpos.x + 0.125;
-				} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE)) {
-					cpos.x = cpos.x + 0.25;
-				}
-				if (scale == 1.0) {
-					cpos.y = Math::floor(cpos.y);
-					cpos.x = Math::floor(cpos.x);
-				}
-				Vector2 gpos = fgl.rect.position;
-				Size2 csize = fgl.rect.size;
-				if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
-					if (size.x != p_size * 64) {
-						if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
-							double gl_scale = (double)p_size / (double)fd->fixed_size;
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						} else {
-							double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
-							gpos *= gl_scale;
-							csize *= gl_scale;
-						}
+			if (RenderingServer::get_singleton() != nullptr) {
+				if (ffsd->textures[fgl.texture_idx].dirty) {
+					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
+					Ref<Image> img = tex.image;
+					if (fd->mipmaps && !img->has_mipmaps()) {
+						img = tex.image->duplicate();
+						img->generate_mipmaps();
 					}
-				} else {
-					gpos /= oversampling_factor;
-					csize /= oversampling_factor;
+					if (tex.texture.is_null()) {
+						tex.texture = ImageTexture::create_from_image(img);
+					} else {
+						tex.texture->update(img);
+					}
+					tex.dirty = false;
 				}
-				cpos += gpos;
-				if (lcd_aa) {
-					ffsd->textures[fgl.texture_idx].texture->draw_lcd_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate);
+				RID texture = ffsd->textures[fgl.texture_idx].texture->get_rid();
+				if (fd->msdf) {
+					Point2 cpos = p_pos;
+					cpos += fgl.rect.position * (double)p_size / (double)fd->msdf_source_size;
+					Size2 csize = fgl.rect.size * (double)p_size / (double)fd->msdf_source_size;
+					RenderingServer::get_singleton()->canvas_item_add_msdf_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, p_outline_size, fd->msdf_range, (double)p_size / (double)fd->msdf_source_size);
 				} else {
-					ffsd->textures[fgl.texture_idx].texture->draw_rect_region(p_canvas, Rect2(cpos, csize), fgl.uv_rect, modulate, false, false);
+					Point2 cpos = p_pos;
+					double scale = _font_get_scale(p_font_rid, p_size) / oversampling_factor;
+					if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_QUARTER) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_QUARTER_MAX_SIZE)) {
+						cpos.x = cpos.x + 0.125;
+					} else if ((fd->subpixel_positioning == SUBPIXEL_POSITIONING_ONE_HALF) || (fd->subpixel_positioning == SUBPIXEL_POSITIONING_AUTO && size.x <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE)) {
+						cpos.x = cpos.x + 0.25;
+					}
+					if (scale == 1.0) {
+						cpos.y = Math::floor(cpos.y);
+						cpos.x = Math::floor(cpos.x);
+					}
+					Vector2 gpos = fgl.rect.position;
+					Size2 csize = fgl.rect.size;
+					if (fd->fixed_size > 0 && fd->fixed_size_scale_mode != FIXED_SIZE_SCALE_DISABLE) {
+						if (size.x != p_size * 64) {
+							if (fd->fixed_size_scale_mode == FIXED_SIZE_SCALE_ENABLED) {
+								double gl_scale = (double)p_size / (double)fd->fixed_size;
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							} else {
+								double gl_scale = Math::round((double)p_size / (double)fd->fixed_size);
+								gpos *= gl_scale;
+								csize *= gl_scale;
+							}
+						}
+					} else {
+						gpos /= oversampling_factor;
+						csize /= oversampling_factor;
+					}
+					cpos += gpos;
+					if (lcd_aa) {
+						RenderingServer::get_singleton()->canvas_item_add_lcd_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate);
+					} else {
+						RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, csize), texture, fgl.uv_rect, modulate, false, false);
+					}
 				}
 			}
 		}
@@ -4482,7 +4459,12 @@ RID TextServerFallback::_find_sys_font_for_text(const RID &p_fdef, const String
 
 		String locale = (p_language.is_empty()) ? TranslationServer::get_singleton()->get_tool_locale() : p_language;
 		PackedStringArray fallback_font_name = OS::get_singleton()->get_system_font_path_for_text(font_name, p_text, locale, p_script_code, font_weight, font_stretch, font_style & TextServer::FONT_ITALIC);
+#ifdef GDEXTENSION
+		for (int fb = 0; fb < fallback_font_name.size(); fb++) {
+			const String &E = fallback_font_name[fb];
+#elif defined(GODOT_MODULE)
 		for (const String &E : fallback_font_name) {
+#endif
 			SystemFontKey key = SystemFontKey(E, font_style & TextServer::FONT_ITALIC, font_weight, font_stretch, p_fdef, this);
 			if (system_fonts.has(key)) {
 				const SystemFontCache &sysf_cache = system_fonts[key];
@@ -4595,7 +4577,7 @@ RID TextServerFallback::_find_sys_font_for_text(const RID &p_fdef, const String
 						Vector2i size = _get_size(fd, 16);
 						FontForSizeFallback *ffsd = nullptr;
 						if (_ensure_cache_for_size(fd, size, ffsd)) {
-							if (ffsd && (FT_HAS_COLOR(fd->face) || !FT_IS_SCALABLE(fd->face))) {
+							if (ffsd && (FT_HAS_COLOR(ffsd->face) || !FT_IS_SCALABLE(ffsd->face))) {
 								fb_use_msdf = false;
 							}
 						}
@@ -5238,7 +5220,11 @@ PackedInt32Array TextServerFallback::_shaped_text_get_character_breaks(const RID
 	if (size > 0) {
 		ret.resize(size);
 		for (int i = 0; i < size; i++) {
+#ifdef GDEXTENSION
+			ret[i] = i + 1 + sd->start;
+#else
 			ret.write[i] = i + 1 + sd->start;
+#endif
 		}
 	}
 	return ret;
diff --git a/engine/modules/text_server_fb/text_server_fb.h b/engine/modules/text_server_fb/text_server_fb.h
index f3310a35..833c96de 100644
--- a/engine/modules/text_server_fb/text_server_fb.h
+++ b/engine/modules/text_server_fb/text_server_fb.h
@@ -35,7 +35,52 @@
 /* BiDi, shaping and advanced font features support.                     */
 /*************************************************************************/
 
-#include "core/extension/ext_wrappers.gen.h"
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/godot.hpp>
+
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/ext_wrappers.gen.inc>
+#include <godot_cpp/core/mutex_lock.hpp>
+
+#include <godot_cpp/variant/array.hpp>
+#include <godot_cpp/variant/dictionary.hpp>
+#include <godot_cpp/variant/packed_int32_array.hpp>
+#include <godot_cpp/variant/packed_string_array.hpp>
+#include <godot_cpp/variant/packed_vector2_array.hpp>
+#include <godot_cpp/variant/rect2.hpp>
+#include <godot_cpp/variant/rid.hpp>
+#include <godot_cpp/variant/string.hpp>
+#include <godot_cpp/variant/typed_array.hpp>
+#include <godot_cpp/variant/vector2.hpp>
+#include <godot_cpp/variant/vector2i.hpp>
+
+#include <godot_cpp/classes/text_server.hpp>
+#include <godot_cpp/classes/text_server_extension.hpp>
+#include <godot_cpp/classes/text_server_manager.hpp>
+
+#include <godot_cpp/classes/caret_info.hpp>
+#include <godot_cpp/classes/global_constants_binds.hpp>
+#include <godot_cpp/classes/glyph.hpp>
+#include <godot_cpp/classes/image.hpp>
+#include <godot_cpp/classes/image_texture.hpp>
+#include <godot_cpp/classes/ref.hpp>
+#include <godot_cpp/classes/worker_thread_pool.hpp>
+
+#include <godot_cpp/templates/hash_map.hpp>
+#include <godot_cpp/templates/hash_set.hpp>
+#include <godot_cpp/templates/rid_owner.hpp>
+#include <godot_cpp/templates/safe_refcount.hpp>
+#include <godot_cpp/templates/vector.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/worker_thread_pool.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/safe_refcount.h"
@@ -44,6 +89,8 @@
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 
+#endif
+
 // Thirdparty headers.
 
 #ifdef MODULE_FREETYPE_ENABLED
@@ -54,7 +101,6 @@
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 #include FT_BBOX_H
-#include FT_SIZES_H
 #include FT_MODULE_H
 #include FT_CONFIG_OPTIONS_H
 #if !defined(FT_CONFIG_OPTION_USE_BROTLI) && !defined(_MSC_VER)
@@ -193,13 +239,14 @@ class TextServerFallback : public TextServerExtension {
 		HashMap<Vector2i, Vector2> kerning_map;
 
 #ifdef MODULE_FREETYPE_ENABLED
-		FT_Size fsize = nullptr;
+		FT_Face face = nullptr;
+		FT_StreamRec stream;
 #endif
 
 		~FontForSizeFallback() {
 #ifdef MODULE_FREETYPE_ENABLED
-			if (fsize != nullptr) {
-				FT_Done_Size(fsize);
+			if (face != nullptr) {
+				FT_Done_Face(face);
 			}
 #endif
 		}
@@ -263,21 +310,11 @@ class TextServerFallback : public TextServerExtension {
 		size_t data_size;
 		int face_index = 0;
 
-#ifdef MODULE_FREETYPE_ENABLED
-		FT_Face face = nullptr;
-		FT_StreamRec stream;
-#endif
-
 		~FontFallback() {
 			for (const KeyValue<Vector2i, FontForSizeFallback *> &E : cache) {
 				memdelete(E.value);
 			}
 			cache.clear();
-#ifdef MODULE_FREETYPE_ENABLED
-			if (face != nullptr) {
-				FT_Done_Face(face);
-			}
-#endif
 		}
 	};
 
@@ -649,14 +686,6 @@ public:
 	MODBIND2(font_set_modulate_color_glyphs, const RID &, bool);
 	MODBIND1RC(bool, font_is_modulate_color_glyphs, const RID &);
 
-	MODBIND1RC(int64_t, font_get_palette_count, const RID &);
-	MODBIND2RC(String, font_get_palette_name, const RID &, int64_t);
-	MODBIND2RC(Vector<Color>, font_get_palette_colors, const RID &, int64_t);
-	MODBIND2(font_set_palette_custom_colors, const RID &, const Vector<Color> &);
-	MODBIND1RC(Vector<Color>, font_get_palette_custom_colors, const RID &);
-	MODBIND1RC(int64_t, font_get_used_palette, const RID &);
-	MODBIND2(font_set_used_palette, const RID &, int64_t);
-
 	MODBIND2(font_set_subpixel_positioning, const RID &, SubpixelPositioning);
 	MODBIND1RC(SubpixelPositioning, font_get_subpixel_positioning, const RID &);
 
diff --git a/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp b/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
index af855e17..f9f6c8b8 100644
--- a/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
+++ b/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
@@ -30,14 +30,29 @@
 
 #include "thorvg_svg_in_ot.h"
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/classes/xml_parser.hpp>
+#include <godot_cpp/core/mutex_lock.hpp>
+#include <godot_cpp/godot.hpp>
+#include <godot_cpp/templates/vector.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/error/error_macros.h"
 #include "core/io/xml_parser.h"
 #include "core/os/memory.h"
+#include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
 
 #include "modules/modules_enabled.gen.h" // For svg, freetype.
+#endif
 
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
@@ -45,6 +60,8 @@
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
+#include <cstdlib>
+
 FT_Error tvg_svg_in_ot_init(FT_Pointer *p_state) {
 	*p_state = memnew(TVG_State);
 
@@ -163,7 +180,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 				if (!is_in_defs && parser->has_attribute("id")) {
 					const String &gl_name = parser->get_named_attribute_value("id");
 					if (gl_name.begins_with("glyph")) {
+#ifdef GDEXTENSION
+						int dot_pos = gl_name.find(".");
+#else
 						int dot_pos = gl_name.find_char('.');
+#endif // GDEXTENSION
 						int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int();
 
 						TVG_NodeCache node_cache = TVG_NodeCache();
@@ -201,12 +222,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 			cache.embox_y = embox_y;
 		}
 
-		tvg::Picture *picture = tvg::Picture::gen();
+		std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
 		gl_state.xml_code = xml_body.utf8();
 
-		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", nullptr, false);
+		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
 		}
 
@@ -217,7 +237,6 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 
 		result = picture->size(embox_x * aspect_x, embox_y * aspect_y);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
@@ -239,13 +258,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 
 		result = picture->size(embox_x * aspect_x * x_svg_to_out, embox_y * aspect_y * y_svg_to_out);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
 		result = picture->transform(gl_state.m);
 		if (result != tvg::Result::Success) {
-			tvg::Paint::rel(picture);
 			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 		}
 
@@ -254,8 +271,6 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 		gl_state.x = (double(p_slot->metrics.horiAdvance) / 64.0 - gl_state.w) / 2.0;
 		gl_state.y = -Math::ceil(gl_state.h * yoff);
 
-		tvg::Paint::rel(picture);
-
 		gl_state.ready = true;
 	}
 
@@ -310,30 +325,26 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) {
 	GL_State &gl_state = state->glyph_map[p_slot->glyph_index];
 	ERR_FAIL_COND_V_MSG(!gl_state.ready, FT_Err_Invalid_SVG_Document, "SVG glyph not ready.");
 
-	tvg::Picture *picture = tvg::Picture::gen();
-	tvg::Result res = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", nullptr, false);
+	std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
+	tvg::Result res = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering).");
 	}
 	res = picture->size(gl_state.w, gl_state.h);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 	}
 	res = picture->transform(gl_state.m);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 	}
 
-	std::unique_ptr<tvg::SwCanvas> sw_canvas(tvg::SwCanvas::gen());
-	res = sw_canvas->target((uint32_t *)p_slot->bitmap.buffer, (int)p_slot->bitmap.width, (int)p_slot->bitmap.width, (int)p_slot->bitmap.rows, tvg::ColorSpace::ARGB8888S);
+	std::unique_ptr<tvg::SwCanvas> sw_canvas = tvg::SwCanvas::gen();
+	res = sw_canvas->target((uint32_t *)p_slot->bitmap.buffer, (int)p_slot->bitmap.width, (int)p_slot->bitmap.width, (int)p_slot->bitmap.rows, tvg::SwCanvas::ARGB8888S);
 	if (res != tvg::Result::Success) {
-		tvg::Paint::rel(picture);
 		ERR_FAIL_V_MSG(FT_Err_Invalid_Outline, "Failed to create SVG canvas.");
 	}
-	res = sw_canvas->add(picture);
+	res = sw_canvas->push(std::move(picture));
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_Outline, "Failed to set SVG canvas source.");
 	}
diff --git a/engine/modules/text_server_fb/thorvg_svg_in_ot.h b/engine/modules/text_server_fb/thorvg_svg_in_ot.h
index 986c364e..ebb0f8fb 100644
--- a/engine/modules/text_server_fb/thorvg_svg_in_ot.h
+++ b/engine/modules/text_server_fb/thorvg_svg_in_ot.h
@@ -30,12 +30,25 @@
 
 #pragma once
 
+#ifdef GDEXTENSION
+// Headers for building as GDExtension plug-in.
+
+#include <godot_cpp/core/mutex_lock.hpp>
+#include <godot_cpp/godot.hpp>
+#include <godot_cpp/templates/hash_map.hpp>
+
+using namespace godot;
+
+#elif defined(GODOT_MODULE)
+// Headers for building as built-in module.
+
 #include "core/os/mutex.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/typedefs.h"
 
 #include "modules/modules_enabled.gen.h" // For svg, freetype.
+#endif
 
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
diff --git a/engine/modules/tga/image_loader_tga.cpp b/engine/modules/tga/image_loader_tga.cpp
index 2446b036..6d7d0ed7 100644
--- a/engine/modules/tga/image_loader_tga.cpp
+++ b/engine/modules/tga/image_loader_tga.cpp
@@ -89,8 +89,8 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t
 }
 
 Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome, size_t p_input_size) {
-#define TGA_PUT_PIXEL(r, g, b, a) \
-	int image_data_ofs = ((y * width) + x); \
+#define TGA_PUT_PIXEL(r, g, b, a)             \
+	int image_data_ofs = ((y * width) + x);   \
 	image_data_w[image_data_ofs * 4 + 0] = r; \
 	image_data_w[image_data_ofs * 4 + 1] = g; \
 	image_data_w[image_data_ofs * 4 + 2] = b; \
diff --git a/engine/modules/theora/doc_classes/VideoStreamTheora.xml b/engine/modules/theora/doc_classes/VideoStreamTheora.xml
index 7216b1b5..97939eea 100644
--- a/engine/modules/theora/doc_classes/VideoStreamTheora.xml
+++ b/engine/modules/theora/doc_classes/VideoStreamTheora.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VideoStreamTheora" inherits="VideoStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="VideoStreamTheora" inherits="VideoStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		[VideoStream] resource for Ogg Theora videos.
 	</brief_description>
diff --git a/engine/modules/theora/editor/movie_writer_ogv.cpp b/engine/modules/theora/editor/movie_writer_ogv.cpp
index a062c619..cbba4a88 100644
--- a/engine/modules/theora/editor/movie_writer_ogv.cpp
+++ b/engine/modules/theora/editor/movie_writer_ogv.cpp
@@ -30,10 +30,9 @@
 
 #include "movie_writer_ogv.h"
 
-#include "rgb2yuv.h"
-
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
+#include "rgb2yuv.h"
 
 void MovieWriterOGV::push_audio(const int32_t *p_audio_data) {
 	// Read and process more audio.
diff --git a/engine/modules/theora/register_types.cpp b/engine/modules/theora/register_types.cpp
index 069817b6..84013efa 100644
--- a/engine/modules/theora/register_types.cpp
+++ b/engine/modules/theora/register_types.cpp
@@ -32,9 +32,6 @@
 
 #include "video_stream_theora.h"
 
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/movie_writer_ogv.h"
 #endif
diff --git a/engine/modules/theora/video_stream_theora.cpp b/engine/modules/theora/video_stream_theora.cpp
index 8a219dc8..b6103844 100644
--- a/engine/modules/theora/video_stream_theora.cpp
+++ b/engine/modules/theora/video_stream_theora.cpp
@@ -32,10 +32,9 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
-#include <thirdparty/misc/yuv2rgb.h>
+#include "thirdparty/misc/yuv2rgb.h"
 
 int VideoStreamPlaybackTheora::buffer_data() {
 	char *buffer = ogg_sync_buffer(&oy, 4096);
@@ -799,8 +798,7 @@ Ref<Resource> ResourceFormatLoaderTheora::load(const String &p_path, const Strin
 		return Ref<Resource>();
 	}
 
-	Ref<VideoStreamTheora> stream;
-	stream.instantiate();
+	VideoStreamTheora *stream = memnew(VideoStreamTheora);
 	stream->set_file(p_path);
 
 	Ref<VideoStreamTheora> ogv_stream = Ref<VideoStreamTheora>(stream);
diff --git a/engine/modules/tinyexr/image_loader_tinyexr.cpp b/engine/modules/tinyexr/image_loader_tinyexr.cpp
index 43aa48b8..7ba54e5c 100644
--- a/engine/modules/tinyexr/image_loader_tinyexr.cpp
+++ b/engine/modules/tinyexr/image_loader_tinyexr.cpp
@@ -30,11 +30,11 @@
 
 #include "image_loader_tinyexr.h"
 
-#include "core/io/file_access_memory.h"
+#include <zlib.h> // Should come before including tinyexr.
 
-#include <zlib.h>
-// zlib should come before including tinyexr.
-#include <thirdparty/tinyexr/tinyexr.h>
+#include "thirdparty/tinyexr/tinyexr.h"
+
+#include "core/io/file_access_memory.h"
 
 Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, Ref<FileAccess> f, BitField<ImageFormatLoader::LoaderFlags> p_flags, float p_scale) {
 	Vector<uint8_t> src_image;
diff --git a/engine/modules/tinyexr/image_saver_tinyexr.cpp b/engine/modules/tinyexr/image_saver_tinyexr.cpp
index 24874078..c5c18409 100644
--- a/engine/modules/tinyexr/image_saver_tinyexr.cpp
+++ b/engine/modules/tinyexr/image_saver_tinyexr.cpp
@@ -33,12 +33,11 @@
 #include "core/io/file_access.h"
 #include "core/math/math_funcs.h"
 
-#include <zlib.h>
-// zlib should come before including tinyexr.
-#include <thirdparty/tinyexr/tinyexr.h>
-
+#include <zlib.h> // Should come before including tinyexr.
 #include <cstdlib>
 
+#include "thirdparty/tinyexr/tinyexr.h"
+
 static bool is_supported_format(Image::Format p_format) {
 	// This is checked before anything else.
 	// Mostly uncompressed formats are considered.
@@ -145,7 +144,7 @@ static int get_channel_count(Image::Format p_format) {
 	}
 }
 
-Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value) {
+Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale) {
 	Image::Format format = p_img->get_format();
 
 	if (!is_supported_format(format)) {
@@ -213,14 +212,7 @@ Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool
 				float *dst_wp = (float *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
-					float src_float = src_rp[channel_index + i * channel_count];
-					if (p_max_value >= 0.f) {
-						src_float = fmin(p_max_value, src_float);
-					}
-					if (p_color_image) {
-						src_float = fmax(0.f, src_float);
-					}
-					dst_wp[i] = src_float;
+					dst_wp[i] = src_rp[channel_index + i * channel_count];
 				}
 
 			} else if (src_pixel_type == SRC_HALF && target_pixel_type == TINYEXR_PIXELTYPE_HALF) {
@@ -230,19 +222,7 @@ Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool
 				uint16_t *dst_wp = (uint16_t *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
-					int src_rp_index = channel_index + i * channel_count;
-					if (p_max_value >= 0.f || p_color_image) {
-						float src_float = Math::halfptr_to_float(src_rp + src_rp_index);
-						if (p_max_value >= 0.f) {
-							src_float = fmin(p_max_value, src_float);
-						}
-						if (p_color_image) {
-							src_float = fmax(0.f, src_float);
-						}
-						dst_wp[i] = Math::make_half_float(src_float);
-					} else {
-						dst_wp[i] = src_rp[src_rp_index];
-					}
+					dst_wp[i] = src_rp[channel_index + i * channel_count];
 				}
 
 			} else if (src_pixel_type == SRC_BYTE && target_pixel_type == TINYEXR_PIXELTYPE_HALF) {
@@ -252,11 +232,7 @@ Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool
 				uint16_t *dst_wp = (uint16_t *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
-					float src_float = src_rp[channel_index + i * channel_count] / 255.f;
-					if (p_max_value >= 0.f) {
-						src_float = fmin(p_max_value, src_float);
-					}
-					dst_wp[i] = Math::make_half_float(src_float);
+					dst_wp[i] = Math::make_half_float(src_rp[channel_index + i * channel_count] / 255.f);
 				}
 
 			} else {
@@ -308,8 +284,8 @@ Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool
 	return buffer;
 }
 
-Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value) {
-	const Vector<uint8_t> buffer = save_exr_buffer(p_img, p_grayscale, p_color_image, p_max_value);
+Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale) {
+	const Vector<uint8_t> buffer = save_exr_buffer(p_img, p_grayscale);
 	if (buffer.is_empty()) {
 		print_error(String("Saving EXR failed."));
 		return ERR_FILE_CANT_WRITE;
diff --git a/engine/modules/tinyexr/image_saver_tinyexr.h b/engine/modules/tinyexr/image_saver_tinyexr.h
index 2bd00764..b5c773c6 100644
--- a/engine/modules/tinyexr/image_saver_tinyexr.h
+++ b/engine/modules/tinyexr/image_saver_tinyexr.h
@@ -32,5 +32,5 @@
 
 #include "core/io/image.h"
 
-Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value);
-Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale, bool p_color_image, float p_max_value);
+Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale);
+Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale);
diff --git a/engine/modules/upnp/doc_classes/UPNP.xml b/engine/modules/upnp/doc_classes/UPNP.xml
index 8aab5d75..47938ef4 100644
--- a/engine/modules/upnp/doc_classes/UPNP.xml
+++ b/engine/modules/upnp/doc_classes/UPNP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UPNP" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="UPNP" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Universal Plug and Play (UPnP) functions for network device discovery, querying and port forwarding.
 	</brief_description>
diff --git a/engine/modules/upnp/doc_classes/UPNPDevice.xml b/engine/modules/upnp/doc_classes/UPNPDevice.xml
index f76e0433..4eddca0e 100644
--- a/engine/modules/upnp/doc_classes/UPNPDevice.xml
+++ b/engine/modules/upnp/doc_classes/UPNPDevice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="UPNPDevice" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="UPNPDevice" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Universal Plug and Play (UPnP) device.
 	</brief_description>
diff --git a/engine/modules/upnp/register_types.cpp b/engine/modules/upnp/register_types.cpp
index 7ddfdecc..49fdd331 100644
--- a/engine/modules/upnp/register_types.cpp
+++ b/engine/modules/upnp/register_types.cpp
@@ -38,8 +38,6 @@
 #include "upnp_miniupnp.h"
 #endif
 
-#include "core/object/class_db.h"
-
 void initialize_upnp_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;
diff --git a/engine/modules/upnp/upnp.cpp b/engine/modules/upnp/upnp.cpp
index f32b16d4..5ec0b984 100644
--- a/engine/modules/upnp/upnp.cpp
+++ b/engine/modules/upnp/upnp.cpp
@@ -30,8 +30,6 @@
 
 #include "upnp.h"
 
-#include "core/object/class_db.h"
-
 UPNP *(*UPNP::_create)(bool p_notify_postinitialize) = nullptr;
 
 void UPNP::_bind_methods() {
diff --git a/engine/modules/upnp/upnp_device.cpp b/engine/modules/upnp/upnp_device.cpp
index 876f4827..45766281 100644
--- a/engine/modules/upnp/upnp_device.cpp
+++ b/engine/modules/upnp/upnp_device.cpp
@@ -30,8 +30,6 @@
 
 #include "upnp_device.h"
 
-#include "core/object/class_db.h"
-
 UPNPDevice *(*UPNPDevice::_create)(bool p_notify_postinitialize) = nullptr;
 
 void UPNPDevice::_bind_methods() {
diff --git a/engine/modules/upnp/upnp_device.h b/engine/modules/upnp/upnp_device.h
index 83f2e1da..146727d9 100644
--- a/engine/modules/upnp/upnp_device.h
+++ b/engine/modules/upnp/upnp_device.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class UPNPDevice : public RefCounted {
 	GDCLASS(UPNPDevice, RefCounted);
diff --git a/engine/modules/upnp/upnp_device_miniupnp.cpp b/engine/modules/upnp/upnp_device_miniupnp.cpp
index 19a0f4bf..a1e61df4 100644
--- a/engine/modules/upnp/upnp_device_miniupnp.cpp
+++ b/engine/modules/upnp/upnp_device_miniupnp.cpp
@@ -34,14 +34,8 @@
 
 #include "upnp_miniupnp.h"
 
-#include "core/object/class_db.h"
-
 #include <miniupnpc/upnpcommands.h>
 
-UPNPDevice *UPNPDeviceMiniUPNP::_create(bool p_notify_postinitialize) {
-	return static_cast<UPNPDevice *>(ClassDB::creator<UPNPDeviceMiniUPNP>(p_notify_postinitialize));
-}
-
 void UPNPDeviceMiniUPNP::make_default() {
 	UPNPDevice::_create = UPNPDeviceMiniUPNP::_create;
 }
diff --git a/engine/modules/upnp/upnp_device_miniupnp.h b/engine/modules/upnp/upnp_device_miniupnp.h
index e6916447..616ecaa6 100644
--- a/engine/modules/upnp/upnp_device_miniupnp.h
+++ b/engine/modules/upnp/upnp_device_miniupnp.h
@@ -38,7 +38,7 @@ class UPNPDeviceMiniUPNP : public UPNPDevice {
 	GDCLASS(UPNPDeviceMiniUPNP, UPNPDevice);
 
 private:
-	static UPNPDevice *_create(bool p_notify_postinitialize);
+	static UPNPDevice *_create(bool p_notify_postinitialize) { return static_cast<UPNPDevice *>(ClassDB::creator<UPNPDeviceMiniUPNP>(p_notify_postinitialize)); }
 
 	String description_url;
 	String service_type;
diff --git a/engine/modules/upnp/upnp_miniupnp.cpp b/engine/modules/upnp/upnp_miniupnp.cpp
index 6ef77164..e32c19a3 100644
--- a/engine/modules/upnp/upnp_miniupnp.cpp
+++ b/engine/modules/upnp/upnp_miniupnp.cpp
@@ -34,17 +34,11 @@
 
 #include "upnp_device_miniupnp.h"
 
-#include "core/object/class_db.h"
-
 #include <miniupnpc/miniwget.h>
 #include <miniupnpc/upnpcommands.h>
 
 #include <cstdlib>
 
-UPNP *UPNPMiniUPNP::_create(bool p_notify_postinitialize) {
-	return static_cast<UPNP *>(ClassDB::creator<UPNPMiniUPNP>(p_notify_postinitialize));
-}
-
 void UPNPMiniUPNP::make_default() {
 	UPNP::_create = UPNPMiniUPNP::_create;
 }
diff --git a/engine/modules/upnp/upnp_miniupnp.h b/engine/modules/upnp/upnp_miniupnp.h
index 725e538e..d8a4cfe4 100644
--- a/engine/modules/upnp/upnp_miniupnp.h
+++ b/engine/modules/upnp/upnp_miniupnp.h
@@ -40,7 +40,7 @@ class UPNPMiniUPNP : public UPNP {
 	GDCLASS(UPNPMiniUPNP, UPNP);
 
 private:
-	static UPNP *_create(bool p_notify_postinitialize);
+	static UPNP *_create(bool p_notify_postinitialize) { return static_cast<UPNP *>(ClassDB::creator<UPNPMiniUPNP>(p_notify_postinitialize)); }
 
 	String discover_multicast_if = "";
 	int discover_local_port = 0;
diff --git a/engine/modules/vhacd/register_types.cpp b/engine/modules/vhacd/register_types.cpp
index 1b7639dd..d0b35ef0 100644
--- a/engine/modules/vhacd/register_types.cpp
+++ b/engine/modules/vhacd/register_types.cpp
@@ -32,7 +32,7 @@
 
 #include "scene/resources/mesh.h"
 
-#include <thirdparty/vhacd/public/VHACD.h>
+#include "thirdparty/vhacd/public/VHACD.h"
 
 static Vector<Vector<Vector3>> convex_decompose(const real_t *p_vertices, int p_vertex_count, const uint32_t *p_triangles, int p_triangle_count, const Ref<MeshConvexDecompositionSettings> &p_settings, Vector<Vector<uint32_t>> *r_convex_indices) {
 	VHACD::IVHACD::Parameters params;
diff --git a/engine/modules/vorbis/audio_stream_ogg_vorbis.cpp b/engine/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 5355484c..62c7e739 100644
--- a/engine/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/engine/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -29,9 +29,8 @@
 /**************************************************************************/
 
 #include "audio_stream_ogg_vorbis.h"
-
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
+
 #include "core/templates/rb_map.h"
 
 #include <ogg/ogg.h>
diff --git a/engine/modules/vorbis/doc_classes/AudioStreamOggVorbis.xml b/engine/modules/vorbis/doc_classes/AudioStreamOggVorbis.xml
index dd16173a..5f144baa 100644
--- a/engine/modules/vorbis/doc_classes/AudioStreamOggVorbis.xml
+++ b/engine/modules/vorbis/doc_classes/AudioStreamOggVorbis.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamOggVorbis" inherits="AudioStream" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamOggVorbis" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A class representing an Ogg Vorbis audio stream.
 	</brief_description>
 	<description>
-		The AudioStreamOggVorbis class is a specialized [AudioStream] for handling Ogg Vorbis file formats. It offers functionality for loading and playing back Ogg Vorbis files, as well as managing looping and other playback properties. More info can be found in [ResourceImporterOggVorbis].
-		This class is part of the audio stream system, which also supports WAV files through the [AudioStreamWAV] class, and MP3 files through the [AudioStreamMP3] class.
+		The AudioStreamOggVorbis class is a specialized [AudioStream] for handling Ogg Vorbis file formats. It offers functionality for loading and playing back Ogg Vorbis files, as well as managing looping and other playback properties. This class is part of the audio stream system, which also supports WAV files through the [AudioStreamWAV] class.
 	</description>
 	<tutorials>
-		<link title="Audio streams">$DOCS_URL/tutorials/audio/audio_streams.html</link>
 		<link title="Runtime file loading and saving">$DOCS_URL/tutorials/io/runtime_file_loading_and_saving.html</link>
 	</tutorials>
 	<methods>
@@ -29,16 +27,13 @@
 	</methods>
 	<members>
 		<member name="bar_beats" type="int" setter="set_bar_beats" getter="get_bar_beats" default="4">
-			The number of beats within a single bar in the audio track.
 		</member>
 		<member name="beat_count" type="int" setter="set_beat_count" getter="get_beat_count" default="0">
-			The length of the audio track, in beats. The actual duration of the audio file might be longer than what is indicated by this property. It defines the end of the audio for looping, [AudioStreamPlaylist], and [AudioStreamInteractive].
 		</member>
 		<member name="bpm" type="float" setter="set_bpm" getter="get_bpm" default="0.0">
-			The tempo of the audio track, measured in beats per minute.
 		</member>
 		<member name="loop" type="bool" setter="set_loop" getter="has_loop" default="false">
-			If [code]true[/code], the stream will play again from the specified [member loop_offset] once it reaches the end of the audio track, or once it reaches the end of the last beat according to the amount specified in [member beat_count]. Useful for ambient sounds and background music.
+			If [code]true[/code], the audio will play again from the specified [member loop_offset] once it is done playing. Useful for ambient sounds and background music.
 		</member>
 		<member name="loop_offset" type="float" setter="set_loop_offset" getter="get_loop_offset" default="0.0">
 			Time in seconds at which the stream starts after being looped.
diff --git a/engine/modules/vorbis/doc_classes/AudioStreamPlaybackOggVorbis.xml b/engine/modules/vorbis/doc_classes/AudioStreamPlaybackOggVorbis.xml
index f3b8dfa8..54a60262 100644
--- a/engine/modules/vorbis/doc_classes/AudioStreamPlaybackOggVorbis.xml
+++ b/engine/modules/vorbis/doc_classes/AudioStreamPlaybackOggVorbis.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AudioStreamPlaybackOggVorbis" inherits="AudioStreamPlaybackResampled" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="AudioStreamPlaybackOggVorbis" inherits="AudioStreamPlaybackResampled" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
-		Playback class used for [AudioStreamOggVorbis].
 	</brief_description>
 	<description>
-		Playback component of [AudioStreamOggVorbis]. Uses [OggPacketSequencePlayback] for playback data.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/engine/modules/vorbis/doc_classes/ResourceImporterOggVorbis.xml b/engine/modules/vorbis/doc_classes/ResourceImporterOggVorbis.xml
index 87d2e6c2..87f8b726 100644
--- a/engine/modules/vorbis/doc_classes/ResourceImporterOggVorbis.xml
+++ b/engine/modules/vorbis/doc_classes/ResourceImporterOggVorbis.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceImporterOggVorbis" inherits="ResourceImporter" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ResourceImporterOggVorbis" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Imports an Ogg Vorbis audio file for playback.
 	</brief_description>
@@ -29,19 +29,19 @@
 	</methods>
 	<members>
 		<member name="bar_beats" type="int" setter="" getter="" default="4">
-			The number of beats within a single bar in the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The number of bars within a single beat in the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member bar_beats] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="beat_count" type="int" setter="" getter="" default="0">
-			The length of the audio track, in beats. The actual duration of the audio file might be longer than what is indicated by this property. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The beat count of the audio track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member beat_count] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="bpm" type="float" setter="" getter="" default="0">
-			The tempo of the audio track, measured in beats per minute. This should match the BPM measure that was used to compose the track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
+			The beats per minute of the audio track. This should match the BPM measure that was used to compose the track. This is only relevant for music that wishes to make use of interactive music functionality, not sound effects.
 			A more convenient editor for [member bpm] is provided in the [b]Advanced Import Settings[/b] dialog, as it lets you preview your changes without having to reimport the audio.
 		</member>
 		<member name="loop" type="bool" setter="" getter="" default="false">
-			If enabled, the audio will begin playing either from the beginning or from [member loop_offset], after playback ends by either reaching the end of the audio or reaching the end of the last beat according to the amount specified in [member beat_count].
+			If enabled, the audio will begin playing at the beginning after playback ends by reaching the end of the audio.
 			[b]Note:[/b] In [AudioStreamPlayer], the [signal AudioStreamPlayer.finished] signal won't be emitted for looping audio when it reaches the end of the audio file, as the audio will keep playing indefinitely.
 		</member>
 		<member name="loop_offset" type="float" setter="" getter="" default="0">
diff --git a/engine/modules/vorbis/register_types.cpp b/engine/modules/vorbis/register_types.cpp
index 622ef1ed..880727aa 100644
--- a/engine/modules/vorbis/register_types.cpp
+++ b/engine/modules/vorbis/register_types.cpp
@@ -32,13 +32,9 @@
 
 #include "audio_stream_ogg_vorbis.h"
 
-#include "core/io/resource_importer.h"
-#include "core/object/class_db.h"
-
 #ifdef TOOLS_ENABLED
-#include "resource_importer_ogg_vorbis.h"
-
 #include "editor/editor_node.h"
+#include "resource_importer_ogg_vorbis.h"
 
 static void _editor_init() {
 	Ref<ResourceImporterOggVorbis> ogg_vorbis_importer;
diff --git a/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp b/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
index f30add65..a30c8490 100644
--- a/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
+++ b/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
@@ -30,8 +30,8 @@
 
 #include "resource_importer_ogg_vorbis.h"
 
+#include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/import/audio_stream_import_settings.h"
diff --git a/engine/modules/webp/register_types.cpp b/engine/modules/webp/register_types.cpp
index f68e9e97..1d8f6799 100644
--- a/engine/modules/webp/register_types.cpp
+++ b/engine/modules/webp/register_types.cpp
@@ -33,8 +33,6 @@
 #include "image_loader_webp.h"
 #include "resource_saver_webp.h"
 
-#include "core/io/resource_saver.h"
-
 static Ref<ImageLoaderWebP> image_loader_webp;
 static Ref<ResourceSaverWebP> resource_saver_webp;
 
diff --git a/engine/modules/webrtc/doc_classes/WebRTCDataChannel.xml b/engine/modules/webrtc/doc_classes/WebRTCDataChannel.xml
index 6b21c7aa..0d306320 100644
--- a/engine/modules/webrtc/doc_classes/WebRTCDataChannel.xml
+++ b/engine/modules/webrtc/doc_classes/WebRTCDataChannel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebRTCDataChannel" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebRTCDataChannel" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml b/engine/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
index dbb0980c..dc10428b 100644
--- a/engine/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
+++ b/engine/modules/webrtc/doc_classes/WebRTCDataChannelExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebRTCDataChannelExtension" inherits="WebRTCDataChannel" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebRTCDataChannelExtension" inherits="WebRTCDataChannel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml b/engine/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
index 006fc508..63caa9e4 100644
--- a/engine/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
+++ b/engine/modules/webrtc/doc_classes/WebRTCMultiplayerPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebRTCMultiplayerPeer" inherits="MultiplayerPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebRTCMultiplayerPeer" inherits="MultiplayerPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A simple interface to create a peer-to-peer mesh network composed of [WebRTCPeerConnection] that is compatible with the [MultiplayerAPI].
 	</brief_description>
diff --git a/engine/modules/webrtc/doc_classes/WebRTCPeerConnection.xml b/engine/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
index 8046ac34..9b948d3b 100644
--- a/engine/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
+++ b/engine/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebRTCPeerConnection" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebRTCPeerConnection" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Interface to a WebRTC peer connection.
 	</brief_description>
diff --git a/engine/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml b/engine/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
index 8b3e48fa..570a68f7 100644
--- a/engine/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
+++ b/engine/modules/webrtc/doc_classes/WebRTCPeerConnectionExtension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebRTCPeerConnectionExtension" inherits="WebRTCPeerConnection" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebRTCPeerConnectionExtension" inherits="WebRTCPeerConnection" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/engine/modules/webrtc/register_types.cpp b/engine/modules/webrtc/register_types.cpp
index e745055f..28ce36f1 100644
--- a/engine/modules/webrtc/register_types.cpp
+++ b/engine/modules/webrtc/register_types.cpp
@@ -37,7 +37,6 @@
 #include "webrtc_peer_connection_extension.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 
 void initialize_webrtc_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
diff --git a/engine/modules/webrtc/webrtc_data_channel.cpp b/engine/modules/webrtc/webrtc_data_channel.cpp
index 1ef3b51f..687e9b5f 100644
--- a/engine/modules/webrtc/webrtc_data_channel.cpp
+++ b/engine/modules/webrtc/webrtc_data_channel.cpp
@@ -31,7 +31,6 @@
 #include "webrtc_data_channel.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 
 void WebRTCDataChannel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("poll"), &WebRTCDataChannel::poll);
@@ -62,7 +61,7 @@ void WebRTCDataChannel::_bind_methods() {
 }
 
 WebRTCDataChannel::WebRTCDataChannel() {
-	_in_buffer_shift = Math::nearest_shift(uint32_t((int)GLOBAL_GET("network/limits/webrtc/max_channel_in_buffer_kb") - 1)) + (uint32_t)10;
+	_in_buffer_shift = nearest_shift(uint32_t((int)GLOBAL_GET("network/limits/webrtc/max_channel_in_buffer_kb") - 1)) + (uint32_t)10;
 }
 
 WebRTCDataChannel::~WebRTCDataChannel() {
diff --git a/engine/modules/webrtc/webrtc_data_channel_extension.cpp b/engine/modules/webrtc/webrtc_data_channel_extension.cpp
index e2c3632b..b09997e4 100644
--- a/engine/modules/webrtc/webrtc_data_channel_extension.cpp
+++ b/engine/modules/webrtc/webrtc_data_channel_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "webrtc_data_channel_extension.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void WebRTCDataChannelExtension::_bind_methods() {
 	ADD_PROPERTY_DEFAULT("write_mode", WRITE_MODE_BINARY);
 
diff --git a/engine/modules/webrtc/webrtc_data_channel_extension.h b/engine/modules/webrtc/webrtc_data_channel_extension.h
index d632cedb..ff7a53b2 100644
--- a/engine/modules/webrtc/webrtc_data_channel_extension.h
+++ b/engine/modules/webrtc/webrtc_data_channel_extension.h
@@ -32,8 +32,8 @@
 
 #include "webrtc_data_channel.h"
 
-#include "core/extension/ext_wrappers.gen.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 
 class WebRTCDataChannelExtension : public WebRTCDataChannel {
diff --git a/engine/modules/webrtc/webrtc_multiplayer_peer.cpp b/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
index f6e890d7..2bf9e086 100644
--- a/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
+++ b/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
@@ -30,8 +30,6 @@
 
 #include "webrtc_multiplayer_peer.h"
 
-#include "core/object/class_db.h"
-
 void WebRTCMultiplayerPeer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_server", "channels_config"), &WebRTCMultiplayerPeer::create_server, DEFVAL(Array()));
 	ClassDB::bind_method(D_METHOD("create_client", "peer_id", "channels_config"), &WebRTCMultiplayerPeer::create_client, DEFVAL(Array()));
diff --git a/engine/modules/webrtc/webrtc_peer_connection.cpp b/engine/modules/webrtc/webrtc_peer_connection.cpp
index 9b857d30..69be873f 100644
--- a/engine/modules/webrtc/webrtc_peer_connection.cpp
+++ b/engine/modules/webrtc/webrtc_peer_connection.cpp
@@ -36,8 +36,6 @@
 
 #include "webrtc_peer_connection_extension.h"
 
-#include "core/object/class_db.h"
-
 StringName WebRTCPeerConnection::default_extension;
 
 void WebRTCPeerConnection::set_default_extension(const StringName &p_extension) {
@@ -81,7 +79,7 @@ void WebRTCPeerConnection::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("session_description_created", PropertyInfo(Variant::STRING, "type"), PropertyInfo(Variant::STRING, "sdp")));
 	ADD_SIGNAL(MethodInfo("ice_candidate_created", PropertyInfo(Variant::STRING, "media"), PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::STRING, "name")));
-	ADD_SIGNAL(MethodInfo("data_channel_received", PropertyInfo(Variant::OBJECT, "channel", PROPERTY_HINT_RESOURCE_TYPE, WebRTCDataChannel::get_class_static())));
+	ADD_SIGNAL(MethodInfo("data_channel_received", PropertyInfo(Variant::OBJECT, "channel", PROPERTY_HINT_RESOURCE_TYPE, "WebRTCDataChannel")));
 
 	BIND_ENUM_CONSTANT(STATE_NEW);
 	BIND_ENUM_CONSTANT(STATE_CONNECTING);
diff --git a/engine/modules/webrtc/webrtc_peer_connection_extension.cpp b/engine/modules/webrtc/webrtc_peer_connection_extension.cpp
index fa1f8c66..248b0cf6 100644
--- a/engine/modules/webrtc/webrtc_peer_connection_extension.cpp
+++ b/engine/modules/webrtc/webrtc_peer_connection_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "webrtc_peer_connection_extension.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void WebRTCPeerConnectionExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_get_connection_state);
 	GDVIRTUAL_BIND(_get_gathering_state);
diff --git a/engine/modules/webrtc/webrtc_peer_connection_extension.h b/engine/modules/webrtc/webrtc_peer_connection_extension.h
index 6fffe98f..1d3139ea 100644
--- a/engine/modules/webrtc/webrtc_peer_connection_extension.h
+++ b/engine/modules/webrtc/webrtc_peer_connection_extension.h
@@ -32,7 +32,8 @@
 
 #include "webrtc_peer_connection.h"
 
-#include "core/extension/ext_wrappers.gen.h"
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 
 class WebRTCPeerConnectionExtension : public WebRTCPeerConnection {
 	GDCLASS(WebRTCPeerConnectionExtension, WebRTCPeerConnection);
diff --git a/engine/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml b/engine/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
index 39bd9e56..b2e1cb34 100644
--- a/engine/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
+++ b/engine/modules/websocket/doc_classes/WebSocketMultiplayerPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebSocketMultiplayerPeer" inherits="MultiplayerPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebSocketMultiplayerPeer" inherits="MultiplayerPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Base class for WebSocket server and client.
 	</brief_description>
diff --git a/engine/modules/websocket/doc_classes/WebSocketPeer.xml b/engine/modules/websocket/doc_classes/WebSocketPeer.xml
index 84223cca..8c5475a7 100644
--- a/engine/modules/websocket/doc_classes/WebSocketPeer.xml
+++ b/engine/modules/websocket/doc_classes/WebSocketPeer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebSocketPeer" inherits="PacketPeer" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebSocketPeer" inherits="PacketPeer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		A WebSocket connection.
 	</brief_description>
diff --git a/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp b/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
index 6819063b..6c032dd9 100644
--- a/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
+++ b/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
@@ -32,7 +32,6 @@
 
 #include "../remote_debugger_peer_websocket.h"
 
-#include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
@@ -117,7 +116,7 @@ bool EditorDebuggerServerWebSocket::is_connection_available() const {
 
 Ref<RemoteDebuggerPeer> EditorDebuggerServerWebSocket::take_connection() {
 	ERR_FAIL_COND_V(!is_connection_available(), Ref<RemoteDebuggerPeer>());
-	Ref<RemoteDebuggerPeer> peer = memnew(RemoteDebuggerPeerWebSocket(pending_peer));
+	RemoteDebuggerPeer *peer = memnew(RemoteDebuggerPeerWebSocket(pending_peer));
 	pending_peer.unref();
 	return peer;
 }
@@ -130,7 +129,7 @@ EditorDebuggerServerWebSocket::~EditorDebuggerServerWebSocket() {
 	stop();
 }
 
-Ref<EditorDebuggerServer> EditorDebuggerServerWebSocket::create(const String &p_protocol) {
+EditorDebuggerServer *EditorDebuggerServerWebSocket::create(const String &p_protocol) {
 	ERR_FAIL_COND_V(p_protocol != "ws://", nullptr);
 	return memnew(EditorDebuggerServerWebSocket);
 }
diff --git a/engine/modules/websocket/editor/editor_debugger_server_websocket.h b/engine/modules/websocket/editor/editor_debugger_server_websocket.h
index e3aa038c..09f0436f 100644
--- a/engine/modules/websocket/editor/editor_debugger_server_websocket.h
+++ b/engine/modules/websocket/editor/editor_debugger_server_websocket.h
@@ -45,7 +45,7 @@ private:
 	String endpoint;
 
 public:
-	static Ref<EditorDebuggerServer> create(const String &p_protocol);
+	static EditorDebuggerServer *create(const String &p_protocol);
 
 	void _peer_connected(int p_peer, const String &p_protocol);
 	void _peer_disconnected(int p_peer, bool p_was_clean);
diff --git a/engine/modules/websocket/emws_peer.cpp b/engine/modules/websocket/emws_peer.cpp
index 882a3479..56cae55b 100644
--- a/engine/modules/websocket/emws_peer.cpp
+++ b/engine/modules/websocket/emws_peer.cpp
@@ -33,11 +33,6 @@
 #ifdef WEB_ENABLED
 
 #include "core/io/ip.h"
-#include "core/object/class_db.h"
-
-WebSocketPeer *EMWSPeer::_create(bool p_notify_postinitialize) {
-	return static_cast<WebSocketPeer *>(ClassDB::creator<EMWSPeer>(p_notify_postinitialize));
-}
 
 void EMWSPeer::_esws_on_connect(void *p_obj, char *p_proto) {
 	EMWSPeer *peer = static_cast<EMWSPeer *>(p_obj);
@@ -111,7 +106,7 @@ Error EMWSPeer::connect_to_url(const String &p_url, const Ref<TLSOptions> &p_tls
 	if (peer_sock == -1) {
 		return FAILED;
 	}
-	in_buffer.resize(Math::nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
+	in_buffer.resize(nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
 	packet_buffer.resize(inbound_buffer_size);
 	ready_state = STATE_CONNECTING;
 	return OK;
diff --git a/engine/modules/websocket/emws_peer.h b/engine/modules/websocket/emws_peer.h
index 1feca30c..b43b43f6 100644
--- a/engine/modules/websocket/emws_peer.h
+++ b/engine/modules/websocket/emws_peer.h
@@ -66,7 +66,7 @@ private:
 	String selected_protocol;
 	String requested_url;
 
-	static WebSocketPeer *_create(bool p_notify_postinitialize);
+	static WebSocketPeer *_create(bool p_notify_postinitialize) { return static_cast<WebSocketPeer *>(ClassDB::creator<EMWSPeer>(p_notify_postinitialize)); }
 	static void _esws_on_connect(void *obj, char *proto);
 	static void _esws_on_message(void *obj, const uint8_t *p_data, int p_data_size, int p_is_string);
 	static void _esws_on_error(void *obj);
diff --git a/engine/modules/websocket/library_godot_websocket.js b/engine/modules/websocket/library_godot_websocket.js
index 4bf9e5d1..beaaf7d1 100644
--- a/engine/modules/websocket/library_godot_websocket.js
+++ b/engine/modules/websocket/library_godot_websocket.js
@@ -169,9 +169,14 @@ const GodotWebSocket = {
 	godot_js_websocket_send__proxy: 'sync',
 	godot_js_websocket_send__sig: 'iiiii',
 	godot_js_websocket_send: function (p_id, p_buf, p_buf_len, p_raw) {
-		let out = GodotRuntime.heapSlice(HEAPU8, p_buf, p_buf_len);
+		const bytes_array = new Uint8Array(p_buf_len);
+		let i = 0;
+		for (i = 0; i < p_buf_len; i++) {
+			bytes_array[i] = GodotRuntime.getHeapValue(p_buf + i, 'i8');
+		}
+		let out = bytes_array.buffer;
 		if (!p_raw) {
-			out = new TextDecoder('utf-8').decode(out);
+			out = new TextDecoder('utf-8').decode(bytes_array);
 		}
 		return GodotWebSocket.send(p_id, out);
 	},
diff --git a/engine/modules/websocket/register_types.cpp b/engine/modules/websocket/register_types.cpp
index 29acf692..f945684c 100644
--- a/engine/modules/websocket/register_types.cpp
+++ b/engine/modules/websocket/register_types.cpp
@@ -46,7 +46,6 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
-#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/debugger/editor_debugger_server.h"
diff --git a/engine/modules/websocket/remote_debugger_peer_websocket.cpp b/engine/modules/websocket/remote_debugger_peer_websocket.cpp
index b555ee66..5102f402 100644
--- a/engine/modules/websocket/remote_debugger_peer_websocket.cpp
+++ b/engine/modules/websocket/remote_debugger_peer_websocket.cpp
@@ -129,12 +129,12 @@ RemoteDebuggerPeerWebSocket::RemoteDebuggerPeerWebSocket(const Ref<WebSocketPeer
 	}
 }
 
-Ref<RemoteDebuggerPeer> RemoteDebuggerPeerWebSocket::create(const String &p_uri) {
+RemoteDebuggerPeer *RemoteDebuggerPeerWebSocket::create(const String &p_uri) {
 	ERR_FAIL_COND_V(!p_uri.begins_with("ws://") && !p_uri.begins_with("wss://"), nullptr);
-	Ref<RemoteDebuggerPeerWebSocket> peer;
-	peer.instantiate();
+	RemoteDebuggerPeerWebSocket *peer = memnew(RemoteDebuggerPeerWebSocket);
 	Error err = peer->connect_to_host(p_uri);
 	if (err != OK) {
+		memdelete(peer);
 		return nullptr;
 	}
 	return peer;
diff --git a/engine/modules/websocket/remote_debugger_peer_websocket.h b/engine/modules/websocket/remote_debugger_peer_websocket.h
index b26144c0..149fa697 100644
--- a/engine/modules/websocket/remote_debugger_peer_websocket.h
+++ b/engine/modules/websocket/remote_debugger_peer_websocket.h
@@ -44,7 +44,7 @@ class RemoteDebuggerPeerWebSocket : public RemoteDebuggerPeer {
 	int max_queued_messages;
 
 public:
-	static Ref<RemoteDebuggerPeer> create(const String &p_uri);
+	static RemoteDebuggerPeer *create(const String &p_uri);
 
 	Error connect_to_host(const String &p_uri);
 
diff --git a/engine/modules/websocket/websocket_multiplayer_peer.cpp b/engine/modules/websocket/websocket_multiplayer_peer.cpp
index f6bf1de9..47c9af28 100644
--- a/engine/modules/websocket/websocket_multiplayer_peer.cpp
+++ b/engine/modules/websocket/websocket_multiplayer_peer.cpp
@@ -31,7 +31,6 @@
 #include "websocket_multiplayer_peer.h"
 
 #include "core/io/stream_peer_tls.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() {
diff --git a/engine/modules/websocket/websocket_peer.cpp b/engine/modules/websocket/websocket_peer.cpp
index 53bc566c..5c24b5d0 100644
--- a/engine/modules/websocket/websocket_peer.cpp
+++ b/engine/modules/websocket/websocket_peer.cpp
@@ -30,8 +30,6 @@
 
 #include "websocket_peer.h"
 
-#include "core/object/class_db.h"
-
 WebSocketPeer *(*WebSocketPeer::_create)(bool p_notify_postinitialize) = nullptr;
 
 WebSocketPeer::WebSocketPeer() {
diff --git a/engine/modules/websocket/wsl_peer.cpp b/engine/modules/websocket/wsl_peer.cpp
index ae3e34fc..8be31add 100644
--- a/engine/modules/websocket/wsl_peer.cpp
+++ b/engine/modules/websocket/wsl_peer.cpp
@@ -33,8 +33,6 @@
 #ifndef WEB_ENABLED
 
 #include "core/io/stream_peer_tls.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 
 CryptoCore::RandomGenerator *WSLPeer::_static_rng = nullptr;
 
@@ -51,10 +49,6 @@ void WSLPeer::deinitialize() {
 	}
 }
 
-WebSocketPeer *WSLPeer::_create(bool p_notify_postinitialize) {
-	return static_cast<WebSocketPeer *>(ClassDB::creator<WSLPeer>(p_notify_postinitialize));
-}
-
 ///
 /// Resolver
 ///
@@ -181,7 +175,7 @@ bool WSLPeer::_parse_client_request() {
 	}
 	requested_host = headers.has("host") ? headers.get("host") : "";
 	requested_url = (use_tls ? "wss://" : "ws://") + requested_host + req[1];
-#define WSL_CHECK(NAME, VALUE) \
+#define WSL_CHECK(NAME, VALUE)                                                          \
 	ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
 			"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
 #define WSL_CHECK_EX(NAME) \
@@ -303,7 +297,7 @@ Error WSLPeer::_do_server_handshake() {
 			wslay_event_context_server_init(&wsl_ctx, &_wsl_callbacks, this);
 			wslay_event_config_set_no_buffering(wsl_ctx, 1);
 			wslay_event_config_set_max_recv_msg_length(wsl_ctx, inbound_buffer_size);
-			in_buffer.resize(Math::nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
+			in_buffer.resize(nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
 			packet_buffer.resize(inbound_buffer_size);
 			ready_state = STATE_OPEN;
 		}
@@ -412,7 +406,7 @@ void WSLPeer::_do_client_handshake() {
 				wslay_event_context_client_init(&wsl_ctx, &_wsl_callbacks, this);
 				wslay_event_config_set_no_buffering(wsl_ctx, 1);
 				wslay_event_config_set_max_recv_msg_length(wsl_ctx, inbound_buffer_size);
-				in_buffer.resize(Math::nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
+				in_buffer.resize(nearest_shift((uint32_t)inbound_buffer_size), max_queued_packets);
 				packet_buffer.resize(inbound_buffer_size);
 				ready_state = STATE_OPEN;
 				break;
@@ -446,10 +440,10 @@ bool WSLPeer::_verify_server_response() {
 		}
 	}
 
-#define WSL_CHECK(NAME, VALUE) \
+#define WSL_CHECK(NAME, VALUE)                                                          \
 	ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
 			"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
-#define WSL_CHECK_NC(NAME, VALUE) \
+#define WSL_CHECK_NC(NAME, VALUE)                                            \
 	ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME] != VALUE, false, \
 			"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
 	WSL_CHECK("connection", "upgrade");
diff --git a/engine/modules/websocket/wsl_peer.h b/engine/modules/websocket/wsl_peer.h
index e06ab85b..0f460b13 100644
--- a/engine/modules/websocket/wsl_peer.h
+++ b/engine/modules/websocket/wsl_peer.h
@@ -45,7 +45,7 @@
 class WSLPeer : public WebSocketPeer {
 private:
 	static CryptoCore::RandomGenerator *_static_rng;
-	static WebSocketPeer *_create(bool p_notify_postinitialize);
+	static WebSocketPeer *_create(bool p_notify_postinitialize) { return static_cast<WebSocketPeer *>(ClassDB::creator<WSLPeer>(p_notify_postinitialize)); }
 
 	// Callbacks.
 	static ssize_t _wsl_recv_callback(wslay_event_context_ptr ctx, uint8_t *data, size_t len, int flags, void *user_data);
diff --git a/engine/modules/webxr/doc_classes/WebXRInterface.xml b/engine/modules/webxr/doc_classes/WebXRInterface.xml
index 7ef2d30c..e03bfd0f 100644
--- a/engine/modules/webxr/doc_classes/WebXRInterface.xml
+++ b/engine/modules/webxr/doc_classes/WebXRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="WebXRInterface" inherits="XRInterface" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="WebXRInterface" inherits="XRInterface" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		XR interface using WebXR.
 	</brief_description>
diff --git a/engine/modules/webxr/register_types.cpp b/engine/modules/webxr/register_types.cpp
index 0f720ccc..139539c2 100644
--- a/engine/modules/webxr/register_types.cpp
+++ b/engine/modules/webxr/register_types.cpp
@@ -31,12 +31,7 @@
 #include "register_types.h"
 
 #include "webxr_interface.h"
-
-#ifdef WEB_ENABLED
 #include "webxr_interface_js.h"
-#endif
-
-#include "core/object/class_db.h"
 
 #ifdef WEB_ENABLED
 Ref<WebXRInterfaceJS> webxr;
diff --git a/engine/modules/webxr/webxr_interface.compat.inc b/engine/modules/webxr/webxr_interface.compat.inc
index 681c3ddc..97a9d44c 100644
--- a/engine/modules/webxr/webxr_interface.compat.inc
+++ b/engine/modules/webxr/webxr_interface.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "webxr_interface.h"
-
-#include "core/object/class_db.h"
-
 Ref<XRPositionalTracker> WebXRInterface::_get_input_source_tracker_bind_compat_90645(int p_input_source_id) const {
 	return get_input_source_tracker(p_input_source_id);
 }
diff --git a/engine/modules/webxr/webxr_interface.cpp b/engine/modules/webxr/webxr_interface.cpp
index 63213196..a33a28a7 100644
--- a/engine/modules/webxr/webxr_interface.cpp
+++ b/engine/modules/webxr/webxr_interface.cpp
@@ -31,8 +31,6 @@
 #include "webxr_interface.h"
 #include "webxr_interface.compat.inc"
 
-#include "core/object/class_db.h"
-
 void WebXRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_session_supported", "session_mode"), &WebXRInterface::is_session_supported);
 	ClassDB::bind_method(D_METHOD("set_session_mode", "session_mode"), &WebXRInterface::set_session_mode);
diff --git a/engine/modules/webxr/webxr_interface_js.cpp b/engine/modules/webxr/webxr_interface_js.cpp
index 11e89ebc..216ecaca 100644
--- a/engine/modules/webxr/webxr_interface_js.cpp
+++ b/engine/modules/webxr/webxr_interface_js.cpp
@@ -40,11 +40,11 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/scene_string_names.h"
-#include "servers/display/display_server.h"
+#include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/rendering_server_globals.h"
 #include "servers/xr/xr_hand_tracker.h"
 
 #include <emscripten.h>
-
 #include <cstdlib>
 
 void _emwebxr_on_session_supported(char *p_session_mode, int p_supported) {
@@ -523,8 +523,8 @@ bool WebXRInterfaceJS::pre_draw_viewport(RID p_render_target) {
 	return true;
 }
 
-Vector<RenderingServerTypes::BlitToScreen> WebXRInterfaceJS::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
-	Vector<RenderingServerTypes::BlitToScreen> blit_to_screen;
+Vector<BlitToScreen> WebXRInterfaceJS::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
+	Vector<BlitToScreen> blit_to_screen;
 
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 	if (texture_storage == nullptr) {
@@ -569,7 +569,7 @@ RID WebXRInterfaceJS::_get_texture(unsigned int p_texture_id) {
 	Size2 texture_size = get_render_target_size();
 
 	RID texture = texture_storage->texture_create_from_native_handle(
-			view_count == 1 ? RSE::TEXTURE_TYPE_2D : RSE::TEXTURE_TYPE_LAYERED,
+			view_count == 1 ? RS::TEXTURE_TYPE_2D : RS::TEXTURE_TYPE_LAYERED,
 			Image::FORMAT_RGBA8,
 			p_texture_id,
 			(int)texture_size.width,
diff --git a/engine/modules/webxr/webxr_interface_js.h b/engine/modules/webxr/webxr_interface_js.h
index 3c6bf3c6..4df9b0ed 100644
--- a/engine/modules/webxr/webxr_interface_js.h
+++ b/engine/modules/webxr/webxr_interface_js.h
@@ -32,10 +32,10 @@
 
 #ifdef WEB_ENABLED
 
+#include "servers/xr/xr_controller_tracker.h"
+#include "servers/xr/xr_hand_tracker.h"
 #include "webxr_interface.h"
 
-#include "core/templates/rb_map.h"
-
 /**
 	The WebXR interface is a VR/AR interface that can be used on the web.
 */
@@ -44,8 +44,6 @@ namespace GLES3 {
 class TextureStorage;
 }
 
-class XRHandTracker;
-
 class WebXRInterfaceJS : public WebXRInterface {
 	GDCLASS(WebXRInterfaceJS, WebXRInterface);
 
@@ -134,7 +132,7 @@ public:
 	virtual Transform3D get_transform_for_view(uint32_t p_view, const Transform3D &p_cam_transform) override;
 	virtual Projection get_projection_for_view(uint32_t p_view, double p_aspect, double p_z_near, double p_z_far) override;
 	virtual bool pre_draw_viewport(RID p_render_target) override;
-	virtual Vector<RenderingServerTypes::BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
 	virtual RID get_color_texture() override;
 	virtual RID get_depth_texture() override;
 	virtual RID get_velocity_texture() override;
diff --git a/engine/modules/xatlas_unwrap/register_types.cpp b/engine/modules/xatlas_unwrap/register_types.cpp
index 60d6bb89..e5da9b3a 100644
--- a/engine/modules/xatlas_unwrap/register_types.cpp
+++ b/engine/modules/xatlas_unwrap/register_types.cpp
@@ -31,13 +31,9 @@
 #include "register_types.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/error/error_macros.h"
-#include "core/os/memory.h"
 
 #include <xatlas.h>
 
-#include <cstring>
-
 extern bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, const uint8_t *p_cache_data, bool *r_use_cache, uint8_t **r_mesh_cache, int *r_mesh_cache_size, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y);
 
 bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, const uint8_t *p_cache_data, bool *r_use_cache, uint8_t **r_mesh_cache, int *r_mesh_cache_size, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y) {
diff --git a/engine/modules/zip/SCsub b/engine/modules/zip/SCsub
index d390dc4d..0ae5ae91 100644
--- a/engine/modules/zip/SCsub
+++ b/engine/modules/zip/SCsub
@@ -10,4 +10,5 @@ env_zip = env_modules.Clone()
 env_zip.add_source_files(env.modules_sources, "*.cpp")
 
 if env["tests"]:
+    env_zip.Append(CPPDEFINES=["TESTS_ENABLED"])
     env_zip.add_source_files(env.modules_sources, "./tests/*.cpp")
diff --git a/engine/modules/zip/doc_classes/ZIPPacker.xml b/engine/modules/zip/doc_classes/ZIPPacker.xml
index e5cb1e42..9ff45891 100644
--- a/engine/modules/zip/doc_classes/ZIPPacker.xml
+++ b/engine/modules/zip/doc_classes/ZIPPacker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ZIPPacker" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ZIPPacker" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Allows the creation of ZIP files.
 	</brief_description>
@@ -23,16 +23,6 @@
 	<tutorials>
 	</tutorials>
 	<methods>
-		<method name="add_directory">
-			<return type="int" enum="Error" />
-			<param index="0" name="path" type="String" />
-			<param index="1" name="permissions" type="int" enum="FileAccess.UnixPermissionFlags" is_bitfield="true" default="493" />
-			<param index="2" name="modified_time" type="int" default="0" />
-			<description>
-				Adds directory to the archive. If [param modified_time] is set to [code]0[/code], current system time is used.
-				[b]Note:[/b] Directories are automatically created when [method start_file] is called, use this function before adding files to create directories with custom permissions and modification time.
-			</description>
-		</method>
 		<method name="close">
 			<return type="int" enum="Error" />
 			<description>
@@ -58,10 +48,8 @@
 		<method name="start_file">
 			<return type="int" enum="Error" />
 			<param index="0" name="path" type="String" />
-			<param index="1" name="permissions" type="int" enum="FileAccess.UnixPermissionFlags" is_bitfield="true" default="420" />
-			<param index="2" name="modified_time" type="int" default="0" />
 			<description>
-				Starts writing to a file within the archive. Only one file can be written at the same time. If [param modified_time] is set to [code]0[/code], current system time is used.
+				Starts writing to a file within the archive. Only one file can be written at the same time.
 				Must be called after [method open].
 			</description>
 		</method>
diff --git a/engine/modules/zip/doc_classes/ZIPReader.xml b/engine/modules/zip/doc_classes/ZIPReader.xml
index f43213be..0536bc10 100644
--- a/engine/modules/zip/doc_classes/ZIPReader.xml
+++ b/engine/modules/zip/doc_classes/ZIPReader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ZIPReader" inherits="RefCounted" api_type="core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="ZIPReader" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Allows reading the content of a ZIP file.
 	</brief_description>
diff --git a/engine/modules/zip/tests/test_zip.h b/engine/modules/zip/tests/test_zip.h
index 8ae7139d..7f8376e6 100644
--- a/engine/modules/zip/tests/test_zip.h
+++ b/engine/modules/zip/tests/test_zip.h
@@ -30,12 +30,12 @@
 
 #pragma once
 
-#include "../zip_packer.h"
-#include "../zip_reader.h"
-
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
+#include "../zip_packer.h"
+#include "../zip_reader.h"
+
 namespace TestZip {
 
 void check_file_size(const String &p_path, int p_expected_size);
diff --git a/engine/modules/zip/zip_packer.compat.inc b/engine/modules/zip/zip_packer.compat.inc
deleted file mode 100644
index 6787065b..00000000
--- a/engine/modules/zip/zip_packer.compat.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************/
-/*  zip_packer.compat.inc                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "zip_packer.h"
-
-#include "core/object/class_db.h"
-
-Error ZIPPacker::_start_file_bind_compat_115946(const String &p_path) {
-	return start_file(p_path, 0644, 0);
-}
-
-void ZIPPacker::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("start_file", "path"), &ZIPPacker::_start_file_bind_compat_115946);
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/modules/zip/zip_packer.cpp b/engine/modules/zip/zip_packer.cpp
index 8bc13ba7..b40929e3 100644
--- a/engine/modules/zip/zip_packer.cpp
+++ b/engine/modules/zip/zip_packer.cpp
@@ -29,11 +29,9 @@
 /**************************************************************************/
 
 #include "zip_packer.h"
-#include "zip_packer.compat.inc"
 
 #include "core/io/zip_io.h"
-#include "core/object/class_db.h"
-#include "core/os/time.h"
+#include "core/os/os.h"
 
 Error ZIPPacker::open(const String &p_path, ZipAppend p_append) {
 	if (fa.is_valid()) {
@@ -51,7 +49,6 @@ Error ZIPPacker::close() {
 	Error err = zipClose(zf, nullptr) == ZIP_OK ? OK : FAILED;
 	if (err == OK) {
 		DEV_ASSERT(fa.is_null());
-		directories.clear();
 		zf = nullptr;
 	}
 
@@ -67,40 +64,22 @@ int ZIPPacker::get_compression_level() const {
 	return compression_level;
 }
 
-Error ZIPPacker::start_file(const String &p_path, BitField<FileAccess::UnixPermissionFlags> p_permissions, uint64_t p_modified_time) {
+Error ZIPPacker::start_file(const String &p_path) {
 	ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use.");
 
-	if (!p_path.get_base_dir().is_empty() && !directories.has(p_path.get_base_dir())) {
-		add_directory(p_path.get_base_dir(), 0755, p_modified_time);
-	}
-
-	uint64_t time = p_modified_time;
-	if (time == 0) {
-		time = Time::get_singleton()->get_unix_time_from_system();
-	}
-	Dictionary tz = Time::get_singleton()->get_time_zone_from_system();
-	time += tz["bias"].operator int() * 60;
-	Dictionary dt = Time::get_singleton()->get_datetime_dict_from_unix_time(time);
-
 	zip_fileinfo zipfi;
-	zipfi.tmz_date.tm_year = dt["year"];
-	zipfi.tmz_date.tm_mon = dt["month"].operator int() - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, https://www.cplusplus.com/reference/ctime/tm/
-	zipfi.tmz_date.tm_mday = dt["day"];
-	zipfi.tmz_date.tm_hour = dt["hour"];
-	zipfi.tmz_date.tm_min = dt["minute"];
-	zipfi.tmz_date.tm_sec = dt["second"];
-	zipfi.dosDate = 0;
 
-	// 0100000: regular file type
-	// 0000644: permissions rw-r--r--
-	uint32_t _mode = p_permissions;
-	if (_mode == 0) {
-		_mode = 0100644;
-	} else {
-		_mode |= 0100000;
-	}
-	zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUU UUUUUUUU 00000000 00ADVSHR: Unix permissions (U) + DOS read-only flag (R).
+	OS::DateTime time = OS::get_singleton()->get_datetime();
+
+	zipfi.tmz_date.tm_sec = time.second;
+	zipfi.tmz_date.tm_min = time.minute;
+	zipfi.tmz_date.tm_hour = time.hour;
+	zipfi.tmz_date.tm_mday = time.day;
+	zipfi.tmz_date.tm_mon = time.month - 1;
+	zipfi.tmz_date.tm_year = time.year;
+	zipfi.dosDate = 0;
 	zipfi.internal_fa = 0;
+	zipfi.external_fa = 0;
 
 	int err = zipOpenNewFileInZip4(zf,
 			p_path.utf8().get_data(),
@@ -118,7 +97,7 @@ Error ZIPPacker::start_file(const String &p_path, BitField<FileAccess::UnixPermi
 			Z_DEFAULT_STRATEGY,
 			nullptr,
 			0,
-			0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
+			0, // "version made by", indicates the compatibility of the file attribute information (the `external_fa` field above).
 			1 << 11); // Bit 11 is the language encoding flag. When set, filename and comment fields must be encoded using UTF-8.
 	return err == ZIP_OK ? OK : FAILED;
 }
@@ -135,72 +114,12 @@ Error ZIPPacker::close_file() {
 	return zipCloseFileInZip(zf) == ZIP_OK ? OK : FAILED;
 }
 
-Error ZIPPacker::add_directory(const String &p_path, BitField<FileAccess::UnixPermissionFlags> p_permissions, uint64_t p_modified_time) {
-	ERR_FAIL_COND_V_MSG(fa.is_null(), FAILED, "ZIPPacker must be opened before use.");
-	ERR_FAIL_COND_V_MSG(directories.has(p_path), ERR_CANT_CREATE, vformat("Directory '%s' already exists.", p_path));
-
-	uint64_t time = p_modified_time;
-	if (time == 0) {
-		time = Time::get_singleton()->get_unix_time_from_system();
-	}
-	Dictionary tz = Time::get_singleton()->get_time_zone_from_system();
-	time += tz["bias"].operator int() * 60;
-	Dictionary dt = Time::get_singleton()->get_datetime_dict_from_unix_time(time);
-
-	zip_fileinfo zipfi;
-	zipfi.tmz_date.tm_year = dt["year"];
-	zipfi.tmz_date.tm_mon = dt["month"].operator int() - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, https://www.cplusplus.com/reference/ctime/tm/
-	zipfi.tmz_date.tm_mday = dt["day"];
-	zipfi.tmz_date.tm_hour = dt["hour"];
-	zipfi.tmz_date.tm_min = dt["minute"];
-	zipfi.tmz_date.tm_sec = dt["second"];
-	zipfi.dosDate = 0;
-
-	// 0040000: directory file type
-	// 0000755: permissions rwxr-xr-x
-	uint32_t _mode = p_permissions;
-	if (_mode == 0) {
-		_mode = 0040755;
-	} else {
-		_mode |= 0040000;
-	}
-	zipfi.external_fa = (_mode << 16L) | 0x10 | ((_mode & 0200) ? 0 : 1); // UUUUUUUU UUUUUUUU 00000000 00ADVSHR: Unix permissions (U) + DOS directory flag (D) + DOS read-only flag (R).
-	zipfi.internal_fa = 0;
-
-	int err = zipOpenNewFileInZip4(zf,
-			p_path.utf8().get_data(),
-			&zipfi,
-			nullptr,
-			0,
-			nullptr,
-			0,
-			nullptr,
-			Z_DEFLATED,
-			compression_level,
-			0,
-			-MAX_WBITS,
-			DEF_MEM_LEVEL,
-			Z_DEFAULT_STRATEGY,
-			nullptr,
-			0,
-			0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
-			1 << 11); // Bit 11 is the language encoding flag. When set, filename and comment fields must be encoded using UTF-8.
-	zipCloseFileInZip(zf);
-	if (err != ZIP_OK) {
-		return FAILED;
-	}
-
-	directories.insert(p_path);
-	return OK;
-}
-
 void ZIPPacker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("open", "path", "append"), &ZIPPacker::open, DEFVAL(Variant(APPEND_CREATE)));
 	ClassDB::bind_method(D_METHOD("set_compression_level", "compression_level"), &ZIPPacker::set_compression_level);
 	ClassDB::bind_method(D_METHOD("get_compression_level"), &ZIPPacker::get_compression_level);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "compression_level"), "set_compression_level", "get_compression_level");
-	ClassDB::bind_method(D_METHOD("add_directory", "path", "permissions", "modified_time"), &ZIPPacker::add_directory, DEFVAL(0755), DEFVAL(0));
-	ClassDB::bind_method(D_METHOD("start_file", "path", "permissions", "modified_time"), &ZIPPacker::start_file, DEFVAL(0644), DEFVAL(0));
+	ClassDB::bind_method(D_METHOD("start_file", "path"), &ZIPPacker::start_file);
 	ClassDB::bind_method(D_METHOD("write_file", "data"), &ZIPPacker::write_file);
 	ClassDB::bind_method(D_METHOD("close_file"), &ZIPPacker::close_file);
 	ClassDB::bind_method(D_METHOD("close"), &ZIPPacker::close);
diff --git a/engine/modules/zip/zip_packer.h b/engine/modules/zip/zip_packer.h
index 4c4eaf11..87c2d0da 100644
--- a/engine/modules/zip/zip_packer.h
+++ b/engine/modules/zip/zip_packer.h
@@ -33,7 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 
-#include <thirdparty/minizip/zip.h>
+#include "thirdparty/minizip/zip.h"
 
 class ZIPPacker : public RefCounted {
 	GDCLASS(ZIPPacker, RefCounted);
@@ -41,16 +41,10 @@ class ZIPPacker : public RefCounted {
 	Ref<FileAccess> fa;
 	zipFile zf = nullptr;
 	int compression_level = Z_DEFAULT_COMPRESSION;
-	HashSet<String> directories;
 
 protected:
 	static void _bind_methods();
 
-#ifndef DISABLE_DEPRECATED
-	Error _start_file_bind_compat_115946(const String &p_path);
-	static void _bind_compatibility_methods();
-#endif
-
 public:
 	enum ZipAppend {
 		APPEND_CREATE = 0,
@@ -71,12 +65,10 @@ public:
 	void set_compression_level(int p_compression_level);
 	int get_compression_level() const;
 
-	Error start_file(const String &p_path, BitField<FileAccess::UnixPermissionFlags> p_permissions = 0644, uint64_t p_modified_time = 0);
+	Error start_file(const String &p_path);
 	Error write_file(const Vector<uint8_t> &p_data);
 	Error close_file();
 
-	Error add_directory(const String &p_path, BitField<FileAccess::UnixPermissionFlags> p_permissions = 0755, uint64_t p_modified_time = 0);
-
 	ZIPPacker();
 	~ZIPPacker();
 };
diff --git a/engine/modules/zip/zip_reader.cpp b/engine/modules/zip/zip_reader.cpp
index bf917481..5817c1c2 100644
--- a/engine/modules/zip/zip_reader.cpp
+++ b/engine/modules/zip/zip_reader.cpp
@@ -32,7 +32,6 @@
 
 #include "core/error/error_macros.h"
 #include "core/io/zip_io.h"
-#include "core/object/class_db.h"
 
 Error ZIPReader::open(const String &p_path) {
 	if (fa.is_valid()) {
diff --git a/engine/modules/zip/zip_reader.h b/engine/modules/zip/zip_reader.h
index 79acab48..8135afb6 100644
--- a/engine/modules/zip/zip_reader.h
+++ b/engine/modules/zip/zip_reader.h
@@ -33,7 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 
-#include <thirdparty/minizip/unzip.h>
+#include "thirdparty/minizip/unzip.h"
 
 class ZIPReader : public RefCounted {
 	GDCLASS(ZIPReader, RefCounted)
diff --git a/engine/platform/android/SCsub b/engine/platform/android/SCsub
index 68521fa5..f97ad7a8 100644
--- a/engine/platform/android/SCsub
+++ b/engine/platform/android/SCsub
@@ -82,7 +82,9 @@ elif sys.platform.startswith("win"):
         host_subpath = "windows"
 
 if lib_arch_dir != "" and host_subpath != "":
-    if env.debug_features:
+    if env.dev_build:
+        lib_type_dir = "dev"
+    elif env.debug_features:
         if env.editor_build and env["store_release"]:
             lib_type_dir = "release"
         else:
diff --git a/engine/platform/android/android_input_handler.cpp b/engine/platform/android/android_input_handler.cpp
index 4c8b6bd6..ca63bcdf 100644
--- a/engine/platform/android/android_input_handler.cpp
+++ b/engine/platform/android/android_input_handler.cpp
@@ -33,8 +33,6 @@
 #include "android_keys_utils.h"
 #include "display_server_android.h"
 
-#include "core/input/input.h"
-
 void AndroidInputHandler::process_joy_event(AndroidInputHandler::JoypadEvent p_event) {
 	switch (p_event.type) {
 		case JOY_EVENT_BUTTON:
@@ -134,7 +132,7 @@ void AndroidInputHandler::process_key_event(int p_physical_keycode, int p_unicod
 
 	if (p_physical_keycode == AKEYCODE_BACK && p_pressed) {
 		if (DisplayServerAndroid *dsa = Object::cast_to<DisplayServerAndroid>(DisplayServer::get_singleton())) {
-			dsa->send_window_event(DisplayServerEnums::WINDOW_EVENT_GO_BACK_REQUEST, true);
+			dsa->send_window_event(DisplayServer::WINDOW_EVENT_GO_BACK_REQUEST, true);
 		}
 	}
 
diff --git a/engine/platform/android/android_input_handler.h b/engine/platform/android/android_input_handler.h
index 1fd74783..7901b066 100644
--- a/engine/platform/android/android_input_handler.h
+++ b/engine/platform/android/android_input_handler.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/input/input_event.h"
+#include "core/input/input.h"
 
 // This class encapsulates all the handling of input events that come from the Android UI thread.
 // Remarks:
diff --git a/engine/platform/android/api/api.cpp b/engine/platform/android/api/api.cpp
index 5a10a47b..8c4a0779 100644
--- a/engine/platform/android/api/api.cpp
+++ b/engine/platform/android/api/api.cpp
@@ -34,7 +34,6 @@
 #include "jni_singleton.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 #if !defined(ANDROID_ENABLED)
 static JavaClassWrapper *java_class_wrapper = nullptr;
@@ -74,8 +73,6 @@ void JavaObject::_bind_methods() {
 void JavaClassWrapper::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("wrap", "name"), &JavaClassWrapper::wrap);
 	ClassDB::bind_method(D_METHOD("get_exception"), &JavaClassWrapper::get_exception);
-	ClassDB::bind_method(D_METHOD("create_sam_callback", "sam_interface", "callable"), &JavaClassWrapper::create_sam_callback);
-	ClassDB::bind_method(D_METHOD("create_proxy", "object", "interfaces"), &JavaClassWrapper::create_proxy);
 }
 
 #if !defined(ANDROID_ENABLED)
@@ -127,14 +124,6 @@ Ref<JavaClass> JavaClassWrapper::_wrap(const String &, bool) {
 	return Ref<JavaClass>();
 }
 
-Ref<JavaObject> JavaClassWrapper::create_sam_callback(const String &p_interface, const Callable &p_callable) {
-	return Ref<JavaObject>();
-}
-
-Ref<JavaObject> JavaClassWrapper::create_proxy(const Object *p_object, const PackedStringArray &p_interfaces) {
-	return Ref<JavaObject>();
-}
-
 JavaClassWrapper::JavaClassWrapper() {
 	singleton = this;
 }
diff --git a/engine/platform/android/api/java_class_wrapper.h b/engine/platform/android/api/java_class_wrapper.h
index 9e5657fb..ab469217 100644
--- a/engine/platform/android/api/java_class_wrapper.h
+++ b/engine/platform/android/api/java_class_wrapper.h
@@ -191,7 +191,6 @@ class JavaClass : public RefCounted {
 	String java_constructor_name;
 	HashMap<StringName, List<MethodInfo>> methods;
 	jclass _class;
-	bool is_interface;
 #endif
 
 protected:
@@ -253,10 +252,8 @@ class JavaClassWrapper : public Object {
 	jmethodID Class_getConstructors;
 	jmethodID Class_getDeclaredMethods;
 	jmethodID Class_getFields;
-	jmethodID Class_getInterfaces;
 	jmethodID Class_getName;
 	jmethodID Class_getSuperclass;
-	jmethodID Class_isInterface;
 	jmethodID Constructor_getParameterTypes;
 	jmethodID Constructor_getModifiers;
 	jmethodID Method_getParameterTypes;
@@ -275,16 +272,7 @@ class JavaClassWrapper : public Object {
 	jmethodID Float_floatValue;
 	jmethodID Double_doubleValue;
 
-	jclass proxy_class;
-	jmethodID Proxy_isProxyClass;
-
-	jclass android_runtime_class;
-	jmethodID ARP_create_proxy_from_godot_callable;
-	jmethodID ARP_create_proxy_from_godot_object_id;
-
-	bool _is_proxy_class(JNIEnv *env, jclass p_class);
 	bool _get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, String &strsig);
-	bool _wrap_class_components(JNIEnv *p_env, const Ref<JavaClass> &p_java_class, jclass p_class, bool p_allow_non_public_methods_access);
 #endif
 
 	Ref<JavaObject> exception;
@@ -303,9 +291,6 @@ public:
 		return _wrap(p_class, false);
 	}
 
-	Ref<JavaObject> create_sam_callback(const String &p_sam_interface, const Callable &p_callable);
-	Ref<JavaObject> create_proxy(const Object *p_object, const PackedStringArray &p_interfaces);
-
 	Ref<JavaObject> get_exception() {
 		return exception;
 	}
diff --git a/engine/platform/android/api/jni_singleton.cpp b/engine/platform/android/api/jni_singleton.cpp
deleted file mode 100644
index ef35ea07..00000000
--- a/engine/platform/android/api/jni_singleton.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************/
-/*  jni_singleton.cpp                                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "jni_singleton.h"
-
-#include "core/object/class_db.h"
-
-void JNISingleton::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("has_java_method", "method"), &JNISingleton::has_java_method);
-}
-
-Variant JNISingleton::callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
-	// Godot methods take precedence.
-	Variant ret = Object::callp(p_method, p_args, p_argcount, r_error);
-	if (r_error.error == Callable::CallError::CALL_OK) {
-		return ret;
-	}
-
-	// Check the method we're looking for is in the JNISingleton map.
-	// This is done because JNISingletons register methods differently than wrapped JavaClass / JavaObject to allow
-	// for access to private methods annotated with the @UsedByGodot annotation.
-	// In the future, we should remove access to private methods and require that JNISingletons' methods exposed to
-	// GDScript be all public, similarly to what we do for wrapped JavaClass / JavaObject methods. Doing so will
-	// also allow dropping and deprecating the @UsedByGodot annotation.
-	RBMap<StringName, MethodData>::Element *E = method_map.find(p_method);
-	if (E) {
-		if (wrapped_object.is_valid()) {
-			return wrapped_object->callp(p_method, p_args, p_argcount, r_error);
-		} else {
-			r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
-		}
-	}
-	return Variant();
-}
-
-void JNISingleton::add_method(const StringName &p_name, const Vector<Variant::Type> &p_args, Variant::Type p_ret_type) {
-	MethodData md;
-	md.argtypes = p_args;
-	md.ret_type = p_ret_type;
-	method_map[p_name] = md;
-}
-
-void JNISingleton::add_signal(const StringName &p_name, const Vector<Variant::Type> &p_args) {
-	MethodInfo mi;
-	mi.name = p_name;
-	for (int i = 0; i < p_args.size(); i++) {
-		mi.arguments.push_back(PropertyInfo(p_args[i], "arg" + itos(i + 1)));
-	}
-	ADD_SIGNAL(mi);
-}
diff --git a/engine/platform/android/api/jni_singleton.h b/engine/platform/android/api/jni_singleton.h
index f6bafce6..9f6b1cbc 100644
--- a/engine/platform/android/api/jni_singleton.h
+++ b/engine/platform/android/api/jni_singleton.h
@@ -32,6 +32,7 @@
 
 #include "java_class_wrapper.h"
 
+#include "core/config/engine.h"
 #include "core/templates/rb_map.h"
 #include "core/variant/variant.h"
 
@@ -47,10 +48,34 @@ class JNISingleton : public Object {
 	Ref<JavaObject> wrapped_object;
 
 protected:
-	static void _bind_methods();
+	static void _bind_methods() {
+		ClassDB::bind_method(D_METHOD("has_java_method", "method"), &JNISingleton::has_java_method);
+	}
 
 public:
-	virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
+	virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override {
+		// Godot methods take precedence.
+		Variant ret = Object::callp(p_method, p_args, p_argcount, r_error);
+		if (r_error.error == Callable::CallError::CALL_OK) {
+			return ret;
+		}
+
+		// Check the method we're looking for is in the JNISingleton map.
+		// This is done because JNISingletons register methods differently than wrapped JavaClass / JavaObject to allow
+		// for access to private methods annotated with the @UsedByGodot annotation.
+		// In the future, we should remove access to private methods and require that JNISingletons' methods exposed to
+		// GDScript be all public, similarly to what we do for wrapped JavaClass / JavaObject methods. Doing so will
+		// also allow dropping and deprecating the @UsedByGodot annotation.
+		RBMap<StringName, MethodData>::Element *E = method_map.find(p_method);
+		if (E) {
+			if (wrapped_object.is_valid()) {
+				return wrapped_object->callp(p_method, p_args, p_argcount, r_error);
+			} else {
+				r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+			}
+		}
+		return Variant();
+	}
 
 	Ref<JavaObject> get_wrapped_object() const {
 		return wrapped_object;
@@ -60,9 +85,21 @@ public:
 		return method_map.has(p_method);
 	}
 
-	void add_method(const StringName &p_name, const Vector<Variant::Type> &p_args, Variant::Type p_ret_type);
+	void add_method(const StringName &p_name, const Vector<Variant::Type> &p_args, Variant::Type p_ret_type) {
+		MethodData md;
+		md.argtypes = p_args;
+		md.ret_type = p_ret_type;
+		method_map[p_name] = md;
+	}
 
-	void add_signal(const StringName &p_name, const Vector<Variant::Type> &p_args);
+	void add_signal(const StringName &p_name, const Vector<Variant::Type> &p_args) {
+		MethodInfo mi;
+		mi.name = p_name;
+		for (int i = 0; i < p_args.size(); i++) {
+			mi.arguments.push_back(PropertyInfo(p_args[i], "arg" + itos(i + 1)));
+		}
+		ADD_SIGNAL(mi);
+	}
 
 	JNISingleton() {}
 
diff --git a/engine/platform/android/audio_driver_opensl.cpp b/engine/platform/android/audio_driver_opensl.cpp
index 177dce52..9dfb60ac 100644
--- a/engine/platform/android/audio_driver_opensl.cpp
+++ b/engine/platform/android/audio_driver_opensl.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_driver_opensl.h"
 
-#include "core/os/os.h"
-
 #define MAX_NUMBER_INTERFACES 3
 #define MAX_NUMBER_OUTPUT_DEVICES 6
 
diff --git a/engine/platform/android/detect.py b/engine/platform/android/detect.py
index 2b3b359d..a5937657 100644
--- a/engine/platform/android/detect.py
+++ b/engine/platform/android/detect.py
@@ -68,7 +68,7 @@ def get_android_ndk_root(env: "SConsEnvironment"):
 
 # This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
 def get_ndk_version():
-    return "29.0.14206865"
+    return "28.1.13356709"
 
 
 # This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
@@ -191,7 +191,7 @@ def configure(env: "SConsEnvironment"):
     has_swappy = detect_swappy()
     if not has_swappy:
         print_warning(
-            f"Swappy Frame Pacing not detected! It is strongly recommended you run `python {os.path.join('misc', 'scripts', 'install_swappy_android.py')}` to download and install Swappy before compiling.\n"
+            "Swappy Frame Pacing not detected! It is strongly recommended you run `python misc/scripts/install_swappy_android.py` to download and install Swappy before compiling.\n"
             + "Without Swappy, Godot apps on Android will inevitably suffer stutter and struggle to keep a consistent framerate. Although Swappy cannot guarantee your app will be stutter-free, not having Swappy will guarantee there will be stutter even on the best phones and the most simple of scenes."
         )
         if env["swappy"]:
diff --git a/engine/platform/android/dir_access_jandroid.h b/engine/platform/android/dir_access_jandroid.h
index 7de4e11c..7787f47c 100644
--- a/engine/platform/android/dir_access_jandroid.h
+++ b/engine/platform/android/dir_access_jandroid.h
@@ -30,9 +30,12 @@
 
 #pragma once
 
+#include "java_godot_lib_jni.h"
+
+#include "core/io/dir_access.h"
 #include "drivers/unix/dir_access_unix.h"
 
-#include <jni.h>
+#include <cstdio>
 
 /// Android implementation of the DirAccess interface used to provide access to
 /// ACCESS_FILESYSTEM and ACCESS_RESOURCES directory resources.
diff --git a/engine/platform/android/display_server_android.cpp b/engine/platform/android/display_server_android.cpp
index 00d1bd9b..bae7817e 100644
--- a/engine/platform/android/display_server_android.cpp
+++ b/engine/platform/android/display_server_android.cpp
@@ -36,10 +36,6 @@
 #include "tts_android.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/input/input_event.h"
-#include "core/os/os.h"
-#include "servers/display/native_menu.h"
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
@@ -56,48 +52,37 @@
 #include <EGL/egl.h>
 #endif
 
-#if defined(RD_ENABLED)
-static RenderingContextDriver *rendering_context_global = nullptr;
-static bool rendering_context_global_checked = false;
-#endif
-
 DisplayServerAndroid *DisplayServerAndroid::get_singleton() {
 	return static_cast<DisplayServerAndroid *>(DisplayServer::get_singleton());
 }
 
-bool DisplayServerAndroid::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerAndroid::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_PIP_MODE: {
-			GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
-			ERR_FAIL_NULL_V(godot_java, false);
-			return godot_java->is_pip_mode_supported();
-		} break;
-
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		//case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		//case DisplayServerEnums::FEATURE_HIDPI:
-		//case DisplayServerEnums::FEATURE_ICON:
-		//case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_MOUSE:
-		//case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
-		//case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		case DisplayServerEnums::FEATURE_ORIENTATION:
-		case DisplayServerEnums::FEATURE_TOUCHSCREEN:
-		case DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD:
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
+		case FEATURE_CURSOR_SHAPE:
+		//case FEATURE_CUSTOM_CURSOR_SHAPE:
+		//case FEATURE_HIDPI:
+		//case FEATURE_ICON:
+		//case FEATURE_IME:
+		case FEATURE_MOUSE:
+		//case FEATURE_MOUSE_WARP:
+		case FEATURE_NATIVE_DIALOG:
+		case FEATURE_NATIVE_DIALOG_INPUT:
+		case FEATURE_NATIVE_DIALOG_FILE:
+		//case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		case FEATURE_NATIVE_DIALOG_FILE_MIME:
+		//case FEATURE_NATIVE_ICON:
+		case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_ORIENTATION:
+		case FEATURE_TOUCHSCREEN:
+		case FEATURE_VIRTUAL_KEYBOARD:
+		case FEATURE_TEXT_TO_SPEECH:
 			return true;
 		default:
 			return false;
@@ -229,7 +214,7 @@ void DisplayServerAndroid::emit_input_dialog_callback(String p_text) {
 	}
 }
 
-Error DisplayServerAndroid::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerAndroid::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
 	ERR_FAIL_NULL_V(godot_java, FAILED);
 	file_picker_callback = p_callback;
@@ -278,7 +263,7 @@ bool DisplayServerAndroid::screen_is_kept_on() const {
 	return keep_screen_on;
 }
 
-void DisplayServerAndroid::screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) {
+void DisplayServerAndroid::screen_set_orientation(DisplayServer::ScreenOrientation p_orientation, int p_screen) {
 	p_screen = _get_screen_index(p_screen);
 	int screen_count = get_screen_count();
 	ERR_FAIL_INDEX(p_screen, screen_count);
@@ -289,17 +274,17 @@ void DisplayServerAndroid::screen_set_orientation(DisplayServerEnums::ScreenOrie
 	godot_io_java->set_screen_orientation(p_orientation);
 }
 
-DisplayServerEnums::ScreenOrientation DisplayServerAndroid::screen_get_orientation(int p_screen) const {
+DisplayServer::ScreenOrientation DisplayServerAndroid::screen_get_orientation(int p_screen) const {
 	p_screen = _get_screen_index(p_screen);
 	int screen_count = get_screen_count();
-	ERR_FAIL_INDEX_V(p_screen, screen_count, DisplayServerEnums::SCREEN_LANDSCAPE);
+	ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_LANDSCAPE);
 
 	GodotIOJavaWrapper *godot_io_java = OS_Android::get_singleton()->get_godot_io_java();
-	ERR_FAIL_NULL_V(godot_io_java, DisplayServerEnums::SCREEN_LANDSCAPE);
+	ERR_FAIL_NULL_V(godot_io_java, SCREEN_LANDSCAPE);
 
 	const int orientation = godot_io_java->get_screen_orientation();
-	ERR_FAIL_INDEX_V_MSG(orientation, 7, DisplayServerEnums::SCREEN_LANDSCAPE, "Unrecognized screen orientation");
-	return (DisplayServerEnums::ScreenOrientation)orientation;
+	ERR_FAIL_INDEX_V_MSG(orientation, 7, SCREEN_LANDSCAPE, "Unrecognized screen orientation");
+	return (ScreenOrientation)orientation;
 }
 
 int DisplayServerAndroid::get_display_rotation() const {
@@ -392,7 +377,7 @@ bool DisplayServerAndroid::is_touchscreen_available() const {
 	return true;
 }
 
-void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	GodotIOJavaWrapper *godot_io_java = OS_Android::get_singleton()->get_godot_io_java();
 	ERR_FAIL_NULL(godot_io_java);
 
@@ -428,23 +413,23 @@ bool DisplayServerAndroid::has_hardware_keyboard() const {
 	return godot_io_java->has_hardware_keyboard();
 }
 
-void DisplayServerAndroid::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_window_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window) {
 	window_event_callback = p_callable;
 }
 
-void DisplayServerAndroid::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_input_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window) {
 	input_event_callback = p_callable;
 }
 
-void DisplayServerAndroid::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_input_text_callback(const Callable &p_callable, DisplayServer::WindowID p_window) {
 	input_text_callback = p_callable;
 }
 
-void DisplayServerAndroid::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_rect_changed_callback(const Callable &p_callable, DisplayServer::WindowID p_window) {
 	rect_changed_callback = p_callable;
 }
 
-void DisplayServerAndroid::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_drop_files_callback(const Callable &p_callable, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
@@ -459,7 +444,7 @@ void DisplayServerAndroid::_window_callback(const Callable &p_callable, bool p_d
 	}
 }
 
-void DisplayServerAndroid::send_window_event(DisplayServerEnums::WindowEvent p_event, bool p_deferred) const {
+void DisplayServerAndroid::send_window_event(DisplayServer::WindowEvent p_event, bool p_deferred) const {
 	_window_callback(window_event_callback, p_deferred, int(p_event));
 }
 
@@ -475,43 +460,43 @@ void DisplayServerAndroid::_dispatch_input_events(const Ref<InputEvent> &p_event
 	DisplayServerAndroid::get_singleton()->send_input_event(p_event);
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerAndroid::get_window_list() const {
-	Vector<DisplayServerEnums::WindowID> ret;
-	ret.push_back(DisplayServerEnums::MAIN_WINDOW_ID);
+Vector<DisplayServer::WindowID> DisplayServerAndroid::get_window_list() const {
+	Vector<WindowID> ret;
+	ret.push_back(MAIN_WINDOW_ID);
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerAndroid::get_window_at_screen_position(const Point2i &p_position) const {
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+DisplayServer::WindowID DisplayServerAndroid::get_window_at_screen_position(const Point2i &p_position) const {
+	return MAIN_WINDOW_ID;
 }
 
-int64_t DisplayServerAndroid::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, 0);
+int64_t DisplayServerAndroid::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, 0);
 	switch (p_handle_type) {
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return reinterpret_cast<int64_t>(static_cast<OS_Android *>(OS::get_singleton())->get_godot_java()->get_activity());
 		}
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			return 0; // Not supported.
 		}
 #ifdef GLES3_ENABLED
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			if (rendering_driver == "opengl3") {
 				return reinterpret_cast<int64_t>(eglGetCurrentDisplay());
 			}
 			return 0;
 		}
-		case DisplayServerEnums::OPENGL_CONTEXT: {
+		case OPENGL_CONTEXT: {
 			if (rendering_driver == "opengl3") {
 				return reinterpret_cast<int64_t>(eglGetCurrentContext());
 			}
 			return 0;
 		}
-		case DisplayServerEnums::EGL_DISPLAY: {
+		case EGL_DISPLAY: {
 			// @todo Find a way to get this from the Java side.
 			return 0;
 		}
-		case DisplayServerEnums::EGL_CONFIG: {
+		case EGL_CONFIG: {
 			// @todo Find a way to get this from the Java side.
 			return 0;
 		}
@@ -522,95 +507,95 @@ int64_t DisplayServerAndroid::window_get_native_handle(DisplayServerEnums::Handl
 	}
 }
 
-void DisplayServerAndroid::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_attach_instance_id(ObjectID p_instance, DisplayServer::WindowID p_window) {
 	window_attached_instance_id = p_instance;
 }
 
-ObjectID DisplayServerAndroid::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerAndroid::window_get_attached_instance_id(DisplayServer::WindowID p_window) const {
 	return window_attached_instance_id;
 }
 
-void DisplayServerAndroid::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_title(const String &p_title, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-int DisplayServerAndroid::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, DisplayServerEnums::INVALID_SCREEN);
+int DisplayServerAndroid::window_get_current_screen(DisplayServer::WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, INVALID_SCREEN);
 	return 0;
 }
 
-void DisplayServerAndroid::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_current_screen(int p_screen, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-Point2i DisplayServerAndroid::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerAndroid::window_get_position(DisplayServer::WindowID p_window) const {
 	return Point2i();
 }
 
-Point2i DisplayServerAndroid::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerAndroid::window_get_position_with_decorations(DisplayServer::WindowID p_window) const {
 	return Point2i();
 }
 
-void DisplayServerAndroid::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_position(const Point2i &p_position, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-void DisplayServerAndroid::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerAndroid::window_set_transient(DisplayServer::WindowID p_window, DisplayServer::WindowID p_parent) {
 	// Not supported on Android.
 }
 
-void DisplayServerAndroid::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_max_size(const Size2i p_size, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-Size2i DisplayServerAndroid::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAndroid::window_get_max_size(DisplayServer::WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerAndroid::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_min_size(const Size2i p_size, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-Size2i DisplayServerAndroid::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAndroid::window_get_min_size(DisplayServer::WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerAndroid::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_size(const Size2i p_size, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-Size2i DisplayServerAndroid::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAndroid::window_get_size(DisplayServer::WindowID p_window) const {
 	return OS_Android::get_singleton()->get_display_size();
 }
 
-Size2i DisplayServerAndroid::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerAndroid::window_get_size_with_decorations(DisplayServer::WindowID p_window) const {
 	return OS_Android::get_singleton()->get_display_size();
 }
 
-void DisplayServerAndroid::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
-	OS_Android::get_singleton()->get_godot_java()->enable_immersive_mode(p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN);
+void DisplayServerAndroid::window_set_mode(DisplayServer::WindowMode p_mode, DisplayServer::WindowID p_window) {
+	OS_Android::get_singleton()->get_godot_java()->enable_immersive_mode(p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN);
 }
 
-DisplayServerEnums::WindowMode DisplayServerAndroid::window_get_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::WindowMode DisplayServerAndroid::window_get_mode(DisplayServer::WindowID p_window) const {
 	if (OS_Android::get_singleton()->get_godot_java()->is_in_immersive_mode()) {
-		return DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+		return WINDOW_MODE_FULLSCREEN;
 	} else {
-		return DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+		return WINDOW_MODE_MAXIMIZED;
 	}
 }
 
-bool DisplayServerAndroid::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAndroid::window_is_maximize_allowed(DisplayServer::WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerAndroid::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_flag(DisplayServer::WindowFlags p_flag, bool p_enabled, DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-bool DisplayServerAndroid::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, false);
+bool DisplayServerAndroid::window_get_flag(DisplayServer::WindowFlags p_flag, DisplayServer::WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, false);
 	switch (p_flag) {
-		case DisplayServerEnums::WindowFlags::WINDOW_FLAG_TRANSPARENT:
+		case WindowFlags::WINDOW_FLAG_TRANSPARENT:
 			return is_window_transparency_available();
 
 		default:
@@ -618,19 +603,19 @@ bool DisplayServerAndroid::window_get_flag(DisplayServerEnums::WindowFlags p_fla
 	}
 }
 
-void DisplayServerAndroid::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_request_attention(DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-void DisplayServerAndroid::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_move_to_foreground(DisplayServer::WindowID p_window) {
 	// Not supported on Android.
 }
 
-bool DisplayServerAndroid::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAndroid::window_is_focused(WindowID p_window) const {
 	return true;
 }
 
-bool DisplayServerAndroid::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerAndroid::window_can_draw(DisplayServer::WindowID p_window) const {
 	return true;
 }
 
@@ -661,7 +646,7 @@ Vector<String> DisplayServerAndroid::get_rendering_drivers_func() {
 	return drivers;
 }
 
-DisplayServer *DisplayServerAndroid::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerAndroid::create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	DisplayServer *ds = memnew(DisplayServerAndroid(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 	if (r_error != OK) {
 		if (p_rendering_driver == "vulkan") {
@@ -682,58 +667,15 @@ void DisplayServerAndroid::register_android_driver() {
 	register_create_function("android", create_func, get_rendering_drivers_func);
 }
 
-#ifdef VULKAN_ENABLED
-bool DisplayServerAndroid::check_vulkan_global_context(bool p_vulkan_requirements_met) {
-	if (!rendering_context_global_checked) {
-		bool fallback_to_opengl3 = GLOBAL_GET("rendering/rendering_device/fallback_to_opengl3");
-		Error err = ERR_CANT_CREATE;
-		if (p_vulkan_requirements_met) {
-			rendering_context_global = memnew(RenderingContextDriverVulkanAndroid);
-			err = rendering_context_global->initialize();
-		}
-
-		if (err != OK) {
-			if (rendering_context_global != nullptr) {
-				memdelete(rendering_context_global);
-				rendering_context_global = nullptr;
-			}
-
-#if defined(GLES3_ENABLED)
-			if (fallback_to_opengl3) {
-				WARN_PRINT("Your device does not seem to support Vulkan, switching to OpenGL 3.");
-				OS::get_singleton()->set_current_rendering_driver_name("opengl3", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-			} else
-#endif
-			{
-				ERR_PRINT("Failed to initialize Vulkan context.");
-			}
-		}
-
-		rendering_context_global_checked = true;
-	}
-
-	return rendering_context_global != nullptr;
-}
-
-void DisplayServerAndroid::free_vulkan_global_context() {
-	if (rendering_context_global != nullptr) {
-		memdelete(rendering_context_global);
-		rendering_context_global = nullptr;
-		rendering_context_global_checked = false;
-	}
-}
-#endif
-
 void DisplayServerAndroid::reset_window() {
 #if defined(RD_ENABLED)
-	if (rendering_context_global) {
+	if (rendering_context) {
 		if (rendering_device) {
-			rendering_device->screen_free(DisplayServerEnums::MAIN_WINDOW_ID);
+			rendering_device->screen_free(MAIN_WINDOW_ID);
 		}
 
-		DisplayServerEnums::VSyncMode last_vsync_mode = rendering_context_global->window_get_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID);
-		rendering_context_global->window_destroy(DisplayServerEnums::MAIN_WINDOW_ID);
+		VSyncMode last_vsync_mode = rendering_context->window_get_vsync_mode(MAIN_WINDOW_ID);
+		rendering_context->window_destroy(MAIN_WINDOW_ID);
 
 		union {
 #ifdef VULKAN_ENABLED
@@ -748,17 +690,19 @@ void DisplayServerAndroid::reset_window() {
 		}
 #endif
 
-		if (rendering_context_global->window_create(DisplayServerEnums::MAIN_WINDOW_ID, &wpd) != OK) {
+		if (rendering_context->window_create(MAIN_WINDOW_ID, &wpd) != OK) {
 			ERR_PRINT(vformat("Failed to reset %s window.", rendering_driver));
+			memdelete(rendering_context);
+			rendering_context = nullptr;
 			return;
 		}
 
 		Size2i display_size = OS_Android::get_singleton()->get_display_size();
-		rendering_context_global->window_set_size(DisplayServerEnums::MAIN_WINDOW_ID, display_size.width, display_size.height);
-		rendering_context_global->window_set_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID, last_vsync_mode);
+		rendering_context->window_set_size(MAIN_WINDOW_ID, display_size.width, display_size.height);
+		rendering_context->window_set_vsync_mode(MAIN_WINDOW_ID, last_vsync_mode);
 
 		if (rendering_device) {
-			rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+			rendering_device->screen_create(MAIN_WINDOW_ID);
 		}
 	}
 #endif
@@ -778,46 +722,79 @@ void DisplayServerAndroid::notify_application_paused() {
 #endif // defined(RD_ENABLED)
 }
 
-DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	rendering_driver = p_rendering_driver;
 
 	keep_screen_on = GLOBAL_GET("display/window/energy_saving/keep_screen_on");
 
 	native_menu = memnew(NativeMenu);
 
-#ifdef VULKAN_ENABLED
+#if defined(RD_ENABLED)
+	rendering_context = nullptr;
+	rendering_device = nullptr;
+
+#if defined(VULKAN_ENABLED)
 	if (rendering_driver == "vulkan") {
-		check_vulkan_global_context(true);
-		if (rendering_context_global == nullptr) {
-			ERR_PRINT("Can't initialize display server with Vulkan driver because no Vulkan context is available.");
-			r_error = ERR_UNAVAILABLE;
-			return;
+		rendering_context = memnew(RenderingContextDriverVulkanAndroid);
+	}
+#endif
+
+	if (rendering_context) {
+		if (rendering_context->initialize() != OK) {
+			memdelete(rendering_context);
+			rendering_context = nullptr;
+#if defined(GLES3_ENABLED)
+			bool fallback_to_opengl3 = GLOBAL_GET("rendering/rendering_device/fallback_to_opengl3");
+			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
+				WARN_PRINT("Your device does not seem to support Vulkan, switching to OpenGL 3.");
+				rendering_driver = "opengl3";
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
+			} else
+#endif
+			{
+				ERR_PRINT(vformat("Failed to initialize %s context", rendering_driver));
+				r_error = ERR_UNAVAILABLE;
+				return;
+			}
 		}
+	}
 
-		ANativeWindow *native_window = OS_Android::get_singleton()->get_native_window();
-		ERR_FAIL_NULL(native_window);
+	if (rendering_context) {
+		union {
+#ifdef VULKAN_ENABLED
+			RenderingContextDriverVulkanAndroid::WindowPlatformData vulkan;
+#endif
+		} wpd;
+#ifdef VULKAN_ENABLED
+		if (rendering_driver == "vulkan") {
+			ANativeWindow *native_window = OS_Android::get_singleton()->get_native_window();
+			ERR_FAIL_NULL(native_window);
+			wpd.vulkan.window = native_window;
+		}
+#endif
 
-		RenderingContextDriverVulkanAndroid::WindowPlatformData wpd;
-		wpd.window = native_window;
-
-		if (rendering_context_global->window_create(DisplayServerEnums::MAIN_WINDOW_ID, &wpd) != OK) {
+		if (rendering_context->window_create(MAIN_WINDOW_ID, &wpd) != OK) {
 			ERR_PRINT(vformat("Failed to create %s window.", rendering_driver));
+			memdelete(rendering_context);
+			rendering_context = nullptr;
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
 
 		Size2i display_size = OS_Android::get_singleton()->get_display_size();
-		rendering_context_global->window_set_size(DisplayServerEnums::MAIN_WINDOW_ID, display_size.width, display_size.height);
-		rendering_context_global->window_set_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID, p_vsync_mode);
+		rendering_context->window_set_size(MAIN_WINDOW_ID, display_size.width, display_size.height);
+		rendering_context->window_set_vsync_mode(MAIN_WINDOW_ID, p_vsync_mode);
 
 		rendering_device = memnew(RenderingDevice);
-		if (rendering_device->initialize(rendering_context_global, DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) != OK) {
 			rendering_device = nullptr;
+			memdelete(rendering_context);
+			rendering_context = nullptr;
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
-
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
@@ -844,8 +821,9 @@ DisplayServerAndroid::~DisplayServerAndroid() {
 	if (rendering_device) {
 		memdelete(rendering_device);
 	}
-
-	free_vulkan_global_context();
+	if (rendering_context) {
+		memdelete(rendering_context);
+	}
 #endif
 }
 
@@ -866,7 +844,7 @@ void DisplayServerAndroid::process_gyroscope(const Vector3 &p_gyroscope) {
 }
 
 void DisplayServerAndroid::_mouse_update_mode() {
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
 			? mouse_mode_override
 			: mouse_mode_base;
 
@@ -877,13 +855,13 @@ void DisplayServerAndroid::_mouse_update_mode() {
 		return;
 	}
 
-	if (wanted_mouse_mode == DisplayServerEnums::MouseMode::MOUSE_MODE_HIDDEN) {
+	if (wanted_mouse_mode == MouseMode::MOUSE_MODE_HIDDEN) {
 		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->set_pointer_icon(CURSOR_TYPE_NULL);
 	} else {
 		cursor_set_shape(cursor_shape);
 	}
 
-	if (wanted_mouse_mode == DisplayServerEnums::MouseMode::MOUSE_MODE_CAPTURED) {
+	if (wanted_mouse_mode == MouseMode::MOUSE_MODE_CAPTURED) {
 		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->request_pointer_capture();
 	} else {
 		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->release_pointer_capture();
@@ -892,8 +870,8 @@ void DisplayServerAndroid::_mouse_update_mode() {
 	mouse_mode = wanted_mouse_mode;
 }
 
-void DisplayServerAndroid::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerAndroid::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_base) {
 		return;
 	}
@@ -901,12 +879,12 @@ void DisplayServerAndroid::mouse_set_mode(DisplayServerEnums::MouseMode p_mode)
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerAndroid::mouse_get_mode() const {
+DisplayServer::MouseMode DisplayServerAndroid::mouse_get_mode() const {
 	return mouse_mode;
 }
 
-void DisplayServerAndroid::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerAndroid::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_override) {
 		return;
 	}
@@ -914,7 +892,7 @@ void DisplayServerAndroid::mouse_set_mode_override(DisplayServerEnums::MouseMode
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerAndroid::mouse_get_mode_override() const {
+DisplayServer::MouseMode DisplayServerAndroid::mouse_get_mode_override() const {
 	return mouse_mode_override;
 }
 
@@ -935,7 +913,7 @@ BitField<MouseButtonMask> DisplayServerAndroid::mouse_get_button_state() const {
 	return Input::get_singleton()->get_mouse_button_mask();
 }
 
-void DisplayServerAndroid::_cursor_set_shape_helper(DisplayServerEnums::CursorShape p_shape, bool force) {
+void DisplayServerAndroid::_cursor_set_shape_helper(CursorShape p_shape, bool force) {
 	if (!OS_Android::get_singleton()->get_godot_java()->get_godot_view()->can_update_pointer_icon()) {
 		return;
 	}
@@ -945,22 +923,22 @@ void DisplayServerAndroid::_cursor_set_shape_helper(DisplayServerEnums::CursorSh
 
 	cursor_shape = p_shape;
 
-	if (mouse_mode == DisplayServerEnums::MouseMode::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MouseMode::MOUSE_MODE_CONFINED) {
+	if (mouse_mode == MouseMode::MOUSE_MODE_VISIBLE || mouse_mode == MouseMode::MOUSE_MODE_CONFINED) {
 		OS_Android::get_singleton()->get_godot_java()->get_godot_view()->set_pointer_icon(android_cursors[cursor_shape]);
 	}
 }
 
-void DisplayServerAndroid::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+void DisplayServerAndroid::cursor_set_shape(DisplayServer::CursorShape p_shape) {
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 	_cursor_set_shape_helper(p_shape);
 }
 
-DisplayServerEnums::CursorShape DisplayServerAndroid::cursor_get_shape() const {
+DisplayServer::CursorShape DisplayServerAndroid::cursor_get_shape() const {
 	return cursor_shape;
 }
 
-void DisplayServerAndroid::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+void DisplayServerAndroid::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 	String cursor_path = p_cursor.is_valid() ? p_cursor->get_path() : "";
 	if (!cursor_path.is_empty()) {
 		cursor_path = ProjectSettings::get_singleton()->globalize_path(cursor_path);
@@ -969,21 +947,21 @@ void DisplayServerAndroid::cursor_set_custom_image(const Ref<Resource> &p_cursor
 	_cursor_set_shape_helper(p_shape, true);
 }
 
-void DisplayServerAndroid::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerAndroid::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 #if defined(RD_ENABLED)
-	if (rendering_context_global) {
-		rendering_context_global->window_set_vsync_mode(p_window, p_vsync_mode);
+	if (rendering_context) {
+		rendering_context->window_set_vsync_mode(p_window, p_vsync_mode);
 	}
 #endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerAndroid::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerAndroid::window_get_vsync_mode(WindowID p_window) const {
 #if defined(RD_ENABLED)
-	if (rendering_context_global) {
-		return rendering_context_global->window_get_vsync_mode(p_window);
+	if (rendering_context) {
+		return rendering_context->window_get_vsync_mode(p_window);
 	}
 #endif
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
 void DisplayServerAndroid::reset_swap_buffers_flag() {
@@ -1009,31 +987,3 @@ void DisplayServerAndroid::set_icon(const Ref<Image> &p_icon) {
 bool DisplayServerAndroid::is_window_transparency_available() const {
 	return GLOBAL_GET_CACHED(bool, "display/window/per_pixel_transparency/allowed");
 }
-
-bool DisplayServerAndroid::is_in_pip_mode(DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, false);
-	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
-	ERR_FAIL_NULL_V(godot_java, false);
-	return godot_java->is_in_pip_mode();
-}
-
-void DisplayServerAndroid::pip_mode_enter(DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND(p_window != DisplayServerEnums::MAIN_WINDOW_ID);
-	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
-	ERR_FAIL_NULL(godot_java);
-	godot_java->enter_pip_mode();
-}
-
-void DisplayServerAndroid::pip_mode_set_aspect_ratio(int p_numerator, int p_denominator, DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND(p_window != DisplayServerEnums::MAIN_WINDOW_ID);
-	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
-	ERR_FAIL_NULL(godot_java);
-	godot_java->set_pip_mode_aspect_ratio(p_numerator, p_denominator);
-}
-
-void DisplayServerAndroid::pip_mode_set_auto_enter_on_background(bool p_auto_enter_on_background, DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND(p_window != DisplayServerEnums::MAIN_WINDOW_ID);
-	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
-	ERR_FAIL_NULL(godot_java);
-	godot_java->set_auto_enter_pip_mode_on_background(p_auto_enter_on_background);
-}
diff --git a/engine/platform/android/display_server_android.h b/engine/platform/android/display_server_android.h
index 1d3757a7..49301d4b 100644
--- a/engine/platform/android/display_server_android.h
+++ b/engine/platform/android/display_server_android.h
@@ -32,9 +32,6 @@
 
 #include "servers/display/display_server.h"
 
-class InputEvent;
-class NativeMenu;
-
 #if defined(RD_ENABLED)
 class RenderingContextDriver;
 class RenderingDevice;
@@ -47,38 +44,39 @@ class DisplayServerAndroid : public DisplayServer {
 
 	// https://developer.android.com/reference/android/view/PointerIcon
 	// mapping between Godot's cursor shape to Android's'
-	int android_cursors[DisplayServerEnums::CURSOR_MAX] = {
-		1000, //DisplayServerEnums::CURSOR_ARROW
-		1008, //DisplayServerEnums::CURSOR_IBEAM
-		1002, //DisplayServerEnums::CURSOR_POINTIN
-		1007, //DisplayServerEnums::CURSOR_CROSS
-		1004, //DisplayServerEnums::CURSOR_WAIT
-		1004, //DisplayServerEnums::CURSOR_BUSY
-		1021, //DisplayServerEnums::CURSOR_DRAG
-		1021, //DisplayServerEnums::CURSOR_CAN_DRO
-		1000, //DisplayServerEnums::CURSOR_FORBIDD (no corresponding icon in Android's icon so fallback to default)
-		1015, //DisplayServerEnums::CURSOR_VSIZE
-		1014, //DisplayServerEnums::CURSOR_HSIZE
-		1017, //DisplayServerEnums::CURSOR_BDIAGSI
-		1016, //DisplayServerEnums::CURSOR_FDIAGSI
-		1020, //DisplayServerEnums::CURSOR_MOVE
-		1015, //DisplayServerEnums::CURSOR_VSPLIT
-		1014, //DisplayServerEnums::CURSOR_HSPLIT
-		1003, //DisplayServerEnums::CURSOR_HELP
+	int android_cursors[CURSOR_MAX] = {
+		1000, //CURSOR_ARROW
+		1008, //CURSOR_IBEAM
+		1002, //CURSOR_POINTIN
+		1007, //CURSOR_CROSS
+		1004, //CURSOR_WAIT
+		1004, //CURSOR_BUSY
+		1021, //CURSOR_DRAG
+		1021, //CURSOR_CAN_DRO
+		1000, //CURSOR_FORBIDD (no corresponding icon in Android's icon so fallback to default)
+		1015, //CURSOR_VSIZE
+		1014, //CURSOR_HSIZE
+		1017, //CURSOR_BDIAGSI
+		1016, //CURSOR_FDIAGSI
+		1020, //CURSOR_MOVE
+		1015, //CURSOR_VSPLIT
+		1014, //CURSOR_HSPLIT
+		1003, //CURSOR_HELP
 	};
 	const int CURSOR_TYPE_NULL = 0;
-	DisplayServerEnums::MouseMode mouse_mode = DisplayServerEnums::MouseMode::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MouseMode::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MouseMode::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode = MouseMode::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_base = MouseMode::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MouseMode::MOUSE_MODE_VISIBLE;
 	bool mouse_mode_override_enabled = false;
 	void _mouse_update_mode();
 
 	bool keep_screen_on;
 	bool swap_buffers_flag;
 
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CursorShape::CURSOR_ARROW;
+	CursorShape cursor_shape = CursorShape::CURSOR_ARROW;
 
 #if defined(RD_ENABLED)
+	RenderingContextDriver *rendering_context = nullptr;
 	RenderingDevice *rendering_device = nullptr;
 #endif
 	NativeMenu *native_menu = nullptr;
@@ -106,7 +104,7 @@ class DisplayServerAndroid : public DisplayServer {
 public:
 	static DisplayServerAndroid *get_singleton();
 
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
 	virtual bool tts_is_speaking() const override;
@@ -133,7 +131,7 @@ public:
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override;
 	void emit_input_dialog_callback(String p_text);
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, const DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, const FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
 	void emit_file_picker_callback(bool p_ok, const Vector<String> &p_selected_paths);
 
 	virtual Color get_accent_color() const override;
@@ -145,83 +143,83 @@ public:
 	virtual void screen_set_keep_on(bool p_enable) override;
 	virtual bool screen_is_kept_on() const override;
 
-	virtual void screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) override;
-	virtual DisplayServerEnums::ScreenOrientation screen_get_orientation(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual void screen_set_orientation(ScreenOrientation p_orientation, int p_screen = SCREEN_OF_MAIN_WINDOW) override;
+	virtual ScreenOrientation screen_get_orientation(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	int get_display_rotation() const;
 
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual bool is_touchscreen_available() const override;
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), DisplayServerEnums::VirtualKeyboardType p_type = DisplayServerEnums::KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
 	virtual void virtual_keyboard_hide() override;
 	virtual int virtual_keyboard_get_height() const override;
 	virtual bool has_hardware_keyboard() const override;
 	virtual void set_hardware_keyboard_connection_change_callback(const Callable &p_callable) override;
 	void emit_hardware_keyboard_connection_changed(bool p_connected);
 
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	void send_window_event(DisplayServerEnums::WindowEvent p_event, bool p_deferred = false) const;
+	void send_window_event(WindowEvent p_event, bool p_deferred = false) const;
 	void send_input_event(const Ref<InputEvent> &p_event) const;
 	void send_input_text(const String &p_text) const;
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual Vector<WindowID> get_window_list() const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
 	virtual void window_set_color(const Color &p_color) override;
 
@@ -232,27 +230,22 @@ public:
 	void process_magnetometer(const Vector3 &p_magnetometer);
 	void process_gyroscope(const Vector3 &p_gyroscope);
 
-	void _cursor_set_shape_helper(DisplayServerEnums::CursorShape p_shape, bool force = false);
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
+	void _cursor_set_shape_helper(CursorShape p_shape, bool force = false);
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
 
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
 	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
 	virtual bool mouse_is_mode_override_enabled() const override;
 
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	static Vector<String> get_rendering_drivers_func();
 	static void register_android_driver();
 
-#ifdef VULKAN_ENABLED
-	static bool check_vulkan_global_context(bool p_vulkan_requirements_met);
-	static void free_vulkan_global_context();
-#endif
-
 	void reset_window();
 	void notify_surface_changed(int p_width, int p_height);
 	void notify_application_paused();
@@ -269,11 +262,6 @@ public:
 
 	virtual bool is_window_transparency_available() const override;
 
-	virtual bool is_in_pip_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void pip_mode_enter(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void pip_mode_set_aspect_ratio(int p_numerator, int p_denominator, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void pip_mode_set_auto_enter_on_background(bool p_auto_enter_on_background, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	DisplayServerAndroid(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerAndroid(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerAndroid();
 };
diff --git a/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml b/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
index ec3b8076..0b597eb0 100644
--- a/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
+++ b/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformAndroid" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformAndroid" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for Android.
 	</brief_description>
diff --git a/engine/platform/android/editor/editor_utils_jni.cpp b/engine/platform/android/editor/editor_utils_jni.cpp
index 142aee66..e2b6f3b4 100644
--- a/engine/platform/android/editor/editor_utils_jni.cpp
+++ b/engine/platform/android/editor/editor_utils_jni.cpp
@@ -30,14 +30,11 @@
 
 #include "editor_utils_jni.h"
 
-#ifdef TOOLS_ENABLED
 #include "jni_utils.h"
 
-#include "core/os/os.h"
+#ifdef TOOLS_ENABLED
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
-#include "editor/editor_node.h"
-#include "editor/gui/editor_title_bar.h"
 #include "editor/run/editor_run_bar.h"
 #include "main/main.h"
 #endif
@@ -95,15 +92,4 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_editor_utils_EditorUtils_runSc
 	}
 #endif
 }
-
-JNIEXPORT void JNICALL Java_org_godotengine_godot_editor_utils_EditorUtils_toggleTitleBar(JNIEnv *p_env, jclass, jboolean p_visible) {
-#ifdef TOOLS_ENABLED
-	if (EditorNode::get_singleton() != nullptr) {
-		EditorTitleBar *title_bar = EditorNode::get_singleton()->get_title_bar();
-		if (title_bar != nullptr) {
-			title_bar->call_deferred("set_visible", p_visible);
-		}
-	}
-#endif
-}
 }
diff --git a/engine/platform/android/editor/editor_utils_jni.h b/engine/platform/android/editor/editor_utils_jni.h
index 963b97b7..68d26961 100644
--- a/engine/platform/android/editor/editor_utils_jni.h
+++ b/engine/platform/android/editor/editor_utils_jni.h
@@ -34,5 +34,4 @@
 
 extern "C" {
 JNIEXPORT void JNICALL Java_org_godotengine_godot_editor_utils_EditorUtils_runScene(JNIEnv *p_env, jclass, jstring p_scene, jobjectArray p_scene_args);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_editor_utils_EditorUtils_toggleTitleBar(JNIEnv *p_env, jclass, jboolean p_enable);
 }
diff --git a/engine/platform/android/export/android_editor_gradle_runner.cpp b/engine/platform/android/export/android_editor_gradle_runner.cpp
index 965023c1..199776b6 100644
--- a/engine/platform/android/export/android_editor_gradle_runner.cpp
+++ b/engine/platform/android/export/android_editor_gradle_runner.cpp
@@ -31,15 +31,14 @@
 #ifdef ANDROID_ENABLED
 #include "android_editor_gradle_runner.h"
 
-#include "../java_godot_wrapper.h"
-#include "../os_android.h"
-
-#include "core/object/callable_mp.h"
 #include "editor/editor_interface.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/rich_text_label.h"
 
+#include "../java_godot_wrapper.h"
+#include "../os_android.h"
+
 void AndroidEditorGradleRunner::run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const String &p_export_format, const List<String> &p_gradle_build_args, const List<String> &p_gradle_copy_args) {
 	project_path = p_project_path;
 	build_path = p_build_path;
diff --git a/engine/platform/android/export/export.cpp b/engine/platform/android/export/export.cpp
index 520eeb6b..7fe0ecb9 100644
--- a/engine/platform/android/export/export.cpp
+++ b/engine/platform/android/export/export.cpp
@@ -32,7 +32,6 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/file_system/editor_paths.h"
diff --git a/engine/platform/android/export/export_plugin.cpp b/engine/platform/android/export/export_plugin.cpp
index 8a5b2372..60a2b80e 100644
--- a/engine/platform/android/export/export_plugin.cpp
+++ b/engine/platform/android/export/export_plugin.cpp
@@ -36,24 +36,23 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/io/image_loader.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
-#include "core/math/random_pcg.h"
-#include "core/os/os.h"
-#include "core/os/shared_object.h"
 #include "core/string/translation_server.h"
 #include "core/version.h"
+#include "editor/editor_log.h"
 #include "editor/editor_node.h"
-#include "editor/export/editor_export.h"
-#include "editor/export/editor_export_plugin.h"
+#include "editor/editor_string_names.h"
 #include "editor/export/export_template_manager.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "main/splash.gen.h"
 #include "scene/resources/image_texture.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 #include "modules/svg/image_loader_svg.h"
 
 #ifdef MODULE_MONO_ENABLED
@@ -61,16 +60,11 @@
 #endif
 
 #ifdef ANDROID_ENABLED
+#include "../java_godot_wrapper.h"
 #include "../os_android.h"
 #include "android_editor_gradle_runner.h"
 #endif
 
-#ifndef ANDROID_ENABLED
-#include "core/object/callable_mp.h"
-#include "editor/editor_log.h"
-#include "editor/editor_string_names.h"
-#endif
-
 static const char *ANDROID_PERMS[] = {
 	"ACCESS_CHECKIN_PROPERTIES",
 	"ACCESS_COARSE_LOCATION",
@@ -293,8 +287,7 @@ static const char *APK_ASSETS_DIRECTORY = "src/main/assets";
 static const char *AAB_ASSETS_DIRECTORY = "assetPackInstallTime/src/main/assets";
 
 static const int DEFAULT_MIN_SDK_VERSION = 24; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
-static const int VULKAN_MIN_SDK_VERSION = 29; // Minimum recommended sdk version for Vulkan 1.1 support. See https://developer.android.com/games/develop/vulkan/native-engine-support#recommendations
-static const int DEFAULT_TARGET_SDK_VERSION = 36; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
+static const int DEFAULT_TARGET_SDK_VERSION = 35; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
 
 #ifndef ANDROID_ENABLED
 void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
@@ -472,30 +465,24 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 }
 
 void EditorExportPlatformAndroid::_update_preset_status() {
-	bool has_runnable = EditorExport::get_singleton()->get_runnable_preset_for_platform(this).is_valid();
+	const int preset_count = EditorExport::get_singleton()->get_export_preset_count();
+	bool has_runnable = false;
+
+	for (int i = 0; i < preset_count; i++) {
+		const Ref<EditorExportPreset> &preset = EditorExport::get_singleton()->get_export_preset(i);
+		if (preset->get_platform() == this && preset->is_runnable()) {
+			has_runnable = true;
+			break;
+		}
+	}
+
 	if (has_runnable) {
 		has_runnable_preset.set();
-		_start_check_for_changes_poll_thread();
 	} else {
 		has_runnable_preset.clear();
-		_stop_check_for_changes_poll_thread();
 	}
 	devices_changed.set();
 }
-
-void EditorExportPlatformAndroid::_start_check_for_changes_poll_thread() {
-	quit_request.clear();
-	if (!check_for_changes_thread.is_started()) {
-		check_for_changes_thread.start(_check_for_changes_poll_thread, this);
-	}
-}
-
-void EditorExportPlatformAndroid::_stop_check_for_changes_poll_thread() {
-	quit_request.set();
-	if (check_for_changes_thread.is_started()) {
-		check_for_changes_thread.wait_to_finish();
-	}
-}
 #endif
 
 String EditorExportPlatformAndroid::get_project_name(const Ref<EditorExportPreset> &p_preset, const String &p_name) const {
@@ -834,12 +821,7 @@ Error EditorExportPlatformAndroid::save_apk_file(const Ref<EditorExportPreset> &
 		return err;
 	}
 
-	String dst_path;
-	if (ed->pd.salt.length() == 32) {
-		dst_path = String("assets/") + (simplified_path + ed->pd.salt).sha256_text();
-	} else {
-		dst_path = String("assets/") + simplified_path.trim_prefix("res://");
-	}
+	const String dst_path = String("assets/") + simplified_path.trim_prefix("res://");
 	print_verbose("Saving project files from " + simplified_path + " into " + dst_path);
 	store_in_apk(ed, dst_path, enc_data, _should_compress_asset(simplified_path, enc_data) ? Z_DEFLATED : 0);
 
@@ -999,7 +981,7 @@ void EditorExportPlatformAndroid::_get_manifest_info(const Ref<EditorExportPrese
 	}
 
 	if (_uses_vulkan(p_preset)) {
-		// Optionally request vulkan hardware level 1 support.
+		// Require vulkan hardware level 1 support
 		FeatureInfo vulkan_level = {
 			"android.hardware.vulkan.level", // name
 			false, // required
@@ -1007,12 +989,11 @@ void EditorExportPlatformAndroid::_get_manifest_info(const Ref<EditorExportPrese
 		};
 		r_features.append(vulkan_level);
 
-		// Require vulkan version 1.1 if fallback_to_opengl3 is disabled.
-		bool vulkan_1_1_required = !GLOBAL_GET("rendering/rendering_device/fallback_to_opengl3");
+		// Require vulkan version 1.0
 		FeatureInfo vulkan_version = {
 			"android.hardware.vulkan.version", // name
-			vulkan_1_1_required, // required
-			"0x401000" // version - Encoded value for api version 1.1
+			true, // required
+			"0x400003" // version - Encoded value for api version 1.0
 		};
 		r_features.append(vulkan_version);
 	}
@@ -1223,7 +1204,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 	String package_name = p_preset->get("package/unique_name");
 
 	const int screen_orientation =
-			_get_android_orientation_value(DisplayServerEnums::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation"))));
+			_get_android_orientation_value(DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation"))));
 
 	bool screen_support_small = p_preset->get("screen/support_small");
 	bool screen_support_normal = p_preset->get("screen/support_normal");
@@ -2082,7 +2063,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport
 			int target_sdk_int = DEFAULT_TARGET_SDK_VERSION;
 
 			String min_sdk_str = p_preset->get("gradle_build/min_sdk");
-			int min_sdk_int = VULKAN_MIN_SDK_VERSION;
+			int min_sdk_int = DEFAULT_MIN_SDK_VERSION;
 			if (min_sdk_str.is_valid_int()) {
 				min_sdk_int = min_sdk_str.to_int();
 			}
@@ -2143,7 +2124,7 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
 	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "gradle_build/export_format", PROPERTY_HINT_ENUM, "Export APK,Export AAB"), EXPORT_FORMAT_APK, false, true));
 	// Using String instead of int to default to an empty string (no override) with placeholder for instructions (see GH-62465).
 	// This implies doing validation that the string is a proper int.
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "gradle_build/min_sdk", PROPERTY_HINT_PLACEHOLDER_TEXT, vformat("%d (default)", VULKAN_MIN_SDK_VERSION)), "", false, true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "gradle_build/min_sdk", PROPERTY_HINT_PLACEHOLDER_TEXT, vformat("%d (default)", DEFAULT_MIN_SDK_VERSION)), "", false, true));
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "gradle_build/target_sdk", PROPERTY_HINT_PLACEHOLDER_TEXT, vformat("%d (default)", DEFAULT_TARGET_SDK_VERSION)), "", false, true));
 
 	r_options->push_back(ExportOption(PropertyInfo(Variant::DICTIONARY, "gradle_build/custom_theme_attributes", PROPERTY_HINT_DICTIONARY_TYPE, "String;String"), Dictionary()));
@@ -2392,14 +2373,14 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
 
 	String tmp_export_path = EditorPaths::get_singleton()->get_temp_dir().path_join("tmpexport." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
-		DirAccess::remove_file_or_error(tmp_export_path); \
-		if (FileAccess::exists(tmp_export_path + ".idsig")) { \
+#define CLEANUP_AND_RETURN(m_err)                                        \
+	{                                                                    \
+		DirAccess::remove_file_or_error(tmp_export_path);                \
+		if (FileAccess::exists(tmp_export_path + ".idsig")) {            \
 			DirAccess::remove_file_or_error(tmp_export_path + ".idsig"); \
-		} \
-		return m_err; \
-	} \
+		}                                                                \
+		return m_err;                                                    \
+	}                                                                    \
 	((void)0)
 
 	// Export to temporary APK before sending to device.
@@ -3131,20 +3112,6 @@ bool EditorExportPlatformAndroid::has_valid_project_configuration(const Ref<Edit
 		err += "\n";
 	}
 
-	String min_sdk_str = p_preset->get("gradle_build/min_sdk");
-	int min_sdk_int = VULKAN_MIN_SDK_VERSION;
-	if (!min_sdk_str.is_empty()) { // Empty means no override, nothing to do.
-		if (min_sdk_str.is_valid_int()) {
-			min_sdk_int = min_sdk_str.to_int();
-		}
-	}
-	bool fallback_to_opengl3 = GLOBAL_GET("rendering/rendering_device/fallback_to_opengl3");
-	if (_uses_vulkan(p_preset) && min_sdk_int < VULKAN_MIN_SDK_VERSION && !fallback_to_opengl3) {
-		// Warning only, so don't override `valid`.
-		err += vformat(TTR("\"Min SDK\" should be greater or equal to %d for the \"%s\" renderer."), VULKAN_MIN_SDK_VERSION, current_renderer);
-		err += "\n";
-	}
-
 	String package_name = p_preset->get("package/unique_name");
 	if (package_name.contains("$genname") && !is_project_name_valid(p_preset)) {
 		// Warning only, so don't override `valid`.
@@ -3577,7 +3544,7 @@ Error EditorExportPlatformAndroid::_generate_sparse_pck_metadata(const Ref<Edito
 	int64_t pck_start_pos = ftmp->get_position();
 	uint64_t file_base_ofs = 0;
 	uint64_t dir_base_ofs = 0;
-	EditorExportPlatform::_store_header(ftmp, p_preset->get_enc_pck() && p_preset->get_enc_directory(), true, file_base_ofs, dir_base_ofs, p_pack_data.salt);
+	EditorExportPlatform::_store_header(ftmp, p_preset->get_enc_pck() && p_preset->get_enc_directory(), true, file_base_ofs, dir_base_ofs);
 
 	// Write directory.
 	uint64_t dir_offset = ftmp->get_position();
@@ -3784,12 +3751,6 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 			} else {
 				user_data.pd.path = "assets.sparsepck";
 				user_data.pd.use_sparse_pck = true;
-				if (p_preset->get_enc_directory()) {
-					RandomPCG rng = RandomPCG(p_preset->get_seed());
-					for (int i = 0; i < 32; i++) {
-						user_data.pd.salt += String::chr(1 + rng.rand() % 254);
-					}
-				}
 				err = export_project_files(p_preset, p_debug, rename_and_store_file_in_gradle_project, nullptr, &user_data, copy_gradle_so);
 
 				Vector<uint8_t> enc_data;
@@ -3848,7 +3809,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		String version_name = p_preset->get_version("version/name");
 		String min_sdk_version = p_preset->get("gradle_build/min_sdk");
 		if (!min_sdk_version.is_valid_int()) {
-			min_sdk_version = itos(VULKAN_MIN_SDK_VERSION);
+			min_sdk_version = itos(DEFAULT_MIN_SDK_VERSION);
 		}
 		String target_sdk_version = p_preset->get("gradle_build/target_sdk");
 		if (!target_sdk_version.is_valid_int()) {
@@ -4102,11 +4063,11 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 
 	String tmp_unaligned_path = EditorPaths::get_singleton()->get_temp_dir().path_join("tmpexport-unaligned." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
+#define CLEANUP_AND_RETURN(m_err)                            \
+	{                                                        \
 		DirAccess::remove_file_or_error(tmp_unaligned_path); \
-		return m_err; \
-	} \
+		return m_err;                                        \
+	}                                                        \
 	((void)0)
 
 	zipFile unaligned_apk = zipOpen2(tmp_unaligned_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
@@ -4297,12 +4258,6 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 			ed.apk = unaligned_apk;
 			ed.pd.path = "assets.sparsepck";
 			ed.pd.use_sparse_pck = true;
-			if (p_preset->get_enc_directory()) {
-				RandomPCG rng = RandomPCG(p_preset->get_seed());
-				for (int i = 0; i < 32; i++) {
-					ed.pd.salt += String::chr(1 + rng.rand() % 254);
-				}
-			}
 			err = export_project_files(p_preset, p_debug, save_apk_file, nullptr, &ed, save_apk_so);
 
 			Vector<uint8_t> enc_data;
@@ -4464,6 +4419,7 @@ void EditorExportPlatformAndroid::initialize() {
 		devices_changed.set();
 		_create_editor_debug_keystore_if_needed();
 		_update_preset_status();
+		check_for_changes_thread.start(_check_for_changes_poll_thread, this);
 		use_scrcpy = EditorSettings::get_singleton()->get_project_metadata("android", "use_scrcpy", false);
 #else // ANDROID_ENABLED
 		android_editor_gradle_runner = memnew(AndroidEditorGradleRunner);
@@ -4473,7 +4429,10 @@ void EditorExportPlatformAndroid::initialize() {
 
 EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
 #ifndef ANDROID_ENABLED
-	_stop_check_for_changes_poll_thread();
+	quit_request.set();
+	if (check_for_changes_thread.is_started()) {
+		check_for_changes_thread.wait_to_finish();
+	}
 #else
 	if (android_editor_gradle_runner) {
 		memdelete(android_editor_gradle_runner);
diff --git a/engine/platform/android/export/export_plugin.h b/engine/platform/android/export/export_plugin.h
index 2f08e89f..527b9e90 100644
--- a/engine/platform/android/export/export_plugin.h
+++ b/engine/platform/android/export/export_plugin.h
@@ -38,6 +38,7 @@
 
 #include "core/io/image.h"
 #include "core/io/zip_io.h"
+#include "core/os/os.h"
 #include "editor/export/editor_export_platform.h"
 
 class ImageTexture;
@@ -107,8 +108,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 	SafeFlag has_runnable_preset;
 
 	static void _check_for_changes_poll_thread(void *ud);
-	void _start_check_for_changes_poll_thread();
-	void _stop_check_for_changes_poll_thread();
 	void _update_preset_status();
 #else // ANDROID_ENABLED
 	AndroidEditorGradleRunner *android_editor_gradle_runner = nullptr;
diff --git a/engine/platform/android/export/godot_plugin_config.cpp b/engine/platform/android/export/godot_plugin_config.cpp
index 70b01164..cdec5f55 100644
--- a/engine/platform/android/export/godot_plugin_config.cpp
+++ b/engine/platform/android/export/godot_plugin_config.cpp
@@ -32,8 +32,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "core/config/project_settings.h"
-
 /*
  * Set of prebuilt plugins.
  * Currently unused, this is just for future reference:
diff --git a/engine/platform/android/export/godot_plugin_config.h b/engine/platform/android/export/godot_plugin_config.h
index 36cd6fc0..1b69262c 100644
--- a/engine/platform/android/export/godot_plugin_config.h
+++ b/engine/platform/android/export/godot_plugin_config.h
@@ -32,6 +32,7 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/string/ustring.h"
 
diff --git a/engine/platform/android/export/gradle_export_util.cpp b/engine/platform/android/export/gradle_export_util.cpp
index a953c1a6..93527568 100644
--- a/engine/platform/android/export/gradle_export_util.cpp
+++ b/engine/platform/android/export/gradle_export_util.cpp
@@ -30,50 +30,44 @@
 
 #include "gradle_export_util.h"
 
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
-#include "editor/export/editor_export.h"
-#include "editor/export/editor_export_plugin.h"
-
 #include "modules/regex/regex.h"
 
-int _get_android_orientation_value(DisplayServerEnums::ScreenOrientation screen_orientation) {
+int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation) {
 	switch (screen_orientation) {
-		case DisplayServerEnums::SCREEN_PORTRAIT:
+		case DisplayServer::SCREEN_PORTRAIT:
 			return 1;
-		case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
+		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
 			return 8;
-		case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
+		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
 			return 9;
-		case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
 			return 11;
-		case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 			return 12;
-		case DisplayServerEnums::SCREEN_SENSOR:
+		case DisplayServer::SCREEN_SENSOR:
 			return 13;
-		case DisplayServerEnums::SCREEN_LANDSCAPE:
+		case DisplayServer::SCREEN_LANDSCAPE:
 		default:
 			return 0;
 	}
 }
 
-String _get_android_orientation_label(DisplayServerEnums::ScreenOrientation screen_orientation) {
+String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation) {
 	switch (screen_orientation) {
-		case DisplayServerEnums::SCREEN_PORTRAIT:
+		case DisplayServer::SCREEN_PORTRAIT:
 			return "portrait";
-		case DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE:
+		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
 			return "reverseLandscape";
-		case DisplayServerEnums::SCREEN_REVERSE_PORTRAIT:
+		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
 			return "reversePortrait";
-		case DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE:
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
 			return "userLandscape";
-		case DisplayServerEnums::SCREEN_SENSOR_PORTRAIT:
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
 			return "userPortrait";
-		case DisplayServerEnums::SCREEN_SENSOR:
+		case DisplayServer::SCREEN_SENSOR:
 			return "fullUser";
-		case DisplayServerEnums::SCREEN_LANDSCAPE:
+		case DisplayServer::SCREEN_LANDSCAPE:
 		default:
 			return "landscape";
 	}
@@ -188,12 +182,7 @@ Error rename_and_store_file_in_gradle_project(const Ref<EditorExportPreset> &p_p
 		return err;
 	}
 
-	String dst_path;
-	if (export_data->pd.salt.length() == 32) {
-		dst_path = export_data->assets_directory + String("/") + (simplified_path + export_data->pd.salt).sha256_text();
-	} else {
-		dst_path = export_data->assets_directory + String("/") + simplified_path.trim_prefix("res://");
-	}
+	const String dst_path = export_data->assets_directory + String("/") + simplified_path.trim_prefix("res://");
 	print_verbose("Saving project files from " + simplified_path + " into " + dst_path);
 	err = store_file_at_path(dst_path, enc_data);
 
@@ -312,7 +301,7 @@ String _get_activity_tag(const Ref<EditorExportPlatform> &p_export_platform, con
 	}
 
 	// Update the GodotApp activity tag.
-	String orientation = _get_android_orientation_label(DisplayServerEnums::ScreenOrientation(int(p_export_platform->get_project_setting(p_preset, "display/window/handheld/orientation"))));
+	String orientation = _get_android_orientation_label(DisplayServer::ScreenOrientation(int(p_export_platform->get_project_setting(p_preset, "display/window/handheld/orientation"))));
 	String manifest_activity_text = vformat(
 			"        <activity android:name=\".GodotApp\" "
 			"tools:replace=\"android:screenOrientation,android:excludeFromRecents,android:resizeableActivity\" "
diff --git a/engine/platform/android/export/gradle_export_util.h b/engine/platform/android/export/gradle_export_util.h
index 048c912f..c7216887 100644
--- a/engine/platform/android/export/gradle_export_util.h
+++ b/engine/platform/android/export/gradle_export_util.h
@@ -31,8 +31,13 @@
 #pragma once
 
 #include "core/crypto/crypto_core.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
+#include "editor/export/editor_export.h"
 #include "editor/export/editor_export_platform.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 const String GODOT_PROJECT_NAME_XML_STRING = R"(<?xml version="1.0" encoding="utf-8"?>
 <!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
@@ -72,9 +77,9 @@ struct MetadataInfo {
 	String value;
 };
 
-int _get_android_orientation_value(DisplayServerEnums::ScreenOrientation screen_orientation);
+int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation);
 
-String _get_android_orientation_label(DisplayServerEnums::ScreenOrientation screen_orientation);
+String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation);
 
 int _get_app_category_value(int category_index);
 
diff --git a/engine/platform/android/file_access_android.cpp b/engine/platform/android/file_access_android.cpp
index 23afb52c..c57206ce 100644
--- a/engine/platform/android/file_access_android.cpp
+++ b/engine/platform/android/file_access_android.cpp
@@ -30,9 +30,8 @@
 
 #include "file_access_android.h"
 
-#include "thread_jandroid.h"
-
 #include "core/string/print_string.h"
+#include "thread_jandroid.h"
 
 #include <android/asset_manager_jni.h>
 
diff --git a/engine/platform/android/file_access_android.h b/engine/platform/android/file_access_android.h
index 4d2ce192..d6c63f88 100644
--- a/engine/platform/android/file_access_android.h
+++ b/engine/platform/android/file_access_android.h
@@ -35,6 +35,7 @@
 #include <android/asset_manager.h>
 #include <android/log.h>
 #include <jni.h>
+#include <cstdio>
 
 class FileAccessAndroid : public FileAccess {
 	GDSOFTCLASS(FileAccessAndroid, FileAccess);
diff --git a/engine/platform/android/file_access_filesystem_jandroid.cpp b/engine/platform/android/file_access_filesystem_jandroid.cpp
index 668eb96f..c8666f53 100644
--- a/engine/platform/android/file_access_filesystem_jandroid.cpp
+++ b/engine/platform/android/file_access_filesystem_jandroid.cpp
@@ -32,6 +32,7 @@
 
 #include "thread_jandroid.h"
 
+#include "core/os/os.h"
 #include "core/templates/local_vector.h"
 
 #include <unistd.h>
diff --git a/engine/platform/android/file_access_filesystem_jandroid.h b/engine/platform/android/file_access_filesystem_jandroid.h
index cf0cb15c..03b66d48 100644
--- a/engine/platform/android/file_access_filesystem_jandroid.h
+++ b/engine/platform/android/file_access_filesystem_jandroid.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "core/io/file_access.h"
+#include "java_godot_lib_jni.h"
 
-#include <jni.h>
+#include "core/io/file_access.h"
 
 class FileAccessFilesystemJAndroid : public FileAccess {
 	GDSOFTCLASS(FileAccessFilesystemJAndroid, FileAccess);
diff --git a/engine/platform/android/java/app/build.gradle b/engine/platform/android/java/app/build.gradle
index 7107c4b5..839dbb79 100644
--- a/engine/platform/android/java/app/build.gradle
+++ b/engine/platform/android/java/app/build.gradle
@@ -27,6 +27,8 @@ allprojects {
 }
 
 configurations {
+    // Initializes a placeholder for the devImplementation dependency configuration.
+    devImplementation {}
     // Initializes a placeholder for the monoImplementation dependency configuration.
     monoImplementation {}
 }
@@ -51,32 +53,15 @@ dependencies {
         // Godot gradle build mode. In this scenario this project is the only one around and the Godot
         // library is available through the pre-generated godot-lib.*.aar android archive files.
         debugImplementation fileTree(dir: 'libs/debug', include: ['**/*.jar', '*.aar'])
+        devImplementation fileTree(dir: 'libs/dev', include: ['**/*.jar', '*.aar'])
         releaseImplementation fileTree(dir: 'libs/release', include: ['**/*.jar', '*.aar'])
     }
 
     // Godot user plugins remote dependencies
     String[] remoteDeps = getGodotPluginsRemoteBinaries()
     if (remoteDeps != null && remoteDeps.size() > 0) {
-        def platformPattern = /^\s*(platform|enforcedPlatform)\s*\(\s*['"]*(\S+)['"]*\s*\)$/
         for (String dep : remoteDeps) {
-            def matcher = dep =~ platformPattern
-            if (matcher) {
-                switch (matcher[0][1]) {
-                    case "platform":
-                        implementation platform(matcher[0][2])
-                        break
-
-                    case "enforcedPlatform":
-                        implementation enforcedPlatform(matcher[0][2])
-                        break
-
-                    default:
-                        throw new GradleException("Invalid remote platform dependency: $dep")
-                        break
-                }
-            } else {
-                implementation dep
-            }
+            implementation dep
         }
     }
 
@@ -221,6 +206,18 @@ android {
             }
         }
 
+        dev {
+            initWith debug
+            // Signing and zip-aligning are skipped for prebuilt builds, but
+            // performed for Godot gradle builds.
+            zipAlignEnabled shouldZipAlign()
+            if (shouldSign()) {
+                signingConfig signingConfigs.debug
+            } else {
+                signingConfig null
+            }
+        }
+
         release {
             // Signing and zip-aligning are skipped for prebuilt builds, but
             // performed for Godot gradle builds.
@@ -254,6 +251,7 @@ android {
     sourceSets {
         main.res.srcDirs += ['res']
         debug.jniLibs.srcDirs = ['libs/debug', 'libs/debug/vulkan_validation_layers']
+        dev.jniLibs.srcDirs = ['libs/dev']
         release.jniLibs.srcDirs = ['libs/release']
     }
 
@@ -332,6 +330,9 @@ module, so we're ensuring the ':app:preBuild' task is set to run after those tas
 if (rootProject.tasks.findByPath("copyDebugAARToAppModule") != null) {
     preBuild.mustRunAfter(rootProject.tasks.named("copyDebugAARToAppModule"))
 }
+if (rootProject.tasks.findByPath("copyDevAARToAppModule") != null) {
+    preBuild.mustRunAfter(rootProject.tasks.named("copyDevAARToAppModule"))
+}
 if (rootProject.tasks.findByPath("copyReleaseAARToAppModule") != null) {
     preBuild.mustRunAfter(rootProject.tasks.named("copyReleaseAARToAppModule"))
 }
diff --git a/engine/platform/android/java/app/config.gradle b/engine/platform/android/java/app/config.gradle
index 872f6bbb..4129edbe 100644
--- a/engine/platform/android/java/app/config.gradle
+++ b/engine/platform/android/java/app/config.gradle
@@ -1,23 +1,23 @@
 ext.versions = [
     androidGradlePlugin: '8.6.1',
-    compileSdk         : 36,
+    compileSdk         : 35,
     // Also update:
     // - 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
     // - 'platform/android/detect.py#get_min_target_api()'
     minSdk             : 24,
     // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
-    targetSdk          : 36,
-    buildTools         : '36.1.0',
-    kotlinVersion      : '2.1.21',
+    targetSdk          : 35,
+    buildTools         : '35.0.1',
+    kotlinVersion      : '2.1.20',
     fragmentVersion    : '1.8.6',
     nexusPublishVersion: '1.3.0',
     javaVersion        : JavaVersion.VERSION_17,
     // Also update 'platform/android/detect.py#get_ndk_version()' when this is updated.
-    ndkVersion         : '29.0.14206865',
+    ndkVersion         : '28.1.13356709',
     splashscreenVersion: '1.0.1',
     // 'openxrLoaderVersion' should be set to XR_CURRENT_API_VERSION, see 'thirdparty/openxr'
     openxrLoaderVersion: '1.1.53',
-    openxrVendorsVersion: '4.3.0-stable',
+    openxrVendorsVersion: '4.2.2-stable',
     junitVersion       : '1.3.0',
     espressoCoreVersion: '3.7.0',
     kotlinTestVersion  : '1.3.11',
diff --git a/engine/platform/android/java/app/src/instrumented/assets/.godot/global_script_class_cache.cfg b/engine/platform/android/java/app/src/instrumented/assets/.godot/global_script_class_cache.cfg
index 1f8f0662..b6ed5489 100644
--- a/engine/platform/android/java/app/src/instrumented/assets/.godot/global_script_class_cache.cfg
+++ b/engine/platform/android/java/app/src/instrumented/assets/.godot/global_script_class_cache.cfg
@@ -1,4 +1,12 @@
 list=[{
+"base": &"RefCounted",
+"class": &"BaseTest",
+"icon": "",
+"is_abstract": true,
+"is_tool": false,
+"language": &"GDScript",
+"path": "res://test/base_test.gd"
+}, {
 "base": &"BaseTest",
 "class": &"FileAccessTests",
 "icon": "",
@@ -14,12 +22,4 @@ list=[{
 "is_tool": false,
 "language": &"GDScript",
 "path": "res://test/javaclasswrapper/java_class_wrapper_tests.gd"
-}, {
-"base": &"RefCounted",
-"class": &"BaseTest",
-"icon": "",
-"is_abstract": true,
-"is_tool": false,
-"language": &"GDScript",
-"path": "res://test/base_test.gd"
 }]
diff --git a/engine/platform/android/java/app/src/instrumented/assets/main.tscn b/engine/platform/android/java/app/src/instrumented/assets/main.tscn
index 692618a7..848845ba 100644
--- a/engine/platform/android/java/app/src/instrumented/assets/main.tscn
+++ b/engine/platform/android/java/app/src/instrumented/assets/main.tscn
@@ -1,29 +1,29 @@
-[gd_scene format=3 uid="uid://cg3hylang5fxn"]
+[gd_scene load_steps=2 format=3 uid="uid://cg3hylang5fxn"]
 
 [ext_resource type="Script" uid="uid://bv6y7in6otgcm" path="res://main.gd" id="1_j0gfq"]
 
-[node name="Main" type="Node2D" unique_id=852911723]
+[node name="Main" type="Node2D"]
 script = ExtResource("1_j0gfq")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1839352715]
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
 offset_left = 68.0
 offset_top = 102.0
 offset_right = 506.0
 offset_bottom = 408.0
 theme_override_constants/separation = 25
 
-[node name="PluginToastButton" type="Button" parent="VBoxContainer" unique_id=1670434164]
+[node name="PluginToastButton" type="Button" parent="VBoxContainer"]
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
 text = "Plugin Toast
 "
 
-[node name="VibrationButton" type="Button" parent="VBoxContainer" unique_id=648980813]
+[node name="VibrationButton" type="Button" parent="VBoxContainer"]
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
 text = "Vibration"
 
-[node name="GDScriptToastButton" type="Button" parent="VBoxContainer" unique_id=95554078]
+[node name="GDScriptToastButton" type="Button" parent="VBoxContainer"]
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
 text = "GDScript Toast
diff --git a/engine/platform/android/java/app/src/instrumented/assets/project.godot b/engine/platform/android/java/app/src/instrumented/assets/project.godot
index 68bc653c..f4ec2997 100644
--- a/engine/platform/android/java/app/src/instrumented/assets/project.godot
+++ b/engine/platform/android/java/app/src/instrumented/assets/project.godot
@@ -8,15 +8,11 @@
 
 config_version=5
 
-[animation]
-
-compatibility/default_parent_skeleton_in_mesh_instance_3d=true
-
 [application]
 
 config/name="Godot App Instrumentation Tests"
 run/main_scene="res://main.tscn"
-config/features=PackedStringArray("4.6", "GL Compatibility")
+config/features=PackedStringArray("4.5", "GL Compatibility")
 config/icon="res://icon.svg"
 
 [debug]
diff --git a/engine/platform/android/java/app/src/instrumented/assets/test/javaclasswrapper/java_class_wrapper_tests.gd b/engine/platform/android/java/app/src/instrumented/assets/test/javaclasswrapper/java_class_wrapper_tests.gd
index 1d4a5766..65843f1f 100644
--- a/engine/platform/android/java/app/src/instrumented/assets/test/javaclasswrapper/java_class_wrapper_tests.gd
+++ b/engine/platform/android/java/app/src/instrumented/assets/test/javaclasswrapper/java_class_wrapper_tests.gd
@@ -20,10 +20,6 @@ func run_tests():
 
 	__exec_test(test_callable)
 
-	__exec_test(test_interface_callable_proxy)
-
-	__exec_test(test_interface_object_proxy)
-
 	print("JavaClassWrapper tests finished.")
 	print("Tests started: " + str(_test_started))
 	print("Tests completed: " + str(_test_completed))
@@ -173,34 +169,3 @@ func test_callable() -> bool:
 	assert_equal(cb1_data['called'], true)
 
 	return true
-
-func test_interface_callable_proxy() -> bool:
-	var cb1_data := {called = false, content = ""}
-	var cb1 = func (content: String) -> void:
-		cb1_data['called'] = true
-		cb1_data['content'] = content
-
-	var printer_proxy = JavaClassWrapper.create_sam_callback("android.util.Printer", cb1)
-	assert_true(printer_proxy != null)
-
-	printer_proxy.println("This is a callback test")
-	assert_equal(cb1_data['called'], true)
-	assert_equal(cb1_data['content'], "This is a callback test")
-	return true
-
-class PrintProxy:
-	var test_data := {called = false, content = ""}
-
-	func println(content: String) -> void:
-		test_data['called'] = true
-		test_data['content'] = content
-
-func test_interface_object_proxy() -> bool:
-	var print_object = PrintProxy.new()
-	var proxy = JavaClassWrapper.create_proxy(print_object, ["android.util.Printer"])
-	assert_true(proxy != null)
-
-	proxy.println("This is proxy test")
-	assert_equal(print_object.test_data['called'], true)
-	assert_equal(print_object.test_data['content'], "This is proxy test")
-	return true
diff --git a/engine/platform/android/java/app/src/main/AndroidManifest.xml b/engine/platform/android/java/app/src/main/AndroidManifest.xml
index f523b317..41774516 100644
--- a/engine/platform/android/java/app/src/main/AndroidManifest.xml
+++ b/engine/platform/android/java/app/src/main/AndroidManifest.xml
@@ -35,7 +35,6 @@
             android:launchMode="singleInstancePerTask"
             android:excludeFromRecents="false"
             android:exported="false"
-            android:supportsPictureInPicture="true"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
diff --git a/engine/platform/android/java/app/src/main/java/com/godot/game/GodotApp.java b/engine/platform/android/java/app/src/main/java/com/godot/game/GodotApp.java
index 8573f713..4bd7359b 100644
--- a/engine/platform/android/java/app/src/main/java/com/godot/game/GodotApp.java
+++ b/engine/platform/android/java/app/src/main/java/com/godot/game/GodotApp.java
@@ -92,9 +92,4 @@ public class GodotApp extends GodotActivity {
 			super.onGodotForceQuit(instance);
 		}
 	}
-
-	@Override
-	protected boolean isPiPEnabled() {
-		return true;
-	}
 }
diff --git a/engine/platform/android/java/build.gradle b/engine/platform/android/java/build.gradle
index bf04ffb4..702cea4f 100644
--- a/engine/platform/android/java/build.gradle
+++ b/engine/platform/android/java/build.gradle
@@ -27,8 +27,8 @@ ext {
     supportedFlavors = ["editor", "template"]
     supportedAndroidDistributions = ["android", "horizonos", "picoos"]
     supportedFlavorsBuildTypes = [
-        "editor": ["debug", "release"],
-        "template": ["debug", "release"]
+        "editor": ["dev", "debug", "release"],
+        "template": ["dev", "debug", "release"]
     ]
     supportedEditions = ["standard", "mono"]
 
@@ -50,11 +50,11 @@ def getSconsTaskName(String flavor, String buildType, String abi) {
 
 /**
  * Generate Godot gradle build template by zipping the source files from the app directory, as well
- * as the AAR files generated by 'copyDebugAAR' and 'copyReleaseAAR'.
+ * as the AAR files generated by 'copyDebugAAR', 'copyDevAAR' and 'copyReleaseAAR'.
  * The zip file also includes some gradle tools to enable gradle builds from the Godot Editor.
  */
 task zipGradleBuild(type: Zip) {
-    onlyIf { generateGodotTemplates.state.executed || generateGodotMonoTemplates.state.executed }
+    onlyIf { generateGodotTemplates.state.executed || generateGodotMonoTemplates.state.executed || generateDevTemplate.state.executed }
     doFirst {
         logger.lifecycle("Generating Godot gradle build template")
     }
@@ -124,6 +124,9 @@ def generateBuildTasks(String flavor = "template", String edition = "standard",
         File targetLibs = new File(libsDir + target)
 
         String targetSuffix = target
+        if (target == "dev") {
+            targetSuffix = "debug.dev"
+        }
 
         if (!excludeSconsBuildTasks || (targetLibs != null
             && targetLibs.isDirectory()
@@ -312,20 +315,26 @@ task cleanGodotTemplates(type: Delete) {
 
     // Delete the Godot templates in the Godot bin directory
     delete("$binDir/android_debug.apk")
+    delete("$binDir/android_dev.apk")
     delete("$binDir/android_release.apk")
     delete("$binDir/android_monoDebug.apk")
+    delete("$binDir/android_monoDev.apk")
     delete("$binDir/android_monoRelease.apk")
     delete("$binDir/android_source.zip")
     delete("$binDir/godot-lib.template_debug.aar")
+    delete("$binDir/godot-lib.template_debug.dev.aar")
     delete("$binDir/godot-lib.template_release.aar")
 
     // Cover deletion for the libs using the previous naming scheme
     delete("$binDir/godot-lib.debug.aar")
+    delete("$binDir/godot-lib.dev.aar")
     delete("$binDir/godot-lib.release.aar")
 
     // Delete the native debug symbols files.
     delete("$binDir/android-editor-debug-native-symbols.zip")
+    delete("$binDir/android-editor-dev-native-symbols.zip")
     delete("$binDir/android-editor-release-native-symbols.zip")
     delete("$binDir/android-template-debug-native-symbols.zip")
+    delete("$binDir/android-template-dev-native-symbols.zip")
     delete("$binDir/android-template-release-native-symbols.zip")
 }
diff --git a/engine/platform/android/java/editor/build.gradle b/engine/platform/android/java/editor/build.gradle
index e117e372..890b6486 100644
--- a/engine/platform/android/java/editor/build.gradle
+++ b/engine/platform/android/java/editor/build.gradle
@@ -81,7 +81,7 @@ android {
         applicationId "org.godotengine.editor.v4"
         versionCode generateVersionCode()
         versionName generateVersionName()
-        minSdkVersion 29 // Minimum recommended sdk version for Vulkan 1.1 support. See https://developer.android.com/games/develop/vulkan/native-engine-support#recommendations
+        minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
 
         missingDimensionStrategy 'products', 'editor'
@@ -131,7 +131,14 @@ android {
     }
 
     buildTypes {
+        dev {
+            initWith debug
+            applicationIdSuffix ".dev"
+            manifestPlaceholders += [editorBuildSuffix: " (dev)"]
+        }
+
         debug {
+            initWith release
             applicationIdSuffix ".debug"
             manifestPlaceholders += [editorBuildSuffix: " (debug)"]
             signingConfig signingConfigs.debug
@@ -140,14 +147,6 @@ android {
         release {
             if (hasReleaseSigningConfigs()) {
                 signingConfig signingConfigs.release
-            } else {
-                // We default to the debug signingConfigs when the release signing configs are not
-                // available (e.g: development in Android Studio).
-                signingConfig signingConfigs.debug
-                // In addition, we update the application ID to allow installing an Android studio release build
-                // side by side with a production build from the store.
-                applicationIdSuffix ".release"
-                manifestPlaceholders += [editorBuildSuffix: " (release)"]
             }
         }
     }
@@ -187,6 +186,7 @@ android {
             }
             applicationIdSuffix ".pico"
             versionNameSuffix "-pico"
+            minSdkVersion 29
             targetSdkVersion 32
         }
     }
diff --git a/engine/platform/android/java/editor/src/main/AndroidManifest.xml b/engine/platform/android/java/editor/src/main/AndroidManifest.xml
index 24a32b3e..cbe5a9d2 100644
--- a/engine/platform/android/java/editor/src/main/AndroidManifest.xml
+++ b/engine/platform/android/java/editor/src/main/AndroidManifest.xml
@@ -16,14 +16,6 @@
     <uses-feature
         android:glEsVersion="0x00030000"
         android:required="true" />
-    <uses-feature
-        android:name="android.hardware.vulkan.version"
-        android:required="true"
-        android:version="0x401000" />
-    <uses-feature
-        android:name="android.hardware.vulkan.level"
-        android:required="true"
-        android:version="1" />
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
@@ -60,7 +52,7 @@
             android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:exported="false"
             android:icon="@mipmap/themed_icon"
-            android:launchMode="singleInstancePerTask"
+            android:launchMode="singleTask"
             android:screenOrientation="userLandscape">
             <layout
                 android:defaultWidth="@dimen/editor_default_window_width"
@@ -93,15 +85,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-                <data android:mimeType="*/*" />
-                <data android:host="*" />
-                <data android:pathPattern=".*\\.godot" />
-            </intent-filter>
         </activity-alias>
         <activity
             android:name=".GodotGame"
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
index fd625220..9063471b 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
@@ -34,12 +34,9 @@ import android.Manifest
 import android.app.ActivityManager
 import android.app.ActivityOptions
 import android.content.ComponentName
-import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
-import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.os.Debug
@@ -74,9 +71,7 @@ import org.godotengine.godot.utils.DialogUtils
 import org.godotengine.godot.utils.PermissionsUtil
 import org.godotengine.godot.utils.ProcessPhoenix
 import org.godotengine.openxr.vendors.utils.*
-import java.io.File
 import kotlin.math.min
-import kotlin.text.indexOf
 
 /**
  * Base class for the Godot Android Editor activities.
@@ -157,7 +152,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		internal const val GAME_MENU_ACTION_SET_TIME_SCALE = "setTimeScale"
 
 		private const val GAME_WORKSPACE = "Game"
-		private const val SCRIPT_WORKSPACE = "Script"
 
 		internal const val SNACKBAR_SHOW_DURATION_MS = 5000L
 
@@ -204,12 +198,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	protected var gameMenuFragment: GameMenuFragment? = null
 	protected val gameMenuState = Bundle()
 
-	private val updatedCommandLineParams = ArrayList<String>()
-
-	private var changingOrientationAllowed = false
-	private var distractionFreeModeEnabled = false
-	private var activeWorkspace: String? = null
-
 	override fun getGodotAppLayout() = R.layout.godot_editor_layout
 
 	internal open fun getEditorWindowInfo() = EDITOR_MAIN_INFO
@@ -256,7 +244,8 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 		// Skip permissions request if running in a device farm (e.g. firebase test lab) or if requested via the launch
 		// intent (e.g. instrumentation tests).
-		val skipPermissionsRequest = isRunningInInstrumentation() || ActivityManager.isRunningInUserTestHarness()
+		val skipPermissionsRequest = isRunningInInstrumentation() ||
+			Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && ActivityManager.isRunningInUserTestHarness()
 		if (!skipPermissionsRequest) {
 			// We exclude certain permissions from the set we request at startup, as they'll be
 			// requested on demand based on use cases.
@@ -265,7 +254,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 		editorMessageDispatcher.parseStartIntent(packageManager, intent)
 
-		if (BuildConfig.BUILD_TYPE == "debug" && WAIT_FOR_DEBUGGER) {
+		if (BuildConfig.BUILD_TYPE == "dev" && WAIT_FOR_DEBUGGER) {
 			Debug.waitForDebugger()
 		}
 
@@ -275,14 +264,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		setupGameMenuBar()
 	}
 
-	override fun onConfigurationChanged(newConfig: Configuration) {
-		super.onConfigurationChanged(newConfig)
-
-		// Show EditorTitleBar on small screens only in landscape due to width limitations in portrait.
-		// TODO: Enable for portrait once the title bar width is optimized.
-		EditorUtils.toggleTitleBar(isLargeScreen || newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
-	}
-
 	override fun onDestroy() {
 		gradleBuildProvider.buildEnvDisconnect()
 		super.onDestroy()
@@ -338,91 +319,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		super.onNewIntent(newIntent)
 	}
 
-	override fun handleStartIntent(intent: Intent, newLaunch: Boolean) {
-		when (intent.action) {
-			Intent.ACTION_VIEW -> {
-				val rootDir = Environment.getExternalStorageDirectory().canonicalPath
-
-				val dataPath = when (intent.scheme) {
-					ContentResolver.SCHEME_FILE -> {
-						intent.data?.path
-					}
-
-					ContentResolver.SCHEME_CONTENT -> {
-						// This approach is not recommend with 'content' scheme, but we require the filesystem path in
-						// order to open its parent directory and load the project.
-						val uriPath = intent.data?.path
-						if (uriPath != null) {
-							// Try and see if the external storage directory is part of the uri path.
-							val rootDirIndex = uriPath.indexOf(rootDir)
-							if (rootDirIndex != -1) {
-								uriPath.substring(rootDirIndex)
-							} else {
-								// Try and see if we can retrieve an existing relative path.
-								val pathParts = uriPath.split(':', '/')
-								var currentPath = ""
-								for (index in pathParts.size -1 downTo 0) {
-									currentPath = if (currentPath == "") {
-										pathParts[index]
-									} else {
-										"${pathParts[index]}/$currentPath"
-									}
-									val currentFile = File(rootDir, currentPath)
-									if (currentFile.exists()) {
-										break
-									}
-								}
-								currentPath
-							}
-						} else {
-							null
-						}
-					}
-
-					else -> null
-				}
-
-				if (!dataPath.isNullOrBlank()) {
-					var dataFile = File(dataPath)
-					if (!dataFile.isAbsolute) {
-						dataFile = File(rootDir, dataPath)
-					}
-
-					val dataDir = dataFile.parentFile
-					if (dataDir?.isDirectory == true) {
-						val loadProjectArgs = arrayOf(EDITOR_ARG, PATH_ARG, dataDir.absolutePath)
-						if (newLaunch) {
-							// Update the command line parameters to load the specified project.
-							updatedCommandLineParams.addAll(loadProjectArgs)
-						} else {
-							// Check if we are already editing the specified directory.
-							var isEditor = false
-							var nextIsPath = false
-							var currentPath = ""
-							for (arg in commandLine) {
-								if (nextIsPath) {
-									currentPath = arg
-									nextIsPath = false
-								}
-
-								if (arg == EDITOR_ARG || arg == EDITOR_ARG_SHORT) {
-									isEditor = true
-								} else if (arg == PATH_ARG) {
-									nextIsPath = true
-								}
-							}
-							if (!isEditor || currentPath != dataDir.absolutePath) {
-								onNewGodotInstanceRequested(loadProjectArgs)
-							}
-						}
-					}
-				}
-			}
-		}
-
-		super.handleStartIntent(intent, newLaunch)
-	}
-
 	protected open fun shouldShowGameMenuBar() = gameMenuContainer != null
 
 	private fun setupGameMenuBar() {
@@ -449,7 +345,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		val longPressEnabled = enableLongPressGestures()
 		val panScaleEnabled = enablePanAndScaleGestures()
 		val overrideVolumeButtonsEnabled = overrideVolumeButtons()
-		val hapticEnabled = enableHapticOnLongPress()
 
 		runOnUiThread {
 			// Enable long press, panning and scaling gestures
@@ -457,7 +352,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 				enableLongPress(longPressEnabled)
 				enablePanningAndScalingGestures(panScaleEnabled)
 				setOverrideVolumeButtons(overrideVolumeButtonsEnabled)
-				enableHapticFeedback(hapticEnabled)
 			}
 		}
 	}
@@ -510,10 +404,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 	override fun getCommandLine(): MutableList<String> {
 		val params = super.getCommandLine()
-		if (updatedCommandLineParams.isNotEmpty()) {
-			params.addAll(updatedCommandLineParams)
-		}
-		if (BuildConfig.BUILD_TYPE == "debug" && !params.contains("--benchmark")) {
+		if (BuildConfig.BUILD_TYPE == "dev" && !params.contains("--benchmark")) {
 			params.add("--benchmark")
 		}
 		return params
@@ -712,7 +603,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	/**
 	 * The Godot Android Editor sets its own orientation via its AndroidManifest
 	 */
-	protected open fun overrideOrientationRequest() = !changingOrientationAllowed
+	protected open fun overrideOrientationRequest() = true
 
 	protected open fun overrideVolumeButtons() = false
 
@@ -722,12 +613,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	protected open fun enableLongPressGestures() =
 		java.lang.Boolean.parseBoolean(GodotLib.getEditorSetting("interface/touchscreen/enable_long_press_as_right_click"))
 
-	/**
-	 * Enable haptic feedback on long-press right-click for the Godot Android editor.
-	 */
-	protected open fun enableHapticOnLongPress() =
-		java.lang.Boolean.parseBoolean(GodotLib.getEditorSetting("interface/touchscreen/haptic_on_long_press"))
-
 	/**
 	 * Disable scroll deadzone for the Godot Android editor.
 	 */
@@ -804,7 +689,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 			}
 
 			PermissionsUtil.REQUEST_INSTALL_PACKAGES_REQ_CODE -> {
-				if (!packageManager.canRequestPackageInstalls()) {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !packageManager.canRequestPackageInstalls()) {
 					Toast.makeText(
 						this,
 						R.string.denied_install_packages_permission_error_msg,
@@ -916,8 +801,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	}
 
 	override fun onEditorWorkspaceSelected(workspace: String) {
-		activeWorkspace = workspace
-
 		if (workspace == GAME_WORKSPACE && shouldShowGameMenuBar()) {
 			if (editorMessageDispatcher.bringEditorWindowToFront(EMBEDDED_RUN_GAME_INFO) || editorMessageDispatcher.bringEditorWindowToFront(RUN_GAME_INFO)) {
 				return
@@ -930,23 +813,6 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 				embeddedGameViewContainerWindow?.isVisible = true
 			}
 		}
-
-		toggleScriptEditorOrientation()
-	}
-
-	override fun onDistractionFreeModeChanged(enabled: Boolean) {
-		distractionFreeModeEnabled = enabled
-		toggleScriptEditorOrientation()
-	}
-
-	private fun toggleScriptEditorOrientation() {
-		if (activeWorkspace == SCRIPT_WORKSPACE && distractionFreeModeEnabled) {
-			changingOrientationAllowed = true
-			requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
-		} else if (changingOrientationAllowed) {
-			requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-			changingOrientationAllowed = false
-		}
 	}
 
 	internal open fun bringSelfToFront() {
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
index 286d31f4..45c8f505 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
@@ -30,7 +30,12 @@
 
 package org.godotengine.editor
 
+import android.app.PictureInPictureParams
+import android.content.pm.PackageManager
+import android.graphics.Rect
+import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import androidx.annotation.CallSuper
 import androidx.core.view.isVisible
@@ -50,6 +55,7 @@ open class GodotGame : BaseGodotGame() {
 		private val TAG = GodotGame::class.java.simpleName
 	}
 
+	private val gameViewSourceRectHint = Rect()
 	private val expandGameMenuButton: View? by lazy { findViewById(R.id.game_menu_expand_button) }
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -69,6 +75,13 @@ open class GodotGame : BaseGodotGame() {
 				gameMenuFragment?.expandGameMenu()
 			}
 		}
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val gameView = findViewById<View>(R.id.godot_fragment_container)
+			gameView?.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom ->
+				gameView.getGlobalVisibleRect(gameViewSourceRectHint)
+			}
+		}
 	}
 
 	override fun getCommandLine(): MutableList<String> {
@@ -83,7 +96,27 @@ open class GodotGame : BaseGodotGame() {
 		return updatedArgs
 	}
 
-	override fun isPiPEnabled() = true
+	override fun enterPiPMode() {
+		if (hasPiPSystemFeature()) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				val builder = PictureInPictureParams.Builder().setSourceRectHint(gameViewSourceRectHint)
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+					builder.setSeamlessResizeEnabled(false)
+				}
+				setPictureInPictureParams(builder.build())
+			}
+
+			Log.v(TAG, "Entering PiP mode")
+			enterPictureInPictureMode()
+		}
+	}
+
+	/**
+	 * Returns true the if the device supports picture-in-picture (PiP).
+	 */
+	protected fun hasPiPSystemFeature(): Boolean {
+		return packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
+	}
 
 	override fun shouldShowGameMenuBar(): Boolean {
 		return intent.getBooleanExtra(
@@ -94,11 +127,21 @@ open class GodotGame : BaseGodotGame() {
 
 	override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
 		super.onPictureInPictureModeChanged(isInPictureInPictureMode)
+		Log.v(TAG, "onPictureInPictureModeChanged: $isInPictureInPictureMode")
 
 		// Hide the game menu fragment when in PiP.
 		gameMenuContainer?.isVisible = !isInPictureInPictureMode
 	}
 
+	override fun onStop() {
+		super.onStop()
+
+		if (isInPictureInPictureMode && !isFinishing) {
+			// We get in this state when PiP is closed, so we terminate the activity.
+			finish()
+		}
+	}
+
 	override fun getGodotAppLayout() = R.layout.godot_game_layout
 
 	override fun getEditorWindowInfo() = RUN_GAME_INFO
@@ -215,7 +258,7 @@ open class GodotGame : BaseGodotGame() {
 
 	override fun isCloseButtonEnabled() = !isHorizonOSDevice(applicationContext)
 
-	override fun isPiPButtonEnabled() = isPiPModeSupported()
+	override fun isPiPButtonEnabled() = hasPiPSystemFeature()
 
 	override fun isMenuBarCollapsable() = true
 
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/EmbeddedGodotGame.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/EmbeddedGodotGame.kt
index 5456cb23..d03c1439 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/EmbeddedGodotGame.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/EmbeddedGodotGame.kt
@@ -140,7 +140,7 @@ class EmbeddedGodotGame : GodotGame() {
 
 	override fun isMenuBarCollapsable() = false
 
-	override fun isAlwaysOnTopSupported() = isPiPModeSupported()
+	override fun isAlwaysOnTopSupported() = hasPiPSystemFeature()
 
 	override fun onFullScreenUpdated(enabled: Boolean) {
 		godot?.enableImmersiveMode(enabled)
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
index 8161fc1c..715f0508 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
@@ -47,7 +47,6 @@ import androidx.fragment.app.Fragment
 import org.godotengine.editor.BaseGodotEditor
 import org.godotengine.editor.BaseGodotEditor.Companion.SNACKBAR_SHOW_DURATION_MS
 import org.godotengine.editor.R
-import org.godotengine.godot.feature.PictureInPictureProvider
 import org.godotengine.godot.utils.DialogUtils
 
 /**
@@ -66,7 +65,7 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 	/**
 	 * Used to be notified of events fired when interacting with the game menu.
 	 */
-	interface GameMenuListener : PictureInPictureProvider {
+	interface GameMenuListener {
 
 		/**
 		 * Kotlin representation of the RuntimeNodeSelect::SelectMode enum in 'scene/debugger/scene_debugger.h'.
@@ -110,6 +109,7 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 		fun isGameEmbeddingSupported(): Boolean
 		fun embedGameOnPlay(embedded: Boolean)
 
+		fun enterPiPMode() {}
 		fun minimizeGameWindow() {}
 		fun closeGameWindow() {}
 
@@ -181,7 +181,10 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 		PopupMenu(context, optionsButton).apply {
 			setOnMenuItemClickListener(this@GameMenuFragment)
 			inflate(R.menu.options_menu)
-			menu.setGroupDividerEnabled(true)
+
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+				menu.setGroupDividerEnabled(true)
+			}
 		}
 	}
 
diff --git a/engine/platform/android/java/lib/build.gradle b/engine/platform/android/java/lib/build.gradle
index 2ee5fe9c..a929d0f7 100644
--- a/engine/platform/android/java/lib/build.gradle
+++ b/engine/platform/android/java/lib/build.gradle
@@ -48,6 +48,12 @@ android {
         buildConfig = true
     }
 
+    buildTypes {
+        dev {
+            initWith debug
+        }
+    }
+
     flavorDimensions = ["products"]
     productFlavors {
         editor {}
@@ -73,11 +79,13 @@ android {
 
     sourceSets {
         debug.jniLibs.srcDirs = ['libs/debug']
+        dev.jniLibs.srcDirs = ['libs/dev']
         release.jniLibs.srcDirs = ['libs/release']
 
         // Editor jni library
         editorRelease.jniLibs.srcDirs = ['libs/tools/release']
         editorDebug.jniLibs.srcDirs = ['libs/tools/debug']
+        editorDev.jniLibs.srcDirs = ['libs/tools/dev']
     }
 
     libraryVariants.all { variant ->
@@ -91,9 +99,9 @@ android {
             throw new GradleException("Invalid build type: $buildType")
         }
 
-        boolean debugBuild = buildType == "debug"
-        boolean debugSymbols = debugBuild
-        boolean runTests = debugBuild
+        boolean devBuild = buildType == "dev"
+        boolean debugSymbols = devBuild
+        boolean runTests = devBuild
         boolean storeRelease = buildType == "release"
         boolean productionBuild = storeRelease
 
@@ -101,13 +109,12 @@ android {
         if (sconsTarget == "template") {
             // Tests are not supported on template builds
             runTests = false
-
-            //noinspection GroovyFallthrough
             switch (buildType) {
                 case "release":
                     sconsTarget += "_release"
                     break
                 case "debug":
+                case "dev":
                 default:
                     sconsTarget += "_debug"
                     break
@@ -116,6 +123,9 @@ android {
 
         // Update the name of the generated library
         def outputSuffix = "${sconsTarget}"
+        if (devBuild) {
+            outputSuffix = "${outputSuffix}.dev"
+        }
         variant.outputs.all { output ->
             output.outputFileName = "godot-lib.${outputSuffix}.aar"
         }
@@ -158,7 +168,7 @@ android {
             def taskName = getSconsTaskName(flavorName, buildType, selectedAbi)
             tasks.create(name: taskName, type: Exec) {
                 executable sconsExecutableFile.absolutePath
-                args "--directory=${pathToRootDir}", "platform=android", "store_release=${storeRelease}", "production=${productionBuild}", "dev_mode=${debugBuild}", "dev_build=${debugBuild}", "debug_symbols=${debugSymbols}", "tests=${runTests}", "target=${sconsTarget}", "arch=${selectedAbi}", "-j" + Runtime.runtime.availableProcessors()
+                args "--directory=${pathToRootDir}", "platform=android", "store_release=${storeRelease}", "production=${productionBuild}", "dev_mode=${devBuild}", "dev_build=${devBuild}", "debug_symbols=${debugSymbols}", "tests=${runTests}", "target=${sconsTarget}", "arch=${selectedAbi}", "-j" + Runtime.runtime.availableProcessors()
             }
 
             // Schedule the tasks so the generated libs are present before the aar file is packaged.
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
index 2940701d..f467d2c8 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
@@ -43,7 +43,6 @@ import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.os.*
 import android.util.Log
-import android.util.Rational
 import android.util.TypedValue
 import android.view.*
 import android.widget.FrameLayout
@@ -58,7 +57,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.google.android.vending.expansion.downloader.*
 import org.godotengine.godot.error.Error
-import org.godotengine.godot.feature.PictureInPictureProvider
 import org.godotengine.godot.input.GodotEditText
 import org.godotengine.godot.input.GodotInputHandler
 import org.godotengine.godot.io.FilePicker
@@ -177,6 +175,7 @@ class Godot private constructor(val context: Context) {
 	 */
 	private var renderViewInitialized = false
 	private var primaryHost: GodotHost? = null
+	private var currentConfig = context.resources.configuration
 
 	/**
 	 * Tracks whether we're in the RESUMED lifecycle state.
@@ -198,7 +197,6 @@ class Godot private constructor(val context: Context) {
 	private var useDebugOpengl = false
 	private var darkMode = false
 	private var backgroundColor: Int = Color.BLACK
-	private var orientation = Configuration.ORIENTATION_UNDEFINED
 
 	internal var containerLayout: FrameLayout? = null
 	var renderView: GodotRenderView? = null
@@ -236,9 +234,7 @@ class Godot private constructor(val context: Context) {
 
 		Log.v(TAG, "InitEngine with params: $commandLineParams")
 
-		val config = context.resources.configuration
-		darkMode = (config.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
-		orientation = config.orientation
+		darkMode = context.resources?.configuration?.uiMode?.and(Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
 
 		beginBenchmarkMeasure("Startup", "Godot::initEngine")
 		try {
@@ -569,14 +565,19 @@ class Godot private constructor(val context: Context) {
 					!isEditorHint() &&
 					java.lang.Boolean.parseBoolean(GodotLib.getGlobal("display/window/per_pixel_transparency/allowed"))
 			Log.d(TAG, "Render view should be transparent: $shouldBeTransparent")
+			renderView = if (usesVulkan()) {
+				if (meetsVulkanRequirements(context.packageManager)) {
+					GodotVulkanRenderView(this, godotInputHandler, shouldBeTransparent)
+				} else if (canFallbackToOpenGL()) {
+					// Fallback to OpenGl.
+					GodotGLRenderView(this, godotInputHandler, xrMode, useDebugOpengl, shouldBeTransparent)
+				} else {
+					throw IllegalStateException(context.getString(R.string.error_missing_vulkan_requirements_message))
+				}
 
-			val nativeRenderer = getNativeRenderer();
-			if (nativeRenderer == "vulkan") {
-				renderView = GodotVulkanRenderView(this, godotInputHandler, shouldBeTransparent)
-			} else if (nativeRenderer == "opengl3") {
-				renderView = GodotGLRenderView(this, godotInputHandler, xrMode, useDebugOpengl, shouldBeTransparent)
 			} else {
-				throw IllegalStateException("No native renderer is available.")
+				// Fallback to OpenGl.
+				GodotGLRenderView(this, godotInputHandler, xrMode, useDebugOpengl, shouldBeTransparent)
 			}
 
 			renderView?.let {
@@ -647,6 +648,9 @@ class Godot private constructor(val context: Context) {
 			})
 
 			renderView?.queueOnRenderThread {
+				for (plugin in pluginRegistry.allPlugins) {
+					plugin.onRegisterPluginWithGodotNative()
+				}
 				setKeepScreenOn(java.lang.Boolean.parseBoolean(GodotLib.getGlobal("display/window/energy_saving/keep_screen_on")))
 			}
 
@@ -715,13 +719,6 @@ class Godot private constructor(val context: Context) {
 		}
 	}
 
-	internal fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
-		Log.v(TAG, "onPictureInPictureModeChanged: $isInPictureInPictureMode")
-		runOnRenderThread {
-			GodotLib.onPictureInPictureModeChanged(isInPictureInPictureMode)
-		}
-	}
-
 	fun onPause(host: GodotHost) {
 		Log.v(TAG, "OnPause: $host")
 		resumed = false
@@ -778,12 +775,12 @@ class Godot private constructor(val context: Context) {
 			}
 		}
 
-		if (orientation != newConfig.orientation) {
-			orientation = newConfig.orientation
+		if (currentConfig.orientation != newConfig.orientation) {
 			runOnRenderThread {
-				GodotLib.onOrientationChange(orientation)
+				GodotLib.onScreenRotationChange(newConfig.orientation)
 			}
 		}
+		currentConfig = newConfig
 	}
 
 	/**
@@ -847,7 +844,6 @@ class Godot private constructor(val context: Context) {
 		}
 
 		for (plugin in pluginRegistry.allPlugins) {
-			plugin.onRegisterPluginWithGodotNative()
 			plugin.onGodotSetupCompleted()
 		}
 		primaryHost?.onGodotSetupCompleted()
@@ -936,25 +932,31 @@ class Godot private constructor(val context: Context) {
 	 */
 	private fun isOnUiThread() = Looper.myLooper() == Looper.getMainLooper()
 
-/**
-	 * Returns the native rendering driver.
+	/**
+	 * Returns true if `Vulkan` is used for rendering.
 	 */
-	private fun getNativeRenderer(): String {
-		val rendererInfo = GodotLib.getRendererInfo(meetsVulkanRequirements(context.packageManager))
-		var renderingDriverChosen = rendererInfo[0]
-		var renderingDriverOriginal = rendererInfo[1]
-		var renderingMethod = rendererInfo[2]
-		var renderingDriverSource = rendererInfo[3]
-		var renderingMethodSource = rendererInfo[4]
-		Log.d(TAG, """renderingDevice: ${renderingDriverChosen} (${renderingDriverSource})
-			renderer: ${renderingMethod} (${renderingMethodSource})""")
-
-		if (renderingDriverOriginal == "vulkan" && renderingDriverChosen == "") {
-			// Throw the exception for the case where Vulkan failed to create and no fallback was available.
-			throw IllegalStateException(context.getString(R.string.error_missing_vulkan_requirements_message))
+	private fun usesVulkan(): Boolean {
+		val rendererInfo = GodotLib.getRendererInfo()
+		var renderingDeviceSource = "ProjectSettings"
+		var renderingDevice = rendererInfo[0]
+		var rendererSource = "ProjectSettings"
+		var renderer = rendererInfo[1]
+		val cmdline = commandLine
+		var index = cmdline.indexOf("--rendering-method")
+		if (index > -1 && cmdline.size > index + 1) {
+			rendererSource = "CommandLine"
+			renderer = cmdline.get(index + 1)
 		}
-
-		return renderingDriverChosen;
+		index = cmdline.indexOf("--rendering-driver")
+		if (index > -1 && cmdline.size > index + 1) {
+			renderingDeviceSource = "CommandLine"
+			renderingDevice = cmdline.get(index + 1)
+		}
+		val result = ("forward_plus" == renderer || "mobile" == renderer) && "vulkan" == renderingDevice
+		Log.d(TAG, """usesVulkan(): ${result}
+			renderingDevice: ${renderingDevice} (${renderingDeviceSource})
+			renderer: ${renderer} (${rendererSource})""")
+		return result
 	}
 
 	/**
@@ -976,8 +978,8 @@ class Godot private constructor(val context: Context) {
 			Log.w(TAG, "The vulkan hardware level does not meet the minimum requirement: 1")
 		}
 
-		// Check for api version 1.1
-		return packageManager.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, 0x401000)
+		// Check for api version 1.0
+		return packageManager.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, 0x400003)
 	}
 
 	private fun setKeepScreenOn(enabled: Boolean) {
@@ -1315,11 +1317,6 @@ class Godot private constructor(val context: Context) {
 		primaryHost?.onEditorWorkspaceSelected(workspace)
 	}
 
-	@Keep
-	private fun nativeOnDistractionFreeModeChanged(enabled: Boolean) {
-		primaryHost?.onDistractionFreeModeChanged(enabled)
-	}
-
 	@Keep
 	private fun nativeBuildEnvConnect(callback: GodotCallable): Boolean {
 		try {
@@ -1379,52 +1376,4 @@ class Godot private constructor(val context: Context) {
 		}
 	}
 
-	@Keep
-	private fun nativeIsPiPModeSupported(): Boolean {
-		val hostActivity = getActivity()
-		if (hostActivity is PictureInPictureProvider) {
-			return hostActivity.isPiPModeSupported()
-		}
-		return false
-	}
-
-	@Keep
-	private fun nativeIsInPiPMode(): Boolean {
-		val hostActivity = getActivity()
-		if (hostActivity is GodotActivity) {
-			return hostActivity.isInPictureInPictureMode
-		}
-		return false
-	}
-
-	@Keep
-	private fun nativeEnterPiPMode() {
-		val hostActivity = getActivity()
-		if (hostActivity is PictureInPictureProvider) {
-			runOnHostThread {
-				hostActivity.enterPiPMode()
-			}
-		}
-	}
-
-	@Keep
-	private fun nativeSetPiPModeAspectRatio(numerator: Int, denominator: Int) {
-		val hostActivity = getActivity()
-		if (hostActivity is GodotActivity) {
-			runOnHostThread {
-				hostActivity.updatePiPParams(aspectRatio = Rational(numerator, denominator))
-			}
-		}
-	}
-
-	@Keep
-	private fun nativeSetAutoEnterPiPModeOnBackground(autoEnterPiPOnBackground: Boolean) {
-		val hostActivity = getActivity()
-		if (hostActivity is GodotActivity) {
-			runOnHostThread {
-				hostActivity.updatePiPParams(enableAutoEnter = autoEnterPiPOnBackground)
-			}
-		}
-	}
-
 }
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
index 938bdb00..b4547d7f 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotActivity.kt
@@ -31,25 +31,17 @@
 package org.godotengine.godot
 
 import android.app.Activity
-import android.app.PictureInPictureParams
 import android.content.ComponentName
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Rect
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.util.Rational
-import android.view.View
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.FragmentActivity
-import org.godotengine.godot.feature.PictureInPictureProvider
 import org.godotengine.godot.utils.CommandLineFileParser
 import org.godotengine.godot.utils.PermissionsUtil
 import org.godotengine.godot.utils.ProcessPhoenix
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicReference
 
 /**
  * Base abstract activity for Android apps intending to use Godot as the primary screen.
@@ -57,7 +49,7 @@ import java.util.concurrent.atomic.AtomicReference
  * Also a reference implementation for how to setup and use the [GodotFragment] fragment
  * within an Android app.
  */
-abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPictureProvider {
+abstract class GodotActivity : FragmentActivity(), GodotHost {
 
 	companion object {
 		private val TAG = GodotActivity::class.java.simpleName
@@ -73,12 +65,6 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 		private final val DEFAULT_WINDOW_ID = 664;
 	}
 
-	/**
-	 * Set to true if the activity should automatically enter picture-in-picture when put in the background.
-	 */
-	private val pipAspectRatio = AtomicReference<Rational>()
-	private val autoEnterPiP = AtomicBoolean(false)
-	private val gameViewSourceRectHint = Rect()
 	private val commandLineParams = ArrayList<String>()
 	/**
 	 * Interaction with the [Godot] object is delegated to the [GodotFragment] class.
@@ -153,13 +139,6 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 				.setPrimaryNavigationFragment(godotFragment)
 				.commitNowAllowingStateLoss()
 		}
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val gameView = findViewById<View>(R.id.godot_fragment_container)
-			gameView?.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom ->
-				gameView.getGlobalVisibleRect(gameViewSourceRectHint)
-			}
-		}
 	}
 
 	override fun onNewGodotInstanceRequested(args: Array<String>): Int {
@@ -170,7 +149,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 			.putExtra(EXTRA_COMMAND_LINE_PARAMS, args)
 		triggerRebirth(null, intent)
 		// fake 'process' id returned by create_instance() etc
-		return DEFAULT_WINDOW_ID
+		return DEFAULT_WINDOW_ID;
 	}
 
 	protected fun triggerRebirth(bundle: Bundle?, intent: Intent) {
@@ -188,15 +167,6 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 		super.onDestroy()
 	}
 
-	override fun onStop() {
-		super.onStop()
-
-		if (isInPictureInPictureMode && !isFinishing) {
-			// We get in this state when PiP is closed, so we terminate the activity.
-			finish()
-		}
-	}
-
 	override fun onGodotForceQuit(instance: Godot) {
 		runOnUiThread { terminateGodotInstance(instance) }
 	}
@@ -226,31 +196,13 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 		}
 	}
 
-	override fun onGodotSetupCompleted() {
-		super.onGodotSetupCompleted()
-
-		if (isPiPEnabled()) {
-			try {
-				// Update the aspect ratio for picture-in-picture mode.
-				val viewportWidth = Integer.parseInt(GodotLib.getGlobal("display/window/size/viewport_width"))
-				val viewportHeight = Integer.parseInt(GodotLib.getGlobal("display/window/size/viewport_height"))
-				pipAspectRatio.set(Rational(viewportWidth, viewportHeight))
-			} catch (e: NumberFormatException) {
-				Log.w(TAG, "Unable to parse viewport dimensions.", e)
-			}
-
-			runOnHostThread { updatePiPParams() }
-		}
-	}
-
 	override fun onNewIntent(newIntent: Intent) {
 		intent = sanitizeLaunchIntent(newIntent)
 		super.onNewIntent(intent)
 		handleStartIntent(intent, false)
 	}
 
-	@CallSuper
-	protected open fun handleStartIntent(intent: Intent, newLaunch: Boolean) {
+	private fun handleStartIntent(intent: Intent, newLaunch: Boolean) {
 		if (!newLaunch) {
 			val newLaunchRequested = intent.getBooleanExtra(EXTRA_NEW_LAUNCH, false)
 			if (newLaunchRequested) {
@@ -304,56 +256,4 @@ abstract class GodotActivity : FragmentActivity(), GodotHost, PictureInPicturePr
 
 	@CallSuper
 	override fun getCommandLine(): MutableList<String> = commandLineParams
-
-	override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
-		super.onPictureInPictureModeChanged(isInPictureInPictureMode)
-		godot?.onPictureInPictureModeChanged(isInPictureInPictureMode)
-	}
-
-	/**
-	 * Returns true if picture-in-picture (PiP) mode is supported.
-	 */
-	override fun isPiPModeSupported() = isPiPEnabled() && packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-
-	/**
-	 * Returns true if the current activity has enabled picture-in-picture in its manifest declaration using
-	 * 'android:supportsPictureInPicture="true"'
-	 */
-	protected open fun isPiPEnabled() = false
-
-	internal fun updatePiPParams(enableAutoEnter: Boolean = autoEnterPiP.get(), aspectRatio: Rational? = pipAspectRatio.get()) {
-		if (isPiPModeSupported()) {
-			autoEnterPiP.set(enableAutoEnter)
-			pipAspectRatio.set(aspectRatio)
-
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				val builder = PictureInPictureParams.Builder()
-					.setSourceRectHint(gameViewSourceRectHint)
-					.setAspectRatio(aspectRatio)
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-					builder.setSeamlessResizeEnabled(false)
-						.setAutoEnterEnabled(enableAutoEnter)
-				}
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-					builder.setExpandedAspectRatio(aspectRatio)
-				}
-				setPictureInPictureParams(builder.build())
-			}
-		}
-	}
-
-	override fun enterPiPMode() {
-		if (isPiPModeSupported()) {
-			updatePiPParams()
-
-			Log.v(TAG, "Entering PiP mode")
-			enterPictureInPictureMode()
-		}
-	}
-
-	override fun onUserLeaveHint() {
-		if (autoEnterPiP.get()) {
-			enterPiPMode()
-		}
-	}
 }
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java
index 4a08d976..1ecbc2ac 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java
@@ -496,13 +496,6 @@ public class GodotFragment extends Fragment implements IDownloaderClient, GodotH
 		}
 	}
 
-	@Override
-	public void onDistractionFreeModeChanged(Boolean enabled) {
-		if (parentHost != null) {
-			parentHost.onDistractionFreeModeChanged(enabled);
-		}
-	}
-
 	@Override
 	public BuildProvider getBuildProvider() {
 		if (parentHost != null) {
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java
index 40c268d4..e8be6e88 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java
@@ -153,11 +153,6 @@ public interface GodotHost {
 	 */
 	default void onEditorWorkspaceSelected(String workspace) {}
 
-	/**
-	 * Triggered when the editor's distraction-free mode changes.
-	 */
-	default void onDistractionFreeModeChanged(Boolean enabled) {}
-
 	/**
 	 * Runs the specified action on a host provided thread.
 	 */
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
index c6d780ce..38e32714 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
@@ -192,14 +192,11 @@ public class GodotLib {
 	/**
 	 * Used to get info about the current rendering system.
 	 *
-	 * @return A String array with three elements:
-	 *         [0] Rendering driver name chosen for rendering.
-	 *         [1] Rendering driver name chosen before any fallbacks were applied.
-	 *         [2] Rendering method.
-	 *         [3] Source where the rendering driver was chosen from.
-	 *         [4] Source where the rendering method was chosen from.
+	 * @return A String array with two elements:
+	 *         [0] Rendering driver name.
+	 *         [1] Rendering method.
 	 */
-	public static native String[] getRendererInfo(boolean p_vulkan_requirements_met);
+	public static native String[] getRendererInfo();
 
 	/**
 	 * Used to access Godot's editor settings.
@@ -302,7 +299,7 @@ public class GodotLib {
 	 * Invoked when the screen orientation changes.
 	 * @param orientation the new screen orientation
 	 */
-	static native void onOrientationChange(int orientation);
+	static native void onScreenRotationChange(int orientation);
 
 	/**
 	 * @return true if input must be dispatched from the render thread. If false, input is
@@ -320,6 +317,4 @@ public class GodotLib {
 	static native boolean isProjectManagerHint();
 
 	static native boolean hasFeature(String feature);
-
-	static native void onPictureInPictureModeChanged(boolean isInPictureInPictureMode);
 }
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt
index 478dbab7..7c495e85 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt
@@ -38,7 +38,4 @@ package org.godotengine.godot.editor.utils
 object EditorUtils {
 	@JvmStatic
 	external fun runScene(scene: String, sceneArgs: Array<String>)
-
-	@JvmStatic
-	external fun toggleTitleBar(visible: Boolean)
 }
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/feature/PictureInPictureProvider.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/feature/PictureInPictureProvider.kt
deleted file mode 100644
index c4979ce0..00000000
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/feature/PictureInPictureProvider.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************/
-/*  PictureInPictureProvider.kt                                           */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-package org.godotengine.godot.feature
-
-/**
- * Provides APIs to enable picture-in-picture.
- */
-interface PictureInPictureProvider {
-
-	fun enterPiPMode()
-
-	fun isPiPModeSupported(): Boolean
-}
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java
index 21d0e2c3..770364e5 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotEditText.java
@@ -57,7 +57,7 @@ public class GodotEditText extends EditText {
 	private final static int HANDLER_OPEN_IME_KEYBOARD = 2;
 	private final static int HANDLER_CLOSE_IME_KEYBOARD = 3;
 
-	// Enum must be kept up-to-date with DisplayServerEnums::VirtualKeyboardType
+	// Enum must be kept up-to-date with DisplayServer::VirtualKeyboardType
 	public enum VirtualKeyboardType {
 		KEYBOARD_TYPE_DEFAULT,
 		KEYBOARD_TYPE_MULTILINE,
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt
index a2d743e8..037898cd 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt
@@ -57,11 +57,6 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 
 	var scrollDeadzoneDisabled = false
 
-	/**
-	 * Enable haptic feedback on long-press right-click
-	 */
-	var hapticFeedbackEnabled = false
-
 	private var nextDownIsDoubleTap = false
 	private var dragInProgress = false
 	private var scaleInProgress = false
@@ -85,9 +80,6 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	override fun onLongPress(event: MotionEvent) {
 		val toolType = GodotInputHandler.getEventToolType(event)
 		if (toolType != MotionEvent.TOOL_TYPE_MOUSE) {
-			if (hapticFeedbackEnabled) {
-				inputHandler.performHapticFeedback()
-			}
 			contextClickRouter(event)
 		}
 	}
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
index b7c3d225..ccf4412e 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
@@ -47,7 +47,6 @@ import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.view.GestureDetector;
-import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -134,23 +133,6 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 		this.godotGestureHandler.setScrollDeadzoneDisabled(disable);
 	}
 
-	/**
-	 * Enable haptic feedback (vibration) when a long-press right-click is triggered.
-	 */
-	public void enableHapticFeedback(boolean enable) {
-		this.godotGestureHandler.setHapticFeedbackEnabled(enable);
-	}
-
-	/**
-	 * Perform haptic feedback on the render view.
-	 */
-	void performHapticFeedback() {
-		GodotRenderView view = godot.getRenderView();
-		if (view != null) {
-			view.getView().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-		}
-	}
-
 	/**
 	 * Enable multi-fingers pan & scale gestures. This is false by default.
 	 * <p>
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt
index 5d20e645..b426decf 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/io/file/DataAccess.kt
@@ -203,10 +203,8 @@ internal abstract class DataAccess {
 	abstract fun write(buffer: ByteBuffer): Boolean
 
 	fun seekFromEnd(positionFromEnd: Long) {
-		val positionFromBeginning = size() + positionFromEnd
-		if (positionFromBeginning >= 0) {
-			seek(positionFromBeginning)
-		}
+		val positionFromBeginning = max(0, size() - positionFromEnd)
+		seek(positionFromBeginning)
 	}
 
 	abstract class FileChannelDataAccess(private val filePath: String) : DataAccess() {
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
index 19c9d51b..4394d514 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt
@@ -32,13 +32,10 @@ package org.godotengine.godot.plugin
 
 import android.content.Intent
 import android.util.Log
-import androidx.annotation.Keep
 import androidx.core.net.toUri
 
 import org.godotengine.godot.Godot
 import org.godotengine.godot.variant.Callable
-import java.lang.reflect.InvocationHandler
-import java.lang.reflect.Proxy
 
 /**
  * Built-in Godot Android plugin used to provide access to the Android runtime capabilities.
@@ -46,76 +43,7 @@ import java.lang.reflect.Proxy
  * @see <a href="https://docs.godotengine.org/en/latest/tutorials/platform/android/javaclasswrapper_and_androidruntimeplugin.html">Integrating with Android APIs</a>
  */
 class AndroidRuntimePlugin(godot: Godot) : GodotPlugin(godot) {
-
-	companion object {
-		private val TAG = AndroidRuntimePlugin::class.java.simpleName
-
-		/**
-		 * Helper method used to generate Godot Proxy instances.
-		 */
-		@JvmStatic
-		@Keep
-		private fun generateProxyInstance(interfaces: Array<String>, invocationHandler: InvocationHandler): Any? {
-			try {
-				val interfaceClasses = interfaces.map { Class.forName(it) }.toTypedArray()
-
-				val proxy = Proxy.newProxyInstance(invocationHandler.javaClass.classLoader, interfaceClasses, invocationHandler)
-				return proxy
-			} catch (e: Exception) {
-				Log.w(TAG, "Error generating Godot proxy for interfaces ${interfaces.joinToString(",")}", e)
-			}
-			return null
-		}
-
-		/**
-		 * Utility method used to create [java.lang.reflect.Proxy] instance wrapping a given Godot [Callable].
-		 *
-		 * The [Proxy] instance is used to implement one SAM interface with the [Callable] serving as the delegate
-		 * implementation for the SAM interface overridden methods.
-		 */
-		@JvmStatic
-		@Keep
-		private fun createProxyFromGodotCallable(interfaceName: String, godotCallable: Callable): Any? {
-			return generateProxyInstance(arrayOf(interfaceName)) { proxy, method, args ->
-				when (method.name) {
-					// We automatically handle 'toString', 'equals' and 'hashCode' to simplify the task of the caller
-					// and provide consistency.
-					"toString" -> "Godot Callable Proxy for $interfaceName"
-					"equals" -> proxy == args[0]
-					"hashCode" -> godotCallable.hashCode()
-
-					// Invocation for the interface single abstract method falls here and is dispatched to the
-					// Godot [Callable].
-					else -> godotCallable.call(*args)
-				}
-			}
-		}
-
-		/**
-		 * Utility method used to create [java.lang.reflect.Proxy] instance wrapping a given Godot Object represented by
-		 * its ObjectID.
-		 *
-		 * The [Proxy] instance is used to implement one or multiple interfaces with the Object represented by
-		 * [godotObjectID] serving as the delegate implementation for the interface(s) overridden methods.
-		 */
-		@JvmStatic
-		@Keep
-		private fun createProxyFromGodotObjectID(godotObjectID: Long, interfaces: Array<String>): Any? {
-			return generateProxyInstance(interfaces) { proxy, method, args ->
-				when (val methodName = method.name) {
-					// We automatically handle 'toString', 'equals' and 'hashCode' to simplify the task of the caller
-					// and provide consistency.
-					"toString" -> "Godot Object Proxy for ${interfaces.joinToString(",")}"
-					"equals" -> proxy == args[0]
-					"hashCode" -> godotObjectID
-
-					// Invocation for the remaining interface(s) methods falls here and is dispatched to the
-					// Godot Object.
-					else -> Callable.call(godotObjectID, methodName, *args)
-				}
-			}
-		}
-	}
+	private val TAG = AndroidRuntimePlugin::class.java.simpleName
 
 	override fun getPluginName() = "AndroidRuntime"
 
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java
index 62a26d2e..bba17a28 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/tts/GodotTTS.java
@@ -57,7 +57,7 @@ import java.util.Set;
  */
 @Keep
 public class GodotTTS extends UtteranceProgressListener implements TextToSpeech.OnInitListener {
-	// Note: These constants must be in sync with DisplayServerEnums::TTSUtteranceEvent enum from "servers/display/display_server.h".
+	// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display/display_server.h".
 	final private static int EVENT_START = 0;
 	final private static int EVENT_END = 1;
 	final private static int EVENT_CANCEL = 2;
diff --git a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt
index 72d9efef..738f27e8 100644
--- a/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt
+++ b/engine/platform/android/java/lib/src/main/java/org/godotengine/godot/utils/BenchmarkUtils.kt
@@ -64,7 +64,7 @@ private val benchmarkTracker = Collections.synchronizedMap(LinkedHashMap<Pair<St
  * Note: Only enabled on 'editorDev' build variant.
  */
 fun beginBenchmarkMeasure(scope: String, label: String) {
-	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "debug") {
+	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "dev") {
 		return
 	}
 	val key = Pair(scope, label)
@@ -84,7 +84,7 @@ fun beginBenchmarkMeasure(scope: String, label: String) {
  */
 @JvmOverloads
 fun endBenchmarkMeasure(scope: String, label: String, dumpBenchmark: Boolean = false) {
-	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "debug") {
+	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "dev") {
 		return
 	}
 	val key = Pair(scope, label)
@@ -109,7 +109,7 @@ fun endBenchmarkMeasure(scope: String, label: String, dumpBenchmark: Boolean = f
  */
 @JvmOverloads
 fun dumpBenchmark(fileAccessHandler: FileAccessHandler? = null, filepath: String? = benchmarkFile) {
-	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "debug") {
+	if (BuildConfig.FLAVOR != "editor" || BuildConfig.BUILD_TYPE != "dev") {
 		return
 	}
 	if (!useBenchmark || benchmarkTracker.isEmpty()) {
diff --git a/engine/platform/android/java_class_wrapper.cpp b/engine/platform/android/java_class_wrapper.cpp
index f1a9b689..051775f0 100644
--- a/engine/platform/android/java_class_wrapper.cpp
+++ b/engine/platform/android/java_class_wrapper.cpp
@@ -1461,58 +1461,74 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 	return false;
 }
 
-bool JavaClassWrapper::_wrap_class_components(JNIEnv *p_env, const Ref<JavaClass> &p_java_class, jclass p_class, bool p_allow_non_public_methods_access) {
-	ERR_FAIL_NULL_V(p_class, false);
-
-	jobjectArray constructors = (jobjectArray)p_env->CallObjectMethod(p_class, Class_getConstructors);
-	if (p_env->ExceptionCheck()) {
-		p_env->ExceptionDescribe();
-		p_env->ExceptionClear();
+Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_non_public_methods_access) {
+	String class_name_dots = p_class.replace_char('/', '.');
+	if (class_cache.has(class_name_dots)) {
+		return class_cache[class_name_dots];
 	}
-	ERR_FAIL_NULL_V(constructors, false);
 
-	jobjectArray methods = (jobjectArray)p_env->CallObjectMethod(p_class, Class_getDeclaredMethods);
-	if (p_env->ExceptionCheck()) {
-		p_env->ExceptionDescribe();
-		p_env->ExceptionClear();
+	JNIEnv *env = get_jni_env();
+	ERR_FAIL_NULL_V(env, Ref<JavaClass>());
+
+	jclass bclass = jni_find_class(env, class_name_dots.replace_char('.', '/').utf8().get_data());
+	ERR_FAIL_NULL_V_MSG(bclass, Ref<JavaClass>(), vformat("Java class '%s' not found.", p_class));
+
+	jobjectArray constructors = (jobjectArray)env->CallObjectMethod(bclass, Class_getConstructors);
+	if (env->ExceptionCheck()) {
+		env->ExceptionDescribe();
+		env->ExceptionClear();
 	}
-	ERR_FAIL_NULL_V(methods, false);
+	ERR_FAIL_NULL_V(constructors, Ref<JavaClass>());
 
-	int constructor_count = p_env->GetArrayLength(constructors);
-	int method_count = p_env->GetArrayLength(methods);
+	jobjectArray methods = (jobjectArray)env->CallObjectMethod(bclass, Class_getDeclaredMethods);
+	if (env->ExceptionCheck()) {
+		env->ExceptionDescribe();
+		env->ExceptionClear();
+	}
+	ERR_FAIL_NULL_V(methods, Ref<JavaClass>());
+
+	Ref<JavaClass> java_class = memnew(JavaClass);
+	java_class->java_class_name = class_name_dots;
+	Vector<String> class_name_parts = class_name_dots.split(".");
+	java_class->java_constructor_name = class_name_parts[class_name_parts.size() - 1];
+	java_class->_class = (jclass)env->NewGlobalRef(bclass);
+	class_cache[class_name_dots] = java_class;
+
+	int constructor_count = env->GetArrayLength(constructors);
+	int method_count = env->GetArrayLength(methods);
 
 	int methods_and_constructors_count = method_count + constructor_count;
 	for (int i = 0; i < methods_and_constructors_count; i++) {
 		bool is_constructor = i < constructor_count;
 		jobject obj = is_constructor
-				? p_env->GetObjectArrayElement(constructors, i)
-				: p_env->GetObjectArrayElement(methods, i - constructor_count);
+				? env->GetObjectArrayElement(constructors, i)
+				: env->GetObjectArrayElement(methods, i - constructor_count);
 		ERR_CONTINUE(!obj);
 
 		String str_method;
 		if (is_constructor) {
 			str_method = "<init>";
 		} else {
-			jstring name = (jstring)p_env->CallObjectMethod(obj, Method_getName);
-			str_method = jstring_to_string(name, p_env);
-			p_env->DeleteLocalRef(name);
+			jstring name = (jstring)env->CallObjectMethod(obj, Method_getName);
+			str_method = jstring_to_string(name, env);
+			env->DeleteLocalRef(name);
 		}
 
 		Vector<String> params;
 
-		jint mods = p_env->CallIntMethod(obj, is_constructor ? Constructor_getModifiers : Method_getModifiers);
+		jint mods = env->CallIntMethod(obj, is_constructor ? Constructor_getModifiers : Method_getModifiers);
 		bool is_public = (mods & 0x0001) != 0; // java.lang.reflect.Modifier.PUBLIC
 
 		if (!is_public && (is_constructor || !p_allow_non_public_methods_access)) {
-			p_env->DeleteLocalRef(obj);
+			env->DeleteLocalRef(obj);
 			continue; //not public bye
 		}
 
-		jobjectArray param_types = (jobjectArray)p_env->CallObjectMethod(obj, is_constructor ? Constructor_getParameterTypes : Method_getParameterTypes);
-		int count = p_env->GetArrayLength(param_types);
+		jobjectArray param_types = (jobjectArray)env->CallObjectMethod(obj, is_constructor ? Constructor_getParameterTypes : Method_getParameterTypes);
+		int count = env->GetArrayLength(param_types);
 
-		if (!p_java_class->methods.has(str_method)) {
-			p_java_class->methods[str_method] = List<JavaClass::MethodInfo>();
+		if (!java_class->methods.has(str_method)) {
+			java_class->methods[str_method] = List<JavaClass::MethodInfo>();
 		}
 
 		JavaClass::MethodInfo mi;
@@ -1523,24 +1539,24 @@ bool JavaClassWrapper::_wrap_class_components(JNIEnv *p_env, const Ref<JavaClass
 		String signature = "(";
 
 		for (int j = 0; j < count; j++) {
-			jobject obj2 = p_env->GetObjectArrayElement(param_types, j);
+			jobject obj2 = env->GetObjectArrayElement(param_types, j);
 			String strsig;
 			uint32_t sig = 0;
-			if (!_get_type_sig(p_env, obj2, sig, strsig)) {
+			if (!_get_type_sig(env, obj2, sig, strsig)) {
 				valid = false;
-				p_env->DeleteLocalRef(obj2);
+				env->DeleteLocalRef(obj2);
 				break;
 			}
 			signature += strsig;
 			mi.param_types.push_back(sig);
 			mi.param_sigs.push_back(strsig);
-			p_env->DeleteLocalRef(obj2);
+			env->DeleteLocalRef(obj2);
 		}
 
 		if (!valid) {
-			print_line("Method can't be bound (unsupported arguments): " + p_java_class->java_class_name + "::" + str_method);
-			p_env->DeleteLocalRef(obj);
-			p_env->DeleteLocalRef(param_types);
+			print_line("Method can't be bound (unsupported arguments): " + class_name_dots + "::" + str_method);
+			env->DeleteLocalRef(obj);
+			env->DeleteLocalRef(param_types);
 			continue;
 		}
 
@@ -1550,27 +1566,27 @@ bool JavaClassWrapper::_wrap_class_components(JNIEnv *p_env, const Ref<JavaClass
 			signature += "V";
 			mi.return_type = JavaClass::ARG_TYPE_CLASS;
 		} else {
-			jobject return_type = (jobject)p_env->CallObjectMethod(obj, Method_getReturnType);
+			jobject return_type = (jobject)env->CallObjectMethod(obj, Method_getReturnType);
 
 			String strsig;
 			uint32_t sig = 0;
-			if (!_get_type_sig(p_env, return_type, sig, strsig)) {
-				print_line("Method can't be bound (unsupported return type): " + p_java_class->java_class_name + "::" + str_method);
-				p_env->DeleteLocalRef(obj);
-				p_env->DeleteLocalRef(param_types);
-				p_env->DeleteLocalRef(return_type);
+			if (!_get_type_sig(env, return_type, sig, strsig)) {
+				print_line("Method can't be bound (unsupported return type): " + class_name_dots + "::" + str_method);
+				env->DeleteLocalRef(obj);
+				env->DeleteLocalRef(param_types);
+				env->DeleteLocalRef(return_type);
 				continue;
 			}
 
 			signature += strsig;
 			mi.return_type = sig;
 
-			p_env->DeleteLocalRef(return_type);
+			env->DeleteLocalRef(return_type);
 		}
 
 		bool discard = false;
 
-		for (List<JavaClass::MethodInfo>::Element *E = p_java_class->methods[str_method].front(); E; E = E->next()) {
+		for (List<JavaClass::MethodInfo>::Element *E = java_class->methods[str_method].front(); E; E = E->next()) {
 			float new_likeliness = 0;
 			float existing_likeliness = 0;
 
@@ -1601,7 +1617,7 @@ bool JavaClassWrapper::_wrap_class_components(JNIEnv *p_env, const Ref<JavaClass
 			}
 
 			if (new_likeliness > existing_likeliness) {
-				p_java_class->methods[str_method].erase(E);
+				java_class->methods[str_method].erase(E);
 				break;
 			} else {
 				discard = true;
@@ -1610,202 +1626,72 @@ bool JavaClassWrapper::_wrap_class_components(JNIEnv *p_env, const Ref<JavaClass
 
 		if (!discard) {
 			if (mi._static) {
-				mi.method = p_env->GetStaticMethodID(p_class, str_method.utf8().get_data(), signature.utf8().get_data());
+				mi.method = env->GetStaticMethodID(bclass, str_method.utf8().get_data(), signature.utf8().get_data());
 			} else {
-				mi.method = p_env->GetMethodID(p_class, str_method.utf8().get_data(), signature.utf8().get_data());
+				mi.method = env->GetMethodID(bclass, str_method.utf8().get_data(), signature.utf8().get_data());
 			}
 
-			if (p_env->ExceptionCheck()) {
+			if (env->ExceptionCheck()) {
 				// Exceptions may be thrown when trying to access hidden methods; write the exception to the logs and continue.
-				p_env->ExceptionDescribe();
-				p_env->ExceptionClear();
+				env->ExceptionDescribe();
+				env->ExceptionClear();
 				continue;
 			}
 
 			if (mi.method) {
-				p_java_class->methods[str_method].push_back(mi);
+				java_class->methods[str_method].push_back(mi);
 			}
 		}
 
-		p_env->DeleteLocalRef(obj);
-		p_env->DeleteLocalRef(param_types);
+		env->DeleteLocalRef(obj);
+		env->DeleteLocalRef(param_types);
 	}
 
-	p_env->DeleteLocalRef(constructors);
-	p_env->DeleteLocalRef(methods);
+	env->DeleteLocalRef(constructors);
+	env->DeleteLocalRef(methods);
 
-	jobjectArray fields = (jobjectArray)p_env->CallObjectMethod(p_class, Class_getFields);
+	jobjectArray fields = (jobjectArray)env->CallObjectMethod(bclass, Class_getFields);
 
-	int count = p_env->GetArrayLength(fields);
+	int count = env->GetArrayLength(fields);
 
 	for (int i = 0; i < count; i++) {
-		jobject obj = p_env->GetObjectArrayElement(fields, i);
+		jobject obj = env->GetObjectArrayElement(fields, i);
 		ERR_CONTINUE(!obj);
 
-		jstring name = (jstring)p_env->CallObjectMethod(obj, Field_getName);
-		String str_field = jstring_to_string(name, p_env);
-		p_env->DeleteLocalRef(name);
-		int mods = p_env->CallIntMethod(obj, Field_getModifiers);
+		jstring name = (jstring)env->CallObjectMethod(obj, Field_getName);
+		String str_field = jstring_to_string(name, env);
+		env->DeleteLocalRef(name);
+		int mods = env->CallIntMethod(obj, Field_getModifiers);
 		if ((mods & 0x8) && (mods & 0x1)) { //static public!
 
-			jobject objc = p_env->CallObjectMethod(obj, Field_get, nullptr);
+			jobject objc = env->CallObjectMethod(obj, Field_get, nullptr);
 			if (objc) {
 				uint32_t sig;
 				String strsig;
-				jclass cl = p_env->GetObjectClass(objc);
-				if (JavaClassWrapper::_get_type_sig(p_env, cl, sig, strsig)) {
+				jclass cl = env->GetObjectClass(objc);
+				if (JavaClassWrapper::_get_type_sig(env, cl, sig, strsig)) {
 					if ((sig & JavaClass::ARG_TYPE_MASK) <= JavaClass::ARG_TYPE_STRING) {
 						Variant value;
-						if (JavaClass::_convert_object_to_variant(p_env, objc, value, sig)) {
-							p_java_class->constant_map[str_field] = value;
+						if (JavaClass::_convert_object_to_variant(env, objc, value, sig)) {
+							java_class->constant_map[str_field] = value;
 						}
 					}
 				}
 
-				p_env->DeleteLocalRef(cl);
+				env->DeleteLocalRef(cl);
 			}
 
-			p_env->DeleteLocalRef(objc);
+			env->DeleteLocalRef(objc);
 		}
-		p_env->DeleteLocalRef(obj);
+		env->DeleteLocalRef(obj);
 	}
 
-	p_env->DeleteLocalRef(fields);
-	return true;
-}
-
-Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_non_public_methods_access) {
-	String class_name_dots = p_class.replace_char('/', '.');
-	if (class_cache.has(class_name_dots)) {
-		return class_cache[class_name_dots];
-	}
-
-	JNIEnv *env = get_jni_env();
-	ERR_FAIL_NULL_V(env, Ref<JavaClass>());
-
-	jclass bclass = jni_find_class(env, class_name_dots.replace_char('.', '/').utf8().get_data());
-	ERR_FAIL_NULL_V_MSG(bclass, Ref<JavaClass>(), vformat("Java class '%s' not found.", p_class));
-
-	Ref<JavaClass> java_class;
-	java_class.instantiate();
-	java_class->java_class_name = class_name_dots;
-	Vector<String> class_name_parts = class_name_dots.split(".");
-	java_class->java_constructor_name = class_name_parts[class_name_parts.size() - 1];
-	java_class->_class = (jclass)env->NewGlobalRef(bclass);
-	java_class->is_interface = env->CallBooleanMethod(bclass, Class_isInterface);
-
-	bool class_components_configured;
-	if (_is_proxy_class(env, bclass)) {
-		// Proxy class components must be setup using the interfaces they implement.
-		jobjectArray interfaces = (jobjectArray)env->CallObjectMethod(bclass, Class_getInterfaces);
-		if (env->ExceptionCheck()) {
-			env->ExceptionDescribe();
-			env->ExceptionClear();
-		}
-		int interfaces_count = interfaces == nullptr ? 0 : env->GetArrayLength(interfaces);
-		for (int i = 0; i < interfaces_count; i++) {
-			jclass interface = (jclass)env->GetObjectArrayElement(interfaces, i);
-			ERR_CONTINUE(!interface);
-
-			jstring j_interface_name = (jstring)env->CallObjectMethod(interface, Class_getName);
-			String interface_name = jstring_to_string(j_interface_name, env);
-			env->DeleteLocalRef(j_interface_name);
-			if (!_wrap_class_components(env, java_class, interface, p_allow_non_public_methods_access)) {
-				ERR_PRINT(vformat("Unable to set up components for proxy class interface %s.", interface_name));
-				continue;
-			}
-
-			class_components_configured = true;
-		}
-	} else {
-		class_components_configured = _wrap_class_components(env, java_class, bclass, p_allow_non_public_methods_access);
-	}
+	env->DeleteLocalRef(fields);
 	env->DeleteLocalRef(bclass);
 
-	if (!class_components_configured) {
-		java_class.unref();
-		return Ref<JavaClass>();
-	}
-
-	// Cache the initialized JavaClass instance.
-	class_cache[class_name_dots] = java_class;
-
 	return java_class;
 }
 
-Ref<JavaObject> JavaClassWrapper::create_sam_callback(const String &p_sam_interface, const Callable &p_callable) {
-	JNIEnv *env = get_jni_env();
-	ERR_FAIL_NULL_V(env, Ref<JavaObject>());
-	ERR_FAIL_NULL_V(android_runtime_class, Ref<JavaObject>());
-	ERR_FAIL_NULL_V(ARP_create_proxy_from_godot_callable, Ref<JavaObject>());
-
-	Ref<JavaClass> interface_class = wrap(p_sam_interface);
-	if (interface_class.is_null()) {
-		ERR_PRINT(vformat("Invalid java class: %s.", p_sam_interface));
-		return Ref<JavaObject>();
-	}
-	if (!interface_class->is_interface) {
-		ERR_PRINT(vformat("Java class %s must be an interface.", p_sam_interface));
-		return Ref<JavaObject>();
-	}
-
-	if (interface_class->methods.size() != 1) {
-		ERR_PRINT(vformat("%s must be a Single Abstract Method (SAM) interface.", p_sam_interface));
-		return Ref<JavaObject>();
-	}
-
-	jobject j_callable = callable_to_jcallable(env, p_callable);
-	jstring j_interface = env->NewStringUTF(p_sam_interface.utf8().get_data());
-
-	jobject proxy = env->CallStaticObjectMethod(android_runtime_class, ARP_create_proxy_from_godot_callable, j_interface, j_callable);
-	Ref<JavaObject> result = _jobject_to_variant(env, proxy);
-
-	env->DeleteLocalRef(j_callable);
-	env->DeleteLocalRef(j_interface);
-	env->DeleteLocalRef(proxy);
-
-	return result;
-}
-
-Ref<JavaObject> JavaClassWrapper::create_proxy(const Object *p_object, const PackedStringArray &p_interfaces) {
-	ERR_FAIL_NULL_V(p_object, Ref<JavaObject>());
-	ERR_FAIL_COND_V(p_interfaces.is_empty(), Ref<JavaObject>());
-
-	JNIEnv *env = get_jni_env();
-	ERR_FAIL_NULL_V(env, Ref<JavaObject>());
-	ERR_FAIL_NULL_V(android_runtime_class, Ref<JavaObject>());
-	ERR_FAIL_NULL_V(ARP_create_proxy_from_godot_callable, Ref<JavaObject>());
-
-	for (const String &interface_name : p_interfaces) {
-		Ref<JavaClass> interface_class = wrap(interface_name);
-		if (interface_class.is_null()) {
-			ERR_PRINT(vformat("Invalid java class: %s.", interface_name));
-			return Ref<JavaObject>();
-		}
-
-		if (!interface_class->is_interface) {
-			ERR_PRINT(vformat("Java class %s must be an interface.", interface_name));
-			return Ref<JavaObject>();
-		}
-	}
-
-	jlong object_id = p_object->get_instance_id();
-	jobjectArray j_interfaces = env->NewObjectArray(p_interfaces.size(), jni_find_class(env, "java/lang/String"), nullptr);
-	for (int i = 0; i < p_interfaces.size(); i++) {
-		jstring j_interface = env->NewStringUTF(p_interfaces[i].utf8().get_data());
-		env->SetObjectArrayElement(j_interfaces, i, j_interface);
-		env->DeleteLocalRef(j_interface);
-	}
-
-	jobject proxy = env->CallStaticObjectMethod(android_runtime_class, ARP_create_proxy_from_godot_object_id, object_id, j_interfaces);
-	Ref<JavaObject> result = _jobject_to_variant(env, proxy);
-
-	env->DeleteLocalRef(j_interfaces);
-	env->DeleteLocalRef(proxy);
-
-	return result;
-}
-
 Ref<JavaClass> JavaClassWrapper::wrap_jclass(jclass p_class, bool p_allow_non_public_methods_access) {
 	JNIEnv *env = get_jni_env();
 	ERR_FAIL_NULL_V(env, Ref<JavaClass>());
@@ -1817,14 +1703,6 @@ Ref<JavaClass> JavaClassWrapper::wrap_jclass(jclass p_class, bool p_allow_non_pu
 	return _wrap(class_name_string, p_allow_non_public_methods_access);
 }
 
-bool JavaClassWrapper::_is_proxy_class(JNIEnv *env, jclass p_class) {
-	ERR_FAIL_NULL_V(proxy_class, false);
-	ERR_FAIL_NULL_V(Proxy_isProxyClass, false);
-	ERR_FAIL_NULL_V(env, false);
-
-	return env->CallStaticBooleanMethod(proxy_class, Proxy_isProxyClass, p_class);
-}
-
 JavaClassWrapper *JavaClassWrapper::singleton = nullptr;
 
 JavaClassWrapper::JavaClassWrapper() {
@@ -1833,27 +1711,12 @@ JavaClassWrapper::JavaClassWrapper() {
 	JNIEnv *env = get_jni_env();
 	ERR_FAIL_NULL(env);
 
-	proxy_class = jni_find_class(env, "java/lang/reflect/Proxy");
-	if (proxy_class) {
-		proxy_class = (jclass)env->NewGlobalRef(proxy_class);
-		Proxy_isProxyClass = env->GetStaticMethodID(proxy_class, "isProxyClass", "(Ljava/lang/Class;)Z");
-	}
-
-	android_runtime_class = jni_find_class(env, "org/godotengine/godot/plugin/AndroidRuntimePlugin");
-	if (android_runtime_class) {
-		android_runtime_class = (jclass)env->NewGlobalRef(android_runtime_class);
-		ARP_create_proxy_from_godot_callable = env->GetStaticMethodID(android_runtime_class, "createProxyFromGodotCallable", "(Ljava/lang/String;Lorg/godotengine/godot/variant/Callable;)Ljava/lang/Object;");
-		ARP_create_proxy_from_godot_object_id = env->GetStaticMethodID(android_runtime_class, "createProxyFromGodotObjectID", "(J[Ljava/lang/String;)Ljava/lang/Object;");
-	}
-
 	jclass bclass = jni_find_class(env, "java/lang/Class");
 	Class_getConstructors = env->GetMethodID(bclass, "getConstructors", "()[Ljava/lang/reflect/Constructor;");
 	Class_getDeclaredMethods = env->GetMethodID(bclass, "getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
 	Class_getFields = env->GetMethodID(bclass, "getFields", "()[Ljava/lang/reflect/Field;");
-	Class_getInterfaces = env->GetMethodID(bclass, "getInterfaces", "()[Ljava/lang/Class;");
 	Class_getName = env->GetMethodID(bclass, "getName", "()Ljava/lang/String;");
 	Class_getSuperclass = env->GetMethodID(bclass, "getSuperclass", "()Ljava/lang/Class;");
-	Class_isInterface = env->GetMethodID(bclass, "isInterface", "()Z");
 	env->DeleteLocalRef(bclass);
 
 	bclass = jni_find_class(env, "java/lang/reflect/Constructor");
diff --git a/engine/platform/android/java_godot_io_wrapper.cpp b/engine/platform/android/java_godot_io_wrapper.cpp
index 561f2c5e..1d0f6dac 100644
--- a/engine/platform/android/java_godot_io_wrapper.cpp
+++ b/engine/platform/android/java_godot_io_wrapper.cpp
@@ -30,9 +30,6 @@
 
 #include "java_godot_io_wrapper.h"
 
-#include "jni_utils.h"
-#include "thread_jandroid.h"
-
 #include "core/math/rect2.h"
 #include "core/variant/variant.h"
 
diff --git a/engine/platform/android/java_godot_io_wrapper.h b/engine/platform/android/java_godot_io_wrapper.h
index b41fac53..6fe8e050 100644
--- a/engine/platform/android/java_godot_io_wrapper.h
+++ b/engine/platform/android/java_godot_io_wrapper.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "jni_utils.h"
+
 #include "core/math/rect2i.h"
 #include "core/variant/typed_array.h"
 
@@ -42,25 +44,25 @@ private:
 	jobject godot_io_instance;
 	jclass cls;
 
-	jmethodID _open_URI = nullptr;
-	jmethodID _get_cache_dir = nullptr;
-	jmethodID _get_data_dir = nullptr;
-	jmethodID _get_temp_dir = nullptr;
-	jmethodID _get_display_cutouts = nullptr;
-	jmethodID _get_display_rotation = nullptr;
-	jmethodID _get_display_safe_area = nullptr;
-	jmethodID _get_locale = nullptr;
-	jmethodID _get_model = nullptr;
-	jmethodID _get_screen_DPI = nullptr;
-	jmethodID _get_scaled_density = nullptr;
-	jmethodID _get_screen_refresh_rate = nullptr;
-	jmethodID _get_unique_id = nullptr;
-	jmethodID _show_keyboard = nullptr;
-	jmethodID _hide_keyboard = nullptr;
-	jmethodID _has_hardware_keyboard = nullptr;
-	jmethodID _set_screen_orientation = nullptr;
-	jmethodID _get_screen_orientation = nullptr;
-	jmethodID _get_system_dir = nullptr;
+	jmethodID _open_URI = 0;
+	jmethodID _get_cache_dir = 0;
+	jmethodID _get_data_dir = 0;
+	jmethodID _get_temp_dir = 0;
+	jmethodID _get_display_cutouts = 0;
+	jmethodID _get_display_rotation = 0;
+	jmethodID _get_display_safe_area = 0;
+	jmethodID _get_locale = 0;
+	jmethodID _get_model = 0;
+	jmethodID _get_screen_DPI = 0;
+	jmethodID _get_scaled_density = 0;
+	jmethodID _get_screen_refresh_rate = 0;
+	jmethodID _get_unique_id = 0;
+	jmethodID _show_keyboard = 0;
+	jmethodID _hide_keyboard = 0;
+	jmethodID _has_hardware_keyboard = 0;
+	jmethodID _set_screen_orientation = 0;
+	jmethodID _get_screen_orientation = 0;
+	jmethodID _get_system_dir = 0;
 
 public:
 	GodotIOJavaWrapper(JNIEnv *p_env, jobject p_godot_io_instance);
diff --git a/engine/platform/android/java_godot_lib_jni.cpp b/engine/platform/android/java_godot_lib_jni.cpp
index f46c3dab..41f96384 100644
--- a/engine/platform/android/java_godot_lib_jni.cpp
+++ b/engine/platform/android/java_godot_lib_jni.cpp
@@ -49,12 +49,12 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
-#include "servers/camera/camera_server.h"
 #include "servers/rendering/rendering_server.h"
 
+#include "servers/camera/camera_server.h"
+
 #ifndef XR_DISABLED
 #include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
@@ -139,21 +139,6 @@ static void _terminate(JNIEnv *env, bool p_restart = false) {
 	}
 }
 
-static String rendering_source_to_string(OS::RenderingSource p_source) {
-	switch (p_source) {
-		case OS::RENDERING_SOURCE_DEFAULT:
-			return "Default";
-		case OS::RENDERING_SOURCE_PROJECT_SETTING:
-			return "ProjectSettings";
-		case OS::RENDERING_SOURCE_COMMANDLINE:
-			return "Commandline";
-		case OS::RENDERING_SOURCE_FALLBACK:
-			return "Fallback";
-		default:
-			return "Unknown";
-	}
-}
-
 extern "C" {
 
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height) {
@@ -273,7 +258,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jcl
 	}
 
 	if (DisplayServerAndroid *dsa = Object::cast_to<DisplayServerAndroid>(DisplayServer::get_singleton())) {
-		dsa->send_window_event(DisplayServerEnums::WINDOW_EVENT_GO_BACK_REQUEST);
+		dsa->send_window_event(DisplayServer::WINDOW_EVENT_GO_BACK_REQUEST);
 	}
 }
 
@@ -502,46 +487,13 @@ JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *
 	return env->NewStringUTF(setting_value.utf8().get_data());
 }
 
-JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz, jboolean p_vulkan_requirements_met) {
-	String rendering_driver_original = RenderingServer::get_singleton()->get_current_rendering_driver_name();
-	String rendering_driver_chosen = rendering_driver_original;
+JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz) {
+	String rendering_driver = RenderingServer::get_singleton()->get_current_rendering_driver_name();
 	String rendering_method = RenderingServer::get_singleton()->get_current_rendering_method();
 
-#ifdef VULKAN_ENABLED
-	if (rendering_driver_original == "vulkan" && !DisplayServerAndroid::check_vulkan_global_context(p_vulkan_requirements_met)) {
-		// The Android display server only gets created after this step, so a static check must be used to check for Vulkan
-		// availability instead. If the check fails, it'll fall back to OpenGL3 accordingly if the relevant project setting
-		// is enabled. The Vulkan context created by this check will be reused by the DisplayServer afterwards.
-		rendering_driver_chosen = RenderingServer::get_singleton()->get_current_rendering_driver_name();
-		rendering_method = RenderingServer::get_singleton()->get_current_rendering_method();
-	}
-#ifndef XR_DISABLED
-	// When running in XR mode, vulkan initialization must be done by the XR module, so we ensure that the vulkan
-	// global context is reset.
-	// Note: This is temporary workaround to address https://github.com/godotengine/godot/issues/115924
-	// A proper fix involves updating the Android init flow so that DisplayServerAndroid can update the Android surface
-	// type (vulkan or opengl) after it's initialized.
-	bool xr_enabled = false;
-	if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
-		xr_enabled = GLOBAL_GET_CACHED(bool, "xr/shaders/enabled");
-	} else {
-		xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
-	}
-	if (xr_enabled) {
-		DisplayServerAndroid::free_vulkan_global_context();
-	}
-#endif // XR_DISABLED
-#endif
-
-	String rendering_driver_source = rendering_source_to_string(OS::get_singleton()->get_current_rendering_driver_name_source());
-	String rendering_method_source = rendering_source_to_string(OS::get_singleton()->get_current_rendering_method_source());
-
-	jobjectArray result = env->NewObjectArray(5, jni_find_class(env, "java/lang/String"), nullptr);
-	env->SetObjectArrayElement(result, 0, env->NewStringUTF(rendering_driver_chosen.utf8().get_data()));
-	env->SetObjectArrayElement(result, 1, env->NewStringUTF(rendering_driver_original.utf8().get_data()));
-	env->SetObjectArrayElement(result, 2, env->NewStringUTF(rendering_method.utf8().get_data()));
-	env->SetObjectArrayElement(result, 3, env->NewStringUTF(rendering_driver_source.utf8().get_data()));
-	env->SetObjectArrayElement(result, 4, env->NewStringUTF(rendering_method_source.utf8().get_data()));
+	jobjectArray result = env->NewObjectArray(2, jni_find_class(env, "java/lang/String"), nullptr);
+	env->SetObjectArrayElement(result, 0, env->NewStringUTF(rendering_driver.utf8().get_data()));
+	env->SetObjectArrayElement(result, 1, env->NewStringUTF(rendering_method.utf8().get_data()));
 
 	return result;
 }
@@ -678,7 +630,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIE
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onOrientationChange(JNIEnv *env, jclass clazz, jint p_orientation) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation) {
 	if (step.get() <= STEP_SETUP) {
 		return;
 	}
@@ -687,11 +639,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onOrientationChange(J
 	if (camera_server) {
 		camera_server->handle_display_rotation_change(p_orientation);
 	}
-
-	DisplayServer *display_server = DisplayServer::get_singleton();
-	if (display_server) {
-		display_server->emit_signal("orientation_changed", p_orientation);
-	}
 }
 
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) {
@@ -730,18 +677,4 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_hasFeature(JNIEnv
 	}
 	return false;
 }
-
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onPictureInPictureModeChanged(JNIEnv *env, jclass clazz, jboolean p_is_in_picture_in_picture_mode) {
-	if (step.get() <= STEP_SETUP) {
-		return;
-	}
-
-	if (os_android->get_main_loop()) {
-		if (p_is_in_picture_in_picture_mode) {
-			os_android->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_PIP_MODE_ENTERED);
-		} else {
-			os_android->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_PIP_MODE_EXITED);
-		}
-	}
-}
 }
diff --git a/engine/platform/android/java_godot_lib_jni.h b/engine/platform/android/java_godot_lib_jni.h
index 6579c5ca..0df20794 100644
--- a/engine/platform/android/java_godot_lib_jni.h
+++ b/engine/platform/android/java_godot_lib_jni.h
@@ -60,7 +60,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz);
 JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path);
-JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz, jboolean p_vulkan_requirements_met);
+JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz);
 JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorSetting(JNIEnv *env, jclass clazz, jstring p_key, jobject p_data);
 JNIEXPORT jobject JNICALL Java_org_godotengine_godot_GodotLib_getEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_default_value);
@@ -72,11 +72,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hardwareKeyboardConne
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onOrientationChange(JNIEnv *env, jclass clazz, jint p_orientation);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz);
 JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_hasFeature(JNIEnv *env, jclass clazz, jstring p_feature);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onPictureInPictureModeChanged(JNIEnv *env, jclass clazz, jboolean p_is_in_picture_in_picture_mode);
 }
diff --git a/engine/platform/android/java_godot_view_wrapper.cpp b/engine/platform/android/java_godot_view_wrapper.cpp
index 4de482e4..010b374f 100644
--- a/engine/platform/android/java_godot_view_wrapper.cpp
+++ b/engine/platform/android/java_godot_view_wrapper.cpp
@@ -32,8 +32,6 @@
 
 #include "thread_jandroid.h"
 
-#include "core/string/ustring.h"
-
 GodotJavaViewWrapper::GodotJavaViewWrapper(jobject godot_view) {
 	JNIEnv *env = get_jni_env();
 	ERR_FAIL_NULL(env);
diff --git a/engine/platform/android/java_godot_view_wrapper.h b/engine/platform/android/java_godot_view_wrapper.h
index 58832e55..991e64c4 100644
--- a/engine/platform/android/java_godot_view_wrapper.h
+++ b/engine/platform/android/java_godot_view_wrapper.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "jni_utils.h"
+
 #include "core/math/vector2.h"
 
 #include <android/log.h>
@@ -42,12 +44,12 @@ private:
 
 	jobject _godot_view;
 
-	jmethodID _can_capture_pointer = nullptr;
-	jmethodID _request_pointer_capture = nullptr;
-	jmethodID _release_pointer_capture = nullptr;
+	jmethodID _can_capture_pointer = 0;
+	jmethodID _request_pointer_capture = 0;
+	jmethodID _release_pointer_capture = 0;
 
-	jmethodID _configure_pointer_icon = nullptr;
-	jmethodID _set_pointer_icon = nullptr;
+	jmethodID _configure_pointer_icon = 0;
+	jmethodID _set_pointer_icon = 0;
 
 public:
 	GodotJavaViewWrapper(jobject godot_view);
diff --git a/engine/platform/android/java_godot_wrapper.cpp b/engine/platform/android/java_godot_wrapper.cpp
index ba880dc8..0eb9d12f 100644
--- a/engine/platform/android/java_godot_wrapper.cpp
+++ b/engine/platform/android/java_godot_wrapper.cpp
@@ -89,20 +89,12 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance) {
 	_is_in_immersive_mode = p_env->GetMethodID(godot_class, "isInImmersiveMode", "()Z");
 	_set_window_color = p_env->GetMethodID(godot_class, "setWindowColor", "(Ljava/lang/String;)V");
 	_on_editor_workspace_selected = p_env->GetMethodID(godot_class, "nativeOnEditorWorkspaceSelected", "(Ljava/lang/String;)V");
-	_on_distraction_free_mode_changed = p_env->GetMethodID(godot_class, "nativeOnDistractionFreeModeChanged", "(Z)V");
 	_get_activity = p_env->GetMethodID(godot_class, "getActivity", "()Landroid/app/Activity;");
 	_build_env_connect = p_env->GetMethodID(godot_class, "nativeBuildEnvConnect", "(Lorg/godotengine/godot/variant/Callable;)Z");
 	_build_env_disconnect = p_env->GetMethodID(godot_class, "nativeBuildEnvDisconnect", "()V");
 	_build_env_execute = p_env->GetMethodID(godot_class, "nativeBuildEnvExecute", "(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/godotengine/godot/variant/Callable;Lorg/godotengine/godot/variant/Callable;)I");
 	_build_env_cancel = p_env->GetMethodID(godot_class, "nativeBuildEnvCancel", "(I)V");
 	_build_env_clean_project = p_env->GetMethodID(godot_class, "nativeBuildEnvCleanProject", "(Ljava/lang/String;Ljava/lang/String;Lorg/godotengine/godot/variant/Callable;)V");
-
-	// PiP mode method ids.
-	_is_pip_mode_supported = p_env->GetMethodID(godot_class, "nativeIsPiPModeSupported", "()Z");
-	_is_in_pip_mode = p_env->GetMethodID(godot_class, "nativeIsInPiPMode", "()Z");
-	_enter_pip_mode = p_env->GetMethodID(godot_class, "nativeEnterPiPMode", "()V");
-	_set_pip_mode_aspect_ratio = p_env->GetMethodID(godot_class, "nativeSetPiPModeAspectRatio", "(II)V");
-	_set_auto_enter_pip_mode_on_background = p_env->GetMethodID(godot_class, "nativeSetAutoEnterPiPModeOnBackground", "(Z)V");
 }
 
 GodotJavaWrapper::~GodotJavaWrapper() {
@@ -623,15 +615,6 @@ void GodotJavaWrapper::on_editor_workspace_selected(const String &p_workspace) {
 	}
 }
 
-void GodotJavaWrapper::on_distraction_free_mode_changed(bool p_enabled) {
-	if (_on_distraction_free_mode_changed) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL(env);
-
-		env->CallVoidMethod(godot_instance, _on_distraction_free_mode_changed, p_enabled);
-	}
-}
-
 bool GodotJavaWrapper::build_env_connect(const Callable &p_callback) {
 	if (_build_env_connect) {
 		JNIEnv *env = get_jni_env();
@@ -712,47 +695,3 @@ void GodotJavaWrapper::build_env_clean_project(const String &p_project_path, con
 		env->DeleteLocalRef(j_callback);
 	}
 }
-
-bool GodotJavaWrapper::is_pip_mode_supported() {
-	if (_is_pip_mode_supported) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL_V(env, false);
-		return env->CallBooleanMethod(godot_instance, _is_pip_mode_supported);
-	} else {
-		return false;
-	}
-}
-
-bool GodotJavaWrapper::is_in_pip_mode() {
-	if (_is_in_pip_mode) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL_V(env, false);
-		return env->CallBooleanMethod(godot_instance, _is_in_pip_mode);
-	} else {
-		return false;
-	}
-}
-
-void GodotJavaWrapper::enter_pip_mode() {
-	if (_enter_pip_mode) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL(env);
-		env->CallVoidMethod(godot_instance, _enter_pip_mode);
-	}
-}
-
-void GodotJavaWrapper::set_pip_mode_aspect_ratio(int p_numerator, int p_denominator) {
-	if (_set_pip_mode_aspect_ratio) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL(env);
-		env->CallVoidMethod(godot_instance, _set_pip_mode_aspect_ratio, p_numerator, p_denominator);
-	}
-}
-
-void GodotJavaWrapper::set_auto_enter_pip_mode_on_background(bool p_auto_enter_on_background) {
-	if (_set_auto_enter_pip_mode_on_background) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL(env);
-		env->CallVoidMethod(godot_instance, _set_auto_enter_pip_mode_on_background, p_auto_enter_on_background);
-	}
-}
diff --git a/engine/platform/android/java_godot_wrapper.h b/engine/platform/android/java_godot_wrapper.h
index 7b56f72e..15367a1f 100644
--- a/engine/platform/android/java_godot_wrapper.h
+++ b/engine/platform/android/java_godot_wrapper.h
@@ -34,9 +34,8 @@
 
 #include "core/math/color.h"
 #include "core/templates/list.h"
-#include "core/templates/vector.h"
-#include "core/variant/callable.h"
 
+#include <android/log.h>
 #include <jni.h>
 
 // Class that makes functions in java/src/org/godotengine/godot/Godot.kt callable from C++
@@ -84,18 +83,12 @@ private:
 	jmethodID _is_in_immersive_mode = nullptr;
 	jmethodID _set_window_color = nullptr;
 	jmethodID _on_editor_workspace_selected = nullptr;
-	jmethodID _on_distraction_free_mode_changed = nullptr;
 	jmethodID _get_activity = nullptr;
 	jmethodID _build_env_connect = nullptr;
 	jmethodID _build_env_disconnect = nullptr;
 	jmethodID _build_env_execute = nullptr;
 	jmethodID _build_env_cancel = nullptr;
 	jmethodID _build_env_clean_project = nullptr;
-	jmethodID _is_pip_mode_supported = nullptr;
-	jmethodID _is_in_pip_mode = nullptr;
-	jmethodID _enter_pip_mode = nullptr;
-	jmethodID _set_pip_mode_aspect_ratio = nullptr;
-	jmethodID _set_auto_enter_pip_mode_on_background = nullptr;
 
 public:
 	GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance);
@@ -153,17 +146,10 @@ public:
 	void set_window_color(const Color &p_color);
 
 	void on_editor_workspace_selected(const String &p_workspace);
-	void on_distraction_free_mode_changed(bool p_enabled);
 
 	bool build_env_connect(const Callable &p_callback);
 	void build_env_disconnect();
 	int build_env_execute(const String &p_build_tool, const List<String> &p_arguments, const String &p_project_path, const String &p_gradle_build_directory, const Callable &p_output_callback, const Callable &p_result_callback);
 	void build_env_cancel(int p_job_id);
 	void build_env_clean_project(const String &p_project_path, const String &p_gradle_build_directory, const Callable &p_callback);
-
-	bool is_pip_mode_supported();
-	bool is_in_pip_mode();
-	void enter_pip_mode();
-	void set_pip_mode_aspect_ratio(int p_numerator, int p_denominator);
-	void set_auto_enter_pip_mode_on_background(bool p_auto_enter_on_background);
 };
diff --git a/engine/platform/android/jni_utils.h b/engine/platform/android/jni_utils.h
index bd15ce77..c41e38a5 100644
--- a/engine/platform/android/jni_utils.h
+++ b/engine/platform/android/jni_utils.h
@@ -32,6 +32,7 @@
 
 #include "thread_jandroid.h"
 
+#include "core/config/engine.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 
diff --git a/engine/platform/android/net_socket_android.cpp b/engine/platform/android/net_socket_android.cpp
index 2fda2197..9ab7d6a0 100644
--- a/engine/platform/android/net_socket_android.cpp
+++ b/engine/platform/android/net_socket_android.cpp
@@ -71,7 +71,7 @@ void NetSocketAndroid::multicast_lock_release() {
 	}
 }
 
-Ref<NetSocket> NetSocketAndroid::_create_func() {
+NetSocket *NetSocketAndroid::_create_func() {
 	return memnew(NetSocketAndroid);
 }
 
diff --git a/engine/platform/android/net_socket_android.h b/engine/platform/android/net_socket_android.h
index 9aea9278..21a3f6a3 100644
--- a/engine/platform/android/net_socket_android.h
+++ b/engine/platform/android/net_socket_android.h
@@ -59,7 +59,7 @@ private:
 	static void multicast_lock_release();
 
 protected:
-	static Ref<NetSocket> _create_func();
+	static NetSocket *_create_func();
 
 public:
 	static void make_default();
diff --git a/engine/platform/android/os_android.cpp b/engine/platform/android/os_android.cpp
index 78247d61..daccd38c 100644
--- a/engine/platform/android/os_android.cpp
+++ b/engine/platform/android/os_android.cpp
@@ -32,33 +32,26 @@
 
 #include "dir_access_jandroid.h"
 #include "display_server_android.h"
+#include "file_access_android.h"
 #include "file_access_filesystem_jandroid.h"
 #include "java_godot_io_wrapper.h"
 #include "java_godot_wrapper.h"
 #include "net_socket_android.h"
 
-#ifndef TOOLS_ENABLED
-#include "file_access_android.h"
-#endif
-
-#include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/extension/gdextension_manager.h"
-#include "core/input/input.h"
 #include "core/io/xml_parser.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
-#include "main/main.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifdef TOOLS_ENABLED
-#include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
 #include "editor/run/game_view_plugin.h"
 #endif
+#include "main/main.h"
+#include "scene/main/scene_tree.h"
+#include "servers/rendering/rendering_server.h"
 
 #include <dlfcn.h>
 #include <sys/system_properties.h>
@@ -367,10 +360,6 @@ void OS_Android::main_loop_begin() {
 		if (game_view_plugin != nullptr) {
 			game_view_plugin->connect("main_screen_changed", callable_mp_static(&OS_Android::_on_main_screen_changed));
 		}
-
-		if (EditorNode::get_singleton() != nullptr) {
-			EditorNode::get_singleton()->connect("distraction_free_mode_changed", callable_mp_static(&OS_Android::_on_distraction_free_mode_changed));
-		}
 	}
 #endif
 }
@@ -403,10 +392,6 @@ void OS_Android::main_loop_end() {
 		if (game_view_plugin != nullptr) {
 			game_view_plugin->disconnect("main_screen_changed", callable_mp_static(&OS_Android::_on_main_screen_changed));
 		}
-
-		if (EditorNode::get_singleton() != nullptr) {
-			EditorNode::get_singleton()->disconnect("distraction_free_mode_changed", callable_mp_static(&OS_Android::_on_distraction_free_mode_changed));
-		}
 	}
 #endif
 
@@ -425,26 +410,18 @@ void OS_Android::_on_main_screen_changed(const String &p_screen_name) {
 		OS_Android::get_singleton()->get_godot_java()->on_editor_workspace_selected(p_screen_name);
 	}
 }
-
-void OS_Android::_on_distraction_free_mode_changed(bool p_enable) {
-	if (OS_Android::get_singleton() != nullptr && OS_Android::get_singleton()->get_godot_java() != nullptr) {
-		OS_Android::get_singleton()->get_godot_java()->on_distraction_free_mode_changed(p_enable);
-	}
-}
 #endif
 
 void OS_Android::main_loop_focusout() {
-	DisplayServerAndroid::get_singleton()->send_window_event(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+	DisplayServerAndroid::get_singleton()->send_window_event(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT);
 	}
-
-	// Only pause when we are not in PiP mode.
-	audio_driver_android.set_pause(!DisplayServerAndroid::get_singleton()->is_in_pip_mode());
+	audio_driver_android.set_pause(true);
 }
 
 void OS_Android::main_loop_focusin() {
-	DisplayServerAndroid::get_singleton()->send_window_event(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+	DisplayServerAndroid::get_singleton()->send_window_event(DisplayServer::WINDOW_EVENT_FOCUS_IN);
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN);
 	}
diff --git a/engine/platform/android/os_android.h b/engine/platform/android/os_android.h
index df9c4e3f..b05069b8 100644
--- a/engine/platform/android/os_android.h
+++ b/engine/platform/android/os_android.h
@@ -34,6 +34,7 @@
 
 #include "core/os/main_loop.h"
 #include "drivers/unix/os_unix.h"
+#include "servers/audio/audio_server.h"
 
 class GodotJavaWrapper;
 class GodotIOJavaWrapper;
@@ -105,6 +106,8 @@ public:
 
 	virtual void finalize() override;
 
+	typedef int64_t ProcessID;
+
 	static OS_Android *get_singleton();
 	GodotJavaWrapper *get_godot_java();
 	GodotIOJavaWrapper *get_godot_io_java();
@@ -188,6 +191,5 @@ private:
 
 #ifdef TOOLS_ENABLED
 	static void _on_main_screen_changed(const String &p_screen_name);
-	static void _on_distraction_free_mode_changed(bool p_enable);
 #endif
 };
diff --git a/engine/platform/android/platform_gl.h b/engine/platform/android/platform_gl.h
index d1f53e14..bf990e25 100644
--- a/engine/platform/android/platform_gl.h
+++ b/engine/platform/android/platform_gl.h
@@ -34,9 +34,7 @@
 #define GLES_API_ENABLED // Allow using GLES.
 #endif
 
-// IWYU pragma: begin_exports.
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES3/gl3.h>
 #include <GLES3/gl3ext.h>
-// IWYU pragma: end_exports.
diff --git a/engine/platform/android/rendering_context_driver_vulkan_android.cpp b/engine/platform/android/rendering_context_driver_vulkan_android.cpp
index 9b6000d8..51fb1ca1 100644
--- a/engine/platform/android/rendering_context_driver_vulkan_android.cpp
+++ b/engine/platform/android/rendering_context_driver_vulkan_android.cpp
@@ -32,7 +32,7 @@
 
 #ifdef VULKAN_ENABLED
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 const char *RenderingContextDriverVulkanAndroid::_get_platform_surface_extension() const {
 	return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
diff --git a/engine/platform/android/tts_android.cpp b/engine/platform/android/tts_android.cpp
index ea444b57..352ce175 100644
--- a/engine/platform/android/tts_android.cpp
+++ b/engine/platform/android/tts_android.cpp
@@ -30,13 +30,10 @@
 
 #include "tts_android.h"
 
-#include "jni_utils.h"
+#include "java_godot_wrapper.h"
+#include "os_android.h"
 #include "thread_jandroid.h"
 
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
-#include "servers/display/display_server.h"
-
 bool TTS_Android::initialized = false;
 jobject TTS_Android::tts = nullptr;
 jclass TTS_Android::cls = nullptr;
@@ -155,7 +152,7 @@ void TTS_Android::_java_utterance_callback(int p_event, int64_t p_id, int p_pos)
 	ERR_FAIL_COND_MSG(!initialized || tts == nullptr, "Text to Speech not initialized.");
 	if (ids.has(p_id)) {
 		int pos = 0;
-		if ((DisplayServerEnums::TTSUtteranceEvent)p_event == DisplayServerEnums::TTS_UTTERANCE_BOUNDARY) {
+		if ((DisplayServer::TTSUtteranceEvent)p_event == DisplayServer::TTS_UTTERANCE_BOUNDARY) {
 			// Convert position from UTF-16 to UTF-32.
 			const Char16String &string = ids[p_id];
 			for (int i = 0; i < MIN(p_pos, string.length()); i++) {
@@ -165,10 +162,10 @@ void TTS_Android::_java_utterance_callback(int p_event, int64_t p_id, int p_pos)
 				}
 				pos++;
 			}
-		} else if ((DisplayServerEnums::TTSUtteranceEvent)p_event != DisplayServerEnums::TTS_UTTERANCE_STARTED) {
+		} else if ((DisplayServer::TTSUtteranceEvent)p_event != DisplayServer::TTS_UTTERANCE_STARTED) {
 			ids.erase(p_id);
 		}
-		DisplayServer::get_singleton()->tts_post_utterance_event((DisplayServerEnums::TTSUtteranceEvent)p_event, p_id, pos);
+		DisplayServer::get_singleton()->tts_post_utterance_event((DisplayServer::TTSUtteranceEvent)p_event, p_id, pos);
 	}
 }
 
@@ -243,7 +240,7 @@ void TTS_Android::speak(const String &p_text, const String &p_voice, int p_volum
 	}
 
 	if (p_text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_utterance_id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, p_utterance_id);
 		return;
 	}
 
@@ -293,7 +290,7 @@ void TTS_Android::stop() {
 	}
 	ERR_FAIL_COND_MSG(!initialized || tts == nullptr, "Text to Speech not initialized.");
 	for (const KeyValue<int64_t, Char16String> &E : ids) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, E.key);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
 	}
 	ids.clear();
 
diff --git a/engine/platform/android/tts_android.h b/engine/platform/android/tts_android.h
index 9d4b1c17..c813d67d 100644
--- a/engine/platform/android/tts_android.h
+++ b/engine/platform/android/tts_android.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "core/os/thread.h"
+#include "core/config/project_settings.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
-#include "core/templates/safe_refcount.h"
 #include "core/variant/array.h"
+#include "servers/display/display_server.h"
 
 #include <jni.h>
 
diff --git a/engine/platform/ios/SCsub b/engine/platform/ios/SCsub
index 92f6c171..a313442e 100644
--- a/engine/platform/ios/SCsub
+++ b/engine/platform/ios/SCsub
@@ -22,9 +22,6 @@ ios_lib = env_ios.add_library("ios", ios_lib)
 # (iOS) Enable module support
 env_ios.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
 
-if "LIBS_EXTERNAL" in env_ios:
-    env_ios.Depends(ios_lib, env_ios["LIBS_EXTERNAL"])
-
 combine_command = env_ios.CommandNoCache(
     "#bin/libgodot" + env_ios["LIBSUFFIX"], [ios_lib] + env_ios["LIBS"], env.Run(combine_libs_apple_embedded)
 )
diff --git a/engine/platform/ios/detect.py b/engine/platform/ios/detect.py
index b7da1354..16c9f5ac 100644
--- a/engine/platform/ios/detect.py
+++ b/engine/platform/ios/detect.py
@@ -113,8 +113,6 @@ def configure(env: "SConsEnvironment"):
         env.Append(CCFLAGS=["-miphoneos-version-min=14.0"])
     detect_darwin_sdk_path(env["APPLE_PLATFORM"], env)
 
-    env.Append(CCFLAGS=["-ffp-contract=off"])
-
     if env["arch"] == "x86_64":
         if not env["simulator"]:
             print_error("Building for iOS with 'arch=x86_64' requires 'simulator=yes'.")
@@ -183,10 +181,3 @@ def configure(env: "SConsEnvironment"):
                 "$APPLE_SDK_PATH/System/Library/Frameworks/OpenGLES.framework/Headers",
             ]
         )
-
-    if env["sdl"]:
-        if env["builtin_sdl"]:
-            env.Append(CPPDEFINES=["SDL_ENABLED"])
-        else:
-            print_warning("`builtin_sdl` was explicitly disabled. Disabling SDL input driver support.")
-            env["sdl"] = False
diff --git a/engine/platform/ios/display_layer_ios.h b/engine/platform/ios/display_layer_ios.h
index f32c450a..14977b32 100644
--- a/engine/platform/ios/display_layer_ios.h
+++ b/engine/platform/ios/display_layer_ios.h
@@ -32,9 +32,7 @@
 
 #include "drivers/apple_embedded/display_layer_apple_embedded.h"
 
-#if defined(GLES3_ENABLED)
 #import <OpenGLES/EAGLDrawable.h>
-#endif
 #import <QuartzCore/QuartzCore.h>
 
 // An ugly workaround for iOS simulator
@@ -50,9 +48,7 @@ API_AVAILABLE(ios(13.0))
 #endif
 @end
 
-#if defined(GLES3_ENABLED)
 API_DEPRECATED("OpenGLES is deprecated", ios(2.0, 12.0))
 @interface GDTOpenGLLayer : CAEAGLLayer <GDTDisplayLayer>
 
 @end
-#endif
diff --git a/engine/platform/ios/display_layer_ios.mm b/engine/platform/ios/display_layer_ios.mm
index 554c159d..c1f6d758 100644
--- a/engine/platform/ios/display_layer_ios.mm
+++ b/engine/platform/ios/display_layer_ios.mm
@@ -40,11 +40,9 @@
 
 #import <AudioToolbox/AudioServices.h>
 #import <GameController/GameController.h>
-#if defined(GLES3_ENABLED)
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/ES1/gl.h>
 #import <OpenGLES/ES1/glext.h>
-#endif
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
@@ -71,7 +69,6 @@
 
 @end
 
-#if defined(GLES3_ENABLED)
 @implementation GDTOpenGLLayer {
 	// The pixel dimensions of the backbuffer
 	GLint backingWidth;
@@ -192,4 +189,3 @@
 }
 
 @end
-#endif
diff --git a/engine/platform/ios/display_server_ios.h b/engine/platform/ios/display_server_ios.h
index 01f16b0f..c8538d29 100644
--- a/engine/platform/ios/display_server_ios.h
+++ b/engine/platform/ios/display_server_ios.h
@@ -32,28 +32,23 @@
 
 #include "drivers/apple_embedded/display_server_apple_embedded.h"
 
-class DisplayServerIOS final : public DisplayServerAppleEmbedded {
+class DisplayServerIOS : public DisplayServerAppleEmbedded {
 	GDSOFTCLASS(DisplayServerIOS, DisplayServerAppleEmbedded);
 
 	_THREAD_SAFE_CLASS_
 
-	DisplayServerIOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerIOS(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerIOS();
 
 public:
 	static DisplayServerIOS *get_singleton();
 
 	static void register_ios_driver();
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 
 	virtual String get_name() const override;
 
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-
-protected:
-	virtual bool _screen_hdr_is_supported() const override;
-	virtual float _screen_potential_edr_headroom() const override;
-	virtual float _screen_current_edr_headroom() const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 };
diff --git a/engine/platform/ios/display_server_ios.mm b/engine/platform/ios/display_server_ios.mm
index ee86f710..fa42f8b3 100644
--- a/engine/platform/ios/display_server_ios.mm
+++ b/engine/platform/ios/display_server_ios.mm
@@ -39,16 +39,14 @@ DisplayServerIOS *DisplayServerIOS::get_singleton() {
 	return (DisplayServerIOS *)DisplayServerAppleEmbedded::get_singleton();
 }
 
-DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) :
+DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) :
 		DisplayServerAppleEmbedded(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error) {
-	// See: https://github.com/godotengine/godot/pull/106814#discussion_r2854262156 for why this was set to 203 nits.
-	hardware_reference_luminance_nits = 203.0f;
 }
 
 DisplayServerIOS::~DisplayServerIOS() {
 }
 
-DisplayServer *DisplayServerIOS::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerIOS::create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	return memnew(DisplayServerIOS(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 }
 
@@ -120,24 +118,3 @@ float DisplayServerIOS::screen_get_scale(int p_screen) const {
 
 	return [UIScreen mainScreen].scale;
 }
-
-bool DisplayServerIOS::_screen_hdr_is_supported() const {
-	if (@available(iOS 16.0, *)) {
-		return [UIScreen mainScreen].potentialEDRHeadroom > 1.0;
-	}
-	return false;
-}
-
-float DisplayServerIOS::_screen_potential_edr_headroom() const {
-	if (@available(iOS 16.0, *)) {
-		return [UIScreen mainScreen].potentialEDRHeadroom;
-	}
-	return 1.0f;
-}
-
-float DisplayServerIOS::_screen_current_edr_headroom() const {
-	if (@available(iOS 16.0, *)) {
-		return [UIScreen mainScreen].currentEDRHeadroom;
-	}
-	return 1.0f;
-}
diff --git a/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml b/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
index d0b8ab03..c9723a52 100644
--- a/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
+++ b/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformIOS" inherits="EditorExportPlatformAppleEmbedded" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformIOS" inherits="EditorExportPlatformAppleEmbedded" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for iOS.
 	</brief_description>
@@ -269,9 +269,6 @@
 		<member name="icons/spotlight_120x120_tinted" type="String" setter="" getter="">
 			Spotlight icon file on iPad and iPhone (3x DPI), tinted version. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
 		</member>
-		<member name="modules/camera" type="bool" setter="" getter="">
-			If [code]true[/code], [CameraServer] module is added to the exported project.
-		</member>
 		<member name="privacy/active_keyboard_access_reasons" type="int" setter="" getter="">
 			The reasons your app use active keyboard API. See [url=https://developer.apple.com/documentation/bundleresources/privacy_manifest_files/describing_use_of_required_reason_api]Describing use of required reason API[/url].
 		</member>
diff --git a/engine/platform/ios/export/export.cpp b/engine/platform/ios/export/export.cpp
index d8ed5087..5e9ca3e0 100644
--- a/engine/platform/ios/export/export.cpp
+++ b/engine/platform/ios/export/export.cpp
@@ -32,13 +32,8 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
-#ifdef MACOS_ENABLED
-#include "editor/settings/editor_settings.h"
-#endif
-
 void register_ios_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformIOS);
 }
diff --git a/engine/platform/ios/export/export_plugin.cpp b/engine/platform/ios/export/export_plugin.cpp
index fa5211f9..2af484ea 100644
--- a/engine/platform/ios/export/export_plugin.cpp
+++ b/engine/platform/ios/export/export_plugin.cpp
@@ -34,7 +34,6 @@
 #include "run_icon_svg.gen.h"
 
 #include "editor/editor_node.h"
-#include "main/splash.gen.h"
 
 Vector<String> EditorExportPlatformIOS::device_types({ "iPhone", "iPad" });
 
@@ -99,28 +98,28 @@ HashMap<String, Variant> EditorExportPlatformIOS::get_custom_project_settings(co
 	switch (image_scale_mode) {
 		case 0: {
 			String logo_path = get_project_setting(p_preset, "application/boot_splash/image");
-			RSE::SplashStretchMode stretch_mode = get_project_setting(p_preset, "application/boot_splash/stretch_mode");
+			RenderingServer::SplashStretchMode stretch_mode = get_project_setting(p_preset, "application/boot_splash/stretch_mode");
 			// If custom logo is not specified, Godot does not scale default one, so we should do the same.
 			if (logo_path.is_empty()) {
 				value = "center";
 			} else {
 				switch (stretch_mode) {
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED: {
 						value = "center";
 					} break;
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP: {
 						value = "scaleAspectFit";
 					} break;
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_WIDTH: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_WIDTH: {
 						value = "scaleAspectFit";
 					} break;
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_HEIGHT: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_HEIGHT: {
 						value = "scaleAspectFit";
 					} break;
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_COVER: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_COVER: {
 						value = "scaleAspectFill";
 					} break;
-					case RSE::SplashStretchMode::SPLASH_STRETCH_MODE_IGNORE: {
+					case RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_IGNORE: {
 						value = "scaleToFill";
 					} break;
 				}
diff --git a/engine/platform/ios/godot_view_ios.mm b/engine/platform/ios/godot_view_ios.mm
index 2de4ec34..c267ac39 100644
--- a/engine/platform/ios/godot_view_ios.mm
+++ b/engine/platform/ios/godot_view_ios.mm
@@ -62,12 +62,10 @@ GODOT_CLANG_WARNING_POP
 #else
 		layer = [GDTMetalLayer layer];
 #endif
-#if defined(GLES3_ENABLED)
 	} else if ([driverName isEqualToString:@"opengl3"]) {
 		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in iOS 12.0.
 		layer = [GDTOpenGLLayer layer];
 		GODOT_CLANG_WARNING_POP
-#endif
 	} else {
 		return nil;
 	}
diff --git a/engine/platform/ios/main_ios.mm b/engine/platform/ios/main_ios.mm
index 7d61b8a3..dab9e880 100644
--- a/engine/platform/ios/main_ios.mm
+++ b/engine/platform/ios/main_ios.mm
@@ -36,7 +36,6 @@
 #include "main/main.h"
 
 #import <UIKit/UIKit.h>
-
 #include <cstdio>
 
 static OS_IOS *os = nullptr;
diff --git a/engine/platform/ios/platform_gl.h b/engine/platform/ios/platform_gl.h
index a3f97cf6..8271b43b 100644
--- a/engine/platform/ios/platform_gl.h
+++ b/engine/platform/ios/platform_gl.h
@@ -30,10 +30,8 @@
 
 #pragma once
 
-#ifdef GLES3_ENABLED
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES.
 #endif
 
-#include <ES3/gl.h> // IWYU pragma: export.
-#endif
+#include <ES3/gl.h>
diff --git a/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp b/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
index ca7969ae..b85d65ff 100644
--- a/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
@@ -48,9 +48,7 @@
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <link.h>
-
 #include <csignal>
-#include <cstdio>
 #include <cstdlib>
 
 static void handle_crash(int sig) {
@@ -104,36 +102,8 @@ static void handle_crash(int sig) {
 	// Non glibc systems apparently don't give PIE relocation info.
 	uintptr_t relocation = 0;
 #endif //__GLIBC__
-
-	print_error(vformat("Load address: %x\n", (uint64_t)relocation));
-
 	if (strings) {
-		int ret;
-
 		List<String> args;
-		args.push_back("--version");
-		String exe_name;
-
-		if (exe_name.is_empty()) {
-			String output;
-			// Faster implementation from gimli-rs/addr2line.
-			Error err = OS::get_singleton()->execute(OS::get_singleton()->get_environment("HOME").path_join(String("/.cargo/bin/addr2line")), args, &output, &ret);
-			if (err == OK && ret == 0) {
-				exe_name = OS::get_singleton()->get_environment("HOME").path_join(String("/.cargo/bin/addr2line"));
-			}
-		}
-		if (exe_name.is_empty()) {
-			String output;
-			Error err = OS::get_singleton()->execute(String("llvm-addr2line"), args, &output, &ret);
-			if (err == OK && ret == 0) {
-				exe_name = String("llvm-addr2line");
-			}
-		}
-		if (exe_name.is_empty()) {
-			exe_name = String("addr2line");
-		}
-
-		args.clear();
 		for (size_t i = 0; i < size; i++) {
 			char str[1024];
 			snprintf(str, 1024, "%p", (void *)((uintptr_t)bt_buffer[i] - relocation));
@@ -143,8 +113,9 @@ static void handle_crash(int sig) {
 		args.push_back(_execpath);
 
 		// Try to get the file/line number using addr2line
-		String output;
-		Error err = OS::get_singleton()->execute(exe_name, args, &output, &ret);
+		int ret;
+		String output = "";
+		Error err = OS::get_singleton()->execute(String("addr2line"), args, &output, &ret);
 		Vector<String> addr2line_results;
 		if (err == OK) {
 			addr2line_results = output.substr(0, output.length() - 1).split("\n", false);
@@ -173,7 +144,7 @@ static void handle_crash(int sig) {
 			}
 
 			// Simplify printed file paths to remove redundant `/./` sections (e.g. `/opt/godot/./core` -> `/opt/godot/core`).
-			print_error(vformat("[%d] %x - %s (%s)", (int64_t)i, (uint64_t)bt_buffer[i], fname, err == OK ? addr2line_results[i].replace("/./", "/") : ""));
+			print_error(vformat("[%d] %s (%s)", (int64_t)i, fname, err == OK ? addr2line_results[i].replace("/./", "/") : ""));
 		}
 
 		free(strings);
diff --git a/engine/platform/linuxbsd/dbus-so_wrap.c b/engine/platform/linuxbsd/dbus-so_wrap.c
index 792e5142..4aec9dc4 100644
--- a/engine/platform/linuxbsd/dbus-so_wrap.c
+++ b/engine/platform/linuxbsd/dbus-so_wrap.c
@@ -243,7 +243,7 @@
 #define dbus_validate_utf8 dbus_validate_utf8_dylibloader_orig_dbus
 #define dbus_threads_init dbus_threads_init_dylibloader_orig_dbus
 #define dbus_threads_init_default dbus_threads_init_default_dylibloader_orig_dbus
-#include <thirdparty/linuxbsd_headers/dbus/dbus.h>
+#include "thirdparty/linuxbsd_headers/dbus/dbus.h"
 #undef dbus_error_init
 #undef dbus_error_free
 #undef dbus_set_error
diff --git a/engine/platform/linuxbsd/dbus-so_wrap.h b/engine/platform/linuxbsd/dbus-so_wrap.h
index 075c6525..2c637579 100644
--- a/engine/platform/linuxbsd/dbus-so_wrap.h
+++ b/engine/platform/linuxbsd/dbus-so_wrap.h
@@ -245,7 +245,7 @@
 #define dbus_validate_utf8 dbus_validate_utf8_dylibloader_orig_dbus
 #define dbus_threads_init dbus_threads_init_dylibloader_orig_dbus
 #define dbus_threads_init_default dbus_threads_init_default_dylibloader_orig_dbus
-#include <thirdparty/linuxbsd_headers/dbus/dbus.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/dbus/dbus.h"
 #undef dbus_error_init
 #undef dbus_error_free
 #undef dbus_set_error
diff --git a/engine/platform/linuxbsd/detect.py b/engine/platform/linuxbsd/detect.py
index dc843efc..35415dc2 100644
--- a/engine/platform/linuxbsd/detect.py
+++ b/engine/platform/linuxbsd/detect.py
@@ -29,22 +29,6 @@ def can_build():
 def get_opts():
     from SCons.Variables import BoolVariable, EnumVariable
 
-    # Dependencies folder.
-    deps_folder = os.getenv("LOCALAPPDATA")
-    if deps_folder:
-        deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
-    else:
-        # Cross-compiling, the deps install script puts things in `bin`.
-        # Getting an absolute path to it is a bit hacky in Python.
-        try:
-            import inspect
-
-            caller_frame = inspect.stack()[1]
-            caller_script_dir = os.path.dirname(os.path.abspath(caller_frame[1]))
-            deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
-        except Exception:  # Give up.
-            deps_folder = ""
-
     return [
         EnumVariable("linker", "Linker program", "default", ["default", "bfd", "gold", "lld", "mold"], ignorecase=2),
         BoolVariable("use_llvm", "Use the LLVM compiler", False),
@@ -67,12 +51,6 @@ def get_opts():
         BoolVariable("libdecor", "Enable libdecor support", True),
         BoolVariable("touch", "Enable touch events", True),
         BoolVariable("execinfo", "Use libexecinfo on systems where glibc is not available", False),
-        # Screen reader support.
-        (
-            "accesskit_sdk_path",
-            "Path to the AccessKit C SDK",
-            os.path.join(deps_folder, "accesskit"),
-        ),
     ]
 
 
@@ -166,9 +144,9 @@ def configure(env: "SConsEnvironment"):
 
     if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"] or env["use_msan"]:
         env.extra_suffix += ".san"
+        env.Append(CPPDEFINES=["SANITIZERS_ENABLED"])
 
         if env["use_ubsan"]:
-            env.Append(CPPDEFINES=["UBSAN_ENABLED"])
             env.Append(
                 CCFLAGS=[
                     "-fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin"
@@ -185,22 +163,18 @@ def configure(env: "SConsEnvironment"):
                 env.Append(CCFLAGS=["-fsanitize=bounds-strict"])
 
         if env["use_asan"]:
-            env.Append(CPPDEFINES=["ASAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=address,pointer-subtract,pointer-compare"])
             env.Append(LINKFLAGS=["-fsanitize=address"])
 
         if env["use_lsan"]:
-            env.Append(CPPDEFINES=["LSAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=leak"])
             env.Append(LINKFLAGS=["-fsanitize=leak"])
 
         if env["use_tsan"]:
-            env.Append(CPPDEFINES=["TSAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=thread"])
             env.Append(LINKFLAGS=["-fsanitize=thread"])
 
         if env["use_msan"] and env["use_llvm"]:
-            env.Append(CPPDEFINES=["MSAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=memory"])
             env.Append(CCFLAGS=["-fsanitize-memory-track-origins"])
             env.Append(CCFLAGS=["-fsanitize-recover=memory"])
@@ -517,7 +491,7 @@ def configure(env: "SConsEnvironment"):
         env.Append(LIBS=["rt"])  # Needed by glibc, used by _allocate_shm_file
 
     if env["accesskit"]:
-        if os.path.exists(env["accesskit_sdk_path"]):
+        if env["accesskit_sdk_path"] != "":
             env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
             if env["arch"] == "arm64":
                 env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/arm64/static/"])
@@ -530,16 +504,9 @@ def configure(env: "SConsEnvironment"):
             elif env["arch"] == "x86_32":
                 env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/x86/static/"])
             env.Append(LIBS=["accesskit"])
-            env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
         else:
-            print_warning(
-                "The screen reader support driver requires dependencies to be installed.\n"
-                f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_accesskit.py')}`.\n"
-                "See the documentation for more information:\n"
-                "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_linuxbsd.html\n"
-                "Alternatively, disable this driver by compiling with `accesskit=no` explicitly."
-            )
-            env["accesskit"] = False
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
 
     if env["vulkan"]:
         env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
diff --git a/engine/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml b/engine/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml
index 47478d43..3a7f086c 100644
--- a/engine/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml
+++ b/engine/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformLinuxBSD" inherits="EditorExportPlatformPC" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformLinuxBSD" inherits="EditorExportPlatformPC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for Linux/BSD.
 	</brief_description>
diff --git a/engine/platform/linuxbsd/export/export.cpp b/engine/platform/linuxbsd/export/export.cpp
index d8c407cd..a5127147 100644
--- a/engine/platform/linuxbsd/export/export.cpp
+++ b/engine/platform/linuxbsd/export/export.cpp
@@ -32,7 +32,6 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_linuxbsd_exporter_types() {
diff --git a/engine/platform/linuxbsd/export/export_plugin.cpp b/engine/platform/linuxbsd/export/export_plugin.cpp
index 9d00b556..6c470d9b 100644
--- a/engine/platform/linuxbsd/export/export_plugin.cpp
+++ b/engine/platform/linuxbsd/export/export_plugin.cpp
@@ -33,15 +33,12 @@
 #include "logo_svg.gen.h"
 #include "run_icon_svg.gen.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
 #include "editor/file_system/editor_paths.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 
 #include "modules/svg/image_loader_svg.h"
@@ -407,7 +404,15 @@ Ref<Texture2D> EditorExportPlatformLinuxBSD::get_run_icon() const {
 }
 
 bool EditorExportPlatformLinuxBSD::poll_export() {
-	Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(this);
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == this) {
+			preset = ep;
+			break;
+		}
+	}
 
 	int prev = menu_options;
 	menu_options = (preset.is_valid() && preset->get("ssh_remote_deploy/enabled").operator bool());
@@ -490,19 +495,19 @@ Error EditorExportPlatformLinuxBSD::run(const Ref<EditorExportPreset> &p_preset,
 
 	const String basepath = dest.path_join("tmp_linuxbsd_export");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
-		if (da->file_exists(basepath + ".zip")) { \
-			da->remove(basepath + ".zip"); \
-		} \
+#define CLEANUP_AND_RETURN(m_err)                      \
+	{                                                  \
+		if (da->file_exists(basepath + ".zip")) {      \
+			da->remove(basepath + ".zip");             \
+		}                                              \
 		if (da->file_exists(basepath + "_start.sh")) { \
-			da->remove(basepath + "_start.sh"); \
-		} \
+			da->remove(basepath + "_start.sh");        \
+		}                                              \
 		if (da->file_exists(basepath + "_clean.sh")) { \
-			da->remove(basepath + "_clean.sh"); \
-		} \
-		return m_err; \
-	} \
+			da->remove(basepath + "_clean.sh");        \
+		}                                              \
+		return m_err;                                  \
+	}                                                  \
 	((void)0)
 
 	if (ep.step(TTR("Exporting project..."), 1)) {
diff --git a/engine/platform/linuxbsd/export/export_plugin.h b/engine/platform/linuxbsd/export/export_plugin.h
index 397098ef..91f84f5a 100644
--- a/engine/platform/linuxbsd/export/export_plugin.h
+++ b/engine/platform/linuxbsd/export/export_plugin.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "core/os/process_id.h"
+#include "core/io/file_access.h"
 #include "editor/export/editor_export_platform_pc.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/resources/image_texture.h"
 
 class EditorExportPlatformLinuxBSD : public EditorExportPlatformPC {
@@ -60,7 +61,7 @@ class EditorExportPlatformLinuxBSD : public EditorExportPlatformPC {
 	Ref<ImageTexture> stop_icon;
 
 	Vector<SSHCleanupCommand> cleanup_commands;
-	ProcessID ssh_pid = 0;
+	OS::ProcessID ssh_pid = 0;
 	int menu_options = 0;
 
 	bool is_elf(const String &p_path) const;
diff --git a/engine/platform/linuxbsd/fontconfig-so_wrap.c b/engine/platform/linuxbsd/fontconfig-so_wrap.c
index 003710c3..86aacbc6 100644
--- a/engine/platform/linuxbsd/fontconfig-so_wrap.c
+++ b/engine/platform/linuxbsd/fontconfig-so_wrap.c
@@ -210,7 +210,7 @@
 #define FcStrListDone FcStrListDone_dylibloader_orig_fontconfig
 #define FcConfigParseAndLoad FcConfigParseAndLoad_dylibloader_orig_fontconfig
 #define FcConfigParseAndLoadFromMemory FcConfigParseAndLoadFromMemory_dylibloader_orig_fontconfig
-#include <thirdparty/linuxbsd_headers/fontconfig/fontconfig.h>
+#include "thirdparty/linuxbsd_headers/fontconfig/fontconfig.h"
 #undef FcBlanksCreate
 #undef FcBlanksDestroy
 #undef FcBlanksAdd
diff --git a/engine/platform/linuxbsd/fontconfig-so_wrap.h b/engine/platform/linuxbsd/fontconfig-so_wrap.h
index e361a137..956c0947 100644
--- a/engine/platform/linuxbsd/fontconfig-so_wrap.h
+++ b/engine/platform/linuxbsd/fontconfig-so_wrap.h
@@ -212,7 +212,7 @@
 #define FcStrListDone FcStrListDone_dylibloader_orig_fontconfig
 #define FcConfigParseAndLoad FcConfigParseAndLoad_dylibloader_orig_fontconfig
 #define FcConfigParseAndLoadFromMemory FcConfigParseAndLoadFromMemory_dylibloader_orig_fontconfig
-#include <thirdparty/linuxbsd_headers/fontconfig/fontconfig.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/fontconfig/fontconfig.h"
 #undef FcBlanksCreate
 #undef FcBlanksDestroy
 #undef FcBlanksAdd
diff --git a/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp
index fb9e73f1..8f7e8bf6 100644
--- a/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp
+++ b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp
@@ -32,6 +32,8 @@
 
 #ifdef DBUS_ENABLED
 
+#include "core/os/os.h"
+
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"
 #else
diff --git a/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
index 6e836ce7..56ce401f 100644
--- a/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
+++ b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
@@ -33,7 +33,7 @@
 #ifdef DBUS_ENABLED
 
 #include "core/os/thread.h"
-#include "core/templates/safe_refcount.h"
+#include "core/os/thread_safe.h"
 
 class FreeDesktopAtSPIMonitor {
 private:
diff --git a/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp b/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
index ff248b4f..f0937152 100644
--- a/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
+++ b/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
@@ -34,12 +34,9 @@
 
 #include "core/crypto/crypto_core.h"
 #include "core/error/error_macros.h"
-#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
-#include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
-#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"
@@ -682,12 +679,12 @@ bool FreeDesktopPortalDesktop::send_request(DBusMessage *p_message, const String
 	return true;
 }
 
-Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServerEnums::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb) {
+Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServer::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb) {
 	if (unsupported) {
 		return FAILED;
 	}
 
-	ERR_FAIL_INDEX_V(int(p_mode), DisplayServerEnums::FILE_DIALOG_MODE_SAVE_MAX, FAILED);
+	ERR_FAIL_INDEX_V(int(p_mode), DisplayServer::FILE_DIALOG_MODE_SAVE_MAX, FAILED);
 	ERR_FAIL_NULL_V(monitor_connection, FAILED);
 
 	Vector<String> filter_names;
@@ -741,7 +738,7 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServerEnums::WindowID p_
 
 	// Generate FileChooser message.
 	const char *method = nullptr;
-	if (p_mode == DisplayServerEnums::FILE_DIALOG_MODE_SAVE_FILE) {
+	if (p_mode == DisplayServer::FILE_DIALOG_MODE_SAVE_FILE) {
 		method = "SaveFile";
 	} else {
 		method = "OpenFile";
@@ -759,13 +756,13 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServerEnums::WindowID p_
 		dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &arr_iter);
 
 		append_dbus_dict_string(&arr_iter, "handle_token", token);
-		append_dbus_dict_bool(&arr_iter, "multiple", p_mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILES);
-		append_dbus_dict_bool(&arr_iter, "directory", p_mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_DIR);
+		append_dbus_dict_bool(&arr_iter, "multiple", p_mode == DisplayServer::FILE_DIALOG_MODE_OPEN_FILES);
+		append_dbus_dict_bool(&arr_iter, "directory", p_mode == DisplayServer::FILE_DIALOG_MODE_OPEN_DIR);
 		append_dbus_dict_filters(&arr_iter, filter_names, filter_exts, filter_mimes);
 
 		append_dbus_dict_options(&arr_iter, p_options, fd.option_ids);
 		append_dbus_dict_string(&arr_iter, "current_folder", p_current_directory, true);
-		if (p_mode == DisplayServerEnums::FILE_DIALOG_MODE_SAVE_FILE) {
+		if (p_mode == DisplayServer::FILE_DIALOG_MODE_SAVE_FILE) {
 			append_dbus_dict_string(&arr_iter, "current_name", p_filename);
 		}
 
@@ -950,7 +947,7 @@ void FreeDesktopPortalDesktop::_thread_monitor(void *p_ud) {
 										cb.opt_in_cb = fd.opt_in_cb;
 										portal->pending_file_cbs.push_back(cb);
 									}
-									if (fd.prev_focus != DisplayServerEnums::INVALID_WINDOW_ID) {
+									if (fd.prev_focus != DisplayServer::INVALID_WINDOW_ID) {
 										callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(fd.prev_focus);
 									}
 								}
diff --git a/engine/platform/linuxbsd/freedesktop_portal_desktop.h b/engine/platform/linuxbsd/freedesktop_portal_desktop.h
index 7d102d44..aca41acc 100644
--- a/engine/platform/linuxbsd/freedesktop_portal_desktop.h
+++ b/engine/platform/linuxbsd/freedesktop_portal_desktop.h
@@ -32,11 +32,9 @@
 
 #ifdef DBUS_ENABLED
 
-#include "core/object/object.h"
-#include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "core/templates/safe_refcount.h"
-#include "servers/display/display_server_enums.h"
+#include "core/os/thread_safe.h"
+#include "servers/display/display_server.h"
 
 struct DBusMessage;
 struct DBusConnection;
@@ -89,7 +87,7 @@ private:
 	struct FileDialogData {
 		Vector<String> filter_names;
 		HashMap<String, String> option_ids;
-		DisplayServerEnums::WindowID prev_focus = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID prev_focus = DisplayServer::INVALID_WINDOW_ID;
 		Callable callback;
 		String filter;
 		String path;
@@ -134,7 +132,7 @@ public:
 	bool is_inhibit_supported();
 
 	// org.freedesktop.portal.FileChooser methods.
-	Error file_dialog_show(DisplayServerEnums::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
+	Error file_dialog_show(DisplayServer::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServer::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
 	void process_callbacks();
 
 	// org.freedesktop.portal.Settings methods.
diff --git a/engine/platform/linuxbsd/godot_linuxbsd.cpp b/engine/platform/linuxbsd/godot_linuxbsd.cpp
index d96c940e..acfd4d95 100644
--- a/engine/platform/linuxbsd/godot_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/godot_linuxbsd.cpp
@@ -34,12 +34,11 @@
 #include "main/main.h"
 
 #include <unistd.h>
-
+#include <climits>
 #include <clocale>
-#include <cstdio>
 #include <cstdlib>
 
-#if defined(ASAN_ENABLED)
+#if defined(SANITIZERS_ENABLED)
 #include <sys/resource.h>
 #endif
 
@@ -89,7 +88,7 @@ int main(int argc, char *argv[]) {
 	}
 #endif
 
-#if defined(ASAN_ENABLED)
+#if defined(SANITIZERS_ENABLED)
 	// Note: Set stack size to be at least 30 MB (vs 8 MB default) to avoid overflow, address sanitizer can increase stack usage up to 3 times.
 	struct rlimit stack_lim = { 0x1E00000, 0x1E00000 };
 	setrlimit(RLIMIT_STACK, &stack_lim);
diff --git a/engine/platform/linuxbsd/libgodot_linuxbsd.cpp b/engine/platform/linuxbsd/libgodot_linuxbsd.cpp
index a5434a65..6ae9d4c5 100644
--- a/engine/platform/linuxbsd/libgodot_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/libgodot_linuxbsd.cpp
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "os_linuxbsd.h"
+#include "core/extension/libgodot.h"
 
 #include "core/extension/godot_instance.h"
-#include "core/extension/libgodot.h"
 #include "main/main.h"
 
+#include "os_linuxbsd.h"
+
 static OS_LinuxBSD *os = nullptr;
 
 static GodotInstance *instance = nullptr;
diff --git a/engine/platform/linuxbsd/os_linuxbsd.cpp b/engine/platform/linuxbsd/os_linuxbsd.cpp
index 43d71295..9f66a8f2 100644
--- a/engine/platform/linuxbsd/os_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/os_linuxbsd.cpp
@@ -34,16 +34,14 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
+#ifdef SDL_ENABLED
+#include "drivers/sdl/joypad_sdl.h"
+#endif
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
-#ifdef SDL_ENABLED
-#include "drivers/sdl/joypad_sdl.h"
-#endif
-
 #ifdef X11_ENABLED
 #include "x11/detect_prime_x11.h"
 #include "x11/display_server_x11.h"
@@ -80,7 +78,6 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <unistd.h>
-
 #include <cstdio>
 #include <cstdlib>
 
@@ -92,14 +89,6 @@
 #include <sys/sysctl.h>
 #endif
 
-#ifdef FONTCONFIG_ENABLED
-#ifdef SOWRAP_ENABLED
-#include "fontconfig-so_wrap.h"
-#else
-#include <fontconfig/fontconfig.h>
-#endif
-#endif
-
 void OS_LinuxBSD::alert(const String &p_alert, const String &p_title) {
 	const char *message_programs[] = { "zenity", "kdialog", "Xdialog", "xmessage" };
 
diff --git a/engine/platform/linuxbsd/os_linuxbsd.h b/engine/platform/linuxbsd/os_linuxbsd.h
index d483e619..7bd4918e 100644
--- a/engine/platform/linuxbsd/os_linuxbsd.h
+++ b/engine/platform/linuxbsd/os_linuxbsd.h
@@ -32,18 +32,22 @@
 
 #include "crash_handler_linuxbsd.h"
 
-#include "core/input/input_event.h"
+#include "core/input/input.h"
 #include "drivers/alsa/audio_driver_alsa.h"
 #include "drivers/alsamidi/midi_driver_alsamidi.h"
 #include "drivers/pulseaudio/audio_driver_pulseaudio.h"
 #include "drivers/unix/os_unix.h"
-
-class JoypadSDL;
+#include "servers/audio/audio_server.h"
 
 #ifdef FONTCONFIG_ENABLED
-typedef struct _FcConfig FcConfig;
-typedef struct _FcObjectSet FcObjectSet;
+#ifdef SOWRAP_ENABLED
+#include "fontconfig-so_wrap.h"
+#else
+#include <fontconfig/fontconfig.h>
 #endif
+#endif
+
+class JoypadSDL;
 
 class OS_LinuxBSD : public OS_Unix {
 	virtual void delete_main_loop() override;
diff --git a/engine/platform/linuxbsd/platform_gl.h b/engine/platform/linuxbsd/platform_gl.h
index ba1e0219..73477b50 100644
--- a/engine/platform/linuxbsd/platform_gl.h
+++ b/engine/platform/linuxbsd/platform_gl.h
@@ -38,11 +38,5 @@
 #define GLES_API_ENABLED // Allow using GLES.
 #endif
 
-#ifndef GLAD_GLES2
-#define GLAD_GLES2
-#endif
-
-// IWYU pragma: begin_exports.
-#include <thirdparty/glad/glad/egl.h>
-#include <thirdparty/glad/glad/gl.h>
-// IWYU pragma: end_exports.
+#include "thirdparty/glad/glad/egl.h"
+#include "thirdparty/glad/glad/gl.h"
diff --git a/engine/platform/linuxbsd/speechd-so_wrap.c b/engine/platform/linuxbsd/speechd-so_wrap.c
index 1bb496d3..1dc5f08c 100644
--- a/engine/platform/linuxbsd/speechd-so_wrap.c
+++ b/engine/platform/linuxbsd/speechd-so_wrap.c
@@ -80,7 +80,7 @@
 #define spd_execute_command_wo_mutex spd_execute_command_wo_mutex_dylibloader_orig_speechd
 #define spd_send_data spd_send_data_dylibloader_orig_speechd
 #define spd_send_data_wo_mutex spd_send_data_wo_mutex_dylibloader_orig_speechd
-#include <thirdparty/linuxbsd_headers/speechd/libspeechd.h>
+#include "thirdparty/linuxbsd_headers/speechd/libspeechd.h"
 #undef SPDConnectionAddress__free
 #undef spd_get_default_address
 #undef spd_open
diff --git a/engine/platform/linuxbsd/speechd-so_wrap.h b/engine/platform/linuxbsd/speechd-so_wrap.h
index eba7d743..2967cfa9 100644
--- a/engine/platform/linuxbsd/speechd-so_wrap.h
+++ b/engine/platform/linuxbsd/speechd-so_wrap.h
@@ -82,7 +82,7 @@
 #define spd_execute_command_wo_mutex spd_execute_command_wo_mutex_dylibloader_orig_speechd
 #define spd_send_data spd_send_data_dylibloader_orig_speechd
 #define spd_send_data_wo_mutex spd_send_data_wo_mutex_dylibloader_orig_speechd
-#include <thirdparty/linuxbsd_headers/speechd/libspeechd.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/speechd/libspeechd.h"
 #undef SPDConnectionAddress__free
 #undef spd_get_default_address
 #undef spd_open
diff --git a/engine/platform/linuxbsd/tts_linux.cpp b/engine/platform/linuxbsd/tts_linux.cpp
index 974d9008..4284ac43 100644
--- a/engine/platform/linuxbsd/tts_linux.cpp
+++ b/engine/platform/linuxbsd/tts_linux.cpp
@@ -31,8 +31,6 @@
 #include "tts_linux.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "servers/display/display_server.h"
 #include "servers/text/text_server.h"
 
 TTS_Linux *TTS_Linux::singleton = nullptr;
@@ -92,7 +90,7 @@ void TTS_Linux::_speech_index_mark(int p_msg_id, int p_type, const String &p_ind
 	_THREAD_SAFE_METHOD_
 
 	if (ids.has(p_msg_id)) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, ids[p_msg_id], p_index_mark.to_int());
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, ids[p_msg_id], p_index_mark.to_int());
 	}
 }
 
@@ -126,19 +124,19 @@ void TTS_Linux::_speech_event(int p_msg_id, int p_type) {
 
 	if (!paused && ids.has(p_msg_id)) {
 		if ((SPDNotificationType)p_type == SPD_EVENT_END) {
-			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, ids[p_msg_id]);
+			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, ids[p_msg_id]);
 			ids.erase(p_msg_id);
 			last_msg_id = -1;
 			speaking = false;
 		} else if ((SPDNotificationType)p_type == SPD_EVENT_CANCEL) {
-			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[p_msg_id]);
+			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[p_msg_id]);
 			ids.erase(p_msg_id);
 			last_msg_id = -1;
 			speaking = false;
 		}
 	}
 	if (!speaking && queue.size() > 0) {
-		TTSUtterance &message = queue.front()->get();
+		DisplayServer::TTSUtterance &message = queue.front()->get();
 
 		// Inject index mark after each word.
 		String text;
@@ -176,7 +174,7 @@ void TTS_Linux::_speech_event(int p_msg_id, int p_type) {
 		spd_set_data_mode(synth, SPD_DATA_SSML);
 		last_msg_id = spd_say(synth, SPD_TEXT, text.utf8().get_data());
 		ids[last_msg_id] = message.id;
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, message.id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_STARTED, message.id);
 
 		queue.pop_front();
 		speaking = true;
@@ -218,11 +216,11 @@ void TTS_Linux::speak(const String &p_text, const String &p_voice, int p_volume,
 	}
 
 	if (p_text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_utterance_id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, p_utterance_id);
 		return;
 	}
 
-	TTSUtterance message;
+	DisplayServer::TTSUtterance message;
 	message.text = p_text;
 	message.voice = p_voice;
 	message.volume = CLAMP(p_volume, 0, 100);
@@ -259,11 +257,11 @@ void TTS_Linux::stop() {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_NULL(synth);
-	for (TTSUtterance &message : queue) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
+	for (DisplayServer::TTSUtterance &message : queue) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, message.id);
 	}
 	if ((last_msg_id != -1) && ids.has(last_msg_id)) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[last_msg_id]);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[last_msg_id]);
 	}
 	queue.clear();
 	ids.clear();
diff --git a/engine/platform/linuxbsd/tts_linux.h b/engine/platform/linuxbsd/tts_linux.h
index 5bf36608..42647b8a 100644
--- a/engine/platform/linuxbsd/tts_linux.h
+++ b/engine/platform/linuxbsd/tts_linux.h
@@ -30,13 +30,13 @@
 
 #pragma once
 
-#include "core/object/object.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "speechd-so_wrap.h"
@@ -44,13 +44,11 @@
 #include <libspeechd.h>
 #endif
 
-struct TTSUtterance;
-
 class TTS_Linux : public Object {
 	GDSOFTCLASS(TTS_Linux, Object);
 	_THREAD_SAFE_CLASS_
 
-	List<TTSUtterance> queue;
+	List<DisplayServer::TTSUtterance> queue;
 	SPDConnection *synth = nullptr;
 	bool speaking = false;
 	bool paused = false;
diff --git a/engine/platform/linuxbsd/wayland/SCsub b/engine/platform/linuxbsd/wayland/SCsub
index e8531a17..7bdf03da 100644
--- a/engine/platform/linuxbsd/wayland/SCsub
+++ b/engine/platform/linuxbsd/wayland/SCsub
@@ -58,9 +58,6 @@ generated_sources = [
     generate_from_xml("viewporter", "#thirdparty/wayland-protocols/stable/viewporter/viewporter.xml"),
     generate_from_xml("xdg_shell", "#thirdparty/wayland-protocols/stable/xdg-shell/xdg-shell.xml"),
     # Staging protocols
-    generate_from_xml(
-        "color_management", "#thirdparty/wayland-protocols/staging/color-management/color-management-v1.xml"
-    ),
     generate_from_xml("cursor_shape", "#thirdparty/wayland-protocols/staging/cursor-shape/cursor-shape-v1.xml"),
     generate_from_xml(
         "fractional_scale", "#thirdparty/wayland-protocols/staging/fractional-scale/fractional-scale-v1.xml"
@@ -72,7 +69,6 @@ generated_sources = [
     generate_from_xml(
         "xdg_toplevel_icon", "#thirdparty/wayland-protocols/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml"
     ),
-    generate_from_xml("pointer_warp", "#thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml"),
     # Unstable protocols
     generate_from_xml(
         "idle_inhibit", "#thirdparty/wayland-protocols/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml"
@@ -127,11 +123,13 @@ source_files = generated_sources + [
 ]
 
 if env["use_sowrap"]:
-    source_files.append([
-        File("dynwrappers/wayland-cursor-so_wrap.c"),
-        File("dynwrappers/wayland-client-core-so_wrap.c"),
-        File("dynwrappers/wayland-egl-core-so_wrap.c"),
-    ])
+    source_files.append(
+        [
+            File("dynwrappers/wayland-cursor-so_wrap.c"),
+            File("dynwrappers/wayland-client-core-so_wrap.c"),
+            File("dynwrappers/wayland-egl-core-so_wrap.c"),
+        ]
+    )
 
     if env["libdecor"]:
         source_files.append(File("dynwrappers/libdecor-so_wrap.c"))
diff --git a/engine/platform/linuxbsd/wayland/detect_prime_egl.cpp b/engine/platform/linuxbsd/wayland/detect_prime_egl.cpp
index 1169e364..8c697aa1 100644
--- a/engine/platform/linuxbsd/wayland/detect_prime_egl.cpp
+++ b/engine/platform/linuxbsd/wayland/detect_prime_egl.cpp
@@ -33,15 +33,12 @@
 
 #include "detect_prime_egl.h"
 
-#include "core/core_globals.h"
 #include "core/string/print_string.h"
-#include "core/string/ustring.h"
-#include "core/variant/variant.h" // IWYU pragma: keep. Needed for print_verbose.
+#include "core/variant/variant.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
 #include <cstdlib>
 
 // To prevent shadowing warnings.
diff --git a/engine/platform/linuxbsd/wayland/detect_prime_egl.h b/engine/platform/linuxbsd/wayland/detect_prime_egl.h
index 7add8566..6a29ee81 100644
--- a/engine/platform/linuxbsd/wayland/detect_prime_egl.h
+++ b/engine/platform/linuxbsd/wayland/detect_prime_egl.h
@@ -34,7 +34,8 @@
 #ifdef EGL_ENABLED
 
 #ifdef GLAD_ENABLED
-#include <platform_gl.h>
+#include "thirdparty/glad/glad/egl.h"
+#include "thirdparty/glad/glad/gl.h"
 #else
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/engine/platform/linuxbsd/wayland/display_server_wayland.cpp b/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
index 6eb34196..2e3881eb 100644
--- a/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
+++ b/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -39,39 +39,26 @@
 #define DEBUG_LOG_WAYLAND(...)
 #endif
 
-#include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/input/input_event.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/native_menu.h"
 #include "servers/rendering/dummy/rasterizer_dummy.h"
-#include "servers/rendering/rendering_server.h"
 
-#ifdef RD_ENABLED
 #ifdef VULKAN_ENABLED
-#include "wayland/rendering_context_driver_vulkan_wayland.h"
-#endif
-
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
 
 #ifdef GLES3_ENABLED
+#include "core/io/file_access.h"
 #include "detect_prime_egl.h"
+#include "drivers/gles3/rasterizer_gles3.h"
 #include "wayland/egl_manager_wayland.h"
 #include "wayland/egl_manager_wayland_gles.h"
+#endif
 
-#include "core/io/file_access.h"
-#include "drivers/egl/egl_manager.h"
-#include "drivers/gles3/rasterizer_gles3.h"
+#ifdef ACCESSKIT_ENABLED
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
 #endif
 
 #ifdef DBUS_ENABLED
-#include "freedesktop_at_spi_monitor.h"
-#include "freedesktop_portal_desktop.h"
-#include "freedesktop_screensaver.h"
-
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"
 #else
@@ -79,26 +66,22 @@
 #endif
 #endif
 
-#ifdef SPEECHD_ENABLED
-#include "tts_linux.h"
-#endif
-
 #define WAYLAND_MAX_FRAME_TIME_US (1'000'000)
 #define WINDOW_READY_TIMEOUT_MS (10'000)
 
-String DisplayServerWayland::_get_app_id_from_context(DisplayServerEnums::Context p_context) {
+String DisplayServerWayland::_get_app_id_from_context(Context p_context) {
 	String app_id;
 
 	switch (p_context) {
-		case DisplayServerEnums::CONTEXT_EDITOR: {
+		case CONTEXT_EDITOR: {
 			app_id = "org.godotengine.Editor";
 		} break;
 
-		case DisplayServerEnums::CONTEXT_PROJECTMAN: {
+		case CONTEXT_PROJECTMAN: {
 			app_id = "org.godotengine.ProjectManager";
 		} break;
 
-		case DisplayServerEnums::CONTEXT_ENGINE:
+		case CONTEXT_ENGINE:
 		default: {
 			String config_name = GLOBAL_GET("application/config/name");
 			if (config_name.length() != 0) {
@@ -112,7 +95,7 @@ String DisplayServerWayland::_get_app_id_from_context(DisplayServerEnums::Contex
 	return app_id;
 }
 
-void DisplayServerWayland::_send_window_event(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::_send_window_event(WindowEvent p_event, WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 
 	WindowData &wd = windows[p_window_id];
@@ -131,7 +114,7 @@ void DisplayServerWayland::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	Ref<InputEventFromWindow> event_from_window = p_event;
 
 	if (event_from_window.is_valid()) {
-		DisplayServerEnums::WindowID window_id = event_from_window->get_window_id();
+		WindowID window_id = event_from_window->get_window_id();
 
 		Ref<InputEventKey> key_event = p_event;
 		if (!popup_menu_list.is_empty() && key_event.is_valid()) {
@@ -149,7 +132,7 @@ void DisplayServerWayland::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	} else {
 		// Send to all windows. Copy all pending callbacks, since callback can erase window.
 		Vector<Callable> cbs;
-		for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+		for (KeyValue<WindowID, WindowData> &E : windows) {
 			Callable callable = E.value.input_event_callback;
 			if (callable.is_valid()) {
 				cbs.push_back(callable);
@@ -162,7 +145,7 @@ void DisplayServerWayland::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	}
 }
 
-void DisplayServerWayland::_delete_window(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::_delete_window(WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowData &wd = windows[p_window_id];
 
@@ -173,12 +156,12 @@ void DisplayServerWayland::_delete_window(DisplayServerEnums::WindowID p_window_
 	// the window will be gone and the message will be discarded, confusing the
 	// engine. We thus have to send it ourselves.
 	if (wayland_thread.pointer_get_pointed_window_id() == p_window_id) {
-		_send_window_event(DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT, p_window_id);
+		_send_window_event(WINDOW_EVENT_MOUSE_EXIT, p_window_id);
 	}
 
 	// The XDG shell specification requires us to clear all popups in reverse order.
 	while (!root_wd.popup_stack.is_empty() && root_wd.popup_stack.back()->get() != p_window_id) {
-		_send_window_event(DisplayServerEnums::WINDOW_EVENT_FORCE_CLOSE, root_wd.popup_stack.back()->get());
+		_send_window_event(WINDOW_EVENT_FORCE_CLOSE, root_wd.popup_stack.back()->get());
 	}
 
 	if (root_wd.popup_stack.back() && root_wd.popup_stack.back()->get() == p_window_id) {
@@ -189,7 +172,11 @@ void DisplayServerWayland::_delete_window(DisplayServerEnums::WindowID p_window_
 		popup_menu_list.pop_back();
 	}
 
-	AccessibilityServer::get_singleton()->window_destroy(p_window_id);
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_window_id);
+	}
+#endif
 
 	if (wd.visible) {
 #ifdef VULKAN_ENABLED
@@ -218,7 +205,7 @@ void DisplayServerWayland::_delete_window(DisplayServerEnums::WindowID p_window_
 	DEBUG_LOG_WAYLAND(vformat("Destroyed window %d", p_window_id));
 }
 
-void DisplayServerWayland::_update_window_rect(const Rect2i &p_rect, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::_update_window_rect(const Rect2i &p_rect, WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 
 	WindowData &wd = windows[p_window_id];
@@ -248,55 +235,56 @@ void DisplayServerWayland::_update_window_rect(const Rect2i &p_rect, DisplayServ
 
 // Interface methods.
 
-bool DisplayServerWayland::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerWayland::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_ICON:
-		case DisplayServerEnums::FEATURE_HIDPI:
-		case DisplayServerEnums::FEATURE_SWAP_BUFFERS:
-		case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_WINDOW_DRAG:
-		case DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY:
-		case DisplayServerEnums::FEATURE_SUBWINDOWS:
-		case DisplayServerEnums::FEATURE_WINDOW_EMBEDDING:
-		case DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS:
-		case DisplayServerEnums::FEATURE_HDR_OUTPUT: {
+		case FEATURE_MOUSE:
+		case FEATURE_MOUSE_WARP:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+		case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_ICON:
+		case FEATURE_HIDPI:
+		case FEATURE_SWAP_BUFFERS:
+		case FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_IME:
+		case FEATURE_WINDOW_DRAG:
+		case FEATURE_CLIPBOARD_PRIMARY:
+		case FEATURE_SUBWINDOWS:
+		case FEATURE_WINDOW_EMBEDDING:
+		case FEATURE_SELF_FITTING_WINDOWS: {
 			return true;
 		} break;
 
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
+		//case FEATURE_NATIVE_DIALOG:
+		//case FEATURE_NATIVE_DIALOG_INPUT:
 #ifdef DBUS_ENABLED
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME: {
+		case FEATURE_NATIVE_DIALOG_FILE:
+		case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		case FEATURE_NATIVE_DIALOG_FILE_MIME: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_file_chooser_supported());
 		} break;
-		case DisplayServerEnums::FEATURE_NATIVE_COLOR_PICKER: {
+		case FEATURE_NATIVE_COLOR_PICKER: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_screenshot_supported());
 		} break;
 #endif
 
 #ifdef SPEECHD_ENABLED
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH: {
+		case FEATURE_TEXT_TO_SPEECH: {
 			return true;
 		} break;
 #endif
 
-		case DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER: {
-			return AccessibilityServer::get_singleton()->is_supported();
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
 		} break;
+#endif
 
 		default: {
 			return false;
@@ -407,13 +395,13 @@ void DisplayServerWayland::set_system_theme_change_callback(const Callable &p_ca
 	portal_desktop->set_system_theme_change_callback(p_callable);
 }
 
-Error DisplayServerWayland::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWayland::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	ERR_FAIL_COND_V(!portal_desktop, ERR_UNAVAILABLE);
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	DisplayServerEnums::WindowID window_id = p_window_id;
-	if (!windows.has(window_id) || window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_id = p_window_id;
+	if (!windows.has(window_id) || window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	WaylandThread::WindowState *ws = wayland_thread.window_get_state(window_id);
@@ -422,13 +410,13 @@ Error DisplayServerWayland::file_dialog_show(const String &p_title, const String
 	return portal_desktop->file_dialog_show(window_id, (ws ? ws->exported_handle : String()), p_title, p_current_directory, String(), p_filename, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
 }
 
-Error DisplayServerWayland::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWayland::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	ERR_FAIL_COND_V(!portal_desktop, ERR_UNAVAILABLE);
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	DisplayServerEnums::WindowID window_id = p_window_id;
-	if (!windows.has(window_id) || window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_id = p_window_id;
+	if (!windows.has(window_id) || window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	WaylandThread::WindowState *ws = wayland_thread.window_get_state(window_id);
@@ -444,7 +432,7 @@ void DisplayServerWayland::beep() const {
 }
 
 void DisplayServerWayland::_mouse_update_mode() {
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
 			? mouse_mode_override
 			: mouse_mode_base;
 
@@ -454,19 +442,19 @@ void DisplayServerWayland::_mouse_update_mode() {
 
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	bool show_cursor = (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED);
+	bool show_cursor = (wanted_mouse_mode == MOUSE_MODE_VISIBLE || wanted_mouse_mode == MOUSE_MODE_CONFINED);
 
 	wayland_thread.cursor_set_visible(show_cursor);
 
 	WaylandThread::PointerConstraint constraint = WaylandThread::PointerConstraint::NONE;
 
 	switch (wanted_mouse_mode) {
-		case DisplayServerEnums::MOUSE_MODE_CAPTURED: {
+		case DisplayServer::MOUSE_MODE_CAPTURED: {
 			constraint = WaylandThread::PointerConstraint::LOCKED;
 		} break;
 
-		case DisplayServerEnums::MOUSE_MODE_CONFINED:
-		case DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN: {
+		case DisplayServer::MOUSE_MODE_CONFINED:
+		case DisplayServer::MOUSE_MODE_CONFINED_HIDDEN: {
 			constraint = WaylandThread::PointerConstraint::CONFINED;
 		} break;
 
@@ -476,7 +464,7 @@ void DisplayServerWayland::_mouse_update_mode() {
 
 	wayland_thread.pointer_set_constraint(constraint);
 
-	if (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (wanted_mouse_mode == DisplayServer::MOUSE_MODE_CAPTURED) {
 		WindowData *pointed_win = windows.getptr(wayland_thread.pointer_get_pointed_window_id());
 		ERR_FAIL_NULL(pointed_win);
 		wayland_thread.pointer_set_hint(pointed_win->rect.size / 2);
@@ -485,8 +473,8 @@ void DisplayServerWayland::_mouse_update_mode() {
 	mouse_mode = wanted_mouse_mode;
 }
 
-void DisplayServerWayland::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWayland::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_base) {
 		return;
 	}
@@ -494,12 +482,12 @@ void DisplayServerWayland::mouse_set_mode(DisplayServerEnums::MouseMode p_mode)
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWayland::mouse_get_mode() const {
+DisplayServerWayland::MouseMode DisplayServerWayland::mouse_get_mode() const {
 	return mouse_mode;
 }
 
-void DisplayServerWayland::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWayland::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_override) {
 		return;
 	}
@@ -507,7 +495,7 @@ void DisplayServerWayland::mouse_set_mode_override(DisplayServerEnums::MouseMode
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWayland::mouse_get_mode_override() const {
+DisplayServerWayland::MouseMode DisplayServerWayland::mouse_get_mode_override() const {
 	return mouse_mode_override;
 }
 
@@ -523,17 +511,28 @@ bool DisplayServerWayland::mouse_is_mode_override_enabled() const {
 	return mouse_mode_override_enabled;
 }
 
+// NOTE: This is hacked together (and not guaranteed to work in the first place)
+// as for some reason the there's no proper way to ask the compositor to warp
+// the pointer, although, at the time of writing, there's a proposal for a
+// proper protocol for this. See:
+// https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/158
 void DisplayServerWayland::warp_mouse(const Point2i &p_to) {
 	MutexLock mutex_lock(wayland_thread.mutex);
-	wayland_thread.pointer_warp(p_to);
+
+	WaylandThread::PointerConstraint old_constraint = wayland_thread.pointer_get_constraint();
+
+	wayland_thread.pointer_set_constraint(WaylandThread::PointerConstraint::LOCKED);
+	wayland_thread.pointer_set_hint(p_to);
+
+	wayland_thread.pointer_set_constraint(old_constraint);
 }
 
 Point2i DisplayServerWayland::mouse_get_position() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	DisplayServerEnums::WindowID pointed_id = wayland_thread.pointer_get_pointed_window_id();
+	WindowID pointed_id = wayland_thread.pointer_get_pointed_window_id();
 
-	if (pointed_id != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(pointed_id)) {
+	if (pointed_id != INVALID_WINDOW_ID && windows.has(pointed_id)) {
 		return Input::get_singleton()->get_mouse_position() + windows[pointed_id].rect.position;
 	}
 
@@ -709,13 +708,13 @@ int DisplayServerWayland::screen_get_dpi(int p_screen) const {
 float DisplayServerWayland::screen_get_scale(int p_screen) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	if (p_screen == DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) {
+	if (p_screen == SCREEN_OF_MAIN_WINDOW) {
 		// Wayland does not expose fractional scale factors at the screen-level, but
 		// some code relies on it. Since this special screen is the default and a lot
 		// of code relies on it, we'll return the window's scale, which is what we
 		// really care about. After all, we have very little use of the actual screen
 		// enumeration APIs and we're (for now) in single-window mode anyways.
-		struct wl_surface *wl_surface = wayland_thread.window_get_wl_surface(DisplayServerEnums::MAIN_WINDOW_ID);
+		struct wl_surface *wl_surface = wayland_thread.window_get_wl_surface(MAIN_WINDOW_ID);
 		WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wl_surface);
 
 		return wayland_thread.window_state_get_scale_factor(ws);
@@ -747,14 +746,14 @@ void DisplayServerWayland::screen_set_keep_on(bool p_enable) {
 		return;
 	}
 
-	wayland_thread.window_set_idle_inhibition(DisplayServerEnums::MAIN_WINDOW_ID, p_enable);
+	wayland_thread.window_set_idle_inhibition(MAIN_WINDOW_ID, p_enable);
 
 #ifdef DBUS_ENABLED
 	if (portal_desktop && portal_desktop->is_inhibit_supported()) {
 		if (p_enable) {
 			// Attach the inhibit request to the main window, not the last focused window,
 			// on the basis that inhibiting the screensaver is global state for the application.
-			DisplayServerEnums::WindowID window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			WindowID window_id = MAIN_WINDOW_ID;
 			WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
 			screensaver_inhibited = portal_desktop->inhibit(ws ? ws->exported_handle : String());
 		} else {
@@ -776,24 +775,24 @@ void DisplayServerWayland::screen_set_keep_on(bool p_enable) {
 bool DisplayServerWayland::screen_is_kept_on() const {
 	// FIXME: Multiwindow support.
 #ifdef DBUS_ENABLED
-	return wayland_thread.window_get_idle_inhibition(DisplayServerEnums::MAIN_WINDOW_ID) || screensaver_inhibited;
+	return wayland_thread.window_get_idle_inhibition(MAIN_WINDOW_ID) || screensaver_inhibited;
 #else
-	return wayland_thread.window_get_idle_inhibition(DisplayServerEnums::MAIN_WINDOW_ID);
+	return wayland_thread.window_get_idle_inhibition(MAIN_WINDOW_ID);
 #endif
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerWayland::get_window_list() const {
+Vector<DisplayServer::WindowID> DisplayServerWayland::get_window_list() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	Vector<int> ret;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		ret.push_back(E.key);
 	}
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerWayland::create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent) {
-	DisplayServerEnums::WindowID id = ++window_id_counter;
+DisplayServer::WindowID DisplayServerWayland::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
+	WindowID id = ++window_id_counter;
 	WindowData &wd = windows[id];
 
 	wd.id = id;
@@ -801,11 +800,15 @@ DisplayServerEnums::WindowID DisplayServerWayland::create_sub_window(DisplayServ
 	wd.flags = p_flags;
 	wd.vsync_mode = p_vsync_mode;
 
-	if (!AccessibilityServer::get_singleton()->window_create(wd.id, nullptr)) {
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver && !accessibility_driver->window_create(wd.id, nullptr)) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
 		}
+		memdelete(accessibility_driver);
+		accessibility_driver = nullptr;
 	}
+#endif
 
 	// NOTE: Remember to clear its position if this window will be a toplevel. We
 	// can only know once we show it.
@@ -816,7 +819,7 @@ DisplayServerEnums::WindowID DisplayServerWayland::create_sub_window(DisplayServ
 	return id;
 }
 
-void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::show_window(WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -828,19 +831,19 @@ void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id)
 		// Showing this window will reset its mode with whatever the compositor
 		// reports. We'll save the mode beforehand so that we can reapply it later.
 		// TODO: Fix/Port/Move/Whatever to `WaylandThread` APIs.
-		DisplayServerEnums::WindowMode setup_mode = wd.mode;
+		WindowMode setup_mode = wd.mode;
 
 		// Let's determine the closest toplevel. For toplevels it will be themselves,
 		// for popups the first toplevel ancestor it finds.
-		DisplayServerEnums::WindowID root_id = wd.id;
-		while (root_id != DisplayServerEnums::INVALID_WINDOW_ID && window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT, root_id)) {
+		WindowID root_id = wd.id;
+		while (root_id != INVALID_WINDOW_ID && window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, root_id)) {
 			root_id = windows[root_id].parent_id;
 		}
-		ERR_FAIL_COND(root_id == DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_COND(root_id == INVALID_WINDOW_ID);
 
 		wd.root_id = root_id;
 
-		if (!window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT, p_window_id)) {
+		if (!window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, p_window_id)) {
 			// NOTE: DO **NOT** KEEP THE POSITION SET FOR TOPLEVELS. Wayland does not
 			// track them and we're gonna get our events transformed in unexpected ways.
 			wd.rect.position = Point2i();
@@ -850,7 +853,7 @@ void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id)
 			wayland_thread.window_set_min_size(p_window_id, wd.min_size);
 			wayland_thread.window_set_max_size(p_window_id, wd.max_size);
 			wayland_thread.window_set_app_id(p_window_id, _get_app_id_from_context(context));
-			wayland_thread.window_set_borderless(p_window_id, window_get_flag(DisplayServerEnums::WINDOW_FLAG_BORDERLESS, p_window_id));
+			wayland_thread.window_set_borderless(p_window_id, window_get_flag(WINDOW_FLAG_BORDERLESS, p_window_id));
 
 			// Since it can't have a position. Let's tell the window node the news by
 			// sending the actual rect to it.
@@ -862,7 +865,7 @@ void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id)
 
 			windows[root_id].popup_stack.push_back(p_window_id);
 
-			if (window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP, p_window_id)) {
+			if (window_get_flag(WINDOW_FLAG_POPUP, p_window_id)) {
 				// Reroutes all input to it.
 				popup_menu_list.push_back(p_window_id);
 			}
@@ -875,7 +878,7 @@ void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id)
 		bool ready = wayland_thread.window_wait_ready(p_window_id, WINDOW_READY_TIMEOUT_MS);
 		if (!ready) {
 			ERR_PRINT(vformat("Could not create window %d: timeout.", p_window_id));
-			_send_window_event(DisplayServerEnums::WINDOW_EVENT_FORCE_CLOSE, p_window_id);
+			_send_window_event(WINDOW_EVENT_FORCE_CLOSE, p_window_id);
 
 			return;
 		}
@@ -938,25 +941,25 @@ void DisplayServerWayland::show_window(DisplayServerEnums::WindowID p_window_id)
 	}
 }
 
-void DisplayServerWayland::delete_sub_window(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::delete_sub_window(WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	ERR_FAIL_COND_MSG(p_window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be deleted");
+	ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't be deleted");
 
 	_delete_window(p_window_id);
 }
 
-DisplayServerEnums::WindowID DisplayServerWayland::window_get_active_popup() const {
+DisplayServer::WindowID DisplayServerWayland::window_get_active_popup() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	if (!popup_menu_list.is_empty()) {
 		return popup_menu_list.back()->get();
 	}
 
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+	return INVALID_WINDOW_ID;
 }
 
-void DisplayServerWayland::window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) {
+void DisplayServerWayland::window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -964,7 +967,7 @@ void DisplayServerWayland::window_set_popup_safe_rect(DisplayServerEnums::Window
 	windows[p_window].safe_rect = p_rect;
 }
 
-Rect2i DisplayServerWayland::window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const {
+Rect2i DisplayServerWayland::window_get_popup_safe_rect(WindowID p_window) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Rect2i());
@@ -972,36 +975,36 @@ Rect2i DisplayServerWayland::window_get_popup_safe_rect(DisplayServerEnums::Wind
 	return windows[p_window].safe_rect;
 }
 
-int64_t DisplayServerWayland::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
+int64_t DisplayServerWayland::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	switch (p_handle_type) {
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			return (int64_t)wayland_thread.get_wl_display();
 		} break;
 
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return (int64_t)wayland_thread.window_get_wl_surface(p_window);
 		} break;
 
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			return 0; // Not supported.
 		} break;
 
 #ifdef GLES3_ENABLED
-		case DisplayServerEnums::OPENGL_CONTEXT: {
+		case OPENGL_CONTEXT: {
 			if (egl_manager) {
 				return (int64_t)egl_manager->get_context(p_window);
 			}
 			return 0;
 		} break;
-		case DisplayServerEnums::EGL_DISPLAY: {
+		case EGL_DISPLAY: {
 			if (egl_manager) {
 				return (int64_t)egl_manager->get_display(p_window);
 			}
 			return 0;
 		}
-		case DisplayServerEnums::EGL_CONFIG: {
+		case EGL_CONFIG: {
 			if (egl_manager) {
 				return (int64_t)egl_manager->get_config(p_window);
 			}
@@ -1015,12 +1018,12 @@ int64_t DisplayServerWayland::window_get_native_handle(DisplayServerEnums::Handl
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerWayland::get_window_at_screen_position(const Point2i &p_position) const {
+DisplayServer::WindowID DisplayServerWayland::get_window_at_screen_position(const Point2i &p_position) const {
 	// Standard Wayland APIs don't support this.
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+	return MAIN_WINDOW_ID;
 }
 
-void DisplayServerWayland::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_attach_instance_id(ObjectID p_instance, WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1028,7 +1031,7 @@ void DisplayServerWayland::window_attach_instance_id(ObjectID p_instance, Displa
 	windows[p_window_id].instance_id = p_instance;
 }
 
-ObjectID DisplayServerWayland::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window_id) const {
+ObjectID DisplayServerWayland::window_get_attached_instance_id(WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window_id), ObjectID());
@@ -1036,7 +1039,7 @@ ObjectID DisplayServerWayland::window_get_attached_instance_id(DisplayServerEnum
 	return windows[p_window_id].instance_id;
 }
 
-void DisplayServerWayland::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_title(const String &p_title, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1050,12 +1053,12 @@ void DisplayServerWayland::window_set_title(const String &p_title, DisplayServer
 	}
 }
 
-void DisplayServerWayland::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServer::WindowID p_window_id) {
 	// TODO
 	DEBUG_LOG_WAYLAND(vformat("wayland stub window_set_mouse_passthrough region %s", p_region));
 }
 
-void DisplayServerWayland::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_rect_changed_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1063,7 +1066,7 @@ void DisplayServerWayland::window_set_rect_changed_callback(const Callable &p_ca
 	windows[p_window_id].rect_changed_callback = p_callable;
 }
 
-void DisplayServerWayland::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_window_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1071,7 +1074,7 @@ void DisplayServerWayland::window_set_window_event_callback(const Callable &p_ca
 	windows[p_window_id].window_event_callback = p_callable;
 }
 
-void DisplayServerWayland::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_input_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1079,7 +1082,7 @@ void DisplayServerWayland::window_set_input_event_callback(const Callable &p_cal
 	windows[p_window_id].input_event_callback = p_callable;
 }
 
-void DisplayServerWayland::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_input_text_callback(const Callable &p_callable, WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1087,7 +1090,7 @@ void DisplayServerWayland::window_set_input_text_callback(const Callable &p_call
 	windows[p_window_id].input_text_callback = p_callable;
 }
 
-void DisplayServerWayland::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_drop_files_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1095,33 +1098,33 @@ void DisplayServerWayland::window_set_drop_files_callback(const Callable &p_call
 	windows[p_window_id].drop_files_callback = p_callable;
 }
 
-int DisplayServerWayland::window_get_current_screen(DisplayServerEnums::WindowID p_window_id) const {
-	ERR_FAIL_COND_V(!windows.has(p_window_id), DisplayServerEnums::INVALID_SCREEN);
+int DisplayServerWayland::window_get_current_screen(DisplayServer::WindowID p_window_id) const {
+	ERR_FAIL_COND_V(!windows.has(p_window_id), INVALID_SCREEN);
 	// Standard Wayland APIs don't support getting the screen of a window.
 	return 0;
 }
 
-void DisplayServerWayland::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_current_screen(int p_screen, DisplayServer::WindowID p_window_id) {
 	// Standard Wayland APIs don't support setting the screen of a window.
 }
 
-Point2i DisplayServerWayland::window_get_position(DisplayServerEnums::WindowID p_window_id) const {
+Point2i DisplayServerWayland::window_get_position(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	return windows[p_window_id].rect.position;
 }
 
-Point2i DisplayServerWayland::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window_id) const {
+Point2i DisplayServerWayland::window_get_position_with_decorations(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	return windows[p_window_id].rect.position;
 }
 
-void DisplayServerWayland::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_position(const Point2i &p_position, DisplayServer::WindowID p_window_id) {
 	// Unsupported with toplevels.
 }
 
-void DisplayServerWayland::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_max_size(const Size2i p_size, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	DEBUG_LOG_WAYLAND(vformat("window max size set to %s", p_size));
@@ -1146,14 +1149,14 @@ void DisplayServerWayland::window_set_max_size(const Size2i p_size, DisplayServe
 	}
 }
 
-Size2i DisplayServerWayland::window_get_max_size(DisplayServerEnums::WindowID p_window_id) const {
+Size2i DisplayServerWayland::window_get_max_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
 	return windows[p_window_id].max_size;
 }
 
-void DisplayServerWayland::gl_window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 #ifdef GLES3_ENABLED
 	if (egl_manager) {
 		egl_manager->window_make_current(p_window_id);
@@ -1161,7 +1164,7 @@ void DisplayServerWayland::gl_window_make_current(DisplayServerEnums::WindowID p
 #endif
 }
 
-void DisplayServerWayland::window_set_transient(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerWayland::window_set_transient(WindowID p_window_id, WindowID p_parent) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1169,9 +1172,9 @@ void DisplayServerWayland::window_set_transient(DisplayServerEnums::WindowID p_w
 
 	ERR_FAIL_COND(wd.parent_id == p_parent);
 
-	if (p_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_parent != INVALID_WINDOW_ID) {
 		ERR_FAIL_COND(!windows.has(p_parent));
-		ERR_FAIL_COND_MSG(wd.parent_id != DisplayServerEnums::INVALID_WINDOW_ID, "Window already has a transient parent");
+		ERR_FAIL_COND_MSG(wd.parent_id != INVALID_WINDOW_ID, "Window already has a transient parent");
 		wd.parent_id = p_parent;
 
 		// NOTE: Looks like live unparenting is not really practical unfortunately.
@@ -1182,7 +1185,7 @@ void DisplayServerWayland::window_set_transient(DisplayServerEnums::WindowID p_w
 	}
 }
 
-void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	DEBUG_LOG_WAYLAND(vformat("window minsize set to %s", p_size));
@@ -1207,14 +1210,14 @@ void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServe
 	}
 }
 
-Size2i DisplayServerWayland::window_get_min_size(DisplayServerEnums::WindowID p_window_id) const {
+Size2i DisplayServerWayland::window_get_min_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
 	return windows[p_window_id].min_size;
 }
 
-void DisplayServerWayland::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_size(const Size2i p_size, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1234,14 +1237,14 @@ void DisplayServerWayland::window_set_size(const Size2i p_size, DisplayServerEnu
 	_update_window_rect(Rect2i(wd.rect.position, new_size), p_window_id);
 }
 
-Size2i DisplayServerWayland::window_get_size(DisplayServerEnums::WindowID p_window_id) const {
+Size2i DisplayServerWayland::window_get_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
 	return windows[p_window_id].rect.size;
 }
 
-Size2i DisplayServerWayland::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window_id) const {
+Size2i DisplayServerWayland::window_get_size_with_decorations(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	// I don't think there's a way of actually knowing the size of the window
@@ -1251,7 +1254,7 @@ Size2i DisplayServerWayland::window_get_size_with_decorations(DisplayServerEnums
 	return windows[p_window_id].rect.size;
 }
 
-float DisplayServerWayland::window_get_scale(DisplayServerEnums::WindowID p_window_id) const {
+float DisplayServerWayland::window_get_scale(WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	const WaylandThread::WindowState *ws = wayland_thread.window_get_state(p_window_id);
@@ -1260,7 +1263,7 @@ float DisplayServerWayland::window_get_scale(DisplayServerEnums::WindowID p_wind
 	return wayland_thread.window_state_get_scale_factor(ws);
 }
 
-void DisplayServerWayland::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_mode(WindowMode p_mode, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1273,33 +1276,26 @@ void DisplayServerWayland::window_set_mode(DisplayServerEnums::WindowMode p_mode
 	wayland_thread.window_try_set_mode(p_window_id, p_mode);
 }
 
-void DisplayServerWayland::window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window_id) {
+DisplayServer::WindowMode DisplayServerWayland::window_get_mode(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	wayland_thread.set_icon(p_icon, p_window_id);
-}
-
-DisplayServerEnums::WindowMode DisplayServerWayland::window_get_mode(DisplayServerEnums::WindowID p_window_id) const {
-	MutexLock mutex_lock(wayland_thread.mutex);
-
-	ERR_FAIL_COND_V(!windows.has(p_window_id), DisplayServerEnums::WINDOW_MODE_WINDOWED);
+	ERR_FAIL_COND_V(!windows.has(p_window_id), WINDOW_MODE_WINDOWED);
 	const WindowData &wd = windows[p_window_id];
 
 	if (!wd.created) {
-		return DisplayServerEnums::WINDOW_MODE_WINDOWED;
+		return WINDOW_MODE_WINDOWED;
 	}
 
 	return wayland_thread.window_get_mode(p_window_id);
 }
 
-bool DisplayServerWayland::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window_id) const {
+bool DisplayServerWayland::window_is_maximize_allowed(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return wayland_thread.window_can_set_mode(p_window_id, DisplayServerEnums::WINDOW_MODE_MAXIMIZED);
+	return wayland_thread.window_can_set_mode(p_window_id, WINDOW_MODE_MAXIMIZED);
 }
 
-void DisplayServerWayland::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_flag(WindowFlags p_flag, bool p_enabled, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND(!windows.has(p_window_id));
@@ -1308,18 +1304,18 @@ void DisplayServerWayland::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 	DEBUG_LOG_WAYLAND(vformat("Window set flag %d", p_flag));
 
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			wayland_thread.window_set_borderless(p_window_id, p_enabled);
 		} break;
 
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
-			ERR_FAIL_COND_MSG(p_window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be popup.");
-			ERR_FAIL_COND_MSG(wd.created && (wd.flags & DisplayServerEnums::WINDOW_FLAG_POPUP_BIT) != p_enabled, "Popup flag can't changed while window is opened.");
+		case WINDOW_FLAG_POPUP: {
+			ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't be popup.");
+			ERR_FAIL_COND_MSG(wd.created && (wd.flags & WINDOW_FLAG_POPUP_BIT) != p_enabled, "Popup flag can't changed while window is opened.");
 		} break;
 
-		case DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT: {
-			ERR_FAIL_COND_MSG(p_window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't have popup hint.");
-			ERR_FAIL_COND_MSG(wd.created && (wd.flags & DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT_BIT) != p_enabled, "Popup hint can't changed while window is opened.");
+		case WINDOW_FLAG_POPUP_WM_HINT: {
+			ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't have popup hint.");
+			ERR_FAIL_COND_MSG(wd.created && (wd.flags & WINDOW_FLAG_POPUP_WM_HINT_BIT) != p_enabled, "Popup hint can't changed while window is opened.");
 		} break;
 
 		default: {
@@ -1333,14 +1329,14 @@ void DisplayServerWayland::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 	}
 }
 
-bool DisplayServerWayland::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window_id) const {
+bool DisplayServerWayland::window_get_flag(WindowFlags p_flag, DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
 	return windows[p_window_id].flags & (1 << p_flag);
 }
 
-void DisplayServerWayland::window_request_attention(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_request_attention(DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	DEBUG_LOG_WAYLAND("Requested attention.");
@@ -1348,17 +1344,17 @@ void DisplayServerWayland::window_request_attention(DisplayServerEnums::WindowID
 	wayland_thread.window_request_attention(p_window_id);
 }
 
-void DisplayServerWayland::window_move_to_foreground(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_move_to_foreground(DisplayServer::WindowID p_window_id) {
 	// Standard Wayland APIs don't support this.
 }
 
-bool DisplayServerWayland::window_is_focused(DisplayServerEnums::WindowID p_window_id) const {
+bool DisplayServerWayland::window_is_focused(WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	return wayland_thread.pointer_get_pointed_window_id() == p_window_id;
 }
 
-bool DisplayServerWayland::window_can_draw(DisplayServerEnums::WindowID p_window_id) const {
+bool DisplayServerWayland::window_can_draw(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	uint64_t last_frame_time = wayland_thread.window_get_last_frame_time(p_window_id);
@@ -1379,13 +1375,13 @@ bool DisplayServerWayland::can_any_window_draw() const {
 	return suspend_state == SuspendState::NONE;
 }
 
-void DisplayServerWayland::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_ime_active(const bool p_active, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	wayland_thread.window_set_ime_active(p_active, p_window_id);
 }
 
-void DisplayServerWayland::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_ime_position(const Point2i &p_pos, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	wayland_thread.window_set_ime_position(p_pos, p_window_id);
@@ -1422,7 +1418,7 @@ String DisplayServerWayland::ime_get_text() const {
 // 1.30 added a protocol for allowing async flips which is supposed to be
 // handled by drivers such as Vulkan. We can then just ask to disable v-sync and
 // hope for the best. See: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/6394f0b4f3be151076f10a845a2fb131eeb56706
-void DisplayServerWayland::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWayland::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	WindowData &wd = windows[p_window_id];
@@ -1431,18 +1427,18 @@ void DisplayServerWayland::window_set_vsync_mode(DisplayServerEnums::VSyncMode p
 	if (rendering_context) {
 		rendering_context->window_set_vsync_mode(p_window_id, p_vsync_mode);
 
-		wd.emulate_vsync = (!wayland_thread.is_fifo_available() && rendering_context->window_get_vsync_mode(p_window_id) == DisplayServerEnums::VSYNC_ENABLED);
+		wd.emulate_vsync = (!wayland_thread.is_fifo_available() && rendering_context->window_get_vsync_mode(p_window_id) == DisplayServer::VSYNC_ENABLED);
 
 		if (wd.emulate_vsync) {
 			print_verbose("VSYNC: manually throttling frames using MAILBOX.");
-			rendering_context->window_set_vsync_mode(p_window_id, DisplayServerEnums::VSYNC_MAILBOX);
+			rendering_context->window_set_vsync_mode(p_window_id, DisplayServer::VSYNC_MAILBOX);
 		}
 	}
 #endif // VULKAN_ENABLED
 
 #ifdef GLES3_ENABLED
 	if (egl_manager) {
-		egl_manager->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		egl_manager->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 
 		// NOTE: Mesa's EGL implementation does not seem to make use of fifo_v1 so
 		// we'll have to always emulate V-Sync.
@@ -1456,10 +1452,10 @@ void DisplayServerWayland::window_set_vsync_mode(DisplayServerEnums::VSyncMode p
 #endif // GLES3_ENABLED
 }
 
-DisplayServerEnums::VSyncMode DisplayServerWayland::window_get_vsync_mode(DisplayServerEnums::WindowID p_window_id) const {
+DisplayServer::VSyncMode DisplayServerWayland::window_get_vsync_mode(DisplayServer::WindowID p_window_id) const {
 	const WindowData &wd = windows[p_window_id];
 	if (wd.emulate_vsync) {
-		return DisplayServerEnums::VSYNC_ENABLED;
+		return DisplayServer::VSYNC_ENABLED;
 	}
 
 #ifdef VULKAN_ENABLED
@@ -1470,148 +1466,28 @@ DisplayServerEnums::VSyncMode DisplayServerWayland::window_get_vsync_mode(Displa
 
 #ifdef GLES3_ENABLED
 	if (egl_manager) {
-		return egl_manager->is_using_vsync() ? DisplayServerEnums::VSYNC_ENABLED : DisplayServerEnums::VSYNC_DISABLED;
+		return egl_manager->is_using_vsync() ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
 #endif // GLES3_ENABLED
 
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
-void DisplayServerWayland::window_start_drag(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWayland::window_start_drag(WindowID p_window) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	wayland_thread.window_start_drag(p_window);
 }
 
-void DisplayServerWayland::window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWayland::window_start_resize(WindowResizeEdge p_edge, WindowID p_window) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	ERR_FAIL_INDEX(int(p_edge), DisplayServerEnums::WINDOW_EDGE_MAX);
+	ERR_FAIL_INDEX(int(p_edge), WINDOW_EDGE_MAX);
 	wayland_thread.window_start_resize(p_edge, p_window);
 }
 
-void DisplayServerWayland::_window_update_hdr_state(WindowData &p_window) {
-	DisplayServerEnums::WindowID window_id = p_window.id;
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		// The `display/window/hdr/request_hdr_output` project setting makes the main window "request" HDR.
-		// On Windows, this means enable HDR for the main window if it is on an HDR screen.
-		// Since all screens support HDR on Wayland, we use whether the window "prefers" HDR or not instead.
-		bool hdr_preferred = p_window.color_profile.target_max_luminance > p_window.color_profile.reference_luminance;
-		bool hdr_desired = wayland_thread.supports_hdr() && hdr_preferred && p_window.hdr_requested;
-
-		if (rendering_context->window_get_hdr_output_enabled(window_id) != hdr_desired) {
-			rendering_context->window_set_hdr_output_enabled(window_id, hdr_desired);
-			_send_window_event(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED, window_id);
-		}
-
-		if (hdr_desired) {
-			rendering_context->window_set_hdr_output_max_luminance(window_id, p_window.color_profile.target_max_luminance);
-			rendering_context->window_set_hdr_output_reference_luminance(window_id, p_window.color_profile.reference_luminance);
-			rendering_context->window_set_hdr_output_linear_luminance_scale(window_id, p_window.color_profile.target_max_luminance);
-
-			p_window.color_profile.named_primary = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
-			p_window.color_profile.named_transfer_function = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
-		} else {
-			p_window.color_profile.named_primary = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
-			p_window.color_profile.named_transfer_function = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22;
-		}
-
-		if (p_window.visible) {
-			MutexLock mutex_lock(wayland_thread.mutex);
-			wayland_thread.window_set_color_profile(window_id, p_window.color_profile);
-		}
-	}
-#endif
-}
-
-bool DisplayServerWayland::window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window_id) const {
-	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
-	const WindowData &wd = windows[p_window_id];
-
-	return wd.color_profile.target_max_luminance > wd.color_profile.reference_luminance;
-}
-
-void DisplayServerWayland::window_request_hdr_output(const bool p_enabled, DisplayServerEnums::WindowID p_window_id) {
-#if defined(RD_ENABLED)
-	ERR_FAIL_COND_MSG(p_enabled && !(rendering_device && rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT)), "HDR output is not supported by the rendering device.");
-#endif
-
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	WindowData &wd = windows[p_window_id];
-	wd.hdr_requested = p_enabled;
-
-	_window_update_hdr_state(wd);
-}
-
-bool DisplayServerWayland::window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window_id) const {
-	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
-	const WindowData &wd = windows[p_window_id];
-	return wd.hdr_requested;
-}
-
-bool DisplayServerWayland::window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window_id) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_enabled(p_window_id);
-	}
-#endif
-	return false;
-}
-
-void DisplayServerWayland::window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window_id) {
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	if (p_reference_luminance >= 0.0f) {
-		ERR_PRINT_ONCE("Manually setting reference white luminance is not supported on Linux devices, as they provide a user-facing brightness setting that directly controls reference white luminance.");
-	}
-}
-
-float DisplayServerWayland::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window_id) const {
-	return -1.0;
-}
-
-float DisplayServerWayland::window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window_id) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_reference_luminance(p_window_id);
-	}
-#endif
-	return 0.0f;
-}
-
-void DisplayServerWayland::window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window_id) {
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	if (p_max_luminance >= 0.0f) {
-		ERR_PRINT_ONCE("Manually setting max luminance is not supported on Linux devices as they provide a built-in method of calibrating max luminance without the need for additional apps or tools.");
-	}
-}
-
-float DisplayServerWayland::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window_id) const {
-	return -1.0;
-}
-
-float DisplayServerWayland::window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window_id) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_max_luminance(p_window_id);
-	}
-#endif
-	return 0.0f;
-}
-
-float DisplayServerWayland::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window_id) const {
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_output_max_linear_value(p_window_id);
-	}
-#endif
-
-	return 1.0f;
-}
-
-void DisplayServerWayland::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+void DisplayServerWayland::cursor_set_shape(CursorShape p_shape) {
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	MutexLock mutex_lock(wayland_thread.mutex);
 
@@ -1621,7 +1497,7 @@ void DisplayServerWayland::cursor_set_shape(DisplayServerEnums::CursorShape p_sh
 
 	cursor_shape = p_shape;
 
-	if (mouse_mode != DisplayServerEnums::MOUSE_MODE_VISIBLE && mouse_mode != DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
 		// Hidden.
 		return;
 	}
@@ -1629,17 +1505,17 @@ void DisplayServerWayland::cursor_set_shape(DisplayServerEnums::CursorShape p_sh
 	wayland_thread.cursor_set_shape(p_shape);
 }
 
-DisplayServerEnums::CursorShape DisplayServerWayland::cursor_get_shape() const {
+DisplayServerWayland::CursorShape DisplayServerWayland::cursor_get_shape() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	return cursor_shape;
 }
 
-void DisplayServerWayland::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+void DisplayServerWayland::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	if (p_cursor.is_valid()) {
-		HashMap<DisplayServerEnums::CursorShape, CustomCursor>::Iterator cursor_c = custom_cursors.find(p_shape);
+		HashMap<CursorShape, CustomCursor>::Iterator cursor_c = custom_cursors.find(p_shape);
 
 		if (cursor_c) {
 			if (cursor_c->value.resource == p_cursor && cursor_c->value.hotspot == p_hotspot) {
@@ -1682,7 +1558,7 @@ bool DisplayServerWayland::get_swap_cancel_ok() {
 	return swap_cancel_ok;
 }
 
-Error DisplayServerWayland::embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
+Error DisplayServerWayland::embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	struct godot_embedding_compositor *ec = wayland_thread.get_embedding_compositor();
@@ -1734,7 +1610,7 @@ Error DisplayServerWayland::embed_process(DisplayServerEnums::WindowID p_window,
 	return OK;
 }
 
-Error DisplayServerWayland::request_close_embedded_process(ProcessID p_pid) {
+Error DisplayServerWayland::request_close_embedded_process(OS::ProcessID p_pid) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	struct godot_embedding_compositor *ec = wayland_thread.get_embedding_compositor();
@@ -1755,14 +1631,14 @@ Error DisplayServerWayland::request_close_embedded_process(ProcessID p_pid) {
 	return OK;
 }
 
-Error DisplayServerWayland::remove_embedded_process(ProcessID p_pid) {
+Error DisplayServerWayland::remove_embedded_process(OS::ProcessID p_pid) {
 	return request_close_embedded_process(p_pid);
 }
 
-ProcessID DisplayServerWayland::get_focused_process_id() {
+OS::ProcessID DisplayServerWayland::get_focused_process_id() {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	ProcessID embedded_pid = wayland_thread.embedded_compositor_get_focused_pid();
+	OS::ProcessID embedded_pid = wayland_thread.embedded_compositor_get_focused_pid();
 
 	if (embedded_pid < 0) {
 		return OS::get_singleton()->get_process_id();
@@ -1838,7 +1714,7 @@ bool DisplayServerWayland::color_picker(const Callable &p_callback) {
 		return false;
 	}
 	MutexLock mutex_lock(wayland_thread.mutex);
-	DisplayServerEnums::WindowID window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_id = MAIN_WINDOW_ID;
 	// TODO: Use window IDs for multiwindow support.
 	WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
 	return portal_desktop->color_picker((ws ? ws->exported_handle : String()), p_callback);
@@ -1864,48 +1740,13 @@ void DisplayServerWayland::process_events() {
 
 	wayland_thread.keyboard_echo_keys();
 
-#if defined(RD_ENABLED)
-	// Enabling HDR may have failed, in which case we need to clear the color profile.
-	// NOTE: this happens _before_ reading events because the rendering driver is only updated the frame _after_ we try to enable HDR.
-	if (rendering_device && (!OS::get_singleton()->is_in_low_processor_usage_mode() || RS::get_singleton()->has_changed())) {
-		for (KeyValue<DisplayServerEnums::WindowID, WindowData> &pair : windows) {
-			const RD::ColorSpace color_space = rendering_device->screen_get_color_space(pair.key);
-
-			bool dirty_srgb = color_space == RDD::COLOR_SPACE_REC709_NONLINEAR_SRGB && pair.value.color_profile.named_transfer_function != WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22;
-			bool dirty_linear = color_space == RDD::COLOR_SPACE_REC709_LINEAR && pair.value.color_profile.named_transfer_function != WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
-
-			if (dirty_srgb) {
-				pair.value.color_profile.named_primary = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
-				pair.value.color_profile.named_transfer_function = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22;
-
-				if (pair.value.visible) {
-					wayland_thread.window_set_color_profile(pair.key, pair.value.color_profile);
-				}
-
-				rendering_context->window_set_hdr_output_enabled(pair.key, false);
-				_send_window_event(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED, pair.key);
-			} else if (dirty_linear) {
-				pair.value.color_profile.named_primary = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
-				pair.value.color_profile.named_transfer_function = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
-
-				if (pair.value.visible) {
-					wayland_thread.window_set_color_profile(pair.key, pair.value.color_profile);
-				}
-
-				rendering_context->window_set_hdr_output_enabled(pair.key, true);
-				_send_window_event(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED, pair.key);
-			}
-		}
-	}
-#endif
-
 	while (wayland_thread.has_message()) {
 		Ref<WaylandThread::Message> msg = wayland_thread.pop_message();
 
 		// Generic check. Not actual message handling.
 		Ref<WaylandThread::WindowMessage> win_msg = msg;
 		if (win_msg.is_valid()) {
-			ERR_CONTINUE_MSG(win_msg->id == DisplayServerEnums::INVALID_WINDOW_ID, "Invalid window ID received from Wayland thread.");
+			ERR_CONTINUE_MSG(win_msg->id == INVALID_WINDOW_ID, "Invalid window ID received from Wayland thread.");
 
 			if (!windows.has(win_msg->id)) {
 				// Window got probably deleted.
@@ -1915,23 +1756,7 @@ void DisplayServerWayland::process_events() {
 
 		Ref<WaylandThread::WindowRectMessage> winrect_msg = msg;
 		if (winrect_msg.is_valid()) {
-			int scale = winrect_msg->buffer_scale;
-
-			WaylandThread::WindowState *ws = wayland_thread.window_get_state(winrect_msg->id);
-			ERR_CONTINUE(ws == nullptr);
-
-			if (scale == 0) {
-				// This should *never* happen. We fallback to the latest scale but it might
-				// have changed in the meantime to something invalid (non-integer divisor),
-				// leading to a protocol error.
-				ERR_PRINT("Wayland Thread did not report buffer scale at the time of resize.");
-				scale = wayland_thread.window_state_get_preferred_buffer_scale(ws);
-			}
-
-			wayland_thread.window_state_set_buffer_scale(ws, scale);
-
 			_update_window_rect(winrect_msg->rect, winrect_msg->id);
-
 			continue;
 		}
 
@@ -1939,13 +1764,21 @@ void DisplayServerWayland::process_events() {
 		if (winev_msg.is_valid() && windows.has(winev_msg->id)) {
 			_send_window_event(winev_msg->event, winev_msg->id);
 
-			if (winev_msg->event == DisplayServerEnums::WINDOW_EVENT_FOCUS_IN) {
-				AccessibilityServer::get_singleton()->set_window_focused(winev_msg->id, true);
+			if (winev_msg->event == WINDOW_EVENT_FOCUS_IN) {
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(winev_msg->id, true);
+				}
+#endif
 				if (OS::get_singleton()->get_main_loop()) {
 					OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN);
 				}
-			} else if (winev_msg->event == DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT) {
-				AccessibilityServer::get_singleton()->set_window_focused(winev_msg->id, false);
+			} else if (winev_msg->event == WINDOW_EVENT_FOCUS_OUT) {
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(winev_msg->id, false);
+				}
+#endif
 				if (OS::get_singleton()->get_main_loop()) {
 					OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT);
 				}
@@ -1963,8 +1796,8 @@ void DisplayServerWayland::process_events() {
 				BitField<MouseButtonMask> mouse_mask = mb->get_button_mask();
 				if (!popup_menu_list.is_empty() && mb->is_pressed() && mouse_mask != last_mouse_monitor_mask) {
 					// Popup menu handling.
-					List<DisplayServerEnums::WindowID>::Element *E = popup_menu_list.back();
-					List<DisplayServerEnums::WindowID>::Element *C = nullptr;
+					List<WindowID>::Element *E = popup_menu_list.back();
+					List<WindowID>::Element *C = nullptr;
 
 					// Looking for the oldest popup to close.
 					while (E) {
@@ -1982,7 +1815,7 @@ void DisplayServerWayland::process_events() {
 
 					if (C) {
 						handled = true;
-						_send_window_event(DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST, C->get());
+						_send_window_event(WINDOW_EVENT_CLOSE_REQUEST, C->get());
 					}
 				}
 
@@ -2046,22 +1879,12 @@ void DisplayServerWayland::process_events() {
 			}
 			continue;
 		}
-
-		Ref<WaylandThread::ColorProfileMessage> color_profile_msg = msg;
-		if (color_profile_msg.is_valid()) {
-			WindowData &wd = windows[color_profile_msg->id];
-			wd.color_profile = color_profile_msg->color_profile;
-
-			_window_update_hdr_state(wd);
-			_send_window_event(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED, wd.id);
-			continue;
-		}
 	}
 
 	switch (suspend_state) {
 		case SuspendState::NONE: {
 			bool emulate_vsync = false;
-			for (KeyValue<DisplayServerEnums::WindowID, WindowData> &pair : windows) {
+			for (KeyValue<DisplayServer::WindowID, WindowData> &pair : windows) {
 				if (pair.value.emulate_vsync) {
 					emulate_vsync = true;
 					break;
@@ -2158,11 +1981,10 @@ void DisplayServerWayland::swap_buffers() {
 
 void DisplayServerWayland::set_icon(const Ref<Image> &p_icon) {
 	MutexLock mutex_lock(wayland_thread.mutex);
-
-	wayland_thread.set_default_icon(p_icon);
+	wayland_thread.set_icon(p_icon);
 }
 
-void DisplayServerWayland::set_context(DisplayServerEnums::Context p_context) {
+void DisplayServerWayland::set_context(Context p_context) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	DEBUG_LOG_WAYLAND(vformat("Setting context %d.", p_context));
@@ -2170,7 +1992,7 @@ void DisplayServerWayland::set_context(DisplayServerEnums::Context p_context) {
 	context = p_context;
 
 	String app_id = _get_app_id_from_context(p_context);
-	wayland_thread.window_set_app_id(DisplayServerEnums::MAIN_WINDOW_ID, app_id);
+	wayland_thread.window_set_app_id(MAIN_WINDOW_ID, app_id);
 }
 
 bool DisplayServerWayland::is_window_transparency_available() const {
@@ -2198,7 +2020,7 @@ Vector<String> DisplayServerWayland::get_rendering_drivers_func() {
 	return drivers;
 }
 
-DisplayServer *DisplayServerWayland::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerWayland::create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	DisplayServer *ds = memnew(DisplayServerWayland(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_resolution, p_context, p_parent_window, r_error));
 	if (r_error != OK) {
 		ERR_PRINT("Can't create the Wayland display server.");
@@ -2209,7 +2031,7 @@ DisplayServer *DisplayServerWayland::create_func(const String &p_rendering_drive
 	return ds;
 }
 
-DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, Context p_context, int64_t p_parent_window, Error &r_error) {
 #if defined(GLES3_ENABLED) || defined(DBUS_ENABLED)
 #ifdef SOWRAP_ENABLED
 #ifdef DEBUG_ENABLED
@@ -2249,6 +2071,16 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 	}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	rendering_driver = p_rendering_driver;
 
 	bool driver_found = false;
@@ -2275,8 +2107,8 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
 				WARN_PRINT("Your video card drivers seem not to support the required Vulkan version, switching to OpenGL 3.");
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else
 #endif // GLES3_ENABLED
 			{
@@ -2363,7 +2195,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 				if (fallback) {
 					WARN_PRINT("Your video card drivers seem not to support the required OpenGL version, switching to OpenGLES.");
 					rendering_driver = "opengl3_es";
-					OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+					OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 				} else {
 					r_error = ERR_UNAVAILABLE;
 
@@ -2415,26 +2247,30 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 		ERR_FAIL_MSG("Video driver not found.");
 	}
 
-	cursor_set_shape(DisplayServerEnums::CURSOR_BUSY);
+	cursor_set_shape(CURSOR_BUSY);
 
-	WindowData &wd = windows[DisplayServerEnums::MAIN_WINDOW_ID];
+	WindowData &wd = windows[MAIN_WINDOW_ID];
 
-	wd.id = DisplayServerEnums::MAIN_WINDOW_ID;
+	wd.id = MAIN_WINDOW_ID;
 	wd.mode = p_mode;
 	wd.flags = p_flags;
 	wd.vsync_mode = p_vsync_mode;
 	wd.rect.size = p_resolution;
 	wd.title = "Godot";
 
-	if (!AccessibilityServer::get_singleton()->window_create(wd.id, nullptr)) {
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver && !accessibility_driver->window_create(wd.id, nullptr)) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
 		}
+		memdelete(accessibility_driver);
+		accessibility_driver = nullptr;
 	}
+#endif
 
-	show_window(DisplayServerEnums::MAIN_WINDOW_ID);
+	show_window(MAIN_WINDOW_ID);
 
-	if (!windows.has(DisplayServerEnums::MAIN_WINDOW_ID) || !windows[DisplayServerEnums::MAIN_WINDOW_ID].visible) {
+	if (!windows.has(MAIN_WINDOW_ID) || !windows[MAIN_WINDOW_ID].visible) {
 		ERR_PRINT("Could not map the main window.");
 		r_error = ERR_CANT_CREATE;
 		return;
@@ -2443,7 +2279,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 #ifdef RD_ENABLED
 	if (rendering_context) {
 		rendering_device = memnew(RenderingDevice);
-		if (rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) != OK) {
 			memdelete(rendering_device);
 			rendering_device = nullptr;
 			memdelete(rendering_context);
@@ -2451,7 +2287,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Dis
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
@@ -2501,19 +2337,21 @@ DisplayServerWayland::~DisplayServerWayland() {
 	// Iterating on the window map while we delete stuff from it is a bit
 	// uncomfortable, plus we can't even delete /all/ windows in an arbitrary order
 	// (due to popups).
-	List<DisplayServerEnums::WindowID> toplevels;
+	List<WindowID> toplevels;
 
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &pair : windows) {
-		DisplayServerEnums::WindowID id = pair.key;
+	for (const KeyValue<WindowID, WindowData> &pair : windows) {
+		WindowID id = pair.key;
 
-		if (!window_get_flag(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT, id)) {
+		if (!window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, id)) {
 			toplevels.push_back(id);
-		} else {
-			AccessibilityServer::get_singleton()->window_destroy(id);
+#ifdef ACCESSKIT_ENABLED
+		} else if (accessibility_driver) {
+			accessibility_driver->window_destroy(id);
+#endif
 		}
 	}
 
-	for (DisplayServerEnums::WindowID &id : toplevels) {
+	for (WindowID &id : toplevels) {
 		_delete_window(id);
 	}
 	windows.clear();
@@ -2540,6 +2378,12 @@ DisplayServerWayland::~DisplayServerWayland() {
 	}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
+
 #ifdef DBUS_ENABLED
 	if (portal_desktop) {
 		memdelete(portal_desktop);
diff --git a/engine/platform/linuxbsd/wayland/display_server_wayland.h b/engine/platform/linuxbsd/wayland/display_server_wayland.h
index 0ee4cc8f..dab330d3 100644
--- a/engine/platform/linuxbsd/wayland/display_server_wayland.h
+++ b/engine/platform/linuxbsd/wayland/display_server_wayland.h
@@ -34,44 +34,51 @@
 
 #include "wayland/wayland_thread.h"
 
-#include "core/os/process_id.h"
-#include "servers/display/display_server.h"
-
-class InputEvent;
-class NativeMenu;
-
 #ifdef RD_ENABLED
-class RenderingDevice;
-class RenderingContextDriver;
+#include "servers/rendering/rendering_device.h"
+
+#ifdef VULKAN_ENABLED
+#include "wayland/rendering_context_driver_vulkan_wayland.h"
 #endif
 
+#endif //RD_ENABLED
+
 #ifdef GLES3_ENABLED
-class EGLManager;
+#include "drivers/egl/egl_manager.h"
+#endif
+
+#if defined(SPEECHD_ENABLED)
+#include "tts_linux.h"
 #endif
 
 #ifdef DBUS_ENABLED
-class FreeDesktopPortalDesktop;
-class FreeDesktopAtSPIMonitor;
-class FreeDesktopScreenSaver;
+#include "freedesktop_at_spi_monitor.h"
+#include "freedesktop_portal_desktop.h"
+#include "freedesktop_screensaver.h"
 #endif
 
-#ifdef SPEECHD_ENABLED
-class TTS_Linux;
-#endif
+#include "core/config/project_settings.h"
+#include "core/input/input.h"
+#include "servers/display/display_server.h"
+
+#include <climits>
+#include <cstdio>
+
+#undef CursorShape
 
 class DisplayServerWayland : public DisplayServer {
 	GDSOFTCLASS(DisplayServerWayland, DisplayServer);
 
 	struct WindowData {
-		DisplayServerEnums::WindowID id = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID id = INVALID_WINDOW_ID;
 
-		DisplayServerEnums::WindowID parent_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID parent_id = INVALID_WINDOW_ID;
 
 		// For popups.
-		DisplayServerEnums::WindowID root_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID root_id = INVALID_WINDOW_ID;
 
 		// For toplevels.
-		List<DisplayServerEnums::WindowID> popup_stack;
+		List<WindowID> popup_stack;
 
 		Rect2i rect;
 		Size2i max_size;
@@ -91,14 +98,11 @@ class DisplayServerWayland : public DisplayServer {
 		// Flags whether we have allocated a buffer through the video drivers.
 		bool visible = false;
 
-		DisplayServerEnums::VSyncMode vsync_mode = DisplayServerEnums::VSYNC_ENABLED;
+		DisplayServer::VSyncMode vsync_mode = VSYNC_ENABLED;
 
 		uint32_t flags = 0;
 
-		DisplayServerEnums::WindowMode mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
-
-		bool hdr_requested = false;
-		WaylandThread::ColorProfile color_profile;
+		DisplayServer::WindowMode mode = WINDOW_MODE_WINDOWED;
 
 		Callable rect_changed_callback;
 		Callable window_event_callback;
@@ -121,28 +125,28 @@ class DisplayServerWayland : public DisplayServer {
 		CAPABILITY, // New "suspended" wm_capability flag.
 	};
 
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CURSOR_ARROW;
-	DisplayServerEnums::MouseMode mouse_mode = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	CursorShape cursor_shape = CURSOR_ARROW;
+	DisplayServer::MouseMode mouse_mode = DisplayServer::MOUSE_MODE_VISIBLE;
+	DisplayServer::MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	DisplayServer::MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
 	bool mouse_mode_override_enabled = false;
 	void _mouse_update_mode();
 
-	HashMap<DisplayServerEnums::CursorShape, CustomCursor> custom_cursors;
+	HashMap<CursorShape, CustomCursor> custom_cursors;
 
-	HashMap<DisplayServerEnums::WindowID, WindowData> windows;
-	DisplayServerEnums::WindowID window_id_counter = DisplayServerEnums::MAIN_WINDOW_ID;
+	HashMap<WindowID, WindowData> windows;
+	WindowID window_id_counter = MAIN_WINDOW_ID;
 
 	WaylandThread wayland_thread;
 
-	DisplayServerEnums::Context context;
+	Context context;
 	bool swap_cancel_ok = false;
 
-	// NOTE: These are the based on DisplayServerEnums::WINDOW_FLAG_POPUP, which does NOT imply what it
+	// NOTE: These are the based on WINDOW_FLAG_POPUP, which does NOT imply what it
 	// seems. It's particularly confusing for our usecase, but just know that these
 	// are the "take all input thx" windows while the `popup_stack` variable keeps
 	// track of all the generic floating window concept.
-	List<DisplayServerEnums::WindowID> popup_menu_list;
+	List<WindowID> popup_menu_list;
 	BitField<MouseButtonMask> last_mouse_monitor_mask = MouseButtonMask::NONE;
 
 	String ime_text;
@@ -173,24 +177,22 @@ class DisplayServerWayland : public DisplayServer {
 	FreeDesktopScreenSaver *screensaver = nullptr;
 	bool screensaver_inhibited = false;
 #endif
-	static String _get_app_id_from_context(DisplayServerEnums::Context p_context);
+	static String _get_app_id_from_context(Context p_context);
 
-	void _send_window_event(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID);
+	void _send_window_event(WindowEvent p_event, WindowID p_window_id = MAIN_WINDOW_ID);
 
 	static void dispatch_input_events(const Ref<InputEvent> &p_event);
 	void _dispatch_input_event(const Ref<InputEvent> &p_event);
 
-	void _delete_window(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID);
-	void _update_window_rect(const Rect2i &p_rect, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID);
-
-	void _window_update_hdr_state(WindowData &p_window);
+	void _delete_window(WindowID p_window_id = MAIN_WINDOW_ID);
+	void _update_window_rect(const Rect2i &p_rect, WindowID p_window_id = MAIN_WINDOW_ID);
 
 	void try_suspend();
 
 	void initialize_tts() const;
 
 public:
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 
 	virtual String get_name() const override;
 
@@ -211,16 +213,16 @@ public:
 	virtual Color get_accent_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 #endif
 
 	virtual void beep() const override;
 
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
 	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
 	virtual bool mouse_is_mode_override_enabled() const override;
 
@@ -236,85 +238,83 @@ public:
 
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 
 	virtual void screen_set_keep_on(bool p_enable) override;
 	virtual bool screen_is_kept_on() const override;
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
 
-	virtual DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID) override;
-	virtual void show_window(DisplayServerEnums::WindowID p_id) override;
-	virtual void delete_sub_window(DisplayServerEnums::WindowID p_id) override;
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override;
+	virtual void show_window(WindowID p_id) override;
+	virtual void delete_sub_window(WindowID p_id) override;
 
-	virtual DisplayServerEnums::WindowID window_get_active_popup() const override;
-	virtual void window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) override;
-	virtual Rect2i window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const override;
+	virtual WindowID window_get_active_popup() const override;
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override;
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window_id = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window_id = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window_id = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void gl_window_make_current(DisplayServerEnums::WindowID p_window_id) override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window_id = MAIN_WINDOW_ID) const override;
+	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent) override;
+	virtual void window_set_transient(WindowID p_window_id, WindowID p_parent) override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window_id = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual float window_get_scale(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual float window_get_scale(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual bool window_is_maximize_allowed(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window_id = MAIN_WINDOW_ID) override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window_id = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
 	virtual int accessibility_should_increase_contrast() const override;
 	virtual int accessibility_screen_reader_active() const override;
@@ -322,38 +322,22 @@ public:
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_window_id) const override;
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window_id = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_window_id) const override;
 
-	virtual void window_start_drag(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) override;
+	virtual void window_start_drag(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window) override;
 
-	virtual bool window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_request_hdr_output(const bool p_enabled, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual bool window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) override;
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) override;
 
 	virtual bool get_swap_cancel_ok() override;
 
-	virtual Error embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
-	virtual Error request_close_embedded_process(ProcessID p_pid) override;
-	virtual Error remove_embedded_process(ProcessID p_pid) override;
-	virtual ProcessID get_focused_process_id() override;
+	virtual Error embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
+	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;
+	virtual Error remove_embedded_process(OS::ProcessID p_pid) override;
+	virtual OS::ProcessID get_focused_process_id() override;
 
 	virtual int keyboard_get_layout_count() const override;
 	virtual int keyboard_get_current_layout() const override;
@@ -372,16 +356,16 @@ public:
 
 	virtual void set_icon(const Ref<Image> &p_icon) override;
 
-	virtual void set_context(DisplayServerEnums::Context p_context) override;
+	virtual void set_context(Context p_context) override;
 
 	virtual bool is_window_transparency_available() const override;
 
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	static Vector<String> get_rendering_drivers_func();
 
 	static void register_wayland_driver();
 
-	DisplayServerWayland(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerWayland(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerWayland();
 };
 
diff --git a/engine/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h b/engine/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h
index d2eda767..b89ff9e3 100644
--- a/engine/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h
+++ b/engine/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h
@@ -48,7 +48,7 @@
 #define libdecor_state_free libdecor_state_free_dylibloader_orig_libdecor
 #define libdecor_configuration_get_content_size libdecor_configuration_get_content_size_dylibloader_orig_libdecor
 #define libdecor_configuration_get_window_state libdecor_configuration_get_window_state_dylibloader_orig_libdecor
-#include "./thirdparty/linuxbsd_headers/libdecor-0/libdecor.h" // IWYU pragma: export.
+#include "./thirdparty/linuxbsd_headers/libdecor-0/libdecor.h"
 #undef libdecor_unref
 #undef libdecor_new
 #undef libdecor_get_fd
diff --git a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h
index 53cb4502..86c51573 100644
--- a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h
+++ b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h
@@ -61,7 +61,7 @@
 #define wl_display_cancel_read wl_display_cancel_read_dylibloader_orig_wayland_client
 #define wl_display_read_events wl_display_read_events_dylibloader_orig_wayland_client
 #define wl_log_set_handler_client wl_log_set_handler_client_dylibloader_orig_wayland_client
-#include "./thirdparty/linuxbsd_headers/wayland/wayland-client-core.h" // IWYU pragma: export.
+#include "./thirdparty/linuxbsd_headers/wayland/wayland-client-core.h"
 #undef wl_list_init
 #undef wl_list_insert
 #undef wl_list_remove
diff --git a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h
index 3aa66db1..43520e74 100644
--- a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h
+++ b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h
@@ -13,7 +13,7 @@
 #define wl_cursor_image_get_buffer wl_cursor_image_get_buffer_dylibloader_orig_wayland_cursor
 #define wl_cursor_frame wl_cursor_frame_dylibloader_orig_wayland_cursor
 #define wl_cursor_frame_and_duration wl_cursor_frame_and_duration_dylibloader_orig_wayland_cursor
-#include "./thirdparty/linuxbsd_headers/wayland/wayland-cursor.h" // IWYU pragma: export.
+#include "./thirdparty/linuxbsd_headers/wayland/wayland-cursor.h"
 #undef wl_cursor_theme_load
 #undef wl_cursor_theme_destroy
 #undef wl_cursor_theme_get_cursor
diff --git a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h
index d6b32282..c2643f97 100644
--- a/engine/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h
+++ b/engine/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h
@@ -11,7 +11,7 @@
 #define wl_egl_window_destroy wl_egl_window_destroy_dylibloader_orig_wayland_egl
 #define wl_egl_window_resize wl_egl_window_resize_dylibloader_orig_wayland_egl
 #define wl_egl_window_get_attached_size wl_egl_window_get_attached_size_dylibloader_orig_wayland_egl
-#include "./thirdparty/linuxbsd_headers/wayland/wayland-egl-core.h" // IWYU pragma: export.
+#include "./thirdparty/linuxbsd_headers/wayland/wayland-egl-core.h"
 #undef wl_egl_window_create
 #undef wl_egl_window_destroy
 #undef wl_egl_window_resize
diff --git a/engine/platform/linuxbsd/wayland/key_mapping_xkb.cpp b/engine/platform/linuxbsd/wayland/key_mapping_xkb.cpp
index 0edbb940..bd1a1e38 100644
--- a/engine/platform/linuxbsd/wayland/key_mapping_xkb.cpp
+++ b/engine/platform/linuxbsd/wayland/key_mapping_xkb.cpp
@@ -30,12 +30,6 @@
 
 #include "key_mapping_xkb.h"
 
-#ifdef SOWRAP_ENABLED
-#include "xkbcommon-so_wrap.h"
-#else
-#include <xkbcommon/xkbcommon.h>
-#endif // SOWRAP_ENABLED
-
 void KeyMappingXKB::initialize() {
 	// XKB keycode to Godot Key map.
 
diff --git a/engine/platform/linuxbsd/wayland/key_mapping_xkb.h b/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
index ad9c3344..b95385eb 100644
--- a/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
+++ b/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
@@ -33,8 +33,11 @@
 #include "core/os/keyboard.h"
 #include "core/templates/hash_map.h"
 
-typedef uint32_t xkb_keycode_t;
-typedef uint32_t xkb_keysym_t;
+#ifdef SOWRAP_ENABLED
+#include "xkbcommon-so_wrap.h"
+#else
+#include <xkbcommon/xkbcommon.h>
+#endif // SOWRAP_ENABLED
 
 class KeyMappingXKB {
 	struct HashMapHasherKeys {
diff --git a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp
index 002ee699..8abcc464 100644
--- a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp
+++ b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp
@@ -32,7 +32,7 @@
 
 #include "rendering_context_driver_vulkan_wayland.h"
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 const char *RenderingContextDriverVulkanWayland::_get_platform_surface_extension() const {
 	return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME;
diff --git a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
index 9b9e72e4..0515471e 100644
--- a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
+++ b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
@@ -37,9 +37,6 @@
 class RenderingContextDriverVulkanWayland : public RenderingContextDriverVulkan {
 private:
 	virtual const char *_get_platform_surface_extension() const override final;
-	// If wp-color-management is supported, we will perform color management externally to the driver.
-	// If wp-color-management is not supported, the driver would not be able to perform color management anyway.
-	virtual bool is_colorspace_externally_managed() const override final { return true; }
 
 protected:
 	SurfaceID surface_create(const void *p_platform_data) override final;
diff --git a/engine/platform/linuxbsd/wayland/wayland_embedder.cpp b/engine/platform/linuxbsd/wayland/wayland_embedder.cpp
index 0d028895..41e6e48c 100644
--- a/engine/platform/linuxbsd/wayland/wayland_embedder.cpp
+++ b/engine/platform/linuxbsd/wayland/wayland_embedder.cpp
@@ -57,11 +57,11 @@
 // Gotta flush as we're doing this mess from a thread without any
 // synchronization. It's awful, I know, but the `print_*` utilities hang for
 // some reason during editor startup and I need some quick and dirty debugging.
-#define DEBUG_LOG_WAYLAND_EMBED(...) \
-	if (1) { \
+#define DEBUG_LOG_WAYLAND_EMBED(...)                               \
+	if (1) {                                                       \
 		printf("[PROXY] %s\n", vformat(__VA_ARGS__).utf8().ptr()); \
-		fflush(stdout); \
-	} else \
+		fflush(stdout);                                            \
+	} else                                                         \
 		((void)0)
 
 #else
diff --git a/engine/platform/linuxbsd/wayland/wayland_embedder.h b/engine/platform/linuxbsd/wayland/wayland_embedder.h
index 57a5f748..67f92fe0 100644
--- a/engine/platform/linuxbsd/wayland/wayland_embedder.h
+++ b/engine/platform/linuxbsd/wayland/wayland_embedder.h
@@ -34,30 +34,37 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "core/templates/a_hash_map.h"
+#include "core/templates/pooled_list.h"
+
+#ifdef SOWRAP_ENABLED
+#include "wayland/dynwrappers/wayland-client-core-so_wrap.h"
+#else
+#include <wayland-client-core.h>
+#endif
+
 #include "protocol/wayland.gen.h"
 
-// Keep wayland protocol included first.
+#include "protocol/linux_dmabuf_v1.gen.h"
+#include "protocol/xdg_shell.gen.h"
 
-#include "protocol/color_management.gen.h"
 #include "protocol/commit_timing_v1.gen.h"
 #include "protocol/cursor_shape.gen.h"
 #include "protocol/fifo_v1.gen.h"
 #include "protocol/fractional_scale.gen.h"
 #include "protocol/godot_embedding_compositor.gen.h"
 #include "protocol/idle_inhibit.gen.h"
-#include "protocol/linux_dmabuf_v1.gen.h"
 #include "protocol/linux_drm_syncobj_v1.gen.h"
 #include "protocol/linux_explicit_synchronization_unstable_v1.gen.h"
 #include "protocol/pointer_constraints.gen.h"
 #include "protocol/pointer_gestures.gen.h"
-#include "protocol/pointer_warp.gen.h"
 #include "protocol/primary_selection.gen.h"
 #include "protocol/relative_pointer.gen.h"
+#include "protocol/tablet.gen.h"
 #include "protocol/tearing_control_v1.gen.h"
 #include "protocol/text_input.gen.h"
 #include "protocol/viewporter.gen.h"
 #include "protocol/wayland-drm.gen.h"
-#include "protocol/wayland.gen.h"
 #include "protocol/xdg_activation.gen.h"
 #include "protocol/xdg_decoration.gen.h"
 #include "protocol/xdg_foreign_v1.gen.h"
@@ -66,21 +73,18 @@
 #include "protocol/xdg_system_bell.gen.h"
 #include "protocol/xdg_toplevel_icon.gen.h"
 
-// #include "protocol/tablet.gen.h" // TODO: Needs some extra work
-
-#include "core/io/dir_access.h"
-#include "core/os/thread.h"
-#include "core/templates/a_hash_map.h"
-#include "core/templates/pooled_list.h"
-
-#include <poll.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <poll.h>
+
+#include "core/io/dir_access.h"
+#include "core/os/thread.h"
 
 // TODO: Consider resizing the ancillary buffer dynamically.
 #define EMBED_ANCILLARY_BUF_SIZE 4096
@@ -342,16 +346,6 @@ class WaylandEmbedder {
 		&zwp_linux_surface_synchronization_v1_interface,
 		&zwp_linux_buffer_release_v1_interface,
 
-		// color-management
-		&wp_color_manager_v1_interface,
-		&wp_color_management_output_v1_interface,
-		&wp_color_management_surface_v1_interface,
-		&wp_color_management_surface_feedback_v1_interface,
-		&wp_image_description_creator_icc_v1_interface,
-		&wp_image_description_creator_params_v1_interface,
-		&wp_image_description_v1_interface,
-		&wp_image_description_info_v1_interface,
-
 		// fractional-scale
 		&wp_fractional_scale_manager_v1_interface,
 		&wp_fractional_scale_v1_interface,
@@ -457,9 +451,6 @@ class WaylandEmbedder {
 		&wp_tearing_control_manager_v1_interface,
 		&wp_tearing_control_v1_interface,
 
-		// pointer-warp-v1
-		&wp_pointer_warp_v1_interface,
-
 		// Our custom things.
 		&godot_embedding_compositor_interface,
 		&godot_embedded_client_interface,
diff --git a/engine/platform/linuxbsd/wayland/wayland_thread.cpp b/engine/platform/linuxbsd/wayland/wayland_thread.cpp
index dc27d4be..0a06021e 100644
--- a/engine/platform/linuxbsd/wayland/wayland_thread.cpp
+++ b/engine/platform/linuxbsd/wayland/wayland_thread.cpp
@@ -31,8 +31,6 @@
 #include "wayland_thread.h"
 
 #include "core/config/engine.h"
-#include "core/io/image.h"
-#include "core/os/os.h"
 
 #ifdef WAYLAND_ENABLED
 
@@ -461,7 +459,7 @@ bool WaylandThread::_load_cursor_theme(int p_cursor_size) {
 		"help"
 	};
 
-	for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
+	for (int i = 0; i < DisplayServer::CURSOR_MAX; i++) {
 		struct wl_cursor *cursor = wl_cursor_theme_get_cursor(wl_cursor_theme, cursor_names[i]);
 
 		if (!cursor && cursor_names_fallback[i]) {
@@ -512,12 +510,6 @@ void WaylandThread::_wl_registry_on_global(void *data, struct wl_registry *wl_re
 	RegistryState *registry = (RegistryState *)data;
 	ERR_FAIL_NULL(registry);
 
-	if (registry->global_names.has(name)) {
-		WARN_PRINT("Received duplicate Wayland global announcement!");
-	}
-
-	registry->global_names.insert(name);
-
 	if (strcmp(interface, wl_shm_interface.name) == 0) {
 		registry->wl_shm = (struct wl_shm *)wl_registry_bind(wl_registry, name, &wl_shm_interface, 1);
 		registry->wl_shm_name = name;
@@ -639,16 +631,6 @@ void WaylandThread::_wl_registry_on_global(void *data, struct wl_registry *wl_re
 		registry->wp_viewporter_name = name;
 	}
 
-	if (strcmp(interface, wp_color_manager_v1_interface.name) == 0) {
-		registry->wp_color_manager = (struct wp_color_manager_v1 *)wl_registry_bind(wl_registry, name, &wp_color_manager_v1_interface, 1);
-		registry->wp_color_manager_name = name;
-		wl_proxy_tag_godot((struct wl_proxy *)registry->wp_color_manager);
-
-		WaylandThread::ColorManagementState *color_state = memnew(WaylandThread::ColorManagementState);
-		wp_color_manager_v1_add_listener(registry->wp_color_manager, &wp_color_manager_listener, color_state);
-		return;
-	}
-
 	if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
 		registry->wp_cursor_shape_manager = (struct wp_cursor_shape_manager_v1 *)wl_registry_bind(wl_registry, name, &wp_cursor_shape_manager_v1_interface, 1);
 		registry->wp_cursor_shape_manager_name = name;
@@ -679,17 +661,6 @@ void WaylandThread::_wl_registry_on_global(void *data, struct wl_registry *wl_re
 	if (strcmp(interface, xdg_toplevel_icon_manager_v1_interface.name) == 0) {
 		registry->xdg_toplevel_icon_manager = (struct xdg_toplevel_icon_manager_v1 *)wl_registry_bind(wl_registry, name, &xdg_toplevel_icon_manager_v1_interface, 1);
 		registry->xdg_toplevel_icon_manager_name = name;
-
-		if (registry->wayland_thread->xdg_icon) {
-			xdg_toplevel_icon_v1_destroy(registry->wayland_thread->xdg_icon);
-			registry->wayland_thread->xdg_icon = nullptr;
-		}
-
-		if (registry->wayland_thread->icon_buffer) {
-			wl_buffer_destroy(registry->wayland_thread->icon_buffer);
-			registry->wayland_thread->icon_buffer = nullptr;
-		}
-
 		return;
 	}
 
@@ -770,12 +741,6 @@ void WaylandThread::_wl_registry_on_global(void *data, struct wl_registry *wl_re
 		return;
 	}
 
-	if (strcmp(interface, wp_pointer_warp_v1_interface.name) == 0) {
-		registry->wp_pointer_warp = (struct wp_pointer_warp_v1 *)wl_registry_bind(wl_registry, name, &wp_pointer_warp_v1_interface, 1);
-		registry->wp_pointer_warp_name = name;
-		return;
-	}
-
 	if (strcmp(interface, FIFO_INTERFACE_NAME) == 0) {
 		registry->wp_fifo_manager_name = name;
 	}
@@ -792,10 +757,6 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 	RegistryState *registry = (RegistryState *)data;
 	ERR_FAIL_NULL(registry);
 
-	if (!registry->global_names.erase(name)) {
-		WARN_PRINT("Received remove event for unknown Wayland global!");
-	}
-
 	if (name == registry->wl_shm_name) {
 		if (registry->wl_shm) {
 			wl_shm_destroy(registry->wl_shm);
@@ -877,7 +838,7 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 	}
 
 	if (name == registry->wp_viewporter_name) {
-		for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
+		for (KeyValue<DisplayServer::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
 			WindowState &ws = pair.value;
 			if (registry->wp_viewporter) {
 				wp_viewporter_destroy(registry->wp_viewporter);
@@ -895,32 +856,6 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 		return;
 	}
 
-	if (name == registry->wp_color_manager_name) {
-		for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
-			WindowState ws = pair.value;
-
-			if (ws.wp_color_management_surface) {
-				wp_color_management_surface_v1_destroy(ws.wp_color_management_surface);
-				ws.wp_color_management_surface = nullptr;
-			}
-
-			if (ws.wp_color_management_surface_feedback) {
-				wp_color_management_surface_feedback_v1_destroy(ws.wp_color_management_surface_feedback);
-				ws.wp_color_management_surface_feedback = nullptr;
-			}
-		}
-
-		if (registry->wp_color_manager) {
-			ColorManagementState *color_state = wp_color_manager_get_state(registry->wp_color_manager);
-			memdelete(color_state);
-
-			wp_color_manager_v1_destroy(registry->wp_color_manager);
-			registry->wp_color_manager = nullptr;
-		}
-
-		registry->wp_color_manager_name = 0;
-	}
-
 	if (name == registry->wp_cursor_shape_manager_name) {
 		if (registry->wp_cursor_shape_manager) {
 			wp_cursor_shape_manager_v1_destroy(registry->wp_cursor_shape_manager);
@@ -941,7 +876,7 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 	}
 
 	if (name == registry->wp_fractional_scale_manager_name) {
-		for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
+		for (KeyValue<DisplayServer::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
 			WindowState &ws = pair.value;
 
 			if (registry->wp_fractional_scale_manager) {
@@ -1177,17 +1112,6 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 		return;
 	}
 
-	if (name == registry->wp_pointer_warp_name) {
-		if (registry->wp_pointer_warp) {
-			wp_pointer_warp_v1_destroy(registry->wp_pointer_warp);
-			registry->wp_pointer_warp = nullptr;
-		}
-
-		registry->wp_pointer_warp_name = 0;
-
-		return;
-	}
-
 	{
 		// Iterate through all of the seats to find if any got removed.
 		List<struct wl_seat *>::Element *E = registry->wl_seats.front();
@@ -1314,6 +1238,17 @@ void WaylandThread::_frame_wl_callback_on_done(void *data, struct wl_callback *w
 
 	ws->frame_callback = wl_surface_frame(ws->wl_surface);
 	wl_callback_add_listener(ws->frame_callback, &frame_wl_callback_listener, ws);
+
+	if (ws->wl_surface && ws->buffer_scale_changed) {
+		// NOTE: We're only now setting the buffer scale as the idea is to get this
+		// data committed together with the new frame, all by the rendering driver.
+		// This is important because we might otherwise set an invalid combination of
+		// buffer size and scale (e.g. odd size and 2x scale). We're pretty much
+		// guaranteed to get a proper buffer in the next render loop as the rescaling
+		// method also informs the engine of a "window rect change", triggering
+		// rendering if needed.
+		wl_surface_set_buffer_scale(ws->wl_surface, window_state_get_preferred_buffer_scale(ws));
+	}
 }
 
 void WaylandThread::_wl_surface_on_leave(void *data, struct wl_surface *wl_surface, struct wl_output *wl_output) {
@@ -1441,7 +1376,7 @@ void WaylandThread::_xdg_toplevel_on_configure(void *data, struct xdg_toplevel *
 
 	// Expect the window to be in a plain state. It will get properly set if the
 	// compositor reports otherwise below.
-	ws->mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+	ws->mode = DisplayServer::WINDOW_MODE_WINDOWED;
 	ws->maximized = false;
 	ws->fullscreen = false;
 	ws->resizing = false;
@@ -1455,12 +1390,12 @@ void WaylandThread::_xdg_toplevel_on_configure(void *data, struct xdg_toplevel *
 	wl_array_for_each(state, states) {
 		switch (*state) {
 			case XDG_TOPLEVEL_STATE_MAXIMIZED: {
-				ws->mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+				ws->mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 				ws->maximized = true;
 			} break;
 
 			case XDG_TOPLEVEL_STATE_FULLSCREEN: {
-				ws->mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+				ws->mode = DisplayServer::WINDOW_MODE_FULLSCREEN;
 				ws->fullscreen = true;
 			} break;
 
@@ -1506,7 +1441,7 @@ void WaylandThread::_xdg_toplevel_on_close(void *data, struct xdg_toplevel *xdg_
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
 	msg->id = ws->id;
-	msg->event = DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST;
+	msg->event = DisplayServer::WINDOW_EVENT_CLOSE_REQUEST;
 	ws->wayland_thread->push_message(msg);
 }
 
@@ -1586,7 +1521,6 @@ void WaylandThread::_xdg_popup_on_configure(void *data, struct xdg_popup *xdg_po
 		rect_msg->id = ws->id;
 		rect_msg->rect.position = scale_vector2i(ws->rect.position, parent_scale);
 		rect_msg->rect.size = scale_vector2i(ws->rect.size, parent_scale);
-		rect_msg->buffer_scale = window_state_get_preferred_buffer_scale(ws);
 
 		ws->wayland_thread->push_message(rect_msg);
 	}
@@ -1601,7 +1535,7 @@ void WaylandThread::_xdg_popup_on_popup_done(void *data, struct xdg_popup *xdg_p
 	Ref<WindowEventMessage> ev_msg;
 	ev_msg.instantiate();
 	ev_msg->id = ws->id;
-	ev_msg->event = DisplayServerEnums::WINDOW_EVENT_FORCE_CLOSE;
+	ev_msg->event = DisplayServer::WINDOW_EVENT_FORCE_CLOSE;
 
 	ws->wayland_thread->push_message(ev_msg);
 }
@@ -1666,7 +1600,7 @@ void WaylandThread::libdecor_frame_on_configure(struct libdecor_frame *frame, st
 
 	// Expect the window to be in a plain state. It will get properly set if the
 	// compositor reports otherwise below.
-	ws->mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+	ws->mode = DisplayServer::WINDOW_MODE_WINDOWED;
 	ws->maximized = false;
 	ws->fullscreen = false;
 	ws->resizing = false;
@@ -1678,12 +1612,12 @@ void WaylandThread::libdecor_frame_on_configure(struct libdecor_frame *frame, st
 
 	if (libdecor_configuration_get_window_state(configuration, &window_state)) {
 		if (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) {
-			ws->mode = DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+			ws->mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
 			ws->maximized = true;
 		}
 
 		if (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) {
-			ws->mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+			ws->mode = DisplayServer::WINDOW_MODE_FULLSCREEN;
 			ws->fullscreen = true;
 		}
 
@@ -1722,7 +1656,7 @@ void WaylandThread::libdecor_frame_on_close(struct libdecor_frame *frame, void *
 	Ref<WindowEventMessage> winevent_msg;
 	winevent_msg.instantiate();
 	winevent_msg->id = ws->id;
-	winevent_msg->event = DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST;
+	winevent_msg->event = DisplayServer::WINDOW_EVENT_CLOSE_REQUEST;
 
 	ws->wayland_thread->push_message(winevent_msg);
 
@@ -1908,14 +1842,14 @@ void WaylandThread::_wl_pointer_on_leave(void *data, struct wl_pointer *wl_point
 
 	PointerData &pd = ss->pointer_data_buffer;
 
-	if (pd.pointed_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (pd.pointed_id == DisplayServer::INVALID_WINDOW_ID) {
 		// We're probably on a decoration or some other third-party thing.
 		return;
 	}
 
-	DisplayServerEnums::WindowID id = pd.pointed_id;
+	DisplayServer::WindowID id = pd.pointed_id;
 
-	pd.pointed_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	pd.pointed_id = DisplayServer::INVALID_WINDOW_ID;
 	pd.pressed_button_mask.clear();
 
 	DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer left window %d.", id));
@@ -1954,19 +1888,19 @@ void WaylandThread::_wl_pointer_on_button(void *data, struct wl_pointer *wl_poin
 			button_pressed = MouseButton::LEFT;
 			break;
 
-		case BTN_RIGHT:
-			button_pressed = MouseButton::RIGHT;
-			break;
-
 		case BTN_MIDDLE:
 			button_pressed = MouseButton::MIDDLE;
 			break;
 
-		case BTN_SIDE:
-			button_pressed = MouseButton::MB_XBUTTON1;
+		case BTN_RIGHT:
+			button_pressed = MouseButton::RIGHT;
 			break;
 
 		case BTN_EXTRA:
+			button_pressed = MouseButton::MB_XBUTTON1;
+			break;
+
+		case BTN_SIDE:
 			button_pressed = MouseButton::MB_XBUTTON2;
 			break;
 
@@ -2026,20 +1960,20 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 	PointerData &pd = ss->pointer_data_buffer;
 
 	if (pd.pointed_id != old_pd.pointed_id) {
-		if (old_pd.pointed_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (old_pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
 			Ref<WindowEventMessage> msg;
 			msg.instantiate();
 			msg->id = old_pd.pointed_id;
-			msg->event = DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
 
 			wayland_thread->push_message(msg);
 		}
 
-		if (pd.pointed_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
 			Ref<WindowEventMessage> msg;
 			msg.instantiate();
 			msg->id = pd.pointed_id;
-			msg->event = DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
 
 			wayland_thread->push_message(msg);
 		}
@@ -2052,10 +1986,10 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 	// wl_pointer::button) within the same wl_pointer::frame. Because of this, we
 	// need to account for when the currently pointed window might be invalid
 	// (third-party or even none) and fall back to the old one.
-	if (pd.pointed_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
 		ws = ss->wayland_thread->window_get_state(pd.pointed_id);
 		ERR_FAIL_NULL(ws);
-	} else if (old_pd.pointed_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (old_pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
 		ws = ss->wayland_thread->window_get_state(old_pd.pointed_id);
 		ERR_FAIL_NULL(ws);
 	}
@@ -2373,7 +2307,7 @@ void WaylandThread::_wl_keyboard_on_enter(void *data, struct wl_keyboard *wl_key
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
 	msg->id = ws->id;
-	msg->event = DisplayServerEnums::WINDOW_EVENT_FOCUS_IN;
+	msg->event = DisplayServer::WINDOW_EVENT_FOCUS_IN;
 	wayland_thread->push_message(msg);
 
 	DEBUG_LOG_WAYLAND_THREAD(vformat("Keyboard focused window %d.", ws->id));
@@ -2396,7 +2330,7 @@ void WaylandThread::_wl_keyboard_on_leave(void *data, struct wl_keyboard *wl_key
 
 	ss->repeating_keycode = XKB_KEYCODE_INVALID;
 
-	if (ss->focused_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->focused_id == DisplayServer::INVALID_WINDOW_ID) {
 		// We're probably on a decoration or some other third-party thing.
 		return;
 	}
@@ -2404,12 +2338,12 @@ void WaylandThread::_wl_keyboard_on_leave(void *data, struct wl_keyboard *wl_key
 	WindowState *ws = wayland_thread->window_get_state(ss->focused_id);
 	ERR_FAIL_NULL(ws);
 
-	ss->focused_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	ss->focused_id = DisplayServer::INVALID_WINDOW_ID;
 
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
 	msg->id = ws->id;
-	msg->event = DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT;
+	msg->event = DisplayServer::WINDOW_EVENT_FOCUS_OUT;
 	wayland_thread->push_message(msg);
 
 	ss->shift_pressed = false;
@@ -2428,7 +2362,7 @@ void WaylandThread::_wl_keyboard_on_key(void *data, struct wl_keyboard *wl_keybo
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (ss->focused_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->focused_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -2513,7 +2447,7 @@ void WaylandThread::_wl_data_device_on_leave(void *data, struct wl_data_device *
 		memdelete(wl_data_offer_get_offer_state(ss->wl_data_offer_dnd));
 		wl_data_offer_destroy(ss->wl_data_offer_dnd);
 		ss->wl_data_offer_dnd = nullptr;
-		ss->dnd_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		ss->dnd_id = DisplayServer::INVALID_WINDOW_ID;
 	}
 }
 
@@ -2550,7 +2484,7 @@ void WaylandThread::_wl_data_device_on_drop(void *data, struct wl_data_device *w
 	memdelete(wl_data_offer_get_offer_state(ss->wl_data_offer_dnd));
 	wl_data_offer_destroy(ss->wl_data_offer_dnd);
 	ss->wl_data_offer_dnd = nullptr;
-	ss->dnd_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	ss->dnd_id = DisplayServer::INVALID_WINDOW_ID;
 }
 
 void WaylandThread::_wl_data_device_on_selection(void *data, struct wl_data_device *wl_data_device, struct wl_data_offer *id) {
@@ -2585,15 +2519,37 @@ void WaylandThread::_wl_data_source_on_target(void *data, struct wl_data_source
 
 void WaylandThread::_wl_data_source_on_send(void *data, struct wl_data_source *wl_data_source, const char *mime_type, int32_t fd) {
 	SeatState *ss = (SeatState *)data;
-	if (ss == nullptr) {
-		ERR_PRINT("Seat state not set.");
-		close(fd);
-		return;
-	}
+	ERR_FAIL_NULL(ss);
+
+	Vector<uint8_t> *data_to_send = nullptr;
 
 	if (wl_data_source == ss->wl_data_source_selection) {
+		data_to_send = &ss->selection_data;
 		DEBUG_LOG_WAYLAND_THREAD("Clipboard: requested selection.");
-		_clipboard_send(ss->selection_data, mime_type, fd);
+	}
+
+	if (data_to_send) {
+		ssize_t written_bytes = 0;
+
+		bool valid_mime = false;
+
+		if (strcmp(mime_type, "text/plain;charset=utf-8") == 0) {
+			valid_mime = true;
+		} else if (strcmp(mime_type, "text/plain") == 0) {
+			valid_mime = true;
+		}
+
+		if (valid_mime) {
+			written_bytes = write(fd, data_to_send->ptr(), data_to_send->size());
+		}
+
+		if (written_bytes > 0) {
+			DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", written_bytes));
+		} else if (written_bytes == 0) {
+			DEBUG_LOG_WAYLAND_THREAD("Clipboard: no bytes sent.");
+		} else {
+			ERR_PRINT(vformat("Clipboard: write error %d.", errno));
+		}
 	}
 
 	close(fd);
@@ -2623,144 +2579,6 @@ void WaylandThread::_wl_data_source_on_dnd_finished(void *data, struct wl_data_s
 void WaylandThread::_wl_data_source_on_action(void *data, struct wl_data_source *wl_data_source, uint32_t dnd_action) {
 }
 
-void WaylandThread::_wp_color_manager_on_supported_intent(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t render_intent) {
-	ColorManagementState *cms = (ColorManagementState *)data;
-	ERR_FAIL_NULL(cms);
-
-	cms->supported_render_intents |= 1 << render_intent;
-}
-
-void WaylandThread::_wp_color_manager_on_supported_feature(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t feature) {
-	ColorManagementState *cms = (ColorManagementState *)data;
-	ERR_FAIL_NULL(cms);
-
-	cms->supported_render_feature |= 1 << feature;
-}
-
-void WaylandThread::_wp_color_manager_on_supported_tf_named(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t tf) {
-	ColorManagementState *cms = (ColorManagementState *)data;
-	ERR_FAIL_NULL(cms);
-
-	cms->supported_transfer_function |= 1 << tf;
-}
-
-void WaylandThread::_wp_color_manager_on_supported_primaries_named(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t primaries) {
-	ColorManagementState *cms = (ColorManagementState *)data;
-	ERR_FAIL_NULL(cms);
-
-	cms->supported_primaries |= 1 << primaries;
-}
-
-void WaylandThread::_wp_color_manager_on_done(void *data, struct wp_color_manager_v1 *wp_color_manager_v1) {
-	ColorManagementState *cms = (ColorManagementState *)data;
-	ERR_FAIL_NULL(cms);
-
-	// We require parametric profiles until we can support reading ICC files.
-	if ((cms->supported_render_feature & (1 << WP_COLOR_MANAGER_V1_FEATURE_PARAMETRIC)) == 0) {
-		return;
-	}
-
-	// We require the compositor to support extended linear sRGB.
-	// sRGB primaries support is assumed.
-	cms->supports_hdr = cms->supported_transfer_function & (1 << WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR);
-}
-
-void WaylandThread::_wp_color_management_surface_feedback_on_preferred_changed(void *data, struct wp_color_management_surface_feedback_v1 *wp_color_management_surface_feedback_v1, uint32_t identity) {
-	_wp_color_management_surface_feedback_on_preferred_changed2(data, wp_color_management_surface_feedback_v1, 0, identity);
-}
-
-void WaylandThread::_wp_color_management_surface_feedback_on_preferred_changed2(void *data, struct wp_color_management_surface_feedback_v1 *wp_color_management_surface_feedback_v1, uint32_t identity_high, uint32_t identity_low) {
-	struct wp_image_description_v1 *image_description = wp_color_management_surface_feedback_v1_get_preferred_parametric(wp_color_management_surface_feedback_v1);
-
-	wp_image_description_v1_add_listener(image_description, &wp_image_description_listener, data);
-}
-
-void WaylandThread::_wp_image_description_on_failed(void *data, struct wp_image_description_v1 *image_descrptor, uint32_t cause, const char *msg) {
-	WARN_PRINT(msg);
-}
-
-void WaylandThread::_wp_image_description_on_ready(void *data, struct wp_image_description_v1 *image_descriptor, uint32_t identity) {
-	_wp_image_description_on_ready2(data, image_descriptor, 0, identity);
-}
-
-void WaylandThread::_wp_image_description_on_ready2(void *data, struct wp_image_description_v1 *image_descriptor, uint32_t identity_high, uint32_t identity_low) {
-	WindowState *ws = (WindowState *)data;
-	ERR_FAIL_NULL(ws);
-
-	struct wp_image_description_info_v1 *image_info = wp_image_description_v1_get_information(image_descriptor);
-	if (image_info != nullptr) {
-		// The wp_image_description_info_v1 listener takes ownership of this msg.
-		// We need to add a virtual reference so this msg is not freed when we leave the scope.
-		Ref<ColorProfileMessage> msg = memnew(ColorProfileMessage);
-		msg->reference();
-		msg->id = ws->id;
-		msg->wayland_thread = ws->wayland_thread;
-
-		wp_image_description_info_v1_add_listener(image_info, &wp_image_description_info_listener, msg.ptr());
-		wp_image_description_v1_destroy(image_descriptor);
-	}
-}
-
-void WaylandThread::_wp_image_description_info_on_done(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1) {
-	wp_image_description_info_v1_destroy(wp_image_description_info_v1);
-
-	ERR_FAIL_NULL(data);
-	// Now that we have claimed ownership of the msg, remove the virtual reference.
-	Ref<ColorProfileMessage> msg = (ColorProfileMessage *)data;
-	msg->unreference();
-
-	msg->wayland_thread->push_message(msg);
-}
-
-void WaylandThread::_wp_image_description_info_on_icc_file(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t icc, uint32_t icc_size) {
-	::close(icc);
-}
-
-void WaylandThread::_wp_image_description_info_on_primaries(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t r_x, int32_t r_y, int32_t g_x, int32_t g_y, int32_t b_x, int32_t b_y, int32_t w_x, int32_t w_y) {
-}
-
-void WaylandThread::_wp_image_description_info_on_primaries_named(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t primaries) {
-	ColorProfileMessage *msg = (ColorProfileMessage *)data;
-	ERR_FAIL_NULL(msg);
-
-	msg->color_profile.named_primary = primaries;
-}
-
-void WaylandThread::_wp_image_description_info_on_tf_power(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t eexp) {
-}
-
-void WaylandThread::_wp_image_description_info_on_tf_named(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t tf) {
-	ColorProfileMessage *msg = (ColorProfileMessage *)data;
-	ERR_FAIL_NULL(msg);
-
-	msg->color_profile.named_transfer_function = tf;
-}
-
-void WaylandThread::_wp_image_description_info_on_luminances(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t min_lum, uint32_t max_lum, uint32_t reference_lum) {
-	ColorProfileMessage *msg = (ColorProfileMessage *)data;
-	ERR_FAIL_NULL(msg);
-
-	msg->color_profile.reference_luminance = reference_lum;
-}
-
-void WaylandThread::_wp_image_description_info_on_target_primaries(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t r_x, int32_t r_y, int32_t g_x, int32_t g_y, int32_t b_x, int32_t b_y, int32_t w_x, int32_t w_y) {
-}
-
-void WaylandThread::_wp_image_description_info_on_target_luminance(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t min_lum, uint32_t max_lum) {
-	ColorProfileMessage *msg = (ColorProfileMessage *)data;
-	ERR_FAIL_NULL(msg);
-
-	// The uint32 is multiplied by 10000 for precision.
-	msg->color_profile.target_min_luminance = static_cast<float>(min_lum) / 10000;
-	msg->color_profile.target_max_luminance = max_lum;
-}
-
-void WaylandThread::_wp_image_description_info_on_target_max_cll(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t max_cll) {
-}
-
-void WaylandThread::_wp_image_description_info_on_target_max_fall(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t max_fall) {
-}
-
 void WaylandThread::_wp_fractional_scale_on_preferred_scale(void *data, struct wp_fractional_scale_v1 *wp_fractional_scale_v1, uint32_t scale) {
 	WindowState *ws = (WindowState *)data;
 	ERR_FAIL_NULL(ws);
@@ -2897,15 +2715,29 @@ void WaylandThread::_wp_primary_selection_offer_on_offer(void *data, struct zwp_
 
 void WaylandThread::_wp_primary_selection_source_on_send(void *data, struct zwp_primary_selection_source_v1 *wp_primary_selection_source_v1, const char *mime_type, int32_t fd) {
 	SeatState *ss = (SeatState *)data;
-	if (ss == nullptr) {
-		ERR_PRINT("Seat state not set.");
-		close(fd);
-		return;
-	}
+	ERR_FAIL_NULL(ss);
+
+	Vector<uint8_t> *data_to_send = nullptr;
 
 	if (wp_primary_selection_source_v1 == ss->wp_primary_selection_source) {
+		data_to_send = &ss->primary_data;
 		DEBUG_LOG_WAYLAND_THREAD("Clipboard: requested primary selection.");
-		_clipboard_send(ss->primary_data, mime_type, fd);
+	}
+
+	if (data_to_send) {
+		ssize_t written_bytes = 0;
+
+		if (strcmp(mime_type, "text/plain") == 0) {
+			written_bytes = write(fd, data_to_send->ptr(), data_to_send->size());
+		}
+
+		if (written_bytes > 0) {
+			DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", written_bytes));
+		} else if (written_bytes == 0) {
+			DEBUG_LOG_WAYLAND_THREAD("Clipboard: no bytes sent.");
+		} else {
+			ERR_PRINT(vformat("Clipboard: write error %d.", errno));
+		}
 	}
 
 	close(fd);
@@ -3013,14 +2845,14 @@ void WaylandThread::_wp_tablet_tool_on_proximity_out(void *data, struct zwp_tabl
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
 	ERR_FAIL_NULL(ts);
 
-	if (ts->data_pending.proximal_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ts->data_pending.proximal_id == DisplayServer::INVALID_WINDOW_ID) {
 		// We're probably on a decoration or some other third-party thing.
 		return;
 	}
 
-	DisplayServerEnums::WindowID id = ts->data_pending.proximal_id;
+	DisplayServer::WindowID id = ts->data_pending.proximal_id;
 
-	ts->data_pending.proximal_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	ts->data_pending.proximal_id = DisplayServer::INVALID_WINDOW_ID;
 	ts->data_pending.pressed_button_mask.clear();
 
 	DEBUG_LOG_WAYLAND_THREAD(vformat("Tablet tool left window %d.", id));
@@ -3156,26 +2988,26 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 	TabletToolData &td = ts->data_pending;
 
 	if (td.proximal_id != old_td.proximal_id) {
-		if (old_td.proximal_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (old_td.proximal_id != DisplayServer::INVALID_WINDOW_ID) {
 			Ref<WindowEventMessage> msg;
 			msg.instantiate();
 			msg->id = old_td.proximal_id;
-			msg->event = DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
 
 			wayland_thread->push_message(msg);
 		}
 
-		if (td.proximal_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (td.proximal_id != DisplayServer::INVALID_WINDOW_ID) {
 			Ref<WindowEventMessage> msg;
 			msg.instantiate();
 			msg->id = td.proximal_id;
-			msg->event = DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
 
 			wayland_thread->push_message(msg);
 		}
 	}
 
-	if (td.proximal_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (td.proximal_id == DisplayServer::INVALID_WINDOW_ID) {
 		// We're probably on a decoration or some other third-party thing. Let's
 		// "commit" the data and call it a day.
 		old_td = td;
@@ -3310,7 +3142,7 @@ void WaylandThread::_wp_text_input_on_leave(void *data, struct zwp_text_input_v3
 		return;
 	}
 
-	if (ss->ime_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->ime_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -3321,7 +3153,7 @@ void WaylandThread::_wp_text_input_on_leave(void *data, struct zwp_text_input_v3
 	msg->selection = Vector2i();
 	ss->wayland_thread->push_message(msg);
 
-	ss->ime_window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	ss->ime_window_id = DisplayServer::INVALID_WINDOW_ID;
 	ss->ime_enabled = false;
 	ss->ime_active = false;
 	ss->ime_text = String();
@@ -3335,7 +3167,7 @@ void WaylandThread::_wp_text_input_on_preedit_string(void *data, struct zwp_text
 		return;
 	}
 
-	if (ss->ime_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->ime_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -3387,7 +3219,7 @@ void WaylandThread::_wp_text_input_on_commit_string(void *data, struct zwp_text_
 		return;
 	}
 
-	if (ss->ime_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->ime_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -3404,7 +3236,7 @@ void WaylandThread::_wp_text_input_on_done(void *data, struct zwp_text_input_v3
 		return;
 	}
 
-	if (ss->ime_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (ss->ime_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -3505,33 +3337,6 @@ void WaylandThread::_godot_embedded_client_on_window_focus_out(void *data, struc
 	DEBUG_LOG_WAYLAND_THREAD(vformat("Embedded client pid %d focus out", state->pid));
 }
 
-void WaylandThread::_clipboard_send(Vector<uint8_t> &p_data, const char *p_media_type, int32_t p_fd) {
-	ssize_t written_bytes = 0;
-
-	bool valid_mime = false;
-
-	if (strcmp(p_media_type, "text/plain;charset=utf-8") == 0) {
-		valid_mime = true;
-	} else if (strcmp(p_media_type, "text/plain") == 0) {
-		valid_mime = true;
-	}
-
-	if (!valid_mime) {
-		DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: Media type '%s' unknown, skipping.", p_media_type));
-		return;
-	}
-
-	written_bytes = write(p_fd, p_data.ptr(), p_data.size());
-
-	if (written_bytes > 0) {
-		DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", written_bytes));
-	} else if (written_bytes == 0) {
-		DEBUG_LOG_WAYLAND_THREAD("Clipboard: no bytes sent.");
-	} else {
-		ERR_PRINT(vformat("Clipboard: write error %d.", errno));
-	}
-}
-
 // NOTE: This must be started after a valid wl_display is loaded.
 void WaylandThread::_poll_events_thread(void *p_data) {
 	Thread::set_name("Wayland Events");
@@ -3674,14 +3479,6 @@ WaylandThread::OfferState *WaylandThread::wp_primary_selection_offer_get_offer_s
 	return nullptr;
 }
 
-WaylandThread::ColorManagementState *WaylandThread::wp_color_manager_get_state(wp_color_manager_v1 *p_color_manager) {
-	if (p_color_manager && wl_proxy_is_godot((wl_proxy *)p_color_manager)) {
-		return (ColorManagementState *)wp_color_manager_v1_get_user_data(p_color_manager);
-	}
-
-	return nullptr;
-}
-
 WaylandThread::EmbeddingCompositorState *WaylandThread::godot_embedding_compositor_get_state(struct godot_embedding_compositor *p_compositor) {
 	// NOTE: No need for tag check as it's a "fake" interface - nothing else exposes it.
 	if (p_compositor) {
@@ -3774,6 +3571,7 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 	if (p_ws->buffer_scale != preferred_buffer_scale) {
 		// The buffer scale is always important, even if we use frac scaling.
 		p_ws->buffer_scale = preferred_buffer_scale;
+		p_ws->buffer_scale_changed = true;
 
 		if (!using_fractional) {
 			// We don't bother updating everything else if it's turned on though.
@@ -3818,7 +3616,6 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 		rect_msg->id = p_ws->id;
 		rect_msg->rect.position = scale_vector2i(p_ws->rect.position, win_scale);
 		rect_msg->rect.size = scaled_size;
-		rect_msg->buffer_scale = preferred_buffer_scale;
 		p_ws->wayland_thread->push_message(rect_msg);
 	}
 
@@ -3826,23 +3623,11 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 		Ref<WindowEventMessage> dpi_msg;
 		dpi_msg.instantiate();
 		dpi_msg->id = p_ws->id;
-		dpi_msg->event = DisplayServerEnums::WINDOW_EVENT_DPI_CHANGE;
+		dpi_msg->event = DisplayServer::WINDOW_EVENT_DPI_CHANGE;
 		p_ws->wayland_thread->push_message(dpi_msg);
 	}
 }
 
-void WaylandThread::window_state_set_buffer_scale(WindowState *p_ws, int p_buffer_scale) {
-	ERR_FAIL_NULL(p_ws);
-	ERR_FAIL_COND(p_buffer_scale <= 0);
-
-	ERR_FAIL_NULL(p_ws->wl_surface);
-
-	if (p_ws->buffer_scale != p_buffer_scale) {
-		p_ws->buffer_scale = p_buffer_scale;
-		wl_surface_set_buffer_scale(p_ws->wl_surface, p_buffer_scale);
-	}
-}
-
 // Scales a vector according to wp_fractional_scale's rules, where coordinates
 // must be scaled with away from zero half-rounding.
 Vector2i WaylandThread::scale_vector2i(const Vector2i &p_vector, double p_amount) {
@@ -3887,7 +3672,7 @@ void WaylandThread::seat_state_lock_pointer(SeatState *p_ss) {
 	if (p_ss->wp_locked_pointer == nullptr) {
 		struct wl_surface *locked_surface = window_get_wl_surface(p_ss->pointer_data.last_pointed_id);
 		if (locked_surface == nullptr) {
-			locked_surface = window_get_wl_surface(DisplayServerEnums::MAIN_WINDOW_ID);
+			locked_surface = window_get_wl_surface(DisplayServer::MAIN_WINDOW_ID);
 		}
 		ERR_FAIL_NULL(locked_surface);
 
@@ -3903,21 +3688,6 @@ void WaylandThread::seat_state_set_hint(SeatState *p_ss, int p_x, int p_y) {
 	zwp_locked_pointer_v1_set_cursor_position_hint(p_ss->wp_locked_pointer, wl_fixed_from_int(p_x), wl_fixed_from_int(p_y));
 }
 
-void WaylandThread::seat_state_warp_pointer(SeatState *p_ss, int p_x, int p_y) {
-	if (registry.wp_pointer_warp == nullptr) {
-		return;
-	}
-
-	if (p_ss->pointer_data.pointed_id == DisplayServerEnums::INVALID_WINDOW_ID) {
-		return;
-	}
-
-	struct wl_surface *surface = window_get_wl_surface(p_ss->pointer_data.pointed_id);
-	ERR_FAIL_NULL(surface);
-
-	wp_pointer_warp_v1_warp_pointer(registry.wp_pointer_warp, surface, p_ss->wl_pointer, wl_fixed_from_int(p_x), wl_fixed_from_int(p_y), p_ss->pointer_enter_serial);
-}
-
 void WaylandThread::seat_state_confine_pointer(SeatState *p_ss) {
 	ERR_FAIL_NULL(p_ss);
 
@@ -3955,7 +3725,7 @@ void WaylandThread::seat_state_update_cursor(SeatState *p_ss) {
 	int scale = 1;
 
 	if (thread->cursor_visible) {
-		DisplayServerEnums::CursorShape shape = thread->cursor_shape;
+		DisplayServer::CursorShape shape = thread->cursor_shape;
 
 		struct CustomCursor *custom_cursor = thread->custom_cursors.getptr(shape);
 
@@ -4068,7 +3838,7 @@ Ref<WaylandThread::Message> WaylandThread::pop_message() {
 	return Ref<Message>();
 }
 
-void WaylandThread::window_create(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size, DisplayServerEnums::WindowID p_parent_id) {
+void WaylandThread::window_create(DisplayServer::WindowID p_window_id, const Size2i &p_size, DisplayServer::WindowID p_parent_id) {
 	ERR_FAIL_COND(windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4092,17 +3862,6 @@ void WaylandThread::window_create(DisplayServerEnums::WindowID p_window_id, cons
 		}
 	}
 
-	if (supports_hdr()) {
-		ws.wp_color_management_surface_feedback = wp_color_manager_v1_get_surface_feedback(registry.wp_color_manager, ws.wl_surface);
-		wp_color_management_surface_feedback_v1_add_listener(ws.wp_color_management_surface_feedback, &wp_color_management_surface_feedback_listener, &ws);
-
-		struct wp_image_description_v1 *image_description = wp_color_management_surface_feedback_v1_get_preferred_parametric(ws.wp_color_management_surface_feedback);
-		wp_image_description_v1_add_listener(image_description, &wp_image_description_listener, &ws);
-
-		//NOTE: requires vulkan to use the VK_COLOR_SPACE_PASSTHROUGH_EXT colorspace to not raise protocol errors
-		ws.wp_color_management_surface = wp_color_manager_v1_get_surface(registry.wp_color_manager, ws.wl_surface);
-	}
-
 	bool decorated = false;
 
 #ifdef LIBDECOR_ENABLED
@@ -4143,7 +3902,7 @@ void WaylandThread::window_create(DisplayServerEnums::WindowID p_window_id, cons
 		}
 	}
 
-	if (p_parent_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_parent_id != DisplayServer::INVALID_WINDOW_ID) {
 		// NOTE: It's important to set the parent ASAP to avoid misunderstandings with
 		// the compositor. For example, niri immediately resizes the window to full
 		// size as soon as it's configured if it's not parented to another toplevel.
@@ -4164,7 +3923,7 @@ void WaylandThread::window_create(DisplayServerEnums::WindowID p_window_id, cons
 	wl_surface_commit(ws.wl_surface);
 }
 
-void WaylandThread::window_create_popup(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent_id, Rect2i p_rect) {
+void WaylandThread::window_create_popup(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id, Rect2i p_rect) {
 	ERR_FAIL_COND(windows.has(p_window_id));
 	ERR_FAIL_COND(!windows.has(p_parent_id));
 
@@ -4247,7 +4006,7 @@ void WaylandThread::window_create_popup(DisplayServerEnums::WindowID p_window_id
 	wl_surface_commit(ws.wl_surface);
 }
 
-void WaylandThread::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void WaylandThread::window_destroy(DisplayServer::WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4273,14 +4032,6 @@ void WaylandThread::window_destroy(DisplayServerEnums::WindowID p_window_id) {
 		wp_fractional_scale_v1_destroy(ws.wp_fractional_scale);
 	}
 
-	if (ws.wp_color_management_surface) {
-		wp_color_management_surface_v1_destroy(ws.wp_color_management_surface);
-	}
-
-	if (ws.wp_color_management_surface_feedback) {
-		wp_color_management_surface_feedback_v1_destroy(ws.wp_color_management_surface_feedback);
-	}
-
 	if (ws.wp_viewport) {
 		wp_viewport_destroy(ws.wp_viewport);
 	}
@@ -4297,14 +4048,6 @@ void WaylandThread::window_destroy(DisplayServerEnums::WindowID p_window_id) {
 		wl_surface_destroy(ws.wl_surface);
 	}
 
-	if (ws.xdg_icon) {
-		xdg_toplevel_icon_v1_destroy(ws.xdg_icon);
-	}
-
-	if (ws.icon_buffer) {
-		wl_buffer_destroy(ws.icon_buffer);
-	}
-
 	// Before continuing, let's handle any leftover event that might still refer to
 	// this window.
 	wl_display_roundtrip(wl_display);
@@ -4313,7 +4056,7 @@ void WaylandThread::window_destroy(DisplayServerEnums::WindowID p_window_id) {
 	windows.erase(p_window_id);
 }
 
-struct wl_surface *WaylandThread::window_get_wl_surface(DisplayServerEnums::WindowID p_window_id) const {
+struct wl_surface *WaylandThread::window_get_wl_surface(DisplayServer::WindowID p_window_id) const {
 	const WindowState *ws = windows.getptr(p_window_id);
 	if (ws) {
 		return ws->wl_surface;
@@ -4322,15 +4065,15 @@ struct wl_surface *WaylandThread::window_get_wl_surface(DisplayServerEnums::Wind
 	return nullptr;
 }
 
-WaylandThread::WindowState *WaylandThread::window_get_state(DisplayServerEnums::WindowID p_window_id) {
+WaylandThread::WindowState *WaylandThread::window_get_state(DisplayServer::WindowID p_window_id) {
 	return windows.getptr(p_window_id);
 }
 
-const WaylandThread::WindowState *WaylandThread::window_get_state(DisplayServerEnums::WindowID p_window_id) const {
+const WaylandThread::WindowState *WaylandThread::window_get_state(DisplayServer::WindowID p_window_id) const {
 	return windows.getptr(p_window_id);
 }
 
-Size2i WaylandThread::window_set_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size) {
+Size2i WaylandThread::window_set_size(DisplayServer::WindowID p_window_id, const Size2i &p_size) {
 	ERR_FAIL_COND_V(!windows.has(p_window_id), p_size);
 	WindowState &ws = windows[p_window_id];
 
@@ -4360,7 +4103,6 @@ Size2i WaylandThread::window_set_size(DisplayServerEnums::WindowID p_window_id,
 		new_size = new_size.min(ws.rect.size);
 	}
 
-#ifdef LIBDECOR_ENABLED
 	// NOTE: Older versions of libdecor (~2022) do not have a way to get the max
 	// content size. Let's also check for its pointer so that we can preserve
 	// compatibility with older distros.
@@ -4377,7 +4119,6 @@ Size2i WaylandThread::window_set_size(DisplayServerEnums::WindowID p_window_id,
 			new_size.height = MIN(new_size.height, max_height);
 		}
 	}
-#endif
 
 	window_state_update_size(&ws, new_size.width, new_size.height);
 
@@ -4390,7 +4131,7 @@ void WaylandThread::beep() const {
 	}
 }
 
-void WaylandThread::window_start_drag(DisplayServerEnums::WindowID p_window_id) {
+void WaylandThread::window_start_drag(DisplayServer::WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
@@ -4406,7 +4147,7 @@ void WaylandThread::window_start_drag(DisplayServerEnums::WindowID p_window_id)
 #endif
 }
 
-void WaylandThread::window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) {
+void WaylandThread::window_start_resize(DisplayServer::WindowResizeEdge p_edge, DisplayServer::WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowState &ws = windows[p_window];
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
@@ -4414,28 +4155,28 @@ void WaylandThread::window_start_resize(DisplayServerEnums::WindowResizeEdge p_e
 	if (ss && ws.xdg_toplevel) {
 		xdg_toplevel_resize_edge edge = XDG_TOPLEVEL_RESIZE_EDGE_NONE;
 		switch (p_edge) {
-			case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+			case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP: {
+			case DisplayServer::WINDOW_EDGE_TOP: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+			case DisplayServer::WINDOW_EDGE_LEFT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_RIGHT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_RIGHT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 				edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT;
 			} break;
 			default:
@@ -4448,28 +4189,28 @@ void WaylandThread::window_start_resize(DisplayServerEnums::WindowResizeEdge p_e
 	if (ws.libdecor_frame) {
 		libdecor_resize_edge edge = LIBDECOR_RESIZE_EDGE_NONE;
 		switch (p_edge) {
-			case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+			case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 				edge = LIBDECOR_RESIZE_EDGE_TOP_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP: {
+			case DisplayServer::WINDOW_EDGE_TOP: {
 				edge = LIBDECOR_RESIZE_EDGE_TOP;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 				edge = LIBDECOR_RESIZE_EDGE_TOP_RIGHT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+			case DisplayServer::WINDOW_EDGE_LEFT: {
 				edge = LIBDECOR_RESIZE_EDGE_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_RIGHT: {
 				edge = LIBDECOR_RESIZE_EDGE_RIGHT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 				edge = LIBDECOR_RESIZE_EDGE_BOTTOM_LEFT;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM: {
 				edge = LIBDECOR_RESIZE_EDGE_BOTTOM;
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 				edge = LIBDECOR_RESIZE_EDGE_BOTTOM_RIGHT;
 			} break;
 			default:
@@ -4480,7 +4221,7 @@ void WaylandThread::window_start_resize(DisplayServerEnums::WindowResizeEdge p_e
 #endif
 }
 
-void WaylandThread::window_set_parent(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent_id) {
+void WaylandThread::window_set_parent(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	ERR_FAIL_COND(!windows.has(p_parent_id));
 
@@ -4505,7 +4246,7 @@ void WaylandThread::window_set_parent(DisplayServerEnums::WindowID p_window_id,
 	}
 }
 
-void WaylandThread::window_set_max_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size) {
+void WaylandThread::window_set_max_size(DisplayServer::WindowID p_window_id, const Size2i &p_size) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4524,7 +4265,7 @@ void WaylandThread::window_set_max_size(DisplayServerEnums::WindowID p_window_id
 #endif
 }
 
-void WaylandThread::window_set_min_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size) {
+void WaylandThread::window_set_min_size(DisplayServer::WindowID p_window_id, const Size2i &p_size) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4543,17 +4284,17 @@ void WaylandThread::window_set_min_size(DisplayServerEnums::WindowID p_window_id
 #endif
 }
 
-bool WaylandThread::window_can_set_mode(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_window_mode) const {
+bool WaylandThread::window_can_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode) const {
 	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
 	const WindowState &ws = windows[p_window_id];
 
 	switch (p_window_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case DisplayServer::WINDOW_MODE_WINDOWED: {
 			// Looks like it's guaranteed.
 			return true;
 		};
 
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case DisplayServer::WINDOW_MODE_MINIMIZED: {
 #ifdef LIBDECOR_ENABLED
 			if (ws.libdecor_frame) {
 				return libdecor_frame_has_capability(ws.libdecor_frame, LIBDECOR_ACTION_MINIMIZE);
@@ -4563,20 +4304,18 @@ bool WaylandThread::window_can_set_mode(DisplayServerEnums::WindowID p_window_id
 			return ws.can_minimize;
 		};
 
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
-#ifdef LIBDECOR_ENABLED
+		case DisplayServer::WINDOW_MODE_MAXIMIZED: {
 			if (ws.libdecor_frame) {
 				// NOTE: libdecor doesn't seem to have a maximize capability query?
 				// The fact that there's a fullscreen one makes me suspicious. Anyways,
 				// let's act as if we always can.
 				return true;
 			}
-#endif
 			return ws.can_maximize;
 		};
 
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
+		case DisplayServer::WINDOW_MODE_FULLSCREEN:
+		case DisplayServer::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
 #ifdef LIBDECOR_ENABLED
 			if (ws.libdecor_frame) {
 				return libdecor_frame_has_capability(ws.libdecor_frame, LIBDECOR_ACTION_FULLSCREEN);
@@ -4590,7 +4329,7 @@ bool WaylandThread::window_can_set_mode(DisplayServerEnums::WindowID p_window_id
 	return false;
 }
 
-void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_window_mode) {
+void WaylandThread::window_try_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4610,18 +4349,18 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 
 	// Return back to a windowed state so that we can apply what the user asked.
 	switch (ws.mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case DisplayServer::WINDOW_MODE_WINDOWED: {
 			// Do nothing.
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case DisplayServer::WINDOW_MODE_MINIMIZED: {
 			// We can't do much according to the xdg_shell protocol. I have no idea
 			// whether this implies that we should return or who knows what. For now
 			// we'll do nothing.
 			// TODO: Test this properly.
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case DisplayServer::WINDOW_MODE_MAXIMIZED: {
 			// Try to unmaximize. This isn't garaunteed to work actually, so we'll have
 			// to check whether something changed.
 			if (ws.xdg_toplevel) {
@@ -4635,8 +4374,8 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 #endif // LIBDECOR_ENABLED
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
+		case DisplayServer::WINDOW_MODE_FULLSCREEN:
+		case DisplayServer::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
 			// Same thing as above, unset fullscreen and check later if it worked.
 			if (ws.xdg_toplevel) {
 				xdg_toplevel_unset_fullscreen(ws.xdg_toplevel);
@@ -4653,7 +4392,7 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 	// TODO: Async?
 	wl_display_roundtrip(wl_display);
 
-	if (ws.mode != DisplayServerEnums::WINDOW_MODE_WINDOWED) {
+	if (ws.mode != DisplayServer::WINDOW_MODE_WINDOWED) {
 		// The compositor refused our "normalization" request. It'd be useless or
 		// unpredictable to attempt setting a new state. We're done.
 		return;
@@ -4661,11 +4400,11 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 
 	// Ask the compositor to set the state indicated by the new mode.
 	switch (p_window_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case DisplayServer::WINDOW_MODE_WINDOWED: {
 			// Do nothing. We're already windowed.
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case DisplayServer::WINDOW_MODE_MINIMIZED: {
 			if (!window_can_set_mode(p_window_id, p_window_mode)) {
 				// Minimization is special (read below). Better not mess with it if the
 				// compositor explicitly announces that it doesn't support it.
@@ -4684,10 +4423,10 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 	   // We have no way to actually detect this state, so we'll have to report it
 	   // manually to the engine (hoping that it worked). In the worst case it'll
 	   // get reset by the next configure event.
-			ws.mode = DisplayServerEnums::WINDOW_MODE_MINIMIZED;
+			ws.mode = DisplayServer::WINDOW_MODE_MINIMIZED;
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case DisplayServer::WINDOW_MODE_MAXIMIZED: {
 			if (ws.xdg_toplevel) {
 				xdg_toplevel_set_maximized(ws.xdg_toplevel);
 			}
@@ -4699,8 +4438,8 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 #endif // LIBDECOR_ENABLED
 		} break;
 
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
+		case DisplayServer::WINDOW_MODE_FULLSCREEN:
+		case DisplayServer::WINDOW_MODE_EXCLUSIVE_FULLSCREEN: {
 			if (ws.xdg_toplevel) {
 				xdg_toplevel_set_fullscreen(ws.xdg_toplevel, nullptr);
 			}
@@ -4717,7 +4456,7 @@ void WaylandThread::window_try_set_mode(DisplayServerEnums::WindowID p_window_id
 	}
 }
 
-void WaylandThread::window_set_borderless(DisplayServerEnums::WindowID p_window_id, bool p_borderless) {
+void WaylandThread::window_set_borderless(DisplayServer::WindowID p_window_id, bool p_borderless) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4747,7 +4486,7 @@ void WaylandThread::window_set_borderless(DisplayServerEnums::WindowID p_window_
 #endif // LIBDECOR_ENABLED
 }
 
-void WaylandThread::window_set_title(DisplayServerEnums::WindowID p_window_id, const String &p_title) {
+void WaylandThread::window_set_title(DisplayServer::WindowID p_window_id, const String &p_title) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4762,7 +4501,7 @@ void WaylandThread::window_set_title(DisplayServerEnums::WindowID p_window_id, c
 	}
 }
 
-void WaylandThread::window_set_app_id(DisplayServerEnums::WindowID p_window_id, const String &p_app_id) {
+void WaylandThread::window_set_app_id(DisplayServer::WindowID p_window_id, const String &p_app_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4779,85 +4518,7 @@ void WaylandThread::window_set_app_id(DisplayServerEnums::WindowID p_window_id,
 	}
 }
 
-void WaylandThread::set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window_id) {
-	if (!registry.xdg_toplevel_icon_manager) {
-		return;
-	}
-
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	WindowState &ws = windows[p_window_id];
-
-	if (ws.xdg_icon) {
-		xdg_toplevel_icon_v1_destroy(ws.xdg_icon);
-	}
-	if (ws.icon_buffer) {
-		wl_buffer_destroy(ws.icon_buffer);
-	}
-	ws.icon_set = true;
-
-	if (p_icon.is_valid()) {
-		Size2i icon_size = p_icon->get_size();
-		ERR_FAIL_COND(icon_size.width != icon_size.height);
-
-		// NOTE: The stride is the width of the icon in bytes.
-		uint32_t icon_stride = icon_size.width * 4;
-		uint32_t data_size = icon_stride * icon_size.height;
-
-		// We need a shared memory object file descriptor in order to create a
-		// wl_buffer through wl_shm.
-		int fd = WaylandThread::_allocate_shm_file(data_size);
-		ERR_FAIL_COND(fd == -1);
-
-		uint32_t *buffer_data = (uint32_t *)mmap(nullptr, data_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
-		// Create the Wayland buffer.
-		struct wl_shm_pool *shm_pool = wl_shm_create_pool(registry.wl_shm, fd, data_size);
-		ws.icon_buffer = wl_shm_pool_create_buffer(shm_pool, 0, icon_size.width, icon_size.height, icon_stride, WL_SHM_FORMAT_ARGB8888);
-		wl_shm_pool_destroy(shm_pool);
-
-		// Fill the cursor buffer with the image data.
-		for (uint32_t index = 0; index < (uint32_t)(icon_size.width * icon_size.height); index++) {
-			int row_index = index / icon_size.width;
-			int column_index = (index % icon_size.width);
-
-			buffer_data[index] = p_icon->get_pixel(column_index, row_index).to_argb32();
-
-			// Wayland buffers, unless specified, require associated alpha, so we'll just
-			// associate the alpha in-place.
-			uint8_t *pixel_data = (uint8_t *)&buffer_data[index];
-			pixel_data[0] = pixel_data[0] * pixel_data[3] / 255;
-			pixel_data[1] = pixel_data[1] * pixel_data[3] / 255;
-			pixel_data[2] = pixel_data[2] * pixel_data[3] / 255;
-		}
-
-		ws.xdg_icon = xdg_toplevel_icon_manager_v1_create_icon(registry.xdg_toplevel_icon_manager);
-		xdg_toplevel_icon_v1_add_buffer(ws.xdg_icon, ws.icon_buffer, icon_size.width);
-
-#ifdef LIBDECOR_ENABLED
-		if (ws.libdecor_frame) {
-			xdg_toplevel *toplevel = libdecor_frame_get_xdg_toplevel(ws.libdecor_frame);
-			ERR_FAIL_NULL(toplevel);
-			xdg_toplevel_icon_manager_v1_set_icon(registry.xdg_toplevel_icon_manager, toplevel, ws.xdg_icon);
-		}
-#endif
-		if (ws.xdg_toplevel) {
-			xdg_toplevel_icon_manager_v1_set_icon(registry.xdg_toplevel_icon_manager, ws.xdg_toplevel, ws.xdg_icon);
-		}
-	} else {
-#ifdef LIBDECOR_ENABLED
-		if (ws.libdecor_frame) {
-			xdg_toplevel *toplevel = libdecor_frame_get_xdg_toplevel(ws.libdecor_frame);
-			ERR_FAIL_NULL(toplevel);
-			xdg_toplevel_icon_manager_v1_set_icon(registry.xdg_toplevel_icon_manager, toplevel, nullptr);
-		}
-#endif
-		if (ws.xdg_toplevel) {
-			xdg_toplevel_icon_manager_v1_set_icon(registry.xdg_toplevel_icon_manager, ws.xdg_toplevel, nullptr);
-		}
-	}
-}
-
-void WaylandThread::set_default_icon(const Ref<Image> &p_icon) {
+void WaylandThread::set_icon(const Ref<Image> &p_icon) {
 	ERR_FAIL_COND(p_icon.is_null());
 
 	Size2i icon_size = p_icon->get_size();
@@ -4917,12 +4578,8 @@ void WaylandThread::set_default_icon(const Ref<Image> &p_icon) {
 		xdg_toplevel_icon_v1_set_name(xdg_icon, "godot");
 	}
 
-	for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : windows) {
+	for (KeyValue<DisplayServer::WindowID, WindowState> &pair : windows) {
 		WindowState &ws = pair.value;
-		if (ws.icon_set) {
-			continue;
-		}
-
 #ifdef LIBDECOR_ENABLED
 		if (ws.libdecor_frame) {
 			xdg_toplevel *toplevel = libdecor_frame_get_xdg_toplevel(ws.libdecor_frame);
@@ -4936,14 +4593,14 @@ void WaylandThread::set_default_icon(const Ref<Image> &p_icon) {
 	}
 }
 
-DisplayServerEnums::WindowMode WaylandThread::window_get_mode(DisplayServerEnums::WindowID p_window_id) const {
-	ERR_FAIL_COND_V(!windows.has(p_window_id), DisplayServerEnums::WINDOW_MODE_WINDOWED);
+DisplayServer::WindowMode WaylandThread::window_get_mode(DisplayServer::WindowID p_window_id) const {
+	ERR_FAIL_COND_V(!windows.has(p_window_id), DisplayServer::WINDOW_MODE_WINDOWED);
 	const WindowState &ws = windows[p_window_id];
 
 	return ws.mode;
 }
 
-void WaylandThread::window_request_attention(DisplayServerEnums::WindowID p_window_id) {
+void WaylandThread::window_request_attention(DisplayServer::WindowID p_window_id) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4955,7 +4612,7 @@ void WaylandThread::window_request_attention(DisplayServerEnums::WindowID p_wind
 	}
 }
 
-void WaylandThread::window_set_idle_inhibition(DisplayServerEnums::WindowID p_window_id, bool p_enable) {
+void WaylandThread::window_set_idle_inhibition(DisplayServer::WindowID p_window_id, bool p_enable) {
 	ERR_FAIL_COND(!windows.has(p_window_id));
 	WindowState &ws = windows[p_window_id];
 
@@ -4972,47 +4629,13 @@ void WaylandThread::window_set_idle_inhibition(DisplayServerEnums::WindowID p_wi
 	}
 }
 
-bool WaylandThread::window_get_idle_inhibition(DisplayServerEnums::WindowID p_window_id) const {
+bool WaylandThread::window_get_idle_inhibition(DisplayServer::WindowID p_window_id) const {
 	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
 	const WindowState &ws = windows[p_window_id];
 
 	return ws.wp_idle_inhibitor != nullptr;
 }
 
-void WaylandThread::window_set_color_profile(DisplayServerEnums::WindowID p_window_id, ColorProfile p_profile) {
-	ERR_FAIL_COND(!windows.has(p_window_id));
-	const WindowState &ws = windows[p_window_id];
-
-	if (!ws.wp_color_management_surface) {
-		return;
-	}
-
-	if (p_profile.named_transfer_function == WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22) {
-		// This is largely a problem with some HDR monitors applying "glare compensation" or not.
-		// For monitors which do not apply glare compensation, it is correct to report gamma22 like we would on SDR.
-		// But there also exist monitors which apply glare compensation, on these monitors it is correct to request compound_2_4.
-		// Since we have no way to know on which type of monitor we are in, we unset the image description in the hopes
-		// that future compositor features may include choosing a default transfer function.
-		wp_color_management_surface_v1_unset_image_description(ws.wp_color_management_surface);
-		return;
-	}
-
-	ColorManagementState *cms = wp_color_manager_get_state(registry.wp_color_manager);
-
-	struct wp_image_description_creator_params_v1 *builder = wp_color_manager_v1_create_parametric_creator(registry.wp_color_manager);
-	wp_image_description_creator_params_v1_set_primaries_named(builder, p_profile.named_primary);
-	wp_image_description_creator_params_v1_set_tf_named(builder, p_profile.named_transfer_function);
-
-	if ((cms->supported_render_feature & WP_COLOR_MANAGER_V1_FEATURE_SET_LUMINANCES) > 0) {
-		uint32_t min_luminance = static_cast<uint32_t>(p_profile.target_min_luminance * 10000);
-		wp_image_description_creator_params_v1_set_luminances(builder, min_luminance, p_profile.target_max_luminance, p_profile.reference_luminance);
-	}
-
-	struct wp_image_description_v1 *image_desc = wp_image_description_creator_params_v1_create(builder);
-	wp_color_management_surface_v1_set_image_description(ws.wp_color_management_surface, image_desc, WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL);
-	wp_image_description_v1_destroy(image_desc);
-}
-
 WaylandThread::ScreenData WaylandThread::screen_get_data(int p_screen) const {
 	ERR_FAIL_INDEX_V(p_screen, registry.wl_outputs.size(), ScreenData());
 
@@ -5023,7 +4646,7 @@ int WaylandThread::get_screen_count() const {
 	return registry.wl_outputs.size();
 }
 
-DisplayServerEnums::WindowID WaylandThread::pointer_get_pointed_window_id() const {
+DisplayServer::WindowID WaylandThread::pointer_get_pointed_window_id() const {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss) {
@@ -5057,9 +4680,9 @@ DisplayServerEnums::WindowID WaylandThread::pointer_get_pointed_window_id() cons
 		return ss->pointer_data.pointed_id;
 	}
 
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+	return DisplayServer::INVALID_WINDOW_ID;
 }
-DisplayServerEnums::WindowID WaylandThread::pointer_get_last_pointed_window_id() const {
+DisplayServer::WindowID WaylandThread::pointer_get_last_pointed_window_id() const {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss) {
@@ -5093,7 +4716,7 @@ DisplayServerEnums::WindowID WaylandThread::pointer_get_last_pointed_window_id()
 		return ss->pointer_data.last_pointed_id;
 	}
 
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+	return DisplayServer::INVALID_WINDOW_ID;
 }
 
 void WaylandThread::pointer_set_constraint(PointerConstraint p_constraint) {
@@ -5119,60 +4742,25 @@ void WaylandThread::pointer_set_hint(const Point2i &p_hint) {
 	}
 
 	WindowState *ws = window_get_state(ss->pointer_data.pointed_id);
-	if (!ws) {
-		return;
-	}
 
-	// NOTE: It looks like it's not really recommended to convert from
-	// "godot-space" to "wayland-space" and in general I received mixed feelings
-	// discussing about this. I'm not really sure about the maths behind this but,
-	// oh well, we're setting a cursor hint. ¯\_(ツ)_/¯
-	// See: https://oftc.irclog.whitequark.org/wayland/2023-08-23#1692756914-1692816818
-	int hint_x = Math::round(p_hint.x / window_state_get_scale_factor(ws));
-	int hint_y = Math::round(p_hint.y / window_state_get_scale_factor(ws));
+	int hint_x = 0;
+	int hint_y = 0;
+
+	if (ws) {
+		// NOTE: It looks like it's not really recommended to convert from
+		// "godot-space" to "wayland-space" and in general I received mixed feelings
+		// discussing about this. I'm not really sure about the maths behind this but,
+		// oh well, we're setting a cursor hint. ¯\_(ツ)_/¯
+		// See: https://oftc.irclog.whitequark.org/wayland/2023-08-23#1692756914-1692816818
+		hint_x = std::round(p_hint.x / window_state_get_scale_factor(ws));
+		hint_y = std::round(p_hint.y / window_state_get_scale_factor(ws));
+	}
 
 	if (ss) {
 		seat_state_set_hint(ss, hint_x, hint_y);
 	}
 }
 
-void WaylandThread::pointer_warp(const Point2i &p_to) {
-	// NOTE: This is for compositors that don't support the pointer-warp protocol.
-	// It's hacked together and not guaranteed to work.
-	if (registry.wp_pointer_warp == nullptr) {
-		PointerConstraint old_constraint = pointer_get_constraint();
-
-		pointer_set_constraint(PointerConstraint::LOCKED);
-		pointer_set_hint(p_to);
-
-		pointer_set_constraint(old_constraint);
-
-		return;
-	}
-
-	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
-	if (!ss) {
-		return;
-	}
-
-	WindowState *ws = window_get_state(ss->pointer_data.pointed_id);
-	if (!ws) {
-		return;
-	}
-
-	// NOTE: It looks like it's not really recommended to convert from
-	// "godot-space" to "wayland-space" and in general I received mixed feelings
-	// discussing about this. I'm not really sure about the maths behind this but,
-	// oh well. ¯\_(ツ)_/¯
-	// See: https://oftc.irclog.whitequark.org/wayland/2023-08-23#1692756914-1692816818
-	int wl_pos_x = Math::round(p_to.x / window_state_get_scale_factor(ws));
-	int wl_pos_y = Math::round(p_to.y / window_state_get_scale_factor(ws));
-
-	if (ss) {
-		seat_state_warp_pointer(ss, wl_pos_x, wl_pos_y);
-	}
-}
-
 WaylandThread::PointerConstraint WaylandThread::pointer_get_constraint() const {
 	return pointer_constraint;
 }
@@ -5345,7 +4933,7 @@ Error WaylandThread::init() {
 	}
 
 	// Update the cursor.
-	cursor_set_shape(DisplayServerEnums::CURSOR_ARROW);
+	cursor_set_shape(DisplayServer::CURSOR_ARROW);
 
 	events_thread.start(_poll_events_thread, &thread_data);
 
@@ -5364,7 +4952,7 @@ void WaylandThread::cursor_set_visible(bool p_visible) {
 	}
 }
 
-void WaylandThread::cursor_set_shape(DisplayServerEnums::CursorShape p_cursor_shape) {
+void WaylandThread::cursor_set_shape(DisplayServer::CursorShape p_cursor_shape) {
 	cursor_shape = p_cursor_shape;
 
 	for (struct wl_seat *wl_seat : registry.wl_seats) {
@@ -5375,7 +4963,7 @@ void WaylandThread::cursor_set_shape(DisplayServerEnums::CursorShape p_cursor_sh
 	}
 }
 
-void WaylandThread::cursor_shape_set_custom_image(DisplayServerEnums::CursorShape p_cursor_shape, Ref<Image> p_image, const Point2i &p_hotspot) {
+void WaylandThread::cursor_shape_set_custom_image(DisplayServer::CursorShape p_cursor_shape, Ref<Image> p_image, const Point2i &p_hotspot) {
 	ERR_FAIL_COND(p_image.is_null());
 
 	Size2i image_size = p_image->get_size();
@@ -5429,7 +5017,7 @@ void WaylandThread::cursor_shape_set_custom_image(DisplayServerEnums::CursorShap
 	}
 }
 
-void WaylandThread::cursor_shape_clear_custom_image(DisplayServerEnums::CursorShape p_cursor_shape) {
+void WaylandThread::cursor_shape_clear_custom_image(DisplayServer::CursorShape p_cursor_shape) {
 	if (custom_cursors.has(p_cursor_shape)) {
 		CustomCursor cursor = custom_cursors[p_cursor_shape];
 		custom_cursors.erase(p_cursor_shape);
@@ -5444,7 +5032,7 @@ void WaylandThread::cursor_shape_clear_custom_image(DisplayServerEnums::CursorSh
 	}
 }
 
-void WaylandThread::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window_id) {
+void WaylandThread::window_set_ime_active(const bool p_active, DisplayServer::WindowID p_window_id) {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss && ss->wp_text_input && ss->ime_enabled) {
@@ -5463,7 +5051,7 @@ void WaylandThread::window_set_ime_active(const bool p_active, DisplayServerEnum
 	}
 }
 
-void WaylandThread::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window_id) {
+void WaylandThread::window_set_ime_position(const Point2i &p_pos, DisplayServer::WindowID p_window_id) {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss && ss->wp_text_input && ss->ime_enabled) {
@@ -5574,19 +5162,16 @@ void WaylandThread::selection_set_text(const String &p_text) {
 
 	ss->selection_data = p_text.to_utf8_buffer();
 
-	if (ss->wl_data_source_selection != nullptr) {
-		wl_data_source_destroy(ss->wl_data_source_selection);
-		ss->wl_data_source_selection = nullptr;
+	if (ss->wl_data_source_selection == nullptr) {
+		ss->wl_data_source_selection = wl_data_device_manager_create_data_source(registry.wl_data_device_manager);
+		wl_data_source_add_listener(ss->wl_data_source_selection, &wl_data_source_listener, ss);
+		wl_data_source_offer(ss->wl_data_source_selection, "text/plain;charset=utf-8");
+		wl_data_source_offer(ss->wl_data_source_selection, "text/plain");
+
+		// TODO: Implement a good way of getting the latest serial from the user.
+		wl_data_device_set_selection(ss->wl_data_device, ss->wl_data_source_selection, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
 	}
 
-	ss->wl_data_source_selection = wl_data_device_manager_create_data_source(registry.wl_data_device_manager);
-	wl_data_source_add_listener(ss->wl_data_source_selection, &wl_data_source_listener, ss);
-	wl_data_source_offer(ss->wl_data_source_selection, "text/plain;charset=utf-8");
-	wl_data_source_offer(ss->wl_data_source_selection, "text/plain");
-
-	// TODO: Implement a good way of getting the latest serial from the user.
-	wl_data_device_set_selection(ss->wl_data_device, ss->wl_data_source_selection, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
-
 	// Wait for the message to get to the server before continuing, otherwise the
 	// clipboard update might come with a delay.
 	wl_display_roundtrip(wl_display);
@@ -5668,7 +5253,7 @@ Vector<uint8_t> WaylandThread::primary_get_mime(const String &p_mime) const {
 
 		if (os->mime_types.has(p_mime)) {
 			// All righty, we're offering this type. Let's just return the data as is.
-			return ss->primary_data;
+			return ss->selection_data;
 		}
 
 		// ... we don't offer that type. Oh well.
@@ -5698,35 +5283,23 @@ void WaylandThread::primary_set_text(const String &p_text) {
 
 	ss->primary_data = p_text.to_utf8_buffer();
 
-	if (ss->wp_primary_selection_source != nullptr) {
-		zwp_primary_selection_source_v1_destroy(ss->wp_primary_selection_source);
-		ss->wp_primary_selection_source = nullptr;
+	if (ss->wp_primary_selection_source == nullptr) {
+		ss->wp_primary_selection_source = zwp_primary_selection_device_manager_v1_create_source(registry.wp_primary_selection_device_manager);
+		zwp_primary_selection_source_v1_add_listener(ss->wp_primary_selection_source, &wp_primary_selection_source_listener, ss);
+		zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain;charset=utf-8");
+		zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain");
+
+		// TODO: Implement a good way of getting the latest serial from the user.
+		zwp_primary_selection_device_v1_set_selection(ss->wp_primary_selection_device, ss->wp_primary_selection_source, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
 	}
 
-	ss->wp_primary_selection_source = zwp_primary_selection_device_manager_v1_create_source(registry.wp_primary_selection_device_manager);
-	zwp_primary_selection_source_v1_add_listener(ss->wp_primary_selection_source, &wp_primary_selection_source_listener, ss);
-	zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain;charset=utf-8");
-	zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain");
-
-	// TODO: Implement a good way of getting the latest serial from the user.
-	zwp_primary_selection_device_v1_set_selection(ss->wp_primary_selection_device, ss->wp_primary_selection_source, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
-
 	// Wait for the message to get to the server before continuing, otherwise the
 	// clipboard update might come with a delay.
 	wl_display_roundtrip(wl_display);
 }
 
-bool WaylandThread::supports_hdr() const {
-	ColorManagementState *color_state = wp_color_manager_get_state(registry.wp_color_manager);
-	if (!color_state) {
-		return false;
-	}
-
-	return color_state->supports_hdr;
-}
-
 void WaylandThread::commit_surfaces() {
-	for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : windows) {
+	for (KeyValue<DisplayServer::WindowID, WindowState> &pair : windows) {
 		wl_surface_commit(pair.value.wl_surface);
 	}
 }
@@ -5838,12 +5411,12 @@ bool WaylandThread::wait_frame_suspend_ms(int p_timeout) {
 	return false;
 }
 
-uint64_t WaylandThread::window_get_last_frame_time(DisplayServerEnums::WindowID p_window_id) const {
+uint64_t WaylandThread::window_get_last_frame_time(DisplayServer::WindowID p_window_id) const {
 	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
 	return windows[p_window_id].last_frame_time;
 }
 
-bool WaylandThread::window_is_suspended(DisplayServerEnums::WindowID p_window_id) const {
+bool WaylandThread::window_is_suspended(DisplayServer::WindowID p_window_id) const {
 	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
 	return windows[p_window_id].suspended;
 }
@@ -5853,7 +5426,7 @@ bool WaylandThread::is_fifo_available() const {
 }
 
 bool WaylandThread::is_suspended() const {
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowState> &E : windows) {
+	for (const KeyValue<DisplayServer::WindowID, WindowState> &E : windows) {
 		if (!E.value.suspended) {
 			return false;
 		}
@@ -5862,7 +5435,7 @@ bool WaylandThread::is_suspended() const {
 	return true;
 }
 
-bool WaylandThread::window_wait_ready(DisplayServerEnums::WindowID p_window_id, int p_timeout_ms) {
+bool WaylandThread::window_wait_ready(DisplayServer::WindowID p_window_id, int p_timeout_ms) {
 	MutexLock mutex_lock(mutex);
 
 	WindowState *ws = windows.getptr(p_window_id);
@@ -5903,7 +5476,7 @@ struct godot_embedding_compositor *WaylandThread::get_embedding_compositor() {
 	return registry.godot_embedding_compositor;
 }
 
-ProcessID WaylandThread::embedded_compositor_get_focused_pid() {
+OS::ProcessID WaylandThread::embedded_compositor_get_focused_pid() {
 	EmbeddingCompositorState *ecomp_state = godot_embedding_compositor_get_state(registry.godot_embedding_compositor);
 	ERR_FAIL_NULL_V(ecomp_state, -1);
 
@@ -5925,39 +5498,223 @@ void WaylandThread::destroy() {
 		events_thread.wait_to_finish();
 	}
 
-	if (!windows.is_empty()) {
-		WARN_PRINT("Display server did not destroy all windows!");
-		// Destroy all remaining windows.
-		// FIXME: This code does not delete popups in order and might cause protocol
-		// errors, as all the popup tree tracking and signaling is done in the display
-		// server. We should figure whether the Wayland thread is the sole responsible
-		// for cleanup.
-		LocalVector<DisplayServerEnums::WindowID> window_ids;
-		for (KeyValue<DisplayServerEnums::WindowID, WindowState> &pair : windows) {
-			print_verbose(vformat("Window %d still allocated", pair.key));
-			window_ids.push_back(pair.key);
+	for (KeyValue<DisplayServer::WindowID, WindowState> &pair : windows) {
+		WindowState &ws = pair.value;
+		if (ws.wp_fractional_scale) {
+			wp_fractional_scale_v1_destroy(ws.wp_fractional_scale);
 		}
 
-		for (LocalVector<DisplayServerEnums::WindowID>::Iterator E = window_ids.end(); E != window_ids.begin(); --E) {
-			window_destroy(*E);
+		if (ws.wp_viewport) {
+			wp_viewport_destroy(ws.wp_viewport);
+		}
+
+		if (ws.frame_callback) {
+			wl_callback_destroy(ws.frame_callback);
+		}
+
+#ifdef LIBDECOR_ENABLED
+		if (ws.libdecor_frame) {
+			libdecor_frame_close(ws.libdecor_frame);
+		}
+#endif // LIBDECOR_ENABLED
+
+		if (ws.xdg_toplevel_decoration) {
+			zxdg_toplevel_decoration_v1_destroy(ws.xdg_toplevel_decoration);
+		}
+
+		if (ws.xdg_toplevel) {
+			xdg_toplevel_destroy(ws.xdg_toplevel);
+		}
+
+		if (ws.xdg_surface) {
+			xdg_surface_destroy(ws.xdg_surface);
+		}
+
+		if (ws.wl_surface) {
+			wl_surface_destroy(ws.wl_surface);
 		}
 	}
 
-	// We can't iterate directly on `global_names` as it gets mutated by the global
-	// remove handler.
-	LocalVector<uint32_t> global_names_to_delete;
-	for (uint32_t name : registry.global_names) {
-		global_names_to_delete.push_back(name);
+	for (struct wl_seat *wl_seat : registry.wl_seats) {
+		SeatState *ss = wl_seat_get_seat_state(wl_seat);
+		ERR_FAIL_NULL(ss);
+
+		wl_seat_destroy(wl_seat);
+
+		xkb_context_unref(ss->xkb_context);
+		xkb_state_unref(ss->xkb_state);
+		xkb_keymap_unref(ss->xkb_keymap);
+		xkb_compose_table_unref(ss->xkb_compose_table);
+		xkb_compose_state_unref(ss->xkb_compose_state);
+
+		if (ss->wl_keyboard) {
+			wl_keyboard_destroy(ss->wl_keyboard);
+		}
+
+		if (ss->keymap_buffer) {
+			munmap((void *)ss->keymap_buffer, ss->keymap_buffer_size);
+		}
+
+		if (ss->wl_pointer) {
+			wl_pointer_destroy(ss->wl_pointer);
+		}
+
+		if (ss->cursor_frame_callback) {
+			// We don't need to set a null userdata for safety as the thread is done.
+			wl_callback_destroy(ss->cursor_frame_callback);
+		}
+
+		if (ss->cursor_surface) {
+			wl_surface_destroy(ss->cursor_surface);
+		}
+
+		if (ss->wl_data_device) {
+			wl_data_device_destroy(ss->wl_data_device);
+		}
+
+		if (ss->wp_cursor_shape_device) {
+			wp_cursor_shape_device_v1_destroy(ss->wp_cursor_shape_device);
+		}
+
+		if (ss->wp_relative_pointer) {
+			zwp_relative_pointer_v1_destroy(ss->wp_relative_pointer);
+		}
+
+		if (ss->wp_locked_pointer) {
+			zwp_locked_pointer_v1_destroy(ss->wp_locked_pointer);
+		}
+
+		if (ss->wp_confined_pointer) {
+			zwp_confined_pointer_v1_destroy(ss->wp_confined_pointer);
+		}
+
+		if (ss->wp_tablet_seat) {
+			zwp_tablet_seat_v2_destroy(ss->wp_tablet_seat);
+		}
+
+		for (struct zwp_tablet_tool_v2 *tool : ss->tablet_tools) {
+			TabletToolState *state = wp_tablet_tool_get_state(tool);
+			if (state) {
+				memdelete(state);
+			}
+
+			zwp_tablet_tool_v2_destroy(tool);
+		}
+
+		if (ss->wp_text_input) {
+			zwp_text_input_v3_destroy(ss->wp_text_input);
+		}
+
+		memdelete(ss);
 	}
 
-	for (uint32_t name : global_names_to_delete) {
-		_wl_registry_on_global_remove(wl_registry_get_user_data(wl_registry), wl_registry, name);
+	if (registry.wp_tablet_manager) {
+		zwp_tablet_manager_v2_destroy(registry.wp_tablet_manager);
+	}
+
+	if (registry.wp_text_input_manager) {
+		zwp_text_input_manager_v3_destroy(registry.wp_text_input_manager);
+	}
+
+	for (struct wl_output *wl_output : registry.wl_outputs) {
+		ERR_FAIL_NULL(wl_output);
+
+		memdelete(wl_output_get_screen_state(wl_output));
+		wl_output_destroy(wl_output);
+	}
+
+	if (registry.godot_embedding_compositor) {
+		EmbeddingCompositorState *es = godot_embedding_compositor_get_state(registry.godot_embedding_compositor);
+		ERR_FAIL_NULL(es);
+
+		es->mapped_clients.clear();
+
+		for (struct godot_embedded_client *client : es->clients) {
+			godot_embedded_client_destroy(client);
+		}
+		es->clients.clear();
+
+		memdelete(es);
+
+		godot_embedding_compositor_destroy(registry.godot_embedding_compositor);
 	}
 
 	if (wl_cursor_theme) {
 		wl_cursor_theme_destroy(wl_cursor_theme);
 	}
 
+	if (registry.wp_idle_inhibit_manager) {
+		zwp_idle_inhibit_manager_v1_destroy(registry.wp_idle_inhibit_manager);
+	}
+
+	if (registry.wp_pointer_constraints) {
+		zwp_pointer_constraints_v1_destroy(registry.wp_pointer_constraints);
+	}
+
+	if (registry.wp_pointer_gestures) {
+		zwp_pointer_gestures_v1_destroy(registry.wp_pointer_gestures);
+	}
+
+	if (registry.wp_relative_pointer_manager) {
+		zwp_relative_pointer_manager_v1_destroy(registry.wp_relative_pointer_manager);
+	}
+
+	if (registry.xdg_activation) {
+		xdg_activation_v1_destroy(registry.xdg_activation);
+	}
+
+	if (registry.xdg_system_bell) {
+		xdg_system_bell_v1_destroy(registry.xdg_system_bell);
+	}
+
+	if (registry.xdg_toplevel_icon_manager) {
+		xdg_toplevel_icon_manager_v1_destroy(registry.xdg_toplevel_icon_manager);
+
+		if (xdg_icon) {
+			xdg_toplevel_icon_v1_destroy(xdg_icon);
+		}
+
+		if (icon_buffer) {
+			wl_buffer_destroy(icon_buffer);
+		}
+	}
+
+	if (registry.xdg_decoration_manager) {
+		zxdg_decoration_manager_v1_destroy(registry.xdg_decoration_manager);
+	}
+
+	if (registry.wp_cursor_shape_manager) {
+		wp_cursor_shape_manager_v1_destroy(registry.wp_cursor_shape_manager);
+	}
+
+	if (registry.wp_fractional_scale_manager) {
+		wp_fractional_scale_manager_v1_destroy(registry.wp_fractional_scale_manager);
+	}
+
+	if (registry.wp_viewporter) {
+		wp_viewporter_destroy(registry.wp_viewporter);
+	}
+
+	if (registry.xdg_wm_base) {
+		xdg_wm_base_destroy(registry.xdg_wm_base);
+	}
+
+	// NOTE: Deprecated.
+	if (registry.xdg_exporter_v1) {
+		zxdg_exporter_v1_destroy(registry.xdg_exporter_v1);
+	}
+
+	if (registry.xdg_exporter_v2) {
+		zxdg_exporter_v2_destroy(registry.xdg_exporter_v2);
+	}
+	if (registry.wl_shm) {
+		wl_shm_destroy(registry.wl_shm);
+	}
+
+	if (registry.wl_compositor) {
+		wl_compositor_destroy(registry.wl_compositor);
+	}
+
 	if (wl_registry) {
 		wl_registry_destroy(wl_registry);
 	}
diff --git a/engine/platform/linuxbsd/wayland/wayland_thread.h b/engine/platform/linuxbsd/wayland/wayland_thread.h
index a22ece5e..64eb673f 100644
--- a/engine/platform/linuxbsd/wayland/wayland_thread.h
+++ b/engine/platform/linuxbsd/wayland/wayland_thread.h
@@ -52,19 +52,15 @@
 // These must go after the Wayland client include to work properly.
 #include "wayland/protocol/idle_inhibit.gen.h"
 #include "wayland/protocol/primary_selection.gen.h"
-
-// These protocol headers name wl_pointer method arguments as `pointer`,
+// These four protocol headers name wl_pointer method arguments as `pointer`,
 // which is the same name as X11's pointer typedef. This trips some very
 // annoying shadowing warnings. A `#define` works around this issue.
 #define pointer wl_pointer
 #include "wayland/protocol/cursor_shape.gen.h"
 #include "wayland/protocol/pointer_constraints.gen.h"
 #include "wayland/protocol/pointer_gestures.gen.h"
-#include "wayland/protocol/pointer_warp.gen.h"
 #include "wayland/protocol/relative_pointer.gen.h"
 #undef pointer
-
-#include "wayland/protocol/color_management.gen.h"
 #include "wayland/protocol/fractional_scale.gen.h"
 #include "wayland/protocol/tablet.gen.h"
 #include "wayland/protocol/text_input.gen.h"
@@ -77,12 +73,11 @@
 #include "wayland/protocol/xdg_system_bell.gen.h"
 #include "wayland/protocol/xdg_toplevel_icon.gen.h"
 
+#include "wayland/protocol/godot_embedding_compositor.gen.h"
+
 // NOTE: Deprecated.
 #include "wayland/protocol/xdg_foreign_v1.gen.h"
 
-// Custom internal protocol.
-#include "wayland/protocol/godot_embedding_compositor.gen.h"
-
 #ifdef LIBDECOR_ENABLED
 #ifdef SOWRAP_ENABLED
 #include "dynwrappers/libdecor-so_wrap.h"
@@ -91,27 +86,13 @@
 #endif // SOWRAP_ENABLED
 #endif // LIBDECOR_ENABLED
 
-#include "wayland_embedder.h"
-
-#include "core/input/input_event.h"
-#include "core/os/process_id.h"
 #include "core/os/thread.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
-class Image;
+#include "wayland_embedder.h"
 
 class WaylandThread {
 public:
-	struct ColorProfile {
-		uint32_t named_primary = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
-		uint32_t named_transfer_function = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22;
-
-		// The luminances the compositor recommends.
-		float target_min_luminance = 0;
-		float target_max_luminance = 0;
-		float reference_luminance = 0;
-	};
-
 	// Messages used for exchanging information between Godot's and Wayland's thread.
 	class Message : public RefCounted {
 		GDSOFTCLASS(Message, RefCounted);
@@ -125,7 +106,7 @@ public:
 		GDSOFTCLASS(WindowMessage, Message);
 
 	public:
-		DisplayServerEnums::WindowID id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID id = DisplayServer::INVALID_WINDOW_ID;
 	};
 
 	// Message data for window rect changes.
@@ -133,24 +114,16 @@ public:
 		GDSOFTCLASS(WindowRectMessage, WindowMessage);
 
 	public:
-		// The window size in "absolute units" (pre-scaled). Basically the desired
-		// resolution of the underlying buffer.
+		// NOTE: This is in "scaled" terms. For example, if there's a 1920x1080 rect
+		// with a scale factor of 2, the actual value of `rect` will be 3840x2160.
 		Rect2i rect;
-
-		// Used to synchronize buffer size and scale together, otherwise we risk a
-		// protocol error. Note that this doesn't control scaling in general, only the
-		// concept of "surface buffer scale". See the protocol documentation of
-		// `wl_surface::set_buffer_scale` for more details.
-		//
-		// Defaults to 0 so that we can catch malformed messages.
-		int buffer_scale = 0;
 	};
 
 	class WindowEventMessage : public WindowMessage {
 		GDSOFTCLASS(WindowEventMessage, WindowMessage);
 
 	public:
-		DisplayServerEnums::WindowEvent event;
+		DisplayServer::WindowEvent event;
 	};
 
 	class InputEventMessage : public Message {
@@ -182,17 +155,7 @@ public:
 		String text;
 	};
 
-	class ColorProfileMessage : public WindowMessage {
-		GDSOFTCLASS(ColorProfileMessage, WindowMessage);
-
-	public:
-		WaylandThread *wayland_thread;
-		ColorProfile color_profile;
-	};
-
 	struct RegistryState {
-		HashSet<uint32_t> global_names;
-
 		WaylandThread *wayland_thread;
 
 		// Core Wayland globals.
@@ -228,9 +191,6 @@ public:
 		struct wp_viewporter *wp_viewporter = nullptr;
 		uint32_t wp_viewporter_name = 0;
 
-		struct wp_color_manager_v1 *wp_color_manager = nullptr;
-		uint32_t wp_color_manager_name = 0;
-
 		struct wp_fractional_scale_manager_v1 *wp_fractional_scale_manager = nullptr;
 		uint32_t wp_fractional_scale_manager_name = 0;
 
@@ -270,9 +230,6 @@ public:
 		struct zwp_text_input_manager_v3 *wp_text_input_manager = nullptr;
 		uint32_t wp_text_input_manager_name = 0;
 
-		struct wp_pointer_warp_v1 *wp_pointer_warp = nullptr;
-		uint32_t wp_pointer_warp_name = 0;
-
 		// We're really not meant to use this one directly but we still need to know
 		// whether it's available.
 		uint32_t wp_fifo_manager_name = 0;
@@ -285,11 +242,11 @@ public:
 	// TODO: Make private?
 
 	struct WindowState {
-		DisplayServerEnums::WindowID id = DisplayServerEnums::INVALID_WINDOW_ID;
-		DisplayServerEnums::WindowID parent_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID parent_id = DisplayServer::INVALID_WINDOW_ID;
 
 		Rect2i rect;
-		DisplayServerEnums::WindowMode mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+		DisplayServer::WindowMode mode = DisplayServer::WINDOW_MODE_WINDOWED;
 
 		bool ready = false; // Is configured or otherwise ready to be mapped.
 
@@ -312,10 +269,6 @@ public:
 		bool can_maximize = true;
 		bool can_fullscreen = true;
 
-		xdg_toplevel_icon_v1 *xdg_icon = nullptr;
-		wl_buffer *icon_buffer = nullptr;
-		bool icon_set = false;
-
 		HashSet<struct wl_output *> wl_outputs;
 
 		// NOTE: If for whatever reason this callback is destroyed _while_ the event
@@ -345,6 +298,12 @@ public:
 		// Currently applied buffer scale.
 		int buffer_scale = 1;
 
+		// Buffer scale must be applied right before rendering but _after_ committing
+		// everything else or otherwise we might have an inconsistent state (e.g.
+		// double scale and odd resolution). This flag assists with that; when set,
+		// on the next frame, we'll commit whatever is set in `buffer_scale`.
+		bool buffer_scale_changed = false;
+
 		// NOTE: The preferred buffer scale is currently only dynamically calculated.
 		// It can be accessed by calling `window_state_get_preferred_buffer_scale`.
 
@@ -358,9 +317,6 @@ public:
 		// What the compositor is recommending us.
 		double preferred_fractional_scale = 0;
 
-		struct wp_color_management_surface_feedback_v1 *wp_color_management_surface_feedback = nullptr;
-		struct wp_color_management_surface_v1 *wp_color_management_surface = nullptr;
-
 		struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration = nullptr;
 
 		struct zwp_idle_inhibitor_v1 *wp_idle_inhibitor = nullptr;
@@ -425,8 +381,8 @@ public:
 		MouseButton last_button_pressed = MouseButton::NONE;
 		Point2 last_pressed_position;
 
-		DisplayServerEnums::WindowID pointed_id = DisplayServerEnums::INVALID_WINDOW_ID;
-		DisplayServerEnums::WindowID last_pointed_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID pointed_id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID last_pointed_id = DisplayServer::INVALID_WINDOW_ID;
 
 		// This is needed to check for a new double click every time.
 		bool double_click_begun = false;
@@ -460,8 +416,8 @@ public:
 		uint64_t button_time = 0;
 		uint64_t motion_time = 0;
 
-		DisplayServerEnums::WindowID proximal_id = DisplayServerEnums::INVALID_WINDOW_ID;
-		DisplayServerEnums::WindowID last_proximal_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID proximal_id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID last_proximal_id = DisplayServer::INVALID_WINDOW_ID;
 		uint32_t proximity_serial = 0;
 	};
 
@@ -524,7 +480,7 @@ public:
 		struct wl_keyboard *wl_keyboard = nullptr;
 
 		// For key events.
-		DisplayServerEnums::WindowID focused_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID focused_id = DisplayServer::INVALID_WINDOW_ID;
 
 		struct xkb_context *xkb_context = nullptr;
 		struct xkb_keymap *xkb_keymap = nullptr;
@@ -563,7 +519,7 @@ public:
 		struct wl_data_device *wl_data_device = nullptr;
 
 		// Drag and drop.
-		DisplayServerEnums::WindowID dnd_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID dnd_id = DisplayServer::INVALID_WINDOW_ID;
 		struct wl_data_offer *wl_data_offer_dnd = nullptr;
 		uint32_t dnd_enter_serial = 0;
 
@@ -588,7 +544,7 @@ public:
 
 		// IME.
 		struct zwp_text_input_v3 *wp_text_input = nullptr;
-		DisplayServerEnums::WindowID ime_window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID ime_window_id = DisplayServer::INVALID_WINDOW_ID;
 		bool ime_enabled = false;
 		bool ime_active = false;
 		String ime_text;
@@ -605,22 +561,13 @@ public:
 		Point2i hotspot;
 	};
 
-	struct ColorManagementState {
-		// Compositor features.
-		uint32_t supported_render_intents = 0;
-		uint32_t supported_render_feature = 0;
-		uint32_t supported_transfer_function = 0;
-		uint32_t supported_primaries = 0;
-		bool supports_hdr = false;
-	};
-
 	struct EmbeddingCompositorState {
 		LocalVector<struct godot_embedded_client *> clients;
 
 		// Only a client per PID can create a window.
 		HashMap<int, struct godot_embedded_client *> mapped_clients;
 
-		ProcessID focused_pid = -1;
+		OS::ProcessID focused_pid = -1;
 	};
 
 	struct EmbeddedClientState {
@@ -644,7 +591,7 @@ private:
 	Thread events_thread;
 	ThreadData thread_data;
 
-	HashMap<DisplayServerEnums::WindowID, WindowState> windows;
+	HashMap<DisplayServer::WindowID, WindowState> windows;
 
 	List<Ref<Message>> messages;
 
@@ -662,34 +609,34 @@ private:
 	int cursor_scale = 1;
 
 	// Use cursor-shape-v1 protocol if the compositor supports it.
-	wp_cursor_shape_device_v1_shape standard_cursors[DisplayServerEnums::CURSOR_MAX] = {
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT, //DisplayServerEnums::CURSOR_ARROW
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_TEXT, //DisplayServerEnums::CURSOR_IBEAM
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_POINTER, //DisplayServerEnums::CURSOR_POINTING_HAND
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_CROSSHAIR, //DisplayServerEnums::CURSOR_CROSS
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_WAIT, //DisplayServerEnums::CURSOR_WAIT
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_PROGRESS, //DisplayServerEnums::CURSOR_BUSY
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_GRAB, //DisplayServerEnums::CURSOR_DRAG
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_GRABBING, //DisplayServerEnums::CURSOR_CAN_DROP
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NO_DROP, //DisplayServerEnums::CURSOR_FORBIDDEN
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NS_RESIZE, //DisplayServerEnums::CURSOR_VSIZE
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_EW_RESIZE, //DisplayServerEnums::CURSOR_HSIZE
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NESW_RESIZE, //DisplayServerEnums::CURSOR_BDIAGSIZE
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NWSE_RESIZE, //DisplayServerEnums::CURSOR_FDIAGSIZE
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_MOVE, //DisplayServerEnums::CURSOR_MOVE
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_ROW_RESIZE, //DisplayServerEnums::CURSOR_VSPLIT
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_COL_RESIZE, //DisplayServerEnums::CURSOR_HSPLIT
-		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_HELP, //DisplayServerEnums::CURSOR_HELP
+	wp_cursor_shape_device_v1_shape standard_cursors[DisplayServer::CURSOR_MAX] = {
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT, //CURSOR_ARROW
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_TEXT, //CURSOR_IBEAM
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_POINTER, //CURSOR_POINTING_HAND
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_CROSSHAIR, //CURSOR_CROSS
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_WAIT, //CURSOR_WAIT
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_PROGRESS, //CURSOR_BUSY
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_GRAB, //CURSOR_DRAG
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_GRABBING, //CURSOR_CAN_DROP
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NO_DROP, //CURSOR_FORBIDDEN
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NS_RESIZE, //CURSOR_VSIZE
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_EW_RESIZE, //CURSOR_HSIZE
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NESW_RESIZE, //CURSOR_BDIAGSIZE
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NWSE_RESIZE, //CURSOR_FDIAGSIZE
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_MOVE, //CURSOR_MOVE
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_ROW_RESIZE, //CURSOR_VSPLIT
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_COL_RESIZE, //CURSOR_HSPLIT
+		wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_HELP, //CURSOR_HELP
 	};
 
 	// Fallback to reading $XCURSOR and system themes if the compositor does not.
 	struct wl_cursor_theme *wl_cursor_theme = nullptr;
-	struct wl_cursor *wl_cursors[DisplayServerEnums::CURSOR_MAX] = {};
+	struct wl_cursor *wl_cursors[DisplayServer::CURSOR_MAX] = {};
 
 	// User-defined cursor overrides. Take precedence over standard and wl cursors.
-	HashMap<DisplayServerEnums::CursorShape, CustomCursor> custom_cursors;
+	HashMap<DisplayServer::CursorShape, CustomCursor> custom_cursors;
 
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CURSOR_ARROW;
+	DisplayServer::CursorShape cursor_shape = DisplayServer::CURSOR_ARROW;
 	bool cursor_visible = true;
 
 	PointerConstraint pointer_constraint = PointerConstraint::NONE;
@@ -713,8 +660,6 @@ private:
 	struct libdecor *libdecor_context = nullptr;
 #endif // LIBDECOR_ENABLED
 
-	static void _clipboard_send(Vector<uint8_t> &p_data, const char *p_media_type, int32_t p_fd);
-
 	// Main polling method.
 	static void _poll_events_thread(void *p_data);
 
@@ -793,31 +738,6 @@ private:
 	static void _xdg_popup_on_repositioned(void *data, struct xdg_popup *xdg_popup, uint32_t token);
 
 	// wayland-protocols event handlers.
-	static void _wp_color_manager_on_supported_intent(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t render_intent);
-	static void _wp_color_manager_on_supported_feature(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t feature);
-	static void _wp_color_manager_on_supported_tf_named(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t tf);
-	static void _wp_color_manager_on_supported_primaries_named(void *data, struct wp_color_manager_v1 *wp_color_manager_v1, uint32_t primaries);
-	static void _wp_color_manager_on_done(void *data, struct wp_color_manager_v1 *wp_color_manager_v1);
-
-	static void _wp_color_management_surface_feedback_on_preferred_changed(void *data, struct wp_color_management_surface_feedback_v1 *wp_color_management_surface_feedback_v1, uint32_t identity);
-	static void _wp_color_management_surface_feedback_on_preferred_changed2(void *data, struct wp_color_management_surface_feedback_v1 *wp_color_management_surface_feedback_v1, uint32_t identity_high, uint32_t identity_low);
-
-	static void _wp_image_description_on_failed(void *data, struct wp_image_description_v1 *wp_image_description_v1, uint32_t cause, const char *msg);
-	static void _wp_image_description_on_ready(void *data, struct wp_image_description_v1 *wp_image_description_v1, uint32_t identity);
-	static void _wp_image_description_on_ready2(void *data, struct wp_image_description_v1 *wp_image_description_v1, uint32_t identity_high, uint32_t indentity_low);
-
-	static void _wp_image_description_info_on_done(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1);
-	static void _wp_image_description_info_on_icc_file(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t icc, uint32_t icc_size);
-	static void _wp_image_description_info_on_primaries(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t r_x, int32_t r_y, int32_t g_x, int32_t g_y, int32_t b_x, int32_t b_y, int32_t w_x, int32_t w_y);
-	static void _wp_image_description_info_on_primaries_named(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t primaries);
-	static void _wp_image_description_info_on_tf_power(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t eexp);
-	static void _wp_image_description_info_on_tf_named(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t tf);
-	static void _wp_image_description_info_on_luminances(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t min_lum, uint32_t max_lum, uint32_t reference_lum);
-	static void _wp_image_description_info_on_target_primaries(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, int32_t r_x, int32_t r_y, int32_t g_x, int32_t g_y, int32_t b_x, int32_t b_y, int32_t w_x, int32_t w_y);
-	static void _wp_image_description_info_on_target_luminance(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t min_lum, uint32_t max_lum);
-	static void _wp_image_description_info_on_target_max_cll(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t max_cll);
-	static void _wp_image_description_info_on_target_max_fall(void *data, struct wp_image_description_info_v1 *wp_image_description_info_v1, uint32_t max_fall);
-
 	static void _wp_fractional_scale_on_preferred_scale(void *data, struct wp_fractional_scale_v1 *wp_fractional_scale_v1, uint32_t scale);
 
 	static void _wp_relative_pointer_on_relative_motion(void *data, struct zwp_relative_pointer_v1 *wp_relative_pointer_v1, uint32_t uptime_hi, uint32_t uptime_lo, wl_fixed_t dx, wl_fixed_t dy, wl_fixed_t dx_unaccel, wl_fixed_t dy_unaccel);
@@ -986,39 +906,6 @@ private:
 	};
 
 	// wayland-protocols event listeners.
-	static constexpr struct wp_color_manager_v1_listener wp_color_manager_listener = {
-		.supported_intent = _wp_color_manager_on_supported_intent,
-		.supported_feature = _wp_color_manager_on_supported_feature,
-		.supported_tf_named = _wp_color_manager_on_supported_tf_named,
-		.supported_primaries_named = _wp_color_manager_on_supported_primaries_named,
-		.done = _wp_color_manager_on_done,
-	};
-
-	static constexpr struct wp_color_management_surface_feedback_v1_listener wp_color_management_surface_feedback_listener = {
-		.preferred_changed = _wp_color_management_surface_feedback_on_preferred_changed,
-		.preferred_changed2 = _wp_color_management_surface_feedback_on_preferred_changed2,
-	};
-
-	static constexpr struct wp_image_description_v1_listener wp_image_description_listener = {
-		.failed = _wp_image_description_on_failed,
-		.ready = _wp_image_description_on_ready,
-		.ready2 = _wp_image_description_on_ready2,
-	};
-
-	static constexpr struct wp_image_description_info_v1_listener wp_image_description_info_listener = {
-		.done = _wp_image_description_info_on_done,
-		.icc_file = _wp_image_description_info_on_icc_file,
-		.primaries = _wp_image_description_info_on_primaries,
-		.primaries_named = _wp_image_description_info_on_primaries_named,
-		.tf_power = _wp_image_description_info_on_tf_power,
-		.tf_named = _wp_image_description_info_on_tf_named,
-		.luminances = _wp_image_description_info_on_luminances,
-		.target_primaries = _wp_image_description_info_on_target_primaries,
-		.target_luminance = _wp_image_description_info_on_target_luminance,
-		.target_max_cll = _wp_image_description_info_on_target_max_cll,
-		.target_max_fall = _wp_image_description_info_on_target_max_fall,
-	};
-
 	static constexpr struct wp_fractional_scale_v1_listener wp_fractional_scale_listener = {
 		.preferred_scale = _wp_fractional_scale_on_preferred_scale,
 	};
@@ -1197,14 +1084,12 @@ public:
 	static OfferState *wl_data_offer_get_offer_state(struct wl_data_offer *p_offer);
 
 	static OfferState *wp_primary_selection_offer_get_offer_state(struct zwp_primary_selection_offer_v1 *p_offer);
-	static ColorManagementState *wp_color_manager_get_state(wp_color_manager_v1 *p_color_manager);
 
 	static EmbeddingCompositorState *godot_embedding_compositor_get_state(struct godot_embedding_compositor *p_compositor);
 
 	void seat_state_unlock_pointer(SeatState *p_ss);
 	void seat_state_lock_pointer(SeatState *p_ss);
 	void seat_state_set_hint(SeatState *p_ss, int p_x, int p_y);
-	void seat_state_warp_pointer(SeatState *p_ss, int p_x, int p_y);
 	void seat_state_confine_pointer(SeatState *p_ss);
 
 	static void seat_state_update_cursor(SeatState *p_ss);
@@ -1214,7 +1099,6 @@ public:
 	static int window_state_get_preferred_buffer_scale(WindowState *p_ws);
 	static double window_state_get_scale_factor(const WindowState *p_ws);
 	static void window_state_update_size(WindowState *p_ws, int p_width, int p_height);
-	static void window_state_set_buffer_scale(WindowState *p_ws, int p_buffer_scale);
 
 	static Vector2i scale_vector2i(const Vector2i &p_vector, double p_amount);
 
@@ -1224,67 +1108,62 @@ public:
 
 	void beep() const;
 
-	void set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window_id);
-	void set_default_icon(const Ref<Image> &p_icon);
+	void set_icon(const Ref<Image> &p_icon);
 
-	void window_create(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size, DisplayServerEnums::WindowID p_parent_id = DisplayServerEnums::INVALID_WINDOW_ID);
-	void window_create_popup(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent_id, Rect2i p_rect);
-	void window_destroy(DisplayServerEnums::WindowID p_window_Id);
+	void window_create(DisplayServer::WindowID p_window_id, const Size2i &p_size, DisplayServer::WindowID p_parent_id = DisplayServer::INVALID_WINDOW_ID);
+	void window_create_popup(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id, Rect2i p_rect);
+	void window_destroy(DisplayServer::WindowID p_window_Id);
 
-	void window_set_parent(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowID p_parent_id);
+	void window_set_parent(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id);
 
-	struct wl_surface *window_get_wl_surface(DisplayServerEnums::WindowID p_window_id) const;
-	WindowState *window_get_state(DisplayServerEnums::WindowID p_window_id);
-	const WindowState *window_get_state(DisplayServerEnums::WindowID p_window_id) const;
-	Size2i window_set_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size);
+	struct wl_surface *window_get_wl_surface(DisplayServer::WindowID p_window_id) const;
+	WindowState *window_get_state(DisplayServer::WindowID p_window_id);
+	const WindowState *window_get_state(DisplayServer::WindowID p_window_id) const;
+	Size2i window_set_size(DisplayServer::WindowID p_window_id, const Size2i &p_size);
 
-	void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window);
+	void window_start_resize(DisplayServer::WindowResizeEdge p_edge, DisplayServer::WindowID p_window);
 
-	void window_set_max_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size);
-	void window_set_min_size(DisplayServerEnums::WindowID p_window_id, const Size2i &p_size);
+	void window_set_max_size(DisplayServer::WindowID p_window_id, const Size2i &p_size);
+	void window_set_min_size(DisplayServer::WindowID p_window_id, const Size2i &p_size);
 
-	bool window_can_set_mode(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_window_mode) const;
-	void window_try_set_mode(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_window_mode);
-	DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window_id) const;
+	bool window_can_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode) const;
+	void window_try_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode);
+	DisplayServer::WindowMode window_get_mode(DisplayServer::WindowID p_window_id) const;
 
-	void window_set_borderless(DisplayServerEnums::WindowID p_window_id, bool p_borderless);
-	void window_set_title(DisplayServerEnums::WindowID p_window_id, const String &p_title);
-	void window_set_app_id(DisplayServerEnums::WindowID p_window_id, const String &p_app_id);
+	void window_set_borderless(DisplayServer::WindowID p_window_id, bool p_borderless);
+	void window_set_title(DisplayServer::WindowID p_window_id, const String &p_title);
+	void window_set_app_id(DisplayServer::WindowID p_window_id, const String &p_app_id);
 
-	bool window_is_focused(DisplayServerEnums::WindowID p_window_id);
+	bool window_is_focused(DisplayServer::WindowID p_window_id);
 
 	// Optional - requires xdg_activation_v1
-	void window_request_attention(DisplayServerEnums::WindowID p_window_id);
+	void window_request_attention(DisplayServer::WindowID p_window_id);
 
-	void window_start_drag(DisplayServerEnums::WindowID p_window_id);
+	void window_start_drag(DisplayServer::WindowID p_window_id);
 
 	// Optional - require idle_inhibit_unstable_v1
-	void window_set_idle_inhibition(DisplayServerEnums::WindowID p_window_id, bool p_enable);
-	bool window_get_idle_inhibition(DisplayServerEnums::WindowID p_window_id) const;
-
-	// Optional - require wp_color_management_v1
-	void window_set_color_profile(DisplayServerEnums::WindowID p_window_id, ColorProfile p_profile);
+	void window_set_idle_inhibition(DisplayServer::WindowID p_window_id, bool p_enable);
+	bool window_get_idle_inhibition(DisplayServer::WindowID p_window_id) const;
 
 	ScreenData screen_get_data(int p_screen) const;
 	int get_screen_count() const;
 
 	void pointer_set_constraint(PointerConstraint p_constraint);
 	void pointer_set_hint(const Point2i &p_hint);
-	void pointer_warp(const Point2i &p_to);
 	PointerConstraint pointer_get_constraint() const;
-	DisplayServerEnums::WindowID pointer_get_pointed_window_id() const;
-	DisplayServerEnums::WindowID pointer_get_last_pointed_window_id() const;
+	DisplayServer::WindowID pointer_get_pointed_window_id() const;
+	DisplayServer::WindowID pointer_get_last_pointed_window_id() const;
 	BitField<MouseButtonMask> pointer_get_button_mask() const;
 
 	void cursor_set_visible(bool p_visible);
-	void cursor_set_shape(DisplayServerEnums::CursorShape p_cursor_shape);
+	void cursor_set_shape(DisplayServer::CursorShape p_cursor_shape);
 
-	void cursor_set_custom_shape(DisplayServerEnums::CursorShape p_cursor_shape);
-	void cursor_shape_set_custom_image(DisplayServerEnums::CursorShape p_cursor_shape, Ref<Image> p_image, const Point2i &p_hotspot);
-	void cursor_shape_clear_custom_image(DisplayServerEnums::CursorShape p_cursor_shape);
+	void cursor_set_custom_shape(DisplayServer::CursorShape p_cursor_shape);
+	void cursor_shape_set_custom_image(DisplayServer::CursorShape p_cursor_shape, Ref<Image> p_image, const Point2i &p_hotspot);
+	void cursor_shape_clear_custom_image(DisplayServer::CursorShape p_cursor_shape);
 
-	void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window_id);
-	void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window_id);
+	void window_set_ime_active(const bool p_active, DisplayServer::WindowID p_window_id);
+	void window_set_ime_position(const Point2i &p_pos, DisplayServer::WindowID p_window_id);
 
 	int keyboard_get_layout_count() const;
 	int keyboard_get_current_layout_index() const;
@@ -1307,8 +1186,6 @@ public:
 
 	void primary_set_text(const String &p_text);
 
-	bool supports_hdr() const;
-
 	void commit_surfaces();
 
 	// Returns handled events.
@@ -1319,15 +1196,15 @@ public:
 	bool wait_frame_suspend_ms(int p_timeout);
 	bool is_fifo_available() const;
 
-	uint64_t window_get_last_frame_time(DisplayServerEnums::WindowID p_window_id) const;
-	bool window_is_suspended(DisplayServerEnums::WindowID p_window_id) const;
+	uint64_t window_get_last_frame_time(DisplayServer::WindowID p_window_id) const;
+	bool window_is_suspended(DisplayServer::WindowID p_window_id) const;
 	bool is_suspended() const;
 
-	bool window_wait_ready(DisplayServerEnums::WindowID p_window_id, int p_timeout_ms);
+	bool window_wait_ready(DisplayServer::WindowID p_window_id, int p_timeout_ms);
 
 	struct godot_embedding_compositor *get_embedding_compositor();
 
-	ProcessID embedded_compositor_get_focused_pid();
+	OS::ProcessID embedded_compositor_get_focused_pid();
 
 	Error init();
 	void destroy();
diff --git a/engine/platform/linuxbsd/x11/SCsub b/engine/platform/linuxbsd/x11/SCsub
index a4735f6b..c25bb7ff 100644
--- a/engine/platform/linuxbsd/x11/SCsub
+++ b/engine/platform/linuxbsd/x11/SCsub
@@ -11,26 +11,30 @@ source_files = [
 ]
 
 if env["use_sowrap"]:
-    source_files.append([
-        File("dynwrappers/xlib-so_wrap.c"),
-        File("dynwrappers/xcursor-so_wrap.c"),
-        File("dynwrappers/xinerama-so_wrap.c"),
-        File("dynwrappers/xinput2-so_wrap.c"),
-        File("dynwrappers/xrandr-so_wrap.c"),
-        File("dynwrappers/xrender-so_wrap.c"),
-        File("dynwrappers/xext-so_wrap.c"),
-    ])
+    source_files.append(
+        [
+            File("dynwrappers/xlib-so_wrap.c"),
+            File("dynwrappers/xcursor-so_wrap.c"),
+            File("dynwrappers/xinerama-so_wrap.c"),
+            File("dynwrappers/xinput2-so_wrap.c"),
+            File("dynwrappers/xrandr-so_wrap.c"),
+            File("dynwrappers/xrender-so_wrap.c"),
+            File("dynwrappers/xext-so_wrap.c"),
+        ]
+    )
 
 if env["vulkan"]:
     source_files.append(File("rendering_context_driver_vulkan_x11.cpp"))
 
 if env["opengl3"]:
     env.Append(CPPDEFINES=["GLAD_GLX_NO_X11"])
-    source_files.append([
-        File("gl_manager_x11_egl.cpp"),
-        File("gl_manager_x11.cpp"),
-        File("detect_prime_x11.cpp"),
-        File("#thirdparty/glad/glx.c"),
-    ])
+    source_files.append(
+        [
+            File("gl_manager_x11_egl.cpp"),
+            File("gl_manager_x11.cpp"),
+            File("detect_prime_x11.cpp"),
+            File("#thirdparty/glad/glx.c"),
+        ]
+    )
 
 Return("source_files")
diff --git a/engine/platform/linuxbsd/x11/detect_prime_x11.cpp b/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
index a60a28e8..311c120d 100644
--- a/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
+++ b/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
@@ -32,13 +32,11 @@
 
 #include "detect_prime_x11.h"
 
-#include "core/core_globals.h"
 #include "core/string/print_string.h"
 #include "core/variant/variant.h"
 
-#include <thirdparty/glad/glad/glx.h>
-
-#include <platform_gl.h>
+#include "thirdparty/glad/glad/gl.h"
+#include "thirdparty/glad/glad/glx.h"
 
 #ifdef SOWRAP_ENABLED
 #include "x11/dynwrappers/xlib-so_wrap.h"
@@ -51,7 +49,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
 #include <cstdlib>
 
 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
diff --git a/engine/platform/linuxbsd/x11/display_server_x11.cpp b/engine/platform/linuxbsd/x11/display_server_x11.cpp
index 3948cb9c..9c8e0536 100644
--- a/engine/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/engine/platform/linuxbsd/x11/display_server_x11.cpp
@@ -32,60 +32,34 @@
 
 #ifdef X11_ENABLED
 
+#include "x11/detect_prime_x11.h"
 #include "x11/key_mapping_x11.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/file_access.h"
 #include "core/math/math_funcs.h"
-#include "core/object/callable_mp.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
+#include "core/version.h"
 #include "drivers/png/png_driver_common.h"
-#include "drivers/unix/os_unix.h"
 #include "main/main.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/native_menu.h"
+
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
-#include <X11/Xatom.h>
-
-#ifdef SOWRAP_ENABLED
-#include "x11/dynwrappers/xext-so_wrap.h"
-#include "x11/dynwrappers/xinerama-so_wrap.h"
-#include "x11/dynwrappers/xrender-so_wrap.h"
-#else // !SOWRAP_ENABLED
-#include <X11/XKBlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/Xinerama.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/shape.h>
-#endif
-
-#ifdef RD_ENABLED
-#ifdef VULKAN_ENABLED
-#include "x11/rendering_context_driver_vulkan_x11.h"
-#endif
-
+#if defined(VULKAN_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
 
-#ifdef GLES3_ENABLED
-#include "x11/detect_prime_x11.h"
-#include "x11/gl_manager_x11.h"
-#include "x11/gl_manager_x11_egl.h"
-
+#if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
-#ifdef DBUS_ENABLED
-#include "freedesktop_at_spi_monitor.h"
-#include "freedesktop_portal_desktop.h"
-#include "freedesktop_screensaver.h"
+#ifdef ACCESSKIT_ENABLED
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
 
+#ifdef DBUS_ENABLED
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"
 #else
@@ -93,17 +67,16 @@
 #endif
 #endif
 
-#ifdef SPEECHD_ENABLED
-#include "tts_linux.h"
-#endif
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
 
-#include <dlfcn.h> // dlopen
-//#include <sys/stat.h>
-//#include <sys/types.h>
-//#include <unistd.h>
-#include <climits> // LONG_MAX
-#include <cstdio> // stderr
-#include <cstdlib> // getenv
+#undef CursorShape
+#include <X11/XKBlib.h>
 
 // ICCCM
 #define WM_NormalState 1L // window normal state
@@ -178,62 +151,64 @@ static String get_atom_name(Display *p_disp, Atom p_atom) {
 	return ret;
 }
 
-bool DisplayServerX11::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerX11::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_SUBWINDOWS:
+		case FEATURE_SUBWINDOWS:
 #ifdef TOUCH_ENABLED
-		case DisplayServerEnums::FEATURE_TOUCHSCREEN:
+		case FEATURE_TOUCHSCREEN:
 #endif
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		//case DisplayServerEnums::FEATURE_HIDPI:
-		case DisplayServerEnums::FEATURE_ICON:
-		//case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		case DisplayServerEnums::FEATURE_SWAP_BUFFERS:
+		case FEATURE_MOUSE:
+		case FEATURE_MOUSE_WARP:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+		case FEATURE_IME:
+		case FEATURE_WINDOW_TRANSPARENCY:
+		//case FEATURE_HIDPI:
+		case FEATURE_ICON:
+		//case FEATURE_NATIVE_ICON:
+		case FEATURE_SWAP_BUFFERS:
 #ifdef DBUS_ENABLED
-		case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_KEEP_SCREEN_ON:
 #endif
-		case DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY:
-		case DisplayServerEnums::FEATURE_WINDOW_EMBEDDING:
-		case DisplayServerEnums::FEATURE_WINDOW_DRAG: {
+		case FEATURE_CLIPBOARD_PRIMARY:
+		case FEATURE_WINDOW_EMBEDDING:
+		case FEATURE_WINDOW_DRAG: {
 			return true;
 		} break;
 
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
+		//case FEATURE_NATIVE_DIALOG:
+		//case FEATURE_NATIVE_DIALOG_INPUT:
 #ifdef DBUS_ENABLED
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME: {
+		case FEATURE_NATIVE_DIALOG_FILE:
+		case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		case FEATURE_NATIVE_DIALOG_FILE_MIME: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_file_chooser_supported());
 		} break;
-		case DisplayServerEnums::FEATURE_NATIVE_COLOR_PICKER: {
+		case FEATURE_NATIVE_COLOR_PICKER: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_screenshot_supported());
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_SCREEN_CAPTURE: {
+		case FEATURE_SCREEN_CAPTURE: {
 			return !xwayland;
 		} break;
 
 #ifdef SPEECHD_ENABLED
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH: {
+		case FEATURE_TEXT_TO_SPEECH: {
 			return true;
 		} break;
 #endif
 
-		case DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER: {
-			return AccessibilityServer::get_singleton()->is_supported();
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
 		} break;
+#endif
 
 		default: {
 			return false;
@@ -503,24 +478,24 @@ void DisplayServerX11::set_system_theme_change_callback(const Callable &p_callab
 	portal_desktop->set_system_theme_change_callback(p_callable);
 }
 
-Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	ERR_FAIL_COND_V(!portal_desktop, ERR_UNAVAILABLE);
-	DisplayServerEnums::WindowID window_id = p_window_id;
+	WindowID window_id = p_window_id;
 
 	if (!windows.has(window_id) || windows[window_id].is_popup) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
 	return portal_desktop->file_dialog_show(p_window_id, xid, p_title, p_current_directory, String(), p_filename, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
 }
 
-Error DisplayServerX11::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerX11::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	ERR_FAIL_COND_V(!portal_desktop, ERR_UNAVAILABLE);
-	DisplayServerEnums::WindowID window_id = p_window_id;
+	WindowID window_id = p_window_id;
 
 	if (!windows.has(window_id) || windows[window_id].is_popup) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
@@ -536,7 +511,7 @@ void DisplayServerX11::beep() const {
 void DisplayServerX11::_mouse_update_mode() {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
 			? mouse_mode_override
 			: mouse_mode_base;
 
@@ -544,26 +519,26 @@ void DisplayServerX11::_mouse_update_mode() {
 		return;
 	}
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+	if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 		XUngrabPointer(x11_display, CurrentTime);
 	}
 
 	// The only modes that show a cursor are VISIBLE and CONFINED
-	bool show_cursor = (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED);
-	bool previously_shown = (mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED);
+	bool show_cursor = (wanted_mouse_mode == MOUSE_MODE_VISIBLE || wanted_mouse_mode == MOUSE_MODE_CONFINED);
+	bool previously_shown = (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED);
 
 	if (show_cursor && !previously_shown) {
-		DisplayServerEnums::WindowID window_id = get_window_at_screen_position(mouse_get_position());
-		if (window_id != DisplayServerEnums::INVALID_WINDOW_ID && window_mouseover_id != window_id) {
-			if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-				_send_window_event(windows[window_mouseover_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+		WindowID window_id = get_window_at_screen_position(mouse_get_position());
+		if (window_id != INVALID_WINDOW_ID && window_mouseover_id != window_id) {
+			if (window_mouseover_id != INVALID_WINDOW_ID) {
+				_send_window_event(windows[window_mouseover_id], WINDOW_EVENT_MOUSE_EXIT);
 			}
 			window_mouseover_id = window_id;
-			_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+			_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_ENTER);
 		}
 	}
 
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (show_cursor) {
 			XDefineCursor(x11_display, E.value.x11_window, cursors[current_cursor]); // show cursor
 		} else {
@@ -572,12 +547,12 @@ void DisplayServerX11::_mouse_update_mode() {
 	}
 	mouse_mode = wanted_mouse_mode;
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+	if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 		//flush pending motion events
 		_flush_mouse_motion();
-		DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+		WindowID window_id = _get_focused_window_or_popup();
 		if (!windows.has(window_id)) {
-			window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			window_id = MAIN_WINDOW_ID;
 		}
 		WindowData &window = windows[window_id];
 
@@ -588,7 +563,7 @@ void DisplayServerX11::_mouse_update_mode() {
 			ERR_PRINT("NO GRAB");
 		}
 
-		if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+		if (mouse_mode == MOUSE_MODE_CAPTURED) {
 			center.x = window.size.width / 2;
 			center.y = window.size.height / 2;
 
@@ -604,8 +579,8 @@ void DisplayServerX11::_mouse_update_mode() {
 	XFlush(x11_display);
 }
 
-void DisplayServerX11::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerX11::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_base) {
 		return;
 	}
@@ -613,12 +588,12 @@ void DisplayServerX11::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerX11::mouse_get_mode() const {
+DisplayServerX11::MouseMode DisplayServerX11::mouse_get_mode() const {
 	return mouse_mode;
 }
 
-void DisplayServerX11::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerX11::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_override) {
 		return;
 	}
@@ -626,7 +601,7 @@ void DisplayServerX11::mouse_set_mode_override(DisplayServerEnums::MouseMode p_m
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerX11::mouse_get_mode_override() const {
+DisplayServerX11::MouseMode DisplayServerX11::mouse_get_mode_override() const {
 	return mouse_mode_override;
 }
 
@@ -645,12 +620,12 @@ bool DisplayServerX11::mouse_is_mode_override_enabled() const {
 void DisplayServerX11::warp_mouse(const Point2i &p_position) {
 	_THREAD_SAFE_METHOD_
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (mouse_mode == MOUSE_MODE_CAPTURED) {
 		last_mouse_pos = p_position;
 	} else {
-		DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+		WindowID window_id = _get_focused_window_or_popup();
 		if (!windows.has(window_id)) {
-			window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			window_id = MAIN_WINDOW_ID;
 		}
 
 		XWarpPointer(x11_display, None, windows[window_id].x11_window,
@@ -714,8 +689,8 @@ void DisplayServerX11::clipboard_set(const String &p_text) {
 		internal_clipboard = p_text;
 	}
 
-	XSetSelectionOwner(x11_display, XA_PRIMARY, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, CurrentTime);
-	XSetSelectionOwner(x11_display, XInternAtom(x11_display, "CLIPBOARD", 0), windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, CurrentTime);
+	XSetSelectionOwner(x11_display, XA_PRIMARY, windows[MAIN_WINDOW_ID].x11_window, CurrentTime);
+	XSetSelectionOwner(x11_display, XInternAtom(x11_display, "CLIPBOARD", 0), windows[MAIN_WINDOW_ID].x11_window, CurrentTime);
 }
 
 void DisplayServerX11::clipboard_set_primary(const String &p_text) {
@@ -727,8 +702,8 @@ void DisplayServerX11::clipboard_set_primary(const String &p_text) {
 			internal_clipboard_primary = p_text;
 		}
 
-		XSetSelectionOwner(x11_display, XA_PRIMARY, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, CurrentTime);
-		XSetSelectionOwner(x11_display, XInternAtom(x11_display, "PRIMARY", 0), windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, CurrentTime);
+		XSetSelectionOwner(x11_display, XA_PRIMARY, windows[MAIN_WINDOW_ID].x11_window, CurrentTime);
+		XSetSelectionOwner(x11_display, XInternAtom(x11_display, "PRIMARY", 0), windows[MAIN_WINDOW_ID].x11_window, CurrentTime);
 	}
 }
 
@@ -970,10 +945,10 @@ String DisplayServerX11::clipboard_get() const {
 	_THREAD_SAFE_METHOD_
 
 	String ret;
-	ret = _clipboard_get(XInternAtom(x11_display, "CLIPBOARD", 0), windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+	ret = _clipboard_get(XInternAtom(x11_display, "CLIPBOARD", 0), windows[MAIN_WINDOW_ID].x11_window);
 
 	if (ret.is_empty()) {
-		ret = _clipboard_get(XA_PRIMARY, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+		ret = _clipboard_get(XA_PRIMARY, windows[MAIN_WINDOW_ID].x11_window);
 	}
 
 	return ret;
@@ -983,10 +958,10 @@ String DisplayServerX11::clipboard_get_primary() const {
 	_THREAD_SAFE_METHOD_
 
 	String ret;
-	ret = _clipboard_get(XInternAtom(x11_display, "PRIMARY", 0), windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+	ret = _clipboard_get(XInternAtom(x11_display, "PRIMARY", 0), windows[MAIN_WINDOW_ID].x11_window);
 
 	if (ret.is_empty()) {
-		ret = _clipboard_get(XA_PRIMARY, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+		ret = _clipboard_get(XA_PRIMARY, windows[MAIN_WINDOW_ID].x11_window);
 	}
 
 	return ret;
@@ -995,7 +970,7 @@ String DisplayServerX11::clipboard_get_primary() const {
 Ref<Image> DisplayServerX11::clipboard_get_image() const {
 	_THREAD_SAFE_METHOD_
 	Atom clipboard = XInternAtom(x11_display, "CLIPBOARD", 0);
-	Window x11_window = windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window;
+	Window x11_window = windows[MAIN_WINDOW_ID].x11_window;
 	Ref<Image> ret;
 	Atom target = _clipboard_get_image_target(clipboard, x11_window);
 	if (target == None) {
@@ -1140,7 +1115,7 @@ Ref<Image> DisplayServerX11::clipboard_get_image() const {
 bool DisplayServerX11::clipboard_has_image() const {
 	Atom target = _clipboard_get_image_target(
 			XInternAtom(x11_display, "CLIPBOARD", 0),
-			windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+			windows[MAIN_WINDOW_ID].x11_window);
 	return target != None;
 }
 
@@ -1667,7 +1642,7 @@ int DisplayServerX11::screen_get_dpi(int p_screen) const {
 	if (xrandr_ext_ok) {
 		int count = 0;
 		if (xrr_get_monitors) {
-			xrr_monitor_info *monitors = xrr_get_monitors(x11_display, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, true, &count);
+			xrr_monitor_info *monitors = xrr_get_monitors(x11_display, windows[MAIN_WINDOW_ID].x11_window, true, &count);
 			if (p_screen < count) {
 				double xdpi = sc.width / (double)monitors[p_screen].mwidth * 25.4;
 				double ydpi = sc.height / (double)monitors[p_screen].mheight * 25.4;
@@ -1854,7 +1829,7 @@ float DisplayServerX11::screen_get_refresh_rate(int p_screen) const {
 	int target_y;
 	{
 		int count = 0;
-		xrr_monitor_info *monitors = xrr_get_monitors(x11_display, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window, true, &count);
+		xrr_monitor_info *monitors = xrr_get_monitors(x11_display, windows[MAIN_WINDOW_ID].x11_window, true, &count);
 		ERR_FAIL_NULL_V(monitors, SCREEN_REFRESH_RATE_FALLBACK);
 		if (count <= p_screen) {
 			xrr_free_monitors(monitors);
@@ -1865,7 +1840,7 @@ float DisplayServerX11::screen_get_refresh_rate(int p_screen) const {
 		xrr_free_monitors(monitors);
 	}
 
-	XRRScreenResources *screen_res = XRRGetScreenResourcesCurrent(x11_display, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window);
+	XRRScreenResources *screen_res = XRRGetScreenResourcesCurrent(x11_display, windows[MAIN_WINDOW_ID].x11_window);
 	ERR_FAIL_NULL_V(screen_res, SCREEN_REFRESH_RATE_FALLBACK);
 
 	XRRModeInfo *mode_info = nullptr;
@@ -1907,7 +1882,7 @@ void DisplayServerX11::screen_set_keep_on(bool p_enable) {
 		if (p_enable) {
 			// Attach the inhibit request to the main window, not the last focused window,
 			// on the basis that inhibiting the screensaver is global state for the application.
-			DisplayServerEnums::WindowID window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			WindowID window_id = MAIN_WINDOW_ID;
 			String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
 			keep_screen_on = portal_desktop->inhibit(xid);
 		} else {
@@ -1930,23 +1905,23 @@ bool DisplayServerX11::screen_is_kept_on() const {
 }
 #endif
 
-Vector<DisplayServerEnums::WindowID> DisplayServerX11::get_window_list() const {
+Vector<DisplayServer::WindowID> DisplayServerX11::get_window_list() const {
 	_THREAD_SAFE_METHOD_
 
 	Vector<int> ret;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		ret.push_back(E.key);
 	}
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent) {
+DisplayServer::WindowID DisplayServerX11::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID id = _create_window(p_mode, p_vsync_mode, p_flags, p_rect, 0);
-	for (int i = 0; i < DisplayServerEnums::WINDOW_FLAG_MAX; i++) {
+	WindowID id = _create_window(p_mode, p_vsync_mode, p_flags, p_rect, 0);
+	for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
 		if (p_flags & (1 << i)) {
-			window_set_flag(DisplayServerEnums::WindowFlags(i), true, id);
+			window_set_flag(WindowFlags(i), true, id);
 		}
 	}
 #ifdef RD_ENABLED
@@ -1955,14 +1930,14 @@ DisplayServerEnums::WindowID DisplayServerX11::create_sub_window(DisplayServerEn
 	}
 #endif
 
-	if (p_transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_transient_parent != INVALID_WINDOW_ID) {
 		window_set_transient(id, p_transient_parent);
 	}
 
 	return id;
 }
 
-void DisplayServerX11::show_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServerX11::show_window(WindowID p_id) {
 	_THREAD_SAFE_METHOD_
 
 	WindowData &wd = windows[p_id];
@@ -1989,7 +1964,7 @@ void DisplayServerX11::show_window(DisplayServerEnums::WindowID p_id) {
 
 	_validate_fullscreen_on_map(p_id);
 
-	if (p_id == DisplayServerEnums::MAIN_WINDOW_ID) {
+	if (p_id == MAIN_WINDOW_ID) {
 		// Get main window size for boot splash drawing.
 		bool get_config_event = false;
 
@@ -2060,11 +2035,11 @@ void DisplayServerX11::show_window(DisplayServerEnums::WindowID p_id) {
 	}
 }
 
-void DisplayServerX11::delete_sub_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServerX11::delete_sub_window(WindowID p_id) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_id));
-	ERR_FAIL_COND_MSG(p_id == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be deleted");
+	ERR_FAIL_COND_MSG(p_id == MAIN_WINDOW_ID, "Main window can't be deleted");
 
 	popup_close(p_id);
 
@@ -2073,16 +2048,16 @@ void DisplayServerX11::delete_sub_window(DisplayServerEnums::WindowID p_id) {
 	DEBUG_LOG_X11("delete_sub_window: %lu (%u) \n", wd.x11_window, p_id);
 
 	if (window_mouseover_id == p_id) {
-		window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
-		_send_window_event(windows[p_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+		window_mouseover_id = INVALID_WINDOW_ID;
+		_send_window_event(windows[p_id], WINDOW_EVENT_MOUSE_EXIT);
 	}
 
 	while (wd.transient_children.size()) {
-		window_set_transient(*wd.transient_children.begin(), DisplayServerEnums::INVALID_WINDOW_ID);
+		window_set_transient(*wd.transient_children.begin(), INVALID_WINDOW_ID);
 	}
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
-		window_set_transient(p_id, DisplayServerEnums::INVALID_WINDOW_ID);
+	if (wd.transient_parent != INVALID_WINDOW_ID) {
+		window_set_transient(p_id, INVALID_WINDOW_ID);
 	}
 
 #if defined(RD_ENABLED)
@@ -2103,7 +2078,11 @@ void DisplayServerX11::delete_sub_window(DisplayServerEnums::WindowID p_id) {
 	}
 #endif
 
-	AccessibilityServer::get_singleton()->window_destroy(p_id);
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_id);
+	}
+#endif
 
 	if (wd.xic) {
 		XDestroyIC(wd.xic);
@@ -2131,24 +2110,24 @@ void DisplayServerX11::delete_sub_window(DisplayServerEnums::WindowID p_id) {
 	windows.erase(p_id);
 
 	if (last_focused_window == p_id) {
-		last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
+		last_focused_window = INVALID_WINDOW_ID;
 	}
 }
 
-int64_t DisplayServerX11::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
+int64_t DisplayServerX11::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), 0);
 	switch (p_handle_type) {
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			return (int64_t)x11_display;
 		}
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return (int64_t)windows[p_window].x11_window;
 		}
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			return 0; // Not supported.
 		}
 #ifdef GLES3_ENABLED
-		case DisplayServerEnums::OPENGL_CONTEXT: {
+		case OPENGL_CONTEXT: {
 			if (gl_manager) {
 				return (int64_t)gl_manager->get_glx_context(p_window);
 			}
@@ -2157,30 +2136,18 @@ int64_t DisplayServerX11::window_get_native_handle(DisplayServerEnums::HandleTyp
 			}
 			return 0;
 		}
-		case DisplayServerEnums::EGL_DISPLAY: {
+		case EGL_DISPLAY: {
 			if (gl_manager_egl) {
 				return (int64_t)gl_manager_egl->get_display(p_window);
 			}
 			return 0;
 		}
-		case DisplayServerEnums::EGL_CONFIG: {
+		case EGL_CONFIG: {
 			if (gl_manager_egl) {
 				return (int64_t)gl_manager_egl->get_config(p_window);
 			}
 			return 0;
 		}
-		case DisplayServerEnums::GLX_VISUALID: {
-			if (gl_manager) {
-				return (int64_t)gl_manager->get_glx_visualid(p_window);
-			}
-			return 0;
-		}
-		case DisplayServerEnums::GLX_FBCONFIG: {
-			if (gl_manager) {
-				return (int64_t)gl_manager->get_glx_fbconfig(p_window);
-			}
-			return 0;
-		}
 #endif
 		default: {
 			return 0;
@@ -2188,24 +2155,24 @@ int64_t DisplayServerX11::window_get_native_handle(DisplayServerEnums::HandleTyp
 	}
 }
 
-void DisplayServerX11::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
 	wd.instance_id = p_instance;
 }
 
-ObjectID DisplayServerX11::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerX11::window_get_attached_instance_id(WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), ObjectID());
 	const WindowData &wd = windows[p_window];
 	return wd.instance_id;
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::get_window_at_screen_position(const Point2i &p_position) const {
-	DisplayServerEnums::WindowID found_window = DisplayServerEnums::INVALID_WINDOW_ID;
-	DisplayServerEnums::WindowID parent_window = DisplayServerEnums::INVALID_WINDOW_ID;
+DisplayServerX11::WindowID DisplayServerX11::get_window_at_screen_position(const Point2i &p_position) const {
+	WindowID found_window = INVALID_WINDOW_ID;
+	WindowID parent_window = INVALID_WINDOW_ID;
 	unsigned int focus_order = 0;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		const WindowData &wd = E.value;
 
 		// Discard windows with no focus.
@@ -2214,7 +2181,7 @@ DisplayServerEnums::WindowID DisplayServerX11::get_window_at_screen_position(con
 		}
 
 		// Find topmost window which contains the given position.
-		DisplayServerEnums::WindowID window_id = E.key;
+		WindowID window_id = E.key;
 		Rect2i win_rect = Rect2i(window_get_position(window_id), window_get_size(window_id));
 		if (win_rect.has_point(p_position)) {
 			// For siblings, pick the window which was focused last.
@@ -2229,7 +2196,7 @@ DisplayServerEnums::WindowID DisplayServerX11::get_window_at_screen_position(con
 	return found_window;
 }
 
-void DisplayServerX11::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_title(const String &p_title, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2245,7 +2212,7 @@ void DisplayServerX11::window_set_title(const String &p_title, DisplayServerEnum
 	}
 }
 
-void DisplayServerX11::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2253,7 +2220,7 @@ void DisplayServerX11::window_set_mouse_passthrough(const Vector<Vector2> &p_reg
 	_update_window_mouse_passthrough(p_window);
 }
 
-void DisplayServerX11::_update_window_mouse_passthrough(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::_update_window_mouse_passthrough(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	ERR_FAIL_COND(!xshaped_ext_ok);
 
@@ -2282,7 +2249,7 @@ void DisplayServerX11::_update_window_mouse_passthrough(DisplayServerEnums::Wind
 	}
 }
 
-void DisplayServerX11::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2290,7 +2257,7 @@ void DisplayServerX11::window_set_rect_changed_callback(const Callable &p_callab
 	wd.rect_changed_callback = p_callable;
 }
 
-void DisplayServerX11::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2298,7 +2265,7 @@ void DisplayServerX11::window_set_window_event_callback(const Callable &p_callab
 	wd.event_callback = p_callable;
 }
 
-void DisplayServerX11::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2306,7 +2273,7 @@ void DisplayServerX11::window_set_input_event_callback(const Callable &p_callabl
 	wd.input_event_callback = p_callable;
 }
 
-void DisplayServerX11::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2314,7 +2281,7 @@ void DisplayServerX11::window_set_input_text_callback(const Callable &p_callable
 	wd.input_text_callback = p_callable;
 }
 
-void DisplayServerX11::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2322,7 +2289,7 @@ void DisplayServerX11::window_set_drop_files_callback(const Callable &p_callable
 	wd.drop_files_callback = p_callable;
 }
 
-int DisplayServerX11::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
+int DisplayServerX11::window_get_current_screen(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	int count = get_screen_count();
@@ -2331,7 +2298,7 @@ int DisplayServerX11::window_get_current_screen(DisplayServerEnums::WindowID p_w
 		return 0;
 	}
 
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::INVALID_SCREEN);
+	ERR_FAIL_COND_V(!windows.has(p_window), INVALID_SCREEN);
 	const WindowData &wd = windows[p_window];
 
 	const Rect2i window_rect(wd.position, wd.size);
@@ -2352,7 +2319,7 @@ int DisplayServerX11::window_get_current_screen(DisplayServerEnums::WindowID p_w
 	return screen_index;
 }
 
-void DisplayServerX11::gl_window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerX11::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
 		gl_manager->window_make_current(p_window_id);
@@ -2363,7 +2330,7 @@ void DisplayServerX11::gl_window_make_current(DisplayServerEnums::WindowID p_win
 #endif
 }
 
-void DisplayServerX11::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_current_screen(int p_screen, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2382,9 +2349,9 @@ void DisplayServerX11::window_set_current_screen(int p_screen, DisplayServerEnum
 		return;
 	}
 
-	if (window_get_mode(p_window) == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || window_get_mode(p_window) == DisplayServerEnums::WINDOW_MODE_MAXIMIZED) {
-		DisplayServerEnums::WindowMode current_mode = window_get_mode(p_window);
-		window_set_mode(DisplayServerEnums::WINDOW_MODE_WINDOWED, p_window);
+	if (window_get_mode(p_window) == WINDOW_MODE_FULLSCREEN || window_get_mode(p_window) == WINDOW_MODE_MAXIMIZED) {
+		WindowMode current_mode = window_get_mode(p_window);
+		window_set_mode(WINDOW_MODE_WINDOWED, p_window);
 		Point2i position = screen_get_position(p_screen);
 		Size2i size = screen_get_size(p_screen);
 		XMoveResizeWindow(x11_display, wd.x11_window, position.x, position.y, size.x, size.y);
@@ -2401,7 +2368,7 @@ void DisplayServerX11::window_set_current_screen(int p_screen, DisplayServerEnum
 	}
 }
 
-void DisplayServerX11::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerX11::window_set_transient(WindowID p_window, WindowID p_parent) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(p_window == p_parent);
@@ -2409,21 +2376,21 @@ void DisplayServerX11::window_set_transient(DisplayServerEnums::WindowID p_windo
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd_window = windows[p_window];
 
-	DisplayServerEnums::WindowID prev_parent = wd_window.transient_parent;
+	WindowID prev_parent = wd_window.transient_parent;
 	ERR_FAIL_COND(prev_parent == p_parent);
 
 	DEBUG_LOG_X11("window_set_transient: %lu (%u), prev_parent=%u, parent=%u\n", wd_window.x11_window, p_window, prev_parent, p_parent);
 
 	ERR_FAIL_COND_MSG(wd_window.on_top, "Windows with the 'on top' can't become transient.");
-	if (p_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_parent == INVALID_WINDOW_ID) {
 		//remove transient
 
-		ERR_FAIL_COND(prev_parent == DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_COND(prev_parent == INVALID_WINDOW_ID);
 		ERR_FAIL_COND(!windows.has(prev_parent));
 
 		WindowData &wd_parent = windows[prev_parent];
 
-		wd_window.transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
+		wd_window.transient_parent = INVALID_WINDOW_ID;
 		wd_parent.transient_children.erase(p_window);
 
 		XSetTransientForHint(x11_display, wd_window.x11_window, None);
@@ -2442,7 +2409,7 @@ void DisplayServerX11::window_set_transient(DisplayServerEnums::WindowID p_windo
 		}
 	} else {
 		ERR_FAIL_COND(!windows.has(p_parent));
-		ERR_FAIL_COND_MSG(prev_parent != DisplayServerEnums::INVALID_WINDOW_ID, "Window already has a transient parent");
+		ERR_FAIL_COND_MSG(prev_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
 		WindowData &wd_parent = windows[p_parent];
 
 		wd_window.transient_parent = p_parent;
@@ -2453,9 +2420,9 @@ void DisplayServerX11::window_set_transient(DisplayServerEnums::WindowID p_windo
 }
 
 // Helper method. Assumes that the window id has already been checked and exists.
-void DisplayServerX11::_update_size_hints(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::_update_size_hints(WindowID p_window) {
 	WindowData &wd = windows[p_window];
-	DisplayServerEnums::WindowMode window_mode = window_get_mode(p_window);
+	WindowMode window_mode = window_get_mode(p_window);
 	XSizeHints *xsh = XAllocSizeHints();
 
 	// Always set the position and size hints - they should be synchronized with the actual values after the window is mapped anyway
@@ -2466,9 +2433,9 @@ void DisplayServerX11::_update_size_hints(DisplayServerEnums::WindowID p_window)
 	xsh->height = wd.size.height;
 	xsh->win_gravity = StaticGravity;
 
-	if (window_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || window_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (window_mode == WINDOW_MODE_FULLSCREEN || window_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		// Do not set any other hints to prevent the window manager from ignoring the fullscreen flags
-	} else if (window_get_flag(DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED, p_window)) {
+	} else if (window_get_flag(WINDOW_FLAG_RESIZE_DISABLED, p_window)) {
 		// If resizing is disabled, use the forced size
 		xsh->flags |= PMinSize | PMaxSize;
 		xsh->min_width = wd.size.x;
@@ -2493,7 +2460,7 @@ void DisplayServerX11::_update_size_hints(DisplayServerEnums::WindowID p_window)
 	XFree(xsh);
 }
 
-void DisplayServerX11::_update_motif_wm_hints(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::_update_motif_wm_hints(WindowID p_window) {
 	Atom motif_wm_hints = XInternAtom(x11_display, "_MOTIF_WM_HINTS", True);
 	if (motif_wm_hints == None) {
 		return;
@@ -2527,7 +2494,7 @@ void DisplayServerX11::_update_motif_wm_hints(DisplayServerEnums::WindowID p_win
 	XChangeProperty(x11_display, wd.x11_window, motif_wm_hints, motif_wm_hints, 32, PropModeReplace, (unsigned char *)&hints, 5);
 }
 
-void DisplayServerX11::_update_wm_state_hints(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::_update_wm_state_hints(WindowID p_window) {
 	WindowData &wd = windows[p_window];
 
 	Atom type;
@@ -2573,7 +2540,7 @@ void DisplayServerX11::_update_wm_state_hints(DisplayServerEnums::WindowID p_win
 	wd.minimized = hints.has(hidden_atom);
 }
 
-Point2i DisplayServerX11::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerX11::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
@@ -2582,7 +2549,7 @@ Point2i DisplayServerX11::window_get_position(DisplayServerEnums::WindowID p_win
 	return wd.position;
 }
 
-Point2i DisplayServerX11::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerX11::window_get_position_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2616,7 +2583,7 @@ Point2i DisplayServerX11::window_get_position_with_decorations(DisplayServerEnum
 	return Size2i(x, y);
 }
 
-void DisplayServerX11::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_position(const Point2i &p_position, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2632,7 +2599,7 @@ void DisplayServerX11::window_set_position(const Point2i &p_position, DisplaySer
 	_update_real_mouse_position(wd);
 }
 
-void DisplayServerX11::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2653,7 +2620,7 @@ void DisplayServerX11::window_set_max_size(const Size2i p_size, DisplayServerEnu
 	XFlush(x11_display);
 }
 
-Size2i DisplayServerX11::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerX11::window_get_max_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2662,7 +2629,7 @@ Size2i DisplayServerX11::window_get_max_size(DisplayServerEnums::WindowID p_wind
 	return wd.max_size;
 }
 
-void DisplayServerX11::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2683,7 +2650,7 @@ void DisplayServerX11::window_set_min_size(const Size2i p_size, DisplayServerEnu
 	XFlush(x11_display);
 }
 
-Size2i DisplayServerX11::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerX11::window_get_min_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2692,7 +2659,7 @@ Size2i DisplayServerX11::window_get_min_size(DisplayServerEnums::WindowID p_wind
 	return wd.min_size;
 }
 
-void DisplayServerX11::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2753,7 +2720,7 @@ void DisplayServerX11::window_set_size(const Size2i p_size, DisplayServerEnums::
 #endif
 }
 
-Size2i DisplayServerX11::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerX11::window_get_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2761,7 +2728,7 @@ Size2i DisplayServerX11::window_get_size(DisplayServerEnums::WindowID p_window)
 	return wd.size;
 }
 
-Size2i DisplayServerX11::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerX11::window_get_size_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2797,7 +2764,7 @@ Size2i DisplayServerX11::window_get_size_with_decorations(DisplayServerEnums::Wi
 
 // Just a helper to reduce code duplication in `window_is_maximize_allowed`
 // and `_set_wm_maximized`.
-bool DisplayServerX11::_window_maximize_check(DisplayServerEnums::WindowID p_window, const char *p_atom_name) const {
+bool DisplayServerX11::_window_maximize_check(WindowID p_window, const char *p_atom_name) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 
@@ -2869,7 +2836,7 @@ bool DisplayServerX11::_window_maximize_check(DisplayServerEnums::WindowID p_win
 	return retval;
 }
 
-bool DisplayServerX11::_window_minimize_check(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::_window_minimize_check(WindowID p_window) const {
 	const WindowData &wd = windows[p_window];
 
 	// Using EWMH instead of ICCCM, might work better for Wayland users.
@@ -2912,7 +2879,7 @@ bool DisplayServerX11::_window_minimize_check(DisplayServerEnums::WindowID p_win
 	return false;
 }
 
-bool DisplayServerX11::_window_fullscreen_check(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::_window_fullscreen_check(WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 
@@ -2958,7 +2925,7 @@ bool DisplayServerX11::_window_fullscreen_check(DisplayServerEnums::WindowID p_w
 	return retval;
 }
 
-void DisplayServerX11::_validate_fullscreen_on_map(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::_validate_fullscreen_on_map(WindowID p_window) {
 	// Check if we applied any window modes that didn't take effect while unmapped
 	const WindowData &wd = windows[p_window];
 	if (wd.fullscreen && !_window_fullscreen_check(p_window)) {
@@ -2982,12 +2949,12 @@ void DisplayServerX11::_validate_fullscreen_on_map(DisplayServerEnums::WindowID
 	}
 }
 
-bool DisplayServerX11::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::window_is_maximize_allowed(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 	return _window_maximize_check(p_window, "_NET_WM_ALLOWED_ACTIONS");
 }
 
-void DisplayServerX11::_set_wm_maximized(DisplayServerEnums::WindowID p_window, bool p_enabled) {
+void DisplayServerX11::_set_wm_maximized(WindowID p_window, bool p_enabled) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
@@ -3012,14 +2979,14 @@ void DisplayServerX11::_set_wm_maximized(DisplayServerEnums::WindowID p_window,
 		// Wait for effective resizing (so the GLX context is too).
 		// Give up after 0.5s, it's not going to happen on this WM.
 		// https://github.com/godotengine/godot/issues/19978
-		for (int attempt = 0; window_get_mode(p_window) != DisplayServerEnums::WINDOW_MODE_MAXIMIZED && attempt < 50; attempt++) {
+		for (int attempt = 0; window_get_mode(p_window) != WINDOW_MODE_MAXIMIZED && attempt < 50; attempt++) {
 			OS::get_singleton()->delay_usec(10'000);
 		}
 	}
 	wd.maximized = p_enabled;
 }
 
-void DisplayServerX11::_set_wm_minimized(DisplayServerEnums::WindowID p_window, bool p_enabled) {
+void DisplayServerX11::_set_wm_minimized(WindowID p_window, bool p_enabled) {
 	WindowData &wd = windows[p_window];
 	// Using ICCCM -- Inter-Client Communication Conventions Manual
 	XEvent xev;
@@ -3049,7 +3016,7 @@ void DisplayServerX11::_set_wm_minimized(DisplayServerEnums::WindowID p_window,
 	wd.minimized = p_enabled;
 }
 
-void DisplayServerX11::_set_wm_fullscreen(DisplayServerEnums::WindowID p_window, bool p_enabled, bool p_exclusive) {
+void DisplayServerX11::_set_wm_fullscreen(WindowID p_window, bool p_enabled, bool p_exclusive) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
@@ -3096,61 +3063,61 @@ void DisplayServerX11::_set_wm_fullscreen(DisplayServerEnums::WindowID p_window,
 	}
 }
 
-void DisplayServerX11::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
-	DisplayServerEnums::WindowMode old_mode = window_get_mode(p_window);
+	WindowMode old_mode = window_get_mode(p_window);
 	if (old_mode == p_mode) {
 		return; // do nothing
 	}
 
-	if (p_mode != DisplayServerEnums::WINDOW_MODE_WINDOWED && wd.embed_parent) {
+	if (p_mode != WINDOW_MODE_WINDOWED && wd.embed_parent) {
 		print_line("Embedded window only supports Windowed mode.");
 		return;
 	}
 
 	// Remove all "extra" modes.
 	switch (old_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case WINDOW_MODE_WINDOWED: {
 			//do nothing
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case WINDOW_MODE_MINIMIZED: {
 			_set_wm_minimized(p_window, false);
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN: {
+		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
+		case WINDOW_MODE_FULLSCREEN: {
 			// Only remove fullscreen when necessary.
-			if (p_mode == DisplayServerEnums::WINDOW_MODE_WINDOWED || p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED) {
+			if (p_mode == WINDOW_MODE_WINDOWED || p_mode == WINDOW_MODE_MAXIMIZED) {
 				wd.fullscreen = false;
 				wd.exclusive_fullscreen = false;
 				_set_wm_fullscreen(p_window, false, false);
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case WINDOW_MODE_MAXIMIZED: {
 			// Varies between target modes, so do nothing here.
 		} break;
 	}
 
 	switch (p_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case WINDOW_MODE_WINDOWED: {
 			if (wd.maximized) {
 				_set_wm_maximized(p_window, false);
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case WINDOW_MODE_MINIMIZED: {
 			_set_wm_minimized(p_window, true);
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN: {
-			if (window_get_flag(DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP, p_window)) {
+		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
+		case WINDOW_MODE_FULLSCREEN: {
+			if (window_get_flag(WINDOW_FLAG_ALWAYS_ON_TOP, p_window)) {
 				_set_wm_maximized(p_window, true);
 			}
 
 			wd.fullscreen = true;
-			if (p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+			if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 				wd.exclusive_fullscreen = true;
 				_set_wm_fullscreen(p_window, true, true);
 			} else {
@@ -3158,159 +3125,56 @@ void DisplayServerX11::window_set_mode(DisplayServerEnums::WindowMode p_mode, Di
 				_set_wm_fullscreen(p_window, true, false);
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case WINDOW_MODE_MAXIMIZED: {
 			_set_wm_maximized(p_window, true);
 		} break;
 	}
 }
 
-void DisplayServerX11::window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window) {
+DisplayServer::WindowMode DisplayServerX11::window_get_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-	wd.icon_set = true;
-
-	Ref<Image> img;
-	if (p_icon.is_valid()) {
-		ERR_FAIL_COND(p_icon->get_width() <= 0 || p_icon->get_height() <= 0);
-		img = p_icon->duplicate();
-		img->convert(Image::FORMAT_RGBA8);
-	}
-	wd.icon = img;
-	_update_window_icon(wd);
-}
-
-bool DisplayServerX11::g_set_icon_error = false;
-
-int DisplayServerX11::set_icon_errorhandler(Display *dpy, XErrorEvent *ev) {
-	g_set_icon_error = true;
-	return 0;
-}
-
-void DisplayServerX11::_update_window_icon(WindowData &p_wd) {
-	Ref<Image> w_icon;
-	if (p_wd.icon_set) {
-		w_icon = p_wd.icon;
-	} else {
-		w_icon = icon;
-	}
-
-	int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&DisplayServerX11::set_icon_errorhandler);
-
-	Atom net_wm_icon = XInternAtom(x11_display, "_NET_WM_ICON", False);
-
-	if (w_icon.is_valid()) {
-		while (true) {
-			int w = w_icon->get_width();
-			int h = w_icon->get_height();
-
-			if (g_set_icon_error) {
-				g_set_icon_error = false;
-
-				WARN_PRINT(vformat("Icon too large (%dx%d), attempting to downscale icon.", w, h));
-
-				int new_width, new_height;
-				if (w > h) {
-					new_width = w / 2;
-					new_height = h * new_width / w;
-				} else {
-					new_height = h / 2;
-					new_width = w * new_height / h;
-				}
-
-				w = new_width;
-				h = new_height;
-
-				if (!w || !h) {
-					WARN_PRINT("Unable to set icon.");
-					break;
-				}
-
-				w_icon->resize(w, h, Image::INTERPOLATE_CUBIC);
-			}
-
-			// We're using long to have wordsize (32Bit build -> 32 Bits, 64 Bit build -> 64 Bits
-			Vector<long> pd;
-
-			pd.resize(2 + w * h);
-
-			pd.write[0] = w;
-			pd.write[1] = h;
-
-			const uint8_t *r = w_icon->get_data().ptr();
-
-			long *wr = &pd.write[2];
-			uint8_t const *pr = r;
-
-			for (int i = 0; i < w * h; i++) {
-				long v = 0;
-				//    A             R             G            B
-				v |= pr[3] << 24 | pr[0] << 16 | pr[1] << 8 | pr[2];
-				*wr++ = v;
-				pr += 4;
-			}
-
-			if (net_wm_icon != None) {
-				XChangeProperty(x11_display, p_wd.x11_window, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)pd.ptr(), pd.size());
-			}
-
-			if (!g_set_icon_error) {
-				break;
-			}
-		}
-	} else {
-		XDeleteProperty(x11_display, p_wd.x11_window, net_wm_icon);
-	}
-
-	XFlush(x11_display);
-	XSetErrorHandler(oldHandler);
-}
-
-DisplayServerEnums::WindowMode DisplayServerX11::window_get_mode(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::WINDOW_MODE_WINDOWED);
+	ERR_FAIL_COND_V(!windows.has(p_window), WINDOW_MODE_WINDOWED);
 	const WindowData &wd = windows[p_window];
 
 	if (_window_minimize_check(p_window)) {
-		return DisplayServerEnums::WINDOW_MODE_MINIMIZED;
+		return WINDOW_MODE_MINIMIZED;
 	}
 
 	if (wd.fullscreen) {
 		if (wd.exclusive_fullscreen) {
-			return DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
+			return WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
 		}
-		return DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+		return WINDOW_MODE_FULLSCREEN;
 	}
 
 	if (_window_maximize_check(p_window, "_NET_WM_STATE")) {
-		return DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+		return WINDOW_MODE_MAXIMIZED;
 	}
 
-	return DisplayServerEnums::WINDOW_MODE_WINDOWED;
+	return WINDOW_MODE_WINDOWED;
 }
 
-void DisplayServerX11::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			wd.no_max_btn = p_enabled;
 			_update_motif_wm_hints(p_window);
 
 			XFlush(x11_display);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			wd.no_min_btn = p_enabled;
 			_update_motif_wm_hints(p_window);
 
 			XFlush(x11_display);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			if (p_enabled && wd.embed_parent) {
 				print_line("Embedded window resize can't be disabled.");
 				return;
@@ -3322,13 +3186,13 @@ void DisplayServerX11::window_set_flag(DisplayServerEnums::WindowFlags p_flag, b
 
 			XFlush(x11_display);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			wd.borderless = p_enabled;
 			_update_motif_wm_hints(p_window);
 			_update_window_mouse_passthrough(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
-			ERR_FAIL_COND_MSG(wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID, "Can't make a window transient if the 'on top' flag is active.");
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
+			ERR_FAIL_COND_MSG(wd.transient_parent != INVALID_WINDOW_ID, "Can't make a window transient if the 'on top' flag is active.");
 			if (p_enabled && wd.embed_parent) {
 				print_line("Embedded window can't become on top.");
 				return;
@@ -3357,22 +3221,22 @@ void DisplayServerX11::window_set_flag(DisplayServerEnums::WindowFlags p_flag, b
 			wd.on_top = p_enabled;
 
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			wd.layered_window = p_enabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			wd.no_focus = p_enabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			wd.mpass = p_enabled;
 			_update_window_mouse_passthrough(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
+		case WINDOW_FLAG_POPUP: {
 			XWindowAttributes xwa;
 			XSync(x11_display, False);
 			XGetWindowAttributes(x11_display, wd.x11_window, &xwa);
 
-			ERR_FAIL_COND_MSG(p_window == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be popup.");
+			ERR_FAIL_COND_MSG(p_window == MAIN_WINDOW_ID, "Main window can't be popup.");
 			ERR_FAIL_COND_MSG((xwa.map_state == IsViewable) && (wd.is_popup != p_enabled), "Popup flag can't changed while window is opened.");
 			if (p_enabled && wd.embed_parent) {
 				print_line("Embedded window can't be popup.");
@@ -3385,38 +3249,38 @@ void DisplayServerX11::window_set_flag(DisplayServerEnums::WindowFlags p_flag, b
 	}
 }
 
-bool DisplayServerX11::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			return wd.no_max_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			return wd.no_min_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return wd.resize_disabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			return wd.borderless;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
 			return wd.on_top;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			return wd.layered_window;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			return wd.no_focus;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			return wd.mpass;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
+		case WINDOW_FLAG_POPUP: {
 			return wd.is_popup;
 		} break;
 		default: {
@@ -3426,7 +3290,7 @@ bool DisplayServerX11::window_get_flag(DisplayServerEnums::WindowFlags p_flag, D
 	return false;
 }
 
-void DisplayServerX11::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_request_attention(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3452,7 +3316,7 @@ void DisplayServerX11::window_request_attention(DisplayServerEnums::WindowID p_w
 	XFlush(x11_display);
 }
 
-void DisplayServerX11::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_move_to_foreground(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3473,11 +3337,11 @@ void DisplayServerX11::window_move_to_foreground(DisplayServerEnums::WindowID p_
 	XFlush(x11_display);
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::get_focused_window() const {
+DisplayServerX11::WindowID DisplayServerX11::get_focused_window() const {
 	return last_focused_window;
 }
 
-bool DisplayServerX11::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::window_is_focused(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
@@ -3487,16 +3351,16 @@ bool DisplayServerX11::window_is_focused(DisplayServerEnums::WindowID p_window)
 	return wd.focused;
 }
 
-bool DisplayServerX11::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerX11::window_can_draw(WindowID p_window) const {
 	//this seems to be all that is provided by X11
-	return window_get_mode(p_window) != DisplayServerEnums::WINDOW_MODE_MINIMIZED;
+	return window_get_mode(p_window) != WINDOW_MODE_MINIMIZED;
 }
 
 bool DisplayServerX11::can_any_window_draw() const {
 	_THREAD_SAFE_METHOD_
 
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (window_get_mode(E.key) != DisplayServerEnums::WINDOW_MODE_MINIMIZED) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
+		if (window_get_mode(E.key) != WINDOW_MODE_MINIMIZED) {
 			return true;
 		}
 	}
@@ -3504,7 +3368,7 @@ bool DisplayServerX11::can_any_window_draw() const {
 	return false;
 }
 
-void DisplayServerX11::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_ime_active(const bool p_active, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3547,7 +3411,7 @@ void DisplayServerX11::window_set_ime_active(const bool p_active, DisplayServerE
 	}
 }
 
-void DisplayServerX11::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3597,23 +3461,23 @@ String DisplayServerX11::ime_get_text() const {
 	return im_text;
 }
 
-void DisplayServerX11::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
+void DisplayServerX11::cursor_set_shape(CursorShape p_shape) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (p_shape == current_cursor) {
 		return;
 	}
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
 		if (cursors[p_shape] != None) {
-			for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+			for (const KeyValue<WindowID, WindowData> &E : windows) {
 				XDefineCursor(x11_display, E.value.x11_window, cursors[p_shape]);
 			}
-		} else if (cursors[DisplayServerEnums::CURSOR_ARROW] != None) {
-			for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-				XDefineCursor(x11_display, E.value.x11_window, cursors[DisplayServerEnums::CURSOR_ARROW]);
+		} else if (cursors[CURSOR_ARROW] != None) {
+			for (const KeyValue<WindowID, WindowData> &E : windows) {
+				XDefineCursor(x11_display, E.value.x11_window, cursors[CURSOR_ARROW]);
 			}
 		}
 	}
@@ -3621,17 +3485,17 @@ void DisplayServerX11::cursor_set_shape(DisplayServerEnums::CursorShape p_shape)
 	current_cursor = p_shape;
 }
 
-DisplayServerEnums::CursorShape DisplayServerX11::cursor_get_shape() const {
+DisplayServerX11::CursorShape DisplayServerX11::cursor_get_shape() const {
 	return current_cursor;
 }
 
-void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (p_cursor.is_valid()) {
-		HashMap<DisplayServerEnums::CursorShape, Vector<Variant>>::Iterator cursor_c = cursors_cache.find(p_shape);
+		HashMap<CursorShape, Vector<Variant>>::Iterator cursor_c = cursors_cache.find(p_shape);
 
 		if (cursor_c) {
 			if (cursor_c->value[0] == p_cursor && cursor_c->value[1] == p_hotspot) {
@@ -3677,8 +3541,8 @@ void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, Di
 		cursors_cache.insert(p_shape, params);
 
 		if (p_shape == current_cursor) {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
-				for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+			if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
+				for (const KeyValue<WindowID, WindowData> &E : windows) {
 					XDefineCursor(x11_display, E.value.x11_window, cursors[p_shape]);
 				}
 			}
@@ -3694,8 +3558,8 @@ void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, Di
 
 		cursors_cache.erase(p_shape);
 
-		DisplayServerEnums::CursorShape c = current_cursor;
-		current_cursor = DisplayServerEnums::CURSOR_MAX;
+		CursorShape c = current_cursor;
+		current_cursor = CURSOR_MAX;
 		cursor_set_shape(c);
 	}
 }
@@ -3853,10 +3717,10 @@ bool DisplayServerX11::color_picker(const Callable &p_callback) {
 	if (!portal_desktop) {
 		return false;
 	}
-	DisplayServerEnums::WindowID window_id = last_focused_window;
+	WindowID window_id = last_focused_window;
 
 	if (!windows.has(window_id)) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
@@ -3932,7 +3796,7 @@ void DisplayServerX11::_get_key_modifier_state(unsigned int p_x11_state, Ref<Inp
 	state->set_meta_pressed((p_x11_state & Mod4Mask));
 }
 
-void DisplayServerX11::_handle_key_event(DisplayServerEnums::WindowID p_window, XKeyEvent *p_event, LocalVector<XEvent> &p_events, uint32_t &p_event_index, bool p_echo) {
+void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event, LocalVector<XEvent> &p_events, uint32_t &p_event_index, bool p_echo) {
 	WindowData &wd = windows[p_window];
 	// X11 functions don't know what const is
 	XKeyEvent *xkeyevent = p_event;
@@ -4438,7 +4302,7 @@ void DisplayServerX11::_handle_selection_request_event(XSelectionRequestEvent *p
 int DisplayServerX11::_xim_preedit_start_callback(::XIM xim, ::XPointer client_data,
 		::XPointer call_data) {
 	DisplayServerX11 *ds = reinterpret_cast<DisplayServerX11 *>(client_data);
-	DisplayServerEnums::WindowID window_id = ds->_get_focused_window_or_popup();
+	WindowID window_id = ds->_get_focused_window_or_popup();
 	WindowData &wd = ds->windows[window_id];
 	if (wd.ime_active) {
 		wd.ime_in_progress = true;
@@ -4450,7 +4314,7 @@ int DisplayServerX11::_xim_preedit_start_callback(::XIM xim, ::XPointer client_d
 void DisplayServerX11::_xim_preedit_done_callback(::XIM xim, ::XPointer client_data,
 		::XPointer call_data) {
 	DisplayServerX11 *ds = reinterpret_cast<DisplayServerX11 *>(client_data);
-	DisplayServerEnums::WindowID window_id = ds->_get_focused_window_or_popup();
+	WindowID window_id = ds->_get_focused_window_or_popup();
 	WindowData &wd = ds->windows[window_id];
 	if (wd.ime_active) {
 		wd.ime_in_progress = false;
@@ -4461,7 +4325,7 @@ void DisplayServerX11::_xim_preedit_done_callback(::XIM xim, ::XPointer client_d
 void DisplayServerX11::_xim_preedit_draw_callback(::XIM xim, ::XPointer client_data,
 		::XIMPreeditDrawCallbackStruct *call_data) {
 	DisplayServerX11 *ds = reinterpret_cast<DisplayServerX11 *>(client_data);
-	DisplayServerEnums::WindowID window_id = ds->_get_focused_window_or_popup();
+	WindowID window_id = ds->_get_focused_window_or_popup();
 	WindowData &wd = ds->windows[window_id];
 
 	XIMText *xim_text = call_data->text;
@@ -4515,16 +4379,16 @@ void DisplayServerX11::_xim_destroy_callback(::XIM im, ::XPointer client_data,
 	DisplayServerX11 *ds = reinterpret_cast<DisplayServerX11 *>(client_data);
 	ds->xim = nullptr;
 
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : ds->windows) {
+	for (KeyValue<WindowID, WindowData> &E : ds->windows) {
 		E.value.xic = nullptr;
 	}
 }
 
 void DisplayServerX11::_window_changed(XEvent *event) {
-	DisplayServerEnums::WindowID window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_id = MAIN_WINDOW_ID;
 
 	// Assign the event to the relevant window
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (event->xany.window == E.value.x11_window) {
 			window_id = E.key;
 			break;
@@ -4576,8 +4440,8 @@ void DisplayServerX11::_window_changed(XEvent *event) {
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::_get_focused_window_or_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerX11::_get_focused_window_or_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	}
@@ -4591,7 +4455,7 @@ void DisplayServerX11::_dispatch_input_events(const Ref<InputEvent> &p_event) {
 
 void DisplayServerX11::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 	{
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *E = popup_list.back();
 		if (E && Object::cast_to<InputEventKey>(*p_event)) {
 			// Redirect keyboard input to active popup.
 			if (windows.has(E->get())) {
@@ -4605,7 +4469,7 @@ void DisplayServerX11::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 	}
 
 	Ref<InputEventFromWindow> event_from_window = p_event;
-	if (event_from_window.is_valid() && event_from_window->get_window_id() != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
 		// Send to a single window.
 		if (windows.has(event_from_window->get_window_id())) {
 			Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
@@ -4616,7 +4480,7 @@ void DisplayServerX11::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 	} else {
 		// Send to all windows. Copy all pending callbacks, since callback can erase window.
 		Vector<Callable> cbs;
-		for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+		for (KeyValue<WindowID, WindowData> &E : windows) {
 			Callable callable = E.value.input_event_callback;
 			if (callable.is_valid()) {
 				cbs.push_back(callable);
@@ -4628,7 +4492,7 @@ void DisplayServerX11::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 	}
 }
 
-void DisplayServerX11::_send_window_event(const WindowData &wd, DisplayServerEnums::WindowEvent p_event) {
+void DisplayServerX11::_send_window_event(const WindowData &wd, WindowEvent p_event) {
 	if (wd.event_callback.is_valid()) {
 		Variant event = int(p_event);
 		wd.event_callback.call(event);
@@ -4725,16 +4589,16 @@ void DisplayServerX11::_check_pending_events(LocalVector<XEvent> &r_events) {
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::window_get_active_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerX11::window_get_active_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	} else {
-		return DisplayServerEnums::INVALID_WINDOW_ID;
+		return INVALID_WINDOW_ID;
 	}
 }
 
-void DisplayServerX11::window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) {
+void DisplayServerX11::window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -4742,7 +4606,7 @@ void DisplayServerX11::window_set_popup_safe_rect(DisplayServerEnums::WindowID p
 	wd.parent_safe_rect = p_rect;
 }
 
-Rect2i DisplayServerX11::window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const {
+Rect2i DisplayServerX11::window_get_popup_safe_rect(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Rect2i());
@@ -4750,14 +4614,14 @@ Rect2i DisplayServerX11::window_get_popup_safe_rect(DisplayServerEnums::WindowID
 	return wd.parent_safe_rect;
 }
 
-void DisplayServerX11::popup_open(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::popup_open(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	bool has_popup_ancestor = false;
-	DisplayServerEnums::WindowID transient_root = p_window;
+	WindowID transient_root = p_window;
 	while (true) {
-		DisplayServerEnums::WindowID parent = windows[transient_root].transient_parent;
-		if (parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+		WindowID parent = windows[transient_root].transient_parent;
+		if (parent == INVALID_WINDOW_ID) {
 			break;
 		} else {
 			transient_root = parent;
@@ -4769,15 +4633,15 @@ void DisplayServerX11::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 
 	// Detect tooltips and other similar popups that shouldn't block input to their parent.
-	bool ignores_input = window_get_flag(DisplayServerEnums::WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
+	bool ignores_input = window_get_flag(WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
 
 	WindowData &wd = windows[p_window];
 	if (wd.is_popup || (has_popup_ancestor && !ignores_input)) {
 		// Find current popup parent, or root popup if new window is not transient.
-		List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *C = nullptr;
+		List<WindowID>::Element *E = popup_list.back();
 		while (E) {
-			if (wd.transient_parent != E->get() || wd.transient_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (wd.transient_parent != E->get() || wd.transient_parent == INVALID_WINDOW_ID) {
 				C = E;
 				E = E->prev();
 			} else {
@@ -4785,7 +4649,7 @@ void DisplayServerX11::popup_open(DisplayServerEnums::WindowID p_window) {
 			}
 		}
 		if (C) {
-			_send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			_send_window_event(windows[C->get()], DisplayServerX11::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 
 		time_since_popup = OS::get_singleton()->get_ticks_msec();
@@ -4793,18 +4657,18 @@ void DisplayServerX11::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 }
 
-void DisplayServerX11::popup_close(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::popup_close(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	List<DisplayServerEnums::WindowID>::Element *E = popup_list.find(p_window);
+	List<WindowID>::Element *E = popup_list.find(p_window);
 	while (E) {
-		List<DisplayServerEnums::WindowID>::Element *F = E->next();
-		DisplayServerEnums::WindowID win_id = E->get();
+		List<WindowID>::Element *F = E->next();
+		WindowID win_id = E->get();
 		popup_list.erase(E);
 
 		if (win_id != p_window) {
 			// Only request close on related windows, not this window.  We are already processing it.
-			_send_window_event(windows[win_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			_send_window_event(windows[win_id], DisplayServerX11::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 		E = F;
 	}
@@ -4834,8 +4698,8 @@ bool DisplayServerX11::mouse_process_popups() {
 			Vector2i pos = Vector2i(root_attrs.x + root_x, root_attrs.y + root_y);
 			if (mask != last_mouse_monitor_mask) {
 				if (((mask & Button1Mask) || (mask & Button2Mask) || (mask & Button3Mask) || (mask & Button4Mask) || (mask & Button5Mask))) {
-					List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-					List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+					List<WindowID>::Element *C = nullptr;
+					List<WindowID>::Element *E = popup_list.back();
 					// Find top popup to close.
 					while (E) {
 						// Popup window area.
@@ -4852,7 +4716,7 @@ bool DisplayServerX11::mouse_process_popups() {
 						}
 					}
 					if (C) {
-						_send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+						_send_window_event(windows[C->get()], DisplayServerX11::WINDOW_EVENT_CLOSE_REQUEST);
 						closed = true;
 					}
 				}
@@ -4894,7 +4758,7 @@ void DisplayServerX11::process_events() {
 	if (app_focused) {
 		//verify that one of the windows has focus, else send focus out notification
 		bool focus_found = false;
-		for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+		for (const KeyValue<WindowID, WindowData> &E : windows) {
 			if (E.value.focused) {
 				focus_found = true;
 				break;
@@ -4920,7 +4784,7 @@ void DisplayServerX11::process_events() {
 	do_mouse_warp = false;
 
 	// Is the current mouse mode one where it needs to be grabbed.
-	bool mouse_mode_grab = mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN;
+	bool mouse_mode_grab = mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN;
 
 	xi.pressure = 0;
 	xi.tilt = Vector2();
@@ -4938,10 +4802,10 @@ void DisplayServerX11::process_events() {
 		XEvent &event = events[event_index];
 
 		bool ime_window_event = false;
-		DisplayServerEnums::WindowID window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		WindowID window_id = MAIN_WINDOW_ID;
 
 		// Assign the event to the relevant window
-		for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+		for (const KeyValue<WindowID, WindowData> &E : windows) {
 			if (event.xany.window == E.value.x11_window) {
 				window_id = E.key;
 				break;
@@ -5185,8 +5049,8 @@ void DisplayServerX11::process_events() {
 				}
 
 				if (!mouse_mode_grab && window_mouseover_id == window_id) {
-					window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
-					_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+					window_mouseover_id = INVALID_WINDOW_ID;
+					_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_EXIT);
 				}
 
 			} break;
@@ -5198,11 +5062,11 @@ void DisplayServerX11::process_events() {
 				}
 
 				if (!mouse_mode_grab && window_mouseover_id != window_id) {
-					if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-						_send_window_event(windows[window_mouseover_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+					if (window_mouseover_id != INVALID_WINDOW_ID) {
+						_send_window_event(windows[window_mouseover_id], WINDOW_EVENT_MOUSE_EXIT);
 					}
 					window_mouseover_id = window_id;
-					_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+					_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_ENTER);
 				}
 			} break;
 
@@ -5220,16 +5084,20 @@ void DisplayServerX11::process_events() {
 				static unsigned int focus_order = 0;
 				wd.focus_order = ++focus_order;
 
-				AccessibilityServer::get_singleton()->set_window_focused(window_id, true);
-				_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(window_id, true);
+				}
+#endif
+				_send_window_event(wd, WINDOW_EVENT_FOCUS_IN);
 
 				if (mouse_mode_grab) {
 					// Show and update the cursor if confined and the window regained focus.
 
-					for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-						if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+					for (const KeyValue<WindowID, WindowData> &E : windows) {
+						if (mouse_mode == MOUSE_MODE_CONFINED) {
 							XUndefineCursor(x11_display, E.value.x11_window);
-						} else if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) { // Or re-hide it.
+						} else if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) { // Or re-hide it.
 							XDefineCursor(x11_display, E.value.x11_window, null_cursor);
 						}
 
@@ -5272,14 +5140,17 @@ void DisplayServerX11::process_events() {
 				wd.focused = false;
 
 				Input::get_singleton()->release_pressed_events();
-
-				AccessibilityServer::get_singleton()->set_window_focused(window_id, false);
-				_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(window_id, false);
+				}
+#endif
+				_send_window_event(wd, WINDOW_EVENT_FOCUS_OUT);
 
 				if (mouse_mode_grab) {
-					for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+					for (const KeyValue<WindowID, WindowData> &E : windows) {
 						//dear X11, I try, I really try, but you never work, you do whatever you want.
-						if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+						if (mouse_mode == MOUSE_MODE_CAPTURED) {
 							// Show the cursor if we're in captured mode so it doesn't look weird.
 							XUndefineCursor(x11_display, E.value.x11_window);
 						}
@@ -5327,7 +5198,7 @@ void DisplayServerX11::process_events() {
 				}
 				/* exit in case of a mouse button press */
 				last_timestamp = event.xbutton.time;
-				if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+				if (mouse_mode == MOUSE_MODE_CAPTURED) {
 					event.xbutton.x = last_mouse_pos.x;
 					event.xbutton.y = last_mouse_pos.y;
 				}
@@ -5390,7 +5261,7 @@ void DisplayServerX11::process_events() {
 				} else {
 					DEBUG_LOG_X11("[%u] ButtonRelease window=%lu (%u), button_index=%u \n", frame, event.xbutton.window, window_id, mb->get_button_index());
 
-					DisplayServerEnums::WindowID window_id_other = DisplayServerEnums::INVALID_WINDOW_ID;
+					WindowID window_id_other = INVALID_WINDOW_ID;
 					Window wd_other_x11_window;
 					if (!wd.focused) {
 						// Propagate the event to the focused window,
@@ -5398,7 +5269,7 @@ void DisplayServerX11::process_events() {
 						// Note: This is needed for drag & drop to work between windows,
 						// because the engine expects events to keep being processed
 						// on the same window dragging started.
-						for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+						for (const KeyValue<WindowID, WindowData> &E : windows) {
 							if (E.value.focused) {
 								if (E.key != window_id) {
 									window_id_other = E.key;
@@ -5409,7 +5280,7 @@ void DisplayServerX11::process_events() {
 						}
 					}
 
-					if (window_id_other != DisplayServerEnums::INVALID_WINDOW_ID) {
+					if (window_id_other != INVALID_WINDOW_ID) {
 						int x, y;
 						Window child;
 						XTranslateCoordinates(x11_display, wd.x11_window, wd_other_x11_window, event.xbutton.x, event.xbutton.y, &x, &y, &child);
@@ -5430,13 +5301,13 @@ void DisplayServerX11::process_events() {
 				// The X11 API requires filtering one-by-one through the motion
 				// notify events, in order to figure out which event is the one
 				// generated by warping the mouse pointer.
-				DisplayServerEnums::WindowID focused_window_id = _get_focused_window_or_popup();
+				WindowID focused_window_id = _get_focused_window_or_popup();
 				if (!windows.has(focused_window_id)) {
-					focused_window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+					focused_window_id = MAIN_WINDOW_ID;
 				}
 
 				while (true) {
-					if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && event.xmotion.x == windows[focused_window_id].size.width / 2 && event.xmotion.y == windows[focused_window_id].size.height / 2) {
+					if (mouse_mode == MOUSE_MODE_CAPTURED && event.xmotion.x == windows[focused_window_id].size.width / 2 && event.xmotion.y == windows[focused_window_id].size.height / 2) {
 						//this is likely the warp event since it was warped here
 						center = Vector2(event.xmotion.x, event.xmotion.y);
 						break;
@@ -5477,7 +5348,7 @@ void DisplayServerX11::process_events() {
 				const WindowData &wd = windows[window_id];
 				bool focused = wd.focused;
 
-				if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+				if (mouse_mode == MOUSE_MODE_CAPTURED) {
 					if (xi.relative_motion.x == 0 && xi.relative_motion.y == 0) {
 						break;
 					}
@@ -5502,7 +5373,7 @@ void DisplayServerX11::process_events() {
 				Point2i rel;
 
 				// Only use raw input if in capture mode. Otherwise use the classic behavior.
-				if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+				if (mouse_mode == MOUSE_MODE_CAPTURED) {
 					rel = xi.relative_motion;
 				} else {
 					rel = pos - last_mouse_pos;
@@ -5511,7 +5382,7 @@ void DisplayServerX11::process_events() {
 				// Reset to prevent lingering motion
 				xi.relative_motion.x = 0;
 				xi.relative_motion.y = 0;
-				if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+				if (mouse_mode == MOUSE_MODE_CAPTURED) {
 					pos = Point2i(windows[focused_window_id].size.width / 2, windows[focused_window_id].size.height / 2);
 				}
 
@@ -5568,7 +5439,7 @@ void DisplayServerX11::process_events() {
 					// Note: This is needed for drag & drop to work between windows,
 					// because the engine expects events to keep being processed
 					// on the same window dragging started.
-					for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+					for (const KeyValue<WindowID, WindowData> &E : windows) {
 						const WindowData &wd_other = E.value;
 						if (wd_other.focused) {
 							int x, y;
@@ -5654,7 +5525,7 @@ void DisplayServerX11::process_events() {
 					break;
 				}
 				if ((unsigned int)event.xclient.data.l[0] == (unsigned int)wm_delete) {
-					_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+					_send_window_event(windows[window_id], WINDOW_EVENT_CLOSE_REQUEST);
 				}
 
 				else if ((unsigned int)event.xclient.message_type == (unsigned int)xdnd_enter) {
@@ -5719,8 +5590,8 @@ void DisplayServerX11::process_events() {
 	XFlush(x11_display);
 
 	if (do_mouse_warp) {
-		XWarpPointer(x11_display, None, windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window,
-				0, 0, 0, 0, (int)windows[DisplayServerEnums::MAIN_WINDOW_ID].size.width / 2, (int)windows[DisplayServerEnums::MAIN_WINDOW_ID].size.height / 2);
+		XWarpPointer(x11_display, None, windows[MAIN_WINDOW_ID].x11_window,
+				0, 0, 0, 0, (int)windows[MAIN_WINDOW_ID].size.width / 2, (int)windows[MAIN_WINDOW_ID].size.height / 2);
 
 		/*
 		Window root, child;
@@ -5773,19 +5644,19 @@ void DisplayServerX11::_update_context(WindowData &wd) {
 	if (classHint) {
 		CharString name_str;
 		switch (context) {
-			case DisplayServerEnums::CONTEXT_EDITOR:
+			case CONTEXT_EDITOR:
 				name_str = "Godot_Editor";
 				break;
-			case DisplayServerEnums::CONTEXT_PROJECTMAN:
+			case CONTEXT_PROJECTMAN:
 				name_str = "Godot_ProjectList";
 				break;
-			case DisplayServerEnums::CONTEXT_ENGINE:
+			case CONTEXT_ENGINE:
 				name_str = "Godot_Engine";
 				break;
 		}
 
 		CharString class_str;
-		if (context == DisplayServerEnums::CONTEXT_ENGINE) {
+		if (context == CONTEXT_ENGINE) {
 			String config_name = GLOBAL_GET("application/config/name");
 			if (config_name.length() == 0) {
 				class_str = "Godot_Engine";
@@ -5804,12 +5675,12 @@ void DisplayServerX11::_update_context(WindowData &wd) {
 	}
 }
 
-void DisplayServerX11::set_context(DisplayServerEnums::Context p_context) {
+void DisplayServerX11::set_context(Context p_context) {
 	_THREAD_SAFE_METHOD_
 
 	context = p_context;
 
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (KeyValue<WindowID, WindowData> &E : windows) {
 		_update_context(E.value);
 	}
 }
@@ -5835,21 +5706,94 @@ void DisplayServerX11::set_native_icon(const String &p_filename) {
 	WARN_PRINT("Native icon not supported by this display server.");
 }
 
-void DisplayServerX11::set_icon(const Ref<Image> &p_icon) {
-	ERR_FAIL_COND(p_icon.is_null());
-
-	icon = p_icon->duplicate();
-	icon->convert(Image::FORMAT_RGBA8);
-
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-			continue;
-		}
-		_update_window_icon(E.value);
-	}
+bool g_set_icon_error = false;
+int set_icon_errorhandler(Display *dpy, XErrorEvent *ev) {
+	g_set_icon_error = true;
+	return 0;
 }
 
-void DisplayServerX11::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::set_icon(const Ref<Image> &p_icon) {
+	_THREAD_SAFE_METHOD_
+
+	WindowData &wd = windows[MAIN_WINDOW_ID];
+
+	int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&set_icon_errorhandler);
+
+	Atom net_wm_icon = XInternAtom(x11_display, "_NET_WM_ICON", False);
+
+	if (p_icon.is_valid()) {
+		ERR_FAIL_COND(p_icon->get_width() <= 0 || p_icon->get_height() <= 0);
+
+		Ref<Image> img = p_icon->duplicate();
+		img->convert(Image::FORMAT_RGBA8);
+
+		while (true) {
+			int w = img->get_width();
+			int h = img->get_height();
+
+			if (g_set_icon_error) {
+				g_set_icon_error = false;
+
+				WARN_PRINT(vformat("Icon too large (%dx%d), attempting to downscale icon.", w, h));
+
+				int new_width, new_height;
+				if (w > h) {
+					new_width = w / 2;
+					new_height = h * new_width / w;
+				} else {
+					new_height = h / 2;
+					new_width = w * new_height / h;
+				}
+
+				w = new_width;
+				h = new_height;
+
+				if (!w || !h) {
+					WARN_PRINT("Unable to set icon.");
+					break;
+				}
+
+				img->resize(w, h, Image::INTERPOLATE_CUBIC);
+			}
+
+			// We're using long to have wordsize (32Bit build -> 32 Bits, 64 Bit build -> 64 Bits
+			Vector<long> pd;
+
+			pd.resize(2 + w * h);
+
+			pd.write[0] = w;
+			pd.write[1] = h;
+
+			const uint8_t *r = img->get_data().ptr();
+
+			long *wr = &pd.write[2];
+			uint8_t const *pr = r;
+
+			for (int i = 0; i < w * h; i++) {
+				long v = 0;
+				//    A             R             G            B
+				v |= pr[3] << 24 | pr[0] << 16 | pr[1] << 8 | pr[2];
+				*wr++ = v;
+				pr += 4;
+			}
+
+			if (net_wm_icon != None) {
+				XChangeProperty(x11_display, wd.x11_window, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)pd.ptr(), pd.size());
+			}
+
+			if (!g_set_icon_error) {
+				break;
+			}
+		}
+	} else {
+		XDeleteProperty(x11_display, wd.x11_window, net_wm_icon);
+	}
+
+	XFlush(x11_display);
+	XSetErrorHandler(oldHandler);
+}
+
+void DisplayServerX11::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -5859,15 +5803,15 @@ void DisplayServerX11::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsy
 
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
-		gl_manager->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 	if (gl_manager_egl) {
-		gl_manager_egl->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager_egl->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 #endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerX11::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerX11::window_get_vsync_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -5876,16 +5820,16 @@ DisplayServerEnums::VSyncMode DisplayServerX11::window_get_vsync_mode(DisplaySer
 #endif
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
-		return gl_manager->is_using_vsync() ? DisplayServerEnums::VSYNC_ENABLED : DisplayServerEnums::VSYNC_DISABLED;
+		return gl_manager->is_using_vsync() ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
 	if (gl_manager_egl) {
-		return gl_manager_egl->is_using_vsync() ? DisplayServerEnums::VSYNC_ENABLED : DisplayServerEnums::VSYNC_DISABLED;
+		return gl_manager_egl->is_using_vsync() ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
 #endif
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
-void DisplayServerX11::window_start_drag(DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_start_drag(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -5923,10 +5867,10 @@ void DisplayServerX11::window_start_drag(DisplayServerEnums::WindowID p_window)
 	XSync(x11_display, 0);
 }
 
-void DisplayServerX11::window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) {
+void DisplayServerX11::window_start_resize(WindowResizeEdge p_edge, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(int(p_edge), DisplayServerEnums::WINDOW_EDGE_MAX);
+	ERR_FAIL_INDEX(int(p_edge), WINDOW_EDGE_MAX);
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
@@ -5957,28 +5901,28 @@ void DisplayServerX11::window_start_resize(DisplayServerEnums::WindowResizeEdge
 	}
 
 	switch (p_edge) {
-		case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+		case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_TOPLEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_TOP: {
+		case DisplayServer::WINDOW_EDGE_TOP: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_TOP;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_TOPRIGHT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+		case DisplayServer::WINDOW_EDGE_LEFT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_LEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_RIGHT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_RIGHT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_BOTTOM;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 			m.data.l[2] = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT;
 		} break;
 		default:
@@ -6101,7 +6045,7 @@ void DisplayServerX11::_set_window_taskbar_pager_enabled(Window p_window, bool p
 	XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *)&xev);
 }
 
-Error DisplayServerX11::embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
+Error DisplayServerX11::embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), FAILED);
@@ -6237,7 +6181,7 @@ Error DisplayServerX11::embed_process(DisplayServerEnums::WindowID p_window, Pro
 	return OK;
 }
 
-Error DisplayServerX11::request_close_embedded_process(ProcessID p_pid) {
+Error DisplayServerX11::request_close_embedded_process(OS::ProcessID p_pid) {
 	_THREAD_SAFE_METHOD_
 
 	if (!embedded_processes.has(p_pid)) {
@@ -6270,7 +6214,7 @@ Error DisplayServerX11::request_close_embedded_process(ProcessID p_pid) {
 	return OK;
 }
 
-Error DisplayServerX11::remove_embedded_process(ProcessID p_pid) {
+Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
 	_THREAD_SAFE_METHOD_
 
 	if (!embedded_processes.has(p_pid)) {
@@ -6287,7 +6231,7 @@ Error DisplayServerX11::remove_embedded_process(ProcessID p_pid) {
 	return OK;
 }
 
-ProcessID DisplayServerX11::get_focused_process_id() {
+OS::ProcessID DisplayServerX11::get_focused_process_id() {
 	Window focused_window = 0;
 	int revert_to = 0;
 
@@ -6315,7 +6259,7 @@ Vector<String> DisplayServerX11::get_rendering_drivers_func() {
 	return drivers;
 }
 
-DisplayServer *DisplayServerX11::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerX11::create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	DisplayServer *ds = memnew(DisplayServerX11(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 	return ds;
 }
@@ -6387,7 +6331,7 @@ void DisplayServerX11::_create_xic(WindowData &wd) {
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, Window p_parent_window) {
+DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, Window p_parent_window) {
 	//Create window
 
 	XVisualInfo visualInfo;
@@ -6397,19 +6341,19 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 	if (gl_manager) {
 		Error err;
 		visualInfo = gl_manager->get_vi(x11_display, err);
-		ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, "Can't acquire visual info from display.");
+		ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't acquire visual info from display.");
 		vi_selected = true;
 	}
 	if (gl_manager_egl) {
 		XVisualInfo visual_info_template;
 		int visual_id = gl_manager_egl->display_get_native_visual_id(x11_display);
-		ERR_FAIL_COND_V_MSG(visual_id < 0, DisplayServerEnums::INVALID_WINDOW_ID, "Unable to get a visual id.");
+		ERR_FAIL_COND_V_MSG(visual_id < 0, INVALID_WINDOW_ID, "Unable to get a visual id.");
 
 		visual_info_template.visualid = (VisualID)visual_id;
 
 		int number_of_visuals = 0;
 		XVisualInfo *vi_list = XGetVisualInfo(x11_display, VisualIDMask, &visual_info_template, &number_of_visuals);
-		ERR_FAIL_COND_V(number_of_visuals <= 0, DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_COND_V(number_of_visuals <= 0, INVALID_WINDOW_ID);
 
 		visualInfo = vi_list[0];
 
@@ -6423,7 +6367,7 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 		XVisualInfo vInfoTemplate = {};
 		vInfoTemplate.screen = DefaultScreen(x11_display);
 		XVisualInfo *vi_list = XGetVisualInfo(x11_display, visualMask, &vInfoTemplate, &numberOfVisuals);
-		ERR_FAIL_NULL_V(vi_list, DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_NULL_V(vi_list, INVALID_WINDOW_ID);
 
 		visualInfo = vi_list[0];
 		if (OS::get_singleton()->is_layered_allowed()) {
@@ -6458,14 +6402,14 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 		valuemask |= CWBackPixel;
 	}
 
-	DisplayServerEnums::WindowID id = window_id_counter++;
+	WindowID id = window_id_counter++;
 	WindowData &wd = windows[id];
 
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_NO_FOCUS_BIT) {
+	if (p_flags & WINDOW_FLAG_NO_FOCUS_BIT) {
 		wd.no_focus = true;
 	}
 
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_POPUP_BIT) {
+	if (p_flags & WINDOW_FLAG_POPUP_BIT) {
 		wd.is_popup = true;
 	}
 
@@ -6488,7 +6432,7 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 	Rect2i win_rect = p_rect;
 	if (!p_parent_window) {
 		// No parent.
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 			Rect2i screen_rect = Rect2i(screen_get_position(rq_screen), screen_get_size(rq_screen));
 
 			win_rect = screen_rect;
@@ -6525,11 +6469,15 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 			wd.xkb_state = xkb_compose_state_new(dead_tbl, XKB_COMPOSE_STATE_NO_FLAGS);
 		}
 #endif
-		if (!AccessibilityServer::get_singleton()->window_create(id, nullptr)) {
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver && !accessibility_driver->window_create(id, nullptr)) {
 			if (OS::get_singleton()->is_stdout_verbose()) {
 				ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
 			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
 		}
+#endif
 		// Enable receiving notification when the window is initialized (MapNotify)
 		// so the focus can be set at the right time.
 		if (!wd.no_focus && !wd.is_popup) {
@@ -6635,7 +6583,7 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 			}
 #endif
 			Error err = rendering_context->window_create(id, &wpd);
-			ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, vformat("Can't create a %s window", rendering_driver));
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, vformat("Can't create a %s window", rendering_driver));
 
 			rendering_context->window_set_size(id, win_rect.size.width, win_rect.size.height);
 			rendering_context->window_set_vsync_mode(id, p_vsync_mode);
@@ -6644,11 +6592,11 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 #ifdef GLES3_ENABLED
 		if (gl_manager) {
 			Error err = gl_manager->window_create(id, wd.x11_window, x11_display, win_rect.size.width, win_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, "Can't create an OpenGL window");
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create an OpenGL window");
 		}
 		if (gl_manager_egl) {
 			Error err = gl_manager_egl->window_create(id, x11_display, &wd.x11_window, win_rect.size.width, win_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, "Failed to create an OpenGLES window.");
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Failed to create an OpenGLES window.");
 		}
 		window_set_vsync_mode(p_vsync_mode, id);
 #endif
@@ -6680,8 +6628,6 @@ DisplayServerEnums::WindowID DisplayServerX11::_create_window(DisplayServerEnums
 		XDefineCursor(x11_display, wd.x11_window, cursors[current_cursor]);
 	}
 
-	_update_window_icon(wd);
-
 	return id;
 }
 
@@ -6785,12 +6731,12 @@ void DisplayServerX11::_xim_instantiate_callback(::Display *display, ::XPointer
 	}
 
 	// The input method has been (re)started.
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : ds->windows) {
+	for (KeyValue<WindowID, WindowData> &E : ds->windows) {
 		ds->_create_xic(E.value);
 	}
 }
 
-DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	KeyMappingX11::initialize();
 
 	String current_desk = OS::get_singleton()->get_environment("XDG_CURRENT_DESKTOP").to_lower();
@@ -6895,7 +6841,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 	}
 #endif
 
-	for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
+	for (int i = 0; i < CURSOR_MAX; i++) {
 		cursors[i] = None;
 		cursor_img[i] = nullptr;
 	}
@@ -7059,6 +7005,16 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 	}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	//!!!!!!!!!!!!!!!!!!!!!!!!!!
 	//TODO - do Vulkan and OpenGL support checks, driver selection and fallback
 	rendering_driver = p_rendering_driver;
@@ -7089,8 +7045,8 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
 				WARN_PRINT("Your video card drivers seem not to support the required Vulkan version, switching to OpenGL 3.");
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else
 #endif // GLES3_ENABLED
 			{
@@ -7166,7 +7122,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 			if (fallback) {
 				WARN_PRINT("Your video card drivers seem not to support the required OpenGL version, switching to OpenGLES.");
 				rendering_driver = "opengl3_es";
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else {
 				r_error = ERR_UNAVAILABLE;
 
@@ -7217,28 +7173,28 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 	if (p_position != nullptr) {
 		window_position = *p_position;
 	} else {
-		if (p_screen == DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) {
-			p_screen = DisplayServerEnums::SCREEN_PRIMARY;
+		if (p_screen == SCREEN_OF_MAIN_WINDOW) {
+			p_screen = SCREEN_PRIMARY;
 		}
 		Rect2i scr_rect = screen_get_usable_rect(p_screen);
 		window_position = scr_rect.position + (scr_rect.size - p_resolution) / 2;
 	}
 
-	DisplayServerEnums::WindowID main_window = _create_window(p_mode, p_vsync_mode, p_flags, Rect2i(window_position, p_resolution), p_parent_window);
-	if (main_window == DisplayServerEnums::INVALID_WINDOW_ID) {
+	WindowID main_window = _create_window(p_mode, p_vsync_mode, p_flags, Rect2i(window_position, p_resolution), p_parent_window);
+	if (main_window == INVALID_WINDOW_ID) {
 		r_error = ERR_CANT_CREATE;
 		return;
 	}
-	for (int i = 0; i < DisplayServerEnums::WINDOW_FLAG_MAX; i++) {
+	for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
 		if (p_flags & (1 << i)) {
-			window_set_flag(DisplayServerEnums::WindowFlags(i), true, main_window);
+			window_set_flag(WindowFlags(i), true, main_window);
 		}
 	}
 
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		rendering_device = memnew(RenderingDevice);
-		if (rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) != OK) {
 			memdelete(rendering_device);
 			rendering_device = nullptr;
 			memdelete(rendering_context);
@@ -7246,7 +7202,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
@@ -7272,7 +7228,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 		cursor_theme = "default";
 	}
 
-	for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
+	for (int i = 0; i < CURSOR_MAX; i++) {
 		static const char *cursor_file[] = {
 			"left_ptr",
 			"xterm",
@@ -7298,49 +7254,49 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 			const char *fallback = nullptr;
 
 			switch (i) {
-				case DisplayServerEnums::CURSOR_POINTING_HAND:
+				case CURSOR_POINTING_HAND:
 					fallback = "pointer";
 					break;
-				case DisplayServerEnums::CURSOR_CROSS:
+				case CURSOR_CROSS:
 					fallback = "crosshair";
 					break;
-				case DisplayServerEnums::CURSOR_WAIT:
+				case CURSOR_WAIT:
 					fallback = "wait";
 					break;
-				case DisplayServerEnums::CURSOR_BUSY:
+				case CURSOR_BUSY:
 					fallback = "progress";
 					break;
-				case DisplayServerEnums::CURSOR_DRAG:
+				case CURSOR_DRAG:
 					fallback = "grabbing";
 					break;
-				case DisplayServerEnums::CURSOR_CAN_DROP:
+				case CURSOR_CAN_DROP:
 					fallback = "hand1";
 					break;
-				case DisplayServerEnums::CURSOR_FORBIDDEN:
+				case CURSOR_FORBIDDEN:
 					fallback = "forbidden";
 					break;
-				case DisplayServerEnums::CURSOR_VSIZE:
+				case CURSOR_VSIZE:
 					fallback = "ns-resize";
 					break;
-				case DisplayServerEnums::CURSOR_HSIZE:
+				case CURSOR_HSIZE:
 					fallback = "ew-resize";
 					break;
-				case DisplayServerEnums::CURSOR_BDIAGSIZE:
+				case CURSOR_BDIAGSIZE:
 					fallback = "fd_double_arrow";
 					break;
-				case DisplayServerEnums::CURSOR_FDIAGSIZE:
+				case CURSOR_FDIAGSIZE:
 					fallback = "bd_double_arrow";
 					break;
-				case DisplayServerEnums::CURSOR_MOVE:
-					cursor_img[i] = cursor_img[DisplayServerEnums::CURSOR_DRAG];
+				case CURSOR_MOVE:
+					cursor_img[i] = cursor_img[CURSOR_DRAG];
 					break;
-				case DisplayServerEnums::CURSOR_VSPLIT:
+				case CURSOR_VSPLIT:
 					fallback = "sb_v_double_arrow";
 					break;
-				case DisplayServerEnums::CURSOR_HSPLIT:
+				case CURSOR_HSPLIT:
 					fallback = "sb_h_double_arrow";
 					break;
-				case DisplayServerEnums::CURSOR_HELP:
+				case CURSOR_HELP:
 					fallback = "help";
 					break;
 			}
@@ -7385,7 +7341,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 
 		null_cursor = cursor;
 	}
-	cursor_set_shape(DisplayServerEnums::CURSOR_BUSY);
+	cursor_set_shape(CURSOR_BUSY);
 
 	// Search the X11 event queue for ConfigureNotify events and process all
 	// that are currently queued early, so we can get the final window size
@@ -7396,7 +7352,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 	}
 	events_thread.start(_poll_events_thread, this);
 
-	_update_real_mouse_position(windows[DisplayServerEnums::MAIN_WINDOW_ID]);
+	_update_real_mouse_position(windows[MAIN_WINDOW_ID]);
 
 #ifdef DBUS_ENABLED
 	bool dbus_ok = true;
@@ -7435,7 +7391,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, DisplayServ
 
 DisplayServerX11::~DisplayServerX11() {
 	// Send owned clipboard data to clipboard manager before exit.
-	Window x11_main_window = windows[DisplayServerEnums::MAIN_WINDOW_ID].x11_window;
+	Window x11_main_window = windows[MAIN_WINDOW_ID].x11_window;
 	_clipboard_transfer_ownership(XA_PRIMARY, x11_main_window);
 	_clipboard_transfer_ownership(XInternAtom(x11_display, "CLIPBOARD", 0), x11_main_window);
 
@@ -7448,7 +7404,7 @@ DisplayServerX11::~DisplayServerX11() {
 	}
 
 	//destroy all windows
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (KeyValue<WindowID, WindowData> &E : windows) {
 #if defined(RD_ENABLED)
 		if (rendering_device) {
 			rendering_device->screen_free(E.key);
@@ -7467,7 +7423,11 @@ DisplayServerX11::~DisplayServerX11() {
 		}
 #endif
 
-		AccessibilityServer::get_singleton()->window_destroy(E.key);
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->window_destroy(E.key);
+		}
+#endif
 
 		WindowData &wd = E.value;
 		if (wd.xic) {
@@ -7526,7 +7486,7 @@ DisplayServerX11::~DisplayServerX11() {
 		dlclose(xrandr_handle);
 	}
 
-	for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
+	for (int i = 0; i < CURSOR_MAX; i++) {
 		if (cursors[i] != None) {
 			XFreeCursor(x11_display, cursors[i]);
 		}
@@ -7543,7 +7503,11 @@ DisplayServerX11::~DisplayServerX11() {
 	if (xmbstring) {
 		memfree(xmbstring);
 	}
-
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
 #ifdef SPEECHD_ENABLED
 	if (tts) {
 		memdelete(tts);
diff --git a/engine/platform/linuxbsd/x11/display_server_x11.h b/engine/platform/linuxbsd/x11/display_server_x11.h
index c3a28c10..b7a9d3c5 100644
--- a/engine/platform/linuxbsd/x11/display_server_x11.h
+++ b/engine/platform/linuxbsd/x11/display_server_x11.h
@@ -32,61 +32,78 @@
 
 #ifdef X11_ENABLED
 
-#include "core/input/input_enums.h"
+#include "core/input/input.h"
 #include "core/os/mutex.h"
-#include "core/os/process_id.h"
 #include "core/os/thread.h"
-#include "core/os/thread_safe.h"
 #include "core/templates/local_vector.h"
+#include "drivers/alsa/audio_driver_alsa.h"
+#include "drivers/alsamidi/midi_driver_alsamidi.h"
+#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
+#include "drivers/unix/os_unix.h"
+#include "servers/audio/audio_server.h"
 #include "servers/display/display_server.h"
+#include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/rendering_server.h"
+
+#if defined(SPEECHD_ENABLED)
+#include "tts_linux.h"
+#endif
+
+#if defined(GLES3_ENABLED)
+#include "x11/gl_manager_x11.h"
+#include "x11/gl_manager_x11_egl.h"
+#endif
+
+#if defined(RD_ENABLED)
+#include "servers/rendering/rendering_device.h"
+
+#if defined(VULKAN_ENABLED)
+#include "x11/rendering_context_driver_vulkan_x11.h"
+#endif
+#endif
+
+#if defined(DBUS_ENABLED)
+#include "freedesktop_at_spi_monitor.h"
+#include "freedesktop_portal_desktop.h"
+#include "freedesktop_screensaver.h"
+#endif
+
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
 
 #ifdef SOWRAP_ENABLED
-#include "x11/dynwrappers/xcursor-so_wrap.h"
-#include "x11/dynwrappers/xinput2-so_wrap.h"
 #include "x11/dynwrappers/xlib-so_wrap.h"
-#include "x11/dynwrappers/xrandr-so_wrap.h"
 
-#ifdef XKB_ENABLED
+#include "x11/dynwrappers/xcursor-so_wrap.h"
+#include "x11/dynwrappers/xext-so_wrap.h"
+#include "x11/dynwrappers/xinerama-so_wrap.h"
+#include "x11/dynwrappers/xinput2-so_wrap.h"
+#include "x11/dynwrappers/xrandr-so_wrap.h"
+#include "x11/dynwrappers/xrender-so_wrap.h"
+
 #include "xkbcommon-so_wrap.h"
-#endif
-#else // !SOWRAP_ENABLED
-#include <X11/Xcursor/Xcursor.h>
+#else
+#include <X11/XKBlib.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include <X11/Xcursor/Xcursor.h>
 #include <X11/extensions/XInput2.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/Xinerama.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/shape.h>
 
 #ifdef XKB_ENABLED
 #include <xkbcommon/xkbcommon-compose.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include <xkbcommon/xkbcommon.h>
 #endif
 #endif
 
-#undef CursorShape // Xlib macro conflicting with our type.
-
-class InputEvent;
-class InputEventWithModifiers;
-class NativeMenu;
-
-#ifdef RD_ENABLED
-class RenderingDevice;
-class RenderingContextDriver;
-#endif
-
-#ifdef GLES3_ENABLED
-class GLManager_X11;
-class GLManagerEGL_X11;
-#endif
-
-#ifdef DBUS_ENABLED
-class FreeDesktopPortalDesktop;
-class FreeDesktopAtSPIMonitor;
-class FreeDesktopScreenSaver;
-#endif
-
-#ifdef SPEECHD_ENABLED
-class TTS_Linux;
-#endif
-
 typedef struct _xrr_monitor_info {
 	Atom name;
 	Bool primary = false;
@@ -101,6 +118,8 @@ typedef struct _xrr_monitor_info {
 	RROutput *outputs = nullptr;
 } xrr_monitor_info;
 
+#undef CursorShape
+
 class DisplayServerX11 : public DisplayServer {
 	GDSOFTCLASS(DisplayServerX11, DisplayServer);
 
@@ -152,8 +171,6 @@ class DisplayServerX11 : public DisplayServer {
 #ifdef XKB_ENABLED
 		xkb_compose_state *xkb_state = nullptr;
 #endif
-		Ref<Image> icon;
-		bool icon_set = false;
 
 		Size2i min_size;
 		Size2i max_size;
@@ -167,15 +184,15 @@ class DisplayServerX11 : public DisplayServer {
 
 		Vector<Vector2> mpath;
 
-		DisplayServerEnums::WindowID transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
-		HashSet<DisplayServerEnums::WindowID> transient_children;
+		WindowID transient_parent = INVALID_WINDOW_ID;
+		HashSet<WindowID> transient_children;
 
 		ObjectID instance_id;
 
 		bool no_focus = false;
 
 		//better to guess on the fly, given WM can change it
-		//DisplayServerEnums::WindowMode mode;
+		//WindowMode mode;
 		bool fullscreen = false; //OS can't exit from this mode
 		bool exclusive_fullscreen = false;
 		bool on_top = false;
@@ -207,19 +224,19 @@ class DisplayServerX11 : public DisplayServer {
 	xkb_compose_table *dead_tbl = nullptr;
 #endif
 
-	HashMap<DisplayServerEnums::WindowID, WindowData> windows;
+	HashMap<WindowID, WindowData> windows;
 
 	unsigned int last_mouse_monitor_mask = 0;
 	uint64_t time_since_popup = 0;
 
-	List<DisplayServerEnums::WindowID> popup_list;
+	List<WindowID> popup_list;
 
-	DisplayServerEnums::WindowID window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
-	DisplayServerEnums::WindowID last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	WindowID window_mouseover_id = INVALID_WINDOW_ID;
+	WindowID last_focused_window = INVALID_WINDOW_ID;
 
-	DisplayServerEnums::WindowID window_id_counter = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_id_counter = MAIN_WINDOW_ID;
 	void _create_xic(WindowData &wd);
-	DisplayServerEnums::WindowID _create_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, Window p_parent_window);
+	WindowID _create_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, Window p_parent_window);
 
 	String internal_clipboard;
 	String internal_clipboard_primary;
@@ -274,12 +291,6 @@ class DisplayServerX11 : public DisplayServer {
 		::Time last_relative_time;
 	} xi;
 
-	Ref<Image> icon;
-	void _update_window_icon(WindowData &p_wd);
-
-	static bool g_set_icon_error;
-	static int set_icon_errorhandler(Display *dpy, XErrorEvent *ev);
-
 	bool _refresh_device_info();
 
 	Rect2i _screen_get_rect(int p_screen) const;
@@ -287,19 +298,19 @@ class DisplayServerX11 : public DisplayServer {
 	void _get_key_modifier_state(unsigned int p_x11_state, Ref<InputEventWithModifiers> state);
 	void _flush_mouse_motion();
 
-	DisplayServerEnums::MouseMode mouse_mode = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
 	bool mouse_mode_override_enabled = false;
 	void _mouse_update_mode();
 
 	Point2i center;
 
-	void _handle_key_event(DisplayServerEnums::WindowID p_window, XKeyEvent *p_event, LocalVector<XEvent> &p_events, uint32_t &p_event_index, bool p_echo = false);
+	void _handle_key_event(WindowID p_window, XKeyEvent *p_event, LocalVector<XEvent> &p_events, uint32_t &p_event_index, bool p_echo = false);
 
 	Atom _process_selection_request_target(Atom p_target, Window p_requestor, Atom p_property, Atom p_selection) const;
 	void _handle_selection_request_event(XSelectionRequestEvent *p_event) const;
-	void _update_window_mouse_passthrough(DisplayServerEnums::WindowID p_window);
+	void _update_window_mouse_passthrough(WindowID p_window);
 
 	String _clipboard_get_impl(Atom p_source, Window x11_window, Atom target) const;
 	String _clipboard_get(Atom p_source, Window x11_window) const;
@@ -310,11 +321,11 @@ class DisplayServerX11 : public DisplayServer {
 
 	const char *cursor_theme = nullptr;
 	int cursor_size = 0;
-	XcursorImage *cursor_img[DisplayServerEnums::CURSOR_MAX];
-	Cursor cursors[DisplayServerEnums::CURSOR_MAX];
+	XcursorImage *cursor_img[CURSOR_MAX];
+	Cursor cursors[CURSOR_MAX];
 	Cursor null_cursor;
-	DisplayServerEnums::CursorShape current_cursor = DisplayServerEnums::CURSOR_ARROW;
-	HashMap<DisplayServerEnums::CursorShape, Vector<Variant>> cursors_cache;
+	CursorShape current_cursor = CURSOR_ARROW;
+	HashMap<CursorShape, Vector<Variant>> cursors_cache;
 
 	String rendering_driver;
 	void set_wm_fullscreen(bool p_enabled);
@@ -339,26 +350,26 @@ class DisplayServerX11 : public DisplayServer {
 	static Property _read_property(Display *p_display, Window p_window, Atom p_property);
 
 	void _update_real_mouse_position(const WindowData &wd);
-	bool _window_maximize_check(DisplayServerEnums::WindowID p_window, const char *p_atom_name) const;
-	bool _window_fullscreen_check(DisplayServerEnums::WindowID p_window) const;
-	bool _window_minimize_check(DisplayServerEnums::WindowID p_window) const;
-	void _validate_fullscreen_on_map(DisplayServerEnums::WindowID p_window);
-	void _update_size_hints(DisplayServerEnums::WindowID p_window);
-	void _update_motif_wm_hints(DisplayServerEnums::WindowID p_window);
-	void _update_wm_state_hints(DisplayServerEnums::WindowID p_window);
-	void _set_wm_fullscreen(DisplayServerEnums::WindowID p_window, bool p_enabled, bool p_exclusive);
-	void _set_wm_maximized(DisplayServerEnums::WindowID p_window, bool p_enabled);
-	void _set_wm_minimized(DisplayServerEnums::WindowID p_window, bool p_enabled);
+	bool _window_maximize_check(WindowID p_window, const char *p_atom_name) const;
+	bool _window_fullscreen_check(WindowID p_window) const;
+	bool _window_minimize_check(WindowID p_window) const;
+	void _validate_fullscreen_on_map(WindowID p_window);
+	void _update_size_hints(WindowID p_window);
+	void _update_motif_wm_hints(WindowID p_window);
+	void _update_wm_state_hints(WindowID p_window);
+	void _set_wm_fullscreen(WindowID p_window, bool p_enabled, bool p_exclusive);
+	void _set_wm_maximized(WindowID p_window, bool p_enabled);
+	void _set_wm_minimized(WindowID p_window, bool p_enabled);
 
 	void _update_context(WindowData &wd);
 
-	DisplayServerEnums::Context context = DisplayServerEnums::CONTEXT_ENGINE;
+	Context context = CONTEXT_ENGINE;
 	bool swap_cancel_ok = false;
 
-	DisplayServerEnums::WindowID _get_focused_window_or_popup() const;
+	WindowID _get_focused_window_or_popup() const;
 	bool _window_focus_check();
 
-	void _send_window_event(const WindowData &wd, DisplayServerEnums::WindowEvent p_event);
+	void _send_window_event(const WindowData &wd, WindowEvent p_event);
 	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
 	void _dispatch_input_event(const Ref<InputEvent> &p_event);
 	void _set_input_focus(Window p_window, int p_revert_to);
@@ -381,11 +392,11 @@ class DisplayServerX11 : public DisplayServer {
 		Window process_window = 0;
 		bool visible = true;
 	};
-	HashMap<ProcessID, EmbeddedProcessData *> embedded_processes;
+	HashMap<OS::ProcessID, EmbeddedProcessData *> embedded_processes;
 
 	Point2i _get_window_position(Window p_window) const;
 	Rect2i _get_window_rect(Window p_window) const;
-	void _set_external_window_settings(Window p_window, Window p_parent_transient, DisplayServerEnums::WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect);
+	void _set_external_window_settings(Window p_window, Window p_parent_transient, WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect);
 	void _set_window_taskbar_pager_enabled(Window p_window, bool p_enabled);
 	Rect2i _screens_get_full_rect() const;
 
@@ -396,10 +407,10 @@ protected:
 
 public:
 	bool mouse_process_popups();
-	void popup_open(DisplayServerEnums::WindowID p_window);
-	void popup_close(DisplayServerEnums::WindowID p_window);
+	void popup_open(WindowID p_window);
+	void popup_close(WindowID p_window);
 
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
 #ifdef SPEECHD_ENABLED
@@ -419,16 +430,16 @@ public:
 	virtual Color get_accent_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 #endif
 
 	virtual void beep() const override;
 
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
 	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
 	virtual bool mouse_is_mode_override_enabled() const override;
 
@@ -446,88 +457,86 @@ public:
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
 	virtual int get_keyboard_focus_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual Color screen_get_pixel(const Point2i &p_position) const override;
-	virtual Ref<Image> screen_get_image(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Ref<Image> screen_get_image(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 
 #if defined(DBUS_ENABLED)
 	virtual void screen_set_keep_on(bool p_enable) override;
 	virtual bool screen_is_kept_on() const override;
 #endif
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
 
-	virtual DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID) override;
-	virtual void show_window(DisplayServerEnums::WindowID p_id) override;
-	virtual void delete_sub_window(DisplayServerEnums::WindowID p_id) override;
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override;
+	virtual void show_window(WindowID p_id) override;
+	virtual void delete_sub_window(WindowID p_id) override;
 
-	virtual DisplayServerEnums::WindowID window_get_active_popup() const override;
-	virtual void window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) override;
-	virtual Rect2i window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const override;
+	virtual WindowID window_get_active_popup() const override;
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override;
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void gl_window_make_current(DisplayServerEnums::WindowID p_window_id) override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual WindowID get_focused_window() const override;
 
-	virtual DisplayServerEnums::WindowID get_focused_window() const override;
-
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
 	virtual int accessibility_should_increase_contrast() const override;
 	virtual int accessibility_screen_reader_active() const override;
@@ -535,20 +544,20 @@ public:
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
-	virtual void window_start_drag(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) override;
+	virtual void window_start_drag(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window) override;
 
-	virtual Error embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
-	virtual Error request_close_embedded_process(ProcessID p_pid) override;
-	virtual Error remove_embedded_process(ProcessID p_pid) override;
-	virtual ProcessID get_focused_process_id() override;
+	virtual Error embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
+	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;
+	virtual Error remove_embedded_process(OS::ProcessID p_pid) override;
+	virtual OS::ProcessID get_focused_process_id() override;
 
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) override;
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) override;
 
 	virtual bool get_swap_cancel_ok() override;
 
@@ -567,19 +576,19 @@ public:
 	virtual void release_rendering_thread() override;
 	virtual void swap_buffers() override;
 
-	virtual void set_context(DisplayServerEnums::Context p_context) override;
+	virtual void set_context(Context p_context) override;
 
 	virtual bool is_window_transparency_available() const override;
 
 	virtual void set_native_icon(const String &p_filename) override;
 	virtual void set_icon(const Ref<Image> &p_icon) override;
 
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	static Vector<String> get_rendering_drivers_func();
 
 	static void register_x11_driver();
 
-	DisplayServerX11(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerX11(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerX11();
 };
 
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c
index c3488d32..3f4e0d4e 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c
@@ -64,7 +64,7 @@
 #define XcursorGetTheme XcursorGetTheme_dylibloader_orig_xcursor
 #define XcursorGetThemeCore XcursorGetThemeCore_dylibloader_orig_xcursor
 #define XcursorSetThemeCore XcursorSetThemeCore_dylibloader_orig_xcursor
-#include <thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h>
+#include "thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h"
 #undef XcursorImageCreate
 #undef XcursorImageDestroy
 #undef XcursorImagesCreate
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h
index 60211a26..eb425ba7 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h
@@ -66,7 +66,7 @@
 #define XcursorGetTheme XcursorGetTheme_dylibloader_orig_xcursor
 #define XcursorGetThemeCore XcursorGetThemeCore_dylibloader_orig_xcursor
 #define XcursorSetThemeCore XcursorSetThemeCore_dylibloader_orig_xcursor
-#include <thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h"
 #undef XcursorImageCreate
 #undef XcursorImageDestroy
 #undef XcursorImagesCreate
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c
index 501b8520..7b3d33fe 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c
@@ -5,7 +5,7 @@
 //
 #include <stdint.h>
 
-#include <thirdparty/linuxbsd_headers/X11/Xlib.h>
+#include "thirdparty/linuxbsd_headers/X11/Xlib.h"
 #define XShapeQueryExtension XShapeQueryExtension_dylibloader_orig_xext
 #define XShapeQueryVersion XShapeQueryVersion_dylibloader_orig_xext
 #define XShapeCombineRegion XShapeCombineRegion_dylibloader_orig_xext
@@ -17,8 +17,8 @@
 #define XShapeSelectInput XShapeSelectInput_dylibloader_orig_xext
 #define XShapeInputSelected XShapeInputSelected_dylibloader_orig_xext
 #define XShapeGetRectangles XShapeGetRectangles_dylibloader_orig_xext
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xext.h>
-#include <thirdparty/linuxbsd_headers/X11/extensions/shape.h>
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xext.h"
+#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h"
 #undef XShapeQueryExtension
 #undef XShapeQueryVersion
 #undef XShapeCombineRegion
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h
index 545665cd..41a3bfac 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h
@@ -18,8 +18,8 @@
 #define XShapeSelectInput XShapeSelectInput_dylibloader_orig_xext
 #define XShapeInputSelected XShapeInputSelected_dylibloader_orig_xext
 #define XShapeGetRectangles XShapeGetRectangles_dylibloader_orig_xext
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xext.h> // IWYU pragma: export.
-#include <thirdparty/linuxbsd_headers/X11/extensions/shape.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xext.h"
+#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h"
 #undef XShapeQueryExtension
 #undef XShapeQueryVersion
 #undef XShapeCombineRegion
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c
index 12c0dbf7..554d8775 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c
@@ -9,7 +9,7 @@
 #define XineramaQueryVersion XineramaQueryVersion_dylibloader_orig_xinerama
 #define XineramaIsActive XineramaIsActive_dylibloader_orig_xinerama
 #define XineramaQueryScreens XineramaQueryScreens_dylibloader_orig_xinerama
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h>
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h"
 #undef XineramaQueryExtension
 #undef XineramaQueryVersion
 #undef XineramaIsActive
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h
index b1b9cf08..59783eb8 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h
@@ -11,7 +11,7 @@
 #define XineramaQueryVersion XineramaQueryVersion_dylibloader_orig_xinerama
 #define XineramaIsActive XineramaIsActive_dylibloader_orig_xinerama
 #define XineramaQueryScreens XineramaQueryScreens_dylibloader_orig_xinerama
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h"
 #undef XineramaQueryExtension
 #undef XineramaQueryVersion
 #undef XineramaIsActive
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c
index 6eb80faf..3446bb8a 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c
@@ -39,7 +39,7 @@
 #define XIBarrierReleasePointers XIBarrierReleasePointers_dylibloader_orig_xinput2
 #define XIBarrierReleasePointer XIBarrierReleasePointer_dylibloader_orig_xinput2
 #define XIFreeDeviceInfo XIFreeDeviceInfo_dylibloader_orig_xinput2
-#include <thirdparty/linuxbsd_headers/X11/extensions/XInput2.h>
+#include "thirdparty/linuxbsd_headers/X11/extensions/XInput2.h"
 #undef XIQueryPointer
 #undef XIWarpPointer
 #undef XIDefineCursor
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h
index a635b278..128df4b1 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h
@@ -41,7 +41,7 @@
 #define XIBarrierReleasePointers XIBarrierReleasePointers_dylibloader_orig_xinput2
 #define XIBarrierReleasePointer XIBarrierReleasePointer_dylibloader_orig_xinput2
 #define XIFreeDeviceInfo XIFreeDeviceInfo_dylibloader_orig_xinput2
-#include <thirdparty/linuxbsd_headers/X11/extensions/XInput2.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/extensions/XInput2.h"
 #undef XIQueryPointer
 #undef XIWarpPointer
 #undef XIDefineCursor
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c
index cab1ec83..9affd47c 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c
@@ -609,9 +609,9 @@
 #define XkbApplyVirtualModChanges XkbApplyVirtualModChanges_dylibloader_orig_xlib
 #define XkbUpdateActionVirtualMods XkbUpdateActionVirtualMods_dylibloader_orig_xlib
 #define XkbUpdateKeyTypeVirtualMods XkbUpdateKeyTypeVirtualMods_dylibloader_orig_xlib
-#include <thirdparty/linuxbsd_headers/X11/Xlib.h>
-#include <thirdparty/linuxbsd_headers/X11/Xutil.h>
-#include <thirdparty/linuxbsd_headers/X11/XKBlib.h>
+#include "thirdparty/linuxbsd_headers/X11/Xlib.h"
+#include "thirdparty/linuxbsd_headers/X11/Xutil.h"
+#include "thirdparty/linuxbsd_headers/X11/XKBlib.h"
 #undef _Xmblen
 #undef XLoadQueryFont
 #undef XQueryFont
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h
index 6f647bbd..69802fd2 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h
@@ -611,9 +611,9 @@
 #define XkbApplyVirtualModChanges XkbApplyVirtualModChanges_dylibloader_orig_xlib
 #define XkbUpdateActionVirtualMods XkbUpdateActionVirtualMods_dylibloader_orig_xlib
 #define XkbUpdateKeyTypeVirtualMods XkbUpdateKeyTypeVirtualMods_dylibloader_orig_xlib
-#include <thirdparty/linuxbsd_headers/X11/Xlib.h> // IWYU pragma: export.
-#include <thirdparty/linuxbsd_headers/X11/Xutil.h> // IWYU pragma: export.
-#include <thirdparty/linuxbsd_headers/X11/XKBlib.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/Xlib.h"
+#include "thirdparty/linuxbsd_headers/X11/Xutil.h"
+#include "thirdparty/linuxbsd_headers/X11/XKBlib.h"
 #undef _Xmblen
 #undef XLoadQueryFont
 #undef XQueryFont
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c
index a63fe024..f33f35c1 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c
@@ -75,7 +75,7 @@
 #define XRRSetMonitor XRRSetMonitor_dylibloader_orig_xrandr
 #define XRRDeleteMonitor XRRDeleteMonitor_dylibloader_orig_xrandr
 #define XRRFreeMonitors XRRFreeMonitors_dylibloader_orig_xrandr
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h>
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h"
 #undef XRRQueryExtension
 #undef XRRQueryVersion
 #undef XRRGetScreenInfo
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h
index d41da5d5..12278f90 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h
@@ -77,7 +77,7 @@
 #define XRRSetMonitor XRRSetMonitor_dylibloader_orig_xrandr
 #define XRRDeleteMonitor XRRDeleteMonitor_dylibloader_orig_xrandr
 #define XRRFreeMonitors XRRFreeMonitors_dylibloader_orig_xrandr
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h"
 #undef XRRQueryExtension
 #undef XRRQueryVersion
 #undef XRRGetScreenInfo
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c b/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c
index f2a551e1..89e90bc9 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c
@@ -49,7 +49,7 @@
 #define XRenderCreateLinearGradient XRenderCreateLinearGradient_dylibloader_orig_xrender
 #define XRenderCreateRadialGradient XRenderCreateRadialGradient_dylibloader_orig_xrender
 #define XRenderCreateConicalGradient XRenderCreateConicalGradient_dylibloader_orig_xrender
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xrender.h>
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xrender.h"
 #undef XRenderQueryExtension
 #undef XRenderQueryVersion
 #undef XRenderQueryFormats
diff --git a/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h b/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h
index 252c4daa..339037e1 100644
--- a/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h
+++ b/engine/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h
@@ -51,7 +51,7 @@
 #define XRenderCreateLinearGradient XRenderCreateLinearGradient_dylibloader_orig_xrender
 #define XRenderCreateRadialGradient XRenderCreateRadialGradient_dylibloader_orig_xrender
 #define XRenderCreateConicalGradient XRenderCreateConicalGradient_dylibloader_orig_xrender
-#include <thirdparty/linuxbsd_headers/X11/extensions/Xrender.h> // IWYU pragma: export.
+#include "thirdparty/linuxbsd_headers/X11/extensions/Xrender.h"
 #undef XRenderQueryExtension
 #undef XRenderQueryVersion
 #undef XRenderQueryFormats
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11.cpp b/engine/platform/linuxbsd/x11/gl_manager_x11.cpp
index afbd4c4a..151730b9 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11.cpp
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11.cpp
@@ -32,18 +32,11 @@
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/os/os.h"
-#include "servers/display/display_server.h"
-
-#include <thirdparty/glad/glad/glx.h>
-
-#ifdef SOWRAP_ENABLED
-#include "dynwrappers/xrender-so_wrap.h"
-#else
-#include <X11/extensions/Xrender.h>
-#endif
+#include "thirdparty/glad/glad/glx.h"
 
 #include <unistd.h>
+#include <cstdio>
+#include <cstdlib>
 
 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
@@ -202,7 +195,6 @@ Error GLManager_X11::_create_context(GLDisplay &gl_display) {
 	// for later creating windows using this display
 	if (vi) {
 		gl_display.x_vi = *vi;
-		gl_display.x_fbconfig = fbconfig;
 	}
 
 	XFree(vi);
@@ -229,7 +221,7 @@ Error GLManager_X11::open_display(Display *p_display) {
 	}
 }
 
-Error GLManager_X11::window_create(DisplayServerEnums::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) {
+Error GLManager_X11::window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) {
 	// make sure vector is big enough...
 	// we can mirror the external vector, it is simpler
 	// to keep the IDs identical for fast lookup
@@ -272,12 +264,12 @@ void GLManager_X11::_internal_set_current_window(GLWindow *p_win) {
 	_x_windisp.x11_display = disp.x11_display;
 }
 
-void GLManager_X11::window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {
+void GLManager_X11::window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
 	get_window(p_window_id).width = p_width;
 	get_window(p_window_id).height = p_height;
 }
 
-void GLManager_X11::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void GLManager_X11::window_destroy(DisplayServer::WindowID p_window_id) {
 	GLWindow &win = get_window(p_window_id);
 	win.in_use = false;
 
@@ -299,7 +291,7 @@ void GLManager_X11::release_current() {
 	_current_window = nullptr;
 }
 
-void GLManager_X11::window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void GLManager_X11::window_make_current(DisplayServer::WindowID p_window_id) {
 	if (p_window_id == -1) {
 		return;
 	}
@@ -334,7 +326,7 @@ void GLManager_X11::swap_buffers() {
 
 	// On X11, when enabled, transparency is always active, so clear alpha manually.
 	if (OS::get_singleton()->is_layered_allowed()) {
-		if (!DisplayServer::get_singleton()->window_get_flag(DisplayServerEnums::WINDOW_FLAG_TRANSPARENT, _current_window->window_id)) {
+		if (!DisplayServer::get_singleton()->window_get_flag(DisplayServer::WINDOW_FLAG_TRANSPARENT, _current_window->window_id)) {
 			glColorMask(false, false, false, true);
 			glClearColor(0, 0, 0, 1);
 			glClear(GL_COLOR_BUFFER_BIT);
@@ -379,7 +371,7 @@ bool GLManager_X11::is_using_vsync() const {
 	return use_vsync;
 }
 
-void *GLManager_X11::get_glx_context(DisplayServerEnums::WindowID p_window_id) {
+void *GLManager_X11::get_glx_context(DisplayServer::WindowID p_window_id) {
 	if (p_window_id == -1) {
 		return nullptr;
 	}
@@ -390,28 +382,6 @@ void *GLManager_X11::get_glx_context(DisplayServerEnums::WindowID p_window_id) {
 	return (void *)disp.context->glx_context;
 }
 
-VisualID GLManager_X11::get_glx_visualid(DisplayServerEnums::WindowID p_window_id) {
-	if (p_window_id == -1) {
-		return (VisualID)0;
-	}
-
-	const GLWindow &win = _windows[p_window_id];
-	const GLDisplay &disp = get_display(win.gldisplay_id);
-
-	return disp.x_vi.visualid;
-}
-
-void *GLManager_X11::get_glx_fbconfig(DisplayServerEnums::WindowID p_window_id) {
-	if (p_window_id == -1) {
-		return nullptr;
-	}
-
-	const GLWindow &win = _windows[p_window_id];
-	const GLDisplay &disp = get_display(win.gldisplay_id);
-
-	return disp.x_fbconfig;
-}
-
 GLManager_X11::GLManager_X11(const Vector2i &p_size, ContextType p_context_type) {
 	context_type = p_context_type;
 
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11.h b/engine/platform/linuxbsd/x11/gl_manager_x11.h
index 77e370e5..3bd956b2 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11.h
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11.h
@@ -32,15 +32,23 @@
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/math/vector2i.h"
+#include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dynwrappers/xlib-so_wrap.h"
+
+#include "dynwrappers/xext-so_wrap.h"
+#include "dynwrappers/xrender-so_wrap.h"
 #else
+#include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/shape.h>
 #endif
 
 struct GLManager_X11_Private;
@@ -57,7 +65,7 @@ private:
 		bool in_use = false;
 
 		// the external ID .. should match the GL window number .. unused I think
-		DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
 		int width = 0;
 		int height = 0;
 		::Window x11_window;
@@ -70,7 +78,6 @@ private:
 		GLManager_X11_Private *context = nullptr;
 		::Display *x11_display = nullptr;
 		XVisualInfo x_vi = {};
-		void *x_fbconfig = nullptr;
 	};
 
 	// just for convenience, window and display struct
@@ -104,23 +111,21 @@ private:
 
 public:
 	XVisualInfo get_vi(Display *p_display, Error &r_error);
-	Error window_create(DisplayServerEnums::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height);
-	void window_destroy(DisplayServerEnums::WindowID p_window_id);
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height);
+	Error window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height);
+	void window_destroy(DisplayServer::WindowID p_window_id);
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);
 
 	void release_current();
 	void swap_buffers();
 
-	void window_make_current(DisplayServerEnums::WindowID p_window_id);
+	void window_make_current(DisplayServer::WindowID p_window_id);
 
 	Error initialize(Display *p_display);
 
 	void set_use_vsync(bool p_use);
 	bool is_using_vsync() const;
 
-	void *get_glx_context(DisplayServerEnums::WindowID p_window_id);
-	void *get_glx_fbconfig(DisplayServerEnums::WindowID p_window_id);
-	VisualID get_glx_visualid(DisplayServerEnums::WindowID p_window_id);
+	void *get_glx_context(DisplayServer::WindowID p_window_id);
 
 	Error open_display(Display *p_display);
 	GLManager_X11(const Vector2i &p_size, ContextType p_context_type);
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.cpp b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.cpp
index 22d7fba7..23ba8d8b 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.cpp
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.cpp
@@ -32,6 +32,9 @@
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
+#include <cstdio>
+#include <cstdlib>
+
 const char *GLManagerEGL_X11::_get_platform_extension_name() const {
 	return "EGL_KHR_platform_x11";
 }
@@ -57,4 +60,4 @@ Vector<EGLint> GLManagerEGL_X11::_get_platform_context_attribs() const {
 	return ret;
 }
 
-#endif // X11_ENABLED && GLES3_ENABLED
+#endif // WINDOWS_ENABLED && GLES3_ENABLED
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
index 253709be..43d89ab1 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
@@ -32,8 +32,12 @@
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/os/os.h"
+#include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
+
+#include <X11/Xlib.h>
 
 class GLManagerEGL_X11 : public EGLManager {
 private:
@@ -44,7 +48,7 @@ private:
 	virtual Vector<EGLint> _get_platform_context_attribs() const override;
 
 public:
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {}
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {}
 
 	GLManagerEGL_X11() {}
 	~GLManagerEGL_X11() {}
diff --git a/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp b/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp
index 4be4f0e5..cbcf0785 100644
--- a/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp
+++ b/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp
@@ -32,7 +32,7 @@
 
 #include "rendering_context_driver_vulkan_x11.h"
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 const char *RenderingContextDriverVulkanX11::_get_platform_surface_extension() const {
 	return VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
diff --git a/engine/platform/linuxbsd/xkbcommon-so_wrap.h b/engine/platform/linuxbsd/xkbcommon-so_wrap.h
index b18aff5e..4ae69fdf 100644
--- a/engine/platform/linuxbsd/xkbcommon-so_wrap.h
+++ b/engine/platform/linuxbsd/xkbcommon-so_wrap.h
@@ -97,9 +97,9 @@
 #define xkb_compose_state_get_status xkb_compose_state_get_status_dylibloader_orig_xkbcommon
 #define xkb_compose_state_get_utf8 xkb_compose_state_get_utf8_dylibloader_orig_xkbcommon
 #define xkb_compose_state_get_one_sym xkb_compose_state_get_one_sym_dylibloader_orig_xkbcommon
-#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h" // IWYU pragma: export.
-#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h" // IWYU pragma: export.
-#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h" // IWYU pragma: export.
+#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h"
+#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h"
+#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h"
 #undef xkb_keysym_get_name
 #undef xkb_keysym_from_name
 #undef xkb_keysym_to_utf8
diff --git a/engine/platform/macos/SCsub b/engine/platform/macos/SCsub
index d801c578..883bd531 100644
--- a/engine/platform/macos/SCsub
+++ b/engine/platform/macos/SCsub
@@ -26,16 +26,13 @@ files = [
     "dir_access_macos.mm",
     "tts_macos.mm",
     "rendering_context_driver_vulkan_macos.mm",
+    "gl_manager_macos_angle.mm",
     "gl_manager_macos_legacy.mm",
-    "godot_progress_view.mm",
 ]
 
-if env["angle"]:
-    files += ["gl_manager_macos_angle.mm"]
-
 if env.editor_build:
     files += [
-        "display_server_macos_embedded.mm",
+        "display_server_embedded.mm",
         "embedded_debugger.mm",
         "embedded_gl_manager.mm",
         "editor/embedded_game_view_plugin.mm",
diff --git a/engine/platform/macos/crash_handler_macos.mm b/engine/platform/macos/crash_handler_macos.mm
index a072c1a3..adebc024 100644
--- a/engine/platform/macos/crash_handler_macos.mm
+++ b/engine/platform/macos/crash_handler_macos.mm
@@ -40,8 +40,6 @@
 
 #include <unistd.h>
 
-#include <cstdio>
-
 #if defined(DEBUG_ENABLED)
 #define CRASH_HANDLER_ENABLED 1
 #endif
@@ -50,12 +48,12 @@
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <execinfo.h>
-#import <mach-o/dyld.h>
-#import <mach-o/getsect.h>
-
 #include <csignal>
 #include <cstdlib>
 
+#import <mach-o/dyld.h>
+#import <mach-o/getsect.h>
+
 static uint64_t load_address() {
 	char full_path[1024];
 	uint32_t size = sizeof(full_path);
@@ -137,8 +135,6 @@ static void handle_crash(int sig) {
 		args.push_back(str);
 	}
 
-	print_error(vformat("Load address: %x\n", (uint64_t)load_addr));
-
 	// Single execution of atos with all addresses.
 	String out;
 	int ret;
@@ -178,7 +174,7 @@ static void handle_crash(int sig) {
 				output = fname;
 			}
 
-			print_error(vformat("[%d] %x - %s", (int64_t)i, (uint64_t)bt_buffer[i], output));
+			print_error(vformat("[%d] %s", (int64_t)i, output));
 		}
 
 		if (strings) {
@@ -189,7 +185,7 @@ static void handle_crash(int sig) {
 		char **strings = backtrace_symbols(bt_buffer, size);
 		if (strings) {
 			for (size_t i = 0; i < size; i++) {
-				print_error(vformat("[%d] %x - %s", (int64_t)i, (uint64_t)bt_buffer[i], strings[i]));
+				print_error(vformat("[%d] %s", (int64_t)i, strings[i]));
 			}
 			free(strings);
 		}
diff --git a/engine/platform/macos/detect.py b/engine/platform/macos/detect.py
index df737588..cfedad09 100644
--- a/engine/platform/macos/detect.py
+++ b/engine/platform/macos/detect.py
@@ -27,22 +27,6 @@ def can_build():
 def get_opts():
     from SCons.Variables import BoolVariable, EnumVariable
 
-    # Dependencies folder.
-    deps_folder = os.getenv("LOCALAPPDATA")
-    if deps_folder:
-        deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
-    else:
-        # Cross-compiling, the deps install script puts things in `bin`.
-        # Getting an absolute path to it is a bit hacky in Python.
-        try:
-            import inspect
-
-            caller_frame = inspect.stack()[1]
-            caller_script_dir = os.path.dirname(os.path.abspath(caller_frame[1]))
-            deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
-        except Exception:  # Give up.
-            deps_folder = ""
-
     return [
         ("osxcross_sdk", "OSXCross SDK version", "darwin16"),
         ("SWIFT_FRONTEND", "Path to the swift-frontend binary", ""),
@@ -53,17 +37,7 @@ def get_opts():
         BoolVariable("use_asan", "Use LLVM/GCC compiler address sanitizer (ASAN)", False),
         BoolVariable("use_tsan", "Use LLVM/GCC compiler thread sanitizer (TSAN)", False),
         BoolVariable("use_coverage", "Use instrumentation codes in the binary (e.g. for code coverage)", False),
-        # Screen reader support.
-        (
-            "accesskit_sdk_path",
-            "Path to the AccessKit C SDK",
-            os.path.join(deps_folder, "accesskit"),
-        ),
-        (
-            "angle_libs",
-            "Path to the ANGLE static libraries",
-            os.path.join(deps_folder, "angle"),
-        ),
+        ("angle_libs", "Path to the ANGLE static libraries", ""),
         (
             "bundle_sign_identity",
             "The 'Full Name', 'Common Name' or SHA-1 hash of the signing identity used to sign editor .app bundle.",
@@ -116,7 +90,7 @@ def configure(env: "SConsEnvironment"):
         env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])
 
     env.Append(CCFLAGS=["-ffp-contract=off"])
-    env.Append(CCFLAGS=["-fobjc-arc", "-fvisibility=hidden"])
+    env.Append(CCFLAGS=["-fobjc-arc"])
 
     cc_version = get_compiler_version(env)
     cc_version_major = cc_version["apple_major"]
@@ -180,9 +154,9 @@ def configure(env: "SConsEnvironment"):
 
     if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]:
         env.extra_suffix += ".san"
+        env.Append(CPPDEFINES=["SANITIZERS_ENABLED"])
 
         if env["use_ubsan"]:
-            env.Append(CPPDEFINES=["UBSAN_ENABLED"])
             env.Append(
                 CCFLAGS=[
                     "-fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin"
@@ -192,12 +166,10 @@ def configure(env: "SConsEnvironment"):
             env.Append(CCFLAGS=["-fsanitize=nullability-return,nullability-arg,function,nullability-assign"])
 
         if env["use_asan"]:
-            env.Append(CPPDEFINES=["ASAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=address,pointer-subtract,pointer-compare"])
             env.Append(LINKFLAGS=["-fsanitize=address"])
 
         if env["use_tsan"]:
-            env.Append(CPPDEFINES=["TSAN_ENABLED"])
             env.Append(CCFLAGS=["-fsanitize=thread"])
             env.Append(LINKFLAGS=["-fsanitize=thread"])
 
@@ -213,23 +185,16 @@ def configure(env: "SConsEnvironment"):
     ## Dependencies
 
     if env["accesskit"]:
-        if os.path.exists(env["accesskit_sdk_path"]):
+        if env["accesskit_sdk_path"] != "":
             env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
             if env["arch"] == "arm64" or env["arch"] == "universal":
                 env.Append(LINKFLAGS=["-L" + env["accesskit_sdk_path"] + "/lib/macos/arm64/static/"])
             if env["arch"] == "x86_64" or env["arch"] == "universal":
                 env.Append(LINKFLAGS=["-L" + env["accesskit_sdk_path"] + "/lib/macos/x86_64/static/"])
             env.Append(LINKFLAGS=["-laccesskit"])
-            env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
         else:
-            print_warning(
-                "The screen reader support driver requires dependencies to be installed.\n"
-                f"You can install them by running `python3 {os.path.join('misc', 'scripts', 'install_accesskit.py')}`.\n"
-                "See the documentation for more information:\n"
-                "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_macos.html\n"
-                "Alternatively, disable this driver by compiling with `accesskit=no` explicitly."
-            )
-            env["accesskit"] = False
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
 
     if env["builtin_libtheora"] and env["arch"] == "x86_64":
         env["x86_libtheora_opt_gcc"] = True
@@ -282,25 +247,13 @@ def configure(env: "SConsEnvironment"):
 
     if env["opengl3"]:
         env.Append(CPPDEFINES=["GLES3_ENABLED"])
-        if env["angle"]:
-            angle_path = env["angle_libs"] + "-" + env["arch"] + "-macos"
-            print(angle_path)
-            if os.path.exists(angle_path):
-                env.Prepend(CPPPATH=["#thirdparty/angle/include"])
-                env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"])
-                env.Append(LINKFLAGS=["-L" + angle_path])
-                env.Append(LINKFLAGS=["-lANGLE.macos." + env["arch"]])
-                env.Append(LINKFLAGS=["-lEGL.macos." + env["arch"]])
-                env.Append(LINKFLAGS=["-lGLES.macos." + env["arch"]])
-            else:
-                print_warning(
-                    "The ANGLE rendering driver requires dependencies to be installed.\n"
-                    f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_angle.py')}`.\n"
-                    "See the documentation for more information:\n"
-                    "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
-                    "Alternatively, disable this driver by compiling with `angle=no` explicitly."
-                )
-                env["angle"] = False
+        if env["angle_libs"] != "":
+            env.AppendUnique(CPPDEFINES=["EGL_STATIC"])
+            env.Append(LINKFLAGS=["-L" + env["angle_libs"]])
+            env.Append(LINKFLAGS=["-lANGLE.macos." + env["arch"]])
+            env.Append(LINKFLAGS=["-lEGL.macos." + env["arch"]])
+            env.Append(LINKFLAGS=["-lGLES.macos." + env["arch"]])
+        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
 
     env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
 
@@ -338,5 +291,5 @@ def configure(env: "SConsEnvironment"):
                 sys.exit(255)
 
     if len(extra_frameworks) > 0:
-        frameworks = [item for key in sorted(extra_frameworks) for item in ["-framework", key]]
+        frameworks = [item for key in extra_frameworks for item in ["-framework", key]]
         env.Append(LINKFLAGS=frameworks)
diff --git a/engine/platform/macos/dir_access_macos.h b/engine/platform/macos/dir_access_macos.h
index acd889ae..d69aa0fd 100644
--- a/engine/platform/macos/dir_access_macos.h
+++ b/engine/platform/macos/dir_access_macos.h
@@ -32,6 +32,7 @@
 
 #if defined(UNIX_ENABLED)
 
+#include "core/io/dir_access.h"
 #include "drivers/unix/dir_access_unix.h"
 
 #include <dirent.h>
diff --git a/engine/platform/macos/dir_access_macos.mm b/engine/platform/macos/dir_access_macos.mm
index 4d691025..b9aa4d9c 100644
--- a/engine/platform/macos/dir_access_macos.mm
+++ b/engine/platform/macos/dir_access_macos.mm
@@ -34,11 +34,11 @@
 
 #include "core/config/project_settings.h"
 
+#include <sys/mount.h>
+#include <cerrno>
+
 #import <AppKit/NSWorkspace.h>
 #import <Foundation/Foundation.h>
-#include <sys/mount.h>
-
-#include <cerrno>
 
 String DirAccessMacOS::get_filesystem_type() const {
 	struct statfs fs;
diff --git a/engine/platform/macos/display_server_embedded.h b/engine/platform/macos/display_server_embedded.h
new file mode 100644
index 00000000..748f185f
--- /dev/null
+++ b/engine/platform/macos/display_server_embedded.h
@@ -0,0 +1,228 @@
+/**************************************************************************/
+/*  display_server_embedded.h                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "display_server_macos_base.h"
+
+@class CAContext;
+@class CALayer;
+class GLManagerEmbedded;
+class RenderingContextDriver;
+class RenderingDevice;
+
+struct DisplayServerEmbeddedState {
+	/*! Default to a scale of 2.0, which is the most common. */
+	float screen_max_scale = 2.0f;
+	float screen_dpi = 96.0f;
+	/*! Scale for window displaying embedded content */
+	float screen_window_scale = 2.0f;
+	/*! The display ID of the window which is displaying the embedded process content. */
+	uint32_t display_id = -1;
+
+	void serialize(PackedByteArray &r_data);
+	Error deserialize(const PackedByteArray &p_data);
+
+	_FORCE_INLINE_ bool operator==(const DisplayServerEmbeddedState &p_other) const {
+		return screen_max_scale == p_other.screen_max_scale && screen_dpi == p_other.screen_dpi && display_id == p_other.display_id;
+	}
+};
+
+class DisplayServerEmbedded : public DisplayServerMacOSBase {
+	GDSOFTCLASS(DisplayServerEmbedded, DisplayServerMacOSBase)
+
+	DisplayServerEmbeddedState state;
+
+	NativeMenu *native_menu = nullptr;
+
+	HashMap<WindowID, ObjectID> window_attached_instance_id;
+
+	HashMap<WindowID, Callable> window_event_callbacks;
+	HashMap<WindowID, Callable> window_resize_callbacks;
+	HashMap<WindowID, Callable> input_event_callbacks;
+	HashMap<WindowID, Callable> input_text_callbacks;
+
+	WindowID window_id_counter = MAIN_WINDOW_ID;
+
+	bool transparent = false;
+
+	CAContext *ca_context = nullptr;
+	// Either be a CAMetalLayer or a CALayer depending on the rendering driver.
+	CALayer *layer = nullptr;
+#ifdef GLES3_ENABLED
+	GLManagerEmbedded *gl_manager = nullptr;
+#endif
+
+#if defined(RD_ENABLED)
+	RenderingContextDriver *rendering_context = nullptr;
+	RenderingDevice *rendering_device = nullptr;
+#endif
+
+	String rendering_driver;
+
+	Point2i ime_last_position;
+	Point2i im_selection;
+	String im_text;
+
+	MouseMode mouse_mode = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
+	bool mouse_mode_override_enabled = false;
+	void _mouse_update_mode();
+
+	CursorShape cursor_shape = CURSOR_ARROW;
+
+	struct Joy {
+		String name;
+		uint64_t timestamp = 0;
+
+		Joy() = default;
+		Joy(const String &p_name) :
+				name(p_name) {}
+	};
+	HashMap<int, Joy> joysticks;
+
+public:
+	static void register_embedded_driver();
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
+	static Vector<String> get_rendering_drivers_func();
+
+	void _window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID);
+
+	// MARK: - Events
+
+	virtual void process_events() override;
+
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+
+	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
+	void send_input_event(const Ref<InputEvent> &p_event, DisplayServer::WindowID p_id = MAIN_WINDOW_ID) const;
+	void send_input_text(const String &p_text, DisplayServer::WindowID p_id = MAIN_WINDOW_ID) const;
+	void send_window_event(DisplayServer::WindowEvent p_event, DisplayServer::WindowID p_id = MAIN_WINDOW_ID) const;
+	void _window_callback(const Callable &p_callable, const Variant &p_arg) const;
+
+	virtual void beep() const override;
+
+	// MARK: - Mouse
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
+	virtual bool mouse_is_mode_override_enabled() const override;
+
+	virtual void warp_mouse(const Point2i &p_position) override;
+	virtual Point2i mouse_get_position() const override;
+	virtual BitField<MouseButtonMask> mouse_get_button_state() const override;
+
+	// MARK: - Window
+
+	virtual bool has_feature(Feature p_feature) const override;
+	virtual String get_name() const override;
+
+	virtual int get_screen_count() const override;
+	virtual int get_primary_screen() const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
+
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
+
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
+
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
+
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
+
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual float screen_get_max_scale() const override;
+
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual bool can_any_window_draw() const override;
+
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
+
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
+
+	void update_im_text(const Point2i &p_selection, const String &p_text);
+	virtual Point2i ime_get_selection() const override;
+	virtual String ime_get_text() const override;
+
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
+
+	void set_state(const DisplayServerEmbeddedState &p_state);
+	virtual void swap_buffers() override;
+
+	DisplayServerEmbedded(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, Error &r_error);
+	~DisplayServerEmbedded();
+};
diff --git a/engine/platform/macos/display_server_macos_embedded.mm b/engine/platform/macos/display_server_embedded.mm
similarity index 56%
rename from engine/platform/macos/display_server_macos_embedded.mm
rename to engine/platform/macos/display_server_embedded.mm
index b4fb1af5..ce208314 100644
--- a/engine/platform/macos/display_server_macos_embedded.mm
+++ b/engine/platform/macos/display_server_embedded.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  display_server_macos_embedded.mm                                      */
+/*  display_server_embedded.mm                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#import "display_server_macos_embedded.h"
+#import "display_server_embedded.h"
 
 #if defined(GLES3_ENABLED)
 #import "embedded_gl_manager.h"
@@ -54,14 +54,10 @@
 
 #import "core/config/project_settings.h"
 #import "core/debugger/engine_debugger.h"
-#import "core/input/input.h"
-#import "core/input/input_event.h"
 #import "core/io/marshalls.h"
 #import "core/os/main_loop.h"
-#import "core/os/os.h"
-#import "servers/display/native_menu.h"
 
-DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, Error &r_error) {
+DisplayServerEmbedded::DisplayServerEmbedded(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, Error &r_error) {
 	EmbeddedDebugger::initialize(this);
 
 	r_error = OK; // default to OK
@@ -82,7 +78,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 	// Metal rendering driver not available on Intel.
 	if (rendering_driver == "metal") {
 		rendering_driver = "vulkan";
-		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 	}
 #endif
 	if (rendering_driver == "vulkan") {
@@ -104,8 +100,8 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
 				WARN_PRINT("Your device does not seem to support MoltenVK or Metal, switching to OpenGL 3.");
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else
 #endif
 			{
@@ -120,7 +116,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 	if (rendering_driver == "opengl3_angle") {
 		WARN_PRINT("ANGLE not supported for embedded display, switching to native OpenGL.");
 		rendering_driver = "opengl3";
-		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 	}
 
 	if (rendering_driver == "opengl3") {
@@ -140,7 +136,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 		if (err != OK) {
 			ERR_FAIL_MSG("Could not create OpenGL context.");
 		}
-		gl_manager->set_vsync_enabled(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager->set_vsync_enabled(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 #endif
 
@@ -164,7 +160,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 #endif
 #ifdef METAL_ENABLED
 		if (rendering_driver == "metal") {
-			wpd.metal.layer = (__bridge CA::MetalLayer *)layer;
+			wpd.metal.layer = (CAMetalLayer *)layer;
 		}
 #endif
 		Error err = rendering_context->window_create(window_id_counter, &wpd);
@@ -187,8 +183,8 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		rendering_device = memnew(RenderingDevice);
-		rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID);
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->initialize(rendering_context, MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
@@ -198,7 +194,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 	layer.contentsScale = scale;
 	layer.magnificationFilter = kCAFilterNearest;
 	layer.minificationFilter = kCAFilterNearest;
-	transparent = ((p_flags & DisplayServerEnums::WINDOW_FLAG_TRANSPARENT_BIT) == DisplayServerEnums::WINDOW_FLAG_TRANSPARENT_BIT);
+	transparent = ((p_flags & WINDOW_FLAG_TRANSPARENT_BIT) == WINDOW_FLAG_TRANSPARENT_BIT);
 	layer.opaque = !(OS::get_singleton()->is_layered_allowed() && transparent);
 	layer.actions = @{ @"contents" : [NSNull null] }; // Disable implicit animations for contents.
 	// AppKit frames, bounds and positions are always in points.
@@ -216,7 +212,7 @@ DisplayServerMacOSEmbedded::DisplayServerMacOSEmbedded(const String &p_rendering
 	}
 }
 
-DisplayServerMacOSEmbedded::~DisplayServerMacOSEmbedded() {
+DisplayServerEmbedded::~DisplayServerEmbedded() {
 	if (native_menu) {
 		memdelete(native_menu);
 		native_menu = nullptr;
@@ -244,11 +240,11 @@ DisplayServerMacOSEmbedded::~DisplayServerMacOSEmbedded() {
 #endif
 }
 
-DisplayServer *DisplayServerMacOSEmbedded::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t /* p_parent_window */, Error &r_error) {
-	return memnew(DisplayServerMacOSEmbedded(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, r_error));
+DisplayServer *DisplayServerEmbedded::create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t /* p_parent_window */, Error &r_error) {
+	return memnew(DisplayServerEmbedded(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, r_error));
 }
 
-Vector<String> DisplayServerMacOSEmbedded::get_rendering_drivers_func() {
+Vector<String> DisplayServerEmbedded::get_rendering_drivers_func() {
 	Vector<String> drivers;
 
 #if defined(VULKAN_ENABLED)
@@ -264,23 +260,74 @@ Vector<String> DisplayServerMacOSEmbedded::get_rendering_drivers_func() {
 	return drivers;
 }
 
-void DisplayServerMacOSEmbedded::register_embedded_driver() {
+void DisplayServerEmbedded::register_embedded_driver() {
 	register_create_function("embedded", create_func, get_rendering_drivers_func);
 }
 
+void DisplayServerEmbedded::beep() const {
+	NSBeep();
+}
+
 // MARK: - Mouse
 
-void DisplayServerMacOSEmbedded::_mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_mode, DisplayServerEnums::MouseMode p_new_mode) {
-	EngineDebugger::get_singleton()->send_message("game_view:mouse_set_mode", { p_new_mode });
+void DisplayServerEmbedded::_mouse_update_mode() {
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+			? mouse_mode_override
+			: mouse_mode_base;
+
+	if (wanted_mouse_mode == mouse_mode) {
+		return;
+	}
+
+	EngineDebugger::get_singleton()->send_message("game_view:mouse_set_mode", { wanted_mouse_mode });
+
+	mouse_mode = wanted_mouse_mode;
 }
 
-void DisplayServerMacOSEmbedded::warp_mouse(const Point2i &p_position) {
+void DisplayServerEmbedded::mouse_set_mode(MouseMode p_mode) {
+	if (p_mode == mouse_mode_base) {
+		return;
+	}
+	mouse_mode_base = p_mode;
+	_mouse_update_mode();
+}
+
+DisplayServerEmbedded::MouseMode DisplayServerEmbedded::mouse_get_mode() const {
+	return mouse_mode;
+}
+
+void DisplayServerEmbedded::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
+	if (p_mode == mouse_mode_override) {
+		return;
+	}
+	mouse_mode_override = p_mode;
+	_mouse_update_mode();
+}
+
+DisplayServer::MouseMode DisplayServerEmbedded::mouse_get_mode_override() const {
+	return mouse_mode_override;
+}
+
+void DisplayServerEmbedded::mouse_set_mode_override_enabled(bool p_override_enabled) {
+	if (p_override_enabled == mouse_mode_override_enabled) {
+		return;
+	}
+	mouse_mode_override_enabled = p_override_enabled;
+	_mouse_update_mode();
+}
+
+bool DisplayServerEmbedded::mouse_is_mode_override_enabled() const {
+	return mouse_mode_override_enabled;
+}
+
+void DisplayServerEmbedded::warp_mouse(const Point2i &p_position) {
 	_THREAD_SAFE_METHOD_
 	Input::get_singleton()->set_mouse_position(p_position);
 	EngineDebugger::get_singleton()->send_message("game_view:warp_mouse", { p_position });
 }
 
-Point2i DisplayServerMacOSEmbedded::mouse_get_position() const {
+Point2i DisplayServerEmbedded::mouse_get_position() const {
 	_THREAD_SAFE_METHOD_
 
 	const NSPoint mouse_pos = [NSEvent mouseLocation];
@@ -300,7 +347,7 @@ Point2i DisplayServerMacOSEmbedded::mouse_get_position() const {
 	return Vector2i();
 }
 
-BitField<MouseButtonMask> DisplayServerMacOSEmbedded::mouse_get_button_state() const {
+BitField<MouseButtonMask> DisplayServerEmbedded::mouse_get_button_state() const {
 	BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 
 	NSUInteger buttons = [NSEvent pressedMouseButtons];
@@ -324,68 +371,68 @@ BitField<MouseButtonMask> DisplayServerMacOSEmbedded::mouse_get_button_state() c
 
 // MARK: Events
 
-void DisplayServerMacOSEmbedded::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	window_resize_callbacks[p_window] = p_callable;
 }
 
-void DisplayServerMacOSEmbedded::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	window_event_callbacks[p_window] = p_callable;
 }
-void DisplayServerMacOSEmbedded::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	input_event_callbacks[p_window] = p_callable;
 }
 
-void DisplayServerMacOSEmbedded::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	input_text_callbacks[p_window] = p_callable;
 }
 
-void DisplayServerMacOSEmbedded::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	// Not supported
 }
 
-void DisplayServerMacOSEmbedded::process_events() {
+void DisplayServerEmbedded::process_events() {
 	Input *input = Input::get_singleton();
 	input->flush_buffered_events();
 }
 
-void DisplayServerMacOSEmbedded::_dispatch_input_events(const Ref<InputEvent> &p_event) {
+void DisplayServerEmbedded::_dispatch_input_events(const Ref<InputEvent> &p_event) {
 	Ref<InputEventFromWindow> event_from_window = p_event;
-	DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	WindowID window_id = INVALID_WINDOW_ID;
 	if (event_from_window.is_valid()) {
 		window_id = event_from_window->get_window_id();
 	}
-	DisplayServerMacOSEmbedded *ds = (DisplayServerMacOSEmbedded *)DisplayServer::get_singleton();
+	DisplayServerEmbedded *ds = (DisplayServerEmbedded *)DisplayServer::get_singleton();
 	ds->send_input_event(p_event, window_id);
 }
 
-void DisplayServerMacOSEmbedded::send_input_event(const Ref<InputEvent> &p_event, DisplayServerEnums::WindowID p_id) const {
-	if (p_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+void DisplayServerEmbedded::send_input_event(const Ref<InputEvent> &p_event, WindowID p_id) const {
+	if (p_id != INVALID_WINDOW_ID) {
 		const Callable *cb = input_event_callbacks.getptr(p_id);
 		if (cb) {
 			_window_callback(*cb, p_event);
 		}
 	} else {
-		for (const KeyValue<DisplayServerEnums::WindowID, Callable> &E : input_event_callbacks) {
+		for (const KeyValue<WindowID, Callable> &E : input_event_callbacks) {
 			_window_callback(E.value, p_event);
 		}
 	}
 }
 
-void DisplayServerMacOSEmbedded::send_input_text(const String &p_text, DisplayServerEnums::WindowID p_id) const {
+void DisplayServerEmbedded::send_input_text(const String &p_text, WindowID p_id) const {
 	const Callable *cb = input_text_callbacks.getptr(p_id);
 	if (cb) {
 		_window_callback(*cb, p_text);
 	}
 }
 
-void DisplayServerMacOSEmbedded::send_window_event_by_id(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_id) const {
+void DisplayServerEmbedded::send_window_event(DisplayServer::WindowEvent p_event, WindowID p_id) const {
 	const Callable *cb = window_event_callbacks.getptr(p_id);
 	if (cb) {
 		_window_callback(*cb, int(p_event));
 	}
 }
 
-void DisplayServerMacOSEmbedded::_window_callback(const Callable &p_callable, const Variant &p_arg) const {
+void DisplayServerEmbedded::_window_callback(const Callable &p_callable, const Variant &p_arg) const {
 	if (p_callable.is_valid()) {
 		p_callable.call(p_arg);
 	}
@@ -393,45 +440,48 @@ void DisplayServerMacOSEmbedded::_window_callback(const Callable &p_callable, co
 
 // MARK: -
 
-bool DisplayServerMacOSEmbedded::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerEmbedded::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-			// case DisplayServerEnums::FEATURE_HIDPI:
-			// case DisplayServerEnums::FEATURE_ICON:
-			// case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_HDR_OUTPUT:
-		case DisplayServerEnums::FEATURE_MOUSE_WARP:
-			// case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-			// case DisplayServerEnums::FEATURE_NATIVE_ICON:
-			// case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-			// case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-			// case DisplayServerEnums::FEATURE_ORIENTATION:
-			// case DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD:
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
-			// case DisplayServerEnums::FEATURE_TOUCHSCREEN:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_IME:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+			// case FEATURE_HIDPI:
+			// case FEATURE_ICON:
+			// case FEATURE_MOUSE:
+		case FEATURE_MOUSE_WARP:
+			// case FEATURE_NATIVE_DIALOG:
+			// case FEATURE_NATIVE_ICON:
+			// case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_CLIPBOARD:
+			// case FEATURE_KEEP_SCREEN_ON:
+			// case FEATURE_ORIENTATION:
+			// case FEATURE_VIRTUAL_KEYBOARD:
+		case FEATURE_TEXT_TO_SPEECH:
+			// case FEATURE_TOUCHSCREEN:
 			return true;
 		default:
 			return false;
 	}
 }
 
-String DisplayServerMacOSEmbedded::get_name() const {
+String DisplayServerEmbedded::get_name() const {
 	return "embedded";
 }
 
-int DisplayServerMacOSEmbedded::get_screen_count() const {
+int DisplayServerEmbedded::get_screen_count() const {
 	return 1;
 }
 
-Point2i DisplayServerMacOSEmbedded::screen_get_position(int p_screen) const {
+int DisplayServerEmbedded::get_primary_screen() const {
+	return 0;
+}
+
+Point2i DisplayServerEmbedded::screen_get_position(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	p_screen = _get_screen_index(p_screen);
@@ -441,17 +491,17 @@ Point2i DisplayServerMacOSEmbedded::screen_get_position(int p_screen) const {
 	return Point2i(0, 0);
 }
 
-Size2i DisplayServerMacOSEmbedded::screen_get_size(int p_screen) const {
+Size2i DisplayServerEmbedded::screen_get_size(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	p_screen = _get_screen_index(p_screen);
 	int screen_count = get_screen_count();
 	ERR_FAIL_INDEX_V(p_screen, screen_count, Size2i());
 
-	return window_get_size(DisplayServerEnums::MAIN_WINDOW_ID);
+	return window_get_size(MAIN_WINDOW_ID);
 }
 
-Rect2i DisplayServerMacOSEmbedded::screen_get_usable_rect(int p_screen) const {
+Rect2i DisplayServerEmbedded::screen_get_usable_rect(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	p_screen = _get_screen_index(p_screen);
@@ -461,7 +511,7 @@ Rect2i DisplayServerMacOSEmbedded::screen_get_usable_rect(int p_screen) const {
 	return Rect2i(screen_get_position(p_screen), screen_get_size(p_screen));
 }
 
-int DisplayServerMacOSEmbedded::screen_get_dpi(int p_screen) const {
+int DisplayServerEmbedded::screen_get_dpi(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	p_screen = _get_screen_index(p_screen);
@@ -471,14 +521,14 @@ int DisplayServerMacOSEmbedded::screen_get_dpi(int p_screen) const {
 	return 96;
 }
 
-float DisplayServerMacOSEmbedded::screen_get_scale(int p_screen) const {
+float DisplayServerEmbedded::screen_get_scale(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	switch (p_screen) {
-		case DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS:
-		case DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS:
-		case DisplayServerEnums::SCREEN_PRIMARY:
-		case DisplayServerEnums::SCREEN_OF_MAIN_WINDOW:
+		case SCREEN_WITH_MOUSE_FOCUS:
+		case SCREEN_WITH_KEYBOARD_FOCUS:
+		case SCREEN_PRIMARY:
+		case SCREEN_OF_MAIN_WINDOW:
 		case 0:
 			return state.screen_window_scale;
 		default:
@@ -486,76 +536,95 @@ float DisplayServerMacOSEmbedded::screen_get_scale(int p_screen) const {
 	}
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerMacOSEmbedded::get_window_list() const {
-	Vector<DisplayServerEnums::WindowID> list;
-	list.push_back(DisplayServerEnums::MAIN_WINDOW_ID);
+float DisplayServerEmbedded::screen_get_refresh_rate(int p_screen) const {
+	_THREAD_SAFE_METHOD_
+
+	p_screen = _get_screen_index(p_screen);
+	int screen_count = get_screen_count();
+	ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_REFRESH_RATE_FALLBACK);
+
+	p_screen = _get_screen_index(p_screen);
+	NSArray *screenArray = [NSScreen screens];
+	if ((NSUInteger)p_screen < [screenArray count]) {
+		NSDictionary *description = [[screenArray objectAtIndex:p_screen] deviceDescription];
+		const CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode([[description objectForKey:@"NSScreenNumber"] unsignedIntValue]);
+		const double displayRefreshRate = CGDisplayModeGetRefreshRate(displayMode);
+		return (float)displayRefreshRate;
+	}
+	ERR_PRINT("An error occurred while trying to get the screen refresh rate.");
+	return SCREEN_REFRESH_RATE_FALLBACK;
+}
+
+Vector<DisplayServer::WindowID> DisplayServerEmbedded::get_window_list() const {
+	Vector<DisplayServer::WindowID> list;
+	list.push_back(MAIN_WINDOW_ID);
 	return list;
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOSEmbedded::get_window_at_screen_position(const Point2i &p_position) const {
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+DisplayServer::WindowID DisplayServerEmbedded::get_window_at_screen_position(const Point2i &p_position) const {
+	return MAIN_WINDOW_ID;
 }
 
-void DisplayServerMacOSEmbedded::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	window_attached_instance_id[p_window] = p_instance;
 }
 
-ObjectID DisplayServerMacOSEmbedded::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerEmbedded::window_get_attached_instance_id(WindowID p_window) const {
 	return window_attached_instance_id[p_window];
 }
 
-void DisplayServerMacOSEmbedded::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_title(const String &p_title, WindowID p_window) {
 	// Not supported
 }
 
-int DisplayServerMacOSEmbedded::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
+int DisplayServerEmbedded::window_get_current_screen(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, DisplayServerEnums::INVALID_SCREEN);
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, INVALID_SCREEN);
 
 	return 0;
 }
 
-void DisplayServerMacOSEmbedded::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_current_screen(int p_screen, WindowID p_window) {
 	// Not supported
 }
 
-Point2i DisplayServerMacOSEmbedded::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerEmbedded::window_get_position(WindowID p_window) const {
 	return Point2i();
 }
 
-Point2i DisplayServerMacOSEmbedded::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerEmbedded::window_get_position_with_decorations(WindowID p_window) const {
 	return Point2i();
 }
 
-void DisplayServerMacOSEmbedded::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_position(const Point2i &p_position, WindowID p_window) {
 	// Probably not supported for single window iOS app
 }
 
-void DisplayServerMacOSEmbedded::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerEmbedded::window_set_transient(WindowID p_window, WindowID p_parent) {
 	// Not supported
 }
 
-void DisplayServerMacOSEmbedded::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	// Not supported
 }
 
-Size2i DisplayServerMacOSEmbedded::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerEmbedded::window_get_max_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerMacOSEmbedded::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	// Not supported
 }
 
-Size2i DisplayServerMacOSEmbedded::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerEmbedded::window_get_min_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerMacOSEmbedded::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_size(const Size2i p_size, WindowID p_window) {
 	print_line("Embedded window can't be resized.");
 }
 
-void DisplayServerMacOSEmbedded::_window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::_window_set_size(const Size2i p_size, WindowID p_window) {
 	[CATransaction begin];
 	[CATransaction setDisableActions:YES];
 
@@ -584,7 +653,7 @@ void DisplayServerMacOSEmbedded::_window_set_size(const Size2i p_size, DisplaySe
 	}
 }
 
-Size2i DisplayServerMacOSEmbedded::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerEmbedded::window_get_size(WindowID p_window) const {
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		RenderingContextDriver::SurfaceID surface = rendering_context->surface_get_from_window(p_window);
@@ -602,73 +671,65 @@ Size2i DisplayServerMacOSEmbedded::window_get_size(DisplayServerEnums::WindowID
 	return Size2i();
 }
 
-Size2i DisplayServerMacOSEmbedded::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerEmbedded::window_get_size_with_decorations(WindowID p_window) const {
 	return window_get_size(p_window);
 }
 
-void DisplayServerMacOSEmbedded::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	// Not supported
 }
 
-DisplayServerEnums::WindowMode DisplayServerMacOSEmbedded::window_get_mode(DisplayServerEnums::WindowID p_window) const {
-	return DisplayServerEnums::WindowMode::WINDOW_MODE_WINDOWED;
+DisplayServer::WindowMode DisplayServerEmbedded::window_get_mode(WindowID p_window) const {
+	return WindowMode::WINDOW_MODE_WINDOWED;
 }
 
-bool DisplayServerMacOSEmbedded::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerEmbedded::window_is_maximize_allowed(WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerMacOSEmbedded::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
-	if (p_flag == DisplayServerEnums::WINDOW_FLAG_TRANSPARENT && p_window == DisplayServerEnums::MAIN_WINDOW_ID) {
+void DisplayServerEmbedded::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
+	if (p_flag == WINDOW_FLAG_TRANSPARENT && p_window == MAIN_WINDOW_ID) {
 		transparent = p_enabled;
 		layer.opaque = !(OS::get_singleton()->is_layered_allowed() && transparent);
 	}
 }
 
-bool DisplayServerMacOSEmbedded::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
-	if (p_flag == DisplayServerEnums::WINDOW_FLAG_TRANSPARENT && p_window == DisplayServerEnums::MAIN_WINDOW_ID) {
+bool DisplayServerEmbedded::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
+	if (p_flag == WINDOW_FLAG_TRANSPARENT && p_window == MAIN_WINDOW_ID) {
 		return transparent;
 	}
 	return false;
 }
 
-void DisplayServerMacOSEmbedded::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_request_attention(WindowID p_window) {
 	// Not supported
 }
 
-void DisplayServerMacOSEmbedded::window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window) {
-	// Not supported.
-}
-
-void DisplayServerMacOSEmbedded::window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window) {
-	// Not supported.
-}
-
-void DisplayServerMacOSEmbedded::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_move_to_foreground(WindowID p_window) {
 	// Not supported
 }
 
-bool DisplayServerMacOSEmbedded::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerEmbedded::window_is_focused(WindowID p_window) const {
 	return true;
 }
 
-float DisplayServerMacOSEmbedded::screen_get_max_scale() const {
+float DisplayServerEmbedded::screen_get_max_scale() const {
 	return state.screen_max_scale;
 }
 
-bool DisplayServerMacOSEmbedded::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerEmbedded::window_can_draw(WindowID p_window) const {
 	return true;
 }
 
-bool DisplayServerMacOSEmbedded::can_any_window_draw() const {
+bool DisplayServerEmbedded::can_any_window_draw() const {
 	return true;
 }
 
-void DisplayServerMacOSEmbedded::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_ime_active(const bool p_active, WindowID p_window) {
 	EngineDebugger::get_singleton()->send_message("game_view:window_set_ime_active", { p_active });
 }
 
-void DisplayServerMacOSEmbedded::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	if (p_pos == ime_last_position) {
 		return;
 	}
@@ -676,40 +737,7 @@ void DisplayServerMacOSEmbedded::window_set_ime_position(const Point2i &p_pos, D
 	ime_last_position = p_pos;
 }
 
-DisplayServerMacOSBase::HDROutput &DisplayServerMacOSEmbedded::_get_hdr_output(DisplayServerEnums::WindowID p_window) {
-	return hdr_output;
-}
-
-const DisplayServerMacOSBase::HDROutput &DisplayServerMacOSEmbedded::_get_hdr_output(DisplayServerEnums::WindowID p_window) const {
-	return hdr_output;
-}
-
-void DisplayServerMacOSEmbedded::window_get_edr_values(DisplayServerEnums::WindowID p_window, CGFloat *r_max_potential_edr_value, CGFloat *r_max_edr_value) const {
-	_THREAD_SAFE_METHOD_
-
-#define SET_VAL(v, val) \
-	if (v) { \
-		*v = val; \
-	}
-
-	if (@available(macOS 10.15, *)) {
-		SET_VAL(r_max_potential_edr_value, state.screen_max_edr);
-		SET_VAL(r_max_edr_value, state.screen_max_potential_edr);
-	} else {
-		SET_VAL(r_max_potential_edr_value, 1.0);
-		SET_VAL(r_max_edr_value, 1.0);
-	}
-
-#undef SET_VAL
-}
-
-void DisplayServerMacOSEmbedded::update_screen_parameters() {
-	if (hdr_output.requested) {
-		_update_hdr_output(DisplayServerEnums::MAIN_WINDOW_ID, hdr_output);
-	}
-}
-
-void DisplayServerMacOSEmbedded::set_state(const DisplayServerMacOSEmbeddedState &p_state) {
+void DisplayServerEmbedded::set_state(const DisplayServerEmbeddedState &p_state) {
 	if (state == p_state) {
 		return;
 	}
@@ -725,15 +753,12 @@ void DisplayServerMacOSEmbedded::set_state(const DisplayServerMacOSEmbeddedState
 		}
 #endif
 	}
-	if (hdr_output.requested) {
-		_update_hdr_output(DisplayServerEnums::MAIN_WINDOW_ID, hdr_output);
-	}
 }
 
-void DisplayServerMacOSEmbedded::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerEmbedded::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
-		gl_manager->set_vsync_enabled(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager->set_vsync_enabled(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 #endif
 
@@ -744,11 +769,11 @@ void DisplayServerMacOSEmbedded::window_set_vsync_mode(DisplayServerEnums::VSync
 #endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerMacOSEmbedded::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerEmbedded::window_get_vsync_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
-		return (gl_manager->is_vsync_enabled() ? DisplayServerEnums::VSyncMode::VSYNC_ENABLED : DisplayServerEnums::VSyncMode::VSYNC_DISABLED);
+		return (gl_manager->is_vsync_enabled() ? DisplayServer::VSyncMode::VSYNC_ENABLED : DisplayServer::VSyncMode::VSYNC_DISABLED);
 	}
 #endif
 #if defined(RD_ENABLED)
@@ -756,15 +781,34 @@ DisplayServerEnums::VSyncMode DisplayServerMacOSEmbedded::window_get_vsync_mode(
 		return rendering_context->window_get_vsync_mode(p_window);
 	}
 #endif
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
-void DisplayServerMacOSEmbedded::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
+void DisplayServerEmbedded::update_im_text(const Point2i &p_selection, const String &p_text) {
+	im_selection = p_selection;
+	im_text = p_text;
+
+	OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+}
+
+Point2i DisplayServerEmbedded::ime_get_selection() const {
+	return im_selection;
+}
+
+String DisplayServerEmbedded::ime_get_text() const {
+	return im_text;
+}
+
+void DisplayServerEmbedded::cursor_set_shape(CursorShape p_shape) {
 	cursor_shape = p_shape;
 	EngineDebugger::get_singleton()->send_message("game_view:cursor_set_shape", { p_shape });
 }
 
-void DisplayServerMacOSEmbedded::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+DisplayServer::CursorShape DisplayServerEmbedded::cursor_get_shape() const {
+	return cursor_shape;
+}
+
+void DisplayServerEmbedded::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	PackedByteArray data;
 	if (p_cursor.is_valid()) {
 		Ref<Image> image = _get_cursor_image_from_resource(p_cursor, p_hotspot);
@@ -775,7 +819,7 @@ void DisplayServerMacOSEmbedded::cursor_set_custom_image(const Ref<Resource> &p_
 	EngineDebugger::get_singleton()->send_message("game_view:cursor_set_custom_image", { data, p_shape, p_hotspot });
 }
 
-void DisplayServerMacOSEmbedded::swap_buffers() {
+void DisplayServerEmbedded::swap_buffers() {
 #ifdef GLES3_ENABLED
 	if (gl_manager) {
 		gl_manager->swap_buffers();
@@ -783,22 +827,20 @@ void DisplayServerMacOSEmbedded::swap_buffers() {
 #endif
 }
 
-void DisplayServerMacOSEmbeddedState::serialize(PackedByteArray &r_data) {
-	r_data.resize(32);
+void DisplayServerEmbeddedState::serialize(PackedByteArray &r_data) {
+	r_data.resize(16);
 
 	uint8_t *data = r_data.ptrw();
 	data += encode_float(screen_max_scale, data);
 	data += encode_float(screen_dpi, data);
 	data += encode_float(screen_window_scale, data);
 	data += encode_uint32(display_id, data);
-	data += encode_double(screen_max_edr, data);
-	data += encode_double(screen_max_potential_edr, data);
 
 	// Assert we had enough space.
 	DEV_ASSERT(r_data.size() >= (data - r_data.ptrw()));
 }
 
-Error DisplayServerMacOSEmbeddedState::deserialize(const PackedByteArray &p_data) {
+Error DisplayServerEmbeddedState::deserialize(const PackedByteArray &p_data) {
 	const uint8_t *data = p_data.ptr();
 
 	screen_max_scale = decode_float(data);
@@ -808,10 +850,6 @@ Error DisplayServerMacOSEmbeddedState::deserialize(const PackedByteArray &p_data
 	screen_window_scale = decode_float(data);
 	data += sizeof(float);
 	display_id = decode_uint32(data);
-	data += sizeof(uint32_t);
-	screen_max_edr = decode_double(data);
-	data += sizeof(double);
-	screen_max_potential_edr = decode_double(data);
 
 	return OK;
 }
diff --git a/engine/platform/macos/display_server_macos.h b/engine/platform/macos/display_server_macos.h
index c6c22646..f74c8416 100644
--- a/engine/platform/macos/display_server_macos.h
+++ b/engine/platform/macos/display_server_macos.h
@@ -33,13 +33,11 @@
 #include "display_server_macos_base.h"
 
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 #include "gl_manager_macos_angle.h"
-#endif
 #include "gl_manager_macos_legacy.h"
 #endif // GLES3_ENABLED
 
-#include "core/os/process_id.h"
+#import "native_menu_macos.h"
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/rendering_device.h"
@@ -66,29 +64,25 @@
 @class GodotContentView;
 @class GodotWindowDelegate;
 @class GodotButtonView;
-@class GodotProgressView;
 #ifdef TOOLS_ENABLED
 @class GodotEmbeddedView;
 @class CALayerHost;
 #endif
 
 #undef BitMap
+#undef CursorShape
 #undef FontVariation
 
 #ifdef TOOLS_ENABLED
 class EmbeddedProcessMacOS;
 #endif
 
-class InputEvent;
-class InputEventWithModifiers;
-class NativeMenuMacOS;
-
 class DisplayServerMacOS : public DisplayServerMacOSBase {
 	GDSOFTCLASS(DisplayServerMacOS, DisplayServerMacOSBase);
 
 public:
 	struct KeyEvent {
-		DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID window_id = INVALID_WINDOW_ID;
 		unsigned int macos_state = false;
 		bool pressed = false;
 		bool echo = false;
@@ -111,7 +105,7 @@ public:
 		CGDirectDisplayID display_id = -1;
 
 		Point2i mouse_pos;
-		DisplayServerEnums::WindowResizeEdge edge = DisplayServerEnums::WINDOW_EDGE_MAX;
+		WindowResizeEdge edge = WINDOW_EDGE_MAX;
 
 		Size2i min_size;
 		Size2i max_size;
@@ -134,9 +128,9 @@ public:
 		bool fs_transition = false;
 		bool initial_size = true;
 
-		DisplayServerEnums::WindowID transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID transient_parent = INVALID_WINDOW_ID;
 		bool exclusive = false;
-		HashSet<DisplayServerEnums::WindowID> transient_children;
+		HashSet<WindowID> transient_children;
 
 		bool layered_window = false;
 		bool fullscreen = false;
@@ -154,24 +148,20 @@ public:
 		bool extend_to_title = false;
 		bool hide_from_capture = false;
 
-		HDROutput hdr_output;
-
 		Rect2i parent_safe_rect;
 	};
 
-	List<DisplayServerEnums::WindowID> popup_list;
+	List<WindowID> popup_list;
 	uint64_t time_since_popup = 0;
 
-	GodotProgressView *dock_progress = nullptr;
-
 private:
-	id screen_observer = nil;
-
 #if defined(GLES3_ENABLED)
 	GLManagerLegacy_MacOS *gl_manager_legacy = nullptr;
-#if defined(ANGLE_ENABLED)
 	GLManagerANGLE_MacOS *gl_manager_angle = nullptr;
 #endif
+#if defined(RD_ENABLED)
+	RenderingContextDriver *rendering_context = nullptr;
+	RenderingDevice *rendering_device = nullptr;
 #endif
 	String rendering_driver;
 
@@ -189,35 +179,42 @@ private:
 	id menu_delegate = nullptr;
 	NativeMenuMacOS *native_menu = nullptr;
 
-	CGEventSourceRef event_source;
-	void _mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_mode, DisplayServerEnums::MouseMode p_new_mode) override;
+	Point2i im_selection;
+	String im_text;
 
-	HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) override;
-	const HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) const override;
+	CGEventSourceRef event_source;
+	MouseMode mouse_mode = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
+	bool mouse_mode_override_enabled = false;
+	void _mouse_update_mode();
 
 	bool drop_events = false;
 	bool in_dispatch_input_event = false;
 
-	DisplayServerEnums::WindowID window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
-	DisplayServerEnums::WindowID last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
-	DisplayServerEnums::WindowID window_id_counter = DisplayServerEnums::MAIN_WINDOW_ID;
+	WindowID window_mouseover_id = INVALID_WINDOW_ID;
+	WindowID last_focused_window = INVALID_WINDOW_ID;
+	WindowID window_id_counter = MAIN_WINDOW_ID;
 	float display_max_scale = 1.f;
 	mutable Point2i origin;
 	mutable bool displays_arrangement_dirty = true;
 	bool is_resizing = false;
 
-	NSCursor *cursors[DisplayServerEnums::CURSOR_MAX];
-	HashMap<DisplayServerEnums::CursorShape, Vector<Variant>> cursors_cache;
+	CursorShape cursor_shape = CURSOR_ARROW;
+	NSCursor *cursors[CURSOR_MAX];
+	HashMap<CursorShape, Vector<Variant>> cursors_cache;
 
-	HashMap<DisplayServerEnums::WindowID, WindowData> windows;
+	HashMap<WindowID, WindowData> windows;
 
 	struct IndicatorData {
 		id delegate;
 		id item;
 	};
 
-	DisplayServerEnums::IndicatorID indicator_id_counter = 0;
-	HashMap<DisplayServerEnums::IndicatorID, IndicatorData> indicators;
+	IndicatorID indicator_id_counter = 0;
+	HashMap<IndicatorID, IndicatorData> indicators;
+
+	IOPMAssertionID screen_keep_on_assertion = kIOPMNullAssertionID;
 
 	Callable help_search_callback;
 	Callable help_action_callback;
@@ -228,8 +225,8 @@ private:
 	};
 	List<MenuCall> deferred_menu_calls;
 
-	DisplayServerEnums::WindowID _create_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, const Rect2i &p_rect);
-	void _update_window_style(WindowData p_wd, DisplayServerEnums::WindowID p_window);
+	WindowID _create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect);
+	void _update_window_style(WindowData p_wd, WindowID p_window);
 
 	void _update_displays_arrangement() const;
 	Point2i _get_native_screen_position(int p_screen) const;
@@ -242,7 +239,7 @@ private:
 
 	static NSCursor *_cursor_from_selector(SEL p_selector, SEL p_fallback = nil);
 
-	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, DisplayServerEnums::WindowID p_window_id);
+	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id);
 
 #ifdef TOOLS_ENABLED
 	struct EmbeddedProcessData {
@@ -250,15 +247,15 @@ private:
 		WindowData *wd = nullptr;
 		CALayer *layer_host = nil;
 	};
-	HashMap<ProcessID, EmbeddedProcessData> embedded_processes;
+	HashMap<OS::ProcessID, EmbeddedProcessData> embedded_processes;
 #endif
 	void _window_update_display_id(WindowData *p_wd);
 
 public:
 	void menu_callback(id p_sender);
 
-	bool has_window(DisplayServerEnums::WindowID p_window) const;
-	WindowData &get_window(DisplayServerEnums::WindowID p_window);
+	bool has_window(WindowID p_window) const;
+	WindowData &get_window(WindowID p_window);
 
 	NSImage *_convert_to_nsimg(Ref<Image> &p_image) const;
 	Point2i _get_screens_origin() const;
@@ -266,38 +263,38 @@ public:
 	void set_menu_delegate(NSMenu *p_menu);
 
 	void send_event(NSEvent *p_event);
-	void send_window_event(const WindowData &p_wd, DisplayServerEnums::WindowEvent p_event) const;
-	virtual void send_window_event_by_id(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	void send_window_event(const WindowData &p_wd, WindowEvent p_event);
 	void release_pressed_events();
 	void sync_mouse_state();
 	void get_key_modifier_state(unsigned int p_macos_state, Ref<InputEventWithModifiers> r_state) const;
 	void update_mouse_pos(WindowData &p_wd, NSPoint p_location_in_window);
 	void push_to_key_event_buffer(const KeyEvent &p_event);
 	void pop_last_key_event();
-	void set_last_focused_window(DisplayServerEnums::WindowID p_window);
+	void update_im_text(const Point2i &p_selection, const String &p_text);
+	void set_last_focused_window(WindowID p_window);
 	bool mouse_process_popups(bool p_close = false);
-	void popup_open(DisplayServerEnums::WindowID p_window);
-	void popup_close(DisplayServerEnums::WindowID p_window);
+	void popup_open(WindowID p_window);
+	void popup_close(WindowID p_window);
 	void set_is_resizing(bool p_is_resizing);
 	bool get_is_resizing() const;
-	void reparent_check(DisplayServerEnums::WindowID p_window);
-	DisplayServerEnums::WindowID _get_focused_window_or_popup() const;
-	void mouse_enter_window(DisplayServerEnums::WindowID p_window);
-	void mouse_exit_window(DisplayServerEnums::WindowID p_window);
+	void reparent_check(WindowID p_window);
+	WindowID _get_focused_window_or_popup() const;
+	void mouse_enter_window(WindowID p_window);
+	void mouse_exit_window(WindowID p_window);
 	void update_presentation_mode();
 
-	bool is_always_on_top_recursive(DisplayServerEnums::WindowID p_window) const;
+	bool is_always_on_top_recursive(WindowID p_window) const;
 
 	/**
 	 * Get the display ID of a window.
 	 */
-	uint32_t window_get_display_id(DisplayServerEnums::WindowID p_window) const;
-	void window_destroy(DisplayServerEnums::WindowID p_window);
-	void window_resize(DisplayServerEnums::WindowID p_window, int p_width, int p_height);
+	uint32_t window_get_display_id(WindowID p_window) const;
+	void window_destroy(WindowID p_window);
+	void window_resize(WindowID p_window, int p_width, int p_height);
 	void window_set_custom_window_buttons(WindowData &p_wd, bool p_enabled);
-	void set_window_per_pixel_transparency_enabled(bool p_enabled, DisplayServerEnums::WindowID p_window);
+	void set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window);
 
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
 	virtual void help_set_search_callbacks(const Callable &p_search_callback = Callable(), const Callable &p_action_callback = Callable()) override;
@@ -307,8 +304,17 @@ public:
 	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) override;
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
+
+	virtual void beep() const override;
+
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
+	virtual bool mouse_is_mode_override_enabled() const override;
 
 	bool update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, NSPoint &r_mpos, NSTimeInterval p_timestamp);
 	virtual void warp_mouse(const Point2i &p_position) override;
@@ -316,113 +322,122 @@ public:
 	virtual BitField<MouseButtonMask> mouse_get_button_state() const override;
 
 	virtual int get_screen_count() const override;
+	virtual int get_primary_screen() const override;
 	virtual int get_keyboard_focus_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual float screen_get_max_scale() const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual Color screen_get_pixel(const Point2i &p_position) const override;
-	virtual Ref<Image> screen_get_image(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Ref<Image> screen_get_image(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual Ref<Image> screen_get_image_rect(const Rect2i &p_rect) const override;
+	virtual void screen_set_keep_on(bool p_enable) override;
+	virtual bool screen_is_kept_on() const override;
+
 	virtual Vector<int> get_window_list() const override;
 
-	virtual DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID) override;
-	virtual void show_window(DisplayServerEnums::WindowID p_id) override;
-	virtual void delete_sub_window(DisplayServerEnums::WindowID p_id) override;
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override;
+	virtual void show_window(WindowID p_id) override;
+	virtual void delete_sub_window(WindowID p_id) override;
 
-	virtual DisplayServerEnums::WindowID window_get_active_popup() const override;
-	virtual void window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) override;
-	virtual Rect2i window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const override;
+	virtual WindowID window_get_active_popup() const override;
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override;
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_title_size(const String &p_title, DisplayServerEnums::WindowID p_window) const override;
-	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_title_size(const String &p_title, WindowID p_window) const override;
+	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
-	virtual void window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
+	virtual void window_set_exclusive(WindowID p_window, bool p_exclusive) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual DisplayServerEnums::WindowID get_focused_window() const override;
+	virtual WindowID get_focused_window() const override;
 
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void gl_window_make_current(DisplayServerEnums::WindowID p_window_id) override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id) override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
-
-public:
-	void update_screen_parameters();
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
 	virtual bool window_maximize_on_title_dbl_click() const override;
 	virtual bool window_minimize_on_title_dbl_click() const override;
 
-	virtual void window_start_drag(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_start_drag(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_window_buttons_offset(const Vector2i &p_offset, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Vector3i window_get_safe_title_margins(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_window_buttons_offset(const Vector2i &p_offset, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Vector3i window_get_safe_title_margins(WindowID p_window = MAIN_WINDOW_ID) const override;
+
+	virtual int accessibility_should_increase_contrast() const override;
+	virtual int accessibility_should_reduce_animation() const override;
+	virtual int accessibility_should_reduce_transparency() const override;
+	virtual int accessibility_screen_reader_active() const override;
+
+	virtual Point2i ime_get_selection() const override;
+	virtual String ime_get_text() const override;
 
 	void cursor_update_shape();
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
 
 	virtual bool get_swap_cancel_ok() override;
 
-	virtual void enable_for_stealing_focus(ProcessID pid) override;
+	virtual void enable_for_stealing_focus(OS::ProcessID pid) override;
 #ifdef TOOLS_ENABLED
-	Error embed_process_update(DisplayServerEnums::WindowID p_window, EmbeddedProcessMacOS *p_process);
-	virtual Error request_close_embedded_process(ProcessID p_pid) override;
-	virtual Error remove_embedded_process(ProcessID p_pid) override;
+	Error embed_process_update(WindowID p_window, EmbeddedProcessMacOS *p_process);
+	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;
+	virtual Error remove_embedded_process(OS::ProcessID p_pid) override;
 #endif
 
 	void _process_events(bool p_pump);
@@ -435,23 +450,21 @@ public:
 	virtual void set_native_icon(const String &p_filename) override;
 	virtual void set_icon(const Ref<Image> &p_icon) override;
 
-	virtual DisplayServerEnums::IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override;
-	virtual void status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) override;
-	virtual void status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) override;
-	virtual void status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_menu_rid) override;
-	virtual void status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) override;
-	virtual Rect2 status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const override;
-	virtual void delete_status_indicator(DisplayServerEnums::IndicatorID p_id) override;
+	virtual IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override;
+	virtual void status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) override;
+	virtual void status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) override;
+	virtual void status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid) override;
+	virtual void status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) override;
+	virtual Rect2 status_indicator_get_rect(IndicatorID p_id) const override;
+	virtual void delete_status_indicator(IndicatorID p_id) override;
 
 	virtual bool is_window_transparency_available() const override;
 
-	void window_get_edr_values(DisplayServerEnums::WindowID p_window, CGFloat *r_max_potential_edr_value, CGFloat *r_max_edr_value) const override;
-
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	static Vector<String> get_rendering_drivers_func();
 
 	static void register_macos_driver();
 
-	DisplayServerMacOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerMacOS();
 };
diff --git a/engine/platform/macos/display_server_macos.mm b/engine/platform/macos/display_server_macos.mm
index fe7bf77b..8f437f32 100644
--- a/engine/platform/macos/display_server_macos.mm
+++ b/engine/platform/macos/display_server_macos.mm
@@ -38,12 +38,10 @@
 #import "godot_menu_delegate.h"
 #import "godot_menu_item.h"
 #import "godot_open_save_delegate.h"
-#import "godot_progress_view.h"
 #import "godot_status_item.h"
 #import "godot_window.h"
 #import "godot_window_delegate.h"
 #import "key_mapping_macos.h"
-#import "native_menu_macos.h"
 #import "os_macos.h"
 
 #ifdef TOOLS_ENABLED
@@ -51,36 +49,36 @@
 #endif
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "drivers/png/png_driver_common.h"
 #include "main/main.h"
 #include "scene/resources/image_texture.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/dummy/rasterizer_dummy.h"
 
 #ifdef TOOLS_ENABLED
-#import "display_server_macos_embedded.h"
-
+#import "display_server_embedded.h"
 #import "editor/embedded_process_macos.h"
 #endif
 
+#include <AppKit/AppKit.h>
+
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-#include "servers/rendering/rendering_device.h"
 #endif
 
-#include <AppKit/AppKit.h>
+#if defined(ACCESSKIT_ENABLED)
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOCFPlugIn.h>
@@ -88,15 +86,15 @@
 #import <IOKit/hid/IOHIDKeys.h>
 #import <IOKit/hid/IOHIDLib.h>
 
-DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, const Rect2i &p_rect) {
+DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect) {
 	const float scale = screen_get_max_scale();
 
-	DisplayServerEnums::WindowID id = window_id_counter;
+	WindowID id = window_id_counter;
 	{
 		WindowData &wd = windows[id];
 
 		wd.window_delegate = [[GodotWindowDelegate alloc] initWithDisplayServer:this];
-		ERR_FAIL_NULL_V_MSG(wd.window_delegate, DisplayServerEnums::INVALID_WINDOW_ID, "Can't create a window delegate");
+		ERR_FAIL_NULL_V_MSG(wd.window_delegate, INVALID_WINDOW_ID, "Can't create a window delegate");
 		[wd.window_delegate setWindowID:id];
 
 		int rq_screen = get_screen_from_rect(p_rect);
@@ -121,14 +119,14 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnu
 						  styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable
 							backing:NSBackingStoreBuffered
 							  defer:NO];
-		ERR_FAIL_NULL_V_MSG(wd.window_object, DisplayServerEnums::INVALID_WINDOW_ID, "Can't create a window");
+		ERR_FAIL_NULL_V_MSG(wd.window_object, INVALID_WINDOW_ID, "Can't create a window");
 		[wd.window_object setWindowID:id];
 		[wd.window_object setReleasedWhenClosed:NO];
 
 		wd.window_view = [[GodotContentView alloc] init];
 		if (wd.window_view == nil) {
 			windows.erase(id);
-			ERR_FAIL_V_MSG(DisplayServerEnums::INVALID_WINDOW_ID, "Can't create a window view");
+			ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Can't create a window view");
 		}
 		[wd.window_view setWindowID:id];
 		[wd.window_view setWantsLayer:TRUE];
@@ -140,11 +138,15 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnu
 		[wd.window_object setRestorable:NO];
 		[wd.window_object setColorSpace:[NSColorSpace sRGBColorSpace]];
 
-		if (!AccessibilityServer::get_singleton()->window_create(id, (__bridge void *)wd.window_object)) {
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver && !accessibility_driver->window_create(id, (__bridge void *)wd.window_object)) {
 			if (OS::get_singleton()->is_stdout_verbose()) {
 				ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
 			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
 		}
+#endif
 
 		if ([wd.window_object respondsToSelector:@selector(setTabbingMode:)]) {
 			[wd.window_object setTabbingMode:NSWindowTabbingModeDisallowed];
@@ -183,16 +185,16 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnu
 #endif
 #ifdef METAL_ENABLED
 			if (rendering_driver == "metal") {
-				wpd.metal.layer = (__bridge CA::MetalLayer *)layer;
+				wpd.metal.layer = (CAMetalLayer *)layer;
 			}
 #endif
 			Error err = rendering_context->window_create(window_id_counter, &wpd);
-
-			if (err != OK) {
-				AccessibilityServer::get_singleton()->window_destroy(id);
+#ifdef ACCESSKIT_ENABLED
+			if (err != OK && accessibility_driver) {
+				accessibility_driver->window_destroy(id);
 			}
-
-			ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, vformat("Can't create a %s context", rendering_driver));
+#endif
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, vformat("Can't create a %s context", rendering_driver));
 
 			rendering_context->window_set_size(window_id_counter, p_rect.size.width, p_rect.size.height);
 			rendering_context->window_set_vsync_mode(window_id_counter, p_vsync_mode);
@@ -207,19 +209,20 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnu
 				gl_failed = true;
 			}
 		}
-#if defined(ANGLE_ENABLED)
 		if (gl_manager_angle) {
 			Error err = gl_manager_angle->window_create(window_id_counter, nullptr, (__bridge void *)layer, p_rect.size.width, p_rect.size.height);
 			if (err != OK) {
 				gl_failed = true;
 			}
 		}
-#endif
 		if (gl_failed) {
-			AccessibilityServer::get_singleton()->window_destroy(id);
-
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver) {
+				accessibility_driver->window_destroy(id);
+			}
+#endif
 			windows.erase(id);
-			ERR_FAIL_V_MSG(DisplayServerEnums::INVALID_WINDOW_ID, "Can't create an OpenGL context.");
+			ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Can't create an OpenGL context.");
 		}
 		window_set_vsync_mode(p_vsync_mode, id);
 #endif
@@ -252,17 +255,15 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_create_window(DisplayServerEnu
 	if (gl_manager_legacy) {
 		gl_manager_legacy->window_resize(id, wd.size.width, wd.size.height);
 	}
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->window_resize(id, wd.size.width, wd.size.height);
 	}
-#endif
 #endif
 
 	return id;
 }
 
-void DisplayServerMacOS::_update_window_style(WindowData p_wd, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::_update_window_style(WindowData p_wd, WindowID p_window) {
 	bool borderless_full = false;
 
 	if (p_wd.borderless) {
@@ -291,7 +292,7 @@ void DisplayServerMacOS::_update_window_style(WindowData p_wd, DisplayServerEnum
 	}
 }
 
-bool DisplayServerMacOS::is_always_on_top_recursive(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::is_always_on_top_recursive(WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 
 	const WindowData &wd = windows[p_window];
@@ -299,14 +300,14 @@ bool DisplayServerMacOS::is_always_on_top_recursive(DisplayServerEnums::WindowID
 		return true;
 	}
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (wd.transient_parent != INVALID_WINDOW_ID) {
 		return is_always_on_top_recursive(wd.transient_parent);
 	}
 
 	return false;
 }
 
-void DisplayServerMacOS::set_window_per_pixel_transparency_enabled(bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
@@ -407,8 +408,8 @@ void DisplayServerMacOS::_displays_arrangement_changed(CGDirectDisplayID display
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOS::_get_focused_window_or_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerMacOS::_get_focused_window_or_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	}
@@ -416,23 +417,23 @@ DisplayServerEnums::WindowID DisplayServerMacOS::_get_focused_window_or_popup()
 	return last_focused_window;
 }
 
-void DisplayServerMacOS::mouse_enter_window(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::mouse_enter_window(WindowID p_window) {
 	if (window_mouseover_id != p_window) {
-		if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-			send_window_event(windows[window_mouseover_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+		if (window_mouseover_id != INVALID_WINDOW_ID) {
+			send_window_event(windows[window_mouseover_id], WINDOW_EVENT_MOUSE_EXIT);
 		}
 		window_mouseover_id = p_window;
-		if (p_window != DisplayServerEnums::INVALID_WINDOW_ID) {
-			send_window_event(windows[p_window], DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+		if (p_window != INVALID_WINDOW_ID) {
+			send_window_event(windows[p_window], WINDOW_EVENT_MOUSE_ENTER);
 		}
 	}
 }
 
-void DisplayServerMacOS::mouse_exit_window(DisplayServerEnums::WindowID p_window) {
-	if (window_mouseover_id == p_window && p_window != DisplayServerEnums::INVALID_WINDOW_ID) {
-		send_window_event(windows[p_window], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+void DisplayServerMacOS::mouse_exit_window(WindowID p_window) {
+	if (window_mouseover_id == p_window && p_window != INVALID_WINDOW_ID) {
+		send_window_event(windows[p_window], WINDOW_EVENT_MOUSE_EXIT);
 	}
-	window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	window_mouseover_id = INVALID_WINDOW_ID;
 }
 
 void DisplayServerMacOS::_dispatch_input_events(const Ref<InputEvent> &p_event) {
@@ -444,7 +445,7 @@ void DisplayServerMacOS::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 		in_dispatch_input_event = true;
 
 		{
-			List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+			List<WindowID>::Element *E = popup_list.back();
 			if (E && Object::cast_to<InputEventKey>(*p_event)) {
 				// Redirect keyboard input to active popup.
 				if (windows.has(E->get())) {
@@ -459,7 +460,7 @@ void DisplayServerMacOS::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 		}
 
 		Ref<InputEventFromWindow> event_from_window = p_event;
-		if (event_from_window.is_valid() && event_from_window->get_window_id() != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
 			// Send to a window.
 			if (windows.has(event_from_window->get_window_id())) {
 				Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
@@ -470,7 +471,7 @@ void DisplayServerMacOS::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 		} else {
 			// Send to all windows. Copy all pending callbacks, since callback can erase window.
 			Vector<Callable> cbs;
-			for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+			for (KeyValue<WindowID, WindowData> &E : windows) {
 				Callable callable = E.value.input_event_callback;
 				if (callable.is_valid()) {
 					cbs.push_back(callable);
@@ -613,11 +614,11 @@ void DisplayServerMacOS::menu_callback(id p_sender) {
 	}
 }
 
-bool DisplayServerMacOS::has_window(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::has_window(WindowID p_window) const {
 	return windows.has(p_window);
 }
 
-DisplayServerMacOS::WindowData &DisplayServerMacOS::get_window(DisplayServerEnums::WindowID p_window) {
+DisplayServerMacOS::WindowData &DisplayServerMacOS::get_window(WindowID p_window) {
 	return windows[p_window];
 }
 
@@ -632,7 +633,7 @@ void DisplayServerMacOS::send_event(NSEvent *p_event) {
 			k.instantiate();
 
 			get_key_modifier_state([p_event modifierFlags], k);
-			k->set_window_id(DisplayServerEnums::INVALID_WINDOW_ID);
+			k->set_window_id(DisplayServerMacOS::INVALID_WINDOW_ID);
 			k->set_pressed(true);
 			k->set_keycode(Key::PERIOD);
 			k->set_physical_keycode(Key::PERIOD);
@@ -649,7 +650,7 @@ void DisplayServerMacOS::send_event(NSEvent *p_event) {
 			k.instantiate();
 
 			get_key_modifier_state([p_event modifierFlags], k);
-			k->set_window_id(DisplayServerEnums::INVALID_WINDOW_ID);
+			k->set_window_id(DisplayServerMacOS::INVALID_WINDOW_ID);
 			k->set_pressed(true);
 			k->set_keycode(Key::TAB);
 			k->set_physical_keycode(Key::TAB);
@@ -662,7 +663,7 @@ void DisplayServerMacOS::send_event(NSEvent *p_event) {
 	}
 }
 
-void DisplayServerMacOS::send_window_event(const WindowData &wd, DisplayServerEnums::WindowEvent p_event) const {
+void DisplayServerMacOS::send_window_event(const WindowData &wd, WindowEvent p_event) {
 	_THREAD_SAFE_METHOD_
 
 	if (wd.event_callback.is_valid()) {
@@ -671,11 +672,6 @@ void DisplayServerMacOS::send_window_event(const WindowData &wd, DisplayServerEn
 	}
 }
 
-void DisplayServerMacOS::send_window_event_by_id(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_id) const {
-	const WindowData &wd = windows[p_id];
-	send_window_event(wd, p_event);
-}
-
 void DisplayServerMacOS::release_pressed_events() {
 	_THREAD_SAFE_METHOD_
 	if (Input::get_singleton()) {
@@ -744,7 +740,14 @@ void DisplayServerMacOS::push_to_key_event_buffer(const DisplayServerMacOS::KeyE
 	key_event_buffer.write[key_event_pos++] = p_event;
 }
 
-void DisplayServerMacOS::set_last_focused_window(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::update_im_text(const Point2i &p_selection, const String &p_text) {
+	im_selection = p_selection;
+	im_text = p_text;
+
+	OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+}
+
+void DisplayServerMacOS::set_last_focused_window(WindowID p_window) {
 	last_focused_window = p_window;
 }
 
@@ -756,7 +759,7 @@ bool DisplayServerMacOS::get_is_resizing() const {
 	return is_resizing;
 }
 
-void DisplayServerMacOS::window_destroy(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_destroy(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 
 #if defined(GLES3_ENABLED)
@@ -773,17 +776,20 @@ void DisplayServerMacOS::window_destroy(DisplayServerEnums::WindowID p_window) {
 		rendering_context->window_destroy(p_window);
 	}
 #endif
-	AccessibilityServer::get_singleton()->window_destroy(p_window);
-
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_window);
+	}
+#endif
 	windows.erase(p_window);
 
 	if (last_focused_window == p_window) {
-		last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
+		last_focused_window = INVALID_WINDOW_ID;
 	}
 	update_presentation_mode();
 }
 
-void DisplayServerMacOS::window_resize(DisplayServerEnums::WindowID p_window, int p_width, int p_height) {
+void DisplayServerMacOS::window_resize(WindowID p_window, int p_width, int p_height) {
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		rendering_context->window_set_size(p_window, p_width, p_height);
@@ -793,54 +799,53 @@ void DisplayServerMacOS::window_resize(DisplayServerEnums::WindowID p_window, in
 	if (gl_manager_legacy) {
 		gl_manager_legacy->window_resize(p_window, p_width, p_height);
 	}
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->window_resize(p_window, p_width, p_height);
 	}
 #endif
-#endif
 }
 
-bool DisplayServerMacOS::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerMacOS::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_SUBWINDOWS:
-		//case DisplayServerEnums::FEATURE_TOUCHSCREEN:
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
-		case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_HIDPI:
-		case DisplayServerEnums::FEATURE_ICON:
-		case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		//case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		case DisplayServerEnums::FEATURE_SWAP_BUFFERS:
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
-		case DisplayServerEnums::FEATURE_EXTEND_TO_TITLE:
-		case DisplayServerEnums::FEATURE_SCREEN_CAPTURE:
-		case DisplayServerEnums::FEATURE_STATUS_INDICATOR:
-		case DisplayServerEnums::FEATURE_NATIVE_HELP:
-		case DisplayServerEnums::FEATURE_WINDOW_DRAG:
-		case DisplayServerEnums::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE:
-		case DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER:
-		case DisplayServerEnums::FEATURE_WINDOW_EMBEDDING:
-		case DisplayServerEnums::FEATURE_HDR_OUTPUT:
+		case FEATURE_SUBWINDOWS:
+		//case FEATURE_TOUCHSCREEN:
+		case FEATURE_MOUSE:
+		case FEATURE_MOUSE_WARP:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+		case FEATURE_NATIVE_DIALOG:
+		case FEATURE_NATIVE_DIALOG_INPUT:
+		case FEATURE_NATIVE_DIALOG_FILE:
+		case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		case FEATURE_NATIVE_DIALOG_FILE_MIME:
+		case FEATURE_IME:
+		case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_HIDPI:
+		case FEATURE_ICON:
+		case FEATURE_NATIVE_ICON:
+		//case FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_SWAP_BUFFERS:
+		case FEATURE_TEXT_TO_SPEECH:
+		case FEATURE_EXTEND_TO_TITLE:
+		case FEATURE_SCREEN_CAPTURE:
+		case FEATURE_STATUS_INDICATOR:
+		case FEATURE_NATIVE_HELP:
+		case FEATURE_WINDOW_DRAG:
+		case FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE:
+		case FEATURE_EMOJI_AND_SYMBOL_PICKER:
+		case FEATURE_WINDOW_EMBEDDING:
 			return true;
-		case DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER: {
-			return AccessibilityServer::get_singleton()->is_supported();
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
 		} break;
+#endif
 		default: {
 		}
 	}
@@ -905,18 +910,18 @@ Error DisplayServerMacOS::dialog_show(String p_title, String p_description, Vect
 	return OK;
 }
 
-Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false, p_window_id);
 }
 
-Error DisplayServerMacOS::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerMacOS::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true, p_window_id);
 }
 
-Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX_V(int(p_mode), DisplayServerEnums::FILE_DIALOG_MODE_SAVE_MAX, FAILED);
+	ERR_FAIL_INDEX_V(int(p_mode), FILE_DIALOG_MODE_SAVE_MAX, FAILED);
 
 	NSString *url = [NSString stringWithUTF8String:p_current_directory.utf8().get_data()];
 
@@ -930,7 +935,7 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 		[panel_delegate setRootPath:p_root];
 	}
 	Callable callback = p_callback; // Make a copy for async completion handler.
-	if (p_mode == DisplayServerEnums::FILE_DIALOG_MODE_SAVE_FILE) {
+	if (p_mode == FILE_DIALOG_MODE_SAVE_FILE) {
 		NSSavePanel *panel = [NSSavePanel savePanel];
 
 		[panel setDirectoryURL:[NSURL fileURLWithPath:url]];
@@ -1032,7 +1037,7 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 					}
 				}
 			}
-			if (p_window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (p_window_id != INVALID_WINDOW_ID) {
 				callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(p_window_id);
 			}
 		};
@@ -1049,16 +1054,15 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 		[panel setExtensionHidden:YES];
 		[panel setCanSelectHiddenExtension:YES];
 		[panel setCanCreateDirectories:YES];
-		[panel setCanChooseFiles:(p_mode != DisplayServerEnums::FILE_DIALOG_MODE_OPEN_DIR)];
-		[panel setCanChooseDirectories:(p_mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_DIR || p_mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_ANY)];
-		[panel setTreatsFilePackagesAsDirectories:YES];
+		[panel setCanChooseFiles:(p_mode != FILE_DIALOG_MODE_OPEN_DIR)];
+		[panel setCanChooseDirectories:(p_mode == FILE_DIALOG_MODE_OPEN_DIR || p_mode == FILE_DIALOG_MODE_OPEN_ANY)];
 		[panel setShowsHiddenFiles:p_show_hidden];
 		[panel setDelegate:panel_delegate];
 		if (p_filename != "") {
 			NSString *fileurl = [NSString stringWithUTF8String:p_filename.utf8().get_data()];
 			[panel setNameFieldStringValue:fileurl];
 		}
-		[panel setAllowsMultipleSelection:(p_mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILES)];
+		[panel setAllowsMultipleSelection:(p_mode == FILE_DIALOG_MODE_OPEN_FILES)];
 
 		void (^completion_handler)(NSInteger ret) = ^(NSInteger ret) {
 			if (ret == NSModalResponseOK) {
@@ -1153,7 +1157,7 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 					}
 				}
 			}
-			if (p_window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (p_window_id != INVALID_WINDOW_ID) {
 				callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(p_window_id);
 			}
 		};
@@ -1167,6 +1171,10 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 	return OK;
 }
 
+void DisplayServerMacOS::beep() const {
+	NSBeep();
+}
+
 Error DisplayServerMacOS::dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) {
 	_THREAD_SAFE_METHOD_
 
@@ -1203,24 +1211,32 @@ Error DisplayServerMacOS::dialog_input_text(String p_title, String p_description
 	return OK;
 }
 
-void DisplayServerMacOS::_mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_mode, DisplayServerEnums::MouseMode p_new_mode) {
+void DisplayServerMacOS::_mouse_update_mode() {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+			? mouse_mode_override
+			: mouse_mode_base;
+
+	if (wanted_mouse_mode == mouse_mode) {
+		return;
+	}
+
+	WindowID window_id = _get_focused_window_or_popup();
 	if (!windows.has(window_id)) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		window_id = MAIN_WINDOW_ID;
 	}
 	WindowData &wd = windows[window_id];
 
-	bool show_cursor = (p_new_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || p_new_mode == DisplayServerEnums::MOUSE_MODE_CONFINED);
-	bool previously_shown = (p_prev_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || p_prev_mode == DisplayServerEnums::MOUSE_MODE_CONFINED);
+	bool show_cursor = (wanted_mouse_mode == MOUSE_MODE_VISIBLE || wanted_mouse_mode == MOUSE_MODE_CONFINED);
+	bool previously_shown = (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED);
 
 	if (show_cursor && !previously_shown) {
 		window_id = get_window_at_screen_position(mouse_get_position());
 		mouse_enter_window(window_id);
 	}
 
-	if (p_new_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (wanted_mouse_mode == MOUSE_MODE_CAPTURED) {
 		// Apple Docs state that the display parameter is not used.
 		// "This parameter is not used. By default, you may pass kCGDirectMainDisplay."
 		// https://developer.apple.com/library/mac/documentation/graphicsimaging/reference/Quartz_Services_Ref/Reference/reference.html
@@ -1234,23 +1250,23 @@ void DisplayServerMacOS::_mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_
 		NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin;
 		CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y };
 		CGWarpMouseCursorPosition(lMouseWarpPos);
-	} else if (p_new_mode == DisplayServerEnums::MOUSE_MODE_HIDDEN) {
+	} else if (wanted_mouse_mode == MOUSE_MODE_HIDDEN) {
 		if (previously_shown) {
 			CGDisplayHideCursor(kCGDirectMainDisplay);
 		}
 		[wd.window_object setMovable:YES];
 		CGAssociateMouseAndMouseCursorPosition(true);
-	} else if (p_new_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	} else if (wanted_mouse_mode == MOUSE_MODE_CONFINED) {
 		CGDisplayShowCursor(kCGDirectMainDisplay);
 		[wd.window_object setMovable:NO];
 		CGAssociateMouseAndMouseCursorPosition(false);
-	} else if (p_new_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+	} else if (wanted_mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 		if (previously_shown) {
 			CGDisplayHideCursor(kCGDirectMainDisplay);
 		}
 		[wd.window_object setMovable:NO];
 		CGAssociateMouseAndMouseCursorPosition(false);
-	} else { // DisplayServerEnums::MOUSE_MODE_VISIBLE
+	} else { // MOUSE_MODE_VISIBLE
 		CGDisplayShowCursor(kCGDirectMainDisplay);
 		[wd.window_object setMovable:YES];
 		CGAssociateMouseAndMouseCursorPosition(true);
@@ -1259,12 +1275,51 @@ void DisplayServerMacOS::_mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_
 	last_warp = [[NSProcessInfo processInfo] systemUptime];
 	ignore_warp = true;
 	warp_events.clear();
+	mouse_mode = wanted_mouse_mode;
 
 	if (show_cursor) {
 		cursor_update_shape();
 	}
 }
 
+void DisplayServerMacOS::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
+	if (p_mode == mouse_mode_base) {
+		return;
+	}
+	mouse_mode_base = p_mode;
+	_mouse_update_mode();
+}
+
+DisplayServer::MouseMode DisplayServerMacOS::mouse_get_mode() const {
+	return mouse_mode;
+}
+
+void DisplayServerMacOS::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
+	if (p_mode == mouse_mode_override) {
+		return;
+	}
+	mouse_mode_override = p_mode;
+	_mouse_update_mode();
+}
+
+DisplayServer::MouseMode DisplayServerMacOS::mouse_get_mode_override() const {
+	return mouse_mode_override;
+}
+
+void DisplayServerMacOS::mouse_set_mode_override_enabled(bool p_override_enabled) {
+	if (p_override_enabled == mouse_mode_override_enabled) {
+		return;
+	}
+	mouse_mode_override_enabled = p_override_enabled;
+	_mouse_update_mode();
+}
+
+bool DisplayServerMacOS::mouse_is_mode_override_enabled() const {
+	return mouse_mode_override_enabled;
+}
+
 bool DisplayServerMacOS::update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, NSPoint &r_mpos, NSTimeInterval p_timestamp) {
 	_THREAD_SAFE_METHOD_
 
@@ -1277,7 +1332,7 @@ bool DisplayServerMacOS::update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, N
 		return true;
 	}
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+	if (mouse_mode == DisplayServer::MOUSE_MODE_CONFINED || mouse_mode == DisplayServer::MOUSE_MODE_CONFINED_HIDDEN) {
 		// Discard late events.
 		if (p_timestamp < last_warp) {
 			return true;
@@ -1334,10 +1389,10 @@ bool DisplayServerMacOS::update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, N
 void DisplayServerMacOS::warp_mouse(const Point2i &p_position) {
 	_THREAD_SAFE_METHOD_
 
-	if (mouse_mode != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
-		DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	if (mouse_mode != MOUSE_MODE_CAPTURED) {
+		WindowID window_id = _get_focused_window_or_popup();
 		if (!windows.has(window_id)) {
-			window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			window_id = MAIN_WINDOW_ID;
 		}
 		WindowData &wd = windows[window_id];
 
@@ -1355,7 +1410,7 @@ void DisplayServerMacOS::warp_mouse(const Point2i &p_position) {
 		CGEventSourceSetLocalEventsSuppressionInterval(lEventRef, 0.0);
 		CGAssociateMouseAndMouseCursorPosition(false);
 		CGWarpMouseCursorPosition(lMouseWarpPos);
-		if (mouse_mode != DisplayServerEnums::MOUSE_MODE_CONFINED && mouse_mode != DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+		if (mouse_mode != MOUSE_MODE_CONFINED && mouse_mode != MOUSE_MODE_CONFINED_HIDDEN) {
 			CGAssociateMouseAndMouseCursorPosition(true);
 		}
 	}
@@ -1409,6 +1464,10 @@ int DisplayServerMacOS::get_screen_count() const {
 	return [screenArray count];
 }
 
+int DisplayServerMacOS::get_primary_screen() const {
+	return 0;
+}
+
 int DisplayServerMacOS::get_keyboard_focus_screen() const {
 	const NSUInteger index = [[NSScreen screens] indexOfObject:[NSScreen mainScreen]];
 	return (index == NSNotFound) ? get_primary_screen() : index;
@@ -1454,12 +1513,11 @@ int DisplayServerMacOS::screen_get_dpi(int p_screen) const {
 
 	NSArray *screenArray = [NSScreen screens];
 	if ((NSUInteger)p_screen < [screenArray count]) {
-		NSScreen *screen = [screenArray objectAtIndex:p_screen];
-		NSDictionary *description = [screen deviceDescription];
+		NSDictionary *description = [[screenArray objectAtIndex:p_screen] deviceDescription];
 
 		const NSSize displayPixelSize = [[description objectForKey:NSDeviceSize] sizeValue];
-		const CGSize displayPhysicalSize = CGDisplayScreenSize(_get_display_id_for_screen(screen));
-		float scale = [screen backingScaleFactor];
+		const CGSize displayPhysicalSize = CGDisplayScreenSize([[description objectForKey:@"NSScreenNumber"] unsignedIntValue]);
+		float scale = [[screenArray objectAtIndex:p_screen] backingScaleFactor];
 
 		float den2 = (displayPhysicalSize.width / 25.4f) * (displayPhysicalSize.width / 25.4f) + (displayPhysicalSize.height / 25.4f) * (displayPhysicalSize.height / 25.4f);
 		if (den2 > 0.0f) {
@@ -1519,7 +1577,7 @@ Rect2i DisplayServerMacOS::screen_get_usable_rect(int p_screen) const {
 
 Color DisplayServerMacOS::screen_get_pixel(const Point2i &p_position) const {
 	HashSet<CGWindowID> exclude_windows;
-	for (HashMap<DisplayServerEnums::WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
+	for (HashMap<WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
 		if (E->value.hide_from_capture) {
 			exclude_windows.insert([E->value.window_object windowNumber]);
 		}
@@ -1563,7 +1621,7 @@ Ref<Image> DisplayServerMacOS::screen_get_image(int p_screen) const {
 	ERR_FAIL_INDEX_V(p_screen, screen_count, Ref<Image>());
 
 	HashSet<CGWindowID> exclude_windows;
-	for (HashMap<DisplayServerEnums::WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
+	for (HashMap<WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
 		if (E->value.hide_from_capture) {
 			exclude_windows.insert([E->value.window_object windowNumber]);
 		}
@@ -1611,7 +1669,7 @@ Ref<Image> DisplayServerMacOS::screen_get_image(int p_screen) const {
 
 Ref<Image> DisplayServerMacOS::screen_get_image_rect(const Rect2i &p_rect) const {
 	HashSet<CGWindowID> exclude_windows;
-	for (HashMap<DisplayServerEnums::WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
+	for (HashMap<WindowID, WindowData>::ConstIterator E = windows.begin(); E; ++E) {
 		if (E->value.hide_from_capture) {
 			exclude_windows.insert([E->value.window_object windowNumber]);
 		}
@@ -1657,30 +1715,61 @@ Ref<Image> DisplayServerMacOS::screen_get_image_rect(const Rect2i &p_rect) const
 	return img;
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerMacOS::get_window_list() const {
+float DisplayServerMacOS::screen_get_refresh_rate(int p_screen) const {
+	_THREAD_SAFE_METHOD_
+
+	p_screen = _get_screen_index(p_screen);
+	int screen_count = get_screen_count();
+	ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_REFRESH_RATE_FALLBACK);
+
+	NSArray *screenArray = [NSScreen screens];
+	if ((NSUInteger)p_screen < [screenArray count]) {
+		NSDictionary *description = [[screenArray objectAtIndex:p_screen] deviceDescription];
+		const CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode([[description objectForKey:@"NSScreenNumber"] unsignedIntValue]);
+		const double displayRefreshRate = CGDisplayModeGetRefreshRate(displayMode);
+		return (float)displayRefreshRate;
+	}
+	ERR_PRINT("An error occurred while trying to get the screen refresh rate.");
+	return SCREEN_REFRESH_RATE_FALLBACK;
+}
+
+bool DisplayServerMacOS::screen_is_kept_on() const {
+	return (screen_keep_on_assertion);
+}
+
+void DisplayServerMacOS::screen_set_keep_on(bool p_enable) {
+	if (screen_keep_on_assertion) {
+		IOPMAssertionRelease(screen_keep_on_assertion);
+		screen_keep_on_assertion = kIOPMNullAssertionID;
+	}
+
+	if (p_enable) {
+		String app_name_string = GLOBAL_GET("application/config/name");
+		NSString *name = [NSString stringWithUTF8String:(app_name_string.is_empty() ? "Godot Engine" : app_name_string.utf8().get_data())];
+		NSString *reason = @"Godot Engine running with display/window/energy_saving/keep_screen_on = true";
+		IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep, (__bridge CFStringRef)name, (__bridge CFStringRef)reason, (__bridge CFStringRef)reason, nullptr, 0, nullptr, &screen_keep_on_assertion);
+	}
+}
+
+Vector<DisplayServer::WindowID> DisplayServerMacOS::get_window_list() const {
 	_THREAD_SAFE_METHOD_
 
 	Vector<int> ret;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		ret.push_back(E.key);
 	}
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOS::create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent) {
+DisplayServer::WindowID DisplayServerMacOS::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID id = _create_window(p_mode, p_vsync_mode, p_rect);
-
-	uint32_t set_flags = p_flags & ~(DisplayServerEnums::WINDOW_FLAG_MAX - 1); // Clear the flags that are not supported by the window.
-	while (set_flags != 0) {
-		// Find the index of the next set bit.
-		uint32_t index = (uint32_t)__builtin_ctzll(set_flags);
-		// Clear the set bit.
-		set_flags &= (set_flags - 1);
-		window_set_flag(DisplayServerEnums::WindowFlags(index), true, id);
+	WindowID id = _create_window(p_mode, p_vsync_mode, p_rect);
+	for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
+		if (p_flags & (1 << i)) {
+			window_set_flag(WindowFlags(i), true, id);
+		}
 	}
-
 #ifdef RD_ENABLED
 	if (rendering_device) {
 		rendering_device->screen_create(id);
@@ -1688,17 +1777,17 @@ DisplayServerEnums::WindowID DisplayServerMacOS::create_sub_window(DisplayServer
 #endif
 
 	window_set_exclusive(id, p_exclusive);
-	if (p_transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_transient_parent != INVALID_WINDOW_ID) {
 		window_set_transient(id, p_transient_parent);
 	}
 
 	return id;
 }
 
-void DisplayServerMacOS::show_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServerMacOS::show_window(WindowID p_id) {
 	WindowData &wd = windows[p_id];
 
-	if (p_id == DisplayServerEnums::MAIN_WINDOW_ID) {
+	if (p_id == MAIN_WINDOW_ID) {
 		[GodotApp activateApplication];
 	}
 
@@ -1706,11 +1795,11 @@ void DisplayServerMacOS::show_window(DisplayServerEnums::WindowID p_id) {
 	if ([wd.window_object isMiniaturized]) {
 		return;
 	} else if (wd.no_focus) {
-		if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (wd.transient_parent != INVALID_WINDOW_ID) {
 			WindowData &wd_parent = windows[wd.transient_parent];
 			[wd.window_object orderWindow:NSWindowAbove relativeTo:[wd_parent.window_object windowNumber]];
-		} else if (p_id != DisplayServerEnums::MAIN_WINDOW_ID) {
-			[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[DisplayServerEnums::MAIN_WINDOW_ID].window_object windowNumber]];
+		} else if (p_id != MAIN_WINDOW_ID) {
+			[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[MAIN_WINDOW_ID].window_object windowNumber]];
 		} else {
 			[wd.window_object orderFront:nil];
 		}
@@ -1719,11 +1808,11 @@ void DisplayServerMacOS::show_window(DisplayServerEnums::WindowID p_id) {
 	}
 }
 
-void DisplayServerMacOS::delete_sub_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServerMacOS::delete_sub_window(WindowID p_id) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_id));
-	ERR_FAIL_COND_MSG(p_id == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be deleted");
+	ERR_FAIL_COND_MSG(p_id == MAIN_WINDOW_ID, "Main window can't be deleted");
 
 	WindowData &wd = windows[p_id];
 
@@ -1734,7 +1823,7 @@ void DisplayServerMacOS::delete_sub_window(DisplayServerEnums::WindowID p_id) {
 	mouse_enter_window(get_window_at_screen_position(mouse_get_position()));
 }
 
-void DisplayServerMacOS::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1742,7 +1831,7 @@ void DisplayServerMacOS::window_set_rect_changed_callback(const Callable &p_call
 	wd.rect_changed_callback = p_callable;
 }
 
-void DisplayServerMacOS::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1750,7 +1839,7 @@ void DisplayServerMacOS::window_set_window_event_callback(const Callable &p_call
 	wd.event_callback = p_callable;
 }
 
-void DisplayServerMacOS::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1758,21 +1847,21 @@ void DisplayServerMacOS::window_set_input_event_callback(const Callable &p_calla
 	wd.input_event_callback = p_callable;
 }
 
-void DisplayServerMacOS::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	wd.input_text_callback = p_callable;
 }
 
-void DisplayServerMacOS::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	wd.drop_files_callback = p_callable;
 }
 
-void DisplayServerMacOS::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_title(const String &p_title, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1781,7 +1870,7 @@ void DisplayServerMacOS::window_set_title(const String &p_title, DisplayServerEn
 	[wd.window_object setTitle:[NSString stringWithUTF8String:p_title.utf8().get_data()]];
 }
 
-Size2i DisplayServerMacOS::window_get_title_size(const String &p_title, DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerMacOS::window_get_title_size(const String &p_title, WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	Size2i size;
@@ -1822,7 +1911,7 @@ Size2i DisplayServerMacOS::window_get_title_size(const String &p_title, DisplayS
 	return size * scale;
 }
 
-void DisplayServerMacOS::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1831,16 +1920,16 @@ void DisplayServerMacOS::window_set_mouse_passthrough(const Vector<Vector2> &p_r
 	wd.mpath = p_region;
 }
 
-int DisplayServerMacOS::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
+int DisplayServerMacOS::window_get_current_screen(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::INVALID_SCREEN);
+	ERR_FAIL_COND_V(!windows.has(p_window), INVALID_SCREEN);
 	const WindowData &wd = windows[p_window];
 
 	const NSUInteger index = [[NSScreen screens] indexOfObject:[wd.window_object screen]];
 	return (index == NSNotFound) ? 0 : index;
 }
 
-void DisplayServerMacOS::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_current_screen(int p_screen, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -1885,16 +1974,14 @@ void DisplayServerMacOS::window_set_current_screen(int p_screen, DisplayServerEn
 	}
 }
 
-void DisplayServerMacOS::reparent_check(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::reparent_check(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	NSScreen *screen = [wd.window_object screen];
 
-	_update_hdr_output(p_window, wd.hdr_output);
-
 	_window_update_display_id(&wd);
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (wd.transient_parent != INVALID_WINDOW_ID) {
 		WindowData &wd_parent = windows[wd.transient_parent];
 		NSScreen *parent_screen = [wd_parent.window_object screen];
 
@@ -1907,11 +1994,11 @@ void DisplayServerMacOS::reparent_check(DisplayServerEnums::WindowID p_window) {
 			if ([[wd_parent.window_object childWindows] containsObject:wd.window_object]) {
 				[wd_parent.window_object removeChildWindow:wd.window_object];
 				[wd.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-				if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+				if (wd.transient_parent != INVALID_WINDOW_ID) {
 					WindowData &wd_parent = windows[wd.transient_parent];
 					[wd.window_object orderWindow:NSWindowAbove relativeTo:[wd_parent.window_object windowNumber]];
-				} else if (p_window != DisplayServerEnums::MAIN_WINDOW_ID) {
-					[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[DisplayServerEnums::MAIN_WINDOW_ID].window_object windowNumber]];
+				} else if (p_window != MAIN_WINDOW_ID) {
+					[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[MAIN_WINDOW_ID].window_object windowNumber]];
 				} else {
 					[wd.window_object orderFront:nil];
 				}
@@ -1919,7 +2006,7 @@ void DisplayServerMacOS::reparent_check(DisplayServerEnums::WindowID p_window) {
 		}
 	}
 
-	for (const DisplayServerEnums::WindowID &child : wd.transient_children) {
+	for (const WindowID &child : wd.transient_children) {
 		WindowData &wd_child = windows[child];
 		NSScreen *child_screen = [wd_child.window_object screen];
 
@@ -1940,7 +2027,7 @@ void DisplayServerMacOS::reparent_check(DisplayServerEnums::WindowID p_window) {
 	}
 }
 
-void DisplayServerMacOS::window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive) {
+void DisplayServerMacOS::window_set_exclusive(WindowID p_window, bool p_exclusive) {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
@@ -1950,7 +2037,7 @@ void DisplayServerMacOS::window_set_exclusive(DisplayServerEnums::WindowID p_win
 	}
 }
 
-Point2i DisplayServerMacOS::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerMacOS::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
@@ -1973,7 +2060,7 @@ Point2i DisplayServerMacOS::window_get_position(DisplayServerEnums::WindowID p_w
 	return pos;
 }
 
-Point2i DisplayServerMacOS::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerMacOS::window_get_position_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
@@ -1994,7 +2081,7 @@ Point2i DisplayServerMacOS::window_get_position_with_decorations(DisplayServerEn
 	return pos;
 }
 
-void DisplayServerMacOS::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_position(const Point2i &p_position, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2026,7 +2113,7 @@ void DisplayServerMacOS::window_set_position(const Point2i &p_position, DisplayS
 	update_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
 }
 
-void DisplayServerMacOS::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerMacOS::window_set_transient(WindowID p_window, WindowID p_parent) {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND(p_window == p_parent);
 
@@ -2036,14 +2123,14 @@ void DisplayServerMacOS::window_set_transient(DisplayServerEnums::WindowID p_win
 	ERR_FAIL_COND(wd_window.transient_parent == p_parent);
 
 	ERR_FAIL_COND_MSG(wd_window.on_top, "Windows with the 'on top' can't become transient.");
-	if (p_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_parent == INVALID_WINDOW_ID) {
 		// Remove transient.
-		ERR_FAIL_COND(wd_window.transient_parent == DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_COND(wd_window.transient_parent == INVALID_WINDOW_ID);
 		ERR_FAIL_COND(!windows.has(wd_window.transient_parent));
 
 		WindowData &wd_parent = windows[wd_window.transient_parent];
 
-		wd_window.transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
+		wd_window.transient_parent = INVALID_WINDOW_ID;
 		wd_parent.transient_children.erase(p_window);
 		if ([[wd_parent.window_object childWindows] containsObject:wd_window.window_object]) {
 			[wd_parent.window_object removeChildWindow:wd_window.window_object];
@@ -2051,7 +2138,7 @@ void DisplayServerMacOS::window_set_transient(DisplayServerEnums::WindowID p_win
 		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 	} else {
 		ERR_FAIL_COND(!windows.has(p_parent));
-		ERR_FAIL_COND_MSG(wd_window.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID, "Window already has a transient parent");
+		ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
 		WindowData &wd_parent = windows[p_parent];
 
 		wd_window.transient_parent = p_parent;
@@ -2060,7 +2147,7 @@ void DisplayServerMacOS::window_set_transient(DisplayServerEnums::WindowID p_win
 	}
 }
 
-void DisplayServerMacOS::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2080,7 +2167,7 @@ void DisplayServerMacOS::window_set_max_size(const Size2i p_size, DisplayServerE
 	}
 }
 
-Size2i DisplayServerMacOS::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerMacOS::window_get_max_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2090,7 +2177,7 @@ Size2i DisplayServerMacOS::window_get_max_size(DisplayServerEnums::WindowID p_wi
 
 void DisplayServerMacOS::update_presentation_mode() {
 	bool has_fs_windows = false;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &wd : windows) {
+	for (const KeyValue<WindowID, WindowData> &wd : windows) {
 		if (wd.value.fullscreen) {
 			if (wd.value.exclusive_fullscreen) {
 				return;
@@ -2106,7 +2193,7 @@ void DisplayServerMacOS::update_presentation_mode() {
 	}
 }
 
-void DisplayServerMacOS::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2126,7 +2213,7 @@ void DisplayServerMacOS::window_set_min_size(const Size2i p_size, DisplayServerE
 	}
 }
 
-Size2i DisplayServerMacOS::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerMacOS::window_get_min_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2135,7 +2222,7 @@ Size2i DisplayServerMacOS::window_get_min_size(DisplayServerEnums::WindowID p_wi
 	return wd.min_size;
 }
 
-void DisplayServerMacOS::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2163,7 +2250,7 @@ void DisplayServerMacOS::window_set_size(const Size2i p_size, DisplayServerEnums
 	_update_window_style(wd, p_window);
 }
 
-Size2i DisplayServerMacOS::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerMacOS::window_get_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2171,7 +2258,7 @@ Size2i DisplayServerMacOS::window_get_size(DisplayServerEnums::WindowID p_window
 	return wd.size;
 }
 
-Size2i DisplayServerMacOS::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerMacOS::window_get_size_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2180,28 +2267,28 @@ Size2i DisplayServerMacOS::window_get_size_with_decorations(DisplayServerEnums::
 	return Size2i(frame.size.width, frame.size.height) * screen_get_max_scale();
 }
 
-void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
-	DisplayServerEnums::WindowMode old_mode = window_get_mode(p_window);
+	WindowMode old_mode = window_get_mode(p_window);
 	if (old_mode == p_mode) {
 		return; // Do nothing.
 	}
 
 	switch (old_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case WINDOW_MODE_WINDOWED: {
 			// Do nothing.
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case WINDOW_MODE_MINIMIZED: {
 			[wd.window_object deminiaturize:nil];
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN: {
-			if (p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN) {
-				if (p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
+		case WINDOW_MODE_FULLSCREEN: {
+			if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN || p_mode == WINDOW_MODE_FULLSCREEN) {
+				if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 					const NSUInteger presentationOptions = NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar;
 					[NSApp setPresentationOptions:presentationOptions];
 					wd.exclusive_fullscreen = true;
@@ -2230,14 +2317,14 @@ void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode,
 			}
 			[wd.window_object toggleFullScreen:nil];
 
-			if (old_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+			if (old_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 				update_presentation_mode();
 			}
 
 			wd.fullscreen = false;
 			wd.exclusive_fullscreen = false;
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case WINDOW_MODE_MAXIMIZED: {
 			if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
 				if (wd.borderless) {
 					if (wd.pre_zoom_rect.size.width > 0 && wd.pre_zoom_rect.size.height > 0) {
@@ -2251,14 +2338,14 @@ void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode,
 	}
 
 	switch (p_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
+		case WINDOW_MODE_WINDOWED: {
 			// Do nothing.
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED: {
+		case WINDOW_MODE_MINIMIZED: {
 			[wd.window_object performMiniaturize:nil];
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN: {
+		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
+		case WINDOW_MODE_FULLSCREEN: {
 			if (wd.resize_disabled) { // Fullscreen window should be resizable to work.
 				[wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskResizable];
 			}
@@ -2267,7 +2354,7 @@ void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode,
 			[wd.window_object toggleFullScreen:nil];
 
 			wd.fullscreen = true;
-			if (p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+			if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 				const NSUInteger presentationOptions = NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar;
 				[NSApp setPresentationOptions:presentationOptions];
 				wd.exclusive_fullscreen = true;
@@ -2276,7 +2363,7 @@ void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode,
 				update_presentation_mode();
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED: {
+		case WINDOW_MODE_MAXIMIZED: {
 			if (!NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
 				wd.pre_zoom_rect = [wd.window_object frame];
 				if (wd.borderless) {
@@ -2289,33 +2376,33 @@ void DisplayServerMacOS::window_set_mode(DisplayServerEnums::WindowMode p_mode,
 	}
 }
 
-DisplayServerEnums::WindowMode DisplayServerMacOS::window_get_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::WindowMode DisplayServerMacOS::window_get_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::WINDOW_MODE_WINDOWED);
+	ERR_FAIL_COND_V(!windows.has(p_window), WINDOW_MODE_WINDOWED);
 	const WindowData &wd = windows[p_window];
 
 	if (wd.fullscreen) { // If fullscreen, it's not in another mode.
 		if (wd.exclusive_fullscreen) {
-			return DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
+			return WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
 		} else {
-			return DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+			return WINDOW_MODE_FULLSCREEN;
 		}
 	}
 	if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
-		return DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+		return WINDOW_MODE_MAXIMIZED;
 	}
 	if ([wd.window_object respondsToSelector:@selector(isMiniaturized)]) {
 		if ([wd.window_object isMiniaturized]) {
-			return DisplayServerEnums::WINDOW_MODE_MINIMIZED;
+			return WINDOW_MODE_MINIMIZED;
 		}
 	}
 
 	// All other discarded, return windowed.
-	return DisplayServerEnums::WINDOW_MODE_WINDOWED;
+	return WINDOW_MODE_WINDOWED;
 }
 
-bool DisplayServerMacOS::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::window_is_maximize_allowed(WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 
@@ -2332,7 +2419,7 @@ bool DisplayServerMacOS::window_minimize_on_title_dbl_click() const {
 	return [value isEqualToString:@"Minimize"];
 }
 
-void DisplayServerMacOS::window_start_drag(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_start_drag(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2342,17 +2429,17 @@ void DisplayServerMacOS::window_start_drag(DisplayServerEnums::WindowID p_window
 	[wd.window_object performWindowDragWithEvent:event];
 }
 
-void DisplayServerMacOS::window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_start_resize(WindowResizeEdge p_edge, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(int(p_edge), DisplayServerEnums::WINDOW_EDGE_MAX);
+	ERR_FAIL_INDEX(int(p_edge), WINDOW_EDGE_MAX);
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
 	wd.edge = p_edge;
 }
 
-void DisplayServerMacOS::window_set_window_buttons_offset(const Vector2i &p_offset, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_window_buttons_offset(const Vector2i &p_offset, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2365,7 +2452,7 @@ void DisplayServerMacOS::window_set_window_buttons_offset(const Vector2i &p_offs
 	}
 }
 
-Vector3i DisplayServerMacOS::window_get_safe_title_margins(DisplayServerEnums::WindowID p_window) const {
+Vector3i DisplayServerMacOS::window_get_safe_title_margins(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Vector3i());
@@ -2419,26 +2506,26 @@ void DisplayServerMacOS::window_set_custom_window_buttons(WindowData &p_wd, bool
 	}
 }
 
-void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			wd.no_min_btn = p_enabled;
 			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!p_enabled];
 			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			wd.no_max_btn = p_enabled;
 			[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:!p_enabled];
 			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			wd.resize_disabled = p_enabled;
 			if (wd.fullscreen) { // Fullscreen window should be resizable, style will be applied on exiting fullscreen.
 				return;
@@ -2453,7 +2540,7 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE: {
+		case WINDOW_FLAG_EXTEND_TO_TITLE: {
 			NSRect rect = [wd.window_object frame];
 			wd.extend_to_title = p_enabled;
 			if (p_enabled) {
@@ -2470,9 +2557,9 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 				}
 			}
 			[wd.window_object setFrame:rect display:YES];
-			send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE);
+			send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_TITLEBAR_CHANGE);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			if (wd.fullscreen) {
 				return;
 			}
@@ -2511,11 +2598,11 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 				if ([wd.window_object isMiniaturized]) {
 					return;
 				} else if (wd.no_focus) {
-					if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+					if (wd.transient_parent != INVALID_WINDOW_ID) {
 						WindowData &wd_parent = windows[wd.transient_parent];
 						[wd.window_object orderWindow:NSWindowAbove relativeTo:[wd_parent.window_object windowNumber]];
-					} else if (p_window != DisplayServerEnums::MAIN_WINDOW_ID) {
-						[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[DisplayServerEnums::MAIN_WINDOW_ID].window_object windowNumber]];
+					} else if (p_window != MAIN_WINDOW_ID) {
+						[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[MAIN_WINDOW_ID].window_object windowNumber]];
 					} else {
 						[wd.window_object orderFront:nil];
 					}
@@ -2527,7 +2614,7 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 				[wd.window_object setFrame:[[wd.window_object screen] visibleFrame] display:NO];
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
 			wd.on_top = p_enabled;
 			if (wd.fullscreen) {
 				return;
@@ -2538,7 +2625,7 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 				[(NSWindow *)wd.window_object setLevel:NSNormalWindowLevel];
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			if (wd.fullscreen) {
 				return;
 			}
@@ -2551,13 +2638,13 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 				[wd.window_object setFrame:frameRect display:NO];
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			wd.no_focus = p_enabled;
 
 			NSWindow *w = wd.window_object;
 			w.excludedFromWindowsMenu = wd.is_popup || wd.no_focus;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
+		case WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
 			if (p_enabled) {
 				[wd.window_object setSharingType:NSWindowSharingNone];
 			} else {
@@ -2565,11 +2652,11 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 			}
 			wd.hide_from_capture = p_enabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			wd.mpass = p_enabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
-			ERR_FAIL_COND_MSG(p_window == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be popup.");
+		case WINDOW_FLAG_POPUP: {
+			ERR_FAIL_COND_MSG(p_window == MAIN_WINDOW_ID, "Main window can't be popup.");
 			ERR_FAIL_COND_MSG([wd.window_object isVisible] && (wd.is_popup != p_enabled), "Popup flag can't changed while window is opened.");
 			wd.is_popup = p_enabled;
 
@@ -2581,44 +2668,44 @@ void DisplayServerMacOS::window_set_flag(DisplayServerEnums::WindowFlags p_flag,
 	}
 }
 
-bool DisplayServerMacOS::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			return wd.no_max_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			return wd.no_min_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return wd.resize_disabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE: {
+		case WINDOW_FLAG_EXTEND_TO_TITLE: {
 			return [wd.window_object styleMask] & NSWindowStyleMaskFullSizeContentView;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			return [wd.window_object styleMask] == NSWindowStyleMaskBorderless;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
 			return wd.on_top;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			return wd.layered_window;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			return wd.no_focus;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
+		case WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
 			return wd.hide_from_capture;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			return wd.mpass;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
+		case WINDOW_FLAG_POPUP: {
 			return wd.is_popup;
 		} break;
 		default: {
@@ -2628,34 +2715,12 @@ bool DisplayServerMacOS::window_get_flag(DisplayServerEnums::WindowFlags p_flag,
 	return false;
 }
 
-void DisplayServerMacOS::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_request_attention(WindowID p_window) {
 	// It's app global, ignore window id.
 	[NSApp requestUserAttention:NSCriticalRequest];
 }
 
-void DisplayServerMacOS::window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND(p_window != DisplayServerEnums::MAIN_WINDOW_ID);
-
-	if (!dock_progress) {
-		dock_progress = [[GodotProgressView alloc] init];
-		[NSApp.dockTile setContentView:dock_progress];
-	}
-
-	[dock_progress setValue:p_value];
-}
-
-void DisplayServerMacOS::window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window) {
-	ERR_FAIL_COND(p_window != DisplayServerEnums::MAIN_WINDOW_ID);
-
-	if (!dock_progress) {
-		dock_progress = [[GodotProgressView alloc] init];
-		[NSApp.dockTile setContentView:dock_progress];
-	}
-
-	[dock_progress setState:p_state];
-}
-
-void DisplayServerMacOS::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_move_to_foreground(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2663,11 +2728,11 @@ void DisplayServerMacOS::window_move_to_foreground(DisplayServerEnums::WindowID
 
 	[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
 	if (wd.no_focus || wd.is_popup) {
-		if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (wd.transient_parent != INVALID_WINDOW_ID) {
 			WindowData &wd_parent = windows[wd.transient_parent];
 			[wd.window_object orderWindow:NSWindowAbove relativeTo:[wd_parent.window_object windowNumber]];
-		} else if (p_window != DisplayServerEnums::MAIN_WINDOW_ID) {
-			[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[DisplayServerEnums::MAIN_WINDOW_ID].window_object windowNumber]];
+		} else if (p_window != MAIN_WINDOW_ID) {
+			[wd.window_object orderWindow:NSWindowAbove relativeTo:[windows[MAIN_WINDOW_ID].window_object windowNumber]];
 		} else {
 			[wd.window_object orderFront:nil];
 		}
@@ -2676,7 +2741,7 @@ void DisplayServerMacOS::window_move_to_foreground(DisplayServerEnums::WindowID
 	}
 }
 
-bool DisplayServerMacOS::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::window_is_focused(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
@@ -2685,18 +2750,18 @@ bool DisplayServerMacOS::window_is_focused(DisplayServerEnums::WindowID p_window
 	return wd.focused;
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOS::get_focused_window() const {
+DisplayServerMacOS::WindowID DisplayServerMacOS::get_focused_window() const {
 	return last_focused_window;
 }
 
-bool DisplayServerMacOS::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerMacOS::window_can_draw(WindowID p_window) const {
 	return windows[p_window].is_visible;
 }
 
 bool DisplayServerMacOS::can_any_window_draw() const {
 	_THREAD_SAFE_METHOD_
 
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (E.value.is_visible) {
 			return true;
 		}
@@ -2704,7 +2769,7 @@ bool DisplayServerMacOS::can_any_window_draw() const {
 	return false;
 }
 
-void DisplayServerMacOS::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_ime_active(const bool p_active, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2717,7 +2782,7 @@ void DisplayServerMacOS::window_set_ime_active(const bool p_active, DisplayServe
 	}
 }
 
-void DisplayServerMacOS::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2726,59 +2791,53 @@ void DisplayServerMacOS::window_set_ime_position(const Point2i &p_pos, DisplaySe
 	wd.im_position = p_pos;
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOS::get_window_at_screen_position(const Point2i &p_position) const {
+DisplayServer::WindowID DisplayServerMacOS::get_window_at_screen_position(const Point2i &p_position) const {
 	Point2i position = p_position;
 	position.y *= -1;
 	position += _get_screens_origin();
 	position /= screen_get_max_scale();
 
 	NSInteger wnum = [NSWindow windowNumberAtPoint:NSMakePoint(position.x, position.y) belowWindowWithWindowNumber:0 /*topmost*/];
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if ([E.value.window_object windowNumber] == wnum) {
 			return E.key;
 		}
 	}
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+	return INVALID_WINDOW_ID;
 }
 
-int64_t DisplayServerMacOS::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
+int64_t DisplayServerMacOS::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), 0);
 	switch (p_handle_type) {
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			return 0; // Not supported.
 		}
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return (int64_t)windows[p_window].window_object;
 		}
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			return (int64_t)windows[p_window].window_view;
 		}
 #ifdef GLES3_ENABLED
-		case DisplayServerEnums::OPENGL_CONTEXT: {
+		case OPENGL_CONTEXT: {
 			if (gl_manager_legacy) {
 				return (int64_t)gl_manager_legacy->get_context(p_window);
 			}
-#if defined(ANGLE_ENABLED)
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_context(p_window);
 			}
-#endif
 			return 0;
 		}
-		case DisplayServerEnums::EGL_DISPLAY: {
-#if defined(ANGLE_ENABLED)
+		case EGL_DISPLAY: {
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_display(p_window);
 			}
-#endif
 			return 0;
 		}
-		case DisplayServerEnums::EGL_CONFIG: {
-#if defined(ANGLE_ENABLED)
+		case EGL_CONFIG: {
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_config(p_window);
 			}
-#endif
 			return 0;
 		}
 #endif
@@ -2788,43 +2847,39 @@ int64_t DisplayServerMacOS::window_get_native_handle(DisplayServerEnums::HandleT
 	}
 }
 
-void DisplayServerMacOS::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].instance_id = p_instance;
 }
 
-ObjectID DisplayServerMacOS::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerMacOS::window_get_attached_instance_id(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), ObjectID());
 	return windows[p_window].instance_id;
 }
 
-void DisplayServerMacOS::gl_window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerMacOS::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 #if defined(GLES3_ENABLED)
 	if (gl_manager_legacy) {
 		gl_manager_legacy->window_make_current(p_window_id);
 	}
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->window_make_current(p_window_id);
 	}
 #endif
-#endif
 }
 
-void DisplayServerMacOS::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
-		gl_manager_angle->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager_angle->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
-#endif
 	if (gl_manager_legacy) {
-		gl_manager_legacy->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager_legacy->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 #endif
 #if defined(RD_ENABLED)
@@ -2834,16 +2889,14 @@ void DisplayServerMacOS::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_v
 #endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerMacOS::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerMacOS::window_get_vsync_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
-		return (gl_manager_angle->is_using_vsync() ? DisplayServerEnums::VSyncMode::VSYNC_ENABLED : DisplayServerEnums::VSyncMode::VSYNC_DISABLED);
+		return (gl_manager_angle->is_using_vsync() ? DisplayServer::VSyncMode::VSYNC_ENABLED : DisplayServer::VSyncMode::VSYNC_DISABLED);
 	}
-#endif
 	if (gl_manager_legacy) {
-		return (gl_manager_legacy->is_using_vsync() ? DisplayServerEnums::VSyncMode::VSYNC_ENABLED : DisplayServerEnums::VSyncMode::VSYNC_DISABLED);
+		return (gl_manager_legacy->is_using_vsync() ? DisplayServer::VSyncMode::VSYNC_ENABLED : DisplayServer::VSyncMode::VSYNC_DISABLED);
 	}
 #endif
 #if defined(RD_ENABLED)
@@ -2851,52 +2904,31 @@ DisplayServerEnums::VSyncMode DisplayServerMacOS::window_get_vsync_mode(DisplayS
 		return rendering_context->window_get_vsync_mode(p_window);
 	}
 #endif
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
-DisplayServerMacOSBase::HDROutput &DisplayServerMacOS::_get_hdr_output(DisplayServerEnums::WindowID p_window) {
-	return windows.getptr(p_window)->hdr_output;
+int DisplayServerMacOS::accessibility_should_increase_contrast() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getHighContrast];
 }
 
-const DisplayServerMacOSBase::HDROutput &DisplayServerMacOS::_get_hdr_output(DisplayServerEnums::WindowID p_window) const {
-	return windows.getptr(p_window)->hdr_output;
+int DisplayServerMacOS::accessibility_should_reduce_animation() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceMotion];
 }
 
-void DisplayServerMacOS::window_get_edr_values(DisplayServerEnums::WindowID p_window, CGFloat *r_max_potential_edr_value, CGFloat *r_max_edr_value) const {
-	_THREAD_SAFE_METHOD_
-
-	const WindowData *wd = windows.getptr(p_window);
-	ERR_FAIL_NULL(wd);
-
-	NSScreen *screen = wd->window_object.screen;
-#define SET_VAL(v, val) \
-	if (v) { \
-		*v = val; \
-	}
-
-	if (@available(macOS 10.15, *)) {
-		SET_VAL(r_max_potential_edr_value, screen.maximumPotentialExtendedDynamicRangeColorComponentValue);
-		SET_VAL(r_max_edr_value, screen.maximumExtendedDynamicRangeColorComponentValue);
-	} else {
-		SET_VAL(r_max_potential_edr_value, 1.0);
-		SET_VAL(r_max_edr_value, 1.0);
-	}
-
-#undef SET_VAL
+int DisplayServerMacOS::accessibility_should_reduce_transparency() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceTransparency];
 }
 
-void DisplayServerMacOS::update_screen_parameters() {
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (E.value.hdr_output.requested) {
-			_update_hdr_output(E.key, E.value.hdr_output);
-		}
-	}
+int DisplayServerMacOS::accessibility_screen_reader_active() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getVoiceOver];
+}
 
-#ifdef TOOLS_ENABLED
-	for (KeyValue<ProcessID, EmbeddedProcessData> &E : embedded_processes) {
-		E.value.process->display_state_changed();
-	}
-#endif
+Point2i DisplayServerMacOS::ime_get_selection() const {
+	return im_selection;
+}
+
+String DisplayServerMacOS::ime_get_text() const {
+	return im_text;
 }
 
 void DisplayServerMacOS::cursor_update_shape() {
@@ -2906,55 +2938,55 @@ void DisplayServerMacOS::cursor_update_shape() {
 		[cursors[cursor_shape] set];
 	} else {
 		switch (cursor_shape) {
-			case DisplayServerEnums::CURSOR_ARROW:
+			case CURSOR_ARROW:
 				[[NSCursor arrowCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_IBEAM:
+			case CURSOR_IBEAM:
 				[[NSCursor IBeamCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_POINTING_HAND:
+			case CURSOR_POINTING_HAND:
 				[[NSCursor pointingHandCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_CROSS:
+			case CURSOR_CROSS:
 				[[NSCursor crosshairCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_WAIT:
+			case CURSOR_WAIT:
 				[[NSCursor arrowCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_BUSY:
+			case CURSOR_BUSY:
 				[[NSCursor arrowCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_DRAG:
+			case CURSOR_DRAG:
 				[[NSCursor closedHandCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_CAN_DROP:
+			case CURSOR_CAN_DROP:
 				[[NSCursor openHandCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_FORBIDDEN:
+			case CURSOR_FORBIDDEN:
 				[[NSCursor operationNotAllowedCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_VSIZE:
+			case CURSOR_VSIZE:
 				[_cursor_from_selector(@selector(_windowResizeNorthSouthCursor), @selector(resizeUpDownCursor)) set];
 				break;
-			case DisplayServerEnums::CURSOR_HSIZE:
+			case CURSOR_HSIZE:
 				[_cursor_from_selector(@selector(_windowResizeEastWestCursor), @selector(resizeLeftRightCursor)) set];
 				break;
-			case DisplayServerEnums::CURSOR_BDIAGSIZE:
+			case CURSOR_BDIAGSIZE:
 				[_cursor_from_selector(@selector(_windowResizeNorthEastSouthWestCursor)) set];
 				break;
-			case DisplayServerEnums::CURSOR_FDIAGSIZE:
+			case CURSOR_FDIAGSIZE:
 				[_cursor_from_selector(@selector(_windowResizeNorthWestSouthEastCursor)) set];
 				break;
-			case DisplayServerEnums::CURSOR_MOVE:
+			case CURSOR_MOVE:
 				[[[GodotCoreCursor alloc] initWithType:GDCoreCursorWindowMove] set];
 				break;
-			case DisplayServerEnums::CURSOR_VSPLIT:
+			case CURSOR_VSPLIT:
 				[[NSCursor resizeUpDownCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_HSPLIT:
+			case CURSOR_HSPLIT:
 				[[NSCursor resizeLeftRightCursor] set];
 				break;
-			case DisplayServerEnums::CURSOR_HELP:
+			case CURSOR_HELP:
 				[_cursor_from_selector(@selector(_helpCursor)) set];
 				break;
 			default: {
@@ -2963,10 +2995,10 @@ void DisplayServerMacOS::cursor_update_shape() {
 	}
 }
 
-void DisplayServerMacOS::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
+void DisplayServerMacOS::cursor_set_shape(CursorShape p_shape) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (cursor_shape == p_shape) {
 		return;
@@ -2974,20 +3006,24 @@ void DisplayServerMacOS::cursor_set_shape(DisplayServerEnums::CursorShape p_shap
 
 	cursor_shape = p_shape;
 
-	if (mouse_mode != DisplayServerEnums::MOUSE_MODE_VISIBLE && mouse_mode != DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
 		return;
 	}
 
 	cursor_update_shape();
 }
 
-void DisplayServerMacOS::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+DisplayServerMacOS::CursorShape DisplayServerMacOS::cursor_get_shape() const {
+	return cursor_shape;
+}
+
+void DisplayServerMacOS::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (p_cursor.is_valid()) {
-		HashMap<DisplayServerEnums::CursorShape, Vector<Variant>>::Iterator cursor_c = cursors_cache.find(p_shape);
+		HashMap<CursorShape, Vector<Variant>>::Iterator cursor_c = cursors_cache.find(p_shape);
 
 		if (cursor_c) {
 			if (cursor_c->value[0] == p_cursor && cursor_c->value[1] == p_hotspot) {
@@ -3044,7 +3080,7 @@ void DisplayServerMacOS::cursor_set_custom_image(const Ref<Resource> &p_cursor,
 		cursors_cache.insert(p_shape, params);
 
 		if (p_shape == cursor_shape) {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+			if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
 				[cursor set];
 			}
 		}
@@ -3064,16 +3100,16 @@ bool DisplayServerMacOS::get_swap_cancel_ok() {
 	return false;
 }
 
-void DisplayServerMacOS::enable_for_stealing_focus(ProcessID pid) {
+void DisplayServerMacOS::enable_for_stealing_focus(OS::ProcessID pid) {
 }
 
 #define GET_OR_FAIL_V(m_val, m_map, m_key, m_retval) \
-	m_val = m_map.getptr(m_key); \
-	if (m_val == nullptr) { \
-		ERR_FAIL_V(m_retval); \
+	m_val = m_map.getptr(m_key);                     \
+	if (m_val == nullptr) {                          \
+		ERR_FAIL_V(m_retval);                        \
 	}
 
-uint32_t DisplayServerMacOS::window_get_display_id(DisplayServerEnums::WindowID p_window) const {
+uint32_t DisplayServerMacOS::window_get_display_id(WindowID p_window) const {
 	const WindowData *wd;
 	GET_OR_FAIL_V(wd, windows, p_window, -1);
 	return wd->display_id;
@@ -3081,7 +3117,7 @@ uint32_t DisplayServerMacOS::window_get_display_id(DisplayServerEnums::WindowID
 
 void DisplayServerMacOS::_window_update_display_id(WindowData *p_wd) {
 	NSScreen *screen = [p_wd->window_object screen];
-	CGDirectDisplayID display_id = _get_display_id_for_screen(screen);
+	CGDirectDisplayID display_id = [[screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
 	if (p_wd->display_id == display_id) {
 		return;
 	}
@@ -3090,7 +3126,7 @@ void DisplayServerMacOS::_window_update_display_id(WindowData *p_wd) {
 
 #ifdef TOOLS_ENABLED
 	// Notify any embedded processes of the new display ID, so that they can potentially update their vsync.
-	for (KeyValue<ProcessID, EmbeddedProcessData> &E : embedded_processes) {
+	for (KeyValue<OS::ProcessID, EmbeddedProcessData> &E : embedded_processes) {
 		if (E.value.wd == p_wd) {
 			E.value.process->display_state_changed();
 		}
@@ -3100,13 +3136,13 @@ void DisplayServerMacOS::_window_update_display_id(WindowData *p_wd) {
 
 #ifdef TOOLS_ENABLED
 
-Error DisplayServerMacOS::embed_process_update(DisplayServerEnums::WindowID p_window, EmbeddedProcessMacOS *p_process) {
+Error DisplayServerMacOS::embed_process_update(WindowID p_window, EmbeddedProcessMacOS *p_process) {
 	_THREAD_SAFE_METHOD_
 
 	WindowData *wd;
 	GET_OR_FAIL_V(wd, windows, p_window, FAILED);
 
-	ProcessID p_pid = p_process->get_embedded_pid();
+	OS::ProcessID p_pid = p_process->get_embedded_pid();
 
 	[CATransaction begin];
 	[CATransaction setDisableActions:YES];
@@ -3143,11 +3179,11 @@ Error DisplayServerMacOS::embed_process_update(DisplayServerEnums::WindowID p_wi
 	return OK;
 }
 
-Error DisplayServerMacOS::request_close_embedded_process(ProcessID p_pid) {
+Error DisplayServerMacOS::request_close_embedded_process(OS::ProcessID p_pid) {
 	return OK;
 }
 
-Error DisplayServerMacOS::remove_embedded_process(ProcessID p_pid) {
+Error DisplayServerMacOS::remove_embedded_process(OS::ProcessID p_pid) {
 	_THREAD_SAFE_METHOD_
 
 	EmbeddedProcessData *ed;
@@ -3205,7 +3241,7 @@ void DisplayServerMacOS::_process_events(bool p_pump) {
 
 	_THREAD_SAFE_LOCK_
 
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (KeyValue<WindowID, WindowData> &E : windows) {
 		WindowData &wd = E.value;
 		if (wd.mpass) {
 			if (![wd.window_object ignoresMouseEvents]) {
@@ -3229,11 +3265,6 @@ void DisplayServerMacOS::_process_events(bool p_pump) {
 		}
 	}
 
-	if (dock_progress) {
-		dock_progress.needsDisplay = true;
-		[NSApp.dockTile display];
-	}
-
 	_THREAD_SAFE_UNLOCK_
 }
 
@@ -3247,11 +3278,9 @@ void DisplayServerMacOS::force_process_and_drop_events() {
 
 void DisplayServerMacOS::release_rendering_thread() {
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->release_current();
 	}
-#endif
 	if (gl_manager_legacy) {
 		gl_manager_legacy->release_current();
 	}
@@ -3260,11 +3289,9 @@ void DisplayServerMacOS::release_rendering_thread() {
 
 void DisplayServerMacOS::swap_buffers() {
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->swap_buffers();
 	}
-#endif
 	if (gl_manager_legacy) {
 		gl_manager_legacy->swap_buffers();
 	}
@@ -3342,7 +3369,7 @@ void DisplayServerMacOS::set_icon(const Ref<Image> &p_icon) {
 	}
 }
 
-DisplayServerEnums::IndicatorID DisplayServerMacOS::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
+DisplayServer::IndicatorID DisplayServerMacOS::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
 	NSImage *nsimg = nullptr;
 	if (p_icon.is_valid() && p_icon->get_width() > 0 && p_icon->get_height() > 0 && p_icon->get_image().is_valid()) {
 		Ref<Image> img = p_icon->get_image();
@@ -3368,13 +3395,13 @@ DisplayServerEnums::IndicatorID DisplayServerMacOS::create_status_indicator(cons
 	[item.button sendActionOn:(NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown | NSEventMaskOtherMouseDown)];
 	item.button.toolTip = [NSString stringWithUTF8String:p_tooltip.utf8().get_data()];
 
-	DisplayServerEnums::IndicatorID iid = indicator_id_counter++;
+	IndicatorID iid = indicator_id_counter++;
 	indicators[iid] = idat;
 
 	return iid;
 }
 
-void DisplayServerMacOS::status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) {
+void DisplayServerMacOS::status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	NSImage *nsimg = nullptr;
@@ -3391,14 +3418,14 @@ void DisplayServerMacOS::status_indicator_set_icon(DisplayServerEnums::Indicator
 	item.button.image = nsimg;
 }
 
-void DisplayServerMacOS::status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) {
+void DisplayServerMacOS::status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	NSStatusItem *item = indicators[p_id].item;
 	item.button.toolTip = [NSString stringWithUTF8String:p_tooltip.utf8().get_data()];
 }
 
-void DisplayServerMacOS::status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_menu_rid) {
+void DisplayServerMacOS::status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	NSStatusItem *item = indicators[p_id].item;
@@ -3410,13 +3437,13 @@ void DisplayServerMacOS::status_indicator_set_menu(DisplayServerEnums::Indicator
 	}
 }
 
-void DisplayServerMacOS::status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) {
+void DisplayServerMacOS::status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	[indicators[p_id].delegate setCallback:p_callback];
 }
 
-Rect2 DisplayServerMacOS::status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const {
+Rect2 DisplayServerMacOS::status_indicator_get_rect(IndicatorID p_id) const {
 	ERR_FAIL_COND_V(!indicators.has(p_id), Rect2());
 
 	NSStatusItem *item = indicators[p_id].item;
@@ -3440,7 +3467,7 @@ Rect2 DisplayServerMacOS::status_indicator_get_rect(DisplayServerEnums::Indicato
 	return rect;
 }
 
-void DisplayServerMacOS::delete_status_indicator(DisplayServerEnums::IndicatorID p_id) {
+void DisplayServerMacOS::delete_status_indicator(IndicatorID p_id) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	[[NSStatusBar systemStatusBar] removeStatusItem:indicators[p_id].item];
@@ -3456,7 +3483,7 @@ bool DisplayServerMacOS::is_window_transparency_available() const {
 	return OS::get_singleton()->is_layered_allowed();
 }
 
-DisplayServer *DisplayServerMacOS::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerMacOS::create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	DisplayServer *ds = memnew(DisplayServerMacOS(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 	if (r_error != OK) {
 		if (p_rendering_driver == "vulkan") {
@@ -3494,9 +3521,7 @@ Vector<String> DisplayServerMacOS::get_rendering_drivers_func() {
 #endif
 #if defined(GLES3_ENABLED)
 	drivers.push_back("opengl3");
-#if defined(ANGLE_ENABLED)
 	drivers.push_back("opengl3_angle");
-#endif
 #endif
 	drivers.push_back("dummy");
 
@@ -3507,16 +3532,16 @@ void DisplayServerMacOS::register_macos_driver() {
 	register_create_function("macos", create_func, get_rendering_drivers_func);
 }
 
-DisplayServerEnums::WindowID DisplayServerMacOS::window_get_active_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerMacOS::window_get_active_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	} else {
-		return DisplayServerEnums::INVALID_WINDOW_ID;
+		return INVALID_WINDOW_ID;
 	}
 }
 
-void DisplayServerMacOS::window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) {
+void DisplayServerMacOS::window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3524,7 +3549,7 @@ void DisplayServerMacOS::window_set_popup_safe_rect(DisplayServerEnums::WindowID
 	wd.parent_safe_rect = p_rect;
 }
 
-Rect2i DisplayServerMacOS::window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const {
+Rect2i DisplayServerMacOS::window_get_popup_safe_rect(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Rect2i());
@@ -3532,14 +3557,14 @@ Rect2i DisplayServerMacOS::window_get_popup_safe_rect(DisplayServerEnums::Window
 	return wd.parent_safe_rect;
 }
 
-void DisplayServerMacOS::popup_open(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::popup_open(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	bool has_popup_ancestor = false;
-	DisplayServerEnums::WindowID transient_root = p_window;
+	WindowID transient_root = p_window;
 	while (true) {
-		DisplayServerEnums::WindowID parent = windows[transient_root].transient_parent;
-		if (parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+		WindowID parent = windows[transient_root].transient_parent;
+		if (parent == INVALID_WINDOW_ID) {
 			break;
 		} else {
 			transient_root = parent;
@@ -3551,16 +3576,16 @@ void DisplayServerMacOS::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 
 	// Detect tooltips and other similar popups that shouldn't block input to their parent.
-	bool ignores_input = window_get_flag(DisplayServerEnums::WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
+	bool ignores_input = window_get_flag(WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
 
 	WindowData &wd = windows[p_window];
 	if (wd.is_popup || (has_popup_ancestor && !ignores_input)) {
 		bool was_empty = popup_list.is_empty();
 		// Find current popup parent, or root popup if new window is not transient.
-		List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *C = nullptr;
+		List<WindowID>::Element *E = popup_list.back();
 		while (E) {
-			if (wd.transient_parent != E->get() || wd.transient_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (wd.transient_parent != E->get() || wd.transient_parent == INVALID_WINDOW_ID) {
 				C = E;
 				E = E->prev();
 			} else {
@@ -3568,7 +3593,7 @@ void DisplayServerMacOS::popup_open(DisplayServerEnums::WindowID p_window) {
 			}
 		}
 		if (C) {
-			send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			send_window_event(windows[C->get()], DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 
 		if (was_empty && popup_list.is_empty()) {
@@ -3580,19 +3605,19 @@ void DisplayServerMacOS::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 }
 
-void DisplayServerMacOS::popup_close(DisplayServerEnums::WindowID p_window) {
+void DisplayServerMacOS::popup_close(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	bool was_empty = popup_list.is_empty();
-	List<DisplayServerEnums::WindowID>::Element *E = popup_list.find(p_window);
+	List<WindowID>::Element *E = popup_list.find(p_window);
 	while (E) {
-		List<DisplayServerEnums::WindowID>::Element *F = E->next();
-		DisplayServerEnums::WindowID win_id = E->get();
+		List<WindowID>::Element *F = E->next();
+		WindowID win_id = E->get();
 		popup_list.erase(E);
 
 		if (win_id != p_window) {
 			// Only request close on related windows, not this window.  We are already processing it.
-			send_window_event(windows[win_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			send_window_event(windows[win_id], DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 		E = F;
 	}
@@ -3609,9 +3634,9 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
 	bool closed = false;
 	if (p_close) {
 		// Close all popups.
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.front();
+		List<WindowID>::Element *E = popup_list.front();
 		if (E) {
-			send_window_event(windows[E->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			send_window_event(windows[E->get()], DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 			closed = true;
 		}
 		if (!was_empty) {
@@ -3625,8 +3650,8 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
 		}
 
 		Point2i pos = mouse_get_position();
-		List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *C = nullptr;
+		List<WindowID>::Element *E = popup_list.back();
 		// Find top popup to close.
 		while (E) {
 			// Popup window area.
@@ -3643,7 +3668,7 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
 			}
 		}
 		if (C) {
-			send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			send_window_event(windows[C->get()], DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 			closed = true;
 		}
 		if (!was_empty && popup_list.is_empty()) {
@@ -3654,7 +3679,7 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
 	return closed;
 }
 
-DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
 
 	r_error = OK;
@@ -3676,6 +3701,16 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 
 	native_menu = memnew(NativeMenuMacOS);
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	NSMenuItem *menu_item;
 	NSString *title;
 
@@ -3780,7 +3815,7 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 	// Metal rendering driver not available on Intel.
 	if (rendering_driver == "metal") {
 		rendering_driver = "vulkan";
-		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+		OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 	}
 #endif
 	if (rendering_driver == "vulkan") {
@@ -3802,8 +3837,8 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 			if (fallback_to_opengl3 && rendering_driver != "opengl3") {
 				WARN_PRINT("Your device does not seem to support MoltenVK or Metal, switching to OpenGL 3.");
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else
 #endif
 			{
@@ -3815,7 +3850,6 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 #endif
 
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (rendering_driver == "opengl3" && OS::get_singleton()->get_processor_name().contains("Virtual")) {
 		WARN_PRINT("Virtual Machine detected, switching to ANGLE.");
 		rendering_driver = "opengl3_angle";
@@ -3831,21 +3865,20 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 			}
 			bool fallback = GLOBAL_GET("rendering/gl_compatibility/fallback_to_native");
 			if (fallback) {
+#ifdef EGL_STATIC
 				WARN_PRINT("Your video card drivers seem not to support GLES3 / ANGLE, switching to native OpenGL.");
+#else
+				WARN_PRINT("Your video card drivers seem not to support GLES3 / ANGLE or ANGLE dynamic libraries (libEGL.dylib and libGLESv2.dylib) are missing, switching to native OpenGL.");
+#endif
 				rendering_driver = "opengl3";
-				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else {
 				r_error = ERR_UNAVAILABLE;
 				ERR_FAIL_MSG("Could not initialize ANGLE OpenGL.");
 			}
 		}
 	}
-#else
-	if (rendering_driver == "opengl3" && OS::get_singleton()->get_processor_name().contains("Virtual")) {
-		r_error = ERR_UNAVAILABLE;
-		ERR_FAIL_MSG("Virtual Machine detected, could not initialize OpenGL.");
-	}
-#endif
+
 	if (rendering_driver == "opengl3") {
 		gl_manager_legacy = memnew(GLManagerLegacy_MacOS);
 		if (gl_manager_legacy->initialize() != OK) {
@@ -3861,31 +3894,22 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 	if (p_position != nullptr) {
 		window_position = *p_position;
 	} else {
-		if (p_screen == DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) {
-			p_screen = DisplayServerEnums::SCREEN_PRIMARY;
+		if (p_screen == SCREEN_OF_MAIN_WINDOW) {
+			p_screen = SCREEN_PRIMARY;
 		}
 		Rect2i scr_rect = screen_get_usable_rect(p_screen);
 		window_position = scr_rect.position + (scr_rect.size - p_resolution) / 2;
 	}
 
-	DisplayServerEnums::WindowID main_window = _create_window(p_mode, p_vsync_mode, Rect2i(window_position, p_resolution));
-	ERR_FAIL_COND(main_window == DisplayServerEnums::INVALID_WINDOW_ID);
-	for (int i = 0; i < DisplayServerEnums::WINDOW_FLAG_MAX; i++) {
+	WindowID main_window = _create_window(p_mode, p_vsync_mode, Rect2i(window_position, p_resolution));
+	ERR_FAIL_COND(main_window == INVALID_WINDOW_ID);
+	for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
 		if (p_flags & (1 << i)) {
-			window_set_flag(DisplayServerEnums::WindowFlags(i), true, main_window);
+			window_set_flag(WindowFlags(i), true, main_window);
 		}
 	}
 	force_process_and_drop_events();
 
-	__block DisplayServerMacOS *self = this;
-	screen_observer = [NSNotificationCenter.defaultCenter
-			addObserverForName:NSApplicationDidChangeScreenParametersNotification
-						object:nil
-						 queue:nil
-					usingBlock:^(NSNotification *_Nonnull note) {
-						self->update_screen_parameters();
-					}];
-
 	if (rendering_driver == "dummy") {
 		RasterizerDummy::make_current();
 	}
@@ -3894,26 +3918,31 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, Display
 	if (rendering_driver == "opengl3") {
 		RasterizerGLES3::make_current(true);
 	}
-#if defined(ANGLE_ENABLED)
 	if (rendering_driver == "opengl3_angle") {
 		RasterizerGLES3::make_current(false);
 	}
 #endif
-#endif
 #if defined(RD_ENABLED)
 	if (rendering_context) {
 		rendering_device = memnew(RenderingDevice);
-		rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID);
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->initialize(rendering_context, MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
 #endif
+
+	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 }
 
 DisplayServerMacOS::~DisplayServerMacOS() {
+	if (screen_keep_on_assertion) {
+		IOPMAssertionRelease(screen_keep_on_assertion);
+		screen_keep_on_assertion = kIOPMNullAssertionID;
+	}
+
 	// Destroy all status indicators.
-	for (HashMap<DisplayServerEnums::IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
+	for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
 		[[NSStatusBar systemStatusBar] removeStatusItem:E->value.item];
 	}
 
@@ -3924,8 +3953,8 @@ DisplayServerMacOS::~DisplayServerMacOS() {
 	}
 
 	// Destroy all windows.
-	for (HashMap<DisplayServerEnums::WindowID, WindowData>::Iterator E = windows.begin(); E;) {
-		HashMap<DisplayServerEnums::WindowID, WindowData>::Iterator F = E;
+	for (HashMap<WindowID, WindowData>::Iterator E = windows.begin(); E;) {
+		HashMap<WindowID, WindowData>::Iterator F = E;
 		++E;
 		[F->value.window_object setContentView:nil];
 		[F->value.window_object close];
@@ -3937,13 +3966,11 @@ DisplayServerMacOS::~DisplayServerMacOS() {
 		memdelete(gl_manager_legacy);
 		gl_manager_legacy = nullptr;
 	}
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		memdelete(gl_manager_angle);
 		gl_manager_angle = nullptr;
 	}
 #endif
-#endif
 #if defined(RD_ENABLED)
 	if (rendering_device) {
 		memdelete(rendering_device);
@@ -3955,9 +3982,11 @@ DisplayServerMacOS::~DisplayServerMacOS() {
 		rendering_context = nullptr;
 	}
 #endif
-
-	[NSNotificationCenter.defaultCenter removeObserver:screen_observer];
-
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
 	CGDisplayRemoveReconfigurationCallback(_displays_arrangement_changed, nullptr);
 
 	cursors_cache.clear();
diff --git a/engine/platform/macos/display_server_macos_base.h b/engine/platform/macos/display_server_macos_base.h
index 2ad7ea50..1d44ff1a 100644
--- a/engine/platform/macos/display_server_macos_base.h
+++ b/engine/platform/macos/display_server_macos_base.h
@@ -30,25 +30,19 @@
 
 #pragma once
 
-#include "core/os/thread_safe.h"
-#include "core/typedefs.h" // IWYU pragma: keep. Prevent macOS `MAX`/`MIN` from being defined.
+#include "core/input/input.h"
 #include "servers/display/display_server.h"
 
 #define FontVariation __FontVariation
 
 #import <AppKit/AppKit.h>
-#import <IOKit/pwr_mgt/IOPMLib.h>
 
 #undef FontVariation
 
-class RenderingContextDriver;
-class RenderingDevice;
-
 class DisplayServerMacOSBase : public DisplayServer {
 	GDSOFTCLASS(DisplayServerMacOSBase, DisplayServer)
 
 	id tts = nullptr;
-	IOPMAssertionID screen_keep_on_assertion = kIOPMNullAssertionID;
 
 	struct LayoutInfo {
 		String name;
@@ -60,102 +54,21 @@ class DisplayServerMacOSBase : public DisplayServer {
 
 	Callable system_theme_changed;
 
-	constexpr static CGFloat HARDWARE_REFERENCE_LUMINANCE_NITS = 100.0f;
-
-public:
-	struct HDROutput {
-		static constexpr float AUTO_MAX_LUMINANCE = -1.0f;
-
-		bool requested = false;
-		float max_luminance = AUTO_MAX_LUMINANCE;
-
-		bool is_auto_max_luminance() const { return max_luminance < 0.0f; }
-	};
-
 protected:
 	_THREAD_SAFE_CLASS_
 
-	DisplayServerEnums::MouseMode mouse_mode = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	bool mouse_mode_override_enabled = false;
-
-	void _mouse_update_mode();
-	virtual void _mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_mode, DisplayServerEnums::MouseMode p_new_mode) = 0;
-
-	String im_text;
-	Point2i im_selection;
-
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CURSOR_ARROW;
-
 	void initialize_tts() const;
 
-	static CGDirectDisplayID _get_display_id_for_screen(NSScreen *p_screen);
-
 	void _update_keyboard_layouts() const;
 	static void _keyboard_layout_changed(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef user_info);
 
-#if defined(RD_ENABLED)
-	RenderingContextDriver *rendering_context = nullptr;
-	RenderingDevice *rendering_device = nullptr;
-#endif
-
-	virtual HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) = 0;
-	virtual const HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) const = 0;
-
-	constexpr float _calculate_current_reference_luminance(CGFloat p_max_potential_edr_value, CGFloat p_max_edr_value) const;
-	void _update_hdr_output(DisplayServerEnums::WindowID p_window, const HDROutput &p_hdr);
-
 public:
-	virtual bool tts_is_speaking() const override;
-	virtual bool tts_is_paused() const override;
-	virtual TypedArray<Dictionary> tts_get_voices() const override;
-
-	virtual void tts_speak(const String &p_text, const String &p_voice, int p_volume = 50, float p_pitch = 1.f, float p_rate = 1.f, int64_t p_utterance_id = 0, bool p_interrupt = false) override;
-	virtual void tts_pause() override;
-	virtual void tts_resume() override;
-	virtual void tts_stop() override;
-
-	void emit_system_theme_changed();
-	virtual bool is_dark_mode_supported() const override;
-	virtual bool is_dark_mode() const override;
-	virtual Color get_accent_color() const override;
-	virtual Color get_base_color() const override;
-	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
-
-	virtual void send_window_event_by_id(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
-	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
-	virtual bool mouse_is_mode_override_enabled() const override;
-
 	virtual void clipboard_set(const String &p_text) override;
 	virtual String clipboard_get() const override;
 	virtual Ref<Image> clipboard_get_image() const override;
 	virtual bool clipboard_has() const override;
 	virtual bool clipboard_has_image() const override;
 
-	virtual int get_primary_screen() const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual void screen_set_keep_on(bool p_enable) override;
-	virtual bool screen_is_kept_on() const override;
-
-	virtual int accessibility_should_increase_contrast() const override;
-	virtual int accessibility_should_reduce_animation() const override;
-	virtual int accessibility_should_reduce_transparency() const override;
-	virtual int accessibility_screen_reader_active() const override;
-
-	void update_im_text(const Point2i &p_selection, const String &p_text);
-	virtual Point2i ime_get_selection() const override;
-	virtual String ime_get_text() const override;
-
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-
-	virtual void beep() const override;
-
 	virtual int keyboard_get_layout_count() const override;
 	virtual int keyboard_get_current_layout() const override;
 	virtual void keyboard_set_current_layout(int p_index) override;
@@ -165,21 +78,21 @@ public:
 	virtual Key keyboard_get_label_from_physical(Key p_keycode) const override;
 	virtual void show_emoji_and_symbol_picker() const override;
 
-	virtual void window_get_edr_values(DisplayServerEnums::WindowID p_window, CGFloat *r_max_potential_edr_value = nullptr, CGFloat *r_max_edr_value = nullptr) const = 0;
-	virtual bool window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_request_hdr_output(const bool p_enable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual bool window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	void emit_system_theme_changed();
+	virtual bool is_dark_mode_supported() const override;
+	virtual bool is_dark_mode() const override;
+	virtual Color get_accent_color() const override;
+	virtual Color get_base_color() const override;
+	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual void window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool tts_is_speaking() const override;
+	virtual bool tts_is_paused() const override;
+	virtual TypedArray<Dictionary> tts_get_voices() const override;
 
-	virtual void window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void tts_speak(const String &p_text, const String &p_voice, int p_volume = 50, float p_pitch = 1.f, float p_rate = 1.f, int64_t p_utterance_id = 0, bool p_interrupt = false) override;
+	virtual void tts_pause() override;
+	virtual void tts_resume() override;
+	virtual void tts_stop() override;
 
 	DisplayServerMacOSBase();
 	~DisplayServerMacOSBase();
diff --git a/engine/platform/macos/display_server_macos_base.mm b/engine/platform/macos/display_server_macos_base.mm
index 3cfe1c3a..f0e62b57 100644
--- a/engine/platform/macos/display_server_macos_base.mm
+++ b/engine/platform/macos/display_server_macos_base.mm
@@ -29,75 +29,14 @@
 /**************************************************************************/
 
 #import "display_server_macos_base.h"
-
-#import "godot_application_delegate.h"
 #import "key_mapping_macos.h"
 #import "tts_macos.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "drivers/png/png_driver_common.h"
 
-#if defined(RD_ENABLED)
-#include "servers/rendering/rendering_context_driver.h"
-#include "servers/rendering/rendering_device.h"
-#endif
-
 #import <Carbon/Carbon.h>
 
-void DisplayServerMacOSBase::_mouse_update_mode() {
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
-			? mouse_mode_override
-			: mouse_mode_base;
-
-	if (wanted_mouse_mode == mouse_mode) {
-		return;
-	}
-
-	DisplayServerEnums::MouseMode prev_mode = mouse_mode;
-	mouse_mode = wanted_mouse_mode;
-	_mouse_apply_mode(prev_mode, wanted_mouse_mode);
-}
-
-void DisplayServerMacOSBase::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
-	if (p_mode == mouse_mode_base) {
-		return;
-	}
-	mouse_mode_base = p_mode;
-	_mouse_update_mode();
-}
-
-DisplayServerEnums::MouseMode DisplayServerMacOSBase::mouse_get_mode() const {
-	return mouse_mode;
-}
-
-void DisplayServerMacOSBase::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
-	if (p_mode == mouse_mode_override) {
-		return;
-	}
-	mouse_mode_override = p_mode;
-	_mouse_update_mode();
-}
-
-DisplayServerEnums::MouseMode DisplayServerMacOSBase::mouse_get_mode_override() const {
-	return mouse_mode_override;
-}
-
-void DisplayServerMacOSBase::mouse_set_mode_override_enabled(bool p_override_enabled) {
-	if (p_override_enabled == mouse_mode_override_enabled) {
-		return;
-	}
-	mouse_mode_override_enabled = p_override_enabled;
-	_mouse_update_mode();
-}
-
-bool DisplayServerMacOSBase::mouse_is_mode_override_enabled() const {
-	return mouse_mode_override_enabled;
-}
-
 void DisplayServerMacOSBase::clipboard_set(const String &p_text) {
 	_THREAD_SAFE_METHOD_
 
@@ -164,18 +103,6 @@ bool DisplayServerMacOSBase::clipboard_has_image() const {
 	return result;
 }
 
-CGDirectDisplayID DisplayServerMacOSBase::_get_display_id_for_screen(NSScreen *p_screen) {
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000
-	if (@available(macOS 26.0, *)) {
-		return [p_screen CGDirectDisplayID];
-	} else {
-		return [[p_screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
-	}
-#else
-	return [[p_screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
-#endif
-}
-
 void DisplayServerMacOSBase::initialize_tts() const {
 	const_cast<DisplayServerMacOSBase *>(this)->tts = [[TTS_MacOS alloc] init];
 }
@@ -457,85 +384,6 @@ void DisplayServerMacOSBase::set_system_theme_change_callback(const Callable &p_
 	system_theme_changed = p_callable;
 }
 
-bool DisplayServerMacOSBase::screen_is_kept_on() const {
-	return (screen_keep_on_assertion);
-}
-
-void DisplayServerMacOSBase::screen_set_keep_on(bool p_enable) {
-	if (screen_keep_on_assertion) {
-		IOPMAssertionRelease(screen_keep_on_assertion);
-		screen_keep_on_assertion = kIOPMNullAssertionID;
-	}
-
-	if (p_enable) {
-		String app_name_string = GLOBAL_GET("application/config/name");
-		NSString *name = [NSString stringWithUTF8String:(app_name_string.is_empty() ? "Godot Engine" : app_name_string.utf8().get_data())];
-		NSString *reason = @"Godot Engine running with display/window/energy_saving/keep_screen_on = true";
-		IOPMAssertionCreateWithDescription(kIOPMAssertPreventUserIdleDisplaySleep, (__bridge CFStringRef)name, (__bridge CFStringRef)reason, (__bridge CFStringRef)reason, nullptr, 0, nullptr, &screen_keep_on_assertion);
-	}
-}
-
-int DisplayServerMacOSBase::accessibility_should_increase_contrast() const {
-	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getHighContrast];
-}
-
-int DisplayServerMacOSBase::accessibility_should_reduce_animation() const {
-	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceMotion];
-}
-
-int DisplayServerMacOSBase::accessibility_should_reduce_transparency() const {
-	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceTransparency];
-}
-
-int DisplayServerMacOSBase::accessibility_screen_reader_active() const {
-	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getVoiceOver];
-}
-
-void DisplayServerMacOSBase::update_im_text(const Point2i &p_selection, const String &p_text) {
-	im_selection = p_selection;
-	im_text = p_text;
-
-	OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
-}
-
-Point2i DisplayServerMacOSBase::ime_get_selection() const {
-	return im_selection;
-}
-
-String DisplayServerMacOSBase::ime_get_text() const {
-	return im_text;
-}
-
-DisplayServerEnums::CursorShape DisplayServerMacOSBase::cursor_get_shape() const {
-	return cursor_shape;
-}
-
-void DisplayServerMacOSBase::beep() const {
-	NSBeep();
-}
-
-int DisplayServerMacOSBase::get_primary_screen() const {
-	return 0;
-}
-
-float DisplayServerMacOSBase::screen_get_refresh_rate(int p_screen) const {
-	_THREAD_SAFE_METHOD_
-
-	p_screen = _get_screen_index(p_screen);
-	int screen_count = get_screen_count();
-	ERR_FAIL_INDEX_V(p_screen, screen_count, SCREEN_REFRESH_RATE_FALLBACK);
-
-	NSArray *screenArray = [NSScreen screens];
-	if ((NSUInteger)p_screen < [screenArray count]) {
-		NSScreen *screen = [screenArray objectAtIndex:p_screen];
-		const CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(_get_display_id_for_screen(screen));
-		const double displayRefreshRate = CGDisplayModeGetRefreshRate(displayMode);
-		return (float)displayRefreshRate;
-	}
-	ERR_PRINT("An error occurred while trying to get the screen refresh rate.");
-	return SCREEN_REFRESH_RATE_FALLBACK;
-}
-
 void DisplayServerMacOSBase::emit_system_theme_changed() {
 	if (system_theme_changed.is_valid()) {
 		Variant ret;
@@ -547,152 +395,6 @@ void DisplayServerMacOSBase::emit_system_theme_changed() {
 	}
 }
 
-// MARK: - HDR / EDR
-
-void DisplayServerMacOSBase::_update_hdr_output(DisplayServerEnums::WindowID p_window, const HDROutput &p_hdr) {
-#ifdef RD_ENABLED
-	if (!rendering_context) {
-		return;
-	}
-
-	CGFloat max_potential_edr, max_edr;
-	window_get_edr_values(p_window, &max_potential_edr, &max_edr);
-	bool desired_hdr_enabled = p_hdr.requested && max_potential_edr > 1.0f;
-	bool current_hdr_enabled = rendering_context->window_get_hdr_output_enabled(p_window);
-	bool hdr_state_changed = false;
-	if (current_hdr_enabled != desired_hdr_enabled) {
-		rendering_context->window_set_hdr_output_enabled(p_window, desired_hdr_enabled);
-		hdr_state_changed = true;
-	}
-
-	float new_reference_luminance = _calculate_current_reference_luminance(max_potential_edr, max_edr);
-	float current_ref_luminance = rendering_context->window_get_hdr_output_reference_luminance(p_window);
-	if (!Math::is_equal_approx(current_ref_luminance, new_reference_luminance)) {
-		rendering_context->window_set_hdr_output_reference_luminance(p_window, new_reference_luminance);
-		hdr_state_changed = true;
-	}
-
-	float new_max_luminance = p_hdr.is_auto_max_luminance() ? max_potential_edr * HARDWARE_REFERENCE_LUMINANCE_NITS : p_hdr.max_luminance;
-	float current_max_luminance = rendering_context->window_get_hdr_output_max_luminance(p_window);
-	if (!Math::is_equal_approx(current_max_luminance, new_max_luminance)) {
-		rendering_context->window_set_hdr_output_max_luminance(p_window, new_max_luminance);
-		hdr_state_changed = true;
-	}
-
-	if (hdr_state_changed) {
-		send_window_event_by_id(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED, p_window);
-	}
-#endif
-}
-
-bool DisplayServerMacOSBase::window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_device && !rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT)) {
-		return false;
-	}
-#endif
-	CGFloat max_potential_edr;
-	window_get_edr_values(p_window, &max_potential_edr, nullptr);
-	return max_potential_edr > 1.0f;
-}
-
-void DisplayServerMacOSBase::window_request_hdr_output(const bool p_enabled, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	ERR_FAIL_COND_MSG(p_enabled && rendering_device && !rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT), "HDR output is not supported by the rendering device.");
-#endif
-
-	HDROutput &hdr = _get_hdr_output(p_window);
-	hdr.requested = p_enabled;
-	_update_hdr_output(p_window, hdr);
-}
-
-bool DisplayServerMacOSBase::window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	return _get_hdr_output(p_window).requested;
-}
-
-bool DisplayServerMacOSBase::window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_enabled(p_window);
-	}
-#endif
-
-	return false;
-}
-
-void DisplayServerMacOSBase::window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window) {
-	ERR_PRINT_ONCE("Manually setting reference white luminance is not supported on Apple devices, as they provide a user-facing brightness setting that directly controls reference white luminance.");
-}
-
-float DisplayServerMacOSBase::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	return -1.0f; // Always auto-adjusted by the OS on Apple platforms.
-}
-
-constexpr float DisplayServerMacOSBase::_calculate_current_reference_luminance(CGFloat p_max_potential_edr_value, CGFloat p_max_edr_value) const {
-	return (p_max_potential_edr_value * HARDWARE_REFERENCE_LUMINANCE_NITS) / p_max_edr_value;
-}
-
-float DisplayServerMacOSBase::window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_reference_luminance(p_window);
-	}
-#endif
-	return 200.0f;
-}
-
-void DisplayServerMacOSBase::window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	HDROutput &hdr = _get_hdr_output(p_window);
-
-	if (hdr.max_luminance == p_max_luminance) {
-		return;
-	}
-	hdr.max_luminance = p_max_luminance;
-	_update_hdr_output(p_window, hdr);
-}
-
-float DisplayServerMacOSBase::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	return _get_hdr_output(p_window).max_luminance;
-}
-
-float DisplayServerMacOSBase::window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	const HDROutput &hdr = _get_hdr_output(p_window);
-	if (hdr.is_auto_max_luminance()) {
-		CGFloat max_potential_edr;
-		window_get_edr_values(p_window, &max_potential_edr, nullptr);
-		return max_potential_edr * HARDWARE_REFERENCE_LUMINANCE_NITS;
-	}
-	return hdr.max_luminance;
-}
-
-float DisplayServerMacOSBase::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_output_max_linear_value(p_window);
-	}
-#endif
-
-	return 1.0f; // SDR
-}
-
 DisplayServerMacOSBase::DisplayServerMacOSBase() {
 	KeyMappingMacOS::initialize();
 
@@ -702,8 +404,6 @@ DisplayServerMacOSBase::DisplayServerMacOSBase() {
 		initialize_tts();
 	}
 
-	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
-
 	// Register to be notified on keyboard layout changes.
 	CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(),
 			nullptr, _keyboard_layout_changed,
@@ -712,10 +412,5 @@ DisplayServerMacOSBase::DisplayServerMacOSBase() {
 }
 
 DisplayServerMacOSBase::~DisplayServerMacOSBase() {
-	if (screen_keep_on_assertion) {
-		IOPMAssertionRelease(screen_keep_on_assertion);
-		screen_keep_on_assertion = kIOPMNullAssertionID;
-	}
-
 	CFNotificationCenterRemoveObserver(CFNotificationCenterGetDistributedCenter(), nullptr, kTISNotifySelectedKeyboardInputSourceChanged, nullptr);
 }
diff --git a/engine/platform/macos/display_server_macos_embedded.h b/engine/platform/macos/display_server_macos_embedded.h
deleted file mode 100644
index 121105ae..00000000
--- a/engine/platform/macos/display_server_macos_embedded.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/**************************************************************************/
-/*  display_server_macos_embedded.h                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "display_server_macos_base.h"
-
-@class CAContext;
-@class CALayer;
-class InputEvent;
-class GLManagerEmbedded;
-class NativeMenu;
-class RenderingContextDriver;
-class RenderingDevice;
-
-struct DisplayServerMacOSEmbeddedState {
-	/*! Default to a scale of 2.0, which is the most common. */
-	float screen_max_scale = 2.0f;
-	float screen_dpi = 96.0f;
-	/*! Scale for window displaying embedded content */
-	float screen_window_scale = 2.0f;
-	/*! The display ID of the window which is displaying the embedded process content. */
-	uint32_t display_id = -1;
-
-	/*! The current maximum EDR value for the display. */
-	double screen_max_edr = 1.0;
-	/*! The maximum possible EDR value for the display. */
-	double screen_max_potential_edr = 1.0;
-
-	void serialize(PackedByteArray &r_data);
-	Error deserialize(const PackedByteArray &p_data);
-
-	_FORCE_INLINE_ bool operator==(const DisplayServerMacOSEmbeddedState &p_other) const {
-		return screen_max_scale == p_other.screen_max_scale && screen_dpi == p_other.screen_dpi && screen_window_scale == p_other.screen_window_scale && display_id == p_other.display_id && screen_max_edr == p_other.screen_max_edr && screen_max_potential_edr == p_other.screen_max_potential_edr;
-	}
-};
-
-/// "Embedded" as in "Embedded in the Godot editor window".
-class DisplayServerMacOSEmbedded : public DisplayServerMacOSBase {
-	GDSOFTCLASS(DisplayServerMacOSEmbedded, DisplayServerMacOSBase)
-
-	DisplayServerMacOSEmbeddedState state;
-
-	NativeMenu *native_menu = nullptr;
-
-	HashMap<DisplayServerEnums::WindowID, ObjectID> window_attached_instance_id;
-
-	HashMap<DisplayServerEnums::WindowID, Callable> window_event_callbacks;
-	HashMap<DisplayServerEnums::WindowID, Callable> window_resize_callbacks;
-	HashMap<DisplayServerEnums::WindowID, Callable> input_event_callbacks;
-	HashMap<DisplayServerEnums::WindowID, Callable> input_text_callbacks;
-
-	DisplayServerEnums::WindowID window_id_counter = DisplayServerEnums::MAIN_WINDOW_ID;
-
-	bool transparent = false;
-
-	CAContext *ca_context = nullptr;
-	// Either be a CAMetalLayer or a CALayer depending on the rendering driver.
-	CALayer *layer = nullptr;
-#ifdef GLES3_ENABLED
-	GLManagerEmbedded *gl_manager = nullptr;
-#endif
-
-	String rendering_driver;
-
-	HDROutput hdr_output;
-
-	HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) override;
-	const HDROutput &_get_hdr_output(DisplayServerEnums::WindowID p_window) const override;
-
-	Point2i ime_last_position;
-
-	void _mouse_apply_mode(DisplayServerEnums::MouseMode p_prev_mode, DisplayServerEnums::MouseMode p_new_mode) override;
-
-	struct Joy {
-		String name;
-		uint64_t timestamp = 0;
-
-		Joy() = default;
-		Joy(const String &p_name) :
-				name(p_name) {}
-	};
-	HashMap<int, Joy> joysticks;
-
-public:
-	static void register_embedded_driver();
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
-	static Vector<String> get_rendering_drivers_func();
-
-	void _window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-
-	// MARK: - Events
-
-	virtual void process_events() override;
-
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
-	void send_input_event(const Ref<InputEvent> &p_event, DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	void send_input_text(const String &p_text, DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	virtual void send_window_event_by_id(DisplayServerEnums::WindowEvent p_event, DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	void _window_callback(const Callable &p_callable, const Variant &p_arg) const;
-
-	// MARK: - Mouse
-	virtual void warp_mouse(const Point2i &p_position) override;
-	virtual Point2i mouse_get_position() const override;
-	virtual BitField<MouseButtonMask> mouse_get_button_state() const override;
-
-	// MARK: - Window
-
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
-	virtual String get_name() const override;
-
-	virtual int get_screen_count() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
-
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
-
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
-
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual float screen_get_max_scale() const override;
-
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual bool can_any_window_draw() const override;
-
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
-
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
-
-	void window_get_edr_values(DisplayServerEnums::WindowID p_window, CGFloat *r_max_potential_edr_value, CGFloat *r_max_edr_value) const override;
-	void update_screen_parameters();
-
-	void set_state(const DisplayServerMacOSEmbeddedState &p_state);
-	virtual void swap_buffers() override;
-
-	DisplayServerMacOSEmbedded(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, Error &r_error);
-	~DisplayServerMacOSEmbedded();
-};
diff --git a/engine/platform/macos/doc_classes/EditorExportPlatformMacOS.xml b/engine/platform/macos/doc_classes/EditorExportPlatformMacOS.xml
index 96c8d529..04e611d0 100644
--- a/engine/platform/macos/doc_classes/EditorExportPlatformMacOS.xml
+++ b/engine/platform/macos/doc_classes/EditorExportPlatformMacOS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformMacOS" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformMacOS" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for macOS.
 	</brief_description>
diff --git a/engine/platform/macos/editor/embedded_game_view_plugin.mm b/engine/platform/macos/editor/embedded_game_view_plugin.mm
index 611cf28f..ec016625 100644
--- a/engine/platform/macos/editor/embedded_game_view_plugin.mm
+++ b/engine/platform/macos/editor/embedded_game_view_plugin.mm
@@ -32,12 +32,8 @@
 
 #include "embedded_process_macos.h"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
 #include "editor/editor_node.h"
 #include "editor/gui/window_wrapper.h"
-#include "scene/main/window.h"
-#include "servers/display/display_server.h"
 
 HashMap<String, GameViewDebuggerMacOS::ParseMessageFunc> GameViewDebuggerMacOS::parse_message_handlers;
 
@@ -66,7 +62,7 @@ bool GameViewDebuggerMacOS::_msg_cursor_set_custom_image(const Array &p_args) {
 	if (!cursor_data.is_empty()) {
 		image->load_png_from_buffer(cursor_data);
 	}
-	DisplayServerEnums::CursorShape shape = DisplayServerEnums::CursorShape(p_args[1]);
+	DisplayServer::CursorShape shape = DisplayServer::CursorShape(p_args[1]);
 	Vector2 hotspot = p_args[2];
 
 	embedded_process->get_layer_host()->cursor_set_custom_image(image, shape, hotspot);
@@ -77,7 +73,7 @@ bool GameViewDebuggerMacOS::_msg_cursor_set_custom_image(const Array &p_args) {
 bool GameViewDebuggerMacOS::_msg_mouse_set_mode(const Array &p_args) {
 	ERR_FAIL_COND_V_MSG(p_args.size() != 1, false, "mouse_set_mode: invalid number of arguments.");
 
-	DisplayServerEnums::MouseMode mode = DisplayServerEnums::MouseMode(p_args[0]);
+	DisplayServer::MouseMode mode = DisplayServer::MouseMode(p_args[0]);
 	embedded_process->mouse_set_mode(mode);
 
 	return true;
@@ -87,7 +83,7 @@ bool GameViewDebuggerMacOS::_msg_window_set_ime_active(const Array &p_args) {
 	ERR_FAIL_COND_V_MSG(p_args.size() != 1, false, "window_set_ime_active: invalid number of arguments.");
 
 	bool active = p_args[0];
-	DisplayServerEnums::WindowID wid = embedded_process->get_window()->get_window_id();
+	DisplayServer::WindowID wid = embedded_process->get_window()->get_window_id();
 	DisplayServer::get_singleton()->window_set_ime_active(active, wid);
 	return true;
 }
@@ -97,7 +93,7 @@ bool GameViewDebuggerMacOS::_msg_window_set_ime_position(const Array &p_args) {
 
 	Point2i pos = p_args[0];
 	Point2i xpos = embedded_process->get_layer_host()->get_global_transform_with_canvas().xform(pos);
-	DisplayServerEnums::WindowID wid = embedded_process->get_window()->get_window_id();
+	DisplayServer::WindowID wid = embedded_process->get_window()->get_window_id();
 	DisplayServer::get_singleton()->window_set_ime_position(xpos, wid);
 	return true;
 }
diff --git a/engine/platform/macos/editor/embedded_process_macos.h b/engine/platform/macos/editor/embedded_process_macos.h
index 9afc4214..9420a4ef 100644
--- a/engine/platform/macos/editor/embedded_process_macos.h
+++ b/engine/platform/macos/editor/embedded_process_macos.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
-#include "core/os/process_id.h"
 #include "editor/run/embedded_process.h"
-#include "scene/gui/control.h"
-#include "servers/display/display_server_enums.h"
 
 class DisplayServerMacOS;
 class EmbeddedProcessMacOS;
@@ -55,7 +51,7 @@ class LayerHost final : public Control {
 			hotspot = p_hotspot;
 		}
 	};
-	HashMap<DisplayServerEnums::CursorShape, CustomCursor> custom_cursors;
+	HashMap<DisplayServer::CursorShape, CustomCursor> custom_cursors;
 
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
@@ -63,7 +59,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	void cursor_set_custom_image(const Ref<Image> &p_image, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot);
+	void cursor_set_custom_image(const Ref<Image> &p_image, DisplayServer::CursorShape p_shape, const Vector2 &p_hotspot);
 	void set_script_debugger(ScriptEditorDebugger *p_debugger) {
 		script_debugger = p_debugger;
 	}
@@ -86,12 +82,12 @@ class EmbeddedProcessMacOS final : public EmbeddedProcessBase {
 	uint32_t context_id = 0;
 	ScriptEditorDebugger *script_debugger = nullptr;
 	LayerHost *layer_host = nullptr;
-	ProcessID current_process_id = 0;
+	OS::ProcessID current_process_id = 0;
 
 	// Embedded process state.
 
 	// The last mouse mode sent by the embedded process.
-	DisplayServerEnums::MouseMode mouse_mode = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	DisplayServer::MouseMode mouse_mode = DisplayServer::MOUSE_MODE_VISIBLE;
 
 	// Helper functions.
 
@@ -105,7 +101,7 @@ public:
 	// MARK: - Message Handlers
 
 	void set_context_id(uint32_t p_context_id);
-	void mouse_set_mode(DisplayServerEnums::MouseMode p_mode);
+	void mouse_set_mode(DisplayServer::MouseMode p_mode);
 
 	uint32_t get_context_id() const { return context_id; }
 	void set_script_debugger(ScriptEditorDebugger *p_debugger) override;
@@ -119,7 +115,7 @@ public:
 	}
 
 	bool is_process_focused() const override { return layer_host->has_focus(); }
-	void embed_process(ProcessID p_pid) override;
+	void embed_process(OS::ProcessID p_pid) override;
 	int get_embedded_pid() const override { return current_process_id; }
 	void reset() override;
 	void reset_timers() override {}
@@ -133,7 +129,7 @@ public:
 	void display_state_changed();
 
 	// MARK: - Embedded process state
-	_FORCE_INLINE_ DisplayServerEnums::MouseMode get_mouse_mode() const { return mouse_mode; }
+	_FORCE_INLINE_ DisplayServer::MouseMode get_mouse_mode() const { return mouse_mode; }
 
 	EmbeddedProcessMacOS();
 	~EmbeddedProcessMacOS() override;
diff --git a/engine/platform/macos/editor/embedded_process_macos.mm b/engine/platform/macos/editor/embedded_process_macos.mm
index ec61a2fd..c59ffa55 100644
--- a/engine/platform/macos/editor/embedded_process_macos.mm
+++ b/engine/platform/macos/editor/embedded_process_macos.mm
@@ -30,12 +30,11 @@
 
 #include "embedded_process_macos.h"
 
-#include "../display_server_macos.h"
-#include "../display_server_macos_embedded.h"
+#include "platform/macos/display_server_embedded.h"
+#include "platform/macos/display_server_macos.h"
 
 #include "core/input/input_event_codec.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
@@ -80,7 +79,7 @@ void EmbeddedProcessMacOS::set_script_debugger(ScriptEditorDebugger *p_debugger)
 	_try_embed_process();
 }
 
-void EmbeddedProcessMacOS::embed_process(ProcessID p_pid) {
+void EmbeddedProcessMacOS::embed_process(OS::ProcessID p_pid) {
 	if (!window) {
 		return;
 	}
@@ -107,11 +106,11 @@ void EmbeddedProcessMacOS::reset() {
 		ds->remove_embedded_process(current_process_id);
 	}
 	DisplayServer *ds = DisplayServer::get_singleton();
-	for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
-		ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServerEnums::CursorShape)i, Vector2());
+	for (int i = 0; i < DisplayServer::CURSOR_MAX; i++) {
+		ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServer::CursorShape)i, Vector2());
 	}
-	if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
-		ds->mouse_set_mode(DisplayServerEnums::MOUSE_MODE_VISIBLE);
+	if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
+		ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
 	}
 	current_process_id = 0;
 	embedding_state = EmbeddingState::IDLE;
@@ -122,24 +121,19 @@ void EmbeddedProcessMacOS::reset() {
 
 void EmbeddedProcessMacOS::request_close() {
 	if (current_process_id != 0 && is_embedding_completed()) {
-		script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST });
+		script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_CLOSE_REQUEST });
 	}
 	reset();
 }
 
 void EmbeddedProcessMacOS::display_state_changed() {
-	DisplayServerMacOSEmbeddedState state;
+	DisplayServerEmbeddedState state;
 	state.screen_max_scale = ds->screen_get_max_scale();
 	state.screen_dpi = ds->screen_get_dpi();
-	DisplayServerEnums::WindowID wid = window->get_window_id();
+	DisplayServer::WindowID wid = window->get_window_id();
 	state.screen_window_scale = ds->screen_get_scale(ds->window_get_current_screen(wid));
 	state.display_id = ds->window_get_display_id(wid);
 
-	CGFloat max_edr, max_potential_edr;
-	ds->window_get_edr_values(wid, &max_edr, &max_potential_edr);
-	state.screen_max_edr = max_edr;
-	state.screen_max_potential_edr = max_potential_edr;
-
 	PackedByteArray data;
 	state.serialize(data);
 	script_debugger->send_message("embed:ds_state", { data });
@@ -150,7 +144,7 @@ void EmbeddedProcessMacOS::_try_embed_process() {
 		return;
 	}
 
-	DisplayServerEnums::WindowID wid = window->get_window_id();
+	DisplayServer::WindowID wid = window->get_window_id();
 	Error err = ds->embed_process_update(wid, this);
 	if (err == OK) {
 		layer_host->set_rect(get_adjusted_embedded_window_rect(get_rect()));
@@ -191,10 +185,10 @@ Rect2i EmbeddedProcessMacOS::get_adjusted_embedded_window_rect(const Rect2i &p_r
 	}
 }
 
-void EmbeddedProcessMacOS::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
+void EmbeddedProcessMacOS::mouse_set_mode(DisplayServer::MouseMode p_mode) {
 	mouse_mode = p_mode;
 	// If the mouse is anything other than visible, we must ensure the Game view is active and the layer focused.
-	if (mouse_mode != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
+	if (mouse_mode != DisplayServer::MOUSE_MODE_VISIBLE) {
 		EditorNode::get_singleton()->get_editor_main_screen()->select(EditorMainScreen::EDITOR_GAME);
 		layer_host->grab_focus();
 	}
@@ -227,11 +221,11 @@ void LayerHost::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_MOUSE_ENTER: {
 			DisplayServer *ds = DisplayServer::get_singleton();
-			for (const KeyValue<DisplayServerEnums::CursorShape, CustomCursor> &E : custom_cursors) {
+			for (const KeyValue<DisplayServer::CursorShape, CustomCursor> &E : custom_cursors) {
 				ds->cursor_set_custom_image(E.value.image, E.key, E.value.hotspot);
 			}
 			if (script_debugger) {
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_MOUSE_ENTER });
 			}
 			if (get_window()->has_focus()) {
 				grab_focus();
@@ -246,28 +240,28 @@ void LayerHost::_notification(int p_what) {
 					ds->mouse_set_mode(process->get_mouse_mode());
 				}
 				script_debugger->send_message("embed:notification", { NOTIFICATION_APPLICATION_FOCUS_IN });
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_FOCUS_IN });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_FOCUS_IN });
 				window_focused = true;
 			}
 			process->queue_redraw();
 		} break;
 		case NOTIFICATION_MOUSE_EXIT: {
 			DisplayServer *ds = DisplayServer::get_singleton();
-			for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
-				ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServerEnums::CursorShape)i, Vector2());
+			for (int i = 0; i < DisplayServer::CURSOR_MAX; i++) {
+				ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServer::CursorShape)i, Vector2());
 			}
 			if (script_debugger) {
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_MOUSE_EXIT });
 			}
 		} break;
 		case NOTIFICATION_FOCUS_EXIT: {
 			// Temporarily set mouse state back to visible, so the user can interact with the editor.
 			if (window_focused && script_debugger) {
 				DisplayServer *ds = DisplayServer::get_singleton();
-				if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
-					ds->mouse_set_mode(DisplayServerEnums::MOUSE_MODE_VISIBLE);
+				if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
+					ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
 				}
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_FOCUS_OUT });
 				script_debugger->send_message("embed:notification", { NOTIFICATION_APPLICATION_FOCUS_OUT });
 				window_focused = false;
 			}
@@ -284,11 +278,11 @@ void LayerHost::_notification(int p_what) {
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (!is_visible_in_tree()) {
 				DisplayServer *ds = DisplayServer::get_singleton();
-				for (int i = 0; i < DisplayServerEnums::CURSOR_MAX; i++) {
-					ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServerEnums::CursorShape)i, Vector2());
+				for (int i = 0; i < DisplayServer::CURSOR_MAX; i++) {
+					ds->cursor_set_custom_image(Ref<Resource>(), (DisplayServer::CursorShape)i, Vector2());
 				}
-				if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
-					ds->mouse_set_mode(DisplayServerEnums::MOUSE_MODE_VISIBLE);
+				if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
+					ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
 				}
 			}
 		} break;
@@ -299,12 +293,12 @@ void LayerHost::_notification(int p_what) {
 				if (process->get_mouse_mode() != ds->mouse_get_mode()) {
 					// Restore embedded process mouse mode.
 					ds->mouse_set_mode(process->get_mouse_mode());
-					if (process->get_mouse_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
+					if (process->get_mouse_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
 						get_window()->grab_focus();
 					}
 				}
 				script_debugger->send_message("embed:notification", { NOTIFICATION_APPLICATION_FOCUS_IN });
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_FOCUS_IN });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_FOCUS_IN });
 				window_focused = true;
 			}
 		} break;
@@ -312,10 +306,10 @@ void LayerHost::_notification(int p_what) {
 		case NOTIFICATION_WM_WINDOW_FOCUS_OUT: {
 			if (has_focus() && window_focused && script_debugger) {
 				DisplayServer *ds = DisplayServer::get_singleton();
-				if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
-					ds->mouse_set_mode(DisplayServerEnums::MOUSE_MODE_VISIBLE);
+				if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
+					ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
 				}
-				script_debugger->send_message("embed:win_event", { DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT });
+				script_debugger->send_message("embed:win_event", { DisplayServer::WINDOW_EVENT_FOCUS_OUT });
 				script_debugger->send_message("embed:notification", { NOTIFICATION_APPLICATION_FOCUS_OUT });
 				window_focused = false;
 			}
@@ -323,7 +317,7 @@ void LayerHost::_notification(int p_what) {
 	}
 }
 
-void LayerHost::cursor_set_custom_image(const Ref<Image> &p_image, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+void LayerHost::cursor_set_custom_image(const Ref<Image> &p_image, DisplayServer::CursorShape p_shape, const Vector2 &p_hotspot) {
 	custom_cursors[p_shape] = CustomCursor(p_image, p_hotspot);
 }
 
@@ -335,10 +329,10 @@ void LayerHost::gui_input(const Ref<InputEvent> &p_event) {
 	if (p_event->is_pressed()) {
 		if (ED_IS_SHORTCUT("game_view/release_mouse", p_event)) {
 			DisplayServer *ds = DisplayServer::get_singleton();
-			if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_VISIBLE) {
-				ds->mouse_set_mode(DisplayServerEnums::MOUSE_MODE_VISIBLE);
+			if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_VISIBLE) {
+				ds->mouse_set_mode(DisplayServer::MOUSE_MODE_VISIBLE);
 				if (script_debugger != nullptr) {
-					script_debugger->send_message("embed:mouse_set_mode", { DisplayServerEnums::MOUSE_MODE_VISIBLE });
+					script_debugger->send_message("embed:mouse_set_mode", { DisplayServer::MOUSE_MODE_VISIBLE });
 				}
 			}
 			accept_event();
diff --git a/engine/platform/macos/embedded_debugger.h b/engine/platform/macos/embedded_debugger.h
index 37f06c2e..74217b2f 100644
--- a/engine/platform/macos/embedded_debugger.h
+++ b/engine/platform/macos/embedded_debugger.h
@@ -33,23 +33,23 @@
 #include "core/templates/hash_map.h"
 #include "core/variant/array.h"
 
-class DisplayServerMacOSEmbedded;
+class DisplayServerEmbedded;
 
 /// @brief Singleton class to process embedded debugging message in the child process.
 class EmbeddedDebugger {
 	inline static EmbeddedDebugger *singleton = nullptr;
 
-	EmbeddedDebugger(DisplayServerMacOSEmbedded *p_ds);
+	EmbeddedDebugger(DisplayServerEmbedded *p_ds);
 
 public:
-	static void initialize(DisplayServerMacOSEmbedded *p_ds);
+	static void initialize(DisplayServerEmbedded *p_ds);
 	static void deinitialize();
 
 	~EmbeddedDebugger();
 
 #ifdef DEBUG_ENABLED
 private:
-	DisplayServerMacOSEmbedded *ds;
+	DisplayServerEmbedded *ds;
 
 	/// Message handler function for parse_message.
 	typedef Error (EmbeddedDebugger::*ParseMessageFunc)(const Array &p_args);
diff --git a/engine/platform/macos/embedded_debugger.mm b/engine/platform/macos/embedded_debugger.mm
index fa072b6c..8ca8a537 100644
--- a/engine/platform/macos/embedded_debugger.mm
+++ b/engine/platform/macos/embedded_debugger.mm
@@ -30,20 +30,17 @@
 
 #include "embedded_debugger.h"
 
-#include "display_server_macos_embedded.h"
+#include "display_server_embedded.h"
 
 #include "core/debugger/engine_debugger.h"
-#include "core/input/input.h"
-#include "core/input/input_event.h"
 #include "core/input/input_event_codec.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 
 #ifdef DEBUG_ENABLED
 HashMap<String, EmbeddedDebugger::ParseMessageFunc> EmbeddedDebugger::parse_message_handlers;
 #endif
 
-EmbeddedDebugger::EmbeddedDebugger(DisplayServerMacOSEmbedded *p_ds) {
+EmbeddedDebugger::EmbeddedDebugger(DisplayServerEmbedded *p_ds) {
 	singleton = this;
 
 #ifdef DEBUG_ENABLED
@@ -59,7 +56,7 @@ EmbeddedDebugger::~EmbeddedDebugger() {
 	singleton = nullptr;
 }
 
-void EmbeddedDebugger::initialize(DisplayServerMacOSEmbedded *p_ds) {
+void EmbeddedDebugger::initialize(DisplayServerEmbedded *p_ds) {
 	if (EngineDebugger::is_active()) {
 		memnew(EmbeddedDebugger(p_ds));
 	}
@@ -91,7 +88,7 @@ Error EmbeddedDebugger::_msg_window_size(const Array &p_args) {
 
 Error EmbeddedDebugger::_msg_mouse_set_mode(const Array &p_args) {
 	ERR_FAIL_COND_V_MSG(p_args.size() != 1, ERR_INVALID_PARAMETER, "Invalid number of arguments for 'mouse_set_mode' message.");
-	DisplayServerEnums::MouseMode mode = p_args[0];
+	DisplayServer::MouseMode mode = p_args[0];
 	ds->mouse_set_mode(mode);
 	return OK;
 }
@@ -138,9 +135,9 @@ Error EmbeddedDebugger::_msg_event(const Array &p_args) {
 
 Error EmbeddedDebugger::_msg_win_event(const Array &p_args) {
 	ERR_FAIL_COND_V_MSG(p_args.size() != 1, ERR_INVALID_PARAMETER, "Invalid number of arguments for 'win_event' message.");
-	DisplayServerEnums::WindowEvent win_event = p_args[0];
-	ds->send_window_event_by_id(win_event, DisplayServerEnums::MAIN_WINDOW_ID);
-	if (win_event == DisplayServerEnums::WindowEvent::WINDOW_EVENT_MOUSE_EXIT) {
+	DisplayServer::WindowEvent win_event = p_args[0];
+	ds->send_window_event(win_event, DisplayServer::MAIN_WINDOW_ID);
+	if (win_event == DisplayServer::WindowEvent::WINDOW_EVENT_MOUSE_EXIT) {
 		Input::get_singleton()->release_pressed_events();
 	}
 	return OK;
@@ -166,7 +163,7 @@ Error EmbeddedDebugger::_msg_notification(const Array &p_args) {
 Error EmbeddedDebugger::_msg_ds_state(const Array &p_args) {
 	ERR_FAIL_COND_V_MSG(p_args.size() != 1, ERR_INVALID_PARAMETER, "Invalid number of arguments for 'ds_state' message.");
 	PackedByteArray data = p_args[0];
-	DisplayServerMacOSEmbeddedState state;
+	DisplayServerEmbeddedState state;
 	state.deserialize(data);
 	ds->set_state(state);
 	return OK;
diff --git a/engine/platform/macos/embedded_gl_manager.h b/engine/platform/macos/embedded_gl_manager.h
index b66876b6..4097aada 100644
--- a/engine/platform/macos/embedded_gl_manager.h
+++ b/engine/platform/macos/embedded_gl_manager.h
@@ -32,10 +32,9 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
-#include "core/math/vector2i.h"
-#include "core/templates/rb_map.h"
-#include "servers/display/display_server_enums.h"
+#include "core/os/os.h"
+#include "core/templates/local_vector.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
@@ -43,7 +42,7 @@
 
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in macOS 10.14.
 
-typedef CGLContextObj (*CGLGetCurrentContextPtr)();
+typedef CGLContextObj (*CGLGetCurrentContextPtr)(void);
 typedef CGLError (*CGLTexImageIOSurface2DPtr)(CGLContextObj ctx, GLenum target, GLenum internal_format,
 		GLsizei width, GLsizei height, GLenum format, GLenum type, IOSurfaceRef ioSurface, GLuint plane);
 typedef const char *(*CGLErrorStringPtr)(CGLError);
@@ -77,11 +76,11 @@ class GLManagerEmbedded {
 		~GLWindow() { destroy_framebuffers(); }
 	};
 
-	RBMap<DisplayServerEnums::WindowID, GLWindow> windows;
-	typedef RBMap<DisplayServerEnums::WindowID, GLWindow>::Element GLWindowElement;
+	RBMap<DisplayServer::WindowID, GLWindow> windows;
+	typedef RBMap<DisplayServer::WindowID, GLWindow>::Element GLWindowElement;
 
 	NSOpenGLContext *shared_context = nullptr;
-	DisplayServerEnums::WindowID current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	DisplayServer::WindowID current_window = DisplayServer::INVALID_WINDOW_ID;
 
 	Error create_context(GLWindow &p_win);
 
@@ -100,10 +99,10 @@ class GLManagerEmbedded {
 	void release_display_link();
 
 public:
-	Error window_create(DisplayServerEnums::WindowID p_window_id, CALayer *p_layer, int p_width, int p_height);
-	void window_destroy(DisplayServerEnums::WindowID p_window_id);
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height);
-	Size2i window_get_size(DisplayServerEnums::WindowID p_window_id) const;
+	Error window_create(DisplayServer::WindowID p_window_id, CALayer *p_layer, int p_width, int p_height);
+	void window_destroy(DisplayServer::WindowID p_window_id);
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);
+	Size2i window_get_size(DisplayServer::WindowID p_window_id) const;
 
 	void set_display_id(uint32_t p_display_id);
 	void set_vsync_enabled(bool p_enabled);
@@ -112,7 +111,7 @@ public:
 	void release_current();
 	void swap_buffers();
 
-	void window_make_current(DisplayServerEnums::WindowID p_window_id);
+	void window_make_current(DisplayServer::WindowID p_window_id);
 
 	Error initialize();
 
diff --git a/engine/platform/macos/embedded_gl_manager.mm b/engine/platform/macos/embedded_gl_manager.mm
index 50300547..c568f3e2 100644
--- a/engine/platform/macos/embedded_gl_manager.mm
+++ b/engine/platform/macos/embedded_gl_manager.mm
@@ -33,8 +33,7 @@
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
 #import "drivers/gles3/storage/texture_storage.h"
-
-#import <platform_gl.h>
+#import "platform_gl.h"
 
 #import <QuartzCore/QuartzCore.h>
 #include <dlfcn.h>
@@ -66,7 +65,7 @@ Error GLManagerEmbedded::create_context(GLWindow &p_win) {
 	return OK;
 }
 
-Error GLManagerEmbedded::window_create(DisplayServerEnums::WindowID p_window_id, CALayer *p_layer, int p_width, int p_height) {
+Error GLManagerEmbedded::window_create(DisplayServer::WindowID p_window_id, CALayer *p_layer, int p_width, int p_height) {
 	GLWindow win;
 	win.layer = p_layer;
 	win.width = 0;
@@ -82,7 +81,7 @@ Error GLManagerEmbedded::window_create(DisplayServerEnums::WindowID p_window_id,
 	return OK;
 }
 
-void GLManagerEmbedded::window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {
+void GLManagerEmbedded::window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
 	GLWindowElement *el = windows.find(p_window_id);
 	ERR_FAIL_NULL_MSG(el, "Window resize failed: window does not exist.");
 
@@ -176,7 +175,7 @@ void GLManagerEmbedded::GLWindow::destroy_framebuffers() {
 	}
 }
 
-Size2i GLManagerEmbedded::window_get_size(DisplayServerEnums::WindowID p_window_id) const {
+Size2i GLManagerEmbedded::window_get_size(DisplayServer::WindowID p_window_id) const {
 	const GLWindowElement *el = windows.find(p_window_id);
 	if (el == nullptr) {
 		return Size2i();
@@ -186,29 +185,29 @@ Size2i GLManagerEmbedded::window_get_size(DisplayServerEnums::WindowID p_window_
 	return Size2i(win.width, win.height);
 }
 
-void GLManagerEmbedded::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerEmbedded::window_destroy(DisplayServer::WindowID p_window_id) {
 	GLWindowElement *el = windows.find(p_window_id);
 	if (el == nullptr) {
 		return;
 	}
 
 	if (current_window == p_window_id) {
-		current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+		current_window = DisplayServer::INVALID_WINDOW_ID;
 	}
 
 	windows.erase(el);
 }
 
 void GLManagerEmbedded::release_current() {
-	if (current_window == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (current_window == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
 	[NSOpenGLContext clearCurrentContext];
-	current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	current_window = DisplayServer::INVALID_WINDOW_ID;
 }
 
-void GLManagerEmbedded::window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerEmbedded::window_make_current(DisplayServer::WindowID p_window_id) {
 	if (current_window == p_window_id) {
 		return;
 	}
diff --git a/engine/platform/macos/export/export.cpp b/engine/platform/macos/export/export.cpp
index 39238515..707d66bf 100644
--- a/engine/platform/macos/export/export.cpp
+++ b/engine/platform/macos/export/export.cpp
@@ -32,10 +32,6 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
-#include "editor/export/editor_export.h"
-#include "editor/settings/editor_settings.h"
-
 void register_macos_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformMacOS);
 }
diff --git a/engine/platform/macos/export/export_plugin.cpp b/engine/platform/macos/export/export_plugin.cpp
index 77cf6d5d..56e81367 100644
--- a/engine/platform/macos/export/export_plugin.cpp
+++ b/engine/platform/macos/export/export_plugin.cpp
@@ -33,23 +33,17 @@
 #include "logo_svg.gen.h"
 #include "run_icon_svg.gen.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/marshalls.h"
+#include "core/io/image_loader.h"
 #include "core/io/plist.h"
-#include "core/io/zip_io.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "drivers/png/png_driver_common.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/codesign.h"
-#include "editor/export/editor_export.h"
 #include "editor/export/lipo.h"
 #include "editor/export/macho.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/import/resource_importer_texture_settings.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/image_texture.h"
 
@@ -2616,7 +2610,15 @@ Ref<Texture2D> EditorExportPlatformMacOS::get_run_icon() const {
 }
 
 bool EditorExportPlatformMacOS::poll_export() {
-	Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(this);
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == this) {
+			preset = ep;
+			break;
+		}
+	}
 
 	int prev = menu_options;
 	menu_options = (preset.is_valid() && preset->get("ssh_remote_deploy/enabled").operator bool());
@@ -2707,19 +2709,19 @@ Error EditorExportPlatformMacOS::run(const Ref<EditorExportPreset> &p_preset, in
 
 	const String basepath = dest.path_join("tmp_macos_export");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
-		if (da->file_exists(basepath + ".zip")) { \
-			da->remove(basepath + ".zip"); \
-		} \
+#define CLEANUP_AND_RETURN(m_err)                      \
+	{                                                  \
+		if (da->file_exists(basepath + ".zip")) {      \
+			da->remove(basepath + ".zip");             \
+		}                                              \
 		if (da->file_exists(basepath + "_start.sh")) { \
-			da->remove(basepath + "_start.sh"); \
-		} \
+			da->remove(basepath + "_start.sh");        \
+		}                                              \
 		if (da->file_exists(basepath + "_clean.sh")) { \
-			da->remove(basepath + "_clean.sh"); \
-		} \
-		return m_err; \
-	} \
+			da->remove(basepath + "_clean.sh");        \
+		}                                              \
+		return m_err;                                  \
+	}                                                  \
 	((void)0)
 
 	if (ep.step(TTR("Exporting project..."), 1)) {
diff --git a/engine/platform/macos/export/export_plugin.h b/engine/platform/macos/export/export_plugin.h
index 34fde9dc..d47d6f96 100644
--- a/engine/platform/macos/export/export_plugin.h
+++ b/engine/platform/macos/export/export_plugin.h
@@ -30,10 +30,15 @@
 
 #pragma once
 
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/io/file_access.h"
 #include "core/io/image.h"
-#include "core/os/process_id.h"
-#include "editor/export/editor_export_platform.h"
+#include "core/io/marshalls.h"
+#include "core/io/resource_saver.h"
+#include "core/os/os.h"
+#include "editor/export/editor_export.h"
+#include "editor/settings/editor_settings.h"
 #include "scene/resources/image_texture.h"
 
 #include <sys/stat.h>
@@ -77,7 +82,7 @@ class EditorExportPlatformMacOS : public EditorExportPlatform {
 	Ref<ImageTexture> stop_icon;
 
 	Vector<SSHCleanupCommand> cleanup_commands;
-	ProcessID ssh_pid = 0;
+	OS::ProcessID ssh_pid = 0;
 	int menu_options = 0;
 
 	void _fix_privacy_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist);
diff --git a/engine/platform/macos/gl_manager_macos_angle.h b/engine/platform/macos/gl_manager_macos_angle.h
index 7e97622d..626c8ff1 100644
--- a/engine/platform/macos/gl_manager_macos_angle.h
+++ b/engine/platform/macos/gl_manager_macos_angle.h
@@ -32,9 +32,10 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/templates/vector.h"
+#include "core/os/os.h"
+#include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 // Suppress redefinition conflicts
 #define FontVariation __FontVariation
@@ -56,7 +57,7 @@ private:
 	virtual Vector<EGLint> _get_platform_context_attribs() const override;
 
 public:
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {}
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {}
 
 	GLManagerANGLE_MacOS() {}
 	~GLManagerANGLE_MacOS() {}
diff --git a/engine/platform/macos/gl_manager_macos_angle.mm b/engine/platform/macos/gl_manager_macos_angle.mm
index c1cbde21..8579cd0e 100644
--- a/engine/platform/macos/gl_manager_macos_angle.mm
+++ b/engine/platform/macos/gl_manager_macos_angle.mm
@@ -32,11 +32,11 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#import <EGL/eglext_angle.h>
-
 #include <cstdio>
 #include <cstdlib>
 
+#import <EGL/eglext_angle.h>
+
 const char *GLManagerANGLE_MacOS::_get_platform_extension_name() const {
 	return "EGL_ANGLE_platform_angle";
 }
diff --git a/engine/platform/macos/gl_manager_macos_legacy.h b/engine/platform/macos/gl_manager_macos_legacy.h
index 295a0a18..c8eceb20 100644
--- a/engine/platform/macos/gl_manager_macos_legacy.h
+++ b/engine/platform/macos/gl_manager_macos_legacy.h
@@ -32,11 +32,9 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "platform_gl.h"
-
-#include "core/error/error_list.h"
-#include "core/templates/rb_map.h"
-#include "servers/display/display_server_enums.h"
+#include "core/os/os.h"
+#include "core/templates/local_vector.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
@@ -46,7 +44,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is de
 
 typedef CGLError (*CGLEnablePtr)(CGLContextObj ctx, CGLContextEnable pname);
 typedef CGLError (*CGLSetParameterPtr)(CGLContextObj ctx, CGLContextParameter pname, const GLint *params);
-typedef CGLContextObj (*CGLGetCurrentContextPtr)();
+typedef CGLContextObj (*CGLGetCurrentContextPtr)(void);
 
 class GLManagerLegacy_MacOS {
 	struct GLWindow {
@@ -54,10 +52,10 @@ class GLManagerLegacy_MacOS {
 		NSOpenGLContext *context = nullptr;
 	};
 
-	RBMap<DisplayServerEnums::WindowID, GLWindow> windows;
+	RBMap<DisplayServer::WindowID, GLWindow> windows;
 
 	NSOpenGLContext *shared_context = nullptr;
-	DisplayServerEnums::WindowID current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	DisplayServer::WindowID current_window = DisplayServer::INVALID_WINDOW_ID;
 
 	Error create_context(GLWindow &win);
 
@@ -68,23 +66,23 @@ class GLManagerLegacy_MacOS {
 	CGLGetCurrentContextPtr CGLGetCurrentContext = nullptr;
 
 public:
-	Error window_create(DisplayServerEnums::WindowID p_window_id, id p_view, int p_width, int p_height);
-	void window_destroy(DisplayServerEnums::WindowID p_window_id);
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height);
+	Error window_create(DisplayServer::WindowID p_window_id, id p_view, int p_width, int p_height);
+	void window_destroy(DisplayServer::WindowID p_window_id);
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);
 
 	void release_current();
 	void swap_buffers();
 
-	void window_make_current(DisplayServerEnums::WindowID p_window_id);
+	void window_make_current(DisplayServer::WindowID p_window_id);
 
-	void window_set_per_pixel_transparency_enabled(DisplayServerEnums::WindowID p_window_id, bool p_enabled);
+	void window_set_per_pixel_transparency_enabled(DisplayServer::WindowID p_window_id, bool p_enabled);
 
 	Error initialize();
 
 	void set_use_vsync(bool p_use);
 	bool is_using_vsync() const;
 
-	NSOpenGLContext *get_context(DisplayServerEnums::WindowID p_window_id);
+	NSOpenGLContext *get_context(DisplayServer::WindowID p_window_id);
 
 	GLManagerLegacy_MacOS();
 	~GLManagerLegacy_MacOS();
diff --git a/engine/platform/macos/gl_manager_macos_legacy.mm b/engine/platform/macos/gl_manager_macos_legacy.mm
index 90b6bd6a..142fb744 100644
--- a/engine/platform/macos/gl_manager_macos_legacy.mm
+++ b/engine/platform/macos/gl_manager_macos_legacy.mm
@@ -32,10 +32,7 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/os/os.h"
-
 #include <dlfcn.h>
-
 #include <cstdio>
 #include <cstdlib>
 
@@ -67,7 +64,7 @@ Error GLManagerLegacy_MacOS::create_context(GLWindow &win) {
 	return OK;
 }
 
-Error GLManagerLegacy_MacOS::window_create(DisplayServerEnums::WindowID p_window_id, id p_view, int p_width, int p_height) {
+Error GLManagerLegacy_MacOS::window_create(DisplayServer::WindowID p_window_id, id p_view, int p_width, int p_height) {
 	GLWindow win;
 	win.window_view = p_view;
 
@@ -81,7 +78,7 @@ Error GLManagerLegacy_MacOS::window_create(DisplayServerEnums::WindowID p_window
 	return OK;
 }
 
-void GLManagerLegacy_MacOS::window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {
+void GLManagerLegacy_MacOS::window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
 	if (!windows.has(p_window_id)) {
 		return;
 	}
@@ -102,28 +99,28 @@ void GLManagerLegacy_MacOS::window_resize(DisplayServerEnums::WindowID p_window_
 	[win.context update];
 }
 
-void GLManagerLegacy_MacOS::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerLegacy_MacOS::window_destroy(DisplayServer::WindowID p_window_id) {
 	if (!windows.has(p_window_id)) {
 		return;
 	}
 
 	if (current_window == p_window_id) {
-		current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+		current_window = DisplayServer::INVALID_WINDOW_ID;
 	}
 
 	windows.erase(p_window_id);
 }
 
 void GLManagerLegacy_MacOS::release_current() {
-	if (current_window == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (current_window == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
 	[NSOpenGLContext clearCurrentContext];
-	current_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	current_window = DisplayServer::INVALID_WINDOW_ID;
 }
 
-void GLManagerLegacy_MacOS::window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerLegacy_MacOS::window_make_current(DisplayServer::WindowID p_window_id) {
 	if (current_window == p_window_id) {
 		return;
 	}
@@ -142,7 +139,7 @@ void GLManagerLegacy_MacOS::swap_buffers() {
 	[win.context flushBuffer];
 }
 
-void GLManagerLegacy_MacOS::window_set_per_pixel_transparency_enabled(DisplayServerEnums::WindowID p_window_id, bool p_enabled) {
+void GLManagerLegacy_MacOS::window_set_per_pixel_transparency_enabled(DisplayServer::WindowID p_window_id, bool p_enabled) {
 	if (!windows.has(p_window_id)) {
 		return;
 	}
@@ -179,7 +176,7 @@ bool GLManagerLegacy_MacOS::is_using_vsync() const {
 	return use_vsync;
 }
 
-NSOpenGLContext *GLManagerLegacy_MacOS::get_context(DisplayServerEnums::WindowID p_window_id) {
+NSOpenGLContext *GLManagerLegacy_MacOS::get_context(DisplayServer::WindowID p_window_id) {
 	if (!windows.has(p_window_id)) {
 		return nullptr;
 	}
diff --git a/engine/platform/macos/godot_application.h b/engine/platform/macos/godot_application.h
index 5c26fccc..022c02f3 100644
--- a/engine/platform/macos/godot_application.h
+++ b/engine/platform/macos/godot_application.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "core/os/os.h"
+
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <IOKit/hidsystem/ev_keymap.h>
diff --git a/engine/platform/macos/godot_application_delegate.h b/engine/platform/macos/godot_application_delegate.h
index ea4695ad..17fb5f65 100644
--- a/engine/platform/macos/godot_application_delegate.h
+++ b/engine/platform/macos/godot_application_delegate.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "core/os/os.h"
+
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
diff --git a/engine/platform/macos/godot_application_delegate.mm b/engine/platform/macos/godot_application_delegate.mm
index 1ccf1191..bfc8d737 100644
--- a/engine/platform/macos/godot_application_delegate.mm
+++ b/engine/platform/macos/godot_application_delegate.mm
@@ -36,8 +36,6 @@
 #import "native_menu_macos.h"
 #import "os_macos.h"
 
-#import "core/input/input.h"
-#import "core/input/input_event.h"
 #import "core/os/main_loop.h"
 #import "main/main.h"
 
@@ -262,7 +260,7 @@ constexpr static NSEventModifierFlags FLAGS = NSEventModifierFlagCommand | NSEve
 		return;
 	}
 
-	DisplayServerEnums::WindowID window_id = ds->get_focused_window();
+	DisplayServer::WindowID window_id = ds->get_focused_window();
 	NSEventModifierFlags flags = static_cast<NSEventModifierFlags>(mod);
 
 	for (const CGKeyCode key : modifiers) {
@@ -322,8 +320,8 @@ constexpr static NSEventModifierFlags FLAGS = NSEventModifierFlagCommand | NSEve
 	}
 
 	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
-	if (ds && ds->has_window(DisplayServerEnums::MAIN_WINDOW_ID)) {
-		ds->send_window_event(ds->get_window(DisplayServerEnums::MAIN_WINDOW_ID), DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+	if (ds && ds->has_window(DisplayServerMacOS::MAIN_WINDOW_ID)) {
+		ds->send_window_event(ds->get_window(DisplayServerMacOS::MAIN_WINDOW_ID), DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 	}
 
 	return NSTerminateCancel;
diff --git a/engine/platform/macos/godot_button_view.h b/engine/platform/macos/godot_button_view.h
index 50d14b36..36e55bd7 100644
--- a/engine/platform/macos/godot_button_view.h
+++ b/engine/platform/macos/godot_button_view.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "servers/display/display_server.h"
+
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
diff --git a/engine/platform/macos/godot_content_view.h b/engine/platform/macos/godot_content_view.h
index d93cb291..8462431e 100644
--- a/engine/platform/macos/godot_content_view.h
+++ b/engine/platform/macos/godot_content_view.h
@@ -30,9 +30,7 @@
 
 #pragma once
 
-#include "core/input/input_enums.h"
-#include "core/typedefs.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
@@ -47,11 +45,11 @@
 #import <QuartzCore/CAMetalLayer.h>
 
 @interface GodotContentLayerDelegate : NSObject <CALayerDelegate> {
-	DisplayServerEnums::WindowID window_id;
+	DisplayServer::WindowID window_id;
 	bool need_redraw;
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid;
+- (void)setWindowID:(DisplayServer::WindowID)wid;
 - (void)setNeedRedraw:(bool)redraw;
 
 @end
@@ -59,7 +57,7 @@
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in macOS 10.14.
 
 @interface GodotContentView : RootView <NSTextInputClient> {
-	DisplayServerEnums::WindowID window_id;
+	DisplayServer::WindowID window_id;
 	NSTrackingArea *tracking_area;
 	NSMutableAttributedString *marked_text;
 	bool ime_input_event_in_progress;
@@ -74,7 +72,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is de
 - (void)processScrollEvent:(NSEvent *)event button:(MouseButton)button factor:(double)factor;
 - (void)processPanEvent:(NSEvent *)event dx:(double)dx dy:(double)dy;
 - (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index pressed:(bool)pressed outofstream:(bool)outofstream;
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid;
+- (void)setWindowID:(DisplayServer::WindowID)wid;
 - (void)updateLayerDelegate;
 - (void)cancelComposition;
 
diff --git a/engine/platform/macos/godot_content_view.mm b/engine/platform/macos/godot_content_view.mm
index d3fb28f3..49b42514 100644
--- a/engine/platform/macos/godot_content_view.mm
+++ b/engine/platform/macos/godot_content_view.mm
@@ -34,10 +34,6 @@
 #import "godot_window.h"
 #import "key_mapping_macos.h"
 
-#include "core/input/input.h"
-#include "core/input/input_event.h"
-#include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 
@@ -45,12 +41,12 @@
 
 - (id)init {
 	self = [super init];
-	window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	window_id = DisplayServer::INVALID_WINDOW_ID;
 	need_redraw = false;
 	return self;
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid {
+- (void)setWindowID:(DisplayServerMacOS::WindowID)wid {
 	window_id = wid;
 }
 
@@ -141,7 +137,7 @@
 - (id)init {
 	self = [super init];
 	layer_delegate = [[GodotContentLayerDelegate alloc] init];
-	window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	window_id = DisplayServer::INVALID_WINDOW_ID;
 	tracking_area = nil;
 	ime_input_event_in_progress = false;
 	mouse_down_control = false;
@@ -158,7 +154,7 @@
 	return self;
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid {
+- (void)setWindowID:(DisplayServerMacOS::WindowID)wid {
 	window_id = wid;
 	[layer_delegate setWindowID:window_id];
 }
@@ -435,7 +431,7 @@
 	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 	if (ds && ds->has_window(window_id)) {
 		DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
-		wd.edge = DisplayServerEnums::WINDOW_EDGE_MAX;
+		wd.edge = DisplayServer::WINDOW_EDGE_MAX;
 	}
 	if (([event modifierFlags] & NSEventModifierFlagControl)) {
 		mouse_down_control = true;
@@ -450,43 +446,43 @@
 	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 	if (ds && ds->has_window(window_id)) {
 		DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
-		if (wd.edge != DisplayServerEnums::WINDOW_EDGE_MAX) {
+		if (wd.edge != DisplayServer::WINDOW_EDGE_MAX) {
 			Size2i max_size = wd.max_size / ds->screen_get_max_scale();
 			Size2i min_size = wd.min_size / ds->screen_get_max_scale();
 			NSRect frame = [wd.window_object frame];
 			switch (wd.edge) {
-				case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+				case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 					int clamped_dx = CLAMP(frame.size.width - event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					int clamped_dy = CLAMP(frame.size.height - event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x - clamped_dx, frame.origin.y, frame.size.width + clamped_dx, frame.size.height + clamped_dy) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_TOP: {
+				case DisplayServer::WINDOW_EDGE_TOP: {
 					int clamped_dy = CLAMP(frame.size.height - event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height + clamped_dy) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+				case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 					int clamped_dx = CLAMP(frame.size.width + event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					int clamped_dy = CLAMP(frame.size.height - event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width + clamped_dx, frame.size.height + clamped_dy) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+				case DisplayServer::WINDOW_EDGE_LEFT: {
 					int clamped_dx = CLAMP(frame.size.width - event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x - clamped_dx, frame.origin.y, frame.size.width + clamped_dx, frame.size.height) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+				case DisplayServer::WINDOW_EDGE_RIGHT: {
 					int clamped_dx = CLAMP(frame.size.width + event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width + clamped_dx, frame.size.height) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+				case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 					int clamped_dx = CLAMP(frame.size.width - event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					int clamped_dy = CLAMP(frame.size.height + event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x - clamped_dx, frame.origin.y - clamped_dy, frame.size.width + clamped_dx, frame.size.height + clamped_dy) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+				case DisplayServer::WINDOW_EDGE_BOTTOM: {
 					int clamped_dy = CLAMP(frame.size.height + event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y - clamped_dy, frame.size.width, frame.size.height + clamped_dy) display:YES];
 				} break;
-				case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+				case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 					int clamped_dx = CLAMP(frame.size.width + event.deltaX, min_size.x, max_size.x) - frame.size.width;
 					int clamped_dy = CLAMP(frame.size.height + event.deltaY, min_size.y, max_size.y) - frame.size.height;
 					[wd.window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y - clamped_dy, frame.size.width + clamped_dx, frame.size.height + clamped_dy) display:YES];
@@ -504,7 +500,7 @@
 	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 	if (ds && ds->has_window(window_id)) {
 		DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
-		wd.edge = DisplayServerEnums::WINDOW_EDGE_MAX;
+		wd.edge = DisplayServer::WINDOW_EDGE_MAX;
 	}
 	if (mouse_down_control) {
 		[self processMouseEvent:event index:MouseButton::RIGHT pressed:false outofstream:false];
@@ -623,7 +619,7 @@
 		return;
 	}
 
-	if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_CAPTURED) {
 		ds->mouse_exit_window(window_id);
 	}
 }
@@ -634,7 +630,7 @@
 		return;
 	}
 
-	if (ds->mouse_get_mode() != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_CAPTURED) {
 		ds->mouse_enter_window(window_id);
 	}
 
diff --git a/engine/platform/macos/godot_main_macos.mm b/engine/platform/macos/godot_main_macos.mm
index 27fb50f7..46dc9495 100644
--- a/engine/platform/macos/godot_main_macos.mm
+++ b/engine/platform/macos/godot_main_macos.mm
@@ -28,17 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#import "godot_application.h"
 #import "os_macos.h"
 
+#import "godot_application.h"
+
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 
-#if defined(ASAN_ENABLED)
+#if defined(SANITIZERS_ENABLED)
 #include <sys/resource.h>
 #endif
 
-__attribute__((visibility("default"))) int main(int argc, char **argv) {
+int main(int argc, char **argv) {
 	godot_init_profiler();
 
 #if defined(VULKAN_ENABLED)
@@ -46,7 +47,7 @@ __attribute__((visibility("default"))) int main(int argc, char **argv) {
 	setenv("MVK_CONFIG_SWAPCHAIN_MIN_MAG_FILTER_USE_NEAREST", "0", 1); // MoltenVK - use linear surface scaling. TODO: remove when full DPI scaling is implemented.
 #endif
 
-#if defined(ASAN_ENABLED)
+#if defined(SANITIZERS_ENABLED)
 	// Note: Set stack size to be at least 30 MB (vs 8 MB default) to avoid overflow, address sanitizer can increase stack usage up to 3 times.
 	struct rlimit stack_lim = { 0x1E00000, 0x1E00000 };
 	setrlimit(RLIMIT_STACK, &stack_lim);
diff --git a/engine/platform/macos/godot_menu_item.h b/engine/platform/macos/godot_menu_item.h
index ad200629..23bddeef 100644
--- a/engine/platform/macos/godot_menu_item.h
+++ b/engine/platform/macos/godot_menu_item.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#include "core/io/image.h"
-#include "core/object/ref_counted.h"
-#include "core/os/keyboard.h"
-#include "core/variant/callable.h"
-#include "core/variant/variant.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
diff --git a/engine/platform/macos/godot_open_save_delegate.h b/engine/platform/macos/godot_open_save_delegate.h
index b2f9c4c5..558ab23b 100644
--- a/engine/platform/macos/godot_open_save_delegate.h
+++ b/engine/platform/macos/godot_open_save_delegate.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "core/templates/hash_map.h"
-#include "core/variant/typed_array.h"
-#include "core/variant/variant.h"
-
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
+#include "core/templates/hash_map.h"
+#include "core/variant/typed_array.h"
+#include "core/variant/variant.h"
+
 @interface GodotOpenSaveDelegate : NSObject <NSOpenSavePanelDelegate> {
 	NSSavePanel *dialog;
 	NSMutableArray *allowed_types;
diff --git a/engine/platform/macos/godot_progress_view.h b/engine/platform/macos/godot_progress_view.h
deleted file mode 100644
index 2c765be8..00000000
--- a/engine/platform/macos/godot_progress_view.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************/
-/*  godot_progress_view.h                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "display_server_macos_base.h"
-
-#import <AppKit/AppKit.h>
-#import <Foundation/Foundation.h>
-
-@interface GodotProgressView : NSView {
-	DisplayServerEnums::ProgressState pr_state;
-	float pr_value;
-	float pr_offset;
-}
-- (void)setValue:(float)value;
-- (void)setState:(DisplayServerEnums::ProgressState)state;
-@end
diff --git a/engine/platform/macos/godot_progress_view.mm b/engine/platform/macos/godot_progress_view.mm
deleted file mode 100644
index ce39ee19..00000000
--- a/engine/platform/macos/godot_progress_view.mm
+++ /dev/null
@@ -1,94 +0,0 @@
-/**************************************************************************/
-/*  godot_progress_view.mm                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#import "godot_progress_view.h"
-
-@implementation GodotProgressView
-
-- (id)init {
-	self = [super init];
-	pr_state = DisplayServerEnums::PROGRESS_STATE_NOPROGRESS;
-	pr_value = 0.f;
-	pr_offset = 0.f;
-	return self;
-}
-
-- (void)setValue:(float)value {
-	pr_value = value;
-}
-
-- (void)setState:(DisplayServerEnums::ProgressState)state {
-	pr_state = state;
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-	// Icon draw.
-	[[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
-	[[NSApp applicationIconImage] drawInRect:self.bounds];
-
-	if (pr_state == DisplayServerEnums::PROGRESS_STATE_NOPROGRESS) {
-		return;
-	}
-
-	// Border draw.
-	NSRect rect = NSMakeRect(1.f, 1.f, self.bounds.size.width - 2.f, 16.f);
-	NSBezierPath *bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:8.f yRadius:8.f];
-	[bezier_path setLineWidth:2.0];
-	[[NSColor grayColor] set];
-	[bezier_path stroke];
-
-	// Fill clip path.
-	rect = NSMakeRect(2.f, 2.f, self.bounds.size.width - 4.f, 14.f);
-	bezier_path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:7.f yRadius:7.f];
-	[bezier_path setLineWidth:1.0];
-	[bezier_path addClip];
-
-	// Fill draw.
-	if (pr_state == DisplayServerEnums::PROGRESS_STATE_INDETERMINATE) {
-		rect.size.width /= 5.0;
-		pr_offset += rect.size.width / 10.0;
-		if (pr_offset > self.bounds.size.width - rect.size.width) {
-			pr_offset = 0.f;
-		}
-		rect.origin.x += pr_offset;
-	} else {
-		rect.size.width = Math::floor(rect.size.width * pr_value);
-	}
-	if (pr_state == DisplayServerEnums::PROGRESS_STATE_ERROR) {
-		[[NSColor colorWithSRGBRed:1.0 green:0.2 blue:0.2 alpha:1.0] set];
-	} else if (pr_state == DisplayServerEnums::PROGRESS_STATE_PAUSED) {
-		[[NSColor colorWithSRGBRed:1.0 green:1.0 blue:0.2 alpha:1.0] set];
-	} else {
-		[[NSColor colorWithSRGBRed:0.2 green:0.6 blue:1.0 alpha:1.0] set];
-	}
-	NSRectFill(rect);
-}
-
-@end
diff --git a/engine/platform/macos/godot_window.h b/engine/platform/macos/godot_window.h
index 6c9a9a5d..b5b72089 100644
--- a/engine/platform/macos/godot_window.h
+++ b/engine/platform/macos/godot_window.h
@@ -30,17 +30,17 @@
 
 #pragma once
 
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
 @interface GodotWindow : NSWindow {
-	DisplayServerEnums::WindowID window_id;
+	DisplayServer::WindowID window_id;
 	NSTimeInterval anim_duration;
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid;
+- (void)setWindowID:(DisplayServer::WindowID)wid;
 - (void)setAnimDuration:(NSTimeInterval)duration;
 
 @end
diff --git a/engine/platform/macos/godot_window.mm b/engine/platform/macos/godot_window.mm
index 9d42288b..7614c283 100644
--- a/engine/platform/macos/godot_window.mm
+++ b/engine/platform/macos/godot_window.mm
@@ -36,7 +36,7 @@
 
 - (id)init {
 	self = [super init];
-	window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	window_id = DisplayServer::INVALID_WINDOW_ID;
 	anim_duration = -1.0f;
 	return self;
 }
@@ -53,7 +53,7 @@
 	}
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid {
+- (void)setWindowID:(DisplayServerMacOS::WindowID)wid {
 	window_id = wid;
 }
 
diff --git a/engine/platform/macos/godot_window_delegate.h b/engine/platform/macos/godot_window_delegate.h
index 015f70e6..6237838b 100644
--- a/engine/platform/macos/godot_window_delegate.h
+++ b/engine/platform/macos/godot_window_delegate.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
@@ -39,7 +39,7 @@ class DisplayServerMacOS;
 
 @interface GodotWindowDelegate : NSObject <NSWindowDelegate>
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid;
+- (void)setWindowID:(DisplayServer::WindowID)wid;
 
 - (instancetype)initWithDisplayServer:(DisplayServerMacOS *)p_ds;
 
diff --git a/engine/platform/macos/godot_window_delegate.mm b/engine/platform/macos/godot_window_delegate.mm
index 73429c66..4d7ffe93 100644
--- a/engine/platform/macos/godot_window_delegate.mm
+++ b/engine/platform/macos/godot_window_delegate.mm
@@ -35,22 +35,20 @@
 #import "godot_content_view.h"
 #import "godot_window.h"
 
-#include "servers/display/accessibility_server.h"
-
 @implementation GodotWindowDelegate {
-	DisplayServerEnums::WindowID window_id;
+	DisplayServer::WindowID window_id;
 	DisplayServerMacOS *ds;
 }
 
 - (instancetype)initWithDisplayServer:(DisplayServerMacOS *)p_ds {
 	if (self = [super init]) {
 		ds = p_ds;
-		window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		window_id = DisplayServerMacOS::INVALID_WINDOW_ID;
 	}
 	return self;
 }
 
-- (void)setWindowID:(DisplayServerEnums::WindowID)wid {
+- (void)setWindowID:(DisplayServer::WindowID)wid {
 	window_id = wid;
 }
 
@@ -59,7 +57,7 @@
 		return YES;
 	}
 
-	ds->send_window_event(ds->get_window(window_id), DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+	ds->send_window_event(ds->get_window(window_id), DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 	return NO;
 }
 
@@ -72,11 +70,11 @@
 
 	DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
 	while (wd.transient_children.size()) {
-		ds->window_set_transient(*wd.transient_children.begin(), DisplayServerEnums::INVALID_WINDOW_ID);
+		ds->window_set_transient(*wd.transient_children.begin(), DisplayServerMacOS::INVALID_WINDOW_ID);
 	}
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
-		ds->window_set_transient(window_id, DisplayServerEnums::INVALID_WINDOW_ID);
+	if (wd.transient_parent != DisplayServerMacOS::INVALID_WINDOW_ID) {
+		ds->window_set_transient(window_id, DisplayServerMacOS::INVALID_WINDOW_ID);
 	}
 
 	ds->mouse_exit_window(window_id);
@@ -127,7 +125,7 @@
 		ds->window_set_custom_window_buttons(wd, false);
 	}
 
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE);
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_TITLEBAR_CHANGE);
 
 	// Force window resize event and redraw.
 	[self windowDidResize:notification];
@@ -146,7 +144,7 @@
 		ds->window_set_custom_window_buttons(wd, true);
 	}
 
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE);
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_TITLEBAR_CHANGE);
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow *)window {
@@ -161,7 +159,7 @@
 		ds->window_set_custom_window_buttons(wd, false);
 	}
 
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE);
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_TITLEBAR_CHANGE);
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification {
@@ -238,7 +236,7 @@
 		wd.size.width = content_rect.size.width * scale;
 		wd.size.height = content_rect.size.height * scale;
 
-		ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_DPI_CHANGE);
+		ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_DPI_CHANGE);
 
 		CALayer *layer = [wd.window_view layer];
 		if (layer) {
@@ -317,7 +315,7 @@
 		[wd.window_button_view displayButtons];
 	}
 
-	if (ds->mouse_get_mode() == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (ds->mouse_get_mode() == DisplayServer::MOUSE_MODE_CAPTURED) {
 		const NSRect content_rect = [wd.window_view frame];
 		NSRect point_in_window_rect = NSMakeRect(content_rect.size.width / 2, content_rect.size.height / 2, 0, 0);
 		NSPoint point_on_screen = [[wd.window_view window] convertRectToScreen:point_in_window_rect].origin;
@@ -331,9 +329,10 @@
 
 	wd.focused = true;
 	ds->set_last_focused_window(window_id);
-	AccessibilityServer::get_singleton()->set_window_focused(window_id, true);
-
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, true);
+#endif
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_IN);
 }
 
 - (void)windowDidResignKey:(NSNotification *)notification {
@@ -349,9 +348,10 @@
 
 	wd.focused = false;
 	ds->release_pressed_events();
-	AccessibilityServer::get_singleton()->set_window_focused(window_id, false);
-
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, false);
+#endif
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_OUT);
 }
 
 - (void)windowDidMiniaturize:(NSNotification *)notification {
@@ -363,9 +363,10 @@
 
 	wd.focused = false;
 	ds->release_pressed_events();
-	AccessibilityServer::get_singleton()->set_window_focused(window_id, false);
-
-	ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, false);
+#endif
+	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_OUT);
 }
 
 - (void)windowDidDeminiaturize:(NSNotification *)notification {
@@ -378,9 +379,10 @@
 	if ([wd.window_object isKeyWindow]) {
 		wd.focused = true;
 		ds->set_last_focused_window(window_id);
-		AccessibilityServer::get_singleton()->set_window_focused(window_id, true);
-
-		ds->send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+#ifdef ACCESSKIT_ENABLED
+		ds->accessibility_set_window_focused(window_id, true);
+#endif
+		ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_IN);
 	}
 }
 
diff --git a/engine/platform/macos/key_mapping_macos.mm b/engine/platform/macos/key_mapping_macos.mm
index 64059802..07cad718 100644
--- a/engine/platform/macos/key_mapping_macos.mm
+++ b/engine/platform/macos/key_mapping_macos.mm
@@ -30,7 +30,6 @@
 
 #import "key_mapping_macos.h"
 
-#include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
 
diff --git a/engine/platform/macos/libgodot_macos.mm b/engine/platform/macos/libgodot_macos.mm
index 280f3376..d410d730 100644
--- a/engine/platform/macos/libgodot_macos.mm
+++ b/engine/platform/macos/libgodot_macos.mm
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "os_macos.h"
+#include "core/extension/libgodot.h"
 
 #include "core/extension/godot_instance.h"
-#include "core/extension/libgodot.h"
 #include "main/main.h"
 
+#include "os_macos.h"
+
 static OS_MacOS *os = nullptr;
 
 static GodotInstance *instance = nullptr;
diff --git a/engine/platform/macos/macos_quartz_core_spi.h b/engine/platform/macos/macos_quartz_core_spi.h
index 27aa24ae..6dd4e435 100644
--- a/engine/platform/macos/macos_quartz_core_spi.h
+++ b/engine/platform/macos/macos_quartz_core_spi.h
@@ -57,7 +57,7 @@
 #import <Foundation/Foundation.h>
 #import <Quartz/Quartz.h>
 
-#include <cstdint>
+#include <stdint.h>
 
 // https://chromium.googlesource.com/chromium/src/+/refs/heads/main/ui/base/cocoa/remote_layer_api.h
 
diff --git a/engine/platform/macos/native_menu_macos.h b/engine/platform/macos/native_menu_macos.h
index bf5dde4c..def625cf 100644
--- a/engine/platform/macos/native_menu_macos.h
+++ b/engine/platform/macos/native_menu_macos.h
@@ -152,7 +152,6 @@ public:
 	virtual void set_item_max_states(const RID &p_rid, int p_idx, int p_max_states) override;
 	virtual void set_item_icon(const RID &p_rid, int p_idx, const Ref<Texture2D> &p_icon) override;
 	virtual void set_item_indentation_level(const RID &p_rid, int p_idx, int p_level) override;
-	virtual int set_item_index(const RID &p_rid, int p_idx, int p_target_idx) override;
 
 	virtual int get_item_count(const RID &p_rid) const override;
 	virtual bool is_system_menu(const RID &p_rid) const override;
diff --git a/engine/platform/macos/native_menu_macos.mm b/engine/platform/macos/native_menu_macos.mm
index 74d94b97..613799be 100644
--- a/engine/platform/macos/native_menu_macos.mm
+++ b/engine/platform/macos/native_menu_macos.mm
@@ -34,7 +34,6 @@
 #import "godot_menu_item.h"
 #import "key_mapping_macos.h"
 
-#include "core/object/callable_mp.h"
 #include "scene/resources/image_texture.h"
 
 void NativeMenuMacOS::_register_system_menus(NSMenu *p_main_menu, NSMenu *p_application_menu, NSMenu *p_window_menu, NSMenu *p_help_menu, NSMenu *p_dock_menu) {
@@ -1320,29 +1319,6 @@ void NativeMenuMacOS::set_item_indentation_level(const RID &p_rid, int p_idx, in
 	}
 }
 
-int NativeMenuMacOS::set_item_index(const RID &p_rid, int p_idx, int p_target_idx) {
-	ERR_FAIL_COND_V(p_idx < 0, -1);
-
-	MenuData *md = menus.get_or_null(p_rid);
-	ERR_FAIL_NULL_V(md, -1);
-	int item_start = _get_system_menu_start(md->menu);
-	int item_count = _get_system_menu_count(md->menu);
-	p_idx += item_start;
-	ERR_FAIL_COND_V(p_idx >= item_start + item_count, -1);
-	ERR_FAIL_INDEX_V(p_target_idx, item_count, -1);
-	p_target_idx += item_start;
-
-	NSMenuItem *menu_item = [md->menu itemAtIndex:p_idx];
-	if ([menu_item submenu] && _is_menu_opened([menu_item submenu])) {
-		ERR_FAIL_V_MSG(-1, "Can't move open menu!");
-	}
-	if (menu_item) {
-		[md->menu removeItemAtIndex:p_idx];
-		[md->menu insertItem:menu_item atIndex:p_target_idx];
-	}
-	return p_target_idx - item_start;
-}
-
 int NativeMenuMacOS::get_item_count(const RID &p_rid) const {
 	const MenuData *md = menus.get_or_null(p_rid);
 	ERR_FAIL_NULL_V(md, 0);
diff --git a/engine/platform/macos/os_macos.h b/engine/platform/macos/os_macos.h
index 5c311d1f..3153f5a8 100644
--- a/engine/platform/macos/os_macos.h
+++ b/engine/platform/macos/os_macos.h
@@ -32,8 +32,7 @@
 
 #include "crash_handler_macos.h"
 
-#include "core/input/input_event.h"
-#include "core/templates/rb_map.h"
+#include "core/input/input.h"
 #import "drivers/coreaudio/audio_driver_coreaudio.h"
 #import "drivers/coremidi/midi_driver_coremidi.h"
 #include "drivers/unix/os_unix.h"
@@ -167,17 +166,6 @@ public:
 
 	virtual void run() = 0;
 
-	virtual String get_platform_string(PlatformString p_platform_string) const override {
-		switch (p_platform_string) {
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_OPEN:
-				return ETR("Open in Finder");
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_SHOW:
-				return ETR("Show in Finder");
-			default:
-				return OS::get_platform_string(p_platform_string);
-		}
-	}
-
 	OS_MacOS(const char *p_execpath, int p_argc, char **p_argv);
 };
 
diff --git a/engine/platform/macos/os_macos.mm b/engine/platform/macos/os_macos.mm
index 620666c3..2d8951d6 100644
--- a/engine/platform/macos/os_macos.mm
+++ b/engine/platform/macos/os_macos.mm
@@ -31,20 +31,16 @@
 #import "os_macos.h"
 
 #import "dir_access_macos.h"
+#ifdef TOOLS_ENABLED
+#import "display_server_embedded.h"
+#endif
 #import "display_server_macos.h"
 #import "godot_application.h"
 #import "godot_application_delegate.h"
 
-#ifdef TOOLS_ENABLED
-#import "display_server_macos_embedded.h"
-#endif
-
-#include "core/config/engine.h"
 #include "core/crypto/crypto_core.h"
-#include "core/input/input.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "core/version_generated.gen.h"
 #include "drivers/apple/os_log_logger.h"
@@ -284,7 +280,7 @@ void OS_MacOS::set_cmdline_platform_args(const List<String> &p_args) {
 }
 
 List<String> OS_MacOS::get_cmdline_platform_args() const {
-	return List<String>(launch_service_args);
+	return launch_service_args;
 }
 
 void OS_MacOS::load_shell_environment() const {
@@ -544,11 +540,8 @@ String OS_MacOS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
 
 Error OS_MacOS::shell_show_in_file_manager(String p_path, bool p_open_folder) {
 	bool open_folder = false;
-	if (p_open_folder) {
-		Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-		if (dir->dir_exists(p_path) && !dir->is_bundle(p_path)) {
-			open_folder = true;
-		}
+	if (DirAccess::dir_exists_absolute(p_path) && p_open_folder) {
+		open_folder = true;
 	}
 
 	if (!p_path.begins_with("file://")) {
@@ -889,7 +882,7 @@ Error OS_MacOS::create_instance(const List<String> &p_arguments, ProcessID *r_ch
 			// Project started from the editor, inject "path" argument to set instance working directory.
 			char cwd[PATH_MAX];
 			if (::getcwd(cwd, sizeof(cwd)) != nullptr) {
-				List<String> arguments(p_arguments);
+				List<String> arguments = p_arguments;
 				arguments.push_back("--path");
 				arguments.push_back(String::utf8(cwd));
 				return create_process(path, arguments, r_child_id, false);
@@ -1297,9 +1290,9 @@ void OS_MacOS_Embedded::run() {
 		ret = Main::start();
 	}
 
-	DisplayServerMacOSEmbedded *ds = Object::cast_to<DisplayServerMacOSEmbedded>(DisplayServer::get_singleton());
+	DisplayServerEmbedded *ds = Object::cast_to<DisplayServerEmbedded>(DisplayServer::get_singleton());
 	if (!ds) {
-		ERR_FAIL_MSG("DisplayServerMacOSEmbedded is not initialized.");
+		ERR_FAIL_MSG("DisplayServerEmbedded is not initialized.");
 	}
 
 	if (ds && ret == EXIT_SUCCESS && main_loop) {
@@ -1339,7 +1332,7 @@ void OS_MacOS_Embedded::run() {
 
 OS_MacOS_Embedded::OS_MacOS_Embedded(const char *p_execpath, int p_argc, char **p_argv) :
 		OS_MacOS(p_execpath, p_argc, p_argv) {
-	DisplayServerMacOSEmbedded::register_embedded_driver();
+	DisplayServerEmbedded::register_embedded_driver();
 }
 
 #endif
diff --git a/engine/platform/macos/platform_config.h b/engine/platform/macos/platform_config.h
index 3e46717d..bc8b4560 100644
--- a/engine/platform/macos/platform_config.h
+++ b/engine/platform/macos/platform_config.h
@@ -37,8 +37,8 @@
 #define PTHREAD_RENAME_SELF
 
 #define _weakify(var) __weak typeof(var) GDWeak_##var = var;
-#define _strongify(var) \
-	_Pragma("clang diagnostic push") \
+#define _strongify(var)                                      \
+	_Pragma("clang diagnostic push")                         \
 			_Pragma("clang diagnostic ignored \"-Wshadow\"") \
 					__strong typeof(var) var = GDWeak_##var; \
 	_Pragma("clang diagnostic pop")
diff --git a/engine/platform/macos/platform_gl.h b/engine/platform/macos/platform_gl.h
index cfb8b1e2..4aefbc4d 100644
--- a/engine/platform/macos/platform_gl.h
+++ b/engine/platform/macos/platform_gl.h
@@ -34,23 +34,16 @@
 #define GL_API_ENABLED // Allow using desktop GL.
 #endif
 
-#ifdef ANGLE_ENABLED
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES (ANGLE).
 #endif
 
-#ifndef GLAD_GLES2
-#define GLAD_GLES2
-#endif
-
-// IWYU pragma: begin_exports.
 #ifdef EGL_STATIC
 #define KHRONOS_STATIC 1
-#include <thirdparty/angle/include/EGL/egl.h>
-#include <thirdparty/angle/include/EGL/eglext.h>
+#include "thirdparty/angle/include/EGL/egl.h"
+#include "thirdparty/angle/include/EGL/eglext.h"
 #undef KHRONOS_STATIC
+#else
+#include "thirdparty/glad/glad/egl.h"
 #endif
-#endif
-
-#include <thirdparty/glad/glad/gl.h>
-// IWYU pragma: end_exports.
+#include "thirdparty/glad/glad/gl.h"
diff --git a/engine/platform/macos/platform_macos_builders.py b/engine/platform/macos/platform_macos_builders.py
index 70534db1..04462850 100644
--- a/engine/platform/macos/platform_macos_builders.py
+++ b/engine/platform/macos/platform_macos_builders.py
@@ -4,8 +4,7 @@ import os
 import shutil
 import subprocess
 
-from methods import get_version_info
-from platform_methods import lipo
+from platform_methods import get_build_version, lipo
 
 
 def generate_bundle(target, source, env):
@@ -45,14 +44,13 @@ def generate_bundle(target, source, env):
             shutil.copy(target_bin, app_dir + "/Contents/MacOS/Godot")
         if "mono" in env.module_version_string:
             shutil.copytree(env.Dir("#bin/GodotSharp").abspath, app_dir + "/Contents/Resources/GodotSharp")
-        version = get_version_info("", True)
+        version = get_build_version(False)
+        short_version = get_build_version(True)
         with open(env.Dir("#misc/dist/macos").abspath + "/editor_info_plist.template", "rt", encoding="utf-8") as fin:
             with open(app_dir + "/Contents/Info.plist", "wt", encoding="utf-8", newline="\n") as fout:
                 for line in fin:
-                    line = line.replace("$version", "{major}.{minor}.{patch}.{status}.{build}".format(**version))
-                    line = line.replace("$short_version", "{major}.{minor}.{patch}".format(**version))
-                    if version["build"] != "official" and version["build"] != "steam":
-                        line = line.replace("org.godotengine.godot", "org.godotengine.godot." + version["build"])
+                    line = line.replace("$version", version)
+                    line = line.replace("$short_version", short_version)
                     fout.write(line)
 
         # Sign .app bundle.
diff --git a/engine/platform/macos/tts_macos.h b/engine/platform/macos/tts_macos.h
index 132aa389..102b225c 100644
--- a/engine/platform/macos/tts_macos.h
+++ b/engine/platform/macos/tts_macos.h
@@ -34,6 +34,7 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
+#include "servers/display/display_server.h"
 
 #import <AppKit/AppKit.h>
 
@@ -43,8 +44,6 @@
 #import <AVFoundation/AVFoundation.h>
 #endif
 
-struct TTSUtterance;
-
 @interface TTS_MacOS : NSObject <AVSpeechSynthesizerDelegate> {
 	// AVSpeechSynthesizer
 	bool speaking;
@@ -56,7 +55,7 @@ struct TTSUtterance;
 	int64_t last_utterance;
 
 	id synth; // NSSpeechSynthesizer or AVSpeechSynthesizer
-	List<TTSUtterance> queue;
+	List<DisplayServer::TTSUtterance> queue;
 }
 
 - (void)pauseSpeaking;
diff --git a/engine/platform/macos/tts_macos.mm b/engine/platform/macos/tts_macos.mm
index 7a2a6bc4..9ff52d39 100644
--- a/engine/platform/macos/tts_macos.mm
+++ b/engine/platform/macos/tts_macos.mm
@@ -30,8 +30,6 @@
 
 #import "tts_macos.h"
 
-#include "servers/display/display_server.h"
-
 @implementation TTS_MacOS
 
 - (id)init {
@@ -67,13 +65,13 @@
 		pos++;
 	}
 
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, ids[utterance], pos);
 }
 
 // AVSpeechSynthesizer callback (macOS 10.14+)
 
 - (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didCancelSpeechUtterance:(AVSpeechUtterance *)utterance API_AVAILABLE(macosx(10.14)) {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[utterance]);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[utterance]);
 	ids.erase(utterance);
 	speaking = false;
 	[self update];
@@ -82,7 +80,7 @@
 // AVSpeechSynthesizer callback (macOS 10.14+)
 
 - (void)speechSynthesizer:(AVSpeechSynthesizer *)av_synth didFinishSpeechUtterance:(AVSpeechUtterance *)utterance API_AVAILABLE(macosx(10.14)) {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, ids[utterance]);
+	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, ids[utterance]);
 	ids.erase(utterance);
 	speaking = false;
 	[self update];
@@ -102,16 +100,16 @@
 			pos++;
 		}
 
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, last_utterance, pos);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, last_utterance, pos);
 	}
 }
 
 - (void)speechSynthesizer:(NSSpeechSynthesizer *)ns_synth didFinishSpeaking:(BOOL)success {
 	if (!paused && have_utterance) {
 		if (success) {
-			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, last_utterance);
+			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, last_utterance);
 		} else {
-			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, last_utterance);
+			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, last_utterance);
 		}
 		have_utterance = false;
 	}
@@ -121,7 +119,7 @@
 
 - (void)update {
 	if (!speaking && queue.size() > 0) {
-		TTSUtterance &message = queue.front()->get();
+		DisplayServer::TTSUtterance &message = queue.front()->get();
 
 		if (@available(macOS 10.14, *)) {
 			AVSpeechSynthesizer *av_synth = synth;
@@ -150,7 +148,7 @@
 			have_utterance = true;
 			[ns_synth startSpeakingString:[NSString stringWithUTF8String:message.text.utf8().get_data()]];
 		}
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, message.id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_STARTED, message.id);
 		queue.pop_front();
 
 		speaking = true;
@@ -180,8 +178,8 @@
 }
 
 - (void)stopSpeaking {
-	for (TTSUtterance &message : queue) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
+	for (DisplayServer::TTSUtterance &message : queue) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, message.id);
 	}
 	queue.clear();
 	if (@available(macOS 10.14, *)) {
@@ -190,7 +188,7 @@
 	} else {
 		NSSpeechSynthesizer *ns_synth = synth;
 		if (have_utterance) {
-			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, last_utterance);
+			DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, last_utterance);
 		}
 		[ns_synth stopSpeaking];
 	}
@@ -218,11 +216,11 @@
 	}
 
 	if (text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, utterance_id);
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, utterance_id);
 		return;
 	}
 
-	TTSUtterance message;
+	DisplayServer::TTSUtterance message;
 	message.text = text;
 	message.voice = voice;
 	message.volume = CLAMP(volume, 0, 100);
diff --git a/engine/platform/visionos/SCsub b/engine/platform/visionos/SCsub
index 8f64654d..d3da9bb0 100644
--- a/engine/platform/visionos/SCsub
+++ b/engine/platform/visionos/SCsub
@@ -21,9 +21,6 @@ visionos_lib = env_visionos.add_library("visionos", visionos_lib)
 # Enable module support
 env_visionos.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
 
-if "LIBS_EXTERNAL" in env_visionos:
-    env_visionos.Depends(visionos_lib, env_visionos["LIBS_EXTERNAL"])
-
 combine_command = env_visionos.Command(
     "#bin/libgodot" + env_visionos["LIBSUFFIX"], [visionos_lib] + env_visionos["LIBS"], combine_libs_apple_embedded
 )
diff --git a/engine/platform/visionos/detect.py b/engine/platform/visionos/detect.py
index 83aa2a1b..dc0a7de9 100644
--- a/engine/platform/visionos/detect.py
+++ b/engine/platform/visionos/detect.py
@@ -114,8 +114,6 @@ def configure(env: "SConsEnvironment"):
         env.Append(CCFLAGS=["-mtargetos=xros26.0"])
     detect_darwin_sdk_path(env["APPLE_PLATFORM"], env)
 
-    env.Append(CCFLAGS=["-ffp-contract=off"])
-
     if env["arch"] == "arm64":
         env.Append(
             CCFLAGS=(
@@ -162,10 +160,3 @@ def configure(env: "SConsEnvironment"):
     if env["opengl3"]:
         print_warning("The visionOS platform does not support the OpenGL rendering driver")
         env["opengl3"] = False
-
-    if env["sdl"]:
-        if env["builtin_sdl"]:
-            env.Append(CPPDEFINES=["SDL_ENABLED"])
-        else:
-            print_warning("`builtin_sdl` was explicitly disabled. Disabling SDL input driver support.")
-            env["sdl"] = False
diff --git a/engine/platform/visionos/display_server_visionos.h b/engine/platform/visionos/display_server_visionos.h
index adc05a33..56fbe4e5 100644
--- a/engine/platform/visionos/display_server_visionos.h
+++ b/engine/platform/visionos/display_server_visionos.h
@@ -37,23 +37,18 @@ class DisplayServerVisionOS : public DisplayServerAppleEmbedded {
 
 	_THREAD_SAFE_CLASS_
 
-	DisplayServerVisionOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerVisionOS(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerVisionOS();
 
 public:
 	static DisplayServerVisionOS *get_singleton();
 
 	static void register_visionos_driver();
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 
 	virtual String get_name() const override;
 
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-
-protected:
-	virtual bool _screen_hdr_is_supported() const override;
-	virtual float _screen_potential_edr_headroom() const override;
-	virtual float _screen_current_edr_headroom() const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 };
diff --git a/engine/platform/visionos/display_server_visionos.mm b/engine/platform/visionos/display_server_visionos.mm
index 357818ba..76c6938d 100644
--- a/engine/platform/visionos/display_server_visionos.mm
+++ b/engine/platform/visionos/display_server_visionos.mm
@@ -34,14 +34,14 @@ DisplayServerVisionOS *DisplayServerVisionOS::get_singleton() {
 	return (DisplayServerVisionOS *)DisplayServerAppleEmbedded::get_singleton();
 }
 
-DisplayServerVisionOS::DisplayServerVisionOS(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) :
+DisplayServerVisionOS::DisplayServerVisionOS(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) :
 		DisplayServerAppleEmbedded(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error) {
 }
 
 DisplayServerVisionOS::~DisplayServerVisionOS() {
 }
 
-DisplayServer *DisplayServerVisionOS::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerVisionOS::create_func(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	return memnew(DisplayServerVisionOS(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 }
 
@@ -77,19 +77,3 @@ float DisplayServerVisionOS::screen_get_scale(int p_screen) const {
 
 	return 1;
 }
-
-bool DisplayServerVisionOS::_screen_hdr_is_supported() const {
-	return true;
-}
-
-float DisplayServerVisionOS::_screen_potential_edr_headroom() const {
-	// Current Apple Vision Pro hardware supports an EDR headroom of 2.0 (two times the SDR range).
-	// See https://developer.apple.com/videos/play/wwdc2023/10089?time=603
-	return 2.0f;
-}
-
-float DisplayServerVisionOS::_screen_current_edr_headroom() const {
-	// Current Apple Vision Pro hardware  supports an EDR headroom of 2.0 (two times the SDR range).
-	// See https://developer.apple.com/videos/play/wwdc2023/10089?time=603
-	return 2.0f;
-}
diff --git a/engine/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml b/engine/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml
index 97e70f62..0297bed0 100644
--- a/engine/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml
+++ b/engine/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformVisionOS" inherits="EditorExportPlatformAppleEmbedded" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformVisionOS" inherits="EditorExportPlatformAppleEmbedded" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for visionOS.
 	</brief_description>
@@ -121,9 +121,6 @@
 		<member name="icons/icon_1024x1024_tinted" type="String" setter="" getter="">
 			Base application icon used to generate other icons, tinted version. See [url=https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/url].
 		</member>
-		<member name="modules/camera" type="bool" setter="" getter="">
-			If [code]true[/code], [CameraServer] module is added to the exported project.
-		</member>
 		<member name="privacy/active_keyboard_access_reasons" type="int" setter="" getter="">
 			The reasons your app use active keyboard API. See [url=https://developer.apple.com/documentation/bundleresources/privacy_manifest_files/describing_use_of_required_reason_api]Describing use of required reason API[/url].
 		</member>
diff --git a/engine/platform/visionos/export/export.cpp b/engine/platform/visionos/export/export.cpp
index f7f91ad8..50acb174 100644
--- a/engine/platform/visionos/export/export.cpp
+++ b/engine/platform/visionos/export/export.cpp
@@ -32,7 +32,6 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_visionos_exporter_types() {
diff --git a/engine/platform/visionos/main_visionos.mm b/engine/platform/visionos/main_visionos.mm
index d0d2cfc8..f3ff5893 100644
--- a/engine/platform/visionos/main_visionos.mm
+++ b/engine/platform/visionos/main_visionos.mm
@@ -36,7 +36,6 @@
 #include "main/main.h"
 
 #import <UIKit/UIKit.h>
-
 #include <cstdio>
 
 static OS_VisionOS *os = nullptr;
diff --git a/engine/platform/web/SCsub b/engine/platform/web/SCsub
index c5c06809..ea974aca 100644
--- a/engine/platform/web/SCsub
+++ b/engine/platform/web/SCsub
@@ -34,24 +34,30 @@ if env["target"] == "editor":
     env.add_source_files(web_files, "editor/*.cpp")
 
 sys_env = env.Clone()
-sys_env.AddJSLibraries([
-    "js/libs/library_godot_audio.js",
-    "js/libs/library_godot_display.js",
-    "js/libs/library_godot_emscripten.js",
-    "js/libs/library_godot_fetch.js",
-    "js/libs/library_godot_webmidi.js",
-    "js/libs/library_godot_os.js",
-    "js/libs/library_godot_runtime.js",
-    "js/libs/library_godot_input.js",
-    "js/libs/library_godot_webgl2.js",
-])
-sys_env.AddJSExterns([
-    "js/libs/library_godot_webgl2.externs.js",
-])
+sys_env.AddJSLibraries(
+    [
+        "js/libs/library_godot_audio.js",
+        "js/libs/library_godot_display.js",
+        "js/libs/library_godot_emscripten.js",
+        "js/libs/library_godot_fetch.js",
+        "js/libs/library_godot_webmidi.js",
+        "js/libs/library_godot_os.js",
+        "js/libs/library_godot_runtime.js",
+        "js/libs/library_godot_input.js",
+        "js/libs/library_godot_webgl2.js",
+    ]
+)
+sys_env.AddJSExterns(
+    [
+        "js/libs/library_godot_webgl2.externs.js",
+    ]
+)
 
-sys_env.AddJSPost([
-    "js/patches/patch_em_gl.js",
-])
+sys_env.AddJSPost(
+    [
+        "js/patches/patch_em_gl.js",
+    ]
+)
 
 if env["javascript_eval"]:
     sys_env.AddJSLibraries(["js/libs/library_godot_javascript_singleton.js"])
diff --git a/engine/platform/web/api/api.cpp b/engine/platform/web/api/api.cpp
index deb78471..c8d94357 100644
--- a/engine/platform/web/api/api.cpp
+++ b/engine/platform/web/api/api.cpp
@@ -33,7 +33,6 @@
 #include "javascript_bridge_singleton.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 static JavaScriptBridge *javascript_bridge_singleton;
 
diff --git a/engine/platform/web/api/javascript_bridge_singleton.h b/engine/platform/web/api/javascript_bridge_singleton.h
index a3825abf..eb07d979 100644
--- a/engine/platform/web/api/javascript_bridge_singleton.h
+++ b/engine/platform/web/api/javascript_bridge_singleton.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 
 class JavaScriptObject : public RefCounted {
diff --git a/engine/platform/web/audio_driver_web.cpp b/engine/platform/web/audio_driver_web.cpp
index 2fd50049..fbb3971a 100644
--- a/engine/platform/web/audio_driver_web.cpp
+++ b/engine/platform/web/audio_driver_web.cpp
@@ -32,9 +32,9 @@
 
 #include "godot_audio.h"
 
-#include "core/config/engine.h"
-#include "core/math/math_funcs_binary.h"
+#include "core/config/project_settings.h"
 #include "core/object/object.h"
+#include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
 
 #include <emscripten.h>
@@ -129,7 +129,7 @@ Error AudioDriverWeb::init() {
 	}
 	mix_rate = audio_context.mix_rate;
 	channel_count = audio_context.channel_count;
-	buffer_length = Math::closest_power_of_2(uint32_t(latency * mix_rate / 1000));
+	buffer_length = closest_power_of_2(uint32_t(latency * mix_rate / 1000));
 	Error err = create(buffer_length, channel_count);
 	if (err != OK) {
 		return err;
diff --git a/engine/platform/web/audio_driver_web.h b/engine/platform/web/audio_driver_web.h
index 49e107a8..82558237 100644
--- a/engine/platform/web/audio_driver_web.h
+++ b/engine/platform/web/audio_driver_web.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "godot_audio.h"
 #include "godot_js.h"
 
 #include "core/os/mutex.h"
diff --git a/engine/platform/web/detect.py b/engine/platform/web/detect.py
index 68608e17..49dc2c50 100644
--- a/engine/platform/web/detect.py
+++ b/engine/platform/web/detect.py
@@ -122,7 +122,7 @@ def configure(env: "SConsEnvironment"):
     env["EXPORTED_RUNTIME_METHODS"] = []
 
     # Validate arch.
-    supported_arches = ["wasm32", "wasm64"]
+    supported_arches = ["wasm32"]
     validate_arch(env["arch"], get_name(), supported_arches)
 
     try:
@@ -183,15 +183,12 @@ def configure(env: "SConsEnvironment"):
 
     # Sanitizers
     if env["use_ubsan"]:
-        env.Append(CPPDEFINES=["UBSAN_ENABLED"])
         env.Append(CCFLAGS=["-fsanitize=undefined"])
         env.Append(LINKFLAGS=["-fsanitize=undefined"])
     if env["use_asan"]:
-        env.Append(CPPDEFINES=["ASAN_ENABLED"])
         env.Append(CCFLAGS=["-fsanitize=address"])
         env.Append(LINKFLAGS=["-fsanitize=address"])
     if env["use_lsan"]:
-        env.Append(CPPDEFINES=["LSAN_ENABLED"])
         env.Append(CCFLAGS=["-fsanitize=leak"])
         env.Append(LINKFLAGS=["-fsanitize=leak"])
     if env["use_safe_heap"]:
@@ -299,8 +296,6 @@ def configure(env: "SConsEnvironment"):
         env.extra_suffix = ".dlink" + env.extra_suffix
 
     env.Append(LINKFLAGS=["-sWASM_BIGINT"])
-    env.Append(CCFLAGS=[f"-sMEMORY64={0 if env['arch'] == 'wasm32' else 1}"])
-    env.Append(LINKFLAGS=[f"-sMEMORY64={0 if env['arch'] == 'wasm32' else 1}"])
 
     # Run the main application in a web worker
     if env["proxy_to_pthread"]:
diff --git a/engine/platform/web/display_server_web.cpp b/engine/platform/web/display_server_web.cpp
index 496bf898..20c92de4 100644
--- a/engine/platform/web/display_server_web.cpp
+++ b/engine/platform/web/display_server_web.cpp
@@ -35,17 +35,10 @@
 #include "os_web.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/input/input_event.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
-#include "servers/display/native_menu.h"
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
-#ifdef PROXY_TO_PTHREAD_ENABLED
-#include "core/object/callable_mp.h"
-#endif
-
 #ifdef GLES3_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
@@ -89,9 +82,9 @@ void DisplayServerWeb::fullscreen_change_callback(int p_fullscreen) {
 void DisplayServerWeb::_fullscreen_change_callback(int p_fullscreen) {
 	DisplayServerWeb *display = get_singleton();
 	if (p_fullscreen) {
-		display->window_mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+		display->window_mode = WINDOW_MODE_FULLSCREEN;
 	} else {
-		display->window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+		display->window_mode = WINDOW_MODE_WINDOWED;
 	}
 }
 
@@ -145,7 +138,7 @@ void DisplayServerWeb::request_quit_callback() {
 void DisplayServerWeb::_request_quit_callback() {
 	DisplayServerWeb *ds = get_singleton();
 	if (ds && ds->window_event_callback.is_valid()) {
-		Variant event = int(DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+		Variant event = int(DisplayServer::WINDOW_EVENT_CLOSE_REQUEST);
 		ds->window_event_callback.call(event);
 	}
 }
@@ -351,41 +344,41 @@ void DisplayServerWeb::_mouse_move_callback(double p_x, double p_y, double p_rel
 }
 
 // Cursor
-const char *DisplayServerWeb::godot2dom_cursor(DisplayServerEnums::CursorShape p_shape) {
+const char *DisplayServerWeb::godot2dom_cursor(DisplayServer::CursorShape p_shape) {
 	switch (p_shape) {
-		case DisplayServerEnums::CURSOR_ARROW:
+		case DisplayServer::CURSOR_ARROW:
 			return "default";
-		case DisplayServerEnums::CURSOR_IBEAM:
+		case DisplayServer::CURSOR_IBEAM:
 			return "text";
-		case DisplayServerEnums::CURSOR_POINTING_HAND:
+		case DisplayServer::CURSOR_POINTING_HAND:
 			return "pointer";
-		case DisplayServerEnums::CURSOR_CROSS:
+		case DisplayServer::CURSOR_CROSS:
 			return "crosshair";
-		case DisplayServerEnums::CURSOR_WAIT:
+		case DisplayServer::CURSOR_WAIT:
 			return "wait";
-		case DisplayServerEnums::CURSOR_BUSY:
+		case DisplayServer::CURSOR_BUSY:
 			return "progress";
-		case DisplayServerEnums::CURSOR_DRAG:
+		case DisplayServer::CURSOR_DRAG:
 			return "grab";
-		case DisplayServerEnums::CURSOR_CAN_DROP:
+		case DisplayServer::CURSOR_CAN_DROP:
 			return "grabbing";
-		case DisplayServerEnums::CURSOR_FORBIDDEN:
+		case DisplayServer::CURSOR_FORBIDDEN:
 			return "no-drop";
-		case DisplayServerEnums::CURSOR_VSIZE:
+		case DisplayServer::CURSOR_VSIZE:
 			return "ns-resize";
-		case DisplayServerEnums::CURSOR_HSIZE:
+		case DisplayServer::CURSOR_HSIZE:
 			return "ew-resize";
-		case DisplayServerEnums::CURSOR_BDIAGSIZE:
+		case DisplayServer::CURSOR_BDIAGSIZE:
 			return "nesw-resize";
-		case DisplayServerEnums::CURSOR_FDIAGSIZE:
+		case DisplayServer::CURSOR_FDIAGSIZE:
 			return "nwse-resize";
-		case DisplayServerEnums::CURSOR_MOVE:
+		case DisplayServer::CURSOR_MOVE:
 			return "move";
-		case DisplayServerEnums::CURSOR_VSPLIT:
+		case DisplayServer::CURSOR_VSPLIT:
 			return "row-resize";
-		case DisplayServerEnums::CURSOR_HSPLIT:
+		case DisplayServer::CURSOR_HSPLIT:
 			return "col-resize";
-		case DisplayServerEnums::CURSOR_HELP:
+		case DisplayServer::CURSOR_HELP:
 			return "help";
 		default:
 			return "default";
@@ -441,7 +434,7 @@ void DisplayServerWeb::tts_speak(const String &p_text, const String &p_voice, in
 	}
 
 	if (p_text.is_empty()) {
-		tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_utterance_id);
+		tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, p_utterance_id);
 		return;
 	}
 
@@ -461,7 +454,7 @@ void DisplayServerWeb::tts_resume() {
 
 void DisplayServerWeb::tts_stop() {
 	for (const KeyValue<int64_t, CharString> &E : utterance_ids) {
-		tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, E.key);
+		tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
 	}
 	utterance_ids.clear();
 	godot_js_tts_stop();
@@ -482,7 +475,7 @@ void DisplayServerWeb::_js_utterance_callback(int p_event, int64_t p_id, int p_p
 	DisplayServerWeb *ds = (DisplayServerWeb *)DisplayServer::get_singleton();
 	if (ds->utterance_ids.has(p_id)) {
 		int pos = 0;
-		if ((DisplayServerEnums::TTSUtteranceEvent)p_event == DisplayServerEnums::TTS_UTTERANCE_BOUNDARY) {
+		if ((TTSUtteranceEvent)p_event == DisplayServer::TTS_UTTERANCE_BOUNDARY) {
 			// Convert position from UTF-8 to UTF-32.
 			const CharString &string = ds->utterance_ids[p_id];
 			for (int i = 0; i < MIN(p_pos, string.length()); i++) {
@@ -496,15 +489,15 @@ void DisplayServerWeb::_js_utterance_callback(int p_event, int64_t p_id, int p_p
 				}
 				pos++;
 			}
-		} else if ((DisplayServerEnums::TTSUtteranceEvent)p_event != DisplayServerEnums::TTS_UTTERANCE_STARTED) {
+		} else if ((TTSUtteranceEvent)p_event != DisplayServer::TTS_UTTERANCE_STARTED) {
 			ds->utterance_ids.erase(p_id);
 		}
-		ds->tts_post_utterance_event((DisplayServerEnums::TTSUtteranceEvent)p_event, p_id, pos);
+		ds->tts_post_utterance_event((TTSUtteranceEvent)p_event, p_id, pos);
 	}
 }
 
-void DisplayServerWeb::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+void DisplayServerWeb::cursor_set_shape(CursorShape p_shape) {
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 	if (cursor_shape == p_shape) {
 		return;
 	}
@@ -512,12 +505,12 @@ void DisplayServerWeb::cursor_set_shape(DisplayServerEnums::CursorShape p_shape)
 	godot_js_display_cursor_set_shape(godot2dom_cursor(cursor_shape));
 }
 
-DisplayServerEnums::CursorShape DisplayServerWeb::cursor_get_shape() const {
+DisplayServer::CursorShape DisplayServerWeb::cursor_get_shape() const {
 	return cursor_shape;
 }
 
-void DisplayServerWeb::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+void DisplayServerWeb::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 	if (p_cursor.is_valid()) {
 		Ref<Image> image = _get_cursor_image_from_resource(p_cursor, p_hotspot);
 		ERR_FAIL_COND(image.is_null());
@@ -553,31 +546,31 @@ void DisplayServerWeb::cursor_set_custom_image(const Ref<Resource> &p_cursor, Di
 
 // Mouse mode
 void DisplayServerWeb::_mouse_update_mode() {
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
 			? mouse_mode_override
 			: mouse_mode_base;
 
-	ERR_FAIL_COND_MSG(wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN, "DisplayServerEnums::MOUSE_MODE_CONFINED is not supported for the Web platform.");
+	ERR_FAIL_COND_MSG(wanted_mouse_mode == MOUSE_MODE_CONFINED || wanted_mouse_mode == MOUSE_MODE_CONFINED_HIDDEN, "MOUSE_MODE_CONFINED is not supported for the Web platform.");
 	if (wanted_mouse_mode == mouse_get_mode()) {
 		return;
 	}
 
-	if (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE) {
+	if (wanted_mouse_mode == MOUSE_MODE_VISIBLE) {
 		godot_js_display_cursor_set_visible(1);
 		godot_js_display_cursor_lock_set(0);
 
-	} else if (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_HIDDEN) {
+	} else if (wanted_mouse_mode == MOUSE_MODE_HIDDEN) {
 		godot_js_display_cursor_set_visible(0);
 		godot_js_display_cursor_lock_set(0);
 
-	} else if (wanted_mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	} else if (wanted_mouse_mode == MOUSE_MODE_CAPTURED) {
 		godot_js_display_cursor_set_visible(1);
 		godot_js_display_cursor_lock_set(1);
 	}
 }
 
-void DisplayServerWeb::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWeb::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 
 	if (mouse_mode_override_enabled) {
 		mouse_mode_base = p_mode;
@@ -593,19 +586,19 @@ void DisplayServerWeb::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWeb::mouse_get_mode() const {
+DisplayServer::MouseMode DisplayServerWeb::mouse_get_mode() const {
 	if (godot_js_display_cursor_is_hidden()) {
-		return DisplayServerEnums::MOUSE_MODE_HIDDEN;
+		return MOUSE_MODE_HIDDEN;
 	}
 
 	if (godot_js_display_cursor_is_locked()) {
-		return DisplayServerEnums::MOUSE_MODE_CAPTURED;
+		return MOUSE_MODE_CAPTURED;
 	}
-	return DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	return MOUSE_MODE_VISIBLE;
 }
 
-void DisplayServerWeb::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWeb::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 
 	if (!mouse_mode_override_enabled) {
 		mouse_mode_override = p_mode;
@@ -621,7 +614,7 @@ void DisplayServerWeb::mouse_set_mode_override(DisplayServerEnums::MouseMode p_m
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWeb::mouse_get_mode_override() const {
+DisplayServer::MouseMode DisplayServerWeb::mouse_get_mode_override() const {
 	return mouse_mode_override;
 }
 
@@ -821,7 +814,7 @@ void DisplayServerWeb::_vk_input_text_callback(const String &p_text, int p_curso
 	}
 }
 
-void DisplayServerWeb::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServerWeb::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
 	godot_js_display_vk_show(p_existing_text.utf8().get_data(), p_type, p_cursor_start, p_cursor_end);
 }
 
@@ -954,12 +947,12 @@ void DisplayServerWeb::_ime_callback(int p_type, const String &p_text) {
 	Input::get_singleton()->flush_buffered_events();
 }
 
-void DisplayServerWeb::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_ime_active(const bool p_active, WindowID p_window) {
 	ime_active = p_active;
 	godot_js_set_ime_active(p_active);
 }
 
-void DisplayServerWeb::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	godot_js_set_ime_position(p_pos.x, p_pos.y);
 }
 
@@ -1054,10 +1047,10 @@ void DisplayServerWeb::_send_window_event_callback(int p_notification) {
 	if (!ds) {
 		return;
 	}
-	if (p_notification == DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER || p_notification == DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT) {
-		ds->cursor_inside_canvas = p_notification == DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER;
+	if (p_notification == DisplayServer::WINDOW_EVENT_MOUSE_ENTER || p_notification == DisplayServer::WINDOW_EVENT_MOUSE_EXIT) {
+		ds->cursor_inside_canvas = p_notification == DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
 	}
-	if (godot_js_is_ime_focused() && (p_notification == DisplayServerEnums::WINDOW_EVENT_FOCUS_IN || p_notification == DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT)) {
+	if (godot_js_is_ime_focused() && (p_notification == DisplayServer::WINDOW_EVENT_FOCUS_IN || p_notification == DisplayServer::WINDOW_EVENT_FOCUS_OUT)) {
 		return;
 	}
 	if (ds->window_event_callback.is_valid()) {
@@ -1110,11 +1103,11 @@ void DisplayServerWeb::_dispatch_input_event(const Ref<InputEvent> &p_event) {
 	}
 }
 
-DisplayServer *DisplayServerWeb::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_window_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerWeb::create_func(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	return memnew(DisplayServerWeb(p_rendering_driver, p_window_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 }
 
-DisplayServerWeb::DisplayServerWeb(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_window_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerWeb::DisplayServerWeb(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	r_error = OK; // Always succeeds for now.
 
 	native_menu = memnew(NativeMenu); // Dummy native menu.
@@ -1123,7 +1116,7 @@ DisplayServerWeb::DisplayServerWeb(const String &p_rendering_driver, DisplayServ
 	godot_js_config_canvas_id_get(canvas_id, 256);
 
 	// Handle contextmenu, webglcontextlost
-	godot_js_display_setup_canvas(p_resolution.x, p_resolution.y, (p_window_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_window_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN), OS::get_singleton()->is_hidpi_allowed() ? 1 : 0);
+	godot_js_display_setup_canvas(p_resolution.x, p_resolution.y, (p_window_mode == WINDOW_MODE_FULLSCREEN || p_window_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN), OS::get_singleton()->is_hidpi_allowed() ? 1 : 0);
 
 	// Check if it's windows.
 	swap_cancel_ok = godot_js_display_is_swap_ok_cancel() == 1;
@@ -1176,10 +1169,10 @@ DisplayServerWeb::DisplayServerWeb(const String &p_rendering_driver, DisplayServ
 	godot_js_display_fullscreen_cb(&DisplayServerWeb::fullscreen_change_callback);
 	godot_js_display_window_blur_cb(&DisplayServerWeb::window_blur_callback);
 	godot_js_display_notification_cb(&DisplayServerWeb::send_window_event_callback,
-			DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER,
-			DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT,
-			DisplayServerEnums::WINDOW_EVENT_FOCUS_IN,
-			DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+			WINDOW_EVENT_MOUSE_ENTER,
+			WINDOW_EVENT_MOUSE_EXIT,
+			WINDOW_EVENT_FOCUS_IN,
+			WINDOW_EVENT_FOCUS_OUT);
 	godot_js_display_vk_cb(&DisplayServerWeb::vk_input_text_callback);
 
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_event);
@@ -1198,37 +1191,37 @@ DisplayServerWeb::~DisplayServerWeb() {
 #endif
 }
 
-bool DisplayServerWeb::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerWeb::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		//case DisplayServerEnums::FEATURE_HIDPI:
-		case DisplayServerEnums::FEATURE_ICON:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_TOUCHSCREEN:
+		//case FEATURE_HIDPI:
+		case FEATURE_ICON:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+		case FEATURE_MOUSE:
+		case FEATURE_TOUCHSCREEN:
 			return true;
-		//case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
-		//case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		//case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		//case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		//case DisplayServerEnums::FEATURE_ORIENTATION:
-		case DisplayServerEnums::FEATURE_IME:
+		//case FEATURE_MOUSE_WARP:
+		//case FEATURE_NATIVE_DIALOG:
+		//case FEATURE_NATIVE_DIALOG_INPUT:
+		//case FEATURE_NATIVE_DIALOG_FILE:
+		//case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		//case FEATURE_NATIVE_DIALOG_FILE_MIME:
+		//case FEATURE_NATIVE_ICON:
+		//case FEATURE_WINDOW_TRANSPARENCY:
+		//case FEATURE_KEEP_SCREEN_ON:
+		//case FEATURE_ORIENTATION:
+		case FEATURE_IME:
 			// IME does not work with experimental VK support.
 			return godot_js_display_vk_available() == 0;
-		case DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD:
+		case FEATURE_VIRTUAL_KEYBOARD:
 			return godot_js_display_vk_available() != 0;
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
+		case FEATURE_TEXT_TO_SPEECH:
 			return godot_js_display_tts_available() != 0;
 		default:
 			return false;
@@ -1303,158 +1296,158 @@ float DisplayServerWeb::screen_get_refresh_rate(int p_screen) const {
 	return SCREEN_REFRESH_RATE_FALLBACK; // Web doesn't have much of a need for the screen refresh rate, and there's no native way to do so.
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerWeb::get_window_list() const {
-	Vector<DisplayServerEnums::WindowID> ret;
-	ret.push_back(DisplayServerEnums::MAIN_WINDOW_ID);
+Vector<DisplayServer::WindowID> DisplayServerWeb::get_window_list() const {
+	Vector<WindowID> ret;
+	ret.push_back(MAIN_WINDOW_ID);
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerWeb::get_window_at_screen_position(const Point2i &p_position) const {
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+DisplayServerWeb::WindowID DisplayServerWeb::get_window_at_screen_position(const Point2i &p_position) const {
+	return MAIN_WINDOW_ID;
 }
 
-void DisplayServerWeb::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	window_attached_instance_id = p_instance;
 }
 
-ObjectID DisplayServerWeb::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerWeb::window_get_attached_instance_id(WindowID p_window) const {
 	return window_attached_instance_id;
 }
 
-void DisplayServerWeb::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	rect_changed_callback = p_callable;
 }
 
-void DisplayServerWeb::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	window_event_callback = p_callable;
 }
 
-void DisplayServerWeb::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	input_event_callback = p_callable;
 }
 
-void DisplayServerWeb::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	input_text_callback = p_callable;
 }
 
-void DisplayServerWeb::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	drop_files_callback = p_callable;
 }
 
-void DisplayServerWeb::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_title(const String &p_title, WindowID p_window) {
 	godot_js_display_window_title_set(p_title.utf8().get_data());
 }
 
-int DisplayServerWeb::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
-	ERR_FAIL_COND_V(p_window != DisplayServerEnums::MAIN_WINDOW_ID, DisplayServerEnums::INVALID_SCREEN);
+int DisplayServerWeb::window_get_current_screen(WindowID p_window) const {
+	ERR_FAIL_COND_V(p_window != MAIN_WINDOW_ID, INVALID_SCREEN);
 	return 0;
 }
 
-void DisplayServerWeb::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_current_screen(int p_screen, WindowID p_window) {
 	// Not implemented.
 }
 
-Point2i DisplayServerWeb::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerWeb::window_get_position(WindowID p_window) const {
 	return Point2i();
 }
 
-Point2i DisplayServerWeb::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerWeb::window_get_position_with_decorations(WindowID p_window) const {
 	return Point2i();
 }
 
-void DisplayServerWeb::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_position(const Point2i &p_position, WindowID p_window) {
 	// Not supported.
 }
 
-void DisplayServerWeb::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerWeb::window_set_transient(WindowID p_window, WindowID p_parent) {
 	// Not supported.
 }
 
-void DisplayServerWeb::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	// Not supported.
 }
 
-Size2i DisplayServerWeb::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWeb::window_get_max_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerWeb::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	// Not supported.
 }
 
-Size2i DisplayServerWeb::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWeb::window_get_min_size(WindowID p_window) const {
 	return Size2i();
 }
 
-void DisplayServerWeb::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_size(const Size2i p_size, WindowID p_window) {
 	godot_js_display_desired_size_set(p_size.x, p_size.y);
 }
 
-Size2i DisplayServerWeb::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWeb::window_get_size(WindowID p_window) const {
 	int size[2];
 	godot_js_display_window_size_get(size, size + 1);
 	return Size2i(size[0], size[1]);
 }
 
-Size2i DisplayServerWeb::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWeb::window_get_size_with_decorations(WindowID p_window) const {
 	return window_get_size(p_window);
 }
 
-void DisplayServerWeb::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	if (window_mode == p_mode) {
 		return;
 	}
 
 	switch (p_mode) {
-		case DisplayServerEnums::WINDOW_MODE_WINDOWED: {
-			if (window_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN) {
+		case WINDOW_MODE_WINDOWED: {
+			if (window_mode == WINDOW_MODE_FULLSCREEN) {
 				godot_js_display_fullscreen_exit();
 			}
-			window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
+			window_mode = WINDOW_MODE_WINDOWED;
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
-		case DisplayServerEnums::WINDOW_MODE_FULLSCREEN: {
+		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
+		case WINDOW_MODE_FULLSCREEN: {
 			int result = godot_js_display_fullscreen_request();
 			ERR_FAIL_COND_MSG(result, "The request was denied. Remember that enabling fullscreen is only possible from an input callback for the Web platform.");
 		} break;
-		case DisplayServerEnums::WINDOW_MODE_MAXIMIZED:
-		case DisplayServerEnums::WINDOW_MODE_MINIMIZED:
-			// DisplayServerEnums::WindowMode MAXIMIZED and MINIMIZED are not supported in Web platform.
+		case WINDOW_MODE_MAXIMIZED:
+		case WINDOW_MODE_MINIMIZED:
+			// WindowMode MAXIMIZED and MINIMIZED are not supported in Web platform.
 			break;
 		default:
 			break;
 	}
 }
 
-DisplayServerEnums::WindowMode DisplayServerWeb::window_get_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServerWeb::WindowMode DisplayServerWeb::window_get_mode(WindowID p_window) const {
 	return window_mode;
 }
 
-bool DisplayServerWeb::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWeb::window_is_maximize_allowed(WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerWeb::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	// Not supported.
 }
 
-bool DisplayServerWeb::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWeb::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
 	return false;
 }
 
-void DisplayServerWeb::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_request_attention(WindowID p_window) {
 	// Not supported.
 }
 
-void DisplayServerWeb::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWeb::window_move_to_foreground(WindowID p_window) {
 	// Not supported.
 }
 
-bool DisplayServerWeb::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWeb::window_is_focused(WindowID p_window) const {
 	return true;
 }
 
-bool DisplayServerWeb::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWeb::window_can_draw(WindowID p_window) const {
 	return true;
 }
 
@@ -1462,8 +1455,8 @@ bool DisplayServerWeb::can_any_window_draw() const {
 	return true;
 }
 
-DisplayServerEnums::VSyncMode DisplayServerWeb::window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const {
-	return DisplayServerEnums::VSYNC_ENABLED;
+DisplayServer::VSyncMode DisplayServerWeb::window_get_vsync_mode(WindowID p_vsync_mode) const {
+	return DisplayServer::VSYNC_ENABLED;
 }
 
 void DisplayServerWeb::process_events() {
diff --git a/engine/platform/web/display_server_web.h b/engine/platform/web/display_server_web.h
index 9b3901c3..d78bd980 100644
--- a/engine/platform/web/display_server_web.h
+++ b/engine/platform/web/display_server_web.h
@@ -30,19 +30,13 @@
 
 #pragma once
 
-#include "godot_js.h"
-
-#include "core/input/input_enums.h"
-#include "core/os/keyboard.h"
 #include "servers/display/display_server.h"
 
+#include "godot_js.h"
+
 #include <emscripten.h>
 #include <emscripten/html5.h>
 
-class InputEvent;
-class InputEventWithModifiers;
-class NativeMenu;
-
 class DisplayServerWeb : public DisplayServer {
 	GDSOFTCLASS(DisplayServerWeb, DisplayServer);
 
@@ -66,8 +60,8 @@ private:
 
 	HashMap<int64_t, CharString> utterance_ids;
 
-	DisplayServerEnums::WindowMode window_mode = DisplayServerEnums::WINDOW_MODE_WINDOWED;
-	ObjectID window_attached_instance_id;
+	WindowMode window_mode = WINDOW_MODE_WINDOWED;
+	ObjectID window_attached_instance_id = {};
 
 	Callable rect_changed_callback;
 	Callable window_event_callback;
@@ -82,7 +76,7 @@ private:
 
 	char canvas_id[256] = { 0 };
 	bool cursor_inside_canvas = true;
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CURSOR_ARROW;
+	CursorShape cursor_shape = CURSOR_ARROW;
 	Point2i last_click_pos = Point2(-100, -100); // TODO check this again.
 	uint64_t last_click_ms = 0;
 	MouseButton last_click_button_index = MouseButton::NONE;
@@ -112,14 +106,14 @@ private:
 
 	int gamepad_count = 0;
 
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
 	bool mouse_mode_override_enabled = false;
 	void _mouse_update_mode();
 
 	// utilities
 	static void dom2godot_mod(Ref<InputEventWithModifiers> ev, int p_mod, Key p_keycode);
-	static const char *godot2dom_cursor(DisplayServerEnums::CursorShape p_shape);
+	static const char *godot2dom_cursor(DisplayServer::CursorShape p_shape);
 
 	// events
 	WASM_EXPORT static void fullscreen_change_callback(int p_fullscreen);
@@ -159,7 +153,7 @@ private:
 	void process_keys();
 
 	static Vector<String> get_rendering_drivers_func();
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_window_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 
 	static void _dispatch_input_event(const Ref<InputEvent> &p_event);
 
@@ -174,7 +168,7 @@ public:
 	bool check_size_force_redraw();
 
 	// from DisplayServer
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
 	// tts
@@ -188,23 +182,23 @@ public:
 	virtual void tts_stop() override;
 
 	// cursor
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
 
 	// mouse
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
 	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
 	virtual bool mouse_is_mode_override_enabled() const override;
 
 	virtual Point2i mouse_get_position() const override;
 
 	// ime
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
@@ -219,71 +213,71 @@ public:
 	// screen
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual void screen_set_keep_on(bool p_enable) override {}
 
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), DisplayServerEnums::VirtualKeyboardType p_type = DisplayServerEnums::KEYBOARD_TYPE_DEFAULT, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override;
 	virtual void virtual_keyboard_hide() override;
 
 	// windows
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
+	virtual void window_set_vsync_mode(VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override {}
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
 	// events
 	virtual void process_events() override;
@@ -296,6 +290,6 @@ public:
 	virtual void swap_buffers() override;
 
 	static void register_web_driver();
-	DisplayServerWeb(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_window_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerWeb(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerWeb();
 };
diff --git a/engine/platform/web/doc_classes/EditorExportPlatformWeb.xml b/engine/platform/web/doc_classes/EditorExportPlatformWeb.xml
index d5a933a8..0d8c791e 100644
--- a/engine/platform/web/doc_classes/EditorExportPlatformWeb.xml
+++ b/engine/platform/web/doc_classes/EditorExportPlatformWeb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformWeb" inherits="EditorExportPlatform" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformWeb" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for the Web.
 	</brief_description>
diff --git a/engine/platform/web/dom_keys.inc b/engine/platform/web/dom_keys.inc
index c4c3af4b..b20a3a46 100644
--- a/engine/platform/web/dom_keys.inc
+++ b/engine/platform/web/dom_keys.inc
@@ -32,9 +32,9 @@
 
 // See https://w3c.github.io/uievents-code/#code-value-tables
 Key dom_code2godot_scancode(EM_UTF8 const p_code[32], EM_UTF8 const p_key[32], bool p_physical) {
-#define DOM2GODOT(p_str, p_godot_code) \
+#define DOM2GODOT(p_str, p_godot_code)                                                                \
 	if (memcmp((const void *)p_str, (void *)(p_physical ? p_code : p_key), strlen(p_str) + 1) == 0) { \
-		return Key::p_godot_code; \
+		return Key::p_godot_code;                                                                     \
 	}
 
 	// Numpad section.
@@ -225,9 +225,9 @@ Key dom_code2godot_scancode(EM_UTF8 const p_code[32], EM_UTF8 const p_key[32], b
 }
 
 KeyLocation dom_code2godot_key_location(EM_UTF8 const p_code[32]) {
-#define DOM2GODOT(m_str, m_godot_code) \
+#define DOM2GODOT(m_str, m_godot_code)                                         \
 	if (memcmp((const void *)m_str, (void *)p_code, strlen(m_str) + 1) == 0) { \
-		return KeyLocation::m_godot_code; \
+		return KeyLocation::m_godot_code;                                      \
 	}
 
 	DOM2GODOT("AltLeft", LEFT);
diff --git a/engine/platform/web/editor/web_tools_editor_plugin.cpp b/engine/platform/web/editor/web_tools_editor_plugin.cpp
index 32de94fc..1154ef2d 100644
--- a/engine/platform/web/editor/web_tools_editor_plugin.cpp
+++ b/engine/platform/web/editor/web_tools_editor_plugin.cpp
@@ -31,9 +31,10 @@
 #include "web_tools_editor_plugin.h"
 
 #include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/callable_mp.h"
+#include "core/os/time.h"
 #include "editor/editor_node.h"
 #include "editor/export/project_zip_packer.h"
 
diff --git a/engine/platform/web/editor/web_tools_editor_plugin.h b/engine/platform/web/editor/web_tools_editor_plugin.h
index b095ca43..b71de0b9 100644
--- a/engine/platform/web/editor/web_tools_editor_plugin.h
+++ b/engine/platform/web/editor/web_tools_editor_plugin.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/io/zip_io.h"
 #include "editor/plugins/editor_plugin.h"
 
 class WebToolsEditorPlugin : public EditorPlugin {
diff --git a/engine/platform/web/emscripten_helpers.py b/engine/platform/web/emscripten_helpers.py
index 37029054..6f3c0517 100644
--- a/engine/platform/web/emscripten_helpers.py
+++ b/engine/platform/web/emscripten_helpers.py
@@ -62,8 +62,6 @@ def create_template_zip(env, js, wasm, side):
             "godot.editor.audio.position.worklet.js",
             "logo.svg",
             "favicon.png",
-            "inter-regular.woff2",
-            "inter-bold.woff2",
         ]
         opt_cache = ["godot.editor.wasm"]
         subst_dict = {
@@ -95,10 +93,6 @@ def create_template_zip(env, js, wasm, side):
         out_files.append(zip_dir.File("manifest.json"))
         in_files.append("#misc/dist/html/offline.html")
         out_files.append(zip_dir.File("offline.html"))
-        in_files.append("#thirdparty/fonts/Inter_Regular.woff2")
-        out_files.append(zip_dir.File("inter-regular.woff2"))
-        in_files.append("#thirdparty/fonts/Inter_Bold.woff2")
-        out_files.append(zip_dir.File("inter-bold.woff2"))
     else:
         # HTML
         in_files.append("#misc/dist/html/full-size.html")
diff --git a/engine/platform/web/export/editor_http_server.cpp b/engine/platform/web/export/editor_http_server.cpp
index 72b188a5..26b9a626 100644
--- a/engine/platform/web/export/editor_http_server.cpp
+++ b/engine/platform/web/export/editor_http_server.cpp
@@ -30,10 +30,6 @@
 
 #include "editor_http_server.h"
 
-#include "core/io/file_access.h"
-#include "core/os/os.h"
-#include "editor/file_system/editor_paths.h"
-
 void EditorHTTPServer::_server_thread_poll(void *data) {
 	EditorHTTPServer *web_server = static_cast<EditorHTTPServer *>(data);
 	while (!web_server->server_quit.is_set()) {
diff --git a/engine/platform/web/export/editor_http_server.h b/engine/platform/web/export/editor_http_server.h
index 45ea0a59..b454c6d1 100644
--- a/engine/platform/web/export/editor_http_server.h
+++ b/engine/platform/web/export/editor_http_server.h
@@ -30,8 +30,11 @@
 
 #pragma once
 
+#include "core/io/image_loader.h"
 #include "core/io/stream_peer_tls.h"
 #include "core/io/tcp_server.h"
+#include "core/io/zip_io.h"
+#include "editor/file_system/editor_paths.h"
 
 class EditorHTTPServer : public RefCounted {
 	GDSOFTCLASS(EditorHTTPServer, RefCounted);
diff --git a/engine/platform/web/export/export.cpp b/engine/platform/web/export/export.cpp
index fa17b6c7..f07d4d48 100644
--- a/engine/platform/web/export/export.cpp
+++ b/engine/platform/web/export/export.cpp
@@ -32,7 +32,6 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/engine/platform/web/export/export_plugin.cpp b/engine/platform/web/export/export_plugin.cpp
index f495a821..effd549b 100644
--- a/engine/platform/web/export/export_plugin.cpp
+++ b/engine/platform/web/export/export_plugin.cpp
@@ -35,17 +35,14 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
-#include "editor/file_system/editor_paths.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/image_texture.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
+#include "modules/modules_enabled.gen.h" // For mono.
 #include "modules/svg/image_loader_svg.h"
 
 Error EditorExportPlatformWeb::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) {
@@ -178,8 +175,8 @@ void EditorExportPlatformWeb::_fix_html(Vector<uint8_t> &p_html, const Ref<Edito
 
 	Vector<String> godot_splash_classes;
 	godot_splash_classes.push_back("show-image--" + String(get_project_setting(p_preset, "application/boot_splash/show_image")));
-	RSE::SplashStretchMode boot_splash_stretch_mode = get_project_setting(p_preset, "application/boot_splash/stretch_mode");
-	godot_splash_classes.push_back("fullsize--" + String(((boot_splash_stretch_mode != RSE::SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED) ? "true" : "false")));
+	RenderingServer::SplashStretchMode boot_splash_stretch_mode = get_project_setting(p_preset, "application/boot_splash/stretch_mode");
+	godot_splash_classes.push_back("fullsize--" + String(((boot_splash_stretch_mode != RenderingServer::SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED) ? "true" : "false")));
 	godot_splash_classes.push_back("use-filter--" + String(get_project_setting(p_preset, "application/boot_splash/use_filter")));
 	replaces["$GODOT_SPLASH_CLASSES"] = String(" ").join(godot_splash_classes);
 	replaces["$GODOT_SPLASH"] = p_name + ".png";
@@ -617,7 +614,15 @@ Error EditorExportPlatformWeb::export_project(const Ref<EditorExportPreset> &p_p
 }
 
 bool EditorExportPlatformWeb::poll_export() {
-	Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(this);
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == this) {
+			preset = ep;
+			break;
+		}
+	}
 
 	RemoteDebugState prev_remote_debug_state = remote_debug_state;
 	remote_debug_state = REMOTE_DEBUG_STATE_UNAVAILABLE;
diff --git a/engine/platform/web/export/export_plugin.h b/engine/platform/web/export/export_plugin.h
index 5de8ff06..2f8efcd2 100644
--- a/engine/platform/web/export/export_plugin.h
+++ b/engine/platform/web/export/export_plugin.h
@@ -32,6 +32,11 @@
 
 #include "editor_http_server.h"
 
+#include "core/config/project_settings.h"
+#include "core/io/image_loader.h"
+#include "core/io/stream_peer_tls.h"
+#include "core/io/tcp_server.h"
+#include "core/io/zip_io.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export_platform.h"
diff --git a/engine/platform/web/http_client_web.cpp b/engine/platform/web/http_client_web.cpp
index b3c5f2fc..c481ef55 100644
--- a/engine/platform/web/http_client_web.cpp
+++ b/engine/platform/web/http_client_web.cpp
@@ -30,12 +30,6 @@
 
 #include "http_client_web.h"
 
-#include "core/object/class_db.h"
-
-#ifdef DEBUG_ENABLED
-#include "core/config/engine.h"
-#endif
-
 void HTTPClientWeb::_parse_headers(int p_len, const char **p_headers, void *p_ref) {
 	HTTPClientWeb *client = static_cast<HTTPClientWeb *>(p_ref);
 	for (int i = 0; i < p_len; i++) {
diff --git a/engine/platform/web/javascript_bridge_singleton.cpp b/engine/platform/web/javascript_bridge_singleton.cpp
index d3a62038..d41fd64a 100644
--- a/engine/platform/web/javascript_bridge_singleton.cpp
+++ b/engine/platform/web/javascript_bridge_singleton.cpp
@@ -34,10 +34,6 @@
 
 #include <emscripten.h>
 
-#ifdef PROXY_TO_PTHREAD_ENABLED
-#include "core/object/callable_mp.h"
-#endif
-
 extern "C" {
 extern void godot_js_os_download_buffer(const uint8_t *p_buf, int p_buf_size, const char *p_name, const char *p_mime);
 }
diff --git a/engine/platform/web/js/libs/library_godot_display.js b/engine/platform/web/js/libs/library_godot_display.js
index 81172591..747db850 100644
--- a/engine/platform/web/js/libs/library_godot_display.js
+++ b/engine/platform/web/js/libs/library_godot_display.js
@@ -95,34 +95,34 @@ const GodotDisplayVK = {
 
 			let elem = GodotDisplayVK.textinput;
 			switch (type) {
-			case 0: // DisplayServerEnums::KEYBOARD_TYPE_DEFAULT
+			case 0: // KEYBOARD_TYPE_DEFAULT
 				elem.type = 'text';
 				elem.inputmode = '';
 				break;
-			case 1: // DisplayServerEnums::KEYBOARD_TYPE_MULTILINE
+			case 1: // KEYBOARD_TYPE_MULTILINE
 				elem = GodotDisplayVK.textarea;
 				break;
-			case 2: // DisplayServerEnums::KEYBOARD_TYPE_NUMBER
+			case 2: // KEYBOARD_TYPE_NUMBER
 				elem.type = 'text';
 				elem.inputmode = 'numeric';
 				break;
-			case 3: // DisplayServerEnums::KEYBOARD_TYPE_NUMBER_DECIMAL
+			case 3: // KEYBOARD_TYPE_NUMBER_DECIMAL
 				elem.type = 'text';
 				elem.inputmode = 'decimal';
 				break;
-			case 4: // DisplayServerEnums::KEYBOARD_TYPE_PHONE
+			case 4: // KEYBOARD_TYPE_PHONE
 				elem.type = 'tel';
 				elem.inputmode = '';
 				break;
-			case 5: // DisplayServerEnums::KEYBOARD_TYPE_EMAIL_ADDRESS
+			case 5: // KEYBOARD_TYPE_EMAIL_ADDRESS
 				elem.type = 'email';
 				elem.inputmode = '';
 				break;
-			case 6: // DisplayServerEnums::KEYBOARD_TYPE_PASSWORD
+			case 6: // KEYBOARD_TYPE_PASSWORD
 				elem.type = 'password';
 				elem.inputmode = '';
 				break;
-			case 7: // DisplayServerEnums::KEYBOARD_TYPE_URL
+			case 7: // KEYBOARD_TYPE_URL
 				elem.type = 'url';
 				elem.inputmode = '';
 				break;
@@ -403,19 +403,19 @@ const GodotDisplay = {
 		const func = GodotRuntime.get_func(p_callback);
 
 		function listener_end(evt) {
-			evt.currentTarget.cb(1 /* DisplayServerEnums::TTS_UTTERANCE_ENDED */, evt.currentTarget.id, 0);
+			evt.currentTarget.cb(1 /* TTS_UTTERANCE_ENDED */, evt.currentTarget.id, 0);
 		}
 
 		function listener_start(evt) {
-			evt.currentTarget.cb(0 /* DisplayServerEnums::TTS_UTTERANCE_STARTED */, evt.currentTarget.id, 0);
+			evt.currentTarget.cb(0 /* TTS_UTTERANCE_STARTED */, evt.currentTarget.id, 0);
 		}
 
 		function listener_error(evt) {
-			evt.currentTarget.cb(2 /* DisplayServerEnums::TTS_UTTERANCE_CANCELED */, evt.currentTarget.id, 0);
+			evt.currentTarget.cb(2 /* TTS_UTTERANCE_CANCELED */, evt.currentTarget.id, 0);
 		}
 
 		function listener_bound(evt) {
-			evt.currentTarget.cb(3 /* DisplayServerEnums::TTS_UTTERANCE_BOUNDARY */, evt.currentTarget.id, evt.charIndex);
+			evt.currentTarget.cb(3 /* TTS_UTTERANCE_BOUNDARY */, evt.currentTarget.id, evt.charIndex);
 		}
 
 		const utterance = new SpeechSynthesisUtterance(GodotRuntime.parseString(p_text));
diff --git a/engine/platform/web/net_socket_web.h b/engine/platform/web/net_socket_web.h
index dfc0c342..f993b6b2 100644
--- a/engine/platform/web/net_socket_web.h
+++ b/engine/platform/web/net_socket_web.h
@@ -38,7 +38,7 @@ class NetSocketWeb : public NetSocket {
 	GDSOFTCLASS(NetSocketWeb, NetSocket);
 
 protected:
-	static Ref<NetSocket> _create_func() {
+	static NetSocket *_create_func() {
 		return memnew(NetSocketWeb);
 	}
 
diff --git a/engine/platform/web/os_web.cpp b/engine/platform/web/os_web.cpp
index b3e8784a..9666bd88 100644
--- a/engine/platform/web/os_web.cpp
+++ b/engine/platform/web/os_web.cpp
@@ -36,16 +36,20 @@
 #include "ip_web.h"
 #include "net_socket_web.h"
 
+#include "core/config/project_settings.h"
+#include "core/debugger/engine_debugger.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
 #include "main/main.h"
 
+#include "modules/modules_enabled.gen.h" // For websocket.
+
 #include <dlfcn.h>
 #include <emscripten.h>
+#include <cstdlib>
 
 void OS_Web::alert(const String &p_alert, const String &p_title) {
 	godot_js_display_alert(p_alert.utf8().get_data());
diff --git a/engine/platform/web/os_web.h b/engine/platform/web/os_web.h
index 2862b259..43bcfa6c 100644
--- a/engine/platform/web/os_web.h
+++ b/engine/platform/web/os_web.h
@@ -31,11 +31,13 @@
 #pragma once
 
 #include "audio_driver_web.h"
-#include "godot_js.h"
 #include "webmidi_driver.h"
 
-#include "core/input/input_event.h"
+#include "godot_js.h"
+
+#include "core/input/input.h"
 #include "drivers/unix/os_unix.h"
+#include "servers/audio/audio_server.h"
 
 #include <emscripten/html5.h>
 
diff --git a/engine/platform/web/platform_gl.h b/engine/platform/web/platform_gl.h
index ebbcd921..20ac8c55 100644
--- a/engine/platform/web/platform_gl.h
+++ b/engine/platform/web/platform_gl.h
@@ -38,4 +38,4 @@
 #define glGetProcAddress(n) static_assert(false, "Usage of glGetProcessAddress() on the web is a bug.")
 #define eglGetProcAddress(n) static_assert(false, "Usage of eglGetProcessAddress() on the web is a bug.")
 
-#include "platform/web/godot_webgl2.h" // IWYU pragma: export.
+#include "platform/web/godot_webgl2.h"
diff --git a/engine/platform/web/web_main.cpp b/engine/platform/web/web_main.cpp
index ee76b893..25801dcb 100644
--- a/engine/platform/web/web_main.cpp
+++ b/engine/platform/web/web_main.cpp
@@ -33,21 +33,18 @@
 #include "os_web.h"
 
 #include "core/config/engine.h"
+#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
-
-#ifdef TOOLS_ENABLED
-#include "core/io/file_access.h"
-#include "editor/web_tools_editor_plugin.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h" // SceneTree only forward declares it.
+
+#ifdef TOOLS_ENABLED
+#include "editor/web_tools_editor_plugin.h"
 #endif
 
 #include <emscripten/emscripten.h>
-
 #include <cstdlib>
 
 static OS_Web *os = nullptr;
diff --git a/engine/platform/web/webmidi_driver.cpp b/engine/platform/web/webmidi_driver.cpp
index 8be5a258..51c58344 100644
--- a/engine/platform/web/webmidi_driver.cpp
+++ b/engine/platform/web/webmidi_driver.cpp
@@ -30,10 +30,8 @@
 
 #include "webmidi_driver.h"
 
-#include "godot_midi.h"
-
 #ifdef PROXY_TO_PTHREAD_ENABLED
-#include "core/object/callable_mp.h"
+#include "core/object/callable_method_pointer.h"
 #endif
 
 MIDIDriverWebMidi *MIDIDriverWebMidi::get_singleton() {
diff --git a/engine/platform/web/webmidi_driver.h b/engine/platform/web/webmidi_driver.h
index 56af88a3..57944bf3 100644
--- a/engine/platform/web/webmidi_driver.h
+++ b/engine/platform/web/webmidi_driver.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
-#include "godot_js.h"
-
 #include "core/os/midi_driver.h"
 
+#include "godot_js.h"
+#include "godot_midi.h"
+
 class MIDIDriverWebMidi : public MIDIDriver {
 private:
 	static const int MAX_EVENT_BUFFER_LENGTH = 2;
diff --git a/engine/platform/windows/SCsub b/engine/platform/windows/SCsub
index cd9e9d52..aefb0481 100644
--- a/engine/platform/windows/SCsub
+++ b/engine/platform/windows/SCsub
@@ -16,18 +16,17 @@ common_win = [
     "os_windows.cpp",
     "display_server_windows.cpp",
     "key_mapping_windows.cpp",
+    "tts_windows.cpp",
     "windows_terminal_logger.cpp",
     "windows_utils.cpp",
     "native_menu_windows.cpp",
     "gl_manager_windows_native.cpp",
+    "gl_manager_windows_angle.cpp",
     "wgl_detect_version.cpp",
     "rendering_context_driver_vulkan_windows.cpp",
     "drop_target_windows.cpp",
 ]
 
-if env["angle"]:
-    common_win += ["gl_manager_windows_angle.cpp"]
-
 if env["library_type"] == "executable":
     common_win += ["godot_windows.cpp"]
 else:
@@ -80,30 +79,6 @@ res_obj = env.RES(res_target, res_file)
 env.Depends(res_obj, "#core/version_generated.gen.h")
 
 env.add_source_files(sources, common_win)
-
-env_winrt = env.Clone()
-if not env_winrt.msvc:
-    if "-std=gnu++17" in env_winrt["CXXFLAGS"]:
-        env_winrt["CXXFLAGS"].remove("-std=gnu++17")
-    env_winrt.Append(CXXFLAGS=["-std=gnu++20"])
-    if "-fno-exceptions" in env_winrt["CXXFLAGS"]:
-        env_winrt["CXXFLAGS"].remove("-fno-exceptions")
-    env_winrt.Append(CXXFLAGS=["-fexceptions"])
-else:
-    if "/std:c++17" in env_winrt["CXXFLAGS"]:
-        env_winrt["CXXFLAGS"].remove("/std:c++17")
-    env_winrt.Append(CXXFLAGS=["/std:c++20"])
-    if "_HAS_EXCEPTIONS" in env_winrt["CPPDEFINES"]:
-        env_winrt["CPPDEFINES"].remove("_HAS_EXCEPTIONS")
-    env_winrt.Append(CXXFLAGS=["/EHsc"])
-tts_sources = ["tts_windows.cpp", "tts_driver_sapi.cpp"]
-if env_winrt["winrt_path"] != "" or env_winrt.msvc:
-    if not env_winrt.msvc:
-        env_winrt.Append(CPPPATH=[env["winrt_path"]])
-    env_winrt.AppendUnique(CPPDEFINES=["WINRT_ENABLED"])
-    tts_sources += ["tts_driver_onecore.cpp"]
-env_winrt.add_source_files(sources, tts_sources)
-
 sources += res_obj
 
 if env["accesskit"] and not env.msvc:
diff --git a/engine/platform/windows/console_wrapper_windows.cpp b/engine/platform/windows/console_wrapper_windows.cpp
index 68641d9f..c72a8e23 100644
--- a/engine/platform/windows/console_wrapper_windows.cpp
+++ b/engine/platform/windows/console_wrapper_windows.cpp
@@ -31,9 +31,8 @@
 #include <windows.h>
 
 #include <shlwapi.h>
-
+#include <cstdio>
 #include <cstdlib>
-#include <cwchar>
 
 #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
diff --git a/engine/platform/windows/crash_handler_windows.h b/engine/platform/windows/crash_handler_windows.h
index 8cfee486..358d0ce3 100644
--- a/engine/platform/windows/crash_handler_windows.h
+++ b/engine/platform/windows/crash_handler_windows.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 // Crash handler exception only enabled with MSVC
diff --git a/engine/platform/windows/crash_handler_windows_seh.cpp b/engine/platform/windows/crash_handler_windows_seh.cpp
index 3e3ac6bc..f2b3cd27 100644
--- a/engine/platform/windows/crash_handler_windows_seh.cpp
+++ b/engine/platform/windows/crash_handler_windows_seh.cpp
@@ -36,19 +36,20 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/version.h"
+#include "main/main.h"
 
 #ifdef CRASH_HANDLER_EXCEPTION
 
 // Backtrace code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app
 
-#include <psapi.h>
-
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
 #include <vector>
 
+#include <psapi.h>
+
 // Some versions of imagehlp.dll lack the proper packing directives themselves
 // so we need to do it.
 #pragma pack(push, before_imagehlp, 8)
@@ -166,8 +167,6 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 	std::transform(module_handles.begin(), module_handles.end(), std::back_inserter(modules), get_mod_info(process));
 	void *base = modules[0].base_address;
 
-	print_error(vformat("Load address: %x\n", (uint64_t)base));
-
 	// Setup stuff:
 	CONTEXT *context = ep->ContextRecord;
 	STACKFRAME64 frame;
@@ -210,27 +209,10 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 			if (frame.AddrPC.Offset != 0) {
 				std::string fnName = symbol(process, frame.AddrPC.Offset).undecorated_name();
 
-				IMAGEHLP_MODULE64 mod_info;
-				memset(&mod_info, 0, sizeof(IMAGEHLP_MODULE64));
-				mod_info.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
-				uint64_t offset = (uint64_t)base;
-				String mod_name = "main";
-				if (SymGetModuleInfo64(process, frame.AddrPC.Offset, &mod_info)) {
-					offset = mod_info.BaseOfImage;
-					if (offset != (uint64_t)base) {
-						if (mod_info.ImageName[0] != 0) {
-							mod_name = String((const char *)mod_info.ImageName).to_lower().get_file();
-						} else if (mod_info.ModuleName[0] != 0) {
-							mod_name = String((const char *)mod_info.ModuleName).to_lower();
-						} else {
-							mod_name = "<unknown module>";
-						}
-					}
-				}
 				if (SymGetLineFromAddr64(process, frame.AddrPC.Offset, &offset_from_symbol, &line)) {
-					print_error(vformat("[%d] %x (%s+%x) - %s (%s:%d)", n, (uint64_t)frame.AddrPC.Offset, mod_name, (uint64_t)frame.AddrPC.Offset - offset, fnName.c_str(), (char *)line.FileName, (int)line.LineNumber));
+					print_error(vformat("[%d] %s (%s:%d)", n, fnName.c_str(), (char *)line.FileName, (int)line.LineNumber));
 				} else {
-					print_error(vformat("[%d] %x (%s+%x) - %s", n, (uint64_t)frame.AddrPC.Offset, mod_name, (uint64_t)frame.AddrPC.Offset - offset, fnName.c_str()));
+					print_error(vformat("[%d] %s", n, fnName.c_str()));
 				}
 			} else {
 				print_error(vformat("[%d] ???", n));
diff --git a/engine/platform/windows/crash_handler_windows_signal.cpp b/engine/platform/windows/crash_handler_windows_signal.cpp
index 0a018e47..9622f3c2 100644
--- a/engine/platform/windows/crash_handler_windows_signal.cpp
+++ b/engine/platform/windows/crash_handler_windows_signal.cpp
@@ -37,114 +37,50 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/version.h"
+#include "main/main.h"
 
 #ifdef CRASH_HANDLER_EXCEPTION
 
-#include <thirdparty/libbacktrace/backtrace.h>
-
 #include <cxxabi.h>
-#include <psapi.h>
-
 #include <algorithm>
 #include <csignal>
 #include <cstdlib>
-#include <iterator>
+#include <string>
 #include <vector>
 
-// Some versions of imagehlp.dll lack the proper packing directives themselves
-// so we need to do it.
-#pragma pack(push, before_imagehlp, 8)
-#include <imagehlp.h>
-#pragma pack(pop, before_imagehlp)
+#include <psapi.h>
+
+#include "thirdparty/libbacktrace/backtrace.h"
 
 struct CrashHandlerData {
 	int64_t index = 0;
 	backtrace_state *state = nullptr;
 	int64_t offset = 0;
-	int64_t base = 0;
-	uint64_t pc = 0;
-	HANDLE process = nullptr;
-	bool sym_ok = false;
-};
-
-struct module_data {
-	std::string image_name;
-	std::string module_name;
-	void *base_address = nullptr;
-	DWORD load_size;
-};
-
-class get_mod_info {
-	HANDLE process;
-
-public:
-	get_mod_info(HANDLE h) :
-			process(h) {}
-
-	module_data operator()(HMODULE module) {
-		module_data ret;
-		char temp[4096];
-		MODULEINFO mi;
-
-		GetModuleInformation(process, module, &mi, sizeof(mi));
-		ret.base_address = mi.lpBaseOfDll;
-		ret.load_size = mi.SizeOfImage;
-
-		GetModuleFileNameEx(process, module, temp, sizeof(temp));
-		ret.image_name = temp;
-		GetModuleBaseName(process, module, temp, sizeof(temp));
-		ret.module_name = temp;
-		std::vector<char> img(ret.image_name.begin(), ret.image_name.end());
-		std::vector<char> mod(ret.module_name.begin(), ret.module_name.end());
-		SymLoadModule64(process, nullptr, &img[0], &mod[0], (DWORD64)ret.base_address, ret.load_size);
-		return ret;
-	}
 };
 
 int symbol_callback(void *data, uintptr_t pc, const char *filename, int lineno, const char *function) {
 	CrashHandlerData *ch_data = reinterpret_cast<CrashHandlerData *>(data);
-	uint64_t offset = (uint64_t)ch_data->base;
-	String mod_name = "main";
-	if (ch_data->sym_ok) {
-		IMAGEHLP_MODULE64 mod_info;
-		memset(&mod_info, 0, sizeof(IMAGEHLP_MODULE64));
-		mod_info.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
-		if (SymGetModuleInfo64(ch_data->process, ch_data->pc, &mod_info)) {
-			offset = mod_info.BaseOfImage;
-			if (offset != (uint64_t)ch_data->base) {
-				if (mod_info.ImageName[0] != 0) {
-					mod_name = String((const char *)mod_info.ImageName).to_lower().get_file();
-				} else if (mod_info.ModuleName[0] != 0) {
-					mod_name = String((const char *)mod_info.ModuleName).to_lower();
-				} else {
-					mod_name = "<unknown module>";
-				}
-			}
+	if (!function) {
+		return 0;
+	}
+
+	char fname[1024];
+	snprintf(fname, 1024, "%s", function);
+
+	if (function[0] == '_') {
+		int status;
+		char *demangled = abi::__cxa_demangle(function, nullptr, nullptr, &status);
+
+		if (status == 0 && demangled) {
+			snprintf(fname, 1024, "%s", demangled);
+		}
+
+		if (demangled) {
+			free(demangled);
 		}
 	}
 
-	if (function) {
-		char fname[1024];
-		snprintf(fname, 1024, "%s", function);
-
-		if (function[0] == '_') {
-			int status;
-			char *demangled = abi::__cxa_demangle(function, nullptr, nullptr, &status);
-
-			if (status == 0 && demangled) {
-				snprintf(fname, 1024, "%s", demangled);
-			}
-
-			if (demangled) {
-				free(demangled);
-			}
-		}
-		print_error(vformat("[%d] %x (%s+%x) - %s (%s:%d)", ch_data->index++, ch_data->pc, mod_name, ch_data->pc - offset, String::utf8(fname), String::utf8(filename), lineno));
-	} else if ((int64_t)ch_data->pc > 0) {
-		print_error(vformat("[%d] %x (%s+%x) - <couldn't map PC to fn name>", ch_data->index++, ch_data->pc, mod_name, ch_data->pc - offset));
-	} else {
-		print_error(vformat("[%d] ???", ch_data->index++));
-	}
+	print_error(vformat("[%d] %s (%s:%d)", ch_data->index++, String::utf8(fname), String::utf8(filename), lineno));
 	return 0;
 }
 
@@ -153,32 +89,12 @@ void error_callback(void *data, const char *msg, int errnum) {
 	if (ch_data->index == 0) {
 		print_error(vformat("Error(%d): %s", errnum, String::utf8(msg)));
 	} else {
-		uint64_t offset = (uint64_t)ch_data->base;
-		String mod_name = "main";
-		if (ch_data->sym_ok) {
-			IMAGEHLP_MODULE64 mod_info;
-			memset(&mod_info, 0, sizeof(IMAGEHLP_MODULE64));
-			mod_info.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
-			if (SymGetModuleInfo64(ch_data->process, ch_data->pc, &mod_info)) {
-				offset = mod_info.BaseOfImage;
-				if (offset != (uint64_t)ch_data->base) {
-					if (mod_info.ImageName[0] != 0) {
-						mod_name = String((const char *)mod_info.ImageName).to_lower().get_file();
-					} else if (mod_info.ModuleName[0] != 0) {
-						mod_name = String((const char *)mod_info.ModuleName).to_lower();
-					} else {
-						mod_name = "<unknown module>";
-					}
-				}
-			}
-		}
-		print_error(vformat("[%d] %x (%s+%x) - %s", ch_data->index++, ch_data->pc, mod_name, ch_data->pc - offset, String::utf8(msg)));
+		print_error(vformat("[%d] error(%d): %s", ch_data->index++, errnum, String::utf8(msg)));
 	}
 }
 
 int trace_callback(void *data, uintptr_t pc) {
 	CrashHandlerData *ch_data = reinterpret_cast<CrashHandlerData *>(data);
-	ch_data->pc = (uint64_t)pc;
 	backtrace_pcinfo(ch_data->state, pc - ch_data->offset, &symbol_callback, &error_callback, data);
 	return 0;
 }
@@ -254,24 +170,6 @@ extern void CrashHandlerException(int signal) {
 	int64_t image_file_base = get_image_base(_execpath);
 	data.offset = image_mem_base - image_file_base;
 
-	std::vector<module_data> modules;
-	DWORD cbNeeded;
-	std::vector<HMODULE> module_handles(1);
-
-	data.process = GetCurrentProcess();
-	data.sym_ok = SymInitialize(data.process, nullptr, false);
-
-	if (data.sym_ok) {
-		SymSetOptions(SymGetOptions() | SYMOPT_LOAD_LINES | SYMOPT_UNDNAME | SYMOPT_EXACT_SYMBOLS);
-		EnumProcessModules(data.process, &module_handles[0], module_handles.size() * sizeof(HMODULE), &cbNeeded);
-		module_handles.resize(cbNeeded / sizeof(HMODULE));
-		EnumProcessModules(data.process, &module_handles[0], module_handles.size() * sizeof(HMODULE), &cbNeeded);
-		std::transform(module_handles.begin(), module_handles.end(), std::back_inserter(modules), get_mod_info(data.process));
-		data.base = (uint64_t)modules[0].base_address;
-	}
-
-	print_error(vformat("Load address: %x\n", (uint64_t)data.offset));
-
 	if (FileAccess::exists(_execpath + ".debugsymbols")) {
 		_execpath = _execpath + ".debugsymbols";
 	}
diff --git a/engine/platform/windows/detect.py b/engine/platform/windows/detect.py
index 6453c60b..011cdade 100644
--- a/engine/platform/windows/detect.py
+++ b/engine/platform/windows/detect.py
@@ -166,10 +166,10 @@ def get_opts():
 
     mingw = os.getenv("MINGW_PREFIX", "")
 
-    # Dependencies folder.
-    deps_folder = os.getenv("LOCALAPPDATA")
-    if deps_folder:
-        deps_folder = os.path.join(deps_folder, "Godot", "build_deps")
+    # Direct3D 12 SDK dependencies folder.
+    d3d12_deps_folder = os.getenv("LOCALAPPDATA")
+    if d3d12_deps_folder:
+        d3d12_deps_folder = os.path.join(d3d12_deps_folder, "Godot", "build_deps")
     else:
         # Cross-compiling, the deps install script puts things in `bin`.
         # Getting an absolute path to it is a bit hacky in Python.
@@ -178,9 +178,9 @@ def get_opts():
 
             caller_frame = inspect.stack()[1]
             caller_script_dir = os.path.dirname(os.path.abspath(caller_frame[1]))
-            deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
+            d3d12_deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
         except Exception:  # Give up.
-            deps_folder = ""
+            d3d12_deps_folder = ""
 
     return [
         ("mingw_prefix", "MinGW prefix", mingw),
@@ -194,34 +194,17 @@ def get_opts():
         BoolVariable("debug_crt", "Compile with MSVC's debug CRT (/MDd)", False),
         BoolVariable("incremental_link", "Use MSVC incremental linking. May increase or decrease build times.", False),
         BoolVariable("silence_msvc", "Silence MSVC's cl/link stdout bloat, redirecting any errors to stderr.", True),
-        # Screen reader support.
-        (
-            "accesskit_sdk_path",
-            "Path to the AccessKit C SDK",
-            os.path.join(deps_folder, "accesskit"),
-        ),
-        # OpenGL over Direct3D 11.
-        (
-            "angle_libs",
-            "Path to the ANGLE static libraries",
-            os.path.join(deps_folder, "angle"),
-        ),
-        # WinRT.
-        (
-            "winrt_path",
-            "Path to the WinRT headers",
-            os.path.join(deps_folder, "winrt_mingw"),
-        ),
+        ("angle_libs", "Path to the ANGLE static libraries", ""),
         # Direct3D 12 support.
         (
             "mesa_libs",
             "Path to the MESA/NIR static libraries (required for D3D12)",
-            os.path.join(deps_folder, "mesa"),
+            os.path.join(d3d12_deps_folder, "mesa"),
         ),
         (
             "agility_sdk_path",
             "Path to the Agility SDK distribution (optional for D3D12)",
-            os.path.join(deps_folder, "agility_sdk"),
+            os.path.join(d3d12_deps_folder, "agility_sdk"),
         ),
         BoolVariable(
             "agility_sdk_multiarch",
@@ -232,7 +215,7 @@ def get_opts():
         (
             "pix_path",
             "Path to the PIX runtime distribution (optional for D3D12)",
-            os.path.join(deps_folder, "pix"),
+            os.path.join(d3d12_deps_folder, "pix"),
         ),
     ]
 
@@ -392,7 +375,7 @@ def configure_msvc(env: "SConsEnvironment"):
     if env["use_asan"]:
         env.extra_suffix += ".san"
         prebuilt_lib_extra_suffix = ".san"
-        env.Append(CPPDEFINES=["ASAN_ENABLED"])
+        env.AppendUnique(CPPDEFINES=["SANITIZERS_ENABLED"])
         env.Append(CCFLAGS=["/fsanitize=address"])
         env.Append(LINKFLAGS=["/INFERASANLIBS"])
 
@@ -425,14 +408,13 @@ def configure_msvc(env: "SConsEnvironment"):
         "wbemuuid",
         "ntdll",
         "hid",
-        "mincore",
     ]
 
     if env.debug_features:
         LIBS += ["psapi", "dbghelp"]
 
     if env["accesskit"]:
-        if os.path.exists(env["accesskit_sdk_path"]):
+        if env["accesskit_sdk_path"] != "":
             env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
             if env["arch"] == "arm64":
                 env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/arm64/msvc/static"])
@@ -450,16 +432,9 @@ def configure_msvc(env: "SConsEnvironment"):
                 "userenv",
                 "ntdll",
             ]
-            env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
         else:
-            print_error(
-                "The screen reader support driver requires dependencies to be installed.\n"
-                f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_accesskit.py')}`.\n"
-                "See the documentation for more information:\n"
-                "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
-                "Alternatively, disable this driver by compiling with `accesskit=no` explicitly."
-            )
-            env["accesskit"] = False
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
 
     if env["vulkan"]:
         env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
@@ -494,26 +469,16 @@ def configure_msvc(env: "SConsEnvironment"):
 
     if env["opengl3"]:
         env.AppendUnique(CPPDEFINES=["GLES3_ENABLED"])
-        angle_path = env["angle_libs"] + "-" + env["arch"] + "-msvc"
-        if os.path.exists(angle_path):
-            env.Prepend(CPPPATH=["#thirdparty/angle/include"])
-            env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"])
-            env.Append(LIBPATH=[angle_path])
+        if env["angle_libs"] != "":
+            env.AppendUnique(CPPDEFINES=["EGL_STATIC"])
+            env.Append(LIBPATH=[env["angle_libs"]])
             LIBS += [
                 "libANGLE.windows." + env["arch"] + prebuilt_lib_extra_suffix,
                 "libEGL.windows." + env["arch"] + prebuilt_lib_extra_suffix,
                 "libGLES.windows." + env["arch"] + prebuilt_lib_extra_suffix,
             ]
             LIBS += ["dxgi", "d3d9", "d3d11"]
-        else:
-            print_warning(
-                "The ANGLE rendering driver requires dependencies to be installed.\n"
-                f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_angle.py')}`.\n"
-                "See the documentation for more information:\n"
-                "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
-                "Alternatively, disable this driver by compiling with `angle=no` explicitly."
-            )
-            env["angle"] = False
+        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
 
     if env["target"] in ["editor", "template_debug"]:
         LIBS += ["psapi", "dbghelp"]
@@ -562,8 +527,7 @@ def get_ar_version(env):
     }
     try:
         output = (
-            subprocess
-            .check_output([env.subst(env["AR"]), "--version"], shell=(os.name == "nt"))
+            subprocess.check_output([env.subst(env["AR"]), "--version"], shell=(os.name == "nt"))
             .strip()
             .decode("utf-8")
         )
@@ -766,12 +730,11 @@ def configure_mingw(env: "SConsEnvironment"):
             sys.exit(255)
 
         env.extra_suffix += ".san"
+        env.AppendUnique(CPPDEFINES=["SANITIZERS_ENABLED"])
         san_flags = []
         if env["use_asan"]:
-            env.Append(CPPDEFINES=["ASAN_ENABLED"])
             san_flags.append("-fsanitize=address")
         if env["use_ubsan"]:
-            env.Append(CPPDEFINES=["UBSAN_ENABLED"])
             san_flags.append("-fsanitize=undefined")
             # Disable the vptr check since it gets triggered on any COM interface calls.
             san_flags.append("-fno-sanitize=vptr")
@@ -819,12 +782,11 @@ def configure_mingw(env: "SConsEnvironment"):
             "wbemuuid",
             "ntdll",
             "hid",
-            "mincore",
         ]
     )
 
     if env["accesskit"]:
-        if os.path.exists(env["accesskit_sdk_path"]):
+        if env["accesskit_sdk_path"] != "":
             env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
             if env["use_llvm"]:
                 if env["arch"] == "arm64":
@@ -851,17 +813,10 @@ def configure_mingw(env: "SConsEnvironment"):
                     "ntdll",
                 ]
             )
-            env.Append(LIBPATH=["#platform/windows"])
-            env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
         else:
-            print_warning(
-                "The screen reader support driver requires dependencies to be installed.\n"
-                f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_accesskit.py')}`.\n"
-                "See the documentation for more information:\n"
-                "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
-                "Alternatively, disable this driver by compiling with `accesskit=no` explicitly."
-            )
-            env["accesskit"] = False
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(LIBPATH=["#platform/windows"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
 
     if env.debug_features:
         env.Append(LIBS=["psapi", "dbghelp"])
@@ -904,29 +859,18 @@ def configure_mingw(env: "SConsEnvironment"):
 
     if env["opengl3"]:
         env.Append(CPPDEFINES=["GLES3_ENABLED"])
-        if env["angle"]:
-            angle_path = env["angle_libs"] + "-" + env["arch"] + ("-llvm" if env["use_llvm"] else "-gcc")
-            if os.path.exists(angle_path):
-                env.Prepend(CPPPATH=["#thirdparty/angle/include"])
-                env.AppendUnique(CPPDEFINES=["ANGLE_ENABLED", "EGL_STATIC"])
-                env.Append(LIBPATH=[angle_path])
-                env.Append(
-                    LIBS=[
-                        "EGL.windows." + env["arch"],
-                        "GLES.windows." + env["arch"],
-                        "ANGLE.windows." + env["arch"],
-                    ]
-                )
-                env.Append(LIBS=["dxgi", "d3d9", "d3d11"])
-            else:
-                print_warning(
-                    "The ANGLE rendering driver requires dependencies to be installed.\n"
-                    f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_angle.py')}`.\n"
-                    "See the documentation for more information:\n"
-                    "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
-                    "Alternatively, disable this driver by compiling with `angle=no` explicitly."
-                )
-                env["angle"] = False
+        if env["angle_libs"] != "":
+            env.AppendUnique(CPPDEFINES=["EGL_STATIC"])
+            env.Append(LIBPATH=[env["angle_libs"]])
+            env.Append(
+                LIBS=[
+                    "EGL.windows." + env["arch"],
+                    "GLES.windows." + env["arch"],
+                    "ANGLE.windows." + env["arch"],
+                ]
+            )
+            env.Append(LIBS=["dxgi", "d3d9", "d3d11"])
+        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
 
     env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)])
 
@@ -981,7 +925,7 @@ def check_d3d12_installed(env, suffix):
     if not os.path.exists(env["mesa_libs"]) and not os.path.exists(env["mesa_libs"] + "-" + suffix):
         print_error(
             "The Direct3D 12 rendering driver requires dependencies to be installed.\n"
-            f"You can install them by running `python {os.path.join('misc', 'scripts', 'install_d3d12_sdk_windows.py')}`.\n"
+            "You can install them by running `python misc\\scripts\\install_d3d12_sdk_windows.py`.\n"
             "See the documentation for more information:\n"
             "\thttps://docs.godotengine.org/en/latest/engine_details/development/compiling/compiling_for_windows.html\n"
             "Alternatively, disable this driver by compiling with `d3d12=no` explicitly."
diff --git a/engine/platform/windows/display_server_windows.cpp b/engine/platform/windows/display_server_windows.cpp
index d96beefc..22aba8a7 100644
--- a/engine/platform/windows/display_server_windows.cpp
+++ b/engine/platform/windows/display_server_windows.cpp
@@ -31,46 +31,40 @@
 #include "display_server_windows.h"
 
 #include "drop_target_windows.h"
-#include "key_mapping_windows.h"
-#include "native_menu_windows.h"
 #include "os_windows.h"
-#include "tts_windows.h"
+#include "scene/main/window.h"
 #include "wgl_detect_version.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
 #include "core/io/xml_parser.h"
-#include "core/object/callable_mp.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/version.h"
 #include "drivers/png/png_driver_common.h"
 #include "main/main.h"
 #include "scene/resources/texture.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/dummy/rasterizer_dummy.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 
 #ifdef SDL_ENABLED
 #include "drivers/sdl/joypad_sdl.h"
 #endif
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #if defined(VULKAN_ENABLED)
 #include "rendering_context_driver_vulkan_windows.h"
 #endif
 #if defined(D3D12_ENABLED)
 #include "drivers/d3d12/rendering_context_driver_d3d12.h"
-
-#include <dxgi1_6.h>
 #endif
 #if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
+#if defined(ACCESSKIT_ENABLED)
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
 #include <avrt.h>
 #include <dwmapi.h>
 #include <propkey.h>
@@ -124,46 +118,47 @@ static void track_mouse_leave_event(HWND hWnd) {
 	TrackMouseEvent(&tme);
 }
 
-bool DisplayServerWindows::has_feature(DisplayServerEnums::Feature p_feature) const {
+bool DisplayServerWindows::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 #ifndef DISABLE_DEPRECATED
-		case DisplayServerEnums::FEATURE_GLOBAL_MENU: {
+		case FEATURE_GLOBAL_MENU: {
 			return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU));
 		} break;
 #endif
-		case DisplayServerEnums::FEATURE_SUBWINDOWS:
-		case DisplayServerEnums::FEATURE_TOUCHSCREEN:
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_MOUSE_WARP:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_IME:
-		case DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY:
-		case DisplayServerEnums::FEATURE_HIDPI:
-		case DisplayServerEnums::FEATURE_ICON:
-		case DisplayServerEnums::FEATURE_NATIVE_ICON:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE:
-		case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA:
-		//case DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME:
-		case DisplayServerEnums::FEATURE_SWAP_BUFFERS:
-		case DisplayServerEnums::FEATURE_KEEP_SCREEN_ON:
-		case DisplayServerEnums::FEATURE_TEXT_TO_SPEECH:
-		case DisplayServerEnums::FEATURE_SCREEN_CAPTURE:
-		case DisplayServerEnums::FEATURE_STATUS_INDICATOR:
-		case DisplayServerEnums::FEATURE_WINDOW_EMBEDDING:
-		case DisplayServerEnums::FEATURE_WINDOW_DRAG:
-		case DisplayServerEnums::FEATURE_HDR_OUTPUT:
+		case FEATURE_SUBWINDOWS:
+		case FEATURE_TOUCHSCREEN:
+		case FEATURE_MOUSE:
+		case FEATURE_MOUSE_WARP:
+		case FEATURE_CLIPBOARD:
+		case FEATURE_CURSOR_SHAPE:
+		case FEATURE_CUSTOM_CURSOR_SHAPE:
+		case FEATURE_IME:
+		case FEATURE_WINDOW_TRANSPARENCY:
+		case FEATURE_HIDPI:
+		case FEATURE_ICON:
+		case FEATURE_NATIVE_ICON:
+		case FEATURE_NATIVE_DIALOG:
+		case FEATURE_NATIVE_DIALOG_INPUT:
+		case FEATURE_NATIVE_DIALOG_FILE:
+		case FEATURE_NATIVE_DIALOG_FILE_EXTRA:
+		//case FEATURE_NATIVE_DIALOG_FILE_MIME:
+		case FEATURE_SWAP_BUFFERS:
+		case FEATURE_KEEP_SCREEN_ON:
+		case FEATURE_TEXT_TO_SPEECH:
+		case FEATURE_SCREEN_CAPTURE:
+		case FEATURE_STATUS_INDICATOR:
+		case FEATURE_WINDOW_EMBEDDING:
+		case FEATURE_WINDOW_DRAG:
 			return true;
-		case DisplayServerEnums::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE:
+		case FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE:
 			return (os_ver.dwBuildNumber >= 19041); // Fully supported on Windows 10 Vibranium R1 (2004)+ only, captured as black rect on older versions.
-		case DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER:
+		case FEATURE_EMOJI_AND_SYMBOL_PICKER:
 			return (os_ver.dwBuildNumber >= 17134); // Windows 10 Redstone 4 (1803)+ only.
-		case DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER: {
-			return AccessibilityServer::get_singleton()->is_supported();
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
 		} break;
+#endif
 		default:
 			return false;
 	}
@@ -216,8 +211,8 @@ Vector2i DisplayServerWindows::_get_screen_expand_offset(int p_screen) const {
 	}
 }
 
-void DisplayServerWindows::_set_mouse_mode_impl(DisplayServerEnums::MouseMode p_mode) {
-	if (p_mode == DisplayServerEnums::MOUSE_MODE_HIDDEN || p_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || p_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+void DisplayServerWindows::_set_mouse_mode_impl(MouseMode p_mode) {
+	if (p_mode == MOUSE_MODE_HIDDEN || p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 		// Hide cursor before moving.
 		if (hCursor == nullptr) {
 			hCursor = SetCursor(nullptr);
@@ -226,11 +221,11 @@ void DisplayServerWindows::_set_mouse_mode_impl(DisplayServerEnums::MouseMode p_
 		}
 	}
 
-	if (windows.has(DisplayServerEnums::MAIN_WINDOW_ID) && (p_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || p_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || p_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN)) {
+	if (windows.has(MAIN_WINDOW_ID) && (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_CONFINED || p_mode == MOUSE_MODE_CONFINED_HIDDEN)) {
 		// Mouse is grabbed (captured or confined).
-		DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+		WindowID window_id = _get_focused_window_or_popup();
 		if (!windows.has(window_id)) {
-			window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+			window_id = MAIN_WINDOW_ID;
 		}
 
 		WindowData &wd = windows[window_id];
@@ -244,7 +239,7 @@ void DisplayServerWindows::_set_mouse_mode_impl(DisplayServerEnums::MouseMode p_
 		ClientToScreen(wd.hWnd, (POINT *)&clipRect.left);
 		ClientToScreen(wd.hWnd, (POINT *)&clipRect.right);
 		ClipCursor(&clipRect);
-		if (p_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+		if (p_mode == MOUSE_MODE_CAPTURED) {
 			center = window_get_size() / 2;
 			POINT pos = { (int)center.x, (int)center.y };
 			ClientToScreen(wd.hWnd, &pos);
@@ -263,19 +258,19 @@ void DisplayServerWindows::_set_mouse_mode_impl(DisplayServerEnums::MouseMode p_
 		}
 		ClipCursor(nullptr);
 
-		_register_raw_input_devices(DisplayServerEnums::INVALID_WINDOW_ID);
+		_register_raw_input_devices(INVALID_WINDOW_ID);
 	}
 
-	if (p_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || p_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	if (p_mode == MOUSE_MODE_VISIBLE || p_mode == MOUSE_MODE_CONFINED) {
 		// Show cursor.
-		DisplayServerEnums::CursorShape c = cursor_shape;
-		cursor_shape = DisplayServerEnums::CURSOR_MAX;
+		CursorShape c = cursor_shape;
+		cursor_shape = CURSOR_MAX;
 		cursor_set_shape(c);
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerWindows::_get_focused_window_or_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerWindows::_get_focused_window_or_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	}
@@ -284,7 +279,7 @@ DisplayServerEnums::WindowID DisplayServerWindows::_get_focused_window_or_popup(
 }
 
 bool DisplayServerWindows::_has_moving_window() const {
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (E.value.move_timer_id) {
 			return true;
 		}
@@ -292,7 +287,7 @@ bool DisplayServerWindows::_has_moving_window() const {
 	return false;
 }
 
-void DisplayServerWindows::_register_raw_input_devices(DisplayServerEnums::WindowID p_target_window) {
+void DisplayServerWindows::_register_raw_input_devices(WindowID p_target_window) {
 	use_raw_input = true;
 
 	RAWINPUTDEVICE rid[2] = {};
@@ -304,7 +299,7 @@ void DisplayServerWindows::_register_raw_input_devices(DisplayServerEnums::Windo
 	rid[1].usUsage = 0x06; // HID_USAGE_GENERIC_KEYBOARD
 	rid[1].dwFlags = 0;
 
-	if (p_target_window != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(p_target_window)) {
+	if (p_target_window != INVALID_WINDOW_ID && windows.has(p_target_window)) {
 		// Follow the defined window
 		rid[0].hwndTarget = windows[p_target_window].hWnd;
 		rid[1].hwndTarget = windows[p_target_window].hWnd;
@@ -380,11 +375,11 @@ void DisplayServerWindows::tts_stop() {
 	tts->stop();
 }
 
-Error DisplayServerWindows::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWindows::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false, p_window_id);
 }
 
-Error DisplayServerWindows::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWindows::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true, p_window_id);
 }
 
@@ -541,7 +536,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 	DisplayServerWindows *ds = static_cast<DisplayServerWindows *>(get_singleton());
 	FileDialogData *fd = (FileDialogData *)p_ud;
 
-	if (fd->mode < 0 && fd->mode >= DisplayServerEnums::FILE_DIALOG_MODE_SAVE_MAX) {
+	if (fd->mode < 0 && fd->mode >= DisplayServer::FILE_DIALOG_MODE_SAVE_MAX) {
 		fd->finished.set();
 		return;
 	}
@@ -565,13 +560,13 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 			ds->file_dialog_wnd[hwnd_dialog] = fd;
 		}
 
-		HICON w_icon = (HICON)SendMessage(fd->hwnd_owner, WM_GETICON, ICON_SMALL, 0);
-		if (w_icon) {
-			SendMessage(hwnd_dialog, WM_SETICON, ICON_SMALL, (LPARAM)w_icon);
+		HICON mainwindow_icon = (HICON)SendMessage(fd->hwnd_owner, WM_GETICON, ICON_SMALL, 0);
+		if (mainwindow_icon) {
+			SendMessage(hwnd_dialog, WM_SETICON, ICON_SMALL, (LPARAM)mainwindow_icon);
 		}
-		w_icon = (HICON)SendMessage(fd->hwnd_owner, WM_GETICON, ICON_BIG, 0);
-		if (w_icon) {
-			SendMessage(hwnd_dialog, WM_SETICON, ICON_BIG, (LPARAM)w_icon);
+		mainwindow_icon = (HICON)SendMessage(fd->hwnd_owner, WM_GETICON, ICON_BIG, 0);
+		if (mainwindow_icon) {
+			SendMessage(hwnd_dialog, WM_SETICON, ICON_BIG, (LPARAM)mainwindow_icon);
 		}
 		IPropertyStore *prop_store;
 		HRESULT hr = SHGetPropertyStoreForWindow(hwnd_dialog, IID_IPropertyStore, (void **)&prop_store);
@@ -622,7 +617,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 
 	HRESULT hr = S_OK;
 	IFileDialog *pfd = nullptr;
-	if (fd->mode == DisplayServerEnums::FILE_DIALOG_MODE_SAVE_FILE) {
+	if (fd->mode == DisplayServer::FILE_DIALOG_MODE_SAVE_FILE) {
 		hr = CoCreateInstance(CLSID_FileSaveDialog, nullptr, CLSCTX_INPROC_SERVER, IID_IFileSaveDialog, (void **)&pfd);
 	} else {
 		hr = CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC_SERVER, IID_IFileOpenDialog, (void **)&pfd);
@@ -651,10 +646,10 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 
 		DWORD flags;
 		pfd->GetOptions(&flags);
-		if (fd->mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILES) {
+		if (fd->mode == DisplayServer::FILE_DIALOG_MODE_OPEN_FILES) {
 			flags |= FOS_ALLOWMULTISELECT;
 		}
-		if (fd->mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_DIR) {
+		if (fd->mode == DisplayServer::FILE_DIALOG_MODE_OPEN_DIR) {
 			flags |= FOS_PICKFOLDERS;
 		}
 		if (fd->show_hidden) {
@@ -709,7 +704,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 		if (SUCCEEDED(hr)) {
 			Vector<String> file_names;
 
-			if (fd->mode == DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILES) {
+			if (fd->mode == DisplayServer::FILE_DIALOG_MODE_OPEN_FILES) {
 				IShellItemArray *results;
 				hr = static_cast<IFileOpenDialog *>(pfd)->GetResults(&results);
 				if (SUCCEEDED(hr)) {
@@ -800,15 +795,15 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 
 	fd->finished.set();
 
-	if (fd->window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (fd->window_id != INVALID_WINDOW_ID) {
 		callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(fd->window_id);
 	}
 }
 
-Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX_V(int(p_mode), DisplayServerEnums::FILE_DIALOG_MODE_SAVE_MAX, FAILED);
+	ERR_FAIL_INDEX_V(int(p_mode), FILE_DIALOG_MODE_SAVE_MAX, FAILED);
 
 	String appname;
 	if (Engine::get_singleton()->is_editor_hint()) {
@@ -896,7 +891,7 @@ void DisplayServerWindows::beep() const {
 void DisplayServerWindows::_mouse_update_mode() {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::MouseMode wanted_mouse_mode = mouse_mode_override_enabled
+	MouseMode wanted_mouse_mode = mouse_mode_override_enabled
 			? mouse_mode_override
 			: mouse_mode_base;
 
@@ -910,8 +905,8 @@ void DisplayServerWindows::_mouse_update_mode() {
 	_set_mouse_mode_impl(wanted_mouse_mode);
 }
 
-void DisplayServerWindows::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWindows::mouse_set_mode(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_base) {
 		return;
 	}
@@ -919,12 +914,12 @@ void DisplayServerWindows::mouse_set_mode(DisplayServerEnums::MouseMode p_mode)
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWindows::mouse_get_mode() const {
+DisplayServer::MouseMode DisplayServerWindows::mouse_get_mode() const {
 	return mouse_mode;
 }
 
-void DisplayServerWindows::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
-	ERR_FAIL_INDEX(p_mode, DisplayServerEnums::MouseMode::MOUSE_MODE_MAX);
+void DisplayServerWindows::mouse_set_mode_override(MouseMode p_mode) {
+	ERR_FAIL_INDEX(p_mode, MouseMode::MOUSE_MODE_MAX);
 	if (p_mode == mouse_mode_override) {
 		return;
 	}
@@ -932,7 +927,7 @@ void DisplayServerWindows::mouse_set_mode_override(DisplayServerEnums::MouseMode
 	_mouse_update_mode();
 }
 
-DisplayServerEnums::MouseMode DisplayServerWindows::mouse_get_mode_override() const {
+DisplayServer::MouseMode DisplayServerWindows::mouse_get_mode_override() const {
 	return mouse_mode_override;
 }
 
@@ -951,13 +946,13 @@ bool DisplayServerWindows::mouse_is_mode_override_enabled() const {
 void DisplayServerWindows::warp_mouse(const Point2i &p_position) {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	WindowID window_id = _get_focused_window_or_popup();
 
 	if (!windows.has(window_id)) {
 		return; // No focused window?
 	}
 
-	if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+	if (mouse_mode == MOUSE_MODE_CAPTURED) {
 		old_x = p_position.x;
 		old_y = p_position.y;
 	} else {
@@ -1001,7 +996,7 @@ BitField<MouseButtonMask> DisplayServerWindows::mouse_get_button_state() const {
 void DisplayServerWindows::clipboard_set(const String &p_text) {
 	_THREAD_SAFE_METHOD_
 
-	if (!windows.has(DisplayServerEnums::MAIN_WINDOW_ID)) {
+	if (!windows.has(MAIN_WINDOW_ID)) {
 		return;
 	}
 
@@ -1009,7 +1004,7 @@ void DisplayServerWindows::clipboard_set(const String &p_text) {
 	// Otherwise, line endings won't be visible when pasted in other software.
 	String text = p_text.replace("\r\n", "\n").replace("\n", "\r\n"); // Avoid \r\r\n.
 
-	if (!OpenClipboard(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd)) {
+	if (!OpenClipboard(windows[MAIN_WINDOW_ID].hWnd)) {
 		ERR_FAIL_MSG("Unable to open clipboard.");
 	}
 	EmptyClipboard();
@@ -1042,12 +1037,12 @@ void DisplayServerWindows::clipboard_set(const String &p_text) {
 String DisplayServerWindows::clipboard_get() const {
 	_THREAD_SAFE_METHOD_
 
-	if (!windows.has(DisplayServerEnums::MAIN_WINDOW_ID)) {
+	if (!windows.has(MAIN_WINDOW_ID)) {
 		return String();
 	}
 
 	String ret;
-	if (!OpenClipboard(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd)) {
+	if (!OpenClipboard(windows[MAIN_WINDOW_ID].hWnd)) {
 		ERR_FAIL_V_MSG("", "Unable to open clipboard.");
 	}
 
@@ -1196,24 +1191,6 @@ static BOOL CALLBACK _MonitorEnumProcCount(HMONITOR hMonitor, HDC hdcMonitor, LP
 	return TRUE;
 }
 
-static BOOL CALLBACK _MonitorEnumProcMonitor(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) {
-	EnumScreenData *data = (EnumScreenData *)dwData;
-
-	if (data->screen == data->count) {
-		data->monitor = hMonitor;
-		return FALSE;
-	}
-
-	data->count++;
-	return TRUE;
-}
-
-static HMONITOR _get_hmonitor_of_screen(int p_screen) {
-	EnumScreenData data = { 0, p_screen, nullptr };
-	EnumDisplayMonitors(nullptr, nullptr, _MonitorEnumProcMonitor, (LPARAM)&data);
-	return data.monitor;
-}
-
 int DisplayServerWindows::get_screen_count() const {
 	_THREAD_SAFE_METHOD_
 
@@ -1544,11 +1521,11 @@ Ref<Image> DisplayServerWindows::screen_get_image_rect(const Rect2i &p_rect) con
 	POINT p2;
 	p2.x = pos.x + size.x;
 	p2.y = pos.y + size.y;
-	LogicalToPhysicalPointForPerMonitorDPI(nullptr, &p1);
-	LogicalToPhysicalPointForPerMonitorDPI(nullptr, &p2);
+	LogicalToPhysicalPointForPerMonitorDPI(0, &p1);
+	LogicalToPhysicalPointForPerMonitorDPI(0, &p2);
 
 	Ref<Image> img;
-	HDC dc = GetDC(nullptr);
+	HDC dc = GetDC(0);
 	if (dc) {
 		HDC hdc = CreateCompatibleDC(dc);
 		int width = p2.x - p1.x;
@@ -1581,107 +1558,12 @@ Ref<Image> DisplayServerWindows::screen_get_image_rect(const Rect2i &p_rect) con
 			}
 			DeleteDC(hdc);
 		}
-		ReleaseDC(nullptr, dc);
+		ReleaseDC(NULL, dc);
 	}
 
 	return img;
 }
 
-#ifdef D3D12_ENABLED
-static bool _get_monitor_desc(HMONITOR p_monitor, IDXGIFactory2 *dxgi_factory, DXGI_OUTPUT_DESC1 &r_Desc) {
-	r_Desc = {};
-
-	// Note: As of August, 2025 Microsoft's sample code only checks the default
-	// adapter, but sometimes p_monitor may belong to another adapter.
-	Microsoft::WRL::ComPtr<IDXGIAdapter1> dxgiAdapter;
-	UINT adapter_i = 0;
-	while (dxgi_factory->EnumAdapters1(adapter_i, &dxgiAdapter) == S_OK) {
-		Microsoft::WRL::ComPtr<IDXGIOutput> dxgiOutput;
-		DXGI_OUTPUT_DESC1 desc1;
-		UINT output_i = 0;
-		while (dxgiAdapter->EnumOutputs(output_i, &dxgiOutput) != DXGI_ERROR_NOT_FOUND) {
-			Microsoft::WRL::ComPtr<IDXGIOutput6> output6;
-			if (FAILED(dxgiOutput.As(&output6))) {
-				continue;
-			}
-
-			if (FAILED(output6->GetDesc1(&desc1))) {
-				continue;
-			}
-
-			if (desc1.Monitor == p_monitor) {
-				r_Desc = desc1;
-				return true;
-			}
-
-			output_i++;
-		}
-		adapter_i++;
-	}
-
-	return false;
-}
-#endif // D3D12_ENABLED
-
-// Store a list of displays that have failed to get their SDR white level so we don't spam the error log.
-static HashSet<Vector3i> displays_with_white_level_error;
-
-static float _get_sdr_white_level_for_hmonitor(HMONITOR p_monitor, const LocalVector<DISPLAYCONFIG_PATH_INFO> &p_paths) {
-	if (!p_monitor) {
-		return 0.0f;
-	}
-
-	MONITORINFOEXW minfo;
-	memset(&minfo, 0, sizeof(minfo));
-	minfo.cbSize = sizeof(minfo);
-	if (!GetMonitorInfoW(p_monitor, &minfo)) {
-		ERR_FAIL_V_MSG(0.0f, vformat("Failed to get monitor info for HMONITOR: 0x%X", (intptr_t)p_monitor));
-	}
-
-	for (const DISPLAYCONFIG_PATH_INFO &path : p_paths) {
-		const Vector3i key = Vector3i((int32_t)path.sourceInfo.adapterId.HighPart, (int32_t)path.sourceInfo.adapterId.LowPart, (int32_t)path.sourceInfo.id);
-
-		DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name;
-		memset(&source_name, 0, sizeof(source_name));
-		source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME;
-		source_name.header.size = sizeof(source_name);
-		source_name.header.adapterId = path.sourceInfo.adapterId;
-		source_name.header.id = path.sourceInfo.id;
-
-		if (DisplayConfigGetDeviceInfo(&source_name.header) != ERROR_SUCCESS) {
-			if (!displays_with_white_level_error.has(key)) {
-				WARN_PRINT(vformat("Failed to get source name for adapterId: 0x%08X%08X, id: %d", (uint32_t)path.sourceInfo.adapterId.HighPart, (uint32_t)path.sourceInfo.adapterId.LowPart, path.sourceInfo.id));
-				displays_with_white_level_error.insert(key);
-			}
-			continue;
-		}
-
-		if (wcscmp(minfo.szDevice, source_name.viewGdiDeviceName) != 0) {
-			continue;
-		}
-
-		// Query the SDR white level.
-		DISPLAYCONFIG_SDR_WHITE_LEVEL sdr_white_level;
-		memset(&sdr_white_level, 0, sizeof(sdr_white_level));
-		sdr_white_level.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL;
-		sdr_white_level.header.size = sizeof(sdr_white_level);
-		sdr_white_level.header.adapterId = path.targetInfo.adapterId;
-		sdr_white_level.header.id = path.targetInfo.id;
-
-		if (DisplayConfigGetDeviceInfo(&sdr_white_level.header) != ERROR_SUCCESS) {
-			if (!displays_with_white_level_error.has(key)) {
-				WARN_PRINT(vformat("Failed to get SDR white level for adapterId: 0x%08X%08X, id: %d", (uint32_t)path.targetInfo.adapterId.HighPart, (uint32_t)path.targetInfo.adapterId.LowPart, path.targetInfo.id));
-				displays_with_white_level_error.insert(key);
-			}
-			continue;
-		}
-
-		return (float)sdr_white_level.SDRWhiteLevel / 1000.0f * 80.0f;
-	}
-
-	return 0.0f;
-}
-
 float DisplayServerWindows::screen_get_refresh_rate(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
@@ -1745,32 +1627,32 @@ bool DisplayServerWindows::screen_is_kept_on() const {
 	return keep_screen_on;
 }
 
-Vector<DisplayServerEnums::WindowID> DisplayServerWindows::get_window_list() const {
+Vector<DisplayServer::WindowID> DisplayServerWindows::get_window_list() const {
 	_THREAD_SAFE_METHOD_
 
-	Vector<DisplayServerEnums::WindowID> ret;
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	Vector<DisplayServer::WindowID> ret;
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		ret.push_back(E.key);
 	}
 	return ret;
 }
 
-DisplayServerEnums::WindowID DisplayServerWindows::get_window_at_screen_position(const Point2i &p_position) const {
+DisplayServer::WindowID DisplayServerWindows::get_window_at_screen_position(const Point2i &p_position) const {
 	Point2i offset = _get_screens_origin();
 	POINT p;
 	p.x = p_position.x + offset.x;
 	p.y = p_position.y + offset.y;
 	HWND hwnd = WindowFromPoint(p);
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (E.value.hWnd == hwnd) {
 			return E.key;
 		}
 	}
 
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+	return INVALID_WINDOW_ID;
 }
 
-DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent) {
+DisplayServer::WindowID DisplayServerWindows::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
 	_THREAD_SAFE_METHOD_
 
 	bool no_redirection_bitmap = false;
@@ -1778,9 +1660,9 @@ DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServ
 	no_redirection_bitmap = OS::get_singleton()->is_layered_allowed() && rendering_driver == "d3d12";
 #endif
 
-	DisplayServerEnums::WindowID window_id = window_id_counter;
-	Error err = _create_window(window_id, p_mode, p_flags, p_rect, p_exclusive, p_transient_parent, nullptr, no_redirection_bitmap);
-	ERR_FAIL_COND_V_MSG(err != OK, DisplayServerEnums::INVALID_WINDOW_ID, "Failed to create sub window.");
+	WindowID window_id = window_id_counter;
+	Error err = _create_window(window_id, p_mode, p_flags, p_rect, p_exclusive, p_transient_parent, NULL, no_redirection_bitmap);
+	ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Failed to create sub window.");
 	++window_id_counter;
 
 #ifdef RD_ENABLED
@@ -1796,31 +1678,31 @@ DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServ
 
 	WindowData &wd = windows[window_id];
 
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED_BIT) {
+	if (p_flags & WINDOW_FLAG_RESIZE_DISABLED_BIT) {
 		wd.resizable = false;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED_BIT) {
+	if (p_flags & WINDOW_FLAG_MINIMIZE_DISABLED_BIT) {
 		wd.no_min_btn = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED_BIT) {
+	if (p_flags & WINDOW_FLAG_MAXIMIZE_DISABLED_BIT) {
 		wd.no_max_btn = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT) {
+	if (p_flags & WINDOW_FLAG_BORDERLESS_BIT) {
 		wd.borderless = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP_BIT && p_mode != DisplayServerEnums::WINDOW_MODE_FULLSCREEN && p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (p_flags & WINDOW_FLAG_ALWAYS_ON_TOP_BIT && p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		wd.always_on_top = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS_BIT) {
+	if (p_flags & WINDOW_FLAG_SHARP_CORNERS_BIT) {
 		wd.sharp_corners = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_NO_FOCUS_BIT) {
+	if (p_flags & WINDOW_FLAG_NO_FOCUS_BIT) {
 		wd.no_focus = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH_BIT) {
+	if (p_flags & WINDOW_FLAG_MOUSE_PASSTHROUGH_BIT) {
 		wd.mpass = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE_BIT) {
+	if (p_flags & WINDOW_FLAG_EXCLUDE_FROM_CAPTURE_BIT) {
 		wd.hide_from_capture = true;
 		if (os_ver.dwBuildNumber >= 19041) {
 			SetWindowDisplayAffinity(wd.hWnd, WDA_EXCLUDEFROMCAPTURE);
@@ -1828,10 +1710,10 @@ DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServ
 			SetWindowDisplayAffinity(wd.hWnd, WDA_MONITOR);
 		}
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_POPUP_BIT) {
+	if (p_flags & WINDOW_FLAG_POPUP_BIT) {
 		wd.is_popup = true;
 	}
-	if (p_flags & DisplayServerEnums::WINDOW_FLAG_TRANSPARENT_BIT) {
+	if (p_flags & WINDOW_FLAG_TRANSPARENT_BIT) {
 		if (OS::get_singleton()->is_layered_allowed()) {
 			DWM_BLURBEHIND bb;
 			ZeroMemory(&bb, sizeof(bb));
@@ -1846,11 +1728,11 @@ DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServ
 	}
 
 	// Inherit icons from MAIN_WINDOW for all sub windows.
-	HICON mainwindow_icon = (HICON)SendMessage(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_SMALL, 0);
+	HICON mainwindow_icon = (HICON)SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_SMALL, 0);
 	if (mainwindow_icon) {
 		SendMessage(windows[window_id].hWnd, WM_SETICON, ICON_SMALL, (LPARAM)mainwindow_icon);
 	}
-	mainwindow_icon = (HICON)SendMessage(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_BIG, 0);
+	mainwindow_icon = (HICON)SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_BIG, 0);
 	if (mainwindow_icon) {
 		SendMessage(windows[window_id].hWnd, WM_SETICON, ICON_BIG, (LPARAM)mainwindow_icon);
 	}
@@ -1862,7 +1744,7 @@ DisplayServerEnums::WindowID DisplayServerWindows::create_sub_window(DisplayServ
 	return window_id;
 }
 
-bool DisplayServerWindows::_is_always_on_top_recursive(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWindows::_is_always_on_top_recursive(WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 
 	const WindowData &wd = windows[p_window];
@@ -1870,20 +1752,20 @@ bool DisplayServerWindows::_is_always_on_top_recursive(DisplayServerEnums::Windo
 		return true;
 	}
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (wd.transient_parent != INVALID_WINDOW_ID) {
 		return _is_always_on_top_recursive(wd.transient_parent);
 	}
 
 	return false;
 }
 
-void DisplayServerWindows::show_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServerWindows::show_window(WindowID p_id) {
 	ERR_FAIL_COND(!windows.has(p_id));
 
 	WindowData &wd = windows[p_id];
 	popup_open(p_id);
 
-	if (p_id != DisplayServerEnums::MAIN_WINDOW_ID) {
+	if (p_id != MAIN_WINDOW_ID) {
 		_update_window_style(p_id);
 	}
 	wd.initialized = true;
@@ -1910,30 +1792,22 @@ void DisplayServerWindows::show_window(DisplayServerEnums::WindowID p_id) {
 	}
 }
 
-void DisplayServerWindows::delete_sub_window(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::delete_sub_window(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
-	ERR_FAIL_COND_MSG(p_window == DisplayServerEnums::MAIN_WINDOW_ID, "Main window cannot be deleted.");
+	ERR_FAIL_COND_MSG(p_window == MAIN_WINDOW_ID, "Main window cannot be deleted.");
 
 	popup_close(p_window);
 
 	WindowData &wd = windows[p_window];
 
 	while (wd.transient_children.size()) {
-		DisplayServerEnums::WindowID wid = *wd.transient_children.begin();
-		if (windows.has(wid)) {
-			WindowData &wd_window = windows[wid];
-			wd_window.transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
-			if (wd_window.exclusive) {
-				SetWindowLongPtr(wd_window.hWnd, GWLP_HWNDPARENT, (LONG_PTR) nullptr);
-			}
-		}
-		wd.transient_children.erase(wid);
+		window_set_transient(*wd.transient_children.begin(), INVALID_WINDOW_ID);
 	}
 
-	if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
-		window_set_transient(p_window, DisplayServerEnums::INVALID_WINDOW_ID);
+	if (wd.transient_parent != INVALID_WINDOW_ID) {
+		window_set_transient(p_window, INVALID_WINDOW_ID);
 	}
 
 #ifdef RD_ENABLED
@@ -1946,11 +1820,9 @@ void DisplayServerWindows::delete_sub_window(DisplayServerEnums::WindowID p_wind
 	}
 #endif
 #ifdef GLES3_ENABLED
-#ifdef ANGLE_ENABLED
 	if (gl_manager_angle) {
 		gl_manager_angle->window_destroy(p_window);
 	}
-#endif
 	if (gl_manager_native) {
 		gl_manager_native->window_destroy(p_window);
 	}
@@ -1959,65 +1831,57 @@ void DisplayServerWindows::delete_sub_window(DisplayServerEnums::WindowID p_wind
 	_destroy_window(p_window);
 
 	if (last_focused_window == p_window) {
-		last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
+		last_focused_window = INVALID_WINDOW_ID;
 	}
 }
 
-void DisplayServerWindows::gl_window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWindows::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->window_make_current(p_window_id);
 	}
-#endif
 	if (gl_manager_native) {
 		gl_manager_native->window_make_current(p_window_id);
 	}
 #endif
 }
 
-int64_t DisplayServerWindows::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
+int64_t DisplayServerWindows::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	ERR_FAIL_COND_V(!windows.has(p_window), 0);
 	switch (p_handle_type) {
-		case DisplayServerEnums::DISPLAY_HANDLE: {
+		case DISPLAY_HANDLE: {
 			return 0; // Not supported.
 		}
-		case DisplayServerEnums::WINDOW_HANDLE: {
+		case WINDOW_HANDLE: {
 			return (int64_t)windows[p_window].hWnd;
 		}
 #if defined(GLES3_ENABLED)
-		case DisplayServerEnums::WINDOW_VIEW: {
+		case WINDOW_VIEW: {
 			if (gl_manager_native) {
 				return (int64_t)gl_manager_native->get_hdc(p_window);
 			} else {
 				return (int64_t)GetDC(windows[p_window].hWnd);
 			}
 		}
-		case DisplayServerEnums::OPENGL_CONTEXT: {
+		case OPENGL_CONTEXT: {
 			if (gl_manager_native) {
 				return (int64_t)gl_manager_native->get_hglrc(p_window);
 			}
-#if defined(ANGLE_ENABLED)
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_context(p_window);
 			}
-#endif
 			return 0;
 		}
-		case DisplayServerEnums::EGL_DISPLAY: {
-#if defined(ANGLE_ENABLED)
+		case EGL_DISPLAY: {
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_display(p_window);
 			}
-#endif
 			return 0;
 		}
-		case DisplayServerEnums::EGL_CONFIG: {
-#if defined(ANGLE_ENABLED)
+		case EGL_CONFIG: {
 			if (gl_manager_angle) {
 				return (int64_t)gl_manager_angle->get_config(p_window);
 			}
-#endif
 			return 0;
 		}
 #endif
@@ -2027,49 +1891,49 @@ int64_t DisplayServerWindows::window_get_native_handle(DisplayServerEnums::Handl
 	}
 }
 
-void DisplayServerWindows::window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].instance_id = p_instance;
 }
 
-ObjectID DisplayServerWindows::window_get_attached_instance_id(DisplayServerEnums::WindowID p_window) const {
+ObjectID DisplayServerWindows::window_get_attached_instance_id(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), ObjectID());
 	return windows[p_window].instance_id;
 }
 
-void DisplayServerWindows::window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].rect_changed_callback = p_callable;
 }
 
-void DisplayServerWindows::window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_window_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].event_callback = p_callable;
 }
 
-void DisplayServerWindows::window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_input_event_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].input_event_callback = p_callable;
 }
 
-void DisplayServerWindows::window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_input_text_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	windows[p_window].input_text_callback = p_callable;
 }
 
-void DisplayServerWindows::window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_drop_files_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2083,14 +1947,14 @@ void DisplayServerWindows::window_set_drop_files_callback(const Callable &p_call
 	}
 }
 
-void DisplayServerWindows::window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_title(const String &p_title, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	SetWindowTextW(windows[p_window].hWnd, (LPCWSTR)(p_title.utf16().get_data()));
 }
 
-Size2i DisplayServerWindows::window_get_title_size(const String &p_title, DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWindows::window_get_title_size(const String &p_title, WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	Size2i size;
@@ -2125,7 +1989,7 @@ Size2i DisplayServerWindows::window_get_title_size(const String &p_title, Displa
 			size.y = MAX(size.y, rect.bottom - rect.top);
 		}
 	}
-	if (wd.icon_big || wd.icon_small) {
+	if (icon_big) {
 		size.x += 32;
 	} else {
 		size.x += 16;
@@ -2133,7 +1997,7 @@ Size2i DisplayServerWindows::window_get_title_size(const String &p_title, Displa
 	return size;
 }
 
-void DisplayServerWindows::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2141,7 +2005,7 @@ void DisplayServerWindows::window_set_mouse_passthrough(const Vector<Vector2> &p
 	_update_window_mouse_passthrough(p_window);
 }
 
-void DisplayServerWindows::_update_window_mouse_passthrough(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::_update_window_mouse_passthrough(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 
 	const WindowData &wd = windows[p_window];
@@ -2177,17 +2041,17 @@ void DisplayServerWindows::_update_window_mouse_passthrough(DisplayServerEnums::
 	}
 }
 
-int DisplayServerWindows::window_get_current_screen(DisplayServerEnums::WindowID p_window) const {
+int DisplayServerWindows::window_get_current_screen(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::INVALID_SCREEN);
+	ERR_FAIL_COND_V(!windows.has(p_window), INVALID_SCREEN);
 
 	EnumScreenData data = { 0, 0, MonitorFromWindow(windows[p_window].hWnd, MONITOR_DEFAULTTONEAREST) };
 	EnumDisplayMonitors(nullptr, nullptr, _MonitorEnumProcScreen, (LPARAM)&data);
 	return data.screen;
 }
 
-void DisplayServerWindows::window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_current_screen(int p_screen, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2230,7 +2094,7 @@ void DisplayServerWindows::window_set_current_screen(int p_screen, DisplayServer
 	}
 }
 
-Point2i DisplayServerWindows::window_get_position(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerWindows::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
@@ -2249,7 +2113,7 @@ Point2i DisplayServerWindows::window_get_position(DisplayServerEnums::WindowID p
 	return Point2i(point.x, point.y) - _get_screens_origin();
 }
 
-Point2i DisplayServerWindows::window_get_position_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Point2i DisplayServerWindows::window_get_position_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
@@ -2267,7 +2131,7 @@ Point2i DisplayServerWindows::window_get_position_with_decorations(DisplayServer
 	return Point2i();
 }
 
-void DisplayServerWindows::_update_real_mouse_position(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::_update_real_mouse_position(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
 
 	POINT mouse_pos;
@@ -2281,7 +2145,7 @@ void DisplayServerWindows::_update_real_mouse_position(DisplayServerEnums::Windo
 	}
 }
 
-void DisplayServerWindows::window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_position(const Point2i &p_position, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2314,13 +2178,13 @@ void DisplayServerWindows::window_set_position(const Point2i &p_position, Displa
 	_update_real_mouse_position(p_window);
 }
 
-void DisplayServerWindows::window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive) {
+void DisplayServerWindows::window_set_exclusive(WindowID p_window, bool p_exclusive) {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	if (wd.exclusive != p_exclusive) {
 		wd.exclusive = p_exclusive;
-		if (wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (wd.transient_parent != INVALID_WINDOW_ID) {
 			if (wd.exclusive) {
 				WindowData &wd_parent = windows[wd.transient_parent];
 				SetWindowLongPtr(wd.hWnd, GWLP_HWNDPARENT, (LONG_PTR)wd_parent.hWnd);
@@ -2331,7 +2195,7 @@ void DisplayServerWindows::window_set_exclusive(DisplayServerEnums::WindowID p_w
 	}
 }
 
-void DisplayServerWindows::window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) {
+void DisplayServerWindows::window_set_transient(WindowID p_window, WindowID p_parent) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(p_window == p_parent);
@@ -2342,15 +2206,15 @@ void DisplayServerWindows::window_set_transient(DisplayServerEnums::WindowID p_w
 	ERR_FAIL_COND(wd_window.transient_parent == p_parent);
 	ERR_FAIL_COND_MSG(wd_window.always_on_top, "Windows with the 'on top' can't become transient.");
 
-	if (p_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_parent == INVALID_WINDOW_ID) {
 		// Remove transient.
 
-		ERR_FAIL_COND(wd_window.transient_parent == DisplayServerEnums::INVALID_WINDOW_ID);
+		ERR_FAIL_COND(wd_window.transient_parent == INVALID_WINDOW_ID);
 		ERR_FAIL_COND(!windows.has(wd_window.transient_parent));
 
 		WindowData &wd_parent = windows[wd_window.transient_parent];
 
-		wd_window.transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
+		wd_window.transient_parent = INVALID_WINDOW_ID;
 		wd_parent.transient_children.erase(p_window);
 
 		if (wd_window.exclusive) {
@@ -2358,7 +2222,7 @@ void DisplayServerWindows::window_set_transient(DisplayServerEnums::WindowID p_w
 		}
 	} else {
 		ERR_FAIL_COND(!windows.has(p_parent));
-		ERR_FAIL_COND_MSG(wd_window.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID, "Window already has a transient parent");
+		ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
 		WindowData &wd_parent = windows[p_parent];
 
 		wd_window.transient_parent = p_parent;
@@ -2370,7 +2234,7 @@ void DisplayServerWindows::window_set_transient(DisplayServerEnums::WindowID p_w
 	}
 }
 
-void DisplayServerWindows::window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_max_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2388,7 +2252,7 @@ void DisplayServerWindows::window_set_max_size(const Size2i p_size, DisplayServe
 	wd.max_size = p_size;
 }
 
-Size2i DisplayServerWindows::window_get_max_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWindows::window_get_max_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2396,7 +2260,7 @@ Size2i DisplayServerWindows::window_get_max_size(DisplayServerEnums::WindowID p_
 	return wd.max_size;
 }
 
-void DisplayServerWindows::window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_min_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2414,7 +2278,7 @@ void DisplayServerWindows::window_set_min_size(const Size2i p_size, DisplayServe
 	wd.min_size = p_size;
 }
 
-Size2i DisplayServerWindows::window_get_min_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWindows::window_get_min_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2422,7 +2286,7 @@ Size2i DisplayServerWindows::window_get_min_size(DisplayServerEnums::WindowID p_
 	return wd.min_size;
 }
 
-void DisplayServerWindows::window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_size(const Size2i p_size, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2453,7 +2317,7 @@ void DisplayServerWindows::window_set_size(const Size2i p_size, DisplayServerEnu
 	MoveWindow(wd.hWnd, rect.left, rect.top, w, h, TRUE);
 }
 
-Size2i DisplayServerWindows::window_get_size(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWindows::window_get_size(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2472,7 +2336,7 @@ Size2i DisplayServerWindows::window_get_size(DisplayServerEnums::WindowID p_wind
 	return Size2();
 }
 
-Size2i DisplayServerWindows::window_get_size_with_decorations(DisplayServerEnums::WindowID p_window) const {
+Size2i DisplayServerWindows::window_get_size_with_decorations(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Size2i());
@@ -2573,7 +2437,7 @@ void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_initiali
 	}
 }
 
-void DisplayServerWindows::_update_window_style(DisplayServerEnums::WindowID p_window, bool p_repaint) {
+void DisplayServerWindows::_update_window_style(WindowID p_window, bool p_repaint) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2582,31 +2446,20 @@ void DisplayServerWindows::_update_window_style(DisplayServerEnums::WindowID p_w
 	DWORD style = 0;
 	DWORD style_ex = 0;
 
-	_get_window_style(p_window == DisplayServerEnums::MAIN_WINDOW_ID, wd.initialized, wd.fullscreen, wd.multiwindow_fs, wd.borderless, wd.resizable, wd.no_min_btn, wd.no_max_btn, wd.minimized, wd.maximized, wd.maximized_fs, wd.no_focus || wd.is_popup, wd.parent_hwnd, wd.no_redirection_bitmap, style, style_ex);
+	_get_window_style(p_window == MAIN_WINDOW_ID, wd.initialized, wd.fullscreen, wd.multiwindow_fs, wd.borderless, wd.resizable, wd.no_min_btn, wd.no_max_btn, wd.minimized, wd.maximized, wd.maximized_fs, wd.no_focus || wd.is_popup, wd.parent_hwnd, wd.no_redirection_bitmap, style, style_ex);
 
 	SetWindowLongPtr(wd.hWnd, GWL_STYLE, style);
 	SetWindowLongPtr(wd.hWnd, GWL_EXSTYLE, style_ex);
 
-	if (wd.icon_set) {
-		if (wd.icon_big && !wd.icon_small) {
-			SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-			SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_big);
-		} else {
-			if (wd.icon_big) {
-				SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-			}
-			if (wd.icon_small) {
-				SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_small);
-			}
+	if (icon_big && !icon_small) {
+		SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
+		SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_big);
+	} else {
+		if (icon_big) {
+			SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
 		}
-	} else if (p_window != DisplayServerEnums::MAIN_WINDOW_ID) {
-		HICON mainwindow_icon = (HICON)SendMessage(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_SMALL, 0);
-		if (mainwindow_icon) {
-			SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)mainwindow_icon);
-		}
-		mainwindow_icon = (HICON)SendMessage(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_BIG, 0);
-		if (mainwindow_icon) {
-			SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)mainwindow_icon);
+		if (icon_small) {
+			SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small);
 		}
 	}
 
@@ -2620,13 +2473,13 @@ void DisplayServerWindows::_update_window_style(DisplayServerEnums::WindowID p_w
 	}
 }
 
-void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
-	if (p_mode != DisplayServerEnums::WINDOW_MODE_WINDOWED && wd.parent_hwnd) {
+	if (p_mode != WINDOW_MODE_WINDOWED && wd.parent_hwnd) {
 		print_line("Embedded window only supports Windowed mode.");
 		return;
 	}
@@ -2634,16 +2487,16 @@ void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode
 	bool was_fullscreen = wd.fullscreen;
 	wd.was_fullscreen_pre_min = false;
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED && wd.borderless) {
+	if (p_mode == WINDOW_MODE_MAXIMIZED && wd.borderless) {
 		int cs = window_get_current_screen(p_window);
 		Rect2i full = Rect2i(screen_get_position(cs), screen_get_size(cs));
 		Rect2i usable = screen_get_usable_rect(cs);
 		if (full == usable) {
-			p_mode = DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+			p_mode = WINDOW_MODE_FULLSCREEN;
 		}
 	}
 
-	if (wd.fullscreen && p_mode != DisplayServerEnums::WINDOW_MODE_FULLSCREEN && p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (wd.fullscreen && p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		RECT rect;
 
 		wd.fullscreen = false;
@@ -2673,7 +2526,7 @@ void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode
 		}
 	}
 
-	if ((wd.maximized || wd.was_maximized_pre_fs) && wd.borderless && p_mode != DisplayServerEnums::WINDOW_MODE_MINIMIZED && p_mode != DisplayServerEnums::WINDOW_MODE_FULLSCREEN && p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if ((wd.maximized || wd.was_maximized_pre_fs) && wd.borderless && p_mode != WINDOW_MODE_MINIMIZED && p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		RECT rect;
 		if (wd.pre_fs_valid) {
 			rect = wd.pre_fs_rect;
@@ -2688,19 +2541,19 @@ void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode
 		MoveWindow(wd.hWnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, TRUE);
 	}
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_WINDOWED) {
+	if (p_mode == WINDOW_MODE_WINDOWED) {
 		ShowWindow(wd.hWnd, SW_NORMAL);
 		wd.maximized = false;
 		wd.minimized = false;
 	}
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED && !wd.borderless) {
+	if (p_mode == WINDOW_MODE_MAXIMIZED && !wd.borderless) {
 		ShowWindow(wd.hWnd, SW_MAXIMIZE);
 		wd.maximized = true;
 		wd.minimized = false;
 	}
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED && wd.borderless) {
+	if (p_mode == WINDOW_MODE_MAXIMIZED && wd.borderless) {
 		if (!was_fullscreen && !(wd.maximized && wd.borderless)) {
 			// Save non-fullscreen rect before entering fullscreen.
 			GetWindowRect(wd.hWnd, &wd.pre_fs_rect);
@@ -2717,21 +2570,21 @@ void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode
 		MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
 	}
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_MINIMIZED) {
+	if (p_mode == WINDOW_MODE_MINIMIZED) {
 		ShowWindow(wd.hWnd, SW_MINIMIZE);
 		wd.maximized = false;
 		wd.minimized = true;
 		wd.was_fullscreen_pre_min = was_fullscreen;
 	}
 
-	if (p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		wd.multiwindow_fs = false;
-	} else if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN) {
+	} else if (p_mode == WINDOW_MODE_FULLSCREEN) {
 		wd.multiwindow_fs = true;
 	}
 	_update_window_style(p_window, false);
 
-	if ((p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) && !wd.fullscreen) {
+	if ((p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) && !wd.fullscreen) {
 		if (wd.minimized || wd.maximized) {
 			ShowWindow(wd.hWnd, SW_RESTORE);
 		}
@@ -2768,28 +2621,28 @@ void DisplayServerWindows::window_set_mode(DisplayServerEnums::WindowMode p_mode
 	_update_window_mouse_passthrough(p_window);
 }
 
-DisplayServerEnums::WindowMode DisplayServerWindows::window_get_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::WindowMode DisplayServerWindows::window_get_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND_V(!windows.has(p_window), DisplayServerEnums::WINDOW_MODE_WINDOWED);
+	ERR_FAIL_COND_V(!windows.has(p_window), WINDOW_MODE_WINDOWED);
 	const WindowData &wd = windows[p_window];
 
 	if (wd.fullscreen) {
 		if (wd.multiwindow_fs) {
-			return DisplayServerEnums::WINDOW_MODE_FULLSCREEN;
+			return WINDOW_MODE_FULLSCREEN;
 		} else {
-			return DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
+			return WINDOW_MODE_EXCLUSIVE_FULLSCREEN;
 		}
 	} else if (wd.minimized) {
-		return DisplayServerEnums::WINDOW_MODE_MINIMIZED;
+		return WINDOW_MODE_MINIMIZED;
 	} else if (wd.maximized) {
-		return DisplayServerEnums::WINDOW_MODE_MAXIMIZED;
+		return WINDOW_MODE_MAXIMIZED;
 	} else {
-		return DisplayServerEnums::WINDOW_MODE_WINDOWED;
+		return WINDOW_MODE_WINDOWED;
 	}
 }
 
-bool DisplayServerWindows::window_is_maximize_allowed(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWindows::window_is_maximize_allowed(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
@@ -2799,21 +2652,21 @@ bool DisplayServerWindows::window_is_maximize_allowed(DisplayServerEnums::Window
 	return (style & WS_MAXIMIZEBOX) == WS_MAXIMIZEBOX;
 }
 
-void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			wd.no_min_btn = p_enabled;
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			wd.no_max_btn = p_enabled;
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			if (p_enabled && wd.parent_hwnd) {
 				print_line("Embedded window resize can't be disabled.");
 				return;
@@ -2821,7 +2674,7 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 			wd.resizable = !p_enabled;
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			wd.borderless = p_enabled;
 			if (wd.fullscreen) {
 				return;
@@ -2830,8 +2683,8 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 			_update_window_style(p_window);
 			ShowWindow(wd.hWnd, (wd.no_focus || wd.is_popup) ? SW_SHOWNOACTIVATE : SW_SHOW); // Show the window.
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
-			ERR_FAIL_COND_MSG(wd.transient_parent != DisplayServerEnums::INVALID_WINDOW_ID && p_enabled, "Transient windows can't become on top.");
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
+			ERR_FAIL_COND_MSG(wd.transient_parent != INVALID_WINDOW_ID && p_enabled, "Transient windows can't become on top.");
 			if (p_enabled && wd.parent_hwnd) {
 				print_line("Embedded window can't become on top.");
 				return;
@@ -2839,13 +2692,13 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 			wd.always_on_top = p_enabled;
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS: {
+		case WINDOW_FLAG_SHARP_CORNERS: {
 			wd.sharp_corners = p_enabled;
 			DWORD value = wd.sharp_corners ? DWMWCP_DONOTROUND : DWMWCP_DEFAULT;
 			::DwmSetWindowAttribute(wd.hWnd, DWMWA_WINDOW_CORNER_PREFERENCE, &value, sizeof(value));
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			if (p_enabled) {
 				// Enable per-pixel alpha.
 				if (OS::get_singleton()->is_layered_allowed()) {
@@ -2872,14 +2725,14 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 				}
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			wd.no_focus = p_enabled;
 			_update_window_style(p_window);
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			wd.mpass = p_enabled;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
+		case WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
 			wd.hide_from_capture = p_enabled;
 			if (p_enabled) {
 				if (os_ver.dwBuildNumber >= 19041) {
@@ -2891,8 +2744,8 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 				SetWindowDisplayAffinity(wd.hWnd, WDA_NONE);
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
-			ERR_FAIL_COND_MSG(p_window == DisplayServerEnums::MAIN_WINDOW_ID, "Main window can't be popup.");
+		case WINDOW_FLAG_POPUP: {
+			ERR_FAIL_COND_MSG(p_window == MAIN_WINDOW_ID, "Main window can't be popup.");
 			ERR_FAIL_COND_MSG(IsWindowVisible(wd.hWnd) && (wd.is_popup != p_enabled), "Popup flag can't changed while window is opened.");
 			if (p_enabled && wd.parent_hwnd) {
 				print_line("Embedded window can't be popup.");
@@ -2905,43 +2758,43 @@ void DisplayServerWindows::window_set_flag(DisplayServerEnums::WindowFlags p_fla
 	}
 }
 
-bool DisplayServerWindows::window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWindows::window_get_flag(WindowFlags p_flag, WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 	switch (p_flag) {
-		case DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED: {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
 			return wd.no_max_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED: {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
 			return wd.no_min_btn;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED: {
+		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return !wd.resizable;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_BORDERLESS: {
+		case WINDOW_FLAG_BORDERLESS: {
 			return wd.borderless;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP: {
+		case WINDOW_FLAG_ALWAYS_ON_TOP: {
 			return wd.always_on_top;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS: {
+		case WINDOW_FLAG_SHARP_CORNERS: {
 			return wd.sharp_corners;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_TRANSPARENT: {
+		case WINDOW_FLAG_TRANSPARENT: {
 			return wd.layered_window;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_NO_FOCUS: {
+		case WINDOW_FLAG_NO_FOCUS: {
 			return wd.no_focus;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH: {
+		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			return wd.mpass;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
+		case WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
 			return wd.hide_from_capture;
 		} break;
-		case DisplayServerEnums::WINDOW_FLAG_POPUP: {
+		case WINDOW_FLAG_POPUP: {
 			return wd.is_popup;
 		} break;
 		default:
@@ -2951,7 +2804,7 @@ bool DisplayServerWindows::window_get_flag(DisplayServerEnums::WindowFlags p_fla
 	return false;
 }
 
-void DisplayServerWindows::window_request_attention(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_request_attention(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -2966,70 +2819,7 @@ void DisplayServerWindows::window_request_attention(DisplayServerEnums::WindowID
 	FlashWindowEx(&info);
 }
 
-void DisplayServerWindows::window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-	wd.progress_value = p_value;
-	if (wd.progress_state == DisplayServerEnums::PROGRESS_STATE_NOPROGRESS) {
-		return;
-	}
-	if (taskbar == nullptr) {
-		if (CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&taskbar) != S_OK) {
-			taskbar = nullptr;
-			return;
-		} else {
-			taskbar->HrInit();
-		}
-	}
-
-	taskbar->SetProgressValue(wd.hWnd, Math::round(p_value * 100000), 100000);
-}
-
-void DisplayServerWindows::window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-	wd.progress_state = p_state;
-	if (taskbar == nullptr) {
-		if (CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&taskbar) != S_OK) {
-			taskbar = nullptr;
-			return;
-		} else {
-			taskbar->HrInit();
-		}
-	}
-
-	TBPFLAG tbpf = TBPF_NOPROGRESS;
-	switch (p_state) {
-		case DisplayServerEnums::PROGRESS_STATE_NOPROGRESS:
-			tbpf = TBPF_NOPROGRESS;
-			break;
-		case DisplayServerEnums::PROGRESS_STATE_INDETERMINATE:
-			tbpf = TBPF_INDETERMINATE;
-			break;
-		case DisplayServerEnums::PROGRESS_STATE_ERROR:
-			tbpf = TBPF_ERROR;
-			break;
-		case DisplayServerEnums::PROGRESS_STATE_PAUSED:
-			tbpf = TBPF_PAUSED;
-			break;
-		case DisplayServerEnums::PROGRESS_STATE_NORMAL:
-			tbpf = TBPF_NORMAL;
-			break;
-		default:
-			break;
-	}
-
-	taskbar->SetProgressState(wd.hWnd, tbpf);
-	if (p_state != DisplayServerEnums::PROGRESS_STATE_INDETERMINATE) {
-		taskbar->SetProgressValue(wd.hWnd, Math::round(wd.progress_value * 100000), 100000);
-	}
-}
-
-void DisplayServerWindows::window_move_to_foreground(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_move_to_foreground(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3040,7 +2830,7 @@ void DisplayServerWindows::window_move_to_foreground(DisplayServerEnums::WindowI
 	}
 }
 
-bool DisplayServerWindows::window_is_focused(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWindows::window_is_focused(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
@@ -3049,11 +2839,11 @@ bool DisplayServerWindows::window_is_focused(DisplayServerEnums::WindowID p_wind
 	return wd.window_focused;
 }
 
-DisplayServerEnums::WindowID DisplayServerWindows::get_focused_window() const {
+DisplayServerWindows::WindowID DisplayServerWindows::get_focused_window() const {
 	return last_focused_window;
 }
 
-bool DisplayServerWindows::window_can_draw(DisplayServerEnums::WindowID p_window) const {
+bool DisplayServerWindows::window_can_draw(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
@@ -3064,7 +2854,7 @@ bool DisplayServerWindows::window_can_draw(DisplayServerEnums::WindowID p_window
 bool DisplayServerWindows::can_any_window_draw() const {
 	_THREAD_SAFE_METHOD_
 
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (!E.value.minimized) {
 			return true;
 		}
@@ -3116,7 +2906,7 @@ int DisplayServerWindows::accessibility_screen_reader_active() const {
 Vector2i DisplayServerWindows::ime_get_selection() const {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	DisplayServer::WindowID window_id = _get_focused_window_or_popup();
 	const WindowData &wd = windows[window_id];
 	if (!wd.ime_active) {
 		return Vector2i();
@@ -3148,7 +2938,7 @@ Vector2i DisplayServerWindows::ime_get_selection() const {
 String DisplayServerWindows::ime_get_text() const {
 	_THREAD_SAFE_METHOD_
 
-	DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	DisplayServer::WindowID window_id = _get_focused_window_or_popup();
 	const WindowData &wd = windows[window_id];
 	if (!wd.ime_active) {
 		return String();
@@ -3165,7 +2955,7 @@ String DisplayServerWindows::ime_get_text() const {
 	return ret;
 }
 
-void DisplayServerWindows::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_ime_active(const bool p_active, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3183,7 +2973,7 @@ void DisplayServerWindows::window_set_ime_active(const bool p_active, DisplaySer
 	}
 }
 
-void DisplayServerWindows::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -3204,21 +2994,21 @@ void DisplayServerWindows::window_set_ime_position(const Point2i &p_pos, Display
 	ImmReleaseContext(wd.hWnd, himc);
 }
 
-void DisplayServerWindows::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
+void DisplayServerWindows::cursor_set_shape(CursorShape p_shape) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (cursor_shape == p_shape) {
 		return;
 	}
 
-	if (mouse_mode != DisplayServerEnums::MOUSE_MODE_VISIBLE && mouse_mode != DisplayServerEnums::MOUSE_MODE_CONFINED) {
+	if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
 		cursor_shape = p_shape;
 		return;
 	}
 
-	static const LPCTSTR win_cursors[DisplayServerEnums::CURSOR_MAX] = {
+	static const LPCTSTR win_cursors[CURSOR_MAX] = {
 		IDC_ARROW,
 		IDC_IBEAM,
 		IDC_HAND, // Finger.
@@ -3247,17 +3037,17 @@ void DisplayServerWindows::cursor_set_shape(DisplayServerEnums::CursorShape p_sh
 	cursor_shape = p_shape;
 }
 
-DisplayServerEnums::CursorShape DisplayServerWindows::cursor_get_shape() const {
+DisplayServer::CursorShape DisplayServerWindows::cursor_get_shape() const {
 	return cursor_shape;
 }
 
-void DisplayServerWindows::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+void DisplayServerWindows::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
 
 	if (p_cursor.is_valid()) {
-		RBMap<DisplayServerEnums::CursorShape, Vector<Variant>>::Element *cursor_c = cursors_cache.find(p_shape);
+		RBMap<CursorShape, Vector<Variant>>::Element *cursor_c = cursors_cache.find(p_shape);
 
 		if (cursor_c) {
 			if (cursor_c->get()[0] == p_cursor && cursor_c->get()[1] == p_hotspot) {
@@ -3328,7 +3118,7 @@ void DisplayServerWindows::cursor_set_custom_image(const Ref<Resource> &p_cursor
 		cursors_cache.insert(p_shape, params);
 
 		if (p_shape == cursor_shape) {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_VISIBLE || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED) {
+			if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
 				SetCursor(cursors[p_shape]);
 			}
 		}
@@ -3345,8 +3135,8 @@ void DisplayServerWindows::cursor_set_custom_image(const Ref<Resource> &p_cursor
 
 		cursors_cache.erase(p_shape);
 
-		DisplayServerEnums::CursorShape c = cursor_shape;
-		cursor_shape = DisplayServerEnums::CURSOR_MAX;
+		CursorShape c = cursor_shape;
+		cursor_shape = CURSOR_MAX;
 		cursor_set_shape(c);
 	}
 }
@@ -3355,7 +3145,7 @@ bool DisplayServerWindows::get_swap_cancel_ok() {
 	return true;
 }
 
-void DisplayServerWindows::enable_for_stealing_focus(ProcessID pid) {
+void DisplayServerWindows::enable_for_stealing_focus(OS::ProcessID pid) {
 	_THREAD_SAFE_METHOD_
 
 	AllowSetForegroundWindow(pid);
@@ -3386,9 +3176,9 @@ static BOOL CALLBACK _enum_proc_find_window_from_process_id_callback(HWND hWnd,
 	return TRUE;
 }
 
-HWND DisplayServerWindows::_find_window_from_process_id(ProcessID p_pid, HWND p_current_hwnd) {
+HWND DisplayServerWindows::_find_window_from_process_id(OS::ProcessID p_pid, HWND p_current_hwnd) {
 	DWORD pid = p_pid;
-	WindowEnumData ed = { pid, p_current_hwnd, nullptr };
+	WindowEnumData ed = { pid, p_current_hwnd, NULL };
 
 	// First, check our own child, maybe it's already embedded.
 	if (!EnumChildWindows(p_current_hwnd, _enum_proc_find_window_from_process_id_callback, (LPARAM)&ed) && (GetLastError() == ERROR_SUCCESS)) {
@@ -3402,115 +3192,10 @@ HWND DisplayServerWindows::_find_window_from_process_id(ProcessID p_pid, HWND p_
 		return ed.hWnd;
 	}
 
-	return nullptr;
+	return NULL;
 }
 
-// Get screen HDR capabilities for internal use only.
-DisplayServerWindows::ScreenHdrData DisplayServerWindows::_get_screen_hdr_data(int p_screen) const {
-	ScreenHdrData data;
-	HMONITOR monitor = _get_hmonitor_of_screen(p_screen);
-	if (!monitor) {
-		return data;
-	}
-
-#ifdef D3D12_ENABLED
-	// A dynamic cast is used here because the rendering context is not an Object and Object:cast is not supported.
-	RenderingContextDriverD3D12 *rendering_context_d3d12 = dynamic_cast<RenderingContextDriverD3D12 *>(rendering_context);
-	if (rendering_context_d3d12) {
-		IDXGIFactory2 *dxgi_factory = rendering_context_d3d12->dxgi_factory_get();
-
-		DXGI_OUTPUT_DESC1 desc;
-		if (_get_monitor_desc(monitor, dxgi_factory, desc)) {
-			data.hdr_supported = desc.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
-			data.min_luminance = desc.MinLuminance;
-			data.max_luminance = desc.MaxLuminance;
-			data.max_average_luminance = desc.MaxFullFrameLuminance;
-		}
-	}
-#endif // D3D12_ENABLED
-
-	uint32_t path_count = 0;
-	uint32_t mode_count = 0;
-
-	if (GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &path_count, &mode_count) == ERROR_SUCCESS) {
-		LocalVector<DISPLAYCONFIG_PATH_INFO> paths;
-		LocalVector<DISPLAYCONFIG_MODE_INFO> modes;
-		paths.resize(path_count);
-		modes.resize(mode_count);
-
-		if (QueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &path_count, paths.ptr(), &mode_count, modes.ptr(), nullptr) == ERROR_SUCCESS) {
-			data.sdr_white_level = _get_sdr_white_level_for_hmonitor(monitor, paths);
-		}
-	}
-
-	return data;
-}
-
-void DisplayServerWindows::_update_hdr_output_for_window(DisplayServerEnums::WindowID p_window, const WindowData &p_window_data, ScreenHdrData p_screen_data) {
-#ifdef RD_ENABLED
-	if (rendering_context) {
-		bool current_hdr_enabled = rendering_context->window_get_hdr_output_enabled(p_window);
-		bool desired_hdr_enabled = p_window_data.hdr_output_requested && p_screen_data.hdr_supported;
-		bool hdr_state_changed = false;
-
-		if (current_hdr_enabled != desired_hdr_enabled) {
-			rendering_context->window_set_hdr_output_enabled(p_window, desired_hdr_enabled);
-			rendering_context->window_set_hdr_output_linear_luminance_scale(p_window, 80.0f);
-			hdr_state_changed = true;
-		}
-
-		// If auto reference luminance is enabled, update it based on the current SDR white level.
-		if (p_window_data.hdr_output_reference_luminance < 0.0f) {
-			if (p_screen_data.sdr_white_level > 0.0f) {
-				float current_ref_luminance = rendering_context->window_get_hdr_output_reference_luminance(p_window);
-				if (!Math::is_equal_approx(current_ref_luminance, p_screen_data.sdr_white_level)) {
-					rendering_context->window_set_hdr_output_reference_luminance(p_window, p_screen_data.sdr_white_level);
-					hdr_state_changed = true;
-				}
-			}
-			// If we cannot get the SDR white level, leave the previous value unchanged.
-		}
-
-		// If auto max luminance is enabled, update it based on the screen's max luminance.
-		if (p_window_data.hdr_output_max_luminance < 0.0f) {
-			if (p_screen_data.max_luminance > 0.0f) {
-				float current_max_luminance = rendering_context->window_get_hdr_output_max_luminance(p_window);
-				if (!Math::is_equal_approx(current_max_luminance, p_screen_data.max_luminance)) {
-					rendering_context->window_set_hdr_output_max_luminance(p_window, p_screen_data.max_luminance);
-					hdr_state_changed = true;
-				}
-			}
-			// If we cannot get the screen's max luminance, leave the previous value unchanged.
-		}
-
-		// Trigger HDR output changed event if any HDR parameter was modified.
-		if (hdr_state_changed) {
-			_send_window_event(p_window_data, DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
-		}
-	}
-#endif // RD_ENABLED
-}
-
-void DisplayServerWindows::_update_hdr_output_for_tracked_windows() {
-	hdr_output_cache.clear();
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (E.value.hdr_output_requested) {
-			int screen = window_get_current_screen(E.key);
-
-			ScreenHdrData data;
-			if (!hdr_output_cache.has(screen)) {
-				data = _get_screen_hdr_data(screen);
-				hdr_output_cache.insert(screen, data);
-			} else {
-				data = hdr_output_cache[screen];
-			}
-
-			_update_hdr_output_for_window(E.key, E.value, data);
-		}
-	}
-}
-
-Error DisplayServerWindows::embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
+Error DisplayServerWindows::embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), FAILED);
@@ -3566,7 +3251,7 @@ Error DisplayServerWindows::embed_process(DisplayServerEnums::WindowID p_window,
 	return OK;
 }
 
-Error DisplayServerWindows::request_close_embedded_process(ProcessID p_pid) {
+Error DisplayServerWindows::request_close_embedded_process(OS::ProcessID p_pid) {
 	_THREAD_SAFE_METHOD_
 
 	if (!embedded_processes.has(p_pid)) {
@@ -3581,7 +3266,7 @@ Error DisplayServerWindows::request_close_embedded_process(ProcessID p_pid) {
 	return OK;
 }
 
-Error DisplayServerWindows::remove_embedded_process(ProcessID p_pid) {
+Error DisplayServerWindows::remove_embedded_process(OS::ProcessID p_pid) {
 	_THREAD_SAFE_METHOD_
 
 	if (!embedded_processes.has(p_pid)) {
@@ -3631,7 +3316,7 @@ Error DisplayServerWindows::remove_embedded_process(ProcessID p_pid) {
 	return OK;
 }
 
-ProcessID DisplayServerWindows::get_focused_process_id() {
+OS::ProcessID DisplayServerWindows::get_focused_process_id() {
 	HWND hwnd = GetForegroundWindow();
 	if (!hwnd) {
 		return 0;
@@ -3668,9 +3353,9 @@ Error DisplayServerWindows::dialog_show(String p_title, String p_description, Ve
 		buttons.push_back(s.utf16());
 	}
 
-	DisplayServerEnums::WindowID window_id = _get_focused_window_or_popup();
+	WindowID window_id = _get_focused_window_or_popup();
 	if (!windows.has(window_id)) {
-		window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+		window_id = MAIN_WINDOW_ID;
 	}
 
 	config.pszWindowTitle = (LPCWSTR)(title.get_data());
@@ -4195,10 +3880,6 @@ void DisplayServerWindows::process_events() {
 		Input::get_singleton()->flush_buffered_events();
 	}
 
-	// Poll HDR output state for windows that have requested it.
-	// Needed to detect changes in luminance values due to a lack of Windows events for such changes.
-	_update_hdr_output_for_tracked_windows();
-
 	LocalVector<List<FileDialogData *>::Element *> to_remove;
 	for (List<FileDialogData *>::Element *E = file_dialogs.front(); E; E = E->next()) {
 		FileDialogData *fd = E->get();
@@ -4226,11 +3907,9 @@ void DisplayServerWindows::force_process_and_drop_events() {
 
 void DisplayServerWindows::release_rendering_thread() {
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->release_current();
 	}
-#endif
 	if (gl_manager_native) {
 		gl_manager_native->release_current();
 	}
@@ -4239,11 +3918,9 @@ void DisplayServerWindows::release_rendering_thread() {
 
 void DisplayServerWindows::swap_buffers() {
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
 		gl_manager_angle->swap_buffers();
 	}
-#endif
 	if (gl_manager_native) {
 		gl_manager_native->swap_buffers();
 	}
@@ -4251,29 +3928,17 @@ void DisplayServerWindows::swap_buffers() {
 }
 
 void DisplayServerWindows::set_native_icon(const String &p_filename) {
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-			continue;
-		}
-		_window_set_native_icon(p_filename, E.key);
-	}
-}
-
-void DisplayServerWindows::_window_set_native_icon(const String &p_filename, DisplayServerEnums::WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-
-	if (wd.icon_big) {
-		DestroyIcon(wd.icon_big);
-		wd.icon_buffer_big.clear();
-		wd.icon_big = nullptr;
+	if (icon_big) {
+		DestroyIcon(icon_big);
+		icon_buffer_big.clear();
+		icon_big = nullptr;
 	}
-	if (wd.icon_small) {
-		DestroyIcon(wd.icon_small);
-		wd.icon_buffer_small.clear();
-		wd.icon_small = nullptr;
+	if (icon_small) {
+		DestroyIcon(icon_small);
+		icon_buffer_small.clear();
+		icon_small = nullptr;
 	}
 
 	Ref<FileAccess> f = FileAccess::open(p_filename, FileAccess::READ);
@@ -4333,65 +3998,45 @@ void DisplayServerWindows::_window_set_native_icon(const String &p_filename, Dis
 
 	// Read the big icon.
 	DWORD bytecount_big = icon_dir->idEntries[big_icon_index].dwBytesInRes;
-	wd.icon_buffer_big.resize(bytecount_big);
+	icon_buffer_big.resize(bytecount_big);
 	pos = icon_dir->idEntries[big_icon_index].dwImageOffset;
 	f->seek(pos);
-	f->get_buffer((uint8_t *)&wd.icon_buffer_big.write[0], bytecount_big);
-	wd.icon_big = CreateIconFromResourceEx((PBYTE)&wd.icon_buffer_big.write[0], bytecount_big, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
-	ERR_FAIL_NULL_MSG(wd.icon_big, "Could not create " + itos(big_icon_width) + "x" + itos(big_icon_width) + " @" + itos(big_icon_cc) + " icon, error: " + format_error_message(GetLastError()) + ".");
+	f->get_buffer((uint8_t *)&icon_buffer_big.write[0], bytecount_big);
+	icon_big = CreateIconFromResourceEx((PBYTE)&icon_buffer_big.write[0], bytecount_big, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
+	ERR_FAIL_NULL_MSG(icon_big, "Could not create " + itos(big_icon_width) + "x" + itos(big_icon_width) + " @" + itos(big_icon_cc) + " icon, error: " + format_error_message(GetLastError()) + ".");
 
 	// Read the small icon.
 	DWORD bytecount_small = icon_dir->idEntries[small_icon_index].dwBytesInRes;
-	wd.icon_buffer_small.resize(bytecount_small);
+	icon_buffer_small.resize(bytecount_small);
 	pos = icon_dir->idEntries[small_icon_index].dwImageOffset;
 	f->seek(pos);
-	f->get_buffer((uint8_t *)&wd.icon_buffer_small.write[0], bytecount_small);
-	wd.icon_small = CreateIconFromResourceEx((PBYTE)&wd.icon_buffer_small.write[0], bytecount_small, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
-	ERR_FAIL_NULL_MSG(wd.icon_small, "Could not create 16x16 @" + itos(small_icon_cc) + " icon, error: " + format_error_message(GetLastError()) + ".");
+	f->get_buffer((uint8_t *)&icon_buffer_small.write[0], bytecount_small);
+	icon_small = CreateIconFromResourceEx((PBYTE)&icon_buffer_small.write[0], bytecount_small, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
+	ERR_FAIL_NULL_MSG(icon_small, "Could not create 16x16 @" + itos(small_icon_cc) + " icon, error: " + format_error_message(GetLastError()) + ".");
 
 	// Online tradition says to be sure last error is cleared and set the small icon first.
 	int err = 0;
 	SetLastError(err);
 
-	wd.icon_set = true;
-	SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_small);
-	SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-	if (p_window == DisplayServerEnums::MAIN_WINDOW_ID) {
-		for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-			if (!E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-				SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_small);
-				SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-			}
-		}
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
+		SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small);
+		SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
 	}
-
 	memdelete(icon_dir);
 }
 
 void DisplayServerWindows::set_icon(const Ref<Image> &p_icon) {
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-		if (E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-			continue;
-		}
-		window_set_icon(p_icon, E.key);
-	}
-}
-
-void DisplayServerWindows::window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-
-	if (wd.icon_big) {
-		DestroyIcon(wd.icon_big);
-		wd.icon_buffer_big.clear();
-		wd.icon_big = nullptr;
+	if (icon_big) {
+		DestroyIcon(icon_big);
+		icon_buffer_big.clear();
+		icon_big = nullptr;
 	}
-	if (wd.icon_small) {
-		DestroyIcon(wd.icon_small);
-		wd.icon_buffer_small.clear();
-		wd.icon_small = nullptr;
+	if (icon_small) {
+		DestroyIcon(icon_small);
+		icon_buffer_small.clear();
+		icon_small = nullptr;
 	}
 
 	if (p_icon.is_valid()) {
@@ -4405,8 +4050,8 @@ void DisplayServerWindows::window_set_icon(const Ref<Image> &p_icon, DisplayServ
 
 		// Create temporary bitmap buffer.
 		int icon_len = 40 + h * w * 4;
-		wd.icon_buffer_big.resize(icon_len);
-		BYTE *icon_bmp = wd.icon_buffer_big.ptrw();
+		icon_buffer_big.resize(icon_len);
+		BYTE *icon_bmp = icon_buffer_big.ptrw();
 
 		encode_uint32(40, &icon_bmp[0]);
 		encode_uint32(w, &icon_bmp[4]);
@@ -4433,37 +4078,22 @@ void DisplayServerWindows::window_set_icon(const Ref<Image> &p_icon, DisplayServ
 				wpx[3] = rpx[3];
 			}
 		}
-		wd.icon_big = CreateIconFromResourceEx(icon_bmp, icon_len, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
-		ERR_FAIL_NULL(wd.icon_big);
+		icon_big = CreateIconFromResourceEx(icon_bmp, icon_len, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE);
+		ERR_FAIL_NULL(icon_big);
 
-		wd.icon_set = true;
-		SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_big);
-		SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-
-		if (p_window == DisplayServerEnums::MAIN_WINDOW_ID) {
-			for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-				if (!E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-					SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)wd.icon_big);
-					SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, (LPARAM)wd.icon_big);
-				}
-			}
+		for (const KeyValue<WindowID, WindowData> &E : windows) {
+			SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_big);
+			SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
 		}
 	} else {
-		wd.icon_set = false;
-		SendMessage(wd.hWnd, WM_SETICON, ICON_SMALL, 0);
-		SendMessage(wd.hWnd, WM_SETICON, ICON_BIG, 0);
-		if (p_window == DisplayServerEnums::MAIN_WINDOW_ID) {
-			for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
-				if (!E.value.icon_set && E.key != DisplayServerEnums::MAIN_WINDOW_ID) {
-					SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, 0);
-					SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, 0);
-				}
-			}
+		for (const KeyValue<WindowID, WindowData> &E : windows) {
+			SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, 0);
+			SendMessage(E.value.hWnd, WM_SETICON, ICON_BIG, 0);
 		}
 	}
 }
 
-DisplayServerEnums::IndicatorID DisplayServerWindows::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
+DisplayServer::IndicatorID DisplayServerWindows::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
 	IndicatorData idat;
 	if (p_icon.is_valid() && p_icon->get_width() > 0 && p_icon->get_height() > 0 && p_icon->get_image().is_valid()) {
 		Ref<Image> img = p_icon->get_image();
@@ -4515,7 +4145,7 @@ DisplayServerEnums::IndicatorID DisplayServerWindows::create_status_indicator(co
 	NOTIFYICONDATAW ndat;
 	ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
 	ndat.cbSize = sizeof(NOTIFYICONDATAW);
-	ndat.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+	ndat.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 	ndat.uID = indicator_id_counter;
 	ndat.uFlags = NIF_ICON | NIF_TIP | NIF_MESSAGE;
 	ndat.uCallbackMessage = WM_INDICATOR_CALLBACK_MESSAGE;
@@ -4526,13 +4156,13 @@ DisplayServerEnums::IndicatorID DisplayServerWindows::create_status_indicator(co
 	Shell_NotifyIconW(NIM_ADD, &ndat);
 	Shell_NotifyIconW(NIM_SETVERSION, &ndat);
 
-	DisplayServerEnums::IndicatorID iid = indicator_id_counter++;
+	IndicatorID iid = indicator_id_counter++;
 	indicators[iid] = idat;
 
 	return iid;
 }
 
-void DisplayServerWindows::status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) {
+void DisplayServerWindows::status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	IndicatorData &idat = indicators[p_id];
@@ -4591,7 +4221,7 @@ void DisplayServerWindows::status_indicator_set_icon(DisplayServerEnums::Indicat
 	NOTIFYICONDATAW ndat;
 	ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
 	ndat.cbSize = sizeof(NOTIFYICONDATAW);
-	ndat.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+	ndat.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 	ndat.uID = p_id;
 	ndat.uFlags = NIF_ICON;
 	ndat.hIcon = idat.icon;
@@ -4600,13 +4230,13 @@ void DisplayServerWindows::status_indicator_set_icon(DisplayServerEnums::Indicat
 	Shell_NotifyIconW(NIM_MODIFY, &ndat);
 }
 
-void DisplayServerWindows::status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) {
+void DisplayServerWindows::status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	NOTIFYICONDATAW ndat;
 	ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
 	ndat.cbSize = sizeof(NOTIFYICONDATAW);
-	ndat.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+	ndat.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 	ndat.uID = p_id;
 	ndat.uFlags = NIF_TIP;
 	memcpy(ndat.szTip, p_tooltip.utf16().get_data(), MIN(p_tooltip.utf16().length(), 127) * sizeof(WCHAR));
@@ -4615,25 +4245,25 @@ void DisplayServerWindows::status_indicator_set_tooltip(DisplayServerEnums::Indi
 	Shell_NotifyIconW(NIM_MODIFY, &ndat);
 }
 
-void DisplayServerWindows::status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_menu_rid) {
+void DisplayServerWindows::status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	indicators[p_id].menu_rid = p_menu_rid;
 }
 
-void DisplayServerWindows::status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) {
+void DisplayServerWindows::status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	indicators[p_id].callback = p_callback;
 }
 
-Rect2 DisplayServerWindows::status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const {
+Rect2 DisplayServerWindows::status_indicator_get_rect(IndicatorID p_id) const {
 	ERR_FAIL_COND_V(!indicators.has(p_id), Rect2());
 
 	NOTIFYICONIDENTIFIER nid;
 	ZeroMemory(&nid, sizeof(NOTIFYICONIDENTIFIER));
 	nid.cbSize = sizeof(NOTIFYICONIDENTIFIER);
-	nid.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+	nid.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 	nid.uID = p_id;
 	nid.guidItem = GUID_NULL;
 
@@ -4651,7 +4281,7 @@ Rect2 DisplayServerWindows::status_indicator_get_rect(DisplayServerEnums::Indica
 	return Rect2();
 }
 
-void DisplayServerWindows::delete_status_indicator(DisplayServerEnums::IndicatorID p_id) {
+void DisplayServerWindows::delete_status_indicator(IndicatorID p_id) {
 	ERR_FAIL_COND(!indicators.has(p_id));
 
 	IndicatorData &idat = indicators[p_id];
@@ -4664,7 +4294,7 @@ void DisplayServerWindows::delete_status_indicator(DisplayServerEnums::Indicator
 	NOTIFYICONDATAW ndat;
 	ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
 	ndat.cbSize = sizeof(NOTIFYICONDATAW);
-	ndat.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+	ndat.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 	ndat.uID = p_id;
 	ndat.uVersion = NOTIFYICON_VERSION;
 
@@ -4672,7 +4302,7 @@ void DisplayServerWindows::delete_status_indicator(DisplayServerEnums::Indicator
 	indicators.erase(p_id);
 }
 
-void DisplayServerWindows::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -4682,17 +4312,15 @@ void DisplayServerWindows::window_set_vsync_mode(DisplayServerEnums::VSyncMode p
 
 #if defined(GLES3_ENABLED)
 	if (gl_manager_native) {
-		gl_manager_native->set_use_vsync(p_window, p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager_native->set_use_vsync(p_window, p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
-#if defined(ANGLE_ENABLED)
 	if (gl_manager_angle) {
-		gl_manager_angle->set_use_vsync(p_vsync_mode != DisplayServerEnums::VSYNC_DISABLED);
+		gl_manager_angle->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 	}
 #endif
-#endif
 }
 
-DisplayServerEnums::VSyncMode DisplayServerWindows::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServerWindows::window_get_vsync_mode(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -4702,171 +4330,16 @@ DisplayServerEnums::VSyncMode DisplayServerWindows::window_get_vsync_mode(Displa
 
 #if defined(GLES3_ENABLED)
 	if (gl_manager_native) {
-		return gl_manager_native->is_using_vsync(p_window) ? DisplayServerEnums::VSYNC_ENABLED : DisplayServerEnums::VSYNC_DISABLED;
+		return gl_manager_native->is_using_vsync(p_window) ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
-#ifdef ANGLE_ENABLED
 	if (gl_manager_angle) {
-		return gl_manager_angle->is_using_vsync() ? DisplayServerEnums::VSYNC_ENABLED : DisplayServerEnums::VSYNC_DISABLED;
+		return gl_manager_angle->is_using_vsync() ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
 #endif
-#endif
-	return DisplayServerEnums::VSYNC_ENABLED;
+	return DisplayServer::VSYNC_ENABLED;
 }
 
-bool DisplayServerWindows::window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_device && !rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT)) {
-		return false; // HDR output is not supported by the rendering device.
-	}
-#endif
-
-	// The window supports HDR if the screen it is on supports HDR.
-	int screen = window_get_current_screen(p_window);
-	DisplayServerWindows::ScreenHdrData data = _get_screen_hdr_data(screen);
-	return data.hdr_supported;
-}
-
-void DisplayServerWindows::window_request_hdr_output(const bool p_enable, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	ERR_FAIL_COND_EDMSG(p_enable && (rendering_device && rendering_device->has_feature(RenderingDevice::Features::SUPPORTS_HDR_OUTPUT)) == false, "HDR output is not supported by the rendering device.");
-#endif
-
-	WindowData &wd = windows[p_window];
-	wd.hdr_output_requested = p_enable;
-
-	int screen = window_get_current_screen(p_window);
-	DisplayServerWindows::ScreenHdrData data = _get_screen_hdr_data(screen);
-	_update_hdr_output_for_window(p_window, wd, data);
-}
-
-bool DisplayServerWindows::window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	const WindowData &wd = windows[p_window];
-	return wd.hdr_output_requested;
-}
-
-bool DisplayServerWindows::window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_enabled(p_window);
-	}
-#endif
-
-	return false;
-}
-
-void DisplayServerWindows::window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	WindowData &wd = windows[p_window];
-
-	if (Math::is_equal_approx(wd.hdr_output_reference_luminance, p_reference_luminance)) {
-		return;
-	}
-
-	wd.hdr_output_reference_luminance = p_reference_luminance;
-
-	// Negative luminance means auto-adjust
-	if (wd.hdr_output_reference_luminance < 0.0f) {
-		int screen = window_get_current_screen(p_window);
-		DisplayServerWindows::ScreenHdrData data = _get_screen_hdr_data(screen);
-		_update_hdr_output_for_window(p_window, wd, data);
-	} else {
-		// Otherwise, apply the requested luminance
-#if defined(RD_ENABLED)
-		if (rendering_context) {
-			rendering_context->window_set_hdr_output_reference_luminance(p_window, p_reference_luminance);
-			_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
-		}
-#endif
-	}
-}
-
-float DisplayServerWindows::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	const WindowData &wd = windows[p_window];
-	return wd.hdr_output_reference_luminance;
-}
-
-float DisplayServerWindows::window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_reference_luminance(p_window);
-	}
-#endif
-
-	return 0.0f;
-}
-
-void DisplayServerWindows::window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	WindowData &wd = windows[p_window];
-
-	if (Math::is_equal_approx(wd.hdr_output_max_luminance, p_max_luminance)) {
-		return;
-	}
-
-	wd.hdr_output_max_luminance = p_max_luminance;
-
-	// Negative luminance means auto-adjust
-	if (wd.hdr_output_max_luminance < 0.0f) {
-		int screen = window_get_current_screen(p_window);
-		DisplayServerWindows::ScreenHdrData data = _get_screen_hdr_data(screen);
-		_update_hdr_output_for_window(p_window, wd, data);
-	} else {
-		// Otherwise, apply the requested luminance
-#if defined(RD_ENABLED)
-		if (rendering_context) {
-			rendering_context->window_set_hdr_output_max_luminance(p_window, p_max_luminance);
-			_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
-		}
-#endif
-	}
-}
-
-float DisplayServerWindows::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	const WindowData &wd = windows[p_window];
-	return wd.hdr_output_max_luminance;
-}
-
-float DisplayServerWindows::window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_hdr_output_max_luminance(p_window);
-	}
-#endif
-
-	return 0.0f;
-}
-
-float DisplayServerWindows::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-#if defined(RD_ENABLED)
-	if (rendering_context) {
-		return rendering_context->window_get_output_max_linear_value(p_window);
-	}
-#endif
-
-	return 1.0f; // SDR
-}
-
-void DisplayServerWindows::window_start_drag(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_start_drag(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -4898,10 +4371,10 @@ void DisplayServerWindows::window_start_drag(DisplayServerEnums::WindowID p_wind
 	}
 }
 
-void DisplayServerWindows::window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::window_start_resize(WindowResizeEdge p_edge, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(int(p_edge), DisplayServerEnums::WINDOW_EDGE_MAX);
+	ERR_FAIL_INDEX(int(p_edge), WINDOW_EDGE_MAX);
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 
@@ -4917,28 +4390,28 @@ void DisplayServerWindows::window_start_resize(DisplayServerEnums::WindowResizeE
 
 	DWORD op = 0;
 	switch (p_edge) {
-		case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+		case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 			op = WMSZ_TOPLEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_TOP: {
+		case DisplayServer::WINDOW_EDGE_TOP: {
 			op = WMSZ_TOP;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 			op = WMSZ_TOPRIGHT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+		case DisplayServer::WINDOW_EDGE_LEFT: {
 			op = WMSZ_LEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_RIGHT: {
 			op = WMSZ_RIGHT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 			op = WMSZ_BOTTOMLEFT;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM: {
 			op = WMSZ_BOTTOM;
 		} break;
-		case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+		case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 			op = WMSZ_BOTTOMRIGHT;
 		} break;
 		default:
@@ -4961,7 +4434,7 @@ void DisplayServerWindows::window_start_resize(DisplayServerEnums::WindowResizeE
 	}
 }
 
-void DisplayServerWindows::set_context(DisplayServerEnums::Context p_context) {
+void DisplayServerWindows::set_context(Context p_context) {
 }
 
 bool DisplayServerWindows::is_window_transparency_available() const {
@@ -4981,7 +4454,7 @@ bool DisplayServerWindows::is_window_transparency_available() const {
 // This one tells whether the event comes from touchscreen (and not from pen).
 #define IsTouchEvent(dw) (IsPenEvent(dw) && ((dw) & 0x80))
 
-void DisplayServerWindows::_touch_event(DisplayServerEnums::WindowID p_window, bool p_pressed, float p_x, float p_y, int idx) {
+void DisplayServerWindows::_touch_event(WindowID p_window, bool p_pressed, float p_x, float p_y, int idx) {
 	if (touch_state.has(idx) == p_pressed) {
 		return;
 	}
@@ -5002,7 +4475,7 @@ void DisplayServerWindows::_touch_event(DisplayServerEnums::WindowID p_window, b
 	Input::get_singleton()->parse_input_event(event);
 }
 
-void DisplayServerWindows::_drag_event(DisplayServerEnums::WindowID p_window, float p_x, float p_y, int idx) {
+void DisplayServerWindows::_drag_event(WindowID p_window, float p_x, float p_y, int idx) {
 	RBMap<int, Vector2>::Element *curr = touch_state.find(idx);
 	if (!curr) {
 		return;
@@ -5025,7 +4498,7 @@ void DisplayServerWindows::_drag_event(DisplayServerEnums::WindowID p_window, fl
 	curr->get() = Vector2(p_x, p_y);
 }
 
-void DisplayServerWindows::_send_window_event(const WindowData &wd, DisplayServerEnums::WindowEvent p_event) {
+void DisplayServerWindows::_send_window_event(const WindowData &wd, WindowEvent p_event) {
 	if (wd.event_callback.is_valid()) {
 		Variant event = int(p_event);
 		wd.event_callback.call(event);
@@ -5043,7 +4516,7 @@ void DisplayServerWindows::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	in_dispatch_input_event = true;
 
 	{
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *E = popup_list.back();
 		if (E && Object::cast_to<InputEventKey>(*p_event)) {
 			// Redirect keyboard input to active popup.
 			if (windows.has(E->get())) {
@@ -5058,7 +4531,7 @@ void DisplayServerWindows::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	}
 
 	Ref<InputEventFromWindow> event_from_window = p_event;
-	if (event_from_window.is_valid() && event_from_window->get_window_id() != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
 		// Send to a single window.
 		if (windows.has(event_from_window->get_window_id())) {
 			Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
@@ -5069,7 +4542,7 @@ void DisplayServerWindows::_dispatch_input_event(const Ref<InputEvent> &p_event)
 	} else {
 		// Send to all windows. Copy all pending callbacks, since callback can erase window.
 		Vector<Callable> cbs;
-		for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+		for (KeyValue<WindowID, WindowData> &E : windows) {
 			Callable callable = E.value.input_event_callback;
 			if (callable.is_valid()) {
 				cbs.push_back(callable);
@@ -5092,16 +4565,16 @@ LRESULT CALLBACK MouseProc(int code, WPARAM wParam, LPARAM lParam) {
 	}
 }
 
-DisplayServerEnums::WindowID DisplayServerWindows::window_get_active_popup() const {
-	const List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+DisplayServer::WindowID DisplayServerWindows::window_get_active_popup() const {
+	const List<WindowID>::Element *E = popup_list.back();
 	if (E) {
 		return E->get();
 	} else {
-		return DisplayServerEnums::INVALID_WINDOW_ID;
+		return INVALID_WINDOW_ID;
 	}
 }
 
-void DisplayServerWindows::window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) {
+void DisplayServerWindows::window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND(!windows.has(p_window));
@@ -5109,7 +4582,7 @@ void DisplayServerWindows::window_set_popup_safe_rect(DisplayServerEnums::Window
 	wd.parent_safe_rect = p_rect;
 }
 
-Rect2i DisplayServerWindows::window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const {
+Rect2i DisplayServerWindows::window_get_popup_safe_rect(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), Rect2i());
@@ -5117,14 +4590,14 @@ Rect2i DisplayServerWindows::window_get_popup_safe_rect(DisplayServerEnums::Wind
 	return wd.parent_safe_rect;
 }
 
-void DisplayServerWindows::popup_open(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::popup_open(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
 	bool has_popup_ancestor = false;
-	DisplayServerEnums::WindowID transient_root = p_window;
+	WindowID transient_root = p_window;
 	while (true) {
-		DisplayServerEnums::WindowID parent = windows[transient_root].transient_parent;
-		if (parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+		WindowID parent = windows[transient_root].transient_parent;
+		if (parent == INVALID_WINDOW_ID) {
 			break;
 		} else {
 			transient_root = parent;
@@ -5136,15 +4609,15 @@ void DisplayServerWindows::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 
 	// Detect tooltips and other similar popups that shouldn't block input to their parent.
-	bool ignores_input = window_get_flag(DisplayServerEnums::WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
+	bool ignores_input = window_get_flag(WINDOW_FLAG_NO_FOCUS, p_window) && window_get_flag(WINDOW_FLAG_MOUSE_PASSTHROUGH, p_window);
 
 	WindowData &wd = windows[p_window];
 	if (wd.is_popup || (has_popup_ancestor && !ignores_input)) {
 		// Find current popup parent, or root popup if new window is not transient.
-		List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-		List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+		List<WindowID>::Element *C = nullptr;
+		List<WindowID>::Element *E = popup_list.back();
 		while (E) {
-			if (wd.transient_parent != E->get() || wd.transient_parent == DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (wd.transient_parent != E->get() || wd.transient_parent == INVALID_WINDOW_ID) {
 				C = E;
 				E = E->prev();
 			} else {
@@ -5152,7 +4625,7 @@ void DisplayServerWindows::popup_open(DisplayServerEnums::WindowID p_window) {
 			}
 		}
 		if (C) {
-			_send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			_send_window_event(windows[C->get()], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 
 		time_since_popup = OS::get_singleton()->get_ticks_msec();
@@ -5160,18 +4633,18 @@ void DisplayServerWindows::popup_open(DisplayServerEnums::WindowID p_window) {
 	}
 }
 
-void DisplayServerWindows::popup_close(DisplayServerEnums::WindowID p_window) {
+void DisplayServerWindows::popup_close(WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	List<DisplayServerEnums::WindowID>::Element *E = popup_list.find(p_window);
+	List<WindowID>::Element *E = popup_list.find(p_window);
 	while (E) {
-		List<DisplayServerEnums::WindowID>::Element *F = E->next();
-		DisplayServerEnums::WindowID win_id = E->get();
+		List<WindowID>::Element *F = E->next();
+		WindowID win_id = E->get();
 		popup_list.erase(E);
 
 		if (win_id != p_window) {
 			// Only request close on related windows, not this window.  We are already processing it.
-			_send_window_event(windows[win_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			_send_window_event(windows[win_id], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
 		}
 		E = F;
 	}
@@ -5215,8 +4688,8 @@ LRESULT DisplayServerWindows::MouseProc(int code, WPARAM wParam, LPARAM lParam)
 			case WM_MBUTTONDOWN: {
 				MOUSEHOOKSTRUCT *ms = (MOUSEHOOKSTRUCT *)lParam;
 				Point2i pos = Point2i(ms->pt.x, ms->pt.y) - _get_screens_origin();
-				List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-				List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+				List<WindowID>::Element *C = nullptr;
+				List<WindowID>::Element *E = popup_list.back();
 				// Find top popup to close.
 				while (E) {
 					// Popup window area.
@@ -5233,7 +4706,7 @@ LRESULT DisplayServerWindows::MouseProc(int code, WPARAM wParam, LPARAM lParam)
 					}
 				}
 				if (C) {
-					_send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+					_send_window_event(windows[C->get()], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
 					return 1;
 				}
 			} break;
@@ -5260,11 +4733,15 @@ LRESULT DisplayServerWindows::_handle_early_window_message(HWND hWnd, UINT uMsg,
 			// Fix this up so we can recognize the remaining messages.
 			pWindowData->hWnd = hWnd;
 
-			if (!AccessibilityServer::get_singleton()->window_create(pWindowData->id, (void *)hWnd)) {
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver && !accessibility_driver->window_create(pWindowData->id, (void *)hWnd)) {
 				if (OS::get_singleton()->is_stdout_verbose()) {
 					ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
 				}
+				memdelete(accessibility_driver);
+				accessibility_driver = nullptr;
 			}
+#endif
 		} break;
 		default: {
 			// Additional messages during window creation should happen after we fixed
@@ -5291,13 +4768,13 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		}
 	}
 
-	DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	WindowID window_id = INVALID_WINDOW_ID;
 	bool window_created = false;
 
 	// Check whether window exists
 	// FIXME this is O(n), where n is the set of currently open windows and subwindows
-	// we should have a secondary map from HWND to DisplayServerEnums::WindowID or even WindowData* alias, if we want to eliminate all the map lookups below
-	for (const KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	// we should have a secondary map from HWND to WindowID or even WindowData* alias, if we want to eliminate all the map lookups below
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
 		if (E.value.hWnd == hWnd) {
 			window_id = E.key;
 			window_created = true;
@@ -5470,7 +4947,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		} break;
 		case WM_INDICATOR_CALLBACK_MESSAGE: {
 			if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN || lParam == WM_MBUTTONDOWN || lParam == WM_XBUTTONDOWN) {
-				DisplayServerEnums::IndicatorID iid = (DisplayServerEnums::IndicatorID)wParam;
+				IndicatorID iid = (IndicatorID)wParam;
 				MouseButton mb = MouseButton::LEFT;
 				if (lParam == WM_RBUTTONDOWN) {
 					mb = MouseButton::RIGHT;
@@ -5484,7 +4961,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 						NOTIFYICONIDENTIFIER nid;
 						ZeroMemory(&nid, sizeof(NOTIFYICONIDENTIFIER));
 						nid.cbSize = sizeof(NOTIFYICONIDENTIFIER);
-						nid.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+						nid.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 						nid.uID = iid;
 						nid.guidItem = GUID_NULL;
 
@@ -5512,16 +4989,16 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				KillTimer(windows[window_id].hWnd, windows[window_id].activate_timer_id);
 				windows[window_id].activate_timer_id = 0;
 			}
-			_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+			_send_window_event(windows[window_id], WINDOW_EVENT_CLOSE_REQUEST);
 			return 0;
 		}
 		case WM_MOUSELEAVE: {
 			if (window_mouseover_id == window_id) {
 				old_invalid = true;
-				window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
+				window_mouseover_id = INVALID_WINDOW_ID;
 
-				_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
-			} else if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
+				_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_EXIT);
+			} else if (window_mouseover_id != INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
 				// This is reached during drag and drop, after dropping in a different window.
 				// Once-off notification, must call again.
 				track_mouse_leave_event(windows[window_mouseover_id].hWnd);
@@ -5576,7 +5053,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 						}
 					}
 				}
-			} else if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && raw->header.dwType == RIM_TYPEMOUSE) {
+			} else if (mouse_mode == MOUSE_MODE_CAPTURED && raw->header.dwType == RIM_TYPEMOUSE) {
 				Ref<InputEventMouseMotion> mm;
 				mm.instantiate();
 
@@ -5675,7 +5152,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					windows[window_id].last_pen_inverted = inverted;
 
 					// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
-					if (!windows[window_id].window_focused && mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+					if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
 						break;
 					}
 
@@ -5697,7 +5174,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					mm->set_position(Vector2(coords.x, coords.y));
 					mm->set_global_position(Vector2(coords.x, coords.y));
 
-					if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+					if (mouse_mode == MOUSE_MODE_CAPTURED) {
 						Point2i c(windows[window_id].width / 2, windows[window_id].height / 2);
 						old_x = c.x;
 						old_y = c.y;
@@ -5736,7 +5213,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 		} break;
 		case WM_POINTERENTER: {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && use_raw_input) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED && use_raw_input) {
 				break;
 			}
 
@@ -5765,7 +5242,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		} break;
 		case WM_POINTERDOWN:
 		case WM_POINTERUP: {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && use_raw_input) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED && use_raw_input) {
 				break;
 			}
 
@@ -5824,8 +5301,8 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			uint64_t delta = OS::get_singleton()->get_ticks_msec() - time_since_popup;
 			if (delta > 250) {
 				Point2i pos = Point2i(coords.x, coords.y) - _get_screens_origin();
-				List<DisplayServerEnums::WindowID>::Element *C = nullptr;
-				List<DisplayServerEnums::WindowID>::Element *E = popup_list.back();
+				List<WindowID>::Element *C = nullptr;
+				List<WindowID>::Element *E = popup_list.back();
 				// Find top popup to close.
 				while (E) {
 					// Popup window area.
@@ -5842,7 +5319,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					}
 				}
 				if (C) {
-					_send_window_event(windows[C->get()], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+					_send_window_event(windows[C->get()], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
 				}
 			}
 
@@ -5877,7 +5354,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			return 0;
 		} break;
 		case WM_POINTERUPDATE: {
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && use_raw_input) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED && use_raw_input) {
 				break;
 			}
 
@@ -5911,16 +5388,16 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			if (window_mouseover_id != window_id) {
 				// Mouse enter.
 
-				if (mouse_mode != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
-					if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
+				if (mouse_mode != MOUSE_MODE_CAPTURED) {
+					if (window_mouseover_id != INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
 						// Leave previous window.
-						_send_window_event(windows[window_mouseover_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+						_send_window_event(windows[window_mouseover_id], WINDOW_EVENT_MOUSE_EXIT);
 					}
-					_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+					_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_ENTER);
 				}
 
-				DisplayServerEnums::CursorShape c = cursor_shape;
-				cursor_shape = DisplayServerEnums::CURSOR_MAX;
+				CursorShape c = cursor_shape;
+				cursor_shape = CURSOR_MAX;
 				cursor_set_shape(c);
 				window_mouseover_id = window_id;
 
@@ -5929,7 +5406,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 
 			// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
-			if (!windows[window_id].window_focused && mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+			if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
 				break;
 			}
 
@@ -5980,7 +5457,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			mm->set_position(Vector2(coords.x, coords.y));
 			mm->set_global_position(Vector2(coords.x, coords.y));
 
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED) {
 				Point2i c(windows[window_id].width / 2, windows[window_id].height / 2);
 				old_x = c.x;
 				old_y = c.y;
@@ -6021,7 +5498,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				break;
 			}
 
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && use_raw_input) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED && use_raw_input) {
 				break;
 			}
 
@@ -6033,27 +5510,27 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				}
 			}
 
-			DisplayServerEnums::WindowID over_id = get_window_at_screen_position(mouse_get_position());
+			DisplayServer::WindowID over_id = get_window_at_screen_position(mouse_get_position());
 			if (windows.has(over_id) && !Rect2(window_get_position(over_id), Point2(windows[over_id].width, windows[over_id].height)).has_point(mouse_get_position())) {
 				// Don't consider the windowborder as part of the window.
-				over_id = DisplayServerEnums::INVALID_WINDOW_ID;
+				over_id = INVALID_WINDOW_ID;
 			}
 			if (window_mouseover_id != over_id) {
 				// Mouse enter.
 
-				if (mouse_mode != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
-					if (window_mouseover_id != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
+				if (mouse_mode != MOUSE_MODE_CAPTURED) {
+					if (window_mouseover_id != INVALID_WINDOW_ID && windows.has(window_mouseover_id)) {
 						// Leave previous window.
-						_send_window_event(windows[window_mouseover_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+						_send_window_event(windows[window_mouseover_id], WINDOW_EVENT_MOUSE_EXIT);
 					}
 
-					if (over_id != DisplayServerEnums::INVALID_WINDOW_ID && windows.has(over_id)) {
-						_send_window_event(windows[over_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+					if (over_id != INVALID_WINDOW_ID && windows.has(over_id)) {
+						_send_window_event(windows[over_id], WINDOW_EVENT_MOUSE_ENTER);
 					}
 				}
 
-				DisplayServerEnums::CursorShape c = cursor_shape;
-				cursor_shape = DisplayServerEnums::CURSOR_MAX;
+				CursorShape c = cursor_shape;
+				cursor_shape = CURSOR_MAX;
 				cursor_set_shape(c);
 				window_mouseover_id = over_id;
 
@@ -6062,14 +5539,14 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 
 			// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
-			if (!windows[window_id].window_focused && mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+			if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
 				break;
 			}
 
-			DisplayServerEnums::WindowID receiving_window_id = window_id;
+			DisplayServer::WindowID receiving_window_id = window_id;
 			if (!windows[window_id].no_focus) {
 				receiving_window_id = _get_focused_window_or_popup();
-				if (receiving_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+				if (receiving_window_id == INVALID_WINDOW_ID) {
 					receiving_window_id = window_id;
 				}
 			}
@@ -6107,7 +5584,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			mm->set_position(Vector2(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)));
 			mm->set_global_position(Vector2(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)));
 
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED) {
 				Point2i c(windows[window_id].width / 2, windows[window_id].height / 2);
 				old_x = c.x;
 				old_y = c.y;
@@ -6288,18 +5765,18 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 
 			mb->set_position(Vector2(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)));
 
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED && !use_raw_input) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED && !use_raw_input) {
 				mb->set_position(Vector2(old_x, old_y));
 			}
 
 			if (uMsg != WM_MOUSEWHEEL && uMsg != WM_MOUSEHWHEEL) {
 				if (mb->is_pressed()) {
-					if (++pressrc > 0 && mouse_mode != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+					if (++pressrc > 0 && mouse_mode != MOUSE_MODE_CAPTURED) {
 						SetCapture(hWnd);
 					}
 				} else {
 					if (--pressrc <= 0 || mouse_get_button_state().is_empty()) {
-						if (mouse_mode != DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+						if (mouse_mode != MOUSE_MODE_CAPTURED) {
 							ReleaseCapture();
 						}
 						pressrc = 0;
@@ -6334,17 +5811,12 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			// on the same window dragging started.
 			if (mb->is_pressed()) {
 				last_mouse_button_down_window = window_id;
-			} else if (last_mouse_button_down_window != DisplayServerEnums::INVALID_WINDOW_ID) {
+			} else if (last_mouse_button_down_window != INVALID_WINDOW_ID) {
 				mb->set_window_id(last_mouse_button_down_window);
-				last_mouse_button_down_window = DisplayServerEnums::INVALID_WINDOW_ID;
+				last_mouse_button_down_window = INVALID_WINDOW_ID;
 			}
 		} break;
 
-		case WM_DISPLAYCHANGE: {
-			// Update HDR capabilities and reference luminance when display changes.
-			_update_hdr_output_for_tracked_windows();
-		} break;
-
 		case WM_WINDOWPOSCHANGED: {
 			WindowData &window = windows[window_id];
 
@@ -6424,11 +5896,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				if (window.create_completed && gl_manager_native && window.gl_native_window_created) {
 					gl_manager_native->window_resize(window_id, window.width + off.x, window.height + off.y);
 				}
-#if defined(ANGLE_ENABLED)
 				if (window.create_completed && gl_manager_angle && window.gl_angle_window_created) {
 					gl_manager_angle->window_resize(window_id, window.width + off.x, window.height + off.y);
 				}
-#endif
 #endif
 			}
 
@@ -6442,11 +5912,8 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					window.rect_changed_callback.call(Rect2i(window.last_pos.x, window.last_pos.y, window.width, window.height));
 				}
 
-				// Update HDR capabilities and reference luminance when window moves to different screen.
-				_update_hdr_output_for_tracked_windows();
-
 				// Update cursor clip region after window rect has changed.
-				if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN) {
+				if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 					RECT crect;
 					GetClientRect(window.hWnd, &crect);
 					crect.right -= off.x;
@@ -6526,10 +5993,10 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				break;
 			}
 
-			if (mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED) {
+			if (mouse_mode == MOUSE_MODE_CAPTURED) {
 				// When SetCapture is used, ALT+F4 hotkey is ignored by Windows, so handle it ourselves
 				if (wParam == VK_F4 && _get_mods().has_flag(WinKeyModifierMask::ALT) && (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN)) {
-					_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+					_send_window_event(windows[window_id], WINDOW_EVENT_CLOSE_REQUEST);
 				}
 			}
 			[[fallthrough]];
@@ -6637,17 +6104,20 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 
 		} break;
 		case WM_DESTROY: {
-			AccessibilityServer::get_singleton()->window_destroy(window_id);
-
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver) {
+				accessibility_driver->window_destroy(window_id);
+			}
+#endif
 			Input::get_singleton()->flush_buffered_events();
 			if (window_mouseover_id == window_id) {
-				window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
-				_send_window_event(windows[window_id], DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+				window_mouseover_id = INVALID_WINDOW_ID;
+				_send_window_event(windows[window_id], WINDOW_EVENT_MOUSE_EXIT);
 			}
 		} break;
 		case WM_SETCURSOR: {
 			if (LOWORD(lParam) == HTCLIENT) {
-				if (windows[window_id].window_focused && (mouse_mode == DisplayServerEnums::MOUSE_MODE_HIDDEN || mouse_mode == DisplayServerEnums::MOUSE_MODE_CAPTURED || mouse_mode == DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN)) {
+				if (windows[window_id].window_focused && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN)) {
 					// Hide the cursor.
 					if (hCursor == nullptr) {
 						hCursor = SetCursor(nullptr);
@@ -6656,8 +6126,8 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					}
 				} else {
 					if (hCursor != nullptr) {
-						DisplayServerEnums::CursorShape c = cursor_shape;
-						cursor_shape = DisplayServerEnums::CURSOR_MAX;
+						CursorShape c = cursor_shape;
+						cursor_shape = CURSOR_MAX;
 						cursor_set_shape(c);
 						hCursor = nullptr;
 					}
@@ -6683,7 +6153,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	}
 }
 
-void DisplayServerWindows::_process_activate_event(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWindows::_process_activate_event(WindowID p_window_id) {
 	WindowData &wd = windows[p_window_id];
 	if (wd.activate_state == WA_ACTIVE || wd.activate_state == WA_CLICKACTIVE) {
 		last_focused_window = p_window_id;
@@ -6692,9 +6162,12 @@ void DisplayServerWindows::_process_activate_event(DisplayServerEnums::WindowID
 			SetFocus(wd.hWnd);
 		}
 		wd.window_focused = true;
-		AccessibilityServer::get_singleton()->set_window_focused(p_window_id, true);
-
-		_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->accessibility_set_window_focused(p_window_id, true);
+		}
+#endif
+		_send_window_event(wd, WINDOW_EVENT_FOCUS_IN);
 	} else { // WM_INACTIVE.
 		Input::get_singleton()->release_pressed_events();
 		track_mouse_leave_event(wd.hWnd);
@@ -6707,9 +6180,12 @@ void DisplayServerWindows::_process_activate_event(DisplayServerEnums::WindowID
 			ReleaseCapture();
 		}
 		wd.window_focused = false;
-		AccessibilityServer::get_singleton()->set_window_focused(p_window_id, false);
-
-		_send_window_event(wd, DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->accessibility_set_window_focused(p_window_id, false);
+		}
+#endif
+		_send_window_event(wd, WINDOW_EVENT_FOCUS_OUT);
 	}
 
 	if ((tablet_get_current_driver() == "wintab") && wintab_available && wd.wtctx) {
@@ -6884,7 +6360,7 @@ void DisplayServerWindows::_process_key_events() {
 }
 
 void DisplayServerWindows::_update_tablet_ctx(const String &p_old_driver, const String &p_new_driver) {
-	for (KeyValue<DisplayServerEnums::WindowID, WindowData> &E : windows) {
+	for (KeyValue<WindowID, WindowData> &E : windows) {
 		WindowData &wd = E.value;
 		wd.block_mm = false;
 		if ((p_old_driver == "wintab") && wintab_available && wd.wtctx) {
@@ -6922,11 +6398,11 @@ void DisplayServerWindows::_update_tablet_ctx(const String &p_old_driver, const
 	}
 }
 
-Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent, HWND p_parent_hwnd, bool p_no_redirection_bitmap) {
+Error DisplayServerWindows::_create_window(WindowID p_window_id, WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent, HWND p_parent_hwnd, bool p_no_redirection_bitmap) {
 	DWORD dwExStyle;
 	DWORD dwStyle;
 
-	_get_window_style(p_window_id == DisplayServerEnums::MAIN_WINDOW_ID, false, (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN), p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN, p_flags & DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT, !(p_flags & DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED_BIT), p_flags & DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED_BIT, p_flags & DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED_BIT, p_mode == DisplayServerEnums::WINDOW_MODE_MINIMIZED, p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED, false, (p_flags & DisplayServerEnums::WINDOW_FLAG_NO_FOCUS_BIT) | (p_flags & DisplayServerEnums::WINDOW_FLAG_POPUP_BIT), p_parent_hwnd, p_no_redirection_bitmap, dwStyle, dwExStyle);
+	_get_window_style(p_window_id == MAIN_WINDOW_ID, false, (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN), p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN, p_flags & WINDOW_FLAG_BORDERLESS_BIT, !(p_flags & WINDOW_FLAG_RESIZE_DISABLED_BIT), p_flags & WINDOW_FLAG_MINIMIZE_DISABLED_BIT, p_flags & WINDOW_FLAG_MAXIMIZE_DISABLED_BIT, p_mode == WINDOW_MODE_MINIMIZED, p_mode == WINDOW_MODE_MAXIMIZED, false, (p_flags & WINDOW_FLAG_NO_FOCUS_BIT) | (p_flags & WINDOW_FLAG_POPUP_BIT), p_parent_hwnd, p_no_redirection_bitmap, dwStyle, dwExStyle);
 
 	int rq_screen = get_screen_from_rect(p_rect);
 	if (rq_screen < 0) {
@@ -6938,7 +6414,7 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 
 	RECT WindowRect;
 
-	Vector2i off = (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || ((p_flags & DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT) && p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED)) ? _get_screen_expand_offset(rq_screen) : Vector2i();
+	Vector2i off = (p_mode == WINDOW_MODE_FULLSCREEN || ((p_flags & WINDOW_FLAG_BORDERLESS_BIT) && p_mode == WINDOW_MODE_MAXIMIZED)) ? _get_screen_expand_offset(rq_screen) : Vector2i();
 
 	WindowRect.left = p_rect.position.x;
 	WindowRect.right = p_rect.position.x + p_rect.size.x + off.x;
@@ -6946,7 +6422,7 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 	WindowRect.bottom = p_rect.position.y + p_rect.size.y + off.y;
 
 	if (!p_parent_hwnd) {
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 			Rect2i screen_rect = Rect2i(screen_get_position(rq_screen), screen_get_size(rq_screen));
 
 			WindowRect.left = screen_rect.position.x;
@@ -6972,20 +6448,20 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 	WindowRect.top += offset.y;
 	WindowRect.bottom += offset.y;
 
-	if (p_mode != DisplayServerEnums::WINDOW_MODE_FULLSCREEN && p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+	if (p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, dwExStyle);
 	}
 
-	DisplayServerEnums::WindowID id = p_window_id;
+	WindowID id = p_window_id;
 	{
 		WindowData *wd_transient_parent = nullptr;
 		HWND owner_hwnd = nullptr;
 		if (p_parent_hwnd) {
 			owner_hwnd = p_parent_hwnd;
-		} else if (p_transient_parent != DisplayServerEnums::INVALID_WINDOW_ID) {
+		} else if (p_transient_parent != INVALID_WINDOW_ID) {
 			if (!windows.has(p_transient_parent)) {
 				ERR_PRINT("Condition \"!windows.has(p_transient_parent)\" is true.");
-				p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
+				p_transient_parent = INVALID_WINDOW_ID;
 			} else {
 				wd_transient_parent = &windows[p_transient_parent];
 				if (p_exclusive) {
@@ -7029,14 +6505,14 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 			AttachThreadInput(embeddedThreadId, mainThreadId, FALSE);
 		}
 
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 			wd.fullscreen = true;
-			if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN) {
+			if (p_mode == WINDOW_MODE_FULLSCREEN) {
 				wd.multiwindow_fs = true;
 			}
 		}
 
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
+		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 			// Save initial non-fullscreen rect.
 			Rect2i srect = screen_get_usable_rect(rq_screen);
 			Point2i wpos = p_rect.position;
@@ -7052,17 +6528,12 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 		}
 
 		wd.exclusive = p_exclusive;
-		bool on_top = (p_flags & DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP_BIT && p_mode != DisplayServerEnums::WINDOW_MODE_FULLSCREEN && p_mode != DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN);
 		if (wd_transient_parent) {
-			if (on_top) {
-				ERR_PRINT("Windows with the 'on top' can't become transient.");
-			} else {
-				wd.transient_parent = p_transient_parent;
-				wd_transient_parent->transient_children.insert(id);
-			}
+			wd.transient_parent = p_transient_parent;
+			wd_transient_parent->transient_children.insert(id);
 		}
 
-		wd.sharp_corners = p_flags & DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS_BIT;
+		wd.sharp_corners = p_flags & WINDOW_FLAG_SHARP_CORNERS_BIT;
 		{
 			DWORD value = wd.sharp_corners ? DWMWCP_DONOTROUND : DWMWCP_DEFAULT;
 			::DwmSetWindowAttribute(wd.hWnd, DWMWA_WINDOW_CORNER_PREFERENCE, &value, sizeof(value));
@@ -7105,12 +6576,12 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 			wd.wtctx = nullptr;
 		}
 
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED) {
+		if (p_mode == WINDOW_MODE_MAXIMIZED) {
 			wd.maximized = true;
 			wd.minimized = false;
 		}
 
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_MINIMIZED) {
+		if (p_mode == WINDOW_MODE_MINIMIZED) {
 			wd.maximized = false;
 			wd.minimized = true;
 		}
@@ -7152,7 +6623,7 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 
 		wd.im_position = Vector2();
 
-		if (p_mode == DisplayServerEnums::WINDOW_MODE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN || p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED) {
+		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN || p_mode == WINDOW_MODE_MAXIMIZED) {
 			RECT r;
 			GetClientRect(wd.hWnd, &r);
 			ClientToScreen(wd.hWnd, (POINT *)&r.left);
@@ -7170,7 +6641,7 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 
 		wd.create_completed = true;
 		// Set size of maximized borderless window (by default it covers the entire screen).
-		if (!p_parent_hwnd && p_mode == DisplayServerEnums::WINDOW_MODE_MAXIMIZED && (p_flags & DisplayServerEnums::WINDOW_FLAG_BORDERLESS_BIT)) {
+		if (!p_parent_hwnd && p_mode == WINDOW_MODE_MAXIMIZED && (p_flags & WINDOW_FLAG_BORDERLESS_BIT)) {
 			SetWindowPos(wd.hWnd, HWND_TOP, usable_rect.position.x - off.x, usable_rect.position.y - off.y, usable_rect.size.width + off.x, usable_rect.size.height + off.y, SWP_NOZORDER | SWP_NOACTIVATE);
 		}
 		_update_window_mouse_passthrough(id);
@@ -7179,7 +6650,7 @@ Error DisplayServerWindows::_create_window(DisplayServerEnums::WindowID p_window
 	return OK;
 }
 
-void DisplayServerWindows::_destroy_window(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWindows::_destroy_window(WindowID p_window_id) {
 	WindowData &wd = windows[p_window_id];
 
 	IPropertyStore *prop_store;
@@ -7201,23 +6672,12 @@ void DisplayServerWindows::_destroy_window(DisplayServerEnums::WindowID p_window
 		wd.drop_target->Release();
 	}
 
-	if (wd.icon_big) {
-		DestroyIcon(wd.icon_big);
-		wd.icon_buffer_big.clear();
-		wd.icon_big = nullptr;
-	}
-	if (wd.icon_small) {
-		DestroyIcon(wd.icon_small);
-		wd.icon_buffer_small.clear();
-		wd.icon_small = nullptr;
-	}
-
 	DestroyWindow(wd.hWnd);
 	windows.erase(p_window_id);
 }
 
 #ifdef RD_ENABLED
-Error DisplayServerWindows::_create_rendering_context_window(DisplayServerEnums::WindowID p_window_id, const String &p_rendering_driver) {
+Error DisplayServerWindows::_create_rendering_context_window(WindowID p_window_id, const String &p_rendering_driver) {
 	DEV_ASSERT(rendering_context != nullptr);
 
 	WindowData &wd = windows[p_window_id];
@@ -7252,7 +6712,7 @@ Error DisplayServerWindows::_create_rendering_context_window(DisplayServerEnums:
 	return OK;
 }
 
-void DisplayServerWindows::_destroy_rendering_context_window(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServerWindows::_destroy_rendering_context_window(WindowID p_window_id) {
 	DEV_ASSERT(rendering_context != nullptr);
 
 	WindowData &wd = windows[p_window_id];
@@ -7264,7 +6724,7 @@ void DisplayServerWindows::_destroy_rendering_context_window(DisplayServerEnums:
 #endif
 
 #ifdef GLES3_ENABLED
-Error DisplayServerWindows::_create_gl_window(DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServerWindows::_create_gl_window(WindowID p_window_id) {
 	if (gl_manager_native) {
 		WindowData &wd = windows[p_window_id];
 
@@ -7273,7 +6733,7 @@ Error DisplayServerWindows::_create_gl_window(DisplayServerEnums::WindowID p_win
 
 		wd.gl_native_window_created = true;
 	}
-#ifdef ANGLE_ENABLED
+
 	if (gl_manager_angle) {
 		WindowData &wd = windows[p_window_id];
 
@@ -7282,7 +6742,6 @@ Error DisplayServerWindows::_create_gl_window(DisplayServerEnums::WindowID p_win
 
 		wd.gl_angle_window_created = true;
 	}
-#endif
 
 	return OK;
 }
@@ -7526,7 +6985,7 @@ void DisplayServerWindows::tablet_set_current_driver(const String &p_driver) {
 	}
 }
 
-DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	KeyMappingWindows::initialize();
 
 	tested_drivers.clear();
@@ -7538,7 +6997,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 
 	pressrc = 0;
 	old_invalid = true;
-	mouse_mode = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	mouse_mode = MOUSE_MODE_VISIBLE;
 
 	rendering_driver = p_rendering_driver;
 
@@ -7549,6 +7008,19 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	}
 	native_menu = memnew(NativeMenuWindows);
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			if (OS::get_singleton()->is_stdout_verbose()) {
+				ERR_PRINT("Can't create an accessibility driver, accessibility support disabled!");
+			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	// Enforce default keep screen on value.
 	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 
@@ -7557,15 +7029,11 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	os_ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
 
 	HMODULE nt_lib = LoadLibraryW(L"ntdll.dll");
-#if defined(ANGLE_ENABLED)
 	bool is_wine = false;
-#endif
 	if (nt_lib) {
 		WineGetVersionPtr wine_get_version = (WineGetVersionPtr)(void *)GetProcAddress(nt_lib, "wine_get_version"); // Do not read Windows build number under Wine, it can be set to arbitrary value.
 		if (wine_get_version) {
-#if defined(ANGLE_ENABLED)
 			is_wine = true;
-#endif
 		} else {
 			RtlGetVersionPtr RtlGetVersion = (RtlGetVersionPtr)(void *)GetProcAddress(nt_lib, "RtlGetVersion");
 			if (RtlGetVersion) {
@@ -7708,7 +7176,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 		return;
 	}
 
-	_register_raw_input_devices(DisplayServerEnums::INVALID_WINDOW_ID);
+	_register_raw_input_devices(INVALID_WINDOW_ID);
 
 	String appname;
 	if (Engine::get_singleton()->is_editor_hint()) {
@@ -7747,14 +7215,14 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	if (p_position != nullptr) {
 		window_position = *p_position;
 	} else {
-		if (p_screen == DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) {
-			p_screen = DisplayServerEnums::SCREEN_PRIMARY;
+		if (p_screen == SCREEN_OF_MAIN_WINDOW) {
+			p_screen = SCREEN_PRIMARY;
 		}
 		Rect2i scr_rect = screen_get_usable_rect(p_screen);
 		window_position = scr_rect.position + (scr_rect.size - p_resolution) / 2;
 	}
 
-	HWND parent_hwnd = nullptr;
+	HWND parent_hwnd = NULL;
 	if (p_parent_window) {
 		// Parented window.
 		parent_hwnd = (HWND)p_parent_window;
@@ -7819,23 +7287,23 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 #endif
 				if (cur_no_redirection_bitmap_value != new_no_redirection_bitmap_value) {
 					if (main_window_created) {
-						_destroy_window(DisplayServerEnums::MAIN_WINDOW_ID);
+						_destroy_window(MAIN_WINDOW_ID);
 						main_window_created = false;
 					}
 					cur_no_redirection_bitmap_value = new_no_redirection_bitmap_value;
 				}
 
 				if (!main_window_created) {
-					if (_create_window(DisplayServerEnums::MAIN_WINDOW_ID, p_mode, p_flags, Rect2i(window_position, p_resolution), false, DisplayServerEnums::INVALID_WINDOW_ID, parent_hwnd, cur_no_redirection_bitmap_value) != OK) {
+					if (_create_window(MAIN_WINDOW_ID, p_mode, p_flags, Rect2i(window_position, p_resolution), false, INVALID_WINDOW_ID, parent_hwnd, cur_no_redirection_bitmap_value) != OK) {
 						r_error = ERR_UNAVAILABLE;
 						ERR_FAIL_MSG("Failed to create main window.");
 					}
 					main_window_created = true;
 				}
 
-				if (_create_rendering_context_window(DisplayServerEnums::MAIN_WINDOW_ID, tested_rendering_driver) == OK) {
+				if (_create_rendering_context_window(MAIN_WINDOW_ID, tested_rendering_driver) == OK) {
 					rendering_device = memnew(RenderingDevice);
-					if (rendering_device->initialize(rendering_context, DisplayServerEnums::MAIN_WINDOW_ID) == OK) {
+					if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) == OK) {
 #ifdef VULKAN_ENABLED
 						if (rendering_driver == "vulkan" && tested_rendering_driver == "d3d12") {
 							WARN_PRINT("Your video card drivers seem not to support Vulkan, switching to Direct3D 12.");
@@ -7847,7 +7315,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 						}
 #endif
 						rendering_driver = tested_rendering_driver;
-						OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, i > 0 ? OS::RENDERING_SOURCE_FALLBACK : OS::get_singleton()->get_current_rendering_driver_name_source());
+						OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 
 						break;
 					}
@@ -7855,7 +7323,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 					memdelete(rendering_device);
 					rendering_device = nullptr;
 
-					_destroy_rendering_context_window(DisplayServerEnums::MAIN_WINDOW_ID);
+					_destroy_rendering_context_window(MAIN_WINDOW_ID);
 				}
 			}
 
@@ -7873,8 +7341,8 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 			tested_drivers.set_flag(DRIVER_ID_COMPAT_OPENGL3);
 			WARN_PRINT("Your video card drivers seem not to support Direct3D 12 or Vulkan, switching to OpenGL 3.");
 			rendering_driver = "opengl3";
-			OS::get_singleton()->set_current_rendering_method("gl_compatibility", OS::RENDERING_SOURCE_FALLBACK);
-			OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+			OS::get_singleton()->set_current_rendering_method("gl_compatibility");
+			OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			rendering_driver_failed = false;
 		}
 	}
@@ -7887,21 +7355,15 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 #endif
 
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
+
 	bool fallback = GLOBAL_GET("rendering/gl_compatibility/fallback_to_angle");
 	bool show_warning = true;
-#endif
 
 	if (rendering_driver == "opengl3") {
 		// There's no native OpenGL drivers on Windows for ARM, always enable fallback.
 #if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
-#if defined(ANGLE_ENABLED)
 		fallback = true;
 		show_warning = false;
-#else
-		r_error = ERR_UNAVAILABLE;
-		ERR_FAIL_MSG("Could not initialize OpenGL.");
-#endif
 #else
 		typedef BOOL(WINAPI * IsWow64Process2Ptr)(HANDLE, USHORT *, USHORT *);
 
@@ -7913,19 +7375,13 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 				machine_arch = 0;
 			}
 			if (machine_arch == 0xAA64) {
-#if defined(ANGLE_ENABLED)
 				fallback = true;
 				show_warning = false;
-#else
-				r_error = ERR_UNAVAILABLE;
-				ERR_FAIL_MSG("Could not initialize OpenGL.");
-#endif
 			}
 		}
 #endif
 	}
 
-#if defined(ANGLE_ENABLED)
 	bool gl_supported = true;
 	if (fallback && !is_wine && (rendering_driver == "opengl3")) {
 		Dictionary gl_info = detect_wgl();
@@ -7968,7 +7424,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 				}
 			}
 			rendering_driver = "opengl3_angle";
-			OS::get_singleton()->set_current_rendering_driver_name(rendering_driver, OS::RENDERING_SOURCE_FALLBACK);
+			OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 		}
 	}
 
@@ -7981,15 +7437,19 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 			gl_manager_angle = nullptr;
 			bool fallback_to_native = GLOBAL_GET("rendering/gl_compatibility/fallback_to_native");
 			if (fallback_to_native && gl_supported) {
+#ifdef EGL_STATIC
 				WARN_PRINT("Your video card drivers seem not to support GLES3 / ANGLE, switching to native OpenGL.");
+#else
+				WARN_PRINT("Your video card drivers seem not to support GLES3 / ANGLE or ANGLE dynamic libraries (libEGL.dll and libGLESv2.dll) are missing, switching to native OpenGL.");
+#endif
 				rendering_driver = "opengl3";
+				OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
 			} else {
 				r_error = ERR_UNAVAILABLE;
 				ERR_FAIL_MSG("Could not initialize ANGLE OpenGL.");
 			}
 		}
 	}
-#endif // ANGLE_ENABLED
 	if (rendering_driver == "opengl3") {
 		gl_manager_native = memnew(GLManagerNative_Windows);
 		tested_drivers.set_flag(DRIVER_ID_COMPAT_OPENGL3);
@@ -8015,7 +7475,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	if (main_window_created) {
 		if (no_redirection_bitmap != cur_no_redirection_bitmap_value) {
 			DEV_ASSERT(rendering_context == nullptr);
-			_destroy_window(DisplayServerEnums::MAIN_WINDOW_ID);
+			_destroy_window(MAIN_WINDOW_ID);
 		} else {
 			should_create_main_window = false;
 		}
@@ -8023,7 +7483,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 #endif
 
 	if (should_create_main_window) {
-		if (_create_window(DisplayServerEnums::MAIN_WINDOW_ID, p_mode, p_flags, Rect2i(window_position, p_resolution), false, DisplayServerEnums::INVALID_WINDOW_ID, parent_hwnd, no_redirection_bitmap) != OK) {
+		if (_create_window(MAIN_WINDOW_ID, p_mode, p_flags, Rect2i(window_position, p_resolution), false, INVALID_WINDOW_ID, parent_hwnd, no_redirection_bitmap) != OK) {
 			r_error = ERR_UNAVAILABLE;
 			ERR_FAIL_MSG("Failed to create main window.");
 		}
@@ -8032,30 +7492,28 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 
 #ifdef GLES3_ENABLED
 	if (rendering_driver == "opengl3") {
-		if (_create_gl_window(DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (_create_gl_window(MAIN_WINDOW_ID) != OK) {
 			memdelete(gl_manager_native);
 			gl_manager_native = nullptr;
-			windows.erase(DisplayServerEnums::MAIN_WINDOW_ID);
+			windows.erase(MAIN_WINDOW_ID);
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
 		RasterizerGLES3::make_current(true);
 	}
-#ifdef ANGLE_ENABLED
 	if (rendering_driver == "opengl3_angle") {
-		if (_create_gl_window(DisplayServerEnums::MAIN_WINDOW_ID) != OK) {
+		if (_create_gl_window(MAIN_WINDOW_ID) != OK) {
 			memdelete(gl_manager_angle);
 			gl_manager_angle = nullptr;
-			windows.erase(DisplayServerEnums::MAIN_WINDOW_ID);
+			windows.erase(MAIN_WINDOW_ID);
 			r_error = ERR_UNAVAILABLE;
 			return;
 		}
 		RasterizerGLES3::make_current(false);
 	}
-#endif
 #endif
 
-	window_set_vsync_mode(p_vsync_mode, DisplayServerEnums::MAIN_WINDOW_ID);
+	window_set_vsync_mode(p_vsync_mode, MAIN_WINDOW_ID);
 
 #ifdef SDL_ENABLED
 	joypad_sdl = memnew(JoypadSDL);
@@ -8066,13 +7524,13 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	}
 #endif
 
-	for (int i = 0; i < DisplayServerEnums::WINDOW_FLAG_MAX; i++) {
+	for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
 		if (p_flags & (1 << i)) {
-			window_set_flag(DisplayServerEnums::WindowFlags(i), true, DisplayServerEnums::MAIN_WINDOW_ID);
+			window_set_flag(WindowFlags(i), true, MAIN_WINDOW_ID);
 		}
 	}
 
-	windows[DisplayServerEnums::MAIN_WINDOW_ID].initialized = true;
+	windows[MAIN_WINDOW_ID].initialized = true;
 
 #ifdef ACCESSKIT_ENABLED
 	if (accessibility_screen_reader_active()) {
@@ -8098,7 +7556,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 	if (rendering_context) {
 		DEV_ASSERT(rendering_device != nullptr);
 
-		rendering_device->screen_create(DisplayServerEnums::MAIN_WINDOW_ID);
+		rendering_device->screen_create(MAIN_WINDOW_ID);
 
 		RendererCompositorRD::make_current();
 	}
@@ -8121,13 +7579,13 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Dis
 		SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);
 	}
 
-	cursor_shape = DisplayServerEnums::CURSOR_ARROW;
+	cursor_shape = CURSOR_ARROW;
 
-	_update_real_mouse_position(DisplayServerEnums::MAIN_WINDOW_ID);
+	_update_real_mouse_position(MAIN_WINDOW_ID);
 
 	r_error = OK;
 
-	static_cast<OS_Windows *>(OS::get_singleton())->set_main_window(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd);
+	static_cast<OS_Windows *>(OS::get_singleton())->set_main_window(windows[MAIN_WINDOW_ID].hWnd);
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
 }
 
@@ -8142,16 +7600,14 @@ Vector<String> DisplayServerWindows::get_rendering_drivers_func() {
 #endif
 #ifdef GLES3_ENABLED
 	drivers.push_back("opengl3");
-#ifdef ANGLE_ENABLED
 	drivers.push_back("opengl3_angle");
-#endif
 #endif
 	drivers.push_back("dummy");
 
 	return drivers;
 }
 
-DisplayServer *DisplayServerWindows::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServerWindows::create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	DisplayServer *ds = memnew(DisplayServerWindows(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error));
 	if (r_error != OK) {
 		if (tested_drivers == 0) {
@@ -8223,11 +7679,11 @@ DisplayServerWindows::~DisplayServerWindows() {
 	cursors_cache.clear();
 
 	// Destroy all status indicators.
-	for (HashMap<DisplayServerEnums::IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
+	for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
 		NOTIFYICONDATAW ndat;
 		ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
 		ndat.cbSize = sizeof(NOTIFYICONDATAW);
-		ndat.hWnd = windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd;
+		ndat.hWnd = windows[MAIN_WINDOW_ID].hWnd;
 		ndat.uID = E->key;
 		ndat.uVersion = NOTIFYICON_VERSION;
 
@@ -8245,7 +7701,7 @@ DisplayServerWindows::~DisplayServerWindows() {
 	}
 
 	if (user_proc) {
-		SetWindowLongPtr(windows[DisplayServerEnums::MAIN_WINDOW_ID].hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc);
+		SetWindowLongPtr(windows[MAIN_WINDOW_ID].hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc);
 	}
 
 	// Close power request handle.
@@ -8261,17 +7717,17 @@ DisplayServerWindows::~DisplayServerWindows() {
 	// FIXME wglDeleteContext is never called
 #endif
 
-	if (windows.has(DisplayServerEnums::MAIN_WINDOW_ID)) {
+	if (windows.has(MAIN_WINDOW_ID)) {
 #ifdef RD_ENABLED
 		if (rendering_device) {
-			rendering_device->screen_free(DisplayServerEnums::MAIN_WINDOW_ID);
+			rendering_device->screen_free(MAIN_WINDOW_ID);
 		}
 
 		if (rendering_context) {
-			rendering_context->window_destroy(DisplayServerEnums::MAIN_WINDOW_ID);
+			rendering_context->window_destroy(MAIN_WINDOW_ID);
 		}
 #endif
-		_destroy_window(DisplayServerEnums::MAIN_WINDOW_ID);
+		_destroy_window(MAIN_WINDOW_ID);
 	}
 
 #ifdef RD_ENABLED
@@ -8286,20 +7742,34 @@ DisplayServerWindows::~DisplayServerWindows() {
 	}
 #endif
 
+	if (icon_big) {
+		DestroyIcon(icon_big);
+		icon_buffer_big.clear();
+		icon_big = nullptr;
+	}
+	if (icon_small) {
+		DestroyIcon(icon_small);
+		icon_buffer_small.clear();
+		icon_small = nullptr;
+	}
+
 	if (restore_mouse_trails > 1) {
 		SystemParametersInfoA(SPI_SETMOUSETRAILS, restore_mouse_trails, nullptr, 0);
 	}
 #ifdef GLES3_ENABLED
-#ifdef ANGLE_ENABLED
 	if (gl_manager_angle) {
 		memdelete(gl_manager_angle);
 		gl_manager_angle = nullptr;
 	}
-#endif
 	if (gl_manager_native) {
 		memdelete(gl_manager_native);
 		gl_manager_native = nullptr;
 	}
+#endif
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
 #endif
 	if (tts) {
 		memdelete(tts);
diff --git a/engine/platform/windows/display_server_windows.h b/engine/platform/windows/display_server_windows.h
index ad2216de..11885e6b 100644
--- a/engine/platform/windows/display_server_windows.h
+++ b/engine/platform/windows/display_server_windows.h
@@ -30,14 +30,21 @@
 
 #pragma once
 
+#include "crash_handler_windows.h"
+#include "key_mapping_windows.h"
+#include "tts_windows.h"
+
 #include "core/config/project_settings.h"
-#include "core/input/input_event.h"
+#include "core/input/input.h"
 #include "core/io/image.h"
-#include "core/os/process_id.h"
-#include "core/templates/a_hash_map.h"
-#include "core/templates/rb_map.h"
+#include "core/os/os.h"
+#include "drivers/wasapi/audio_driver_wasapi.h"
+#include "drivers/winmidi/midi_driver_winmidi.h"
+#include "servers/audio/audio_server.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifdef XAUDIO2_ENABLED
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
@@ -48,16 +55,17 @@
 #endif
 
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 #include "gl_manager_windows_angle.h"
-#endif // ANGLE_ENABLED
 #include "gl_manager_windows_native.h"
 #endif // GLES3_ENABLED
 
-#include <windows.h>
+#include "native_menu_windows.h"
 
 #include <io.h>
-#include <shobjidl.h>
+#include <cstdio>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <windowsx.h>
 
 // WinTab API
@@ -152,7 +160,7 @@ enum PreferredAppMode {
 	APPMODE_MAX = 4
 };
 
-typedef const char *(CDECL *WineGetVersionPtr)();
+typedef const char *(CDECL *WineGetVersionPtr)(void);
 typedef bool(WINAPI *ShouldAppsUseDarkModePtr)();
 typedef DWORD(WINAPI *GetImmersiveColorFromColorSetExPtr)(UINT dwImmersiveColorSet, UINT dwImmersiveColorType, bool bIgnoreHighContrast, UINT dwHighContrastCacheMode);
 typedef int(WINAPI *GetImmersiveColorTypeFromNamePtr)(const WCHAR *name);
@@ -182,8 +190,6 @@ typedef struct {
 } ICONDIR, *LPICONDIR;
 
 class DropTargetWindows;
-class NativeMenuWindows;
-class TTS_Windows;
 
 #ifndef WDA_EXCLUDEFROMCAPTURE
 #define WDA_EXCLUDEFROMCAPTURE 0x00000011
@@ -240,14 +246,14 @@ class DisplayServerWindows : public DisplayServer {
 	};
 
 	struct KeyEvent {
-		DisplayServerEnums::WindowID window_id;
+		WindowID window_id;
 		bool alt, shift, control, meta, altgr;
 		UINT uMsg;
 		WPARAM wParam;
 		LPARAM lParam;
 	};
 
-	DisplayServerEnums::WindowID window_mouseover_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	WindowID window_mouseover_id = INVALID_WINDOW_ID;
 
 	KeyEvent key_event_buffer[KEY_EVENT_BUFFER_SIZE];
 	int key_event_pos;
@@ -257,9 +263,7 @@ class DisplayServerWindows : public DisplayServer {
 	Point2i center;
 
 #if defined(GLES3_ENABLED)
-#if defined(ANGLE_ENABLED)
 	GLManagerANGLE_Windows *gl_manager_angle = nullptr;
-#endif
 	GLManagerNative_Windows *gl_manager_native = nullptr;
 #endif
 
@@ -270,6 +274,11 @@ class DisplayServerWindows : public DisplayServer {
 
 	RBMap<int, Vector2> touch_state;
 
+	Vector<BYTE> icon_buffer_big;
+	HICON icon_big = nullptr;
+	Vector<BYTE> icon_buffer_small;
+	HICON icon_small = nullptr;
+
 	int pressrc;
 	HINSTANCE hInstance; // Holds The Instance Of The Application
 	String rendering_driver;
@@ -280,15 +289,12 @@ class DisplayServerWindows : public DisplayServer {
 
 	TTS_Windows *tts = nullptr;
 	NativeMenuWindows *native_menu = nullptr;
-	ITaskbarList3 *taskbar = nullptr;
 
 	struct WindowData {
 		HWND hWnd;
-		DisplayServerEnums::WindowID id;
+		WindowID id;
 
 		Vector<Vector2> mpath;
-		DisplayServerEnums::ProgressState progress_state = DisplayServerEnums::PROGRESS_STATE_NOPROGRESS;
-		float progress_value = 0.0;
 
 		bool create_completed = false;
 		bool pre_fs_valid = false;
@@ -313,9 +319,7 @@ class DisplayServerWindows : public DisplayServer {
 		bool exclusive = false;
 		bool rendering_context_window_created = false;
 		bool gl_native_window_created = false;
-#ifdef ANGLE_ENABLED
 		bool gl_angle_window_created = false;
-#endif
 		bool mpass = false;
 		bool sharp_corners = false;
 		bool hide_from_capture = false;
@@ -350,11 +354,6 @@ class DisplayServerWindows : public DisplayServer {
 		Point2 last_pos;
 
 		ObjectID instance_id;
-		bool icon_set = false;
-		Vector<BYTE> icon_buffer_big;
-		HICON icon_big = nullptr;
-		Vector<BYTE> icon_buffer_small;
-		HICON icon_small = nullptr;
 
 		// IME
 		HIMC im_himc;
@@ -374,20 +373,15 @@ class DisplayServerWindows : public DisplayServer {
 		// OLE API
 		DropTargetWindows *drop_target = nullptr;
 
-		DisplayServerEnums::WindowID transient_parent = DisplayServerEnums::INVALID_WINDOW_ID;
-		HashSet<DisplayServerEnums::WindowID> transient_children;
+		WindowID transient_parent = INVALID_WINDOW_ID;
+		HashSet<WindowID> transient_children;
 
 		bool is_popup = false;
 		Rect2i parent_safe_rect;
 
-		// HDR
-		bool hdr_output_requested = false;
-		float hdr_output_reference_luminance = -1.0f;
-		float hdr_output_max_luminance = -1.0f;
-
 		bool initialized = false;
 
-		HWND parent_hwnd = nullptr;
+		HWND parent_hwnd = 0;
 
 		bool no_redirection_bitmap = false;
 	};
@@ -396,28 +390,26 @@ class DisplayServerWindows : public DisplayServer {
 	JoypadSDL *joypad_sdl = nullptr;
 #endif
 	HHOOK mouse_monitor = nullptr;
-	List<DisplayServerEnums::WindowID> popup_list;
+	List<WindowID> popup_list;
 	uint64_t time_since_popup = 0;
 
-	Error _create_window(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent, HWND p_parent_hwnd, bool p_no_redirection_bitmap);
-	void _destroy_window(DisplayServerEnums::WindowID p_window_id); // Destroys only what was needed to be created for the main window. Does not destroy transient parent dependencies or GL/rendering context windows.
-
-	void _window_set_native_icon(const String &p_filename, DisplayServerEnums::WindowID p_window);
+	Error _create_window(WindowID p_window_id, WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent, HWND p_parent_hwnd, bool p_no_redirection_bitmap);
+	void _destroy_window(WindowID p_window_id); // Destroys only what was needed to be created for the main window. Does not destroy transient parent dependencies or GL/rendering context windows.
 
 #ifdef RD_ENABLED
-	Error _create_rendering_context_window(DisplayServerEnums::WindowID p_window_id, const String &p_rendering_driver);
-	void _destroy_rendering_context_window(DisplayServerEnums::WindowID p_window_id);
+	Error _create_rendering_context_window(WindowID p_window_id, const String &p_rendering_driver);
+	void _destroy_rendering_context_window(WindowID p_window_id);
 #endif
 
 #ifdef GLES3_ENABLED
-	Error _create_gl_window(DisplayServerEnums::WindowID p_window_id);
+	Error _create_gl_window(WindowID p_window_id);
 #endif
 
-	DisplayServerEnums::WindowID window_id_counter = DisplayServerEnums::MAIN_WINDOW_ID;
-	RBMap<DisplayServerEnums::WindowID, WindowData> windows;
+	WindowID window_id_counter = MAIN_WINDOW_ID;
+	RBMap<WindowID, WindowData> windows;
 
-	DisplayServerEnums::WindowID last_focused_window = DisplayServerEnums::INVALID_WINDOW_ID;
-	DisplayServerEnums::WindowID last_mouse_button_down_window = DisplayServerEnums::INVALID_WINDOW_ID;
+	WindowID last_focused_window = INVALID_WINDOW_ID;
+	WindowID last_mouse_button_down_window = INVALID_WINDOW_ID;
 	HCURSOR hCursor;
 
 	WNDPROC user_proc = nullptr;
@@ -429,11 +421,11 @@ class DisplayServerWindows : public DisplayServer {
 		HICON icon = nullptr;
 	};
 
-	DisplayServerEnums::IndicatorID indicator_id_counter = 0;
-	HashMap<DisplayServerEnums::IndicatorID, IndicatorData> indicators;
+	IndicatorID indicator_id_counter = 0;
+	HashMap<IndicatorID, IndicatorData> indicators;
 
 	struct FileDialogData {
-		HWND hwnd_owner = nullptr;
+		HWND hwnd_owner = 0;
 		Rect2i wrect;
 		String appid;
 		String title;
@@ -441,10 +433,10 @@ class DisplayServerWindows : public DisplayServer {
 		String root;
 		String filename;
 		bool show_hidden = false;
-		DisplayServerEnums::FileDialogMode mode = DisplayServerEnums::FileDialogMode::FILE_DIALOG_MODE_OPEN_ANY;
+		DisplayServer::FileDialogMode mode = FileDialogMode::FILE_DIALOG_MODE_OPEN_ANY;
 		Vector<String> filters;
 		TypedArray<Dictionary> options;
-		DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+		WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
 		Callable callback;
 		bool options_in_cb = false;
 		Thread listener_thread;
@@ -472,12 +464,12 @@ class DisplayServerWindows : public DisplayServer {
 	HashMap<int64_t, LONG> pointer_down_time;
 	HashMap<int64_t, Vector2> pointer_last_pos;
 
-	void _send_window_event(const WindowData &wd, DisplayServerEnums::WindowEvent p_event);
+	void _send_window_event(const WindowData &wd, WindowEvent p_event);
 	void _get_window_style(bool p_main_window, bool p_initialized, bool p_fullscreen, bool p_multiwindow_fs, bool p_borderless, bool p_resizable, bool p_no_min_btn, bool p_no_max_btn, bool p_minimized, bool p_maximized, bool p_maximized_fs, bool p_no_activate_focus, bool p_embed_child, bool p_no_redirection_bitmap, DWORD &r_style, DWORD &r_style_ex);
 
-	DisplayServerEnums::MouseMode mouse_mode;
-	DisplayServerEnums::MouseMode mouse_mode_base = DisplayServerEnums::MOUSE_MODE_VISIBLE;
-	DisplayServerEnums::MouseMode mouse_mode_override = DisplayServerEnums::MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode;
+	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
+	MouseMode mouse_mode_override = MOUSE_MODE_VISIBLE;
 	bool mouse_mode_override_enabled = false;
 	void _mouse_update_mode();
 	int restore_mouse_trails = 0;
@@ -490,28 +482,28 @@ class DisplayServerWindows : public DisplayServer {
 	HBRUSH window_bkg_brush = nullptr;
 	uint32_t window_bkg_brush_color = 0;
 
-	HCURSOR cursors[DisplayServerEnums::CURSOR_MAX] = { nullptr };
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CursorShape::CURSOR_ARROW;
-	RBMap<DisplayServerEnums::CursorShape, Vector<Variant>> cursors_cache;
+	HCURSOR cursors[CURSOR_MAX] = { nullptr };
+	CursorShape cursor_shape = CursorShape::CURSOR_ARROW;
+	RBMap<CursorShape, Vector<Variant>> cursors_cache;
 
 	Callable system_theme_changed;
 
-	void _drag_event(DisplayServerEnums::WindowID p_window, float p_x, float p_y, int idx);
-	void _touch_event(DisplayServerEnums::WindowID p_window, bool p_pressed, float p_x, float p_y, int idx);
+	void _drag_event(WindowID p_window, float p_x, float p_y, int idx);
+	void _touch_event(WindowID p_window, bool p_pressed, float p_x, float p_y, int idx);
 
-	bool _is_always_on_top_recursive(DisplayServerEnums::WindowID p_window) const;
+	bool _is_always_on_top_recursive(WindowID p_window) const;
 
-	void _update_window_style(DisplayServerEnums::WindowID p_window, bool p_repaint = true);
-	void _update_window_mouse_passthrough(DisplayServerEnums::WindowID p_window);
+	void _update_window_style(WindowID p_window, bool p_repaint = true);
+	void _update_window_mouse_passthrough(WindowID p_window);
 
-	void _update_real_mouse_position(DisplayServerEnums::WindowID p_window);
+	void _update_real_mouse_position(WindowID p_window);
 
-	void _set_mouse_mode_impl(DisplayServerEnums::MouseMode p_mode);
-	DisplayServerEnums::WindowID _get_focused_window_or_popup() const;
-	void _register_raw_input_devices(DisplayServerEnums::WindowID p_target_window);
+	void _set_mouse_mode_impl(MouseMode p_mode);
+	WindowID _get_focused_window_or_popup() const;
+	void _register_raw_input_devices(WindowID p_target_window);
 	bool _has_moving_window() const;
 
-	void _process_activate_event(DisplayServerEnums::WindowID p_window_id);
+	void _process_activate_event(WindowID p_window_id);
 	void _process_key_events();
 
 	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
@@ -531,44 +523,31 @@ class DisplayServerWindows : public DisplayServer {
 	};
 	BitField<WinKeyModifierMask> _get_mods() const;
 
-	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, DisplayServerEnums::WindowID p_window_id);
+	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id);
 
 	String _get_keyboard_layout_display_name(const String &p_klid) const;
 	String _get_klid(HKL p_hkl) const;
 
 	struct EmbeddedProcessData {
-		HWND window_handle = nullptr;
-		HWND parent_window_handle = nullptr;
+		HWND window_handle = 0;
+		HWND parent_window_handle = 0;
 		bool is_visible = false;
 	};
-	HashMap<ProcessID, EmbeddedProcessData *> embedded_processes;
+	HashMap<OS::ProcessID, EmbeddedProcessData *> embedded_processes;
 
-	HWND _find_window_from_process_id(ProcessID p_pid, HWND p_current_hwnd);
+	HWND _find_window_from_process_id(OS::ProcessID p_pid, HWND p_current_hwnd);
 
 	void initialize_tts() const;
 
-	struct ScreenHdrData {
-		bool hdr_supported = false;
-		float min_luminance = 0.0f;
-		float max_luminance = 0.0f;
-		float max_average_luminance = 0.0f;
-		float sdr_white_level = 0.0f;
-	};
-	AHashMap<int, ScreenHdrData> hdr_output_cache;
-
-	ScreenHdrData _get_screen_hdr_data(int p_screen) const;
-	void _update_hdr_output_for_window(DisplayServerEnums::WindowID p_window, const WindowData &p_window_data, ScreenHdrData p_screen_data);
-	void _update_hdr_output_for_tracked_windows();
-
 public:
 	LRESULT WndProcFileDialog(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	LRESULT WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	LRESULT MouseProc(int code, WPARAM wParam, LPARAM lParam);
 
-	void popup_open(DisplayServerEnums::WindowID p_window);
-	void popup_close(DisplayServerEnums::WindowID p_window);
+	void popup_open(WindowID p_window);
+	void popup_close(WindowID p_window);
 
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
 	virtual bool tts_is_speaking() const override;
@@ -586,15 +565,15 @@ public:
 	virtual Color get_base_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 
 	virtual void beep() const override;
 
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const override;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override;
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const override;
+	virtual void mouse_set_mode(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode() const override;
+	virtual void mouse_set_mode_override(MouseMode p_mode) override;
+	virtual MouseMode mouse_get_mode_override() const override;
 	virtual void mouse_set_mode_override_enabled(bool p_override_enabled) override;
 	virtual bool mouse_is_mode_override_enabled() const override;
 
@@ -611,92 +590,88 @@ public:
 	virtual int get_screen_count() const override;
 	virtual int get_primary_screen() const override;
 	virtual int get_keyboard_focus_screen() const override;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual Color screen_get_pixel(const Point2i &p_position) const override;
-	virtual Ref<Image> screen_get_image(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override;
+	virtual Ref<Image> screen_get_image(int p_screen = SCREEN_OF_MAIN_WINDOW) const override;
 	virtual Ref<Image> screen_get_image_rect(const Rect2i &p_rect) const override;
 
 	virtual void screen_set_keep_on(bool p_enable) override; //disable screensaver
 	virtual bool screen_is_kept_on() const override;
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const override;
+	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
 
-	virtual DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID) override;
-	virtual void show_window(DisplayServerEnums::WindowID p_window) override;
-	virtual void delete_sub_window(DisplayServerEnums::WindowID p_window) override;
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override;
+	virtual void show_window(WindowID p_window) override;
+	virtual void delete_sub_window(WindowID p_window) override;
 
-	virtual DisplayServerEnums::WindowID window_get_active_popup() const override;
-	virtual void window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) override;
-	virtual Rect2i window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const override;
+	virtual WindowID window_get_active_popup() const override;
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override;
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override;
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void gl_window_make_current(DisplayServerEnums::WindowID p_window_id) override;
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id) override;
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_title_size(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_title_size(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override;
-	virtual void window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive) override;
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
+	virtual void window_set_exclusive(WindowID p_window, bool p_exclusive) override;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override;
 
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual WindowID get_focused_window() const override;
 
-	virtual DisplayServerEnums::WindowID get_focused_window() const override;
-
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual bool can_any_window_draw() const override;
 
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
 	virtual int accessibility_should_increase_contrast() const override;
 	virtual int accessibility_should_reduce_animation() const override;
@@ -706,39 +681,23 @@ public:
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_vsync_mode) const override;
+	virtual void window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual DisplayServer::VSyncMode window_get_vsync_mode(WindowID p_vsync_mode) const override;
 
-	virtual bool window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
+	virtual void window_start_drag(WindowID p_window = MAIN_WINDOW_ID) override;
+	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window = MAIN_WINDOW_ID) override;
 
-	virtual void window_request_hdr_output(const bool p_enable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual bool window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual bool window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-	virtual float window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override;
-
-	virtual void window_start_drag(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-	virtual void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override;
-
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override;
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const override;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
+	virtual void cursor_set_shape(CursorShape p_shape) override;
+	virtual CursorShape cursor_get_shape() const override;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
 
 	virtual bool get_swap_cancel_ok() override;
 
-	virtual void enable_for_stealing_focus(ProcessID pid) override;
-	virtual Error embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
-	virtual Error request_close_embedded_process(ProcessID p_pid) override;
-	virtual Error remove_embedded_process(ProcessID p_pid) override;
-	virtual ProcessID get_focused_process_id() override;
+	virtual void enable_for_stealing_focus(OS::ProcessID pid) override;
+	virtual Error embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) override;
+	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;
+	virtual Error remove_embedded_process(OS::ProcessID p_pid) override;
+	virtual OS::ProcessID get_focused_process_id() override;
 
 	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) override;
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override;
@@ -767,22 +726,22 @@ public:
 	virtual void set_native_icon(const String &p_filename) override;
 	virtual void set_icon(const Ref<Image> &p_icon) override;
 
-	virtual DisplayServerEnums::IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override;
-	virtual void status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) override;
-	virtual void status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) override;
-	virtual void status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_rid) override;
-	virtual void status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) override;
-	virtual Rect2 status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const override;
-	virtual void delete_status_indicator(DisplayServerEnums::IndicatorID p_id) override;
+	virtual IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override;
+	virtual void status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) override;
+	virtual void status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) override;
+	virtual void status_indicator_set_menu(IndicatorID p_id, const RID &p_rid) override;
+	virtual void status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) override;
+	virtual Rect2 status_indicator_get_rect(IndicatorID p_id) const override;
+	virtual void delete_status_indicator(IndicatorID p_id) override;
 
-	virtual void set_context(DisplayServerEnums::Context p_context) override;
+	virtual void set_context(Context p_context) override;
 
 	virtual bool is_window_transparency_available() const override;
 
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	static Vector<String> get_rendering_drivers_func();
 	static void register_windows_driver();
 
-	DisplayServerWindows(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	DisplayServerWindows(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerWindows();
 };
diff --git a/engine/platform/windows/doc_classes/EditorExportPlatformWindows.xml b/engine/platform/windows/doc_classes/EditorExportPlatformWindows.xml
index 01e08c0f..5c263d95 100644
--- a/engine/platform/windows/doc_classes/EditorExportPlatformWindows.xml
+++ b/engine/platform/windows/doc_classes/EditorExportPlatformWindows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorExportPlatformWindows" inherits="EditorExportPlatformPC" api_type="editor" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="EditorExportPlatformWindows" inherits="EditorExportPlatformPC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
 		Exporter for Windows.
 	</brief_description>
diff --git a/engine/platform/windows/export/export.cpp b/engine/platform/windows/export/export.cpp
index cc74901f..bf52006c 100644
--- a/engine/platform/windows/export/export.cpp
+++ b/engine/platform/windows/export/export.cpp
@@ -32,9 +32,7 @@
 
 #include "export_plugin.h"
 
-#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
-#include "editor/settings/editor_settings.h"
 
 void register_windows_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformWindows);
diff --git a/engine/platform/windows/export/export_plugin.cpp b/engine/platform/windows/export/export_plugin.cpp
index 4a69bb44..13116a3a 100644
--- a/engine/platform/windows/export/export_plugin.cpp
+++ b/engine/platform/windows/export/export_plugin.cpp
@@ -36,14 +36,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
+#include "core/io/image_loader.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
 #include "editor/file_system/editor_paths.h"
-#include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/resources/image_texture.h"
 
@@ -924,7 +921,15 @@ Ref<Texture2D> EditorExportPlatformWindows::get_run_icon() const {
 }
 
 bool EditorExportPlatformWindows::poll_export() {
-	Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(this);
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == this) {
+			preset = ep;
+			break;
+		}
+	}
 
 	int prev = menu_options;
 	menu_options = (preset.is_valid() && preset->get("ssh_remote_deploy/enabled").operator bool());
@@ -1007,19 +1012,19 @@ Error EditorExportPlatformWindows::run(const Ref<EditorExportPreset> &p_preset,
 
 	const String basepath = dest.path_join("tmp_windows_export");
 
-#define CLEANUP_AND_RETURN(m_err) \
-	{ \
-		if (da->file_exists(basepath + ".zip")) { \
-			da->remove(basepath + ".zip"); \
-		} \
+#define CLEANUP_AND_RETURN(m_err)                       \
+	{                                                   \
+		if (da->file_exists(basepath + ".zip")) {       \
+			da->remove(basepath + ".zip");              \
+		}                                               \
 		if (da->file_exists(basepath + "_start.ps1")) { \
-			da->remove(basepath + "_start.ps1"); \
-		} \
+			da->remove(basepath + "_start.ps1");        \
+		}                                               \
 		if (da->file_exists(basepath + "_clean.ps1")) { \
-			da->remove(basepath + "_clean.ps1"); \
-		} \
-		return m_err; \
-	} \
+			da->remove(basepath + "_clean.ps1");        \
+		}                                               \
+		return m_err;                                   \
+	}                                                   \
 	((void)0)
 
 	if (ep.step(TTR("Exporting project..."), 1)) {
diff --git a/engine/platform/windows/export/export_plugin.h b/engine/platform/windows/export/export_plugin.h
index 5fb56d84..976e8731 100644
--- a/engine/platform/windows/export/export_plugin.h
+++ b/engine/platform/windows/export/export_plugin.h
@@ -30,8 +30,10 @@
 
 #pragma once
 
-#include "core/os/process_id.h"
+#include "core/io/file_access.h"
+#include "core/os/os.h"
 #include "editor/export/editor_export_platform_pc.h"
+#include "editor/settings/editor_settings.h"
 
 // Optional environment variables for defining confidential information. If any
 // of these is set, they will override the values set in the credentials file.
@@ -63,7 +65,7 @@ class EditorExportPlatformWindows : public EditorExportPlatformPC {
 	Ref<ImageTexture> stop_icon;
 
 	Vector<SSHCleanupCommand> cleanup_commands;
-	ProcessID ssh_pid = 0;
+	OS::ProcessID ssh_pid = 0;
 	int menu_options = 0;
 
 	Error _process_icon(const Ref<EditorExportPreset> &p_preset, const String &p_src_path, const String &p_dst_path);
diff --git a/engine/platform/windows/export/template_modifier.cpp b/engine/platform/windows/export/template_modifier.cpp
index 3575dc0d..6a76c33d 100644
--- a/engine/platform/windows/export/template_modifier.cpp
+++ b/engine/platform/windows/export/template_modifier.cpp
@@ -30,9 +30,9 @@
 
 #include "template_modifier.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/image.h"
-#include "editor/export/editor_export_preset.h"
 
 void TemplateModifier::ByteStream::save(uint8_t p_value, Vector<uint8_t> &r_bytes) const {
 	save(p_value, r_bytes, 1);
diff --git a/engine/platform/windows/export/template_modifier.h b/engine/platform/windows/export/template_modifier.h
index e230a314..5608b1c8 100644
--- a/engine/platform/windows/export/template_modifier.h
+++ b/engine/platform/windows/export/template_modifier.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "core/io/file_access.h"
-
-class EditorExportPreset;
+#include "editor/export/editor_export_platform_pc.h"
 
 class TemplateModifier {
 	const uint32_t PE_PAGE_SIZE = 4096;
diff --git a/engine/platform/windows/gl_manager_windows_angle.cpp b/engine/platform/windows/gl_manager_windows_angle.cpp
index 43f4bc26..571c3cf6 100644
--- a/engine/platform/windows/gl_manager_windows_angle.cpp
+++ b/engine/platform/windows/gl_manager_windows_angle.cpp
@@ -32,6 +32,9 @@
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
+#include <cstdio>
+#include <cstdlib>
+
 #include <EGL/eglext_angle.h>
 
 const char *GLManagerANGLE_Windows::_get_platform_extension_name() const {
@@ -64,7 +67,7 @@ Vector<EGLint> GLManagerANGLE_Windows::_get_platform_context_attribs() const {
 	return ret;
 }
 
-void GLManagerANGLE_Windows::window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {
+void GLManagerANGLE_Windows::window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
 	window_make_current(p_window_id);
 	eglWaitNative(EGL_CORE_NATIVE_ENGINE);
 }
diff --git a/engine/platform/windows/gl_manager_windows_angle.h b/engine/platform/windows/gl_manager_windows_angle.h
index 0e5f84a5..c83cce4a 100644
--- a/engine/platform/windows/gl_manager_windows_angle.h
+++ b/engine/platform/windows/gl_manager_windows_angle.h
@@ -32,8 +32,10 @@
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/os/os.h"
+#include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #include <windows.h>
 
@@ -46,7 +48,7 @@ private:
 	virtual Vector<EGLint> _get_platform_context_attribs() const override;
 
 public:
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height);
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);
 
 	GLManagerANGLE_Windows() {}
 	~GLManagerANGLE_Windows() {}
diff --git a/engine/platform/windows/gl_manager_windows_native.cpp b/engine/platform/windows/gl_manager_windows_native.cpp
index 3323be11..c1d89229 100644
--- a/engine/platform/windows/gl_manager_windows_native.cpp
+++ b/engine/platform/windows/gl_manager_windows_native.cpp
@@ -33,13 +33,11 @@
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
 #include "core/version.h"
 
-#include <thirdparty/misc/nvapi_minimal.h>
+#include "thirdparty/misc/nvapi_minimal.h"
 
 #include <dwmapi.h>
-
 #include <cstdio>
 #include <cstdlib>
 
@@ -427,7 +425,7 @@ Error GLManagerNative_Windows::_create_context(GLWindow &win, GLDisplay &gl_disp
 	return OK;
 }
 
-Error GLManagerNative_Windows::window_create(DisplayServerEnums::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height) {
+Error GLManagerNative_Windows::window_create(DisplayServer::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height) {
 	HDC hDC = GetDC(p_hwnd);
 	if (!hDC) {
 		return ERR_CANT_CREATE;
@@ -459,7 +457,7 @@ Error GLManagerNative_Windows::window_create(DisplayServerEnums::WindowID p_wind
 	return OK;
 }
 
-void GLManagerNative_Windows::window_destroy(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerNative_Windows::window_destroy(DisplayServer::WindowID p_window_id) {
 	GLWindow &win = get_window(p_window_id);
 	if (_current_window == &win) {
 		_current_window = nullptr;
@@ -479,7 +477,7 @@ void GLManagerNative_Windows::release_current() {
 	_current_window = nullptr;
 }
 
-void GLManagerNative_Windows::window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void GLManagerNative_Windows::window_make_current(DisplayServer::WindowID p_window_id) {
 	if (p_window_id == -1) {
 		return;
 	}
@@ -509,7 +507,7 @@ Error GLManagerNative_Windows::initialize() {
 	return OK;
 }
 
-void GLManagerNative_Windows::set_use_vsync(DisplayServerEnums::WindowID p_window_id, bool p_use) {
+void GLManagerNative_Windows::set_use_vsync(DisplayServer::WindowID p_window_id, bool p_use) {
 	GLWindow &win = get_window(p_window_id);
 
 	if (&win != _current_window) {
@@ -527,15 +525,15 @@ void GLManagerNative_Windows::set_use_vsync(DisplayServerEnums::WindowID p_windo
 	}
 }
 
-bool GLManagerNative_Windows::is_using_vsync(DisplayServerEnums::WindowID p_window_id) const {
+bool GLManagerNative_Windows::is_using_vsync(DisplayServer::WindowID p_window_id) const {
 	return get_window(p_window_id).use_vsync;
 }
 
-HDC GLManagerNative_Windows::get_hdc(DisplayServerEnums::WindowID p_window_id) {
+HDC GLManagerNative_Windows::get_hdc(DisplayServer::WindowID p_window_id) {
 	return get_window(p_window_id).hDC;
 }
 
-HGLRC GLManagerNative_Windows::get_hglrc(DisplayServerEnums::WindowID p_window_id) {
+HGLRC GLManagerNative_Windows::get_hglrc(DisplayServer::WindowID p_window_id) {
 	const GLWindow &win = get_window(p_window_id);
 	const GLDisplay &disp = get_display(win.gldisplay_id);
 	return disp.hRC;
diff --git a/engine/platform/windows/gl_manager_windows_native.h b/engine/platform/windows/gl_manager_windows_native.h
index 2a3f97d0..7d70b10d 100644
--- a/engine/platform/windows/gl_manager_windows_native.h
+++ b/engine/platform/windows/gl_manager_windows_native.h
@@ -32,9 +32,9 @@
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rb_map.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 #include <windows.h>
 
@@ -59,7 +59,7 @@ private:
 		HGLRC hRC;
 	};
 
-	RBMap<DisplayServerEnums::WindowID, GLWindow> _windows;
+	RBMap<DisplayServer::WindowID, GLWindow> _windows;
 	LocalVector<GLDisplay> _displays;
 
 	GLWindow *_current_window = nullptr;
@@ -81,22 +81,22 @@ private:
 	Error _create_context(GLWindow &win, GLDisplay &gl_display);
 
 public:
-	Error window_create(DisplayServerEnums::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height);
-	void window_destroy(DisplayServerEnums::WindowID p_window_id);
-	void window_resize(DisplayServerEnums::WindowID p_window_id, int p_width, int p_height) {}
+	Error window_create(DisplayServer::WindowID p_window_id, HWND p_hwnd, HINSTANCE p_hinstance, int p_width, int p_height);
+	void window_destroy(DisplayServer::WindowID p_window_id);
+	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {}
 
 	void release_current();
 	void swap_buffers();
 
-	void window_make_current(DisplayServerEnums::WindowID p_window_id);
+	void window_make_current(DisplayServer::WindowID p_window_id);
 
 	Error initialize();
 
-	void set_use_vsync(DisplayServerEnums::WindowID p_window_id, bool p_use);
-	bool is_using_vsync(DisplayServerEnums::WindowID p_window_id) const;
+	void set_use_vsync(DisplayServer::WindowID p_window_id, bool p_use);
+	bool is_using_vsync(DisplayServer::WindowID p_window_id) const;
 
-	HDC get_hdc(DisplayServerEnums::WindowID p_window_id);
-	HGLRC get_hglrc(DisplayServerEnums::WindowID p_window_id);
+	HDC get_hdc(DisplayServer::WindowID p_window_id);
+	HGLRC get_hglrc(DisplayServer::WindowID p_window_id);
 
 	GLManagerNative_Windows();
 	~GLManagerNative_Windows();
diff --git a/engine/platform/windows/godot.natvis b/engine/platform/windows/godot.natvis
index 5910401f..8d30f05e 100644
--- a/engine/platform/windows/godot.natvis
+++ b/engine/platform/windows/godot.natvis
@@ -251,18 +251,21 @@
 	</Type>
 
 	<Type Name="StringName">
-		<DisplayString Condition="_data">{_data->name,s32}</DisplayString>
+		<DisplayString Condition="_data &amp;&amp; _data->cname">{_data->cname,na}</DisplayString>
+		<DisplayString Condition="_data &amp;&amp; !_data->cname">{_data->name,s32}</DisplayString>
 		<DisplayString Condition="!_data">[empty]</DisplayString>
-		<StringView Condition="_data">_data->name,s32</StringView>
+		<StringView Condition="_data &amp;&amp; _data->cname">_data->cname,na</StringView>
+		<StringView Condition="_data &amp;&amp; !_data->cname">_data->name,s32</StringView>
 	</Type>
 
 	<!-- can't cast the opaque to ::StringName because Natvis does not support global namespace specifier? -->
 	<Type Name="godot::StringName">
-		<Intrinsic Name="get_data_ptr" Expression="(*reinterpret_cast&lt;const char32_t***&gt;(opaque))[1]" />
-		<DisplayString Condition="get_data_ptr()">{get_data_ptr(),s32}</DisplayString>
+		<DisplayString Condition="(*reinterpret_cast&lt;const char***&gt;(opaque))[1]">{(*reinterpret_cast&lt;const char***&gt;(opaque))[1],s8}</DisplayString>
+		<DisplayString Condition="!(*reinterpret_cast&lt;const char***&gt;(opaque))[1]">{(*reinterpret_cast&lt;const char***&gt;(opaque))[2],s32}</DisplayString>
 		<Expand>
 			<Item Name="opaque_ptr">*reinterpret_cast&lt;void**&gt;(opaque)</Item>
-			<Item Name="cname">get_data_ptr(),s32</Item>
+			<Item Name="&amp;cname">(*reinterpret_cast&lt;const char***&gt;(opaque))+1</Item>
+			<Item Name="cname">(*reinterpret_cast&lt;const char***&gt;(opaque))[1],s8</Item>
 		</Expand>
 	</Type>
 
diff --git a/engine/platform/windows/godot_windows.cpp b/engine/platform/windows/godot_windows.cpp
index 0acfb06c..086d8f0d 100644
--- a/engine/platform/windows/godot_windows.cpp
+++ b/engine/platform/windows/godot_windows.cpp
@@ -34,6 +34,7 @@
 #include "main/main.h"
 
 #include <clocale>
+#include <cstdio>
 
 // For export templates, add a section; the exporter will patch it to enclose
 // the data appended to the executable (bundled PCK).
diff --git a/engine/platform/windows/key_mapping_windows.h b/engine/platform/windows/key_mapping_windows.h
index 08446c1f..be4988e8 100644
--- a/engine/platform/windows/key_mapping_windows.h
+++ b/engine/platform/windows/key_mapping_windows.h
@@ -32,8 +32,8 @@
 
 #include "core/os/keyboard.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-
 #include <winuser.h>
 
 class KeyMappingWindows {
diff --git a/engine/platform/windows/lang_table.h b/engine/platform/windows/lang_table.h
index cec7d31b..c4d18beb 100644
--- a/engine/platform/windows/lang_table.h
+++ b/engine/platform/windows/lang_table.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <windef.h>
+#include <winnt.h>
 
 struct _WinLocale {
 	const char *locale;
@@ -186,5 +186,5 @@ static const _WinLocale _win_locales[] = {
 	{ "zh_HK", LANG_CHINESE, SUBLANG_CHINESE_HONGKONG },
 	{ "zh_SG", LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE },
 	{ "zh_TW", LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL },
-	{ nullptr, 0, 0 },
+	{ 0, 0, 0 },
 };
diff --git a/engine/platform/windows/libgodot_windows.cpp b/engine/platform/windows/libgodot_windows.cpp
index 2b75e114..28466fe1 100644
--- a/engine/platform/windows/libgodot_windows.cpp
+++ b/engine/platform/windows/libgodot_windows.cpp
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "os_windows.h"
+#include "core/extension/libgodot.h"
 
 #include "core/extension/godot_instance.h"
-#include "core/extension/libgodot.h"
 #include "main/main.h"
 
+#include "os_windows.h"
+
 static OS_Windows *os = nullptr;
 
 static GodotInstance *instance = nullptr;
diff --git a/engine/platform/windows/native_menu_windows.cpp b/engine/platform/windows/native_menu_windows.cpp
index eac74d2b..4d314221 100644
--- a/engine/platform/windows/native_menu_windows.cpp
+++ b/engine/platform/windows/native_menu_windows.cpp
@@ -170,7 +170,7 @@ void NativeMenuWindows::popup(const RID &p_rid, const Vector2i &p_position) {
 	const MenuData *md = menus.get_or_null(p_rid);
 	ERR_FAIL_NULL(md);
 
-	HWND hwnd = (HWND)DisplayServer::get_singleton()->window_get_native_handle(DisplayServerEnums::WINDOW_HANDLE, DisplayServerEnums::MAIN_WINDOW_ID);
+	HWND hwnd = (HWND)DisplayServer::get_singleton()->window_get_native_handle(DisplayServer::WINDOW_HANDLE, DisplayServer::MAIN_WINDOW_ID);
 	UINT flags = TPM_HORIZONTAL | TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON | TPM_VERPOSANIMATION;
 	if (md->is_rtl) {
 		flags |= TPM_LAYOUTRTL;
@@ -1122,58 +1122,6 @@ void NativeMenuWindows::set_item_indentation_level(const RID &p_rid, int p_idx,
 	// Not supported.
 }
 
-int NativeMenuWindows::set_item_index(const RID &p_rid, int p_idx, int p_target_idx) {
-	ERR_FAIL_COND_V(p_idx < 0, -1);
-	const MenuData *md = menus.get_or_null(p_rid);
-	ERR_FAIL_NULL_V(md, -1);
-	int count = GetMenuItemCount(md->menu);
-	ERR_FAIL_COND_V(p_idx >= count, -1);
-	ERR_FAIL_INDEX_V(p_target_idx, count, -1);
-
-	// Get item text separately.
-	MENUITEMINFOW item;
-	ZeroMemory(&item, sizeof(item));
-	item.cbSize = sizeof(item);
-	item.fMask = MIIM_STRING;
-	item.dwTypeData = nullptr;
-	Char16String str;
-	if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
-		return -1;
-	}
-	item.cch++;
-	str.resize_uninitialized(item.cch);
-	item.dwTypeData = (LPWSTR)str.ptrw();
-	if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
-		return -1;
-	}
-
-	ZeroMemory(&item, sizeof(item));
-	item.cbSize = sizeof(item);
-	item.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU | MIIM_BITMAP;
-	if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
-		return -1;
-	}
-
-	item.dwTypeData = (LPWSTR)str.get_data();
-
-	if (!RemoveMenu(md->menu, p_idx, MF_BYPOSITION)) {
-		return -1;
-	}
-	if (!InsertMenuItemW(md->menu, p_target_idx, true, &item)) {
-		// Delete item if failed to insert.
-		MenuItemData *item_data = (MenuItemData *)item.dwItemData;
-		if (item_data) {
-			if (item_data->bmp) {
-				DeleteObject(item_data->bmp);
-			}
-			memdelete(item_data);
-		}
-		return -1;
-	}
-
-	return p_target_idx;
-}
-
 int NativeMenuWindows::get_item_count(const RID &p_rid) const {
 	const MenuData *md = menus.get_or_null(p_rid);
 	ERR_FAIL_NULL_V(md, 0);
diff --git a/engine/platform/windows/native_menu_windows.h b/engine/platform/windows/native_menu_windows.h
index 9a900d19..785772c8 100644
--- a/engine/platform/windows/native_menu_windows.h
+++ b/engine/platform/windows/native_menu_windows.h
@@ -35,6 +35,7 @@
 #include "core/templates/rid_owner.h"
 #include "servers/display/native_menu.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class NativeMenuWindows : public NativeMenu {
@@ -54,11 +55,11 @@ class NativeMenuWindows : public NativeMenu {
 		int max_states = 0;
 		int state = 0;
 		Ref<Image> img;
-		HBITMAP bmp = nullptr;
+		HBITMAP bmp = 0;
 	};
 
 	struct MenuData {
-		HMENU menu = nullptr;
+		HMENU menu = 0;
 
 		Callable close_cb;
 		bool is_rtl = false;
@@ -141,7 +142,6 @@ public:
 	virtual void set_item_max_states(const RID &p_rid, int p_idx, int p_max_states) override;
 	virtual void set_item_icon(const RID &p_rid, int p_idx, const Ref<Texture2D> &p_icon) override;
 	virtual void set_item_indentation_level(const RID &p_rid, int p_idx, int p_level) override;
-	virtual int set_item_index(const RID &p_rid, int p_idx, int p_target_idx) override;
 
 	virtual int get_item_count(const RID &p_rid) const override;
 	virtual bool is_system_menu(const RID &p_rid) const override;
diff --git a/engine/platform/windows/os_windows.cpp b/engine/platform/windows/os_windows.cpp
index 04d4783e..d2d98c19 100644
--- a/engine/platform/windows/os_windows.cpp
+++ b/engine/platform/windows/os_windows.cpp
@@ -35,9 +35,9 @@
 #include "windows_terminal_logger.h"
 #include "windows_utils.h"
 
-#include "core/config/engine.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
+#include "core/io/marshalls.h"
 #include "core/os/main_loop.h"
 #include "core/profiling/profiling.h"
 #include "core/version_generated.gen.h"
@@ -49,7 +49,7 @@
 #include "drivers/windows/thread_windows.h"
 #include "main/main.h"
 #include "servers/audio/audio_server.h"
-#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/rendering_server_default.h"
 #include "servers/text/text_server.h"
 
 #include <avrt.h>
@@ -82,7 +82,7 @@ extern "C" {
 #endif
 
 #if defined(VULKAN_ENABLED)
-#include "drivers/vulkan/rendering_context_driver_vulkan.h"
+#include "rendering_context_driver_vulkan_windows.h"
 #endif
 #if defined(D3D12_ENABLED)
 #include "drivers/d3d12/rendering_context_driver_d3d12.h"
@@ -202,7 +202,7 @@ bool OS_Windows::is_using_con_wrapper() const {
 	DWORD count = GetConsoleProcessList(&pids[0], 256);
 	for (DWORD i = 0; i < count; i++) {
 		HANDLE process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pids[i]);
-		if (process != nullptr) {
+		if (process != NULL) {
 			WCHAR proc_name[MAX_PATH];
 			DWORD len = MAX_PATH;
 			if (QueryFullProcessImageNameW(process, 0, &proc_name[0], &len)) {
@@ -1285,23 +1285,23 @@ Dictionary OS_Windows::get_memory_info() const {
 }
 
 Dictionary OS_Windows::execute_with_pipe(const String &p_path, const List<String> &p_arguments, bool p_blocking) {
-#define CLEAN_PIPES \
-	if (pipe_in[0] != 0) { \
-		CloseHandle(pipe_in[0]); \
-	} \
-	if (pipe_in[1] != 0) { \
-		CloseHandle(pipe_in[1]); \
-	} \
-	if (pipe_out[0] != 0) { \
+#define CLEAN_PIPES               \
+	if (pipe_in[0] != 0) {        \
+		CloseHandle(pipe_in[0]);  \
+	}                             \
+	if (pipe_in[1] != 0) {        \
+		CloseHandle(pipe_in[1]);  \
+	}                             \
+	if (pipe_out[0] != 0) {       \
 		CloseHandle(pipe_out[0]); \
-	} \
-	if (pipe_out[1] != 0) { \
+	}                             \
+	if (pipe_out[1] != 0) {       \
 		CloseHandle(pipe_out[1]); \
-	} \
-	if (pipe_err[0] != 0) { \
+	}                             \
+	if (pipe_err[0] != 0) {       \
 		CloseHandle(pipe_err[0]); \
-	} \
-	if (pipe_err[1] != 0) { \
+	}                             \
+	if (pipe_err[1] != 0) {       \
 		CloseHandle(pipe_err[1]); \
 	}
 
@@ -2120,7 +2120,7 @@ PackedByteArray OS_Windows::get_stdin_buffer(int64_t p_buffer_size) {
 
 OS_Windows::StdHandleType OS_Windows::get_stdin_type() const {
 	HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
-	if (h == nullptr || h == INVALID_HANDLE_VALUE) {
+	if (h == 0 || h == INVALID_HANDLE_VALUE) {
 		return STD_HANDLE_INVALID;
 	}
 	DWORD ftype = GetFileType(h);
@@ -2151,7 +2151,7 @@ OS_Windows::StdHandleType OS_Windows::get_stdin_type() const {
 
 OS_Windows::StdHandleType OS_Windows::get_stdout_type() const {
 	HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
-	if (h == nullptr || h == INVALID_HANDLE_VALUE) {
+	if (h == 0 || h == INVALID_HANDLE_VALUE) {
 		return STD_HANDLE_INVALID;
 	}
 	DWORD ftype = GetFileType(h);
@@ -2177,7 +2177,7 @@ OS_Windows::StdHandleType OS_Windows::get_stdout_type() const {
 
 OS_Windows::StdHandleType OS_Windows::get_stderr_type() const {
 	HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
-	if (h == nullptr || h == INVALID_HANDLE_VALUE) {
+	if (h == 0 || h == INVALID_HANDLE_VALUE) {
 		return STD_HANDLE_INVALID;
 	}
 	DWORD ftype = GetFileType(h);
@@ -2510,19 +2510,6 @@ String OS_Windows::get_user_data_dir(const String &p_user_dir) const {
 	return get_data_path().path_join(p_user_dir).replace_char('\\', '/');
 }
 
-String OS_Windows::expand_path(const String &p_path) const {
-	String path = p_path;
-
-	if (path.begins_with("~/") || path.begins_with("~\\") || path == "~") {
-		String home = get_environment("USERPROFILE");
-		if (!home.is_empty()) {
-			path = home + path.substr(1);
-		}
-	}
-
-	return path;
-}
-
 String OS_Windows::get_unique_id() const {
 	HW_PROFILE_INFOA HwProfInfo;
 	ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), "");
@@ -2742,7 +2729,7 @@ bool OS_Windows::_test_create_rendering_device_and_gl(const String &p_display_dr
 	bool ok = true;
 #ifdef GLES3_ENABLED
 	GLManagerNative_Windows *test_gl_manager_native = memnew(GLManagerNative_Windows);
-	if (test_gl_manager_native->window_create(DisplayServerEnums::MAIN_WINDOW_ID, hWnd, GetModuleHandle(nullptr), 800, 600) == OK) {
+	if (test_gl_manager_native->window_create(DisplayServer::MAIN_WINDOW_ID, hWnd, GetModuleHandle(nullptr), 800, 600) == OK) {
 		RasterizerGLES3::make_current(true);
 	} else {
 		ok = false;
diff --git a/engine/platform/windows/os_windows.h b/engine/platform/windows/os_windows.h
index 07c133ab..a2cadc65 100644
--- a/engine/platform/windows/os_windows.h
+++ b/engine/platform/windows/os_windows.h
@@ -31,22 +31,31 @@
 #pragma once
 
 #include "crash_handler_windows.h"
+#include "key_mapping_windows.h"
 
-#include "core/input/input_event.h"
+#include "core/config/project_settings.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "drivers/wasapi/audio_driver_wasapi.h"
 #include "drivers/winmidi/midi_driver_winmidi.h"
+#include "servers/audio/audio_server.h"
 
 #ifdef XAUDIO2_ENABLED
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
 #endif
 
-#include <windows.h>
+#if defined(RD_ENABLED)
+#include "servers/rendering/rendering_device.h"
+#endif
 
-#include <dwrite.h>
-#include <dwrite_2.h>
 #include <io.h>
 #include <shellapi.h>
+#include <cstdio>
+
+#define WIN32_LEAN_AND_MEAN
+#include <dwrite.h>
+#include <dwrite_2.h>
+#include <windows.h>
 #include <windowsx.h>
 
 #ifdef DEBUG_ENABLED
@@ -61,8 +70,8 @@
 #ifndef SAFE_RELEASE // when Windows Media Device M? is not present
 #define SAFE_RELEASE(x) \
 	if (x != nullptr) { \
-		x->Release(); \
-		x = nullptr; \
+		x->Release();   \
+		x = nullptr;    \
 	}
 #endif
 
@@ -236,8 +245,6 @@ public:
 	virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override;
 	virtual String get_user_data_dir(const String &p_user_dir) const override;
 
-	virtual String expand_path(const String &p_path) const override;
-
 	virtual String get_unique_id() const override;
 
 	virtual Error shell_open(const String &p_uri) override;
@@ -260,17 +267,6 @@ public:
 
 	void set_main_window(HWND p_main_window) { main_window = p_main_window; }
 
-	virtual String get_platform_string(PlatformString p_platform_string) const override {
-		switch (p_platform_string) {
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_OPEN:
-				return ETR("Open in File Explorer");
-			case OS::PlatformString::PLATFORM_STRING_FILE_MANAGER_SHOW:
-				return ETR("Show in File Explorer");
-			default:
-				return OS::get_platform_string(p_platform_string);
-		}
-	}
-
 #ifdef TOOLS_ENABLED
 	virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
 	virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
diff --git a/engine/platform/windows/platform_gl.h b/engine/platform/windows/platform_gl.h
index cfb8b1e2..3d4a05c0 100644
--- a/engine/platform/windows/platform_gl.h
+++ b/engine/platform/windows/platform_gl.h
@@ -34,23 +34,17 @@
 #define GL_API_ENABLED // Allow using desktop GL.
 #endif
 
-#ifdef ANGLE_ENABLED
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES (ANGLE).
 #endif
 
-#ifndef GLAD_GLES2
-#define GLAD_GLES2
-#endif
-
-// IWYU pragma: begin_exports.
 #ifdef EGL_STATIC
 #define KHRONOS_STATIC 1
-#include <thirdparty/angle/include/EGL/egl.h>
-#include <thirdparty/angle/include/EGL/eglext.h>
+#include "thirdparty/angle/include/EGL/egl.h"
+#include "thirdparty/angle/include/EGL/eglext.h"
 #undef KHRONOS_STATIC
-#endif
+#else
+#include "thirdparty/glad/glad/egl.h"
 #endif
 
-#include <thirdparty/glad/glad/gl.h>
-// IWYU pragma: end_exports.
+#include "thirdparty/glad/glad/gl.h"
diff --git a/engine/platform/windows/rendering_context_driver_vulkan_windows.cpp b/engine/platform/windows/rendering_context_driver_vulkan_windows.cpp
index 5eca85cb..8ca677fe 100644
--- a/engine/platform/windows/rendering_context_driver_vulkan_windows.cpp
+++ b/engine/platform/windows/rendering_context_driver_vulkan_windows.cpp
@@ -30,11 +30,11 @@
 
 #if defined(WINDOWS_ENABLED) && defined(VULKAN_ENABLED)
 
-#include "rendering_context_driver_vulkan_windows.h"
-
 #include "core/os/os.h"
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "rendering_context_driver_vulkan_windows.h"
+
+#include "drivers/vulkan/godot_vulkan.h"
 
 const char *RenderingContextDriverVulkanWindows::_get_platform_surface_extension() const {
 	return VK_KHR_WIN32_SURFACE_EXTENSION_NAME;
diff --git a/engine/platform/windows/rendering_context_driver_vulkan_windows.h b/engine/platform/windows/rendering_context_driver_vulkan_windows.h
index d9e384b4..be674c48 100644
--- a/engine/platform/windows/rendering_context_driver_vulkan_windows.h
+++ b/engine/platform/windows/rendering_context_driver_vulkan_windows.h
@@ -34,6 +34,7 @@
 
 #include "drivers/vulkan/rendering_context_driver_vulkan.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class RenderingContextDriverVulkanWindows : public RenderingContextDriverVulkan {
diff --git a/engine/platform/windows/tts_driver.h b/engine/platform/windows/tts_driver.h
deleted file mode 100644
index 3cef4461..00000000
--- a/engine/platform/windows/tts_driver.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/
-/*  tts_driver.h                                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/object.h"
-
-class TTSDriver : public Object {
-	GDSOFTCLASS(TTSDriver, Object);
-
-public:
-	virtual bool is_speaking() const = 0;
-	virtual bool is_paused() const = 0;
-	virtual Array get_voices() const = 0;
-
-	virtual void speak(const String &p_text, const String &p_voice, int p_volume = 50, float p_pitch = 1.f, float p_rate = 1.f, int64_t p_utterance_id = 0, bool p_interrupt = false) = 0;
-	virtual void pause() = 0;
-	virtual void resume() = 0;
-	virtual void stop() = 0;
-
-	virtual void process_events() = 0;
-
-	virtual bool init() = 0;
-
-	virtual ~TTSDriver() {}
-};
diff --git a/engine/platform/windows/tts_driver_onecore.cpp b/engine/platform/windows/tts_driver_onecore.cpp
deleted file mode 100644
index a456af67..00000000
--- a/engine/platform/windows/tts_driver_onecore.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/**************************************************************************/
-/*  tts_driver_onecore.cpp                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "tts_driver_onecore.h"
-
-#include "core/object/callable_mp.h"
-#include "servers/display/display_server.h"
-
-TTSDriverOneCore *TTSDriverOneCore::singleton = nullptr;
-
-void TTSDriverOneCore::_speech_index_mark(int p_msg_id, int p_index_mark) {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, p_msg_id, p_index_mark);
-}
-
-void TTSDriverOneCore::_speech_cancel(int p_msg_id) {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_msg_id);
-}
-
-void TTSDriverOneCore::_speech_end(int p_msg_id) {
-	DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, p_msg_id);
-}
-
-void TTSDriverOneCore::_dispose_current(bool p_silent, bool p_canceled) {
-	if (media.get() != nullptr) {
-		for (const TrackData &T : tracks) {
-			T.track.CueEntered(T.token);
-		}
-		tracks.clear();
-		media->MediaFailed(singleton->token_f);
-		media->MediaEnded(singleton->token_e);
-		if (!ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 4)) {
-			media->PlaybackMediaMarkerReached(singleton->token_s);
-		}
-		media->Close();
-		media.reset();
-
-		if (!p_silent) {
-			if (p_canceled) {
-				callable_mp(this, &TTSDriverOneCore::_speech_cancel).call_deferred(id);
-			} else {
-				callable_mp(this, &TTSDriverOneCore::_speech_end).call_deferred(id);
-			}
-		}
-		id = -1;
-		string = Char16String();
-		playing = false;
-		paused = false;
-		offset = 0;
-	}
-}
-
-void TTSDriverOneCore::process_events() {
-	if (update_requested && !paused && queue.size() > 0 && !is_speaking()) {
-		TTSUtterance &message = queue.front()->get();
-		_dispose_current(true);
-		playing = true;
-
-		SpeechSynthesizer synth = SpeechSynthesizer();
-
-		if (ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 4)) {
-			synth.Options().IncludeWordBoundaryMetadata(true);
-		}
-		if (ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 5)) {
-			synth.Options().SpeakingRate(CLAMP(message.rate, 0.5, 6.0));
-			synth.Options().AudioPitch(CLAMP(message.pitch, 0.0, 2.0));
-			synth.Options().AudioVolume(CLAMP((double)message.volume / 100.0, 0.0, 1.0));
-		}
-
-		winrt::hstring name = winrt::hstring((const wchar_t *)message.voice.utf16().get_data());
-		IVectorView<VoiceInformation> voices = SpeechSynthesizer::AllVoices();
-		for (uint32_t i = 0; i < voices.Size(); i++) {
-			VoiceInformation voice = voices.GetAt(i);
-			if (voice.Id() == name) {
-				synth.Voice(voice);
-				break;
-			}
-		}
-
-		string = message.text.utf16();
-		winrt::hstring text = winrt::hstring((const wchar_t *)string.get_data());
-
-		SpeechSynthesisStream stream = synth.SynthesizeTextToStreamAsync(text).get();
-
-		media = std::make_shared<MediaPlayer>();
-		token_f = media->MediaFailed([=, this](const MediaPlayer &p_sender, const MediaPlayerFailedEventArgs &p_args) {
-			_dispose_current(false, true);
-		});
-		token_e = media->MediaEnded([=, this](const MediaPlayer &p_sender, const IInspectable &p_args) {
-			_dispose_current(false, false);
-		});
-		if (ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 4)) {
-			MediaPlaybackItem mitem = MediaPlaybackItem(MediaSource::CreateFromStream(stream, stream.ContentType()));
-			media->Source(mitem);
-			MediaPlaybackTimedMetadataTrackList list = mitem.TimedMetadataTracks();
-
-			for (uint32_t i = 0; i < list.Size(); i++) {
-				TimedMetadataTrack track = list.GetAt(i);
-				if (track.TimedMetadataKind() == TimedMetadataKind::Speech) {
-					winrt::event_token token = track.CueEntered([=, this](const TimedMetadataTrack &p_sender, const MediaCueEventArgs &p_args) {
-						SpeechCue sq;
-						p_args.Cue().as(sq);
-						int32_t pos16 = sq.StartPositionInInput().Value();
-						int pos = 0;
-						for (int j = 0; j < MIN(pos16, string.length()); j++) {
-							char16_t c = string[j];
-							if ((c & 0xfffffc00) == 0xd800) {
-								j++;
-							}
-							pos++;
-						}
-						callable_mp(singleton, &TTSDriverOneCore::_speech_index_mark).call_deferred(id, pos);
-					});
-					tracks.push_back({ track, token });
-					list.SetPresentationMode(i, TimedMetadataTrackPresentationMode::ApplicationPresented);
-				}
-			}
-		} else {
-			media->Source(MediaSource::CreateFromStream(stream, stream.ContentType()));
-			token_s = media->PlaybackMediaMarkerReached([=, this](const MediaPlayer &p_sender, const PlaybackMediaMarkerReachedEventArgs &p_args) {
-				offset += p_args.PlaybackMediaMarker().Text().size() + 1;
-				int pos = 0;
-				for (int j = 0; j < MIN(offset, string.length()); j++) {
-					char16_t c = string[j];
-					if ((c & 0xfffffc00) == 0xd800) {
-						j++;
-					}
-					pos++;
-				}
-				callable_mp(singleton, &TTSDriverOneCore::_speech_index_mark).call_deferred(id, pos);
-			});
-		}
-		media->AutoPlay(true);
-
-		id = message.id;
-		update_requested = false;
-		paused = false;
-
-		media->Play();
-
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, message.id);
-		queue.pop_front();
-	}
-}
-
-bool TTSDriverOneCore::is_speaking() const {
-	return playing;
-}
-
-bool TTSDriverOneCore::is_paused() const {
-	return paused;
-}
-
-Array TTSDriverOneCore::get_voices() const {
-	Array list;
-
-	IVectorView<VoiceInformation> voices = SpeechSynthesizer::AllVoices();
-	for (uint32_t i = 0; i < voices.Size(); i++) {
-		VoiceInformation voice = voices.GetAt(i);
-		winrt::hstring vname = voice.DisplayName();
-		winrt::hstring vid = voice.Id();
-		winrt::hstring vlang = voice.Language();
-
-		Dictionary voice_d;
-		voice_d["id"] = String::utf16((const char16_t *)vid.c_str(), vid.size());
-		voice_d["name"] = String::utf16((const char16_t *)vname.c_str(), vname.size());
-		voice_d["language"] = String::utf16((const char16_t *)vlang.c_str(), vlang.size());
-		list.push_back(voice_d);
-	}
-	return list;
-}
-
-void TTSDriverOneCore::speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int64_t p_utterance_id, bool p_interrupt) {
-	if (p_interrupt) {
-		stop();
-	}
-
-	if (p_text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_utterance_id);
-		return;
-	}
-
-	TTSUtterance message;
-	message.text = p_text;
-	message.voice = p_voice;
-	message.volume = CLAMP(p_volume, 0, 100);
-	message.pitch = CLAMP(p_pitch, 0.f, 2.f);
-	message.rate = CLAMP(p_rate, 0.1f, 10.f);
-	message.id = p_utterance_id;
-	queue.push_back(message);
-
-	if (is_paused()) {
-		resume();
-	} else {
-		update_requested = true;
-	}
-}
-
-void TTSDriverOneCore::pause() {
-	if (!paused && playing) {
-		media->Pause();
-		paused = true;
-	}
-}
-
-void TTSDriverOneCore::resume() {
-	if (paused && playing) {
-		media->Play();
-		paused = false;
-	}
-}
-
-void TTSDriverOneCore::stop() {
-	for (TTSUtterance &message : queue) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
-	}
-	queue.clear();
-	_dispose_current(false, true);
-}
-
-bool TTSDriverOneCore::init() {
-	if (!ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 1)) {
-		print_verbose("Text-to-Speech: Cannot initialize OneCore driver, API contract not present!");
-		return false;
-	}
-	if (SpeechSynthesizer::AllVoices().Size() == 0) {
-		print_verbose("Text-to-Speech: Cannot initialize OneCore driver, no voices found!");
-		return false;
-	}
-	print_verbose("Text-to-Speech: OneCore initialized.");
-	return true;
-}
-
-TTSDriverOneCore::TTSDriverOneCore() {
-	singleton = this;
-}
-
-TTSDriverOneCore::~TTSDriverOneCore() {
-	_dispose_current(false, true);
-	singleton = nullptr;
-}
diff --git a/engine/platform/windows/tts_driver_onecore.h b/engine/platform/windows/tts_driver_onecore.h
deleted file mode 100644
index 6cd8f181..00000000
--- a/engine/platform/windows/tts_driver_onecore.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**************************************************************************/
-/*  tts_driver_onecore.h                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "tts_driver.h"
-
-GODOT_GCC_WARNING_PUSH
-GODOT_GCC_WARNING_IGNORE("-Wnon-virtual-dtor")
-GODOT_GCC_WARNING_IGNORE("-Wctor-dtor-privacy")
-GODOT_GCC_WARNING_IGNORE("-Wshadow")
-GODOT_GCC_WARNING_IGNORE("-Wstrict-aliasing")
-GODOT_CLANG_WARNING_PUSH
-GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
-
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.Foundation.Metadata.h>
-#include <winrt/Windows.Media.Core.h>
-#include <winrt/Windows.Media.Playback.h>
-#include <winrt/Windows.Media.SpeechSynthesis.h>
-#include <winrt/Windows.Storage.Streams.h>
-
-GODOT_GCC_WARNING_POP
-GODOT_CLANG_WARNING_POP
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::Foundation::Metadata;
-using namespace winrt::Windows::Media::Core;
-using namespace winrt::Windows::Media::Playback;
-using namespace winrt::Windows::Media::SpeechSynthesis;
-using namespace winrt::Windows::Storage::Streams;
-
-struct TTSUtterance;
-
-class TTSDriverOneCore : public TTSDriver {
-	List<TTSUtterance> queue;
-
-	bool playing = false;
-	bool paused = false;
-	bool update_requested = false;
-
-	int64_t id = -1;
-	Char16String string;
-	std::shared_ptr<MediaPlayer> media;
-	struct TrackData {
-		TimedMetadataTrack track;
-		winrt::event_token token{};
-	};
-	Vector<TrackData> tracks;
-	winrt::event_token token_s{};
-	winrt::event_token token_f{};
-	winrt::event_token token_e{};
-	int64_t offset = 0;
-
-	void _dispose_current(bool p_silent = false, bool p_canceled = false);
-
-	void _speech_cancel(int p_msg_id);
-	void _speech_end(int p_msg_id);
-	void _speech_index_mark(int p_msg_id, int p_index_mark);
-
-	static TTSDriverOneCore *singleton;
-
-public:
-	virtual bool is_speaking() const override;
-	virtual bool is_paused() const override;
-	virtual Array get_voices() const override;
-
-	virtual void speak(const String &p_text, const String &p_voice, int p_volume = 50, float p_pitch = 1.f, float p_rate = 1.f, int64_t p_utterance_id = 0, bool p_interrupt = false) override;
-	virtual void pause() override;
-	virtual void resume() override;
-	virtual void stop() override;
-
-	virtual void process_events() override;
-
-	virtual bool init() override;
-
-	TTSDriverOneCore();
-	~TTSDriverOneCore();
-};
diff --git a/engine/platform/windows/tts_driver_sapi.cpp b/engine/platform/windows/tts_driver_sapi.cpp
deleted file mode 100644
index 8e69d5b6..00000000
--- a/engine/platform/windows/tts_driver_sapi.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/**************************************************************************/
-/*  tts_driver_sapi.cpp                                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "tts_driver_sapi.h"
-
-#include "core/object/callable_mp.h"
-#include "servers/display/display_server.h"
-
-TTSDriverSAPI *TTSDriverSAPI::singleton = nullptr;
-
-void __stdcall TTSDriverSAPI::speech_event_callback(WPARAM wParam, LPARAM lParam) {
-	SPEVENT event;
-	while (singleton->synth->GetEvents(1, &event, nullptr) == S_OK) {
-		uint32_t stream_num = (uint32_t)event.ulStreamNum;
-		if (singleton->ids.has(stream_num)) {
-			if (event.eEventId == SPEI_START_INPUT_STREAM) {
-				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_STARTED, singleton->ids[stream_num].id);
-			} else if (event.eEventId == SPEI_END_INPUT_STREAM) {
-				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_ENDED, singleton->ids[stream_num].id);
-				singleton->ids.erase(stream_num);
-				singleton->update_requested = true;
-			} else if (event.eEventId == SPEI_WORD_BOUNDARY) {
-				const Char16String &string = singleton->ids[stream_num].string;
-				int pos = 0;
-				for (int i = 0; i < MIN(event.lParam, string.length()); i++) {
-					char16_t c = string[i];
-					if ((c & 0xfffffc00) == 0xd800) {
-						i++;
-					}
-					pos++;
-				}
-				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY, singleton->ids[stream_num].id, pos - singleton->ids[stream_num].offset);
-			}
-		}
-	}
-}
-
-void TTSDriverSAPI::process_events() {
-	if (update_requested && !paused && queue.size() > 0 && !is_speaking()) {
-		TTSUtterance &message = queue.front()->get();
-
-		String text;
-		DWORD flags = SPF_ASYNC | SPF_PURGEBEFORESPEAK | SPF_IS_XML;
-		String pitch_tag = String("<pitch absmiddle=\"") + String::num_int64(message.pitch * 10 - 10, 10) + String("\">");
-		text = pitch_tag + message.text + String("</pitch>");
-
-		IEnumSpObjectTokens *cpEnum;
-		ISpObjectToken *cpVoiceToken;
-		ULONG ulCount = 0;
-		ULONG stream_number = 0;
-		ISpObjectTokenCategory *cpCategory;
-		HRESULT hr = CoCreateInstance(CLSID_SpObjectTokenCategory, nullptr, CLSCTX_INPROC_SERVER, IID_ISpObjectTokenCategory, (void **)&cpCategory);
-		if (SUCCEEDED(hr)) {
-			hr = cpCategory->SetId(SPCAT_VOICES, false);
-			if (SUCCEEDED(hr)) {
-				hr = cpCategory->EnumTokens(nullptr, nullptr, &cpEnum);
-				if (SUCCEEDED(hr)) {
-					hr = cpEnum->GetCount(&ulCount);
-					while (SUCCEEDED(hr) && ulCount--) {
-						wchar_t *w_id = nullptr;
-						hr = cpEnum->Next(1, &cpVoiceToken, nullptr);
-						cpVoiceToken->GetId(&w_id);
-						if (String::utf16((const char16_t *)w_id) == message.voice) {
-							synth->SetVoice(cpVoiceToken);
-							cpVoiceToken->Release();
-							break;
-						}
-						cpVoiceToken->Release();
-					}
-					cpEnum->Release();
-				}
-			}
-			cpCategory->Release();
-		}
-
-		UTData ut;
-		ut.string = text.utf16();
-		ut.offset = pitch_tag.length(); // Subtract injected <pitch> tag offset.
-		ut.id = message.id;
-
-		synth->SetVolume(message.volume);
-		synth->SetRate(10.f * std::log10(message.rate) / std::log10(3.f));
-		synth->Speak((LPCWSTR)ut.string.get_data(), flags, &stream_number);
-
-		ids[(uint32_t)stream_number] = ut;
-
-		queue.pop_front();
-
-		update_requested = false;
-	}
-}
-
-bool TTSDriverSAPI::is_speaking() const {
-	ERR_FAIL_NULL_V(synth, false);
-
-	SPVOICESTATUS status;
-	synth->GetStatus(&status, nullptr);
-	return (status.dwRunningState == SPRS_IS_SPEAKING || status.dwRunningState == 0 /* Waiting To Speak */);
-}
-
-bool TTSDriverSAPI::is_paused() const {
-	ERR_FAIL_NULL_V(synth, false);
-	return paused;
-}
-
-Array TTSDriverSAPI::get_voices() const {
-	Array list;
-	IEnumSpObjectTokens *cpEnum;
-	ISpObjectToken *cpVoiceToken;
-	ISpDataKey *cpDataKeyAttribs;
-	ULONG ulCount = 0;
-	ISpObjectTokenCategory *cpCategory;
-	HRESULT hr = CoCreateInstance(CLSID_SpObjectTokenCategory, nullptr, CLSCTX_INPROC_SERVER, IID_ISpObjectTokenCategory, (void **)&cpCategory);
-	if (SUCCEEDED(hr)) {
-		hr = cpCategory->SetId(SPCAT_VOICES, false);
-		if (SUCCEEDED(hr)) {
-			hr = cpCategory->EnumTokens(nullptr, nullptr, &cpEnum);
-			if (SUCCEEDED(hr)) {
-				hr = cpEnum->GetCount(&ulCount);
-				while (SUCCEEDED(hr) && ulCount--) {
-					hr = cpEnum->Next(1, &cpVoiceToken, nullptr);
-					HRESULT hr_attr = cpVoiceToken->OpenKey(SPTOKENKEY_ATTRIBUTES, &cpDataKeyAttribs);
-					if (SUCCEEDED(hr_attr)) {
-						wchar_t *w_id = nullptr;
-						wchar_t *w_lang = nullptr;
-						wchar_t *w_name = nullptr;
-						cpVoiceToken->GetId(&w_id);
-						cpDataKeyAttribs->GetStringValue(L"Language", &w_lang);
-						cpDataKeyAttribs->GetStringValue(nullptr, &w_name);
-						LCID locale = wcstol(w_lang, nullptr, 16);
-
-						int locale_chars = GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, nullptr, 0);
-						int region_chars = GetLocaleInfoW(locale, LOCALE_SISO3166CTRYNAME, nullptr, 0);
-						wchar_t *w_lang_code = new wchar_t[locale_chars];
-						wchar_t *w_reg_code = new wchar_t[region_chars];
-						GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, w_lang_code, locale_chars);
-						GetLocaleInfoW(locale, LOCALE_SISO3166CTRYNAME, w_reg_code, region_chars);
-
-						Dictionary voice_d;
-						voice_d["id"] = String::utf16((const char16_t *)w_id);
-						if (w_name) {
-							voice_d["name"] = String::utf16((const char16_t *)w_name);
-						} else {
-							voice_d["name"] = voice_d["id"].operator String().replace("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices\\Tokens\\", "");
-						}
-						voice_d["language"] = String::utf16((const char16_t *)w_lang_code) + "_" + String::utf16((const char16_t *)w_reg_code);
-						list.push_back(voice_d);
-
-						delete[] w_lang_code;
-						delete[] w_reg_code;
-
-						cpDataKeyAttribs->Release();
-					}
-					cpVoiceToken->Release();
-				}
-				cpEnum->Release();
-			}
-		}
-		cpCategory->Release();
-	}
-	return list;
-}
-
-void TTSDriverSAPI::speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int64_t p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_NULL(synth);
-	if (p_interrupt) {
-		stop();
-	}
-
-	if (p_text.is_empty()) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, p_utterance_id);
-		return;
-	}
-
-	TTSUtterance message;
-	message.text = p_text;
-	message.voice = p_voice;
-	message.volume = CLAMP(p_volume, 0, 100);
-	message.pitch = CLAMP(p_pitch, 0.f, 2.f);
-	message.rate = CLAMP(p_rate, 0.1f, 10.f);
-	message.id = p_utterance_id;
-	queue.push_back(message);
-
-	if (is_paused()) {
-		resume();
-	} else {
-		update_requested = true;
-	}
-}
-
-void TTSDriverSAPI::pause() {
-	ERR_FAIL_NULL(synth);
-	if (!paused) {
-		if (synth->Pause() == S_OK) {
-			paused = true;
-		}
-	}
-}
-
-void TTSDriverSAPI::resume() {
-	ERR_FAIL_NULL(synth);
-	synth->Resume();
-	paused = false;
-}
-
-void TTSDriverSAPI::stop() {
-	ERR_FAIL_NULL(synth);
-
-	SPVOICESTATUS status;
-	synth->GetStatus(&status, nullptr);
-	uint32_t current_stream = (uint32_t)status.ulCurrentStream;
-	if (ids.has(current_stream)) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, ids[current_stream].id);
-		ids.erase(current_stream);
-	}
-	for (TTSUtterance &message : queue) {
-		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServerEnums::TTS_UTTERANCE_CANCELED, message.id);
-	}
-	queue.clear();
-	synth->Speak(nullptr, SPF_PURGEBEFORESPEAK, nullptr);
-	synth->Resume();
-	paused = false;
-}
-
-bool TTSDriverSAPI::init() {
-	if (SUCCEEDED(CoCreateInstance(CLSID_SpVoice, nullptr, CLSCTX_ALL, IID_ISpVoice, (void **)&synth))) {
-		ULONGLONG event_mask = SPFEI(SPEI_END_INPUT_STREAM) | SPFEI(SPEI_START_INPUT_STREAM) | SPFEI(SPEI_WORD_BOUNDARY);
-		synth->SetInterest(event_mask, event_mask);
-		synth->SetNotifyCallbackFunction(&speech_event_callback, (WPARAM)(this), 0);
-		print_verbose("Text-to-Speech: SAPI initialized.");
-		return true;
-	} else {
-		print_verbose("Text-to-Speech: Cannot initialize SAPI driver!");
-		return false;
-	}
-}
-
-TTSDriverSAPI::TTSDriverSAPI() {
-	singleton = this;
-}
-
-TTSDriverSAPI::~TTSDriverSAPI() {
-	if (synth) {
-		synth->Release();
-	}
-	singleton = nullptr;
-}
diff --git a/engine/platform/windows/tts_driver_sapi.h b/engine/platform/windows/tts_driver_sapi.h
deleted file mode 100644
index e40495e3..00000000
--- a/engine/platform/windows/tts_driver_sapi.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************/
-/*  tts_driver_sapi.h                                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "tts_driver.h"
-
-#include <windows.h>
-
-#include <objbase.h>
-#include <sapi.h>
-#include <winnls.h>
-
-#include <cwchar>
-
-struct TTSUtterance;
-
-class TTSDriverSAPI : public TTSDriver {
-	List<TTSUtterance> queue;
-	ISpVoice *synth = nullptr;
-	bool paused = false;
-	struct UTData {
-		Char16String string;
-		int offset;
-		int64_t id;
-	};
-	HashMap<uint32_t, UTData> ids;
-	bool update_requested = false;
-
-	static void __stdcall speech_event_callback(WPARAM wParam, LPARAM lParam);
-
-	static TTSDriverSAPI *singleton;
-
-public:
-	virtual bool is_speaking() const override;
-	virtual bool is_paused() const override;
-	virtual Array get_voices() const override;
-
-	virtual void speak(const String &p_text, const String &p_voice, int p_volume = 50, float p_pitch = 1.f, float p_rate = 1.f, int64_t p_utterance_id = 0, bool p_interrupt = false) override;
-	virtual void pause() override;
-	virtual void resume() override;
-	virtual void stop() override;
-
-	virtual void process_events() override;
-
-	virtual bool init() override;
-
-	TTSDriverSAPI();
-	~TTSDriverSAPI();
-};
diff --git a/engine/platform/windows/tts_windows.cpp b/engine/platform/windows/tts_windows.cpp
index 6273483f..71985383 100644
--- a/engine/platform/windows/tts_windows.cpp
+++ b/engine/platform/windows/tts_windows.cpp
@@ -30,92 +30,243 @@
 
 #include "tts_windows.h"
 
-#include "tts_driver_sapi.h"
-
-#ifdef WINRT_ENABLED
-#include "tts_driver_onecore.h"
-#endif
-
 TTS_Windows *TTS_Windows::singleton = nullptr;
 
+void __stdcall TTS_Windows::speech_event_callback(WPARAM wParam, LPARAM lParam) {
+	TTS_Windows *tts = TTS_Windows::get_singleton();
+	SPEVENT event;
+	while (tts->synth->GetEvents(1, &event, nullptr) == S_OK) {
+		uint32_t stream_num = (uint32_t)event.ulStreamNum;
+		if (tts->ids.has(stream_num)) {
+			if (event.eEventId == SPEI_START_INPUT_STREAM) {
+				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_STARTED, tts->ids[stream_num].id);
+			} else if (event.eEventId == SPEI_END_INPUT_STREAM) {
+				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, tts->ids[stream_num].id);
+				tts->ids.erase(stream_num);
+				tts->update_requested = true;
+			} else if (event.eEventId == SPEI_WORD_BOUNDARY) {
+				const Char16String &string = tts->ids[stream_num].string;
+				int pos = 0;
+				for (int i = 0; i < MIN(event.lParam, string.length()); i++) {
+					char16_t c = string[i];
+					if ((c & 0xfffffc00) == 0xd800) {
+						i++;
+					}
+					pos++;
+				}
+				DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_BOUNDARY, tts->ids[stream_num].id, pos - tts->ids[stream_num].offset);
+			}
+		}
+	}
+}
+
+void TTS_Windows::process_events() {
+	if (update_requested && !paused && queue.size() > 0 && !is_speaking()) {
+		DisplayServer::TTSUtterance &message = queue.front()->get();
+
+		String text;
+		DWORD flags = SPF_ASYNC | SPF_PURGEBEFORESPEAK | SPF_IS_XML;
+		String pitch_tag = String("<pitch absmiddle=\"") + String::num_int64(message.pitch * 10 - 10, 10) + String("\">");
+		text = pitch_tag + message.text + String("</pitch>");
+
+		IEnumSpObjectTokens *cpEnum;
+		ISpObjectToken *cpVoiceToken;
+		ULONG ulCount = 0;
+		ULONG stream_number = 0;
+		ISpObjectTokenCategory *cpCategory;
+		HRESULT hr = CoCreateInstance(CLSID_SpObjectTokenCategory, nullptr, CLSCTX_INPROC_SERVER, IID_ISpObjectTokenCategory, (void **)&cpCategory);
+		if (SUCCEEDED(hr)) {
+			hr = cpCategory->SetId(SPCAT_VOICES, false);
+			if (SUCCEEDED(hr)) {
+				hr = cpCategory->EnumTokens(nullptr, nullptr, &cpEnum);
+				if (SUCCEEDED(hr)) {
+					hr = cpEnum->GetCount(&ulCount);
+					while (SUCCEEDED(hr) && ulCount--) {
+						wchar_t *w_id = nullptr;
+						hr = cpEnum->Next(1, &cpVoiceToken, nullptr);
+						cpVoiceToken->GetId(&w_id);
+						if (String::utf16((const char16_t *)w_id) == message.voice) {
+							synth->SetVoice(cpVoiceToken);
+							cpVoiceToken->Release();
+							break;
+						}
+						cpVoiceToken->Release();
+					}
+					cpEnum->Release();
+				}
+			}
+			cpCategory->Release();
+		}
+
+		UTData ut;
+		ut.string = text.utf16();
+		ut.offset = pitch_tag.length(); // Subtract injected <pitch> tag offset.
+		ut.id = message.id;
+
+		synth->SetVolume(message.volume);
+		synth->SetRate(10.f * std::log10(message.rate) / std::log10(3.f));
+		synth->Speak((LPCWSTR)ut.string.get_data(), flags, &stream_number);
+
+		ids[(uint32_t)stream_number] = ut;
+
+		queue.pop_front();
+
+		update_requested = false;
+	}
+}
+
+bool TTS_Windows::is_speaking() const {
+	ERR_FAIL_NULL_V(synth, false);
+
+	SPVOICESTATUS status;
+	synth->GetStatus(&status, nullptr);
+	return (status.dwRunningState == SPRS_IS_SPEAKING || status.dwRunningState == 0 /* Waiting To Speak */);
+}
+
+bool TTS_Windows::is_paused() const {
+	ERR_FAIL_NULL_V(synth, false);
+	return paused;
+}
+
+Array TTS_Windows::get_voices() const {
+	Array list;
+	IEnumSpObjectTokens *cpEnum;
+	ISpObjectToken *cpVoiceToken;
+	ISpDataKey *cpDataKeyAttribs;
+	ULONG ulCount = 0;
+	ISpObjectTokenCategory *cpCategory;
+	HRESULT hr = CoCreateInstance(CLSID_SpObjectTokenCategory, nullptr, CLSCTX_INPROC_SERVER, IID_ISpObjectTokenCategory, (void **)&cpCategory);
+	if (SUCCEEDED(hr)) {
+		hr = cpCategory->SetId(SPCAT_VOICES, false);
+		if (SUCCEEDED(hr)) {
+			hr = cpCategory->EnumTokens(nullptr, nullptr, &cpEnum);
+			if (SUCCEEDED(hr)) {
+				hr = cpEnum->GetCount(&ulCount);
+				while (SUCCEEDED(hr) && ulCount--) {
+					hr = cpEnum->Next(1, &cpVoiceToken, nullptr);
+					HRESULT hr_attr = cpVoiceToken->OpenKey(SPTOKENKEY_ATTRIBUTES, &cpDataKeyAttribs);
+					if (SUCCEEDED(hr_attr)) {
+						wchar_t *w_id = nullptr;
+						wchar_t *w_lang = nullptr;
+						wchar_t *w_name = nullptr;
+						cpVoiceToken->GetId(&w_id);
+						cpDataKeyAttribs->GetStringValue(L"Language", &w_lang);
+						cpDataKeyAttribs->GetStringValue(nullptr, &w_name);
+						LCID locale = wcstol(w_lang, nullptr, 16);
+
+						int locale_chars = GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, nullptr, 0);
+						int region_chars = GetLocaleInfoW(locale, LOCALE_SISO3166CTRYNAME, nullptr, 0);
+						wchar_t *w_lang_code = new wchar_t[locale_chars];
+						wchar_t *w_reg_code = new wchar_t[region_chars];
+						GetLocaleInfoW(locale, LOCALE_SISO639LANGNAME, w_lang_code, locale_chars);
+						GetLocaleInfoW(locale, LOCALE_SISO3166CTRYNAME, w_reg_code, region_chars);
+
+						Dictionary voice_d;
+						voice_d["id"] = String::utf16((const char16_t *)w_id);
+						if (w_name) {
+							voice_d["name"] = String::utf16((const char16_t *)w_name);
+						} else {
+							voice_d["name"] = voice_d["id"].operator String().replace("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices\\Tokens\\", "");
+						}
+						voice_d["language"] = String::utf16((const char16_t *)w_lang_code) + "_" + String::utf16((const char16_t *)w_reg_code);
+						list.push_back(voice_d);
+
+						delete[] w_lang_code;
+						delete[] w_reg_code;
+
+						cpDataKeyAttribs->Release();
+					}
+					cpVoiceToken->Release();
+				}
+				cpEnum->Release();
+			}
+		}
+		cpCategory->Release();
+	}
+	return list;
+}
+
+void TTS_Windows::speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int64_t p_utterance_id, bool p_interrupt) {
+	ERR_FAIL_NULL(synth);
+	if (p_interrupt) {
+		stop();
+	}
+
+	if (p_text.is_empty()) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, p_utterance_id);
+		return;
+	}
+
+	DisplayServer::TTSUtterance message;
+	message.text = p_text;
+	message.voice = p_voice;
+	message.volume = CLAMP(p_volume, 0, 100);
+	message.pitch = CLAMP(p_pitch, 0.f, 2.f);
+	message.rate = CLAMP(p_rate, 0.1f, 10.f);
+	message.id = p_utterance_id;
+	queue.push_back(message);
+
+	if (is_paused()) {
+		resume();
+	} else {
+		update_requested = true;
+	}
+}
+
+void TTS_Windows::pause() {
+	ERR_FAIL_NULL(synth);
+	if (!paused) {
+		if (synth->Pause() == S_OK) {
+			paused = true;
+		}
+	}
+}
+
+void TTS_Windows::resume() {
+	ERR_FAIL_NULL(synth);
+	synth->Resume();
+	paused = false;
+}
+
+void TTS_Windows::stop() {
+	ERR_FAIL_NULL(synth);
+
+	SPVOICESTATUS status;
+	synth->GetStatus(&status, nullptr);
+	uint32_t current_stream = (uint32_t)status.ulCurrentStream;
+	if (ids.has(current_stream)) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, ids[current_stream].id);
+		ids.erase(current_stream);
+	}
+	for (DisplayServer::TTSUtterance &message : queue) {
+		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, message.id);
+	}
+	queue.clear();
+	synth->Speak(nullptr, SPF_PURGEBEFORESPEAK, nullptr);
+	synth->Resume();
+	paused = false;
+}
+
 TTS_Windows *TTS_Windows::get_singleton() {
 	return singleton;
 }
 
-bool TTS_Windows::is_speaking() const {
-	if (driver) {
-		return driver->is_speaking();
-	}
-	return false;
-}
-
-bool TTS_Windows::is_paused() const {
-	if (driver) {
-		return driver->is_paused();
-	}
-	return false;
-}
-
-Array TTS_Windows::get_voices() const {
-	if (driver) {
-		return driver->get_voices();
-	}
-	return Array();
-}
-
-void TTS_Windows::speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int64_t p_utterance_id, bool p_interrupt) {
-	if (driver) {
-		driver->speak(p_text, p_voice, p_volume, p_pitch, p_rate, p_utterance_id, p_interrupt);
-	}
-}
-
-void TTS_Windows::pause() {
-	if (driver) {
-		driver->pause();
-	}
-}
-
-void TTS_Windows::resume() {
-	if (driver) {
-		driver->resume();
-	}
-}
-
-void TTS_Windows::stop() {
-	if (driver) {
-		driver->stop();
-	}
-}
-
-void TTS_Windows::process_events() {
-	if (driver) {
-		driver->process_events();
-	}
-}
-
 TTS_Windows::TTS_Windows() {
-#ifdef WINRT_ENABLED
-	// Try OneCore driver.
-	if (!driver) {
-		driver = memnew(TTSDriverOneCore);
-		if (!driver->init()) {
-			memdelete(driver);
-			driver = nullptr;
-		}
-	}
-#endif
-	// Try SAPI driver.
-	if (!driver) {
-		driver = memnew(TTSDriverSAPI);
-		if (!driver->init()) {
-			memdelete(driver);
-			driver = nullptr;
-		}
+	singleton = this;
+
+	if (SUCCEEDED(CoCreateInstance(CLSID_SpVoice, nullptr, CLSCTX_ALL, IID_ISpVoice, (void **)&synth))) {
+		ULONGLONG event_mask = SPFEI(SPEI_END_INPUT_STREAM) | SPFEI(SPEI_START_INPUT_STREAM) | SPFEI(SPEI_WORD_BOUNDARY);
+		synth->SetInterest(event_mask, event_mask);
+		synth->SetNotifyCallbackFunction(&speech_event_callback, (WPARAM)(this), 0);
+		print_verbose("Text-to-Speech: SAPI initialized.");
+	} else {
+		print_verbose("Text-to-Speech: Cannot initialize ISpVoice!");
 	}
 }
 
 TTS_Windows::~TTS_Windows() {
-	if (driver) {
-		memdelete(driver);
+	if (synth) {
+		synth->Release();
 	}
+	singleton = nullptr;
 }
diff --git a/engine/platform/windows/tts_windows.h b/engine/platform/windows/tts_windows.h
index a2f7d914..d841ac4c 100644
--- a/engine/platform/windows/tts_windows.h
+++ b/engine/platform/windows/tts_windows.h
@@ -31,14 +31,32 @@
 #pragma once
 
 #include "core/string/ustring.h"
+#include "core/templates/hash_map.h"
+#include "core/templates/list.h"
 #include "core/variant/array.h"
+#include "servers/display/display_server.h"
 
-class TTSDriver;
+#include <objbase.h>
+#include <sapi.h>
+#include <winnls.h>
+#include <cwchar>
 
-struct TTSUtterance;
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 class TTS_Windows {
-	TTSDriver *driver = nullptr;
+	List<DisplayServer::TTSUtterance> queue;
+	ISpVoice *synth = nullptr;
+	bool paused = false;
+	struct UTData {
+		Char16String string;
+		int offset;
+		int64_t id;
+	};
+	HashMap<uint32_t, UTData> ids;
+	bool update_requested = false;
+
+	static void __stdcall speech_event_callback(WPARAM wParam, LPARAM lParam);
 
 	static TTS_Windows *singleton;
 
diff --git a/engine/platform/windows/wgl_detect_version.cpp b/engine/platform/windows/wgl_detect_version.cpp
index 154f123b..c5208295 100644
--- a/engine/platform/windows/wgl_detect_version.cpp
+++ b/engine/platform/windows/wgl_detect_version.cpp
@@ -31,10 +31,8 @@
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
 #include "wgl_detect_version.h"
-
 #include "os_windows.h"
 
-#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
 #include "core/variant/dictionary.h"
@@ -42,7 +40,6 @@
 #include <windows.h>
 
 #include <dwmapi.h>
-
 #include <cstdio>
 #include <cstdlib>
 
diff --git a/engine/platform/windows/windows.h b/engine/platform/windows/windows.h
deleted file mode 100644
index 96e1accb..00000000
--- a/engine/platform/windows/windows.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************/
-/*  windows.h                                                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#ifdef _MSC_VER
-// HACK: MSVC lacks an `include_next` equivalent, so we'll instead utilize the relative path of
-//  the system include by going up one directory and immediately returning.
-#include <../um/windows.h>
-#else
-#include_next <windows.h>
-#endif
-
-// windows.h badly defines macros that clash with our own or types/enums.
-#undef ERROR // wingdi.h
-#undef DELETE // winnt.h
-#undef MessageBox // winuser.h
-#undef CONNECT_DEFERRED // winnetwk.h
-#undef MONO_FONT // wingdi.h
diff --git a/engine/platform/windows/windows_terminal_logger.cpp b/engine/platform/windows/windows_terminal_logger.cpp
index effaf6ae..e9ed9104 100644
--- a/engine/platform/windows/windows_terminal_logger.cpp
+++ b/engine/platform/windows/windows_terminal_logger.cpp
@@ -30,15 +30,16 @@
 
 #include "windows_terminal_logger.h"
 
-#ifdef WINDOWS_ENABLED
-
 #include "core/object/script_backtrace.h"
 #include "core/os/os.h"
 
-#include <windows.h>
+#ifdef WINDOWS_ENABLED
 
 #include <cstdio>
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
 void WindowsTerminalLogger::logv(const char *p_format, va_list p_list, bool p_err) {
 	if (!should_log(p_err)) {
 		return;
diff --git a/engine/platform/windows/windows_utils.cpp b/engine/platform/windows/windows_utils.cpp
index b1cc566b..7015f633 100644
--- a/engine/platform/windows/windows_utils.cpp
+++ b/engine/platform/windows/windows_utils.cpp
@@ -36,6 +36,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef FAILED // Overrides Error::FAILED
 
diff --git a/engine/platform_methods.py b/engine/platform_methods.py
index 7a702c08..af9134ae 100644
--- a/engine/platform_methods.py
+++ b/engine/platform_methods.py
@@ -17,7 +17,7 @@ compatibility_platform_aliases = {
 }
 
 # CPU architecture options.
-architectures = ["x86_32", "x86_64", "arm32", "arm64", "rv64", "ppc64", "wasm32", "wasm64", "loongarch64"]
+architectures = ["x86_32", "x86_64", "arm32", "arm64", "rv64", "ppc64", "wasm32", "loongarch64"]
 architecture_aliases = {
     "x86": "x86_32",
     "x64": "x86_64",
@@ -172,93 +172,13 @@ def combine_libs_apple_embedded(target, source, env):
     )
 
 
-def lipo_and_copy_apple_embedded(
-    platform, framework_dir, framework_dir_sim, rel_prefix, dbg_prefix, module_prefix, app_dir, env
-):
+def generate_bundle_apple_embedded(platform, framework_dir, framework_dir_sim, use_mkv, target, source, env):
     bin_dir = env.Dir("#bin").abspath
 
-    # Lipo template libraries.
-    #
-    # env.extra_suffix contains ".simulator" when building for simulator,
-    # but it's undesired when calling lipo()
-    extra_suffix = env.extra_suffix.replace(".simulator", "")
-    rel_target_bin = lipo(bin_dir + "/libgodot" + module_prefix + "." + rel_prefix, extra_suffix + ".a")
-    dbg_target_bin = lipo(bin_dir + "/libgodot" + module_prefix + "." + dbg_prefix, extra_suffix + ".a")
-    rel_target_bin_sim = lipo(
-        bin_dir + "/libgodot" + module_prefix + "." + rel_prefix, ".simulator" + extra_suffix + ".a"
-    )
-    dbg_target_bin_sim = lipo(
-        bin_dir + "/libgodot" + module_prefix + "." + dbg_prefix, ".simulator" + extra_suffix + ".a"
-    )
-    # Assemble Xcode project bundle.
-    if rel_target_bin != "":
-        print(f' Copying "{platform}" release framework')
-        shutil.copy(
-            rel_target_bin,
-            app_dir
-            + "/libgodot"
-            + module_prefix
-            + "."
-            + platform
-            + ".release.xcframework/"
-            + framework_dir
-            + "/libgodot"
-            + module_prefix
-            + ".a",
-        )
-    if dbg_target_bin != "":
-        print(f' Copying "{platform}" debug framework')
-        shutil.copy(
-            dbg_target_bin,
-            app_dir
-            + "/libgodot"
-            + module_prefix
-            + "."
-            + platform
-            + ".debug.xcframework/"
-            + framework_dir
-            + "/libgodot"
-            + module_prefix
-            + ".a",
-        )
-    if rel_target_bin_sim != "":
-        print(f' Copying "{platform}" (simulator) release framework')
-        shutil.copy(
-            rel_target_bin_sim,
-            app_dir
-            + "/libgodot"
-            + module_prefix
-            + "."
-            + platform
-            + ".release.xcframework/"
-            + framework_dir_sim
-            + "/libgodot"
-            + module_prefix
-            + ".a",
-        )
-    if dbg_target_bin_sim != "":
-        print(f' Copying "{platform}" (simulator) debug framework')
-        shutil.copy(
-            dbg_target_bin_sim,
-            app_dir
-            + "/libgodot"
-            + module_prefix
-            + "."
-            + platform
-            + ".debug.xcframework/"
-            + framework_dir_sim
-            + "/libgodot"
-            + module_prefix
-            + ".a",
-        )
-
-
-def generate_bundle_apple_embedded(platform, framework_dir, framework_dir_sim, use_mkv, target, source, env):
     # Template bundle.
-    extra_suffix = env.extra_suffix.replace(".simulator", "")
     app_prefix = "godot." + platform
-    rel_prefix = platform + "." + "template_release"
-    dbg_prefix = platform + "." + "template_debug"
+    rel_prefix = "libgodot." + platform + "." + "template_release"
+    dbg_prefix = "libgodot." + platform + "." + "template_debug"
     if env.dev_build:
         app_prefix += ".dev"
         rel_prefix += ".dev"
@@ -268,22 +188,47 @@ def generate_bundle_apple_embedded(platform, framework_dir, framework_dir_sim, u
         rel_prefix += ".double"
         dbg_prefix += ".double"
 
+    # Lipo template libraries.
+    #
+    # env.extra_suffix contains ".simulator" when building for simulator,
+    # but it's undesired when calling lipo()
+    extra_suffix = env.extra_suffix.replace(".simulator", "")
+    rel_target_bin = lipo(bin_dir + "/" + rel_prefix, extra_suffix + ".a")
+    dbg_target_bin = lipo(bin_dir + "/" + dbg_prefix, extra_suffix + ".a")
+    rel_target_bin_sim = lipo(bin_dir + "/" + rel_prefix, ".simulator" + extra_suffix + ".a")
+    dbg_target_bin_sim = lipo(bin_dir + "/" + dbg_prefix, ".simulator" + extra_suffix + ".a")
+    # Assemble Xcode project bundle.
     app_dir = env.Dir("#bin/" + platform + "_xcode").abspath
     templ = env.Dir("#misc/dist/apple_embedded_xcode").abspath
     if os.path.exists(app_dir):
         shutil.rmtree(app_dir)
     shutil.copytree(templ, app_dir)
-
-    lipo_and_copy_apple_embedded(platform, framework_dir, framework_dir_sim, rel_prefix, dbg_prefix, "", app_dir, env)
-    if "MODULES_EXTERNAL" in env:
-        for mod in env["MODULES_EXTERNAL"]:
-            lipo_and_copy_apple_embedded(
-                platform, framework_dir, framework_dir_sim, rel_prefix, dbg_prefix, mod, app_dir, env
-            )
+    if rel_target_bin != "":
+        print(f' Copying "{platform}" release framework')
+        shutil.copy(
+            rel_target_bin, app_dir + "/libgodot." + platform + ".release.xcframework/" + framework_dir + "/libgodot.a"
+        )
+    if dbg_target_bin != "":
+        print(f' Copying "{platform}" debug framework')
+        shutil.copy(
+            dbg_target_bin, app_dir + "/libgodot." + platform + ".debug.xcframework/" + framework_dir + "/libgodot.a"
+        )
+    if rel_target_bin_sim != "":
+        print(f' Copying "{platform}" (simulator) release framework')
+        shutil.copy(
+            rel_target_bin_sim,
+            app_dir + "/libgodot." + platform + ".release.xcframework/" + framework_dir_sim + "/libgodot.a",
+        )
+    if dbg_target_bin_sim != "":
+        print(f' Copying "{platform}" (simulator) debug framework')
+        shutil.copy(
+            dbg_target_bin_sim,
+            app_dir + "/libgodot." + platform + ".debug.xcframework/" + framework_dir_sim + "/libgodot.a",
+        )
 
     # Remove other platform xcframeworks
     for entry in os.listdir(app_dir):
-        if (entry.startswith("libgodot.") or entry.startswith("libgodot_")) and entry.endswith(".xcframework"):
+        if entry.startswith("libgodot.") and entry.endswith(".xcframework"):
             parts = entry.split(".")
             if len(parts) >= 3 and parts[1] != platform:
                 full_path = os.path.join(app_dir, entry)
@@ -292,11 +237,7 @@ def generate_bundle_apple_embedded(platform, framework_dir, framework_dir_sim, u
     if use_mkv:
         mvk_path = detect_mvk(env, "ios-arm64")
         if mvk_path != "":
-            shutil.copytree(mvk_path + "/ios-arm64", app_dir + "/MoltenVK.xcframework/ios-arm64")
-            shutil.copytree(
-                mvk_path + "/ios-arm64_x86_64-simulator", app_dir + "/MoltenVK.xcframework/ios-arm64_x86_64-simulator"
-            )
-            shutil.copy(mvk_path + "/Info.plist", app_dir + "/MoltenVK.xcframework/Info.plist")
+            shutil.copytree(mvk_path, app_dir + "/MoltenVK.xcframework")
 
     # ZIP Xcode project bundle.
     zip_dir = env.Dir("#bin/" + (app_prefix + extra_suffix).replace(".", "_")).abspath
diff --git a/engine/pyproject.toml b/engine/pyproject.toml
index f00b2932..b1245da9 100644
--- a/engine/pyproject.toml
+++ b/engine/pyproject.toml
@@ -10,36 +10,29 @@ warn_redundant_casts = true
 warn_return_any = true
 warn_unreachable = true
 exclude = ["thirdparty/"]
-python_version = "3.9"
+python_version = "3.8"
 
 [tool.ruff]
 extend-exclude = ["thirdparty"]
 extend-include = ["*SConstruct", "*SCsub"]
-target-version = "py39"
 line-length = 120
-preview = true
-fix = true
+target-version = "py38"
 
 [tool.ruff.lint]
-# NOTE: Starting with `0.15.2`, ruff uses a SIGNIFICANTLY expanded set of default rules for
-#  preview builds. While expanding into these new rulesets is something we're interested in,
-#  we'll adopt them gradually, depending on our needs. As such, our base `select` utilizes the
-#  legacy defaults.
-select = ["E4", "E7", "E9", "F"]
 extend-select = [
-	"FA",    # flake8-future-annotations.
-	"I",     # isort.
-	"UP006", # Use {to} instead of {from} for type annotation.
-	"UP007", # Use `X | Y` for type annotations.
-	"UP037", # Remove quotes from type annotation.
+	"I",     # isort
+	"UP006", # Use {to} instead of {from} for type annotation
+	"UP007", # Use `X | Y` for type annotations
+	"UP037", # Remove quotes from type annotation
+	"FA",    # Future annotations
 ]
-extend-safe-fixes = ["FA", "UP006", "UP007"]
+extend-safe-fixes = ["UP006", "UP007", "FA"]
 
 [tool.ruff.lint.per-file-ignores]
 "{SConstruct,SCsub}" = [
-	"E402", # Module level import not at top of file.
-	"F403", # Undefined local with import star.
-	"F405", # Undefined local with import star usage.
+	"E402", # Module level import not at top of file
+	"F403", # Undefined local with import star
+	"F405", # Undefined local with import star usage
 ]
 
 [tool.ruff.lint.isort]
diff --git a/engine/scene/2d/animated_sprite_2d.cpp b/engine/scene/2d/animated_sprite_2d.cpp
index ebb091f5..525b9414 100644
--- a/engine/scene/2d/animated_sprite_2d.cpp
+++ b/engine/scene/2d/animated_sprite_2d.cpp
@@ -30,11 +30,7 @@
 
 #include "animated_sprite_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
-#include "servers/display/accessibility_server.h"
 
 #ifdef TOOLS_ENABLED
 Dictionary AnimatedSprite2D::_edit_get_state() const {
@@ -121,12 +117,10 @@ void AnimatedSprite2D::_validate_property(PropertyInfo &p_property) const {
 		return;
 	}
 	if (!Engine::get_singleton()->is_editor_hint()) {
-		if (p_property.name == "frame") {
-			if (playing) {
-				p_property.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY;
-			}
-			return;
+		if (p_property.name == "frame" && playing) {
+			p_property.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY;
 		}
+		return;
 	}
 	if (p_property.name == "animation") {
 		List<StringName> names;
@@ -184,9 +178,9 @@ void AnimatedSprite2D::_notification(int p_what) {
 
 			Rect2 dst_rect = _get_rect();
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_IMAGE);
-			AccessibilityServer::get_singleton()->update_set_transform(ae, get_transform());
-			AccessibilityServer::get_singleton()->update_set_bounds(ae, dst_rect);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -316,6 +310,7 @@ void AnimatedSprite2D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 	if (frames.is_valid()) {
 		frames->disconnect(CoreStringName(changed), callable_mp(this, &AnimatedSprite2D::_res_changed));
 	}
+	stop();
 	frames = p_frames;
 	if (frames.is_valid()) {
 		frames->connect(CoreStringName(changed), callable_mp(this, &AnimatedSprite2D::_res_changed));
@@ -334,7 +329,6 @@ void AnimatedSprite2D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 			}
 		}
 	}
-	stop();
 
 	notify_property_list_changed();
 	queue_redraw();
@@ -674,7 +668,7 @@ void AnimatedSprite2D::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("animation_looped"));
 	ADD_SIGNAL(MethodInfo("animation_finished"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sprite_frames", PROPERTY_HINT_RESOURCE_TYPE, SpriteFrames::get_class_static()), "set_sprite_frames", "get_sprite_frames");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sprite_frames", PROPERTY_HINT_RESOURCE_TYPE, "SpriteFrames"), "set_sprite_frames", "get_sprite_frames");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "animation", PROPERTY_HINT_ENUM, ""), "set_animation", "get_animation");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "autoplay", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_autoplay", "get_autoplay");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "frame"), "set_frame", "get_frame");
diff --git a/engine/scene/2d/audio_listener_2d.cpp b/engine/scene/2d/audio_listener_2d.cpp
index bc36464e..2d6ef203 100644
--- a/engine/scene/2d/audio_listener_2d.cpp
+++ b/engine/scene/2d/audio_listener_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_listener_2d.h"
 
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 bool AudioListener2D::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/engine/scene/2d/audio_stream_player_2d.compat.inc b/engine/scene/2d/audio_stream_player_2d.compat.inc
index f2911fc3..6f541087 100644
--- a/engine/scene/2d/audio_stream_player_2d.compat.inc
+++ b/engine/scene/2d/audio_stream_player_2d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "audio_stream_player_2d.h"
-
-#include "core/object/class_db.h"
-
 bool AudioStreamPlayer2D::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/engine/scene/2d/audio_stream_player_2d.cpp b/engine/scene/2d/audio_stream_player_2d.cpp
index 429805f2..e1fa6d55 100644
--- a/engine/scene/2d/audio_stream_player_2d.cpp
+++ b/engine/scene/2d/audio_stream_player_2d.cpp
@@ -32,8 +32,6 @@
 #include "audio_stream_player_2d.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/audio_listener_2d.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "scene/main/viewport.h"
@@ -127,7 +125,7 @@ void AudioStreamPlayer2D::_update_panning() {
 
 	Vector2 global_pos = get_global_position();
 
-	HashSet<Viewport *> viewports(world_2d->get_viewports());
+	HashSet<Viewport *> viewports = world_2d->get_viewports();
 
 	volume_vector.resize(4);
 	volume_vector.write[0] = AudioFrame(0, 0);
@@ -428,7 +426,7 @@ void AudioStreamPlayer2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_playback_type", "playback_type"), &AudioStreamPlayer2D::set_playback_type);
 	ClassDB::bind_method(D_METHOD("get_playback_type"), &AudioStreamPlayer2D::get_playback_type);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()), "set_stream", "get_stream");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_linear", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_volume_linear", "get_volume_linear");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
diff --git a/engine/scene/2d/back_buffer_copy.cpp b/engine/scene/2d/back_buffer_copy.cpp
index c50e101e..9561971d 100644
--- a/engine/scene/2d/back_buffer_copy.cpp
+++ b/engine/scene/2d/back_buffer_copy.cpp
@@ -30,10 +30,6 @@
 
 #include "back_buffer_copy.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void BackBufferCopy::_update_copy_mode() {
 	switch (copy_mode) {
 		case COPY_MODE_DISABLED: {
diff --git a/engine/scene/2d/camera_2d.cpp b/engine/scene/2d/camera_2d.cpp
index 44345121..78957460 100644
--- a/engine/scene/2d/camera_2d.cpp
+++ b/engine/scene/2d/camera_2d.cpp
@@ -30,11 +30,8 @@
 
 #include "camera_2d.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
+#include "core/input/input.h"
 #include "scene/main/viewport.h"
 
 void Camera2D::_update_scroll() {
@@ -965,7 +962,7 @@ void Camera2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ignore_rotation"), "set_ignore_rotation", "is_ignoring_rotation");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "zoom", PROPERTY_HINT_LINK), "set_zoom", "get_zoom");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "custom_viewport", PROPERTY_HINT_RESOURCE_TYPE, Viewport::get_class_static(), PROPERTY_USAGE_NONE), "set_custom_viewport", "get_custom_viewport");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "custom_viewport", PROPERTY_HINT_RESOURCE_TYPE, "Viewport", PROPERTY_USAGE_NONE), "set_custom_viewport", "get_custom_viewport");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "process_callback", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_callback", "get_process_callback");
 
 	ADD_GROUP("Limit", "limit_");
diff --git a/engine/scene/2d/canvas_group.cpp b/engine/scene/2d/canvas_group.cpp
index 9ceae205..42e5c16e 100644
--- a/engine/scene/2d/canvas_group.cpp
+++ b/engine/scene/2d/canvas_group.cpp
@@ -30,14 +30,11 @@
 
 #include "canvas_group.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void CanvasGroup::set_fit_margin(real_t p_fit_margin) {
 	ERR_FAIL_COND(p_fit_margin < 0.0);
 
 	fit_margin = p_fit_margin;
-	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RSE::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
+	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
 
 	queue_redraw();
 }
@@ -50,7 +47,7 @@ void CanvasGroup::set_clear_margin(real_t p_clear_margin) {
 	ERR_FAIL_COND(p_clear_margin < 0.0);
 
 	clear_margin = p_clear_margin;
-	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RSE::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
+	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
 
 	queue_redraw();
 }
@@ -61,7 +58,7 @@ real_t CanvasGroup::get_clear_margin() const {
 
 void CanvasGroup::set_use_mipmaps(bool p_use_mipmaps) {
 	use_mipmaps = p_use_mipmaps;
-	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RSE::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
+	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CANVAS_GROUP_MODE_TRANSPARENT, clear_margin, true, fit_margin, use_mipmaps);
 }
 bool CanvasGroup::is_using_mipmaps() const {
 	return use_mipmaps;
@@ -119,5 +116,5 @@ CanvasGroup::CanvasGroup() {
 	set_fit_margin(10.0); //sets things
 }
 CanvasGroup::~CanvasGroup() {
-	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RSE::CANVAS_GROUP_MODE_DISABLED);
+	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CANVAS_GROUP_MODE_DISABLED);
 }
diff --git a/engine/scene/2d/canvas_modulate.cpp b/engine/scene/2d/canvas_modulate.cpp
index 0de9d8a2..80d613d4 100644
--- a/engine/scene/2d/canvas_modulate.cpp
+++ b/engine/scene/2d/canvas_modulate.cpp
@@ -30,10 +30,6 @@
 
 #include "canvas_modulate.h"
 
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
-
 void CanvasModulate::_on_in_canvas_visibility_changed(bool p_new_visibility) {
 	RID canvas = get_canvas();
 	StringName group_name = "_canvas_modulate_" + itos(canvas.get_id());
diff --git a/engine/scene/2d/cpu_particles_2d.compat.inc b/engine/scene/2d/cpu_particles_2d.compat.inc
index 5fd2b357..38a801ec 100644
--- a/engine/scene/2d/cpu_particles_2d.compat.inc
+++ b/engine/scene/2d/cpu_particles_2d.compat.inc
@@ -30,21 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "cpu_particles_2d.h"
-
-#include "core/object/class_db.h"
-
 void CPUParticles2D::_restart_bind_compat_92089() {
 	restart(false);
 }
 
-void CPUParticles2D::_request_particles_process_bind_compat_109142(real_t p_time) {
-	request_particles_process(p_time, 0.);
-}
-
 void CPUParticles2D::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("restart"), &CPUParticles2D::_restart_bind_compat_92089);
-	ClassDB::bind_compatibility_method(D_METHOD("request_particles_process", "process_time"), &CPUParticles2D::_request_particles_process_bind_compat_109142);
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/scene/2d/cpu_particles_2d.cpp b/engine/scene/2d/cpu_particles_2d.cpp
index 96070ec5..c897a5b7 100644
--- a/engine/scene/2d/cpu_particles_2d.cpp
+++ b/engine/scene/2d/cpu_particles_2d.cpp
@@ -31,19 +31,14 @@
 #include "cpu_particles_2d.h"
 #include "cpu_particles_2d.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/math/random_number_generator.h"
 #include "core/math/transform_interpolator.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/gpu_particles_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/particle_process_material.h"
-#include "servers/rendering/rendering_server.h"
 
 void CPUParticles2D::set_emitting(bool p_emitting) {
 	if (emitting == p_emitting) {
@@ -82,7 +77,7 @@ void CPUParticles2D::set_amount(int p_amount) {
 	}
 
 	particle_data.resize((8 + 4 + 4) * p_amount);
-	RS::get_singleton()->multimesh_allocate_data(multimesh, p_amount, RSE::MULTIMESH_TRANSFORM_2D, true, true);
+	RS::get_singleton()->multimesh_allocate_data(multimesh, p_amount, RS::MULTIMESH_TRANSFORM_2D, true, true);
 
 	particle_order.resize(p_amount);
 }
@@ -224,14 +219,14 @@ void CPUParticles2D::_update_mesh_texture() {
 	Vector<int> indices = { 0, 1, 2, 2, 3, 0 };
 
 	Array arr;
-	arr.resize(RSE::ARRAY_MAX);
-	arr[RSE::ARRAY_VERTEX] = vertices;
-	arr[RSE::ARRAY_TEX_UV] = uvs;
-	arr[RSE::ARRAY_COLOR] = colors;
-	arr[RSE::ARRAY_INDEX] = indices;
+	arr.resize(RS::ARRAY_MAX);
+	arr[RS::ARRAY_VERTEX] = vertices;
+	arr[RS::ARRAY_TEX_UV] = uvs;
+	arr[RS::ARRAY_COLOR] = colors;
+	arr[RS::ARRAY_INDEX] = indices;
 
 	RS::get_singleton()->mesh_clear(mesh);
-	RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RSE::PRIMITIVE_TRIANGLES, arr);
+	RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RS::PRIMITIVE_TRIANGLES, arr);
 }
 
 void CPUParticles2D::set_texture(const Ref<Texture2D> &p_texture) {
@@ -632,55 +627,51 @@ uint32_t CPUParticles2D::get_seed() const {
 	return seed;
 }
 
-void CPUParticles2D::request_particles_process(real_t p_request_process_time, real_t p_request_process_time_residual) {
-	_request_process_time = p_request_process_time;
-	_request_process_time_residual = p_request_process_time_residual;
-	_update_internal();
+void CPUParticles2D::request_particles_process(real_t p_requested_process_time) {
+	_requested_process_time = p_requested_process_time;
 }
 
 void CPUParticles2D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "emitting") {
 		p_property.hint = one_shot ? PROPERTY_HINT_ONESHOT : PROPERTY_HINT_NONE;
-	} else if (p_property.name == "emission_sphere_radius") {
-		if (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_rect_extents") {
-		if (emission_shape != EMISSION_SHAPE_RECTANGLE) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture") {
-		if (emission_shape < EMISSION_SHAPE_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_normals") {
-		if (emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_points") {
-		if (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_colors") {
-		if (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name.begins_with("scale_curve_")) {
-		if (!split_scale) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_ring_inner_radius") {
-		if (emission_shape != EMISSION_SHAPE_RING) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_ring_radius") {
-		if (emission_shape != EMISSION_SHAPE_RING) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "seed") {
-		if (!use_fixed_seed) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
+	}
+
+	if (p_property.name == "emission_sphere_radius" && (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_rect_extents" && emission_shape != EMISSION_SHAPE_RECTANGLE) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if ((p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture") && (emission_shape < EMISSION_SHAPE_POINTS)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_normals" && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_points" && emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_colors" && emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if (p_property.name.begins_with("scale_curve_") && !split_scale) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_ring_inner_radius" && emission_shape != EMISSION_SHAPE_RING) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if (p_property.name == "emission_ring_radius" && emission_shape != EMISSION_SHAPE_RING) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "seed" && !use_fixed_seed) {
+		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
 
@@ -726,58 +717,28 @@ void CPUParticles2D::_update_internal() {
 		cycle = 0;
 		return;
 	}
-
 	_set_do_redraw(true);
-	{
-		float todo = time == 0 ? pre_process_time : 0;
-		todo = todo > _request_process_time ? todo : _request_process_time;
-		todo = todo > _request_process_time_residual ? todo : _request_process_time_residual;
-
-		if (todo > 0.0) {
-			real_t frame_time;
-			if (fixed_fps > 0) {
-				frame_time = 1.0 / fixed_fps;
-			} else {
-				frame_time = 1.0 / 30.0;
-			}
-
-			float tmp_scale = speed_scale;
-			// We need this otherwise the speed scale of the particle system influences the `todo`.
-			speed_scale = 1.0;
-			if (time == 0) {
-				todo = pre_process_time;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (_request_process_time > 0.0) {
-				todo = _request_process_time;
-				emitting = true;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (_request_process_time_residual > 0.0) {
-				emitting = false;
-				todo = _request_process_time_residual;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			speed_scale = tmp_scale;
-		}
-		_request_process_time = 0;
-		_request_process_time_residual = 0;
-	}
 	double frame_time;
 	if (fixed_fps > 0) {
 		frame_time = 1.0 / fixed_fps;
 	} else {
 		frame_time = 1.0 / 30.0;
 	}
+	double todo = _requested_process_time;
+	_requested_process_time = 0;
+	if (time == 0 && pre_process_time > 0.0) {
+		todo += pre_process_time;
+	}
+	real_t tmp_speed = speed_scale;
+	speed_scale = 1.0;
+	while (todo > 0) {
+		_particles_process(frame_time);
+		todo -= frame_time;
+	}
+	speed_scale = tmp_speed;
+
+	todo = 0.0;
+
 	if (fixed_fps > 0) {
 		double decr = frame_time;
 
@@ -787,7 +748,7 @@ void CPUParticles2D::_update_internal() {
 		} else if (ldelta <= 0.0) { //unlikely but..
 			ldelta = 0.001;
 		}
-		double todo = frame_remainder + ldelta;
+		todo = frame_remainder + ldelta;
 
 		while (todo >= frame_time) {
 			_particles_process(frame_time);
@@ -1007,7 +968,7 @@ void CPUParticles2D::_particles_process(double p_delta) {
 
 		} else if (!p.active) {
 			continue;
-		} else if (p.time >= p.lifetime) {
+		} else if (p.time > p.lifetime) {
 			p.active = false;
 			tv = 1.0;
 		} else {
@@ -1460,13 +1421,13 @@ void CPUParticles2D::convert_from_particles(Node *p_particles) {
 	set_gravity(Vector2(proc_mat->get_gravity().x, proc_mat->get_gravity().y));
 	set_lifetime_randomness(proc_mat->get_lifetime_randomness());
 
-#define CONVERT_PARAM(m_param) \
-	set_param_min(m_param, proc_mat->get_param_min(ParticleProcessMaterial::m_param)); \
-	{ \
+#define CONVERT_PARAM(m_param)                                                                  \
+	set_param_min(m_param, proc_mat->get_param_min(ParticleProcessMaterial::m_param));          \
+	{                                                                                           \
 		Ref<CurveTexture> ctex = proc_mat->get_param_texture(ParticleProcessMaterial::m_param); \
-		if (ctex.is_valid()) \
-			set_param_curve(m_param, ctex->get_curve()); \
-	} \
+		if (ctex.is_valid())                                                                    \
+			set_param_curve(m_param, ctex->get_curve());                                        \
+	}                                                                                           \
 	set_param_max(m_param, proc_mat->get_param_max(ParticleProcessMaterial::m_param));
 
 	CONVERT_PARAM(PARAM_INITIAL_LINEAR_VELOCITY);
@@ -1498,7 +1459,7 @@ void CPUParticles2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_fixed_fps", "fps"), &CPUParticles2D::set_fixed_fps);
 	ClassDB::bind_method(D_METHOD("set_fractional_delta", "enable"), &CPUParticles2D::set_fractional_delta);
 	ClassDB::bind_method(D_METHOD("set_speed_scale", "scale"), &CPUParticles2D::set_speed_scale);
-	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time", "process_time_residual"), &CPUParticles2D::request_particles_process, DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time"), &CPUParticles2D::request_particles_process);
 
 	ClassDB::bind_method(D_METHOD("is_emitting"), &CPUParticles2D::is_emitting);
 	ClassDB::bind_method(D_METHOD("get_amount"), &CPUParticles2D::get_amount);
@@ -1529,7 +1490,7 @@ void CPUParticles2D::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "emitting", PROPERTY_HINT_ONESHOT), "set_emitting", "is_emitting");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "amount", PROPERTY_HINT_RANGE, "1,1000000,1,exp"), "set_amount", "get_amount"); // FIXME: Evaluate support for `exp` in integer properties, or remove this.
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_GROUP("Time", "");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "lifetime", PROPERTY_HINT_RANGE, "0.01,600.0,0.01,or_greater,exp,suffix:s"), "set_lifetime", "get_lifetime");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "one_shot"), "set_one_shot", "get_one_shot");
@@ -1643,55 +1604,55 @@ void CPUParticles2D::_bind_methods() {
 	ADD_GROUP("Angular Velocity", "angular_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_min", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ANGULAR_VELOCITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_max", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ANGULAR_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANGULAR_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANGULAR_VELOCITY);
 	ADD_GROUP("Orbit Velocity", "orbit_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_min", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ORBIT_VELOCITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_max", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ORBIT_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ORBIT_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ORBIT_VELOCITY);
 	ADD_GROUP("Linear Accel", "linear_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_LINEAR_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_LINEAR_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_LINEAR_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_LINEAR_ACCEL);
 	ADD_GROUP("Radial Accel", "radial_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_RADIAL_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_RADIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_RADIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_RADIAL_ACCEL);
 	ADD_GROUP("Tangential Accel", "tangential_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_TANGENTIAL_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_TANGENTIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_TANGENTIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_TANGENTIAL_ACCEL);
 	ADD_GROUP("Damping", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_min", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_min", "get_param_min", PARAM_DAMPING);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_max", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_max", "get_param_max", PARAM_DAMPING);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_DAMPING);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_DAMPING);
 	ADD_GROUP("Angle", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_min", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_min", "get_param_min", PARAM_ANGLE);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_max", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_max", "get_param_max", PARAM_ANGLE);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANGLE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANGLE);
 	ADD_GROUP("Scale", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_amount_min", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_min", "get_param_min", PARAM_SCALE);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_amount_max", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_max", "get_param_max", PARAM_SCALE);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_amount_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_SCALE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_amount_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_SCALE);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "split_scale"), "set_split_scale", "get_split_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_x", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_scale_curve_x", "get_scale_curve_x");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_y", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_scale_curve_y", "get_scale_curve_y");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_x", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_scale_curve_x", "get_scale_curve_x");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_y", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_scale_curve_y", "get_scale_curve_y");
 
 	ADD_GROUP("Color", "");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_ramp", "get_color_ramp");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_initial_ramp", "get_color_initial_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_ramp", "get_color_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_initial_ramp", "get_color_initial_ramp");
 
 	ADD_GROUP("Hue Variation", "hue_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_min", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_min", "get_param_min", PARAM_HUE_VARIATION);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_max", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_max", "get_param_max", PARAM_HUE_VARIATION);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_HUE_VARIATION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_HUE_VARIATION);
 	ADD_GROUP("Animation", "anim_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_min", PROPERTY_HINT_RANGE, "0,128,0.01,or_greater,or_less"), "set_param_min", "get_param_min", PARAM_ANIM_SPEED);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_max", PROPERTY_HINT_RANGE, "0,128,0.01,or_greater,or_less"), "set_param_max", "get_param_max", PARAM_ANIM_SPEED);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANIM_SPEED);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANIM_SPEED);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_min", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_min", "get_param_min", PARAM_ANIM_OFFSET);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_max", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_max", "get_param_max", PARAM_ANIM_OFFSET);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANIM_OFFSET);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANIM_OFFSET);
 
 	BIND_ENUM_CONSTANT(PARAM_INITIAL_LINEAR_VELOCITY);
 	BIND_ENUM_CONSTANT(PARAM_ANGULAR_VELOCITY);
diff --git a/engine/scene/2d/cpu_particles_2d.h b/engine/scene/2d/cpu_particles_2d.h
index 314f7156..dc838622 100644
--- a/engine/scene/2d/cpu_particles_2d.h
+++ b/engine/scene/2d/cpu_particles_2d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
 
 class RandomNumberGenerator;
@@ -129,8 +128,7 @@ private:
 
 	double lifetime = 1.0;
 	double pre_process_time = 0.0;
-	real_t _request_process_time = 0.0;
-	real_t _request_process_time_residual = 0.0;
+	double _requested_process_time = 0.0;
 	real_t explosiveness_ratio = 0.0;
 	real_t randomness_ratio = 0.0;
 	double lifetime_randomness = 0.0;
@@ -219,7 +217,6 @@ protected:
 
 #ifndef DISABLE_DEPRECATED
 	void _restart_bind_compat_92089();
-	void _request_particles_process_bind_compat_109142(real_t p_time);
 	static void _bind_compatibility_methods();
 #endif
 
@@ -267,7 +264,7 @@ public:
 #endif
 	uint32_t get_seed() const;
 
-	void request_particles_process(real_t p_requested_process_time, real_t p_requested_process_time_residual = 0.);
+	void request_particles_process(real_t p_requested_process_time);
 
 	///////////////////
 
diff --git a/engine/scene/2d/gpu_particles_2d.compat.inc b/engine/scene/2d/gpu_particles_2d.compat.inc
index d06ae09e..5ff6442e 100644
--- a/engine/scene/2d/gpu_particles_2d.compat.inc
+++ b/engine/scene/2d/gpu_particles_2d.compat.inc
@@ -30,21 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gpu_particles_2d.h"
-
-#include "core/object/class_db.h"
-
 void GPUParticles2D::_restart_bind_compat_92089() {
 	restart(false);
 }
 
-void GPUParticles2D::_request_particles_process_bind_compat_109142(real_t p_time) {
-	request_particles_process(p_time, 0.);
-}
-
 void GPUParticles2D::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("restart"), &GPUParticles2D::_restart_bind_compat_92089);
-	ClassDB::bind_compatibility_method(D_METHOD("request_particles_process", "process_time"), &GPUParticles2D::_request_particles_process_bind_compat_109142);
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/scene/2d/gpu_particles_2d.cpp b/engine/scene/2d/gpu_particles_2d.cpp
index 7c908036..924cfd2a 100644
--- a/engine/scene/2d/gpu_particles_2d.cpp
+++ b/engine/scene/2d/gpu_particles_2d.cpp
@@ -31,17 +31,12 @@
 #include "gpu_particles_2d.h"
 #include "gpu_particles_2d.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/particle_process_material.h"
-#include "servers/rendering/rendering_server.h"
 
 void GPUParticles2D::set_emitting(bool p_emitting) {
 	// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
@@ -186,7 +181,7 @@ void GPUParticles2D::set_trail_enabled(bool p_enabled) {
 	queue_redraw();
 	update_configuration_warnings();
 
-	RS::get_singleton()->particles_set_transform_align(particles, p_enabled ? RSE::PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY : RSE::PARTICLES_TRANSFORM_ALIGN_DISABLED);
+	RS::get_singleton()->particles_set_transform_align(particles, p_enabled ? RS::PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY : RS::PARTICLES_TRANSFORM_ALIGN_DISABLED);
 }
 
 void GPUParticles2D::set_trail_lifetime(double p_seconds) {
@@ -312,7 +307,7 @@ double GPUParticles2D::get_speed_scale() const {
 
 void GPUParticles2D::set_draw_order(DrawOrder p_order) {
 	draw_order = p_order;
-	RS::get_singleton()->particles_set_draw_order(particles, RSE::ParticlesDrawOrder(p_order));
+	RS::get_singleton()->particles_set_draw_order(particles, RS::ParticlesDrawOrder(p_order));
 }
 
 GPUParticles2D::DrawOrder GPUParticles2D::get_draw_order() const {
@@ -371,15 +366,8 @@ uint32_t GPUParticles2D::get_seed() const {
 	return seed;
 }
 
-void GPUParticles2D::request_particles_process(real_t p_requested_process_time, real_t p_request_process_time_residual) {
-	RS::get_singleton()->particles_request_process_time(particles, p_requested_process_time, p_request_process_time_residual);
-	if (p_requested_process_time > 0.0) {
-		emitting = true;
-		RS::get_singleton()->particles_set_emitting(particles, true);
-	}
-	if (p_request_process_time_residual > 0.0) {
-		emitting = false;
-	}
+void GPUParticles2D::request_particles_process(real_t p_requested_process_time) {
+	RS::get_singleton()->particles_request_process_time(particles, p_requested_process_time);
 }
 
 PackedStringArray GPUParticles2D::get_configuration_warnings() const {
@@ -440,11 +428,10 @@ Ref<Texture2D> GPUParticles2D::get_texture() const {
 }
 
 void GPUParticles2D::_validate_property(PropertyInfo &p_property) const {
-	if (p_property.name == "seed") {
-		if (!use_fixed_seed) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (Engine::get_singleton()->is_editor_hint() && p_property.name == "emitting") {
+	if (p_property.name == "seed" && !use_fixed_seed) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "emitting") {
 		p_property.hint = one_shot ? PROPERTY_HINT_ONESHOT : PROPERTY_HINT_NONE;
 	}
 }
@@ -587,16 +574,16 @@ void GPUParticles2D::convert_from_particles(Node *p_particles) {
 	proc_mat->set_gravity(Vector3(gravity.x, gravity.y, 0));
 	proc_mat->set_lifetime_randomness(cpu_particles->get_lifetime_randomness());
 
-#define CONVERT_PARAM(m_param) \
+#define CONVERT_PARAM(m_param)                                                                                        \
 	proc_mat->set_param_min(ParticleProcessMaterial::m_param, cpu_particles->get_param_min(CPUParticles2D::m_param)); \
-	{ \
-		Ref<Curve> curve = cpu_particles->get_param_curve(CPUParticles2D::m_param); \
-		if (curve.is_valid()) { \
-			Ref<CurveTexture> tex = memnew(CurveTexture); \
-			tex->set_curve(curve); \
-			proc_mat->set_param_texture(ParticleProcessMaterial::m_param, tex); \
-		} \
-	} \
+	{                                                                                                                 \
+		Ref<Curve> curve = cpu_particles->get_param_curve(CPUParticles2D::m_param);                                   \
+		if (curve.is_valid()) {                                                                                       \
+			Ref<CurveTexture> tex = memnew(CurveTexture);                                                             \
+			tex->set_curve(curve);                                                                                    \
+			proc_mat->set_param_texture(ParticleProcessMaterial::m_param, tex);                                       \
+		}                                                                                                             \
+	}                                                                                                                 \
 	proc_mat->set_param_max(ParticleProcessMaterial::m_param, cpu_particles->get_param_max(CPUParticles2D::m_param));
 
 	CONVERT_PARAM(PARAM_INITIAL_LINEAR_VELOCITY);
@@ -681,14 +668,14 @@ void GPUParticles2D::_notification(int p_what) {
 				}
 
 				Array arr;
-				arr.resize(RSE::ARRAY_MAX);
-				arr[RSE::ARRAY_VERTEX] = points;
-				arr[RSE::ARRAY_TEX_UV] = uvs;
-				arr[RSE::ARRAY_BONES] = bone_indices;
-				arr[RSE::ARRAY_WEIGHTS] = bone_weights;
-				arr[RSE::ARRAY_INDEX] = indices;
+				arr.resize(RS::ARRAY_MAX);
+				arr[RS::ARRAY_VERTEX] = points;
+				arr[RS::ARRAY_TEX_UV] = uvs;
+				arr[RS::ARRAY_BONES] = bone_indices;
+				arr[RS::ARRAY_WEIGHTS] = bone_weights;
+				arr[RS::ARRAY_INDEX] = indices;
 
-				RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RSE::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+				RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RS::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 
 				Vector<Transform3D> xforms;
 				for (int i = 0; i <= trail_sections; i++) {
@@ -730,12 +717,12 @@ void GPUParticles2D::_notification(int p_what) {
 				Vector<int> indices = { 0, 1, 2, 0, 2, 3 };
 
 				Array arr;
-				arr.resize(RSE::ARRAY_MAX);
-				arr[RSE::ARRAY_VERTEX] = points;
-				arr[RSE::ARRAY_TEX_UV] = uvs;
-				arr[RSE::ARRAY_INDEX] = indices;
+				arr.resize(RS::ARRAY_MAX);
+				arr[RS::ARRAY_VERTEX] = points;
+				arr[RS::ARRAY_TEX_UV] = uvs;
+				arr[RS::ARRAY_INDEX] = indices;
 
-				RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RSE::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+				RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RS::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 				RS::get_singleton()->particles_set_trail_bind_poses(particles, Vector<Transform3D>());
 			}
 			RS::get_singleton()->canvas_item_add_particles(get_canvas_item(), particles, texture_rid);
@@ -891,7 +878,7 @@ void GPUParticles2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_collision_base_size", "size"), &GPUParticles2D::set_collision_base_size);
 	ClassDB::bind_method(D_METHOD("set_interp_to_end", "interp"), &GPUParticles2D::set_interp_to_end);
 
-	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time", "process_time_residual"), &GPUParticles2D::request_particles_process, DEFVAL(0));
+	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time"), &GPUParticles2D::request_particles_process);
 
 	ClassDB::bind_method(D_METHOD("is_emitting"), &GPUParticles2D::is_emitting);
 	ClassDB::bind_method(D_METHOD("get_amount"), &GPUParticles2D::get_amount);
@@ -955,7 +942,7 @@ void GPUParticles2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "amount", PROPERTY_HINT_RANGE, "1,1000000,1,exp"), "set_amount", "get_amount"); // FIXME: Evaluate support for `exp` in integer properties, or remove this.
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "amount_ratio", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_amount_ratio", "get_amount_ratio");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "sub_emitter", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "GPUParticles2D"), "set_sub_emitter", "get_sub_emitter");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_GROUP("Time", "");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "lifetime", PROPERTY_HINT_RANGE, "0.01,600.0,0.01,or_greater,exp,suffix:s"), "set_lifetime", "get_lifetime");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "interp_to_end", PROPERTY_HINT_RANGE, "0.00,1.0,0.001"), "set_interp_to_end", "get_interp_to_end");
@@ -997,7 +984,7 @@ void GPUParticles2D::_bind_methods() {
 
 GPUParticles2D::GPUParticles2D() {
 	particles = RS::get_singleton()->particles_create();
-	RS::get_singleton()->particles_set_mode(particles, RSE::PARTICLES_MODE_2D);
+	RS::get_singleton()->particles_set_mode(particles, RS::PARTICLES_MODE_2D);
 
 	mesh = RS::get_singleton()->mesh_create();
 	RS::get_singleton()->particles_set_draw_passes(particles, 1);
diff --git a/engine/scene/2d/gpu_particles_2d.h b/engine/scene/2d/gpu_particles_2d.h
index ae72de24..db3286a0 100644
--- a/engine/scene/2d/gpu_particles_2d.h
+++ b/engine/scene/2d/gpu_particles_2d.h
@@ -107,7 +107,6 @@ protected:
 
 #ifndef DISABLE_DEPRECATED
 	void _restart_bind_compat_92089();
-	void _request_particles_process_bind_compat_109142(real_t p_time);
 	static void _bind_compatibility_methods();
 #endif
 
@@ -129,7 +128,7 @@ public:
 	void set_trail_sections(int p_sections);
 	void set_trail_section_subdivisions(int p_subdivisions);
 	void set_interp_to_end(float p_interp);
-	void request_particles_process(real_t p_requested_process_time, real_t p_requested_process_time_residual);
+	void request_particles_process(real_t p_requested_process_time);
 
 #ifdef TOOLS_ENABLED
 	void set_show_gizmos(bool p_show_gizmos);
@@ -184,11 +183,11 @@ public:
 	uint32_t get_seed() const;
 
 	enum EmitFlags {
-		EMIT_FLAG_POSITION = RSE::PARTICLES_EMIT_FLAG_POSITION,
-		EMIT_FLAG_ROTATION_SCALE = RSE::PARTICLES_EMIT_FLAG_ROTATION_SCALE,
-		EMIT_FLAG_VELOCITY = RSE::PARTICLES_EMIT_FLAG_VELOCITY,
-		EMIT_FLAG_COLOR = RSE::PARTICLES_EMIT_FLAG_COLOR,
-		EMIT_FLAG_CUSTOM = RSE::PARTICLES_EMIT_FLAG_CUSTOM
+		EMIT_FLAG_POSITION = RS::PARTICLES_EMIT_FLAG_POSITION,
+		EMIT_FLAG_ROTATION_SCALE = RS::PARTICLES_EMIT_FLAG_ROTATION_SCALE,
+		EMIT_FLAG_VELOCITY = RS::PARTICLES_EMIT_FLAG_VELOCITY,
+		EMIT_FLAG_COLOR = RS::PARTICLES_EMIT_FLAG_COLOR,
+		EMIT_FLAG_CUSTOM = RS::PARTICLES_EMIT_FLAG_CUSTOM
 	};
 
 	void emit_particle(const Transform2D &p_transform, const Vector2 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags);
diff --git a/engine/scene/2d/light_2d.cpp b/engine/scene/2d/light_2d.cpp
index 156bced6..2fa9a792 100644
--- a/engine/scene/2d/light_2d.cpp
+++ b/engine/scene/2d/light_2d.cpp
@@ -30,11 +30,6 @@
 
 #include "light_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
-
 void Light2D::owner_changed_notify() {
 	// For cases where owner changes _after_ entering tree (as example, editor editing).
 	_update_light_visibility();
@@ -175,7 +170,7 @@ bool Light2D::is_shadow_enabled() const {
 void Light2D::set_shadow_filter(ShadowFilter p_filter) {
 	ERR_FAIL_INDEX(p_filter, SHADOW_FILTER_MAX);
 	shadow_filter = p_filter;
-	RS::get_singleton()->canvas_light_set_shadow_filter(canvas_light, RSE::CanvasLightShadowFilter(p_filter));
+	RS::get_singleton()->canvas_light_set_shadow_filter(canvas_light, RS::CanvasLightShadowFilter(p_filter));
 	notify_property_list_changed();
 }
 
@@ -194,7 +189,7 @@ Color Light2D::get_shadow_color() const {
 
 void Light2D::set_blend_mode(BlendMode p_mode) {
 	blend_mode = p_mode;
-	RS::get_singleton()->canvas_light_set_blend_mode(_get_light(), RSE::CanvasLightBlendMode(p_mode));
+	RS::get_singleton()->canvas_light_set_blend_mode(_get_light(), RS::CanvasLightBlendMode(p_mode));
 }
 
 Light2D::BlendMode Light2D::get_blend_mode() const {
@@ -311,10 +306,10 @@ void Light2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "energy", PROPERTY_HINT_RANGE, "0,16,0.01,or_greater"), "set_energy", "get_energy");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "blend_mode", PROPERTY_HINT_ENUM, "Add,Subtract,Mix"), "set_blend_mode", "get_blend_mode");
 	ADD_GROUP("Range", "range_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_min", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_ITEM_Z_MIN) + "," + itos(RSE::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_min", "get_z_range_min");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_max", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_ITEM_Z_MIN) + "," + itos(RSE::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_max", "get_z_range_max");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_min", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_LAYER_MIN) + "," + itos(RSE::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_min", "get_layer_range_min");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_max", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_LAYER_MIN) + "," + itos(RSE::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_max", "get_layer_range_max");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_min", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_min", "get_z_range_min");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_max", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_max", "get_z_range_max");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_min", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_min", "get_layer_range_min");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_max", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_max", "get_layer_range_max");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "range_item_cull_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_item_cull_mask", "get_item_cull_mask");
 
 	ADD_GROUP("Shadow", "shadow_");
@@ -486,7 +481,7 @@ void PointLight2D::_bind_methods() {
 }
 
 PointLight2D::PointLight2D() {
-	RS::get_singleton()->canvas_light_set_mode(_get_light(), RSE::CANVAS_LIGHT_MODE_POINT);
+	RS::get_singleton()->canvas_light_set_mode(_get_light(), RS::CANVAS_LIGHT_MODE_POINT);
 	set_hide_clip_children(true);
 }
 
@@ -510,7 +505,7 @@ void DirectionalLight2D::_bind_methods() {
 }
 
 DirectionalLight2D::DirectionalLight2D() {
-	RS::get_singleton()->canvas_light_set_mode(_get_light(), RSE::CANVAS_LIGHT_MODE_DIRECTIONAL);
+	RS::get_singleton()->canvas_light_set_mode(_get_light(), RS::CANVAS_LIGHT_MODE_DIRECTIONAL);
 	set_max_distance(max_distance); // Update RenderingServer.
 	set_hide_clip_children(true);
 }
diff --git a/engine/scene/2d/light_occluder_2d.cpp b/engine/scene/2d/light_occluder_2d.cpp
index a629ccc6..7d24b38b 100644
--- a/engine/scene/2d/light_occluder_2d.cpp
+++ b/engine/scene/2d/light_occluder_2d.cpp
@@ -32,9 +32,6 @@
 
 #include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
 
 #define LINE_GRAB_WIDTH 8
 
@@ -117,7 +114,7 @@ bool OccluderPolygon2D::is_closed() const {
 
 void OccluderPolygon2D::set_cull_mode(CullMode p_mode) {
 	cull = p_mode;
-	RS::get_singleton()->canvas_occluder_polygon_set_cull_mode(occ_polygon, RSE::CanvasOccluderPolygonCullMode(p_mode));
+	RS::get_singleton()->canvas_occluder_polygon_set_cull_mode(occ_polygon, RS::CanvasOccluderPolygonCullMode(p_mode));
 }
 
 OccluderPolygon2D::CullMode OccluderPolygon2D::get_cull_mode() const {
@@ -298,7 +295,7 @@ void LightOccluder2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_as_sdf_collision", "enable"), &LightOccluder2D::set_as_sdf_collision);
 	ClassDB::bind_method(D_METHOD("is_set_as_sdf_collision"), &LightOccluder2D::is_set_as_sdf_collision);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "occluder", PROPERTY_HINT_RESOURCE_TYPE, OccluderPolygon2D::get_class_static()), "set_occluder_polygon", "get_occluder_polygon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "occluder", PROPERTY_HINT_RESOURCE_TYPE, "OccluderPolygon2D"), "set_occluder_polygon", "get_occluder_polygon");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sdf_collision"), "set_as_sdf_collision", "is_set_as_sdf_collision");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "occluder_light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_occluder_light_mask", "get_occluder_light_mask");
 }
diff --git a/engine/scene/2d/line_2d.cpp b/engine/scene/2d/line_2d.cpp
index 3215e248..917a3b61 100644
--- a/engine/scene/2d/line_2d.cpp
+++ b/engine/scene/2d/line_2d.cpp
@@ -31,10 +31,7 @@
 #include "line_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/2d/line_builder.h"
-#include "servers/rendering/rendering_server.h"
+#include "line_builder.h"
 
 Line2D::Line2D() {
 }
@@ -296,7 +293,7 @@ void Line2D::_draw() {
 
 	RID texture_rid;
 	if (_texture.is_valid()) {
-		texture_rid = _texture->get_scaled_rid();
+		texture_rid = _texture->get_rid();
 
 		lb.tile_aspect = _texture->get_size().aspect();
 	}
@@ -397,11 +394,11 @@ void Line2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR2_ARRAY, "points"), "set_points", "get_points");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "closed"), "set_closed", "is_closed");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "width", PROPERTY_HINT_NONE, "suffix:px"), "set_width", "get_width");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "width_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "width_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve", "get_curve");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "default_color"), "set_default_color", "get_default_color");
 	ADD_GROUP("Fill", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_gradient", "get_gradient");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_gradient", "get_gradient");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_mode", PROPERTY_HINT_ENUM, "None,Tile,Stretch"), "set_texture_mode", "get_texture_mode");
 	ADD_GROUP("Capping", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "joint_mode", PROPERTY_HINT_ENUM, "Sharp,Bevel,Round"), "set_joint_mode", "get_joint_mode");
diff --git a/engine/scene/2d/line_2d.h b/engine/scene/2d/line_2d.h
index 4555b0c2..0c73f58d 100644
--- a/engine/scene/2d/line_2d.h
+++ b/engine/scene/2d/line_2d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
 
 class Line2D : public Node2D {
diff --git a/engine/scene/2d/line_builder.h b/engine/scene/2d/line_builder.h
index 41afe245..5ff86e69 100644
--- a/engine/scene/2d/line_builder.h
+++ b/engine/scene/2d/line_builder.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/2d/line_2d.h"
+#include "line_2d.h"
 
 class LineBuilder {
 public:
diff --git a/engine/scene/2d/marker_2d.cpp b/engine/scene/2d/marker_2d.cpp
index 57939e79..1f4ea172 100644
--- a/engine/scene/2d/marker_2d.cpp
+++ b/engine/scene/2d/marker_2d.cpp
@@ -30,9 +30,6 @@
 
 #include "marker_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 void Marker2D::_draw_cross() {
 	const real_t extents = get_gizmo_extents();
 
diff --git a/engine/scene/2d/mesh_instance_2d.cpp b/engine/scene/2d/mesh_instance_2d.cpp
index 33c0ee18..82767ca1 100644
--- a/engine/scene/2d/mesh_instance_2d.cpp
+++ b/engine/scene/2d/mesh_instance_2d.cpp
@@ -30,15 +30,13 @@
 
 #include "mesh_instance_2d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
-#include <thirdparty/clipper2/include/clipper2/clipper.h>
+#include "thirdparty/clipper2/include/clipper2/clipper.h"
+#include "thirdparty/misc/polypartition.h"
 #endif // NAVIGATION_2D_DISABLED
 
 Callable MeshInstance2D::_navmesh_source_geometry_parsing_callback;
@@ -63,8 +61,8 @@ void MeshInstance2D::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("texture_changed"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 }
 
 void MeshInstance2D::set_mesh(const Ref<Mesh> &p_mesh) {
@@ -86,7 +84,6 @@ void MeshInstance2D::set_mesh(const Ref<Mesh> &p_mesh) {
 	}
 
 	queue_redraw();
-	update_configuration_warnings();
 }
 
 Ref<Mesh> MeshInstance2D::get_mesh() const {
@@ -218,10 +215,5 @@ void MeshInstance2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon>
 }
 #endif // NAVIGATION_2D_DISABLED
 
-PackedStringArray MeshInstance2D::get_configuration_warnings() const {
-	PackedStringArray warnings = Node2D::get_configuration_warnings();
-	if (mesh.is_null()) {
-		warnings.push_back(RTR("MeshInstance2D requires a Mesh to render anything. Please add a mesh resource for it!"));
-	}
-	return warnings;
+MeshInstance2D::MeshInstance2D() {
 }
diff --git a/engine/scene/2d/mesh_instance_2d.h b/engine/scene/2d/mesh_instance_2d.h
index 733f8c3b..2f72dca9 100644
--- a/engine/scene/2d/mesh_instance_2d.h
+++ b/engine/scene/2d/mesh_instance_2d.h
@@ -69,5 +69,5 @@ public:
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
 #endif // NAVIGATION_2D_DISABLED
 
-	virtual PackedStringArray get_configuration_warnings() const override;
+	MeshInstance2D();
 };
diff --git a/engine/scene/2d/multimesh_instance_2d.cpp b/engine/scene/2d/multimesh_instance_2d.cpp
index 2d826bc3..6714e204 100644
--- a/engine/scene/2d/multimesh_instance_2d.cpp
+++ b/engine/scene/2d/multimesh_instance_2d.cpp
@@ -30,15 +30,13 @@
 
 #include "multimesh_instance_2d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
-#include <thirdparty/clipper2/include/clipper2/clipper.h>
+#include "thirdparty/clipper2/include/clipper2/clipper.h"
+#include "thirdparty/misc/polypartition.h"
 #endif // NAVIGATION_2D_DISABLED
 
 Callable MultiMeshInstance2D::_navmesh_source_geometry_parsing_callback;
@@ -79,8 +77,8 @@ void MultiMeshInstance2D::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("texture_changed"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, MultiMesh::get_class_static()), "set_multimesh", "get_multimesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), "set_multimesh", "get_multimesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 }
 
 void MultiMeshInstance2D::set_multimesh(const Ref<MultiMesh> &p_multimesh) {
diff --git a/engine/scene/2d/navigation/navigation_agent_2d.cpp b/engine/scene/2d/navigation/navigation_agent_2d.cpp
index 2fbb7cac..32f1d373 100644
--- a/engine/scene/2d/navigation/navigation_agent_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_agent_2d.cpp
@@ -31,13 +31,9 @@
 #include "navigation_agent_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/navigation/navigation_link_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 void NavigationAgent2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationAgent2D::get_rid);
@@ -1101,7 +1097,7 @@ void NavigationAgent2D::_update_debug_path() {
 	}
 
 	RenderingServer::get_singleton()->canvas_item_set_parent(debug_path_instance, agent_parent->get_canvas());
-	RenderingServer::get_singleton()->canvas_item_set_z_index(debug_path_instance, RSE::CANVAS_ITEM_Z_MAX - 1);
+	RenderingServer::get_singleton()->canvas_item_set_z_index(debug_path_instance, RS::CANVAS_ITEM_Z_MAX - 1);
 	RenderingServer::get_singleton()->canvas_item_set_visible(debug_path_instance, agent_parent->is_visible_in_tree());
 
 	const Vector<Vector2> &navigation_path = navigation_result->get_path();
diff --git a/engine/scene/2d/navigation/navigation_link_2d.cpp b/engine/scene/2d/navigation/navigation_link_2d.cpp
index 60844377..afe4dd1b 100644
--- a/engine/scene/2d/navigation/navigation_link_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_link_2d.cpp
@@ -30,9 +30,7 @@
 
 #include "navigation_link_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
diff --git a/engine/scene/2d/navigation/navigation_obstacle_2d.cpp b/engine/scene/2d/navigation/navigation_obstacle_2d.cpp
index f20e5e7e..e58ed9df 100644
--- a/engine/scene/2d/navigation/navigation_obstacle_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_obstacle_2d.cpp
@@ -30,16 +30,11 @@
 
 #include "navigation_obstacle_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 Callable NavigationObstacle2D::_navmesh_source_geometry_parsing_callback;
 RID NavigationObstacle2D::_navmesh_source_geometry_parser;
@@ -510,7 +505,7 @@ void NavigationObstacle2D::_update_static_obstacle_debug() {
 	edge_mesh_array[Mesh::ARRAY_VERTEX] = edge_vertex_array;
 	edge_mesh_array[Mesh::ARRAY_COLOR] = line_color_array;
 
-	rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_LINES, edge_mesh_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+	rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_LINES, edge_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 
 	rs->canvas_item_add_mesh(debug_canvas_item, debug_mesh_rid, get_global_transform());
 }
diff --git a/engine/scene/2d/navigation/navigation_region_2d.cpp b/engine/scene/2d/navigation/navigation_region_2d.cpp
index 91a1ddea..f0b0803a 100644
--- a/engine/scene/2d/navigation/navigation_region_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_region_2d.cpp
@@ -30,14 +30,9 @@
 
 #include "navigation_region_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/random_pcg.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 RID NavigationRegion2D::get_rid() const {
 	return region;
@@ -349,7 +344,7 @@ void NavigationRegion2D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_bounds"), &NavigationRegion2D::get_bounds);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navigation_polygon", PROPERTY_HINT_RESOURCE_TYPE, NavigationPolygon::get_class_static()), "set_navigation_polygon", "get_navigation_polygon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navigation_polygon", PROPERTY_HINT_RESOURCE_TYPE, "NavigationPolygon"), "set_navigation_polygon", "get_navigation_polygon");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_edge_connections"), "set_use_edge_connections", "get_use_edge_connections");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "navigation_layers", PROPERTY_HINT_LAYERS_2D_NAVIGATION), "set_navigation_layers", "get_navigation_layers");
@@ -470,7 +465,7 @@ void NavigationRegion2D::_update_debug_mesh() {
 	const Transform2D region_gt = get_global_transform();
 
 	rs->canvas_item_set_parent(debug_instance_rid, get_world_2d()->get_canvas());
-	rs->canvas_item_set_z_index(debug_instance_rid, RSE::CANVAS_ITEM_Z_MAX - 2);
+	rs->canvas_item_set_z_index(debug_instance_rid, RS::CANVAS_ITEM_Z_MAX - 2);
 	rs->canvas_item_set_transform(debug_instance_rid, region_gt);
 
 	if (!debug_mesh_dirty) {
@@ -588,7 +583,7 @@ void NavigationRegion2D::_update_debug_mesh() {
 	face_mesh_array[Mesh::ARRAY_VERTEX] = face_vertex_array;
 	face_mesh_array[Mesh::ARRAY_COLOR] = face_color_array;
 
-	rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_TRIANGLES, face_mesh_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+	rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_TRIANGLES, face_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 
 	if (enabled_edge_lines) {
 		Vector<Color> line_color_array;
@@ -600,7 +595,7 @@ void NavigationRegion2D::_update_debug_mesh() {
 		line_mesh_array[Mesh::ARRAY_VERTEX] = line_vertex_array;
 		line_mesh_array[Mesh::ARRAY_COLOR] = line_color_array;
 
-		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_LINES, line_mesh_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_LINES, line_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 	}
 
 	rs->canvas_item_add_mesh(debug_instance_rid, debug_mesh_rid, Transform2D());
diff --git a/engine/scene/2d/navigation/navigation_region_2d.h b/engine/scene/2d/navigation/navigation_region_2d.h
index 74a02781..01126715 100644
--- a/engine/scene/2d/navigation/navigation_region_2d.h
+++ b/engine/scene/2d/navigation/navigation_region_2d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "scene/2d/node_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 
 class NavigationRegion2D : public Node2D {
diff --git a/engine/scene/2d/node_2d.cpp b/engine/scene/2d/node_2d.cpp
index 6f32cb6e..d07982fa 100644
--- a/engine/scene/2d/node_2d.cpp
+++ b/engine/scene/2d/node_2d.cpp
@@ -30,11 +30,7 @@
 
 #include "node_2d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
 Dictionary Node2D::_edit_get_state() const {
@@ -437,7 +433,7 @@ void Node2D::_notification(int p_notification) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
diff --git a/engine/scene/2d/parallax_2d.cpp b/engine/scene/2d/parallax_2d.cpp
index 35e05e2f..f07a89df 100644
--- a/engine/scene/2d/parallax_2d.cpp
+++ b/engine/scene/2d/parallax_2d.cpp
@@ -30,10 +30,7 @@
 
 #include "parallax_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
-#include "servers/rendering/rendering_server.h"
 
 void Parallax2D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/2d/parallax_background.cpp b/engine/scene/2d/parallax_background.cpp
index 6848fd6f..777a5251 100644
--- a/engine/scene/2d/parallax_background.cpp
+++ b/engine/scene/2d/parallax_background.cpp
@@ -30,8 +30,7 @@
 
 #include "parallax_background.h"
 
-#include "core/object/class_db.h"
-#include "scene/2d/parallax_layer.h"
+#include "parallax_layer.h"
 
 void ParallaxBackground::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/2d/parallax_layer.cpp b/engine/scene/2d/parallax_layer.cpp
index 0b52b1c9..b0379608 100644
--- a/engine/scene/2d/parallax_layer.cpp
+++ b/engine/scene/2d/parallax_layer.cpp
@@ -30,10 +30,7 @@
 
 #include "parallax_layer.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-#include "scene/2d/parallax_background.h"
-#include "servers/rendering/rendering_server.h"
+#include "parallax_background.h"
 
 void ParallaxLayer::set_motion_scale(const Size2 &p_scale) {
 	motion_scale = p_scale;
diff --git a/engine/scene/2d/path_2d.cpp b/engine/scene/2d/path_2d.cpp
index 0c29f39f..e51be104 100644
--- a/engine/scene/2d/path_2d.cpp
+++ b/engine/scene/2d/path_2d.cpp
@@ -30,14 +30,13 @@
 
 #include "path_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/themes/editor_scale.h"
+#endif
 
 #ifdef DEBUG_ENABLED
 Rect2 Path2D::_edit_get_rect() const {
@@ -122,7 +121,7 @@ void Path2D::_debug_create() {
 	}
 
 	RS::get_singleton()->instance_set_base(debug_instance, debug_mesh_rid);
-	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(debug_instance, RSE::SHADOW_CASTING_SETTING_OFF);
+	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(debug_instance, RS::SHADOW_CASTING_SETTING_OFF);
 }
 
 void Path2D::_debug_free() {
@@ -209,7 +208,7 @@ void Path2D::_debug_update() {
 		ribbon_color.fill(debug_color);
 		ribbon_array[Mesh::ARRAY_COLOR] = ribbon_color;
 
-		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_LINE_STRIP, ribbon_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_LINE_STRIP, ribbon_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 	}
 
 	// Render path fish bones.
@@ -244,7 +243,7 @@ void Path2D::_debug_update() {
 		bones_color.fill(debug_color);
 		bone_array[Mesh::ARRAY_COLOR] = bones_color;
 
-		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RSE::PRIMITIVE_LINES, bone_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+		rs->mesh_add_surface_from_arrays(debug_mesh_rid, RS::PRIMITIVE_LINES, bone_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 	}
 
 	rs->canvas_item_clear(get_canvas_item());
@@ -291,7 +290,7 @@ void Path2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_curve", "curve"), &Path2D::set_curve);
 	ClassDB::bind_method(D_METHOD("get_curve"), &Path2D::get_curve);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, Curve2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_curve", "get_curve");
 }
 
 /////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/scene/2d/physics/animatable_body_2d.cpp b/engine/scene/2d/physics/animatable_body_2d.cpp
index ecbc5528..10e90e70 100644
--- a/engine/scene/2d/physics/animatable_body_2d.cpp
+++ b/engine/scene/2d/physics/animatable_body_2d.cpp
@@ -30,10 +30,6 @@
 
 #include "animatable_body_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 void AnimatableBody2D::set_sync_to_physics(bool p_enable) {
 	if (sync_to_physics == p_enable) {
 		return;
diff --git a/engine/scene/2d/physics/area_2d.cpp b/engine/scene/2d/physics/area_2d.cpp
index 9b514413..d0a2deb3 100644
--- a/engine/scene/2d/physics/area_2d.cpp
+++ b/engine/scene/2d/physics/area_2d.cpp
@@ -30,9 +30,6 @@
 
 #include "area_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void Area2D::set_gravity_space_override_mode(SpaceOverride p_mode) {
@@ -360,7 +357,7 @@ void Area2D::_clear_monitoring() {
 	ERR_FAIL_COND_MSG(locked, "This function can't be used during the in/out signal.");
 
 	{
-		HashMap<ObjectID, BodyState> bmcopy(body_map);
+		HashMap<ObjectID, BodyState> bmcopy = body_map;
 		body_map.clear();
 		//disconnect all monitored stuff
 
@@ -388,7 +385,7 @@ void Area2D::_clear_monitoring() {
 	}
 
 	{
-		HashMap<ObjectID, AreaState> bmcopy(area_map);
+		HashMap<ObjectID, AreaState> bmcopy = area_map;
 		area_map.clear();
 		//disconnect all monitored stuff
 
@@ -638,15 +635,15 @@ void Area2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_audio_bus_override", "enable"), &Area2D::set_audio_bus_override);
 	ClassDB::bind_method(D_METHOD("is_overriding_audio_bus"), &Area2D::is_overriding_audio_bus);
 
-	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node2D::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node2D::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node2D::get_class_static())));
-	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node2D::get_class_static())));
+	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node2D"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node2D"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node2D")));
+	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node2D")));
 
-	ADD_SIGNAL(MethodInfo("area_shape_entered", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area2D::get_class_static()), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("area_shape_exited", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area2D::get_class_static()), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("area_entered", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area2D::get_class_static())));
-	ADD_SIGNAL(MethodInfo("area_exited", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area2D::get_class_static())));
+	ADD_SIGNAL(MethodInfo("area_shape_entered", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area2D"), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("area_shape_exited", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area2D"), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("area_entered", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area2D")));
+	ADD_SIGNAL(MethodInfo("area_exited", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area2D")));
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitoring"), "set_monitoring", "is_monitoring");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitorable"), "set_monitorable", "is_monitorable");
diff --git a/engine/scene/2d/physics/character_body_2d.cpp b/engine/scene/2d/physics/character_body_2d.cpp
index 374676be..2138a1ae 100644
--- a/engine/scene/2d/physics/character_body_2d.cpp
+++ b/engine/scene/2d/physics/character_body_2d.cpp
@@ -30,9 +30,6 @@
 
 #include "character_body_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "servers/physics_2d/physics_server_2d_extension.h"
 #endif
diff --git a/engine/scene/2d/physics/collision_object_2d.cpp b/engine/scene/2d/physics/collision_object_2d.cpp
index 7f483367..e772c227 100644
--- a/engine/scene/2d/physics/collision_object_2d.cpp
+++ b/engine/scene/2d/physics/collision_object_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "collision_object_2d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/world_2d.h"
 
 void CollisionObject2D::_notification(int p_what) {
@@ -347,7 +346,7 @@ void CollisionObject2D::shape_owner_set_one_way_collision(uint32_t p_owner, bool
 	ShapeData &sd = shapes[p_owner];
 	sd.one_way_collision = p_enable;
 	for (int i = 0; i < sd.shapes.size(); i++) {
-		PhysicsServer2D::get_singleton()->body_set_shape_as_one_way_collision(rid, sd.shapes[i].index, sd.one_way_collision, sd.one_way_collision_margin, sd.one_way_collision_direction);
+		PhysicsServer2D::get_singleton()->body_set_shape_as_one_way_collision(rid, sd.shapes[i].index, sd.one_way_collision, sd.one_way_collision_margin);
 	}
 }
 
@@ -367,21 +366,7 @@ void CollisionObject2D::shape_owner_set_one_way_collision_margin(uint32_t p_owne
 	ShapeData &sd = shapes[p_owner];
 	sd.one_way_collision_margin = p_margin;
 	for (int i = 0; i < sd.shapes.size(); i++) {
-		PhysicsServer2D::get_singleton()->body_set_shape_as_one_way_collision(rid, sd.shapes[i].index, sd.one_way_collision, sd.one_way_collision_margin, sd.one_way_collision_direction);
-	}
-}
-
-void CollisionObject2D::shape_owner_set_one_way_collision_direction(uint32_t p_owner, const Vector2 &p_direction) {
-	if (area) {
-		return; //not for areas
-	}
-
-	ERR_FAIL_COND(!shapes.has(p_owner));
-
-	ShapeData &sd = shapes[p_owner];
-	sd.one_way_collision_direction = p_direction.normalized();
-	for (int i = 0; i < sd.shapes.size(); i++) {
-		PhysicsServer2D::get_singleton()->body_set_shape_as_one_way_collision(rid, sd.shapes[i].index, sd.one_way_collision, sd.one_way_collision_margin, sd.one_way_collision_direction);
+		PhysicsServer2D::get_singleton()->body_set_shape_as_one_way_collision(rid, sd.shapes[i].index, sd.one_way_collision, sd.one_way_collision_margin);
 	}
 }
 
@@ -391,12 +376,6 @@ real_t CollisionObject2D::get_shape_owner_one_way_collision_margin(uint32_t p_ow
 	return shapes[p_owner].one_way_collision_margin;
 }
 
-Vector2 CollisionObject2D::get_shape_owner_one_way_collision_direction(uint32_t p_owner) const {
-	ERR_FAIL_COND_V(!shapes.has(p_owner), Vector2());
-
-	return shapes[p_owner].one_way_collision_direction;
-}
-
 void CollisionObject2D::get_shape_owners(List<uint32_t> *r_owners) {
 	for (const KeyValue<uint32_t, ShapeData> &E : shapes) {
 		r_owners->push_back(E.key);
@@ -640,8 +619,6 @@ void CollisionObject2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_shape_owner_one_way_collision_enabled", "owner_id"), &CollisionObject2D::is_shape_owner_one_way_collision_enabled);
 	ClassDB::bind_method(D_METHOD("shape_owner_set_one_way_collision_margin", "owner_id", "margin"), &CollisionObject2D::shape_owner_set_one_way_collision_margin);
 	ClassDB::bind_method(D_METHOD("get_shape_owner_one_way_collision_margin", "owner_id"), &CollisionObject2D::get_shape_owner_one_way_collision_margin);
-	ClassDB::bind_method(D_METHOD("get_shape_owner_one_way_collision_direction", "owner_id"), &CollisionObject2D::get_shape_owner_one_way_collision_direction);
-	ClassDB::bind_method(D_METHOD("shape_owner_set_one_way_collision_direction", "owner_id", "p_direction"), &CollisionObject2D::shape_owner_set_one_way_collision_direction);
 	ClassDB::bind_method(D_METHOD("shape_owner_add_shape", "owner_id", "shape"), &CollisionObject2D::shape_owner_add_shape);
 	ClassDB::bind_method(D_METHOD("shape_owner_get_shape_count", "owner_id"), &CollisionObject2D::shape_owner_get_shape_count);
 	ClassDB::bind_method(D_METHOD("shape_owner_get_shape", "owner_id", "shape_id"), &CollisionObject2D::shape_owner_get_shape);
@@ -656,7 +633,7 @@ void CollisionObject2D::_bind_methods() {
 	GDVIRTUAL_BIND(_mouse_shape_enter, "shape_idx");
 	GDVIRTUAL_BIND(_mouse_shape_exit, "shape_idx");
 
-	ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "viewport", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::INT, "shape_idx")));
+	ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "viewport", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::INT, "shape_idx")));
 	ADD_SIGNAL(MethodInfo("mouse_entered"));
 	ADD_SIGNAL(MethodInfo("mouse_exited"));
 	ADD_SIGNAL(MethodInfo("mouse_shape_entered", PropertyInfo(Variant::INT, "shape_idx")));
diff --git a/engine/scene/2d/physics/collision_object_2d.h b/engine/scene/2d/physics/collision_object_2d.h
index b2dbbe90..3156d906 100644
--- a/engine/scene/2d/physics/collision_object_2d.h
+++ b/engine/scene/2d/physics/collision_object_2d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_map.h"
 #include "scene/2d/node_2d.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/2d/shape_2d.h"
@@ -75,7 +74,6 @@ private:
 		bool disabled = false;
 		bool one_way_collision = false;
 		real_t one_way_collision_margin = 0.0;
-		Vector2 one_way_collision_direction = Vector2(0.0, 1.0);
 	};
 
 	int total_subshapes = 0;
@@ -156,9 +154,6 @@ public:
 	void shape_owner_set_one_way_collision_margin(uint32_t p_owner, real_t p_margin);
 	real_t get_shape_owner_one_way_collision_margin(uint32_t p_owner) const;
 
-	void shape_owner_set_one_way_collision_direction(uint32_t p_owner, const Vector2 &p_direction);
-	Vector2 get_shape_owner_one_way_collision_direction(uint32_t p_owner) const;
-
 	void shape_owner_add_shape(uint32_t p_owner, RequiredParam<Shape2D> rp_shape);
 	int shape_owner_get_shape_count(uint32_t p_owner) const;
 	Ref<Shape2D> shape_owner_get_shape(uint32_t p_owner, int p_shape) const;
diff --git a/engine/scene/2d/physics/collision_polygon_2d.cpp b/engine/scene/2d/physics/collision_polygon_2d.cpp
index 61bcedad..c7468c5f 100644
--- a/engine/scene/2d/physics/collision_polygon_2d.cpp
+++ b/engine/scene/2d/physics/collision_polygon_2d.cpp
@@ -30,12 +30,9 @@
 
 #include "collision_polygon_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
 #include "scene/resources/2d/convex_polygon_shape_2d.h"
 
@@ -154,14 +151,14 @@ void CollisionPolygon2D::_notification(int p_what) {
 			if (one_way_collision) {
 				Color dcol = get_tree()->get_debug_collisions_color(); //0.9,0.2,0.2,0.4);
 				dcol.a = 1.0;
-				Vector2 line_to = 20.0 * one_way_collision_direction;
+				Vector2 line_to(0, 20);
 				draw_line(Vector2(), line_to, dcol, 3);
 				real_t tsize = 8;
 
 				Vector<Vector2> pts = {
-					line_to + tsize * one_way_collision_direction,
-					line_to + Math::SQRT12 * tsize * one_way_collision_direction.orthogonal(),
-					line_to - Math::SQRT12 * tsize * one_way_collision_direction.orthogonal(),
+					line_to + Vector2(0, tsize),
+					line_to + Vector2(Math::SQRT12 * tsize, 0),
+					line_to + Vector2(-Math::SQRT12 * tsize, 0)
 				};
 
 				Vector<Color> cols{ dcol, dcol, dcol };
@@ -295,22 +292,6 @@ real_t CollisionPolygon2D::get_one_way_collision_margin() const {
 	return one_way_collision_margin;
 }
 
-void CollisionPolygon2D::set_one_way_collision_direction(const Vector2 &p_direction) {
-	if (p_direction == one_way_collision_direction) {
-		return;
-	}
-
-	one_way_collision_direction = p_direction.normalized();
-	queue_redraw();
-	if (collision_object) {
-		collision_object->shape_owner_set_one_way_collision_direction(owner_id, p_direction);
-	}
-}
-
-Vector2 CollisionPolygon2D::get_one_way_collision_direction() const {
-	return one_way_collision_direction;
-}
-
 void CollisionPolygon2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_polygon", "polygon"), &CollisionPolygon2D::set_polygon);
 	ClassDB::bind_method(D_METHOD("get_polygon"), &CollisionPolygon2D::get_polygon);
@@ -323,8 +304,6 @@ void CollisionPolygon2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_one_way_collision_enabled"), &CollisionPolygon2D::is_one_way_collision_enabled);
 	ClassDB::bind_method(D_METHOD("set_one_way_collision_margin", "margin"), &CollisionPolygon2D::set_one_way_collision_margin);
 	ClassDB::bind_method(D_METHOD("get_one_way_collision_margin"), &CollisionPolygon2D::get_one_way_collision_margin);
-	ClassDB::bind_method(D_METHOD("set_one_way_collision_direction", "direction"), &CollisionPolygon2D::set_one_way_collision_direction);
-	ClassDB::bind_method(D_METHOD("get_one_way_collision_direction"), &CollisionPolygon2D::get_one_way_collision_direction);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "build_mode", PROPERTY_HINT_ENUM, "Solids,Segments"), "set_build_mode", "get_build_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR2_ARRAY, "polygon"), "set_polygon", "get_polygon");
@@ -333,7 +312,6 @@ void CollisionPolygon2D::_bind_methods() {
 	ADD_GROUP("One Way Collision", "one_way_collision");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "one_way_collision", PROPERTY_HINT_GROUP_ENABLE), "set_one_way_collision", "is_one_way_collision_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "one_way_collision_margin", PROPERTY_HINT_RANGE, "0,128,0.1,suffix:px"), "set_one_way_collision_margin", "get_one_way_collision_margin");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "one_way_collision_direction"), "set_one_way_collision_direction", "get_one_way_collision_direction");
 
 	BIND_ENUM_CONSTANT(BUILD_SOLIDS);
 	BIND_ENUM_CONSTANT(BUILD_SEGMENTS);
diff --git a/engine/scene/2d/physics/collision_polygon_2d.h b/engine/scene/2d/physics/collision_polygon_2d.h
index 702c858a..ad628203 100644
--- a/engine/scene/2d/physics/collision_polygon_2d.h
+++ b/engine/scene/2d/physics/collision_polygon_2d.h
@@ -52,7 +52,6 @@ protected:
 	bool disabled = false;
 	bool one_way_collision = false;
 	real_t one_way_collision_margin = 1.0;
-	Vector2 one_way_collision_direction = Vector2(0.0, 1.0);
 
 	Vector<Vector<Vector2>> _decompose_in_convex();
 
@@ -88,9 +87,6 @@ public:
 	void set_one_way_collision_margin(real_t p_margin);
 	real_t get_one_way_collision_margin() const;
 
-	void set_one_way_collision_direction(const Vector2 &p_direction);
-	Vector2 get_one_way_collision_direction() const;
-
 	CollisionPolygon2D();
 };
 
diff --git a/engine/scene/2d/physics/collision_shape_2d.cpp b/engine/scene/2d/physics/collision_shape_2d.cpp
index 13f7958a..47ea5bbf 100644
--- a/engine/scene/2d/physics/collision_shape_2d.cpp
+++ b/engine/scene/2d/physics/collision_shape_2d.cpp
@@ -30,12 +30,8 @@
 
 #include "collision_shape_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
 #include "scene/resources/2d/convex_polygon_shape_2d.h"
 
@@ -51,7 +47,6 @@ void CollisionShape2D::_update_in_shape_owner(bool p_xform_only) {
 	collision_object->shape_owner_set_disabled(owner_id, disabled);
 	collision_object->shape_owner_set_one_way_collision(owner_id, one_way_collision);
 	collision_object->shape_owner_set_one_way_collision_margin(owner_id, one_way_collision_margin);
-	collision_object->shape_owner_set_one_way_collision_direction(owner_id, one_way_collision_direction);
 }
 
 void CollisionShape2D::_notification(int p_what) {
@@ -119,15 +114,14 @@ void CollisionShape2D::_notification(int p_what) {
 				if (disabled) {
 					draw_col = draw_col.darkened(0.25);
 				}
-
-				Vector2 line_to = 20.0 * one_way_collision_direction;
+				Vector2 line_to(0, 20);
 				draw_line(Vector2(), line_to, draw_col, 2);
 				real_t tsize = 8;
 
 				Vector<Vector2> pts{
-					line_to + tsize * one_way_collision_direction,
-					line_to + Math::SQRT12 * tsize * one_way_collision_direction.orthogonal(),
-					line_to - Math::SQRT12 * tsize * one_way_collision_direction.orthogonal(),
+					line_to + Vector2(0, tsize),
+					line_to + Vector2(Math::SQRT12 * tsize, 0),
+					line_to + Vector2(-Math::SQRT12 * tsize, 0)
 				};
 
 				Vector<Color> cols{ draw_col, draw_col, draw_col };
@@ -233,22 +227,6 @@ real_t CollisionShape2D::get_one_way_collision_margin() const {
 	return one_way_collision_margin;
 }
 
-void CollisionShape2D::set_one_way_collision_direction(const Vector2 &p_direction) {
-	if (p_direction == one_way_collision_direction) {
-		return;
-	}
-
-	one_way_collision_direction = p_direction.normalized();
-	if (collision_object) {
-		collision_object->shape_owner_set_one_way_collision_direction(owner_id, p_direction.normalized());
-	}
-	queue_redraw();
-}
-
-Vector2 CollisionShape2D::get_one_way_collision_direction() const {
-	return one_way_collision_direction;
-}
-
 Color CollisionShape2D::_get_default_debug_color() const {
 	const SceneTree *st = SceneTree::get_singleton();
 	return st ? st->get_debug_collisions_color() : Color(0.0, 0.0, 0.0, 0.0);
@@ -305,15 +283,12 @@ void CollisionShape2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_one_way_collision_enabled"), &CollisionShape2D::is_one_way_collision_enabled);
 	ClassDB::bind_method(D_METHOD("set_one_way_collision_margin", "margin"), &CollisionShape2D::set_one_way_collision_margin);
 	ClassDB::bind_method(D_METHOD("get_one_way_collision_margin"), &CollisionShape2D::get_one_way_collision_margin);
-	ClassDB::bind_method(D_METHOD("set_one_way_collision_direction", "p_direction"), &CollisionShape2D::set_one_way_collision_direction);
-	ClassDB::bind_method(D_METHOD("get_one_way_collision_direction"), &CollisionShape2D::get_one_way_collision_direction);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape2D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
 	ADD_GROUP("One Way Collision", "one_way_collision");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "one_way_collision", PROPERTY_HINT_GROUP_ENABLE), "set_one_way_collision", "is_one_way_collision_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "one_way_collision_margin", PROPERTY_HINT_RANGE, "0,128,0.1,suffix:px"), "set_one_way_collision_margin", "get_one_way_collision_margin");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "one_way_collision_direction", PROPERTY_HINT_NONE, "suffix:px"), "set_one_way_collision_direction", "get_one_way_collision_direction");
 
 	ClassDB::bind_method(D_METHOD("set_debug_color", "color"), &CollisionShape2D::set_debug_color);
 	ClassDB::bind_method(D_METHOD("get_debug_color"), &CollisionShape2D::get_debug_color);
diff --git a/engine/scene/2d/physics/collision_shape_2d.h b/engine/scene/2d/physics/collision_shape_2d.h
index 38e2838e..5de56c80 100644
--- a/engine/scene/2d/physics/collision_shape_2d.h
+++ b/engine/scene/2d/physics/collision_shape_2d.h
@@ -44,7 +44,6 @@ class CollisionShape2D : public Node2D {
 	bool disabled = false;
 	bool one_way_collision = false;
 	real_t one_way_collision_margin = 1.0;
-	Vector2 one_way_collision_direction = Vector2(0.0, 1.0);
 
 	void _shape_changed();
 	void _update_in_shape_owner(bool p_xform_only = false);
@@ -84,9 +83,6 @@ public:
 	void set_one_way_collision_margin(real_t p_margin);
 	real_t get_one_way_collision_margin() const;
 
-	void set_one_way_collision_direction(const Vector2 &p_direction);
-	Vector2 get_one_way_collision_direction() const;
-
 	void set_debug_color(const Color &p_color);
 	Color get_debug_color() const;
 
diff --git a/engine/scene/2d/physics/joints/damped_spring_joint_2d.cpp b/engine/scene/2d/physics/joints/damped_spring_joint_2d.cpp
index 9af1ff85..4b210ec0 100644
--- a/engine/scene/2d/physics/joints/damped_spring_joint_2d.cpp
+++ b/engine/scene/2d/physics/joints/damped_spring_joint_2d.cpp
@@ -30,10 +30,7 @@
 
 #include "damped_spring_joint_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
-#include "scene/main/scene_tree.h"
 
 void DampedSpringJoint2D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/2d/physics/joints/groove_joint_2d.cpp b/engine/scene/2d/physics/joints/groove_joint_2d.cpp
index f2e7a06f..415a49d8 100644
--- a/engine/scene/2d/physics/joints/groove_joint_2d.cpp
+++ b/engine/scene/2d/physics/joints/groove_joint_2d.cpp
@@ -30,10 +30,7 @@
 
 #include "groove_joint_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
-#include "scene/main/scene_tree.h"
 
 void GrooveJoint2D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/2d/physics/joints/joint_2d.cpp b/engine/scene/2d/physics/joints/joint_2d.cpp
index 46eaedde..382a3cc7 100644
--- a/engine/scene/2d/physics/joints/joint_2d.cpp
+++ b/engine/scene/2d/physics/joints/joint_2d.cpp
@@ -30,9 +30,6 @@
 
 #include "joint_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 void Joint2D::_disconnect_signals() {
diff --git a/engine/scene/2d/physics/joints/pin_joint_2d.cpp b/engine/scene/2d/physics/joints/pin_joint_2d.cpp
index 400a9da2..b28a77ee 100644
--- a/engine/scene/2d/physics/joints/pin_joint_2d.cpp
+++ b/engine/scene/2d/physics/joints/pin_joint_2d.cpp
@@ -30,10 +30,7 @@
 
 #include "pin_joint_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
-#include "scene/main/scene_tree.h"
 
 void PinJoint2D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/2d/physics/kinematic_collision_2d.cpp b/engine/scene/2d/physics/kinematic_collision_2d.cpp
index b1e98b5a..28e8f392 100644
--- a/engine/scene/2d/physics/kinematic_collision_2d.cpp
+++ b/engine/scene/2d/physics/kinematic_collision_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "kinematic_collision_2d.h"
 
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 Vector2 KinematicCollision2D::get_position() const {
diff --git a/engine/scene/2d/physics/physical_bone_2d.cpp b/engine/scene/2d/physics/physical_bone_2d.cpp
index 5102937d..19274c80 100644
--- a/engine/scene/2d/physics/physical_bone_2d.cpp
+++ b/engine/scene/2d/physics/physical_bone_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "physical_bone_2d.h"
 
-#include "core/object/class_db.h"
 #include "scene/2d/physics/joints/joint_2d.h"
 
 void PhysicalBone2D::_notification(int p_what) {
diff --git a/engine/scene/2d/physics/physics_body_2d.cpp b/engine/scene/2d/physics/physics_body_2d.cpp
index 4cec467f..f8313360 100644
--- a/engine/scene/2d/physics/physics_body_2d.cpp
+++ b/engine/scene/2d/physics/physics_body_2d.cpp
@@ -30,9 +30,6 @@
 
 #include "physics_body_2d.h"
 
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-
 void PhysicsBody2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("move_and_collide", "motion", "test_only", "safe_margin", "recovery_as_collision"), &PhysicsBody2D::_move, DEFVAL(false), DEFVAL(0.08), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("test_move", "from", "motion", "collision", "safe_margin", "recovery_as_collision"), &PhysicsBody2D::test_move, DEFVAL(Variant()), DEFVAL(0.08), DEFVAL(false));
diff --git a/engine/scene/2d/physics/physics_body_2d.h b/engine/scene/2d/physics/physics_body_2d.h
index e3e4bfa5..5272170b 100644
--- a/engine/scene/2d/physics/physics_body_2d.h
+++ b/engine/scene/2d/physics/physics_body_2d.h
@@ -32,6 +32,7 @@
 
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/2d/physics/kinematic_collision_2d.h"
+#include "scene/resources/physics_material.h"
 #include "servers/physics_2d/physics_server_2d.h"
 
 class PhysicsBody2D : public CollisionObject2D {
diff --git a/engine/scene/2d/physics/ray_cast_2d.cpp b/engine/scene/2d/physics/ray_cast_2d.cpp
index abfd3147..af5268d9 100644
--- a/engine/scene/2d/physics/ray_cast_2d.cpp
+++ b/engine/scene/2d/physics/ray_cast_2d.cpp
@@ -30,10 +30,7 @@
 
 #include "ray_cast_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 
 void RayCast2D::set_target_position(const Vector2 &p_point) {
diff --git a/engine/scene/2d/physics/rigid_body_2d.cpp b/engine/scene/2d/physics/rigid_body_2d.cpp
index 86fb8a34..4648df6e 100644
--- a/engine/scene/2d/physics/rigid_body_2d.cpp
+++ b/engine/scene/2d/physics/rigid_body_2d.cpp
@@ -30,11 +30,6 @@
 
 #include "rigid_body_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/resources/physics_material.h"
-
 void RigidBody2D::_body_enter_tree(ObjectID p_id) {
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = Object::cast_to<Node>(obj);
@@ -148,10 +143,9 @@ struct _RigidBody2DInOut {
 };
 
 void RigidBody2D::_sync_body_state(PhysicsDirectBodyState2D *p_state) {
-	Transform2D new_transform = p_state->get_transform();
-	if (likely(new_transform != get_global_transform())) {
+	if (!freeze || freeze_mode != FREEZE_MODE_KINEMATIC) {
 		set_block_transform_notify(true);
-		set_global_transform(new_transform);
+		set_global_transform(p_state->get_transform());
 		set_block_transform_notify(false);
 	}
 
@@ -746,7 +740,7 @@ void RigidBody2D::_bind_methods() {
 	GDVIRTUAL_BIND(_integrate_forces, "state");
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "mass", PROPERTY_HINT_RANGE, "0.001,1000,0.001,or_greater,exp,suffix:kg"), "set_mass", "get_mass");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), "set_physics_material_override", "get_physics_material_override");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material_override", "get_physics_material_override");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "gravity_scale", PROPERTY_HINT_RANGE, "-8,8,0.001,or_less,or_greater"), "set_gravity_scale", "get_gravity_scale");
 	ADD_GROUP("Mass Distribution", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "center_of_mass_mode", PROPERTY_HINT_ENUM, "Auto,Custom"), "set_center_of_mass_mode", "get_center_of_mass_mode");
@@ -775,10 +769,10 @@ void RigidBody2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "constant_force", PROPERTY_HINT_NONE, U"suffix:kg\u22C5px/s\u00B2"), "set_constant_force", "get_constant_force");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "constant_torque", PROPERTY_HINT_NONE, U"suffix:kg\u22C5px\u00B2/s\u00B2/rad"), "set_constant_torque", "get_constant_torque");
 
-	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 	ADD_SIGNAL(MethodInfo("sleeping_state_changed"));
 
 	BIND_ENUM_CONSTANT(FREEZE_MODE_STATIC);
@@ -801,7 +795,9 @@ void RigidBody2D::_validate_property(PropertyInfo &p_property) const {
 	}
 	if (center_of_mass_mode != CENTER_OF_MASS_MODE_CUSTOM && p_property.name == "center_of_mass") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-	} else if (!contact_monitor && p_property.name == "max_contacts_reported") {
+	}
+
+	if (!contact_monitor && p_property.name == "max_contacts_reported") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
diff --git a/engine/scene/2d/physics/rigid_body_2d.h b/engine/scene/2d/physics/rigid_body_2d.h
index f3b0708d..4655818e 100644
--- a/engine/scene/2d/physics/rigid_body_2d.h
+++ b/engine/scene/2d/physics/rigid_body_2d.h
@@ -33,8 +33,6 @@
 #include "core/templates/vset.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
-class PhysicsMaterial;
-
 class RigidBody2D : public PhysicsBody2D {
 	GDCLASS(RigidBody2D, PhysicsBody2D);
 
diff --git a/engine/scene/2d/physics/shape_cast_2d.cpp b/engine/scene/2d/physics/shape_cast_2d.cpp
index 2d1dba73..042d79b7 100644
--- a/engine/scene/2d/physics/shape_cast_2d.cpp
+++ b/engine/scene/2d/physics/shape_cast_2d.cpp
@@ -31,10 +31,7 @@
 #include "shape_cast_2d.h"
 
 #include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/physics_2d/physics_server_2d.h"
 
@@ -469,7 +466,7 @@ void ShapeCast2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_collision_result"), &ShapeCast2D::get_collision_result);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape2D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "exclude_parent"), "set_exclude_parent_body", "get_exclude_parent_body");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "target_position", PROPERTY_HINT_NONE, "suffix:px"), "set_target_position", "get_target_position");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "margin", PROPERTY_HINT_RANGE, "0,100,0.01,suffix:px"), "set_margin", "get_margin");
diff --git a/engine/scene/2d/physics/static_body_2d.cpp b/engine/scene/2d/physics/static_body_2d.cpp
index 1972c982..07c64cb5 100644
--- a/engine/scene/2d/physics/static_body_2d.cpp
+++ b/engine/scene/2d/physics/static_body_2d.cpp
@@ -30,10 +30,6 @@
 
 #include "static_body_2d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/resources/physics_material.h"
-
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/capsule_shape_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"
@@ -231,7 +227,7 @@ void StaticBody2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_physics_material_override", "physics_material_override"), &StaticBody2D::set_physics_material_override);
 	ClassDB::bind_method(D_METHOD("get_physics_material_override"), &StaticBody2D::get_physics_material_override);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), "set_physics_material_override", "get_physics_material_override");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material_override", "get_physics_material_override");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "constant_linear_velocity", PROPERTY_HINT_NONE, "suffix:px/s"), "set_constant_linear_velocity", "get_constant_linear_velocity");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "constant_angular_velocity", PROPERTY_HINT_NONE, U"radians_as_degrees,suffix:\u00B0/s"), "set_constant_angular_velocity", "get_constant_angular_velocity");
 }
diff --git a/engine/scene/2d/physics/static_body_2d.h b/engine/scene/2d/physics/static_body_2d.h
index 19729fc1..a0891b91 100644
--- a/engine/scene/2d/physics/static_body_2d.h
+++ b/engine/scene/2d/physics/static_body_2d.h
@@ -32,12 +32,8 @@
 
 #include "scene/2d/physics/physics_body_2d.h"
 
-class PhysicsMaterial;
-
-#ifndef NAVIGATION_2D_DISABLED
 class NavigationPolygon;
 class NavigationMeshSourceGeometryData2D;
-#endif
 
 class StaticBody2D : public PhysicsBody2D {
 	GDCLASS(StaticBody2D, PhysicsBody2D);
diff --git a/engine/scene/2d/physics/touch_screen_button.cpp b/engine/scene/2d/physics/touch_screen_button.cpp
index 36939106..a76a3a3f 100644
--- a/engine/scene/2d/physics/touch_screen_button.cpp
+++ b/engine/scene/2d/physics/touch_screen_button.cpp
@@ -30,14 +30,7 @@
 
 #include "touch_screen_button.h"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
 
 void TouchScreenButton::set_texture_normal(const Ref<Texture2D> &p_texture) {
 	if (texture_normal == p_texture) {
@@ -132,12 +125,12 @@ void TouchScreenButton::_notification(int p_what) {
 
 			Rect2 dst_rect(Point2(), texture_normal.is_valid() ? texture_normal->get_size() : Size2());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &TouchScreenButton::_accessibility_action_click));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &TouchScreenButton::_accessibility_action_click));
 
-			AccessibilityServer::get_singleton()->update_set_transform(ae, get_transform());
-			AccessibilityServer::get_singleton()->update_set_bounds(ae, dst_rect);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -438,10 +431,10 @@ void TouchScreenButton::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("is_pressed"), &TouchScreenButton::is_pressed);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_normal", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_normal", "get_texture_normal");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_pressed", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_pressed", "get_texture_pressed");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "bitmask", PROPERTY_HINT_RESOURCE_TYPE, BitMap::get_class_static()), "set_bitmask", "get_bitmask");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape2D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_normal", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_normal", "get_texture_normal");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_pressed", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_pressed", "get_texture_pressed");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "bitmask", PROPERTY_HINT_RESOURCE_TYPE, "BitMap"), "set_bitmask", "get_bitmask");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_centered"), "set_shape_centered", "is_shape_centered");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_visible"), "set_shape_visible", "is_shape_visible");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "passby_press"), "set_passby_press", "is_passby_press_enabled");
diff --git a/engine/scene/2d/polygon_2d.cpp b/engine/scene/2d/polygon_2d.cpp
index 279f554d..1dae6984 100644
--- a/engine/scene/2d/polygon_2d.cpp
+++ b/engine/scene/2d/polygon_2d.cpp
@@ -30,12 +30,8 @@
 
 #include "polygon_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/2d/skeleton_2d.h"
-#include "servers/rendering/rendering_server.h"
+#include "skeleton_2d.h"
 
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
@@ -358,39 +354,27 @@ void Polygon2D::_notification(int p_what) {
 				}
 			}
 
-			bool has_uv = uvs.size() == points.size();
-			bool has_color = colors.size() == points.size();
-			bool has_bones = skeleton_node != nullptr;
-
-			bool needs_clear = len != last_len;
-			needs_clear |= index_array.size() != last_index_count;
-			needs_clear |= has_uv != last_has_uv;
-			needs_clear |= has_color != last_has_color;
-			needs_clear |= has_bones || has_bones != last_has_bones;
-
-			if (needs_clear) {
-				RS::get_singleton()->mesh_clear(mesh);
-			}
+			RS::get_singleton()->mesh_clear(mesh);
 
 			if (index_array.size()) {
 				Array arr;
-				arr.resize(RSE::ARRAY_MAX);
-				arr[RSE::ARRAY_VERTEX] = points;
+				arr.resize(RS::ARRAY_MAX);
+				arr[RS::ARRAY_VERTEX] = points;
 				if (uvs.size() == points.size()) {
-					arr[RSE::ARRAY_TEX_UV] = uvs;
+					arr[RS::ARRAY_TEX_UV] = uvs;
 				}
 				if (colors.size() == points.size()) {
-					arr[RSE::ARRAY_COLOR] = colors;
+					arr[RS::ARRAY_COLOR] = colors;
 				}
 
 				if (bones.size() == points.size() * 4) {
-					arr[RSE::ARRAY_BONES] = bones;
-					arr[RSE::ARRAY_WEIGHTS] = weights;
+					arr[RS::ARRAY_BONES] = bones;
+					arr[RS::ARRAY_WEIGHTS] = weights;
 				}
 
-				arr[RSE::ARRAY_INDEX] = index_array;
+				arr[RS::ARRAY_INDEX] = index_array;
 
-				RenderingServerTypes::SurfaceData sd;
+				RS::SurfaceData sd;
 
 				if (skeleton_node) {
 					// Compute transform between mesh and skeleton for runtime AABB compute.
@@ -408,29 +392,15 @@ void Polygon2D::_notification(int p_what) {
 					sd.mesh_to_skeleton_xform.origin.y = mesh_to_sk2d.get_origin().y;
 				}
 
-				Error err = RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RSE::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+				Error err = RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RS::PRIMITIVE_TRIANGLES, arr, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 				if (err != OK) {
 					return;
 				}
 
-				if (needs_clear) {
-					RS::get_singleton()->mesh_add_surface(mesh, sd);
-				} else {
-					RS::get_singleton()->mesh_surface_update_vertex_region(mesh, 0, 0, sd.vertex_data);
-					if (has_uv || has_color) {
-						RS::get_singleton()->mesh_surface_update_attribute_region(mesh, 0, 0, sd.attribute_data);
-					}
-					RS::get_singleton()->mesh_surface_update_index_region(mesh, 0, 0, sd.index_data);
-				}
+				RS::get_singleton()->mesh_add_surface(mesh, sd);
+				RS::get_singleton()->canvas_item_add_mesh(get_canvas_item(), mesh, Transform2D(), Color(1, 1, 1), texture.is_valid() ? texture->get_scaled_rid() : RID());
 			}
 
-			last_len = len;
-			last_index_count = index_array.size();
-			last_has_uv = has_uv;
-			last_has_color = has_color;
-			last_has_bones = has_bones;
-
-			RS::get_singleton()->canvas_item_add_mesh(get_canvas_item(), mesh, Transform2D(), Color(1, 1, 1), texture.is_valid() ? texture->get_scaled_rid() : RID());
 		} break;
 	}
 }
@@ -731,7 +701,7 @@ void Polygon2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "antialiased"), "set_antialiased", "get_antialiased");
 
 	ADD_GROUP("Texture", "texture_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "texture_offset", PROPERTY_HINT_NONE, "suffix:px"), "set_texture_offset", "get_texture_offset");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "texture_scale", PROPERTY_HINT_LINK), "set_texture_scale", "get_texture_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "texture_rotation", PROPERTY_HINT_RANGE, "-360,360,0.1,or_less,or_greater,radians_as_degrees"), "set_texture_rotation", "get_texture_rotation");
diff --git a/engine/scene/2d/polygon_2d.h b/engine/scene/2d/polygon_2d.h
index 8250f59b..57c65966 100644
--- a/engine/scene/2d/polygon_2d.h
+++ b/engine/scene/2d/polygon_2d.h
@@ -74,11 +74,6 @@ class Polygon2D : public Node2D {
 	void _skeleton_bone_setup_changed();
 
 	RID mesh;
-	int last_len = 0;
-	int last_index_count = 0;
-	bool last_has_uv = false;
-	bool last_has_color = false;
-	bool last_has_bones = false;
 
 protected:
 	void _notification(int p_what);
diff --git a/engine/scene/2d/remote_transform_2d.cpp b/engine/scene/2d/remote_transform_2d.cpp
index 31de1bf7..a24dd553 100644
--- a/engine/scene/2d/remote_transform_2d.cpp
+++ b/engine/scene/2d/remote_transform_2d.cpp
@@ -30,8 +30,6 @@
 
 #include "remote_transform_2d.h"
 
-#include "core/object/class_db.h"
-
 void RemoteTransform2D::_update_cache() {
 	cache = ObjectID();
 	if (has_node(remote_node)) {
diff --git a/engine/scene/2d/skeleton_2d.cpp b/engine/scene/2d/skeleton_2d.cpp
index 57bf6193..6647a68a 100644
--- a/engine/scene/2d/skeleton_2d.cpp
+++ b/engine/scene/2d/skeleton_2d.cpp
@@ -30,11 +30,7 @@
 
 #include "skeleton_2d.h"
 
-#include "core/config/engine.h"
 #include "core/math/transform_interpolator.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_data.h"
diff --git a/engine/scene/2d/sprite_2d.cpp b/engine/scene/2d/sprite_2d.cpp
index 9c703fe4..d17256ee 100644
--- a/engine/scene/2d/sprite_2d.cpp
+++ b/engine/scene/2d/sprite_2d.cpp
@@ -30,11 +30,8 @@
 
 #include "sprite_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/input/input.h"
 #include "scene/main/viewport.h"
-#include "servers/display/accessibility_server.h"
 
 #ifdef TOOLS_ENABLED
 Dictionary Sprite2D::_edit_get_state() const {
@@ -153,9 +150,9 @@ void Sprite2D::_notification(int p_what) {
 
 			Rect2 dst_rect = get_rect();
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_IMAGE);
-			AccessibilityServer::get_singleton()->update_set_transform(ae, get_transform());
-			AccessibilityServer::get_singleton()->update_set_bounds(ae, dst_rect);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -471,7 +468,9 @@ void Sprite2D::_validate_property(PropertyInfo &p_property) const {
 		p_property.hint = PROPERTY_HINT_RANGE;
 		p_property.hint_string = "0," + itos(vframes * hframes - 1) + ",1";
 		p_property.usage |= PROPERTY_USAGE_KEYING_INCREMENTS;
-	} else if (p_property.name == "frame_coords") {
+	}
+
+	if (p_property.name == "frame_coords") {
 		p_property.usage |= PROPERTY_USAGE_KEYING_INCREMENTS;
 	}
 }
@@ -534,7 +533,7 @@ void Sprite2D::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("frame_changed"));
 	ADD_SIGNAL(MethodInfo("texture_changed"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_GROUP("Offset", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "centered"), "set_centered", "is_centered");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset", PROPERTY_HINT_NONE, "suffix:px"), "set_offset", "get_offset");
diff --git a/engine/scene/2d/tile_map.compat.inc b/engine/scene/2d/tile_map.compat.inc
index 3fef663d..e0f99e70 100644
--- a/engine/scene/2d/tile_map.compat.inc
+++ b/engine/scene/2d/tile_map.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "tile_map.h"
-
-#include "core/object/class_db.h"
-
 Rect2i TileMap::_get_used_rect_bind_compat_78328() {
 	return get_used_rect();
 }
@@ -66,4 +62,4 @@ void TileMap::_bind_compatibility_methods() {
 #endif // NAVIGATION_2D_DISABLED
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/2d/tile_map.cpp b/engine/scene/2d/tile_map.cpp
index 54491ad0..f7b3eb1f 100644
--- a/engine/scene/2d/tile_map.cpp
+++ b/engine/scene/2d/tile_map.cpp
@@ -31,28 +31,24 @@
 #include "tile_map.h"
 #include "tile_map.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/io/marshalls.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
 
 #define TILEMAP_CALL_FOR_LAYER(layer, function, ...) \
-	if (layer < 0) { \
-		layer = layers.size() + layer; \
-	}; \
-	ERR_FAIL_INDEX(layer, (int)layers.size()); \
+	if (layer < 0) {                                 \
+		layer = layers.size() + layer;               \
+	};                                               \
+	ERR_FAIL_INDEX(layer, (int)layers.size());       \
 	layers[layer]->function(__VA_ARGS__);
 
 #define TILEMAP_CALL_FOR_LAYER_V(layer, err_value, function, ...) \
-	if (layer < 0) { \
-		layer = layers.size() + layer; \
-	}; \
-	ERR_FAIL_INDEX_V(layer, (int)layers.size(), err_value); \
+	if (layer < 0) {                                              \
+		layer = layers.size() + layer;                            \
+	};                                                            \
+	ERR_FAIL_INDEX_V(layer, (int)layers.size(), err_value);       \
 	return layers[layer]->function(__VA_ARGS__);
 
 #ifndef NAVIGATION_2D_DISABLED
@@ -151,7 +147,7 @@ Vector<int> TileMap::_get_tile_map_data_using_compatibility_format(int p_layer)
 	ERR_FAIL_INDEX_V(p_layer, (int)layers.size(), Vector<int>());
 
 	// Export tile data to raw format.
-	const HashMap<Vector2i, CellData> tile_map_layer_data(layers[p_layer]->get_tile_map_layer_data());
+	const HashMap<Vector2i, CellData> tile_map_layer_data = layers[p_layer]->get_tile_map_layer_data();
 	Vector<int> tile_data;
 	tile_data.resize(tile_map_layer_data.size() * 3);
 	int *w = tile_data.ptrw();
@@ -996,7 +992,7 @@ void TileMap::_bind_methods() {
 	GDVIRTUAL_BIND(_use_tile_data_runtime_update, "layer", "coords");
 	GDVIRTUAL_BIND(_tile_data_runtime_update, "layer", "coords", "tile_data");
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_set", PROPERTY_HINT_RESOURCE_TYPE, TileSet::get_class_static()), "set_tileset", "get_tileset");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_set", PROPERTY_HINT_RESOURCE_TYPE, "TileSet"), "set_tileset", "get_tileset");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "rendering_quadrant_size", PROPERTY_HINT_RANGE, "1,128,1"), "set_rendering_quadrant_size", "get_rendering_quadrant_size");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_animatable"), "set_collision_animatable", "is_collision_animatable");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_collision_visibility_mode", "get_collision_visibility_mode");
@@ -1041,7 +1037,7 @@ TileMap::TileMap() {
 		base_property_helper.register_property(PropertyInfo(Variant::BOOL, "navigation_enabled"), defaults->is_navigation_enabled(), &TileMap::set_layer_navigation_enabled, &TileMap::is_layer_navigation_enabled);
 #endif // NAVIGATION_2D_DISABLED
 		base_property_helper.register_property(PropertyInfo(Variant::PACKED_INT32_ARRAY, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), Vector<int>(), &TileMap::_set_layer_tile_data, &TileMap::_get_tile_map_data_using_compatibility_format);
-		PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+		PropertyListHelper::register_base_helper(&base_property_helper);
 
 		memdelete(defaults);
 	}
diff --git a/engine/scene/2d/tile_map_layer.cpp b/engine/scene/2d/tile_map_layer.cpp
index 86e8aa1a..ba6fcb17 100644
--- a/engine/scene/2d/tile_map_layer.cpp
+++ b/engine/scene/2d/tile_map_layer.cpp
@@ -30,20 +30,15 @@
 
 #include "tile_map_layer.h"
 
-#include "core/config/engine.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/random_pcg.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 #include "scene/2d/tile_map.h"
 #include "scene/gui/control.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/material.h"
 #include "scene/resources/world_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_2d/physics_server_2d.h"
@@ -169,7 +164,7 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
 			if (needs_set_not_interpolated) {
 				rs->canvas_item_set_interpolated(ci, false);
 			}
-			rs->canvas_item_set_z_index(ci, RSE::CANVAS_ITEM_Z_MAX - 1);
+			rs->canvas_item_set_z_index(ci, RS::CANVAS_ITEM_Z_MAX - 1);
 			rs->canvas_item_set_parent(ci, get_canvas_item());
 		}
 		const Vector2 quadrant_pos = tile_set->map_to_local(debug_quadrant->quadrant_coords * TILE_MAP_DEBUG_QUADRANT_SIZE);
@@ -362,8 +357,8 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
 						rs->canvas_item_set_z_index(ci, tile_z_index);
 						rs->canvas_item_set_self_modulate(ci, layer_modulate);
 
-						rs->canvas_item_set_default_texture_filter(ci, RSE::CanvasItemTextureFilter(get_texture_filter_in_tree()));
-						rs->canvas_item_set_default_texture_repeat(ci, RSE::CanvasItemTextureRepeat(get_texture_repeat_in_tree()));
+						rs->canvas_item_set_default_texture_filter(ci, RS::CanvasItemTextureFilter(get_texture_filter_in_tree()));
+						rs->canvas_item_set_default_texture_repeat(ci, RS::CanvasItemTextureRepeat(get_texture_repeat_in_tree()));
 
 						rendering_quadrant->canvas_items.push_back(ci);
 
@@ -449,8 +444,8 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
 				Ref<RenderingQuadrant> &rendering_quadrant = kv.value;
 				for (const RID &ci : rendering_quadrant->canvas_items) {
 					rs->canvas_item_set_light_mask(ci, get_light_mask());
-					rs->canvas_item_set_default_texture_filter(ci, RSE::CanvasItemTextureFilter(get_texture_filter_in_tree()));
-					rs->canvas_item_set_default_texture_repeat(ci, RSE::CanvasItemTextureRepeat(get_texture_repeat_in_tree()));
+					rs->canvas_item_set_default_texture_filter(ci, RS::CanvasItemTextureFilter(get_texture_filter_in_tree()));
+					rs->canvas_item_set_default_texture_repeat(ci, RS::CanvasItemTextureRepeat(get_texture_repeat_in_tree()));
 					rs->canvas_item_set_self_modulate(ci, layer_modulate);
 				}
 			}
@@ -1271,18 +1266,18 @@ void TileMapLayer::_physics_draw_quadrant_debug(const RID &p_canvas_item, DebugQ
 
 			if (face_index_array.size() > 2) {
 				Array face_mesh_array;
-				face_mesh_array.resize(RSE::ARRAY_MAX);
-				face_mesh_array[RSE::ARRAY_VERTEX] = Vector<Vector2>(face_vertex_array);
-				face_mesh_array[RSE::ARRAY_INDEX] = Vector<int32_t>(face_index_array);
-				face_mesh_array[RSE::ARRAY_COLOR] = Vector<Color>(face_color_array);
-				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RSE::PRIMITIVE_TRIANGLES, face_mesh_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+				face_mesh_array.resize(RS::ARRAY_MAX);
+				face_mesh_array[RS::ARRAY_VERTEX] = Vector<Vector2>(face_vertex_array);
+				face_mesh_array[RS::ARRAY_INDEX] = Vector<int32_t>(face_index_array);
+				face_mesh_array[RS::ARRAY_COLOR] = Vector<Color>(face_color_array);
+				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RS::PRIMITIVE_TRIANGLES, face_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 
 				Array line_mesh_array;
-				line_mesh_array.resize(RSE::ARRAY_MAX);
-				line_mesh_array[RSE::ARRAY_VERTEX] = Vector<Vector2>(line_vertex_array);
-				line_mesh_array[RSE::ARRAY_COLOR] = Vector<Color>(line_color_array);
+				line_mesh_array.resize(RS::ARRAY_MAX);
+				line_mesh_array[RS::ARRAY_VERTEX] = Vector<Vector2>(line_vertex_array);
+				line_mesh_array[RS::ARRAY_COLOR] = Vector<Color>(line_color_array);
 
-				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RSE::PRIMITIVE_LINES, line_mesh_array, Array(), Dictionary(), RSE::ARRAY_FLAG_USE_2D_VERTICES);
+				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RS::PRIMITIVE_LINES, line_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
 			}
 		}
 	}
@@ -2272,7 +2267,7 @@ void TileMapLayer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "tile_map_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_tile_map_data_from_array", "get_tile_map_data_as_array");
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_set", PROPERTY_HINT_RESOURCE_TYPE, TileSet::get_class_static()), "set_tile_set", "get_tile_set");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_set", PROPERTY_HINT_RESOURCE_TYPE, "TileSet"), "set_tile_set", "get_tile_set");
 	ADD_GROUP("Rendering", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "occlusion_enabled"), "set_occlusion_enabled", "is_occlusion_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "y_sort_origin"), "set_y_sort_origin", "get_y_sort_origin");
@@ -2313,7 +2308,7 @@ void TileMapLayer::_validate_property(PropertyInfo &p_property) const {
 	}
 }
 
-void TileMapLayer::_update_self_texture_filter(RSE::CanvasItemTextureFilter p_texture_filter) {
+void TileMapLayer::_update_self_texture_filter(RS::CanvasItemTextureFilter p_texture_filter) {
 	// Set a default texture filter for the whole tilemap.
 	CanvasItem::_update_self_texture_filter(p_texture_filter);
 	dirty.flags[DIRTY_FLAGS_LAYER_TEXTURE_FILTER] = true;
@@ -2321,7 +2316,7 @@ void TileMapLayer::_update_self_texture_filter(RSE::CanvasItemTextureFilter p_te
 	emit_signal(CoreStringName(changed));
 }
 
-void TileMapLayer::_update_self_texture_repeat(RSE::CanvasItemTextureRepeat p_texture_repeat) {
+void TileMapLayer::_update_self_texture_repeat(RS::CanvasItemTextureRepeat p_texture_repeat) {
 	// Set a default texture repeat for the whole tilemap.
 	CanvasItem::_update_self_texture_repeat(p_texture_repeat);
 	dirty.flags[DIRTY_FLAGS_LAYER_TEXTURE_REPEAT] = true;
@@ -2387,7 +2382,7 @@ HashMap<Vector2i, TileSet::TerrainsPattern> TileMapLayer::terrain_fill_constrain
 	}
 
 	// Copy the constraints set.
-	RBSet<TerrainConstraint> constraints(p_constraints);
+	RBSet<TerrainConstraint> constraints = p_constraints;
 
 	// Output map.
 	HashMap<Vector2i, TileSet::TerrainsPattern> output;
diff --git a/engine/scene/2d/tile_map_layer.h b/engine/scene/2d/tile_map_layer.h
index 375d1d0b..6c6954db 100644
--- a/engine/scene/2d/tile_map_layer.h
+++ b/engine/scene/2d/tile_map_layer.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/resources/2d/tile_set.h"
-#include "servers/rendering/rendering_server_enums.h"
 
 #ifndef NAVIGATION_2D_DISABLED
 class NavigationMeshSourceGeometryData2D;
@@ -518,8 +517,8 @@ protected:
 	static void _bind_methods();
 	void _validate_property(PropertyInfo &p_property) const;
 
-	virtual void _update_self_texture_filter(RSE::CanvasItemTextureFilter p_texture_filter) override;
-	virtual void _update_self_texture_repeat(RSE::CanvasItemTextureRepeat p_texture_repeat) override;
+	virtual void _update_self_texture_filter(RS::CanvasItemTextureFilter p_texture_filter) override;
+	virtual void _update_self_texture_repeat(RS::CanvasItemTextureRepeat p_texture_repeat) override;
 
 public:
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/2d/visible_on_screen_notifier_2d.cpp b/engine/scene/2d/visible_on_screen_notifier_2d.cpp
index 685bb14d..79f0ee56 100644
--- a/engine/scene/2d/visible_on_screen_notifier_2d.cpp
+++ b/engine/scene/2d/visible_on_screen_notifier_2d.cpp
@@ -30,11 +30,6 @@
 
 #include "visible_on_screen_notifier_2d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifdef TOOLS_ENABLED
 Dictionary VisibleOnScreenNotifier2D::_edit_get_state() const {
 	Dictionary state = Node2D::_edit_get_state();
diff --git a/engine/scene/3d/aim_modifier_3d.cpp b/engine/scene/3d/aim_modifier_3d.cpp
index 548a61b6..fc7dfe73 100644
--- a/engine/scene/3d/aim_modifier_3d.cpp
+++ b/engine/scene/3d/aim_modifier_3d.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "aim_modifier_3d.h"
-
-#include "core/object/class_db.h"
 #include "scene/3d/look_at_modifier_3d.h"
 
 bool AimModifier3D::_set(const StringName &p_path, const Variant &p_value) {
@@ -172,7 +170,7 @@ void AimModifier3D::set_relative(int p_index, bool p_enabled) {
 }
 
 bool AimModifier3D::is_relative(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), false);
+	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), 0);
 	AimModifier3DSetting *setting = static_cast<AimModifier3DSetting *>(settings[p_index]);
 	return setting->relative;
 }
diff --git a/engine/scene/3d/audio_listener_3d.cpp b/engine/scene/3d/audio_listener_3d.cpp
index ae109ab8..ad6f13c8 100644
--- a/engine/scene/3d/audio_listener_3d.cpp
+++ b/engine/scene/3d/audio_listener_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_listener_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 void AudioListener3D::_update_audio_listener_state() {
diff --git a/engine/scene/3d/audio_stream_player_3d.compat.inc b/engine/scene/3d/audio_stream_player_3d.compat.inc
index aa5dbdfb..11f82b51 100644
--- a/engine/scene/3d/audio_stream_player_3d.compat.inc
+++ b/engine/scene/3d/audio_stream_player_3d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "audio_stream_player_3d.h"
-
-#include "core/object/class_db.h"
-
 bool AudioStreamPlayer3D::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/engine/scene/3d/audio_stream_player_3d.cpp b/engine/scene/3d/audio_stream_player_3d.cpp
index 0fcbe80d..ea05c6bb 100644
--- a/engine/scene/3d/audio_stream_player_3d.cpp
+++ b/engine/scene/3d/audio_stream_player_3d.cpp
@@ -32,8 +32,6 @@
 #include "audio_stream_player_3d.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/audio_listener_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/velocity_tracker_3d.h"
@@ -107,7 +105,7 @@ static const Vector3 speaker_directions[7] = {
 	Vector3(1.0, 0.0, 0.0).normalized(), // side-right
 };
 
-void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tightness, FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &output) {
+void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tightness, Vector<AudioFrame> &output) {
 	unsigned int speaker_count = 0; // only main speakers (no LFE)
 	switch (AudioServer::get_singleton()->get_speaker_mode()) {
 		case AudioServer::SPEAKER_MODE_STEREO:
@@ -125,25 +123,25 @@ void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tig
 	}
 
 	Spcap spcap(speaker_count, speaker_directions); //TODO: should only be created/recreated once the speaker mode / speaker positions changes
-	real_t volumes[7] = {};
+	real_t volumes[7];
 	spcap.calculate(source_dir, tightness, speaker_count, volumes);
 
 	switch (AudioServer::get_singleton()->get_speaker_mode()) {
 		case AudioServer::SPEAKER_SURROUND_71:
-			output[3].left = volumes[5]; // side-left
-			output[3].right = volumes[6]; // side-right
+			output.write[3].left = volumes[5]; // side-left
+			output.write[3].right = volumes[6]; // side-right
 			[[fallthrough]];
 		case AudioServer::SPEAKER_SURROUND_51:
-			output[2].left = volumes[3]; // rear-left
-			output[2].right = volumes[4]; // rear-right
+			output.write[2].left = volumes[3]; // rear-left
+			output.write[2].right = volumes[4]; // rear-right
 			[[fallthrough]];
 		case AudioServer::SPEAKER_SURROUND_31:
-			output[1].right = 1.0; // LFE - always full power
-			output[1].left = volumes[2]; // center
+			output.write[1].right = 1.0; // LFE - always full power
+			output.write[1].left = volumes[2]; // center
 			[[fallthrough]];
 		case AudioServer::SPEAKER_MODE_STEREO:
-			output[0].right = volumes[1]; // front-right
-			output[0].left = volumes[0]; // front-left
+			output.write[0].right = volumes[1]; // front-right
+			output.write[0].left = volumes[0]; // front-left
 			break;
 	}
 }
@@ -161,11 +159,12 @@ AudioFrame AudioStreamPlayer3D::_calc_output_vol_stereo(const Vector3 &source_di
 }
 
 #ifndef PHYSICS_3D_DISABLED
-void AudioStreamPlayer3D::_calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, const FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &direct_path_vol, FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &reverb_vol) {
-	reverb_vol.resize_uninitialized(VOLUME_VECTOR_SIZE);
-	for (AudioFrame &frame : reverb_vol) {
-		frame = AudioFrame(0, 0);
-	}
+void AudioStreamPlayer3D::_calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, Vector<AudioFrame> direct_path_vol, Vector<AudioFrame> &reverb_vol) {
+	reverb_vol.resize(4);
+	reverb_vol.write[0] = AudioFrame(0, 0);
+	reverb_vol.write[1] = AudioFrame(0, 0);
+	reverb_vol.write[2] = AudioFrame(0, 0);
+	reverb_vol.write[3] = AudioFrame(0, 0);
 
 	float uniformity = area->get_reverb_uniformity();
 	float area_send = area->get_reverb_amount();
@@ -187,44 +186,44 @@ void AudioStreamPlayer3D::_calc_reverb_vol(Area3D *area, Vector3 listener_area_p
 
 			// Stereo pair.
 			float c = rev_pos.x * 0.5 + 0.5;
-			reverb_vol[0].left = 1.0 - c;
-			reverb_vol[0].right = c;
+			reverb_vol.write[0].left = 1.0 - c;
+			reverb_vol.write[0].right = c;
 
 			if (channel_count >= 3) {
 				// Center pair + Side pair
 				float xl = Vector3(-1, 0, -1).normalized().dot(rev_pos) * 0.5 + 0.5;
 				float xr = Vector3(1, 0, -1).normalized().dot(rev_pos) * 0.5 + 0.5;
 
-				reverb_vol[1].left = xl;
-				reverb_vol[1].right = xr;
-				reverb_vol[2].left = 1.0 - xr;
-				reverb_vol[2].right = 1.0 - xl;
+				reverb_vol.write[1].left = xl;
+				reverb_vol.write[1].right = xr;
+				reverb_vol.write[2].left = 1.0 - xr;
+				reverb_vol.write[2].right = 1.0 - xl;
 			}
 
 			if (channel_count >= 4) {
 				// Rear pair
 				// FIXME: Not sure what math should be done here
-				reverb_vol[3].left = 1.0 - c;
-				reverb_vol[3].right = c;
+				reverb_vol.write[3].left = 1.0 - c;
+				reverb_vol.write[3].right = c;
 			}
 
 			for (int i = 0; i < channel_count; i++) {
-				reverb_vol[i] = reverb_vol[i].lerp(center_frame, attenuation);
+				reverb_vol.write[i] = reverb_vol[i].lerp(center_frame, attenuation);
 			}
 		} else {
 			for (int i = 0; i < channel_count; i++) {
-				reverb_vol[i] = center_frame;
+				reverb_vol.write[i] = center_frame;
 			}
 		}
 
 		for (int i = 0; i < channel_count; i++) {
-			reverb_vol[i] = direct_path_vol[i].lerp(reverb_vol[i] * attenuation, uniformity);
-			reverb_vol[i] *= area_send;
+			reverb_vol.write[i] = direct_path_vol[i].lerp(reverb_vol[i] * attenuation, uniformity);
+			reverb_vol.write[i] *= area_send;
 		}
 
 	} else {
 		for (int i = 0; i < 4; i++) {
-			reverb_vol[i] = direct_path_vol[i] * area_send;
+			reverb_vol.write[i] = direct_path_vol[i] * area_send;
 		}
 	}
 }
@@ -355,30 +354,13 @@ StringName AudioStreamPlayer3D::_get_actual_bus() {
 	return internal->bus;
 }
 
-static void _apply_max_volume_from_vector(Vector<AudioFrame> &r_tgt_volume_vector, const FixedVector<AudioFrame, AudioServer::MAX_CHANNELS_PER_BUS> &p_src_volume_vector) {
-	// note: indexed loops with Vector are slow, so we use raw pointers on purpose here
-	AudioFrame *tgt_ptr = r_tgt_volume_vector.ptrw();
-	const AudioFrame *src_ptr = p_src_volume_vector.ptr();
-
-	for (int64_t i = 0; i < r_tgt_volume_vector.size(); i++) {
-		tgt_ptr[i].left = MAX(src_ptr[i].left, tgt_ptr[i].left);
-		tgt_ptr[i].right = MAX(src_ptr[i].right, tgt_ptr[i].right);
-	}
-}
-
-static float _get_max_volume(const FixedVector<AudioFrame, AudioServer::MAX_CHANNELS_PER_BUS> &p_src_volume_vector) {
-	float max_vol = 0.0;
-	for (const AudioFrame &frame : p_src_volume_vector) {
-		max_vol = MAX(max_vol, MAX(frame.left, frame.right));
-	}
-	return max_vol;
-}
-
 // Interacts with PhysicsServer3D, so can only be called during _physics_process.
 Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 	Vector<AudioFrame> output_volume_vector;
-	output_volume_vector.resize(VOLUME_VECTOR_SIZE);
-	output_volume_vector.fill(AudioFrame(0, 0));
+	output_volume_vector.resize(4);
+	for (AudioFrame &frame : output_volume_vector) {
+		frame = AudioFrame(0, 0);
+	}
 
 	if (!internal->active.is_set() || internal->stream.is_null()) {
 		return output_volume_vector;
@@ -396,28 +378,13 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 	Ref<World3D> world_3d = get_world_3d();
 	ERR_FAIL_COND_V(world_3d.is_null(), output_volume_vector);
 
-	HashSet<Camera3D *> cameras(world_3d->get_cameras());
+	HashSet<Camera3D *> cameras = world_3d->get_cameras();
 	cameras.insert(get_viewport()->get_camera_3d());
 
 #ifndef PHYSICS_3D_DISABLED
 	PhysicsDirectSpaceState3D *space_state = PhysicsServer3D::get_singleton()->space_get_direct_state(world_3d->get_space());
-	Area3D *area = _get_overriding_area();
 #endif // PHYSICS_3D_DISABLED
 
-	// set pitch to default value
-	// this will only change if the Doppler effect is activated
-	actual_pitch_scale = internal->pitch_scale;
-
-	Vector<AudioFrame> output_reverb_vector;
-	output_reverb_vector.resize(VOLUME_VECTOR_SIZE);
-	output_reverb_vector.fill(AudioFrame(0, 0));
-
-	// keep track of a weighted average of the pitch
-	float pitch_scale_sum = 0.0F;
-	float pitch_scale_weight = 0.0F;
-
-	bool has_any_listener_in_range = false;
-	linear_attenuation = 0;
 	for (Camera3D *camera : cameras) {
 		if (!camera) {
 			continue;
@@ -445,6 +412,7 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 		Vector3 area_sound_pos;
 		Vector3 listener_area_pos;
 
+		Area3D *area = _get_overriding_area();
 		if (area && area->is_using_reverb_bus() && area->get_reverb_uniformity() > 0) {
 			area_sound_pos = space_state->get_closest_point_to_object_volume(area->get_rid(), listener_node->get_global_transform().origin);
 			listener_area_pos = listener_node->get_global_transform().affine_inverse().xform(area_sound_pos);
@@ -460,10 +428,18 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 			}
 #endif // PHYSICS_3D_DISABLED
 			if (dist > total_max || total_max > max_distance) {
+				if (!was_further_than_max_distance_last_frame) {
+					HashMap<StringName, Vector<AudioFrame>> bus_volumes;
+					for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
+						// So the player gets muted and mostly stops mixing when out of range.
+						AudioServer::get_singleton()->set_playback_bus_volumes_linear(playback, bus_volumes);
+					}
+					was_further_than_max_distance_last_frame = true; // Cache so we don't set the volume over and over.
+				}
 				continue; //can't hear this sound in this listener
 			}
 		}
-		has_any_listener_in_range = true;
+		was_further_than_max_distance_last_frame = false;
 
 		float multiplier = Math::db_to_linear(_get_attenuation_db(dist));
 		if (max_distance > 0) {
@@ -481,37 +457,50 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 			}
 		}
 
-		linear_attenuation = MAX(linear_attenuation, Math::db_to_linear(db_att));
-
-		FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> listener_volume_vector;
-		listener_volume_vector.resize_uninitialized(VOLUME_VECTOR_SIZE);
-		for (AudioFrame &frame : listener_volume_vector) {
-			frame = AudioFrame(0, 0);
+		linear_attenuation = Math::db_to_linear(db_att);
+		for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
+			AudioServer::get_singleton()->set_playback_highshelf_params(playback, linear_attenuation, attenuation_filter_cutoff_hz);
 		}
 
 		if (AudioServer::get_singleton()->get_speaker_mode() == AudioServer::SPEAKER_MODE_STEREO) {
-			listener_volume_vector[0] = _calc_output_vol_stereo(local_pos, cached_global_panning_strength * panning_strength);
+			output_volume_vector.write[0] = _calc_output_vol_stereo(local_pos, cached_global_panning_strength * panning_strength);
+			output_volume_vector.write[1] = AudioFrame(0, 0);
+			output_volume_vector.write[2] = AudioFrame(0, 0);
+			output_volume_vector.write[3] = AudioFrame(0, 0);
 		} else {
 			// Bake in a constant factor here to allow the project setting defaults for 2d and 3d to be normalized to 1.0.
 			float tightness = cached_global_panning_strength * 2.0f;
 			tightness *= panning_strength;
-			_calc_output_vol(local_pos.normalized(), tightness, listener_volume_vector);
+			_calc_output_vol(local_pos.normalized(), tightness, output_volume_vector);
 		}
 
-		for (AudioFrame &frame : listener_volume_vector) {
-			frame *= multiplier;
+		for (unsigned int k = 0; k < 4; k++) {
+			output_volume_vector.write[k] = multiplier * output_volume_vector[k];
 		}
 
-		_apply_max_volume_from_vector(output_volume_vector, listener_volume_vector);
-
+		HashMap<StringName, Vector<AudioFrame>> bus_volumes;
 #ifndef PHYSICS_3D_DISABLED
+		if (area) {
+			if (area->is_overriding_audio_bus()) {
+				//override audio bus
+				bus_volumes[area->get_audio_bus_name()] = output_volume_vector;
+			}
 
-		if (area && area->is_using_reverb_bus()) {
-			FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> listener_reverb_vector;
-			_calc_reverb_vol(area, listener_area_pos, listener_volume_vector, listener_reverb_vector);
-			_apply_max_volume_from_vector(output_reverb_vector, listener_reverb_vector);
+			if (area->is_using_reverb_bus()) {
+				StringName reverb_bus_name = area->get_reverb_bus_name();
+				Vector<AudioFrame> reverb_vol;
+				_calc_reverb_vol(area, listener_area_pos, output_volume_vector, reverb_vol);
+				bus_volumes[reverb_bus_name] = reverb_vol;
+			}
+		} else
+#endif // PHYSICS_3D_DISABLED
+		{
+			bus_volumes[internal->bus] = output_volume_vector;
+		}
+
+		for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
+			AudioServer::get_singleton()->set_playback_bus_volumes_linear(playback, bus_volumes);
 		}
-#endif
 
 		if (doppler_tracking != DOPPLER_TRACKING_DISABLED) {
 			Vector3 listener_velocity;
@@ -522,63 +511,23 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 				listener_velocity = camera->get_doppler_tracked_velocity();
 			}
 
-			const Vector3 local_velocity = listener_node->get_global_transform().orthonormalized().basis.xform_inv(linear_velocity - listener_velocity);
+			Vector3 local_velocity = listener_node->get_global_transform().orthonormalized().basis.xform_inv(linear_velocity - listener_velocity);
+
 			if (local_velocity != Vector3()) {
-				const float approaching = local_pos.normalized().dot(local_velocity.normalized());
-				const float velocity = local_velocity.length();
-				static constexpr float speed_of_sound = 343.0F;
+				float approaching = local_pos.normalized().dot(local_velocity.normalized());
+				float velocity = local_velocity.length();
+				float speed_of_sound = 343.0;
 
 				float doppler_pitch_scale = internal->pitch_scale * speed_of_sound / (speed_of_sound + velocity * approaching);
+				doppler_pitch_scale = CLAMP(doppler_pitch_scale, (1 / 8.0), 8.0); //avoid crazy stuff
 
-				// limit the pitch scale, so we do not get execeedingly extreme pitch effects in edge cases
-				doppler_pitch_scale = CLAMP(doppler_pitch_scale, (1.0F / 8.0F), 8.0F);
-
-				// just use the maximum volume of the current volume vector as weight
-				// so the pitch effect fades out with lower volumes
-				float weight = _get_max_volume(listener_volume_vector);
-				pitch_scale_sum += weight * doppler_pitch_scale;
-				pitch_scale_weight += weight;
+				actual_pitch_scale = doppler_pitch_scale;
+			} else {
+				actual_pitch_scale = internal->pitch_scale;
 			}
+		} else {
+			actual_pitch_scale = internal->pitch_scale;
 		}
-	}
-
-	if (pitch_scale_weight > 0.0F) {
-		actual_pitch_scale = pitch_scale_sum / pitch_scale_weight;
-	}
-
-	for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
-		AudioServer::get_singleton()->set_playback_highshelf_params(playback, linear_attenuation, attenuation_filter_cutoff_hz);
-	}
-
-	bus_volumes.clear();
-	if (has_any_listener_in_range) {
-#ifndef PHYSICS_3D_DISABLED
-		if (area) {
-			if (area->is_overriding_audio_bus()) {
-				//override audio bus
-				bus_volumes[area->get_audio_bus_name()] = output_volume_vector;
-			}
-
-			if (area->is_using_reverb_bus()) {
-				StringName reverb_bus_name = area->get_reverb_bus_name();
-				bus_volumes[reverb_bus_name] = output_reverb_vector;
-			}
-		} else
-#endif // PHYSICS_3D_DISABLED
-		{
-			bus_volumes[internal->bus] = output_volume_vector;
-		}
-	}
-
-	// If no listeners are in range and this was the case last frame, then we can skip setting any audio.
-	const bool skip_setting_volumes = !has_any_listener_in_range && was_further_than_max_distance_last_frame;
-	was_further_than_max_distance_last_frame = !has_any_listener_in_range;
-
-	if (!skip_setting_volumes) {
-		for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
-			AudioServer::get_singleton()->set_playback_bus_volumes_linear(playback, bus_volumes);
-		}
-
 		for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
 			AudioServer::get_singleton()->set_playback_pitch_scale(playback, actual_pitch_scale);
 			if (playback->get_is_sample()) {
@@ -929,7 +878,7 @@ void AudioStreamPlayer3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_playback_type", "playback_type"), &AudioStreamPlayer3D::set_playback_type);
 	ClassDB::bind_method(D_METHOD("get_playback_type"), &AudioStreamPlayer3D::get_playback_type);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()), "set_stream", "get_stream");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "attenuation_model", PROPERTY_HINT_ENUM, "Inverse,Inverse Square,Logarithmic,Disabled"), "set_attenuation_model", "get_attenuation_model");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,80,suffix:dB"), "set_volume_db", "get_volume_db");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_linear", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_volume_linear", "get_volume_linear");
diff --git a/engine/scene/3d/audio_stream_player_3d.h b/engine/scene/3d/audio_stream_player_3d.h
index 9dd97a7a..69d41c44 100644
--- a/engine/scene/3d/audio_stream_player_3d.h
+++ b/engine/scene/3d/audio_stream_player_3d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/fixed_vector.h"
 #include "scene/3d/node_3d.h"
 #include "servers/audio/audio_server.h"
 
@@ -67,8 +66,6 @@ private:
 
 	};
 
-	static constexpr int64_t VOLUME_VECTOR_SIZE = AudioServer::MAX_CHANNELS_PER_BUS;
-
 	AudioStreamPlayerInternal *internal = nullptr;
 
 	SafeNumeric<float> setplay{ -1.0 };
@@ -83,11 +80,11 @@ private:
 	uint64_t last_mix_count = -1;
 	bool force_update_panning = false;
 
-	static void _calc_output_vol(const Vector3 &source_dir, real_t tightness, FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &output);
+	static void _calc_output_vol(const Vector3 &source_dir, real_t tightness, Vector<AudioFrame> &output);
 	static AudioFrame _calc_output_vol_stereo(const Vector3 &source_dir, real_t panning_strength);
 
 #ifndef PHYSICS_3D_DISABLED
-	void _calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, const FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &direct_path_vol, FixedVector<AudioFrame, VOLUME_VECTOR_SIZE> &reverb_vol);
+	void _calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, Vector<AudioFrame> direct_path_vol, Vector<AudioFrame> &reverb_vol);
 #endif // PHYSICS_3D_DISABLED
 
 	static void _listener_changed_cb(void *self) { reinterpret_cast<AudioStreamPlayer3D *>(self)->force_update_panning = true; }
@@ -124,10 +121,6 @@ private:
 	float panning_strength = 1.0f;
 	float cached_global_panning_strength = 0.5f;
 
-	/// Hash map storing the bus volumes during the panning update.
-	/// This hash map is stored as member for efficiency reasons.
-	HashMap<StringName, Vector<AudioFrame>> bus_volumes;
-
 protected:
 	void _validate_property(PropertyInfo &p_property) const;
 	void _notification(int p_what);
diff --git a/engine/scene/3d/bone_attachment_3d.compat.inc b/engine/scene/3d/bone_attachment_3d.compat.inc
index acde7931..1b21612d 100644
--- a/engine/scene/3d/bone_attachment_3d.compat.inc
+++ b/engine/scene/3d/bone_attachment_3d.compat.inc
@@ -32,8 +32,6 @@
 
 #include "bone_attachment_3d.h"
 
-#include "core/object/class_db.h"
-
 void BoneAttachment3D::_on_bone_pose_update_bind_compat_90575(int p_bone_index) {
 	return on_skeleton_update();
 }
diff --git a/engine/scene/3d/bone_attachment_3d.cpp b/engine/scene/3d/bone_attachment_3d.cpp
index c7b16969..dd6a9901 100644
--- a/engine/scene/3d/bone_attachment_3d.cpp
+++ b/engine/scene/3d/bone_attachment_3d.cpp
@@ -31,10 +31,6 @@
 #include "bone_attachment_3d.h"
 #include "bone_attachment_3d.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "bone_name") {
 		// Because it is a constant function, we cannot use the get_skeleton function.
@@ -54,7 +50,6 @@ void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const {
 			p_property.hint = PROPERTY_HINT_NONE;
 			p_property.hint_string = "";
 		}
-		return;
 	}
 
 	if (p_property.name == "external_skeleton" && !use_external_skeleton) {
diff --git a/engine/scene/3d/bone_constraint_3d.cpp b/engine/scene/3d/bone_constraint_3d.cpp
index aba1f9e5..cc34052f 100644
--- a/engine/scene/3d/bone_constraint_3d.cpp
+++ b/engine/scene/3d/bone_constraint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "bone_constraint_3d.h"
 
-#include "core/object/class_db.h"
-
 bool BoneConstraint3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -193,7 +191,7 @@ void BoneConstraint3D::set_apply_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->apply_bone <= -1 || settings[p_index]->apply_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Apply bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Apply bone index out of range!");
 			settings[p_index]->apply_bone = -1;
 		} else {
 			settings[p_index]->apply_bone_name = sk->get_bone_name(settings[p_index]->apply_bone);
@@ -237,7 +235,7 @@ void BoneConstraint3D::set_reference_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->reference_bone <= -1 || settings[p_index]->reference_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Reference bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("reference bone index out of range!");
 			settings[p_index]->reference_bone = -1;
 		} else {
 			settings[p_index]->reference_bone_name = sk->get_bone_name(settings[p_index]->reference_bone);
@@ -253,9 +251,6 @@ int BoneConstraint3D::get_reference_bone(int p_index) const {
 void BoneConstraint3D::set_reference_node(int p_index, const NodePath &p_node) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	settings[p_index]->reference_node = p_node;
-	if (should_check_node_path() && !p_node.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_node))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Reference node '" + String(p_node) + "' not found.");
-	}
 }
 
 NodePath BoneConstraint3D::get_reference_node(int p_index) const {
diff --git a/engine/scene/3d/bone_twist_disperser_3d.cpp b/engine/scene/3d/bone_twist_disperser_3d.cpp
index 66f16096..8f129e4a 100644
--- a/engine/scene/3d/bone_twist_disperser_3d.cpp
+++ b/engine/scene/3d/bone_twist_disperser_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "bone_twist_disperser_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 bool BoneTwistDisperser3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -156,7 +153,7 @@ void BoneTwistDisperser3D::_get_property_list(List<PropertyInfo> *p_list) const
 		props.push_back(PropertyInfo(Variant::QUATERNION, path + "twist_from"));
 		props.push_back(PropertyInfo(Variant::INT, path + "disperse_mode", PROPERTY_HINT_ENUM, "Even,Weighted,Custom"));
 		props.push_back(PropertyInfo(Variant::FLOAT, path + "weight_position", PROPERTY_HINT_RANGE, "0,1,0.001"));
-		props.push_back(PropertyInfo(Variant::OBJECT, path + "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()));
+		props.push_back(PropertyInfo(Variant::OBJECT, path + "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"));
 
 		props.push_back(PropertyInfo(Variant::INT, path + "joint_count", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ARRAY, "Joints," + path + "joints/,static,const"));
 		for (uint32_t j = 0; j < settings[i]->joints.size(); j++) {
@@ -267,7 +264,7 @@ void BoneTwistDisperser3D::set_root_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->root_bone.bone <= -1 || settings[p_index]->root_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Root bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Root bone index out of range!");
 			settings[p_index]->root_bone.bone = -1;
 		} else {
 			settings[p_index]->root_bone.name = sk->get_bone_name(settings[p_index]->root_bone.bone);
@@ -304,7 +301,7 @@ void BoneTwistDisperser3D::set_end_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->end_bone.bone <= -1 || settings[p_index]->end_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": End bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("End bone index out of range!");
 			settings[p_index]->end_bone.bone = -1;
 		} else {
 			settings[p_index]->end_bone.name = sk->get_bone_name(settings[p_index]->end_bone.bone);
@@ -470,7 +467,7 @@ void BoneTwistDisperser3D::_set_joint_bone(int p_index, int p_joint, int p_bone)
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (joints[p_joint].joint.bone <= -1 || joints[p_joint].joint.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + " : Joint: " + itos(p_joint) + ": bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Joint bone index out of range!");
 			joints[p_joint].joint.bone = -1;
 		} else {
 			joints[p_joint].joint.name = sk->get_bone_name(joints[p_joint].joint.bone);
diff --git a/engine/scene/3d/bone_twist_disperser_3d.h b/engine/scene/3d/bone_twist_disperser_3d.h
index 2a3d1f20..8f15f1db 100644
--- a/engine/scene/3d/bone_twist_disperser_3d.h
+++ b/engine/scene/3d/bone_twist_disperser_3d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
-#include "scene/resources/curve.h"
 
 class BoneTwistDisperser3D : public SkeletonModifier3D {
 	GDCLASS(BoneTwistDisperser3D, SkeletonModifier3D);
diff --git a/engine/scene/3d/camera_3d.cpp b/engine/scene/3d/camera_3d.cpp
index a42abf59..148466aa 100644
--- a/engine/scene/3d/camera_3d.cpp
+++ b/engine/scene/3d/camera_3d.cpp
@@ -30,13 +30,9 @@
 
 #include "camera_3d.h"
 
-#include "core/config/engine.h"
 #include "core/math/projection.h"
 #include "core/math/transform_interpolator.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
-#include "servers/rendering/rendering_server.h"
 
 void Camera3D::_update_audio_listener_state() {
 }
@@ -126,17 +122,14 @@ void Camera3D::_validate_property(PropertyInfo &p_property) const {
 			if (mode != PROJECTION_PERSPECTIVE) {
 				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 			}
-			return;
 		} else if (p_property.name == "size") {
 			if (mode != PROJECTION_ORTHOGONAL && mode != PROJECTION_FRUSTUM) {
 				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 			}
-			return;
 		} else if (p_property.name == "frustum_offset") {
 			if (mode != PROJECTION_FRUSTUM) {
 				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 			}
-			return;
 		}
 	}
 
@@ -678,9 +671,9 @@ void Camera3D::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "keep_aspect", PROPERTY_HINT_ENUM, "Keep Width,Keep Height"), "set_keep_aspect_mode", "get_keep_aspect_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, Environment::get_class_static()), "set_environment", "get_environment");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_attributes", "get_attributes");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "compositor", PROPERTY_HINT_RESOURCE_TYPE, Compositor::get_class_static()), "set_compositor", "get_compositor");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "compositor", PROPERTY_HINT_RESOURCE_TYPE, "Compositor"), "set_compositor", "get_compositor");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "h_offset", PROPERTY_HINT_NONE, "suffix:m"), "set_h_offset", "get_h_offset");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "v_offset", PROPERTY_HINT_NONE, "suffix:m"), "set_v_offset", "get_v_offset");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "doppler_tracking", PROPERTY_HINT_ENUM, "Disabled,Idle,Physics"), "set_doppler_tracking", "get_doppler_tracking");
diff --git a/engine/scene/3d/chain_ik_3d.cpp b/engine/scene/3d/chain_ik_3d.cpp
index 2144d22f..bb0a616e 100644
--- a/engine/scene/3d/chain_ik_3d.cpp
+++ b/engine/scene/3d/chain_ik_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "chain_ik_3d.h"
 
-#include "core/object/class_db.h"
-
 bool ChainIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -186,7 +184,7 @@ void ChainIK3D::set_root_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (chain_settings[p_index]->root_bone.bone <= -1 || chain_settings[p_index]->root_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Root bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Root bone index out of range!");
 			chain_settings[p_index]->root_bone.bone = -1;
 		} else {
 			chain_settings[p_index]->root_bone.name = sk->get_bone_name(chain_settings[p_index]->root_bone.bone);
@@ -223,7 +221,7 @@ void ChainIK3D::set_end_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (chain_settings[p_index]->end_bone.bone <= -1 || chain_settings[p_index]->end_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": End bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("End bone index out of range!");
 			chain_settings[p_index]->end_bone.bone = -1;
 		} else {
 			chain_settings[p_index]->end_bone.name = sk->get_bone_name(chain_settings[p_index]->end_bone.bone);
@@ -315,7 +313,7 @@ void ChainIK3D::_set_joint_bone(int p_index, int p_joint, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (joints[p_joint].bone <= -1 || joints[p_joint].bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + " : Joint: " + itos(p_joint) + ": bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Joint bone index out of range!");
 			joints[p_joint].bone = -1;
 		} else {
 			joints[p_joint].name = sk->get_bone_name(joints[p_joint].bone);
diff --git a/engine/scene/3d/convert_transform_modifier_3d.cpp b/engine/scene/3d/convert_transform_modifier_3d.cpp
index 99ac4c9e..55c9f565 100644
--- a/engine/scene/3d/convert_transform_modifier_3d.cpp
+++ b/engine/scene/3d/convert_transform_modifier_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "convert_transform_modifier_3d.h"
 
-#include "core/object/class_db.h"
-
 constexpr const char *HINT_POSITION = "-10,10,0.01,or_greater,or_less,suffix:m";
 constexpr const char *HINT_ROTATION = "-180,180,0.01,radians_as_degrees";
 constexpr const char *HINT_SCALE = "0,10,0.01,or_greater";
@@ -287,7 +285,7 @@ void ConvertTransformModifier3D::set_relative(int p_index, bool p_enabled) {
 }
 
 bool ConvertTransformModifier3D::is_relative(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), false);
+	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), 0);
 	ConvertTransform3DSetting *setting = static_cast<ConvertTransform3DSetting *>(settings[p_index]);
 	return setting->is_relative();
 }
@@ -299,7 +297,7 @@ void ConvertTransformModifier3D::set_additive(int p_index, bool p_enabled) {
 }
 
 bool ConvertTransformModifier3D::is_additive(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), false);
+	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), 0);
 	ConvertTransform3DSetting *setting = static_cast<ConvertTransform3DSetting *>(settings[p_index]);
 	return setting->additive;
 }
diff --git a/engine/scene/3d/copy_transform_modifier_3d.cpp b/engine/scene/3d/copy_transform_modifier_3d.cpp
index b700158c..067bfe68 100644
--- a/engine/scene/3d/copy_transform_modifier_3d.cpp
+++ b/engine/scene/3d/copy_transform_modifier_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "copy_transform_modifier_3d.h"
 
-#include "core/object/class_db.h"
-
 bool CopyTransformModifier3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -306,7 +304,7 @@ void CopyTransformModifier3D::set_relative(int p_index, bool p_enabled) {
 }
 
 bool CopyTransformModifier3D::is_relative(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), false);
+	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), 0);
 	CopyTransform3DSetting *setting = static_cast<CopyTransform3DSetting *>(settings[p_index]);
 	return setting->is_relative();
 }
@@ -318,7 +316,7 @@ void CopyTransformModifier3D::set_additive(int p_index, bool p_enabled) {
 }
 
 bool CopyTransformModifier3D::is_additive(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), false);
+	ERR_FAIL_INDEX_V(p_index, (int)settings.size(), 0);
 	CopyTransform3DSetting *setting = static_cast<CopyTransform3DSetting *>(settings[p_index]);
 	return setting->additive;
 }
diff --git a/engine/scene/3d/cpu_particles_3d.compat.inc b/engine/scene/3d/cpu_particles_3d.compat.inc
index cc0f3a83..33e7f546 100644
--- a/engine/scene/3d/cpu_particles_3d.compat.inc
+++ b/engine/scene/3d/cpu_particles_3d.compat.inc
@@ -30,21 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "cpu_particles_3d.h"
-
-#include "core/object/class_db.h"
-
 void CPUParticles3D::_restart_bind_compat_92089() {
 	restart(false);
 }
 
-void CPUParticles3D::_request_particles_process_bind_compat_109142(real_t p_time) {
-	request_particles_process(p_time, 0.);
-}
-
 void CPUParticles3D::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("restart"), &CPUParticles3D::_restart_bind_compat_92089);
-	ClassDB::bind_compatibility_method(D_METHOD("request_particles_process", "process_time"), &CPUParticles3D::_request_particles_process_bind_compat_109142);
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/scene/3d/cpu_particles_3d.cpp b/engine/scene/3d/cpu_particles_3d.cpp
index e8e7fb74..d8f158a2 100644
--- a/engine/scene/3d/cpu_particles_3d.cpp
+++ b/engine/scene/3d/cpu_particles_3d.cpp
@@ -31,10 +31,7 @@
 #include "cpu_particles_3d.h"
 #include "cpu_particles_3d.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/math/random_number_generator.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/main/viewport.h"
@@ -42,7 +39,6 @@
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/particle_process_material.h"
-#include "servers/rendering/rendering_server.h"
 
 AABB CPUParticles3D::get_aabb() const {
 	return AABB();
@@ -87,7 +83,7 @@ void CPUParticles3D::set_amount(int p_amount) {
 
 	particle_data.resize((12 + 4 + 4) * p_amount);
 	RS::get_singleton()->multimesh_set_visible_instances(multimesh, -1);
-	RS::get_singleton()->multimesh_allocate_data(multimesh, p_amount, RSE::MULTIMESH_TRANSFORM_3D, true, true);
+	RS::get_singleton()->multimesh_allocate_data(multimesh, p_amount, RS::MULTIMESH_TRANSFORM_3D, true, true);
 
 	particle_order.resize(p_amount);
 }
@@ -587,47 +583,45 @@ uint32_t CPUParticles3D::get_seed() const {
 	return seed;
 }
 
-void CPUParticles3D::request_particles_process(real_t p_request_process_time, real_t p_request_process_time_residual) {
-	_request_process_time = p_request_process_time;
-	_request_process_time_residual = p_request_process_time_residual;
-	_update_internal();
+void CPUParticles3D::request_particles_process(real_t p_requested_process_time) {
+	_requested_process_time = p_requested_process_time;
 }
 
 void CPUParticles3D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "emitting") {
 		p_property.hint = one_shot ? PROPERTY_HINT_ONESHOT : PROPERTY_HINT_NONE;
-	} else if (p_property.name == "emission_sphere_radius") {
-		if (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_box_extents") {
-		if (emission_shape != EMISSION_SHAPE_BOX) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture" || p_property.name == "emission_points") {
-		if (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_normals") {
-		if (emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name.begins_with("emission_ring_")) {
-		if (emission_shape != EMISSION_SHAPE_RING) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name.begins_with("orbit_")) {
-		if (!particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name.begins_with("scale_curve_")) {
-		if (!split_scale) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "seed") {
-		if (!use_fixed_seed) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
+	}
+
+	if (p_property.name == "emission_sphere_radius" && (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_box_extents" && emission_shape != EMISSION_SHAPE_BOX) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if ((p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture" || p_property.name == "emission_points") && (emission_shape != EMISSION_SHAPE_POINTS && (emission_shape != EMISSION_SHAPE_DIRECTED_POINTS))) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_normals" && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name.begins_with("emission_ring_") && emission_shape != EMISSION_SHAPE_RING) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name.begins_with("orbit_") && !particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name.begins_with("scale_curve_") && !split_scale) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "seed" && !use_fixed_seed) {
+		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
 
@@ -674,58 +668,25 @@ void CPUParticles3D::_update_internal() {
 
 	bool processed = false;
 
-	{
-		float todo = time == 0 ? pre_process_time : 0;
-		todo = todo > _request_process_time ? todo : _request_process_time;
-		todo = todo > _request_process_time_residual ? todo : _request_process_time_residual;
-
-		if (todo > 0.0) {
-			real_t frame_time;
-			if (fixed_fps > 0) {
-				frame_time = 1.0 / fixed_fps;
-			} else {
-				frame_time = 1.0 / 30.0;
-			}
-
-			float tmp_scale = speed_scale;
-			// We need this otherwise the speed scale of the particle system influences the TODO.
-			speed_scale = 1.0;
-			if (time == 0) {
-				todo = pre_process_time;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (_request_process_time > 0.0) {
-				todo = _request_process_time;
-				emitting = true;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (_request_process_time_residual > 0.0) {
-				emitting = false;
-				todo = _request_process_time_residual;
-				while (todo > 0.0) {
-					_particles_process(frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			speed_scale = tmp_scale;
-			processed = true;
-		}
-		_request_process_time = 0;
-		_request_process_time_residual = 0;
-	}
-
 	double frame_time;
 	if (fixed_fps > 0) {
 		frame_time = 1.0 / fixed_fps;
 	} else {
 		frame_time = 1.0 / 30.0;
 	}
+	double todo = _requested_process_time;
+	_requested_process_time = 0.;
+	if (time == 0 && pre_process_time > 0.0) {
+		todo += pre_process_time;
+	}
+	real_t tmp_speed = speed_scale;
+	speed_scale = 1.0;
+	while (todo > 0) {
+		_particles_process(frame_time);
+		todo -= frame_time;
+	}
+	speed_scale = tmp_speed;
+	todo = 0.0;
 
 	if (fixed_fps > 0) {
 		double decr = frame_time;
@@ -736,7 +697,7 @@ void CPUParticles3D::_update_internal() {
 		} else if (ldelta <= 0.0) { //unlikely but..
 			ldelta = 0.001;
 		}
-		double todo = frame_remainder + ldelta;
+		todo = frame_remainder + ldelta;
 
 		while (todo >= frame_time) {
 			_particles_process(frame_time);
@@ -1367,13 +1328,13 @@ void CPUParticles3D::_set_redraw(bool p_redraw) {
 
 		if (redraw) {
 			RS::get_singleton()->connect("frame_pre_draw", callable_mp(this, &CPUParticles3D::_update_render_thread));
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
 			RS::get_singleton()->multimesh_set_visible_instances(multimesh, -1);
 		} else {
 			if (RS::get_singleton()->is_connected("frame_pre_draw", callable_mp(this, &CPUParticles3D::_update_render_thread))) {
 				RS::get_singleton()->disconnect("frame_pre_draw", callable_mp(this, &CPUParticles3D::_update_render_thread));
 			}
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false);
 			RS::get_singleton()->multimesh_set_visible_instances(multimesh, 0);
 		}
 	}
@@ -1516,13 +1477,13 @@ void CPUParticles3D::convert_from_particles(Node *p_particles) {
 	set_gravity(material->get_gravity());
 	set_lifetime_randomness(material->get_lifetime_randomness());
 
-#define CONVERT_PARAM(m_param) \
-	set_param_min(m_param, material->get_param_min(ParticleProcessMaterial::m_param)); \
-	{ \
+#define CONVERT_PARAM(m_param)                                                                  \
+	set_param_min(m_param, material->get_param_min(ParticleProcessMaterial::m_param));          \
+	{                                                                                           \
 		Ref<CurveTexture> ctex = material->get_param_texture(ParticleProcessMaterial::m_param); \
-		if (ctex.is_valid()) \
-			set_param_curve(m_param, ctex->get_curve()); \
-	} \
+		if (ctex.is_valid())                                                                    \
+			set_param_curve(m_param, ctex->get_curve());                                        \
+	}                                                                                           \
 	set_param_max(m_param, material->get_param_max(ParticleProcessMaterial::m_param));
 
 	CONVERT_PARAM(PARAM_INITIAL_LINEAR_VELOCITY);
@@ -1584,7 +1545,7 @@ void CPUParticles3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_seed"), &CPUParticles3D::get_seed);
 
 	ClassDB::bind_method(D_METHOD("restart", "keep_seed"), &CPUParticles3D::restart, DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time", "process_time_residual"), &CPUParticles3D::request_particles_process, DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time"), &CPUParticles3D::request_particles_process);
 	ClassDB::bind_method(D_METHOD("capture_aabb"), &CPUParticles3D::capture_aabb);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "emitting", PROPERTY_HINT_ONESHOT), "set_emitting", "is_emitting");
@@ -1606,7 +1567,7 @@ void CPUParticles3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::AABB, "visibility_aabb", PROPERTY_HINT_NONE, "suffix:m"), "set_visibility_aabb", "get_visibility_aabb");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "local_coords"), "set_use_local_coordinates", "get_use_local_coordinates");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "draw_order", PROPERTY_HINT_ENUM, "Index,Lifetime,View Depth"), "set_draw_order", "get_draw_order");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
 
 	BIND_ENUM_CONSTANT(DRAW_ORDER_INDEX);
 	BIND_ENUM_CONSTANT(DRAW_ORDER_LIFETIME);
@@ -1726,55 +1687,55 @@ void CPUParticles3D::_bind_methods() {
 	ADD_GROUP("Angular Velocity", "angular_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_min", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ANGULAR_VELOCITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_max", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ANGULAR_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANGULAR_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANGULAR_VELOCITY);
 	ADD_GROUP("Orbit Velocity", "orbit_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_min", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ORBIT_VELOCITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_max", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ORBIT_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ORBIT_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ORBIT_VELOCITY);
 	ADD_GROUP("Linear Accel", "linear_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_LINEAR_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_LINEAR_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_LINEAR_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_LINEAR_ACCEL);
 	ADD_GROUP("Radial Accel", "radial_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_RADIAL_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_RADIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_RADIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_RADIAL_ACCEL);
 	ADD_GROUP("Tangential Accel", "tangential_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_TANGENTIAL_ACCEL);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_TANGENTIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_TANGENTIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_TANGENTIAL_ACCEL);
 	ADD_GROUP("Damping", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_min", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_min", "get_param_min", PARAM_DAMPING);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_max", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_max", "get_param_max", PARAM_DAMPING);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_DAMPING);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_DAMPING);
 	ADD_GROUP("Angle", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_min", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_min", "get_param_min", PARAM_ANGLE);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_max", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_max", "get_param_max", PARAM_ANGLE);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANGLE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANGLE);
 	ADD_GROUP("Scale", "");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_amount_min", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_min", "get_param_min", PARAM_SCALE);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_amount_max", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_max", "get_param_max", PARAM_SCALE);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_amount_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_SCALE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_amount_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_SCALE);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "split_scale"), "set_split_scale", "get_split_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_x", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_scale_curve_x", "get_scale_curve_x");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_y", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_scale_curve_y", "get_scale_curve_y");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_z", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_scale_curve_z", "get_scale_curve_z");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_x", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_scale_curve_x", "get_scale_curve_x");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_y", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_scale_curve_y", "get_scale_curve_y");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "scale_curve_z", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_scale_curve_z", "get_scale_curve_z");
 	ADD_GROUP("Color", "");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_ramp", "get_color_ramp");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static()), "set_color_initial_ramp", "get_color_initial_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_ramp", "get_color_ramp");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, "Gradient"), "set_color_initial_ramp", "get_color_initial_ramp");
 
 	ADD_GROUP("Hue Variation", "hue_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_min", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_min", "get_param_min", PARAM_HUE_VARIATION);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_max", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_max", "get_param_max", PARAM_HUE_VARIATION);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_HUE_VARIATION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_HUE_VARIATION);
 	ADD_GROUP("Animation", "anim_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_min", PROPERTY_HINT_RANGE, "0,128,0.01,or_greater,or_less"), "set_param_min", "get_param_min", PARAM_ANIM_SPEED);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_max", PROPERTY_HINT_RANGE, "0,128,0.01,or_greater,or_less"), "set_param_max", "get_param_max", PARAM_ANIM_SPEED);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANIM_SPEED);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANIM_SPEED);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_min", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_min", "get_param_min", PARAM_ANIM_OFFSET);
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_max", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_max", "get_param_max", PARAM_ANIM_OFFSET);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_param_curve", "get_param_curve", PARAM_ANIM_OFFSET);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_param_curve", "get_param_curve", PARAM_ANIM_OFFSET);
 
 	BIND_ENUM_CONSTANT(PARAM_INITIAL_LINEAR_VELOCITY);
 	BIND_ENUM_CONSTANT(PARAM_ANGULAR_VELOCITY);
diff --git a/engine/scene/3d/cpu_particles_3d.h b/engine/scene/3d/cpu_particles_3d.h
index 0fec503a..0ef996a5 100644
--- a/engine/scene/3d/cpu_particles_3d.h
+++ b/engine/scene/3d/cpu_particles_3d.h
@@ -31,10 +31,8 @@
 #pragma once
 
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
 
-class Mesh;
 class RandomNumberGenerator;
 
 class CPUParticles3D : public GeometryInstance3D {
@@ -138,8 +136,7 @@ private:
 
 	double lifetime = 1.0;
 	double pre_process_time = 0.0;
-	real_t _request_process_time = 0.0;
-	real_t _request_process_time_residual = 0.0;
+	double _requested_process_time = 0.0;
 	real_t explosiveness_ratio = 0.0;
 	real_t randomness_ratio = 0.0;
 	double lifetime_randomness = 0.0;
@@ -214,7 +211,6 @@ protected:
 
 #ifndef DISABLE_DEPRECATED
 	void _restart_bind_compat_92089();
-	void _request_particles_process_bind_compat_109142(real_t p_time);
 	static void _bind_compatibility_methods();
 #endif
 
@@ -263,7 +259,7 @@ public:
 	void set_seed(uint32_t p_seed);
 	uint32_t get_seed() const;
 
-	void request_particles_process(real_t p_requested_process_time, real_t p_request_process_time_residual = 0.0f);
+	void request_particles_process(real_t p_requested_process_time);
 
 	///////////////////
 
diff --git a/engine/scene/3d/decal.cpp b/engine/scene/3d/decal.cpp
index 776fd2d1..2e48a5ca 100644
--- a/engine/scene/3d/decal.cpp
+++ b/engine/scene/3d/decal.cpp
@@ -30,10 +30,6 @@
 
 #include "decal.h"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "servers/rendering/rendering_server.h"
-
 void Decal::set_size(const Vector3 &p_size) {
 	size = p_size.maxf(0.001);
 	RS::get_singleton()->decal_set_size(decal, size);
@@ -62,7 +58,7 @@ void Decal::set_texture(DecalTexture p_type, const Ref<Texture2D> &p_texture) {
 	}
 #endif
 
-	RS::get_singleton()->decal_set_texture(decal, RSE::DecalTexture(p_type), texture_rid);
+	RS::get_singleton()->decal_set_texture(decal, RS::DecalTexture(p_type), texture_rid);
 	update_configuration_warnings();
 }
 
diff --git a/engine/scene/3d/fog_volume.cpp b/engine/scene/3d/fog_volume.cpp
index 2a118ca8..e43d2be7 100644
--- a/engine/scene/3d/fog_volume.cpp
+++ b/engine/scene/3d/fog_volume.cpp
@@ -30,11 +30,8 @@
 
 #include "fog_volume.h"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
-#include "servers/rendering/rendering_server.h"
 
 ///////////////////////////
 
@@ -52,8 +49,9 @@ void FogVolume::_bind_methods() {
 }
 
 void FogVolume::_validate_property(PropertyInfo &p_property) const {
-	if (p_property.name == "size" && shape == RSE::FOG_VOLUME_SHAPE_WORLD) {
+	if (p_property.name == "size" && shape == RS::FOG_VOLUME_SHAPE_WORLD) {
 		p_property.usage = PROPERTY_USAGE_NONE;
+		return;
 	}
 }
 
@@ -86,15 +84,15 @@ Vector3 FogVolume::get_size() const {
 	return size;
 }
 
-void FogVolume::set_shape(RSE::FogVolumeShape p_type) {
+void FogVolume::set_shape(RS::FogVolumeShape p_type) {
 	shape = p_type;
 	RS::get_singleton()->fog_volume_set_shape(_get_volume(), shape);
-	RS::get_singleton()->instance_set_ignore_culling(get_instance(), shape == RSE::FOG_VOLUME_SHAPE_WORLD);
+	RS::get_singleton()->instance_set_ignore_culling(get_instance(), shape == RS::FOG_VOLUME_SHAPE_WORLD);
 	update_gizmos();
 	notify_property_list_changed();
 }
 
-RSE::FogVolumeShape FogVolume::get_shape() const {
+RS::FogVolumeShape FogVolume::get_shape() const {
 	return shape;
 }
 
@@ -113,7 +111,7 @@ Ref<Material> FogVolume::get_material() const {
 }
 
 AABB FogVolume::get_aabb() const {
-	if (shape != RSE::FOG_VOLUME_SHAPE_WORLD) {
+	if (shape != RS::FOG_VOLUME_SHAPE_WORLD) {
 		return AABB(-size / 2, size);
 	}
 	return AABB();
@@ -138,7 +136,7 @@ PackedStringArray FogVolume::get_configuration_warnings() const {
 
 FogVolume::FogVolume() {
 	volume = RS::get_singleton()->fog_volume_create();
-	RS::get_singleton()->fog_volume_set_shape(volume, RSE::FOG_VOLUME_SHAPE_BOX);
+	RS::get_singleton()->fog_volume_set_shape(volume, RS::FOG_VOLUME_SHAPE_BOX);
 	set_base(volume);
 }
 
diff --git a/engine/scene/3d/fog_volume.h b/engine/scene/3d/fog_volume.h
index 88c421e7..5a9e3348 100644
--- a/engine/scene/3d/fog_volume.h
+++ b/engine/scene/3d/fog_volume.h
@@ -39,7 +39,7 @@ class FogVolume : public VisualInstance3D {
 
 	Vector3 size = Vector3(2, 2, 2);
 	Ref<Material> material;
-	RSE::FogVolumeShape shape = RSE::FOG_VOLUME_SHAPE_BOX;
+	RS::FogVolumeShape shape = RS::FOG_VOLUME_SHAPE_BOX;
 
 	RID volume;
 
@@ -56,8 +56,8 @@ public:
 	void set_size(const Vector3 &p_size);
 	Vector3 get_size() const;
 
-	void set_shape(RSE::FogVolumeShape p_type);
-	RSE::FogVolumeShape get_shape() const;
+	void set_shape(RS::FogVolumeShape p_type);
+	RS::FogVolumeShape get_shape() const;
 
 	void set_material(const Ref<Material> &p_material);
 	Ref<Material> get_material() const;
diff --git a/engine/scene/3d/gpu_particles_3d.compat.inc b/engine/scene/3d/gpu_particles_3d.compat.inc
index b77a0c0e..44e6fbb1 100644
--- a/engine/scene/3d/gpu_particles_3d.compat.inc
+++ b/engine/scene/3d/gpu_particles_3d.compat.inc
@@ -30,21 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "gpu_particles_3d.h"
-
-#include "core/object/class_db.h"
-
 void GPUParticles3D::_restart_bind_compat_92089() {
 	restart(false);
 }
 
-void GPUParticles3D::_request_particles_process_bind_compat_109142(real_t p_time) {
-	request_particles_process(p_time, 0.);
-}
-
 void GPUParticles3D::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("restart"), &GPUParticles3D::_restart_bind_compat_92089);
-	ClassDB::bind_compatibility_method(D_METHOD("request_particles_process", "process_time"), &GPUParticles3D::_request_particles_process_bind_compat_109142);
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/scene/3d/gpu_particles_3d.cpp b/engine/scene/3d/gpu_particles_3d.cpp
index 1dfcfe5f..96afd066 100644
--- a/engine/scene/3d/gpu_particles_3d.cpp
+++ b/engine/scene/3d/gpu_particles_3d.cpp
@@ -31,16 +31,11 @@
 #include "gpu_particles_3d.h"
 #include "gpu_particles_3d.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/3d/cpu_particles_3d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/particle_process_material.h"
-#include "servers/rendering/rendering_server.h"
 
 AABB GPUParticles3D::get_aabb() const {
 	return AABB();
@@ -240,7 +235,7 @@ real_t GPUParticles3D::get_collision_base_size() const {
 
 void GPUParticles3D::set_draw_order(DrawOrder p_order) {
 	draw_order = p_order;
-	RS::get_singleton()->particles_set_draw_order(particles, RSE::ParticlesDrawOrder(p_order));
+	RS::get_singleton()->particles_set_draw_order(particles, RS::ParticlesDrawOrder(p_order));
 }
 
 void GPUParticles3D::set_trail_enabled(bool p_enabled) {
@@ -462,40 +457,22 @@ AABB GPUParticles3D::capture_aabb() const {
 void GPUParticles3D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "emitting") {
 		p_property.hint = one_shot ? PROPERTY_HINT_ONESHOT : PROPERTY_HINT_NONE;
-	} else if (p_property.name.begins_with("draw_pass_")) {
+	}
+
+	if (p_property.name.begins_with("draw_pass_")) {
 		int index = p_property.name.get_slicec('_', 2).to_int() - 1;
 		if (index >= draw_passes.size()) {
 			p_property.usage = PROPERTY_USAGE_NONE;
 			return;
 		}
-	} else if (p_property.name == "seed" && !use_fixed_seed) {
+	}
+	if (p_property.name == "seed" && !use_fixed_seed) {
 		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (p_property.name == "transform_align_axis") {
-		if (transform_align == TRANSFORM_ALIGN_DISABLED || transform_align == TRANSFORM_ALIGN_Z_BILLBOARD ||
-				transform_align == TRANSFORM_ALIGN_Y_TO_VELOCITY || transform_align == TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "transform_align_channel_filter") {
-		if (!(transform_align == TRANSFORM_ALIGN_Z_BILLBOARD)) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
 	}
 }
 
-void GPUParticles3D::request_particles_process(real_t p_requested_process_time, real_t p_request_process_time_residual) {
-	RS::get_singleton()->particles_request_process_time(particles, p_requested_process_time, p_request_process_time_residual);
-	// Setting emitting independently from set_emitting is important here
-	// we assume to be in a controlled process situation.
-	// setting RS emission to true is necessary to ensure particles will emit when
-	// regular process time is > than zero but the particles are already in trailing mode.
-	// this could also be done on the GScript/tool side.
-	if (p_requested_process_time > 0.0) {
-		emitting = true;
-		RS::get_singleton()->particles_set_emitting(particles, true);
-	}
-	if (p_request_process_time_residual > 0.0) {
-		emitting = false;
-	}
+void GPUParticles3D::request_particles_process(real_t p_requested_process_time) {
+	RS::get_singleton()->particles_request_process_time(particles, p_requested_process_time);
 }
 
 void GPUParticles3D::emit_particle(const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) {
@@ -650,36 +627,15 @@ Ref<Skin> GPUParticles3D::get_skin() const {
 }
 
 void GPUParticles3D::set_transform_align(TransformAlign p_align) {
-	if (p_align != transform_align) {
-		notify_property_list_changed();
-	}
+	ERR_FAIL_INDEX(uint32_t(p_align), 4);
 	transform_align = p_align;
-	RS::get_singleton()->particles_set_transform_align(particles, RSE::ParticlesTransformAlign(transform_align));
+	RS::get_singleton()->particles_set_transform_align(particles, RS::ParticlesTransformAlign(transform_align));
 }
 
 GPUParticles3D::TransformAlign GPUParticles3D::get_transform_align() const {
 	return transform_align;
 }
 
-void GPUParticles3D::set_transform_align_channel_filter(RSE::ParticlesTransformAlignCustomSrc p_align_channel_filter) {
-	ERR_FAIL_INDEX(uint32_t(p_align_channel_filter), uint32_t(RSE::ParticlesTransformAlignCustomSrc::PARTICLES_ALIGN_CHANNEL_FILTER_MAX));
-	transform_align_channel_filter = p_align_channel_filter;
-	RS::get_singleton()->particles_set_transform_align_channel_filter(particles, transform_align_channel_filter);
-}
-
-RSE::ParticlesTransformAlignCustomSrc GPUParticles3D::get_transform_align_channel_filter() const {
-	return transform_align_channel_filter;
-}
-
-void GPUParticles3D::set_transform_align_axis(RSE::ParticlesTransformAlignAxis p_axis) {
-	transform_align_axis = p_axis;
-	RS::get_singleton()->particles_set_transform_align_axis(particles, p_axis);
-}
-
-RSE::ParticlesTransformAlignAxis GPUParticles3D::get_transform_align_axis() const {
-	return transform_align_axis;
-}
-
 void GPUParticles3D::convert_from_particles(Node *p_particles) {
 	CPUParticles3D *cpu_particles = Object::cast_to<CPUParticles3D>(p_particles);
 	ERR_FAIL_NULL_MSG(cpu_particles, "Only CPUParticles3D nodes can be converted to GPUParticles3D.");
@@ -743,16 +699,16 @@ void GPUParticles3D::convert_from_particles(Node *p_particles) {
 	proc_mat->set_gravity(cpu_particles->get_gravity());
 	proc_mat->set_lifetime_randomness(cpu_particles->get_lifetime_randomness());
 
-#define CONVERT_PARAM(m_param) \
+#define CONVERT_PARAM(m_param)                                                                                        \
 	proc_mat->set_param_min(ParticleProcessMaterial::m_param, cpu_particles->get_param_min(CPUParticles3D::m_param)); \
-	{ \
-		Ref<Curve> curve = cpu_particles->get_param_curve(CPUParticles3D::m_param); \
-		if (curve.is_valid()) { \
-			Ref<CurveTexture> tex = memnew(CurveTexture); \
-			tex->set_curve(curve); \
-			proc_mat->set_param_texture(ParticleProcessMaterial::m_param, tex); \
-		} \
-	} \
+	{                                                                                                                 \
+		Ref<Curve> curve = cpu_particles->get_param_curve(CPUParticles3D::m_param);                                   \
+		if (curve.is_valid()) {                                                                                       \
+			Ref<CurveTexture> tex = memnew(CurveTexture);                                                             \
+			tex->set_curve(curve);                                                                                    \
+			proc_mat->set_param_texture(ParticleProcessMaterial::m_param, tex);                                       \
+		}                                                                                                             \
+	}                                                                                                                 \
 	proc_mat->set_param_max(ParticleProcessMaterial::m_param, cpu_particles->get_param_max(CPUParticles3D::m_param));
 
 	CONVERT_PARAM(PARAM_INITIAL_LINEAR_VELOCITY);
@@ -851,18 +807,12 @@ void GPUParticles3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_transform_align", "align"), &GPUParticles3D::set_transform_align);
 	ClassDB::bind_method(D_METHOD("get_transform_align"), &GPUParticles3D::get_transform_align);
 
-	ClassDB::bind_method(D_METHOD("set_transform_align_channel_filter", "channel_filter"), &GPUParticles3D::set_transform_align_channel_filter);
-	ClassDB::bind_method(D_METHOD("get_transform_align_channel_filter"), &GPUParticles3D::get_transform_align_channel_filter);
-
-	ClassDB::bind_method(D_METHOD("set_transform_align_axis", "align"), &GPUParticles3D::set_transform_align_axis);
-	ClassDB::bind_method(D_METHOD("get_transform_align_axis"), &GPUParticles3D::get_transform_align_axis);
-
 	ClassDB::bind_method(D_METHOD("convert_from_particles", "particles"), &GPUParticles3D::convert_from_particles);
 
 	ClassDB::bind_method(D_METHOD("set_amount_ratio", "ratio"), &GPUParticles3D::set_amount_ratio);
 	ClassDB::bind_method(D_METHOD("get_amount_ratio"), &GPUParticles3D::get_amount_ratio);
 
-	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time", "process_time_residual"), &GPUParticles3D::request_particles_process, DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("request_particles_process", "process_time"), &GPUParticles3D::request_particles_process);
 
 	ADD_SIGNAL(MethodInfo("finished"));
 
@@ -891,11 +841,7 @@ void GPUParticles3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::AABB, "visibility_aabb", PROPERTY_HINT_NONE, "suffix:m"), "set_visibility_aabb", "get_visibility_aabb");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "local_coords"), "set_use_local_coordinates", "get_use_local_coordinates");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "draw_order", PROPERTY_HINT_ENUM, "Index,Lifetime,Reverse Lifetime,View Depth"), "set_draw_order", "get_draw_order");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "transform_align", PROPERTY_HINT_ENUM, "Disabled,Billboard,Align to Velocity,Trails,Local Billboard"), "set_transform_align", "get_transform_align");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "transform_align_axis", PROPERTY_HINT_ENUM, "X,Y"), "set_transform_align_axis", "get_transform_align_axis");
-	ADD_SUBGROUP("Advanced", "");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "transform_align_channel_filter", PROPERTY_HINT_ENUM, "Disabled,X,Y,Z,W"), "set_transform_align_channel_filter", "get_transform_align_channel_filter");
-
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "transform_align", PROPERTY_HINT_ENUM, "Disabled,Z-Billboard,Y to Velocity,Z-Billboard + Y to Velocity"), "set_transform_align", "get_transform_align");
 	ADD_GROUP("Trails", "trail_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "trail_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_trail_enabled", "is_trail_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "trail_lifetime", PROPERTY_HINT_RANGE, "0.01,10,0.01,or_greater,suffix:s"), "set_trail_lifetime", "get_trail_lifetime");
@@ -904,9 +850,9 @@ void GPUParticles3D::_bind_methods() {
 	ADD_GROUP("Draw Passes", "draw_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "draw_passes", PROPERTY_HINT_RANGE, "0," + itos(MAX_DRAW_PASSES) + ",1"), "set_draw_passes", "get_draw_passes");
 	for (int i = 0; i < MAX_DRAW_PASSES; i++) {
-		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "draw_pass_" + itos(i + 1), PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_draw_pass_mesh", "get_draw_pass_mesh", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "draw_pass_" + itos(i + 1), PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_draw_pass_mesh", "get_draw_pass_mesh", i);
 	}
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "draw_skin", PROPERTY_HINT_RESOURCE_TYPE, Skin::get_class_static()), "set_skin", "get_skin");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "draw_skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
 
 	BIND_ENUM_CONSTANT(DRAW_ORDER_INDEX);
 	BIND_ENUM_CONSTANT(DRAW_ORDER_LIFETIME);
@@ -925,14 +871,13 @@ void GPUParticles3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRANSFORM_ALIGN_Z_BILLBOARD);
 	BIND_ENUM_CONSTANT(TRANSFORM_ALIGN_Y_TO_VELOCITY);
 	BIND_ENUM_CONSTANT(TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY);
-	BIND_ENUM_CONSTANT(TRANSFORM_ALIGN_LOCAL_BILLBOARD);
 
 	ADD_PROPERTY_DEFAULT("seed", 0);
 }
 
 GPUParticles3D::GPUParticles3D() {
 	particles = RS::get_singleton()->particles_create();
-	RS::get_singleton()->particles_set_mode(particles, RSE::PARTICLES_MODE_3D);
+	RS::get_singleton()->particles_set_mode(particles, RS::PARTICLES_MODE_3D);
 	set_base(particles);
 	one_shot = false; // Needed so that set_emitting doesn't access uninitialized values
 	set_emitting(true);
@@ -955,8 +900,6 @@ GPUParticles3D::GPUParticles3D() {
 	set_speed_scale(1);
 	set_collision_base_size(collision_base_size);
 	set_transform_align(TRANSFORM_ALIGN_DISABLED);
-	set_transform_align_channel_filter(RSE::ParticlesTransformAlignCustomSrc::PARTICLES_ALIGN_CHANNEL_FILTER_X);
-	set_transform_align_axis(RSE::ParticlesTransformAlignAxis::PARTICLES_ALIGN_AXIS_Y);
 	set_use_fixed_seed(false);
 }
 
diff --git a/engine/scene/3d/gpu_particles_3d.h b/engine/scene/3d/gpu_particles_3d.h
index 12940fa9..d76fc4c6 100644
--- a/engine/scene/3d/gpu_particles_3d.h
+++ b/engine/scene/3d/gpu_particles_3d.h
@@ -33,8 +33,6 @@
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/3d/skin.h"
 
-class Mesh;
-
 class GPUParticles3D : public GeometryInstance3D {
 private:
 	GDCLASS(GPUParticles3D, GeometryInstance3D);
@@ -48,11 +46,10 @@ public:
 	};
 
 	enum TransformAlign {
-		TRANSFORM_ALIGN_DISABLED = RSE::PARTICLES_TRANSFORM_ALIGN_DISABLED,
-		TRANSFORM_ALIGN_Z_BILLBOARD = RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD,
-		TRANSFORM_ALIGN_Y_TO_VELOCITY = RSE::PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY,
-		TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY = RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY,
-		TRANSFORM_ALIGN_LOCAL_BILLBOARD = RSE::PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD,
+		TRANSFORM_ALIGN_DISABLED,
+		TRANSFORM_ALIGN_Z_BILLBOARD,
+		TRANSFORM_ALIGN_Y_TO_VELOCITY,
+		TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY
 	};
 
 	enum {
@@ -87,9 +84,6 @@ private:
 	double trail_lifetime = 0.3;
 
 	TransformAlign transform_align = TRANSFORM_ALIGN_DISABLED;
-	RSE::ParticlesTransformAlignCustomSrc transform_align_channel_filter = RSE::ParticlesTransformAlignCustomSrc::PARTICLES_ALIGN_CHANNEL_FILTER_X;
-	RSE::ParticlesTransformAlignAxis transform_align_axis = RSE::ParticlesTransformAlignAxis::PARTICLES_ALIGN_AXIS_Y;
-	bool transform_align_use_velocity = true;
 
 	Ref<Material> process_material;
 
@@ -116,7 +110,6 @@ protected:
 
 #ifndef DISABLE_DEPRECATED
 	void _restart_bind_compat_92089();
-	void _request_particles_process_bind_compat_109142(real_t p_time);
 	static void _bind_compatibility_methods();
 #endif
 
@@ -188,12 +181,6 @@ public:
 	void set_transform_align(TransformAlign p_align);
 	TransformAlign get_transform_align() const;
 
-	void set_transform_align_channel_filter(RSE::ParticlesTransformAlignCustomSrc p_align_channel_filter);
-	RSE::ParticlesTransformAlignCustomSrc get_transform_align_channel_filter() const;
-
-	void set_transform_align_axis(RSE::ParticlesTransformAlignAxis p_axis);
-	RSE::ParticlesTransformAlignAxis get_transform_align_axis() const;
-
 	void restart(bool p_keep_seed = false);
 
 	void set_use_fixed_seed(bool p_use_fixed_seed);
@@ -201,14 +188,14 @@ public:
 
 	void set_seed(uint32_t p_seed);
 	uint32_t get_seed() const;
-	void request_particles_process(real_t p_requested_process_time, real_t p_request_process_time_residual = 0.0f);
+	void request_particles_process(real_t p_requested_process_time);
 
 	enum EmitFlags {
-		EMIT_FLAG_POSITION = RSE::PARTICLES_EMIT_FLAG_POSITION,
-		EMIT_FLAG_ROTATION_SCALE = RSE::PARTICLES_EMIT_FLAG_ROTATION_SCALE,
-		EMIT_FLAG_VELOCITY = RSE::PARTICLES_EMIT_FLAG_VELOCITY,
-		EMIT_FLAG_COLOR = RSE::PARTICLES_EMIT_FLAG_COLOR,
-		EMIT_FLAG_CUSTOM = RSE::PARTICLES_EMIT_FLAG_CUSTOM
+		EMIT_FLAG_POSITION = RS::PARTICLES_EMIT_FLAG_POSITION,
+		EMIT_FLAG_ROTATION_SCALE = RS::PARTICLES_EMIT_FLAG_ROTATION_SCALE,
+		EMIT_FLAG_VELOCITY = RS::PARTICLES_EMIT_FLAG_VELOCITY,
+		EMIT_FLAG_COLOR = RS::PARTICLES_EMIT_FLAG_COLOR,
+		EMIT_FLAG_CUSTOM = RS::PARTICLES_EMIT_FLAG_CUSTOM
 	};
 
 	void emit_particle(const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags);
diff --git a/engine/scene/3d/gpu_particles_collision_3d.cpp b/engine/scene/3d/gpu_particles_collision_3d.cpp
index 5bc82727..22a6998e 100644
--- a/engine/scene/3d/gpu_particles_collision_3d.cpp
+++ b/engine/scene/3d/gpu_particles_collision_3d.cpp
@@ -30,14 +30,10 @@
 
 #include "gpu_particles_collision_3d.h"
 
-#include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
+#include "mesh_instance_3d.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/main/viewport.h"
-#include "servers/rendering/rendering_server.h"
 
 void GPUParticlesCollision3D::set_cull_mask(uint32_t p_cull_mask) {
 	cull_mask = p_cull_mask;
@@ -55,7 +51,7 @@ void GPUParticlesCollision3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask");
 }
 
-GPUParticlesCollision3D::GPUParticlesCollision3D(RSE::ParticlesCollisionType p_type) {
+GPUParticlesCollision3D::GPUParticlesCollision3D(RS::ParticlesCollisionType p_type) {
 	collision = RS::get_singleton()->particles_collision_create();
 	RS::get_singleton()->particles_collision_set_collision_type(collision, p_type);
 	set_base(collision);
@@ -90,7 +86,7 @@ AABB GPUParticlesCollisionSphere3D::get_aabb() const {
 }
 
 GPUParticlesCollisionSphere3D::GPUParticlesCollisionSphere3D() :
-		GPUParticlesCollision3D(RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE) {
+		GPUParticlesCollision3D(RS::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE) {
 }
 
 GPUParticlesCollisionSphere3D::~GPUParticlesCollisionSphere3D() {
@@ -138,7 +134,7 @@ AABB GPUParticlesCollisionBox3D::get_aabb() const {
 }
 
 GPUParticlesCollisionBox3D::GPUParticlesCollisionBox3D() :
-		GPUParticlesCollision3D(RSE::PARTICLES_COLLISION_TYPE_BOX_COLLIDE) {
+		GPUParticlesCollision3D(RS::PARTICLES_COLLISION_TYPE_BOX_COLLIDE) {
 }
 
 GPUParticlesCollisionBox3D::~GPUParticlesCollisionBox3D() {
@@ -559,7 +555,7 @@ void GPUParticlesCollisionSDF3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "resolution", PROPERTY_HINT_ENUM, "16,32,64,128,256,512"), "set_resolution", "get_resolution");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "thickness", PROPERTY_HINT_RANGE, "0.0,2.0,0.01,suffix:m"), "set_thickness", "get_thickness");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "bake_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_bake_mask", "get_bake_mask");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture3D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture3D"), "set_texture", "get_texture");
 
 	BIND_ENUM_CONSTANT(RESOLUTION_16);
 	BIND_ENUM_CONSTANT(RESOLUTION_32);
@@ -659,7 +655,7 @@ GPUParticlesCollisionSDF3D::BakeStepFunc GPUParticlesCollisionSDF3D::bake_step_f
 GPUParticlesCollisionSDF3D::BakeEndFunc GPUParticlesCollisionSDF3D::bake_end_function = nullptr;
 
 GPUParticlesCollisionSDF3D::GPUParticlesCollisionSDF3D() :
-		GPUParticlesCollision3D(RSE::PARTICLES_COLLISION_TYPE_SDF_COLLIDE) {
+		GPUParticlesCollision3D(RS::PARTICLES_COLLISION_TYPE_SDF_COLLIDE) {
 }
 
 GPUParticlesCollisionSDF3D::~GPUParticlesCollisionSDF3D() {
@@ -783,7 +779,7 @@ Vector3 GPUParticlesCollisionHeightField3D::get_size() const {
 
 void GPUParticlesCollisionHeightField3D::set_resolution(Resolution p_resolution) {
 	resolution = p_resolution;
-	RS::get_singleton()->particles_collision_set_height_field_resolution(_get_collision(), RSE::ParticlesCollisionHeightfieldResolution(resolution));
+	RS::get_singleton()->particles_collision_set_height_field_resolution(_get_collision(), RS::ParticlesCollisionHeightfieldResolution(resolution));
 	update_gizmos();
 	RS::get_singleton()->particles_collision_height_field_update(_get_collision());
 }
@@ -842,7 +838,7 @@ AABB GPUParticlesCollisionHeightField3D::get_aabb() const {
 }
 
 GPUParticlesCollisionHeightField3D::GPUParticlesCollisionHeightField3D() :
-		GPUParticlesCollision3D(RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE) {
+		GPUParticlesCollision3D(RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE) {
 }
 
 GPUParticlesCollisionHeightField3D::~GPUParticlesCollisionHeightField3D() {
@@ -907,7 +903,7 @@ void GPUParticlesAttractor3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask");
 }
 
-GPUParticlesAttractor3D::GPUParticlesAttractor3D(RSE::ParticlesCollisionType p_type) {
+GPUParticlesAttractor3D::GPUParticlesAttractor3D(RS::ParticlesCollisionType p_type) {
 	collision = RS::get_singleton()->particles_collision_create();
 	RS::get_singleton()->particles_collision_set_collision_type(collision, p_type);
 	set_base(collision);
@@ -941,7 +937,7 @@ AABB GPUParticlesAttractorSphere3D::get_aabb() const {
 }
 
 GPUParticlesAttractorSphere3D::GPUParticlesAttractorSphere3D() :
-		GPUParticlesAttractor3D(RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT) {
+		GPUParticlesAttractor3D(RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT) {
 }
 
 GPUParticlesAttractorSphere3D::~GPUParticlesAttractorSphere3D() {
@@ -989,7 +985,7 @@ AABB GPUParticlesAttractorBox3D::get_aabb() const {
 }
 
 GPUParticlesAttractorBox3D::GPUParticlesAttractorBox3D() :
-		GPUParticlesAttractor3D(RSE::PARTICLES_COLLISION_TYPE_BOX_ATTRACT) {
+		GPUParticlesAttractor3D(RS::PARTICLES_COLLISION_TYPE_BOX_ATTRACT) {
 }
 
 GPUParticlesAttractorBox3D::~GPUParticlesAttractorBox3D() {
@@ -1005,7 +1001,7 @@ void GPUParticlesAttractorVectorField3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_texture"), &GPUParticlesAttractorVectorField3D::get_texture);
 
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "size", PROPERTY_HINT_RANGE, "0.01,1024,0.01,or_greater,suffix:m"), "set_size", "get_size");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture3D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture3D"), "set_texture", "get_texture");
 }
 
 #ifndef DISABLE_DEPRECATED
@@ -1051,7 +1047,7 @@ AABB GPUParticlesAttractorVectorField3D::get_aabb() const {
 }
 
 GPUParticlesAttractorVectorField3D::GPUParticlesAttractorVectorField3D() :
-		GPUParticlesAttractor3D(RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
+		GPUParticlesAttractor3D(RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
 }
 
 GPUParticlesAttractorVectorField3D::~GPUParticlesAttractorVectorField3D() {
diff --git a/engine/scene/3d/gpu_particles_collision_3d.h b/engine/scene/3d/gpu_particles_collision_3d.h
index 588985b7..59636bce 100644
--- a/engine/scene/3d/gpu_particles_collision_3d.h
+++ b/engine/scene/3d/gpu_particles_collision_3d.h
@@ -33,8 +33,6 @@
 #include "core/templates/local_vector.h"
 #include "scene/3d/visual_instance_3d.h"
 
-class Mesh;
-
 class GPUParticlesCollision3D : public VisualInstance3D {
 	GDCLASS(GPUParticlesCollision3D, VisualInstance3D);
 
@@ -45,7 +43,7 @@ protected:
 	_FORCE_INLINE_ RID _get_collision() { return collision; }
 	static void _bind_methods();
 
-	GPUParticlesCollision3D(RSE::ParticlesCollisionType p_type);
+	GPUParticlesCollision3D(RS::ParticlesCollisionType p_type);
 
 public:
 	void set_cull_mask(uint32_t p_cull_mask);
@@ -282,7 +280,7 @@ protected:
 	_FORCE_INLINE_ RID _get_collision() { return collision; }
 	static void _bind_methods();
 
-	GPUParticlesAttractor3D(RSE::ParticlesCollisionType p_type);
+	GPUParticlesAttractor3D(RS::ParticlesCollisionType p_type);
 
 public:
 	void set_cull_mask(uint32_t p_cull_mask);
diff --git a/engine/scene/3d/ik_modifier_3d.cpp b/engine/scene/3d/ik_modifier_3d.cpp
index 17bc3126..a0b36929 100644
--- a/engine/scene/3d/ik_modifier_3d.cpp
+++ b/engine/scene/3d/ik_modifier_3d.cpp
@@ -30,10 +30,6 @@
 
 #include "ik_modifier_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 void IKModifier3D::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
diff --git a/engine/scene/3d/importer_mesh_instance_3d.cpp b/engine/scene/3d/importer_mesh_instance_3d.cpp
index 85ee6133..ad44c9e5 100644
--- a/engine/scene/3d/importer_mesh_instance_3d.cpp
+++ b/engine/scene/3d/importer_mesh_instance_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "importer_mesh_instance_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/importer_mesh.h"
 
 void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) {
@@ -162,8 +161,8 @@ void ImporterMeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_visibility_range_fade_mode", "mode"), &ImporterMeshInstance3D::set_visibility_range_fade_mode);
 	ClassDB::bind_method(D_METHOD("get_visibility_range_fade_mode"), &ImporterMeshInstance3D::get_visibility_range_fade_mode);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, ImporterMesh::get_class_static()), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, Skin::get_class_static()), "set_skin", "get_skin");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "ImporterMesh"), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton_path", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "layer_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_layer_mask", "get_layer_mask");
 
diff --git a/engine/scene/3d/iterate_ik_3d.cpp b/engine/scene/3d/iterate_ik_3d.cpp
index 639858f9..434e3370 100644
--- a/engine/scene/3d/iterate_ik_3d.cpp
+++ b/engine/scene/3d/iterate_ik_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "iterate_ik_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 bool IterateIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -122,7 +119,7 @@ void IterateIK3D::_get_property_list(List<PropertyInfo> *p_list) const {
 			String joint_path = path + "joints/" + itos(j) + "/";
 			props.push_back(PropertyInfo(Variant::INT, joint_path + "rotation_axis", PROPERTY_HINT_ENUM, SkeletonModifier3D::get_hint_rotation_axis()));
 			props.push_back(PropertyInfo(Variant::VECTOR3, joint_path + "rotation_axis_vector"));
-			props.push_back(PropertyInfo(Variant::OBJECT, joint_path + "limitation", PROPERTY_HINT_RESOURCE_TYPE, JointLimitation3D::get_class_static()));
+			props.push_back(PropertyInfo(Variant::OBJECT, joint_path + "limitation", PROPERTY_HINT_RESOURCE_TYPE, "JointLimitation3D"));
 			props.push_back(PropertyInfo(Variant::INT, joint_path + "limitation/right_axis", PROPERTY_HINT_ENUM, SkeletonModifier3D::get_hint_secondary_direction()));
 			props.push_back(PropertyInfo(Variant::VECTOR3, joint_path + "limitation/right_axis_vector"));
 			props.push_back(PropertyInfo(Variant::QUATERNION, joint_path + "limitation/rotation_offset"));
@@ -206,9 +203,6 @@ bool IterateIK3D::is_deterministic() const {
 void IterateIK3D::set_target_node(int p_index, const NodePath &p_node_path) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	iterate_settings[p_index]->target_node = p_node_path;
-	if (should_check_node_path() && !p_node_path.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_node_path))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Target node '" + String(p_node_path) + "' not found.");
-	}
 	update_configuration_warnings();
 }
 
diff --git a/engine/scene/3d/iterate_ik_3d.h b/engine/scene/3d/iterate_ik_3d.h
index fba418c3..50c075cf 100644
--- a/engine/scene/3d/iterate_ik_3d.h
+++ b/engine/scene/3d/iterate_ik_3d.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/chain_ik_3d.h"
+
 #include "scene/resources/3d/joint_limitation_3d.h"
 
 class IterateIK3D : public ChainIK3D {
diff --git a/engine/scene/3d/label_3d.cpp b/engine/scene/3d/label_3d.cpp
index 141d150d..a55b9dc9 100644
--- a/engine/scene/3d/label_3d.cpp
+++ b/engine/scene/3d/label_3d.cpp
@@ -30,14 +30,10 @@
 
 #include "label_3d.h"
 
-#include "core/config/engine.h"
-#include "core/math/triangle_mesh.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/window.h"
+#include "scene/resources/mesh.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
-#include "servers/rendering/rendering_server.h"
 
 void Label3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_horizontal_alignment", "alignment"), &Label3D::set_horizontal_alignment);
@@ -147,14 +143,14 @@ void Label3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "alpha_antialiasing_mode", PROPERTY_HINT_ENUM, "Disabled,Alpha Edge Blend,Alpha Edge Clip"), "set_alpha_antialiasing", "get_alpha_antialiasing");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "alpha_antialiasing_edge", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_alpha_antialiasing_edge", "get_alpha_antialiasing_edge");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Nearest Mipmap,Linear Mipmap,Nearest Mipmap Anisotropic,Linear Mipmap Anisotropic"), "set_texture_filter", "get_texture_filter");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RSE::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RSE::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "outline_render_priority", PROPERTY_HINT_RANGE, itos(RSE::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RSE::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_outline_render_priority", "get_outline_render_priority");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RS::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RS::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "outline_render_priority", PROPERTY_HINT_RANGE, itos(RS::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RS::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_outline_render_priority", "get_outline_render_priority");
 
 	ADD_GROUP("Text", "");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate"), "set_modulate", "get_modulate");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "outline_modulate"), "set_outline_modulate", "get_outline_modulate");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT, ""), "set_text", "get_text");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static()), "set_font", "get_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_font", "get_font");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "font_size", PROPERTY_HINT_RANGE, "1,256,1,or_greater,suffix:px"), "set_font_size", "get_font_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "outline_size", PROPERTY_HINT_RANGE, "0,127,1,suffix:px"), "set_outline_size", "get_outline_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
@@ -195,7 +191,9 @@ void Label3D::_validate_property(PropertyInfo &p_property) const {
 			p_property.name == "gi_mode" ||
 			p_property.name == "gi_lightmap_scale") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-	} else if (p_property.name == "cast_shadow" && alpha_cut == ALPHA_CUT_DISABLED) {
+	}
+
+	if (p_property.name == "cast_shadow" && alpha_cut == ALPHA_CUT_DISABLED) {
 		// Alpha-blended materials can't cast shadows.
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
@@ -644,16 +642,16 @@ void Label3D::_shape() {
 
 	for (const KeyValue<SurfaceKey, SurfaceData> &E : surfaces) {
 		Array mesh_array;
-		mesh_array.resize(RSE::ARRAY_MAX);
-		mesh_array[RSE::ARRAY_VERTEX] = E.value.mesh_vertices;
-		mesh_array[RSE::ARRAY_NORMAL] = E.value.mesh_normals;
-		mesh_array[RSE::ARRAY_TANGENT] = E.value.mesh_tangents;
-		mesh_array[RSE::ARRAY_COLOR] = E.value.mesh_colors;
-		mesh_array[RSE::ARRAY_TEX_UV] = E.value.mesh_uvs;
-		mesh_array[RSE::ARRAY_INDEX] = E.value.indices;
+		mesh_array.resize(RS::ARRAY_MAX);
+		mesh_array[RS::ARRAY_VERTEX] = E.value.mesh_vertices;
+		mesh_array[RS::ARRAY_NORMAL] = E.value.mesh_normals;
+		mesh_array[RS::ARRAY_TANGENT] = E.value.mesh_tangents;
+		mesh_array[RS::ARRAY_COLOR] = E.value.mesh_colors;
+		mesh_array[RS::ARRAY_TEX_UV] = E.value.mesh_uvs;
+		mesh_array[RS::ARRAY_INDEX] = E.value.indices;
 
-		RenderingServerTypes::SurfaceData sd;
-		RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RSE::PRIMITIVE_TRIANGLES, mesh_array);
+		RS::SurfaceData sd;
+		RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RS::PRIMITIVE_TRIANGLES, mesh_array);
 
 		sd.material = E.value.material;
 
@@ -765,7 +763,7 @@ bool Label3D::is_uppercase() const {
 }
 
 void Label3D::set_render_priority(int p_priority) {
-	ERR_FAIL_COND(p_priority < RSE::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RSE::MATERIAL_RENDER_PRIORITY_MAX);
+	ERR_FAIL_COND(p_priority < RS::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RS::MATERIAL_RENDER_PRIORITY_MAX);
 	if (render_priority != p_priority) {
 		render_priority = p_priority;
 		_queue_update();
@@ -777,7 +775,7 @@ int Label3D::get_render_priority() const {
 }
 
 void Label3D::set_outline_render_priority(int p_priority) {
-	ERR_FAIL_COND(p_priority < RSE::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RSE::MATERIAL_RENDER_PRIORITY_MAX);
+	ERR_FAIL_COND(p_priority < RS::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RS::MATERIAL_RENDER_PRIORITY_MAX);
 	if (outline_render_priority != p_priority) {
 		outline_render_priority = p_priority;
 		_queue_update();
diff --git a/engine/scene/3d/label_3d.h b/engine/scene/3d/label_3d.h
index 340ffb75..29d0cace 100644
--- a/engine/scene/3d/label_3d.h
+++ b/engine/scene/3d/label_3d.h
@@ -32,7 +32,7 @@
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/font.h"
-#include "scene/resources/material.h"
+
 #include "servers/text/text_server.h"
 
 class Label3D : public GeometryInstance3D {
diff --git a/engine/scene/3d/light_3d.cpp b/engine/scene/3d/light_3d.cpp
index e68f98d5..2f7d55fc 100644
--- a/engine/scene/3d/light_3d.cpp
+++ b/engine/scene/3d/light_3d.cpp
@@ -30,18 +30,13 @@
 
 #include "light_3d.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
 
 void Light3D::set_param(Param p_param, real_t p_value) {
 	ERR_FAIL_INDEX(p_param, PARAM_MAX);
 	param[p_param] = p_value;
 
-	RS::get_singleton()->light_set_param(light, RSE::LightParam(p_param), p_value);
+	RS::get_singleton()->light_set_param(light, RS::LightParam(p_param), p_value);
 
 	if (p_param == PARAM_SPOT_ANGLE || p_param == PARAM_RANGE) {
 		update_gizmos();
@@ -160,13 +155,13 @@ uint32_t Light3D::get_shadow_caster_mask() const {
 }
 
 AABB Light3D::get_aabb() const {
-	if (type == RSE::LIGHT_DIRECTIONAL) {
+	if (type == RenderingServer::LIGHT_DIRECTIONAL) {
 		return AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2));
 
-	} else if (type == RSE::LIGHT_OMNI) {
+	} else if (type == RenderingServer::LIGHT_OMNI) {
 		return AABB(Vector3(-1, -1, -1) * param[PARAM_RANGE], Vector3(2, 2, 2) * param[PARAM_RANGE]);
 
-	} else if (type == RSE::LIGHT_SPOT) {
+	} else if (type == RenderingServer::LIGHT_SPOT) {
 		real_t cone_slant_height = param[PARAM_RANGE];
 		real_t cone_angle_rad = Math::deg_to_rad(param[PARAM_SPOT_ANGLE]);
 
@@ -194,7 +189,7 @@ PackedStringArray Light3D::get_configuration_warnings() const {
 
 void Light3D::set_bake_mode(BakeMode p_mode) {
 	bake_mode = p_mode;
-	RS::get_singleton()->light_set_bake_mode(light, RSE::LightBakeMode(p_mode));
+	RS::get_singleton()->light_set_bake_mode(light, RS::LightBakeMode(p_mode));
 }
 
 Light3D::BakeMode Light3D::get_bake_mode() const {
@@ -327,12 +322,14 @@ bool Light3D::is_editor_only() const {
 }
 
 void Light3D::_validate_property(PropertyInfo &p_property) const {
-	if (get_light_type() != RSE::LIGHT_DIRECTIONAL && (p_property.name == "light_angular_distance" || p_property.name == "light_intensity_lux")) {
+	if (get_light_type() != RS::LIGHT_DIRECTIONAL && (p_property.name == "light_angular_distance" || p_property.name == "light_intensity_lux")) {
 		// Angular distance and Light Intensity Lux are only used in DirectionalLight3D.
 		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (get_light_type() == RSE::LIGHT_DIRECTIONAL && p_property.name == "light_intensity_lumens") {
+	} else if (get_light_type() == RS::LIGHT_DIRECTIONAL && p_property.name == "light_intensity_lumens") {
 		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (!GLOBAL_GET_CACHED(bool, "rendering/lights_and_shadows/use_physical_light_units") && (p_property.name == "light_intensity_lumens" || p_property.name == "light_intensity_lux" || p_property.name == "light_temperature")) {
+	}
+
+	if (!GLOBAL_GET_CACHED(bool, "rendering/lights_and_shadows/use_physical_light_units") && (p_property.name == "light_intensity_lumens" || p_property.name == "light_intensity_lux" || p_property.name == "light_temperature")) {
 		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
@@ -450,16 +447,16 @@ void Light3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(BAKE_DYNAMIC);
 }
 
-Light3D::Light3D(RSE::LightType p_type) {
+Light3D::Light3D(RenderingServer::LightType p_type) {
 	type = p_type;
 	switch (p_type) {
-		case RSE::LIGHT_DIRECTIONAL:
+		case RS::LIGHT_DIRECTIONAL:
 			light = RenderingServer::get_singleton()->directional_light_create();
 			break;
-		case RSE::LIGHT_OMNI:
+		case RS::LIGHT_OMNI:
 			light = RenderingServer::get_singleton()->omni_light_create();
 			break;
-		case RSE::LIGHT_SPOT:
+		case RS::LIGHT_SPOT:
 			light = RenderingServer::get_singleton()->spot_light_create();
 			break;
 		default: {
@@ -517,7 +514,7 @@ Light3D::~Light3D() {
 
 void DirectionalLight3D::set_shadow_mode(ShadowMode p_mode) {
 	shadow_mode = p_mode;
-	RS::get_singleton()->light_directional_set_shadow_mode(light, RSE::LightDirectionalShadowMode(p_mode));
+	RS::get_singleton()->light_directional_set_shadow_mode(light, RS::LightDirectionalShadowMode(p_mode));
 	notify_property_list_changed();
 }
 
@@ -536,7 +533,7 @@ bool DirectionalLight3D::is_blend_splits_enabled() const {
 
 void DirectionalLight3D::set_sky_mode(SkyMode p_mode) {
 	sky_mode = p_mode;
-	RS::get_singleton()->light_directional_set_sky_mode(light, RSE::LightDirectionalSkyMode(p_mode));
+	RS::get_singleton()->light_directional_set_sky_mode(light, RS::LightDirectionalSkyMode(p_mode));
 }
 
 DirectionalLight3D::SkyMode DirectionalLight3D::get_sky_mode() const {
@@ -558,7 +555,9 @@ void DirectionalLight3D::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name == "light_size" || p_property.name == "light_projector") {
 		// Not implemented in DirectionalLight3D (`light_size` is replaced by `light_angular_distance`).
 		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (p_property.name == "distance_fade_enabled" || p_property.name == "distance_fade_begin" || p_property.name == "distance_fade_shadow" || p_property.name == "distance_fade_length") {
+	}
+
+	if (p_property.name == "distance_fade_enabled" || p_property.name == "distance_fade_begin" || p_property.name == "distance_fade_shadow" || p_property.name == "distance_fade_length") {
 		// Not relevant for DirectionalLight3D, as the light LOD system only pertains to point lights.
 		// For DirectionalLight3D, `directional_shadow_max_distance` can be used instead.
 		p_property.usage = PROPERTY_USAGE_NONE;
@@ -597,7 +596,7 @@ void DirectionalLight3D::_bind_methods() {
 }
 
 DirectionalLight3D::DirectionalLight3D() :
-		Light3D(RSE::LIGHT_DIRECTIONAL) {
+		Light3D(RenderingServer::LIGHT_DIRECTIONAL) {
 	set_param(PARAM_SHADOW_MAX_DISTANCE, 100);
 	set_param(PARAM_SHADOW_FADE_START, 0.8);
 	// Increase the default shadow normal bias to better suit most scenes.
@@ -611,7 +610,7 @@ DirectionalLight3D::DirectionalLight3D() :
 
 void OmniLight3D::set_shadow_mode(ShadowMode p_mode) {
 	shadow_mode = p_mode;
-	RS::get_singleton()->light_omni_set_shadow_mode(light, RSE::LightOmniShadowMode(p_mode));
+	RS::get_singleton()->light_omni_set_shadow_mode(light, RS::LightOmniShadowMode(p_mode));
 }
 
 OmniLight3D::ShadowMode OmniLight3D::get_shadow_mode() const {
@@ -646,7 +645,7 @@ void OmniLight3D::_bind_methods() {
 }
 
 OmniLight3D::OmniLight3D() :
-		Light3D(RSE::LIGHT_OMNI) {
+		Light3D(RenderingServer::LIGHT_OMNI) {
 	set_shadow_mode(SHADOW_CUBE);
 }
 
@@ -677,7 +676,7 @@ void SpotLight3D::_bind_methods() {
 }
 
 SpotLight3D::SpotLight3D() :
-		Light3D(RSE::LIGHT_SPOT) {
+		Light3D(RenderingServer::LIGHT_SPOT) {
 	// Decrease the default shadow bias to better suit most scenes.
 	set_param(PARAM_SHADOW_BIAS, 0.03);
 }
diff --git a/engine/scene/3d/light_3d.h b/engine/scene/3d/light_3d.h
index 84cb6ac4..d412350c 100644
--- a/engine/scene/3d/light_3d.h
+++ b/engine/scene/3d/light_3d.h
@@ -37,28 +37,28 @@ class Light3D : public VisualInstance3D {
 
 public:
 	enum Param {
-		PARAM_ENERGY = RSE::LIGHT_PARAM_ENERGY,
-		PARAM_INDIRECT_ENERGY = RSE::LIGHT_PARAM_INDIRECT_ENERGY,
-		PARAM_VOLUMETRIC_FOG_ENERGY = RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY,
-		PARAM_SPECULAR = RSE::LIGHT_PARAM_SPECULAR,
-		PARAM_RANGE = RSE::LIGHT_PARAM_RANGE,
-		PARAM_SIZE = RSE::LIGHT_PARAM_SIZE,
-		PARAM_ATTENUATION = RSE::LIGHT_PARAM_ATTENUATION,
-		PARAM_SPOT_ANGLE = RSE::LIGHT_PARAM_SPOT_ANGLE,
-		PARAM_SPOT_ATTENUATION = RSE::LIGHT_PARAM_SPOT_ATTENUATION,
-		PARAM_SHADOW_MAX_DISTANCE = RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE,
-		PARAM_SHADOW_SPLIT_1_OFFSET = RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
-		PARAM_SHADOW_SPLIT_2_OFFSET = RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
-		PARAM_SHADOW_SPLIT_3_OFFSET = RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET,
-		PARAM_SHADOW_FADE_START = RSE::LIGHT_PARAM_SHADOW_FADE_START,
-		PARAM_SHADOW_NORMAL_BIAS = RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS,
-		PARAM_SHADOW_BIAS = RSE::LIGHT_PARAM_SHADOW_BIAS,
-		PARAM_SHADOW_PANCAKE_SIZE = RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
-		PARAM_SHADOW_OPACITY = RSE::LIGHT_PARAM_SHADOW_OPACITY,
-		PARAM_SHADOW_BLUR = RSE::LIGHT_PARAM_SHADOW_BLUR,
-		PARAM_TRANSMITTANCE_BIAS = RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS,
-		PARAM_INTENSITY = RSE::LIGHT_PARAM_INTENSITY,
-		PARAM_MAX = RSE::LIGHT_PARAM_MAX
+		PARAM_ENERGY = RS::LIGHT_PARAM_ENERGY,
+		PARAM_INDIRECT_ENERGY = RS::LIGHT_PARAM_INDIRECT_ENERGY,
+		PARAM_VOLUMETRIC_FOG_ENERGY = RS::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY,
+		PARAM_SPECULAR = RS::LIGHT_PARAM_SPECULAR,
+		PARAM_RANGE = RS::LIGHT_PARAM_RANGE,
+		PARAM_SIZE = RS::LIGHT_PARAM_SIZE,
+		PARAM_ATTENUATION = RS::LIGHT_PARAM_ATTENUATION,
+		PARAM_SPOT_ANGLE = RS::LIGHT_PARAM_SPOT_ANGLE,
+		PARAM_SPOT_ATTENUATION = RS::LIGHT_PARAM_SPOT_ATTENUATION,
+		PARAM_SHADOW_MAX_DISTANCE = RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE,
+		PARAM_SHADOW_SPLIT_1_OFFSET = RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
+		PARAM_SHADOW_SPLIT_2_OFFSET = RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
+		PARAM_SHADOW_SPLIT_3_OFFSET = RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET,
+		PARAM_SHADOW_FADE_START = RS::LIGHT_PARAM_SHADOW_FADE_START,
+		PARAM_SHADOW_NORMAL_BIAS = RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS,
+		PARAM_SHADOW_BIAS = RS::LIGHT_PARAM_SHADOW_BIAS,
+		PARAM_SHADOW_PANCAKE_SIZE = RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
+		PARAM_SHADOW_OPACITY = RS::LIGHT_PARAM_SHADOW_OPACITY,
+		PARAM_SHADOW_BLUR = RS::LIGHT_PARAM_SHADOW_BLUR,
+		PARAM_TRANSMITTANCE_BIAS = RS::LIGHT_PARAM_TRANSMITTANCE_BIAS,
+		PARAM_INTENSITY = RS::LIGHT_PARAM_INTENSITY,
+		PARAM_MAX = RS::LIGHT_PARAM_MAX
 	};
 
 	enum BakeMode {
@@ -79,7 +79,7 @@ private:
 	real_t distance_fade_begin = 40.0;
 	real_t distance_fade_shadow = 50.0;
 	real_t distance_fade_length = 10.0;
-	RSE::LightType type = RSE::LIGHT_DIRECTIONAL;
+	RS::LightType type = RenderingServer::LIGHT_DIRECTIONAL;
 	bool editor_only = false;
 	void _update_visibility();
 	BakeMode bake_mode = BAKE_DYNAMIC;
@@ -98,10 +98,10 @@ protected:
 	void _notification(int p_what);
 	void _validate_property(PropertyInfo &p_property) const;
 
-	Light3D(RSE::LightType p_type);
+	Light3D(RenderingServer::LightType p_type);
 
 public:
-	RSE::LightType get_light_type() const { return type; }
+	RS::LightType get_light_type() const { return type; }
 
 	void set_editor_only(bool p_editor_only);
 	bool is_editor_only() const;
diff --git a/engine/scene/3d/lightmap_gi.cpp b/engine/scene/3d/lightmap_gi.cpp
index 176d5c4e..b48cdd8f 100644
--- a/engine/scene/3d/lightmap_gi.cpp
+++ b/engine/scene/3d/lightmap_gi.cpp
@@ -30,33 +30,18 @@
 
 #include "lightmap_gi.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/math/delaunay_3d.h"
-#include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
 #include "core/object/object.h"
-#include "scene/3d/light_3d.h"
 #include "scene/3d/lightmap_probe.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/sky.h"
-#include "servers/rendering/rendering_server.h"
 
-#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For lightmapper_rd.
-
-#ifdef MODULE_LIGHTMAPPER_RD_ENABLED
-#include "servers/display/display_server.h"
-#endif
-
-#if defined(ANDROID_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
-#include "core/os/os.h"
-#endif
+#include "modules/modules_enabled.gen.h" // For lightmapper_rd.
 
 void LightmapGIData::add_user(const NodePath &p_path, const Rect2 &p_uv_scale, int p_slice_index, int32_t p_sub_instance) {
 	User user;
@@ -227,7 +212,7 @@ bool LightmapGIData::_is_using_packed_directional() const {
 }
 
 void LightmapGIData::update_shadowmask_mode(ShadowmaskMode p_mode) {
-	RS::get_singleton()->lightmap_set_shadowmask_mode(lightmap, (RSE::ShadowmaskMode)p_mode);
+	RS::get_singleton()->lightmap_set_shadowmask_mode(lightmap, (RS::ShadowmaskMode)p_mode);
 }
 
 LightmapGIData::ShadowmaskMode LightmapGIData::get_shadowmask_mode() const {
@@ -376,7 +361,7 @@ void LightmapGIData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_set_light_textures_data", "data"), &LightmapGIData::_set_light_textures_data);
 	ClassDB::bind_method(D_METHOD("_get_light_textures_data"), &LightmapGIData::_get_light_textures_data);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "light_texture", PROPERTY_HINT_RESOURCE_TYPE, TextureLayered::get_class_static(), PROPERTY_USAGE_NONE), "set_light_texture", "get_light_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "light_texture", PROPERTY_HINT_RESOURCE_TYPE, "TextureLayered", PROPERTY_USAGE_NONE), "set_light_texture", "get_light_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "light_textures", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_INTERNAL), "_set_light_textures_data", "_get_light_textures_data");
 #endif
 
@@ -976,8 +961,8 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 
 			ERR_FAIL_COND_V(images.is_empty(), BAKE_ERROR_CANT_CREATE_IMAGE);
 
-			Ref<Image> albedo = images[RSE::BAKE_CHANNEL_ALBEDO_ALPHA];
-			Ref<Image> orm = images[RSE::BAKE_CHANNEL_ORM];
+			Ref<Image> albedo = images[RS::BAKE_CHANNEL_ALBEDO_ALPHA];
+			Ref<Image> orm = images[RS::BAKE_CHANNEL_ORM];
 
 			//multiply albedo by metal
 
@@ -1020,7 +1005,7 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 				md.albedo_on_uv2->set_data(lightmap_size.width, lightmap_size.height, false, Image::FORMAT_RGBA8, albedom);
 			}
 
-			md.emission_on_uv2 = images[RSE::BAKE_CHANNEL_EMISSION];
+			md.emission_on_uv2 = images[RS::BAKE_CHANNEL_EMISSION];
 			if (md.emission_on_uv2->get_format() != Image::FORMAT_RGBAH) {
 				md.emission_on_uv2->convert(Image::FORMAT_RGBAH);
 			}
@@ -1841,30 +1826,23 @@ void LightmapGI::_validate_property(PropertyInfo &p_property) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-	if (p_property.name == "supersampling_factor") {
-		if (!supersampling_enabled) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "environment_custom_sky") {
-		if (environment_mode != ENVIRONMENT_MODE_CUSTOM_SKY) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "environment_custom_color") {
-		if (environment_mode != ENVIRONMENT_MODE_CUSTOM_COLOR) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "environment_custom_energy") {
-		if (environment_mode != ENVIRONMENT_MODE_CUSTOM_COLOR && environment_mode != ENVIRONMENT_MODE_CUSTOM_SKY) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "denoiser_strength") {
-		if (!use_denoiser) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "denoiser_range") {
-		if (!use_denoiser) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
+	if (p_property.name == "supersampling_factor" && !supersampling_enabled) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+	if (p_property.name == "environment_custom_sky" && environment_mode != ENVIRONMENT_MODE_CUSTOM_SKY) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+	if (p_property.name == "environment_custom_color" && environment_mode != ENVIRONMENT_MODE_CUSTOM_COLOR) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+	if (p_property.name == "environment_custom_energy" && environment_mode != ENVIRONMENT_MODE_CUSTOM_COLOR && environment_mode != ENVIRONMENT_MODE_CUSTOM_SKY) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+	if (p_property.name == "denoiser_strength" && !use_denoiser) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
+	if (p_property.name == "denoiser_range" && !use_denoiser) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
 
@@ -1955,14 +1933,14 @@ void LightmapGI::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "max_texture_size", PROPERTY_HINT_RANGE, "2048,16384,1"), "set_max_texture_size", "get_max_texture_size");
 	ADD_GROUP("Environment", "environment_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "environment_mode", PROPERTY_HINT_ENUM, "Disabled,Scene,Custom Sky,Custom Color"), "set_environment_mode", "get_environment_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment_custom_sky", PROPERTY_HINT_RESOURCE_TYPE, Sky::get_class_static()), "set_environment_custom_sky", "get_environment_custom_sky");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment_custom_sky", PROPERTY_HINT_RESOURCE_TYPE, "Sky"), "set_environment_custom_sky", "get_environment_custom_sky");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "environment_custom_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_environment_custom_color", "get_environment_custom_color");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "environment_custom_energy", PROPERTY_HINT_RANGE, "0,64,0.01"), "set_environment_custom_energy", "get_environment_custom_energy");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_camera_attributes", "get_camera_attributes");
 	ADD_GROUP("Gen Probes", "generate_probes_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "generate_probes_subdiv", PROPERTY_HINT_ENUM, "Disabled,4,8,16,32"), "set_generate_probes", "get_generate_probes");
 	ADD_GROUP("Data", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "light_data", PROPERTY_HINT_RESOURCE_TYPE, LightmapGIData::get_class_static()), "set_light_data", "get_light_data");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "light_data", PROPERTY_HINT_RESOURCE_TYPE, "LightmapGIData"), "set_light_data", "get_light_data");
 
 	BIND_ENUM_CONSTANT(BAKE_QUALITY_LOW);
 	BIND_ENUM_CONSTANT(BAKE_QUALITY_MEDIUM);
diff --git a/engine/scene/3d/lightmap_gi.h b/engine/scene/3d/lightmap_gi.h
index 8555069d..c50cb7c4 100644
--- a/engine/scene/3d/lightmap_gi.h
+++ b/engine/scene/3d/lightmap_gi.h
@@ -30,15 +30,13 @@
 
 #pragma once
 
-#include "core/io/resource.h"
 #include "core/templates/local_vector.h"
+#include "scene/3d/light_3d.h"
 #include "scene/3d/lightmapper.h"
 #include "scene/3d/visual_instance_3d.h"
 
-class CameraAttributes;
-class Light3D;
-class Mesh;
 class Sky;
+class CameraAttributes;
 
 class LightmapGIData : public Resource {
 	GDCLASS(LightmapGIData, Resource);
diff --git a/engine/scene/3d/lightmapper.cpp b/engine/scene/3d/lightmapper.cpp
index 1e1571bc..0a71a730 100644
--- a/engine/scene/3d/lightmapper.cpp
+++ b/engine/scene/3d/lightmapper.cpp
@@ -30,7 +30,7 @@
 
 #include "lightmapper.h"
 
-Ref<LightmapDenoiser> (*LightmapDenoiser::create_function)() = nullptr;
+LightmapDenoiser *(*LightmapDenoiser::create_function)() = nullptr;
 
 Ref<LightmapDenoiser> LightmapDenoiser::create() {
 	if (create_function) {
@@ -39,7 +39,7 @@ Ref<LightmapDenoiser> LightmapDenoiser::create() {
 	return Ref<LightmapDenoiser>();
 }
 
-Ref<LightmapRaycaster> (*LightmapRaycaster::create_function)() = nullptr;
+LightmapRaycaster *(*LightmapRaycaster::create_function)() = nullptr;
 
 Ref<LightmapRaycaster> LightmapRaycaster::create() {
 	if (create_function) {
@@ -53,19 +53,19 @@ Lightmapper::CreateFunc Lightmapper::create_gpu = nullptr;
 Lightmapper::CreateFunc Lightmapper::create_cpu = nullptr;
 
 Ref<Lightmapper> Lightmapper::create() {
-	Ref<Lightmapper> lm;
+	Lightmapper *lm = nullptr;
 	if (create_custom) {
 		lm = create_custom();
 	}
 
-	if (lm.is_null() && create_gpu) {
+	if (!lm && create_gpu) {
 		lm = create_gpu();
 	}
 
-	if (lm.is_null() && create_cpu) {
+	if (!lm && create_cpu) {
 		lm = create_cpu();
 	}
-	if (lm.is_null()) {
+	if (!lm) {
 		return Ref<Lightmapper>();
 	} else {
 		return Ref<Lightmapper>(lm);
diff --git a/engine/scene/3d/lightmapper.h b/engine/scene/3d/lightmapper.h
index 3bc04454..99c1edc8 100644
--- a/engine/scene/3d/lightmapper.h
+++ b/engine/scene/3d/lightmapper.h
@@ -37,7 +37,7 @@ class Image;
 class LightmapDenoiser : public RefCounted {
 	GDCLASS(LightmapDenoiser, RefCounted)
 protected:
-	static Ref<LightmapDenoiser> (*create_function)();
+	static LightmapDenoiser *(*create_function)();
 
 public:
 	virtual Ref<Image> denoise_image(const Ref<Image> &p_image) = 0;
@@ -47,7 +47,7 @@ public:
 class LightmapRaycaster : public RefCounted {
 	GDCLASS(LightmapRaycaster, RefCounted)
 protected:
-	static Ref<LightmapRaycaster> (*create_function)();
+	static LightmapRaycaster *(*create_function)();
 
 public:
 	// Compatible with embree4 rays.
@@ -145,7 +145,7 @@ public:
 		BAKE_QUALITY_ULTRA,
 	};
 
-	typedef Ref<Lightmapper> (*CreateFunc)();
+	typedef Lightmapper *(*CreateFunc)();
 
 	static CreateFunc create_custom;
 	static CreateFunc create_gpu;
diff --git a/engine/scene/3d/limit_angular_velocity_modifier_3d.cpp b/engine/scene/3d/limit_angular_velocity_modifier_3d.cpp
index 915bebbf..e0dc3e94 100644
--- a/engine/scene/3d/limit_angular_velocity_modifier_3d.cpp
+++ b/engine/scene/3d/limit_angular_velocity_modifier_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "limit_angular_velocity_modifier_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 bool LimitAngularVelocityModifier3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -150,7 +147,7 @@ void LimitAngularVelocityModifier3D::set_root_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (chains[p_index].root_bone.bone <= -1 || chains[p_index].root_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Root bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Root bone index out of range!");
 			chains[p_index].root_bone.bone = -1;
 		} else {
 			chains[p_index].root_bone.name = sk->get_bone_name(chains[p_index].root_bone.bone);
@@ -187,7 +184,7 @@ void LimitAngularVelocityModifier3D::set_end_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (chains[p_index].end_bone.bone <= -1 || chains[p_index].end_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": End bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("End bone index out of range!");
 			chains[p_index].end_bone.bone = -1;
 		} else {
 			chains[p_index].end_bone.name = sk->get_bone_name(chains[p_index].end_bone.bone);
diff --git a/engine/scene/3d/look_at_modifier_3d.cpp b/engine/scene/3d/look_at_modifier_3d.cpp
index 7f98990e..05a3a913 100644
--- a/engine/scene/3d/look_at_modifier_3d.cpp
+++ b/engine/scene/3d/look_at_modifier_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "look_at_modifier_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/resources/animation.h"
 
 void LookAtModifier3D::_validate_property(PropertyInfo &p_property) const {
@@ -108,7 +106,7 @@ void LookAtModifier3D::set_bone(int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (bone <= -1 || bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Bone index out of range!");
 			bone = -1;
 		} else {
 			bone_name = sk->get_bone_name(bone);
@@ -159,9 +157,6 @@ void LookAtModifier3D::set_target_node(const NodePath &p_target_node) {
 	if (target_node != p_target_node) {
 		init_transition();
 	}
-	if (should_check_node_path() && !p_target_node.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_target_node))) {
-		WARN_PRINT_ED("Target node '" + String(p_target_node) + "' not found.");
-	}
 	target_node = p_target_node;
 }
 
@@ -197,7 +192,7 @@ void LookAtModifier3D::set_origin_bone(int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (origin_bone <= -1 || origin_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Origin bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Bone index out of range!");
 			origin_bone = -1;
 		} else {
 			origin_bone_name = sk->get_bone_name(origin_bone);
@@ -210,9 +205,6 @@ int LookAtModifier3D::get_origin_bone() const {
 }
 
 void LookAtModifier3D::set_origin_external_node(const NodePath &p_external_node) {
-	if (should_check_node_path() && !p_external_node.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_external_node))) {
-		WARN_PRINT_ED("Origin node '" + String(p_external_node) + "' not found.");
-	}
 	origin_external_node = p_external_node;
 }
 
diff --git a/engine/scene/3d/marker_3d.cpp b/engine/scene/3d/marker_3d.cpp
index a76f2991..565f383e 100644
--- a/engine/scene/3d/marker_3d.cpp
+++ b/engine/scene/3d/marker_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "marker_3d.h"
 
-#include "core/object/class_db.h"
-
 void Marker3D::set_gizmo_extents(real_t p_extents) {
 	if (Math::is_equal_approx(gizmo_extents, p_extents)) {
 		return;
diff --git a/engine/scene/3d/mesh_instance_3d.cpp b/engine/scene/3d/mesh_instance_3d.cpp
index 4b183bf7..e44c955a 100644
--- a/engine/scene/3d/mesh_instance_3d.cpp
+++ b/engine/scene/3d/mesh_instance_3d.cpp
@@ -30,11 +30,7 @@
 
 #include "mesh_instance_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
-#include "scene/main/scene_tree.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "scene/3d/physics/collision_shape_3d.h"
@@ -47,11 +43,7 @@
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#endif // NAVIGATION_3D_DISABLED
 
-#include <cfloat> // FLT_EPSILON
-
-#ifndef NAVIGATION_3D_DISABLED
 Callable MeshInstance3D::_navmesh_source_geometry_parsing_callback;
 RID MeshInstance3D::_navmesh_source_geometry_parser;
 #endif // NAVIGATION_3D_DISABLED
@@ -142,7 +134,6 @@ void MeshInstance3D::set_mesh(const Ref<Mesh> &p_mesh) {
 	}
 
 	notify_property_list_changed();
-	update_configuration_warnings();
 }
 
 Ref<Mesh> MeshInstance3D::get_mesh() const {
@@ -571,7 +562,7 @@ Ref<ArrayMesh> MeshInstance3D::bake_mesh_from_current_blend_shape_mix(Ref<ArrayM
 
 		const Array &source_mesh_arrays = source_mesh->surface_get_arrays(surface_index);
 
-		ERR_FAIL_COND_V(source_mesh_arrays.size() != RSE::ARRAY_MAX, Ref<ArrayMesh>());
+		ERR_FAIL_COND_V(source_mesh_arrays.size() != RS::ARRAY_MAX, Ref<ArrayMesh>());
 
 		const Vector<Vector3> &source_mesh_vertex_array = source_mesh_arrays[Mesh::ARRAY_VERTEX];
 		const Vector<Vector3> &source_mesh_normal_array = source_mesh_arrays[Mesh::ARRAY_NORMAL];
@@ -748,7 +739,7 @@ Ref<ArrayMesh> MeshInstance3D::bake_mesh_from_current_skeleton_pose(Ref<ArrayMes
 
 		const Array &source_mesh_arrays = source_mesh->surface_get_arrays(surface_index);
 
-		ERR_FAIL_COND_V(source_mesh_arrays.size() != RSE::ARRAY_MAX, Ref<ArrayMesh>());
+		ERR_FAIL_COND_V(source_mesh_arrays.size() != RS::ARRAY_MAX, Ref<ArrayMesh>());
 
 		const Vector<Vector3> &source_mesh_vertex_array = source_mesh_arrays[Mesh::ARRAY_VERTEX];
 		const Vector<Vector3> &source_mesh_normal_array = source_mesh_arrays[Mesh::ARRAY_NORMAL];
@@ -933,21 +924,13 @@ void MeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("bake_mesh_from_current_blend_shape_mix", "existing"), &MeshInstance3D::bake_mesh_from_current_blend_shape_mix, DEFVAL(Ref<ArrayMesh>()));
 	ClassDB::bind_method(D_METHOD("bake_mesh_from_current_skeleton_pose", "existing"), &MeshInstance3D::bake_mesh_from_current_skeleton_pose, DEFVAL(Ref<ArrayMesh>()));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
 	ADD_GROUP("Skeleton", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, Skin::get_class_static()), "set_skin", "get_skin");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton3D"), "set_skeleton_path", "get_skeleton_path");
 	ADD_GROUP("", "");
 }
 
-PackedStringArray MeshInstance3D::get_configuration_warnings() const {
-	PackedStringArray warnings = GeometryInstance3D::get_configuration_warnings();
-	if (mesh.is_null()) {
-		warnings.push_back(RTR("MeshInstance3D requires a Mesh to render anything. Please add a mesh resource for it!"));
-	}
-	return warnings;
-}
-
 MeshInstance3D::MeshInstance3D() {
 	_define_ancestry(AncestralClass::MESH_INSTANCE_3D);
 #ifndef DISABLE_DEPRECATED
@@ -956,3 +939,6 @@ MeshInstance3D::MeshInstance3D() {
 	}
 #endif
 }
+
+MeshInstance3D::~MeshInstance3D() {
+}
diff --git a/engine/scene/3d/mesh_instance_3d.h b/engine/scene/3d/mesh_instance_3d.h
index fdd9f80a..34a344da 100644
--- a/engine/scene/3d/mesh_instance_3d.h
+++ b/engine/scene/3d/mesh_instance_3d.h
@@ -132,7 +132,6 @@ public:
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
 #endif // NAVIGATION_3D_DISABLED
 
-	virtual PackedStringArray get_configuration_warnings() const override;
-
 	MeshInstance3D();
+	~MeshInstance3D();
 };
diff --git a/engine/scene/3d/modifier_bone_target_3d.cpp b/engine/scene/3d/modifier_bone_target_3d.cpp
index 59f62205..6539a4af 100644
--- a/engine/scene/3d/modifier_bone_target_3d.cpp
+++ b/engine/scene/3d/modifier_bone_target_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "modifier_bone_target_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 void ModifierBoneTarget3D::_validate_bone_names() {
 	// Prior bone name.
 	if (!bone_name.is_empty()) {
@@ -59,7 +56,7 @@ void ModifierBoneTarget3D::set_bone(int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (bone <= -1 || bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Bone index out of range!");
 			bone = -1;
 		} else {
 			bone_name = sk->get_bone_name(bone);
diff --git a/engine/scene/3d/multimesh_instance_3d.cpp b/engine/scene/3d/multimesh_instance_3d.cpp
index e257576c..d5589d33 100644
--- a/engine/scene/3d/multimesh_instance_3d.cpp
+++ b/engine/scene/3d/multimesh_instance_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "multimesh_instance_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 #ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
@@ -57,7 +54,7 @@ void MultiMeshInstance3D::_physics_interpolated_changed() {
 void MultiMeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_multimesh", "multimesh"), &MultiMeshInstance3D::set_multimesh);
 	ClassDB::bind_method(D_METHOD("get_multimesh"), &MultiMeshInstance3D::get_multimesh);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, MultiMesh::get_class_static()), "set_multimesh", "get_multimesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), "set_multimesh", "get_multimesh");
 }
 
 void MultiMeshInstance3D::_notification(int p_what) {
diff --git a/engine/scene/3d/navigation/navigation_agent_3d.cpp b/engine/scene/3d/navigation/navigation_agent_3d.cpp
index 90081118..f44c377f 100644
--- a/engine/scene/3d/navigation/navigation_agent_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_agent_3d.cpp
@@ -30,13 +30,8 @@
 
 #include "navigation_agent_3d.h"
 
-#include "core/math/geometry_3d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/navigation/navigation_link_3d.h"
-#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 void NavigationAgent3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationAgent3D::get_rid);
@@ -351,6 +346,7 @@ void NavigationAgent3D::_notification(int p_what) {
 void NavigationAgent3D::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name == "keep_y_velocity" && use_3d_avoidance) {
 		p_property.usage = PROPERTY_USAGE_NONE;
+		return;
 	}
 }
 
diff --git a/engine/scene/3d/navigation/navigation_agent_3d.h b/engine/scene/3d/navigation/navigation_agent_3d.h
index 7d6a5547..03a92b7b 100644
--- a/engine/scene/3d/navigation/navigation_agent_3d.h
+++ b/engine/scene/3d/navigation/navigation_agent_3d.h
@@ -35,7 +35,6 @@
 #include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
 #include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
-class ArrayMesh;
 class Node3D;
 class StandardMaterial3D;
 
diff --git a/engine/scene/3d/navigation/navigation_link_3d.cpp b/engine/scene/3d/navigation/navigation_link_3d.cpp
index baf64101..eb454c9f 100644
--- a/engine/scene/3d/navigation/navigation_link_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_link_3d.cpp
@@ -30,10 +30,7 @@
 
 #include "navigation_link_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifdef DEBUG_ENABLED
 void NavigationLink3D::_update_debug_mesh() {
diff --git a/engine/scene/3d/navigation/navigation_link_3d.h b/engine/scene/3d/navigation/navigation_link_3d.h
index 23aeadff..ff0c3712 100644
--- a/engine/scene/3d/navigation/navigation_link_3d.h
+++ b/engine/scene/3d/navigation/navigation_link_3d.h
@@ -32,8 +32,6 @@
 
 #include "scene/3d/node_3d.h"
 
-class ArrayMesh;
-
 class NavigationLink3D : public Node3D {
 	GDCLASS(NavigationLink3D, Node3D);
 
diff --git a/engine/scene/3d/navigation/navigation_obstacle_3d.cpp b/engine/scene/3d/navigation/navigation_obstacle_3d.cpp
index 7e988c63..f6a967d4 100644
--- a/engine/scene/3d/navigation/navigation_obstacle_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_obstacle_3d.cpp
@@ -30,15 +30,10 @@
 
 #include "navigation_obstacle_3d.h"
 
-#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 Callable NavigationObstacle3D::_navmesh_source_geometry_parsing_callback;
 RID NavigationObstacle3D::_navmesh_source_geometry_parser;
@@ -621,7 +616,7 @@ void NavigationObstacle3D::_update_fake_agent_radius_debug() {
 	face_mesh_array[Mesh::ARRAY_VERTEX] = face_vertex_array;
 	face_mesh_array[Mesh::ARRAY_INDEX] = face_indices_array;
 
-	rs->mesh_add_surface_from_arrays(fake_agent_radius_debug_mesh_rid, RSE::PRIMITIVE_TRIANGLES, face_mesh_array);
+	rs->mesh_add_surface_from_arrays(fake_agent_radius_debug_mesh_rid, RS::PRIMITIVE_TRIANGLES, face_mesh_array);
 
 	Ref<StandardMaterial3D> face_material = ns3d->get_debug_navigation_avoidance_obstacles_radius_material();
 	rs->instance_set_surface_override_material(fake_agent_radius_debug_instance_rid, 0, face_material->get_rid());
@@ -697,7 +692,7 @@ void NavigationObstacle3D::_update_static_obstacle_debug() {
 	edge_mesh_array.resize(Mesh::ARRAY_MAX);
 	edge_mesh_array[Mesh::ARRAY_VERTEX] = edge_vertex_array;
 
-	rs->mesh_add_surface_from_arrays(static_obstacle_debug_mesh_rid, RSE::PRIMITIVE_LINES, edge_mesh_array);
+	rs->mesh_add_surface_from_arrays(static_obstacle_debug_mesh_rid, RS::PRIMITIVE_LINES, edge_mesh_array);
 
 	Ref<StandardMaterial3D> edge_material;
 
diff --git a/engine/scene/3d/navigation/navigation_region_3d.cpp b/engine/scene/3d/navigation/navigation_region_3d.cpp
index 50b13ffb..11869bd2 100644
--- a/engine/scene/3d/navigation/navigation_region_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_region_3d.cpp
@@ -30,13 +30,9 @@
 
 #include "navigation_region_3d.h"
 
-#include "core/config/engine.h"
 #include "core/math/random_pcg.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 RID NavigationRegion3D::get_rid() const {
 	return region;
@@ -299,7 +295,7 @@ void NavigationRegion3D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_bounds"), &NavigationRegion3D::get_bounds);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navigation_mesh", PROPERTY_HINT_RESOURCE_TYPE, NavigationMesh::get_class_static()), "set_navigation_mesh", "get_navigation_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "navigation_mesh", PROPERTY_HINT_RESOURCE_TYPE, "NavigationMesh"), "set_navigation_mesh", "get_navigation_mesh");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_edge_connections"), "set_use_edge_connections", "get_use_edge_connections");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "navigation_layers", PROPERTY_HINT_LAYERS_3D_NAVIGATION), "set_navigation_layers", "get_navigation_layers");
diff --git a/engine/scene/3d/node_3d.cpp b/engine/scene/3d/node_3d.cpp
index e055fd99..67cde94a 100644
--- a/engine/scene/3d/node_3d.cpp
+++ b/engine/scene/3d/node_3d.cpp
@@ -30,16 +30,10 @@
 
 #include "node_3d.h"
 
-#include "core/config/engine.h"
 #include "core/math/transform_interpolator.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "scene/property_utils.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 
 /*
 
@@ -128,11 +122,10 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) {
 #else
 	if (data.notify_transform && !data.ignore_notification && !xform_change.in_list()) {
 #endif
-		// SceneTree::xform_change_list is not thread safe to modify, and is read by the main thread when processings are done.
-		if (Thread::is_main_thread()) {
+		if (likely(is_accessible_from_caller_thread())) {
 			get_tree()->xform_change_list.add(&xform_change);
 		} else {
-			// For any threaded-processed node, add it to xform_change_list on the main thread in a deferred manner.
+			// This should very rarely happen, but if it does at least make sure the notification is received eventually.
 			callable_mp(this, &Node3D::_propagate_transform_changed_deferred).call_deferred();
 		}
 	}
@@ -145,7 +138,7 @@ void Node3D::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
@@ -1356,15 +1349,19 @@ NodePath Node3D::get_visibility_parent() const {
 
 void Node3D::_validate_property(PropertyInfo &p_property) const {
 	if (data.rotation_edit_mode != ROTATION_EDIT_MODE_BASIS && p_property.name == "basis") {
-		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (data.rotation_edit_mode == ROTATION_EDIT_MODE_BASIS && p_property.name == "scale") {
-		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_QUATERNION && p_property.name == "quaternion") {
-		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation") {
-		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation_order") {
-		p_property.usage = PROPERTY_USAGE_NONE;
+		p_property.usage = 0;
+	}
+	if (data.rotation_edit_mode == ROTATION_EDIT_MODE_BASIS && p_property.name == "scale") {
+		p_property.usage = 0;
+	}
+	if (data.rotation_edit_mode != ROTATION_EDIT_MODE_QUATERNION && p_property.name == "quaternion") {
+		p_property.usage = 0;
+	}
+	if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation") {
+		p_property.usage = 0;
+	}
+	if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation_order") {
+		p_property.usage = 0;
 	}
 }
 
diff --git a/engine/scene/3d/node_3d.h b/engine/scene/3d/node_3d.h
index 9f77c699..af7c53c9 100644
--- a/engine/scene/3d/node_3d.h
+++ b/engine/scene/3d/node_3d.h
@@ -174,7 +174,7 @@ private:
 	NodePath visibility_parent_path;
 
 	_FORCE_INLINE_ uint32_t _read_dirty_mask() const { return is_group_processing() ? data.dirty.mt.get() : data.dirty.st; }
-	_FORCE_INLINE_ bool _test_dirty_bits(uint32_t p_bits) const { return (is_group_processing() ? data.dirty.mt.get() : data.dirty.st) & p_bits; }
+	_FORCE_INLINE_ bool _test_dirty_bits(uint32_t p_bits) const { return is_group_processing() ? data.dirty.mt.bit_and(p_bits) : (data.dirty.st & p_bits); }
 	void _replace_dirty_mask(uint32_t p_mask) const;
 	void _set_dirty_bits(uint32_t p_bits) const;
 	void _clear_dirty_bits(uint32_t p_bits) const;
@@ -232,7 +232,7 @@ protected:
 
 public:
 	enum {
-		NOTIFICATION_TRANSFORM_CHANGED = 2000, // Keep in sync with SceneTree.
+		NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED,
 		NOTIFICATION_ENTER_WORLD = 41,
 		NOTIFICATION_EXIT_WORLD = 42,
 		NOTIFICATION_VISIBILITY_CHANGED = 43,
diff --git a/engine/scene/3d/occluder_instance_3d.cpp b/engine/scene/3d/occluder_instance_3d.cpp
index f64748d7..f389a813 100644
--- a/engine/scene/3d/occluder_instance_3d.cpp
+++ b/engine/scene/3d/occluder_instance_3d.cpp
@@ -30,19 +30,14 @@
 
 #include "occluder_instance_3d.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
-#include "core/io/resource_saver.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/triangulate.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
@@ -746,7 +741,7 @@ void OccluderInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_is_editable_3d_polygon"), &OccluderInstance3D::_is_editable_3d_polygon);
 	ClassDB::bind_method(D_METHOD("_get_editable_3d_polygon_resource"), &OccluderInstance3D::_get_editable_3d_polygon_resource);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "occluder", PROPERTY_HINT_RESOURCE_TYPE, Occluder3D::get_class_static()), "set_occluder", "get_occluder");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "occluder", PROPERTY_HINT_RESOURCE_TYPE, "Occluder3D"), "set_occluder", "get_occluder");
 	ADD_GROUP("Bake", "bake_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "bake_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_bake_mask", "get_bake_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "bake_simplification_distance", PROPERTY_HINT_RANGE, "0.0,2.0,0.01,suffix:m"), "set_bake_simplification_distance", "get_bake_simplification_distance");
diff --git a/engine/scene/3d/occluder_instance_3d.h b/engine/scene/3d/occluder_instance_3d.h
index 4c040c97..1078317f 100644
--- a/engine/scene/3d/occluder_instance_3d.h
+++ b/engine/scene/3d/occluder_instance_3d.h
@@ -32,8 +32,6 @@
 
 #include "scene/3d/visual_instance_3d.h"
 
-class ArrayMesh;
-
 class Occluder3D : public Resource {
 	GDCLASS(Occluder3D, Resource);
 	RES_BASE_EXTENSION("occ");
diff --git a/engine/scene/3d/path_3d.cpp b/engine/scene/3d/path_3d.cpp
index 85333fc6..dcc54f71 100644
--- a/engine/scene/3d/path_3d.cpp
+++ b/engine/scene/3d/path_3d.cpp
@@ -30,12 +30,7 @@
 
 #include "path_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 Path3D::Path3D() {
 	SceneTree *st = SceneTree::get_singleton();
@@ -262,7 +257,7 @@ void Path3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_debug_custom_color", "debug_custom_color"), &Path3D::set_debug_custom_color);
 	ClassDB::bind_method(D_METHOD("get_debug_custom_color"), &Path3D::get_debug_custom_color);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, Curve3D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve3D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_curve", "get_curve");
 
 	ADD_GROUP("Debug Shape", "debug_");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_custom_color"), "set_debug_custom_color", "get_debug_custom_color");
diff --git a/engine/scene/3d/path_3d.h b/engine/scene/3d/path_3d.h
index bd073083..8ea04970 100644
--- a/engine/scene/3d/path_3d.h
+++ b/engine/scene/3d/path_3d.h
@@ -32,9 +32,6 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/curve.h"
-#include "scene/resources/material.h"
-
-class ArrayMesh;
 
 class Path3D : public Node3D {
 	GDCLASS(Path3D, Node3D);
diff --git a/engine/scene/3d/physics/animatable_body_3d.cpp b/engine/scene/3d/physics/animatable_body_3d.cpp
index b8fc4e47..407e23a5 100644
--- a/engine/scene/3d/physics/animatable_body_3d.cpp
+++ b/engine/scene/3d/physics/animatable_body_3d.cpp
@@ -30,10 +30,6 @@
 
 #include "animatable_body_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 Vector3 AnimatableBody3D::get_linear_velocity() const {
 	return linear_velocity;
 }
diff --git a/engine/scene/3d/physics/area_3d.cpp b/engine/scene/3d/physics/area_3d.cpp
index e904ee26..43077779 100644
--- a/engine/scene/3d/physics/area_3d.cpp
+++ b/engine/scene/3d/physics/area_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "area_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void Area3D::set_gravity_space_override_mode(SpaceOverride p_mode) {
@@ -306,7 +303,7 @@ void Area3D::_clear_monitoring() {
 	ERR_FAIL_COND_MSG(locked, "This function can't be used during the in/out signal.");
 
 	{
-		HashMap<ObjectID, BodyState> bmcopy(body_map);
+		HashMap<ObjectID, BodyState> bmcopy = body_map;
 		body_map.clear();
 		//disconnect all monitored stuff
 
@@ -335,7 +332,7 @@ void Area3D::_clear_monitoring() {
 	}
 
 	{
-		HashMap<ObjectID, AreaState> bmcopy(area_map);
+		HashMap<ObjectID, AreaState> bmcopy = area_map;
 		area_map.clear();
 		//disconnect all monitored stuff
 
@@ -763,15 +760,15 @@ void Area3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_reverb_uniformity", "amount"), &Area3D::set_reverb_uniformity);
 	ClassDB::bind_method(D_METHOD("get_reverb_uniformity"), &Area3D::get_reverb_uniformity);
 
-	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node3D::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node3D::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node3D::get_class_static())));
-	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node3D::get_class_static())));
+	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node3D"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node3D"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node3D")));
+	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node3D")));
 
-	ADD_SIGNAL(MethodInfo("area_shape_entered", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area3D::get_class_static()), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("area_shape_exited", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area3D::get_class_static()), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("area_entered", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area3D::get_class_static())));
-	ADD_SIGNAL(MethodInfo("area_exited", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, Area3D::get_class_static())));
+	ADD_SIGNAL(MethodInfo("area_shape_entered", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area3D"), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("area_shape_exited", PropertyInfo(Variant::RID, "area_rid"), PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area3D"), PropertyInfo(Variant::INT, "area_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("area_entered", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area3D")));
+	ADD_SIGNAL(MethodInfo("area_exited", PropertyInfo(Variant::OBJECT, "area", PROPERTY_HINT_RESOURCE_TYPE, "Area3D")));
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitoring"), "set_monitoring", "is_monitoring");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitorable"), "set_monitorable", "is_monitorable");
diff --git a/engine/scene/3d/physics/character_body_3d.cpp b/engine/scene/3d/physics/character_body_3d.cpp
index 19bebc58..aa4ed20b 100644
--- a/engine/scene/3d/physics/character_body_3d.cpp
+++ b/engine/scene/3d/physics/character_body_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "character_body_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "servers/physics_3d/physics_server_3d_extension.h"
 #endif
diff --git a/engine/scene/3d/physics/collision_object_3d.cpp b/engine/scene/3d/physics/collision_object_3d.cpp
index 88cf223f..b8a3fe47 100644
--- a/engine/scene/3d/physics/collision_object_3d.cpp
+++ b/engine/scene/3d/physics/collision_object_3d.cpp
@@ -30,13 +30,8 @@
 
 #include "collision_object_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/shape_3d.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 void CollisionObject3D::_notification(int p_what) {
 	switch (p_what) {
@@ -501,7 +496,7 @@ void CollisionObject3D::_bind_methods() {
 	GDVIRTUAL_BIND(_mouse_enter);
 	GDVIRTUAL_BIND(_mouse_exit);
 
-	ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::VECTOR3, "event_position"), PropertyInfo(Variant::VECTOR3, "normal"), PropertyInfo(Variant::INT, "shape_idx")));
+	ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::VECTOR3, "event_position"), PropertyInfo(Variant::VECTOR3, "normal"), PropertyInfo(Variant::INT, "shape_idx")));
 	ADD_SIGNAL(MethodInfo("mouse_entered"));
 	ADD_SIGNAL(MethodInfo("mouse_exited"));
 
diff --git a/engine/scene/3d/physics/collision_object_3d.h b/engine/scene/3d/physics/collision_object_3d.h
index c39a4cb3..dc841d16 100644
--- a/engine/scene/3d/physics/collision_object_3d.h
+++ b/engine/scene/3d/physics/collision_object_3d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_map.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/shape_3d.h"
diff --git a/engine/scene/3d/physics/collision_polygon_3d.cpp b/engine/scene/3d/physics/collision_polygon_3d.cpp
index 91c23440..10281b08 100644
--- a/engine/scene/3d/physics/collision_polygon_3d.cpp
+++ b/engine/scene/3d/physics/collision_polygon_3d.cpp
@@ -31,9 +31,7 @@
 #include "collision_polygon_3d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 
 void CollisionPolygon3D::_build_polygon() {
diff --git a/engine/scene/3d/physics/collision_shape_3d.cpp b/engine/scene/3d/physics/collision_shape_3d.cpp
index c3429f5b..5031e040 100644
--- a/engine/scene/3d/physics/collision_shape_3d.cpp
+++ b/engine/scene/3d/physics/collision_shape_3d.cpp
@@ -30,12 +30,9 @@
 
 #include "collision_shape_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 #include "scene/resources/3d/world_boundary_shape_3d.h"
@@ -57,7 +54,7 @@ void CollisionShape3D::make_convex_from_siblings() {
 				for (int j = 0; j < m->get_surface_count(); j++) {
 					Array a = m->surface_get_arrays(j);
 					if (!a.is_empty()) {
-						Vector<Vector3> v = a[RSE::ARRAY_VERTEX];
+						Vector<Vector3> v = a[RenderingServer::ARRAY_VERTEX];
 						for (int k = 0; k < v.size(); k++) {
 							vertices.append(mi->get_transform().xform(v[k]));
 						}
@@ -173,7 +170,7 @@ void CollisionShape3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("make_convex_from_siblings"), &CollisionShape3D::make_convex_from_siblings);
 	ClassDB::set_method_flags("CollisionShape3D", "make_convex_from_siblings", METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape3D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape3D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
 
 	ClassDB::bind_method(D_METHOD("set_debug_color", "color"), &CollisionShape3D::set_debug_color);
@@ -323,9 +320,11 @@ void CollisionShape3D::_shape_changed() {
 #endif // DEBUG_ENABLED
 
 CollisionShape3D::CollisionShape3D() {
+	//indicator = RenderingServer::get_singleton()->mesh_create();
 	set_notify_local_transform(true);
 	debug_color = _get_default_debug_color();
 }
 
 CollisionShape3D::~CollisionShape3D() {
+	//RenderingServer::get_singleton()->free(indicator);
 }
diff --git a/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp b/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
index fe2bdd52..f4e58adc 100644
--- a/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "cone_twist_joint_3d.h"
 
-#include "core/object/class_db.h"
-
 void ConeTwistJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &ConeTwistJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &ConeTwistJoint3D::get_param);
diff --git a/engine/scene/3d/physics/joints/generic_6dof_joint_3d.cpp b/engine/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
index 87774956..9f440b65 100644
--- a/engine/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "generic_6dof_joint_3d.h"
 
-#include "core/object/class_db.h"
-
 void Generic6DOFJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param_x", "param", "value"), &Generic6DOFJoint3D::set_param_x);
 	ClassDB::bind_method(D_METHOD("get_param_x", "param"), &Generic6DOFJoint3D::get_param_x);
diff --git a/engine/scene/3d/physics/joints/hinge_joint_3d.cpp b/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
index d66cfc80..cf38357d 100644
--- a/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "hinge_joint_3d.h"
 
-#include "core/object/class_db.h"
-
 void HingeJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &HingeJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &HingeJoint3D::get_param);
diff --git a/engine/scene/3d/physics/joints/joint_3d.cpp b/engine/scene/3d/physics/joints/joint_3d.cpp
index 0f09afa1..b6760dbc 100644
--- a/engine/scene/3d/physics/joints/joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/joint_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "joint_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 void Joint3D::_disconnect_signals() {
 	Node *node_a = get_node_or_null(a);
 	PhysicsBody3D *body_a = Object::cast_to<PhysicsBody3D>(node_a);
diff --git a/engine/scene/3d/physics/joints/pin_joint_3d.cpp b/engine/scene/3d/physics/joints/pin_joint_3d.cpp
index c9311cfa..8e367c5e 100644
--- a/engine/scene/3d/physics/joints/pin_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/pin_joint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "pin_joint_3d.h"
 
-#include "core/object/class_db.h"
-
 void PinJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &PinJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &PinJoint3D::get_param);
diff --git a/engine/scene/3d/physics/joints/slider_joint_3d.cpp b/engine/scene/3d/physics/joints/slider_joint_3d.cpp
index 45077652..df6b1cc0 100644
--- a/engine/scene/3d/physics/joints/slider_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/slider_joint_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "slider_joint_3d.h"
 
-#include "core/object/class_db.h"
-
 void SliderJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &SliderJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &SliderJoint3D::get_param);
diff --git a/engine/scene/3d/physics/kinematic_collision_3d.cpp b/engine/scene/3d/physics/kinematic_collision_3d.cpp
index 8b891c64..15111258 100644
--- a/engine/scene/3d/physics/kinematic_collision_3d.cpp
+++ b/engine/scene/3d/physics/kinematic_collision_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "kinematic_collision_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/physics/physics_body_3d.h"
 
 Vector3 KinematicCollision3D::get_travel() const {
diff --git a/engine/scene/3d/physics/physical_bone_3d.cpp b/engine/scene/3d/physics/physical_bone_3d.cpp
index f88e7d32..41ebadf9 100644
--- a/engine/scene/3d/physics/physical_bone_3d.cpp
+++ b/engine/scene/3d/physics/physical_bone_3d.cpp
@@ -30,11 +30,7 @@
 
 #include "physical_bone_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "scene/3d/skeleton_3d.h"
 #endif //_DISABLE_DEPRECATED
@@ -791,12 +787,9 @@ void PhysicalBone3D::_notification(int p_what) {
 }
 
 void PhysicalBone3D::_sync_body_state(PhysicsDirectBodyState3D *p_state) {
-	Transform3D new_transform = p_state->get_transform();
-	if (likely(new_transform != get_global_transform())) {
-		set_ignore_transform_notification(true);
-		set_global_transform(new_transform);
-		set_ignore_transform_notification(false);
-	}
+	set_ignore_transform_notification(true);
+	set_global_transform(p_state->get_transform());
+	set_ignore_transform_notification(false);
 
 	linear_velocity = p_state->get_linear_velocity();
 	angular_velocity = p_state->get_angular_velocity();
diff --git a/engine/scene/3d/physics/physical_bone_simulator_3d.cpp b/engine/scene/3d/physics/physical_bone_simulator_3d.cpp
index 7d6ce68c..12cd9bac 100644
--- a/engine/scene/3d/physics/physical_bone_simulator_3d.cpp
+++ b/engine/scene/3d/physics/physical_bone_simulator_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "physical_bone_simulator_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/physical_bone_3d.h"
 
 void PhysicalBoneSimulator3D::_skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) {
diff --git a/engine/scene/3d/physics/physics_body_3d.cpp b/engine/scene/3d/physics/physics_body_3d.cpp
index 6b520632..a3f72a60 100644
--- a/engine/scene/3d/physics/physics_body_3d.cpp
+++ b/engine/scene/3d/physics/physics_body_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "physics_body_3d.h"
 
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
-
 void PhysicsBody3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("move_and_collide", "motion", "test_only", "safe_margin", "recovery_as_collision", "max_collisions"), &PhysicsBody3D::_move, DEFVAL(false), DEFVAL(0.001), DEFVAL(false), DEFVAL(1));
 	ClassDB::bind_method(D_METHOD("test_move", "from", "motion", "collision", "safe_margin", "recovery_as_collision", "max_collisions"), &PhysicsBody3D::test_move, DEFVAL(Variant()), DEFVAL(0.001), DEFVAL(false), DEFVAL(1));
diff --git a/engine/scene/3d/physics/physics_body_3d.h b/engine/scene/3d/physics/physics_body_3d.h
index 249844dd..a5a99cea 100644
--- a/engine/scene/3d/physics/physics_body_3d.h
+++ b/engine/scene/3d/physics/physics_body_3d.h
@@ -32,6 +32,7 @@
 
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/physics/kinematic_collision_3d.h"
+#include "scene/resources/physics_material.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
 class PhysicsBody3D : public CollisionObject3D {
diff --git a/engine/scene/3d/physics/ray_cast_3d.cpp b/engine/scene/3d/physics/ray_cast_3d.cpp
index 51d1d7c5..e71b734e 100644
--- a/engine/scene/3d/physics/ray_cast_3d.cpp
+++ b/engine/scene/3d/physics/ray_cast_3d.cpp
@@ -30,12 +30,8 @@
 
 #include "ray_cast_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 void RayCast3D::set_target_position(const Vector3 &p_point) {
 	target_position = p_point;
diff --git a/engine/scene/3d/physics/ray_cast_3d.h b/engine/scene/3d/physics/ray_cast_3d.h
index 5a1c4dc6..8ad4f486 100644
--- a/engine/scene/3d/physics/ray_cast_3d.h
+++ b/engine/scene/3d/physics/ray_cast_3d.h
@@ -31,9 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/material.h"
 
-class ArrayMesh;
 class CollisionObject3D;
 
 class RayCast3D : public Node3D {
diff --git a/engine/scene/3d/physics/rigid_body_3d.cpp b/engine/scene/3d/physics/rigid_body_3d.cpp
index 39c042fc..e71a52db 100644
--- a/engine/scene/3d/physics/rigid_body_3d.cpp
+++ b/engine/scene/3d/physics/rigid_body_3d.cpp
@@ -30,11 +30,6 @@
 
 #include "rigid_body_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/resources/physics_material.h"
-
 void RigidBody3D::_body_enter_tree(ObjectID p_id) {
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = Object::cast_to<Node>(obj);
@@ -147,12 +142,9 @@ struct _RigidBodyInOut {
 };
 
 void RigidBody3D::_sync_body_state(PhysicsDirectBodyState3D *p_state) {
-	Transform3D new_transform = p_state->get_transform();
-	if (likely(new_transform != get_global_transform())) {
-		set_ignore_transform_notification(true);
-		set_global_transform(new_transform);
-		set_ignore_transform_notification(false);
-	}
+	set_ignore_transform_notification(true);
+	set_global_transform(p_state->get_transform());
+	set_ignore_transform_notification(false);
 
 	linear_velocity = p_state->get_linear_velocity();
 	angular_velocity = p_state->get_angular_velocity();
@@ -770,7 +762,7 @@ void RigidBody3D::_bind_methods() {
 	GDVIRTUAL_BIND(_integrate_forces, "state");
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "mass", PROPERTY_HINT_RANGE, "0.001,1000,0.001,or_greater,exp,suffix:kg"), "set_mass", "get_mass");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), "set_physics_material_override", "get_physics_material_override");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material_override", "get_physics_material_override");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "gravity_scale", PROPERTY_HINT_RANGE, "-8,8,0.001,or_less,or_greater"), "set_gravity_scale", "get_gravity_scale");
 	ADD_GROUP("Mass Distribution", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "center_of_mass_mode", PROPERTY_HINT_ENUM, "Auto,Custom"), "set_center_of_mass_mode", "get_center_of_mass_mode");
@@ -799,10 +791,10 @@ void RigidBody3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "constant_force", PROPERTY_HINT_NONE, U"suffix:kg\u22C5m/s\u00B2 (N)"), "set_constant_force", "get_constant_force");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "constant_torque", PROPERTY_HINT_NONE, U"suffix:kg\u22C5m\u00B2/s\u00B2/rad"), "set_constant_torque", "get_constant_torque");
 
-	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static()), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
-	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("body_shape_entered", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_shape_exited", PropertyInfo(Variant::RID, "body_rid"), PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::INT, "body_shape_index"), PropertyInfo(Variant::INT, "local_shape_index")));
+	ADD_SIGNAL(MethodInfo("body_entered", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 	ADD_SIGNAL(MethodInfo("sleeping_state_changed"));
 
 	BIND_ENUM_CONSTANT(FREEZE_MODE_STATIC);
@@ -821,7 +813,9 @@ void RigidBody3D::_validate_property(PropertyInfo &p_property) const {
 	}
 	if (center_of_mass_mode != CENTER_OF_MASS_MODE_CUSTOM && p_property.name == "center_of_mass") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-	} else if (!contact_monitor && p_property.name == "max_contacts_reported") {
+	}
+
+	if (!contact_monitor && p_property.name == "max_contacts_reported") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
diff --git a/engine/scene/3d/physics/rigid_body_3d.h b/engine/scene/3d/physics/rigid_body_3d.h
index 65df0435..43fe3175 100644
--- a/engine/scene/3d/physics/rigid_body_3d.h
+++ b/engine/scene/3d/physics/rigid_body_3d.h
@@ -33,8 +33,6 @@
 #include "core/templates/vset.h"
 #include "scene/3d/physics/physics_body_3d.h"
 
-class PhysicsMaterial;
-
 class RigidBody3D : public PhysicsBody3D {
 	GDCLASS(RigidBody3D, PhysicsBody3D);
 
diff --git a/engine/scene/3d/physics/shape_cast_3d.cpp b/engine/scene/3d/physics/shape_cast_3d.cpp
index e2cedb40..ca7585fd 100644
--- a/engine/scene/3d/physics/shape_cast_3d.cpp
+++ b/engine/scene/3d/physics/shape_cast_3d.cpp
@@ -30,14 +30,9 @@
 
 #include "shape_cast_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 void ShapeCast3D::_notification(int p_what) {
 	switch (p_what) {
@@ -168,7 +163,7 @@ void ShapeCast3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_debug_shape_custom_color"), &ShapeCast3D::get_debug_shape_custom_color);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape3D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape3D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "exclude_parent"), "set_exclude_parent_body", "get_exclude_parent_body");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "target_position", PROPERTY_HINT_NONE, "suffix:m"), "set_target_position", "get_target_position");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "margin", PROPERTY_HINT_RANGE, "0,100,0.01,suffix:m"), "set_margin", "get_margin");
diff --git a/engine/scene/3d/physics/shape_cast_3d.h b/engine/scene/3d/physics/shape_cast_3d.h
index 6cf6474d..b0be9330 100644
--- a/engine/scene/3d/physics/shape_cast_3d.h
+++ b/engine/scene/3d/physics/shape_cast_3d.h
@@ -32,7 +32,6 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/shape_3d.h"
-#include "scene/resources/material.h"
 
 class CollisionObject3D;
 
diff --git a/engine/scene/3d/physics/soft_body_3d.compat.inc b/engine/scene/3d/physics/soft_body_3d.compat.inc
index 1b56ce01..0b01bfeb 100644
--- a/engine/scene/3d/physics/soft_body_3d.compat.inc
+++ b/engine/scene/3d/physics/soft_body_3d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "soft_body_3d.h"
-
-#include "core/object/class_db.h"
-
 void SoftBody3D::_pin_point_bind_compat_94684(int p_point_index, bool pin, const NodePath &p_spatial_attachment_path) {
 	pin_point(p_point_index, pin, p_spatial_attachment_path, -1);
 }
diff --git a/engine/scene/3d/physics/soft_body_3d.cpp b/engine/scene/3d/physics/soft_body_3d.cpp
index 2e7d2c25..3c596dda 100644
--- a/engine/scene/3d/physics/soft_body_3d.cpp
+++ b/engine/scene/3d/physics/soft_body_3d.cpp
@@ -31,11 +31,7 @@
 #include "soft_body_3d.h"
 #include "soft_body_3d.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/physics/physics_body_3d.h"
-#include "servers/rendering/rendering_server.h"
 
 SoftBodyRenderingServerHandler::SoftBodyRenderingServerHandler() {}
 
@@ -47,9 +43,9 @@ void SoftBodyRenderingServerHandler::prepare(RID p_mesh, int p_surface) {
 	mesh = p_mesh;
 	surface = p_surface;
 
-	RenderingServerTypes::SurfaceData surface_data = RS::get_singleton()->mesh_get_surface(mesh, surface);
+	RS::SurfaceData surface_data = RS::get_singleton()->mesh_get_surface(mesh, surface);
 
-	uint32_t surface_offsets[RSE::ARRAY_MAX];
+	uint32_t surface_offsets[RS::ARRAY_MAX];
 	uint32_t vertex_stride;
 	uint32_t normal_tangent_stride;
 	uint32_t attrib_stride;
@@ -59,8 +55,8 @@ void SoftBodyRenderingServerHandler::prepare(RID p_mesh, int p_surface) {
 	buffer = surface_data.vertex_data;
 	stride = vertex_stride;
 	normal_stride = normal_tangent_stride;
-	offset_vertices = surface_offsets[RSE::ARRAY_VERTEX];
-	offset_normal = surface_offsets[RSE::ARRAY_NORMAL];
+	offset_vertices = surface_offsets[RS::ARRAY_VERTEX];
+	offset_normal = surface_offsets[RS::ARRAY_NORMAL];
 }
 
 void SoftBodyRenderingServerHandler::clear() {
@@ -387,7 +383,7 @@ void SoftBody3D::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "parent_collision_ignore", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "CollisionObject3D"), "set_parent_collision_ignore", "get_parent_collision_ignore");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "simulation_precision", PROPERTY_HINT_RANGE, "1,100,1"), "set_simulation_precision", "get_simulation_precision");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "total_mass", PROPERTY_HINT_RANGE, "0.001,1000,0.001,or_greater,exp,suffix:kg"), "set_total_mass", "get_total_mass");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "total_mass", PROPERTY_HINT_RANGE, "0,1000,0.001,or_greater,exp,suffix:kg"), "set_total_mass", "get_total_mass");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "linear_stiffness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_linear_stiffness", "get_linear_stiffness");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "shrinking_factor", PROPERTY_HINT_RANGE, "-1,1,0.01,or_less,or_greater"), "set_shrinking_factor", "get_shrinking_factor");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pressure_coefficient"), "set_pressure_coefficient", "get_pressure_coefficient");
diff --git a/engine/scene/3d/physics/spring_arm_3d.cpp b/engine/scene/3d/physics/spring_arm_3d.cpp
index 878fddec..8d2f1031 100644
--- a/engine/scene/3d/physics/spring_arm_3d.cpp
+++ b/engine/scene/3d/physics/spring_arm_3d.cpp
@@ -30,10 +30,7 @@
 
 #include "spring_arm_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/shape_3d.h"
 
 void SpringArm3D::_notification(int p_what) {
@@ -76,7 +73,7 @@ void SpringArm3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_margin"), &SpringArm3D::get_margin);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, Shape3D::get_class_static()), "set_shape", "get_shape");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape3D"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "spring_length", PROPERTY_HINT_NONE, "suffix:m"), "set_length", "get_length");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "margin", PROPERTY_HINT_NONE, "suffix:m"), "set_margin", "get_margin");
 }
diff --git a/engine/scene/3d/physics/static_body_3d.cpp b/engine/scene/3d/physics/static_body_3d.cpp
index 4de0f241..a632af46 100644
--- a/engine/scene/3d/physics/static_body_3d.cpp
+++ b/engine/scene/3d/physics/static_body_3d.cpp
@@ -30,10 +30,6 @@
 
 #include "static_body_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/resources/physics_material.h"
-
 #ifndef NAVIGATION_3D_DISABLED
 #include "core/math/convex_hull.h"
 #include "scene/resources/3d/box_shape_3d.h"
@@ -46,6 +42,7 @@
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/3d/shape_3d.h"
 #include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
@@ -139,7 +136,7 @@ void StaticBody3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_na
 				BoxShape3D *box = Object::cast_to<BoxShape3D>(*s);
 				if (box) {
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					BoxMesh::create_mesh_array(arr, box->get_size());
 					p_source_geometry_data->add_mesh_array(arr, transform);
 				}
@@ -147,7 +144,7 @@ void StaticBody3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_na
 				CapsuleShape3D *capsule = Object::cast_to<CapsuleShape3D>(*s);
 				if (capsule) {
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					CapsuleMesh::create_mesh_array(arr, capsule->get_radius(), capsule->get_height());
 					p_source_geometry_data->add_mesh_array(arr, transform);
 				}
@@ -155,7 +152,7 @@ void StaticBody3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_na
 				CylinderShape3D *cylinder = Object::cast_to<CylinderShape3D>(*s);
 				if (cylinder) {
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					CylinderMesh::create_mesh_array(arr, cylinder->get_radius(), cylinder->get_radius(), cylinder->get_height());
 					p_source_geometry_data->add_mesh_array(arr, transform);
 				}
@@ -163,7 +160,7 @@ void StaticBody3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_na
 				SphereShape3D *sphere = Object::cast_to<SphereShape3D>(*s);
 				if (sphere) {
 					Array arr;
-					arr.resize(RSE::ARRAY_MAX);
+					arr.resize(RS::ARRAY_MAX);
 					SphereMesh::create_mesh_array(arr, sphere->get_radius(), sphere->get_radius() * 2.0);
 					p_source_geometry_data->add_mesh_array(arr, transform);
 				}
@@ -243,7 +240,7 @@ void StaticBody3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_physics_material_override", "physics_material_override"), &StaticBody3D::set_physics_material_override);
 	ClassDB::bind_method(D_METHOD("get_physics_material_override"), &StaticBody3D::get_physics_material_override);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static()), "set_physics_material_override", "get_physics_material_override");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material_override", "get_physics_material_override");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "constant_linear_velocity", PROPERTY_HINT_NONE, "suffix:m/s"), "set_constant_linear_velocity", "get_constant_linear_velocity");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "constant_angular_velocity", PROPERTY_HINT_NONE, U"radians_as_degrees,suffix:\u00B0/s"), "set_constant_angular_velocity", "get_constant_angular_velocity");
 }
diff --git a/engine/scene/3d/physics/static_body_3d.h b/engine/scene/3d/physics/static_body_3d.h
index 04ae6b77..f4869575 100644
--- a/engine/scene/3d/physics/static_body_3d.h
+++ b/engine/scene/3d/physics/static_body_3d.h
@@ -32,8 +32,6 @@
 
 #include "scene/3d/physics/physics_body_3d.h"
 
-class PhysicsMaterial;
-
 #ifndef NAVIGATION_3D_DISABLED
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
diff --git a/engine/scene/3d/physics/vehicle_body_3d.cpp b/engine/scene/3d/physics/vehicle_body_3d.cpp
index 1e5083a9..5efa207f 100644
--- a/engine/scene/3d/physics/vehicle_body_3d.cpp
+++ b/engine/scene/3d/physics/vehicle_body_3d.cpp
@@ -31,7 +31,6 @@
 #include "vehicle_body_3d.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 #define ROLLING_INFLUENCE_FIX
 
diff --git a/engine/scene/3d/reflection_probe.cpp b/engine/scene/3d/reflection_probe.cpp
index d0cc98d0..53849418 100644
--- a/engine/scene/3d/reflection_probe.cpp
+++ b/engine/scene/3d/reflection_probe.cpp
@@ -30,10 +30,6 @@
 
 #include "reflection_probe.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void ReflectionProbe::set_intensity(float p_intensity) {
 	intensity = p_intensity;
 	RS::get_singleton()->reflection_probe_set_intensity(probe, p_intensity);
@@ -55,7 +51,7 @@ float ReflectionProbe::get_blend_distance() const {
 
 void ReflectionProbe::set_ambient_mode(AmbientMode p_mode) {
 	ambient_mode = p_mode;
-	RS::get_singleton()->reflection_probe_set_ambient_mode(probe, RSE::ReflectionProbeAmbientMode(p_mode));
+	RS::get_singleton()->reflection_probe_set_ambient_mode(probe, RS::ReflectionProbeAmbientMode(p_mode));
 	notify_property_list_changed();
 }
 
@@ -190,7 +186,7 @@ uint32_t ReflectionProbe::get_reflection_mask() const {
 
 void ReflectionProbe::set_update_mode(UpdateMode p_mode) {
 	update_mode = p_mode;
-	RS::get_singleton()->reflection_probe_set_update_mode(probe, RSE::ReflectionProbeUpdateMode(p_mode));
+	RS::get_singleton()->reflection_probe_set_update_mode(probe, RS::ReflectionProbeUpdateMode(p_mode));
 }
 
 ReflectionProbe::UpdateMode ReflectionProbe::get_update_mode() const {
diff --git a/engine/scene/3d/remote_transform_3d.cpp b/engine/scene/3d/remote_transform_3d.cpp
index 325d8148..2a69ded0 100644
--- a/engine/scene/3d/remote_transform_3d.cpp
+++ b/engine/scene/3d/remote_transform_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "remote_transform_3d.h"
 
-#include "core/object/class_db.h"
-
 void RemoteTransform3D::_update_cache() {
 	cache = ObjectID();
 	if (has_node(remote_node)) {
diff --git a/engine/scene/3d/retarget_modifier_3d.cpp b/engine/scene/3d/retarget_modifier_3d.cpp
index 80cb8816..ace428db 100644
--- a/engine/scene/3d/retarget_modifier_3d.cpp
+++ b/engine/scene/3d/retarget_modifier_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "retarget_modifier_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 PackedStringArray RetargetModifier3D::get_configuration_warnings() const {
 	PackedStringArray warnings = SkeletonModifier3D::get_configuration_warnings();
 	if (child_skeletons.is_empty()) {
@@ -273,7 +270,7 @@ void RetargetModifier3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_scale_enabled", "enabled"), &RetargetModifier3D::set_scale_enabled);
 	ClassDB::bind_method(D_METHOD("is_scale_enabled"), &RetargetModifier3D::is_scale_enabled);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "profile", PROPERTY_HINT_RESOURCE_TYPE, SkeletonProfile::get_class_static()), "set_profile", "get_profile");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "profile", PROPERTY_HINT_RESOURCE_TYPE, "SkeletonProfile"), "set_profile", "get_profile");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_global_pose"), "set_use_global_pose", "is_using_global_pose");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "enable", PROPERTY_HINT_FLAGS, "Position,Rotation,Scale"), "set_enable_flags", "get_enable_flags");
 
diff --git a/engine/scene/3d/skeleton_3d.compat.inc b/engine/scene/3d/skeleton_3d.compat.inc
index f0291d3c..6410ab33 100644
--- a/engine/scene/3d/skeleton_3d.compat.inc
+++ b/engine/scene/3d/skeleton_3d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "skeleton_3d.h"
-
-#include "core/object/class_db.h"
-
 void Skeleton3D::_add_bone_bind_compat_88791(const String &p_name) {
 	add_bone(p_name);
 }
diff --git a/engine/scene/3d/skeleton_3d.cpp b/engine/scene/3d/skeleton_3d.cpp
index 0dcb1238..a66655eb 100644
--- a/engine/scene/3d/skeleton_3d.cpp
+++ b/engine/scene/3d/skeleton_3d.cpp
@@ -31,13 +31,10 @@
 #include "skeleton_3d.h"
 #include "skeleton_3d.compat.inc"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/skeleton_modifier_3d.h"
 #if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
 #endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
-#include "servers/rendering/rendering_server.h"
 
 void SkinReference::_skin_changed() {
 	if (skeleton_node) {
diff --git a/engine/scene/3d/skeleton_3d.h b/engine/scene/3d/skeleton_3d.h
index cbeac91d..66ae8bd7 100644
--- a/engine/scene/3d/skeleton_3d.h
+++ b/engine/scene/3d/skeleton_3d.h
@@ -54,7 +54,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	// Public for use as signal callback.
+	// Public for use with callable_mp.
 	void _skin_changed();
 
 	RID get_skeleton() const;
diff --git a/engine/scene/3d/skeleton_ik_3d.cpp b/engine/scene/3d/skeleton_ik_3d.cpp
index 4f500cdd..9f36d6ac 100644
--- a/engine/scene/3d/skeleton_ik_3d.cpp
+++ b/engine/scene/3d/skeleton_ik_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "skeleton_ik_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) {
 	for (int i = children.size() - 1; 0 <= i; --i) {
 		if (p_bone_id == children[i].bone) {
diff --git a/engine/scene/3d/skeleton_modifier_3d.cpp b/engine/scene/3d/skeleton_modifier_3d.cpp
index 7071d2f1..3c34c875 100644
--- a/engine/scene/3d/skeleton_modifier_3d.cpp
+++ b/engine/scene/3d/skeleton_modifier_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "skeleton_modifier_3d.h"
 
-#include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-
 PackedStringArray SkeletonModifier3D::get_configuration_warnings() const {
 	PackedStringArray warnings = Node3D::get_configuration_warnings();
 	if (skeleton_id.is_null()) {
@@ -92,10 +89,6 @@ void SkeletonModifier3D::_force_update_skeleton_skin() {
 	skeleton->force_update_deferred();
 }
 
-bool SkeletonModifier3D::should_check_node_path() {
-	return (bool)GLOBAL_GET_CACHED(bool, "animation/warnings/check_invalid_skeleton_modifier_node_paths") && is_inside_tree();
-}
-
 /* Process */
 
 void SkeletonModifier3D::set_active(bool p_active) {
diff --git a/engine/scene/3d/skeleton_modifier_3d.h b/engine/scene/3d/skeleton_modifier_3d.h
index dde42577..25e46953 100644
--- a/engine/scene/3d/skeleton_modifier_3d.h
+++ b/engine/scene/3d/skeleton_modifier_3d.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
+
 #include "scene/3d/skeleton_3d.h"
 
 class SkeletonModifier3D : public Node3D {
@@ -113,8 +114,6 @@ protected:
 	GDVIRTUAL0(_process_modification);
 #endif
 
-	bool should_check_node_path();
-
 public:
 	virtual PackedStringArray get_configuration_warnings() const override;
 	virtual bool has_process() const { return false; } // Return true if modifier needs to modify bone pose without external animation such as physics, jiggle and etc.
diff --git a/engine/scene/3d/spline_ik_3d.cpp b/engine/scene/3d/spline_ik_3d.cpp
index ff446a80..0e3119c4 100644
--- a/engine/scene/3d/spline_ik_3d.cpp
+++ b/engine/scene/3d/spline_ik_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "spline_ik_3d.h"
 
-#include "core/object/class_db.h"
-#include "scene/3d/path_3d.h"
-
 bool SplineIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -125,9 +122,6 @@ PackedStringArray SplineIK3D::get_configuration_warnings() const {
 void SplineIK3D::set_path_3d(int p_index, const NodePath &p_path_3d) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	sp_settings[p_index]->path_3d = p_path_3d;
-	if (should_check_node_path() && !p_path_3d.is_empty() && !Object::cast_to<Path3D>(get_node_or_null(p_path_3d))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Path3D '" + String(p_path_3d) + "' not found.");
-	}
 	notify_property_list_changed();
 	update_configuration_warnings();
 }
diff --git a/engine/scene/3d/spline_ik_3d.h b/engine/scene/3d/spline_ik_3d.h
index d1f288eb..4ac29850 100644
--- a/engine/scene/3d/spline_ik_3d.h
+++ b/engine/scene/3d/spline_ik_3d.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "scene/3d/chain_ik_3d.h"
-
-class Curve3D;
+#include "scene/3d/path_3d.h"
 
 class SplineIK3D : public ChainIK3D {
 	GDCLASS(SplineIK3D, ChainIK3D);
diff --git a/engine/scene/3d/spring_bone_collision_3d.cpp b/engine/scene/3d/spring_bone_collision_3d.cpp
index 3d2755d0..14f644bc 100644
--- a/engine/scene/3d/spring_bone_collision_3d.cpp
+++ b/engine/scene/3d/spring_bone_collision_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "spring_bone_collision_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_simulator_3d.h"
 
 PackedStringArray SpringBoneCollision3D::get_configuration_warnings() const {
@@ -95,7 +93,7 @@ void SpringBoneCollision3D::set_bone(int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (bone <= -1 || bone >= sk->get_bone_count()) {
-			WARN_PRINT("Bone index '" + itos(p_bone) + "' is out of range! Cannot connect BoneAttachment to node!");
+			WARN_PRINT("Bone index out of range! Cannot connect BoneAttachment to node!");
 			bone = -1;
 		} else {
 			bone_name = sk->get_bone_name(bone);
diff --git a/engine/scene/3d/spring_bone_collision_capsule_3d.cpp b/engine/scene/3d/spring_bone_collision_capsule_3d.cpp
index fec5b4ef..2867c2c4 100644
--- a/engine/scene/3d/spring_bone_collision_capsule_3d.cpp
+++ b/engine/scene/3d/spring_bone_collision_capsule_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "spring_bone_collision_capsule_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_collision_sphere_3d.h"
 
 void SpringBoneCollisionCapsule3D::set_radius(float p_radius) {
diff --git a/engine/scene/3d/spring_bone_collision_sphere_3d.cpp b/engine/scene/3d/spring_bone_collision_sphere_3d.cpp
index c49657d6..3560932b 100644
--- a/engine/scene/3d/spring_bone_collision_sphere_3d.cpp
+++ b/engine/scene/3d/spring_bone_collision_sphere_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "spring_bone_collision_sphere_3d.h"
 
-#include "core/object/class_db.h"
-
 void SpringBoneCollisionSphere3D::set_radius(float p_radius) {
 	radius = p_radius;
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/3d/spring_bone_simulator_3d.compat.inc b/engine/scene/3d/spring_bone_simulator_3d.compat.inc
index 99f49707..4fa1e94c 100644
--- a/engine/scene/3d/spring_bone_simulator_3d.compat.inc
+++ b/engine/scene/3d/spring_bone_simulator_3d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "spring_bone_simulator_3d.h"
-
-#include "core/object/class_db.h"
-
 namespace compat::SpringBoneSimulator3D {
 enum BoneDirection : int {
 	BONE_DIRECTION_PLUS_X = SkeletonModifier3D::BONE_DIRECTION_PLUS_X,
diff --git a/engine/scene/3d/spring_bone_simulator_3d.cpp b/engine/scene/3d/spring_bone_simulator_3d.cpp
index b9401c90..4d977522 100644
--- a/engine/scene/3d/spring_bone_simulator_3d.cpp
+++ b/engine/scene/3d/spring_bone_simulator_3d.cpp
@@ -31,9 +31,6 @@
 #include "spring_bone_simulator_3d.h"
 #include "spring_bone_simulator_3d.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_collision_3d.h"
 
 // Original VRM Spring Bone movement logic was distributed by (c) VRM Consortium. Licensed under the MIT license.
@@ -308,13 +305,13 @@ void SpringBoneSimulator3D::_get_property_list(List<PropertyInfo> *p_list) const
 		props.push_back(PropertyInfo(Variant::INT, path + "rotation_axis", PROPERTY_HINT_ENUM, SkeletonModifier3D::get_hint_rotation_axis()));
 		props.push_back(PropertyInfo(Variant::VECTOR3, path + "rotation_axis_vector"));
 		props.push_back(PropertyInfo(Variant::FLOAT, path + "radius/value", PROPERTY_HINT_RANGE, "0,1,0.001,or_greater,suffix:m"));
-		props.push_back(PropertyInfo(Variant::OBJECT, path + "radius/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()));
+		props.push_back(PropertyInfo(Variant::OBJECT, path + "radius/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"));
 		props.push_back(PropertyInfo(Variant::FLOAT, path + "stiffness/value", PROPERTY_HINT_RANGE, "0,4,0.01,or_greater"));
-		props.push_back(PropertyInfo(Variant::OBJECT, path + "stiffness/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()));
+		props.push_back(PropertyInfo(Variant::OBJECT, path + "stiffness/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"));
 		props.push_back(PropertyInfo(Variant::FLOAT, path + "drag/value", PROPERTY_HINT_RANGE, "0,1,0.01,or_greater"));
-		props.push_back(PropertyInfo(Variant::OBJECT, path + "drag/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()));
+		props.push_back(PropertyInfo(Variant::OBJECT, path + "drag/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"));
 		props.push_back(PropertyInfo(Variant::FLOAT, path + "gravity/value", PROPERTY_HINT_RANGE, "0,1,0.01,or_greater,or_less,suffix:m/s"));
-		props.push_back(PropertyInfo(Variant::OBJECT, path + "gravity/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()));
+		props.push_back(PropertyInfo(Variant::OBJECT, path + "gravity/damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"));
 		props.push_back(PropertyInfo(Variant::VECTOR3, path + "gravity/direction"));
 		props.push_back(PropertyInfo(Variant::INT, path + "joint_count", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ARRAY, "Joints," + path + "joints/,static,const"));
 		for (uint32_t j = 0; j < settings[i]->joints.size(); j++) {
@@ -461,7 +458,7 @@ void SpringBoneSimulator3D::set_root_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->root_bone <= -1 || settings[p_index]->root_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Root bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Root bone index out of range!");
 			settings[p_index]->root_bone = -1;
 		} else {
 			settings[p_index]->root_bone_name = sk->get_bone_name(settings[p_index]->root_bone);
@@ -498,7 +495,7 @@ void SpringBoneSimulator3D::set_end_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->end_bone <= -1 || settings[p_index]->end_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": End bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("End bone index out of range!");
 			settings[p_index]->end_bone = -1;
 		} else {
 			settings[p_index]->end_bone_name = sk->get_bone_name(settings[p_index]->end_bone);
@@ -594,9 +591,6 @@ SpringBoneSimulator3D::CenterFrom SpringBoneSimulator3D::get_center_from(int p_i
 void SpringBoneSimulator3D::set_center_node(int p_index, const NodePath &p_node_path) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	bool center_changed = settings[p_index]->center_node != p_node_path;
-	if (should_check_node_path() && !p_node_path.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_node_path))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Center node '" + String(p_node_path) + "' not found.");
-	}
 	settings[p_index]->center_node = p_node_path;
 	if (center_changed) {
 		reset();
@@ -629,7 +623,7 @@ void SpringBoneSimulator3D::set_center_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (settings[p_index]->center_bone <= -1 || settings[p_index]->center_bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Center bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Center bone index out of range!");
 			settings[p_index]->center_bone = -1;
 		} else {
 			settings[p_index]->center_bone_name = sk->get_bone_name(settings[p_index]->center_bone);
@@ -900,7 +894,7 @@ void SpringBoneSimulator3D::_set_joint_bone(int p_index, int p_joint, int p_bone
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (joints[p_joint]->bone <= -1 || joints[p_joint]->bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + " : Joint: " + itos(p_joint) + ": bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Joint bone index out of range!");
 			joints[p_joint]->bone = -1;
 		} else {
 			joints[p_joint]->bone_name = sk->get_bone_name(joints[p_joint]->bone);
@@ -1212,7 +1206,7 @@ LocalVector<ObjectID> SpringBoneSimulator3D::get_valid_collision_instance_ids(in
 	if (collisions_dirty) {
 		_find_collisions();
 	}
-	return LocalVector<ObjectID>(settings[p_index]->cached_collisions);
+	return settings[p_index]->cached_collisions;
 }
 
 void SpringBoneSimulator3D::set_external_force(const Vector3 &p_force) {
diff --git a/engine/scene/3d/spring_bone_simulator_3d.h b/engine/scene/3d/spring_bone_simulator_3d.h
index a9aea88d..1b1cd327 100644
--- a/engine/scene/3d/spring_bone_simulator_3d.h
+++ b/engine/scene/3d/spring_bone_simulator_3d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
-#include "scene/resources/curve.h"
 
 #ifndef DISABLE_DEPRECATED
 namespace compat::SpringBoneSimulator3D {
diff --git a/engine/scene/3d/sprite_3d.cpp b/engine/scene/3d/sprite_3d.cpp
index ebe44c04..e9263486 100644
--- a/engine/scene/3d/sprite_3d.cpp
+++ b/engine/scene/3d/sprite_3d.cpp
@@ -30,12 +30,8 @@
 
 #include "sprite_3d.h"
 
-#include "core/config/engine.h"
-#include "core/math/triangle_mesh.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/resources/atlas_texture.h"
-#include "servers/rendering/rendering_server.h"
+#include "scene/resources/mesh.h"
 
 Color SpriteBase3D::_get_color_accum() {
 	if (!color_dirty) {
@@ -244,14 +240,14 @@ void SpriteBase3D::draw_texture_rect(Ref<Texture2D> p_texture, Rect2 p_dst_rect,
 		}
 
 		float v_uv[2] = { (float)uvs[i].x, (float)uvs[i].y };
-		memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RSE::ARRAY_TEX_UV]], v_uv, 8);
+		memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_TEX_UV]], v_uv, 8);
 
 		float v_vertex[3] = { (float)vtx.x, (float)vtx.y, (float)vtx.z };
 
-		memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RSE::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3);
-		memcpy(&vertex_write_buffer[i * normal_tangent_stride + mesh_surface_offsets[RSE::ARRAY_NORMAL]], &v_normal, 4);
-		memcpy(&vertex_write_buffer[i * normal_tangent_stride + mesh_surface_offsets[RSE::ARRAY_TANGENT]], &v_tangent, 4);
-		memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RSE::ARRAY_COLOR]], v_color, 4);
+		memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3);
+		memcpy(&vertex_write_buffer[i * normal_tangent_stride + mesh_surface_offsets[RS::ARRAY_NORMAL]], &v_normal, 4);
+		memcpy(&vertex_write_buffer[i * normal_tangent_stride + mesh_surface_offsets[RS::ARRAY_TANGENT]], &v_tangent, 4);
+		memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_COLOR]], v_color, 4);
 	}
 
 	switch (get_billboard_mode()) {
@@ -384,7 +380,7 @@ Color SpriteBase3D::get_modulate() const {
 }
 
 void SpriteBase3D::set_render_priority(int p_priority) {
-	ERR_FAIL_COND(p_priority < RSE::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RSE::MATERIAL_RENDER_PRIORITY_MAX);
+	ERR_FAIL_COND(p_priority < RS::MATERIAL_RENDER_PRIORITY_MIN || p_priority > RS::MATERIAL_RENDER_PRIORITY_MAX);
 
 	if (render_priority == p_priority) {
 		return;
@@ -698,7 +694,7 @@ void SpriteBase3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "alpha_antialiasing_mode", PROPERTY_HINT_ENUM, "Disabled,Alpha Edge Blend,Alpha Edge Clip"), "set_alpha_antialiasing", "get_alpha_antialiasing");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "alpha_antialiasing_edge", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_alpha_antialiasing_edge", "get_alpha_antialiasing_edge");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Nearest Mipmap,Linear Mipmap,Nearest Mipmap Anisotropic,Linear Mipmap Anisotropic"), "set_texture_filter", "get_texture_filter");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RSE::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RSE::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RS::MATERIAL_RENDER_PRIORITY_MIN) + "," + itos(RS::MATERIAL_RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
 
 	BIND_ENUM_CONSTANT(FLAG_TRANSPARENT);
 	BIND_ENUM_CONSTANT(FLAG_SHADED);
@@ -765,16 +761,16 @@ SpriteBase3D::SpriteBase3D() {
 	indices.write[5] = 3;
 
 	Array mesh_array;
-	mesh_array.resize(RSE::ARRAY_MAX);
-	mesh_array[RSE::ARRAY_VERTEX] = mesh_vertices;
-	mesh_array[RSE::ARRAY_NORMAL] = mesh_normals;
-	mesh_array[RSE::ARRAY_TANGENT] = mesh_tangents;
-	mesh_array[RSE::ARRAY_COLOR] = mesh_colors;
-	mesh_array[RSE::ARRAY_TEX_UV] = mesh_uvs;
-	mesh_array[RSE::ARRAY_INDEX] = indices;
+	mesh_array.resize(RS::ARRAY_MAX);
+	mesh_array[RS::ARRAY_VERTEX] = mesh_vertices;
+	mesh_array[RS::ARRAY_NORMAL] = mesh_normals;
+	mesh_array[RS::ARRAY_TANGENT] = mesh_tangents;
+	mesh_array[RS::ARRAY_COLOR] = mesh_colors;
+	mesh_array[RS::ARRAY_TEX_UV] = mesh_uvs;
+	mesh_array[RS::ARRAY_INDEX] = indices;
 
-	RenderingServerTypes::SurfaceData sd;
-	RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RSE::PRIMITIVE_TRIANGLES, mesh_array);
+	RS::SurfaceData sd;
+	RS::get_singleton()->mesh_create_surface_data_from_arrays(&sd, RS::PRIMITIVE_TRIANGLES, mesh_array);
 
 	mesh_surface_format = sd.format;
 	vertex_buffer = sd.vertex_data;
@@ -1013,7 +1009,7 @@ void Sprite3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hframes", "hframes"), &Sprite3D::set_hframes);
 	ClassDB::bind_method(D_METHOD("get_hframes"), &Sprite3D::get_hframes);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_GROUP("Animation", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "hframes", PROPERTY_HINT_RANGE, "1,16384,1"), "set_hframes", "get_hframes");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vframes", PROPERTY_HINT_RANGE, "1,16384,1"), "set_vframes", "get_vframes");
@@ -1217,6 +1213,7 @@ void AnimatedSprite3D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 	if (frames.is_valid()) {
 		frames->disconnect(CoreStringName(changed), callable_mp(this, &AnimatedSprite3D::_res_changed));
 	}
+	stop();
 	frames = p_frames;
 	if (frames.is_valid()) {
 		frames->connect(CoreStringName(changed), callable_mp(this, &AnimatedSprite3D::_res_changed));
@@ -1235,7 +1232,6 @@ void AnimatedSprite3D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 			}
 		}
 	}
-	stop();
 
 	notify_property_list_changed();
 	_queue_redraw();
@@ -1540,7 +1536,7 @@ void AnimatedSprite3D::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("animation_looped"));
 	ADD_SIGNAL(MethodInfo("animation_finished"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sprite_frames", PROPERTY_HINT_RESOURCE_TYPE, SpriteFrames::get_class_static()), "set_sprite_frames", "get_sprite_frames");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sprite_frames", PROPERTY_HINT_RESOURCE_TYPE, "SpriteFrames"), "set_sprite_frames", "get_sprite_frames");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "animation", PROPERTY_HINT_ENUM, ""), "set_animation", "get_animation");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "autoplay", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_autoplay", "get_autoplay");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "frame"), "set_frame", "get_frame");
diff --git a/engine/scene/3d/sprite_3d.h b/engine/scene/3d/sprite_3d.h
index d243e3ea..f41e612a 100644
--- a/engine/scene/3d/sprite_3d.h
+++ b/engine/scene/3d/sprite_3d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/material.h"
 #include "scene/resources/sprite_frames.h"
 
 class SpriteBase3D : public GeometryInstance3D {
@@ -109,7 +108,7 @@ protected:
 	_FORCE_INLINE_ RID &get_mesh() { return mesh; }
 	_FORCE_INLINE_ RID &get_material() { return material; }
 
-	uint32_t mesh_surface_offsets[RSE::ARRAY_MAX];
+	uint32_t mesh_surface_offsets[RS::ARRAY_MAX];
 	PackedByteArray vertex_buffer;
 	PackedByteArray attribute_buffer;
 	uint32_t vertex_stride = 0;
diff --git a/engine/scene/3d/two_bone_ik_3d.cpp b/engine/scene/3d/two_bone_ik_3d.cpp
index 43c46fca..bcd4c13f 100644
--- a/engine/scene/3d/two_bone_ik_3d.cpp
+++ b/engine/scene/3d/two_bone_ik_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "two_bone_ik_3d.h"
 
-#include "core/object/class_db.h"
-
 bool TwoBoneIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
@@ -231,7 +229,7 @@ void TwoBoneIK3D::set_root_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (tb_settings[p_index]->root_bone.bone <= -1 || tb_settings[p_index]->root_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Root bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Root bone index out of range!");
 			tb_settings[p_index]->root_bone.bone = -1;
 		} else {
 			tb_settings[p_index]->root_bone.name = sk->get_bone_name(tb_settings[p_index]->root_bone.bone);
@@ -268,7 +266,7 @@ void TwoBoneIK3D::set_middle_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (tb_settings[p_index]->middle_bone.bone <= -1 || tb_settings[p_index]->middle_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": Middle bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("Middle bone index out of range!");
 			tb_settings[p_index]->middle_bone.bone = -1;
 			tb_settings[p_index]->use_virtual_end = false; // To sync inspector.
 		} else {
@@ -307,7 +305,7 @@ void TwoBoneIK3D::set_end_bone(int p_index, int p_bone) {
 	Skeleton3D *sk = get_skeleton();
 	if (sk) {
 		if (tb_settings[p_index]->end_bone.bone <= -1 || tb_settings[p_index]->end_bone.bone >= sk->get_bone_count()) {
-			WARN_PRINT_ED("Setting: " + itos(p_index) + ": End bone index '" + itos(p_bone) + "' is out of range!");
+			WARN_PRINT("End bone index out of range!");
 			tb_settings[p_index]->end_bone.bone = -1;
 		} else {
 			tb_settings[p_index]->end_bone.name = sk->get_bone_name(tb_settings[p_index]->end_bone.bone);
@@ -405,9 +403,6 @@ float TwoBoneIK3D::get_end_bone_length(int p_index) const {
 void TwoBoneIK3D::set_target_node(int p_index, const NodePath &p_node_path) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	tb_settings[p_index]->target_node = p_node_path;
-	if (should_check_node_path() && !p_node_path.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_node_path))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Target node '" + String(p_node_path) + "' not found.");
-	}
 	update_configuration_warnings();
 }
 
@@ -419,9 +414,6 @@ NodePath TwoBoneIK3D::get_target_node(int p_index) const {
 void TwoBoneIK3D::set_pole_node(int p_index, const NodePath &p_node_path) {
 	ERR_FAIL_INDEX(p_index, (int)settings.size());
 	tb_settings[p_index]->pole_node = p_node_path;
-	if (should_check_node_path() && !p_node_path.is_empty() && !Object::cast_to<Node3D>(get_node_or_null(p_node_path))) {
-		WARN_PRINT_ED("Setting: " + itos(p_index) + ": Pole node '" + String(p_node_path) + "' not found.");
-	}
 	update_configuration_warnings();
 }
 
diff --git a/engine/scene/3d/velocity_tracker_3d.cpp b/engine/scene/3d/velocity_tracker_3d.cpp
index cb8734af..2b92f72f 100644
--- a/engine/scene/3d/velocity_tracker_3d.cpp
+++ b/engine/scene/3d/velocity_tracker_3d.cpp
@@ -31,7 +31,6 @@
 #include "velocity_tracker_3d.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 void VelocityTracker3D::set_track_physics_step(bool p_track_physics_step) {
 	physics_step = p_track_physics_step;
diff --git a/engine/scene/3d/visible_on_screen_notifier_3d.cpp b/engine/scene/3d/visible_on_screen_notifier_3d.cpp
index 2c9259e4..2e702541 100644
--- a/engine/scene/3d/visible_on_screen_notifier_3d.cpp
+++ b/engine/scene/3d/visible_on_screen_notifier_3d.cpp
@@ -30,11 +30,6 @@
 
 #include "visible_on_screen_notifier_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void VisibleOnScreenNotifier3D::_visibility_enter() {
 	if (!is_inside_tree() || Engine::get_singleton()->is_editor_hint()) {
 		return;
diff --git a/engine/scene/3d/visual_instance_3d.cpp b/engine/scene/3d/visual_instance_3d.cpp
index c4788c8c..a315c179 100644
--- a/engine/scene/3d/visual_instance_3d.cpp
+++ b/engine/scene/3d/visual_instance_3d.cpp
@@ -30,14 +30,7 @@
 
 #include "visual_instance_3d.h"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/material.h"
-#include "servers/rendering/rendering_server.h"
+#include "core/config/project_settings.h"
 
 AABB VisualInstance3D::get_aabb() const {
 	AABB ret;
@@ -251,7 +244,7 @@ float GeometryInstance3D::get_transparency() const {
 
 void GeometryInstance3D::set_visibility_range_begin(float p_dist) {
 	visibility_range_begin = p_dist;
-	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RSE::VisibilityRangeFadeMode)visibility_range_fade_mode);
+	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RS::VisibilityRangeFadeMode)visibility_range_fade_mode);
 	update_configuration_warnings();
 }
 
@@ -261,7 +254,7 @@ float GeometryInstance3D::get_visibility_range_begin() const {
 
 void GeometryInstance3D::set_visibility_range_end(float p_dist) {
 	visibility_range_end = p_dist;
-	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RSE::VisibilityRangeFadeMode)visibility_range_fade_mode);
+	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RS::VisibilityRangeFadeMode)visibility_range_fade_mode);
 	update_configuration_warnings();
 }
 
@@ -271,7 +264,7 @@ float GeometryInstance3D::get_visibility_range_end() const {
 
 void GeometryInstance3D::set_visibility_range_begin_margin(float p_dist) {
 	visibility_range_begin_margin = p_dist;
-	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RSE::VisibilityRangeFadeMode)visibility_range_fade_mode);
+	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RS::VisibilityRangeFadeMode)visibility_range_fade_mode);
 	update_configuration_warnings();
 }
 
@@ -281,7 +274,7 @@ float GeometryInstance3D::get_visibility_range_begin_margin() const {
 
 void GeometryInstance3D::set_visibility_range_end_margin(float p_dist) {
 	visibility_range_end_margin = p_dist;
-	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RSE::VisibilityRangeFadeMode)visibility_range_fade_mode);
+	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RS::VisibilityRangeFadeMode)visibility_range_fade_mode);
 	update_configuration_warnings();
 }
 
@@ -291,7 +284,7 @@ float GeometryInstance3D::get_visibility_range_end_margin() const {
 
 void GeometryInstance3D::set_visibility_range_fade_mode(VisibilityRangeFadeMode p_mode) {
 	visibility_range_fade_mode = p_mode;
-	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RSE::VisibilityRangeFadeMode)visibility_range_fade_mode);
+	RS::get_singleton()->instance_geometry_set_visibility_range(get_instance(), visibility_range_begin, visibility_range_end, visibility_range_begin_margin, visibility_range_end_margin, (RS::VisibilityRangeFadeMode)visibility_range_fade_mode);
 	update_configuration_warnings();
 }
 
@@ -373,7 +366,7 @@ void GeometryInstance3D::_get_property_list(List<PropertyInfo> *p_list) const {
 void GeometryInstance3D::set_cast_shadows_setting(ShadowCastingSetting p_shadow_casting_setting) {
 	shadow_casting_setting = p_shadow_casting_setting;
 
-	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(get_instance(), (RSE::ShadowCastingSetting)p_shadow_casting_setting);
+	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(get_instance(), (RS::ShadowCastingSetting)p_shadow_casting_setting);
 }
 
 GeometryInstance3D::ShadowCastingSetting GeometryInstance3D::get_cast_shadows_setting() const {
@@ -479,17 +472,17 @@ GeometryInstance3D::LightmapScale GeometryInstance3D::get_lightmap_scale() const
 void GeometryInstance3D::set_gi_mode(GIMode p_mode) {
 	switch (p_mode) {
 		case GI_MODE_DISABLED: {
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_DYNAMIC_GI, false);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_DYNAMIC_GI, false);
 		} break;
 		case GI_MODE_STATIC: {
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, true);
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_DYNAMIC_GI, false);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_BAKED_LIGHT, true);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_DYNAMIC_GI, false);
 
 		} break;
 		case GI_MODE_DYNAMIC: {
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_USE_DYNAMIC_GI, true);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_USE_DYNAMIC_GI, true);
 		} break;
 	}
 
@@ -502,7 +495,7 @@ GeometryInstance3D::GIMode GeometryInstance3D::get_gi_mode() const {
 
 void GeometryInstance3D::set_ignore_occlusion_culling(bool p_enabled) {
 	ignore_occlusion_culling = p_enabled;
-	RS::get_singleton()->instance_geometry_set_flag(get_instance(), RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, ignore_occlusion_culling);
+	RS::get_singleton()->instance_geometry_set_flag(get_instance(), RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, ignore_occlusion_culling);
 }
 
 bool GeometryInstance3D::is_ignoring_occlusion_culling() {
diff --git a/engine/scene/3d/visual_instance_3d.h b/engine/scene/3d/visual_instance_3d.h
index 48e26e0c..25226553 100644
--- a/engine/scene/3d/visual_instance_3d.h
+++ b/engine/scene/3d/visual_instance_3d.h
@@ -31,9 +31,7 @@
 #pragma once
 
 #include "scene/3d/node_3d.h"
-#include "servers/rendering/rendering_server_enums.h"
 
-class Material;
 class TriangleMesh;
 
 class VisualInstance3D : public Node3D {
@@ -94,10 +92,10 @@ public:
 	static constexpr AncestralClass static_ancestral_class = AncestralClass::GEOMETRY_INSTANCE_3D;
 
 	enum ShadowCastingSetting {
-		SHADOW_CASTING_SETTING_OFF = RSE::SHADOW_CASTING_SETTING_OFF,
-		SHADOW_CASTING_SETTING_ON = RSE::SHADOW_CASTING_SETTING_ON,
-		SHADOW_CASTING_SETTING_DOUBLE_SIDED = RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED,
-		SHADOW_CASTING_SETTING_SHADOWS_ONLY = RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY,
+		SHADOW_CASTING_SETTING_OFF = RS::SHADOW_CASTING_SETTING_OFF,
+		SHADOW_CASTING_SETTING_ON = RS::SHADOW_CASTING_SETTING_ON,
+		SHADOW_CASTING_SETTING_DOUBLE_SIDED = RS::SHADOW_CASTING_SETTING_DOUBLE_SIDED,
+		SHADOW_CASTING_SETTING_SHADOWS_ONLY = RS::SHADOW_CASTING_SETTING_SHADOWS_ONLY
 	};
 
 	enum GIMode {
@@ -115,9 +113,9 @@ public:
 	};
 
 	enum VisibilityRangeFadeMode {
-		VISIBILITY_RANGE_FADE_DISABLED = RSE::VISIBILITY_RANGE_FADE_DISABLED,
-		VISIBILITY_RANGE_FADE_SELF = RSE::VISIBILITY_RANGE_FADE_SELF,
-		VISIBILITY_RANGE_FADE_DEPENDENCIES = RSE::VISIBILITY_RANGE_FADE_DEPENDENCIES,
+		VISIBILITY_RANGE_FADE_DISABLED = RS::VISIBILITY_RANGE_FADE_DISABLED,
+		VISIBILITY_RANGE_FADE_SELF = RS::VISIBILITY_RANGE_FADE_SELF,
+		VISIBILITY_RANGE_FADE_DEPENDENCIES = RS::VISIBILITY_RANGE_FADE_DEPENDENCIES,
 	};
 
 private:
diff --git a/engine/scene/3d/voxel_gi.cpp b/engine/scene/3d/voxel_gi.cpp
index fc091b30..20e3c8be 100644
--- a/engine/scene/3d/voxel_gi.cpp
+++ b/engine/scene/3d/voxel_gi.cpp
@@ -31,14 +31,10 @@
 #include "voxel_gi.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/multimesh_instance_3d.h"
-#include "scene/3d/voxelizer.h"
-#include "scene/main/scene_tree.h"
+#include "mesh_instance_3d.h"
+#include "multimesh_instance_3d.h"
 #include "scene/resources/camera_attributes.h"
-#include "servers/rendering/rendering_server.h"
+#include "voxelizer.h"
 
 void VoxelGIData::_set_data(const Dictionary &p_data) {
 	ERR_FAIL_COND(!p_data.has("bounds"));
@@ -574,7 +570,7 @@ void VoxelGI::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "subdiv", PROPERTY_HINT_ENUM, "64,128,256,512"), "set_subdiv", "get_subdiv");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "size", PROPERTY_HINT_NONE, "suffix:m"), "set_size", "get_size");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_camera_attributes", "get_camera_attributes");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, VoxelGIData::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE), "set_probe_data", "get_probe_data");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "VoxelGIData", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE), "set_probe_data", "get_probe_data");
 
 	BIND_ENUM_CONSTANT(SUBDIV_64);
 	BIND_ENUM_CONSTANT(SUBDIV_128);
diff --git a/engine/scene/3d/voxel_gi.h b/engine/scene/3d/voxel_gi.h
index 80ed3135..46b0c58d 100644
--- a/engine/scene/3d/voxel_gi.h
+++ b/engine/scene/3d/voxel_gi.h
@@ -33,7 +33,6 @@
 #include "scene/3d/visual_instance_3d.h"
 
 class CameraAttributes;
-class Mesh;
 
 class VoxelGIData : public Resource {
 	GDCLASS(VoxelGIData, Resource);
diff --git a/engine/scene/3d/voxelizer.cpp b/engine/scene/3d/voxelizer.cpp
index dd4b0a2b..8ebdc0e3 100644
--- a/engine/scene/3d/voxelizer.cpp
+++ b/engine/scene/3d/voxelizer.cpp
@@ -31,9 +31,6 @@
 #include "voxelizer.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/image.h"
-#include "core/math/geometry_3d.h"
-#include "scene/resources/texture.h"
 
 static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3 *p_vtx, const Vector2 *p_uv, const Vector3 *p_normal, Vector2 &r_uv, Vector3 &r_normal) {
 	if (p_pos.is_equal_approx(p_vtx[0])) {
@@ -1014,7 +1011,7 @@ Ref<MultiMesh> Voxelizer::create_debug_multimesh() {
 
 		Vector<Vector3> vertices;
 		Vector<Color> colors;
-#define ADD_VTX(m_idx) \
+#define ADD_VTX(m_idx)                      \
 	vertices.push_back(face_points[m_idx]); \
 	colors.push_back(Color(1, 1, 1, 1));
 
diff --git a/engine/scene/3d/voxelizer.h b/engine/scene/3d/voxelizer.h
index 55f870df..13e808cd 100644
--- a/engine/scene/3d/voxelizer.h
+++ b/engine/scene/3d/voxelizer.h
@@ -32,8 +32,6 @@
 
 #include "scene/resources/multimesh.h"
 
-class Image;
-
 class Voxelizer {
 public:
 	enum BakeResult {
diff --git a/engine/scene/3d/world_environment.cpp b/engine/scene/3d/world_environment.cpp
index 7605154e..01148485 100644
--- a/engine/scene/3d/world_environment.cpp
+++ b/engine/scene/3d/world_environment.cpp
@@ -30,9 +30,7 @@
 
 #include "world_environment.h"
 
-#include "core/object/class_db.h"
 #include "scene/3d/node_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void WorldEnvironment::_notification(int p_what) {
@@ -212,7 +210,7 @@ PackedStringArray WorldEnvironment::get_configuration_warnings() const {
 void WorldEnvironment::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_environment", "env"), &WorldEnvironment::set_environment);
 	ClassDB::bind_method(D_METHOD("get_environment"), &WorldEnvironment::get_environment);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, Environment::get_class_static()), "set_environment", "get_environment");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment");
 
 	ClassDB::bind_method(D_METHOD("set_camera_attributes", "camera_attributes"), &WorldEnvironment::set_camera_attributes);
 	ClassDB::bind_method(D_METHOD("get_camera_attributes"), &WorldEnvironment::get_camera_attributes);
@@ -220,7 +218,7 @@ void WorldEnvironment::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_compositor", "compositor"), &WorldEnvironment::set_compositor);
 	ClassDB::bind_method(D_METHOD("get_compositor"), &WorldEnvironment::get_compositor);
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "compositor", PROPERTY_HINT_RESOURCE_TYPE, Compositor::get_class_static()), "set_compositor", "get_compositor");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "compositor", PROPERTY_HINT_RESOURCE_TYPE, "Compositor"), "set_compositor", "get_compositor");
 }
 
 WorldEnvironment::WorldEnvironment() {
diff --git a/engine/scene/3d/xr/xr_body_modifier_3d.cpp b/engine/scene/3d/xr/xr_body_modifier_3d.cpp
index 0f6e294c..4d05f40a 100644
--- a/engine/scene/3d/xr/xr_body_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_body_modifier_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "xr_body_modifier_3d.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/engine/scene/3d/xr/xr_face_modifier_3d.cpp b/engine/scene/3d/xr/xr_face_modifier_3d.cpp
index aa4c2ff7..df7c6b53 100644
--- a/engine/scene/3d/xr/xr_face_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_face_modifier_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "xr_face_modifier_3d.h"
 
-#include "core/object/class_db.h"
 #include "servers/xr/xr_face_tracker.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/engine/scene/3d/xr/xr_face_modifier_3d.h b/engine/scene/3d/xr/xr_face_modifier_3d.h
index 3a9d10ee..75acb79b 100644
--- a/engine/scene/3d/xr/xr_face_modifier_3d.h
+++ b/engine/scene/3d/xr/xr_face_modifier_3d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_map.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
 
diff --git a/engine/scene/3d/xr/xr_hand_modifier_3d.cpp b/engine/scene/3d/xr/xr_hand_modifier_3d.cpp
index 1ba31857..ac106373 100644
--- a/engine/scene/3d/xr/xr_hand_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_hand_modifier_3d.cpp
@@ -31,8 +31,6 @@
 #include "xr_hand_modifier_3d.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 void XRHandModifier3D::_bind_methods() {
diff --git a/engine/scene/3d/xr/xr_nodes.cpp b/engine/scene/3d/xr/xr_nodes.cpp
index 7f58ca9a..d0da5c92 100644
--- a/engine/scene/3d/xr/xr_nodes.cpp
+++ b/engine/scene/3d/xr/xr_nodes.cpp
@@ -30,11 +30,7 @@
 
 #include "xr_nodes.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "servers/xr/xr_interface.h"
 
diff --git a/engine/scene/animation/animation_blend_space_1d.compat.inc b/engine/scene/animation/animation_blend_space_1d.compat.inc
deleted file mode 100644
index 87bbf24d..00000000
--- a/engine/scene/animation/animation_blend_space_1d.compat.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*  animation_blend_space_1d.compat.inc                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "animation_blend_space_1d.h"
-
-#include "core/object/class_db.h"
-
-void AnimationNodeBlendSpace1D::_add_blend_point_bind_compat_110369(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index) {
-	int n = p_at_index == -1 ? blend_points_used : p_at_index;
-	while (find_blend_point_by_name(itos(n)) != -1) {
-		n++;
-	}
-	add_blend_point(p_node, p_position, p_at_index, StringName(itos(n)));
-}
-
-void AnimationNodeBlendSpace1D::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("add_blend_point", "node", "pos", "at_index"), &AnimationNodeBlendSpace1D::_add_blend_point_bind_compat_110369, DEFVAL(-1));
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/scene/animation/animation_blend_space_1d.cpp b/engine/scene/animation/animation_blend_space_1d.cpp
index 42389275..a57ea2e3 100644
--- a/engine/scene/animation/animation_blend_space_1d.cpp
+++ b/engine/scene/animation/animation_blend_space_1d.cpp
@@ -29,12 +29,10 @@
 /**************************************************************************/
 
 #include "animation_blend_space_1d.h"
-#include "animation_blend_space_1d.compat.inc"
 
-#include "core/object/class_db.h"
-#include "scene/animation/animation_blend_tree.h"
+#include "animation_blend_tree.h"
 
-void AnimationNodeBlendSpace1D::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeBlendSpace1D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, blend_position));
 	r_list->push_back(PropertyInfo(Variant::INT, closest, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE));
@@ -54,11 +52,17 @@ Variant AnimationNodeBlendSpace1D::get_parameter_default_value(const StringName
 }
 
 Ref<AnimationNode> AnimationNodeBlendSpace1D::get_child_by_name(const StringName &p_name) const {
-	int point_index = find_blend_point_by_name(p_name);
-	if (point_index != -1) {
-		return get_blend_point_node(point_index);
+	return get_blend_point_node(p_name.operator String().to_int());
+}
+
+void AnimationNodeBlendSpace1D::_validate_property(PropertyInfo &p_property) const {
+	if (p_property.name.begins_with("blend_point_")) {
+		String left = p_property.name.get_slicec('/', 0);
+		int idx = left.get_slicec('_', 2).to_int();
+		if (idx >= blend_points_used) {
+			p_property.usage = PROPERTY_USAGE_NONE;
+		}
 	}
-	return Ref<AnimationRootNode>();
 }
 
 void AnimationNodeBlendSpace1D::_tree_changed() {
@@ -73,26 +77,14 @@ void AnimationNodeBlendSpace1D::_animation_node_removed(const ObjectID &p_oid, c
 	AnimationRootNode::_animation_node_removed(p_oid, p_node);
 }
 
-void AnimationNodeBlendSpace1D::validate_node(const AnimationTree *p_tree, const StringName &p_path) const {
-	AnimationRootNode::validate_node(p_tree, p_path);
-
-	if (get_blend_point_count() == 0) {
-		add_validation_error(p_tree, p_path, RTR("No blend points exist, so blending cannot take place."));
-	}
-}
-
 void AnimationNodeBlendSpace1D::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("add_blend_point", "node", "pos", "at_index", "name"), &AnimationNodeBlendSpace1D::add_blend_point, DEFVAL(-1), DEFVAL(StringName()));
+	ClassDB::bind_method(D_METHOD("add_blend_point", "node", "pos", "at_index"), &AnimationNodeBlendSpace1D::add_blend_point, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("set_blend_point_position", "point", "pos"), &AnimationNodeBlendSpace1D::set_blend_point_position);
 	ClassDB::bind_method(D_METHOD("get_blend_point_position", "point"), &AnimationNodeBlendSpace1D::get_blend_point_position);
 	ClassDB::bind_method(D_METHOD("set_blend_point_node", "point", "node"), &AnimationNodeBlendSpace1D::set_blend_point_node);
 	ClassDB::bind_method(D_METHOD("get_blend_point_node", "point"), &AnimationNodeBlendSpace1D::get_blend_point_node);
-	ClassDB::bind_method(D_METHOD("set_blend_point_name", "point", "name"), &AnimationNodeBlendSpace1D::set_blend_point_name);
-	ClassDB::bind_method(D_METHOD("get_blend_point_name", "point"), &AnimationNodeBlendSpace1D::get_blend_point_name);
-	ClassDB::bind_method(D_METHOD("find_blend_point_by_name", "name"), &AnimationNodeBlendSpace1D::find_blend_point_by_name);
 	ClassDB::bind_method(D_METHOD("remove_blend_point", "point"), &AnimationNodeBlendSpace1D::remove_blend_point);
 	ClassDB::bind_method(D_METHOD("get_blend_point_count"), &AnimationNodeBlendSpace1D::get_blend_point_count);
-	ClassDB::bind_method(D_METHOD("reorder_blend_point", "from_index", "to_index"), &AnimationNodeBlendSpace1D::reorder_blend_point);
 
 	ClassDB::bind_method(D_METHOD("set_min_space", "min_space"), &AnimationNodeBlendSpace1D::set_min_space);
 	ClassDB::bind_method(D_METHOD("get_min_space"), &AnimationNodeBlendSpace1D::get_min_space);
@@ -112,6 +104,13 @@ void AnimationNodeBlendSpace1D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_use_sync", "enable"), &AnimationNodeBlendSpace1D::set_use_sync);
 	ClassDB::bind_method(D_METHOD("is_using_sync"), &AnimationNodeBlendSpace1D::is_using_sync);
 
+	ClassDB::bind_method(D_METHOD("_add_blend_point", "index", "node"), &AnimationNodeBlendSpace1D::_add_blend_point);
+
+	for (int i = 0; i < MAX_BLEND_POINTS; i++) {
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "blend_point_" + itos(i) + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_add_blend_point", "get_blend_point_node", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "blend_point_" + itos(i) + "/pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_blend_point_position", "get_blend_point_position", i);
+	}
+
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "min_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_min_space", "get_min_space");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_max_space", "get_max_space");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "snap", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_snap", "get_snap");
@@ -124,28 +123,21 @@ void AnimationNodeBlendSpace1D::_bind_methods() {
 	BIND_ENUM_CONSTANT(BLEND_MODE_DISCRETE_CARRY);
 }
 
-void AnimationNodeBlendSpace1D::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
+void AnimationNodeBlendSpace1D::get_child_nodes(List<ChildNode> *r_child_nodes) {
 	for (int i = 0; i < blend_points_used; i++) {
 		ChildNode cn;
-		cn.name = blend_points[i].name;
+		cn.name = itos(i);
 		cn.node = blend_points[i].node;
 		r_child_nodes->push_back(cn);
 	}
 }
 
-void AnimationNodeBlendSpace1D::add_blend_point(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index, const StringName &p_name) {
+void AnimationNodeBlendSpace1D::add_blend_point(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index) {
 	ERR_FAIL_COND(blend_points_used >= MAX_BLEND_POINTS);
 	ERR_FAIL_COND(p_node.is_null());
+
 	ERR_FAIL_COND(p_at_index < -1 || p_at_index > blend_points_used);
-#ifndef DISABLE_DEPRECATED
-	if (p_name == StringName()) {
-		_add_blend_point_bind_compat_110369(p_node, p_position, p_at_index);
-		WARN_PRINT_ED("AnimationNodeBlendSpace1D::add_blend_point: No name provided, using safe index as reference. In the future, empty names will be deprecated, so explicitly passing a name is recommended.");
-		return;
-	}
-#else
-	ERR_FAIL_COND(p_name == StringName());
-#endif
+
 	if (p_at_index == -1 || p_at_index == blend_points_used) {
 		p_at_index = blend_points_used;
 	} else {
@@ -156,12 +148,13 @@ void AnimationNodeBlendSpace1D::add_blend_point(const Ref<AnimationRootNode> &p_
 
 	blend_points[p_at_index].node = p_node;
 	blend_points[p_at_index].position = p_position;
-	blend_points[p_at_index].name = p_name;
 
-	_add_node(blend_points[p_at_index].node);
+	blend_points[p_at_index].node->connect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace1D::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_at_index].node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_at_index].node->connect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 
 	blend_points_used++;
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 void AnimationNodeBlendSpace1D::set_blend_point_position(int p_point, float p_position) {
@@ -175,13 +168,17 @@ void AnimationNodeBlendSpace1D::set_blend_point_node(int p_point, const Ref<Anim
 	ERR_FAIL_COND(p_node.is_null());
 
 	if (blend_points[p_point].node.is_valid()) {
-		_remove_node(blend_points[p_point].node);
+		blend_points[p_point].node->disconnect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace1D::_tree_changed));
+		blend_points[p_point].node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_renamed));
+		blend_points[p_point].node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_removed));
 	}
 
 	blend_points[p_point].node = p_node;
-	_add_node(blend_points[p_point].node);
+	blend_points[p_point].node->connect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace1D::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_point].node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_point].node->connect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 float AnimationNodeBlendSpace1D::get_blend_point_position(int p_point) const {
@@ -194,38 +191,13 @@ Ref<AnimationRootNode> AnimationNodeBlendSpace1D::get_blend_point_node(int p_poi
 	return blend_points[p_point].node;
 }
 
-void AnimationNodeBlendSpace1D::set_blend_point_name(int p_point, const StringName &p_name) {
-	ERR_FAIL_INDEX(p_point, blend_points_used);
-	String new_name = p_name;
-	ERR_FAIL_COND(new_name.is_empty() || new_name.contains_char('.') || new_name.contains_char('/'));
-
-	String old_name = blend_points[p_point].name;
-	if (new_name != old_name) {
-		blend_points[p_point].name = p_name;
-		emit_signal(SNAME("animation_node_renamed"), get_instance_id(), old_name, new_name);
-	}
-}
-
-const StringName &AnimationNodeBlendSpace1D::get_blend_point_name(int p_point) const {
-	const static StringName empty = StringName();
-	ERR_FAIL_INDEX_V(p_point, blend_points_used, empty);
-	return blend_points[p_point].name;
-}
-
-int AnimationNodeBlendSpace1D::find_blend_point_by_name(const StringName &p_name) const {
-	for (int i = 0; i < blend_points_used; i++) {
-		if (blend_points[i].name == p_name) {
-			return i;
-		}
-	}
-	return -1;
-}
-
 void AnimationNodeBlendSpace1D::remove_blend_point(int p_point) {
 	ERR_FAIL_INDEX(p_point, blend_points_used);
 
 	ERR_FAIL_COND(blend_points[p_point].node.is_null());
-	_remove_node(blend_points[p_point].node);
+	blend_points[p_point].node->disconnect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace1D::_tree_changed));
+	blend_points[p_point].node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_renamed));
+	blend_points[p_point].node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace1D::_animation_node_removed));
 
 	for (int i = p_point; i < blend_points_used - 1; i++) {
 		blend_points[i] = blend_points[i + 1];
@@ -233,32 +205,14 @@ void AnimationNodeBlendSpace1D::remove_blend_point(int p_point) {
 
 	blend_points_used--;
 
-	blend_points[blend_points_used].name = StringName();
-
 	emit_signal(SNAME("animation_node_removed"), get_instance_id(), itos(p_point));
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 int AnimationNodeBlendSpace1D::get_blend_point_count() const {
 	return blend_points_used;
 }
 
-void AnimationNodeBlendSpace1D::reorder_blend_point(int p_from_index, int p_to_index) {
-	ERR_FAIL_INDEX(p_from_index, blend_points_used);
-	ERR_FAIL_INDEX(p_to_index, blend_points_used);
-
-	if (p_from_index == p_to_index) {
-		return;
-	}
-
-	BlendPoint temp = blend_points[p_from_index];
-
-	blend_points[p_from_index] = blend_points[p_to_index];
-	blend_points[p_to_index] = temp;
-
-	emit_signal(SNAME("tree_changed"));
-}
-
 void AnimationNodeBlendSpace1D::set_min_space(float p_min) {
 	min_space = p_min;
 
@@ -315,57 +269,15 @@ bool AnimationNodeBlendSpace1D::is_using_sync() const {
 	return sync;
 }
 
-bool AnimationNodeBlendSpace1D::_set(const StringName &p_name, const Variant &p_value) {
-	String prop = p_name;
-	if (prop.begins_with("blend_point_")) {
-		int idx = prop.get_slicec('_', 2).to_int();
-		String what = prop.get_slicec('/', 1);
-		if (idx == blend_points_used && what == "node") {
-			add_blend_point(p_value, 0, -1, StringName(itos(idx)));
-			return true;
-		}
-		if (what == "node") {
-			set_blend_point_node(idx, p_value);
-		} else if (what == "pos") {
-			set_blend_point_position(idx, p_value);
-		} else if (what == "name") {
-			set_blend_point_name(idx, p_value);
-		} else {
-			return false;
-		}
-		return true;
-	}
-	return false;
-}
-
-bool AnimationNodeBlendSpace1D::_get(const StringName &p_name, Variant &r_ret) const {
-	String prop = p_name;
-	if (prop.begins_with("blend_point_")) {
-		int idx = prop.get_slicec('_', 2).to_int();
-		String what = prop.get_slicec('/', 1);
-		if (what == "node") {
-			r_ret = get_blend_point_node(idx);
-		} else if (what == "pos") {
-			r_ret = get_blend_point_position(idx);
-		} else if (what == "name") {
-			r_ret = get_blend_point_name(idx);
-		} else {
-			return false;
-		}
-		return true;
-	}
-	return false;
-}
-
-void AnimationNodeBlendSpace1D::_get_property_list(List<PropertyInfo> *p_list) const {
-	for (int i = 0; i < blend_points_used; i++) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, "blend_point_" + itos(i) + "/node", PROPERTY_HINT_RESOURCE_TYPE, AnimationRootNode::get_class_static(), PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
-		p_list->push_back(PropertyInfo(Variant::FLOAT, "blend_point_" + itos(i) + "/pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
-		p_list->push_back(PropertyInfo(Variant::STRING, "blend_point_" + itos(i) + "/name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
+void AnimationNodeBlendSpace1D::_add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node) {
+	if (p_index == blend_points_used) {
+		add_blend_point(p_node, 0);
+	} else {
+		set_blend_point_node(p_index, p_node);
 	}
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	if (!blend_points_used) {
 		return NodeTimeInfo();
 	}
@@ -375,12 +287,11 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_
 	if (blend_points_used == 1) {
 		// only one point available, just play that animation
 		pi.weight = 1.0;
-		AnimationNodeInstance &other_instance = p_instance.get_child_instance_by_path(get_blend_point_name(0));
-		return blend_node(p_process_state, p_instance, &other_instance, pi, FILTER_IGNORE, true, p_test_only);
+		return blend_node(blend_points[0].node, blend_points[0].name, pi, FILTER_IGNORE, true, p_test_only);
 	}
 
-	double blend_pos = p_instance.get_parameter(blend_position);
-	int cur_closest = p_instance.get_parameter_closest();
+	double blend_pos = get_parameter(blend_position);
+	int cur_closest = get_parameter(closest);
 	NodeTimeInfo mind;
 
 	if (blend_mode == BLEND_MODE_INTERPOLATED) {
@@ -439,8 +350,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_
 		for (int i = 0; i < blend_points_used; i++) {
 			if (i == point_lower || i == point_higher) {
 				pi.weight = weights[i];
-				AnimationNodeInstance &other_instance = p_instance.get_child_instance_by_path(get_blend_point_name(i));
-				NodeTimeInfo t = blend_node(p_process_state, p_instance, &other_instance, pi, FILTER_IGNORE, true, p_test_only);
+				NodeTimeInfo t = blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 				if (first || pi.weight > max_weight) {
 					max_weight = pi.weight;
 					mind = t;
@@ -448,8 +358,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_
 				}
 			} else if (sync) {
 				pi.weight = 0;
-				AnimationNodeInstance &other_instance = p_instance.get_child_instance_by_path(get_blend_point_name(i));
-				blend_node(p_process_state, p_instance, &other_instance, pi, FILTER_IGNORE, true, p_test_only);
+				blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 			}
 		}
 	} else {
@@ -464,33 +373,34 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_
 			}
 		}
 
-		AnimationNodeInstance *instance_current_closest = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(cur_closest));
 		if (new_closest != cur_closest && new_closest != -1) {
-			AnimationNodeInstance *instance_new_closest = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(new_closest));
-
 			if (blend_mode == BLEND_MODE_DISCRETE_CARRY && cur_closest != -1) {
 				NodeTimeInfo from;
 				// For ping-pong loop.
 				Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[cur_closest].node);
 				Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
-				if (na_c.is_valid() && na_n.is_valid() && instance_current_closest && instance_new_closest) {
-					na_n->set_backward(*instance_new_closest, p_process_state, na_c->is_backward(*instance_current_closest, p_process_state));
+				if (na_c.is_valid() && na_n.is_valid()) {
+					na_n->process_state = process_state;
+					na_c->process_state = process_state;
+
+					na_n->set_backward(na_c->is_backward());
+
 					na_n = nullptr;
 					na_c = nullptr;
 				}
 				// See how much animation remains.
 				pi.seeked = false;
 				pi.weight = 0;
-				from = blend_node(p_process_state, p_instance, instance_current_closest, pi, FILTER_IGNORE, true, true);
+				from = blend_node(blend_points[cur_closest].node, blend_points[cur_closest].name, pi, FILTER_IGNORE, true, true);
 				pi.time = from.position;
 			}
 			pi.seeked = true;
 			pi.weight = 1.0;
-			mind = blend_node(p_process_state, p_instance, instance_new_closest, pi, FILTER_IGNORE, true, p_test_only);
+			mind = blend_node(blend_points[new_closest].node, blend_points[new_closest].name, pi, FILTER_IGNORE, true, p_test_only);
 			cur_closest = new_closest;
 		} else {
 			pi.weight = 1.0;
-			mind = blend_node(p_process_state, p_instance, instance_current_closest, pi, FILTER_IGNORE, true, p_test_only);
+			mind = blend_node(blend_points[cur_closest].node, blend_points[cur_closest].name, pi, FILTER_IGNORE, true, p_test_only);
 		}
 
 		if (sync) {
@@ -498,14 +408,13 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(ProcessState &p_
 			pi.weight = 0;
 			for (int i = 0; i < blend_points_used; i++) {
 				if (i != cur_closest) {
-					AnimationNodeInstance &other_instance = p_instance.get_child_instance_by_path(get_blend_point_name(i));
-					blend_node(p_process_state, p_instance, &other_instance, pi, FILTER_IGNORE, true, p_test_only);
+					blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 				}
 			}
 		}
 	}
 
-	p_instance.set_parameter_closest(cur_closest, p_process_state.is_testing);
+	set_parameter(closest, cur_closest);
 	return mind;
 }
 
@@ -514,6 +423,9 @@ String AnimationNodeBlendSpace1D::get_caption() const {
 }
 
 AnimationNodeBlendSpace1D::AnimationNodeBlendSpace1D() {
+	for (int i = 0; i < MAX_BLEND_POINTS; i++) {
+		blend_points[i].name = itos(i);
+	}
 }
 
 AnimationNodeBlendSpace1D::~AnimationNodeBlendSpace1D() {
diff --git a/engine/scene/animation/animation_blend_space_1d.h b/engine/scene/animation/animation_blend_space_1d.h
index f90f61a1..0bd29cd9 100644
--- a/engine/scene/animation/animation_blend_space_1d.h
+++ b/engine/scene/animation/animation_blend_space_1d.h
@@ -63,9 +63,7 @@ protected:
 
 	String value_label = "value";
 
-	bool _set(const StringName &p_name, const Variant &p_value);
-	bool _get(const StringName &p_name, Variant &r_ret) const;
-	void _get_property_list(List<PropertyInfo> *p_list) const;
+	void _add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node);
 
 	StringName blend_position = "blend_position";
 	StringName closest = "closest";
@@ -74,39 +72,28 @@ protected:
 
 	bool sync = false;
 
+	void _validate_property(PropertyInfo &p_property) const;
 	static void _bind_methods();
 
 	virtual void _tree_changed() override;
 	virtual void _animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name) override;
 	virtual void _animation_node_removed(const ObjectID &p_oid, const StringName &p_node) override;
 
-#ifndef DISABLE_DEPRECATED
-	void _add_blend_point_bind_compat_110369(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index = -1);
-	static void _bind_compatibility_methods();
-#endif
-
 public:
-	virtual void validate_node(const AnimationTree *p_tree, const StringName &p_path) const override;
-
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
-	virtual void get_child_nodes(LocalVector<ChildNode> *r_child_nodes) override;
+	virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
 
-	void add_blend_point(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index = -1, const StringName &p_name = "");
+	void add_blend_point(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index = -1);
 	void set_blend_point_position(int p_point, float p_position);
 	void set_blend_point_node(int p_point, const Ref<AnimationRootNode> &p_node);
 
 	float get_blend_point_position(int p_point) const;
 	Ref<AnimationRootNode> get_blend_point_node(int p_point) const;
-	void set_blend_point_name(int p_point, const StringName &p_name);
-	const StringName &get_blend_point_name(int p_point) const;
-	int find_blend_point_by_name(const StringName &p_name) const;
 	void remove_blend_point(int p_point);
 	int get_blend_point_count() const;
 
-	void reorder_blend_point(int p_from_index, int p_to_index);
-
 	void set_min_space(float p_min);
 	float get_min_space() const;
 
@@ -125,7 +112,7 @@ public:
 	void set_use_sync(bool p_sync);
 	bool is_using_sync() const;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 	String get_caption() const override;
 
 	Ref<AnimationNode> get_child_by_name(const StringName &p_name) const override;
diff --git a/engine/scene/animation/animation_blend_space_2d.compat.inc b/engine/scene/animation/animation_blend_space_2d.compat.inc
deleted file mode 100644
index 59994aa0..00000000
--- a/engine/scene/animation/animation_blend_space_2d.compat.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*  animation_blend_space_2d.compat.inc                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "animation_blend_space_2d.h"
-
-#include "core/object/class_db.h"
-
-void AnimationNodeBlendSpace2D::_add_blend_point_bind_compat_110369(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index) {
-	int n = p_at_index == -1 ? blend_points_used : p_at_index;
-	while (find_blend_point_by_name(itos(n)) != -1) {
-		n++;
-	}
-	add_blend_point(p_node, p_position, p_at_index, StringName(itos(n)));
-}
-
-void AnimationNodeBlendSpace2D::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("add_blend_point", "node", "pos", "at_index"), &AnimationNodeBlendSpace2D::_add_blend_point_bind_compat_110369, DEFVAL(-1));
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/scene/animation/animation_blend_space_2d.cpp b/engine/scene/animation/animation_blend_space_2d.cpp
index 12e2ea7a..62ba7edd 100644
--- a/engine/scene/animation/animation_blend_space_2d.cpp
+++ b/engine/scene/animation/animation_blend_space_2d.cpp
@@ -29,14 +29,12 @@
 /**************************************************************************/
 
 #include "animation_blend_space_2d.h"
-#include "animation_blend_space_2d.compat.inc"
 
+#include "animation_blend_tree.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/animation/animation_blend_tree.h"
+#include "scene/resources/material.h"
 
-void AnimationNodeBlendSpace2D::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::VECTOR2, blend_position));
 	r_list->push_back(PropertyInfo(Variant::INT, closest, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE));
@@ -55,28 +53,19 @@ Variant AnimationNodeBlendSpace2D::get_parameter_default_value(const StringName
 	}
 }
 
-void AnimationNodeBlendSpace2D::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
+void AnimationNodeBlendSpace2D::get_child_nodes(List<ChildNode> *r_child_nodes) {
 	for (int i = 0; i < blend_points_used; i++) {
 		ChildNode cn;
-		cn.name = blend_points[i].name;
+		cn.name = itos(i);
 		cn.node = blend_points[i].node;
 		r_child_nodes->push_back(cn);
 	}
 }
 
-void AnimationNodeBlendSpace2D::add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index, const StringName &p_name) {
+void AnimationNodeBlendSpace2D::add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index) {
 	ERR_FAIL_COND(blend_points_used >= MAX_BLEND_POINTS);
 	ERR_FAIL_COND(p_node.is_null());
 	ERR_FAIL_COND(p_at_index < -1 || p_at_index > blend_points_used);
-#ifndef DISABLE_DEPRECATED
-	if (p_name == StringName()) {
-		_add_blend_point_bind_compat_110369(p_node, p_position, p_at_index);
-		WARN_PRINT_ED("AnimationNodeBlendSpace2D::add_blend_point: No name provided, using safe index as reference. In the future, empty names will be deprecated, so explicitly passing a name is recommended.");
-		return;
-	}
-#else
-	ERR_FAIL_COND(p_name == StringName());
-#endif
 
 	if (p_at_index == -1 || p_at_index == blend_points_used) {
 		p_at_index = blend_points_used;
@@ -94,14 +83,15 @@ void AnimationNodeBlendSpace2D::add_blend_point(const Ref<AnimationRootNode> &p_
 	}
 	blend_points[p_at_index].node = p_node;
 	blend_points[p_at_index].position = p_position;
-	blend_points[p_at_index].name = p_name;
 
-	_add_node(blend_points[p_at_index].node);
+	blend_points[p_at_index].node->connect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace2D::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_at_index].node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_at_index].node->connect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 	blend_points_used++;
 
 	_queue_auto_triangles();
 
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 void AnimationNodeBlendSpace2D::set_blend_point_position(int p_point, const Vector2 &p_position) {
@@ -115,12 +105,16 @@ void AnimationNodeBlendSpace2D::set_blend_point_node(int p_point, const Ref<Anim
 	ERR_FAIL_COND(p_node.is_null());
 
 	if (blend_points[p_point].node.is_valid()) {
-		_remove_node(blend_points[p_point].node);
+		blend_points[p_point].node->disconnect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace2D::_tree_changed));
+		blend_points[p_point].node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_renamed));
+		blend_points[p_point].node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_removed));
 	}
 	blend_points[p_point].node = p_node;
-	_add_node(blend_points[p_point].node);
+	blend_points[p_point].node->connect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace2D::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_point].node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	blend_points[p_point].node->connect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 Vector2 AnimationNodeBlendSpace2D::get_blend_point_position(int p_point) const {
@@ -133,38 +127,13 @@ Ref<AnimationRootNode> AnimationNodeBlendSpace2D::get_blend_point_node(int p_poi
 	return blend_points[p_point].node;
 }
 
-void AnimationNodeBlendSpace2D::set_blend_point_name(int p_point, const StringName &p_name) {
-	ERR_FAIL_INDEX(p_point, blend_points_used);
-	String new_name = p_name;
-	ERR_FAIL_COND(new_name.is_empty() || new_name.contains_char('.') || new_name.contains_char('/'));
-
-	String old_name = blend_points[p_point].name;
-	if (new_name != old_name) {
-		blend_points[p_point].name = p_name;
-		emit_signal(SNAME("animation_node_renamed"), get_instance_id(), old_name, p_name);
-	}
-}
-
-const StringName &AnimationNodeBlendSpace2D::get_blend_point_name(int p_point) const {
-	const static StringName empty = StringName();
-	ERR_FAIL_INDEX_V(p_point, blend_points_used, empty);
-	return blend_points[p_point].name;
-}
-
-int AnimationNodeBlendSpace2D::find_blend_point_by_name(const StringName &p_name) const {
-	for (int i = 0; i < blend_points_used; i++) {
-		if (blend_points[i].name == p_name) {
-			return i;
-		}
-	}
-	return -1;
-}
-
 void AnimationNodeBlendSpace2D::remove_blend_point(int p_point) {
 	ERR_FAIL_INDEX(p_point, blend_points_used);
 
 	ERR_FAIL_COND(blend_points[p_point].node.is_null());
-	_remove_node(blend_points[p_point].node);
+	blend_points[p_point].node->disconnect("tree_changed", callable_mp(this, &AnimationNodeBlendSpace2D::_tree_changed));
+	blend_points[p_point].node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_renamed));
+	blend_points[p_point].node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeBlendSpace2D::_animation_node_removed));
 
 	for (int i = 0; i < triangles.size(); i++) {
 		bool erase = false;
@@ -188,48 +157,14 @@ void AnimationNodeBlendSpace2D::remove_blend_point(int p_point) {
 	}
 	blend_points_used--;
 
-	blend_points[blend_points_used].name = StringName();
-
 	emit_signal(SNAME("animation_node_removed"), get_instance_id(), itos(p_point));
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 int AnimationNodeBlendSpace2D::get_blend_point_count() const {
 	return blend_points_used;
 }
 
-void AnimationNodeBlendSpace2D::reorder_blend_point(int p_from_index, int p_to_index) {
-	ERR_FAIL_INDEX(p_from_index, blend_points_used);
-	ERR_FAIL_INDEX(p_to_index, blend_points_used);
-
-	if (p_from_index == p_to_index) {
-		return;
-	}
-
-	// Update triangle indices for swap operation
-	for (int i = 0; i < triangles.size(); i++) {
-		for (int j = 0; j < 3; j++) {
-			int point_ref = triangles[i].points[j];
-
-			if (point_ref == p_from_index) {
-				triangles.write[i].points[j] = p_to_index;
-			} else if (point_ref == p_to_index) {
-				triangles.write[i].points[j] = p_from_index;
-			}
-		}
-	}
-
-	BlendPoint temp = blend_points[p_from_index];
-
-	blend_points[p_from_index] = blend_points[p_to_index];
-	blend_points[p_to_index] = temp;
-
-	_queue_auto_triangles();
-
-	emit_signal(SNAME("tree_changed"));
-	emit_signal(SNAME("triangles_updated"));
-}
-
 bool AnimationNodeBlendSpace2D::has_triangle(int p_x, int p_y, int p_z) const {
 	ERR_FAIL_INDEX_V(p_x, blend_points_used, false);
 	ERR_FAIL_INDEX_V(p_y, blend_points_used, false);
@@ -362,6 +297,14 @@ String AnimationNodeBlendSpace2D::get_y_label() const {
 	return y_label;
 }
 
+void AnimationNodeBlendSpace2D::_add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node) {
+	if (p_index == blend_points_used) {
+		add_blend_point(p_node, Vector2());
+	} else {
+		set_blend_point_node(p_index, p_node);
+	}
+}
+
 void AnimationNodeBlendSpace2D::_set_triangles(const Vector<int> &p_triangles) {
 	if (auto_triangles) {
 		return;
@@ -387,56 +330,6 @@ Vector<int> AnimationNodeBlendSpace2D::_get_triangles() const {
 	return t;
 }
 
-bool AnimationNodeBlendSpace2D::_set(const StringName &p_name, const Variant &p_value) {
-	String prop = p_name;
-	if (prop.begins_with("blend_point_")) {
-		int idx = prop.get_slicec('_', 2).to_int();
-		String what = prop.get_slicec('/', 1);
-		if (idx == blend_points_used && what == "node") {
-			add_blend_point(p_value, Vector2(), -1, StringName(itos(idx)));
-			return true;
-		}
-		if (what == "node") {
-			set_blend_point_node(idx, p_value);
-		} else if (what == "pos") {
-			set_blend_point_position(idx, p_value);
-		} else if (what == "name") {
-			set_blend_point_name(idx, p_value);
-		} else {
-			return false;
-		}
-		return true;
-	}
-	return false;
-}
-
-bool AnimationNodeBlendSpace2D::_get(const StringName &p_name, Variant &r_ret) const {
-	String prop = p_name;
-	if (prop.begins_with("blend_point_")) {
-		int idx = prop.get_slicec('_', 2).to_int();
-		String what = prop.get_slicec('/', 1);
-		if (what == "node") {
-			r_ret = get_blend_point_node(idx);
-		} else if (what == "pos") {
-			r_ret = get_blend_point_position(idx);
-		} else if (what == "name") {
-			r_ret = get_blend_point_name(idx);
-		} else {
-			return false;
-		}
-		return true;
-	}
-	return false;
-}
-
-void AnimationNodeBlendSpace2D::_get_property_list(List<PropertyInfo> *p_list) const {
-	for (int i = 0; i < blend_points_used; i++) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, "blend_point_" + itos(i) + "/node", PROPERTY_HINT_RESOURCE_TYPE, AnimationRootNode::get_class_static(), PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
-		p_list->push_back(PropertyInfo(Variant::VECTOR2, "blend_point_" + itos(i) + "/pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
-		p_list->push_back(PropertyInfo(Variant::STRING, "blend_point_" + itos(i) + "/name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
-	}
-}
-
 void AnimationNodeBlendSpace2D::_queue_auto_triangles() {
 	if (!auto_triangles || triangles_dirty) {
 		return;
@@ -551,15 +444,15 @@ void AnimationNodeBlendSpace2D::_blend_triangle(const Vector2 &p_pos, const Vect
 	r_weights[2] = w;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	_update_triangles();
 
 	if (!blend_points_used) {
 		return NodeTimeInfo();
 	}
 
-	Vector2 blend_pos = p_instance.get_parameter(blend_position);
-	int cur_closest = p_instance.get_parameter_closest();
+	Vector2 blend_pos = get_parameter(blend_position);
+	int cur_closest = get_parameter(closest);
 	NodeTimeInfo mind; //time of min distance point
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
@@ -626,8 +519,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(ProcessState &p_
 				if (i == triangle_points[j]) {
 					//blend with the given weight
 					pi.weight = blend_weights[j];
-					AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(i));
-					NodeTimeInfo t = blend_node(p_process_state, p_instance, other_instance, pi, FILTER_IGNORE, true, p_test_only);
+					NodeTimeInfo t = blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 					if (first || pi.weight > max_weight) {
 						mind = t;
 						max_weight = pi.weight;
@@ -640,8 +532,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(ProcessState &p_
 
 			if (sync && !found) {
 				pi.weight = 0;
-				AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(i));
-				blend_node(p_process_state, p_instance, other_instance, pi, FILTER_IGNORE, true, p_test_only);
+				blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 			}
 		}
 	} else {
@@ -656,33 +547,34 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(ProcessState &p_
 			}
 		}
 
-		AnimationNodeInstance *instance_current_closest = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(cur_closest));
 		if (new_closest != cur_closest && new_closest != -1) {
-			AnimationNodeInstance *instance_new_closest = p_instance.get_child_instance_by_path_or_null(get_blend_point_name(new_closest));
-
 			if (blend_mode == BLEND_MODE_DISCRETE_CARRY && cur_closest != -1) {
 				NodeTimeInfo from;
 				// For ping-pong loop.
 				Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[cur_closest].node);
 				Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
-				if (na_c.is_valid() && na_n.is_valid() && instance_current_closest && instance_new_closest) {
-					na_n->set_backward(*instance_new_closest, p_process_state, na_c->is_backward(*instance_current_closest, p_process_state));
+				if (na_c.is_valid() && na_n.is_valid()) {
+					na_n->process_state = process_state;
+					na_c->process_state = process_state;
+
+					na_n->set_backward(na_c->is_backward());
+
 					na_n = nullptr;
 					na_c = nullptr;
 				}
 				// See how much animation remains.
 				pi.seeked = false;
 				pi.weight = 0;
-				from = blend_node(p_process_state, p_instance, instance_current_closest, pi, FILTER_IGNORE, true, true);
+				from = blend_node(blend_points[cur_closest].node, blend_points[cur_closest].name, pi, FILTER_IGNORE, true, true);
 				pi.time = from.position;
 			}
 			pi.seeked = true;
 			pi.weight = 1.0;
-			mind = blend_node(p_process_state, p_instance, instance_new_closest, pi, FILTER_IGNORE, true, p_test_only);
+			mind = blend_node(blend_points[new_closest].node, blend_points[new_closest].name, pi, FILTER_IGNORE, true, p_test_only);
 			cur_closest = new_closest;
 		} else {
 			pi.weight = 1.0;
-			mind = blend_node(p_process_state, p_instance, instance_current_closest, pi, FILTER_IGNORE, true, p_test_only);
+			mind = blend_node(blend_points[cur_closest].node, blend_points[cur_closest].name, pi, FILTER_IGNORE, true, p_test_only);
 		}
 
 		if (sync) {
@@ -690,14 +582,13 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(ProcessState &p_
 			pi.weight = 0;
 			for (int i = 0; i < blend_points_used; i++) {
 				if (i != cur_closest) {
-					AnimationNodeInstance &other_instance = p_instance.get_child_instance_by_path(get_blend_point_name(i));
-					blend_node(p_process_state, p_instance, &other_instance, pi, FILTER_IGNORE, true, p_test_only);
+					blend_node(blend_points[i].node, blend_points[i].name, pi, FILTER_IGNORE, true, p_test_only);
 				}
 			}
 		}
 	}
 
-	p_instance.set_parameter_closest(cur_closest, p_process_state.is_testing);
+	set_parameter(closest, cur_closest);
 	return mind;
 }
 
@@ -709,6 +600,13 @@ void AnimationNodeBlendSpace2D::_validate_property(PropertyInfo &p_property) con
 	if (auto_triangles && p_property.name == "triangles") {
 		p_property.usage = PROPERTY_USAGE_NONE;
 	}
+	if (p_property.name.begins_with("blend_point_")) {
+		String left = p_property.name.get_slicec('/', 0);
+		int idx = left.get_slicec('_', 2).to_int();
+		if (idx >= blend_points_used) {
+			p_property.usage = PROPERTY_USAGE_NONE;
+		}
+	}
 }
 
 void AnimationNodeBlendSpace2D::set_auto_triangles(bool p_enable) {
@@ -725,11 +623,7 @@ bool AnimationNodeBlendSpace2D::get_auto_triangles() const {
 }
 
 Ref<AnimationNode> AnimationNodeBlendSpace2D::get_child_by_name(const StringName &p_name) const {
-	int point_index = find_blend_point_by_name(p_name);
-	if (point_index != -1) {
-		return get_blend_point_node(point_index);
-	}
-	return Ref<AnimationRootNode>();
+	return get_blend_point_node(p_name.operator String().to_int());
 }
 
 void AnimationNodeBlendSpace2D::set_blend_mode(BlendMode p_blend_mode) {
@@ -760,27 +654,14 @@ void AnimationNodeBlendSpace2D::_animation_node_removed(const ObjectID &p_oid, c
 	AnimationRootNode::_animation_node_removed(p_oid, p_node);
 }
 
-void AnimationNodeBlendSpace2D::validate_node(const AnimationTree *p_tree, const StringName &p_path) const {
-	AnimationRootNode::validate_node(p_tree, p_path);
-
-	const_cast<AnimationNodeBlendSpace2D *>(this)->_update_triangles();
-	if (get_triangle_count() == 0) {
-		add_validation_error(p_tree, p_path, RTR("No triangles exist, so blending cannot take place."));
-	}
-}
-
 void AnimationNodeBlendSpace2D::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("add_blend_point", "node", "pos", "at_index", "name"), &AnimationNodeBlendSpace2D::add_blend_point, DEFVAL(-1), DEFVAL(StringName()));
+	ClassDB::bind_method(D_METHOD("add_blend_point", "node", "pos", "at_index"), &AnimationNodeBlendSpace2D::add_blend_point, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("set_blend_point_position", "point", "pos"), &AnimationNodeBlendSpace2D::set_blend_point_position);
 	ClassDB::bind_method(D_METHOD("get_blend_point_position", "point"), &AnimationNodeBlendSpace2D::get_blend_point_position);
 	ClassDB::bind_method(D_METHOD("set_blend_point_node", "point", "node"), &AnimationNodeBlendSpace2D::set_blend_point_node);
 	ClassDB::bind_method(D_METHOD("get_blend_point_node", "point"), &AnimationNodeBlendSpace2D::get_blend_point_node);
-	ClassDB::bind_method(D_METHOD("set_blend_point_name", "point", "name"), &AnimationNodeBlendSpace2D::set_blend_point_name);
-	ClassDB::bind_method(D_METHOD("get_blend_point_name", "point"), &AnimationNodeBlendSpace2D::get_blend_point_name);
-	ClassDB::bind_method(D_METHOD("find_blend_point_by_name", "name"), &AnimationNodeBlendSpace2D::find_blend_point_by_name);
 	ClassDB::bind_method(D_METHOD("remove_blend_point", "point"), &AnimationNodeBlendSpace2D::remove_blend_point);
 	ClassDB::bind_method(D_METHOD("get_blend_point_count"), &AnimationNodeBlendSpace2D::get_blend_point_count);
-	ClassDB::bind_method(D_METHOD("reorder_blend_point", "from_index", "to_index"), &AnimationNodeBlendSpace2D::reorder_blend_point);
 
 	ClassDB::bind_method(D_METHOD("add_triangle", "x", "y", "z", "at_index"), &AnimationNodeBlendSpace2D::add_triangle, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("get_triangle_point", "triangle", "point"), &AnimationNodeBlendSpace2D::get_triangle_point);
@@ -802,6 +683,8 @@ void AnimationNodeBlendSpace2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_y_label", "text"), &AnimationNodeBlendSpace2D::set_y_label);
 	ClassDB::bind_method(D_METHOD("get_y_label"), &AnimationNodeBlendSpace2D::get_y_label);
 
+	ClassDB::bind_method(D_METHOD("_add_blend_point", "index", "node"), &AnimationNodeBlendSpace2D::_add_blend_point);
+
 	ClassDB::bind_method(D_METHOD("_set_triangles", "triangles"), &AnimationNodeBlendSpace2D::_set_triangles);
 	ClassDB::bind_method(D_METHOD("_get_triangles"), &AnimationNodeBlendSpace2D::_get_triangles);
 
@@ -815,6 +698,12 @@ void AnimationNodeBlendSpace2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_using_sync"), &AnimationNodeBlendSpace2D::is_using_sync);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_triangles", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_auto_triangles", "get_auto_triangles");
+
+	for (int i = 0; i < MAX_BLEND_POINTS; i++) {
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "blend_point_" + itos(i) + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_add_blend_point", "get_blend_point_node", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::VECTOR2, "blend_point_" + itos(i) + "/pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_blend_point_position", "get_blend_point_position", i);
+	}
+
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_INT32_ARRAY, "triangles", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_triangles", "_get_triangles");
 
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "min_space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_min_space", "get_min_space");
@@ -832,6 +721,9 @@ void AnimationNodeBlendSpace2D::_bind_methods() {
 }
 
 AnimationNodeBlendSpace2D::AnimationNodeBlendSpace2D() {
+	for (int i = 0; i < MAX_BLEND_POINTS; i++) {
+		blend_points[i].name = itos(i);
+	}
 }
 
 AnimationNodeBlendSpace2D::~AnimationNodeBlendSpace2D() {
diff --git a/engine/scene/animation/animation_blend_space_2d.h b/engine/scene/animation/animation_blend_space_2d.h
index aef7ced0..4c4791c2 100644
--- a/engine/scene/animation/animation_blend_space_2d.h
+++ b/engine/scene/animation/animation_blend_space_2d.h
@@ -71,10 +71,7 @@ protected:
 	String y_label = "y";
 	BlendMode blend_mode = BLEND_MODE_INTERPOLATED;
 
-	bool _set(const StringName &p_name, const Variant &p_value);
-	bool _get(const StringName &p_name, Variant &r_ret) const;
-	void _get_property_list(List<PropertyInfo> *p_list) const;
-
+	void _add_blend_point(int p_index, const Ref<AnimationRootNode> &p_node);
 	void _set_triangles(const Vector<int> &p_triangles);
 	Vector<int> _get_triangles() const;
 
@@ -95,32 +92,20 @@ protected:
 	virtual void _animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name) override;
 	virtual void _animation_node_removed(const ObjectID &p_oid, const StringName &p_node) override;
 
-#ifndef DISABLE_DEPRECATED
-	void _add_blend_point_bind_compat_110369(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index = -1);
-	static void _bind_compatibility_methods();
-#endif
-
 public:
-	virtual void validate_node(const AnimationTree *p_tree, const StringName &p_path) const override;
-
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
-	virtual void get_child_nodes(LocalVector<ChildNode> *r_child_nodes) override;
+	virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
 
-	void add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index = -1, const StringName &p_name = StringName());
+	void add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index = -1);
 	void set_blend_point_position(int p_point, const Vector2 &p_position);
 	void set_blend_point_node(int p_point, const Ref<AnimationRootNode> &p_node);
-	void set_blend_point_name(int p_point, const StringName &p_name);
-	const StringName &get_blend_point_name(int p_point) const;
-	int find_blend_point_by_name(const StringName &p_name) const;
 	Vector2 get_blend_point_position(int p_point) const;
 	Ref<AnimationRootNode> get_blend_point_node(int p_point) const;
 	void remove_blend_point(int p_point);
 	int get_blend_point_count() const;
 
-	void reorder_blend_point(int p_from_index, int p_to_index);
-
 	bool has_triangle(int p_x, int p_y, int p_z) const;
 	void add_triangle(int p_x, int p_y, int p_z, int p_at_index = -1);
 	int get_triangle_point(int p_triangle, int p_point);
@@ -142,7 +127,7 @@ public:
 	void set_y_label(const String &p_label);
 	String get_y_label() const;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 	virtual String get_caption() const override;
 
 	Vector2 get_closest_point(const Vector2 &p_point);
diff --git a/engine/scene/animation/animation_blend_tree.cpp b/engine/scene/animation/animation_blend_tree.cpp
index 4dcd9210..2110d03a 100644
--- a/engine/scene/animation/animation_blend_tree.cpp
+++ b/engine/scene/animation/animation_blend_tree.cpp
@@ -30,39 +30,19 @@
 
 #include "animation_blend_tree.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/resources/animation.h"
 
 void AnimationNodeAnimation::set_animation(const StringName &p_name) {
-	if (animation == p_name) {
-		return;
-	}
 	animation = p_name;
-	animation_version++;
-	if (unlikely(animation_version == 0)) {
-		animation_version = 1;
-	}
-	_node_updated(get_instance_id());
 }
 
 StringName AnimationNodeAnimation::get_animation() const {
 	return animation;
 }
 
-LocalVector<StringName> (*AnimationNodeAnimation::get_editable_animation_list)() = nullptr;
+Vector<String> (*AnimationNodeAnimation::get_editable_animation_list)() = nullptr;
 
-void AnimationNodeAnimation::validate_node(const AnimationTree *p_tree, const StringName &p_path) const {
-	AnimationRootNode::validate_node(p_tree, p_path);
-
-	const Ref<Animation> &animation_resource = p_tree->get_animation_or_null(animation);
-	if (animation_resource.is_null()) {
-		add_validation_error(p_tree, p_path, vformat(RTR("Animation '%s' not found."), animation));
-	}
-}
-
-void AnimationNodeAnimation::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeAnimation::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::BOOL, backward, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE));
 }
@@ -78,11 +58,30 @@ Variant AnimationNodeAnimation::get_parameter_default_value(const StringName &p_
 	return 0.0;
 }
 
+AnimationNode::NodeTimeInfo AnimationNodeAnimation::get_node_time_info() const {
+	NodeTimeInfo nti;
+	if (!process_state->tree->has_animation(animation)) {
+		return nti;
+	}
+
+	if (use_custom_timeline) {
+		nti.length = timeline_length;
+		nti.loop_mode = loop_mode;
+	} else {
+		Ref<Animation> anim = process_state->tree->get_animation(animation);
+		nti.length = (double)anim->get_length();
+		nti.loop_mode = anim->get_loop_mode();
+	}
+	nti.position = get_parameter(current_position);
+
+	return nti;
+}
+
 void AnimationNodeAnimation::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "animation" && get_editable_animation_list) {
-		LocalVector<StringName> names = get_editable_animation_list();
+		Vector<String> names = get_editable_animation_list();
 		String anims;
-		for (uint32_t i = 0; i < names.size(); i++) {
+		for (int i = 0; i < names.size(); i++) {
 			if (i > 0) {
 				anims += ",";
 			}
@@ -92,34 +91,61 @@ void AnimationNodeAnimation::_validate_property(PropertyInfo &p_property) const
 			p_property.hint = PROPERTY_HINT_ENUM;
 			p_property.hint_string = anims;
 		}
-	} else if (!use_custom_timeline) {
+	}
+
+	if (!use_custom_timeline) {
 		if (p_property.name == "timeline_length" || p_property.name == "start_offset" || p_property.name == "loop_mode" || p_property.name == "stretch_time_scale") {
 			p_property.usage = PROPERTY_USAGE_NONE;
 		}
 	}
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	_update_animation_cache(p_process_state.tree, p_instance);
-	const Ref<Animation> &anim = p_instance.cached_animation;
-	// Should not ever happen due to validation earlier.
-	ERR_FAIL_COND_V(anim.is_null(), NodeTimeInfo());
-	double anim_size = anim->get_length();
+AnimationNode::NodeTimeInfo AnimationNodeAnimation::process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	process_state->is_testing = p_test_only;
 
-	double cur_len;
-	Animation::LoopMode cur_loop_mode;
-	if (use_custom_timeline) {
-		cur_len = timeline_length;
-		cur_loop_mode = loop_mode;
+	AnimationMixer::PlaybackInfo pi = p_playback_info;
+	if (p_playback_info.seeked) {
+		if (p_playback_info.is_external_seeking) {
+			pi.delta = get_node_time_info().position - p_playback_info.time;
+		}
 	} else {
-		cur_len = anim_size;
-		cur_loop_mode = anim->get_loop_mode();
+		pi.time = get_node_time_info().position + (get_parameter(backward) ? -p_playback_info.delta : p_playback_info.delta);
 	}
 
+	NodeTimeInfo nti = _process(pi, p_test_only);
+
+	if (!p_test_only) {
+		set_node_time_info(nti);
+	}
+
+	return nti;
+}
+
+AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	if (!process_state->tree->has_animation(animation)) {
+		AnimationNodeBlendTree *tree = Object::cast_to<AnimationNodeBlendTree>(node_state.parent);
+		if (tree) {
+			String node_name = tree->get_node_name(Ref<AnimationNodeAnimation>(this));
+			make_invalid(vformat(RTR("On BlendTree node '%s', animation not found: '%s'"), node_name, animation));
+
+		} else {
+			make_invalid(vformat(RTR("Animation not found: '%s'"), animation));
+		}
+
+		return NodeTimeInfo();
+	}
+
+	Ref<Animation> anim = process_state->tree->get_animation(animation);
+	double anim_size = (double)anim->get_length();
+
+	NodeTimeInfo cur_nti = get_node_time_info();
+	double cur_len = cur_nti.length;
 	double cur_time = p_playback_info.time;
 	double cur_delta = p_playback_info.delta;
-	bool cur_backward = p_instance.get_parameter_backward();
-	double prev_time = p_instance.get_parameter_current_position();
+	bool cur_backward = get_parameter(backward);
+
+	Animation::LoopMode cur_loop_mode = cur_nti.loop_mode;
+	double prev_time = cur_nti.position;
 
 	Animation::LoopedFlag looped_flag = Animation::LOOPED_FLAG_NONE;
 	bool node_backward = play_mode == PLAY_MODE_BACKWARD;
@@ -226,15 +252,15 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro
 
 		// Emit start & finish signal. Internally, the detections are the same for backward.
 		// We should use call_deferred since the track keys are still being processed.
-		if (p_process_state.tree && !p_test_only) {
+		if (process_state->tree && !p_test_only) {
 			// AnimationTree uses seek to 0 "internally" to process the first key of the animation, which is used as the start detection.
 			if (is_started) {
-				p_process_state.tree->call_deferred(SNAME("emit_signal"), SceneStringName(animation_started), animation);
+				process_state->tree->call_deferred(SNAME("emit_signal"), SceneStringName(animation_started), animation);
 			}
 			// Finished.
 			if (Animation::is_less_approx(prev_playback_time, anim_size) && Animation::is_greater_or_equal_approx(cur_playback_time, anim_size)) {
 				cur_playback_time = anim_size;
-				p_process_state.tree->call_deferred(SNAME("emit_signal"), SceneStringName(animation_finished), animation);
+				process_state->tree->call_deferred(SNAME("emit_signal"), SceneStringName(animation_finished), animation);
 			}
 		}
 	}
@@ -252,7 +278,7 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro
 			}
 			pi.delta = 0;
 			pi.weight = CMP_EPSILON;
-			blend_animation(p_process_state, p_instance, animation, pi);
+			blend_animation(animation, pi);
 		}
 
 		AnimationMixer::PlaybackInfo pi = p_playback_info;
@@ -270,9 +296,9 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro
 		}
 		pi.weight = 1.0;
 		pi.looped_flag = looped_flag;
-		blend_animation(p_process_state, p_instance, animation, pi);
+		blend_animation(animation, pi);
 
-		p_instance.set_parameter_backward(cur_backward, p_process_state.is_testing);
+		set_parameter(backward, cur_backward);
 	}
 
 	return nti;
@@ -290,12 +316,12 @@ AnimationNodeAnimation::PlayMode AnimationNodeAnimation::get_play_mode() const {
 	return play_mode;
 }
 
-void AnimationNodeAnimation::set_backward(AnimationNodeInstance &p_instance, ProcessState &p_process_state, bool p_backward) {
-	p_instance.set_parameter_backward(p_backward, p_process_state.is_testing);
+void AnimationNodeAnimation::set_backward(bool p_backward) {
+	set_parameter(backward, p_backward);
 }
 
-bool AnimationNodeAnimation::is_backward(AnimationNodeInstance &p_instance, ProcessState &p_process_state) const {
-	return p_instance.get_parameter_backward();
+bool AnimationNodeAnimation::is_backward() const {
+	return get_parameter(backward);
 }
 
 void AnimationNodeAnimation::set_advance_on_start(bool p_advance_on_start) {
@@ -386,21 +412,6 @@ void AnimationNodeAnimation::_bind_methods() {
 	BIND_ENUM_CONSTANT(PLAY_MODE_BACKWARD);
 }
 
-void AnimationNodeAnimation::_update_animation_cache(AnimationTree *p_tree, AnimationNodeInstance &p_instance) const {
-	if (p_instance.cached_animation_version == animation_version) {
-		return;
-	}
-
-	const Ref<Animation> &anim = p_tree->get_animation_or_null(animation);
-	if (anim.is_null()) {
-		// I don't think this can even occur with validation now.
-		return;
-	}
-
-	p_instance.cached_animation = anim;
-	p_instance.cached_animation_version = animation_version;
-}
-
 AnimationNodeAnimation::AnimationNodeAnimation() {
 }
 
@@ -425,7 +436,7 @@ AnimationNodeSync::AnimationNodeSync() {
 }
 
 ////////////////////////////////////////////////////////
-void AnimationNodeOneShot::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeOneShot::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::BOOL, active, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_READ_ONLY));
 	r_list->push_back(PropertyInfo(Variant::BOOL, internal_active, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_READ_ONLY));
@@ -551,16 +562,16 @@ bool AnimationNodeOneShot::has_filter() const {
 	return true;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	OneShotRequest cur_request = static_cast<OneShotRequest>(p_instance.get_parameter_request());
-	bool cur_active = p_instance.get_parameter_active();
-	bool cur_internal_active = p_instance.get_parameter_internal_active();
-	double prev_position = p_instance.get_parameter_current_position();
-	double cur_time_to_restart = p_instance.get_parameter_time_to_restart();
-	double cur_fade_in_remaining = p_instance.get_parameter_fade_in_remaining();
-	double cur_fade_out_remaining = p_instance.get_parameter_fade_out_remaining();
+AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	OneShotRequest cur_request = static_cast<OneShotRequest>((int)get_parameter(request));
+	bool cur_active = get_parameter(active);
+	bool cur_internal_active = get_parameter(internal_active);
+	NodeTimeInfo cur_nti = get_node_time_info();
+	double cur_time_to_restart = get_parameter(time_to_restart);
+	double cur_fade_in_remaining = get_parameter(fade_in_remaining);
+	double cur_fade_out_remaining = get_parameter(fade_out_remaining);
 
-	p_instance.set_parameter_request(ONE_SHOT_REQUEST_NONE, p_process_state.is_testing);
+	set_parameter(request, ONE_SHOT_REQUEST_NONE);
 
 	bool is_shooting = true;
 	bool is_fading_out = cur_active == true && cur_internal_active == false;
@@ -584,10 +595,10 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 	}
 
 	if (is_abort) {
-		p_instance.set_parameter_internal_active(false, p_process_state.is_testing);
-		p_instance.set_parameter_active(false, p_process_state.is_testing);
-		p_instance.set_parameter_time_to_restart(-1, p_process_state.is_testing);
-		p_instance.set_parameter_fade_out_remaining(0, p_process_state.is_testing);
+		set_parameter(internal_active, false);
+		set_parameter(active, false);
+		set_parameter(time_to_restart, -1);
+		set_parameter(fade_out_remaining, 0);
 		cur_fade_out_remaining = 0;
 		is_fading_out = false;
 		is_shooting = false;
@@ -601,15 +612,15 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 			// Shot is ended, do nothing.
 			is_shooting = false;
 		}
-		p_instance.set_parameter_internal_active(false, p_process_state.is_testing);
-		p_instance.set_parameter_time_to_restart(-1, p_process_state.is_testing);
+		set_parameter(internal_active, false);
+		set_parameter(time_to_restart, -1);
 	} else if (!do_start && !cur_active) {
 		if (Animation::is_greater_or_equal_approx(cur_time_to_restart, 0) && !p_seek) {
 			cur_time_to_restart -= abs_delta;
 			if (Animation::is_less_approx(cur_time_to_restart, 0)) {
 				do_start = true; // Restart.
 			}
-			p_instance.set_parameter_time_to_restart(cur_time_to_restart, p_process_state.is_testing);
+			set_parameter(time_to_restart, cur_time_to_restart);
 		}
 		if (!do_start) {
 			is_shooting = false;
@@ -621,7 +632,7 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 	if (!is_shooting) {
 		AnimationMixer::PlaybackInfo pi = p_playback_info;
 		pi.weight = 1.0;
-		return blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, sync, p_test_only);
+		return blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
 	}
 
 	if (do_start) {
@@ -630,9 +641,9 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 			cur_fade_in_remaining = fade_in; // If already active, don't fade-in again.
 		}
 		cur_internal_active = true;
-		p_instance.set_parameter_request(ONE_SHOT_REQUEST_NONE, p_process_state.is_testing);
-		p_instance.set_parameter_internal_active(true, p_process_state.is_testing);
-		p_instance.set_parameter_active(true, p_process_state.is_testing);
+		set_parameter(request, ONE_SHOT_REQUEST_NONE);
+		set_parameter(internal_active, true);
+		set_parameter(active, true);
 		// Clear fade-out.
 		is_fading_out = false;
 		cur_fade_out_remaining = 0;
@@ -669,23 +680,23 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 	NodeTimeInfo main_nti;
 	if (mix == MIX_MODE_ADD) {
 		pi.weight = 1.0;
-		main_nti = blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, sync, p_test_only);
+		main_nti = blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
 	} else {
 		pi.seeked &= use_blend;
 		pi.weight = 1.0 - blend;
-		main_nti = blend_input(p_process_state, p_instance, 0, pi, FILTER_BLEND, sync, p_test_only); // Unlike below, processing this edge is a corner case.
+		main_nti = blend_input(0, pi, FILTER_BLEND, sync, p_test_only); // Unlike below, processing this edge is a corner case.
 	}
 
 	pi = p_playback_info;
 	if (do_start) {
 		pi.time = 0;
 	} else if (os_seek) {
-		pi.time = prev_position;
+		pi.time = cur_nti.position;
 	}
 	pi.seeked = os_seek;
 	pi.weight = Math::is_zero_approx(blend) ? CMP_EPSILON : blend;
 
-	NodeTimeInfo os_nti = blend_input(p_process_state, p_instance, 1, pi, FILTER_PASS, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
+	NodeTimeInfo os_nti = blend_input(1, pi, FILTER_PASS, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
 
 	if (Animation::is_less_or_equal_approx(cur_fade_in_remaining, 0) && !do_start && !is_fading_out) {
 		// Predict time scale by difference of delta times to estimate input animation's remain time in self time scale.
@@ -697,17 +708,17 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 			is_fading_out = true;
 			cur_fade_out_remaining = os_rem + abs_delta;
 			cur_fade_in_remaining = 0;
-			p_instance.set_parameter_internal_active(false, p_process_state.is_testing);
+			set_parameter(internal_active, false);
 		}
 	}
 
 	if (!p_seek) {
 		if (Animation::is_less_or_equal_approx(os_nti.get_remain(break_loop_at_end), 0) || (is_fading_out && Animation::is_less_or_equal_approx(cur_fade_out_remaining, 0))) {
-			p_instance.set_parameter_internal_active(false, p_process_state.is_testing);
-			p_instance.set_parameter_active(false, p_process_state.is_testing);
+			set_parameter(internal_active, false);
+			set_parameter(active, false);
 			if (auto_restart) {
 				double restart_sec = auto_restart_delay + Math::randd() * auto_restart_random_delay;
-				p_instance.set_parameter_time_to_restart(restart_sec, p_process_state.is_testing);
+				set_parameter(time_to_restart, restart_sec);
 			}
 		}
 		if (!do_start) {
@@ -716,8 +727,8 @@ AnimationNode::NodeTimeInfo AnimationNodeOneShot::_process(ProcessState &p_proce
 		cur_fade_out_remaining = MAX(0, cur_fade_out_remaining - abs_delta);
 	}
 
-	p_instance.set_parameter_fade_in_remaining(cur_fade_in_remaining, p_process_state.is_testing);
-	p_instance.set_parameter_fade_out_remaining(cur_fade_out_remaining, p_process_state.is_testing);
+	set_parameter(fade_in_remaining, cur_fade_in_remaining);
+	set_parameter(fade_out_remaining, cur_fade_out_remaining);
 
 	return cur_internal_active ? os_nti : main_nti;
 }
@@ -756,9 +767,9 @@ void AnimationNodeOneShot::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mix_mode", PROPERTY_HINT_ENUM, "Blend,Add"), "set_mix_mode", "get_mix_mode");
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fadein_time", PROPERTY_HINT_RANGE, "0,60,0.01,or_greater,suffix:s"), "set_fadein_time", "get_fadein_time");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fadein_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_fadein_curve", "get_fadein_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fadein_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_fadein_curve", "get_fadein_curve");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fadeout_time", PROPERTY_HINT_RANGE, "0,60,0.01,or_greater,suffix:s"), "set_fadeout_time", "get_fadeout_time");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fadeout_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_fadeout_curve", "get_fadeout_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fadeout_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_fadeout_curve", "get_fadeout_curve");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "break_loop_at_end"), "set_break_loop_at_end", "is_loop_broken_at_end");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "abort_on_reset"), "set_abort_on_reset", "is_aborted_on_reset");
 
@@ -784,7 +795,7 @@ AnimationNodeOneShot::AnimationNodeOneShot() {
 
 ////////////////////////////////////////////////
 
-void AnimationNodeAdd2::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeAdd2::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, add_amount, PROPERTY_HINT_RANGE, "0,1,0.01,or_less,or_greater"));
 }
@@ -806,14 +817,14 @@ bool AnimationNodeAdd2::has_filter() const {
 	return true;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeAdd2::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double amount = p_instance.get_parameter_add_amount();
+AnimationNode::NodeTimeInfo AnimationNodeAdd2::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double amount = get_parameter(add_amount);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0;
-	NodeTimeInfo nti = blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, sync, p_test_only);
+	NodeTimeInfo nti = blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
 	pi.weight = amount;
-	blend_input(p_process_state, p_instance, 1, pi, FILTER_PASS, sync, p_test_only);
+	blend_input(1, pi, FILTER_PASS, sync, p_test_only);
 
 	return nti;
 }
@@ -825,7 +836,7 @@ AnimationNodeAdd2::AnimationNodeAdd2() {
 
 ////////////////////////////////////////////////
 
-void AnimationNodeAdd3::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeAdd3::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, add_amount, PROPERTY_HINT_RANGE, "-1,1,0.01,or_less,or_greater"));
 }
@@ -847,16 +858,16 @@ bool AnimationNodeAdd3::has_filter() const {
 	return true;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeAdd3::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double amount = p_instance.get_parameter_add_amount();
+AnimationNode::NodeTimeInfo AnimationNodeAdd3::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double amount = get_parameter(add_amount);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = MAX(0, -amount);
-	blend_input(p_process_state, p_instance, 0, pi, FILTER_PASS, sync, p_test_only);
+	blend_input(0, pi, FILTER_PASS, sync, p_test_only);
 	pi.weight = 1.0;
-	NodeTimeInfo nti = blend_input(p_process_state, p_instance, 1, pi, FILTER_IGNORE, sync, p_test_only);
+	NodeTimeInfo nti = blend_input(1, pi, FILTER_IGNORE, sync, p_test_only);
 	pi.weight = MAX(0, amount);
-	blend_input(p_process_state, p_instance, 2, pi, FILTER_PASS, sync, p_test_only);
+	blend_input(2, pi, FILTER_PASS, sync, p_test_only);
 
 	return nti;
 }
@@ -869,7 +880,7 @@ AnimationNodeAdd3::AnimationNodeAdd3() {
 
 /////////////////////////////////////////////
 
-void AnimationNodeBlend2::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeBlend2::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, blend_amount, PROPERTY_HINT_RANGE, "0,1,0.01,or_less,or_greater"));
 }
@@ -887,14 +898,14 @@ String AnimationNodeBlend2::get_caption() const {
 	return "Blend2";
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeBlend2::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double amount = p_instance.get_parameter_blend_amount();
+AnimationNode::NodeTimeInfo AnimationNodeBlend2::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double amount = get_parameter(blend_amount);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0 - amount;
-	NodeTimeInfo nti0 = blend_input(p_process_state, p_instance, 0, pi, FILTER_BLEND, sync, p_test_only);
+	NodeTimeInfo nti0 = blend_input(0, pi, FILTER_BLEND, sync, p_test_only);
 	pi.weight = amount;
-	NodeTimeInfo nti1 = blend_input(p_process_state, p_instance, 1, pi, FILTER_PASS, sync, p_test_only);
+	NodeTimeInfo nti1 = blend_input(1, pi, FILTER_PASS, sync, p_test_only);
 
 	return amount > 0.5 ? nti1 : nti0; // Hacky but good enough.
 }
@@ -910,7 +921,7 @@ AnimationNodeBlend2::AnimationNodeBlend2() {
 
 //////////////////////////////////////
 
-void AnimationNodeBlend3::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeBlend3::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, blend_amount, PROPERTY_HINT_RANGE, "-1,1,0.01,or_less,or_greater"));
 }
@@ -928,16 +939,16 @@ String AnimationNodeBlend3::get_caption() const {
 	return "Blend3";
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeBlend3::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double amount = p_instance.get_parameter_blend_amount();
+AnimationNode::NodeTimeInfo AnimationNodeBlend3::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double amount = get_parameter(blend_amount);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = MAX(0, -amount);
-	NodeTimeInfo nti0 = blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, sync, p_test_only);
+	NodeTimeInfo nti0 = blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
 	pi.weight = 1.0 - Math::abs(amount);
-	NodeTimeInfo nti1 = blend_input(p_process_state, p_instance, 1, pi, FILTER_IGNORE, sync, p_test_only);
+	NodeTimeInfo nti1 = blend_input(1, pi, FILTER_IGNORE, sync, p_test_only);
 	pi.weight = MAX(0, amount);
-	NodeTimeInfo nti2 = blend_input(p_process_state, p_instance, 2, pi, FILTER_IGNORE, sync, p_test_only);
+	NodeTimeInfo nti2 = blend_input(2, pi, FILTER_IGNORE, sync, p_test_only);
 
 	return amount > 0.5 ? nti2 : (amount < -0.5 ? nti0 : nti1); // Hacky but good enough.
 }
@@ -950,7 +961,7 @@ AnimationNodeBlend3::AnimationNodeBlend3() {
 
 ////////////////////////////////////////////////
 
-void AnimationNodeSub2::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeSub2::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, sub_amount, PROPERTY_HINT_RANGE, "0,1,0.01,or_less,or_greater"));
 }
@@ -972,16 +983,16 @@ bool AnimationNodeSub2::has_filter() const {
 	return true;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeSub2::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double amount = p_instance.get_parameter_sub_amount();
+AnimationNode::NodeTimeInfo AnimationNodeSub2::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double amount = get_parameter(sub_amount);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	// Out = Sub.Transform3D^(-1) * In.Transform3D
 	pi.weight = -amount;
-	blend_input(p_process_state, p_instance, 1, pi, FILTER_PASS, sync, p_test_only);
+	blend_input(1, pi, FILTER_PASS, sync, p_test_only);
 	pi.weight = 1.0;
 
-	return blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, sync, p_test_only);
+	return blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
 }
 
 AnimationNodeSub2::AnimationNodeSub2() {
@@ -991,7 +1002,7 @@ AnimationNodeSub2::AnimationNodeSub2() {
 
 /////////////////////////////////
 
-void AnimationNodeTimeScale::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeTimeScale::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, scale, PROPERTY_HINT_RANGE, "-32,32,0.01,or_less,or_greater"));
 }
@@ -1009,8 +1020,8 @@ String AnimationNodeTimeScale::get_caption() const {
 	return "TimeScale";
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeTimeScale::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double cur_scale = p_instance.get_parameter_scale();
+AnimationNode::NodeTimeInfo AnimationNodeTimeScale::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double cur_scale = get_parameter(scale);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0;
@@ -1018,7 +1029,7 @@ AnimationNode::NodeTimeInfo AnimationNodeTimeScale::_process(ProcessState &p_pro
 		pi.delta *= cur_scale;
 	}
 
-	return blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, true, p_test_only);
+	return blend_input(0, pi, FILTER_IGNORE, true, p_test_only);
 }
 
 AnimationNodeTimeScale::AnimationNodeTimeScale() {
@@ -1027,9 +1038,9 @@ AnimationNodeTimeScale::AnimationNodeTimeScale() {
 
 ////////////////////////////////////
 
-void AnimationNodeTimeSeek::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeTimeSeek::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
-	r_list->push_back(PropertyInfo(Variant::FLOAT, seek_request, PROPERTY_HINT_RANGE, "-1,3600,0.01,or_greater")); // It will be reset to -1 after seeking the position immediately.
+	r_list->push_back(PropertyInfo(Variant::FLOAT, seek_pos_request, PROPERTY_HINT_RANGE, "-1,3600,0.01,or_greater")); // It will be reset to -1 after seeking the position immediately.
 }
 
 Variant AnimationNodeTimeSeek::get_parameter_default_value(const StringName &p_parameter) const {
@@ -1053,8 +1064,8 @@ bool AnimationNodeTimeSeek::is_explicit_elapse() const {
 	return explicit_elapse;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeTimeSeek::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	double cur_seek_pos = p_instance.get_parameter_seek_request();
+AnimationNode::NodeTimeInfo AnimationNodeTimeSeek::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	double cur_seek_pos = get_parameter(seek_pos_request);
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0;
@@ -1062,10 +1073,10 @@ AnimationNode::NodeTimeInfo AnimationNodeTimeSeek::_process(ProcessState &p_proc
 		pi.time = cur_seek_pos;
 		pi.seeked = true;
 		pi.is_external_seeking = explicit_elapse;
-		p_instance.set_parameter_seek_request(-1.0, p_process_state.is_testing); // Reset.
+		set_parameter(seek_pos_request, -1.0); // Reset.
 	}
 
-	return blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, true, p_test_only);
+	return blend_input(0, pi, FILTER_IGNORE, true, p_test_only);
 }
 
 AnimationNodeTimeSeek::AnimationNodeTimeSeek() {
@@ -1141,7 +1152,7 @@ bool AnimationNodeTransition::_get(const StringName &p_path, Variant &r_ret) con
 	return true;
 }
 
-void AnimationNodeTransition::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeTransition::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	String anims;
 	for (int i = 0; i < get_input_count(); i++) {
@@ -1278,12 +1289,13 @@ bool AnimationNodeTransition::is_allow_transition_to_self() const {
 	return allow_transition_to_self;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	const String &cur_transition_request = p_instance.get_parameter_transition_request();
-	int cur_current_index = p_instance.get_parameter_current_index();
-	int cur_prev_index = p_instance.get_parameter_prev_index();
+AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	String cur_transition_request = get_parameter(transition_request);
+	int cur_current_index = get_parameter(current_index);
+	int cur_prev_index = get_parameter(prev_index);
 
-	double cur_prev_xfading = p_instance.get_parameter_prev_xfading();
+	NodeTimeInfo cur_nti = get_node_time_info();
+	double cur_prev_xfading = get_parameter(prev_xfading);
 
 	bool switched = false;
 	bool restart = false;
@@ -1291,16 +1303,16 @@ AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_pr
 
 	if (pending_update) {
 		if (cur_current_index < 0 || cur_current_index >= get_input_count()) {
-			p_instance.set_parameter_prev_index(-1, p_process_state.is_testing);
+			set_parameter(prev_index, -1);
 			if (get_input_count() > 0) {
-				p_instance.set_parameter_current_index(0, p_process_state.is_testing);
-				p_instance.set_parameter_current_state(get_input_name(0), p_process_state.is_testing);
+				set_parameter(current_index, 0);
+				set_parameter(current_state, get_input_name(0));
 			} else {
-				p_instance.set_parameter_current_index(-1, p_process_state.is_testing);
-				p_instance.set_parameter_current_state(StringName(), p_process_state.is_testing);
+				set_parameter(current_index, -1);
+				set_parameter(current_state, StringName());
 			}
 		} else {
-			p_instance.set_parameter_current_state(get_input_name(cur_current_index), p_process_state.is_testing);
+			set_parameter(current_state, get_input_name(cur_current_index));
 		}
 		pending_update = false;
 	}
@@ -1325,22 +1337,23 @@ AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_pr
 			} else {
 				switched = true;
 				cur_prev_index = cur_current_index;
-				p_instance.set_parameter_prev_index(cur_current_index, p_process_state.is_testing);
+				set_parameter(prev_index, cur_current_index);
 				cur_current_index = new_idx;
-				p_instance.set_parameter_current_index(cur_current_index, p_process_state.is_testing);
-				p_instance.set_parameter_current_state(cur_transition_request, p_process_state.is_testing);
+				set_parameter(current_index, cur_current_index);
+				set_parameter(current_state, cur_transition_request);
 			}
 		} else {
 			ERR_PRINT("No such input: '" + cur_transition_request + "'");
 		}
-		p_instance.set_parameter_transition_request(String(), p_process_state.is_testing);
+		cur_transition_request = String();
+		set_parameter(transition_request, cur_transition_request);
 	}
 
 	if (clear_remaining_fade) {
 		cur_prev_xfading = 0;
-		p_instance.set_parameter_prev_xfading(0, p_process_state.is_testing);
+		set_parameter(prev_xfading, 0);
 		cur_prev_index = -1;
-		p_instance.set_parameter_prev_index(-1, p_process_state.is_testing);
+		set_parameter(prev_index, -1);
 	}
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
@@ -1350,7 +1363,7 @@ AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_pr
 		pi.time = 0;
 		pi.seeked = true;
 		pi.weight = 1.0;
-		return blend_input(p_process_state, p_instance, cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
+		return blend_input(cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
 	}
 
 	if (switched) {
@@ -1365,17 +1378,16 @@ AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_pr
 		pi.weight = 0;
 		for (int i = 0; i < get_input_count(); i++) {
 			if (i != cur_current_index && i != cur_prev_index) {
-				blend_input(p_process_state, p_instance, i, pi, FILTER_IGNORE, true, p_test_only);
+				blend_input(i, pi, FILTER_IGNORE, true, p_test_only);
 			}
 		}
 	}
 
-	NodeTimeInfo cur_nti;
 	if (cur_prev_index < 0) { // Process current animation, check for transition.
 		pi.weight = 1.0;
-		cur_nti = blend_input(p_process_state, p_instance, cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
+		cur_nti = blend_input(cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
 		if (input_data[cur_current_index].auto_advance && Animation::is_less_or_equal_approx(cur_nti.get_remain(input_data[cur_current_index].break_loop_at_end), xfade_time)) {
-			p_instance.set_parameter_transition_request(get_input_name((cur_current_index + 1) % get_input_count()), p_process_state.is_testing);
+			set_parameter(transition_request, get_input_name((cur_current_index + 1) % get_input_count()));
 		}
 	} else { // Cross-fading from prev to current.
 
@@ -1399,21 +1411,21 @@ AnimationNode::NodeTimeInfo AnimationNodeTransition::_process(ProcessState &p_pr
 			pi.time = 0;
 			pi.seeked = true;
 		}
-		cur_nti = blend_input(p_process_state, p_instance, cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
+		cur_nti = blend_input(cur_current_index, pi, FILTER_IGNORE, true, p_test_only);
 
 		pi = p_playback_info;
 		pi.seeked &= use_blend;
 		pi.weight = blend;
-		blend_input(p_process_state, p_instance, cur_prev_index, pi, FILTER_IGNORE, true, p_test_only);
+		blend_input(cur_prev_index, pi, FILTER_IGNORE, true, p_test_only);
 		if (!p_seek) {
 			if (Animation::is_less_or_equal_approx(cur_prev_xfading, 0)) {
-				p_instance.set_parameter_prev_index(-1, p_process_state.is_testing);
+				set_parameter(prev_index, -1);
 			}
 			cur_prev_xfading -= Math::abs(p_playback_info.delta);
 		}
 	}
 
-	p_instance.set_parameter_prev_xfading(cur_prev_xfading, p_process_state.is_testing);
+	set_parameter(prev_xfading, cur_prev_xfading);
 
 	return cur_nti;
 }
@@ -1449,7 +1461,7 @@ void AnimationNodeTransition::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_allow_transition_to_self"), &AnimationNodeTransition::is_allow_transition_to_self);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "xfade_time", PROPERTY_HINT_RANGE, "0,120,0.01,suffix:s"), "set_xfade_time", "get_xfade_time");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "xfade_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_xfade_curve", "get_xfade_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "xfade_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_xfade_curve", "get_xfade_curve");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_transition_to_self"), "set_allow_transition_to_self", "is_allow_transition_to_self");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "input_count", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_ARRAY | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED, "Inputs,input_"), "set_input_count", "get_input_count");
 }
@@ -1463,10 +1475,10 @@ String AnimationNodeOutput::get_caption() const {
 	return "Output";
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeOutput::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNodeOutput::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0;
-	return blend_input(p_process_state, p_instance, 0, pi, FILTER_IGNORE, true, p_test_only);
+	return blend_input(0, pi, FILTER_IGNORE, true, p_test_only);
 }
 
 AnimationNodeOutput::AnimationNodeOutput() {
@@ -1474,7 +1486,7 @@ AnimationNodeOutput::AnimationNodeOutput() {
 }
 
 ///////////////////////////////////////////////////////
-void AnimationNodeBlendTree::add_node(const StringName &p_name, const Ref<AnimationNode> &p_node, const Vector2 &p_position) {
+void AnimationNodeBlendTree::add_node(const StringName &p_name, Ref<AnimationNode> p_node, const Vector2 &p_position) {
 	ERR_FAIL_COND(nodes.has(p_name));
 	ERR_FAIL_COND(p_node.is_null());
 	ERR_FAIL_COND(p_name == SceneStringName(output));
@@ -1489,14 +1501,26 @@ void AnimationNodeBlendTree::add_node(const StringName &p_name, const Ref<Animat
 	emit_changed();
 	emit_signal(SNAME("tree_changed"));
 
-	_add_node(p_node);
-	p_node->connect_changed(callable_mp(this, &AnimationNodeBlendTree::_child_node_changed).bind(p_name), CONNECT_REFERENCE_COUNTED);
+	p_node->connect(SNAME("tree_changed"), callable_mp(this, &AnimationNodeBlendTree::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationNodeBlendTree::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect(SNAME("animation_node_removed"), callable_mp(this, &AnimationNodeBlendTree::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect_changed(callable_mp(this, &AnimationNodeBlendTree::_node_changed).bind(p_name), CONNECT_REFERENCE_COUNTED);
 }
 
 Ref<AnimationNode> AnimationNodeBlendTree::get_node(const StringName &p_name) const {
-	const Node *node = nodes.getptr(p_name);
-	ERR_FAIL_NULL_V(node, Ref<AnimationNode>());
-	return node->node;
+	ERR_FAIL_COND_V(!nodes.has(p_name), Ref<AnimationNode>());
+
+	return nodes[p_name].node;
+}
+
+StringName AnimationNodeBlendTree::get_node_name(const Ref<AnimationNode> &p_node) const {
+	for (const KeyValue<StringName, Node> &E : nodes) {
+		if (E.value.node == p_node) {
+			return E.key;
+		}
+	}
+
+	ERR_FAIL_V(StringName());
 }
 
 void AnimationNodeBlendTree::set_node_position(const StringName &p_node, const Vector2 &p_position) {
@@ -1509,11 +1533,17 @@ Vector2 AnimationNodeBlendTree::get_node_position(const StringName &p_node) cons
 	return nodes[p_node].position;
 }
 
-void AnimationNodeBlendTree::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
+void AnimationNodeBlendTree::get_child_nodes(List<ChildNode> *r_child_nodes) {
+	Vector<StringName> ns;
+
 	for (const KeyValue<StringName, Node> &E : nodes) {
+		ns.push_back(E.key);
+	}
+
+	for (int i = 0; i < ns.size(); i++) {
 		ChildNode cn;
-		cn.name = E.key;
-		cn.node = E.value.node;
+		cn.name = ns[i];
+		cn.node = nodes[cn.name].node;
 		r_child_nodes->push_back(cn);
 	}
 }
@@ -1522,10 +1552,9 @@ bool AnimationNodeBlendTree::has_node(const StringName &p_name) const {
 	return nodes.has(p_name);
 }
 
-const LocalVector<StringName> *AnimationNodeBlendTree::get_node_connection_array(const StringName &p_name) const {
-	const Node *node = nodes.getptr(p_name);
-	ERR_FAIL_NULL_V(node, nullptr);
-	return &node->connections;
+Vector<StringName> AnimationNodeBlendTree::get_node_connection_array(const StringName &p_name) const {
+	ERR_FAIL_COND_V(!nodes.has(p_name), Vector<StringName>());
+	return nodes[p_name].connections;
 }
 
 void AnimationNodeBlendTree::remove_node(const StringName &p_name) {
@@ -1534,17 +1563,19 @@ void AnimationNodeBlendTree::remove_node(const StringName &p_name) {
 
 	{
 		Ref<AnimationNode> node = nodes[p_name].node;
-		_remove_node(node);
-		node->disconnect_changed(callable_mp(this, &AnimationNodeBlendTree::_child_node_changed));
+		node->disconnect(SNAME("tree_changed"), callable_mp(this, &AnimationNodeBlendTree::_tree_changed));
+		node->disconnect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationNodeBlendTree::_animation_node_renamed));
+		node->disconnect(SNAME("animation_node_removed"), callable_mp(this, &AnimationNodeBlendTree::_animation_node_removed));
+		node->disconnect_changed(callable_mp(this, &AnimationNodeBlendTree::_node_changed));
 	}
 
 	nodes.erase(p_name);
 
 	// Erase connections to name.
 	for (KeyValue<StringName, Node> &E : nodes) {
-		for (uint32_t i = 0; i < E.value.connections.size(); i++) {
+		for (int i = 0; i < E.value.connections.size(); i++) {
 			if (E.value.connections[i] == p_name) {
-				E.value.connections[i] = StringName();
+				E.value.connections.write[i] = StringName();
 			}
 		}
 	}
@@ -1560,7 +1591,7 @@ void AnimationNodeBlendTree::rename_node(const StringName &p_name, const StringN
 	ERR_FAIL_COND(p_name == SceneStringName(output));
 	ERR_FAIL_COND(p_new_name == SceneStringName(output));
 
-	nodes[p_name].node->disconnect_changed(callable_mp(this, &AnimationNodeBlendTree::_child_node_changed));
+	nodes[p_name].node->disconnect_changed(callable_mp(this, &AnimationNodeBlendTree::_node_changed));
 
 	const Node temp_copy = nodes[p_name];
 	nodes[p_new_name] = temp_copy; // might realloc
@@ -1568,14 +1599,14 @@ void AnimationNodeBlendTree::rename_node(const StringName &p_name, const StringN
 
 	// Rename connections.
 	for (KeyValue<StringName, Node> &E : nodes) {
-		for (uint32_t i = 0; i < E.value.connections.size(); i++) {
+		for (int i = 0; i < E.value.connections.size(); i++) {
 			if (E.value.connections[i] == p_name) {
-				E.value.connections[i] = p_new_name;
+				E.value.connections.write[i] = p_new_name;
 			}
 		}
 	}
 	// Connection must be done with new name.
-	nodes[p_new_name].node->connect_changed(callable_mp(this, &AnimationNodeBlendTree::_child_node_changed).bind(p_new_name), CONNECT_REFERENCE_COUNTED);
+	nodes[p_new_name].node->connect_changed(callable_mp(this, &AnimationNodeBlendTree::_node_changed).bind(p_new_name), CONNECT_REFERENCE_COUNTED);
 
 	emit_signal(SNAME("animation_node_renamed"), get_instance_id(), p_name, p_new_name);
 	emit_signal(SNAME("tree_changed"));
@@ -1588,29 +1619,27 @@ void AnimationNodeBlendTree::connect_node(const StringName &p_input_node, int p_
 	ERR_FAIL_COND(p_input_node == p_output_node);
 
 	Ref<AnimationNode> input = nodes[p_input_node].node;
-	ERR_FAIL_INDEX(p_input_index, (int)nodes[p_input_node].connections.size());
+	ERR_FAIL_INDEX(p_input_index, nodes[p_input_node].connections.size());
 
 	for (KeyValue<StringName, Node> &E : nodes) {
-		for (uint32_t i = 0; i < E.value.connections.size(); i++) {
+		for (int i = 0; i < E.value.connections.size(); i++) {
 			StringName output = E.value.connections[i];
 			ERR_FAIL_COND(output == p_output_node);
 		}
 	}
 
-	nodes[p_input_node].connections[p_input_index] = p_output_node;
+	nodes[p_input_node].connections.write[p_input_index] = p_output_node;
 
 	emit_changed();
-	_node_updated(input->get_instance_id());
 }
 
 void AnimationNodeBlendTree::disconnect_node(const StringName &p_node, int p_input_index) {
 	ERR_FAIL_COND(!nodes.has(p_node));
 
 	Ref<AnimationNode> input = nodes[p_node].node;
-	ERR_FAIL_INDEX(p_input_index, (int)nodes[p_node].connections.size());
+	ERR_FAIL_INDEX(p_input_index, nodes[p_node].connections.size());
 
-	nodes[p_node].connections[p_input_index] = StringName();
-	_node_updated(input->get_instance_id());
+	nodes[p_node].connections.write[p_input_index] = StringName();
 }
 
 AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node(const StringName &p_input_node, int p_input_index, const StringName &p_output_node) const {
@@ -1628,7 +1657,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
 
 	Ref<AnimationNode> input = nodes[p_input_node].node;
 
-	if (p_input_index < 0 || p_input_index >= (int)nodes[p_input_node].connections.size()) {
+	if (p_input_index < 0 || p_input_index >= nodes[p_input_node].connections.size()) {
 		return CONNECTION_ERROR_NO_INPUT_INDEX;
 	}
 
@@ -1637,7 +1666,7 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
 	}
 
 	for (const KeyValue<StringName, Node> &E : nodes) {
-		for (uint32_t i = 0; i < E.value.connections.size(); i++) {
+		for (int i = 0; i < E.value.connections.size(); i++) {
 			const StringName output = E.value.connections[i];
 			if (output == p_output_node) {
 				return CONNECTION_ERROR_CONNECTION_EXISTS;
@@ -1647,9 +1676,9 @@ AnimationNodeBlendTree::ConnectionError AnimationNodeBlendTree::can_connect_node
 	return CONNECTION_OK;
 }
 
-void AnimationNodeBlendTree::get_node_connections(LocalVector<NodeConnection> *r_connections) const {
+void AnimationNodeBlendTree::get_node_connections(List<NodeConnection> *r_connections) const {
 	for (const KeyValue<StringName, Node> &E : nodes) {
-		for (uint32_t i = 0; i < E.value.connections.size(); i++) {
+		for (int i = 0; i < E.value.connections.size(); i++) {
 			const StringName output = E.value.connections[i];
 			if (output != StringName()) {
 				NodeConnection nc;
@@ -1666,15 +1695,15 @@ String AnimationNodeBlendTree::get_caption() const {
 	return "BlendTree";
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeBlendTree::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	const Ref<AnimationNodeOutput> output = nodes[SceneStringName(output)].node;
+AnimationNode::NodeTimeInfo AnimationNodeBlendTree::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	Ref<AnimationNodeOutput> output = nodes[SceneStringName(output)].node;
+	node_state.connections = nodes[SceneStringName(output)].connections;
 	ERR_FAIL_COND_V(output.is_null(), NodeTimeInfo());
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = 1.0;
 
-	AnimationNodeInstance &output_instance = p_instance.get_child_instance_by_path(SceneStringName(output));
-	return _blend_node(p_process_state, p_instance, output_instance, pi, FILTER_IGNORE, true, p_test_only, nullptr);
+	return _blend_node(output, "output", this, pi, FILTER_IGNORE, true, p_test_only, nullptr);
 }
 
 LocalVector<StringName> AnimationNodeBlendTree::get_node_list() const {
@@ -1762,7 +1791,7 @@ bool AnimationNodeBlendTree::_get(const StringName &p_name, Variant &r_ret) cons
 			}
 		}
 	} else if (prop_name == "node_connections") {
-		LocalVector<NodeConnection> nc;
+		List<NodeConnection> nc;
 		get_node_connections(&nc);
 		Array conns;
 		conns.resize(nc.size() * 3);
@@ -1791,7 +1820,7 @@ void AnimationNodeBlendTree::_get_property_list(List<PropertyInfo> *p_list) cons
 	for (const StringName &E : names) {
 		String prop_name = E;
 		if (prop_name != "output") {
-			p_list->push_back(PropertyInfo(Variant::OBJECT, "nodes/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, AnimationNode::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
+			p_list->push_back(PropertyInfo(Variant::OBJECT, "nodes/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationNode", PROPERTY_USAGE_NO_EDITOR));
 		}
 		p_list->push_back(PropertyInfo(Variant::VECTOR2, "nodes/" + prop_name + "/position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 	}
@@ -1819,39 +1848,7 @@ void AnimationNodeBlendTree::reset_state() {
 	emit_signal(SNAME("tree_changed"));
 }
 
-void AnimationNodeBlendTree::validate_node(const AnimationTree *p_tree, const StringName &p_path) const {
-	AnimationRootNode::validate_node(p_tree, p_path);
-
-	// Validate output connection.
-	{
-		const LocalVector<StringName> *output_connections = get_node_connection_array(SceneStringName(output));
-		const StringName &node_name = output_connections->operator[](0);
-
-		if (const Node *child_node = nodes.getptr(node_name); !child_node) {
-			add_validation_error(p_tree, String(p_path) + SceneStringName(output) + "/", RTR("Nothing connected to output."));
-		}
-	}
-
-	// Rest of children.
-	for (const KeyValue<StringName, Node> &E : nodes) {
-		const Node &child = E.value;
-
-		// Skip output node, already validated.
-		if (E.key == SceneStringName(output)) {
-			continue;
-		}
-
-		for (uint32_t input = 0; input < child.connections.size(); input++) {
-			const StringName &connected_node_name = child.connections[input];
-			if (const Node *connected_to = nodes.getptr(connected_node_name); !connected_to) {
-				StringName path = String(p_path) + String(E.key) + "/";
-				add_validation_error(p_tree, path, "Nothing connected to", input);
-			}
-		}
-	}
-}
-
-void AnimationNodeBlendTree::_child_node_changed(const StringName &p_node) {
+void AnimationNodeBlendTree::_node_changed(const StringName &p_node) {
 	ERR_FAIL_COND(!nodes.has(p_node));
 	nodes[p_node].connections.resize(nodes[p_node].node->get_input_count());
 	emit_signal(SNAME("node_changed"), p_node);
@@ -1910,7 +1907,7 @@ void AnimationNodeBlendTree::_initialize_node_tree() {
 	n.node = output;
 	n.position = Vector2(300, 150);
 	n.connections.resize(1);
-	nodes[SceneStringName(output)] = n;
+	nodes["output"] = n;
 }
 
 AnimationNodeBlendTree::AnimationNodeBlendTree() {
diff --git a/engine/scene/animation/animation_blend_tree.h b/engine/scene/animation/animation_blend_tree.h
index 7a2c3835..6830cddf 100644
--- a/engine/scene/animation/animation_blend_tree.h
+++ b/engine/scene/animation/animation_blend_tree.h
@@ -39,7 +39,6 @@ class AnimationNodeAnimation : public AnimationRootNode {
 	StringName backward = "backward"; // Only used by pingpong animation.
 
 	StringName animation;
-	mutable uint32_t animation_version = 1;
 
 	bool advance_on_start = false;
 
@@ -55,18 +54,16 @@ public:
 		PLAY_MODE_BACKWARD
 	};
 
-	virtual void validate_node(const AnimationTree *p_tree, const StringName &p_path) const override;
-
-	void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
-	static LocalVector<StringName> (*get_editable_animation_list)();
+	virtual NodeTimeInfo get_node_time_info() const override; // Wrapper of get_parameter().
+
+	static Vector<String> (*get_editable_animation_list)();
 
 	virtual String get_caption() const override;
-	_FORCE_INLINE_ virtual double get_process_delta(AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info) const override final {
-		return (p_instance.get_parameter_backward() ? -p_playback_info.delta : p_playback_info.delta);
-	}
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	void set_animation(const StringName &p_name);
 	StringName get_animation() const;
@@ -74,8 +71,8 @@ public:
 	void set_play_mode(PlayMode p_play_mode);
 	PlayMode get_play_mode() const;
 
-	void set_backward(AnimationNodeInstance &p_instance, ProcessState &p_process_state, bool p_backward);
-	bool is_backward(AnimationNodeInstance &p_instance, ProcessState &p_process_state) const;
+	void set_backward(bool p_backward);
+	bool is_backward() const;
 
 	void set_advance_on_start(bool p_advance_on_start);
 	bool is_advance_on_start() const;
@@ -103,8 +100,6 @@ protected:
 
 private:
 	PlayMode play_mode = PLAY_MODE_FORWARD;
-
-	void _update_animation_cache(AnimationTree *p_tree, AnimationNodeInstance &p_instance) const;
 };
 
 VARIANT_ENUM_CAST(AnimationNodeAnimation::PlayMode)
@@ -164,7 +159,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 	virtual bool is_parameter_read_only(const StringName &p_parameter) const override;
 
@@ -200,7 +195,7 @@ public:
 	bool is_aborted_on_reset() const;
 
 	virtual bool has_filter() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeOneShot();
 };
@@ -214,13 +209,13 @@ class AnimationNodeAdd2 : public AnimationNodeSync {
 	StringName add_amount = PNAME("add_amount");
 
 public:
-	void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
 	virtual bool has_filter() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeAdd2();
 };
@@ -231,13 +226,13 @@ class AnimationNodeAdd3 : public AnimationNodeSync {
 	StringName add_amount = PNAME("add_amount");
 
 public:
-	void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
 	virtual bool has_filter() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeAdd3();
 };
@@ -248,11 +243,11 @@ class AnimationNodeBlend2 : public AnimationNodeSync {
 	StringName blend_amount = PNAME("blend_amount");
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	virtual bool has_filter() const override;
 	AnimationNodeBlend2();
@@ -264,12 +259,12 @@ class AnimationNodeBlend3 : public AnimationNodeSync {
 	StringName blend_amount = PNAME("blend_amount");
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 	AnimationNodeBlend3();
 };
 
@@ -279,13 +274,13 @@ class AnimationNodeSub2 : public AnimationNodeSync {
 	StringName sub_amount = PNAME("sub_amount");
 
 public:
-	void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
 	virtual bool has_filter() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeSub2();
 };
@@ -296,12 +291,12 @@ class AnimationNodeTimeScale : public AnimationNode {
 	StringName scale = PNAME("scale");
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeTimeScale();
 };
@@ -309,19 +304,19 @@ public:
 class AnimationNodeTimeSeek : public AnimationNode {
 	GDCLASS(AnimationNodeTimeSeek, AnimationNode);
 
-	StringName seek_request = PNAME("seek_request");
+	StringName seek_pos_request = PNAME("seek_request");
 	bool explicit_elapse = true;
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
 	virtual String get_caption() const override;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	void set_explicit_elapse(bool p_enable);
 	bool is_explicit_elapse() const;
@@ -358,7 +353,7 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 	virtual bool is_parameter_read_only(const StringName &p_parameter) const override;
 
@@ -388,7 +383,7 @@ public:
 	void set_allow_transition_to_self(bool p_enable);
 	bool is_allow_transition_to_self() const;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	AnimationNodeTransition();
 };
@@ -398,7 +393,7 @@ class AnimationNodeOutput : public AnimationNode {
 
 public:
 	virtual String get_caption() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 	AnimationNodeOutput();
 };
 
@@ -410,14 +405,14 @@ class AnimationNodeBlendTree : public AnimationRootNode {
 	struct Node {
 		Ref<AnimationNode> node;
 		Vector2 position;
-		LocalVector<StringName> connections;
+		Vector<StringName> connections;
 	};
 
 	AHashMap<StringName, Node> nodes;
 
 	Vector2 graph_offset;
 
-	void _child_node_changed(const StringName &p_node);
+	void _node_changed(const StringName &p_node);
 
 	void _initialize_node_tree();
 
@@ -444,19 +439,18 @@ public:
 		//no need to check for cycles due to tree topology
 	};
 
-	virtual void validate_node(const AnimationTree *p_tree, const StringName &p_path) const override;
-
-	void add_node(const StringName &p_name, const Ref<AnimationNode> &p_node, const Vector2 &p_position = Vector2());
+	void add_node(const StringName &p_name, Ref<AnimationNode> p_node, const Vector2 &p_position = Vector2());
 	Ref<AnimationNode> get_node(const StringName &p_name) const;
 	void remove_node(const StringName &p_name);
 	void rename_node(const StringName &p_name, const StringName &p_new_name);
 	bool has_node(const StringName &p_name) const;
-	const LocalVector<StringName> *get_node_connection_array(const StringName &p_name) const;
+	StringName get_node_name(const Ref<AnimationNode> &p_node) const;
+	Vector<StringName> get_node_connection_array(const StringName &p_name) const;
 
 	void set_node_position(const StringName &p_node, const Vector2 &p_position);
 	Vector2 get_node_position(const StringName &p_node) const;
 
-	virtual void get_child_nodes(LocalVector<ChildNode> *r_child_nodes) override;
+	virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
 
 	void connect_node(const StringName &p_input_node, int p_input_index, const StringName &p_output_node);
 	void disconnect_node(const StringName &p_node, int p_input_index);
@@ -468,10 +462,10 @@ public:
 	};
 
 	ConnectionError can_connect_node(const StringName &p_input_node, int p_input_index, const StringName &p_output_node) const;
-	void get_node_connections(LocalVector<NodeConnection> *r_connections) const;
+	void get_node_connections(List<NodeConnection> *r_connections) const;
 
 	virtual String get_caption() const override;
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	LocalVector<StringName> get_node_list() const;
 	TypedArray<StringName> get_node_list_as_typed_array() const;
diff --git a/engine/scene/animation/animation_mixer.compat.inc b/engine/scene/animation/animation_mixer.compat.inc
index 39716c29..f46e34bf 100644
--- a/engine/scene/animation/animation_mixer.compat.inc
+++ b/engine/scene/animation/animation_mixer.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "animation_mixer.h"
-
-#include "core/object/class_db.h"
-
 Variant AnimationMixer::_post_process_key_value_bind_compat_86687(const Ref<Animation> &p_anim, int p_track, Variant p_value, Object *p_object, int p_object_idx) {
 	if (!p_object) {
 		return Variant();
diff --git a/engine/scene/animation/animation_mixer.cpp b/engine/scene/animation/animation_mixer.cpp
index af416b80..0b872819 100644
--- a/engine/scene/animation/animation_mixer.cpp
+++ b/engine/scene/animation/animation_mixer.cpp
@@ -33,8 +33,6 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/string_name.h"
 #include "scene/2d/audio_stream_player_2d.h"
 #include "scene/animation/animation_player.h"
@@ -131,7 +129,7 @@ uint32_t AnimationMixer::_get_libraries_property_usage() const {
 void AnimationMixer::_get_property_list(List<PropertyInfo> *p_list) const {
 	for (uint32_t i = 0; i < animation_libraries.size(); i++) {
 		const String path = vformat("libraries/%s", animation_libraries[i].name);
-		p_list->push_back(PropertyInfo(Variant::OBJECT, path, PROPERTY_HINT_RESOURCE_TYPE, AnimationLibrary::get_class_static(), _get_libraries_property_usage()));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, path, PROPERTY_HINT_RESOURCE_TYPE, "AnimationLibrary", _get_libraries_property_usage()));
 	}
 }
 
@@ -139,7 +137,6 @@ void AnimationMixer::_validate_property(PropertyInfo &p_property) const {
 #ifdef TOOLS_ENABLED // `editing` is surrounded by TOOLS_ENABLED so this should also be.
 	if (Engine::get_singleton()->is_editor_hint() && editing && (p_property.name == "active" || p_property.name == "deterministic" || p_property.name == "root_motion_track")) {
 		p_property.usage |= PROPERTY_USAGE_READ_ONLY;
-		return;
 	}
 #endif // TOOLS_ENABLED
 	if (root_motion_track.is_empty() && p_property.name == "root_motion_local") {
@@ -160,31 +157,33 @@ void AnimationMixer::_animation_set_cache_update() {
 	for (const AnimationLibraryData &lib : animation_libraries) {
 		for (const KeyValue<StringName, Ref<Animation>> &K : lib.library->animations) {
 			StringName key = lib.name == StringName() ? K.key : StringName(String(lib.name) + "/" + String(K.key));
-			AnimationData *ad = animation_set.getptr(key);
-
-			if (!ad) {
-				ad = &animation_set.insert(key, AnimationData())->value; // 2) Hash key and lookup again.
-				ad->animation = K.value;
-				ad->animation_library = lib.name;
-				ad->last_update = animation_set_update_pass;
-				cache_valid = false;
+			if (!animation_set.has(key)) {
+				AnimationData ad;
+				ad.animation = K.value;
+				ad.animation_library = lib.name;
+				ad.name = key;
+				ad.last_update = animation_set_update_pass;
+				animation_set.insert(ad.name, ad);
+				cache_valid = false; // No need to delete the cache, but it must be updated to add track caches.
 			} else {
-				if (ad->last_update != animation_set_update_pass) {
-					if (ad->animation != K.value || ad->animation_library != lib.name) {
+				AnimationData &ad = animation_set[key];
+				if (ad.last_update != animation_set_update_pass) {
+					// Was not updated, update. If the animation is duplicated, the second one will be ignored.
+					if (ad.animation != K.value || ad.animation_library != lib.name) {
+						// Animation changed, update and clear caches.
 						clear_cache_needed = true;
-						ad->animation = K.value;
-						ad->animation_library = lib.name;
+						ad.animation = K.value;
+						ad.animation_library = lib.name;
 					}
 
-					ad->last_update = animation_set_update_pass;
+					ad.last_update = animation_set_update_pass;
 				}
 			}
 		}
 	}
 
 	// Check removed.
-	// TODO: Can we avoid this nonsense by iterating in reverse?
-	LocalVector<StringName> to_erase;
+	List<StringName> to_erase;
 	for (const KeyValue<StringName, AnimationData> &E : animation_set) {
 		if (E.value.last_update != animation_set_update_pass) {
 			// Was not updated, must be erased.
@@ -193,8 +192,9 @@ void AnimationMixer::_animation_set_cache_update() {
 		}
 	}
 
-	for (const StringName &E : to_erase) {
-		animation_set.erase(E);
+	while (to_erase.size()) {
+		animation_set.erase(to_erase.front()->get());
+		to_erase.pop_front();
 	}
 
 	if (clear_cache_needed) {
@@ -210,7 +210,7 @@ void AnimationMixer::_animation_added(const StringName &p_name, const StringName
 }
 
 void AnimationMixer::_animation_removed(const StringName &p_name, const StringName &p_library) {
-	const StringName name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
+	StringName name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
 
 	if (!animation_set.has(name)) {
 		return; // No need to update because not the one from the library being used.
@@ -222,8 +222,8 @@ void AnimationMixer::_animation_removed(const StringName &p_name, const StringNa
 }
 
 void AnimationMixer::_animation_renamed(const StringName &p_name, const StringName &p_to_name, const StringName &p_library) {
-	const StringName from_name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
-	const StringName to_name = p_library == StringName() ? p_to_name : StringName(String(p_library) + "/" + String(p_to_name));
+	StringName from_name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
+	StringName to_name = p_library == StringName() ? p_to_name : StringName(String(p_library) + "/" + String(p_to_name));
 
 	if (!animation_set.has(from_name)) {
 		return; // No need to update because not the one from the library being used.
@@ -257,7 +257,7 @@ TypedArray<StringName> AnimationMixer::_get_animation_library_list() const {
 	return ret;
 }
 
-void AnimationMixer::get_animation_library_list(LocalVector<StringName> *p_libraries) const {
+void AnimationMixer::get_animation_library_list(List<StringName> *p_libraries) const {
 	for (const AnimationLibraryData &lib : animation_libraries) {
 		p_libraries->push_back(lib.name);
 	}
@@ -282,14 +282,23 @@ bool AnimationMixer::has_animation_library(const StringName &p_name) const {
 	return false;
 }
 
-const StringName &AnimationMixer::find_animation_library(const Ref<Animation> &p_animation) const {
+StringName AnimationMixer::get_animation_library_name(const Ref<AnimationLibrary> &p_animation_library) const {
+	ERR_FAIL_COND_V(p_animation_library.is_null(), StringName());
+	for (const AnimationLibraryData &lib : animation_libraries) {
+		if (lib.library == p_animation_library) {
+			return lib.name;
+		}
+	}
+	return StringName();
+}
+
+StringName AnimationMixer::find_animation_library(const Ref<Animation> &p_animation) const {
 	for (const KeyValue<StringName, AnimationData> &E : animation_set) {
 		if (E.value.animation == p_animation) {
 			return E.value.animation_library;
 		}
 	}
-	const static StringName empty = StringName();
-	return empty;
+	return StringName();
 }
 
 Error AnimationMixer::add_animation_library(const StringName &p_name, const Ref<AnimationLibrary> &p_animation_library) {
@@ -392,33 +401,21 @@ void AnimationMixer::rename_animation_library(const StringName &p_name, const St
 	notify_property_list_changed();
 }
 
-LocalVector<StringName> AnimationMixer::get_sorted_animation_list() const {
-	LocalVector<StringName> animations;
-	get_animation_list(&animations);
-	animations.sort_custom<StringName::AlphCompare>();
-	return animations;
-}
-
-void AnimationMixer::get_animation_list(LocalVector<StringName> *p_animations) const {
-	p_animations->reserve(p_animations->size() + animation_set.size());
+void AnimationMixer::get_animation_list(List<StringName> *p_animations) const {
+	List<String> anims;
 	for (const KeyValue<StringName, AnimationData> &E : animation_set) {
-		p_animations->push_back(E.key);
+		anims.push_back(E.key);
+	}
+	anims.sort();
+	for (const String &E : anims) {
+		p_animations->push_back(E);
 	}
 }
 
-const Ref<Animation> &AnimationMixer::get_animation(const StringName &p_name) const {
-	const Ref<Animation> &animation = get_animation_or_null(p_name);
-	ERR_FAIL_COND_V_MSG(animation.is_null(), animation, vformat("Animation not found: \"%s\".", p_name));
-	return animation;
-}
-
-const Ref<Animation> &AnimationMixer::get_animation_or_null(const StringName &p_name) const {
-	const AnimationData *ad = animation_set.getptr(p_name);
-	if (!ad) {
-		const static Ref<Animation> empty = Ref<Animation>();
-		return empty;
-	}
-	return ad->animation;
+Ref<Animation> AnimationMixer::get_animation(const StringName &p_name) const {
+	ERR_FAIL_COND_V_MSG(!animation_set.has(p_name), Ref<Animation>(), vformat("Animation not found: \"%s\".", p_name));
+	const AnimationData &anim_data = animation_set[p_name];
+	return anim_data.animation;
 }
 
 bool AnimationMixer::has_animation(const StringName &p_name) const {
@@ -587,7 +584,7 @@ void AnimationMixer::_clear_caches() {
 	_init_root_motion_cache();
 	_clear_audio_streams();
 	_clear_playing_caches();
-	for (KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		memdelete(K.value);
 	}
 	track_cache.clear();
@@ -628,7 +625,7 @@ void AnimationMixer::_init_root_motion_cache() {
 	root_motion_scale_accumulator = Vector3(1, 1, 1);
 }
 
-void AnimationMixer::_create_track_num_to_track_cache_for_animation(const Ref<Animation> &p_animation) {
+void AnimationMixer::_create_track_num_to_track_cache_for_animation(Ref<Animation> &p_animation) {
 	if (animation_track_num_to_track_cache.has(p_animation)) {
 		// In AnimationMixer::_update_caches, it retrieves all animations via AnimationMixer::get_animation_list
 		// Since multiple AnimationLibraries can share the same Animation, it is possible that the cache is already created.
@@ -639,7 +636,7 @@ void AnimationMixer::_create_track_num_to_track_cache_for_animation(const Ref<An
 
 	track_num_to_track_cache.resize(tracks.size());
 	for (uint32_t i = 0; i < tracks.size(); i++) {
-		TrackCache **track_ptr = track_cache.getptr(tracks[i]->get_unique_id());
+		TrackCache **track_ptr = track_cache.getptr(tracks[i]->thash);
 		if (track_ptr == nullptr) {
 			track_num_to_track_cache[i] = nullptr;
 		} else {
@@ -650,15 +647,12 @@ void AnimationMixer::_create_track_num_to_track_cache_for_animation(const Ref<An
 
 bool AnimationMixer::_update_caches() {
 	setup_pass++;
-	if (unlikely(setup_pass == 0)) {
-		setup_pass = 1;
-	}
 
 	root_motion_cache.loc = Vector3(0, 0, 0);
 	root_motion_cache.rot = Quaternion(0, 0, 0, 1);
 	root_motion_cache.scale = Vector3(1, 1, 1);
 
-	LocalVector<StringName> sname_list;
+	List<StringName> sname_list;
 	get_animation_list(&sname_list);
 
 	bool check_path = GLOBAL_GET_CACHED(bool, "animation/warnings/check_invalid_track_paths");
@@ -690,28 +684,26 @@ bool AnimationMixer::_update_caches() {
 		reset_anim = get_animation(SceneStringName(RESET));
 	}
 	for (const StringName &E : sname_list) {
-		const Ref<Animation> &anim = get_animation(E);
+		Ref<Animation> anim = get_animation(E);
 		for (int i = 0; i < anim->get_track_count(); i++) {
 			if (!anim->track_is_enabled(i)) {
 				continue;
 			}
 			NodePath path = anim->track_get_path(i);
-			(void)path.hash(); // Make sure the cache is valid for faster comparison.
-
-			const Animation::TrackCacheID &track_unique_id = anim->track_get_unique_id(i);
+			Animation::TypeHash thash = anim->track_get_type_hash(i);
 			Animation::TrackType track_src_type = anim->track_get_type(i);
 			Animation::TrackType track_cache_type = Animation::get_cache_type(track_src_type);
 
 			TrackCache *track = nullptr;
-			if (TrackCache **p = track_cache.getptr(track_unique_id)) {
-				track = *p;
+			if (track_cache.has(thash)) {
+				track = track_cache.get(thash);
 			}
 
 			// If not valid, delete track.
 			if (track && (track->type != track_cache_type || ObjectDB::get_instance(track->object_id) == nullptr)) {
 				playing_caches.erase(track);
 				memdelete(track);
-				track_cache.erase(track_unique_id);
+				track_cache.erase(thash);
 				track = nullptr;
 			}
 
@@ -922,7 +914,7 @@ bool AnimationMixer::_update_caches() {
 					}
 				}
 				track->path = path;
-				track_cache[track_unique_id] = track;
+				track_cache[thash] = track;
 			} else if (track_cache_type == Animation::TYPE_POSITION_3D) {
 				TrackCacheTransform *track_xform = static_cast<TrackCacheTransform *>(track);
 				if (track->setup_pass != setup_pass) {
@@ -962,39 +954,36 @@ bool AnimationMixer::_update_caches() {
 		}
 	}
 
-	LocalVector<Animation::TrackCacheID> to_delete;
+	List<Animation::TypeHash> to_delete;
 
-	for (const KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (const KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		if (K.value->setup_pass != setup_pass) {
 			to_delete.push_back(K.key);
 		}
 	}
 
-	for (const Animation::TrackCacheID &unique_id : to_delete) {
-		memdelete(track_cache[unique_id]);
-		track_cache.erase(unique_id);
+	while (to_delete.front()) {
+		Animation::TypeHash thash = to_delete.front()->get();
+		memdelete(track_cache[thash]);
+		track_cache.erase(thash);
+		to_delete.pop_front();
 	}
 
 	track_map.clear();
 
 	int idx = 0;
-	for (const KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (const KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		track_map[K.value->path] = idx;
 		idx++;
 	}
 
-	for (KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		K.value->blend_idx = track_map[K.value->path];
 	}
 
-	track_map_version++;
-	if (track_map_version == 0) {
-		track_map_version = 1;
-	}
-
 	animation_track_num_to_track_cache.clear();
 	for (const StringName &E : sname_list) {
-		const Ref<Animation> &anim = get_animation(E);
+		Ref<Animation> anim = get_animation(E);
 		_create_track_num_to_track_cache_for_animation(anim);
 	}
 
@@ -1070,7 +1059,7 @@ void AnimationMixer::_blend_init() {
 	}
 
 	// Init all value/transform/blend/bezier tracks that track_cache has.
-	for (const KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (const KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		TrackCache *track = K.value;
 
 		track->total_weight = 0.0;
@@ -1146,11 +1135,14 @@ void AnimationMixer::blend_capture(double p_delta) {
 	}
 
 	// Build capture animation instance.
+	AnimationData ad;
+	ad.animation = capture_cache.animation;
+
 	PlaybackInfo pi;
 	pi.weight = weight;
 
 	AnimationInstance ai;
-	ai.animation = capture_cache.animation;
+	ai.animation_data = ad;
 	ai.playback_info = pi;
 
 	animation_instances.push_back(ai);
@@ -1158,29 +1150,14 @@ void AnimationMixer::blend_capture(double p_delta) {
 
 void AnimationMixer::_blend_calc_total_weight() {
 	for (const AnimationInstance &ai : animation_instances) {
-		const Ref<Animation> &a = ai.animation;
+		Ref<Animation> a = ai.animation_data.animation;
 		real_t weight = ai.playback_info.weight;
-		if (Math::is_zero_approx(weight)) {
-			continue;
-		}
-		Span<real_t> track_weights = ai.playback_info.track_weights != nullptr ? *ai.playback_info.track_weights : Span<real_t>();
-
-		LocalVector<TrackCache *> *t_cache = animation_track_num_to_track_cache.getptr(a);
-		ERR_CONTINUE_EDMSG(!t_cache, "No animation in cache.");
-		LocalVector<TrackCache *> &track_num_to_track_cache = *t_cache;
-
-		uint64_t pass_id = ++animation_instance_weight_pass_counter;
-		// Handle wrap (slower but rare).
-		if (unlikely(pass_id == 0)) {
-			for (KeyValue<Animation::TrackCacheID, TrackCache *> &kv : track_cache) {
-				if (kv.value) {
-					kv.value->animation_instance_weight_applied_at = 0;
-				}
-			}
-			animation_instance_weight_pass_counter = 1;
-			pass_id = 1;
-		}
-
+		const real_t *track_weights_ptr = ai.playback_info.track_weights.ptr();
+		int track_weights_count = ai.playback_info.track_weights.size();
+		ERR_CONTINUE_EDMSG(!animation_track_num_to_track_cache.has(a), "No animation in cache.");
+		LocalVector<TrackCache *> &track_num_to_track_cache = animation_track_num_to_track_cache[a];
+		thread_local HashSet<Animation::TypeHash, HashHasher> processed_hashes;
+		processed_hashes.clear();
 		const LocalVector<Animation::Track *> &tracks = a->get_tracks();
 		Animation::Track *const *tracks_ptr = tracks.ptr();
 		int count = tracks.size();
@@ -1189,30 +1166,18 @@ void AnimationMixer::_blend_calc_total_weight() {
 			if (!animation_track->enabled) {
 				continue;
 			}
+			Animation::TypeHash thash = animation_track->thash;
 			TrackCache *track = track_num_to_track_cache[i];
-			if (track == nullptr) {
+			if (track == nullptr || processed_hashes.has(thash)) {
 				// No path, but avoid error spamming.
+				// Or, there is the case different track type with same path; These can be distinguished by hash. So don't add the weight doubly.
 				continue;
 			}
-
-			// In some cases (e.g. TrackCacheTransform),
-			// multiple Animation::Tracks (e.g. TYPE_POSITION_3D, TYPE_ROTATION_3D and TYPE_SCALE_3D)
-			// can point to the same TrackCache instance.
-			// So we need to make sure that the weight is added only once per AnimationInstance.
-			if (track->animation_instance_weight_applied_at == pass_id) {
-				continue;
-			}
-
 			int blend_idx = track->blend_idx;
 			ERR_CONTINUE(blend_idx < 0 || blend_idx >= track_count);
-			real_t blend;
-			if (!track_weights.is_empty() && blend_idx < static_cast<int>(track_weights.size())) {
-				blend = track_weights[blend_idx] * weight;
-			} else {
-				blend = weight;
-			}
+			real_t blend = blend_idx < track_weights_count ? track_weights_ptr[blend_idx] * weight : weight;
 			track->total_weight += blend;
-			track->animation_instance_weight_applied_at = pass_id;
+			processed_hashes.insert(thash);
 		}
 	}
 }
@@ -1223,7 +1188,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 	bool can_call = is_inside_tree() && !Engine::get_singleton()->is_editor_hint();
 #endif // TOOLS_ENABLED
 	for (const AnimationInstance &ai : animation_instances) {
-		const Ref<Animation> &a = ai.animation;
+		Ref<Animation> a = ai.animation_data.animation;
 		double time = ai.playback_info.time;
 		double delta = ai.playback_info.delta;
 		double start = ai.playback_info.start;
@@ -1232,18 +1197,18 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 		Animation::LoopedFlag looped_flag = ai.playback_info.looped_flag;
 		bool is_external_seeking = ai.playback_info.is_external_seeking;
 		real_t weight = ai.playback_info.weight;
+		const real_t *track_weights_ptr = ai.playback_info.track_weights.ptr();
+		int track_weights_count = ai.playback_info.track_weights.size();
 		bool backward = std::signbit(delta); // This flag is used by the root motion calculates or detecting the end of audio stream.
 		bool seeked_backward = std::signbit(p_delta);
 #ifndef _3D_DISABLED
 		bool calc_root = !seeked || is_external_seeking;
 #endif // _3D_DISABLED
-		LocalVector<TrackCache *> *t_cache = animation_track_num_to_track_cache.getptr(a);
-		ERR_CONTINUE_EDMSG(!t_cache, "No animation in cache.");
-		LocalVector<TrackCache *> &track_num_to_track_cache = *t_cache;
-
+		ERR_CONTINUE_EDMSG(!animation_track_num_to_track_cache.has(a), "No animation in cache.");
+		LocalVector<TrackCache *> &track_num_to_track_cache = animation_track_num_to_track_cache[a];
 		const LocalVector<Animation::Track *> &tracks = a->get_tracks();
 		Animation::Track *const *tracks_ptr = tracks.ptr();
-		double a_length = a->get_length();
+		real_t a_length = a->get_length();
 		int count = tracks.size();
 		for (int i = 0; i < count; i++) {
 			const Animation::Track *animation_track = tracks_ptr[i];
@@ -1256,14 +1221,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 			}
 			int blend_idx = track->blend_idx;
 			ERR_CONTINUE(blend_idx < 0 || blend_idx >= track_count);
-			real_t blend;
-			Span<real_t> track_weights = ai.playback_info.track_weights != nullptr ? *ai.playback_info.track_weights : Span<real_t>();
-			if (!track_weights.is_empty() && blend_idx < static_cast<int>(track_weights.size())) {
-				blend = track_weights[blend_idx] * weight;
-			} else {
-				blend = weight;
-			}
-
+			real_t blend = blend_idx < track_weights_count ? track_weights_ptr[blend_idx] * weight : weight;
 			if (!deterministic) {
 				// If non-deterministic, do normalization.
 				// It would be better to make this if statement outside the for loop, but come here since too much code...
@@ -1675,7 +1633,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 								t_obj->set_indexed(t->subpath, value);
 							}
 						} else {
-							LocalVector<int> indices;
+							List<int> indices;
 							a->track_get_key_indices_in_range(i, time, delta, start, end, &indices, looped_flag);
 							for (int &F : indices) {
 								t->use_discrete = true;
@@ -1708,7 +1666,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 						Vector<Variant> params = a->method_track_get_params(i, idx);
 						_call_object(t->object_id, method, params, callback_mode_method == ANIMATION_CALLBACK_MODE_METHOD_DEFERRED);
 					} else {
-						LocalVector<int> indices;
+						List<int> indices;
 						a->track_get_key_indices_in_range(i, time, delta, start, end, &indices, looped_flag);
 						for (int &F : indices) {
 							StringName method = a->method_track_get_name(i, F);
@@ -1756,10 +1714,10 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 							map.erase(idx);
 						}
 					} else {
-						LocalVector<int> to_play;
+						List<int> to_play;
 						a->track_get_key_indices_in_range(i, time, delta, start, end, &to_play, looped_flag);
 						if (to_play.size()) {
-							idx = to_play[to_play.size() - 1];
+							idx = to_play.back()->get();
 						}
 					}
 					if (idx < 0) {
@@ -1839,10 +1797,10 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 						}
 						double pos = a->track_get_key_time(i, idx);
 						StringName anim_name = a->animation_track_get_key_animation(i, idx);
-						const Ref<Animation> &anim = player2->get_animation_or_null(anim_name);
-						if (anim_name == SNAME("[stop]") || anim.is_null()) {
+						if (String(anim_name) == "[stop]" || !player2->has_animation(anim_name)) {
 							continue;
 						}
+						Ref<Animation> anim = player2->get_animation(anim_name);
 						double at_anim_pos = start;
 						switch (anim->get_loop_mode()) {
 							case Animation::LOOP_NONE: {
@@ -1871,12 +1829,12 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 						}
 					} else {
 						// Find stuff to play.
-						LocalVector<int> to_play;
+						List<int> to_play;
 						a->track_get_key_indices_in_range(i, time, delta, start, end, &to_play, looped_flag);
 						if (to_play.size()) {
-							int idx = to_play[to_play.size() - 1];
+							int idx = to_play.back()->get();
 							StringName anim_name = a->animation_track_get_key_animation(i, idx);
-							if (anim_name == SNAME("[stop]") || !player2->has_animation(anim_name)) {
+							if (String(anim_name) == "[stop]" || !player2->has_animation(anim_name)) {
 								if (playing_caches.has(t)) {
 									playing_caches.erase(t);
 									player2->stop();
@@ -1898,7 +1856,7 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 
 void AnimationMixer::_blend_apply() {
 	// Finally, set the tracks.
-	for (const KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (const KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		TrackCache *track = K.value;
 		bool is_zero_amount = Math::is_zero_approx(track->total_weight);
 		if (!deterministic && is_zero_amount) {
@@ -1921,10 +1879,6 @@ void AnimationMixer::_blend_apply() {
 					if (!t_skeleton) {
 						return;
 					}
-
-					// TODO: Once https://github.com/godotengine/godot/pull/113441 makes it in
-					// Use set_bone_pose_components when loc_used, rot_used, and scale_used are all true.
-
 					if (t->loc_used) {
 						t_skeleton->set_bone_pose_position(t->bone_idx, t->loc);
 					}
@@ -1940,19 +1894,14 @@ void AnimationMixer::_blend_apply() {
 					if (!t_node_3d) {
 						return;
 					}
-					if (t->loc_used && t->rot_used && t->scale_used) {
-						Transform3D transform = Transform3D(Basis(t->rot).scaled(t->scale), t->loc);
-						t_node_3d->set_transform(transform);
-					} else {
-						if (t->loc_used) {
-							t_node_3d->set_position(t->loc);
-						}
-						if (t->rot_used) {
-							t_node_3d->set_rotation(t->rot.get_euler());
-						}
-						if (t->scale_used) {
-							t_node_3d->set_scale(t->scale);
-						}
+					if (t->loc_used) {
+						t_node_3d->set_position(t->loc);
+					}
+					if (t->rot_used) {
+						t_node_3d->set_rotation(t->rot.get_euler());
+					}
+					if (t->scale_used) {
+						t_node_3d->set_scale(t->scale);
 					}
 				}
 #endif // _3D_DISABLED
@@ -2091,15 +2040,19 @@ void AnimationMixer::_call_object(ObjectID p_object_id, const StringName &p_meth
 	}
 }
 
-void AnimationMixer::make_animation_instance(const StringName &p_name, const PlaybackInfo &p_playback_info) {
-	const Ref<Animation> &animation = get_animation_or_null(p_name);
-	ERR_FAIL_COND(animation.is_null());
+void AnimationMixer::make_animation_instance(const StringName &p_name, const PlaybackInfo p_playback_info) {
+	ERR_FAIL_COND(!has_animation(p_name));
+
+	AnimationData ad;
+	ad.name = p_name;
+	ad.animation = get_animation(p_name);
+	ad.animation_library = find_animation_library(ad.animation);
 
 	AnimationInstance ai;
-	ai.animation = animation;
+	ai.animation_data = ad;
 	ai.playback_info = p_playback_info;
 
-	animation_instances.push_back(std::move(ai));
+	animation_instances.push_back(ai);
 }
 
 void AnimationMixer::clear_animation_instances() {
@@ -2176,7 +2129,7 @@ bool AnimationMixer::can_apply_reset() const {
 }
 
 void AnimationMixer::_build_backup_track_cache() {
-	for (const KeyValue<Animation::TrackCacheID, TrackCache *> &K : track_cache) {
+	for (const KeyValue<Animation::TypeHash, TrackCache *> &K : track_cache) {
 		TrackCache *track = K.value;
 		track->total_weight = 1.0;
 		switch (track->type) {
@@ -2273,7 +2226,7 @@ Ref<AnimatedValuesBackup> AnimationMixer::make_backup() {
 	make_animation_instance(SceneStringName(RESET), pi);
 	_build_backup_track_cache();
 
-	backup->set_data(AHashMap<Animation::TrackCacheID, TrackCache *, HashHasher>(track_cache));
+	backup->set_data(track_cache);
 	clear_animation_instances();
 
 	return backup;
@@ -2305,7 +2258,7 @@ void AnimationMixer::restore(const Ref<AnimatedValuesBackup> &p_backup) {
 	ERR_FAIL_COND(p_backup.is_null());
 	track_cache = p_backup->get_data();
 	_blend_apply();
-	track_cache = AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher>();
+	track_cache = AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher>();
 	cache_valid = false;
 }
 
@@ -2340,9 +2293,9 @@ Ref<AnimatedValuesBackup> AnimationMixer::apply_reset(bool p_user_initiated) {
 
 void AnimationMixer::capture(const StringName &p_name, double p_duration, Tween::TransitionType p_trans_type, Tween::EaseType p_ease_type) {
 	ERR_FAIL_COND(!active);
-	const Ref<Animation> &reference_animation = get_animation_or_null(p_name);
-	ERR_FAIL_COND(reference_animation.is_null());
+	ERR_FAIL_COND(!has_animation(p_name));
 	ERR_FAIL_COND(p_duration <= 0);
+	Ref<Animation> reference_animation = get_animation(p_name);
 
 	if (!cache_valid) {
 		_update_caches(); // Need to retrieve object id.
@@ -2363,7 +2316,7 @@ void AnimationMixer::capture(const StringName &p_name, double p_duration, Tween:
 			continue;
 		}
 		if (reference_animation->track_get_type(i) == Animation::TYPE_VALUE && reference_animation->value_track_get_update_mode(i) == Animation::UPDATE_CAPTURE) {
-			TrackCacheValue *t = static_cast<TrackCacheValue *>(track_cache[reference_animation->track_get_unique_id(i)]);
+			TrackCacheValue *t = static_cast<TrackCacheValue *>(track_cache[reference_animation->track_get_type_hash(i)]);
 			Object *t_obj = ObjectDB::get_instance(t->object_id);
 			if (t_obj) {
 				Variant value = t_obj->get_indexed(t->subpath);
@@ -2424,11 +2377,13 @@ void AnimationMixer::get_argument_options(const StringName &p_function, int p_id
 	const String pf = p_function;
 	if (p_idx == 0) {
 		if (pf == "get_animation" || pf == "has_animation") {
-			for (const StringName &name : get_sorted_animation_list()) {
+			List<StringName> al;
+			get_animation_list(&al);
+			for (const StringName &name : al) {
 				r_options->push_back(String(name).quote());
 			}
 		} else if (pf == "get_animation_library" || pf == "has_animation_library" || pf == "remove_animation_library" || pf == "rename_animation_library") {
-			LocalVector<StringName> al;
+			List<StringName> al;
 			get_animation_library_list(&al);
 			for (const StringName &name : al) {
 				r_options->push_back(String(name).quote());
@@ -2541,16 +2496,16 @@ void AnimationMixer::_bind_methods() {
 }
 
 AnimationMixer::AnimationMixer() {
-	root_node = NodePath("..");
+	root_node = SceneStringName(path_pp);
 }
 
 AnimationMixer::~AnimationMixer() {
 }
 
-void AnimatedValuesBackup::set_data(const AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> &p_data) {
+void AnimatedValuesBackup::set_data(const AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> p_data) {
 	clear_data();
 
-	for (const KeyValue<Animation::TrackCacheID, AnimationMixer::TrackCache *> &E : p_data) {
+	for (const KeyValue<Animation::TypeHash, AnimationMixer::TrackCache *> &E : p_data) {
 		AnimationMixer::TrackCache *track = get_cache_copy(E.value);
 		if (!track) {
 			continue; // Some types of tracks do not get a copy and must be ignored.
@@ -2560,9 +2515,9 @@ void AnimatedValuesBackup::set_data(const AHashMap<Animation::TrackCacheID, Anim
 	}
 }
 
-AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> AnimatedValuesBackup::get_data() const {
-	AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> ret;
-	for (const KeyValue<Animation::TrackCacheID, AnimationMixer::TrackCache *> &E : data) {
+AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> AnimatedValuesBackup::get_data() const {
+	AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> ret;
+	for (const KeyValue<Animation::TypeHash, AnimationMixer::TrackCache *> &E : data) {
 		AnimationMixer::TrackCache *track = get_cache_copy(E.value);
 		ERR_CONTINUE(!track); // Backup shouldn't contain tracks that cannot be copied, this is a mistake.
 
@@ -2572,7 +2527,7 @@ AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> Anim
 }
 
 void AnimatedValuesBackup::clear_data() {
-	for (KeyValue<Animation::TrackCacheID, AnimationMixer::TrackCache *> &K : data) {
+	for (KeyValue<Animation::TypeHash, AnimationMixer::TrackCache *> &K : data) {
 		memdelete(K.value);
 	}
 	data.clear();
diff --git a/engine/scene/animation/animation_mixer.h b/engine/scene/animation/animation_mixer.h
index 4743e0fb..21b76e7c 100644
--- a/engine/scene/animation/animation_mixer.h
+++ b/engine/scene/animation/animation_mixer.h
@@ -76,6 +76,7 @@ public:
 	};
 
 	struct AnimationData {
+		String name;
 		Ref<Animation> animation;
 		StringName animation_library;
 		uint64_t last_update = 0;
@@ -90,11 +91,11 @@ public:
 		bool is_external_seeking = false;
 		Animation::LoopedFlag looped_flag = Animation::LOOPED_FLAG_NONE;
 		real_t weight = 0.0;
-		LocalVector<real_t> *track_weights = nullptr;
+		Vector<real_t> track_weights;
 	};
 
 	struct AnimationInstance {
-		Ref<Animation> animation;
+		AnimationData animation_data;
 		PlaybackInfo playback_info;
 	};
 
@@ -104,13 +105,13 @@ protected:
 	AHashMap<StringName, AnimationData> animation_set; // HashMap<Library name + Animation name, AnimationData>
 
 	TypedArray<StringName> _get_animation_library_list() const;
-	// TODO: This needs to be a TypedArray<StringName> see this PR for rationale https://github.com/godotengine/godot/pull/110767/
 	Vector<String> _get_animation_list() const {
+		List<StringName> animations;
+		get_animation_list(&animations);
 		Vector<String> ret;
-		LocalVector<StringName> animations = get_sorted_animation_list();
-		ret.resize(animations.size());
-		for (uint32_t i = 0; i < animations.size(); ++i) {
-			ret.write[i] = animations[i];
+		while (animations.size()) {
+			ret.push_back(animations.front()->get());
+			animations.pop_front();
 		}
 		return ret;
 	}
@@ -140,6 +141,7 @@ protected:
 	/* ---- Caches for blending ---- */
 	bool cache_valid = false;
 	uint64_t setup_pass = 1;
+	uint64_t process_pass = 1;
 
 	struct TrackCache {
 		bool root_motion = false;
@@ -149,7 +151,6 @@ protected:
 		int blend_idx = -1;
 		ObjectID object_id;
 		real_t total_weight = 0.0;
-		uint64_t animation_instance_weight_applied_at = 0;
 
 		TrackCache() = default;
 		TrackCache(const TrackCache &p_other) :
@@ -157,8 +158,7 @@ protected:
 				setup_pass(p_other.setup_pass),
 				type(p_other.type),
 				object_id(p_other.object_id),
-				total_weight(p_other.total_weight),
-				animation_instance_weight_applied_at(p_other.animation_instance_weight_applied_at) {}
+				total_weight(p_other.total_weight) {}
 
 		virtual ~TrackCache() {}
 	};
@@ -304,7 +304,7 @@ protected:
 	};
 
 	RootMotionCache root_motion_cache;
-	AHashMap<Animation::TrackCacheID, TrackCache *, HashHasher> track_cache;
+	AHashMap<Animation::TypeHash, TrackCache *, HashHasher> track_cache;
 	AHashMap<Ref<Animation>, LocalVector<TrackCache *>> animation_track_num_to_track_cache;
 	HashSet<TrackCache *> playing_caches;
 	Vector<Node *> playing_audio_stream_players;
@@ -315,16 +315,14 @@ protected:
 	void _clear_playing_caches();
 	void _init_root_motion_cache();
 	bool _update_caches();
-	void _create_track_num_to_track_cache_for_animation(const Ref<Animation> &p_animation);
+	void _create_track_num_to_track_cache_for_animation(Ref<Animation> &p_animation);
 
 	/* ---- Audio ---- */
 	AudioServer::PlaybackType playback_type;
 
 	/* ---- Blending processor ---- */
 	LocalVector<AnimationInstance> animation_instances;
-	uint64_t animation_instance_weight_pass_counter = 0;
 	AHashMap<NodePath, int> track_map;
-	uint64_t track_map_version = 1;
 	int track_count = 0;
 	bool deterministic = false;
 
@@ -401,18 +399,17 @@ protected:
 
 public:
 	/* ---- Data lists ---- */
-	void get_animation_library_list(LocalVector<StringName> *p_animations) const;
+	void get_animation_library_list(List<StringName> *p_animations) const;
 	Ref<AnimationLibrary> get_animation_library(const StringName &p_name) const;
 	bool has_animation_library(const StringName &p_name) const;
-	const StringName &find_animation_library(const Ref<Animation> &p_animation) const;
+	StringName get_animation_library_name(const Ref<AnimationLibrary> &p_animation_library) const;
+	StringName find_animation_library(const Ref<Animation> &p_animation) const;
 	Error add_animation_library(const StringName &p_name, const Ref<AnimationLibrary> &p_animation_library);
 	void remove_animation_library(const StringName &p_name);
 	void rename_animation_library(const StringName &p_name, const StringName &p_new_name);
 
-	LocalVector<StringName> get_sorted_animation_list() const;
-	void get_animation_list(LocalVector<StringName> *p_animations) const;
-	const Ref<Animation> &get_animation(const StringName &p_name) const;
-	const Ref<Animation> &get_animation_or_null(const StringName &p_name) const;
+	void get_animation_list(List<StringName> *p_animations) const;
+	Ref<Animation> get_animation(const StringName &p_name) const;
 	bool has_animation(const StringName &p_name) const;
 	StringName find_animation(const Ref<Animation> &p_animation) const;
 
@@ -455,7 +452,7 @@ public:
 	Vector3 get_root_motion_scale_accumulator() const;
 
 	/* ---- Blending processor ---- */
-	void make_animation_instance(const StringName &p_name, const PlaybackInfo &p_playback_info);
+	void make_animation_instance(const StringName &p_name, const PlaybackInfo p_playback_info);
 	void clear_animation_instances();
 	virtual void advance(double p_time);
 	virtual void clear_caches(); // Must be called by hand if an animation was modified after added.
@@ -489,12 +486,11 @@ public:
 class AnimatedValuesBackup : public RefCounted {
 	GDCLASS(AnimatedValuesBackup, RefCounted);
 
-	AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> data;
+	AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> data;
 
 public:
-	void set_data(const AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> &p_data);
-	AHashMap<Animation::TrackCacheID, AnimationMixer::TrackCache *, HashHasher> get_data() const;
-
+	void set_data(const AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> p_data);
+	AHashMap<Animation::TypeHash, AnimationMixer::TrackCache *, HashHasher> get_data() const;
 	void clear_data();
 
 	AnimationMixer::TrackCache *get_cache_copy(AnimationMixer::TrackCache *p_cache) const;
diff --git a/engine/scene/animation/animation_node_extension.cpp b/engine/scene/animation/animation_node_extension.cpp
index d00ccfb0..3d5a6367 100644
--- a/engine/scene/animation/animation_node_extension.cpp
+++ b/engine/scene/animation/animation_node_extension.cpp
@@ -30,9 +30,7 @@
 
 #include "animation_node_extension.h"
 
-#include "core/object/class_db.h"
-
-AnimationNode::NodeTimeInfo AnimationNodeExtension::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNodeExtension::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	PackedFloat32Array r_ret;
 
 	GDVIRTUAL_CALL(
diff --git a/engine/scene/animation/animation_node_extension.h b/engine/scene/animation/animation_node_extension.h
index 82690d7b..71adcc5b 100644
--- a/engine/scene/animation/animation_node_extension.h
+++ b/engine/scene/animation/animation_node_extension.h
@@ -36,7 +36,7 @@ class AnimationNodeExtension : public AnimationNode {
 	GDCLASS(AnimationNodeExtension, AnimationNode);
 
 public:
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 
 	static bool is_looping(const PackedFloat32Array &p_node_info);
 	static double get_remaining_time(const PackedFloat32Array &p_node_info, bool p_break_loop = false);
diff --git a/engine/scene/animation/animation_node_state_machine.cpp b/engine/scene/animation/animation_node_state_machine.cpp
index 9a179532..e5df4b0b 100644
--- a/engine/scene/animation/animation_node_state_machine.cpp
+++ b/engine/scene/animation/animation_node_state_machine.cpp
@@ -30,10 +30,6 @@
 
 #include "animation_node_state_machine.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 /////////////////////////////////////////////////
 
 void AnimationNodeStateMachineTransition::set_switch_mode(SwitchMode p_mode) {
@@ -167,7 +163,7 @@ void AnimationNodeStateMachineTransition::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_advance_expression"), &AnimationNodeStateMachineTransition::get_advance_expression);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "xfade_time", PROPERTY_HINT_RANGE, "0,240,0.01,suffix:s"), "set_xfade_time", "get_xfade_time");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "xfade_curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_xfade_curve", "get_xfade_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "xfade_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_xfade_curve", "get_xfade_curve");
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "break_loop_at_end"), "set_break_loop_at_end", "is_loop_broken_at_end");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "reset"), "set_reset", "is_reset");
@@ -196,7 +192,7 @@ AnimationNodeStateMachineTransition::AnimationNodeStateMachineTransition() {
 
 ////////////////////////////////////////////////////////
 
-void AnimationNodeStateMachinePlayback::_set_current(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine, const StringName &p_state) {
+void AnimationNodeStateMachinePlayback::_set_current(AnimationNodeStateMachine *p_state_machine, const StringName &p_state) {
 	current = p_state;
 	if (current == StringName()) {
 		group_start_transition = Ref<AnimationNodeStateMachineTransition>();
@@ -204,7 +200,7 @@ void AnimationNodeStateMachinePlayback::_set_current(AnimationNode::ProcessState
 		return;
 	}
 
-	AnimationTree *tree = p_process_state.tree;
+	AnimationTree *tree = p_state_machine->process_state ? p_state_machine->process_state->tree : nullptr;
 	Ref<AnimationNodeStateMachine> anodesm = p_state_machine->find_node_by_path(current);
 	if (anodesm.is_null()) {
 		group_start_transition = Ref<AnimationNodeStateMachineTransition>();
@@ -358,9 +354,9 @@ bool _is_grouped_state_machine(const Ref<AnimationNodeStateMachine> p_node) {
 	return p_node.is_valid() && p_node->get_state_machine_type() == AnimationNodeStateMachine::STATE_MACHINE_TYPE_GROUPED;
 }
 
-void AnimationNodeStateMachinePlayback::_clear_fading(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine, const StringName &p_state) {
+void AnimationNodeStateMachinePlayback::_clear_fading(AnimationNodeStateMachine *p_state_machine, const StringName &p_state) {
 	if (!p_state.is_empty() && !_is_grouped_state_machine(p_state_machine->get_node(p_state))) {
-		_signal_state_change(p_process_state.tree, p_state, false);
+		_signal_state_change(p_state_machine->get_animation_tree(), p_state, false);
 	}
 	fading_from = StringName();
 	fadeing_from_nti = AnimationNode::NodeTimeInfo();
@@ -377,8 +373,8 @@ void AnimationNodeStateMachinePlayback::_signal_state_change(AnimationTree *p_an
 	emit_signal(p_started ? SceneStringName(state_started) : SceneStringName(state_finished), p_state);
 }
 
-void AnimationNodeStateMachinePlayback::_clear_path_children(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_test_only) {
-	LocalVector<AnimationNode::ChildNode> child_nodes;
+void AnimationNodeStateMachinePlayback::_clear_path_children(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_test_only) {
+	List<AnimationNode::ChildNode> child_nodes;
 	p_state_machine->get_child_nodes(&child_nodes);
 	for (const AnimationNode::ChildNode &child_node : child_nodes) {
 		Ref<AnimationNodeStateMachine> anodesm = child_node.node;
@@ -390,9 +386,9 @@ void AnimationNodeStateMachinePlayback::_clear_path_children(AnimationNode::Proc
 				playback = playback->duplicate();
 			}
 			playback->path.clear();
-			playback->_clear_path_children(p_process_state, p_tree, anodesm.ptr(), p_test_only);
+			playback->_clear_path_children(p_tree, anodesm.ptr(), p_test_only);
 			if (current != child_node.name) {
-				playback->_start(p_process_state, anodesm.ptr()); // Can restart.
+				playback->_start(anodesm.ptr()); // Can restart.
 			}
 		}
 	}
@@ -425,7 +421,7 @@ void AnimationNodeStateMachinePlayback::_start_children(AnimationTree *p_tree, A
 	}
 }
 
-bool AnimationNodeStateMachinePlayback::_travel_children(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const String &p_path, bool p_is_allow_transition_to_self, bool p_is_parent_same_state, bool p_test_only) {
+bool AnimationNodeStateMachinePlayback::_travel_children(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const String &p_path, bool p_is_allow_transition_to_self, bool p_is_parent_same_state, bool p_test_only) {
 	if (p_state_machine->get_state_machine_type() == AnimationNodeStateMachine::STATE_MACHINE_TYPE_GROUPED) {
 		return false; // This function must be fired only by the top state machine, do nothing in child state machine.
 	}
@@ -452,7 +448,7 @@ bool AnimationNodeStateMachinePlayback::_travel_children(AnimationNode::ProcessS
 				playback = playback->duplicate();
 			}
 			if (!playback->is_playing()) {
-				playback->_start(p_process_state, anodesm.ptr());
+				playback->_start(anodesm.ptr());
 			}
 			ChildStateMachineInfo child_info;
 			child_info.playback = playback;
@@ -475,18 +471,18 @@ bool AnimationNodeStateMachinePlayback::_travel_children(AnimationNode::ProcessS
 						child_playback = child_playback->duplicate();
 					}
 					child_playback->_travel_main(SceneStringName(End));
-					child_found_route &= child_playback->_travel(p_process_state, p_tree, child_anodesm.ptr(), false, p_test_only);
+					child_found_route &= child_playback->_travel(p_tree, child_anodesm.ptr(), false, p_test_only);
 					child_path += "/" + child_playback->get_current_node();
 				}
 				// Force restart target state machine.
-				playback->_start(p_process_state, anodesm.ptr());
+				playback->_start(anodesm.ptr());
 			}
 			is_parent_same_state = is_current_same_state;
 
 			bool is_deepest_state = i == temp_path.size() - 1;
 			child_info.is_reset = is_deepest_state ? reset_request_on_teleport : false;
 			playback->_travel_main(temp_path[i], child_info.is_reset);
-			if (playback->_make_travel_path(p_process_state, p_tree, anodesm.ptr(), is_deepest_state ? p_is_allow_transition_to_self : false, child_info.path, p_test_only)) {
+			if (playback->_make_travel_path(p_tree, anodesm.ptr(), is_deepest_state ? p_is_allow_transition_to_self : false, child_info.path, p_test_only)) {
 				found_route &= child_found_route;
 			} else {
 				child_info.path.push_back(temp_path[i]);
@@ -515,16 +511,16 @@ bool AnimationNodeStateMachinePlayback::_travel_children(AnimationNode::ProcessS
 	return found_route;
 }
 
-void AnimationNodeStateMachinePlayback::_start(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine) {
+void AnimationNodeStateMachinePlayback::_start(AnimationNodeStateMachine *p_state_machine) {
 	playing = true;
-	_set_current(p_process_state, p_state_machine, start_request != StringName() ? start_request : SceneStringName(Start));
+	_set_current(p_state_machine, start_request != StringName() ? start_request : SceneStringName(Start));
 	teleport_request = true;
 	stop_request = false;
 	start_request = StringName();
 }
 
-bool AnimationNodeStateMachinePlayback::_travel(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, bool p_test_only) {
-	return _make_travel_path(p_process_state, p_tree, p_state_machine, p_is_allow_transition_to_self, path, p_test_only);
+bool AnimationNodeStateMachinePlayback::_travel(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, bool p_test_only) {
+	return _make_travel_path(p_tree, p_state_machine, p_is_allow_transition_to_self, path, p_test_only);
 }
 
 String AnimationNodeStateMachinePlayback::_validate_path(AnimationNodeStateMachine *p_state_machine, const String &p_path) {
@@ -545,12 +541,12 @@ String AnimationNodeStateMachinePlayback::_validate_path(AnimationNodeStateMachi
 	return target;
 }
 
-bool AnimationNodeStateMachinePlayback::_make_travel_path(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, Vector<StringName> &r_path, bool p_test_only) {
+bool AnimationNodeStateMachinePlayback::_make_travel_path(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, Vector<StringName> &r_path, bool p_test_only) {
 	StringName travel = travel_request;
 	travel_request = StringName();
 
 	if (!playing) {
-		_start(p_process_state, p_state_machine);
+		_start(p_state_machine);
 	}
 
 	ERR_FAIL_COND_V(!p_state_machine->states.has(travel), false);
@@ -682,13 +678,13 @@ bool AnimationNodeStateMachinePlayback::_make_travel_path(AnimationNode::Process
 					playback = playback->duplicate();
 				}
 				if (i > 0) {
-					playback->_start(p_process_state, anodesm.ptr());
+					playback->_start(anodesm.ptr());
 				}
 				if (i >= new_path.size()) {
 					break; // Tracing has been finished, needs to break.
 				}
 				playback->_travel_main(SceneStringName(End));
-				if (!playback->_travel(p_process_state, p_tree, anodesm.ptr(), false, p_test_only)) {
+				if (!playback->_travel(p_tree, anodesm.ptr(), false, p_test_only)) {
 					found_route = false;
 					break;
 				}
@@ -709,8 +705,8 @@ bool AnimationNodeStateMachinePlayback::_make_travel_path(AnimationNode::Process
 	}
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::process(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
-	AnimationNode::NodeTimeInfo nti = _process(p_process_state, p_instance, p_state_machine, p_playback_info, p_test_only);
+AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	AnimationNode::NodeTimeInfo nti = _process(p_state_machine, p_playback_info, p_test_only);
 	start_request = StringName();
 	next_request = false;
 	stop_request = false;
@@ -718,8 +714,8 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::process(Animation
 	return nti;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
-	AnimationTree *tree = p_process_state.tree;
+AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	AnimationTree *tree = p_state_machine->process_state->tree;
 
 	double p_time = p_playback_info.time;
 	double p_delta = p_playback_info.delta;
@@ -732,9 +728,9 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 			// Restart state machine.
 			if (p_state_machine->get_state_machine_type() != AnimationNodeStateMachine::STATE_MACHINE_TYPE_GROUPED) {
 				path.clear();
-				_clear_path_children(p_process_state, tree, p_state_machine, p_test_only);
+				_clear_path_children(tree, p_state_machine, p_test_only);
 			}
-			_start(p_process_state, p_state_machine);
+			_start(p_state_machine);
 			reset_request = true;
 		} else {
 			// Reset current state.
@@ -758,7 +754,7 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 	// Process start/travel request.
 	if (start_request != StringName() || travel_request != StringName()) {
 		if (p_state_machine->get_state_machine_type() != AnimationNodeStateMachine::STATE_MACHINE_TYPE_GROUPED) {
-			_clear_path_children(p_process_state, tree, p_state_machine, p_test_only);
+			_clear_path_children(tree, p_state_machine, p_test_only);
 		}
 	}
 
@@ -772,7 +768,7 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 		}
 		// Teleport to start.
 		if (p_state_machine->states.has(start_request)) {
-			_start(p_process_state, p_state_machine);
+			_start(p_state_machine);
 		} else {
 			StringName node = start_request;
 			ERR_FAIL_V_MSG(AnimationNode::NodeTimeInfo(), "No such node: '" + node + "'");
@@ -787,10 +783,10 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 		StringName temp_travel_request = travel_request; // For the case that can't travel.
 		// Process children.
 		Vector<StringName> new_path;
-		bool can_travel = _make_travel_path(p_process_state, tree, p_state_machine, travel_path.size() <= 1 ? p_state_machine->is_allow_transition_to_self() : false, new_path, p_test_only);
+		bool can_travel = _make_travel_path(tree, p_state_machine, travel_path.size() <= 1 ? p_state_machine->is_allow_transition_to_self() : false, new_path, p_test_only);
 		if (travel_path.size()) {
 			if (can_travel) {
-				can_travel = _travel_children(p_process_state, tree, p_state_machine, travel_target, p_state_machine->is_allow_transition_to_self(), travel_path[0] == current, p_test_only);
+				can_travel = _travel_children(tree, p_state_machine, travel_target, p_state_machine->is_allow_transition_to_self(), travel_path[0] == current, p_test_only);
 			} else {
 				_start_children(tree, p_state_machine, travel_target, p_test_only);
 			}
@@ -804,7 +800,7 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 			if (p_state_machine->states.has(temp_travel_request)) {
 				path.clear();
 				if (current != temp_travel_request || reset_request_on_teleport) {
-					_set_current(p_process_state, p_state_machine, temp_travel_request);
+					_set_current(p_state_machine, temp_travel_request);
 					reset_request = reset_request_on_teleport;
 					teleport_request = true;
 				}
@@ -827,16 +823,15 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 		pi.seeked = true;
 		pi.is_external_seeking = false;
 		pi.weight = 0;
-		AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(current);
-		current_nti = p_state_machine->blend_node(p_process_state, p_instance, other_instance, pi, AnimationNode::FILTER_IGNORE, true, true);
+		current_nti = p_state_machine->blend_node(p_state_machine->states[current].node, current, pi, AnimationNode::FILTER_IGNORE, true, true);
 		// Don't process first node if not necessary, instead process next node.
-		_transition_to_next_recursive(p_process_state, p_instance, tree, p_state_machine, p_delta, p_test_only);
+		_transition_to_next_recursive(tree, p_state_machine, p_delta, p_test_only);
 	}
 
 	// Check current node existence.
 	if (!p_state_machine->states.has(current)) {
 		playing = false; // Current does not exist.
-		_set_current(p_process_state, p_state_machine, StringName());
+		_set_current(p_state_machine, StringName());
 		return AnimationNode::NodeTimeInfo();
 	}
 
@@ -878,8 +873,7 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 		pi.time = 0;
 		pi.seeked = true;
 	}
-	AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(current);
-	current_nti = p_state_machine->blend_node(p_process_state, p_instance, other_instance, pi, AnimationNode::FILTER_IGNORE, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
+	current_nti = p_state_machine->blend_node(p_state_machine->states[current].node, current, pi, AnimationNode::FILTER_IGNORE, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
 
 	// Cross-fade process.
 	if (fading_from != StringName()) {
@@ -898,17 +892,16 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 			pi.time = 0;
 			pi.seeked = true;
 		}
-		AnimationNodeInstance *fading_from_instance = p_instance.get_child_instance_by_path_or_null(fading_from);
-		fadeing_from_nti = p_state_machine->blend_node(p_process_state, p_instance, fading_from_instance, pi, AnimationNode::FILTER_IGNORE, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
+		fadeing_from_nti = p_state_machine->blend_node(p_state_machine->states[fading_from].node, fading_from, pi, AnimationNode::FILTER_IGNORE, true, p_test_only); // Blend values must be more than CMP_EPSILON to process discrete keys in edge.
 
 		if (Animation::is_greater_or_equal_approx(fading_pos, fading_time)) {
 			// Finish fading.
-			_clear_fading(p_process_state, p_state_machine, fading_from);
+			_clear_fading(p_state_machine, fading_from);
 		}
 	}
 
 	// Find next and see when to transition.
-	bool will_end = _transition_to_next_recursive(p_process_state, p_instance, tree, p_state_machine, p_delta, p_test_only) || current == SceneStringName(End);
+	bool will_end = _transition_to_next_recursive(tree, p_state_machine, p_delta, p_test_only) || current == SceneStringName(End);
 
 	// Predict remaining time.
 	if (will_end || ((p_state_machine->get_state_machine_type() == AnimationNodeStateMachine::STATE_MACHINE_TYPE_NESTED) && !p_state_machine->has_transition_from(current))) {
@@ -926,7 +919,7 @@ AnimationNode::NodeTimeInfo AnimationNodeStateMachinePlayback::_process(Animatio
 	return current_nti;
 }
 
-bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, double p_delta, bool p_test_only) {
+bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, double p_delta, bool p_test_only) {
 	_reset_request_for_fading_from = false;
 
 	AnimationMixer::PlaybackInfo pi;
@@ -935,9 +928,9 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 	Vector<StringName> transition_path;
 	transition_path.push_back(current);
 	while (true) {
-		next = _find_next(p_process_state, p_instance, p_tree, p_state_machine);
+		next = _find_next(p_tree, p_state_machine);
 
-		if (!_can_transition_to_next(p_process_state, p_tree, p_state_machine, next, p_test_only)) {
+		if (!_can_transition_to_next(p_tree, p_state_machine, next, p_test_only)) {
 			break; // Finish transition.
 		}
 
@@ -961,10 +954,9 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 				pi.seeked = true;
 				pi.is_external_seeking = false;
 				pi.weight = 0;
-				AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(current);
-				p_state_machine->blend_node(p_process_state, p_instance, other_instance, pi, AnimationNode::FILTER_IGNORE, true, p_test_only);
+				p_state_machine->blend_node(p_state_machine->states[current].node, current, pi, AnimationNode::FILTER_IGNORE, true, p_test_only);
 			}
-			_clear_fading(p_process_state, p_state_machine, current);
+			_clear_fading(p_state_machine, current);
 			fading_time = 0;
 			fading_pos = 0;
 		}
@@ -975,7 +967,7 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 		}
 
 		// Update current status.
-		_set_current(p_process_state, p_state_machine, next.node);
+		_set_current(p_state_machine, next.node);
 		current_curve = next.curve;
 
 		if (current == SceneStringName(End)) {
@@ -987,13 +979,12 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 
 		fadeing_from_nti = current_nti;
 
-		AnimationNodeInstance *other_instance = p_instance.get_child_instance_by_path_or_null(current);
 		if (next.switch_mode == AnimationNodeStateMachineTransition::SWITCH_MODE_SYNC) {
 			pi.time = current_nti.position;
 			pi.seeked = true;
 			pi.is_external_seeking = false;
 			pi.weight = 0;
-			p_state_machine->blend_node(p_process_state, p_instance, other_instance, pi, AnimationNode::FILTER_IGNORE, true, p_test_only);
+			p_state_machine->blend_node(p_state_machine->states[current].node, current, pi, AnimationNode::FILTER_IGNORE, true, p_test_only);
 		}
 
 		// Just get length to find next recursive.
@@ -1001,7 +992,7 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 		pi.is_external_seeking = false;
 		pi.weight = 0;
 		pi.seeked = next.is_reset;
-		current_nti = p_state_machine->blend_node(p_process_state, p_instance, other_instance, pi, AnimationNode::FILTER_IGNORE, true, true); // Just retrieve remain length, don't process.
+		current_nti = p_state_machine->blend_node(p_state_machine->states[current].node, current, pi, AnimationNode::FILTER_IGNORE, true, true); // Just retrieve remain length, don't process.
 
 		// Fading must be processed.
 		if (fading_time) {
@@ -1012,7 +1003,7 @@ bool AnimationNodeStateMachinePlayback::_transition_to_next_recursive(AnimationN
 	return next.node == SceneStringName(End);
 }
 
-bool AnimationNodeStateMachinePlayback::_can_transition_to_next(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, NextInfo p_next, bool p_test_only) {
+bool AnimationNodeStateMachinePlayback::_can_transition_to_next(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, NextInfo p_next, bool p_test_only) {
 	if (p_next.node == StringName()) {
 		return false;
 	}
@@ -1031,7 +1022,7 @@ bool AnimationNodeStateMachinePlayback::_can_transition_to_next(AnimationNode::P
 			}
 			playback->_next_main();
 			// Then, fading should end.
-			_clear_fading(p_process_state, p_state_machine, fading_from);
+			_clear_fading(p_state_machine, fading_from);
 			fading_pos = 0;
 		} else {
 			return true;
@@ -1072,7 +1063,7 @@ Ref<AnimationNodeStateMachineTransition> AnimationNodeStateMachinePlayback::_che
 	return p_transition.transition;
 }
 
-AnimationNodeStateMachinePlayback::NextInfo AnimationNodeStateMachinePlayback::_find_next(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine) const {
+AnimationNodeStateMachinePlayback::NextInfo AnimationNodeStateMachinePlayback::_find_next(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine) const {
 	NextInfo next;
 	if (path.size()) {
 		for (int i = 0; i < p_state_machine->transitions.size(); i++) {
@@ -1101,7 +1092,7 @@ AnimationNodeStateMachinePlayback::NextInfo AnimationNodeStateMachinePlayback::_
 			if (ref_transition->get_advance_mode() == AnimationNodeStateMachineTransition::ADVANCE_MODE_DISABLED) {
 				continue;
 			}
-			if (p_state_machine->transitions[i].from == current && (_check_advance_condition(p_process_state, p_instance, anodesm, ref_transition) || bypass)) {
+			if (p_state_machine->transitions[i].from == current && (_check_advance_condition(anodesm, ref_transition) || bypass)) {
 				if (ref_transition->get_priority() <= priority_best) {
 					priority_best = ref_transition->get_priority();
 					auto_advance_to = i;
@@ -1125,21 +1116,19 @@ AnimationNodeStateMachinePlayback::NextInfo AnimationNodeStateMachinePlayback::_
 	return next;
 }
 
-bool AnimationNodeStateMachinePlayback::_check_advance_condition(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, const Ref<AnimationNodeStateMachine> state_machine, const Ref<AnimationNodeStateMachineTransition> transition) const {
+bool AnimationNodeStateMachinePlayback::_check_advance_condition(const Ref<AnimationNodeStateMachine> state_machine, const Ref<AnimationNodeStateMachineTransition> transition) const {
 	if (transition->get_advance_mode() != AnimationNodeStateMachineTransition::ADVANCE_MODE_AUTO) {
 		return false;
 	}
 
 	StringName advance_condition_name = transition->get_advance_condition_name();
 
-	ERR_FAIL_COND_V(p_instance.resource != state_machine, false);
-
-	if (advance_condition_name != StringName() && !bool(p_instance.get_parameter(advance_condition_name))) {
+	if (advance_condition_name != StringName() && !bool(state_machine->get_parameter(advance_condition_name))) {
 		return false;
 	}
 
 	if (transition->expression.is_valid()) {
-		AnimationTree *tree_base = p_process_state.tree;
+		AnimationTree *tree_base = state_machine->get_animation_tree();
 		ERR_FAIL_NULL_V(tree_base, false);
 
 		NodePath advance_expression_base_node_path = tree_base->get_advance_expression_base_node();
@@ -1247,9 +1236,9 @@ AnimationNodeStateMachinePlayback::AnimationNodeStateMachinePlayback() {
 
 ///////////////////////////////////////////////////////
 
-void AnimationNodeStateMachine::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNodeStateMachine::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
-	r_list->push_back(PropertyInfo(Variant::OBJECT, playback, PROPERTY_HINT_RESOURCE_TYPE, AnimationNodeStateMachinePlayback::get_class_static(), PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE)); // Don't store this object in .tres, it always needs to be made as unique object.
+	r_list->push_back(PropertyInfo(Variant::OBJECT, playback, PROPERTY_HINT_RESOURCE_TYPE, "AnimationNodeStateMachinePlayback", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE)); // Don't store this object in .tres, it always needs to be made as unique object.
 	List<StringName> advance_conditions;
 	for (int i = 0; i < transitions.size(); i++) {
 		StringName ac = transitions[i].transition->get_advance_condition_name();
@@ -1301,9 +1290,12 @@ void AnimationNodeStateMachine::add_node(const StringName &p_name, Ref<Animation
 
 	states[p_name] = state_new;
 
-	_add_node(p_node);
 	emit_changed();
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
+
+	p_node->connect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect("animation_node_removed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 }
 
 void AnimationNodeStateMachine::replace_node(const StringName &p_name, Ref<AnimationNode> p_node) {
@@ -1314,21 +1306,26 @@ void AnimationNodeStateMachine::replace_node(const StringName &p_name, Ref<Anima
 	{
 		Ref<AnimationNode> node = states[p_name].node;
 		if (node.is_valid()) {
-			_remove_node(node);
+			node->disconnect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
+			node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_renamed));
+			node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_removed));
 		}
 	}
 
 	states[p_name].node = p_node;
 
-	_add_node(p_node);
 	emit_changed();
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
+
+	p_node->connect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect("animation_node_renamed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
+	p_node->connect("animation_node_removed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
 }
 
 void AnimationNodeStateMachine::set_state_machine_type(StateMachineType p_state_machine_type) {
 	state_machine_type = p_state_machine_type;
 	emit_changed();
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 	notify_property_list_changed();
 }
 
@@ -1377,7 +1374,7 @@ StringName AnimationNodeStateMachine::get_node_name(const Ref<AnimationNode> &p_
 	ERR_FAIL_V(StringName());
 }
 
-void AnimationNodeStateMachine::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
+void AnimationNodeStateMachine::get_child_nodes(List<ChildNode> *r_child_nodes) {
 	Vector<StringName> nodes;
 
 	for (const KeyValue<StringName, State> &E : states) {
@@ -1415,7 +1412,9 @@ void AnimationNodeStateMachine::remove_node(const StringName &p_name) {
 	{
 		Ref<AnimationNode> node = states[p_name].node;
 		ERR_FAIL_COND(node.is_null());
-		_remove_node(node);
+		node->disconnect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
+		node->disconnect("animation_node_renamed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_renamed));
+		node->disconnect("animation_node_removed", callable_mp(this, &AnimationNodeStateMachine::_animation_node_removed));
 	}
 
 	states.erase(p_name);
@@ -1636,17 +1635,16 @@ Vector2 AnimationNodeStateMachine::get_graph_offset() const {
 	return graph_offset;
 }
 
-AnimationNode::NodeTimeInfo AnimationNodeStateMachine::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	Ref<AnimationNodeStateMachinePlayback> playback_new = p_instance.get_parameter(playback);
+AnimationNode::NodeTimeInfo AnimationNodeStateMachine::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	Ref<AnimationNodeStateMachinePlayback> playback_new = get_parameter(playback);
 	ERR_FAIL_COND_V(playback_new.is_null(), AnimationNode::NodeTimeInfo());
-
-	playback_new->_set_base_path(p_instance.path);
+	playback_new->_set_base_path(node_state.get_base_path());
 	playback_new->_set_grouped(state_machine_type == STATE_MACHINE_TYPE_GROUPED);
 	if (p_test_only) {
 		playback_new = playback_new->duplicate(); // Don't process original when testing.
 	}
 
-	return playback_new->process(p_process_state, p_instance, this, p_playback_info, p_test_only);
+	return playback_new->process(this, p_playback_info, p_test_only);
 }
 
 String AnimationNodeStateMachine::get_caption() const {
@@ -1742,7 +1740,7 @@ void AnimationNodeStateMachine::_get_property_list(List<PropertyInfo> *p_list) c
 	names.sort_custom<StringName::AlphCompare>();
 
 	for (const StringName &prop_name : names) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, "states/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, AnimationNode::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, "states/" + prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, "AnimationNode", PROPERTY_USAGE_NO_EDITOR));
 		p_list->push_back(PropertyInfo(Variant::VECTOR2, "states/" + prop_name + "/position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 	}
 
@@ -1779,7 +1777,7 @@ void AnimationNodeStateMachine::reset_state() {
 	states[SceneStringName(End)] = end;
 
 	emit_changed();
-	_tree_changed();
+	emit_signal(SNAME("tree_changed"));
 }
 
 void AnimationNodeStateMachine::set_node_position(const StringName &p_name, const Vector2 &p_position) {
diff --git a/engine/scene/animation/animation_node_state_machine.h b/engine/scene/animation/animation_node_state_machine.h
index c8ecb569..d62f1ce8 100644
--- a/engine/scene/animation/animation_node_state_machine.h
+++ b/engine/scene/animation/animation_node_state_machine.h
@@ -164,7 +164,7 @@ protected:
 	virtual void reset_state() override;
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const override;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 	virtual bool is_parameter_read_only(const StringName &p_parameter) const override;
 
@@ -181,7 +181,7 @@ public:
 	void set_node_position(const StringName &p_name, const Vector2 &p_position);
 	Vector2 get_node_position(const StringName &p_name) const;
 
-	virtual void get_child_nodes(LocalVector<ChildNode> *r_child_nodes) override;
+	virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
 
 	bool has_transition(const StringName &p_from, const StringName &p_to) const;
 	bool has_transition_from(const StringName &p_from) const;
@@ -212,7 +212,7 @@ public:
 	void set_graph_offset(const Vector2 &p_offset);
 	Vector2 get_graph_offset() const;
 
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false) override;
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false) override;
 	virtual String get_caption() const override;
 
 	virtual Ref<AnimationNode> get_child_by_name(const StringName &p_name) const override;
@@ -289,32 +289,32 @@ class AnimationNodeStateMachinePlayback : public Resource {
 
 	bool is_grouped = false;
 
-	void _clear_fading(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine, const StringName &p_state);
+	void _clear_fading(AnimationNodeStateMachine *p_state_machine, const StringName &p_state);
 	void _signal_state_change(AnimationTree *p_animation_tree, const StringName &p_state, bool p_started);
 	void _travel_main(const StringName &p_state, bool p_reset_on_teleport = true);
 	void _start_main(const StringName &p_state, bool p_reset = true);
 	void _next_main();
 	void _stop_main();
 
-	bool _make_travel_path(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, Vector<StringName> &r_path, bool p_test_only);
+	bool _make_travel_path(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, Vector<StringName> &r_path, bool p_test_only);
 	String _validate_path(AnimationNodeStateMachine *p_state_machine, const String &p_path);
-	bool _travel(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, bool p_test_only);
-	void _start(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine);
+	bool _travel(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_is_allow_transition_to_self, bool p_test_only);
+	void _start(AnimationNodeStateMachine *p_state_machine);
 
-	void _clear_path_children(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_test_only);
-	bool _travel_children(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const String &p_path, bool p_is_allow_transition_to_self, bool p_is_parent_same_state, bool p_test_only);
+	void _clear_path_children(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, bool p_test_only);
+	bool _travel_children(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const String &p_path, bool p_is_allow_transition_to_self, bool p_is_parent_same_state, bool p_test_only);
 	void _start_children(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const String &p_path, bool p_test_only);
 
-	AnimationNode::NodeTimeInfo process(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only);
-	AnimationNode::NodeTimeInfo _process(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only);
+	AnimationNode::NodeTimeInfo process(AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only);
+	AnimationNode::NodeTimeInfo _process(AnimationNodeStateMachine *p_state_machine, const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only);
 
-	bool _check_advance_condition(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, const Ref<AnimationNodeStateMachine> p_state_machine, const Ref<AnimationNodeStateMachineTransition> p_transition) const;
-	bool _transition_to_next_recursive(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, double p_delta, bool p_test_only);
-	NextInfo _find_next(AnimationNode::ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine) const;
+	bool _check_advance_condition(const Ref<AnimationNodeStateMachine> p_state_machine, const Ref<AnimationNodeStateMachineTransition> p_transition) const;
+	bool _transition_to_next_recursive(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, double p_delta, bool p_test_only);
+	NextInfo _find_next(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine) const;
 	Ref<AnimationNodeStateMachineTransition> _check_group_transition(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, const AnimationNodeStateMachine::Transition &p_transition, Ref<AnimationNodeStateMachine> &r_state_machine, bool &r_bypass) const;
-	bool _can_transition_to_next(AnimationNode::ProcessState &p_process_state, AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, NextInfo p_next, bool p_test_only);
+	bool _can_transition_to_next(AnimationTree *p_tree, AnimationNodeStateMachine *p_state_machine, NextInfo p_next, bool p_test_only);
 
-	void _set_current(AnimationNode::ProcessState &p_process_state, AnimationNodeStateMachine *p_state_machine, const StringName &p_state);
+	void _set_current(AnimationNodeStateMachine *p_state_machine, const StringName &p_state);
 	void _set_grouped(bool p_is_grouped);
 	void _set_base_path(const String &p_base_path);
 	Ref<AnimationNodeStateMachinePlayback> _get_parent_playback(AnimationTree *p_tree) const;
diff --git a/engine/scene/animation/animation_player.compat.inc b/engine/scene/animation/animation_player.compat.inc
index dd390769..19df42fe 100644
--- a/engine/scene/animation/animation_player.compat.inc
+++ b/engine/scene/animation/animation_player.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "animation_player.h"
-
-#include "core/object/class_db.h"
-
 void AnimationPlayer::_set_process_callback_bind_compat_80813(AnimationPlayer::AnimationProcessCallback p_mode) {
 	set_callback_mode_process(static_cast<AnimationMixer::AnimationCallbackModeProcess>(static_cast<int>(p_mode)));
 }
diff --git a/engine/scene/animation/animation_player.cpp b/engine/scene/animation/animation_player.cpp
index 1665a489..c988633c 100644
--- a/engine/scene/animation/animation_player.cpp
+++ b/engine/scene/animation/animation_player.cpp
@@ -32,10 +32,6 @@
 #include "animation_player.compat.inc"
 
 #include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "scene/main/scene_tree.h"
 
 bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;
@@ -168,11 +164,10 @@ void AnimationPlayer::_process_playback_data(PlaybackData &cd, double p_delta, f
 
 	double start = cd.get_start_time();
 	double end = cd.get_end_time();
-	AnimationData *p_from = &animation_set[cd.animation_name];
 
 	Animation::LoopedFlag looped_flag = Animation::LOOPED_FLAG_NONE;
 
-	switch (p_from->animation->get_loop_mode()) {
+	switch (cd.from->animation->get_loop_mode()) {
 		case Animation::LOOP_NONE: {
 			if (Animation::is_less_approx(next_pos, start)) {
 				next_pos = start;
@@ -212,7 +207,7 @@ void AnimationPlayer::_process_playback_data(PlaybackData &cd, double p_delta, f
 
 	// End detection.
 	if (p_is_current) {
-		if (p_from->animation->get_loop_mode() == Animation::LOOP_NONE) {
+		if (cd.from->animation->get_loop_mode() == Animation::LOOP_NONE) {
 			if (!backwards && Animation::is_less_or_equal_approx(prev_pos, end) && Math::is_equal_approx(next_pos, end)) {
 				// Playback finished.
 				next_pos = end; // Snap to the edge.
@@ -253,7 +248,7 @@ void AnimationPlayer::_process_playback_data(PlaybackData &cd, double p_delta, f
 	pi.is_external_seeking = !p_internal_seeked && !p_started;
 	pi.looped_flag = looped_flag;
 	pi.weight = p_blend;
-	make_animation_instance(cd.animation_name, pi);
+	make_animation_instance(cd.from->name, pi);
 }
 
 float AnimationPlayer::get_current_blend_amount() {
@@ -287,31 +282,30 @@ void AnimationPlayer::_blend_playback_data(double p_delta, bool p_started) {
 		}
 		return;
 	}
-	LocalVector<int> to_erase;
-	for (uint32_t i = 0; i < c.blend.size(); i++) {
-		Blend &b = c.blend[i];
+	List<List<Blend>::Element *> to_erase;
+	for (List<Blend>::Element *E = c.blend.front(); E; E = E->next()) {
+		Blend &b = E->get();
 		b.blend_left = MAX(0, b.blend_left - Math::abs(speed_scale * p_delta) / b.blend_time);
 		if (Animation::is_less_or_equal_approx(b.blend_left, 0)) {
-			to_erase.push_back(i);
+			to_erase.push_back(E);
 			b.blend_left = CMP_EPSILON; // May want to play last frame.
 		}
 		// Note: There may be issues if an animation event triggers an animation change while this blend is active,
 		// so it is best to use "deferred" calls instead of "immediate" for animation events that can trigger new animations.
 		_process_playback_data(b.data, p_delta, b.blend_left, false, false, false);
 	}
-	for (int i = to_erase.size() - 1; i >= 0; i--) {
-		c.blend.remove_at(to_erase[i]);
+	for (List<Blend>::Element *&E : to_erase) {
+		c.blend.erase(E);
 	}
 }
 
 bool AnimationPlayer::_blend_pre_process(double p_delta, int p_track_count, const AHashMap<NodePath, int> &p_track_map) {
-	if (!playback.current.is_enabled) {
+	if (!playback.current.from) {
 		_set_process(false);
 		return false;
 	}
 
-	AnimationData *p_from = &animation_set[playback.current.animation_name];
-	tmp_from = p_from->animation->get_instance_id();
+	tmp_from = playback.current.from->animation->get_instance_id();
 	end_reached = false;
 	end_notify = false;
 
@@ -322,10 +316,10 @@ bool AnimationPlayer::_blend_pre_process(double p_delta, int p_track_count, cons
 		playback.started = false;
 	}
 
-	String prev_animation_name = playback.current.animation_name;
+	AnimationData *prev_from = playback.current.from;
 	_blend_playback_data(p_delta, started);
 
-	if (prev_animation_name != playback.current.animation_name) {
+	if (prev_from != playback.current.from) {
 		return false; // Animation has been changed in the process (may be caused by method track), abort process.
 	}
 
@@ -339,7 +333,7 @@ void AnimationPlayer::_blend_capture(double p_delta) {
 void AnimationPlayer::_blend_post_process() {
 	if (end_reached) {
 		// If the method track changes current animation, the animation is not finished.
-		if (tmp_from == animation_set[playback.current.animation_name].animation->get_instance_id()) {
+		if (tmp_from == playback.current.from->animation->get_instance_id()) {
 			if (!playback_queue.is_empty()) {
 				if (!finished_anim.is_empty()) {
 					emit_signal(SceneStringName(animation_finished), finished_anim);
@@ -351,9 +345,9 @@ void AnimationPlayer::_blend_post_process() {
 						return;
 					}
 				}
-				const StringName old = playback.assigned;
+				String old = playback.assigned;
 				play(playback_queue.front()->get());
-				const StringName &new_name = playback.assigned;
+				String new_name = playback.assigned;
 				playback_queue.pop_front();
 				if (end_notify) {
 					emit_signal(SceneStringName(animation_changed), old, new_name);
@@ -432,10 +426,9 @@ void AnimationPlayer::play_section_with_markers(const StringName &p_name, const
 		name = playback.assigned;
 	}
 
-	AnimationData *ad = animation_set.getptr(name);
-	ERR_FAIL_NULL_MSG(ad, vformat("Animation not found: %s.", name));
+	ERR_FAIL_COND_MSG(!animation_set.has(name), vformat("Animation not found: %s.", name));
 
-	const Ref<Animation> &animation = ad->animation;
+	Ref<Animation> animation = animation_set[name].animation;
 
 	ERR_FAIL_COND_MSG(p_start_marker == p_end_marker && p_start_marker, vformat("Start marker and end marker cannot be the same marker: %s.", p_start_marker));
 	ERR_FAIL_COND_MSG(p_start_marker && !animation->has_marker(p_start_marker), vformat("Marker %s not found in animation: %s.", p_start_marker, name));
@@ -447,10 +440,10 @@ void AnimationPlayer::play_section_with_markers(const StringName &p_name, const
 	ERR_FAIL_COND_MSG(p_start_marker && p_end_marker && Animation::is_greater_approx(start_time, end_time), vformat("End marker %s is placed earlier than start marker %s in animation: %s.", p_end_marker, p_start_marker, name));
 
 	if (p_start_marker && Animation::is_less_approx(start_time, 0)) {
-		WARN_PRINT_ED(vformat("Negative time start marker: %s is invalid in the section, so the start of the animation: %s is used instead.", p_start_marker, playback.current.animation_name));
+		WARN_PRINT_ED(vformat("Negative time start marker: %s is invalid in the section, so the start of the animation: %s is used instead.", p_start_marker, playback.current.from->animation->get_name()));
 	}
 	if (p_end_marker && Animation::is_less_approx(end_time, 0)) {
-		WARN_PRINT_ED(vformat("Negative time end marker: %s is invalid in the section, so the end of the animation: %s is used instead.", p_end_marker, playback.current.animation_name));
+		WARN_PRINT_ED(vformat("Negative time end marker: %s is invalid in the section, so the end of the animation: %s is used instead.", p_end_marker, playback.current.from->animation->get_name()));
 	}
 
 	play_section(name, start_time, end_time, p_custom_blend, p_custom_scale, p_from_end);
@@ -469,11 +462,11 @@ void AnimationPlayer::play_section(const StringName &p_name, double p_start_time
 
 	Playback &c = playback;
 
-	if (c.current.is_enabled) {
+	if (c.current.from) {
 		double blend_time = 0.0;
 		// Find if it can blend.
 		BlendKey bk;
-		bk.from = c.current.animation_name;
+		bk.from = c.current.from->name;
 		bk.to = name;
 
 		if (Animation::is_greater_or_equal_approx(p_custom_blend, 0)) {
@@ -481,12 +474,12 @@ void AnimationPlayer::play_section(const StringName &p_name, double p_start_time
 		} else if (blend_times.has(bk)) {
 			blend_time = blend_times[bk];
 		} else {
-			bk.from = SNAME("*");
+			bk.from = "*";
 			if (blend_times.has(bk)) {
 				blend_time = blend_times[bk];
 			} else {
-				bk.from = c.current.animation_name;
-				bk.to = SNAME("*");
+				bk.from = c.current.from->name;
+				bk.to = "*";
 
 				if (blend_times.has(bk)) {
 					blend_time = blend_times[bk];
@@ -512,9 +505,7 @@ void AnimationPlayer::play_section(const StringName &p_name, double p_start_time
 		_clear_playing_caches();
 	}
 
-	c.current.is_enabled = true;
-	c.current.animation_name = name;
-	c.current.animation_length = animation_set[name].animation->get_length();
+	c.current.from = &animation_set[name];
 	c.current.speed_scale = p_custom_scale;
 	c.current.start_time = p_start_time;
 	c.current.end_time = p_end_time;
@@ -634,9 +625,7 @@ void AnimationPlayer::set_assigned_animation(const StringName &p_animation) {
 	} else {
 		ERR_FAIL_COND_MSG(!animation_set.has(p_animation), vformat("Animation not found: %s.", p_animation.operator String()));
 		playback.current.pos = 0;
-		playback.current.is_enabled = true;
-		playback.current.animation_name = p_animation;
-		playback.current.animation_length = animation_set[p_animation].animation->get_length();
+		playback.current.from = &animation_set[p_animation];
 		playback.current.start_time = -1;
 		playback.current.end_time = -1;
 		playback.assigned = p_animation;
@@ -681,15 +670,12 @@ void AnimationPlayer::seek_internal(double p_time, bool p_update, bool p_update_
 	_check_immediately_after_start();
 
 	playback.current.pos = p_time;
-	if (!playback.current.is_enabled) {
-		if (!playback.assigned.is_empty()) {
-			AnimationData *ad = animation_set.getptr(playback.assigned);
-			ERR_FAIL_NULL_MSG(ad, vformat("Animation not found: %s.", playback.assigned));
-			playback.current.is_enabled = true;
-			playback.current.animation_name = playback.assigned;
-			playback.current.animation_length = ad->animation->get_length();
+	if (!playback.current.from) {
+		if (playback.assigned) {
+			ERR_FAIL_COND_MSG(!animation_set.has(playback.assigned), vformat("Animation not found: %s.", playback.assigned));
+			playback.current.from = &animation_set[playback.assigned];
 		}
-		if (!playback.current.is_enabled) {
+		if (!playback.current.from) {
 			return; // There is no animation.
 		}
 	}
@@ -725,37 +711,37 @@ void AnimationPlayer::_check_immediately_after_start() {
 }
 
 bool AnimationPlayer::is_valid() const {
-	return playback.current.is_enabled;
+	return (playback.current.from);
 }
 
 double AnimationPlayer::get_current_animation_position() const {
-	ERR_FAIL_COND_V_MSG(!playback.current.is_enabled, 0, "AnimationPlayer has no current animation.");
+	ERR_FAIL_NULL_V_MSG(playback.current.from, 0, "AnimationPlayer has no current animation.");
 	return playback.current.pos;
 }
 
 double AnimationPlayer::get_current_animation_length() const {
-	ERR_FAIL_COND_V_MSG(!playback.current.is_enabled, 0, "AnimationPlayer has no current animation.");
-	return playback.current.animation_length;
+	ERR_FAIL_NULL_V_MSG(playback.current.from, 0, "AnimationPlayer has no current animation.");
+	return playback.current.from->animation->get_length();
 }
 
 void AnimationPlayer::set_section_with_markers(const StringName &p_start_marker, const StringName &p_end_marker) {
-	ERR_FAIL_COND_MSG(!playback.current.is_enabled, "AnimationPlayer has no current animation.");
+	ERR_FAIL_NULL_MSG(playback.current.from, "AnimationPlayer has no current animation.");
 	ERR_FAIL_COND_MSG(p_start_marker == p_end_marker && p_start_marker, vformat("Start marker and end marker cannot be the same marker: %s.", p_start_marker));
-	ERR_FAIL_COND_MSG(p_start_marker && !animation_set[playback.current.animation_name].animation->has_marker(p_start_marker), vformat("Marker %s not found in animation: %s.", p_start_marker, playback.current.animation_name));
-	ERR_FAIL_COND_MSG(p_end_marker && !animation_set[playback.current.animation_name].animation->has_marker(p_end_marker), vformat("Marker %s not found in animation: %s.", p_end_marker, playback.current.animation_name));
-	double start_time = p_start_marker ? animation_set[playback.current.animation_name].animation->get_marker_time(p_start_marker) : -1;
-	double end_time = p_end_marker ? animation_set[playback.current.animation_name].animation->get_marker_time(p_end_marker) : -1;
+	ERR_FAIL_COND_MSG(p_start_marker && !playback.current.from->animation->has_marker(p_start_marker), vformat("Marker %s not found in animation: %s.", p_start_marker, playback.current.from->animation->get_name()));
+	ERR_FAIL_COND_MSG(p_end_marker && !playback.current.from->animation->has_marker(p_end_marker), vformat("Marker %s not found in animation: %s.", p_end_marker, playback.current.from->animation->get_name()));
+	double start_time = p_start_marker ? playback.current.from->animation->get_marker_time(p_start_marker) : -1;
+	double end_time = p_end_marker ? playback.current.from->animation->get_marker_time(p_end_marker) : -1;
 	if (p_start_marker && Animation::is_less_approx(start_time, 0)) {
-		WARN_PRINT_ONCE_ED(vformat("Marker %s time must be positive in animation: %s.", p_start_marker, playback.current.animation_name));
+		WARN_PRINT_ONCE_ED(vformat("Marker %s time must be positive in animation: %s.", p_start_marker, playback.current.from->animation->get_name()));
 	}
 	if (p_end_marker && Animation::is_less_approx(end_time, 0)) {
-		WARN_PRINT_ONCE_ED(vformat("Marker %s time must be positive in animation: %s.", p_end_marker, playback.current.animation_name));
+		WARN_PRINT_ONCE_ED(vformat("Marker %s time must be positive in animation: %s.", p_end_marker, playback.current.from->animation->get_name()));
 	}
 	set_section(start_time, end_time);
 }
 
 void AnimationPlayer::set_section(double p_start_time, double p_end_time) {
-	ERR_FAIL_COND_MSG(!playback.current.is_enabled, "AnimationPlayer has no current animation.");
+	ERR_FAIL_NULL_MSG(playback.current.from, "AnimationPlayer has no current animation.");
 	ERR_FAIL_COND_MSG(Animation::is_greater_or_equal_approx(p_start_time, 0) && Animation::is_greater_or_equal_approx(p_end_time, 0) && Animation::is_greater_or_equal_approx(p_start_time, p_end_time), vformat("Start time %f is greater than end time %f.", p_start_time, p_end_time));
 	playback.current.start_time = p_start_time;
 	playback.current.end_time = p_end_time;
@@ -768,12 +754,12 @@ void AnimationPlayer::reset_section() {
 }
 
 double AnimationPlayer::get_section_start_time() const {
-	ERR_FAIL_COND_V_MSG(!playback.current.is_enabled, playback.current.start_time, "AnimationPlayer has no current animation.");
+	ERR_FAIL_NULL_V_MSG(playback.current.from, playback.current.start_time, "AnimationPlayer has no current animation.");
 	return playback.current.get_start_time();
 }
 
 double AnimationPlayer::get_section_end_time() const {
-	ERR_FAIL_COND_V_MSG(!playback.current.is_enabled, playback.current.end_time, "AnimationPlayer has no current animation.");
+	ERR_FAIL_NULL_V_MSG(playback.current.from, playback.current.end_time, "AnimationPlayer has no current animation.");
 	return playback.current.get_end_time();
 }
 
@@ -801,17 +787,10 @@ bool AnimationPlayer::is_movie_quit_on_finish_enabled() const {
 	return movie_quit_on_finish;
 }
 
-void AnimationPlayer::_animation_changed(const StringName &p_name) {
-	AnimationMixer::_animation_changed(p_name);
-	if (playback.current.is_enabled && playback.current.animation_name == p_name && animation_set.has(p_name)) {
-		playback.current.animation_length = animation_set[p_name].animation->get_length();
-	}
-}
-
 void AnimationPlayer::_stop_internal(bool p_reset, bool p_keep_state) {
 	_clear_caches();
 	Playback &c = playback;
-	double start = c.current.is_enabled ? playback.current.get_start_time() : 0;
+	double start = c.current.from ? playback.current.get_start_time() : 0;
 	if (p_reset) {
 		c.blend.clear();
 		if (p_keep_state) {
@@ -819,8 +798,7 @@ void AnimationPlayer::_stop_internal(bool p_reset, bool p_keep_state) {
 		} else {
 			seek_internal(start, true, true, true);
 		}
-		c.current.is_enabled = false;
-		c.current.animation_name = String();
+		c.current.from = nullptr;
 		c.current.speed_scale = 1;
 		emit_signal(SNAME("current_animation_changed"), "");
 	}
@@ -835,11 +813,10 @@ void AnimationPlayer::animation_set_next(const StringName &p_animation, const St
 }
 
 StringName AnimationPlayer::animation_get_next(const StringName &p_animation) const {
-	const StringName *next = animation_next_set.getptr(p_animation);
-	if (!next) {
+	if (!animation_next_set.has(p_animation)) {
 		return StringName();
 	}
-	return *next;
+	return animation_next_set[p_animation];
 }
 
 void AnimationPlayer::set_default_blend_time(double p_default) {
@@ -870,8 +847,8 @@ double AnimationPlayer::get_blend_time(const StringName &p_animation1, const Str
 	bk.from = p_animation1;
 	bk.to = p_animation2;
 
-	if (const double *blend_time = blend_times.getptr(bk)) {
-		return *blend_time;
+	if (blend_times.has(bk)) {
+		return blend_times[bk];
 	} else {
 		return 0;
 	}
@@ -914,7 +891,9 @@ Tween::EaseType AnimationPlayer::get_auto_capture_ease_type() const {
 void AnimationPlayer::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	const String pf = p_function;
 	if (p_idx == 0 && (pf == "play" || pf == "play_backwards" || pf == "has_animation" || pf == "queue")) {
-		for (const StringName &name : get_sorted_animation_list()) {
+		List<StringName> al;
+		get_animation_list(&al);
+		for (const StringName &name : al) {
 			r_options->push_back(String(name).quote());
 		}
 	}
@@ -925,7 +904,7 @@ void AnimationPlayer::get_argument_options(const StringName &p_function, int p_i
 void AnimationPlayer::_animation_removed(const StringName &p_name, const StringName &p_library) {
 	AnimationMixer::_animation_removed(p_name, p_library);
 
-	const StringName &name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
+	StringName name = p_library == StringName() ? p_name : StringName(String(p_library) + "/" + String(p_name));
 
 	if (!animation_set.has(name)) {
 		return; // No need to update because not the one from the library being used.
@@ -934,16 +913,17 @@ void AnimationPlayer::_animation_removed(const StringName &p_name, const StringN
 	_animation_set_cache_update();
 
 	// Erase blends if needed
-	LocalVector<BlendKey> to_erase;
+	List<BlendKey> to_erase;
 	for (const KeyValue<BlendKey, double> &E : blend_times) {
-		const BlendKey &bk = E.key;
+		BlendKey bk = E.key;
 		if (bk.from == name || bk.to == name) {
 			to_erase.push_back(bk);
 		}
 	}
 
-	for (const BlendKey &bk : to_erase) {
-		blend_times.erase(bk);
+	while (to_erase.size()) {
+		blend_times.erase(to_erase.front()->get());
+		to_erase.pop_front();
 	}
 }
 
@@ -951,7 +931,7 @@ void AnimationPlayer::_rename_animation(const StringName &p_from_name, const Str
 	AnimationMixer::_rename_animation(p_from_name, p_to_name);
 
 	// Rename autoplay or blends if needed.
-	LocalVector<BlendKey> to_erase;
+	List<BlendKey> to_erase;
 	HashMap<BlendKey, double, BlendKey> to_insert;
 	for (const KeyValue<BlendKey, double> &E : blend_times) {
 		BlendKey bk = E.key;
@@ -972,8 +952,9 @@ void AnimationPlayer::_rename_animation(const StringName &p_from_name, const Str
 		}
 	}
 
-	for (const BlendKey &bk : to_erase) {
-		blend_times.erase(bk);
+	while (to_erase.size()) {
+		blend_times.erase(to_erase.front()->get());
+		to_erase.pop_front();
 	}
 
 	while (to_insert.size()) {
diff --git a/engine/scene/animation/animation_player.h b/engine/scene/animation/animation_player.h
index db0deab0..0749021d 100644
--- a/engine/scene/animation/animation_player.h
+++ b/engine/scene/animation/animation_player.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/animation/animation_mixer.h"
+#include "animation_mixer.h"
 #include "scene/resources/animation.h"
 
 class AnimationPlayer : public AnimationMixer {
@@ -63,22 +63,20 @@ private:
 	Tween::EaseType auto_capture_ease_type = Tween::EASE_IN;
 
 	struct PlaybackData {
-		bool is_enabled = false;
-		String animation_name;
-		double animation_length = 0.0;
+		AnimationData *from = nullptr;
 		double pos = 0.0;
 		float speed_scale = 1.0;
 		double start_time = 0.0;
 		double end_time = 0.0;
 		double get_start_time() const {
-			if (is_enabled && (Animation::is_less_approx(start_time, 0) || Animation::is_greater_approx(start_time, animation_length))) {
+			if (from && (Animation::is_less_approx(start_time, 0) || Animation::is_greater_approx(start_time, from->animation->get_length()))) {
 				return 0;
 			}
 			return start_time;
 		}
 		double get_end_time() const {
-			if (is_enabled && (Animation::is_less_approx(end_time, 0) || Animation::is_greater_approx(end_time, animation_length))) {
-				return animation_length;
+			if (from && (Animation::is_less_approx(end_time, 0) || Animation::is_greater_approx(end_time, from->animation->get_length()))) {
+				return from->animation->get_length();
 			}
 			return end_time;
 		}
@@ -96,7 +94,7 @@ private:
 		bool seeked = false;
 		bool internal_seeked = false;
 		bool started = false;
-		LocalVector<Blend> blend;
+		List<Blend> blend;
 	} playback;
 
 	struct BlendKey {
@@ -153,7 +151,6 @@ protected:
 	virtual void _blend_capture(double p_delta) override;
 	virtual void _blend_post_process() override;
 
-	virtual void _animation_changed(const StringName &p_name) override;
 	virtual void _animation_removed(const StringName &p_name, const StringName &p_library) override;
 	virtual void _rename_animation(const StringName &p_from_name, const StringName &p_to_name) override;
 
diff --git a/engine/scene/animation/animation_tree.compat.inc b/engine/scene/animation/animation_tree.compat.inc
index b98e79ed..29635f5b 100644
--- a/engine/scene/animation/animation_tree.compat.inc
+++ b/engine/scene/animation/animation_tree.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "animation_tree.h"
-
-#include "core/object/class_db.h"
-
 void AnimationTree::_set_process_callback_bind_compat_80813(AnimationTree::AnimationProcessCallback p_mode) {
 	set_callback_mode_process(static_cast<AnimationMixer::AnimationCallbackModeProcess>(static_cast<int>(p_mode)));
 }
diff --git a/engine/scene/animation/animation_tree.cpp b/engine/scene/animation/animation_tree.cpp
index 7addfb62..deef9529 100644
--- a/engine/scene/animation/animation_tree.cpp
+++ b/engine/scene/animation/animation_tree.cpp
@@ -31,16 +31,10 @@
 #include "animation_tree.h"
 #include "animation_tree.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/animation/animation_blend_tree.h"
+#include "animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 
-thread_local AnimationNode::ProcessState *AnimationNode::tls_process_state = nullptr;
-thread_local AnimationNodeInstance *AnimationNode::current_instance = nullptr;
-
-void AnimationNode::get_parameter_list(LocalVector<PropertyInfo> *r_list) const {
+void AnimationNode::get_parameter_list(List<PropertyInfo> *r_list) const {
 	Array parameters;
 
 	if (GDVIRTUAL_CALL(_get_parameter_list, parameters)) {
@@ -78,19 +72,60 @@ bool AnimationNode::is_parameter_read_only(const StringName &p_parameter) const
 	return false;
 }
 
-void AnimationNode::set_parameter_ex(const StringName &p_name, const Variant &p_value) {
-	ERR_FAIL_NULL(tls_process_state);
-	ERR_FAIL_NULL(current_instance);
-	current_instance->set_parameter(p_name, p_value, tls_process_state->is_testing);
+void AnimationNode::set_parameter(const StringName &p_name, const Variant &p_value) {
+	ERR_FAIL_NULL(process_state);
+	if (process_state->is_testing) {
+		return;
+	}
+
+	const AHashMap<StringName, int>::Iterator it = property_cache.find(p_name);
+	if (it) {
+		Pair<Variant, bool> &prop = process_state->tree->property_map.get_by_index(it->value).value;
+		Variant value = p_value;
+		if (Animation::validate_type_match(prop.first, value)) {
+			prop.first = value;
+		}
+		return;
+	}
+
+	ERR_FAIL_COND(!process_state->tree->property_parent_map.has(node_state.base_path));
+	ERR_FAIL_COND(!process_state->tree->property_parent_map[node_state.base_path].has(p_name));
+	StringName path = process_state->tree->property_parent_map[node_state.base_path][p_name];
+	int idx = process_state->tree->property_map.get_index(path);
+	property_cache.insert_new(p_name, idx);
+	process_state->tree->property_map.get_by_index(idx).value.first = p_value;
 }
 
-Variant AnimationNode::get_parameter_ex(const StringName &p_name) const {
-	ERR_FAIL_NULL_V(tls_process_state, Variant());
-	ERR_FAIL_NULL_V(current_instance, Variant());
-	return current_instance->get_parameter(p_name);
+Variant AnimationNode::get_parameter(const StringName &p_name) const {
+	ERR_FAIL_NULL_V(process_state, Variant());
+	const AHashMap<StringName, int>::ConstIterator it = property_cache.find(p_name);
+	if (it) {
+		return process_state->tree->property_map.get_by_index(it->value).value.first;
+	}
+	ERR_FAIL_COND_V(!process_state->tree->property_parent_map.has(node_state.base_path), Variant());
+	ERR_FAIL_COND_V(!process_state->tree->property_parent_map[node_state.base_path].has(p_name), Variant());
+
+	StringName path = process_state->tree->property_parent_map[node_state.base_path][p_name];
+	int idx = process_state->tree->property_map.get_index(path);
+	property_cache.insert_new(p_name, idx);
+	return process_state->tree->property_map.get_by_index(idx).value.first;
 }
 
-void AnimationNode::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
+void AnimationNode::set_node_time_info(const NodeTimeInfo &p_node_time_info) {
+	set_parameter(current_length, p_node_time_info.length);
+	set_parameter(current_position, p_node_time_info.position);
+	set_parameter(current_delta, p_node_time_info.delta);
+}
+
+AnimationNode::NodeTimeInfo AnimationNode::get_node_time_info() const {
+	NodeTimeInfo nti;
+	nti.length = get_parameter(current_length);
+	nti.position = get_parameter(current_position);
+	nti.delta = get_parameter(current_delta);
+	return nti;
+}
+
+void AnimationNode::get_child_nodes(List<ChildNode> *r_child_nodes) {
 	Dictionary cn;
 	if (GDVIRTUAL_CALL(_get_child_nodes, cn)) {
 		for (const KeyValue<Variant, Variant> &kv : cn) {
@@ -102,81 +137,95 @@ void AnimationNode::get_child_nodes(LocalVector<ChildNode> *r_child_nodes) {
 	}
 }
 
-void AnimationNode::blend_animation(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const StringName &p_animation, AnimationMixer::PlaybackInfo &p_playback_info) {
-	p_playback_info.track_weights = &p_instance.track_weights;
-	p_process_state.tree->make_animation_instance(p_animation, p_playback_info);
+void AnimationNode::blend_animation(const StringName &p_animation, AnimationMixer::PlaybackInfo p_playback_info) {
+	ERR_FAIL_NULL(process_state);
+	p_playback_info.track_weights = Vector<real_t>(node_state.track_weights);
+	process_state->tree->make_animation_instance(p_animation, p_playback_info);
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::_pre_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	ERR_FAIL_NULL_V(tls_process_state, NodeTimeInfo()); // Should not ever happen.
-	ERR_FAIL_COND_V_MSG(tls_process_state != &p_process_state, NodeTimeInfo(), "AnimationNodes can only be processed from within their own AnimationTree.");
-
-	AnimationNodeInstance *prev_instance = current_instance;
-
-	current_instance = &p_instance;
-	NodeTimeInfo nti = process(p_process_state, p_instance, p_playback_info, p_test_only);
-	current_instance = prev_instance;
-
+AnimationNode::NodeTimeInfo AnimationNode::_pre_process(ProcessState *p_process_state, AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	process_state = p_process_state;
+	NodeTimeInfo nti = process(p_playback_info, p_test_only);
+	process_state = nullptr;
 	return nti;
 }
 
-void AnimationNode::add_validation_error(const AnimationTree *p_tree, const StringName &p_path, const String &p_error, int p_input_index) const {
-	p_tree->_add_validation_error(p_path, p_error, p_input_index);
+void AnimationNode::make_invalid(const String &p_reason) {
+	ERR_FAIL_NULL(process_state);
+	process_state->valid = false;
+	if (!process_state->invalid_reasons.is_empty()) {
+		process_state->invalid_reasons += "\n";
+	}
+	process_state->invalid_reasons += String::utf8("•  ") + p_reason;
 }
 
-void AnimationNode::make_invalid(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const String &p_reason) {
-	p_process_state.valid = false;
-
-	InvalidInstance &invalid_instance = p_process_state.invalid_instances[p_instance.path];
-	invalid_instance.errors.push_back(p_reason);
+AnimationTree *AnimationNode::get_animation_tree() const {
+	ERR_FAIL_NULL_V(process_state, nullptr);
+	return process_state->tree;
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::blend_input(ProcessState &p_process_state, AnimationNodeInstance &p_instance, int p_input, const AnimationMixer::PlaybackInfo &p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNode::blend_input(int p_input, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only) {
 	ERR_FAIL_INDEX_V(p_input, (int64_t)inputs.size(), NodeTimeInfo());
 
-	AnimationNodeInstance *node_instance = nullptr;
-	if (likely(p_instance.connection_instances.size() > 0)) {
-		node_instance = p_instance.connection_instances[p_input];
+	AnimationNodeBlendTree *blend_tree = Object::cast_to<AnimationNodeBlendTree>(node_state.parent);
+	ERR_FAIL_NULL_V(blend_tree, NodeTimeInfo());
+
+	// Update connections.
+	StringName current_name = blend_tree->get_node_name(Ref<AnimationNode>(this));
+	node_state.connections = blend_tree->get_node_connection_array(current_name);
+
+	// Get node which is connected input port.
+	StringName node_name = node_state.connections[p_input];
+	if (!blend_tree->has_node(node_name)) {
+		make_invalid(vformat(RTR("Nothing connected to input '%s' of node '%s'."), get_input_name(p_input), current_name));
+		return NodeTimeInfo();
 	}
-	// Should not ever happen due to validation earlier.
-	ERR_FAIL_NULL_V(node_instance, NodeTimeInfo());
+
+	Ref<AnimationNode> node = blend_tree->get_node(node_name);
+	ERR_FAIL_COND_V(node.is_null(), NodeTimeInfo());
 
 	real_t activity = 0.0;
+	LocalVector<AnimationTree::Activity> *activity_ptr = process_state->tree->input_activity_map.getptr(node_state.base_path);
+	NodeTimeInfo nti = _blend_node(node, node_name, nullptr, p_playback_info, p_filter, p_sync, p_test_only, &activity);
 
-	NodeTimeInfo nti = _blend_node(p_process_state, p_instance, *node_instance, p_playback_info, p_filter, p_sync, p_test_only, &activity);
-
-#ifdef ENABLE_ACTIVITY_TRACKING
-	LocalVector<AnimationNodeInstance::Activity> &input_activity = p_instance.input_activity;
-	input_activity[p_input].last_pass = p_process_state.last_pass;
-	input_activity[p_input].activity = activity;
-#endif
-
+	if (activity_ptr && p_input < (int64_t)activity_ptr->size()) {
+		(*activity_ptr)[p_input].last_pass = process_state->last_pass;
+		(*activity_ptr)[p_input].activity = activity;
+	}
 	return nti;
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::blend_node(ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeInstance *p_other, const AnimationMixer::PlaybackInfo &p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only) {
-	ERR_FAIL_NULL_V(p_other, NodeTimeInfo());
-	return _blend_node(p_process_state, p_instance, *p_other, p_playback_info, p_filter, p_sync, p_test_only, nullptr);
+AnimationNode::NodeTimeInfo AnimationNode::blend_node(Ref<AnimationNode> p_node, const StringName &p_subpath, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only) {
+	ERR_FAIL_COND_V(p_node.is_null(), NodeTimeInfo());
+	p_node->node_state.connections.clear();
+	return _blend_node(p_node, p_subpath, this, p_playback_info, p_filter, p_sync, p_test_only, nullptr);
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::_blend_node(ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeInstance &p_other, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only, real_t *r_activity) {
-	int blend_count = p_instance.track_weights.size();
+AnimationNode::NodeTimeInfo AnimationNode::_blend_node(Ref<AnimationNode> p_node, const StringName &p_subpath, AnimationNode *p_new_parent, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter, bool p_sync, bool p_test_only, real_t *r_activity) {
+	ERR_FAIL_NULL_V(process_state, NodeTimeInfo());
 
-	if ((int64_t)p_other.track_weights.size() != blend_count) {
-		p_other.track_weights.resize(blend_count);
+	int blend_count = node_state.track_weights.size();
+
+	if ((int64_t)p_node->node_state.track_weights.size() != blend_count) {
+		p_node->node_state.track_weights.resize(blend_count);
 	}
 
-	real_t *blendw = p_other.track_weights.ptr();
-	const real_t *blendr = p_instance.track_weights.ptr();
+	real_t *blendw = p_node->node_state.track_weights.ptr();
+	const real_t *blendr = node_state.track_weights.ptr();
 
 	bool any_valid = false;
 
 	if (has_filter() && is_filter_enabled() && p_filter != FILTER_IGNORE) {
-		_update_filter_cache(p_process_state, p_instance);
-		// All to zero by default.
-		memset(blendw, 0, sizeof(real_t) * blend_count);
+		for (int i = 0; i < blend_count; i++) {
+			blendw[i] = 0.0; // All to zero by default.
+		}
 
-		for (const int idx : p_instance.filtered_track_indices_cache) {
+		for (const KeyValue<NodePath, bool> &E : filter) {
+			const AHashMap<NodePath, int> &map = *process_state->track_map;
+			if (!map.has(E.key)) {
+				continue;
+			}
+			int idx = map[E.key];
 			blendw[idx] = 1.0; // Filtered goes to one.
 		}
 
@@ -241,19 +290,33 @@ AnimationNode::NodeTimeInfo AnimationNode::_blend_node(ProcessState &p_process_s
 
 	if (r_activity) {
 		*r_activity = 0;
-#ifdef ENABLE_ACTIVITY_TRACKING
 		for (int i = 0; i < blend_count; i++) {
 			*r_activity = MAX(*r_activity, Math::abs(blendw[i]));
 		}
-#endif
+	}
+
+	String new_path;
+	AnimationNode *new_parent;
+
+	// This is the slowest part of processing, but as strings process in powers of 2, and the paths always exist, it will not result in that many allocations.
+	if (p_new_parent) {
+		new_parent = p_new_parent;
+		new_path = String(node_state.base_path) + String(p_subpath) + "/";
+	} else {
+		ERR_FAIL_NULL_V(node_state.parent, NodeTimeInfo());
+		new_parent = node_state.parent;
+		new_path = String(new_parent->node_state.base_path) + String(p_subpath) + "/";
 	}
 
 	// This process, which depends on p_sync is needed to process sync correctly in the case of
 	// that a synced AnimationNodeSync exists under the un-synced AnimationNodeSync.
+	p_node->set_node_state_base_path(new_path);
+	p_node->node_state.parent = new_parent;
 	if (!p_playback_info.seeked && !p_sync && !any_valid) {
 		p_playback_info.delta = 0.0;
+		return p_node->_pre_process(process_state, p_playback_info, p_test_only);
 	}
-	return p_other.resource->_pre_process(p_process_state, p_other, p_playback_info, p_test_only);
+	return p_node->_pre_process(process_state, p_playback_info, p_test_only);
 }
 
 String AnimationNode::get_caption() const {
@@ -307,34 +370,28 @@ int AnimationNode::find_input(const String &p_name) const {
 	return idx;
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
-	p_process_state.is_testing = p_test_only;
-
-	double &length = *VariantInternal::get_float(p_instance.parameter_ptrs_by_slot[AnimationNodeInstance::SLOT_CURRENT_LENGTH]);
-	double &position = *VariantInternal::get_float(p_instance.parameter_ptrs_by_slot[AnimationNodeInstance::SLOT_CURRENT_POSITION]);
-	double &delta = *VariantInternal::get_float(p_instance.parameter_ptrs_by_slot[AnimationNodeInstance::SLOT_CURRENT_DELTA]);
+AnimationNode::NodeTimeInfo AnimationNode::process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
+	process_state->is_testing = p_test_only;
 
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	if (p_playback_info.seeked) {
 		if (p_playback_info.is_external_seeking) {
-			pi.delta = position - p_playback_info.time;
+			pi.delta = get_node_time_info().position - p_playback_info.time;
 		}
 	} else {
-		pi.time = position + get_process_delta(p_instance, p_playback_info);
+		pi.time = get_node_time_info().position + p_playback_info.delta;
 	}
 
-	NodeTimeInfo nti = _process(p_process_state, p_instance, pi, p_test_only);
+	NodeTimeInfo nti = _process(pi, p_test_only);
 
 	if (!p_test_only) {
-		length = nti.length;
-		position = nti.position;
-		delta = nti.delta;
+		set_node_time_info(nti);
 	}
 
 	return nti;
 }
 
-AnimationNode::NodeTimeInfo AnimationNode::_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only) {
+AnimationNode::NodeTimeInfo AnimationNode::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	double r_ret = 0.0;
 	GDVIRTUAL_CALL(_process, p_playback_info.time, p_playback_info.seeked, p_playback_info.is_external_seeking, p_test_only, r_ret);
 	NodeTimeInfo nti;
@@ -344,17 +401,14 @@ AnimationNode::NodeTimeInfo AnimationNode::_process(ProcessState &p_process_stat
 
 void AnimationNode::set_filter_path(const NodePath &p_path, bool p_enable) {
 	if (p_enable) {
-		(void)p_path.hash(); // Make sure the cache is valid.
-		filter.insert(p_path);
+		filter[p_path] = true;
 	} else {
 		filter.erase(p_path);
 	}
-	filters_dirty = true;
 }
 
 void AnimationNode::set_filter_enabled(bool p_enable) {
 	filter_enabled = p_enable;
-	filters_dirty = true;
 }
 
 bool AnimationNode::is_filter_enabled() const {
@@ -370,13 +424,13 @@ bool AnimationNode::is_deletable() const {
 }
 
 ObjectID AnimationNode::get_processing_animation_tree_instance_id() const {
-	ERR_FAIL_NULL_V(tls_process_state, ObjectID());
-	return tls_process_state->tree->get_instance_id();
+	ERR_FAIL_NULL_V(process_state, ObjectID());
+	return process_state->tree->get_instance_id();
 }
 
 bool AnimationNode::is_process_testing() const {
-	ERR_FAIL_NULL_V(tls_process_state, false);
-	return tls_process_state->is_testing;
+	ERR_FAIL_NULL_V(process_state, false);
+	return process_state->is_testing;
 }
 
 bool AnimationNode::is_path_filtered(const NodePath &p_path) const {
@@ -392,8 +446,8 @@ bool AnimationNode::has_filter() const {
 Array AnimationNode::_get_filters() const {
 	Array paths;
 
-	for (const NodePath &E : filter) {
-		paths.push_back(String(E)); // Use strings, so sorting is possible.
+	for (const KeyValue<NodePath, bool> &E : filter) {
+		paths.push_back(String(E.key)); // Use strings, so sorting is possible.
 	}
 	paths.sort(); // Done so every time the scene is saved, it does not change.
 
@@ -407,24 +461,6 @@ void AnimationNode::_set_filters(const Array &p_filters) {
 	}
 }
 
-void AnimationNode::_update_filter_cache(const ProcessState &p_process_state, const AnimationNodeInstance &p_instance) {
-	if (!p_process_state.track_map_updated && !filters_dirty) {
-		return; // Cache is valid.
-	}
-
-	p_instance.filtered_track_indices_cache.clear();
-	if (p_instance.filtered_track_indices_cache.size() < filter.size()) {
-		p_instance.filtered_track_indices_cache.reserve(filter.size());
-	}
-
-	for (const NodePath &path : filter) {
-		if (const int *p = p_process_state.track_map->getptr(path)) {
-			p_instance.filtered_track_indices_cache.push_back(*p);
-		}
-	}
-	filters_dirty = false;
-}
-
 void AnimationNode::_validate_property(PropertyInfo &p_property) const {
 	if (!has_filter() && (p_property.name == "filter_enabled" || p_property.name == "filters")) {
 		p_property.usage = PROPERTY_USAGE_NONE;
@@ -450,9 +486,6 @@ Ref<AnimationNode> AnimationNode::find_node_by_path(const String &p_name) const
 }
 
 void AnimationNode::blend_animation_ex(const StringName &p_animation, double p_time, double p_delta, bool p_seeked, bool p_is_external_seeking, real_t p_blend, Animation::LoopedFlag p_looped_flag) {
-	ERR_FAIL_NULL(tls_process_state);
-	ERR_FAIL_NULL(current_instance);
-
 	AnimationMixer::PlaybackInfo info;
 	info.time = p_time;
 	info.delta = p_delta;
@@ -460,38 +493,26 @@ void AnimationNode::blend_animation_ex(const StringName &p_animation, double p_t
 	info.is_external_seeking = p_is_external_seeking;
 	info.weight = p_blend;
 	info.looped_flag = p_looped_flag;
-
-	blend_animation(*tls_process_state, *current_instance, p_animation, info);
+	blend_animation(p_animation, info);
 }
 
-double AnimationNode::blend_node_ex(const StringName &p_sub_path, const Ref<AnimationNode> &p_node, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter, bool p_sync, bool p_test_only) {
-	ERR_FAIL_NULL_V(tls_process_state, 0.0);
-	ERR_FAIL_NULL_V(current_instance, 0.0);
-
-	AnimationNodeInstance *other_instance = current_instance->get_child_instance_by_path_or_null(p_sub_path);
-	ERR_FAIL_NULL_V_MSG(other_instance, 0.0, vformat("The sub-path '%s' does not exist under the current node instance.", String(p_sub_path)));
-
+double AnimationNode::blend_node_ex(const StringName &p_sub_path, Ref<AnimationNode> p_node, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter, bool p_sync, bool p_test_only) {
 	AnimationMixer::PlaybackInfo info;
 	info.time = p_time;
 	info.seeked = p_seek;
 	info.is_external_seeking = p_is_external_seeking;
 	info.weight = p_blend;
-
-	NodeTimeInfo nti = blend_node(*tls_process_state, *current_instance, other_instance, info, p_filter, p_sync, p_test_only);
+	NodeTimeInfo nti = blend_node(p_node, p_sub_path, info, p_filter, p_sync, p_test_only);
 	return nti.length - nti.position;
 }
 
 double AnimationNode::blend_input_ex(int p_input, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter, bool p_sync, bool p_test_only) {
-	ERR_FAIL_NULL_V(tls_process_state, 0.0);
-	ERR_FAIL_NULL_V(current_instance, 0.0);
-
 	AnimationMixer::PlaybackInfo info;
 	info.time = p_time;
 	info.seeked = p_seek;
 	info.is_external_seeking = p_is_external_seeking;
 	info.weight = p_blend;
-
-	NodeTimeInfo nti = blend_input(*tls_process_state, *current_instance, p_input, info, p_filter, p_sync, p_test_only);
+	NodeTimeInfo nti = blend_input(p_input, info, p_filter, p_sync, p_test_only);
 	return nti.length - nti.position;
 }
 
@@ -505,7 +526,7 @@ void AnimationNode::get_argument_options(const StringName &p_function, int p_idx
 			}
 		} else if (pf == "get_parameter" || pf == "set_parameter") {
 			bool is_setter = pf == "set_parameter";
-			LocalVector<PropertyInfo> parameters;
+			List<PropertyInfo> parameters;
 			get_parameter_list(&parameters);
 			for (const PropertyInfo &E : parameters) {
 				if (is_setter && is_parameter_read_only(E.name)) {
@@ -514,8 +535,8 @@ void AnimationNode::get_argument_options(const StringName &p_function, int p_idx
 				r_options->push_back(E.name.quote());
 			}
 		} else if (pf == "set_filter_path" || pf == "is_path_filtered") {
-			for (const NodePath &E : filter) {
-				r_options->push_back(String(E).quote());
+			for (const KeyValue<NodePath, bool> &E : filter) {
+				r_options->push_back(String(E.key).quote());
 			}
 		}
 	}
@@ -548,8 +569,8 @@ void AnimationNode::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("blend_node", "name", "node", "time", "seek", "is_external_seeking", "blend", "filter", "sync", "test_only"), &AnimationNode::blend_node_ex, DEFVAL(FILTER_IGNORE), DEFVAL(true), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("blend_input", "input_index", "time", "seek", "is_external_seeking", "blend", "filter", "sync", "test_only"), &AnimationNode::blend_input_ex, DEFVAL(FILTER_IGNORE), DEFVAL(true), DEFVAL(false));
 
-	ClassDB::bind_method(D_METHOD("set_parameter", "name", "value"), &AnimationNode::set_parameter_ex);
-	ClassDB::bind_method(D_METHOD("get_parameter", "name"), &AnimationNode::get_parameter_ex);
+	ClassDB::bind_method(D_METHOD("set_parameter", "name", "value"), &AnimationNode::set_parameter);
+	ClassDB::bind_method(D_METHOD("get_parameter", "name"), &AnimationNode::get_parameter);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "filter_enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_filter_enabled", "is_filter_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "filters", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_filters", "_get_filters");
@@ -563,10 +584,7 @@ void AnimationNode::_bind_methods() {
 	GDVIRTUAL_BIND(_get_caption);
 	GDVIRTUAL_BIND(_has_filter);
 
-	// For "tree_changed", wouldn't it be nice, if we could pass in the source?
-	// That way we would be able to partially rebuild instances.
 	ADD_SIGNAL(MethodInfo("tree_changed"));
-	ADD_SIGNAL(MethodInfo("node_updated", PropertyInfo(Variant::INT, "object_id")));
 	ADD_SIGNAL(MethodInfo("animation_node_renamed", PropertyInfo(Variant::INT, "object_id"), PropertyInfo(Variant::STRING, "old_name"), PropertyInfo(Variant::STRING, "new_name")));
 	ADD_SIGNAL(MethodInfo("animation_node_removed", PropertyInfo(Variant::INT, "object_id"), PropertyInfo(Variant::STRING, "name")));
 
@@ -581,28 +599,10 @@ AnimationNode::AnimationNode() {
 
 ////////////////////
 
-void AnimationRootNode::_add_node(const Ref<AnimationNode> &p_node) {
-	p_node->connect(SNAME("tree_changed"), callable_mp(this, &AnimationRootNode::_tree_changed), CONNECT_REFERENCE_COUNTED);
-	p_node->connect(SNAME("node_updated"), callable_mp(this, &AnimationRootNode::_node_updated), CONNECT_REFERENCE_COUNTED);
-	p_node->connect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationRootNode::_animation_node_renamed), CONNECT_REFERENCE_COUNTED);
-	p_node->connect(SNAME("animation_node_removed"), callable_mp(this, &AnimationRootNode::_animation_node_removed), CONNECT_REFERENCE_COUNTED);
-}
-
-void AnimationRootNode::_remove_node(const Ref<AnimationNode> &p_node) {
-	p_node->disconnect(SNAME("tree_changed"), callable_mp(this, &AnimationRootNode::_tree_changed));
-	p_node->disconnect(SNAME("node_updated"), callable_mp(this, &AnimationRootNode::_node_updated));
-	p_node->disconnect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationRootNode::_animation_node_renamed));
-	p_node->disconnect(SNAME("animation_node_removed"), callable_mp(this, &AnimationRootNode::_animation_node_removed));
-}
-
 void AnimationRootNode::_tree_changed() {
 	emit_signal(SNAME("tree_changed"));
 }
 
-void AnimationRootNode::_node_updated(const ObjectID &p_oid) {
-	emit_signal(SNAME("node_updated"), p_oid);
-}
-
 void AnimationRootNode::_animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name) {
 	emit_signal(SNAME("animation_node_renamed"), p_oid, p_old_name, p_new_name);
 }
@@ -616,7 +616,6 @@ void AnimationRootNode::_animation_node_removed(const ObjectID &p_oid, const Str
 void AnimationTree::set_root_animation_node(const Ref<AnimationRootNode> &p_animation_node) {
 	if (root_animation_node.is_valid()) {
 		root_animation_node->disconnect(SNAME("tree_changed"), callable_mp(this, &AnimationTree::_tree_changed));
-		root_animation_node->disconnect(SNAME("node_updated"), callable_mp(this, &AnimationTree::_node_updated));
 		root_animation_node->disconnect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationTree::_animation_node_renamed));
 		root_animation_node->disconnect(SNAME("animation_node_removed"), callable_mp(this, &AnimationTree::_animation_node_removed));
 	}
@@ -625,7 +624,6 @@ void AnimationTree::set_root_animation_node(const Ref<AnimationRootNode> &p_anim
 
 	if (root_animation_node.is_valid()) {
 		root_animation_node->connect(SNAME("tree_changed"), callable_mp(this, &AnimationTree::_tree_changed));
-		root_animation_node->connect(SNAME("node_updated"), callable_mp(this, &AnimationTree::_node_updated));
 		root_animation_node->connect(SNAME("animation_node_renamed"), callable_mp(this, &AnimationTree::_animation_node_renamed));
 		root_animation_node->connect(SNAME("animation_node_removed"), callable_mp(this, &AnimationTree::_animation_node_removed));
 	}
@@ -642,65 +640,46 @@ Ref<AnimationRootNode> AnimationTree::get_root_animation_node() const {
 bool AnimationTree::_blend_pre_process(double p_delta, int p_track_count, const AHashMap<NodePath, int> &p_track_map) {
 	_update_properties(); // If properties need updating, update them.
 
-	bool was_validation_dirty = validation_dirty;
-	if (validation_dirty) {
-		process_state.invalid_instances.clear();
-		validation_successful = true;
-		_validate_animation_graph(Animation::PARAMETERS_BASE_PATH, root_animation_node);
-		validation_dirty = false;
-	}
-	if (!validation_successful) {
+	if (root_animation_node.is_null()) {
 		return false;
 	}
-	if (was_validation_dirty) {
-		_update_connections();
-	}
-
-	AnimationNodeInstance &instance = get_node_instance_by_path(SNAME(Animation::PARAMETERS_BASE_PATH.ascii().get_data()));
 
 	{ // Setup.
 		process_pass++;
-		if (unlikely(process_pass == 0)) {
-			process_pass = 1;
-		}
 
 		// Init process state.
 		process_state = AnimationNode::ProcessState();
 		process_state.tree = this;
 		process_state.valid = true;
-		process_state.invalid_instances.clear();
+		process_state.invalid_reasons = "";
 		process_state.last_pass = process_pass;
 		process_state.track_map = &p_track_map;
-		process_state.track_map_updated = track_map_version != last_track_map_version;
-		process_state.is_testing = false;
-
-		last_track_map_version = track_map_version;
 
 		// Init node state for root AnimationNode.
-		instance.track_weights.resize(p_track_count);
-		real_t *src_blendsw = instance.track_weights.ptr();
+		root_animation_node->node_state.track_weights.resize(p_track_count);
+		real_t *src_blendsw = root_animation_node->node_state.track_weights.ptr();
 		for (int i = 0; i < p_track_count; i++) {
 			src_blendsw[i] = 1.0; // By default all go to 1 for the root input.
 		}
-		instance.path = SNAME(Animation::PARAMETERS_BASE_PATH.ascii().get_data());
+		root_animation_node->set_node_state_base_path(SNAME(Animation::PARAMETERS_BASE_PATH.ascii().get_data()));
+		root_animation_node->node_state.parent = nullptr;
 	}
 
 	// Process.
 	{
 		PlaybackInfo pi;
-		pi.delta = p_delta;
 
 		if (started) {
-			started = false;
 			// If started, seek.
 			pi.seeked = true;
+			pi.delta = p_delta;
+			root_animation_node->_pre_process(&process_state, pi, false);
+			started = false;
 		} else {
 			pi.seeked = false;
+			pi.delta = p_delta;
+			root_animation_node->_pre_process(&process_state, pi, false);
 		}
-
-		AnimationNode::tls_process_state = &process_state;
-		root_animation_node->_pre_process(process_state, instance, pi, false);
-		AnimationNode::tls_process_state = nullptr;
 	}
 
 	if (!process_state.valid) {
@@ -727,8 +706,12 @@ bool AnimationTree::is_state_invalid() const {
 	return !process_state.valid;
 }
 
-const AHashMap<StringName, AnimationNode::InvalidInstance> &AnimationTree::get_invalid_instances() const {
-	return process_state.invalid_instances;
+String AnimationTree::get_invalid_state_reason() const {
+	return process_state.invalid_reasons;
+}
+
+uint64_t AnimationTree::get_last_process_pass() const {
+	return process_pass;
 }
 
 PackedStringArray AnimationTree::get_configuration_warnings() const {
@@ -748,30 +731,17 @@ void AnimationTree::_tree_changed() {
 	properties_dirty = true;
 }
 
-void AnimationTree::_node_updated(const ObjectID &p_oid) {
-	// This is for when the animation in AnimationNodeAnimation changes.
-	// or a connection in AnimationNodeBlendTree changes.
-
-	// Ideally, we would only validate relevant instances, but for now, revalidate all.
-	validation_dirty = true;
-}
-
 void AnimationTree::_animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name) {
-	//print_line("Node: " + ObjectDB::get_instance(p_oid)->get_class() + " (" + itos(p_oid) + ") renamed: " + p_old_name + " -> " + p_new_name);
-	for (const StringName &pp : instance_paths[p_oid]) {
-		String parent_path = pp;
-		String old_base = parent_path + p_old_name;
-		String new_base = parent_path + p_new_name;
-		//print_line(" - Updating " + pp + ": " + old_base + " -> " + new_base);
-		for (const PropertyInfo &E : properties) {
-			if (E.name.begins_with(old_base)) {
-				StringName old_name = E.name;
-				StringName new_name = E.name.replace_first(old_base, new_base);
-				const Pair<Variant, bool> temp_copy = property_map[old_name];
-				//print_line("   - Property: " + String(old_name) + " -> " + String(new_name));
-				property_map[new_name] = temp_copy;
-				property_map.erase(old_name);
-			}
+	ERR_FAIL_COND(!property_reference_map.has(p_oid));
+	String base_path = property_reference_map[p_oid];
+	String old_base = base_path + p_old_name;
+	String new_base = base_path + p_new_name;
+	for (const PropertyInfo &E : properties) {
+		if (E.name.begins_with(old_base)) {
+			String new_name = E.name.replace_first(old_base, new_base);
+			const Pair<Variant, bool> temp_copy = property_map[E.name];
+			property_map[new_name] = temp_copy;
+			property_map.erase(E.name);
 		}
 	}
 
@@ -781,13 +751,11 @@ void AnimationTree::_animation_node_renamed(const ObjectID &p_oid, const String
 }
 
 void AnimationTree::_animation_node_removed(const ObjectID &p_oid, const StringName &p_node) {
-	for (const StringName &parent_path : instance_paths[p_oid]) {
-		String base_path = String(parent_path) + String(p_node);
-
-		for (const PropertyInfo &E : properties) {
-			if (E.name.begins_with(base_path)) {
-				property_map.erase(E.name);
-			}
+	ERR_FAIL_COND(!property_reference_map.has(p_oid));
+	String base_path = String(property_reference_map[p_oid]) + String(p_node);
+	for (const PropertyInfo &E : properties) {
+		if (E.name.begins_with(base_path)) {
+			property_map.erase(E.name);
 		}
 	}
 
@@ -796,57 +764,50 @@ void AnimationTree::_animation_node_removed(const ObjectID &p_oid, const StringN
 	_update_properties();
 }
 
-void AnimationTree::_update_properties_for_node(const StringName &p_base_path, const Ref<AnimationNode> &p_node) const {
+void AnimationTree::_update_properties_for_node(const String &p_base_path, Ref<AnimationNode> p_node) const {
 	ERR_FAIL_COND(p_node.is_null());
+	if (!property_parent_map.has(p_base_path)) {
+		property_parent_map[p_base_path] = AHashMap<StringName, StringName>();
+	}
+	if (!property_reference_map.has(p_node->get_instance_id())) {
+		property_reference_map[p_node->get_instance_id()] = p_base_path;
+	}
 
-	instance_paths[p_node->get_instance_id()].insert(p_base_path);
-
-	const String base_path_str = p_base_path;
-
-	AnimationNodeInstance &instance = instance_map[p_base_path];
-	instance.path = p_base_path;
-	instance.resource = p_node;
-
-#ifdef ENABLE_ACTIVITY_TRACKING
-	if (p_node->get_input_count()) {
+	if (p_node->get_input_count() && !input_activity_map.has(p_base_path)) {
+		LocalVector<Activity> activity;
 		for (int i = 0; i < p_node->get_input_count(); i++) {
-			AnimationNodeInstance::Activity a;
+			Activity a;
 			a.activity = 0;
 			a.last_pass = 0;
-			instance.input_activity.push_back(a);
+			activity.push_back(a);
 		}
+		input_activity_map[p_base_path] = activity;
+		input_activity_map_get[String(p_base_path).substr(0, String(p_base_path).length() - 1)] = input_activity_map.get_index(p_base_path);
 	}
-#endif
 
-	LocalVector<PropertyInfo> plist;
+	List<PropertyInfo> plist;
 	p_node->get_parameter_list(&plist);
 	for (PropertyInfo &pinfo : plist) {
-		StringName pname = pinfo.name;
-		StringName key = base_path_str + pname;
+		StringName key = pinfo.name;
 
-		Pair<Variant, bool> *param = property_map.getptr(key);
-		if (!param) {
-			param = &property_map.insert(key, Pair<Variant, bool>())->value;
-			param->first = p_node->get_parameter_default_value(pname);
-			param->second = p_node->is_parameter_read_only(pname);
+		if (!property_map.has(p_base_path + key)) {
+			Pair<Variant, bool> param;
+			param.first = p_node->get_parameter_default_value(key);
+			param.second = p_node->is_parameter_read_only(key);
+			property_map[p_base_path + key] = param;
 		}
 
-		pinfo.name = key;
+		property_parent_map[p_base_path][key] = p_base_path + key;
+
+		pinfo.name = p_base_path + key;
 		properties.push_back(pinfo);
 	}
-
-	LocalVector<AnimationNode::ChildNode> children;
+	p_node->make_cache_dirty();
+	List<AnimationNode::ChildNode> children;
 	p_node->get_child_nodes(&children);
 
-	// These have to be done in two passes, because _update_properties_for_node invalidates the instance reference.
 	for (const AnimationNode::ChildNode &E : children) {
-		ERR_CONTINUE(E.name.is_empty());
-		instance.child_instances[E.name] = nullptr; // Will be set in _update_properties
-	}
-
-	for (const AnimationNode::ChildNode &E : children) {
-		const StringName child_path = base_path_str + E.name + "/";
-		_update_properties_for_node(child_path, E.node);
+		_update_properties_for_node(p_base_path + E.name + "/", E.node);
 	}
 }
 
@@ -855,46 +816,14 @@ void AnimationTree::_update_properties() const {
 		return;
 	}
 
-	// if properties are dirty, so is the validation state.
-	validation_dirty = true;
 	properties.clear();
-	instance_map.clear();
-	instance_paths.clear();
+	property_reference_map.clear();
+	property_parent_map.clear();
+	input_activity_map.clear();
+	input_activity_map_get.clear();
 
 	if (root_animation_node.is_valid()) {
 		_update_properties_for_node(Animation::PARAMETERS_BASE_PATH, root_animation_node);
-
-		// Now that the properties and instances are stable, we can update them.
-		for (KeyValue<StringName, AnimationNodeInstance> &E : instance_map) {
-			const String &instance_path = E.key;
-			AnimationNodeInstance &instance = E.value;
-
-			// Update children.
-			for (KeyValue<StringName, AnimationNodeInstance *> &kv : instance.child_instances) {
-				const StringName child_path = instance_path + kv.key + "/";
-				kv.value = instance_map.getptr(child_path);
-				CRASH_COND(!kv.value); // Shouldn't ever happen.
-			}
-
-			// Now properties.
-			const Ref<AnimationNode> &node = instance.resource;
-			ERR_FAIL_COND(node.is_null());
-
-			instance.parameter_ptrs_by_slot.resize_initialized(AnimationNodeInstance::SLOT_MAX);
-			LocalVector<PropertyInfo> plist;
-			node->get_parameter_list(&plist);
-			for (const PropertyInfo &pinfo : plist) {
-				StringName pname = pinfo.name;
-
-				Pair<Variant, bool> *pair = property_map.getptr(instance_path + pname);
-				CRASH_COND(!pair); // Shouldn't ever happen.
-
-				instance.property_ptrs[pname] = &pair->first;
-
-				// Some of these get special treatment.
-				instance.maybe_bind_slot_property(pname, &pair->first);
-			}
-		}
 	}
 
 	properties_dirty = false;
@@ -902,69 +831,6 @@ void AnimationTree::_update_properties() const {
 	const_cast<AnimationTree *>(this)->notify_property_list_changed();
 }
 
-void AnimationTree::_validate_animation_graph(const StringName &p_path, const Ref<AnimationNode> &p_node) const {
-	if (p_node.is_null()) {
-		validation_successful = false;
-		return;
-	}
-
-	p_node->validate_node(this, p_path);
-	// We will continue even if the validation is not successful, to gather all errors.
-
-	LocalVector<AnimationNode::ChildNode> children;
-	p_node->get_child_nodes(&children);
-
-	for (const AnimationNode::ChildNode &E : children) {
-		const StringName child_path = String(p_path) + E.name + "/";
-		_validate_animation_graph(child_path, E.node);
-	}
-}
-
-void AnimationTree::_update_connections() {
-	for (KeyValue<StringName, AnimationNodeInstance> &E : instance_map) {
-		AnimationNodeInstance &parent_instance = E.value;
-
-		const AnimationNodeBlendTree *blend_tree = Object::cast_to<AnimationNodeBlendTree>(parent_instance.resource.ptr());
-
-		if (!blend_tree) {
-			continue;
-		}
-
-		{
-			const LocalVector<StringName> *output_connections = blend_tree->get_node_connection_array(SceneStringName(output));
-			parent_instance.connection_instances.resize(1);
-			AnimationNodeInstance *connected_instance = parent_instance.get_child_instance_by_path_or_null(output_connections->operator[](0));
-			parent_instance.connection_instances[0] = connected_instance;
-			CRASH_COND(!connected_instance); // Will never happen.
-		}
-
-		for (const KeyValue<StringName, AnimationNodeInstance *> &kv : parent_instance.child_instances) {
-			AnimationNodeInstance *child_instance = kv.value;
-			const LocalVector<StringName> &child_connections = *blend_tree->get_node_connection_array(kv.key);
-			child_instance->connection_instances.clear();
-			child_instance->connection_instances.resize(child_connections.size());
-			for (uint32_t input = 0; input < child_connections.size(); input++) {
-				const StringName &connected_node_name = child_connections[input];
-				AnimationNodeInstance *connected_instance = parent_instance.get_child_instance_by_path_or_null(connected_node_name);
-				child_instance->connection_instances[input] = connected_instance;
-				CRASH_COND(!connected_instance); // Will never happen.
-			}
-		}
-	}
-}
-
-void AnimationTree::_add_validation_error(const StringName &p_path, const String &p_error, int p_input_index) const {
-	validation_successful = false;
-
-	AnimationNode::InvalidInstance &invalid_instance = process_state.invalid_instances[p_path];
-
-	if (p_input_index == -1) {
-		invalid_instance.errors.push_back(p_error);
-	} else {
-		invalid_instance.input_errors.push_back({ p_input_index, p_error });
-	}
-}
-
 void AnimationTree::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
@@ -979,7 +845,7 @@ void AnimationTree::_notification(int p_what) {
 void AnimationTree::set_animation_player(const NodePath &p_path) {
 	animation_player = p_path;
 	if (p_path.is_empty()) {
-		set_root_node(NodePath(".."));
+		set_root_node(SceneStringName(path_pp));
 		while (animation_libraries.size()) {
 			remove_animation_library(animation_libraries[0].name);
 		}
@@ -1021,7 +887,7 @@ void AnimationTree::_setup_animation_player() {
 		while (animation_libraries.size()) {
 			remove_animation_library(animation_libraries[0].name);
 		}
-		LocalVector<StringName> list;
+		List<StringName> list;
 		player->get_animation_library_list(&list);
 		for (const StringName &E : list) {
 			Ref<AnimationLibrary> lib = player->get_animation_library(E);
@@ -1062,25 +928,19 @@ bool AnimationTree::_set(const StringName &p_name, const Variant &p_value) {
 		return true;
 	}
 #endif // DISABLE_DEPRECATED
-	_update_properties();
+	if (properties_dirty) {
+		_update_properties();
+	}
 
-	if (Pair<Variant, bool> *property_ptr = property_map.getptr(p_name)) {
-		Pair<Variant, bool> *&pair = property_ptr;
-		if (is_inside_tree() && pair->second) {
+	if (property_map.has(p_name)) {
+		if (is_inside_tree() && property_map[p_name].second) {
 			return false; // Prevent to set property by user.
 		}
-
-		Variant &prop = pair->first;
-		// Only copy variant if needed.
-		if (Animation::needs_type_cast(prop, p_value)) {
-			Variant value = p_value;
-			if (Animation::validate_type_match(prop, value)) {
-				prop = value;
-			}
-		} else {
-			prop = p_value;
+		Pair<Variant, bool> &prop = property_map[p_name];
+		Variant value = p_value;
+		if (Animation::validate_type_match(prop.first, value)) {
+			prop.first = value;
 		}
-
 		return true;
 	}
 
@@ -1094,10 +954,12 @@ bool AnimationTree::_get(const StringName &p_name, Variant &r_ret) const {
 		return true;
 	}
 #endif // DISABLE_DEPRECATED
-	_update_properties();
+	if (properties_dirty) {
+		_update_properties();
+	}
 
-	if (const Pair<Variant, bool> *p = property_map.getptr(p_name)) {
-		r_ret = p->first;
+	if (property_map.has(p_name)) {
+		r_ret = property_map[p_name].first;
 		return true;
 	}
 
@@ -1105,35 +967,38 @@ bool AnimationTree::_get(const StringName &p_name, Variant &r_ret) const {
 }
 
 void AnimationTree::_get_property_list(List<PropertyInfo> *p_list) const {
-	_update_properties();
+	if (properties_dirty) {
+		_update_properties();
+	}
 
 	for (const PropertyInfo &E : properties) {
 		p_list->push_back(E);
 	}
 }
 
-#ifdef ENABLE_ACTIVITY_TRACKING
 real_t AnimationTree::get_connection_activity(const StringName &p_path, int p_connection) const {
-	const AnimationNodeInstance *a = get_node_instance_by_path_or_null(p_path);
-	if (!a) {
+	if (!input_activity_map_get.has(p_path)) {
 		return 0;
 	}
 
-	const LocalVector<AnimationNodeInstance::Activity> &activity = a->input_activity;
+	int index = input_activity_map_get[p_path];
+	const LocalVector<Activity> &activity = input_activity_map.get_by_index(index).value;
+
 	if (p_connection < 0 || p_connection >= (int64_t)activity.size() || activity[p_connection].last_pass != process_pass) {
 		return 0;
 	}
 
 	return activity[p_connection].activity;
 }
-#endif
 
 #ifdef TOOLS_ENABLED
 String AnimationTree::get_editor_error_message() const {
 	if (!is_active()) {
 		return TTR("The AnimationTree is inactive.\nActivate it in the inspector to enable playback; check node warnings if activation fails.");
 	} else if (!is_enabled()) {
-		return TTR("The AnimationTree node (or one of its ancestors) has its process mode set to Disabled.\nChange the process mode in the inspector to allow playback.");
+		return TTR("The AnimationTree node (or one of its parents) has its process mode set to Disabled.\nChange the process mode in the inspector to allow playback.");
+	} else if (is_state_invalid()) {
+		return get_invalid_state_reason();
 	}
 
 	return "";
@@ -1150,7 +1015,7 @@ void AnimationTree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_animation_player", "path"), &AnimationTree::set_animation_player);
 	ClassDB::bind_method(D_METHOD("get_animation_player"), &AnimationTree::get_animation_player);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tree_root", PROPERTY_HINT_RESOURCE_TYPE, AnimationRootNode::get_class_static()), "set_tree_root", "get_tree_root");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tree_root", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode"), "set_tree_root", "get_tree_root");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "advance_expression_base_node", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Node"), "set_advance_expression_base_node", "get_advance_expression_base_node");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "anim_player", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "AnimationPlayer"), "set_animation_player", "get_animation_player");
 
diff --git a/engine/scene/animation/animation_tree.h b/engine/scene/animation/animation_tree.h
index 6e46adc4..5a612f80 100644
--- a/engine/scene/animation/animation_tree.h
+++ b/engine/scene/animation/animation_tree.h
@@ -30,20 +30,15 @@
 
 #pragma once
 
-#include "scene/animation/animation_mixer.h"
+#include "animation_mixer.h"
 #include "scene/resources/animation.h"
 
 #define HUGE_LENGTH 31540000 // 31540000 seconds mean 1 year... is it too long? It must be longer than any Animation length and Transition xfade time to prevent time inversion for AnimationNodeStateMachine.
 
-#ifdef TOOLS_ENABLED
-#define ENABLE_ACTIVITY_TRACKING
-#endif
-
 class AnimationNodeBlendTree;
 class AnimationNodeStartState;
 class AnimationNodeEndState;
 class AnimationTree;
-struct AnimationNodeInstance;
 
 class AnimationNode : public Resource {
 	GDCLASS(AnimationNode, Resource);
@@ -64,9 +59,8 @@ public:
 
 	bool closable = false;
 	LocalVector<Input> inputs;
-	HashSet<NodePath> filter;
+	AHashMap<NodePath, bool> filter;
 	bool filter_enabled = false;
-	bool filters_dirty = true;
 
 	// To propagate information from upstream for use in estimation of playback progress.
 	// These values must be taken from the result of blend_node() or blend_input() and must be essentially read-only.
@@ -100,72 +94,87 @@ public:
 		}
 	};
 
-	struct InvalidInstance {
-		LocalVector<String> errors;
+	// Temporary state for blending process which needs to be stored in each AnimationNodes.
+	struct NodeState {
+		friend AnimationNode;
 
-		struct InputError {
-			int index;
-			String error;
-		};
+	private:
+		StringName base_path;
 
-		LocalVector<InputError> input_errors;
-	};
+	public:
+		AnimationNode *parent = nullptr;
+		Vector<StringName> connections;
+		LocalVector<real_t> track_weights;
+
+		const StringName get_base_path() const {
+			return base_path;
+		}
+
+	} node_state;
 
 	// Temporary state for blending process which needs to be started in the AnimationTree, pass through the AnimationNodes, and then return to the AnimationTree.
 	struct ProcessState {
 		AnimationTree *tree = nullptr;
 		const AHashMap<NodePath, int> *track_map; // TODO: Is there a better way to manage filter/tracks?
-		bool track_map_updated = false;
 		bool is_testing = false;
 		bool valid = false;
-		mutable AHashMap<StringName, InvalidInstance> invalid_instances;
+		String invalid_reasons;
 		uint64_t last_pass = 0;
-	};
+	} *process_state = nullptr;
 
-	// For performance ProcessState needs to be passed down,
-	// but the scripting api was already exposed before this optimization was made.
-	// So to keep compatibility, we need this internal state, so that the scripting api can continue working as before.
-	// It also must be thread_local, because multiple AnimationTrees can be processed in different threads.
-	static thread_local ProcessState *tls_process_state;
-	static thread_local AnimationNodeInstance *current_instance;
+private:
+	mutable AHashMap<StringName, int> property_cache;
 
 public:
+	void set_node_state_base_path(const StringName p_base_path) {
+		if (p_base_path != node_state.base_path) {
+			node_state.base_path = p_base_path;
+			make_cache_dirty();
+		}
+	}
+
+	void set_node_state_base_path(const String p_base_path) {
+		if (p_base_path != node_state.base_path) {
+			node_state.base_path = p_base_path;
+			make_cache_dirty();
+		}
+	}
+
+	const StringName get_node_state_base_path() const {
+		return node_state.get_base_path();
+	}
+
+	void make_cache_dirty() {
+		property_cache.clear();
+	}
 	Array _get_filters() const;
 	void _set_filters(const Array &p_filters);
-
-	void _update_filter_cache(const ProcessState &p_process_state, const AnimationNodeInstance &p_instance);
-
 	friend class AnimationNodeBlendTree;
 
-	virtual void validate_node(const AnimationTree *p_tree, const StringName &p_path) const {}
 	// The time information is passed from upstream to downstream by AnimationMixer::PlaybackInfo::p_playback_info until AnimationNodeAnimation processes it.
 	// Conversely, AnimationNodeAnimation returns the processed result as NodeTimeInfo from downstream to upstream.
-	NodeTimeInfo _blend_node(ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeInstance &p_other, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false, real_t *r_activity = nullptr);
-	NodeTimeInfo _pre_process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false);
+	NodeTimeInfo _blend_node(Ref<AnimationNode> p_node, const StringName &p_subpath, AnimationNode *p_new_parent, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false, real_t *r_activity = nullptr);
+	NodeTimeInfo _pre_process(ProcessState *p_process_state, AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false);
 
 protected:
 	StringName current_length = "current_length";
 	StringName current_position = "current_position";
 	StringName current_delta = "current_delta";
 
-	NodeTimeInfo process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false);
-	// Virtualizing for especially AnimationNodeAnimation needs to take "backward" into account.
-	_FORCE_INLINE_ virtual double get_process_delta(AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info) const {
-		return p_playback_info.delta;
-	}
-	virtual NodeTimeInfo _process(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const AnimationMixer::PlaybackInfo &p_playback_info, bool p_test_only = false); // Main process.
+	virtual NodeTimeInfo process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false); // To organize time information. Virtualizing for especially AnimationNodeAnimation needs to take "backward" into account.
+	virtual NodeTimeInfo _process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only = false); // Main process.
 
-	void blend_animation(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const StringName &p_animation, AnimationMixer::PlaybackInfo &p_playback_info);
-	NodeTimeInfo blend_node(ProcessState &p_process_state, AnimationNodeInstance &p_instance, AnimationNodeInstance *p_other, const AnimationMixer::PlaybackInfo &p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
-	NodeTimeInfo blend_input(ProcessState &p_process_state, AnimationNodeInstance &p_instance, int p_input, const AnimationMixer::PlaybackInfo &p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
+	void blend_animation(const StringName &p_animation, AnimationMixer::PlaybackInfo p_playback_info);
+	NodeTimeInfo blend_node(Ref<AnimationNode> p_node, const StringName &p_subpath, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
+	NodeTimeInfo blend_input(int p_input, AnimationMixer::PlaybackInfo p_playback_info, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
 
 	// Bind-able methods to expose for compatibility, moreover AnimationMixer::PlaybackInfo is not exposed.
 	void blend_animation_ex(const StringName &p_animation, double p_time, double p_delta, bool p_seeked, bool p_is_external_seeking, real_t p_blend, Animation::LoopedFlag p_looped_flag = Animation::LOOPED_FLAG_NONE);
-	double blend_node_ex(const StringName &p_sub_path, const Ref<AnimationNode> &p_node, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
+	double blend_node_ex(const StringName &p_sub_path, Ref<AnimationNode> p_node, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
 	double blend_input_ex(int p_input, double p_time, bool p_seek, bool p_is_external_seeking, real_t p_blend, FilterAction p_filter = FILTER_IGNORE, bool p_sync = true, bool p_test_only = false);
 
-	void add_validation_error(const AnimationTree *p_tree, const StringName &p_path, const String &p_error, int p_input_index = -1) const;
-	void make_invalid(ProcessState &p_process_state, AnimationNodeInstance &p_instance, const String &p_reason);
+	void make_invalid(const String &p_reason);
+	AnimationTree *get_animation_tree() const;
 
 	static void _bind_methods();
 
@@ -181,19 +190,22 @@ protected:
 	GDVIRTUAL0RC(bool, _has_filter)
 
 public:
-	virtual void get_parameter_list(LocalVector<PropertyInfo> *r_list) const;
+	virtual void get_parameter_list(List<PropertyInfo> *r_list) const;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const;
 	virtual bool is_parameter_read_only(const StringName &p_parameter) const;
 
-	void set_parameter_ex(const StringName &p_name, const Variant &p_value);
-	Variant get_parameter_ex(const StringName &p_name) const;
+	void set_parameter(const StringName &p_name, const Variant &p_value);
+	Variant get_parameter(const StringName &p_name) const;
+
+	void set_node_time_info(const NodeTimeInfo &p_node_time_info); // Wrapper of set_parameter().
+	virtual NodeTimeInfo get_node_time_info() const; // Wrapper of get_parameter().
 
 	struct ChildNode {
 		StringName name;
 		Ref<AnimationNode> node;
 	};
 
-	virtual void get_child_nodes(LocalVector<ChildNode> *r_child_nodes);
+	virtual void get_child_nodes(List<ChildNode> *r_child_nodes);
 
 	virtual String get_caption() const;
 
@@ -236,10 +248,7 @@ class AnimationRootNode : public AnimationNode {
 	GDCLASS(AnimationRootNode, AnimationNode);
 
 protected:
-	void _add_node(const Ref<AnimationNode> &p_node);
-	void _remove_node(const Ref<AnimationNode> &p_node);
 	virtual void _tree_changed();
-	void _node_updated(const ObjectID &p_oid);
 	virtual void _animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name);
 	virtual void _animation_node_removed(const ObjectID &p_oid, const StringName &p_node);
 };
@@ -252,181 +261,6 @@ class AnimationNodeEndState : public AnimationRootNode {
 	GDCLASS(AnimationNodeEndState, AnimationRootNode);
 };
 
-// Per instance data, for a node.
-// These get created/destroyed when the AnimationRootNode is updated, so you cannot use it to store persistent data.
-struct AnimationNodeInstance {
-	// This makes it faster to access the most commonly used parameters, since we just index an array instead of doing a hash lookup.
-	// But unfortunately, these are still Variants, which are quite slow,
-	// They are also pointers, which cause a level of indirection.
-	//
-	// In an ideal world, get_parameter and set_parameter are removed, and everything is made strongly typed (without variant).
-	// But that is a ton of work, and this is a good enough optimization for now.
-	LocalVector<Variant *> parameter_ptrs_by_slot;
-
-	mutable LocalVector<AnimationNodeInstance *> connection_instances; // AnimationNodeInstance* | nullptr
-	mutable LocalVector<real_t> track_weights;
-	mutable LocalVector<int> filtered_track_indices_cache;
-	mutable AHashMap<StringName, AnimationNodeInstance *> child_instances; // Child Name -> AnimationNodeInstance*
-
-	// Multiple AnimationNodeInstances can share the same resource btw.
-	Ref<AnimationNode> resource;
-
-	// TODO: these fields are like only used during initialization, or editor, or already slow paths. Consider moving them out of this struct.
-	//AnimationNodeInstance *parent = nullptr;
-	StringName path; // e.g. "parameters/node_name/sub_node_name/"
-
-	mutable AHashMap<StringName, Variant *> property_ptrs;
-
-#ifdef ENABLE_ACTIVITY_TRACKING
-	struct Activity {
-		uint64_t last_pass = 0;
-		real_t activity = 0.0;
-	};
-
-	LocalVector<Activity> input_activity;
-#endif
-
-	// Cache for AnimationNodeAnimation
-	Ref<Animation> cached_animation;
-	uint32_t cached_animation_version = 0;
-
-	// Macro to define all slots.
-	// slot index, enum name, member name, variant type, native type
-	// you can reuse slot index for different nodes if they don't overlap.
-	// Just make sure you update SLOT_MAX accordingly.
-#define ANIM_SLOT_LIST(X) \
-	/* Core parameters. */ \
-	X(0, CURRENT_LENGTH, current_length, Variant::FLOAT, double) \
-	X(1, CURRENT_POSITION, current_position, Variant::FLOAT, double) \
-	X(2, CURRENT_DELTA, current_delta, Variant::FLOAT, double) \
-	/* AnimationNodeTimeScale. */ \
-	X(3, TIME_SCALE, scale, Variant::FLOAT, double) \
-	/* AnimationNodeTimeSeek. */ \
-	X(3, SEEK_REQUEST, seek_request, Variant::FLOAT, double) \
-	/* AnimationNodeAdd2, AnimationNodeAdd3. */ \
-	X(3, ADD_AMOUNT, add_amount, Variant::FLOAT, double) \
-	/* AnimationNodeBlend2, AnimationNodeBlend3. */ \
-	X(3, BLEND_AMOUNT, blend_amount, Variant::FLOAT, double) \
-	/* AnimationNodeSub2. */ \
-	X(3, SUB_AMOUNT, sub_amount, Variant::FLOAT, double) \
-	/* AnimationNodeOneShot. */ \
-	X(3, ONESHOT_TIME_TO_RESTART, time_to_restart, Variant::FLOAT, double) \
-	X(4, ONESHOT_FADE_IN_REMAINING, fade_in_remaining, Variant::FLOAT, double) \
-	X(5, ONESHOT_FADE_OUT_REMAINING, fade_out_remaining, Variant::FLOAT, double) \
-	X(6, ONESHOT_ACTIVE, active, Variant::BOOL, bool) \
-	X(7, ONESHOT_INTERNAL_ACTIVE, internal_active, Variant::BOOL, bool) \
-	X(8, ONESHOT_REQUEST, request, Variant::INT, int) \
-	/* AnimationNodeAnimation */ \
-	X(3, ANIMATION_BACKWARD, backward, Variant::BOOL, bool) \
-	/* AnimationNodeTransition TODO: Make ref & */ \
-	X(3, TRANSITION_REQUEST, transition_request, Variant::STRING, String) \
-	X(4, CURRENT_INDEX, current_index, Variant::INT, int) \
-	X(5, PREV_INDEX, prev_index, Variant::INT, int) \
-	X(6, PREV_XFADING, prev_xfading, Variant::FLOAT, double) \
-	X(7, CURRENT_STATE, current_state, Variant::STRING, String) \
-	/* AnimationNodeBlendSpace1D and AnimationNodeBlendSpace2D, \
-	We currently cannot do blend_position, due to type same name but different type */ \
-	X(3, CLOSEST, closest, Variant::INT, int)
-
-	enum Slot : uint8_t {
-#define SLOT_ENUM(index, e, _member, _variant_type, _native_type) SLOT_##e = index,
-		ANIM_SLOT_LIST(SLOT_ENUM)
-#undef SLOT_ENUM
-				SLOT_MAX = 9
-	};
-
-	void maybe_bind_slot_property(const StringName &p_name, Variant *p_property) {
-#define HANDLE_MAYBE_BIND_SLOT_PARAMETER(_index, slot, name, _variant_type, _native_type) \
-	if (p_name == SNAME(#name)) { \
-		parameter_ptrs_by_slot[SLOT_##slot] = p_property; \
-		return; \
-	}
-		ANIM_SLOT_LIST(HANDLE_MAYBE_BIND_SLOT_PARAMETER)
-#undef HANDLE_MAYBE_BIND_SLOT_PARAMETER
-	}
-
-#define DEFINE_SET_PARAMETER_METHOD(_index, e, member, _variant_type, native_type) \
-	_FORCE_INLINE_ void set_parameter_##member(const native_type p_value, bool p_test_only) { \
-		if (p_test_only) { \
-			return; \
-		} \
-		Variant &prop = *parameter_ptrs_by_slot[SLOT_##e]; \
-		prop = p_value; \
-	}
-	ANIM_SLOT_LIST(DEFINE_SET_PARAMETER_METHOD)
-#undef DEFINE_SET_PARAMETER_METHOD
-
-#define DEFINE_GET_PARAMETER_METHOD(_index, e, member, _variant_type, native_type) \
-	_FORCE_INLINE_ native_type get_parameter_##member() const { \
-		return *parameter_ptrs_by_slot[SLOT_##e]; \
-	}
-	ANIM_SLOT_LIST(DEFINE_GET_PARAMETER_METHOD)
-#undef DEFINE_GET_PARAMETER_METHOD
-
-	_FORCE_INLINE_ void set_parameter(const StringName &p_name, const Variant &p_value, bool p_test_only) {
-		if (p_test_only) {
-			return;
-		}
-
-#define HANDLE_SET_SLOT_PARAMETER(_index, slot, name, variant_type, _native_type) \
-	if (p_name == SNAME(#name)) { \
-		ERR_FAIL_COND(p_value.get_type() != Variant::variant_type); \
-		Variant &prop = *parameter_ptrs_by_slot[SLOT_##slot]; \
-		prop = p_value; \
-		return; \
-	}
-		ANIM_SLOT_LIST(HANDLE_SET_SLOT_PARAMETER)
-#undef HANDLE_SET_SLOT_PARAMETER
-
-		Variant **p = property_ptrs.getptr(p_name);
-		ERR_FAIL_NULL(p);
-		Variant &prop = **p;
-
-		// Only copy variant if needed.
-		if (Animation::needs_type_cast(prop, p_value)) {
-			Variant value = p_value;
-			if (Animation::validate_type_match(prop, value)) {
-				prop = value;
-			}
-		} else {
-			prop = p_value;
-		}
-	}
-
-	_FORCE_INLINE_ Variant &get_parameter(const StringName &p_name) {
-		static Variant dummy = Variant();
-
-#define HANDLE_GET_SLOT_PARAMETER(_index, slot, name, _variant_type, _native_type) \
-	if (p_name == SNAME(#name)) { \
-		return *parameter_ptrs_by_slot[SLOT_##slot]; \
-	}
-		ANIM_SLOT_LIST(HANDLE_GET_SLOT_PARAMETER)
-#undef HANDLE_GET_SLOT_PARAMETER
-
-		Variant **p = property_ptrs.getptr(p_name);
-		ERR_FAIL_NULL_V(p, dummy);
-		Variant &prop = **p;
-		return prop;
-	}
-
-	_FORCE_INLINE_ AnimationNodeInstance *get_child_instance_by_path_or_null(const StringName &p_path) {
-		AnimationNodeInstance **instance_ptr = child_instances.getptr(p_path);
-		if (!instance_ptr) {
-			return nullptr;
-		}
-		AnimationNodeInstance *instance = *instance_ptr;
-		return instance;
-	}
-
-	_FORCE_INLINE_ AnimationNodeInstance &get_child_instance_by_path(const StringName &p_path) {
-		AnimationNodeInstance **instance_ptr = child_instances.getptr(p_path);
-		CRASH_COND_MSG(!instance_ptr, "No child instance found for path: \"" + String(p_path) + "\".");
-		AnimationNodeInstance *instance = *instance_ptr;
-		CRASH_COND_MSG(!instance, "Child instance pointer is null for path: \"" + String(p_path) + "\".");
-		return *instance;
-	}
-};
-
 class AnimationTree : public AnimationMixer {
 	GDCLASS(AnimationTree, AnimationMixer);
 
@@ -445,32 +279,32 @@ private:
 
 	AnimationNode::ProcessState process_state;
 	uint64_t process_pass = 1;
-	uint64_t last_track_map_version = 0;
 
 	bool started = true;
 
 	friend class AnimationNode;
 
-	mutable LocalVector<PropertyInfo> properties;
+	mutable List<PropertyInfo> properties;
+	mutable AHashMap<StringName, AHashMap<StringName, StringName>> property_parent_map;
+	mutable AHashMap<ObjectID, StringName> property_reference_map;
 	mutable AHashMap<StringName, Pair<Variant, bool>> property_map; // Property value and read-only flag.
-	mutable AHashMap<StringName, AnimationNodeInstance> instance_map;
-	mutable AHashMap<ObjectID, HashSet<StringName>> instance_paths;
 
 	mutable bool properties_dirty = true;
-	mutable bool validation_dirty = true;
-	mutable bool validation_successful = false;
 
 	void _update_properties() const;
-	void _validate_animation_graph(const StringName &p_path, const Ref<AnimationNode> &p_node) const;
-	void _update_connections();
-	void _add_validation_error(const StringName &p_path, const String &p_error, int p_input_index = -1) const;
-	void _update_properties_for_node(const StringName &p_base_path, const Ref<AnimationNode> &p_node) const;
+	void _update_properties_for_node(const String &p_base_path, Ref<AnimationNode> p_node) const;
 
 	void _tree_changed();
-	void _node_updated(const ObjectID &p_oid);
 	void _animation_node_renamed(const ObjectID &p_oid, const String &p_old_name, const String &p_new_name);
 	void _animation_node_removed(const ObjectID &p_oid, const StringName &p_node);
 
+	struct Activity {
+		uint64_t last_pass = 0;
+		real_t activity = 0.0;
+	};
+	mutable AHashMap<StringName, LocalVector<Activity>> input_activity_map;
+	mutable AHashMap<StringName, int> input_activity_map_get;
+
 	NodePath animation_player;
 
 	void _setup_animation_player();
@@ -500,36 +334,6 @@ private:
 #endif // DISABLE_DEPRECATED
 
 public:
-	AnimationNodeInstance &get_node_instance_by_path(const StringName &p_path) {
-		AnimationNodeInstance *instance = instance_map.getptr(p_path);
-		CRASH_COND_MSG(instance == nullptr, vformat(R"(No instance found for path "%s".)", String(p_path)));
-		return *instance;
-	}
-
-	AnimationNodeInstance *get_node_instance_by_path_or_null(const StringName &p_path) const {
-		return instance_map.getptr(p_path);
-	}
-
-#if TOOLS_ENABLED
-	// Used in situations where instance_map is not built.
-	// Intended for the editor, because its very slow.
-	Ref<AnimationNode> get_animation_node_by_path(const StringName &p_path) const {
-		Ref<AnimationNode> current = root_animation_node;
-
-		int name_count = String(p_path).substr(0, String(p_path).length() - 1).count("/");
-		for (int i = 0; i < name_count; i++) {
-			if (current.is_null()) {
-				return Ref<AnimationNode>();
-			}
-
-			StringName child_name = StringName(String(p_path).get_slicec('/', i + 1));
-			current = current->get_child_by_name(child_name);
-		}
-
-		return current;
-	}
-#endif
-
 	void set_animation_player(const NodePath &p_path);
 	NodePath get_animation_player() const;
 
@@ -542,10 +346,12 @@ public:
 	PackedStringArray get_configuration_warnings() const override;
 
 	bool is_state_invalid() const;
-	const AHashMap<StringName, AnimationNode::InvalidInstance> &get_invalid_instances() const;
+	String get_invalid_state_reason() const;
 
 	real_t get_connection_activity(const StringName &p_path, int p_connection) const;
 
+	uint64_t get_last_process_pass() const;
+
 #ifdef TOOLS_ENABLED
 	String get_editor_error_message() const;
 #endif
diff --git a/engine/scene/animation/easing_equations.h b/engine/scene/animation/easing_equations.h
index 2c05f8f6..a758910a 100644
--- a/engine/scene/animation/easing_equations.h
+++ b/engine/scene/animation/easing_equations.h
@@ -57,25 +57,25 @@
  */
 
 namespace Linear {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c * t / d + b;
 }
 }; // namespace Linear
 
 namespace Sine {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
-	return -c * Math::cos(t / d * (Math::PI / 2)) + c + b;
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
+	return -c * std::cos(t / d * (Math::PI / 2)) + c + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
-	return c * Math::sin(t / d * (Math::PI / 2)) + b;
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
+	return c * std::sin(t / d * (Math::PI / 2)) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
-	return -c / 2 * (Math::cos(Math::PI * t / d) - 1) + b;
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+	return -c / 2 * (std::cos(Math::PI * t / d) - 1) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -85,24 +85,24 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Sine
 
 namespace Quint {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
-	return c * Math::pow(t / d, 5) + b;
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
+	return c * std::pow(t / d, 5) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
-	return c * (Math::pow(t / d - 1, 5) + 1) + b;
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
+	return c * (std::pow(t / d - 1, 5) + 1) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d * 2;
 
 	if (t < 1) {
-		return c / 2 * Math::pow(t, 5) + b;
+		return c / 2 * std::pow(t, 5) + b;
 	}
-	return c / 2 * (Math::pow(t - 2, 5) + 2) + b;
+	return c / 2 * (std::pow(t - 2, 5) + 2) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -112,24 +112,24 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Quint
 
 namespace Quart {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
-	return c * Math::pow(t / d, 4) + b;
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
+	return c * std::pow(t / d, 4) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
-	return -c * (Math::pow(t / d - 1, 4) - 1) + b;
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
+	return -c * (std::pow(t / d - 1, 4) - 1) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d * 2;
 
 	if (t < 1) {
-		return c / 2 * Math::pow(t, 4) + b;
+		return c / 2 * std::pow(t, 4) + b;
 	}
-	return -c / 2 * (Math::pow(t - 2, 4) - 2) + b;
+	return -c / 2 * (std::pow(t - 2, 4) - 2) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -139,25 +139,25 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Quart
 
 namespace Quad {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
-	return c * Math::pow(t / d, 2) + b;
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
+	return c * std::pow(t / d, 2) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	return -c * t * (t - 2) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d * 2;
 
 	if (t < 1) {
-		return c / 2 * Math::pow(t, 2) + b;
+		return c / 2 * std::pow(t, 2) + b;
 	}
 	return -c / 2 * ((t - 1) * (t - 3) - 1) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -167,21 +167,21 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Quad
 
 namespace Expo {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
 	}
-	return c * Math::pow(2, 10 * (t / d - 1)) + b - c * 0.001;
+	return c * std::pow(2, 10 * (t / d - 1)) + b - c * 0.001;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	if (t == d) {
 		return b + c;
 	}
-	return c * 1.001 * (-Math::pow(2, -10 * t / d) + 1) + b;
+	return c * 1.001 * (-std::pow(2, -10 * t / d) + 1) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
 	}
@@ -193,12 +193,12 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d * 2;
 
 	if (t < 1) {
-		return c / 2 * Math::pow(2, 10 * (t - 1)) + b - c * 0.0005;
+		return c / 2 * std::pow(2, 10 * (t - 1)) + b - c * 0.0005;
 	}
-	return c / 2 * 1.0005 * (-Math::pow(2, -10 * (t - 1)) + 2) + b;
+	return c / 2 * 1.0005 * (-std::pow(2, -10 * (t - 1)) + 2) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -208,7 +208,7 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Expo
 
 namespace Elastic {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
 	}
@@ -220,13 +220,13 @@ inline real_t in(real_t t, real_t b, real_t c, real_t d) {
 
 	t -= 1;
 	float p = d * 0.3f;
-	float a = c * Math::pow(2, 10 * t);
+	float a = c * std::pow(2, 10 * t);
 	float s = p / 4;
 
-	return -(a * Math::sin((t * d - s) * (2 * Math::PI) / p)) + b;
+	return -(a * std::sin((t * d - s) * (2 * Math::PI) / p)) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
 	}
@@ -239,10 +239,10 @@ inline real_t out(real_t t, real_t b, real_t c, real_t d) {
 	float p = d * 0.3f;
 	float s = p / 4;
 
-	return (c * Math::pow(2, -10 * t) * Math::sin((t * d - s) * (2 * Math::PI) / p) + c + b);
+	return (c * std::pow(2, -10 * t) * std::sin((t * d - s) * (2 * Math::PI) / p) + c + b);
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
 	}
@@ -257,16 +257,16 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 
 	if (t < 1) {
 		t -= 1;
-		a *= Math::pow(2, 10 * t);
-		return -0.5f * (a * Math::sin((t * d - s) * (2 * Math::PI) / p)) + b;
+		a *= std::pow(2, 10 * t);
+		return -0.5f * (a * std::sin((t * d - s) * (2 * Math::PI) / p)) + b;
 	}
 
 	t -= 1;
-	a *= Math::pow(2, -10 * t);
-	return a * Math::sin((t * d - s) * (2 * Math::PI) / p) * 0.5f + c + b;
+	a *= std::pow(2, -10 * t);
+	return a * std::sin((t * d - s) * (2 * Math::PI) / p) * 0.5f + c + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -276,17 +276,17 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Elastic
 
 namespace Cubic {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	return c * t * t * t + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d - 1;
 	return c * (t * t * t + 1) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d / 2;
 	if (t < 1) {
 		return c / 2 * t * t * t + b;
@@ -296,7 +296,7 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	return c / 2 * (t * t * t + 2) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -306,27 +306,27 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Cubic
 
 namespace Circ {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
-	return -c * (Math::sqrt(1 - t * t) - 1) + b;
+	return -c * (std::sqrt(1 - t * t) - 1) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t = t / d - 1;
-	return c * Math::sqrt(1 - t * t) + b;
+	return c * std::sqrt(1 - t * t) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d / 2;
 	if (t < 1) {
-		return -c / 2 * (Math::sqrt(1 - t * t) - 1) + b;
+		return -c / 2 * (std::sqrt(1 - t * t) - 1) + b;
 	}
 
 	t -= 2;
-	return c / 2 * (Math::sqrt(1 - t * t) + 1) + b;
+	return c / 2 * (std::sqrt(1 - t * t) + 1) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -336,7 +336,7 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Circ
 
 namespace Bounce {
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 
 	if (t < (1 / 2.75f)) {
@@ -357,11 +357,11 @@ inline real_t out(real_t t, real_t b, real_t c, real_t d) {
 	return c * (7.5625f * t * t + 0.984375f) + b;
 }
 
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c - out(d - t, 0, c, d) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return in(t * 2, b, c / 2, d);
 	}
@@ -369,7 +369,7 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	return out(t * 2 - d, b + h, h, d);
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -379,21 +379,21 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Bounce
 
 namespace Back {
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	float s = 1.70158f;
 	t /= d;
 
 	return c * t * t * ((s + 1) * t - s) + b;
 }
 
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	float s = 1.70158f;
 	t = t / d - 1;
 
 	return c * (t * t * ((s + 1) * t + s) + 1) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	float s = 1.70158f * 1.525f;
 	t /= d / 2;
 
@@ -405,7 +405,7 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	return c / 2 * (t * t * ((s + 1) * t + s) + 2) + b;
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
@@ -415,18 +415,18 @@ inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 }; // namespace Back
 
 namespace Spring {
-inline real_t out(real_t t, real_t b, real_t c, real_t d) {
+static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	real_t s = 1.0 - t;
-	t = (Math::sin(t * Math::PI * (0.2 + 2.5 * t * t * t)) * Math::pow(s, (real_t)2.2) + t) * (1.0 + (1.2 * s));
+	t = (std::sin(t * Math::PI * (0.2 + 2.5 * t * t * t)) * std::pow(s, 2.2) + t) * (1.0 + (1.2 * s));
 	return c * t + b;
 }
 
-inline real_t in(real_t t, real_t b, real_t c, real_t d) {
+static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c - out(d - t, 0, c, d) + b;
 }
 
-inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
+static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return in(t * 2, b, c / 2, d);
 	}
@@ -434,7 +434,7 @@ inline real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	return out(t * 2 - d, b + h, h, d);
 }
 
-inline real_t out_in(real_t t, real_t b, real_t c, real_t d) {
+static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	if (t < d / 2) {
 		return out(t * 2, b, c / 2, d);
 	}
diff --git a/engine/scene/animation/root_motion_view.cpp b/engine/scene/animation/root_motion_view.cpp
index 58bacd20..5c4a71f4 100644
--- a/engine/scene/animation/root_motion_view.cpp
+++ b/engine/scene/animation/root_motion_view.cpp
@@ -32,8 +32,6 @@
 
 #include "root_motion_view.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/animation/animation_mixer.h"
 #include "scene/resources/material.h"
 
diff --git a/engine/scene/animation/tween.cpp b/engine/scene/animation/tween.cpp
index 71f3729c..f2162d4d 100644
--- a/engine/scene/animation/tween.cpp
+++ b/engine/scene/animation/tween.cpp
@@ -30,13 +30,11 @@
 
 #include "tween.h"
 
-#include "core/object/class_db.h"
 #include "scene/animation/easing_equations.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/animation.h"
 
-#define CHECK_VALID() \
+#define CHECK_VALID()                                                                                      \
 	ERR_FAIL_COND_V_MSG(!valid, nullptr, "Tween invalid. Either finished or created outside scene tree."); \
 	ERR_FAIL_COND_V_MSG(started, nullptr, "Can't append to a Tween that has started. Use stop() first.");
 
@@ -171,14 +169,6 @@ RequiredResult<SubtweenTweener> Tween::tween_subtween(RequiredParam<Tween> rp_su
 	return tweener;
 }
 
-RequiredResult<AwaitTweener> Tween::tween_await(const Signal &p_signal) {
-	CHECK_VALID();
-
-	Ref<AwaitTweener> tweener = memnew(AwaitTweener(p_signal));
-	append(tweener);
-	return tweener;
-}
-
 void Tween::append(Ref<Tweener> p_tweener) {
 	p_tweener->set_tween(this);
 
@@ -218,10 +208,6 @@ void Tween::kill() {
 	}
 }
 
-bool Tween::has_tweeners() const {
-	return !tweeners.is_empty();
-}
-
 bool Tween::is_running() {
 	return running;
 }
@@ -488,7 +474,6 @@ void Tween::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("tween_callback", "callback"), &Tween::tween_callback);
 	ClassDB::bind_method(D_METHOD("tween_method", "method", "from", "to", "duration"), &Tween::tween_method);
 	ClassDB::bind_method(D_METHOD("tween_subtween", "subtween"), &Tween::tween_subtween);
-	ClassDB::bind_method(D_METHOD("tween_await", "signal"), &Tween::tween_await);
 
 	ClassDB::bind_method(D_METHOD("custom_step", "delta"), &Tween::custom_step);
 	ClassDB::bind_method(D_METHOD("stop"), &Tween::stop);
@@ -497,7 +482,6 @@ void Tween::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("kill"), &Tween::kill);
 	ClassDB::bind_method(D_METHOD("get_total_elapsed_time"), &Tween::get_total_time);
 
-	ClassDB::bind_method(D_METHOD("has_tweeners"), &Tween::has_tweeners);
 	ClassDB::bind_method(D_METHOD("is_running"), &Tween::is_running);
 	ClassDB::bind_method(D_METHOD("is_valid"), &Tween::is_valid);
 	ClassDB::bind_method(D_METHOD("bind_node", "node"), &Tween::bind_node);
@@ -944,63 +928,3 @@ SubtweenTweener::SubtweenTweener(const Ref<Tween> &p_subtween) {
 SubtweenTweener::SubtweenTweener() {
 	ERR_FAIL_MSG("SubtweenTweener can't be created directly. Use the tween_subtween() method in Tween.");
 }
-
-Ref<AwaitTweener> AwaitTweener::set_timeout(double p_timeout) {
-	timeout = p_timeout;
-	return this;
-}
-
-void AwaitTweener::start() {
-	Tweener::start();
-	received = false;
-}
-
-bool AwaitTweener::step(double &r_delta) {
-	if (finished) {
-		return false;
-	}
-
-	if (!signal.get_object() || !signal.is_connected(target_callable)) { // In case the object was destroyed before emitting.
-		_finish();
-		return false;
-	}
-
-	elapsed_time += r_delta;
-
-	if (timeout >= 0 && elapsed_time >= timeout) {
-		_finish();
-		r_delta = elapsed_time - timeout;
-		return false;
-	}
-
-	r_delta = 0; // "Consume" all remaining time to prevent infinite loops.
-	if (received) {
-		_finish();
-		return false;
-	}
-	return true;
-}
-
-AwaitTweener::AwaitTweener(const Signal &p_signal) {
-	signal = p_signal;
-	target_callable = Callable(this, SNAME("_signal_callback"));
-	signal.connect(target_callable);
-
-	Object *signal_instance = p_signal.get_object();
-	if (signal_instance && signal_instance->is_ref_counted()) {
-		ref_copy = signal_instance;
-	}
-}
-
-AwaitTweener::AwaitTweener() {
-	ERR_FAIL_MSG("AwaitTweener can't be created directly. Use the tween_await() method in Tween.");
-}
-
-void AwaitTweener::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_timeout", "timeout"), &AwaitTweener::set_timeout);
-	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "_signal_callback", &AwaitTweener::_signal_received, MethodInfo("_signal_callback"));
-}
-
-void AwaitTweener::_signal_received(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
-	received = true;
-}
diff --git a/engine/scene/animation/tween.h b/engine/scene/animation/tween.h
index a8a7c3ac..e417b064 100644
--- a/engine/scene/animation/tween.h
+++ b/engine/scene/animation/tween.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class Tween;
 class Node;
@@ -62,7 +61,6 @@ class IntervalTweener;
 class CallbackTweener;
 class MethodTweener;
 class SubtweenTweener;
-class AwaitTweener;
 
 class Tween : public RefCounted {
 	GDCLASS(Tween, RefCounted);
@@ -150,7 +148,6 @@ public:
 	RequiredResult<CallbackTweener> tween_callback(const Callable &p_callback);
 	RequiredResult<MethodTweener> tween_method(const Callable &p_callback, const Variant p_from, Variant p_to, double p_duration);
 	RequiredResult<SubtweenTweener> tween_subtween(RequiredParam<Tween> rp_subtween);
-	RequiredResult<AwaitTweener> tween_await(const Signal &p_signal);
 	void append(Ref<Tweener> p_tweener);
 
 	bool custom_step(double p_delta);
@@ -159,7 +156,6 @@ public:
 	void play();
 	void kill();
 
-	bool has_tweeners() const;
 	bool is_running();
 	bool is_valid();
 	void clear();
@@ -330,30 +326,3 @@ protected:
 private:
 	double delay = 0;
 };
-
-class AwaitTweener : public Tweener {
-	GDCLASS(AwaitTweener, Tweener);
-
-public:
-	Ref<AwaitTweener> set_timeout(double p_timeout);
-
-	void start() override;
-	bool step(double &r_delta) override;
-
-	AwaitTweener(const Signal &p_signal);
-	AwaitTweener();
-
-protected:
-	static void _bind_methods();
-
-private:
-	Signal signal;
-	Callable target_callable;
-	bool received = false;
-
-	double timeout = -1;
-
-	void _signal_received(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
-
-	Ref<RefCounted> ref_copy;
-};
diff --git a/engine/scene/audio/audio_stream_player.compat.inc b/engine/scene/audio/audio_stream_player.compat.inc
index e16cd1a4..b0f091ec 100644
--- a/engine/scene/audio/audio_stream_player.compat.inc
+++ b/engine/scene/audio/audio_stream_player.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "audio_stream_player.h"
-
-#include "core/object/class_db.h"
-
 bool AudioStreamPlayer::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/engine/scene/audio/audio_stream_player.cpp b/engine/scene/audio/audio_stream_player.cpp
index 1eaa8071..531b3c0d 100644
--- a/engine/scene/audio/audio_stream_player.cpp
+++ b/engine/scene/audio/audio_stream_player.cpp
@@ -31,18 +31,16 @@
 #include "audio_stream_player.h"
 #include "audio_stream_player.compat.inc"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "servers/audio/audio_stream.h"
-#include "servers/display/accessibility_server.h"
+#include "servers/display/display_server.h"
 
 void AudioStreamPlayer::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ACCESSIBILITY_UPDATE) {
 		RID ae = get_accessibility_element();
 		ERR_FAIL_COND(ae.is_null());
 
-		AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_AUDIO);
+		DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_AUDIO);
 	} else {
 		internal->notification(p_what);
 	}
@@ -280,7 +278,7 @@ void AudioStreamPlayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_playback_type", "playback_type"), &AudioStreamPlayer::set_playback_type);
 	ClassDB::bind_method(D_METHOD("get_playback_type"), &AudioStreamPlayer::get_playback_type);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()), "set_stream", "get_stream");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_linear", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_volume_linear", "get_volume_linear");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
diff --git a/engine/scene/audio/audio_stream_player_internal.cpp b/engine/scene/audio/audio_stream_player_internal.cpp
index 133d16c7..43265007 100644
--- a/engine/scene/audio/audio_stream_player_internal.cpp
+++ b/engine/scene/audio/audio_stream_player_internal.cpp
@@ -30,10 +30,7 @@
 
 #include "audio_stream_player_internal.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "servers/audio/audio_stream.h"
 
 void AudioStreamPlayerInternal::_set_process(bool p_enabled) {
diff --git a/engine/scene/debugger/runtime_node_select.cpp b/engine/scene/debugger/runtime_node_select.cpp
deleted file mode 100644
index 1e794ef3..00000000
--- a/engine/scene/debugger/runtime_node_select.cpp
+++ /dev/null
@@ -1,1504 +0,0 @@
-/**************************************************************************/
-/*  runtime_node_select.cpp                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifdef DEBUG_ENABLED
-
-#include "runtime_node_select.h"
-
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
-#include "core/debugger/debugger_marshalls.h"
-#include "core/debugger/engine_debugger.h"
-#include "core/input/input.h"
-#include "core/input/input_event.h"
-#include "core/math/geometry_3d.h"
-#include "core/object/callable_mp.h"
-#include "scene/2d/camera_2d.h"
-#include "scene/debugger/scene_debugger_object.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/view_panner.h"
-#include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
-#include "scene/resources/mesh.h"
-#include "scene/theme/theme_db.h"
-#include "servers/rendering/rendering_server.h"
-
-#ifndef PHYSICS_2D_DISABLED
-#include "scene/2d/physics/collision_object_2d.h"
-#include "scene/2d/physics/collision_polygon_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
-#endif // PHYSICS_2D_DISABLED
-
-#ifndef _3D_DISABLED
-#include "scene/3d/camera_3d.h"
-#ifndef PHYSICS_3D_DISABLED
-#include "scene/3d/physics/collision_object_3d.h"
-#include "scene/3d/physics/collision_shape_3d.h"
-#endif // PHYSICS_3D_DISABLED
-#include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/3d/convex_polygon_shape_3d.h"
-#include "scene/resources/surface_tool.h"
-#endif // _3D_DISABLED
-
-RuntimeNodeSelect *RuntimeNodeSelect::get_singleton() {
-	return singleton;
-}
-
-RuntimeNodeSelect::~RuntimeNodeSelect() {
-	if (selection_list && !selection_list->is_visible()) {
-		memdelete(selection_list);
-	}
-
-	if (draw_canvas.is_valid()) {
-		RS::get_singleton()->free_rid(sel_drag_ci);
-		RS::get_singleton()->free_rid(srect_ci);
-		RS::get_singleton()->free_rid(draw_canvas);
-	}
-}
-
-void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
-	Window *root = SceneTree::get_singleton()->get_root();
-	ERR_FAIL_COND(root->is_connected(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input)));
-
-	root->connect(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input));
-	root->connect("size_changed", callable_mp(this, &RuntimeNodeSelect::_queue_selection_update), CONNECT_DEFERRED);
-
-	max_selection = p_settings.get("debugger/max_node_selection", 1);
-
-	// Panner Setup
-
-	panner.instantiate();
-	panner->set_callbacks(callable_mp(this, &RuntimeNodeSelect::_pan_callback), callable_mp(this, &RuntimeNodeSelect::_zoom_callback));
-
-	ViewPanner::ControlScheme panning_scheme = (ViewPanner::ControlScheme)p_settings.get("editors/panning/2d_editor_panning_scheme", 0).operator int();
-	bool simple_panning = p_settings.get("editors/panning/simple_panning", false);
-	int pan_speed = p_settings.get("editors/panning/2d_editor_pan_speed", 20);
-	Array keys = p_settings.get("canvas_item_editor/pan_view", Array()).operator Array();
-	panner->setup(panning_scheme, DebuggerMarshalls::deserialize_key_shortcut(keys), simple_panning);
-	panner->setup_warped_panning(root, p_settings.get("editors/panning/warped_mouse_panning", true));
-	panner->set_scroll_speed(pan_speed);
-
-	sel_2d_grab_dist = p_settings.get("editors/polygon_editor/point_grab_radius", 0);
-	sel_2d_scale = MAX(1, Math::ceil(2.0 / (float)GLOBAL_GET("display/window/stretch/scale")));
-
-	selection_area_fill = p_settings.get("box_selection_fill_color", Color());
-	selection_area_outline = p_settings.get("box_selection_stroke_color", Color());
-
-	draw_canvas = RS::get_singleton()->canvas_create();
-	sel_drag_ci = RS::get_singleton()->canvas_item_create();
-
-	/// 2D Selection Rectangle Generation
-
-	srect_color = p_settings.get("editors/2d/selection_rectangle_color", Color());
-
-	srect_ci = RS::get_singleton()->canvas_item_create();
-	RS::get_singleton()->viewport_attach_canvas(root->get_viewport_rid(), draw_canvas);
-	RS::get_singleton()->canvas_item_set_parent(sel_drag_ci, draw_canvas);
-	RS::get_singleton()->canvas_item_set_parent(srect_ci, draw_canvas);
-
-#ifndef _3D_DISABLED
-	camera_fov = p_settings.get("editors/3d/default_fov", 70);
-	camera_znear = p_settings.get("editors/3d/default_z_near", 0.05);
-	camera_zfar = p_settings.get("editors/3d/default_z_far", 4'000);
-
-	// View3DController Setup
-
-	view_3d_controller.instantiate();
-
-	view_3d_controller->set_freelook_scheme((View3DController::FreelookScheme)p_settings.get("editors/3d/freelook/freelook_navigation_scheme", View3DController::FREELOOK_DEFAULT).operator int());
-	view_3d_controller->set_freelook_base_speed(p_settings.get("editors/3d/freelook/freelook_base_speed", 5));
-	view_3d_controller->set_freelook_sensitivity(p_settings.get("editors/3d/freelook/freelook_sensitivity", 0.25));
-	view_3d_controller->set_freelook_inertia(p_settings.get("editors/3d/freelook/freelook_inertia", 0));
-	view_3d_controller->set_freelook_speed_zoom_link(p_settings.get("editors/3d/freelook/freelook_speed_zoom_link", false));
-	view_3d_controller->set_freelook_invert_y_axis(p_settings.get("editors/3d/freelook/freelook_invert_y_axis", false));
-
-	view_3d_controller->set_translation_sensitivity(p_settings.get("editors/3d/navigation_feel/translation_sensitivity", 1));
-	view_3d_controller->set_translation_inertia(p_settings.get("editors/3d/navigation_feel/translation_inertia", 0));
-
-	view_3d_controller->set_pan_mouse_button(p_settings.get("editors/3d/navigation/pan_mouse_button", View3DController::NAV_MOUSE_BUTTON_MIDDLE));
-
-	view_3d_controller->set_orbit_mouse_button(p_settings.get("editors/3d/navigation/orbit_mouse_button", View3DController::NAV_MOUSE_BUTTON_MIDDLE));
-	view_3d_controller->set_orbit_sensitivity(p_settings.get("editors/3d/navigation_feel/orbit_sensitivity", 0.004));
-	view_3d_controller->set_orbit_inertia(p_settings.get("editors/3d/navigation_feel/orbit_inertia", 0));
-
-	view_3d_controller->set_zoom_style(p_settings.get("editors/3d/navigation/zoom_style", View3DController::ZOOM_VERTICAL));
-	view_3d_controller->set_zoom_inertia(p_settings.get("editors/3d/navigation_feel/zoom_inertia", 0));
-	view_3d_controller->set_zoom_mouse_button(p_settings.get("editors/3d/navigation/zoom_mouse_button", View3DController::NAV_MOUSE_BUTTON_MIDDLE));
-
-	view_3d_controller->set_angle_snap_threshold(p_settings.get("editors/3d/navigation_feel/angle_snap_threshold", 10));
-
-	view_3d_controller->set_emulate_3_button_mouse(p_settings.get("editors/3d/navigation/emulate_3_button_mouse", false));
-	view_3d_controller->set_emulate_numpad(p_settings.get("editors/3d/navigation/emulate_numpad", true));
-
-	view_3d_controller->set_z_near(camera_znear);
-	view_3d_controller->set_z_far(camera_zfar);
-
-	view_3d_controller->set_invert_x_axis(p_settings.get("editors/3d/navigation/invert_x_axis", false));
-	view_3d_controller->set_invert_x_axis(p_settings.get("editors/3d/navigation/invert_y_axis", false));
-
-	view_3d_controller->set_warped_mouse_panning(p_settings.get("editors/3d/navigation/warped_mouse_panning", true));
-
-	view_3d_controller->connect("fov_scaled", callable_mp(this, &RuntimeNodeSelect::_fov_scaled));
-	view_3d_controller->connect("cursor_interpolated", callable_mp(this, &RuntimeNodeSelect::_cursor_interpolated));
-
-#define SET_SHORTCUT(p_name, p_setting) \
-	{ \
-		Ref<Shortcut> shortcut = DebuggerMarshalls::deserialize_key_shortcut(p_settings.get(p_setting, Array()).operator Array()); \
-		if (shortcut.is_valid()) { \
-			view_3d_controller->set_shortcut(p_name, shortcut); \
-		} \
-	}
-
-	SET_SHORTCUT(View3DController::SHORTCUT_FOV_DECREASE, "spatial_editor/decrease_fov");
-	SET_SHORTCUT(View3DController::SHORTCUT_FOV_INCREASE, "spatial_editor/increase_fov");
-	SET_SHORTCUT(View3DController::SHORTCUT_FOV_RESET, "spatial_editor/reset_fov");
-	SET_SHORTCUT(View3DController::SHORTCUT_PAN_MOD_1, "spatial_editor/viewport_pan_modifier_1");
-	SET_SHORTCUT(View3DController::SHORTCUT_PAN_MOD_2, "spatial_editor/viewport_pan_modifier_2");
-	SET_SHORTCUT(View3DController::SHORTCUT_ORBIT_MOD_1, "spatial_editor/viewport_orbit_modifier_1");
-	SET_SHORTCUT(View3DController::SHORTCUT_ORBIT_MOD_2, "spatial_editor/viewport_orbit_modifier_2");
-	SET_SHORTCUT(View3DController::SHORTCUT_ORBIT_SNAP_MOD_1, "spatial_editor/viewport_orbit_snap_modifier_1");
-	SET_SHORTCUT(View3DController::SHORTCUT_ORBIT_SNAP_MOD_2, "spatial_editor/viewport_orbit_snap_modifier_2");
-	SET_SHORTCUT(View3DController::SHORTCUT_ZOOM_MOD_1, "spatial_editor/viewport_zoom_modifier_1");
-	SET_SHORTCUT(View3DController::SHORTCUT_ZOOM_MOD_2, "spatial_editor/viewport_zoom_modifier_2");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_FORWARD, "spatial_editor/freelook_forward");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_BACKWARDS, "spatial_editor/freelook_backwards");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_LEFT, "spatial_editor/freelook_left");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_RIGHT, "spatial_editor/freelook_right");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_UP, "spatial_editor/freelook_up");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_DOWN, "spatial_editor/freelook_down");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_SPEED_MOD, "spatial_editor/freelook_speed_modifier");
-	SET_SHORTCUT(View3DController::SHORTCUT_FREELOOK_SLOW_MOD, "spatial_editor/freelook_slow_modifier");
-
-#undef SET_SHORTCUT
-
-	/// 3D Selection Box Generation
-	// Copied from the Node3DEditor implementation.
-
-	sbox_color = p_settings.get("editors/3d/selection_box_color", Color());
-
-	// Use two AABBs to create the illusion of a slightly thicker line.
-	AABB aabb(Vector3(), Vector3(1, 1, 1));
-
-	// Create a x-ray (visible through solid surfaces) and standard version of the selection box.
-	// Both will be drawn at the same position, but with different opacity.
-	// This lets the user see where the selection is while still having a sense of depth.
-	Ref<SurfaceTool> st = memnew(SurfaceTool);
-	Ref<SurfaceTool> st_xray = memnew(SurfaceTool);
-
-	st->begin(Mesh::PRIMITIVE_LINES);
-	st_xray->begin(Mesh::PRIMITIVE_LINES);
-	for (int i = 0; i < 12; i++) {
-		Vector3 a, b;
-		aabb.get_edge(i, a, b);
-
-		st->add_vertex(a);
-		st->add_vertex(b);
-		st_xray->add_vertex(a);
-		st_xray->add_vertex(b);
-	}
-
-	Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
-	mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
-	mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
-	mat->set_albedo(sbox_color);
-	mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
-	st->set_material(mat);
-	sbox_mesh = st->commit();
-
-	Ref<StandardMaterial3D> mat_xray = memnew(StandardMaterial3D);
-	mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
-	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
-	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
-	mat_xray->set_albedo(sbox_color * Color(1, 1, 1, 0.15));
-	mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
-	st_xray->set_material(mat_xray);
-	sbox_mesh_xray = st_xray->commit();
-#endif // _3D_DISABLED
-
-	SceneTree::get_singleton()->connect("process_frame", callable_mp(this, &RuntimeNodeSelect::_process_frame));
-	SceneTree::get_singleton()->connect("physics_frame", callable_mp(this, &RuntimeNodeSelect::_physics_frame));
-
-	// This function will be called before the root enters the tree at first when the Game view is passing its settings to
-	// the debugger, so queue the update for after it enters.
-	root->connect(SceneStringName(tree_entered), callable_mp(this, &RuntimeNodeSelect::_update_input_state), Object::CONNECT_ONE_SHOT);
-}
-
-void RuntimeNodeSelect::_node_set_type(NodeType p_type) {
-	node_select_type = p_type;
-	_update_input_state();
-}
-
-void RuntimeNodeSelect::_select_set_mode(SelectMode p_mode) {
-	node_select_mode = p_mode;
-}
-
-void RuntimeNodeSelect::_set_camera_override_enabled(bool p_enabled) {
-	camera_override = p_enabled;
-
-	if (camera_first_override) {
-		_reset_camera_2d();
-#ifndef _3D_DISABLED
-		_reset_camera_3d();
-#endif // _3D_DISABLED
-
-		camera_first_override = false;
-	} else if (p_enabled) {
-		_update_view_2d();
-
-#ifndef _3D_DISABLED
-		Window *root = SceneTree::get_singleton()->get_root();
-		ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
-		Camera3D *override_camera = root->get_override_camera_3d();
-		override_camera->set_transform(view_3d_controller->to_camera_transform());
-		override_camera->set_perspective(camera_fov * view_3d_controller->cursor.fov_scale, camera_znear, camera_zfar);
-#endif // _3D_DISABLED
-	}
-}
-
-void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
-	Window *root = SceneTree::get_singleton()->get_root();
-	if (node_select_type == NODE_TYPE_NONE || (selection_list && selection_list->is_visible())) {
-		// Workaround for platforms that don't allow subwindows.
-		if (selection_list && selection_list->is_visible() && selection_list->is_embedded()) {
-			root->set_disable_input_override(false);
-			selection_list->push_input(p_event);
-			callable_mp(root->get_viewport(), &Viewport::set_disable_input_override).call_deferred(true);
-		}
-
-		return;
-	}
-
-	bool is_dragging_camera = false;
-	if (camera_override) {
-		if (node_select_type == NODE_TYPE_2D) {
-			is_dragging_camera = panner->gui_input(p_event, Rect2(Vector2(), root->get_visible_rect().get_size()));
-#ifndef _3D_DISABLED
-		} else if (node_select_type == NODE_TYPE_3D && selection_drag_state == SELECTION_DRAG_NONE) {
-			if (_handle_3d_input(p_event)) {
-				return;
-			}
-#endif // _3D_DISABLED
-		}
-	}
-
-	Ref<InputEventMouseButton> b = p_event;
-
-	if (selection_drag_state == SELECTION_DRAG_MOVE) {
-		Ref<InputEventMouseMotion> m = p_event;
-		if (m.is_valid()) {
-			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(m->get_position()));
-			return;
-		} else if (b.is_valid()) {
-			// Account for actions like zooming.
-			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(b->get_position()));
-		}
-	}
-
-	if (b.is_null()) {
-		return;
-	}
-
-	// Ignore mouse wheel inputs.
-	if (b->get_button_index() != MouseButton::LEFT && b->get_button_index() != MouseButton::RIGHT) {
-		return;
-	}
-
-	if (selection_drag_state == SELECTION_DRAG_MOVE && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
-		selection_drag_state = SELECTION_DRAG_END;
-		selection_drag_area = selection_drag_area.abs();
-		_update_selection_drag();
-
-		// Trigger a selection in the position on release.
-		if (multi_shortcut_pressed) {
-			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
-		}
-	}
-
-	if (!is_dragging_camera && b->is_pressed()) {
-		multi_shortcut_pressed = b->is_shift_pressed();
-		list_shortcut_pressed = node_select_mode == SELECT_MODE_SINGLE && b->get_button_index() == MouseButton::RIGHT && b->is_alt_pressed();
-		if (list_shortcut_pressed || b->get_button_index() == MouseButton::LEFT) {
-			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
-		}
-	}
-}
-
-void RuntimeNodeSelect::_items_popup_index_pressed(int p_index, PopupMenu *p_popup) {
-	Object *obj = p_popup->get_item_metadata(p_index).get_validated_object();
-	if (obj) {
-		Vector<Node *> node;
-		node.append(Object::cast_to<Node>(obj));
-		_send_ids(node);
-	}
-}
-
-void RuntimeNodeSelect::_update_input_state() {
-	SceneTree *scene_tree = SceneTree::get_singleton();
-	// This function can be called at the very beginning, when the root hasn't entered the tree yet.
-	// So check first to avoid a crash.
-	if (!scene_tree->get_root()->is_inside_tree()) {
-		return;
-	}
-
-	bool disable_input = scene_tree->is_suspended() || node_select_type != RuntimeNodeSelect::NODE_TYPE_NONE;
-	Input::get_singleton()->set_disable_input(disable_input);
-	Input::get_singleton()->set_mouse_mode_override_enabled(disable_input);
-	scene_tree->get_root()->set_disable_input_override(disable_input);
-}
-
-void RuntimeNodeSelect::_process_frame() {
-#ifndef _3D_DISABLED
-	// Calculate the process time manually, as the time scale can be frozen.
-	const double process_time = (1.0 / Engine::get_singleton()->get_frames_per_second()) * Engine::get_singleton()->get_unfrozen_time_scale();
-
-	if (view_3d_controller->is_freelook_enabled()) {
-		Input *input = Input::get_singleton();
-		bool was_input_disabled = input->is_input_disabled();
-		if (was_input_disabled) {
-			input->set_disable_input(false);
-		}
-
-		view_3d_controller->update_freelook(process_time);
-
-		if (was_input_disabled) {
-			input->set_disable_input(true);
-		}
-	}
-
-	view_3d_controller->update_camera(process_time);
-#endif // _3D_DISABLED
-
-	if (selection_update_queued || !SceneTree::get_singleton()->is_suspended()) {
-		selection_update_queued = false;
-		if (has_selection) {
-			_update_selection();
-		}
-	}
-}
-
-void RuntimeNodeSelect::_physics_frame() {
-	if (selection_drag_state != SELECTION_DRAG_END && (selection_drag_state == SELECTION_DRAG_MOVE || Math::is_inf(selection_position.x))) {
-		return;
-	}
-
-	Window *root = SceneTree::get_singleton()->get_root();
-	bool selection_drag_valid = selection_drag_state == SELECTION_DRAG_END && selection_drag_area.get_area() > SELECTION_MIN_AREA;
-	Vector<SelectResult> items;
-
-	if (node_select_type == NODE_TYPE_2D) {
-		if (selection_drag_valid) {
-			for (int i = 0; i < root->get_child_count(); i++) {
-				_find_canvas_items_at_rect(selection_drag_area, root->get_child(i), items);
-			}
-		} else if (!Math::is_inf(selection_position.x)) {
-			for (int i = 0; i < root->get_child_count(); i++) {
-				_find_canvas_items_at_pos(selection_position, root->get_child(i), items);
-			}
-		}
-
-#ifndef _3D_DISABLED
-	} else if (node_select_type == NODE_TYPE_3D) {
-		if (selection_drag_valid) {
-			_find_3d_items_at_rect(selection_drag_area, items);
-		} else {
-			_find_3d_items_at_pos(selection_position, items);
-		}
-#endif // _3D_DISABLED
-	}
-
-	if ((prefer_group_selection || avoid_locked_nodes) && !list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) {
-		for (int i = 0; i < items.size(); i++) {
-			Node *node = items[i].item;
-			Node *final_node = node;
-			real_t order = items[i].order;
-
-			// Replace the node by the group if grouped.
-			if (prefer_group_selection) {
-				while (node && node != root) {
-					if (node->has_meta("_edit_group_")) {
-						final_node = node;
-
-						if (Object::cast_to<CanvasItem>(final_node)) {
-							CanvasItem *ci_tmp = Object::cast_to<CanvasItem>(final_node);
-							order = ci_tmp->get_effective_z_index() + ci_tmp->get_canvas_layer();
-#ifndef _3D_DISABLED
-						} else if (Object::cast_to<Node3D>(final_node)) {
-							Node3D *node3d_tmp = Object::cast_to<Node3D>(final_node);
-							Camera3D *camera = root->get_camera_3d();
-							Vector3 pos = camera->project_ray_origin(selection_position);
-							order = -pos.distance_to(node3d_tmp->get_global_transform().origin);
-#endif // _3D_DISABLED
-						}
-					}
-					node = node->get_parent();
-				}
-			}
-
-			// Filter out locked nodes.
-			if (avoid_locked_nodes && final_node->get_meta("_edit_lock_", false)) {
-				items.remove_at(i);
-				i--;
-				continue;
-			}
-
-			items.write[i].item = final_node;
-			items.write[i].order = order;
-		}
-	}
-
-	// Remove possible duplicates.
-	for (int i = 0; i < items.size(); i++) {
-		Node *item = items[i].item;
-		for (int j = 0; j < i; j++) {
-			if (items[j].item == item) {
-				items.remove_at(i);
-				i--;
-
-				break;
-			}
-		}
-	}
-
-	items.sort();
-
-	switch (selection_drag_state) {
-		case SELECTION_DRAG_END: {
-			selection_position = Point2(Math::INF, Math::INF);
-			selection_drag_state = SELECTION_DRAG_NONE;
-
-			if (selection_drag_area.get_area() > SELECTION_MIN_AREA) {
-				if (!items.is_empty()) {
-					Vector<Node *> nodes;
-					for (const SelectResult item : items) {
-						nodes.append(item.item);
-					}
-					_send_ids(nodes, false);
-				}
-
-				_update_selection_drag();
-				return;
-			}
-
-			_update_selection_drag();
-		} break;
-
-		case SELECTION_DRAG_NONE: {
-			if (node_select_mode == SELECT_MODE_LIST) {
-				break;
-			}
-
-			if (multi_shortcut_pressed) {
-				// Allow forcing box selection when an item was clicked.
-				selection_drag_state = SELECTION_DRAG_MOVE;
-			} else if (items.is_empty()) {
-#ifdef _3D_DISABLED
-				if (!selected_ci_nodes.is_empty()) {
-#else
-				if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
-#endif // _3D_DISABLED
-					EngineDebugger::get_singleton()->send_message("remote_nothing_selected", Array());
-					_clear_selection();
-				}
-
-				selection_drag_state = SELECTION_DRAG_MOVE;
-			} else {
-				break;
-			}
-
-			[[fallthrough]];
-		}
-
-		case SELECTION_DRAG_MOVE: {
-			selection_drag_area.position = selection_position;
-
-			// Stop selection on click, so it can happen on release if the selection area doesn't pass the threshold.
-			if (multi_shortcut_pressed) {
-				return;
-			}
-		}
-	}
-
-	if (items.is_empty()) {
-		selection_position = Point2(Math::INF, Math::INF);
-		return;
-	}
-	if ((!list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) || items.size() == 1) {
-		selection_position = Point2(Math::INF, Math::INF);
-
-		Vector<Node *> node;
-		node.append(items[0].item);
-		_send_ids(node);
-
-		return;
-	}
-
-	if (!selection_list && (list_shortcut_pressed || node_select_mode == SELECT_MODE_LIST)) {
-		_open_selection_list(items, selection_position);
-	}
-
-	selection_position = Point2(Math::INF, Math::INF);
-}
-
-void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections) {
-	ERR_FAIL_COND(p_picked_nodes.is_empty());
-
-	Vector<Node *> picked_nodes = p_picked_nodes;
-	Array message;
-
-	if (!multi_shortcut_pressed) {
-		if (picked_nodes.size() > max_selection) {
-			picked_nodes.resize(max_selection);
-			EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
-		}
-
-		for (const Node *node : picked_nodes) {
-			SceneDebuggerObject obj(node->get_instance_id());
-			Array arr;
-			obj.serialize(arr);
-			message.append(arr);
-		}
-
-		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
-		_set_selected_nodes(picked_nodes);
-
-		return;
-	}
-
-	LocalVector<Node *> nodes;
-	LocalVector<ObjectID> ids;
-	for (Node *node : picked_nodes) {
-		ObjectID id = node->get_instance_id();
-		if (CanvasItem *ci = Object::cast_to<CanvasItem>(node)) {
-			if (selected_ci_nodes.has(id)) {
-				if (p_invert_new_selections) {
-					selected_ci_nodes.erase(id);
-				}
-			} else {
-				ids.push_back(id);
-				nodes.push_back(ci);
-			}
-		} else {
-#ifndef _3D_DISABLED
-			if (Node3D *node3d = Object::cast_to<Node3D>(node)) {
-				if (selected_3d_nodes.has(id)) {
-					if (p_invert_new_selections) {
-						selected_3d_nodes.erase(id);
-					}
-				} else {
-					ids.push_back(id);
-					nodes.push_back(node3d);
-				}
-			}
-#endif // _3D_DISABLED
-		}
-	}
-
-	uint32_t limit = max_selection - selected_ci_nodes.size();
-#ifndef _3D_DISABLED
-	limit -= selected_3d_nodes.size();
-#endif // _3D_DISABLED
-	if (ids.size() > limit) {
-		ids.resize(limit);
-		nodes.resize(limit);
-		EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
-	}
-
-	for (ObjectID id : selected_ci_nodes) {
-		ids.push_back(id);
-		nodes.push_back(ObjectDB::get_instance<Node>(id));
-	}
-#ifndef _3D_DISABLED
-	for (const KeyValue<ObjectID, Ref<SelectionBox>> &KV : selected_3d_nodes) {
-		ids.push_back(KV.key);
-		nodes.push_back(ObjectDB::get_instance<Node>(KV.key));
-	}
-#endif // _3D_DISABLED
-
-	if (ids.is_empty()) {
-		EngineDebugger::get_singleton()->send_message("remote_nothing_selected", message);
-	} else {
-		for (const ObjectID &id : ids) {
-			SceneDebuggerObject obj(id);
-			Array arr;
-			obj.serialize(arr);
-			message.append(arr);
-		}
-
-		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
-	}
-
-	_set_selected_nodes(Vector<Node *>(nodes));
-}
-
-void RuntimeNodeSelect::_set_selected_nodes(const Vector<Node *> &p_nodes) {
-	if (p_nodes.is_empty()) {
-		_clear_selection();
-		return;
-	}
-
-	bool changed = false;
-	LocalVector<ObjectID> nodes_ci;
-#ifndef _3D_DISABLED
-	HashMap<ObjectID, Ref<SelectionBox>> nodes_3d;
-#endif // _3D_DISABLED
-
-	for (Node *node : p_nodes) {
-		ObjectID id = node->get_instance_id();
-		if (Object::cast_to<CanvasItem>(node)) {
-			if (!changed || !selected_ci_nodes.has(id)) {
-				changed = true;
-			}
-
-			nodes_ci.push_back(id);
-		} else {
-#ifndef _3D_DISABLED
-			Node3D *node_3d = Object::cast_to<Node3D>(node);
-			if (!node_3d || !node_3d->is_inside_world()) {
-				continue;
-			}
-
-			if (!changed || !selected_3d_nodes.has(id)) {
-				changed = true;
-			}
-
-			if (selected_3d_nodes.has(id)) {
-				// Assign an already available visual instance.
-				nodes_3d[id] = selected_3d_nodes.get(id);
-				continue;
-			}
-
-			if (sbox_mesh.is_null() || sbox_mesh_xray.is_null()) {
-				continue;
-			}
-
-			Ref<SelectionBox> sb;
-			sb.instantiate();
-			nodes_3d[id] = sb;
-
-			RID scenario = node_3d->get_world_3d()->get_scenario();
-
-			sb->instance = RS::get_singleton()->instance_create2(sbox_mesh->get_rid(), scenario);
-			sb->instance_ofs = RS::get_singleton()->instance_create2(sbox_mesh->get_rid(), scenario);
-			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance, RSE::SHADOW_CASTING_SETTING_OFF);
-			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_ofs, RSE::SHADOW_CASTING_SETTING_OFF);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-
-			sb->instance_xray = RS::get_singleton()->instance_create2(sbox_mesh_xray->get_rid(), scenario);
-			sb->instance_xray_ofs = RS::get_singleton()->instance_create2(sbox_mesh_xray->get_rid(), scenario);
-			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray, RSE::SHADOW_CASTING_SETTING_OFF);
-			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray_ofs, RSE::SHADOW_CASTING_SETTING_OFF);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RSE::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-#endif // _3D_DISABLED
-		}
-	}
-
-#ifdef _3D_DISABLED
-	if (!changed && nodes_ci.size() == selected_ci_nodes.size()) {
-		return;
-	}
-#else
-	if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
-		return;
-	}
-#endif // _3D_DISABLED
-
-	_clear_selection();
-	selected_ci_nodes = nodes_ci;
-	has_selection = !nodes_ci.is_empty();
-
-#ifndef _3D_DISABLED
-	if (!nodes_3d.is_empty()) {
-		selected_3d_nodes = nodes_3d;
-		has_selection = true;
-	}
-#endif // _3D_DISABLED
-
-	_queue_selection_update();
-}
-
-void RuntimeNodeSelect::_queue_selection_update() {
-	if (has_selection && selection_visible) {
-		if (SceneTree::get_singleton()->is_suspended()) {
-			_update_selection();
-		} else {
-			selection_update_queued = true;
-		}
-	}
-}
-
-void RuntimeNodeSelect::_update_selection() {
-	RS::get_singleton()->canvas_item_clear(srect_ci);
-	RS::get_singleton()->canvas_item_set_visible(srect_ci, selection_visible);
-
-	for (LocalVector<ObjectID>::Iterator E = selected_ci_nodes.begin(); E != selected_ci_nodes.end(); ++E) {
-		ObjectID id = *E;
-		CanvasItem *ci = ObjectDB::get_instance<CanvasItem>(id);
-		if (!ci) {
-			selected_ci_nodes.erase(id);
-			--E;
-			continue;
-		}
-
-		if (!ci->is_inside_tree()) {
-			continue;
-		}
-
-		Transform2D xform = ci->get_global_transform_with_canvas();
-
-		// Fallback.
-		Rect2 rect = Rect2(Vector2(), Vector2(10, 10));
-
-		if (ci->_edit_use_rect()) {
-			rect = ci->_edit_get_rect();
-		} else {
-#ifndef PHYSICS_2D_DISABLED
-			CollisionShape2D *collision_shape = Object::cast_to<CollisionShape2D>(ci);
-			if (collision_shape) {
-				Ref<Shape2D> shape = collision_shape->get_shape();
-				if (shape.is_valid()) {
-					rect = shape->get_rect();
-				}
-			}
-#endif // PHYSICS_2D_DISABLED
-		}
-
-		const Vector2 endpoints[4] = {
-			xform.xform(rect.position),
-			xform.xform(rect.position + Point2(rect.size.x, 0)),
-			xform.xform(rect.position + rect.size),
-			xform.xform(rect.position + Point2(0, rect.size.y))
-		};
-
-		for (int i = 0; i < 4; i++) {
-			RS::get_singleton()->canvas_item_add_line(srect_ci, endpoints[i], endpoints[(i + 1) % 4], srect_color, sel_2d_scale);
-		}
-	}
-
-#ifndef _3D_DISABLED
-	for (HashMap<ObjectID, Ref<SelectionBox>>::ConstIterator KV = selected_3d_nodes.begin(); KV != selected_3d_nodes.end(); ++KV) {
-		ObjectID id = KV->key;
-		Node3D *node_3d = ObjectDB::get_instance<Node3D>(id);
-		if (!node_3d) {
-			selected_3d_nodes.erase(id);
-			--KV;
-			continue;
-		}
-
-		if (!node_3d->is_inside_tree()) {
-			continue;
-		}
-
-		// Fallback.
-		AABB bounds(Vector3(-0.5, -0.5, -0.5), Vector3(1, 1, 1));
-
-		VisualInstance3D *visual_instance = Object::cast_to<VisualInstance3D>(node_3d);
-		if (visual_instance) {
-			bounds = visual_instance->get_aabb();
-		} else {
-#ifndef PHYSICS_3D_DISABLED
-			CollisionShape3D *collision_shape = Object::cast_to<CollisionShape3D>(node_3d);
-			if (collision_shape) {
-				Ref<Shape3D> shape = collision_shape->get_shape();
-				if (shape.is_valid()) {
-					bounds = shape->get_debug_mesh()->get_aabb();
-				}
-			}
-#endif // PHYSICS_3D_DISABLED
-		}
-
-		Transform3D xform_to_top_level_parent_space = node_3d->get_global_transform().affine_inverse() * node_3d->get_global_transform();
-		bounds = xform_to_top_level_parent_space.xform(bounds);
-		Transform3D t = node_3d->get_global_transform();
-
-		Ref<SelectionBox> sb = KV->value;
-		if (t == sb->transform && bounds == sb->bounds) {
-			continue; // Nothing changed.
-		}
-		sb->transform = t;
-		sb->bounds = bounds;
-
-		Transform3D t_offset = t;
-
-		// Apply AABB scaling before item's global transform.
-		{
-			const Vector3 offset(0.005, 0.005, 0.005);
-			Basis aabb_s;
-			aabb_s.scale(bounds.size + offset);
-			t.translate_local(bounds.position - offset / 2);
-			t.basis = t.basis * aabb_s;
-		}
-		{
-			const Vector3 offset(0.01, 0.01, 0.01);
-			Basis aabb_s;
-			aabb_s.scale(bounds.size + offset);
-			t_offset.translate_local(bounds.position - offset / 2);
-			t_offset.basis = t_offset.basis * aabb_s;
-		}
-
-		RS::get_singleton()->instance_set_visible(sb->instance, selection_visible);
-		RS::get_singleton()->instance_set_visible(sb->instance_ofs, selection_visible);
-		RS::get_singleton()->instance_set_visible(sb->instance_xray, selection_visible);
-		RS::get_singleton()->instance_set_visible(sb->instance_xray_ofs, selection_visible);
-
-		RS::get_singleton()->instance_set_transform(sb->instance, t);
-		RS::get_singleton()->instance_set_transform(sb->instance_ofs, t_offset);
-		RS::get_singleton()->instance_set_transform(sb->instance_xray, t);
-		RS::get_singleton()->instance_set_transform(sb->instance_xray_ofs, t_offset);
-	}
-#endif // _3D_DISABLED
-}
-
-void RuntimeNodeSelect::_clear_selection() {
-	selected_ci_nodes.clear();
-	if (draw_canvas.is_valid()) {
-		RS::get_singleton()->canvas_item_clear(srect_ci);
-	}
-
-#ifndef _3D_DISABLED
-	selected_3d_nodes.clear();
-#endif // _3D_DISABLED
-
-	has_selection = false;
-}
-
-void RuntimeNodeSelect::_update_selection_drag(const Point2 &p_end_pos) {
-	RS::get_singleton()->canvas_item_clear(sel_drag_ci);
-
-	if (selection_drag_state != SELECTION_DRAG_MOVE) {
-		return;
-	}
-
-	selection_drag_area.size = p_end_pos - selection_drag_area.position;
-
-	if (selection_drag_state == SELECTION_DRAG_END) {
-		return;
-	}
-
-	Rect2 selection_drawing = selection_drag_area.abs();
-	int thickness = 1;
-
-	const Vector2 endpoints[4] = {
-		selection_drawing.position,
-		selection_drawing.position + Point2(selection_drawing.size.x, 0),
-		selection_drawing.position + selection_drawing.size,
-		selection_drawing.position + Point2(0, selection_drawing.size.y)
-	};
-
-	// Draw fill.
-	RS::get_singleton()->canvas_item_add_rect(sel_drag_ci, selection_drawing, selection_area_fill);
-	// Draw outline.
-	for (int i = 0; i < 4; i++) {
-		RS::get_singleton()->canvas_item_add_line(sel_drag_ci, endpoints[i], endpoints[(i + 1) % 4], selection_area_outline, thickness);
-	}
-}
-
-void RuntimeNodeSelect::_open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos) {
-	Window *root = SceneTree::get_singleton()->get_root();
-
-	selection_list = memnew(PopupMenu);
-	selection_list->set_theme(ThemeDB::get_singleton()->get_default_theme());
-	selection_list->set_auto_translate_mode(Node::AUTO_TRANSLATE_MODE_DISABLED);
-	selection_list->set_force_native(true);
-	selection_list->connect("index_pressed", callable_mp(this, &RuntimeNodeSelect::_items_popup_index_pressed).bind(selection_list));
-	selection_list->connect("popup_hide", callable_mp(this, &RuntimeNodeSelect::_close_selection_list));
-
-	root->add_child(selection_list);
-
-	for (const SelectResult &I : p_items) {
-		int locked = 0;
-		if (I.item->get_meta("_edit_lock_", false)) {
-			locked = 1;
-		} else {
-			Node *scene = SceneTree::get_singleton()->get_root();
-			Node *node = I.item;
-
-			while (node && node != scene->get_parent()) {
-				if (node->has_meta("_edit_group_")) {
-					locked = 2;
-				}
-				node = node->get_parent();
-			}
-		}
-
-		String suffix;
-		if (locked == 1) {
-			suffix = " (" + RTR("Locked") + ")";
-		} else if (locked == 2) {
-			suffix = " (" + RTR("Grouped") + ")";
-		}
-
-		selection_list->add_item((String)I.item->get_name() + suffix);
-		selection_list->set_item_metadata(-1, I.item);
-	}
-
-	selection_list->set_position(selection_list->is_embedded() ? p_pos : (Input::get_singleton()->get_mouse_position() + root->get_position()));
-	selection_list->reset_size();
-	selection_list->popup();
-
-	selection_list->set_content_scale_factor(1);
-	selection_list->set_min_size(selection_list->get_contents_minimum_size());
-	selection_list->reset_size();
-
-	// FIXME: Ugly hack that stops the popup from hiding when the button is released.
-	selection_list->call_deferred(SNAME("set_position"), selection_list->get_position() + Point2(1, 0));
-}
-
-void RuntimeNodeSelect::_close_selection_list() {
-	selection_list->queue_free();
-	selection_list = nullptr;
-}
-
-void RuntimeNodeSelect::_set_selection_visible(bool p_visible) {
-	selection_visible = p_visible;
-
-	if (has_selection) {
-		_update_selection();
-	}
-}
-
-void RuntimeNodeSelect::_set_avoid_locked(bool p_enabled) {
-	avoid_locked_nodes = p_enabled;
-}
-
-void RuntimeNodeSelect::_set_prefer_group(bool p_enabled) {
-	prefer_group_selection = p_enabled;
-}
-
-// Copied and trimmed from the CanvasItemEditor implementation.
-void RuntimeNodeSelect::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
-	if (!p_node || Object::cast_to<Viewport>(p_node)) {
-		return;
-	}
-
-	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
-	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
-		if (ci) {
-			if (!ci->is_set_as_top_level()) {
-				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
-			} else {
-				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
-			}
-		} else {
-			CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
-			_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
-		}
-	}
-
-	if (!ci || !ci->is_visible_in_tree()) {
-		return;
-	}
-
-	Transform2D xform = p_canvas_xform;
-	if (!ci->is_set_as_top_level()) {
-		xform *= p_parent_xform;
-	}
-
-	Window *root = SceneTree::get_singleton()->get_root();
-	Point2 pos;
-
-	// Cameras don't affect `CanvasLayer`s.
-	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
-		pos = root->get_canvas_transform().affine_inverse().xform(p_pos);
-	} else {
-		pos = p_pos;
-	}
-
-	xform = (xform * ci->get_transform()).affine_inverse();
-	const real_t local_grab_distance = xform.basis_xform(Vector2(sel_2d_grab_dist, 0)).length() / view_2d_zoom;
-	if (ci->_edit_is_selected_on_click(xform.xform(pos), local_grab_distance)) {
-		SelectResult res;
-		res.item = ci;
-		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
-		r_items.push_back(res);
-
-#ifndef PHYSICS_2D_DISABLED
-		// If it's a shape, get the collision object it's from.
-		// FIXME: If the collision object has multiple shapes, only the topmost will be above it in the list.
-		if (Object::cast_to<CollisionShape2D>(ci) || Object::cast_to<CollisionPolygon2D>(ci)) {
-			CollisionObject2D *collision_object = Object::cast_to<CollisionObject2D>(ci->get_parent());
-			if (collision_object) {
-				SelectResult res_col;
-				res_col.item = ci->get_parent();
-				res_col.order = collision_object->get_z_index() + ci->get_canvas_layer();
-				r_items.push_back(res_col);
-			}
-		}
-#endif // PHYSICS_2D_DISABLED
-	}
-}
-
-// Copied and trimmed from the CanvasItemEditor implementation.
-void RuntimeNodeSelect::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
-	if (!p_node || Object::cast_to<Viewport>(p_node)) {
-		return;
-	}
-
-	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
-	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
-		if (ci) {
-			if (!ci->is_set_as_top_level()) {
-				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
-			} else {
-				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
-			}
-		} else {
-			CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
-			_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
-		}
-	}
-
-	if (!ci || !ci->is_visible_in_tree()) {
-		return;
-	}
-
-	Transform2D xform = p_canvas_xform;
-	if (!ci->is_set_as_top_level()) {
-		xform *= p_parent_xform;
-	}
-
-	Window *root = SceneTree::get_singleton()->get_root();
-	Rect2 rect;
-	// Cameras don't affect `CanvasLayer`s.
-	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
-		rect = root->get_canvas_transform().affine_inverse().xform(p_rect);
-	} else {
-		rect = p_rect;
-	}
-	rect = (xform * ci->get_transform()).affine_inverse().xform(rect);
-
-	bool selected = false;
-	if (ci->_edit_use_rect()) {
-		Rect2 ci_rect = ci->_edit_get_rect();
-		if (rect.has_point(ci_rect.position) &&
-				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, 0)) &&
-				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, ci_rect.size.y)) &&
-				rect.has_point(ci_rect.position + Vector2(0, ci_rect.size.y))) {
-			selected = true;
-		}
-	} else if (rect.has_point(Point2())) {
-		selected = true;
-	}
-
-	if (selected) {
-		SelectResult res;
-		res.item = ci;
-		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
-		r_items.push_back(res);
-	}
-}
-
-void RuntimeNodeSelect::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
-	Vector2 scroll = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_scroll_vec);
-	view_2d_offset.x -= scroll.x / view_2d_zoom;
-	view_2d_offset.y -= scroll.y / view_2d_zoom;
-
-	_update_view_2d();
-}
-
-// A very shallow copy of the same function inside CanvasItemEditor.
-void RuntimeNodeSelect::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event) {
-	real_t prev_zoom = view_2d_zoom;
-	view_2d_zoom = CLAMP(view_2d_zoom * p_zoom_factor, VIEW_2D_MIN_ZOOM, VIEW_2D_MAX_ZOOM);
-
-	Vector2 pos = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_origin);
-	view_2d_offset += pos / prev_zoom - pos / view_2d_zoom;
-
-	// We want to align in-scene pixels to screen pixels, this prevents blurry rendering
-	// of small details (texts, lines).
-	// This correction adds a jitter movement when zooming, so we correct only when the
-	// zoom factor is an integer. (in the other cases, all pixels won't be aligned anyway)
-	const real_t closest_zoom_factor = Math::round(view_2d_zoom);
-	if (Math::is_zero_approx(view_2d_zoom - closest_zoom_factor)) {
-		// Make sure scene pixel at view_offset is aligned on a screen pixel.
-		Vector2 view_offset_int = view_2d_offset.floor();
-		Vector2 view_offset_frac = view_2d_offset - view_offset_int;
-		view_2d_offset = view_offset_int + (view_offset_frac * closest_zoom_factor).round() / closest_zoom_factor;
-	}
-
-	_update_view_2d();
-}
-
-void RuntimeNodeSelect::_reset_camera_2d() {
-	camera_first_override = true;
-	Window *root = SceneTree::get_singleton()->get_root();
-	Camera2D *game_camera = root->is_camera_2d_override_enabled() ? root->get_overridden_camera_2d() : root->get_camera_2d();
-	if (game_camera) {
-		// Ideally we should be using Camera2D::get_camera_transform() but it's not so this hack will have to do for now.
-		view_2d_offset = game_camera->get_camera_screen_center() - (0.5 * root->get_visible_rect().size);
-	} else {
-		view_2d_offset = Vector2();
-	}
-
-	view_2d_zoom = 1;
-
-	if (root->is_camera_2d_override_enabled()) {
-		_update_view_2d();
-	}
-}
-
-void RuntimeNodeSelect::_update_view_2d() {
-	Window *root = SceneTree::get_singleton()->get_root();
-	ERR_FAIL_COND(!root->is_camera_2d_override_enabled());
-
-	Camera2D *override_camera = root->get_override_camera_2d();
-	override_camera->set_anchor_mode(Camera2D::ANCHOR_MODE_FIXED_TOP_LEFT);
-	override_camera->set_zoom(Vector2(view_2d_zoom, view_2d_zoom));
-	override_camera->set_offset(view_2d_offset);
-
-	_queue_selection_update();
-}
-
-#ifndef _3D_DISABLED
-
-void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items) {
-	Window *root = SceneTree::get_singleton()->get_root();
-
-	Vector3 ray, pos, to;
-	Camera3D *camera = root->get_camera_3d();
-	if (!camera) {
-		return;
-	}
-
-	ray = camera->project_ray_normal(p_pos);
-	pos = camera->project_ray_origin(p_pos);
-	to = pos + ray * camera->get_far();
-
-#ifndef PHYSICS_3D_DISABLED
-	// Start with physical objects.
-	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
-	PhysicsDirectSpaceState3D::RayResult result;
-	HashSet<RID> excluded;
-	PhysicsDirectSpaceState3D::RayParameters ray_params;
-	ray_params.from = pos;
-	ray_params.to = to;
-	ray_params.collide_with_areas = true;
-	while (true) {
-		ray_params.exclude = excluded;
-		if (ss->intersect_ray(ray_params, result)) {
-			SelectResult res;
-			res.item = Object::cast_to<Node>(result.collider);
-			res.order = -pos.distance_to(result.position);
-
-			// Fetch collision shapes.
-			CollisionObject3D *collision = Object::cast_to<CollisionObject3D>(result.collider);
-			if (collision) {
-				List<uint32_t> owners;
-				collision->get_shape_owners(&owners);
-				for (uint32_t &I : owners) {
-					SelectResult res_shape;
-					res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
-					res_shape.order = res.order;
-					r_items.push_back(res_shape);
-				}
-			}
-
-			r_items.push_back(res);
-
-			excluded.insert(result.rid);
-		} else {
-			break;
-		}
-	}
-#endif // PHYSICS_3D_DISABLED
-
-	// Then go for the meshes.
-	Vector<ObjectID> items = RS::get_singleton()->instances_cull_ray(pos, to, root->get_world_3d()->get_scenario());
-	for (int i = 0; i < items.size(); i++) {
-		Object *obj = ObjectDB::get_instance(items[i]);
-
-		GeometryInstance3D *geo_instance = Object::cast_to<GeometryInstance3D>(obj);
-		if (geo_instance) {
-			Ref<TriangleMesh> mesh_collision = geo_instance->generate_triangle_mesh();
-
-			if (mesh_collision.is_valid()) {
-				Transform3D gt = geo_instance->get_global_transform();
-				Transform3D ai = gt.affine_inverse();
-				Vector3 point, normal;
-				if (mesh_collision->intersect_ray(ai.xform(pos), ai.basis.xform(ray).normalized(), point, normal)) {
-					SelectResult res;
-					res.item = Object::cast_to<Node>(obj);
-					res.order = -pos.distance_to(gt.xform(point));
-					r_items.push_back(res);
-
-					continue;
-				}
-			}
-		}
-
-		items.remove_at(i);
-		i--;
-	}
-}
-
-void RuntimeNodeSelect::_find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items) {
-	Window *root = SceneTree::get_singleton()->get_root();
-	Camera3D *camera = root->get_camera_3d();
-	if (!camera) {
-		return;
-	}
-
-	Vector3 cam_pos = camera->get_global_position();
-	Vector3 dist_pos = camera->project_ray_origin(p_rect.position + p_rect.size / 2);
-
-	real_t znear = camera->get_near();
-	real_t zfar = camera->get_far();
-	real_t zofs = MAX(0.0, 5.0 - znear);
-
-	const Point2 pos_end = p_rect.position + p_rect.size;
-	Vector3 box[4] = {
-		Vector3(
-				MIN(p_rect.position.x, pos_end.x),
-				MIN(p_rect.position.y, pos_end.y),
-				zofs),
-		Vector3(
-				MAX(p_rect.position.x, pos_end.x),
-				MIN(p_rect.position.y, pos_end.y),
-				zofs),
-		Vector3(
-				MAX(p_rect.position.x, pos_end.x),
-				MAX(p_rect.position.y, pos_end.y),
-				zofs),
-		Vector3(
-				MIN(p_rect.position.x, pos_end.x),
-				MAX(p_rect.position.y, pos_end.y),
-				zofs)
-	};
-
-	Vector<Plane> frustum;
-	for (int i = 0; i < 4; i++) {
-		Vector3 a = _get_screen_to_space(box[i]);
-		Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
-		frustum.push_back(Plane(a, b, cam_pos));
-	}
-
-	// Get the camera normal.
-	Plane near_plane = Plane(camera->get_global_transform().basis.get_column(2), cam_pos);
-
-	near_plane.d -= znear;
-	frustum.push_back(near_plane);
-
-	Plane far_plane = -near_plane;
-	far_plane.d += zfar;
-	frustum.push_back(far_plane);
-
-	// Keep track of the currently listed nodes, so repeats can be ignored.
-	HashSet<Node *> node_list;
-
-#ifndef PHYSICS_3D_DISABLED
-	Vector<Vector3> points = Geometry3D::compute_convex_mesh_points(&frustum[0], frustum.size());
-	Ref<ConvexPolygonShape3D> shape;
-	shape.instantiate();
-	shape->set_points(points);
-
-	// Start with physical objects.
-	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
-	PhysicsDirectSpaceState3D::ShapeResult results[32];
-	PhysicsDirectSpaceState3D::ShapeParameters shape_params;
-	shape_params.shape_rid = shape->get_rid();
-	shape_params.collide_with_areas = true;
-	const int num_hits = ss->intersect_shape(shape_params, results, 32);
-	for (int i = 0; i < num_hits; i++) {
-		const PhysicsDirectSpaceState3D::ShapeResult &result = results[i];
-		SelectResult res;
-		res.item = Object::cast_to<Node>(result.collider);
-		res.order = -dist_pos.distance_to(Object::cast_to<Node3D>(res.item)->get_global_transform().origin);
-
-		// Fetch collision shapes.
-		CollisionObject3D *collision = Object::cast_to<CollisionObject3D>(result.collider);
-		if (collision) {
-			List<uint32_t> owners;
-			collision->get_shape_owners(&owners);
-			for (uint32_t &I : owners) {
-				SelectResult res_shape;
-				res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
-				if (!node_list.has(res_shape.item)) {
-					node_list.insert(res_shape.item);
-					res_shape.order = res.order;
-					r_items.push_back(res_shape);
-				}
-			}
-		}
-
-		if (!node_list.has(res.item)) {
-			node_list.insert(res.item);
-			r_items.push_back(res);
-		}
-	}
-#endif // PHYSICS_3D_DISABLED
-
-	// Then go for the meshes.
-	Vector<ObjectID> items = RS::get_singleton()->instances_cull_convex(frustum, root->get_world_3d()->get_scenario());
-	for (int i = 0; i < items.size(); i++) {
-		Object *obj = ObjectDB::get_instance(items[i]);
-		GeometryInstance3D *geo_instance = Object::cast_to<GeometryInstance3D>(obj);
-		if (geo_instance) {
-			Ref<TriangleMesh> mesh_collision = geo_instance->generate_triangle_mesh();
-
-			if (mesh_collision.is_valid()) {
-				Transform3D gt = geo_instance->get_global_transform();
-				Vector3 mesh_scale = gt.get_basis().get_scale();
-				gt.orthonormalize();
-
-				Transform3D it = gt.affine_inverse();
-
-				Vector<Plane> transformed_frustum;
-				int plane_count = frustum.size();
-				transformed_frustum.resize(plane_count);
-
-				for (int j = 0; j < plane_count; j++) {
-					transformed_frustum.write[j] = it.xform(frustum[j]);
-				}
-				Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count);
-				if (mesh_collision->inside_convex_shape(transformed_frustum.ptr(), transformed_frustum.size(), convex_points.ptr(), convex_points.size(), mesh_scale)) {
-					SelectResult res;
-					res.item = Object::cast_to<Node>(obj);
-					if (!node_list.has(res.item)) {
-						node_list.insert(res.item);
-						res.order = -dist_pos.distance_to(gt.origin);
-						r_items.push_back(res);
-					}
-
-					continue;
-				}
-			}
-		}
-
-		items.remove_at(i);
-		i--;
-	}
-}
-
-Vector3 RuntimeNodeSelect::_get_screen_to_space(const Vector3 &p_vector3) {
-	Window *root = SceneTree::get_singleton()->get_root();
-	Camera3D *camera = root->get_camera_3d();
-
-	Transform3D camera_transform = camera->get_camera_transform();
-	Size2 size = root->get_size();
-	real_t znear = camera->get_near();
-	Projection cm = Projection::create_perspective(camera->get_fov(), size.aspect(), znear + p_vector3.z, camera->get_far());
-	Vector2 screen_he = cm.get_viewport_half_extents();
-	return camera_transform.xform(Vector3(((p_vector3.x / size.width) * 2.0 - 1.0) * screen_he.x, ((1.0 - (p_vector3.y / size.height)) * 2.0 - 1.0) * screen_he.y, -(znear + p_vector3.z)));
-}
-
-void RuntimeNodeSelect::_fov_scaled() {
-	SceneTree::get_singleton()->get_root()->get_override_camera_3d()->set_perspective(camera_fov * view_3d_controller->cursor.fov_scale, camera_znear, camera_zfar);
-}
-
-void RuntimeNodeSelect::_cursor_interpolated() {
-	Window *root = SceneTree::get_singleton()->get_root();
-	ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
-	root->get_override_camera_3d()->set_transform(view_3d_controller->interp_to_camera_transform());
-}
-
-bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
-	Window *root = SceneTree::get_singleton()->get_root();
-	ERR_FAIL_COND_V(!root->is_camera_3d_override_enabled(), true);
-
-	Input *input = Input::get_singleton();
-	bool was_input_disabled = input->is_input_disabled();
-	if (was_input_disabled) {
-		input->set_disable_input(false);
-	}
-
-	// Reduce all sides of the area by 1, so warping works when windows are maximized/fullscreen.
-	bool view_3d_input_received = view_3d_controller->gui_input(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
-
-	if (was_input_disabled) {
-		input->set_disable_input(true);
-	}
-
-	if (view_3d_input_received) {
-		root->get_override_camera_3d()->set_transform(view_3d_controller->interp_to_camera_transform());
-		return true;
-	}
-
-	Ref<InputEventMouseButton> b = p_event;
-	if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT) {
-		view_3d_controller->set_freelook_enabled(b->is_pressed());
-		return true;
-	}
-
-	Ref<InputEventKey> k = p_event;
-	if (k.is_valid() && k->get_physical_keycode() == Key::ESCAPE) {
-		view_3d_controller->set_freelook_enabled(false);
-		return true;
-	}
-
-	return false;
-}
-
-void RuntimeNodeSelect::_reset_camera_3d() {
-	camera_first_override = true;
-
-	View3DController::Cursor cursor;
-
-	Window *root = SceneTree::get_singleton()->get_root();
-	Camera3D *game_camera = root->is_camera_3d_override_enabled() ? root->get_overridden_camera_3d() : root->get_camera_3d();
-	if (game_camera) {
-		Transform3D transform = game_camera->get_camera_transform();
-		transform.translate_local(0, 0, -cursor.distance);
-		cursor.pos = transform.origin;
-
-		cursor.x_rot = -game_camera->get_global_rotation().x;
-		cursor.y_rot = -game_camera->get_global_rotation().y;
-		cursor.unsnapped_x_rot = cursor.x_rot;
-		cursor.unsnapped_y_rot = cursor.y_rot;
-
-		cursor.fov_scale = CLAMP(game_camera->get_fov() / camera_fov, View3DControllerConsts::CAMERA_MIN_FOV_SCALE, View3DControllerConsts::CAMERA_MAX_FOV_SCALE);
-	}
-
-	view_3d_controller->cursor = cursor;
-
-	if (root->is_camera_3d_override_enabled()) {
-		view_3d_controller->update_camera();
-		Camera3D *override_camera = root->get_override_camera_3d();
-		override_camera->set_transform(view_3d_controller->to_camera_transform());
-		override_camera->set_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
-	}
-}
-
-RuntimeNodeSelect::SelectionBox::~SelectionBox() {
-	if (instance.is_valid()) {
-		RS::get_singleton()->free_rid(instance);
-		RS::get_singleton()->free_rid(instance_ofs);
-		RS::get_singleton()->free_rid(instance_xray);
-		RS::get_singleton()->free_rid(instance_xray_ofs);
-	}
-}
-
-#endif // _3D_DISABLED
-
-#endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/runtime_node_select.h b/engine/scene/debugger/runtime_node_select.h
deleted file mode 100644
index 67cadf6c..00000000
--- a/engine/scene/debugger/runtime_node_select.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/**************************************************************************/
-/*  runtime_node_select.h                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#ifdef DEBUG_ENABLED
-
-#include "core/object/ref_counted.h"
-
-#ifndef _3D_DISABLED
-#include "scene/debugger/view_3d_controller.h"
-#include "scene/resources/mesh.h"
-#endif // _3D_DISABLED
-
-class InputEvent;
-class InputEventMouseMotion;
-class InputEventWithModifiers;
-class Node;
-class PopupMenu;
-class ViewPanner;
-
-#ifndef _3D_DISABLED
-class ArrayMesh;
-#endif
-
-class RuntimeNodeSelect : public Object {
-	GDCLASS(RuntimeNodeSelect, Object);
-
-public:
-	enum NodeType {
-		NODE_TYPE_NONE,
-		NODE_TYPE_2D,
-		NODE_TYPE_3D,
-		NODE_TYPE_MAX,
-	};
-
-	enum SelectMode {
-		SELECT_MODE_SINGLE,
-		SELECT_MODE_LIST,
-		SELECT_MODE_MAX,
-	};
-
-private:
-	friend class SceneDebugger;
-
-	NodeType node_select_type = NODE_TYPE_2D;
-	SelectMode node_select_mode = SELECT_MODE_SINGLE;
-
-	struct SelectResult {
-		Node *item = nullptr;
-		real_t order = 0;
-		_FORCE_INLINE_ bool operator<(const SelectResult &p_rr) const { return p_rr.order < order; }
-	};
-
-	const int SELECTION_MIN_AREA = 8 * 8;
-	enum SelectionDragState {
-		SELECTION_DRAG_NONE,
-		SELECTION_DRAG_MOVE,
-		SELECTION_DRAG_END,
-	};
-	SelectionDragState selection_drag_state = SELECTION_DRAG_NONE;
-
-	bool has_selection = false;
-	int max_selection = 1;
-	Point2 selection_position = Point2(Math::INF, Math::INF);
-	Rect2 selection_drag_area;
-	PopupMenu *selection_list = nullptr;
-	Color selection_area_fill;
-	Color selection_area_outline;
-	bool selection_visible = true;
-	bool selection_update_queued = false;
-
-	bool avoid_locked_nodes = false;
-	bool prefer_group_selection = false;
-
-	bool multi_shortcut_pressed = false;
-	bool list_shortcut_pressed = false;
-	RID draw_canvas;
-	RID sel_drag_ci;
-
-	bool camera_override = false;
-	bool camera_first_override = true;
-
-	// Values taken from EditorZoomWidget.
-	const float VIEW_2D_MIN_ZOOM = 1.0 / 128;
-	const float VIEW_2D_MAX_ZOOM = 128;
-
-	Ref<ViewPanner> panner;
-	Vector2 view_2d_offset;
-	real_t view_2d_zoom = 1.0;
-	bool warped_panning = false;
-
-	LocalVector<ObjectID> selected_ci_nodes;
-	real_t sel_2d_grab_dist = 0;
-	int sel_2d_scale = 1;
-
-	Color srect_color;
-	RID srect_ci;
-
-#ifndef _3D_DISABLED
-	Ref<View3DController> view_3d_controller;
-
-	real_t camera_fov = 0;
-	real_t camera_znear = 0;
-	real_t camera_zfar = 0;
-
-	struct SelectionBox : public RefCounted {
-		RID instance;
-		RID instance_ofs;
-		RID instance_xray;
-		RID instance_xray_ofs;
-
-		Transform3D transform;
-		AABB bounds;
-
-		~SelectionBox();
-	};
-	HashMap<ObjectID, Ref<SelectionBox>> selected_3d_nodes;
-
-	Color sbox_color;
-	Ref<ArrayMesh> sbox_mesh;
-	Ref<ArrayMesh> sbox_mesh_xray;
-#endif // _3D_DISABLED
-
-	void _setup(const Dictionary &p_settings);
-
-	void _node_set_type(NodeType p_type);
-	void _select_set_mode(SelectMode p_mode);
-
-	void _set_camera_override_enabled(bool p_enabled);
-
-	void _root_window_input(const Ref<InputEvent> &p_event);
-	void _items_popup_index_pressed(int p_index, PopupMenu *p_popup);
-	void _update_input_state();
-
-	void _process_frame();
-	void _physics_frame();
-
-	void _send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections = true);
-	void _set_selected_nodes(const Vector<Node *> &p_nodes);
-	void _queue_selection_update();
-	void _update_selection();
-	void _clear_selection();
-	void _update_selection_drag(const Point2 &p_end_pos = Point2());
-	void _set_selection_visible(bool p_visible);
-	void _set_avoid_locked(bool p_enabled);
-	void _set_prefer_group(bool p_enabled);
-
-	void _open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos);
-	void _close_selection_list();
-
-	void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
-	void _find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
-	void _pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event);
-	void _zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event);
-	void _reset_camera_2d();
-	void _update_view_2d();
-
-#ifndef _3D_DISABLED
-	void _find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items);
-	void _find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items);
-	Vector3 _get_screen_to_space(const Vector3 &p_vector3);
-
-	void _fov_scaled();
-	void _cursor_interpolated();
-
-	bool _handle_3d_input(const Ref<InputEvent> &p_event);
-	void _reset_camera_3d();
-#endif // _3D_DISABLED
-
-	RuntimeNodeSelect() { singleton = this; }
-
-	inline static RuntimeNodeSelect *singleton = nullptr;
-
-public:
-	static RuntimeNodeSelect *get_singleton();
-
-	~RuntimeNodeSelect();
-};
-#endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/scene_debugger.cpp b/engine/scene/debugger/scene_debugger.cpp
index d725282c..334b7223 100644
--- a/engine/scene/debugger/scene_debugger.cpp
+++ b/engine/scene/debugger/scene_debugger.cpp
@@ -30,37 +30,42 @@
 
 #include "scene_debugger.h"
 
-#include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
-#include "core/input/input.h"
-#include "core/input/shortcut.h"
 #include "core/io/dir_access.h"
+#include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/math_fieldwise.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
+#include "core/object/script_language.h"
 #include "core/os/time.h"
 #include "core/templates/local_vector.h"
-#include "core/variant/array.h"
 #include "scene/2d/camera_2d.h"
-#include "scene/debugger/scene_debugger_object.h"
-#include "scene/main/node.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/main/canvas_layer.h"
 #include "scene/main/scene_tree.h"
-#include "scene/main/window.h" // SceneTree:get_root()
+#include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
+#include "scene/theme/theme_db.h"
 #include "servers/audio/audio_server.h"
-#include "servers/rendering/rendering_server.h"
+
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/collision_object_2d.h"
+#include "scene/2d/physics/collision_polygon_2d.h"
+#include "scene/2d/physics/collision_shape_2d.h"
+#endif // PHYSICS_2D_DISABLED
 
 #ifndef _3D_DISABLED
 #include "scene/3d/camera_3d.h"
-#endif
-
-#ifdef DEBUG_ENABLED
-#include "scene/debugger/runtime_node_select.h"
-#endif
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/3d/physics/collision_object_3d.h"
+#include "scene/3d/physics/collision_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
+#include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/surface_tool.h"
+#endif // _3D_DISABLED
 
 SceneDebugger::SceneDebugger() {
 	singleton = this;
@@ -70,7 +75,7 @@ SceneDebugger::SceneDebugger() {
 	RuntimeNodeSelect::singleton = memnew(RuntimeNodeSelect);
 
 	EngineDebugger::register_message_capture("scene", EngineDebugger::Capture(nullptr, SceneDebugger::parse_message));
-#endif
+#endif // DEBUG_ENABLED
 }
 
 SceneDebugger::~SceneDebugger() {
@@ -508,17 +513,6 @@ Error SceneDebugger::_msg_rq_screenshot(const Array &p_args) {
 	return OK;
 }
 
-Error SceneDebugger::_msg_report_window_focused(const Array &p_args) {
-	ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
-
-	bool focused = p_args[0];
-	Input::get_singleton()->embedder_focused = focused;
-	if (Input::get_singleton()->_should_ignore_joypad_events()) {
-		Input::get_singleton()->release_pressed_events();
-	}
-	return OK;
-}
-
 // endregion
 
 HashMap<String, SceneDebugger::ParseMessageFunc> SceneDebugger::message_handlers;
@@ -595,7 +589,6 @@ void SceneDebugger::_init_message_handlers() {
 	message_handlers["runtime_node_select_reset_camera_3d"] = _msg_runtime_node_select_reset_camera_3d;
 #endif
 	message_handlers["rq_screenshot"] = _msg_rq_screenshot;
-	message_handlers["report_window_focused"] = _msg_report_window_focused;
 }
 
 void SceneDebugger::_save_node(ObjectID id, const String &p_path) {
@@ -766,6 +759,286 @@ SceneDebuggerObject::SceneDebuggerObject(ObjectID p_id) :
 		SceneDebuggerObject(ObjectDB::get_instance(p_id)) {
 }
 
+/// SceneDebuggerObject
+SceneDebuggerObject::SceneDebuggerObject(Object *p_obj) {
+	if (!p_obj) {
+		return;
+	}
+
+	id = p_obj->get_instance_id();
+	class_name = p_obj->get_class();
+
+	if (ScriptInstance *si = p_obj->get_script_instance()) {
+		// Read script instance constants and variables.
+		if (!si->get_script().is_null()) {
+			Script *s = si->get_script().ptr();
+			_parse_script_properties(s, si);
+		}
+	}
+
+	if (Node *node = Object::cast_to<Node>(p_obj)) {
+		// For debugging multiplayer.
+		{
+			PropertyInfo pi(Variant::INT, String("Node/multiplayer_authority"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY);
+			properties.push_back(SceneDebuggerProperty(pi, node->get_multiplayer_authority()));
+		}
+
+		// Add specialized NodePath info (if inside tree).
+		if (node->is_inside_tree()) {
+			PropertyInfo pi(Variant::NODE_PATH, String("Node/path"));
+			properties.push_back(SceneDebuggerProperty(pi, node->get_path()));
+		} else { // Can't ask for path if a node is not in tree.
+			PropertyInfo pi(Variant::STRING, String("Node/path"));
+			properties.push_back(SceneDebuggerProperty(pi, "[Orphan]"));
+		}
+	} else if (Script *s = Object::cast_to<Script>(p_obj)) {
+		// Add script constants (no instance).
+		_parse_script_properties(s, nullptr);
+	}
+
+	// Add base object properties.
+	List<PropertyInfo> pinfo;
+	p_obj->get_property_list(&pinfo, true);
+	for (const PropertyInfo &E : pinfo) {
+		if (E.usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) {
+			properties.push_back(SceneDebuggerProperty(E, p_obj->get(E.name)));
+		}
+	}
+}
+
+void SceneDebuggerObject::_parse_script_properties(Script *p_script, ScriptInstance *p_instance) {
+	typedef HashMap<const Script *, HashSet<StringName>> ScriptMemberMap;
+	typedef HashMap<const Script *, HashMap<StringName, Variant>> ScriptConstantsMap;
+
+	ScriptMemberMap members;
+	if (p_instance) {
+		members[p_script] = HashSet<StringName>();
+		p_script->get_members(&(members[p_script]));
+	}
+
+	ScriptConstantsMap constants;
+	constants[p_script] = HashMap<StringName, Variant>();
+	p_script->get_constants(&(constants[p_script]));
+
+	Ref<Script> base = p_script->get_base_script();
+	while (base.is_valid()) {
+		if (p_instance) {
+			members[base.ptr()] = HashSet<StringName>();
+			base->get_members(&(members[base.ptr()]));
+		}
+
+		constants[base.ptr()] = HashMap<StringName, Variant>();
+		base->get_constants(&(constants[base.ptr()]));
+
+		base = base->get_base_script();
+	}
+
+	HashSet<String> exported_members;
+
+	if (p_instance) {
+		List<PropertyInfo> pinfo;
+		p_instance->get_property_list(&pinfo);
+		for (const PropertyInfo &E : pinfo) {
+			if (E.usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) {
+				exported_members.insert(E.name);
+			}
+		}
+	}
+
+	// Members
+	for (KeyValue<const Script *, HashSet<StringName>> sm : members) {
+		for (const StringName &E : sm.value) {
+			if (exported_members.has(E)) {
+				continue; // Exported variables already show up in the inspector.
+			}
+			if (String(E).begins_with("@")) {
+				continue; // Skip groups.
+			}
+
+			Variant m;
+			if (p_instance->get(E, m)) {
+				String script_path = sm.key == p_script ? "" : sm.key->get_path().get_file() + "/";
+				PropertyInfo pi(m.get_type(), "Members/" + script_path + E);
+				properties.push_back(SceneDebuggerProperty(pi, m));
+			}
+		}
+	}
+	// Constants
+	for (KeyValue<const Script *, HashMap<StringName, Variant>> &sc : constants) {
+		for (const KeyValue<StringName, Variant> &E : sc.value) {
+			String script_path = sc.key == p_script ? "" : sc.key->get_path().get_file() + "/";
+			if (E.value.get_type() == Variant::OBJECT) {
+				Variant inst_id = ((Object *)E.value)->get_instance_id();
+				PropertyInfo pi(inst_id.get_type(), "Constants/" + E.key, PROPERTY_HINT_OBJECT_ID, "Object");
+				properties.push_back(SceneDebuggerProperty(pi, inst_id));
+			} else {
+				PropertyInfo pi(E.value.get_type(), "Constants/" + script_path + E.key);
+				properties.push_back(SceneDebuggerProperty(pi, E.value));
+			}
+		}
+	}
+}
+
+void SceneDebuggerObject::serialize(Array &r_arr, int p_max_size) {
+	Array send_props;
+	for (SceneDebuggerProperty &property : properties) {
+		const PropertyInfo &pi = property.first;
+		Variant &var = property.second;
+
+		Ref<Resource> res = var;
+
+		Array prop = { pi.name, pi.type };
+		PropertyHint hint = pi.hint;
+		String hint_string = pi.hint_string;
+		if (res.is_valid() && !res->get_path().is_empty()) {
+			var = res->get_path();
+		} else { //only send information that can be sent..
+			int len = 0; //test how big is this to encode
+			encode_variant(var, nullptr, len);
+			if (len > p_max_size) { //limit to max size
+				hint = PROPERTY_HINT_OBJECT_TOO_BIG;
+				hint_string = "";
+				var = Variant();
+			}
+		}
+		prop.push_back(hint);
+		prop.push_back(hint_string);
+		prop.push_back(pi.usage);
+		prop.push_back(var);
+		send_props.push_back(prop);
+	}
+	r_arr.push_back(uint64_t(id));
+	r_arr.push_back(class_name);
+	r_arr.push_back(send_props);
+}
+
+void SceneDebuggerObject::deserialize(const Array &p_arr) {
+#define CHECK_TYPE(p_what, p_type) ERR_FAIL_COND(p_what.get_type() != Variant::p_type);
+	ERR_FAIL_COND(p_arr.size() < 3);
+	CHECK_TYPE(p_arr[0], INT);
+	CHECK_TYPE(p_arr[1], STRING);
+	CHECK_TYPE(p_arr[2], ARRAY);
+
+	deserialize(uint64_t(p_arr[0]), p_arr[1], p_arr[2]);
+}
+
+void SceneDebuggerObject::deserialize(uint64_t p_id, const String &p_class_name, const Array &p_props) {
+	id = p_id;
+	class_name = p_class_name;
+
+	for (int i = 0; i < p_props.size(); i++) {
+		CHECK_TYPE(p_props[i], ARRAY);
+		Array prop = p_props[i];
+
+		ERR_FAIL_COND(prop.size() != 6);
+		CHECK_TYPE(prop[0], STRING);
+		CHECK_TYPE(prop[1], INT);
+		CHECK_TYPE(prop[2], INT);
+		CHECK_TYPE(prop[3], STRING);
+		CHECK_TYPE(prop[4], INT);
+
+		PropertyInfo pinfo;
+		pinfo.name = prop[0];
+		pinfo.type = Variant::Type(int(prop[1]));
+		pinfo.hint = PropertyHint(int(prop[2]));
+		pinfo.hint_string = prop[3];
+		pinfo.usage = PropertyUsageFlags(int(prop[4]));
+		Variant var = prop[5];
+
+		if (pinfo.type == Variant::OBJECT) {
+			if (var.is_zero()) {
+				var = Ref<Resource>();
+			} else if (var.get_type() == Variant::OBJECT) {
+				if (((Object *)var)->is_class("EncodedObjectAsID")) {
+					var = Object::cast_to<EncodedObjectAsID>(var)->get_object_id();
+					pinfo.type = var.get_type();
+					pinfo.hint = PROPERTY_HINT_OBJECT_ID;
+					pinfo.hint_string = "Object";
+				}
+			}
+		}
+		properties.push_back(SceneDebuggerProperty(pinfo, var));
+	}
+}
+
+/// SceneDebuggerTree
+SceneDebuggerTree::SceneDebuggerTree(Node *p_root) {
+	// Flatten tree into list, depth first, use stack to avoid recursion.
+	List<Node *> stack;
+	stack.push_back(p_root);
+	bool is_root = true;
+	const StringName &is_visible_sn = SNAME("is_visible");
+	const StringName &is_visible_in_tree_sn = SNAME("is_visible_in_tree");
+	while (stack.size()) {
+		Node *n = stack.front()->get();
+		stack.pop_front();
+
+		int count = n->get_child_count();
+		for (int i = 0; i < count; i++) {
+			stack.push_front(n->get_child(count - i - 1));
+		}
+
+		int view_flags = 0;
+		if (is_root) {
+			// Prevent root window visibility from being changed.
+			is_root = false;
+		} else if (n->has_method(is_visible_sn)) {
+			const Variant visible = n->call(is_visible_sn);
+			if (visible.get_type() == Variant::BOOL) {
+				view_flags = RemoteNode::VIEW_HAS_VISIBLE_METHOD;
+				view_flags |= uint8_t(visible) * RemoteNode::VIEW_VISIBLE;
+			}
+			if (n->has_method(is_visible_in_tree_sn)) {
+				const Variant visible_in_tree = n->call(is_visible_in_tree_sn);
+				if (visible_in_tree.get_type() == Variant::BOOL) {
+					view_flags |= uint8_t(visible_in_tree) * RemoteNode::VIEW_VISIBLE_IN_TREE;
+				}
+			}
+		}
+
+		String class_name;
+		ScriptInstance *script_instance = n->get_script_instance();
+		if (script_instance) {
+			Ref<Script> script = script_instance->get_script();
+			if (script.is_valid()) {
+				class_name = script->get_global_name();
+
+				if (class_name.is_empty()) {
+					// If there is no class_name in this script we just take the script path.
+					class_name = script->get_path();
+				}
+			}
+		}
+		nodes.push_back(RemoteNode(count, n->get_name(), class_name.is_empty() ? n->get_class() : class_name, n->get_instance_id(), n->get_scene_file_path(), view_flags));
+	}
+}
+
+void SceneDebuggerTree::serialize(Array &p_arr) {
+	for (const RemoteNode &n : nodes) {
+		p_arr.push_back(n.child_count);
+		p_arr.push_back(n.name);
+		p_arr.push_back(n.type_name);
+		p_arr.push_back(n.id);
+		p_arr.push_back(n.scene_file_path);
+		p_arr.push_back(n.view_flags);
+	}
+}
+
+void SceneDebuggerTree::deserialize(const Array &p_arr) {
+	int idx = 0;
+	while (p_arr.size() > idx) {
+		ERR_FAIL_COND(p_arr.size() < 6);
+		CHECK_TYPE(p_arr[idx], INT); // child_count.
+		CHECK_TYPE(p_arr[idx + 1], STRING); // name.
+		CHECK_TYPE(p_arr[idx + 2], STRING); // type_name.
+		CHECK_TYPE(p_arr[idx + 3], INT); // id.
+		CHECK_TYPE(p_arr[idx + 4], STRING); // scene_file_path.
+		CHECK_TYPE(p_arr[idx + 5], INT); // view_flags.
+		nodes.push_back(RemoteNode(p_arr[idx], p_arr[idx + 1], p_arr[idx + 2], p_arr[idx + 3], p_arr[idx + 4], p_arr[idx + 5]));
+		idx += 6;
+	}
+}
+
 /// LiveEditor
 LiveEditor *LiveEditor::get_singleton() {
 	return singleton;
@@ -1269,4 +1542,1577 @@ void LiveEditor::_reparent_node_func(const NodePath &p_at, const NodePath &p_new
 		}
 	}
 }
+
+/// RuntimeNodeSelect
+RuntimeNodeSelect *RuntimeNodeSelect::get_singleton() {
+	return singleton;
+}
+
+RuntimeNodeSelect::~RuntimeNodeSelect() {
+	if (selection_list && !selection_list->is_visible()) {
+		memdelete(selection_list);
+	}
+
+	if (draw_canvas.is_valid()) {
+		RS::get_singleton()->free_rid(sel_drag_ci);
+		RS::get_singleton()->free_rid(sbox_2d_ci);
+		RS::get_singleton()->free_rid(draw_canvas);
+	}
+}
+
+void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	ERR_FAIL_COND(root->is_connected(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input)));
+
+	root->connect(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input));
+	root->connect("size_changed", callable_mp(this, &RuntimeNodeSelect::_queue_selection_update), CONNECT_DEFERRED);
+
+	max_selection = p_settings.get("debugger/max_node_selection", 1);
+
+	panner.instantiate();
+	panner->set_callbacks(callable_mp(this, &RuntimeNodeSelect::_pan_callback), callable_mp(this, &RuntimeNodeSelect::_zoom_callback));
+
+	ViewPanner::ControlScheme panning_scheme = (ViewPanner::ControlScheme)p_settings.get("editors/panning/2d_editor_panning_scheme", 0).operator int();
+	bool simple_panning = p_settings.get("editors/panning/simple_panning", false);
+	int pan_speed = p_settings.get("editors/panning/2d_editor_pan_speed", 20);
+	Array keys = p_settings.get("canvas_item_editor/pan_view", Array()).operator Array();
+	panner->setup(panning_scheme, DebuggerMarshalls::deserialize_key_shortcut(keys), simple_panning);
+	panner->setup_warped_panning(root, p_settings.get("editors/panning/warped_mouse_panning", true));
+	panner->set_scroll_speed(pan_speed);
+
+	sel_2d_grab_dist = p_settings.get("editors/polygon_editor/point_grab_radius", 0);
+	sel_2d_scale = MAX(1, Math::ceil(2.0 / (float)GLOBAL_GET("display/window/stretch/scale")));
+
+	selection_area_fill = p_settings.get("box_selection_fill_color", Color());
+	selection_area_outline = p_settings.get("box_selection_stroke_color", Color());
+
+	draw_canvas = RS::get_singleton()->canvas_create();
+	sel_drag_ci = RS::get_singleton()->canvas_item_create();
+
+	/// 2D Selection Box Generation
+
+	sbox_2d_ci = RS::get_singleton()->canvas_item_create();
+	RS::get_singleton()->viewport_attach_canvas(root->get_viewport_rid(), draw_canvas);
+	RS::get_singleton()->canvas_item_set_parent(sel_drag_ci, draw_canvas);
+	RS::get_singleton()->canvas_item_set_parent(sbox_2d_ci, draw_canvas);
+
+#ifndef _3D_DISABLED
+	cursor = Cursor();
+
+	camera_fov = p_settings.get("editors/3d/default_fov", 70);
+	camera_znear = p_settings.get("editors/3d/default_z_near", 0.05);
+	camera_zfar = p_settings.get("editors/3d/default_z_far", 4'000);
+
+	invert_x_axis = p_settings.get("editors/3d/navigation/invert_x_axis", false);
+	invert_y_axis = p_settings.get("editors/3d/navigation/invert_y_axis", false);
+	warped_mouse_panning_3d = p_settings.get("editors/3d/navigation/warped_mouse_panning", true);
+
+	freelook_base_speed = p_settings.get("editors/3d/freelook/freelook_base_speed", 5);
+	freelook_sensitivity = Math::deg_to_rad((real_t)p_settings.get("editors/3d/freelook/freelook_sensitivity", 0.25));
+	orbit_sensitivity = Math::deg_to_rad((real_t)p_settings.get("editors/3d/navigation_feel/orbit_sensitivity", 0.004));
+	translation_sensitivity = p_settings.get("editors/3d/navigation_feel/translation_sensitivity", 1);
+
+	/// 3D Selection Box Generation
+	// Copied from the Node3DEditor implementation.
+
+	sbox_3d_color = p_settings.get("editors/3d/selection_box_color", Color());
+
+	// Use two AABBs to create the illusion of a slightly thicker line.
+	AABB aabb(Vector3(), Vector3(1, 1, 1));
+
+	// Create a x-ray (visible through solid surfaces) and standard version of the selection box.
+	// Both will be drawn at the same position, but with different opacity.
+	// This lets the user see where the selection is while still having a sense of depth.
+	Ref<SurfaceTool> st = memnew(SurfaceTool);
+	Ref<SurfaceTool> st_xray = memnew(SurfaceTool);
+
+	st->begin(Mesh::PRIMITIVE_LINES);
+	st_xray->begin(Mesh::PRIMITIVE_LINES);
+	for (int i = 0; i < 12; i++) {
+		Vector3 a, b;
+		aabb.get_edge(i, a, b);
+
+		st->add_vertex(a);
+		st->add_vertex(b);
+		st_xray->add_vertex(a);
+		st_xray->add_vertex(b);
+	}
+
+	Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
+	mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	mat->set_albedo(sbox_3d_color);
+	mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	st->set_material(mat);
+	sbox_3d_mesh = st->commit();
+
+	Ref<StandardMaterial3D> mat_xray = memnew(StandardMaterial3D);
+	mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
+	mat_xray->set_albedo(sbox_3d_color * Color(1, 1, 1, 0.15));
+	mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	st_xray->set_material(mat_xray);
+	sbox_3d_mesh_xray = st_xray->commit();
+#endif // _3D_DISABLED
+
+	SceneTree::get_singleton()->connect("process_frame", callable_mp(this, &RuntimeNodeSelect::_process_frame));
+	SceneTree::get_singleton()->connect("physics_frame", callable_mp(this, &RuntimeNodeSelect::_physics_frame));
+
+	// This function will be called before the root enters the tree at first when the Game view is passing its settings to
+	// the debugger, so queue the update for after it enters.
+	root->connect(SceneStringName(tree_entered), callable_mp(this, &RuntimeNodeSelect::_update_input_state), Object::CONNECT_ONE_SHOT);
+}
+
+void RuntimeNodeSelect::_node_set_type(NodeType p_type) {
+	node_select_type = p_type;
+	_update_input_state();
+}
+
+void RuntimeNodeSelect::_select_set_mode(SelectMode p_mode) {
+	node_select_mode = p_mode;
+}
+
+void RuntimeNodeSelect::_set_camera_override_enabled(bool p_enabled) {
+	camera_override = p_enabled;
+
+	if (camera_first_override) {
+		_reset_camera_2d();
+#ifndef _3D_DISABLED
+		_reset_camera_3d();
+#endif // _3D_DISABLED
+
+		camera_first_override = false;
+	} else if (p_enabled) {
+		_update_view_2d();
+
+#ifndef _3D_DISABLED
+		Window *root = SceneTree::get_singleton()->get_root();
+		ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
+		Camera3D *override_camera = root->get_override_camera_3d();
+		override_camera->set_transform(_get_cursor_transform());
+		override_camera->set_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
+#endif // _3D_DISABLED
+	}
+}
+
+void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	if (node_select_type == NODE_TYPE_NONE || (selection_list && selection_list->is_visible())) {
+		// Workaround for platforms that don't allow subwindows.
+		if (selection_list && selection_list->is_visible() && selection_list->is_embedded()) {
+			root->set_disable_input_override(false);
+			selection_list->push_input(p_event);
+			callable_mp(root->get_viewport(), &Viewport::set_disable_input_override).call_deferred(true);
+		}
+
+		return;
+	}
+
+	bool is_dragging_camera = false;
+	if (camera_override) {
+		if (node_select_type == NODE_TYPE_2D) {
+			is_dragging_camera = panner->gui_input(p_event, Rect2(Vector2(), root->get_visible_rect().get_size()));
+#ifndef _3D_DISABLED
+		} else if (node_select_type == NODE_TYPE_3D && selection_drag_state == SELECTION_DRAG_NONE) {
+			if (_handle_3d_input(p_event)) {
+				return;
+			}
+#endif // _3D_DISABLED
+		}
+	}
+
+	Ref<InputEventMouseButton> b = p_event;
+
+	if (selection_drag_state == SELECTION_DRAG_MOVE) {
+		Ref<InputEventMouseMotion> m = p_event;
+		if (m.is_valid()) {
+			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(m->get_position()));
+			return;
+		} else if (b.is_valid()) {
+			// Account for actions like zooming.
+			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(b->get_position()));
+		}
+	}
+
+	if (b.is_null()) {
+		return;
+	}
+
+	// Ignore mouse wheel inputs.
+	if (b->get_button_index() != MouseButton::LEFT && b->get_button_index() != MouseButton::RIGHT) {
+		return;
+	}
+
+	if (selection_drag_state == SELECTION_DRAG_MOVE && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
+		selection_drag_state = SELECTION_DRAG_END;
+		selection_drag_area = selection_drag_area.abs();
+		_update_selection_drag();
+
+		// Trigger a selection in the position on release.
+		if (multi_shortcut_pressed) {
+			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
+		}
+	}
+
+	if (!is_dragging_camera && b->is_pressed()) {
+		multi_shortcut_pressed = b->is_shift_pressed();
+		list_shortcut_pressed = node_select_mode == SELECT_MODE_SINGLE && b->get_button_index() == MouseButton::RIGHT && b->is_alt_pressed();
+		if (list_shortcut_pressed || b->get_button_index() == MouseButton::LEFT) {
+			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
+		}
+	}
+}
+
+void RuntimeNodeSelect::_items_popup_index_pressed(int p_index, PopupMenu *p_popup) {
+	Object *obj = p_popup->get_item_metadata(p_index).get_validated_object();
+	if (obj) {
+		Vector<Node *> node;
+		node.append(Object::cast_to<Node>(obj));
+		_send_ids(node);
+	}
+}
+
+void RuntimeNodeSelect::_update_input_state() {
+	SceneTree *scene_tree = SceneTree::get_singleton();
+	// This function can be called at the very beginning, when the root hasn't entered the tree yet.
+	// So check first to avoid a crash.
+	if (!scene_tree->get_root()->is_inside_tree()) {
+		return;
+	}
+
+	bool disable_input = scene_tree->is_suspended() || node_select_type != RuntimeNodeSelect::NODE_TYPE_NONE;
+	Input::get_singleton()->set_disable_input(disable_input);
+	Input::get_singleton()->set_mouse_mode_override_enabled(disable_input);
+	scene_tree->get_root()->set_disable_input_override(disable_input);
+}
+
+void RuntimeNodeSelect::_process_frame() {
+#ifndef _3D_DISABLED
+	if (camera_freelook) {
+		Transform3D transform = _get_cursor_transform();
+		Vector3 forward = transform.basis.xform(Vector3(0, 0, -1));
+		const Vector3 right = transform.basis.xform(Vector3(1, 0, 0));
+		Vector3 up = transform.basis.xform(Vector3(0, 1, 0));
+
+		Vector3 direction;
+
+		Input *input = Input::get_singleton();
+		bool was_input_disabled = input->is_input_disabled();
+		if (was_input_disabled) {
+			input->set_disable_input(false);
+		}
+
+		if (input->is_physical_key_pressed(Key::A)) {
+			direction -= right;
+		}
+		if (input->is_physical_key_pressed(Key::D)) {
+			direction += right;
+		}
+		if (input->is_physical_key_pressed(Key::W)) {
+			direction += forward;
+		}
+		if (input->is_physical_key_pressed(Key::S)) {
+			direction -= forward;
+		}
+		if (input->is_physical_key_pressed(Key::E)) {
+			direction += up;
+		}
+		if (input->is_physical_key_pressed(Key::Q)) {
+			direction -= up;
+		}
+
+		real_t speed = freelook_base_speed;
+		if (input->is_physical_key_pressed(Key::SHIFT)) {
+			speed *= 3.0;
+		}
+		if (input->is_physical_key_pressed(Key::ALT)) {
+			speed *= 0.333333;
+		}
+
+		if (was_input_disabled) {
+			input->set_disable_input(true);
+		}
+
+		if (direction != Vector3()) {
+			Window *root = SceneTree::get_singleton()->get_root();
+			ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
+
+			// Calculate the process time manually, as the time scale is frozen.
+			const double process_time = (1.0 / Engine::get_singleton()->get_frames_per_second()) * Engine::get_singleton()->get_unfrozen_time_scale();
+			const Vector3 motion = direction * speed * process_time;
+			cursor.pos += motion;
+			cursor.eye_pos += motion;
+
+			root->get_override_camera_3d()->set_transform(_get_cursor_transform());
+		}
+	}
+#endif // _3D_DISABLED
+
+	if (selection_update_queued || !SceneTree::get_singleton()->is_suspended()) {
+		selection_update_queued = false;
+		if (has_selection) {
+			_update_selection();
+		}
+	}
+}
+
+void RuntimeNodeSelect::_physics_frame() {
+	if (selection_drag_state != SELECTION_DRAG_END && (selection_drag_state == SELECTION_DRAG_MOVE || Math::is_inf(selection_position.x))) {
+		return;
+	}
+
+	Window *root = SceneTree::get_singleton()->get_root();
+	bool selection_drag_valid = selection_drag_state == SELECTION_DRAG_END && selection_drag_area.get_area() > SELECTION_MIN_AREA;
+	Vector<SelectResult> items;
+
+	if (node_select_type == NODE_TYPE_2D) {
+		if (selection_drag_valid) {
+			for (int i = 0; i < root->get_child_count(); i++) {
+				_find_canvas_items_at_rect(selection_drag_area, root->get_child(i), items);
+			}
+		} else if (!Math::is_inf(selection_position.x)) {
+			for (int i = 0; i < root->get_child_count(); i++) {
+				_find_canvas_items_at_pos(selection_position, root->get_child(i), items);
+			}
+		}
+
+#ifndef _3D_DISABLED
+	} else if (node_select_type == NODE_TYPE_3D) {
+		if (selection_drag_valid) {
+			_find_3d_items_at_rect(selection_drag_area, items);
+		} else {
+			_find_3d_items_at_pos(selection_position, items);
+		}
+#endif // _3D_DISABLED
+	}
+
+	if ((prefer_group_selection || avoid_locked_nodes) && !list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) {
+		for (int i = 0; i < items.size(); i++) {
+			Node *node = items[i].item;
+			Node *final_node = node;
+			real_t order = items[i].order;
+
+			// Replace the node by the group if grouped.
+			if (prefer_group_selection) {
+				while (node && node != root) {
+					if (node->has_meta("_edit_group_")) {
+						final_node = node;
+
+						if (Object::cast_to<CanvasItem>(final_node)) {
+							CanvasItem *ci_tmp = Object::cast_to<CanvasItem>(final_node);
+							order = ci_tmp->get_effective_z_index() + ci_tmp->get_canvas_layer();
+#ifndef _3D_DISABLED
+						} else if (Object::cast_to<Node3D>(final_node)) {
+							Node3D *node3d_tmp = Object::cast_to<Node3D>(final_node);
+							Camera3D *camera = root->get_camera_3d();
+							Vector3 pos = camera->project_ray_origin(selection_position);
+							order = -pos.distance_to(node3d_tmp->get_global_transform().origin);
+#endif // _3D_DISABLED
+						}
+					}
+					node = node->get_parent();
+				}
+			}
+
+			// Filter out locked nodes.
+			if (avoid_locked_nodes && final_node->get_meta("_edit_lock_", false)) {
+				items.remove_at(i);
+				i--;
+				continue;
+			}
+
+			items.write[i].item = final_node;
+			items.write[i].order = order;
+		}
+	}
+
+	// Remove possible duplicates.
+	for (int i = 0; i < items.size(); i++) {
+		Node *item = items[i].item;
+		for (int j = 0; j < i; j++) {
+			if (items[j].item == item) {
+				items.remove_at(i);
+				i--;
+
+				break;
+			}
+		}
+	}
+
+	items.sort();
+
+	switch (selection_drag_state) {
+		case SELECTION_DRAG_END: {
+			selection_position = Point2(Math::INF, Math::INF);
+			selection_drag_state = SELECTION_DRAG_NONE;
+
+			if (selection_drag_area.get_area() > SELECTION_MIN_AREA) {
+				if (!items.is_empty()) {
+					Vector<Node *> nodes;
+					for (const SelectResult item : items) {
+						nodes.append(item.item);
+					}
+					_send_ids(nodes, false);
+				}
+
+				_update_selection_drag();
+				return;
+			}
+
+			_update_selection_drag();
+		} break;
+
+		case SELECTION_DRAG_NONE: {
+			if (node_select_mode == SELECT_MODE_LIST) {
+				break;
+			}
+
+			if (multi_shortcut_pressed) {
+				// Allow forcing box selection when an item was clicked.
+				selection_drag_state = SELECTION_DRAG_MOVE;
+			} else if (items.is_empty()) {
+#ifdef _3D_DISABLED
+				if (!selected_ci_nodes.is_empty()) {
+#else
+				if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
+#endif // _3D_DISABLED
+					EngineDebugger::get_singleton()->send_message("remote_nothing_selected", Array());
+					_clear_selection();
+				}
+
+				selection_drag_state = SELECTION_DRAG_MOVE;
+			} else {
+				break;
+			}
+
+			[[fallthrough]];
+		}
+
+		case SELECTION_DRAG_MOVE: {
+			selection_drag_area.position = selection_position;
+
+			// Stop selection on click, so it can happen on release if the selection area doesn't pass the threshold.
+			if (multi_shortcut_pressed) {
+				return;
+			}
+		}
+	}
+
+	if (items.is_empty()) {
+		selection_position = Point2(Math::INF, Math::INF);
+		return;
+	}
+	if ((!list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) || items.size() == 1) {
+		selection_position = Point2(Math::INF, Math::INF);
+
+		Vector<Node *> node;
+		node.append(items[0].item);
+		_send_ids(node);
+
+		return;
+	}
+
+	if (!selection_list && (list_shortcut_pressed || node_select_mode == SELECT_MODE_LIST)) {
+		_open_selection_list(items, selection_position);
+	}
+
+	selection_position = Point2(Math::INF, Math::INF);
+}
+
+void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections) {
+	ERR_FAIL_COND(p_picked_nodes.is_empty());
+
+	Vector<Node *> picked_nodes = p_picked_nodes;
+	Array message;
+
+	if (!multi_shortcut_pressed) {
+		if (picked_nodes.size() > max_selection) {
+			picked_nodes.resize(max_selection);
+			EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
+		}
+
+		for (const Node *node : picked_nodes) {
+			SceneDebuggerObject obj(node->get_instance_id());
+			Array arr;
+			obj.serialize(arr);
+			message.append(arr);
+		}
+
+		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
+		_set_selected_nodes(picked_nodes);
+
+		return;
+	}
+
+	LocalVector<Node *> nodes;
+	LocalVector<ObjectID> ids;
+	for (Node *node : picked_nodes) {
+		ObjectID id = node->get_instance_id();
+		if (CanvasItem *ci = Object::cast_to<CanvasItem>(node)) {
+			if (selected_ci_nodes.has(id)) {
+				if (p_invert_new_selections) {
+					selected_ci_nodes.erase(id);
+				}
+			} else {
+				ids.push_back(id);
+				nodes.push_back(ci);
+			}
+		} else {
+#ifndef _3D_DISABLED
+			if (Node3D *node3d = Object::cast_to<Node3D>(node)) {
+				if (selected_3d_nodes.has(id)) {
+					if (p_invert_new_selections) {
+						selected_3d_nodes.erase(id);
+					}
+				} else {
+					ids.push_back(id);
+					nodes.push_back(node3d);
+				}
+			}
+#endif // _3D_DISABLED
+		}
+	}
+
+	uint32_t limit = max_selection - selected_ci_nodes.size();
+#ifndef _3D_DISABLED
+	limit -= selected_3d_nodes.size();
+#endif // _3D_DISABLED
+	if (ids.size() > limit) {
+		ids.resize(limit);
+		nodes.resize(limit);
+		EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
+	}
+
+	for (ObjectID id : selected_ci_nodes) {
+		ids.push_back(id);
+		nodes.push_back(ObjectDB::get_instance<Node>(id));
+	}
+#ifndef _3D_DISABLED
+	for (const KeyValue<ObjectID, Ref<SelectionBox3D>> &KV : selected_3d_nodes) {
+		ids.push_back(KV.key);
+		nodes.push_back(ObjectDB::get_instance<Node>(KV.key));
+	}
+#endif // _3D_DISABLED
+
+	if (ids.is_empty()) {
+		EngineDebugger::get_singleton()->send_message("remote_nothing_selected", message);
+	} else {
+		for (const ObjectID &id : ids) {
+			SceneDebuggerObject obj(id);
+			Array arr;
+			obj.serialize(arr);
+			message.append(arr);
+		}
+
+		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
+	}
+
+	_set_selected_nodes(Vector<Node *>(nodes));
+}
+
+void RuntimeNodeSelect::_set_selected_nodes(const Vector<Node *> &p_nodes) {
+	if (p_nodes.is_empty()) {
+		_clear_selection();
+		return;
+	}
+
+	bool changed = false;
+	LocalVector<ObjectID> nodes_ci;
+#ifndef _3D_DISABLED
+	HashMap<ObjectID, Ref<SelectionBox3D>> nodes_3d;
+#endif // _3D_DISABLED
+
+	for (Node *node : p_nodes) {
+		ObjectID id = node->get_instance_id();
+		if (Object::cast_to<CanvasItem>(node)) {
+			if (!changed || !selected_ci_nodes.has(id)) {
+				changed = true;
+			}
+
+			nodes_ci.push_back(id);
+		} else {
+#ifndef _3D_DISABLED
+			Node3D *node_3d = Object::cast_to<Node3D>(node);
+			if (!node_3d || !node_3d->is_inside_world()) {
+				continue;
+			}
+
+			if (!changed || !selected_3d_nodes.has(id)) {
+				changed = true;
+			}
+
+			if (selected_3d_nodes.has(id)) {
+				// Assign an already available visual instance.
+				nodes_3d[id] = selected_3d_nodes.get(id);
+				continue;
+			}
+
+			if (sbox_3d_mesh.is_null() || sbox_3d_mesh_xray.is_null()) {
+				continue;
+			}
+
+			Ref<SelectionBox3D> sb;
+			sb.instantiate();
+			nodes_3d[id] = sb;
+
+			RID scenario = node_3d->get_world_3d()->get_scenario();
+
+			sb->instance = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), scenario);
+			sb->instance_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), scenario);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_ofs, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+
+			sb->instance_xray = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), scenario);
+			sb->instance_xray_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), scenario);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray_ofs, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+#endif // _3D_DISABLED
+		}
+	}
+
+#ifdef _3D_DISABLED
+	if (!changed && nodes_ci.size() == selected_ci_nodes.size()) {
+		return;
+	}
+#else
+	if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
+		return;
+	}
+#endif // _3D_DISABLED
+
+	_clear_selection();
+	selected_ci_nodes = nodes_ci;
+	has_selection = !nodes_ci.is_empty();
+
+#ifndef _3D_DISABLED
+	if (!nodes_3d.is_empty()) {
+		selected_3d_nodes = nodes_3d;
+		has_selection = true;
+	}
+#endif // _3D_DISABLED
+
+	_queue_selection_update();
+}
+
+void RuntimeNodeSelect::_queue_selection_update() {
+	if (has_selection && selection_visible) {
+		if (SceneTree::get_singleton()->is_suspended()) {
+			_update_selection();
+		} else {
+			selection_update_queued = true;
+		}
+	}
+}
+
+void RuntimeNodeSelect::_update_selection() {
+	RS::get_singleton()->canvas_item_clear(sbox_2d_ci);
+	RS::get_singleton()->canvas_item_set_visible(sbox_2d_ci, selection_visible);
+
+	for (LocalVector<ObjectID>::Iterator E = selected_ci_nodes.begin(); E != selected_ci_nodes.end(); ++E) {
+		ObjectID id = *E;
+		CanvasItem *ci = ObjectDB::get_instance<CanvasItem>(id);
+		if (!ci) {
+			selected_ci_nodes.erase(id);
+			--E;
+			continue;
+		}
+
+		if (!ci->is_inside_tree()) {
+			continue;
+		}
+
+		Transform2D xform = ci->get_global_transform_with_canvas();
+
+		// Fallback.
+		Rect2 rect = Rect2(Vector2(), Vector2(10, 10));
+
+		if (ci->_edit_use_rect()) {
+			rect = ci->_edit_get_rect();
+		} else {
+#ifndef PHYSICS_2D_DISABLED
+			CollisionShape2D *collision_shape = Object::cast_to<CollisionShape2D>(ci);
+			if (collision_shape) {
+				Ref<Shape2D> shape = collision_shape->get_shape();
+				if (shape.is_valid()) {
+					rect = shape->get_rect();
+				}
+			}
+#endif // PHYSICS_2D_DISABLED
+		}
+
+		const Vector2 endpoints[4] = {
+			xform.xform(rect.position),
+			xform.xform(rect.position + Point2(rect.size.x, 0)),
+			xform.xform(rect.position + rect.size),
+			xform.xform(rect.position + Point2(0, rect.size.y))
+		};
+
+		const Color selection_color_2d = Color(1, 0.6, 0.4, 0.7);
+		for (int i = 0; i < 4; i++) {
+			RS::get_singleton()->canvas_item_add_line(sbox_2d_ci, endpoints[i], endpoints[(i + 1) % 4], selection_color_2d, sel_2d_scale);
+		}
+	}
+
+#ifndef _3D_DISABLED
+	for (HashMap<ObjectID, Ref<SelectionBox3D>>::ConstIterator KV = selected_3d_nodes.begin(); KV != selected_3d_nodes.end(); ++KV) {
+		ObjectID id = KV->key;
+		Node3D *node_3d = ObjectDB::get_instance<Node3D>(id);
+		if (!node_3d) {
+			selected_3d_nodes.erase(id);
+			--KV;
+			continue;
+		}
+
+		if (!node_3d->is_inside_tree()) {
+			continue;
+		}
+
+		// Fallback.
+		AABB bounds(Vector3(-0.5, -0.5, -0.5), Vector3(1, 1, 1));
+
+		VisualInstance3D *visual_instance = Object::cast_to<VisualInstance3D>(node_3d);
+		if (visual_instance) {
+			bounds = visual_instance->get_aabb();
+		} else {
+#ifndef PHYSICS_3D_DISABLED
+			CollisionShape3D *collision_shape = Object::cast_to<CollisionShape3D>(node_3d);
+			if (collision_shape) {
+				Ref<Shape3D> shape = collision_shape->get_shape();
+				if (shape.is_valid()) {
+					bounds = shape->get_debug_mesh()->get_aabb();
+				}
+			}
+#endif // PHYSICS_3D_DISABLED
+		}
+
+		Transform3D xform_to_top_level_parent_space = node_3d->get_global_transform().affine_inverse() * node_3d->get_global_transform();
+		bounds = xform_to_top_level_parent_space.xform(bounds);
+		Transform3D t = node_3d->get_global_transform();
+
+		Ref<SelectionBox3D> sb = KV->value;
+		if (t == sb->transform && bounds == sb->bounds) {
+			continue; // Nothing changed.
+		}
+		sb->transform = t;
+		sb->bounds = bounds;
+
+		Transform3D t_offset = t;
+
+		// Apply AABB scaling before item's global transform.
+		{
+			const Vector3 offset(0.005, 0.005, 0.005);
+			Basis aabb_s;
+			aabb_s.scale(bounds.size + offset);
+			t.translate_local(bounds.position - offset / 2);
+			t.basis = t.basis * aabb_s;
+		}
+		{
+			const Vector3 offset(0.01, 0.01, 0.01);
+			Basis aabb_s;
+			aabb_s.scale(bounds.size + offset);
+			t_offset.translate_local(bounds.position - offset / 2);
+			t_offset.basis = t_offset.basis * aabb_s;
+		}
+
+		RS::get_singleton()->instance_set_visible(sb->instance, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_ofs, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_xray, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_xray_ofs, selection_visible);
+
+		RS::get_singleton()->instance_set_transform(sb->instance, t);
+		RS::get_singleton()->instance_set_transform(sb->instance_ofs, t_offset);
+		RS::get_singleton()->instance_set_transform(sb->instance_xray, t);
+		RS::get_singleton()->instance_set_transform(sb->instance_xray_ofs, t_offset);
+	}
+#endif // _3D_DISABLED
+}
+
+void RuntimeNodeSelect::_clear_selection() {
+	selected_ci_nodes.clear();
+	if (draw_canvas.is_valid()) {
+		RS::get_singleton()->canvas_item_clear(sbox_2d_ci);
+	}
+
+#ifndef _3D_DISABLED
+	selected_3d_nodes.clear();
+#endif // _3D_DISABLED
+
+	has_selection = false;
+}
+
+void RuntimeNodeSelect::_update_selection_drag(const Point2 &p_end_pos) {
+	RS::get_singleton()->canvas_item_clear(sel_drag_ci);
+
+	if (selection_drag_state != SELECTION_DRAG_MOVE) {
+		return;
+	}
+
+	selection_drag_area.size = p_end_pos - selection_drag_area.position;
+
+	if (selection_drag_state == SELECTION_DRAG_END) {
+		return;
+	}
+
+	Rect2 selection_drawing = selection_drag_area.abs();
+	int thickness = 1;
+
+	const Vector2 endpoints[4] = {
+		selection_drawing.position,
+		selection_drawing.position + Point2(selection_drawing.size.x, 0),
+		selection_drawing.position + selection_drawing.size,
+		selection_drawing.position + Point2(0, selection_drawing.size.y)
+	};
+
+	// Draw fill.
+	RS::get_singleton()->canvas_item_add_rect(sel_drag_ci, selection_drawing, selection_area_fill);
+	// Draw outline.
+	for (int i = 0; i < 4; i++) {
+		RS::get_singleton()->canvas_item_add_line(sel_drag_ci, endpoints[i], endpoints[(i + 1) % 4], selection_area_outline, thickness);
+	}
+}
+
+void RuntimeNodeSelect::_open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos) {
+	Window *root = SceneTree::get_singleton()->get_root();
+
+	selection_list = memnew(PopupMenu);
+	selection_list->set_theme(ThemeDB::get_singleton()->get_default_theme());
+	selection_list->set_auto_translate_mode(Node::AUTO_TRANSLATE_MODE_DISABLED);
+	selection_list->set_force_native(true);
+	selection_list->connect("index_pressed", callable_mp(this, &RuntimeNodeSelect::_items_popup_index_pressed).bind(selection_list));
+	selection_list->connect("popup_hide", callable_mp(this, &RuntimeNodeSelect::_close_selection_list));
+
+	root->add_child(selection_list);
+
+	for (const SelectResult &I : p_items) {
+		int locked = 0;
+		if (I.item->get_meta("_edit_lock_", false)) {
+			locked = 1;
+		} else {
+			Node *scene = SceneTree::get_singleton()->get_root();
+			Node *node = I.item;
+
+			while (node && node != scene->get_parent()) {
+				if (node->has_meta("_edit_group_")) {
+					locked = 2;
+				}
+				node = node->get_parent();
+			}
+		}
+
+		String suffix;
+		if (locked == 1) {
+			suffix = " (" + RTR("Locked") + ")";
+		} else if (locked == 2) {
+			suffix = " (" + RTR("Grouped") + ")";
+		}
+
+		selection_list->add_item((String)I.item->get_name() + suffix);
+		selection_list->set_item_metadata(-1, I.item);
+	}
+
+	selection_list->set_position(selection_list->is_embedded() ? p_pos : (Input::get_singleton()->get_mouse_position() + root->get_position()));
+	selection_list->reset_size();
+	selection_list->popup();
+
+	selection_list->set_content_scale_factor(1);
+	selection_list->set_min_size(selection_list->get_contents_minimum_size());
+	selection_list->reset_size();
+
+	// FIXME: Ugly hack that stops the popup from hiding when the button is released.
+	selection_list->call_deferred(SNAME("set_position"), selection_list->get_position() + Point2(1, 0));
+}
+
+void RuntimeNodeSelect::_close_selection_list() {
+	selection_list->queue_free();
+	selection_list = nullptr;
+}
+
+void RuntimeNodeSelect::_set_selection_visible(bool p_visible) {
+	selection_visible = p_visible;
+
+	if (has_selection) {
+		_update_selection();
+	}
+}
+
+void RuntimeNodeSelect::_set_avoid_locked(bool p_enabled) {
+	avoid_locked_nodes = p_enabled;
+}
+
+void RuntimeNodeSelect::_set_prefer_group(bool p_enabled) {
+	prefer_group_selection = p_enabled;
+}
+
+// Copied and trimmed from the CanvasItemEditor implementation.
+void RuntimeNodeSelect::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
+	if (!p_node || Object::cast_to<Viewport>(p_node)) {
+		return;
+	}
+
+	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
+	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
+		if (ci) {
+			if (!ci->is_set_as_top_level()) {
+				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
+			} else {
+				_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
+			}
+		} else {
+			CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
+			_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
+		}
+	}
+
+	if (!ci || !ci->is_visible_in_tree()) {
+		return;
+	}
+
+	Transform2D xform = p_canvas_xform;
+	if (!ci->is_set_as_top_level()) {
+		xform *= p_parent_xform;
+	}
+
+	Window *root = SceneTree::get_singleton()->get_root();
+	Point2 pos;
+
+	// Cameras don't affect `CanvasLayer`s.
+	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
+		pos = root->get_canvas_transform().affine_inverse().xform(p_pos);
+	} else {
+		pos = p_pos;
+	}
+
+	xform = (xform * ci->get_transform()).affine_inverse();
+	const real_t local_grab_distance = xform.basis_xform(Vector2(sel_2d_grab_dist, 0)).length() / view_2d_zoom;
+	if (ci->_edit_is_selected_on_click(xform.xform(pos), local_grab_distance)) {
+		SelectResult res;
+		res.item = ci;
+		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
+		r_items.push_back(res);
+
+#ifndef PHYSICS_2D_DISABLED
+		// If it's a shape, get the collision object it's from.
+		// FIXME: If the collision object has multiple shapes, only the topmost will be above it in the list.
+		if (Object::cast_to<CollisionShape2D>(ci) || Object::cast_to<CollisionPolygon2D>(ci)) {
+			CollisionObject2D *collision_object = Object::cast_to<CollisionObject2D>(ci->get_parent());
+			if (collision_object) {
+				SelectResult res_col;
+				res_col.item = ci->get_parent();
+				res_col.order = collision_object->get_z_index() + ci->get_canvas_layer();
+				r_items.push_back(res_col);
+			}
+		}
+#endif // PHYSICS_2D_DISABLED
+	}
+}
+
+// Copied and trimmed from the CanvasItemEditor implementation.
+void RuntimeNodeSelect::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
+	if (!p_node || Object::cast_to<Viewport>(p_node)) {
+		return;
+	}
+
+	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
+	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
+		if (ci) {
+			if (!ci->is_set_as_top_level()) {
+				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
+			} else {
+				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
+			}
+		} else {
+			CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
+			_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
+		}
+	}
+
+	if (!ci || !ci->is_visible_in_tree()) {
+		return;
+	}
+
+	Transform2D xform = p_canvas_xform;
+	if (!ci->is_set_as_top_level()) {
+		xform *= p_parent_xform;
+	}
+
+	Window *root = SceneTree::get_singleton()->get_root();
+	Rect2 rect;
+	// Cameras don't affect `CanvasLayer`s.
+	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
+		rect = root->get_canvas_transform().affine_inverse().xform(p_rect);
+	} else {
+		rect = p_rect;
+	}
+	rect = (xform * ci->get_transform()).affine_inverse().xform(rect);
+
+	bool selected = false;
+	if (ci->_edit_use_rect()) {
+		Rect2 ci_rect = ci->_edit_get_rect();
+		if (rect.has_point(ci_rect.position) &&
+				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, 0)) &&
+				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, ci_rect.size.y)) &&
+				rect.has_point(ci_rect.position + Vector2(0, ci_rect.size.y))) {
+			selected = true;
+		}
+	} else if (rect.has_point(Point2())) {
+		selected = true;
+	}
+
+	if (selected) {
+		SelectResult res;
+		res.item = ci;
+		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
+		r_items.push_back(res);
+	}
+}
+
+void RuntimeNodeSelect::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
+	Vector2 scroll = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_scroll_vec);
+	view_2d_offset.x -= scroll.x / view_2d_zoom;
+	view_2d_offset.y -= scroll.y / view_2d_zoom;
+
+	_update_view_2d();
+}
+
+// A very shallow copy of the same function inside CanvasItemEditor.
+void RuntimeNodeSelect::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event) {
+	real_t prev_zoom = view_2d_zoom;
+	view_2d_zoom = CLAMP(view_2d_zoom * p_zoom_factor, VIEW_2D_MIN_ZOOM, VIEW_2D_MAX_ZOOM);
+
+	Vector2 pos = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_origin);
+	view_2d_offset += pos / prev_zoom - pos / view_2d_zoom;
+
+	// We want to align in-scene pixels to screen pixels, this prevents blurry rendering
+	// of small details (texts, lines).
+	// This correction adds a jitter movement when zooming, so we correct only when the
+	// zoom factor is an integer. (in the other cases, all pixels won't be aligned anyway)
+	const real_t closest_zoom_factor = Math::round(view_2d_zoom);
+	if (Math::is_zero_approx(view_2d_zoom - closest_zoom_factor)) {
+		// Make sure scene pixel at view_offset is aligned on a screen pixel.
+		Vector2 view_offset_int = view_2d_offset.floor();
+		Vector2 view_offset_frac = view_2d_offset - view_offset_int;
+		view_2d_offset = view_offset_int + (view_offset_frac * closest_zoom_factor).round() / closest_zoom_factor;
+	}
+
+	_update_view_2d();
+}
+
+void RuntimeNodeSelect::_reset_camera_2d() {
+	camera_first_override = true;
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera2D *game_camera = root->is_camera_2d_override_enabled() ? root->get_overridden_camera_2d() : root->get_camera_2d();
+	if (game_camera) {
+		// Ideally we should be using Camera2D::get_camera_transform() but it's not so this hack will have to do for now.
+		view_2d_offset = game_camera->get_camera_screen_center() - (0.5 * root->get_visible_rect().size);
+	} else {
+		view_2d_offset = Vector2();
+	}
+
+	view_2d_zoom = 1;
+
+	if (root->is_camera_2d_override_enabled()) {
+		_update_view_2d();
+	}
+}
+
+void RuntimeNodeSelect::_update_view_2d() {
+	Window *root = SceneTree::get_singleton()->get_root();
+	ERR_FAIL_COND(!root->is_camera_2d_override_enabled());
+
+	Camera2D *override_camera = root->get_override_camera_2d();
+	override_camera->set_anchor_mode(Camera2D::ANCHOR_MODE_FIXED_TOP_LEFT);
+	override_camera->set_zoom(Vector2(view_2d_zoom, view_2d_zoom));
+	override_camera->set_offset(view_2d_offset);
+
+	_queue_selection_update();
+}
+
+#ifndef _3D_DISABLED
+void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items) {
+	Window *root = SceneTree::get_singleton()->get_root();
+
+	Vector3 ray, pos, to;
+	Camera3D *camera = root->get_camera_3d();
+	if (!camera) {
+		return;
+	}
+
+	ray = camera->project_ray_normal(p_pos);
+	pos = camera->project_ray_origin(p_pos);
+	to = pos + ray * camera->get_far();
+
+#ifndef PHYSICS_3D_DISABLED
+	// Start with physical objects.
+	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
+	PhysicsDirectSpaceState3D::RayResult result;
+	HashSet<RID> excluded;
+	PhysicsDirectSpaceState3D::RayParameters ray_params;
+	ray_params.from = pos;
+	ray_params.to = to;
+	ray_params.collide_with_areas = true;
+	while (true) {
+		ray_params.exclude = excluded;
+		if (ss->intersect_ray(ray_params, result)) {
+			SelectResult res;
+			res.item = Object::cast_to<Node>(result.collider);
+			res.order = -pos.distance_to(result.position);
+
+			// Fetch collision shapes.
+			CollisionObject3D *collision = Object::cast_to<CollisionObject3D>(result.collider);
+			if (collision) {
+				List<uint32_t> owners;
+				collision->get_shape_owners(&owners);
+				for (uint32_t &I : owners) {
+					SelectResult res_shape;
+					res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
+					res_shape.order = res.order;
+					r_items.push_back(res_shape);
+				}
+			}
+
+			r_items.push_back(res);
+
+			excluded.insert(result.rid);
+		} else {
+			break;
+		}
+	}
+#endif // PHYSICS_3D_DISABLED
+
+	// Then go for the meshes.
+	Vector<ObjectID> items = RS::get_singleton()->instances_cull_ray(pos, to, root->get_world_3d()->get_scenario());
+	for (int i = 0; i < items.size(); i++) {
+		Object *obj = ObjectDB::get_instance(items[i]);
+
+		GeometryInstance3D *geo_instance = Object::cast_to<GeometryInstance3D>(obj);
+		if (geo_instance) {
+			Ref<TriangleMesh> mesh_collision = geo_instance->generate_triangle_mesh();
+
+			if (mesh_collision.is_valid()) {
+				Transform3D gt = geo_instance->get_global_transform();
+				Transform3D ai = gt.affine_inverse();
+				Vector3 point, normal;
+				if (mesh_collision->intersect_ray(ai.xform(pos), ai.basis.xform(ray).normalized(), point, normal)) {
+					SelectResult res;
+					res.item = Object::cast_to<Node>(obj);
+					res.order = -pos.distance_to(gt.xform(point));
+					r_items.push_back(res);
+
+					continue;
+				}
+			}
+		}
+
+		items.remove_at(i);
+		i--;
+	}
+}
+
+void RuntimeNodeSelect::_find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera3D *camera = root->get_camera_3d();
+	if (!camera) {
+		return;
+	}
+
+	Vector3 cam_pos = camera->get_global_position();
+	Vector3 dist_pos = camera->project_ray_origin(p_rect.position + p_rect.size / 2);
+
+	real_t znear = camera->get_near();
+	real_t zfar = camera->get_far();
+	real_t zofs = MAX(0.0, 5.0 - znear);
+
+	const Point2 pos_end = p_rect.position + p_rect.size;
+	Vector3 box[4] = {
+		Vector3(
+				MIN(p_rect.position.x, pos_end.x),
+				MIN(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MAX(p_rect.position.x, pos_end.x),
+				MIN(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MAX(p_rect.position.x, pos_end.x),
+				MAX(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MIN(p_rect.position.x, pos_end.x),
+				MAX(p_rect.position.y, pos_end.y),
+				zofs)
+	};
+
+	Vector<Plane> frustum;
+	for (int i = 0; i < 4; i++) {
+		Vector3 a = _get_screen_to_space(box[i]);
+		Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
+		frustum.push_back(Plane(a, b, cam_pos));
+	}
+
+	// Get the camera normal.
+	Plane near_plane = Plane(camera->get_global_transform().basis.get_column(2), cam_pos);
+
+	near_plane.d -= znear;
+	frustum.push_back(near_plane);
+
+	Plane far_plane = -near_plane;
+	far_plane.d += zfar;
+	frustum.push_back(far_plane);
+
+	// Keep track of the currently listed nodes, so repeats can be ignored.
+	HashSet<Node *> node_list;
+
+#ifndef PHYSICS_3D_DISABLED
+	Vector<Vector3> points = Geometry3D::compute_convex_mesh_points(&frustum[0], frustum.size());
+	Ref<ConvexPolygonShape3D> shape;
+	shape.instantiate();
+	shape->set_points(points);
+
+	// Start with physical objects.
+	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
+	PhysicsDirectSpaceState3D::ShapeResult results[32];
+	PhysicsDirectSpaceState3D::ShapeParameters shape_params;
+	shape_params.shape_rid = shape->get_rid();
+	shape_params.collide_with_areas = true;
+	const int num_hits = ss->intersect_shape(shape_params, results, 32);
+	for (int i = 0; i < num_hits; i++) {
+		const PhysicsDirectSpaceState3D::ShapeResult &result = results[i];
+		SelectResult res;
+		res.item = Object::cast_to<Node>(result.collider);
+		res.order = -dist_pos.distance_to(Object::cast_to<Node3D>(res.item)->get_global_transform().origin);
+
+		// Fetch collision shapes.
+		CollisionObject3D *collision = Object::cast_to<CollisionObject3D>(result.collider);
+		if (collision) {
+			List<uint32_t> owners;
+			collision->get_shape_owners(&owners);
+			for (uint32_t &I : owners) {
+				SelectResult res_shape;
+				res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
+				if (!node_list.has(res_shape.item)) {
+					node_list.insert(res_shape.item);
+					res_shape.order = res.order;
+					r_items.push_back(res_shape);
+				}
+			}
+		}
+
+		if (!node_list.has(res.item)) {
+			node_list.insert(res.item);
+			r_items.push_back(res);
+		}
+	}
+#endif // PHYSICS_3D_DISABLED
+
+	// Then go for the meshes.
+	Vector<ObjectID> items = RS::get_singleton()->instances_cull_convex(frustum, root->get_world_3d()->get_scenario());
+	for (int i = 0; i < items.size(); i++) {
+		Object *obj = ObjectDB::get_instance(items[i]);
+		GeometryInstance3D *geo_instance = Object::cast_to<GeometryInstance3D>(obj);
+		if (geo_instance) {
+			Ref<TriangleMesh> mesh_collision = geo_instance->generate_triangle_mesh();
+
+			if (mesh_collision.is_valid()) {
+				Transform3D gt = geo_instance->get_global_transform();
+				Vector3 mesh_scale = gt.get_basis().get_scale();
+				gt.orthonormalize();
+
+				Transform3D it = gt.affine_inverse();
+
+				Vector<Plane> transformed_frustum;
+				int plane_count = frustum.size();
+				transformed_frustum.resize(plane_count);
+
+				for (int j = 0; j < plane_count; j++) {
+					transformed_frustum.write[j] = it.xform(frustum[j]);
+				}
+				Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count);
+				if (mesh_collision->inside_convex_shape(transformed_frustum.ptr(), transformed_frustum.size(), convex_points.ptr(), convex_points.size(), mesh_scale)) {
+					SelectResult res;
+					res.item = Object::cast_to<Node>(obj);
+					if (!node_list.has(res.item)) {
+						node_list.insert(res.item);
+						res.order = -dist_pos.distance_to(gt.origin);
+						r_items.push_back(res);
+					}
+
+					continue;
+				}
+			}
+		}
+
+		items.remove_at(i);
+		i--;
+	}
+}
+
+Vector3 RuntimeNodeSelect::_get_screen_to_space(const Vector3 &p_vector3) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera3D *camera = root->get_camera_3d();
+
+	Transform3D camera_transform = camera->get_camera_transform();
+	Size2 size = root->get_size();
+	real_t znear = camera->get_near();
+	Projection cm = Projection::create_perspective(camera->get_fov(), size.aspect(), znear + p_vector3.z, camera->get_far());
+	Vector2 screen_he = cm.get_viewport_half_extents();
+	return camera_transform.xform(Vector3(((p_vector3.x / size.width) * 2.0 - 1.0) * screen_he.x, ((1.0 - (p_vector3.y / size.height)) * 2.0 - 1.0) * screen_he.y, -(znear + p_vector3.z)));
+}
+
+bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
+	Ref<InputEventMouseButton> b = p_event;
+	if (b.is_valid()) {
+		const real_t zoom_factor = 1.08 * b->get_factor();
+		switch (b->get_button_index()) {
+			case MouseButton::WHEEL_UP: {
+				if (!camera_freelook) {
+					_cursor_scale_distance(1.0 / zoom_factor);
+				} else {
+					_scale_freelook_speed(zoom_factor);
+				}
+
+				return true;
+			} break;
+			case MouseButton::WHEEL_DOWN: {
+				if (!camera_freelook) {
+					_cursor_scale_distance(zoom_factor);
+				} else {
+					_scale_freelook_speed(1.0 / zoom_factor);
+				}
+
+				return true;
+			} break;
+			case MouseButton::RIGHT: {
+				_set_camera_freelook_enabled(b->is_pressed());
+				return true;
+			} break;
+			default: {
+			}
+		}
+	}
+
+	Ref<InputEventMouseMotion> m = p_event;
+	if (m.is_valid()) {
+		if (camera_freelook) {
+			_cursor_look(m);
+		} else if (m->get_button_mask().has_flag(MouseButtonMask::MIDDLE)) {
+			if (m->is_shift_pressed()) {
+				_cursor_pan(m);
+			} else {
+				_cursor_orbit(m);
+			}
+		}
+
+		return true;
+	}
+
+	Ref<InputEventKey> k = p_event;
+	if (k.is_valid()) {
+		if (k->get_physical_keycode() == Key::ESCAPE) {
+			_set_camera_freelook_enabled(false);
+			return true;
+		} else if (k->is_ctrl_pressed()) {
+			switch (k->get_physical_keycode()) {
+				case Key::EQUAL: {
+					ERR_FAIL_COND_V(!SceneTree::get_singleton()->get_root()->is_camera_3d_override_enabled(), false);
+					cursor.fov_scale = CLAMP(cursor.fov_scale - 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
+					SceneTree::get_singleton()->get_root()->get_override_camera_3d()->set_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
+
+					return true;
+				} break;
+				case Key::MINUS: {
+					ERR_FAIL_COND_V(!SceneTree::get_singleton()->get_root()->is_camera_3d_override_enabled(), false);
+					cursor.fov_scale = CLAMP(cursor.fov_scale + 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
+					SceneTree::get_singleton()->get_root()->get_override_camera_3d()->set_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
+
+					return true;
+				} break;
+				case Key::KEY_0: {
+					ERR_FAIL_COND_V(!SceneTree::get_singleton()->get_root()->is_camera_3d_override_enabled(), false);
+					cursor.fov_scale = 1;
+					SceneTree::get_singleton()->get_root()->get_override_camera_3d()->set_perspective(camera_fov, camera_znear, camera_zfar);
+
+					return true;
+				} break;
+				default: {
+				}
+			}
+		}
+	}
+
+	// TODO: Handle magnify and pan input gestures.
+
+	return false;
+}
+
+void RuntimeNodeSelect::_set_camera_freelook_enabled(bool p_enabled) {
+	camera_freelook = p_enabled;
+
+	if (p_enabled) {
+		// Make sure eye_pos is synced, because freelook referential is eye pos rather than orbit pos
+		Vector3 forward = _get_cursor_transform().basis.xform(Vector3(0, 0, -1));
+		cursor.eye_pos = cursor.pos - cursor.distance * forward;
+
+		previous_mouse_position = SceneTree::get_singleton()->get_root()->get_mouse_position();
+
+		// Hide mouse like in an FPS (warping doesn't work).
+		Input::get_singleton()->set_mouse_mode_override(Input::MOUSE_MODE_CAPTURED);
+
+	} else {
+		// Restore mouse.
+		Input::get_singleton()->set_mouse_mode_override(Input::MOUSE_MODE_VISIBLE);
+
+		// Restore the previous mouse position when leaving freelook mode.
+		// This is done because leaving `Input.MOUSE_MODE_CAPTURED` will center the cursor
+		// due to OS limitations.
+		Input::get_singleton()->warp_mouse(previous_mouse_position);
+	}
+}
+
+void RuntimeNodeSelect::_cursor_scale_distance(real_t p_scale) {
+	ERR_FAIL_COND(!SceneTree::get_singleton()->get_root()->is_camera_3d_override_enabled());
+	real_t min_distance = MAX(camera_znear * 4, VIEW_3D_MIN_ZOOM);
+	real_t max_distance = MIN(camera_zfar / 4, VIEW_3D_MAX_ZOOM);
+	cursor.distance = CLAMP(cursor.distance * p_scale, min_distance, max_distance);
+
+	SceneTree::get_singleton()->get_root()->get_override_camera_3d()->set_transform(_get_cursor_transform());
+}
+
+void RuntimeNodeSelect::_scale_freelook_speed(real_t p_scale) {
+	real_t min_speed = MAX(camera_znear * 4, VIEW_3D_MIN_ZOOM);
+	real_t max_speed = MIN(camera_zfar / 4, VIEW_3D_MAX_ZOOM);
+	if (unlikely(min_speed > max_speed)) {
+		freelook_base_speed = (min_speed + max_speed) / 2;
+	} else {
+		freelook_base_speed = CLAMP(freelook_base_speed * p_scale, min_speed, max_speed);
+	}
+}
+
+void RuntimeNodeSelect::_cursor_look(Ref<InputEventWithModifiers> p_event) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
+
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(), root->get_size()));
+	const Transform3D prev_camera_transform = _get_cursor_transform();
+
+	if (invert_y_axis) {
+		cursor.x_rot -= relative.y * freelook_sensitivity;
+	} else {
+		cursor.x_rot += relative.y * freelook_sensitivity;
+	}
+	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
+	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
+
+	cursor.y_rot += relative.x * freelook_sensitivity;
+
+	// Look is like the opposite of Orbit: the focus point rotates around the camera.
+	Transform3D camera_transform = _get_cursor_transform();
+	Vector3 pos = camera_transform.xform(Vector3(0, 0, 0));
+	Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0));
+	Vector3 diff = prev_pos - pos;
+	cursor.pos += diff;
+
+	root->get_override_camera_3d()->set_transform(_get_cursor_transform());
+}
+
+void RuntimeNodeSelect::_cursor_pan(Ref<InputEventWithModifiers> p_event) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
+
+	// Reduce all sides of the area by 1, so warping works when windows are maximized/fullscreen.
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
+	const real_t pan_speed = translation_sensitivity / 150.0;
+
+	Transform3D camera_transform;
+	camera_transform.translate_local(cursor.pos);
+	camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
+	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
+
+	Vector3 translation(1 * -relative.x * pan_speed, relative.y * pan_speed, 0);
+	translation *= cursor.distance / 4;
+	camera_transform.translate_local(translation);
+	cursor.pos = camera_transform.origin;
+
+	root->get_override_camera_3d()->set_transform(_get_cursor_transform());
+}
+
+void RuntimeNodeSelect::_cursor_orbit(Ref<InputEventWithModifiers> p_event) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	ERR_FAIL_COND(!root->is_camera_3d_override_enabled());
+
+	// Reduce all sides of the area by 1, so warping works when windows are maximized/fullscreen.
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
+
+	if (invert_y_axis) {
+		cursor.x_rot -= relative.y * orbit_sensitivity;
+	} else {
+		cursor.x_rot += relative.y * orbit_sensitivity;
+	}
+	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
+	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
+
+	if (invert_x_axis) {
+		cursor.y_rot -= relative.x * orbit_sensitivity;
+	} else {
+		cursor.y_rot += relative.x * orbit_sensitivity;
+	}
+
+	root->get_override_camera_3d()->set_transform(_get_cursor_transform());
+}
+
+Point2 RuntimeNodeSelect::_get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, Rect2 p_area) const {
+	ERR_FAIL_COND_V(p_event.is_null(), Point2());
+
+	if (warped_mouse_panning_3d) {
+		return Input::get_singleton()->warp_mouse_motion(p_event, p_area);
+	}
+
+	return p_event->get_relative();
+}
+
+Transform3D RuntimeNodeSelect::_get_cursor_transform() {
+	Transform3D camera_transform;
+	camera_transform.translate_local(cursor.pos);
+	camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
+	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
+	camera_transform.translate_local(0, 0, cursor.distance);
+
+	return camera_transform;
+}
+
+void RuntimeNodeSelect::_reset_camera_3d() {
+	camera_first_override = true;
+
+	cursor = Cursor();
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera3D *game_camera = root->is_camera_3d_override_enabled() ? root->get_overridden_camera_3d() : root->get_camera_3d();
+	if (game_camera) {
+		Transform3D transform = game_camera->get_camera_transform();
+		transform.translate_local(0, 0, -cursor.distance);
+		cursor.pos = transform.origin;
+
+		cursor.x_rot = -game_camera->get_global_rotation().x;
+		cursor.y_rot = -game_camera->get_global_rotation().y;
+
+		cursor.fov_scale = CLAMP(game_camera->get_fov() / camera_fov, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
+	} else {
+		cursor.fov_scale = 1.0;
+	}
+
+	if (root->is_camera_3d_override_enabled()) {
+		Camera3D *override_camera = root->get_override_camera_3d();
+		override_camera->set_transform(_get_cursor_transform());
+		override_camera->set_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
+	}
+}
+#endif // _3D_DISABLED
+
 #endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/scene_debugger.h b/engine/scene/debugger/scene_debugger.h
index 9acc093a..97563171 100644
--- a/engine/scene/debugger/scene_debugger.h
+++ b/engine/scene/debugger/scene_debugger.h
@@ -30,13 +30,25 @@
 
 #pragma once
 
+#include "core/input/shortcut.h"
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
+#include "core/templates/pair.h"
+#include "core/variant/array.h"
+#include "scene/gui/view_panner.h"
+#ifndef _3D_DISABLED
+#include "scene/resources/mesh.h"
+#endif // _3D_DISABLED
 
-class Array;
-class InputEvent;
-class Node;
-class Shortcut;
+class CanvasItem;
+class LiveEditor;
+class PopupMenu;
+class RuntimeNodeSelect;
+class Script;
+class SceneTree;
+#ifndef _3D_DISABLED
+class Node3D;
+#endif // _3D_DISABLED
 
 class SceneDebugger {
 private:
@@ -106,7 +118,6 @@ private:
 	static Error _msg_runtime_node_select_set_avoid_locked(const Array &p_args);
 	static Error _msg_runtime_node_select_set_prefer_group(const Array &p_args);
 	static Error _msg_rq_screenshot(const Array &p_args);
-	static Error _msg_report_window_focused(const Array &p_args);
 
 	static Error _msg_runtime_node_select_reset_camera_2d(const Array &p_args);
 	static Error _msg_transform_camera_2d(const Array &p_args);
@@ -124,6 +135,62 @@ public:
 };
 
 #ifdef DEBUG_ENABLED
+class SceneDebuggerObject {
+private:
+	void _parse_script_properties(Script *p_script, ScriptInstance *p_instance);
+
+public:
+	typedef Pair<PropertyInfo, Variant> SceneDebuggerProperty;
+	ObjectID id;
+	String class_name;
+	List<SceneDebuggerProperty> properties;
+
+	SceneDebuggerObject(ObjectID p_id);
+	SceneDebuggerObject(Object *p_obj);
+	SceneDebuggerObject() {}
+
+	void serialize(Array &r_arr, int p_max_size = 1 << 20);
+	void deserialize(const Array &p_arr);
+	void deserialize(uint64_t p_id, const String &p_class_name, const Array &p_props);
+};
+
+class SceneDebuggerTree {
+public:
+	struct RemoteNode {
+		int child_count = 0;
+		String name;
+		String type_name;
+		ObjectID id;
+		String scene_file_path;
+		uint8_t view_flags = 0;
+
+		enum ViewFlags {
+			VIEW_HAS_VISIBLE_METHOD = 1 << 1,
+			VIEW_VISIBLE = 1 << 2,
+			VIEW_VISIBLE_IN_TREE = 1 << 3,
+		};
+
+		RemoteNode(int p_child, const String &p_name, const String &p_type, ObjectID p_id, const String p_scene_file_path, int p_view_flags) {
+			child_count = p_child;
+			name = p_name;
+			type_name = p_type;
+			id = p_id;
+
+			scene_file_path = p_scene_file_path;
+			view_flags = p_view_flags;
+		}
+
+		RemoteNode() {}
+	};
+
+	List<RemoteNode> nodes;
+
+	void serialize(Array &r_arr);
+	void deserialize(const Array &p_arr);
+	SceneDebuggerTree(Node *p_root);
+	SceneDebuggerTree() {}
+};
+
 class LiveEditor {
 private:
 	friend class SceneDebugger;
@@ -167,4 +234,211 @@ private:
 public:
 	static LiveEditor *get_singleton();
 };
+
+class RuntimeNodeSelect : public Object {
+	GDCLASS(RuntimeNodeSelect, Object);
+
+public:
+	enum NodeType {
+		NODE_TYPE_NONE,
+		NODE_TYPE_2D,
+		NODE_TYPE_3D,
+		NODE_TYPE_MAX,
+	};
+
+	enum SelectMode {
+		SELECT_MODE_SINGLE,
+		SELECT_MODE_LIST,
+		SELECT_MODE_MAX,
+	};
+
+private:
+	friend class SceneDebugger;
+
+	NodeType node_select_type = NODE_TYPE_2D;
+	SelectMode node_select_mode = SELECT_MODE_SINGLE;
+
+	struct SelectResult {
+		Node *item = nullptr;
+		real_t order = 0;
+		_FORCE_INLINE_ bool operator<(const SelectResult &p_rr) const { return p_rr.order < order; }
+	};
+
+	const int SELECTION_MIN_AREA = 8 * 8;
+	enum SelectionDragState {
+		SELECTION_DRAG_NONE,
+		SELECTION_DRAG_MOVE,
+		SELECTION_DRAG_END,
+	};
+	SelectionDragState selection_drag_state = SELECTION_DRAG_NONE;
+
+	bool has_selection = false;
+	int max_selection = 1;
+	Point2 selection_position = Point2(Math::INF, Math::INF);
+	Rect2 selection_drag_area;
+	PopupMenu *selection_list = nullptr;
+	Color selection_area_fill;
+	Color selection_area_outline;
+	bool selection_visible = true;
+	bool selection_update_queued = false;
+
+	bool avoid_locked_nodes = false;
+	bool prefer_group_selection = false;
+
+	bool multi_shortcut_pressed = false;
+	bool list_shortcut_pressed = false;
+	RID draw_canvas;
+	RID sel_drag_ci;
+
+	bool camera_override = false;
+	bool camera_first_override = true;
+
+	// Values taken from EditorZoomWidget.
+	const float VIEW_2D_MIN_ZOOM = 1.0 / 128;
+	const float VIEW_2D_MAX_ZOOM = 128;
+
+	Ref<ViewPanner> panner;
+	Vector2 view_2d_offset;
+	real_t view_2d_zoom = 1.0;
+	bool warped_panning = false;
+
+	LocalVector<ObjectID> selected_ci_nodes;
+	real_t sel_2d_grab_dist = 0;
+	int sel_2d_scale = 1;
+
+	RID sbox_2d_ci;
+
+#ifndef _3D_DISABLED
+	struct Cursor {
+		Vector3 pos;
+		real_t x_rot, y_rot, distance, fov_scale;
+		Vector3 eye_pos; // Used in freelook mode.
+
+		Cursor() {
+			// These rotations place the camera in +X +Y +Z, aka south east, facing north west.
+			x_rot = 0.5;
+			y_rot = -0.5;
+			distance = 4;
+			fov_scale = 1.0;
+		}
+	};
+	Cursor cursor;
+
+	// Values taken from Node3DEditor.
+	const float VIEW_3D_MIN_ZOOM = 0.01;
+#ifdef REAL_T_IS_DOUBLE
+	const double VIEW_3D_MAX_ZOOM = 1'000'000'000'000;
+#else
+	const float VIEW_3D_MAX_ZOOM = 10'000;
+#endif // REAL_T_IS_DOUBLE
+
+	const float CAMERA_MIN_FOV_SCALE = 0.1;
+	const float CAMERA_MAX_FOV_SCALE = 2.5;
+
+	bool camera_freelook = false;
+
+	real_t camera_fov = 0;
+	real_t camera_znear = 0;
+	real_t camera_zfar = 0;
+
+	bool invert_x_axis = false;
+	bool invert_y_axis = false;
+	bool warped_mouse_panning_3d = false;
+
+	real_t freelook_base_speed = 0;
+	real_t freelook_sensitivity = 0;
+	real_t orbit_sensitivity = 0;
+	real_t translation_sensitivity = 0;
+
+	Vector2 previous_mouse_position;
+
+	struct SelectionBox3D : public RefCounted {
+		RID instance;
+		RID instance_ofs;
+		RID instance_xray;
+		RID instance_xray_ofs;
+
+		Transform3D transform;
+		AABB bounds;
+
+		~SelectionBox3D() {
+			if (instance.is_valid()) {
+				RS::get_singleton()->free_rid(instance);
+				RS::get_singleton()->free_rid(instance_ofs);
+				RS::get_singleton()->free_rid(instance_xray);
+				RS::get_singleton()->free_rid(instance_xray_ofs);
+			}
+		}
+	};
+	HashMap<ObjectID, Ref<SelectionBox3D>> selected_3d_nodes;
+
+	Color sbox_3d_color;
+	Ref<ArrayMesh> sbox_3d_mesh;
+	Ref<ArrayMesh> sbox_3d_mesh_xray;
+	RID sbox_3d;
+	RID sbox_3d_ofs;
+	RID sbox_3d_xray;
+	RID sbox_3d_xray_ofs;
+#endif // _3D_DISABLED
+
+	void _setup(const Dictionary &p_settings);
+
+	void _node_set_type(NodeType p_type);
+	void _select_set_mode(SelectMode p_mode);
+
+	void _set_camera_override_enabled(bool p_enabled);
+
+	void _root_window_input(const Ref<InputEvent> &p_event);
+	void _items_popup_index_pressed(int p_index, PopupMenu *p_popup);
+	void _update_input_state();
+
+	void _process_frame();
+	void _physics_frame();
+
+	void _send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections = true);
+	void _set_selected_nodes(const Vector<Node *> &p_nodes);
+	void _queue_selection_update();
+	void _update_selection();
+	void _clear_selection();
+	void _update_selection_drag(const Point2 &p_end_pos = Point2());
+	void _set_selection_visible(bool p_visible);
+	void _set_avoid_locked(bool p_enabled);
+	void _set_prefer_group(bool p_enabled);
+
+	void _open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos);
+	void _close_selection_list();
+
+	void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
+	void _find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
+	void _pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event);
+	void _zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event);
+	void _reset_camera_2d();
+	void _update_view_2d();
+
+#ifndef _3D_DISABLED
+	void _find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items);
+	void _find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items);
+	Vector3 _get_screen_to_space(const Vector3 &p_vector3);
+
+	bool _handle_3d_input(const Ref<InputEvent> &p_event);
+	void _set_camera_freelook_enabled(bool p_enabled);
+	void _cursor_scale_distance(real_t p_scale);
+	void _scale_freelook_speed(real_t p_scale);
+	void _cursor_look(Ref<InputEventWithModifiers> p_event);
+	void _cursor_pan(Ref<InputEventWithModifiers> p_event);
+	void _cursor_orbit(Ref<InputEventWithModifiers> p_event);
+	Point2 _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, Rect2 p_border) const;
+	Transform3D _get_cursor_transform();
+	void _reset_camera_3d();
+#endif // _3D_DISABLED
+
+	RuntimeNodeSelect() { singleton = this; }
+
+	inline static RuntimeNodeSelect *singleton = nullptr;
+
+public:
+	static RuntimeNodeSelect *get_singleton();
+
+	~RuntimeNodeSelect();
+};
 #endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/scene_debugger_object.cpp b/engine/scene/debugger/scene_debugger_object.cpp
deleted file mode 100644
index 8ce4b783..00000000
--- a/engine/scene/debugger/scene_debugger_object.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/**************************************************************************/
-/*  scene_debugger_object.cpp                                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifdef DEBUG_ENABLED
-
-#include "scene_debugger_object.h"
-
-#include "core/debugger/debugger_marshalls.h"
-#include "core/io/marshalls.h"
-#include "core/object/script_language.h"
-#include "scene/main/node.h"
-
-SceneDebuggerObject::SceneDebuggerObject(Object *p_obj) {
-	if (!p_obj) {
-		return;
-	}
-
-	id = p_obj->get_instance_id();
-	class_name = p_obj->get_class();
-
-	if (ScriptInstance *si = p_obj->get_script_instance()) {
-		// Read script instance constants and variables.
-		if (!si->get_script().is_null()) {
-			Script *s = si->get_script().ptr();
-			_parse_script_properties(s, si);
-		}
-	}
-
-	if (Node *node = Object::cast_to<Node>(p_obj)) {
-		{
-			PropertyInfo pi(Variant::STRING_NAME, "name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE);
-			properties.push_back(SceneDebuggerProperty(pi, node->get_name()));
-		}
-
-		// For debugging multiplayer.
-		{
-			PropertyInfo pi(Variant::INT, String("Node/multiplayer_authority"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY);
-			properties.push_back(SceneDebuggerProperty(pi, node->get_multiplayer_authority()));
-		}
-
-		// Add specialized NodePath info (if inside tree).
-		if (node->is_inside_tree()) {
-			PropertyInfo pi(Variant::NODE_PATH, String("Node/path"));
-			properties.push_back(SceneDebuggerProperty(pi, node->get_path()));
-		} else { // Can't ask for path if a node is not in tree.
-			PropertyInfo pi(Variant::STRING, String("Node/path"));
-			properties.push_back(SceneDebuggerProperty(pi, "[Orphan]"));
-		}
-	} else if (Script *s = Object::cast_to<Script>(p_obj)) {
-		// Add script constants (no instance).
-		_parse_script_properties(s, nullptr);
-	}
-
-	// Add base object properties.
-	List<PropertyInfo> pinfo;
-	p_obj->get_property_list(&pinfo, true);
-	for (PropertyInfo &E : pinfo) {
-		const Variant &m = p_obj->get(E.name);
-
-		if (!m.is_null() && E.type == Variant::OBJECT && E.hint == PROPERTY_HINT_NODE_TYPE && E.usage & PROPERTY_USAGE_EDITOR) {
-			E.hint_string = DebuggerMarshalls::parse_type_from_variant(m);
-		}
-
-		if (E.usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_GROUP | PROPERTY_USAGE_SUBGROUP | PROPERTY_USAGE_CATEGORY)) {
-			properties.push_back(SceneDebuggerProperty(E, m));
-		}
-	}
-}
-
-void SceneDebuggerObject::_parse_script_properties(Script *p_script, ScriptInstance *p_instance) {
-	typedef HashMap<const Script *, HashSet<StringName>> ScriptMemberMap;
-	typedef HashMap<const Script *, HashMap<StringName, Variant>> ScriptConstantsMap;
-
-	ScriptMemberMap members;
-	if (p_instance) {
-		members[p_script] = HashSet<StringName>();
-		p_script->get_members(&(members[p_script]));
-	}
-
-	ScriptConstantsMap constants;
-	constants[p_script] = HashMap<StringName, Variant>();
-	p_script->get_constants(&(constants[p_script]));
-
-	Ref<Script> base = p_script->get_base_script();
-	while (base.is_valid()) {
-		if (p_instance) {
-			members[base.ptr()] = HashSet<StringName>();
-			base->get_members(&(members[base.ptr()]));
-		}
-
-		constants[base.ptr()] = HashMap<StringName, Variant>();
-		base->get_constants(&(constants[base.ptr()]));
-
-		base = base->get_base_script();
-	}
-
-	HashSet<String> exported_members;
-	HashMap<String, PropertyInfo> non_exported_members;
-
-	if (p_instance) {
-		List<PropertyInfo> pinfo;
-		p_instance->get_property_list(&pinfo);
-		for (const PropertyInfo &E : pinfo) {
-			if (E.usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) {
-				exported_members.insert(E.name);
-			} else {
-				PropertyInfo pi = E;
-				pi.usage |= PROPERTY_USAGE_EDITOR;
-				non_exported_members.insert(E.name, pi);
-			}
-		}
-	}
-
-	// Members
-	for (KeyValue<const Script *, HashSet<StringName>> sm : members) {
-		for (const StringName &E : sm.value) {
-			if (exported_members.has(E)) {
-				continue; // Exported variables already show up in the inspector.
-			}
-			if (String(E).begins_with("@")) {
-				continue; // Skip groups.
-			}
-
-			Variant m;
-			if (p_instance->get(E, m)) {
-				const String script_path = sm.key == p_script ? "" : sm.key->get_path().get_file() + "/";
-				if (!m.is_null() && m.get_type() == Variant::OBJECT) {
-					PropertyInfo pi(m.get_type(), "Members/" + script_path + E, PROPERTY_HINT_OBJECT_ID, DebuggerMarshalls::parse_type_from_variant(m));
-					properties.push_back(SceneDebuggerProperty(pi, m));
-				} else {
-					PropertyInfo pi;
-					const PropertyInfo *pi_ptr = non_exported_members.getptr(E);
-					if (pi_ptr == nullptr) {
-						pi.type = m.get_type();
-					} else {
-						pi = *pi_ptr;
-					}
-					pi.name = "Members/" + script_path + E;
-
-					properties.push_back(SceneDebuggerProperty(pi, m));
-				}
-			}
-		}
-	}
-	// Constants
-	for (KeyValue<const Script *, HashMap<StringName, Variant>> &sc : constants) {
-		for (const KeyValue<StringName, Variant> &E : sc.value) {
-			const String script_path = sc.key == p_script ? "" : sc.key->get_path().get_file() + "/";
-			if (!E.value.is_null() && E.value.get_type() == Variant::OBJECT) {
-				PropertyInfo pi(E.value.get_type(), "Constants/" + E.key, PROPERTY_HINT_OBJECT_ID, DebuggerMarshalls::parse_type_from_variant(E.value), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY);
-				properties.push_back(SceneDebuggerProperty(pi, E.value));
-			} else {
-				PropertyInfo pi(E.value.get_type(), "Constants/" + script_path + E.key);
-				pi.usage |= PROPERTY_USAGE_READ_ONLY;
-
-				properties.push_back(SceneDebuggerProperty(pi, E.value));
-			}
-		}
-	}
-}
-
-void SceneDebuggerObject::serialize(Array &r_arr, int p_max_size) {
-	Array send_props;
-	for (SceneDebuggerProperty &property : properties) {
-		const PropertyInfo &pi = property.first;
-		Variant &var = property.second;
-
-		Ref<Resource> res = var;
-
-		Array prop = { pi.name, pi.type };
-		PropertyHint hint = pi.hint;
-		String hint_string = pi.hint_string;
-		if (res.is_valid() && !res->get_path().is_empty()) {
-			// HACK: Overwrite `PropertyInfo` with the current runtime type.
-			// This allows untyped variables to be displayed correctly.
-			prop[1] = Variant::OBJECT;
-
-			var = res->get_path();
-		} else { //only send information that can be sent..
-			int len = 0; //test how big is this to encode
-			encode_variant(var, nullptr, len);
-			if (len > p_max_size) { //limit to max size
-				hint = PROPERTY_HINT_OBJECT_TOO_BIG;
-				hint_string = "";
-				var = Variant();
-			}
-		}
-		prop.push_back(hint);
-		prop.push_back(hint_string);
-		prop.push_back(pi.usage);
-		prop.push_back(var);
-		send_props.push_back(prop);
-	}
-	r_arr.push_back(uint64_t(id));
-	r_arr.push_back(class_name);
-	r_arr.push_back(send_props);
-}
-
-#define CHECK_TYPE(p_what, p_type) ERR_FAIL_COND(p_what.get_type() != Variant::p_type)
-
-void SceneDebuggerObject::deserialize(const Array &p_arr) {
-	ERR_FAIL_COND(p_arr.size() < 3);
-	CHECK_TYPE(p_arr[0], INT);
-	CHECK_TYPE(p_arr[1], STRING);
-	CHECK_TYPE(p_arr[2], ARRAY);
-
-	deserialize(uint64_t(p_arr[0]), p_arr[1], p_arr[2]);
-}
-
-void SceneDebuggerObject::deserialize(uint64_t p_id, const String &p_class_name, const Array &p_props) {
-	id = p_id;
-	class_name = p_class_name;
-
-	for (int i = 0; i < p_props.size(); i++) {
-		CHECK_TYPE(p_props[i], ARRAY);
-		Array prop = p_props[i];
-
-		ERR_FAIL_COND(prop.size() != 6);
-		CHECK_TYPE(prop[0], STRING);
-		CHECK_TYPE(prop[1], INT);
-		CHECK_TYPE(prop[2], INT);
-		CHECK_TYPE(prop[3], STRING);
-		CHECK_TYPE(prop[4], INT);
-
-		PropertyInfo pinfo;
-		pinfo.name = prop[0];
-		pinfo.type = Variant::Type(int(prop[1]));
-		pinfo.hint = PropertyHint(int(prop[2]));
-		pinfo.hint_string = prop[3];
-		pinfo.usage = PropertyUsageFlags(int(prop[4]));
-		Variant var = prop[5];
-
-		if (pinfo.type == Variant::OBJECT) {
-			if (var.is_zero()) {
-				var = Ref<Resource>();
-			} else if (var.get_type() == Variant::OBJECT) {
-				if (((Object *)var)->is_class("EncodedObjectAsID")) {
-					var = Object::cast_to<EncodedObjectAsID>(var)->get_object_id();
-					pinfo.type = var.get_type();
-					pinfo.hint = PROPERTY_HINT_OBJECT_ID;
-					if (pinfo.hint_string.is_empty()) {
-						pinfo.hint_string = "Object";
-					}
-				}
-			}
-		}
-		properties.push_back(SceneDebuggerProperty(pinfo, var));
-	}
-}
-
-SceneDebuggerTree::SceneDebuggerTree(Node *p_root) {
-	// Flatten tree into list, depth first, use stack to avoid recursion.
-	List<Node *> stack;
-	stack.push_back(p_root);
-	bool is_root = true;
-	const StringName &is_visible_sn = SNAME("is_visible");
-	const StringName &is_visible_in_tree_sn = SNAME("is_visible_in_tree");
-	while (stack.size()) {
-		Node *n = stack.front()->get();
-		stack.pop_front();
-
-		int count = n->get_child_count();
-		for (int i = 0; i < count; i++) {
-			stack.push_front(n->get_child(count - i - 1));
-		}
-
-		int view_flags = 0;
-		if (is_root) {
-			// Prevent root window visibility from being changed.
-			is_root = false;
-		} else if (n->has_method(is_visible_sn)) {
-			const Variant visible = n->call(is_visible_sn);
-			if (visible.get_type() == Variant::BOOL) {
-				view_flags = RemoteNode::VIEW_HAS_VISIBLE_METHOD;
-				view_flags |= uint8_t(visible) * RemoteNode::VIEW_VISIBLE;
-			}
-			if (n->has_method(is_visible_in_tree_sn)) {
-				const Variant visible_in_tree = n->call(is_visible_in_tree_sn);
-				if (visible_in_tree.get_type() == Variant::BOOL) {
-					view_flags |= uint8_t(visible_in_tree) * RemoteNode::VIEW_VISIBLE_IN_TREE;
-				}
-			}
-		}
-
-		String class_name;
-		ScriptInstance *script_instance = n->get_script_instance();
-		if (script_instance) {
-			Ref<Script> script = script_instance->get_script();
-			if (script.is_valid()) {
-				class_name = script->get_global_name();
-
-				if (class_name.is_empty()) {
-					// If there is no class_name in this script we just take the script path.
-					class_name = script->get_path();
-				}
-			}
-		}
-		nodes.push_back(RemoteNode(count, n->get_name(), class_name.is_empty() ? n->get_class() : class_name, n->get_instance_id(), n->get_scene_file_path(), view_flags));
-	}
-}
-
-void SceneDebuggerTree::serialize(Array &p_arr) {
-	for (const RemoteNode &n : nodes) {
-		p_arr.push_back(n.child_count);
-		p_arr.push_back(n.name);
-		p_arr.push_back(n.type_name);
-		p_arr.push_back(n.id);
-		p_arr.push_back(n.scene_file_path);
-		p_arr.push_back(n.view_flags);
-	}
-}
-
-void SceneDebuggerTree::deserialize(const Array &p_arr) {
-	int idx = 0;
-	while (p_arr.size() > idx) {
-		ERR_FAIL_COND(p_arr.size() < 6);
-		CHECK_TYPE(p_arr[idx], INT); // child_count.
-		CHECK_TYPE(p_arr[idx + 1], STRING); // name.
-		CHECK_TYPE(p_arr[idx + 2], STRING); // type_name.
-		CHECK_TYPE(p_arr[idx + 3], INT); // id.
-		CHECK_TYPE(p_arr[idx + 4], STRING); // scene_file_path.
-		CHECK_TYPE(p_arr[idx + 5], INT); // view_flags.
-		nodes.push_back(RemoteNode(p_arr[idx], p_arr[idx + 1], p_arr[idx + 2], p_arr[idx + 3], p_arr[idx + 4], p_arr[idx + 5]));
-		idx += 6;
-	}
-}
-
-#undef CHECK_TYPE
-
-#endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/scene_debugger_object.h b/engine/scene/debugger/scene_debugger_object.h
deleted file mode 100644
index 8035d2e5..00000000
--- a/engine/scene/debugger/scene_debugger_object.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/**************************************************************************/
-/*  scene_debugger_object.h                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#ifdef DEBUG_ENABLED
-
-#include "core/object/object.h"
-#include "core/string/ustring.h"
-#include "core/templates/list.h"
-#include "core/templates/pair.h"
-
-class Node;
-class Script;
-
-class SceneDebuggerObject {
-private:
-	void _parse_script_properties(Script *p_script, ScriptInstance *p_instance);
-
-public:
-	typedef Pair<PropertyInfo, Variant> SceneDebuggerProperty;
-	ObjectID id;
-	String class_name;
-	List<SceneDebuggerProperty> properties;
-
-	SceneDebuggerObject(ObjectID p_id);
-	SceneDebuggerObject(Object *p_obj);
-	SceneDebuggerObject() {}
-
-	void serialize(Array &r_arr, int p_max_size = 1 << 20);
-	void deserialize(const Array &p_arr);
-	void deserialize(uint64_t p_id, const String &p_class_name, const Array &p_props);
-};
-
-class SceneDebuggerTree {
-public:
-	struct RemoteNode {
-		int child_count = 0;
-		String name;
-		String type_name;
-		ObjectID id;
-		String scene_file_path;
-		uint8_t view_flags = 0;
-
-		enum ViewFlags {
-			VIEW_HAS_VISIBLE_METHOD = 1 << 1,
-			VIEW_VISIBLE = 1 << 2,
-			VIEW_VISIBLE_IN_TREE = 1 << 3,
-		};
-
-		RemoteNode(int p_child, const String &p_name, const String &p_type, ObjectID p_id, const String p_scene_file_path, int p_view_flags) {
-			child_count = p_child;
-			name = p_name;
-			type_name = p_type;
-			id = p_id;
-
-			scene_file_path = p_scene_file_path;
-			view_flags = p_view_flags;
-		}
-
-		RemoteNode() {}
-	};
-
-	List<RemoteNode> nodes;
-
-	void serialize(Array &r_arr);
-	void deserialize(const Array &p_arr);
-	SceneDebuggerTree(Node *p_root);
-	SceneDebuggerTree() {}
-};
-#endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/view_3d_controller.cpp b/engine/scene/debugger/view_3d_controller.cpp
deleted file mode 100644
index 55d6b51c..00000000
--- a/engine/scene/debugger/view_3d_controller.cpp
+++ /dev/null
@@ -1,800 +0,0 @@
-/**************************************************************************/
-/*  view_3d_controller.cpp                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef _3D_DISABLED
-
-#include "view_3d_controller.h"
-
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/input/shortcut.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-
-using namespace View3DControllerConsts;
-
-Transform3D View3DController::_to_camera_transform(const Cursor &p_cursor) const {
-	Transform3D camera_transform;
-	camera_transform.translate_local(p_cursor.pos);
-	camera_transform.basis.rotate(Vector3(1, 0, 0), -p_cursor.x_rot);
-	camera_transform.basis.rotate(Vector3(0, 1, 0), -p_cursor.y_rot);
-
-	if (orthogonal) {
-		camera_transform.translate_local(0, 0, (zfar - znear) / 2.0);
-	} else {
-		camera_transform.translate_local(0, 0, p_cursor.distance);
-	}
-
-	return camera_transform;
-}
-
-bool View3DController::_is_shortcut_pressed(const ShortcutName p_name, const bool p_true_if_null) {
-	Ref<Shortcut> shortcut = inputs[p_name];
-	if (shortcut.is_null()) {
-		return p_true_if_null;
-	}
-
-	const Array shortcuts = shortcut->get_events();
-	Ref<InputEventKey> k;
-	if (shortcuts.size() > 0) {
-		k = shortcuts.front();
-	}
-
-	if (k.is_null()) {
-		return p_true_if_null;
-	}
-
-#define EMULATE_NUMPAD_KEY(p_code) \
-	(emulate_numpad && p_code >= Key::KEY_0 && p_code <= Key::KEY_9 ? p_code - Key::KEY_0 + Key::KP_0 : p_code)
-
-	if (k->get_physical_keycode() == Key::NONE) {
-		return Input::get_singleton()->is_key_pressed(EMULATE_NUMPAD_KEY(k->get_keycode()));
-	}
-
-	return Input::get_singleton()->is_physical_key_pressed(EMULATE_NUMPAD_KEY(k->get_physical_keycode()));
-
-#undef EMULATE_NUMPAD_KEY
-}
-
-bool View3DController::_is_shortcut_empty(const ShortcutName p_name) {
-	Ref<Shortcut> shortcut = inputs[p_name];
-	if (shortcut.is_null()) {
-		return true;
-	}
-
-	const Array shortcuts = shortcut->get_events();
-	Ref<InputEventKey> k;
-	if (shortcuts.size() > 0) {
-		k = shortcuts.front();
-	}
-
-	return k.is_null();
-}
-
-View3DController::NavigationMode View3DController::_get_nav_mode_from_shortcuts(NavigationMouseButton p_mouse_button, const Vector<ShortcutCheck> &p_shortcut_checks, bool p_not_empty) {
-	if (p_not_empty) {
-		for (const ShortcutCheck &shortcut_check : p_shortcut_checks) {
-			if (shortcut_check.mod_pressed && shortcut_check.not_empty) {
-				return shortcut_check.result_nav_mode;
-			}
-		}
-	} else {
-		for (const ShortcutCheck &shortcut_check : p_shortcut_checks) {
-			if (shortcut_check.mouse_preference == p_mouse_button && shortcut_check.mod_pressed) {
-				return shortcut_check.result_nav_mode;
-			}
-		}
-	}
-
-	return NAV_MODE_NONE;
-}
-
-bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_surface_rect) {
-	Ref<InputEventMouseButton> b = p_event;
-	if (b.is_valid()) {
-		if (b->get_button_index() == MouseButton::RIGHT && b->is_pressed() && navigating) {
-			cancel_navigation();
-			return true;
-		}
-
-		const real_t zoom_factor = 1 + (ZOOM_FREELOOK_MULTIPLIER - 1) * b->get_factor();
-		switch (b->get_button_index()) {
-			case MouseButton::WHEEL_UP: {
-				if (freelook) {
-					scale_freelook_speed(zoom_factor);
-				} else {
-					scale_cursor_distance(1.0 / zoom_factor);
-				}
-			} break;
-			case MouseButton::WHEEL_DOWN: {
-				if (freelook) {
-					scale_freelook_speed(1.0 / zoom_factor);
-				} else {
-					scale_cursor_distance(zoom_factor);
-				}
-			} break;
-			default: {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	Vector<ShortcutCheck> shortcut_checks;
-
-	if (Input::get_singleton()->get_mouse_mode() != Input::MouseMode::MOUSE_MODE_CAPTURED) {
-#define GET_SHORTCUT_COUNT(p_name) (inputs[p_name].is_null() ? 0 : inputs[p_name]->get_events().size())
-
-		bool orbit_mod_pressed = _is_shortcut_pressed(SHORTCUT_ORBIT_MOD_1, true) && _is_shortcut_pressed(SHORTCUT_ORBIT_MOD_2, true);
-		bool pan_mod_pressed = _is_shortcut_pressed(SHORTCUT_PAN_MOD_1, true) && _is_shortcut_pressed(SHORTCUT_PAN_MOD_2, true);
-		bool zoom_mod_pressed = _is_shortcut_pressed(SHORTCUT_ZOOM_MOD_1, true) && _is_shortcut_pressed(SHORTCUT_ZOOM_MOD_2, true);
-		int orbit_mod_input_count = GET_SHORTCUT_COUNT(SHORTCUT_ORBIT_MOD_1) + GET_SHORTCUT_COUNT(SHORTCUT_ORBIT_MOD_2);
-		int pan_mod_input_count = GET_SHORTCUT_COUNT(SHORTCUT_PAN_MOD_1) + GET_SHORTCUT_COUNT(SHORTCUT_PAN_MOD_2);
-		int zoom_mod_input_count = GET_SHORTCUT_COUNT(SHORTCUT_ZOOM_MOD_1) + GET_SHORTCUT_COUNT(SHORTCUT_ZOOM_MOD_2);
-		bool orbit_not_empty = !_is_shortcut_empty(SHORTCUT_ORBIT_MOD_1) || !_is_shortcut_empty(SHORTCUT_ORBIT_MOD_2);
-		bool pan_not_empty = !_is_shortcut_empty(SHORTCUT_PAN_MOD_2) || !_is_shortcut_empty(SHORTCUT_PAN_MOD_2);
-		bool zoom_not_empty = !_is_shortcut_empty(SHORTCUT_ZOOM_MOD_1) || !_is_shortcut_empty(SHORTCUT_ZOOM_MOD_2);
-		shortcut_checks.push_back(ShortcutCheck(orbit_mod_pressed, orbit_not_empty, orbit_mod_input_count, orbit_mouse_button, NAV_MODE_ORBIT));
-		shortcut_checks.push_back(ShortcutCheck(pan_mod_pressed, pan_not_empty, pan_mod_input_count, pan_mouse_button, NAV_MODE_PAN));
-		shortcut_checks.push_back(ShortcutCheck(zoom_mod_pressed, zoom_not_empty, zoom_mod_input_count, zoom_mouse_button, NAV_MODE_ZOOM));
-		shortcut_checks.sort_custom<ShortcutCheckSetComparator>();
-
-#undef GET_SHORTCUT_COUNT
-	}
-
-	Ref<InputEventMouseMotion> m = p_event;
-	if (m.is_valid()) {
-		if (m->get_button_mask() == MouseButtonMask::NONE) {
-			navigation_cancelled = false;
-		}
-
-		if (navigation_cancelled) {
-			return false;
-		}
-
-		if (!navigating) {
-			previous_cursor = cursor;
-		}
-
-		NavigationMode nav_mode = NAV_MODE_NONE;
-
-		if (m->get_button_mask().has_flag(MouseButtonMask::LEFT)) {
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_LEFT, shortcut_checks, false);
-			if (change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			}
-		} else if (freelook || m->get_button_mask().has_flag(MouseButtonMask::RIGHT)) {
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_RIGHT, shortcut_checks, false);
-			if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) && change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			} else if (freelook) {
-				nav_mode = NAV_MODE_LOOK;
-			} else if (orthogonal) {
-				nav_mode = NAV_MODE_PAN;
-			}
-
-		} else if (m->get_button_mask().has_flag(MouseButtonMask::MIDDLE)) {
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_MIDDLE, shortcut_checks, false);
-			if (change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			}
-
-		} else if (m->get_button_mask().has_flag(MouseButtonMask::MB_XBUTTON1)) {
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_4, shortcut_checks, false);
-			if (change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			}
-
-		} else if (m->get_button_mask().has_flag(MouseButtonMask::MB_XBUTTON2)) {
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_5, shortcut_checks, false);
-			if (change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			}
-
-		} else if (emulate_3_button_mouse) {
-			// Handle trackpad (no external mouse) use case.
-			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcuts(NAV_MOUSE_BUTTON_LEFT, shortcut_checks, true);
-			if (change_nav_from_shortcut != NAV_MODE_NONE) {
-				nav_mode = change_nav_from_shortcut;
-			}
-		}
-
-		switch (nav_mode) {
-			case NAV_MODE_PAN: {
-				cursor_pan(m, get_warped_mouse_motion(m, p_surface_rect));
-			} break;
-
-			case NAV_MODE_ZOOM: {
-				cursor_zoom(m, m->get_relative());
-			} break;
-
-			case NAV_MODE_ORBIT: {
-				cursor_orbit(m, get_warped_mouse_motion(m, p_surface_rect));
-			} break;
-
-			case NAV_MODE_LOOK: {
-				cursor_look(m, get_warped_mouse_motion(m, p_surface_rect));
-			} break;
-
-			default: {
-				navigating = false;
-				return false;
-			}
-		}
-
-		if (!freelook) {
-			navigating = true;
-		}
-		return true;
-	}
-
-	Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
-	if (magnify_gesture.is_valid()) {
-		if (freelook) {
-			scale_freelook_speed(magnify_gesture->get_factor());
-		} else {
-			scale_cursor_distance(1.0 / magnify_gesture->get_factor());
-		}
-
-		return true;
-	}
-
-	Ref<InputEventPanGesture> pan_gesture = p_event;
-	if (pan_gesture.is_valid()) {
-		NavigationMode nav_mode = NAV_MODE_NONE;
-
-		for (const ShortcutCheck &shortcut_check_set : shortcut_checks) {
-			if (shortcut_check_set.mod_pressed) {
-				nav_mode = shortcut_check_set.result_nav_mode;
-				break;
-			}
-		}
-
-		switch (nav_mode) {
-			case NAV_MODE_PAN: {
-				cursor_pan(pan_gesture, -pan_gesture->get_delta());
-			} break;
-
-			case NAV_MODE_ZOOM: {
-				cursor_zoom(pan_gesture, pan_gesture->get_delta());
-			} break;
-
-			case NAV_MODE_ORBIT: {
-				cursor_orbit(pan_gesture, -pan_gesture->get_delta());
-			} break;
-
-			case NAV_MODE_LOOK: {
-				cursor_look(pan_gesture, pan_gesture->get_delta());
-			} break;
-
-			default: {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	Ref<InputEventKey> k = p_event;
-	if (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == Key::ESCAPE && navigating) {
-		cancel_navigation();
-		return true;
-	}
-
-	bool pressed = false;
-	float old_fov_scale = cursor.fov_scale;
-
-	if (_is_shortcut_pressed(SHORTCUT_FOV_DECREASE)) {
-		cursor.fov_scale = CLAMP(cursor.fov_scale - 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
-		pressed = true;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FOV_INCREASE)) {
-		cursor.fov_scale = CLAMP(cursor.fov_scale + 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
-		pressed = true;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FOV_RESET)) {
-		cursor.fov_scale = 1;
-		pressed = true;
-	}
-
-	if (old_fov_scale != cursor.fov_scale) {
-		emit_signal(SNAME("fov_scaled"));
-	}
-
-	return pressed;
-}
-
-void View3DController::cancel_navigation() {
-	navigating = false;
-	navigation_cancelled = true;
-	cursor = previous_cursor;
-}
-
-void View3DController::cursor_pan(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative) {
-	float pan_speed = translation_sensitivity / 150.0;
-	if (p_event.is_valid() && navigation_scheme == NAV_SCHEME_MAYA && p_event->is_shift_pressed()) {
-		pan_speed *= 10;
-	}
-
-	Transform3D camera_transform;
-
-	camera_transform.translate_local(cursor.pos);
-	camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
-	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
-	Vector3 translation(
-			(invert_x_axis ? -1 : 1) * -p_relative.x * pan_speed,
-			(invert_y_axis ? -1 : 1) * p_relative.y * pan_speed,
-			0);
-	translation *= cursor.distance / DISTANCE_DEFAULT;
-	camera_transform.translate_local(translation);
-	cursor.pos = camera_transform.origin;
-
-	emit_signal(SNAME("cursor_panned"));
-}
-
-void View3DController::cursor_orbit(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative) {
-	if (lock_rotation) {
-		cursor_pan(p_event, p_relative);
-		return;
-	}
-
-	const float radians_per_pixel = Math::deg_to_rad(orbit_sensitivity);
-
-	cursor.unsnapped_x_rot += p_relative.y * radians_per_pixel * (invert_y_axis ? -1 : 1);
-	cursor.unsnapped_x_rot = CLAMP(cursor.unsnapped_x_rot, -1.57, 1.57);
-	cursor.unsnapped_y_rot += p_relative.x * radians_per_pixel * (invert_x_axis ? -1 : 1);
-
-	cursor.x_rot = cursor.unsnapped_x_rot;
-	cursor.y_rot = cursor.unsnapped_y_rot;
-
-	ViewType new_view_type = VIEW_TYPE_USER;
-
-	bool snap_modifier_configured = !_is_shortcut_empty(SHORTCUT_ORBIT_SNAP_MOD_1) || !_is_shortcut_empty(SHORTCUT_ORBIT_SNAP_MOD_2);
-	if (snap_modifier_configured && _is_shortcut_pressed(SHORTCUT_ORBIT_SNAP_MOD_1, true) && _is_shortcut_pressed(SHORTCUT_ORBIT_SNAP_MOD_2, true)) {
-		const float snap_angle = Math::deg_to_rad(45.0);
-		const float snap_threshold = Math::deg_to_rad(angle_snap_threshold);
-
-		float x_rot_snapped = Math::snapped(cursor.unsnapped_x_rot, snap_angle);
-		float y_rot_snapped = Math::snapped(cursor.unsnapped_y_rot, snap_angle);
-
-		float x_dist = Math::abs(cursor.unsnapped_x_rot - x_rot_snapped);
-		float y_dist = Math::abs(cursor.unsnapped_y_rot - y_rot_snapped);
-
-		if (x_dist < snap_threshold && y_dist < snap_threshold) {
-			cursor.x_rot = x_rot_snapped;
-			cursor.y_rot = y_rot_snapped;
-
-			float y_rot_wrapped = Math::wrapf(y_rot_snapped, (float)-Math::PI, (float)Math::PI);
-
-			if (Math::abs(x_rot_snapped) < snap_threshold) {
-				// Only switch to ortho for 90-degree views.
-				if (Math::abs(y_rot_wrapped) < snap_threshold) {
-					new_view_type = VIEW_TYPE_FRONT;
-				} else if (Math::abs(Math::abs(y_rot_wrapped) - Math::PI) < snap_threshold) {
-					new_view_type = VIEW_TYPE_REAR;
-				} else if (Math::abs(y_rot_wrapped - Math::PI / 2.0) < snap_threshold) {
-					new_view_type = VIEW_TYPE_LEFT;
-				} else if (Math::abs(y_rot_wrapped + Math::PI / 2.0) < snap_threshold) {
-					new_view_type = VIEW_TYPE_RIGHT;
-				}
-
-			} else if (Math::abs(Math::abs(x_rot_snapped) - Math::PI / 2.0) < snap_threshold) {
-				if (Math::abs(y_rot_wrapped) < snap_threshold ||
-						Math::abs(Math::abs(y_rot_wrapped) - Math::PI) < snap_threshold ||
-						Math::abs(y_rot_wrapped - Math::PI / 2.0) < snap_threshold ||
-						Math::abs(y_rot_wrapped + Math::PI / 2.0) < snap_threshold) {
-					new_view_type = x_rot_snapped > 0 ? VIEW_TYPE_TOP : VIEW_TYPE_BOTTOM;
-				}
-			}
-		}
-	}
-
-	set_view_type(new_view_type);
-}
-
-void View3DController::cursor_look(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative) {
-	if (orthogonal) {
-		cursor_pan(p_event, p_relative);
-		return;
-	}
-
-	// Scale mouse sensitivity with camera FOV scale when zoomed in to make it easier to point at things.
-	const float degrees_per_pixel = freelook_sensitivity * MIN(1.0, cursor.fov_scale);
-	const float radians_per_pixel = Math::deg_to_rad(degrees_per_pixel);
-
-	// Note: do NOT assume the camera has the "current" transform, because it is interpolated and may have "lag".
-	const Transform3D prev_camera_transform = to_camera_transform();
-
-	if (freelook_invert_y_axis) {
-		cursor.x_rot -= p_relative.y * radians_per_pixel;
-	} else {
-		cursor.x_rot += p_relative.y * radians_per_pixel;
-	}
-
-	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
-	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
-	cursor.unsnapped_x_rot = cursor.x_rot;
-
-	cursor.y_rot += p_relative.x * radians_per_pixel;
-	cursor.unsnapped_y_rot = cursor.y_rot;
-
-	// Look is like the opposite of Orbit: the focus point rotates around the camera
-	Transform3D camera_transform = to_camera_transform();
-	Vector3 pos = camera_transform.xform(Vector3(0, 0, 0));
-	Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0));
-	Vector3 diff = prev_pos - pos;
-	cursor.pos += diff;
-
-	set_view_type(VIEW_TYPE_USER);
-}
-
-void View3DController::cursor_zoom(const Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
-	float zoom_speed = 1 / 80.0;
-	if (p_event.is_valid() && navigation_scheme == NAV_SCHEME_MAYA && p_event->is_shift_pressed()) {
-		zoom_speed *= 10;
-	}
-
-	if (zoom_style == ZOOM_HORIZONTAL) {
-		if (p_relative.x > 0) {
-			scale_cursor_distance(1 - p_relative.x * zoom_speed);
-		} else if (p_relative.x < 0) {
-			scale_cursor_distance(1.0 / (1 + p_relative.x * zoom_speed));
-		}
-	} else {
-		if (p_relative.y > 0) {
-			scale_cursor_distance(1 + p_relative.y * zoom_speed);
-		} else if (p_relative.y < 0) {
-			scale_cursor_distance(1.0 / (1 - p_relative.y * zoom_speed));
-		}
-	}
-}
-
-void View3DController::update_camera(const real_t p_delta) {
-	View3DController::Cursor old_camera_cursor = cursor_interp;
-	cursor_interp = cursor;
-	bool equal = true;
-
-	if (p_delta > 0) {
-		// Perform smoothing.
-
-		if (freelook) {
-			// Higher inertia should increase "lag" (lerp with factor between 0 and 1).
-			// Inertia of zero should produce instant movement (lerp with factor of 1) in this case it returns a really high value and gets clamped to 1.
-			float factor = (1.0 / freelook_inertia) * p_delta;
-
-			// We interpolate a different point here, because in freelook mode the focus point (cursor.pos) orbits around eye_pos
-			cursor_interp.eye_pos = old_camera_cursor.eye_pos.lerp(cursor.eye_pos, CLAMP(factor, 0, 1));
-		}
-
-		cursor_interp.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_delta * (1 / orbit_inertia)));
-		cursor_interp.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_delta * (1 / orbit_inertia)));
-
-		if (Math::abs(cursor_interp.x_rot - cursor.x_rot) < 0.1) {
-			cursor_interp.x_rot = cursor.x_rot;
-		}
-		if (Math::abs(cursor_interp.y_rot - cursor.y_rot) < 0.1) {
-			cursor_interp.y_rot = cursor.y_rot;
-		}
-
-		if (freelook) {
-			Vector3 forward = _to_camera_transform(cursor_interp).basis.xform(Vector3(0, 0, -1));
-			cursor_interp.pos = cursor_interp.eye_pos + forward * cursor_interp.distance;
-		} else {
-			cursor_interp.pos = old_camera_cursor.pos.lerp(cursor.pos, MIN(1.f, p_delta * (1 / translation_inertia)));
-			cursor_interp.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN((float)1.0, p_delta * (1 / zoom_inertia)));
-		}
-
-		// Apply camera transform.
-
-		const real_t tolerance = 0.001;
-		if (!Math::is_equal_approx(old_camera_cursor.x_rot, cursor_interp.x_rot, tolerance) || !Math::is_equal_approx(old_camera_cursor.y_rot, cursor_interp.y_rot, tolerance)) {
-			equal = false;
-		} else if (!old_camera_cursor.pos.is_equal_approx(cursor_interp.pos)) {
-			equal = false;
-		} else if (!Math::is_equal_approx(old_camera_cursor.distance, cursor_interp.distance, tolerance)) {
-			equal = false;
-		} else if (!Math::is_equal_approx(old_camera_cursor.fov_scale, cursor_interp.fov_scale, tolerance)) {
-			equal = false;
-		}
-	}
-
-	if (p_delta == 0 || !equal) {
-		emit_signal(SNAME("cursor_interpolated"));
-	}
-}
-
-void View3DController::update_freelook(const float p_delta) {
-	if (!freelook) {
-		return;
-	}
-
-	const Transform3D camera_transform = to_camera_transform();
-
-	Vector3 forward;
-	if (freelook_scheme == FREELOOK_FULLY_AXIS_LOCKED) {
-		// Forward/backward keys will always go straight forward/backward, never moving on the Y axis.
-		forward = Vector3(0, 0, -1).rotated(Vector3(0, 1, 0), camera_transform.get_basis().get_euler().y);
-	} else {
-		// Forward/backward keys will be relative to the camera pitch.
-		forward = camera_transform.basis.xform(Vector3(0, 0, -1));
-	}
-
-	const Vector3 right = camera_transform.basis.xform(Vector3(1, 0, 0));
-
-	Vector3 up;
-	if (freelook_scheme == View3DController::FREELOOK_PARTIALLY_AXIS_LOCKED || freelook_scheme == View3DController::FREELOOK_FULLY_AXIS_LOCKED) {
-		// Up/down keys will always go up/down regardless of camera pitch.
-		up = Vector3(0, 1, 0);
-	} else {
-		// Up/down keys will be relative to the camera pitch.
-		up = camera_transform.basis.xform(Vector3(0, 1, 0));
-	}
-
-	Vector3 direction;
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_LEFT)) {
-		direction -= right;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_RIGHT)) {
-		direction += right;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_FORWARD)) {
-		direction += forward;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_BACKWARDS)) {
-		direction -= forward;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_UP)) {
-		direction += up;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_DOWN)) {
-		direction -= up;
-	}
-
-	real_t speed = freelook_speed;
-
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_SPEED_MOD)) {
-		speed *= 3.0;
-	}
-	if (_is_shortcut_pressed(SHORTCUT_FREELOOK_SLOW_MOD)) {
-		speed *= 0.333333;
-	}
-
-	const Vector3 motion = direction * speed * p_delta;
-	cursor.pos += motion;
-	cursor.eye_pos += motion;
-}
-
-void View3DController::scale_freelook_speed(const float p_scale) {
-	float min_speed = MAX(znear * 4, ZOOM_FREELOOK_MIN);
-	float max_speed = MIN(zfar / 4, ZOOM_FREELOOK_MAX);
-	if (unlikely(min_speed > max_speed)) {
-		freelook_speed = (min_speed + max_speed) / 2;
-	} else {
-		freelook_speed = CLAMP(freelook_speed * p_scale, min_speed, max_speed);
-	}
-
-	emit_signal(SNAME("freelook_speed_scaled"));
-}
-
-void View3DController::scale_cursor_distance(const float p_scale) {
-	float min_distance = MAX(znear * 4, ZOOM_FREELOOK_MIN);
-	float max_distance = MIN(zfar / 4, ZOOM_FREELOOK_MAX);
-	if (unlikely(min_distance > max_distance)) {
-		cursor.distance = (min_distance + max_distance) / 2;
-	} else {
-		cursor.distance = CLAMP(cursor.distance * p_scale, min_distance, max_distance);
-	}
-
-	if (cursor.distance == max_distance || cursor.distance == min_distance) {
-		zoom_failed_attempts_count++;
-	} else {
-		zoom_failed_attempts_count = 0;
-	}
-
-	emit_signal(SNAME("cursor_distance_scaled"));
-}
-
-void View3DController::set_shortcut(const ShortcutName p_name, const Ref<Shortcut> &p_shortcut) {
-	ERR_FAIL_INDEX(0, SHORTCUT_MAX);
-	ERR_FAIL_COND(p_shortcut.is_null());
-	inputs[p_name] = p_shortcut;
-}
-
-void View3DController::set_view_type(const ViewType p_view) {
-	ViewType view_type_old = view_type;
-	OrthogonalMode orthogonal_old = orthogonal;
-
-	view_type = p_view;
-	if (view_type != VIEW_TYPE_USER) {
-		if (auto_orthogonal_allowed && orthogonal != ORTHOGONAL_ENABLED) {
-			orthogonal = ORTHOGONAL_AUTO;
-		}
-	} else if (orthogonal == ORTHOGONAL_AUTO) {
-		orthogonal = ORTHOGONAL_DISABLED;
-	}
-
-	if (view_type_old != view_type || orthogonal_old != orthogonal) {
-		emit_signal(SNAME("view_state_changed"));
-	}
-}
-
-String View3DController::get_view_type_name() const {
-	String name;
-
-	switch (view_type) {
-		case VIEW_TYPE_USER: {
-			if (orthogonal) {
-				name = RTR("Orthogonal");
-			} else {
-				name = RTR("Perspective");
-			}
-		} break;
-		case VIEW_TYPE_TOP: {
-			if (orthogonal) {
-				name = RTR("Top Orthogonal");
-			} else {
-				name = RTR("Top Perspective");
-			}
-		} break;
-		case VIEW_TYPE_BOTTOM: {
-			if (orthogonal) {
-				name = RTR("Bottom Orthogonal");
-			} else {
-				name = RTR("Bottom Perspective");
-			}
-		} break;
-		case VIEW_TYPE_LEFT: {
-			if (orthogonal) {
-				name = RTR("Left Orthogonal");
-			} else {
-				name = RTR("Left Perspective");
-			}
-		} break;
-		case VIEW_TYPE_RIGHT: {
-			if (orthogonal) {
-				name = RTR("Right Orthogonal");
-			} else {
-				name = RTR("Right Perspective");
-			}
-		} break;
-		case VIEW_TYPE_FRONT: {
-			if (orthogonal) {
-				name = RTR("Front Orthogonal");
-			} else {
-				name = RTR("Front Perspective");
-			}
-		} break;
-		case VIEW_TYPE_REAR: {
-			if (orthogonal) {
-				name = RTR("Rear Orthogonal");
-			} else {
-				name = RTR("Rear Perspective");
-			}
-		} break;
-	}
-
-	if (orthogonal == ORTHOGONAL_AUTO) {
-		// TRANSLATORS: This will be appended to the view name when Auto Orthogonal is enabled.
-		name += " " + RTR("[auto]");
-	}
-
-	return name;
-}
-
-void View3DController::set_freelook_enabled(const bool p_enabled) {
-	if (freelook == p_enabled) {
-		return;
-	}
-
-	freelook = p_enabled;
-
-	// Sync interpolated cursor to cursor to "cut" interpolation jumps due to changing referential.
-	cursor = cursor_interp;
-
-	if (freelook) {
-		// Make sure eye_pos is synced, because freelook referential is eye pos rather than orbit pos.
-		Vector3 forward = to_camera_transform().basis.xform(Vector3(0, 0, -1));
-		cursor.eye_pos = cursor.pos - cursor.distance * forward;
-		// Also sync the interpolated cursor's eye_pos, otherwise switching to freelook will be trippy if inertia is active.
-		cursor_interp.eye_pos = cursor.eye_pos;
-
-		if (freelook_speed_zoom_link) {
-			// Re-adjust freelook speed from the current zoom level.
-			freelook_speed = freelook_base_speed * cursor.distance;
-		}
-
-		previous_mouse_position = SceneTree::get_singleton()->get_root()->get_mouse_position();
-
-		// Hide mouse like in an FPS (warping doesn't work).
-		if (Engine::get_singleton()->is_editor_hint()) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
-		} else {
-			Input::get_singleton()->set_mouse_mode_override(Input::MouseMode::MOUSE_MODE_CAPTURED);
-		}
-	} else {
-		// Restore mouse.
-		if (Engine::get_singleton()->is_editor_hint()) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
-		} else {
-			Input::get_singleton()->set_mouse_mode_override(Input::MouseMode::MOUSE_MODE_VISIBLE);
-		}
-
-		// Restore the previous mouse position when leaving freelook mode.
-		// This is done because leaving `Input.MOUSE_MODE_CAPTURED` will center the cursor
-		// due to OS limitations.
-		Input::get_singleton()->warp_mouse(previous_mouse_position);
-	}
-
-	emit_signal(SNAME("freelook_changed"));
-}
-
-void View3DController::set_freelook_base_speed(const float p_speed) {
-	freelook_base_speed = p_speed;
-	freelook_speed = p_speed;
-}
-
-void View3DController::force_auto_orthogonal() {
-	if (auto_orthogonal_allowed) {
-		orthogonal = ORTHOGONAL_AUTO;
-	}
-}
-
-void View3DController::set_auto_orthogonal_allowed(const bool p_enabled) {
-	auto_orthogonal_allowed = p_enabled;
-
-	if (!p_enabled && orthogonal == ORTHOGONAL_AUTO) {
-		orthogonal = ORTHOGONAL_ENABLED;
-	}
-}
-
-Point2 View3DController::get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, const Rect2 &p_surface_rect) const {
-	if (warped_mouse_panning) {
-		return Input::get_singleton()->warp_mouse_motion(p_event, p_surface_rect);
-	}
-
-	return p_event->get_relative();
-}
-
-void View3DController::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("view_state_changed"));
-
-	ADD_SIGNAL(MethodInfo("fov_scaled"));
-
-	ADD_SIGNAL(MethodInfo("freelook_changed"));
-	ADD_SIGNAL(MethodInfo("freelook_speed_scaled"));
-
-	ADD_SIGNAL(MethodInfo("cursor_panned"));
-	ADD_SIGNAL(MethodInfo("cursor_interpolated"));
-	ADD_SIGNAL(MethodInfo("cursor_distance_scaled"));
-}
-
-#endif // _3D_DISABLED
diff --git a/engine/scene/debugger/view_3d_controller.h b/engine/scene/debugger/view_3d_controller.h
deleted file mode 100644
index c61c78c8..00000000
--- a/engine/scene/debugger/view_3d_controller.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/**************************************************************************/
-/*  view_3d_controller.h                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#ifndef _3D_DISABLED
-
-#include "core/object/ref_counted.h"
-
-namespace View3DControllerConsts {
-constexpr float DISTANCE_DEFAULT = 4;
-
-constexpr float ZOOM_FREELOOK_MULTIPLIER = 1.08;
-constexpr float ZOOM_FREELOOK_MIN = 0.01;
-#ifdef REAL_T_IS_DOUBLE
-constexpr double ZOOM_FREELOOK_MAX = 1'000'000'000'000;
-#else
-constexpr float ZOOM_FREELOOK_MAX = 10'000;
-#endif
-
-constexpr float CAMERA_MIN_FOV_SCALE = 0.1;
-constexpr float CAMERA_MAX_FOV_SCALE = 2.5;
-} //namespace View3DControllerConsts
-
-class InputEvent;
-class InputEventMouseMotion;
-class InputEventWithModifiers;
-class Shortcut;
-
-class View3DController : public RefCounted {
-	GDCLASS(View3DController, RefCounted);
-
-public:
-	enum NavigationMode {
-		NAV_MODE_NONE,
-		NAV_MODE_PAN,
-		NAV_MODE_ZOOM,
-		NAV_MODE_ORBIT,
-		NAV_MODE_LOOK,
-		NAV_MODE_MOVE,
-	};
-
-	enum NavigationScheme {
-		NAV_SCHEME_GODOT,
-		NAV_SCHEME_MAYA,
-		NAV_SCHEME_MODO,
-		NAV_SCHEME_CUSTOM,
-		NAV_SCHEME_TABLET,
-	};
-
-	enum NavigationMouseButton {
-		NAV_MOUSE_BUTTON_LEFT,
-		NAV_MOUSE_BUTTON_MIDDLE,
-		NAV_MOUSE_BUTTON_RIGHT,
-		NAV_MOUSE_BUTTON_4,
-		NAV_MOUSE_BUTTON_5,
-	};
-
-	enum ZoomStyle {
-		ZOOM_VERTICAL,
-		ZOOM_HORIZONTAL,
-	};
-
-	enum FreelookScheme {
-		FREELOOK_DEFAULT,
-		FREELOOK_PARTIALLY_AXIS_LOCKED,
-		FREELOOK_FULLY_AXIS_LOCKED,
-	};
-
-	enum ViewType {
-		VIEW_TYPE_USER,
-		VIEW_TYPE_TOP,
-		VIEW_TYPE_BOTTOM,
-		VIEW_TYPE_LEFT,
-		VIEW_TYPE_RIGHT,
-		VIEW_TYPE_FRONT,
-		VIEW_TYPE_REAR,
-	};
-
-	enum OrthogonalMode {
-		ORTHOGONAL_DISABLED,
-		ORTHOGONAL_ENABLED,
-		ORTHOGONAL_AUTO,
-	};
-
-	enum ShortcutName {
-		SHORTCUT_FOV_INCREASE,
-		SHORTCUT_FOV_DECREASE,
-		SHORTCUT_FOV_RESET,
-
-		SHORTCUT_PAN_MOD_1,
-		SHORTCUT_PAN_MOD_2,
-
-		SHORTCUT_ORBIT_MOD_1,
-		SHORTCUT_ORBIT_MOD_2,
-		SHORTCUT_ORBIT_SNAP_MOD_1,
-		SHORTCUT_ORBIT_SNAP_MOD_2,
-
-		SHORTCUT_ZOOM_MOD_1,
-		SHORTCUT_ZOOM_MOD_2,
-
-		SHORTCUT_FREELOOK_FORWARD,
-		SHORTCUT_FREELOOK_BACKWARDS,
-		SHORTCUT_FREELOOK_LEFT,
-		SHORTCUT_FREELOOK_RIGHT,
-		SHORTCUT_FREELOOK_UP,
-		SHORTCUT_FREELOOK_DOWN,
-		SHORTCUT_FREELOOK_SPEED_MOD,
-		SHORTCUT_FREELOOK_SLOW_MOD,
-
-		SHORTCUT_MAX,
-	};
-
-	struct Cursor {
-		Vector3 pos;
-		real_t x_rot;
-		real_t y_rot;
-		real_t distance;
-		real_t fov_scale;
-		real_t unsnapped_x_rot;
-		real_t unsnapped_y_rot;
-		Vector3 eye_pos; // Used for freelook.
-		// TODO: These variables are not related to cursor manipulation, and specific
-		// to Node3DEditorPlugin. So remove them in the future.
-		bool region_select;
-		Point2 region_begin;
-		Point2 region_end;
-
-		Cursor() {
-			// These rotations place the camera in +X +Y +Z, aka south east, facing north west.
-			x_rot = 0.5;
-			y_rot = -0.5;
-			unsnapped_x_rot = x_rot;
-			unsnapped_y_rot = y_rot;
-			distance = 4;
-			fov_scale = 1.0;
-			region_select = false;
-		}
-	};
-
-	// Viewport camera supports movement smoothing,
-	// so one cursor is the real cursor, while the other can be an interpolated version.
-	Cursor cursor; // Immediate cursor.
-
-private:
-	Cursor cursor_interp; // That one may be interpolated (don't modify this one except for smoothing purposes).
-	Cursor previous_cursor; // Storing previous cursor state for canceling purposes.
-	bool navigating = false;
-	bool navigation_cancelled = false;
-	void cancel_navigation();
-
-protected:
-	static void _bind_methods();
-
-private:
-	HashMap<int, Ref<Shortcut>> inputs;
-
-	NavigationScheme navigation_scheme = NAV_SCHEME_GODOT;
-	ViewType view_type = VIEW_TYPE_USER;
-
-	NavigationMouseButton pan_mouse_button = NAV_MOUSE_BUTTON_MIDDLE;
-
-	NavigationMouseButton orbit_mouse_button = NAV_MOUSE_BUTTON_MIDDLE;
-	float orbit_sensitivity = 0;
-	float orbit_inertia = 0;
-
-	bool freelook = false;
-	FreelookScheme freelook_scheme = FREELOOK_DEFAULT;
-	float freelook_speed = 0;
-	float freelook_base_speed = 0;
-	float freelook_speed_zoom_link = 0;
-	float freelook_sensitivity = 0;
-	float freelook_inertia = 0;
-	bool freelook_invert_y_axis = false;
-
-	ZoomStyle zoom_style = ZOOM_VERTICAL;
-	NavigationMouseButton zoom_mouse_button = NAV_MOUSE_BUTTON_MIDDLE;
-	float zoom_inertia = 0;
-	int zoom_failed_attempts_count = 0;
-
-	float translation_sensitivity = 0;
-	float translation_inertia = 0;
-
-	float angle_snap_threshold = 0;
-	bool warped_mouse_panning = false;
-
-	bool emulate_3_button_mouse = false;
-	bool emulate_numpad = true;
-
-	OrthogonalMode orthogonal = ORTHOGONAL_DISABLED;
-	bool auto_orthogonal_allowed = false;
-
-	bool lock_rotation = false;
-
-	float znear = 0;
-	float zfar = 0;
-
-	bool invert_x_axis = false;
-	bool invert_y_axis = false;
-
-	Point2 previous_mouse_position;
-
-	Transform3D _to_camera_transform(const Cursor &p_cursor) const;
-
-	struct ShortcutCheck {
-		bool mod_pressed = false;
-		bool not_empty = true;
-		int input_count = 0;
-		NavigationMouseButton mouse_preference = NAV_MOUSE_BUTTON_LEFT;
-		NavigationMode result_nav_mode = NAV_MODE_NONE;
-
-		ShortcutCheck(bool p_mod_pressed, bool p_not_empty, int p_input_count, const NavigationMouseButton &p_mouse_preference, const NavigationMode &p_result_nav_mode) :
-				mod_pressed(p_mod_pressed), not_empty(p_not_empty), input_count(p_input_count), mouse_preference(p_mouse_preference), result_nav_mode(p_result_nav_mode) {
-		}
-	};
-
-	struct ShortcutCheckSetComparator {
-		_FORCE_INLINE_ bool operator()(const ShortcutCheck &A, const ShortcutCheck &B) const {
-			return A.input_count > B.input_count;
-		}
-	};
-
-	bool _is_shortcut_pressed(const ShortcutName p_name, const bool p_true_if_null = false);
-	bool _is_shortcut_empty(const ShortcutName p_name);
-	NavigationMode _get_nav_mode_from_shortcuts(NavigationMouseButton p_mouse_button, const Vector<ShortcutCheck> &p_shortcut_checks, bool p_not_empty);
-
-public:
-	bool gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_surface_rect);
-	bool is_navigating() const { return navigating; }
-
-	void cursor_pan(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative);
-	void cursor_look(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative);
-	void cursor_orbit(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative);
-	void cursor_zoom(const Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative);
-
-	void update_camera(const real_t p_delta = 0);
-
-	void update_freelook(const float p_delta);
-	void scale_freelook_speed(const float p_scale);
-
-	void scale_cursor_distance(const float p_scale);
-
-	inline Transform3D to_camera_transform() const { return _to_camera_transform(cursor); }
-	inline Transform3D interp_to_camera_transform() const { return _to_camera_transform(cursor_interp); }
-
-	void set_shortcut(const ShortcutName p_name, const Ref<Shortcut> &p_shortcut);
-
-	void set_navigation_scheme(const NavigationScheme p_scheme) { navigation_scheme = p_scheme; }
-
-	void set_view_type(const ViewType p_view);
-	ViewType get_view_type() const { return view_type; }
-	String get_view_type_name() const;
-
-	void set_pan_mouse_button(const NavigationMouseButton p_button) { pan_mouse_button = p_button; }
-
-	void set_orbit_sensitivity(const float p_sensitivity) { orbit_sensitivity = p_sensitivity; }
-	void set_orbit_inertia(const float p_inertia) { orbit_inertia = p_inertia; }
-	void set_orbit_mouse_button(const NavigationMouseButton p_button) { orbit_mouse_button = p_button; }
-
-	void set_freelook_enabled(const bool p_enabled);
-	bool is_freelook_enabled() const { return freelook; }
-	void set_freelook_scheme(FreelookScheme p_scheme) { freelook_scheme = p_scheme; }
-	FreelookScheme get_freelook_scheme() const { return freelook_scheme; }
-	void set_freelook_base_speed(const float p_speed);
-	float get_freelook_speed() const { return freelook_speed; }
-	void set_freelook_sensitivity(const float p_sensitivity) { freelook_sensitivity = p_sensitivity; }
-	void set_freelook_inertia(const float p_inertia) { freelook_inertia = p_inertia; }
-	void set_freelook_speed_zoom_link(const bool p_enabled) { freelook_speed_zoom_link = p_enabled; }
-	void set_freelook_invert_y_axis(const bool p_enabled) { freelook_invert_y_axis = p_enabled; }
-
-	void set_zoom_style(ZoomStyle p_style) { zoom_style = p_style; }
-	void set_zoom_inertia(const float p_inertia) { zoom_inertia = p_inertia; }
-	void set_zoom_mouse_button(const NavigationMouseButton p_button) { zoom_mouse_button = p_button; }
-
-	void set_translation_sensitivity(const float p_sensitivity) { translation_sensitivity = p_sensitivity; }
-	void set_translation_inertia(const float p_inertia) { translation_inertia = p_inertia; }
-
-	void set_angle_snap_threshold(const float p_threshold) { angle_snap_threshold = p_threshold; }
-
-	void set_emulate_3_button_mouse(const bool p_enabled) { emulate_3_button_mouse = p_enabled; }
-	void set_emulate_numpad(const bool p_enabled) { emulate_numpad = p_enabled; }
-
-	void set_orthogonal(const bool p_enabled) { orthogonal = p_enabled ? ORTHOGONAL_ENABLED : ORTHOGONAL_DISABLED; }
-	bool is_orthogonal() const { return orthogonal != ORTHOGONAL_DISABLED; }
-	OrthogonalMode get_orthogonal_mode() const { return orthogonal; }
-	void force_auto_orthogonal();
-	void set_auto_orthogonal_allowed(const bool p_enabled);
-
-	void set_lock_rotation(const bool p_locked) { lock_rotation = p_locked; }
-	bool is_locking_rotation() { return lock_rotation; }
-
-	void set_z_near(const float p_near) { znear = p_near; }
-	void set_z_far(const float p_far) { zfar = p_far; }
-
-	void set_invert_x_axis(const bool p_invert) { invert_x_axis = p_invert; }
-	void set_invert_y_axis(const bool p_invert) { invert_y_axis = p_invert; }
-
-	void set_warped_mouse_panning(const bool p_enabled) { warped_mouse_panning = p_enabled; }
-	Point2 get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, const Rect2 &p_surface_rect) const;
-
-	int get_zoom_failed_attempts_count() const { return zoom_failed_attempts_count; }
-};
-
-#endif // _3D_DISABLED
diff --git a/engine/scene/gui/aspect_ratio_container.cpp b/engine/scene/gui/aspect_ratio_container.cpp
index 96064094..d012268e 100644
--- a/engine/scene/gui/aspect_ratio_container.cpp
+++ b/engine/scene/gui/aspect_ratio_container.cpp
@@ -30,7 +30,6 @@
 
 #include "aspect_ratio_container.h"
 
-#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 
 Size2 AspectRatioContainer::get_minimum_size() const {
diff --git a/engine/scene/gui/base_button.cpp b/engine/scene/gui/base_button.cpp
index 598670b5..7ae19e33 100644
--- a/engine/scene/gui/base_button.cpp
+++ b/engine/scene/gui/base_button.cpp
@@ -31,11 +31,9 @@
 #include "base_button.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/label.h"
 #include "scene/main/timer.h"
-#include "servers/display/accessibility_server.h"
+#include "scene/main/window.h"
 
 void BaseButton::_unpress_group() {
 	if (button_group.is_null()) {
@@ -113,19 +111,19 @@ void BaseButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &BaseButton::_accessibility_action_click));
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED, status.disabled);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &BaseButton::_accessibility_action_click));
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_DISABLED, status.disabled);
 			if (toggle_mode) {
-				AccessibilityServer::get_singleton()->update_set_checked(ae, status.pressed);
+				DisplayServer::get_singleton()->accessibility_update_set_checked(ae, status.pressed);
 			}
 			if (button_group.is_valid()) {
 				for (const BaseButton *btn : button_group->buttons) {
 					if (btn->is_part_of_edited_scene()) {
 						continue;
 					}
-					AccessibilityServer::get_singleton()->update_add_related_radio_group(ae, btn->get_accessibility_element());
+					DisplayServer::get_singleton()->accessibility_update_add_related_radio_group(ae, btn->get_accessibility_element());
 				}
 			}
 			if (shortcut_in_tooltip && shortcut.is_valid() && shortcut->has_valid_event()) {
@@ -134,7 +132,7 @@ void BaseButton::_notification(int p_what) {
 				if (!tooltip.is_empty() && shortcut->get_name().nocasecmp_to(tooltip) != 0) {
 					text += "\n" + atr(tooltip);
 				}
-				AccessibilityServer::get_singleton()->update_set_tooltip(ae, text);
+				DisplayServer::get_singleton()->accessibility_update_set_tooltip(ae, text);
 			}
 		} break;
 
@@ -475,21 +473,11 @@ Control *BaseButton::make_custom_tooltip(const String &p_text) const {
 	if (control) {
 		return control;
 	}
-
-	if (!shortcut_in_tooltip || shortcut.is_null()) {
+	if (!shortcut_in_tooltip || shortcut.is_null() || !shortcut->has_valid_event()) {
 		return nullptr; // Use the default tooltip label.
 	}
 
-	bool shortcut_has_events = shortcut->has_valid_event();
-	if (!shortcut_has_events && shortcut->get_name().is_empty()) {
-		return nullptr;
-	}
-
-	String text = atr(shortcut->get_name());
-	if (shortcut_has_events) {
-		text += " (" + shortcut->get_as_text() + ")";
-	}
-
+	String text = atr(shortcut->get_name()) + " (" + shortcut->get_as_text() + ")";
 	if (!p_text.is_empty() && shortcut->get_name().nocasecmp_to(p_text) != 0) {
 		text += "\n" + atr(p_text);
 	}
@@ -582,10 +570,10 @@ void BaseButton::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "action_mode", PROPERTY_HINT_ENUM, "Button Press,Button Release"), "set_action_mode", "get_action_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "button_mask", PROPERTY_HINT_FLAGS, "Mouse Left, Mouse Right, Mouse Middle"), "set_button_mask", "get_button_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_pressed_outside"), "set_keep_pressed_outside", "is_keep_pressed_outside");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "button_group", PROPERTY_HINT_RESOURCE_TYPE, ButtonGroup::get_class_static()), "set_button_group", "get_button_group");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "button_group", PROPERTY_HINT_RESOURCE_TYPE, "ButtonGroup"), "set_button_group", "get_button_group");
 
 	ADD_GROUP("Shortcut", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, Shortcut::get_class_static()), "set_shortcut", "get_shortcut");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "Shortcut"), "set_shortcut", "get_shortcut");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_feedback"), "set_shortcut_feedback", "is_shortcut_feedback");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_in_tooltip"), "set_shortcut_in_tooltip", "is_shortcut_in_tooltip_enabled");
 
@@ -651,7 +639,7 @@ void ButtonGroup::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_unpress"), "set_allow_unpress", "is_allow_unpress");
 
-	ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::OBJECT, "button", PROPERTY_HINT_RESOURCE_TYPE, BaseButton::get_class_static())));
+	ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::OBJECT, "button", PROPERTY_HINT_RESOURCE_TYPE, "BaseButton")));
 }
 
 ButtonGroup::ButtonGroup() {
diff --git a/engine/scene/gui/box_container.cpp b/engine/scene/gui/box_container.cpp
index f4ee3459..e5d73769 100644
--- a/engine/scene/gui/box_container.cpp
+++ b/engine/scene/gui/box_container.cpp
@@ -30,7 +30,6 @@
 
 #include "box_container.h"
 
-#include "core/object/class_db.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
 #include "scene/theme/theme_db.h"
diff --git a/engine/scene/gui/button.cpp b/engine/scene/gui/button.cpp
index 7fad8abd..718779af 100644
--- a/engine/scene/gui/button.cpp
+++ b/engine/scene/gui/button.cpp
@@ -30,11 +30,9 @@
 
 #include "button.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/dialogs.h"
+
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 Size2 Button::get_minimum_size() const {
 	Ref<Texture2D> _icon = icon;
@@ -153,28 +151,23 @@ Ref<StyleBox> Button::_get_current_stylebox() const {
 	return stylebox;
 }
 
-String Button::_get_accessibility_name() const {
-	const String &ac_name = Control::_get_accessibility_name();
-	if (!xl_text.is_empty() && ac_name.is_empty()) {
-		return xl_text;
-	} else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) {
-		return ac_name + ": " + xl_text;
-	} else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) {
-		return get_tooltip_text(); // Fall back to tooltip.
-	} else {
-		return ac_name;
-	}
-}
-
 void Button::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
+			const String &ac_name = get_accessibility_name();
+			if (!xl_text.is_empty() && ac_name.is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text);
+			} else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, ac_name + ": " + xl_text);
+			} else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_tooltip_text()); // Fall back to tooltip.
+			}
 			AcceptDialog *dlg = Object::cast_to<AcceptDialog>(get_parent());
 			if (dlg && dlg->get_ok_button() == this) {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_DEFAULT_BUTTON);
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_DEFAULT_BUTTON);
 			}
 		} break;
 
@@ -187,7 +180,6 @@ void Button::_notification(int p_what) {
 			_shape();
 
 			update_minimum_size();
-			update_configuration_warnings();
 			queue_accessibility_update();
 			queue_redraw();
 		} break;
@@ -606,7 +598,6 @@ void Button::set_text(const String &p_text) {
 	xl_text = translated_text;
 	_shape();
 
-	update_configuration_warnings();
 	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
@@ -816,7 +807,7 @@ void Button::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_expand_icon"), &Button::is_expand_icon);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_button_icon", "get_button_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_button_icon", "get_button_icon");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flat"), "set_flat", "is_flat");
 
 	ADD_GROUP("Text Behavior", "");
diff --git a/engine/scene/gui/button.h b/engine/scene/gui/button.h
index 37e7da8d..1f7711ec 100644
--- a/engine/scene/gui/button.h
+++ b/engine/scene/gui/button.h
@@ -120,8 +120,6 @@ protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
-	virtual String _get_accessibility_name() const override;
-
 public:
 	virtual Size2 get_minimum_size() const override;
 
diff --git a/engine/scene/gui/center_container.cpp b/engine/scene/gui/center_container.cpp
index 520bd881..98fc1116 100644
--- a/engine/scene/gui/center_container.cpp
+++ b/engine/scene/gui/center_container.cpp
@@ -30,8 +30,6 @@
 
 #include "center_container.h"
 
-#include "core/object/class_db.h"
-
 Size2 CenterContainer::get_minimum_size() const {
 	if (use_top_left) {
 		return Size2();
diff --git a/engine/scene/gui/check_box.cpp b/engine/scene/gui/check_box.cpp
index 3dd9e481..03dab744 100644
--- a/engine/scene/gui/check_box.cpp
+++ b/engine/scene/gui/check_box.cpp
@@ -31,7 +31,6 @@
 #include "check_box.h"
 
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 Size2 CheckBox::get_icon_size() const {
 	Size2 tex_size = Size2(0, 0);
@@ -87,9 +86,9 @@ void CheckBox::_notification(int p_what) {
 			ERR_FAIL_COND(ae.is_null());
 
 			if (is_radio()) {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_RADIO_BUTTON);
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_RADIO_BUTTON);
 			} else {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CHECK_BOX);
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CHECK_BOX);
 			}
 		} break;
 
diff --git a/engine/scene/gui/check_button.cpp b/engine/scene/gui/check_button.cpp
index f9650b39..d90f12e4 100644
--- a/engine/scene/gui/check_button.cpp
+++ b/engine/scene/gui/check_button.cpp
@@ -31,7 +31,6 @@
 #include "check_button.h"
 
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 Size2 CheckButton::get_icon_size() const {
 	Ref<Texture2D> on_tex;
@@ -90,7 +89,7 @@ void CheckButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CHECK_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CHECK_BUTTON);
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED:
diff --git a/engine/scene/gui/code_edit.compat.inc b/engine/scene/gui/code_edit.compat.inc
index 3461b6f2..8dd7c00a 100644
--- a/engine/scene/gui/code_edit.compat.inc
+++ b/engine/scene/gui/code_edit.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "code_edit.h"
-
-#include "core/object/class_db.h"
-
 String CodeEdit::_get_text_for_symbol_lookup_bind_compat_73196() {
 	return get_text_for_symbol_lookup();
 }
@@ -47,4 +43,4 @@ void CodeEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_code_completion_option", "type", "display_text", "insert_text", "text_color", "icon", "value", "location"), &CodeEdit::_add_code_completion_option_compat_84906, DEFVAL(Color(1, 1, 1)), DEFVAL(Ref<Resource>()), DEFVAL(Variant::NIL), DEFVAL(LOCATION_OTHER));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/code_edit.cpp b/engine/scene/gui/code_edit.cpp
index 1c6b5634..ab59cd61 100644
--- a/engine/scene/gui/code_edit.cpp
+++ b/engine/scene/gui/code_edit.cpp
@@ -31,35 +31,17 @@
 #include "code_edit.h"
 #include "code_edit.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "core/string/translation_server.h"
 #include "core/string/ustring.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 
 void CodeEdit::_apply_project_settings() {
 	symbol_tooltip_timer->set_wait_time(GLOBAL_GET_CACHED(double, "gui/timers/tooltip_delay_sec"));
 }
 
-RID CodeEdit::get_focused_accessibility_element() const {
-	bool draw_code_completion = code_completion_active && !code_completion_options.is_empty();
-	if (draw_code_completion && code_completion_current_selected >= 0 && code_completion_current_selected < code_completion_options.size()) {
-		RID item = code_completion_ac_items[code_completion_current_selected];
-		if (item.is_valid()) {
-			return item;
-		}
-	}
-	return TextEdit::get_focused_accessibility_element();
-}
-
 void CodeEdit::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
@@ -86,141 +68,6 @@ void CodeEdit::_notification(int p_what) {
 			// Avoid having many hidden text editors with unused cache filling up memory.
 			_clear_line_number_text_cache();
 		} break;
-		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
-			code_completion_ac_items.clear();
-			code_completion_ac_items.resize_initialized(code_completion_options.size());
-			code_completion_ac_scroll_element = RID();
-			code_completion_ac_root_element = RID();
-		} break;
-		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
-			RID ae = get_accessibility_element();
-			ERR_FAIL_COND(ae.is_null());
-
-			if (code_completion_ac_root_element.is_null()) {
-				code_completion_ac_root_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU);
-			}
-
-			if (code_completion_ac_scroll_element.is_null()) {
-				code_completion_ac_scroll_element = AccessibilityServer::get_singleton()->create_sub_element(code_completion_ac_root_element, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
-			}
-
-			bool draw_code_completion = code_completion_active && !code_completion_options.is_empty();
-			if (draw_code_completion && code_completion_current_selected >= 0 && code_completion_current_selected < code_completion_options.size()) {
-				int options_count = code_completion_options.size();
-				int row_height = get_line_height();
-				const bool draw_code_hint = !code_hint.is_empty();
-
-				Size2 code_hint_minsize;
-				if (draw_code_hint) {
-					const int font_height = theme_cache.font->get_height(theme_cache.font_size);
-
-					Vector<String> code_hint_lines = code_hint.split("\n");
-					int line_count = code_hint_lines.size();
-
-					int max_width = 0;
-					for (int i = 0; i < line_count; i++) {
-						max_width = MAX(max_width, theme_cache.font->get_string_size(code_hint_lines[i], HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size).x);
-					}
-					code_hint_minsize = theme_cache.code_hint_style->get_minimum_size() + Size2(max_width, line_count * font_height + (theme_cache.line_spacing * line_count - 1));
-				}
-
-				int lines = MIN(options_count, theme_cache.code_completion_max_lines);
-				const Size2 icon_area_size(row_height, row_height);
-
-				code_completion_rect.size.width = code_completion_longest_line + theme_cache.code_completion_icon_separation + icon_area_size.width + 2;
-				code_completion_rect.size.height = lines * row_height;
-
-				const Point2 caret_pos = get_caret_draw_pos();
-				int total_height = theme_cache.code_completion_style->get_minimum_size().y + code_completion_rect.size.height;
-				int min_y = caret_pos.y - row_height;
-				int max_y = caret_pos.y + row_height + total_height;
-				if (draw_code_hint) {
-					if (code_hint_draw_below) {
-						max_y += code_hint_minsize.y;
-					} else {
-						min_y -= code_hint_minsize.y;
-					}
-				}
-
-				const bool can_fit_completion_above = min_y > total_height;
-				const bool can_fit_completion_below = max_y <= get_size().height;
-
-				bool should_place_above = !can_fit_completion_below && can_fit_completion_above;
-
-				if (!can_fit_completion_below && !can_fit_completion_above) {
-					const int space_above = caret_pos.y - row_height;
-					const int space_below = get_size().height - caret_pos.y;
-					should_place_above = space_above > space_below;
-
-					// Reduce the line count and recalculate heights to better fit the completion popup.
-					int space_avail;
-					if (should_place_above) {
-						space_avail = space_above - theme_cache.code_completion_style->get_minimum_size().y;
-					} else {
-						space_avail = space_below - theme_cache.code_completion_style->get_minimum_size().y;
-					}
-
-					int max_lines_fit = MAX(1, space_avail / row_height);
-					lines = MIN(lines, max_lines_fit);
-					code_completion_rect.size.height = lines * row_height;
-					total_height = theme_cache.code_completion_style->get_minimum_size().y + code_completion_rect.size.height;
-				}
-
-				if (should_place_above) {
-					code_completion_rect.position.y = (caret_pos.y - total_height - row_height) + theme_cache.line_spacing;
-					if (draw_code_hint && !code_hint_draw_below) {
-						code_completion_rect.position.y -= code_hint_minsize.y;
-					}
-				} else {
-					code_completion_rect.position.y = caret_pos.y + (theme_cache.line_spacing / 2.0f);
-					if (draw_code_hint && code_hint_draw_below) {
-						code_completion_rect.position.y += code_hint_minsize.y;
-					}
-				}
-
-				const int scroll_width = options_count > theme_cache.code_completion_max_lines ? theme_cache.code_completion_scroll_width : 0;
-				const int code_completion_base_width = theme_cache.font->get_string_size(code_completion_base, HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size).width;
-				if (caret_pos.x - code_completion_base_width + code_completion_rect.size.width + scroll_width > get_size().width) {
-					code_completion_rect.position.x = get_size().width - code_completion_rect.size.width - scroll_width;
-				} else {
-					code_completion_rect.position.x = caret_pos.x - code_completion_base_width;
-				}
-
-				code_completion_line_ofs = CLAMP((code_completion_force_item_center < 0 ? code_completion_current_selected : code_completion_force_item_center) - lines / 2, 0, options_count - lines);
-
-				Transform2D scroll_xform;
-				scroll_xform.set_origin(Vector2i(0, -row_height * code_completion_line_ofs));
-				AccessibilityServer::get_singleton()->update_set_flag(code_completion_ac_root_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, false);
-				AccessibilityServer::get_singleton()->update_set_list_item_count(code_completion_ac_root_element, options_count);
-				AccessibilityServer::get_singleton()->update_set_bounds(code_completion_ac_root_element, code_completion_rect);
-				AccessibilityServer::get_singleton()->update_set_name(code_completion_ac_root_element, ETR("Code completion list:"));
-
-				AccessibilityServer::get_singleton()->update_set_flag(code_completion_ac_scroll_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, false);
-				AccessibilityServer::get_singleton()->update_set_transform(code_completion_ac_scroll_element, scroll_xform);
-				AccessibilityServer::get_singleton()->update_set_bounds(code_completion_ac_scroll_element, code_completion_rect);
-
-				for (int i = 0; i < options_count; i++) {
-					if (code_completion_ac_items[i].is_null()) {
-						RID item = AccessibilityServer::get_singleton()->create_sub_element(code_completion_ac_scroll_element, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM);
-						code_completion_ac_items.write[i] = item;
-					}
-					RID item = code_completion_ac_items[i];
-					AccessibilityServer::get_singleton()->update_set_role(item, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM);
-					AccessibilityServer::get_singleton()->update_set_list_item_index(item, i);
-					AccessibilityServer::get_singleton()->update_set_list_item_level(item, 0);
-					AccessibilityServer::get_singleton()->update_set_list_item_selected(item, i == code_completion_current_selected);
-					AccessibilityServer::get_singleton()->update_set_name(item, code_completion_options[i].display);
-					AccessibilityServer::get_singleton()->update_set_bounds(item, Rect2(code_completion_rect.position.x, code_completion_rect.position.y + row_height * i, code_completion_rect.size.x, row_height));
-				}
-			} else {
-				AccessibilityServer::get_singleton()->update_set_flag(code_completion_ac_root_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, true);
-				AccessibilityServer::get_singleton()->update_set_list_item_count(code_completion_ac_root_element, 0);
-				AccessibilityServer::get_singleton()->update_set_bounds(code_completion_ac_root_element, Rect2(0, 0, 1, 1));
-
-				AccessibilityServer::get_singleton()->update_set_flag(code_completion_ac_scroll_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, true);
-				AccessibilityServer::get_singleton()->update_set_bounds(code_completion_ac_scroll_element, Rect2(0, 0, 1, 1));
-			}
-		} break;
 
 		case NOTIFICATION_DRAW: {
 			RID ci = get_text_canvas_item();
@@ -546,7 +393,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 						confirm_code_completion();
 					}
 					queue_redraw();
-					queue_accessibility_update();
 				} break;
 				default:
 					break;
@@ -565,7 +411,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 				is_code_completion_scroll_pressed = true;
 
 				_update_scroll_selected_line(mb->get_position().y);
-				queue_accessibility_update();
 				queue_redraw();
 			}
 
@@ -655,7 +500,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 		if (is_code_completion_scroll_pressed) {
 			_update_scroll_selected_line(mpos.y);
 			accept_event();
-			queue_accessibility_update();
 			queue_redraw();
 			return;
 		}
@@ -724,7 +568,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			}
 			code_completion_force_item_center = -1;
 			code_completion_pan_offset = 0.0f;
-			queue_accessibility_update();
 			queue_redraw();
 			accept_event();
 			return;
@@ -737,7 +580,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			}
 			code_completion_force_item_center = -1;
 			code_completion_pan_offset = 0.0f;
-			queue_accessibility_update();
 			queue_redraw();
 			accept_event();
 			return;
@@ -746,7 +588,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			code_completion_current_selected = MAX(0, code_completion_current_selected - theme_cache.code_completion_max_lines);
 			code_completion_force_item_center = -1;
 			code_completion_pan_offset = 0.0f;
-			queue_accessibility_update();
 			queue_redraw();
 			accept_event();
 			return;
@@ -755,7 +596,6 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			code_completion_current_selected = MIN(code_completion_options.size() - 1, code_completion_current_selected + theme_cache.code_completion_max_lines);
 			code_completion_force_item_center = -1;
 			code_completion_pan_offset = 0.0f;
-			queue_accessibility_update();
 			queue_redraw();
 			accept_event();
 			return;
@@ -2450,7 +2290,6 @@ void CodeEdit::request_code_completion(bool p_force) {
 	} else if (ofs > 1 && line[ofs - 1] == ' ' && code_completion_prefixes.has(line[ofs - 2])) {
 		emit_signal(SNAME("code_completion_requested"));
 	}
-	queue_accessibility_update();
 }
 
 void CodeEdit::add_code_completion_option(CodeCompletionKind p_type, const String &p_display_text, const String &p_insert_text, const Color &p_text_color, const Ref<Resource> &p_icon, const Variant &p_value, int p_location) {
@@ -2522,7 +2361,6 @@ void CodeEdit::set_code_completion_selected_index(int p_index) {
 	code_completion_current_selected = p_index;
 	code_completion_force_item_center = -1;
 	code_completion_pan_offset = 0.0f;
-	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2654,7 +2492,6 @@ void CodeEdit::cancel_code_completion() {
 	code_completion_forced = false;
 	code_completion_active = false;
 	is_code_completion_drag_started = false;
-	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2861,44 +2698,6 @@ void CodeEdit::delete_lines() {
 	end_complex_operation();
 }
 
-void CodeEdit::join_lines(const String &p_line_ending) {
-	ERR_FAIL_COND_MSG(p_line_ending.contains_char('\n'), "Cannot join lines with a newline.");
-
-	begin_complex_operation();
-	begin_multicaret_edit();
-
-	Vector<Point2i> line_ranges = get_line_ranges_from_carets();
-	int line_offset = 0;
-	for (const Point2i &line_range : line_ranges) {
-		for (int32_t line_index = line_range.x; line_index <= line_range.y; line_index++) {
-			int32_t real_line = line_index + line_offset;
-			if (real_line + 1 >= get_line_count()) {
-				break;
-			}
-			unfold_line(real_line);
-			String line = get_line(real_line);
-			int line_length = line.length();
-			int next_line_leading_whitespace_length = get_first_non_whitespace_column(real_line + 1);
-			int next_line_length = get_line(real_line + 1).length();
-			int corrected_line_length = line_length - 1;
-			for (; corrected_line_length >= 0; corrected_line_length--) {
-				if (!is_whitespace(line[corrected_line_length])) {
-					break;
-				}
-			}
-			corrected_line_length++;
-			remove_text(real_line, corrected_line_length, real_line + 1, next_line_leading_whitespace_length);
-			if (next_line_leading_whitespace_length != next_line_length && corrected_line_length != 0) {
-				insert_text(p_line_ending, real_line, corrected_line_length);
-			}
-			line_offset--;
-		}
-	}
-
-	end_multicaret_edit();
-	end_complex_operation();
-}
-
 void CodeEdit::duplicate_selection() {
 	begin_complex_operation();
 	begin_multicaret_edit();
@@ -3171,7 +2970,6 @@ void CodeEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("move_lines_up"), &CodeEdit::move_lines_up);
 	ClassDB::bind_method(D_METHOD("move_lines_down"), &CodeEdit::move_lines_down);
 	ClassDB::bind_method(D_METHOD("delete_lines"), &CodeEdit::delete_lines);
-	ClassDB::bind_method(D_METHOD("join_lines", "line_ending"), &CodeEdit::join_lines, DEFVAL(" "));
 	ClassDB::bind_method(D_METHOD("duplicate_selection"), &CodeEdit::duplicate_selection);
 	ClassDB::bind_method(D_METHOD("duplicate_lines"), &CodeEdit::duplicate_lines);
 
@@ -3806,19 +3604,11 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 			code_completion_current_selected = 0;
 			code_completion_pan_offset = 0.0f;
 		}
-		for (RID &E : code_completion_ac_items) {
-			if (E.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(E);
-			}
-		}
-		code_completion_ac_items.clear();
 		code_completion_options = code_completion_options_new;
-		code_completion_ac_items.resize_initialized(code_completion_options.size());
 
 		code_completion_longest_line = MIN(max_width, theme_cache.code_completion_max_width * theme_cache.font_size);
 		code_completion_force_item_center = -1;
 		code_completion_active = true;
-		queue_accessibility_update();
 		queue_redraw();
 		return;
 	}
@@ -4033,19 +3823,11 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 		code_completion_current_selected = 0;
 		code_completion_pan_offset = 0.0f;
 	}
-	for (RID &E : code_completion_ac_items) {
-		if (E.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(E);
-		}
-	}
-	code_completion_ac_items.clear();
 	code_completion_options = code_completion_options_new;
-	code_completion_ac_items.resize_initialized(code_completion_options.size());
 
 	code_completion_longest_line = MIN(max_width, theme_cache.code_completion_max_width * theme_cache.font_size);
 	code_completion_force_item_center = -1;
 	code_completion_active = true;
-	queue_accessibility_update();
 	queue_redraw();
 }
 
diff --git a/engine/scene/gui/code_edit.h b/engine/scene/gui/code_edit.h
index 0a458929..bda57af2 100644
--- a/engine/scene/gui/code_edit.h
+++ b/engine/scene/gui/code_edit.h
@@ -213,9 +213,6 @@ private:
 	bool is_code_completion_scroll_pressed = false;
 	bool is_code_completion_drag_started = false;
 	Vector<ScriptLanguage::CodeCompletionOption> code_completion_options;
-	Vector<RID> code_completion_ac_items;
-	RID code_completion_ac_scroll_element;
-	RID code_completion_ac_root_element;
 	int code_completion_line_ofs = 0;
 	int code_completion_current_selected = 0;
 	int code_completion_force_item_center = -1;
@@ -339,8 +336,6 @@ protected:
 	virtual void _backspace_internal(int p_caret) override;
 	virtual void _cut_internal(int p_caret) override;
 
-	virtual RID get_focused_accessibility_element() const override;
-
 	GDVIRTUAL1(_confirm_code_completion, bool)
 	GDVIRTUAL1(_request_code_completion, bool)
 	GDVIRTUAL1RC(TypedArray<Dictionary>, _filter_code_completion_candidates, TypedArray<Dictionary>)
@@ -528,7 +523,6 @@ public:
 	void move_lines_up();
 	void move_lines_down();
 	void delete_lines();
-	void join_lines(const String &p_line_ending = " ");
 	void duplicate_selection();
 	void duplicate_lines();
 
diff --git a/engine/scene/gui/color_picker.cpp b/engine/scene/gui/color_picker.cpp
index 6fb87542..a3e1f211 100644
--- a/engine/scene/gui/color_picker.cpp
+++ b/engine/scene/gui/color_picker.cpp
@@ -30,14 +30,8 @@
 
 #include "color_picker.h"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
 #include "core/io/image.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/math/expression.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/color_mode.h"
 #include "scene/gui/color_picker_shape.h"
 #include "scene/gui/file_dialog.h"
@@ -52,19 +46,12 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/color_palette.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/style_box_texture.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-
-#ifdef MACOS_ENABLED
-#include "core/os/os.h"
-#endif
 
 static inline bool is_color_overbright(const Color &color) {
 	return (color.r > 1.0) || (color.g > 1.0) || (color.b > 1.0);
@@ -93,8 +80,8 @@ void ColorPicker::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_COLOR_PICKER);
-			AccessibilityServer::get_singleton()->update_set_color_value(ae, color);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_COLOR_PICKER);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
@@ -110,10 +97,10 @@ void ColorPicker::_notification(int p_what) {
 #endif
 
 		case NOTIFICATION_READY: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_COLOR_PICKER)) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_COLOR_PICKER)) {
 				btn_pick->set_tooltip_text(ETR("Pick a color from the screen."));
 				btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed_native));
-			} else if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
+			} else if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
 				// FIXME: The embedding check is needed to fix a bug in single-window mode (GH-93718).
 				btn_pick->set_tooltip_text(ETR("Pick a color from the screen."));
 				btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed));
@@ -183,8 +170,6 @@ void ColorPicker::_notification(int p_what) {
 			hex_label->set_custom_minimum_size(Size2(38 * theme_cache.base_scale, 0));
 			// Adjust for the width of the "script" icon.
 			text_type->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0));
-			text_copy->set_button_icon(theme_cache.color_copy);
-			text_copy->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0));
 
 			_update_controls();
 			// HACK: Deferring updating presets to ensure their size is correct when creating ColorPicker at runtime.
@@ -246,13 +231,13 @@ void ColorPicker::_notification(int p_what) {
 			picker_preview_style_box_color->set_bg_color(c);
 			picker_preview_style_box->set_bg_color(c.get_luminance() < 0.5 ? Color(1.0f, 1.0f, 1.0f) : Color(0.0f, 0.0f, 0.0f));
 
-			if (ds->has_feature(DisplayServerEnums::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE)) {
+			if (ds->has_feature(DisplayServer::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE)) {
 				Ref<Image> zoom_preview_img = ds->screen_get_image_rect(Rect2i(ofs.x - 8, ofs.y - 8, 17, 17));
 				picker_window->set_position(ofs - Vector2(28, 28));
 				picker_texture_zoom->set_texture(ImageTexture::create_from_image(zoom_preview_img));
 			} else {
-				Size2i screen_size = ds->screen_get_size(DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS);
-				Vector2i screen_position = ds->screen_get_position(DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS);
+				Size2i screen_size = ds->screen_get_size(DisplayServer::SCREEN_WITH_MOUSE_FOCUS);
+				Vector2i screen_position = ds->screen_get_position(DisplayServer::SCREEN_WITH_MOUSE_FOCUS);
 
 				float ofs_decal_x = (ofs.x < screen_position.x + screen_size.width - 51) ? 8 : -36;
 				float ofs_decal_y = (ofs.y < screen_position.y + screen_size.height - 51) ? 8 : -36;
@@ -857,10 +842,6 @@ void ColorPicker::_text_type_toggled() {
 }
 #endif // TOOLS_ENABLED
 
-void ColorPicker::_text_copy_pressed() {
-	DisplayServer::get_singleton()->clipboard_set(c_text->get_text());
-}
-
 Color ColorPicker::get_pick_color() const {
 	return color;
 }
@@ -1544,7 +1525,7 @@ void ColorPicker::_add_preset_pressed() {
 void ColorPicker::_pick_button_pressed_native() {
 	if (!DisplayServer::get_singleton()->color_picker(callable_mp(this, &ColorPicker::_native_cb))) {
 		// Fallback to default/legacy picker.
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
 			_pick_button_pressed();
 		} else {
 			_pick_button_pressed_legacy();
@@ -1567,7 +1548,7 @@ void ColorPicker::_pick_button_pressed() {
 
 	if (!picker_window) {
 		picker_window = memnew(Popup);
-		bool has_feature_exclude_from_capture = DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE);
+		bool has_feature_exclude_from_capture = DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE);
 		if (!has_feature_exclude_from_capture) {
 			picker_window->set_size(Vector2i(28, 28));
 		} else {
@@ -1822,9 +1803,9 @@ void ColorPicker::_pick_button_pressed_legacy() {
 		DisplayServer *ds = DisplayServer::get_singleton();
 
 		// Add the Texture of each Window to the Image.
-		Vector<DisplayServerEnums::WindowID> wl = ds->get_window_list();
+		Vector<DisplayServer::WindowID> wl = ds->get_window_list();
 		// FIXME: sort windows by visibility.
-		for (const DisplayServerEnums::WindowID &window_id : wl) {
+		for (const DisplayServer::WindowID &window_id : wl) {
 			Window *w = Window::get_from_id(window_id);
 			if (!w) {
 				continue;
@@ -2075,7 +2056,6 @@ void ColorPicker::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPicker, color_hue);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPicker, color_script);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPicker, color_copy);
 
 	BIND_THEME_ITEM_EXT(Theme::DATA_TYPE_STYLEBOX, ColorPicker, mode_button_normal, "tab_unselected", "TabContainer");
 	BIND_THEME_ITEM_EXT(Theme::DATA_TYPE_STYLEBOX, ColorPicker, mode_button_pressed, "tab_selected", "TabContainer");
@@ -2243,13 +2223,6 @@ ColorPicker::ColorPicker() {
 	c_text->connect(SceneStringName(text_changed), callable_mp(this, &ColorPicker::_text_changed));
 	c_text->connect(SceneStringName(focus_exited), callable_mp(this, &ColorPicker::_html_focus_exit));
 
-	text_copy = memnew(Button);
-	hex_hbc->add_child(text_copy);
-	text_copy->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	text_copy->set_tooltip_text(ETR("Copy the color value."));
-	text_type->set_accessibility_name(ETR("Copy Color"));
-	text_copy->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_text_copy_pressed));
-
 	_update_controls();
 	updating = false;
 
@@ -2445,9 +2418,9 @@ void ColorPickerButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_DIALOG);
-			AccessibilityServer::get_singleton()->update_set_color_value(ae, color);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_DIALOG);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -2586,8 +2559,8 @@ void ColorPresetButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
-			AccessibilityServer::get_singleton()->update_set_color_value(ae, preset_color);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, preset_color);
 		} break;
 
 		case NOTIFICATION_DRAW: {
diff --git a/engine/scene/gui/color_picker.h b/engine/scene/gui/color_picker.h
index ebfa2a8a..50702d5b 100644
--- a/engine/scene/gui/color_picker.h
+++ b/engine/scene/gui/color_picker.h
@@ -246,7 +246,6 @@ private:
 
 	Button *text_type = nullptr;
 	LineEdit *c_text = nullptr;
-	Button *text_copy = nullptr;
 
 	HSlider *alpha_slider = nullptr;
 	SpinBox *alpha_value = nullptr;
@@ -341,7 +340,6 @@ private:
 		Ref<Texture2D> color_hue;
 
 		Ref<Texture2D> color_script;
-		Ref<Texture2D> color_copy;
 
 		/* Mode buttons */
 		Ref<StyleBox> mode_button_normal;
@@ -369,7 +367,6 @@ private:
 #ifdef TOOLS_ENABLED
 	void _text_type_toggled();
 #endif // TOOLS_ENABLED
-	void _text_copy_pressed();
 	void _sample_input(const Ref<InputEvent> &p_event);
 	void _sample_draw();
 	void _slider_draw(int p_which);
diff --git a/engine/scene/gui/color_picker_shape.cpp b/engine/scene/gui/color_picker_shape.cpp
index 460e2c72..b2c10b5a 100644
--- a/engine/scene/gui/color_picker_shape.cpp
+++ b/engine/scene/gui/color_picker_shape.cpp
@@ -30,13 +30,9 @@
 
 #include "color_picker_shape.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
 #include "scene/gui/margin_container.h"
 #include "scene/resources/material.h"
-#include "servers/rendering/rendering_server.h"
-
-#include <thirdparty/misc/ok_color_shader.h>
+#include "thirdparty/misc/ok_color_shader.h"
 
 void ColorPickerShape::init_shaders() {
 	wheel_shader.instantiate();
diff --git a/engine/scene/gui/color_rect.cpp b/engine/scene/gui/color_rect.cpp
index 56b023f9..141581c2 100644
--- a/engine/scene/gui/color_rect.cpp
+++ b/engine/scene/gui/color_rect.cpp
@@ -30,9 +30,6 @@
 
 #include "color_rect.h"
 
-#include "core/object/class_db.h"
-#include "servers/display/accessibility_server.h"
-
 void ColorRect::set_color(const Color &p_color) {
 	if (color == p_color) {
 		return;
@@ -52,7 +49,7 @@ void ColorRect::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_color_value(ae, color);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
 		} break;
 
 		case NOTIFICATION_DRAW: {
diff --git a/engine/scene/gui/container.cpp b/engine/scene/gui/container.cpp
index 4745896d..81c7bb4d 100644
--- a/engine/scene/gui/container.cpp
+++ b/engine/scene/gui/container.cpp
@@ -30,10 +30,6 @@
 
 #include "container.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/display/accessibility_server.h"
-
 void Container::_child_minsize_changed() {
 	update_minimum_size();
 	queue_sort();
@@ -94,7 +90,6 @@ void Container::_sort_children() {
 	notification(NOTIFICATION_SORT_CHILDREN);
 	emit_signal(SceneStringName(sort_children));
 	pending_sort = false;
-	layout_pending_finish();
 }
 
 void Container::fit_child_in_rect(RequiredParam<Control> rp_child, const Rect2 &p_rect) {
@@ -141,7 +136,6 @@ void Container::queue_sort() {
 		return;
 	}
 
-	layout_pending_start();
 	callable_mp(this, &Container::_sort_children).call_deferred();
 	pending_sort = true;
 }
@@ -194,11 +188,7 @@ void Container::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			if (accessibility_region) {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_REGION);
-			} else {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
-			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 		} break;
 
 		case NOTIFICATION_RESIZED:
@@ -214,18 +204,6 @@ void Container::_notification(int p_what) {
 	}
 }
 
-void Container::set_accessibility_region(bool p_region) {
-	ERR_MAIN_THREAD_GUARD;
-	if (accessibility_region != p_region) {
-		accessibility_region = p_region;
-		queue_accessibility_update();
-	}
-}
-
-bool Container::is_accessibility_region() const {
-	return accessibility_region;
-}
-
 PackedStringArray Container::get_configuration_warnings() const {
 	PackedStringArray warnings = Control::get_configuration_warnings();
 
@@ -239,8 +217,6 @@ PackedStringArray Container::get_configuration_warnings() const {
 void Container::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("queue_sort"), &Container::queue_sort);
 	ClassDB::bind_method(D_METHOD("fit_child_in_rect", "child", "rect"), &Container::fit_child_in_rect);
-	ClassDB::bind_method(D_METHOD("set_accessibility_region", "region"), &Container::set_accessibility_region);
-	ClassDB::bind_method(D_METHOD("is_accessibility_region"), &Container::is_accessibility_region);
 
 	GDVIRTUAL_BIND(_get_allowed_size_flags_horizontal);
 	GDVIRTUAL_BIND(_get_allowed_size_flags_vertical);
@@ -250,8 +226,6 @@ void Container::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("pre_sort_children"));
 	ADD_SIGNAL(MethodInfo("sort_children"));
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "accessibility_region"), "set_accessibility_region", "is_accessibility_region");
 }
 
 Container::Container() {
diff --git a/engine/scene/gui/container.h b/engine/scene/gui/container.h
index af9fbc7f..50be92d9 100644
--- a/engine/scene/gui/container.h
+++ b/engine/scene/gui/container.h
@@ -36,7 +36,6 @@ class Container : public Control {
 	GDCLASS(Container, Control);
 
 	bool pending_sort = false;
-	bool accessibility_region = false;
 	void _sort_children();
 	void _child_minsize_changed();
 
@@ -73,8 +72,5 @@ public:
 
 	PackedStringArray get_configuration_warnings() const override;
 
-	void set_accessibility_region(bool p_region);
-	bool is_accessibility_region() const;
-
 	Container();
 };
diff --git a/engine/scene/gui/control.compat.inc b/engine/scene/gui/control.compat.inc
index 27e84b1d..4e854fc9 100644
--- a/engine/scene/gui/control.compat.inc
+++ b/engine/scene/gui/control.compat.inc
@@ -30,11 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "control.h"
-
-#include "core/object/class_db.h"
-#include "servers/display/display_server.h" // IWYU pragma: keep // Needed to bind DisplayServerEnums enums.
-
 bool Control::_has_focus_bind_compat_110250() const {
 	return has_focus(false);
 }
@@ -46,9 +41,6 @@ void Control::_grab_focus_bind_compat_110250() {
 void Control::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("has_focus"), &Control::_has_focus_bind_compat_110250);
 	ClassDB::bind_compatibility_method(D_METHOD("grab_focus"), &Control::_grab_focus_bind_compat_110250);
-
-	ClassDB::bind_compatibility_method(D_METHOD("set_accessibility_live", "mode"), (void (Control::*)(DisplayServerEnums::AccessibilityLiveMode))&Control::set_accessibility_live);
-	ClassDB::bind_compatibility_method(D_METHOD("get_accessibility_live"), (DisplayServerEnums::AccessibilityLiveMode (Control::*)() const) & Control::get_accessibility_live);
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/scene/gui/control.cpp b/engine/scene/gui/control.cpp
index e274eb6f..499e53be 100644
--- a/engine/scene/gui/control.cpp
+++ b/engine/scene/gui/control.cpp
@@ -31,24 +31,16 @@
 #include "control.h"
 #include "control.compat.inc"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/config/engine.h"
+#include "container.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
-#include "core/math/transform_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
-#include "scene/gui/container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 #include "scene/theme/theme_owner.h"
-#include "servers/display/accessibility_server.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/text/text_server.h"
 
@@ -263,32 +255,21 @@ PackedStringArray Control::get_configuration_warnings() const {
 	return warnings;
 }
 
-String Control::_get_accessibility_name() const {
-	if (get_parent_control()) {
-		String container_info = get_parent_control()->get_accessibility_container_name(this);
-		return container_info.is_empty() ? get_accessibility_name() : get_accessibility_name() + " " + container_info;
-	} else {
-		return get_accessibility_name();
-	}
-}
-
 PackedStringArray Control::get_accessibility_configuration_warnings() const {
 	ERR_READ_THREAD_GUARD_V(PackedStringArray());
 	PackedStringArray warnings = Node::get_accessibility_configuration_warnings();
 
-	if (get_focus_mode_with_override() != FOCUS_NONE) {
-		String ac_name = _get_accessibility_name().strip_edges();
-		if (ac_name.is_empty()) {
-			warnings.push_back(RTR("Accessibility Name must not be empty, or contain only spaces."));
-		}
-		if (ac_name.contains(get_class_name())) {
-			warnings.push_back(RTR("Accessibility Name must not include Node class name."));
-		}
-		for (int i = 0; i < ac_name.length(); i++) {
-			if (is_control(ac_name[i])) {
-				warnings.push_back(RTR("Accessibility Name must not include control character."));
-				break;
-			}
+	String ac_name = get_accessibility_name().strip_edges();
+	if (ac_name.is_empty()) {
+		warnings.push_back(RTR("Accessibility Name must not be empty, or contain only spaces."));
+	}
+	if (ac_name.contains(get_class_name())) {
+		warnings.push_back(RTR("Accessibility Name must not include Node class name."));
+	}
+	for (int i = 0; i < ac_name.length(); i++) {
+		if (is_control(ac_name[i])) {
+			warnings.push_back(RTR("Accessibility Name must not include control character."));
+			break;
 		}
 	}
 
@@ -455,7 +436,7 @@ void Control::_get_property_list(List<PropertyInfo> *p_list) const {
 				if (data.theme_font_override.has(E.item_name)) {
 					usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 				}
-				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_fonts") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static(), usage));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_fonts") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, "Font", usage));
 			} break;
 
 			case Theme::DATA_TYPE_FONT_SIZE: {
@@ -469,14 +450,14 @@ void Control::_get_property_list(List<PropertyInfo> *p_list) const {
 				if (data.theme_icon_override.has(E.item_name)) {
 					usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 				}
-				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_icons") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), usage));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_icons") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", usage));
 			} break;
 
 			case Theme::DATA_TYPE_STYLEBOX: {
 				if (data.theme_style_override.has(E.item_name)) {
 					usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 				}
-				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_styles") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, StyleBox::get_class_static(), usage));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_styles") + String("/") + E.item_name, PROPERTY_HINT_RESOURCE_TYPE, "StyleBox", usage));
 			} break;
 
 			default: {
@@ -533,7 +514,6 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 		}
 
 		p_property.hint_string = hint_string;
-		return;
 	}
 
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "mouse_force_pass_scroll_events") {
@@ -541,7 +521,6 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 		if (data.mouse_filter != MOUSE_FILTER_STOP) {
 			p_property.usage |= PROPERTY_USAGE_READ_ONLY;
 		}
-		return;
 	}
 
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "scale") {
@@ -549,8 +528,6 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 	}
 	// Validate which positioning properties should be displayed depending on the parent and the layout mode.
 	Control *parent_control = get_parent_control();
-	bool is_anchor_offset_property_name = p_property.name.begins_with("offset_") && !p_property.name.begins_with("offset_transform_");
-
 	if (Engine::get_singleton()->is_editor_hint() && !parent_control) {
 		// If there is no parent control, display both anchor and container options.
 
@@ -562,12 +539,12 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 
 		// Use the layout mode to display or hide advanced anchoring properties.
 		bool use_custom_anchors = _get_anchors_layout_preset() == -1; // Custom "preset".
-		if (!use_custom_anchors && (p_property.name.begins_with("anchor_") || is_anchor_offset_property_name || p_property.name.begins_with("grow_"))) {
+		if (!use_custom_anchors && (p_property.name.begins_with("anchor_") || p_property.name.begins_with("offset_") || p_property.name.begins_with("grow_"))) {
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 		}
 	} else if (Object::cast_to<Container>(parent_control)) {
 		// If the parent is a container, display only container-related properties.
-		if (p_property.name.begins_with("anchor_") || is_anchor_offset_property_name || p_property.name.begins_with("grow_") || p_property.name == "anchors_preset") {
+		if (p_property.name.begins_with("anchor_") || p_property.name.begins_with("offset_") || p_property.name.begins_with("grow_") || p_property.name == "anchors_preset") {
 			p_property.usage ^= PROPERTY_USAGE_DEFAULT;
 		} else if (p_property.name == "position" || p_property.name == "rotation" || p_property.name == "scale" || p_property.name == "size" || p_property.name == "pivot_offset" || p_property.name == "pivot_offset_ratio") {
 			p_property.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY;
@@ -633,7 +610,7 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 		}
 		bool use_custom_anchors = use_anchors && _get_anchors_layout_preset() == -1; // Custom "preset".
-		if (!use_custom_anchors && (p_property.name.begins_with("anchor_") || is_anchor_offset_property_name || p_property.name.begins_with("grow_"))) {
+		if (!use_custom_anchors && (p_property.name.begins_with("anchor_") || p_property.name.begins_with("offset_") || p_property.name.begins_with("grow_"))) {
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 		}
 	}
@@ -744,11 +721,6 @@ Transform2D Control::_get_internal_transform() const {
 	// T(pivot_offset) * R(rotation) * S(scale) * T(-pivot_offset)
 	Transform2D xform(data.rotation, data.scale, 0.0f, get_combined_pivot_offset());
 	xform.translate_local(-get_combined_pivot_offset());
-
-	if (is_offset_transform_enabled() && !data.offset_transform->visual_only) {
-		xform *= get_offset_transform();
-	}
-
 	return xform;
 }
 
@@ -761,10 +733,6 @@ void Control::_update_canvas_item_transform() {
 		xform[2] = (xform[2] + Vector2(0.5, 0.5)).floor();
 	}
 
-	if (is_offset_transform_enabled() && data.offset_transform->visual_only) {
-		xform *= get_offset_transform();
-	}
-
 	RenderingServer::get_singleton()->canvas_item_set_transform(get_canvas_item(), xform);
 }
 
@@ -1729,8 +1697,6 @@ void Control::update_minimum_size() {
 	}
 
 	if (!is_visible_in_tree()) {
-		// Invalidate the last minimum size so it will update when made visible.
-		data.last_minimum_size = Size2(-1, -1);
 		return;
 	}
 
@@ -1775,55 +1741,6 @@ Size2 Control::get_custom_minimum_size() const {
 	return data.custom_minimum_size;
 }
 
-bool Control::is_layout_pending() const {
-	ERR_MAIN_THREAD_GUARD_V(false);
-	return data.layout_pending;
-}
-
-bool Control::is_layout_pending_in_tree() const {
-	ERR_MAIN_THREAD_GUARD_V(false);
-	const Control *current_node = this;
-	while (current_node != nullptr) {
-		if (current_node->is_layout_pending()) {
-			return true;
-		}
-		current_node = current_node->get_parent_control();
-	}
-	return false;
-}
-
-void Control::layout_pending_start() {
-	ERR_MAIN_THREAD_GUARD;
-	data.layout_pending = true;
-}
-
-void Control::layout_pending_finish() {
-	ERR_MAIN_THREAD_GUARD;
-	data.layout_pending = false;
-	emit_signal(SNAME("_layout_pending_finished"));
-}
-
-Control *Control::get_layout_pending_control_in_tree() const {
-	Control *current_node = const_cast<Control *>(this);
-	while (current_node != nullptr) {
-		if (current_node->is_layout_pending()) {
-			return current_node;
-		}
-		current_node = current_node->get_parent_control();
-	}
-	return nullptr;
-}
-
-void Control::call_on_all_layout_pending_finished(const Callable &p_callable) {
-	Control *pending_control = get_layout_pending_control_in_tree();
-	if (pending_control != nullptr) {
-		Callable recheck = callable_mp(this, &Control::call_on_all_layout_pending_finished).bind(p_callable);
-		pending_control->connect(SNAME("_layout_pending_finished"), recheck, CONNECT_ONE_SHOT | CONNECT_REFERENCE_COUNTED);
-	} else {
-		p_callable.call();
-	}
-}
-
 void Control::_update_minimum_size_cache() const {
 	Size2 minsize = get_minimum_size();
 	minsize = minsize.max(data.custom_minimum_size);
@@ -1963,218 +1880,6 @@ real_t Control::get_stretch_ratio() const {
 	return data.expand;
 }
 
-// Offset transform.
-
-void Control::set_offset_transform_enabled(bool p_enabled) {
-	if (is_offset_transform_enabled() == p_enabled) {
-		return;
-	}
-
-	if (p_enabled) {
-		_ensure_allocated_offset_transform();
-		data.offset_transform->enabled = true;
-	} else {
-		// Never deallocate to not lose previously set values
-		data.offset_transform->enabled = false;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-bool Control::is_offset_transform_enabled() const {
-	return data.offset_transform != nullptr && data.offset_transform->enabled;
-}
-
-void Control::set_offset_transform_position(const Vector2 &p_offset) {
-	if (get_offset_transform_position() == p_offset) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->translation_absolute = p_offset;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-Vector2 Control::get_offset_transform_position() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_TRANSLATION_ABSOLUTE;
-	}
-
-	return data.offset_transform->translation_absolute;
-}
-
-void Control::set_offset_transform_position_ratio(const Vector2 &p_offset) {
-	if (get_offset_transform_position_ratio() == p_offset) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->translation_relative = p_offset;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-Vector2 Control::get_offset_transform_position_ratio() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_TRANSLATION_RELATIVE;
-	}
-
-	return data.offset_transform->translation_relative;
-}
-
-void Control::set_offset_transform_scale(const Vector2 &p_scale) {
-	if (get_offset_transform_scale() == p_scale) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->scale = p_scale;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-Vector2 Control::get_offset_transform_scale() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_SCALE;
-	}
-
-	return data.offset_transform->scale;
-}
-
-void Control::set_offset_transform_rotation(real_t p_rotation) {
-	if (get_offset_transform_rotation() == p_rotation) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->rotation = p_rotation;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-real_t Control::get_offset_transform_rotation() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_ROTATION;
-	}
-
-	return data.offset_transform->rotation;
-}
-
-void Control::set_offset_transform_pivot(const Vector2 &p_pivot) {
-	if (get_offset_transform_pivot() == p_pivot) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->pivot_absolute = p_pivot;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-Vector2 Control::get_offset_transform_pivot() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_PIVOT_ABSOLUTE;
-	}
-
-	return data.offset_transform->pivot_absolute;
-}
-
-void Control::set_offset_transform_pivot_ratio(const Vector2 &p_pivot) {
-	if (get_offset_transform_pivot_ratio() == p_pivot) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->pivot_relative = p_pivot;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-Vector2 Control::get_offset_transform_pivot_ratio() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_PIVOT_RELATIVE;
-	}
-
-	return data.offset_transform->pivot_relative;
-}
-
-void Control::set_offset_transform_visual_only(bool p_enabled) {
-	if (is_offset_transform_visual_only() == p_enabled) {
-		return;
-	}
-
-	_ensure_allocated_offset_transform();
-	data.offset_transform->visual_only = p_enabled;
-
-	if (!data.offset_transform->enabled) {
-		return;
-	}
-
-	queue_redraw();
-	_notify_transform();
-	queue_accessibility_update();
-}
-
-bool Control::is_offset_transform_visual_only() const {
-	if (data.offset_transform == nullptr) {
-		return Data::OffsetTransform::DEFAULT_VISUAL_ONLY;
-	}
-
-	return data.offset_transform->visual_only;
-}
-
-Transform2D Control::get_offset_transform() const {
-	if (!is_offset_transform_enabled()) {
-		return Transform2D();
-	}
-
-	Vector2 combined_translation = data.offset_transform->translation_absolute + data.offset_transform->translation_relative * get_size();
-	Vector2 combined_pivot = data.offset_transform->pivot_absolute + data.offset_transform->pivot_relative * get_size();
-
-	Transform2D offset_xform(data.offset_transform->rotation, data.offset_transform->scale, 0.0f, combined_pivot + combined_translation);
-	offset_xform.translate_local(-combined_pivot);
-	return offset_xform;
-}
-
 // Input events.
 
 void Control::_call_gui_input(const Ref<InputEvent> &p_event) {
@@ -2339,7 +2044,7 @@ bool Control::is_focus_owner_in_shortcut_context() const {
 	}
 
 	const Node *ctx_node = get_shortcut_context();
-	const Control *vp_focus = (get_viewport() && get_viewport()->gui_shortcut_use_focus_owner()) ? get_viewport()->gui_get_focus_owner() : nullptr;
+	const Control *vp_focus = get_viewport() ? get_viewport()->gui_get_focus_owner() : nullptr;
 
 	// If the context is valid and the viewport focus is valid, check if the context is the focus or is a parent of it.
 	return ctx_node && vp_focus && (ctx_node == vp_focus || ctx_node->is_ancestor_of(vp_focus));
@@ -2483,7 +2188,7 @@ String Control::get_accessibility_description() const {
 	return tr(data.accessibility_description);
 }
 
-void Control::set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode p_mode) {
+void Control::set_accessibility_live(DisplayServer::AccessibilityLiveMode p_mode) {
 	ERR_THREAD_GUARD
 	if (data.accessibility_live != p_mode) {
 		data.accessibility_live = p_mode;
@@ -2491,7 +2196,7 @@ void Control::set_accessibility_live(AccessibilityServerEnums::AccessibilityLive
 	}
 }
 
-AccessibilityServerEnums::AccessibilityLiveMode Control::get_accessibility_live() const {
+DisplayServer::AccessibilityLiveMode Control::get_accessibility_live() const {
 	return data.accessibility_live;
 }
 
@@ -3169,7 +2874,7 @@ void Control::_window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, cons
 
 void Control::set_default_cursor_shape(CursorShape p_shape) {
 	ERR_MAIN_THREAD_GUARD;
-	ERR_FAIL_INDEX(int(p_shape), DisplayServerEnums::CURSOR_MAX);
+	ERR_FAIL_INDEX(int(p_shape), CURSOR_MAX);
 
 	if (data.default_cursor == p_shape) {
 		return;
@@ -3194,10 +2899,6 @@ Control::CursorShape Control::get_default_cursor_shape() const {
 
 Control::CursorShape Control::get_cursor_shape(const Point2 &p_pos) const {
 	ERR_READ_THREAD_GUARD_V(CURSOR_ARROW);
-	int ret;
-	if (GDVIRTUAL_CALL(_get_cursor_shape, p_pos, ret)) {
-		return (CursorShape)ret;
-	}
 	return data.default_cursor;
 }
 
@@ -3963,15 +3664,6 @@ Node::AutoTranslateMode Control::get_tooltip_auto_translate_mode() const {
 	return data.tooltip_auto_translate_mode;
 }
 
-Node::AutoTranslateMode Control::get_tooltip_auto_translate_mode_at(const Vector2 &p_at) const {
-	ERR_READ_THREAD_GUARD_V(AUTO_TRANSLATE_MODE_INHERIT);
-	AutoTranslateMode auto_translating;
-	if (GDVIRTUAL_CALL(_get_tooltip_auto_translate_mode_at, p_at, auto_translating)) {
-		return auto_translating;
-	}
-	return get_tooltip_auto_translate_mode();
-}
-
 // Extra properties.
 
 void Control::set_tooltip_text(const String &p_hint) {
@@ -4008,14 +3700,6 @@ Control *Control::make_custom_tooltip(const String &p_text) const {
 	return Object::cast_to<Control>(ret);
 }
 
-void Control::_ensure_allocated_offset_transform() {
-	if (data.offset_transform != nullptr) {
-		return;
-	}
-
-	data.offset_transform = memnew(Data::OffsetTransform);
-}
-
 // Base object overrides.
 
 void Control::_accessibility_action_foucs(const Variant &p_data) {
@@ -4064,28 +3748,33 @@ void Control::_notification(int p_notification) {
 			ERR_FAIL_COND(ae.is_null());
 
 			// Base info.
-			AccessibilityServer::get_singleton()->update_set_name(ae, _get_accessibility_name());
-			AccessibilityServer::get_singleton()->update_set_description(ae, get_accessibility_description());
-			AccessibilityServer::get_singleton()->update_set_live(ae, get_accessibility_live());
+			if (get_parent_control()) {
+				String container_info = get_parent_control()->get_accessibility_container_name(this);
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, container_info.is_empty() ? get_accessibility_name() : get_accessibility_name() + " " + container_info);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_accessibility_name());
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_description(ae, get_accessibility_description());
+			DisplayServer::get_singleton()->accessibility_update_set_live(ae, get_accessibility_live());
 
-			AccessibilityServer::get_singleton()->update_set_transform(ae, get_transform());
-			AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Vector2(), data.size_cache));
-			AccessibilityServer::get_singleton()->update_set_tooltip(ae, data.tooltip);
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_CLIPS_CHILDREN, data.clip_contents);
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH, data.mouse_filter == MOUSE_FILTER_PASS);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Vector2(), data.size_cache));
+			DisplayServer::get_singleton()->accessibility_update_set_tooltip(ae, data.tooltip);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_CLIPS_CHILDREN, data.clip_contents);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH, data.mouse_filter == MOUSE_FILTER_PASS);
 
 			if (_is_focusable()) {
-				AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Control::_accessibility_action_foucs));
-				AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Control::_accessibility_action_blur));
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Control::_accessibility_action_foucs));
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Control::_accessibility_action_blur));
 			}
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_TOOLTIP, callable_mp(this, &Control::_accessibility_action_show_tooltip));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_HIDE_TOOLTIP, callable_mp(this, &Control::_accessibility_action_hide_tooltip));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Control::_accessibility_action_scroll_into_view));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_TOOLTIP, callable_mp(this, &Control::_accessibility_action_show_tooltip));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_HIDE_TOOLTIP, callable_mp(this, &Control::_accessibility_action_hide_tooltip));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Control::_accessibility_action_scroll_into_view));
 			if (is_inside_tree() && get_viewport()->gui_is_dragging()) {
 				if (can_drop_data(Vector2(Math::INF, Math::INF), get_viewport()->gui_get_drag_data())) {
-					AccessibilityServer::get_singleton()->update_set_extra_info(ae, vformat(RTR("%s can be dropped here. Use %s to drop, use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_accessibility_drag_and_drop"), InputMap::get_singleton()->get_action_description("ui_cancel")));
+					DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(RTR("%s can be dropped here. Use %s to drop, use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_accessibility_drag_and_drop"), InputMap::get_singleton()->get_action_description("ui_cancel")));
 				} else {
-					AccessibilityServer::get_singleton()->update_set_extra_info(ae, vformat(RTR("%s can not be dropped here. Use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_cancel")));
+					DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(RTR("%s can not be dropped here. Use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_cancel")));
 				}
 			}
 
@@ -4095,7 +3784,7 @@ void Control::_notification(int p_notification) {
 				if (!np.is_empty()) {
 					Node *n = get_node(np);
 					if (n && !n->is_part_of_edited_scene()) {
-						AccessibilityServer::get_singleton()->update_add_related_controls(ae, n->get_accessibility_element());
+						DisplayServer::get_singleton()->accessibility_update_add_related_controls(ae, n->get_accessibility_element());
 					}
 				}
 			}
@@ -4104,7 +3793,7 @@ void Control::_notification(int p_notification) {
 				if (!np.is_empty()) {
 					Node *n = get_node(np);
 					if (n && !n->is_part_of_edited_scene()) {
-						AccessibilityServer::get_singleton()->update_add_related_described_by(ae, n->get_accessibility_element());
+						DisplayServer::get_singleton()->accessibility_update_add_related_described_by(ae, n->get_accessibility_element());
 					}
 				}
 			}
@@ -4113,7 +3802,7 @@ void Control::_notification(int p_notification) {
 				if (!np.is_empty()) {
 					Node *n = get_node(np);
 					if (n && !n->is_part_of_edited_scene()) {
-						AccessibilityServer::get_singleton()->update_add_related_labeled_by(ae, n->get_accessibility_element());
+						DisplayServer::get_singleton()->accessibility_update_add_related_labeled_by(ae, n->get_accessibility_element());
 					}
 				}
 			}
@@ -4122,7 +3811,7 @@ void Control::_notification(int p_notification) {
 				if (!np.is_empty()) {
 					Node *n = get_node(np);
 					if (n && !n->is_part_of_edited_scene()) {
-						AccessibilityServer::get_singleton()->update_add_related_flow_to(ae, n->get_accessibility_element());
+						DisplayServer::get_singleton()->accessibility_update_add_related_flow_to(ae, n->get_accessibility_element());
 					}
 				}
 			}
@@ -4359,7 +4048,6 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_screen_position"), &Control::get_screen_position);
 	ClassDB::bind_method(D_METHOD("get_rect"), &Control::get_rect);
 	ClassDB::bind_method(D_METHOD("get_global_rect"), &Control::get_global_rect);
-
 	ClassDB::bind_method(D_METHOD("set_focus_mode", "mode"), &Control::set_focus_mode);
 	ClassDB::bind_method(D_METHOD("get_focus_mode"), &Control::get_focus_mode);
 	ClassDB::bind_method(D_METHOD("get_focus_mode_with_override"), &Control::get_focus_mode_with_override);
@@ -4381,23 +4069,6 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_v_size_flags", "flags"), &Control::set_v_size_flags);
 	ClassDB::bind_method(D_METHOD("get_v_size_flags"), &Control::get_v_size_flags);
 
-	ClassDB::bind_method(D_METHOD("set_offset_transform_enabled", "enabled"), &Control::set_offset_transform_enabled);
-	ClassDB::bind_method(D_METHOD("is_offset_transform_enabled"), &Control::is_offset_transform_enabled);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_position", "offset"), &Control::set_offset_transform_position);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_position"), &Control::get_offset_transform_position);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_position_ratio", "offset"), &Control::set_offset_transform_position_ratio);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_position_ratio"), &Control::get_offset_transform_position_ratio);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_scale", "scale"), &Control::set_offset_transform_scale);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_scale"), &Control::get_offset_transform_scale);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_rotation", "rotation"), &Control::set_offset_transform_rotation);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_rotation"), &Control::get_offset_transform_rotation);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_pivot", "pivot"), &Control::set_offset_transform_pivot);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_pivot"), &Control::get_offset_transform_pivot);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_pivot_ratio", "pivot"), &Control::set_offset_transform_pivot_ratio);
-	ClassDB::bind_method(D_METHOD("get_offset_transform_pivot_ratio"), &Control::get_offset_transform_pivot_ratio);
-	ClassDB::bind_method(D_METHOD("set_offset_transform_visual_only", "enabled"), &Control::set_offset_transform_visual_only);
-	ClassDB::bind_method(D_METHOD("is_offset_transform_visual_only"), &Control::is_offset_transform_visual_only);
-
 	ClassDB::bind_method(D_METHOD("set_theme", "theme"), &Control::set_theme);
 	ClassDB::bind_method(D_METHOD("get_theme"), &Control::get_theme);
 
@@ -4462,7 +4133,7 @@ void Control::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_default_cursor_shape", "shape"), &Control::set_default_cursor_shape);
 	ClassDB::bind_method(D_METHOD("get_default_cursor_shape"), &Control::get_default_cursor_shape);
-	ClassDB::bind_method(D_METHOD("get_cursor_shape", "at_position"), &Control::get_cursor_shape, DEFVAL(Point2()));
+	ClassDB::bind_method(D_METHOD("get_cursor_shape", "position"), &Control::get_cursor_shape, DEFVAL(Point2()));
 
 	ClassDB::bind_method(D_METHOD("set_focus_neighbor", "side", "neighbor"), &Control::set_focus_neighbor);
 	ClassDB::bind_method(D_METHOD("get_focus_neighbor", "side"), &Control::get_focus_neighbor);
@@ -4605,16 +4276,6 @@ void Control::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "size_flags_vertical", PROPERTY_HINT_FLAGS, "Fill:1,Expand:2,Shrink Center:4,Shrink End:8"), "set_v_size_flags", "get_v_size_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "size_flags_stretch_ratio", PROPERTY_HINT_RANGE, "0,20,0.01,or_greater"), "set_stretch_ratio", "get_stretch_ratio");
 
-	ADD_GROUP("Offset Transform", "offset_transform_");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "offset_transform_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_offset_transform_enabled", "is_offset_transform_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset_transform_position", PROPERTY_HINT_NONE, "suffix:px"), "set_offset_transform_position", "get_offset_transform_position");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset_transform_position_ratio", PROPERTY_HINT_NONE), "set_offset_transform_position_ratio", "get_offset_transform_position_ratio");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset_transform_scale", PROPERTY_HINT_LINK), "set_offset_transform_scale", "get_offset_transform_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "offset_transform_rotation", PROPERTY_HINT_RANGE, "-360,360,0.1,or_less,or_greater,radians_as_degrees"), "set_offset_transform_rotation", "get_offset_transform_rotation");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset_transform_pivot", PROPERTY_HINT_NONE, "suffix:px"), "set_offset_transform_pivot", "get_offset_transform_pivot");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset_transform_pivot_ratio", PROPERTY_HINT_NONE), "set_offset_transform_pivot_ratio", "get_offset_transform_pivot_ratio");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "offset_transform_visual_only", PROPERTY_HINT_NONE), "set_offset_transform_visual_only", "is_offset_transform_visual_only");
-
 	ADD_GROUP("Localization", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "localize_numeral_system"), "set_localize_numeral_system", "is_localizing_numeral_system");
 
@@ -4655,7 +4316,7 @@ void Control::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "accessibility_flow_to_nodes", PROPERTY_HINT_ARRAY_TYPE, "NodePath"), "set_accessibility_flow_to_nodes", "get_accessibility_flow_to_nodes");
 
 	ADD_GROUP("Theme", "theme_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, Theme::get_class_static()), "set_theme", "get_theme");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), "set_theme", "get_theme");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "theme_type_variation", PROPERTY_HINT_ENUM_SUGGESTION), "set_theme_type_variation", "get_theme_type_variation");
 
 	BIND_ENUM_CONSTANT(FOCUS_NONE);
@@ -4757,8 +4418,7 @@ void Control::_bind_methods() {
 	BIND_ENUM_CONSTANT(TEXT_DIRECTION_RTL);
 
 	ADD_SIGNAL(MethodInfo("resized"));
-	ADD_SIGNAL(MethodInfo("_layout_pending_finished"));
-	ADD_SIGNAL(MethodInfo("gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, InputEvent::get_class_static())));
+	ADD_SIGNAL(MethodInfo("gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));
 	ADD_SIGNAL(MethodInfo("mouse_entered"));
 	ADD_SIGNAL(MethodInfo("mouse_exited"));
 	ADD_SIGNAL(MethodInfo("focus_entered"));
@@ -4771,15 +4431,12 @@ void Control::_bind_methods() {
 	GDVIRTUAL_BIND(_structured_text_parser, "args", "text");
 	GDVIRTUAL_BIND(_get_minimum_size);
 	GDVIRTUAL_BIND(_get_tooltip, "at_position");
-	GDVIRTUAL_BIND(_get_tooltip_auto_translate_mode_at, "at_position");
 
 	GDVIRTUAL_BIND(_get_drag_data, "at_position");
 	GDVIRTUAL_BIND(_can_drop_data, "at_position", "data");
 	GDVIRTUAL_BIND(_drop_data, "at_position", "data");
 	GDVIRTUAL_BIND(_make_custom_tooltip, "for_text");
 
-	GDVIRTUAL_BIND(_get_cursor_shape, "at_position");
-
 	GDVIRTUAL_BIND(_accessibility_get_contextual_info);
 	GDVIRTUAL_BIND(_get_accessibility_container_name, "node");
 
@@ -4797,10 +4454,6 @@ Control::Control() {
 Control::~Control() {
 	memdelete(data.theme_owner);
 
-	if (data.offset_transform != nullptr) {
-		memdelete(data.offset_transform);
-	}
-
 	// Resources need to be disconnected.
 	for (KeyValue<StringName, Ref<Texture2D>> &E : data.theme_icon_override) {
 		E.value->disconnect_changed(callable_mp(this, &Control::_notify_theme_override_changed));
diff --git a/engine/scene/gui/control.h b/engine/scene/gui/control.h
index 7ab115ef..28dcd43f 100644
--- a/engine/scene/gui/control.h
+++ b/engine/scene/gui/control.h
@@ -30,17 +30,16 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/math/transform_2d.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "scene/main/canvas_item.h"
 #include "scene/resources/theme.h"
-#include "servers/display/accessibility_server_enums.h"
 
+class Viewport;
 class Label;
 class Panel;
-class ThemeContext;
 class ThemeOwner;
-class Viewport;
-struct Transform2D;
+class ThemeContext;
 
 class Control : public CanvasItem {
 	GDCLASS(Control, CanvasItem);
@@ -98,7 +97,6 @@ public:
 		MOUSE_BEHAVIOR_ENABLED,
 	};
 
-	// Keep synced with InputClassEnums and DisplayServerEnums enums.
 	enum CursorShape {
 		CURSOR_ARROW,
 		CURSOR_IBEAM,
@@ -185,25 +183,6 @@ private:
 
 	// This Data struct is to avoid namespace pollution in derived classes.
 	struct Data {
-		struct OffsetTransform {
-			static constexpr Vector2 DEFAULT_TRANSLATION_ABSOLUTE = Vector2();
-			static constexpr Vector2 DEFAULT_TRANSLATION_RELATIVE = Vector2();
-			static constexpr Vector2 DEFAULT_SCALE = Vector2(1, 1);
-			static constexpr real_t DEFAULT_ROTATION = 0.0;
-			static constexpr Vector2 DEFAULT_PIVOT_ABSOLUTE = Vector2();
-			static constexpr Vector2 DEFAULT_PIVOT_RELATIVE = Vector2(0.5, 0.5);
-			static constexpr bool DEFAULT_VISUAL_ONLY = true;
-
-			bool enabled = false;
-			Vector2 translation_absolute = DEFAULT_TRANSLATION_ABSOLUTE;
-			Vector2 translation_relative = DEFAULT_TRANSLATION_RELATIVE;
-			Vector2 scale = DEFAULT_SCALE;
-			real_t rotation = DEFAULT_ROTATION;
-			Vector2 pivot_absolute = DEFAULT_PIVOT_ABSOLUTE;
-			Vector2 pivot_relative = DEFAULT_PIVOT_RELATIVE;
-			bool visual_only = DEFAULT_VISUAL_ONLY;
-		};
-
 		bool initialized = false;
 
 		// Global relations.
@@ -235,8 +214,6 @@ private:
 		Vector2 pivot_offset;
 		Vector2 pivot_offset_ratio;
 
-		OffsetTransform *offset_transform = nullptr;
-
 		Point2 pos_cache;
 		Size2 size_cache;
 		mutable Size2 minimum_size_cache;
@@ -246,8 +223,6 @@ private:
 		bool updating_last_minimum_size = false;
 		bool block_minimum_size_adjust = false;
 
-		bool layout_pending = false;
-
 		bool size_warning = true;
 
 		// Container sizing.
@@ -281,7 +256,7 @@ private:
 
 		String accessibility_name;
 		String accessibility_description;
-		AccessibilityServerEnums::AccessibilityLiveMode accessibility_live = AccessibilityServerEnums::AccessibilityLiveMode::LIVE_OFF;
+		DisplayServer::AccessibilityLiveMode accessibility_live = DisplayServer::AccessibilityLiveMode::LIVE_OFF;
 
 		TypedArray<NodePath> accessibility_controls_nodes;
 		TypedArray<NodePath> accessibility_described_by_nodes;
@@ -387,8 +362,6 @@ private:
 	void _notify_theme_override_changed();
 	void _invalidate_theme_cache();
 
-	void _ensure_allocated_offset_transform();
-
 	// Extra properties.
 
 	static int root_layout_direction;
@@ -435,15 +408,12 @@ protected:
 	GDVIRTUAL2RC(TypedArray<Vector3i>, _structured_text_parser, Array, String)
 	GDVIRTUAL0RC(Vector2, _get_minimum_size)
 	GDVIRTUAL1RC(String, _get_tooltip, Vector2)
-	GDVIRTUAL1RC(AutoTranslateMode, _get_tooltip_auto_translate_mode_at, Vector2)
 
 	GDVIRTUAL1R(Variant, _get_drag_data, Vector2)
 	GDVIRTUAL2RC(bool, _can_drop_data, Vector2, Variant)
 	GDVIRTUAL2(_drop_data, Vector2, Variant)
 	GDVIRTUAL1RC(Object *, _make_custom_tooltip, String)
 
-	GDVIRTUAL1RC(int, _get_cursor_shape, Vector2)
-
 	GDVIRTUAL0RC(String, _accessibility_get_contextual_info);
 	GDVIRTUAL1RC(String, _get_accessibility_container_name, RequiredParam<const Node>)
 
@@ -582,13 +552,6 @@ public:
 	void set_custom_minimum_size(const Size2 &p_custom);
 	Size2 get_custom_minimum_size() const;
 
-	bool is_layout_pending() const;
-	bool is_layout_pending_in_tree() const;
-	void layout_pending_start();
-	void layout_pending_finish();
-	Control *get_layout_pending_control_in_tree() const;
-	void call_on_all_layout_pending_finished(const Callable &p_callable);
-
 	// Container sizing.
 
 	void set_h_size_flags(BitField<SizeFlags> p_flags);
@@ -598,26 +561,6 @@ public:
 	void set_stretch_ratio(real_t p_ratio);
 	real_t get_stretch_ratio() const;
 
-	// Offset transform.
-
-	void set_offset_transform_enabled(bool p_enabled);
-	bool is_offset_transform_enabled() const;
-	void set_offset_transform_position(const Vector2 &p_offset);
-	Vector2 get_offset_transform_position() const;
-	void set_offset_transform_position_ratio(const Vector2 &p_offset);
-	Vector2 get_offset_transform_position_ratio() const;
-	void set_offset_transform_scale(const Vector2 &p_scale);
-	Vector2 get_offset_transform_scale() const;
-	void set_offset_transform_rotation(real_t p_rotation);
-	real_t get_offset_transform_rotation() const;
-	void set_offset_transform_pivot(const Vector2 &p_pivot);
-	Vector2 get_offset_transform_pivot() const;
-	void set_offset_transform_pivot_ratio(const Vector2 &p_pivot);
-	Vector2 get_offset_transform_pivot_ratio() const;
-	void set_offset_transform_visual_only(bool p_enabled);
-	bool is_offset_transform_visual_only() const;
-	Transform2D get_offset_transform() const;
-
 	// Input events.
 
 	virtual void gui_input(const Ref<InputEvent> &p_event);
@@ -684,13 +627,11 @@ public:
 	void set_accessibility_name(const String &p_name);
 	String get_accessibility_name() const;
 
-	virtual String _get_accessibility_name() const;
-
 	void set_accessibility_description(const String &p_description);
 	String get_accessibility_description() const;
 
-	void set_accessibility_live(AccessibilityServerEnums::AccessibilityLiveMode p_mode);
-	AccessibilityServerEnums::AccessibilityLiveMode get_accessibility_live() const;
+	void set_accessibility_live(DisplayServer::AccessibilityLiveMode p_mode);
+	DisplayServer::AccessibilityLiveMode get_accessibility_live() const;
 
 	void set_accessibility_controls_nodes(const TypedArray<NodePath> &p_node_path);
 	TypedArray<NodePath> get_accessibility_controls_nodes() const;
@@ -708,7 +649,7 @@ public:
 
 	void set_default_cursor_shape(CursorShape p_shape);
 	CursorShape get_default_cursor_shape() const;
-	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2()) const;
+	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const;
 
 	void set_clip_contents(bool p_clip);
 	bool is_clipping_contents();
@@ -793,7 +734,6 @@ public:
 
 	void set_tooltip_auto_translate_mode(AutoTranslateMode p_mode);
 	AutoTranslateMode get_tooltip_auto_translate_mode() const;
-	virtual AutoTranslateMode get_tooltip_auto_translate_mode_at(const Vector2 &p_at) const;
 
 	// Extra properties.
 
diff --git a/engine/scene/gui/dialogs.compat.inc b/engine/scene/gui/dialogs.compat.inc
index 90691bcd..acfc9f0a 100644
--- a/engine/scene/gui/dialogs.compat.inc
+++ b/engine/scene/gui/dialogs.compat.inc
@@ -30,9 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "dialogs.h"
-
-#include "core/object/class_db.h"
 #include "scene/gui/line_edit.h"
 
 void AcceptDialog::_register_text_enter_bind_compat_89419(Control *p_line_edit) {
@@ -48,4 +45,4 @@ void AcceptDialog::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("remove_button", "quadrant_size"), &AcceptDialog::_remove_button_bind_compat_89419);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/dialogs.cpp b/engine/scene/gui/dialogs.cpp
index ce93ac3e..69993a41 100644
--- a/engine/scene/gui/dialogs.cpp
+++ b/engine/scene/gui/dialogs.cpp
@@ -31,12 +31,8 @@
 #include "dialogs.h"
 #include "dialogs.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/line_edit.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 // AcceptDialog
 
@@ -59,7 +55,7 @@ void AcceptDialog::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_DIALOG);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_DIALOG);
 		} break;
 		case NOTIFICATION_POST_ENTER_TREE: {
 			if (is_visible()) {
diff --git a/engine/scene/gui/dialogs.h b/engine/scene/gui/dialogs.h
index 5a5a1573..b837f7fe 100644
--- a/engine/scene/gui/dialogs.h
+++ b/engine/scene/gui/dialogs.h
@@ -30,11 +30,12 @@
 
 #pragma once
 
-#include "scene/gui/box_container.h"
+#include "box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/popup.h"
+#include "scene/gui/texture_button.h"
 #include "scene/main/window.h"
 
 class LineEdit;
diff --git a/engine/scene/gui/file_dialog.compat.inc b/engine/scene/gui/file_dialog.compat.inc
index b0ce5b70..c8da18f7 100644
--- a/engine/scene/gui/file_dialog.compat.inc
+++ b/engine/scene/gui/file_dialog.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "file_dialog.h"
-
-#include "core/object/class_db.h"
-
 void FileDialog::_add_filter_bind_compat_111439(const String &p_filter, const String &p_description) {
 	add_filter(p_filter, p_description, "");
 }
@@ -42,4 +38,4 @@ void FileDialog::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_filter", "filter", "description"), &FileDialog::_add_filter_bind_compat_111439, DEFVAL(""));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/file_dialog.cpp b/engine/scene/gui/file_dialog.cpp
index 06c1f444..e168eee0 100644
--- a/engine/scene/gui/file_dialog.cpp
+++ b/engine/scene/gui/file_dialog.cpp
@@ -34,10 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
@@ -50,7 +47,6 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
 
 void FileDialog::popup_file_dialog() {
 	popup_centered_clamped(Vector2(1050, 700) * get_theme_default_base_scale(), 0.8f);
@@ -83,20 +79,20 @@ void FileDialog::_native_popup() {
 	while (w && w->get_flag(FLAG_POPUP) && w->get_parent_visible_window()) {
 		w = w->get_parent_visible_window();
 	}
-	DisplayServerEnums::WindowID wid = w ? w->get_window_id() : DisplayServerEnums::INVALID_WINDOW_ID;
+	DisplayServer::WindowID wid = w ? w->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA)) {
-		DisplayServer::get_singleton()->file_dialog_with_options_show(get_displayed_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), root, filename_edit->get_text().get_file(), show_hidden_files, DisplayServerEnums::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &FileDialog::_native_dialog_cb_with_options), wid);
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_EXTRA)) {
+		DisplayServer::get_singleton()->file_dialog_with_options_show(get_displayed_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), root, filename_edit->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &FileDialog::_native_dialog_cb_with_options), wid);
 	} else {
-		DisplayServer::get_singleton()->file_dialog_show(get_displayed_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), filename_edit->get_text().get_file(), show_hidden_files, DisplayServerEnums::FileDialogMode(mode), processed_filters, callable_mp(this, &FileDialog::_native_dialog_cb), wid);
+		DisplayServer::get_singleton()->file_dialog_show(get_displayed_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), filename_edit->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, callable_mp(this, &FileDialog::_native_dialog_cb), wid);
 	}
 }
 
 bool FileDialog::_can_use_native_popup() const {
 	if (access == ACCESS_RESOURCES || access == ACCESS_USERDATA || options.size() > 0) {
-		return DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA);
+		return DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_EXTRA);
 	}
-	return DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE);
+	return DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE);
 }
 
 Vector2i FileDialog::_get_list_mode_icon_size() const {
@@ -370,24 +366,14 @@ void FileDialog::update_dir() {
 	if (drives->is_visible()) {
 		if (dir_access->get_current_dir().is_network_share_path()) {
 			_update_drives(false);
-			PopupMenu *pm = drives->get_popup();
-			pm->add_item(ETR("Network"));
-			Dictionary meta;
-			meta["index"] = -1;
-			meta["path"] = String();
-			meta["name"] = ETR("Network");
-			pm->set_item_metadata(-1, meta);
-			pm->set_item_disabled(-1, true);
-			drives->set_text(meta["name"]);
-			selected_drive = pm->get_item_count() - 1;
+			drives->add_item(ETR("Network"));
+			drives->set_item_disabled(-1, true);
+			drives->select(drives->get_item_count() - 1);
 		} else {
-			PopupMenu *pm = drives->get_popup();
 			int cur = dir_access->get_current_drive();
-			for (int i = 0; i < pm->get_item_count(); i++) {
-				const Dictionary &meta = pm->get_item_metadata(i);
-				if (meta["index"].operator int() == cur) {
-					drives->set_text(meta["name"]);
-					selected_drive = i;
+			for (int i = 0; i < drives->get_item_count(); i++) {
+				if (drives->get_item_metadata(i).operator int() == cur) {
+					drives->select(i);
 					break;
 				}
 			}
@@ -399,11 +385,11 @@ void FileDialog::update_dir() {
 }
 
 void FileDialog::_dir_submitted(String p_dir) {
-	String new_dir = OS::get_singleton()->expand_path(p_dir);
+	String new_dir = p_dir;
 #ifdef WINDOWS_ENABLED
 	if (root_prefix.is_empty() && drives->is_visible() && !new_dir.is_network_share_path() && new_dir.is_absolute_path() && new_dir.find(":/") == -1 && new_dir.find(":\\") == -1) {
 		// Non network path without X:/ prefix on Windows, add drive letter.
-		new_dir = drives->get_popup()->get_item_metadata(selected_drive).operator Dictionary()["path"].operator String().path_join(new_dir);
+		new_dir = drives->get_item_text(drives->get_selected()).path_join(new_dir);
 	}
 #endif
 	if (!root_prefix.is_empty()) {
@@ -468,9 +454,6 @@ void FileDialog::_action_pressed() {
 	}
 
 	String file_text = filename_edit->get_text();
-
-	file_text = OS::get_singleton()->expand_path(file_text);
-
 	String f = file_text.is_absolute_path() ? file_text : dir_access->get_current_dir().path_join(file_text);
 
 	if ((mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_FILE) && (dir_access->file_exists(f) || dir_access->is_bundle(f))) {
@@ -791,19 +774,15 @@ void FileDialog::_popup_menu(const Vector2 &p_pos, int p_for_item) {
 
 	if (p_for_item > -1) {
 		item_menu->add_item(ETR("Copy Path"), ITEM_MENU_COPY_PATH);
-		item_menu->set_item_icon(-1, theme_cache.menu_copy_path);
 		if (customization_flags[CUSTOMIZATION_DELETE]) {
 			item_menu->add_item(ETR("Delete"), ITEM_MENU_DELETE);
-			item_menu->set_item_icon(-1, theme_cache.menu_delete);
 			item_menu->set_item_shortcut(-1, action_shortcuts[ITEM_MENU_DELETE]);
 		}
 	} else {
 		if (can_create_folders) {
 			item_menu->add_item(ETR("New Folder..."), ITEM_MENU_NEW_FOLDER);
-			item_menu->set_item_icon(-1, theme_cache.menu_new_folder);
 		}
 		item_menu->add_item(ETR("Refresh"), ITEM_MENU_REFRESH);
-		item_menu->set_item_icon(-1, theme_cache.menu_refresh);
 		item_menu->set_item_shortcut(-1, action_shortcuts[ITEM_MENU_REFRESH]);
 	}
 
@@ -816,11 +795,9 @@ void FileDialog::_popup_menu(const Vector2 &p_pos, int p_for_item) {
 		meta = file_list->get_item_metadata(p_for_item);
 	}
 
-	item_menu->add_item((p_for_item == -1 || meta["dir"]) ? OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_OPEN) : OS::get_singleton()->get_platform_string(OS::PLATFORM_STRING_FILE_MANAGER_SHOW), ITEM_MENU_SHOW_IN_EXPLORER);
-	item_menu->set_item_icon(-1, theme_cache.menu_show_in_file_manager);
+	item_menu->add_item((p_for_item == -1 || meta["dir"]) ? ETR("Open in File Manager") : ETR("Show in File Manager"), ITEM_MENU_SHOW_IN_EXPLORER);
 	if (meta["bundle"]) {
 		item_menu->add_item(ETR("Show Package Contents"), ITEM_MENU_SHOW_BUNDLE_CONTENT);
-		item_menu->set_item_icon(-1, theme_cache.menu_open_bundle);
 	}
 #endif
 
@@ -1181,7 +1158,7 @@ void FileDialog::update_filters() {
 
 		String native_all_name;
 		native_all_name += all_filters;
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
 			if (!native_all_name.is_empty()) {
 				native_all_name += ", ";
 			}
@@ -1203,7 +1180,7 @@ void FileDialog::update_filters() {
 		String native_name;
 
 		native_name += flt;
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
 			if (!native_name.is_empty() && !mime.is_empty()) {
 				native_name += ", ";
 			}
@@ -1341,15 +1318,12 @@ void FileDialog::set_current_path(const String &p_path) {
 	if (!p_path.size()) {
 		return;
 	}
-
-	String path = OS::get_singleton()->expand_path(p_path);
-
-	int pos = MAX(path.rfind_char('/'), path.rfind_char('\\'));
+	int pos = MAX(p_path.rfind_char('/'), p_path.rfind_char('\\'));
 	if (pos == -1) {
-		set_current_file(path);
+		set_current_file(p_path);
 	} else {
-		String path_dir = path.substr(0, pos);
-		String path_file = path.substr(pos + 1);
+		String path_dir = p_path.substr(0, pos);
+		String path_file = p_path.substr(pos + 1);
 		set_current_dir(path_dir);
 		set_current_file(path_file);
 	}
@@ -1579,10 +1553,6 @@ void FileDialog::_invalidate() {
 
 	update_file_list();
 
-	if (ensure_visible_after_invalidating) {
-		file_list->ensure_current_is_visible();
-		ensure_visible_after_invalidating = false;
-	}
 	is_invalidating = false;
 }
 
@@ -1625,22 +1595,13 @@ void FileDialog::_make_dir() {
 }
 
 void FileDialog::_select_drive(int p_idx) {
-	const Dictionary &meta = drives->get_popup()->get_item_metadata(p_idx);
-	drives->set_text(meta["name"]);
-	selected_drive = p_idx;
-
-	_change_dir(meta["path"]);
+	String d = drives->get_item_text(p_idx);
+	_change_dir(d);
 	filename_edit->set_text("");
 	_push_history();
 }
 
 void FileDialog::_change_dir(const String &p_new_dir) {
-	if (access == ACCESS_RESOURCES && p_new_dir.begins_with("user://")) {
-		ERR_FAIL_MSG("Can't change to userdata folder when using ACCESS_RESOURCES.");
-	} else if (access == ACCESS_USERDATA && p_new_dir.begins_with("res://")) {
-		ERR_FAIL_MSG("Can't change to resources folder when using ACCESS_USERDATA.");
-	}
-
 	if (root_prefix.is_empty()) {
 		dir_access->change_dir(p_new_dir);
 	} else {
@@ -1675,8 +1636,7 @@ void FileDialog::_update_drives(bool p_select) {
 	if (drive_map.size() == 0) {
 		drives->hide();
 	} else {
-		PopupMenu *pm = drives->get_popup();
-		pm->clear();
+		drives->clear();
 		Node *dp = drives->get_parent();
 		if (dp) {
 			dp->remove_child(drives);
@@ -1686,22 +1646,10 @@ void FileDialog::_update_drives(bool p_select) {
 		drives->show();
 
 		for (const KeyValue<int, String> &drv : drive_map) {
-			String display_name = drv.value;
-			String lbl = dir_access->get_drive_label(drv.key);
-			if (!lbl.is_empty()) {
-				display_name = drv.value + " (" + lbl + ")";
-			}
-			pm->add_item(display_name);
-			pm->set_item_tooltip(-1, drv.value);
-
-			Dictionary meta;
-			meta["index"] = drv.key;
-			meta["path"] = drv.value;
-			meta["name"] = drv.value;
-			pm->set_item_metadata(-1, meta);
+			drives->add_item(drv.value);
+			drives->set_item_metadata(-1, drv.key);
 			if (p_select && drv.key == cur) {
-				drives->set_text(drv.value);
-				selected_drive = drv.key;
+				drives->select(drives->get_item_count() - 1);
 			}
 		}
 	}
@@ -1712,7 +1660,6 @@ void FileDialog::_sort_option_selected(int p_option) {
 		file_sort_button->get_popup()->set_item_checked(i, (i == p_option));
 	}
 	file_sort = FileSortOption(p_option);
-	ensure_visible_after_invalidating = true;
 	invalidate();
 }
 
@@ -2237,13 +2184,6 @@ void FileDialog::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, file_thumbnail);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, folder_thumbnail);
 
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_copy_path);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_delete);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_refresh);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_new_folder);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_show_in_file_manager);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FileDialog, menu_open_bundle);
-
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, FileDialog, folder_icon_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, FileDialog, file_icon_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, FileDialog, file_disabled_color);
@@ -2261,7 +2201,7 @@ void FileDialog::_bind_methods() {
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "name"), defaults.name, &FileDialog::set_option_name, &FileDialog::get_option_name);
 	base_property_helper.register_property(PropertyInfo(Variant::PACKED_STRING_ARRAY, "values"), defaults.values, &FileDialog::set_option_values, &FileDialog::get_option_values);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "default"), defaults.default_idx, &FileDialog::set_option_default, &FileDialog::get_option_default);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 
 	ADD_CLASS_DEPENDENCY("Button");
 	ADD_CLASS_DEPENDENCY("ConfirmationDialog");
@@ -2393,9 +2333,8 @@ FileDialog::FileDialog() {
 	drives_container = memnew(HBoxContainer);
 	top_toolbar->add_child(drives_container);
 
-	drives = memnew(MenuButton);
-	drives->set_flat(false);
-	drives->get_popup()->connect("index_pressed", callable_mp(this, &FileDialog::_select_drive));
+	drives = memnew(OptionButton);
+	drives->connect(SceneStringName(item_selected), callable_mp(this, &FileDialog::_select_drive));
 	drives->set_accessibility_name(ETR("Drive"));
 	top_toolbar->add_child(drives);
 
diff --git a/engine/scene/gui/file_dialog.h b/engine/scene/gui/file_dialog.h
index 92ec8070..1d37fb41 100644
--- a/engine/scene/gui/file_dialog.h
+++ b/engine/scene/gui/file_dialog.h
@@ -205,7 +205,6 @@ private:
 	String full_dir;
 
 	bool is_invalidating = false;
-	bool ensure_visible_after_invalidating = false;
 
 	VBoxContainer *main_vbox = nullptr;
 
@@ -214,8 +213,7 @@ private:
 	Button *dir_up = nullptr;
 
 	HBoxContainer *drives_container = nullptr;
-	MenuButton *drives = nullptr;
-	int selected_drive = 0;
+	OptionButton *drives = nullptr;
 	LineEdit *directory_edit = nullptr;
 	HBoxContainer *shortcuts_container = nullptr;
 
@@ -282,13 +280,6 @@ private:
 		Ref<Texture2D> file_thumbnail;
 		Ref<Texture2D> folder_thumbnail;
 
-		Ref<Texture2D> menu_copy_path;
-		Ref<Texture2D> menu_delete;
-		Ref<Texture2D> menu_refresh;
-		Ref<Texture2D> menu_new_folder;
-		Ref<Texture2D> menu_show_in_file_manager;
-		Ref<Texture2D> menu_open_bundle;
-
 		Color folder_icon_color;
 		Color file_icon_color;
 		Color file_disabled_color;
diff --git a/engine/scene/gui/flow_container.cpp b/engine/scene/gui/flow_container.cpp
index 3e4f32ac..659a8ad7 100644
--- a/engine/scene/gui/flow_container.cpp
+++ b/engine/scene/gui/flow_container.cpp
@@ -30,7 +30,6 @@
 
 #include "flow_container.h"
 
-#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/engine/scene/gui/foldable_container.cpp b/engine/scene/gui/foldable_container.cpp
index 415a5719..0c948ddd 100644
--- a/engine/scene/gui/foldable_container.cpp
+++ b/engine/scene/gui/foldable_container.cpp
@@ -30,7 +30,6 @@
 
 #include "foldable_container.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/text_line.h"
 #include "scene/theme/theme_db.h"
 
@@ -561,7 +560,7 @@ void FoldableContainer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_title_alignment", "get_title_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_position", PROPERTY_HINT_ENUM, "Top,Bottom"), "set_title_position", "get_title_position");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_title_text_overrun_behavior", "get_title_text_overrun_behavior");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "foldable_group", PROPERTY_HINT_RESOURCE_TYPE, FoldableGroup::get_class_static()), "set_foldable_group", "get_foldable_group");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "foldable_group", PROPERTY_HINT_RESOURCE_TYPE, "FoldableGroup"), "set_foldable_group", "get_foldable_group");
 
 	ADD_GROUP("BiDi", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_title_text_direction", "get_title_text_direction");
@@ -653,7 +652,7 @@ void FoldableGroup::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_folding_all"), "set_allow_folding_all", "is_allow_folding_all");
 
-	ADD_SIGNAL(MethodInfo("expanded", PropertyInfo(Variant::OBJECT, "container", PROPERTY_HINT_RESOURCE_TYPE, FoldableContainer::get_class_static())));
+	ADD_SIGNAL(MethodInfo("expanded", PropertyInfo(Variant::OBJECT, "container", PROPERTY_HINT_RESOURCE_TYPE, "FoldableContainer")));
 }
 
 FoldableGroup::FoldableGroup() {
diff --git a/engine/scene/gui/graph_edit.compat.inc b/engine/scene/gui/graph_edit.compat.inc
index 4f374819..5b8cc2b0 100644
--- a/engine/scene/gui/graph_edit.compat.inc
+++ b/engine/scene/gui/graph_edit.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "graph_edit.h"
-
-#include "core/object/class_db.h"
-
 bool GraphEdit::_is_arrange_nodes_button_hidden_bind_compat_81582() const {
 	return !is_showing_arrange_button();
 }
@@ -57,4 +53,4 @@ void GraphEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("connect_node", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::_connect_node_bind_compat_97449);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/graph_edit.cpp b/engine/scene/gui/graph_edit.cpp
index c1d83dad..279716f8 100644
--- a/engine/scene/gui/graph_edit.cpp
+++ b/engine/scene/gui/graph_edit.cpp
@@ -31,12 +31,9 @@
 #include "graph_edit.h"
 #include "graph_edit.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/math_funcs.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "scene/2d/line_2d.h"
 #include "scene/gui/box_container.h"
@@ -1832,7 +1829,7 @@ void GraphEdit::_minimap_draw() {
 		Vector2 node_size = minimap->_convert_from_graph_position(graph_frame->get_size() * zoom);
 		Rect2 node_rect = Rect2(node_position, node_size);
 
-		Ref<StyleBoxFlat> sb_minimap = minimap->theme_cache.node_style;
+		Ref<StyleBoxFlat> sb_minimap = minimap->theme_cache.node_style->duplicate();
 
 		// Override default values with colors provided by the GraphNode's stylebox, if possible.
 		Ref<StyleBoxFlat> sb_frame = graph_frame->get_theme_stylebox(graph_frame->is_selected() ? SNAME("panel_selected") : SceneStringName(panel));
@@ -1841,7 +1838,6 @@ void GraphEdit::_minimap_draw() {
 			if (graph_frame->is_tint_color_enabled()) {
 				node_color = graph_frame->get_tint_color();
 			}
-			sb_minimap = sb_minimap->duplicate();
 			sb_minimap->set_bg_color(node_color);
 		}
 
@@ -1859,13 +1855,12 @@ void GraphEdit::_minimap_draw() {
 		Vector2 node_size = minimap->_convert_from_graph_position(graph_node->get_size() * zoom);
 		Rect2 node_rect = Rect2(node_position, node_size);
 
-		Ref<StyleBoxFlat> sb_minimap = minimap->theme_cache.node_style;
+		Ref<StyleBoxFlat> sb_minimap = minimap->theme_cache.node_style->duplicate();
 
 		// Override default values with colors provided by the GraphNode's stylebox, if possible.
 		Ref<StyleBoxFlat> sb_frame = graph_node->is_selected() ? graph_node->theme_cache.panel_selected : graph_node->theme_cache.panel;
 		if (sb_frame.is_valid()) {
 			Color node_color = sb_frame->get_bg_color();
-			sb_minimap = sb_minimap->duplicate();
 			sb_minimap->set_bg_color(node_color);
 		}
 
@@ -2595,7 +2590,7 @@ TypedArray<Dictionary> GraphEdit::_get_connections_intersecting_with_rect(const
 TypedArray<Dictionary> GraphEdit::_get_connection_list_from_node(const StringName &p_node) const {
 	ERR_FAIL_COND_V(!connection_map.has(p_node), TypedArray<Dictionary>());
 
-	List<Ref<GraphEdit::Connection>> connections_from_node(connection_map.get(p_node));
+	List<Ref<GraphEdit::Connection>> connections_from_node = connection_map.get(p_node);
 	TypedArray<Dictionary> connections_from_node_dict;
 
 	for (const Ref<Connection> &conn : connections_from_node) {
@@ -2954,7 +2949,7 @@ void GraphEdit::set_warped_panning(bool p_warped) {
 }
 
 void GraphEdit::update_warped_panning() {
-	panner->setup_warped_panning(this, warped_panning);
+	panner->setup_warped_panning(get_viewport(), warped_panning);
 }
 
 void GraphEdit::arrange_nodes() {
@@ -3119,9 +3114,9 @@ void GraphEdit::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("duplicate_nodes_request"));
 	ADD_SIGNAL(MethodInfo("delete_nodes_request", PropertyInfo(Variant::ARRAY, "nodes", PROPERTY_HINT_ARRAY_TYPE, "StringName")));
 
-	ADD_SIGNAL(MethodInfo("node_selected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("node_deselected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("frame_rect_changed", PropertyInfo(Variant::OBJECT, "frame", PROPERTY_HINT_RESOURCE_TYPE, GraphFrame::get_class_static()), PropertyInfo(Variant::RECT2, "new_rect")));
+	ADD_SIGNAL(MethodInfo("node_selected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("node_deselected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("frame_rect_changed", PropertyInfo(Variant::OBJECT, "frame", PROPERTY_HINT_RESOURCE_TYPE, "GraphFrame"), PropertyInfo(Variant::RECT2, "new_rect")));
 
 	ADD_SIGNAL(MethodInfo("popup_request", PropertyInfo(Variant::VECTOR2, "at_position")));
 
diff --git a/engine/scene/gui/graph_edit.h b/engine/scene/gui/graph_edit.h
index 4db738d4..088507cc 100644
--- a/engine/scene/gui/graph_edit.h
+++ b/engine/scene/gui/graph_edit.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/variant/typed_dictionary.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/graph_frame.h"
 #include "scene/gui/graph_node.h"
diff --git a/engine/scene/gui/graph_edit_arranger.cpp b/engine/scene/gui/graph_edit_arranger.cpp
index 7cd0ff7d..d50af786 100644
--- a/engine/scene/gui/graph_edit_arranger.cpp
+++ b/engine/scene/gui/graph_edit_arranger.cpp
@@ -32,8 +32,6 @@
 
 #include "scene/gui/graph_edit.h"
 
-#include <cfloat> // FLT_MIN, FLT_MAX
-
 void GraphEditArranger::arrange_nodes() {
 	ERR_FAIL_NULL(graph_edit);
 
@@ -244,17 +242,14 @@ int GraphEditArranger::_set_operations(SET_OPERATIONS p_operation, HashSet<Strin
 HashMap<int, Vector<StringName>> GraphEditArranger::_layering(const HashSet<StringName> &r_selected_nodes, const HashMap<StringName, HashSet<StringName>> &r_upper_neighbours) {
 	HashMap<int, Vector<StringName>> l;
 
-	HashSet<StringName> p(r_selected_nodes);
-	HashSet<StringName> q(r_selected_nodes);
-	HashSet<StringName> u;
-	HashSet<StringName> z;
+	HashSet<StringName> p = r_selected_nodes, q = r_selected_nodes, u, z;
 	int current_layer = 0;
 	bool selected = false;
 
 	while (!_set_operations(GraphEditArranger::IS_EQUAL, q, u)) {
 		_set_operations(GraphEditArranger::DIFFERENCE, p, u);
 		for (const StringName &E : p) {
-			HashSet<StringName> n(r_upper_neighbours[E]);
+			HashSet<StringName> n = r_upper_neighbours[E];
 			if (_set_operations(GraphEditArranger::IS_SUBSET, n, z)) {
 				Vector<StringName> t;
 				t.push_back(E);
@@ -431,14 +426,14 @@ void GraphEditArranger::_calculate_inner_shifts(Dictionary &r_inner_shifts, cons
 
 float GraphEditArranger::_calculate_threshold(const StringName &p_v, const StringName &p_w, const Dictionary &r_node_names, const HashMap<int, Vector<StringName>> &r_layers, const Dictionary &r_root, const Dictionary &r_align, const Dictionary &r_inner_shift, real_t p_current_threshold, const HashMap<StringName, Vector2> &r_node_positions) {
 #define MAX_ORDER 2147483647
-#define ORDER(node, layers) \
+#define ORDER(node, layers)                            \
 	for (unsigned int i = 0; i < layers.size(); i++) { \
-		int index = layers[i].find(node); \
-		if (index > 0) { \
-			order = index; \
-			break; \
-		} \
-		order = MAX_ORDER; \
+		int index = layers[i].find(node);              \
+		if (index > 0) {                               \
+			order = index;                             \
+			break;                                     \
+		}                                              \
+		order = MAX_ORDER;                             \
 	}
 
 	int order = MAX_ORDER;
@@ -510,14 +505,14 @@ float GraphEditArranger::_calculate_threshold(const StringName &p_v, const Strin
 }
 
 void GraphEditArranger::_place_block(const StringName &p_v, float p_delta, const HashMap<int, Vector<StringName>> &r_layers, const Dictionary &r_root, const Dictionary &r_align, const Dictionary &r_node_name, const Dictionary &r_inner_shift, Dictionary &r_sink, Dictionary &r_shift, HashMap<StringName, Vector2> &r_node_positions) {
-#define PRED(node, layers) \
+#define PRED(node, layers)                             \
 	for (unsigned int i = 0; i < layers.size(); i++) { \
-		int index = layers[i].find(node); \
-		if (index > 0) { \
-			predecessor = layers[i][index - 1]; \
-			break; \
-		} \
-		predecessor = StringName(); \
+		int index = layers[i].find(node);              \
+		if (index > 0) {                               \
+			predecessor = layers[i][index - 1];        \
+			break;                                     \
+		}                                              \
+		predecessor = StringName();                    \
 	}
 
 	StringName predecessor;
diff --git a/engine/scene/gui/graph_element.cpp b/engine/scene/gui/graph_element.cpp
index 699839aa..0d69e375 100644
--- a/engine/scene/gui/graph_element.cpp
+++ b/engine/scene/gui/graph_element.cpp
@@ -30,8 +30,6 @@
 
 #include "graph_element.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/engine/scene/gui/graph_frame.cpp b/engine/scene/gui/graph_frame.cpp
index cd77b1bd..9eed6d56 100644
--- a/engine/scene/gui/graph_frame.cpp
+++ b/engine/scene/gui/graph_frame.cpp
@@ -30,8 +30,6 @@
 
 #include "graph_frame.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/resources/style_box_flat.h"
diff --git a/engine/scene/gui/graph_node.cpp b/engine/scene/gui/graph_node.cpp
index 4f52ec4f..c1c74091 100644
--- a/engine/scene/gui/graph_node.cpp
+++ b/engine/scene/gui/graph_node.cpp
@@ -30,14 +30,10 @@
 
 #include "graph_node.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/label.h"
-#include "scene/main/scene_tree.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 bool GraphNode::_set(const StringName &p_name, const Variant &p_value) {
 	String str = p_name;
@@ -144,11 +140,11 @@ void GraphNode::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(PropertyInfo(Variant::BOOL, base + "left_enabled"));
 		p_list->push_back(PropertyInfo(Variant::INT, base + "left_type"));
 		p_list->push_back(PropertyInfo(Variant::COLOR, base + "left_color"));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, base + "left_icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, base + "left_icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		p_list->push_back(PropertyInfo(Variant::BOOL, base + "right_enabled"));
 		p_list->push_back(PropertyInfo(Variant::INT, base + "right_type"));
 		p_list->push_back(PropertyInfo(Variant::COLOR, base + "right_color"));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, base + "right_icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, base + "right_icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		p_list->push_back(PropertyInfo(Variant::BOOL, base + "draw_stylebox"));
 		idx++;
 	}
@@ -544,82 +540,79 @@ void GraphNode::gui_input(const Ref<InputEvent> &p_event) {
 	GraphElement::gui_input(p_event);
 }
 
-String GraphNode::_get_accessibility_name() const {
-	String name = Control::_get_accessibility_name();
-	if (name.is_empty()) {
-		name = get_name();
-	}
-	name = vformat(ETR("graph node %s (%s)"), name, get_title());
-
-	if (slot_table.has(selected_slot)) {
-		GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
-		Dictionary type_info;
-		if (graph) {
-			type_info = graph->get_type_names();
-		}
-		const Slot &slot = slot_table[selected_slot];
-		name += ", " + vformat(ETR("slot %d of %d"), selected_slot + 1, slot_count);
-		if (slot.enable_left) {
-			if (type_info.has(slot.type_left)) {
-				name += "," + vformat(ETR("input port, type: %s"), type_info[slot.type_left]);
-			} else {
-				name += "," + vformat(ETR("input port, type: %d"), slot.type_left);
-			}
-			if (graph) {
-				for (int i = 0; i < left_port_cache.size(); i++) {
-					if (left_port_cache[i].slot_index == selected_slot) {
-						String cd = graph->get_connections_description(get_name(), i);
-						if (cd.is_empty()) {
-							name += " " + ETR("no connections");
-						} else {
-							name += " " + cd;
-						}
-						break;
-					}
-				}
-			}
-		}
-		if (slot.enable_right) {
-			if (type_info.has(slot.type_right)) {
-				name += "," + vformat(ETR("output port, type: %s"), type_info[slot.type_right]);
-			} else {
-				name += "," + vformat(ETR("output port, type: %d"), slot.type_right);
-			}
-			if (graph) {
-				for (int i = 0; i < right_port_cache.size(); i++) {
-					if (right_port_cache[i].slot_index == selected_slot) {
-						String cd = graph->get_connections_description(get_name(), i);
-						if (cd.is_empty()) {
-							name += " " + ETR("no connections");
-						} else {
-							name += " " + cd;
-						}
-						break;
-					}
-				}
-			}
-		}
-		if (graph && graph->is_keyboard_connecting()) {
-			name += ", " + ETR("currently selecting target port");
-		}
-	} else {
-		name += ", " + vformat(ETR("has %d slots"), slot_count);
-	}
-	return name;
-}
-
 void GraphNode::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_LIST);
-			AccessibilityServer::get_singleton()->update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_INPUT, ETR("Edit Input Port Connection"));
-			AccessibilityServer::get_singleton()->update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_OUTPUT, ETR("Edit Output Port Connection"));
-			AccessibilityServer::get_singleton()->update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_INPUT, ETR("Follow Input Port Connection"));
-			AccessibilityServer::get_singleton()->update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_OUTPUT, ETR("Follow Output Port Connection"));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_CUSTOM, callable_mp(this, &GraphNode::_accessibility_action_slot));
+			String name = get_accessibility_name();
+			if (name.is_empty()) {
+				name = get_name();
+			}
+			name = vformat(ETR("graph node %s (%s)"), name, get_title());
+
+			if (slot_table.has(selected_slot)) {
+				GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+				Dictionary type_info;
+				if (graph) {
+					type_info = graph->get_type_names();
+				}
+				const Slot &slot = slot_table[selected_slot];
+				name += ", " + vformat(ETR("slot %d of %d"), selected_slot + 1, slot_count);
+				if (slot.enable_left) {
+					if (type_info.has(slot.type_left)) {
+						name += "," + vformat(ETR("input port, type: %s"), type_info[slot.type_left]);
+					} else {
+						name += "," + vformat(ETR("input port, type: %d"), slot.type_left);
+					}
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								String cd = graph->get_connections_description(get_name(), i);
+								if (cd.is_empty()) {
+									name += " " + ETR("no connections");
+								} else {
+									name += " " + cd;
+								}
+								break;
+							}
+						}
+					}
+				}
+				if (slot.enable_right) {
+					if (type_info.has(slot.type_right)) {
+						name += "," + vformat(ETR("output port, type: %s"), type_info[slot.type_right]);
+					} else {
+						name += "," + vformat(ETR("output port, type: %d"), slot.type_right);
+					}
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								String cd = graph->get_connections_description(get_name(), i);
+								if (cd.is_empty()) {
+									name += " " + ETR("no connections");
+								} else {
+									name += " " + cd;
+								}
+								break;
+							}
+						}
+					}
+				}
+				if (graph && graph->is_keyboard_connecting()) {
+					name += ", " + ETR("currently selecting target port");
+				}
+			} else {
+				name += ", " + vformat(ETR("has %d slots"), slot_count);
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, name);
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_INPUT, ETR("Edit Input Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_OUTPUT, ETR("Edit Output Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_INPUT, ETR("Follow Input Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_OUTPUT, ETR("Follow Output Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CUSTOM, callable_mp(this, &GraphNode::_accessibility_action_slot));
 		} break;
 		case NOTIFICATION_FOCUS_EXIT: {
 			selected_slot = -1;
diff --git a/engine/scene/gui/graph_node.h b/engine/scene/gui/graph_node.h
index 43fec134..bdbc1192 100644
--- a/engine/scene/gui/graph_node.h
+++ b/engine/scene/gui/graph_node.h
@@ -127,8 +127,6 @@ protected:
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
-	virtual String _get_accessibility_name() const override;
-
 public:
 	virtual String get_accessibility_container_name(const Node *p_node) const override;
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
diff --git a/engine/scene/gui/grid_container.cpp b/engine/scene/gui/grid_container.cpp
index 7b434f7d..7c781bed 100644
--- a/engine/scene/gui/grid_container.cpp
+++ b/engine/scene/gui/grid_container.cpp
@@ -30,8 +30,6 @@
 
 #include "grid_container.h"
 
-#include "core/object/class_db.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/engine/scene/gui/item_list.cpp b/engine/scene/gui/item_list.cpp
index f1ec3b3d..6d66d3f6 100644
--- a/engine/scene/gui/item_list.cpp
+++ b/engine/scene/gui/item_list.cpp
@@ -31,12 +31,8 @@
 #include "item_list.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 
 void ItemList::_shape_text(int p_idx) {
 	Item &item = items.write[p_idx];
@@ -537,7 +533,7 @@ void ItemList::set_item_count(int p_count) {
 	if (items.size() > p_count) {
 		for (int i = p_count; i < items.size(); i++) {
 			if (items[i].accessibility_item_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(items.write[i].accessibility_item_element);
+				DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
 				items.write[i].accessibility_item_element = RID();
 			}
 		}
@@ -558,7 +554,7 @@ void ItemList::remove_item(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 
 	if (items[p_idx].accessibility_item_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(items.write[p_idx].accessibility_item_element);
+		DisplayServer::get_singleton()->accessibility_free_element(items.write[p_idx].accessibility_item_element);
 		items.write[p_idx].accessibility_item_element = RID();
 	}
 	items.remove_at(p_idx);
@@ -575,7 +571,7 @@ void ItemList::remove_item(int p_idx) {
 void ItemList::clear() {
 	for (int i = 0; i < items.size(); i++) {
 		if (items[i].accessibility_item_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(items.write[i].accessibility_item_element);
+			DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
 			items.write[i].accessibility_item_element = RID();
 		}
 	}
@@ -1186,36 +1182,6 @@ void ItemList::ensure_current_is_visible() {
 	queue_redraw();
 }
 
-void ItemList::center_on_current(bool p_center_verically, bool p_center_horizontally) {
-	if (current < 0 || current >= items.size()) {
-		return;
-	}
-
-	ERR_FAIL_COND_MSG(!p_center_verically && !p_center_horizontally, "At least one of the parameters must be true.");
-
-	Rect2 r = items[current].rect_cache;
-
-	if (p_center_verically) {
-		int from_v = scroll_bar_v->get_value();
-		int to_v = from_v + scroll_bar_v->get_page();
-		int item_center_y = r.position.y + r.size.y / 2;
-		int viewport_center_y = (from_v + to_v) / 2;
-
-		int offset_y = item_center_y - viewport_center_y;
-		scroll_bar_v->set_value(scroll_bar_v->get_value() + offset_y);
-	}
-
-	if (p_center_horizontally) {
-		int from_h = scroll_bar_h->get_value();
-		int to_h = from_h + scroll_bar_h->get_page();
-		int item_center_x = r.position.x + r.size.x / 2;
-		int viewport_center_x = (from_h + to_h) / 2;
-
-		int offset_x = item_center_x - viewport_center_x;
-		scroll_bar_h->set_value(scroll_bar_h->get_value() + offset_x);
-	}
-}
-
 static Rect2 _adjust_to_max_size(Size2 p_size, Size2 p_max_size) {
 	Size2 size = p_max_size;
 	int tex_width = p_size.width * size.height / p_size.height;
@@ -1248,7 +1214,7 @@ void ItemList::_accessibility_action_scroll_set(const Variant &p_data) {
 }
 
 void ItemList::_accessibility_action_scroll_up(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page() / 4);
 	} else {
 		scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page());
@@ -1256,7 +1222,7 @@ void ItemList::_accessibility_action_scroll_up(const Variant &p_data) {
 }
 
 void ItemList::_accessibility_action_scroll_down(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page() / 4);
 	} else {
 		scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page());
@@ -1264,7 +1230,7 @@ void ItemList::_accessibility_action_scroll_down(const Variant &p_data) {
 }
 
 void ItemList::_accessibility_action_scroll_left(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page() / 4);
 	} else {
 		scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page());
@@ -1272,7 +1238,7 @@ void ItemList::_accessibility_action_scroll_left(const Variant &p_data) {
 }
 
 void ItemList::_accessibility_action_scroll_right(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page() / 4);
 	} else {
 		scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page());
@@ -1324,47 +1290,47 @@ void ItemList::_notification(int p_what) {
 
 			force_update_list_size();
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX);
-			AccessibilityServer::get_singleton()->update_set_list_item_count(ae, items.size());
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_MULTISELECTABLE, select_mode == SELECT_MULTI);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ItemList::_accessibility_action_scroll_down));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ItemList::_accessibility_action_scroll_up));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ItemList::_accessibility_action_scroll_left));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ItemList::_accessibility_action_scroll_right));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ItemList::_accessibility_action_scroll_set));
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, items.size());
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE, select_mode == SELECT_MULTI);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ItemList::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ItemList::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ItemList::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ItemList::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ItemList::_accessibility_action_scroll_set));
 
 			if (accessibility_scroll_element.is_null()) {
-				accessibility_scroll_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 			}
 
 			Transform2D scroll_xform;
 			scroll_xform.set_origin(Vector2i(-scroll_bar_h->get_value(), -scroll_bar_v->get_value()));
-			AccessibilityServer::get_singleton()->update_set_transform(accessibility_scroll_element, scroll_xform);
-			AccessibilityServer::get_singleton()->update_set_bounds(accessibility_scroll_element, Rect2(0, 0, scroll_bar_h->get_max(), scroll_bar_v->get_max()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, scroll_bar_h->get_max(), scroll_bar_v->get_max()));
 
 			for (int i = 0; i < items.size(); i++) {
 				const Item &item = items.write[i];
 
 				if (item.accessibility_item_element.is_null()) {
-					item.accessibility_item_element = AccessibilityServer::get_singleton()->create_sub_element(accessibility_scroll_element, AccessibilityServerEnums::AccessibilityRole::ROLE_LIST_BOX_OPTION);
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION);
 					item.accessibility_item_dirty = true;
 				}
 				if (item.accessibility_item_dirty || i == hovered || i == prev_hovered) {
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ItemList::_accessibility_action_scroll_into_view).bind(i));
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ItemList::_accessibility_action_focus).bind(i));
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ItemList::_accessibility_action_blur).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ItemList::_accessibility_action_scroll_into_view).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ItemList::_accessibility_action_focus).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ItemList::_accessibility_action_blur).bind(i));
 
-					AccessibilityServer::get_singleton()->update_set_list_item_index(item.accessibility_item_element, i);
-					AccessibilityServer::get_singleton()->update_set_list_item_level(item.accessibility_item_element, 0);
-					AccessibilityServer::get_singleton()->update_set_list_item_selected(item.accessibility_item_element, item.selected);
-					AccessibilityServer::get_singleton()->update_set_name(item.accessibility_item_element, item.xl_text);
-					AccessibilityServer::get_singleton()->update_set_flag(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_level(item.accessibility_item_element, 0);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, item.selected);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, item.xl_text);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
 					if (item.tooltip_enabled) {
-						AccessibilityServer::get_singleton()->update_set_tooltip(item.accessibility_item_element, item.tooltip);
+						DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
 					}
 
 					Rect2 r = get_item_rect(i);
-					AccessibilityServer::get_singleton()->update_set_bounds(item.accessibility_item_element, Rect2(r.position, r.size));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(r.position, r.size));
 
 					item.accessibility_item_dirty = false;
 				}
@@ -2077,14 +2043,6 @@ String ItemList::get_tooltip(const Point2 &p_pos) const {
 	return Control::get_tooltip(p_pos);
 }
 
-Node::AutoTranslateMode ItemList::get_tooltip_auto_translate_mode_at(const Point2 &p_at) const {
-	int closest = get_item_at_position(p_at, true);
-	if (closest != -1) {
-		return items[closest].auto_translate_mode;
-	}
-	return Control::get_tooltip_auto_translate_mode_at(p_at);
-}
-
 void ItemList::sort_items_by_text() {
 	items.sort();
 	queue_accessibility_update();
@@ -2412,7 +2370,6 @@ void ItemList::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_item_at_position", "position", "exact"), &ItemList::get_item_at_position, DEFVAL(false));
 
 	ClassDB::bind_method(D_METHOD("ensure_current_is_visible"), &ItemList::ensure_current_is_visible);
-	ClassDB::bind_method(D_METHOD("center_on_current", "center_verically", "center_horizontally"), &ItemList::center_on_current, DEFVAL(true), DEFVAL(true));
 
 	ClassDB::bind_method(D_METHOD("get_v_scroll_bar"), &ItemList::get_v_scroll_bar);
 	ClassDB::bind_method(D_METHOD("get_h_scroll_bar"), &ItemList::get_h_scroll_bar);
@@ -2503,10 +2460,10 @@ void ItemList::_bind_methods() {
 	base_property_helper.set_prefix("item_");
 	base_property_helper.set_array_length_getter(&ItemList::get_item_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "text"), defaults.text, &ItemList::set_item_text, &ItemList::get_item_text);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon, &ItemList::set_item_icon, &ItemList::get_item_icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon, &ItemList::set_item_icon, &ItemList::get_item_icon);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "selectable"), defaults.selectable, &ItemList::set_item_selectable, &ItemList::is_item_selectable);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled, &ItemList::set_item_disabled, &ItemList::is_item_disabled);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 ItemList::ItemList() {
diff --git a/engine/scene/gui/item_list.h b/engine/scene/gui/item_list.h
index 7890148d..6259bb1e 100644
--- a/engine/scene/gui/item_list.h
+++ b/engine/scene/gui/item_list.h
@@ -319,13 +319,11 @@ public:
 	bool get_allow_search() const;
 
 	void ensure_current_is_visible();
-	void center_on_current(bool p_center_verically = true, bool p_center_horizontally = true);
 
 	void sort_items_by_text();
 	int find_metadata(const Variant &p_metadata) const;
 
 	virtual String get_tooltip(const Point2 &p_pos) const override;
-	virtual AutoTranslateMode get_tooltip_auto_translate_mode_at(const Point2 &p_at) const override;
 	int get_item_at_position(const Point2 &p_pos, bool p_exact = false) const;
 	bool is_pos_at_end_of_items(const Point2 &p_pos) const;
 
diff --git a/engine/scene/gui/label.cpp b/engine/scene/gui/label.cpp
index 9366834a..0afa6802 100644
--- a/engine/scene/gui/label.cpp
+++ b/engine/scene/gui/label.cpp
@@ -30,13 +30,8 @@
 
 #include "label.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/text/text_server.h"
 
 void Label::set_autowrap_mode(TextServer::AutowrapMode p_mode) {
@@ -710,9 +705,9 @@ void Label::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_STATIC_TEXT);
-			AccessibilityServer::get_singleton()->update_set_value(ae, xl_text);
-			AccessibilityServer::get_singleton()->update_set_text_align(ae, horizontal_alignment);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, xl_text);
+			DisplayServer::get_singleton()->accessibility_update_set_text_align(ae, horizontal_alignment);
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -1434,7 +1429,7 @@ void Label::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_character_bounds", "pos"), &Label::get_character_bounds);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "label_settings", PROPERTY_HINT_RESOURCE_TYPE, LabelSettings::get_class_static()), "set_label_settings", "get_label_settings");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "label_settings", PROPERTY_HINT_RESOURCE_TYPE, "LabelSettings"), "set_label_settings", "get_label_settings");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vertical_alignment", PROPERTY_HINT_ENUM, "Top,Center,Bottom,Fill"), "set_vertical_alignment", "get_vertical_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Off,Arbitrary,Word,Word (Smart)"), "set_autowrap_mode", "get_autowrap_mode");
diff --git a/engine/scene/gui/line_edit.compat.inc b/engine/scene/gui/line_edit.compat.inc
index e9cbe962..9b2148e2 100644
--- a/engine/scene/gui/line_edit.compat.inc
+++ b/engine/scene/gui/line_edit.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "line_edit.h"
-
-#include "core/object/class_db.h"
-
 void LineEdit::_edit_bind_compat_111117() {
 	edit(false);
 }
diff --git a/engine/scene/gui/line_edit.cpp b/engine/scene/gui/line_edit.cpp
index 45a35f15..ec2e2ff0 100644
--- a/engine/scene/gui/line_edit.cpp
+++ b/engine/scene/gui/line_edit.cpp
@@ -31,22 +31,16 @@
 #include "line_edit.h"
 #include "line_edit.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/string/alt_codes.h"
+#include "core/string/translation_server.h"
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/text/text_server.h"
 
 #ifdef TOOLS_ENABLED
@@ -100,7 +94,7 @@ void LineEdit::unedit() {
 	apply_ime();
 	set_caret_column(caret_column); // Update scroll_offset.
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
 		DisplayServer::get_singleton()->virtual_keyboard_hide();
 	}
 
@@ -122,8 +116,8 @@ bool LineEdit::is_editing_kept_on_text_submit() const {
 }
 
 void LineEdit::_close_ime_window() {
-	DisplayServerEnums::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServerEnums::INVALID_WINDOW_ID;
-	if (wid == DisplayServerEnums::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_IME)) {
+	DisplayServer::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+	if (wid == DisplayServer::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_ime_position(Point2(), wid);
@@ -131,8 +125,8 @@ void LineEdit::_close_ime_window() {
 }
 
 void LineEdit::_update_ime_window_position() {
-	DisplayServerEnums::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServerEnums::INVALID_WINDOW_ID;
-	if (wid == DisplayServerEnums::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_IME)) {
+	DisplayServer::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+	if (wid == DisplayServer::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_ime_active(true, wid);
@@ -465,7 +459,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 			return;
 		}
 
-		if (editable && is_middle_mouse_paste_enabled() && b->is_pressed() && b->get_button_index() == MouseButton::MIDDLE && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+		if (editable && is_middle_mouse_paste_enabled() && b->is_pressed() && b->get_button_index() == MouseButton::MIDDLE && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 			apply_ime();
 
 			String paste_buffer = DisplayServer::get_singleton()->clipboard_get_primary().strip_escapes();
@@ -535,7 +529,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 						selection.double_click = true;
 						last_dblclk = 0;
 						set_caret_column(selection.begin);
-						if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+						if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 							DisplayServer::get_singleton()->clipboard_set_primary(text);
 						}
 						queue_accessibility_update();
@@ -557,7 +551,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 								break;
 							}
 						}
-						if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+						if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 							DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 						}
 					}
@@ -583,7 +577,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 			}
 
 		} else {
-			if (selection.enabled && !pass && b->get_button_index() == MouseButton::LEFT && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+			if (selection.enabled && !pass && b->get_button_index() == MouseButton::LEFT && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 				DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 			}
 			if (editable && !text.is_empty() && clear_button_enabled) {
@@ -665,7 +659,13 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
-	if (editable && !editing && p_event->is_action_pressed("ui_text_submit", false)) {
+	Ref<InputEventKey> k = p_event;
+
+	if (k.is_null()) {
+		return;
+	}
+
+	if (editable && !editing && k->is_action_pressed("ui_text_submit", false)) {
 		edit();
 		emit_signal(SNAME("editing_toggled"), true);
 		accept_event();
@@ -674,7 +674,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 	// Open context menu.
 	if (context_menu_enabled) {
-		if (p_event->is_action("ui_menu", true)) {
+		if (k->is_action("ui_menu", true)) {
 			_update_context_menu();
 			Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
 			menu->set_position(get_screen_transform().xform(pos));
@@ -688,19 +688,19 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 	}
 
 	if (is_shortcut_keys_enabled()) {
-		if (p_event->is_action("ui_copy", true)) {
+		if (k->is_action("ui_copy", true)) {
 			copy_text();
 			accept_event();
 			return;
 		}
 
-		if (p_event->is_action("ui_text_select_all", true)) {
+		if (k->is_action("ui_text_select_all", true)) {
 			select();
 			accept_event();
 			return;
 		}
 
-		if (p_event->is_action("ui_cut", true)) {
+		if (k->is_action("ui_cut", true)) {
 			if (editable) {
 				cut_text();
 			} else {
@@ -715,12 +715,6 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
-	Ref<InputEventKey> k = p_event;
-
-	if (k.is_null()) {
-		return;
-	}
-
 	// Start Unicode Alt input (hold).
 	if (k->is_alt_pressed() && k->get_keycode() == Key::KP_ADD && !alt_start && !alt_start_no_hold) {
 		if (selection.enabled) {
@@ -928,7 +922,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		if (editing && !keep_editing_on_text_submit) {
 			unedit();
 			emit_signal(SNAME("editing_toggled"), false);
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
 				DisplayServer::get_singleton()->virtual_keyboard_hide();
 			}
 		}
@@ -1214,15 +1208,6 @@ void LineEdit::_accessibility_action_menu(const Variant &p_data) {
 	menu->grab_focus();
 }
 
-String LineEdit::_get_accessibility_name() const {
-	const String &ac_name = Control::_get_accessibility_name();
-	if (!placeholder.is_empty() && ac_name.is_empty()) {
-		return atr(placeholder);
-	} else {
-		return ac_name;
-	}
-}
-
 void LineEdit::_notification(int p_what) {
 	switch (p_what) {
 #ifdef TOOLS_ENABLED
@@ -1246,19 +1231,22 @@ void LineEdit::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TEXT_FIELD);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TEXT_FIELD);
 			bool using_placeholder = text.is_empty() && ime_text.is_empty();
 			if (using_placeholder && !placeholder.is_empty()) {
-				AccessibilityServer::get_singleton()->update_set_placeholder(ae, atr(placeholder));
+				DisplayServer::get_singleton()->accessibility_update_set_placeholder(ae, atr(placeholder));
 			}
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_READONLY, !editable);
+			if (!placeholder.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, atr(placeholder));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, !editable);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &LineEdit::_accessibility_action_set_selection));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &LineEdit::_accessibility_action_replace_selected));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &LineEdit::_accessibility_action_set_value));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &LineEdit::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &LineEdit::_accessibility_action_set_selection));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &LineEdit::_accessibility_action_replace_selected));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &LineEdit::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &LineEdit::_accessibility_action_menu));
 			const String &lang = language.is_empty() ? _get_locale() : language;
-			AccessibilityServer::get_singleton()->update_set_language(ae, lang);
+			DisplayServer::get_singleton()->accessibility_update_set_language(ae, lang);
 
 			bool rtl = is_layout_rtl();
 			Ref<StyleBox> style = theme_cache.normal;
@@ -1323,16 +1311,16 @@ void LineEdit::_notification(int p_what) {
 			float text_off_x = x_ofs + scroll_offset;
 
 			if (accessibility_text_root_element.is_null()) {
-				accessibility_text_root_element = AccessibilityServer::get_singleton()->create_sub_text_edit_elements(ae, using_placeholder ? RID() : text_rid, text_height, -1, true);
+				accessibility_text_root_element = DisplayServer::get_singleton()->accessibility_create_sub_text_edit_elements(ae, using_placeholder ? RID() : text_rid, text_height, -1, true);
 			}
 
 			Transform2D text_xform;
 			text_xform.set_origin(Vector2i(text_off_x, y_ofs));
-			AccessibilityServer::get_singleton()->update_set_transform(accessibility_text_root_element, text_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_text_root_element, text_xform);
 			if (selection.enabled) {
-				AccessibilityServer::get_singleton()->update_set_text_selection(ae, accessibility_text_root_element, selection.begin, accessibility_text_root_element, selection.end);
+				DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, accessibility_text_root_element, selection.begin, accessibility_text_root_element, selection.end);
 			} else {
-				AccessibilityServer::get_singleton()->update_set_text_selection(ae, accessibility_text_root_element, caret_column, accessibility_text_root_element, caret_column);
+				DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, accessibility_text_root_element, caret_column, accessibility_text_root_element, caret_column);
 			}
 		} break;
 
@@ -2253,11 +2241,11 @@ void LineEdit::clear() {
 void LineEdit::show_virtual_keyboard() {
 	_update_ime_window_position();
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
 		if (selection.enabled) {
-			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServerEnums::VirtualKeyboardType(virtual_keyboard_type), max_length, selection.begin, selection.end);
+			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServer::VirtualKeyboardType(virtual_keyboard_type), max_length, selection.begin, selection.end);
 		} else {
-			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServerEnums::VirtualKeyboardType(virtual_keyboard_type), max_length, caret_column);
+			DisplayServer::get_singleton()->virtual_keyboard_show(text, get_global_rect(), DisplayServer::VirtualKeyboardType(virtual_keyboard_type), max_length, caret_column);
 		}
 	}
 }
@@ -2275,7 +2263,6 @@ void LineEdit::set_placeholder(String p_text) {
 	placeholder_translated = atr(placeholder);
 	_shape();
 	queue_redraw();
-	update_configuration_warnings();
 }
 
 String LineEdit::get_placeholder() const {
@@ -3134,7 +3121,7 @@ void LineEdit::_shape() {
 	}
 
 	if (accessibility_text_root_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(accessibility_text_root_element);
+		DisplayServer::get_singleton()->accessibility_free_element(accessibility_text_root_element);
 		accessibility_text_root_element = RID();
 	}
 
@@ -3240,7 +3227,7 @@ void LineEdit::_generate_context_menu() {
 	menu_ctl->add_item(ETR("Word Joiner (WJ)"), MENU_INSERT_WJ);
 	menu_ctl->add_item(ETR("Soft Hyphen (SHY)"), MENU_INSERT_SHY);
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
 		menu->add_item(ETR("Emoji & Symbols"), MENU_EMOJI_AND_SYMBOL);
 		menu->add_separator();
 	}
@@ -3275,32 +3262,32 @@ void LineEdit::_update_context_menu() {
 
 	int idx = -1;
 
-#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
+#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled)                                                  \
+	idx = m_menu->get_item_index(m_id);                                                                                \
+	if (idx >= 0) {                                                                                                    \
 		m_menu->set_item_accelerator(idx, shortcut_keys_enabled ? _get_menu_action_accelerator(m_action) : Key::NONE); \
-		m_menu->set_item_disabled(idx, m_disabled); \
+		m_menu->set_item_disabled(idx, m_disabled);                                                                    \
 	}
 
-#define MENU_ITEM_ACTION(m_menu, m_id, m_action) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
+#define MENU_ITEM_ACTION(m_menu, m_id, m_action)                                                                       \
+	idx = m_menu->get_item_index(m_id);                                                                                \
+	if (idx >= 0) {                                                                                                    \
 		m_menu->set_item_accelerator(idx, shortcut_keys_enabled ? _get_menu_action_accelerator(m_action) : Key::NONE); \
 	}
 
 #define MENU_ITEM_DISABLED(m_menu, m_id, m_disabled) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
-		m_menu->set_item_disabled(idx, m_disabled); \
+	idx = m_menu->get_item_index(m_id);              \
+	if (idx >= 0) {                                  \
+		m_menu->set_item_disabled(idx, m_disabled);  \
 	}
 
 #define MENU_ITEM_CHECKED(m_menu, m_id, m_checked) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
-		m_menu->set_item_checked(idx, m_checked); \
+	idx = m_menu->get_item_index(m_id);            \
+	if (idx >= 0) {                                \
+		m_menu->set_item_checked(idx, m_checked);  \
 	}
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
 		MENU_ITEM_DISABLED(menu, MENU_EMOJI_AND_SYMBOL, !editable || !emoji_menu_enabled)
 	}
 	MENU_ITEM_ACTION_DISABLED(menu, MENU_CUT, "ui_cut", !editable)
@@ -3480,14 +3467,14 @@ void LineEdit::_bind_methods() {
 	BIND_ENUM_CONSTANT(MENU_EMOJI_AND_SYMBOL);
 	BIND_ENUM_CONSTANT(MENU_MAX);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_DEFAULT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_MULTILINE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_NUMBER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_NUMBER_DECIMAL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_PHONE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_EMAIL_ADDRESS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_PASSWORD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_URL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_DEFAULT);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_MULTILINE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER_DECIMAL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PHONE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_EMAIL_ADDRESS);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PASSWORD);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_URL);
 
 	BIND_ENUM_CONSTANT(EXPAND_MODE_ORIGINAL_SIZE);
 	BIND_ENUM_CONSTANT(EXPAND_MODE_FIT_TO_TEXT);
@@ -3536,7 +3523,7 @@ void LineEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "structured_text_bidi_override_options"), "set_structured_text_bidi_override_options", "get_structured_text_bidi_override_options");
 
 	ADD_GROUP("Icon", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "right_icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_right_icon", "get_right_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "right_icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_right_icon", "get_right_icon");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "icon_expand_mode", PROPERTY_HINT_ENUM, "Original,Fit to Text,Fit to LineEdit"), "set_icon_expand_mode", "get_icon_expand_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "right_icon_scale", PROPERTY_HINT_RANGE, "0.1,1.0,0.01"), "set_right_icon_scale", "get_right_icon_scale");
 
diff --git a/engine/scene/gui/line_edit.h b/engine/scene/gui/line_edit.h
index f1e8477e..bd3d81b3 100644
--- a/engine/scene/gui/line_edit.h
+++ b/engine/scene/gui/line_edit.h
@@ -72,7 +72,6 @@ public:
 		MENU_MAX
 	};
 
-	// Keep synced with DisplayServerEnums::VirtualKeyboardType enum.
 	enum VirtualKeyboardType {
 		KEYBOARD_TYPE_DEFAULT,
 		KEYBOARD_TYPE_MULTILINE,
@@ -297,8 +296,6 @@ protected:
 	void _accessibility_action_set_value(const Variant &p_data);
 	void _accessibility_action_menu(const Variant &p_data);
 
-	virtual String _get_accessibility_name() const override;
-
 public:
 	void edit(bool p_hide_focus = false);
 	void unedit();
diff --git a/engine/scene/gui/link_button.cpp b/engine/scene/gui/link_button.cpp
index ebc8882b..a51dd124 100644
--- a/engine/scene/gui/link_button.cpp
+++ b/engine/scene/gui/link_button.cpp
@@ -30,10 +30,7 @@
 
 #include "link_button.h"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 void LinkButton::_shape() {
 	Ref<Font> font = theme_cache.font;
@@ -62,7 +59,6 @@ void LinkButton::set_text(const String &p_text) {
 	text = p_text;
 	xl_text = atr(text);
 	_shape();
-	update_configuration_warnings();
 	update_minimum_size();
 	queue_redraw();
 }
@@ -207,34 +203,27 @@ Control::CursorShape LinkButton::get_cursor_shape(const Point2 &p_pos) const {
 	return is_disabled() ? CURSOR_ARROW : get_default_cursor_shape();
 }
 
-String LinkButton::_get_accessibility_name() const {
-	const String &ac_name = Control::_get_accessibility_name();
-	if (!xl_text.is_empty() && ac_name.is_empty()) {
-		return xl_text;
-	} else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) {
-		return ac_name + ": " + xl_text;
-	} else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) {
-		return get_tooltip_text(); // Fall back to tooltip.
-	} else {
-		return ac_name;
-	}
-}
-
 void LinkButton::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_LINK);
-
-			AccessibilityServer::get_singleton()->update_set_url(ae, uri);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LINK);
+			const String &ac_name = get_accessibility_name();
+			if (!xl_text.is_empty() && ac_name.is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text);
+			} else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, ac_name + ": " + xl_text);
+			} else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_tooltip_text()); // Fall back to tooltip.
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_url(ae, uri);
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED: {
 			xl_text = atr(text);
 			_shape();
-			update_configuration_warnings();
 			update_minimum_size();
 			queue_redraw();
 		} break;
diff --git a/engine/scene/gui/link_button.h b/engine/scene/gui/link_button.h
index 7c0a16a8..3591a6af 100644
--- a/engine/scene/gui/link_button.h
+++ b/engine/scene/gui/link_button.h
@@ -84,8 +84,6 @@ protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
-	virtual String _get_accessibility_name() const override;
-
 public:
 	void set_text(const String &p_text);
 	String get_text() const;
diff --git a/engine/scene/gui/menu_bar.cpp b/engine/scene/gui/menu_bar.cpp
index d882d30d..325ac40c 100644
--- a/engine/scene/gui/menu_bar.cpp
+++ b/engine/scene/gui/menu_bar.cpp
@@ -30,11 +30,8 @@
 
 #include "menu_bar.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 	ERR_FAIL_COND(p_event.is_null());
@@ -295,7 +292,7 @@ void MenuBar::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_BAR);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MENU_BAR);
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 			if (get_menu_count() > 0) {
@@ -708,7 +705,6 @@ void MenuBar::remove_child_notify(Node *p_child) {
 	menu_cache.remove_at(idx);
 
 	p_child->remove_meta("_menu_name");
-	p_child->update_configuration_warnings();
 	p_child->remove_meta("_menu_tooltip");
 
 	p_child->disconnect("renamed", callable_mp(this, &MenuBar::_refresh_menu_names));
@@ -901,7 +897,6 @@ void MenuBar::set_menu_title(int p_menu, const String &p_title) {
 	} else {
 		pm->set_meta("_menu_name", p_title);
 	}
-	pm->update_configuration_warnings();
 	menu_cache.write[p_menu].name = p_title;
 	shape(menu_cache.write[p_menu]);
 	if (!global_menu_tag.is_empty() && menu_cache[p_menu].submenu_rid.is_valid()) {
diff --git a/engine/scene/gui/menu_button.cpp b/engine/scene/gui/menu_button.cpp
index bd657b6f..0b292dfe 100644
--- a/engine/scene/gui/menu_button.cpp
+++ b/engine/scene/gui/menu_button.cpp
@@ -30,12 +30,7 @@
 
 #include "menu_button.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/window.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 void MenuButton::shortcut_input(const Ref<InputEvent> &p_event) {
 	ERR_FAIL_COND(p_event.is_null());
@@ -146,8 +141,8 @@ void MenuButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED:
@@ -218,13 +213,13 @@ void MenuButton::_bind_methods() {
 	base_property_helper.set_prefix("popup/item_");
 	base_property_helper.set_array_length_getter(&MenuButton::get_item_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "text"), defaults.text);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "checkable", PROPERTY_HINT_ENUM, "No,As Checkbox,As Radio Button"), defaults.checkable_type);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "checked"), defaults.checked);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "id", PROPERTY_HINT_RANGE, "0,10,1,or_greater", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL), defaults.id);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "separator"), defaults.separator);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 void MenuButton::set_disable_shortcuts(bool p_disabled) {
diff --git a/engine/scene/gui/nine_patch_rect.cpp b/engine/scene/gui/nine_patch_rect.cpp
index 26a5a116..64e8c740 100644
--- a/engine/scene/gui/nine_patch_rect.cpp
+++ b/engine/scene/gui/nine_patch_rect.cpp
@@ -30,8 +30,6 @@
 
 #include "nine_patch_rect.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void NinePatchRect::_notification(int p_what) {
@@ -47,7 +45,7 @@ void NinePatchRect::_notification(int p_what) {
 			texture->get_rect_region(rect, src_rect, rect, src_rect);
 
 			RID ci = get_canvas_item();
-			RS::get_singleton()->canvas_item_add_nine_patch(ci, rect, src_rect, texture->get_scaled_rid(), Vector2(margin[SIDE_LEFT], margin[SIDE_TOP]), Vector2(margin[SIDE_RIGHT], margin[SIDE_BOTTOM]), RSE::NinePatchAxisMode(axis_h), RSE::NinePatchAxisMode(axis_v), draw_center);
+			RS::get_singleton()->canvas_item_add_nine_patch(ci, rect, src_rect, texture->get_scaled_rid(), Vector2(margin[SIDE_LEFT], margin[SIDE_TOP]), Vector2(margin[SIDE_RIGHT], margin[SIDE_BOTTOM]), RS::NinePatchAxisMode(axis_h), RS::NinePatchAxisMode(axis_v), draw_center);
 		} break;
 	}
 }
@@ -72,7 +70,7 @@ void NinePatchRect::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("texture_changed"));
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "is_draw_center_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::RECT2, "region_rect", PROPERTY_HINT_NONE, "suffix:px"), "set_region_rect", "get_region_rect");
 
diff --git a/engine/scene/gui/option_button.cpp b/engine/scene/gui/option_button.cpp
index bc95bbf1..748fa97f 100644
--- a/engine/scene/gui/option_button.cpp
+++ b/engine/scene/gui/option_button.cpp
@@ -30,10 +30,7 @@
 
 #include "option_button.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 static const int NONE_SELECTED = -1;
 
@@ -80,8 +77,8 @@ void OptionButton::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
-			AccessibilityServer::get_singleton()->update_set_popup_type(ae, AccessibilityServerEnums::AccessibilityPopupType::POPUP_LIST);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_LIST);
 		} break;
 
 		case NOTIFICATION_POSTINITIALIZE: {
@@ -390,18 +387,6 @@ bool OptionButton::get_allow_reselect() const {
 	return allow_reselect;
 }
 
-bool OptionButton::is_search_bar_enabled() const {
-	return popup->is_search_bar_enabled();
-}
-
-void OptionButton::set_search_bar_enabled_on_item_count(int p_count) {
-	popup->set_search_bar_enabled_on_item_count(p_count);
-}
-
-int OptionButton::get_search_bar_enabled_on_item_count() const {
-	return popup->get_search_bar_enabled_on_item_count();
-}
-
 void OptionButton::add_separator(const String &p_text) {
 	popup->add_separator(p_text);
 }
@@ -582,7 +567,6 @@ void OptionButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_metadata", "idx", "metadata"), &OptionButton::set_item_metadata);
 	ClassDB::bind_method(D_METHOD("set_item_tooltip", "idx", "tooltip"), &OptionButton::set_item_tooltip);
 	ClassDB::bind_method(D_METHOD("set_item_auto_translate_mode", "idx", "mode"), &OptionButton::set_item_auto_translate_mode);
-	ClassDB::bind_method(D_METHOD("set_search_bar_enabled_on_item_count", "counts"), &OptionButton::set_search_bar_enabled_on_item_count);
 	ClassDB::bind_method(D_METHOD("get_item_text", "idx"), &OptionButton::get_item_text);
 	ClassDB::bind_method(D_METHOD("get_item_icon", "idx"), &OptionButton::get_item_icon);
 	ClassDB::bind_method(D_METHOD("get_item_id", "idx"), &OptionButton::get_item_id);
@@ -592,8 +576,6 @@ void OptionButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_item_auto_translate_mode", "idx"), &OptionButton::get_item_auto_translate_mode);
 	ClassDB::bind_method(D_METHOD("is_item_disabled", "idx"), &OptionButton::is_item_disabled);
 	ClassDB::bind_method(D_METHOD("is_item_separator", "idx"), &OptionButton::is_item_separator);
-	ClassDB::bind_method(D_METHOD("is_search_bar_enabled"), &OptionButton::is_search_bar_enabled);
-	ClassDB::bind_method(D_METHOD("get_search_bar_enabled_on_item_count"), &OptionButton::get_search_bar_enabled_on_item_count);
 	ClassDB::bind_method(D_METHOD("add_separator", "text"), &OptionButton::add_separator, DEFVAL(String()));
 	ClassDB::bind_method(D_METHOD("clear"), &OptionButton::clear);
 	ClassDB::bind_method(D_METHOD("select", "idx"), &OptionButton::select);
@@ -619,7 +601,6 @@ void OptionButton::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "selected"), "_select_int", "get_selected");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fit_to_longest_item"), "set_fit_to_longest_item", "is_fit_to_longest_item");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_reselect"), "set_allow_reselect", "get_allow_reselect");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "enable_search_bar_on_item_count", PROPERTY_HINT_RANGE, "0,20,1,or_greater"), "set_search_bar_enabled_on_item_count", "get_search_bar_enabled_on_item_count");
 	ADD_ARRAY_COUNT("Items", "item_count", "set_item_count", "get_item_count", "popup/item_");
 
 	ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "index")));
@@ -645,11 +626,11 @@ void OptionButton::_bind_methods() {
 	base_property_helper.set_prefix("popup/item_");
 	base_property_helper.set_array_length_getter(&OptionButton::get_item_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "text"), defaults.text, &OptionButton::_dummy_setter, &OptionButton::get_item_text);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon, &OptionButton::_dummy_setter, &OptionButton::get_item_icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon, &OptionButton::_dummy_setter, &OptionButton::get_item_icon);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "id", PROPERTY_HINT_RANGE, "0,10,1,or_greater", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL), defaults.id, &OptionButton::_dummy_setter, &OptionButton::get_item_id);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled, &OptionButton::_dummy_setter, &OptionButton::is_item_disabled);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "separator"), defaults.separator, &OptionButton::_dummy_setter, &OptionButton::is_item_separator);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 
 	ADD_CLASS_DEPENDENCY("PopupMenu");
 }
diff --git a/engine/scene/gui/option_button.h b/engine/scene/gui/option_button.h
index 9f2e785e..e35bb7fd 100644
--- a/engine/scene/gui/option_button.h
+++ b/engine/scene/gui/option_button.h
@@ -107,7 +107,6 @@ public:
 	void set_item_disabled(int p_idx, bool p_disabled);
 	void set_item_tooltip(int p_idx, const String &p_tooltip);
 	void set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode);
-	void set_search_bar_enabled_on_item_count(int p_count);
 
 	String get_item_text(int p_idx) const;
 	Ref<Texture2D> get_item_icon(int p_idx) const;
@@ -118,8 +117,6 @@ public:
 	bool is_item_separator(int p_idx) const;
 	String get_item_tooltip(int p_idx) const;
 	AutoTranslateMode get_item_auto_translate_mode(int p_idx) const;
-	bool is_search_bar_enabled() const;
-	int get_search_bar_enabled_on_item_count() const;
 
 	bool has_selectable_items() const;
 	int get_selectable_item(bool p_from_last = false) const;
diff --git a/engine/scene/gui/panel.cpp b/engine/scene/gui/panel.cpp
index 20f126f7..9f175ea3 100644
--- a/engine/scene/gui/panel.cpp
+++ b/engine/scene/gui/panel.cpp
@@ -29,9 +29,7 @@
 /**************************************************************************/
 
 #include "panel.h"
-
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 void Panel::_notification(int p_what) {
 	switch (p_what) {
@@ -39,7 +37,7 @@ void Panel::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_PANEL);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PANEL);
 		} break;
 
 		case NOTIFICATION_DRAW: {
diff --git a/engine/scene/gui/popup.cpp b/engine/scene/gui/popup.cpp
index e432d2b9..40e09481 100644
--- a/engine/scene/gui/popup.cpp
+++ b/engine/scene/gui/popup.cpp
@@ -30,17 +30,12 @@
 
 #include "popup.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
-#include "scene/gui/panel.h"
-#include "scene/resources/style_box_flat.h"
-#include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
-
 #ifdef TOOLS_ENABLED
 #include "core/config/project_settings.h"
 #endif
+#include "scene/gui/panel.h"
+#include "scene/resources/style_box_flat.h"
+#include "scene/theme/theme_db.h"
 
 void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
 	if (get_flag(FLAG_POPUP) && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
@@ -168,7 +163,7 @@ Rect2i Popup::_popup_adjust_rect() const {
 
 	Rect2i current(get_position(), get_size());
 
-	if (!is_embedded() && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS)) {
+	if (!is_embedded() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
 		// We're fine as is, the Display Server will take care of that for us.
 		return current;
 	}
@@ -435,8 +430,6 @@ void PopupPanel::_bind_methods() {
 
 PopupPanel::PopupPanel() {
 	set_flag(FLAG_TRANSPARENT, true);
-	set_default_canvas_item_texture_filter(Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE);
-	set_default_canvas_item_texture_repeat(Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE);
 
 	panel = memnew(Panel);
 	panel->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
diff --git a/engine/scene/gui/popup.h b/engine/scene/gui/popup.h
index df2a9792..1afc9a74 100644
--- a/engine/scene/gui/popup.h
+++ b/engine/scene/gui/popup.h
@@ -30,9 +30,10 @@
 
 #pragma once
 
-#include "core/templates/local_vector.h"
 #include "scene/main/window.h"
 
+#include "core/templates/local_vector.h"
+
 class Panel;
 
 class Popup : public Window {
diff --git a/engine/scene/gui/popup_menu.compat.inc b/engine/scene/gui/popup_menu.compat.inc
index fef74552..3d41c626 100644
--- a/engine/scene/gui/popup_menu.compat.inc
+++ b/engine/scene/gui/popup_menu.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "popup_menu.h"
-
-#include "core/object/class_db.h"
-
 void PopupMenu::_add_shortcut_bind_compat_36493(const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
 	add_shortcut(p_shortcut, p_id, p_global, false);
 }
@@ -82,4 +78,4 @@ void PopupMenu::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_system_menu_root"), &PopupMenu::_get_system_menu_root_compat_87452);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/popup_menu.cpp b/engine/scene/gui/popup_menu.cpp
index a20e8ead..f78d7f12 100644
--- a/engine/scene/gui/popup_menu.cpp
+++ b/engine/scene/gui/popup_menu.cpp
@@ -33,21 +33,14 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/fuzzy_search.h"
-#include "scene/gui/box_container.h"
 #include "scene/gui/graph_edit.h"
-#include "scene/gui/line_edit.h"
 #include "scene/gui/menu_bar.h"
 #include "scene/gui/panel_container.h"
 #include "scene/main/timer.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
 
 HashMap<NativeMenu::SystemMenus, PopupMenu *> PopupMenu::system_menus;
 
@@ -271,28 +264,20 @@ Size2 PopupMenu::_get_contents_minimum_size() const {
 		minsize.height += _get_item_height(i) + theme_cache.v_separation;
 	}
 
-	body_max_w = theme_cache.item_start_padding + body_max_w + accel_max_w + theme_cache.item_end_padding;
+	minsize.width += theme_cache.item_start_padding + body_max_w + accel_max_w + theme_cache.item_end_padding;
 
 	const int check_w = MAX(theme_cache.checked->get_width(), theme_cache.radio_checked->get_width());
 	if (gutter_compact) {
-		body_max_w += MAX(icon_max_w, check_w) + theme_cache.h_separation;
+		minsize.width += MAX(icon_max_w, check_w) + theme_cache.h_separation;
 	} else {
 		if (icon_max_w > 0) {
-			body_max_w += icon_max_w + theme_cache.h_separation;
+			minsize.width += icon_max_w + theme_cache.h_separation;
 		}
 		if (has_check_gutter) {
-			body_max_w += check_w + theme_cache.h_separation;
+			minsize.width += check_w + theme_cache.h_separation;
 		}
 	}
 
-	if (is_search_bar_enabled()) {
-		Size2 sb_min_size = search_bar->get_minimum_size();
-		minsize.width += MAX(body_max_w, sb_min_size.width);
-		minsize.height += sb_min_size.height + theme_cache.search_bar_separation;
-	} else {
-		minsize.width += body_max_w;
-	}
-
 	if (is_inside_tree()) {
 		int height_limit = get_usable_parent_rect().size.height;
 		if (minsize.height > height_limit) {
@@ -330,9 +315,6 @@ int PopupMenu::_get_items_total_height() const {
 	// Get total height of all items by taking max of icon height and font height
 	int items_total_height = 0;
 	for (int i = 0; i < items.size(); i++) {
-		if (!items[i].visible) {
-			continue;
-		}
 		items_total_height += _get_item_height(i) + theme_cache.v_separation;
 	}
 
@@ -357,9 +339,6 @@ int PopupMenu::_get_mouse_over(const Point2 &p_over) const {
 	const float over_control_y = control->get_transform().xform_inv(over_scroll_container).y;
 	float bottom_edge = 0;
 	for (int i = 0; i < items.size(); i++) {
-		if (!items[i].visible) {
-			continue;
-		}
 		bottom_edge += theme_cache.v_separation;
 		bottom_edge += _get_item_height(i);
 		if (bottom_edge > over_control_y) {
@@ -530,7 +509,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 
 			bool match_found = false;
 			for (int i = search_from; i < items.size(); i++) {
-				if (!items[i].separator && !items[i].disabled && items[i].visible) {
+				if (!items[i].separator && !items[i].disabled) {
 					prev_mouse_over = mouse_over;
 					mouse_over = i;
 					emit_signal(SNAME("id_focused"), items[i].id);
@@ -546,7 +525,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 			if (!match_found) {
 				// If the last item is not selectable, try re-searching from the start.
 				for (int i = 0; i < search_from; i++) {
-					if (!items[i].separator && !items[i].disabled && items[i].visible) {
+					if (!items[i].separator && !items[i].disabled) {
 						prev_mouse_over = mouse_over;
 						mouse_over = i;
 						emit_signal(SNAME("id_focused"), items[i].id);
@@ -573,7 +552,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 
 			bool match_found = false;
 			for (int i = search_from; i >= 0; i--) {
-				if (!items[i].separator && !items[i].disabled && items[i].visible) {
+				if (!items[i].separator && !items[i].disabled) {
 					prev_mouse_over = mouse_over;
 					mouse_over = i;
 					emit_signal(SNAME("id_focused"), items[i].id);
@@ -589,7 +568,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 			if (!match_found) {
 				// If the first item is not selectable, try re-searching from the end.
 				for (int i = items.size() - 1; i >= search_from; i--) {
-					if (!items[i].separator && !items[i].disabled && items[i].visible) {
+					if (!items[i].separator && !items[i].disabled) {
 						prev_mouse_over = mouse_over;
 						mouse_over = i;
 						emit_signal(SNAME("id_focused"), items[i].id);
@@ -709,9 +688,6 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 
 				int over = _get_mouse_over(b->get_position());
 				if (over < 0) {
-					if (search_bar->is_visible() && search_bar->get_global_rect().has_point(b->get_position() / win_scale)) {
-						return;
-					}
 					if (!was_during_grabbed_click) {
 						hide();
 					}
@@ -778,7 +754,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventKey> k = p_event;
 
-	if (!search_bar->is_visible() && allow_search && k.is_valid() && k->get_unicode() && k->is_pressed()) {
+	if (allow_search && k.is_valid() && k->get_unicode() && k->is_pressed()) {
 		uint64_t now = OS::get_singleton()->get_ticks_msec();
 		uint64_t diff = now - search_time_msec;
 		uint64_t max_interval = uint64_t(GLOBAL_GET_CACHED(uint64_t, "gui/timers/incremental_search_max_interval_msec"));
@@ -892,7 +868,7 @@ void PopupMenu::_draw_items() {
 	bool has_check_gutter = false;
 	bool gutter_compact = theme_cache.gutter_compact;
 	for (int i = 0; i < items.size(); i++) {
-		if (items[i].separator || !items[i].visible) {
+		if (items[i].separator) {
 			continue;
 		}
 
@@ -916,10 +892,6 @@ void PopupMenu::_draw_items() {
 
 	// Loop through all items and draw each.
 	for (int i = 0; i < items.size(); i++) {
-		if (!items[i].visible) {
-			continue;
-		}
-
 		// For the first item only add half a separation. For all other items, add a whole separation to the offset.
 		ofs.y += i > 0 ? theme_cache.v_separation : theme_cache.v_separation / 2;
 
@@ -1076,62 +1048,6 @@ void PopupMenu::_draw_items() {
 	}
 }
 
-void PopupMenu::_search_bar_input(const Ref<InputEvent> &p_event) {
-	// Redirect navigational key events to the tree.
-	Ref<InputEventKey> key = p_event;
-	if (key.is_valid()) {
-		if (key->is_action("ui_up", true) || key->is_action("ui_down", true) || key->is_action("ui_page_up") || key->is_action("ui_page_down")) {
-			search_bar->accept_event();
-		}
-	}
-}
-
-void PopupMenu::_search_bar_text_changed(const String &p_new_text) {
-	_filter_items(p_new_text);
-
-	queue_accessibility_update();
-	control->queue_redraw();
-	child_controls_changed();
-	notify_property_list_changed();
-	_menu_changed();
-}
-
-void PopupMenu::_filter_items(const String &p_query) {
-	PackedStringArray search_names;
-	for (int i = 0; i < items.size(); i++) {
-		search_names.append(items[i].text);
-	}
-
-	Vector<FuzzySearchResult> results;
-	FuzzySearch fuzzy;
-	fuzzy.set_query(p_query, false);
-	fuzzy.search_all(search_names, results);
-
-	for (PopupMenu::Item &item : items) {
-		bool submenu_visible = false;
-		if (item.submenu) {
-			item.submenu->_filter_items(p_query);
-			for (PopupMenu::Item &submenu_item : item.submenu->items) {
-				if (submenu_item.visible) {
-					submenu_visible = true;
-					break;
-				}
-			}
-		}
-
-		item.visible = p_query.length() == 0 || submenu_visible;
-	}
-
-	for (const FuzzySearchResult &res : results) {
-		items.write[res.original_index].visible = res.score > 0;
-		if (items[res.original_index].visible && items[res.original_index].submenu) {
-			for (PopupMenu::Item &submenu_item : items[res.original_index].submenu->items) {
-				submenu_item.visible = true;
-			}
-		}
-	}
-}
-
 void PopupMenu::_close_pressed() {
 	if (this_submenu_index != -1 && active_submenu_index != -1) { // Close secondary submenus on first submenu close.
 		ERR_FAIL_INDEX_MSG(active_submenu_index, items.size(), vformat("Invalid active_submenu_index index %d in _close_pressed.", active_submenu_index));
@@ -1307,14 +1223,6 @@ RID PopupMenu::get_focused_accessibility_element() const {
 	}
 }
 
-String PopupMenu::_get_accessibility_name() const {
-	if (has_meta("_menu_name")) {
-		return get_meta("_menu_name", get_name());
-	} else {
-		return Window::_get_accessibility_name();
-	}
-}
-
 void PopupMenu::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_EXIT_TREE: {
@@ -1335,17 +1243,20 @@ void PopupMenu::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU);
-			AccessibilityServer::get_singleton()->update_set_list_item_count(ae, items.size());
+			if (has_meta("_menu_name")) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_meta("_menu_name", get_name()));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MENU);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, items.size());
 
 			if (accessibility_scroll_element.is_null()) {
-				accessibility_scroll_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 			}
 
 			Transform2D scroll_xform;
 			scroll_xform.set_origin(Vector2i(0, -scroll_container->get_v_scroll_bar()->get_value()));
-			AccessibilityServer::get_singleton()->update_set_transform(accessibility_scroll_element, scroll_xform);
-			AccessibilityServer::get_singleton()->update_set_bounds(accessibility_scroll_element, Rect2(0, 0, get_size().x, scroll_container->get_v_scroll_bar()->get_max()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, get_size().x, scroll_container->get_v_scroll_bar()->get_max()));
 
 			float scroll_width = scroll_container->get_v_scroll_bar()->is_visible_in_tree() ? scroll_container->get_v_scroll_bar()->get_size().width : 0;
 			float display_width = control->get_size().width - scroll_width;
@@ -1353,16 +1264,13 @@ void PopupMenu::_notification(int p_what) {
 
 			for (int i = 0; i < items.size(); i++) {
 				const Item &item = items.write[i];
-				if (!item.visible) {
-					continue;
-				}
 
 				// Avoid discrepancy between min size and drawn items due to rounding.
 				ofs.y += i > 0 ? theme_cache.v_separation : theme_cache.v_separation - (theme_cache.v_separation / 2);
 
 				Point2 item_ofs = ofs;
 				if (item.accessibility_item_element.is_null()) {
-					item.accessibility_item_element = AccessibilityServer::get_singleton()->create_sub_element(accessibility_scroll_element, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM);
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM);
 					item.accessibility_item_dirty = true;
 				}
 
@@ -1372,27 +1280,27 @@ void PopupMenu::_notification(int p_what) {
 				if (item.accessibility_item_dirty || i == prev_mouse_over || i == mouse_over) {
 					switch (item.checkable_type) {
 						case Item::CHECKABLE_TYPE_NONE: {
-							AccessibilityServer::get_singleton()->update_set_role(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM);
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM);
 						} break;
 						case Item::CHECKABLE_TYPE_CHECK_BOX: {
-							AccessibilityServer::get_singleton()->update_set_role(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX);
-							AccessibilityServer::get_singleton()->update_set_checked(item.accessibility_item_element, item.checked);
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX);
+							DisplayServer::get_singleton()->accessibility_update_set_checked(item.accessibility_item_element, item.checked);
 						} break;
 						case Item::CHECKABLE_TYPE_RADIO_BUTTON: {
-							AccessibilityServer::get_singleton()->update_set_role(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityRole::ROLE_MENU_ITEM_RADIO);
-							AccessibilityServer::get_singleton()->update_set_checked(item.accessibility_item_element, item.checked);
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_RADIO);
+							DisplayServer::get_singleton()->accessibility_update_set_checked(item.accessibility_item_element, item.checked);
 						} break;
 					}
 
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &PopupMenu::_accessibility_action_click).bind(i));
-					AccessibilityServer::get_singleton()->update_set_list_item_index(item.accessibility_item_element, i);
-					AccessibilityServer::get_singleton()->update_set_list_item_level(item.accessibility_item_element, 0);
-					AccessibilityServer::get_singleton()->update_set_list_item_selected(item.accessibility_item_element, i == mouse_over);
-					AccessibilityServer::get_singleton()->update_set_name(item.accessibility_item_element, item.xl_text);
-					AccessibilityServer::get_singleton()->update_set_flag(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED, item.disabled);
-					AccessibilityServer::get_singleton()->update_set_tooltip(item.accessibility_item_element, item.tooltip);
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &PopupMenu::_accessibility_action_click).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_level(item.accessibility_item_element, 0);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, i == mouse_over);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, item.xl_text);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
 
-					AccessibilityServer::get_singleton()->update_set_bounds(item.accessibility_item_element, Rect2(item_ofs, Size2(display_width, h + theme_cache.v_separation)));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(item_ofs, Size2(display_width, h + theme_cache.v_separation)));
 
 					item.accessibility_item_dirty = false;
 				}
@@ -1416,9 +1324,6 @@ void PopupMenu::_notification(int p_what) {
 
 		case Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
-			search_bar->set_right_icon(get_theme_icon(SNAME("search")));
-			vbox_container->add_theme_constant_override(SNAME("separation"), theme_cache.search_bar_separation);
-
 			panel->add_theme_style_override(SceneStringName(panel), theme_cache.panel_style);
 
 			if (is_visible()) {
@@ -1455,9 +1360,6 @@ void PopupMenu::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_WM_MOUSE_ENTER: {
-			if (is_embedded() && search_bar->is_menu_visible()) {
-				return;
-			}
 			grab_focus();
 		} break;
 
@@ -1505,7 +1407,7 @@ void PopupMenu::_notification(int p_what) {
 
 						bool match_found = false;
 						for (int i = search_from; i < items.size(); i++) {
-							if (!items[i].separator && !items[i].disabled && items[i].visible) {
+							if (!items[i].separator && !items[i].disabled) {
 								mouse_over = i;
 								emit_signal(SNAME("id_focused"), items[i].id);
 								scroll_to_item(i);
@@ -1584,21 +1486,6 @@ void PopupMenu::_notification(int p_what) {
 			if (!is_visible()) {
 				this_submenu_index = -1;
 
-				if (!search_bar->get_text().is_empty()) {
-					search_bar->clear();
-					_search_bar_text_changed("");
-				}
-
-				if (is_embedded()) {
-					LineEdit *parent_search_bar = Object::cast_to<LineEdit>(get_parent());
-					if (parent_search_bar && parent_search_bar->is_visible()) {
-						Window *window_parent = Object::cast_to<Window>(parent_search_bar->get_viewport());
-						if (window_parent) {
-							window_parent->grab_focus();
-						}
-					}
-				}
-
 				if (mouse_over >= 0) {
 					prev_mouse_over = mouse_over;
 					mouse_over = -1;
@@ -1644,9 +1531,9 @@ void PopupMenu::_notification(int p_what) {
  */
 
 #define ITEM_SETUP_WITH_ACCEL(p_label, p_id, p_accel) \
-	item.text = p_label; \
-	item.xl_text = atr(p_label); \
-	item.id = p_id == -1 ? items.size() : p_id; \
+	item.text = p_label;                              \
+	item.xl_text = atr(p_label);                      \
+	item.id = p_id == -1 ? items.size() : p_id;       \
 	item.accel = p_accel;
 
 void PopupMenu::add_item(const String &p_label, int p_id, Key p_accel) {
@@ -1821,14 +1708,14 @@ void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int
 	notify_property_list_changed();
 }
 
-#define ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global, p_allow_echo) \
+#define ITEM_SETUP_WITH_SHORTCUT(p_shortcut, p_id, p_global, p_allow_echo)             \
 	ERR_FAIL_COND_MSG(p_shortcut.is_null(), "Cannot add item with invalid Shortcut."); \
-	_ref_shortcut(p_shortcut); \
-	item.text = p_shortcut->get_name(); \
-	item.xl_text = atr(item.text); \
-	item.id = p_id == -1 ? items.size() : p_id; \
-	item.shortcut = p_shortcut; \
-	item.shortcut_is_global = p_global; \
+	_ref_shortcut(p_shortcut);                                                         \
+	item.text = p_shortcut->get_name();                                                \
+	item.xl_text = atr(item.text);                                                     \
+	item.id = p_id == -1 ? items.size() : p_id;                                        \
+	item.shortcut = p_shortcut;                                                        \
+	item.shortcut_is_global = p_global;                                                \
 	item.allow_echo = p_allow_echo;
 
 void PopupMenu::add_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bool p_global, bool p_allow_echo) {
@@ -2744,39 +2631,6 @@ void PopupMenu::set_item_shortcut_disabled(int p_idx, bool p_disabled) {
 	_menu_changed();
 }
 
-void PopupMenu::set_item_index(int p_idx, int p_target_idx) {
-	if (p_idx < 0) {
-		p_idx += get_item_count();
-	}
-	ERR_FAIL_INDEX(p_idx, items.size());
-
-	if (p_target_idx < 0) {
-		p_target_idx += get_item_count();
-	}
-	ERR_FAIL_INDEX(p_target_idx, items.size());
-
-	if (p_idx == p_target_idx) {
-		return;
-	}
-
-	Item item = items[p_idx];
-	items.remove_at(p_idx);
-	items.insert(p_target_idx, item);
-
-	if (global_menu.is_valid()) {
-		NativeMenu *nmenu = NativeMenu::get_singleton();
-		nmenu->set_item_index(global_menu, p_idx, p_target_idx);
-		// Update tags of all affected items to their new index.
-		for (int i = MIN(p_idx, p_target_idx); i <= MAX(p_idx, p_target_idx); i++) {
-			nmenu->set_item_tag(global_menu, i, i);
-		}
-	}
-
-	queue_accessibility_update();
-	control->queue_redraw();
-	_menu_changed();
-}
-
 void PopupMenu::toggle_item_multistate(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	if (0 >= items[p_idx].max_states) {
@@ -2855,7 +2709,7 @@ void PopupMenu::set_item_count(int p_count) {
 		for (int i = prev_size - 1; i >= p_count; i--) {
 			nmenu->remove_item(global_menu, i);
 			if (items[i].accessibility_item_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(items.write[i].accessibility_item_element);
+				DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
 				items.write[i].accessibility_item_element = RID();
 			}
 		}
@@ -3039,7 +2893,7 @@ void PopupMenu::remove_item(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 
 	if (items[p_idx].accessibility_item_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(items.write[p_idx].accessibility_item_element);
+		DisplayServer::get_singleton()->accessibility_free_element(items.write[p_idx].accessibility_item_element);
 		items.write[p_idx].accessibility_item_element = RID();
 	}
 	if (items[p_idx].shortcut.is_valid()) {
@@ -3079,7 +2933,7 @@ void PopupMenu::add_separator(const String &p_text, int p_id) {
 void PopupMenu::clear(bool p_free_submenus) {
 	for (Item &I : items) {
 		if (I.accessibility_item_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(I.accessibility_item_element);
+			DisplayServer::get_singleton()->accessibility_free_element(I.accessibility_item_element);
 			I.accessibility_item_element = RID();
 		}
 		if (I.shortcut.is_valid()) {
@@ -3211,18 +3065,6 @@ String PopupMenu::get_tooltip(const Point2 &p_pos) const {
 	return items[over].tooltip;
 }
 
-bool PopupMenu::is_search_bar_enabled() const {
-	return search_bar_enabled_on_item_count > 0 && items.size() >= search_bar_enabled_on_item_count;
-}
-
-void PopupMenu::set_search_bar_enabled_on_item_count(int p_count) {
-	search_bar_enabled_on_item_count = p_count;
-}
-
-int PopupMenu::get_search_bar_enabled_on_item_count() const {
-	return search_bar_enabled_on_item_count;
-}
-
 #ifdef TOOLS_ENABLED
 PackedStringArray PopupMenu::get_configuration_warnings() const {
 	PackedStringArray warnings = Popup::get_configuration_warnings();
@@ -3345,7 +3187,6 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_multistate", "index", "state"), &PopupMenu::set_item_multistate);
 	ClassDB::bind_method(D_METHOD("set_item_multistate_max", "index", "max_states"), &PopupMenu::set_item_max_states);
 	ClassDB::bind_method(D_METHOD("set_item_shortcut_disabled", "index", "disabled"), &PopupMenu::set_item_shortcut_disabled);
-	ClassDB::bind_method(D_METHOD("set_item_index", "index", "target_index"), &PopupMenu::set_item_index);
 
 	ClassDB::bind_method(D_METHOD("toggle_item_checked", "index"), &PopupMenu::toggle_item_checked);
 	ClassDB::bind_method(D_METHOD("toggle_item_multistate", "index"), &PopupMenu::toggle_item_multistate);
@@ -3406,9 +3247,6 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_system_menu"), &PopupMenu::is_system_menu);
 	ClassDB::bind_method(D_METHOD("set_system_menu", "system_menu_id"), &PopupMenu::set_system_menu);
 	ClassDB::bind_method(D_METHOD("get_system_menu"), &PopupMenu::get_system_menu);
-	ClassDB::bind_method(D_METHOD("is_search_bar_enabled"), &PopupMenu::is_search_bar_enabled);
-	ClassDB::bind_method(D_METHOD("set_search_bar_enabled_on_item_count", "count"), &PopupMenu::set_search_bar_enabled_on_item_count);
-	ClassDB::bind_method(D_METHOD("get_search_bar_enabled_on_item_count"), &PopupMenu::get_search_bar_enabled_on_item_count);
 
 	ClassDB::bind_method(D_METHOD("set_shrink_height", "shrink"), &PopupMenu::set_shrink_height);
 	ClassDB::bind_method(D_METHOD("get_shrink_height"), &PopupMenu::get_shrink_height);
@@ -3426,8 +3264,6 @@ void PopupMenu::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shrink_height"), "set_shrink_height", "get_shrink_height");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shrink_width"), "set_shrink_width", "get_shrink_width");
 
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "search_bar_enabled_on_item_count", PROPERTY_HINT_RANGE, "0,20,1,or_greater"), "set_search_bar_enabled_on_item_count", "get_search_bar_enabled_on_item_count");
-
 	ADD_ARRAY_COUNT("Items", "item_count", "set_item_count", "get_item_count", "item_");
 
 	ADD_SIGNAL(MethodInfo("id_pressed", PropertyInfo(Variant::INT, "id")));
@@ -3444,7 +3280,6 @@ void PopupMenu::_bind_methods() {
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, v_separation);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, h_separation);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, search_bar_separation);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, indent);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, item_start_padding);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, PopupMenu, item_end_padding);
@@ -3460,7 +3295,6 @@ void PopupMenu::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, PopupMenu, radio_unchecked);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, PopupMenu, radio_unchecked_disabled);
 
-	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, PopupMenu, search);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, PopupMenu, submenu);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, PopupMenu, submenu_mirrored);
 
@@ -3485,22 +3319,22 @@ void PopupMenu::_bind_methods() {
 	base_property_helper.set_prefix("item_");
 	base_property_helper.set_array_length_getter(&PopupMenu::get_item_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "text"), defaults.text, &PopupMenu::set_item_text, &PopupMenu::get_item_text);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon, &PopupMenu::set_item_icon, &PopupMenu::get_item_icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon, &PopupMenu::set_item_icon, &PopupMenu::get_item_icon);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "checkable", PROPERTY_HINT_ENUM, "No,As checkbox,As radio button"), defaults.checkable_type, &PopupMenu::_set_item_checkable_type, &PopupMenu::_get_item_checkable_type);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "checked"), defaults.checked, &PopupMenu::set_item_checked, &PopupMenu::is_item_checked);
 	base_property_helper.register_property(PropertyInfo(Variant::INT, "id", PROPERTY_HINT_RANGE, "0,10,1,or_greater", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL), defaults.id, &PopupMenu::set_item_id, &PopupMenu::get_item_id);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled, &PopupMenu::set_item_disabled, &PopupMenu::is_item_disabled);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "separator"), defaults.separator, &PopupMenu::set_item_as_separator, &PopupMenu::is_item_separator);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 void PopupMenu::_native_popup(const Rect2i &p_rect) {
 	Point2i popup_pos = p_rect.position;
 	if (is_embedded()) {
 		popup_pos = get_embedder()->get_screen_transform().xform(popup_pos); // Note: for embedded windows "screen transform" is transform relative to embedder not the actual screen.
-		DisplayServerEnums::WindowID wid = get_window_id();
-		if (wid == DisplayServerEnums::INVALID_WINDOW_ID) {
-			wid = DisplayServerEnums::MAIN_WINDOW_ID;
+		DisplayServer::WindowID wid = get_window_id();
+		if (wid == DisplayServer::INVALID_WINDOW_ID) {
+			wid = DisplayServer::MAIN_WINDOW_ID;
 		}
 		popup_pos += DisplayServer::get_singleton()->window_get_position(wid);
 	}
@@ -3629,16 +3463,6 @@ void PopupMenu::set_visible(bool p_visible) {
 	}
 #endif
 
-	if (p_visible) {
-		PopupMenu *parent_popup = Object::cast_to<PopupMenu>(get_parent());
-		if (!parent_popup) {
-			search_bar->set_visible(is_search_bar_enabled());
-			if (search_bar->is_visible()) {
-				search_bar->edit(true);
-			}
-		}
-	}
-
 	if (native) {
 		if (p_visible) {
 			_native_popup(Rect2i(get_position(), get_size()));
@@ -3655,35 +3479,15 @@ void PopupMenu::set_visible(bool p_visible) {
 
 PopupMenu::PopupMenu() {
 	set_flag(FLAG_TRANSPARENT, true);
-	set_default_canvas_item_texture_filter(Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE);
-	set_default_canvas_item_texture_repeat(Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE);
-
 	// The panel used to draw the panel style.
 	panel = memnew(PanelContainer);
 	panel->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 	add_child(panel, false, INTERNAL_MODE_FRONT);
 
-	vbox_container = memnew(VBoxContainer);
-	vbox_container->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-	vbox_container->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	vbox_container->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	panel->add_child(vbox_container, false, INTERNAL_MODE_FRONT);
-
-	search_bar = memnew(LineEdit);
-	search_bar->set_visible(is_search_bar_enabled());
-	search_bar->set_clear_button_enabled(true);
-	search_bar->set_placeholder(ETR("Search"));
-	search_bar->set_keep_editing_on_text_submit(true);
-	search_bar->connect(SceneStringName(text_changed), callable_mp(this, &PopupMenu::_search_bar_text_changed));
-	search_bar->connect(SceneStringName(gui_input), callable_mp(this, &PopupMenu::_search_bar_input));
-	vbox_container->add_child(search_bar, false, INTERNAL_MODE_FRONT);
-
 	// Scroll Container
 	scroll_container = memnew(ScrollContainer);
 	scroll_container->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-	scroll_container->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	scroll_container->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	vbox_container->add_child(scroll_container, false, INTERNAL_MODE_FRONT);
+	panel->add_child(scroll_container, false, INTERNAL_MODE_FRONT);
 
 	// The control which will display the items
 	control = memnew(Control);
diff --git a/engine/scene/gui/popup_menu.h b/engine/scene/gui/popup_menu.h
index 515ddfa1..a600310c 100644
--- a/engine/scene/gui/popup_menu.h
+++ b/engine/scene/gui/popup_menu.h
@@ -35,11 +35,8 @@
 #include "scene/gui/scroll_container.h"
 #include "scene/property_list_helper.h"
 #include "scene/resources/text_line.h"
-#include "servers/display/native_menu.h"
 
 class PanelContainer;
-class VBoxContainer;
-class LineEdit;
 class Timer;
 
 class PopupMenu : public Popup {
@@ -64,7 +61,6 @@ class PopupMenu : public Popup {
 		AutoTranslateMode auto_translate_mode = AUTO_TRANSLATE_MODE_INHERIT;
 
 		bool checked = false;
-		bool visible = true;
 		enum {
 			CHECKABLE_TYPE_NONE,
 			CHECKABLE_TYPE_CHECK_BOX,
@@ -179,10 +175,7 @@ class PopupMenu : public Popup {
 	uint64_t search_time_msec = 0;
 	String search_string = "";
 
-	int search_bar_enabled_on_item_count = 0;
 	PanelContainer *panel = nullptr;
-	VBoxContainer *vbox_container = nullptr;
-	LineEdit *search_bar = nullptr;
 	ScrollContainer *scroll_container = nullptr;
 	Control *control = nullptr;
 
@@ -201,7 +194,6 @@ class PopupMenu : public Popup {
 
 		int v_separation = 0;
 		int h_separation = 0;
-		int search_bar_separation = 0;
 		int indent = 0;
 		int item_start_padding = 0;
 		int item_end_padding = 0;
@@ -217,7 +209,6 @@ class PopupMenu : public Popup {
 		Ref<Texture2D> radio_unchecked;
 		Ref<Texture2D> radio_unchecked_disabled;
 
-		Ref<Texture2D> search;
 		Ref<Texture2D> submenu;
 		Ref<Texture2D> submenu_mirrored;
 
@@ -239,9 +230,6 @@ class PopupMenu : public Popup {
 	} theme_cache;
 
 	void _draw_items();
-	void _search_bar_input(const Ref<InputEvent> &p_event);
-	void _search_bar_text_changed(const String &p_new_text);
-	void _filter_items(const String &p_query);
 
 	void _close_pressed();
 	void _menu_changed();
@@ -273,8 +261,6 @@ protected:
 	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return property_helper.property_get_revert(p_name, r_property); }
 	static void _bind_methods();
 
-	virtual String _get_accessibility_name() const override;
-
 #ifndef DISABLE_DEPRECATED
 	void _add_shortcut_bind_compat_36493(const Ref<Shortcut> &p_shortcut, int p_id = -1, bool p_global = false);
 	void _add_icon_shortcut_bind_compat_36493(const Ref<Texture2D> &p_icon, const Ref<Shortcut> &p_shortcut, int p_id = -1, bool p_global = false);
@@ -346,7 +332,6 @@ public:
 	void set_item_multistate(int p_idx, int p_state);
 	void toggle_item_multistate(int p_idx);
 	void set_item_shortcut_disabled(int p_idx, bool p_disabled);
-	void set_item_index(int p_idx, int p_target_idx);
 
 	void toggle_item_checked(int p_idx);
 
@@ -387,11 +372,6 @@ public:
 	void set_prefer_native_menu(bool p_enabled);
 	bool is_prefer_native_menu() const;
 
-	bool is_search_bar_enabled() const;
-
-	void set_search_bar_enabled_on_item_count(int p_count);
-	int get_search_bar_enabled_on_item_count() const;
-
 	bool is_native_menu() const;
 
 	void scroll_to_item(int p_idx);
diff --git a/engine/scene/gui/progress_bar.cpp b/engine/scene/gui/progress_bar.cpp
index d271f0a9..a72aaee5 100644
--- a/engine/scene/gui/progress_bar.cpp
+++ b/engine/scene/gui/progress_bar.cpp
@@ -30,12 +30,9 @@
 
 #include "progress_bar.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/text_line.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 Size2 ProgressBar::get_minimum_size() const {
 	Size2 minimum_size = theme_cache.background_style->get_minimum_size();
@@ -63,7 +60,7 @@ void ProgressBar::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -193,7 +190,8 @@ void ProgressBar::_notification(int p_what) {
 void ProgressBar::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && indeterminate && p_property.name == "show_percentage") {
 		p_property.usage |= PROPERTY_USAGE_READ_ONLY;
-	} else if (!indeterminate && p_property.name == "editor_preview_indeterminate") {
+	}
+	if (!indeterminate && p_property.name == "editor_preview_indeterminate") {
 		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
diff --git a/engine/scene/gui/range.cpp b/engine/scene/gui/range.cpp
index 887c78ef..6f5abb4d 100644
--- a/engine/scene/gui/range.cpp
+++ b/engine/scene/gui/range.cpp
@@ -30,11 +30,7 @@
 
 #include "range.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/display/accessibility_server.h"
-
-#include <thirdparty/misc/r128.h>
+#include "thirdparty/misc/r128.h"
 
 double Range::_snapped_r128(double p_value, double p_step) {
 	if (p_step == 0.0) {
@@ -116,17 +112,17 @@ void Range::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SPIN_BUTTON);
-			AccessibilityServer::get_singleton()->update_set_num_value(ae, shared->val);
-			AccessibilityServer::get_singleton()->update_set_num_range(ae, shared->min, shared->max);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, shared->val);
+			DisplayServer::get_singleton()->accessibility_update_set_num_range(ae, shared->min, shared->max);
 			if (shared->step > 0) {
-				AccessibilityServer::get_singleton()->update_set_num_step(ae, shared->step);
+				DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, shared->step);
 			} else {
-				AccessibilityServer::get_singleton()->update_set_num_step(ae, 1);
+				DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, 1);
 			}
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Range::_accessibility_action_dec));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Range::_accessibility_action_inc));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Range::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Range::_accessibility_action_dec));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Range::_accessibility_action_inc));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Range::_accessibility_action_set_value));
 		} break;
 	}
 }
diff --git a/engine/scene/gui/reference_rect.cpp b/engine/scene/gui/reference_rect.cpp
index 00bbb342..5a4b6c44 100644
--- a/engine/scene/gui/reference_rect.cpp
+++ b/engine/scene/gui/reference_rect.cpp
@@ -31,7 +31,6 @@
 #include "reference_rect.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 void ReferenceRect::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/gui/rich_text_effect.cpp b/engine/scene/gui/rich_text_effect.cpp
index 4a05477a..e9683217 100644
--- a/engine/scene/gui/rich_text_effect.cpp
+++ b/engine/scene/gui/rich_text_effect.cpp
@@ -30,7 +30,6 @@
 
 #include "rich_text_effect.h"
 
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 CharFXTransform::CharFXTransform() {
diff --git a/engine/scene/gui/rich_text_effect.h b/engine/scene/gui/rich_text_effect.h
index d33d9539..8e8c45ae 100644
--- a/engine/scene/gui/rich_text_effect.h
+++ b/engine/scene/gui/rich_text_effect.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 class CharFXTransform : public RefCounted {
 	GDCLASS(CharFXTransform, RefCounted);
diff --git a/engine/scene/gui/rich_text_label.compat.inc b/engine/scene/gui/rich_text_label.compat.inc
index 04ee6d4d..661f589b 100644
--- a/engine/scene/gui/rich_text_label.compat.inc
+++ b/engine/scene/gui/rich_text_label.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "rich_text_label.h"
-
-#include "core/object/class_db.h"
-
 void RichTextLabel::_push_font_bind_compat_79053(const Ref<Font> &p_font, int p_size) {
 	push_font(p_font, p_size);
 }
diff --git a/engine/scene/gui/rich_text_label.cpp b/engine/scene/gui/rich_text_label.cpp
index 3462d4bc..5c081bc2 100644
--- a/engine/scene/gui/rich_text_label.cpp
+++ b/engine/scene/gui/rich_text_label.cpp
@@ -34,60 +34,21 @@
 #include "core/input/input_map.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "scene/gui/label.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/rich_text_effect.h"
-#include "scene/gui/scroll_bar.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/resources/atlas_texture.h"
-#include "scene/resources/text_paragraph.h"
-#include "scene/resources/texture.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 #ifdef MODULE_REGEX_ENABLED
 #include "modules/regex/regex.h"
 #endif
 
-RichTextLabel::ItemDropcap::~ItemDropcap() {
-	if (font.is_valid()) {
-		RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
-		if (owner_rtl) {
-			font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts));
-		}
-	}
-}
-
-RichTextLabel::ItemImage::~ItemImage() {
-	if (image.is_valid()) {
-		RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
-		if (owner_rtl) {
-			if (owner_rtl->hr_list.has(rid)) {
-				owner_rtl->hr_list.erase((rid));
-			}
-			image->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_texture_changed));
-		}
-	}
-}
-
-RichTextLabel::ItemFont::~ItemFont() {
-	if (font.is_valid()) {
-		RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
-		if (owner_rtl) {
-			font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts));
-		}
-	}
-}
-
 RichTextLabel::ItemCustomFX::ItemCustomFX() {
 	type = ITEM_CUSTOMFX;
 	char_fx_transform.instantiate();
@@ -108,14 +69,6 @@ Rect2i _merge_or_copy_rect(const Rect2i &p_a, const Rect2i &p_b) {
 	}
 }
 
-RichTextLabel::Line::~Line() {
-	if (accessibility_line_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(accessibility_line_element);
-		accessibility_line_element = RID();
-		accessibility_text_element = RID();
-	}
-}
-
 RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) const {
 	if (!p_item) {
 		return nullptr;
@@ -230,8 +183,7 @@ RichTextLabel::Item *RichTextLabel::_get_item_at_pos(RichTextLabel::Item *p_item
 				}
 			} break;
 			case ITEM_TABLE: {
-				ItemTable *table = static_cast<ItemTable *>(it);
-				offset += table->char_count;
+				offset += 1;
 			} break;
 			default:
 				break;
@@ -262,11 +214,11 @@ String RichTextLabel::_roman(int p_num, bool p_capitalize) const {
 }
 
 String RichTextLabel::_letters(int p_num, bool p_capitalize) const {
-	uint64_t n = p_num;
+	int64_t n = p_num;
 
 	int chars = 0;
 	do {
-		n = (n - 1) / 26;
+		n /= 24;
 		chars++;
 	} while (n);
 
@@ -276,10 +228,11 @@ String RichTextLabel::_letters(int p_num, bool p_capitalize) const {
 	c[chars] = 0;
 	n = p_num;
 	do {
-		const char a = (p_capitalize ? 'A' : 'a');
-		n = n - 1;
-		c[--chars] = a + n % 26;
-		n /= 26;
+		int mod = Math::abs(n % 24);
+		char a = (p_capitalize ? 'A' : 'a');
+		c[--chars] = a + mod - 1;
+
+		n /= 24;
 	} while (n);
 
 	return s;
@@ -561,31 +514,23 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font
 					table->columns[i].width = 0;
 				}
 
-				// Compute width for each column.
-				const int available_width = p_width - l.offset.x - theme_cache.table_h_separation * col_count;
-				_update_table_column_width(table, available_width);
+				const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1);
+				int base_column_width = available_width / col_count;
 
-				// Resize for elements in the table.
-				int idx = 0;
 				for (Item *E : table->subitems) {
 					ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
 					ItemFrame *frame = static_cast<ItemFrame *>(E);
 
-					const int frame_padding_space = Math::ceil(frame->padding.position.x + frame->padding.size.x);
-
-					int column = idx % col_count;
 					float prev_h = 0;
 					for (int i = 0; i < (int)frame->lines.size(); i++) {
 						MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
-						int w = table->columns[column].width - frame_padding_space;
+						int w = base_column_width - frame->padding.position.x - frame->padding.size.x;
 						w = MAX(w, _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1);
 						prev_h = _resize_line(frame, i, p_base_font, p_base_font_size, w, prev_h);
 					}
-					idx++;
 				}
 
-				// Compute size and offset for each element in the table.
-				_update_table_size(table);
+				_set_table_size(table, available_width);
 
 				int row_idx = (table->align_to_row < 0) ? table->rows_baseline.size() - 1 : table->align_to_row;
 				if (table->rows_baseline.size() != 0 && row_idx < (int)table->rows_baseline.size()) {
@@ -609,41 +554,6 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font
 	return _calculate_line_vertical_offset(l);
 }
 
-int RichTextLabel::_get_line_max_width(ItemFrame *p_frame, int p_line) const {
-	ERR_FAIL_NULL_V(p_frame, 0);
-	ERR_FAIL_INDEX_V(p_line, (int)p_frame->lines.size(), 0);
-
-	Line &l = p_frame->lines[p_line];
-	MutexLock lock(l.text_buf->get_mutex());
-
-	int max_width = Math::ceil(l.text_buf->get_non_wrapped_size().x);
-
-	Item *it_to = (p_line + 1 < (int)p_frame->lines.size()) ? p_frame->lines[p_line + 1].from : nullptr;
-	for (Item *it = l.from; it && it != it_to; it = _get_next_item(it)) {
-		if (it->type != ITEM_TABLE) {
-			continue;
-		}
-
-		ItemTable *table = static_cast<ItemTable *>(it);
-
-		// Subtract the table's width recorded in text_buf.
-		max_width -= table->total_width;
-
-		// Recalculate the maximum width of the table.
-		const int col_count = table->columns.size();
-		max_width += theme_cache.table_h_separation * col_count;
-
-		// The columns in the nested table have already been calculated in _shape_line().
-		for (ItemTable::Column &C : table->columns) {
-			max_width += C.max_width;
-		}
-	}
-
-	max_width += Math::ceil(p_frame->padding.position.x + p_frame->padding.size.x + l.indent);
-
-	return max_width;
-}
-
 float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size, int p_width, float p_h, int *r_char_offset) {
 	ERR_FAIL_NULL_V(p_frame, p_h);
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), p_h);
@@ -781,70 +691,51 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 				ItemTable *table = static_cast<ItemTable *>(it);
 				int col_count = table->columns.size();
 				int t_char_count = 0;
-
 				// Set minimums to zero.
 				for (int i = 0; i < col_count; i++) {
 					table->columns[i].min_width = 0;
 					table->columns[i].max_width = 0;
 					table->columns[i].width = 0;
 				}
-
 				// Compute minimum width for each cell.
+				const int available_width = p_width - theme_cache.table_h_separation * (col_count - 1);
+				int base_column_width = available_width / col_count;
 				int idx = 0;
 				for (Item *E : table->subitems) {
 					ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
 					ItemFrame *frame = static_cast<ItemFrame *>(E);
 
-					const real_t frame_padding_space = frame->padding.position.x + frame->padding.size.x;
-
 					int column = idx % col_count;
-					ItemTable::Column &C = table->columns[column];
-
 					float prev_h = 0;
 					for (int i = 0; i < (int)frame->lines.size(); i++) {
-						Line &line = frame->lines[i];
-						MutexLock sub_lock(line.text_buf->get_mutex());
+						MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
 
 						int char_offset = l.char_offset + l.char_count;
-						int w = _find_margin(line.from, p_base_font, p_base_font_size) + 1;
+						int w = _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1;
 						prev_h = _shape_line(frame, i, p_base_font, p_base_font_size, w, prev_h, &char_offset);
 						int cell_ch = (char_offset - (l.char_offset + l.char_count));
 						l.char_count += cell_ch;
 						t_char_count += cell_ch;
 						remaining_characters -= cell_ch;
 
-						C.min_width = MAX(C.min_width, Math::ceil(frame_padding_space + line.indent) + Math::ceil(line.text_buf->get_size().x));
-						C.max_width = MAX(C.max_width, _get_line_max_width(frame, i));
+						table->columns[column].min_width = MAX(table->columns[column].min_width, frame->lines[i].indent + std::ceil(frame->lines[i].text_buf->get_size().x));
+						table->columns[column].max_width = MAX(table->columns[column].max_width, frame->lines[i].indent + std::ceil(frame->lines[i].text_buf->get_non_wrapped_size().x));
 					}
 					idx++;
 				}
-				table->char_count = t_char_count;
-
-				// Compute width for each column.
-				const int available_width = p_width - l.offset.x - theme_cache.table_h_separation * col_count;
-				_update_table_column_width(table, available_width);
-
-				// Resize for elements in the table.
-				idx = 0;
 				for (Item *E : table->subitems) {
 					ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
 					ItemFrame *frame = static_cast<ItemFrame *>(E);
 
-					const int frame_padding_space = Math::ceil(frame->padding.position.x + frame->padding.size.x);
-
-					int column = idx % col_count;
 					float prev_h = 0;
 					for (int i = 0; i < (int)frame->lines.size(); i++) {
-						MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
-						int w = table->columns[column].width - frame_padding_space;
+						int w = base_column_width - frame->padding.position.x - frame->padding.size.x;
 						w = MAX(w, _find_margin(frame->lines[i].from, p_base_font, p_base_font_size) + 1);
 						prev_h = _resize_line(frame, i, p_base_font, p_base_font_size, w, prev_h);
 					}
-					idx++;
 				}
 
-				// Compute size and offset for each element in the table.
-				_update_table_size(table);
+				_set_table_size(table, available_width);
 
 				int row_idx = (table->align_to_row < 0) ? table->rows_baseline.size() - 1 : table->align_to_row;
 				if (table->rows_baseline.size() != 0 && row_idx < (int)table->rows_baseline.size()) {
@@ -872,98 +763,85 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 	return _calculate_line_vertical_offset(l);
 }
 
-void RichTextLabel::_update_table_column_width(ItemTable *p_table, int p_available_width) {
-	const int col_count = p_table->columns.size();
+void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
+	int col_count = p_table->columns.size();
 
-	LocalVector<bool> columns_will_stretch;
-	columns_will_stretch.resize(col_count);
-
-	int total_ratio = 0; // The total ratio of the columns that will stretch.
-	p_table->total_width = 0;
-	float remaining_width = 0; // The available width of the columns that will stretch.
+	// Compute available width and total ratio (for expanders).
+	int total_ratio = 0;
+	int remaining_width = p_available_width;
+	p_table->total_width = theme_cache.table_h_separation;
 
 	for (int i = 0; i < col_count; i++) {
-		ItemTable::Column &C = p_table->columns[i];
-		p_table->total_width += C.min_width;
-		C.width = C.min_width;
-		if (C.max_width > C.min_width) {
-			C.expand = true; // Like a hack.
+		remaining_width -= p_table->columns[i].min_width;
+		if (p_table->columns[i].max_width > p_table->columns[i].min_width) {
+			p_table->columns[i].expand = true;
 		}
-		columns_will_stretch[i] = C.expand;
-		if (columns_will_stretch[i]) {
-			remaining_width += C.min_width;
-			total_ratio += C.expand_ratio;
+		if (p_table->columns[i].expand) {
+			total_ratio += p_table->columns[i].expand_ratio;
 		}
 	}
 
-	int diff = p_available_width - p_table->total_width;
-	if (diff < 0) {
-		diff = 0; // Avoid negative stretch space.
+	// Assign actual widths.
+	for (int i = 0; i < col_count; i++) {
+		p_table->columns[i].width = p_table->columns[i].min_width;
+		if (p_table->columns[i].expand && total_ratio > 0 && remaining_width > 0) {
+			p_table->columns[i].width += p_table->columns[i].expand_ratio * remaining_width / total_ratio;
+		}
+		if (i != col_count - 1) {
+			p_table->total_width += p_table->columns[i].width + theme_cache.table_h_separation;
+		} else {
+			p_table->total_width += p_table->columns[i].width;
+		}
+		p_table->columns[i].width_with_padding = p_table->columns[i].width;
 	}
-	remaining_width += diff;
 
 	// Resize to max_width if needed and distribute the remaining space.
 	bool table_need_fit = true;
 	while (table_need_fit) {
 		table_need_fit = false;
-		float error = 0.0; // Keep track of accumulated error in pixels.
-
+		// Fit slim.
 		for (int i = 0; i < col_count; i++) {
-			if (!columns_will_stretch[i]) {
+			if (!p_table->columns[i].expand || !p_table->columns[i].shrink) {
 				continue;
 			}
-			ItemTable::Column &C = p_table->columns[i];
-
-			float final_pixel_size = remaining_width * C.expand_ratio / total_ratio;
-			error += Math::fract(final_pixel_size);
-
-			if (C.shrink && final_pixel_size > C.max_width) {
-				columns_will_stretch[i] = false;
-				total_ratio -= C.expand_ratio;
+			int dif = p_table->columns[i].width - p_table->columns[i].max_width;
+			if (dif > 0) {
 				table_need_fit = true;
-				remaining_width -= C.max_width;
-				C.width = C.max_width;
-				break;
+				p_table->columns[i].width = p_table->columns[i].max_width;
+				p_table->total_width -= dif;
+				total_ratio -= p_table->columns[i].expand_ratio;
+				p_table->columns[i].width_with_padding = p_table->columns[i].width;
 			}
-
-			if (final_pixel_size < C.min_width) {
-				// If available stretching area is too small for widget,
-				// then remove it from stretching area.
-				columns_will_stretch[i] = false;
-				total_ratio -= C.expand_ratio;
-				table_need_fit = true;
-				remaining_width -= C.min_width;
-				C.width = C.min_width;
-				break;
-			}
-
-			C.width = final_pixel_size;
-			// Dump accumulated error if one pixel or more.
-			if (error >= 1) {
-				C.width += 1;
-				error -= 1;
+		}
+		// Grow.
+		remaining_width = p_available_width - p_table->total_width;
+		if (remaining_width > 0 && total_ratio > 0) {
+			for (int i = 0; i < col_count; i++) {
+				if (p_table->columns[i].expand) {
+					int dif = p_table->columns[i].max_width - p_table->columns[i].width;
+					if (dif > 0) {
+						int slice = p_table->columns[i].expand_ratio * remaining_width / total_ratio;
+						int incr = MIN(dif, slice);
+						p_table->columns[i].width += incr;
+						p_table->total_width += incr;
+						p_table->columns[i].width_with_padding = p_table->columns[i].width;
+					}
+				}
 			}
 		}
 	}
 
-	// Recalculate total width.
-	p_table->total_width = theme_cache.table_h_separation * col_count;
-	for (ItemTable::Column &C : p_table->columns) {
-		p_table->total_width += C.width;
-	}
-}
-
-void RichTextLabel::_update_table_size(ItemTable *p_table) {
-	const int col_count = p_table->columns.size();
-
 	// Update line width and get total height.
 	int idx = 0;
 	p_table->total_height = 0;
 	p_table->rows.clear();
+	p_table->rows_no_padding.clear();
 	p_table->rows_baseline.clear();
 
 	Vector2 offset = Vector2(theme_cache.table_h_separation * 0.5, theme_cache.table_v_separation * 0.5).floor();
 	float row_height = 0.0;
+	float row_top_padding = 0.0;
+	float row_bottom_padding = 0.0;
 	const List<Item *>::Element *prev = p_table->subitems.front();
 
 	for (const List<Item *>::Element *E = prev; E; E = E->next()) {
@@ -971,19 +849,21 @@ void RichTextLabel::_update_table_size(ItemTable *p_table) {
 		ItemFrame *frame = static_cast<ItemFrame *>(E->get());
 
 		int column = idx % col_count;
-		const real_t frame_padding_space = frame->padding.position.x + frame->padding.size.x;
 
-		offset += frame->padding.position;
+		offset.x += frame->padding.position.x;
 		float yofs = 0.0;
 		float prev_h = 0.0;
 		float row_baseline = 0.0;
 		for (int i = 0; i < (int)frame->lines.size(); i++) {
-			Line &line = frame->lines[i];
-			MutexLock sub_lock(line.text_buf->get_mutex());
-			line.text_buf->set_width(p_table->columns[column].width - Math::ceil(frame_padding_space + line.indent));
-			line.offset.y = prev_h;
+			MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
 
-			float h = line.text_buf->get_size().y + (line.text_buf->get_line_count() - 1) * theme_cache.line_separation;
+			frame->lines[i].text_buf->set_width(p_table->columns[column].width);
+			p_table->columns[column].width = MAX(p_table->columns[column].width, std::ceil(frame->lines[i].text_buf->get_size().x));
+			p_table->columns[column].width_with_padding = MAX(p_table->columns[column].width_with_padding, std::ceil(frame->lines[i].text_buf->get_size().x + frame->padding.position.x + frame->padding.size.x));
+
+			frame->lines[i].offset.y = prev_h;
+
+			float h = frame->lines[i].text_buf->get_size().y + (frame->lines[i].text_buf->get_line_count() - 1) * theme_cache.line_separation;
 			if (i > 0) {
 				h += theme_cache.paragraph_separation + theme_cache.line_separation;
 			}
@@ -994,29 +874,49 @@ void RichTextLabel::_update_table_size(ItemTable *p_table) {
 				h = MIN(h, frame->max_size_over.y);
 			}
 			yofs += h;
-			prev_h = line.offset.y + line.text_buf->get_size().y + line.text_buf->get_line_count() * theme_cache.line_separation + theme_cache.paragraph_separation;
+			prev_h = frame->lines[i].offset.y + frame->lines[i].text_buf->get_size().y + frame->lines[i].text_buf->get_line_count() * theme_cache.line_separation + theme_cache.paragraph_separation;
 
-			line.offset += offset;
-			row_baseline = MAX(row_baseline, line.text_buf->get_line_ascent(line.text_buf->get_line_count() - 1));
+			frame->lines[i].offset += offset;
+			row_baseline = MAX(row_baseline, frame->lines[i].text_buf->get_line_ascent(frame->lines[i].text_buf->get_line_count() - 1));
 		}
+		row_top_padding = MAX(row_top_padding, frame->padding.position.y);
+		row_bottom_padding = MAX(row_bottom_padding, frame->padding.size.y);
+		offset.x += p_table->columns[column].width + theme_cache.table_h_separation + frame->padding.size.x;
 
-		offset -= frame->padding.position;
-		offset.x += p_table->columns[column].width + theme_cache.table_h_separation;
-
-		row_height = MAX(yofs + frame->padding.position.y + frame->padding.size.y, row_height);
+		row_height = MAX(yofs, row_height);
 		// Add row height after last column of the row or last cell of the table.
 		if (column == col_count - 1 || E->next() == nullptr) {
 			offset.x = Math::floor(theme_cache.table_h_separation * 0.5);
+			float row_contents_height = row_height;
+			row_height += row_top_padding + row_bottom_padding;
 			row_height += theme_cache.table_v_separation;
-			p_table->rows.push_back(row_height);
-			p_table->rows_baseline.push_back(p_table->total_height + row_baseline + Math::floor(theme_cache.table_v_separation * 0.5));
 			p_table->total_height += row_height;
 			offset.y += row_height;
+			p_table->rows.push_back(row_height);
+			p_table->rows_no_padding.push_back(row_contents_height);
+			p_table->rows_baseline.push_back(p_table->total_height - row_height + row_baseline + Math::floor(theme_cache.table_v_separation * 0.5));
+			for (const List<Item *>::Element *F = prev; F; F = F->next()) {
+				ItemFrame *in_frame = static_cast<ItemFrame *>(F->get());
+				for (int i = 0; i < (int)in_frame->lines.size(); i++) {
+					in_frame->lines[i].offset.y += row_top_padding;
+				}
+				if (in_frame == frame) {
+					break;
+				}
+			}
 			row_height = 0.0;
+			row_top_padding = 0.0;
+			row_bottom_padding = 0.0;
 			prev = E->next();
 		}
 		idx++;
 	}
+
+	// Recalculate total width.
+	p_table->total_width = 0;
+	for (int i = 0; i < col_count; i++) {
+		p_table->total_width += p_table->columns[i].width_with_padding + theme_cache.table_h_separation;
+	}
 }
 
 int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep, const Color &p_base_color, int p_outline_size, const Color &p_outline_color, const Color &p_font_shadow_color, int p_shadow_outline_size, const Point2 &p_shadow_ofs, int &r_processed_glyphs) {
@@ -1208,14 +1108,6 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 								int col_count = table->columns.size();
 								int row_count = table->rows.size();
 
-								Point2 table_ofs = p_ofs + rect.position + off;
-								if (rtl) {
-									table_ofs -= Vector2(h_separation * 0.5, v_separation * 0.5).ceil();
-								} else {
-									table_ofs -= Vector2(h_separation * 0.5, v_separation * 0.5).floor();
-								}
-
-								bool right_has_border = false;
 								int idx = 0;
 								for (Item *E : table->subitems) {
 									ItemFrame *frame = static_cast<ItemFrame *>(E);
@@ -1223,43 +1115,26 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 									int col = idx % col_count;
 									int row = idx / col_count;
 
-									const Size2 cell_size = Size2(table->columns[col].width + h_separation, table->rows[row]);
-
 									if (frame->lines.size() != 0 && row < row_count) {
-										Vector2 coff = frame->lines[0].offset - frame->padding.position;
+										Vector2 coff = frame->lines[0].offset;
 										coff.x -= frame->lines[0].indent;
 										if (rtl) {
 											coff.x = rect.size.width - table->columns[col].width - coff.x;
 										}
-
-										const Point2 cell_ofs = table_ofs + coff;
-										Rect2 cell_rect = Rect2(cell_ofs, cell_size);
-
-										Color row_bg;
 										if (row % 2 == 0) {
-											row_bg = frame->odd_row_bg != Color(0, 0, 0, 0) ? frame->odd_row_bg : odd_row_bg;
+											Color c = frame->odd_row_bg != Color(0, 0, 0, 0) ? frame->odd_row_bg : odd_row_bg;
+											if (c.a > 0.0) {
+												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), c, true);
+											}
 										} else {
-											row_bg = frame->even_row_bg != Color(0, 0, 0, 0) ? frame->even_row_bg : even_row_bg;
-										}
-										if (row_bg.a > 0.0) {
-											if (right_has_border) {
-												// To prevent the border of the right cell from being covered.
-												cell_rect.size.x -= 1;
-												draw_rect(cell_rect, row_bg, true);
-												cell_rect.size.x += 1;
-											} else {
-												draw_rect(cell_rect, row_bg, true);
+											Color c = frame->even_row_bg != Color(0, 0, 0, 0) ? frame->even_row_bg : even_row_bg;
+											if (c.a > 0.0) {
+												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), c, true);
 											}
 										}
-
-										right_has_border = false;
-
 										Color bc = frame->border != Color(0, 0, 0, 0) ? frame->border : border;
 										if (bc.a > 0.0) {
-											if (rtl && col < col_count - 1) {
-												right_has_border = true;
-											}
-											draw_rect(cell_rect, bc, false);
+											draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), bc, false);
 										}
 									}
 
@@ -2179,14 +2054,14 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 	if (l.accessibility_line_element.is_valid()) {
 		return;
 	}
-	l.accessibility_line_element = AccessibilityServer::get_singleton()->create_sub_element(p_id, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+	l.accessibility_line_element = DisplayServer::get_singleton()->accessibility_create_sub_element(p_id, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 
 	MutexLock lock(l.text_buf->get_mutex());
 
 	const RID &line_ae = l.accessibility_line_element;
 
 	Rect2 ae_rect = Rect2(p_ofs, Size2(p_width, l.text_buf->get_size().y + l.text_buf->get_line_count() * theme_cache.line_separation));
-	AccessibilityServer::get_singleton()->update_set_bounds(line_ae, ae_rect);
+	DisplayServer::get_singleton()->accessibility_update_set_bounds(line_ae, ae_rect);
 	ac_element_bounds_cache[line_ae] = ae_rect;
 
 	Item *it_from = l.from;
@@ -2224,15 +2099,15 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 			}
 		}
 
-		l.accessibility_text_element = AccessibilityServer::get_singleton()->create_sub_element(line_ae, AccessibilityServerEnums::AccessibilityRole::ROLE_STATIC_TEXT);
-		AccessibilityServer::get_singleton()->update_set_value(l.accessibility_text_element, l_text);
+		l.accessibility_text_element = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+		DisplayServer::get_singleton()->accessibility_update_set_value(l.accessibility_text_element, l_text);
 		ae_rect = Rect2(p_ofs + off, text_buf->get_size());
-		AccessibilityServer::get_singleton()->update_set_bounds(l.accessibility_text_element, ae_rect);
+		DisplayServer::get_singleton()->accessibility_update_set_bounds(l.accessibility_text_element, ae_rect);
 		ac_element_bounds_cache[l.accessibility_text_element] = ae_rect;
 
-		AccessibilityServer::get_singleton()->update_add_action(l.accessibility_text_element, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, true));
-		AccessibilityServer::get_singleton()->update_add_action(l.accessibility_text_element, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, false));
-		AccessibilityServer::get_singleton()->update_add_action(l.accessibility_text_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)l.from));
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, true));
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, false));
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)l.from));
 	}
 
 	Vector2 off;
@@ -2296,9 +2171,9 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 				switch (it->type) {
 					case ITEM_IMAGE: {
 						ItemImage *img = static_cast<ItemImage *>(it);
-						RID img_ae = AccessibilityServer::get_singleton()->create_sub_element(line_ae, AccessibilityServerEnums::AccessibilityRole::ROLE_IMAGE);
+						RID img_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
 
-						AccessibilityServer::get_singleton()->update_set_name(img_ae, img->alt_text);
+						DisplayServer::get_singleton()->accessibility_update_set_name(img_ae, img->alt_text);
 						if (img->pad) {
 							Size2 pad_size = rect.size.min(img->image->get_size());
 							Vector2 pad_off = (rect.size - pad_size) / 2;
@@ -2306,12 +2181,12 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 						} else {
 							ae_rect = Rect2(p_ofs + rect.position + off, rect.size);
 						}
-						AccessibilityServer::get_singleton()->update_set_bounds(img_ae, ae_rect);
+						DisplayServer::get_singleton()->accessibility_update_set_bounds(img_ae, ae_rect);
 						ac_element_bounds_cache[img_ae] = ae_rect;
 
-						AccessibilityServer::get_singleton()->update_add_action(img_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
-						AccessibilityServer::get_singleton()->update_add_action(img_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
-						AccessibilityServer::get_singleton()->update_add_action(img_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
 
 						it->accessibility_item_element = img_ae;
 					} break;
@@ -2320,31 +2195,31 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 						float h_separation = theme_cache.table_h_separation;
 						float v_separation = theme_cache.table_v_separation;
 
-						RID table_ae = AccessibilityServer::get_singleton()->create_sub_element(line_ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TABLE);
+						RID table_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_TABLE);
 
 						int col_count = table->columns.size();
 						int row_count = table->rows.size();
 
-						AccessibilityServer::get_singleton()->update_set_name(table_ae, table->name);
-						AccessibilityServer::get_singleton()->update_set_role(table_ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TABLE);
-						AccessibilityServer::get_singleton()->update_set_table_column_count(table_ae, col_count);
-						AccessibilityServer::get_singleton()->update_set_table_row_count(table_ae, row_count);
+						DisplayServer::get_singleton()->accessibility_update_set_name(table_ae, table->name);
+						DisplayServer::get_singleton()->accessibility_update_set_role(table_ae, DisplayServer::AccessibilityRole::ROLE_TABLE);
+						DisplayServer::get_singleton()->accessibility_update_set_table_column_count(table_ae, col_count);
+						DisplayServer::get_singleton()->accessibility_update_set_table_row_count(table_ae, row_count);
 						ae_rect = Rect2(p_ofs + rect.position + off + Vector2(0, TS->shaped_text_get_ascent(rid)), rect.size);
-						AccessibilityServer::get_singleton()->update_set_bounds(table_ae, ae_rect);
+						DisplayServer::get_singleton()->accessibility_update_set_bounds(table_ae, ae_rect);
 						ac_element_bounds_cache[table_ae] = ae_rect;
 
-						AccessibilityServer::get_singleton()->update_add_action(table_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
-						AccessibilityServer::get_singleton()->update_add_action(table_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
-						AccessibilityServer::get_singleton()->update_add_action(table_ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
 
 						Vector<RID> row_aes;
 						Vector2 row_off = Vector2(0, TS->shaped_text_get_ascent(rid));
 						for (int j = 0; j < row_count; j++) {
-							RID row_ae = AccessibilityServer::get_singleton()->create_sub_element(table_ae, AccessibilityServerEnums::AccessibilityRole::ROLE_ROW);
+							RID row_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(table_ae, DisplayServer::AccessibilityRole::ROLE_ROW);
 
-							AccessibilityServer::get_singleton()->update_set_table_row_index(row_ae, j);
+							DisplayServer::get_singleton()->accessibility_update_set_table_row_index(row_ae, j);
 							ae_rect = Rect2(p_ofs + rect.position + off + row_off, Size2(rect.size.x, table->rows[j]));
-							AccessibilityServer::get_singleton()->update_set_bounds(row_ae, ae_rect);
+							DisplayServer::get_singleton()->accessibility_update_set_bounds(row_ae, ae_rect);
 							ac_element_bounds_cache[row_ae] = ae_rect;
 							row_off.y += table->rows[j];
 
@@ -2359,7 +2234,7 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 							int row = idx / col_count;
 
 							for (int j = 0; j < (int)frame->lines.size(); j++) {
-								RID cell_ae = AccessibilityServer::get_singleton()->create_sub_element(row_aes[row], AccessibilityServerEnums::AccessibilityRole::ROLE_CELL);
+								RID cell_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(row_aes[row], DisplayServer::AccessibilityRole::ROLE_CELL);
 
 								if (frame->lines.size() != 0 && row < row_count) {
 									Vector2 coff = frame->lines[0].offset;
@@ -2368,10 +2243,10 @@ void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int
 										coff.x = rect.size.width - table->columns[col].width - coff.x;
 									}
 									ae_rect = Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows[row]));
-									AccessibilityServer::get_singleton()->update_set_bounds(cell_ae, ae_rect);
+									DisplayServer::get_singleton()->accessibility_update_set_bounds(cell_ae, ae_rect);
 									ac_element_bounds_cache[cell_ae] = ae_rect;
 								}
-								AccessibilityServer::get_singleton()->update_set_table_cell_position(cell_ae, row, col);
+								DisplayServer::get_singleton()->accessibility_update_set_table_cell_position(cell_ae, row, col);
 
 								_accessibility_update_line(cell_ae, frame, j, p_ofs + rect.position + off + Vector2(0, frame->lines[j].offset.y), rect.size.x, p_vsep);
 							}
@@ -2462,7 +2337,7 @@ void RichTextLabel::_invalidate_accessibility() {
 			ItemFrame *fr = static_cast<ItemFrame *>(it);
 			for (size_t i = 0; i < fr->lines.size(); i++) {
 				if (fr->lines[i].accessibility_line_element.is_valid()) {
-					AccessibilityServer::get_singleton()->free_element(fr->lines[i].accessibility_line_element);
+					DisplayServer::get_singleton()->accessibility_free_element(fr->lines[i].accessibility_line_element);
 				}
 				fr->lines[i].accessibility_line_element = RID();
 				fr->lines[i].accessibility_text_element = RID();
@@ -2517,29 +2392,29 @@ void RichTextLabel::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &RichTextLabel::_accessibility_action_menu));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &RichTextLabel::_accessibility_scroll_down));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &RichTextLabel::_accessibility_scroll_up));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &RichTextLabel::_accessibility_scroll_set));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &RichTextLabel::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &RichTextLabel::_accessibility_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &RichTextLabel::_accessibility_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &RichTextLabel::_accessibility_scroll_set));
 
 			if (_validate_line_caches()) {
-				AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_BUSY, false);
+				DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_BUSY, false);
 			} else {
-				AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_BUSY, true);
+				DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_BUSY, true);
 				return; // Do not update internal elements if threaded procesisng is not done.
 			}
 
 			if (accessibility_scroll_element.is_null()) {
-				accessibility_scroll_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 			}
 			Rect2 text_rect = _get_text_rect();
 
 			Transform2D scroll_xform;
 			scroll_xform.set_origin(Vector2i(0, -vscroll->get_value()));
-			AccessibilityServer::get_singleton()->update_set_transform(accessibility_scroll_element, scroll_xform);
-			AccessibilityServer::get_singleton()->update_set_bounds(accessibility_scroll_element, text_rect);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, text_rect);
 
 			MutexLock data_lock(data_mutex);
 
@@ -2862,82 +2737,38 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 				int c_index = 0;
 				bool outside;
 
-				selection.selection_mode = Selection::SINGLE_CLICK;
+				selection.double_click = false;
 				selection.drag_attempt = false;
 
-				// Detect triple-click.
-				const int triple_click_timeout = 600;
-				const int triple_click_tolerance = 5;
-				bool is_triple_click = (selection.enabled && (OS::get_singleton()->get_ticks_msec() - last_double_click) < (uint64_t)triple_click_timeout && b->get_position().distance_to(last_double_click_pos) < triple_click_tolerance);
-
-				if (is_triple_click) {
-					// Triple-click: select paragraph.
-					last_double_click = 0;
-
-					_find_click(main, b->get_position(), &c_frame, &c_line, &c_item, &c_index, &outside, false);
-
-					if (c_frame) {
-						const Line &l = c_frame->lines[c_line];
-
-						selection.from_frame = c_frame;
-						selection.from_line = c_line;
-						selection.from_item = c_item;
-						selection.from_char = 0;
-
-						selection.to_frame = c_frame;
-						selection.to_line = c_line;
-						selection.to_item = c_item;
-						selection.to_char = l.char_count;
-
+				_find_click(main, b->get_position(), &c_frame, &c_line, &c_item, &c_index, &outside, false);
+				if (c_item != nullptr) {
+					if (selection.enabled) {
 						selection.click_frame = c_frame;
 						selection.click_item = c_item;
 						selection.click_line = c_line;
 						selection.click_char = c_index;
 
-						selection.active = true;
-						selection.selection_mode = Selection::TRIPLE_CLICK;
-						if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
-							DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
+						// Erase previous selection.
+						if (selection.active) {
+							if (drag_and_drop_selection_enabled && _is_click_inside_selection()) {
+								selection.drag_attempt = true;
+								selection.click_item = nullptr;
+							} else {
+								selection.from_frame = nullptr;
+								selection.from_line = 0;
+								selection.from_item = nullptr;
+								selection.from_char = 0;
+								selection.to_frame = nullptr;
+								selection.to_line = 0;
+								selection.to_item = nullptr;
+								selection.to_char = 0;
+								deselect();
+							}
 						}
 
-						is_selecting_text = true;
-						click_select_held->start();
-
-						queue_accessibility_update();
-						queue_redraw();
-					}
-				} else {
-					// Regular single click.
-					_find_click(main, b->get_position(), &c_frame, &c_line, &c_item, &c_index, &outside, false);
-					if (c_item != nullptr) {
-						if (selection.enabled) {
-							selection.click_frame = c_frame;
-							selection.click_item = c_item;
-							selection.click_line = c_line;
-							selection.click_char = c_index;
-
-							// Erase previous selection.
-							if (selection.active) {
-								if (drag_and_drop_selection_enabled && _is_click_inside_selection()) {
-									selection.drag_attempt = true;
-									selection.click_item = nullptr;
-								} else {
-									selection.from_frame = nullptr;
-									selection.from_line = 0;
-									selection.from_item = nullptr;
-									selection.from_char = 0;
-									selection.to_frame = nullptr;
-									selection.to_line = 0;
-									selection.to_item = nullptr;
-									selection.to_char = 0;
-									deselect();
-								}
-							}
-
-							if (!selection.drag_attempt) {
-								is_selecting_text = true;
-								click_select_held->start();
-							}
+						if (!selection.drag_attempt) {
+							is_selecting_text = true;
+							click_select_held->start();
 						}
 					}
 				}
@@ -2971,7 +2802,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 							selection.to_char = words[i + 1];
 
 							selection.active = true;
-							if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+							if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 								DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 							}
 							queue_accessibility_update();
@@ -2985,14 +2816,12 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 					selection.click_line = c_line;
 					selection.click_char = c_index;
 
-					selection.selection_mode = Selection::DOUBLE_CLICK;
-					last_double_click = OS::get_singleton()->get_ticks_msec();
-					last_double_click_pos = b->get_position();
+					selection.double_click = true;
 					is_selecting_text = true;
 					click_select_held->start();
 				}
 			} else if (!b->is_pressed()) {
-				if (selection.enabled && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+				if (selection.enabled && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 					DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 				}
 				selection.click_item = nullptr;
@@ -3292,7 +3121,7 @@ void RichTextLabel::_update_selection() {
 			const Line &l2 = selection.click_frame->lines[selection.click_line];
 			if (l1.char_offset + c_index < l2.char_offset + selection.click_char) {
 				swap = true;
-			} else if (l1.char_offset + c_index == l2.char_offset + selection.click_char && selection.selection_mode == Selection::SINGLE_CLICK) {
+			} else if (l1.char_offset + c_index == l2.char_offset + selection.click_char && !selection.double_click) {
 				deselect();
 				return;
 			}
@@ -3305,11 +3134,7 @@ void RichTextLabel::_update_selection() {
 			SWAP(selection.from_char, selection.to_char);
 		}
 
-		if (selection.selection_mode == Selection::TRIPLE_CLICK && c_frame) {
-			// Expand the selection to paragraph edges.
-			selection.from_char = 0;
-			selection.to_char = selection.to_frame->lines[selection.to_line].char_count;
-		} else if (selection.selection_mode == Selection::DOUBLE_CLICK && c_frame) {
+		if (selection.double_click && c_frame) {
 			// Expand the selection to word edges.
 
 			Line *l = &selection.from_frame->lines[selection.from_line];
@@ -3975,7 +3800,7 @@ _FORCE_INLINE_ float RichTextLabel::_update_scroll_exceeds(float p_total_height,
 	updating_scroll = true;
 
 	float total_height = p_total_height;
-	bool exceeds = scroll_active && p_total_height > p_ctrl_height && p_width > vscroll->get_combined_minimum_size().width;
+	bool exceeds = p_total_height > p_ctrl_height && scroll_active;
 	if (exceeds != scroll_visible) {
 		if (exceeds) {
 			scroll_visible = true;
@@ -5359,8 +5184,6 @@ void RichTextLabel::set_scroll_active(bool p_active) {
 
 	scroll_active = p_active;
 	vscroll->set_drag_node_enabled(p_active);
-	vscroll->set_visible(p_active);
-	_apply_translation(); // without this, RichLabelText is not updated in the editor/game.
 	queue_redraw();
 }
 
@@ -5914,7 +5737,6 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			pos = brk_end + 1;
 			tag_stack.push_front("lang");
 		} else if (tag == "br") {
-			// `\n` starts a new paragraph, `\r` just adds a break to existing one.
 			add_text("\r");
 			pos = brk_end + 1;
 		} else if (tag == "p") {
@@ -7101,41 +6923,38 @@ bool RichTextLabel::search(const String &p_string, bool p_from_selection, bool p
 	}
 }
 
-String RichTextLabel::_get_line_text(ItemFrame *p_frame, int p_line) const {
+String RichTextLabel::_get_line_text(ItemFrame *p_frame, int p_line, Selection p_selection) const {
 	String txt;
 
 	ERR_FAIL_NULL_V(p_frame, txt);
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), txt);
 
-	int start = 0; // Unless the current line is the `from` line.
-	if (!selection.from_line_found && p_frame == selection.from_frame) {
-		if (p_line < selection.from_line) {
-			return txt; // Skip the lines with smaller line numbers in the same `from` frame.
-		}
-		selection.from_line_found = true;
-		start = selection.from_char;
-	}
-	const bool from_this = selection.from_line_found; // Used to detect cases starting from a sub-frame.
-
 	Line &l = p_frame->lines[p_line];
 
 	Item *it_to = (p_line + 1 < (int)p_frame->lines.size()) ? p_frame->lines[p_line + 1].from : nullptr;
-	for (Item *it = l.from; !selection.to_line_found && it && it != it_to; it = _get_next_item(it)) {
+	int end_idx = 0;
+	if (it_to != nullptr) {
+		end_idx = it_to->index;
+	} else {
+		for (Item *it = l.from; it; it = _get_next_item(it)) {
+			end_idx = it->index + 1;
+		}
+	}
+	for (Item *it = l.from; it && it != it_to; it = _get_next_item(it)) {
 		if (it->type == ITEM_TABLE) {
 			ItemTable *table = static_cast<ItemTable *>(it);
 			for (Item *E : table->subitems) {
 				ERR_CONTINUE(E->type != ITEM_FRAME); // Children should all be frames.
 				ItemFrame *frame = static_cast<ItemFrame *>(E);
-				for (int i = 0; !selection.to_line_found && i < (int)frame->lines.size(); i++) {
-					txt += _get_line_text(frame, i);
-				}
-				if (selection.to_line_found) {
-					break;
+				for (int i = 0; i < (int)frame->lines.size(); i++) {
+					txt += _get_line_text(frame, i, p_selection);
 				}
 			}
+		}
+		if ((p_selection.to_item != nullptr) && (p_selection.to_item->index < l.from->index)) {
 			continue;
 		}
-		if (!selection.from_line_found) {
+		if ((p_selection.from_item != nullptr) && (p_selection.from_item->index >= end_idx)) {
 			continue;
 		}
 		if (it->type == ITEM_DROPCAP) {
@@ -7150,26 +6969,12 @@ String RichTextLabel::_get_line_text(ItemFrame *p_frame, int p_line) const {
 			txt += " ";
 		}
 	}
-
-	if (!selection.from_line_found) {
-		return txt; // Empty.
+	if ((l.from != nullptr) && (p_frame == p_selection.to_frame) && (p_selection.to_item != nullptr) && (p_selection.to_item->index >= l.from->index) && (p_selection.to_item->index < end_idx)) {
+		txt = txt.substr(0, p_selection.to_char);
 	}
-
-	int chars = -1; // Unless the current line is the `to` line.
-	if (p_frame == selection.to_frame && p_line == selection.to_line) {
-		selection.to_line_found = true;
-
-		if (from_this ^ selection.from_line_found) {
-			// For cases text from child frame to parent frame is considered to be on the same line,
-			// even if the line numbers are different. `start` has been reset to 0.
-			chars = selection.to_char - selection.from_char;
-		} else {
-			chars = selection.to_char - start;
-		}
+	if ((l.from != nullptr) && (p_frame == p_selection.from_frame) && (p_selection.from_item != nullptr) && (p_selection.from_item->index >= l.from->index) && (p_selection.from_item->index < end_idx)) {
+		txt = txt.substr(p_selection.from_char);
 	}
-
-	txt = txt.substr(start, chars);
-
 	return txt;
 }
 
@@ -7208,12 +7013,8 @@ String RichTextLabel::get_selected_text() const {
 
 	String txt;
 	int to_line = main->first_invalid_line.load();
-
-	selection.from_line_found = false;
-	selection.to_line_found = false;
-
-	for (int i = 0; !selection.to_line_found && i < to_line; i++) {
-		txt += _get_line_text(main, i);
+	for (int i = 0; i < to_line; i++) {
+		txt += _get_line_text(main, i, selection);
 	}
 
 	if (selection_modifier.is_valid()) {
@@ -8258,11 +8059,11 @@ void RichTextLabel::_update_context_menu() {
 
 	int idx = -1;
 
-#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
+#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled)                                                  \
+	idx = m_menu->get_item_index(m_id);                                                                                \
+	if (idx >= 0) {                                                                                                    \
 		m_menu->set_item_accelerator(idx, shortcut_keys_enabled ? _get_menu_action_accelerator(m_action) : Key::NONE); \
-		m_menu->set_item_disabled(idx, m_disabled); \
+		m_menu->set_item_disabled(idx, m_disabled);                                                                    \
 	}
 
 	MENU_ITEM_ACTION_DISABLED(menu, MENU_COPY, "ui_copy", !selection.enabled)
diff --git a/engine/scene/gui/rich_text_label.h b/engine/scene/gui/rich_text_label.h
index 2712a69a..021e677d 100644
--- a/engine/scene/gui/rich_text_label.h
+++ b/engine/scene/gui/rich_text_label.h
@@ -32,18 +32,15 @@
 
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
-#include "scene/gui/control.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/resources/image_texture.h"
 #include "scene/resources/text_paragraph.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/themes/editor_scale.h"
 #endif
 
-class PopupMenu;
-class Texture2D;
-class Timer;
-class VScrollBar;
-
 class CharFXTransform;
 class RichTextEffect;
 
@@ -187,7 +184,13 @@ private:
 		Line() {
 			text_buf.instantiate();
 		}
-		~Line();
+		~Line() {
+			if (accessibility_line_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(accessibility_line_element);
+				accessibility_line_element = RID();
+				accessibility_text_element = RID();
+			}
+		}
 
 		_FORCE_INLINE_ float get_height(float p_line_separation, float p_paragraph_separation) const {
 			return offset.y + text_buf->get_size().y + text_buf->get_line_count() * p_line_separation + p_paragraph_separation;
@@ -262,7 +265,14 @@ private:
 		Color ol_color;
 		Rect2 dropcap_margins;
 		ItemDropcap() { type = ITEM_DROPCAP; }
-		~ItemDropcap();
+		~ItemDropcap() {
+			if (font.is_valid()) {
+				RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
+				if (owner_rtl) {
+					font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts));
+				}
+			}
+		}
 	};
 
 	struct ItemImage : public Item {
@@ -279,7 +289,17 @@ private:
 		Variant key;
 		String tooltip;
 		ItemImage() { type = ITEM_IMAGE; }
-		~ItemImage();
+		~ItemImage() {
+			if (image.is_valid()) {
+				RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
+				if (owner_rtl) {
+					if (owner_rtl->hr_list.has(rid)) {
+						owner_rtl->hr_list.erase((rid));
+					}
+					image->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_texture_changed));
+				}
+			}
+		}
 	};
 
 	struct ItemFont : public Item {
@@ -289,7 +309,14 @@ private:
 		bool def_size = false;
 		int font_size = 0;
 		ItemFont() { type = ITEM_FONT; }
-		~ItemFont();
+		~ItemFont() {
+			if (font.is_valid()) {
+				RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
+				if (owner_rtl) {
+					font->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_invalidate_fonts));
+				}
+			}
+		}
 	};
 
 	struct ItemFontSize : public Item {
@@ -381,13 +408,13 @@ private:
 
 		LocalVector<Column> columns;
 		LocalVector<float> rows;
+		LocalVector<float> rows_no_padding;
 		LocalVector<float> rows_baseline;
 		String name;
 
 		int align_to_row = -1;
 		int total_width = 0;
 		int total_height = 0;
-		int char_count = 0;
 		InlineAlignment inline_align = INLINE_ALIGNMENT_TOP;
 		ItemTable() { type = ITEM_TABLE; }
 	};
@@ -579,7 +606,7 @@ private:
 
 	void _texture_changed(RID p_item);
 
-	static inline RID_PtrOwner<Item, true> items;
+	RID_PtrOwner<Item> items;
 	List<String> tag_stack;
 	HashSet<RID> hr_list;
 
@@ -598,28 +625,19 @@ private:
 		int from_line = 0;
 		Item *from_item = nullptr;
 		int from_char = 0;
-		mutable bool from_line_found = false;
 
 		ItemFrame *to_frame = nullptr;
 		int to_line = 0;
 		Item *to_item = nullptr;
 		int to_char = 0;
-		mutable bool to_line_found = false;
 
-		enum SelectionMode {
-			SINGLE_CLICK,
-			DOUBLE_CLICK,
-			TRIPLE_CLICK,
-		};
-		SelectionMode selection_mode = SINGLE_CLICK;
+		bool double_click = false; // Selecting whole words?
 		bool active = false; // anything selected? i.e. from, to, etc. valid?
 		bool enabled = false; // allow selections?
 		bool drag_attempt = false;
 	};
 
 	Selection selection;
-	uint64_t last_double_click = 0;
-	Vector2 last_double_click_pos;
 	Callable selection_modifier;
 	bool deselect_on_focus_loss_enabled = true;
 	bool drag_and_drop_selection_enabled = true;
@@ -645,7 +663,7 @@ private:
 	bool _is_click_inside_selection() const;
 	void _find_click(ItemFrame *p_frame, const Point2i &p_click, ItemFrame **r_click_frame = nullptr, int *r_click_line = nullptr, Item **r_click_item = nullptr, int *r_click_char = nullptr, bool *r_outside = nullptr, bool p_meta = false);
 
-	String _get_line_text(ItemFrame *p_frame, int p_line) const;
+	String _get_line_text(ItemFrame *p_frame, int p_line, Selection p_sel) const;
 	bool _search_table_cell(ItemTable *p_table, List<Item *>::Element *p_cell, const String &p_string, bool p_reverse_search, int p_from_line);
 	bool _search_table(ItemTable *p_table, List<Item *>::Element *p_from, const String &p_string, bool p_reverse_search);
 	bool _search_line(ItemFrame *p_frame, int p_line, const String &p_string, int p_char_idx, bool p_reverse_search);
@@ -653,9 +671,7 @@ private:
 	float _shape_line(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size, int p_width, float p_h, int *r_char_offset);
 	float _resize_line(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size, int p_width, float p_h);
 
-	int _get_line_max_width(ItemFrame *p_frame, int p_line) const;
-	void _update_table_column_width(ItemTable *p_table, int p_available_width);
-	void _update_table_size(ItemTable *p_table);
+	void _set_table_size(ItemTable *p_table, int p_available_width);
 
 	void _update_line_font(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size);
 	int _draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep, const Color &p_base_color, int p_outline_size, const Color &p_outline_color, const Color &p_font_shadow_color, int p_shadow_outline_size, const Point2 &p_shadow_ofs, int &r_processed_glyphs);
diff --git a/engine/scene/gui/scroll_bar.cpp b/engine/scene/gui/scroll_bar.cpp
index c4ab2ca8..6639df7e 100644
--- a/engine/scene/gui/scroll_bar.cpp
+++ b/engine/scene/gui/scroll_bar.cpp
@@ -30,12 +30,8 @@
 
 #include "scroll_bar.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
 
 bool ScrollBar::focus_by_default = false;
 
@@ -263,7 +259,7 @@ void ScrollBar::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SCROLL_BAR);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SCROLL_BAR);
 		} break;
 
 		case NOTIFICATION_DRAW: {
diff --git a/engine/scene/gui/scroll_container.cpp b/engine/scene/gui/scroll_container.cpp
index abd43332..7794443d 100644
--- a/engine/scene/gui/scroll_container.cpp
+++ b/engine/scene/gui/scroll_container.cpp
@@ -31,14 +31,10 @@
 #include "scroll_container.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
 
 Size2 ScrollContainer::get_minimum_size() const {
 	// Calculated in this function, as it needs to traverse all child controls once to calculate;
@@ -146,12 +142,11 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 	if (mb.is_valid()) {
 		if (mb->is_pressed()) {
 			bool scroll_value_modified = false;
-			bool swap_axes = scroll_horizontal_by_default != mb->is_shift_pressed();
 
 			bool v_scroll_hidden = !v_scroll->is_visible() && vertical_scroll_mode != SCROLL_MODE_SHOW_NEVER;
 			if (mb->get_button_index() == MouseButton::WHEEL_UP) {
 				// By default, the vertical orientation takes precedence. This is an exception.
-				if ((h_scroll_enabled && swap_axes) || v_scroll_hidden) {
+				if ((h_scroll_enabled && mb->is_shift_pressed()) || v_scroll_hidden) {
 					h_scroll->scroll(-h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (v_scroll_enabled) {
@@ -160,7 +155,7 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 				}
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_DOWN) {
-				if ((h_scroll_enabled && swap_axes) || v_scroll_hidden) {
+				if ((h_scroll_enabled && mb->is_shift_pressed()) || v_scroll_hidden) {
 					h_scroll->scroll(h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (v_scroll_enabled) {
@@ -172,7 +167,7 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 			bool h_scroll_hidden = !h_scroll->is_visible() && horizontal_scroll_mode != SCROLL_MODE_SHOW_NEVER;
 			if (mb->get_button_index() == MouseButton::WHEEL_LEFT) {
 				// By default, the horizontal orientation takes precedence. This is an exception.
-				if ((v_scroll_enabled && swap_axes) || h_scroll_hidden) {
+				if ((v_scroll_enabled && mb->is_shift_pressed()) || h_scroll_hidden) {
 					v_scroll->scroll(-v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (h_scroll_enabled) {
@@ -181,7 +176,7 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 				}
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_RIGHT) {
-				if ((v_scroll_enabled && swap_axes) || h_scroll_hidden) {
+				if ((v_scroll_enabled && mb->is_shift_pressed()) || h_scroll_hidden) {
 					v_scroll->scroll(v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (h_scroll_enabled) {
@@ -402,7 +397,7 @@ void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {
 }
 
 void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
@@ -410,7 +405,7 @@ void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
 }
 
 void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
@@ -418,7 +413,7 @@ void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
 }
 
 void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
@@ -426,7 +421,7 @@ void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
 }
 
 void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
@@ -439,17 +434,13 @@ void ScrollContainer::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			if (is_accessibility_region()) {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_REGION);
-			} else {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SCROLL_VIEW);
-			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SCROLL_VIEW);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_down));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_left));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_right));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_up));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_set));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_set));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -731,14 +722,6 @@ ScrollContainer::ScrollMode ScrollContainer::get_vertical_scroll_mode() const {
 	return vertical_scroll_mode;
 }
 
-void ScrollContainer::set_scroll_horizontal_by_default(bool p_enable) {
-	scroll_horizontal_by_default = p_enable;
-}
-
-bool ScrollContainer::is_scroll_horizontal_by_default() const {
-	return scroll_horizontal_by_default;
-}
-
 int ScrollContainer::get_deadzone() const {
 	return deadzone;
 }
@@ -835,9 +818,6 @@ void ScrollContainer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_vertical_scroll_mode", "enable"), &ScrollContainer::set_vertical_scroll_mode);
 	ClassDB::bind_method(D_METHOD("get_vertical_scroll_mode"), &ScrollContainer::get_vertical_scroll_mode);
 
-	ClassDB::bind_method(D_METHOD("set_scroll_horizontal_by_default", "enable"), &ScrollContainer::set_scroll_horizontal_by_default);
-	ClassDB::bind_method(D_METHOD("is_scroll_horizontal_by_default"), &ScrollContainer::is_scroll_horizontal_by_default);
-
 	ClassDB::bind_method(D_METHOD("set_deadzone", "deadzone"), &ScrollContainer::set_deadzone);
 	ClassDB::bind_method(D_METHOD("get_deadzone"), &ScrollContainer::get_deadzone);
 
@@ -870,7 +850,6 @@ void ScrollContainer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "scroll_vertical_custom_step", PROPERTY_HINT_RANGE, "-1,4096,suffix:px"), "set_vertical_custom_step", "get_vertical_custom_step");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "horizontal_scroll_mode", PROPERTY_HINT_ENUM, "Disabled,Auto,Always Show,Never Show,Reserve"), "set_horizontal_scroll_mode", "get_horizontal_scroll_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vertical_scroll_mode", PROPERTY_HINT_ENUM, "Disabled,Auto,Always Show,Never Show,Reserve"), "set_vertical_scroll_mode", "get_vertical_scroll_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scroll_horizontal_by_default"), "set_scroll_horizontal_by_default", "is_scroll_horizontal_by_default");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "scroll_deadzone"), "set_deadzone", "get_deadzone");
 
 	ADD_GROUP("Scroll Hint", "");
@@ -939,13 +918,11 @@ ScrollContainer::ScrollContainer() {
 	h_scroll->set_name("_h_scroll");
 	add_child(h_scroll, false, INTERNAL_MODE_BACK);
 	h_scroll->connect(SceneStringName(value_changed), callable_mp(this, &ScrollContainer::_scroll_moved));
-	h_scroll->set_focus_mode(FOCUS_NONE);
 
 	v_scroll = memnew(VScrollBar);
 	v_scroll->set_name("_v_scroll");
 	add_child(v_scroll, false, INTERNAL_MODE_BACK);
 	v_scroll->connect(SceneStringName(value_changed), callable_mp(this, &ScrollContainer::_scroll_moved));
-	v_scroll->set_focus_mode(FOCUS_NONE);
 
 	// We need to use a PanelContainer for the focus style instead of just drawing it directly with RenderingService
 	// due to a clippling issues. The Control that is being scrolled will be over the focus border because both will be
diff --git a/engine/scene/gui/scroll_container.h b/engine/scene/gui/scroll_container.h
index 37c9c611..6ef12617 100644
--- a/engine/scene/gui/scroll_container.h
+++ b/engine/scene/gui/scroll_container.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "scene/gui/container.h"
-#include "scene/gui/scroll_bar.h"
+#include "container.h"
+
+#include "scroll_bar.h"
 
 class PanelContainer;
 class TextureRect;
@@ -86,7 +87,6 @@ private:
 	bool follow_focus = false;
 	int scroll_border = 20;
 	int scroll_speed = 12;
-	bool scroll_horizontal_by_default = false;
 
 	ScrollHintMode scroll_hint_mode = SCROLL_HINT_MODE_DISABLED;
 	bool tile_scroll_hint = false;
@@ -156,9 +156,6 @@ public:
 	void set_vertical_scroll_mode(ScrollMode p_mode);
 	ScrollMode get_vertical_scroll_mode() const;
 
-	void set_scroll_horizontal_by_default(bool p_enable);
-	bool is_scroll_horizontal_by_default() const;
-
 	void set_deadzone(int p_deadzone);
 	int get_deadzone() const;
 
diff --git a/engine/scene/gui/slider.cpp b/engine/scene/gui/slider.cpp
index 35a41536..eb48e52c 100644
--- a/engine/scene/gui/slider.cpp
+++ b/engine/scene/gui/slider.cpp
@@ -30,11 +30,7 @@
 
 #include "slider.h"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 Size2 Slider::get_minimum_size() const {
 	Size2i ss = theme_cache.slider_style->get_minimum_size();
@@ -247,7 +243,7 @@ void Slider::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SLIDER);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SLIDER);
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
diff --git a/engine/scene/gui/spin_box.cpp b/engine/scene/gui/spin_box.cpp
index 8d54fadb..f647b2f2 100644
--- a/engine/scene/gui/spin_box.cpp
+++ b/engine/scene/gui/spin_box.cpp
@@ -32,11 +32,8 @@
 
 #include "core/input/input.h"
 #include "core/math/expression.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
 
 void SpinBoxLineEdit::_accessibility_action_inc(const Variant &p_data) {
 	SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
@@ -54,15 +51,6 @@ void SpinBoxLineEdit::_accessibility_action_dec(const Variant &p_data) {
 	}
 }
 
-String SpinBoxLineEdit::_get_accessibility_name() const {
-	SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
-	if (parent_sb) {
-		return parent_sb->_get_accessibility_name();
-	} else {
-		return Control::_get_accessibility_name();
-	}
-}
-
 void SpinBoxLineEdit::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
 	switch (p_what) {
@@ -72,19 +60,20 @@ void SpinBoxLineEdit::_notification(int p_what) {
 
 			SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
 			if (parent_sb) {
-				AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SPIN_BUTTON);
-				AccessibilityServer::get_singleton()->update_set_description(ae, parent_sb->get_accessibility_description());
-				AccessibilityServer::get_singleton()->update_set_live(ae, parent_sb->get_accessibility_live());
-				AccessibilityServer::get_singleton()->update_set_num_value(ae, parent_sb->get_value());
-				AccessibilityServer::get_singleton()->update_set_num_range(ae, parent_sb->get_min(), parent_sb->get_max());
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON);
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, parent_sb->get_accessibility_name());
+				DisplayServer::get_singleton()->accessibility_update_set_description(ae, parent_sb->get_accessibility_description());
+				DisplayServer::get_singleton()->accessibility_update_set_live(ae, parent_sb->get_accessibility_live());
+				DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, parent_sb->get_value());
+				DisplayServer::get_singleton()->accessibility_update_set_num_range(ae, parent_sb->get_min(), parent_sb->get_max());
 				if (parent_sb->get_step() > 0) {
-					AccessibilityServer::get_singleton()->update_set_num_step(ae, parent_sb->get_step());
+					DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, parent_sb->get_step());
 				} else {
-					AccessibilityServer::get_singleton()->update_set_num_step(ae, 1);
+					DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, 1);
 				}
-				//AccessibilityServer::get_singleton()->update_set_num_jump(ae, ???);
-				AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_dec));
-				AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_inc));
+				//DisplayServer::get_singleton()->accessibility_update_set_num_jump(ae, ???);
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_dec));
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_inc));
 			}
 		} break;
 	}
@@ -229,9 +218,9 @@ void SpinBox::_range_click_timeout() {
 void SpinBox::_release_mouse_from_drag_mode() {
 	if (drag.enabled) {
 		drag.enabled = false;
-		Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_HIDDEN);
+		Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_HIDDEN);
 		warp_mouse(drag.capture_pos);
-		Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+		Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 	}
 }
 
@@ -359,7 +348,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 			double diff_y = -0.01 * Math::pow(Math::abs(drag.diff_y), 1.8) * SIGN(drag.diff_y);
 			set_value(CLAMP(drag.base_val + step * diff_y, get_min(), get_max()));
 		} else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) {
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 			drag.enabled = true;
 			drag.base_val = get_value();
 			drag.diff_y = 0;
diff --git a/engine/scene/gui/spin_box.h b/engine/scene/gui/spin_box.h
index 8a4f7a5c..032349db 100644
--- a/engine/scene/gui/spin_box.h
+++ b/engine/scene/gui/spin_box.h
@@ -42,8 +42,6 @@ protected:
 
 	void _accessibility_action_inc(const Variant &p_data);
 	void _accessibility_action_dec(const Variant &p_data);
-
-	virtual String _get_accessibility_name() const override;
 };
 
 class SpinBox : public Range {
diff --git a/engine/scene/gui/split_container.compat.inc b/engine/scene/gui/split_container.compat.inc
index 11a10125..1833290b 100644
--- a/engine/scene/gui/split_container.compat.inc
+++ b/engine/scene/gui/split_container.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "split_container.h"
-
-#include "core/object/class_db.h"
-
 void SplitContainer::_clamp_split_offset_compat_90411() {
 	clamp_split_offset(0);
 }
@@ -42,4 +38,4 @@ void SplitContainer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("clamp_split_offset"), &SplitContainer::_clamp_split_offset_compat_90411);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/split_container.cpp b/engine/scene/gui/split_container.cpp
index 995f0bd4..7992b480 100644
--- a/engine/scene/gui/split_container.cpp
+++ b/engine/scene/gui/split_container.cpp
@@ -31,119 +31,9 @@
 #include "split_container.h"
 #include "split_container.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/viewport.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-
-void SplitContainerMultiDragger::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_MOUSE_ENTER: {
-			if (!dragging && !Input::get_singleton()->is_mouse_button_pressed(MouseButton::LEFT)) {
-				split_container->show_grabber_icon(dragger_index);
-			}
-		} break;
-
-		case NOTIFICATION_MOUSE_EXIT: {
-			if (!dragging && !Input::get_singleton()->is_mouse_button_pressed(MouseButton::LEFT)) {
-				split_container->show_grabber_icon(-1);
-			}
-		} break;
-	}
-}
-
-void SplitContainerMultiDragger::gui_input(const Ref<InputEvent> &p_event) {
-	SplitContainer *parent_sc = Object::cast_to<SplitContainer>(get_parent()->get_parent());
-	ERR_FAIL_NULL(parent_sc);
-
-	if (parent_sc->collapsed || parent_sc->valid_children.size() < 2u || !parent_sc->dragging_enabled) {
-		return;
-	}
-	if (split_container->collapsed || split_container->valid_children.size() < 2u || !split_container->dragging_enabled || !split_container->is_visible_in_tree()) {
-		return;
-	}
-
-	Ref<InputEventMouseButton> mb = p_event;
-
-	if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT) {
-		if (mb->is_pressed()) {
-			// To match the visual position, clamp on the first split.
-			split_container->_update_dragger_positions(0);
-			dragging = true;
-			split_container->show_grabber_icon(dragger_index);
-			split_container->emit_signal(SNAME("drag_started"));
-			const int axis = split_container->vertical ? 1 : 0;
-			start_drag_split_offset = split_container->get_split_offset(dragger_index);
-			drag_from = (int)get_transform().xform(mb->get_position())[axis];
-		} else {
-			stop_dragging();
-		}
-		// Don't accept to allow the event to go to the parent dragger.
-	}
-
-	Ref<InputEventMouseMotion> mm = p_event;
-
-	if (mm.is_valid()) {
-		if (!dragging) {
-			return;
-		}
-
-		Vector2i in_parent_pos = get_transform().xform(mm->get_position());
-		int new_drag_offset;
-		if (!split_container->vertical && is_layout_rtl()) {
-			new_drag_offset = start_drag_split_offset - (in_parent_pos.x - drag_from);
-		} else {
-			new_drag_offset = start_drag_split_offset + ((split_container->vertical ? in_parent_pos.y : in_parent_pos.x) - drag_from);
-		}
-		split_container->set_split_offset(new_drag_offset, dragger_index);
-		split_container->_update_dragger_positions(dragger_index);
-		split_container->queue_sort();
-		split_container->emit_signal(SNAME("dragged"), split_container->get_split_offset(dragger_index));
-	}
-}
-
-Control::CursorShape SplitContainerMultiDragger::get_cursor_shape(const Point2 &p_pos) const {
-	SplitContainer *parent_sc = Object::cast_to<SplitContainer>(get_parent()->get_parent());
-	ERR_FAIL_NULL_V(parent_sc, CURSOR_ARROW);
-	if (dragging || (!parent_sc->collapsed && parent_sc->dragging_enabled)) {
-		return CURSOR_DRAG;
-	}
-	return Control::get_cursor_shape(p_pos);
-}
-
-void SplitContainerMultiDragger::update_position() {
-	if (dragging || is_queued_for_deletion()) {
-		return;
-	}
-	SplitContainer *parent_sc = Object::cast_to<SplitContainer>(get_parent()->get_parent());
-	ERR_FAIL_NULL(parent_sc);
-	ERR_FAIL_INDEX(dragger_index, (int)split_container->dragging_area_controls.size());
-	const int axis = parent_sc->vertical ? 1 : 0;
-	const int cross_axis = parent_sc->vertical ? 0 : 1;
-	Control *control = split_container->dragging_area_controls[dragger_index];
-	Point2 pos;
-	pos[axis] = get_parent_control()->get_global_position()[axis];
-	pos[cross_axis] = control->get_global_position()[cross_axis];
-	set_global_position(pos);
-}
-
-void SplitContainerMultiDragger::stop_dragging() {
-	if (!dragging) {
-		return;
-	}
-	dragging = false;
-	split_container->show_grabber_icon(-1);
-	update_position();
-	split_container->emit_signal(SNAME("drag_ended"));
-}
-
-SplitContainerMultiDragger::SplitContainerMultiDragger() {
-	set_mouse_filter(MOUSE_FILTER_PASS);
-}
 
 void SplitContainerDragger::gui_input(const Ref<InputEvent> &p_event) {
 	ERR_FAIL_COND(p_event.is_null());
@@ -183,7 +73,9 @@ void SplitContainerDragger::gui_input(const Ref<InputEvent> &p_event) {
 					drag_from = (int)get_transform().xform(mb->get_position()).x;
 				}
 			} else {
-				stop_dragging();
+				dragging = false;
+				queue_redraw();
+				sc->emit_signal(SNAME("drag_ended"));
 			}
 			accept_event();
 		}
@@ -302,28 +194,6 @@ void SplitContainerDragger::update_touch_dragger() {
 	touch_dragger->set_texture(sc->_get_touch_dragger_icon());
 	touch_dragger->set_anchors_and_offsets_preset(Control::PRESET_CENTER);
 	touch_dragger->set_default_cursor_shape(sc->vertical ? CURSOR_VSPLIT : CURSOR_HSPLIT);
-	touch_dragger->set_visible(sc->dragging_enabled);
-}
-
-void SplitContainerDragger::stop_dragging() {
-	ERR_THREAD_GUARD;
-	if (!dragging) {
-		return;
-	}
-	dragging = false;
-	queue_redraw();
-	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
-	sc->emit_signal(SNAME("drag_ended"));
-	for (Node *child : iterate_children()) {
-		SplitContainerMultiDragger *dragger = Object::cast_to<SplitContainerMultiDragger>(child);
-		if (dragger) {
-			dragger->stop_dragging();
-		}
-	}
-}
-
-String SplitContainerDragger::_get_accessibility_name() const {
-	return RTR("Drag to resize");
 }
 
 void SplitContainerDragger::_notification(int p_what) {
@@ -335,18 +205,19 @@ void SplitContainerDragger::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_SPLITTER);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPLITTER);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, RTR("Drag to resize"));
 
 			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
 			if (sc->collapsed || sc->valid_children.size() < 2u || !sc->dragging_enabled) {
 				return;
 			}
 			sc->clamp_split_offset(dragger_index);
-			AccessibilityServer::get_singleton()->update_set_num_value(ae, sc->get_split_offset(dragger_index));
+			DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, sc->get_split_offset(dragger_index));
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_dec));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_inc));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &SplitContainerDragger::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_dec));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_inc));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &SplitContainerDragger::_accessibility_action_set_value));
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
@@ -374,19 +245,22 @@ void SplitContainerDragger::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_FOCUS_EXIT: {
-			stop_dragging();
+			if (dragging) {
+				dragging = false;
+				queue_redraw();
+			}
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (dragging && !is_visible_in_tree()) {
-				stop_dragging();
+				dragging = false;
 			}
 		} break;
 
 		case NOTIFICATION_DRAW: {
 			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
 			draw_style_box(sc->theme_cache.split_bar_background, split_bar_rect);
-			if (!sc->touch_dragger_enabled && sc->dragger_visibility == SplitContainer::DRAGGER_VISIBLE && (dragging || mouse_inside || !sc->theme_cache.autohide || sc->force_show_grabber_icon == dragger_index)) {
+			if (sc->dragger_visibility == SplitContainer::DRAGGER_VISIBLE && (dragging || mouse_inside || !sc->theme_cache.autohide) && !sc->touch_dragger_enabled) {
 				Ref<Texture2D> tex = sc->_get_grabber_icon();
 				float available_size = sc->vertical ? (sc->get_size().x - tex->get_size().x) : (sc->get_size().y - tex->get_size().y);
 				if (available_size - sc->drag_area_margin_begin - sc->drag_area_margin_end > 0) { // Draw the grabber only if it fits.
@@ -846,14 +720,13 @@ void SplitContainer::_resort() {
 		for (SplitContainerDragger *dragger : dragging_area_controls) {
 			dragger->hide();
 		}
-		if (drag_nested_intersections) {
-			// Ancestors may need to remove multi draggers.
-			_update_nested_ancestors();
-		}
 		return;
 	}
 	for (SplitContainerDragger *dragger : dragging_area_controls) {
 		dragger->set_visible(!collapsed);
+		if (touch_dragger_enabled) {
+			dragger->touch_dragger->set_visible(dragging_enabled);
+		}
 	}
 
 	_update_default_dragger_positions();
@@ -906,23 +779,9 @@ void SplitContainer::_resort() {
 		dragging_area_controls[i]->queue_redraw();
 	}
 	queue_redraw();
-
-	if (drag_nested_intersections) {
-		_update_nested_ancestors();
-		// Update all multi dragger positions in case size changed.
-		for (SplitContainerDragger *dragger : dragging_area_controls) {
-			for (Node *child : dragger->iterate_children()) {
-				SplitContainerMultiDragger *multi_dragger = Object::cast_to<SplitContainerMultiDragger>(child);
-				if (multi_dragger) {
-					multi_dragger->update_position();
-				}
-			}
-		}
-	}
 }
 
 void SplitContainer::_update_draggers() {
-	ERR_THREAD_GUARD;
 	if (!is_visible_in_tree()) {
 		return;
 	}
@@ -930,24 +789,6 @@ void SplitContainer::_update_draggers() {
 	const int dragger_count = MAX(valid_child_count - 1, 1);
 	const int draggers_size_diff = dragger_count - (int)dragging_area_controls.size();
 
-	if (draggers_size_diff != 0) {
-		LocalVector<SplitContainer *> to_update;
-		for (SplitContainerDragger *dragger : dragging_area_controls) {
-			for (Node *child : dragger->iterate_children()) {
-				SplitContainerMultiDragger *multi_dragger = Object::cast_to<SplitContainerMultiDragger>(child);
-				if (multi_dragger == nullptr || multi_dragger->is_queued_for_deletion()) {
-					continue;
-				}
-				to_update.push_back(multi_dragger->split_container);
-			}
-		}
-		_remove_nested_descendent(nullptr);
-		// Existing descendents may not resort, so need to update them after draggers update.
-		for (SplitContainer *to_update_sc : to_update) {
-			callable_mp(to_update_sc, &SplitContainer::_update_nested_ancestors).call_deferred(false);
-		}
-	}
-
 	// Add new draggers.
 	for (int i = 0; i < draggers_size_diff; i++) {
 		SplitContainerDragger *dragger = memnew(SplitContainerDragger);
@@ -962,7 +803,6 @@ void SplitContainer::_update_draggers() {
 	for (int i = 0; i < -draggers_size_diff; i++) {
 		const int remove_at = (int)dragging_area_controls.size() - 1;
 		SplitContainerDragger *dragger = dragging_area_controls[remove_at];
-		dragger->stop_dragging();
 		dragging_area_controls.remove_at(remove_at);
 		// replace_by removes all children, so make sure it is a child before removing.
 		if (dragger->get_parent() == this) {
@@ -1018,17 +858,9 @@ void SplitContainer::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			update_minimum_size();
 		} break;
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			if (!is_visible_in_tree()) {
-				_update_nested_ancestors();
-			}
-		} break;
 		case NOTIFICATION_PREDELETE: {
 			valid_children.clear();
 			dragging_area_controls.clear();
-			if (drag_nested_intersections) {
-				_remove_nested_descendent(nullptr);
-			}
 		} break;
 	}
 }
@@ -1221,178 +1053,6 @@ void SplitContainer::_remove_valid_child(Control *p_control) {
 	_set_desired_sizes(desired_sizes);
 }
 
-void SplitContainer::_remove_nested_descendent(SplitContainer *p_nested_sc) {
-	for (SplitContainerDragger *dragger : dragging_area_controls) {
-		for (int i = dragger->get_child_count() - 1; i >= 0; i--) {
-			SplitContainerMultiDragger *multi_dragger = Object::cast_to<SplitContainerMultiDragger>(dragger->get_child(i));
-			if (multi_dragger == nullptr || multi_dragger->is_queued_for_deletion()) {
-				continue;
-			}
-			if (p_nested_sc != nullptr && multi_dragger->split_container != p_nested_sc) {
-				continue;
-			}
-			dragger->stop_dragging();
-
-			SplitContainer *nested_sc = multi_dragger->split_container;
-			if (nested_sc->is_connected(SceneStringName(tree_exiting), callable_mp(this, &SplitContainer::_remove_nested_descendent))) {
-				nested_sc->disconnect(SceneStringName(tree_exiting), callable_mp(this, &SplitContainer::_remove_nested_descendent).bind(nested_sc));
-			}
-			multi_dragger->queue_free();
-		}
-	}
-}
-
-void SplitContainer::_update_nested_descendent(SplitContainer *p_nested_sc, Control *p_direct_child) {
-	ERR_THREAD_GUARD;
-	// Remove multi draggers if the descendent cannot drag or is not orthogonal. If any of these change, the descendent will call this update again.
-	if (!p_nested_sc->is_dragging_enabled() || !p_nested_sc->is_dragging_nested_intersections() || p_nested_sc->is_collapsed() || !p_nested_sc->is_visible_in_tree() || p_nested_sc->is_vertical() == vertical || p_nested_sc->valid_children.size() < 2u) {
-		_remove_nested_descendent(p_nested_sc);
-		return;
-	}
-	if (dragging_area_controls.size() != valid_children.size() - 1) {
-		_update_draggers();
-	}
-
-	// Make sure the nested SplitContainer is adjacent.
-	const int child_index = valid_children.find(p_direct_child);
-	if (child_index < 0) {
-		return;
-	}
-	const int axis = vertical ? 1 : 0;
-	const float max_delta_pos = theme_cache.minimum_grab_thickness;
-
-	const float start_pos = p_direct_child->get_global_rect().get_position()[axis];
-	const float end_pos = p_direct_child->get_global_rect().get_end()[axis];
-	const float child_start_pos = p_nested_sc->get_global_rect().get_position()[axis];
-	const float child_end_pos = p_nested_sc->get_global_rect().get_end()[axis];
-	bool nested_to_start = Math::abs(start_pos - child_start_pos) <= max_delta_pos;
-	bool nested_to_end = Math::abs(end_pos - child_end_pos) <= max_delta_pos;
-
-	if (is_layout_rtl() && !is_vertical()) {
-		SWAP(nested_to_start, nested_to_end);
-	}
-
-	LocalVector<SplitContainerDragger *> connected_draggers;
-	if (nested_to_start && child_index > 0) {
-		connected_draggers.push_back(dragging_area_controls[child_index - 1]);
-	}
-	if (nested_to_end && child_index < (int)dragging_area_controls.size()) {
-		connected_draggers.push_back(dragging_area_controls[child_index]);
-	}
-
-	if (connected_draggers.is_empty()) {
-		_remove_nested_descendent(p_nested_sc);
-		return;
-	}
-
-	bool needs_rebuild = false;
-	for (SplitContainerDragger *dragger : connected_draggers) {
-		int needed = (int)p_nested_sc->valid_children.size() - 1;
-		for (Node *child : dragger->iterate_children()) {
-			SplitContainerMultiDragger *multi_dragger = Object::cast_to<SplitContainerMultiDragger>(child);
-			if (multi_dragger == nullptr || multi_dragger->is_queued_for_deletion()) {
-				continue;
-			}
-			if (multi_dragger->split_container != p_nested_sc) {
-				continue;
-			}
-			needed--;
-			if (needed < 0) {
-				break;
-			}
-		}
-		if (needed != 0) {
-			needs_rebuild = true;
-			break;
-		}
-	}
-	if (!needs_rebuild) {
-		// Only update the positions.
-		for (SplitContainerDragger *dragger : dragging_area_controls) {
-			for (Node *child : dragger->iterate_children()) {
-				SplitContainerMultiDragger *multi_dragger = Object::cast_to<SplitContainerMultiDragger>(child);
-				if (multi_dragger) {
-					multi_dragger->update_position();
-				}
-			}
-		}
-		return;
-	}
-
-	_remove_nested_descendent(p_nested_sc);
-
-	// Add new multi draggers.
-	const int sep = _get_separation();
-	const int drag_thickness = MAX(sep, theme_cache.minimum_grab_thickness);
-
-	for (SplitContainerDragger *dragger : connected_draggers) {
-		for (int i = 0; i < (int)p_nested_sc->dragging_area_controls.size(); i++) {
-			SplitContainerMultiDragger *new_dragger = memnew(SplitContainerMultiDragger);
-			new_dragger->dragger_index = i;
-			new_dragger->split_container = p_nested_sc;
-			new_dragger->set_size(Size2(drag_thickness, drag_thickness));
-			dragger->add_child(new_dragger, false, INTERNAL_MODE_FRONT);
-
-			if (!p_nested_sc->is_connected(SceneStringName(tree_exiting), callable_mp(this, &SplitContainer::_remove_nested_descendent))) {
-				p_nested_sc->connect(SceneStringName(tree_exiting), callable_mp(this, &SplitContainer::_remove_nested_descendent).bind(p_nested_sc));
-			}
-			callable_mp(new_dragger, &SplitContainerMultiDragger::update_position).call_deferred();
-		}
-	}
-}
-
-void SplitContainer::_update_nested_ancestors(bool p_remove) {
-	if (!is_inside_tree()) {
-		return;
-	}
-	if (!p_remove && !drag_nested_intersections) {
-		return;
-	}
-	Control *last_ancestor = this;
-	Control *ancestor = get_parent_control();
-	while (ancestor) {
-		SplitContainer *ancestor_split_container = Object::cast_to<SplitContainer>(ancestor);
-		if (ancestor_split_container && ancestor_split_container->is_dragging_nested_intersections()) {
-			if (p_remove) {
-				ancestor_split_container->_remove_nested_descendent(this);
-			} else {
-				ancestor_split_container->_update_nested_descendent(this, last_ancestor);
-			}
-		}
-		if (ancestor->is_part_of_edited_scene() != is_part_of_edited_scene()) {
-			break;
-		}
-
-		if (ancestor->is_set_as_top_level()) {
-			break;
-		}
-		last_ancestor = ancestor;
-		ancestor = ancestor->get_parent_control();
-	}
-}
-
-void SplitContainer::_update_all_nested_descendents(Control *p_control, Control *p_first_child) {
-	ERR_THREAD_GUARD;
-	for (Node *child_node : p_control->iterate_children<false>()) {
-		Control *child_control = Object::cast_to<Control>(child_node);
-		if (!child_control || child_control->is_set_as_top_level()) {
-			break;
-		}
-		if (child_control->is_part_of_edited_scene() != is_part_of_edited_scene()) {
-			break;
-		}
-		if (p_first_child == nullptr) {
-			p_first_child = child_control;
-		}
-
-		SplitContainer *control_sc = Object::cast_to<SplitContainer>(child_control);
-		if (control_sc) {
-			_update_nested_descendent(control_sc, p_first_child);
-		}
-		_update_all_nested_descendents(child_control, p_first_child);
-	}
-}
-
 void SplitContainer::set_split_offset(int p_offset, int p_index) {
 	ERR_FAIL_INDEX(p_index, split_offsets.size());
 	if (split_offsets[p_index] == p_offset) {
@@ -1480,13 +1140,13 @@ void SplitContainer::set_dragging_enabled(bool p_enabled) {
 	}
 	dragging_enabled = p_enabled;
 	if (!dragging_enabled) {
+		bool was_dragging = false;
 		for (SplitContainerDragger *dragger : dragging_area_controls) {
-			dragger->stop_dragging();
+			was_dragging |= dragger->dragging;
+			dragger->dragging = false;
 		}
-	}
-	if (touch_dragger_enabled) {
-		for (SplitContainerDragger *dragger : dragging_area_controls) {
-			dragger->update_touch_dragger();
+		if (was_dragging) {
+			emit_signal(SNAME("drag_ended"));
 		}
 	}
 	if (get_viewport()) {
@@ -1593,36 +1253,6 @@ bool SplitContainer::is_touch_dragger_enabled() const {
 	return touch_dragger_enabled;
 }
 
-void SplitContainer::show_grabber_icon(int p_index) {
-	if (force_show_grabber_icon == p_index) {
-		return;
-	}
-	force_show_grabber_icon = p_index;
-	for (SplitContainerDragger *dragger : dragging_area_controls) {
-		dragger->queue_redraw();
-	}
-}
-
-void SplitContainer::set_drag_nested_intersections(bool p_enabled) {
-	if (drag_nested_intersections == p_enabled) {
-		return;
-	}
-	drag_nested_intersections = p_enabled;
-	if (!is_inside_tree()) {
-		return;
-	}
-	_update_nested_ancestors(!drag_nested_intersections);
-	if (drag_nested_intersections) {
-		_update_all_nested_descendents(this);
-	} else {
-		_remove_nested_descendent(nullptr);
-	}
-}
-
-bool SplitContainer::is_dragging_nested_intersections() const {
-	return drag_nested_intersections;
-}
-
 void SplitContainer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_split_offsets", "offsets"), &SplitContainer::set_split_offsets);
 	ClassDB::bind_method(D_METHOD("get_split_offsets"), &SplitContainer::get_split_offsets);
@@ -1658,9 +1288,6 @@ void SplitContainer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_touch_dragger_enabled", "enabled"), &SplitContainer::set_touch_dragger_enabled);
 	ClassDB::bind_method(D_METHOD("is_touch_dragger_enabled"), &SplitContainer::is_touch_dragger_enabled);
 
-	ClassDB::bind_method(D_METHOD("set_drag_nested_intersections", "enabled"), &SplitContainer::set_drag_nested_intersections);
-	ClassDB::bind_method(D_METHOD("is_dragging_nested_intersections"), &SplitContainer::is_dragging_nested_intersections);
-
 	ADD_SIGNAL(MethodInfo("dragged", PropertyInfo(Variant::INT, "offset")));
 	ADD_SIGNAL(MethodInfo("drag_started"));
 	ADD_SIGNAL(MethodInfo("drag_ended"));
@@ -1671,7 +1298,6 @@ void SplitContainer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "dragger_visibility", PROPERTY_HINT_ENUM, "Visible,Hidden,Hidden and Collapsed"), "set_dragger_visibility", "get_dragger_visibility");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "vertical"), "set_vertical", "is_vertical");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "touch_dragger_enabled"), "set_touch_dragger_enabled", "is_touch_dragger_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "drag_nested_intersections"), "set_drag_nested_intersections", "is_dragging_nested_intersections");
 
 	ADD_GROUP("Drag Area", "drag_area_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "drag_area_margin_begin", PROPERTY_HINT_NONE, "suffix:px"), "set_drag_area_margin_begin", "get_drag_area_margin_begin");
diff --git a/engine/scene/gui/split_container.h b/engine/scene/gui/split_container.h
index 7acc752e..72ead3bc 100644
--- a/engine/scene/gui/split_container.h
+++ b/engine/scene/gui/split_container.h
@@ -33,40 +33,11 @@
 #include "scene/gui/container.h"
 
 class TextureRect;
-class SplitContainer;
-
-class SplitContainerMultiDragger : public Control {
-	GDCLASS(SplitContainerMultiDragger, Control);
-
-	bool dragging = false;
-	int drag_from = 0;
-	int start_drag_split_offset = 0;
-
-protected:
-	void _notification(int p_what);
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-
-public:
-	int dragger_index = -1;
-	SplitContainer *split_container = nullptr;
-
-	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override;
-
-	void update_position();
-	void stop_dragging();
-
-	SplitContainerMultiDragger();
-};
 
 class SplitContainerDragger : public Control {
 	GDCLASS(SplitContainerDragger, Control);
 	friend class SplitContainer;
 
-	bool dragging = false;
-	int drag_from = 0;
-	int start_drag_split_offset = 0;
-	bool mouse_inside = false;
-
 	Rect2 split_bar_rect;
 	TextureRect *touch_dragger = nullptr;
 
@@ -81,7 +52,11 @@ protected:
 	void _accessibility_action_dec(const Variant &p_data);
 	void _accessibility_action_set_value(const Variant &p_data);
 
-	virtual String _get_accessibility_name() const override;
+private:
+	bool dragging = false;
+	int drag_from = 0;
+	int start_drag_split_offset = 0;
+	bool mouse_inside = false;
 
 public:
 	int dragger_index = -1;
@@ -90,7 +65,7 @@ public:
 
 	void set_touch_dragger_enabled(bool p_enabled);
 	void update_touch_dragger();
-	void stop_dragging();
+	bool is_touch_dragger_enabled() const;
 
 	SplitContainerDragger();
 };
@@ -98,7 +73,6 @@ public:
 class SplitContainer : public Container {
 	GDCLASS(SplitContainer, Container);
 	friend class SplitContainerDragger;
-	friend class SplitContainerMultiDragger;
 
 public:
 	enum DraggerVisibility {
@@ -128,8 +102,6 @@ private:
 	bool initialized = false;
 
 	bool touch_dragger_enabled = false;
-	bool drag_nested_intersections = false;
-	int force_show_grabber_icon = -1;
 
 	struct ThemeCache {
 		Color touch_dragger_color;
@@ -164,11 +136,6 @@ private:
 	void _add_valid_child(Control *p_control);
 	void _remove_valid_child(Control *p_control);
 
-	void _remove_nested_descendent(SplitContainer *p_nested_sc);
-	void _update_nested_descendent(SplitContainer *p_nested_sc, Control *p_direct_child);
-	void _update_nested_ancestors(bool p_remove = false);
-	void _update_all_nested_descendents(Control *p_control, Control *p_first_child = nullptr);
-
 protected:
 	bool is_fixed = false;
 
@@ -228,11 +195,6 @@ public:
 	void set_touch_dragger_enabled(bool p_enabled);
 	bool is_touch_dragger_enabled() const;
 
-	void show_grabber_icon(int p_index);
-
-	void set_drag_nested_intersections(bool p_enabled);
-	bool is_dragging_nested_intersections() const;
-
 #ifndef DISABLE_DEPRECATED
 	Control *get_drag_area_control() { return dragging_area_controls[0]; }
 	void _set_split_offset_first(int p_offset) { set_split_offset(p_offset); }
diff --git a/engine/scene/gui/subviewport_container.cpp b/engine/scene/gui/subviewport_container.cpp
index 4da07b13..9e885e9d 100644
--- a/engine/scene/gui/subviewport_container.cpp
+++ b/engine/scene/gui/subviewport_container.cpp
@@ -31,7 +31,6 @@
 #include "subviewport_container.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 Size2 SubViewportContainer::get_minimum_size() const {
diff --git a/engine/scene/gui/tab_bar.cpp b/engine/scene/gui/tab_bar.cpp
index 33ed5fcc..7e1b87cd 100644
--- a/engine/scene/gui/tab_bar.cpp
+++ b/engine/scene/gui/tab_bar.cpp
@@ -30,18 +30,12 @@
 
 #include "tab_bar.h"
 
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-
-#include <cfloat> // FLT_MAX
 
 static inline Color _select_color(const Color &p_override_color, const Color &p_default_color) {
 	return p_override_color.a > 0 ? p_override_color : p_default_color;
@@ -377,7 +371,7 @@ RID TabBar::get_tab_accessibility_element(int p_tab) const {
 
 	const Tab &item = tabs[p_tab];
 	if (item.accessibility_item_element.is_null()) {
-		item.accessibility_item_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TAB);
+		item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB);
 		item.accessibility_item_dirty = true;
 	}
 	return item.accessibility_item_element;
@@ -443,29 +437,29 @@ void TabBar::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TAB_BAR);
-			AccessibilityServer::get_singleton()->update_set_list_item_count(ae, tabs.size());
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TAB_BAR);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, tabs.size());
 
 			for (int i = 0; i < tabs.size(); i++) {
 				const Tab &item = tabs[i];
 
 				if (item.accessibility_item_element.is_null()) {
-					item.accessibility_item_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TAB);
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB);
 					item.accessibility_item_dirty = true;
 				}
 
 				if (item.accessibility_item_dirty) {
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TabBar::_accessibility_action_scroll_into_view).bind(i));
-					AccessibilityServer::get_singleton()->update_add_action(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &TabBar::_accessibility_action_focus).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TabBar::_accessibility_action_scroll_into_view).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &TabBar::_accessibility_action_focus).bind(i));
 
-					AccessibilityServer::get_singleton()->update_set_list_item_index(item.accessibility_item_element, i);
-					AccessibilityServer::get_singleton()->update_set_name(item.accessibility_item_element, atr(item.text));
-					AccessibilityServer::get_singleton()->update_set_list_item_selected(item.accessibility_item_element, i == current);
-					AccessibilityServer::get_singleton()->update_set_flag(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED, item.disabled);
-					AccessibilityServer::get_singleton()->update_set_flag(item.accessibility_item_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, item.hidden);
-					AccessibilityServer::get_singleton()->update_set_tooltip(item.accessibility_item_element, item.tooltip);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, atr(item.text));
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, i == current);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, item.hidden);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
 
-					AccessibilityServer::get_singleton()->update_set_bounds(item.accessibility_item_element, Rect2(Point2(item.ofs_cache, 0), Size2(item.size_cache, get_size().height)));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(Point2(item.ofs_cache, 0), Size2(item.size_cache, get_size().height)));
 
 					item.accessibility_item_dirty = false;
 				}
@@ -753,7 +747,7 @@ void TabBar::set_tab_count(int p_count) {
 	if (tabs.size() > p_count) {
 		for (int i = p_count; i < tabs.size(); i++) {
 			if (tabs[i].accessibility_item_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(tabs.write[i].accessibility_item_element);
+				DisplayServer::get_singleton()->accessibility_free_element(tabs.write[i].accessibility_item_element);
 				tabs.write[i].accessibility_item_element = RID();
 			}
 		}
@@ -1344,7 +1338,7 @@ void TabBar::clear_tabs() {
 
 	for (int i = 0; i < tabs.size(); i++) {
 		if (tabs[i].accessibility_item_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(tabs.write[i].accessibility_item_element);
+			DisplayServer::get_singleton()->accessibility_free_element(tabs.write[i].accessibility_item_element);
 			tabs.write[i].accessibility_item_element = RID();
 		}
 	}
@@ -1364,7 +1358,7 @@ void TabBar::remove_tab(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, tabs.size());
 
 	if (tabs[p_idx].accessibility_item_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(tabs.write[p_idx].accessibility_item_element);
+		DisplayServer::get_singleton()->accessibility_free_element(tabs.write[p_idx].accessibility_item_element);
 		tabs.write[p_idx].accessibility_item_element = RID();
 	}
 	tabs.remove_at(p_idx);
@@ -2195,9 +2189,9 @@ void TabBar::_bind_methods() {
 	base_property_helper.set_array_length_getter(&TabBar::get_tab_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "title"), defaults.text, &TabBar::set_tab_title, &TabBar::get_tab_title);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "tooltip"), defaults.tooltip, &TabBar::set_tab_tooltip, &TabBar::get_tab_tooltip);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon, &TabBar::set_tab_icon, &TabBar::get_tab_icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon, &TabBar::set_tab_icon, &TabBar::get_tab_icon);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled, &TabBar::set_tab_disabled, &TabBar::is_tab_disabled);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 TabBar::TabBar() {
diff --git a/engine/scene/gui/tab_container.cpp b/engine/scene/gui/tab_container.cpp
index 66f52dc7..91e721fb 100644
--- a/engine/scene/gui/tab_container.cpp
+++ b/engine/scene/gui/tab_container.cpp
@@ -30,13 +30,17 @@
 
 #include "tab_container.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/popup.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
+
+Rect2 TabContainer::_get_tab_rect() const {
+	Rect2 rect;
+	if (tabs_visible && get_tab_count() > 0) {
+		rect = Rect2(theme_cache.tabbar_style->get_offset(), tab_bar->get_size());
+		rect.position.x += is_layout_rtl() ? theme_cache.menu_icon->get_width() : theme_cache.side_margin;
+	}
+
+	return rect;
+}
 
 TabContainer::CachedTab &TabContainer::get_pending_tab(int p_idx) const {
 	if (p_idx >= pending_tabs.size()) {
@@ -54,12 +58,86 @@ int TabContainer::_get_tab_height() const {
 	return height;
 }
 
-Control *TabContainer::_as_tab_control(Node *p_child) const {
-	Control *control = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
-	if (!control || control == internal_container || children_removing.has(control)) {
-		return nullptr;
+void TabContainer::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	Ref<InputEventMouseButton> mb = p_event;
+
+	Popup *popup = get_popup();
+
+	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
+		Point2 pos = mb->get_position();
+		real_t content_height = get_size().height - _get_tab_height();
+
+		Rect2 popup_rect = _get_tab_rect();
+		popup_rect.position.x += is_layout_rtl() ? -theme_cache.menu_icon->get_width() : popup_rect.size.x;
+		popup_rect.position.y += tabs_position == POSITION_BOTTOM ? content_height : 0;
+		popup_rect.size.x = theme_cache.menu_icon->get_width();
+
+		// Click must be on tabs in the tab header area.
+		if (!tabs_visible || pos.y < popup_rect.position.y || pos.y >= popup_rect.position.y + popup_rect.size.y) {
+			return;
+		}
+
+		// Handle menu button.
+		if (popup) {
+			if (popup_rect.has_point(pos)) {
+				emit_signal(SNAME("pre_popup_pressed"));
+
+				Vector2 popup_pos = get_screen_position();
+				popup_pos.x += popup_rect.position.x + (is_layout_rtl() ? 0 : popup_rect.size.x - popup->get_size().width);
+				popup_pos.y += popup_rect.position.y + popup_rect.size.y / 2.0;
+				if (tabs_position == POSITION_BOTTOM) {
+					popup_pos.y -= popup->get_size().height;
+					popup_pos.y -= theme_cache.menu_icon->get_height() / 2.0;
+				} else {
+					popup_pos.y += theme_cache.menu_icon->get_height() / 2.0;
+				}
+
+				popup->set_position(popup_pos);
+				popup->popup();
+				return;
+			}
+		}
+	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+
+	if (mm.is_valid()) {
+		Point2 pos = mm->get_position();
+		real_t content_height = get_size().height - _get_tab_height();
+
+		Rect2 popup_rect = _get_tab_rect();
+		popup_rect.position.x += is_layout_rtl() ? -theme_cache.menu_icon->get_width() : popup_rect.size.x;
+		popup_rect.position.y += tabs_position == POSITION_BOTTOM ? content_height : 0;
+		popup_rect.size.x = theme_cache.menu_icon->get_width();
+
+		// Mouse must be on tabs in the tab header area.
+		if (!tabs_visible || pos.y < popup_rect.position.y || pos.y >= popup_rect.position.y + popup_rect.size.y) {
+			if (menu_hovered) {
+				menu_hovered = false;
+				queue_redraw();
+			}
+			return;
+		}
+
+		if (popup) {
+			if (popup_rect.has_point(pos)) {
+				if (!menu_hovered) {
+					menu_hovered = true;
+					queue_redraw();
+					return;
+				}
+			} else if (menu_hovered) {
+				menu_hovered = false;
+				queue_redraw();
+			}
+
+			if (menu_hovered) {
+				return;
+			}
+		}
 	}
-	return control;
 }
 
 void TabContainer::_get_property_list(List<PropertyInfo> *p_list) const {
@@ -115,20 +193,20 @@ void TabContainer::_notification(int p_what) {
 				if (child_node->is_part_of_edited_scene()) {
 					continue;
 				}
-				Control *control = _as_tab_control(child_node);
-				if (!control) {
-					AccessibilityServer::get_singleton()->update_add_child(ae, child_node->get_accessibility_element());
+				Control *control = as_sortable_control(child_node, SortableVisibilityMode::IGNORE);
+				if (!control || control == tab_bar || children_removing.has(control)) {
+					DisplayServer::get_singleton()->accessibility_update_add_child(ae, child_node->get_accessibility_element());
 				} else {
 					if (!tab_panels.has(child_node)) {
-						tab_panels[child_node] = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TAB_PANEL);
+						tab_panels[child_node] = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB_PANEL);
 					}
 					RID panel = tab_panels[child_node];
 					RID tab = tab_bar->get_tab_accessibility_element(tab_index);
 
-					AccessibilityServer::get_singleton()->update_add_related_controls(tab, panel);
-					AccessibilityServer::get_singleton()->update_add_related_labeled_by(panel, tab);
-					AccessibilityServer::get_singleton()->update_set_flag(panel, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, tab_index != tab_cur);
-					AccessibilityServer::get_singleton()->update_add_child(panel, child_node->get_accessibility_element());
+					DisplayServer::get_singleton()->accessibility_update_add_related_controls(tab, panel);
+					DisplayServer::get_singleton()->accessibility_update_add_related_labeled_by(panel, tab);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(panel, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, tab_index != tab_cur);
+					DisplayServer::get_singleton()->accessibility_update_add_child(panel, child_node->get_accessibility_element());
 
 					tab_index++;
 				}
@@ -169,12 +247,14 @@ void TabContainer::_notification(int p_what) {
 		case NOTIFICATION_DRAW: {
 			RID canvas = get_canvas_item();
 			Size2 size = get_size();
+			Rect2 tabbar_rect = _get_tab_rect();
 
 			// Draw only the tab area if the header is hidden.
 			if (!tabs_visible) {
 				theme_cache.panel_style->draw(canvas, Rect2(0, 0, size.width, size.height));
 				return;
 			}
+
 			int header_height = _get_tab_height();
 			int header_voffset = int(tabs_position == POSITION_BOTTOM) * (size.height - header_height);
 
@@ -182,6 +262,18 @@ void TabContainer::_notification(int p_what) {
 			theme_cache.tabbar_style->draw(canvas, Rect2(0, header_voffset, size.width, header_height));
 			// Draw the background for the tab's content.
 			theme_cache.panel_style->draw(canvas, Rect2(0, int(tabs_position == POSITION_TOP) * header_height, size.width, size.height - header_height));
+
+			// Draw the popup menu.
+			if (get_popup()) {
+				int x = is_layout_rtl() ? tabbar_rect.position.x - theme_cache.menu_icon->get_width() : tabbar_rect.position.x + tabbar_rect.size.x;
+				header_voffset += tabbar_rect.position.y;
+
+				if (menu_hovered) {
+					theme_cache.menu_hl_icon->draw(get_canvas_item(), Point2(x, header_voffset + (tabbar_rect.size.y - theme_cache.menu_hl_icon->get_height()) / 2));
+				} else {
+					theme_cache.menu_icon->draw(get_canvas_item(), Point2(x, header_voffset + (tabbar_rect.size.y - theme_cache.menu_icon->get_height()) / 2));
+				}
+			}
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -204,14 +296,7 @@ void TabContainer::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED:
-		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
-			if (popup_button) {
-				popup_button->set_button_icon(theme_cache.menu_icon);
-				internal_container->move_child(popup_button, is_layout_rtl() ? 0 : 1);
-			}
-			_update_margins();
-		} break;
-
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
 			theme_changing = true;
 			callable_mp(this, &TabContainer::_on_theme_changed).call_deferred(); // Wait until all changed theme.
@@ -271,17 +356,7 @@ void TabContainer::_on_theme_changed() {
 	theme_changing = false;
 }
 
-void TabContainer::_repaint_call_deferred() {
-	layout_pending_start();
-	callable_mp(this, &TabContainer::_repaint_internal).call_deferred();
-}
-
 void TabContainer::_repaint() {
-	layout_pending_start();
-	_repaint_internal();
-}
-
-void TabContainer::_repaint_internal() {
 	Vector<Control *> controls = _get_tab_controls();
 	int current = get_current_tab();
 
@@ -291,11 +366,11 @@ void TabContainer::_repaint_internal() {
 	// Move the TabBar to the top or bottom.
 	// Don't change the left and right offsets since the TabBar will resize and may change tab offset.
 	if (tabs_position == POSITION_BOTTOM) {
-		internal_container->set_anchor_and_offset(SIDE_BOTTOM, 1.0, -bottom_margin);
-		internal_container->set_anchor_and_offset(SIDE_TOP, 1.0, top_margin - _get_tab_height());
+		tab_bar->set_anchor_and_offset(SIDE_BOTTOM, 1.0, -bottom_margin);
+		tab_bar->set_anchor_and_offset(SIDE_TOP, 1.0, top_margin - _get_tab_height());
 	} else {
-		internal_container->set_anchor_and_offset(SIDE_TOP, 0.0, top_margin);
-		internal_container->set_anchor_and_offset(SIDE_BOTTOM, 0.0, _get_tab_height() - bottom_margin);
+		tab_bar->set_anchor_and_offset(SIDE_TOP, 0.0, top_margin);
+		tab_bar->set_anchor_and_offset(SIDE_BOTTOM, 0.0, _get_tab_height() - bottom_margin);
 	}
 
 	updating_visibility = true;
@@ -325,7 +400,6 @@ void TabContainer::_repaint_internal() {
 	updating_visibility = false;
 
 	update_minimum_size();
-	layout_pending_finish();
 }
 
 void TabContainer::_update_margins() {
@@ -339,28 +413,32 @@ void TabContainer::_update_margins() {
 		SWAP(left_margin, right_margin);
 	}
 
+	if (has_popup) {
+		right_margin += theme_cache.menu_icon->get_width();
+	}
+
 	if (get_tab_count() == 0) {
-		internal_container->set_offset(SIDE_LEFT, left_margin);
-		internal_container->set_offset(SIDE_RIGHT, -right_margin);
+		tab_bar->set_offset(SIDE_LEFT, left_margin);
+		tab_bar->set_offset(SIDE_RIGHT, -right_margin);
 		return;
 	}
 
 	switch (get_tab_alignment()) {
 		case TabBar::ALIGNMENT_LEFT: {
-			internal_container->set_offset(SIDE_LEFT, left_margin + theme_cache.side_margin);
-			internal_container->set_offset(SIDE_RIGHT, -right_margin);
+			tab_bar->set_offset(SIDE_LEFT, left_margin + theme_cache.side_margin);
+			tab_bar->set_offset(SIDE_RIGHT, -right_margin);
 		} break;
 
 		case TabBar::ALIGNMENT_CENTER: {
-			internal_container->set_offset(SIDE_LEFT, left_margin);
-			internal_container->set_offset(SIDE_RIGHT, -right_margin);
+			tab_bar->set_offset(SIDE_LEFT, left_margin);
+			tab_bar->set_offset(SIDE_RIGHT, -right_margin);
 		} break;
 
 		case TabBar::ALIGNMENT_RIGHT: {
-			internal_container->set_offset(SIDE_LEFT, left_margin);
+			tab_bar->set_offset(SIDE_LEFT, left_margin);
 
 			if (has_popup) {
-				internal_container->set_offset(SIDE_RIGHT, -right_margin);
+				tab_bar->set_offset(SIDE_RIGHT, -right_margin);
 				return;
 			}
 
@@ -370,9 +448,9 @@ void TabContainer::_update_margins() {
 
 			// Calculate if all the tabs would still fit if the margin was present.
 			if (get_clip_tabs() && (tab_bar->get_offset_buttons_visible() || (get_tab_count() > 1 && (total_tabs_width + theme_cache.side_margin) > get_size().width))) {
-				internal_container->set_offset(SIDE_RIGHT, -right_margin);
+				tab_bar->set_offset(SIDE_RIGHT, -right_margin);
 			} else {
-				internal_container->set_offset(SIDE_RIGHT, -right_margin - theme_cache.side_margin);
+				tab_bar->set_offset(SIDE_RIGHT, -right_margin - theme_cache.side_margin);
 			}
 		} break;
 
@@ -381,16 +459,24 @@ void TabContainer::_update_margins() {
 	}
 }
 
+void TabContainer::_on_mouse_exited() {
+	if (menu_hovered) {
+		menu_hovered = false;
+		queue_redraw();
+	}
+}
+
 Vector<Control *> TabContainer::_get_tab_controls() const {
 	Vector<Control *> controls;
-	ERR_THREAD_GUARD_V(controls);
-
-	for (Node *child : iterate_children()) {
-		Control *control = _as_tab_control(child);
-		if (control) {
-			controls.push_back(control);
+	for (int i = 0; i < get_child_count(); i++) {
+		Control *control = as_sortable_control(get_child(i), SortableVisibilityMode::IGNORE);
+		if (!control || control == tab_bar || children_removing.has(control)) {
+			continue;
 		}
+
+		controls.push_back(control);
 	}
+
 	return controls;
 }
 
@@ -420,44 +506,17 @@ void TabContainer::_drag_move_tab(int p_from_index, int p_to_index) {
 }
 
 void TabContainer::_drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index) {
-	HBoxContainer *parent = Object::cast_to<HBoxContainer>(p_from_tabbar->get_parent()); // The internal container.
+	Node *parent = p_from_tabbar->get_parent();
 	if (!parent) {
 		return;
 	}
-	TabContainer *from_tab_container = Object::cast_to<TabContainer>(parent->get_parent());
+	TabContainer *from_tab_container = Object::cast_to<TabContainer>(parent);
 	if (!from_tab_container) {
 		return;
 	}
 	move_tab_from_tab_container(from_tab_container, p_from_index, p_to_index);
 }
 
-void TabContainer::_popup_button_hovered(bool p_hover) {
-	if (p_hover) {
-		popup_button->set_button_icon(theme_cache.menu_hl_icon);
-	} else {
-		popup_button->set_button_icon(theme_cache.menu_icon);
-	}
-}
-
-void TabContainer::_popup_button_pressed() {
-	Popup *popup = get_popup();
-	ERR_FAIL_NULL(popup);
-
-	emit_signal(SNAME("pre_popup_pressed"));
-
-	Vector2 popup_pos = popup_button->get_screen_position();
-	popup_pos.x += (is_layout_rtl() ? 0 : popup_button->get_size().x - popup->get_size().width);
-	if (tabs_position == POSITION_BOTTOM) {
-		popup_pos.y -= popup->get_size().height;
-	} else {
-		popup_pos.y += popup_button->get_size().y;
-	}
-
-	popup->set_position(popup_pos);
-	popup->popup();
-	return;
-}
-
 void TabContainer::move_tab_from_tab_container(TabContainer *p_from, int p_from_index, int p_to_index) {
 	ERR_FAIL_NULL(p_from);
 	ERR_FAIL_INDEX(p_from_index, p_from->get_tab_count());
@@ -505,16 +564,15 @@ void TabContainer::_on_tab_hovered(int p_tab) {
 }
 
 void TabContainer::_on_tab_changed(int p_tab) {
-	_repaint();
+	callable_mp(this, &TabContainer::_repaint).call_deferred();
 	queue_redraw();
-	queue_accessibility_update();
 
 	emit_signal(SNAME("tab_changed"), p_tab);
 }
 
 void TabContainer::_on_tab_selected(int p_tab) {
 	if (p_tab != get_previous_tab()) {
-		_repaint_call_deferred();
+		callable_mp(this, &TabContainer::_repaint).call_deferred();
 	}
 
 	emit_signal(SNAME("tab_selected"), p_tab);
@@ -582,7 +640,7 @@ void TabContainer::_refresh_tab_names() {
 void TabContainer::add_child_notify(Node *p_child) {
 	Container::add_child_notify(p_child);
 
-	if (p_child == internal_container) {
+	if (p_child == tab_bar) {
 		return;
 	}
 
@@ -606,7 +664,7 @@ void TabContainer::add_child_notify(Node *p_child) {
 
 	// TabBar won't emit the "tab_changed" signal when not inside the tree.
 	if (!is_inside_tree()) {
-		_repaint_call_deferred();
+		callable_mp(this, &TabContainer::_repaint).call_deferred();
 	}
 	notify_property_list_changed();
 }
@@ -614,7 +672,7 @@ void TabContainer::add_child_notify(Node *p_child) {
 void TabContainer::move_child_notify(Node *p_child) {
 	Container::move_child_notify(p_child);
 
-	if (p_child == internal_container) {
+	if (p_child == tab_bar) {
 		return;
 	}
 
@@ -632,11 +690,11 @@ void TabContainer::remove_child_notify(Node *p_child) {
 	Container::remove_child_notify(p_child);
 
 	if (tab_panels.has(p_child)) {
-		AccessibilityServer::get_singleton()->free_element(tab_panels[p_child]);
+		DisplayServer::get_singleton()->accessibility_free_element(tab_panels[p_child]);
 		tab_panels.erase(p_child);
 	}
 
-	if (p_child == internal_container) {
+	if (p_child == tab_bar) {
 		return;
 	}
 
@@ -668,7 +726,7 @@ void TabContainer::remove_child_notify(Node *p_child) {
 
 	// TabBar won't emit the "tab_changed" signal when not inside the tree.
 	if (!is_inside_tree()) {
-		_repaint_call_deferred();
+		callable_mp(this, &TabContainer::_repaint).call_deferred();
 	}
 	notify_property_list_changed();
 }
@@ -715,24 +773,12 @@ bool TabContainer::get_deselect_enabled() const {
 }
 
 Control *TabContainer::get_tab_control(int p_idx) const {
-	if (p_idx < 0) {
+	Vector<Control *> controls = _get_tab_controls();
+	if (p_idx >= 0 && p_idx < controls.size()) {
+		return controls[p_idx];
+	} else {
 		return nullptr;
 	}
-	ERR_THREAD_GUARD_V(nullptr);
-
-	for (Node *child : iterate_children()) {
-		Control *control = _as_tab_control(child);
-		if (!control) {
-			continue;
-		}
-
-		if (p_idx > 0) {
-			p_idx--;
-		} else {
-			return control;
-		}
-	}
-	return nullptr;
 }
 
 Control *TabContainer::get_current_tab_control() const {
@@ -746,20 +792,14 @@ int TabContainer::get_tab_idx_at_point(const Point2 &p_point) const {
 int TabContainer::get_tab_idx_from_control(Control *p_child) const {
 	ERR_FAIL_NULL_V(p_child, -1);
 	ERR_FAIL_COND_V(p_child->get_parent() != this, -1);
-	ERR_THREAD_GUARD_V(-1);
 
-	int idx = 0;
-	for (Node *child : iterate_children()) {
-		Control *control = _as_tab_control(child);
-		if (!control) {
-			continue;
+	Vector<Control *> controls = _get_tab_controls();
+	for (int i = 0; i < controls.size(); i++) {
+		if (controls[i] == p_child) {
+			return i;
 		}
-
-		if (control == p_child) {
-			return idx;
-		}
-		idx++;
 	}
+
 	return -1;
 }
 
@@ -785,7 +825,7 @@ void TabContainer::set_tabs_position(TabPosition p_tabs_position) {
 
 	tab_bar->set_tab_style_v_flip(tabs_position == POSITION_BOTTOM);
 
-	_repaint_call_deferred();
+	callable_mp(this, &TabContainer::_repaint).call_deferred();
 	queue_redraw();
 }
 
@@ -817,7 +857,7 @@ void TabContainer::set_tabs_visible(bool p_visible) {
 	tabs_visible = p_visible;
 	tab_bar->set_visible(tabs_visible);
 
-	_repaint_call_deferred();
+	callable_mp(this, &TabContainer::_repaint).call_deferred();
 	queue_redraw();
 }
 
@@ -958,7 +998,7 @@ void TabContainer::set_tab_hidden(int p_tab, bool p_hidden) {
 	if (!get_clip_tabs()) {
 		update_minimum_size();
 	}
-	_repaint_call_deferred();
+	callable_mp(this, &TabContainer::_repaint).call_deferred();
 }
 
 bool TabContainer::is_tab_hidden(int p_tab) const {
@@ -993,7 +1033,7 @@ Size2 TabContainer::get_minimum_size() const {
 		ms.height += theme_cache.tabbar_style->get_margin(SIDE_TOP) + theme_cache.tabbar_style->get_margin(SIDE_BOTTOM);
 
 		if (get_popup()) {
-			ms.width += popup_button->get_minimum_size().x;
+			ms.width += theme_cache.menu_icon->get_width();
 		}
 
 		if (theme_cache.side_margin > 0 && get_tab_alignment() != TabBar::ALIGNMENT_CENTER &&
@@ -1034,26 +1074,8 @@ void TabContainer::set_popup(Node *p_popup) {
 	}
 	popup_obj_id = popup_id;
 
-	if (!popup_button) {
-		popup_button = memnew(Button);
-		popup_button->set_action_mode(BaseButton::ACTION_MODE_BUTTON_PRESS);
-		popup_button->set_flat(true);
-		if (is_inside_tree()) {
-			popup_button->set_button_icon(theme_cache.menu_icon);
-		}
-		popup_button->add_theme_color_override("icon_pressed_color", Color(1, 1, 1));
-		popup_button->add_theme_color_override("icon_hover_pressed_color", Color(1, 1, 1));
-
-		internal_container->add_child(popup_button);
-		internal_container->move_child(popup_button, is_layout_rtl() ? 0 : 1);
-
-		popup_button->connect(SceneStringName(mouse_entered), callable_mp(this, &TabContainer::_popup_button_hovered).bind(true));
-		popup_button->connect(SceneStringName(mouse_exited), callable_mp(this, &TabContainer::_popup_button_hovered).bind(false));
-		popup_button->connect(SceneStringName(pressed), callable_mp(this, &TabContainer::_popup_button_pressed));
-	}
-
 	if (had_popup != bool(popup)) {
-		popup_button->set_visible(popup != nullptr);
+		queue_redraw();
 		_update_margins();
 		update_minimum_size();
 	}
@@ -1197,7 +1219,6 @@ void TabContainer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "deselect_enabled"), "set_deselect_enabled", "get_deselect_enabled");
 
 	ADD_CLASS_DEPENDENCY("TabBar");
-	ADD_CLASS_DEPENDENCY("Button");
 
 	BIND_ENUM_CONSTANT(POSITION_TOP);
 	BIND_ENUM_CONSTANT(POSITION_BOTTOM);
@@ -1249,31 +1270,25 @@ void TabContainer::_bind_methods() {
 	base_property_helper.set_prefix("tab_");
 	base_property_helper.set_array_length_getter(&TabContainer::get_tab_count);
 	base_property_helper.register_property(PropertyInfo(Variant::STRING, "title"), defaults.title, &TabContainer::set_tab_title, &TabContainer::get_tab_title);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), defaults.icon, &TabContainer::set_tab_icon, &TabContainer::get_tab_icon);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), defaults.icon, &TabContainer::set_tab_icon, &TabContainer::get_tab_icon);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "disabled"), defaults.disabled, &TabContainer::set_tab_disabled, &TabContainer::is_tab_disabled);
 	base_property_helper.register_property(PropertyInfo(Variant::BOOL, "hidden"), defaults.hidden, &TabContainer::set_tab_hidden, &TabContainer::is_tab_hidden);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 TabContainer::TabContainer() {
-	internal_container = memnew(HBoxContainer);
-	internal_container->add_theme_constant_override(SNAME("separation"), 0);
-	internal_container->set_anchors_and_offsets_preset(Control::PRESET_TOP_WIDE);
-	internal_container->set_use_parent_material(true);
-	add_child(internal_container, false, INTERNAL_MODE_FRONT);
-
 	tab_bar = memnew(TabBar);
 	SET_DRAG_FORWARDING_GCDU(tab_bar, TabContainer);
+	add_child(tab_bar, false, INTERNAL_MODE_FRONT);
 	tab_bar->set_use_parent_material(true);
-
-	tab_bar->set_h_size_flags(SIZE_EXPAND_FILL);
-	internal_container->add_child(tab_bar);
+	tab_bar->set_anchors_and_offsets_preset(Control::PRESET_TOP_WIDE);
 	tab_bar->connect("tab_changed", callable_mp(this, &TabContainer::_on_tab_changed));
 	tab_bar->connect("tab_clicked", callable_mp(this, &TabContainer::_on_tab_clicked));
 	tab_bar->connect("tab_hovered", callable_mp(this, &TabContainer::_on_tab_hovered));
 	tab_bar->connect("tab_selected", callable_mp(this, &TabContainer::_on_tab_selected));
 	tab_bar->connect("tab_button_pressed", callable_mp(this, &TabContainer::_on_tab_button_pressed));
 	tab_bar->connect("active_tab_rearranged", callable_mp(this, &TabContainer::_on_active_tab_rearranged));
+	connect(SceneStringName(mouse_exited), callable_mp(this, &TabContainer::_on_mouse_exited));
 
 	property_helper.setup_for_instance(base_property_helper, this);
 	property_helper.enable_out_of_bounds_assign();
diff --git a/engine/scene/gui/tab_container.h b/engine/scene/gui/tab_container.h
index f3c40564..e418de35 100644
--- a/engine/scene/gui/tab_container.h
+++ b/engine/scene/gui/tab_container.h
@@ -31,13 +31,10 @@
 #pragma once
 
 #include "scene/gui/container.h"
+#include "scene/gui/popup.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/property_list_helper.h"
 
-class Button;
-class HBoxContainer;
-class Popup;
-
 class TabContainer : public Container {
 	GDCLASS(TabContainer, Container);
 
@@ -49,13 +46,11 @@ public:
 	};
 
 private:
-	HBoxContainer *internal_container = nullptr;
 	TabBar *tab_bar = nullptr;
-	Button *popup_button = nullptr;
-
 	bool tabs_visible = true;
 	bool all_tabs_in_front = false;
 	TabPosition tabs_position = POSITION_TOP;
+	bool menu_hovered = false;
 	mutable ObjectID popup_obj_id;
 	bool use_hidden_tabs_for_min_size = false;
 	bool theme_changing = false;
@@ -123,16 +118,15 @@ private:
 
 	HashMap<Node *, RID> tab_panels;
 
+	Rect2 _get_tab_rect() const;
 	int _get_tab_height() const;
-	Control *_as_tab_control(Node *p_child) const;
 	Vector<Control *> _get_tab_controls() const;
 	void _on_theme_changed();
-	void _repaint_call_deferred();
 	void _repaint();
-	void _repaint_internal();
 	void _refresh_tab_indices();
 	void _refresh_tab_names();
 	void _update_margins();
+	void _on_mouse_exited();
 	void _on_tab_changed(int p_tab);
 	void _on_tab_clicked(int p_tab);
 	void _on_tab_hovered(int p_tab);
@@ -147,10 +141,9 @@ private:
 	void _drag_move_tab(int p_from_index, int p_to_index);
 	void _drag_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index);
 
-	void _popup_button_hovered(bool p_hover);
-	void _popup_button_pressed();
-
 protected:
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+
 	bool _set(const StringName &p_name, const Variant &p_value) { return property_helper.property_set_value(p_name, p_value); }
 	bool _get(const StringName &p_name, Variant &r_ret) const { return property_helper.property_get_value(p_name, r_ret); }
 	void _get_property_list(List<PropertyInfo> *p_list) const;
@@ -166,7 +159,6 @@ protected:
 public:
 	virtual bool accessibility_override_tree_hierarchy() const override { return true; }
 
-	HBoxContainer *get_internal_container() { return internal_container; }
 	TabBar *get_tab_bar() const;
 
 	int get_tab_idx_at_point(const Point2 &p_point) const;
diff --git a/engine/scene/gui/text_edit.compat.inc b/engine/scene/gui/text_edit.compat.inc
index c4054078..d1574039 100644
--- a/engine/scene/gui/text_edit.compat.inc
+++ b/engine/scene/gui/text_edit.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "text_edit.h"
-
-#include "core/object/class_db.h"
-
 void TextEdit::_set_selection_mode_compat_86978(SelectionMode p_mode, int p_line, int p_column, int p_caret) {
 	set_selection_mode(p_mode);
 }
@@ -47,4 +43,4 @@ void TextEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_line_column_at_pos", "position", "allow_out_of_bounds"), &TextEdit::_get_line_column_at_pos_bind_compat_100913, DEFVAL(true));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/gui/text_edit.cpp b/engine/scene/gui/text_edit.cpp
index e9f75775..465045f6 100644
--- a/engine/scene/gui/text_edit.cpp
+++ b/engine/scene/gui/text_edit.cpp
@@ -31,25 +31,17 @@
 #include "text_edit.h"
 #include "text_edit.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/input/input_map.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
-#include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/string/alt_codes.h"
 #include "core/string/string_builder.h"
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 ///                            TEXT                                         ///
@@ -252,7 +244,7 @@ void TextEdit::Text::update_accessibility(int p_line, RID p_root) {
 	if (l.accessibility_text_root_element.is_empty()) {
 		for (int i = 0; i < l.data_buf->get_line_count(); i++) {
 			bool is_last_line = (p_line == text.size() - 1) && (i == l.data_buf->get_line_count() - 1);
-			RID rid = AccessibilityServer::get_singleton()->create_sub_text_edit_elements(p_root, l.data_buf->get_line_rid(i), max_line_height, p_line, is_last_line);
+			RID rid = DisplayServer::get_singleton()->accessibility_create_sub_text_edit_elements(p_root, l.data_buf->get_line_rid(i), max_line_height, p_line, is_last_line);
 			l.accessibility_text_root_element.push_back(rid);
 		}
 	}
@@ -275,7 +267,7 @@ void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
 	Line &l = text.write[p_line];
 	for (const RID rid : l.accessibility_text_root_element) {
 		if (rid.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(rid);
+			DisplayServer::get_singleton()->accessibility_free_element(rid);
 		}
 	}
 	l.accessibility_text_root_element.clear();
@@ -654,11 +646,11 @@ String TextEdit::Text::get_enabled_word_separators() const {
 void TextEdit::_accessibility_action_set_selection(const Variant &p_data) {
 	Dictionary new_selection = p_data;
 	RID sel_start = new_selection["start_element"];
-	Vector2i sel_start_line = AccessibilityServer::get_singleton()->element_get_meta(sel_start);
+	Vector2i sel_start_line = DisplayServer::get_singleton()->accessibility_element_get_meta(sel_start);
 	int sel_start_pos = new_selection["start_char"];
 
 	RID sel_end = new_selection["end_element"];
-	Vector2i sel_end_line = AccessibilityServer::get_singleton()->element_get_meta(sel_end);
+	Vector2i sel_end_line = DisplayServer::get_singleton()->accessibility_element_get_meta(sel_end);
 	int sel_end_pos = new_selection["end_char"];
 
 	remove_secondary_carets();
@@ -687,7 +679,7 @@ void TextEdit::_accessibility_action_menu(const Variant &p_data) {
 }
 
 void TextEdit::_accessibility_scroll_down(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
@@ -696,7 +688,7 @@ void TextEdit::_accessibility_scroll_down(const Variant &p_data) {
 }
 
 void TextEdit::_accessibility_scroll_left(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
@@ -705,7 +697,7 @@ void TextEdit::_accessibility_scroll_left(const Variant &p_data) {
 }
 
 void TextEdit::_accessibility_scroll_right(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
@@ -714,7 +706,7 @@ void TextEdit::_accessibility_scroll_right(const Variant &p_data) {
 }
 
 void TextEdit::_accessibility_scroll_up(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
@@ -742,14 +734,6 @@ Ref<StyleBox> TextEdit::_get_current_stylebox() const {
 	return editable ? theme_cache.style_normal : theme_cache.style_readonly;
 }
 
-String TextEdit::_get_accessibility_name() const {
-	if (!placeholder_text.is_empty() && get_accessibility_name().is_empty()) {
-		return atr(placeholder_text);
-	} else {
-		return Control::_get_accessibility_name();
-	}
-}
-
 void TextEdit::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_EXIT_TREE:
@@ -761,22 +745,24 @@ void TextEdit::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD);
 			if (text.size() == 1 && text[0].is_empty()) {
-				AccessibilityServer::get_singleton()->update_set_placeholder(ae, atr(placeholder_text));
+				DisplayServer::get_singleton()->accessibility_update_set_placeholder(ae, atr(placeholder_text));
 			}
+			if (!placeholder_text.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, atr(placeholder_text));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, !editable);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &TextEdit::_accessibility_action_set_selection));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &TextEdit::_accessibility_action_replace_selected));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &TextEdit::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &TextEdit::_accessibility_action_menu));
 
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_READONLY, !editable);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &TextEdit::_accessibility_action_set_selection));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &TextEdit::_accessibility_action_replace_selected));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &TextEdit::_accessibility_action_set_value));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &TextEdit::_accessibility_action_menu));
-
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &TextEdit::_accessibility_scroll_down));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &TextEdit::_accessibility_scroll_left));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &TextEdit::_accessibility_scroll_right));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &TextEdit::_accessibility_scroll_up));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &TextEdit::_accessibility_scroll_set));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &TextEdit::_accessibility_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &TextEdit::_accessibility_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &TextEdit::_accessibility_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &TextEdit::_accessibility_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &TextEdit::_accessibility_scroll_set));
 
 			int first_vis_line = get_first_visible_line();
 			int row_height = get_line_height();
@@ -811,13 +797,13 @@ void TextEdit::_notification(int p_what) {
 						char_margin += wrap_indent;
 					}
 
-					AccessibilityServer::get_singleton()->update_set_flag(text_aes[j], AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, _is_line_hidden(i));
+					DisplayServer::get_singleton()->accessibility_update_set_flag(text_aes[j], DisplayServer::AccessibilityFlags::FLAG_HIDDEN, _is_line_hidden(i));
 					Transform2D tr;
 					tr.set_origin(Point2(char_margin, text_off_y));
-					AccessibilityServer::get_singleton()->update_set_transform(text_aes[j], tr);
-					AccessibilityServer::get_singleton()->update_set_name(text_aes[j], vformat(RTR("Line %d"), i));
-					AccessibilityServer::get_singleton()->element_set_meta(text_aes[j], Vector2i(i, j));
-					AccessibilityServer::get_singleton()->update_add_action(text_aes[j], AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TextEdit::_accessibility_action_scroll_into_view).bind(i, j));
+					DisplayServer::get_singleton()->accessibility_update_set_transform(text_aes[j], tr);
+					DisplayServer::get_singleton()->accessibility_update_set_name(text_aes[j], vformat(RTR("Line %d"), i));
+					DisplayServer::get_singleton()->accessibility_element_set_meta(text_aes[j], Vector2i(i, j));
+					DisplayServer::get_singleton()->accessibility_update_add_action(text_aes[j], DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TextEdit::_accessibility_action_scroll_into_view).bind(i, j));
 				}
 				lines_drawn += ac_buf->get_line_count();
 			}
@@ -830,11 +816,11 @@ void TextEdit::_notification(int p_what) {
 
 					int end_wrap = get_line_wrap_index_at_column(carets[0].line, carets[0].column);
 					RID end_rid = text.get_accessibility_elements(carets[0].line)[end_wrap];
-					AccessibilityServer::get_singleton()->update_set_text_selection(ae, start_rid, carets[0].selection.origin_column, end_rid, carets[0].column);
+					DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, start_rid, carets[0].selection.origin_column, end_rid, carets[0].column);
 				} else {
 					int caret_wrap = get_line_wrap_index_at_column(carets[0].line, carets[0].column);
 					RID caret_rid = text.get_accessibility_elements(carets[0].line)[caret_wrap];
-					AccessibilityServer::get_singleton()->update_set_text_selection(ae, caret_rid, carets[0].column, caret_rid, carets[0].column);
+					DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, caret_rid, carets[0].column, caret_rid, carets[0].column);
 				}
 			}
 		} break;
@@ -846,9 +832,7 @@ void TextEdit::_notification(int p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			_update_caches();
 			if (caret_pos_dirty) {
-				// No need to emit "caret_changed" signal (otherwise will save an unnecessary state to history),
-				// so we use `_set_caret_pos_dirty()` instead of `_emit_caret_changed()`.
-				callable_mp(this, &TextEdit::_set_caret_pos_dirty).call_deferred(false);
+				callable_mp(this, &TextEdit::_emit_caret_changed).call_deferred();
 			}
 			if (text_changed_dirty) {
 				callable_mp(this, &TextEdit::_emit_text_changed).call_deferred();
@@ -949,7 +933,7 @@ void TextEdit::_notification(int p_what) {
 			RS::get_singleton()->canvas_item_set_custom_rect(text_ci, !is_visibility_clip_disabled(), Rect2(Point2(0, 0), size));
 			RS::get_singleton()->canvas_item_set_clip(text_ci, true);
 			RS::get_singleton()->canvas_item_set_visibility_layer(text_ci, get_visibility_layer());
-			RS::get_singleton()->canvas_item_set_default_texture_filter(text_ci, RSE::CanvasItemTextureFilter(get_texture_filter_in_tree()));
+			RS::get_singleton()->canvas_item_set_default_texture_filter(text_ci, RS::CanvasItemTextureFilter(get_texture_filter_in_tree()));
 
 			int left_margin = Math::ceil(style->get_margin(SIDE_LEFT));
 			int xmargin_beg = left_margin + gutters_width + gutter_padding;
@@ -1391,9 +1375,9 @@ void TextEdit::_notification(int p_what) {
 
 					int ofs_y = style->get_margin(SIDE_TOP);
 
-					ofs_y += i * row_height;
+					ofs_y += i * row_height + theme_cache.line_spacing / 2;
 					ofs_y -= first_visible_line_wrap_ofs * row_height;
-					ofs_y -= (int)Math::round(_get_v_scroll_offset() * row_height);
+					ofs_y -= _get_v_scroll_offset() * row_height;
 
 					bool clipped = false;
 					if (ofs_y + row_height < top_limit_y) {
@@ -1470,16 +1454,12 @@ void TextEdit::_notification(int p_what) {
 									gutter_rect.size -= Point2(horizontal_padding, vertical_padding) * 2;
 
 									// Correct icon aspect ratio.
-									float icon_ratio = (float)icon->get_width() / (float)icon->get_height();
+									float icon_ratio = icon->get_width() / icon->get_height();
 									float gutter_ratio = gutter_rect.size.x / gutter_rect.size.y;
 									if (gutter_ratio > icon_ratio) {
-										float ratio_width = Math::floor(gutter_rect.size.y * icon_ratio);
-										gutter_rect.position.x += (gutter_rect.size.x - ratio_width) / 2;
-										gutter_rect.size.x = ratio_width;
+										gutter_rect.size.x = std::floor(icon->get_width() * (gutter_rect.size.y / icon->get_height()));
 									} else {
-										float ratio_height = Math::floor(gutter_rect.size.x / icon_ratio);
-										gutter_rect.position.y += (gutter_rect.size.y - ratio_height) / 2;
-										gutter_rect.size.y = ratio_height;
+										gutter_rect.size.y = std::floor(icon->get_height() * (gutter_rect.size.x / icon->get_width()));
 									}
 									if (rtl) {
 										gutter_rect.position.x = size.width - gutter_rect.position.x - gutter_rect.size.x;
@@ -1979,7 +1959,7 @@ void TextEdit::_notification(int p_what) {
 
 			apply_ime();
 
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
 				DisplayServer::get_singleton()->virtual_keyboard_hide();
 			}
 
@@ -1989,7 +1969,7 @@ void TextEdit::_notification(int p_what) {
 		} break;
 
 		case MainLoop::NOTIFICATION_OS_IME_UPDATE: {
-			if (has_focus() && editable) {
+			if (has_focus()) {
 				const String &new_ime_text = DisplayServer::get_singleton()->ime_get_text();
 				const Vector2i &new_ime_selection = DisplayServer::get_singleton()->ime_get_selection();
 				if (ime_text == new_ime_text && ime_selection == new_ime_selection) {
@@ -2074,9 +2054,6 @@ void TextEdit::unhandled_key_input(const Ref<InputEvent> &p_event) {
 }
 
 bool TextEdit::alt_input(const Ref<InputEvent> &p_gui_input) {
-	if (!editable) {
-		return false;
-	}
 	Ref<InputEventKey> k = p_gui_input;
 	if (k.is_valid()) {
 		// Start Unicode Alt input (hold).
@@ -2448,7 +2425,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 				queue_redraw();
 			}
 
-			if (is_middle_mouse_paste_enabled() && mb->get_button_index() == MouseButton::MIDDLE && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+			if (is_middle_mouse_paste_enabled() && mb->get_button_index() == MouseButton::MIDDLE && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 				apply_ime();
 				paste_primary_clipboard();
 			}
@@ -2479,7 +2456,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 					menu->set_position(get_screen_transform().xform(mpos));
 					menu->reset_size();
 					menu->popup();
-					grab_focus(true);
+					grab_focus();
 				}
 			}
 		} else {
@@ -2504,7 +2481,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 				can_drag_minimap = false;
 				set_selection_mode(SelectionMode::SELECTION_MODE_NONE);
 				click_select_held->stop();
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 					DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 				}
 			}
@@ -3441,8 +3418,8 @@ void TextEdit::_update_caches(bool p_invalidate_all) {
 }
 
 void TextEdit::_close_ime_window() {
-	DisplayServerEnums::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServerEnums::INVALID_WINDOW_ID;
-	if (wid == DisplayServerEnums::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_IME)) {
+	DisplayServer::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+	if (wid == DisplayServer::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_ime_position(Point2(), wid);
@@ -3450,12 +3427,8 @@ void TextEdit::_close_ime_window() {
 }
 
 void TextEdit::_update_ime_window_position() {
-	DisplayServerEnums::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServerEnums::INVALID_WINDOW_ID;
-	if (wid == DisplayServerEnums::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_IME)) {
-		return;
-	}
-	if (!editable) {
-		DisplayServer::get_singleton()->window_set_ime_active(false, wid);
+	DisplayServer::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+	if (wid == DisplayServer::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_ime_active(true, wid);
@@ -3494,7 +3467,7 @@ void TextEdit::_update_ime_text() {
 void TextEdit::_show_virtual_keyboard() {
 	_update_ime_window_position();
 
-	if (virtual_keyboard_enabled && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD)) {
+	if (virtual_keyboard_enabled && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD)) {
 		int caret_start = -1;
 		int caret_end = -1;
 
@@ -3510,7 +3483,7 @@ void TextEdit::_show_virtual_keyboard() {
 			caret_end = caret_start + post_text.length();
 		}
 
-		DisplayServer::get_singleton()->virtual_keyboard_show(get_text(), get_global_rect(), DisplayServerEnums::KEYBOARD_TYPE_MULTILINE, -1, caret_start, caret_end);
+		DisplayServer::get_singleton()->virtual_keyboard_show(get_text(), get_global_rect(), DisplayServer::KEYBOARD_TYPE_MULTILINE, -1, caret_start, caret_end);
 	}
 }
 
@@ -3603,7 +3576,7 @@ void TextEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
 		insert_text_at_caret(p_data);
 
 		select(drop_at_line, drop_at_column, get_caret_line(), get_caret_column());
-		grab_focus(true);
+		grab_focus();
 		adjust_viewport_to_caret();
 		end_multicaret_edit();
 		end_complex_operation();
@@ -3738,9 +3711,6 @@ void TextEdit::set_editable(bool p_editable) {
 	}
 
 	editable = p_editable;
-	if (editable) {
-		draw_caret = true;
-	}
 	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
@@ -4063,7 +4033,6 @@ void TextEdit::set_placeholder(const String &p_text) {
 
 	placeholder_text = p_text;
 	_update_placeholder();
-	update_configuration_warnings();
 	queue_accessibility_update();
 	queue_redraw();
 }
@@ -4923,11 +4892,6 @@ Point2i TextEdit::search(const String &p_key, uint32_t p_search_flags, int p_fro
 	int current_line = p_from_line;
 	int current_column = p_from_column;
 
-	if (p_search_flags & SEARCH_BACKWARDS) {
-		// `rfind` requires the from index to be within the bounds of the last possible match position.
-		current_column = MIN(current_column, text[p_from_line].length() - p_key.length());
-	}
-
 	// + 1 because we'll search p_from_line twice - starting from p_from_column, and then again at the very end.
 	for (int i = 0; i < text.size() + 1; i++) {
 		const String &text_line = text[current_line];
@@ -5008,7 +4972,7 @@ String TextEdit::get_word(int p_line, int p_column) const {
 	}
 	ERR_FAIL_INDEX_V(p_line, text.size(), String());
 
-	const String &text_line = text.get_text_with_ime(p_line);
+	const String &text_line = text[p_line];
 	if (text_line.is_empty()) {
 		return String();
 	}
@@ -5025,7 +4989,7 @@ String TextEdit::get_word(int p_line, int p_column) const {
 
 Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_clamp_line, bool p_clamp_column) const {
 	Ref<StyleBox> style = _get_current_stylebox();
-	float rows = p_pos.y - style->get_margin(SIDE_TOP);
+	float rows = p_pos.y - (style->get_margin(SIDE_TOP) + (theme_cache.line_spacing / 2));
 	rows /= get_line_height();
 	rows += _get_v_scroll_offset();
 	int first_vis_line = get_first_visible_line();
@@ -5460,7 +5424,6 @@ void TextEdit::add_caret_at_carets(bool p_below) {
 			carets.remove_at(new_caret_index);
 			carets.insert(0, new_caret);
 			i++;
-			num_carets += 1;
 		}
 	}
 
@@ -5824,7 +5787,7 @@ String TextEdit::get_word_under_caret(int p_caret) const {
 
 		PackedInt32Array words = TS->shaped_text_get_word_breaks(text.get_line_data(get_caret_line(c))->get_rid());
 		for (int i = 0; i < words.size(); i = i + 2) {
-			if (words[i] <= get_caret_column(c) && words[i + 1] >= get_caret_column(c)) {
+			if (words[i] <= get_caret_column(c) && words[i + 1] > get_caret_column(c)) {
 				selected_text += text[get_caret_line(c)].substr(words[i], words[i + 1] - words[i]);
 				if (p_caret == -1 && c != carets.size() - 1) {
 					selected_text += "\n";
@@ -6426,20 +6389,24 @@ int TextEdit::get_line_wrap_count(int p_line) const {
 int TextEdit::get_line_wrap_index_at_column(int p_line, int p_column) const {
 	ERR_FAIL_INDEX_V(p_line, text.size(), 0);
 	ERR_FAIL_COND_V(p_column < 0, 0);
-	ERR_FAIL_COND_V(p_column > text.get_text_with_ime(p_line).length(), 0);
+	ERR_FAIL_COND_V(p_column > text[p_line].length(), 0);
 
 	if (!is_line_wrapped(p_line)) {
 		return 0;
 	}
 
-	// Loop through wraps in the line text until we get to the column.
-	const Vector<Vector2i> line_ranges = text.get_line_wrap_ranges(p_line);
-	for (int i = 0; i < line_ranges.size(); i++) {
-		if (line_ranges[i].y > p_column) {
-			return i;
+	/* Loop through wraps in the line text until we get to the column. */
+	int wrap_index = 0;
+	int col = 0;
+	Vector<String> lines = get_line_wrapped_text(p_line);
+	for (int i = 0; i < lines.size(); i++) {
+		wrap_index = i;
+		col += lines[wrap_index].length();
+		if (col > p_column) {
+			break;
 		}
 	}
-	return line_ranges.is_empty() ? 0 : line_ranges.size() - 1;
+	return wrap_index;
 }
 
 Vector<String> TextEdit::get_line_wrapped_text(int p_line) const {
@@ -6447,13 +6414,12 @@ Vector<String> TextEdit::get_line_wrapped_text(int p_line) const {
 
 	Vector<String> lines;
 	if (!is_line_wrapped(p_line)) {
-		lines.push_back(text.get_text_with_ime(p_line));
+		lines.push_back(text[p_line]);
 		return lines;
 	}
 
-	const String &line_text = text.get_text_with_ime(p_line);
-	const Vector<Vector2i> line_ranges = text.get_line_wrap_ranges(p_line);
-	lines.reserve(line_ranges.size());
+	const String &line_text = text[p_line];
+	Vector<Vector2i> line_ranges = text.get_line_wrap_ranges(p_line);
 	for (int i = 0; i < line_ranges.size(); i++) {
 		lines.push_back(line_text.substr(line_ranges[i].x, line_ranges[i].y - line_ranges[i].x));
 	}
@@ -6673,26 +6639,6 @@ int TextEdit::get_total_visible_line_count() const {
 }
 
 // Auto adjust.
-bool TextEdit::is_line_in_viewport(int p_line) const {
-	ERR_FAIL_INDEX_V(p_line, text.size(), false);
-
-	int line_wrap = get_line_wrap_index_at_column(p_line, 0);
-
-	int first_vis_line = get_first_visible_line();
-	int first_vis_wrap = first_visible_line_wrap_ofs;
-	int last_vis_line = get_last_full_visible_line();
-	int last_vis_wrap = get_last_full_visible_line_wrap_index();
-
-	if (p_line < first_vis_line || (p_line == first_vis_line && p_line < first_vis_wrap)) {
-		// Caret is above screen.
-		return false;
-	} else if (p_line > last_vis_line || (p_line == last_vis_line && line_wrap > last_vis_wrap)) {
-		// Caret is below screen.
-		return false;
-	}
-	return true;
-}
-
 void TextEdit::adjust_viewport_to_caret(int p_caret) {
 	ERR_FAIL_INDEX(p_caret, carets.size());
 
@@ -7502,7 +7448,6 @@ void TextEdit::_bind_methods() {
 	// Visible lines.
 	ClassDB::bind_method(D_METHOD("set_line_as_first_visible", "line", "wrap_index"), &TextEdit::set_line_as_first_visible, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("get_first_visible_line"), &TextEdit::get_first_visible_line);
-	ClassDB::bind_method(D_METHOD("is_line_in_viewport", "line"), &TextEdit::is_line_in_viewport);
 
 	ClassDB::bind_method(D_METHOD("set_line_as_center_visible", "line", "wrap_index"), &TextEdit::set_line_as_center_visible, DEFVAL(0));
 
@@ -7650,7 +7595,7 @@ void TextEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "custom_word_separators"), "set_custom_word_separators", "get_custom_word_separators");
 
 	ADD_GROUP("Highlighting", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "syntax_highlighter", PROPERTY_HINT_RESOURCE_TYPE, SyntaxHighlighter::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE), "set_syntax_highlighter", "get_syntax_highlighter");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "syntax_highlighter", PROPERTY_HINT_RESOURCE_TYPE, "SyntaxHighlighter", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE), "set_syntax_highlighter", "get_syntax_highlighter");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_all_occurrences"), "set_highlight_all_occurrences", "is_highlight_all_occurrences_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "highlight_current_line"), "set_highlight_current_line", "is_highlight_current_line_enabled");
 
@@ -8006,7 +7951,7 @@ void TextEdit::_paste_internal(int p_caret) {
 
 void TextEdit::_paste_primary_clipboard_internal(int p_caret) {
 	ERR_FAIL_COND(p_caret >= get_caret_count() || p_caret < -1);
-	if (!is_editable() || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+	if (!is_editable() || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 		return;
 	}
 
@@ -8083,7 +8028,7 @@ void TextEdit::_generate_context_menu() {
 	menu_ctl->add_item(ETR("Word Joiner (WJ)"), MENU_INSERT_WJ);
 	menu_ctl->add_item(ETR("Soft Hyphen (SHY)"), MENU_INSERT_SHY);
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
 		menu->add_item(ETR("Emoji & Symbols"), MENU_EMOJI_AND_SYMBOL);
 		menu->add_separator();
 	}
@@ -8115,32 +8060,32 @@ void TextEdit::_update_context_menu() {
 
 	int idx = -1;
 
-#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
+#define MENU_ITEM_ACTION_DISABLED(m_menu, m_id, m_action, m_disabled)                                                  \
+	idx = m_menu->get_item_index(m_id);                                                                                \
+	if (idx >= 0) {                                                                                                    \
 		m_menu->set_item_accelerator(idx, shortcut_keys_enabled ? _get_menu_action_accelerator(m_action) : Key::NONE); \
-		m_menu->set_item_disabled(idx, m_disabled); \
+		m_menu->set_item_disabled(idx, m_disabled);                                                                    \
 	}
 
-#define MENU_ITEM_ACTION(m_menu, m_id, m_action) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
+#define MENU_ITEM_ACTION(m_menu, m_id, m_action)                                                                       \
+	idx = m_menu->get_item_index(m_id);                                                                                \
+	if (idx >= 0) {                                                                                                    \
 		m_menu->set_item_accelerator(idx, shortcut_keys_enabled ? _get_menu_action_accelerator(m_action) : Key::NONE); \
 	}
 
 #define MENU_ITEM_DISABLED(m_menu, m_id, m_disabled) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
-		m_menu->set_item_disabled(idx, m_disabled); \
+	idx = m_menu->get_item_index(m_id);              \
+	if (idx >= 0) {                                  \
+		m_menu->set_item_disabled(idx, m_disabled);  \
 	}
 
 #define MENU_ITEM_CHECKED(m_menu, m_id, m_checked) \
-	idx = m_menu->get_item_index(m_id); \
-	if (idx >= 0) { \
-		m_menu->set_item_checked(idx, m_checked); \
+	idx = m_menu->get_item_index(m_id);            \
+	if (idx >= 0) {                                \
+		m_menu->set_item_checked(idx, m_checked);  \
 	}
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EMOJI_AND_SYMBOL_PICKER)) {
 		MENU_ITEM_DISABLED(menu, MENU_EMOJI_AND_SYMBOL, !editable || !emoji_menu_enabled)
 	}
 	MENU_ITEM_ACTION_DISABLED(menu, MENU_CUT, "ui_cut", !editable)
@@ -8286,10 +8231,6 @@ int TextEdit::_get_char_pos_for_line(int p_px, int p_line, int p_wrap_index) con
 }
 
 /* Caret */
-void TextEdit::_set_caret_pos_dirty(bool p_dirty) {
-	caret_pos_dirty = p_dirty;
-}
-
 void TextEdit::_caret_changed(int p_caret) {
 	queue_redraw();
 
@@ -8534,7 +8475,7 @@ void TextEdit::_update_selection_mode_word(bool p_initial) {
 	}
 	adjust_viewport_to_caret(caret_index);
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 		DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 	}
 
@@ -8564,7 +8505,7 @@ void TextEdit::_update_selection_mode_line(bool p_initial) {
 		carets.write[caret_index].selection.word_end_column = get_line(origin_line).length();
 	}
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 		DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 	}
 
diff --git a/engine/scene/gui/text_edit.h b/engine/scene/gui/text_edit.h
index 182f7d77..cbd75c6b 100644
--- a/engine/scene/gui/text_edit.h
+++ b/engine/scene/gui/text_edit.h
@@ -457,7 +457,6 @@ private:
 
 	bool setting_caret_line = false;
 	bool caret_pos_dirty = false;
-	void _set_caret_pos_dirty(bool p_dirty);
 
 	int multicaret_edit_count = 0;
 	bool multicaret_edit_merge_queued = false;
@@ -708,8 +707,6 @@ protected:
 	virtual void _draw_guidelines() {}
 	virtual void _update_theme_item_cache() override;
 
-	virtual String _get_accessibility_name() const override;
-
 	/* Internal API for CodeEdit, pending public API. */
 	// Brace matching.
 	struct BraceMatchingData {
@@ -1096,7 +1093,6 @@ public:
 	int get_total_visible_line_count() const;
 
 	// Auto Adjust
-	bool is_line_in_viewport(int p_line) const;
 	void adjust_viewport_to_caret(int p_caret = 0);
 	void center_viewport_to_caret(int p_caret = 0);
 
diff --git a/engine/scene/gui/texture_button.cpp b/engine/scene/gui/texture_button.cpp
index 5e2ef5e2..7b93c483 100644
--- a/engine/scene/gui/texture_button.cpp
+++ b/engine/scene/gui/texture_button.cpp
@@ -30,8 +30,6 @@
 
 #include "texture_button.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/typedefs.h"
 
 Size2 TextureButton::get_minimum_size() const {
@@ -274,16 +272,16 @@ void TextureButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_stretch_mode"), &TextureButton::get_stretch_mode);
 
 	ADD_GROUP("Textures", "texture_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_normal", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_normal", "get_texture_normal");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_pressed", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_pressed", "get_texture_pressed");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_hover", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_hover", "get_texture_hover");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_disabled", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_disabled", "get_texture_disabled");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_focused", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture_focused", "get_texture_focused");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_click_mask", PROPERTY_HINT_RESOURCE_TYPE, BitMap::get_class_static()), "set_click_mask", "get_click_mask");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ignore_texture_size"), "set_ignore_texture_size", "get_ignore_texture_size");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_normal", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_normal", "get_texture_normal");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_pressed", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_pressed", "get_texture_pressed");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_hover", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_hover", "get_texture_hover");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_disabled", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_disabled", "get_texture_disabled");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_focused", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture_focused", "get_texture_focused");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_click_mask", PROPERTY_HINT_RESOURCE_TYPE, "BitMap"), "set_click_mask", "get_click_mask");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ignore_texture_size", PROPERTY_HINT_RESOURCE_TYPE, "bool"), "set_ignore_texture_size", "get_ignore_texture_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "stretch_mode", PROPERTY_HINT_ENUM, "Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), "set_stretch_mode", "get_stretch_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_h"), "set_flip_h", "is_flipped_h");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_v"), "set_flip_v", "is_flipped_v");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_h", PROPERTY_HINT_RESOURCE_TYPE, "bool"), "set_flip_h", "is_flipped_h");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_v", PROPERTY_HINT_RESOURCE_TYPE, "bool"), "set_flip_v", "is_flipped_v");
 
 	BIND_ENUM_CONSTANT(STRETCH_SCALE);
 	BIND_ENUM_CONSTANT(STRETCH_TILE);
diff --git a/engine/scene/gui/texture_progress_bar.cpp b/engine/scene/gui/texture_progress_bar.cpp
index eac9f98a..6978ed7f 100644
--- a/engine/scene/gui/texture_progress_bar.cpp
+++ b/engine/scene/gui/texture_progress_bar.cpp
@@ -30,12 +30,6 @@
 
 #include "texture_progress_bar.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
-
 void TextureProgressBar::set_under_texture(const Ref<Texture2D> &p_texture) {
 	_set_texture(&under, p_texture);
 }
@@ -430,7 +424,7 @@ void TextureProgressBar::draw_nine_patch_stretched(const Ref<Texture2D> &p_textu
 	p_texture->get_rect_region(dst_rect, src_rect, dst_rect, src_rect);
 
 	RID ci = get_canvas_item();
-	RS::get_singleton()->canvas_item_add_nine_patch(ci, dst_rect, src_rect, p_texture->get_scaled_rid(), topleft, bottomright, RSE::NINE_PATCH_STRETCH, RSE::NINE_PATCH_STRETCH, true, p_modulate);
+	RS::get_singleton()->canvas_item_add_nine_patch(ci, dst_rect, src_rect, p_texture->get_scaled_rid(), topleft, bottomright, RS::NINE_PATCH_STRETCH, RS::NINE_PATCH_STRETCH, true, p_modulate);
 }
 
 void TextureProgressBar::_notification(int p_what) {
@@ -439,7 +433,7 @@ void TextureProgressBar::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -647,7 +641,9 @@ void TextureProgressBar::_validate_property(PropertyInfo &p_property) const {
 	}
 	if (p_property.name.begins_with("stretch_margin_") && !nine_patch_stretch) {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-	} else if (p_property.name.begins_with("radial_") && (mode != FillMode::FILL_CLOCKWISE && mode != FillMode::FILL_COUNTER_CLOCKWISE && mode != FillMode::FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE)) {
+	}
+
+	if (p_property.name.begins_with("radial_") && (mode != FillMode::FILL_CLOCKWISE && mode != FillMode::FILL_COUNTER_CLOCKWISE && mode != FillMode::FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE)) {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
@@ -707,9 +703,9 @@ void TextureProgressBar::_bind_methods() {
 	ADD_PROPERTYI(PropertyInfo(Variant::INT, "stretch_margin_bottom", PROPERTY_HINT_RANGE, "0,16384,1,suffix:px"), "set_stretch_margin", "get_stretch_margin", SIDE_BOTTOM);
 
 	ADD_GROUP("Textures", "texture_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_under", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_under_texture", "get_under_texture");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_over", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_over_texture", "get_over_texture");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_progress", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_progress_texture", "get_progress_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_under", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_under_texture", "get_under_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_over", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_over_texture", "get_over_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture_progress", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_progress_texture", "get_progress_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "texture_progress_offset", PROPERTY_HINT_NONE, "suffix:px"), "set_texture_progress_offset", "get_texture_progress_offset");
 
 	ADD_GROUP("Tint", "tint_");
diff --git a/engine/scene/gui/texture_rect.cpp b/engine/scene/gui/texture_rect.cpp
index 15f77ee9..21bcf997 100644
--- a/engine/scene/gui/texture_rect.cpp
+++ b/engine/scene/gui/texture_rect.cpp
@@ -30,11 +30,6 @@
 
 #include "texture_rect.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/resources/atlas_texture.h"
-#include "servers/rendering/rendering_server.h"
-
 void TextureRect::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
@@ -100,23 +95,7 @@ void TextureRect::_notification(int p_what) {
 			if (region.has_area()) {
 				draw_texture_rect_region(texture, Rect2(offset, size), region);
 			} else {
-				// `draw_texture_rect` doesn't support tiling an AtlasTexture.
-				// Workaround using nine patch. Doesn't work properly for non-zero margin, nesting AtlasTextures is fine otherwise.
-				if (tile && Object::cast_to<AtlasTexture>(*texture)) {
-					Rect2 src_rect(Vector2(), texture->get_size());
-					Rect2 dst_rect(offset, size);
-					Ref<AtlasTexture> at = texture;
-					bool anything_to_draw = true;
-					while (anything_to_draw && at.is_valid()) {
-						anything_to_draw = at->get_rect_region(dst_rect, src_rect, dst_rect, src_rect);
-						at = at->get_atlas();
-					}
-					if (anything_to_draw) {
-						RS::get_singleton()->canvas_item_add_nine_patch(get_canvas_item(), dst_rect, src_rect, texture->get_scaled_rid(), Vector2(), Vector2(), RSE::NINE_PATCH_TILE, RSE::NINE_PATCH_TILE, true);
-					}
-				} else {
-					draw_texture_rect(texture, Rect2(offset, size), tile);
-				}
+				draw_texture_rect(texture, Rect2(offset, size), tile);
 			}
 		} break;
 		case NOTIFICATION_RESIZED: {
@@ -153,23 +132,6 @@ Size2 TextureRect::get_minimum_size() const {
 	return Size2();
 }
 
-PackedStringArray TextureRect::get_configuration_warnings() const {
-	PackedStringArray warnings = Control::get_configuration_warnings();
-
-	if (stretch_mode == STRETCH_TILE) {
-		Ref<AtlasTexture> at = texture;
-		while (at.is_valid()) {
-			if (at->get_margin() != Rect2()) {
-				warnings.push_back(vformat(RTR("STRETCH_TILE mode is not supported for an AtlasTexture with non-zero margin.")));
-				break;
-			}
-			at = at->get_atlas();
-		}
-	}
-
-	return warnings;
-}
-
 void TextureRect::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_texture", "texture"), &TextureRect::set_texture);
 	ClassDB::bind_method(D_METHOD("get_texture"), &TextureRect::get_texture);
@@ -182,7 +144,7 @@ void TextureRect::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_stretch_mode", "stretch_mode"), &TextureRect::set_stretch_mode);
 	ClassDB::bind_method(D_METHOD("get_stretch_mode"), &TextureRect::get_stretch_mode);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "expand_mode", PROPERTY_HINT_ENUM, "Keep Size,Ignore Size,Fit Width,Fit Width Proportional,Fit Height,Fit Height Proportional"), "set_expand_mode", "get_expand_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "stretch_mode", PROPERTY_HINT_ENUM, "Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), "set_stretch_mode", "get_stretch_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_h"), "set_flip_h", "is_flipped_h");
@@ -217,7 +179,6 @@ bool TextureRect::_set(const StringName &p_name, const Variant &p_value) {
 void TextureRect::_texture_changed() {
 	queue_redraw();
 	update_minimum_size();
-	update_configuration_warnings();
 }
 
 void TextureRect::set_texture(const Ref<Texture2D> &p_tex) {
@@ -235,7 +196,8 @@ void TextureRect::set_texture(const Ref<Texture2D> &p_tex) {
 		texture->connect_changed(callable_mp(this, &TextureRect::_texture_changed));
 	}
 
-	_texture_changed();
+	queue_redraw();
+	update_minimum_size();
 }
 
 Ref<Texture2D> TextureRect::get_texture() const {
@@ -263,7 +225,6 @@ void TextureRect::set_stretch_mode(StretchMode p_mode) {
 
 	stretch_mode = p_mode;
 	queue_redraw();
-	update_configuration_warnings();
 }
 
 TextureRect::StretchMode TextureRect::get_stretch_mode() const {
diff --git a/engine/scene/gui/texture_rect.h b/engine/scene/gui/texture_rect.h
index de89fc12..098229a7 100644
--- a/engine/scene/gui/texture_rect.h
+++ b/engine/scene/gui/texture_rect.h
@@ -88,8 +88,6 @@ public:
 	void set_flip_v(bool p_flip);
 	bool is_flipped_v() const;
 
-	PackedStringArray get_configuration_warnings() const override;
-
 	TextureRect();
 	~TextureRect();
 };
diff --git a/engine/scene/gui/tree.compat.inc b/engine/scene/gui/tree.compat.inc
index ec15106d..f4355764 100644
--- a/engine/scene/gui/tree.compat.inc
+++ b/engine/scene/gui/tree.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "tree.h"
-
-#include "core/object/class_db.h"
-
 void TreeItem::_add_button_bind_compat_76829(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip) {
 	add_button(p_column, p_button, p_id, p_disabled, p_tooltip, String());
 }
diff --git a/engine/scene/gui/tree.cpp b/engine/scene/gui/tree.cpp
index 741b679d..03318da1 100644
--- a/engine/scene/gui/tree.cpp
+++ b/engine/scene/gui/tree.cpp
@@ -34,8 +34,6 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/math/math_funcs.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "scene/gui/box_container.h"
@@ -44,12 +42,9 @@
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/text_edit.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #include <climits>
 
@@ -164,17 +159,17 @@ void TreeItem::_change_tree(Tree *p_tree) {
 	tree = p_tree;
 
 	if (accessibility_row_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(accessibility_row_element);
+		DisplayServer::get_singleton()->accessibility_free_element(accessibility_row_element);
 		accessibility_row_element = RID();
 	}
 	for (Cell &cell : cells) {
 		if (cell.accessibility_cell_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(cell.accessibility_cell_element);
+			DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
 			cell.accessibility_cell_element = RID();
 		}
 		for (Cell::Button &btn : cell.buttons) {
 			if (btn.accessibility_button_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(btn.accessibility_button_element);
+				DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
 				btn.accessibility_button_element = RID();
 			}
 		}
@@ -465,26 +460,6 @@ TextServer::AutowrapMode TreeItem::get_autowrap_mode(int p_column) const {
 	return cells[p_column].autowrap_mode;
 }
 
-void TreeItem::set_autowrap_trim_flags(int p_column, BitField<TextServer::LineBreakFlag> p_flags) {
-	ERR_FAIL_INDEX(p_column, cells.size());
-
-	// Only trim-related flags are valid for this property.
-	BitField<TextServer::LineBreakFlag> masked_flags = p_flags & TextServer::BREAK_TRIM_MASK;
-	if (cells[p_column].autowrap_trim_flags == masked_flags) {
-		return;
-	}
-
-	cells.write[p_column].autowrap_trim_flags = masked_flags;
-	cells.write[p_column].dirty = true;
-	_changed_notify(p_column);
-	cells.write[p_column].cached_minimum_size_dirty = true;
-}
-
-BitField<TextServer::LineBreakFlag> TreeItem::get_autowrap_trim_flags(int p_column) const {
-	ERR_FAIL_INDEX_V(p_column, cells.size(), TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES);
-	return cells[p_column].autowrap_trim_flags;
-}
-
 void TreeItem::set_text_overrun_behavior(int p_column, TextServer::OverrunBehavior p_behavior) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 
@@ -1047,10 +1022,6 @@ TreeItem *TreeItem::get_first_child() const {
 	return first_child;
 }
 
-TreeItem *TreeItem::get_last_child() const {
-	return last_child;
-}
-
 TreeItem *TreeItem::_get_prev_in_tree(bool p_wrap, bool p_include_invisible) {
 	TreeItem *current = this;
 
@@ -1374,7 +1345,7 @@ void TreeItem::clear_buttons() {
 		if (!cell.buttons.is_empty()) {
 			for (Cell::Button &btn : cell.buttons) {
 				if (btn.accessibility_button_element.is_valid()) {
-					AccessibilityServer::get_singleton()->free_element(btn.accessibility_button_element);
+					DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
 				}
 			}
 			cell.buttons.clear();
@@ -1433,7 +1404,7 @@ void TreeItem::erase_button(int p_column, int p_index) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_INDEX(p_index, cells[p_column].buttons.size());
 	if (cells[p_column].buttons[p_index].accessibility_button_element.is_valid()) {
-		AccessibilityServer::get_singleton()->free_element(cells.write[p_column].buttons.write[p_index].accessibility_button_element);
+		DisplayServer::get_singleton()->accessibility_free_element(cells.write[p_column].buttons.write[p_index].accessibility_button_element);
 	}
 	cells.write[p_column].buttons.remove_at(p_index);
 	_changed_notify(p_column);
@@ -1721,14 +1692,6 @@ bool TreeItem::is_folding_disabled() const {
 	return disable_folding;
 }
 
-void TreeItem::set_accept_children(bool p_allowed) {
-	accepts_children = p_allowed;
-}
-
-bool TreeItem::is_accepting_children() const {
-	return accepts_children;
-}
-
 Size2 TreeItem::get_minimum_size(int p_column) {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), Size2());
 	Tree *parent_tree = get_tree();
@@ -1854,9 +1817,6 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_autowrap_mode", "column", "autowrap_mode"), &TreeItem::set_autowrap_mode);
 	ClassDB::bind_method(D_METHOD("get_autowrap_mode", "column"), &TreeItem::get_autowrap_mode);
 
-	ClassDB::bind_method(D_METHOD("set_autowrap_trim_flags", "column", "flags"), &TreeItem::set_autowrap_trim_flags);
-	ClassDB::bind_method(D_METHOD("get_autowrap_trim_flags", "column"), &TreeItem::get_autowrap_trim_flags);
-
 	ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "column", "overrun_behavior"), &TreeItem::set_text_overrun_behavior);
 	ClassDB::bind_method(D_METHOD("get_text_overrun_behavior", "column"), &TreeItem::get_text_overrun_behavior);
 
@@ -1973,9 +1933,6 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_disable_folding", "disable"), &TreeItem::set_disable_folding);
 	ClassDB::bind_method(D_METHOD("is_folding_disabled"), &TreeItem::is_folding_disabled);
 
-	ClassDB::bind_method(D_METHOD("set_accept_children", "allowed"), &TreeItem::set_accept_children);
-	ClassDB::bind_method(D_METHOD("is_accepting_children"), &TreeItem::is_accepting_children);
-
 	ClassDB::bind_method(D_METHOD("create_child", "index"), &TreeItem::create_child, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("add_child", "child"), &TreeItem::add_child);
 	ClassDB::bind_method(D_METHOD("remove_child", "child"), &TreeItem::remove_child);
@@ -2072,8 +2029,7 @@ int Tree::compute_item_height(TreeItem *p_item) const {
 	for (int i = 0; i < columns.size(); i++) {
 		height = MAX(height, p_item->get_minimum_size(i).y);
 	}
-	int font_height = cache.font_height != -1 ? cache.font_height : theme_cache.font->get_height(theme_cache.font_size);
-	int item_min_height = MAX(font_height, p_item->get_custom_minimum_height());
+	int item_min_height = MAX(theme_cache.font->get_height(theme_cache.font_size), p_item->get_custom_minimum_height());
 	if (height < item_min_height) {
 		height = item_min_height;
 	}
@@ -2104,25 +2060,18 @@ int Tree::get_item_height(TreeItem *p_item) const {
 	return height;
 }
 
-Point2i Tree::convert_rtl_position(const Point2i &p_pos, int p_width) const {
+Point2i Tree::convert_rtl_position(const Point2i &pos, int width) const {
 	if (cache.rtl) {
-		return Point2i(get_size().width - p_pos.x - p_width, p_pos.y);
+		return Point2i(get_size().width - pos.x - width, pos.y);
 	}
-	return p_pos;
+	return pos;
 }
 
-Point2 Tree::convert_rtl_position(const Point2 &p_pos, int p_width) const {
+Rect2i Tree::convert_rtl_rect(const Rect2i &rect) const {
 	if (cache.rtl) {
-		return Point2(get_size().width - p_pos.x - p_width, p_pos.y);
+		return Rect2i(Point2i(get_size().width - rect.position.x - rect.size.x, rect.position.y), rect.size);
 	}
-	return p_pos;
-}
-
-Rect2i Tree::convert_rtl_rect(const Rect2i &p_rect) const {
-	if (cache.rtl) {
-		return Rect2i(Point2i(get_size().width - p_rect.position.x - p_rect.size.x, p_rect.position.y), p_rect.size);
-	}
-	return p_rect;
+	return rect;
 }
 
 void Tree::draw_item_rect(const TreeItem::Cell &p_cell, const Rect2i &p_rect, const Color &p_color, const Color &p_icon_color, int p_ol_size, const Color &p_ol_color) const {
@@ -2282,7 +2231,7 @@ void Tree::update_item_cell(TreeItem *p_item, int p_col) const {
 	const String &lang = p_item->cells[p_col].language.is_empty() ? _get_locale() : p_item->cells[p_col].language;
 	p_item->cells.write[p_col].text_buf->add_string(valtext, font, font_size, lang);
 
-	BitField<TextServer::LineBreakFlag> break_flags = TextServer::BREAK_MANDATORY | p_item->cells[p_col].autowrap_trim_flags;
+	BitField<TextServer::LineBreakFlag> break_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 	switch (p_item->cells.write[p_col].autowrap_mode) {
 		case TextServer::AUTOWRAP_OFF:
 			break;
@@ -2532,6 +2481,30 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				p_item->cells[i].custom_stylebox->draw(ci, r);
 			}
 
+			if (drop_mode_flags && drop_mode_over) {
+				Rect2 r = convert_rtl_rect(cell_rect);
+				if (drop_mode_over == p_item) {
+					if (drop_mode_section == 0 || drop_mode_section == -1) {
+						// Line above.
+						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, r.size.x, 1), theme_cache.drop_position_color);
+					}
+					if (drop_mode_section == 0) {
+						// Side lines.
+						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, 1, r.size.y), theme_cache.drop_position_color);
+						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x + r.size.x - 1, r.position.y, 1, r.size.y), theme_cache.drop_position_color);
+					}
+					if (drop_mode_section == 0 || (drop_mode_section == 1 && (!p_item->get_first_child() || p_item->is_collapsed()))) {
+						// Line below.
+						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y + r.size.y, r.size.x, 1), theme_cache.drop_position_color);
+					}
+				} else if (drop_mode_over == p_item->get_parent()) {
+					if (drop_mode_section == 1 && !p_item->get_prev()) {
+						// Line above.
+						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, r.size.x, 1), theme_cache.drop_position_color);
+					}
+				}
+			}
+
 			Color cell_color;
 			if (p_item->cells[i].custom_color) {
 				cell_color = p_item->cells[i].color;
@@ -2828,8 +2801,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				int parent_ofs = p_pos.x + ((p_item->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - theme_cache.arrow->get_width() * 0.5);
 				Point2i parent_pos = Point2i(parent_ofs, p_pos.y + label_h * 0.5 + theme_cache.arrow->get_height() * 0.5) - theme_cache.offset + p_draw_ofs;
 
-				bool drop_showing_arrow_on_c = (drop_mode_over == c && drop_mode_section == 0 && !c->first_child && !hide_folding);
-				int root_ofs = children_pos.x + ((c->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - (c->get_visible_child_count() > 0 || drop_showing_arrow_on_c ? theme_cache.arrow->get_width() : 0));
+				int root_ofs = children_pos.x + ((c->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - (c->get_visible_child_count() > 0 ? theme_cache.arrow->get_width() : 0));
 				root_ofs = MIN(root_ofs, get_column_width(0) + p_draw_ofs.x);
 				Point2i root_pos = Point2i(root_ofs, children_pos.y + child_self_height * 0.5) - theme_cache.offset + p_draw_ofs;
 
@@ -2843,9 +2815,11 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				float parent_line_pixel_shift = int(Math::round(parent_line_width * content_scale_factor)) % 2 == 0 ? 0.0 : 0.5;
 				float children_line_pixel_shift = int(Math::round(children_line_width * content_scale_factor)) % 2 == 0 ? 0.0 : 0.5;
 
-				int v_hl_margin = 0;
+				int more_prev_ofs = 0;
 
 				if (root_pos.y + line_width >= 0) {
+					root_pos = convert_rtl_position(root_pos);
+					parent_pos = convert_rtl_position(parent_pos);
 					float parent_bottom_y = root_pos.y + parent_line_width * 0.5 + parent_line_pixel_shift;
 
 					// Order of parts on this bend: the horizontal line first, then the vertical line.
@@ -2853,16 +2827,12 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						// If this item or one of its children is selected, we draw the line using parent highlight style.
 						if (!is_no_space) {
 							if (htotal >= 0) {
-								Point2 h_p_1 = convert_rtl_position(Point2(root_pos.x, root_pos.y + parent_line_pixel_shift));
-								Point2 h_p_2 = convert_rtl_position(Point2(parent_pos.x + parent_line_width * 0.5 + parent_line_pixel_shift, root_pos.y + parent_line_pixel_shift));
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, h_p_1, h_p_2, theme_cache.parent_hl_line_color, parent_line_width);
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(root_pos.x, root_pos.y + parent_line_pixel_shift), Point2(parent_pos.x + parent_line_width * 0.5 + parent_line_pixel_shift, root_pos.y + parent_line_pixel_shift), theme_cache.parent_hl_line_color, parent_line_width);
 							}
-							Point2 v_p_1 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y));
-							Point2 v_p_2 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs));
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, v_p_1, v_p_2, theme_cache.parent_hl_line_color, parent_line_width);
+							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y), Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 						}
 
-						v_hl_margin = theme_cache.parent_hl_line_margin;
+						more_prev_ofs = theme_cache.parent_hl_line_margin;
 						prev_hl_ofs = parent_bottom_y;
 						has_sibling_selection = _is_sibling_branch_selected(c);
 					} else if (p_item->is_any_column_selected()) {
@@ -2871,26 +2841,18 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						if (has_sibling_selection) {
 							if (!is_no_space) {
 								if (htotal >= 0) {
-									Point2 h_p_1 = convert_rtl_position(Point2(root_pos.x, root_pos.y + children_line_pixel_shift));
-									Point2 h_p_2 = convert_rtl_position(Point2(parent_pos.x + parent_line_width * 0.5 + children_line_pixel_shift, root_pos.y + children_line_pixel_shift));
-									RenderingServer::get_singleton()->canvas_item_add_line(ci, h_p_1, h_p_2, theme_cache.children_hl_line_color, children_line_width);
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(root_pos.x, root_pos.y + children_line_pixel_shift), Point2i(parent_pos.x + parent_line_width * 0.5 + children_line_pixel_shift, root_pos.y + children_line_pixel_shift), theme_cache.children_hl_line_color, children_line_width);
 								}
-								Point2 v_p_1 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y));
-								Point2 v_p_2 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs));
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, v_p_1, v_p_2, theme_cache.parent_hl_line_color, parent_line_width);
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y), Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 							}
 
 							prev_hl_ofs = parent_bottom_y;
 						} else {
 							if (!is_no_space) {
 								if (htotal >= 0) {
-									Point2 h_p_1 = convert_rtl_position(Point2(root_pos.x, root_pos.y + children_line_pixel_shift));
-									Point2 h_p_2 = convert_rtl_position(Point2(parent_pos.x + children_line_width * 0.5 + children_line_pixel_shift, root_pos.y + children_line_pixel_shift));
-									RenderingServer::get_singleton()->canvas_item_add_line(ci, h_p_1, h_p_2, theme_cache.children_hl_line_color, children_line_width);
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(root_pos.x, root_pos.y + children_line_pixel_shift), Point2(parent_pos.x + children_line_width * 0.5 + children_line_pixel_shift, root_pos.y + children_line_pixel_shift), theme_cache.children_hl_line_color, children_line_width);
 								}
-								Point2 v_p_1 = convert_rtl_position(Point2(parent_pos.x + children_line_pixel_shift, root_pos.y + children_line_width * 0.5 + children_line_pixel_shift));
-								Point2 v_p_2 = convert_rtl_position(Point2(parent_pos.x + children_line_pixel_shift, prev_ofs + children_line_width * 0.5));
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, v_p_1, v_p_2, theme_cache.children_hl_line_color, children_line_width);
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(parent_pos.x + children_line_pixel_shift, root_pos.y + children_line_width * 0.5 + children_line_pixel_shift), Point2(parent_pos.x + children_line_pixel_shift, prev_ofs + children_line_width * 0.5), theme_cache.children_hl_line_color, children_line_width);
 							}
 						}
 					} else {
@@ -2899,26 +2861,18 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						if (has_sibling_selection) {
 							if (!is_no_space) {
 								if (htotal >= 0) {
-									Point2 h_p_1 = convert_rtl_position(Point2(root_pos.x, root_pos.y + line_pixel_shift));
-									Point2 h_p_2 = convert_rtl_position(Point2(parent_pos.x + theme_cache.parent_hl_line_margin, root_pos.y + line_pixel_shift));
-									RenderingServer::get_singleton()->canvas_item_add_line(ci, h_p_1, h_p_2, theme_cache.relationship_line_color, line_width);
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(root_pos.x, root_pos.y + line_pixel_shift), Point2(parent_pos.x + theme_cache.parent_hl_line_margin, root_pos.y + line_pixel_shift), theme_cache.relationship_line_color, line_width);
 								}
-								Point2 v_p_1 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y));
-								Point2 v_p_2 = convert_rtl_position(Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs));
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, v_p_1, v_p_2, theme_cache.parent_hl_line_color, parent_line_width);
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(parent_pos.x + parent_line_pixel_shift, parent_bottom_y), Point2(parent_pos.x + parent_line_pixel_shift, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 							}
 
 							prev_hl_ofs = parent_bottom_y;
 						} else {
 							if (!is_no_space) {
 								if (htotal >= 0) {
-									Point2 h_p_1 = convert_rtl_position(Point2(root_pos.x, root_pos.y + line_pixel_shift));
-									Point2 h_p_2 = convert_rtl_position(Point2(parent_pos.x + line_width * 0.5 + line_pixel_shift, root_pos.y + line_pixel_shift));
-									RenderingServer::get_singleton()->canvas_item_add_line(ci, h_p_1, h_p_2, theme_cache.relationship_line_color, line_width);
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(root_pos.x, root_pos.y + line_pixel_shift), Point2(parent_pos.x + line_width * 0.5 + line_pixel_shift, root_pos.y + line_pixel_shift), theme_cache.relationship_line_color, line_width);
 								}
-								Point2 v_p_1 = convert_rtl_position(Point2(parent_pos.x + line_pixel_shift, root_pos.y + line_width * 0.5 + line_pixel_shift));
-								Point2 v_p_2 = convert_rtl_position(Point2(parent_pos.x + line_pixel_shift, prev_ofs + line_width * 0.5));
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, v_p_1, v_p_2, theme_cache.relationship_line_color, line_width);
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2(parent_pos.x + line_pixel_shift, root_pos.y + line_width * 0.5 + line_pixel_shift), Point2(parent_pos.x + line_pixel_shift, prev_ofs + line_width * 0.5), theme_cache.relationship_line_color, line_width);
 							}
 						}
 					}
@@ -2928,7 +2882,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 					}
 				}
 
-				prev_ofs = root_pos.y + v_hl_margin + line_pixel_shift;
+				prev_ofs = root_pos.y + more_prev_ofs + line_pixel_shift;
 			}
 
 			if (child_h < 0) {
@@ -4065,7 +4019,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 					range_drag_enabled = true;
 					range_drag_capture_pos = cpos;
 					range_drag_base = popup_edited_item->get_range(popup_edited_item_col);
-					Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_CAPTURED);
+					Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 				}
 			} else {
 				const TreeItem::Cell &c = popup_edited_item->cells[popup_edited_item_col];
@@ -4125,7 +4079,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 				if (pressing_for_editor) {
 					if (range_drag_enabled) {
 						range_drag_enabled = false;
-						Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+						Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 						warp_mouse(range_drag_capture_pos);
 					} else {
 						Rect2 rect = _get_item_focus_rect(get_selected());
@@ -4349,9 +4303,8 @@ void Tree::_determine_hovered_item() {
 	cache.hover_header_row = false;
 	cache.hover_header_column = 0;
 	if (show_column_titles && is_mouse_hovering) {
-		int tbh = _get_title_button_height();
-		pos.y -= tbh;
-		if (pos.y < 0 && pos.y >= -tbh) {
+		pos.y -= _get_title_button_height();
+		if (pos.y < 0) {
 			pos.x += theme_cache.offset.x;
 			int len = 0;
 			for (int i = 0; i < columns.size(); i++) {
@@ -4374,47 +4327,16 @@ void Tree::_determine_hovered_item() {
 
 		if (drop_mode_flags) {
 			if (it != drop_mode_over) {
-				drop_mode_over = (section != COLUMN_NOT_FOUND) ? it : nullptr;
-
-				// Check if the drop target is a descendant of any selected item.
-				if (drop_mode_over) {
-					TreeItem *check = drop_mode_over->get_parent();
-					while (check) {
-						if (check->is_any_column_selected()) {
-							drop_mode_over = nullptr;
-							break;
-						}
-						check = check->get_parent();
-					}
-				}
-
+				drop_mode_over = it;
 				if (enable_drag_unfolding) {
 					dropping_unfold_timer->start(theme_cache.dragging_unfold_wait_msec * 0.001);
 				}
 				queue_redraw();
 			}
-
-			if (it && section != COLUMN_NOT_FOUND && section != drop_mode_section) {
+			if (it && section != drop_mode_section) {
 				drop_mode_section = section;
 				queue_redraw();
 			}
-
-			drop_mode_unchanged = false;
-			if (drop_mode_over && selected_item) {
-				TreeItem *child = selected_item;
-				TreeItem *parent = selected_item->get_parent();
-				if (drop_mode_over == selected_item) {
-					drop_mode_unchanged = true;
-				} else if (drop_mode_section == -1 && drop_mode_over->get_prev() == child && parent == drop_mode_over->get_parent()) {
-					drop_mode_unchanged = true;
-				} else if (drop_mode_section == 1 && drop_mode_over->get_next() == child && parent == drop_mode_over->get_parent()) {
-					drop_mode_unchanged = true;
-				} else if (drop_mode_section == 0 && drop_mode_over == parent && child == parent->get_last_child()) {
-					drop_mode_unchanged = true;
-				} else if (drop_mode_section == 2 && drop_mode_over == parent && child == parent->get_first_child()) {
-					drop_mode_unchanged = true;
-				}
-			}
 		}
 
 		cache.hover_item = it;
@@ -4453,7 +4375,7 @@ void Tree::_determine_hovered_item() {
 }
 
 void Tree::_on_dropping_unfold_timer_timeout() {
-	if (enable_drag_unfolding && drop_mode_over && (drop_mode_section == 0 || drop_mode_section == 2)) {
+	if (enable_drag_unfolding && drop_mode_over && drop_mode_section == 0) {
 		drop_mode_over->set_collapsed(false);
 	}
 }
@@ -4738,7 +4660,7 @@ PackedStringArray Tree::get_accessibility_configuration_warnings() const {
 }
 
 void Tree::_accessibility_action_scroll_down(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page());
@@ -4746,7 +4668,7 @@ void Tree::_accessibility_action_scroll_down(const Variant &p_data) {
 }
 
 void Tree::_accessibility_action_scroll_left(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page());
@@ -4754,7 +4676,7 @@ void Tree::_accessibility_action_scroll_left(const Variant &p_data) {
 }
 
 void Tree::_accessibility_action_scroll_right(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
 	} else {
 		h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page());
@@ -4762,7 +4684,7 @@ void Tree::_accessibility_action_scroll_right(const Variant &p_data) {
 }
 
 void Tree::_accessibility_action_scroll_up(const Variant &p_data) {
-	if ((AccessibilityServerEnums::AccessibilityScrollUnit)p_data == AccessibilityServerEnums::SCROLL_UNIT_ITEM) {
+	if ((DisplayServer::AccessibilityScrollUnit)p_data == DisplayServer::SCROLL_UNIT_ITEM) {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
 	} else {
 		v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page());
@@ -4873,27 +4795,27 @@ void Tree::_accessibility_update_item(Point2 &r_ofs, TreeItem *p_item, int &r_ro
 	// Row.
 	if ((p_item != root || !hide_root) && p_item->is_visible()) {
 		if (p_item->accessibility_row_element.is_null()) {
-			p_item->accessibility_row_element = AccessibilityServer::get_singleton()->create_sub_element(accessibility_scroll_element, AccessibilityServerEnums::AccessibilityRole::ROLE_TREE_ITEM);
+			p_item->accessibility_row_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_TREE_ITEM);
 			p_item->accessibility_row_dirty = true;
 		}
 
-		AccessibilityServer::get_singleton()->update_set_table_row_index(p_item->accessibility_row_element, r_row);
-		AccessibilityServer::get_singleton()->update_set_list_item_level(p_item->accessibility_row_element, p_level);
-		AccessibilityServer::get_singleton()->update_set_list_item_expanded(p_item->accessibility_row_element, !p_item->collapsed);
-		AccessibilityServer::get_singleton()->update_set_flag(p_item->accessibility_row_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
-		AccessibilityServer::get_singleton()->update_add_action(p_item->accessibility_row_element, AccessibilityServerEnums::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
-		AccessibilityServer::get_singleton()->update_add_action(p_item->accessibility_row_element, AccessibilityServerEnums::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
+		DisplayServer::get_singleton()->accessibility_update_set_table_row_index(p_item->accessibility_row_element, r_row);
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_level(p_item->accessibility_row_element, p_level);
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_expanded(p_item->accessibility_row_element, !p_item->collapsed);
+		DisplayServer::get_singleton()->accessibility_update_set_flag(p_item->accessibility_row_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
+		DisplayServer::get_singleton()->accessibility_update_add_action(p_item->accessibility_row_element, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
+		DisplayServer::get_singleton()->accessibility_update_add_action(p_item->accessibility_row_element, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
 
-		AccessibilityServer::get_singleton()->update_set_list_item_selected(p_item->accessibility_row_element, selected_item == p_item);
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(p_item->accessibility_row_element, selected_item == p_item);
 		if (p_item == root && is_root_hidden()) {
-			AccessibilityServer::get_singleton()->update_set_flag(p_item->accessibility_row_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, true);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(p_item->accessibility_row_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, true);
 		}
 		Transform2D row_xform;
 		row_xform.set_origin(r_ofs);
-		AccessibilityServer::get_singleton()->update_set_transform(p_item->accessibility_row_element, row_xform);
+		DisplayServer::get_singleton()->accessibility_update_set_transform(p_item->accessibility_row_element, row_xform);
 
 		Size2 item_size = Size2(get_size().width, compute_item_height(p_item));
-		AccessibilityServer::get_singleton()->update_set_bounds(p_item->accessibility_row_element, Rect2(Vector2(), item_size));
+		DisplayServer::get_singleton()->accessibility_update_set_bounds(p_item->accessibility_row_element, Rect2(Vector2(), item_size));
 
 		if (p_item->accessibility_row_dirty) {
 			// Cells.
@@ -4902,82 +4824,82 @@ void Tree::_accessibility_update_item(Point2 &r_ofs, TreeItem *p_item, int &r_ro
 				TreeItem::Cell &cell = p_item->cells.write[i];
 
 				if (cell.accessibility_cell_element.is_null()) {
-					cell.accessibility_cell_element = AccessibilityServer::get_singleton()->create_sub_element(p_item->accessibility_row_element, AccessibilityServerEnums::AccessibilityRole::ROLE_CELL);
+					cell.accessibility_cell_element = DisplayServer::get_singleton()->accessibility_create_sub_element(p_item->accessibility_row_element, DisplayServer::AccessibilityRole::ROLE_CELL);
 				}
 
 				float cw = get_column_width(i);
 
-				AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Tree::_accessibility_action_scroll_into_view).bind(p_item, i));
-				AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Tree::_accessibility_action_focus).bind(p_item, i));
-				AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Tree::_accessibility_action_blur).bind(p_item, i));
-				AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
-				AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Tree::_accessibility_action_scroll_into_view).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Tree::_accessibility_action_focus).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Tree::_accessibility_action_blur).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
 
-				AccessibilityServer::get_singleton()->update_set_table_cell_position(cell.accessibility_cell_element, r_row, i);
-				AccessibilityServer::get_singleton()->update_set_list_item_selected(cell.accessibility_cell_element, cell.selected);
+				DisplayServer::get_singleton()->accessibility_update_set_table_cell_position(cell.accessibility_cell_element, r_row, i);
+				DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(cell.accessibility_cell_element, cell.selected);
 				if (cell.description.is_empty()) {
-					AccessibilityServer::get_singleton()->update_set_name(cell.accessibility_cell_element, cell.xl_text);
+					DisplayServer::get_singleton()->accessibility_update_set_name(cell.accessibility_cell_element, cell.xl_text);
 				} else {
-					AccessibilityServer::get_singleton()->update_set_name(cell.accessibility_cell_element, cell.description);
+					DisplayServer::get_singleton()->accessibility_update_set_name(cell.accessibility_cell_element, cell.description);
 				}
 
-				AccessibilityServer::get_singleton()->update_set_text_align(cell.accessibility_cell_element, cell.text_alignment);
-				AccessibilityServer::get_singleton()->update_set_flag(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
-				AccessibilityServer::get_singleton()->update_set_flag(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_READONLY, !cell.editable);
-				AccessibilityServer::get_singleton()->update_set_tooltip(cell.accessibility_cell_element, cell.tooltip);
+				DisplayServer::get_singleton()->accessibility_update_set_text_align(cell.accessibility_cell_element, cell.text_alignment);
+				DisplayServer::get_singleton()->accessibility_update_set_flag(cell.accessibility_cell_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
+				DisplayServer::get_singleton()->accessibility_update_set_flag(cell.accessibility_cell_element, DisplayServer::AccessibilityFlags::FLAG_READONLY, !cell.editable);
+				DisplayServer::get_singleton()->accessibility_update_set_tooltip(cell.accessibility_cell_element, cell.tooltip);
 				switch (cell.mode) {
 					case TreeItem::CELL_MODE_STRING: {
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_text_value).bind(p_item, i));
-						AccessibilityServer::get_singleton()->update_set_value(cell.accessibility_cell_element, cell.xl_text);
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_text_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_value(cell.accessibility_cell_element, cell.xl_text);
 					} break;
 					case TreeItem::CELL_MODE_CHECK: {
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_set_bool_value).bind(p_item, i));
-						AccessibilityServer::get_singleton()->update_set_checked(cell.accessibility_cell_element, cell.checked);
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_set_bool_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_checked(cell.accessibility_cell_element, cell.checked);
 					} break;
 					case TreeItem::CELL_MODE_RANGE: {
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Tree::_accessibility_action_set_dec).bind(p_item, i));
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Tree::_accessibility_action_set_inc).bind(p_item, i));
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_num_value).bind(p_item, i));
-						AccessibilityServer::get_singleton()->update_set_num_value(cell.accessibility_cell_element, cell.val);
-						AccessibilityServer::get_singleton()->update_set_num_range(cell.accessibility_cell_element, cell.min, cell.max);
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Tree::_accessibility_action_set_dec).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Tree::_accessibility_action_set_inc).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_num_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_num_value(cell.accessibility_cell_element, cell.val);
+						DisplayServer::get_singleton()->accessibility_update_set_num_range(cell.accessibility_cell_element, cell.min, cell.max);
 						if (cell.step > 0) {
-							AccessibilityServer::get_singleton()->update_set_num_step(cell.accessibility_cell_element, cell.step);
+							DisplayServer::get_singleton()->accessibility_update_set_num_step(cell.accessibility_cell_element, cell.step);
 						} else {
-							AccessibilityServer::get_singleton()->update_set_num_step(cell.accessibility_cell_element, 1);
+							DisplayServer::get_singleton()->accessibility_update_set_num_step(cell.accessibility_cell_element, 1);
 						}
 					} break;
 					case TreeItem::CELL_MODE_ICON: {
 						// NOP
 					} break;
 					case TreeItem::CELL_MODE_CUSTOM: {
-						AccessibilityServer::get_singleton()->update_add_action(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_edit_custom).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_edit_custom).bind(p_item, i));
 					} break;
 				}
-				AccessibilityServer::get_singleton()->update_set_background_color(cell.accessibility_cell_element, cell.color);
-				AccessibilityServer::get_singleton()->update_set_foreground_color(cell.accessibility_cell_element, cell.bg_color);
+				DisplayServer::get_singleton()->accessibility_update_set_background_color(cell.accessibility_cell_element, cell.color);
+				DisplayServer::get_singleton()->accessibility_update_set_foreground_color(cell.accessibility_cell_element, cell.bg_color);
 
-				AccessibilityServer::get_singleton()->update_set_bounds(cell.accessibility_cell_element, Rect2(Point2(col_offset, 0), Size2(cw, item_size.y)));
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(cell.accessibility_cell_element, Rect2(Point2(col_offset, 0), Size2(cw, item_size.y)));
 
 				Vector2 ofst = Vector2(col_offset + cw, 0);
 				for (int j = cell.buttons.size() - 1; j >= 0; j--) {
 					if (cell.buttons[j].accessibility_button_element.is_null()) {
-						cell.buttons[j].accessibility_button_element = AccessibilityServer::get_singleton()->create_sub_element(cell.accessibility_cell_element, AccessibilityServerEnums::AccessibilityRole::ROLE_BUTTON);
+						cell.buttons[j].accessibility_button_element = DisplayServer::get_singleton()->accessibility_create_sub_element(cell.accessibility_cell_element, DisplayServer::AccessibilityRole::ROLE_BUTTON);
 					}
 
-					AccessibilityServer::get_singleton()->update_add_action(cell.buttons[j].accessibility_button_element, AccessibilityServerEnums::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_button_press).bind(p_item, i, j));
-					AccessibilityServer::get_singleton()->update_set_flag(cell.buttons[j].accessibility_button_element, AccessibilityServerEnums::AccessibilityFlags::FLAG_DISABLED, cell.buttons[j].disabled);
-					AccessibilityServer::get_singleton()->update_set_tooltip(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
+					DisplayServer::get_singleton()->accessibility_update_add_action(cell.buttons[j].accessibility_button_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_button_press).bind(p_item, i, j));
+					DisplayServer::get_singleton()->accessibility_update_set_flag(cell.buttons[j].accessibility_button_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, cell.buttons[j].disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
 					if (cell.buttons[j].description.is_empty()) {
-						AccessibilityServer::get_singleton()->update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
+						DisplayServer::get_singleton()->accessibility_update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
 					} else {
-						AccessibilityServer::get_singleton()->update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].description);
+						DisplayServer::get_singleton()->accessibility_update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].description);
 					}
 
 					Ref<Texture2D> b = cell.buttons[j].texture;
 					Size2 b_size = b->get_size() + theme_cache.button_pressed->get_minimum_size();
 					ofst.x -= b_size.x;
 
-					AccessibilityServer::get_singleton()->update_set_bounds(cell.buttons[j].accessibility_button_element, Rect2(ofst, b_size));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(cell.buttons[j].accessibility_button_element, Rect2(ofst, b_size));
 				}
 				col_offset += cw;
 			}
@@ -5017,13 +4939,13 @@ void Tree::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TREE);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TREE);
 
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &Tree::_accessibility_action_scroll_down));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &Tree::_accessibility_action_scroll_left));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &Tree::_accessibility_action_scroll_right));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &Tree::_accessibility_action_scroll_up));
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &Tree::_accessibility_action_scroll_set));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &Tree::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &Tree::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &Tree::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &Tree::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &Tree::_accessibility_action_scroll_set));
 
 			Ref<StyleBox> bg = theme_cache.panel_style;
 			int tbh = _get_title_button_height();
@@ -5035,32 +4957,32 @@ void Tree::_notification(int p_what) {
 				ColumnInfo &column = columns.write[i];
 
 				if (column.accessibility_col_element.is_null()) {
-					column.accessibility_col_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_COLUMN_HEADER);
+					column.accessibility_col_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_COLUMN_HEADER);
 				}
 
-				AccessibilityServer::get_singleton()->update_set_table_column_index(column.accessibility_col_element, i);
-				AccessibilityServer::get_singleton()->update_set_name(column.accessibility_col_element, column.xl_title);
-				AccessibilityServer::get_singleton()->update_set_text_align(column.accessibility_col_element, column.title_alignment);
+				DisplayServer::get_singleton()->accessibility_update_set_table_column_index(column.accessibility_col_element, i);
+				DisplayServer::get_singleton()->accessibility_update_set_name(column.accessibility_col_element, column.xl_title);
+				DisplayServer::get_singleton()->accessibility_update_set_text_align(column.accessibility_col_element, column.title_alignment);
 
 				Rect2 tbrect = Rect2(ofs - theme_cache.offset.x, bg->get_margin(SIDE_TOP), get_column_width(i), tbh);
 				if (cache.rtl) {
 					tbrect.position.x = get_size().width - tbrect.size.x - tbrect.position.x;
 				}
 				ofs += tbrect.size.width;
-				AccessibilityServer::get_singleton()->update_set_bounds(column.accessibility_col_element, Rect2(tbrect.position, tbrect.size));
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(column.accessibility_col_element, Rect2(tbrect.position, tbrect.size));
 			}
 
-			AccessibilityServer::get_singleton()->update_set_table_column_count(ae, cs);
+			DisplayServer::get_singleton()->accessibility_update_set_table_column_count(ae, cs);
 
 			// Scroll container.
 			if (accessibility_scroll_element.is_null()) {
-				accessibility_scroll_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
 			}
 
 			Transform2D scroll_xform;
 			scroll_xform.set_origin(Vector2i(-h_scroll->get_value(), -v_scroll->get_value()));
-			AccessibilityServer::get_singleton()->update_set_transform(accessibility_scroll_element, scroll_xform);
-			AccessibilityServer::get_singleton()->update_set_bounds(accessibility_scroll_element, Rect2(0, 0, h_scroll->get_max(), v_scroll->get_max()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, h_scroll->get_max(), v_scroll->get_max()));
 
 			// Rows (and cells).
 			Point2 origin = Point2(theme_cache.panel_style->get_margin(SIDE_LEFT) - theme_cache.offset.x, bg->get_margin(SIDE_TOP) + tbh);
@@ -5068,7 +4990,7 @@ void Tree::_notification(int p_what) {
 			if (root) {
 				_accessibility_update_item(origin, root, rows, 0);
 			}
-			AccessibilityServer::get_singleton()->update_set_table_row_count(ae, rows);
+			DisplayServer::get_singleton()->accessibility_update_set_table_row_count(ae, rows);
 
 		} break;
 
@@ -5084,11 +5006,7 @@ void Tree::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_MOUSE_EXIT: {
-			hovered_pos = Vector2(-1.0, -1.0);
 			is_mouse_hovering = false;
-			if (enable_drag_unfolding && drop_mode_over) {
-				_reset_drop_mode_over();
-			}
 			// Clear hovered item cache.
 			if (cache.hover_header_row || cache.hover_item != nullptr) {
 				cache.hover_header_row = false;
@@ -5106,7 +5024,6 @@ void Tree::_notification(int p_what) {
 
 		case NOTIFICATION_DRAG_END: {
 			drop_mode_flags = 0;
-			_reset_drop_mode_over();
 			scrolling = false;
 			set_process_internal(false);
 			queue_redraw();
@@ -5181,8 +5098,7 @@ void Tree::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_DRAW: {
-			int font_height = cache.font_height != -1 ? cache.font_height : theme_cache.font->get_height(theme_cache.font_size);
-			v_scroll->set_custom_step(font_height);
+			v_scroll->set_custom_step(theme_cache.font->get_height(theme_cache.font_size));
 
 			update_scrollbars();
 			RID ci = get_canvas_item();
@@ -5225,227 +5141,12 @@ void Tree::_notification(int p_what) {
 			rendering_server->canvas_item_set_custom_rect(content_ci, !is_visibility_clip_disabled(), main_clip_rect);
 			rendering_server->canvas_item_set_clip(content_ci, true);
 
-			rendering_server->canvas_item_clear(drop_indicator_ci);
-			rendering_server->canvas_item_set_custom_rect(drop_indicator_ci, !is_visibility_clip_disabled(), main_clip_rect);
-			rendering_server->canvas_item_set_clip(drop_indicator_ci, true);
-
 			cache.rtl = is_layout_rtl();
 			content_scale_factor = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor();
 
 			if (root && get_size().x > 0 && get_size().y > 0) {
 				int self_height = 0; // Just to pass a reference, we don't need the root's `self_height`.
 				draw_item(Point2(), draw_ofs, draw_size, root, self_height);
-
-				// Draw drop indicator.
-				if (drop_mode_flags && drop_mode_over) {
-					// Y position from get_item_offset, adjusted for title bar.
-					int item_y = get_item_offset(drop_mode_over) - _get_title_button_height();
-
-					// X position based on depth (count parents, excluding root if hidden).
-					int depth = 0;
-					for (TreeItem *iter = drop_mode_over->parent; iter; iter = iter->parent) {
-						if (iter == root && hide_root) {
-							break;
-						}
-						depth += 1;
-					}
-
-					float line_width = theme_cache.parent_hl_line_width * Math::round(theme_cache.base_scale);
-					float line_pixel_shift = int(Math::round(line_width * content_scale_factor)) % 2 == 0 ? 0.0 : 0.5;
-					float line_join_nudge = line_width * 0.5 - line_pixel_shift;
-
-					float stub_height = theme_cache.arrow->get_height() * 0.5;
-
-					int item_x = theme_cache.item_margin * depth;
-
-					Point2 item_pos = Point2(item_x, item_y);
-					int item_h = compute_item_height(drop_mode_over) + theme_cache.v_separation;
-
-					int col0_ofs = item_pos.x + ((drop_mode_over->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin);
-					int col0_item_width = get_column_width(0) - col0_ofs;
-					Rect2i col0_cell_rect = Rect2i(Point2i(col0_ofs, item_pos.y) - theme_cache.offset + draw_ofs, Size2i(col0_item_width, item_h));
-					Rect2 r = convert_rtl_rect(col0_cell_rect);
-
-					if (drop_mode_flags == DROP_MODE_ON_ITEM) {
-						// When only "on item" drops are allowed, draw an accented outline around the target node.
-						float rect_line_width = theme_cache.children_hl_line_width * Math::round(theme_cache.base_scale);
-						RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, r.position, Point2(r.position.x + r.size.x, r.position.y), theme_cache.drop_on_item_color, rect_line_width);
-						RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(r.position.x + r.size.x, r.position.y), r.position + r.size, theme_cache.drop_on_item_color, rect_line_width);
-						RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, r.position + r.size, Point2(r.position.x, r.position.y + r.size.y), theme_cache.drop_on_item_color, rect_line_width);
-						RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(r.position.x, r.position.y + r.size.y), r.position, theme_cache.drop_on_item_color, rect_line_width);
-					} else if (drop_mode_unchanged) {
-						// Draw a relationship line to the child already in its anticipated location.
-						TreeItem *target_parent = selected_item->get_parent();
-
-						int selected_y = get_item_offset(selected_item) - _get_title_button_height();
-						int selected_h = compute_item_height(selected_item) + theme_cache.v_separation;
-
-						Rect2i selected_cell_rect = Rect2i(Point2i(col0_ofs, selected_y) - theme_cache.offset + draw_ofs, Size2i(col0_item_width, selected_h));
-						Rect2 selected_r = convert_rtl_rect(selected_cell_rect);
-
-						int selected_item_depth = 0;
-						for (TreeItem *iter = selected_item->get_parent(); iter; iter = iter->get_parent()) {
-							if (iter == root && hide_root) {
-								break;
-							}
-							selected_item_depth += 1;
-						}
-						int selected_item_pos_x = theme_cache.item_margin * selected_item_depth;
-
-						float parent_x = selected_r.position.x;
-						if (target_parent) {
-							float parent_pos_x = selected_item_pos_x - theme_cache.item_margin;
-							parent_x = parent_pos_x + ((target_parent->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - theme_cache.arrow->get_width() * 0.5);
-							parent_x = parent_x - theme_cache.offset.x + draw_ofs.x;
-						}
-
-						int selected_root_ofs = selected_item_pos_x + ((selected_item->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - (selected_item->get_visible_child_count() > 0 ? theme_cache.arrow->get_width() : 0));
-						selected_root_ofs = MIN(selected_root_ofs, get_column_width(0) + draw_ofs.x);
-						float line_end_x = selected_root_ofs - theme_cache.offset.x + draw_ofs.x;
-
-						float horizontal_y = selected_y - theme_cache.offset.y + draw_ofs.y + selected_h * 0.5;
-						// Horizontal line.
-						RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(parent_x - line_join_nudge, horizontal_y + line_pixel_shift), Point2(line_end_x, horizontal_y + line_pixel_shift), theme_cache.drop_position_color, line_width);
-
-						float vertical_offset = 0;
-						TreeItem *walk = selected_item->get_prev_visible(false);
-						while (walk && walk != target_parent) {
-							vertical_offset += compute_item_height(walk) + theme_cache.v_separation;
-							walk = walk->get_prev_visible(false);
-						}
-
-						// Vertical line.
-						if (walk == target_parent) {
-							RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(parent_x + line_pixel_shift, selected_r.position.y - vertical_offset), Point2(parent_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-						}
-					} else {
-						TreeItem *target_parent = drop_mode_over->get_parent();
-
-						// Calculate the x position to align with relationship lines.
-						float parent_x = r.position.x;
-						if (target_parent) {
-							float parent_pos_x = item_pos.x - theme_cache.item_margin;
-							parent_x = parent_pos_x + ((target_parent->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - theme_cache.arrow->get_width() * 0.5);
-							parent_x = parent_x - theme_cache.offset.x + draw_ofs.x;
-						}
-
-						// Calculate total height of all visible descendants.
-						int descendants_height = 0;
-						if (!drop_mode_over->is_collapsed()) {
-							// Count depth of drop_mode_over once.
-							int base_depth = 0;
-							for (TreeItem *iter = drop_mode_over->get_parent(); iter; iter = iter->get_parent()) {
-								base_depth++;
-							}
-
-							TreeItem *next = drop_mode_over->get_next_visible(true);
-							while (next) {
-								// Count depth of candidate.
-								int next_depth = 0;
-								for (TreeItem *iter = next->get_parent(); iter; iter = iter->get_parent()) {
-									next_depth++;
-								}
-								if (next_depth <= base_depth) {
-									break; // No longer a descendant.
-								}
-								descendants_height += compute_item_height(next) + theme_cache.v_separation;
-								next = next->get_next_visible(true);
-							}
-						}
-
-						// Total height includes item height for drop below section.
-						int total_height = (drop_mode_section == 1) ? r.size.y + descendants_height : 0;
-
-						// Calculate total width across all columns.
-						float total_columns_width = 0;
-						for (int i = 0; i < columns.size(); i++) {
-							total_columns_width += get_column_width(i);
-						}
-						float line_end_x = total_columns_width - theme_cache.offset.x + draw_ofs.x;
-
-						if (drop_mode_section == 0 || drop_mode_section == 2) {
-							// Drop on item as last child (section 0) or as first child (section 2).
-							Ref<Texture2D> arrow = theme_cache.arrow;
-							Size2 arrow_full_size = arrow->get_size();
-
-							float item_line_x = item_pos.x + ((drop_mode_over->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin - arrow_full_size.width * 0.5);
-							item_line_x = item_line_x - theme_cache.offset.x + draw_ofs.x;
-
-							// Section 0 with visible children: use descendants_height to insert as last child.
-							// Section 2: child_height stays 0 to insert as first child.
-							float child_height = (drop_mode_section == 0 && drop_mode_over->first_child && !drop_mode_over->is_collapsed()) ? descendants_height : 0;
-
-							float horizontal_y = r.position.y + r.size.y + child_height;
-
-							// Horizontal line.
-							RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(item_line_x - line_join_nudge, horizontal_y + line_pixel_shift), Point2(line_end_x, horizontal_y + line_pixel_shift), theme_cache.drop_position_color, line_width);
-
-							// Vertical line to parent or stub.
-							if (drop_mode_section == 0) {
-								Point2 apos = Point2(item_line_x - arrow_full_size.width * 0.5, r.position.y + (r.size.y - arrow_full_size.height) / 2);
-
-								// Only draw the dropdown arrow if the item doesn't already have children and the folding arrow isn't hidden entirely.
-								if (!drop_mode_over->first_child && !hide_folding) {
-									Size2 arrow_draw_size = arrow_full_size;
-									int out_width = (apos.x + arrow_full_size.width) - (get_column_width(0) - theme_cache.offset.x + draw_ofs.x);
-									if (out_width > 0) {
-										arrow_draw_size.width -= out_width;
-									}
-
-									if (arrow_draw_size.width > 0) {
-										Point2 final_apos = convert_rtl_position(apos, arrow_draw_size.width);
-										Point2 src_pos = Point2();
-										if (cache.rtl) {
-											src_pos = Point2(arrow_full_size.width - arrow_draw_size.width, 0);
-										}
-										Rect2 arrow_rect = Rect2(final_apos, arrow_draw_size);
-										Rect2 arrow_src_rect = Rect2(src_pos, arrow_draw_size);
-										arrow->draw_rect_region(drop_indicator_ci, arrow_rect, arrow_src_rect);
-									}
-								}
-
-								if (drop_mode_over->first_child && !drop_mode_over->is_collapsed()) {
-									// Draw line down to end of visible expanded children.
-									RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(item_line_x + line_pixel_shift, r.position.y + r.size.y), Point2(item_line_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-								} else {
-									// Collapsed children or no children, draw stub.
-									RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(item_line_x + line_pixel_shift, horizontal_y - stub_height), Point2(item_line_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-								}
-							} else if (drop_mode_section == 2) {
-								// Draw stub.
-								RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(item_line_x + line_pixel_shift, horizontal_y - stub_height), Point2(item_line_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-							}
-						} else if (target_parent) {
-							// Drop above (section -1) or below (section 1) as sibling.
-							float horizontal_y = r.position.y + total_height;
-
-							// Horizontal line.
-							RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(parent_x - line_join_nudge, horizontal_y + line_pixel_shift), Point2(line_end_x, horizontal_y + line_pixel_shift), theme_cache.drop_position_color, line_width);
-
-							// Calculate vertical line length to parent.
-							float vertical_offset = 0;
-							TreeItem *walk = drop_mode_over->get_prev_visible(false);
-							while (walk && walk != target_parent) {
-								vertical_offset += compute_item_height(walk) + theme_cache.v_separation;
-								walk = walk->get_prev_visible(false);
-							}
-
-							// Vertical line or stub.
-							float line_height = (drop_mode_section == 1) ? vertical_offset + total_height : vertical_offset;
-
-							if (walk == target_parent && line_height > 0) {
-								// Draw from parent's bottom edge to horizontal line.
-								RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(parent_x + line_pixel_shift, r.position.y - vertical_offset), Point2(parent_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-							} else {
-								// Only draw stub if not at root level.
-								bool is_depth_zero = !target_parent || (target_parent == root && hide_root);
-								if (!is_depth_zero) {
-									RenderingServer::get_singleton()->canvas_item_add_line(drop_indicator_ci, Point2(parent_x + line_pixel_shift, horizontal_y - stub_height), Point2(parent_x + line_pixel_shift, horizontal_y), theme_cache.drop_position_color, line_width);
-								}
-							}
-						}
-					}
-				}
 			}
 
 			if (show_column_titles) {
@@ -5543,7 +5244,6 @@ void Tree::set_self_modulate(const Color &p_self_modulate) {
 }
 
 void Tree::_update_all() {
-	cache.font_height = theme_cache.font->get_height(theme_cache.font_size);
 	for (int i = 0; i < columns.size(); i++) {
 		update_column(i);
 	}
@@ -5573,7 +5273,7 @@ Size2 Tree::get_minimum_size() const {
 }
 
 TreeItem *Tree::create_item(TreeItem *p_parent, int p_index) {
-	ERR_FAIL_COND_V_MSG(blocked > 0, nullptr, "The tree cannot create items during mouse selection events.");
+	ERR_FAIL_COND_V(blocked > 0, nullptr);
 
 	TreeItem *ti = nullptr;
 
@@ -5737,12 +5437,12 @@ bool Tree::is_anything_selected() {
 }
 
 void Tree::clear() {
-	ERR_FAIL_COND_MSG(blocked > 0, "The tree cannot be cleared during mouse selection events.");
+	ERR_FAIL_COND(blocked > 0);
 
 	if (pressing_for_editor) {
 		if (range_drag_enabled) {
 			range_drag_enabled = false;
-			Input::get_singleton()->set_mouse_mode(Input::MouseMode::MOUSE_MODE_VISIBLE);
+			Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 			warp_mouse(range_drag_capture_pos);
 		}
 		pressing_for_editor = false;
@@ -5994,12 +5694,12 @@ void Tree::propagate_set_columns(TreeItem *p_item) {
 	p_item->accessibility_row_dirty = true;
 	for (TreeItem::Cell &cell : p_item->cells) {
 		if (cell.accessibility_cell_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(cell.accessibility_cell_element);
+			DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
 			cell.accessibility_cell_element = RID();
 		}
 		for (TreeItem::Cell::Button &btn : cell.buttons) {
 			if (btn.accessibility_button_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(btn.accessibility_button_element);
+				DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
 				btn.accessibility_button_element = RID();
 			}
 		}
@@ -6014,12 +5714,12 @@ void Tree::propagate_set_columns(TreeItem *p_item) {
 
 void Tree::set_columns(int p_columns) {
 	ERR_FAIL_COND(p_columns < 1);
-	ERR_FAIL_COND_MSG(blocked > 0, "The number of columns cannot be changed during mouse selection events.");
+	ERR_FAIL_COND(blocked > 0);
 
 	if (columns.size() > p_columns) {
 		for (int i = p_columns; i < columns.size(); i++) {
 			if (columns[i].accessibility_col_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(columns[i].accessibility_col_element);
+				DisplayServer::get_singleton()->accessibility_free_element(columns[i].accessibility_col_element);
 				columns.write[i].accessibility_col_element = RID();
 			}
 		}
@@ -6046,7 +5746,6 @@ int Tree::get_columns() const {
 void Tree::_scroll_moved(float) {
 	_determine_hovered_item();
 	queue_redraw();
-	popup_editor->hide();
 }
 
 Rect2 Tree::get_custom_popup_rect() const {
@@ -6101,7 +5800,6 @@ void Tree::ensure_cursor_is_visible() {
 	// Note: Code below similar to `Tree::scroll_to_item()`, in case of bug fix both.
 	const Size2 area_size = _get_content_rect().size;
 
-	double delta_v = 0;
 	int y_offset = get_item_offset(selected_item);
 	if (y_offset != -1) {
 		const int tbh = _get_title_button_height();
@@ -6111,18 +5809,14 @@ void Tree::ensure_cursor_is_visible() {
 		int screen_h = area_size.height - tbh;
 
 		if (cell_h > screen_h) { // Screen size is too small, maybe it was not resized yet.
-			delta_v = y_offset - v_scroll->get_value();
 			v_scroll->set_value(y_offset);
 		} else if (y_offset + cell_h > v_scroll->get_value() + screen_h) {
-			delta_v = y_offset - screen_h + cell_h - v_scroll->get_value();
 			callable_mp((Range *)v_scroll, &Range::set_value).call_deferred(y_offset - screen_h + cell_h);
 		} else if (y_offset < v_scroll->get_value()) {
-			delta_v = y_offset - v_scroll->get_value();
 			v_scroll->set_value(y_offset);
 		}
 	}
 
-	double delta_h = 0;
 	if (select_mode != SELECT_ROW) { // Cursor always at column 0 in this mode.
 		int x_offset = 0;
 		for (int i = 0; i < selected_col; i++) {
@@ -6133,28 +5827,14 @@ void Tree::ensure_cursor_is_visible() {
 		const int screen_w = area_size.width;
 
 		if (cell_w > screen_w) {
-			delta_h = x_offset - h_scroll->get_value();
 			h_scroll->set_value(x_offset);
 		} else if (x_offset + cell_w > h_scroll->get_value() + screen_w) {
-			delta_h = x_offset - screen_w + cell_w - h_scroll->get_value();
 			callable_mp((Range *)h_scroll, &Range::set_value).call_deferred(x_offset - screen_w + cell_w);
 		} else if (x_offset < h_scroll->get_value()) {
-			delta_h = x_offset - h_scroll->get_value();
 			h_scroll->set_value(x_offset);
 		}
 	}
 
-	// Move focus_rect.
-	if (select_mode == SELECT_ROW) {
-		Rect2 r = selected_item->cells[selected_col].focus_rect;
-		r.position -= Vector2(delta_h, delta_v);
-		selected_item->cells.write[selected_col].focus_rect = r;
-	} else {
-		Rect2 r = selected_item->focus_rect;
-		r.position -= Vector2(delta_h, delta_v);
-		selected_item->focus_rect = r;
-	}
-
 	queue_accessibility_update();
 }
 
@@ -6534,7 +6214,7 @@ void Tree::_do_incr_search(const String &p_add) {
 TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_column, int &r_height, int &r_section) const {
 	r_column = -1;
 	r_height = 0;
-	r_section = COLUMN_NOT_FOUND;
+	r_section = -100;
 
 	if (!root) {
 		return nullptr;
@@ -6542,116 +6222,41 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
 
 	Point2 pos = p_pos;
 
-	// Calculate target parent based on horizontal mouse position.
-	int indent_width = theme_cache.item_margin;
-	int target_depth = MAX(0, (p_pos.x / indent_width) + 1); // +1 to overlap with relationship lines.
-	int current_item_depth = 0;
-	for (TreeItem *depth_parent = p_item->get_parent(); depth_parent; depth_parent = depth_parent->get_parent()) {
-		if (depth_parent == root && hide_root) {
-			break;
-		}
-		current_item_depth++;
-	}
-
-	if (drop_mode_flags && drop_mode_flags != DROP_MODE_ON_ITEM) {
-		// Clamp maximum depth to current item's depth.
-		target_depth = MIN(target_depth, current_item_depth);
-	} else if (drop_mode_flags == DROP_MODE_ON_ITEM) {
-		// Ignore indent space and always target items directly.
-		target_depth = current_item_depth;
-	}
-
-	bool is_at_target_depth = (drop_mode_flags && current_item_depth == target_depth);
-
 	if ((root != p_item || !hide_root) && p_item->is_visible_in_tree()) {
 		r_height = compute_item_height(p_item) + theme_cache.v_separation;
-
-		bool within_vertical_bounds = (pos.y < r_height);
-
-		if (within_vertical_bounds) {
-			bool skip_item = false;
-			if (drop_mode_flags && current_item_depth != target_depth) {
-				// Skip items not at target depth.
-				skip_item = true;
+		if (pos.y < r_height) {
+			if (drop_mode_flags == DROP_MODE_ON_ITEM) {
+				r_section = 0;
+			} else if (drop_mode_flags == DROP_MODE_INBETWEEN) {
+				r_section = pos.y < r_height / 2 ? -1 : 1;
+			} else if (pos.y < r_height / 4) {
+				r_section = -1;
+			} else if (pos.y >= (r_height * 3 / 4)) {
+				r_section = 1;
+			} else {
+				r_section = 0;
 			}
 
-			if (!skip_item) {
-				int item_content_start_x = current_item_depth * theme_cache.item_margin;
-				if (!p_item->first_child) {
-					item_content_start_x += ((p_item->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin);
-				}
-				bool over_content_area = (p_pos.x >= item_content_start_x);
+			for (int i = 0; i < columns.size(); i++) {
+				int col_width = get_column_width(i);
 
-				bool item_allows_drop = p_item->is_accepting_children();
-				bool parent_allows_drop = p_item->get_parent() && p_item->get_parent()->is_accepting_children();
-
-				if (drop_mode_flags == DROP_MODE_ON_ITEM) {
-					// When only on item drops are allowed.
-					r_section = item_allows_drop ? 0 : COLUMN_NOT_FOUND;
-				} else if (drop_mode_flags == DROP_MODE_INBETWEEN) {
-					// When only sibling drops are allowed.
-					if (parent_allows_drop) { // Parent must accept children.
-						r_section = pos.y < r_height / 2 ? -1 : 1; // Above or below.
-					} else {
-						r_section = COLUMN_NOT_FOUND;
+				if (p_item->cells[i].expand_right) {
+					int plus = 1;
+					while (i + plus < columns.size() && !p_item->cells[i + plus].editable && p_item->cells[i + plus].mode == TreeItem::CELL_MODE_STRING && p_item->cells[i + plus].text.is_empty() && p_item->cells[i + plus].icon.is_null() && p_item->cells[i + plus].buttons.is_empty()) {
+						col_width += theme_cache.h_separation;
+						col_width += get_column_width(i + plus);
+						plus++;
 					}
-				} else if (drop_mode_flags) {
-					// When either are allowed, section is determined by cursor position.
-					if (!over_content_area) {
-						// In indent space.
-						if (pos.y < r_height / 2 && current_item_depth > 0) {
-							r_section = parent_allows_drop ? -1 : COLUMN_NOT_FOUND; // Sibling above.
-						} else {
-							r_section = parent_allows_drop ? 1 : COLUMN_NOT_FOUND; // Sibling below.
-						}
-					} else if (pos.y < r_height / 4) {
-						// Near top edge.
-						if (current_item_depth > 0) { // Not root, since root cannot have siblings.
-							r_section = parent_allows_drop ? -1 : COLUMN_NOT_FOUND; // Sibling above.
-						} else {
-							r_section = item_allows_drop ? 0 : COLUMN_NOT_FOUND; // On root, or as last child of root.
-						}
-					} else if (pos.y >= r_height * 3 / 4) {
-						// Near bottom edge.
-						if (p_item->first_child && item_allows_drop) {
-							r_section = 2; // As first child.
-						} else {
-							r_section = parent_allows_drop ? 1 : COLUMN_NOT_FOUND; // Sibling below.
-						}
-					} else {
-						// Middle zone.
-						if (item_allows_drop) {
-							r_section = 0; // On item, or as last child.
-						} else if (parent_allows_drop) {
-							r_section = pos.y < r_height / 2 ? -1 : 1; // Above or below as sibling.
-						} else {
-							r_section = COLUMN_NOT_FOUND;
-						}
-					}
-				} else {
-					r_section = 0;
 				}
 
-				for (int i = 0; i < columns.size(); i++) {
-					int col_width = get_column_width(i);
-
-					if (p_item->cells[i].expand_right) {
-						int plus = 1;
-						while (i + plus < columns.size() && !p_item->cells[i + plus].editable && p_item->cells[i + plus].mode == TreeItem::CELL_MODE_STRING && p_item->cells[i + plus].text.is_empty() && p_item->cells[i + plus].icon.is_null() && p_item->cells[i + plus].buttons.is_empty()) {
-							col_width += theme_cache.h_separation;
-							col_width += get_column_width(i + plus);
-							plus++;
-						}
-					}
-
-					if (pos.x < col_width) {
-						r_column = i;
-						return p_item;
-					}
-					pos.x -= col_width;
+				if (pos.x < col_width) {
+					r_column = i;
+					return p_item;
 				}
-				return nullptr;
+				pos.x -= col_width;
 			}
+
+			return nullptr;
 		} else {
 			pos.y -= r_height;
 		}
@@ -6675,35 +6280,6 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
 		n = n->get_next();
 	}
 
-	// Fallback: if in drop mode, at target depth, and mouse is below all nodes (pos.y is now negative after subtracting all children).
-	if (drop_mode_flags && is_at_target_depth && (root != p_item || !hide_root) && p_item->is_visible_in_tree() && pos.y < 0) {
-		// Dropping below the last item at specified depth level.
-		if (!p_item->get_parent() || !p_item->get_parent()->is_accepting_children()) {
-			return nullptr;
-		}
-		r_section = 1;
-
-		Point2 col_pos = p_pos;
-		for (int i = 0; i < columns.size(); i++) {
-			int col_width = get_column_width(i);
-
-			if (p_item->cells[i].expand_right) {
-				int plus = 1;
-				while (i + plus < columns.size() && !p_item->cells[i + plus].editable && p_item->cells[i + plus].mode == TreeItem::CELL_MODE_STRING && p_item->cells[i + plus].text.is_empty() && p_item->cells[i + plus].icon.is_null() && p_item->cells[i + plus].buttons.is_empty()) {
-					col_width += theme_cache.h_separation;
-					col_width += get_column_width(i + plus);
-					plus++;
-				}
-			}
-
-			if (col_pos.x < col_width) {
-				r_column = i;
-				return p_item;
-			}
-			col_pos.x -= col_width;
-		}
-	}
-
 	return nullptr;
 }
 
@@ -6875,7 +6451,7 @@ int Tree::get_column_at_position(const Point2 &p_pos) const {
 
 int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
 	if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
-		return COLUMN_NOT_FOUND;
+		return -100;
 	}
 
 	Point2 pos = p_pos;
@@ -6886,7 +6462,7 @@ int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
 	pos -= margin_offset;
 	pos.y -= _get_title_button_height();
 	if (pos.y + margin_offset.y < 0) {
-		return COLUMN_NOT_FOUND;
+		return -100;
 	}
 
 	if (h_scroll->is_visible_in_tree()) {
@@ -6900,16 +6476,9 @@ int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
 	TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
 
 	if (it) {
-		TreeItem *check = it->get_parent();
-		while (check) {
-			if (check->is_any_column_selected()) {
-				return COLUMN_NOT_FOUND;
-			}
-			check = check->get_parent();
-		}
 		return section;
 	}
-	return COLUMN_NOT_FOUND;
+	return -100;
 }
 
 bool Tree::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
@@ -7041,26 +6610,6 @@ String Tree::get_tooltip(const Point2 &p_pos) const {
 	return Control::get_tooltip(p_pos);
 }
 
-Node::AutoTranslateMode Tree::get_tooltip_auto_translate_mode_at(const Point2 &p_at) const {
-	Point2 pos = p_at - theme_cache.panel_style->get_offset();
-	pos.y -= _get_title_button_height();
-
-	// `pos.y` less than 0 indicates we're in the header.
-	if (pos.y < 0) {
-		// Columns don't have auto-translate mode, so return the default.
-		return Control::get_tooltip_auto_translate_mode_at(p_at);
-	}
-
-	TreeItem *it;
-	int col, index, section;
-	_find_button_at_pos(p_at, it, col, index, section);
-
-	if (it) {
-		return it->get_auto_translate_mode(col);
-	}
-	return Control::get_tooltip_auto_translate_mode_at(p_at);
-}
-
 void Tree::set_cursor_can_exit_tree(bool p_enable) {
 	cursor_can_exit_tree = p_enable;
 }
@@ -7275,15 +6824,15 @@ void Tree::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("item_selected"));
 	ADD_SIGNAL(MethodInfo("cell_selected"));
-	ADD_SIGNAL(MethodInfo("multi_selected", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, TreeItem::get_class_static()), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::BOOL, "selected")));
+	ADD_SIGNAL(MethodInfo("multi_selected", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::BOOL, "selected")));
 	ADD_SIGNAL(MethodInfo("item_mouse_selected", PropertyInfo(Variant::VECTOR2, "mouse_position"), PropertyInfo(Variant::INT, "mouse_button_index")));
 	ADD_SIGNAL(MethodInfo("empty_clicked", PropertyInfo(Variant::VECTOR2, "click_position"), PropertyInfo(Variant::INT, "mouse_button_index")));
 	ADD_SIGNAL(MethodInfo("item_edited"));
 	ADD_SIGNAL(MethodInfo("custom_item_clicked", PropertyInfo(Variant::INT, "mouse_button_index")));
 	ADD_SIGNAL(MethodInfo("item_icon_double_clicked"));
-	ADD_SIGNAL(MethodInfo("item_collapsed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, TreeItem::get_class_static())));
-	ADD_SIGNAL(MethodInfo("check_propagated_to_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, TreeItem::get_class_static()), PropertyInfo(Variant::INT, "column")));
-	ADD_SIGNAL(MethodInfo("button_clicked", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, TreeItem::get_class_static()), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "mouse_button_index")));
+	ADD_SIGNAL(MethodInfo("item_collapsed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem")));
+	ADD_SIGNAL(MethodInfo("check_propagated_to_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column")));
+	ADD_SIGNAL(MethodInfo("button_clicked", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "mouse_button_index")));
 	ADD_SIGNAL(MethodInfo("custom_popup_edited", PropertyInfo(Variant::BOOL, "arrow_clicked")));
 	ADD_SIGNAL(MethodInfo("item_activated"));
 	ADD_SIGNAL(MethodInfo("column_title_clicked", PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "mouse_button_index")));
@@ -7346,7 +6895,6 @@ void Tree::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_hovered_selected_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_selected_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_disabled_color);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, drop_on_item_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, drop_position_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Tree, h_separation);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Tree, v_separation);
@@ -7415,10 +6963,6 @@ Tree::Tree() {
 	rs->canvas_item_set_parent(header_ci, get_canvas_item());
 	rs->canvas_item_set_use_parent_material(header_ci, true);
 
-	drop_indicator_ci = rs->canvas_item_create();
-	rs->canvas_item_set_parent(drop_indicator_ci, get_canvas_item());
-	rs->canvas_item_set_use_parent_material(drop_indicator_ci, true);
-
 	popup_editor = memnew(Popup);
 	add_child(popup_editor, false, INTERNAL_MODE_FRONT);
 
@@ -7470,7 +7014,6 @@ Tree::~Tree() {
 	if (root) {
 		memdelete(root);
 	}
-	RenderingServer::get_singleton()->free_rid(drop_indicator_ci);
 	RenderingServer::get_singleton()->free_rid(content_ci);
 	RenderingServer::get_singleton()->free_rid(header_ci);
 }
diff --git a/engine/scene/gui/tree.h b/engine/scene/gui/tree.h
index 3e7dc989..8a6c0916 100644
--- a/engine/scene/gui/tree.h
+++ b/engine/scene/gui/tree.h
@@ -32,7 +32,6 @@
 
 #include "scene/gui/control.h"
 #include "scene/resources/text_paragraph.h"
-#include "servers/display/accessibility_server.h"
 
 class VBoxContainer;
 class HScrollBar;
@@ -79,7 +78,6 @@ private:
 		Array st_args;
 		Control::TextDirection text_direction = Control::TEXT_DIRECTION_INHERITED;
 		TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF;
-		BitField<TextServer::LineBreakFlag> autowrap_trim_flags = TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 		bool dirty = true;
 		double min = 0.0;
 		double max = 100.0;
@@ -147,7 +145,6 @@ private:
 	bool visible = true;
 	bool parent_visible_in_tree = true;
 	bool disable_folding = false;
-	bool accepts_children = true;
 	int custom_min_height = 0;
 
 	TreeItem *parent = nullptr; // Parent item.
@@ -183,17 +180,17 @@ private:
 
 	_FORCE_INLINE_ void _unlink_from_tree() {
 		if (accessibility_row_element.is_valid()) {
-			AccessibilityServer::get_singleton()->free_element(accessibility_row_element);
+			DisplayServer::get_singleton()->accessibility_free_element(accessibility_row_element);
 			accessibility_row_element = RID();
 		}
 		for (Cell &cell : cells) {
 			if (cell.accessibility_cell_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(cell.accessibility_cell_element);
+				DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
 				cell.accessibility_cell_element = RID();
 			}
 			for (Cell::Button &btn : cell.buttons) {
 				if (btn.accessibility_button_element.is_valid()) {
-					AccessibilityServer::get_singleton()->free_element(btn.accessibility_button_element);
+					DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
 					btn.accessibility_button_element = RID();
 				}
 			}
@@ -287,9 +284,6 @@ public:
 	void set_autowrap_mode(int p_column, TextServer::AutowrapMode p_mode);
 	TextServer::AutowrapMode get_autowrap_mode(int p_column) const;
 
-	void set_autowrap_trim_flags(int p_column, BitField<TextServer::LineBreakFlag> p_flags);
-	BitField<TextServer::LineBreakFlag> get_autowrap_trim_flags(int p_column) const;
-
 	void set_text_overrun_behavior(int p_column, TextServer::OverrunBehavior p_behavior);
 	TextServer::OverrunBehavior get_text_overrun_behavior(int p_column) const;
 
@@ -412,9 +406,6 @@ public:
 	void set_disable_folding(bool p_disable);
 	bool is_folding_disabled() const;
 
-	void set_accept_children(bool p_allowed);
-	bool is_accepting_children() const;
-
 	Size2 get_minimum_size(int p_column);
 
 	// Item manipulation.
@@ -428,7 +419,6 @@ public:
 	TreeItem *get_next() const;
 	TreeItem *get_parent() const;
 	TreeItem *get_first_child() const;
-	TreeItem *get_last_child() const;
 
 	TreeItem *get_prev_in_tree(bool p_wrap = false);
 	TreeItem *get_next_in_tree(bool p_wrap = false);
@@ -497,7 +487,6 @@ private:
 
 	TreeItem *drop_mode_over = nullptr;
 	int drop_mode_section = 0;
-	bool drop_mode_unchanged = false;
 
 	TreeItem *single_select_defer = nullptr;
 	int single_select_defer_column = 0;
@@ -506,7 +495,7 @@ private:
 	bool pressing_for_editor = false;
 	Vector2 pressing_pos;
 
-	Vector2 hovered_pos = Vector2(-1.0, -1.0);
+	Vector2 hovered_pos;
 	bool is_mouse_hovering = false;
 
 	float range_drag_base = 0.0;
@@ -527,7 +516,6 @@ private:
 	int blocked = 0;
 
 	int drop_mode_flags = 0;
-	static constexpr int COLUMN_NOT_FOUND = -100;
 
 	struct ColumnInfo {
 		mutable RID accessibility_col_element;
@@ -557,7 +545,6 @@ private:
 	RID accessibility_scroll_element;
 	RID header_ci; // Separate canvas item for drawing column headers
 	RID content_ci; // Separate canvas item for drawing tree rows
-	RID drop_indicator_ci;
 
 	VBoxContainer *popup_editor_vb = nullptr;
 	Popup *popup_editor = nullptr;
@@ -577,9 +564,8 @@ private:
 
 	int compute_item_height(TreeItem *p_item) const;
 	int get_item_height(TreeItem *p_item) const;
-	Point2i convert_rtl_position(const Point2i &p_pos, int p_width = 0) const;
-	Point2 convert_rtl_position(const Point2 &p_pos, int p_width = 0) const;
-	Rect2i convert_rtl_rect(const Rect2i &p_rect) const;
+	Point2i convert_rtl_position(const Point2i &pos, int width = 0) const;
+	Rect2i convert_rtl_rect(const Rect2i &Rect2) const;
 	void _update_all();
 	void update_column(int p_col);
 	void update_item_cell(TreeItem *p_item, int p_col) const;
@@ -654,7 +640,6 @@ private:
 		Color font_selected_color;
 		Color font_disabled_color;
 		Color guide_color;
-		Color drop_on_item_color;
 		Color drop_position_color;
 		Color relationship_line_color;
 		Color parent_hl_line_color;
@@ -720,7 +705,6 @@ private:
 		int hover_button_index_in_column = -1;
 
 		bool rtl = false;
-		int font_height = -1;
 	} cache;
 
 	int _get_title_button_height() const;
@@ -843,7 +827,6 @@ public:
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
 	virtual String get_tooltip(const Point2 &p_pos) const override;
-	virtual AutoTranslateMode get_tooltip_auto_translate_mode_at(const Point2 &p_at) const override;
 
 	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
 	virtual Variant get_drag_data(const Point2 &p_point) override;
diff --git a/engine/scene/gui/video_stream_player.cpp b/engine/scene/gui/video_stream_player.cpp
index 19e04796..79da7a42 100644
--- a/engine/scene/gui/video_stream_player.cpp
+++ b/engine/scene/gui/video_stream_player.cpp
@@ -30,12 +30,8 @@
 
 #include "video_stream_player.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
+#include "core/os/os.h"
 #include "servers/audio/audio_server.h"
-#include "servers/display/accessibility_server.h"
 
 int VideoStreamPlayer::sp_get_channel_count() const {
 	if (playback.is_null()) {
@@ -135,7 +131,7 @@ void VideoStreamPlayer::_notification(int p_notification) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_VIDEO);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_VIDEO);
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
@@ -575,7 +571,7 @@ void VideoStreamPlayer::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("finished"));
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "audio_track", PROPERTY_HINT_RANGE, "0,128,1"), "set_audio_track", "get_audio_track");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, VideoStream::get_class_static()), "set_stream", "get_stream");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "VideoStream"), "set_stream", "get_stream");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01,suffix:dB"), "set_volume_db", "get_volume_db");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume", PROPERTY_HINT_RANGE, "0,15,0.01,exp", PROPERTY_USAGE_NONE), "set_volume", "get_volume");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "speed_scale", PROPERTY_HINT_RANGE, "0,4,0.001,or_greater"), "set_speed_scale", "get_speed_scale");
diff --git a/engine/scene/gui/view_panner.cpp b/engine/scene/gui/view_panner.cpp
index 4ed11524..df7dc3f8 100644
--- a/engine/scene/gui/view_panner.cpp
+++ b/engine/scene/gui/view_panner.cpp
@@ -120,7 +120,6 @@ bool ViewPanner::gui_input(const Ref<InputEvent> &p_event, Rect2 p_canvas_rect)
 	Ref<InputEventMouseMotion> mm = p_event;
 	if (mm.is_valid()) {
 		if (drag_type == DragType::DRAG_TYPE_PAN) {
-			Viewport *warped_panning_viewport = (warped_panning_owner ? warped_panning_owner->get_viewport() : nullptr);
 			if (warped_panning_viewport && p_canvas_rect.has_area()) {
 				pan_callback.call(warped_panning_viewport->wrap_mouse_in_rect(mm->get_relative(), p_canvas_rect), p_event);
 			} else {
@@ -244,8 +243,8 @@ void ViewPanner::setup(ControlScheme p_scheme, Ref<Shortcut> p_shortcut, bool p_
 	set_simple_panning_enabled(p_simple_panning);
 }
 
-void ViewPanner::setup_warped_panning(Node *p_owner, bool p_allowed) {
-	warped_panning_owner = p_allowed ? p_owner : nullptr;
+void ViewPanner::setup_warped_panning(Viewport *p_viewport, bool p_allowed) {
+	warped_panning_viewport = p_allowed ? p_viewport : nullptr;
 }
 
 bool ViewPanner::is_panning() const {
diff --git a/engine/scene/gui/view_panner.h b/engine/scene/gui/view_panner.h
index fb35224d..df097c06 100644
--- a/engine/scene/gui/view_panner.h
+++ b/engine/scene/gui/view_panner.h
@@ -33,8 +33,8 @@
 #include "core/object/ref_counted.h"
 
 class InputEvent;
-class Node;
 class Shortcut;
+class Viewport;
 
 class ViewPanner : public RefCounted {
 	GDCLASS(ViewPanner, RefCounted);
@@ -86,7 +86,7 @@ private:
 	Callable zoom_callback;
 
 	ControlScheme control_scheme = SCROLL_ZOOMS;
-	Node *warped_panning_owner = nullptr;
+	Viewport *warped_panning_viewport = nullptr;
 
 public:
 	void set_callbacks(Callable p_pan_callback, Callable p_zoom_callback);
@@ -100,7 +100,7 @@ public:
 	void set_zoom_style(ZoomStyle p_zoom_style);
 
 	void setup(ControlScheme p_scheme, Ref<Shortcut> p_shortcut, bool p_simple_panning);
-	void setup_warped_panning(Node *p_owner, bool p_allowed);
+	void setup_warped_panning(Viewport *p_viewport, bool p_allowed);
 
 	bool is_panning() const;
 	void set_force_drag(bool p_force);
diff --git a/engine/scene/gui/virtual_joystick.cpp b/engine/scene/gui/virtual_joystick.cpp
deleted file mode 100644
index ba0910a2..00000000
--- a/engine/scene/gui/virtual_joystick.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/**************************************************************************/
-/*  virtual_joystick.cpp                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "virtual_joystick.h"
-
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/object/class_db.h"
-#include "scene/theme/theme_db.h"
-
-void VirtualJoystick::gui_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEventScreenTouch> touch = p_event;
-	if (touch.is_valid()) {
-		if (touch->is_pressed()) {
-			if (touch_index == -1 && has_point(touch->get_position())) {
-				Rect2 base_rect = Rect2(joystick_pos - Vector2(0.5, 0.5) * joystick_size, Vector2(joystick_size, joystick_size));
-				if (joystick_mode == JOYSTICK_DYNAMIC || joystick_mode == JOYSTICK_FOLLOWING || (base_rect.has_point(touch->get_position()) && joystick_mode == JOYSTICK_FIXED)) {
-					if (joystick_mode == JOYSTICK_DYNAMIC || joystick_mode == JOYSTICK_FOLLOWING) {
-						joystick_pos = touch->get_position();
-					}
-
-					emit_signal(SceneStringName(pressed));
-
-					is_pressed = true;
-					touch_index = touch->get_index();
-					_update_joystick(touch->get_position());
-				}
-			}
-		} else if (touch->get_index() == touch_index) {
-			is_pressed = false;
-			emit_signal(SNAME("released"), input_vector);
-
-			if (!is_flick_canceled && !has_moved) {
-				emit_signal(SNAME("tapped"));
-			} else if (has_input && has_moved) {
-				emit_signal(SNAME("flicked"), input_vector);
-			}
-			_reset();
-		}
-	}
-
-	Ref<InputEventScreenDrag> drag = p_event;
-	if (drag.is_valid() && drag->get_index() == touch_index) {
-		has_moved = true;
-		_update_joystick(drag->get_position());
-	}
-}
-
-void VirtualJoystick::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_DRAW: {
-			if (!Engine::get_singleton()->is_editor_hint() && visibility == VISIBILITY_WHEN_TOUCHED && !is_pressed) {
-				return;
-			}
-
-			Rect2 rect_joystick = Rect2(joystick_pos - Vector2(0.5, 0.5) * joystick_size, Vector2(joystick_size, joystick_size));
-			draw_style_box(is_pressed ? theme_cache.pressed_joystick : theme_cache.normal_joystick, rect_joystick);
-
-			Rect2 rect_tip = Rect2(tip_pos - Vector2(0.5, 0.5) * tip_size, Vector2(tip_size, tip_size));
-			draw_style_box(is_pressed ? theme_cache.pressed_tip : theme_cache.normal_tip, rect_tip);
-		} break;
-
-		case NOTIFICATION_ENTER_TREE: {
-			joystick_pos = get_size() * initial_offset_ratio;
-			tip_pos = joystick_pos;
-		} break;
-
-		case NOTIFICATION_RESIZED: {
-			_reset();
-		} break;
-	}
-}
-
-void VirtualJoystick::_update_joystick(const Vector2 &p_pos) {
-	Vector2 offset = p_pos - joystick_pos;
-	float length = offset.length();
-	Vector2 direction = offset.normalized();
-
-	float clampzone_radius = joystick_size * 0.5f * clampzone_ratio;
-
-	if (joystick_mode == JOYSTICK_FOLLOWING && length > clampzone_radius && has_point(p_pos)) {
-		joystick_pos = p_pos - direction * clampzone_radius;
-	}
-
-	if (length > clampzone_radius) {
-		length = clampzone_radius;
-		offset = direction * length;
-	}
-
-	tip_pos = joystick_pos + offset;
-
-	bool was_pressed = has_input;
-	raw_input_vector = offset / clampzone_radius;
-	if (length > deadzone_ratio * clampzone_radius) {
-		has_input = true;
-		float scaled = Math::inverse_lerp(deadzone_ratio * clampzone_radius, clampzone_radius, length);
-		input_vector = direction * scaled;
-	} else {
-		has_input = false;
-		input_vector = Vector2();
-	}
-
-	if (!is_flick_canceled && was_pressed && !has_input) {
-		is_flick_canceled = true;
-		emit_signal(SNAME("flick_canceled"));
-	} else if (is_flick_canceled && !was_pressed && has_input) {
-		is_flick_canceled = false;
-	}
-
-	_handle_input_actions();
-
-	queue_redraw();
-}
-
-void VirtualJoystick::_handle_input_actions() {
-	Input *input = Input::get_singleton();
-
-	if (input_vector.x >= 0.0f && input->is_action_pressed(action_left)) {
-		input->action_release(action_left);
-	}
-	if (input_vector.x <= 0.0f && input->is_action_pressed(action_right)) {
-		input->action_release(action_right);
-	}
-	if (input_vector.y >= 0.0f && input->is_action_pressed(action_up)) {
-		input->action_release(action_up);
-	}
-	if (input_vector.y <= 0.0f && input->is_action_pressed(action_down)) {
-		input->action_release(action_down);
-	}
-
-	if (input_vector.x < 0.0f) {
-		input->action_press(action_left, -input_vector.x);
-	} else if (input_vector.x > 0.0f) {
-		input->action_press(action_right, input_vector.x);
-	}
-	if (input_vector.y < 0.0f) {
-		input->action_press(action_up, -input_vector.y);
-	} else if (input_vector.y > 0.0f) {
-		input->action_press(action_down, input_vector.y);
-	}
-}
-
-void VirtualJoystick::_reset() {
-	is_pressed = false;
-	has_input = false;
-	has_moved = false;
-	raw_input_vector = Vector2();
-	input_vector = Vector2();
-	is_flick_canceled = false;
-	touch_index = -1;
-	joystick_pos = get_size() * initial_offset_ratio;
-	tip_pos = joystick_pos;
-
-	Input *input = Input::get_singleton();
-	for (const StringName &action : { action_left, action_right, action_down, action_up }) {
-		if (input->is_action_pressed(action)) {
-			input->action_release(action);
-		}
-	}
-
-	queue_redraw();
-}
-
-void VirtualJoystick::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_joystick_mode", "mode"), &VirtualJoystick::set_joystick_mode);
-	ClassDB::bind_method(D_METHOD("get_joystick_mode"), &VirtualJoystick::get_joystick_mode);
-
-	ClassDB::bind_method(D_METHOD("set_joystick_size", "size"), &VirtualJoystick::set_joystick_size);
-	ClassDB::bind_method(D_METHOD("get_joystick_size"), &VirtualJoystick::get_joystick_size);
-
-	ClassDB::bind_method(D_METHOD("set_tip_size", "size"), &VirtualJoystick::set_tip_size);
-	ClassDB::bind_method(D_METHOD("get_tip_size"), &VirtualJoystick::get_tip_size);
-
-	ClassDB::bind_method(D_METHOD("set_deadzone_ratio", "ratio"), &VirtualJoystick::set_deadzone_ratio);
-	ClassDB::bind_method(D_METHOD("get_deadzone_ratio"), &VirtualJoystick::get_deadzone_ratio);
-
-	ClassDB::bind_method(D_METHOD("set_clampzone_ratio", "ratio"), &VirtualJoystick::set_clampzone_ratio);
-	ClassDB::bind_method(D_METHOD("get_clampzone_ratio"), &VirtualJoystick::get_clampzone_ratio);
-
-	ClassDB::bind_method(D_METHOD("set_initial_offset_ratio", "ratio"), &VirtualJoystick::set_initial_offset_ratio);
-	ClassDB::bind_method(D_METHOD("get_initial_offset_ratio"), &VirtualJoystick::get_initial_offset_ratio);
-
-	ClassDB::bind_method(D_METHOD("set_action_left", "action"), &VirtualJoystick::set_action_left);
-	ClassDB::bind_method(D_METHOD("get_action_left"), &VirtualJoystick::get_action_left);
-
-	ClassDB::bind_method(D_METHOD("set_action_right", "action"), &VirtualJoystick::set_action_right);
-	ClassDB::bind_method(D_METHOD("get_action_right"), &VirtualJoystick::get_action_right);
-
-	ClassDB::bind_method(D_METHOD("set_action_up", "action"), &VirtualJoystick::set_action_up);
-	ClassDB::bind_method(D_METHOD("get_action_up"), &VirtualJoystick::get_action_up);
-
-	ClassDB::bind_method(D_METHOD("set_action_down", "action"), &VirtualJoystick::set_action_down);
-	ClassDB::bind_method(D_METHOD("get_action_down"), &VirtualJoystick::get_action_down);
-
-	ClassDB::bind_method(D_METHOD("set_visibility_mode", "mode"), &VirtualJoystick::set_visibility_mode);
-	ClassDB::bind_method(D_METHOD("get_visibility_mode"), &VirtualJoystick::get_visibility_mode);
-
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "joystick_mode", PROPERTY_HINT_ENUM, "Fixed,Dynamic,Following"), "set_joystick_mode", "get_joystick_mode");
-
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "joystick_size", PROPERTY_HINT_RANGE, "10,500,1"), "set_joystick_size", "get_joystick_size");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tip_size", PROPERTY_HINT_RANGE, "5,250,1"), "set_tip_size", "get_tip_size");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "deadzone_ratio", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_deadzone_ratio", "get_deadzone_ratio");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "clampzone_ratio", PROPERTY_HINT_RANGE, "0,2,0.01"), "set_clampzone_ratio", "get_clampzone_ratio");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "initial_offset_ratio", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_initial_offset_ratio", "get_initial_offset_ratio");
-
-	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "action_left", PROPERTY_HINT_INPUT_NAME, "show_builtin,loose_mode"), "set_action_left", "get_action_left");
-	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "action_right", PROPERTY_HINT_INPUT_NAME, "show_builtin,loose_mode"), "set_action_right", "get_action_right");
-	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "action_up", PROPERTY_HINT_INPUT_NAME, "show_builtin,loose_mode"), "set_action_up", "get_action_up");
-	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "action_down", PROPERTY_HINT_INPUT_NAME, "show_builtin,loose_mode"), "set_action_down", "get_action_down");
-
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_mode", PROPERTY_HINT_ENUM, "Always,When Touched"), "set_visibility_mode", "get_visibility_mode");
-
-	ADD_SIGNAL(MethodInfo("pressed"));
-	ADD_SIGNAL(MethodInfo("tapped"));
-	ADD_SIGNAL(MethodInfo("released", PropertyInfo(Variant::VECTOR2, "input_vector")));
-	ADD_SIGNAL(MethodInfo("flicked", PropertyInfo(Variant::VECTOR2, "input_vector")));
-	ADD_SIGNAL(MethodInfo("flick_canceled"));
-
-	BIND_ENUM_CONSTANT(JOYSTICK_FIXED);
-	BIND_ENUM_CONSTANT(JOYSTICK_DYNAMIC);
-	BIND_ENUM_CONSTANT(JOYSTICK_FOLLOWING);
-	BIND_ENUM_CONSTANT(VISIBILITY_ALWAYS);
-	BIND_ENUM_CONSTANT(VISIBILITY_WHEN_TOUCHED);
-
-	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, VirtualJoystick, normal_joystick);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, VirtualJoystick, normal_tip);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, VirtualJoystick, pressed_joystick);
-	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, VirtualJoystick, pressed_tip);
-}
-
-Vector2 VirtualJoystick::get_joystick_position() const {
-	return joystick_pos;
-}
-
-void VirtualJoystick::set_joystick_size(float p_size) {
-	if (joystick_size == p_size) {
-		return;
-	}
-	joystick_size = p_size;
-	_reset();
-}
-
-float VirtualJoystick::get_joystick_size() const {
-	return joystick_size;
-}
-
-void VirtualJoystick::set_tip_size(float p_size) {
-	if (tip_size == p_size) {
-		return;
-	}
-	tip_size = p_size;
-	_reset();
-}
-
-float VirtualJoystick::get_tip_size() const {
-	return tip_size;
-}
-
-void VirtualJoystick::set_deadzone_ratio(float p_ratio) {
-	deadzone_ratio = p_ratio;
-	if (Engine::get_singleton()->is_editor_hint()) {
-		queue_redraw();
-	}
-}
-
-float VirtualJoystick::get_deadzone_ratio() const {
-	return deadzone_ratio;
-}
-
-void VirtualJoystick::set_clampzone_ratio(float p_ratio) {
-	clampzone_ratio = p_ratio;
-	if (Engine::get_singleton()->is_editor_hint()) {
-		queue_redraw();
-	}
-}
-
-float VirtualJoystick::get_clampzone_ratio() const {
-	return clampzone_ratio;
-}
-
-void VirtualJoystick::set_initial_offset_ratio(const Vector2 &p_ratio) {
-	if (initial_offset_ratio == p_ratio) {
-		return;
-	}
-	initial_offset_ratio = p_ratio;
-	_reset();
-}
-
-Vector2 VirtualJoystick::get_initial_offset_ratio() const {
-	return initial_offset_ratio;
-}
-
-void VirtualJoystick::set_joystick_mode(JoystickMode p_mode) {
-	joystick_mode = p_mode;
-}
-
-VirtualJoystick::JoystickMode VirtualJoystick::get_joystick_mode() const {
-	return joystick_mode;
-}
-
-void VirtualJoystick::set_action_left(const StringName &p_action) {
-	action_left = p_action;
-}
-
-StringName VirtualJoystick::get_action_left() const {
-	return action_left;
-}
-
-void VirtualJoystick::set_action_right(const StringName &p_action) {
-	action_right = p_action;
-}
-
-StringName VirtualJoystick::get_action_right() const {
-	return action_right;
-}
-
-void VirtualJoystick::set_action_up(const StringName &p_action) {
-	action_up = p_action;
-}
-
-StringName VirtualJoystick::get_action_up() const {
-	return action_up;
-}
-
-void VirtualJoystick::set_action_down(const StringName &p_action) {
-	action_down = p_action;
-}
-
-StringName VirtualJoystick::get_action_down() const {
-	return action_down;
-}
-
-void VirtualJoystick::set_visibility_mode(VisibilityMode p_mode) {
-	visibility = p_mode;
-}
-
-VirtualJoystick::VisibilityMode VirtualJoystick::get_visibility_mode() const {
-	return visibility;
-}
diff --git a/engine/scene/gui/virtual_joystick.h b/engine/scene/gui/virtual_joystick.h
deleted file mode 100644
index 1e1bd4b5..00000000
--- a/engine/scene/gui/virtual_joystick.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/**************************************************************************/
-/*  virtual_joystick.h                                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "scene/gui/control.h"
-
-class VirtualJoystick : public Control {
-	GDCLASS(VirtualJoystick, Control);
-
-public:
-	enum JoystickMode {
-		JOYSTICK_FIXED,
-		JOYSTICK_DYNAMIC,
-		JOYSTICK_FOLLOWING,
-	};
-
-	enum VisibilityMode {
-		VISIBILITY_ALWAYS,
-		VISIBILITY_WHEN_TOUCHED,
-	};
-
-private:
-	JoystickMode joystick_mode = JOYSTICK_FIXED;
-	float joystick_size = 100.0f;
-	float tip_size = 50.0f;
-	float deadzone_ratio = 0.0f;
-	float clampzone_ratio = 1.0f;
-	Vector2 initial_offset_ratio = Vector2(0.5, 0.5);
-	StringName action_left = "ui_left";
-	StringName action_right = "ui_right";
-	StringName action_up = "ui_up";
-	StringName action_down = "ui_down";
-	VisibilityMode visibility = VISIBILITY_ALWAYS;
-
-	struct ThemeCache {
-		Ref<StyleBox> normal_joystick;
-		Ref<StyleBox> normal_tip;
-		Ref<StyleBox> pressed_joystick;
-		Ref<StyleBox> pressed_tip;
-	} theme_cache;
-
-	bool is_pressed = false;
-	bool has_input = false;
-	bool has_moved = false;
-	Vector2 raw_input_vector;
-	Vector2 input_vector;
-	bool is_flick_canceled = false;
-	int touch_index = -1;
-
-	Vector2 joystick_pos;
-	Vector2 tip_pos;
-
-	void _update_joystick(const Vector2 &p_pos);
-	void _handle_input_actions();
-	void _reset();
-
-protected:
-	virtual void gui_input(const Ref<InputEvent> &p_event) override;
-	void _notification(int p_what);
-	static void _bind_methods();
-
-public:
-	Vector2 get_joystick_position() const;
-
-	void set_joystick_mode(JoystickMode p_mode);
-	JoystickMode get_joystick_mode() const;
-
-	void set_joystick_size(float p_size);
-	float get_joystick_size() const;
-
-	void set_tip_size(float p_size);
-	float get_tip_size() const;
-
-	void set_deadzone_ratio(float p_ratio);
-	float get_deadzone_ratio() const;
-
-	void set_clampzone_ratio(float p_ratio);
-	float get_clampzone_ratio() const;
-
-	void set_initial_offset_ratio(const Vector2 &p_ratio);
-	Vector2 get_initial_offset_ratio() const;
-
-	void set_action_left(const StringName &p_action);
-	StringName get_action_left() const;
-	void set_action_right(const StringName &p_action);
-	StringName get_action_right() const;
-	void set_action_up(const StringName &p_action);
-	StringName get_action_up() const;
-	void set_action_down(const StringName &p_action);
-	StringName get_action_down() const;
-
-	void set_visibility_mode(VisibilityMode p_mode);
-	VisibilityMode get_visibility_mode() const;
-};
-
-VARIANT_ENUM_CAST(VirtualJoystick::JoystickMode);
-VARIANT_ENUM_CAST(VirtualJoystick::VisibilityMode);
diff --git a/engine/scene/main/canvas_item.compat.inc b/engine/scene/main/canvas_item.compat.inc
index 399dfe25..040a3fde 100644
--- a/engine/scene/main/canvas_item.compat.inc
+++ b/engine/scene/main/canvas_item.compat.inc
@@ -30,11 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "canvas_item.h"
-
-#include "core/object/class_db.h"
-#include "scene/resources/font.h"
-
 void CanvasItem::_draw_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	draw_string(p_font, p_pos, p_text, p_alignment, p_width, p_font_size, p_modulate, p_jst_flags, p_direction, p_orientation, 0.0);
 }
@@ -80,12 +75,12 @@ void CanvasItem::_draw_multiline_colors_bind_compat_84523(const Vector<Point2> &
 }
 
 void CanvasItem::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("draw_string", "font", "pos", "text", "alignment", "width", "font_size", "modulate", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_string_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
-	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_string", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "modulate", "brk_flags", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_multiline_string_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
-	ClassDB::bind_compatibility_method(D_METHOD("draw_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "size", "modulate", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_string_outline_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
-	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "size", "modulate", "brk_flags", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_multiline_string_outline_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
-	ClassDB::bind_compatibility_method(D_METHOD("draw_char", "font", "pos", "char", "font_size", "modulate"), &CanvasItem::_draw_char_bind_compat_104872, DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)));
-	ClassDB::bind_compatibility_method(D_METHOD("draw_char_outline", "font", "pos", "char", "font_size", "size", "modulate"), &CanvasItem::_draw_char_outline_bind_compat_104872, DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_string", "font", "pos", "text", "alignment", "width", "font_size", "modulate", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_string_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_string", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "modulate", "brk_flags", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_multiline_string_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "size", "modulate", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_string_outline_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "size", "modulate", "brk_flags", "justification_flags", "direction", "orientation"), &CanvasItem::_draw_multiline_string_outline_bind_compat_104872, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_char", "font", "pos", "char", "font_size", "modulate"), &CanvasItem::_draw_char_bind_compat_104872, DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)));
+	ClassDB::bind_compatibility_method(D_METHOD("draw_char_outline", "font", "pos", "char", "font_size", "size", "modulate"), &CanvasItem::_draw_char_outline_bind_compat_104872, DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)));
 	ClassDB::bind_compatibility_method(D_METHOD("draw_circle", "position", "radius", "color"), &CanvasItem::_draw_circle_bind_compat_84472);
 	ClassDB::bind_compatibility_method(D_METHOD("draw_rect", "rect", "color", "filled", "width"), &CanvasItem::_draw_rect_bind_compat_84523, DEFVAL(true), DEFVAL(-1.0));
 	ClassDB::bind_compatibility_method(D_METHOD("draw_dashed_line", "from", "to", "color", "width", "dash", "aligned"), &CanvasItem::_draw_dashed_line_bind_compat_84523, DEFVAL(-1.0), DEFVAL(2.0), DEFVAL(true));
@@ -93,4 +88,4 @@ void CanvasItem::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_colors", "points", "colors", "width"), &CanvasItem::_draw_multiline_colors_bind_compat_84523, DEFVAL(-1.0));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/main/canvas_item.cpp b/engine/scene/main/canvas_item.cpp
index 849772e2..ffbe9dc2 100644
--- a/engine/scene/main/canvas_item.cpp
+++ b/engine/scene/main/canvas_item.cpp
@@ -31,23 +31,14 @@
 #include "canvas_item.h"
 #include "canvas_item.compat.inc"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/2d/canvas_group.h"
 #include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/font.h"
-#include "scene/resources/material.h"
-#include "scene/resources/mesh.h"
 #include "scene/resources/multimesh.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/world_2d.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #define ERR_DRAW_GUARD \
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside this node's `_draw()`, functions connected to its `draw` signal, or when it receives NOTIFICATION_DRAW.")
@@ -309,7 +300,7 @@ void CanvasItem::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, !visible);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !visible);
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
@@ -674,8 +665,8 @@ void CanvasItem::item_rect_changed(bool p_size_changed) {
 
 void CanvasItem::set_z_index(int p_z) {
 	ERR_THREAD_GUARD;
-	ERR_FAIL_COND(p_z < RSE::CANVAS_ITEM_Z_MIN);
-	ERR_FAIL_COND(p_z > RSE::CANVAS_ITEM_Z_MAX);
+	ERR_FAIL_COND(p_z < RS::CANVAS_ITEM_Z_MIN);
+	ERR_FAIL_COND(p_z > RS::CANVAS_ITEM_Z_MAX);
 	z_index = p_z;
 	RS::get_singleton()->canvas_item_set_z_index(canvas_item, z_index);
 	update_configuration_warnings();
@@ -1338,9 +1329,6 @@ PackedStringArray CanvasItem::get_configuration_warnings() const {
 }
 
 void CanvasItem::_bind_methods() {
-	// Constant redefined in CanvasItem to allow forward-declaring Font.
-	static_assert(CanvasItem::DEFAULT_FONT_SIZE == Font::DEFAULT_FONT_SIZE);
-
 	ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self);
 
 #ifdef TOOLS_ENABLED
@@ -1417,12 +1405,12 @@ void CanvasItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("draw_primitive", "points", "colors", "uvs", "texture"), &CanvasItem::draw_primitive, DEFVAL(Ref<Texture2D>()));
 	ClassDB::bind_method(D_METHOD("draw_polygon", "points", "colors", "uvs", "texture"), &CanvasItem::draw_polygon, DEFVAL(PackedVector2Array()), DEFVAL(Ref<Texture2D>()));
 	ClassDB::bind_method(D_METHOD("draw_colored_polygon", "points", "color", "uvs", "texture"), &CanvasItem::draw_colored_polygon, DEFVAL(PackedVector2Array()), DEFVAL(Ref<Texture2D>()));
-	ClassDB::bind_method(D_METHOD("draw_string", "font", "pos", "text", "alignment", "width", "font_size", "modulate", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_string, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
-	ClassDB::bind_method(D_METHOD("draw_multiline_string", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "modulate", "brk_flags", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_multiline_string, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
-	ClassDB::bind_method(D_METHOD("draw_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "size", "modulate", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_string_outline, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
-	ClassDB::bind_method(D_METHOD("draw_multiline_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "size", "modulate", "brk_flags", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_multiline_string_outline, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
-	ClassDB::bind_method(D_METHOD("draw_char", "font", "pos", "char", "font_size", "modulate", "oversampling"), &CanvasItem::draw_char, DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(0.0));
-	ClassDB::bind_method(D_METHOD("draw_char_outline", "font", "pos", "char", "font_size", "size", "modulate", "oversampling"), &CanvasItem::draw_char_outline, DEFVAL(DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_string", "font", "pos", "text", "alignment", "width", "font_size", "modulate", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_string, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_multiline_string", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "modulate", "brk_flags", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_multiline_string, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "size", "modulate", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_string_outline, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_multiline_string_outline", "font", "pos", "text", "alignment", "width", "font_size", "max_lines", "size", "modulate", "brk_flags", "justification_flags", "direction", "orientation", "oversampling"), &CanvasItem::draw_multiline_string_outline, DEFVAL(HORIZONTAL_ALIGNMENT_LEFT), DEFVAL(-1), DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND), DEFVAL(TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND), DEFVAL(TextServer::DIRECTION_AUTO), DEFVAL(TextServer::ORIENTATION_HORIZONTAL), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_char", "font", "pos", "char", "font_size", "modulate", "oversampling"), &CanvasItem::draw_char, DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("draw_char_outline", "font", "pos", "char", "font_size", "size", "modulate", "oversampling"), &CanvasItem::draw_char_outline, DEFVAL(Font::DEFAULT_FONT_SIZE), DEFVAL(-1), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(0.0));
 	ClassDB::bind_method(D_METHOD("draw_mesh", "mesh", "texture", "transform", "modulate"), &CanvasItem::draw_mesh, DEFVAL(Transform2D()), DEFVAL(Color(1, 1, 1, 1)));
 	ClassDB::bind_method(D_METHOD("draw_multimesh", "multimesh", "texture"), &CanvasItem::draw_multimesh);
 	ClassDB::bind_method(D_METHOD("draw_set_transform", "position", "rotation", "scale"), &CanvasItem::draw_set_transform, DEFVAL(0.0), DEFVAL(Size2(1.0, 1.0)));
@@ -1490,7 +1478,7 @@ void CanvasItem::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_layer", PROPERTY_HINT_LAYERS_2D_RENDER), "set_visibility_layer", "get_visibility_layer");
 
 	ADD_GROUP("Ordering", "");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "z_index", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_ITEM_Z_MIN) + "," + itos(RSE::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_index", "get_z_index");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "z_index", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_index", "get_z_index");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "z_as_relative"), "set_z_as_relative", "is_z_relative");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "y_sort_enabled"), "set_y_sort_enabled", "is_y_sort_enabled");
 
@@ -1644,14 +1632,14 @@ void CanvasItem::_refresh_texture_filter_cache() const {
 		if (parent_item) {
 			texture_filter_cache = parent_item->texture_filter_cache;
 		} else {
-			texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
+			texture_filter_cache = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
 		}
 	} else {
-		texture_filter_cache = RSE::CanvasItemTextureFilter(texture_filter);
+		texture_filter_cache = RS::CanvasItemTextureFilter(texture_filter);
 	}
 }
 
-void CanvasItem::_update_self_texture_filter(RSE::CanvasItemTextureFilter p_texture_filter) {
+void CanvasItem::_update_self_texture_filter(RS::CanvasItemTextureFilter p_texture_filter) {
 	RS::get_singleton()->canvas_item_set_default_texture_filter(get_canvas_item(), p_texture_filter);
 	queue_redraw();
 }
@@ -1664,17 +1652,11 @@ void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
 	_update_self_texture_filter(texture_filter_cache);
 
 	if (p_propagate) {
-		for (Node *c : iterate_children()) {
-			CanvasItem *child_ci = Object::cast_to<CanvasItem>(c);
-			if (child_ci) {
-				if (child_ci->texture_filter == CanvasItem::TEXTURE_FILTER_PARENT_NODE) {
-					child_ci->_update_texture_filter_changed(true);
-				}
-				continue;
-			}
-			Viewport *child_vp = Object::cast_to<Viewport>(c);
-			if (child_vp && child_vp->get_default_canvas_item_texture_filter() == Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE) {
-				child_vp->_update_texture_filter_changed(true);
+		for (uint32_t n = 0; n < data.canvas_item_children.size(); n++) {
+			CanvasItem *ci = data.canvas_item_children[n];
+
+			if (!ci->top_level && ci->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
+				ci->_update_texture_filter_changed(true);
 			}
 		}
 	}
@@ -1706,14 +1688,14 @@ void CanvasItem::_refresh_texture_repeat_cache() const {
 		if (parent_item) {
 			texture_repeat_cache = parent_item->texture_repeat_cache;
 		} else {
-			texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
+			texture_repeat_cache = RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
 		}
 	} else {
-		texture_repeat_cache = RSE::CanvasItemTextureRepeat(texture_repeat);
+		texture_repeat_cache = RS::CanvasItemTextureRepeat(texture_repeat);
 	}
 }
 
-void CanvasItem::_update_self_texture_repeat(RSE::CanvasItemTextureRepeat p_texture_repeat) {
+void CanvasItem::_update_self_texture_repeat(RS::CanvasItemTextureRepeat p_texture_repeat) {
 	RS::get_singleton()->canvas_item_set_default_texture_repeat(get_canvas_item(), p_texture_repeat);
 	queue_redraw();
 }
@@ -1726,17 +1708,10 @@ void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
 	_update_self_texture_repeat(texture_repeat_cache);
 
 	if (p_propagate) {
-		for (Node *c : iterate_children()) {
-			CanvasItem *child_ci = Object::cast_to<CanvasItem>(c);
-			if (child_ci) {
-				if (child_ci->texture_repeat == CanvasItem::TEXTURE_REPEAT_PARENT_NODE) {
-					child_ci->_update_texture_repeat_changed(true);
-				}
-				continue;
-			}
-			Viewport *child_vp = Object::cast_to<Viewport>(c);
-			if (child_vp && child_vp->get_default_canvas_item_texture_repeat() == Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE) {
-				child_vp->_update_texture_repeat_changed(true);
+		for (uint32_t n = 0; n < data.canvas_item_children.size(); n++) {
+			CanvasItem *ci = data.canvas_item_children[n];
+			if (!ci->top_level && ci->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
+				ci->_update_texture_repeat_changed(true);
 			}
 		}
 	}
@@ -1769,7 +1744,7 @@ void CanvasItem::set_clip_children_mode(ClipChildrenMode p_clip_mode) {
 		return;
 	}
 
-	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RSE::CanvasGroupMode(clip_children_mode));
+	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CanvasGroupMode(clip_children_mode));
 }
 
 CanvasItem::ClipChildrenMode CanvasItem::get_clip_children_mode() const {
@@ -1816,7 +1791,7 @@ void CanvasTexture::set_diffuse_texture(const Ref<Texture2D> &p_diffuse) {
 	diffuse_texture = p_diffuse;
 
 	RID tex_rid = diffuse_texture.is_valid() ? diffuse_texture->get_rid() : RID();
-	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RSE::CANVAS_TEXTURE_CHANNEL_DIFFUSE, tex_rid);
+	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RS::CANVAS_TEXTURE_CHANNEL_DIFFUSE, tex_rid);
 	emit_changed();
 }
 Ref<Texture2D> CanvasTexture::get_diffuse_texture() const {
@@ -1830,7 +1805,7 @@ void CanvasTexture::set_normal_texture(const Ref<Texture2D> &p_normal) {
 	}
 	normal_texture = p_normal;
 	RID tex_rid = normal_texture.is_valid() ? normal_texture->get_rid() : RID();
-	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RSE::CANVAS_TEXTURE_CHANNEL_NORMAL, tex_rid);
+	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RS::CANVAS_TEXTURE_CHANNEL_NORMAL, tex_rid);
 	emit_changed();
 }
 Ref<Texture2D> CanvasTexture::get_normal_texture() const {
@@ -1844,7 +1819,7 @@ void CanvasTexture::set_specular_texture(const Ref<Texture2D> &p_specular) {
 	}
 	specular_texture = p_specular;
 	RID tex_rid = specular_texture.is_valid() ? specular_texture->get_rid() : RID();
-	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RSE::CANVAS_TEXTURE_CHANNEL_SPECULAR, tex_rid);
+	RS::get_singleton()->canvas_texture_set_channel(canvas_texture, RS::CANVAS_TEXTURE_CHANNEL_SPECULAR, tex_rid);
 	emit_changed();
 }
 
@@ -1883,7 +1858,7 @@ void CanvasTexture::set_texture_filter(CanvasItem::TextureFilter p_filter) {
 		return;
 	}
 	texture_filter = p_filter;
-	RS::get_singleton()->canvas_texture_set_texture_filter(canvas_texture, RSE::CanvasItemTextureFilter(p_filter));
+	RS::get_singleton()->canvas_texture_set_texture_filter(canvas_texture, RS::CanvasItemTextureFilter(p_filter));
 	emit_changed();
 }
 CanvasItem::TextureFilter CanvasTexture::get_texture_filter() const {
@@ -1895,7 +1870,7 @@ void CanvasTexture::set_texture_repeat(CanvasItem::TextureRepeat p_repeat) {
 		return;
 	}
 	texture_repeat = p_repeat;
-	RS::get_singleton()->canvas_texture_set_texture_repeat(canvas_texture, RSE::CanvasItemTextureRepeat(p_repeat));
+	RS::get_singleton()->canvas_texture_set_texture_repeat(canvas_texture, RS::CanvasItemTextureRepeat(p_repeat));
 	emit_changed();
 }
 CanvasItem::TextureRepeat CanvasTexture::get_texture_repeat() const {
@@ -1968,11 +1943,11 @@ void CanvasTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_texture_repeat"), &CanvasTexture::get_texture_repeat);
 
 	ADD_GROUP("Diffuse", "diffuse_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "diffuse_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_diffuse_texture", "get_diffuse_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "diffuse_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_diffuse_texture", "get_diffuse_texture");
 	ADD_GROUP("NormalMap", "normal_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_normal_texture", "get_normal_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_normal_texture", "get_normal_texture");
 	ADD_GROUP("Specular", "specular_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "specular_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_specular_texture", "get_specular_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "specular_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_specular_texture", "get_specular_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "specular_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_specular_color", "get_specular_color");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "specular_shininess", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_specular_shininess", "get_specular_shininess");
 	ADD_GROUP("Texture", "texture_");
diff --git a/engine/scene/main/canvas_item.h b/engine/scene/main/canvas_item.h
index 9dd741a0..3e838aa2 100644
--- a/engine/scene/main/canvas_item.h
+++ b/engine/scene/main/canvas_item.h
@@ -31,16 +31,13 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/text/text_server.h"
+#include "scene/resources/font.h"
+#include "servers/rendering/rendering_server.h"
 
 class CanvasLayer;
-class Font;
-class Material;
-class Mesh;
 class MultiMesh;
 class StyleBox;
+class SubViewport;
 class Window;
 class World2D;
 
@@ -79,7 +76,8 @@ public:
 	};
 
 private:
-	mutable SelfList<Node> xform_change;
+	mutable SelfList<Node>
+			xform_change;
 
 	RID canvas_item;
 	StringName canvas_group;
@@ -104,8 +102,6 @@ private:
 	bool z_relative = true;
 	bool y_sort_enabled = false;
 
-	static constexpr int DEFAULT_FONT_SIZE = 16; // Keep synced with font.h.
-
 	Window *window = nullptr;
 	bool visible = true;
 	bool parent_visible_in_tree = false;
@@ -122,8 +118,8 @@ private:
 
 	ClipChildrenMode clip_children_mode = CLIP_CHILDREN_DISABLED;
 
-	mutable RSE::CanvasItemTextureFilter texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-	mutable RSE::CanvasItemTextureRepeat texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
+	mutable RS::CanvasItemTextureFilter texture_filter_cache = RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
+	mutable RS::CanvasItemTextureRepeat texture_repeat_cache = RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
 	TextureFilter texture_filter = TEXTURE_FILTER_PARENT_NODE;
 	TextureRepeat texture_repeat = TEXTURE_REPEAT_PARENT_NODE;
 
@@ -171,8 +167,8 @@ protected:
 
 	virtual void _physics_interpolated_changed() override;
 
-	virtual void _update_self_texture_repeat(RSE::CanvasItemTextureRepeat p_texture_repeat);
-	virtual void _update_self_texture_filter(RSE::CanvasItemTextureFilter p_texture_filter);
+	virtual void _update_self_texture_repeat(RS::CanvasItemTextureRepeat p_texture_repeat);
+	virtual void _update_self_texture_filter(RS::CanvasItemTextureFilter p_texture_filter);
 
 	_FORCE_INLINE_ void _notify_transform() {
 		_notify_transform(this);
@@ -189,12 +185,12 @@ protected:
 	static void _bind_methods();
 
 #ifndef DISABLE_DEPRECATED
-	void _draw_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
-	void _draw_multiline_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
-	void _draw_string_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
-	void _draw_multiline_string_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
-	void _draw_char_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, int p_font_size = DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0)) const;
-	void _draw_char_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, int p_font_size = DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0)) const;
+	void _draw_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
+	void _draw_multiline_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
+	void _draw_string_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
+	void _draw_multiline_string_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL) const;
+	void _draw_char_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0)) const;
+	void _draw_char_outline_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0)) const;
 	void _draw_circle_bind_compat_84472(const Point2 &p_pos, real_t p_radius, const Color &p_color);
 	void _draw_rect_bind_compat_84523(const Rect2 &p_rect, const Color &p_color, bool p_filled, real_t p_width);
 	void _draw_dashed_line_bind_compat_84523(const Point2 &p_from, const Point2 &p_to, const Color &p_color, real_t p_width, real_t p_dash, bool p_aligned);
@@ -211,7 +207,7 @@ protected:
 
 public:
 	enum {
-		NOTIFICATION_TRANSFORM_CHANGED = 2000, // Keep in sync with SceneTree.
+		NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED, //unique
 		NOTIFICATION_DRAW = 30,
 		NOTIFICATION_VISIBILITY_CHANGED = 31,
 		NOTIFICATION_ENTER_CANVAS = 32,
@@ -333,14 +329,14 @@ public:
 	void draw_mesh(RequiredParam<Mesh> rp_mesh, const Ref<Texture2D> &p_texture, const Transform2D &p_transform = Transform2D(), const Color &p_modulate = Color(1, 1, 1));
 	void draw_multimesh(RequiredParam<MultiMesh> rp_multimesh, const Ref<Texture2D> &p_texture);
 
-	void draw_string(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
-	void draw_multiline_string(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
+	void draw_string(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
+	void draw_multiline_string(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
 
-	void draw_string_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
-	void draw_multiline_string_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
+	void draw_string_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
+	void draw_multiline_string_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField<TextServer::LineBreakFlag> p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField<TextServer::JustificationFlag> p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const;
 
-	void draw_char(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const;
-	void draw_char_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const;
+	void draw_char(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const;
+	void draw_char_outline(RequiredParam<Font> rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const;
 
 	void draw_set_transform(const Point2 &p_offset, real_t p_rot = 0.0, const Size2 &p_scale = Size2(1.0, 1.0));
 	void draw_set_transform_matrix(const Transform2D &p_matrix);
diff --git a/engine/scene/main/canvas_layer.cpp b/engine/scene/main/canvas_layer.cpp
index 98132205..e9d3c162 100644
--- a/engine/scene/main/canvas_layer.cpp
+++ b/engine/scene/main/canvas_layer.cpp
@@ -30,12 +30,9 @@
 
 #include "canvas_layer.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world_2d.h"
-#include "servers/rendering/rendering_server.h"
 
 void CanvasLayer::set_layer(int p_xform) {
 	layer = p_xform;
@@ -340,7 +337,7 @@ void CanvasLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasLayer::get_canvas);
 
 	ADD_GROUP("Layer", "");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_RANGE, itos(RSE::CANVAS_LAYER_MIN) + "," + itos(RSE::CANVAS_LAYER_MAX) + ",1"), "set_layer", "get_layer");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer", "get_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible");
 	ADD_GROUP("Transform", "");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset", PROPERTY_HINT_NONE, "suffix:px"), "set_offset", "get_offset");
@@ -348,7 +345,7 @@ void CanvasLayer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "scale", PROPERTY_HINT_LINK), "set_scale", "get_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "transform", PROPERTY_HINT_NONE, "suffix:px"), "set_transform", "get_transform");
 	ADD_GROUP("", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "custom_viewport", PROPERTY_HINT_RESOURCE_TYPE, Viewport::get_class_static(), PROPERTY_USAGE_NONE), "set_custom_viewport", "get_custom_viewport");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "custom_viewport", PROPERTY_HINT_RESOURCE_TYPE, "Viewport", PROPERTY_USAGE_NONE), "set_custom_viewport", "get_custom_viewport");
 	ADD_GROUP("Follow Viewport", "follow_viewport");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "follow_viewport_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_follow_viewport", "is_following_viewport");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "follow_viewport_scale", PROPERTY_HINT_RANGE, "0.001,1000,0.001,or_greater,or_less"), "set_follow_viewport_scale", "get_follow_viewport_scale");
diff --git a/engine/scene/main/canvas_layer.h b/engine/scene/main/canvas_layer.h
index 3a67c2fb..7bd7c54f 100644
--- a/engine/scene/main/canvas_layer.h
+++ b/engine/scene/main/canvas_layer.h
@@ -33,7 +33,6 @@
 #include "scene/main/node.h"
 
 class Viewport;
-
 class CanvasLayer : public Node {
 	GDCLASS(CanvasLayer, Node);
 
diff --git a/engine/scene/main/http_request.cpp b/engine/scene/main/http_request.cpp
index 8b0a0f8a..46dd3321 100644
--- a/engine/scene/main/http_request.cpp
+++ b/engine/scene/main/http_request.cpp
@@ -30,13 +30,7 @@
 
 #include "http_request.h"
 
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/stream_peer_gzip.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "core/os/thread.h"
 #include "scene/main/timer.h"
 
 Error HTTPRequest::_request() {
@@ -205,20 +199,13 @@ void HTTPRequest::cancel_request() {
 		}
 	}
 
-	if (file.is_valid()) {
-		file.unref();
-		if (!download_complete) {
-			DirAccess::remove_absolute(download_to_file);
-		}
-	}
-
+	file.unref();
 	decompressor.unref();
 	client->close();
 	body.clear();
 	got_response = false;
 	response_code = -1;
 	request_sent = false;
-	download_complete = false;
 	requesting = false;
 }
 
@@ -242,22 +229,6 @@ Error HTTPRequest::_get_redirect_headers(Vector<String> *r_headers) {
 	return OK;
 }
 
-bool HTTPRequest::_is_automatic_redirect() const {
-	if (unlikely(method == HTTPClient::METHOD_CONNECT)) {
-		// Never automatically redirect CONNECT requests.
-		return false;
-	} else if (response_code == 301 || response_code == 302 || response_code == 303 || response_code == 305) {
-		// We change unsafe methods to GET for 301, 302, and 303, so these are always redirected.
-		// 305 is deprecated and treated as equivalent to 302.
-		return true;
-	} else if ((response_code == 307 || response_code == 308) && _is_method_safe()) {
-		// We only automatically redirect for safe methods on method-preserving status codes.
-		return true;
-	} else {
-		return false;
-	}
-}
-
 bool HTTPRequest::_handle_response(bool *ret_value) {
 	if (!client->has_response()) {
 		_defer_done(RESULT_NO_RESPONSE, 0, PackedStringArray(), PackedByteArray());
@@ -278,8 +249,8 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
 		response_headers.push_back(E);
 	}
 
-	if (_is_automatic_redirect()) {
-		// Follow redirect.
+	if (response_code == 301 || response_code == 302) {
+		// Handle redirect.
 
 		if (max_redirects >= 0 && redirections >= max_redirects) {
 			_defer_done(RESULT_REDIRECT_LIMIT_REACHED, response_code, response_headers, PackedByteArray());
@@ -509,7 +480,6 @@ bool HTTPRequest::_update_connection() {
 
 			if (body_len >= 0) {
 				if (downloaded.get() == body_len) {
-					download_complete = true;
 					_defer_done(RESULT_SUCCESS, response_code, response_headers, body);
 					return true;
 				}
diff --git a/engine/scene/main/http_request.h b/engine/scene/main/http_request.h
index af44ab8a..ccac9809 100644
--- a/engine/scene/main/http_request.h
+++ b/engine/scene/main/http_request.h
@@ -31,12 +31,12 @@
 #pragma once
 
 #include "core/io/http_client.h"
+#include "core/io/stream_peer_gzip.h"
+#include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
 #include "scene/main/node.h"
 
-class Thread;
 class Timer;
-class StreamPeerGZIP;
 
 class HTTPRequest : public Node {
 	GDCLASS(HTTPRequest, Node);
@@ -62,7 +62,6 @@ public:
 
 private:
 	bool requesting = false;
-	bool download_complete = false;
 
 	String request_string;
 	String url;
@@ -106,7 +105,6 @@ private:
 	bool _is_content_header(const String &p_header) const;
 	bool _is_method_safe() const;
 	Error _get_redirect_headers(Vector<String> *r_headers);
-	bool _is_automatic_redirect() const;
 
 	bool _handle_response(bool *ret_value);
 
diff --git a/engine/scene/main/instance_placeholder.cpp b/engine/scene/main/instance_placeholder.cpp
index 7aff0d78..0a93eaaa 100644
--- a/engine/scene/main/instance_placeholder.cpp
+++ b/engine/scene/main/instance_placeholder.cpp
@@ -31,7 +31,6 @@
 #include "instance_placeholder.h"
 
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "scene/resources/packed_scene.h"
 
 bool InstancePlaceholder::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/engine/scene/main/missing_node.cpp b/engine/scene/main/missing_node.cpp
index 2cf90600..10d426dd 100644
--- a/engine/scene/main/missing_node.cpp
+++ b/engine/scene/main/missing_node.cpp
@@ -30,8 +30,6 @@
 
 #include "missing_node.h"
 
-#include "core/object/class_db.h"
-
 bool MissingNode::_set(const StringName &p_name, const Variant &p_value) {
 	if (is_recording_properties()) {
 		properties.insert(p_name, p_value);
diff --git a/engine/scene/main/multiplayer_api.cpp b/engine/scene/main/multiplayer_api.cpp
index 3e9a3e76..d872dd36 100644
--- a/engine/scene/main/multiplayer_api.cpp
+++ b/engine/scene/main/multiplayer_api.cpp
@@ -31,8 +31,6 @@
 #include "multiplayer_api.h"
 
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
-
 StringName MultiplayerAPI::default_interface;
 
 void MultiplayerAPI::set_default_interface(const StringName &p_interface) {
@@ -299,7 +297,7 @@ void MultiplayerAPI::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_peers"), &MultiplayerAPI::get_peer_ids);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multiplayer_peer", PROPERTY_HINT_RESOURCE_TYPE, MultiplayerPeer::get_class_static(), PROPERTY_USAGE_NONE), "set_multiplayer_peer", "get_multiplayer_peer");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multiplayer_peer", PROPERTY_HINT_RESOURCE_TYPE, "MultiplayerPeer", PROPERTY_USAGE_NONE), "set_multiplayer_peer", "get_multiplayer_peer");
 
 	ClassDB::bind_static_method("MultiplayerAPI", D_METHOD("set_default_interface", "interface_name"), &MultiplayerAPI::set_default_interface);
 	ClassDB::bind_static_method("MultiplayerAPI", D_METHOD("get_default_interface"), &MultiplayerAPI::get_default_interface);
diff --git a/engine/scene/main/multiplayer_peer.cpp b/engine/scene/main/multiplayer_peer.cpp
index b01f390c..407353ff 100644
--- a/engine/scene/main/multiplayer_peer.cpp
+++ b/engine/scene/main/multiplayer_peer.cpp
@@ -30,7 +30,6 @@
 
 #include "multiplayer_peer.h"
 
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 uint32_t MultiplayerPeer::generate_unique_id() const {
diff --git a/engine/scene/main/multiplayer_peer.h b/engine/scene/main/multiplayer_peer.h
index 96f94bb7..90921b7a 100644
--- a/engine/scene/main/multiplayer_peer.h
+++ b/engine/scene/main/multiplayer_peer.h
@@ -30,9 +30,10 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
 #include "core/io/packet_peer.h"
-#include "core/object/gdvirtual.gen.h"
+
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 
 class MultiplayerPeer : public PacketPeer {
diff --git a/engine/scene/main/node.compat.inc b/engine/scene/main/node.compat.inc
index b4a73db2..27685d22 100644
--- a/engine/scene/main/node.compat.inc
+++ b/engine/scene/main/node.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "node.h"
-
-#include "core/object/class_db.h"
-
 void Node::_set_name_bind_compat_76560(const String &p_name) {
 	set_name(p_name);
 }
@@ -47,4 +43,4 @@ void Node::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_rpc_config"), &Node::_get_rpc_config_bind_compat_106848);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/main/node.cpp b/engine/scene/main/node.cpp
index 868d8815..d723df77 100644
--- a/engine/scene/main/node.cpp
+++ b/engine/scene/main/node.cpp
@@ -38,26 +38,18 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Shader);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, OS);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, Engine);
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/io/resource.h"
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/string/print_string.h"
+#include "instance_placeholder.h"
 #include "scene/animation/tween.h"
-#include "scene/main/instance_placeholder.h"
+#include "scene/debugger/scene_debugger.h"
 #include "scene/main/multiplayer_api.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/viewport.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/display/accessibility_server.h"
-
-#ifdef DEBUG_ENABLED
-#include "scene/debugger/scene_debugger.h"
-#endif
+#include "viewport.h"
 
 #ifdef DEBUG_ENABLED
 SafeNumeric<uint64_t> Node::total_node_count{ 0 };
@@ -69,7 +61,7 @@ void Node::_notification(int p_notification) {
 	switch (p_notification) {
 		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
 			if (data.accessibility_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(data.accessibility_element);
+				DisplayServer::get_singleton()->accessibility_free_element(data.accessibility_element);
 				data.accessibility_element = RID();
 			}
 		} break;
@@ -78,7 +70,7 @@ void Node::_notification(int p_notification) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_name(ae, get_name());
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_name());
 
 			// Node children.
 			if (!accessibility_override_tree_hierarchy()) {
@@ -91,7 +83,7 @@ void Node::_notification(int p_notification) {
 					if (child_node->is_part_of_edited_scene()) {
 						continue;
 					}
-					AccessibilityServer::get_singleton()->update_add_child(ae, child_node->get_accessibility_element());
+					DisplayServer::get_singleton()->accessibility_update_add_child(ae, child_node->get_accessibility_element());
 				}
 			}
 		} break;
@@ -197,7 +189,7 @@ void Node::_notification(int p_notification) {
 
 			if (data.tree->is_accessibility_supported() && !is_part_of_edited_scene()) {
 				if (data.accessibility_element.is_valid()) {
-					AccessibilityServer::get_singleton()->free_element(data.accessibility_element);
+					DisplayServer::get_singleton()->accessibility_free_element(data.accessibility_element);
 					data.accessibility_element = RID();
 				}
 				data.tree->_accessibility_notify_change(this, true);
@@ -907,7 +899,8 @@ bool Node::can_process_notification(int p_what) const {
 }
 
 bool Node::can_process() const {
-	return is_inside_tree() && !data.tree->is_suspended() && _can_process(data.tree->is_paused());
+	ERR_FAIL_COND_V(!is_inside_tree(), false);
+	return !data.tree->is_suspended() && _can_process(data.tree->is_paused());
 }
 
 bool Node::_can_process(bool p_paused) const {
@@ -971,10 +964,6 @@ void Node::set_physics_interpolation_mode(PhysicsInterpolationMode p_mode) {
 	}
 }
 
-bool Node::is_physics_interpolated_and_enabled() const {
-	return SceneTree::is_fti_enabled() && is_physics_interpolated();
-}
-
 void Node::reset_physics_interpolation() {
 	if (SceneTree::is_fti_enabled() && is_inside_tree()) {
 		propagate_notification(NOTIFICATION_RESET_PHYSICS_INTERPOLATION);
@@ -1107,6 +1096,10 @@ void Node::_remove_tree_from_process_thread_group() {
 }
 
 void Node::_add_tree_to_process_thread_group(Node *p_owner) {
+	if (_is_any_processing()) {
+		_add_to_process_thread_group();
+	}
+
 	data.process_thread_group_owner = p_owner;
 	if (p_owner != nullptr) {
 		data.process_group = p_owner->data.process_group;
@@ -1114,16 +1107,12 @@ void Node::_add_tree_to_process_thread_group(Node *p_owner) {
 		data.process_group = &data.tree->default_process_group;
 	}
 
-	if (_is_any_processing()) {
-		_add_to_process_thread_group();
-	}
-
 	for (KeyValue<StringName, Node *> &K : data.children) {
 		if (K.value->data.process_thread_group != PROCESS_THREAD_GROUP_INHERIT) {
 			continue;
 		}
 
-		K.value->_add_tree_to_process_thread_group(p_owner);
+		K.value->_add_to_process_thread_group();
 	}
 }
 bool Node::is_processing_internal() const {
@@ -1477,7 +1466,7 @@ void Node::set_name(const StringName &p_name) {
 }
 
 // Returns a clear description of this node depending on what is available. Useful for error messages.
-String Node::get_description(bool p_show_not_in_tree) const {
+String Node::get_description() const {
 	String description;
 	if (is_inside_tree()) {
 		description = String(get_path());
@@ -1486,9 +1475,6 @@ String Node::get_description(bool p_show_not_in_tree) const {
 		if (description.is_empty()) {
 			description = get_class();
 		}
-		if (p_show_not_in_tree) {
-			description += " (not inside tree)";
-		}
 	}
 	return description;
 }
@@ -2365,7 +2351,7 @@ NodePath Node::get_path_to(RequiredParam<const Node> rp_node, bool p_use_unique_
 		common_parent = common_parent->data.parent;
 	}
 
-	ERR_FAIL_NULL_V_MSG(common_parent, NodePath(), vformat("No path can be resolved between the nodes %s and %s as they share no common ancestor.", get_description(true), p_node->get_description(true)));
+	ERR_FAIL_NULL_V(common_parent, NodePath()); //nodes not in the same tree
 
 	visited.clear();
 
@@ -2576,6 +2562,37 @@ String Node::get_tree_string() {
 	return _get_tree_string(this);
 }
 
+void Node::_propagate_reverse_notification(int p_notification) {
+	data.blocked++;
+
+	for (HashMap<StringName, Node *>::Iterator I = data.children.last(); I; --I) {
+		I->value->_propagate_reverse_notification(p_notification);
+	}
+
+	notification(p_notification, true);
+	data.blocked--;
+}
+
+void Node::_propagate_deferred_notification(int p_notification, bool p_reverse) {
+	ERR_FAIL_COND(!is_inside_tree());
+
+	data.blocked++;
+
+	if (!p_reverse) {
+		MessageQueue::get_singleton()->push_notification(this, p_notification);
+	}
+
+	for (KeyValue<StringName, Node *> &K : data.children) {
+		K.value->_propagate_deferred_notification(p_notification, p_reverse);
+	}
+
+	if (p_reverse) {
+		MessageQueue::get_singleton()->push_notification(this, p_notification);
+	}
+
+	data.blocked--;
+}
+
 void Node::propagate_notification(int p_notification) {
 	ERR_THREAD_GUARD
 	data.blocked++;
@@ -3207,7 +3224,7 @@ void Node::replace_by(RequiredParam<Node> rp_node, bool p_keep_groups) {
 	EXTRACT_PARAM_OR_FAIL(p_node, rp_node);
 	ERR_FAIL_COND(p_node->data.parent);
 
-	List<Node *> owned(data.owned);
+	List<Node *> owned = data.owned;
 	List<Node *> owned_by_owner;
 	Node *owner = (data.owner == this) ? p_node : data.owner;
 
@@ -3495,7 +3512,7 @@ void Node::get_argument_options(const StringName &p_function, int p_idx, List<St
 	if (p_idx == 0 && (pf == "has_node" || pf == "get_node" || pf == "get_node_or_null")) {
 		_add_nodes_to_options(this, this, r_options);
 	} else if (p_idx == 0 && (pf == "add_to_group" || pf == "remove_from_group" || pf == "is_in_group")) {
-		HashMap<StringName, String> global_groups(ProjectSettings::get_singleton()->get_global_groups_list());
+		HashMap<StringName, String> global_groups = ProjectSettings::get_singleton()->get_global_groups_list();
 		for (const KeyValue<StringName, String> &E : global_groups) {
 			r_options->push_back(E.key.operator String().quote());
 		}
@@ -3607,7 +3624,7 @@ void Node::_call_unhandled_key_input(const Ref<InputEvent> &p_event) {
 
 void Node::_validate_property(PropertyInfo &p_property) const {
 	if ((p_property.name == "process_thread_group_order" || p_property.name == "process_thread_messages") && data.process_thread_group == PROCESS_THREAD_GROUP_INHERIT) {
-		p_property.usage = PROPERTY_USAGE_NONE;
+		p_property.usage = 0;
 	}
 }
 
@@ -3741,8 +3758,8 @@ RID Node::get_accessibility_element() const {
 	}
 	if (unlikely(data.accessibility_element.is_null())) {
 		Window *w = get_non_popup_window();
-		if (w && w->get_window_id() != DisplayServerEnums::INVALID_WINDOW_ID && get_window()->is_visible()) {
-			data.accessibility_element = AccessibilityServer::get_singleton()->create_element(w->get_window_id(), AccessibilityServerEnums::ROLE_CONTAINER);
+		if (w && w->get_window_id() != DisplayServer::INVALID_WINDOW_ID && get_window()->is_visible()) {
+			data.accessibility_element = DisplayServer::get_singleton()->accessibility_create_element(w->get_window_id(), DisplayServer::ROLE_CONTAINER);
 		}
 	}
 	return data.accessibility_element;
@@ -3969,7 +3986,6 @@ void Node::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_VP_MOUSE_ENTER);
 	BIND_CONSTANT(NOTIFICATION_VP_MOUSE_EXIT);
 	BIND_CONSTANT(NOTIFICATION_WM_POSITION_CHANGED);
-	BIND_CONSTANT(NOTIFICATION_WM_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
@@ -3980,8 +3996,6 @@ void Node::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_APPLICATION_FOCUS_IN);
 	BIND_CONSTANT(NOTIFICATION_APPLICATION_FOCUS_OUT);
 	BIND_CONSTANT(NOTIFICATION_TEXT_SERVER_CHANGED);
-	BIND_CONSTANT(NOTIFICATION_APPLICATION_PIP_MODE_ENTERED);
-	BIND_CONSTANT(NOTIFICATION_APPLICATION_PIP_MODE_EXITED);
 
 	BIND_CONSTANT(NOTIFICATION_ACCESSIBILITY_UPDATE);
 	BIND_CONSTANT(NOTIFICATION_ACCESSIBILITY_INVALIDATE);
@@ -4035,8 +4049,8 @@ void Node::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_name", "get_name");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "unique_name_in_owner", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_unique_name_in_owner", "is_unique_name_in_owner");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "scene_file_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_scene_file_path", "get_scene_file_path");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "owner", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static(), PROPERTY_USAGE_NONE), "set_owner", "get_owner");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multiplayer", PROPERTY_HINT_RESOURCE_TYPE, MultiplayerAPI::get_class_static(), PROPERTY_USAGE_NONE), "", "get_multiplayer");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "owner", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_owner", "get_owner");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multiplayer", PROPERTY_HINT_RESOURCE_TYPE, "MultiplayerAPI", PROPERTY_USAGE_NONE), "", "get_multiplayer");
 
 	ADD_GROUP("Process", "process_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Inherit,Pausable,When Paused,Always,Disabled"), "set_process_mode", "get_process_mode");
diff --git a/engine/scene/main/node.h b/engine/scene/main/node.h
index dd7d10dd..26179def 100644
--- a/engine/scene/main/node.h
+++ b/engine/scene/main/node.h
@@ -31,22 +31,18 @@
 #pragma once
 
 #include "core/input/input_event.h"
-#include "core/object/gdvirtual.gen.h"
-#include "core/object/object.h"
-#include "core/object/ref_counted.h"
-#include "core/os/thread_safe.h"
+#include "core/io/resource.h"
+#include "core/string/node_path.h"
 #include "core/templates/iterable.h"
-#include "scene/scene_string_names.h" // IWYU pragma: export. Make available to all Nodes.
+#include "core/variant/typed_array.h"
+#include "scene/main/scene_tree.h"
+#include "scene/scene_string_names.h"
 
-class MultiplayerAPI;
-class NodePath;
-class Resource;
-class SceneState;
-class SceneTree;
-class Tween;
 class Viewport;
 class Window;
-struct SceneTreeGroup;
+class SceneState;
+class Tween;
+class PropertyTweener;
 
 SAFE_FLAG_TYPE_PUN_GUARANTEES
 SAFE_NUMERIC_TYPE_PUN_GUARANTEES(uint32_t)
@@ -172,7 +168,7 @@ public:
 private:
 	struct GroupData {
 		bool persistent = false;
-		SceneTreeGroup *group = nullptr;
+		SceneTree::Group *group = nullptr;
 	};
 
 	struct ComparatorByIndex {
@@ -308,6 +304,8 @@ private:
 	void _validate_child_name(Node *p_child, bool p_force_human_readable = false);
 	void _generate_serial_child_name(const Node *p_child, StringName &name) const;
 
+	void _propagate_reverse_notification(int p_notification);
+	void _propagate_deferred_notification(int p_notification, bool p_reverse);
 	void _propagate_enter_tree();
 	void _propagate_ready();
 	void _propagate_exit_tree();
@@ -487,21 +485,17 @@ public:
 		NOTIFICATION_VP_MOUSE_ENTER = 1010,
 		NOTIFICATION_VP_MOUSE_EXIT = 1011,
 		NOTIFICATION_WM_POSITION_CHANGED = 1012,
-		NOTIFICATION_WM_OUTPUT_MAX_LINEAR_VALUE_CHANGED = 1013,
 
-		// Keep these in sync with MainLoop.
-		NOTIFICATION_OS_MEMORY_WARNING = 2009,
-		NOTIFICATION_TRANSLATION_CHANGED = 2010,
-		NOTIFICATION_WM_ABOUT = 2011,
-		NOTIFICATION_CRASH = 2012,
-		NOTIFICATION_OS_IME_UPDATE = 2013,
-		NOTIFICATION_APPLICATION_RESUMED = 2014,
-		NOTIFICATION_APPLICATION_PAUSED = 2015,
-		NOTIFICATION_APPLICATION_FOCUS_IN = 2016,
-		NOTIFICATION_APPLICATION_FOCUS_OUT = 2017,
-		NOTIFICATION_TEXT_SERVER_CHANGED = 2018,
-		NOTIFICATION_APPLICATION_PIP_MODE_ENTERED = 2019,
-		NOTIFICATION_APPLICATION_PIP_MODE_EXITED = 2020,
+		NOTIFICATION_OS_MEMORY_WARNING = MainLoop::NOTIFICATION_OS_MEMORY_WARNING,
+		NOTIFICATION_TRANSLATION_CHANGED = MainLoop::NOTIFICATION_TRANSLATION_CHANGED,
+		NOTIFICATION_WM_ABOUT = MainLoop::NOTIFICATION_WM_ABOUT,
+		NOTIFICATION_CRASH = MainLoop::NOTIFICATION_CRASH,
+		NOTIFICATION_OS_IME_UPDATE = MainLoop::NOTIFICATION_OS_IME_UPDATE,
+		NOTIFICATION_APPLICATION_RESUMED = MainLoop::NOTIFICATION_APPLICATION_RESUMED,
+		NOTIFICATION_APPLICATION_PAUSED = MainLoop::NOTIFICATION_APPLICATION_PAUSED,
+		NOTIFICATION_APPLICATION_FOCUS_IN = MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN,
+		NOTIFICATION_APPLICATION_FOCUS_OUT = MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT,
+		NOTIFICATION_TEXT_SERVER_CHANGED = MainLoop::NOTIFICATION_TEXT_SERVER_CHANGED,
 
 		// Editor specific node notifications
 		NOTIFICATION_EDITOR_PRE_SAVE = 9001,
@@ -513,7 +507,7 @@ public:
 	/* NODE/TREE */
 
 	StringName get_name() const;
-	String get_description(bool p_show_not_in_tree = false) const;
+	String get_description() const;
 	void set_name(const StringName &p_name);
 
 	InternalMode get_internal_mode() const;
@@ -758,7 +752,7 @@ public:
 	void set_physics_interpolation_mode(PhysicsInterpolationMode p_mode);
 	PhysicsInterpolationMode get_physics_interpolation_mode() const { return data.physics_interpolation_mode; }
 	_FORCE_INLINE_ bool is_physics_interpolated() const { return data.physics_interpolated; }
-	bool is_physics_interpolated_and_enabled() const;
+	_FORCE_INLINE_ bool is_physics_interpolated_and_enabled() const { return SceneTree::is_fti_enabled() && is_physics_interpolated(); }
 	void reset_physics_interpolation();
 
 	bool is_enabled() const;
diff --git a/engine/scene/main/resource_preloader.cpp b/engine/scene/main/resource_preloader.cpp
index 3f722411..946014ba 100644
--- a/engine/scene/main/resource_preloader.cpp
+++ b/engine/scene/main/resource_preloader.cpp
@@ -29,10 +29,7 @@
 /**************************************************************************/
 
 #include "resource_preloader.h"
-
-#include "core/object/class_db.h"
 #include "core/templates/rb_set.h"
-
 void ResourcePreloader::_set_resources(const Array &p_data) {
 	resources.clear();
 
diff --git a/engine/scene/main/scene_tree.cpp b/engine/scene/main/scene_tree.cpp
index d1c0ef42..78e2181d 100644
--- a/engine/scene/main/scene_tree.cpp
+++ b/engine/scene/main/scene_tree.cpp
@@ -30,23 +30,19 @@
 
 #include "scene_tree.h"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/object/message_queue.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/profiling/profiling.h"
+#include "node.h"
 #include "scene/animation/tween.h"
 #include "scene/debugger/scene_debugger.h"
 #include "scene/gui/control.h"
 #include "scene/main/multiplayer_api.h"
-#include "scene/main/node.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
 #include "scene/resources/environment.h"
@@ -55,9 +51,6 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/world_2d.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/node_3d.h"
@@ -171,12 +164,12 @@ void SceneTree::node_renamed(Node *p_node) {
 	emit_signal(node_renamed_name, p_node);
 }
 
-SceneTreeGroup *SceneTree::add_to_group(const StringName &p_group, Node *p_node) {
+SceneTree::Group *SceneTree::add_to_group(const StringName &p_group, Node *p_node) {
 	_THREAD_SAFE_METHOD_
 
-	HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 	if (!E) {
-		E = group_map.insert(p_group, SceneTreeGroup());
+		E = group_map.insert(p_group, Group());
 	}
 
 	ERR_FAIL_COND_V_MSG(E->value.nodes.has(p_node), &E->value, "Already in group: " + p_group + ".");
@@ -188,7 +181,7 @@ SceneTreeGroup *SceneTree::add_to_group(const StringName &p_group, Node *p_node)
 void SceneTree::remove_from_group(const StringName &p_group, Node *p_node) {
 	_THREAD_SAFE_METHOD_
 
-	HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 	ERR_FAIL_COND(!E);
 
 	E->value.nodes.erase(p_node);
@@ -211,25 +204,25 @@ void SceneTree::flush_transform_notifications() {
 }
 
 bool SceneTree::is_accessibility_enabled() const {
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
 		return false;
 	}
 
-	AccessibilityServerEnums::AccessibilityMode accessibility_mode = AccessibilityServer::get_singleton()->get_mode();
+	DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::accessibility_get_mode();
 	int screen_reader_active = DisplayServer::get_singleton()->accessibility_screen_reader_active();
-	if ((accessibility_mode == AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_DISABLED) || ((accessibility_mode == AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_AUTO) && (screen_reader_active != 1))) {
+	if ((accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) || ((accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO) && (screen_reader_active != 1))) {
 		return false;
 	}
 	return true;
 }
 
 bool SceneTree::is_accessibility_supported() const {
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
 		return false;
 	}
 
-	AccessibilityServerEnums::AccessibilityMode accessibility_mode = AccessibilityServer::get_singleton()->get_mode();
-	if (accessibility_mode == AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+	DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::accessibility_get_mode();
+	if (accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
 		return false;
 	}
 	return true;
@@ -249,7 +242,7 @@ void SceneTree::_accessibility_notify_change(const Node *p_node, bool p_remove)
 	}
 }
 
-void SceneTree::_process_accessibility_changes(DisplayServerEnums::WindowID p_window_id) {
+void SceneTree::_process_accessibility_changes(DisplayServer::WindowID p_window_id) {
 	// Process NOTIFICATION_ACCESSIBILITY_UPDATE.
 	Vector<ObjectID> processed;
 	for (const ObjectID &id : accessibility_change_queue) {
@@ -276,8 +269,8 @@ void SceneTree::_process_accessibility_changes(DisplayServerEnums::WindowID p_wi
 		}
 
 		// Popups have no native window focus, but have focused element.
-		DisplayServerEnums::WindowID popup_id = DisplayServer::get_singleton()->window_get_active_popup();
-		if (popup_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		DisplayServer::WindowID popup_id = DisplayServer::get_singleton()->window_get_active_popup();
+		if (popup_id != DisplayServer::INVALID_WINDOW_ID) {
 			Window *popup_w = Window::get_from_id(popup_id);
 			if (popup_w && w_this->is_ancestor_of(popup_w)) {
 				w_this = popup_w;
@@ -292,7 +285,7 @@ void SceneTree::_process_accessibility_changes(DisplayServerEnums::WindowID p_wi
 			new_focus_element = w_this->get_focused_accessibility_element();
 		}
 
-		AccessibilityServer::get_singleton()->update_set_focus(new_focus_element);
+		DisplayServer::get_singleton()->accessibility_update_set_focus(new_focus_element);
 	}
 
 	// Cleanup.
@@ -313,7 +306,7 @@ void SceneTree::_flush_accessibility_changes() {
 		accessibility_last_update = time;
 
 		// Push update to the accessibility driver.
-		AccessibilityServer::get_singleton()->update_if_active(callable_mp(this, &SceneTree::_process_accessibility_changes));
+		DisplayServer::get_singleton()->accessibility_update_if_active(callable_mp(this, &SceneTree::_process_accessibility_changes));
 	}
 }
 
@@ -337,7 +330,7 @@ void SceneTree::_flush_ugc() {
 	ugc_locked = false;
 }
 
-void SceneTree::_update_group_order(SceneTreeGroup &g) {
+void SceneTree::_update_group_order(Group &g) {
 	if (!g.changed) {
 		return;
 	}
@@ -360,11 +353,11 @@ void SceneTree::call_group_flagsp(uint32_t p_call_flags, const StringName &p_gro
 	{
 		_THREAD_SAFE_METHOD_
 
-		HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+		HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 		if (!E) {
 			return;
 		}
-		SceneTreeGroup &g = E->value;
+		Group &g = E->value;
 		if (g.nodes.is_empty()) {
 			return;
 		}
@@ -451,11 +444,11 @@ void SceneTree::notify_group_flags(uint32_t p_call_flags, const StringName &p_gr
 	Vector<Node *> nodes_copy;
 	{
 		_THREAD_SAFE_METHOD_
-		HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+		HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 		if (!E) {
 			return;
 		}
-		SceneTreeGroup &g = E->value;
+		Group &g = E->value;
 		if (g.nodes.is_empty()) {
 			return;
 		}
@@ -514,11 +507,11 @@ void SceneTree::set_group_flags(uint32_t p_call_flags, const StringName &p_group
 	{
 		_THREAD_SAFE_METHOD_
 
-		HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+		HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 		if (!E) {
 			return;
 		}
-		SceneTreeGroup &g = E->value;
+		Group &g = E->value;
 		if (g.nodes.is_empty()) {
 			return;
 		}
@@ -921,22 +914,8 @@ void SceneTree::_notification(int p_notification) {
 		case NOTIFICATION_CRASH:
 		case NOTIFICATION_APPLICATION_RESUMED:
 		case NOTIFICATION_APPLICATION_PAUSED:
-		case NOTIFICATION_APPLICATION_PIP_MODE_ENTERED:
-		case NOTIFICATION_APPLICATION_PIP_MODE_EXITED: {
-			// Pass these to nodes, since they are mirrored.
-			get_root()->propagate_notification(p_notification);
-		} break;
-
 		case NOTIFICATION_APPLICATION_FOCUS_IN:
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
-			if (Input::get_singleton()) {
-				Input::get_singleton()->application_focused = p_notification == NOTIFICATION_APPLICATION_FOCUS_IN;
-
-				if (Input::get_singleton()->_should_ignore_joypad_events()) {
-					Input::get_singleton()->release_pressed_events();
-				}
-			}
-
 			// Pass these to nodes, since they are mirrored.
 			get_root()->propagate_notification(p_notification);
 		} break;
@@ -1427,11 +1406,11 @@ void SceneTree::_call_input_pause(const StringName &p_group, CallInputType p_cal
 	{
 		_THREAD_SAFE_METHOD_
 
-		HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+		HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 		if (!E) {
 			return;
 		}
-		SceneTreeGroup &g = E->value;
+		Group &g = E->value;
 		if (g.nodes.is_empty()) {
 			return;
 		}
@@ -1550,7 +1529,7 @@ int64_t SceneTree::get_frame() const {
 TypedArray<Node> SceneTree::_get_nodes_in_group(const StringName &p_group) {
 	_THREAD_SAFE_METHOD_
 	TypedArray<Node> ret;
-	HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 	if (!E) {
 		return ret;
 	}
@@ -1578,7 +1557,7 @@ bool SceneTree::has_group(const StringName &p_identifier) const {
 
 int SceneTree::get_node_count_in_group(const StringName &p_group) const {
 	_THREAD_SAFE_METHOD_
-	HashMap<StringName, SceneTreeGroup>::ConstIterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::ConstIterator E = group_map.find(p_group);
 	if (!E) {
 		return 0;
 	}
@@ -1588,7 +1567,7 @@ int SceneTree::get_node_count_in_group(const StringName &p_group) const {
 
 Node *SceneTree::get_first_node_in_group(const StringName &p_group) {
 	_THREAD_SAFE_METHOD_
-	HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 	if (!E) {
 		return nullptr; // No group.
 	}
@@ -1604,7 +1583,7 @@ Node *SceneTree::get_first_node_in_group(const StringName &p_group) {
 
 Vector<Node *> SceneTree::get_nodes_in_group(const StringName &p_group) {
 	_THREAD_SAFE_METHOD_
-	HashMap<StringName, SceneTreeGroup>::Iterator E = group_map.find(p_group);
+	HashMap<StringName, Group>::Iterator E = group_map.find(p_group);
 	if (!E) {
 		return {};
 	}
@@ -1966,19 +1945,19 @@ void SceneTree::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_paths_hint"), "set_debug_paths_hint", "is_debugging_paths_hint");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_navigation_hint"), "set_debug_navigation_hint", "is_debugging_navigation_hint");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "paused"), "set_pause", "is_paused");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_scene_root", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static(), PROPERTY_USAGE_NONE), "set_edited_scene_root", "get_edited_scene_root");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "current_scene", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static(), PROPERTY_USAGE_NONE), "set_current_scene", "get_current_scene");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "root", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static(), PROPERTY_USAGE_NONE), "", "get_root");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_scene_root", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_edited_scene_root", "get_edited_scene_root");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "current_scene", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_current_scene", "get_current_scene");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "root", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "", "get_root");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "multiplayer_poll"), "set_multiplayer_poll_enabled", "is_multiplayer_poll_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_interpolation"), "set_physics_interpolation_enabled", "is_physics_interpolation_enabled");
 
 	ADD_SIGNAL(MethodInfo("tree_changed"));
 	ADD_SIGNAL(MethodInfo("scene_changed"));
 	ADD_SIGNAL(MethodInfo("tree_process_mode_changed")); //editor only signal, but due to API hash it can't be removed in run-time
-	ADD_SIGNAL(MethodInfo("node_added", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("node_removed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("node_renamed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
-	ADD_SIGNAL(MethodInfo("node_configuration_warning_changed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
+	ADD_SIGNAL(MethodInfo("node_added", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("node_removed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("node_renamed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
+	ADD_SIGNAL(MethodInfo("node_configuration_warning_changed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 
 	ADD_SIGNAL(MethodInfo("process_frame"));
 	ADD_SIGNAL(MethodInfo("physics_frame"));
@@ -2029,7 +2008,7 @@ void SceneTree::get_argument_options(const StringName &p_function, int p_idx, Li
 		add_options = names.has(p_function);
 	}
 	if (add_options) {
-		HashMap<StringName, String> global_groups(ProjectSettings::get_singleton()->get_global_groups_list());
+		HashMap<StringName, String> global_groups = ProjectSettings::get_singleton()->get_global_groups_list();
 		for (const KeyValue<StringName, String> &E : global_groups) {
 			r_options->push_back(E.key.operator String().quote());
 		}
@@ -2106,16 +2085,8 @@ SceneTree::SceneTree() {
 	const bool transparent_background = GLOBAL_DEF("rendering/viewport/transparent_background", false);
 	root->set_transparent_background(transparent_background);
 
-	// Enable HDR if requested.
-	const bool hdr_requested = GLOBAL_GET("display/window/hdr/request_hdr_output");
-	DisplayServer::get_singleton()->window_request_hdr_output(hdr_requested);
-
 	const bool use_hdr_2d = GLOBAL_GET("rendering/viewport/hdr_2d");
-	root->set_use_hdr_2d(use_hdr_2d || hdr_requested);
-
-	if (hdr_requested && !use_hdr_2d) {
-		WARN_PRINT_ED("HDR 2D was automatically enabled because HDR output was requested in project settings. To avoid this warning, enable rendering/viewport/hdr_2d in the Project Settings.");
-	}
+	root->set_use_hdr_2d(use_hdr_2d);
 
 	const int ssaa_mode = GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "rendering/anti_aliasing/quality/screen_space_aa", PROPERTY_HINT_ENUM, "Disabled (Fastest),FXAA (Fast),SMAA (Average)"), 0);
 	root->set_screen_space_aa(Viewport::ScreenSpaceAA(ssaa_mode));
diff --git a/engine/scene/main/scene_tree.h b/engine/scene/main/scene_tree.h
index b3a3757a..d1655f9e 100644
--- a/engine/scene/main/scene_tree.h
+++ b/engine/scene/main/scene_tree.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "core/object/message_queue.h"
-#include "core/object/ref_counted.h"
 #include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/paged_allocator.h"
@@ -40,19 +38,22 @@
 
 #include <cstdlib>
 
-class ArrayMesh;
-class InputEvent;
-class Material;
-class MultiplayerAPI;
-class Node;
-class PackedScene;
-class Tween;
-class Viewport;
-class Window;
+#undef Window
 
+class ArrayMesh;
+class PackedScene;
+class InputEvent;
+class Node;
 #ifndef _3D_DISABLED
 class Node3D;
 #endif
+class Window;
+class Material;
+class Mesh;
+class MultiplayerAPI;
+class SceneDebugger;
+class Tween;
+class Viewport;
 
 class SceneTreeTimer : public RefCounted {
 	GDCLASS(SceneTreeTimer, RefCounted);
@@ -81,11 +82,6 @@ public:
 	void release_connections();
 };
 
-struct SceneTreeGroup {
-	Vector<Node *> nodes;
-	bool changed = false;
-};
-
 class SceneTree : public MainLoop {
 	_THREAD_SAFE_CLASS_
 
@@ -123,6 +119,11 @@ private:
 
 	bool node_threading_disabled = false;
 
+	struct Group {
+		Vector<Node *> nodes;
+		bool changed = false;
+	};
+
 #ifndef _3D_DISABLED
 	struct ClientPhysicsInterpolation {
 		SelfList<Node3D>::List _node_3d_list;
@@ -145,7 +146,7 @@ private:
 	bool paused = false;
 	bool suspended = false;
 
-	HashMap<StringName, SceneTreeGroup> group_map;
+	HashMap<StringName, Group> group_map;
 	bool _quit = false;
 
 	// Static so we can get directly instead of via SceneTree pointer.
@@ -196,7 +197,7 @@ private:
 	bool ugc_locked = false;
 	void _flush_ugc();
 
-	_FORCE_INLINE_ void _update_group_order(SceneTreeGroup &g);
+	_FORCE_INLINE_ void _update_group_order(Group &g);
 
 	TypedArray<Node> _get_nodes_in_group(const StringName &p_group);
 
@@ -234,7 +235,7 @@ private:
 	void process_timers(double p_delta, bool p_physics_frame);
 	void process_tweens(double p_delta, bool p_physics_frame);
 
-	SceneTreeGroup *add_to_group(const StringName &p_group, Node *p_node);
+	Group *add_to_group(const StringName &p_group, Node *p_node);
 	void remove_from_group(const StringName &p_group, Node *p_node);
 
 	void _process_group(ProcessGroup *p_group, bool p_physics);
@@ -289,7 +290,6 @@ protected:
 
 public:
 	enum {
-		// Keep in sync with CanvasItem and Node3D.
 		NOTIFICATION_TRANSFORM_CHANGED = 2000
 	};
 
@@ -339,7 +339,7 @@ public:
 	void _accessibility_force_update();
 	void _accessibility_notify_change(const Node *p_node, bool p_remove = false);
 	void _flush_accessibility_changes();
-	void _process_accessibility_changes(int p_window_id); // Effectively DisplayServerEnums::WindowID
+	void _process_accessibility_changes(int p_window_id); // Effectively DisplayServer::WindowID
 
 	virtual void initialize() override;
 
diff --git a/engine/scene/main/scene_tree_fti.cpp b/engine/scene/main/scene_tree_fti.cpp
index 88d6f3fe..ee8dc25c 100644
--- a/engine/scene/main/scene_tree_fti.cpp
+++ b/engine/scene/main/scene_tree_fti.cpp
@@ -39,7 +39,7 @@
 #include "scene/3d/visual_instance_3d.h"
 
 #ifdef GODOT_SCENE_TREE_FTI_VERIFY
-#include "scene/main/scene_tree_fti_tests.h"
+#include "scene_tree_fti_tests.h"
 #endif
 
 #ifdef DEV_ENABLED
@@ -83,7 +83,7 @@ void SceneTreeFTI::set_enabled(Node *p_root, bool p_enabled) {
 	if (data.enabled == p_enabled) {
 		return;
 	}
-	MutexLock lock(data.mutex);
+	MutexLock(data.mutex);
 
 	data.tick_xform_list[0].clear();
 	data.tick_xform_list[1].clear();
@@ -111,7 +111,7 @@ void SceneTreeFTI::tick_update() {
 	if (!data.enabled) {
 		return;
 	}
-	MutexLock lock(data.mutex);
+	MutexLock(data.mutex);
 
 	_update_request_resets();
 
@@ -221,7 +221,7 @@ void SceneTreeFTI::node_3d_request_reset(Node3D *p_node) {
 	DEV_CHECK_ONCE(data.enabled);
 	DEV_ASSERT(p_node);
 
-	MutexLock lock(data.mutex);
+	MutexLock(data.mutex);
 
 	if (!p_node->_is_physics_interpolation_reset_requested()) {
 		p_node->_set_physics_interpolation_reset_requested(true);
@@ -415,7 +415,7 @@ void SceneTreeFTI::node_3d_notify_delete(Node3D *p_node) {
 
 	ERR_FAIL_NULL(p_node);
 
-	MutexLock lock(data.mutex);
+	MutexLock(data.mutex);
 
 	// Remove from frame lists.
 	if (p_node->data.fti_on_frame_xform_list) {
@@ -605,7 +605,7 @@ void SceneTreeFTI::frame_update(Node *p_root, bool p_frame_start) {
 	if (!data.enabled || !p_root) {
 		return;
 	}
-	MutexLock lock(data.mutex);
+	MutexLock(data.mutex);
 
 	data.frame_start = p_frame_start;
 	data.in_frame = true;
diff --git a/engine/scene/main/scene_tree_fti.h b/engine/scene/main/scene_tree_fti.h
index c9a97d55..9997ff8c 100644
--- a/engine/scene/main/scene_tree_fti.h
+++ b/engine/scene/main/scene_tree_fti.h
@@ -143,7 +143,7 @@ public:
 		if (!data.enabled) {
 			return;
 		}
-		MutexLock lock(data.mutex);
+		MutexLock(data.mutex);
 
 		if (p_transform_changed) {
 			_node_3d_notify_set_xform(r_node);
diff --git a/engine/scene/main/scene_tree_fti_tests.h b/engine/scene/main/scene_tree_fti_tests.h
index b3171bf6..38e80b0e 100644
--- a/engine/scene/main/scene_tree_fti_tests.h
+++ b/engine/scene/main/scene_tree_fti_tests.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <cstdint>
+#include <stdint.h>
 
 class Node3D;
 class Node;
diff --git a/engine/scene/main/shader_globals_override.cpp b/engine/scene/main/shader_globals_override.cpp
index 8090e502..cf708de5 100644
--- a/engine/scene/main/shader_globals_override.cpp
+++ b/engine/scene/main/shader_globals_override.cpp
@@ -30,8 +30,7 @@
 
 #include "shader_globals_override.h"
 
-#include "core/object/class_db.h"
-#include "scene/main/scene_tree.h"
+#include "scene/main/node.h"
 #include "servers/rendering/rendering_server.h"
 
 StringName *ShaderGlobalsOverride::_remap(const StringName &p_name) const {
@@ -101,105 +100,105 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const
 		pinfo.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CHECKABLE;
 
 		switch (RS::get_singleton()->global_shader_parameter_get_type(variables[i])) {
-			case RSE::GLOBAL_VAR_TYPE_BOOL: {
+			case RS::GLOBAL_VAR_TYPE_BOOL: {
 				pinfo.type = Variant::BOOL;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_BVEC2: {
+			case RS::GLOBAL_VAR_TYPE_BVEC2: {
 				pinfo.type = Variant::INT;
 				pinfo.hint = PROPERTY_HINT_FLAGS;
 				pinfo.hint_string = "x,y";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_BVEC3: {
+			case RS::GLOBAL_VAR_TYPE_BVEC3: {
 				pinfo.type = Variant::INT;
 				pinfo.hint = PROPERTY_HINT_FLAGS;
 				pinfo.hint_string = "x,y,z";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_BVEC4: {
+			case RS::GLOBAL_VAR_TYPE_BVEC4: {
 				pinfo.type = Variant::INT;
 				pinfo.hint = PROPERTY_HINT_FLAGS;
 				pinfo.hint_string = "x,y,z,w";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_INT: {
+			case RS::GLOBAL_VAR_TYPE_INT: {
 				pinfo.type = Variant::INT;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_IVEC2: {
+			case RS::GLOBAL_VAR_TYPE_IVEC2: {
 				pinfo.type = Variant::VECTOR2I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_IVEC3: {
+			case RS::GLOBAL_VAR_TYPE_IVEC3: {
 				pinfo.type = Variant::VECTOR3I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_IVEC4: {
+			case RS::GLOBAL_VAR_TYPE_IVEC4: {
 				pinfo.type = Variant::VECTOR4I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_RECT2I: {
+			case RS::GLOBAL_VAR_TYPE_RECT2I: {
 				pinfo.type = Variant::RECT2I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_UINT: {
+			case RS::GLOBAL_VAR_TYPE_UINT: {
 				pinfo.type = Variant::INT;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_UVEC2: {
+			case RS::GLOBAL_VAR_TYPE_UVEC2: {
 				pinfo.type = Variant::VECTOR2I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_UVEC3: {
+			case RS::GLOBAL_VAR_TYPE_UVEC3: {
 				pinfo.type = Variant::VECTOR3I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_UVEC4: {
+			case RS::GLOBAL_VAR_TYPE_UVEC4: {
 				pinfo.type = Variant::VECTOR4I;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+			case RS::GLOBAL_VAR_TYPE_FLOAT: {
 				pinfo.type = Variant::FLOAT;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_VEC2: {
+			case RS::GLOBAL_VAR_TYPE_VEC2: {
 				pinfo.type = Variant::VECTOR2;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_VEC3: {
+			case RS::GLOBAL_VAR_TYPE_VEC3: {
 				pinfo.type = Variant::VECTOR3;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_VEC4: {
+			case RS::GLOBAL_VAR_TYPE_VEC4: {
 				pinfo.type = Variant::VECTOR4;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_RECT2: {
+			case RS::GLOBAL_VAR_TYPE_RECT2: {
 				pinfo.type = Variant::RECT2;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_COLOR: {
+			case RS::GLOBAL_VAR_TYPE_COLOR: {
 				pinfo.type = Variant::COLOR;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_MAT2: {
+			case RS::GLOBAL_VAR_TYPE_MAT2: {
 				pinfo.type = Variant::PACKED_FLOAT32_ARRAY;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_MAT3: {
+			case RS::GLOBAL_VAR_TYPE_MAT3: {
 				pinfo.type = Variant::BASIS;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_MAT4: {
+			case RS::GLOBAL_VAR_TYPE_MAT4: {
 				pinfo.type = Variant::PROJECTION;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
+			case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 				pinfo.type = Variant::TRANSFORM2D;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+			case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 				pinfo.type = Variant::TRANSFORM3D;
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER2D: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER2D: {
 				pinfo.type = Variant::OBJECT;
 				pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 				pinfo.hint_string = "Texture2D";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
 				pinfo.type = Variant::OBJECT;
 				pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 				pinfo.hint_string = "Texture2DArray";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER3D: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER3D: {
 				pinfo.type = Variant::OBJECT;
 				pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 				pinfo.hint_string = "Texture3D";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
 				pinfo.type = Variant::OBJECT;
 				pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 				pinfo.hint_string = "Cubemap";
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLEREXT: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLEREXT: {
 				pinfo.type = Variant::OBJECT;
 				pinfo.hint = PROPERTY_HINT_RESOURCE_TYPE;
 				pinfo.hint_string = "ExternalTexture";
diff --git a/engine/scene/main/status_indicator.cpp b/engine/scene/main/status_indicator.cpp
index 6defcbe0..f0ba5db1 100644
--- a/engine/scene/main/status_indicator.cpp
+++ b/engine/scene/main/status_indicator.cpp
@@ -30,10 +30,7 @@
 
 #include "status_indicator.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/popup_menu.h"
-#include "servers/display/display_server.h"
 
 void StatusIndicator::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
@@ -45,8 +42,8 @@ void StatusIndicator::_notification(int p_what) {
 
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_STATUS_INDICATOR)) {
-				if (visible && iid == DisplayServerEnums::INVALID_INDICATOR_ID) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
+				if (visible && iid == DisplayServer::INVALID_INDICATOR_ID) {
 					iid = DisplayServer::get_singleton()->create_status_indicator(icon, tooltip, callable_mp(this, &StatusIndicator::_callback));
 					PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 					if (pm) {
@@ -57,15 +54,15 @@ void StatusIndicator::_notification(int p_what) {
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_STATUS_INDICATOR)) {
-				if (iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
+				if (iid != DisplayServer::INVALID_INDICATOR_ID) {
 					PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 					if (pm) {
 						pm->unbind_global_menu();
 						DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 					}
 					DisplayServer::get_singleton()->delete_status_indicator(iid);
-					iid = DisplayServerEnums::INVALID_INDICATOR_ID;
+					iid = DisplayServer::INVALID_INDICATOR_ID;
 				}
 			}
 		} break;
@@ -88,7 +85,7 @@ void StatusIndicator::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::INT, "mouse_button"), PropertyInfo(Variant::VECTOR2I, "mouse_position")));
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "tooltip", PROPERTY_HINT_MULTILINE_TEXT), "set_tooltip", "get_tooltip");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_icon", "get_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_icon", "get_icon");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "menu", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "PopupMenu"), "set_menu", "get_menu");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible");
 }
@@ -100,7 +97,7 @@ void StatusIndicator::_callback(MouseButton p_index, const Point2i &p_pos) {
 void StatusIndicator::set_icon(const Ref<Texture2D> &p_icon) {
 	ERR_MAIN_THREAD_GUARD;
 	icon = p_icon;
-	if (iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+	if (iid != DisplayServer::INVALID_INDICATOR_ID) {
 		DisplayServer::get_singleton()->status_indicator_set_icon(iid, icon);
 	}
 }
@@ -112,7 +109,7 @@ Ref<Texture2D> StatusIndicator::get_icon() const {
 void StatusIndicator::set_tooltip(const String &p_tooltip) {
 	ERR_MAIN_THREAD_GUARD;
 	tooltip = p_tooltip;
-	if (iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+	if (iid != DisplayServer::INVALID_INDICATOR_ID) {
 		DisplayServer::get_singleton()->status_indicator_set_tooltip(iid, tooltip);
 	}
 }
@@ -125,7 +122,7 @@ void StatusIndicator::set_menu(const NodePath &p_menu) {
 	PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 	if (pm) {
 		pm->unbind_global_menu();
-		if (iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+		if (iid != DisplayServer::INVALID_INDICATOR_ID) {
 			DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 		}
 	}
@@ -134,7 +131,7 @@ void StatusIndicator::set_menu(const NodePath &p_menu) {
 
 	pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 	if (pm) {
-		if (iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+		if (iid != DisplayServer::INVALID_INDICATOR_ID) {
 			RID menu_rid = pm->bind_global_menu();
 			DisplayServer::get_singleton()->status_indicator_set_menu(iid, menu_rid);
 		}
@@ -162,8 +159,8 @@ void StatusIndicator::set_visible(bool p_visible) {
 	}
 #endif
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_STATUS_INDICATOR)) {
-		if (visible && iid == DisplayServerEnums::INVALID_INDICATOR_ID) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
+		if (visible && iid == DisplayServer::INVALID_INDICATOR_ID) {
 			iid = DisplayServer::get_singleton()->create_status_indicator(icon, tooltip, callable_mp(this, &StatusIndicator::_callback));
 			PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 			if (pm) {
@@ -171,14 +168,14 @@ void StatusIndicator::set_visible(bool p_visible) {
 				DisplayServer::get_singleton()->status_indicator_set_menu(iid, menu_rid);
 			}
 		}
-		if (!visible && iid != DisplayServerEnums::INVALID_INDICATOR_ID) {
+		if (!visible && iid != DisplayServer::INVALID_INDICATOR_ID) {
 			PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 			if (pm) {
 				pm->unbind_global_menu();
 				DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 			}
 			DisplayServer::get_singleton()->delete_status_indicator(iid);
-			iid = DisplayServerEnums::INVALID_INDICATOR_ID;
+			iid = DisplayServer::INVALID_INDICATOR_ID;
 		}
 	}
 }
@@ -188,7 +185,7 @@ bool StatusIndicator::is_visible() const {
 }
 
 Rect2 StatusIndicator::get_rect() const {
-	if (iid == DisplayServerEnums::INVALID_INDICATOR_ID) {
+	if (iid == DisplayServer::INVALID_INDICATOR_ID) {
 		return Rect2();
 	}
 	return DisplayServer::get_singleton()->status_indicator_get_rect(iid);
diff --git a/engine/scene/main/status_indicator.h b/engine/scene/main/status_indicator.h
index 6df06657..bffb3997 100644
--- a/engine/scene/main/status_indicator.h
+++ b/engine/scene/main/status_indicator.h
@@ -31,8 +31,7 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "scene/resources/texture.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 class StatusIndicator : public Node {
 	GDCLASS(StatusIndicator, Node);
@@ -40,7 +39,7 @@ class StatusIndicator : public Node {
 	Ref<Texture2D> icon;
 	String tooltip;
 	bool visible = true;
-	DisplayServerEnums::IndicatorID iid = DisplayServerEnums::INVALID_INDICATOR_ID;
+	DisplayServer::IndicatorID iid = DisplayServer::INVALID_INDICATOR_ID;
 	NodePath menu;
 
 protected:
diff --git a/engine/scene/main/timer.cpp b/engine/scene/main/timer.cpp
index f1b01282..a6a11dbb 100644
--- a/engine/scene/main/timer.cpp
+++ b/engine/scene/main/timer.cpp
@@ -31,7 +31,6 @@
 #include "timer.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 void Timer::_notification(int p_what) {
 	switch (p_what) {
diff --git a/engine/scene/main/viewport.compat.inc b/engine/scene/main/viewport.compat.inc
deleted file mode 100644
index da034713..00000000
--- a/engine/scene/main/viewport.compat.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*  viewport.compat.inc                                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "viewport.h"
-
-#include "core/object/class_db.h"
-
-#ifndef XR_DISABLED
-bool Viewport::_is_using_xr_115799() {
-	return is_using_xr();
-}
-#endif
-
-void Viewport::_bind_compatibility_methods() {
-#ifndef XR_DISABLED
-	ClassDB::bind_compatibility_method(D_METHOD("is_using_xr"), &Viewport::_is_using_xr_115799);
-#endif
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/scene/main/viewport.cpp b/engine/scene/main/viewport.cpp
index ce767dab..996d4445 100644
--- a/engine/scene/main/viewport.cpp
+++ b/engine/scene/main/viewport.cpp
@@ -29,16 +29,9 @@
 /**************************************************************************/
 
 #include "viewport.h"
-#include "viewport.compat.inc"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "core/templates/sort_array.h"
 #include "scene/gui/control.h"
@@ -47,27 +40,22 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/dpi_texture.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/text_line.h"
+#include "scene/resources/world_2d.h"
 #include "servers/audio/audio_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 // 2D.
 #include "scene/2d/audio_listener_2d.h"
 #include "scene/2d/camera_2d.h"
-#include "scene/resources/world_2d.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/audio_listener_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/world_environment.h"
-#include "scene/resources/3d/world_3d.h"
 #endif // _3D_DISABLED
 
 #ifndef PHYSICS_2D_DISABLED
@@ -78,12 +66,6 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "scene/3d/physics/collision_object_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
-#ifndef XR_DISABLED
-#include "servers/rendering/rendering_server_globals.h"
-#include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_server.h"
-#endif // XR_DISABLED
-
 void ViewportTexture::setup_local_to_scene() {
 	// For the same target viewport, setup is only allowed once to prevent multiple free or multiple creations.
 	if (!vp_changed) {
@@ -423,14 +405,14 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 	if (p_window == nullptr) {
 		// Release current focus.
 		if (gui.subwindow_focused) {
-			gui.subwindow_focused->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+			gui.subwindow_focused->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 			gui.subwindow_focused = nullptr;
 			gui.subwindow_drag = SUB_WINDOW_DRAG_DISABLED;
 		}
 
 		Window *this_window = Object::cast_to<Window>(this);
 		if (this_window) {
-			this_window->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+			this_window->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_IN);
 		}
 
 		return;
@@ -443,7 +425,7 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 	if (p_window->get_flag(Window::FLAG_NO_FOCUS)) {
 		// Release current focus.
 		if (gui.subwindow_focused) {
-			gui.subwindow_focused->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+			gui.subwindow_focused->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 			gui.subwindow_focused = nullptr;
 			gui.subwindow_drag = SUB_WINDOW_DRAG_DISABLED;
 		}
@@ -461,12 +443,12 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 		if (gui.subwindow_focused == p_window) {
 			return; // Nothing to do.
 		}
-		gui.subwindow_focused->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+		gui.subwindow_focused->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 		gui.subwindow_drag = SUB_WINDOW_DRAG_DISABLED;
 	} else {
 		Window *this_window = Object::cast_to<Window>(this);
 		if (this_window) {
-			this_window->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+			this_window->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 		}
 	}
 
@@ -474,7 +456,7 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 
 	gui.subwindow_focused = p_window;
 
-	gui.subwindow_focused->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+	gui.subwindow_focused->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_IN);
 
 	{ // Move to foreground.
 		index = _sub_window_find(p_window);
@@ -521,7 +503,7 @@ void Viewport::_sub_window_remove(Window *p_window) {
 		Window *new_focused_window;
 		Window *parent_visible = p_window->get_parent_visible_window();
 
-		gui.subwindow_focused->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
+		gui.subwindow_focused->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_OUT);
 
 		if (parent_visible) {
 			new_focused_window = parent_visible;
@@ -537,7 +519,7 @@ void Viewport::_sub_window_remove(Window *p_window) {
 				gui.subwindow_focused = nullptr;
 			}
 
-			new_focused_window->_event_callback(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
+			new_focused_window->_event_callback(DisplayServer::WINDOW_EVENT_FOCUS_IN);
 		} else {
 			gui.subwindow_focused = nullptr;
 		}
@@ -620,19 +602,17 @@ void Viewport::_notification(int p_what) {
 #ifndef PHYSICS_3D_DISABLED
 				PhysicsServer3D::get_singleton()->space_set_debug_contacts(find_world_3d()->get_space(), get_tree()->get_collision_debug_contact_count());
 				contact_3d_debug_multimesh = RenderingServer::get_singleton()->multimesh_create();
-				RenderingServer::get_singleton()->multimesh_allocate_data(contact_3d_debug_multimesh, get_tree()->get_collision_debug_contact_count(), RSE::MULTIMESH_TRANSFORM_3D, false);
+				RenderingServer::get_singleton()->multimesh_allocate_data(contact_3d_debug_multimesh, get_tree()->get_collision_debug_contact_count(), RS::MULTIMESH_TRANSFORM_3D, false);
 				RenderingServer::get_singleton()->multimesh_set_visible_instances(contact_3d_debug_multimesh, 0);
 				RenderingServer::get_singleton()->multimesh_set_mesh(contact_3d_debug_multimesh, get_tree()->get_debug_contact_mesh()->get_rid());
 				contact_3d_debug_instance = RenderingServer::get_singleton()->instance_create();
 				RenderingServer::get_singleton()->instance_set_base(contact_3d_debug_instance, contact_3d_debug_multimesh);
 				RenderingServer::get_singleton()->instance_set_scenario(contact_3d_debug_instance, find_world_3d()->get_scenario());
-				RenderingServer::get_singleton()->instance_geometry_set_flag(contact_3d_debug_instance, RSE::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
+				RenderingServer::get_singleton()->instance_geometry_set_flag(contact_3d_debug_instance, RS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
 #endif // PHYSICS_3D_DISABLED
 				set_physics_process_internal(true);
 			}
 #endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
-			_update_texture_filter_changed(false);
-			_update_texture_repeat_changed(false);
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -698,17 +678,6 @@ void Viewport::_notification(int p_what) {
 			_update_viewport_path();
 		} break;
 
-#ifndef XR_DISABLED
-		case NOTIFICATION_INTERNAL_PROCESS: {
-			// Note: internal process should only be enabled if use_xr is true,
-			// but we check anyway to be future proof.
-			// This is currently a polling approach.
-			if (use_xr) {
-				_check_xr_size();
-			}
-		} break;
-#endif // XR_DISABLED
-
 #if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
 			if (!get_tree()) {
@@ -785,7 +754,7 @@ void Viewport::_process_picking() {
 	if (!physics_object_picking) {
 		return;
 	}
-	if (Object::cast_to<Window>(this) && Input::get_singleton()->get_mouse_mode() == Input::MouseMode::MOUSE_MODE_CAPTURED) {
+	if (Object::cast_to<Window>(this) && Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
 		return;
 	}
 	if (!gui.mouse_in_viewport || gui.subwindow_over) {
@@ -1106,7 +1075,7 @@ void Viewport::set_use_oversampling(bool p_oversampling) {
 		return;
 	}
 	use_font_oversampling = p_oversampling;
-	_set_size(_get_size(), _get_view_count(), _get_size_2d_override(), _is_size_allocated());
+	_set_size(_get_size(), _get_size_2d_override(), _is_size_allocated());
 }
 
 bool Viewport::is_using_oversampling() const {
@@ -1120,7 +1089,7 @@ void Viewport::set_oversampling_override(float p_oversampling) {
 		return;
 	}
 	font_oversampling_override = p_oversampling;
-	_set_size(_get_size(), _get_view_count(), _get_size_2d_override(), _is_size_allocated());
+	_set_size(_get_size(), _get_size_2d_override(), _is_size_allocated());
 }
 
 float Viewport::get_oversampling_override() const {
@@ -1128,7 +1097,7 @@ float Viewport::get_oversampling_override() const {
 	return font_oversampling_override;
 }
 
-bool Viewport::_set_size(const Size2i &p_size, const int p_view_count, const Size2 &p_size_2d_override, bool p_allocated) {
+bool Viewport::_set_size(const Size2i &p_size, const Size2 &p_size_2d_override, bool p_allocated) {
 	Transform2D stretch_transform_new = Transform2D();
 	float new_font_oversampling = 1.0;
 	if (is_size_2d_override_stretch_enabled() && p_size_2d_override.width > 0 && p_size_2d_override.height > 0) {
@@ -1149,7 +1118,7 @@ bool Viewport::_set_size(const Size2i &p_size, const int p_view_count, const Siz
 	}
 
 	Size2i new_size = p_size.maxi(2);
-	if (size == new_size && view_count == p_view_count && size_allocated == p_allocated && stretch_transform == stretch_transform_new && p_size_2d_override == size_2d_override && new_font_oversampling == font_oversampling) {
+	if (size == new_size && size_allocated == p_allocated && stretch_transform == stretch_transform_new && p_size_2d_override == size_2d_override && new_font_oversampling == font_oversampling) {
 		return false;
 	}
 
@@ -1162,17 +1131,24 @@ bool Viewport::_set_size(const Size2i &p_size, const int p_view_count, const Siz
 	}
 
 	size = new_size;
-	view_count = p_view_count;
 	size_allocated = p_allocated;
 	size_2d_override = p_size_2d_override;
 	stretch_transform = stretch_transform_new;
 	font_oversampling = new_font_oversampling;
 
-	if (p_allocated) {
-		RS::get_singleton()->viewport_set_size(viewport, size.width, size.height, view_count);
-	} else {
-		RS::get_singleton()->viewport_set_size(viewport, 0, 0, 0);
-	}
+#ifndef XR_DISABLED
+	if (!use_xr) {
+#endif
+
+		if (p_allocated) {
+			RS::get_singleton()->viewport_set_size(viewport, size.width, size.height);
+		} else {
+			RS::get_singleton()->viewport_set_size(viewport, 0, 0);
+		}
+
+#ifndef XR_DISABLED
+	} // if (!use_xr)
+#endif
 
 	_update_global_transform();
 	update_configuration_warnings();
@@ -1198,26 +1174,20 @@ bool Viewport::_set_size(const Size2i &p_size, const int p_view_count, const Siz
 	return true;
 }
 
-void Viewport::_check_xr_size() {
+Size2i Viewport::_get_size() const {
 #ifndef XR_DISABLED
-	// If our viewport has the use_xr flag set, our size and layout is managed by the XRServer.
-	if (use_xr && XRServer::get_singleton() != nullptr) {
-		Ref<XRInterface> xr_interface = XRServer::get_singleton()->get_primary_interface();
-		if (xr_interface.is_valid() && xr_interface->is_initialized()) {
-			Size2 xr_size = xr_interface->get_render_target_size();
-			int xr_view_count = xr_interface->get_view_count();
-
-			_set_size((Size2i)xr_size, xr_view_count, Size2i(0, 0), true);
-		} else {
-			// Set to default and prevent rendering for now (unless in editor, so we get a preview).
-			bool is_editor = Engine::get_singleton()->is_editor_hint();
-			_set_size(is_editor ? Size2i(512, 512) : Size2i(0, 0), is_editor ? 1 : 0, Size2i(0, 0), false);
+	if (use_xr) {
+		if (XRServer::get_singleton() != nullptr) {
+			Ref<XRInterface> xr_interface = XRServer::get_singleton()->get_primary_interface();
+			if (xr_interface.is_valid() && xr_interface->is_initialized()) {
+				Size2 xr_size = xr_interface->get_render_target_size();
+				return (Size2i)xr_size;
+			}
 		}
+		return Size2i();
 	}
 #endif // XR_DISABLED
-}
 
-Size2i Viewport::_get_size() const {
 	return size;
 }
 
@@ -1225,10 +1195,6 @@ Size2 Viewport::_get_size_2d_override() const {
 	return size_2d_override;
 }
 
-int Viewport::_get_view_count() const {
-	return view_count;
-}
-
 bool Viewport::_is_size_allocated() const {
 	return size_allocated;
 }
@@ -1484,7 +1450,7 @@ Vector2 Viewport::get_mouse_position() const {
 		// Rely on the most recent mouse coordinate from an InputEventMouse in push_input.
 		// In this case get_screen_transform is not applicable, because it is ambiguous.
 		return gui.last_mouse_pos;
-	} else if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_MOUSE)) {
+	} else if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_MOUSE)) {
 		Transform2D xform = get_screen_transform_internal(true);
 		if (xform.determinant() == 0) {
 			// Screen transform can be non-invertible when the Window is minimized.
@@ -1675,7 +1641,7 @@ void Viewport::_gui_show_tooltip_at(const Point2i &p_pos) {
 		gui.tooltip_label = memnew(Label);
 		gui.tooltip_label->set_theme_type_variation(SNAME("TooltipLabel"));
 		gui.tooltip_label->set_text(gui.tooltip_text);
-		gui.tooltip_label->set_auto_translate_mode(tooltip_owner->get_tooltip_auto_translate_mode_at(tooltip_owner->get_global_transform_with_canvas().affine_inverse().xform(gui.last_mouse_pos)));
+		gui.tooltip_label->set_auto_translate_mode(tooltip_owner->get_tooltip_auto_translate_mode());
 		base_tooltip = gui.tooltip_label;
 		panel->connect(SceneStringName(mouse_entered), callable_mp(this, &Viewport::_gui_cancel_tooltip));
 	}
@@ -1715,7 +1681,7 @@ void Viewport::_gui_show_tooltip_at(const Point2i &p_pos) {
 	r.size = r.size.ceil();
 	r.size = r.size.min(panel->get_max_size());
 
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS) || gui.tooltip_popup->is_embedded()) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS) || gui.tooltip_popup->is_embedded()) {
 		if (r.size.x + r.position.x > vr.size.x + vr.position.x) {
 			// Place it in the opposite direction. If it fails, just hug the border.
 			r.position.x = gui.tooltip_pos.x - r.size.x - tooltip_offset.x;
@@ -1739,8 +1705,8 @@ void Viewport::_gui_show_tooltip_at(const Point2i &p_pos) {
 		}
 	}
 
-	DisplayServerEnums::WindowID active_popup = DisplayServer::get_singleton()->window_get_active_popup();
-	if (active_popup == DisplayServerEnums::INVALID_WINDOW_ID || active_popup == window->get_window_id()) {
+	DisplayServer::WindowID active_popup = DisplayServer::get_singleton()->window_get_active_popup();
+	if (active_popup == DisplayServer::INVALID_WINDOW_ID || active_popup == window->get_window_id()) {
 		gui.tooltip_popup->popup(r);
 	}
 	gui.tooltip_popup->child_controls_changed();
@@ -2108,7 +2074,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			over = gui_find_control(mpos);
 		}
 
-		DisplayServerEnums::CursorShape ds_cursor_shape = (DisplayServerEnums::CursorShape)Input::get_singleton()->get_default_cursor_shape();
+		DisplayServer::CursorShape ds_cursor_shape = (DisplayServer::CursorShape)Input::get_singleton()->get_default_cursor_shape();
 
 		if (over) {
 			Transform2D localizer = over->get_global_transform_with_canvas().affine_inverse();
@@ -2183,7 +2149,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 				}
 			}
 
-			ds_cursor_shape = (DisplayServerEnums::CursorShape)cursor_shape;
+			ds_cursor_shape = (DisplayServer::CursorShape)cursor_shape;
 
 			if (over->can_process()) {
 				_gui_call_input(over, mm);
@@ -2205,14 +2171,14 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 					gui.drag_mouse_over = nullptr;
 				}
 				if (gui.drag_mouse_over) {
-					ds_cursor_shape = DisplayServerEnums::CURSOR_CAN_DROP;
+					ds_cursor_shape = DisplayServer::CURSOR_CAN_DROP;
 				} else {
-					ds_cursor_shape = DisplayServerEnums::CURSOR_FORBIDDEN;
+					ds_cursor_shape = DisplayServer::CURSOR_FORBIDDEN;
 				}
 			}
 		}
 
-		if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CURSOR_SHAPE) && (gui.dragging || (!section_root->gui.global_dragging && !Object::cast_to<SubViewportContainer>(over)))) {
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE) && (gui.dragging || (!section_root->gui.global_dragging && !Object::cast_to<SubViewportContainer>(over)))) {
 			// If dragging is active, then set the cursor shape only from the Viewport where dragging started.
 			// If dragging is inactive, then set the cursor shape only when not over a SubViewportContainer.
 			DisplayServer::get_singleton()->cursor_set_shape(ds_cursor_shape);
@@ -2953,7 +2919,7 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 			if (gui.subwindow_drag == SUB_WINDOW_DRAG_CLOSE) {
 				if (gui.subwindow_drag_close_rect.has_point(mb->get_position())) {
 					// Close window.
-					gui.currently_dragged_subwindow->_event_callback(DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
+					gui.currently_dragged_subwindow->_event_callback(DisplayServer::WINDOW_EVENT_CLOSE_REQUEST);
 				}
 			}
 			gui.subwindow_drag = SUB_WINDOW_DRAG_DISABLED;
@@ -2975,8 +2941,8 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 
 				gui.currently_dragged_subwindow->_rect_changed_callback(new_rect);
 
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CURSOR_SHAPE)) {
-					DisplayServer::get_singleton()->cursor_set_shape(DisplayServerEnums::CURSOR_MOVE);
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) {
+					DisplayServer::get_singleton()->cursor_set_shape(DisplayServer::CURSOR_MOVE);
 				}
 			}
 			if (gui.subwindow_drag == SUB_WINDOW_DRAG_CLOSE) {
@@ -3159,19 +3125,19 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) {
 		if (mm.is_valid()) {
 			SubWindowResize resize = _sub_window_get_resize_margin(gui.subwindow_focused, mm->get_position());
 			if (resize != SUB_WINDOW_RESIZE_DISABLED) {
-				DisplayServerEnums::CursorShape shapes[SUB_WINDOW_RESIZE_MAX] = {
-					DisplayServerEnums::CURSOR_ARROW,
-					DisplayServerEnums::CURSOR_FDIAGSIZE,
-					DisplayServerEnums::CURSOR_VSIZE,
-					DisplayServerEnums::CURSOR_BDIAGSIZE,
-					DisplayServerEnums::CURSOR_HSIZE,
-					DisplayServerEnums::CURSOR_HSIZE,
-					DisplayServerEnums::CURSOR_BDIAGSIZE,
-					DisplayServerEnums::CURSOR_VSIZE,
-					DisplayServerEnums::CURSOR_FDIAGSIZE
+				DisplayServer::CursorShape shapes[SUB_WINDOW_RESIZE_MAX] = {
+					DisplayServer::CURSOR_ARROW,
+					DisplayServer::CURSOR_FDIAGSIZE,
+					DisplayServer::CURSOR_VSIZE,
+					DisplayServer::CURSOR_BDIAGSIZE,
+					DisplayServer::CURSOR_HSIZE,
+					DisplayServer::CURSOR_HSIZE,
+					DisplayServer::CURSOR_BDIAGSIZE,
+					DisplayServer::CURSOR_VSIZE,
+					DisplayServer::CURSOR_FDIAGSIZE
 				};
 
-				if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CURSOR_SHAPE)) {
+				if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) {
 					DisplayServer::get_singleton()->cursor_set_shape(shapes[resize]);
 				}
 
@@ -3589,46 +3555,12 @@ void Viewport::push_unhandled_input(RequiredParam<InputEvent> rp_event, bool p_l
 }
 #endif // DISABLE_DEPRECATED
 
-void Viewport::_push_shortcut_input_internal(const Ref<InputEvent> &p_event) {
-	if (Object::cast_to<InputEventKey>(*p_event) == nullptr && Object::cast_to<InputEventShortcut>(*p_event) == nullptr && Object::cast_to<InputEventJoypadButton>(*p_event) == nullptr) {
-		return;
-	}
-	ERR_FAIL_COND(!is_inside_tree());
-	get_tree()->_call_input_pause(shortcut_input_group, SceneTree::CALL_INPUT_TYPE_SHORTCUT_INPUT, p_event, this);
-
-	if (!propagate_shortcuts_to_parent || is_input_handled()) {
-		return;
-	}
-
-	Viewport *parent_viewport = get_parent_viewport();
-	if (!parent_viewport) {
-		return;
-	}
-	if (parent_viewport->disable_input || parent_viewport->disable_input_override) {
-		return;
-	}
-	if (Engine::get_singleton()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_ancestor_of(parent_viewport)) {
-		return;
-	}
-	if (!parent_viewport->handle_input_locally || parent_viewport->is_embedding_subwindows()) {
-		return;
-	}
-	if (!parent_viewport->_can_consume_input_events()) {
-		return;
-	}
-
-	parent_viewport->local_input_handled = false;
-	parent_viewport->shortcut_use_focus_owner = false;
-	parent_viewport->_push_shortcut_input_internal(p_event);
-	parent_viewport->shortcut_use_focus_owner = true;
-	if (parent_viewport->is_input_handled()) {
-		set_input_as_handled();
-	}
-}
-
 void Viewport::_push_unhandled_input_internal(const Ref<InputEvent> &p_event) {
 	// Shortcut Input.
-	_push_shortcut_input_internal(p_event);
+	if (Object::cast_to<InputEventKey>(*p_event) != nullptr || Object::cast_to<InputEventShortcut>(*p_event) != nullptr || Object::cast_to<InputEventJoypadButton>(*p_event) != nullptr) {
+		ERR_FAIL_COND(!is_inside_tree());
+		get_tree()->_call_input_pause(shortcut_input_group, SceneTree::CALL_INPUT_TYPE_SHORTCUT_INPUT, p_event, this);
+	}
 
 	// Unhandled key Input - Used for performance reasons - This is called a lot less than _unhandled_input since it ignores MouseMotion, and to handle Unicode input with Alt / Ctrl modifiers after handling shortcuts.
 	if (!is_input_handled() && (Object::cast_to<InputEventKey>(*p_event) != nullptr)) {
@@ -3644,7 +3576,7 @@ void Viewport::_push_unhandled_input_internal(const Ref<InputEvent> &p_event) {
 
 #if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	if (physics_object_picking && !is_input_handled()) {
-		if (Input::get_singleton()->get_mouse_mode() != Input::MouseMode::MOUSE_MODE_CAPTURED &&
+		if (Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED &&
 				(Object::cast_to<InputEventMouse>(*p_event) ||
 						Object::cast_to<InputEventScreenDrag>(*p_event) ||
 						Object::cast_to<InputEventScreenTouch>(*p_event)
@@ -3818,7 +3750,7 @@ void Viewport::set_msaa_2d(MSAA p_msaa) {
 		return;
 	}
 	msaa_2d = p_msaa;
-	RS::get_singleton()->viewport_set_msaa_2d(viewport, RSE::ViewportMSAA(p_msaa));
+	RS::get_singleton()->viewport_set_msaa_2d(viewport, RS::ViewportMSAA(p_msaa));
 }
 
 Viewport::MSAA Viewport::get_msaa_2d() const {
@@ -3833,7 +3765,7 @@ void Viewport::set_msaa_3d(MSAA p_msaa) {
 		return;
 	}
 	msaa_3d = p_msaa;
-	RS::get_singleton()->viewport_set_msaa_3d(viewport, RSE::ViewportMSAA(p_msaa));
+	RS::get_singleton()->viewport_set_msaa_3d(viewport, RS::ViewportMSAA(p_msaa));
 }
 
 Viewport::MSAA Viewport::get_msaa_3d() const {
@@ -3848,7 +3780,7 @@ void Viewport::set_screen_space_aa(ScreenSpaceAA p_screen_space_aa) {
 		return;
 	}
 	screen_space_aa = p_screen_space_aa;
-	RS::get_singleton()->viewport_set_screen_space_aa(viewport, RSE::ViewportScreenSpaceAA(p_screen_space_aa));
+	RS::get_singleton()->viewport_set_screen_space_aa(viewport, RS::ViewportScreenSpaceAA(p_screen_space_aa));
 }
 
 Viewport::ScreenSpaceAA Viewport::get_screen_space_aa() const {
@@ -3915,7 +3847,7 @@ bool Viewport::is_using_occlusion_culling() const {
 void Viewport::set_debug_draw(DebugDraw p_debug_draw) {
 	ERR_MAIN_THREAD_GUARD;
 	debug_draw = p_debug_draw;
-	RS::get_singleton()->viewport_set_debug_draw(viewport, RSE::ViewportDebugDraw(p_debug_draw));
+	RS::get_singleton()->viewport_set_debug_draw(viewport, RS::ViewportDebugDraw(p_debug_draw));
 }
 
 Viewport::DebugDraw Viewport::get_debug_draw() const {
@@ -3925,7 +3857,7 @@ Viewport::DebugDraw Viewport::get_debug_draw() const {
 
 int Viewport::get_render_info(RenderInfoType p_type, RenderInfo p_info) {
 	ERR_READ_THREAD_GUARD_V(0);
-	return RS::get_singleton()->viewport_get_render_info(viewport, RSE::ViewportRenderInfoType(p_type), RSE::ViewportRenderInfo(p_info));
+	return RS::get_singleton()->viewport_get_render_info(viewport, RS::ViewportRenderInfoType(p_type), RS::ViewportRenderInfo(p_info));
 }
 
 void Viewport::set_snap_controls_to_pixels(bool p_enable) {
@@ -4031,80 +3963,6 @@ bool Viewport::is_handling_input_locally() const {
 	return handle_input_locally;
 }
 
-void Viewport::set_propagate_shortcuts_to_parent(bool p_enable) {
-	ERR_MAIN_THREAD_GUARD;
-	propagate_shortcuts_to_parent = p_enable;
-}
-
-bool Viewport::gui_shortcut_use_focus_owner() const {
-	ERR_READ_THREAD_GUARD_V(false);
-	return shortcut_use_focus_owner;
-}
-
-void Viewport::_refresh_texture_filter_cache() const {
-	if (!is_inside_tree()) {
-		return;
-	}
-
-	switch (default_canvas_item_texture_filter) {
-		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST: {
-			default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR: {
-			default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: {
-			default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
-			default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE: {
-			Node *p = get_parent();
-			CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p);
-			if (parent_ci) {
-				default_canvas_item_texture_filter_cache = (RenderingServerEnums::CanvasItemTextureFilter)parent_ci->get_texture_filter_in_tree();
-				if (default_canvas_item_texture_filter_cache == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT) {
-					default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-				}
-				break;
-			}
-			Viewport *parent_vp = Object::cast_to<Viewport>(p);
-			if (parent_vp) {
-				default_canvas_item_texture_filter_cache = (RenderingServerEnums::CanvasItemTextureFilter)parent_vp->get_texture_filter_in_tree();
-				break;
-			}
-			default_canvas_item_texture_filter_cache = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-		} break;
-		default: {
-		}
-	}
-}
-
-void Viewport::_update_texture_filter_changed(bool p_propagate) {
-	if (!is_inside_tree()) {
-		return;
-	}
-	_refresh_texture_filter_cache();
-	RS::get_singleton()->viewport_set_default_canvas_item_texture_filter(viewport, default_canvas_item_texture_filter_cache);
-
-	if (p_propagate) {
-		for (Node *c : iterate_children()) {
-			CanvasItem *child_ci = Object::cast_to<CanvasItem>(c);
-			if (child_ci) {
-				if (child_ci->texture_filter == CanvasItem::TEXTURE_FILTER_PARENT_NODE) {
-					child_ci->_update_texture_filter_changed(true);
-				}
-				continue;
-			}
-			Viewport *child_vp = Object::cast_to<Viewport>(c);
-			if (child_vp && child_vp->default_canvas_item_texture_filter == Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE) {
-				child_vp->_update_texture_filter_changed(true);
-			}
-		}
-	}
-}
-
 void Viewport::set_default_canvas_item_texture_filter(DefaultCanvasItemTextureFilter p_filter) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_INDEX(p_filter, DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_MAX);
@@ -4113,79 +3971,27 @@ void Viewport::set_default_canvas_item_texture_filter(DefaultCanvasItemTextureFi
 		return;
 	}
 	default_canvas_item_texture_filter = p_filter;
-	_update_texture_filter_changed(true);
-}
-
-Viewport::DefaultCanvasItemTextureFilter Viewport::get_default_canvas_item_texture_filter() const {
-	ERR_READ_THREAD_GUARD_V(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
-	return default_canvas_item_texture_filter;
-}
-
-RenderingServerEnums::CanvasItemTextureFilter Viewport::get_texture_filter_in_tree() const {
-	ERR_READ_THREAD_GUARD_V(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR);
-	_refresh_texture_filter_cache();
-	return default_canvas_item_texture_filter_cache;
-}
-
-void Viewport::_refresh_texture_repeat_cache() const {
-	if (!is_inside_tree()) {
-		return;
-	}
-
-	switch (default_canvas_item_texture_repeat) {
-		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: {
-			default_canvas_item_texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: {
-			default_canvas_item_texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: {
-			default_canvas_item_texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR;
-		} break;
-		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE: {
-			Node *p = get_parent();
-			CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p);
-			if (parent_ci) {
-				default_canvas_item_texture_repeat_cache = (RenderingServerEnums::CanvasItemTextureRepeat)parent_ci->get_texture_repeat_in_tree();
-				if (default_canvas_item_texture_repeat_cache == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT) {
-					default_canvas_item_texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
-				}
-				break;
-			}
-			Viewport *parent_vp = Object::cast_to<Viewport>(p);
-			if (parent_vp) {
-				default_canvas_item_texture_repeat_cache = (RenderingServerEnums::CanvasItemTextureRepeat)parent_vp->get_texture_repeat_in_tree();
-				break;
-			}
-			default_canvas_item_texture_repeat_cache = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
-		} break;
+	switch (default_canvas_item_texture_filter) {
+		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_filter(viewport, RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+			break;
+		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_filter(viewport, RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR);
+			break;
+		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_filter(viewport, RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS);
+			break;
+		case DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_filter(viewport, RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
+			break;
 		default: {
 		}
 	}
 }
 
-void Viewport::_update_texture_repeat_changed(bool p_propagate) {
-	if (!is_inside_tree()) {
-		return;
-	}
-	_refresh_texture_repeat_cache();
-	RS::get_singleton()->viewport_set_default_canvas_item_texture_repeat(viewport, default_canvas_item_texture_repeat_cache);
-
-	if (p_propagate) {
-		for (Node *c : iterate_children()) {
-			CanvasItem *child_ci = Object::cast_to<CanvasItem>(c);
-			if (child_ci) {
-				if (child_ci->texture_repeat == CanvasItem::TEXTURE_REPEAT_PARENT_NODE) {
-					child_ci->_update_texture_repeat_changed(true);
-				}
-				continue;
-			}
-			Viewport *child_vp = Object::cast_to<Viewport>(c);
-			if (child_vp && child_vp->default_canvas_item_texture_repeat == Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE) {
-				child_vp->_update_texture_repeat_changed(true);
-			}
-		}
-	}
+Viewport::DefaultCanvasItemTextureFilter Viewport::get_default_canvas_item_texture_filter() const {
+	ERR_READ_THREAD_GUARD_V(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+	return default_canvas_item_texture_filter;
 }
 
 void Viewport::set_default_canvas_item_texture_repeat(DefaultCanvasItemTextureRepeat p_repeat) {
@@ -4197,7 +4003,20 @@ void Viewport::set_default_canvas_item_texture_repeat(DefaultCanvasItemTextureRe
 	}
 
 	default_canvas_item_texture_repeat = p_repeat;
-	_update_texture_repeat_changed(true);
+
+	switch (default_canvas_item_texture_repeat) {
+		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_repeat(viewport, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			break;
+		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_ENABLED:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_repeat(viewport, RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
+			break;
+		case DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR:
+			RS::get_singleton()->viewport_set_default_canvas_item_texture_repeat(viewport, RS::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR);
+			break;
+		default: {
+		}
+	}
 }
 
 Viewport::DefaultCanvasItemTextureRepeat Viewport::get_default_canvas_item_texture_repeat() const {
@@ -4205,12 +4024,6 @@ Viewport::DefaultCanvasItemTextureRepeat Viewport::get_default_canvas_item_textu
 	return default_canvas_item_texture_repeat;
 }
 
-RenderingServerEnums::CanvasItemTextureRepeat Viewport::get_texture_repeat_in_tree() const {
-	ERR_READ_THREAD_GUARD_V(RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	_refresh_texture_repeat_cache();
-	return default_canvas_item_texture_repeat_cache;
-}
-
 void Viewport::set_vrs_mode(Viewport::VRSMode p_vrs_mode) {
 	ERR_MAIN_THREAD_GUARD;
 	// Note, set this even if not supported on this hardware, it will only be used if it is but we want to save the value as set by the user.
@@ -4218,13 +4031,13 @@ void Viewport::set_vrs_mode(Viewport::VRSMode p_vrs_mode) {
 
 	switch (p_vrs_mode) {
 		case VRS_TEXTURE: {
-			RS::get_singleton()->viewport_set_vrs_mode(viewport, RSE::VIEWPORT_VRS_TEXTURE);
+			RS::get_singleton()->viewport_set_vrs_mode(viewport, RS::VIEWPORT_VRS_TEXTURE);
 		} break;
 		case VRS_XR: {
-			RS::get_singleton()->viewport_set_vrs_mode(viewport, RSE::VIEWPORT_VRS_XR);
+			RS::get_singleton()->viewport_set_vrs_mode(viewport, RS::VIEWPORT_VRS_XR);
 		} break;
 		default: {
-			RS::get_singleton()->viewport_set_vrs_mode(viewport, RSE::VIEWPORT_VRS_DISABLED);
+			RS::get_singleton()->viewport_set_vrs_mode(viewport, RS::VIEWPORT_VRS_DISABLED);
 		} break;
 	}
 
@@ -4242,13 +4055,13 @@ void Viewport::set_vrs_update_mode(VRSUpdateMode p_vrs_update_mode) {
 	vrs_update_mode = p_vrs_update_mode;
 	switch (p_vrs_update_mode) {
 		case VRS_UPDATE_ONCE: {
-			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RSE::VIEWPORT_VRS_UPDATE_ONCE);
+			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RS::VIEWPORT_VRS_UPDATE_ONCE);
 		} break;
 		case VRS_UPDATE_ALWAYS: {
-			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RSE::VIEWPORT_VRS_UPDATE_ALWAYS);
+			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RS::VIEWPORT_VRS_UPDATE_ALWAYS);
 		} break;
 		default: {
-			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RSE::VIEWPORT_VRS_UPDATE_DISABLED);
+			RS::get_singleton()->viewport_set_vrs_update_mode(viewport, RS::VIEWPORT_VRS_UPDATE_DISABLED);
 		} break;
 	}
 }
@@ -4272,9 +4085,9 @@ Ref<Texture2D> Viewport::get_vrs_texture() const {
 	return vrs_texture;
 }
 
-DisplayServerEnums::WindowID Viewport::get_window_id() const {
-	ERR_READ_THREAD_GUARD_V(DisplayServerEnums::INVALID_WINDOW_ID);
-	return DisplayServerEnums::MAIN_WINDOW_ID;
+DisplayServer::WindowID Viewport::get_window_id() const {
+	ERR_READ_THREAD_GUARD_V(DisplayServer::INVALID_WINDOW_ID);
+	return DisplayServer::MAIN_WINDOW_ID;
 }
 
 Viewport *Viewport::get_parent_viewport() const {
@@ -4322,8 +4135,8 @@ void Viewport::set_embedding_subwindows(bool p_embed) {
 		}
 
 		if (allow_change) {
-			Vector<DisplayServerEnums::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
-			for (const DisplayServerEnums::WindowID &window_id : wl) {
+			Vector<DisplayServer::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
+			for (const DisplayServer::WindowID &window_id : wl) {
 				const Window *w = Window::get_from_id(window_id);
 				if (w && is_ancestor_of(w)) {
 					// Prevent change when this viewport has child windows that are displayed as native windows.
@@ -4388,7 +4201,7 @@ void Viewport::set_sdf_oversize(SDFOversize p_sdf_oversize) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_INDEX(p_sdf_oversize, SDF_OVERSIZE_MAX);
 	sdf_oversize = p_sdf_oversize;
-	RS::get_singleton()->viewport_set_sdf_oversize_and_scale(viewport, RSE::ViewportSDFOversize(sdf_oversize), RSE::ViewportSDFScale(sdf_scale));
+	RS::get_singleton()->viewport_set_sdf_oversize_and_scale(viewport, RS::ViewportSDFOversize(sdf_oversize), RS::ViewportSDFScale(sdf_scale));
 }
 
 Viewport::SDFOversize Viewport::get_sdf_oversize() const {
@@ -4400,7 +4213,7 @@ void Viewport::set_sdf_scale(SDFScale p_sdf_scale) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_INDEX(p_sdf_scale, SDF_SCALE_MAX);
 	sdf_scale = p_sdf_scale;
-	RS::get_singleton()->viewport_set_sdf_oversize_and_scale(viewport, RSE::ViewportSDFOversize(sdf_oversize), RSE::ViewportSDFScale(sdf_scale));
+	RS::get_singleton()->viewport_set_sdf_oversize_and_scale(viewport, RS::ViewportSDFOversize(sdf_oversize), RS::ViewportSDFScale(sdf_scale));
 }
 
 Viewport::SDFScale Viewport::get_sdf_scale() const {
@@ -5013,37 +4826,27 @@ void Viewport::_propagate_exit_world_3d(Node *p_node) {
 #ifndef XR_DISABLED
 void Viewport::set_use_xr(bool p_use_xr) {
 	ERR_MAIN_THREAD_GUARD;
-
 	if (use_xr != p_use_xr) {
 		use_xr = p_use_xr;
+
 		RS::get_singleton()->viewport_set_use_xr(viewport, use_xr);
 
-#ifndef XR_DISABLED
-		if (use_xr) {
-			// Note: use_xr is ONLY used for the primary XR viewport.
-			// Any additional (sub)viewports for composition layers and
-			// other purposes should not have use_xr set.
-			_check_xr_size();
-
-			// Enable internal process as we need to check for recommended size changes each frame
-			// (though size changes should only happen sporadically).
-			set_process_internal(true);
-		} else
-#endif // XR_DISABLED
-		{
-			// No longer check for recommended size changes in internal process.
-			set_process_internal(false);
+		if (!use_xr) {
+			// Set viewport to previous size when exiting XR.
+			if (size_allocated) {
+				RS::get_singleton()->viewport_set_size(viewport, size.width, size.height);
+			} else {
+				RS::get_singleton()->viewport_set_size(viewport, 0, 0);
+			}
 
 			// Reset render target override textures.
 			RID rt = RS::get_singleton()->viewport_get_render_target(viewport);
 			RSG::texture_storage->render_target_set_override(rt, RID(), RID(), RID(), RID());
 		}
-
-		notify_property_list_changed();
 	}
 }
 
-bool Viewport::is_using_xr() const {
+bool Viewport::is_using_xr() {
 	ERR_READ_THREAD_GUARD_V(false);
 	return use_xr;
 }
@@ -5056,7 +4859,7 @@ void Viewport::set_scaling_3d_mode(Scaling3DMode p_scaling_3d_mode) {
 	}
 
 	scaling_3d_mode = p_scaling_3d_mode;
-	RS::get_singleton()->viewport_set_scaling_3d_mode(viewport, (RSE::ViewportScaling3DMode)(int)p_scaling_3d_mode);
+	RS::get_singleton()->viewport_set_scaling_3d_mode(viewport, (RS::ViewportScaling3DMode)(int)p_scaling_3d_mode);
 }
 
 Viewport::Scaling3DMode Viewport::get_scaling_3d_mode() const {
@@ -5120,7 +4923,7 @@ void Viewport::set_anisotropic_filtering_level(AnisotropicFiltering p_anisotropi
 	}
 
 	anisotropic_filtering_level = p_anisotropic_filtering_level;
-	RS::get_singleton()->viewport_set_anisotropic_filtering_level(viewport, (RSE::ViewportAnisotropicFiltering)(int)p_anisotropic_filtering_level);
+	RS::get_singleton()->viewport_set_anisotropic_filtering_level(viewport, (RS::ViewportAnisotropicFiltering)(int)p_anisotropic_filtering_level);
 }
 
 Viewport::AnisotropicFiltering Viewport::get_anisotropic_filtering_level() const {
@@ -5351,9 +5154,9 @@ void Viewport::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_xr"), "set_use_xr", "is_using_xr");
 #endif // XR_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "own_world_3d"), "set_use_own_world_3d", "is_using_own_world_3d");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_3d", PROPERTY_HINT_RESOURCE_TYPE, World3D::get_class_static()), "set_world_3d", "get_world_3d");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_3d", PROPERTY_HINT_RESOURCE_TYPE, "World3D"), "set_world_3d", "get_world_3d");
 #endif // _3D_DISABLED
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_2d", PROPERTY_HINT_RESOURCE_TYPE, World2D::get_class_static(), PROPERTY_USAGE_NONE), "set_world_2d", "get_world_2d");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_2d", PROPERTY_HINT_RESOURCE_TYPE, "World2D", PROPERTY_USAGE_NONE), "set_world_2d", "get_world_2d");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "transparent_bg"), "set_transparent_background", "has_transparent_background");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "handle_input_locally"), "set_handle_input_locally", "is_handling_input_locally");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "snap_2d_transforms_to_pixel"), "set_snap_2d_transforms_to_pixel", "is_snap_2d_transforms_to_pixel_enabled");
@@ -5371,19 +5174,19 @@ void Viewport::_bind_methods() {
 
 #ifndef _3D_DISABLED
 	ADD_GROUP("Scaling 3D", "");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "scaling_3d_mode", PROPERTY_HINT_ENUM, "Nearest (Fastest):5,Bilinear (Fastest):0,FSR 1.0 (Fast):1,FSR 2.2 (Slow):2,MetalFX (Spatial - Fast):3,MetalFX (Temporal - Slow):4"), "set_scaling_3d_mode", "get_scaling_3d_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "scaling_3d_scale", PROPERTY_HINT_RANGE, "0.1,2.0,0.0001"), "set_scaling_3d_scale", "get_scaling_3d_scale");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "scaling_3d_mode", PROPERTY_HINT_ENUM, "Bilinear (Fastest),FSR 1.0 (Fast),FSR 2.2 (Slow),MetalFX (Spatial),MetalFX (Temporal)"), "set_scaling_3d_mode", "get_scaling_3d_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "scaling_3d_scale", PROPERTY_HINT_RANGE, "0.25,2.0,0.01"), "set_scaling_3d_scale", "get_scaling_3d_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "texture_mipmap_bias", PROPERTY_HINT_RANGE, "-2,2,0.001"), "set_texture_mipmap_bias", "get_texture_mipmap_bias");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "anisotropic_filtering_level", PROPERTY_HINT_ENUM, String::utf8("Disabled (Fastest),2× (Faster),4× (Fast),8× (Average),16x (Slow)")), "set_anisotropic_filtering_level", "get_anisotropic_filtering_level");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fsr_sharpness", PROPERTY_HINT_RANGE, "0,2,0.01"), "set_fsr_sharpness", "get_fsr_sharpness");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fsr_sharpness", PROPERTY_HINT_RANGE, "0,2,0.1"), "set_fsr_sharpness", "get_fsr_sharpness");
 	ADD_GROUP("Variable Rate Shading", "vrs_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vrs_mode", PROPERTY_HINT_ENUM, "Disabled,Texture,XR"), "set_vrs_mode", "get_vrs_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vrs_update_mode", PROPERTY_HINT_ENUM, "Disabled,Once,Always"), "set_vrs_update_mode", "get_vrs_update_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "vrs_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_vrs_texture", "get_vrs_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "vrs_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_vrs_texture", "get_vrs_texture");
 #endif
 	ADD_GROUP("Canvas Items", "canvas_item_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "canvas_item_default_texture_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Linear Mipmap,Nearest Mipmap,Inherit"), "set_default_canvas_item_texture_filter", "get_default_canvas_item_texture_filter");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "canvas_item_default_texture_repeat", PROPERTY_HINT_ENUM, "Disabled,Enabled,Mirror,Inherit"), "set_default_canvas_item_texture_repeat", "get_default_canvas_item_texture_repeat");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "canvas_item_default_texture_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Linear Mipmap,Nearest Mipmap"), "set_default_canvas_item_texture_filter", "get_default_canvas_item_texture_filter");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "canvas_item_default_texture_repeat", PROPERTY_HINT_ENUM, "Disabled,Enabled,Mirror"), "set_default_canvas_item_texture_repeat", "get_default_canvas_item_texture_repeat");
 	ADD_GROUP("Audio Listener", "audio_listener_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "audio_listener_enable_2d"), "set_as_audio_listener_2d", "is_audio_listener_2d");
 #ifndef _3D_DISABLED
@@ -5418,7 +5221,7 @@ void Viewport::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "oversampling_override", PROPERTY_HINT_RANGE, "0,16,0.0001,or_greater"), "set_oversampling_override", "get_oversampling_override");
 
 	ADD_SIGNAL(MethodInfo("size_changed"));
-	ADD_SIGNAL(MethodInfo("gui_focus_changed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, Control::get_class_static())));
+	ADD_SIGNAL(MethodInfo("gui_focus_changed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Control")));
 
 	BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_DISABLED);
 	BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_1);
@@ -5434,7 +5237,6 @@ void Viewport::_bind_methods() {
 	BIND_ENUM_CONSTANT(SCALING_3D_MODE_FSR2);
 	BIND_ENUM_CONSTANT(SCALING_3D_MODE_METALFX_SPATIAL);
 	BIND_ENUM_CONSTANT(SCALING_3D_MODE_METALFX_TEMPORAL);
-	BIND_ENUM_CONSTANT(SCALING_3D_MODE_NEAREST);
 	BIND_ENUM_CONSTANT(SCALING_3D_MODE_MAX);
 
 	BIND_ENUM_CONSTANT(MSAA_DISABLED);
@@ -5497,13 +5299,11 @@ void Viewport::_bind_methods() {
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
-	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_MAX);
 
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR);
-	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE);
 	BIND_ENUM_CONSTANT(DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MAX);
 
 	BIND_ENUM_CONSTANT(SDF_OVERSIZE_100_PERCENT);
@@ -5534,7 +5334,9 @@ void Viewport::_validate_property(PropertyInfo &p_property) const {
 	}
 	if (vrs_mode != VRS_TEXTURE && (p_property.name == "vrs_texture")) {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-	} else if (vrs_mode == VRS_DISABLED && (p_property.name == "vrs_update_mode")) {
+	}
+
+	if (vrs_mode == VRS_DISABLED && (p_property.name == "vrs_update_mode")) {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }
@@ -5610,17 +5412,17 @@ Viewport::~Viewport() {
 
 void SubViewport::set_size(const Size2i &p_size) {
 	ERR_MAIN_THREAD_GUARD;
-	_internal_set_size(p_size, _get_view_count());
+	_internal_set_size(p_size);
 }
 
 void SubViewport::set_size_force(const Size2i &p_size) {
 	ERR_MAIN_THREAD_GUARD;
 	// Use only for setting the size from the parent SubViewportContainer with enabled stretch mode.
 	// Don't expose function to scripting.
-	_internal_set_size(p_size, _get_view_count(), true);
+	_internal_set_size(p_size, true);
 }
 
-void SubViewport::_internal_set_size(const Size2i &p_size, const int p_view_count, bool p_force) {
+void SubViewport::_internal_set_size(const Size2i &p_size, bool p_force) {
 	SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
 	if (!p_force && c && c->is_stretch_enabled()) {
 #ifdef DEBUG_ENABLED
@@ -5629,7 +5431,7 @@ void SubViewport::_internal_set_size(const Size2i &p_size, const int p_view_coun
 		return;
 	}
 
-	_set_size(p_size, p_view_count, _get_size_2d_override(), true);
+	_set_size(p_size, _get_size_2d_override(), true);
 
 	if (c) {
 		c->update_minimum_size();
@@ -5642,22 +5444,9 @@ Size2i SubViewport::get_size() const {
 	return _get_size();
 }
 
-void SubViewport::set_view_count(const int p_view_count) {
-	ERR_MAIN_THREAD_GUARD;
-
-	// Q: add `, _get_size_2d_override(), true` ?
-	_internal_set_size(_get_size(), p_view_count);
-}
-
-int SubViewport::get_view_count() const {
-	ERR_READ_THREAD_GUARD_V(1);
-
-	return _get_view_count();
-}
-
 void SubViewport::set_size_2d_override(const Size2i &p_size) {
 	ERR_MAIN_THREAD_GUARD;
-	_set_size(_get_size(), _get_view_count(), p_size, true);
+	_set_size(_get_size(), p_size, true);
 }
 
 Size2i SubViewport::get_size_2d_override() const {
@@ -5675,7 +5464,7 @@ void SubViewport::set_size_2d_override_stretch(bool p_enable) {
 	}
 
 	size_2d_override_stretch = p_enable;
-	_set_size(_get_size(), _get_view_count(), _get_size_2d_override(), true);
+	_set_size(_get_size(), _get_size_2d_override(), true);
 }
 
 bool SubViewport::is_size_2d_override_stretch_enabled() const {
@@ -5686,7 +5475,7 @@ bool SubViewport::is_size_2d_override_stretch_enabled() const {
 void SubViewport::set_update_mode(UpdateMode p_mode) {
 	ERR_MAIN_THREAD_GUARD;
 	update_mode = p_mode;
-	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::ViewportUpdateMode(p_mode));
+	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::ViewportUpdateMode(p_mode));
 }
 
 SubViewport::UpdateMode SubViewport::get_update_mode() const {
@@ -5697,7 +5486,7 @@ SubViewport::UpdateMode SubViewport::get_update_mode() const {
 void SubViewport::set_clear_mode(ClearMode p_mode) {
 	ERR_MAIN_THREAD_GUARD;
 	clear_mode = p_mode;
-	RS::get_singleton()->viewport_set_clear_mode(get_viewport_rid(), RSE::ViewportClearMode(p_mode));
+	RS::get_singleton()->viewport_set_clear_mode(get_viewport_rid(), RS::ViewportClearMode(p_mode));
 }
 
 SubViewport::ClearMode SubViewport::get_clear_mode() const {
@@ -5705,9 +5494,9 @@ SubViewport::ClearMode SubViewport::get_clear_mode() const {
 	return clear_mode;
 }
 
-DisplayServerEnums::WindowID SubViewport::get_window_id() const {
-	ERR_READ_THREAD_GUARD_V(DisplayServerEnums::INVALID_WINDOW_ID);
-	return DisplayServerEnums::INVALID_WINDOW_ID;
+DisplayServer::WindowID SubViewport::get_window_id() const {
+	ERR_READ_THREAD_GUARD_V(DisplayServer::INVALID_WINDOW_ID);
+	return DisplayServer::INVALID_WINDOW_ID;
 }
 
 Transform2D SubViewport::get_screen_transform_internal(bool p_absolute_position) const {
@@ -5781,9 +5570,6 @@ void SubViewport::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_size_2d_override_stretch", "enable"), &SubViewport::set_size_2d_override_stretch);
 	ClassDB::bind_method(D_METHOD("is_size_2d_override_stretch_enabled"), &SubViewport::is_size_2d_override_stretch_enabled);
 
-	ClassDB::bind_method(D_METHOD("set_view_count", "view_count"), &SubViewport::set_view_count);
-	ClassDB::bind_method(D_METHOD("get_view_count"), &SubViewport::get_view_count);
-
 	ClassDB::bind_method(D_METHOD("set_update_mode", "mode"), &SubViewport::set_update_mode);
 	ClassDB::bind_method(D_METHOD("get_update_mode"), &SubViewport::get_update_mode);
 
@@ -5793,7 +5579,6 @@ void SubViewport::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "size", PROPERTY_HINT_NONE, "suffix:px"), "set_size", "get_size");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "size_2d_override", PROPERTY_HINT_NONE, "suffix:px"), "set_size_2d_override", "get_size_2d_override");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "size_2d_override_stretch"), "set_size_2d_override_stretch", "is_size_2d_override_stretch_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "view_count"), "set_view_count", "get_view_count");
 	ADD_GROUP("Render Target", "render_target_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_target_clear_mode", PROPERTY_HINT_ENUM, "Always,Never,Next Frame"), "set_clear_mode", "get_clear_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_target_update_mode", PROPERTY_HINT_ENUM, "Disabled,Once,When Visible,When Parent Visible,Always"), "set_update_mode", "get_update_mode");
@@ -5813,13 +5598,7 @@ void SubViewport::_validate_property(PropertyInfo &p_property) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-#ifndef XR_DISABLED
-	if (is_using_xr() && (p_property.name == "size" || p_property.name == "size_2d_override" || p_property.name == "size_2d_override_stretch" || p_property.name == "view_count")) {
-		p_property.usage = PROPERTY_USAGE_NONE; // Managed by XR
-	} else if (p_property.name == "size") {
-#else
 	if (p_property.name == "size") {
-#endif
 		SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
 		if (parent_svc && parent_svc->is_stretch_enabled()) {
 			p_property.usage = PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY;
@@ -5830,7 +5609,7 @@ void SubViewport::_validate_property(PropertyInfo &p_property) const {
 }
 
 SubViewport::SubViewport() {
-	RS::get_singleton()->viewport_set_size(get_viewport_rid(), get_size().width, get_size().height, get_view_count());
+	RS::get_singleton()->viewport_set_size(get_viewport_rid(), get_size().width, get_size().height);
 }
 
 /////////////////////////////////
diff --git a/engine/scene/main/viewport.h b/engine/scene/main/viewport.h
index a83dd22c..206631e6 100644
--- a/engine/scene/main/viewport.h
+++ b/engine/scene/main/viewport.h
@@ -32,8 +32,14 @@
 
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
-#include "servers/display/display_server_enums.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/display/display_server.h"
+
+#ifndef _3D_DISABLED
+class Camera3D;
+class CollisionObject3D;
+class AudioListener3D;
+class World3D;
+#endif // _3D_DISABLED
 
 class AudioListener2D;
 class Camera2D;
@@ -46,13 +52,6 @@ class Viewport;
 class Window;
 class World2D;
 
-#ifndef _3D_DISABLED
-class AudioListener3D;
-class Camera3D;
-class CollisionObject3D;
-class World3D;
-#endif // _3D_DISABLED
-
 class ViewportTexture : public Texture2D {
 	GDCLASS(ViewportTexture, Texture2D);
 
@@ -103,7 +102,6 @@ public:
 		SCALING_3D_MODE_FSR2,
 		SCALING_3D_MODE_METALFX_SPATIAL,
 		SCALING_3D_MODE_METALFX_TEMPORAL,
-		SCALING_3D_MODE_NEAREST,
 		SCALING_3D_MODE_MAX
 	};
 
@@ -192,7 +190,6 @@ public:
 		DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR,
 		DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS,
 		DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS,
-		DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_PARENT_NODE,
 		DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_MAX
 	};
 
@@ -200,7 +197,6 @@ public:
 		DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED,
 		DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_ENABLED,
 		DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR,
-		DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_PARENT_NODE,
 		DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MAX,
 	};
 
@@ -258,7 +254,6 @@ private:
 	Transform2D stretch_transform;
 
 	Size2i size = Size2i(512, 512);
-	int view_count = 1;
 	Size2 size_2d_override;
 	bool size_allocated = false;
 
@@ -287,8 +282,6 @@ private:
 
 	bool handle_input_locally = true;
 	bool local_input_handled = false;
-	bool propagate_shortcuts_to_parent = false;
-	bool shortcut_use_focus_owner = true;
 
 	Ref<World2D> world_2d;
 
@@ -424,12 +417,7 @@ private:
 	} gui;
 
 	DefaultCanvasItemTextureFilter default_canvas_item_texture_filter = DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-	mutable RenderingServerEnums::CanvasItemTextureFilter default_canvas_item_texture_filter_cache = RenderingServerEnums::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-	void _refresh_texture_filter_cache() const;
-
 	DefaultCanvasItemTextureRepeat default_canvas_item_texture_repeat = DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
-	mutable RenderingServerEnums::CanvasItemTextureRepeat default_canvas_item_texture_repeat_cache = RenderingServerEnums::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
-	void _refresh_texture_repeat_cache() const;
 
 	bool disable_input = false;
 	bool disable_input_override = false;
@@ -444,7 +432,6 @@ private:
 	void _perform_drop(Control *p_control = nullptr);
 	void _gui_cleanup_internal_state(Ref<InputEvent> p_event);
 
-	void _push_shortcut_input_internal(const Ref<InputEvent> &p_event);
 	void _push_unhandled_input_internal(const Ref<InputEvent> &p_event);
 
 	Ref<InputEvent> _make_input_local(const Ref<InputEvent> &ev);
@@ -515,12 +502,10 @@ private:
 	void _window_start_resize(SubWindowResize p_edge, Window *p_window);
 
 protected:
-	bool _set_size(const Size2i &p_size, const int p_view_count, const Size2 &p_size_2d_override, bool p_allocated);
-	void _check_xr_size();
+	bool _set_size(const Size2i &p_size, const Size2 &p_size_2d_override, bool p_allocated);
 
 	Size2i _get_size() const;
 	Size2 _get_size_2d_override() const;
-	int _get_view_count() const;
 	bool _is_size_allocated() const;
 
 	void _notification(int p_what);
@@ -528,9 +513,6 @@ protected:
 	void _process_picking();
 #endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	static void _bind_methods();
-#ifndef DISABLE_DEPRECATED
-	static void _bind_compatibility_methods();
-#endif
 	void _validate_property(PropertyInfo &p_property) const;
 
 public:
@@ -688,9 +670,6 @@ public:
 	void set_handle_input_locally(bool p_enable);
 	bool is_handling_input_locally() const;
 
-	void set_propagate_shortcuts_to_parent(bool p_enable);
-	bool gui_shortcut_use_focus_owner() const;
-
 	bool gui_is_dragging() const;
 	bool gui_is_drag_successful() const;
 	void gui_cancel_drag();
@@ -707,15 +686,9 @@ public:
 	void set_default_canvas_item_texture_filter(DefaultCanvasItemTextureFilter p_filter);
 	DefaultCanvasItemTextureFilter get_default_canvas_item_texture_filter() const;
 
-	void _update_texture_filter_changed(bool p_propagate);
-	RenderingServerEnums::CanvasItemTextureFilter get_texture_filter_in_tree() const;
-
 	void set_default_canvas_item_texture_repeat(DefaultCanvasItemTextureRepeat p_repeat);
 	DefaultCanvasItemTextureRepeat get_default_canvas_item_texture_repeat() const;
 
-	void _update_texture_repeat_changed(bool p_propagate);
-	RenderingServerEnums::CanvasItemTextureRepeat get_texture_repeat_in_tree() const;
-
 	// VRS
 
 	void set_vrs_mode(VRSMode p_vrs_mode);
@@ -727,7 +700,7 @@ public:
 	void set_vrs_texture(Ref<Texture2D> p_texture);
 	Ref<Texture2D> get_vrs_texture() const;
 
-	virtual DisplayServerEnums::WindowID get_window_id() const = 0;
+	virtual DisplayServer::WindowID get_window_id() const = 0;
 
 	void set_embedding_subwindows(bool p_embed);
 	bool is_embedding_subwindows() const;
@@ -883,11 +856,7 @@ public:
 
 #ifndef XR_DISABLED
 	void set_use_xr(bool p_use_xr);
-	bool is_using_xr() const;
-
-#ifndef DISABLE_DEPRECATED
-	bool _is_using_xr_115799();
-#endif
+	bool is_using_xr();
 #endif // XR_DISABLED
 #endif // _3D_DISABLED
 
@@ -918,11 +887,11 @@ private:
 	ClearMode clear_mode = CLEAR_MODE_ALWAYS;
 	bool size_2d_override_stretch = false;
 
-	void _internal_set_size(const Size2i &p_size, const int p_view_count = 1, bool p_force = false);
+	void _internal_set_size(const Size2i &p_size, bool p_force = false);
 
 protected:
 	static void _bind_methods();
-	virtual DisplayServerEnums::WindowID get_window_id() const override;
+	virtual DisplayServer::WindowID get_window_id() const override;
 	void _notification(int p_what);
 
 public:
@@ -930,9 +899,6 @@ public:
 	Size2i get_size() const;
 	void set_size_force(const Size2i &p_size);
 
-	void set_view_count(const int p_view_count);
-	int get_view_count() const;
-
 	void set_size_2d_override(const Size2i &p_size);
 	Size2i get_size_2d_override() const;
 
diff --git a/engine/scene/main/window.cpp b/engine/scene/main/window.cpp
index 86f69c5a..c8e2f057 100644
--- a/engine/scene/main/window.cpp
+++ b/engine/scene/main/window.cpp
@@ -30,23 +30,11 @@
 
 #include "window.h"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
-#include "core/input/input.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/gui/control.h"
-#include "scene/main/scene_tree.h"
 #include "scene/theme/theme_db.h"
 #include "scene/theme/theme_owner.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
 
 // Editor integration.
 
@@ -204,7 +192,7 @@ void Window::_get_property_list(List<PropertyInfo> *p_list) const {
 				usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 			}
 
-			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_fonts") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static(), usage));
+			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_fonts") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, "Font", usage));
 		}
 	}
 	{
@@ -228,7 +216,7 @@ void Window::_get_property_list(List<PropertyInfo> *p_list) const {
 				usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 			}
 
-			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_icons") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), usage));
+			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_icons") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", usage));
 		}
 	}
 	{
@@ -240,7 +228,7 @@ void Window::_get_property_list(List<PropertyInfo> *p_list) const {
 				usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
 			}
 
-			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_styles") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, StyleBox::get_class_static(), usage));
+			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("theme_override_styles") + String("/") + E, PROPERTY_HINT_RESOURCE_TYPE, "StyleBox", usage));
 		}
 	}
 }
@@ -304,8 +292,8 @@ void Window::_validate_property(PropertyInfo &p_property) const {
 
 //
 
-Window *Window::get_from_id(DisplayServerEnums::WindowID p_window_id) {
-	if (p_window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+Window *Window::get_from_id(DisplayServer::WindowID p_window_id) {
+	if (p_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return nullptr;
 	}
 	return ObjectDB::get_instance<Window>(DisplayServer::get_singleton()->window_get_attached_instance_id(p_window_id));
@@ -357,7 +345,7 @@ void Window::set_current_screen(int p_screen) {
 	ERR_MAIN_THREAD_GUARD;
 
 	current_screen = p_screen;
-	if (window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_current_screen(p_screen, window_id);
@@ -366,7 +354,7 @@ void Window::set_current_screen(int p_screen) {
 int Window::get_current_screen() const {
 	ERR_READ_THREAD_GUARD_V(0);
 
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		current_screen = DisplayServer::get_singleton()->window_get_current_screen(window_id);
 	}
 	return current_screen;
@@ -380,7 +368,7 @@ void Window::set_position(const Point2i &p_position) {
 	if (embedder) {
 		embedder->_sub_window_update(this);
 
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_position(p_position, window_id);
 	}
 }
@@ -436,7 +424,7 @@ void Window::reset_size() {
 
 Point2i Window::get_position_with_decorations() const {
 	ERR_READ_THREAD_GUARD_V(Point2i());
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_get_position_with_decorations(window_id);
 	}
 	if (visible && is_embedded() && !get_flag(Window::FLAG_BORDERLESS)) {
@@ -454,7 +442,7 @@ Point2i Window::get_position_with_decorations() const {
 
 Size2i Window::get_size_with_decorations() const {
 	ERR_READ_THREAD_GUARD_V(Size2i());
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_get_size_with_decorations(window_id);
 	}
 	if (visible && is_embedded() && !get_flag(Window::FLAG_BORDERLESS)) {
@@ -539,14 +527,14 @@ void Window::set_mode(Mode p_mode) {
 	if (embedder) {
 		embedder->_sub_window_update(this);
 
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		DisplayServer::get_singleton()->window_set_mode(DisplayServerEnums::WindowMode(p_mode), window_id);
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+		DisplayServer::get_singleton()->window_set_mode(DisplayServer::WindowMode(p_mode), window_id);
 	}
 }
 
 Window::Mode Window::get_mode() const {
 	ERR_READ_THREAD_GUARD_V(MODE_WINDOWED);
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		mode = (Mode)DisplayServer::get_singleton()->window_get_mode(window_id);
 	}
 	return mode;
@@ -563,9 +551,9 @@ void Window::set_flag(Flags p_flag, bool p_enabled) {
 
 	if (embedder) {
 		embedder->_sub_window_update(this);
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		if (!is_in_edited_scene_root()) {
-			DisplayServer::get_singleton()->window_set_flag(DisplayServerEnums::WindowFlags(p_flag), p_enabled, window_id);
+			DisplayServer::get_singleton()->window_set_flag(DisplayServer::WindowFlags(p_flag), p_enabled, window_id);
 		}
 	}
 }
@@ -573,53 +561,21 @@ void Window::set_flag(Flags p_flag, bool p_enabled) {
 bool Window::get_flag(Flags p_flag) const {
 	ERR_READ_THREAD_GUARD_V(false);
 	ERR_FAIL_INDEX_V(p_flag, FLAG_MAX, false);
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		if (!is_in_edited_scene_root()) {
-			flags[p_flag] = DisplayServer::get_singleton()->window_get_flag(DisplayServerEnums::WindowFlags(p_flag), window_id);
+			flags[p_flag] = DisplayServer::get_singleton()->window_get_flag(DisplayServer::WindowFlags(p_flag), window_id);
 		}
 	}
 	return flags[p_flag];
 }
 
 bool Window::is_popup() const {
-	return (get_flag(Window::FLAG_POPUP) && get_flag(Window::FLAG_NO_FOCUS)) || get_flag(Window::FLAG_MOUSE_PASSTHROUGH);
-}
-
-void Window::set_hdr_output_requested(bool p_requested) {
-	ERR_MAIN_THREAD_GUARD;
-
-	hdr_output_requested = p_requested;
-
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		DisplayServer::get_singleton()->window_request_hdr_output(hdr_output_requested, window_id);
-	}
-
-	_update_viewport_for_hdr_output();
-}
-
-bool Window::is_hdr_output_requested() const {
-	ERR_READ_THREAD_GUARD_V(false);
-
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		hdr_output_requested = DisplayServer::get_singleton()->window_is_hdr_output_requested(window_id);
-	}
-
-	return hdr_output_requested;
-}
-
-float Window::get_output_max_linear_value() const {
-	ERR_READ_THREAD_GUARD_V(1.0f);
-
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		return DisplayServer::get_singleton()->window_get_output_max_linear_value(window_id);
-	}
-
-	return 1.0f;
+	return get_flag(Window::FLAG_POPUP) || get_flag(Window::FLAG_NO_FOCUS);
 }
 
 bool Window::is_maximize_allowed() const {
 	ERR_READ_THREAD_GUARD_V(false);
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_is_maximize_allowed(window_id);
 	}
 	return true;
@@ -627,25 +583,11 @@ bool Window::is_maximize_allowed() const {
 
 void Window::request_attention() {
 	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_request_attention(window_id);
 	}
 }
 
-void Window::set_taskbar_progress_value(float p_value) {
-	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		DisplayServer::get_singleton()->window_set_taskbar_progress_value(p_value, window_id);
-	}
-}
-
-void Window::set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state) {
-	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		DisplayServer::get_singleton()->window_set_taskbar_progress_state(p_state);
-	}
-}
-
 #ifndef DISABLE_DEPRECATED
 void Window::move_to_foreground() {
 	WARN_DEPRECATED_MSG(R"*(The "move_to_foreground()" method is deprecated, use "grab_focus()" instead.)*");
@@ -658,7 +600,7 @@ bool Window::can_draw() const {
 	if (!is_inside_tree()) {
 		return false;
 	}
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_can_draw(window_id);
 	}
 
@@ -667,14 +609,14 @@ bool Window::can_draw() const {
 
 void Window::set_ime_active(bool p_active) {
 	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_ime_active(p_active, window_id);
 	}
 }
 
 void Window::set_ime_position(const Point2i &p_pos) {
 	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_ime_position(p_pos, window_id);
 	}
 }
@@ -694,7 +636,7 @@ bool Window::is_in_edited_scene_root() const {
 }
 
 void Window::_make_window() {
-	ERR_FAIL_COND(window_id != DisplayServerEnums::INVALID_WINDOW_ID);
+	ERR_FAIL_COND(window_id != DisplayServer::INVALID_WINDOW_ID);
 
 	if (transient && transient_to_focused) {
 		_make_transient();
@@ -707,37 +649,36 @@ void Window::_make_window() {
 		}
 	}
 
-	DisplayServerEnums::VSyncMode vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServerEnums::MAIN_WINDOW_ID);
+	DisplayServer::VSyncMode vsync_mode = DisplayServer::get_singleton()->window_get_vsync_mode(DisplayServer::MAIN_WINDOW_ID);
 	Rect2i window_rect;
 	if (initial_position == WINDOW_INITIAL_POSITION_ABSOLUTE) {
 		window_rect = Rect2i(position, size);
 	} else if (initial_position == WINDOW_INITIAL_POSITION_CENTER_PRIMARY_SCREEN) {
-		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServerEnums::SCREEN_PRIMARY) + (DisplayServer::get_singleton()->screen_get_size(DisplayServerEnums::SCREEN_PRIMARY) - size) / 2, size);
+		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServer::SCREEN_PRIMARY) + (DisplayServer::get_singleton()->screen_get_size(DisplayServer::SCREEN_PRIMARY) - size) / 2, size);
 	} else if (initial_position == WINDOW_INITIAL_POSITION_CENTER_MAIN_WINDOW_SCREEN) {
-		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) + (DisplayServer::get_singleton()->screen_get_size(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) - size) / 2, size);
+		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServer::SCREEN_OF_MAIN_WINDOW) + (DisplayServer::get_singleton()->screen_get_size(DisplayServer::SCREEN_OF_MAIN_WINDOW) - size) / 2, size);
 	} else if (initial_position == WINDOW_INITIAL_POSITION_CENTER_OTHER_SCREEN) {
 		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(current_screen) + (DisplayServer::get_singleton()->screen_get_size(current_screen) - size) / 2, size);
 	} else if (initial_position == WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_MOUSE_FOCUS) {
-		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS) + (DisplayServer::get_singleton()->screen_get_size(DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS) - size) / 2, size);
+		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServer::SCREEN_WITH_MOUSE_FOCUS) + (DisplayServer::get_singleton()->screen_get_size(DisplayServer::SCREEN_WITH_MOUSE_FOCUS) - size) / 2, size);
 	} else if (initial_position == WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_KEYBOARD_FOCUS) {
-		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS) + (DisplayServer::get_singleton()->screen_get_size(DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS) - size) / 2, size);
+		window_rect = Rect2i(DisplayServer::get_singleton()->screen_get_position(DisplayServer::SCREEN_WITH_KEYBOARD_FOCUS) + (DisplayServer::get_singleton()->screen_get_size(DisplayServer::SCREEN_WITH_KEYBOARD_FOCUS) - size) / 2, size);
 	}
 
-	window_id = DisplayServer::get_singleton()->create_sub_window(DisplayServerEnums::WindowMode(mode), vsync_mode, f, window_rect, is_in_edited_scene_root() ? false : exclusive, transient_parent ? transient_parent->window_id : DisplayServerEnums::INVALID_WINDOW_ID);
-	ERR_FAIL_COND(window_id == DisplayServerEnums::INVALID_WINDOW_ID);
+	window_id = DisplayServer::get_singleton()->create_sub_window(DisplayServer::WindowMode(mode), vsync_mode, f, window_rect, is_in_edited_scene_root() ? false : exclusive, transient_parent ? transient_parent->window_id : DisplayServer::INVALID_WINDOW_ID);
+	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 	DisplayServer::get_singleton()->window_set_max_size(Size2i(), window_id);
 	DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id);
 	DisplayServer::get_singleton()->window_set_mouse_passthrough(mpath, window_id);
 	DisplayServer::get_singleton()->window_set_title(displayed_title, window_id);
 	DisplayServer::get_singleton()->window_attach_instance_id(get_instance_id(), window_id);
-	DisplayServer::get_singleton()->window_request_hdr_output(hdr_output_requested, window_id);
-	AccessibilityServer::get_singleton()->set_window_callbacks(window_id, callable_mp(this, &Window::_accessibility_activate), callable_mp(this, &Window::_accessibility_deactivate));
+	DisplayServer::get_singleton()->accessibility_set_window_callbacks(window_id, callable_mp(this, &Window::_accessibility_activate), callable_mp(this, &Window::_accessibility_deactivate));
 
 	_update_window_size();
 
 	if (transient_parent) {
 		for (const Window *E : transient_children) {
-			if (E->window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+			if (E->window_id != DisplayServer::INVALID_WINDOW_ID) {
 				DisplayServer::get_singleton()->window_set_transient(E->window_id, transient_parent->window_id);
 			}
 		}
@@ -745,24 +686,24 @@ void Window::_make_window() {
 
 	_update_window_callbacks();
 
-	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_WHEN_VISIBLE);
+	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_VISIBLE);
 	DisplayServer::get_singleton()->show_window(window_id);
 }
 
 void Window::_update_from_window() {
-	ERR_FAIL_COND(window_id == DisplayServerEnums::INVALID_WINDOW_ID);
+	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 	mode = (Mode)DisplayServer::get_singleton()->window_get_mode(window_id);
 	for (int i = 0; i < FLAG_MAX; i++) {
-		flags[i] = DisplayServer::get_singleton()->window_get_flag(DisplayServerEnums::WindowFlags(i), window_id);
+		flags[i] = DisplayServer::get_singleton()->window_get_flag(DisplayServer::WindowFlags(i), window_id);
 	}
 }
 
 void Window::_clear_window() {
-	ERR_FAIL_COND(window_id == DisplayServerEnums::INVALID_WINDOW_ID);
+	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 
 	bool had_focus = has_focus();
 
-	if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS)) {
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
 		float win_scale = DisplayServer::get_singleton()->window_get_scale(window_id);
 
 		Size2i adjusted_size = Size2i(size.width / win_scale, size.height / win_scale);
@@ -771,20 +712,20 @@ void Window::_clear_window() {
 		_rect_changed_callback(Rect2i(adjusted_pos, adjusted_size));
 	}
 
-	if (transient_parent && transient_parent->window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		DisplayServer::get_singleton()->window_set_transient(window_id, DisplayServerEnums::INVALID_WINDOW_ID);
+	if (transient_parent && transient_parent->window_id != DisplayServer::INVALID_WINDOW_ID) {
+		DisplayServer::get_singleton()->window_set_transient(window_id, DisplayServer::INVALID_WINDOW_ID);
 	}
 
 	for (const Window *E : transient_children) {
-		if (E->window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-			DisplayServer::get_singleton()->window_set_transient(E->window_id, DisplayServerEnums::INVALID_WINDOW_ID);
+		if (E->window_id != DisplayServer::INVALID_WINDOW_ID) {
+			DisplayServer::get_singleton()->window_set_transient(E->window_id, DisplayServer::INVALID_WINDOW_ID);
 		}
 	}
 
 	_update_from_window();
 
 	DisplayServer::get_singleton()->delete_sub_window(window_id);
-	window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	window_id = DisplayServer::INVALID_WINDOW_ID;
 
 	// If closing window was focused and has a parent, return focus.
 	if (had_focus && transient_parent) {
@@ -792,7 +733,7 @@ void Window::_clear_window() {
 	}
 
 	_update_viewport_size();
-	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_DISABLED);
+	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 
 	if (transient && transient_to_focused) {
 		_clear_transient();
@@ -814,12 +755,12 @@ void Window::_rect_changed_callback(const Rect2i &p_callback) {
 		size = p_callback.size;
 		_update_viewport_size();
 	}
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID && !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS)) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID && !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
 		Vector2 sz_out = DisplayServer::get_singleton()->window_get_size_with_decorations(window_id);
 		Vector2 pos_out = DisplayServer::get_singleton()->window_get_position_with_decorations(window_id);
 		Vector2 sz_in = DisplayServer::get_singleton()->window_get_size(window_id);
 		Vector2 pos_in = DisplayServer::get_singleton()->window_get_position(window_id);
-		AccessibilityServer::get_singleton()->set_window_rect(window_id, Rect2(pos_out, sz_out), Rect2(pos_in, sz_in));
+		DisplayServer::get_singleton()->accessibility_set_window_rect(window_id, Rect2(pos_out, sz_out), Rect2(pos_in, sz_in));
 	}
 	queue_accessibility_update();
 }
@@ -836,9 +777,9 @@ void Window::_propagate_window_notification(Node *p_node, int p_notification) {
 	}
 }
 
-void Window::_event_callback(DisplayServerEnums::WindowEvent p_event) {
+void Window::_event_callback(DisplayServer::WindowEvent p_event) {
 	switch (p_event) {
-		case DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER: {
+		case DisplayServer::WINDOW_EVENT_MOUSE_ENTER: {
 			if (!is_inside_tree()) {
 				return;
 			}
@@ -850,16 +791,16 @@ void Window::_event_callback(DisplayServerEnums::WindowEvent p_event) {
 #ifdef DEV_ENABLED
 				WARN_PRINT_ONCE("Entering a window while a window is hovered should never happen in DisplayServer.");
 #endif // DEV_ENABLED
-				root->gui.windowmanager_window_over->_event_callback(DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
+				root->gui.windowmanager_window_over->_event_callback(DisplayServer::WINDOW_EVENT_MOUSE_EXIT);
 			}
 			_propagate_window_notification(this, NOTIFICATION_WM_MOUSE_ENTER);
 			root->gui.windowmanager_window_over = this;
 			mouse_in_window = true;
-			if (DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_CURSOR_SHAPE)) {
-				DisplayServer::get_singleton()->cursor_set_shape(DisplayServerEnums::CURSOR_ARROW); //restore cursor shape
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) {
+				DisplayServer::get_singleton()->cursor_set_shape(DisplayServer::CURSOR_ARROW); //restore cursor shape
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT: {
+		case DisplayServer::WINDOW_EVENT_MOUSE_EXIT: {
 			if (!is_inside_tree()) {
 				return;
 			}
@@ -878,7 +819,7 @@ void Window::_event_callback(DisplayServerEnums::WindowEvent p_event) {
 			root->gui.windowmanager_window_over = nullptr;
 			_propagate_window_notification(this, NOTIFICATION_WM_MOUSE_EXIT);
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_FOCUS_IN: {
+		case DisplayServer::WINDOW_EVENT_FOCUS_IN: {
 			focused = true;
 			focused_window = this;
 			_propagate_window_notification(this, NOTIFICATION_WM_WINDOW_FOCUS_IN);
@@ -895,7 +836,7 @@ void Window::_event_callback(DisplayServerEnums::WindowEvent p_event) {
 				}
 			}
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT: {
+		case DisplayServer::WINDOW_EVENT_FOCUS_OUT: {
 			focused = false;
 			if (focused_window == this) {
 				focused_window = nullptr;
@@ -903,32 +844,28 @@ void Window::_event_callback(DisplayServerEnums::WindowEvent p_event) {
 			_propagate_window_notification(this, NOTIFICATION_WM_WINDOW_FOCUS_OUT);
 			emit_signal(SceneStringName(focus_exited));
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST: {
+		case DisplayServer::WINDOW_EVENT_CLOSE_REQUEST: {
 			if (exclusive_child != nullptr) {
 				break; //has an exclusive child, can't get events until child is closed
 			}
 			_propagate_window_notification(this, NOTIFICATION_WM_CLOSE_REQUEST);
 			emit_signal(SNAME("close_requested"));
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_GO_BACK_REQUEST: {
+		case DisplayServer::WINDOW_EVENT_GO_BACK_REQUEST: {
 			_propagate_window_notification(this, NOTIFICATION_WM_GO_BACK_REQUEST);
 			emit_signal(SNAME("go_back_requested"));
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_DPI_CHANGE: {
+		case DisplayServer::WINDOW_EVENT_DPI_CHANGE: {
 			_update_viewport_size();
 			_propagate_window_notification(this, NOTIFICATION_WM_DPI_CHANGE);
 			emit_signal(SNAME("dpi_changed"));
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE: {
+		case DisplayServer::WINDOW_EVENT_TITLEBAR_CHANGE: {
 			emit_signal(SNAME("titlebar_changed"));
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_FORCE_CLOSE: {
+		case DisplayServer::WINDOW_EVENT_FORCE_CLOSE: {
 			hide();
 		} break;
-		case DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED: {
-			_propagate_window_notification(this, NOTIFICATION_WM_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
-			emit_signal(SNAME("output_max_linear_value_changed"), get_output_max_linear_value());
-		} break;
 	}
 }
 
@@ -962,14 +899,14 @@ void Window::hide() {
 void Window::_accessibility_activate() {
 	_accessibility_notify_enter(this);
 	if (!get_embedder()) {
-		AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
+		DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id());
 	}
 }
 
 void Window::_accessibility_deactivate() {
 	_accessibility_notify_exit(this);
 	if (!get_embedder()) {
-		AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
+		DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id());
 	}
 }
 
@@ -1024,10 +961,10 @@ void Window::set_visible(bool p_visible) {
 	Viewport *embedder_vp = get_embedder();
 
 	if (!embedder_vp) {
-		if (!p_visible && window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (!p_visible && window_id != DisplayServer::INVALID_WINDOW_ID) {
 			_clear_window();
 		}
-		if (p_visible && window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+		if (p_visible && window_id == DisplayServer::INVALID_WINDOW_ID) {
 			_make_window();
 		}
 	} else {
@@ -1042,18 +979,11 @@ void Window::set_visible(bool p_visible) {
 				}
 			}
 			embedder->_sub_window_register(this);
-			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
-
-			// Make sure the sub-window shares the HDR output settings of the embedder.
-			Window *containing_window = embedder->get_window();
-			if (containing_window) {
-				hdr_output_requested = containing_window->is_hdr_output_requested();
-				_update_viewport_for_hdr_output();
-			}
+			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
 		} else {
 			embedder->_sub_window_remove(this);
 			embedder = nullptr;
-			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_DISABLED);
+			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 		}
 		_update_window_size();
 	}
@@ -1063,14 +993,14 @@ void Window::set_visible(bool p_visible) {
 			get_tree()->_accessibility_force_update();
 			_accessibility_notify_enter(this);
 			if (!embedder_vp) {
-				AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
+				DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id());
 			}
 		}
 	} else {
 		if (get_tree() && get_tree()->is_accessibility_supported()) {
 			_accessibility_notify_exit(this);
 			if (!embedder_vp) {
-				AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
+				DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id());
 			}
 		}
 		focused = false;
@@ -1098,8 +1028,8 @@ void Window::set_visible(bool p_visible) {
 
 void Window::_clear_transient() {
 	if (transient_parent) {
-		if (transient_parent->window_id != DisplayServerEnums::INVALID_WINDOW_ID && window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-			DisplayServer::get_singleton()->window_set_transient(window_id, DisplayServerEnums::INVALID_WINDOW_ID);
+		if (transient_parent->window_id != DisplayServer::INVALID_WINDOW_ID && window_id != DisplayServer::INVALID_WINDOW_ID) {
+			DisplayServer::get_singleton()->window_set_transient(window_id, DisplayServer::INVALID_WINDOW_ID);
 		}
 		transient_parent->transient_children.erase(this);
 		if (transient_parent->exclusive_child == this) {
@@ -1119,8 +1049,8 @@ void Window::_make_transient() {
 	Window *window = nullptr;
 
 	if (!is_embedded() && transient_to_focused) {
-		DisplayServerEnums::WindowID focused_window_id = DisplayServer::get_singleton()->get_focused_window();
-		if (focused_window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+		DisplayServer::WindowID focused_window_id = DisplayServer::get_singleton()->get_focused_window();
+		if (focused_window_id != DisplayServer::INVALID_WINDOW_ID) {
 			window = Window::get_from_id(focused_window_id);
 		}
 	}
@@ -1147,7 +1077,7 @@ void Window::_make_transient() {
 	}
 
 	//see if we can make transient
-	if (transient_parent->window_id != DisplayServerEnums::INVALID_WINDOW_ID && window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (transient_parent->window_id != DisplayServer::INVALID_WINDOW_ID && window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_transient(window_id, transient_parent->window_id);
 	}
 }
@@ -1215,7 +1145,7 @@ void Window::set_exclusive(bool p_exclusive) {
 
 	exclusive = p_exclusive;
 
-	if (!embedder && window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (!embedder && window_id != DisplayServer::INVALID_WINDOW_ID) {
 		if (is_in_edited_scene_root()) {
 			DisplayServer::get_singleton()->window_set_exclusive(window_id, false);
 		} else {
@@ -1252,7 +1182,7 @@ Size2i Window::_clamp_window_size(const Size2i &p_size) {
 
 void Window::_update_window_size() {
 	Size2i size_limit = get_clamped_minimum_size();
-	if (!embedder && window_id != DisplayServerEnums::INVALID_WINDOW_ID && keep_title_visible) {
+	if (!embedder && window_id != DisplayServer::INVALID_WINDOW_ID && keep_title_visible) {
 		Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(displayed_title, window_id);
 		size_limit = size_limit.max(title_size);
 	}
@@ -1279,9 +1209,9 @@ void Window::_update_window_size() {
 		size = size.maxi(1);
 
 		embedder->_sub_window_update(this);
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		// When main window embedded in the editor, we can't resize the main window.
-		if (window_id != DisplayServerEnums::MAIN_WINDOW_ID || !Engine::get_singleton()->is_embedded_in_editor()) {
+		if (window_id != DisplayServer::MAIN_WINDOW_ID || !Engine::get_singleton()->is_embedded_in_editor()) {
 			if (reset_min_first && wrap_controls) {
 				// Avoid an error if setting max_size to a value between min_size and the previous size_limit.
 				DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id);
@@ -1302,13 +1232,6 @@ void Window::_update_window_size() {
 void Window::_update_viewport_size() {
 	//update the viewport part
 
-#ifndef XR_DISABLED
-	// If `use_xr` set, we should skip this logic.
-	if (is_using_xr()) {
-		return;
-	}
-#endif // XR_DISABLED
-
 	Size2i final_size;
 	Size2 final_size_override;
 	Rect2i attach_to_screen_rect(Point2i(), size);
@@ -1425,13 +1348,13 @@ void Window::_update_viewport_size() {
 		}
 	}
 
-	bool allocate = is_inside_tree() && visible && (window_id != DisplayServerEnums::INVALID_WINDOW_ID || embedder != nullptr);
-	_set_size(final_size, 1, final_size_override, allocate);
+	bool allocate = is_inside_tree() && visible && (window_id != DisplayServer::INVALID_WINDOW_ID || embedder != nullptr);
+	_set_size(final_size, final_size_override, allocate);
 
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		RenderingServer::get_singleton()->viewport_attach_to_screen(get_viewport_rid(), attach_to_screen_rect, window_id);
 	} else if (!is_embedded()) {
-		RenderingServer::get_singleton()->viewport_attach_to_screen(get_viewport_rid(), Rect2i(), DisplayServerEnums::INVALID_WINDOW_ID);
+		RenderingServer::get_singleton()->viewport_attach_to_screen(get_viewport_rid(), Rect2i(), DisplayServer::INVALID_WINDOW_ID);
 	}
 
 	notification(NOTIFICATION_WM_SIZE_CHANGED);
@@ -1441,7 +1364,7 @@ void Window::_update_viewport_size() {
 		Viewport::set_oversampling_override(scale);
 		Size2 s = Size2(final_size.width * scale, final_size.height * scale).ceil();
 		RS::get_singleton()->viewport_set_global_canvas_transform(get_viewport_rid(), global_canvas_transform * scale * content_scale_factor);
-		RS::get_singleton()->viewport_set_size(get_viewport_rid(), s.width, s.height, 1);
+		RS::get_singleton()->viewport_set_size(get_viewport_rid(), s.width, s.height);
 		embedder->_sub_window_update(this);
 	}
 }
@@ -1461,7 +1384,7 @@ void Window::set_force_native(bool p_force_native) {
 	if (is_visible() && !is_in_edited_scene_root()) {
 		ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");
 	}
-	if (window_id == DisplayServerEnums::MAIN_WINDOW_ID) {
+	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
 		return;
 	}
 	force_native = p_force_native;
@@ -1476,7 +1399,7 @@ bool Window::get_force_native() const {
 
 Viewport *Window::get_embedder() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
-	if (force_native && DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS) && !is_in_edited_scene_root()) {
+	if (force_native && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS) && !is_in_edited_scene_root()) {
 		return nullptr;
 	}
 
@@ -1502,15 +1425,15 @@ RID Window::get_accessibility_element() const {
 	}
 	if (get_embedder() || is_popup()) {
 		return Node::get_accessibility_element();
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-		return AccessibilityServer::get_singleton()->get_window_root(window_id);
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+		return DisplayServer::get_singleton()->accessibility_get_window_root(window_id);
 	} else {
 		return RID();
 	}
 }
 
 RID Window::get_focused_accessibility_element() const {
-	if (window_id == DisplayServerEnums::MAIN_WINDOW_ID) {
+	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
 		if (get_child_count() > 0) {
 			return get_child(0)->get_focused_accessibility_element(); // Try scene tree root node.
 		}
@@ -1518,45 +1441,16 @@ RID Window::get_focused_accessibility_element() const {
 	return Node::get_focused_accessibility_element();
 }
 
-String Window::_get_accessibility_name() const {
-	if (accessibility_name.is_empty()) {
-		return displayed_title;
-	} else {
-		return accessibility_name;
-	}
-}
-
-PackedStringArray Window::get_accessibility_configuration_warnings() const {
-	ERR_READ_THREAD_GUARD_V(PackedStringArray());
-	PackedStringArray warnings = Node::get_accessibility_configuration_warnings();
-
-	String ac_name = _get_accessibility_name().strip_edges();
-	if (ac_name.is_empty()) {
-		warnings.push_back(RTR("Accessibility Name must not be empty, or contain only spaces."));
-	}
-	if (ac_name.contains(get_class_name())) {
-		warnings.push_back(RTR("Accessibility Name must not include Node class name."));
-	}
-	for (int i = 0; i < ac_name.length(); i++) {
-		if (is_control(ac_name[i])) {
-			warnings.push_back(RTR("Accessibility Name must not include control character."));
-			break;
-		}
-	}
-
-	return warnings;
-}
-
 void Window::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
 	switch (p_what) {
 		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
 			if (accessibility_title_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(accessibility_title_element);
+				DisplayServer::get_singleton()->accessibility_free_element(accessibility_title_element);
 				accessibility_title_element = RID();
 			}
 			if (accessibility_announcement_element.is_valid()) {
-				AccessibilityServer::get_singleton()->free_element(accessibility_announcement_element);
+				DisplayServer::get_singleton()->accessibility_free_element(accessibility_announcement_element);
 				accessibility_announcement_element = RID();
 			}
 		} break;
@@ -1565,18 +1459,22 @@ void Window::_notification(int p_what) {
 			RID ae = get_accessibility_element();
 			ERR_FAIL_COND(ae.is_null());
 
-			AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_WINDOW);
-			AccessibilityServer::get_singleton()->update_set_name(ae, _get_accessibility_name());
-			AccessibilityServer::get_singleton()->update_set_description(ae, accessibility_description);
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_MODAL, exclusive);
-			AccessibilityServer::get_singleton()->update_add_action(ae, AccessibilityServerEnums::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Window::_accessibility_action_grab_focus));
-			AccessibilityServer::get_singleton()->update_set_flag(ae, AccessibilityServerEnums::AccessibilityFlags::FLAG_HIDDEN, !visible);
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_WINDOW);
+			if (accessibility_name.is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, displayed_title);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, accessibility_name);
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_description(ae, accessibility_description);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MODAL, exclusive);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Window::_accessibility_action_grab_focus));
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !visible);
 
 			if (get_embedder() || is_popup()) {
 				Control *parent_ctrl = Object::cast_to<Control>(get_parent());
 				Transform2D parent_tr = parent_ctrl ? parent_ctrl->get_global_transform() : Transform2D();
 				Transform2D tr;
-				if (window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+				if (window_id == DisplayServer::INVALID_WINDOW_ID) {
 					tr.set_origin(position);
 				} else {
 					Window *np = get_non_popup_window();
@@ -1584,33 +1482,33 @@ void Window::_notification(int p_what) {
 						tr.set_origin(get_position() - np->get_position());
 					}
 				}
-				AccessibilityServer::get_singleton()->update_set_transform(ae, parent_tr.affine_inverse() * tr);
-				AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Point2(), size));
+				DisplayServer::get_singleton()->accessibility_update_set_transform(ae, parent_tr.affine_inverse() * tr);
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Point2(), size));
 
 				if (accessibility_title_element.is_null()) {
-					accessibility_title_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_TITLE_BAR);
+					accessibility_title_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TITLE_BAR);
 				}
 
 				int w = get_theme_constant(SNAME("title_height"));
-				AccessibilityServer::get_singleton()->update_set_name(accessibility_title_element, displayed_title);
-				AccessibilityServer::get_singleton()->update_set_bounds(accessibility_title_element, Rect2(Vector2(0, -w), Size2(size.x, w)));
+				DisplayServer::get_singleton()->accessibility_update_set_name(accessibility_title_element, displayed_title);
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_title_element, Rect2(Vector2(0, -w), Size2(size.x, w)));
 			} else {
-				AccessibilityServer::get_singleton()->update_set_transform(ae, get_final_transform());
+				DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_final_transform());
 				if (_get_size_2d_override() != Size2()) {
-					AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Point2(), _get_size_2d_override()));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Point2(), _get_size_2d_override()));
 				} else {
-					AccessibilityServer::get_singleton()->update_set_bounds(ae, Rect2(Point2(), _get_size()));
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Point2(), _get_size()));
 				}
 
 				if (accessibility_announcement_element.is_null()) {
-					accessibility_announcement_element = AccessibilityServer::get_singleton()->create_sub_element(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_STATIC_TEXT);
+					accessibility_announcement_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
 				}
 
 				if (announcement.is_empty()) {
-					AccessibilityServer::get_singleton()->update_set_live(accessibility_announcement_element, AccessibilityServerEnums::AccessibilityLiveMode::LIVE_OFF);
+					DisplayServer::get_singleton()->accessibility_update_set_live(accessibility_announcement_element, DisplayServer::LIVE_OFF);
 				} else {
-					AccessibilityServer::get_singleton()->update_set_name(accessibility_announcement_element, announcement);
-					AccessibilityServer::get_singleton()->update_set_live(accessibility_announcement_element, AccessibilityServerEnums::AccessibilityLiveMode::LIVE_ASSERTIVE);
+					DisplayServer::get_singleton()->accessibility_update_set_name(accessibility_announcement_element, announcement);
+					DisplayServer::get_singleton()->accessibility_update_set_live(accessibility_announcement_element, DisplayServer::LIVE_ASSERTIVE);
 				}
 			}
 		} break;
@@ -1663,7 +1561,7 @@ void Window::_notification(int p_what) {
 						}
 					}
 					embedder->_sub_window_register(this);
-					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
+					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
 					_update_window_size();
 				}
 
@@ -1671,10 +1569,10 @@ void Window::_notification(int p_what) {
 				if (!get_parent()) {
 					// It's the root window!
 					visible = true; // Always visible.
-					window_id = DisplayServerEnums::MAIN_WINDOW_ID;
+					window_id = DisplayServer::MAIN_WINDOW_ID;
 					focused_window = this;
 					DisplayServer::get_singleton()->window_attach_instance_id(get_instance_id(), window_id);
-					AccessibilityServer::get_singleton()->set_window_callbacks(window_id, callable_mp(this, &Window::_accessibility_activate), callable_mp(this, &Window::_accessibility_deactivate));
+					DisplayServer::get_singleton()->accessibility_set_window_callbacks(window_id, callable_mp(this, &Window::_accessibility_activate), callable_mp(this, &Window::_accessibility_deactivate));
 					_update_from_window();
 					// Since this window already exists (created on start), we must update pos and size from it.
 					{
@@ -1682,20 +1580,15 @@ void Window::_notification(int p_what) {
 						size = DisplayServer::get_singleton()->window_get_size(window_id);
 						focused = DisplayServer::get_singleton()->window_is_focused(window_id);
 					}
-					// Update HDR settings to reflect the current state of the window.
-					{
-						hdr_output_requested = DisplayServer::get_singleton()->window_is_hdr_output_requested(window_id);
-						_update_viewport_for_hdr_output();
-					}
 					_update_window_size(); // Inform DisplayServer of minimum and maximum size.
 					_update_viewport_size(); // Then feed back to the viewport.
 					_update_window_callbacks();
 					// Simulate mouse-enter event when mouse is over the window, since OS event might arrive before setting callbacks.
 					if (!mouse_in_window && Rect2(position, size).has_point(DisplayServer::get_singleton()->mouse_get_position())) {
-						_event_callback(DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
+						_event_callback(DisplayServer::WINDOW_EVENT_MOUSE_ENTER);
 					}
-					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_WHEN_VISIBLE);
-					if (DisplayServer::get_singleton()->window_get_flag(DisplayServerEnums::WindowFlags(FLAG_TRANSPARENT), window_id)) {
+					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_VISIBLE);
+					if (DisplayServer::get_singleton()->window_get_flag(DisplayServer::WindowFlags(FLAG_TRANSPARENT), window_id)) {
 						set_transparent_background(true);
 					}
 				} else {
@@ -1710,11 +1603,11 @@ void Window::_notification(int p_what) {
 				_make_transient();
 			}
 			if (visible) {
-				if (window_id != DisplayServerEnums::MAIN_WINDOW_ID && get_tree() && get_tree()->is_accessibility_supported()) {
+				if (window_id != DisplayServer::MAIN_WINDOW_ID && get_tree() && get_tree()->is_accessibility_supported()) {
 					get_tree()->_accessibility_force_update();
 					_accessibility_notify_enter(this);
 					if (!embedder) {
-						AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
+						DisplayServer::get_singleton()->accessibility_window_activation_completed(get_window_id());
 					}
 				}
 				notification(NOTIFICATION_VISIBILITY_CHANGED);
@@ -1767,11 +1660,11 @@ void Window::_notification(int p_what) {
 
 			set_theme_context(nullptr, false);
 
-			if (visible && window_id != DisplayServerEnums::MAIN_WINDOW_ID) {
+			if (visible && window_id != DisplayServer::MAIN_WINDOW_ID) {
 				if (get_tree() && get_tree()->is_accessibility_supported()) {
 					_accessibility_notify_exit(this);
 					if (!embedder) {
-						AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
+						DisplayServer::get_singleton()->accessibility_window_deactivation_completed(get_window_id());
 					}
 					if (get_parent()) {
 						get_parent()->queue_accessibility_update();
@@ -1789,9 +1682,9 @@ void Window::_notification(int p_what) {
 				_clear_transient();
 			}
 
-			if (!is_embedded() && window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
-				if (window_id == DisplayServerEnums::MAIN_WINDOW_ID) {
-					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_DISABLED);
+			if (!is_embedded() && window_id != DisplayServer::INVALID_WINDOW_ID) {
+				if (window_id == DisplayServer::MAIN_WINDOW_ID) {
+					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 					_update_window_callbacks();
 				} else {
 					_clear_window();
@@ -1800,7 +1693,7 @@ void Window::_notification(int p_what) {
 				if (embedder) {
 					embedder->_sub_window_remove(this);
 					embedder = nullptr;
-					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_DISABLED);
+					RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 				}
 				_update_viewport_size(); //called by clear and make, which does not happen here
 			}
@@ -1867,7 +1760,7 @@ void Window::set_keep_title_visible(bool p_title_visible) {
 		return;
 	}
 	keep_title_visible = p_title_visible;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		_update_window_size();
 	}
 }
@@ -1897,12 +1790,12 @@ Rect2i Window::get_nonclient_area() const {
 	return nonclient_area;
 }
 
-DisplayServerEnums::WindowID Window::get_window_id() const {
-	ERR_READ_THREAD_GUARD_V(DisplayServerEnums::INVALID_WINDOW_ID);
+DisplayServer::WindowID Window::get_window_id() const {
+	ERR_READ_THREAD_GUARD_V(DisplayServer::INVALID_WINDOW_ID);
 	if (get_embedder()) {
 #ifdef TOOLS_ENABLED
 		if (is_part_of_edited_scene()) {
-			return DisplayServerEnums::MAIN_WINDOW_ID;
+			return DisplayServer::MAIN_WINDOW_ID;
 		}
 #endif
 		return parent->get_window_id();
@@ -1913,7 +1806,7 @@ DisplayServerEnums::WindowID Window::get_window_id() const {
 void Window::set_mouse_passthrough_polygon(const Vector<Vector2> &p_region) {
 	ERR_MAIN_THREAD_GUARD;
 	mpath = p_region;
-	if (window_id == DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 	DisplayServer::get_singleton()->window_set_mouse_passthrough(mpath, window_id);
@@ -1969,16 +1862,6 @@ void Window::child_controls_changed() {
 	callable_mp(this, &Window::_update_child_controls).call_deferred();
 }
 
-void Window::_update_viewport_for_hdr_output() {
-	// If HDR output is enabled, we need to enable HDR 2D rendering as well.
-	// This is required to get the correct dynamic range for the final output.
-	// We only need to do this if the viewport is not already set up for HDR 2D rendering.
-
-	if (!is_using_hdr_2d()) {
-		RS::get_singleton()->viewport_set_use_hdr_2d(viewport, hdr_output_requested);
-	}
-}
-
 void Window::_update_child_controls() {
 	if (!updating_child_controls) {
 		return;
@@ -2068,7 +1951,7 @@ Window *Window::get_parent_visible_window() const {
 void Window::popup_on_parent(const Rect2i &p_parent_rect) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_COND(!is_inside_tree());
-	ERR_FAIL_COND_MSG(window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Can't popup the main window.");
+	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
 	if (!is_embedded()) {
 		Window *window = get_parent_visible_window();
@@ -2086,7 +1969,7 @@ void Window::popup_on_parent(const Rect2i &p_parent_rect) {
 void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_COND(!is_inside_tree());
-	ERR_FAIL_COND_MSG(window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Can't popup the main window.");
+	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
 	// Consider the current size when calling with the default value.
 	Size2i expected_size = p_size == Size2i() ? size : p_size;
@@ -2096,7 +1979,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio
 	if (is_embedded()) {
 		parent_rect = get_embedder()->get_visible_rect();
 	} else {
-		DisplayServerEnums::WindowID parent_id = get_parent_visible_window()->get_window_id();
+		DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id();
 		int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id);
 		parent_rect.position = DisplayServer::get_singleton()->screen_get_position(parent_screen);
 		parent_rect.size = DisplayServer::get_singleton()->screen_get_size(parent_screen);
@@ -2128,7 +2011,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio
 void Window::popup_centered(const Size2i &p_minsize) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_COND(!is_inside_tree());
-	ERR_FAIL_COND_MSG(window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Can't popup the main window.");
+	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 
 	// Consider the current size when calling with the default value.
 	Size2i expected_size = p_minsize == Size2i() ? size : p_minsize;
@@ -2138,7 +2021,7 @@ void Window::popup_centered(const Size2i &p_minsize) {
 	if (is_embedded()) {
 		parent_rect = get_embedder()->get_visible_rect();
 	} else {
-		DisplayServerEnums::WindowID parent_id = get_parent_visible_window()->get_window_id();
+		DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id();
 		int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id);
 		parent_rect.position = DisplayServer::get_singleton()->screen_get_position(parent_screen);
 		parent_rect.size = DisplayServer::get_singleton()->screen_get_size(parent_screen);
@@ -2167,7 +2050,7 @@ void Window::popup_centered(const Size2i &p_minsize) {
 void Window::popup_centered_ratio(float p_ratio) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_COND(!is_inside_tree());
-	ERR_FAIL_COND_MSG(window_id == DisplayServerEnums::MAIN_WINDOW_ID, "Can't popup the main window.");
+	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
 	ERR_FAIL_COND_MSG(p_ratio <= 0.0 || p_ratio > 1.0, "Ratio must be between 0.0 and 1.0!");
 
 	Rect2 parent_rect;
@@ -2175,7 +2058,7 @@ void Window::popup_centered_ratio(float p_ratio) {
 	if (is_embedded()) {
 		parent_rect = get_embedder()->get_visible_rect();
 	} else {
-		DisplayServerEnums::WindowID parent_id = get_parent_visible_window()->get_window_id();
+		DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id();
 		int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id);
 		parent_rect.position = DisplayServer::get_singleton()->screen_get_position(parent_screen);
 		parent_rect.size = DisplayServer::get_singleton()->screen_get_size(parent_screen);
@@ -2230,7 +2113,7 @@ void Window::_popup_base(const Rect2i &p_screen_rect) {
 	// Update window size to calculate the actual window size based on contents minimum size and minimum size.
 	_update_window_size();
 
-	bool should_fit = is_embedded() || !DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS);
+	bool should_fit = is_embedded() || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS);
 
 	if (p_screen_rect != Rect2i()) {
 		set_position(p_screen_rect.position);
@@ -2371,14 +2254,14 @@ void Window::grab_focus() {
 	ERR_MAIN_THREAD_GUARD;
 	if (embedder) {
 		embedder->_sub_window_grab_focus(this);
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_move_to_foreground(window_id);
 	}
 }
 
 bool Window::has_focus() const {
 	ERR_READ_THREAD_GUARD_V(false);
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_is_focused(window_id);
 	}
 	return focused;
@@ -2386,7 +2269,7 @@ bool Window::has_focus() const {
 
 bool Window::has_focus_or_active_popup() const {
 	ERR_READ_THREAD_GUARD_V(false);
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		return DisplayServer::get_singleton()->window_is_focused(window_id) || (DisplayServer::get_singleton()->window_get_active_popup() == window_id);
 	}
 	return focused;
@@ -2394,44 +2277,44 @@ bool Window::has_focus_or_active_popup() const {
 
 void Window::start_drag() {
 	ERR_MAIN_THREAD_GUARD;
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_start_drag(window_id);
 	} else if (embedder) {
 		embedder->_window_start_drag(this);
 	}
 }
 
-void Window::start_resize(DisplayServerEnums::WindowResizeEdge p_edge) {
+void Window::start_resize(DisplayServer::WindowResizeEdge p_edge) {
 	ERR_MAIN_THREAD_GUARD;
 	if (get_flag(FLAG_RESIZE_DISABLED)) {
 		return;
 	}
-	if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_start_resize(p_edge, window_id);
 	} else if (embedder) {
 		switch (p_edge) {
-			case DisplayServerEnums::WINDOW_EDGE_TOP_LEFT: {
+			case DisplayServer::WINDOW_EDGE_TOP_LEFT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_TOP_LEFT, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP: {
+			case DisplayServer::WINDOW_EDGE_TOP: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_TOP, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_TOP_RIGHT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_TOP_RIGHT, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_LEFT: {
+			case DisplayServer::WINDOW_EDGE_LEFT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_LEFT, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_RIGHT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_RIGHT, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_LEFT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_BOTTOM_LEFT, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_BOTTOM, this);
 			} break;
-			case DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT: {
+			case DisplayServer::WINDOW_EDGE_BOTTOM_RIGHT: {
 				embedder->_window_start_resize(Viewport::SUB_WINDOW_RESIZE_BOTTOM_RIGHT, this);
 			} break;
 			default:
@@ -3241,7 +3124,7 @@ Transform2D Window::get_screen_transform_internal(bool p_absolute_position) cons
 
 Transform2D Window::get_popup_base_transform_native() const {
 	ERR_READ_THREAD_GUARD_V(Transform2D());
-	if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS)) {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) {
 		return Transform2D();
 	}
 	Transform2D popup_base_transform;
@@ -3319,7 +3202,7 @@ void Window::_update_displayed_title() {
 	displayed_title = atr(title);
 
 #ifdef DEBUG_ENABLED
-	if (window_id == DisplayServerEnums::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
+	if (window_id == DisplayServer::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
 		// Append a suffix to the window title to denote that the project is running
 		// from a debug build (including the editor, excluding the project manager).
 		// Since this results in lower performance, this should be clearly presented
@@ -3330,7 +3213,7 @@ void Window::_update_displayed_title() {
 
 	if (embedder) {
 		embedder->_sub_window_update(this);
-	} else if (window_id != DisplayServerEnums::INVALID_WINDOW_ID) {
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_title(displayed_title, window_id);
 		if (keep_title_visible) {
 			Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(displayed_title, window_id);
@@ -3342,13 +3225,12 @@ void Window::_update_displayed_title() {
 	}
 
 #ifdef DEBUG_ENABLED
-	if (EngineDebugger::get_singleton() && window_id == DisplayServerEnums::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
+	if (EngineDebugger::get_singleton() && window_id == DisplayServer::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
 		Array arr = { displayed_title };
 		EngineDebugger::get_singleton()->send_message("window:title", arr);
 	}
 #endif
 
-	update_configuration_warnings();
 	queue_accessibility_update();
 }
 
@@ -3385,16 +3267,10 @@ void Window::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_flag", "flag", "enabled"), &Window::set_flag);
 	ClassDB::bind_method(D_METHOD("get_flag", "flag"), &Window::get_flag);
 
-	ClassDB::bind_method(D_METHOD("set_hdr_output_requested", "requested"), &Window::set_hdr_output_requested);
-	ClassDB::bind_method(D_METHOD("is_hdr_output_requested"), &Window::is_hdr_output_requested);
-	ClassDB::bind_method(D_METHOD("get_output_max_linear_value"), &Window::get_output_max_linear_value);
-
 	ClassDB::bind_method(D_METHOD("is_maximize_allowed"), &Window::is_maximize_allowed);
 
 	ClassDB::bind_method(D_METHOD("request_attention"), &Window::request_attention);
 
-	ClassDB::bind_method(D_METHOD("set_taskbar_progress_value", "value"), &Window::set_taskbar_progress_value);
-	ClassDB::bind_method(D_METHOD("set_taskbar_progress_state", "state"), &Window::set_taskbar_progress_state);
 #ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("move_to_foreground"), &Window::move_to_foreground);
 #endif // DISABLE_DEPRECATED
@@ -3589,9 +3465,6 @@ void Window::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "content_scale_stretch", PROPERTY_HINT_ENUM, "Fractional,Integer"), "set_content_scale_stretch", "get_content_scale_stretch");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "content_scale_factor", PROPERTY_HINT_RANGE, "0.5,8.0,0.01"), "set_content_scale_factor", "get_content_scale_factor");
 
-	ADD_GROUP("HDR Output", "hdr_output_");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hdr_output_requested"), "set_hdr_output_requested", "is_hdr_output_requested");
-
 #ifndef DISABLE_DEPRECATED
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_translate", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_auto_translate", "is_auto_translating");
 #endif
@@ -3601,11 +3474,11 @@ void Window::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "accessibility_description"), "set_accessibility_description", "get_accessibility_description");
 
 	ADD_GROUP("Theme", "theme_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, Theme::get_class_static()), "set_theme", "get_theme");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), "set_theme", "get_theme");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "theme_type_variation", PROPERTY_HINT_ENUM_SUGGESTION), "set_theme_type_variation", "get_theme_type_variation");
 
-	ADD_SIGNAL(MethodInfo("window_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, InputEvent::get_class_static())));
-	ADD_SIGNAL(MethodInfo("nonclient_window_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, InputEvent::get_class_static())));
+	ADD_SIGNAL(MethodInfo("window_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));
+	ADD_SIGNAL(MethodInfo("nonclient_window_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));
 	ADD_SIGNAL(MethodInfo("files_dropped", PropertyInfo(Variant::PACKED_STRING_ARRAY, "files")));
 	ADD_SIGNAL(MethodInfo("mouse_entered"));
 	ADD_SIGNAL(MethodInfo("mouse_exited"));
@@ -3619,7 +3492,6 @@ void Window::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("dpi_changed"));
 	ADD_SIGNAL(MethodInfo("titlebar_changed"));
 	ADD_SIGNAL(MethodInfo("title_changed"));
-	ADD_SIGNAL(MethodInfo("output_max_linear_value_changed", PropertyInfo(Variant::FLOAT, "output_max_linear_value")));
 
 	BIND_CONSTANT(NOTIFICATION_VISIBILITY_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_THEME_CHANGED);
@@ -3703,7 +3575,7 @@ Window::Window() {
 	}
 
 	theme_owner = memnew(ThemeOwner(this));
-	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RSE::VIEWPORT_UPDATE_DISABLED);
+	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 }
 
 Window::~Window() {
diff --git a/engine/scene/main/window.h b/engine/scene/main/window.h
index 34a4ebe7..124c8bcc 100644
--- a/engine/scene/main/window.h
+++ b/engine/scene/main/window.h
@@ -32,9 +32,10 @@
 
 #include "scene/main/viewport.h"
 #include "scene/resources/theme.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 
 class Font;
+class Shortcut;
 class StyleBox;
 class ThemeOwner;
 class ThemeContext;
@@ -45,28 +46,28 @@ class Window : public Viewport {
 public:
 	// Keep synced with enum hint for `mode` property.
 	enum Mode {
-		MODE_WINDOWED = DisplayServerEnums::WINDOW_MODE_WINDOWED,
-		MODE_MINIMIZED = DisplayServerEnums::WINDOW_MODE_MINIMIZED,
-		MODE_MAXIMIZED = DisplayServerEnums::WINDOW_MODE_MAXIMIZED,
-		MODE_FULLSCREEN = DisplayServerEnums::WINDOW_MODE_FULLSCREEN,
-		MODE_EXCLUSIVE_FULLSCREEN = DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN,
+		MODE_WINDOWED = DisplayServer::WINDOW_MODE_WINDOWED,
+		MODE_MINIMIZED = DisplayServer::WINDOW_MODE_MINIMIZED,
+		MODE_MAXIMIZED = DisplayServer::WINDOW_MODE_MAXIMIZED,
+		MODE_FULLSCREEN = DisplayServer::WINDOW_MODE_FULLSCREEN,
+		MODE_EXCLUSIVE_FULLSCREEN = DisplayServer::WINDOW_MODE_EXCLUSIVE_FULLSCREEN,
 	};
 
 	enum Flags {
-		FLAG_RESIZE_DISABLED = DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED,
-		FLAG_BORDERLESS = DisplayServerEnums::WINDOW_FLAG_BORDERLESS,
-		FLAG_ALWAYS_ON_TOP = DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP,
-		FLAG_TRANSPARENT = DisplayServerEnums::WINDOW_FLAG_TRANSPARENT,
-		FLAG_NO_FOCUS = DisplayServerEnums::WINDOW_FLAG_NO_FOCUS,
-		FLAG_POPUP = DisplayServerEnums::WINDOW_FLAG_POPUP,
-		FLAG_EXTEND_TO_TITLE = DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE,
-		FLAG_MOUSE_PASSTHROUGH = DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH,
-		FLAG_SHARP_CORNERS = DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS,
-		FLAG_EXCLUDE_FROM_CAPTURE = DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
-		FLAG_POPUP_WM_HINT = DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT,
-		FLAG_MINIMIZE_DISABLED = DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED,
-		FLAG_MAXIMIZE_DISABLED = DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED,
-		FLAG_MAX = DisplayServerEnums::WINDOW_FLAG_MAX,
+		FLAG_RESIZE_DISABLED = DisplayServer::WINDOW_FLAG_RESIZE_DISABLED,
+		FLAG_BORDERLESS = DisplayServer::WINDOW_FLAG_BORDERLESS,
+		FLAG_ALWAYS_ON_TOP = DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP,
+		FLAG_TRANSPARENT = DisplayServer::WINDOW_FLAG_TRANSPARENT,
+		FLAG_NO_FOCUS = DisplayServer::WINDOW_FLAG_NO_FOCUS,
+		FLAG_POPUP = DisplayServer::WINDOW_FLAG_POPUP,
+		FLAG_EXTEND_TO_TITLE = DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE,
+		FLAG_MOUSE_PASSTHROUGH = DisplayServer::WINDOW_FLAG_MOUSE_PASSTHROUGH,
+		FLAG_SHARP_CORNERS = DisplayServer::WINDOW_FLAG_SHARP_CORNERS,
+		FLAG_EXCLUDE_FROM_CAPTURE = DisplayServer::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
+		FLAG_POPUP_WM_HINT = DisplayServer::WINDOW_FLAG_POPUP_WM_HINT,
+		FLAG_MINIMIZE_DISABLED = DisplayServer::WINDOW_FLAG_MINIMIZE_DISABLED,
+		FLAG_MAXIMIZE_DISABLED = DisplayServer::WINDOW_FLAG_MAXIMIZE_DISABLED,
+		FLAG_MAX = DisplayServer::WINDOW_FLAG_MAX,
 	};
 
 	enum ContentScaleMode {
@@ -115,7 +116,7 @@ public:
 	};
 
 private:
-	DisplayServerEnums::WindowID window_id = DisplayServerEnums::INVALID_WINDOW_ID;
+	DisplayServer::WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
 	bool initialized = false;
 
 	String title;
@@ -133,10 +134,6 @@ private:
 	WindowInitialPosition initial_position = WINDOW_INITIAL_POSITION_ABSOLUTE;
 	bool force_native = false;
 
-	mutable bool hdr_output_requested = false;
-
-	void _update_viewport_for_hdr_output();
-
 	bool transient = false;
 	bool transient_to_focused = false;
 	bool exclusive = false;
@@ -253,7 +250,7 @@ private:
 	void _window_input_text(const String &p_text, bool p_emit_signal = false);
 	void _window_drop_files(const Vector<String> &p_files);
 	void _rect_changed_callback(const Rect2i &p_callback);
-	void _event_callback(DisplayServerEnums::WindowEvent p_event);
+	void _event_callback(DisplayServer::WindowEvent p_event);
 	virtual bool _can_consume_input_events() const override;
 
 	bool mouse_in_window = false;
@@ -288,8 +285,6 @@ protected:
 	virtual void add_child_notify(Node *p_child) override;
 	virtual void remove_child_notify(Node *p_child) override;
 
-	virtual String _get_accessibility_name() const;
-
 	GDVIRTUAL0RC(Vector2, _get_contents_minimum_size)
 
 public:
@@ -299,10 +294,8 @@ public:
 		NOTIFICATION_THEME_CHANGED = 32
 	};
 
-	PackedStringArray get_accessibility_configuration_warnings() const override;
-
 	static void set_root_layout_direction(int p_root_dir);
-	static Window *get_from_id(DisplayServerEnums::WindowID p_window_id);
+	static Window *get_from_id(DisplayServer::WindowID p_window_id);
 
 	RID get_accessibility_element() const override;
 	virtual RID get_focused_accessibility_element() const override;
@@ -345,15 +338,9 @@ public:
 
 	bool is_popup() const;
 
-	void set_hdr_output_requested(bool p_enabled);
-	bool is_hdr_output_requested() const;
-	float get_output_max_linear_value() const;
-
 	bool is_maximize_allowed() const;
 
 	void request_attention();
-	void set_taskbar_progress_value(float p_value);
-	void set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state);
 #ifndef DISABLE_DEPRECATED
 	void move_to_foreground();
 #endif // DISABLE_DEPRECATED
@@ -419,7 +406,7 @@ public:
 	void child_controls_changed();
 
 	Window *get_exclusive_child() const { return exclusive_child; }
-	const HashSet<Window *> &get_transient_children() const { return transient_children; }
+	HashSet<Window *> get_transient_children() const { return transient_children; }
 	Window *get_parent_visible_window() const;
 	Window *get_non_popup_window() const;
 	Viewport *get_parent_viewport() const;
@@ -445,7 +432,7 @@ public:
 	bool has_focus_or_active_popup() const;
 
 	void start_drag();
-	void start_resize(DisplayServerEnums::WindowResizeEdge p_edge);
+	void start_resize(DisplayServer::WindowResizeEdge p_edge);
 
 	Rect2i get_usable_parent_rect() const;
 
@@ -539,7 +526,7 @@ public:
 	virtual bool is_attached_in_viewport() const override;
 
 	Rect2i get_parent_rect() const;
-	virtual DisplayServerEnums::WindowID get_window_id() const override;
+	virtual DisplayServer::WindowID get_window_id() const override;
 	static Window *get_focused_window() { return focused_window; }
 
 	virtual Size2 _get_contents_minimum_size() const;
diff --git a/engine/scene/property_list_helper.cpp b/engine/scene/property_list_helper.cpp
index 1668d9c7..315c602e 100644
--- a/engine/scene/property_list_helper.cpp
+++ b/engine/scene/property_list_helper.cpp
@@ -30,27 +30,17 @@
 
 #include "property_list_helper.h"
 
-HashMap<StringName, Vector<PropertyListHelper *>> PropertyListHelper::base_helpers; // static
+Vector<PropertyListHelper *> PropertyListHelper::base_helpers; // static
 
 void PropertyListHelper::clear_base_helpers() { // static
-	for (KeyValue<StringName, Vector<PropertyListHelper *>> &E : base_helpers) {
-		for (PropertyListHelper *helper : E.value) {
-			helper->clear();
-		}
+	for (PropertyListHelper *helper : base_helpers) {
+		helper->clear();
 	}
 	base_helpers.clear();
 }
 
-void PropertyListHelper::register_base_helper(const StringName &p_class_name, PropertyListHelper *p_helper) { // static
-	base_helpers[p_class_name].push_back(p_helper);
-}
-
-Vector<PropertyListHelper *> PropertyListHelper::get_helpers_for_class(const StringName &p_class_name) {
-	if (base_helpers.has(p_class_name)) {
-		return base_helpers[p_class_name];
-	} else {
-		return Vector<PropertyListHelper *>();
-	}
+void PropertyListHelper::register_base_helper(PropertyListHelper *p_helper) { // static
+	base_helpers.push_back(p_helper);
 }
 
 const PropertyListHelper::Property *PropertyListHelper::_get_property(const String &p_property, int *r_index, bool p_allow_oob) const {
@@ -121,7 +111,6 @@ void PropertyListHelper::setup_for_instance(const PropertyListHelper &p_base, Ob
 
 	prefix = p_base.prefix;
 	array_length_getter = p_base.array_length_getter;
-	property_filter = p_base.property_filter;
 	property_list = p_base.property_list;
 	object = p_object;
 }
@@ -151,16 +140,6 @@ void PropertyListHelper::get_property_list(List<PropertyInfo> *p_list) const {
 	for (int i = 0; i < property_count; i++) {
 		for (const KeyValue<String, Property> &E : property_list) {
 			const Property &property = E.value;
-			if (property_filter) {
-				Callable::CallError ce;
-				Variant args[] = { property.info.name, i };
-				const Variant *argptrs[] = { &args[0], &args[1] };
-
-				bool property_valid = property_filter->call(object, argptrs, 2, ce);
-				if (!property_valid) {
-					continue;
-				}
-			}
 
 			PropertyInfo info = property.info;
 			if (!(info.usage & PROPERTY_USAGE_STORE_IF_NULL) && _call_getter(&property, i) == property.default_value) {
@@ -173,33 +152,6 @@ void PropertyListHelper::get_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
-#ifdef TOOLS_ENABLED
-
-void PropertyListHelper::documentation_get_property_list(List<PropertyInfo> *r_list) const {
-	for (const KeyValue<String, Property> &E : property_list) {
-		const Property &property = E.value;
-
-		PropertyInfo info = property.info;
-		info.name = vformat("%s{index}/%s", prefix, info.name);
-		r_list->push_back(info);
-	}
-}
-bool PropertyListHelper::documentation_has_property(const String &p_property) const {
-	String name = p_property.trim_prefix(vformat("%s{index}/", prefix));
-	return property_list.has(name);
-}
-
-Variant PropertyListHelper::documentation_get_default_value(const String &p_property) const {
-	String name = p_property.trim_prefix(vformat("%s{index}/", prefix));
-	if (property_list.has(name)) {
-		return property_list[name].default_value;
-	} else {
-		return Variant();
-	}
-}
-
-#endif
-
 bool PropertyListHelper::property_get_value(const String &p_property, Variant &r_ret) const {
 	int index;
 	const Property *property = _get_property(p_property, &index);
@@ -240,9 +192,6 @@ bool PropertyListHelper::property_get_revert(const String &p_property, Variant &
 void PropertyListHelper::clear() {
 	if (is_initialized()) {
 		memdelete(array_length_getter);
-		if (property_filter) {
-			memdelete(property_filter);
-		}
 
 		for (const KeyValue<String, Property> &E : property_list) {
 			if (E.value.setter) {
diff --git a/engine/scene/property_list_helper.h b/engine/scene/property_list_helper.h
index aadc239e..1af04b9f 100644
--- a/engine/scene/property_list_helper.h
+++ b/engine/scene/property_list_helper.h
@@ -41,11 +41,10 @@ class PropertyListHelper {
 		MethodBind *getter = nullptr;
 	};
 
-	static HashMap<StringName, Vector<PropertyListHelper *>> base_helpers;
+	static Vector<PropertyListHelper *> base_helpers;
 
 	String prefix;
 	MethodBind *array_length_getter = nullptr;
-	MethodBind *property_filter = nullptr;
 	HashMap<String, Property> property_list;
 	Object *object = nullptr;
 
@@ -58,19 +57,13 @@ class PropertyListHelper {
 
 public:
 	static void clear_base_helpers();
-	static void register_base_helper(const StringName &p_class_name, PropertyListHelper *p_helper);
-
-	static Vector<PropertyListHelper *> get_helpers_for_class(const StringName &p_class_name);
+	static void register_base_helper(PropertyListHelper *p_helper);
 
 	void set_prefix(const String &p_prefix);
 	template <typename G>
 	void set_array_length_getter(G p_array_length_getter) {
 		array_length_getter = create_method_bind(p_array_length_getter);
 	}
-	template <typename F>
-	void set_property_filter(F p_property_filter) {
-		property_filter = create_method_bind(p_property_filter);
-	}
 
 	// Register property without setter/getter. Only use when you don't need PropertyListHelper for _set/_get logic.
 	void register_property(const PropertyInfo &p_info, const Variant &p_default);
@@ -96,12 +89,6 @@ public:
 	bool property_can_revert(const String &p_property) const;
 	bool property_get_revert(const String &p_property, Variant &r_value) const;
 
-#ifdef TOOLS_ENABLED
-	void documentation_get_property_list(List<PropertyInfo> *r_list) const;
-	bool documentation_has_property(const String &p_property) const;
-	Variant documentation_get_default_value(const String &p_property) const;
-#endif
-
 	void enable_out_of_bounds_assign() { allow_oob_assign = true; }
 
 	void clear();
diff --git a/engine/scene/property_utils.cpp b/engine/scene/property_utils.cpp
index 849be779..99d21ae9 100644
--- a/engine/scene/property_utils.cpp
+++ b/engine/scene/property_utils.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/engine.h"
 #include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/local_vector.h"
 #include "scene/resources/packed_scene.h"
diff --git a/engine/scene/register_scene_types.cpp b/engine/scene/register_scene_types.cpp
index 9d3424e8..da9d0fbc 100644
--- a/engine/scene/register_scene_types.cpp
+++ b/engine/scene/register_scene_types.cpp
@@ -30,10 +30,7 @@
 
 #include "register_scene_types.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "scene/animation/animation_blend_space_1d.h"
@@ -97,7 +94,6 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/video_stream_player.h"
-#include "scene/gui/virtual_joystick.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/http_request.h"
@@ -116,7 +112,6 @@
 #include "scene/resources/audio_stream_polyphonic.h"
 #include "scene/resources/audio_stream_wav.h"
 #include "scene/resources/bit_map.h"
-#include "scene/resources/blit_material.h"
 #include "scene/resources/bone_map.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/camera_texture.h"
@@ -124,9 +119,7 @@
 #include "scene/resources/color_palette.h"
 #include "scene/resources/compositor.h"
 #include "scene/resources/compressed_texture.h"
-#include "scene/resources/compressed_texture_resource_format.h"
 #include "scene/resources/curve_texture.h"
-#include "scene/resources/drawable_texture_2d.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/external_texture.h"
 #include "scene/resources/font.h"
@@ -149,8 +142,6 @@
 #include "scene/resources/portable_compressed_texture.h"
 #include "scene/resources/resource_format_text.h"
 #include "scene/resources/shader_include.h"
-#include "scene/resources/shader_include_resource_format.h"
-#include "scene/resources/shader_resource_format.h"
 #include "scene/resources/skeleton_profile.h"
 #include "scene/resources/sky.h"
 #include "scene/resources/style_box.h"
@@ -170,9 +161,6 @@
 #include "scene/resources/visual_shader_particle_nodes.h"
 #include "scene/resources/visual_shader_sdf_nodes.h"
 #include "scene/theme/theme_db.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifndef DISABLE_DEPRECATED
 #include "scene/resources/animated_texture.h"
 #endif
@@ -568,8 +556,6 @@ void register_scene_types() {
 	GDREGISTER_CLASS(FoldableGroup);
 	GDREGISTER_CLASS(FoldableContainer);
 
-	GDREGISTER_CLASS(VirtualJoystick);
-
 	OS::get_singleton()->yield(); // may take time to init
 
 	int swap_cancel_ok = GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/common/swap_cancel_ok", PROPERTY_HINT_ENUM, "Auto,Cancel First,OK First"), 0);
@@ -591,7 +577,6 @@ void register_scene_types() {
 	GDREGISTER_CLASS(CallbackTweener);
 	GDREGISTER_CLASS(MethodTweener);
 	GDREGISTER_CLASS(SubtweenTweener);
-	GDREGISTER_CLASS(AwaitTweener);
 
 	GDREGISTER_ABSTRACT_CLASS(AnimationMixer);
 	GDREGISTER_CLASS(AnimationPlayer);
@@ -901,10 +886,8 @@ void register_scene_types() {
 	GDREGISTER_CLASS(ShaderMaterial);
 	GDREGISTER_CLASS(CanvasTexture);
 	GDREGISTER_CLASS(CanvasItemMaterial);
-
 	SceneTree::add_idle_callback(CanvasItemMaterial::flush_changes);
 	CanvasItemMaterial::init_shaders();
-	GDREGISTER_CLASS(BlitMaterial);
 
 	/* REGISTER 2D */
 
@@ -1071,7 +1054,6 @@ void register_scene_types() {
 	GDREGISTER_CLASS(GradientTexture2D);
 	GDREGISTER_CLASS(CameraTexture);
 	GDREGISTER_CLASS(ExternalTexture);
-	GDREGISTER_CLASS(DrawableTexture2D);
 	GDREGISTER_VIRTUAL_CLASS(TextureLayered);
 	GDREGISTER_ABSTRACT_CLASS(ImageTextureLayered);
 	GDREGISTER_VIRTUAL_CLASS(Texture3D);
@@ -1490,7 +1472,6 @@ void unregister_scene_types() {
 	ParticleProcessMaterial::finish_shaders();
 	CanvasItemMaterial::finish_shaders();
 	ColorPickerShape::finish_shaders();
-	BlitMaterial::cleanup_shader();
 	GraphEdit::finish_shaders();
 	SceneStringNames::free();
 
diff --git a/engine/scene/resources/2d/capsule_shape_2d.cpp b/engine/scene/resources/2d/capsule_shape_2d.cpp
index 54fe220b..fc621790 100644
--- a/engine/scene/resources/2d/capsule_shape_2d.cpp
+++ b/engine/scene/resources/2d/capsule_shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "capsule_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/circle_shape_2d.cpp b/engine/scene/resources/2d/circle_shape_2d.cpp
index 9a32eb11..8e86ae1f 100644
--- a/engine/scene/resources/2d/circle_shape_2d.cpp
+++ b/engine/scene/resources/2d/circle_shape_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "circle_shape_2d.h"
 
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/concave_polygon_shape_2d.cpp b/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
index 43f39c8b..d551ed45 100644
--- a/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
+++ b/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "concave_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/convex_polygon_shape_2d.cpp b/engine/scene/resources/2d/convex_polygon_shape_2d.cpp
index 836d80d1..a6b89de4 100644
--- a/engine/scene/resources/2d/convex_polygon_shape_2d.cpp
+++ b/engine/scene/resources/2d/convex_polygon_shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "convex_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp b/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
index fd69f1fc..031fb6cb 100644
--- a/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
+++ b/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_mesh_source_geometry_data_2d.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationMeshSourceGeometryData2D::clear() {
diff --git a/engine/scene/resources/2d/navigation_polygon.cpp b/engine/scene/resources/2d/navigation_polygon.cpp
index 7ba7070f..43498bfe 100644
--- a/engine/scene/resources/2d/navigation_polygon.cpp
+++ b/engine/scene/resources/2d/navigation_polygon.cpp
@@ -31,10 +31,9 @@
 #include "navigation_polygon.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "core/os/mutex.h"
 
-#include <thirdparty/misc/polypartition.h>
+#include "thirdparty/misc/polypartition.h"
 
 #ifdef DEBUG_ENABLED
 Rect2 NavigationPolygon::_edit_get_rect() const {
@@ -626,13 +625,14 @@ void NavigationPolygon::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name == "parsed_collision_mask") {
 		if (parsed_geometry_type == PARSED_GEOMETRY_MESH_INSTANCES) {
 			p_property.usage = PROPERTY_USAGE_NONE;
+			return;
 		}
-		return;
 	}
 
 	if (p_property.name == "parsed_source_group_name") {
 		if (source_geometry_mode == SOURCE_GEOMETRY_ROOT_NODE_CHILDREN) {
 			p_property.usage = PROPERTY_USAGE_NONE;
+			return;
 		}
 	}
 }
diff --git a/engine/scene/resources/2d/navigation_polygon.h b/engine/scene/resources/2d/navigation_polygon.h
index 3438009b..9f1ce76a 100644
--- a/engine/scene/resources/2d/navigation_polygon.h
+++ b/engine/scene/resources/2d/navigation_polygon.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "scene/2d/node_2d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
diff --git a/engine/scene/resources/2d/polygon_path_finder.cpp b/engine/scene/resources/2d/polygon_path_finder.cpp
index 51fe4129..e3da45f2 100644
--- a/engine/scene/resources/2d/polygon_path_finder.cpp
+++ b/engine/scene/resources/2d/polygon_path_finder.cpp
@@ -29,9 +29,7 @@
 /**************************************************************************/
 
 #include "polygon_path_finder.h"
-
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 
 bool PolygonPathFinder::_is_point_inside(const Vector2 &p_point) const {
 	int crosses = 0;
diff --git a/engine/scene/resources/2d/rectangle_shape_2d.cpp b/engine/scene/resources/2d/rectangle_shape_2d.cpp
index 9a23f8ff..1e6b3391 100644
--- a/engine/scene/resources/2d/rectangle_shape_2d.cpp
+++ b/engine/scene/resources/2d/rectangle_shape_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "rectangle_shape_2d.h"
 
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 void RectangleShape2D::_update_shape() {
diff --git a/engine/scene/resources/2d/segment_shape_2d.cpp b/engine/scene/resources/2d/segment_shape_2d.cpp
index 36a3e714..b8e9850e 100644
--- a/engine/scene/resources/2d/segment_shape_2d.cpp
+++ b/engine/scene/resources/2d/segment_shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "segment_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/separation_ray_shape_2d.cpp b/engine/scene/resources/2d/separation_ray_shape_2d.cpp
index dd292b4e..80128200 100644
--- a/engine/scene/resources/2d/separation_ray_shape_2d.cpp
+++ b/engine/scene/resources/2d/separation_ray_shape_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "separation_ray_shape_2d.h"
 
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/2d/shape_2d.cpp b/engine/scene/resources/2d/shape_2d.cpp
index b670da26..f48c318c 100644
--- a/engine/scene/resources/2d/shape_2d.cpp
+++ b/engine/scene/resources/2d/shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "shape_2d.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 
 RID Shape2D::get_rid() const {
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
index eb81a4a3..36aacc8a 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
index f6ddad95..00f15228 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_ccdik.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DCCDIK::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
index 493f3da0..bb1b81bd 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_fabrik.h"
-
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DFABRIK::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
index 7a5c1c22..c7e50f4e 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
@@ -30,7 +30,6 @@
 
 #include "skeleton_modification_2d_jiggle.h"
 
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/world_2d.h"
 
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
index 93299cab..8ef48b81 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_lookat.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DLookAt::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
index 2de77f07..9aee8174 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_physicalbones.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/physics/physical_bone_2d.h"
 #include "scene/2d/skeleton_2d.h"
 
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
index d82cda48..6d4cd290 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_stackholder.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DStackHolder::_set(const StringName &p_path, const Variant &p_value) {
@@ -71,7 +68,7 @@ bool SkeletonModification2DStackHolder::_get(const StringName &p_path, Variant &
 }
 
 void SkeletonModification2DStackHolder::_get_property_list(List<PropertyInfo> *p_list) const {
-	p_list->push_back(PropertyInfo(Variant::OBJECT, "held_modification_stack", PROPERTY_HINT_RESOURCE_TYPE, SkeletonModificationStack2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE));
+	p_list->push_back(PropertyInfo(Variant::OBJECT, "held_modification_stack", PROPERTY_HINT_RESOURCE_TYPE, "SkeletonModificationStack2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_ALWAYS_DUPLICATE));
 
 #ifdef TOOLS_ENABLED
 	if (Engine::get_singleton()->is_editor_hint()) {
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
index bc15d864..cbc808d2 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_twoboneik.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
index 36edaa4f..deaa60dc 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "skeleton_modification_stack_2d.h"
-
-#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 void SkeletonModificationStack2D::_get_property_list(List<PropertyInfo> *p_list) const {
diff --git a/engine/scene/resources/2d/tile_set.compat.inc b/engine/scene/resources/2d/tile_set.compat.inc
index b2b1f667..9eb03671 100644
--- a/engine/scene/resources/2d/tile_set.compat.inc
+++ b/engine/scene/resources/2d/tile_set.compat.inc
@@ -32,8 +32,6 @@
 
 #include "tile_set.h"
 
-#include "core/object/class_db.h"
-
 #ifndef NAVIGATION_2D_DISABLED
 Ref<NavigationPolygon> TileData::_get_navigation_polygon_bind_compat_84660(int p_layer_id) const {
 	return get_navigation_polygon(p_layer_id, false, false, false);
@@ -51,4 +49,4 @@ void TileData::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_occluder"), &TileData::_get_occluder_bind_compat_84660);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/2d/tile_set.cpp b/engine/scene/resources/2d/tile_set.cpp
index 351dfd63..b14ea7ce 100644
--- a/engine/scene/resources/2d/tile_set.cpp
+++ b/engine/scene/resources/2d/tile_set.cpp
@@ -31,17 +31,17 @@
 #include "tile_set.h"
 #include "tile_set.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rb_set.h"
 #include "scene/gui/control.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
+
+#ifndef NAVIGATION_2D_DISABLED
+#include "servers/navigation_2d/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
 
 /////////////////////////////// TileMapPattern //////////////////////////////////////
 
@@ -847,22 +847,6 @@ void TileSet::remove_terrain(int p_terrain_set, int p_index) {
 	emit_changed();
 }
 
-void TileSet::clear_terrains(int p_terrain_set) {
-	ERR_FAIL_INDEX(p_terrain_set, terrain_sets.size());
-	Vector<Terrain> &terrains = terrain_sets.write[p_terrain_set].terrains;
-
-	int terrain_count = terrains.size();
-	for (KeyValue<int, Ref<TileSetSource>> source : sources) {
-		for (int i = terrain_count - 1; i >= 0; i--) {
-			source.value->remove_terrain(p_terrain_set, i);
-		}
-	}
-	terrains.clear();
-	notify_property_list_changed();
-	terrains_cache_dirty = true;
-	emit_changed();
-}
-
 void TileSet::set_terrain_name(int p_terrain_set, int p_terrain_index, String p_name) {
 	ERR_FAIL_INDEX(p_terrain_set, terrain_sets.size());
 	ERR_FAIL_INDEX(p_terrain_index, terrain_sets[p_terrain_set].terrains.size());
@@ -1415,7 +1399,7 @@ RBSet<TileSet::TerrainsPattern> TileSet::get_terrains_pattern_set(int p_terrain_
 RBSet<TileMapCell> TileSet::get_tiles_for_terrains_pattern(int p_terrain_set, TerrainsPattern p_terrain_tile_pattern) {
 	ERR_FAIL_INDEX_V(p_terrain_set, terrain_sets.size(), RBSet<TileMapCell>());
 	_update_terrains_cache();
-	return RBSet<TileMapCell>(per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]);
+	return per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern];
 }
 
 TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, TileSet::TerrainsPattern p_terrain_tile_pattern) {
@@ -1424,7 +1408,7 @@ TileMapCell TileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, Ti
 
 	// Count the sum of probabilities.
 	double sum = 0.0;
-	RBSet<TileMapCell> set(per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern]);
+	RBSet<TileMapCell> set = per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern];
 	for (const TileMapCell &E : set) {
 		if (E.source_id >= 0) {
 			Ref<TileSetSource> source = sources[E.source_id];
@@ -2217,11 +2201,11 @@ void TileSet::draw_cells_outline(CanvasItem *p_canvas_item, const RBSet<Vector2i
 	for (const Vector2i &E : p_cells) {
 		Vector2 center = map_to_local(E);
 
-#define DRAW_SIDE_IF_NEEDED(side, polygon_index_from, polygon_index_to) \
-	if (!p_cells.has(get_neighbor_cell(E, side))) { \
+#define DRAW_SIDE_IF_NEEDED(side, polygon_index_from, polygon_index_to)                     \
+	if (!p_cells.has(get_neighbor_cell(E, side))) {                                         \
 		Vector2 from = p_transform.xform(center + polygon[polygon_index_from] * tile_size); \
-		Vector2 to = p_transform.xform(center + polygon[polygon_index_to] * tile_size); \
-		p_canvas_item->draw_line(from, to, p_color); \
+		Vector2 to = p_transform.xform(center + polygon[polygon_index_to] * tile_size);     \
+		p_canvas_item->draw_line(from, to, p_color);                                        \
 	}
 
 		if (tile_shape == TileSet::TILE_SHAPE_SQUARE) {
@@ -3371,9 +3355,8 @@ void TileSet::_compatibility_conversion() {
 		CompatibilityTileData *ctd = E.value;
 
 		// Add the texture
-		Ref<TileSetAtlasSource> atlas_source;
-		atlas_source.instantiate();
-		int source_id = add_source(atlas_source);
+		TileSetAtlasSource *atlas_source = memnew(TileSetAtlasSource);
+		int source_id = add_source(Ref<TileSetSource>(atlas_source));
 
 		atlas_source->set_texture(ctd->texture);
 
@@ -4193,7 +4176,7 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(property_info);
 
 		// physics_layer_%d/physics_material
-		property_info = PropertyInfo(Variant::OBJECT, vformat("physics_layer_%d/physics_material", i), PROPERTY_HINT_RESOURCE_TYPE, PhysicsMaterial::get_class_static());
+		property_info = PropertyInfo(Variant::OBJECT, vformat("physics_layer_%d/physics_material", i), PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial");
 		if (physics_layers[i].physics_material.is_null()) {
 			property_info.usage ^= PROPERTY_USAGE_STORAGE;
 		}
@@ -4232,7 +4215,7 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
 	// Sources.
 	// Note: sources have to be listed in at the end as some TileData rely on the TileSet properties being initialized first.
 	for (const KeyValue<int, Ref<TileSetSource>> &E_source : sources) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("sources/%d", E_source.key), PROPERTY_HINT_RESOURCE_TYPE, TileSetAtlasSource::get_class_static(), PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("sources/%d", E_source.key), PROPERTY_HINT_RESOURCE_TYPE, "TileSetAtlasSource", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE));
 	}
 
 	// Tile Proxies.
@@ -4244,7 +4227,7 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
 
 	// Patterns.
 	for (unsigned int pattern_index = 0; pattern_index < patterns.size(); pattern_index++) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("pattern_%d", pattern_index), PROPERTY_HINT_RESOURCE_TYPE, TileMapPattern::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("pattern_%d", pattern_index), PROPERTY_HINT_RESOURCE_TYPE, "TileMapPattern", PROPERTY_USAGE_NO_EDITOR));
 	}
 }
 
@@ -4252,14 +4235,10 @@ void TileSet::_validate_property(PropertyInfo &p_property) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-	if (p_property.name == "tile_layout") {
-		if (tile_shape == TILE_SHAPE_SQUARE) {
-			p_property.usage ^= PROPERTY_USAGE_READ_ONLY;
-		}
-	} else if (p_property.name == "tile_offset_axis") {
-		if (tile_shape == TILE_SHAPE_SQUARE) {
-			p_property.usage ^= PROPERTY_USAGE_READ_ONLY;
-		}
+	if (p_property.name == "tile_layout" && tile_shape == TILE_SHAPE_SQUARE) {
+		p_property.usage ^= PROPERTY_USAGE_READ_ONLY;
+	} else if (p_property.name == "tile_offset_axis" && tile_shape == TILE_SHAPE_SQUARE) {
+		p_property.usage ^= PROPERTY_USAGE_READ_ONLY;
 	}
 }
 
@@ -4330,7 +4309,6 @@ void TileSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_terrain", "terrain_set", "to_position"), &TileSet::add_terrain, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("move_terrain", "terrain_set", "terrain_index", "to_position"), &TileSet::move_terrain);
 	ClassDB::bind_method(D_METHOD("remove_terrain", "terrain_set", "terrain_index"), &TileSet::remove_terrain);
-	ClassDB::bind_method(D_METHOD("clear_terrains", "terrain_set"), &TileSet::clear_terrains);
 	ClassDB::bind_method(D_METHOD("set_terrain_name", "terrain_set", "terrain_index", "name"), &TileSet::set_terrain_name);
 	ClassDB::bind_method(D_METHOD("get_terrain_name", "terrain_set", "terrain_index"), &TileSet::get_terrain_name);
 	ClassDB::bind_method(D_METHOD("set_terrain_color", "terrain_set", "terrain_index", "color"), &TileSet::set_terrain_color);
@@ -5504,7 +5482,7 @@ void TileSetAtlasSource::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_use_texture_padding", "use_texture_padding"), &TileSetAtlasSource::set_use_texture_padding);
 	ClassDB::bind_method(D_METHOD("get_use_texture_padding"), &TileSetAtlasSource::get_use_texture_padding);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_NO_EDITOR), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_NO_EDITOR), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "margins", PROPERTY_HINT_NONE, "suffix:px", PROPERTY_USAGE_NO_EDITOR), "set_margins", "get_margins");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "separation", PROPERTY_HINT_NONE, "suffix:px", PROPERTY_USAGE_NO_EDITOR), "set_separation", "get_separation");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "texture_region_size", PROPERTY_HINT_NONE, "suffix:px", PROPERTY_USAGE_NO_EDITOR), "set_texture_region_size", "get_texture_region_size");
@@ -5932,7 +5910,7 @@ bool TileSetScenesCollectionSource::_get(const StringName &p_name, Variant &r_re
 
 void TileSetScenesCollectionSource::_get_property_list(List<PropertyInfo> *p_list) const {
 	for (int i = 0; i < scenes_ids.size(); i++) {
-		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("%s/%d/%s", PNAME("scenes"), scenes_ids[i], PNAME("scene")), PROPERTY_HINT_RESOURCE_TYPE, TileSetScenesCollectionSource::get_class_static()));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("%s/%d/%s", PNAME("scenes"), scenes_ids[i], PNAME("scene")), PROPERTY_HINT_RESOURCE_TYPE, "TileSetScenesCollectionSource"));
 
 		PropertyInfo property_info = PropertyInfo(Variant::BOOL, vformat("%s/%d/%s", PNAME("scenes"), scenes_ids[i], PNAME("display_placeholder")));
 		if (scenes[scenes_ids[i]].display_placeholder == false) {
@@ -7018,7 +6996,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 			p_list->push_back(PropertyInfo(Variant::INT, vformat("occlusion_layer_%d/%s", i, PNAME("polygons_count")), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR));
 			for (int j = 0; j < occluders[i].polygons.size(); j++) {
 				// occlusion_layer_%d/polygon_%d/polygon
-				property_info = PropertyInfo(Variant::OBJECT, vformat("occlusion_layer_%d/polygon_%d/%s", i, j, PNAME("polygon")), PROPERTY_HINT_RESOURCE_TYPE, OccluderPolygon2D::get_class_static(), PROPERTY_USAGE_DEFAULT);
+				property_info = PropertyInfo(Variant::OBJECT, vformat("occlusion_layer_%d/polygon_%d/%s", i, j, PNAME("polygon")), PROPERTY_HINT_RESOURCE_TYPE, "OccluderPolygon2D", PROPERTY_USAGE_DEFAULT);
 				if (occluders[i].polygons[j].occluder_polygon.is_null()) {
 					property_info.usage ^= PROPERTY_USAGE_STORAGE;
 				}
@@ -7090,7 +7068,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 		// Navigation layers.
 		p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Navigation", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
 		for (int i = 0; i < navigation.size(); i++) {
-			property_info = PropertyInfo(Variant::OBJECT, vformat("navigation_layer_%d/%s", i, PNAME("polygon")), PROPERTY_HINT_RESOURCE_TYPE, NavigationPolygon::get_class_static(), PROPERTY_USAGE_DEFAULT);
+			property_info = PropertyInfo(Variant::OBJECT, vformat("navigation_layer_%d/%s", i, PNAME("polygon")), PROPERTY_HINT_RESOURCE_TYPE, "NavigationPolygon", PROPERTY_USAGE_DEFAULT);
 			if (navigation[i].navigation_polygon.is_null()) {
 				property_info.usage ^= PROPERTY_USAGE_STORAGE;
 			}
diff --git a/engine/scene/resources/2d/tile_set.h b/engine/scene/resources/2d/tile_set.h
index 75c2483c..61f8ac47 100644
--- a/engine/scene/resources/2d/tile_set.h
+++ b/engine/scene/resources/2d/tile_set.h
@@ -33,7 +33,6 @@
 #include "core/io/resource.h"
 #include "core/object/object.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/main/canvas_item.h"
@@ -53,7 +52,6 @@
 #include "scene/resources/shader.h"
 #endif
 
-class ArrayMesh;
 class TileMap;
 class TileSetSource;
 class TileSetAtlasSource;
@@ -475,7 +473,6 @@ public:
 	void add_terrain(int p_terrain_set, int p_index = -1);
 	void move_terrain(int p_terrain_set, int p_from_index, int p_to_pos);
 	void remove_terrain(int p_terrain_set, int p_index);
-	void clear_terrains(int p_terrain_set);
 	void set_terrain_name(int p_terrain_set, int p_terrain_index, String p_name);
 	String get_terrain_name(int p_terrain_set, int p_terrain_index) const;
 	void set_terrain_color(int p_terrain_set, int p_terrain_index, Color p_color);
diff --git a/engine/scene/resources/2d/world_boundary_shape_2d.cpp b/engine/scene/resources/2d/world_boundary_shape_2d.cpp
index be648b23..d229677d 100644
--- a/engine/scene/resources/2d/world_boundary_shape_2d.cpp
+++ b/engine/scene/resources/2d/world_boundary_shape_2d.cpp
@@ -31,7 +31,6 @@
 #include "world_boundary_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/3d/box_shape_3d.cpp b/engine/scene/resources/3d/box_shape_3d.cpp
index e08345c7..7306b813 100644
--- a/engine/scene/resources/3d/box_shape_3d.cpp
+++ b/engine/scene/resources/3d/box_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "box_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -52,18 +51,18 @@ Vector<Vector3> BoxShape3D::get_debug_mesh_lines() const {
 
 Ref<ArrayMesh> BoxShape3D::get_debug_arraymesh_faces(const Color &p_modulate) const {
 	Array box_array;
-	box_array.resize(RSE::ARRAY_MAX);
+	box_array.resize(RS::ARRAY_MAX);
 	BoxMesh::create_mesh_array(box_array, size);
 
 	Vector<Color> colors;
-	const PackedVector3Array &verts = box_array[RSE::ARRAY_VERTEX];
+	const PackedVector3Array &verts = box_array[RS::ARRAY_VERTEX];
 	const int32_t verts_size = verts.size();
 	for (int i = 0; i < verts_size; i++) {
 		colors.append(p_modulate);
 	}
 
 	Ref<ArrayMesh> box_mesh = memnew(ArrayMesh);
-	box_array[RSE::ARRAY_COLOR] = colors;
+	box_array[RS::ARRAY_COLOR] = colors;
 	box_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, box_array);
 	return box_mesh;
 }
diff --git a/engine/scene/resources/3d/capsule_shape_3d.cpp b/engine/scene/resources/3d/capsule_shape_3d.cpp
index d92a1b90..166848f5 100644
--- a/engine/scene/resources/3d/capsule_shape_3d.cpp
+++ b/engine/scene/resources/3d/capsule_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "capsule_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -71,18 +70,18 @@ Vector<Vector3> CapsuleShape3D::get_debug_mesh_lines() const {
 
 Ref<ArrayMesh> CapsuleShape3D::get_debug_arraymesh_faces(const Color &p_modulate) const {
 	Array capsule_array;
-	capsule_array.resize(RSE::ARRAY_MAX);
+	capsule_array.resize(RS::ARRAY_MAX);
 	CapsuleMesh::create_mesh_array(capsule_array, radius, height, 32, 8);
 
 	Vector<Color> colors;
-	const PackedVector3Array &verts = capsule_array[RSE::ARRAY_VERTEX];
+	const PackedVector3Array &verts = capsule_array[RS::ARRAY_VERTEX];
 	const int32_t verts_size = verts.size();
 	for (int i = 0; i < verts_size; i++) {
 		colors.append(p_modulate);
 	}
 
 	Ref<ArrayMesh> capsule_mesh = memnew(ArrayMesh);
-	capsule_array[RSE::ARRAY_COLOR] = colors;
+	capsule_array[RS::ARRAY_COLOR] = colors;
 	capsule_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, capsule_array);
 	return capsule_mesh;
 }
diff --git a/engine/scene/resources/3d/concave_polygon_shape_3d.cpp b/engine/scene/resources/3d/concave_polygon_shape_3d.cpp
index afce253a..336a3a81 100644
--- a/engine/scene/resources/3d/concave_polygon_shape_3d.cpp
+++ b/engine/scene/resources/3d/concave_polygon_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "concave_polygon_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -71,8 +70,8 @@ Ref<ArrayMesh> ConcavePolygonShape3D::get_debug_arraymesh_faces(const Color &p_m
 	Ref<ArrayMesh> mesh = memnew(ArrayMesh);
 	Array a;
 	a.resize(Mesh::ARRAY_MAX);
-	a[RSE::ARRAY_VERTEX] = faces;
-	a[RSE::ARRAY_COLOR] = colors;
+	a[RS::ARRAY_VERTEX] = faces;
+	a[RS::ARRAY_COLOR] = colors;
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 
 	return mesh;
diff --git a/engine/scene/resources/3d/convex_polygon_shape_3d.cpp b/engine/scene/resources/3d/convex_polygon_shape_3d.cpp
index 4fcc9bbd..b9d807e7 100644
--- a/engine/scene/resources/3d/convex_polygon_shape_3d.cpp
+++ b/engine/scene/resources/3d/convex_polygon_shape_3d.cpp
@@ -29,9 +29,7 @@
 /**************************************************************************/
 
 #include "convex_polygon_shape_3d.h"
-
 #include "core/math/convex_hull.h"
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -86,9 +84,9 @@ Ref<ArrayMesh> ConvexPolygonShape3D::get_debug_arraymesh_faces(const Color &p_mo
 	Ref<ArrayMesh> mesh = memnew(ArrayMesh);
 	Array a;
 	a.resize(Mesh::ARRAY_MAX);
-	a[RSE::ARRAY_VERTEX] = verts;
-	a[RSE::ARRAY_COLOR] = colors;
-	a[RSE::ARRAY_INDEX] = indices;
+	a[RS::ARRAY_VERTEX] = verts;
+	a[RS::ARRAY_COLOR] = colors;
+	a[RS::ARRAY_INDEX] = indices;
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 
 	return mesh;
diff --git a/engine/scene/resources/3d/cylinder_shape_3d.cpp b/engine/scene/resources/3d/cylinder_shape_3d.cpp
index 60704b5c..da2bf8aa 100644
--- a/engine/scene/resources/3d/cylinder_shape_3d.cpp
+++ b/engine/scene/resources/3d/cylinder_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "cylinder_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -64,18 +63,18 @@ Vector<Vector3> CylinderShape3D::get_debug_mesh_lines() const {
 
 Ref<ArrayMesh> CylinderShape3D::get_debug_arraymesh_faces(const Color &p_modulate) const {
 	Array cylinder_array;
-	cylinder_array.resize(RSE::ARRAY_MAX);
+	cylinder_array.resize(RS::ARRAY_MAX);
 	CylinderMesh::create_mesh_array(cylinder_array, radius, radius, height, 32);
 
 	Vector<Color> colors;
-	const PackedVector3Array &verts = cylinder_array[RSE::ARRAY_VERTEX];
+	const PackedVector3Array &verts = cylinder_array[RS::ARRAY_VERTEX];
 	const int32_t verts_size = verts.size();
 	for (int i = 0; i < verts_size; i++) {
 		colors.append(p_modulate);
 	}
 
 	Ref<ArrayMesh> cylinder_mesh = memnew(ArrayMesh);
-	cylinder_array[RSE::ARRAY_COLOR] = colors;
+	cylinder_array[RS::ARRAY_COLOR] = colors;
 	cylinder_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, cylinder_array);
 	return cylinder_mesh;
 }
diff --git a/engine/scene/resources/3d/fog_material.cpp b/engine/scene/resources/3d/fog_material.cpp
index 61b394ec..33be38fa 100644
--- a/engine/scene/resources/3d/fog_material.cpp
+++ b/engine/scene/resources/3d/fog_material.cpp
@@ -30,9 +30,7 @@
 
 #include "fog_material.h"
 
-#include "core/object/class_db.h"
 #include "core/version.h"
-#include "servers/rendering/rendering_server.h"
 
 Mutex FogMaterial::shader_mutex;
 RID FogMaterial::shader;
@@ -129,7 +127,7 @@ void FogMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "emission", PROPERTY_HINT_COLOR_NO_ALPHA), "set_emission", "get_emission");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height_falloff", PROPERTY_HINT_EXP_EASING, "attenuation"), "set_height_falloff", "get_height_falloff");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "edge_fade", PROPERTY_HINT_EXP_EASING), "set_edge_fade", "get_edge_fade");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "density_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture3D::get_class_static()), "set_density_texture", "get_density_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "density_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture3D"), "set_density_texture", "get_density_texture");
 }
 
 void FogMaterial::cleanup_shader() {
diff --git a/engine/scene/resources/3d/fog_material.h b/engine/scene/resources/3d/fog_material.h
index 4d8b9497..f9254d46 100644
--- a/engine/scene/resources/3d/fog_material.h
+++ b/engine/scene/resources/3d/fog_material.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/resources/material.h"
-#include "scene/resources/texture.h"
 
 class FogMaterial : public Material {
 	GDCLASS(FogMaterial, Material);
diff --git a/engine/scene/resources/3d/height_map_shape_3d.cpp b/engine/scene/resources/3d/height_map_shape_3d.cpp
index e7a82bd3..5a643d1f 100644
--- a/engine/scene/resources/3d/height_map_shape_3d.cpp
+++ b/engine/scene/resources/3d/height_map_shape_3d.cpp
@@ -31,12 +31,9 @@
 #include "height_map_shape_3d.h"
 
 #include "core/io/image.h"
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include <cfloat> // FLT_MAX
-
 Vector<Vector3> HeightMapShape3D::get_debug_mesh_lines() const {
 	Vector<Vector3> points;
 
@@ -132,9 +129,9 @@ Ref<ArrayMesh> HeightMapShape3D::get_debug_arraymesh_faces(const Color &p_modula
 	Ref<ArrayMesh> mesh = memnew(ArrayMesh);
 	Array a;
 	a.resize(Mesh::ARRAY_MAX);
-	a[RSE::ARRAY_VERTEX] = verts;
-	a[RSE::ARRAY_COLOR] = colors;
-	a[RSE::ARRAY_INDEX] = indices;
+	a[RS::ARRAY_VERTEX] = verts;
+	a[RS::ARRAY_COLOR] = colors;
+	a[RS::ARRAY_INDEX] = indices;
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 
 	return mesh;
diff --git a/engine/scene/resources/3d/importer_mesh.cpp b/engine/scene/resources/3d/importer_mesh.cpp
index df98b507..cd576064 100644
--- a/engine/scene/resources/3d/importer_mesh.cpp
+++ b/engine/scene/resources/3d/importer_mesh.cpp
@@ -32,293 +32,12 @@
 
 #include "core/io/marshalls.h"
 #include "core/math/random_pcg.h"
-#include "core/object/class_db.h"
 #include "scene/resources/surface_tool.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "core/math/convex_hull.h"
 #endif // PHYSICS_3D_DISABLED
 
-#include <cfloat> // FLT_EPSILON
-
-Ref<ImporterMesh> ImporterMesh::merge_importer_meshes(const TypedArray<ImporterMesh> &p_importer_meshes, const TypedArray<Transform3D> &p_relative_transforms, bool p_deduplicate_surfaces) {
-	// Setup and safety checks.
-	const int mesh_count = p_importer_meshes.size();
-	Ref<ImporterMesh> merged_importer_mesh;
-	ERR_FAIL_COND_V(mesh_count == 0, merged_importer_mesh);
-	ERR_FAIL_COND_V(mesh_count != p_relative_transforms.size(), merged_importer_mesh);
-	// Contains more than just the surface arrays, also contains some metadata to help with merging.
-	HashMap<String, Array> names_to_surfaces;
-	for (int mesh_index = 0; mesh_index < mesh_count; mesh_index++) {
-		const Ref<ImporterMesh> importer_mesh = p_importer_meshes[mesh_index];
-		if (importer_mesh->get_blend_shape_count() > 0) {
-			WARN_PRINT("ImporterMesh.merge_importer_meshes: Mesh " + itos(mesh_index) + " has blend shapes, which are not supported and will be discarded in the merged mesh.");
-		}
-		const Transform3D &relative_transform = p_relative_transforms[mesh_index];
-		const bool is_determinant_negative = relative_transform.basis.determinant() < 0;
-		for (int surface_index = 0; surface_index < importer_mesh->get_surface_count(); surface_index++) {
-			if (importer_mesh->get_surface_lod_count(surface_index) > 0) {
-				WARN_PRINT("ImporterMesh.merge_importer_meshes: Mesh " + itos(mesh_index) + " surface " + itos(surface_index) + " has LODs, which are not supported and will be discarded in the merged mesh.");
-			}
-			// Shallow-duplicate the surface arrays so that writing transformed data back doesn't mutate the original mesh.
-			Array this_surface_arrays = importer_mesh->get_surface_arrays(surface_index).duplicate(false);
-			ERR_FAIL_COND_V(this_surface_arrays.size() != Mesh::ARRAY_MAX, merged_importer_mesh);
-			// Transform the data of the mesh by the instance's relative transform.
-			{
-				PackedVector3Array vertices = this_surface_arrays[Mesh::ARRAY_VERTEX];
-				for (int vertex_index = 0; vertex_index < vertices.size(); vertex_index++) {
-					vertices.ptrw()[vertex_index] = relative_transform.xform(vertices[vertex_index]);
-				}
-				PackedVector3Array normals = this_surface_arrays[Mesh::ARRAY_NORMAL];
-				for (int normal_index = 0; normal_index < normals.size(); normal_index++) {
-					normals.ptrw()[normal_index] = relative_transform.basis.xform(normals[normal_index]).normalized();
-				}
-				PackedFloat32Array tangents = this_surface_arrays[Mesh::ARRAY_TANGENT];
-				for (int tangent_index = 0; tangent_index < tangents.size(); tangent_index += 4) {
-					Vector3 tangent = Vector3(tangents[tangent_index], tangents[tangent_index + 1], tangents[tangent_index + 2]);
-					tangent = relative_transform.basis.xform(tangent).normalized();
-					tangents.ptrw()[tangent_index + 0] = tangent.x;
-					tangents.ptrw()[tangent_index + 1] = tangent.y;
-					tangents.ptrw()[tangent_index + 2] = tangent.z;
-					// The tangent's W component is not transformed (the binormal direction sign), so we keep it as is.
-				}
-				// If the determinant is negative, we need to swap vertices to fix the winding order.
-				if (is_determinant_negative) {
-					PackedInt32Array this_indices = this_surface_arrays[Mesh::ARRAY_INDEX];
-					if (this_indices.is_empty()) {
-						// For non-indexed meshes, we need to swap the data in the arrays.
-						PackedColorArray colors = this_surface_arrays[Mesh::ARRAY_COLOR];
-						PackedVector2Array tex_uv1 = this_surface_arrays[Mesh::ARRAY_TEX_UV];
-						PackedVector2Array tex_uv2 = this_surface_arrays[Mesh::ARRAY_TEX_UV2];
-						Color temp_color;
-						Vector4 temp_vec4;
-						Vector3 temp_vec3;
-						Vector2 temp_vec2;
-						for (int i = 1; i < vertices.size() - 1; i += 3) {
-							temp_vec3 = vertices[i];
-							vertices.ptrw()[i] = vertices[i + 1];
-							vertices.ptrw()[i + 1] = temp_vec3;
-						}
-						for (int i = 1; i < normals.size() - 1; i += 3) {
-							temp_vec3 = normals[i];
-							normals.ptrw()[i] = normals[i + 1];
-							normals.ptrw()[i + 1] = temp_vec3;
-						}
-						for (int i = 4; i < tangents.size() - 1; i += 12) {
-							temp_vec4 = Vector4(tangents[i + 0], tangents[i + 1], tangents[i + 2], tangents[i + 3]);
-							tangents.ptrw()[i + 0] = tangents[i + 4];
-							tangents.ptrw()[i + 1] = tangents[i + 5];
-							tangents.ptrw()[i + 2] = tangents[i + 6];
-							tangents.ptrw()[i + 3] = tangents[i + 7];
-							tangents.ptrw()[i + 4] = temp_vec4.x;
-							tangents.ptrw()[i + 5] = temp_vec4.y;
-							tangents.ptrw()[i + 6] = temp_vec4.z;
-							tangents.ptrw()[i + 7] = temp_vec4.w;
-						}
-						for (int i = 1; i < colors.size() - 1; i += 3) {
-							temp_color = colors[i];
-							colors.ptrw()[i] = colors[i + 1];
-							colors.ptrw()[i + 1] = temp_color;
-						}
-						for (int i = 1; i < tex_uv1.size() - 1; i += 3) {
-							temp_vec2 = tex_uv1[i];
-							tex_uv1.ptrw()[i] = tex_uv1[i + 1];
-							tex_uv1.ptrw()[i + 1] = temp_vec2;
-						}
-						for (int i = 1; i < tex_uv2.size() - 1; i += 3) {
-							temp_vec2 = tex_uv2[i];
-							tex_uv2.ptrw()[i] = tex_uv2[i + 1];
-							tex_uv2.ptrw()[i + 1] = temp_vec2;
-						}
-						// Swap custom data channels.
-						for (int custom_index = 0; custom_index < 4; custom_index++) {
-							Variant custom_var = this_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index];
-							if (custom_var.get_type() == Variant::PACKED_BYTE_ARRAY) {
-								PackedByteArray custom_bytes = custom_var;
-								if (!custom_bytes.is_empty()) {
-									// Each vertex may have multiple bytes associated with it, such as in a half precision float.
-									const int byte_stride = custom_bytes.size() / vertices.size();
-									for (int i = 1; i < vertices.size() - 1; i += 3) {
-										for (int s = 0; s < byte_stride; s++) {
-											const uint8_t temp_byte = custom_bytes[i * byte_stride + s];
-											custom_bytes.ptrw()[i * byte_stride + s] = custom_bytes[(i + 1) * byte_stride + s];
-											custom_bytes.ptrw()[(i + 1) * byte_stride + s] = temp_byte;
-										}
-									}
-									this_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index] = custom_bytes;
-								}
-							} else if (custom_var.get_type() == Variant::PACKED_FLOAT32_ARRAY) {
-								PackedFloat32Array custom_floats = custom_var;
-								if (!custom_floats.is_empty()) {
-									// Each vertex may have multiple floats associated with it, such as in a vector or color.
-									const int float_stride = custom_floats.size() / vertices.size();
-									for (int i = 1; i < vertices.size() - 1; i += 3) {
-										for (int s = 0; s < float_stride; s++) {
-											const float temp_float = custom_floats[i * float_stride + s];
-											custom_floats.ptrw()[i * float_stride + s] = custom_floats[(i + 1) * float_stride + s];
-											custom_floats.ptrw()[(i + 1) * float_stride + s] = temp_float;
-										}
-									}
-									this_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index] = custom_floats;
-								}
-							} else {
-								ERR_PRINT("Unsupported custom data format when merging ImporterMesh surfaces.");
-							}
-						}
-						// Put the data back into the surface arrays.
-						this_surface_arrays[Mesh::ARRAY_COLOR] = colors.is_empty() ? Variant() : Variant(colors);
-						this_surface_arrays[Mesh::ARRAY_TEX_UV] = tex_uv1.is_empty() ? Variant() : Variant(tex_uv1);
-						this_surface_arrays[Mesh::ARRAY_TEX_UV2] = tex_uv2.is_empty() ? Variant() : Variant(tex_uv2);
-					} else {
-						// For indexed meshes, we need to swap the indices.
-						for (int i = 1; i < this_indices.size() - 1; i += 3) {
-							int32_t temp = this_indices[i];
-							this_indices.ptrw()[i] = this_indices[i + 1];
-							this_indices.ptrw()[i + 1] = temp;
-						}
-						this_surface_arrays[Mesh::ARRAY_INDEX] = this_indices;
-					}
-				}
-				// This data always needs to be put back into the surface arrays,
-				// because it gets transformed even if the determinant is positive.
-				this_surface_arrays[Mesh::ARRAY_VERTEX] = vertices;
-				this_surface_arrays[Mesh::ARRAY_NORMAL] = normals.is_empty() ? Variant() : Variant(normals);
-				this_surface_arrays[Mesh::ARRAY_TANGENT] = tangents.is_empty() ? Variant() : Variant(tangents);
-			}
-			// Insert the transformed data into the temporary HashMap.
-			const Mesh::PrimitiveType mesh_prim_type = importer_mesh->get_surface_primitive_type(surface_index);
-			const uint64_t mesh_flags = importer_mesh->get_surface_format(surface_index);
-			String surface_name = importer_mesh->get_surface_name(surface_index);
-			if (surface_name.is_empty()) {
-				surface_name = String("surface_") + itos(surface_index);
-			}
-			// Check if the surface has bone data by inspecting the actual arrays.
-			// NOTE: Unlike ArrayMesh, we can't use the mesh format flags, because those may not be set by ImporterMesh callers.
-			const bool has_bones = this_surface_arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL;
-			const bool has_weights = this_surface_arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL;
-			const bool name_exists = names_to_surfaces.has(surface_name);
-			if (name_exists) {
-				// Only attempt to deduplicate surfaces if the mesh is not skinned.
-				// Avoid deduplicating surfaces with bone weights.
-				constexpr uint64_t skinning_flags = Mesh::ARRAY_FORMAT_BONES | Mesh::ARRAY_FORMAT_WEIGHTS;
-				const bool is_skinned = has_bones || has_weights;
-				if (p_deduplicate_surfaces && !is_skinned && (mesh_flags & skinning_flags) == 0) {
-					Array &existing_surface = names_to_surfaces[surface_name];
-					const Mesh::PrimitiveType existing_prim_type = (Mesh::PrimitiveType)(uint64_t)existing_surface[0];
-					const uint64_t existing_flags = (uint64_t)existing_surface[3];
-					if (existing_prim_type == mesh_prim_type && existing_flags == mesh_flags) {
-						// Duplicate surface found, insert the data into the existing surface.
-						Array merged_surface_arrays = existing_surface[1];
-						PackedVector3Array merged_vertices = merged_surface_arrays[Mesh::ARRAY_VERTEX];
-						const int32_t existing_vertex_count = merged_vertices.size();
-						// Merge vertices (always present).
-						merged_vertices.append_array(this_surface_arrays[Mesh::ARRAY_VERTEX]);
-						merged_surface_arrays[Mesh::ARRAY_VERTEX] = merged_vertices;
-						// Merge normals.
-						{
-							PackedVector3Array existing_normals = merged_surface_arrays[Mesh::ARRAY_NORMAL];
-							const PackedVector3Array incoming_normals = this_surface_arrays[Mesh::ARRAY_NORMAL];
-							if (!existing_normals.is_empty() || !incoming_normals.is_empty()) {
-								existing_normals.append_array(incoming_normals);
-								merged_surface_arrays[Mesh::ARRAY_NORMAL] = existing_normals;
-							}
-						}
-						// Merge tangents.
-						{
-							PackedFloat32Array existing_tangents = merged_surface_arrays[Mesh::ARRAY_TANGENT];
-							const PackedFloat32Array incoming_tangents = this_surface_arrays[Mesh::ARRAY_TANGENT];
-							if (!existing_tangents.is_empty() || !incoming_tangents.is_empty()) {
-								existing_tangents.append_array(incoming_tangents);
-								merged_surface_arrays[Mesh::ARRAY_TANGENT] = existing_tangents;
-							}
-						}
-						// Merge colors.
-						{
-							PackedColorArray existing_colors = merged_surface_arrays[Mesh::ARRAY_COLOR];
-							const PackedColorArray incoming_colors = this_surface_arrays[Mesh::ARRAY_COLOR];
-							if (!existing_colors.is_empty() || !incoming_colors.is_empty()) {
-								existing_colors.append_array(incoming_colors);
-								merged_surface_arrays[Mesh::ARRAY_COLOR] = existing_colors;
-							}
-						}
-						// Merge UV1.
-						{
-							PackedVector2Array existing_uv = merged_surface_arrays[Mesh::ARRAY_TEX_UV];
-							const PackedVector2Array incoming_uv = this_surface_arrays[Mesh::ARRAY_TEX_UV];
-							if (!existing_uv.is_empty() || !incoming_uv.is_empty()) {
-								existing_uv.append_array(incoming_uv);
-								merged_surface_arrays[Mesh::ARRAY_TEX_UV] = existing_uv;
-							}
-						}
-						// Merge UV2.
-						{
-							PackedVector2Array existing_uv2 = merged_surface_arrays[Mesh::ARRAY_TEX_UV2];
-							const PackedVector2Array incoming_uv2 = this_surface_arrays[Mesh::ARRAY_TEX_UV2];
-							if (!existing_uv2.is_empty() || !incoming_uv2.is_empty()) {
-								existing_uv2.append_array(incoming_uv2);
-								merged_surface_arrays[Mesh::ARRAY_TEX_UV2] = existing_uv2;
-							}
-						}
-						// Merge custom data channels.
-						for (int custom_index = 0; custom_index < 4; custom_index++) {
-							const Variant existing_custom = merged_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index];
-							const Variant incoming_custom = this_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index];
-							if (existing_custom.get_type() == Variant::PACKED_BYTE_ARRAY || incoming_custom.get_type() == Variant::PACKED_BYTE_ARRAY) {
-								PackedByteArray merged_custom = existing_custom;
-								merged_custom.append_array(PackedByteArray(incoming_custom));
-								merged_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index] = merged_custom;
-							} else if (existing_custom.get_type() == Variant::PACKED_FLOAT32_ARRAY || incoming_custom.get_type() == Variant::PACKED_FLOAT32_ARRAY) {
-								PackedFloat32Array merged_custom = existing_custom;
-								merged_custom.append_array(PackedFloat32Array(incoming_custom));
-								merged_surface_arrays[Mesh::ARRAY_CUSTOM0 + custom_index] = merged_custom;
-							}
-						}
-						// Merge indices and remap to account for the new vertex count.
-						{
-							PackedInt32Array existing_indices = merged_surface_arrays[Mesh::ARRAY_INDEX];
-							PackedInt32Array incoming_indices = this_surface_arrays[Mesh::ARRAY_INDEX];
-							if (!existing_indices.is_empty() || !incoming_indices.is_empty()) {
-								for (int i = 0; i < incoming_indices.size(); i++) {
-									incoming_indices.ptrw()[i] = incoming_indices[i] + existing_vertex_count;
-								}
-								existing_indices.append_array(incoming_indices);
-								merged_surface_arrays[Mesh::ARRAY_INDEX] = existing_indices;
-							}
-						}
-						existing_surface.set(1, merged_surface_arrays);
-						continue; // Next surface.
-					}
-				}
-				// If the name already exists but isn't a duplicate, we need a new name for the surface.
-				const String original_name = surface_name;
-				int64_t discriminator = 2;
-				do {
-					surface_name = original_name + "_" + itos(discriminator);
-					discriminator++;
-				} while (names_to_surfaces.has(surface_name));
-			}
-			// Add a new entry to the temporary HashMap. The indices are based on the arguments to add_surface.
-			Array new_surface;
-			new_surface.resize(4);
-			new_surface[0] = mesh_prim_type;
-			new_surface[1] = this_surface_arrays;
-			new_surface[2] = importer_mesh->get_surface_material(surface_index);
-			new_surface[3] = mesh_flags;
-			names_to_surfaces[surface_name] = new_surface;
-		}
-	}
-	// Actually put the merged surfaces into the merged ImporterMesh.
-	merged_importer_mesh.instantiate();
-	for (const KeyValue<String, Array> &surface_name_kvp : names_to_surfaces) {
-		const Array surface = surface_name_kvp.value;
-		const Mesh::PrimitiveType mesh_prim_type = (Mesh::PrimitiveType)(uint64_t)surface[0];
-		const Ref<Material> material = surface[2];
-		const uint64_t mesh_flags = (uint64_t)surface[3];
-		merged_importer_mesh->add_surface(mesh_prim_type, surface[1], TypedArray<Array>(), Dictionary(), material, surface_name_kvp.key, mesh_flags);
-	}
-	return merged_importer_mesh;
-}
-
 String ImporterMesh::validate_blend_shape_name(const String &p_name) {
 	return p_name.replace_char(':', '_');
 }
@@ -455,7 +174,7 @@ static Vector<T> _remap_array(Vector<T> p_array, const Vector<uint32_t> &p_remap
 
 static void _remap_arrays(Array &r_arrays, const Vector<uint32_t> &p_remap, uint32_t p_vertex_count) {
 	for (int i = 0; i < r_arrays.size(); i++) {
-		if (i == RSE::ARRAY_INDEX) {
+		if (i == RS::ARRAY_INDEX) {
 			continue;
 		}
 
@@ -499,8 +218,8 @@ void ImporterMesh::optimize_indices() {
 			continue;
 		}
 
-		Vector<Vector3> vertices = surfaces[i].arrays[RSE::ARRAY_VERTEX];
-		PackedInt32Array indices = surfaces[i].arrays[RSE::ARRAY_INDEX];
+		Vector<Vector3> vertices = surfaces[i].arrays[RS::ARRAY_VERTEX];
+		PackedInt32Array indices = surfaces[i].arrays[RS::ARRAY_INDEX];
 
 		unsigned int index_count = indices.size();
 		unsigned int vertex_count = vertices.size();
@@ -512,7 +231,7 @@ void ImporterMesh::optimize_indices() {
 		// Optimize indices for vertex cache to establish final triangle order.
 		int *indices_ptr = indices.ptrw();
 		SurfaceTool::optimize_vertex_cache_func((unsigned int *)indices_ptr, (const unsigned int *)indices_ptr, index_count, vertex_count);
-		surfaces.write[i].arrays[RSE::ARRAY_INDEX] = indices;
+		surfaces.write[i].arrays[RS::ARRAY_INDEX] = indices;
 
 		for (int j = 0; j < surfaces[i].lods.size(); ++j) {
 			Surface::LOD &lod = surfaces.write[i].lods.write[j];
@@ -535,7 +254,7 @@ void ImporterMesh::optimize_indices() {
 
 		// We need to remap all vertex and index arrays in lockstep according to the remap.
 		SurfaceTool::remap_index_func((unsigned int *)indices_ptr, (const unsigned int *)indices_ptr, index_count, remap.ptr());
-		surfaces.write[i].arrays[RSE::ARRAY_INDEX] = indices;
+		surfaces.write[i].arrays[RS::ARRAY_INDEX] = indices;
 
 		for (int j = 0; j < surfaces[i].lods.size(); ++j) {
 			Surface::LOD &lod = surfaces.write[i].lods.write[j];
@@ -555,16 +274,16 @@ void ImporterMesh::optimize_indices() {
 }
 
 #define VERTEX_SKIN_FUNC(bone_count, vert_idx, read_array, write_array, transform_array, bone_array, weight_array) \
-	Vector3 transformed_vert; \
-	for (unsigned int weight_idx = 0; weight_idx < bone_count; weight_idx++) { \
-		int bone_idx = bone_array[vert_idx * bone_count + weight_idx]; \
-		float w = weight_array[vert_idx * bone_count + weight_idx]; \
-		if (w < FLT_EPSILON) { \
-			continue; \
-		} \
-		ERR_FAIL_INDEX(bone_idx, static_cast<int>(transform_array.size())); \
-		transformed_vert += transform_array[bone_idx].xform(read_array[vert_idx]) * w; \
-	} \
+	Vector3 transformed_vert;                                                                                      \
+	for (unsigned int weight_idx = 0; weight_idx < bone_count; weight_idx++) {                                     \
+		int bone_idx = bone_array[vert_idx * bone_count + weight_idx];                                             \
+		float w = weight_array[vert_idx * bone_count + weight_idx];                                                \
+		if (w < FLT_EPSILON) {                                                                                     \
+			continue;                                                                                              \
+		}                                                                                                          \
+		ERR_FAIL_INDEX(bone_idx, static_cast<int>(transform_array.size()));                                        \
+		transformed_vert += transform_array[bone_idx].xform(read_array[vert_idx]) * w;                             \
+	}                                                                                                              \
 	write_array[vert_idx] = transformed_vert;
 
 void ImporterMesh::generate_lods(float p_normal_merge_angle, Array p_bone_transform_array) {
@@ -587,15 +306,15 @@ void ImporterMesh::generate_lods(float p_normal_merge_angle, Array p_bone_transf
 		}
 
 		surfaces.write[i].lods.clear();
-		Vector<Vector3> vertices = surfaces[i].arrays[RSE::ARRAY_VERTEX];
-		PackedInt32Array indices = surfaces[i].arrays[RSE::ARRAY_INDEX];
-		Vector<Vector3> normals = surfaces[i].arrays[RSE::ARRAY_NORMAL];
-		Vector<float> tangents = surfaces[i].arrays[RSE::ARRAY_TANGENT];
-		Vector<Vector2> uvs = surfaces[i].arrays[RSE::ARRAY_TEX_UV];
-		Vector<Vector2> uv2s = surfaces[i].arrays[RSE::ARRAY_TEX_UV2];
-		Vector<int> bones = surfaces[i].arrays[RSE::ARRAY_BONES];
-		Vector<float> weights = surfaces[i].arrays[RSE::ARRAY_WEIGHTS];
-		Vector<Color> colors = surfaces[i].arrays[RSE::ARRAY_COLOR];
+		Vector<Vector3> vertices = surfaces[i].arrays[RS::ARRAY_VERTEX];
+		PackedInt32Array indices = surfaces[i].arrays[RS::ARRAY_INDEX];
+		Vector<Vector3> normals = surfaces[i].arrays[RS::ARRAY_NORMAL];
+		Vector<float> tangents = surfaces[i].arrays[RS::ARRAY_TANGENT];
+		Vector<Vector2> uvs = surfaces[i].arrays[RS::ARRAY_TEX_UV];
+		Vector<Vector2> uv2s = surfaces[i].arrays[RS::ARRAY_TEX_UV2];
+		Vector<int> bones = surfaces[i].arrays[RS::ARRAY_BONES];
+		Vector<float> weights = surfaces[i].arrays[RS::ARRAY_WEIGHTS];
+		Vector<Color> colors = surfaces[i].arrays[RS::ARRAY_COLOR];
 
 		unsigned int index_count = indices.size();
 		unsigned int vertex_count = vertices.size();
@@ -759,7 +478,7 @@ void ImporterMesh::generate_lods(float p_normal_merge_angle, Array p_bone_transf
 		const float max_mesh_error = 1.0f; // We only need LODs that can be selected by error threshold.
 		const unsigned min_target_indices = 12;
 
-		LocalVector<int> current_indices(merged_indices);
+		LocalVector<int> current_indices = merged_indices;
 		float current_error = 0.0f;
 		bool allow_prune = true;
 
@@ -963,10 +682,10 @@ void ImporterMesh::create_shadow_mesh() {
 	}
 	//no shadow mesh for skeletons
 	for (int i = 0; i < surfaces.size(); i++) {
-		if (surfaces[i].arrays[RSE::ARRAY_BONES].get_type() != Variant::NIL) {
+		if (surfaces[i].arrays[RS::ARRAY_BONES].get_type() != Variant::NIL) {
 			return;
 		}
-		if (surfaces[i].arrays[RSE::ARRAY_WEIGHTS].get_type() != Variant::NIL) {
+		if (surfaces[i].arrays[RS::ARRAY_WEIGHTS].get_type() != Variant::NIL) {
 			return;
 		}
 	}
@@ -976,7 +695,7 @@ void ImporterMesh::create_shadow_mesh() {
 	for (int i = 0; i < surfaces.size(); i++) {
 		LocalVector<int> vertex_remap;
 		Vector<Vector3> new_vertices;
-		Vector<Vector3> vertices = surfaces[i].arrays[RSE::ARRAY_VERTEX];
+		Vector<Vector3> vertices = surfaces[i].arrays[RS::ARRAY_VERTEX];
 		int vertex_count = vertices.size();
 		{
 			HashMap<Vector3, int> unique_vertices;
@@ -998,14 +717,14 @@ void ImporterMesh::create_shadow_mesh() {
 		}
 
 		Array new_surface;
-		new_surface.resize(RSE::ARRAY_MAX);
+		new_surface.resize(RS::ARRAY_MAX);
 		Dictionary lods;
 
 		//		print_line("original vertex count: " + itos(vertices.size()) + " new vertex count: " + itos(new_vertices.size()));
 
-		new_surface[RSE::ARRAY_VERTEX] = new_vertices;
+		new_surface[RS::ARRAY_VERTEX] = new_vertices;
 
-		Vector<int> indices = surfaces[i].arrays[RSE::ARRAY_INDEX];
+		Vector<int> indices = surfaces[i].arrays[RS::ARRAY_INDEX];
 		if (indices.size()) {
 			int index_count = indices.size();
 			const int *index_rptr = indices.ptr();
@@ -1019,7 +738,7 @@ void ImporterMesh::create_shadow_mesh() {
 				index_wptr[j] = vertex_remap[index];
 			}
 
-			new_surface[RSE::ARRAY_INDEX] = new_indices;
+			new_surface[RS::ARRAY_INDEX] = new_indices;
 
 			// Make sure the same LODs as the full version are used.
 			// This makes it more coherent between rendered model and its shadows.
@@ -1315,7 +1034,7 @@ struct EditorSceneFormatImporterMeshLightmapSurface {
 	String name;
 };
 
-static const uint32_t custom_shift[RSE::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
+static const uint32_t custom_shift[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
 
 Error ImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform, float p_texel_size, const Vector<uint8_t> &p_src_cache, Vector<uint8_t> &r_dst_cache) {
 	ERR_FAIL_NULL_V(array_mesh_lightmap_unwrap_callback, ERR_UNCONFIGURED);
@@ -1448,8 +1167,8 @@ Error ImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform,
 		st->set_material(lightmap_surfaces[i].material);
 		st->set_meta("name", lightmap_surfaces[i].name);
 
-		for (int custom_i = 0; custom_i < RSE::ARRAY_CUSTOM_COUNT; custom_i++) {
-			st->set_custom_format(custom_i, (SurfaceTool::CustomFormat)((lightmap_surfaces[i].format >> custom_shift[custom_i]) & RSE::ARRAY_FORMAT_CUSTOM_MASK));
+		for (int custom_i = 0; custom_i < RS::ARRAY_CUSTOM_COUNT; custom_i++) {
+			st->set_custom_format(custom_i, (SurfaceTool::CustomFormat)((lightmap_surfaces[i].format >> custom_shift[custom_i]) & RS::ARRAY_FORMAT_CUSTOM_MASK));
 		}
 		surfaces_tools.push_back(st); //stay there
 	}
@@ -1493,8 +1212,8 @@ Error ImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform,
 			if (lightmap_surfaces[surface].format & Mesh::ARRAY_FORMAT_WEIGHTS) {
 				surfaces_tools[surface]->set_weights(v.weights);
 			}
-			for (int custom_i = 0; custom_i < RSE::ARRAY_CUSTOM_COUNT; custom_i++) {
-				if ((lightmap_surfaces[surface].format >> custom_shift[custom_i]) & RSE::ARRAY_FORMAT_CUSTOM_MASK) {
+			for (int custom_i = 0; custom_i < RS::ARRAY_CUSTOM_COUNT; custom_i++) {
+				if ((lightmap_surfaces[surface].format >> custom_shift[custom_i]) & RS::ARRAY_FORMAT_CUSTOM_MASK) {
 					surfaces_tools[surface]->set_custom(custom_i, v.custom[custom_i]);
 				}
 			}
@@ -1514,9 +1233,9 @@ Error ImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform,
 
 		uint64_t format = lightmap_surfaces[i].format;
 		if (tool->get_skin_weight_count() == SurfaceTool::SKIN_8_WEIGHTS) {
-			format |= RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+			format |= RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 		} else {
-			format &= ~RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+			format &= ~RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 		}
 
 		add_surface(tool->get_primitive_type(), arrays, Array(), Dictionary(), tool->get_material(), tool->get_meta("name"), format);
@@ -1549,7 +1268,6 @@ Size2i ImporterMesh::get_lightmap_size_hint() const {
 }
 
 void ImporterMesh::_bind_methods() {
-	ClassDB::bind_static_method("ImporterMesh", D_METHOD("merge_importer_meshes", "importer_meshes", "relative_transforms", "deduplicate_surfaces"), &ImporterMesh::merge_importer_meshes, DEFVAL(true));
 	ClassDB::bind_method(D_METHOD("add_blend_shape", "name"), &ImporterMesh::add_blend_shape);
 	ClassDB::bind_method(D_METHOD("get_blend_shape_count"), &ImporterMesh::get_blend_shape_count);
 	ClassDB::bind_method(D_METHOD("get_blend_shape_name", "blend_shape_idx"), &ImporterMesh::get_blend_shape_name);
diff --git a/engine/scene/resources/3d/importer_mesh.h b/engine/scene/resources/3d/importer_mesh.h
index 5fdbde8a..665b461f 100644
--- a/engine/scene/resources/3d/importer_mesh.h
+++ b/engine/scene/resources/3d/importer_mesh.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/variant/typed_array.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 
@@ -88,15 +87,13 @@ protected:
 	static void _bind_methods();
 
 public:
-	static Ref<ImporterMesh> merge_importer_meshes(const TypedArray<ImporterMesh> &p_importer_meshes, const TypedArray<Transform3D> &p_relative_transforms, bool p_deduplicate_surfaces = true);
-
 	void add_blend_shape(const String &p_name);
 	int get_blend_shape_count() const;
 	String get_blend_shape_name(int p_blend_shape) const;
 
 	static String validate_blend_shape_name(const String &p_name);
 
-	void add_surface(Mesh::PrimitiveType p_primitive, const Array &p_arrays, const TypedArray<Array> &p_blend_shapes = TypedArray<Array>(), const Dictionary &p_lods = Dictionary(), const Ref<Material> &p_material = Ref<Material>(), const String &p_surface_name = String(), const uint64_t p_flags = 0);
+	void add_surface(Mesh::PrimitiveType p_primitive, const Array &p_arrays, const TypedArray<Array> &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), const Ref<Material> &p_material = Ref<Material>(), const String &p_surface_name = String(), const uint64_t p_flags = 0);
 	int get_surface_count() const;
 
 	void set_blend_shape_mode(Mesh::BlendShapeMode p_blend_shape_mode);
diff --git a/engine/scene/resources/3d/joint_limitation_3d.cpp b/engine/scene/resources/3d/joint_limitation_3d.cpp
index 51629123..d6bab4db 100644
--- a/engine/scene/resources/3d/joint_limitation_3d.cpp
+++ b/engine/scene/resources/3d/joint_limitation_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "joint_limitation_3d.h"
 
+#include "scene/3d/skeleton_modifier_3d.h"
+
 Quaternion JointLimitation3D::make_space(const Vector3 &p_local_forward_vector, const Vector3 &p_local_right_vector, const Quaternion &p_rotation_offset) const {
 	const double ALMOST_ONE = 1.0 - CMP_EPSILON;
 	// The default is to interpret the forward vector as the +Y axis.
diff --git a/engine/scene/resources/3d/joint_limitation_cone_3d.cpp b/engine/scene/resources/3d/joint_limitation_cone_3d.cpp
index e85e159d..e6e46cf4 100644
--- a/engine/scene/resources/3d/joint_limitation_cone_3d.cpp
+++ b/engine/scene/resources/3d/joint_limitation_cone_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "joint_limitation_cone_3d.h"
 
-#include "core/object/class_db.h"
-
 #ifndef DISABLE_DEPRECATED
 bool JointLimitationCone3D::_set(const StringName &p_path, const Variant &p_value) {
 	// To keep compatibility between 4.6.beta2 and beta3.
diff --git a/engine/scene/resources/3d/mesh_library.cpp b/engine/scene/resources/3d/mesh_library.cpp
index 2076b918..3f8b6529 100644
--- a/engine/scene/resources/3d/mesh_library.cpp
+++ b/engine/scene/resources/3d/mesh_library.cpp
@@ -30,12 +30,8 @@
 
 #include "mesh_library.h"
 
-#include "core/object/class_db.h"
-#include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
-
 #ifndef PHYSICS_3D_DISABLED
-#include "scene/resources/3d/box_shape_3d.h"
+#include "box_shape_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
@@ -56,19 +52,19 @@ bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 		} else if (what == "mesh_cast_shadow") {
 			switch ((int)p_value) {
 				case 0: {
-					set_item_mesh_cast_shadow(idx, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF);
+					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_OFF);
 				} break;
 				case 1: {
-					set_item_mesh_cast_shadow(idx, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
+					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
 				} break;
 				case 2: {
-					set_item_mesh_cast_shadow(idx, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
+					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
 				} break;
 				case 3: {
-					set_item_mesh_cast_shadow(idx, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
+					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
 				} break;
 				default: {
-					set_item_mesh_cast_shadow(idx, RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
+					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
 				} break;
 			}
 #ifndef PHYSICS_3D_DISABLED
@@ -147,15 +143,15 @@ bool MeshLibrary::_get(const StringName &p_name, Variant &r_ret) const {
 void MeshLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 	for (const KeyValue<int, Item> &E : item_map) {
 		String prop_name = vformat("%s/%d/", PNAME("item"), E.key);
-		p_list->push_back(PropertyInfo(Variant::STRING, prop_name + PNAME("name"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("mesh"), PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, prop_name + PNAME("mesh_transform"), PROPERTY_HINT_NONE, "suffix:m", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::INT, prop_name + PNAME("mesh_cast_shadow"), PROPERTY_HINT_ENUM, "Off,On,Double-Sided,Shadows Only", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::ARRAY, prop_name + PNAME("shapes"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("navigation_mesh"), PROPERTY_HINT_RESOURCE_TYPE, NavigationMesh::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, prop_name + PNAME("navigation_mesh_transform"), PROPERTY_HINT_NONE, "suffix:m", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::INT, prop_name + PNAME("navigation_layers"), PROPERTY_HINT_LAYERS_3D_NAVIGATION, "", PROPERTY_USAGE_NO_EDITOR));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("preview"), PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_NO_EDITOR));
+		p_list->push_back(PropertyInfo(Variant::STRING, prop_name + PNAME("name")));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("mesh"), PROPERTY_HINT_RESOURCE_TYPE, "Mesh"));
+		p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, prop_name + PNAME("mesh_transform"), PROPERTY_HINT_NONE, "suffix:m"));
+		p_list->push_back(PropertyInfo(Variant::INT, prop_name + PNAME("mesh_cast_shadow"), PROPERTY_HINT_ENUM, "Off,On,Double-Sided,Shadows Only"));
+		p_list->push_back(PropertyInfo(Variant::ARRAY, prop_name + PNAME("shapes")));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("navigation_mesh"), PROPERTY_HINT_RESOURCE_TYPE, "NavigationMesh"));
+		p_list->push_back(PropertyInfo(Variant::TRANSFORM3D, prop_name + PNAME("navigation_mesh_transform"), PROPERTY_HINT_NONE, "suffix:m"));
+		p_list->push_back(PropertyInfo(Variant::INT, prop_name + PNAME("navigation_layers"), PROPERTY_HINT_LAYERS_3D_NAVIGATION));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + PNAME("preview"), PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT));
 	}
 }
 
@@ -185,7 +181,7 @@ void MeshLibrary::set_item_mesh_transform(int p_item, const Transform3D &p_trans
 	emit_changed();
 }
 
-void MeshLibrary::set_item_mesh_cast_shadow(int p_item, RSE::ShadowCastingSetting p_shadow_casting_setting) {
+void MeshLibrary::set_item_mesh_cast_shadow(int p_item, RS::ShadowCastingSetting p_shadow_casting_setting) {
 	ERR_FAIL_COND_MSG(!item_map.has(p_item), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	item_map[p_item].mesh_cast_shadow = p_shadow_casting_setting;
 	emit_changed();
@@ -239,8 +235,8 @@ Transform3D MeshLibrary::get_item_mesh_transform(int p_item) const {
 	return item_map[p_item].mesh_transform;
 }
 
-RSE::ShadowCastingSetting MeshLibrary::get_item_mesh_cast_shadow(int p_item) const {
-	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), RSE::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON, "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
+RS::ShadowCastingSetting MeshLibrary::get_item_mesh_cast_shadow(int p_item) const {
+	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON, "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	return item_map[p_item].mesh_cast_shadow;
 }
 
@@ -400,7 +396,6 @@ void MeshLibrary::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("clear"), &MeshLibrary::clear);
 	ClassDB::bind_method(D_METHOD("get_item_list"), &MeshLibrary::get_item_list);
-	ClassDB::bind_method(D_METHOD("get_item_count"), &MeshLibrary::get_item_count);
 	ClassDB::bind_method(D_METHOD("get_last_unused_item_id"), &MeshLibrary::get_last_unused_item_id);
 }
 
diff --git a/engine/scene/resources/3d/mesh_library.h b/engine/scene/resources/3d/mesh_library.h
index 0c505513..941000f9 100644
--- a/engine/scene/resources/3d/mesh_library.h
+++ b/engine/scene/resources/3d/mesh_library.h
@@ -34,10 +34,10 @@
 #include "core/templates/rb_map.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
-#include "scene/resources/3d/shape_3d.h"
+#include "shape_3d.h"
 #endif // PHYSICS_3D_DISABLED
 
 class MeshLibrary : public Resource {
@@ -55,7 +55,7 @@ public:
 		String name;
 		Ref<Mesh> mesh;
 		Transform3D mesh_transform;
-		RSE::ShadowCastingSetting mesh_cast_shadow = RSE::SHADOW_CASTING_SETTING_ON;
+		RS::ShadowCastingSetting mesh_cast_shadow = RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON;
 #ifndef PHYSICS_3D_DISABLED
 		Vector<ShapeData> shapes;
 #endif // PHYSICS_3D_DISABLED
@@ -85,7 +85,7 @@ public:
 	void set_item_name(int p_item, const String &p_name);
 	void set_item_mesh(int p_item, const Ref<Mesh> &p_mesh);
 	void set_item_mesh_transform(int p_item, const Transform3D &p_transform);
-	void set_item_mesh_cast_shadow(int p_item, RSE::ShadowCastingSetting p_shadow_casting_setting);
+	void set_item_mesh_cast_shadow(int p_item, RS::ShadowCastingSetting p_shadow_casting_setting);
 	void set_item_navigation_mesh(int p_item, const Ref<NavigationMesh> &p_navigation_mesh);
 	void set_item_navigation_mesh_transform(int p_item, const Transform3D &p_transform);
 	void set_item_navigation_layers(int p_item, uint32_t p_navigation_layers);
@@ -96,7 +96,7 @@ public:
 	String get_item_name(int p_item) const;
 	Ref<Mesh> get_item_mesh(int p_item) const;
 	Transform3D get_item_mesh_transform(int p_item) const;
-	RSE::ShadowCastingSetting get_item_mesh_cast_shadow(int p_item) const;
+	RS::ShadowCastingSetting get_item_mesh_cast_shadow(int p_item) const;
 	Ref<NavigationMesh> get_item_navigation_mesh(int p_item) const;
 	Transform3D get_item_navigation_mesh_transform(int p_item) const;
 	uint32_t get_item_navigation_layers(int p_item) const;
@@ -113,7 +113,6 @@ public:
 	int find_item_by_name(const String &p_name) const;
 
 	Vector<int> get_item_list() const;
-	int get_item_count() const { return item_map.size(); }
 	int get_last_unused_item_id() const;
 
 	MeshLibrary();
diff --git a/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp b/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
index 3dd2759a..4f696fa8 100644
--- a/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
+++ b/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
@@ -30,9 +30,6 @@
 
 #include "navigation_mesh_source_geometry_data_3d.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
-
 void NavigationMeshSourceGeometryData3D::set_vertices(const Vector<float> &p_vertices) {
 	RWLockWrite write_lock(geometry_rwlock);
 	vertices = p_vertices;
diff --git a/engine/scene/resources/3d/primitive_meshes.cpp b/engine/scene/resources/3d/primitive_meshes.cpp
index 37e424e4..0a635afd 100644
--- a/engine/scene/resources/3d/primitive_meshes.cpp
+++ b/engine/scene/resources/3d/primitive_meshes.cpp
@@ -30,18 +30,13 @@
 
 #include "primitive_meshes.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/math/math_funcs.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
 #include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
-
-#include <thirdparty/misc/polypartition.h>
+#include "thirdparty/misc/polypartition.h"
 
 #define PADDING_REF_SIZE 1024.0
 
@@ -51,13 +46,13 @@
 void PrimitiveMesh::_update() const {
 	Array arr;
 	if (GDVIRTUAL_CALL(_create_mesh_array, arr)) {
-		ERR_FAIL_COND_MSG(arr.size() != RSE::ARRAY_MAX, "_create_mesh_array must return an array of Mesh.ARRAY_MAX elements.");
+		ERR_FAIL_COND_MSG(arr.size() != RS::ARRAY_MAX, "_create_mesh_array must return an array of Mesh.ARRAY_MAX elements.");
 	} else {
-		arr.resize(RSE::ARRAY_MAX);
+		arr.resize(RS::ARRAY_MAX);
 		_create_mesh_array(arr);
 	}
 
-	Vector<Vector3> points = arr[RSE::ARRAY_VERTEX];
+	Vector<Vector3> points = arr[RS::ARRAY_VERTEX];
 
 	ERR_FAIL_COND_MSG(points.is_empty(), "_create_mesh_array must return at least a vertex array.");
 
@@ -76,10 +71,10 @@ void PrimitiveMesh::_update() const {
 		}
 	}
 
-	Vector<int> indices = arr[RSE::ARRAY_INDEX];
+	Vector<int> indices = arr[RS::ARRAY_INDEX];
 
 	if (flip_faces) {
-		Vector<Vector3> normals = arr[RSE::ARRAY_NORMAL];
+		Vector<Vector3> normals = arr[RS::ARRAY_NORMAL];
 
 		if (normals.size() && indices.size()) {
 			{
@@ -97,8 +92,8 @@ void PrimitiveMesh::_update() const {
 					SWAP(w[i + 0], w[i + 1]);
 				}
 			}
-			arr[RSE::ARRAY_NORMAL] = normals;
-			arr[RSE::ARRAY_INDEX] = indices;
+			arr[RS::ARRAY_NORMAL] = normals;
+			arr[RS::ARRAY_INDEX] = indices;
 		}
 	}
 
@@ -106,8 +101,8 @@ void PrimitiveMesh::_update() const {
 		// _create_mesh_array should populate our UV2, this is a fallback in case it doesn't.
 		// As we don't know anything about the geometry we only pad the right and bottom edge
 		// of our texture.
-		Vector<Vector2> uv = arr[RSE::ARRAY_TEX_UV];
-		Vector<Vector2> uv2 = arr[RSE::ARRAY_TEX_UV2];
+		Vector<Vector2> uv = arr[RS::ARRAY_TEX_UV];
+		Vector<Vector2> uv2 = arr[RS::ARRAY_TEX_UV2];
 
 		if (uv.size() > 0 && uv2.is_empty()) {
 			Vector2 uv2_scale = get_uv2_scale();
@@ -119,14 +114,14 @@ void PrimitiveMesh::_update() const {
 			}
 		}
 
-		arr[RSE::ARRAY_TEX_UV2] = uv2;
+		arr[RS::ARRAY_TEX_UV2] = uv2;
 	}
 
 	array_len = pc;
 	index_array_len = indices.size();
 	// in with the new
 	RenderingServer::get_singleton()->mesh_clear(mesh);
-	RenderingServer::get_singleton()->mesh_add_surface_from_arrays(mesh, (RSE::PrimitiveType)primitive_type, arr);
+	RenderingServer::get_singleton()->mesh_add_surface_from_arrays(mesh, (RenderingServer::PrimitiveType)primitive_type, arr);
 	RenderingServer::get_singleton()->mesh_surface_set_material(mesh, 0, material.is_null() ? RID() : material->get_rid());
 
 	pending_request = false;
@@ -188,9 +183,9 @@ TypedArray<Array> PrimitiveMesh::surface_get_blend_shape_arrays(int p_surface) c
 BitField<Mesh::ArrayFormat> PrimitiveMesh::surface_get_format(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, 1, 0);
 
-	uint64_t mesh_format = RSE::ARRAY_FORMAT_VERTEX | RSE::ARRAY_FORMAT_NORMAL | RSE::ARRAY_FORMAT_TANGENT | RSE::ARRAY_FORMAT_TEX_UV | RSE::ARRAY_FORMAT_INDEX;
+	uint64_t mesh_format = RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_NORMAL | RS::ARRAY_FORMAT_TANGENT | RS::ARRAY_FORMAT_TEX_UV | RS::ARRAY_FORMAT_INDEX;
 	if (add_uv2) {
-		mesh_format |= RSE::ARRAY_FORMAT_TEX_UV2;
+		mesh_format |= RS::ARRAY_FORMAT_TEX_UV2;
 	}
 
 	return mesh_format;
@@ -446,9 +441,9 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	// Note, this has been aligned with our collision shape but I've left the descriptions as top/middle/bottom.
@@ -604,14 +599,14 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 		thisrow = point;
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (p_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void CapsuleMesh::_bind_methods() {
@@ -766,9 +761,9 @@ void BoxMesh::create_mesh_array(Array &p_arr, Vector3 size, int subdivide_w, int
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	// front + back
@@ -960,14 +955,14 @@ void BoxMesh::create_mesh_array(Array &p_arr, Vector3 size, int subdivide_w, int
 		thisrow = point;
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (p_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void BoxMesh::_bind_methods() {
@@ -1109,9 +1104,9 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	thisrow = 0;
@@ -1264,14 +1259,14 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 		}
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (p_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void CylinderMesh::_bind_methods() {
@@ -1445,9 +1440,9 @@ void PlaneMesh::_create_mesh_array(Array &p_arr) const {
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	/* top + bottom */
@@ -1495,11 +1490,11 @@ void PlaneMesh::_create_mesh_array(Array &p_arr) const {
 		thisrow = point;
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void PlaneMesh::_bind_methods() {
@@ -1660,9 +1655,9 @@ void PrismMesh::_create_mesh_array(Array &p_arr) const {
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	/* front + back */
@@ -1867,14 +1862,14 @@ void PrismMesh::_create_mesh_array(Array &p_arr) const {
 		thisrow = point;
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void PrismMesh::_bind_methods() {
@@ -2018,9 +2013,9 @@ void SphereMesh::create_mesh_array(Array &p_arr, float radius, float height, int
 	point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	thisrow = 0;
@@ -2082,14 +2077,14 @@ void SphereMesh::create_mesh_array(Array &p_arr, float radius, float height, int
 		thisrow = point;
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (p_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void SphereMesh::_bind_methods() {
@@ -2229,9 +2224,9 @@ void TorusMesh::_create_mesh_array(Array &p_arr) const {
 	indices.reserve(rings * ring_segments * 6);
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	ERR_FAIL_COND_MSG(inner_radius == outer_radius, "Inner radius and outer radius cannot be the same.");
@@ -2293,14 +2288,14 @@ void TorusMesh::_create_mesh_array(Array &p_arr) const {
 		}
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
 	if (_add_uv2) {
-		p_arr[RSE::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
+		p_arr[RS::ARRAY_TEX_UV2] = Vector<Vector2>(uv2s);
 	}
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void TorusMesh::_bind_methods() {
@@ -2381,7 +2376,7 @@ void PointMesh::_create_mesh_array(Array &p_arr) const {
 	faces.resize(1);
 	faces.set(0, Vector3(0.0, 0.0, 0.0));
 
-	p_arr[RSE::ARRAY_VERTEX] = faces;
+	p_arr[RS::ARRAY_VERTEX] = faces;
 }
 
 PointMesh::PointMesh() {
@@ -2532,9 +2527,9 @@ void TubeTrailMesh::_create_mesh_array(Array &p_arr) const {
 	int point = 0;
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	int thisrow = 0;
@@ -2736,13 +2731,13 @@ void TubeTrailMesh::_create_mesh_array(Array &p_arr) const {
 		}
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
-	p_arr[RSE::ARRAY_BONES] = Vector<int>(bone_indices);
-	p_arr[RSE::ARRAY_WEIGHTS] = Vector<float>(bone_weights);
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_BONES] = Vector<int>(bone_indices);
+	p_arr[RS::ARRAY_WEIGHTS] = Vector<float>(bone_weights);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void TubeTrailMesh::_bind_methods() {
@@ -2782,7 +2777,7 @@ void TubeTrailMesh::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cap_top"), "set_cap_top", "is_cap_top");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cap_bottom"), "set_cap_bottom", "is_cap_bottom");
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve", "get_curve");
 }
 
 TubeTrailMesh::TubeTrailMesh() {
@@ -2907,9 +2902,9 @@ void RibbonTrailMesh::_create_mesh_array(Array &p_arr) const {
 	indices.reserve(total_segments * 6 * (shape == SHAPE_CROSS ? 2 : 1));
 
 #define ADD_TANGENT(m_x, m_y, m_z, m_d) \
-	tangents.push_back(m_x); \
-	tangents.push_back(m_y); \
-	tangents.push_back(m_z); \
+	tangents.push_back(m_x);            \
+	tangents.push_back(m_y);            \
+	tangents.push_back(m_z);            \
 	tangents.push_back(m_d);
 
 	for (int j = 0; j <= total_segments; j++) {
@@ -2999,13 +2994,13 @@ void RibbonTrailMesh::_create_mesh_array(Array &p_arr) const {
 		}
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = Vector<Vector3>(points);
-	p_arr[RSE::ARRAY_NORMAL] = Vector<Vector3>(normals);
-	p_arr[RSE::ARRAY_TANGENT] = Vector<float>(tangents);
-	p_arr[RSE::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
-	p_arr[RSE::ARRAY_BONES] = Vector<int>(bone_indices);
-	p_arr[RSE::ARRAY_WEIGHTS] = Vector<float>(bone_weights);
-	p_arr[RSE::ARRAY_INDEX] = Vector<int>(indices);
+	p_arr[RS::ARRAY_VERTEX] = Vector<Vector3>(points);
+	p_arr[RS::ARRAY_NORMAL] = Vector<Vector3>(normals);
+	p_arr[RS::ARRAY_TANGENT] = Vector<float>(tangents);
+	p_arr[RS::ARRAY_TEX_UV] = Vector<Vector2>(uvs);
+	p_arr[RS::ARRAY_BONES] = Vector<int>(bone_indices);
+	p_arr[RS::ARRAY_WEIGHTS] = Vector<float>(bone_weights);
+	p_arr[RS::ARRAY_INDEX] = Vector<int>(indices);
 }
 
 void RibbonTrailMesh::_bind_methods() {
@@ -3032,7 +3027,7 @@ void RibbonTrailMesh::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sections", PROPERTY_HINT_RANGE, "2,128,1"), "set_sections", "get_sections");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "section_length", PROPERTY_HINT_RANGE, "0.001,1024.0,0.001,or_greater,suffix:m"), "set_section_length", "get_section_length");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "section_segments", PROPERTY_HINT_RANGE, "1,128,1"), "set_section_segments", "get_section_segments");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve", "get_curve");
 
 	BIND_ENUM_CONSTANT(SHAPE_FLAT)
 	BIND_ENUM_CONSTANT(SHAPE_CROSS)
@@ -3602,11 +3597,11 @@ void TextMesh::_create_mesh_array(Array &p_arr) const {
 		indices.push_back(0);
 	}
 
-	p_arr[RSE::ARRAY_VERTEX] = vertices;
-	p_arr[RSE::ARRAY_NORMAL] = normals;
-	p_arr[RSE::ARRAY_TANGENT] = tangents;
-	p_arr[RSE::ARRAY_TEX_UV] = uvs;
-	p_arr[RSE::ARRAY_INDEX] = indices;
+	p_arr[RS::ARRAY_VERTEX] = vertices;
+	p_arr[RS::ARRAY_NORMAL] = normals;
+	p_arr[RS::ARRAY_TANGENT] = tangents;
+	p_arr[RS::ARRAY_TEX_UV] = uvs;
+	p_arr[RS::ARRAY_INDEX] = indices;
 }
 
 void TextMesh::_bind_methods() {
@@ -3666,7 +3661,7 @@ void TextMesh::_bind_methods() {
 
 	ADD_GROUP("Text", "");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT, ""), "set_text", "get_text");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static()), "set_font", "get_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_font", "get_font");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "font_size", PROPERTY_HINT_RANGE, "1,256,1,or_greater,suffix:px"), "set_font_size", "get_font_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vertical_alignment", PROPERTY_HINT_ENUM, "Top,Center,Bottom"), "set_vertical_alignment", "get_vertical_alignment");
diff --git a/engine/scene/resources/3d/primitive_meshes.h b/engine/scene/resources/3d/primitive_meshes.h
index d60672cf..94af2f4b 100644
--- a/engine/scene/resources/3d/primitive_meshes.h
+++ b/engine/scene/resources/3d/primitive_meshes.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "scene/resources/curve.h"
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
 #include "servers/text/text_server.h"
diff --git a/engine/scene/resources/3d/separation_ray_shape_3d.cpp b/engine/scene/resources/3d/separation_ray_shape_3d.cpp
index 9a4fa959..4d3a3cc8 100644
--- a/engine/scene/resources/3d/separation_ray_shape_3d.cpp
+++ b/engine/scene/resources/3d/separation_ray_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "separation_ray_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/engine/scene/resources/3d/shape_3d.cpp b/engine/scene/resources/3d/shape_3d.cpp
index 3a261e52..0c8744b7 100644
--- a/engine/scene/resources/3d/shape_3d.cpp
+++ b/engine/scene/resources/3d/shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
diff --git a/engine/scene/resources/3d/skin.cpp b/engine/scene/resources/3d/skin.cpp
index 56b77b65..a4fb371e 100644
--- a/engine/scene/resources/3d/skin.cpp
+++ b/engine/scene/resources/3d/skin.cpp
@@ -30,8 +30,6 @@
 
 #include "skin.h"
 
-#include "core/object/class_db.h"
-
 void Skin::set_bind_count(int p_size) {
 	ERR_FAIL_COND(p_size < 0);
 	binds.resize(p_size);
diff --git a/engine/scene/resources/3d/sky_material.cpp b/engine/scene/resources/3d/sky_material.cpp
index 823167a0..a2f9c0e5 100644
--- a/engine/scene/resources/3d/sky_material.cpp
+++ b/engine/scene/resources/3d/sky_material.cpp
@@ -30,12 +30,8 @@
 
 #include "sky_material.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "core/version.h"
-#include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server.h"
 
 Mutex ProceduralSkyMaterial::shader_mutex;
 RID ProceduralSkyMaterial::shader_cache[4];
@@ -271,7 +267,7 @@ void ProceduralSkyMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "sky_horizon_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_sky_horizon_color", "get_sky_horizon_color");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sky_curve", PROPERTY_HINT_EXP_EASING), "set_sky_curve", "get_sky_curve");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sky_energy_multiplier", PROPERTY_HINT_RANGE, "0,64,0.01"), "set_sky_energy_multiplier", "get_sky_energy_multiplier");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky_cover", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_sky_cover", "get_sky_cover");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky_cover", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_sky_cover", "get_sky_cover");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "sky_cover_modulate"), "set_sky_cover_modulate", "get_sky_cover_modulate");
 
 	ADD_GROUP("Ground", "ground_");
@@ -471,7 +467,7 @@ void PanoramaSkyMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_energy_multiplier", "multiplier"), &PanoramaSkyMaterial::set_energy_multiplier);
 	ClassDB::bind_method(D_METHOD("get_energy_multiplier"), &PanoramaSkyMaterial::get_energy_multiplier);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "panorama", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_panorama", "get_panorama");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "panorama", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_panorama", "get_panorama");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "filter"), "set_filtering_enabled", "is_filtering_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "energy_multiplier", PROPERTY_HINT_RANGE, "0,128,0.01"), "set_energy_multiplier", "get_energy_multiplier");
 }
@@ -718,7 +714,7 @@ void PhysicalSkyMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "ground_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_ground_color", "get_ground_color");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "energy_multiplier", PROPERTY_HINT_RANGE, "0,128,0.01"), "set_energy_multiplier", "get_energy_multiplier");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_debanding"), "set_use_debanding", "get_use_debanding");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "night_sky", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_night_sky", "get_night_sky");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "night_sky", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_night_sky", "get_night_sky");
 }
 
 void PhysicalSkyMaterial::cleanup_shader() {
diff --git a/engine/scene/resources/3d/sphere_shape_3d.cpp b/engine/scene/resources/3d/sphere_shape_3d.cpp
index e5e05a24..ba8a87d7 100644
--- a/engine/scene/resources/3d/sphere_shape_3d.cpp
+++ b/engine/scene/resources/3d/sphere_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "sphere_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -58,18 +57,18 @@ Vector<Vector3> SphereShape3D::get_debug_mesh_lines() const {
 
 Ref<ArrayMesh> SphereShape3D::get_debug_arraymesh_faces(const Color &p_modulate) const {
 	Array sphere_array;
-	sphere_array.resize(RSE::ARRAY_MAX);
+	sphere_array.resize(RS::ARRAY_MAX);
 	SphereMesh::create_mesh_array(sphere_array, radius, radius * 2, 32);
 
 	Vector<Color> colors;
-	const PackedVector3Array &verts = sphere_array[RSE::ARRAY_VERTEX];
+	const PackedVector3Array &verts = sphere_array[RS::ARRAY_VERTEX];
 	const int32_t verts_size = verts.size();
 	for (int i = 0; i < verts_size; i++) {
 		colors.append(p_modulate);
 	}
 
 	Ref<ArrayMesh> sphere_mesh = memnew(ArrayMesh);
-	sphere_array[RSE::ARRAY_COLOR] = colors;
+	sphere_array[RS::ARRAY_COLOR] = colors;
 	sphere_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, sphere_array);
 	return sphere_mesh;
 }
diff --git a/engine/scene/resources/3d/world_3d.cpp b/engine/scene/resources/3d/world_3d.cpp
index 106059d0..6c14ae33 100644
--- a/engine/scene/resources/3d/world_3d.cpp
+++ b/engine/scene/resources/3d/world_3d.cpp
@@ -31,12 +31,9 @@
 #include "world_3d.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
-#include "servers/rendering/rendering_server.h"
-
 #ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_3d/navigation_server_3d.h"
 #endif // NAVIGATION_3D_DISABLED
@@ -169,8 +166,8 @@ void World3D::_bind_methods() {
 #ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_direct_space_state"), &World3D::get_direct_space_state);
 #endif // PHYSICS_3D_DISABLED
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, Environment::get_class_static()), "set_environment", "get_environment");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_environment", PROPERTY_HINT_RESOURCE_TYPE, Environment::get_class_static()), "set_fallback_environment", "get_fallback_environment");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_fallback_environment", "get_fallback_environment");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_camera_attributes", "get_camera_attributes");
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
 #ifndef NAVIGATION_3D_DISABLED
@@ -178,7 +175,7 @@ void World3D::_bind_methods() {
 #endif // NAVIGATION_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "scenario", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_scenario");
 #ifndef PHYSICS_3D_DISABLED
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, PhysicsDirectSpaceState3D::get_class_static(), PROPERTY_USAGE_NONE), "", "get_direct_space_state");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState3D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
 #endif // PHYSICS_3D_DISABLED
 }
 
diff --git a/engine/scene/resources/3d/world_boundary_shape_3d.cpp b/engine/scene/resources/3d/world_boundary_shape_3d.cpp
index cd06bd04..9e951596 100644
--- a/engine/scene/resources/3d/world_boundary_shape_3d.cpp
+++ b/engine/scene/resources/3d/world_boundary_shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "world_boundary_shape_3d.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
@@ -102,9 +101,9 @@ Ref<ArrayMesh> WorldBoundaryShape3D::get_debug_arraymesh_faces(const Color &p_mo
 	Ref<ArrayMesh> mesh = memnew(ArrayMesh);
 	Array a;
 	a.resize(Mesh::ARRAY_MAX);
-	a[RSE::ARRAY_VERTEX] = points;
-	a[RSE::ARRAY_COLOR] = colors;
-	a[RSE::ARRAY_INDEX] = indices;
+	a[RS::ARRAY_VERTEX] = points;
+	a[RS::ARRAY_COLOR] = colors;
+	a[RS::ARRAY_INDEX] = indices;
 	mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, a);
 
 	return mesh;
diff --git a/engine/scene/resources/animated_texture.cpp b/engine/scene/resources/animated_texture.cpp
index 1c4e9013..00ae6479 100644
--- a/engine/scene/resources/animated_texture.cpp
+++ b/engine/scene/resources/animated_texture.cpp
@@ -30,9 +30,6 @@
 
 #include "animated_texture.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "core/os/os.h"
 #include "servers/rendering/rendering_server.h"
 
@@ -269,7 +266,7 @@ void AnimatedTexture::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "speed_scale", PROPERTY_HINT_RANGE, "-60,60,0.1,or_less,or_greater"), "set_speed_scale", "get_speed_scale");
 
 	for (int i = 0; i < MAX_FRAMES; i++) {
-		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_frame_texture", "get_frame_texture", i);
+		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_frame_texture", "get_frame_texture", i);
 		ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "frame_" + itos(i) + "/duration", PROPERTY_HINT_RANGE, "0.0,16.0,0.01,or_greater,suffix:s", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_frame_duration", "get_frame_duration", i);
 	}
 
diff --git a/engine/scene/resources/animated_texture.h b/engine/scene/resources/animated_texture.h
index c5557819..29811d32 100644
--- a/engine/scene/resources/animated_texture.h
+++ b/engine/scene/resources/animated_texture.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/os/rw_lock.h"
 #include "scene/resources/texture.h"
 
 class AnimatedTexture : public Texture2D {
diff --git a/engine/scene/resources/animation.compat.inc b/engine/scene/resources/animation.compat.inc
index 0b4fbfcc..fc2672bb 100644
--- a/engine/scene/resources/animation.compat.inc
+++ b/engine/scene/resources/animation.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "animation.h"
-
-#include "core/object/class_db.h"
-
 Vector3 Animation::_position_track_interpolate_bind_compat_86629(int p_track, double p_time) const {
 	return position_track_interpolate(p_track, p_time, false);
 }
diff --git a/engine/scene/resources/animation.cpp b/engine/scene/resources/animation.cpp
index aa391688..896b8278 100644
--- a/engine/scene/resources/animation.cpp
+++ b/engine/scene/resources/animation.cpp
@@ -32,7 +32,6 @@
 #include "animation.compat.inc"
 
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 
 bool Animation::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
@@ -1034,7 +1033,7 @@ Animation::TrackType Animation::track_get_type(int p_track) const {
 void Animation::track_set_path(int p_track, const NodePath &p_path) {
 	ERR_FAIL_UNSIGNED_INDEX((uint32_t)p_track, tracks.size());
 	tracks[p_track]->path = p_path;
-	tracks[p_track]->concatenated_path = StringName(String(tracks[p_track]->path));
+	_track_update_hash(p_track);
 	emit_changed();
 }
 
@@ -1062,9 +1061,15 @@ Animation::TrackType Animation::get_cache_type(TrackType p_type) {
 	return p_type;
 }
 
-Animation::TrackCacheID Animation::track_get_unique_id(int p_track) const {
+void Animation::_track_update_hash(int p_track) {
+	const NodePath &track_path = tracks[p_track]->path;
+	const TrackType track_cache_type = get_cache_type(tracks[p_track]->type);
+	tracks[p_track]->thash = HashMapHasherDefault::hash(Pair<const NodePath &, TrackType>(track_path, track_cache_type));
+}
+
+Animation::TypeHash Animation::track_get_type_hash(int p_track) const {
 	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_track, tracks.size(), 0);
-	return tracks[p_track]->get_unique_id();
+	return tracks[p_track]->thash;
 }
 
 void Animation::track_set_interpolation_type(int p_track, InterpolationType p_interp) {
@@ -1085,7 +1090,7 @@ void Animation::track_set_interpolation_loop_wrap(int p_track, bool p_enable) {
 }
 
 bool Animation::track_get_interpolation_loop_wrap(int p_track) const {
-	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_track, tracks.size(), false);
+	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_track, tracks.size(), INTERPOLATION_NEAREST);
 	return tracks[p_track]->loop_wrap;
 }
 
@@ -1289,8 +1294,8 @@ Error Animation::try_rotation_track_interpolate(int p_track, double p_time, Quat
 Quaternion Animation::rotation_track_interpolate(int p_track, double p_time, bool p_backward) const {
 	Quaternion ret = Quaternion(0, 0, 0, 1);
 	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_track, tracks.size(), ret);
-	Error err = try_rotation_track_interpolate(p_track, p_time, &ret, p_backward);
-	ERR_FAIL_COND_V_MSG(err != OK, ret, "3D Rotation Track: '" + String(tracks[p_track]->path) + "' is unavailable.");
+	bool err = try_rotation_track_interpolate(p_track, p_time, &ret, p_backward);
+	ERR_FAIL_COND_V_MSG(err, ret, "3D Rotation Track: '" + String(tracks[p_track]->path) + "' is unavailable.");
 	return ret;
 }
 
@@ -2760,7 +2765,7 @@ Animation::UpdateMode Animation::value_track_get_update_mode(int p_track) const
 }
 
 template <typename T>
-void Animation::_track_get_key_indices_in_range(const LocalVector<T> &p_array, double from_time, double to_time, LocalVector<int> *r_indices, bool p_is_backward) const {
+void Animation::_track_get_key_indices_in_range(const LocalVector<T> &p_array, double from_time, double to_time, List<int> *p_indices, bool p_is_backward) const {
 	int len = p_array.size();
 	if (len == 0) {
 		return;
@@ -2798,22 +2803,22 @@ void Animation::_track_get_key_indices_in_range(const LocalVector<T> &p_array, d
 	}
 
 	if (from == to) {
-		r_indices->push_back(from);
+		p_indices->push_back(from);
 		return;
 	}
 
 	if (!p_is_backward) {
 		for (int i = from; i <= to; i++) {
-			r_indices->push_back(i);
+			p_indices->push_back(i);
 		}
 	} else {
 		for (int i = to; i >= from; i--) {
-			r_indices->push_back(i);
+			p_indices->push_back(i);
 		}
 	}
 }
 
-void Animation::track_get_key_indices_in_range(int p_track, double p_time, double p_delta, double p_start, double p_end, LocalVector<int> *r_indices, Animation::LoopedFlag p_looped_flag) const {
+void Animation::track_get_key_indices_in_range(int p_track, double p_time, double p_delta, double p_start, double p_end, List<int> *p_indices, Animation::LoopedFlag p_looped_flag) const {
 	ERR_FAIL_UNSIGNED_INDEX((uint32_t)p_track, tracks.size());
 
 	if (p_delta == 0) {
@@ -2872,111 +2877,111 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
 					case TYPE_POSITION_3D: {
 						const PositionTrack *tt = static_cast<const PositionTrack *>(t);
 						if (tt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, length, r_indices);
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, p_start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, length, p_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, p_start, to_time, p_indices);
 						} else {
 							if (!is_backward) {
-								_track_get_key_indices_in_range(tt->positions, from_time, anim_end, r_indices, is_backward);
-								_track_get_key_indices_in_range(tt->positions, anim_start, to_time, r_indices, is_backward);
+								_track_get_key_indices_in_range(tt->positions, from_time, anim_end, p_indices, is_backward);
+								_track_get_key_indices_in_range(tt->positions, anim_start, to_time, p_indices, is_backward);
 							} else {
-								_track_get_key_indices_in_range(tt->positions, anim_start, to_time, r_indices, is_backward);
-								_track_get_key_indices_in_range(tt->positions, from_time, anim_end, r_indices, is_backward);
+								_track_get_key_indices_in_range(tt->positions, anim_start, to_time, p_indices, is_backward);
+								_track_get_key_indices_in_range(tt->positions, from_time, anim_end, p_indices, is_backward);
 							}
 						}
 					} break;
 					case TYPE_ROTATION_3D: {
 						const RotationTrack *rt = static_cast<const RotationTrack *>(t);
 						if (rt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, to_time, p_indices);
 						} else {
 							if (!is_backward) {
-								_track_get_key_indices_in_range(rt->rotations, from_time, anim_end, r_indices, is_backward);
-								_track_get_key_indices_in_range(rt->rotations, anim_start, to_time, r_indices, is_backward);
+								_track_get_key_indices_in_range(rt->rotations, from_time, anim_end, p_indices, is_backward);
+								_track_get_key_indices_in_range(rt->rotations, anim_start, to_time, p_indices, is_backward);
 							} else {
-								_track_get_key_indices_in_range(rt->rotations, anim_start, to_time, r_indices, is_backward);
-								_track_get_key_indices_in_range(rt->rotations, from_time, anim_end, r_indices, is_backward);
+								_track_get_key_indices_in_range(rt->rotations, anim_start, to_time, p_indices, is_backward);
+								_track_get_key_indices_in_range(rt->rotations, from_time, anim_end, p_indices, is_backward);
 							}
 						}
 					} break;
 					case TYPE_SCALE_3D: {
 						const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
 						if (st->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, to_time, p_indices);
 						} else {
 							if (!is_backward) {
-								_track_get_key_indices_in_range(st->scales, from_time, anim_end, r_indices, is_backward);
-								_track_get_key_indices_in_range(st->scales, anim_start, to_time, r_indices, is_backward);
+								_track_get_key_indices_in_range(st->scales, from_time, anim_end, p_indices, is_backward);
+								_track_get_key_indices_in_range(st->scales, anim_start, to_time, p_indices, is_backward);
 							} else {
-								_track_get_key_indices_in_range(st->scales, anim_start, to_time, r_indices, is_backward);
-								_track_get_key_indices_in_range(st->scales, from_time, anim_end, r_indices, is_backward);
+								_track_get_key_indices_in_range(st->scales, anim_start, to_time, p_indices, is_backward);
+								_track_get_key_indices_in_range(st->scales, from_time, anim_end, p_indices, is_backward);
 							}
 						}
 					} break;
 					case TYPE_BLEND_SHAPE: {
 						const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
 						if (bst->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, to_time, p_indices);
 						} else {
 							if (!is_backward) {
-								_track_get_key_indices_in_range(bst->blend_shapes, from_time, anim_end, r_indices, is_backward);
-								_track_get_key_indices_in_range(bst->blend_shapes, anim_start, to_time, r_indices, is_backward);
+								_track_get_key_indices_in_range(bst->blend_shapes, from_time, anim_end, p_indices, is_backward);
+								_track_get_key_indices_in_range(bst->blend_shapes, anim_start, to_time, p_indices, is_backward);
 							} else {
-								_track_get_key_indices_in_range(bst->blend_shapes, anim_start, to_time, r_indices, is_backward);
-								_track_get_key_indices_in_range(bst->blend_shapes, from_time, anim_end, r_indices, is_backward);
+								_track_get_key_indices_in_range(bst->blend_shapes, anim_start, to_time, p_indices, is_backward);
+								_track_get_key_indices_in_range(bst->blend_shapes, from_time, anim_end, p_indices, is_backward);
 							}
 						}
 					} break;
 					case TYPE_VALUE: {
 						const ValueTrack *vt = static_cast<const ValueTrack *>(t);
 						if (!is_backward) {
-							_track_get_key_indices_in_range(vt->values, from_time, anim_end, r_indices, is_backward);
-							_track_get_key_indices_in_range(vt->values, anim_start, to_time, r_indices, is_backward);
+							_track_get_key_indices_in_range(vt->values, from_time, anim_end, p_indices, is_backward);
+							_track_get_key_indices_in_range(vt->values, anim_start, to_time, p_indices, is_backward);
 						} else {
-							_track_get_key_indices_in_range(vt->values, anim_start, to_time, r_indices, is_backward);
-							_track_get_key_indices_in_range(vt->values, from_time, anim_end, r_indices, is_backward);
+							_track_get_key_indices_in_range(vt->values, anim_start, to_time, p_indices, is_backward);
+							_track_get_key_indices_in_range(vt->values, from_time, anim_end, p_indices, is_backward);
 						}
 					} break;
 					case TYPE_METHOD: {
 						const MethodTrack *mt = static_cast<const MethodTrack *>(t);
 						if (!is_backward) {
-							_track_get_key_indices_in_range(mt->methods, from_time, anim_end, r_indices, is_backward);
-							_track_get_key_indices_in_range(mt->methods, anim_start, to_time, r_indices, is_backward);
+							_track_get_key_indices_in_range(mt->methods, from_time, anim_end, p_indices, is_backward);
+							_track_get_key_indices_in_range(mt->methods, anim_start, to_time, p_indices, is_backward);
 						} else {
-							_track_get_key_indices_in_range(mt->methods, anim_start, to_time, r_indices, is_backward);
-							_track_get_key_indices_in_range(mt->methods, from_time, anim_end, r_indices, is_backward);
+							_track_get_key_indices_in_range(mt->methods, anim_start, to_time, p_indices, is_backward);
+							_track_get_key_indices_in_range(mt->methods, from_time, anim_end, p_indices, is_backward);
 						}
 					} break;
 					case TYPE_BEZIER: {
 						const BezierTrack *bz = static_cast<const BezierTrack *>(t);
 						if (!is_backward) {
-							_track_get_key_indices_in_range(bz->values, from_time, anim_end, r_indices, is_backward);
-							_track_get_key_indices_in_range(bz->values, anim_start, to_time, r_indices, is_backward);
+							_track_get_key_indices_in_range(bz->values, from_time, anim_end, p_indices, is_backward);
+							_track_get_key_indices_in_range(bz->values, anim_start, to_time, p_indices, is_backward);
 						} else {
-							_track_get_key_indices_in_range(bz->values, anim_start, to_time, r_indices, is_backward);
-							_track_get_key_indices_in_range(bz->values, from_time, anim_end, r_indices, is_backward);
+							_track_get_key_indices_in_range(bz->values, anim_start, to_time, p_indices, is_backward);
+							_track_get_key_indices_in_range(bz->values, from_time, anim_end, p_indices, is_backward);
 						}
 					} break;
 					case TYPE_AUDIO: {
 						const AudioTrack *ad = static_cast<const AudioTrack *>(t);
 						if (!is_backward) {
-							_track_get_key_indices_in_range(ad->values, from_time, anim_end, r_indices, is_backward);
-							_track_get_key_indices_in_range(ad->values, anim_start, to_time, r_indices, is_backward);
+							_track_get_key_indices_in_range(ad->values, from_time, anim_end, p_indices, is_backward);
+							_track_get_key_indices_in_range(ad->values, anim_start, to_time, p_indices, is_backward);
 						} else {
-							_track_get_key_indices_in_range(ad->values, anim_start, to_time, r_indices, is_backward);
-							_track_get_key_indices_in_range(ad->values, from_time, anim_end, r_indices, is_backward);
+							_track_get_key_indices_in_range(ad->values, anim_start, to_time, p_indices, is_backward);
+							_track_get_key_indices_in_range(ad->values, from_time, anim_end, p_indices, is_backward);
 						}
 					} break;
 					case TYPE_ANIMATION: {
 						const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
 						if (!is_backward) {
-							_track_get_key_indices_in_range(an->values, from_time, anim_end, r_indices, is_backward);
-							_track_get_key_indices_in_range(an->values, anim_start, to_time, r_indices, is_backward);
+							_track_get_key_indices_in_range(an->values, from_time, anim_end, p_indices, is_backward);
+							_track_get_key_indices_in_range(an->values, anim_start, to_time, p_indices, is_backward);
 						} else {
-							_track_get_key_indices_in_range(an->values, anim_start, to_time, r_indices, is_backward);
-							_track_get_key_indices_in_range(an->values, from_time, anim_end, r_indices, is_backward);
+							_track_get_key_indices_in_range(an->values, anim_start, to_time, p_indices, is_backward);
+							_track_get_key_indices_in_range(an->values, from_time, anim_end, p_indices, is_backward);
 						}
 					} break;
 				}
@@ -2988,12 +2993,12 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
 				if (!is_backward && Math::is_equal_approx(from_time, start)) {
 					int edge = track_find_key(p_track, start, FIND_MODE_EXACT);
 					if (edge >= 0) {
-						r_indices->push_back(edge);
+						p_indices->push_back(edge);
 					}
 				} else if (is_backward && Math::is_equal_approx(to_time, end)) {
 					int edge = track_find_key(p_track, end, FIND_MODE_EXACT);
 					if (edge >= 0) {
-						r_indices->push_back(edge);
+						p_indices->push_back(edge);
 					}
 				}
 			}
@@ -3012,67 +3017,67 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
 					case TYPE_POSITION_3D: {
 						const PositionTrack *tt = static_cast<const PositionTrack *>(t);
 						if (tt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, start, from_time, r_indices);
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, start, from_time, p_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, start, to_time, p_indices);
 						} else {
-							_track_get_key_indices_in_range(tt->positions, start, from_time, r_indices, true);
-							_track_get_key_indices_in_range(tt->positions, start, to_time, r_indices, false);
+							_track_get_key_indices_in_range(tt->positions, start, from_time, p_indices, true);
+							_track_get_key_indices_in_range(tt->positions, start, to_time, p_indices, false);
 						}
 					} break;
 					case TYPE_ROTATION_3D: {
 						const RotationTrack *rt = static_cast<const RotationTrack *>(t);
 						if (rt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, from_time, r_indices);
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, from_time, p_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, start, to_time, p_indices);
 						} else {
-							_track_get_key_indices_in_range(rt->rotations, start, from_time, r_indices, true);
-							_track_get_key_indices_in_range(rt->rotations, start, to_time, r_indices, false);
+							_track_get_key_indices_in_range(rt->rotations, start, from_time, p_indices, true);
+							_track_get_key_indices_in_range(rt->rotations, start, to_time, p_indices, false);
 						}
 					} break;
 					case TYPE_SCALE_3D: {
 						const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
 						if (st->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, from_time, r_indices);
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, from_time, p_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, start, to_time, p_indices);
 						} else {
-							_track_get_key_indices_in_range(st->scales, start, from_time, r_indices, true);
-							_track_get_key_indices_in_range(st->scales, start, to_time, r_indices, false);
+							_track_get_key_indices_in_range(st->scales, start, from_time, p_indices, true);
+							_track_get_key_indices_in_range(st->scales, start, to_time, p_indices, false);
 						}
 					} break;
 					case TYPE_BLEND_SHAPE: {
 						const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
 						if (bst->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, from_time, r_indices);
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, to_time, r_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, from_time, p_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, start, to_time, p_indices);
 						} else {
-							_track_get_key_indices_in_range(bst->blend_shapes, start, from_time, r_indices, true);
-							_track_get_key_indices_in_range(bst->blend_shapes, start, to_time, r_indices, false);
+							_track_get_key_indices_in_range(bst->blend_shapes, start, from_time, p_indices, true);
+							_track_get_key_indices_in_range(bst->blend_shapes, start, to_time, p_indices, false);
 						}
 					} break;
 					case TYPE_VALUE: {
 						const ValueTrack *vt = static_cast<const ValueTrack *>(t);
-						_track_get_key_indices_in_range(vt->values, start, from_time, r_indices, true);
-						_track_get_key_indices_in_range(vt->values, start, to_time, r_indices, false);
+						_track_get_key_indices_in_range(vt->values, start, from_time, p_indices, true);
+						_track_get_key_indices_in_range(vt->values, start, to_time, p_indices, false);
 					} break;
 					case TYPE_METHOD: {
 						const MethodTrack *mt = static_cast<const MethodTrack *>(t);
-						_track_get_key_indices_in_range(mt->methods, start, from_time, r_indices, true);
-						_track_get_key_indices_in_range(mt->methods, start, to_time, r_indices, false);
+						_track_get_key_indices_in_range(mt->methods, start, from_time, p_indices, true);
+						_track_get_key_indices_in_range(mt->methods, start, to_time, p_indices, false);
 					} break;
 					case TYPE_BEZIER: {
 						const BezierTrack *bz = static_cast<const BezierTrack *>(t);
-						_track_get_key_indices_in_range(bz->values, start, from_time, r_indices, true);
-						_track_get_key_indices_in_range(bz->values, start, to_time, r_indices, false);
+						_track_get_key_indices_in_range(bz->values, start, from_time, p_indices, true);
+						_track_get_key_indices_in_range(bz->values, start, to_time, p_indices, false);
 					} break;
 					case TYPE_AUDIO: {
 						const AudioTrack *ad = static_cast<const AudioTrack *>(t);
-						_track_get_key_indices_in_range(ad->values, start, from_time, r_indices, true);
-						_track_get_key_indices_in_range(ad->values, start, to_time, r_indices, false);
+						_track_get_key_indices_in_range(ad->values, start, from_time, p_indices, true);
+						_track_get_key_indices_in_range(ad->values, start, to_time, p_indices, false);
 					} break;
 					case TYPE_ANIMATION: {
 						const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
-						_track_get_key_indices_in_range(an->values, start, from_time, r_indices, true);
-						_track_get_key_indices_in_range(an->values, start, to_time, r_indices, false);
+						_track_get_key_indices_in_range(an->values, start, from_time, p_indices, true);
+						_track_get_key_indices_in_range(an->values, start, to_time, p_indices, false);
 					} break;
 				}
 				return;
@@ -3083,67 +3088,67 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
 					case TYPE_POSITION_3D: {
 						const PositionTrack *tt = static_cast<const PositionTrack *>(t);
 						if (tt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<3>(tt->compressed_track, to_time, end, r_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<3>(tt->compressed_track, to_time, end, p_indices);
 						} else {
-							_track_get_key_indices_in_range(tt->positions, from_time, end, r_indices, false);
-							_track_get_key_indices_in_range(tt->positions, to_time, end, r_indices, true);
+							_track_get_key_indices_in_range(tt->positions, from_time, end, p_indices, false);
+							_track_get_key_indices_in_range(tt->positions, to_time, end, p_indices, true);
 						}
 					} break;
 					case TYPE_ROTATION_3D: {
 						const RotationTrack *rt = static_cast<const RotationTrack *>(t);
 						if (rt->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<3>(rt->compressed_track, to_time, end, r_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<3>(rt->compressed_track, to_time, end, p_indices);
 						} else {
-							_track_get_key_indices_in_range(rt->rotations, from_time, end, r_indices, false);
-							_track_get_key_indices_in_range(rt->rotations, to_time, end, r_indices, true);
+							_track_get_key_indices_in_range(rt->rotations, from_time, end, p_indices, false);
+							_track_get_key_indices_in_range(rt->rotations, to_time, end, p_indices, true);
 						}
 					} break;
 					case TYPE_SCALE_3D: {
 						const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
 						if (st->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<3>(st->compressed_track, to_time, end, r_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<3>(st->compressed_track, to_time, end, p_indices);
 						} else {
-							_track_get_key_indices_in_range(st->scales, from_time, end, r_indices, false);
-							_track_get_key_indices_in_range(st->scales, to_time, end, r_indices, true);
+							_track_get_key_indices_in_range(st->scales, from_time, end, p_indices, false);
+							_track_get_key_indices_in_range(st->scales, to_time, end, p_indices, true);
 						}
 					} break;
 					case TYPE_BLEND_SHAPE: {
 						const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
 						if (bst->compressed_track >= 0) {
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, end, r_indices);
-							_get_compressed_key_indices_in_range<1>(bst->compressed_track, to_time, end, r_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, end, p_indices);
+							_get_compressed_key_indices_in_range<1>(bst->compressed_track, to_time, end, p_indices);
 						} else {
-							_track_get_key_indices_in_range(bst->blend_shapes, from_time, end, r_indices, false);
-							_track_get_key_indices_in_range(bst->blend_shapes, to_time, end, r_indices, true);
+							_track_get_key_indices_in_range(bst->blend_shapes, from_time, end, p_indices, false);
+							_track_get_key_indices_in_range(bst->blend_shapes, to_time, end, p_indices, true);
 						}
 					} break;
 					case TYPE_VALUE: {
 						const ValueTrack *vt = static_cast<const ValueTrack *>(t);
-						_track_get_key_indices_in_range(vt->values, from_time, end, r_indices, false);
-						_track_get_key_indices_in_range(vt->values, to_time, end, r_indices, true);
+						_track_get_key_indices_in_range(vt->values, from_time, end, p_indices, false);
+						_track_get_key_indices_in_range(vt->values, to_time, end, p_indices, true);
 					} break;
 					case TYPE_METHOD: {
 						const MethodTrack *mt = static_cast<const MethodTrack *>(t);
-						_track_get_key_indices_in_range(mt->methods, from_time, end, r_indices, false);
-						_track_get_key_indices_in_range(mt->methods, to_time, end, r_indices, true);
+						_track_get_key_indices_in_range(mt->methods, from_time, end, p_indices, false);
+						_track_get_key_indices_in_range(mt->methods, to_time, end, p_indices, true);
 					} break;
 					case TYPE_BEZIER: {
 						const BezierTrack *bz = static_cast<const BezierTrack *>(t);
-						_track_get_key_indices_in_range(bz->values, from_time, end, r_indices, false);
-						_track_get_key_indices_in_range(bz->values, to_time, end, r_indices, true);
+						_track_get_key_indices_in_range(bz->values, from_time, end, p_indices, false);
+						_track_get_key_indices_in_range(bz->values, to_time, end, p_indices, true);
 					} break;
 					case TYPE_AUDIO: {
 						const AudioTrack *ad = static_cast<const AudioTrack *>(t);
-						_track_get_key_indices_in_range(ad->values, from_time, end, r_indices, false);
-						_track_get_key_indices_in_range(ad->values, to_time, end, r_indices, true);
+						_track_get_key_indices_in_range(ad->values, from_time, end, p_indices, false);
+						_track_get_key_indices_in_range(ad->values, to_time, end, p_indices, true);
 					} break;
 					case TYPE_ANIMATION: {
 						const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
-						_track_get_key_indices_in_range(an->values, from_time, end, r_indices, false);
-						_track_get_key_indices_in_range(an->values, to_time, end, r_indices, true);
+						_track_get_key_indices_in_range(an->values, from_time, end, p_indices, false);
+						_track_get_key_indices_in_range(an->values, to_time, end, p_indices, true);
 					} break;
 				}
 				return;
@@ -3161,54 +3166,54 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
 		case TYPE_POSITION_3D: {
 			const PositionTrack *tt = static_cast<const PositionTrack *>(t);
 			if (tt->compressed_track >= 0) {
-				_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, to_time - from_time, r_indices);
+				_get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, to_time - from_time, p_indices);
 			} else {
-				_track_get_key_indices_in_range(tt->positions, from_time, to_time, r_indices, is_backward);
+				_track_get_key_indices_in_range(tt->positions, from_time, to_time, p_indices, is_backward);
 			}
 		} break;
 		case TYPE_ROTATION_3D: {
 			const RotationTrack *rt = static_cast<const RotationTrack *>(t);
 			if (rt->compressed_track >= 0) {
-				_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, to_time - from_time, r_indices);
+				_get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, to_time - from_time, p_indices);
 			} else {
-				_track_get_key_indices_in_range(rt->rotations, from_time, to_time, r_indices, is_backward);
+				_track_get_key_indices_in_range(rt->rotations, from_time, to_time, p_indices, is_backward);
 			}
 		} break;
 		case TYPE_SCALE_3D: {
 			const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
 			if (st->compressed_track >= 0) {
-				_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, to_time - from_time, r_indices);
+				_get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, to_time - from_time, p_indices);
 			} else {
-				_track_get_key_indices_in_range(st->scales, from_time, to_time, r_indices, is_backward);
+				_track_get_key_indices_in_range(st->scales, from_time, to_time, p_indices, is_backward);
 			}
 		} break;
 		case TYPE_BLEND_SHAPE: {
 			const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
 			if (bst->compressed_track >= 0) {
-				_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, to_time - from_time, r_indices);
+				_get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, to_time - from_time, p_indices);
 			} else {
-				_track_get_key_indices_in_range(bst->blend_shapes, from_time, to_time, r_indices, is_backward);
+				_track_get_key_indices_in_range(bst->blend_shapes, from_time, to_time, p_indices, is_backward);
 			}
 		} break;
 		case TYPE_VALUE: {
 			const ValueTrack *vt = static_cast<const ValueTrack *>(t);
-			_track_get_key_indices_in_range(vt->values, from_time, to_time, r_indices, is_backward);
+			_track_get_key_indices_in_range(vt->values, from_time, to_time, p_indices, is_backward);
 		} break;
 		case TYPE_METHOD: {
 			const MethodTrack *mt = static_cast<const MethodTrack *>(t);
-			_track_get_key_indices_in_range(mt->methods, from_time, to_time, r_indices, is_backward);
+			_track_get_key_indices_in_range(mt->methods, from_time, to_time, p_indices, is_backward);
 		} break;
 		case TYPE_BEZIER: {
 			const BezierTrack *bz = static_cast<const BezierTrack *>(t);
-			_track_get_key_indices_in_range(bz->values, from_time, to_time, r_indices, is_backward);
+			_track_get_key_indices_in_range(bz->values, from_time, to_time, p_indices, is_backward);
 		} break;
 		case TYPE_AUDIO: {
 			const AudioTrack *ad = static_cast<const AudioTrack *>(t);
-			_track_get_key_indices_in_range(ad->values, from_time, to_time, r_indices, is_backward);
+			_track_get_key_indices_in_range(ad->values, from_time, to_time, p_indices, is_backward);
 		} break;
 		case TYPE_ANIMATION: {
 			const AnimationTrack *an = static_cast<const AnimationTrack *>(t);
-			_track_get_key_indices_in_range(an->values, from_time, to_time, r_indices, is_backward);
+			_track_get_key_indices_in_range(an->values, from_time, to_time, p_indices, is_backward);
 		} break;
 	}
 }
@@ -3279,7 +3284,6 @@ double Animation::get_marker_time(const StringName &p_name) const {
 	return marker_times.get(p_name);
 }
 
-// TODO: This needs to be a TypedArray<StringName> see this PR for rationale https://github.com/godotengine/godot/pull/110767/
 PackedStringArray Animation::get_marker_names() const {
 	PackedStringArray names;
 	// We iterate on marker_names so the result is sorted by time.
@@ -3848,7 +3852,7 @@ StringName Animation::animation_track_get_key_animation(int p_track, int p_key)
 	return at->values[p_key].value;
 }
 
-void Animation::set_length(double p_length) {
+void Animation::set_length(real_t p_length) {
 	if (p_length < ANIM_MIN_LENGTH) {
 		p_length = ANIM_MIN_LENGTH;
 	}
@@ -3856,11 +3860,19 @@ void Animation::set_length(double p_length) {
 	emit_changed();
 }
 
+real_t Animation::get_length() const {
+	return length;
+}
+
 void Animation::set_loop_mode(Animation::LoopMode p_loop_mode) {
 	loop_mode = p_loop_mode;
 	emit_changed();
 }
 
+Animation::LoopMode Animation::get_loop_mode() const {
+	return loop_mode;
+}
+
 void Animation::track_set_imported(int p_track, bool p_imported) {
 	ERR_FAIL_UNSIGNED_INDEX((uint32_t)p_track, tracks.size());
 	tracks[p_track]->imported = p_imported;
@@ -4566,7 +4578,7 @@ struct AnimationCompressionDataState {
 				return 1;
 			}
 		}
-		return Math::nearest_shift((uint32_t)p_delta);
+		return nearest_shift((uint32_t)p_delta);
 	}
 
 	void _compute_max_shifts(uint32_t p_from, uint32_t p_to, uint32_t *max_shifts, uint32_t &max_frame_delta_shift) const {
@@ -4577,7 +4589,7 @@ struct AnimationCompressionDataState {
 
 		for (uint32_t i = p_from + 1; i <= p_to; i++) {
 			int32_t frame_delta = temp_packets[i].frame - temp_packets[i - 1].frame;
-			max_frame_delta_shift = MAX(max_frame_delta_shift, Math::nearest_shift((uint32_t)frame_delta));
+			max_frame_delta_shift = MAX(max_frame_delta_shift, nearest_shift((uint32_t)frame_delta));
 			for (uint32_t j = 0; j < components; j++) {
 				int32_t diff = _compute_delta16_signed(temp_packets[i - 1].data[j], temp_packets[i].data[j]);
 				uint32_t shift = _compute_shift_bits_signed(diff);
@@ -5482,7 +5494,7 @@ bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Ve
 }
 
 template <uint32_t COMPONENTS>
-void Animation::_get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, LocalVector<int> *r_indices) const {
+void Animation::_get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, List<int> *r_indices) const {
 	ERR_FAIL_COND(!compression.enabled);
 	ERR_FAIL_UNSIGNED_INDEX(p_compressed_track, compression.bounds.size());
 
@@ -5700,24 +5712,6 @@ bool Animation::is_variant_interpolatable(const Variant p_value) {
 	return (type >= Variant::BOOL && type <= Variant::STRING_NAME) || type == Variant::ARRAY || type >= Variant::PACKED_INT32_ARRAY; // PackedByteArray is unsigned, so it would be better to ignore since blending uses float.
 }
 
-bool Animation::needs_type_cast(const Variant &p_from, const Variant &p_to) {
-	Variant::Type from_type = p_from.get_type();
-	Variant::Type to_type = p_to.get_type();
-
-	if (from_type == to_type) {
-		return false;
-	}
-
-	// Cast between double and int to avoid minor annoyances.
-	if (from_type == Variant::FLOAT && to_type == Variant::INT) {
-		return true;
-	} else if (from_type == Variant::INT && to_type == Variant::FLOAT) {
-		return true;
-	}
-
-	return false;
-}
-
 bool Animation::validate_type_match(const Variant &p_from, Variant &r_to) {
 	if (p_from.get_type() != r_to.get_type()) {
 		// Cast r_to between double and int to avoid minor annoyances.
diff --git a/engine/scene/resources/animation.h b/engine/scene/resources/animation.h
index 0996704e..71bc1ec6 100644
--- a/engine/scene/resources/animation.h
+++ b/engine/scene/resources/animation.h
@@ -40,7 +40,7 @@ class Animation : public Resource {
 	RES_BASE_EXTENSION("anim");
 
 public:
-	typedef uint64_t TrackCacheID;
+	typedef uint32_t TypeHash;
 
 	static inline String PARAMETERS_BASE_PATH = "parameters/";
 	static constexpr real_t DEFAULT_STEP = 1.0 / 30;
@@ -109,16 +109,9 @@ public:
 		InterpolationType interpolation = INTERPOLATION_LINEAR;
 		bool loop_wrap = true;
 		NodePath path; // Path to something.
-		StringName concatenated_path;
+		TypeHash thash = 0; // Hash by Path + SubPath + TrackType.
 		bool imported = false;
 		bool enabled = true;
-		TrackCacheID get_unique_id() const {
-			// HACK. StringName pointer allocates 40 bytes (sizeof(StringName::_Data)), so any StringName pointer we allocate
-			// is guaranteed to not have another StringName pointer within 40 bytes address range. get_cache_type() returns
-			// a value in range (0, 8) so this can be used as an offset while keeping the uniqueness property.
-			// This will break if sizeof(StringName::_Data) is less than max(CACHE_TYPE).
-			return (TrackCacheID)(concatenated_path.data_unique_pointer()) + get_cache_type(type);
-		}
 		virtual ~Track() {}
 	};
 
@@ -257,9 +250,6 @@ private:
 	HashMap<StringName, Color> marker_colors; // name -> color
 
 	LocalVector<Track *> tracks;
-#ifdef TOOLS_ENABLED
-	HashSet<StringName> folded_groups;
-#endif // TOOLS_ENABLED
 
 	template <typename T, typename V>
 	int _insert(double p_time, T &p_keys, const V &p_value);
@@ -286,7 +276,7 @@ private:
 	_FORCE_INLINE_ T _interpolate(const LocalVector<TKey<T>> &p_keys, double p_time, InterpolationType p_interp, bool p_loop_wrap, bool *p_ok, bool p_backward = false) const;
 
 	template <typename T>
-	_FORCE_INLINE_ void _track_get_key_indices_in_range(const LocalVector<T> &p_array, double from_time, double to_time, LocalVector<int> *r_indices, bool p_is_backward) const;
+	_FORCE_INLINE_ void _track_get_key_indices_in_range(const LocalVector<T> &p_array, double from_time, double to_time, List<int> *p_indices, bool p_is_backward) const;
 
 	double length = 1.0;
 	real_t step = DEFAULT_STEP;
@@ -294,6 +284,8 @@ private:
 	bool capture_included = false;
 	void _check_capture_included();
 
+	void _track_update_hash(int p_track);
+
 	/* Animation compression page format (version 1):
 	 *
 	 * Animation uses bitwidth based compression separated into small pages. The intention is that pages fit easily in the cache, so decoding is cache efficient.
@@ -372,7 +364,7 @@ private:
 	bool _fetch_compressed_by_index(uint32_t p_compressed_track, int p_index, Vector3i &r_value, double &r_time) const;
 	int _get_compressed_key_count(uint32_t p_compressed_track) const;
 	template <uint32_t COMPONENTS>
-	void _get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, LocalVector<int> *r_indices) const;
+	void _get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, List<int> *r_indices) const;
 	_FORCE_INLINE_ Quaternion _uncompress_quaternion(const Vector3i &p_value) const;
 	_FORCE_INLINE_ Vector3 _uncompress_pos_scale(uint32_t p_compressed_track, const Vector3i &p_value) const;
 	_FORCE_INLINE_ float _uncompress_blend_shape(const Vector3i &p_value) const;
@@ -428,7 +420,7 @@ public:
 	NodePath track_get_path(int p_track) const;
 	int find_track(const NodePath &p_path, const TrackType p_type) const;
 
-	TrackCacheID track_get_unique_id(int p_track) const;
+	TypeHash track_get_type_hash(int p_track) const;
 
 	void track_move_up(int p_track);
 	void track_move_down(int p_track);
@@ -520,7 +512,7 @@ public:
 
 	void copy_track(int p_track, Ref<Animation> p_to_animation);
 
-	void track_get_key_indices_in_range(int p_track, double p_time, double p_delta, double p_start, double p_end, LocalVector<int> *r_indices, Animation::LoopedFlag p_looped_flag = Animation::LOOPED_FLAG_NONE) const;
+	void track_get_key_indices_in_range(int p_track, double p_time, double p_delta, double p_start, double p_end, List<int> *p_indices, Animation::LoopedFlag p_looped_flag = Animation::LOOPED_FLAG_NONE) const;
 
 	void add_marker(const StringName &p_name, double p_time);
 	void remove_marker(const StringName &p_name);
@@ -533,11 +525,11 @@ public:
 	Color get_marker_color(const StringName &p_name) const;
 	void set_marker_color(const StringName &p_name, const Color &p_color);
 
-	void set_length(double p_length);
-	_FORCE_INLINE_ double get_length() const { return length; }
+	void set_length(real_t p_length);
+	real_t get_length() const;
 
 	void set_loop_mode(LoopMode p_loop_mode);
-	_FORCE_INLINE_ LoopMode get_loop_mode() const { return loop_mode; }
+	LoopMode get_loop_mode() const;
 
 	void set_step(real_t p_step);
 	real_t get_step() const;
@@ -547,28 +539,12 @@ public:
 	void optimize(real_t p_allowed_velocity_err = 0.01, real_t p_allowed_angular_err = 0.01, int p_precision = 3);
 	void compress(uint32_t p_page_size = 8192, uint32_t p_fps = 120, float p_split_tolerance = 4.0); // 4.0 seems to be the split tolerance sweet spot from many tests.
 
-#ifdef TOOLS_ENABLED
-	const HashSet<StringName> &editor_get_folded_groups() const { return folded_groups; }
-	void editor_clear_folded_groups() { folded_groups.clear(); }
-	void editor_add_folded_group(const StringName &p_group_name) { folded_groups.insert(p_group_name); }
-	void editor_remove_folded_group(const StringName &p_group_name) { folded_groups.erase(p_group_name); }
-	bool editor_is_group_folded(const StringName &p_group_name) const { return folded_groups.has(p_group_name); }
-	void editor_set_group_folded(const StringName &p_group_name, bool p_folded) {
-		if (p_folded) {
-			editor_add_folded_group(p_group_name);
-		} else {
-			editor_remove_folded_group(p_group_name);
-		}
-	}
-#endif // TOOLS_ENABLED
-
 	// Helper functions for Rotation.
 	static double interpolate_via_rest(double p_from, double p_to, double p_weight, double p_rest = 0.0); // Deterministic slerp to prevent to cross the inverted rest axis.
 	static Quaternion interpolate_via_rest(const Quaternion &p_from, const Quaternion &p_to, real_t p_weight, const Quaternion &p_rest = Quaternion()); // Deterministic slerp to prevent to cross the inverted rest axis.
 
 	// Helper functions for Variant.
 	static bool is_variant_interpolatable(const Variant p_value);
-	static bool needs_type_cast(const Variant &p_from, const Variant &p_to);
 	static bool validate_type_match(const Variant &p_from, Variant &r_to);
 
 	static Variant cast_to_blendwise(const Variant p_value);
diff --git a/engine/scene/resources/animation_library.cpp b/engine/scene/resources/animation_library.cpp
index fd7cdf78..8e2042a4 100644
--- a/engine/scene/resources/animation_library.cpp
+++ b/engine/scene/resources/animation_library.cpp
@@ -30,8 +30,6 @@
 
 #include "animation_library.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/scene_string_names.h"
 
 bool AnimationLibrary::is_valid_animation_name(const String &p_name) {
@@ -96,7 +94,7 @@ Ref<Animation> AnimationLibrary::get_animation(const StringName &p_name) const {
 
 TypedArray<StringName> AnimationLibrary::_get_animation_list() const {
 	TypedArray<StringName> ret;
-	LocalVector<StringName> names;
+	List<StringName> names;
 	get_animation_list(&names);
 	for (const StringName &K : names) {
 		ret.push_back(K);
@@ -108,8 +106,8 @@ void AnimationLibrary::_animation_changed(const StringName &p_name) {
 	emit_signal(SceneStringName(animation_changed), p_name);
 }
 
-void AnimationLibrary::get_animation_list(LocalVector<StringName> *p_animations) const {
-	LocalVector<StringName> anims;
+void AnimationLibrary::get_animation_list(List<StringName> *p_animations) const {
+	List<StringName> anims;
 
 	for (const KeyValue<StringName, Ref<Animation>> &E : animations) {
 		anims.push_back(E.key);
@@ -148,7 +146,7 @@ Dictionary AnimationLibrary::_get_data() const {
 void AnimationLibrary::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	const String pf = p_function;
 	if (p_idx == 0 && (pf == "get_animation" || pf == "has_animation" || pf == "rename_animation" || pf == "remove_animation")) {
-		LocalVector<StringName> names;
+		List<StringName> names;
 		get_animation_list(&names);
 		for (const StringName &E : names) {
 			r_options->push_back(E.operator String().quote());
diff --git a/engine/scene/resources/animation_library.h b/engine/scene/resources/animation_library.h
index 22896650..7d78146c 100644
--- a/engine/scene/resources/animation_library.h
+++ b/engine/scene/resources/animation_library.h
@@ -60,7 +60,7 @@ public:
 	void rename_animation(const StringName &p_name, const StringName &p_new_name);
 	bool has_animation(const StringName &p_name) const;
 	Ref<Animation> get_animation(const StringName &p_name) const;
-	void get_animation_list(LocalVector<StringName> *p_animations) const;
+	void get_animation_list(List<StringName> *p_animations) const;
 	int get_animation_list_size() const;
 
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/resources/atlas_texture.cpp b/engine/scene/resources/atlas_texture.cpp
index a5b48db0..42538fd6 100644
--- a/engine/scene/resources/atlas_texture.cpp
+++ b/engine/scene/resources/atlas_texture.cpp
@@ -30,9 +30,6 @@
 
 #include "atlas_texture.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 int AtlasTexture::get_width() const {
 	if (rounded_region.size.width == 0) {
 		if (atlas.is_valid()) {
@@ -152,7 +149,7 @@ void AtlasTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_filter_clip", "enable"), &AtlasTexture::set_filter_clip);
 	ClassDB::bind_method(D_METHOD("has_filter_clip"), &AtlasTexture::has_filter_clip);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "atlas", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_atlas", "get_atlas");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "atlas", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_atlas", "get_atlas");
 	ADD_PROPERTY(PropertyInfo(Variant::RECT2, "region", PROPERTY_HINT_NONE, "suffix:px"), "set_region", "get_region");
 	ADD_PROPERTY(PropertyInfo(Variant::RECT2, "margin", PROPERTY_HINT_NONE, "suffix:px"), "set_margin", "get_margin");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "filter_clip"), "set_filter_clip", "has_filter_clip");
diff --git a/engine/scene/resources/audio_stream_polyphonic.compat.inc b/engine/scene/resources/audio_stream_polyphonic.compat.inc
index ab4ec191..31074218 100644
--- a/engine/scene/resources/audio_stream_polyphonic.compat.inc
+++ b/engine/scene/resources/audio_stream_polyphonic.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "audio_stream_polyphonic.h"
-
-#include "core/object/class_db.h"
-
 AudioStreamPlaybackPolyphonic::ID AudioStreamPlaybackPolyphonic::_play_stream_bind_compat_91382(const Ref<AudioStream> &p_stream, float p_from_offset, float p_volume_db, float p_pitch_scale) {
 	return play_stream(p_stream, p_from_offset, p_volume_db, p_pitch_scale, AudioServer::PlaybackType::PLAYBACK_TYPE_DEFAULT, SceneStringName(Master));
 }
@@ -42,4 +38,4 @@ void AudioStreamPlaybackPolyphonic::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("play_stream", "stream", "from_offset", "volume_db", "pitch_scale"), &AudioStreamPlaybackPolyphonic::_play_stream_bind_compat_91382, DEFVAL(0), DEFVAL(0), DEFVAL(1.0));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/audio_stream_polyphonic.cpp b/engine/scene/resources/audio_stream_polyphonic.cpp
index 6d67b08e..3da9106e 100644
--- a/engine/scene/resources/audio_stream_polyphonic.cpp
+++ b/engine/scene/resources/audio_stream_polyphonic.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream_polyphonic.h"
 #include "audio_stream_polyphonic.compat.inc"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 constexpr uint64_t ID_MASK = 0xFFFFFFFF;
diff --git a/engine/scene/resources/audio_stream_wav.cpp b/engine/scene/resources/audio_stream_wav.cpp
index 3cad3033..d7b903e5 100644
--- a/engine/scene/resources/audio_stream_wav.cpp
+++ b/engine/scene/resources/audio_stream_wav.cpp
@@ -32,7 +32,6 @@
 
 #include "core/io/file_access_memory.h"
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 
 const float TRIM_DB_LIMIT = -50;
 const int TRIM_FADE_OUT_FRAMES = 500;
diff --git a/engine/scene/resources/audio_stream_wav.h b/engine/scene/resources/audio_stream_wav.h
index 6c930f44..fd67d7b1 100644
--- a/engine/scene/resources/audio_stream_wav.h
+++ b/engine/scene/resources/audio_stream_wav.h
@@ -32,7 +32,7 @@
 
 #include "servers/audio/audio_stream.h"
 
-#include <thirdparty/misc/qoa.h>
+#include "thirdparty/misc/qoa.h"
 
 class AudioStreamWAV;
 
diff --git a/engine/scene/resources/bit_map.cpp b/engine/scene/resources/bit_map.cpp
index 05d7c908..322dbf5a 100644
--- a/engine/scene/resources/bit_map.cpp
+++ b/engine/scene/resources/bit_map.cpp
@@ -30,7 +30,6 @@
 
 #include "bit_map.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void BitMap::create(const Size2i &p_size) {
diff --git a/engine/scene/resources/blit_material.cpp b/engine/scene/resources/blit_material.cpp
deleted file mode 100644
index 0e3c52f2..00000000
--- a/engine/scene/resources/blit_material.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/**************************************************************************/
-/*  blit_material.cpp                                                     */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "blit_material.h"
-
-#include "core/object/class_db.h"
-#include "core/version.h"
-#include "servers/rendering/rendering_server.h"
-
-void BlitMaterial::_update_shader(BlendMode p_blend) {
-	MutexLock shader_lock(shader_mutex);
-	int index = int(p_blend);
-	if (shader_cache[p_blend].is_null()) {
-		shader_cache[p_blend] = RS::get_singleton()->shader_create();
-		String code = "// NOTE: Shader automatically converted from " GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG "'s BlitMaterial.\n\n";
-
-		code += "shader_type texture_blit;\nrender_mode ";
-		switch (p_blend) {
-			case BLEND_MODE_MIX:
-				code += "blend_mix";
-				break;
-			case BLEND_MODE_ADD:
-				code += "blend_add";
-				break;
-			case BLEND_MODE_SUB:
-				code += "blend_sub";
-				break;
-			case BLEND_MODE_MUL:
-				code += "blend_mul";
-				break;
-			case BLEND_MODE_DISABLED:
-				code += "blend_disabled";
-				break;
-			default:
-				code += "blend_mix";
-				break;
-		}
-		code += ";\n\n";
-
-		code += "uniform sampler2D source_texture0 : hint_blit_source0;\n";
-		code += "uniform sampler2D source_texture1 : hint_blit_source1;\n";
-		code += "uniform sampler2D source_texture2 : hint_blit_source2;\n";
-		code += "uniform sampler2D source_texture3 : hint_blit_source3;\n\n";
-
-		code += "void blit() {\n";
-		code += "	// Copies from each whole source texture to a rect on each output texture.\n";
-		code += "	COLOR0 = texture(source_texture0, UV) * MODULATE;\n";
-		code += "	COLOR1 = texture(source_texture1, UV) * MODULATE;\n";
-		code += "	COLOR2 = texture(source_texture2, UV) * MODULATE;\n";
-		code += "	COLOR3 = texture(source_texture3, UV) * MODULATE;\n}";
-		RS::get_singleton()->shader_set_code(shader_cache[index], code);
-	}
-}
-
-void BlitMaterial::set_blend_mode(BlendMode p_blend_mode) {
-	blend_mode = p_blend_mode;
-	_update_shader(blend_mode);
-	if (shader_set) {
-		RS::get_singleton()->material_set_shader(_get_material(), shader_cache[int(blend_mode)]);
-	}
-}
-
-BlitMaterial::BlendMode BlitMaterial::get_blend_mode() const {
-	return blend_mode;
-}
-
-RID BlitMaterial::get_shader_rid() const {
-	_update_shader(blend_mode);
-	return shader_cache[int(blend_mode)];
-}
-
-Shader::Mode BlitMaterial::get_shader_mode() const {
-	return Shader::MODE_TEXTURE_BLIT;
-}
-
-RID BlitMaterial::get_rid() const {
-	_update_shader(blend_mode);
-	if (!shader_set) {
-		RS::get_singleton()->material_set_shader(_get_material(), shader_cache[int(blend_mode)]);
-		shader_set = true;
-	}
-	return _get_material();
-}
-
-Mutex BlitMaterial::shader_mutex;
-RID BlitMaterial::shader_cache[5];
-
-void BlitMaterial::cleanup_shader() {
-	for (int i = 0; i < 5; i++) {
-		if (shader_cache[i].is_valid()) {
-			RS::get_singleton()->free_rid(shader_cache[i]);
-		}
-	}
-}
-
-void BlitMaterial::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_blend_mode", "blend_mode"), &BlitMaterial::set_blend_mode);
-	ClassDB::bind_method(D_METHOD("get_blend_mode"), &BlitMaterial::get_blend_mode);
-
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "blend_mode", PROPERTY_HINT_ENUM, "Mix,Add,Subtract,Multiply,Disabled"), "set_blend_mode", "get_blend_mode");
-
-	BIND_ENUM_CONSTANT(BLEND_MODE_MIX);
-	BIND_ENUM_CONSTANT(BLEND_MODE_ADD);
-	BIND_ENUM_CONSTANT(BLEND_MODE_SUB);
-	BIND_ENUM_CONSTANT(BLEND_MODE_MUL);
-	BIND_ENUM_CONSTANT(BLEND_MODE_DISABLED);
-}
-
-BlitMaterial::BlitMaterial() {
-	_set_material(RS::get_singleton()->material_create());
-	set_blend_mode(BLEND_MODE_MIX);
-}
-
-BlitMaterial::~BlitMaterial() {
-}
diff --git a/engine/scene/resources/blit_material.h b/engine/scene/resources/blit_material.h
deleted file mode 100644
index aeb7f22d..00000000
--- a/engine/scene/resources/blit_material.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**************************************************************************/
-/*  blit_material.h                                                       */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "scene/resources/material.h"
-
-class BlitMaterial : public Material {
-	GDCLASS(BlitMaterial, Material);
-
-public:
-	enum BlendMode {
-		BLEND_MODE_MIX,
-		BLEND_MODE_ADD,
-		BLEND_MODE_SUB,
-		BLEND_MODE_MUL,
-		BLEND_MODE_DISABLED
-	};
-
-private:
-	static Mutex shader_mutex;
-	static RID shader_cache[5];
-	static void _update_shader(BlendMode p_blend);
-	mutable bool shader_set = false;
-
-	BlendMode blend_mode = BLEND_MODE_MIX;
-
-protected:
-	static void _bind_methods();
-
-public:
-	void set_blend_mode(BlendMode p_blend_mode);
-	BlendMode get_blend_mode() const;
-
-	virtual Shader::Mode get_shader_mode() const override;
-	virtual RID get_shader_rid() const override;
-	virtual RID get_rid() const override;
-
-	static void cleanup_shader();
-
-	BlitMaterial();
-	virtual ~BlitMaterial();
-};
-
-VARIANT_ENUM_CAST(BlitMaterial::BlendMode);
diff --git a/engine/scene/resources/bone_map.cpp b/engine/scene/resources/bone_map.cpp
index 6c568a35..4c0c2d5d 100644
--- a/engine/scene/resources/bone_map.cpp
+++ b/engine/scene/resources/bone_map.cpp
@@ -31,8 +31,6 @@
 #include "bone_map.h"
 
 #include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 
 bool BoneMap::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
@@ -167,7 +165,7 @@ void BoneMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("find_profile_bone_name", "skeleton_bone_name"), &BoneMap::find_profile_bone_name);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "profile", PROPERTY_HINT_RESOURCE_TYPE, SkeletonProfile::get_class_static()), "set_profile", "get_profile");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "profile", PROPERTY_HINT_RESOURCE_TYPE, "SkeletonProfile"), "set_profile", "get_profile");
 	ADD_ARRAY("bonemap", "bonemap");
 
 	ADD_SIGNAL(MethodInfo("bone_map_updated"));
diff --git a/engine/scene/resources/bone_map.h b/engine/scene/resources/bone_map.h
index 7bdbbc78..0f6ee21d 100644
--- a/engine/scene/resources/bone_map.h
+++ b/engine/scene/resources/bone_map.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/resources/skeleton_profile.h"
+#include "skeleton_profile.h"
 
 class BoneMap : public Resource {
 	GDCLASS(BoneMap, Resource);
diff --git a/engine/scene/resources/camera_attributes.cpp b/engine/scene/resources/camera_attributes.cpp
index c94df313..33e9cdaa 100644
--- a/engine/scene/resources/camera_attributes.cpp
+++ b/engine/scene/resources/camera_attributes.cpp
@@ -30,10 +30,7 @@
 
 #include "camera_attributes.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "servers/rendering/rendering_server.h"
 
 void CameraAttributes::set_exposure_multiplier(float p_multiplier) {
@@ -461,6 +458,7 @@ void CameraAttributesPhysical::_validate_property(PropertyInfo &property) const
 	}
 	if (!GLOBAL_GET_CACHED(bool, "rendering/lights_and_shadows/use_physical_light_units") && (property.name == "exposure_aperture" || property.name == "exposure_shutter_speed")) {
 		property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
+		return;
 	}
 }
 
diff --git a/engine/scene/resources/camera_texture.cpp b/engine/scene/resources/camera_texture.cpp
index 7c8d66d5..9b10727f 100644
--- a/engine/scene/resources/camera_texture.cpp
+++ b/engine/scene/resources/camera_texture.cpp
@@ -30,8 +30,6 @@
 
 #include "camera_texture.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/camera/camera_feed.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/engine/scene/resources/canvas_item_material.cpp b/engine/scene/resources/canvas_item_material.cpp
index 00495054..cae2823e 100644
--- a/engine/scene/resources/canvas_item_material.cpp
+++ b/engine/scene/resources/canvas_item_material.cpp
@@ -30,10 +30,7 @@
 
 #include "canvas_item_material.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/version.h"
-#include "servers/rendering/rendering_server.h"
 
 Mutex CanvasItemMaterial::material_mutex;
 SelfList<CanvasItemMaterial>::List CanvasItemMaterial::dirty_materials;
diff --git a/engine/scene/resources/color_palette.cpp b/engine/scene/resources/color_palette.cpp
index 5f1465ec..7c1faead 100644
--- a/engine/scene/resources/color_palette.cpp
+++ b/engine/scene/resources/color_palette.cpp
@@ -30,8 +30,6 @@
 
 #include "color_palette.h"
 
-#include "core/object/class_db.h"
-
 void ColorPalette::set_colors(const PackedColorArray &p_colors) {
 	colors = p_colors;
 }
diff --git a/engine/scene/resources/compositor.cpp b/engine/scene/resources/compositor.cpp
index c189064a..1f6ea53a 100644
--- a/engine/scene/resources/compositor.cpp
+++ b/engine/scene/resources/compositor.cpp
@@ -30,8 +30,6 @@
 
 #include "compositor.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 /* Compositor Effect */
@@ -76,18 +74,14 @@ void CompositorEffect::_bind_methods() {
 }
 
 void CompositorEffect::_validate_property(PropertyInfo &p_property) const {
-	if (p_property.name == "access_resolved_color") {
-		if (effect_callback_type == EFFECT_CALLBACK_TYPE_POST_TRANSPARENT) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "access_resolved_depth") {
-		if (effect_callback_type == EFFECT_CALLBACK_TYPE_POST_TRANSPARENT) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "needs_separate_specular") {
-		if (effect_callback_type != EFFECT_CALLBACK_TYPE_POST_SKY) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
+	if (p_property.name == "access_resolved_color" && effect_callback_type == EFFECT_CALLBACK_TYPE_POST_TRANSPARENT) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if (p_property.name == "access_resolved_depth" && effect_callback_type == EFFECT_CALLBACK_TYPE_POST_TRANSPARENT) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if (p_property.name == "needs_separate_specular" && effect_callback_type != EFFECT_CALLBACK_TYPE_POST_SKY) {
+		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
 
@@ -115,7 +109,7 @@ void CompositorEffect::set_effect_callback_type(EffectCallbackType p_callback_ty
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_callback(rid, RSE::CompositorEffectCallbackType(effect_callback_type), callable_mp(this, &CompositorEffect::_call_render_callback));
+		rs->compositor_effect_set_callback(rid, RenderingServer::CompositorEffectCallbackType(effect_callback_type), callable_mp(this, &CompositorEffect::_call_render_callback));
 	}
 }
 
@@ -128,7 +122,7 @@ void CompositorEffect::set_access_resolved_color(bool p_enabled) {
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_flag(rid, RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, access_resolved_color);
+		rs->compositor_effect_set_flag(rid, RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, access_resolved_color);
 	}
 }
 
@@ -141,7 +135,7 @@ void CompositorEffect::set_access_resolved_depth(bool p_enabled) {
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_flag(rid, RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, access_resolved_depth);
+		rs->compositor_effect_set_flag(rid, RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, access_resolved_depth);
 	}
 }
 
@@ -154,7 +148,7 @@ void CompositorEffect::set_needs_motion_vectors(bool p_enabled) {
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_flag(rid, RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS, needs_motion_vectors);
+		rs->compositor_effect_set_flag(rid, RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS, needs_motion_vectors);
 	}
 }
 
@@ -167,7 +161,7 @@ void CompositorEffect::set_needs_normal_roughness(bool p_enabled) {
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_flag(rid, RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS, needs_normal_roughness);
+		rs->compositor_effect_set_flag(rid, RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS, needs_normal_roughness);
 	}
 }
 
@@ -180,7 +174,7 @@ void CompositorEffect::set_needs_separate_specular(bool p_enabled) {
 	if (rid.is_valid()) {
 		RenderingServer *rs = RenderingServer::get_singleton();
 		ERR_FAIL_NULL(rs);
-		rs->compositor_effect_set_flag(rid, RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR, needs_separate_specular);
+		rs->compositor_effect_set_flag(rid, RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR, needs_separate_specular);
 	}
 }
 
@@ -192,7 +186,7 @@ CompositorEffect::CompositorEffect() {
 	RenderingServer *rs = RenderingServer::get_singleton();
 	if (rs != nullptr) {
 		rid = rs->compositor_effect_create();
-		rs->compositor_effect_set_callback(rid, RSE::CompositorEffectCallbackType(effect_callback_type), callable_mp(this, &CompositorEffect::_call_render_callback));
+		rs->compositor_effect_set_callback(rid, RenderingServer::CompositorEffectCallbackType(effect_callback_type), callable_mp(this, &CompositorEffect::_call_render_callback));
 	}
 }
 
diff --git a/engine/scene/resources/compositor.h b/engine/scene/resources/compositor.h
index 648be5ab..547970c0 100644
--- a/engine/scene/resources/compositor.h
+++ b/engine/scene/resources/compositor.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "servers/rendering/storage/render_data.h"
 
 /* Compositor Effect */
diff --git a/engine/scene/resources/compressed_texture.cpp b/engine/scene/resources/compressed_texture.cpp
index 22d12c2f..76bc95eb 100644
--- a/engine/scene/resources/compressed_texture.cpp
+++ b/engine/scene/resources/compressed_texture.cpp
@@ -31,10 +31,7 @@
 #include "compressed_texture.h"
 
 #include "core/io/file_access.h"
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
-#include "servers/rendering/rendering_server.h"
 
 Error CompressedTexture2D::_load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) {
 	alpha_cache.unref();
@@ -107,7 +104,7 @@ void CompressedTexture2D::_requested_3d(void *p_ud) {
 	request_3d_callback(ctex);
 }
 
-void CompressedTexture2D::_requested_roughness(void *p_ud, const String &p_normal_path, RSE::TextureDetectRoughnessChannel p_roughness_channel) {
+void CompressedTexture2D::_requested_roughness(void *p_ud, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_roughness_channel) {
 	CompressedTexture2D *ct = (CompressedTexture2D *)p_ud;
 	Ref<CompressedTexture2D> ctex(ct);
 	ERR_FAIL_NULL(request_roughness_callback);
@@ -466,6 +463,35 @@ CompressedTexture2D::~CompressedTexture2D() {
 	}
 }
 
+Ref<Resource> ResourceFormatLoaderCompressedTexture2D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	Ref<CompressedTexture2D> st;
+	st.instantiate();
+	Error err = st->load(p_path);
+	if (r_error) {
+		*r_error = err;
+	}
+	if (err != OK) {
+		return Ref<Resource>();
+	}
+
+	return st;
+}
+
+void ResourceFormatLoaderCompressedTexture2D::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("ctex");
+}
+
+bool ResourceFormatLoaderCompressedTexture2D::handles_type(const String &p_type) const {
+	return p_type == "CompressedTexture2D";
+}
+
+String ResourceFormatLoaderCompressedTexture2D::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("ctex")) {
+		return "CompressedTexture2D";
+	}
+	return "";
+}
+
 void CompressedTexture3D::set_path(const String &p_path, bool p_take_over) {
 	if (texture.is_valid()) {
 		RenderingServer::get_singleton()->texture_set_path(texture, p_path);
@@ -621,6 +647,35 @@ CompressedTexture3D::~CompressedTexture3D() {
 	}
 }
 
+Ref<Resource> ResourceFormatLoaderCompressedTexture3D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	Ref<CompressedTexture3D> st;
+	st.instantiate();
+	Error err = st->load(p_path);
+	if (r_error) {
+		*r_error = err;
+	}
+	if (err != OK) {
+		return Ref<Resource>();
+	}
+
+	return st;
+}
+
+void ResourceFormatLoaderCompressedTexture3D::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("ctex3d");
+}
+
+bool ResourceFormatLoaderCompressedTexture3D::handles_type(const String &p_type) const {
+	return p_type == "CompressedTexture3D";
+}
+
+String ResourceFormatLoaderCompressedTexture3D::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("ctex3d")) {
+		return "CompressedTexture3D";
+	}
+	return "";
+}
+
 void CompressedTextureLayered::set_path(const String &p_path, bool p_take_over) {
 	if (texture.is_valid()) {
 		RenderingServer::get_singleton()->texture_set_path(texture, p_path);
@@ -688,10 +743,10 @@ Error CompressedTextureLayered::load(const String &p_path) {
 	}
 
 	if (texture.is_valid()) {
-		RID new_texture = RS::get_singleton()->texture_2d_layered_create(images, RSE::TextureLayeredType(layered_type));
+		RID new_texture = RS::get_singleton()->texture_2d_layered_create(images, RS::TextureLayeredType(layered_type));
 		RS::get_singleton()->texture_replace(texture, new_texture);
 	} else {
-		texture = RS::get_singleton()->texture_2d_layered_create(images, RSE::TextureLayeredType(layered_type));
+		texture = RS::get_singleton()->texture_2d_layered_create(images, RS::TextureLayeredType(layered_type));
 	}
 
 	w = images[0]->get_width();
@@ -738,7 +793,7 @@ TextureLayered::LayeredType CompressedTextureLayered::get_layered_type() const {
 
 RID CompressedTextureLayered::get_rid() const {
 	if (!texture.is_valid()) {
-		texture = RS::get_singleton()->texture_2d_layered_placeholder_create(RSE::TextureLayeredType(layered_type));
+		texture = RS::get_singleton()->texture_2d_layered_placeholder_create(RS::TextureLayeredType(layered_type));
 	}
 	return texture;
 }
@@ -784,3 +839,59 @@ CompressedTextureLayered::~CompressedTextureLayered() {
 		RS::get_singleton()->free_rid(texture);
 	}
 }
+
+/////////////////////////////////////////////////
+
+Ref<Resource> ResourceFormatLoaderCompressedTextureLayered::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	Ref<CompressedTextureLayered> ct;
+	if (p_path.has_extension("ctexarray")) {
+		Ref<CompressedTexture2DArray> c;
+		c.instantiate();
+		ct = c;
+	} else if (p_path.has_extension("ccube")) {
+		Ref<CompressedCubemap> c;
+		c.instantiate();
+		ct = c;
+	} else if (p_path.has_extension("ccubearray")) {
+		Ref<CompressedCubemapArray> c;
+		c.instantiate();
+		ct = c;
+	} else {
+		if (r_error) {
+			*r_error = ERR_FILE_UNRECOGNIZED;
+		}
+		return Ref<Resource>();
+	}
+	Error err = ct->load(p_path);
+	if (r_error) {
+		*r_error = err;
+	}
+	if (err != OK) {
+		return Ref<Resource>();
+	}
+
+	return ct;
+}
+
+void ResourceFormatLoaderCompressedTextureLayered::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("ctexarray");
+	p_extensions->push_back("ccube");
+	p_extensions->push_back("ccubearray");
+}
+
+bool ResourceFormatLoaderCompressedTextureLayered::handles_type(const String &p_type) const {
+	return p_type == "CompressedTexture2DArray" || p_type == "CompressedCubemap" || p_type == "CompressedCubemapArray";
+}
+
+String ResourceFormatLoaderCompressedTextureLayered::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("ctexarray")) {
+		return "CompressedTexture2DArray";
+	}
+	if (p_path.has_extension("ccube")) {
+		return "CompressedCubemap";
+	}
+	if (p_path.has_extension("ccubearray")) {
+		return "CompressedCubemapArray";
+	}
+	return "";
+}
diff --git a/engine/scene/resources/compressed_texture.h b/engine/scene/resources/compressed_texture.h
index d0b79372..6d2c7bce 100644
--- a/engine/scene/resources/compressed_texture.h
+++ b/engine/scene/resources/compressed_texture.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
+#include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class BitMap;
 
@@ -71,7 +72,7 @@ private:
 	virtual void reload_from_file() override;
 
 	static void _requested_3d(void *p_ud);
-	static void _requested_roughness(void *p_ud, const String &p_normal_path, RSE::TextureDetectRoughnessChannel p_roughness_channel);
+	static void _requested_roughness(void *p_ud, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_roughness_channel);
 	static void _requested_normal(void *p_ud);
 
 protected:
@@ -81,13 +82,13 @@ public:
 	static Ref<Image> load_image_from_file(Ref<FileAccess> p_file, int p_size_limit);
 
 	typedef void (*TextureFormatRequestCallback)(const Ref<CompressedTexture2D> &);
-	typedef void (*TextureFormatRoughnessRequestCallback)(const Ref<CompressedTexture2D> &, const String &p_normal_path, RSE::TextureDetectRoughnessChannel p_roughness_channel);
+	typedef void (*TextureFormatRoughnessRequestCallback)(const Ref<CompressedTexture2D> &, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_roughness_channel);
 
 	static TextureFormatRequestCallback request_3d_callback;
 	static TextureFormatRoughnessRequestCallback request_roughness_callback;
 	static TextureFormatRequestCallback request_normal_callback;
 
-	virtual Image::Format get_format() const override;
+	Image::Format get_format() const;
 	Error load(const String &p_path);
 	String get_load_path() const;
 
@@ -109,6 +110,16 @@ public:
 	~CompressedTexture2D();
 };
 
+class ResourceFormatLoaderCompressedTexture2D : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderCompressedTexture2D, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
+
 class CompressedTextureLayered : public TextureLayered {
 	GDCLASS(CompressedTextureLayered, TextureLayered);
 
@@ -165,6 +176,16 @@ public:
 	~CompressedTextureLayered();
 };
 
+class ResourceFormatLoaderCompressedTextureLayered : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderCompressedTextureLayered, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
+
 class CompressedTexture2DArray : public CompressedTextureLayered {
 	GDCLASS(CompressedTexture2DArray, CompressedTextureLayered)
 public:
@@ -240,3 +261,13 @@ public:
 
 	~CompressedTexture3D();
 };
+
+class ResourceFormatLoaderCompressedTexture3D : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderCompressedTexture3D, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
diff --git a/engine/scene/resources/compressed_texture_resource_format.cpp b/engine/scene/resources/compressed_texture_resource_format.cpp
deleted file mode 100644
index 0958dbb9..00000000
--- a/engine/scene/resources/compressed_texture_resource_format.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/**************************************************************************/
-/*  compressed_texture_resource_format.cpp                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "compressed_texture_resource_format.h"
-
-#include "scene/resources/compressed_texture.h"
-
-Ref<Resource> ResourceFormatLoaderCompressedTexture2D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	Ref<CompressedTexture2D> st;
-	st.instantiate();
-	Error err = st->load(p_path);
-	if (r_error) {
-		*r_error = err;
-	}
-	if (err != OK) {
-		return Ref<Resource>();
-	}
-
-	return st;
-}
-
-void ResourceFormatLoaderCompressedTexture2D::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("ctex");
-}
-
-bool ResourceFormatLoaderCompressedTexture2D::handles_type(const String &p_type) const {
-	return p_type == "CompressedTexture2D";
-}
-
-String ResourceFormatLoaderCompressedTexture2D::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("ctex")) {
-		return "CompressedTexture2D";
-	}
-	return "";
-}
-
-Ref<Resource> ResourceFormatLoaderCompressedTextureLayered::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	Ref<CompressedTextureLayered> ct;
-	if (p_path.has_extension("ctexarray")) {
-		Ref<CompressedTexture2DArray> c;
-		c.instantiate();
-		ct = c;
-	} else if (p_path.has_extension("ccube")) {
-		Ref<CompressedCubemap> c;
-		c.instantiate();
-		ct = c;
-	} else if (p_path.has_extension("ccubearray")) {
-		Ref<CompressedCubemapArray> c;
-		c.instantiate();
-		ct = c;
-	} else {
-		if (r_error) {
-			*r_error = ERR_FILE_UNRECOGNIZED;
-		}
-		return Ref<Resource>();
-	}
-	Error err = ct->load(p_path);
-	if (r_error) {
-		*r_error = err;
-	}
-	if (err != OK) {
-		return Ref<Resource>();
-	}
-
-	return ct;
-}
-
-void ResourceFormatLoaderCompressedTextureLayered::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("ctexarray");
-	p_extensions->push_back("ccube");
-	p_extensions->push_back("ccubearray");
-}
-
-bool ResourceFormatLoaderCompressedTextureLayered::handles_type(const String &p_type) const {
-	return p_type == "CompressedTexture2DArray" || p_type == "CompressedCubemap" || p_type == "CompressedCubemapArray";
-}
-
-String ResourceFormatLoaderCompressedTextureLayered::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("ctexarray")) {
-		return "CompressedTexture2DArray";
-	}
-	if (p_path.has_extension("ccube")) {
-		return "CompressedCubemap";
-	}
-	if (p_path.has_extension("ccubearray")) {
-		return "CompressedCubemapArray";
-	}
-	return "";
-}
-
-Ref<Resource> ResourceFormatLoaderCompressedTexture3D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	Ref<CompressedTexture3D> st;
-	st.instantiate();
-	Error err = st->load(p_path);
-	if (r_error) {
-		*r_error = err;
-	}
-	if (err != OK) {
-		return Ref<Resource>();
-	}
-
-	return st;
-}
-
-void ResourceFormatLoaderCompressedTexture3D::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("ctex3d");
-}
-
-bool ResourceFormatLoaderCompressedTexture3D::handles_type(const String &p_type) const {
-	return p_type == "CompressedTexture3D";
-}
-
-String ResourceFormatLoaderCompressedTexture3D::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("ctex3d")) {
-		return "CompressedTexture3D";
-	}
-	return "";
-}
diff --git a/engine/scene/resources/compressed_texture_resource_format.h b/engine/scene/resources/compressed_texture_resource_format.h
deleted file mode 100644
index 70035538..00000000
--- a/engine/scene/resources/compressed_texture_resource_format.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**************************************************************************/
-/*  compressed_texture_resource_format.h                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-
-class ResourceFormatLoaderCompressedTexture2D : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderCompressedTexture2D, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
-
-class ResourceFormatLoaderCompressedTextureLayered : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderCompressedTextureLayered, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
-
-class ResourceFormatLoaderCompressedTexture3D : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderCompressedTexture3D, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
diff --git a/engine/scene/resources/curve.cpp b/engine/scene/resources/curve.cpp
index aba99086..154859f6 100644
--- a/engine/scene/resources/curve.cpp
+++ b/engine/scene/resources/curve.cpp
@@ -31,15 +31,11 @@
 #include "curve.h"
 
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
-
-#include <cfloat> // FLT_EPSILON
 
 const char *Curve::SIGNAL_RANGE_CHANGED = "range_changed";
 const char *Curve::SIGNAL_DOMAIN_CHANGED = "domain_changed";
 
 Curve::Curve() {
-	property_helper.setup_for_instance(base_property_helper, this);
 }
 
 void Curve::set_point_count(int p_count) {
@@ -235,12 +231,6 @@ void Curve::_remove_point(int p_index, bool p_mark_dirty) {
 	}
 }
 
-void Curve::_set_point_position(int p_index, const Vector2 &p_position) {
-	// Set the value first, setting the offset might change the index.
-	set_point_value(p_index, p_position.y);
-	set_point_offset(p_index, p_position.x);
-}
-
 void Curve::remove_point(int p_index) {
 	_remove_point(p_index);
 	notify_property_list_changed();
@@ -442,16 +432,6 @@ real_t Curve::sample_local_nocheck(int p_index, real_t p_local_offset) const {
 	return y;
 }
 
-bool Curve::_filter_property(const String &p_name, int p_index) const {
-	if (p_index == 0) {
-		return p_name != "left_tangent" && p_name != "left_mode";
-	}
-	if (p_index == get_point_count() - 1) {
-		return p_name != "right_tangent" && p_name != "right_mode";
-	}
-	return true;
-}
-
 void Curve::mark_dirty() {
 	_baked_cache_dirty = true;
 	emit_changed();
@@ -597,6 +577,88 @@ void Curve::ensure_default_setup(real_t p_min, real_t p_max) {
 	}
 }
 
+bool Curve::_set(const StringName &p_name, const Variant &p_value) {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			Vector2 position = p_value.operator Vector2();
+			set_point_offset(point_index, position.x);
+			set_point_value(point_index, position.y);
+			return true;
+		} else if (property == "left_tangent") {
+			set_point_left_tangent(point_index, p_value);
+			return true;
+		} else if (property == "left_mode") {
+			int mode = p_value;
+			set_point_left_mode(point_index, (TangentMode)mode);
+			return true;
+		} else if (property == "right_tangent") {
+			set_point_right_tangent(point_index, p_value);
+			return true;
+		} else if (property == "right_mode") {
+			int mode = p_value;
+			set_point_right_mode(point_index, (TangentMode)mode);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Curve::_get(const StringName &p_name, Variant &r_ret) const {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			r_ret = get_point_position(point_index);
+			return true;
+		} else if (property == "left_tangent") {
+			r_ret = get_point_left_tangent(point_index);
+			return true;
+		} else if (property == "left_mode") {
+			r_ret = get_point_left_mode(point_index);
+			return true;
+		} else if (property == "right_tangent") {
+			r_ret = get_point_right_tangent(point_index);
+			return true;
+		} else if (property == "right_mode") {
+			r_ret = get_point_right_mode(point_index);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Curve::_get_property_list(List<PropertyInfo> *p_list) const {
+	for (uint32_t i = 0; i < _points.size(); i++) {
+		PropertyInfo pi = PropertyInfo(Variant::VECTOR2, vformat("point_%d/position", i));
+		pi.usage &= ~PROPERTY_USAGE_STORAGE;
+		p_list->push_back(pi);
+
+		if (i != 0) {
+			pi = PropertyInfo(Variant::FLOAT, vformat("point_%d/left_tangent", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+
+			pi = PropertyInfo(Variant::INT, vformat("point_%d/left_mode", i), PROPERTY_HINT_ENUM, "Free,Linear");
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+
+		if (i != _points.size() - 1) {
+			pi = PropertyInfo(Variant::FLOAT, vformat("point_%d/right_tangent", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+
+			pi = PropertyInfo(Variant::INT, vformat("point_%d/right_mode", i), PROPERTY_HINT_ENUM, "Free,Linear");
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+	}
+}
+
 void Curve::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Curve::get_point_count);
 	ClassDB::bind_method(D_METHOD("set_point_count", "count"), &Curve::set_point_count);
@@ -650,19 +712,6 @@ void Curve::_bind_methods() {
 	BIND_ENUM_CONSTANT(TANGENT_FREE);
 	BIND_ENUM_CONSTANT(TANGENT_LINEAR);
 	BIND_ENUM_CONSTANT(TANGENT_MODE_COUNT);
-
-	Point defaults;
-	const String mode_hint = "Free,Linear";
-
-	base_property_helper.set_prefix("point_");
-	base_property_helper.set_array_length_getter(&Curve::get_point_count);
-	base_property_helper.set_property_filter(&Curve::_filter_property);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR2, "position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.position, &Curve::_set_point_position, &Curve::get_point_position);
-	base_property_helper.register_property(PropertyInfo(Variant::FLOAT, "left_tangent", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.left_tangent, &Curve::set_point_left_tangent, &Curve::get_point_left_tangent);
-	base_property_helper.register_property(PropertyInfo(Variant::INT, "left_mode", PROPERTY_HINT_ENUM, mode_hint, PROPERTY_USAGE_EDITOR), defaults.left_mode, &Curve::set_point_left_mode, &Curve::get_point_left_mode);
-	base_property_helper.register_property(PropertyInfo(Variant::FLOAT, "right_tangent", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.right_tangent, &Curve::set_point_right_tangent, &Curve::get_point_right_tangent);
-	base_property_helper.register_property(PropertyInfo(Variant::INT, "right_mode", PROPERTY_HINT_ENUM, mode_hint, PROPERTY_USAGE_EDITOR), defaults.right_mode, &Curve::set_point_right_mode, &Curve::get_point_right_mode);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
 }
 
 int Curve2D::get_point_count() const {
@@ -1260,16 +1309,6 @@ Vector<RBMap<real_t, Vector2>> Curve2D::_tessellate_even_length(int p_max_stages
 	return midpoints;
 }
 
-bool Curve2D::_filter_property(const String &p_name, int p_index) const {
-	if (p_index == 0) {
-		return p_name != "in";
-	}
-	if (p_index == get_point_count() - 1) {
-		return p_name != "out";
-	}
-	return true;
-}
-
 PackedVector2Array Curve2D::tessellate_even_length(int p_max_stages, real_t p_length) const {
 	PackedVector2Array tess;
 
@@ -1302,6 +1341,64 @@ PackedVector2Array Curve2D::tessellate_even_length(int p_max_stages, real_t p_le
 	return tess;
 }
 
+bool Curve2D::_set(const StringName &p_name, const Variant &p_value) {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			set_point_position(point_index, p_value);
+			return true;
+		} else if (property == "in") {
+			set_point_in(point_index, p_value);
+			return true;
+		} else if (property == "out") {
+			set_point_out(point_index, p_value);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Curve2D::_get(const StringName &p_name, Variant &r_ret) const {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			r_ret = get_point_position(point_index);
+			return true;
+		} else if (property == "in") {
+			r_ret = get_point_in(point_index);
+			return true;
+		} else if (property == "out") {
+			r_ret = get_point_out(point_index);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Curve2D::_get_property_list(List<PropertyInfo> *p_list) const {
+	for (uint32_t i = 0; i < points.size(); i++) {
+		PropertyInfo pi = PropertyInfo(Variant::VECTOR2, vformat("point_%d/position", i));
+		pi.usage &= ~PROPERTY_USAGE_STORAGE;
+		p_list->push_back(pi);
+
+		if (i != 0) {
+			pi = PropertyInfo(Variant::VECTOR2, vformat("point_%d/in", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+
+		if (i != points.size() - 1) {
+			pi = PropertyInfo(Variant::VECTOR2, vformat("point_%d/out", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+	}
+}
+
 void Curve2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Curve2D::get_point_count);
 	ClassDB::bind_method(D_METHOD("set_point_count", "count"), &Curve2D::set_point_count);
@@ -1335,20 +1432,6 @@ void Curve2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "bake_interval", PROPERTY_HINT_RANGE, "0.01,512,0.01"), "set_bake_interval", "get_bake_interval");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_data", "_get_data");
 	ADD_ARRAY_COUNT("Points", "point_count", "set_point_count", "get_point_count", "point_");
-
-	Point defaults;
-
-	base_property_helper.set_prefix("point_");
-	base_property_helper.set_array_length_getter(&Curve2D::get_point_count);
-	base_property_helper.set_property_filter(&Curve2D::_filter_property);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR2, "position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.position, &Curve2D::set_point_position, &Curve2D::get_point_position);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR2, "in", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.in, &Curve2D::set_point_in, &Curve2D::get_point_in);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR2, "out", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.out, &Curve2D::set_point_out, &Curve2D::get_point_out);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
-}
-
-Curve2D::Curve2D() {
-	property_helper.setup_for_instance(base_property_helper, this);
 }
 
 /***********************************************************************************/
@@ -2283,16 +2366,6 @@ Vector<RBMap<real_t, Vector3>> Curve3D::_tessellate_even_length(int p_max_stages
 	return midpoints;
 }
 
-bool Curve3D::_filter_property(const String &p_name, int p_index) const {
-	if (p_index == 0) {
-		return p_name != "in";
-	}
-	if (p_index == get_point_count() - 1) {
-		return p_name != "out";
-	}
-	return true;
-}
-
 PackedVector3Array Curve3D::tessellate_even_length(int p_max_stages, real_t p_length) const {
 	PackedVector3Array tess;
 
@@ -2331,6 +2404,74 @@ PackedVector3Array Curve3D::tessellate_even_length(int p_max_stages, real_t p_le
 	return tess;
 }
 
+bool Curve3D::_set(const StringName &p_name, const Variant &p_value) {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			set_point_position(point_index, p_value);
+			return true;
+		} else if (property == "in") {
+			set_point_in(point_index, p_value);
+			return true;
+		} else if (property == "out") {
+			set_point_out(point_index, p_value);
+			return true;
+		} else if (property == "tilt") {
+			set_point_tilt(point_index, p_value);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool Curve3D::_get(const StringName &p_name, Variant &r_ret) const {
+	Vector<String> components = String(p_name).split("/", true, 2);
+	if (components.size() >= 2 && components[0].begins_with("point_") && components[0].trim_prefix("point_").is_valid_int()) {
+		int point_index = components[0].trim_prefix("point_").to_int();
+		const String &property = components[1];
+		if (property == "position") {
+			r_ret = get_point_position(point_index);
+			return true;
+		} else if (property == "in") {
+			r_ret = get_point_in(point_index);
+			return true;
+		} else if (property == "out") {
+			r_ret = get_point_out(point_index);
+			return true;
+		} else if (property == "tilt") {
+			r_ret = get_point_tilt(point_index);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Curve3D::_get_property_list(List<PropertyInfo> *p_list) const {
+	for (uint32_t i = 0; i < points.size(); i++) {
+		PropertyInfo pi = PropertyInfo(Variant::VECTOR3, vformat("point_%d/position", i));
+		pi.usage &= ~PROPERTY_USAGE_STORAGE;
+		p_list->push_back(pi);
+
+		if (closed || i != 0) {
+			pi = PropertyInfo(Variant::VECTOR3, vformat("point_%d/in", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+
+		if (closed || i != points.size() - 1) {
+			pi = PropertyInfo(Variant::VECTOR3, vformat("point_%d/out", i));
+			pi.usage &= ~PROPERTY_USAGE_STORAGE;
+			p_list->push_back(pi);
+		}
+
+		pi = PropertyInfo(Variant::FLOAT, vformat("point_%d/tilt", i), PROPERTY_HINT_RANGE, "-360,360,0.1,or_less,or_greater,radians_as_degrees");
+		pi.usage &= ~PROPERTY_USAGE_STORAGE;
+		p_list->push_back(pi);
+	}
+}
+
 void Curve3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_point_count"), &Curve3D::get_point_count);
 	ClassDB::bind_method(D_METHOD("set_point_count", "count"), &Curve3D::set_point_count);
@@ -2378,19 +2519,4 @@ void Curve3D::_bind_methods() {
 
 	ADD_GROUP("Up Vector", "up_vector_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "up_vector_enabled"), "set_up_vector_enabled", "is_up_vector_enabled");
-
-	Point defaults;
-
-	base_property_helper.set_prefix("point_");
-	base_property_helper.set_array_length_getter(&Curve3D::get_point_count);
-	base_property_helper.set_property_filter(&Curve3D::_filter_property);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR3, "position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.position, &Curve3D::set_point_position, &Curve3D::get_point_position);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR3, "in", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.in, &Curve3D::set_point_in, &Curve3D::get_point_in);
-	base_property_helper.register_property(PropertyInfo(Variant::VECTOR3, "out", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.out, &Curve3D::set_point_out, &Curve3D::get_point_out);
-	base_property_helper.register_property(PropertyInfo(Variant::FLOAT, "tilt", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), defaults.tilt, &Curve3D::set_point_tilt, &Curve3D::get_point_tilt);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
-}
-
-Curve3D::Curve3D() {
-	property_helper.setup_for_instance(base_property_helper, this);
 }
diff --git a/engine/scene/resources/curve.h b/engine/scene/resources/curve.h
index 3a623972..77821354 100644
--- a/engine/scene/resources/curve.h
+++ b/engine/scene/resources/curve.h
@@ -32,7 +32,6 @@
 
 #include "core/io/resource.h"
 #include "core/templates/rb_map.h"
-#include "scene/property_list_helper.h"
 
 // y(x) curve
 class Curve : public Resource {
@@ -55,7 +54,8 @@ public:
 		TangentMode left_mode = TANGENT_FREE;
 		TangentMode right_mode = TANGENT_FREE;
 
-		Point() {}
+		Point() {
+		}
 
 		Point(const Vector2 &p_position,
 				real_t p_left = 0.0,
@@ -70,9 +70,6 @@ public:
 		}
 	};
 
-	static inline PropertyListHelper base_property_helper;
-	PropertyListHelper property_helper;
-
 	Curve();
 
 	int get_point_count() const { return _points.size(); }
@@ -143,18 +140,14 @@ public:
 
 	void ensure_default_setup(real_t p_min, real_t p_max);
 
-protected:
-	bool _set(const StringName &p_name, const Variant &p_value) { return property_helper.property_set_value(p_name, p_value); }
-	bool _get(const StringName &p_name, Variant &r_ret) const { return property_helper.property_get_value(p_name, r_ret); }
-	void _get_property_list(List<PropertyInfo> *p_list) const { property_helper.get_property_list(p_list); }
-	bool _property_can_revert(const StringName &p_name) const { return property_helper.property_can_revert(p_name); }
-	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return property_helper.property_get_revert(p_name, r_property); }
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
 
+protected:
 	static void _bind_methods();
 
 private:
-	bool _filter_property(const String &p_name, int p_index) const;
-
 	void mark_dirty();
 	int _add_point(Vector2 p_position,
 			real_t p_left_tangent = 0,
@@ -163,7 +156,6 @@ private:
 			TangentMode p_right_mode = TANGENT_FREE,
 			bool p_mark_dirty = true);
 	void _remove_point(int p_index, bool p_mark_dirty = true);
-	void _set_point_position(int p_index, const Vector2 &p_position);
 
 	LocalVector<Point> _points;
 	mutable bool _baked_cache_dirty = false;
@@ -186,9 +178,6 @@ class Curve2D : public Resource {
 		Vector2 position;
 	};
 
-	static inline PropertyListHelper base_property_helper;
-	PropertyListHelper property_helper;
-
 	LocalVector<Point> points;
 
 	struct BakedPoint {
@@ -222,19 +211,16 @@ class Curve2D : public Resource {
 	Dictionary _get_data() const;
 	void _set_data(const Dictionary &p_data);
 
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+
 	void _add_point(const Vector2 &p_position, const Vector2 &p_in = Vector2(), const Vector2 &p_out = Vector2(), int p_atpos = -1);
 	void _remove_point(int p_index);
 
 	Vector<RBMap<real_t, Vector2>> _tessellate_even_length(int p_max_stages = 5, real_t p_length = 0.2) const;
-	bool _filter_property(const String &p_name, int p_index) const;
 
 protected:
-	bool _set(const StringName &p_name, const Variant &p_value) { return property_helper.property_set_value(p_name, p_value); }
-	bool _get(const StringName &p_name, Variant &r_ret) const { return property_helper.property_get_value(p_name, r_ret); }
-	void _get_property_list(List<PropertyInfo> *p_list) const { property_helper.get_property_list(p_list); }
-	bool _property_can_revert(const StringName &p_name) const { return property_helper.property_can_revert(p_name); }
-	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return property_helper.property_get_revert(p_name, r_property); }
-
 	static void _bind_methods();
 
 public:
@@ -266,8 +252,6 @@ public:
 
 	PackedVector2Array tessellate(int p_max_stages = 5, real_t p_tolerance = 4) const; //useful for display
 	PackedVector2Array tessellate_even_length(int p_max_stages = 5, real_t p_length = 20.0) const; // Useful for baking.
-
-	Curve2D();
 };
 
 class Curve3D : public Resource {
@@ -280,9 +264,6 @@ class Curve3D : public Resource {
 		real_t tilt = 0.0;
 	};
 
-	static inline PropertyListHelper base_property_helper;
-	PropertyListHelper property_helper;
-
 	LocalVector<Point> points;
 #ifdef TOOLS_ENABLED
 	// For Path3DGizmo.
@@ -322,19 +303,16 @@ class Curve3D : public Resource {
 	Dictionary _get_data() const;
 	void _set_data(const Dictionary &p_data);
 
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+
 	void _add_point(const Vector3 &p_position, const Vector3 &p_in = Vector3(), const Vector3 &p_out = Vector3(), int p_atpos = -1);
 	void _remove_point(int p_index);
 
 	Vector<RBMap<real_t, Vector3>> _tessellate_even_length(int p_max_stages = 5, real_t p_length = 0.2) const;
-	bool _filter_property(const String &p_name, int p_index) const;
 
 protected:
-	bool _set(const StringName &p_name, const Variant &p_value) { return property_helper.property_set_value(p_name, p_value); }
-	bool _get(const StringName &p_name, Variant &r_ret) const { return property_helper.property_get_value(p_name, r_ret); }
-	void _get_property_list(List<PropertyInfo> *p_list) const { property_helper.get_property_list(p_list); }
-	bool _property_can_revert(const StringName &p_name) const { return property_helper.property_can_revert(p_name); }
-	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return property_helper.property_get_revert(p_name, r_property); }
-
 	static void _bind_methods();
 
 public:
@@ -382,6 +360,4 @@ public:
 
 	PackedVector3Array tessellate(int p_max_stages = 5, real_t p_tolerance = 4) const; // Useful for display.
 	PackedVector3Array tessellate_even_length(int p_max_stages = 5, real_t p_length = 0.2) const; // Useful for baking.
-
-	Curve3D();
 };
diff --git a/engine/scene/resources/curve_texture.cpp b/engine/scene/resources/curve_texture.cpp
index 3cad726d..04f74dd0 100644
--- a/engine/scene/resources/curve_texture.cpp
+++ b/engine/scene/resources/curve_texture.cpp
@@ -30,8 +30,6 @@
 
 #include "curve_texture.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CurveTexture::_bind_methods() {
@@ -45,7 +43,7 @@ void CurveTexture::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,4096,suffix:px"), "set_width", "get_width");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_mode", PROPERTY_HINT_ENUM, "RGB,Red"), "set_texture_mode", "get_texture_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve", "get_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve", "get_curve");
 
 	BIND_ENUM_CONSTANT(TEXTURE_MODE_RGB);
 	BIND_ENUM_CONSTANT(TEXTURE_MODE_RED);
@@ -189,9 +187,9 @@ void CurveXYZTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_curve_z"), &CurveXYZTexture::get_curve_z);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,4096,suffix:px"), "set_width", "get_width");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_x", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve_x", "get_curve_x");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_y", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve_y", "get_curve_y");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_z", PROPERTY_HINT_RESOURCE_TYPE, Curve::get_class_static()), "set_curve_z", "get_curve_z");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_x", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve_x", "get_curve_x");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_y", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve_y", "get_curve_y");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve_z", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve_z", "get_curve_z");
 }
 
 void CurveXYZTexture::set_width(int p_width) {
diff --git a/engine/scene/resources/curve_texture.h b/engine/scene/resources/curve_texture.h
index c927b3e3..c1d3c6e9 100644
--- a/engine/scene/resources/curve_texture.h
+++ b/engine/scene/resources/curve_texture.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "scene/resources/curve.h"
 #include "scene/resources/texture.h"
 
 class CurveTexture : public Texture2D {
diff --git a/engine/scene/resources/dpi_texture.cpp b/engine/scene/resources/dpi_texture.cpp
index 84fbcd72..a02491fc 100644
--- a/engine/scene/resources/dpi_texture.cpp
+++ b/engine/scene/resources/dpi_texture.cpp
@@ -30,10 +30,11 @@
 
 #include "dpi_texture.h"
 
-#include "core/object/class_db.h"
+#include "core/io/image_loader.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/viewport.h"
 #include "scene/resources/bit_map.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/text/text_server.h"
+#include "scene/resources/placeholder_textures.h"
 
 #include "modules/modules_enabled.gen.h" // For svg.
 #ifdef MODULE_SVG_ENABLED
@@ -103,30 +104,6 @@ String DPITexture::get_source() const {
 	return source;
 }
 
-void DPITexture::set_fix_alpha_border(bool p_enabled) {
-	if (fix_alpha_border == p_enabled) {
-		return;
-	}
-	fix_alpha_border = p_enabled;
-	_update_texture();
-}
-
-bool DPITexture::get_fix_alpha_border() const {
-	return fix_alpha_border;
-}
-
-void DPITexture::set_premult_alpha(bool p_enabled) {
-	if (premult_alpha == p_enabled) {
-		return;
-	}
-	premult_alpha = p_enabled;
-	_update_texture();
-}
-
-bool DPITexture::get_premult_alpha() const {
-	return premult_alpha;
-}
-
 void DPITexture::set_base_scale(float p_scale) {
 	if (base_scale == p_scale) {
 		return;
@@ -226,16 +203,6 @@ RID DPITexture::_load_at_scale(double p_scale, bool p_set_size) const {
 		img->adjust_bcs(1.0, 1.0, saturation);
 	}
 
-	// Fix alpha border.
-	if (fix_alpha_border) {
-		img->fix_alpha_edges();
-	}
-
-	// Premultiply the alpha.
-	if (premult_alpha) {
-		img->premultiply_alpha();
-	}
-
 	Size2 current_size = size;
 	if (p_set_size || size.is_zero_approx()) {
 		size.x = img->get_width() / p_scale;
@@ -387,10 +354,6 @@ void DPITexture::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_source", "source"), &DPITexture::set_source);
 	ClassDB::bind_method(D_METHOD("get_source"), &DPITexture::get_source);
-	ClassDB::bind_method(D_METHOD("set_fix_alpha_border", "fix_alpha_border"), &DPITexture::set_fix_alpha_border);
-	ClassDB::bind_method(D_METHOD("get_fix_alpha_border"), &DPITexture::get_fix_alpha_border);
-	ClassDB::bind_method(D_METHOD("set_premult_alpha", "premult_alpha"), &DPITexture::set_premult_alpha);
-	ClassDB::bind_method(D_METHOD("get_premult_alpha"), &DPITexture::get_premult_alpha);
 	ClassDB::bind_method(D_METHOD("set_base_scale", "base_scale"), &DPITexture::set_base_scale);
 	ClassDB::bind_method(D_METHOD("get_base_scale"), &DPITexture::get_base_scale);
 	ClassDB::bind_method(D_METHOD("set_saturation", "saturation"), &DPITexture::set_saturation);
@@ -401,8 +364,6 @@ void DPITexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_scaled_rid"), &DPITexture::get_scaled_rid);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "_source", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_STORAGE), "set_source", "get_source");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fix_alpha_border", PROPERTY_HINT_NONE, ""), "set_fix_alpha_border", "get_fix_alpha_border");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "premult_alpha", PROPERTY_HINT_NONE, ""), "set_premult_alpha", "get_premult_alpha");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "base_scale", PROPERTY_HINT_RANGE, "0.01,10.0,0.01"), "set_base_scale", "get_base_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "saturation", PROPERTY_HINT_RANGE, "0.0,1.0,0.01"), "set_saturation", "get_saturation");
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "color_map", PROPERTY_HINT_DICTIONARY_TYPE, "Color;Color"), "set_color_map", "get_color_map");
diff --git a/engine/scene/resources/dpi_texture.h b/engine/scene/resources/dpi_texture.h
index 272fb65d..93750bb4 100644
--- a/engine/scene/resources/dpi_texture.h
+++ b/engine/scene/resources/dpi_texture.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/templates/lru.h"
 #include "scene/resources/texture.h"
 
 class BitMap;
@@ -43,8 +44,6 @@ class DPITexture : public Texture2D {
 	float saturation = 1.0;
 	Dictionary color_map;
 	Size2 size_override;
-	bool fix_alpha_border = false;
-	bool premult_alpha = false;
 
 	struct ScalingLevel {
 		HashSet<DPITexture *> textures;
@@ -75,12 +74,6 @@ public:
 	void set_source(const String &p_source);
 	String get_source() const;
 
-	void set_fix_alpha_border(bool p_enabled);
-	bool get_fix_alpha_border() const;
-
-	void set_premult_alpha(bool p_enabled);
-	bool get_premult_alpha() const;
-
 	void set_base_scale(float p_scale);
 	float get_base_scale() const;
 
diff --git a/engine/scene/resources/drawable_texture_2d.cpp b/engine/scene/resources/drawable_texture_2d.cpp
deleted file mode 100644
index d229c917..00000000
--- a/engine/scene/resources/drawable_texture_2d.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/**************************************************************************/
-/*  drawable_texture_2d.cpp                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "drawable_texture_2d.h"
-
-#include "core/object/class_db.h"
-#include "scene/resources/atlas_texture.h"
-#include "scene/resources/material.h"
-#include "servers/rendering/rendering_server.h"
-
-DrawableTexture2D::DrawableTexture2D() {
-	default_material = RS::get_singleton()->texture_drawable_get_default_material();
-}
-
-DrawableTexture2D::~DrawableTexture2D() {
-	if (texture.is_valid()) {
-		ERR_FAIL_NULL(RenderingServer::get_singleton());
-		RenderingServer::get_singleton()->free_rid(texture);
-	}
-}
-
-// Initialize Texture Resource with a call to rendering server. Overwrite existing.
-void DrawableTexture2D::_initialize() {
-	if (texture.is_valid()) {
-		RID new_texture = RS::get_singleton()->texture_drawable_create(width, height, (RSE::TextureDrawableFormat)format, base_color, mipmaps);
-		RS::get_singleton()->texture_replace(texture, new_texture);
-	} else {
-		texture = RS::get_singleton()->texture_drawable_create(width, height, (RSE::TextureDrawableFormat)format, base_color, mipmaps);
-	}
-}
-
-// Setup basic parameters on the Drawable Texture
-void DrawableTexture2D::setup(int p_width, int p_height, DrawableFormat p_format, const Color &p_color, bool p_use_mipmaps) {
-	ERR_FAIL_COND_MSG(p_width <= 0 || p_width > 16384, "Texture dimensions have to be in the 1 to 16384 range.");
-	ERR_FAIL_COND_MSG(p_height <= 0 || p_height > 16384, "Texture dimensions have to be in the 1 to 16384 range.");
-	width = p_width;
-	height = p_height;
-	format = p_format;
-	mipmaps = p_use_mipmaps;
-	base_color = p_color;
-	_initialize();
-	notify_property_list_changed();
-	emit_changed();
-}
-
-void DrawableTexture2D::set_width(int p_width) {
-	ERR_FAIL_COND_MSG(p_width <= 0 || p_width > 16384, "Texture dimensions have to be in the 1 to 16384 range.");
-	if (width == p_width) {
-		return;
-	}
-	width = p_width;
-	notify_property_list_changed();
-	emit_changed();
-}
-
-int DrawableTexture2D::get_width() const {
-	return width;
-}
-
-void DrawableTexture2D::set_height(int p_height) {
-	ERR_FAIL_COND_MSG(p_height <= 0 || p_height > 16384, "Texture dimensions have to be in the 1 to 16384 range.");
-	if (height == p_height) {
-		return;
-	}
-	height = p_height;
-	notify_property_list_changed();
-	emit_changed();
-}
-
-int DrawableTexture2D::get_height() const {
-	return height;
-}
-
-void DrawableTexture2D::set_drawable_format(DrawableFormat p_format) {
-	if (format == p_format) {
-		return;
-	}
-	format = p_format;
-	notify_property_list_changed();
-	emit_changed();
-}
-
-DrawableTexture2D::DrawableFormat DrawableTexture2D::get_drawable_format() const {
-	return format;
-}
-
-Image::Format DrawableTexture2D::get_format() const {
-	switch (format) {
-		case DRAWABLE_FORMAT_RGBA8:
-			return Image::FORMAT_RGBA8;
-		case DRAWABLE_FORMAT_RGBA8_SRGB:
-			return Image::FORMAT_RGBA8;
-		case DRAWABLE_FORMAT_RGBAH:
-			return Image::FORMAT_RGBAH;
-		case DRAWABLE_FORMAT_RGBAF:
-			return Image::FORMAT_RGBAF;
-		default:
-			return Image::FORMAT_RGBA8;
-	}
-}
-
-void DrawableTexture2D::set_use_mipmaps(bool p_mipmaps) {
-	if (mipmaps == p_mipmaps) {
-		return;
-	}
-	mipmaps = p_mipmaps;
-	notify_property_list_changed();
-	emit_changed();
-}
-
-bool DrawableTexture2D::get_use_mipmaps() const {
-	return mipmaps;
-}
-
-RID DrawableTexture2D::get_rid() const {
-	if (texture.is_null()) {
-		// We are in trouble, create something temporary.
-		// 4, 4, false, Image::FORMAT_RGBA8
-		texture = RenderingServer::get_singleton()->texture_2d_placeholder_create();
-	}
-	return texture;
-}
-
-void DrawableTexture2D::draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate, bool p_transpose) const {
-	if ((width | height) == 0) {
-		return;
-	}
-	RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, Rect2(p_pos, Size2(width, height)), texture, false, p_modulate, p_transpose);
-}
-
-void DrawableTexture2D::draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose) const {
-	if ((width | height) == 0) {
-		return;
-	}
-	RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, p_rect, texture, p_tile, p_modulate, p_transpose);
-}
-
-void DrawableTexture2D::draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, bool p_transpose, bool p_clip_uv) const {
-	if ((width | height) == 0) {
-		return;
-	}
-	RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas_item, p_rect, texture, p_src_rect, p_modulate, p_transpose, p_clip_uv);
-}
-
-// Perform a blit operation from the given source to the given rect on self.
-void DrawableTexture2D::blit_rect(const Rect2i p_rect, const Ref<Texture2D> &p_source, const Color &p_modulate, int p_mipmap, const Ref<Material> &p_material) {
-	// Use user Shader if exists.
-	RID material = default_material;
-	if (p_material.is_valid()) {
-		material = p_material->get_rid();
-		if (p_material->get_shader_mode() != Shader::MODE_TEXTURE_BLIT) {
-			WARN_PRINT("ShaderMaterial passed to blit_rect() is not a texture_blit shader. Using default instead.");
-		}
-	}
-
-	// Rendering server expects textureParameters as a TypedArray[RID]
-	Array textures;
-	textures.push_back(texture);
-
-	if (p_source.is_valid()) {
-		ERR_FAIL_COND_MSG(texture == p_source->get_rid(), "Cannot use self as a source.");
-	}
-	Array src_textures;
-	if (Ref<AtlasTexture>(p_source).is_valid()) {
-		WARN_PRINT("AtlasTexture not supported as a source for blit_rect. Using default White.");
-		src_textures.push_back(RID());
-	} else {
-		src_textures.push_back(p_source);
-	}
-
-	RS::get_singleton()->texture_drawable_blit_rect(textures, p_rect, material, p_modulate, src_textures, p_mipmap);
-	notify_property_list_changed();
-}
-
-// Perform a blit operation from the given sources to the given rect on self and extra targets
-void DrawableTexture2D::blit_rect_multi(const Rect2i p_rect, const TypedArray<Texture2D> &p_sources, const TypedArray<DrawableTexture2D> &p_extra_targets, const Color &p_modulate, int p_mipmap, const Ref<Material> &p_material) {
-	RID material = default_material;
-	if (p_material.is_valid()) {
-		material = p_material->get_rid();
-		if (p_material->get_shader_mode() != Shader::MODE_TEXTURE_BLIT) {
-			WARN_PRINT("ShaderMaterial passed to blit_rect_multi() is not a texture_blit shader. Using default instead.");
-		}
-	}
-
-	// Rendering server expects textureParameters as a TypedArray[RID]
-	Array textures;
-	textures.push_back(texture);
-	int i = 0;
-	while (i < p_extra_targets.size()) {
-		textures.push_back(RID(p_extra_targets[i]));
-		i += 1;
-	}
-	i = 0;
-	Array src_textures;
-	while (i < p_sources.size()) {
-		if (Ref<AtlasTexture>(p_sources[i]).is_valid()) {
-			WARN_PRINT("AtlasTexture not supported as a source for blit_rect. Using default White.");
-			src_textures.push_back(RID());
-		} else {
-			src_textures.push_back(RID(p_sources[i]));
-		}
-		ERR_FAIL_COND_MSG(textures.has(RID(src_textures[i])), "Cannot use self as a source.");
-		i += 1;
-	}
-
-	RS::get_singleton()->texture_drawable_blit_rect(textures, p_rect, material, p_modulate, src_textures, p_mipmap);
-	notify_property_list_changed();
-}
-
-Ref<Image> DrawableTexture2D::get_image() const {
-	if (texture.is_valid()) {
-		return RS::get_singleton()->texture_2d_get(texture);
-	} else {
-		return Ref<Image>();
-	}
-}
-
-void DrawableTexture2D::generate_mipmaps() {
-	if (texture.is_valid()) {
-		RS::get_singleton()->texture_drawable_generate_mipmaps(texture);
-	}
-}
-
-void DrawableTexture2D::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_width", "width"), &DrawableTexture2D::set_width);
-	ClassDB::bind_method(D_METHOD("set_height", "height"), &DrawableTexture2D::set_height);
-	ClassDB::bind_method(D_METHOD("set_format", "format"), &DrawableTexture2D::set_drawable_format);
-	ClassDB::bind_method(D_METHOD("set_use_mipmaps", "mipmaps"), &DrawableTexture2D::set_use_mipmaps);
-	ClassDB::bind_method(D_METHOD("get_use_mipmaps"), &DrawableTexture2D::get_use_mipmaps);
-
-	ClassDB::bind_method(D_METHOD("setup", "width", "height", "format", "color", "use_mipmaps"), &DrawableTexture2D::setup, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("blit_rect", "rect", "source", "modulate", "mipmap", "material"), &DrawableTexture2D::blit_rect, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(0), DEFVAL(Ref<Material>()));
-	ClassDB::bind_method(D_METHOD("blit_rect_multi", "rect", "sources", "extra_targets", "modulate", "mipmap", "material"), &DrawableTexture2D::blit_rect_multi, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(0), DEFVAL(Ref<Material>()));
-	ClassDB::bind_method(D_METHOD("generate_mipmaps"), &DrawableTexture2D::generate_mipmaps);
-
-	BIND_ENUM_CONSTANT(DRAWABLE_FORMAT_RGBA8);
-	BIND_ENUM_CONSTANT(DRAWABLE_FORMAT_RGBA8_SRGB);
-	BIND_ENUM_CONSTANT(DRAWABLE_FORMAT_RGBAH);
-	BIND_ENUM_CONSTANT(DRAWABLE_FORMAT_RGBAF);
-}
diff --git a/engine/scene/resources/drawable_texture_2d.h b/engine/scene/resources/drawable_texture_2d.h
deleted file mode 100644
index 1f25d067..00000000
--- a/engine/scene/resources/drawable_texture_2d.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**************************************************************************/
-/*  drawable_texture_2d.h                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "scene/resources/texture.h"
-
-class Material;
-
-class DrawableTexture2D : public Texture2D {
-	GDCLASS(DrawableTexture2D, Texture2D);
-	RES_BASE_EXTENSION("tex");
-
-public:
-	enum DrawableFormat {
-		DRAWABLE_FORMAT_RGBA8,
-		DRAWABLE_FORMAT_RGBA8_SRGB,
-		DRAWABLE_FORMAT_RGBAH,
-		DRAWABLE_FORMAT_RGBAF,
-	};
-
-private:
-	mutable RID texture;
-	int width = 64;
-	int height = 64;
-	bool mipmaps = false;
-	DrawableFormat format = DRAWABLE_FORMAT_RGBA8;
-
-	Color base_color = Color(1, 1, 1, 1);
-
-	RID default_material;
-
-	void _initialize();
-
-protected:
-	static void _bind_methods();
-
-public:
-	void set_width(int p_width);
-	int get_width() const override;
-	void set_height(int p_height);
-	int get_height() const override;
-
-	void set_drawable_format(DrawableFormat p_format);
-	DrawableFormat get_drawable_format() const;
-	void set_use_mipmaps(bool p_mipmaps);
-	bool get_use_mipmaps() const;
-
-	virtual Image::Format get_format() const override;
-	virtual RID get_rid() const override;
-
-	virtual void draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false) const override;
-	virtual void draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false) const override;
-	virtual void draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = true) const override;
-
-	void setup(int p_width, int p_height, DrawableFormat p_format, const Color &p_modulate = Color(1, 1, 1, 1), bool p_use_mipmaps = false);
-
-	void blit_rect(const Rect2i p_rect, const Ref<Texture2D> &p_source, const Color &p_modulate = Color(1, 1, 1, 1), int p_mipmap = 0, const Ref<Material> &p_material = Ref<Material>());
-	void blit_rect_multi(const Rect2i p_rect, const TypedArray<Texture2D> &p_sources, const TypedArray<DrawableTexture2D> &p_extra_targets, const Color &p_modulate = Color(1, 1, 1, 1), int p_mipmap = 0, const Ref<Material> &p_material = Ref<Material>());
-
-	virtual Ref<Image> get_image() const override;
-
-	void generate_mipmaps();
-
-	DrawableTexture2D();
-	~DrawableTexture2D();
-};
-
-VARIANT_ENUM_CAST(DrawableTexture2D::DrawableFormat)
diff --git a/engine/scene/resources/environment.cpp b/engine/scene/resources/environment.cpp
index 43bf828c..fc6724fe 100644
--- a/engine/scene/resources/environment.cpp
+++ b/engine/scene/resources/environment.cpp
@@ -30,13 +30,8 @@
 
 #include "environment.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/resources/gradient_texture.h"
-#include "scene/resources/sky.h"
 #include "servers/rendering/rendering_server.h"
 
 RID Environment::get_rid() const {
@@ -47,7 +42,7 @@ RID Environment::get_rid() const {
 
 void Environment::set_background(BGMode p_bg) {
 	bg_mode = p_bg;
-	RS::get_singleton()->environment_set_background(environment, RSE::EnvironmentBG(p_bg));
+	RS::get_singleton()->environment_set_background(environment, RS::EnvironmentBG(p_bg));
 	notify_property_list_changed();
 	if (bg_mode != BG_SKY) {
 		set_fog_aerial_perspective(0.0);
@@ -197,9 +192,9 @@ void Environment::_update_ambient_light() {
 	RS::get_singleton()->environment_set_ambient_light(
 			environment,
 			ambient_color,
-			RSE::EnvironmentAmbientSource(ambient_source),
+			RS::EnvironmentAmbientSource(ambient_source),
 			ambient_energy,
-			ambient_sky_contribution, RSE::EnvironmentReflectionSource(reflection_source));
+			ambient_sky_contribution, RS::EnvironmentReflectionSource(reflection_source));
 }
 
 // Tonemap
@@ -253,7 +248,7 @@ float Environment::get_tonemap_agx_contrast() const {
 void Environment::_update_tonemap() {
 	RS::get_singleton()->environment_set_tonemap(
 			environment,
-			RSE::EnvironmentToneMapper(tone_mapper),
+			RS::EnvironmentToneMapper(tone_mapper),
 			tonemap_exposure,
 			tone_mapper == TONE_MAPPER_AGX ? tonemap_agx_white : tonemap_white);
 }
@@ -594,7 +589,7 @@ void Environment::_update_sdfgi() {
 			sdfgi_enabled,
 			sdfgi_cascades,
 			sdfgi_min_cell_size,
-			RSE::EnvironmentSDFGIYScale(sdfgi_y_scale),
+			RS::EnvironmentSDFGIYScale(sdfgi_y_scale),
 			sdfgi_use_occlusion,
 			sdfgi_bounce_feedback,
 			sdfgi_read_sky_light,
@@ -615,7 +610,7 @@ bool Environment::is_glow_enabled() const {
 }
 
 void Environment::set_glow_level(int p_level, float p_intensity) {
-	ERR_FAIL_INDEX(p_level, RSE::MAX_GLOW_LEVELS);
+	ERR_FAIL_INDEX(p_level, RS::MAX_GLOW_LEVELS);
 
 	glow_levels.write[p_level] = p_intensity;
 
@@ -623,7 +618,7 @@ void Environment::set_glow_level(int p_level, float p_intensity) {
 }
 
 float Environment::get_glow_level(int p_level) const {
-	ERR_FAIL_INDEX_V(p_level, RSE::MAX_GLOW_LEVELS, 0.0);
+	ERR_FAIL_INDEX_V(p_level, RS::MAX_GLOW_LEVELS, 0.0);
 
 	return glow_levels[p_level];
 }
@@ -761,7 +756,7 @@ void Environment::_update_glow() {
 			glow_strength,
 			glow_mix,
 			glow_bloom,
-			RSE::EnvironmentGlowBlendMode(glow_blend_mode),
+			RS::EnvironmentGlowBlendMode(glow_blend_mode),
 			glow_hdr_bleed_threshold,
 			glow_hdr_bleed_scale,
 			glow_hdr_luminance_cap,
@@ -867,7 +862,7 @@ void Environment::_update_fog() {
 			fog_height_density,
 			fog_aerial_perspective,
 			fog_sky_affect,
-			RSE::EnvironmentFogMode(fog_mode));
+			RS::EnvironmentFogMode(fog_mode));
 }
 
 // Depth Fog
@@ -1112,75 +1107,56 @@ void Environment::_validate_property(PropertyInfo &p_property) const {
 		if (bg_mode != BG_SKY && ambient_source != AMBIENT_SOURCE_SKY && reflection_source != REFLECTION_SOURCE_SKY) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "fog_depth_curve" || p_property.name == "fog_depth_begin" || p_property.name == "fog_depth_end") {
 		if (fog_mode == FOG_MODE_EXPONENTIAL) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "ambient_light_color" || p_property.name == "ambient_light_energy") {
 		if (ambient_source == AMBIENT_SOURCE_DISABLED) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "ambient_light_sky_contribution") {
 		if (ambient_source == AMBIENT_SOURCE_DISABLED || ambient_source == AMBIENT_SOURCE_COLOR) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "fog_aerial_perspective") {
 		if (bg_mode != BG_SKY) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
-	if (p_property.name == "tonemap_white") {
-		if (tone_mapper == TONE_MAPPER_LINEAR || tone_mapper == TONE_MAPPER_AGX) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-		return;
+	if (p_property.name == "tonemap_white" && (tone_mapper == TONE_MAPPER_LINEAR || tone_mapper == TONE_MAPPER_AGX)) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 
-	if (p_property.name == "tonemap_agx_white") {
-		if (tone_mapper != TONE_MAPPER_AGX) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-		return;
+	if (p_property.name == "tonemap_agx_white" && tone_mapper != TONE_MAPPER_AGX) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 
-	if (p_property.name == "tonemap_agx_contrast") {
-		if (tone_mapper != TONE_MAPPER_AGX) {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-		return;
+	if (p_property.name == "tonemap_agx_contrast" && tone_mapper != TONE_MAPPER_AGX) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 
-	if (p_property.name == "glow_intensity") {
-		if (glow_blend_mode == GLOW_BLEND_MODE_MIX && OS::get_singleton()->get_current_rendering_method() != "gl_compatibility") {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-		return;
+	if (p_property.name == "glow_intensity" && glow_blend_mode == GLOW_BLEND_MODE_MIX && OS::get_singleton()->get_current_rendering_method() != "gl_compatibility") {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 
 	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
 		// Hide glow properties we do not support in GL Compatibility.
 		if (p_property.name.begins_with("glow_levels") || p_property.name == "glow_normalized" || p_property.name == "glow_strength" || p_property.name == "glow_mix" || p_property.name == "glow_blend_mode" || p_property.name == "glow_map_strength" || p_property.name == "glow_map") {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			return;
 		}
 	} else {
 		if (p_property.name == "glow_mix" && glow_blend_mode != GLOW_BLEND_MODE_MIX) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			return;
 		}
 	}
 
@@ -1190,7 +1166,6 @@ void Environment::_validate_property(PropertyInfo &p_property) const {
 			if ((p_property.name != "ssao_enabled") && (p_property.name != "ssao_radius") && (p_property.name != "ssao_intensity")) {
 				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 			}
-			return;
 		}
 	}
 
@@ -1198,21 +1173,18 @@ void Environment::_validate_property(PropertyInfo &p_property) const {
 		if (bg_mode != BG_COLOR && ambient_source != AMBIENT_SOURCE_COLOR) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "background_canvas_max_layer") {
 		if (bg_mode != BG_CANVAS) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "background_camera_feed_id") {
 		if (bg_mode != BG_CAMERA_FEED) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 		}
-		return;
 	}
 
 	if (p_property.name == "background_intensity" && !GLOBAL_GET_CACHED(bool, "rendering/lights_and_shadows/use_physical_light_units")) {
@@ -1271,7 +1243,7 @@ void Environment::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "background_camera_feed_id", PROPERTY_HINT_RANGE, "1,10,1"), "set_camera_feed_id", "get_camera_feed_id");
 
 	ADD_GROUP("Sky", "sky_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky", PROPERTY_HINT_RESOURCE_TYPE, Sky::get_class_static()), "set_sky", "get_sky");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky", PROPERTY_HINT_RESOURCE_TYPE, "Sky"), "set_sky", "get_sky");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sky_custom_fov", PROPERTY_HINT_RANGE, "0,180,0.1,degrees"), "set_sky_custom_fov", "get_sky_custom_fov");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "sky_rotation", PROPERTY_HINT_RANGE, "-360,360,0.1,or_less,or_greater,radians_as_degrees"), "set_sky_rotation", "get_sky_rotation");
 
@@ -1478,7 +1450,7 @@ void Environment::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_hdr_scale", PROPERTY_HINT_RANGE, "0.0,4.0,0.01"), "set_glow_hdr_bleed_scale", "get_glow_hdr_bleed_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_hdr_luminance_cap", PROPERTY_HINT_RANGE, "0.0,256.0,0.01"), "set_glow_hdr_luminance_cap", "get_glow_hdr_luminance_cap");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "glow_map_strength", PROPERTY_HINT_RANGE, "0.0,1.0,0.01"), "set_glow_map_strength", "get_glow_map_strength");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "glow_map", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_glow_map", "get_glow_map");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "glow_map", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_glow_map", "get_glow_map");
 
 	// Fog
 
diff --git a/engine/scene/resources/environment.h b/engine/scene/resources/environment.h
index 15ea8a0d..cfc1757f 100644
--- a/engine/scene/resources/environment.h
+++ b/engine/scene/resources/environment.h
@@ -31,10 +31,9 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "scene/resources/sky.h"
 #include "scene/resources/texture.h"
 
-class Sky;
-
 class Environment : public Resource {
 	GDCLASS(Environment, Resource);
 
diff --git a/engine/scene/resources/external_texture.cpp b/engine/scene/resources/external_texture.cpp
index 39e1a43c..45d1f723 100644
--- a/engine/scene/resources/external_texture.cpp
+++ b/engine/scene/resources/external_texture.cpp
@@ -30,7 +30,6 @@
 
 #include "external_texture.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void ExternalTexture::_bind_methods() {
diff --git a/engine/scene/resources/font.compat.inc b/engine/scene/resources/font.compat.inc
index daac8b3f..2b7420e1 100644
--- a/engine/scene/resources/font.compat.inc
+++ b/engine/scene/resources/font.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "font.h"
-
-#include "core/object/class_db.h"
-
 void Font::_draw_string_bind_compat_104872(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	draw_string(p_canvas_item, p_pos, p_text, p_alignment, p_width, p_font_size, p_modulate, p_jst_flags, p_direction, p_orientation, 0.0);
 }
@@ -59,15 +55,11 @@ real_t Font::_draw_char_outline_bind_compat_104872(RID p_canvas_item, const Poin
 }
 
 RID Font::_find_variation_bind_compat_80954(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform) const {
-	return find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, 0, 0, 0, 0, 0.0, 0, Vector<Color>());
+	return find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, 0, 0, 0, 0, 0.0);
 }
 
 RID Font::_find_variation_bind_compat_87668(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph) const {
-	return find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, 0.0, 0, Vector<Color>());
-}
-
-RID Font::_find_variation_bind_compat_117149(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset) const {
-	return find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset, 0, Vector<Color>());
+	return find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, 0.0);
 }
 
 void Font::_bind_compatibility_methods() {
@@ -82,7 +74,6 @@ void Font::_bind_compatibility_methods() {
 
 	ClassDB::bind_compatibility_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform"), &Font::_find_variation_bind_compat_80954, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()));
 	ClassDB::bind_compatibility_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform", "spacing_top", "spacing_bottom", "spacing_space", "spacing_glyph"), &Font::_find_variation_bind_compat_87668, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0));
-	ClassDB::bind_compatibility_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform", "spacing_top", "spacing_bottom", "spacing_space", "spacing_glyph", "baseline_offset"), &Font::_find_variation_bind_compat_117149, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0.0));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/font.cpp b/engine/scene/resources/font.cpp
index 11535d9e..d962c979 100644
--- a/engine/scene/resources/font.cpp
+++ b/engine/scene/resources/font.cpp
@@ -31,12 +31,9 @@
 #include "font.h"
 #include "font.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/io/image_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/templates/hash_map.h"
+#include "core/templates/hashfuncs.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/text_line.h"
 #include "scene/resources/text_paragraph.h"
@@ -53,7 +50,7 @@ void Font::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_fallbacks"), &Font::get_fallbacks);
 
 	// Output.
-	ClassDB::bind_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform", "spacing_top", "spacing_bottom", "spacing_space", "spacing_glyph", "baseline_offset", "palette_index", "custom_colors"), &Font::find_variation, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0.0), DEFVAL(0), DEFVAL(Vector<Color>()));
+	ClassDB::bind_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform", "spacing_top", "spacing_bottom", "spacing_space", "spacing_glyph", "baseline_offset"), &Font::find_variation, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0.0));
 	ClassDB::bind_method(D_METHOD("get_rids"), &Font::get_rids);
 
 	// Font metrics.
@@ -70,10 +67,6 @@ void Font::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_font_weight"), &Font::get_font_weight);
 	ClassDB::bind_method(D_METHOD("get_font_stretch"), &Font::get_font_stretch);
 
-	ClassDB::bind_method(D_METHOD("get_palette_count"), &Font::get_palette_count);
-	ClassDB::bind_method(D_METHOD("get_palette_name", "index"), &Font::get_palette_name);
-	ClassDB::bind_method(D_METHOD("get_palette_colors", "index"), &Font::get_palette_colors);
-
 	ClassDB::bind_method(D_METHOD("get_spacing", "spacing"), &Font::get_spacing);
 	ClassDB::bind_method(D_METHOD("get_opentype_features"), &Font::get_opentype_features);
 
@@ -274,18 +267,6 @@ String Font::get_font_name() const {
 	return TS->font_get_name(_get_rid());
 }
 
-int64_t Font::get_palette_count() const {
-	return TS->font_get_palette_count(_get_rid());
-}
-
-String Font::get_palette_name(int64_t p_index) const {
-	return TS->font_get_palette_name(_get_rid(), p_index);
-}
-
-Vector<Color> Font::get_palette_colors(int64_t p_index) const {
-	return TS->font_get_palette_colors(_get_rid(), p_index);
-}
-
 Dictionary Font::get_ot_name_strings() const {
 	return TS->font_get_ot_name_strings(_get_rid());
 }
@@ -1410,7 +1391,7 @@ void FontFile::_get_property_list(List<PropertyInfo> *p_list) const {
 			int tx_cnt = get_texture_count(i, sz);
 			for (int k = 0; k < tx_cnt; k++) {
 				p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, prefix_sz + "textures/" + itos(k) + "/offsets", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
-				p_list->push_back(PropertyInfo(Variant::OBJECT, prefix_sz + "textures/" + itos(k) + "/image", PROPERTY_HINT_RESOURCE_TYPE, Image::get_class_static(), PROPERTY_USAGE_STORAGE));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, prefix_sz + "textures/" + itos(k) + "/image", PROPERTY_HINT_RESOURCE_TYPE, "Image", PROPERTY_USAGE_STORAGE));
 			}
 			PackedInt32Array glyphs = get_glyph_list(i, sz);
 			for (int k = 0; k < glyphs.size(); k++) {
@@ -2382,7 +2363,7 @@ real_t FontFile::get_oversampling() const {
 	return oversampling_override;
 }
 
-RID FontFile::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset, int64_t p_palette_index, const Vector<Color> &p_custom_colors) const {
+RID FontFile::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset) const {
 	// Find existing variation cache.
 	const Dictionary &supported_coords = get_supported_variation_list();
 	int make_linked_from = -1;
@@ -2394,8 +2375,6 @@ RID FontFile::find_variation(const Dictionary &p_variation_coordinates, int p_fa
 			match = match && (TS->font_get_face_index(cache[i]) == p_face_index);
 			match = match && (TS->font_get_embolden(cache[i]) == p_strength);
 			match = match && (TS->font_get_transform(cache[i]) == p_transform);
-			match = match && (TS->font_get_used_palette(cache[i]) == p_palette_index);
-			match = match && (TS->font_get_palette_custom_colors(cache[i]) == p_custom_colors);
 			match_linked = match_linked && (TS->font_get_spacing(cache[i], TextServer::SPACING_TOP) == p_spacing_top);
 			match_linked = match_linked && (TS->font_get_spacing(cache[i], TextServer::SPACING_BOTTOM) == p_spacing_bottom);
 			match_linked = match_linked && (TS->font_get_spacing(cache[i], TextServer::SPACING_SPACE) == p_spacing_space);
@@ -2445,8 +2424,6 @@ RID FontFile::find_variation(const Dictionary &p_variation_coordinates, int p_fa
 		TS->font_set_spacing(cache[idx], TextServer::SPACING_SPACE, p_spacing_space);
 		TS->font_set_spacing(cache[idx], TextServer::SPACING_GLYPH, p_spacing_glyph);
 		TS->font_set_baseline_offset(cache[idx], p_baseline_offset);
-		TS->font_set_used_palette(cache[idx], p_palette_index);
-		TS->font_set_palette_custom_colors(cache[idx], p_custom_colors);
 	} else {
 		_ensure_rid(idx);
 		TS->font_set_variation_coordinates(cache[idx], p_variation_coordinates);
@@ -2458,8 +2435,6 @@ RID FontFile::find_variation(const Dictionary &p_variation_coordinates, int p_fa
 		TS->font_set_spacing(cache[idx], TextServer::SPACING_SPACE, p_spacing_space);
 		TS->font_set_spacing(cache[idx], TextServer::SPACING_GLYPH, p_spacing_glyph);
 		TS->font_set_baseline_offset(cache[idx], p_baseline_offset);
-		TS->font_set_used_palette(cache[idx], p_palette_index);
-		TS->font_set_palette_custom_colors(cache[idx], p_custom_colors);
 	}
 	return cache[idx];
 }
@@ -2927,13 +2902,7 @@ void FontVariation::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_baseline_offset", "baseline_offset"), &FontVariation::set_baseline_offset);
 	ClassDB::bind_method(D_METHOD("get_baseline_offset"), &FontVariation::get_baseline_offset);
 
-	ClassDB::bind_method(D_METHOD("get_palette_index"), &FontVariation::get_palette_index);
-	ClassDB::bind_method(D_METHOD("set_palette_index", "palette_index"), &FontVariation::set_palette_index);
-
-	ClassDB::bind_method(D_METHOD("get_palette_custom_colors"), &FontVariation::get_palette_custom_colors);
-	ClassDB::bind_method(D_METHOD("set_palette_custom_colors", "colors"), &FontVariation::set_palette_custom_colors);
-
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base_font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static()), "set_base_font", "get_base_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base_font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_base_font", "get_base_font");
 
 	ADD_GROUP("Variation", "variation_");
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "variation_opentype"), "set_variation_opentype", "get_variation_opentype");
@@ -2952,46 +2921,6 @@ void FontVariation::_bind_methods() {
 
 	ADD_GROUP("Baseline", "baseline_");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "baseline_offset", PROPERTY_HINT_RANGE, "-2,2,0.005"), "set_baseline_offset", "get_baseline_offset");
-
-	ADD_GROUP("Palette", "palette_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "palette_index", PROPERTY_HINT_NONE, ""), "set_palette_index", "get_palette_index");
-	ADD_PROPERTY(PropertyInfo(Variant::PACKED_COLOR_ARRAY, "palette_custom_colors", PROPERTY_HINT_NONE, ""), "set_palette_custom_colors", "get_palette_custom_colors");
-}
-
-void FontVariation::_validate_property(PropertyInfo &p_property) const {
-	if (p_property.name == "palette_custom_colors") {
-		Ref<Font> f = _get_base_font_or_default();
-		if (f.is_valid()) {
-			int64_t pal_count = f->get_palette_count();
-			if (pal_count == 0 || f->get_palette_colors(0).is_empty()) {
-				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			}
-		} else {
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	} else if (p_property.name == "palette_index") {
-		Ref<Font> f = _get_base_font_or_default();
-		if (f.is_valid()) {
-			p_property.hint = PROPERTY_HINT_ENUM;
-			p_property.hint_string = String();
-
-			int64_t pal_count = f->get_palette_count();
-			if (pal_count == 0) {
-				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			} else {
-				for (int64_t i = 0; i < pal_count; i++) {
-					if (!p_property.hint_string.is_empty()) {
-						p_property.hint_string += ",";
-					}
-					p_property.hint_string += f->get_palette_name(i);
-				}
-			}
-		} else {
-			p_property.hint = PROPERTY_HINT_NONE;
-			p_property.hint_string = String();
-			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-		}
-	}
 }
 
 void FontVariation::_update_rids() const {
@@ -3033,8 +2962,6 @@ void FontVariation::reset_state() {
 		extra_spacing[i] = 0;
 	}
 	baseline_offset = 0.0;
-	palette_index = 0;
-	custom_colors.clear();
 
 	Font::reset_state();
 }
@@ -3190,32 +3117,10 @@ float FontVariation::get_baseline_offset() const {
 	return baseline_offset;
 }
 
-void FontVariation::set_palette_index(int64_t p_palette_index) {
-	if (palette_index != p_palette_index) {
-		palette_index = p_palette_index;
-		_invalidate_rids();
-	}
-}
-
-int64_t FontVariation::get_palette_index() const {
-	return palette_index;
-}
-
-void FontVariation::set_palette_custom_colors(const Vector<Color> &p_colors) {
-	if (custom_colors != p_colors) {
-		custom_colors = p_colors;
-		_invalidate_rids();
-	}
-}
-
-Vector<Color> FontVariation::get_palette_custom_colors() const {
-	return custom_colors;
-}
-
-RID FontVariation::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset, int64_t p_palette_index, const Vector<Color> &p_custom_colors) const {
+RID FontVariation::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset) const {
 	Ref<Font> f = _get_base_font_or_default();
 	if (f.is_valid()) {
-		return f->find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset, p_palette_index, p_custom_colors);
+		return f->find_variation(p_variation_coordinates, p_face_index, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset);
 	}
 	return RID();
 }
@@ -3223,7 +3128,7 @@ RID FontVariation::find_variation(const Dictionary &p_variation_coordinates, int
 RID FontVariation::_get_rid() const {
 	Ref<Font> f = _get_base_font_or_default();
 	if (f.is_valid()) {
-		return f->find_variation(variation.opentype, variation.face_index, variation.embolden, variation.transform, extra_spacing[TextServer::SPACING_TOP], extra_spacing[TextServer::SPACING_BOTTOM], extra_spacing[TextServer::SPACING_SPACE], extra_spacing[TextServer::SPACING_GLYPH], baseline_offset, palette_index, custom_colors);
+		return f->find_variation(variation.opentype, variation.face_index, variation.embolden, variation.transform, extra_spacing[TextServer::SPACING_TOP], extra_spacing[TextServer::SPACING_BOTTOM], extra_spacing[TextServer::SPACING_SPACE], extra_spacing[TextServer::SPACING_GLYPH], baseline_offset);
 	}
 	return RID();
 }
@@ -3743,7 +3648,7 @@ int SystemFont::get_spacing(TextServer::SpacingType p_spacing) const {
 	}
 }
 
-RID SystemFont::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset, int64_t p_palette_index, const Vector<Color> &p_custom_colors) const {
+RID SystemFont::find_variation(const Dictionary &p_variation_coordinates, int p_face_index, float p_strength, Transform2D p_transform, int p_spacing_top, int p_spacing_bottom, int p_spacing_space, int p_spacing_glyph, float p_baseline_offset) const {
 	Ref<Font> f = _get_base_font_or_default();
 	if (f.is_valid()) {
 		Dictionary var = p_variation_coordinates;
@@ -3759,9 +3664,9 @@ RID SystemFont::find_variation(const Dictionary &p_variation_coordinates, int p_
 
 		if (!face_indices.is_empty()) {
 			int face_index = CLAMP(p_face_index, 0, face_indices.size() - 1);
-			return f->find_variation(var, face_indices[face_index], p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset, p_palette_index, p_custom_colors);
+			return f->find_variation(var, face_indices[face_index], p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset);
 		} else {
-			return f->find_variation(var, 0, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset, p_palette_index, p_custom_colors);
+			return f->find_variation(var, 0, p_strength, p_transform, p_spacing_top, p_spacing_bottom, p_spacing_space, p_spacing_glyph, p_baseline_offset);
 		}
 	}
 	return RID();
diff --git a/engine/scene/resources/font.h b/engine/scene/resources/font.h
index 996e6922..741a6b7e 100644
--- a/engine/scene/resources/font.h
+++ b/engine/scene/resources/font.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource.h"
 #include "core/templates/lru.h"
-#include "core/variant/typed_array.h"
+#include "scene/resources/texture.h"
 #include "servers/text/text_server.h"
 
 class TextLine;
@@ -108,7 +108,6 @@ protected:
 	real_t _draw_char_outline_bind_compat_104872(RID p_canvas_item, const Point2 &p_pos, char32_t p_char, int p_font_size = DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0)) const;
 	RID _find_variation_bind_compat_80954(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D()) const;
 	RID _find_variation_bind_compat_87668(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0) const;
-	RID _find_variation_bind_compat_117149(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0) const;
 	static void _bind_compatibility_methods();
 #endif
 
@@ -124,7 +123,7 @@ public:
 	virtual TypedArray<Font> get_fallbacks() const;
 
 	// Output.
-	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0, int64_t p_palette_index = 0, const Vector<Color> &p_custom_colors = Vector<Color>()) const { return RID(); }
+	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0) const { return RID(); }
 	virtual RID _get_rid() const { return RID(); }
 	virtual TypedArray<RID> get_rids() const;
 
@@ -142,10 +141,6 @@ public:
 	virtual int get_font_weight() const;
 	virtual int get_font_stretch() const;
 
-	virtual int64_t get_palette_count() const;
-	virtual String get_palette_name(int64_t p_index) const;
-	virtual Vector<Color> get_palette_colors(int64_t p_index) const;
-
 	virtual int get_spacing(TextServer::SpacingType p_spacing) const { return 0; }
 	virtual Dictionary get_opentype_features() const;
 
@@ -305,7 +300,7 @@ public:
 	virtual real_t get_oversampling() const;
 
 	// Cache.
-	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0, int64_t p_palette_index = 0, const Vector<Color> &p_custom_colors = Vector<Color>()) const override;
+	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0) const override;
 	virtual RID _get_rid() const override;
 
 	virtual int get_cache_count() const;
@@ -432,12 +427,9 @@ class FontVariation : public Font {
 	Dictionary opentype_features;
 	int extra_spacing[TextServer::SPACING_MAX];
 	float baseline_offset = 0.0;
-	int64_t palette_index = 0;
-	Vector<Color> custom_colors;
 
 protected:
 	static void _bind_methods();
-	void _validate_property(PropertyInfo &p_property) const;
 
 	virtual void _update_rids() const override;
 
@@ -469,14 +461,8 @@ public:
 	virtual float get_baseline_offset() const;
 	virtual void set_baseline_offset(float p_baseline_offset);
 
-	virtual int64_t get_palette_index() const;
-	virtual void set_palette_index(int64_t p_palette_index);
-
-	virtual Vector<Color> get_palette_custom_colors() const;
-	virtual void set_palette_custom_colors(const Vector<Color> &p_colors);
-
 	// Output.
-	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0, int64_t p_palette_index = 0, const Vector<Color> &p_custom_colors = Vector<Color>()) const override;
+	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0) const override;
 	virtual RID _get_rid() const override;
 
 	FontVariation();
@@ -582,7 +568,7 @@ public:
 
 	virtual int get_spacing(TextServer::SpacingType p_spacing) const override;
 
-	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0, int64_t p_palette_index = 0, const Vector<Color> &p_custom_colors = Vector<Color>()) const override;
+	virtual RID find_variation(const Dictionary &p_variation_coordinates, int p_face_index = 0, float p_strength = 0.0, Transform2D p_transform = Transform2D(), int p_spacing_top = 0, int p_spacing_bottom = 0, int p_spacing_space = 0, int p_spacing_glyph = 0, float p_baseline_offset = 0.0) const override;
 	virtual RID _get_rid() const override;
 
 	int64_t get_face_count() const override;
diff --git a/engine/scene/resources/gradient.cpp b/engine/scene/resources/gradient.cpp
index ca027cdf..55c787ef 100644
--- a/engine/scene/resources/gradient.cpp
+++ b/engine/scene/resources/gradient.cpp
@@ -31,7 +31,6 @@
 #include "gradient.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 Gradient::Gradient() {
 	//Set initial gradient transition from black to white
diff --git a/engine/scene/resources/gradient.h b/engine/scene/resources/gradient.h
index dd26bfdd..8e3461a8 100644
--- a/engine/scene/resources/gradient.h
+++ b/engine/scene/resources/gradient.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource.h"
 
-#include <thirdparty/misc/ok_color.h>
+#include "thirdparty/misc/ok_color.h"
 
 class Gradient : public Resource {
 	GDCLASS(Gradient, Resource);
diff --git a/engine/scene/resources/gradient_texture.cpp b/engine/scene/resources/gradient_texture.cpp
index 559849e1..183e46fb 100644
--- a/engine/scene/resources/gradient_texture.cpp
+++ b/engine/scene/resources/gradient_texture.cpp
@@ -31,8 +31,6 @@
 #include "gradient_texture.h"
 
 #include "core/math/geometry_2d.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 GradientTexture1D::GradientTexture1D() {
@@ -56,7 +54,7 @@ void GradientTexture1D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_use_hdr", "enabled"), &GradientTexture1D::set_use_hdr);
 	ClassDB::bind_method(D_METHOD("is_using_hdr"), &GradientTexture1D::is_using_hdr);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_gradient", "get_gradient");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, "Gradient", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_gradient", "get_gradient");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,16384,suffix:px"), "set_width", "get_width");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_hdr"), "set_use_hdr", "is_using_hdr");
 }
@@ -304,9 +302,6 @@ float GradientTexture2D::_get_gradient_offset_at(int x, int y) const {
 		ofs = (pos - fill_from).length() / (fill_to - fill_from).length();
 	} else if (fill == Fill::FILL_SQUARE) {
 		ofs = MAX(Math::abs(pos.x - fill_from.x), Math::abs(pos.y - fill_from.y)) / MAX(Math::abs(fill_to.x - fill_from.x), Math::abs(fill_to.y - fill_from.y));
-	} else if (fill == Fill::FILL_CONIC) {
-		float rel_angle = (fill_to - fill_from).angle_to(pos - fill_from);
-		ofs = Math::fposmod((double)rel_angle, Math::TAU) / Math::TAU;
 	}
 	if (repeat == Repeat::REPEAT_NONE) {
 		ofs = CLAMP(ofs, 0.0, 1.0);
@@ -441,13 +436,13 @@ void GradientTexture2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_repeat", "repeat"), &GradientTexture2D::set_repeat);
 	ClassDB::bind_method(D_METHOD("get_repeat"), &GradientTexture2D::get_repeat);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, Gradient::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_gradient", "get_gradient");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "gradient", PROPERTY_HINT_RESOURCE_TYPE, "Gradient", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_gradient", "get_gradient");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "width", PROPERTY_HINT_RANGE, "1,2048,or_greater,suffix:px"), "set_width", "get_width");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,or_greater,suffix:px"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_hdr"), "set_use_hdr", "is_using_hdr");
 
 	ADD_GROUP("Fill", "fill_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "fill", PROPERTY_HINT_ENUM, "Linear,Radial,Square,Conic"), "set_fill", "get_fill");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "fill", PROPERTY_HINT_ENUM, "Linear,Radial,Square"), "set_fill", "get_fill");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_from"), "set_fill_from", "get_fill_from");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_to"), "set_fill_to", "get_fill_to");
 
@@ -457,7 +452,6 @@ void GradientTexture2D::_bind_methods() {
 	BIND_ENUM_CONSTANT(FILL_LINEAR);
 	BIND_ENUM_CONSTANT(FILL_RADIAL);
 	BIND_ENUM_CONSTANT(FILL_SQUARE);
-	BIND_ENUM_CONSTANT(FILL_CONIC);
 
 	BIND_ENUM_CONSTANT(REPEAT_NONE);
 	BIND_ENUM_CONSTANT(REPEAT);
diff --git a/engine/scene/resources/gradient_texture.h b/engine/scene/resources/gradient_texture.h
index 04877bf7..8b785fa7 100644
--- a/engine/scene/resources/gradient_texture.h
+++ b/engine/scene/resources/gradient_texture.h
@@ -78,7 +78,6 @@ public:
 		FILL_LINEAR,
 		FILL_RADIAL,
 		FILL_SQUARE,
-		FILL_CONIC,
 	};
 	enum Repeat {
 		REPEAT_NONE,
diff --git a/engine/scene/resources/image_texture.cpp b/engine/scene/resources/image_texture.cpp
index fed1bba0..b3552ed4 100644
--- a/engine/scene/resources/image_texture.cpp
+++ b/engine/scene/resources/image_texture.cpp
@@ -31,8 +31,6 @@
 #include "image_texture.h"
 
 #include "core/io/image_loader.h"
-#include "core/io/resource_loader.h"
-#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/placeholder_textures.h"
 #include "servers/rendering/rendering_server.h"
@@ -162,20 +160,6 @@ void ImageTexture::draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, cons
 	RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas_item, p_rect, texture, p_src_rect, p_modulate, p_transpose, p_clip_uv);
 }
 
-void ImageTexture::draw_msdf_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, int p_outline_size, float p_px_range, float p_scale) const {
-	if ((w | h) == 0) {
-		return;
-	}
-	RenderingServer::get_singleton()->canvas_item_add_msdf_texture_rect_region(p_canvas_item, p_rect, texture, p_src_rect, p_modulate, p_outline_size, p_px_range, p_scale);
-}
-
-void ImageTexture::draw_lcd_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate) const {
-	if ((w | h) == 0) {
-		return;
-	}
-	RenderingServer::get_singleton()->canvas_item_add_lcd_texture_rect_region(p_canvas_item, p_rect, texture, p_src_rect, p_modulate);
-}
-
 bool ImageTexture::is_pixel_opaque(int p_x, int p_y) const {
 	if (alpha_cache.is_null()) {
 		Ref<Image> img = get_image();
@@ -230,6 +214,7 @@ void ImageTexture::set_path(const String &p_path, bool p_take_over) {
 
 void ImageTexture::_bind_methods() {
 	ClassDB::bind_static_method("ImageTexture", D_METHOD("create_from_image", "image"), &ImageTexture::create_from_image);
+	ClassDB::bind_method(D_METHOD("get_format"), &ImageTexture::get_format);
 
 	ClassDB::bind_method(D_METHOD("set_image", "image"), &ImageTexture::set_image);
 	ClassDB::bind_method(D_METHOD("update", "image"), &ImageTexture::update);
@@ -237,7 +222,7 @@ void ImageTexture::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_set_image", "image"), &ImageTexture::set_image);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, Image::get_class_static(), PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT), "_set_image", "get_image");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Image", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL | PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT), "_set_image", "get_image");
 }
 
 ImageTexture::~ImageTexture() {
@@ -322,11 +307,11 @@ Error ImageTextureLayered::create_from_images(Vector<Ref<Image>> p_images) {
 	}
 
 	if (texture.is_valid()) {
-		RID new_texture = RS::get_singleton()->texture_2d_layered_create(p_images, RSE::TextureLayeredType(layered_type));
+		RID new_texture = RS::get_singleton()->texture_2d_layered_create(p_images, RS::TextureLayeredType(layered_type));
 		ERR_FAIL_COND_V(!new_texture.is_valid(), ERR_CANT_CREATE);
 		RS::get_singleton()->texture_replace(texture, new_texture);
 	} else {
-		texture = RS::get_singleton()->texture_2d_layered_create(p_images, RSE::TextureLayeredType(layered_type));
+		texture = RS::get_singleton()->texture_2d_layered_create(p_images, RS::TextureLayeredType(layered_type));
 		ERR_FAIL_COND_V(!texture.is_valid(), ERR_CANT_CREATE);
 	}
 
@@ -355,7 +340,7 @@ Ref<Image> ImageTextureLayered::get_layer_data(int p_layer) const {
 
 RID ImageTextureLayered::get_rid() const {
 	if (texture.is_null()) {
-		texture = RS::get_singleton()->texture_2d_layered_placeholder_create(RSE::TextureLayeredType(layered_type));
+		texture = RS::get_singleton()->texture_2d_layered_placeholder_create(RS::TextureLayeredType(layered_type));
 	}
 	return texture;
 }
diff --git a/engine/scene/resources/image_texture.h b/engine/scene/resources/image_texture.h
index 311f7182..863ec364 100644
--- a/engine/scene/resources/image_texture.h
+++ b/engine/scene/resources/image_texture.h
@@ -55,7 +55,7 @@ public:
 	void set_image(const Ref<Image> &p_image);
 	static Ref<ImageTexture> create_from_image(const Ref<Image> &p_image);
 
-	virtual Image::Format get_format() const override;
+	Image::Format get_format() const;
 
 	void update(const Ref<Image> &p_image);
 	Ref<Image> get_image() const override;
@@ -70,9 +70,6 @@ public:
 	virtual void draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false) const override;
 	virtual void draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = true) const override;
 
-	void draw_msdf_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, float p_px_range = 1.0, float p_scale = 1.0) const;
-	void draw_lcd_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1)) const;
-
 	bool is_pixel_opaque(int p_x, int p_y) const override;
 
 	void set_size_override(const Size2i &p_size);
diff --git a/engine/scene/resources/immediate_mesh.cpp b/engine/scene/resources/immediate_mesh.cpp
index 3c7741bb..b6ef0d56 100644
--- a/engine/scene/resources/immediate_mesh.cpp
+++ b/engine/scene/resources/immediate_mesh.cpp
@@ -30,9 +30,6 @@
 
 #include "immediate_mesh.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void ImmediateMesh::surface_begin(PrimitiveType p_primitive, const Ref<Material> &p_material) {
 	ERR_FAIL_COND_MSG(surface_active, "Already creating a new surface.");
 	active_surface_data.primitive = p_primitive;
@@ -278,9 +275,9 @@ void ImmediateMesh::surface_end() {
 		}
 	}
 
-	RenderingServerTypes::SurfaceData sd;
+	RS::SurfaceData sd;
 
-	sd.primitive = RSE::PrimitiveType(active_surface_data.primitive);
+	sd.primitive = RS::PrimitiveType(active_surface_data.primitive);
 	sd.format = format;
 	sd.vertex_data = surface_vertex_create_cache;
 	if (uses_colors || uses_uvs || uses_uv2s) {
@@ -314,8 +311,6 @@ void ImmediateMesh::surface_end() {
 	uses_uvs = false;
 	uses_uv2s = false;
 
-	active_surface_data.vertex_2d = false;
-
 	surface_active = false;
 
 	emit_changed();
diff --git a/engine/scene/resources/label_settings.cpp b/engine/scene/resources/label_settings.cpp
index 78500f1c..82f39e72 100644
--- a/engine/scene/resources/label_settings.cpp
+++ b/engine/scene/resources/label_settings.cpp
@@ -30,9 +30,6 @@
 
 #include "label_settings.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
 void LabelSettings::_font_changed() {
 	emit_changed();
 }
@@ -96,7 +93,7 @@ void LabelSettings::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "paragraph_spacing", PROPERTY_HINT_NONE, "suffix:px"), "set_paragraph_spacing", "get_paragraph_spacing");
 
 	ADD_GROUP("Font", "font_");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static()), "set_font", "get_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_font", "get_font");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "font_size", PROPERTY_HINT_RANGE, "1,1024,1,or_greater,suffix:px"), "set_font_size", "get_font_size");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "font_color"), "set_font_color", "get_font_color");
 
@@ -119,7 +116,7 @@ void LabelSettings::_bind_methods() {
 	stacked_outline_base_property_helper.set_array_length_getter(&LabelSettings::get_stacked_outline_count);
 	stacked_outline_base_property_helper.register_property(PropertyInfo(Variant::INT, "size", PROPERTY_HINT_NONE, "0,127,1,or_greater,suffix:px"), stacked_outline_defaults.size, &LabelSettings::set_stacked_outline_size, &LabelSettings::get_stacked_outline_size);
 	stacked_outline_base_property_helper.register_property(PropertyInfo(Variant::COLOR, "color"), stacked_outline_defaults.color, &LabelSettings::set_stacked_outline_color, &LabelSettings::get_stacked_outline_color);
-	PropertyListHelper::register_base_helper(get_class_static(), &stacked_outline_base_property_helper);
+	PropertyListHelper::register_base_helper(&stacked_outline_base_property_helper);
 
 	constexpr StackedShadowData stacked_shadow_defaults;
 
@@ -128,7 +125,7 @@ void LabelSettings::_bind_methods() {
 	stacked_shadow_base_property_helper.register_property(PropertyInfo(Variant::VECTOR2, "offset", PROPERTY_HINT_NONE, "suffix:px"), stacked_shadow_defaults.offset, &LabelSettings::set_stacked_shadow_offset, &LabelSettings::get_stacked_shadow_offset);
 	stacked_shadow_base_property_helper.register_property(PropertyInfo(Variant::COLOR, "color"), stacked_shadow_defaults.color, &LabelSettings::set_stacked_shadow_color, &LabelSettings::get_stacked_shadow_color);
 	stacked_shadow_base_property_helper.register_property(PropertyInfo(Variant::INT, "outline_size", PROPERTY_HINT_NONE, "0,127,1,or_greater,suffix:px"), stacked_shadow_defaults.outline_size, &LabelSettings::set_stacked_shadow_outline_size, &LabelSettings::get_stacked_shadow_outline_size);
-	PropertyListHelper::register_base_helper(get_class_static(), &stacked_shadow_base_property_helper);
+	PropertyListHelper::register_base_helper(&stacked_shadow_base_property_helper);
 }
 
 void LabelSettings::set_line_spacing(real_t p_spacing) {
diff --git a/engine/scene/resources/label_settings.h b/engine/scene/resources/label_settings.h
index 8e1b4285..82b8966d 100644
--- a/engine/scene/resources/label_settings.h
+++ b/engine/scene/resources/label_settings.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "font.h"
 #include "scene/property_list_helper.h"
-#include "scene/resources/font.h"
 
 /*************************************************************************/
 
diff --git a/engine/scene/resources/material.cpp b/engine/scene/resources/material.cpp
index 3b341b9e..42f09aa3 100644
--- a/engine/scene/resources/material.cpp
+++ b/engine/scene/resources/material.cpp
@@ -33,14 +33,8 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
-#include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/version.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/texture.h"
-#include "servers/rendering/rendering_server.h"
 
 void Material::set_next_pass(const Ref<Material> &p_pass) {
 	for (Ref<Material> pass_child = p_pass; pass_child.is_valid(); pass_child = pass_child->get_next_pass()) {
@@ -89,7 +83,8 @@ RID Material::get_rid() const {
 void Material::_validate_property(PropertyInfo &p_property) const {
 	if (!_can_do_next_pass() && p_property.name == "next_pass") {
 		p_property.usage = PROPERTY_USAGE_NONE;
-	} else if (!_can_use_render_priority() && p_property.name == "render_priority") {
+	}
+	if (!_can_use_render_priority() && p_property.name == "render_priority") {
 		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 }
@@ -170,7 +165,7 @@ void Material::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_placeholder"), &Material::create_placeholder);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RENDER_PRIORITY_MIN) + "," + itos(RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next_pass", PROPERTY_HINT_RESOURCE_TYPE, Material::get_class_static()), "set_next_pass", "get_next_pass");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next_pass", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "set_next_pass", "get_next_pass");
 
 	BIND_CONSTANT(RENDER_PRIORITY_MAX);
 	BIND_CONSTANT(RENDER_PRIORITY_MIN);
@@ -374,7 +369,6 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 				Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), pi.name);
 				param_cache.insert(pi.name, default_value);
 				remap_cache.insert(info.name, pi.name);
-				RS::get_singleton()->material_set_param(_get_material(), pi.name, default_value);
 			}
 			groups[last_group][last_subgroup].push_back(info);
 		}
@@ -529,7 +523,7 @@ void ShaderMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_shader_parameter", "param", "value"), &ShaderMaterial::set_shader_parameter);
 	ClassDB::bind_method(D_METHOD("get_shader_parameter", "param"), &ShaderMaterial::get_shader_parameter);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, Shader::get_class_static()), "set_shader", "get_shader");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader"), "set_shader", "get_shader");
 }
 
 #ifdef TOOLS_ENABLED
@@ -3616,22 +3610,22 @@ void BaseMaterial3D::_bind_methods() {
 
 	ADD_GROUP("Albedo", "albedo_");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "albedo_color"), "set_albedo", "get_albedo");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "albedo_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_ALBEDO);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "albedo_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_ALBEDO);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "albedo_texture_force_srgb"), "set_flag", "get_flag", FLAG_ALBEDO_TEXTURE_FORCE_SRGB);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "albedo_texture_msdf"), "set_flag", "get_flag", FLAG_ALBEDO_TEXTURE_MSDF);
 
 	ADD_GROUP("ORM", "orm_");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orm_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_ORM);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orm_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_ORM);
 
 	ADD_GROUP("Metallic", "metallic_");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "metallic", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_metallic", "get_metallic");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "metallic_specular", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_specular", "get_specular");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "metallic_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_METALLIC);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "metallic_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_METALLIC);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "metallic_texture_channel", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Gray"), "set_metallic_texture_channel", "get_metallic_texture_channel");
 
 	ADD_GROUP("Roughness", "roughness_");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "roughness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_roughness", "get_roughness");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "roughness_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_ROUGHNESS);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "roughness_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_ROUGHNESS);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "roughness_texture_channel", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Gray"), "set_roughness_texture_channel", "get_roughness_texture_channel");
 
 	ADD_GROUP("Emission", "emission_");
@@ -3642,38 +3636,38 @@ void BaseMaterial3D::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "emission_operator", PROPERTY_HINT_ENUM, "Add,Multiply"), "set_emission_operator", "get_emission_operator");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "emission_on_uv2"), "set_flag", "get_flag", FLAG_EMISSION_ON_UV2);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "emission_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_EMISSION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "emission_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_EMISSION);
 
 	ADD_GROUP("Normal Map", "normal_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "normal_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_NORMAL_MAPPING);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "normal_scale", PROPERTY_HINT_RANGE, "-16,16,0.01"), "set_normal_scale", "get_normal_scale");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "normal_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_NORMAL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "normal_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_NORMAL);
 
 	ADD_GROUP("Bent Normal Map", "bent_normal_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "bent_normal_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_BENT_NORMAL_MAPPING);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "bent_normal_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_BENT_NORMAL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "bent_normal_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_BENT_NORMAL);
 
 	ADD_GROUP("Rim", "rim_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "rim_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_RIM);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "rim", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_rim", "get_rim");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "rim_tint", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_rim_tint", "get_rim_tint");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "rim_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_RIM);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "rim_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_RIM);
 
 	ADD_GROUP("Clearcoat", "clearcoat_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "clearcoat_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_CLEARCOAT);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "clearcoat", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_clearcoat", "get_clearcoat");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "clearcoat_roughness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_clearcoat_roughness", "get_clearcoat_roughness");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "clearcoat_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_CLEARCOAT);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "clearcoat_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_CLEARCOAT);
 
 	ADD_GROUP("Anisotropy", "anisotropy_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "anisotropy_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_ANISOTROPY);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "anisotropy", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_anisotropy", "get_anisotropy");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anisotropy_flowmap", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_FLOWMAP);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anisotropy_flowmap", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_FLOWMAP);
 
 	ADD_GROUP("Ambient Occlusion", "ao_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "ao_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_AMBIENT_OCCLUSION);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "ao_light_affect", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_ao_light_affect", "get_ao_light_affect");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "ao_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_AMBIENT_OCCLUSION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "ao_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_AMBIENT_OCCLUSION);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "ao_on_uv2"), "set_flag", "get_flag", FLAG_AO_ON_UV2);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "ao_texture_channel", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Gray"), "set_ao_texture_channel", "get_ao_texture_channel");
 
@@ -3685,40 +3679,40 @@ void BaseMaterial3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "heightmap_max_layers", PROPERTY_HINT_RANGE, "1,64,1"), "set_heightmap_deep_parallax_max_layers", "get_heightmap_deep_parallax_max_layers");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "heightmap_flip_tangent"), "set_heightmap_deep_parallax_flip_tangent", "get_heightmap_deep_parallax_flip_tangent");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "heightmap_flip_binormal"), "set_heightmap_deep_parallax_flip_binormal", "get_heightmap_deep_parallax_flip_binormal");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "heightmap_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_HEIGHTMAP);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "heightmap_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_HEIGHTMAP);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "heightmap_flip_texture"), "set_flag", "get_flag", FLAG_INVERT_HEIGHTMAP);
 
 	ADD_GROUP("Subsurf Scatter", "subsurf_scatter_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "subsurf_scatter_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_SUBSURFACE_SCATTERING);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "subsurf_scatter_strength", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_subsurface_scattering_strength", "get_subsurface_scattering_strength");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "subsurf_scatter_skin_mode"), "set_flag", "get_flag", FLAG_SUBSURFACE_MODE_SKIN);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "subsurf_scatter_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_SUBSURFACE_SCATTERING);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "subsurf_scatter_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_SUBSURFACE_SCATTERING);
 
 	ADD_SUBGROUP("Transmittance", "subsurf_scatter_transmittance_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "subsurf_scatter_transmittance_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_SUBSURFACE_TRANSMITTANCE);
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "subsurf_scatter_transmittance_color"), "set_transmittance_color", "get_transmittance_color");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "subsurf_scatter_transmittance_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_SUBSURFACE_TRANSMITTANCE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "subsurf_scatter_transmittance_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_SUBSURFACE_TRANSMITTANCE);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "subsurf_scatter_transmittance_depth", PROPERTY_HINT_RANGE, "0.001,8,0.001,or_greater"), "set_transmittance_depth", "get_transmittance_depth");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "subsurf_scatter_transmittance_boost", PROPERTY_HINT_RANGE, "0.00,1.0,0.01"), "set_transmittance_boost", "get_transmittance_boost");
 
 	ADD_GROUP("Back Lighting", "backlight_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "backlight_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_BACKLIGHT);
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "backlight", PROPERTY_HINT_COLOR_NO_ALPHA), "set_backlight", "get_backlight");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "backlight_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_BACKLIGHT);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "backlight_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_BACKLIGHT);
 
 	ADD_GROUP("Refraction", "refraction_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "refraction_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_REFRACTION);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "refraction_scale", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_refraction", "get_refraction");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "refraction_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_REFRACTION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "refraction_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_REFRACTION);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "refraction_texture_channel", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Gray"), "set_refraction_texture_channel", "get_refraction_texture_channel");
 
 	ADD_GROUP("Detail", "detail_");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "detail_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_feature", "get_feature", FEATURE_DETAIL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_mask", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_DETAIL_MASK);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_mask", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_DETAIL_MASK);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "detail_blend_mode", PROPERTY_HINT_ENUM, "Mix,Add,Subtract,Multiply"), "set_detail_blend_mode", "get_detail_blend_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "detail_uv_layer", PROPERTY_HINT_ENUM, "UV1,UV2"), "set_detail_uv", "get_detail_uv");
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_albedo", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_DETAIL_ALBEDO);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_normal", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture", TEXTURE_DETAIL_NORMAL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_albedo", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_DETAIL_ALBEDO);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "detail_normal", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture", TEXTURE_DETAIL_NORMAL);
 
 	ADD_GROUP("UV1", "uv1_");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "uv1_scale", PROPERTY_HINT_LINK), "set_uv1_scale", "get_uv1_scale");
@@ -3752,7 +3746,7 @@ void BaseMaterial3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "particles_anim_loop"), "set_particles_anim_loop", "get_particles_anim_loop");
 
 	ADD_GROUP("Grow", "grow_");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "grow", PROPERTY_HINT_GROUP_ENABLE), "set_grow_enabled", "is_grow_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "grow"), "set_grow_enabled", "is_grow_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "grow_amount", PROPERTY_HINT_RANGE, "-16,16,0.001,suffix:m"), "set_grow", "get_grow");
 
 	ADD_GROUP("Transform", "");
@@ -3764,9 +3758,8 @@ void BaseMaterial3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "z_clip_scale", PROPERTY_HINT_RANGE, "0.01,1.0,0.01"), "set_z_clip_scale", "get_z_clip_scale");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "use_fov_override"), "set_flag", "get_flag", FLAG_USE_FOV_OVERRIDE);
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fov_override", PROPERTY_HINT_RANGE, "1,179,0.1,degrees"), "set_fov_override", "get_fov_override");
-
 	ADD_GROUP("Proximity Fade", "proximity_fade_");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "proximity_fade_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_proximity_fade_enabled", "is_proximity_fade_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "proximity_fade_enabled"), "set_proximity_fade_enabled", "is_proximity_fade_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "proximity_fade_distance", PROPERTY_HINT_RANGE, "0.01,4096,0.01,suffix:m"), "set_proximity_fade_distance", "get_proximity_fade_distance");
 
 	ADD_GROUP("MSDF", "msdf_");
diff --git a/engine/scene/resources/material.h b/engine/scene/resources/material.h
index 2397824f..00ef28a6 100644
--- a/engine/scene/resources/material.h
+++ b/engine/scene/resources/material.h
@@ -33,7 +33,8 @@
 #include "core/io/resource.h"
 #include "core/templates/self_list.h"
 #include "scene/resources/shader.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "scene/resources/texture.h"
+#include "servers/rendering/rendering_server.h"
 
 class Material : public Resource {
 	GDCLASS(Material, Resource);
@@ -70,8 +71,8 @@ protected:
 	GDVIRTUAL0RC(bool, _can_use_render_priority)
 public:
 	enum {
-		RENDER_PRIORITY_MAX = RSE::MATERIAL_RENDER_PRIORITY_MAX,
-		RENDER_PRIORITY_MIN = RSE::MATERIAL_RENDER_PRIORITY_MIN,
+		RENDER_PRIORITY_MAX = RS::MATERIAL_RENDER_PRIORITY_MAX,
+		RENDER_PRIORITY_MIN = RS::MATERIAL_RENDER_PRIORITY_MIN,
 	};
 
 	bool _is_initialized() { return init_state == INIT_STATE_READY; }
@@ -357,27 +358,27 @@ public:
 private:
 	struct MaterialKey {
 		// enum values
-		uint64_t texture_filter : Math::get_num_bits(TEXTURE_FILTER_MAX - 1);
-		uint64_t detail_uv : Math::get_num_bits(DETAIL_UV_MAX - 1);
-		uint64_t transparency : Math::get_num_bits(TRANSPARENCY_MAX - 1);
-		uint64_t alpha_antialiasing_mode : Math::get_num_bits(ALPHA_ANTIALIASING_MAX - 1);
-		uint64_t shading_mode : Math::get_num_bits(SHADING_MODE_MAX - 1);
-		uint64_t blend_mode : Math::get_num_bits(BLEND_MODE_MAX - 1);
-		uint64_t depth_draw_mode : Math::get_num_bits(DEPTH_DRAW_MAX - 1);
-		uint64_t depth_test : Math::get_num_bits(DEPTH_TEST_MAX - 1);
-		uint64_t cull_mode : Math::get_num_bits(CULL_MAX - 1);
-		uint64_t diffuse_mode : Math::get_num_bits(DIFFUSE_MAX - 1);
-		uint64_t specular_mode : Math::get_num_bits(SPECULAR_MAX - 1);
-		uint64_t billboard_mode : Math::get_num_bits(BILLBOARD_MAX - 1);
-		uint64_t detail_blend_mode : Math::get_num_bits(BLEND_MODE_MAX - 1);
-		uint64_t roughness_channel : Math::get_num_bits(TEXTURE_CHANNEL_MAX - 1);
-		uint64_t emission_op : Math::get_num_bits(EMISSION_OP_MAX - 1);
-		uint64_t distance_fade : Math::get_num_bits(DISTANCE_FADE_MAX - 1);
+		uint64_t texture_filter : get_num_bits(TEXTURE_FILTER_MAX - 1);
+		uint64_t detail_uv : get_num_bits(DETAIL_UV_MAX - 1);
+		uint64_t transparency : get_num_bits(TRANSPARENCY_MAX - 1);
+		uint64_t alpha_antialiasing_mode : get_num_bits(ALPHA_ANTIALIASING_MAX - 1);
+		uint64_t shading_mode : get_num_bits(SHADING_MODE_MAX - 1);
+		uint64_t blend_mode : get_num_bits(BLEND_MODE_MAX - 1);
+		uint64_t depth_draw_mode : get_num_bits(DEPTH_DRAW_MAX - 1);
+		uint64_t depth_test : get_num_bits(DEPTH_TEST_MAX - 1);
+		uint64_t cull_mode : get_num_bits(CULL_MAX - 1);
+		uint64_t diffuse_mode : get_num_bits(DIFFUSE_MAX - 1);
+		uint64_t specular_mode : get_num_bits(SPECULAR_MAX - 1);
+		uint64_t billboard_mode : get_num_bits(BILLBOARD_MAX - 1);
+		uint64_t detail_blend_mode : get_num_bits(BLEND_MODE_MAX - 1);
+		uint64_t roughness_channel : get_num_bits(TEXTURE_CHANNEL_MAX - 1);
+		uint64_t emission_op : get_num_bits(EMISSION_OP_MAX - 1);
+		uint64_t distance_fade : get_num_bits(DISTANCE_FADE_MAX - 1);
 
 		// stencil
-		uint64_t stencil_mode : Math::get_num_bits(STENCIL_MODE_MAX - 1);
+		uint64_t stencil_mode : get_num_bits(STENCIL_MODE_MAX - 1);
 		uint64_t stencil_flags : STENCIL_FLAG_NUM_BITS;
-		uint64_t stencil_compare : Math::get_num_bits(STENCIL_COMPARE_MAX - 1);
+		uint64_t stencil_compare : get_num_bits(STENCIL_COMPARE_MAX - 1);
 		uint64_t stencil_reference : 8;
 
 		// booleans
diff --git a/engine/scene/resources/mesh.cpp b/engine/scene/resources/mesh.cpp
index 383c28fc..9c3ba7df 100644
--- a/engine/scene/resources/mesh.cpp
+++ b/engine/scene/resources/mesh.cpp
@@ -31,10 +31,8 @@
 #include "mesh.h"
 
 #include "core/math/convex_hull.h"
-#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
@@ -1041,7 +1039,7 @@ void _fix_array_compatibility(const Vector<uint8_t> &p_src, uint64_t p_old_forma
 	uint32_t dst_attribute_stride;
 	uint32_t dst_skin_stride;
 	uint32_t dst_offsets[Mesh::ARRAY_MAX];
-	RenderingServer::get_singleton()->mesh_surface_make_offsets_from_format(p_new_format & (~RSE::ARRAY_FORMAT_INDEX), p_elements, 0, dst_offsets, dst_vertex_stride, dst_normal_tangent_stride, dst_attribute_stride, dst_skin_stride);
+	RenderingServer::get_singleton()->mesh_surface_make_offsets_from_format(p_new_format & (~RS::ARRAY_FORMAT_INDEX), p_elements, 0, dst_offsets, dst_vertex_stride, dst_normal_tangent_stride, dst_attribute_stride, dst_skin_stride);
 
 	vertex_data.resize((dst_vertex_stride + dst_normal_tangent_stride) * p_elements);
 	attribute_data.resize(dst_attribute_stride * p_elements);
@@ -1516,7 +1514,7 @@ Array ArrayMesh::_get_surfaces() const {
 
 	Array ret;
 	for (int i = 0; i < surfaces.size(); i++) {
-		RenderingServerTypes::SurfaceData surface = RS::get_singleton()->mesh_get_surface(mesh, i);
+		RenderingServer::SurfaceData surface = RS::get_singleton()->mesh_get_surface(mesh, i);
 		Dictionary data;
 		data["format"] = surface.format;
 		data["primitive"] = surface.primitive;
@@ -1578,20 +1576,20 @@ Array ArrayMesh::_get_surfaces() const {
 void ArrayMesh::_create_if_empty() const {
 	if (!mesh.is_valid()) {
 		mesh = RS::get_singleton()->mesh_create();
-		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RSE::BlendShapeMode)blend_shape_mode);
+		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RS::BlendShapeMode)blend_shape_mode);
 		RS::get_singleton()->mesh_set_blend_shape_count(mesh, blend_shapes.size());
 		RS::get_singleton()->mesh_set_path(mesh, get_path());
 	}
 }
 
 void ArrayMesh::_set_surfaces(const Array &p_surfaces) {
-	Vector<RenderingServerTypes::SurfaceData> surface_data;
+	Vector<RS::SurfaceData> surface_data;
 	Vector<Ref<Material>> surface_materials;
 	Vector<String> surface_names;
 	Vector<bool> surface_2d;
 
 	for (int i = 0; i < p_surfaces.size(); i++) {
-		RenderingServerTypes::SurfaceData surface;
+		RS::SurfaceData surface;
 		Dictionary d = p_surfaces[i];
 		ERR_FAIL_COND(!d.has("format"));
 		ERR_FAIL_COND(!d.has("primitive"));
@@ -1599,7 +1597,7 @@ void ArrayMesh::_set_surfaces(const Array &p_surfaces) {
 		ERR_FAIL_COND(!d.has("vertex_count"));
 		ERR_FAIL_COND(!d.has("aabb"));
 		surface.format = d["format"];
-		surface.primitive = RSE::PrimitiveType(int(d["primitive"]));
+		surface.primitive = RS::PrimitiveType(int(d["primitive"]));
 		surface.vertex_data = d["vertex_data"];
 		surface.vertex_count = d["vertex_count"];
 		if (d.has("attribute_data")) {
@@ -1624,7 +1622,7 @@ void ArrayMesh::_set_surfaces(const Array &p_surfaces) {
 			Array lods = d["lods"];
 			ERR_FAIL_COND(lods.size() & 1); //must be even
 			for (int j = 0; j < lods.size(); j += 2) {
-				RenderingServerTypes::SurfaceData::LOD lod;
+				RS::SurfaceData::LOD lod;
 				lod.edge_length = lods[j + 0];
 				lod.index_data = lods[j + 1];
 				surface.lods.push_back(lod);
@@ -1664,11 +1662,11 @@ void ArrayMesh::_set_surfaces(const Array &p_surfaces) {
 		uint64_t surface_version = surface.format & (ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
 		if (surface_version != ARRAY_FLAG_FORMAT_CURRENT_VERSION) {
 			RS::get_singleton()->fix_surface_compatibility(surface, get_path());
-			surface_version = surface.format & (RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-			ERR_FAIL_COND_MSG(surface_version != RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
+			surface_version = surface.format & (RS::ARRAY_FLAG_FORMAT_VERSION_MASK << RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+			ERR_FAIL_COND_MSG(surface_version != RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
 					vformat("Surface version provided (%d) does not match current version (%d).",
-							(surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK,
-							(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK));
+							(surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK,
+							(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK));
 		}
 #endif
 
@@ -1688,7 +1686,7 @@ void ArrayMesh::_set_surfaces(const Array &p_surfaces) {
 		// if mesh does not exist (first time this is loaded, most likely),
 		// we can create it with a single call, which is a lot more efficient and thread friendly
 		mesh = RS::get_singleton()->mesh_create_from_surfaces(surface_data, blend_shapes.size());
-		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RSE::BlendShapeMode)blend_shape_mode);
+		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RS::BlendShapeMode)blend_shape_mode);
 		RS::get_singleton()->mesh_set_path(mesh, get_path());
 	}
 
@@ -1780,8 +1778,8 @@ void ArrayMesh::_recompute_aabb() {
 }
 
 // TODO: Need to add binding to add_surface using future MeshSurfaceData object.
-void ArrayMesh::add_surface(BitField<ArrayFormat> p_format, PrimitiveType p_primitive, const Vector<uint8_t> &p_array, const Vector<uint8_t> &p_attribute_array, const Vector<uint8_t> &p_skin_array, int p_vertex_count, const Vector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<uint8_t> &p_blend_shape_data, const Vector<AABB> &p_bone_aabbs, const Vector<RenderingServerTypes::SurfaceData::LOD> &p_lods, const Vector4 p_uv_scale) {
-	ERR_FAIL_COND(surfaces.size() == RSE::MAX_MESH_SURFACES);
+void ArrayMesh::add_surface(BitField<ArrayFormat> p_format, PrimitiveType p_primitive, const Vector<uint8_t> &p_array, const Vector<uint8_t> &p_attribute_array, const Vector<uint8_t> &p_skin_array, int p_vertex_count, const Vector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<uint8_t> &p_blend_shape_data, const Vector<AABB> &p_bone_aabbs, const Vector<RS::SurfaceData::LOD> &p_lods, const Vector4 p_uv_scale) {
+	ERR_FAIL_COND(surfaces.size() == RS::MAX_MESH_SURFACES);
 	_create_if_empty();
 
 	Surface s;
@@ -1795,9 +1793,9 @@ void ArrayMesh::add_surface(BitField<ArrayFormat> p_format, PrimitiveType p_prim
 	surfaces.push_back(s);
 	_recompute_aabb();
 
-	RenderingServerTypes::SurfaceData sd;
+	RS::SurfaceData sd;
 	sd.format = p_format;
-	sd.primitive = RSE::PrimitiveType(p_primitive);
+	sd.primitive = RS::PrimitiveType(p_primitive);
 	sd.aabb = p_aabb;
 	sd.vertex_count = p_vertex_count;
 	sd.vertex_data = p_array;
@@ -1821,9 +1819,9 @@ void ArrayMesh::add_surface_from_arrays(PrimitiveType p_primitive, const Array &
 	ERR_FAIL_COND(p_blend_shapes.size() != blend_shapes.size());
 	ERR_FAIL_COND(p_arrays.size() != ARRAY_MAX);
 
-	RenderingServerTypes::SurfaceData surface;
+	RS::SurfaceData surface;
 
-	Error err = RS::get_singleton()->mesh_create_surface_data_from_arrays(&surface, (RSE::PrimitiveType)p_primitive, p_arrays, p_blend_shapes, p_lods, p_flags);
+	Error err = RS::get_singleton()->mesh_create_surface_data_from_arrays(&surface, (RenderingServer::PrimitiveType)p_primitive, p_arrays, p_blend_shapes, p_lods, p_flags);
 	ERR_FAIL_COND(err != OK);
 
 	/* Debug code.
@@ -1916,7 +1914,7 @@ void ArrayMesh::clear_blend_shapes() {
 void ArrayMesh::set_blend_shape_mode(BlendShapeMode p_mode) {
 	blend_shape_mode = p_mode;
 	if (mesh.is_valid()) {
-		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RSE::BlendShapeMode)p_mode);
+		RS::get_singleton()->mesh_set_blend_shape_mode(mesh, (RS::BlendShapeMode)p_mode);
 	}
 }
 
@@ -2341,7 +2339,7 @@ void ArrayMesh::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "_surfaces", PROPERTY_HINT_NO_NODEPATH, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_surfaces", "_get_surfaces");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "blend_shape_mode", PROPERTY_HINT_ENUM, "Normalized,Relative"), "set_blend_shape_mode", "get_blend_shape_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::AABB, "custom_aabb", PROPERTY_HINT_NO_NODEPATH, "suffix:m"), "set_custom_aabb", "get_custom_aabb");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shadow_mesh", PROPERTY_HINT_RESOURCE_TYPE, ArrayMesh::get_class_static()), "set_shadow_mesh", "get_shadow_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shadow_mesh", PROPERTY_HINT_RESOURCE_TYPE, "ArrayMesh"), "set_shadow_mesh", "get_shadow_mesh");
 }
 
 void ArrayMesh::reload_from_file() {
diff --git a/engine/scene/resources/mesh.h b/engine/scene/resources/mesh.h
index 4c28e5cf..23818244 100644
--- a/engine/scene/resources/mesh.h
+++ b/engine/scene/resources/mesh.h
@@ -33,10 +33,8 @@
 #include "core/io/resource.h"
 #include "core/math/face3.h"
 #include "core/math/triangle_mesh.h"
-#include "core/variant/typed_array.h"
 #include "scene/resources/material.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_server.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "scene/resources/3d/shape_3d.h"
@@ -59,12 +57,12 @@ class Mesh : public Resource {
 
 public:
 	enum PrimitiveType {
-		PRIMITIVE_POINTS = RSE::PRIMITIVE_POINTS,
-		PRIMITIVE_LINES = RSE::PRIMITIVE_LINES,
-		PRIMITIVE_LINE_STRIP = RSE::PRIMITIVE_LINE_STRIP,
-		PRIMITIVE_TRIANGLES = RSE::PRIMITIVE_TRIANGLES,
-		PRIMITIVE_TRIANGLE_STRIP = RSE::PRIMITIVE_TRIANGLE_STRIP,
-		PRIMITIVE_MAX = RSE::PRIMITIVE_MAX,
+		PRIMITIVE_POINTS = RenderingServer::PRIMITIVE_POINTS,
+		PRIMITIVE_LINES = RenderingServer::PRIMITIVE_LINES,
+		PRIMITIVE_LINE_STRIP = RenderingServer::PRIMITIVE_LINE_STRIP,
+		PRIMITIVE_TRIANGLES = RenderingServer::PRIMITIVE_TRIANGLES,
+		PRIMITIVE_TRIANGLE_STRIP = RenderingServer::PRIMITIVE_TRIANGLE_STRIP,
+		PRIMITIVE_MAX = RenderingServer::PRIMITIVE_MAX,
 	};
 
 protected:
@@ -87,85 +85,83 @@ protected:
 
 public:
 	enum {
-		NO_INDEX_ARRAY = RSE::NO_INDEX_ARRAY,
-		ARRAY_WEIGHTS_SIZE = RSE::ARRAY_WEIGHTS_SIZE
+		NO_INDEX_ARRAY = RenderingServer::NO_INDEX_ARRAY,
+		ARRAY_WEIGHTS_SIZE = RenderingServer::ARRAY_WEIGHTS_SIZE
 	};
-
 	enum BlendShapeMode {
-		BLEND_SHAPE_MODE_NORMALIZED = RSE::BLEND_SHAPE_MODE_NORMALIZED,
-		BLEND_SHAPE_MODE_RELATIVE = RSE::BLEND_SHAPE_MODE_RELATIVE,
+		BLEND_SHAPE_MODE_NORMALIZED = RS::BLEND_SHAPE_MODE_NORMALIZED,
+		BLEND_SHAPE_MODE_RELATIVE = RS::BLEND_SHAPE_MODE_RELATIVE,
 	};
-
 	enum ArrayType {
-		ARRAY_VERTEX = RSE::ARRAY_VERTEX,
-		ARRAY_NORMAL = RSE::ARRAY_NORMAL,
-		ARRAY_TANGENT = RSE::ARRAY_TANGENT,
-		ARRAY_COLOR = RSE::ARRAY_COLOR,
-		ARRAY_TEX_UV = RSE::ARRAY_TEX_UV,
-		ARRAY_TEX_UV2 = RSE::ARRAY_TEX_UV2,
-		ARRAY_CUSTOM0 = RSE::ARRAY_CUSTOM0,
-		ARRAY_CUSTOM1 = RSE::ARRAY_CUSTOM1,
-		ARRAY_CUSTOM2 = RSE::ARRAY_CUSTOM2,
-		ARRAY_CUSTOM3 = RSE::ARRAY_CUSTOM3,
-		ARRAY_BONES = RSE::ARRAY_BONES,
-		ARRAY_WEIGHTS = RSE::ARRAY_WEIGHTS,
-		ARRAY_INDEX = RSE::ARRAY_INDEX,
-		ARRAY_MAX = RSE::ARRAY_MAX
+		ARRAY_VERTEX = RenderingServer::ARRAY_VERTEX,
+		ARRAY_NORMAL = RenderingServer::ARRAY_NORMAL,
+		ARRAY_TANGENT = RenderingServer::ARRAY_TANGENT,
+		ARRAY_COLOR = RenderingServer::ARRAY_COLOR,
+		ARRAY_TEX_UV = RenderingServer::ARRAY_TEX_UV,
+		ARRAY_TEX_UV2 = RenderingServer::ARRAY_TEX_UV2,
+		ARRAY_CUSTOM0 = RenderingServer::ARRAY_CUSTOM0,
+		ARRAY_CUSTOM1 = RenderingServer::ARRAY_CUSTOM1,
+		ARRAY_CUSTOM2 = RenderingServer::ARRAY_CUSTOM2,
+		ARRAY_CUSTOM3 = RenderingServer::ARRAY_CUSTOM3,
+		ARRAY_BONES = RenderingServer::ARRAY_BONES,
+		ARRAY_WEIGHTS = RenderingServer::ARRAY_WEIGHTS,
+		ARRAY_INDEX = RenderingServer::ARRAY_INDEX,
+		ARRAY_MAX = RenderingServer::ARRAY_MAX
 
 	};
 
 	enum ArrayCustomFormat {
-		ARRAY_CUSTOM_RGBA8_UNORM = RSE::ARRAY_CUSTOM_RGBA8_UNORM,
-		ARRAY_CUSTOM_RGBA8_SNORM = RSE::ARRAY_CUSTOM_RGBA8_SNORM,
-		ARRAY_CUSTOM_RG_HALF = RSE::ARRAY_CUSTOM_RG_HALF,
-		ARRAY_CUSTOM_RGBA_HALF = RSE::ARRAY_CUSTOM_RGBA_HALF,
-		ARRAY_CUSTOM_R_FLOAT = RSE::ARRAY_CUSTOM_R_FLOAT,
-		ARRAY_CUSTOM_RG_FLOAT = RSE::ARRAY_CUSTOM_RG_FLOAT,
-		ARRAY_CUSTOM_RGB_FLOAT = RSE::ARRAY_CUSTOM_RGB_FLOAT,
-		ARRAY_CUSTOM_RGBA_FLOAT = RSE::ARRAY_CUSTOM_RGBA_FLOAT,
-		ARRAY_CUSTOM_MAX = RSE::ARRAY_CUSTOM_MAX
+		ARRAY_CUSTOM_RGBA8_UNORM,
+		ARRAY_CUSTOM_RGBA8_SNORM,
+		ARRAY_CUSTOM_RG_HALF,
+		ARRAY_CUSTOM_RGBA_HALF,
+		ARRAY_CUSTOM_R_FLOAT,
+		ARRAY_CUSTOM_RG_FLOAT,
+		ARRAY_CUSTOM_RGB_FLOAT,
+		ARRAY_CUSTOM_RGBA_FLOAT,
+		ARRAY_CUSTOM_MAX
 	};
 
 	enum ArrayFormat : uint64_t {
-		ARRAY_FORMAT_VERTEX = RSE::ARRAY_FORMAT_VERTEX,
-		ARRAY_FORMAT_NORMAL = RSE::ARRAY_FORMAT_NORMAL,
-		ARRAY_FORMAT_TANGENT = RSE::ARRAY_FORMAT_TANGENT,
-		ARRAY_FORMAT_COLOR = RSE::ARRAY_FORMAT_COLOR,
-		ARRAY_FORMAT_TEX_UV = RSE::ARRAY_FORMAT_TEX_UV,
-		ARRAY_FORMAT_TEX_UV2 = RSE::ARRAY_FORMAT_TEX_UV2,
-		ARRAY_FORMAT_CUSTOM0 = RSE::ARRAY_FORMAT_CUSTOM0,
-		ARRAY_FORMAT_CUSTOM1 = RSE::ARRAY_FORMAT_CUSTOM1,
-		ARRAY_FORMAT_CUSTOM2 = RSE::ARRAY_FORMAT_CUSTOM2,
-		ARRAY_FORMAT_CUSTOM3 = RSE::ARRAY_FORMAT_CUSTOM3,
-		ARRAY_FORMAT_BONES = RSE::ARRAY_FORMAT_BONES,
-		ARRAY_FORMAT_WEIGHTS = RSE::ARRAY_FORMAT_WEIGHTS,
-		ARRAY_FORMAT_INDEX = RSE::ARRAY_FORMAT_INDEX,
+		ARRAY_FORMAT_VERTEX = RS::ARRAY_FORMAT_VERTEX,
+		ARRAY_FORMAT_NORMAL = RS::ARRAY_FORMAT_NORMAL,
+		ARRAY_FORMAT_TANGENT = RS::ARRAY_FORMAT_TANGENT,
+		ARRAY_FORMAT_COLOR = RS::ARRAY_FORMAT_COLOR,
+		ARRAY_FORMAT_TEX_UV = RS::ARRAY_FORMAT_TEX_UV,
+		ARRAY_FORMAT_TEX_UV2 = RS::ARRAY_FORMAT_TEX_UV2,
+		ARRAY_FORMAT_CUSTOM0 = RS::ARRAY_FORMAT_CUSTOM0,
+		ARRAY_FORMAT_CUSTOM1 = RS::ARRAY_FORMAT_CUSTOM1,
+		ARRAY_FORMAT_CUSTOM2 = RS::ARRAY_FORMAT_CUSTOM2,
+		ARRAY_FORMAT_CUSTOM3 = RS::ARRAY_FORMAT_CUSTOM3,
+		ARRAY_FORMAT_BONES = RS::ARRAY_FORMAT_BONES,
+		ARRAY_FORMAT_WEIGHTS = RS::ARRAY_FORMAT_WEIGHTS,
+		ARRAY_FORMAT_INDEX = RS::ARRAY_FORMAT_INDEX,
 
-		ARRAY_FORMAT_BLEND_SHAPE_MASK = RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK,
+		ARRAY_FORMAT_BLEND_SHAPE_MASK = RS::ARRAY_FORMAT_BLEND_SHAPE_MASK,
 
-		ARRAY_FORMAT_CUSTOM_BASE = RSE::ARRAY_FORMAT_CUSTOM_BASE,
-		ARRAY_FORMAT_CUSTOM_BITS = RSE::ARRAY_FORMAT_CUSTOM_BITS,
-		ARRAY_FORMAT_CUSTOM0_SHIFT = RSE::ARRAY_FORMAT_CUSTOM0_SHIFT,
-		ARRAY_FORMAT_CUSTOM1_SHIFT = RSE::ARRAY_FORMAT_CUSTOM1_SHIFT,
-		ARRAY_FORMAT_CUSTOM2_SHIFT = RSE::ARRAY_FORMAT_CUSTOM2_SHIFT,
-		ARRAY_FORMAT_CUSTOM3_SHIFT = RSE::ARRAY_FORMAT_CUSTOM3_SHIFT,
+		ARRAY_FORMAT_CUSTOM_BASE = RS::ARRAY_FORMAT_CUSTOM_BASE,
+		ARRAY_FORMAT_CUSTOM_BITS = RS::ARRAY_FORMAT_CUSTOM_BITS,
+		ARRAY_FORMAT_CUSTOM0_SHIFT = RS::ARRAY_FORMAT_CUSTOM0_SHIFT,
+		ARRAY_FORMAT_CUSTOM1_SHIFT = RS::ARRAY_FORMAT_CUSTOM1_SHIFT,
+		ARRAY_FORMAT_CUSTOM2_SHIFT = RS::ARRAY_FORMAT_CUSTOM2_SHIFT,
+		ARRAY_FORMAT_CUSTOM3_SHIFT = RS::ARRAY_FORMAT_CUSTOM3_SHIFT,
 
-		ARRAY_FORMAT_CUSTOM_MASK = RSE::ARRAY_FORMAT_CUSTOM_MASK,
-		ARRAY_COMPRESS_FLAGS_BASE = RSE::ARRAY_COMPRESS_FLAGS_BASE,
+		ARRAY_FORMAT_CUSTOM_MASK = RS::ARRAY_FORMAT_CUSTOM_MASK,
+		ARRAY_COMPRESS_FLAGS_BASE = RS::ARRAY_COMPRESS_FLAGS_BASE,
 
-		ARRAY_FLAG_USE_2D_VERTICES = RSE::ARRAY_FLAG_USE_2D_VERTICES,
-		ARRAY_FLAG_USE_DYNAMIC_UPDATE = RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE,
-		ARRAY_FLAG_USE_8_BONE_WEIGHTS = RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS,
+		ARRAY_FLAG_USE_2D_VERTICES = RS::ARRAY_FLAG_USE_2D_VERTICES,
+		ARRAY_FLAG_USE_DYNAMIC_UPDATE = RS::ARRAY_FLAG_USE_DYNAMIC_UPDATE,
+		ARRAY_FLAG_USE_8_BONE_WEIGHTS = RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS,
 
-		ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY = RSE::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY,
-		ARRAY_FLAG_COMPRESS_ATTRIBUTES = RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES,
+		ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY = RS::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY,
+		ARRAY_FLAG_COMPRESS_ATTRIBUTES = RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES,
 
-		ARRAY_FLAG_FORMAT_VERSION_BASE = RSE::ARRAY_FLAG_FORMAT_VERSION_BASE,
-		ARRAY_FLAG_FORMAT_VERSION_SHIFT = RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT,
-		ARRAY_FLAG_FORMAT_VERSION_1 = RSE::ARRAY_FLAG_FORMAT_VERSION_1,
-		ARRAY_FLAG_FORMAT_VERSION_2 = (uint64_t)RSE::ARRAY_FLAG_FORMAT_VERSION_2,
-		ARRAY_FLAG_FORMAT_CURRENT_VERSION = (uint64_t)RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
-		ARRAY_FLAG_FORMAT_VERSION_MASK = RSE::ARRAY_FLAG_FORMAT_VERSION_MASK,
+		ARRAY_FLAG_FORMAT_VERSION_BASE = RS::ARRAY_FLAG_FORMAT_VERSION_BASE,
+		ARRAY_FLAG_FORMAT_VERSION_SHIFT = RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT,
+		ARRAY_FLAG_FORMAT_VERSION_1 = RS::ARRAY_FLAG_FORMAT_VERSION_1,
+		ARRAY_FLAG_FORMAT_VERSION_2 = (uint64_t)RS::ARRAY_FLAG_FORMAT_VERSION_2,
+		ARRAY_FLAG_FORMAT_CURRENT_VERSION = (uint64_t)RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
+		ARRAY_FLAG_FORMAT_VERSION_MASK = RS::ARRAY_FLAG_FORMAT_VERSION_MASK,
 	};
 
 	virtual int get_surface_count() const;
@@ -345,7 +341,7 @@ protected:
 public:
 	void add_surface_from_arrays(PrimitiveType p_primitive, const Array &p_arrays, const TypedArray<Array> &p_blend_shapes = TypedArray<Array>(), const Dictionary &p_lods = Dictionary(), BitField<ArrayFormat> p_flags = 0);
 
-	void add_surface(BitField<ArrayFormat> p_format, PrimitiveType p_primitive, const Vector<uint8_t> &p_array, const Vector<uint8_t> &p_attribute_array, const Vector<uint8_t> &p_skin_array, int p_vertex_count, const Vector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<uint8_t> &p_blend_shape_data = Vector<uint8_t>(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>(), const Vector<RenderingServerTypes::SurfaceData::LOD> &p_lods = Vector<RenderingServerTypes::SurfaceData::LOD>(), const Vector4 p_uv_scale = Vector4());
+	void add_surface(BitField<ArrayFormat> p_format, PrimitiveType p_primitive, const Vector<uint8_t> &p_array, const Vector<uint8_t> &p_attribute_array, const Vector<uint8_t> &p_skin_array, int p_vertex_count, const Vector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<uint8_t> &p_blend_shape_data = Vector<uint8_t>(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>(), const Vector<RS::SurfaceData::LOD> &p_lods = Vector<RS::SurfaceData::LOD>(), const Vector4 p_uv_scale = Vector4());
 
 	Array surface_get_arrays(int p_surface) const override;
 	TypedArray<Array> surface_get_blend_shape_arrays(int p_surface) const override;
diff --git a/engine/scene/resources/mesh_data_tool.compat.inc b/engine/scene/resources/mesh_data_tool.compat.inc
index 8b7a3513..6299b0a2 100644
--- a/engine/scene/resources/mesh_data_tool.compat.inc
+++ b/engine/scene/resources/mesh_data_tool.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "mesh_data_tool.h"
-
-#include "core/object/class_db.h"
-
 Error MeshDataTool::commit_to_surface_bind_compat_81138(const Ref<ArrayMesh> &p_mesh) {
 	return commit_to_surface(p_mesh, 0);
 }
@@ -42,4 +38,4 @@ void MeshDataTool::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("commit_to_surface", "mesh"), &MeshDataTool::commit_to_surface_bind_compat_81138);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/mesh_data_tool.cpp b/engine/scene/resources/mesh_data_tool.cpp
index f6d285a3..7ec57121 100644
--- a/engine/scene/resources/mesh_data_tool.cpp
+++ b/engine/scene/resources/mesh_data_tool.cpp
@@ -31,8 +31,6 @@
 #include "mesh_data_tool.h"
 #include "mesh_data_tool.compat.inc"
 
-#include "core/object/class_db.h"
-
 void MeshDataTool::clear() {
 	vertices.clear();
 	edges.clear();
diff --git a/engine/scene/resources/mesh_texture.cpp b/engine/scene/resources/mesh_texture.cpp
index cde5c71b..1440b7f0 100644
--- a/engine/scene/resources/mesh_texture.cpp
+++ b/engine/scene/resources/mesh_texture.cpp
@@ -30,9 +30,7 @@
 
 #include "mesh_texture.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
 
 int MeshTexture::get_width() const {
 	return size.width;
@@ -149,8 +147,8 @@ void MeshTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_base_texture", "texture"), &MeshTexture::set_base_texture);
 	ClassDB::bind_method(D_METHOD("get_base_texture"), &MeshTexture::get_base_texture);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_base_texture", "get_base_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_base_texture", "get_base_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "image_size", PROPERTY_HINT_RANGE, "0,16384,1,suffix:px"), "set_image_size", "get_image_size");
 }
 
diff --git a/engine/scene/resources/multimesh.cpp b/engine/scene/resources/multimesh.cpp
index b5629523..e3f0e120 100644
--- a/engine/scene/resources/multimesh.cpp
+++ b/engine/scene/resources/multimesh.cpp
@@ -30,7 +30,6 @@
 
 #include "multimesh.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 #ifndef DISABLE_DEPRECATED
@@ -231,7 +230,7 @@ Ref<Mesh> MultiMesh::get_mesh() const {
 
 void MultiMesh::set_instance_count(int p_count) {
 	ERR_FAIL_COND(p_count < 0);
-	RenderingServer::get_singleton()->multimesh_allocate_data(multimesh, p_count, RSE::MultimeshTransformFormat(transform_format), use_colors, use_custom_data);
+	RenderingServer::get_singleton()->multimesh_allocate_data(multimesh, p_count, RS::MultimeshTransformFormat(transform_format), use_colors, use_custom_data);
 	instance_count = p_count;
 }
 
@@ -252,7 +251,7 @@ int MultiMesh::get_visible_instance_count() const {
 
 void MultiMesh::set_physics_interpolation_quality(PhysicsInterpolationQuality p_quality) {
 	_physics_interpolation_quality = p_quality;
-	RenderingServer::get_singleton()->multimesh_set_physics_interpolation_quality(multimesh, (RSE::MultimeshPhysicsInterpolationQuality)p_quality);
+	RenderingServer::get_singleton()->multimesh_set_physics_interpolation_quality(multimesh, (RS::MultimeshPhysicsInterpolationQuality)p_quality);
 }
 
 void MultiMesh::set_instance_transform(int p_instance, const Transform3D &p_transform) {
@@ -403,7 +402,7 @@ void MultiMesh::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::AABB, "custom_aabb", PROPERTY_HINT_NONE, "suffix:m"), "set_custom_aabb", "get_custom_aabb");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "instance_count", PROPERTY_HINT_RANGE, "0,16384,1,or_greater"), "set_instance_count", "get_instance_count");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "visible_instance_count", PROPERTY_HINT_RANGE, "-1,16384,1,or_greater"), "set_visible_instance_count", "get_visible_instance_count");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT32_ARRAY, "buffer", PROPERTY_HINT_NONE), "set_buffer", "get_buffer");
 
 #ifndef DISABLE_DEPRECATED
diff --git a/engine/scene/resources/multimesh.h b/engine/scene/resources/multimesh.h
index aa824368..a486bd6e 100644
--- a/engine/scene/resources/multimesh.h
+++ b/engine/scene/resources/multimesh.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class MultiMesh : public Resource {
 	GDCLASS(MultiMesh, Resource);
@@ -39,8 +39,8 @@ class MultiMesh : public Resource {
 
 public:
 	enum TransformFormat {
-		TRANSFORM_2D = RSE::MULTIMESH_TRANSFORM_2D,
-		TRANSFORM_3D = RSE::MULTIMESH_TRANSFORM_3D
+		TRANSFORM_2D = RS::MULTIMESH_TRANSFORM_2D,
+		TRANSFORM_3D = RS::MULTIMESH_TRANSFORM_3D
 	};
 
 	enum PhysicsInterpolationQuality {
diff --git a/engine/scene/resources/navigation_mesh.cpp b/engine/scene/resources/navigation_mesh.cpp
index 505dba45..77fef549 100644
--- a/engine/scene/resources/navigation_mesh.cpp
+++ b/engine/scene/resources/navigation_mesh.cpp
@@ -30,8 +30,6 @@
 
 #include "navigation_mesh.h"
 
-#include "core/object/class_db.h"
-
 #ifdef DEBUG_ENABLED
 #include "servers/navigation_3d/navigation_server_3d.h"
 #endif // DEBUG_ENABLED
@@ -632,7 +630,9 @@ void NavigationMesh::_validate_property(PropertyInfo &p_property) const {
 			p_property.usage = PROPERTY_USAGE_NONE;
 			return;
 		}
-	} else if (p_property.name == "geometry_source_group_name") {
+	}
+
+	if (p_property.name == "geometry_source_group_name") {
 		if (source_geometry_mode == SOURCE_GEOMETRY_ROOT_NODE_CHILDREN) {
 			p_property.usage = PROPERTY_USAGE_NONE;
 			return;
diff --git a/engine/scene/resources/packed_scene.cpp b/engine/scene/resources/packed_scene.cpp
index 49a72488..c25994a3 100644
--- a/engine/scene/resources/packed_scene.cpp
+++ b/engine/scene/resources/packed_scene.cpp
@@ -34,8 +34,6 @@
 #include "core/io/file_access.h"
 #include "core/io/missing_resource.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/local_vector.h"
 #include "core/variant/callable_bind.h"
@@ -156,17 +154,17 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 	// Nodes where instantiation failed (because something is missing.)
 	List<Node *> stray_instances;
 
-#define NODE_FROM_ID(p_name, p_id) \
-	Node *p_name; \
-	if (p_id & FLAG_ID_IS_PATH) { \
-		NodePath np = node_paths[p_id & FLAG_MASK]; \
-		p_name = ret_nodes[0]->get_node_or_null(np); \
-		if (!p_name) { \
+#define NODE_FROM_ID(p_name, p_id)                                             \
+	Node *p_name;                                                              \
+	if (p_id & FLAG_ID_IS_PATH) {                                              \
+		NodePath np = node_paths[p_id & FLAG_MASK];                            \
+		p_name = ret_nodes[0]->get_node_or_null(np);                           \
+		if (!p_name) {                                                         \
 			p_name = _recover_node_path_index(ret_nodes[0], p_id & FLAG_MASK); \
-		} \
-	} else { \
-		ERR_FAIL_INDEX_V(p_id & FLAG_MASK, nc, nullptr); \
-		p_name = ret_nodes[p_id & FLAG_MASK]; \
+		}                                                                      \
+	} else {                                                                   \
+		ERR_FAIL_INDEX_V(p_id & FLAG_MASK, nc, nullptr);                       \
+		p_name = ret_nodes[p_id & FLAG_MASK];                                  \
 	}
 
 	int nc = nodes.size();
diff --git a/engine/scene/resources/packed_scene.h b/engine/scene/resources/packed_scene.h
index f95b4bf3..74ebbd8b 100644
--- a/engine/scene/resources/packed_scene.h
+++ b/engine/scene/resources/packed_scene.h
@@ -33,8 +33,6 @@
 #include "core/io/resource.h"
 #include "scene/main/node.h"
 
-class PackedScene;
-
 class SceneState : public RefCounted {
 	GDCLASS(SceneState, RefCounted);
 
diff --git a/engine/scene/resources/particle_process_material.cpp b/engine/scene/resources/particle_process_material.cpp
index f66b82e5..d87b7a9f 100644
--- a/engine/scene/resources/particle_process_material.cpp
+++ b/engine/scene/resources/particle_process_material.cpp
@@ -30,10 +30,7 @@
 
 #include "particle_process_material.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "core/version.h"
-#include "servers/rendering/rendering_server.h"
 
 Mutex ParticleProcessMaterial::dirty_materials_mutex;
 SelfList<ParticleProcessMaterial>::List ParticleProcessMaterial::dirty_materials;
@@ -63,8 +60,6 @@ void ParticleProcessMaterial::init_shaders() {
 	shader_names->anim_offset_min = "anim_offset_min";
 	shader_names->directional_velocity_min = "directional_velocity_min";
 	shader_names->scale_over_velocity_min = "scale_over_velocity_min";
-	shader_names->scale_3d_min = "scale_3d_min";
-	shader_names->rotation_3d_min = "rotation_3d_min";
 
 	shader_names->initial_linear_velocity_max = "initial_linear_velocity_max";
 	shader_names->initial_angle_max = "initial_angle_max";
@@ -81,8 +76,6 @@ void ParticleProcessMaterial::init_shaders() {
 	shader_names->anim_offset_max = "anim_offset_max";
 	shader_names->directional_velocity_max = "directional_velocity_max";
 	shader_names->scale_over_velocity_max = "scale_over_velocity_max";
-	shader_names->scale_3d_max = "scale_3d_max";
-	shader_names->rotation_3d_max = "rotation_3d_max";
 
 	shader_names->angle_texture = "angle_texture";
 	shader_names->angular_velocity_texture = "angular_velocity_texture";
@@ -107,9 +100,6 @@ void ParticleProcessMaterial::init_shaders() {
 	shader_names->velocity_limit_curve = "velocity_limit_curve";
 	shader_names->inherit_emitter_velocity_ratio = "inherit_emitter_velocity_ratio";
 	shader_names->velocity_pivot = "velocity_pivot";
-	shader_names->rotation_velocity_3d_max = "rotation_velocity_3d_max";
-	shader_names->rotation_velocity_3d_min = "rotation_velocity_3d_min";
-	shader_names->rotation_velocity_3d_curve = "rotation_velocity_3d_curve";
 
 	shader_names->emission_sphere_radius = "emission_sphere_radius";
 	shader_names->emission_box_extents = "emission_box_extents";
@@ -241,18 +231,8 @@ void ParticleProcessMaterial::_update_shader() {
 	code += "uniform float initial_angle_min;\n";
 	code += "uniform float initial_angle_max;\n";
 
-	if (use_scale_3d) {
-		code += "uniform vec3 scale_3d_min;\n";
-		code += "uniform vec3 scale_3d_max;\n";
-	} else {
-		code += "uniform float scale_min;\n";
-		code += "uniform float scale_max;\n";
-	}
-
-	if (!particle_flags[PARTICLE_FLAG_DISABLE_Z] && use_rotation_3d) {
-		code += "uniform vec3 rotation_3d_min;\n";
-		code += "uniform vec3 rotation_3d_max;\n";
-	}
+	code += "uniform float scale_min;\n";
+	code += "uniform float scale_max;\n";
 
 	code += "uniform float hue_variation_min;\n";
 	code += "uniform float hue_variation_max;\n";
@@ -269,14 +249,6 @@ void ParticleProcessMaterial::_update_shader() {
 
 	code += "uniform vec3 velocity_pivot = vec3(0.0);\n";
 
-	if (using_rotation_velocity_3d) {
-		code += "uniform vec3 rotation_velocity_3d_min = vec3(0.0);\n";
-		code += "uniform vec3 rotation_velocity_3d_max = vec3(0.0);\n";
-		if (rotation_velocity_3d_curve.is_valid()) {
-			code += "uniform sampler2D rotation_velocity_3d_curve : repeat_disable;\n";
-		}
-	}
-
 	if (tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) {
 		code += "uniform float scale_over_velocity_min = 0.0;\n";
 		code += "uniform float scale_over_velocity_max = 5.0;\n";
@@ -584,15 +556,9 @@ void ParticleProcessMaterial::_update_shader() {
 	code += "	float directional_velocity;\n";
 	code += "	float radial_velocity;\n";
 	code += "	float orbit_velocity;\n";
-	if (!particle_flags[PARTICLE_FLAG_DISABLE_Z] && use_rotation_3d) {
-		code += "	vec3 rotation_3d;\n";
-	}
 	if (turbulence_enabled) {
 		code += "	float turb_influence;\n";
 	}
-	if (using_rotation_velocity_3d) {
-		code += "	vec3 rotation_velocity_3d;\n";
-	}
 	code += "};\n\n";
 
 	code += "struct PhysicalParameters {\n";
@@ -621,29 +587,13 @@ void ParticleProcessMaterial::_update_shader() {
 	if (turbulence_enabled) {
 		code += "	params.turb_influence = mix(turbulence_influence_min, turbulence_influence_max, rand_from_seed(alt_seed));\n";
 	}
-	if (!particle_flags[PARTICLE_FLAG_DISABLE_Z] && use_rotation_3d) {
-		code += "	params.rotation_3d.x = mix(rotation_3d_min.x, rotation_3d_max.x, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_3d.y = mix(rotation_3d_min.y, rotation_3d_max.y, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_3d.z = mix(rotation_3d_min.z, rotation_3d_max.z, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_3d *= 3.14159 / 180.0;\n";
-	}
-	if (using_rotation_velocity_3d) {
-		code += "	params.rotation_velocity_3d.x = mix(rotation_velocity_3d_min.x, rotation_velocity_3d_max.x, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_velocity_3d.y = mix(rotation_velocity_3d_min.y, rotation_velocity_3d_max.y, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_velocity_3d.z = mix(rotation_velocity_3d_min.z, rotation_velocity_3d_max.z, rand_from_seed(alt_seed));\n";
-		code += "	params.rotation_velocity_3d *= 3.14159 / 180.0;\n";
-	}
 	code += "}\n\n";
 
 	code += "void calculate_initial_display_params(inout DisplayParameters params, inout uint alt_seed) {\n";
 	code += "	// -------------------- DO NOT REORDER OPERATIONS, IT BREAKS VISUAL COMPATIBILITY\n";
 	code += "	// -------------------- ADD NEW OPERATIONS AT THE BOTTOM\n";
 	code += "	float pi = 3.14159;\n";
-	if (use_scale_3d) {
-		code += "	params.scale = mix(scale_3d_min, scale_3d_max, rand_from_seed(alt_seed));\n";
-	} else {
-		code += "	params.scale = vec3(mix(scale_min, scale_max, rand_from_seed(alt_seed)));\n";
-	}
+	code += "	params.scale = vec3(mix(scale_min, scale_max, rand_from_seed(alt_seed)));\n";
 	code += "	params.scale = sign(params.scale) * max(abs(params.scale), 0.001);\n";
 	code += "	params.hue_rotation = pi * 2.0 * mix(hue_variation_min, hue_variation_max, rand_from_seed(alt_seed));\n";
 	code += "	params.animation_speed = mix(anim_speed_min, anim_speed_max, rand_from_seed(alt_seed));\n";
@@ -663,7 +613,6 @@ void ParticleProcessMaterial::_update_shader() {
 			code += "	params.color *= texelFetch(emission_texture_color, emission_tex_ofs, 0);\n";
 		}
 	}
-	// New additions go at the bottom to preserve existing fixed-seed particles.
 	code += "}\n\n";
 
 	// Process display parameters that are bound solely by lifetime.
@@ -938,34 +887,6 @@ void ParticleProcessMaterial::_update_shader() {
 	code += "		TRANSFORM[1].xyz = vec3(0.0, 1.0, 0.0);\n";
 	code += "		TRANSFORM[2].xyz = vec3(0.0, 0.0, 1.0);\n";
 	code += "	}\n";
-	code += "	process_display_param(params, 0.0);\n\n";
-	if (!particle_flags[PARTICLE_FLAG_DISABLE_Z] && use_rotation_3d) {
-		code += R"(
-	if (dot(dynamic_params.rotation_3d, dynamic_params.rotation_3d) > 0.0) {
-		mat4 rx = mat4(
-				vec4(1.0, 0.0, 0.0, 0.0),
-				vec4(0.0, cos(dynamic_params.rotation_3d.x), sin(dynamic_params.rotation_3d.x), 0.0),
-				vec4(0.0, -sin(dynamic_params.rotation_3d.x), cos(dynamic_params.rotation_3d.x), 0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		mat4 ry = mat4(
-				vec4(cos(dynamic_params.rotation_3d.y), 0.0, -sin(dynamic_params.rotation_3d.y), 0.0),
-				vec4(0.0, 1.0, 0.0, 0.0),
-				vec4(sin(dynamic_params.rotation_3d.y), 0.0, cos(dynamic_params.rotation_3d.y), 0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		mat4 rz = mat4(
-				vec4(cos(dynamic_params.rotation_3d.z), sin(dynamic_params.rotation_3d.z), 0.0, 0.0),
-				vec4(-sin(dynamic_params.rotation_3d.z), cos(dynamic_params.rotation_3d.z), 0.0, 0.0),
-				vec4(0.0, 0.0, 1.0, 0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		TRANSFORM[3].xyz = vec3(0.);
-		TRANSFORM = rz * ry * rx * TRANSFORM;
-	}
-)";
-	}
-
 	code += "	if (RESTART_POSITION) {\n";
 	code += "		TRANSFORM[3].xyz = calculate_initial_position(params, alt_seed);\n";
 	if (turbulence_enabled) {
@@ -976,9 +897,7 @@ void ParticleProcessMaterial::_update_shader() {
 	code += "		TRANSFORM = EMISSION_TRANSFORM * TRANSFORM;\n";
 	code += "	}\n";
 	code += "	if (RESTART_VELOCITY) {\n";
-	code += "		// We use USERDATA to accumulate our velocities. That way, we can pass both animated velocities and accumulated velocities from\n";
-	code += "		// acceleration in VELOCITY, allowing for proper interpolation of animated velocities as well. \n";
-	code += "		USERDATA1.xyz = get_random_direction_from_spread(alt_seed, spread) * dynamic_params.initial_velocity_multiplier;\n";
+	code += "		VELOCITY = get_random_direction_from_spread(alt_seed, spread) * dynamic_params.initial_velocity_multiplier;\n";
 	if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS) {
 		code += "		int point = min(emission_texture_point_count - 1, int(params.emission_texture_position * float(emission_texture_point_count)));\n";
 		code += "		ivec2 emission_tex_size = textureSize(emission_texture_points, 0);\n";
@@ -988,7 +907,7 @@ void ParticleProcessMaterial::_update_shader() {
 			code += "			mat2 rotm;\n";
 			code += "			rotm[0] = texelFetch(emission_texture_normal, emission_tex_ofs, 0).xy;\n";
 			code += "			rotm[1] = rotm[0].yx * vec2(1.0, -1.0);\n";
-			code += "			USERDATA1.xy = rotm * USERDATA1.xy;\n";
+			code += "			VELOCITY.xy = rotm * VELOCITY.xy;\n";
 			code += "		}\n";
 		} else {
 			code += "		{\n";
@@ -996,16 +915,16 @@ void ParticleProcessMaterial::_update_shader() {
 			code += "			vec3 v0 = abs(normal.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(0.0, 1.0, 0.0);\n";
 			code += "			vec3 tangent = normalize(cross(v0, normal));\n";
 			code += "			vec3 bitangent = normalize(cross(tangent, normal));\n";
-			code += "			USERDATA1.xyz = mat3(tangent, bitangent, normal) * USERDATA1.xyz;\n";
+			code += "			VELOCITY = mat3(tangent, bitangent, normal) * VELOCITY;\n";
 			code += "		}\n";
 		}
 	}
 	code += "	}\n\n";
 	code += "	process_display_param(params, 0.0);\n\n";
-	code += "	USERDATA1.xyz = (EMISSION_TRANSFORM * vec4(USERDATA1.xyz, 0.0)).xyz;\n";
-	code += "	USERDATA1.xyz += EMITTER_VELOCITY * inherit_emitter_velocity_ratio;\n";
+	code += "	VELOCITY = (EMISSION_TRANSFORM * vec4(VELOCITY, 0.0)).xyz;\n";
+	code += "	VELOCITY += EMITTER_VELOCITY * inherit_emitter_velocity_ratio;\n";
 	if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
-		code += "	USERDATA1.z = 0.0;\n";
+		code += "	VELOCITY.z = 0.0;\n";
 		code += "	TRANSFORM[3].z = 0.0;\n";
 	}
 	code += "}\n\n";
@@ -1030,7 +949,7 @@ void ParticleProcessMaterial::_update_shader() {
 	if (sub_emitter_mode == SUB_EMITTER_AT_START && !RenderingServer::get_singleton()->is_low_end()) {
 		code += "	bool just_spawned = CUSTOM.y == 0.0;\n";
 	}
-	code += "	bool first_frame = CUSTOM.y == 0.0;\n";
+
 	code += "	CUSTOM.y += DELTA / LIFETIME;\n";
 	code += "	CUSTOM.y = mix(CUSTOM.y, 1.0, INTERPOLATE_TO_END);\n";
 	code += "	float lifetime_percent = CUSTOM.y / params.lifetime;\n";
@@ -1055,7 +974,7 @@ void ParticleProcessMaterial::_update_shader() {
 	code += "		vec3 pos = TRANSFORM[3].xyz;\n";
 	code += "		force = gravity;\n";
 	code += "		// Apply linear acceleration.\n";
-	code += "		force += length(USERDATA1.xyz) > 0.0 ? normalize(USERDATA1.xyz) * physics_params.linear_accel : vec3(0.0);\n";
+	code += "		force += length(VELOCITY) > 0.0 ? normalize(VELOCITY) * physics_params.linear_accel : vec3(0.0);\n";
 	code += "		// Apply radial acceleration.\n";
 	code += "		vec3 org = EMISSION_TRANSFORM[3].xyz;\n";
 	code += "		vec3 diff = pos - org;\n";
@@ -1075,12 +994,12 @@ void ParticleProcessMaterial::_update_shader() {
 		code += "		force.z = 0.0;\n";
 	}
 	code += "		// Apply attractor forces.\n";
-	code += "		USERDATA1.xyz += force * DELTA;\n";
+	code += "		VELOCITY += force * DELTA;\n";
 	code += "	}\n";
 	code += "	{\n";
 	code += "		// Copied from previous version.\n";
 	code += "		if (physics_params.damping > 0.0) {\n";
-	code += "			float v = length(USERDATA1.xyz);\n";
+	code += "			float v = length(VELOCITY);\n";
 	if (!particle_flags[PARTICLE_FLAG_DAMPING_AS_FRICTION]) {
 		code += "			v -= physics_params.damping * DELTA;\n";
 	} else {
@@ -1091,24 +1010,24 @@ void ParticleProcessMaterial::_update_shader() {
 		code += "			}\n";
 	}
 	code += "			if (v < 0.0) {\n";
-	code += "				USERDATA1.xyz = vec3(0.0);\n";
+	code += "				VELOCITY = vec3(0.0);\n";
 	code += "			} else {\n";
-	code += "				USERDATA1.xyz = normalize(USERDATA1.xyz) * v;\n";
+	code += "				VELOCITY = normalize(VELOCITY) * v;\n";
 	code += "			}\n";
 	code += "		}\n";
 	code += "	}\n\n";
 
 	if (collision_mode == COLLISION_RIGID) {
 		code += "	if (COLLIDED) {\n";
-		code += "		float collision_response = dot(COLLISION_NORMAL, USERDATA1.xyz);\n";
+		code += "		float collision_response = dot(COLLISION_NORMAL, VELOCITY);\n";
 		code += "		float slide_to_bounce_trigger = step(2.0 / clamp(collision_bounce + 1.0, 1.0, 2.0), abs(collision_response));\n";
 		code += "		TRANSFORM[3].xyz += COLLISION_NORMAL * COLLISION_DEPTH;\n";
-		code += "		// Remove all components that are not tangential to COLLISION_NORMAL.\n";
-		code += "		USERDATA1.xyz -= COLLISION_NORMAL * collision_response;\n";
-		code += "		// Apply friction only across the surface (effectively decouples friction and bounce behavior).\n";
-		code += "		USERDATA1.xyz = mix(USERDATA1.xyz, vec3(0.0), clamp(collision_friction, 0.0, 1.0));\n";
-		code += "		// Add bounce velocity.\n";
-		code += "		USERDATA1.xyz -= COLLISION_NORMAL * collision_response * (collision_bounce * slide_to_bounce_trigger);\n";
+		code += "		// Remove all components of VELOCITY that are not tangential to COLLISION_NORMAL.\n";
+		code += "		VELOCITY -= COLLISION_NORMAL * collision_response;\n";
+		code += "		// Apply friction only to VELOCITY across the surface (effectively decouples friction and bounce behavior).\n";
+		code += "		VELOCITY = mix(VELOCITY, vec3(0.0), clamp(collision_friction, 0.0, 1.0));\n";
+		code += "		// Add bounce velocity to VELOCITY.\n";
+		code += "		VELOCITY -= COLLISION_NORMAL * collision_response * (collision_bounce * slide_to_bounce_trigger);\n";
 		code += "	}\n\n";
 	} else if (collision_mode == COLLISION_HIDE_ON_CONTACT) {
 		code += "	if (COLLIDED) {\n";
@@ -1133,14 +1052,14 @@ void ParticleProcessMaterial::_update_shader() {
 		} else {
 			code += "	{\n";
 		}
-		code += "		float vel_mag = length(USERDATA1.xyz);\n";
+		code += "		float vel_mag = length(VELOCITY);\n";
 		code += "		float vel_infl = clamp(dynamic_params.turb_influence * turbulence_influence, 0.0, 1.0) * (DELTA <= 0.0 ? 0.0 : 1.0);\n";
-		code += "		USERDATA1.xyz = mix(USERDATA1.xyz, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n";
+		code += "		VELOCITY = mix(VELOCITY, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n";
 		code += "		vel_mag = length(controlled_displacement);\n";
 		code += "		controlled_displacement = mix(controlled_displacement, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n";
 		code += "	}\n";
 	}
-	code += "	vec3 final_velocity = controlled_displacement + USERDATA1.xyz;\n\n";
+	code += "	vec3 final_velocity = controlled_displacement + VELOCITY;\n\n";
 
 	if (velocity_limit_curve.is_valid()) {
 		code += "	// Limit velocity.\n";
@@ -1153,7 +1072,6 @@ void ParticleProcessMaterial::_update_shader() {
 		code += "	final_velocity.z = 0.0;\n\n";
 	}
 
-	code += "	VELOCITY = final_velocity;\n";
 	code += "	TRANSFORM[3].xyz += final_velocity * DELTA;\n\n";
 
 	code += "	process_display_param(params, lifetime_percent);\n\n";
@@ -1223,84 +1141,18 @@ void ParticleProcessMaterial::_update_shader() {
 		code += "		params.scale *= texture(scale_over_velocity_curve, vec2(0.0)).rgb;\n";
 		code += "	}\n";
 	}
-
-	if (particle_flags[PARTICLE_FLAG_INHERIT_EMITTER_SCALE]) {
-		code += "	vec3 emitter_scale = vec3(length(EMISSION_TRANSFORM[0].xyz), length(EMISSION_TRANSFORM[1].xyz), length(EMISSION_TRANSFORM[2].xyz));\n";
-		code += "	params.scale = params.scale * emitter_scale;\n";
-	}
-
 	// A scale of 0 results in no emission at some emission amounts (including 3 and 6).
 	// `sign(scale)` is unsuitable, because sign(0) returns 0, nullifying the minimum value.
 	// The following evaluates to 1 when scale is 0, falling back to a positive minimum value.
-	code += "	if (first_frame) {\n";
-	code += "		float scale_sign_x = params.scale.x < 0.0 ? -1.0 : 1.0;\n";
-	code += "		float scale_sign_y = params.scale.y < 0.0 ? -1.0 : 1.0;\n";
-	code += "		float scale_sign_z = params.scale.z < 0.0 ? -1.0 : 1.0;\n";
-	code += "		float scale_minimum = 0.001;\n";
-	code += "		TRANSFORM[0].xyz *= scale_sign_x * max(abs(params.scale.x), scale_minimum);\n";
-	code += "		TRANSFORM[1].xyz *= scale_sign_y * max(abs(params.scale.y), scale_minimum);\n";
-	code += "		TRANSFORM[2].xyz *= scale_sign_z * max(abs(params.scale.z), scale_minimum);\n";
-	code += "	} else {\n";
-	code += "		float scale_minimum = 0.001;\n";
-	code += "		TRANSFORM[0].xyz *= max(abs(params.scale.x), scale_minimum);\n";
-	code += "		TRANSFORM[1].xyz *= max(abs(params.scale.y), scale_minimum);\n";
-	code += "		TRANSFORM[2].xyz *= max(abs(params.scale.z), scale_minimum);\n";
-	code += "	}\n";
+	code += "	float scale_sign_x = params.scale.x < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_sign_y = params.scale.y < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_sign_z = params.scale.z < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_minimum = 0.001;\n";
+	code += "	TRANSFORM[0].xyz *= scale_sign_x * max(abs(params.scale.x), scale_minimum);\n";
+	code += "	TRANSFORM[1].xyz *= scale_sign_y * max(abs(params.scale.y), scale_minimum);\n";
+	code += "	TRANSFORM[2].xyz *= scale_sign_z * max(abs(params.scale.z), scale_minimum);\n";
 	code += "\n";
 	code += "	CUSTOM.z = params.animation_offset + lifetime_percent * params.animation_speed;\n\n";
-	if (using_rotation_velocity_3d && !particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
-		if (rotation_velocity_3d_curve.is_valid()) {
-			code += "	dynamic_params.rotation_velocity_3d *= texture(rotation_velocity_3d_curve, vec2(lifetime_percent)).xyz;\n";
-		}
-		code += R"(
-	if (length(dynamic_params.rotation_velocity_3d) > 0.0) {
-		vec3 r = dynamic_params.rotation_velocity_3d * DELTA;
-		vec4 origin = TRANSFORM[3];
-		vec4 norm_axis = normalize(TRANSFORM[0]);
-		float ux = norm_axis.x;
-		float uy = norm_axis.y;
-		float uz = norm_axis.z;
-		float s = sin(r.x);
-		float c = cos(r.x);
-		float cm = 1.0 - c;
-		mat4 rx = mat4(
-				vec4(ux * ux * cm + c,      ux * uy * cm - uz * s, ux * uz * cm + uy * s, 0.0),
-				vec4(ux * uy * cm + uz * s, uy * uy * cm + c,      uy * uz * cm - ux * s, 0.0),
-				vec4(ux * uz * cm - uy * s, uy * uz * cm + ux * s, uz * uz * cm + c,      0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		norm_axis = normalize(TRANSFORM[1]);
-		ux = norm_axis.x;
-		uy = norm_axis.y;
-		uz = norm_axis.z;
-		s = sin(r.y);
-		c = cos(r.y);
-		cm = 1.0 - c;
-		mat4 ry = mat4(
-				vec4(ux * ux * cm + c,      ux * uy * cm - uz * s, ux * uz * cm + uy * s, 0.0),
-				vec4(ux * uy * cm + uz * s, uy * uy * cm + c,      uy * uz * cm - ux * s, 0.0),
-				vec4(ux * uz * cm - uy * s, uy * uz * cm + ux * s, uz * uz * cm + c,      0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		norm_axis = normalize(TRANSFORM[2]);
-		ux = norm_axis.x;
-		uy = norm_axis.y;
-		uz = norm_axis.z;
-		s = sin(r.z);
-		c = cos(r.z);
-		cm = 1.0 - c;
-		mat4 rz = mat4(
-				vec4(ux * ux * cm + c,      ux * uy * cm - uz * s, ux * uz * cm + uy * s, 0.0),
-				vec4(ux * uy * cm + uz * s, uy * uy * cm + c,      uy * uz * cm - ux * s, 0.0),
-				vec4(ux * uz * cm - uy * s, uy * uz * cm + ux * s, uz * uz * cm + c,      0.0),
-				vec4(0.0, 0.0, 0.0, 1.0)
-			);
-		TRANSFORM[3].xyz = vec3(0.);
-		TRANSFORM = rz * ry * rx * TRANSFORM;
-		TRANSFORM[3] = origin;
-	}
-)";
-	}
 
 	if (sub_emitter_mode != SUB_EMITTER_DISABLED && !RenderingServer::get_singleton()->is_low_end()) {
 		code += "	int emit_count = 0;\n";
@@ -1945,117 +1797,6 @@ double ParticleProcessMaterial::get_inherit_velocity_ratio() {
 	return inherit_emitter_velocity_ratio;
 }
 
-void ParticleProcessMaterial::set_use_scale_3d(const bool p_use_scale_3d) {
-	if (p_use_scale_3d != use_scale_3d) {
-		_queue_shader_change();
-	}
-	use_scale_3d = p_use_scale_3d;
-	notify_property_list_changed();
-}
-
-bool ParticleProcessMaterial::is_using_scale_3d() const {
-	return use_scale_3d;
-}
-
-Vector3 ParticleProcessMaterial::get_scale_3d_min() const {
-	return scale_3d_min;
-}
-
-void ParticleProcessMaterial::set_scale_3d_min(const Vector3 &p_scale_3d_min) {
-	scale_3d_min = p_scale_3d_min;
-	if (scale_3d_min > scale_3d_max) {
-		set_scale_3d_max(scale_3d_min);
-	}
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_3d_min, p_scale_3d_min);
-}
-
-Vector3 ParticleProcessMaterial::get_scale_3d_max() const {
-	return scale_3d_max;
-}
-
-void ParticleProcessMaterial::set_scale_3d_max(const Vector3 &p_scale_3d_max) {
-	scale_3d_max = p_scale_3d_max;
-	if (scale_3d_max < scale_3d_min) {
-		set_scale_3d_min(scale_3d_max);
-	}
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_3d_max, p_scale_3d_max);
-}
-
-void ParticleProcessMaterial::set_use_rotation_3d(const bool p_use_rotation_3d) {
-	if (p_use_rotation_3d != use_rotation_3d) {
-		_queue_shader_change();
-	}
-	use_rotation_3d = p_use_rotation_3d;
-	notify_property_list_changed();
-}
-bool ParticleProcessMaterial::is_using_rotation_3d() const {
-	return use_rotation_3d;
-}
-
-Vector3 ParticleProcessMaterial::get_rotation_3d_min() const {
-	return rotation_3d_min;
-}
-
-void ParticleProcessMaterial::set_rotation_3d_min(const Vector3 &p_rotation_3d_min) {
-	rotation_3d_min = p_rotation_3d_min;
-	if (rotation_3d_min > rotation_3d_max) {
-		set_rotation_3d_max(rotation_3d_min);
-	}
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->rotation_3d_min, p_rotation_3d_min);
-}
-
-Vector3 ParticleProcessMaterial::get_rotation_3d_max() const {
-	return rotation_3d_max;
-}
-
-void ParticleProcessMaterial::set_rotation_3d_max(const Vector3 &p_rotation_3d_max) {
-	rotation_3d_max = p_rotation_3d_max;
-	if (rotation_3d_max < rotation_3d_min) {
-		set_rotation_3d_min(rotation_3d_max);
-	}
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->rotation_3d_max, p_rotation_3d_max);
-}
-
-void ParticleProcessMaterial::set_use_rotation_velocity_3d(bool p_use_rotation_velocity_3d) {
-	using_rotation_velocity_3d = p_use_rotation_velocity_3d;
-	_queue_shader_change();
-	notify_property_list_changed();
-}
-
-bool ParticleProcessMaterial::is_using_rotation_velocity_3d() const {
-	return using_rotation_velocity_3d;
-}
-
-void ParticleProcessMaterial::set_rotation_velocity_3d_min(const Vector3 &p_rotation_velocity_3d_min) {
-	rotation_velocity_3d_min = p_rotation_velocity_3d_min;
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->rotation_velocity_3d_min, p_rotation_velocity_3d_min);
-}
-
-Vector3 ParticleProcessMaterial::get_rotation_velocity_3d_min() const {
-	return rotation_velocity_3d_min;
-}
-
-void ParticleProcessMaterial::set_rotation_velocity_3d_max(const Vector3 &p_rotation_velocity_3d_max) {
-	rotation_velocity_3d_max = p_rotation_velocity_3d_max;
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->rotation_velocity_3d_max, p_rotation_velocity_3d_max);
-}
-
-Vector3 ParticleProcessMaterial::get_rotation_velocity_3d_max() const {
-	return rotation_velocity_3d_max;
-}
-
-void ParticleProcessMaterial::set_rotation_velocity_3d_curve(const Ref<Texture2D> &p_texture) {
-	rotation_velocity_3d_curve = p_texture;
-	Variant tex_rid = p_texture.is_valid() ? Variant(p_texture->get_rid()) : Variant();
-	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->rotation_velocity_3d_curve, tex_rid);
-	_queue_shader_change();
-	notify_property_list_changed();
-}
-
-Ref<Texture2D> ParticleProcessMaterial::get_rotation_velocity_3d_curve() const {
-	return rotation_velocity_3d_curve;
-}
-
 void ParticleProcessMaterial::set_turbulence_enabled(const bool p_turbulence_enabled) {
 	turbulence_enabled = p_turbulence_enabled;
 	RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->turbulence_enabled, turbulence_enabled);
@@ -2141,136 +1882,67 @@ RID ParticleProcessMaterial::get_shader_rid() const {
 }
 
 void ParticleProcessMaterial::_validate_property(PropertyInfo &p_property) const {
-	if (p_property.name == "emission_sphere_radius") {
-		if (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_box_extents") {
-		if (emission_shape != EMISSION_SHAPE_BOX) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if ((p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture")) {
-		if ((emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS)) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_normal_texture") {
-		if (emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "emission_point_count") {
-		if ((emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS)) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name.begins_with("emission_ring_")) {
-		if (emission_shape != EMISSION_SHAPE_RING) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "sub_emitter_frequency") {
-		if (sub_emitter_mode != SUB_EMITTER_CONSTANT) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "sub_emitter_amount_at_end") {
-		if (sub_emitter_mode != SUB_EMITTER_AT_END) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "sub_emitter_amount_at_collision") {
-		if (sub_emitter_mode != SUB_EMITTER_AT_COLLISION) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "sub_emitter_amount_at_start") {
-		if (sub_emitter_mode != SUB_EMITTER_AT_START) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "collision_friction") {
-		if (collision_mode != COLLISION_RIGID) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if (p_property.name == "collision_bounce") {
-		if (collision_mode != COLLISION_RIGID) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if ((p_property.name == "directional_velocity_min" || p_property.name == "directional_velocity_max")) {
-		if (!tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
-	} else if ((p_property.name == "rotation_velocity_3d_min" || p_property.name == "rotation_velocity_3d_max" || p_property.name == "rotation_velocity_3d_curve")) {
-		if (!using_rotation_velocity_3d) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		}
+	if (p_property.name == "emission_sphere_radius" && (emission_shape != EMISSION_SHAPE_SPHERE && emission_shape != EMISSION_SHAPE_SPHERE_SURFACE)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_box_extents" && emission_shape != EMISSION_SHAPE_BOX) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if ((p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture") && (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_normal_texture" && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "emission_point_count" && (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS)) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name.begins_with("emission_ring_") && emission_shape != EMISSION_SHAPE_RING) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "sub_emitter_frequency" && sub_emitter_mode != SUB_EMITTER_CONSTANT) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "sub_emitter_amount_at_end" && sub_emitter_mode != SUB_EMITTER_AT_END) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "sub_emitter_amount_at_collision" && sub_emitter_mode != SUB_EMITTER_AT_COLLISION) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "sub_emitter_amount_at_start" && sub_emitter_mode != SUB_EMITTER_AT_START) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "collision_friction" && collision_mode != COLLISION_RIGID) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+
+	if (p_property.name == "collision_bounce" && collision_mode != COLLISION_RIGID) {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+	if ((p_property.name == "directional_velocity_min" || p_property.name == "directional_velocity_max") && !tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) {
+		p_property.usage = PROPERTY_USAGE_NONE;
 	}
 
 	if (Engine::get_singleton()->is_editor_hint()) {
 		if ((p_property.name == "scale_over_velocity_min" || p_property.name == "scale_over_velocity_max") && !tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) {
 			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+		}
+		if ((p_property.name == "orbit_velocity_min" || p_property.name == "orbit_velocity_max") && (!tex_parameters[PARAM_ORBIT_VELOCITY].is_valid() && !particle_flags[PARTICLE_FLAG_DISABLE_Z])) {
+			p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+		}
 
-		} else if (p_property.name == "emission_box_extents") {
-			if (emission_shape != EMISSION_SHAPE_BOX) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "emission_point_texture" || p_property.name == "emission_color_texture") {
-			if (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "emission_normal_texture") {
-			if (emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "emission_point_count") {
-			if (emission_shape != EMISSION_SHAPE_POINTS && emission_shape != EMISSION_SHAPE_DIRECTED_POINTS) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name.begins_with("emission_ring_")) {
-			if (emission_shape != EMISSION_SHAPE_RING) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "sub_emitter_frequency") {
-			if (sub_emitter_mode != SUB_EMITTER_CONSTANT) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "sub_emitter_amount_at_end") {
-			if (sub_emitter_mode != SUB_EMITTER_AT_END) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "sub_emitter_amount_at_collision") {
-			if (sub_emitter_mode != SUB_EMITTER_AT_COLLISION) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "sub_emitter_amount_at_start") {
-			if (sub_emitter_mode != SUB_EMITTER_AT_START) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "collision_friction") {
-			if (collision_mode != COLLISION_RIGID) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "collision_bounce") {
-			if (collision_mode != COLLISION_RIGID) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "directional_velocity_min" || p_property.name == "directional_velocity_max") {
-			if (!tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) {
-				p_property.usage = PROPERTY_USAGE_NONE;
-			}
-		} else if (p_property.name == "scale_over_velocity_min" || p_property.name == "scale_over_velocity_max") {
-			if (!tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) {
-				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			}
-		} else if (p_property.name == "orbit_velocity_min" || p_property.name == "orbit_velocity_max") {
-			if (!tex_parameters[PARAM_ORBIT_VELOCITY].is_valid() && !particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
-				p_property.usage = PROPERTY_USAGE_NO_EDITOR;
-			}
-		} else if (p_property.usage & PROPERTY_USAGE_EDITOR && (p_property.name.ends_with("_min") || p_property.name.ends_with("_max")) &&
-				!p_property.name.begins_with("rotation_velocity") &&
-				!p_property.name.begins_with("scale_3d") &&
-				!p_property.name.begins_with("rotation_3d")) {
+		if (p_property.usage & PROPERTY_USAGE_EDITOR && (p_property.name.ends_with("_min") || p_property.name.ends_with("_max"))) {
 			p_property.usage &= ~PROPERTY_USAGE_EDITOR;
-
-		} else if ((p_property.name == "scale_3d_min" || p_property.name == "scale_3d_max") && !use_scale_3d) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		} else if (p_property.name == "scale" && use_scale_3d) {
-			p_property.usage = PROPERTY_USAGE_NONE;
-		} else if ((p_property.name == "rotation_3d_max" || p_property.name == "rotation_3d_min") && (particle_flags[PARTICLE_FLAG_DISABLE_Z] || !use_rotation_3d)) {
-			p_property.usage = PROPERTY_USAGE_NONE;
 		}
 	}
 }
@@ -2410,24 +2082,6 @@ void ParticleProcessMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_color", "color"), &ParticleProcessMaterial::set_color);
 	ClassDB::bind_method(D_METHOD("get_color"), &ParticleProcessMaterial::get_color);
 
-	ClassDB::bind_method(D_METHOD("set_use_scale_3d", "using_scale_3d"), &ParticleProcessMaterial::set_use_scale_3d);
-	ClassDB::bind_method(D_METHOD("is_using_scale_3d"), &ParticleProcessMaterial::is_using_scale_3d);
-
-	ClassDB::bind_method(D_METHOD("set_scale_3d_min", "scale_3d_min"), &ParticleProcessMaterial::set_scale_3d_min);
-	ClassDB::bind_method(D_METHOD("get_scale_3d_min"), &ParticleProcessMaterial::get_scale_3d_min);
-
-	ClassDB::bind_method(D_METHOD("set_scale_3d_max", "scale_3d_max"), &ParticleProcessMaterial::set_scale_3d_max);
-	ClassDB::bind_method(D_METHOD("get_scale_3d_max"), &ParticleProcessMaterial::get_scale_3d_max);
-
-	ClassDB::bind_method(D_METHOD("set_use_rotation_3d", "using_rotation_3d"), &ParticleProcessMaterial::set_use_rotation_3d);
-	ClassDB::bind_method(D_METHOD("is_using_rotation_3d"), &ParticleProcessMaterial::is_using_rotation_3d);
-
-	ClassDB::bind_method(D_METHOD("set_rotation_3d_min", "rotation_3d_min"), &ParticleProcessMaterial::set_rotation_3d_min);
-	ClassDB::bind_method(D_METHOD("get_rotation_3d_min"), &ParticleProcessMaterial::get_rotation_3d_min);
-
-	ClassDB::bind_method(D_METHOD("set_rotation_3d_max", "rotation_3d_max"), &ParticleProcessMaterial::set_rotation_3d_max);
-	ClassDB::bind_method(D_METHOD("get_rotation_3d_max"), &ParticleProcessMaterial::get_rotation_3d_max);
-
 	ClassDB::bind_method(D_METHOD("set_color_ramp", "ramp"), &ParticleProcessMaterial::set_color_ramp);
 	ClassDB::bind_method(D_METHOD("get_color_ramp"), &ParticleProcessMaterial::get_color_ramp);
 	ClassDB::bind_method(D_METHOD("set_alpha_curve", "curve"), &ParticleProcessMaterial::set_alpha_curve);
@@ -2544,19 +2198,10 @@ void ParticleProcessMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_collision_bounce", "bounce"), &ParticleProcessMaterial::set_collision_bounce);
 	ClassDB::bind_method(D_METHOD("get_collision_bounce"), &ParticleProcessMaterial::get_collision_bounce);
 
-	ClassDB::bind_method(D_METHOD("set_using_rotation_velocity_3d", "use_rotation_velocity_3d"), &ParticleProcessMaterial::set_use_rotation_velocity_3d);
-	ClassDB::bind_method(D_METHOD("is_using_rotation_velocity_3d"), &ParticleProcessMaterial::is_using_rotation_velocity_3d);
-	ClassDB::bind_method(D_METHOD("set_rotation_velocity_3d_max", "rotation_velocity_3d_max"), &ParticleProcessMaterial::set_rotation_velocity_3d_max);
-	ClassDB::bind_method(D_METHOD("get_rotation_velocity_3d_max"), &ParticleProcessMaterial::get_rotation_velocity_3d_max);
-	ClassDB::bind_method(D_METHOD("set_rotation_velocity_3d_min", "rotation_velocity_3d_min"), &ParticleProcessMaterial::set_rotation_velocity_3d_min);
-	ClassDB::bind_method(D_METHOD("get_rotation_velocity_3d_min"), &ParticleProcessMaterial::get_rotation_velocity_3d_min);
-	ClassDB::bind_method(D_METHOD("set_rotation_velocity_3d_curve", "rotation_velocity_3d_curve"), &ParticleProcessMaterial::set_rotation_velocity_3d_curve);
-	ClassDB::bind_method(D_METHOD("get_rotation_velocity_3d_curve"), &ParticleProcessMaterial::get_rotation_velocity_3d_curve);
-
-#define ADD_MIN_MAX_PROPERTY(m_property, m_range, m_parameter_name) \
+#define ADD_MIN_MAX_PROPERTY(m_property, m_range, m_parameter_name)                                                                                                                       \
 	ADD_PROPERTYI(PropertyInfo(Variant::VECTOR2, m_property, PROPERTY_HINT_RANGE, m_range, PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_INTERNAL), "set_param", "get_param", m_parameter_name); \
-	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, m_property "_min", PROPERTY_HINT_RANGE, m_range), "set_param_min", "get_param_min", m_parameter_name); \
-	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, m_property "_max", PROPERTY_HINT_RANGE, m_range), "set_param_max", "get_param_max", m_parameter_name); \
+	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, m_property "_min", PROPERTY_HINT_RANGE, m_range), "set_param_min", "get_param_min", m_parameter_name);                                     \
+	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, m_property "_max", PROPERTY_HINT_RANGE, m_range), "set_param_max", "get_param_max", m_parameter_name);                                     \
 	min_max_properties.insert(m_property);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "lifetime_randomness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_lifetime_randomness", "get_lifetime_randomness");
@@ -2565,7 +2210,6 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_rotate_y"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_ROTATE_Y);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_disable_z"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_DISABLE_Z);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_damping_as_friction"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_DAMPING_AS_FRICTION);
-	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_inherit_emitter_scale"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_INHERIT_EMITTER_SCALE);
 	ADD_GROUP("Spawn", "");
 	ADD_SUBGROUP("Position", "");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_shape_offset"), "set_emission_shape_offset", "get_emission_shape_offset");
@@ -2573,9 +2217,9 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "emission_shape", PROPERTY_HINT_ENUM, "Point,Sphere,Sphere Surface,Box,Points,Directed Points,Ring"), "set_emission_shape", "get_emission_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_sphere_radius", PROPERTY_HINT_RANGE, "0.01,128,0.01,or_greater"), "set_emission_sphere_radius", "get_emission_sphere_radius");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_box_extents"), "set_emission_box_extents", "get_emission_box_extents");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_point_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_emission_point_texture", "get_emission_point_texture");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_normal_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_emission_normal_texture", "get_emission_normal_texture");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_color_texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_emission_color_texture", "get_emission_color_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_point_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_emission_point_texture", "get_emission_point_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_normal_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_emission_normal_texture", "get_emission_normal_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_color_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_emission_color_texture", "get_emission_color_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "emission_point_count", PROPERTY_HINT_RANGE, "0,1000000,1"), "set_emission_point_count", "get_emission_point_count");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_ring_axis"), "set_emission_ring_axis", "get_emission_ring_axis");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_ring_height", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_emission_ring_height", "get_emission_ring_height");
@@ -2584,11 +2228,7 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_ring_cone_angle", PROPERTY_HINT_RANGE, "0,90,0.01,degrees"), "set_emission_ring_cone_angle", "get_emission_ring_cone_angle");
 	ADD_SUBGROUP("Angle", "");
 	ADD_MIN_MAX_PROPERTY("angle", "-720,720,0.1,or_less,or_greater,degrees", PARAM_ANGLE);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_ANGLE);
-	ADD_SUBGROUP("Rotation 3D", "");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_rotation_3d", PROPERTY_HINT_GROUP_ENABLE), "set_use_rotation_3d", "is_using_rotation_3d");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_3d_min"), "set_rotation_3d_min", "get_rotation_3d_min");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_3d_max"), "set_rotation_3d_max", "get_rotation_3d_max");
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANGLE);
 	ADD_SUBGROUP("Velocity", "");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "inherit_velocity_ratio", PROPERTY_HINT_RANGE, "0.0,1.0,0.001,or_less,or_greater"), "set_inherit_velocity_ratio", "get_inherit_velocity_ratio");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "velocity_pivot"), "set_velocity_pivot", "get_velocity_pivot");
@@ -2600,47 +2240,38 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_SUBGROUP("Velocity Limit", "");
 	ADD_SUBGROUP("Angular Velocity", "angular_");
 	ADD_MIN_MAX_PROPERTY("angular_velocity", "-720,720,0.01,or_less,or_greater", PARAM_ANGULAR_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_ANGULAR_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANGULAR_VELOCITY);
 	ADD_SUBGROUP("Directional Velocity", "directional_");
 	ADD_MIN_MAX_PROPERTY("directional_velocity", "-720,720,0.01,or_less,or_greater", PARAM_DIRECTIONAL_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "directional_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveXYZTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_DIRECTIONAL_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "directional_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_DIRECTIONAL_VELOCITY);
 	ADD_SUBGROUP("Orbit Velocity", "orbit_");
 	ADD_MIN_MAX_PROPERTY("orbit_velocity", "-2,2,0.001,or_less,or_greater", PARAM_ORBIT_VELOCITY);
 	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture,CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_ORBIT_VELOCITY);
 	ADD_SUBGROUP("Radial Velocity", "radial_");
 	ADD_MIN_MAX_PROPERTY("radial_velocity", "-1000,1000,0.01,or_less,or_greater", PARAM_RADIAL_VELOCITY);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_RADIAL_VELOCITY);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_RADIAL_VELOCITY);
 	ADD_SUBGROUP("Velocity Limit", "");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "velocity_limit_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_velocity_limit_curve", "get_velocity_limit_curve");
-	ADD_SUBGROUP("Rotation Velocity 3D", "");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_rotation_velocity_3d", PROPERTY_HINT_GROUP_ENABLE), "set_using_rotation_velocity_3d", "is_using_rotation_velocity_3d");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_velocity_3d_min"), "set_rotation_velocity_3d_min", "get_rotation_velocity_3d_min");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_velocity_3d_max"), "set_rotation_velocity_3d_max", "get_rotation_velocity_3d_max");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "rotation_velocity_3d_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveXYZTexture::get_class_static()), "set_rotation_velocity_3d_curve", "get_rotation_velocity_3d_curve");
-
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "velocity_limit_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_velocity_limit_curve", "get_velocity_limit_curve");
 	ADD_GROUP("Accelerations", "");
 	ADD_SUBGROUP("Gravity", "");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "gravity"), "set_gravity", "get_gravity");
 	ADD_SUBGROUP("Linear Accel", "linear_");
 	ADD_MIN_MAX_PROPERTY("linear_accel", "-100,100,0.01,or_less,or_greater", PARAM_LINEAR_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_LINEAR_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_LINEAR_ACCEL);
 	ADD_SUBGROUP("Radial Accel", "radial_");
 	ADD_MIN_MAX_PROPERTY("radial_accel", "-100,100,0.01,or_less,or_greater", PARAM_RADIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_RADIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_RADIAL_ACCEL);
 	ADD_SUBGROUP("Tangential Accel", "tangential_");
 	ADD_MIN_MAX_PROPERTY("tangential_accel", "-100,100,0.01,or_less,or_greater", PARAM_TANGENTIAL_ACCEL);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_TANGENTIAL_ACCEL);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_TANGENTIAL_ACCEL);
 	ADD_SUBGROUP("Damping", "");
 	ADD_MIN_MAX_PROPERTY("damping", "0,100,0.001,or_greater", PARAM_DAMPING);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_DAMPING);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_DAMPING);
 	ADD_SUBGROUP("Attractor Interaction", "attractor_interaction_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "attractor_interaction_enabled"), "set_attractor_interaction_enabled", "is_attractor_interaction_enabled");
 
 	ADD_GROUP("Display", "");
 	ADD_SUBGROUP("Scale", "");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_scale_3d"), "set_use_scale_3d", "is_using_scale_3d");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "scale_3d_min", PROPERTY_HINT_LINK, ""), "set_scale_3d_min", "get_scale_3d_min");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "scale_3d_max", PROPERTY_HINT_LINK, ""), "set_scale_3d_max", "get_scale_3d_max");
 	ADD_MIN_MAX_PROPERTY("scale", "0,1000,0.01,or_greater", PARAM_SCALE);
 	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture,CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_SCALE);
 	ADD_SUBGROUP("Scale Over Velocity", "");
@@ -2651,16 +2282,16 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "GradientTexture1D"), "set_color_ramp", "get_color_ramp");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, "GradientTexture1D"), "set_color_initial_ramp", "get_color_initial_ramp");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "alpha_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_alpha_curve", "get_alpha_curve");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_emission_curve", "get_emission_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "alpha_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_alpha_curve", "get_alpha_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_emission_curve", "get_emission_curve");
 	ADD_SUBGROUP("Hue Variation", "hue_");
 	ADD_MIN_MAX_PROPERTY("hue_variation", "-1,1,0.01", PARAM_HUE_VARIATION);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_HUE_VARIATION);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_HUE_VARIATION);
 	ADD_SUBGROUP("Animation", "anim_");
 	ADD_MIN_MAX_PROPERTY("anim_speed", "0,16,0.01,or_less,or_greater", PARAM_ANIM_SPEED);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_ANIM_SPEED);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_SPEED);
 	ADD_MIN_MAX_PROPERTY("anim_offset", "0,1,0.0001", PARAM_ANIM_OFFSET);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_ANIM_OFFSET);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_OFFSET);
 
 	ADD_GROUP("Turbulence", "turbulence_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "turbulence_enabled", PROPERTY_HINT_GROUP_ENABLE), "set_turbulence_enabled", "get_turbulence_enabled");
@@ -2670,7 +2301,7 @@ void ParticleProcessMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "turbulence_noise_speed_random", PROPERTY_HINT_RANGE, "0,4,0.01"), "set_turbulence_noise_speed_random", "get_turbulence_noise_speed_random");
 	ADD_MIN_MAX_PROPERTY("turbulence_influence", "0,1,0.001", PARAM_TURB_VEL_INFLUENCE);
 	ADD_MIN_MAX_PROPERTY("turbulence_initial_displacement", "-100,100,0.1", PARAM_TURB_INIT_DISPLACEMENT);
-	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "turbulence_influence_over_life", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_param_texture", "get_param_texture", PARAM_TURB_INFLUENCE_OVER_LIFE);
+	ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "turbulence_influence_over_life", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_TURB_INFLUENCE_OVER_LIFE);
 
 	ADD_GROUP("Collision", "collision_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mode", PROPERTY_HINT_ENUM, "Disabled,Rigid,Hide On Contact"), "set_collision_mode", "get_collision_mode");
@@ -2708,7 +2339,6 @@ void ParticleProcessMaterial::_bind_methods() {
 	BIND_ENUM_CONSTANT(PARTICLE_FLAG_ROTATE_Y);
 	BIND_ENUM_CONSTANT(PARTICLE_FLAG_DISABLE_Z);
 	BIND_ENUM_CONSTANT(PARTICLE_FLAG_DAMPING_AS_FRICTION);
-	BIND_ENUM_CONSTANT(PARTICLE_FLAG_INHERIT_EMITTER_SCALE);
 	BIND_ENUM_CONSTANT(PARTICLE_FLAG_MAX);
 
 	BIND_ENUM_CONSTANT(EMISSION_SHAPE_POINT);
@@ -2772,12 +2402,6 @@ ParticleProcessMaterial::ParticleProcessMaterial() :
 	set_param_max(PARAM_ANIM_OFFSET, 0);
 	set_param_min(PARAM_DIRECTIONAL_VELOCITY, 1.0);
 	set_param_max(PARAM_DIRECTIONAL_VELOCITY, 1.0);
-	set_use_scale_3d(false);
-	set_scale_3d_min(Vector3(1.0, 1.0, 1.0));
-	set_scale_3d_max(Vector3(1.0, 1.0, 1.0));
-	set_use_rotation_3d(false);
-	set_rotation_3d_min(Vector3(0.0, 0.0, 0.0));
-	set_rotation_3d_max(Vector3(0.0, 0.0, 0.0));
 	set_emission_shape(EMISSION_SHAPE_POINT);
 	set_emission_sphere_radius(1);
 	set_emission_box_extents(Vector3(1, 1, 1));
diff --git a/engine/scene/resources/particle_process_material.h b/engine/scene/resources/particle_process_material.h
index 1dc04f94..8c6549a9 100644
--- a/engine/scene/resources/particle_process_material.h
+++ b/engine/scene/resources/particle_process_material.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rb_set.h"
 #include "core/templates/rid.h"
 #include "core/templates/self_list.h"
 #include "scene/resources/curve_texture.h"
@@ -75,7 +74,6 @@ public:
 		PARTICLE_FLAG_ROTATE_Y,
 		PARTICLE_FLAG_DISABLE_Z,
 		PARTICLE_FLAG_DAMPING_AS_FRICTION,
-		PARTICLE_FLAG_INHERIT_EMITTER_SCALE,
 		PARTICLE_FLAG_MAX
 	};
 
@@ -129,10 +127,6 @@ private:
 		uint64_t emission_curve : 1;
 		uint64_t has_initial_ramp : 1;
 		uint64_t orbit_uses_curve_xyz : 1;
-		uint64_t use_scale_3d : 1;
-		uint64_t use_rotation_3d : 1;
-		uint64_t use_rotation_velocity_3d : 1;
-		uint64_t use_rotation_velocity_3d_curve : 1;
 
 		MaterialKey() {
 			memset(this, 0, sizeof(MaterialKey));
@@ -178,13 +172,6 @@ private:
 		mk.has_initial_ramp = color_initial_ramp.is_valid() ? 1 : 0;
 		CurveXYZTexture *texture = Object::cast_to<CurveXYZTexture>(tex_parameters[PARAM_ORBIT_VELOCITY].ptr());
 		mk.orbit_uses_curve_xyz = texture ? 1 : 0;
-		mk.use_scale_3d = use_scale_3d ? 1 : 0;
-		mk.use_rotation_3d = use_rotation_3d ? 1 : 0;
-		mk.use_rotation_velocity_3d = using_rotation_velocity_3d;
-		if (using_rotation_velocity_3d) {
-			texture = Object::cast_to<CurveXYZTexture>(rotation_velocity_3d_curve.ptr());
-			mk.use_rotation_velocity_3d_curve = texture ? 1 : 0;
-		}
 
 		for (int i = 0; i < PARAM_MAX; i++) {
 			if (tex_parameters[i].is_valid()) {
@@ -222,9 +209,6 @@ private:
 		StringName anim_speed_min;
 		StringName anim_offset_min;
 		StringName directional_velocity_min;
-		StringName scale_3d_min;
-		StringName rotation_3d_min;
-		StringName rotation_velocity_3d_min;
 
 		StringName initial_linear_velocity_max;
 		StringName initial_angle_max;
@@ -241,9 +225,6 @@ private:
 		StringName anim_speed_max;
 		StringName anim_offset_max;
 		StringName directional_velocity_max;
-		StringName scale_3d_max;
-		StringName rotation_3d_max;
-		StringName rotation_velocity_3d_max;
 
 		StringName angle_texture;
 		StringName angular_velocity_texture;
@@ -260,7 +241,6 @@ private:
 		StringName anim_offset_texture;
 		StringName velocity_limiter_texture;
 		StringName directional_velocity_texture;
-		StringName rotation_velocity_3d_curve;
 
 		StringName color;
 		StringName color_ramp;
@@ -366,17 +346,6 @@ private:
 	double lifetime_randomness = 0.0;
 	double inherit_emitter_velocity_ratio = 0.0;
 
-	bool use_rotation_3d = false;
-	bool use_scale_3d = false;
-	Vector3 scale_3d_min;
-	Vector3 scale_3d_max;
-	Vector3 rotation_3d_min;
-	Vector3 rotation_3d_max;
-	bool using_rotation_velocity_3d = false;
-	Vector3 rotation_velocity_3d_min;
-	Vector3 rotation_velocity_3d_max;
-	Ref<Texture2D> rotation_velocity_3d_curve;
-
 	SubEmitterMode sub_emitter_mode;
 	double sub_emitter_frequency = 0.0;
 	int sub_emitter_amount_at_end = 0;
@@ -439,24 +408,6 @@ public:
 	void set_emission_curve(const Ref<Texture2D> &p_texture);
 	Ref<Texture2D> get_emission_curve() const;
 
-	void set_use_scale_3d(const bool p_use_scale_3d);
-	bool is_using_scale_3d() const;
-
-	void set_scale_3d_min(const Vector3 &p_scale_3d_min);
-	Vector3 get_scale_3d_min() const;
-
-	void set_scale_3d_max(const Vector3 &p_scale_3d_max);
-	Vector3 get_scale_3d_max() const;
-
-	void set_use_rotation_3d(const bool p_use_scale_3d);
-	bool is_using_rotation_3d() const;
-
-	void set_rotation_3d_min(const Vector3 &p_rotation_3d_min);
-	Vector3 get_rotation_3d_min() const;
-
-	void set_rotation_3d_max(const Vector3 &p_rotation_3d_max);
-	Vector3 get_rotation_3d_max() const;
-
 	void set_particle_flag(ParticleFlags p_particle_flag, bool p_enable);
 	bool get_particle_flag(ParticleFlags p_particle_flag) const;
 
@@ -507,15 +458,6 @@ public:
 	void set_inherit_velocity_ratio(double p_ratio);
 	double get_inherit_velocity_ratio();
 
-	void set_use_rotation_velocity_3d(bool p_use_rotation_velocity_3d);
-	bool is_using_rotation_velocity_3d() const;
-	void set_rotation_velocity_3d_min(const Vector3 &p_rotation_velocity_3d_min);
-	Vector3 get_rotation_velocity_3d_min() const;
-	void set_rotation_velocity_3d_max(const Vector3 &p_rotation_velocity_3d_max);
-	Vector3 get_rotation_velocity_3d_max() const;
-	void set_rotation_velocity_3d_curve(const Ref<Texture2D> &p_texture);
-	Ref<Texture2D> get_rotation_velocity_3d_curve() const;
-
 	void set_attractor_interaction_enabled(bool p_enable);
 	bool is_attractor_interaction_enabled() const;
 
diff --git a/engine/scene/resources/physics_material.cpp b/engine/scene/resources/physics_material.cpp
index 658a4d97..cd762a58 100644
--- a/engine/scene/resources/physics_material.cpp
+++ b/engine/scene/resources/physics_material.cpp
@@ -31,9 +31,6 @@
 #include "physics_material.h"
 
 #if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
-
-#include "core/object/class_db.h"
-
 void PhysicsMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicsMaterial::set_friction);
 	ClassDB::bind_method(D_METHOD("get_friction"), &PhysicsMaterial::get_friction);
diff --git a/engine/scene/resources/placeholder_textures.cpp b/engine/scene/resources/placeholder_textures.cpp
index 54b7195f..159e923b 100644
--- a/engine/scene/resources/placeholder_textures.cpp
+++ b/engine/scene/resources/placeholder_textures.cpp
@@ -30,7 +30,6 @@
 
 #include "placeholder_textures.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void PlaceholderTexture2D::set_size(Size2 p_size) {
@@ -179,7 +178,7 @@ Ref<Image> PlaceholderTextureLayered::get_layer_data(int p_layer) const {
 
 RID PlaceholderTextureLayered::get_rid() const {
 	if (rid.is_null()) {
-		rid = RS::get_singleton()->texture_2d_layered_placeholder_create(RSE::TextureLayeredType(layered_type));
+		rid = RS::get_singleton()->texture_2d_layered_placeholder_create(RS::TextureLayeredType(layered_type));
 	}
 	return rid;
 }
diff --git a/engine/scene/resources/portable_compressed_texture.cpp b/engine/scene/resources/portable_compressed_texture.cpp
index 04eee9a0..e354e168 100644
--- a/engine/scene/resources/portable_compressed_texture.cpp
+++ b/engine/scene/resources/portable_compressed_texture.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
 #include "servers/rendering/rendering_server.h"
 
@@ -369,6 +368,7 @@ void PortableCompressedTexture2D::set_basisu_compressor_params(int p_uastc_level
 
 void PortableCompressedTexture2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_from_image", "image", "compression_mode", "normal_map", "lossy_quality"), &PortableCompressedTexture2D::create_from_image, DEFVAL(false), DEFVAL(0.8));
+	ClassDB::bind_method(D_METHOD("get_format"), &PortableCompressedTexture2D::get_format);
 	ClassDB::bind_method(D_METHOD("get_compression_mode"), &PortableCompressedTexture2D::get_compression_mode);
 
 	ClassDB::bind_method(D_METHOD("set_size_override", "size"), &PortableCompressedTexture2D::set_size_override);
diff --git a/engine/scene/resources/portable_compressed_texture.h b/engine/scene/resources/portable_compressed_texture.h
index 9f1d5c08..af4e192b 100644
--- a/engine/scene/resources/portable_compressed_texture.h
+++ b/engine/scene/resources/portable_compressed_texture.h
@@ -83,7 +83,7 @@ public:
 	CompressionMode get_compression_mode() const;
 	void create_from_image(const Ref<Image> &p_image, CompressionMode p_compression_mode, bool p_normal_map = false, float p_lossy_quality = 0.8);
 
-	virtual Image::Format get_format() const override;
+	Image::Format get_format() const;
 
 	void update(const Ref<Image> &p_image);
 	Ref<Image> get_image() const override;
diff --git a/engine/scene/resources/resource_format_text.cpp b/engine/scene/resources/resource_format_text.cpp
index f9857c24..95dd7f63 100644
--- a/engine/scene/resources/resource_format_text.cpp
+++ b/engine/scene/resources/resource_format_text.cpp
@@ -33,7 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/missing_resource.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "scene/property_utils.h"
 
@@ -583,7 +582,7 @@ Error ResourceLoaderText::load() {
 			}
 		}
 
-		Ref<MissingResource> missing_resource;
+		MissingResource *missing_resource = nullptr;
 
 		if (res.is_null()) { //not reuse
 			Ref<Resource> cache = ResourceCache::get_ref(path);
@@ -599,7 +598,7 @@ Error ResourceLoaderText::load() {
 						missing_resource = memnew(MissingResource);
 						missing_resource->set_original_class(type);
 						missing_resource->set_recording_properties(true);
-						obj = missing_resource.ptr();
+						obj = missing_resource;
 					} else {
 						error_text = vformat("Can't create sub resource of type '%s'", type);
 						_printerr();
@@ -654,7 +653,7 @@ Error ResourceLoaderText::load() {
 				if (do_assign) {
 					bool set_valid = true;
 
-					if (value.get_type() == Variant::OBJECT && missing_resource.is_null() && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
+					if (value.get_type() == Variant::OBJECT && missing_resource == nullptr && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
 						// If the property being set is a missing resource (and the parent is not),
 						// then setting it will most likely not work.
 						// Instead, save it as metadata.
@@ -707,7 +706,7 @@ Error ResourceLoaderText::load() {
 			}
 		}
 
-		if (missing_resource.is_valid()) {
+		if (missing_resource) {
 			missing_resource->set_recording_properties(false);
 		}
 
@@ -728,7 +727,7 @@ Error ResourceLoaderText::load() {
 			return error;
 		}
 
-		Ref<MissingResource> missing_resource;
+		MissingResource *missing_resource = nullptr;
 
 		resource = ResourceLoader::get_resource_ref_override(local_path);
 		if (resource.is_null()) {
@@ -745,7 +744,7 @@ Error ResourceLoaderText::load() {
 						missing_resource = memnew(MissingResource);
 						missing_resource->set_original_class(res_type);
 						missing_resource->set_recording_properties(true);
-						obj = missing_resource.ptr();
+						obj = missing_resource;
 					} else {
 						error_text = vformat("Can't create sub resource of type '%s'", res_type);
 						_printerr();
@@ -795,7 +794,7 @@ Error ResourceLoaderText::load() {
 			if (!assign.is_empty()) {
 				bool set_valid = true;
 
-				if (value.get_type() == Variant::OBJECT && missing_resource.is_null() && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
+				if (value.get_type() == Variant::OBJECT && missing_resource == nullptr && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
 					// If the property being set is a missing resource (and the parent is not),
 					// then setting it will most likely not work.
 					// Instead, save it as metadata.
@@ -852,7 +851,7 @@ Error ResourceLoaderText::load() {
 			*progress = resource_current / float(resources_total);
 		}
 
-		if (missing_resource.is_valid()) {
+		if (missing_resource) {
 			missing_resource->set_recording_properties(false);
 		}
 
diff --git a/engine/scene/resources/shader.compat.inc b/engine/scene/resources/shader.compat.inc
index 06f34d68..b6802060 100644
--- a/engine/scene/resources/shader.compat.inc
+++ b/engine/scene/resources/shader.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "shader.h"
-
-#include "core/object/class_db.h"
-
 void Shader::_set_default_texture_parameter_bind_compat_95126(const StringName &p_name, const Ref<Texture2D> &p_texture, int p_index) {
 	set_default_texture_parameter(p_name, p_texture, p_index);
 }
diff --git a/engine/scene/resources/shader.cpp b/engine/scene/resources/shader.cpp
index 2b8c1300..0e8b41fd 100644
--- a/engine/scene/resources/shader.cpp
+++ b/engine/scene/resources/shader.cpp
@@ -31,14 +31,12 @@
 #include "shader.h"
 #include "shader.compat.inc"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/io/file_access.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/texture.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/shader_preprocessor.h"
+#include "texture.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/doc/editor_help.h"
@@ -120,8 +118,6 @@ void Shader::set_code(const String &p_code) {
 		mode = MODE_SKY;
 	} else if (type == "fog") {
 		mode = MODE_FOG;
-	} else if (type == "texture_blit") {
-		mode = MODE_TEXTURE_BLIT;
 	} else {
 		mode = MODE_SPATIAL;
 	}
@@ -294,7 +290,6 @@ void Shader::_bind_methods() {
 	BIND_ENUM_CONSTANT(MODE_PARTICLES);
 	BIND_ENUM_CONSTANT(MODE_SKY);
 	BIND_ENUM_CONSTANT(MODE_FOG);
-	BIND_ENUM_CONSTANT(MODE_TEXTURE_BLIT);
 }
 
 Shader::Shader() {
@@ -307,3 +302,79 @@ Shader::~Shader() {
 		RenderingServer::get_singleton()->free_rid(shader_rid);
 	}
 }
+
+////////////
+
+Ref<Resource> ResourceFormatLoaderShader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	if (r_error) {
+		*r_error = ERR_FILE_CANT_OPEN;
+	}
+
+	Error error = OK;
+	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes(p_path, &error);
+	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader: " + p_path);
+
+	String str;
+	if (buffer.size() > 0) {
+		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
+		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader: " + p_path);
+	}
+
+	Ref<Shader> shader;
+	shader.instantiate();
+
+	shader->set_include_path(p_path);
+	shader->set_code(str);
+
+	if (r_error) {
+		*r_error = OK;
+	}
+
+	return shader;
+}
+
+void ResourceFormatLoaderShader::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("gdshader");
+}
+
+bool ResourceFormatLoaderShader::handles_type(const String &p_type) const {
+	return (p_type == "Shader");
+}
+
+String ResourceFormatLoaderShader::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("gdshader")) {
+		return "Shader";
+	}
+	return "";
+}
+
+Error ResourceFormatSaverShader::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Ref<Shader> shader = p_resource;
+	ERR_FAIL_COND_V(shader.is_null(), ERR_INVALID_PARAMETER);
+
+	String source = shader->get_code();
+
+	Error err;
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
+
+	ERR_FAIL_COND_V_MSG(err, err, "Cannot save shader '" + p_path + "'.");
+
+	file->store_string(source);
+	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
+		return ERR_CANT_CREATE;
+	}
+
+	return OK;
+}
+
+void ResourceFormatSaverShader::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	if (const Shader *shader = Object::cast_to<Shader>(*p_resource)) {
+		if (shader->is_text_shader()) {
+			p_extensions->push_back("gdshader");
+		}
+	}
+}
+
+bool ResourceFormatSaverShader::recognize(const Ref<Resource> &p_resource) const {
+	return p_resource->get_class_name() == "Shader"; //only shader, not inherited
+}
diff --git a/engine/scene/resources/shader.h b/engine/scene/resources/shader.h
index 6fb78656..b7e6c81b 100644
--- a/engine/scene/resources/shader.h
+++ b/engine/scene/resources/shader.h
@@ -31,10 +31,10 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "scene/resources/shader_include.h"
-
-class Texture;
-class Texture2D;
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
+#include "scene/resources/texture.h"
+#include "shader_include.h"
 
 class Shader : public Resource {
 	GDCLASS(Shader, Resource);
@@ -48,7 +48,6 @@ public:
 		MODE_PARTICLES,
 		MODE_SKY,
 		MODE_FOG,
-		MODE_TEXTURE_BLIT,
 		MODE_MAX
 	};
 
@@ -106,3 +105,22 @@ public:
 };
 
 VARIANT_ENUM_CAST(Shader::Mode);
+
+class ResourceFormatLoaderShader : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderShader, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
+
+class ResourceFormatSaverShader : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverShader, ResourceFormatSaver);
+
+public:
+	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	virtual bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/scene/resources/shader_include.cpp b/engine/scene/resources/shader_include.cpp
index 9476fd0c..a051683b 100644
--- a/engine/scene/resources/shader_include.cpp
+++ b/engine/scene/resources/shader_include.cpp
@@ -30,8 +30,7 @@
 
 #include "shader_include.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
+#include "core/io/file_access.h"
 #include "servers/rendering/shader_preprocessor.h"
 
 void ShaderInclude::_dependency_changed() {
@@ -82,3 +81,80 @@ void ShaderInclude::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_code", "get_code");
 }
+
+// ResourceFormatLoaderShaderInclude
+
+Ref<Resource> ResourceFormatLoaderShaderInclude::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	if (r_error) {
+		*r_error = ERR_FILE_CANT_OPEN;
+	}
+
+	Error error = OK;
+	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes(p_path, &error);
+	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader include: " + p_path);
+
+	String str;
+	if (buffer.size() > 0) {
+		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
+		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader include: " + p_path);
+	}
+
+	Ref<ShaderInclude> shader_inc;
+	shader_inc.instantiate();
+
+	shader_inc->set_include_path(p_path);
+	shader_inc->set_code(str);
+
+	if (r_error) {
+		*r_error = OK;
+	}
+
+	return shader_inc;
+}
+
+void ResourceFormatLoaderShaderInclude::get_recognized_extensions(List<String> *p_extensions) const {
+	p_extensions->push_back("gdshaderinc");
+}
+
+bool ResourceFormatLoaderShaderInclude::handles_type(const String &p_type) const {
+	return (p_type == "ShaderInclude");
+}
+
+String ResourceFormatLoaderShaderInclude::get_resource_type(const String &p_path) const {
+	if (p_path.has_extension("gdshaderinc")) {
+		return "ShaderInclude";
+	}
+	return "";
+}
+
+// ResourceFormatSaverShaderInclude
+
+Error ResourceFormatSaverShaderInclude::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
+	Ref<ShaderInclude> shader_inc = p_resource;
+	ERR_FAIL_COND_V(shader_inc.is_null(), ERR_INVALID_PARAMETER);
+
+	String source = shader_inc->get_code();
+
+	Error error;
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &error);
+
+	ERR_FAIL_COND_V_MSG(error, error, "Cannot save shader include '" + p_path + "'.");
+
+	file->store_string(source);
+	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
+		return ERR_CANT_CREATE;
+	}
+
+	return OK;
+}
+
+void ResourceFormatSaverShaderInclude::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
+	const ShaderInclude *shader_inc = Object::cast_to<ShaderInclude>(*p_resource);
+	if (shader_inc != nullptr) {
+		p_extensions->push_back("gdshaderinc");
+	}
+}
+
+bool ResourceFormatSaverShaderInclude::recognize(const Ref<Resource> &p_resource) const {
+	return p_resource->get_class_name() == "ShaderInclude"; //only shader, not inherited
+}
diff --git a/engine/scene/resources/shader_include.h b/engine/scene/resources/shader_include.h
index f4ceb8ba..0930f5b4 100644
--- a/engine/scene/resources/shader_include.h
+++ b/engine/scene/resources/shader_include.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
 #include "core/templates/hash_set.h"
 
 class ShaderInclude : public Resource {
@@ -52,3 +54,22 @@ public:
 
 	void set_include_path(const String &p_path);
 };
+
+class ResourceFormatLoaderShaderInclude : public ResourceFormatLoader {
+	GDSOFTCLASS(ResourceFormatLoaderShaderInclude, ResourceFormatLoader);
+
+public:
+	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual bool handles_type(const String &p_type) const override;
+	virtual String get_resource_type(const String &p_path) const override;
+};
+
+class ResourceFormatSaverShaderInclude : public ResourceFormatSaver {
+	GDSOFTCLASS(ResourceFormatSaverShaderInclude, ResourceFormatSaver);
+
+public:
+	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
+	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
+	virtual bool recognize(const Ref<Resource> &p_resource) const override;
+};
diff --git a/engine/scene/resources/shader_include_resource_format.cpp b/engine/scene/resources/shader_include_resource_format.cpp
deleted file mode 100644
index a74e0106..00000000
--- a/engine/scene/resources/shader_include_resource_format.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/**************************************************************************/
-/*  shader_include_resource_format.cpp                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "shader_include_resource_format.h"
-
-#include "core/io/file_access.h"
-#include "scene/resources/shader_include.h"
-
-// ResourceFormatLoaderShaderInclude
-
-Ref<Resource> ResourceFormatLoaderShaderInclude::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	Error error = OK;
-	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes(p_path, &error);
-	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader include: " + p_path);
-
-	String str;
-	if (buffer.size() > 0) {
-		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
-		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader include: " + p_path);
-	}
-
-	Ref<ShaderInclude> shader_inc;
-	shader_inc.instantiate();
-
-	shader_inc->set_include_path(p_path);
-	shader_inc->set_code(str);
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return shader_inc;
-}
-
-void ResourceFormatLoaderShaderInclude::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("gdshaderinc");
-}
-
-bool ResourceFormatLoaderShaderInclude::handles_type(const String &p_type) const {
-	return (p_type == "ShaderInclude");
-}
-
-String ResourceFormatLoaderShaderInclude::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("gdshaderinc")) {
-		return "ShaderInclude";
-	}
-	return "";
-}
-
-// ResourceFormatSaverShaderInclude
-
-Error ResourceFormatSaverShaderInclude::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Ref<ShaderInclude> shader_inc = p_resource;
-	ERR_FAIL_COND_V(shader_inc.is_null(), ERR_INVALID_PARAMETER);
-
-	String source = shader_inc->get_code();
-
-	Error error;
-	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &error);
-
-	ERR_FAIL_COND_V_MSG(error, error, "Cannot save shader include '" + p_path + "'.");
-
-	file->store_string(source);
-	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
-		return ERR_CANT_CREATE;
-	}
-
-	return OK;
-}
-
-void ResourceFormatSaverShaderInclude::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	const ShaderInclude *shader_inc = Object::cast_to<ShaderInclude>(*p_resource);
-	if (shader_inc != nullptr) {
-		p_extensions->push_back("gdshaderinc");
-	}
-}
-
-bool ResourceFormatSaverShaderInclude::recognize(const Ref<Resource> &p_resource) const {
-	return p_resource->get_class_name() == "ShaderInclude"; //only shader, not inherited
-}
diff --git a/engine/scene/resources/shader_include_resource_format.h b/engine/scene/resources/shader_include_resource_format.h
deleted file mode 100644
index 080049e1..00000000
--- a/engine/scene/resources/shader_include_resource_format.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/
-/*  shader_include_resource_format.h                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-
-class ResourceFormatLoaderShaderInclude : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderShaderInclude, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
-
-class ResourceFormatSaverShaderInclude : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverShaderInclude, ResourceFormatSaver);
-
-public:
-	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	virtual bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/scene/resources/shader_resource_format.cpp b/engine/scene/resources/shader_resource_format.cpp
deleted file mode 100644
index 9f2510bb..00000000
--- a/engine/scene/resources/shader_resource_format.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************/
-/*  shader_resource_format.cpp                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "shader_resource_format.h"
-
-#include "core/io/file_access.h"
-#include "scene/resources/shader.h"
-
-Ref<Resource> ResourceFormatLoaderShader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
-	if (r_error) {
-		*r_error = ERR_FILE_CANT_OPEN;
-	}
-
-	Error error = OK;
-	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes(p_path, &error);
-	ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot load shader: " + p_path);
-
-	String str;
-	if (buffer.size() > 0) {
-		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
-		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader: " + p_path);
-	}
-
-	Ref<Shader> shader;
-	shader.instantiate();
-
-	shader->set_include_path(p_path);
-	shader->set_code(str);
-
-	if (r_error) {
-		*r_error = OK;
-	}
-
-	return shader;
-}
-
-void ResourceFormatLoaderShader::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("gdshader");
-}
-
-bool ResourceFormatLoaderShader::handles_type(const String &p_type) const {
-	return (p_type == "Shader");
-}
-
-String ResourceFormatLoaderShader::get_resource_type(const String &p_path) const {
-	if (p_path.has_extension("gdshader")) {
-		return "Shader";
-	}
-	return "";
-}
-
-Error ResourceFormatSaverShader::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
-	Ref<Shader> shader = p_resource;
-	ERR_FAIL_COND_V(shader.is_null(), ERR_INVALID_PARAMETER);
-
-	String source = shader->get_code();
-
-	Error err;
-	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE, &err);
-
-	ERR_FAIL_COND_V_MSG(err, err, "Cannot save shader '" + p_path + "'.");
-
-	file->store_string(source);
-	if (file->get_error() != OK && file->get_error() != ERR_FILE_EOF) {
-		return ERR_CANT_CREATE;
-	}
-
-	return OK;
-}
-
-void ResourceFormatSaverShader::get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const {
-	if (const Shader *shader = Object::cast_to<Shader>(*p_resource)) {
-		if (shader->is_text_shader()) {
-			p_extensions->push_back("gdshader");
-		}
-	}
-}
-
-bool ResourceFormatSaverShader::recognize(const Ref<Resource> &p_resource) const {
-	return p_resource->get_class_name() == "Shader"; //only shader, not inherited
-}
diff --git a/engine/scene/resources/shader_resource_format.h b/engine/scene/resources/shader_resource_format.h
deleted file mode 100644
index b6fea34d..00000000
--- a/engine/scene/resources/shader_resource_format.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/
-/*  shader_resource_format.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-
-class ResourceFormatLoaderShader : public ResourceFormatLoader {
-	GDSOFTCLASS(ResourceFormatLoaderShader, ResourceFormatLoader);
-
-public:
-	virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
-	virtual bool handles_type(const String &p_type) const override;
-	virtual String get_resource_type(const String &p_path) const override;
-};
-
-class ResourceFormatSaverShader : public ResourceFormatSaver {
-	GDSOFTCLASS(ResourceFormatSaverShader, ResourceFormatSaver);
-
-public:
-	virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
-	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
-	virtual bool recognize(const Ref<Resource> &p_resource) const override;
-};
diff --git a/engine/scene/resources/skeleton_profile.cpp b/engine/scene/resources/skeleton_profile.cpp
index f08b53c5..92b8f817 100644
--- a/engine/scene/resources/skeleton_profile.cpp
+++ b/engine/scene/resources/skeleton_profile.cpp
@@ -31,7 +31,6 @@
 #include "skeleton_profile.h"
 
 #include "core/config/engine.h"
-#include "core/object/class_db.h"
 
 bool SkeletonProfile::_set(const StringName &p_path, const Variant &p_value) {
 	ERR_FAIL_COND_V(is_read_only, false);
@@ -166,7 +165,7 @@ void SkeletonProfile::_get_property_list(List<PropertyInfo> *p_list) const {
 	for (int i = 0; i < groups.size(); i++) {
 		String path = "groups/" + itos(i) + "/";
 		p_list->push_back(PropertyInfo(Variant::STRING_NAME, path + "group_name"));
-		p_list->push_back(PropertyInfo(Variant::OBJECT, path + "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()));
+		p_list->push_back(PropertyInfo(Variant::OBJECT, path + "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"));
 		if (i > 0) {
 			group_names = group_names + ",";
 		}
diff --git a/engine/scene/resources/skeleton_profile.h b/engine/scene/resources/skeleton_profile.h
index 2e4d394b..a5689d19 100644
--- a/engine/scene/resources/skeleton_profile.h
+++ b/engine/scene/resources/skeleton_profile.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/resources/texture.h"
+#include "texture.h"
 
 class SkeletonProfile : public Resource {
 	GDCLASS(SkeletonProfile, Resource);
diff --git a/engine/scene/resources/sky.cpp b/engine/scene/resources/sky.cpp
index b45d82ec..38c3ee1e 100644
--- a/engine/scene/resources/sky.cpp
+++ b/engine/scene/resources/sky.cpp
@@ -30,9 +30,6 @@
 
 #include "sky.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
-
 void Sky::set_radiance_size(RadianceSize p_size) {
 	ERR_FAIL_INDEX(p_size, RADIANCE_SIZE_MAX);
 
@@ -49,7 +46,7 @@ Sky::RadianceSize Sky::get_radiance_size() const {
 
 void Sky::set_process_mode(ProcessMode p_mode) {
 	mode = p_mode;
-	RS::get_singleton()->sky_set_mode(sky, RSE::SkyMode(mode));
+	RS::get_singleton()->sky_set_mode(sky, RS::SkyMode(mode));
 }
 
 Sky::ProcessMode Sky::get_process_mode() const {
diff --git a/engine/scene/resources/sprite_frames.cpp b/engine/scene/resources/sprite_frames.cpp
index c327a431..094394f6 100644
--- a/engine/scene/resources/sprite_frames.cpp
+++ b/engine/scene/resources/sprite_frames.cpp
@@ -30,7 +30,6 @@
 
 #include "sprite_frames.h"
 
-#include "core/object/class_db.h"
 #include "scene/scene_string_names.h"
 
 void SpriteFrames::add_frame(const StringName &p_anim, const Ref<Texture2D> &p_texture, float p_duration, int p_at_pos) {
diff --git a/engine/scene/resources/style_box.cpp b/engine/scene/resources/style_box.cpp
index 4c939702..1203c21a 100644
--- a/engine/scene/resources/style_box.cpp
+++ b/engine/scene/resources/style_box.cpp
@@ -30,7 +30,6 @@
 
 #include "style_box.h"
 
-#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 
 Size2 StyleBox::get_minimum_size() const {
diff --git a/engine/scene/resources/style_box.h b/engine/scene/resources/style_box.h
index 9dc57d1e..79796f0c 100644
--- a/engine/scene/resources/style_box.h
+++ b/engine/scene/resources/style_box.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 class CanvasItem;
 
diff --git a/engine/scene/resources/style_box_flat.cpp b/engine/scene/resources/style_box_flat.cpp
index 24d784d9..9637f9d7 100644
--- a/engine/scene/resources/style_box_flat.cpp
+++ b/engine/scene/resources/style_box_flat.cpp
@@ -30,12 +30,9 @@
 
 #include "style_box_flat.h"
 
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
+#include "scene/main/canvas_item.h"
+#include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"
-#include "servers/text/text_server.h"
-
-#include <cfloat> // FLT_EPSILON
 
 float StyleBoxFlat::get_style_margin(Side p_side) const {
 	ERR_FAIL_INDEX_V((int)p_side, 4, 0.0);
diff --git a/engine/scene/resources/style_box_line.cpp b/engine/scene/resources/style_box_line.cpp
index 928e941b..77726d62 100644
--- a/engine/scene/resources/style_box_line.cpp
+++ b/engine/scene/resources/style_box_line.cpp
@@ -30,7 +30,6 @@
 
 #include "style_box_line.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 float StyleBoxLine::get_style_margin(Side p_side) const {
diff --git a/engine/scene/resources/style_box_texture.cpp b/engine/scene/resources/style_box_texture.cpp
index 1358483b..97804447 100644
--- a/engine/scene/resources/style_box_texture.cpp
+++ b/engine/scene/resources/style_box_texture.cpp
@@ -30,7 +30,6 @@
 
 #include "style_box_texture.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 float StyleBoxTexture::get_style_margin(Side p_side) const {
@@ -181,7 +180,7 @@ void StyleBoxTexture::draw(RID p_canvas_item, const Rect2 &p_rect) const {
 	Vector2 start_offset = Vector2(texture_margin[SIDE_LEFT], texture_margin[SIDE_TOP]);
 	Vector2 end_offset = Vector2(texture_margin[SIDE_RIGHT], texture_margin[SIDE_BOTTOM]);
 
-	RenderingServer::get_singleton()->canvas_item_add_nine_patch(p_canvas_item, rect, src_rect, texture->get_scaled_rid(), start_offset, end_offset, RSE::NinePatchAxisMode(axis_h), RSE::NinePatchAxisMode(axis_v), draw_center, modulate);
+	RenderingServer::get_singleton()->canvas_item_add_nine_patch(p_canvas_item, rect, src_rect, texture->get_scaled_rid(), start_offset, end_offset, RS::NinePatchAxisMode(axis_h), RS::NinePatchAxisMode(axis_v), draw_center, modulate);
 }
 
 void StyleBoxTexture::_bind_methods() {
@@ -211,7 +210,7 @@ void StyleBoxTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_v_axis_stretch_mode", "mode"), &StyleBoxTexture::set_v_axis_stretch_mode);
 	ClassDB::bind_method(D_METHOD("get_v_axis_stretch_mode"), &StyleBoxTexture::get_v_axis_stretch_mode);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 
 	ADD_GROUP("Texture Margins", "texture_margin_");
 	ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "texture_margin_left", PROPERTY_HINT_RANGE, "0,2048,1,suffix:px"), "set_texture_margin", "get_texture_margin", SIDE_LEFT);
diff --git a/engine/scene/resources/surface_tool.cpp b/engine/scene/resources/surface_tool.cpp
index 0f34b2fc..4b545692 100644
--- a/engine/scene/resources/surface_tool.cpp
+++ b/engine/scene/resources/surface_tool.cpp
@@ -30,7 +30,6 @@
 
 #include "surface_tool.h"
 
-#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 
 #define EQ_VERTEX_DIST 0.00001
@@ -124,7 +123,7 @@ bool SurfaceTool::Vertex::operator==(const Vertex &p_vertex) const {
 		}
 	}
 
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 		if (custom[i] != p_vertex.custom[i]) {
 			return false;
 		}
@@ -239,7 +238,7 @@ void SurfaceTool::add_vertex(const Vector3 &p_vertex) {
 	vtx.binormal = last_normal.cross(last_tangent.normal).normalized() * last_tangent.d;
 	vtx.smooth_group = last_smooth_group;
 
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 		vtx.custom[i] = last_custom[i];
 	}
 
@@ -337,10 +336,10 @@ void SurfaceTool::set_uv2(const Vector2 &p_uv2) {
 }
 
 void SurfaceTool::set_custom(int p_channel_index, const Color &p_custom) {
-	ERR_FAIL_INDEX(p_channel_index, RSE::ARRAY_CUSTOM_COUNT);
+	ERR_FAIL_INDEX(p_channel_index, RS::ARRAY_CUSTOM_COUNT);
 	ERR_FAIL_COND(!begun);
 	ERR_FAIL_COND(last_custom_format[p_channel_index] == CUSTOM_MAX);
-	static const uint32_t mask[RSE::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0, Mesh::ARRAY_FORMAT_CUSTOM1, Mesh::ARRAY_FORMAT_CUSTOM2, Mesh::ARRAY_FORMAT_CUSTOM3 };
+	static const uint32_t mask[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0, Mesh::ARRAY_FORMAT_CUSTOM1, Mesh::ARRAY_FORMAT_CUSTOM2, Mesh::ARRAY_FORMAT_CUSTOM3 };
 	ERR_FAIL_COND(!first && !(format & mask[p_channel_index]));
 
 	if (first) {
@@ -384,19 +383,19 @@ void SurfaceTool::add_triangle_fan(const Vector<Vector3> &p_vertices, const Vect
 	ERR_FAIL_COND(primitive != Mesh::PRIMITIVE_TRIANGLES);
 	ERR_FAIL_COND(p_vertices.size() < 3);
 
-#define ADD_POINT(n) \
-	{ \
-		if (p_colors.size() > n) \
-			set_color(p_colors[n]); \
-		if (p_uvs.size() > n) \
-			set_uv(p_uvs[n]); \
-		if (p_uv2s.size() > n) \
-			set_uv2(p_uv2s[n]); \
-		if (p_normals.size() > n) \
-			set_normal(p_normals[n]); \
-		if (p_tangents.size() > n) \
+#define ADD_POINT(n)                    \
+	{                                   \
+		if (p_colors.size() > n)        \
+			set_color(p_colors[n]);     \
+		if (p_uvs.size() > n)           \
+			set_uv(p_uvs[n]);           \
+		if (p_uv2s.size() > n)          \
+			set_uv2(p_uv2s[n]);         \
+		if (p_normals.size() > n)       \
+			set_normal(p_normals[n]);   \
+		if (p_tangents.size() > n)      \
 			set_tangent(p_tangents[n]); \
-		add_vertex(p_vertices[n]); \
+		add_vertex(p_vertices[n]);      \
 	}
 
 	for (int i = 0; i < p_vertices.size() - 2; i++) {
@@ -728,9 +727,9 @@ Ref<ArrayMesh> SurfaceTool::commit(const Ref<ArrayMesh> &p_existing, uint64_t p_
 
 	Array a = commit_to_arrays();
 
-	uint64_t compress_flags = (p_compress_flags >> RSE::ARRAY_COMPRESS_FLAGS_BASE) << RSE::ARRAY_COMPRESS_FLAGS_BASE;
-	static const uint64_t shift[RSE::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+	uint64_t compress_flags = (p_compress_flags >> RS::ARRAY_COMPRESS_FLAGS_BASE) << RS::ARRAY_COMPRESS_FLAGS_BASE;
+	static const uint64_t shift[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 		if (last_custom_format[i] != CUSTOM_MAX) {
 			compress_flags |= uint64_t(last_custom_format[i]) << shift[i];
 		}
@@ -777,7 +776,7 @@ void SurfaceTool::deindex() {
 		return; //nothing to deindex
 	}
 
-	LocalVector<Vertex> old_vertex_array(vertex_array);
+	LocalVector<Vertex> old_vertex_array = vertex_array;
 	vertex_array.clear();
 	for (const int &index : index_array) {
 		ERR_FAIL_COND(uint32_t(index) >= old_vertex_array.size());
@@ -791,27 +790,27 @@ void SurfaceTool::_create_list(const Ref<Mesh> &p_existing, int p_surface, Local
 	ERR_FAIL_COND_MSG(p_existing.is_null(), "First argument in SurfaceTool::_create_list() must be a valid object of type Mesh");
 
 	Array arr = p_existing->surface_get_arrays(p_surface);
-	ERR_FAIL_COND(arr.size() != RSE::ARRAY_MAX);
+	ERR_FAIL_COND(arr.size() != RS::ARRAY_MAX);
 	_create_list_from_arrays(arr, r_vertex, r_index, lformat);
 }
 
-const uint32_t SurfaceTool::custom_mask[RSE::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0, Mesh::ARRAY_FORMAT_CUSTOM1, Mesh::ARRAY_FORMAT_CUSTOM2, Mesh::ARRAY_FORMAT_CUSTOM3 };
-const uint32_t SurfaceTool::custom_shift[RSE::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
+const uint32_t SurfaceTool::custom_mask[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0, Mesh::ARRAY_FORMAT_CUSTOM1, Mesh::ARRAY_FORMAT_CUSTOM2, Mesh::ARRAY_FORMAT_CUSTOM3 };
+const uint32_t SurfaceTool::custom_shift[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
 
 void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVector<SurfaceTool::Vertex> &ret, uint64_t *r_format) {
-	ERR_FAIL_INDEX(RSE::ARRAY_WEIGHTS, p_arrays.size());
+	ERR_FAIL_INDEX(RS::ARRAY_WEIGHTS, p_arrays.size());
 
 	ret.clear();
 
-	Vector<Vector3> varr = p_arrays[RSE::ARRAY_VERTEX];
-	Vector<Vector3> narr = p_arrays[RSE::ARRAY_NORMAL];
-	Vector<float> tarr = p_arrays[RSE::ARRAY_TANGENT];
-	Vector<Color> carr = p_arrays[RSE::ARRAY_COLOR];
-	Vector<Vector2> uvarr = p_arrays[RSE::ARRAY_TEX_UV];
-	Vector<Vector2> uv2arr = p_arrays[RSE::ARRAY_TEX_UV2];
-	Vector<int> barr = p_arrays[RSE::ARRAY_BONES];
-	Vector<float> warr = p_arrays[RSE::ARRAY_WEIGHTS];
-	Vector<float> custom_float[RSE::ARRAY_CUSTOM_COUNT];
+	Vector<Vector3> varr = p_arrays[RS::ARRAY_VERTEX];
+	Vector<Vector3> narr = p_arrays[RS::ARRAY_NORMAL];
+	Vector<float> tarr = p_arrays[RS::ARRAY_TANGENT];
+	Vector<Color> carr = p_arrays[RS::ARRAY_COLOR];
+	Vector<Vector2> uvarr = p_arrays[RS::ARRAY_TEX_UV];
+	Vector<Vector2> uv2arr = p_arrays[RS::ARRAY_TEX_UV2];
+	Vector<int> barr = p_arrays[RS::ARRAY_BONES];
+	Vector<float> warr = p_arrays[RS::ARRAY_WEIGHTS];
+	Vector<float> custom_float[RS::ARRAY_CUSTOM_COUNT];
 
 	int vc = varr.size();
 	if (vc == 0) {
@@ -823,43 +822,43 @@ void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVe
 
 	uint64_t lformat = 0;
 	if (varr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_VERTEX;
+		lformat |= RS::ARRAY_FORMAT_VERTEX;
 	}
 	if (narr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_NORMAL;
+		lformat |= RS::ARRAY_FORMAT_NORMAL;
 	}
 	if (tarr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_TANGENT;
+		lformat |= RS::ARRAY_FORMAT_TANGENT;
 	}
 	if (carr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_COLOR;
+		lformat |= RS::ARRAY_FORMAT_COLOR;
 	}
 	if (uvarr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_TEX_UV;
+		lformat |= RS::ARRAY_FORMAT_TEX_UV;
 	}
 	if (uv2arr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_TEX_UV2;
+		lformat |= RS::ARRAY_FORMAT_TEX_UV2;
 	}
 	int wcount = 0;
 	if (barr.size() && warr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_BONES;
-		lformat |= RSE::ARRAY_FORMAT_WEIGHTS;
+		lformat |= RS::ARRAY_FORMAT_BONES;
+		lformat |= RS::ARRAY_FORMAT_WEIGHTS;
 
 		wcount = barr.size() / varr.size();
 		if (wcount == 8) {
-			lformat |= RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+			lformat |= RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 		}
 	}
 
 	if (warr.size()) {
-		lformat |= RSE::ARRAY_FORMAT_WEIGHTS;
+		lformat |= RS::ARRAY_FORMAT_WEIGHTS;
 	}
 
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
-		ERR_CONTINUE_MSG(p_arrays[RSE::ARRAY_CUSTOM0 + i].get_type() == Variant::PACKED_BYTE_ARRAY, "Extracting Byte/Half formats is not supported");
-		if (p_arrays[RSE::ARRAY_CUSTOM0 + i].get_type() == Variant::PACKED_FLOAT32_ARRAY) {
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
+		ERR_CONTINUE_MSG(p_arrays[RS::ARRAY_CUSTOM0 + i].get_type() == Variant::PACKED_BYTE_ARRAY, "Extracting Byte/Half formats is not supported");
+		if (p_arrays[RS::ARRAY_CUSTOM0 + i].get_type() == Variant::PACKED_FLOAT32_ARRAY) {
 			lformat |= custom_mask[i];
-			custom_float[i] = p_arrays[RSE::ARRAY_CUSTOM0 + i];
+			custom_float[i] = p_arrays[RS::ARRAY_CUSTOM0 + i];
 			int fmt = custom_float[i].size() / varr.size();
 			if (fmt == 1) {
 				lformat |= CUSTOM_R_FLOAT << custom_shift[i];
@@ -875,27 +874,27 @@ void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVe
 
 	for (int i = 0; i < vc; i++) {
 		Vertex v;
-		if (lformat & RSE::ARRAY_FORMAT_VERTEX) {
+		if (lformat & RS::ARRAY_FORMAT_VERTEX) {
 			v.vertex = varr[i];
 		}
-		if (lformat & RSE::ARRAY_FORMAT_NORMAL) {
+		if (lformat & RS::ARRAY_FORMAT_NORMAL) {
 			v.normal = narr[i];
 		}
-		if (lformat & RSE::ARRAY_FORMAT_TANGENT) {
+		if (lformat & RS::ARRAY_FORMAT_TANGENT) {
 			v.tangent = Vector3(tarr[i * 4 + 0], tarr[i * 4 + 1], tarr[i * 4 + 2]);
 			float d = tarr[i * 4 + 3];
 			v.binormal = v.normal.cross(v.tangent).normalized() * d;
 		}
-		if (lformat & RSE::ARRAY_FORMAT_COLOR) {
+		if (lformat & RS::ARRAY_FORMAT_COLOR) {
 			v.color = carr[i];
 		}
-		if (lformat & RSE::ARRAY_FORMAT_TEX_UV) {
+		if (lformat & RS::ARRAY_FORMAT_TEX_UV) {
 			v.uv = uvarr[i];
 		}
-		if (lformat & RSE::ARRAY_FORMAT_TEX_UV2) {
+		if (lformat & RS::ARRAY_FORMAT_TEX_UV2) {
 			v.uv2 = uv2arr[i];
 		}
-		if (lformat & RSE::ARRAY_FORMAT_BONES) {
+		if (lformat & RS::ARRAY_FORMAT_BONES) {
 			Vector<int> b;
 			b.resize(wcount);
 			for (int j = 0; j < wcount; j++) {
@@ -903,7 +902,7 @@ void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVe
 			}
 			v.bones = b;
 		}
-		if (lformat & RSE::ARRAY_FORMAT_WEIGHTS) {
+		if (lformat & RS::ARRAY_FORMAT_WEIGHTS) {
 			Vector<float> w;
 			w.resize(wcount);
 			for (int j = 0; j < wcount; j++) {
@@ -912,7 +911,7 @@ void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVe
 			v.weights = w;
 		}
 
-		for (int j = 0; j < RSE::ARRAY_CUSTOM_COUNT; j++) {
+		for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
 			if (lformat & custom_mask[j]) {
 				int cc = custom_float[j].size() / varr.size();
 				for (int k = 0; k < cc; k++) {
@@ -936,10 +935,10 @@ void SurfaceTool::_create_list_from_arrays(Array arr, LocalVector<Vertex> *r_ver
 	//indices
 	r_index->clear();
 
-	Vector<int> idx = arr[RSE::ARRAY_INDEX];
+	Vector<int> idx = arr[RS::ARRAY_INDEX];
 	int is = idx.size();
 	if (is) {
-		lformat |= RSE::ARRAY_FORMAT_INDEX;
+		lformat |= RS::ARRAY_FORMAT_INDEX;
 		const int *iarr = idx.ptr();
 		for (int i = 0; i < is; i++) {
 			r_index->push_back(iarr[i]);
@@ -952,9 +951,9 @@ void SurfaceTool::create_from_arrays(const Array &p_arrays, Mesh::PrimitiveType
 	primitive = p_primitive_type;
 	_create_list_from_arrays(p_arrays, &vertex_array, &index_array, format);
 
-	for (int j = 0; j < RSE::ARRAY_CUSTOM_COUNT; j++) {
+	for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
 		if (format & custom_mask[j]) {
-			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RSE::ARRAY_FORMAT_CUSTOM_MASK);
+			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RS::ARRAY_FORMAT_CUSTOM_MASK);
 		}
 	}
 }
@@ -971,9 +970,9 @@ void SurfaceTool::create_from(const Ref<Mesh> &p_existing, int p_surface) {
 	_create_list(p_existing, p_surface, &vertex_array, &index_array, format);
 	material = p_existing->surface_get_material(p_surface);
 
-	for (int j = 0; j < RSE::ARRAY_CUSTOM_COUNT; j++) {
+	for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
 		if (format & custom_mask[j]) {
-			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RSE::ARRAY_FORMAT_CUSTOM_MASK);
+			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RS::ARRAY_FORMAT_CUSTOM_MASK);
 		}
 	}
 }
@@ -996,24 +995,24 @@ void SurfaceTool::create_from_blend_shape(const Ref<Mesh> &p_existing, int p_sur
 	ERR_FAIL_COND(shape_idx == -1);
 	ERR_FAIL_COND(shape_idx >= arr.size());
 	Array blendshape_mesh_arrays = arr[shape_idx];
-	ERR_FAIL_COND(blendshape_mesh_arrays.size() != RSE::ARRAY_MAX);
+	ERR_FAIL_COND(blendshape_mesh_arrays.size() != RS::ARRAY_MAX);
 
 	Array source_mesh_arrays = p_existing->surface_get_arrays(p_surface);
-	ERR_FAIL_COND(source_mesh_arrays.size() != RSE::ARRAY_MAX);
+	ERR_FAIL_COND(source_mesh_arrays.size() != RS::ARRAY_MAX);
 
 	// Copy BlendShape vertex data over while keeping e.g. bones, weights, index from existing mesh intact.
-	source_mesh_arrays[RSE::ARRAY_VERTEX] = blendshape_mesh_arrays[RSE::ARRAY_VERTEX];
-	source_mesh_arrays[RSE::ARRAY_NORMAL] = blendshape_mesh_arrays[RSE::ARRAY_NORMAL];
-	source_mesh_arrays[RSE::ARRAY_TANGENT] = blendshape_mesh_arrays[RSE::ARRAY_TANGENT];
+	source_mesh_arrays[RS::ARRAY_VERTEX] = blendshape_mesh_arrays[RS::ARRAY_VERTEX];
+	source_mesh_arrays[RS::ARRAY_NORMAL] = blendshape_mesh_arrays[RS::ARRAY_NORMAL];
+	source_mesh_arrays[RS::ARRAY_TANGENT] = blendshape_mesh_arrays[RS::ARRAY_TANGENT];
 
 	_create_list_from_arrays(source_mesh_arrays, &vertex_array, &index_array, format);
 
 	material = p_existing->surface_get_material(p_surface);
 	format = p_existing->surface_get_format(p_surface);
 
-	for (int j = 0; j < RSE::ARRAY_CUSTOM_COUNT; j++) {
+	for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
 		if (format & custom_mask[j]) {
-			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RSE::ARRAY_FORMAT_CUSTOM_MASK);
+			last_custom_format[j] = (CustomFormat)((format >> custom_shift[j]) & RS::ARRAY_FORMAT_CUSTOM_MASK);
 		}
 	}
 }
@@ -1032,9 +1031,9 @@ void SurfaceTool::append_from(const Ref<Mesh> &p_existing, int p_surface, const
 	_create_list(p_existing, p_surface, &nvertices, &nindices, nformat);
 	format |= nformat;
 
-	for (int j = 0; j < RSE::ARRAY_CUSTOM_COUNT; j++) {
+	for (int j = 0; j < RS::ARRAY_CUSTOM_COUNT; j++) {
 		if (format & custom_mask[j]) {
-			CustomFormat new_format = (CustomFormat)((format >> custom_shift[j]) & RSE::ARRAY_FORMAT_CUSTOM_MASK);
+			CustomFormat new_format = (CustomFormat)((format >> custom_shift[j]) & RS::ARRAY_FORMAT_CUSTOM_MASK);
 			last_custom_format[j] = new_format;
 		}
 	}
@@ -1042,10 +1041,10 @@ void SurfaceTool::append_from(const Ref<Mesh> &p_existing, int p_surface, const
 
 	for (Vertex &v : nvertices) {
 		v.vertex = p_xform.xform(v.vertex);
-		if (nformat & RSE::ARRAY_FORMAT_NORMAL) {
+		if (nformat & RS::ARRAY_FORMAT_NORMAL) {
 			v.normal = p_xform.basis.xform(v.normal);
 		}
-		if (nformat & RSE::ARRAY_FORMAT_TANGENT) {
+		if (nformat & RS::ARRAY_FORMAT_TANGENT) {
 			v.tangent = p_xform.basis.xform(v.tangent);
 			v.binormal = p_xform.basis.xform(v.binormal);
 		}
@@ -1256,7 +1255,7 @@ void SurfaceTool::clear() {
 	vertex_array.clear();
 	material.unref();
 	last_smooth_group = 0;
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 		last_custom_format[i] = CUSTOM_MAX;
 	}
 	skin_weights = SKIN_4_WEIGHTS;
@@ -1271,7 +1270,7 @@ SurfaceTool::SkinWeightCount SurfaceTool::get_skin_weight_count() const {
 }
 
 void SurfaceTool::set_custom_format(int p_channel_index, CustomFormat p_format) {
-	ERR_FAIL_INDEX(p_channel_index, RSE::ARRAY_CUSTOM_COUNT);
+	ERR_FAIL_INDEX(p_channel_index, RS::ARRAY_CUSTOM_COUNT);
 	ERR_FAIL_COND(!begun);
 	ERR_FAIL_INDEX(p_format, CUSTOM_MAX + 1);
 	last_custom_format[p_channel_index] = p_format;
@@ -1281,7 +1280,7 @@ Mesh::PrimitiveType SurfaceTool::get_primitive_type() const {
 	return primitive;
 }
 SurfaceTool::CustomFormat SurfaceTool::get_custom_format(int p_channel_index) const {
-	ERR_FAIL_INDEX_V(p_channel_index, RSE::ARRAY_CUSTOM_COUNT, CUSTOM_MAX);
+	ERR_FAIL_INDEX_V(p_channel_index, RS::ARRAY_CUSTOM_COUNT, CUSTOM_MAX);
 	return last_custom_format[p_channel_index];
 }
 void SurfaceTool::optimize_indices_for_cache() {
@@ -1290,7 +1289,7 @@ void SurfaceTool::optimize_indices_for_cache() {
 	ERR_FAIL_COND(primitive != Mesh::PRIMITIVE_TRIANGLES);
 	ERR_FAIL_COND(index_array.size() % 3 != 0);
 
-	LocalVector<int> old_index_array(index_array);
+	LocalVector old_index_array = index_array;
 	memset(index_array.ptr(), 0, index_array.size() * sizeof(int));
 	optimize_vertex_cache_func((unsigned int *)index_array.ptr(), (unsigned int *)old_index_array.ptr(), old_index_array.size(), vertex_array.size());
 }
@@ -1399,7 +1398,7 @@ void SurfaceTool::_bind_methods() {
 }
 
 SurfaceTool::SurfaceTool() {
-	for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+	for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 		last_custom_format[i] = CUSTOM_MAX;
 	}
 }
diff --git a/engine/scene/resources/surface_tool.h b/engine/scene/resources/surface_tool.h
index 072c958b..5d4e21d6 100644
--- a/engine/scene/resources/surface_tool.h
+++ b/engine/scene/resources/surface_tool.h
@@ -32,15 +32,13 @@
 
 #include "core/templates/local_vector.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server_enums.h"
-
-#include <thirdparty/misc/mikktspace.h>
+#include "thirdparty/misc/mikktspace.h"
 
 class SurfaceTool : public RefCounted {
 	GDCLASS(SurfaceTool, RefCounted);
 
-	static const uint32_t custom_mask[RSE::ARRAY_CUSTOM_COUNT];
-	static const uint32_t custom_shift[RSE::ARRAY_CUSTOM_COUNT];
+	static const uint32_t custom_mask[RS::ARRAY_CUSTOM_COUNT];
+	static const uint32_t custom_shift[RS::ARRAY_CUSTOM_COUNT];
 
 public:
 	struct Vertex {
@@ -54,7 +52,7 @@ public:
 		Vector3 tangent;
 		Vector2 uv;
 		Vector2 uv2;
-		Color custom[RSE::ARRAY_CUSTOM_COUNT];
+		Color custom[RS::ARRAY_CUSTOM_COUNT];
 
 		Vector3 vertex; // Must be last.
 		// ----------------------------------------------------------------
@@ -66,15 +64,15 @@ public:
 	};
 
 	enum CustomFormat {
-		CUSTOM_RGBA8_UNORM = RSE::ARRAY_CUSTOM_RGBA8_UNORM,
-		CUSTOM_RGBA8_SNORM = RSE::ARRAY_CUSTOM_RGBA8_SNORM,
-		CUSTOM_RG_HALF = RSE::ARRAY_CUSTOM_RG_HALF,
-		CUSTOM_RGBA_HALF = RSE::ARRAY_CUSTOM_RGBA_HALF,
-		CUSTOM_R_FLOAT = RSE::ARRAY_CUSTOM_R_FLOAT,
-		CUSTOM_RG_FLOAT = RSE::ARRAY_CUSTOM_RG_FLOAT,
-		CUSTOM_RGB_FLOAT = RSE::ARRAY_CUSTOM_RGB_FLOAT,
-		CUSTOM_RGBA_FLOAT = RSE::ARRAY_CUSTOM_RGBA_FLOAT,
-		CUSTOM_MAX = RSE::ARRAY_CUSTOM_MAX
+		CUSTOM_RGBA8_UNORM = RS::ARRAY_CUSTOM_RGBA8_UNORM,
+		CUSTOM_RGBA8_SNORM = RS::ARRAY_CUSTOM_RGBA8_SNORM,
+		CUSTOM_RG_HALF = RS::ARRAY_CUSTOM_RG_HALF,
+		CUSTOM_RGBA_HALF = RS::ARRAY_CUSTOM_RGBA_HALF,
+		CUSTOM_R_FLOAT = RS::ARRAY_CUSTOM_R_FLOAT,
+		CUSTOM_RG_FLOAT = RS::ARRAY_CUSTOM_RG_FLOAT,
+		CUSTOM_RGB_FLOAT = RS::ARRAY_CUSTOM_RGB_FLOAT,
+		CUSTOM_RGBA_FLOAT = RS::ARRAY_CUSTOM_RGBA_FLOAT,
+		CUSTOM_MAX = RS::ARRAY_CUSTOM_MAX
 	};
 
 	enum SkinWeightCount {
@@ -169,9 +167,9 @@ private:
 
 	SkinWeightCount skin_weights = SKIN_4_WEIGHTS;
 
-	Color last_custom[RSE::ARRAY_CUSTOM_COUNT];
+	Color last_custom[RS::ARRAY_CUSTOM_COUNT];
 
-	CustomFormat last_custom_format[RSE::ARRAY_CUSTOM_COUNT];
+	CustomFormat last_custom_format[RS::ARRAY_CUSTOM_COUNT];
 
 	void _create_list_from_arrays(Array arr, LocalVector<Vertex> *r_vertex, LocalVector<int> *r_index, uint64_t &lformat);
 	void _create_list(const Ref<Mesh> &p_existing, int p_surface, LocalVector<Vertex> *r_vertex, LocalVector<int> *r_index, uint64_t &lformat);
diff --git a/engine/scene/resources/syntax_highlighter.cpp b/engine/scene/resources/syntax_highlighter.cpp
index 1e8ef601..652a1255 100644
--- a/engine/scene/resources/syntax_highlighter.cpp
+++ b/engine/scene/resources/syntax_highlighter.cpp
@@ -30,8 +30,6 @@
 
 #include "syntax_highlighter.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/gui/text_edit.h"
 
 Dictionary SyntaxHighlighter::get_line_syntax_highlighting(int p_line) {
diff --git a/engine/scene/resources/syntax_highlighter.h b/engine/scene/resources/syntax_highlighter.h
index 31c4b468..52ad2a22 100644
--- a/engine/scene/resources/syntax_highlighter.h
+++ b/engine/scene/resources/syntax_highlighter.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/templates/rb_map.h"
 
 class TextEdit;
diff --git a/engine/scene/resources/text_line.compat.inc b/engine/scene/resources/text_line.compat.inc
index d4a60c7f..b1c243fe 100644
--- a/engine/scene/resources/text_line.compat.inc
+++ b/engine/scene/resources/text_line.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "text_line.h"
-
-#include "core/object/class_db.h"
-
 void TextLine::_draw_bind_compat_104872(RID p_canvas, const Vector2 &p_pos, const Color &p_color) const {
 	draw(p_canvas, p_pos, p_color, 0.0);
 }
@@ -47,4 +43,4 @@ void TextLine::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_outline", "canvas", "pos", "outline_size", "color"), &TextLine::_draw_outline_bind_compat_104872, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/text_line.cpp b/engine/scene/resources/text_line.cpp
index c27f0231..459180dd 100644
--- a/engine/scene/resources/text_line.cpp
+++ b/engine/scene/resources/text_line.cpp
@@ -31,8 +31,6 @@
 #include "text_line.h"
 #include "text_line.compat.inc"
 
-#include "core/object/class_db.h"
-
 void TextLine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &TextLine::clear);
 	ClassDB::bind_method(D_METHOD("duplicate"), &TextLine::duplicate);
diff --git a/engine/scene/resources/text_paragraph.compat.inc b/engine/scene/resources/text_paragraph.compat.inc
index c0c4aff4..f0e74085 100644
--- a/engine/scene/resources/text_paragraph.compat.inc
+++ b/engine/scene/resources/text_paragraph.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "text_paragraph.h"
-
-#include "core/object/class_db.h"
-
 void TextParagraph::_draw_bind_compat_104872(RID p_canvas, const Vector2 &p_pos, const Color &p_color, const Color &p_dc_color) const {
 	draw(p_canvas, p_pos, p_color, p_dc_color, 0.0);
 }
@@ -69,4 +65,4 @@ void TextParagraph::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_dropcap_outline", "canvas", "pos", "outline_size", "color"), &TextParagraph::_draw_dropcap_outline_bind_compat_104872, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/scene/resources/text_paragraph.cpp b/engine/scene/resources/text_paragraph.cpp
index d18928d4..2f709700 100644
--- a/engine/scene/resources/text_paragraph.cpp
+++ b/engine/scene/resources/text_paragraph.cpp
@@ -31,8 +31,6 @@
 #include "text_paragraph.h"
 #include "text_paragraph.compat.inc"
 
-#include "core/object/class_db.h"
-
 void TextParagraph::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &TextParagraph::clear);
 	ClassDB::bind_method(D_METHOD("duplicate"), &TextParagraph::duplicate);
@@ -697,7 +695,7 @@ Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
 	}
 
 	for (int i = 0; i <= p_line; i++) {
-		float l_width = width > 0 ? width : get_size().x;
+		float l_width = width;
 		if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = 0.f;
 			ofs.y += TS->shaped_text_get_ascent(lines_rid[i]);
@@ -718,7 +716,7 @@ Rect2 TextParagraph::get_line_object_rect(int p_line, Variant p_key) const {
 			}
 		}
 		float length = TS->shaped_text_get_width(lines_rid[i]);
-		if (l_width > 0) {
+		if (width > 0) {
 			switch (alignment) {
 				case HORIZONTAL_ALIGNMENT_FILL:
 					if (TS->shaped_text_get_inferred_direction(lines_rid[i]) == TextServer::DIRECTION_RTL) {
@@ -852,13 +850,12 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
 
 	if (h_offset > 0) {
 		// Draw dropcap.
-		float l_width = width > 0 ? width : get_size().x;
 		Vector2 dc_off = ofs;
 		if (TS->shaped_text_get_inferred_direction(dropcap_rid) == TextServer::DIRECTION_RTL) {
 			if (TS->shaped_text_get_orientation(dropcap_rid) == TextServer::ORIENTATION_HORIZONTAL) {
-				dc_off.x += l_width - h_offset;
+				dc_off.x += width - h_offset;
 			} else {
-				dc_off.y += l_width - h_offset;
+				dc_off.y += width - h_offset;
 			}
 		}
 		TS->shaped_text_draw(dropcap_rid, p_canvas, dc_off + Vector2(0, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.size.y + dropcap_margins.position.y / 2), -1, -1, p_dc_color, p_oversampling);
@@ -867,7 +864,7 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
 	int lines_visible = (max_lines_visible >= 0) ? MIN(max_lines_visible, (int)lines_rid.size()) : (int)lines_rid.size();
 
 	for (int i = 0; i < lines_visible; i++) {
-		float l_width = width > 0 ? width : get_size().x;
+		float l_width = width;
 		if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
 			ofs.y += TS->shaped_text_get_ascent(lines_rid[i]);
@@ -888,7 +885,7 @@ void TextParagraph::draw(RID p_canvas, const Vector2 &p_pos, const Color &p_colo
 			}
 		}
 		float line_width = TS->shaped_text_get_width(lines_rid[i]);
-		if (l_width > 0) {
+		if (width > 0) {
 			switch (alignment) {
 				case HORIZONTAL_ALIGNMENT_FILL:
 					if (TS->shaped_text_get_inferred_direction(lines_rid[i]) == TextServer::DIRECTION_RTL) {
@@ -957,20 +954,19 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
 
 	if (h_offset > 0) {
 		// Draw dropcap.
-		float l_width = width > 0 ? width : get_size().x;
 		Vector2 dc_off = ofs;
 		if (TS->shaped_text_get_inferred_direction(dropcap_rid) == TextServer::DIRECTION_RTL) {
 			if (TS->shaped_text_get_orientation(dropcap_rid) == TextServer::ORIENTATION_HORIZONTAL) {
-				dc_off.x += l_width - h_offset;
+				dc_off.x += width - h_offset;
 			} else {
-				dc_off.y += l_width - h_offset;
+				dc_off.y += width - h_offset;
 			}
 		}
 		TS->shaped_text_draw_outline(dropcap_rid, p_canvas, dc_off + Vector2(dropcap_margins.position.x, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.position.y), -1, -1, p_outline_size, p_dc_color, p_oversampling);
 	}
 
 	for (int i = 0; i < (int)lines_rid.size(); i++) {
-		float l_width = width > 0 ? width : get_size().x;
+		float l_width = width;
 		if (TS->shaped_text_get_orientation(lines_rid[i]) == TextServer::ORIENTATION_HORIZONTAL) {
 			ofs.x = p_pos.x;
 			ofs.y += TS->shaped_text_get_ascent(lines_rid[i]);
@@ -991,7 +987,7 @@ void TextParagraph::draw_outline(RID p_canvas, const Vector2 &p_pos, int p_outli
 			}
 		}
 		float length = TS->shaped_text_get_width(lines_rid[i]);
-		if (l_width > 0) {
+		if (width > 0) {
 			switch (alignment) {
 				case HORIZONTAL_ALIGNMENT_FILL:
 					if (TS->shaped_text_get_inferred_direction(lines_rid[i]) == TextServer::DIRECTION_RTL) {
@@ -1092,12 +1088,11 @@ void TextParagraph::draw_dropcap(RID p_canvas, const Vector2 &p_pos, const Color
 
 	if (h_offset > 0) {
 		// Draw dropcap.
-		float l_width = width > 0 ? width : get_size().x;
 		if (TS->shaped_text_get_inferred_direction(dropcap_rid) == TextServer::DIRECTION_RTL) {
 			if (TS->shaped_text_get_orientation(dropcap_rid) == TextServer::ORIENTATION_HORIZONTAL) {
-				ofs.x += l_width - h_offset;
+				ofs.x += width - h_offset;
 			} else {
-				ofs.y += l_width - h_offset;
+				ofs.y += width - h_offset;
 			}
 		}
 		TS->shaped_text_draw(dropcap_rid, p_canvas, ofs + Vector2(dropcap_margins.position.x, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.position.y), -1, -1, p_color, p_oversampling);
@@ -1117,12 +1112,11 @@ void TextParagraph::draw_dropcap_outline(RID p_canvas, const Vector2 &p_pos, int
 
 	if (h_offset > 0) {
 		// Draw dropcap.
-		float l_width = width > 0 ? width : get_size().x;
 		if (TS->shaped_text_get_inferred_direction(dropcap_rid) == TextServer::DIRECTION_RTL) {
 			if (TS->shaped_text_get_orientation(dropcap_rid) == TextServer::ORIENTATION_HORIZONTAL) {
-				ofs.x += l_width - h_offset;
+				ofs.x += width - h_offset;
 			} else {
-				ofs.y += l_width - h_offset;
+				ofs.y += width - h_offset;
 			}
 		}
 		TS->shaped_text_draw_outline(dropcap_rid, p_canvas, ofs + Vector2(dropcap_margins.position.x, TS->shaped_text_get_ascent(dropcap_rid) + dropcap_margins.position.y), -1, -1, p_outline_size, p_color, p_oversampling);
diff --git a/engine/scene/resources/text_paragraph.h b/engine/scene/resources/text_paragraph.h
index 21561dcb..5a5a2c6d 100644
--- a/engine/scene/resources/text_paragraph.h
+++ b/engine/scene/resources/text_paragraph.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/os/thread_safe.h"
 #include "core/templates/local_vector.h"
 #include "scene/resources/font.h"
 #include "servers/text/text_server.h"
diff --git a/engine/scene/resources/texture.cpp b/engine/scene/resources/texture.cpp
index 10ba6a4f..97dd1c8a 100644
--- a/engine/scene/resources/texture.cpp
+++ b/engine/scene/resources/texture.cpp
@@ -30,34 +30,9 @@
 
 #include "texture.h"
 
-#include "core/object/class_db.h"
 #include "scene/resources/placeholder_textures.h"
 #include "servers/rendering/rendering_server.h"
 
-Ref<Image> Texture2D::get_image() const {
-	Ref<Image> ret;
-	GDVIRTUAL_CALL(_get_image, ret);
-	return ret;
-}
-
-Image::Format Texture2D::get_format() const {
-	Image::Format ret = Image::FORMAT_MAX;
-	GDVIRTUAL_CALL(_get_format, ret);
-	return ret;
-}
-
-int Texture2D::get_mipmap_count() const {
-	int ret = 0;
-	GDVIRTUAL_CALL(_get_mipmap_count, ret);
-	return ret;
-}
-
-bool Texture2D::has_mipmaps() const {
-	bool ret = false;
-	GDVIRTUAL_CALL(_has_mipmaps, ret);
-	return ret;
-}
-
 int Texture2D::get_width() const {
 	int ret = 0;
 	GDVIRTUAL_CALL(_get_width, ret);
@@ -121,13 +96,10 @@ Ref<Resource> Texture2D::create_placeholder() const {
 }
 
 void Texture2D::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_format"), &Texture2D::get_format);
-	ClassDB::bind_method(D_METHOD("get_mipmap_count"), &Texture2D::get_mipmap_count);
 	ClassDB::bind_method(D_METHOD("get_width"), &Texture2D::get_width);
 	ClassDB::bind_method(D_METHOD("get_height"), &Texture2D::get_height);
 	ClassDB::bind_method(D_METHOD("get_size"), &Texture2D::get_size);
 	ClassDB::bind_method(D_METHOD("has_alpha"), &Texture2D::has_alpha);
-	ClassDB::bind_method(D_METHOD("has_mipmaps"), &Texture2D::has_mipmaps);
 	ClassDB::bind_method(D_METHOD("draw", "canvas_item", "position", "modulate", "transpose"), &Texture2D::draw, DEFVAL(Color(1, 1, 1)), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("draw_rect", "canvas_item", "rect", "tile", "modulate", "transpose"), &Texture2D::draw_rect, DEFVAL(Color(1, 1, 1)), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("draw_rect_region", "canvas_item", "rect", "src_rect", "modulate", "transpose", "clip_uv"), &Texture2D::draw_rect_region, DEFVAL(Color(1, 1, 1)), DEFVAL(false), DEFVAL(true));
@@ -136,14 +108,10 @@ void Texture2D::_bind_methods() {
 
 	ADD_GROUP("", "");
 
-	GDVIRTUAL_BIND(_get_image);
-	GDVIRTUAL_BIND(_get_format);
-	GDVIRTUAL_BIND(_get_mipmap_count);
 	GDVIRTUAL_BIND(_get_width);
 	GDVIRTUAL_BIND(_get_height);
 	GDVIRTUAL_BIND(_is_pixel_opaque, "x", "y");
 	GDVIRTUAL_BIND(_has_alpha);
-	GDVIRTUAL_BIND(_has_mipmaps);
 
 	GDVIRTUAL_BIND(_draw, "to_canvas_item", "pos", "modulate", "transpose")
 	GDVIRTUAL_BIND(_draw_rect, "to_canvas_item", "rect", "tile", "modulate", "transpose")
diff --git a/engine/scene/resources/texture.h b/engine/scene/resources/texture.h
index f4bcea90..b8fd0f41 100644
--- a/engine/scene/resources/texture.h
+++ b/engine/scene/resources/texture.h
@@ -33,6 +33,7 @@
 #include "core/io/image.h"
 #include "core/io/resource.h"
 #include "core/variant/typed_array.h"
+#include "scene/resources/curve.h"
 
 class Texture : public Resource {
 	GDCLASS(Texture, Resource);
@@ -45,10 +46,6 @@ class Texture2D : public Texture {
 protected:
 	static void _bind_methods();
 
-	GDVIRTUAL0RC(Image::Format, _get_format)
-	GDVIRTUAL0RC(Ref<Image>, _get_image)
-	GDVIRTUAL0RC(int, _get_mipmap_count)
-	GDVIRTUAL0RC(bool, _has_mipmaps)
 	GDVIRTUAL0RC_REQUIRED(int, _get_width)
 	GDVIRTUAL0RC_REQUIRED(int, _get_height)
 	GDVIRTUAL2RC(bool, _is_pixel_opaque, int, int)
@@ -59,8 +56,6 @@ protected:
 	GDVIRTUAL6C(_draw_rect_region, RID, Rect2, Rect2, Color, bool, bool)
 
 public:
-	virtual Image::Format get_format() const;
-	virtual int get_mipmap_count() const;
 	virtual int get_width() const;
 	virtual int get_height() const;
 	virtual Size2 get_size() const;
@@ -68,7 +63,6 @@ public:
 	virtual bool is_pixel_opaque(int p_x, int p_y) const;
 
 	virtual bool has_alpha() const;
-	virtual bool has_mipmaps() const;
 
 	virtual RID get_scaled_rid() const { return get_rid(); }
 	virtual void draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false) const;
@@ -76,7 +70,7 @@ public:
 	virtual void draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = true) const;
 	virtual bool get_rect_region(const Rect2 &p_rect, const Rect2 &p_src_rect, Rect2 &r_rect, Rect2 &r_src_rect) const;
 
-	virtual Ref<Image> get_image() const;
+	virtual Ref<Image> get_image() const { return Ref<Image>(); }
 
 	virtual Ref<Resource> create_placeholder() const;
 
diff --git a/engine/scene/resources/texture_rd.cpp b/engine/scene/resources/texture_rd.cpp
index 6fb37374..becd6d01 100644
--- a/engine/scene/resources/texture_rd.cpp
+++ b/engine/scene/resources/texture_rd.cpp
@@ -30,9 +30,6 @@
 
 #include "texture_rd.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
@@ -200,22 +197,22 @@ void TextureLayeredRD::_set_texture_rd_rid(RID p_texture_rd_rid) {
 	ERR_FAIL_NULL(RD::get_singleton());
 	ERR_FAIL_COND(!RD::get_singleton()->texture_is_valid(p_texture_rd_rid));
 
-	RSE::TextureLayeredType rs_layer_type;
+	RS::TextureLayeredType rs_layer_type;
 	RD::TextureFormat tf = RD::get_singleton()->texture_get_format(p_texture_rd_rid);
 	ERR_FAIL_COND(tf.texture_type != RD::TEXTURE_TYPE_2D_ARRAY && tf.texture_type != RD::TEXTURE_TYPE_CUBE && tf.texture_type != RD::TEXTURE_TYPE_CUBE_ARRAY);
 	ERR_FAIL_COND(tf.depth > 1);
 	switch (layer_type) {
 		case LAYERED_TYPE_2D_ARRAY: {
 			ERR_FAIL_COND(tf.array_layers <= 1);
-			rs_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY;
+			rs_layer_type = RS::TEXTURE_LAYERED_2D_ARRAY;
 		} break;
 		case LAYERED_TYPE_CUBEMAP: {
 			ERR_FAIL_COND(tf.array_layers != 6);
-			rs_layer_type = RSE::TEXTURE_LAYERED_CUBEMAP;
+			rs_layer_type = RS::TEXTURE_LAYERED_CUBEMAP;
 		} break;
 		case LAYERED_TYPE_CUBEMAP_ARRAY: {
 			ERR_FAIL_COND((tf.array_layers == 0) || ((tf.array_layers % 6) != 0));
-			rs_layer_type = RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY;
+			rs_layer_type = RS::TEXTURE_LAYERED_CUBEMAP_ARRAY;
 		} break;
 		default: {
 			ERR_FAIL_MSG("Unknown layer type selected");
diff --git a/engine/scene/resources/theme.cpp b/engine/scene/resources/theme.cpp
index c237c0c4..d2205614 100644
--- a/engine/scene/resources/theme.cpp
+++ b/engine/scene/resources/theme.cpp
@@ -30,8 +30,6 @@
 
 #include "theme.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 // Dynamic properties.
@@ -122,21 +120,21 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	// Icons.
 	for (const KeyValue<StringName, ThemeIconMap> &E : icon_map) {
 		for (const KeyValue<StringName, Ref<Texture2D>> &F : E.value) {
-			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/icons/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
+			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/icons/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
 
 	// Styles.
 	for (const KeyValue<StringName, ThemeStyleMap> &E : style_map) {
 		for (const KeyValue<StringName, Ref<StyleBox>> &F : E.value) {
-			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/styles/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, StyleBox::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
+			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/styles/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, "StyleBox", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
 
 	// Fonts.
 	for (const KeyValue<StringName, ThemeFontMap> &E : font_map) {
 		for (const KeyValue<StringName, Ref<Font>> &F : E.value) {
-			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/fonts/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
+			list.push_back(PropertyInfo(Variant::OBJECT, String() + E.key + "/fonts/" + F.key, PROPERTY_HINT_RESOURCE_TYPE, "Font", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
 
@@ -1914,7 +1912,7 @@ void Theme::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &Theme::clear);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "default_base_scale", PROPERTY_HINT_RANGE, "0.0,2.0,0.01,or_greater"), "set_default_base_scale", "get_default_base_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "default_font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static()), "set_default_font", "get_default_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "default_font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_default_font", "get_default_font");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "default_font_size", PROPERTY_HINT_RANGE, "0,256,1,or_greater,suffix:px"), "set_default_font_size", "get_default_font_size");
 
 	BIND_ENUM_CONSTANT(DATA_TYPE_COLOR);
diff --git a/engine/scene/resources/video_stream.cpp b/engine/scene/resources/video_stream.cpp
index 9ed5d0b1..32e87c38 100644
--- a/engine/scene/resources/video_stream.cpp
+++ b/engine/scene/resources/video_stream.cpp
@@ -30,8 +30,6 @@
 
 #include "video_stream.h"
 
-#include "core/object/class_db.h"
-
 // VideoStreamPlayback starts here.
 
 void VideoStreamPlayback::_bind_methods() {
diff --git a/engine/scene/resources/visual_shader.cpp b/engine/scene/resources/visual_shader.cpp
index cb5f283f..ce2e679f 100644
--- a/engine/scene/resources/visual_shader.cpp
+++ b/engine/scene/resources/visual_shader.cpp
@@ -30,18 +30,14 @@
 
 #include "visual_shader.h"
 
-#include "core/config/engine.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "core/templates/rb_map.h"
 #include "core/variant/variant_utility.h"
-#include "scene/resources/visual_shader_nodes.h"
-#include "scene/resources/visual_shader_particle_nodes.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_types.h"
+#include "visual_shader_nodes.h"
+#include "visual_shader_particle_nodes.h"
 
 String make_unique_id(VisualShader::Type p_type, int p_id, const String &p_name) {
-	static const char *typepf[VisualShader::TYPE_MAX] = { "vtx", "frg", "lgt", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog", "texture_blit" };
+	static const char *typepf[VisualShader::TYPE_MAX] = { "vtx", "frg", "lgt", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog" };
 	return p_name + "_" + String(typepf[p_type]) + "_" + itos(p_id);
 }
 
@@ -1722,7 +1718,6 @@ static const char *type_string[VisualShader::TYPE_MAX] = {
 	"process_custom",
 	"sky",
 	"fog",
-	"texture_blit",
 };
 
 bool VisualShader::_set(const StringName &p_name, const Variant &p_value) {
@@ -1963,13 +1958,13 @@ void VisualShader::reset_state() {
 
 void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
 	//mode
-	p_list->push_back(PropertyInfo(Variant::INT, PNAME("mode"), PROPERTY_HINT_ENUM, "Spatial,CanvasItem,Particles,Sky,Fog,TextureBlit"));
+	p_list->push_back(PropertyInfo(Variant::INT, PNAME("mode"), PROPERTY_HINT_ENUM, "Spatial,CanvasItem,Particles,Sky,Fog"));
 	//render modes
 
 	HashMap<String, String> blend_mode_enums;
 	HashSet<String> toggles;
 
-	const Vector<ShaderLanguage::ModeInfo> &rmodes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(shader_mode));
+	const Vector<ShaderLanguage::ModeInfo> &rmodes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader_mode));
 
 	for (int i = 0; i < rmodes.size(); i++) {
 		const ShaderLanguage::ModeInfo &info = rmodes[i];
@@ -2022,7 +2017,7 @@ void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("flags"), E)));
 	}
 
-	const Vector<ShaderLanguage::ModeInfo> &smodes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(shader_mode));
+	const Vector<ShaderLanguage::ModeInfo> &smodes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(shader_mode));
 
 	if (smodes.size() > 0) {
 		p_list->push_back(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("stencil"), PNAME("enabled")), PROPERTY_HINT_GROUP_ENABLE));
@@ -2077,7 +2072,7 @@ void VisualShader::_get_property_list(List<PropertyInfo> *p_list) const {
 			prop_name += "/" + itos(E.key);
 
 			if (E.key != NODE_ID_OUTPUT) {
-				p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, VisualShaderNode::get_class_static(), PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE));
+				p_list->push_back(PropertyInfo(Variant::OBJECT, prop_name + "/node", PROPERTY_HINT_RESOURCE_TYPE, "VisualShaderNode", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_ALWAYS_DUPLICATE));
 			}
 			p_list->push_back(PropertyInfo(Variant::VECTOR2, prop_name + "/position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 
@@ -2661,9 +2656,9 @@ Error VisualShader::_write_node(Type type, StringBuilder *p_global_code, StringB
 	return OK;
 }
 
-bool VisualShader::has_func_name(RSE::ShaderMode p_mode, const String &p_func_name) const {
+bool VisualShader::has_func_name(RenderingServer::ShaderMode p_mode, const String &p_func_name) const {
 	if (!ShaderTypes::get_singleton()->get_functions(p_mode).has(p_func_name)) {
-		if (p_mode == RSE::ShaderMode::SHADER_PARTICLES) {
+		if (p_mode == RenderingServer::ShaderMode::SHADER_PARTICLES) {
 			if (p_func_name == "start_custom" || p_func_name == "process_custom" || p_func_name == "collide") {
 				return true;
 			}
@@ -2688,14 +2683,14 @@ void VisualShader::_update_shader() const {
 	Vector<VisualShader::DefaultTextureParam> default_tex_params;
 	HashSet<StringName> classes;
 	HashMap<int, int> insertion_pos;
-	static const char *shader_mode_str[Shader::MODE_MAX] = { "spatial", "canvas_item", "particles", "sky", "fog", "texture_blit" };
+	static const char *shader_mode_str[Shader::MODE_MAX] = { "spatial", "canvas_item", "particles", "sky", "fog" };
 
 	global_code += String() + "shader_type " + shader_mode_str[shader_mode] + ";\n";
 
 	String render_mode;
 
 	{
-		const Vector<ShaderLanguage::ModeInfo> &rmodes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(shader_mode));
+		const Vector<ShaderLanguage::ModeInfo> &rmodes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader_mode));
 		Vector<String> flag_names;
 
 		// Add enum modes first.
@@ -2751,7 +2746,7 @@ void VisualShader::_update_shader() const {
 		global_code += "render_mode " + render_mode + ";\n\n";
 	}
 
-	const Vector<ShaderLanguage::ModeInfo> &smodes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(shader_mode));
+	const Vector<ShaderLanguage::ModeInfo> &smodes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(shader_mode));
 
 	if (stencil_enabled && smodes.size() > 0 && (stencil_flags.has("read") || stencil_flags.has("write") || stencil_flags.has("write_depth_fail"))) {
 		String stencil_mode;
@@ -2791,7 +2786,7 @@ void VisualShader::_update_shader() const {
 		global_code += "stencil_mode " + stencil_mode + ";\n\n";
 	}
 
-	static const char *func_name[TYPE_MAX] = { "vertex", "fragment", "light", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog", "blit" };
+	static const char *func_name[TYPE_MAX] = { "vertex", "fragment", "light", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog" };
 
 	String global_expressions;
 	HashSet<String> used_parameter_names;
@@ -2799,15 +2794,8 @@ void VisualShader::_update_shader() const {
 	HashMap<int, List<int>> emitters;
 	HashMap<int, List<int>> varying_setters;
 
-	if (shader_mode == Shader::MODE_TEXTURE_BLIT) {
-		global_code += "uniform sampler2D source_texture0 : hint_blit_source0;\n";
-		global_code += "uniform sampler2D source_texture1 : hint_blit_source1;\n";
-		global_code += "uniform sampler2D source_texture2 : hint_blit_source2;\n";
-		global_code += "uniform sampler2D source_texture3 : hint_blit_source3;\n\n";
-	}
-
 	for (int i = 0, index = 0; i < TYPE_MAX; i++) {
-		if (!has_func_name(RSE::ShaderMode(shader_mode), func_name[i])) {
+		if (!has_func_name(RenderingServer::ShaderMode(shader_mode), func_name[i])) {
 			continue;
 		}
 
@@ -2906,7 +2894,7 @@ void VisualShader::_update_shader() const {
 	HashSet<int> empty_funcs;
 
 	for (int i = 0; i < TYPE_MAX; i++) {
-		if (!has_func_name(RSE::ShaderMode(shader_mode), func_name[i])) {
+		if (!has_func_name(RenderingServer::ShaderMode(shader_mode), func_name[i])) {
 			continue;
 		}
 
@@ -2917,7 +2905,7 @@ void VisualShader::_update_shader() const {
 		HashSet<int> processed;
 
 		bool is_empty_func = false;
-		if (shader_mode != Shader::MODE_PARTICLES && shader_mode != Shader::MODE_SKY && shader_mode != Shader::MODE_FOG && shader_mode != Shader::MODE_TEXTURE_BLIT) {
+		if (shader_mode != Shader::MODE_PARTICLES && shader_mode != Shader::MODE_SKY && shader_mode != Shader::MODE_FOG) {
 			is_empty_func = true;
 		}
 
@@ -3140,7 +3128,7 @@ void VisualShader::_update_shader() const {
 	final_code += global_expressions;
 	String tcode = shader_code;
 	for (int i = 0; i < TYPE_MAX; i++) {
-		if (!has_func_name(RSE::ShaderMode(shader_mode), func_name[i])) {
+		if (!has_func_name(RenderingServer::ShaderMode(shader_mode), func_name[i])) {
 			continue;
 		}
 		String func_code = global_code_per_func[Type(i)].as_string();
@@ -3233,7 +3221,6 @@ void VisualShader::_bind_methods() {
 	BIND_ENUM_CONSTANT(TYPE_PROCESS_CUSTOM);
 	BIND_ENUM_CONSTANT(TYPE_SKY);
 	BIND_ENUM_CONSTANT(TYPE_FOG);
-	BIND_ENUM_CONSTANT(TYPE_TEXTURE_BLIT);
 	BIND_ENUM_CONSTANT(TYPE_MAX);
 
 	BIND_ENUM_CONSTANT(VARYING_MODE_VERTEX_TO_FRAG_LIGHT);
@@ -3293,7 +3280,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_VECTOR_4D, "custom3", "CUSTOM3" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_SCALAR, "exposure", "EXPOSURE" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_VECTOR_3D, "eye_offset", "EYE_OFFSET" },
-	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_BOOLEAN, "in_shadow_pass", "IN_SHADOW_PASS" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_VECTOR_4D, "instance_custom", "INSTANCE_CUSTOM" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_SCALAR_INT, "instance_id", "INSTANCE_ID" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_VERTEX, VisualShaderNode::PORT_TYPE_TRANSFORM, "inv_projection_matrix", "INV_PROJECTION_MATRIX" },
@@ -3331,7 +3317,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "eye_offset", "EYE_OFFSET" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "fragcoord", "FRAGCOORD" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_BOOLEAN, "front_facing", "FRONT_FACING" },
-	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_BOOLEAN, "in_shadow_pass", "IN_SHADOW_PASS" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_TRANSFORM, "inv_projection_matrix", "INV_PROJECTION_MATRIX" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_TRANSFORM, "inv_view_matrix", "INV_VIEW_MATRIX" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_FRAGMENT, VisualShaderNode::PORT_TYPE_TRANSFORM, "model_matrix", "MODEL_MATRIX" },
@@ -3364,7 +3349,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "diffuse", "DIFFUSE_LIGHT" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "exposure", "EXPOSURE" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "fragcoord", "FRAGCOORD" },
-	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_BOOLEAN, "in_shadow_pass", "IN_SHADOW_PASS" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_TRANSFORM, "inv_projection_matrix", "INV_PROJECTION_MATRIX" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_TRANSFORM, "inv_view_matrix", "INV_VIEW_MATRIX" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "light", "LIGHT" },
@@ -3378,7 +3362,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "roughness", "ROUGHNESS" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_2D, "screen_uv", "SCREEN_UV" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "specular", "SPECULAR_LIGHT" },
-	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "specular_amount", "SPECULAR_AMOUNT" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "time", "TIME" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_2D, "uv", "UV" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_2D, "uv2", "UV2" },
@@ -3445,6 +3428,7 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 
 	// Particles, Start
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_BOOLEAN, "active", "ACTIVE" },
+	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_VECTOR_3D, "attractor_force", "ATTRACTOR_FORCE" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_VECTOR_4D, "color", "COLOR" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_VECTOR_4D, "custom", "CUSTOM" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_SCALAR, "delta", "DELTA" },
@@ -3453,12 +3437,14 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_SCALAR, "lifetime", "LIFETIME" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_SCALAR_UINT, "number", "NUMBER" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_SCALAR_UINT, "random_seed", "RANDOM_SEED" },
+	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_BOOLEAN, "restart", "RESTART" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_SCALAR, "time", "TIME" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_TRANSFORM, "transform", "TRANSFORM" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START, VisualShaderNode::PORT_TYPE_VECTOR_3D, "velocity", "VELOCITY" },
 
 	// Particles, Start (Custom)
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_BOOLEAN, "active", "ACTIVE" },
+	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_VECTOR_3D, "attractor_force", "ATTRACTOR_FORCE" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_VECTOR_4D, "color", "COLOR" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_VECTOR_4D, "custom", "CUSTOM" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_SCALAR, "delta", "DELTA" },
@@ -3467,6 +3453,7 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_SCALAR, "lifetime", "LIFETIME" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_SCALAR_UINT, "number", "NUMBER" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_SCALAR_UINT, "random_seed", "RANDOM_SEED" },
+	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_BOOLEAN, "restart", "RESTART" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_SCALAR, "time", "TIME" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_TRANSFORM, "transform", "TRANSFORM" },
 	{ Shader::MODE_PARTICLES, VisualShader::TYPE_START_CUSTOM, VisualShaderNode::PORT_TYPE_VECTOR_3D, "velocity", "VELOCITY" },
@@ -3559,15 +3546,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 	{ Shader::MODE_FOG, VisualShader::TYPE_FOG, VisualShaderNode::PORT_TYPE_VECTOR_3D, "uvw", "UVW" },
 	{ Shader::MODE_FOG, VisualShader::TYPE_FOG, VisualShaderNode::PORT_TYPE_VECTOR_3D, "world_position", "WORLD_POSITION" },
 
-	// Blit, Blit
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "fragcoord", "FRAGCOORD" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "modulate", "MODULATE" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_2D, "uv", "UV" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_SAMPLER, "source_texture0", "source_texture0" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_SAMPLER, "source_texture1", "source_texture1" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_SAMPLER, "source_texture2", "source_texture2" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_SAMPLER, "source_texture3", "source_texture3" },
-
 	{ Shader::MODE_MAX, VisualShader::TYPE_MAX, VisualShaderNode::PORT_TYPE_TRANSFORM, nullptr, nullptr },
 };
 
@@ -3648,11 +3626,6 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::preview_ports[] = {
 
 	{ Shader::MODE_FOG, VisualShader::TYPE_FOG, VisualShaderNode::PORT_TYPE_SCALAR, "time", "TIME" },
 
-	// Blit
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "modulate", "MODULATE" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_2D, "uv", "UV" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_SAMPLER, "source_texture", "source_texture" },
-
 	{ Shader::MODE_MAX, VisualShader::TYPE_MAX, VisualShaderNode::PORT_TYPE_TRANSFORM, nullptr, nullptr },
 };
 
@@ -4288,14 +4261,6 @@ const VisualShaderNodeOutput::Port VisualShaderNodeOutput::ports[] = {
 	{ Shader::MODE_FOG, VisualShader::TYPE_FOG, VisualShaderNode::PORT_TYPE_VECTOR_3D, "Albedo", "ALBEDO" },
 	{ Shader::MODE_FOG, VisualShader::TYPE_FOG, VisualShaderNode::PORT_TYPE_VECTOR_3D, "Emission", "EMISSION" },
 
-	////////////////////////////////////////////////////////////////////////
-	// Blit, Blit.
-	////////////////////////////////////////////////////////////////////////
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "Color0", "COLOR0" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "Color1", "COLOR1" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "Color2", "COLOR2" },
-	{ Shader::MODE_TEXTURE_BLIT, VisualShader::TYPE_TEXTURE_BLIT, VisualShaderNode::PORT_TYPE_VECTOR_4D, "Color3", "COLOR3" },
-
 	////////////////////////////////////////////////////////////////////////
 	{ Shader::MODE_MAX, VisualShader::TYPE_MAX, VisualShaderNode::PORT_TYPE_TRANSFORM, nullptr, nullptr },
 };
@@ -4521,63 +4486,63 @@ String VisualShaderNodeParameter::get_warning(Shader::Mode p_mode, VisualShader:
 		}
 		return vformat(RTR("This parameter type does not support the '%s' qualifier."), qualifier_str);
 	} else if (qualifier == Qualifier::QUAL_GLOBAL) {
-		RSE::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(parameter_name);
-		if (gvt == RSE::GLOBAL_VAR_TYPE_MAX) {
+		RS::GlobalShaderParameterType gvt = RS::get_singleton()->global_shader_parameter_get_type(parameter_name);
+		if (gvt == RS::GLOBAL_VAR_TYPE_MAX) {
 			return vformat(RTR("Global parameter '%s' does not exist.\nCreate it in the Project Settings."), parameter_name);
 		}
 		bool incompatible_type = false;
 		switch (gvt) {
-			case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+			case RS::GLOBAL_VAR_TYPE_FLOAT: {
 				if (!Object::cast_to<VisualShaderNodeFloatParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_INT: {
+			case RS::GLOBAL_VAR_TYPE_INT: {
 				if (!Object::cast_to<VisualShaderNodeIntParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_BOOL: {
+			case RS::GLOBAL_VAR_TYPE_BOOL: {
 				if (!Object::cast_to<VisualShaderNodeBooleanParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_COLOR: {
+			case RS::GLOBAL_VAR_TYPE_COLOR: {
 				if (!Object::cast_to<VisualShaderNodeColorParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_VEC3: {
+			case RS::GLOBAL_VAR_TYPE_VEC3: {
 				if (!Object::cast_to<VisualShaderNodeVec3Parameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_VEC4: {
+			case RS::GLOBAL_VAR_TYPE_VEC4: {
 				if (!Object::cast_to<VisualShaderNodeVec4Parameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+			case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 				if (!Object::cast_to<VisualShaderNodeTransformParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER2D: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER2D: {
 				if (!Object::cast_to<VisualShaderNodeTextureParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER3D: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER3D: {
 				if (!Object::cast_to<VisualShaderNodeTexture3DParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLER2DARRAY: {
 				if (!Object::cast_to<VisualShaderNodeTexture2DArrayParameter>(this)) {
 					incompatible_type = true;
 				}
 			} break;
-			case RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
+			case RS::GLOBAL_VAR_TYPE_SAMPLERCUBE: {
 				if (!Object::cast_to<VisualShaderNodeCubemapParameter>(this)) {
 					incompatible_type = true;
 				}
diff --git a/engine/scene/resources/visual_shader.h b/engine/scene/resources/visual_shader.h
index 7c1a718f..d3312816 100644
--- a/engine/scene/resources/visual_shader.h
+++ b/engine/scene/resources/visual_shader.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/string/string_builder.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/safe_refcount.h"
 #include "scene/gui/control.h"
 #include "scene/resources/shader.h"
@@ -54,7 +53,6 @@ public:
 		TYPE_PROCESS_CUSTOM,
 		TYPE_SKY,
 		TYPE_FOG,
-		TYPE_TEXTURE_BLIT,
 		TYPE_MAX
 	};
 
@@ -163,7 +161,7 @@ private:
 	Error _write_node(Type p_type, StringBuilder *p_global_code, StringBuilder *p_global_code_per_node, HashMap<Type, StringBuilder> *p_global_code_per_func, StringBuilder &r_code, Vector<DefaultTextureParam> &r_def_tex_params, const HashMap<ConnectionKey, const List<Connection>::Element *> &p_input_connections, int p_node, HashSet<int> &r_processed, bool p_for_preview, HashSet<StringName> &r_classes) const;
 
 	void _input_type_changed(Type p_type, int p_id);
-	bool has_func_name(RSE::ShaderMode p_mode, const String &p_func_name) const;
+	bool has_func_name(RenderingServer::ShaderMode p_mode, const String &p_func_name) const;
 
 	bool _check_reroute_subgraph(Type p_type, int p_target_port_type, int p_reroute_node, List<int> *r_visited_reroute_nodes = nullptr) const;
 
diff --git a/engine/scene/resources/visual_shader_nodes.compat.inc b/engine/scene/resources/visual_shader_nodes.compat.inc
index 8e4a977f..e02c3e30 100644
--- a/engine/scene/resources/visual_shader_nodes.compat.inc
+++ b/engine/scene/resources/visual_shader_nodes.compat.inc
@@ -30,9 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "visual_shader_nodes.h"
-
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 // VisualShaderNodeCubemap
diff --git a/engine/scene/resources/visual_shader_nodes.cpp b/engine/scene/resources/visual_shader_nodes.cpp
index 96ab4ba7..8d1166c0 100644
--- a/engine/scene/resources/visual_shader_nodes.cpp
+++ b/engine/scene/resources/visual_shader_nodes.cpp
@@ -31,10 +31,6 @@
 #include "visual_shader_nodes.h"
 #include "visual_shader_nodes.compat.inc"
 
-#include "core/object/class_db.h"
-#include "core/os/os.h"
-#include "servers/rendering/rendering_server.h"
-
 ////////////// Vector Base
 
 VisualShaderNodeVectorBase::PortType VisualShaderNodeVectorBase::get_input_port_type(int p_port) const {
@@ -1033,7 +1029,7 @@ void VisualShaderNodeTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_texture_type"), &VisualShaderNodeTexture::get_texture_type);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "source", PROPERTY_HINT_ENUM, "Texture,Screen,Texture2D,NormalMap2D,Depth,SamplerPort,Normal3D,Roughness"), "set_source", "get_source");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_texture", "get_texture");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_type", PROPERTY_HINT_ENUM, "Data,Color,Normal Map"), "set_texture_type", "get_texture_type");
 
 	BIND_ENUM_CONSTANT(SOURCE_TEXTURE);
@@ -1127,7 +1123,7 @@ void VisualShaderNodeCurveTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_texture", "texture"), &VisualShaderNodeCurveTexture::set_texture);
 	ClassDB::bind_method(D_METHOD("get_texture"), &VisualShaderNodeCurveTexture::get_texture);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, CurveTexture::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_texture", "get_texture");
 }
 
 bool VisualShaderNodeCurveTexture::is_use_prop_slots() const {
@@ -1212,7 +1208,7 @@ void VisualShaderNodeCurveXYZTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_texture", "texture"), &VisualShaderNodeCurveXYZTexture::set_texture);
 	ClassDB::bind_method(D_METHOD("get_texture"), &VisualShaderNodeCurveXYZTexture::get_texture);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, CurveXYZTexture::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "CurveXYZTexture"), "set_texture", "get_texture");
 }
 
 bool VisualShaderNodeCurveXYZTexture::is_use_prop_slots() const {
@@ -1447,7 +1443,7 @@ void VisualShaderNodeTexture3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_texture", "value"), &VisualShaderNodeTexture3D::set_texture);
 	ClassDB::bind_method(D_METHOD("get_texture"), &VisualShaderNodeTexture3D::get_texture);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, Texture3D::get_class_static()), "set_texture", "get_texture");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture3D"), "set_texture", "get_texture");
 }
 
 VisualShaderNodeTexture3D::VisualShaderNodeTexture3D() {
@@ -3264,7 +3260,7 @@ String VisualShaderNodeColorFunc::generate_code(Shader::Mode p_mode, VisualShade
 				code += "		vec3 c = " + p_input_vars[0] + ";\n";
 				code += "		" + p_output_vars[0] + " = max(vec3(1.055) * pow(c, vec3(0.416666667)) - vec3(0.055), vec3(0.0));\n";
 			} else {
-				code += "		vec3 c = " + p_input_vars[0] + ";\n";
+				code += "		vec3 c = clamp(" + p_input_vars[0] + ", vec3(0.0), vec3(1.0));\n";
 				code += "		const vec3 a = vec3(0.055f);\n";
 				code += "		" + p_output_vars[0] + " = mix((vec3(1.0f) + a) * pow(c.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * c.rgb, lessThan(c.rgb, vec3(0.0031308f)));\n";
 			}
diff --git a/engine/scene/resources/visual_shader_particle_nodes.cpp b/engine/scene/resources/visual_shader_particle_nodes.cpp
index db430e8e..a14c9a9e 100644
--- a/engine/scene/resources/visual_shader_particle_nodes.cpp
+++ b/engine/scene/resources/visual_shader_particle_nodes.cpp
@@ -30,8 +30,6 @@
 
 #include "visual_shader_particle_nodes.h"
 
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/mesh.h"
 
@@ -721,7 +719,7 @@ void VisualShaderNodeParticleMeshEmitter::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_surface_index", "surface_index"), &VisualShaderNodeParticleMeshEmitter::set_surface_index);
 	ClassDB::bind_method(D_METHOD("get_surface_index"), &VisualShaderNodeParticleMeshEmitter::get_surface_index);
 
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, Mesh::get_class_static()), "set_mesh", "get_mesh");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_all_surfaces"), "set_use_all_surfaces", "is_use_all_surfaces");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "surface_index"), "set_surface_index", "get_surface_index");
 }
diff --git a/engine/scene/resources/world_2d.cpp b/engine/scene/resources/world_2d.cpp
index c2749aad..1906e060 100644
--- a/engine/scene/resources/world_2d.cpp
+++ b/engine/scene/resources/world_2d.cpp
@@ -31,7 +31,6 @@
 #include "world_2d.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
 #include "servers/rendering/rendering_server.h"
 
@@ -89,7 +88,7 @@ void World2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_space"), &World2D::get_space);
 	ClassDB::bind_method(D_METHOD("get_direct_space_state"), &World2D::get_direct_space_state);
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, PhysicsDirectSpaceState2D::get_class_static(), PROPERTY_USAGE_NONE), "", "get_direct_space_state");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState2D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
 #endif // PHYSICS_2D_DISABLED
 }
 
diff --git a/engine/scene/scene_string_names.h b/engine/scene/scene_string_names.h
index b4827345..355e7889 100644
--- a/engine/scene/scene_string_names.h
+++ b/engine/scene/scene_string_names.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/string/node_path.h"
 #include "core/string/string_name.h"
 
 class SceneStringNames {
@@ -125,6 +126,8 @@ public:
 	const StringName blend_times = "blend_times";
 	const StringName speed = "speed";
 
+	const NodePath path_pp = NodePath("..");
+
 	const StringName default_ = "default"; // default would conflict with C++ keyword.
 	const StringName output = "output";
 
diff --git a/engine/scene/theme/default_theme.cpp b/engine/scene/theme/default_theme.cpp
index 3de32c44..79d25c41 100644
--- a/engine/scene/theme/default_theme.cpp
+++ b/engine/scene/theme/default_theme.cpp
@@ -669,18 +669,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("scroll_hint_vertical_color", "ScrollContainer", Color(0, 0, 0));
 	theme->set_color("scroll_hint_horizontal_color", "ScrollContainer", Color(0, 0, 0));
 
-	// Virtual Joystick
-
-	Ref<StyleBoxFlat> style_joystick = make_flat_stylebox(style_normal_color, 0, 0, 0, 0, 10000, false, 4 * scale);
-	style_joystick->set_corner_detail(24 * scale);
-	Ref<StyleBoxFlat> style_joystick_tip = make_flat_stylebox(style_normal_color, 0, 0, 0, 0, 10000);
-	style_joystick_tip->set_corner_detail(24 * scale);
-
-	theme->set_stylebox("normal_joystick", "VirtualJoystick", style_joystick);
-	theme->set_stylebox("normal_tip", "VirtualJoystick", style_joystick_tip);
-	theme->set_stylebox("pressed_joystick", "VirtualJoystick", style_joystick);
-	theme->set_stylebox("pressed_tip", "VirtualJoystick", style_joystick_tip);
-
 	// Window
 
 	theme->set_stylebox("embedded_border", "Window", sb_expand(make_flat_stylebox(style_popup_color, 10, 28, 10, 8), 8, 32, 8, 6));
@@ -772,7 +760,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("radio_unchecked_disabled", "PopupMenu", icons["radio_unchecked_disabled"]);
 	theme->set_icon("submenu", "PopupMenu", icons["popup_menu_arrow_right"]);
 	theme->set_icon("submenu_mirrored", "PopupMenu", icons["popup_menu_arrow_left"]);
-	theme->set_icon("search", "PopupMenu", icons["search"]);
 
 	theme->set_font(SceneStringName(font), "PopupMenu", Ref<Font>());
 	theme->set_font("font_separator", "PopupMenu", Ref<Font>());
@@ -790,7 +777,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("indent", "PopupMenu", Math::round(10 * scale));
 	theme->set_constant("h_separation", "PopupMenu", Math::round(4 * scale));
 	theme->set_constant("v_separation", "PopupMenu", Math::round(4 * scale));
-	theme->set_constant("search_bar_separation", "PopupMenu", Math::round(4 * scale));
 	theme->set_constant("outline_size", "PopupMenu", 0);
 	theme->set_constant("separator_outline_size", "PopupMenu", 0);
 	theme->set_constant("item_start_padding", "PopupMenu", Math::round(2 * scale));
@@ -918,7 +904,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("font_disabled_color", "Tree", control_font_disabled_color);
 	theme->set_color("font_outline_color", "Tree", Color(0, 0, 0));
 	theme->set_color("guide_color", "Tree", Color(0.7, 0.7, 0.7, 0.25));
-	theme->set_color("drop_on_item_color", "Tree", Color(1, 1, 1));
 	theme->set_color("drop_position_color", "Tree", Color(1, 1, 1));
 	theme->set_color("relationship_line_color", "Tree", Color(0.27, 0.27, 0.27));
 	theme->set_color("parent_hl_line_color", "Tree", Color(0.27, 0.27, 0.27));
@@ -1115,7 +1100,6 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("picker_cursor", "ColorPicker", icons["color_picker_cursor"]);
 	theme->set_icon("picker_cursor_bg", "ColorPicker", icons["color_picker_cursor_bg"]);
 	theme->set_icon("color_script", "ColorPicker", icons["script"]);
-	theme->set_icon("color_copy", "ColorPicker", icons["action_copy"]);
 
 	{
 		const int precision = 7;
diff --git a/engine/scene/theme/icons/action_copy.svg b/engine/scene/theme/icons/action_copy.svg
deleted file mode 100644
index 96e5b2bd..00000000
--- a/engine/scene/theme/icons/action_copy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h1V3h9V2a1 1 0 0 0-1-1zm3 3a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm1 2h7v7H6z"/></svg>
diff --git a/engine/scene/theme/icons/default_theme_icons_builders.py b/engine/scene/theme/icons/default_theme_icons_builders.py
index 66a06805..8e29af7e 100644
--- a/engine/scene/theme/icons/default_theme_icons_builders.py
+++ b/engine/scene/theme/icons/default_theme_icons_builders.py
@@ -22,6 +22,8 @@ def make_default_theme_icons_action(target, source, env):
 
     with methods.generated_wrapper(str(target[0])) as file:
         file.write(f"""\
+#include "modules/modules_enabled.gen.h"
+
 inline constexpr int default_theme_icons_count = {len(icons_names)};
 inline constexpr const char *default_theme_icons_sources[] = {{
 	{icons_raw_str}
diff --git a/engine/scene/theme/icons/search.svg b/engine/scene/theme/icons/search.svg
deleted file mode 100644
index 736d5535..00000000
--- a/engine/scene/theme/icons/search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10.168 8.754a5 5 0 1 0-1.414 1.414l4.316 4.316 1.414-1.414zM6 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6z"/></svg>
diff --git a/engine/scene/theme/theme_db.cpp b/engine/scene/theme/theme_db.cpp
index 931f3249..f0cf9393 100644
--- a/engine/scene/theme/theme_db.cpp
+++ b/engine/scene/theme/theme_db.cpp
@@ -30,12 +30,8 @@
 
 #include "theme_db.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/message_queue.h"
 #include "scene/gui/control.h"
 #include "scene/main/node.h"
 #include "scene/main/window.h"
@@ -43,7 +39,6 @@
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 #include "scene/theme/default_theme.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/text/text_server.h"
 
 // Default engine theme creation and configuration.
@@ -433,10 +428,10 @@ void ThemeDB::_bind_methods() {
 
 	ADD_GROUP("Fallback values", "fallback_");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fallback_base_scale", PROPERTY_HINT_RANGE, "0.0,2.0,0.01,or_greater"), "set_fallback_base_scale", "get_fallback_base_scale");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_font", PROPERTY_HINT_RESOURCE_TYPE, Font::get_class_static(), PROPERTY_USAGE_NONE), "set_fallback_font", "get_fallback_font");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_font", PROPERTY_HINT_RESOURCE_TYPE, "Font", PROPERTY_USAGE_NONE), "set_fallback_font", "get_fallback_font");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "fallback_font_size", PROPERTY_HINT_RANGE, "0,256,1,or_greater,suffix:px"), "set_fallback_font_size", "get_fallback_font_size");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_icon", PROPERTY_HINT_RESOURCE_TYPE, Texture2D::get_class_static(), PROPERTY_USAGE_NONE), "set_fallback_icon", "get_fallback_icon");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_stylebox", PROPERTY_HINT_RESOURCE_TYPE, StyleBox::get_class_static(), PROPERTY_USAGE_NONE), "set_fallback_stylebox", "get_fallback_stylebox");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_NONE), "set_fallback_icon", "get_fallback_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_stylebox", PROPERTY_HINT_RESOURCE_TYPE, "StyleBox", PROPERTY_USAGE_NONE), "set_fallback_stylebox", "get_fallback_stylebox");
 
 	ADD_SIGNAL(MethodInfo("fallback_changed"));
 }
diff --git a/engine/scene/theme/theme_db.h b/engine/scene/theme/theme_db.h
index 9153540d..e9d7f5f8 100644
--- a/engine/scene/theme/theme_db.h
+++ b/engine/scene/theme/theme_db.h
@@ -44,28 +44,28 @@ class ThemeContext;
 // Macros for binding theme items of this class. This information is used for the documentation, theme
 // overrides, etc. This is also the basis for theme cache.
 
-#define BIND_THEME_ITEM(m_data_type, m_class, m_prop) \
-	ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, #m_prop, \
-			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
-				m_class *p_cast = Object::cast_to<m_class>(p_instance); \
+#define BIND_THEME_ITEM(m_data_type, m_class, m_prop)                                                       \
+	ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, #m_prop,            \
+			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) {            \
+				m_class *p_cast = Object::cast_to<m_class>(p_instance);                                     \
 				p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
 			})
 
-#define BIND_THEME_ITEM_CUSTOM(m_data_type, m_class, m_prop, m_item_name) \
-	ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, m_item_name, \
-			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
-				m_class *p_cast = Object::cast_to<m_class>(p_instance); \
+#define BIND_THEME_ITEM_CUSTOM(m_data_type, m_class, m_prop, m_item_name)                                   \
+	ThemeDB::get_singleton()->bind_class_item(m_data_type, get_class_static(), #m_prop, m_item_name,        \
+			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) {            \
+				m_class *p_cast = Object::cast_to<m_class>(p_instance);                                     \
 				p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
 			})
 
 // Macro for binding theme items used by this class, but defined/binded by other classes. This is primarily used for
 // the theme cache. Can also be used to list such items in documentation.
 
-#define BIND_THEME_ITEM_EXT(m_data_type, m_class, m_prop, m_item_name, m_type_name) \
+#define BIND_THEME_ITEM_EXT(m_data_type, m_class, m_prop, m_item_name, m_type_name)                                        \
 	ThemeDB::get_singleton()->bind_class_external_item(m_data_type, get_class_static(), #m_prop, m_item_name, m_type_name, \
-			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) { \
-				m_class *p_cast = Object::cast_to<m_class>(p_instance); \
-				p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name); \
+			[](Node *p_instance, const StringName &p_item_name, const StringName &p_type_name) {                           \
+				m_class *p_cast = Object::cast_to<m_class>(p_instance);                                                    \
+				p_cast->theme_cache.m_prop = p_cast->get_theme_item(m_data_type, p_item_name, p_type_name);                \
 			})
 
 class ThemeDB : public Object {
diff --git a/engine/scene/theme/theme_owner.cpp b/engine/scene/theme/theme_owner.cpp
index 4243926e..75b3c8f4 100644
--- a/engine/scene/theme/theme_owner.cpp
+++ b/engine/scene/theme/theme_owner.cpp
@@ -30,7 +30,6 @@
 
 #include "theme_owner.h"
 
-#include "core/object/callable_mp.h"
 #include "scene/gui/control.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
diff --git a/engine/scu_builders.py b/engine/scu_builders.py
index 95acb516..3efb8bf3 100644
--- a/engine/scu_builders.py
+++ b/engine/scu_builders.py
@@ -272,30 +272,23 @@ def generate_scu_files(max_includes_per_scu):
         return
 
     process_folder(["core"])
-    process_folder(["core/config"])
     process_folder(["core/crypto"])
     process_folder(["core/debugger"])
-    process_folder(["core/error"])
     process_folder(["core/extension"])
     process_folder(["core/input"])
     process_folder(["core/io"])
     process_folder(["core/math"])
     process_folder(["core/object"])
     process_folder(["core/os"])
-    process_folder(["core/profiling"])
     process_folder(["core/string"])
-    process_folder(["core/templates"])
     process_folder(["core/variant"], ["variant_utility"])
 
     process_folder(["drivers/unix"])
     process_folder(["drivers/png"])
 
-    process_folder(["drivers/gles3"])
     process_folder(["drivers/gles3/effects"])
     process_folder(["drivers/gles3/storage"])
 
-    process_folder(["drivers/vulkan"])
-
     process_folder(["editor"], [], 32)
     process_folder(["editor/animation"])
     process_folder(["editor/asset_library"])
@@ -307,12 +300,13 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["editor/export"])
     process_folder(["editor/file_system"])
     process_folder(["editor/gui"])
-    process_folder(["editor/import"])
-    process_folder(["editor/import/3d"])
     process_folder(["editor/inspector"], ["editor_resource_preview"])
-    process_folder(["editor/plugins"])
+    process_folder(["editor/themes"])
     process_folder(["editor/project_manager"])
     process_folder(["editor/project_upgrade"])
+    process_folder(["editor/import"])
+    process_folder(["editor/import/3d"])
+    process_folder(["editor/plugins"])
     process_folder(["editor/run"])
     process_folder(["editor/scene"])
     process_folder(["editor/scene/2d"])
@@ -325,7 +319,6 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["editor/script"])
     process_folder(["editor/settings"])
     process_folder(["editor/shader"])
-    process_folder(["editor/themes"])
     process_folder(["editor/translations"])
     process_folder(["editor/version_control"])
 
@@ -336,51 +329,34 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["platform/web/export"])
     process_folder(["platform/windows/export"])
 
-    process_folder(["modules/csg"])
-    process_folder(["modules/betsy"])
-    process_folder(["modules/gdscript"])
-    process_folder(["modules/gdscript/editor"])
-    process_folder(["modules/gdscript/language_server"])
+    process_folder(["modules/lightmapper_rd"])
     process_folder(["modules/gltf"])
     process_folder(["modules/gltf/structures"])
     process_folder(["modules/gltf/editor"])
     process_folder(["modules/gltf/extensions"])
     process_folder(["modules/gltf/extensions/physics"])
-    process_folder(["modules/godot_physics_2d"])
-    process_folder(["modules/godot_physics_3d"])
-    process_folder(["modules/godot_physics_3d/joints"])
-    process_folder(["modules/gridmap"])
-    process_folder(["modules/interactive_music"])
-    process_folder(["modules/jolt_physics"])
-    process_folder(["modules/jolt_physics/joints"])
-    process_folder(["modules/jolt_physics/objects"])
-    process_folder(["modules/jolt_physics/shapes"])
-    process_folder(["modules/jolt_physics/spaces"])
-    process_folder(["modules/lightmapper_rd"])
-    process_folder(["modules/mbedtls"])
-    process_folder(["modules/mono"])
-    process_folder(["modules/multiplayer"])
-    process_folder(["modules/multiplayer/editor"])
     process_folder(["modules/navigation_3d"])
     process_folder(["modules/navigation_3d/3d"])
-    process_folder(["modules/navigation_3d/editor"])
     process_folder(["modules/navigation_2d"])
     process_folder(["modules/navigation_2d/2d"])
-    process_folder(["modules/navigation_2d/editor"])
-    process_folder(["modules/objectdb_profiler/editor"])
-    process_folder(["modules/objectdb_profiler/editor/data_viewers"])
+    process_folder(["modules/webrtc"])
+    process_folder(["modules/websocket"])
+    process_folder(["modules/gridmap"])
+    process_folder(["modules/multiplayer"])
+    process_folder(["modules/multiplayer/editor"])
     process_folder(["modules/openxr"], ["register_types"])
     process_folder(["modules/openxr/action_map"])
     process_folder(["modules/openxr/editor"])
-    process_folder(
-        ["modules/openxr/extensions"], ["openxr_fb_update_swapchain_extension", "openxr_fb_foveation_extension"]
-    )
-    process_folder(["modules/openxr/extensions/spatial_entities"])
+    # process_folder(["modules/openxr/extensions"])  # Sensitive include order for platform code.
     process_folder(["modules/openxr/scene"])
+    process_folder(["modules/godot_physics_2d"])
+    process_folder(["modules/godot_physics_3d"])
+    process_folder(["modules/godot_physics_3d/joints"])
 
-    process_folder(["modules/webrtc"])
-    process_folder(["modules/websocket"])
-    process_folder(["modules/webxr"])
+    process_folder(["modules/csg"])
+    process_folder(["modules/gdscript"])
+    process_folder(["modules/gdscript/editor"])
+    process_folder(["modules/gdscript/language_server"])
 
     process_folder(["scene/2d"])
     process_folder(["scene/2d/physics"])
@@ -390,22 +366,15 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["scene/3d/physics/joints"])
     process_folder(["scene/3d/xr"])
     process_folder(["scene/animation"])
-    process_folder(["scene/debugger"])
     process_folder(["scene/gui"])
     process_folder(["scene/main"])
+    process_folder(["scene/theme"])
     process_folder(["scene/resources"])
     process_folder(["scene/resources/2d"])
     process_folder(["scene/resources/2d/skeleton"])
     process_folder(["scene/resources/3d"])
-    process_folder(["scene/theme"])
 
     process_folder(["servers"])
-    process_folder(["servers/audio"])
-    process_folder(["servers/audio/effects"])
-    process_folder(["servers/display"])
-    process_folder(["servers/movie_writer"])
-    process_folder(["servers/navigation_2d"])
-    process_folder(["servers/navigation_3d"])
     process_folder(["servers/rendering"])
     process_folder(["servers/rendering/dummy/storage"])
     process_folder(["servers/rendering/storage"])
@@ -415,30 +384,12 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["servers/rendering/renderer_rd/storage_rd"])
     process_folder(["servers/rendering/renderer_rd/forward_clustered"])
     process_folder(["servers/rendering/renderer_rd/forward_mobile"])
+    process_folder(["servers/audio"])
+    process_folder(["servers/audio/effects"])
+    process_folder(["servers/navigation_2d"])
+    process_folder(["servers/navigation_3d"])
     process_folder(["servers/xr"])
 
-    # NOTE: Tests previously compiled as one large unit. We replicate this behavior in SCU builds.
-    process_folder(
-        [
-            "tests",
-            "/core",
-            "/core/config",
-            "/core/input",
-            "/core/io",
-            "/core/math",
-            "/core/object",
-            "/core/os",
-            "/core/string",
-            "/core/templates",
-            "/core/threads",
-            "/core/variant",
-            "/scene",
-            "/servers",
-            "/servers/rendering",
-        ],
-        ["test_macros", "test_main"],
-    )
-
     # Finally change back the path to the calling folder
     os.chdir(curr_folder)
 
diff --git a/engine/servers/audio/audio_driver_dummy.h b/engine/servers/audio/audio_driver_dummy.h
index fe292c8d..a3fdbe7d 100644
--- a/engine/servers/audio/audio_driver_dummy.h
+++ b/engine/servers/audio/audio_driver_dummy.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
+#include "servers/audio/audio_server.h"
+
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
-#include "servers/audio/audio_server.h"
 
 class AudioDriverDummy : public AudioDriver {
 	Thread thread;
diff --git a/engine/servers/audio/audio_effect.cpp b/engine/servers/audio/audio_effect.cpp
index e018be43..ac334eb7 100644
--- a/engine/servers/audio/audio_effect.cpp
+++ b/engine/servers/audio/audio_effect.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_effect.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void AudioEffectInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	GDVIRTUAL_CALL(_process, p_src_frames, p_dst_frames, p_frame_count);
 }
diff --git a/engine/servers/audio/audio_effect.h b/engine/servers/audio/audio_effect.h
index 06cd8fe3..1ecb1e4e 100644
--- a/engine/servers/audio/audio_effect.h
+++ b/engine/servers/audio/audio_effect.h
@@ -32,7 +32,7 @@
 
 #include "core/io/resource.h"
 #include "core/math/audio_frame.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 
 class AudioEffectInstance : public RefCounted {
diff --git a/engine/servers/audio/audio_rb_resampler.cpp b/engine/servers/audio/audio_rb_resampler.cpp
index bd50e34b..86369b64 100644
--- a/engine/servers/audio/audio_rb_resampler.cpp
+++ b/engine/servers/audio/audio_rb_resampler.cpp
@@ -31,7 +31,6 @@
 #include "audio_rb_resampler.h"
 
 #include "core/math/audio_frame.h"
-#include "core/math/math_funcs_binary.h"
 #include "core/os/memory.h"
 
 int AudioRBResampler::get_channel_count() const {
@@ -179,7 +178,7 @@ int AudioRBResampler::get_num_of_ready_frames() {
 Error AudioRBResampler::setup(int p_channels, int p_src_mix_rate, int p_target_mix_rate, int p_buffer_msec, int p_minbuff_needed) {
 	ERR_FAIL_COND_V(p_channels != 1 && p_channels != 2 && p_channels != 4 && p_channels != 6 && p_channels != 8, ERR_INVALID_PARAMETER);
 
-	int desired_rb_bits = Math::nearest_shift((uint32_t)MAX((p_buffer_msec / 1000.0) * p_src_mix_rate, p_minbuff_needed));
+	int desired_rb_bits = nearest_shift((uint32_t)MAX((p_buffer_msec / 1000.0) * p_src_mix_rate, p_minbuff_needed));
 
 	bool recreate = !rb;
 
diff --git a/engine/servers/audio/audio_server.cpp b/engine/servers/audio/audio_server.cpp
index 98bb2ceb..b90ce169 100644
--- a/engine/servers/audio/audio_server.cpp
+++ b/engine/servers/audio/audio_server.cpp
@@ -35,7 +35,6 @@
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/audio_frame.h"
-#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_name.h"
 #include "core/templates/pair.h"
@@ -59,16 +58,6 @@ void AudioDriver::set_singleton() {
 	singleton = this;
 }
 
-#ifdef DEBUG_ENABLED
-void AudioDriver::start_counting_ticks() {
-	prof_ticks.set(OS::get_singleton()->get_ticks_usec());
-}
-
-void AudioDriver::stop_counting_ticks() {
-	prof_time.add(OS::get_singleton()->get_ticks_usec() - prof_ticks.get());
-}
-#endif // DEBUG_ENABLED
-
 void AudioDriver::audio_server_process(int p_frames, int32_t *p_buffer, bool p_update_mix_time) {
 	if (p_update_mix_time) {
 		update_mix_time(p_frames);
diff --git a/engine/servers/audio/audio_server.h b/engine/servers/audio/audio_server.h
index efb0a58e..5c2a9bef 100644
--- a/engine/servers/audio/audio_server.h
+++ b/engine/servers/audio/audio_server.h
@@ -31,6 +31,8 @@
 #pragma once
 
 #include "core/math/audio_frame.h"
+#include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/templates/safe_list.h"
 #include "core/variant/variant.h"
 #include "servers/audio/audio_effect.h"
@@ -68,8 +70,8 @@ protected:
 	int _get_configured_mix_rate();
 
 #ifdef DEBUG_ENABLED
-	void start_counting_ticks();
-	void stop_counting_ticks();
+	_FORCE_INLINE_ void start_counting_ticks() { prof_ticks.set(OS::get_singleton()->get_ticks_usec()); }
+	_FORCE_INLINE_ void stop_counting_ticks() { prof_time.add(OS::get_singleton()->get_ticks_usec() - prof_ticks.get()); }
 #else
 	_FORCE_INLINE_ void start_counting_ticks() {}
 	_FORCE_INLINE_ void stop_counting_ticks() {}
@@ -561,3 +563,5 @@ protected:
 public:
 	AudioBusLayout();
 };
+
+typedef AudioServer AS;
diff --git a/engine/servers/audio/audio_stream.cpp b/engine/servers/audio/audio_stream.cpp
index 6ea294b4..452eb104 100644
--- a/engine/servers/audio/audio_stream.cpp
+++ b/engine/servers/audio/audio_stream.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 
 void AudioStreamPlayback::start(double p_from_pos) {
 	GDVIRTUAL_CALL(_start, p_from_pos);
@@ -780,9 +779,9 @@ void AudioStreamRandomizer::_bind_methods() {
 
 	base_property_helper.set_prefix("stream_");
 	base_property_helper.set_array_length_getter(&AudioStreamRandomizer::get_streams_count);
-	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, AudioStream::get_class_static()), defaults.stream, &AudioStreamRandomizer::set_stream, &AudioStreamRandomizer::get_stream);
+	base_property_helper.register_property(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), defaults.stream, &AudioStreamRandomizer::set_stream, &AudioStreamRandomizer::get_stream);
 	base_property_helper.register_property(PropertyInfo(Variant::FLOAT, "weight", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), defaults.weight, &AudioStreamRandomizer::set_stream_probability_weight, &AudioStreamRandomizer::get_stream_probability_weight);
-	PropertyListHelper::register_base_helper(get_class_static(), &base_property_helper);
+	PropertyListHelper::register_base_helper(&base_property_helper);
 }
 
 AudioStreamRandomizer::AudioStreamRandomizer() {
diff --git a/engine/servers/audio/audio_stream.h b/engine/servers/audio/audio_stream.h
index 502f6005..ea768655 100644
--- a/engine/servers/audio/audio_stream.h
+++ b/engine/servers/audio/audio_stream.h
@@ -31,12 +31,13 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
-#include "core/variant/native_ptr.h"
-#include "core/variant/typed_array.h"
 #include "scene/property_list_helper.h"
 #include "servers/audio/audio_server.h"
 
+#include "core/object/gdvirtual.gen.inc"
+#include "core/variant/native_ptr.h"
+#include "core/variant/typed_array.h"
+
 class AudioStream;
 
 class AudioSamplePlayback : public RefCounted {
diff --git a/engine/servers/audio/effects/audio_effect_amplify.cpp b/engine/servers/audio/effects/audio_effect_amplify.cpp
index 78721452..9824ed0a 100644
--- a/engine/servers/audio/effects/audio_effect_amplify.cpp
+++ b/engine/servers/audio/effects/audio_effect_amplify.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_effect_amplify.h"
 
-#include "core/object/class_db.h"
-
 void AudioEffectAmplifyInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	//multiply volume interpolating to avoid clicks if this changes
 	float volume_db = base->volume_db;
diff --git a/engine/servers/audio/effects/audio_effect_capture.cpp b/engine/servers/audio/effects/audio_effect_capture.cpp
index 467b8c1c..ecc0bd93 100644
--- a/engine/servers/audio/effects/audio_effect_capture.cpp
+++ b/engine/servers/audio/effects/audio_effect_capture.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_effect_capture.h"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 bool AudioEffectCapture::can_get_buffer(int p_frames) const {
@@ -80,7 +79,7 @@ Ref<AudioEffectInstance> AudioEffectCapture::instantiate() {
 	if (!buffer_initialized) {
 		float target_buffer_size = AudioServer::get_singleton()->get_mix_rate() * buffer_length_seconds;
 		ERR_FAIL_COND_V(target_buffer_size <= 0 || target_buffer_size >= (1 << 27), Ref<AudioEffectInstance>());
-		buffer.resize(Math::nearest_shift((uint32_t)target_buffer_size));
+		buffer.resize(nearest_shift((uint32_t)target_buffer_size));
 		buffer_initialized = true;
 	}
 
diff --git a/engine/servers/audio/effects/audio_effect_chorus.cpp b/engine/servers/audio/effects/audio_effect_chorus.cpp
index 1fb48eec..99f40c0f 100644
--- a/engine/servers/audio/effects/audio_effect_chorus.cpp
+++ b/engine/servers/audio/effects/audio_effect_chorus.cpp
@@ -29,9 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_chorus.h"
-
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectChorusInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_compressor.cpp b/engine/servers/audio/effects/audio_effect_compressor.cpp
index 4f41d35c..694b423a 100644
--- a/engine/servers/audio/effects/audio_effect_compressor.cpp
+++ b/engine/servers/audio/effects/audio_effect_compressor.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_compressor.h"
-
-#include "core/config/engine.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectCompressorInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_delay.cpp b/engine/servers/audio/effects/audio_effect_delay.cpp
index c40a68bd..7f4848ce 100644
--- a/engine/servers/audio/effects/audio_effect_delay.cpp
+++ b/engine/servers/audio/effects/audio_effect_delay.cpp
@@ -31,7 +31,6 @@
 #include "audio_effect_delay.h"
 
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectDelayInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_distortion.cpp b/engine/servers/audio/effects/audio_effect_distortion.cpp
index 62c61827..8cd99aba 100644
--- a/engine/servers/audio/effects/audio_effect_distortion.cpp
+++ b/engine/servers/audio/effects/audio_effect_distortion.cpp
@@ -29,9 +29,7 @@
 /**************************************************************************/
 
 #include "audio_effect_distortion.h"
-
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectDistortionInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_eq.cpp b/engine/servers/audio/effects/audio_effect_eq.cpp
index fc9f0dfc..dfa463fe 100644
--- a/engine/servers/audio/effects/audio_effect_eq.cpp
+++ b/engine/servers/audio/effects/audio_effect_eq.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_effect_eq.h"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectEQInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_filter.cpp b/engine/servers/audio/effects/audio_effect_filter.cpp
index 190ec44a..cd393d65 100644
--- a/engine/servers/audio/effects/audio_effect_filter.cpp
+++ b/engine/servers/audio/effects/audio_effect_filter.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_filter.h"
-
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 template <int S>
diff --git a/engine/servers/audio/effects/audio_effect_hard_limiter.cpp b/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
index f925a738..213dbf08 100644
--- a/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
+++ b/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_effect_hard_limiter.h"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectHardLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_limiter.cpp b/engine/servers/audio/effects/audio_effect_limiter.cpp
index 42faac53..8c5dc731 100644
--- a/engine/servers/audio/effects/audio_effect_limiter.cpp
+++ b/engine/servers/audio/effects/audio_effect_limiter.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_effect_limiter.h"
 
-#include "core/object/class_db.h"
-
 void AudioEffectLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float threshdb = base->threshold;
 	float ceiling = Math::db_to_linear(base->ceiling);
diff --git a/engine/servers/audio/effects/audio_effect_panner.cpp b/engine/servers/audio/effects/audio_effect_panner.cpp
index 5d755a58..3fbdcd45 100644
--- a/engine/servers/audio/effects/audio_effect_panner.cpp
+++ b/engine/servers/audio/effects/audio_effect_panner.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_effect_panner.h"
 
-#include "core/object/class_db.h"
-
 void AudioEffectPannerInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float lvol = CLAMP(1.0 - base->pan, 0, 1);
 	float rvol = CLAMP(1.0 + base->pan, 0, 1);
diff --git a/engine/servers/audio/effects/audio_effect_phaser.cpp b/engine/servers/audio/effects/audio_effect_phaser.cpp
index 839e4b00..699d772b 100644
--- a/engine/servers/audio/effects/audio_effect_phaser.cpp
+++ b/engine/servers/audio/effects/audio_effect_phaser.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_phaser.h"
-
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_pitch_shift.cpp b/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
index a64137cb..6b7c406e 100644
--- a/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
+++ b/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
@@ -31,7 +31,6 @@
 #include "audio_effect_pitch_shift.h"
 
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 /* Thirdparty code, so disable clang-format with Godot style */
diff --git a/engine/servers/audio/effects/audio_effect_record.cpp b/engine/servers/audio/effects/audio_effect_record.cpp
index 8919e861..2e2560f1 100644
--- a/engine/servers/audio/effects/audio_effect_record.cpp
+++ b/engine/servers/audio/effects/audio_effect_record.cpp
@@ -31,8 +31,6 @@
 #include "audio_effect_record.h"
 
 #include "core/io/marshalls.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {
diff --git a/engine/servers/audio/effects/audio_effect_reverb.cpp b/engine/servers/audio/effects/audio_effect_reverb.cpp
index ea516169..d77b8bbe 100644
--- a/engine/servers/audio/effects/audio_effect_reverb.cpp
+++ b/engine/servers/audio/effects/audio_effect_reverb.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_effect_reverb.h"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectReverbInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc
deleted file mode 100644
index 1f3a7b3a..00000000
--- a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************/
-/*  audio_effect_spectrum_analyzer.compat.inc                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "audio_effect_spectrum_analyzer.h"
-
-#include "core/object/class_db.h"
-
-void AudioEffectSpectrumAnalyzer::_set_tap_back_pos_bind_compat_114355(float p_seconds) {
-	WARN_PRINT_ONCE("AudioEffectSpectrumAnalyzer.set_tap_back_pos() is deprecated and the value will be discarded.");
-}
-
-float AudioEffectSpectrumAnalyzer::_get_tap_back_pos_bind_compat_114355() const {
-	WARN_PRINT_ONCE("AudioEffectSpectrumAnalyzer.get_tap_back_pos() is deprecated and will only return the original default value.");
-	return 0.01;
-}
-
-void AudioEffectSpectrumAnalyzer::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("set_tap_back_pos", "seconds"), &AudioEffectSpectrumAnalyzer::_set_tap_back_pos_bind_compat_114355);
-	ClassDB::bind_compatibility_method(D_METHOD("get_tap_back_pos"), &AudioEffectSpectrumAnalyzer::_get_tap_back_pos_bind_compat_114355);
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
index 8fc5c61e..2bc3cbc4 100644
--- a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
+++ b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
@@ -29,9 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_spectrum_analyzer.h"
-#include "audio_effect_spectrum_analyzer.compat.inc"
-
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
@@ -49,8 +46,7 @@ static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
 {
 	float wr, wi, arg, *p1, *p2, temp;
 	float tr, ti, ur, ui, *p1r, *p1i, *p2r, *p2i;
-	long i, bitm, j, le, le2, k, logN;
-	logN = (long)(Math::log((double)fftFrameSize) / Math::log(2.) + .5);
+	long i, bitm, j, le, le2, k;
 
 	for (i = 2; i < 2 * fftFrameSize - 2; i += 2) {
 		for (bitm = 2, j = 0; bitm < 2 * fftFrameSize; bitm <<= 1) {
@@ -70,7 +66,7 @@ static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
 			*p2 = temp;
 		}
 	}
-	for (k = 0, le = 2; k < logN; k++) {
+	for (k = 0, le = 2; k < (long)(std::log((double)fftFrameSize) / std::log(2.) + .5); k++) {
 		le <<= 1;
 		le2 = le >> 1;
 		ur = 1.0;
@@ -103,6 +99,8 @@ static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
 }
 
 void AudioEffectSpectrumAnalyzerInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
+	uint64_t time = OS::get_singleton()->get_ticks_usec();
+
 	//copy everything over first, since this only really does capture
 	for (int i = 0; i < p_frame_count; i++) {
 		p_dst_frames[i] = p_src_frames[i];
@@ -112,7 +110,7 @@ void AudioEffectSpectrumAnalyzerInstance::process(const AudioFrame *p_src_frames
 	while (p_frame_count) {
 		int to_fill = fft_size * 2 - temporal_fft_pos;
 		to_fill = MIN(to_fill, p_frame_count);
-		const double to_fill_step = Math::TAU / (double)(fft_size * 2);
+		const double to_fill_step = Math::TAU / (double)fft_size;
 
 		float *fftw = temporal_fft.ptrw();
 		for (int i = 0; i < to_fill; i++) { //left and right buffers
@@ -145,6 +143,10 @@ void AudioEffectSpectrumAnalyzerInstance::process(const AudioFrame *p_src_frames
 			temporal_fft_pos = 0;
 		}
 	}
+
+	//determine time of capture
+	double remainder_sec = (temporal_fft_pos / mix_rate); //subtract remainder from mix time
+	last_fft_time = time - uint64_t(remainder_sec * 1000000.0);
 }
 
 void AudioEffectSpectrumAnalyzerInstance::_bind_methods() {
@@ -154,8 +156,24 @@ void AudioEffectSpectrumAnalyzerInstance::_bind_methods() {
 }
 
 Vector2 AudioEffectSpectrumAnalyzerInstance::get_magnitude_for_frequency_range(float p_begin, float p_end, MagnitudeMode p_mode) const {
+	if (last_fft_time == 0) {
+		return Vector2();
+	}
+	uint64_t time = OS::get_singleton()->get_ticks_usec();
+	float diff = double(time - last_fft_time) / 1000000.0 + base->get_tap_back_pos();
+	diff -= AudioServer::get_singleton()->get_output_latency();
+	float fft_time_size = float(fft_size) / mix_rate;
+
 	int fft_index = fft_pos;
 
+	while (diff > fft_time_size) {
+		diff -= fft_time_size;
+		fft_index -= 1;
+		if (fft_index < 0) {
+			fft_index = fft_count - 1;
+		}
+	}
+
 	int begin_pos = p_begin * fft_size / (mix_rate * 0.5);
 	int end_pos = p_end * fft_size / (mix_rate * 0.5);
 
@@ -198,6 +216,7 @@ Ref<AudioEffectInstance> AudioEffectSpectrumAnalyzer::instantiate() {
 	ins->mix_rate = AudioServer::get_singleton()->get_mix_rate();
 	ins->fft_count = (buffer_length / (float(ins->fft_size) / ins->mix_rate)) + 1;
 	ins->fft_pos = 0;
+	ins->last_fft_time = 0;
 	ins->fft_history.resize(ins->fft_count);
 	ins->temporal_fft.resize(ins->fft_size * 8); //x2 stereo, x2 amount of samples for freqs, x2 for input
 	ins->temporal_fft_pos = 0;
@@ -218,6 +237,14 @@ float AudioEffectSpectrumAnalyzer::get_buffer_length() const {
 	return buffer_length;
 }
 
+void AudioEffectSpectrumAnalyzer::set_tap_back_pos(float p_seconds) {
+	tapback_pos = p_seconds;
+}
+
+float AudioEffectSpectrumAnalyzer::get_tap_back_pos() const {
+	return tapback_pos;
+}
+
 void AudioEffectSpectrumAnalyzer::set_fft_size(FFTSize p_fft_size) {
 	ERR_FAIL_INDEX(p_fft_size, FFT_SIZE_MAX);
 	fft_size = p_fft_size;
@@ -231,10 +258,14 @@ void AudioEffectSpectrumAnalyzer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_buffer_length", "seconds"), &AudioEffectSpectrumAnalyzer::set_buffer_length);
 	ClassDB::bind_method(D_METHOD("get_buffer_length"), &AudioEffectSpectrumAnalyzer::get_buffer_length);
 
+	ClassDB::bind_method(D_METHOD("set_tap_back_pos", "seconds"), &AudioEffectSpectrumAnalyzer::set_tap_back_pos);
+	ClassDB::bind_method(D_METHOD("get_tap_back_pos"), &AudioEffectSpectrumAnalyzer::get_tap_back_pos);
+
 	ClassDB::bind_method(D_METHOD("set_fft_size", "size"), &AudioEffectSpectrumAnalyzer::set_fft_size);
 	ClassDB::bind_method(D_METHOD("get_fft_size"), &AudioEffectSpectrumAnalyzer::get_fft_size);
 
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "buffer_length", PROPERTY_HINT_RANGE, "0.1,4,0.1,suffix:s"), "set_buffer_length", "get_buffer_length");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "tap_back_pos", PROPERTY_HINT_RANGE, "0.1,4,0.1"), "set_tap_back_pos", "get_tap_back_pos");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "fft_size", PROPERTY_HINT_ENUM, "256,512,1024,2048,4096"), "set_fft_size", "get_fft_size");
 
 	BIND_ENUM_CONSTANT(FFT_SIZE_256);
@@ -247,5 +278,6 @@ void AudioEffectSpectrumAnalyzer::_bind_methods() {
 
 AudioEffectSpectrumAnalyzer::AudioEffectSpectrumAnalyzer() {
 	buffer_length = 2;
+	tapback_pos = 0.01;
 	fft_size = FFT_SIZE_1024;
 }
diff --git a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
index 075a9072..746f75aa 100644
--- a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
+++ b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
@@ -54,6 +54,7 @@ private:
 	int fft_count;
 	int fft_pos;
 	float mix_rate;
+	uint64_t last_fft_time;
 
 protected:
 	static void _bind_methods();
@@ -81,21 +82,18 @@ public:
 public:
 	friend class AudioEffectSpectrumAnalyzerInstance;
 	float buffer_length;
+	float tapback_pos;
 	FFTSize fft_size;
 
 protected:
 	static void _bind_methods();
 
-#ifndef DISABLE_DEPRECATED
-	void _set_tap_back_pos_bind_compat_114355(float p_seconds);
-	float _get_tap_back_pos_bind_compat_114355() const;
-	static void _bind_compatibility_methods();
-#endif
-
 public:
 	Ref<AudioEffectInstance> instantiate() override;
 	void set_buffer_length(float p_seconds);
 	float get_buffer_length() const;
+	void set_tap_back_pos(float p_seconds);
+	float get_tap_back_pos() const;
 
 	void set_fft_size(FFTSize);
 	FFTSize get_fft_size() const;
diff --git a/engine/servers/audio/effects/audio_effect_stereo_enhance.cpp b/engine/servers/audio/effects/audio_effect_stereo_enhance.cpp
index 582fda35..93559d25 100644
--- a/engine/servers/audio/effects/audio_effect_stereo_enhance.cpp
+++ b/engine/servers/audio/effects/audio_effect_stereo_enhance.cpp
@@ -30,7 +30,6 @@
 
 #include "audio_effect_stereo_enhance.h"
 
-#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectStereoEnhanceInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/engine/servers/audio/effects/audio_stream_generator.cpp b/engine/servers/audio/effects/audio_stream_generator.cpp
index 709fd272..08ec27c8 100644
--- a/engine/servers/audio/effects/audio_stream_generator.cpp
+++ b/engine/servers/audio/effects/audio_stream_generator.cpp
@@ -30,8 +30,6 @@
 
 #include "audio_stream_generator.h"
 
-#include "core/object/class_db.h"
-
 void AudioStreamGenerator::set_mix_rate(float p_mix_rate) {
 	mix_rate = p_mix_rate;
 }
@@ -73,7 +71,7 @@ Ref<AudioStreamPlayback> AudioStreamGenerator::instantiate_playback() {
 	playback.instantiate();
 	playback->generator = this;
 	uint32_t target_buffer_size = _get_target_rate() * buffer_len;
-	playback->buffer.resize(Math::nearest_shift(target_buffer_size));
+	playback->buffer.resize(nearest_shift(target_buffer_size));
 	playback->buffer.clear();
 	return playback;
 }
diff --git a/engine/servers/audio/effects/eq_filter.cpp b/engine/servers/audio/effects/eq_filter.cpp
index 3b37cd04..3cf2674e 100644
--- a/engine/servers/audio/effects/eq_filter.cpp
+++ b/engine/servers/audio/effects/eq_filter.cpp
@@ -49,7 +49,7 @@ static int solve_quadratic(double a, double b, double c, double *r1, double *r2)
 		return 0;
 	}
 
-	squared = Math::sqrt(squared);
+	squared = std::sqrt(squared);
 
 	*r1 = (-b + squared) / base;
 	*r2 = (-b - squared) / base;
@@ -67,7 +67,7 @@ EQ::BandProcess::BandProcess() {
 }
 
 void EQ::recalculate_band_coefficients() {
-#define BAND_LOG(m_f) (Math::log((m_f)) / Math::log(2.))
+#define BAND_LOG(m_f) (std::log((m_f)) / std::log(2.))
 
 	for (int i = 0; i < band.size(); i++) {
 		double octave_size;
@@ -84,17 +84,17 @@ void EQ::recalculate_band_coefficients() {
 			octave_size = (next + prev) / 2.0;
 		}
 
-		double frq_l = Math::round(frq / Math::pow(2.0, octave_size / 2.0));
+		double frq_l = std::round(frq / std::pow(2.0, octave_size / 2.0));
 
 		double side_gain2 = POW2(Math::SQRT12);
 		double th = Math::TAU * frq / mix_rate;
 		double th_l = Math::TAU * frq_l / mix_rate;
 
-		double c2a = side_gain2 * POW2(Math::cos(th)) - 2.0 * side_gain2 * Math::cos(th_l) * Math::cos(th) + side_gain2 - POW2(Math::sin(th_l));
+		double c2a = side_gain2 * POW2(std::cos(th)) - 2.0 * side_gain2 * std::cos(th_l) * std::cos(th) + side_gain2 - POW2(std::sin(th_l));
 
-		double c2b = 2.0 * side_gain2 * POW2(Math::cos(th_l)) + side_gain2 * POW2(Math::cos(th)) - 2.0 * side_gain2 * Math::cos(th_l) * Math::cos(th) - side_gain2 + POW2(Math::sin(th_l));
+		double c2b = 2.0 * side_gain2 * POW2(std::cos(th_l)) + side_gain2 * POW2(std::cos(th)) - 2.0 * side_gain2 * std::cos(th_l) * std::cos(th) - side_gain2 + POW2(std::sin(th_l));
 
-		double c2c = 0.25 * side_gain2 * POW2(Math::cos(th)) - 0.5 * side_gain2 * Math::cos(th_l) * Math::cos(th) + 0.25 * side_gain2 - 0.25 * POW2(Math::sin(th_l));
+		double c2c = 0.25 * side_gain2 * POW2(std::cos(th)) - 0.5 * side_gain2 * std::cos(th_l) * std::cos(th) + 0.25 * side_gain2 - 0.25 * POW2(std::sin(th_l));
 
 		//printf("band %i, precoefs = %f,%f,%f\n",i,c2a,c2b,c2c);
 
@@ -107,7 +107,7 @@ void EQ::recalculate_band_coefficients() {
 
 		band.write[i].c1 = 2.0 * ((0.5 - r1) / 2.0);
 		band.write[i].c2 = 2.0 * r1;
-		band.write[i].c3 = 2.0 * (0.5 + r1) * Math::cos(th);
+		band.write[i].c3 = 2.0 * (0.5 + r1) * std::cos(th);
 		//printf("band %i, coefs = %f,%f,%f\n",i,(float)bands[i].c1,(float)bands[i].c2,(float)bands[i].c3);
 	}
 }
@@ -115,12 +115,12 @@ void EQ::recalculate_band_coefficients() {
 void EQ::set_preset_band_mode(Preset p_preset) {
 	band.clear();
 
-#define PUSH_BANDS(m_bands) \
+#define PUSH_BANDS(m_bands)             \
 	for (int i = 0; i < m_bands; i++) { \
-		Band b; \
-		b.freq = bands[i]; \
-		b.c1 = b.c2 = b.c3 = 0; \
-		band.push_back(b); \
+		Band b;                         \
+		b.freq = bands[i];              \
+		b.c1 = b.c2 = b.c3 = 0;         \
+		band.push_back(b);              \
 	}
 
 	switch (p_preset) {
diff --git a/engine/servers/camera/camera_feed.cpp b/engine/servers/camera/camera_feed.cpp
index 34fc8fca..7b575a23 100644
--- a/engine/servers/camera/camera_feed.cpp
+++ b/engine/servers/camera/camera_feed.cpp
@@ -30,7 +30,6 @@
 
 #include "camera_feed.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CameraFeed::_bind_methods() {
@@ -62,8 +61,6 @@ void CameraFeed::_bind_methods() {
 
 	GDVIRTUAL_BIND(_activate_feed);
 	GDVIRTUAL_BIND(_deactivate_feed);
-	GDVIRTUAL_BIND(_set_format, "index", "parameters");
-	GDVIRTUAL_BIND(_get_formats);
 
 	ADD_SIGNAL(MethodInfo("frame_changed"));
 	ADD_SIGNAL(MethodInfo("format_changed"));
@@ -192,17 +189,21 @@ void CameraFeed::set_rgb_image(const Ref<Image> &p_rgb_img) {
 		int new_width = p_rgb_img->get_width();
 		int new_height = p_rgb_img->get_height();
 
+		// Emit `format_changed` signal if feed datatype or frame size is changed.
+		// The signal is deferred to ensure:
+		// - They are emitted on Godot's main thread.
+		// - Both datatype and frame size are updated before the emission.
 		if (datatype != CameraFeed::FEED_RGB || (base_width != new_width) || (base_height != new_height)) {
+			call_deferred("emit_signal", format_changed_signal_name);
+		}
+
+		if ((base_width != new_width) || (base_height != new_height)) {
+			// We're assuming here that our camera image doesn't change around formats etc, allocate the whole lot...
 			base_width = new_width;
 			base_height = new_height;
 
 			RID new_texture = RenderingServer::get_singleton()->texture_2d_create(p_rgb_img);
 			RenderingServer::get_singleton()->texture_replace(texture[CameraServer::FEED_RGBA_IMAGE], new_texture);
-
-			// `format_changed` signal is deferred to ensure:
-			// - They are emitted on Godot's main thread.
-			// - Both datatype and frame size are updated before the emission.
-			call_deferred("emit_signal", format_changed_signal_name);
 		} else {
 			RenderingServer::get_singleton()->texture_2d_update(texture[CameraServer::FEED_RGBA_IMAGE], p_rgb_img);
 		}
@@ -220,19 +221,23 @@ void CameraFeed::set_ycbcr_image(const Ref<Image> &p_ycbcr_img) {
 		int new_width = p_ycbcr_img->get_width();
 		int new_height = p_ycbcr_img->get_height();
 
+		// Emit `format_changed` signal if feed datatype or frame size is changed.
+		// The signal is deferred to ensure:
+		// - They are emitted on Godot's main thread.
+		// - Both datatype and frame size are updated before the emission.
 		if (datatype != CameraFeed::FEED_YCBCR || (base_width != new_width) || (base_height != new_height)) {
+			call_deferred("emit_signal", format_changed_signal_name);
+		}
+
+		if ((base_width != new_width) || (base_height != new_height)) {
+			// We're assuming here that our camera image doesn't change around formats etc, allocate the whole lot...
 			base_width = new_width;
 			base_height = new_height;
 
 			RID new_texture = RenderingServer::get_singleton()->texture_2d_create(p_ycbcr_img);
-			RenderingServer::get_singleton()->texture_replace(texture[CameraServer::FEED_YCBCR_IMAGE], new_texture);
-
-			// `format_changed` signal is deferred to ensure:
-			// - They are emitted on Godot's main thread.
-			// - Both datatype and frame size are updated before the emission.
-			call_deferred("emit_signal", format_changed_signal_name);
+			RenderingServer::get_singleton()->texture_replace(texture[CameraServer::FEED_RGBA_IMAGE], new_texture);
 		} else {
-			RenderingServer::get_singleton()->texture_2d_update(texture[CameraServer::FEED_YCBCR_IMAGE], p_ycbcr_img);
+			RenderingServer::get_singleton()->texture_2d_update(texture[CameraServer::FEED_RGBA_IMAGE], p_ycbcr_img);
 		}
 
 		datatype = CameraFeed::FEED_YCBCR;
@@ -253,7 +258,16 @@ void CameraFeed::set_ycbcr_images(const Ref<Image> &p_y_img, const Ref<Image> &p
 		int new_y_width = p_y_img->get_width();
 		int new_y_height = p_y_img->get_height();
 
+		// Emit `format_changed` signal if feed datatype or frame size is changed.
+		// The signal is deferred to ensure:
+		// - They are emitted on Godot's main thread.
+		// - Both datatype and frame size are updated before the emission.
 		if (datatype != CameraFeed::FEED_YCBCR_SEP || (base_width != new_y_width) || (base_height != new_y_height)) {
+			call_deferred("emit_signal", format_changed_signal_name);
+		}
+
+		if ((base_width != new_y_width) || (base_height != new_y_height)) {
+			// We're assuming here that our camera image doesn't change around formats etc, allocate the whole lot...
 			base_width = new_y_width;
 			base_height = new_y_height;
 			{
@@ -264,11 +278,6 @@ void CameraFeed::set_ycbcr_images(const Ref<Image> &p_y_img, const Ref<Image> &p
 				RID new_texture = RenderingServer::get_singleton()->texture_2d_create(p_cbcr_img);
 				RenderingServer::get_singleton()->texture_replace(texture[CameraServer::FEED_CBCR_IMAGE], new_texture);
 			}
-
-			// `format_changed` signal is deferred to ensure:
-			// - They are emitted on Godot's main thread.
-			// - Both datatype and frame size are updated before the emission.
-			call_deferred("emit_signal", format_changed_signal_name);
 		} else {
 			RenderingServer::get_singleton()->texture_2d_update(texture[CameraServer::FEED_Y_IMAGE], p_y_img);
 			RenderingServer::get_singleton()->texture_2d_update(texture[CameraServer::FEED_CBCR_IMAGE], p_cbcr_img);
@@ -282,17 +291,21 @@ void CameraFeed::set_ycbcr_images(const Ref<Image> &p_y_img, const Ref<Image> &p
 }
 
 void CameraFeed::set_external(int p_width, int p_height) {
+	// Emit `format_changed` signal if feed datatype or frame size is changed.
+	// The signal is deferred to ensure:
+	// - They are emitted on Godot's main thread.
+	// - Both datatype and frame size are updated before the emission.
 	if (datatype != CameraFeed::FEED_EXTERNAL || (base_width != p_width) || (base_height != p_height)) {
+		call_deferred("emit_signal", format_changed_signal_name);
+	}
+
+	if ((base_width != p_width) || (base_height != p_height)) {
+		// We're assuming here that our camera image doesn't change around formats etc, allocate the whole lot...
 		base_width = p_width;
 		base_height = p_height;
 
 		RID new_texture = RenderingServer::get_singleton()->texture_external_create(p_width, p_height, 0);
 		RenderingServer::get_singleton()->texture_replace(texture[CameraServer::FEED_YCBCR_IMAGE], new_texture);
-
-		// `format_changed` signal is deferred to ensure:
-		// - They are emitted on Godot's main thread.
-		// - Both datatype and frame size are updated before the emission.
-		call_deferred("emit_signal", format_changed_signal_name);
 	}
 
 	datatype = CameraFeed::FEED_EXTERNAL;
@@ -312,15 +325,11 @@ void CameraFeed::deactivate_feed() {
 }
 
 bool CameraFeed::set_format(int p_index, const Dictionary &p_parameters) {
-	bool ret = false;
-	GDVIRTUAL_CALL(_set_format, p_index, p_parameters, ret);
-	return ret;
+	return false;
 }
 
 Array CameraFeed::get_formats() const {
-	Array ret;
-	GDVIRTUAL_CALL(_get_formats, ret);
-	return ret;
+	return Array();
 }
 
 CameraFeed::FeedFormat CameraFeed::get_format() const {
diff --git a/engine/servers/camera/camera_feed.h b/engine/servers/camera/camera_feed.h
index 1edefd53..73725f23 100644
--- a/engine/servers/camera/camera_feed.h
+++ b/engine/servers/camera/camera_feed.h
@@ -124,8 +124,6 @@ public:
 	virtual bool activate_feed();
 	virtual void deactivate_feed();
 
-	GDVIRTUAL2R(bool, _set_format, int, const Dictionary &);
-	GDVIRTUAL0RC(Array, _get_formats);
 	GDVIRTUAL0R(bool, _activate_feed)
 	GDVIRTUAL0(_deactivate_feed)
 };
diff --git a/engine/servers/camera/camera_server.cpp b/engine/servers/camera/camera_server.cpp
index e9403bae..a44929c0 100644
--- a/engine/servers/camera/camera_server.cpp
+++ b/engine/servers/camera/camera_server.cpp
@@ -30,9 +30,9 @@
 
 #include "camera_server.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 #include "servers/camera/camera_feed.h"
+#include "servers/rendering/rendering_server.h"
 
 ////////////////////////////////////////////////////////
 // CameraServer
diff --git a/engine/servers/camera/camera_server.h b/engine/servers/camera/camera_server.h
index c8de5b7b..4f8c9a4e 100644
--- a/engine/servers/camera/camera_server.h
+++ b/engine/servers/camera/camera_server.h
@@ -30,11 +30,11 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/rid.h"
-#include "core/variant/type_info.h"
+#include "core/variant/variant.h"
 
 /**
 	The camera server is a singleton object that gives access to the various
diff --git a/engine/servers/debugger/servers_debugger.cpp b/engine/servers/debugger/servers_debugger.cpp
index 74d635a3..2ea19ca5 100644
--- a/engine/servers/debugger/servers_debugger.cpp
+++ b/engine/servers/debugger/servers_debugger.cpp
@@ -30,15 +30,12 @@
 
 #include "servers_debugger.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/os.h"
 #include "servers/display/display_server.h"
-#include "servers/rendering/rendering_server.h"
 
 #define CHECK_SIZE(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() < (uint32_t)(expected), false, String("Malformed ") + what + " message from script debugger, message too short. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
 #define CHECK_END(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() > (uint32_t)expected, false, String("Malformed ") + what + " message from script debugger, message too long. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
@@ -173,7 +170,7 @@ bool ServersDebugger::VisualProfilerFrame::deserialize(const Array &p_arr) {
 	CHECK_SIZE(p_arr, size, "VisualProfilerFrame");
 	int idx = 2;
 	areas.resize(size / 3);
-	RenderingServerTypes::FrameProfileArea *w = areas.ptrw();
+	RS::FrameProfileArea *w = areas.ptrw();
 	for (int i = 0; i < size / 3; i++) {
 		w[i].name = p_arr[idx];
 		w[i].cpu_msec = p_arr[idx + 1];
@@ -374,7 +371,7 @@ public:
 	void add(const Array &p_data) {}
 
 	void tick(double p_frame_time, double p_process_time, double p_physics_time, double p_physics_frame_time) {
-		Vector<RenderingServerTypes::FrameProfileArea> profile_areas = RS::get_singleton()->get_frame_profile();
+		Vector<RS::FrameProfileArea> profile_areas = RS::get_singleton()->get_frame_profile();
 		ServersDebugger::VisualProfilerFrame frame;
 		if (!profile_areas.size()) {
 			return;
@@ -430,23 +427,23 @@ Error ServersDebugger::_capture(void *p_user, const String &p_cmd, const Array &
 void ServersDebugger::_send_resource_usage() {
 	ServersDebugger::ResourceUsage usage;
 
-	List<RenderingServerTypes::TextureInfo> tinfo;
+	List<RS::TextureInfo> tinfo;
 	RS::get_singleton()->texture_debug_usage(&tinfo);
 
-	for (const RenderingServerTypes::TextureInfo &E : tinfo) {
+	for (const RS::TextureInfo &E : tinfo) {
 		ServersDebugger::ResourceInfo info;
 		info.path = E.path;
 		info.vram = E.bytes;
 		info.id = E.texture;
 
 		switch (E.type) {
-			case RSE::TextureType::TEXTURE_TYPE_2D:
+			case RS::TextureType::TEXTURE_TYPE_2D:
 				info.type = "Texture2D";
 				break;
-			case RSE::TextureType::TEXTURE_TYPE_3D:
+			case RS::TextureType::TEXTURE_TYPE_3D:
 				info.type = "Texture3D";
 				break;
-			case RSE::TextureType::TEXTURE_TYPE_LAYERED:
+			case RS::TextureType::TEXTURE_TYPE_LAYERED:
 				info.type = "TextureLayered";
 				break;
 		}
@@ -464,10 +461,10 @@ void ServersDebugger::_send_resource_usage() {
 		usage.infos.push_back(info);
 	}
 
-	List<RenderingServerTypes::MeshInfo> mesh_info;
+	List<RS::MeshInfo> mesh_info;
 	RS::get_singleton()->mesh_debug_usage(&mesh_info);
 
-	for (const RenderingServerTypes::MeshInfo &E : mesh_info) {
+	for (const RS::MeshInfo &E : mesh_info) {
 		ServersDebugger::ResourceInfo info;
 		info.path = E.path;
 		// We use 64-bit integers to avoid overflow, if for whatever reason, the sum is bigger than 4GB.
diff --git a/engine/servers/debugger/servers_debugger.h b/engine/servers/debugger/servers_debugger.h
index a9bf2432..5803dc09 100644
--- a/engine/servers/debugger/servers_debugger.h
+++ b/engine/servers/debugger/servers_debugger.h
@@ -30,15 +30,7 @@
 
 #pragma once
 
-#include "core/error/error_list.h"
-#include "core/object/ref_counted.h"
-#include "core/string/string_name.h"
-#include "core/string/ustring.h"
-#include "core/templates/list.h"
-#include "core/templates/rid.h"
-#include "core/templates/vector.h"
-#include "core/variant/array.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_server.h"
 
 class ServersDebugger {
 public:
@@ -105,7 +97,7 @@ public:
 	// Visual Profiler
 	struct VisualProfilerFrame {
 		uint64_t frame_number = 0;
-		Vector<RenderingServerTypes::FrameProfileArea> areas;
+		Vector<RS::FrameProfileArea> areas;
 
 		Array serialize();
 		bool deserialize(const Array &p_arr);
diff --git a/engine/servers/display/accessibility_server.cpp b/engine/servers/display/accessibility_server.cpp
deleted file mode 100644
index a9d1ca06..00000000
--- a/engine/servers/display/accessibility_server.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/**************************************************************************/
-/*  accessibility_server.cpp                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "accessibility_server.h"
-
-#include "core/object/class_db.h"
-#include "servers/display/accessibility_server_dummy.h"
-
-AccessibilityServer::AccessibilityServerCreate AccessibilityServer::server_create_functions[AccessibilityServer::MAX_SERVERS] = {
-	{ "dummy", &AccessibilityServerDummy::create_func }
-};
-
-int AccessibilityServer::server_create_count = 1;
-
-void AccessibilityServer::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("is_supported"), &AccessibilityServer::is_supported);
-
-	ClassDB::bind_method(D_METHOD("create_element", "window_id", "role"), &AccessibilityServer::create_element);
-	ClassDB::bind_method(D_METHOD("create_sub_element", "parent_rid", "role", "insert_pos"), &AccessibilityServer::create_sub_element, DEFVAL(-1));
-	ClassDB::bind_method(D_METHOD("create_sub_text_edit_elements", "parent_rid", "shaped_text", "min_height", "insert_pos", "is_last_line"), &AccessibilityServer::create_sub_text_edit_elements, DEFVAL(-1), DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("has_element", "id"), &AccessibilityServer::has_element);
-	ClassDB::bind_method(D_METHOD("free_element", "id"), &AccessibilityServer::free_element);
-	ClassDB::bind_method(D_METHOD("element_set_meta", "id", "meta"), &AccessibilityServer::element_set_meta);
-	ClassDB::bind_method(D_METHOD("element_get_meta", "id"), &AccessibilityServer::element_get_meta);
-
-	ClassDB::bind_method(D_METHOD("_update_if_active", "callback"), &AccessibilityServer::update_if_active);
-
-	ClassDB::bind_method(D_METHOD("set_window_rect", "window_id", "rect_out", "rect_in"), &AccessibilityServer::set_window_rect);
-	ClassDB::bind_method(D_METHOD("set_window_focused", "window_id", "focused"), &AccessibilityServer::set_window_focused);
-
-	ClassDB::bind_method(D_METHOD("update_set_focus", "id"), &AccessibilityServer::update_set_focus);
-	ClassDB::bind_method(D_METHOD("get_window_root", "window_id"), &AccessibilityServer::get_window_root);
-	ClassDB::bind_method(D_METHOD("update_set_role", "id", "role"), &AccessibilityServer::update_set_role);
-	ClassDB::bind_method(D_METHOD("update_set_name", "id", "name"), &AccessibilityServer::update_set_name);
-	ClassDB::bind_method(D_METHOD("update_set_braille_label", "id", "name"), &AccessibilityServer::update_set_braille_label);
-	ClassDB::bind_method(D_METHOD("update_set_braille_role_description", "id", "description"), &AccessibilityServer::update_set_braille_role_description);
-	ClassDB::bind_method(D_METHOD("update_set_extra_info", "id", "name"), &AccessibilityServer::update_set_extra_info);
-	ClassDB::bind_method(D_METHOD("update_set_description", "id", "description"), &AccessibilityServer::update_set_description);
-	ClassDB::bind_method(D_METHOD("update_set_value", "id", "value"), &AccessibilityServer::update_set_value);
-	ClassDB::bind_method(D_METHOD("update_set_tooltip", "id", "tooltip"), &AccessibilityServer::update_set_tooltip);
-	ClassDB::bind_method(D_METHOD("update_set_bounds", "id", "p_rect"), &AccessibilityServer::update_set_bounds);
-	ClassDB::bind_method(D_METHOD("update_set_transform", "id", "transform"), &AccessibilityServer::update_set_transform);
-	ClassDB::bind_method(D_METHOD("update_add_child", "id", "child_id"), &AccessibilityServer::update_add_child);
-	ClassDB::bind_method(D_METHOD("update_add_related_controls", "id", "related_id"), &AccessibilityServer::update_add_related_controls);
-	ClassDB::bind_method(D_METHOD("update_add_related_details", "id", "related_id"), &AccessibilityServer::update_add_related_details);
-	ClassDB::bind_method(D_METHOD("update_add_related_described_by", "id", "related_id"), &AccessibilityServer::update_add_related_described_by);
-	ClassDB::bind_method(D_METHOD("update_add_related_flow_to", "id", "related_id"), &AccessibilityServer::update_add_related_flow_to);
-	ClassDB::bind_method(D_METHOD("update_add_related_labeled_by", "id", "related_id"), &AccessibilityServer::update_add_related_labeled_by);
-	ClassDB::bind_method(D_METHOD("update_add_related_radio_group", "id", "related_id"), &AccessibilityServer::update_add_related_radio_group);
-	ClassDB::bind_method(D_METHOD("update_set_active_descendant", "id", "other_id"), &AccessibilityServer::update_set_active_descendant);
-	ClassDB::bind_method(D_METHOD("update_set_next_on_line", "id", "other_id"), &AccessibilityServer::update_set_next_on_line);
-	ClassDB::bind_method(D_METHOD("update_set_previous_on_line", "id", "other_id"), &AccessibilityServer::update_set_previous_on_line);
-	ClassDB::bind_method(D_METHOD("update_set_member_of", "id", "group_id"), &AccessibilityServer::update_set_member_of);
-	ClassDB::bind_method(D_METHOD("update_set_in_page_link_target", "id", "other_id"), &AccessibilityServer::update_set_in_page_link_target);
-	ClassDB::bind_method(D_METHOD("update_set_error_message", "id", "other_id"), &AccessibilityServer::update_set_error_message);
-	ClassDB::bind_method(D_METHOD("update_set_live", "id", "live"), &AccessibilityServer::update_set_live);
-	ClassDB::bind_method(D_METHOD("update_add_action", "id", "action", "callable"), &AccessibilityServer::update_add_action);
-	ClassDB::bind_method(D_METHOD("update_add_custom_action", "id", "action_id", "action_description"), &AccessibilityServer::update_add_custom_action);
-	ClassDB::bind_method(D_METHOD("update_set_table_row_count", "id", "count"), &AccessibilityServer::update_set_table_row_count);
-	ClassDB::bind_method(D_METHOD("update_set_table_column_count", "id", "count"), &AccessibilityServer::update_set_table_column_count);
-	ClassDB::bind_method(D_METHOD("update_set_table_row_index", "id", "index"), &AccessibilityServer::update_set_table_row_index);
-	ClassDB::bind_method(D_METHOD("update_set_table_column_index", "id", "index"), &AccessibilityServer::update_set_table_column_index);
-	ClassDB::bind_method(D_METHOD("update_set_table_cell_position", "id", "row_index", "column_index"), &AccessibilityServer::update_set_table_cell_position);
-	ClassDB::bind_method(D_METHOD("update_set_table_cell_span", "id", "row_span", "column_span"), &AccessibilityServer::update_set_table_cell_span);
-	ClassDB::bind_method(D_METHOD("update_set_list_item_count", "id", "size"), &AccessibilityServer::update_set_list_item_count);
-	ClassDB::bind_method(D_METHOD("update_set_list_item_index", "id", "index"), &AccessibilityServer::update_set_list_item_index);
-	ClassDB::bind_method(D_METHOD("update_set_list_item_level", "id", "level"), &AccessibilityServer::update_set_list_item_level);
-	ClassDB::bind_method(D_METHOD("update_set_list_item_selected", "id", "selected"), &AccessibilityServer::update_set_list_item_selected);
-	ClassDB::bind_method(D_METHOD("update_set_list_item_expanded", "id", "expanded"), &AccessibilityServer::update_set_list_item_expanded);
-	ClassDB::bind_method(D_METHOD("update_set_popup_type", "id", "popup"), &AccessibilityServer::update_set_popup_type);
-	ClassDB::bind_method(D_METHOD("update_set_checked", "id", "checekd"), &AccessibilityServer::update_set_checked);
-	ClassDB::bind_method(D_METHOD("update_set_num_value", "id", "position"), &AccessibilityServer::update_set_num_value);
-	ClassDB::bind_method(D_METHOD("update_set_num_range", "id", "min", "max"), &AccessibilityServer::update_set_num_range);
-	ClassDB::bind_method(D_METHOD("update_set_num_step", "id", "step"), &AccessibilityServer::update_set_num_step);
-	ClassDB::bind_method(D_METHOD("update_set_num_jump", "id", "jump"), &AccessibilityServer::update_set_num_jump);
-	ClassDB::bind_method(D_METHOD("update_set_scroll_x", "id", "position"), &AccessibilityServer::update_set_scroll_x);
-	ClassDB::bind_method(D_METHOD("update_set_scroll_x_range", "id", "min", "max"), &AccessibilityServer::update_set_scroll_x_range);
-	ClassDB::bind_method(D_METHOD("update_set_scroll_y", "id", "position"), &AccessibilityServer::update_set_scroll_y);
-	ClassDB::bind_method(D_METHOD("update_set_scroll_y_range", "id", "min", "max"), &AccessibilityServer::update_set_scroll_y_range);
-	ClassDB::bind_method(D_METHOD("update_set_text_decorations", "id", "underline", "strikethrough", "overline", "color"), &AccessibilityServer::update_set_text_decorations, DEFVAL(Color(0, 0, 0, 1)));
-	ClassDB::bind_method(D_METHOD("update_set_text_align", "id", "align"), &AccessibilityServer::update_set_text_align);
-	ClassDB::bind_method(D_METHOD("update_set_text_selection", "id", "text_start_id", "start_char", "text_end_id", "end_char"), &AccessibilityServer::update_set_text_selection);
-	ClassDB::bind_method(D_METHOD("update_set_flag", "id", "flag", "value"), &AccessibilityServer::update_set_flag);
-	ClassDB::bind_method(D_METHOD("update_set_classname", "id", "classname"), &AccessibilityServer::update_set_classname);
-	ClassDB::bind_method(D_METHOD("update_set_placeholder", "id", "placeholder"), &AccessibilityServer::update_set_placeholder);
-	ClassDB::bind_method(D_METHOD("update_set_language", "id", "language"), &AccessibilityServer::update_set_language);
-	ClassDB::bind_method(D_METHOD("update_set_text_orientation", "id", "vertical"), &AccessibilityServer::update_set_text_orientation);
-	ClassDB::bind_method(D_METHOD("update_set_list_orientation", "id", "vertical"), &AccessibilityServer::update_set_list_orientation);
-	ClassDB::bind_method(D_METHOD("update_set_shortcut", "id", "shortcut"), &AccessibilityServer::update_set_shortcut);
-	ClassDB::bind_method(D_METHOD("update_set_url", "id", "url"), &AccessibilityServer::update_set_url);
-	ClassDB::bind_method(D_METHOD("update_set_role_description", "id", "description"), &AccessibilityServer::update_set_role_description);
-	ClassDB::bind_method(D_METHOD("update_set_state_description", "id", "description"), &AccessibilityServer::update_set_state_description);
-	ClassDB::bind_method(D_METHOD("update_set_color_value", "id", "color"), &AccessibilityServer::update_set_color_value);
-	ClassDB::bind_method(D_METHOD("update_set_background_color", "id", "color"), &AccessibilityServer::update_set_background_color);
-	ClassDB::bind_method(D_METHOD("update_set_foreground_color", "id", "color"), &AccessibilityServer::update_set_foreground_color);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_UNKNOWN);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_DEFAULT_BUTTON);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_AUDIO);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_VIDEO);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_STATIC_TEXT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_CONTAINER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_PANEL);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_BUTTON);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_LINK);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_CHECK_BOX);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_RADIO_BUTTON);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_CHECK_BUTTON);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_SCROLL_BAR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_SCROLL_VIEW);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_SPLITTER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_SLIDER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_SPIN_BUTTON);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_PROGRESS_INDICATOR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TEXT_FIELD);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MULTILINE_TEXT_FIELD);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_COLOR_PICKER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TABLE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_CELL);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_ROW);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_ROW_GROUP);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_ROW_HEADER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_COLUMN_HEADER);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TREE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TREE_ITEM);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_LIST);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_LIST_ITEM);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_LIST_BOX);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_LIST_BOX_OPTION);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TAB_BAR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TAB);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TAB_PANEL);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MENU_BAR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MENU);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MENU_ITEM);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MENU_ITEM_CHECK_BOX);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_MENU_ITEM_RADIO);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_IMAGE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_WINDOW);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TITLE_BAR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_DIALOG);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TOOLTIP);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_REGION);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ROLE_TEXT_RUN);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::POPUP_MENU);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::POPUP_LIST);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::POPUP_TREE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::POPUP_DIALOG);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_HIDDEN);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_MULTISELECTABLE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_REQUIRED);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_VISITED);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_BUSY);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_MODAL);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_TOUCH_PASSTHROUGH);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_READONLY);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_DISABLED);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::FLAG_CLIPS_CHILDREN);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_CLICK);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_FOCUS);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_BLUR);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_COLLAPSE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_EXPAND);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_DECREMENT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_INCREMENT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_HIDE_TOOLTIP);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SHOW_TOOLTIP);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SET_TEXT_SELECTION);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_REPLACE_SELECTED_TEXT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_BACKWARD);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_DOWN);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_FORWARD);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_LEFT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_RIGHT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_UP);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_INTO_VIEW);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SCROLL_TO_POINT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SET_SCROLL_OFFSET);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SET_VALUE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_SHOW_CONTEXT_MENU);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::ACTION_CUSTOM);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::LIVE_OFF);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::LIVE_POLITE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::LIVE_ASSERTIVE);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_UNIT_ITEM);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_UNIT_PAGE);
-
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_TOP_LEFT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_BOTTOM_RIGHT);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_TOP_EDGE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_BOTTOM_EDGE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_LEFT_EDGE);
-	BIND_ENUM_CONSTANT(AccessibilityServerEnums::SCROLL_HINT_RIGHT_EDGE);
-}
-
-AccessibilityServer *AccessibilityServer::create(int p_index, Error &r_error) {
-	ERR_FAIL_INDEX_V(p_index, server_create_count, nullptr);
-	return server_create_functions[p_index].create_function(r_error);
-}
-
-void AccessibilityServer::register_create_function(const char *p_name, CreateFunction p_function) {
-	ERR_FAIL_COND(server_create_count == MAX_SERVERS);
-	// Dummy server is always last
-	server_create_functions[server_create_count] = server_create_functions[server_create_count - 1];
-	server_create_functions[server_create_count - 1].name = p_name;
-	server_create_functions[server_create_count - 1].create_function = p_function;
-	server_create_count++;
-}
-
-int AccessibilityServer::get_create_function_count() {
-	return server_create_count;
-}
-
-const char *AccessibilityServer::get_create_function_name(int p_index) {
-	ERR_FAIL_INDEX_V(p_index, server_create_count, nullptr);
-	return server_create_functions[p_index].name;
-}
-
-AccessibilityServer::AccessibilityServer() {
-	singleton = this;
-}
-
-AccessibilityServer::~AccessibilityServer() {
-	singleton = nullptr;
-}
diff --git a/engine/servers/display/accessibility_server.h b/engine/servers/display/accessibility_server.h
deleted file mode 100644
index 22297767..00000000
--- a/engine/servers/display/accessibility_server.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/**************************************************************************/
-/*  accessibility_server.h                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/object.h"
-#include "core/variant/type_info.h"
-#include "servers/display/accessibility_server_enums.h"
-#include "servers/display/display_server_enums.h"
-
-class AccessibilityServer : public Object {
-	GDCLASS(AccessibilityServer, Object)
-
-public:
-	typedef AccessibilityServer *(*CreateFunction)(Error &r_error);
-
-protected:
-	static inline AccessibilityServer *singleton = nullptr;
-	static inline AccessibilityServerEnums::AccessibilityMode accessibility_mode = AccessibilityServerEnums::AccessibilityMode::ACCESSIBILITY_AUTO;
-
-	static void _bind_methods();
-
-	enum {
-		MAX_SERVERS = 64
-	};
-
-	struct AccessibilityServerCreate {
-		const char *name;
-		CreateFunction create_function;
-	};
-
-	static AccessibilityServerCreate server_create_functions[MAX_SERVERS];
-	static int server_create_count;
-
-public:
-	_FORCE_INLINE_ static AccessibilityServerEnums::AccessibilityMode get_mode() { return accessibility_mode; }
-	static void set_mode(AccessibilityServerEnums::AccessibilityMode p_mode) { accessibility_mode = p_mode; }
-
-	_FORCE_INLINE_ static AccessibilityServer *get_singleton() { return singleton; }
-
-	virtual bool is_supported() const { return false; }
-
-	virtual bool window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) = 0;
-	virtual void window_destroy(DisplayServerEnums::WindowID p_window_id) = 0;
-
-	virtual RID create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) = 0;
-	virtual RID create_sub_element(const RID &p_parent_rid, AccessibilityServerEnums::AccessibilityRole p_role, int p_insert_pos = -1) = 0;
-	virtual RID create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) = 0;
-	virtual bool has_element(const RID &p_id) const = 0;
-	virtual void free_element(const RID &p_id) = 0;
-
-	virtual void element_set_meta(const RID &p_id, const Variant &p_meta) = 0;
-	virtual Variant element_get_meta(const RID &p_id) const = 0;
-
-	virtual void update_if_active(const Callable &p_callable) = 0;
-
-	virtual RID get_window_root(DisplayServerEnums::WindowID p_window_id) const = 0;
-	virtual void update_set_focus(const RID &p_id) = 0;
-
-	virtual void set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) = 0;
-	virtual void set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) = 0;
-	virtual void set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) = 0;
-	virtual void window_activation_completed(DisplayServerEnums::WindowID p_window_id) = 0;
-	virtual void window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) = 0;
-
-	virtual void update_set_role(const RID &p_id, AccessibilityServerEnums::AccessibilityRole p_role) = 0;
-	virtual void update_set_name(const RID &p_id, const String &p_name) = 0;
-	virtual void update_set_braille_label(const RID &p_id, const String &p_name) = 0;
-	virtual void update_set_braille_role_description(const RID &p_id, const String &p_description) = 0;
-	virtual void update_set_extra_info(const RID &p_id, const String &p_name_extra_info) = 0;
-	virtual void update_set_description(const RID &p_id, const String &p_description) = 0;
-	virtual void update_set_value(const RID &p_id, const String &p_value) = 0;
-	virtual void update_set_tooltip(const RID &p_id, const String &p_tooltip) = 0;
-	virtual void update_set_bounds(const RID &p_id, const Rect2 &p_rect) = 0;
-	virtual void update_set_transform(const RID &p_id, const Transform2D &p_transform) = 0;
-	virtual void update_add_child(const RID &p_id, const RID &p_child_id) = 0;
-	virtual void update_add_related_controls(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_add_related_details(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_add_related_described_by(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_add_related_flow_to(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_add_related_radio_group(const RID &p_id, const RID &p_related_id) = 0;
-	virtual void update_set_active_descendant(const RID &p_id, const RID &p_other_id) = 0;
-	virtual void update_set_next_on_line(const RID &p_id, const RID &p_other_id) = 0;
-	virtual void update_set_previous_on_line(const RID &p_id, const RID &p_other_id) = 0;
-	virtual void update_set_member_of(const RID &p_id, const RID &p_group_id) = 0;
-	virtual void update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) = 0;
-	virtual void update_set_error_message(const RID &p_id, const RID &p_other_id) = 0;
-	virtual void update_set_live(const RID &p_id, AccessibilityServerEnums::AccessibilityLiveMode p_live) = 0;
-	virtual void update_add_action(const RID &p_id, AccessibilityServerEnums::AccessibilityAction p_action, const Callable &p_callable) = 0;
-	virtual void update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) = 0;
-	virtual void update_set_table_row_count(const RID &p_id, int p_count) = 0;
-	virtual void update_set_table_column_count(const RID &p_id, int p_count) = 0;
-	virtual void update_set_table_row_index(const RID &p_id, int p_index) = 0;
-	virtual void update_set_table_column_index(const RID &p_id, int p_index) = 0;
-	virtual void update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) = 0;
-	virtual void update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) = 0;
-	virtual void update_set_list_item_count(const RID &p_id, int p_size) = 0;
-	virtual void update_set_list_item_index(const RID &p_id, int p_index) = 0;
-	virtual void update_set_list_item_level(const RID &p_id, int p_level) = 0;
-	virtual void update_set_list_item_selected(const RID &p_id, bool p_selected) = 0;
-	virtual void update_set_list_item_expanded(const RID &p_id, bool p_expanded) = 0;
-	virtual void update_set_popup_type(const RID &p_id, AccessibilityServerEnums::AccessibilityPopupType p_popup) = 0;
-	virtual void update_set_checked(const RID &p_id, bool p_checekd) = 0;
-	virtual void update_set_num_value(const RID &p_id, double p_position) = 0;
-	virtual void update_set_num_range(const RID &p_id, double p_min, double p_max) = 0;
-	virtual void update_set_num_step(const RID &p_id, double p_step) = 0;
-	virtual void update_set_num_jump(const RID &p_id, double p_jump) = 0;
-	virtual void update_set_scroll_x(const RID &p_id, double p_position) = 0;
-	virtual void update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) = 0;
-	virtual void update_set_scroll_y(const RID &p_id, double p_position) = 0;
-	virtual void update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) = 0;
-	virtual void update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline, const Color &p_color) = 0;
-	virtual void update_set_text_align(const RID &p_id, HorizontalAlignment p_align) = 0;
-	virtual void update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) = 0;
-	virtual void update_set_flag(const RID &p_id, AccessibilityServerEnums::AccessibilityFlags p_flag, bool p_value) = 0;
-	virtual void update_set_classname(const RID &p_id, const String &p_classname) = 0;
-	virtual void update_set_placeholder(const RID &p_id, const String &p_placeholder) = 0;
-	virtual void update_set_language(const RID &p_id, const String &p_language) = 0;
-	virtual void update_set_text_orientation(const RID &p_id, bool p_vertical) = 0;
-	virtual void update_set_list_orientation(const RID &p_id, bool p_vertical) = 0;
-	virtual void update_set_shortcut(const RID &p_id, const String &p_shortcut) = 0;
-	virtual void update_set_url(const RID &p_id, const String &p_url) = 0;
-	virtual void update_set_role_description(const RID &p_id, const String &p_description) = 0;
-	virtual void update_set_state_description(const RID &p_id, const String &p_description) = 0;
-	virtual void update_set_color_value(const RID &p_id, const Color &p_color) = 0;
-	virtual void update_set_background_color(const RID &p_id, const Color &p_color) = 0;
-	virtual void update_set_foreground_color(const RID &p_id, const Color &p_color) = 0;
-
-	static void register_create_function(const char *p_name, CreateFunction p_function);
-	static int get_create_function_count();
-	static const char *get_create_function_name(int p_index);
-	static AccessibilityServer *create(int p_index, Error &r_error);
-
-	AccessibilityServer();
-	virtual ~AccessibilityServer();
-};
-
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityAction, AccessibilityServer::AccessibilityAction)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityFlags, AccessibilityServer::AccessibilityFlags)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityLiveMode, AccessibilityServer::AccessibilityLiveMode)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityPopupType, AccessibilityServer::AccessibilityPopupType)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityRole, AccessibilityServer::AccessibilityRole)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityScrollUnit, AccessibilityServer::AccessibilityScrollUnit)
-VARIANT_ENUM_CAST_EXT(AccessibilityServerEnums::AccessibilityScrollHint, AccessibilityServer::AccessibilityScrollHint)
diff --git a/engine/servers/display/accessibility_server_dummy.h b/engine/servers/display/accessibility_server_dummy.h
deleted file mode 100644
index 55a837ec..00000000
--- a/engine/servers/display/accessibility_server_dummy.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/**************************************************************************/
-/*  accessibility_server_dummy.h                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "servers/display/accessibility_server.h"
-
-class AccessibilityServerDummy : public AccessibilityServer {
-	GDSOFTCLASS(AccessibilityServerDummy, AccessibilityServer)
-	friend class AccessibilityServer;
-
-protected:
-	static AccessibilityServer *create_func(Error &r_error) {
-		r_error = OK;
-		return memnew(AccessibilityServerDummy);
-	}
-
-public:
-	virtual bool window_create(DisplayServerEnums::WindowID p_window_id, void *p_handle) override { return true; }
-	virtual void window_destroy(DisplayServerEnums::WindowID p_window_id) override {}
-
-	virtual RID create_element(DisplayServerEnums::WindowID p_window_id, AccessibilityServerEnums::AccessibilityRole p_role) override { return RID(); }
-	virtual RID create_sub_element(const RID &p_parent_rid, AccessibilityServerEnums::AccessibilityRole p_role, int p_insert_pos = -1) override { return RID(); }
-	virtual RID create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) override { return RID(); }
-	virtual bool has_element(const RID &p_id) const override { return false; }
-	virtual void free_element(const RID &p_id) override {}
-
-	virtual void element_set_meta(const RID &p_id, const Variant &p_meta) override {}
-	virtual Variant element_get_meta(const RID &p_id) const override { return Variant(); }
-
-	virtual void update_if_active(const Callable &p_callable) override {}
-
-	virtual RID get_window_root(DisplayServerEnums::WindowID p_window_id) const override { return RID(); }
-	virtual void update_set_focus(const RID &p_id) override {}
-
-	virtual void set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override {}
-	virtual void set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) override {}
-	virtual void set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) override {}
-	virtual void window_activation_completed(DisplayServerEnums::WindowID p_window_id) override {}
-	virtual void window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) override {}
-
-	virtual void update_set_role(const RID &p_id, AccessibilityServerEnums::AccessibilityRole p_role) override {}
-	virtual void update_set_name(const RID &p_id, const String &p_name) override {}
-	virtual void update_set_braille_label(const RID &p_id, const String &p_name) override {}
-	virtual void update_set_braille_role_description(const RID &p_id, const String &p_description) override {}
-	virtual void update_set_extra_info(const RID &p_id, const String &p_name_extra_info) override {}
-	virtual void update_set_description(const RID &p_id, const String &p_description) override {}
-	virtual void update_set_value(const RID &p_id, const String &p_value) override {}
-	virtual void update_set_tooltip(const RID &p_id, const String &p_tooltip) override {}
-	virtual void update_set_bounds(const RID &p_id, const Rect2 &p_rect) override {}
-	virtual void update_set_transform(const RID &p_id, const Transform2D &p_transform) override {}
-	virtual void update_add_child(const RID &p_id, const RID &p_child_id) override {}
-	virtual void update_add_related_controls(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_add_related_details(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_add_related_described_by(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_add_related_flow_to(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_add_related_radio_group(const RID &p_id, const RID &p_related_id) override {}
-	virtual void update_set_active_descendant(const RID &p_id, const RID &p_other_id) override {}
-	virtual void update_set_next_on_line(const RID &p_id, const RID &p_other_id) override {}
-	virtual void update_set_previous_on_line(const RID &p_id, const RID &p_other_id) override {}
-	virtual void update_set_member_of(const RID &p_id, const RID &p_group_id) override {}
-	virtual void update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) override {}
-	virtual void update_set_error_message(const RID &p_id, const RID &p_other_id) override {}
-	virtual void update_set_live(const RID &p_id, AccessibilityServerEnums::AccessibilityLiveMode p_live) override {}
-	virtual void update_add_action(const RID &p_id, AccessibilityServerEnums::AccessibilityAction p_action, const Callable &p_callable) override {}
-	virtual void update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) override {}
-	virtual void update_set_table_row_count(const RID &p_id, int p_count) override {}
-	virtual void update_set_table_column_count(const RID &p_id, int p_count) override {}
-	virtual void update_set_table_row_index(const RID &p_id, int p_index) override {}
-	virtual void update_set_table_column_index(const RID &p_id, int p_index) override {}
-	virtual void update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) override {}
-	virtual void update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) override {}
-	virtual void update_set_list_item_count(const RID &p_id, int p_size) override {}
-	virtual void update_set_list_item_index(const RID &p_id, int p_index) override {}
-	virtual void update_set_list_item_level(const RID &p_id, int p_level) override {}
-	virtual void update_set_list_item_selected(const RID &p_id, bool p_selected) override {}
-	virtual void update_set_list_item_expanded(const RID &p_id, bool p_expanded) override {}
-	virtual void update_set_popup_type(const RID &p_id, AccessibilityServerEnums::AccessibilityPopupType p_popup) override {}
-	virtual void update_set_checked(const RID &p_id, bool p_checekd) override {}
-	virtual void update_set_num_value(const RID &p_id, double p_position) override {}
-	virtual void update_set_num_range(const RID &p_id, double p_min, double p_max) override {}
-	virtual void update_set_num_step(const RID &p_id, double p_step) override {}
-	virtual void update_set_num_jump(const RID &p_id, double p_jump) override {}
-	virtual void update_set_scroll_x(const RID &p_id, double p_position) override {}
-	virtual void update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) override {}
-	virtual void update_set_scroll_y(const RID &p_id, double p_position) override {}
-	virtual void update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) override {}
-	virtual void update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline, const Color &p_color) override {}
-	virtual void update_set_text_align(const RID &p_id, HorizontalAlignment p_align) override {}
-	virtual void update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) override {}
-	virtual void update_set_flag(const RID &p_id, AccessibilityServerEnums::AccessibilityFlags p_flag, bool p_value) override {}
-	virtual void update_set_classname(const RID &p_id, const String &p_classname) override {}
-	virtual void update_set_placeholder(const RID &p_id, const String &p_placeholder) override {}
-	virtual void update_set_language(const RID &p_id, const String &p_language) override {}
-	virtual void update_set_text_orientation(const RID &p_id, bool p_vertical) override {}
-	virtual void update_set_list_orientation(const RID &p_id, bool p_vertical) override {}
-	virtual void update_set_shortcut(const RID &p_id, const String &p_shortcut) override {}
-	virtual void update_set_url(const RID &p_id, const String &p_url) override {}
-	virtual void update_set_role_description(const RID &p_id, const String &p_description) override {}
-	virtual void update_set_state_description(const RID &p_id, const String &p_description) override {}
-	virtual void update_set_color_value(const RID &p_id, const Color &p_color) override {}
-	virtual void update_set_background_color(const RID &p_id, const Color &p_color) override {}
-	virtual void update_set_foreground_color(const RID &p_id, const Color &p_color) override {}
-
-	AccessibilityServerDummy() {}
-	virtual ~AccessibilityServerDummy() {}
-};
diff --git a/engine/servers/display/accessibility_server_enums.h b/engine/servers/display/accessibility_server_enums.h
deleted file mode 100644
index 2f4b3669..00000000
--- a/engine/servers/display/accessibility_server_enums.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************/
-/*  accessibility_server_enums.h                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-namespace AccessibilityServerEnums {
-
-enum AccessibilityMode {
-	ACCESSIBILITY_AUTO,
-	ACCESSIBILITY_ALWAYS,
-	ACCESSIBILITY_DISABLED,
-};
-
-enum AccessibilityRole {
-	ROLE_UNKNOWN,
-	ROLE_DEFAULT_BUTTON,
-	ROLE_AUDIO,
-	ROLE_VIDEO,
-	ROLE_STATIC_TEXT,
-	ROLE_CONTAINER,
-	ROLE_PANEL,
-	ROLE_BUTTON,
-	ROLE_LINK,
-	ROLE_CHECK_BOX,
-	ROLE_RADIO_BUTTON,
-	ROLE_CHECK_BUTTON,
-	ROLE_SCROLL_BAR,
-	ROLE_SCROLL_VIEW,
-	ROLE_SPLITTER,
-	ROLE_SLIDER,
-	ROLE_SPIN_BUTTON,
-	ROLE_PROGRESS_INDICATOR,
-	ROLE_TEXT_FIELD,
-	ROLE_MULTILINE_TEXT_FIELD,
-	ROLE_COLOR_PICKER,
-	ROLE_TABLE,
-	ROLE_CELL,
-	ROLE_ROW,
-	ROLE_ROW_GROUP,
-	ROLE_ROW_HEADER,
-	ROLE_COLUMN_HEADER,
-	ROLE_TREE,
-	ROLE_TREE_ITEM,
-	ROLE_LIST,
-	ROLE_LIST_ITEM,
-	ROLE_LIST_BOX,
-	ROLE_LIST_BOX_OPTION,
-	ROLE_TAB_BAR,
-	ROLE_TAB,
-	ROLE_TAB_PANEL,
-	ROLE_MENU_BAR,
-	ROLE_MENU,
-	ROLE_MENU_ITEM,
-	ROLE_MENU_ITEM_CHECK_BOX,
-	ROLE_MENU_ITEM_RADIO,
-	ROLE_IMAGE,
-	ROLE_WINDOW,
-	ROLE_TITLE_BAR,
-	ROLE_DIALOG,
-	ROLE_TOOLTIP,
-	ROLE_REGION,
-	ROLE_TEXT_RUN,
-};
-
-enum AccessibilityPopupType {
-	POPUP_MENU,
-	POPUP_LIST,
-	POPUP_TREE,
-	POPUP_DIALOG,
-};
-
-enum AccessibilityFlags {
-	FLAG_HIDDEN,
-	FLAG_MULTISELECTABLE,
-	FLAG_REQUIRED,
-	FLAG_VISITED,
-	FLAG_BUSY,
-	FLAG_MODAL,
-	FLAG_TOUCH_PASSTHROUGH,
-	FLAG_READONLY,
-	FLAG_DISABLED,
-	FLAG_CLIPS_CHILDREN,
-};
-
-enum AccessibilityAction {
-	ACTION_CLICK,
-	ACTION_FOCUS,
-	ACTION_BLUR,
-	ACTION_COLLAPSE,
-	ACTION_EXPAND,
-	ACTION_DECREMENT,
-	ACTION_INCREMENT,
-	ACTION_HIDE_TOOLTIP,
-	ACTION_SHOW_TOOLTIP,
-	ACTION_SET_TEXT_SELECTION,
-	ACTION_REPLACE_SELECTED_TEXT,
-	ACTION_SCROLL_BACKWARD,
-	ACTION_SCROLL_DOWN,
-	ACTION_SCROLL_FORWARD,
-	ACTION_SCROLL_LEFT,
-	ACTION_SCROLL_RIGHT,
-	ACTION_SCROLL_UP,
-	ACTION_SCROLL_INTO_VIEW,
-	ACTION_SCROLL_TO_POINT,
-	ACTION_SET_SCROLL_OFFSET,
-	ACTION_SET_VALUE,
-	ACTION_SHOW_CONTEXT_MENU,
-	ACTION_CUSTOM,
-};
-
-enum AccessibilityLiveMode {
-	LIVE_OFF,
-	LIVE_POLITE,
-	LIVE_ASSERTIVE,
-};
-
-enum AccessibilityScrollUnit {
-	SCROLL_UNIT_ITEM,
-	SCROLL_UNIT_PAGE,
-};
-
-enum AccessibilityScrollHint {
-	SCROLL_HINT_TOP_LEFT,
-	SCROLL_HINT_BOTTOM_RIGHT,
-	SCROLL_HINT_TOP_EDGE,
-	SCROLL_HINT_BOTTOM_EDGE,
-	SCROLL_HINT_LEFT_EDGE,
-	SCROLL_HINT_RIGHT_EDGE,
-};
-
-}; // namespace AccessibilityServerEnums
diff --git a/engine/servers/display/display_server.compat.inc b/engine/servers/display/display_server.compat.inc
index 233fb039..f3f0b482 100644
--- a/engine/servers/display/display_server.compat.inc
+++ b/engine/servers/display/display_server.compat.inc
@@ -30,16 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "display_server.h"
-
-#include "core/object/class_db.h"
-
-Error DisplayServer::_file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
-	return file_dialog_show(p_title, p_current_directory, p_filename, p_show_hidden, p_mode, p_filters, p_callback, DisplayServerEnums::MAIN_WINDOW_ID);
+Error DisplayServer::_file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
+	return file_dialog_show(p_title, p_current_directory, p_filename, p_show_hidden, p_mode, p_filters, p_callback, MAIN_WINDOW_ID);
 }
 
-Error DisplayServer::_file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
-	return file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, DisplayServerEnums::MAIN_WINDOW_ID);
+Error DisplayServer::_file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
+	return file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, MAIN_WINDOW_ID);
 }
 
 RID DisplayServer::_accessibility_create_sub_text_edit_elements_bind_compat_113459(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos) {
@@ -52,4 +48,4 @@ void DisplayServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("accessibility_create_sub_text_edit_elements", "parent_rid", "shaped_text", "min_height", "insert_pos"), &DisplayServer::_accessibility_create_sub_text_edit_elements_bind_compat_113459, DEFVAL(-1));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/servers/display/display_server.cpp b/engine/servers/display/display_server.cpp
index 2912d7de..d3c81bac 100644
--- a/engine/servers/display/display_server.cpp
+++ b/engine/servers/display/display_server.cpp
@@ -31,26 +31,13 @@
 #include "display_server.h"
 #include "display_server.compat.inc"
 
-STATIC_ASSERT_INCOMPLETE_TYPE(class, Input);
-STATIC_ASSERT_INCOMPLETE_TYPE(class, NativeMenu);
-STATIC_ASSERT_INCOMPLETE_TYPE(class, Texture2D);
-STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
-
 #include "core/input/input.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "scene/resources/texture.h"
-#include "servers/display/accessibility_server.h"
 #include "servers/display/display_server_headless.h"
-#include "servers/display/native_menu.h"
-#include "servers/rendering/rendering_server.h"
-
-#if defined(RD_ENABLED)
-#include "servers/rendering/rendering_device.h"
-#endif
 
 #if defined(VULKAN_ENABLED)
 #include "drivers/vulkan/rendering_context_driver_vulkan.h"
+#undef CursorShape
 #endif
 #if defined(D3D12_ENABLED)
 #include "drivers/d3d12/rendering_context_driver_d3d12.h"
@@ -61,6 +48,10 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 
 DisplayServer *DisplayServer::singleton = nullptr;
 
+DisplayServer::AccessibilityMode DisplayServer::accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
+
+bool DisplayServer::hidpi_allowed = false;
+
 bool DisplayServer::window_early_clear_override_enabled = false;
 Color DisplayServer::window_early_clear_override_color = Color(0, 0, 0, 0);
 
@@ -463,22 +454,22 @@ void DisplayServer::tts_stop() {
 	WARN_PRINT("TTS is not supported by this display server.");
 }
 
-void DisplayServer::tts_set_utterance_callback(DisplayServerEnums::TTSUtteranceEvent p_event, const Callable &p_callable) {
-	ERR_FAIL_INDEX(p_event, DisplayServerEnums::TTS_UTTERANCE_MAX);
+void DisplayServer::tts_set_utterance_callback(TTSUtteranceEvent p_event, const Callable &p_callable) {
+	ERR_FAIL_INDEX(p_event, DisplayServer::TTS_UTTERANCE_MAX);
 	utterance_callback[p_event] = p_callable;
 }
 
-void DisplayServer::tts_post_utterance_event(DisplayServerEnums::TTSUtteranceEvent p_event, int64_t p_id, int p_pos) {
-	ERR_FAIL_INDEX(p_event, DisplayServerEnums::TTS_UTTERANCE_MAX);
+void DisplayServer::tts_post_utterance_event(TTSUtteranceEvent p_event, int64_t p_id, int p_pos) {
+	ERR_FAIL_INDEX(p_event, DisplayServer::TTS_UTTERANCE_MAX);
 	switch (p_event) {
-		case DisplayServerEnums::TTS_UTTERANCE_STARTED:
-		case DisplayServerEnums::TTS_UTTERANCE_ENDED:
-		case DisplayServerEnums::TTS_UTTERANCE_CANCELED: {
+		case DisplayServer::TTS_UTTERANCE_STARTED:
+		case DisplayServer::TTS_UTTERANCE_ENDED:
+		case DisplayServer::TTS_UTTERANCE_CANCELED: {
 			if (utterance_callback[p_event].is_valid()) {
 				utterance_callback[p_event].call_deferred(p_id); // Should be deferred, on some platforms utterance events can be called from different threads in a rapid succession.
 			}
 		} break;
-		case DisplayServerEnums::TTS_UTTERANCE_BOUNDARY: {
+		case DisplayServer::TTS_UTTERANCE_BOUNDARY: {
 			if (utterance_callback[p_event].is_valid()) {
 				utterance_callback[p_event].call_deferred(p_pos, p_id); // Should be deferred, on some platforms utterance events can be called from different threads in a rapid succession.
 			}
@@ -505,20 +496,20 @@ void DisplayServer::set_early_window_clear_color_override(bool p_enabled, Color
 	window_early_clear_override_color = p_color;
 }
 
-void DisplayServer::mouse_set_mode(DisplayServerEnums::MouseMode p_mode) {
+void DisplayServer::mouse_set_mode(MouseMode p_mode) {
 	WARN_PRINT("Mouse is not supported by this display server.");
 }
 
-DisplayServerEnums::MouseMode DisplayServer::mouse_get_mode() const {
-	return DisplayServerEnums::MOUSE_MODE_VISIBLE;
+DisplayServer::MouseMode DisplayServer::mouse_get_mode() const {
+	return MOUSE_MODE_VISIBLE;
 }
 
-void DisplayServer::mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) {
+void DisplayServer::mouse_set_mode_override(MouseMode p_mode) {
 	WARN_PRINT("Mouse is not supported by this display server.");
 }
 
-DisplayServerEnums::MouseMode DisplayServer::mouse_get_mode_override() const {
-	return DisplayServerEnums::MOUSE_MODE_VISIBLE;
+DisplayServer::MouseMode DisplayServer::mouse_get_mode_override() const {
+	return MOUSE_MODE_VISIBLE;
 }
 
 void DisplayServer::mouse_set_mode_override_enabled(bool p_override_enabled) {
@@ -568,12 +559,12 @@ String DisplayServer::clipboard_get_primary() const {
 	ERR_FAIL_V_MSG(String(), "Primary clipboard is not supported by this display server.");
 }
 
-void DisplayServer::screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen) {
+void DisplayServer::screen_set_orientation(ScreenOrientation p_orientation, int p_screen) {
 	WARN_PRINT("Orientation not supported by this display server.");
 }
 
-DisplayServerEnums::ScreenOrientation DisplayServer::screen_get_orientation(int p_screen) const {
-	return DisplayServerEnums::SCREEN_LANDSCAPE;
+DisplayServer::ScreenOrientation DisplayServer::screen_get_orientation(int p_screen) const {
+	return SCREEN_LANDSCAPE;
 }
 
 float DisplayServer::screen_get_scale(int p_screen) const {
@@ -594,7 +585,7 @@ bool DisplayServer::screen_is_kept_on() const {
 
 int DisplayServer::get_screen_from_rect(const Rect2 &p_rect) const {
 	int nearest_area = 0;
-	int pos_screen = DisplayServerEnums::INVALID_SCREEN;
+	int pos_screen = INVALID_SCREEN;
 	for (int i = 0; i < get_screen_count(); i++) {
 		Rect2i r;
 		r.position = screen_get_position(i);
@@ -609,510 +600,506 @@ int DisplayServer::get_screen_from_rect(const Rect2 &p_rect) const {
 	return pos_screen;
 }
 
-DisplayServerEnums::WindowID DisplayServer::create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, DisplayServerEnums::WindowID p_transient_parent) {
-	ERR_FAIL_V_MSG(DisplayServerEnums::INVALID_WINDOW_ID, "Sub-windows not supported by this display server.");
+DisplayServer::WindowID DisplayServer::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
+	ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Sub-windows not supported by this display server.");
 }
 
-void DisplayServer::show_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServer::show_window(WindowID p_id) {
 	ERR_FAIL_MSG("Sub-windows not supported by this display server.");
 }
 
-void DisplayServer::delete_sub_window(DisplayServerEnums::WindowID p_id) {
+void DisplayServer::delete_sub_window(WindowID p_id) {
 	ERR_FAIL_MSG("Sub-windows not supported by this display server.");
 }
 
-void DisplayServer::window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive) {
+void DisplayServer::window_set_exclusive(WindowID p_window, bool p_exclusive) {
 	// Do nothing, if not supported.
 }
 
-void DisplayServer::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window) {
+void DisplayServer::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
 	ERR_FAIL_MSG("Mouse passthrough not supported by this display server.");
 }
 
-void DisplayServer::gl_window_make_current(DisplayServerEnums::WindowID p_window_id) {
+void DisplayServer::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 	// noop except in gles
 }
 
-void DisplayServer::window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window) {
+void DisplayServer::window_set_ime_active(const bool p_active, WindowID p_window) {
 	WARN_PRINT("IME not supported by this display server.");
 }
 
-void DisplayServer::window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window) {
+void DisplayServer::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
 	WARN_PRINT("IME not supported by this display server.");
 }
 
-#ifndef DISABLE_DEPRECATED
-
-RID DisplayServer::accessibility_create_element(DisplayServerEnums::WindowID p_window, DisplayServerEnums::AccessibilityRole p_role) {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->create_element(p_window, (AccessibilityServerEnums::AccessibilityRole)p_role);
+RID DisplayServer::accessibility_create_element(WindowID p_window, DisplayServer::AccessibilityRole p_role) {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_element(p_window, p_role);
 	} else {
 		return RID();
 	}
 }
 
-RID DisplayServer::accessibility_create_sub_element(const RID &p_parent_rid, DisplayServerEnums::AccessibilityRole p_role, int p_insert_pos) {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->create_sub_element(p_parent_rid, (AccessibilityServerEnums::AccessibilityRole)p_role, p_insert_pos);
+RID DisplayServer::accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos) {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_sub_element(p_parent_rid, p_role, p_insert_pos);
 	} else {
 		return RID();
 	}
 }
 
 RID DisplayServer::accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos, bool p_is_last_line) {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->create_sub_text_edit_elements(p_parent_rid, p_shaped_text, p_min_height, p_insert_pos, p_is_last_line);
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_sub_text_edit_elements(p_parent_rid, p_shaped_text, p_min_height, p_insert_pos, p_is_last_line);
 	} else {
 		return RID();
 	}
 }
 
 bool DisplayServer::accessibility_has_element(const RID &p_id) const {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->has_element(p_id);
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_has_element(p_id);
 	} else {
 		return false;
 	}
 }
 
 void DisplayServer::accessibility_free_element(const RID &p_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->free_element(p_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_free_element(p_id);
 	}
 }
 
 void DisplayServer::accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->element_set_meta(p_id, p_meta);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_element_set_meta(p_id, p_meta);
 	}
 }
 
 Variant DisplayServer::accessibility_element_get_meta(const RID &p_id) const {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->element_get_meta(p_id);
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_element_get_meta(p_id);
 	} else {
 		return Variant();
 	}
 }
 
 void DisplayServer::accessibility_update_if_active(const Callable &p_callable) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_if_active(p_callable);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_if_active(p_callable);
 	}
 }
 
 void DisplayServer::accessibility_update_set_focus(const RID &p_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_focus(p_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_focus(p_id);
 	}
 }
 
-RID DisplayServer::accessibility_get_window_root(DisplayServerEnums::WindowID p_window_id) const {
-	if (AccessibilityServer::get_singleton()) {
-		return AccessibilityServer::get_singleton()->get_window_root(p_window_id);
+RID DisplayServer::accessibility_get_window_root(DisplayServer::WindowID p_window_id) const {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_get_window_root(p_window_id);
 	} else {
 		return RID();
 	}
 }
 
-void DisplayServer::accessibility_set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->set_window_rect(p_window_id, p_rect_out, p_rect_in);
+void DisplayServer::accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_set_window_rect(p_window_id, p_rect_out, p_rect_in);
 	}
 }
 
-void DisplayServer::accessibility_set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->set_window_focused(p_window_id, p_focused);
+void DisplayServer::accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_set_window_focused(p_window_id, p_focused);
 	}
 }
 
-void DisplayServer::accessibility_set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->set_window_callbacks(p_window_id, p_activate_callable, p_deativate_callable);
+void DisplayServer::accessibility_set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_set_window_callbacks(p_window_id, p_activate_callable, p_deativate_callable);
 	}
 }
 
-void DisplayServer::accessibility_window_activation_completed(DisplayServerEnums::WindowID p_window_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->window_activation_completed(p_window_id);
+void DisplayServer::accessibility_window_activation_completed(DisplayServer::WindowID p_window_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_window_activation_completed(p_window_id);
 	}
 }
 
-void DisplayServer::accessibility_window_deactivation_completed(DisplayServerEnums::WindowID p_window_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->window_deactivation_completed(p_window_id);
+void DisplayServer::accessibility_window_deactivation_completed(DisplayServer::WindowID p_window_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_window_deactivation_completed(p_window_id);
 	}
 }
 
-void DisplayServer::accessibility_update_set_role(const RID &p_id, DisplayServerEnums::AccessibilityRole p_role) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_role(p_id, (AccessibilityServerEnums::AccessibilityRole)p_role);
+void DisplayServer::accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_role(p_id, p_role);
 	}
 }
 
 void DisplayServer::accessibility_update_set_name(const RID &p_id, const String &p_name) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_name(p_id, p_name);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_name(p_id, p_name);
 	}
 }
 
 void DisplayServer::accessibility_update_set_description(const RID &p_id, const String &p_description) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_description(p_id, p_description);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_description(p_id, p_description);
 	}
 }
 
 void DisplayServer::accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_extra_info(p_id, p_name_extra_info);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_extra_info(p_id, p_name_extra_info);
 	}
 }
 
 void DisplayServer::accessibility_update_set_value(const RID &p_id, const String &p_value) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_value(p_id, p_value);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_value(p_id, p_value);
 	}
 }
 
 void DisplayServer::accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_tooltip(p_id, p_tooltip);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_tooltip(p_id, p_tooltip);
 	}
 }
 
 void DisplayServer::accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_bounds(p_id, p_rect);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_bounds(p_id, p_rect);
 	}
 }
 
 void DisplayServer::accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_transform(p_id, p_transform);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_transform(p_id, p_transform);
 	}
 }
 
 void DisplayServer::accessibility_update_add_child(const RID &p_id, const RID &p_child_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_child(p_id, p_child_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_child(p_id, p_child_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_controls(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_controls(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_details(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_details(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_described_by(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_described_by(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_flow_to(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_flow_to(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_labeled_by(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_labeled_by(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_related_radio_group(p_id, p_related_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_radio_group(p_id, p_related_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_active_descendant(p_id, p_other_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_active_descendant(p_id, p_other_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_next_on_line(p_id, p_other_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_next_on_line(p_id, p_other_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_previous_on_line(p_id, p_other_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_previous_on_line(p_id, p_other_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_member_of(p_id, p_group_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_member_of(p_id, p_group_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_in_page_link_target(p_id, p_other_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_in_page_link_target(p_id, p_other_id);
 	}
 }
 
 void DisplayServer::accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_error_message(p_id, p_other_id);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_error_message(p_id, p_other_id);
 	}
 }
 
-void DisplayServer::accessibility_update_set_live(const RID &p_id, DisplayServerEnums::AccessibilityLiveMode p_live) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_live(p_id, (AccessibilityServerEnums::AccessibilityLiveMode)p_live);
+void DisplayServer::accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_live(p_id, p_live);
 	}
 }
 
-void DisplayServer::accessibility_update_add_action(const RID &p_id, DisplayServerEnums::AccessibilityAction p_action, const Callable &p_callable) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_action(p_id, (AccessibilityServerEnums::AccessibilityAction)p_action, p_callable);
+void DisplayServer::accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_action(p_id, p_action, p_callable);
 	}
 }
 
 void DisplayServer::accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_add_custom_action(p_id, p_action_id, p_action_description);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_custom_action(p_id, p_action_id, p_action_description);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_row_count(const RID &p_id, int p_count) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_row_count(p_id, p_count);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_row_count(p_id, p_count);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_column_count(const RID &p_id, int p_count) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_column_count(p_id, p_count);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_column_count(p_id, p_count);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_row_index(const RID &p_id, int p_index) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_row_index(p_id, p_index);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_row_index(p_id, p_index);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_column_index(const RID &p_id, int p_index) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_column_index(p_id, p_index);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_column_index(p_id, p_index);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_cell_position(p_id, p_row_index, p_column_index);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_cell_position(p_id, p_row_index, p_column_index);
 	}
 }
 
 void DisplayServer::accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_table_cell_span(p_id, p_row_span, p_column_span);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_cell_span(p_id, p_row_span, p_column_span);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_item_count(const RID &p_id, int p_size) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_item_count(p_id, p_size);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_count(p_id, p_size);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_item_index(const RID &p_id, int p_index) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_item_index(p_id, p_index);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_index(p_id, p_index);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_item_level(const RID &p_id, int p_level) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_item_level(p_id, p_level);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_level(p_id, p_level);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_item_selected(p_id, p_selected);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_selected(p_id, p_selected);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_item_expanded(p_id, p_expanded);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_expanded(p_id, p_expanded);
 	}
 }
 
-void DisplayServer::accessibility_update_set_popup_type(const RID &p_id, DisplayServerEnums::AccessibilityPopupType p_popup) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_popup_type(p_id, (AccessibilityServerEnums::AccessibilityPopupType)p_popup);
+void DisplayServer::accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_popup_type(p_id, p_popup);
 	}
 }
 
 void DisplayServer::accessibility_update_set_checked(const RID &p_id, bool p_checekd) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_checked(p_id, p_checekd);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_checked(p_id, p_checekd);
 	}
 }
 
 void DisplayServer::accessibility_update_set_num_value(const RID &p_id, double p_position) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_num_value(p_id, p_position);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_value(p_id, p_position);
 	}
 }
 
 void DisplayServer::accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_num_range(p_id, p_min, p_max);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_range(p_id, p_min, p_max);
 	}
 }
 
 void DisplayServer::accessibility_update_set_num_step(const RID &p_id, double p_step) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_num_step(p_id, p_step);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_step(p_id, p_step);
 	}
 }
 
 void DisplayServer::accessibility_update_set_num_jump(const RID &p_id, double p_jump) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_num_jump(p_id, p_jump);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_jump(p_id, p_jump);
 	}
 }
 
 void DisplayServer::accessibility_update_set_scroll_x(const RID &p_id, double p_position) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_scroll_x(p_id, p_position);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_x(p_id, p_position);
 	}
 }
 
 void DisplayServer::accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_scroll_x_range(p_id, p_min, p_max);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_x_range(p_id, p_min, p_max);
 	}
 }
 
 void DisplayServer::accessibility_update_set_scroll_y(const RID &p_id, double p_position) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_scroll_y(p_id, p_position);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_y(p_id, p_position);
 	}
 }
 
 void DisplayServer::accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_scroll_y_range(p_id, p_min, p_max);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_y_range(p_id, p_min, p_max);
 	}
 }
 
 void DisplayServer::accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_text_decorations(p_id, p_underline, p_strikethrough, p_overline, Color(0, 0, 0, 1));
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_decorations(p_id, p_underline, p_strikethrough, p_overline);
 	}
 }
 
 void DisplayServer::accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_text_align(p_id, p_align);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_align(p_id, p_align);
 	}
 }
 
 void DisplayServer::accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_text_selection(p_id, p_text_start_id, p_start_char, p_text_end_id, p_end_char);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_selection(p_id, p_text_start_id, p_start_char, p_text_end_id, p_end_char);
 	}
 }
 
-void DisplayServer::accessibility_update_set_flag(const RID &p_id, DisplayServerEnums::AccessibilityFlags p_flag, bool p_value) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_flag(p_id, (AccessibilityServerEnums::AccessibilityFlags)p_flag, p_value);
+void DisplayServer::accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_flag(p_id, p_flag, p_value);
 	}
 }
 
 void DisplayServer::accessibility_update_set_classname(const RID &p_id, const String &p_classname) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_classname(p_id, p_classname);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_classname(p_id, p_classname);
 	}
 }
 
 void DisplayServer::accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_placeholder(p_id, p_placeholder);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_placeholder(p_id, p_placeholder);
 	}
 }
 
 void DisplayServer::accessibility_update_set_language(const RID &p_id, const String &p_language) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_language(p_id, p_language);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_language(p_id, p_language);
 	}
 }
 
 void DisplayServer::accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_text_orientation(p_id, p_vertical);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_orientation(p_id, p_vertical);
 	}
 }
 
 void DisplayServer::accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_list_orientation(p_id, p_vertical);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_orientation(p_id, p_vertical);
 	}
 }
 
 void DisplayServer::accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_shortcut(p_id, p_shortcut);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_shortcut(p_id, p_shortcut);
 	}
 }
 
 void DisplayServer::accessibility_update_set_url(const RID &p_id, const String &p_url) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_url(p_id, p_url);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_url(p_id, p_url);
 	}
 }
 
 void DisplayServer::accessibility_update_set_role_description(const RID &p_id, const String &p_description) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_role_description(p_id, p_description);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_role_description(p_id, p_description);
 	}
 }
 
 void DisplayServer::accessibility_update_set_state_description(const RID &p_id, const String &p_description) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_state_description(p_id, p_description);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_state_description(p_id, p_description);
 	}
 }
 
 void DisplayServer::accessibility_update_set_color_value(const RID &p_id, const Color &p_color) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_color_value(p_id, p_color);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_color_value(p_id, p_color);
 	}
 }
 
 void DisplayServer::accessibility_update_set_background_color(const RID &p_id, const Color &p_color) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_background_color(p_id, p_color);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_background_color(p_id, p_color);
 	}
 }
 
 void DisplayServer::accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) {
-	if (AccessibilityServer::get_singleton()) {
-		AccessibilityServer::get_singleton()->update_set_foreground_color(p_id, p_color);
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_foreground_color(p_id, p_color);
 	}
 }
 
-#endif // DISABLE_DEPRECATED
-
 Point2i DisplayServer::ime_get_selection() const {
 	ERR_FAIL_V_MSG(Point2i(), "IME or NOTIFICATION_WM_IME_UPDATE not supported by this display server.");
 }
@@ -1121,7 +1108,7 @@ String DisplayServer::ime_get_text() const {
 	ERR_FAIL_V_MSG(String(), "IME or NOTIFICATION_WM_IME_UPDATE not supported by this display server.");
 }
 
-void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, DisplayServerEnums::VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
+void DisplayServer::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_length, int p_cursor_start, int p_cursor_end) {
 	WARN_PRINT("Virtual keyboard not supported by this display server.");
 }
 
@@ -1139,15 +1126,15 @@ bool DisplayServer::has_hardware_keyboard() const {
 	return true;
 }
 
-void DisplayServer::cursor_set_shape(DisplayServerEnums::CursorShape p_shape) {
+void DisplayServer::cursor_set_shape(CursorShape p_shape) {
 	WARN_PRINT("Cursor shape not supported by this display server.");
 }
 
-DisplayServerEnums::CursorShape DisplayServer::cursor_get_shape() const {
-	return DisplayServerEnums::CURSOR_ARROW;
+DisplayServer::CursorShape DisplayServer::cursor_get_shape() const {
+	return CURSOR_ARROW;
 }
 
-void DisplayServer::cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
+void DisplayServer::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	WARN_PRINT("Custom cursor shape not supported by this display server.");
 }
 
@@ -1155,25 +1142,25 @@ bool DisplayServer::get_swap_cancel_ok() {
 	return false;
 }
 
-void DisplayServer::enable_for_stealing_focus(ProcessID pid) {
+void DisplayServer::enable_for_stealing_focus(OS::ProcessID pid) {
 }
 
-Error DisplayServer::embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
+Error DisplayServer::embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus) {
 	WARN_PRINT("Embedded process not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::request_close_embedded_process(ProcessID p_pid) {
+Error DisplayServer::request_close_embedded_process(OS::ProcessID p_pid) {
 	WARN_PRINT("Embedded process not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::remove_embedded_process(ProcessID p_pid) {
+Error DisplayServer::remove_embedded_process(OS::ProcessID p_pid) {
 	WARN_PRINT("Embedded process not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
 
-ProcessID DisplayServer::get_focused_process_id() {
+OS::ProcessID DisplayServer::get_focused_process_id() {
 	WARN_PRINT("Embedded process not supported by this display server.");
 	return 0;
 }
@@ -1188,12 +1175,12 @@ Error DisplayServer::dialog_input_text(String p_title, String p_description, Str
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	WARN_PRINT("Native dialogs not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) {
+Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	WARN_PRINT("Native dialogs not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
@@ -1254,101 +1241,55 @@ void DisplayServer::set_icon(const Ref<Image> &p_icon) {
 	WARN_PRINT("Icon not supported by this display server.");
 }
 
-DisplayServerEnums::IndicatorID DisplayServer::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
+DisplayServer::IndicatorID DisplayServer::create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) {
 	WARN_PRINT("Status indicator not supported by this display server.");
-	return DisplayServerEnums::INVALID_INDICATOR_ID;
+	return INVALID_INDICATOR_ID;
 }
 
-void DisplayServer::status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) {
+void DisplayServer::status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) {
 	WARN_PRINT("Status indicator not supported by this display server.");
 }
 
-void DisplayServer::status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) {
+void DisplayServer::status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) {
 	WARN_PRINT("Status indicator not supported by this display server.");
 }
 
-void DisplayServer::status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_menu_rid) {
+void DisplayServer::status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid) {
 	WARN_PRINT("Status indicator not supported by this display server.");
 }
 
-void DisplayServer::status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) {
+void DisplayServer::status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) {
 	WARN_PRINT("Status indicator not supported by this display server.");
 }
 
-Rect2 DisplayServer::status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const {
+Rect2 DisplayServer::status_indicator_get_rect(IndicatorID p_id) const {
 	WARN_PRINT("Status indicator not supported by this display server.");
 	return Rect2();
 }
 
-void DisplayServer::delete_status_indicator(DisplayServerEnums::IndicatorID p_id) {
+void DisplayServer::delete_status_indicator(IndicatorID p_id) {
 	WARN_PRINT("Status indicator not supported by this display server.");
 }
 
-int64_t DisplayServer::window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window) const {
+int64_t DisplayServer::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	WARN_PRINT("Native handle not supported by this display server.");
 	return 0;
 }
 
-void DisplayServer::window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window) {
+void DisplayServer::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
 	WARN_PRINT("Changing the V-Sync mode is not supported by this display server.");
 }
 
-DisplayServerEnums::VSyncMode DisplayServer::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode DisplayServer::window_get_vsync_mode(WindowID p_window) const {
 	WARN_PRINT("Changing the V-Sync mode is not supported by this display server.");
-	return DisplayServerEnums::VSyncMode::VSYNC_ENABLED;
+	return VSyncMode::VSYNC_ENABLED;
 }
 
-bool DisplayServer::window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window) const {
-	return false;
+DisplayServer::WindowID DisplayServer::get_focused_window() const {
+	return MAIN_WINDOW_ID; // Proper value for single windows.
 }
 
-void DisplayServer::window_request_hdr_output(const bool p_enable, DisplayServerEnums::WindowID p_window) {
-	if (p_enable) {
-		WARN_PRINT_ED("HDR output is not supported by this display server.");
-	}
-}
-
-bool DisplayServer::window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window) const {
-	return false;
-}
-
-bool DisplayServer::window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const {
-	return false;
-}
-
-void DisplayServer::window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window) {
-	WARN_PRINT_ED("HDR output is not supported by this display server.");
-}
-
-float DisplayServer::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	return -1.0f;
-}
-
-float DisplayServer::window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	return 0.0f;
-}
-
-void DisplayServer::window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window) {
-	WARN_PRINT_ED("HDR output is not supported by this display server.");
-}
-
-float DisplayServer::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	return -1.0f;
-}
-
-float DisplayServer::window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	return 0.0f;
-}
-
-float DisplayServer::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const {
-	return 1.0f;
-}
-
-DisplayServerEnums::WindowID DisplayServer::get_focused_window() const {
-	return DisplayServerEnums::MAIN_WINDOW_ID; // Proper value for single windows.
-}
-
-void DisplayServer::set_context(DisplayServerEnums::Context p_context) {
+void DisplayServer::set_context(Context p_context) {
 }
 
 void DisplayServer::register_additional_output(Object *p_object) {
@@ -1363,8 +1304,6 @@ void DisplayServer::unregister_additional_output(Object *p_object) {
 }
 
 void DisplayServer::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("orientation_changed", PropertyInfo(Variant::INT, "orientation")));
-
 	ClassDB::bind_method(D_METHOD("has_feature", "feature"), &DisplayServer::has_feature);
 	ClassDB::bind_method(D_METHOD("get_name"), &DisplayServer::get_name);
 
@@ -1426,7 +1365,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("global_menu_clear", "menu_root"), &DisplayServer::global_menu_clear);
 
 	ClassDB::bind_method(D_METHOD("global_menu_get_system_menu_roots"), &DisplayServer::global_menu_get_system_menu_roots);
-#endif // DISABLE_DEPRECATED
+#endif
 
 	ClassDB::bind_method(D_METHOD("tts_is_speaking"), &DisplayServer::tts_is_speaking);
 	ClassDB::bind_method(D_METHOD("tts_is_paused"), &DisplayServer::tts_is_paused);
@@ -1469,20 +1408,20 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_primary_screen"), &DisplayServer::get_primary_screen);
 	ClassDB::bind_method(D_METHOD("get_keyboard_focus_screen"), &DisplayServer::get_keyboard_focus_screen);
 	ClassDB::bind_method(D_METHOD("get_screen_from_rect", "rect"), &DisplayServer::get_screen_from_rect);
-	ClassDB::bind_method(D_METHOD("screen_get_position", "screen"), &DisplayServer::screen_get_position, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
-	ClassDB::bind_method(D_METHOD("screen_get_size", "screen"), &DisplayServer::screen_get_size, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
-	ClassDB::bind_method(D_METHOD("screen_get_usable_rect", "screen"), &DisplayServer::screen_get_usable_rect, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
-	ClassDB::bind_method(D_METHOD("screen_get_dpi", "screen"), &DisplayServer::screen_get_dpi, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
-	ClassDB::bind_method(D_METHOD("screen_get_scale", "screen"), &DisplayServer::screen_get_scale, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_position", "screen"), &DisplayServer::screen_get_position, DEFVAL(SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_size", "screen"), &DisplayServer::screen_get_size, DEFVAL(SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_usable_rect", "screen"), &DisplayServer::screen_get_usable_rect, DEFVAL(SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_dpi", "screen"), &DisplayServer::screen_get_dpi, DEFVAL(SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_scale", "screen"), &DisplayServer::screen_get_scale, DEFVAL(SCREEN_OF_MAIN_WINDOW));
 	ClassDB::bind_method(D_METHOD("is_touchscreen_available"), &DisplayServer::is_touchscreen_available);
 	ClassDB::bind_method(D_METHOD("screen_get_max_scale"), &DisplayServer::screen_get_max_scale);
-	ClassDB::bind_method(D_METHOD("screen_get_refresh_rate", "screen"), &DisplayServer::screen_get_refresh_rate, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_refresh_rate", "screen"), &DisplayServer::screen_get_refresh_rate, DEFVAL(SCREEN_OF_MAIN_WINDOW));
 	ClassDB::bind_method(D_METHOD("screen_get_pixel", "position"), &DisplayServer::screen_get_pixel);
-	ClassDB::bind_method(D_METHOD("screen_get_image", "screen"), &DisplayServer::screen_get_image, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_image", "screen"), &DisplayServer::screen_get_image, DEFVAL(SCREEN_OF_MAIN_WINDOW));
 	ClassDB::bind_method(D_METHOD("screen_get_image_rect", "rect"), &DisplayServer::screen_get_image_rect);
 
-	ClassDB::bind_method(D_METHOD("screen_set_orientation", "orientation", "screen"), &DisplayServer::screen_set_orientation, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
-	ClassDB::bind_method(D_METHOD("screen_get_orientation", "screen"), &DisplayServer::screen_get_orientation, DEFVAL(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_set_orientation", "orientation", "screen"), &DisplayServer::screen_set_orientation, DEFVAL(SCREEN_OF_MAIN_WINDOW));
+	ClassDB::bind_method(D_METHOD("screen_get_orientation", "screen"), &DisplayServer::screen_get_orientation, DEFVAL(SCREEN_OF_MAIN_WINDOW));
 
 	ClassDB::bind_method(D_METHOD("screen_set_keep_on", "enable"), &DisplayServer::screen_set_keep_on);
 	ClassDB::bind_method(D_METHOD("screen_is_kept_on"), &DisplayServer::screen_is_kept_on);
@@ -1490,90 +1429,70 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_window_list"), &DisplayServer::get_window_list);
 	ClassDB::bind_method(D_METHOD("get_window_at_screen_position", "position"), &DisplayServer::get_window_at_screen_position);
 
-	ClassDB::bind_method(D_METHOD("window_get_native_handle", "handle_type", "window_id"), &DisplayServer::window_get_native_handle, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_native_handle", "handle_type", "window_id"), &DisplayServer::window_get_native_handle, DEFVAL(MAIN_WINDOW_ID));
 	ClassDB::bind_method(D_METHOD("window_get_active_popup"), &DisplayServer::window_get_active_popup);
 	ClassDB::bind_method(D_METHOD("window_set_popup_safe_rect", "window", "rect"), &DisplayServer::window_set_popup_safe_rect);
 	ClassDB::bind_method(D_METHOD("window_get_popup_safe_rect", "window"), &DisplayServer::window_get_popup_safe_rect);
 
-	ClassDB::bind_method(D_METHOD("window_set_title", "title", "window_id"), &DisplayServer::window_set_title, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_title_size", "title", "window_id"), &DisplayServer::window_get_title_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_mouse_passthrough", "region", "window_id"), &DisplayServer::window_set_mouse_passthrough, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_title", "title", "window_id"), &DisplayServer::window_set_title, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_title_size", "title", "window_id"), &DisplayServer::window_get_title_size, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_mouse_passthrough", "region", "window_id"), &DisplayServer::window_set_mouse_passthrough, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_current_screen", "window_id"), &DisplayServer::window_get_current_screen, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_current_screen", "screen", "window_id"), &DisplayServer::window_set_current_screen, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_current_screen", "window_id"), &DisplayServer::window_get_current_screen, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_current_screen", "screen", "window_id"), &DisplayServer::window_set_current_screen, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_position", "window_id"), &DisplayServer::window_get_position, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_position_with_decorations", "window_id"), &DisplayServer::window_get_position_with_decorations, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_position", "position", "window_id"), &DisplayServer::window_set_position, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_position", "window_id"), &DisplayServer::window_get_position, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_position_with_decorations", "window_id"), &DisplayServer::window_get_position_with_decorations, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_position", "position", "window_id"), &DisplayServer::window_set_position, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_size", "window_id"), &DisplayServer::window_get_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_size", "size", "window_id"), &DisplayServer::window_set_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_rect_changed_callback", "callback", "window_id"), &DisplayServer::window_set_rect_changed_callback, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_window_event_callback", "callback", "window_id"), &DisplayServer::window_set_window_event_callback, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_input_event_callback", "callback", "window_id"), &DisplayServer::window_set_input_event_callback, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_input_text_callback", "callback", "window_id"), &DisplayServer::window_set_input_text_callback, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_drop_files_callback", "callback", "window_id"), &DisplayServer::window_set_drop_files_callback, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_size", "window_id"), &DisplayServer::window_get_size, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_size", "size", "window_id"), &DisplayServer::window_set_size, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_rect_changed_callback", "callback", "window_id"), &DisplayServer::window_set_rect_changed_callback, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_window_event_callback", "callback", "window_id"), &DisplayServer::window_set_window_event_callback, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_input_event_callback", "callback", "window_id"), &DisplayServer::window_set_input_event_callback, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_input_text_callback", "callback", "window_id"), &DisplayServer::window_set_input_text_callback, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_drop_files_callback", "callback", "window_id"), &DisplayServer::window_set_drop_files_callback, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_attached_instance_id", "window_id"), &DisplayServer::window_get_attached_instance_id, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_attached_instance_id", "window_id"), &DisplayServer::window_get_attached_instance_id, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_max_size", "window_id"), &DisplayServer::window_get_max_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_max_size", "max_size", "window_id"), &DisplayServer::window_set_max_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_max_size", "window_id"), &DisplayServer::window_get_max_size, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_max_size", "max_size", "window_id"), &DisplayServer::window_set_max_size, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_min_size", "window_id"), &DisplayServer::window_get_min_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_min_size", "min_size", "window_id"), &DisplayServer::window_set_min_size, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_min_size", "window_id"), &DisplayServer::window_get_min_size, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_min_size", "min_size", "window_id"), &DisplayServer::window_set_min_size, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_size_with_decorations", "window_id"), &DisplayServer::window_get_size_with_decorations, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_size_with_decorations", "window_id"), &DisplayServer::window_get_size_with_decorations, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_get_mode", "window_id"), &DisplayServer::window_get_mode, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_mode", "mode", "window_id"), &DisplayServer::window_set_mode, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_mode", "window_id"), &DisplayServer::window_get_mode, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_mode", "mode", "window_id"), &DisplayServer::window_set_mode, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_set_flag", "flag", "enabled", "window_id"), &DisplayServer::window_set_flag, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_flag", "flag", "window_id"), &DisplayServer::window_get_flag, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_flag", "flag", "enabled", "window_id"), &DisplayServer::window_set_flag, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_flag", "flag", "window_id"), &DisplayServer::window_get_flag, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_set_icon", "icon", "window_id"), &DisplayServer::window_set_icon, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_window_buttons_offset", "offset", "window_id"), &DisplayServer::window_set_window_buttons_offset, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_safe_title_margins", "window_id"), &DisplayServer::window_get_safe_title_margins, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_set_window_buttons_offset", "offset", "window_id"), &DisplayServer::window_set_window_buttons_offset, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_safe_title_margins", "window_id"), &DisplayServer::window_get_safe_title_margins, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_request_attention", "window_id"), &DisplayServer::window_request_attention, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_request_attention", "window_id"), &DisplayServer::window_request_attention, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_taskbar_progress_value", "value", "window_id"), &DisplayServer::window_set_taskbar_progress_value, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_taskbar_progress_state", "state", "window_id"), &DisplayServer::window_set_taskbar_progress_state, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_move_to_foreground", "window_id"), &DisplayServer::window_move_to_foreground, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_is_focused", "window_id"), &DisplayServer::window_is_focused, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_can_draw", "window_id"), &DisplayServer::window_can_draw, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_move_to_foreground", "window_id"), &DisplayServer::window_move_to_foreground, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_is_focused", "window_id"), &DisplayServer::window_is_focused, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_can_draw", "window_id"), &DisplayServer::window_can_draw, DEFVAL(MAIN_WINDOW_ID));
 
 	ClassDB::bind_method(D_METHOD("window_set_transient", "window_id", "parent_window_id"), &DisplayServer::window_set_transient);
 	ClassDB::bind_method(D_METHOD("window_set_exclusive", "window_id", "exclusive"), &DisplayServer::window_set_exclusive);
 
-	ClassDB::bind_method(D_METHOD("window_set_ime_active", "active", "window_id"), &DisplayServer::window_set_ime_active, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_set_ime_position", "position", "window_id"), &DisplayServer::window_set_ime_position, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_ime_active", "active", "window_id"), &DisplayServer::window_set_ime_active, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_ime_position", "position", "window_id"), &DisplayServer::window_set_ime_position, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_set_vsync_mode", "vsync_mode", "window_id"), &DisplayServer::window_set_vsync_mode, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_vsync_mode", "window_id"), &DisplayServer::window_get_vsync_mode, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_set_vsync_mode", "vsync_mode", "window_id"), &DisplayServer::window_set_vsync_mode, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_get_vsync_mode", "window_id"), &DisplayServer::window_get_vsync_mode, DEFVAL(MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("window_is_hdr_output_supported", "window_id"), &DisplayServer::window_is_hdr_output_supported, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_request_hdr_output", "enable", "window_id"), &DisplayServer::window_request_hdr_output, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_is_hdr_output_requested", "window_id"), &DisplayServer::window_is_hdr_output_requested, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_is_hdr_output_enabled", "window_id"), &DisplayServer::window_is_hdr_output_enabled, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_set_hdr_output_reference_luminance", "reference_luminance", "window_id"), &DisplayServer::window_set_hdr_output_reference_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_hdr_output_reference_luminance", "window_id"), &DisplayServer::window_get_hdr_output_reference_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_hdr_output_current_reference_luminance", "window_id"), &DisplayServer::window_get_hdr_output_current_reference_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_set_hdr_output_max_luminance", "max_luminance", "window_id"), &DisplayServer::window_set_hdr_output_max_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_hdr_output_max_luminance", "window_id"), &DisplayServer::window_get_hdr_output_max_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_get_hdr_output_current_max_luminance", "window_id"), &DisplayServer::window_get_hdr_output_current_max_luminance, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_get_output_max_linear_value", "window_id"), &DisplayServer::window_get_output_max_linear_value, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("window_is_maximize_allowed", "window_id"), &DisplayServer::window_is_maximize_allowed, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_is_maximize_allowed", "window_id"), &DisplayServer::window_is_maximize_allowed, DEFVAL(MAIN_WINDOW_ID));
 	ClassDB::bind_method(D_METHOD("window_maximize_on_title_dbl_click"), &DisplayServer::window_maximize_on_title_dbl_click);
 	ClassDB::bind_method(D_METHOD("window_minimize_on_title_dbl_click"), &DisplayServer::window_minimize_on_title_dbl_click);
 
-	ClassDB::bind_method(D_METHOD("window_start_drag", "window_id"), &DisplayServer::window_start_drag, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("window_start_resize", "edge", "window_id"), &DisplayServer::window_start_resize, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_start_drag", "window_id"), &DisplayServer::window_start_drag, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("window_start_resize", "edge", "window_id"), &DisplayServer::window_start_resize, DEFVAL(MAIN_WINDOW_ID));
 
 	ClassDB::bind_method(D_METHOD("window_set_color", "color"), &DisplayServer::window_set_color);
 
@@ -1582,7 +1501,6 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("accessibility_should_reduce_transparency"), &DisplayServer::accessibility_should_reduce_transparency);
 	ClassDB::bind_method(D_METHOD("accessibility_screen_reader_active"), &DisplayServer::accessibility_screen_reader_active);
 
-#ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("accessibility_create_element", "window_id", "role"), &DisplayServer::accessibility_create_element);
 	ClassDB::bind_method(D_METHOD("accessibility_create_sub_element", "parent_rid", "role", "insert_pos"), &DisplayServer::accessibility_create_sub_element, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("accessibility_create_sub_text_edit_elements", "parent_rid", "shaped_text", "min_height", "insert_pos", "is_last_line"), &DisplayServer::accessibility_create_sub_text_edit_elements, DEFVAL(-1), DEFVAL(false));
@@ -1659,12 +1577,11 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("accessibility_update_set_color_value", "id", "color"), &DisplayServer::accessibility_update_set_color_value);
 	ClassDB::bind_method(D_METHOD("accessibility_update_set_background_color", "id", "color"), &DisplayServer::accessibility_update_set_background_color);
 	ClassDB::bind_method(D_METHOD("accessibility_update_set_foreground_color", "id", "color"), &DisplayServer::accessibility_update_set_foreground_color);
-#endif // DISABLE_DEPRECATED
 
 	ClassDB::bind_method(D_METHOD("ime_get_selection"), &DisplayServer::ime_get_selection);
 	ClassDB::bind_method(D_METHOD("ime_get_text"), &DisplayServer::ime_get_text);
 
-	ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "type", "max_length", "cursor_start", "cursor_end"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2()), DEFVAL(DisplayServerEnums::KEYBOARD_TYPE_DEFAULT), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("virtual_keyboard_show", "existing_text", "position", "type", "max_length", "cursor_start", "cursor_end"), &DisplayServer::virtual_keyboard_show, DEFVAL(Rect2()), DEFVAL(KEYBOARD_TYPE_DEFAULT), DEFVAL(-1), DEFVAL(-1), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("virtual_keyboard_hide"), &DisplayServer::virtual_keyboard_hide);
 
 	ClassDB::bind_method(D_METHOD("virtual_keyboard_get_height"), &DisplayServer::virtual_keyboard_get_height);
@@ -1674,7 +1591,7 @@ void DisplayServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("cursor_set_shape", "shape"), &DisplayServer::cursor_set_shape);
 	ClassDB::bind_method(D_METHOD("cursor_get_shape"), &DisplayServer::cursor_get_shape);
-	ClassDB::bind_method(D_METHOD("cursor_set_custom_image", "cursor", "shape", "hotspot"), &DisplayServer::cursor_set_custom_image, DEFVAL(DisplayServerEnums::CURSOR_ARROW), DEFVAL(Vector2()));
+	ClassDB::bind_method(D_METHOD("cursor_set_custom_image", "cursor", "shape", "hotspot"), &DisplayServer::cursor_set_custom_image, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2()));
 
 	ClassDB::bind_method(D_METHOD("get_swap_cancel_ok"), &DisplayServer::get_swap_cancel_ok);
 
@@ -1683,8 +1600,8 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("dialog_show", "title", "description", "buttons", "callback"), &DisplayServer::dialog_show);
 	ClassDB::bind_method(D_METHOD("dialog_input_text", "title", "description", "existing_text", "callback"), &DisplayServer::dialog_input_text);
 
-	ClassDB::bind_method(D_METHOD("file_dialog_show", "title", "current_directory", "filename", "show_hidden", "mode", "filters", "callback", "parent_window_id"), &DisplayServer::file_dialog_show, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("file_dialog_with_options_show", "title", "current_directory", "root", "filename", "show_hidden", "mode", "filters", "options", "callback", "parent_window_id"), &DisplayServer::file_dialog_with_options_show, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("file_dialog_show", "title", "current_directory", "filename", "show_hidden", "mode", "filters", "callback", "parent_window_id"), &DisplayServer::file_dialog_show, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("file_dialog_with_options_show", "title", "current_directory", "root", "filename", "show_hidden", "mode", "filters", "options", "callback", "parent_window_id"), &DisplayServer::file_dialog_with_options_show, DEFVAL(MAIN_WINDOW_ID));
 
 	ClassDB::bind_method(D_METHOD("beep"), &DisplayServer::beep);
 
@@ -1724,280 +1641,260 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("unregister_additional_output", "object"), &DisplayServer::unregister_additional_output);
 	ClassDB::bind_method(D_METHOD("has_additional_outputs"), &DisplayServer::has_additional_outputs);
 
-	ClassDB::bind_method(D_METHOD("is_in_pip_mode", "window_id"), &DisplayServer::is_in_pip_mode, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("pip_mode_enter", "window_id"), &DisplayServer::pip_mode_enter, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("pip_mode_set_aspect_ratio", "numerator", "denominator", "window_id"), &DisplayServer::pip_mode_set_aspect_ratio, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("pip_mode_set_auto_enter_on_background", "auto_enter_on_background", "window_id"), &DisplayServer::pip_mode_set_auto_enter_on_background, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
 #ifndef DISABLE_DEPRECATED
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_GLOBAL_MENU);
-#endif // DISABLE_DEPRECATED
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_SUBWINDOWS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_TOUCHSCREEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_MOUSE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_MOUSE_WARP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_CLIPBOARD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_VIRTUAL_KEYBOARD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_CURSOR_SHAPE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_CUSTOM_CURSOR_SHAPE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_DIALOG);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_IME);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_WINDOW_TRANSPARENCY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_HIDPI);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_ICON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_ICON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_ORIENTATION);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_SWAP_BUFFERS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_TEXT_TO_SPEECH);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_EXTEND_TO_TITLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_SCREEN_CAPTURE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_STATUS_INDICATOR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_HELP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_DIALOG_INPUT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_EXTRA);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_WINDOW_DRAG);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_WINDOW_EMBEDDING);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_DIALOG_FILE_MIME);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_EMOJI_AND_SYMBOL_PICKER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_NATIVE_COLOR_PICKER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_SELF_FITTING_WINDOWS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_ACCESSIBILITY_SCREEN_READER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_HDR_OUTPUT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FEATURE_PIP_MODE);
+	BIND_ENUM_CONSTANT(FEATURE_GLOBAL_MENU);
+#endif
+	BIND_ENUM_CONSTANT(FEATURE_SUBWINDOWS);
+	BIND_ENUM_CONSTANT(FEATURE_TOUCHSCREEN);
+	BIND_ENUM_CONSTANT(FEATURE_MOUSE);
+	BIND_ENUM_CONSTANT(FEATURE_MOUSE_WARP);
+	BIND_ENUM_CONSTANT(FEATURE_CLIPBOARD);
+	BIND_ENUM_CONSTANT(FEATURE_VIRTUAL_KEYBOARD);
+	BIND_ENUM_CONSTANT(FEATURE_CURSOR_SHAPE);
+	BIND_ENUM_CONSTANT(FEATURE_CUSTOM_CURSOR_SHAPE);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG);
+	BIND_ENUM_CONSTANT(FEATURE_IME);
+	BIND_ENUM_CONSTANT(FEATURE_WINDOW_TRANSPARENCY);
+	BIND_ENUM_CONSTANT(FEATURE_HIDPI);
+	BIND_ENUM_CONSTANT(FEATURE_ICON);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_ICON);
+	BIND_ENUM_CONSTANT(FEATURE_ORIENTATION);
+	BIND_ENUM_CONSTANT(FEATURE_SWAP_BUFFERS);
+	BIND_ENUM_CONSTANT(FEATURE_CLIPBOARD_PRIMARY);
+	BIND_ENUM_CONSTANT(FEATURE_TEXT_TO_SPEECH);
+	BIND_ENUM_CONSTANT(FEATURE_EXTEND_TO_TITLE);
+	BIND_ENUM_CONSTANT(FEATURE_SCREEN_CAPTURE);
+	BIND_ENUM_CONSTANT(FEATURE_STATUS_INDICATOR);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_HELP);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG_INPUT);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG_FILE);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG_FILE_EXTRA);
+	BIND_ENUM_CONSTANT(FEATURE_WINDOW_DRAG);
+	BIND_ENUM_CONSTANT(FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE);
+	BIND_ENUM_CONSTANT(FEATURE_WINDOW_EMBEDDING);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG_FILE_MIME);
+	BIND_ENUM_CONSTANT(FEATURE_EMOJI_AND_SYMBOL_PICKER);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_COLOR_PICKER);
+	BIND_ENUM_CONSTANT(FEATURE_SELF_FITTING_WINDOWS);
+	BIND_ENUM_CONSTANT(FEATURE_ACCESSIBILITY_SCREEN_READER);
 
-#ifndef DISABLE_DEPRECATED
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_UNKNOWN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_DEFAULT_BUTTON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_AUDIO);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_VIDEO);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_STATIC_TEXT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_CONTAINER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_PANEL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_BUTTON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_LINK);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_CHECK_BOX);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_RADIO_BUTTON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_CHECK_BUTTON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_SCROLL_BAR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_SCROLL_VIEW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_SPLITTER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_SLIDER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_SPIN_BUTTON);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_PROGRESS_INDICATOR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TEXT_FIELD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MULTILINE_TEXT_FIELD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_COLOR_PICKER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TABLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_CELL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_ROW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_ROW_GROUP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_ROW_HEADER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_COLUMN_HEADER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TREE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TREE_ITEM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_LIST);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_LIST_ITEM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_LIST_BOX);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_LIST_BOX_OPTION);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TAB_BAR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TAB);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TAB_PANEL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MENU_BAR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MENU);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MENU_ITEM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MENU_ITEM_CHECK_BOX);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_MENU_ITEM_RADIO);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_IMAGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_WINDOW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TITLE_BAR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_DIALOG);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TOOLTIP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_REGION);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ROLE_TEXT_RUN);
+	BIND_ENUM_CONSTANT(ROLE_UNKNOWN);
+	BIND_ENUM_CONSTANT(ROLE_DEFAULT_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_AUDIO);
+	BIND_ENUM_CONSTANT(ROLE_VIDEO);
+	BIND_ENUM_CONSTANT(ROLE_STATIC_TEXT);
+	BIND_ENUM_CONSTANT(ROLE_CONTAINER);
+	BIND_ENUM_CONSTANT(ROLE_PANEL);
+	BIND_ENUM_CONSTANT(ROLE_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_LINK);
+	BIND_ENUM_CONSTANT(ROLE_CHECK_BOX);
+	BIND_ENUM_CONSTANT(ROLE_RADIO_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_CHECK_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_SCROLL_BAR);
+	BIND_ENUM_CONSTANT(ROLE_SCROLL_VIEW);
+	BIND_ENUM_CONSTANT(ROLE_SPLITTER);
+	BIND_ENUM_CONSTANT(ROLE_SLIDER);
+	BIND_ENUM_CONSTANT(ROLE_SPIN_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_PROGRESS_INDICATOR);
+	BIND_ENUM_CONSTANT(ROLE_TEXT_FIELD);
+	BIND_ENUM_CONSTANT(ROLE_MULTILINE_TEXT_FIELD);
+	BIND_ENUM_CONSTANT(ROLE_COLOR_PICKER);
+	BIND_ENUM_CONSTANT(ROLE_TABLE);
+	BIND_ENUM_CONSTANT(ROLE_CELL);
+	BIND_ENUM_CONSTANT(ROLE_ROW);
+	BIND_ENUM_CONSTANT(ROLE_ROW_GROUP);
+	BIND_ENUM_CONSTANT(ROLE_ROW_HEADER);
+	BIND_ENUM_CONSTANT(ROLE_COLUMN_HEADER);
+	BIND_ENUM_CONSTANT(ROLE_TREE);
+	BIND_ENUM_CONSTANT(ROLE_TREE_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_LIST);
+	BIND_ENUM_CONSTANT(ROLE_LIST_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_LIST_BOX);
+	BIND_ENUM_CONSTANT(ROLE_LIST_BOX_OPTION);
+	BIND_ENUM_CONSTANT(ROLE_TAB_BAR);
+	BIND_ENUM_CONSTANT(ROLE_TAB);
+	BIND_ENUM_CONSTANT(ROLE_TAB_PANEL);
+	BIND_ENUM_CONSTANT(ROLE_MENU_BAR);
+	BIND_ENUM_CONSTANT(ROLE_MENU);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM_CHECK_BOX);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM_RADIO);
+	BIND_ENUM_CONSTANT(ROLE_IMAGE);
+	BIND_ENUM_CONSTANT(ROLE_WINDOW);
+	BIND_ENUM_CONSTANT(ROLE_TITLE_BAR);
+	BIND_ENUM_CONSTANT(ROLE_DIALOG);
+	BIND_ENUM_CONSTANT(ROLE_TOOLTIP);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::POPUP_MENU);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::POPUP_LIST);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::POPUP_TREE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::POPUP_DIALOG);
+	BIND_ENUM_CONSTANT(POPUP_MENU);
+	BIND_ENUM_CONSTANT(POPUP_LIST);
+	BIND_ENUM_CONSTANT(POPUP_TREE);
+	BIND_ENUM_CONSTANT(POPUP_DIALOG);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_HIDDEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_MULTISELECTABLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_REQUIRED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_VISITED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_BUSY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_MODAL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_TOUCH_PASSTHROUGH);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_READONLY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_DISABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FLAG_CLIPS_CHILDREN);
+	BIND_ENUM_CONSTANT(FLAG_HIDDEN);
+	BIND_ENUM_CONSTANT(FLAG_MULTISELECTABLE);
+	BIND_ENUM_CONSTANT(FLAG_REQUIRED);
+	BIND_ENUM_CONSTANT(FLAG_VISITED);
+	BIND_ENUM_CONSTANT(FLAG_BUSY);
+	BIND_ENUM_CONSTANT(FLAG_MODAL);
+	BIND_ENUM_CONSTANT(FLAG_TOUCH_PASSTHROUGH);
+	BIND_ENUM_CONSTANT(FLAG_READONLY);
+	BIND_ENUM_CONSTANT(FLAG_DISABLED);
+	BIND_ENUM_CONSTANT(FLAG_CLIPS_CHILDREN);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_CLICK);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_FOCUS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_BLUR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_COLLAPSE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_EXPAND);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_DECREMENT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_INCREMENT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_HIDE_TOOLTIP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SHOW_TOOLTIP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SET_TEXT_SELECTION);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_REPLACE_SELECTED_TEXT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_BACKWARD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_DOWN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_FORWARD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_LEFT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_RIGHT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_UP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_INTO_VIEW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SCROLL_TO_POINT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SET_SCROLL_OFFSET);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SET_VALUE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_SHOW_CONTEXT_MENU);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::ACTION_CUSTOM);
+	BIND_ENUM_CONSTANT(ACTION_CLICK);
+	BIND_ENUM_CONSTANT(ACTION_FOCUS);
+	BIND_ENUM_CONSTANT(ACTION_BLUR);
+	BIND_ENUM_CONSTANT(ACTION_COLLAPSE);
+	BIND_ENUM_CONSTANT(ACTION_EXPAND);
+	BIND_ENUM_CONSTANT(ACTION_DECREMENT);
+	BIND_ENUM_CONSTANT(ACTION_INCREMENT);
+	BIND_ENUM_CONSTANT(ACTION_HIDE_TOOLTIP);
+	BIND_ENUM_CONSTANT(ACTION_SHOW_TOOLTIP);
+	BIND_ENUM_CONSTANT(ACTION_SET_TEXT_SELECTION);
+	BIND_ENUM_CONSTANT(ACTION_REPLACE_SELECTED_TEXT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_BACKWARD);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_DOWN);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_FORWARD);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_LEFT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_RIGHT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_UP);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_INTO_VIEW);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_TO_POINT);
+	BIND_ENUM_CONSTANT(ACTION_SET_SCROLL_OFFSET);
+	BIND_ENUM_CONSTANT(ACTION_SET_VALUE);
+	BIND_ENUM_CONSTANT(ACTION_SHOW_CONTEXT_MENU);
+	BIND_ENUM_CONSTANT(ACTION_CUSTOM);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::LIVE_OFF);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::LIVE_POLITE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::LIVE_ASSERTIVE);
+	BIND_ENUM_CONSTANT(LIVE_OFF);
+	BIND_ENUM_CONSTANT(LIVE_POLITE);
+	BIND_ENUM_CONSTANT(LIVE_ASSERTIVE);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_UNIT_ITEM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_UNIT_PAGE);
+	BIND_ENUM_CONSTANT(SCROLL_UNIT_ITEM);
+	BIND_ENUM_CONSTANT(SCROLL_UNIT_PAGE);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_TOP_LEFT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_BOTTOM_RIGHT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_TOP_EDGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_BOTTOM_EDGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_LEFT_EDGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCROLL_HINT_RIGHT_EDGE);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_TOP_LEFT);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_BOTTOM_RIGHT);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_TOP_EDGE);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_BOTTOM_EDGE);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_LEFT_EDGE);
+	BIND_ENUM_CONSTANT(SCROLL_HINT_RIGHT_EDGE);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_VISIBLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_HIDDEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_CAPTURED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_CONFINED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_CONFINED_HIDDEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::MOUSE_MODE_MAX);
-#endif // DISABLE_DEPRECATED
+	BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE);
+	BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN);
+	BIND_ENUM_CONSTANT(MOUSE_MODE_CAPTURED);
+	BIND_ENUM_CONSTANT(MOUSE_MODE_CONFINED);
+	BIND_ENUM_CONSTANT(MOUSE_MODE_CONFINED_HIDDEN);
+	BIND_ENUM_CONSTANT(MOUSE_MODE_MAX);
 
-	BIND_CONSTANT(DisplayServerEnums::INVALID_SCREEN);
-	BIND_CONSTANT(DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS);
-	BIND_CONSTANT(DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS);
-	BIND_CONSTANT(DisplayServerEnums::SCREEN_PRIMARY);
-	BIND_CONSTANT(DisplayServerEnums::SCREEN_OF_MAIN_WINDOW);
+	BIND_CONSTANT(INVALID_SCREEN);
+	BIND_CONSTANT(SCREEN_WITH_MOUSE_FOCUS);
+	BIND_CONSTANT(SCREEN_WITH_KEYBOARD_FOCUS);
+	BIND_CONSTANT(SCREEN_PRIMARY);
+	BIND_CONSTANT(SCREEN_OF_MAIN_WINDOW);
 
-	BIND_CONSTANT(DisplayServerEnums::MAIN_WINDOW_ID);
-	BIND_CONSTANT(DisplayServerEnums::INVALID_WINDOW_ID);
-	BIND_CONSTANT(DisplayServerEnums::INVALID_INDICATOR_ID);
+	BIND_CONSTANT(MAIN_WINDOW_ID);
+	BIND_CONSTANT(INVALID_WINDOW_ID);
+	BIND_CONSTANT(INVALID_INDICATOR_ID);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_LANDSCAPE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_PORTRAIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_REVERSE_LANDSCAPE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_REVERSE_PORTRAIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_SENSOR_LANDSCAPE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_SENSOR_PORTRAIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::SCREEN_SENSOR);
+	BIND_ENUM_CONSTANT(SCREEN_LANDSCAPE);
+	BIND_ENUM_CONSTANT(SCREEN_PORTRAIT);
+	BIND_ENUM_CONSTANT(SCREEN_REVERSE_LANDSCAPE);
+	BIND_ENUM_CONSTANT(SCREEN_REVERSE_PORTRAIT);
+	BIND_ENUM_CONSTANT(SCREEN_SENSOR_LANDSCAPE);
+	BIND_ENUM_CONSTANT(SCREEN_SENSOR_PORTRAIT);
+	BIND_ENUM_CONSTANT(SCREEN_SENSOR);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_DEFAULT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_MULTILINE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_NUMBER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_NUMBER_DECIMAL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_PHONE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_EMAIL_ADDRESS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_PASSWORD);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::KEYBOARD_TYPE_URL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_DEFAULT);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_MULTILINE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_NUMBER_DECIMAL);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PHONE);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_EMAIL_ADDRESS);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_PASSWORD);
+	BIND_ENUM_CONSTANT(KEYBOARD_TYPE_URL);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_ARROW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_IBEAM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_POINTING_HAND);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_CROSS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_WAIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_BUSY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_DRAG);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_CAN_DROP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_FORBIDDEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_VSIZE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_HSIZE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_BDIAGSIZE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_FDIAGSIZE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_MOVE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_VSPLIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_HSPLIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_HELP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::CURSOR_MAX);
+	BIND_ENUM_CONSTANT(CURSOR_ARROW);
+	BIND_ENUM_CONSTANT(CURSOR_IBEAM);
+	BIND_ENUM_CONSTANT(CURSOR_POINTING_HAND);
+	BIND_ENUM_CONSTANT(CURSOR_CROSS);
+	BIND_ENUM_CONSTANT(CURSOR_WAIT);
+	BIND_ENUM_CONSTANT(CURSOR_BUSY);
+	BIND_ENUM_CONSTANT(CURSOR_DRAG);
+	BIND_ENUM_CONSTANT(CURSOR_CAN_DROP);
+	BIND_ENUM_CONSTANT(CURSOR_FORBIDDEN);
+	BIND_ENUM_CONSTANT(CURSOR_VSIZE);
+	BIND_ENUM_CONSTANT(CURSOR_HSIZE);
+	BIND_ENUM_CONSTANT(CURSOR_BDIAGSIZE);
+	BIND_ENUM_CONSTANT(CURSOR_FDIAGSIZE);
+	BIND_ENUM_CONSTANT(CURSOR_MOVE);
+	BIND_ENUM_CONSTANT(CURSOR_VSPLIT);
+	BIND_ENUM_CONSTANT(CURSOR_HSPLIT);
+	BIND_ENUM_CONSTANT(CURSOR_HELP);
+	BIND_ENUM_CONSTANT(CURSOR_MAX);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FILE_DIALOG_MODE_OPEN_FILES);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FILE_DIALOG_MODE_OPEN_DIR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FILE_DIALOG_MODE_OPEN_ANY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::FILE_DIALOG_MODE_SAVE_FILE);
+	BIND_ENUM_CONSTANT(FILE_DIALOG_MODE_OPEN_FILE);
+	BIND_ENUM_CONSTANT(FILE_DIALOG_MODE_OPEN_FILES);
+	BIND_ENUM_CONSTANT(FILE_DIALOG_MODE_OPEN_DIR);
+	BIND_ENUM_CONSTANT(FILE_DIALOG_MODE_OPEN_ANY);
+	BIND_ENUM_CONSTANT(FILE_DIALOG_MODE_SAVE_FILE);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_MODE_WINDOWED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_MODE_MINIMIZED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_MODE_MAXIMIZED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_MODE_FULLSCREEN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_MODE_EXCLUSIVE_FULLSCREEN);
+	BIND_ENUM_CONSTANT(WINDOW_MODE_WINDOWED);
+	BIND_ENUM_CONSTANT(WINDOW_MODE_MINIMIZED);
+	BIND_ENUM_CONSTANT(WINDOW_MODE_MAXIMIZED);
+	BIND_ENUM_CONSTANT(WINDOW_MODE_FULLSCREEN);
+	BIND_ENUM_CONSTANT(WINDOW_MODE_EXCLUSIVE_FULLSCREEN);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::PROGRESS_STATE_NOPROGRESS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::PROGRESS_STATE_INDETERMINATE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::PROGRESS_STATE_NORMAL);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::PROGRESS_STATE_ERROR);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::PROGRESS_STATE_PAUSED);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_RESIZE_DISABLED);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_BORDERLESS);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_ALWAYS_ON_TOP);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_TRANSPARENT);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_NO_FOCUS);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_POPUP);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_EXTEND_TO_TITLE);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MOUSE_PASSTHROUGH);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_SHARP_CORNERS);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_EXCLUDE_FROM_CAPTURE);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_POPUP_WM_HINT);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MINIMIZE_DISABLED);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MAXIMIZE_DISABLED);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MAX);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_RESIZE_DISABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_BORDERLESS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_ALWAYS_ON_TOP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_TRANSPARENT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_NO_FOCUS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_POPUP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_EXTEND_TO_TITLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_MOUSE_PASSTHROUGH);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_SHARP_CORNERS);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_POPUP_WM_HINT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_MINIMIZE_DISABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_MAXIMIZE_DISABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_FLAG_MAX);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_MOUSE_ENTER);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_MOUSE_EXIT);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_FOCUS_IN);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_FOCUS_OUT);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_CLOSE_REQUEST);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_GO_BACK_REQUEST);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_DPI_CHANGE);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_TITLEBAR_CHANGE);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_FORCE_CLOSE);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_FOCUS_IN);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_FOCUS_OUT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_CLOSE_REQUEST);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_GO_BACK_REQUEST);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_DPI_CHANGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_TITLEBAR_CHANGE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_FORCE_CLOSE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_TOP_LEFT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_TOP);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_TOP_RIGHT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_LEFT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_RIGHT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_BOTTOM_LEFT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_BOTTOM);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_BOTTOM_RIGHT);
+	BIND_ENUM_CONSTANT(WINDOW_EDGE_MAX);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_TOP_LEFT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_TOP);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_TOP_RIGHT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_LEFT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_RIGHT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_BOTTOM_LEFT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_BOTTOM);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_BOTTOM_RIGHT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_EDGE_MAX);
+	BIND_ENUM_CONSTANT(VSYNC_DISABLED);
+	BIND_ENUM_CONSTANT(VSYNC_ENABLED);
+	BIND_ENUM_CONSTANT(VSYNC_ADAPTIVE);
+	BIND_ENUM_CONSTANT(VSYNC_MAILBOX);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::VSYNC_DISABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::VSYNC_ENABLED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::VSYNC_ADAPTIVE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::VSYNC_MAILBOX);
+	BIND_ENUM_CONSTANT(DISPLAY_HANDLE);
+	BIND_ENUM_CONSTANT(WINDOW_HANDLE);
+	BIND_ENUM_CONSTANT(WINDOW_VIEW);
+	BIND_ENUM_CONSTANT(OPENGL_CONTEXT);
+	BIND_ENUM_CONSTANT(EGL_DISPLAY);
+	BIND_ENUM_CONSTANT(EGL_CONFIG);
 
-	BIND_ENUM_CONSTANT(DisplayServerEnums::DISPLAY_HANDLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_HANDLE);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::WINDOW_VIEW);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::OPENGL_CONTEXT);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::EGL_DISPLAY);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::EGL_CONFIG);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::GLX_VISUALID);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::GLX_FBCONFIG);
-
-	BIND_ENUM_CONSTANT(DisplayServerEnums::TTS_UTTERANCE_STARTED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::TTS_UTTERANCE_ENDED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::TTS_UTTERANCE_CANCELED);
-	BIND_ENUM_CONSTANT(DisplayServerEnums::TTS_UTTERANCE_BOUNDARY);
+	BIND_ENUM_CONSTANT(TTS_UTTERANCE_STARTED);
+	BIND_ENUM_CONSTANT(TTS_UTTERANCE_ENDED);
+	BIND_ENUM_CONSTANT(TTS_UTTERANCE_CANCELED);
+	BIND_ENUM_CONSTANT(TTS_UTTERANCE_BOUNDARY);
 }
 
 Ref<Image> DisplayServer::_get_cursor_image_from_resource(const Ref<Resource> &p_cursor, const Vector2 &p_hotspot) {
@@ -2048,25 +1945,25 @@ Vector<String> DisplayServer::get_create_function_rendering_drivers(int p_index)
 	return server_create_functions[p_index].get_rendering_drivers_function();
 }
 
-DisplayServer *DisplayServer::create(int p_index, const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
+DisplayServer *DisplayServer::create(int p_index, const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	ERR_FAIL_INDEX_V(p_index, server_create_count, nullptr);
 	return server_create_functions[p_index].create_function(p_rendering_driver, p_mode, p_vsync_mode, p_flags, p_position, p_resolution, p_screen, p_context, p_parent_window, r_error);
 }
 
-void DisplayServer::_input_set_mouse_mode(InputClassEnums::MouseMode p_mode) {
-	singleton->mouse_set_mode(DisplayServerEnums::MouseMode(p_mode));
+void DisplayServer::_input_set_mouse_mode(Input::MouseMode p_mode) {
+	singleton->mouse_set_mode(MouseMode(p_mode));
 }
 
-InputClassEnums::MouseMode DisplayServer::_input_get_mouse_mode() {
-	return InputClassEnums::MouseMode(singleton->mouse_get_mode());
+Input::MouseMode DisplayServer::_input_get_mouse_mode() {
+	return Input::MouseMode(singleton->mouse_get_mode());
 }
 
-void DisplayServer::_input_set_mouse_mode_override(InputClassEnums::MouseMode p_mode) {
-	singleton->mouse_set_mode_override(DisplayServerEnums::MouseMode(p_mode));
+void DisplayServer::_input_set_mouse_mode_override(Input::MouseMode p_mode) {
+	singleton->mouse_set_mode_override(MouseMode(p_mode));
 }
 
-InputClassEnums::MouseMode DisplayServer::_input_get_mouse_mode_override() {
-	return InputClassEnums::MouseMode(singleton->mouse_get_mode_override());
+Input::MouseMode DisplayServer::_input_get_mouse_mode_override() {
+	return Input::MouseMode(singleton->mouse_get_mode_override());
 }
 
 void DisplayServer::_input_set_mouse_mode_override_enabled(bool p_enabled) {
@@ -2081,12 +1978,12 @@ void DisplayServer::_input_warp(const Vector2 &p_to_pos) {
 	singleton->warp_mouse(p_to_pos);
 }
 
-InputClassEnums::CursorShape DisplayServer::_input_get_current_cursor_shape() {
-	return (InputClassEnums::CursorShape)singleton->cursor_get_shape();
+Input::CursorShape DisplayServer::_input_get_current_cursor_shape() {
+	return (Input::CursorShape)singleton->cursor_get_shape();
 }
 
-void DisplayServer::_input_set_custom_mouse_cursor_func(const Ref<Resource> &p_image, InputClassEnums::CursorShape p_shape, const Vector2 &p_hotspot) {
-	singleton->cursor_set_custom_image(p_image, (DisplayServerEnums::CursorShape)p_shape, p_hotspot);
+void DisplayServer::_input_set_custom_mouse_cursor_func(const Ref<Resource> &p_image, Input::CursorShape p_shape, const Vector2 &p_hotspot) {
+	singleton->cursor_set_custom_image(p_image, (CursorShape)p_shape, p_hotspot);
 }
 
 bool DisplayServer::is_rendering_device_supported() {
@@ -2096,9 +1993,9 @@ bool DisplayServer::is_rendering_device_supported() {
 		return true;
 	}
 
-	if (supported_rendering_device == DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS) {
+	if (supported_rendering_device == RenderingDeviceCreationStatus::SUCCESS) {
 		return true;
-	} else if (supported_rendering_device == DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE) {
+	} else if (supported_rendering_device == RenderingDeviceCreationStatus::FAILURE) {
 		return false;
 	}
 
@@ -2117,10 +2014,10 @@ bool DisplayServer::is_rendering_device_supported() {
 	int exitcode = 0;
 	err = OS::get_singleton()->execute(OS::get_singleton()->get_executable_path(), arguments, &pipe, &exitcode);
 	if (err == OK && exitcode == 0) {
-		supported_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS;
+		supported_rendering_device = RenderingDeviceCreationStatus::SUCCESS;
 		return true;
 	} else {
-		supported_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE;
+		supported_rendering_device = RenderingDeviceCreationStatus::FAILURE;
 	}
 #else // WINDOWS_ENABLED
 
@@ -2153,12 +2050,12 @@ bool DisplayServer::is_rendering_device_supported() {
 			if (err == OK) {
 				// Creating a RenderingDevice is quite slow.
 				// Cache the result for future usage, so that it's much faster on subsequent calls.
-				supported_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS;
+				supported_rendering_device = RenderingDeviceCreationStatus::SUCCESS;
 				memdelete(rcd);
 				rcd = nullptr;
 				return true;
 			} else {
-				supported_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE;
+				supported_rendering_device = RenderingDeviceCreationStatus::FAILURE;
 			}
 		}
 
@@ -2182,9 +2079,9 @@ bool DisplayServer::can_create_rendering_device() {
 		return true;
 	}
 
-	if (created_rendering_device == DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS) {
+	if (created_rendering_device == RenderingDeviceCreationStatus::SUCCESS) {
 		return true;
-	} else if (created_rendering_device == DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE) {
+	} else if (created_rendering_device == RenderingDeviceCreationStatus::FAILURE) {
 		return false;
 	}
 
@@ -2199,10 +2096,10 @@ bool DisplayServer::can_create_rendering_device() {
 	int exitcode = 0;
 	err = OS::get_singleton()->execute(OS::get_singleton()->get_executable_path(), arguments, &pipe, &exitcode);
 	if (err == OK && exitcode == 0) {
-		created_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS;
+		created_rendering_device = RenderingDeviceCreationStatus::SUCCESS;
 		return true;
 	} else {
-		created_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE;
+		created_rendering_device = RenderingDeviceCreationStatus::FAILURE;
 	}
 #else // WINDOWS_ENABLED
 
@@ -2235,12 +2132,12 @@ bool DisplayServer::can_create_rendering_device() {
 			if (err == OK) {
 				// Creating a RenderingDevice is quite slow.
 				// Cache the result for future usage, so that it's much faster on subsequent calls.
-				created_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::SUCCESS;
+				created_rendering_device = RenderingDeviceCreationStatus::SUCCESS;
 				memdelete(rcd);
 				rcd = nullptr;
 				return true;
 			} else {
-				created_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::FAILURE;
+				created_rendering_device = RenderingDeviceCreationStatus::FAILURE;
 			}
 		}
 
diff --git a/engine/servers/display/display_server.h b/engine/servers/display/display_server.h
index 5cc2c178..a2cd1e5a 100644
--- a/engine/servers/display/display_server.h
+++ b/engine/servers/display/display_server.h
@@ -30,55 +30,95 @@
 
 #pragma once
 
-#include "core/input/input_enums.h"
+#include "core/input/input.h"
 #include "core/io/image.h"
 #include "core/io/resource.h"
-#include "core/object/object.h"
-#include "core/os/keyboard.h"
-#include "core/os/process_id.h"
+#include "core/os/os.h"
 #include "core/variant/callable.h"
-#include "core/variant/typed_array.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/native_menu.h"
 
-class NativeMenu;
 class Texture2D;
-
-#undef CursorShape
-namespace InputClassEnums {
-enum MouseMode : int;
-enum CursorShape : int;
-} //namespace InputClassEnums
-
-// Defined here so it can be forward-declared.
-struct TTSUtterance {
-	String text;
-	String voice;
-	int volume = 50;
-	float pitch = 1.f;
-	float rate = 1.f;
-	int64_t id = 0;
-};
+class AccessibilityDriver;
 
 class DisplayServer : public Object {
 	GDCLASS(DisplayServer, Object)
 
 	static DisplayServer *singleton;
+	static bool hidpi_allowed;
+
+#ifndef DISABLE_DEPRECATED
+	mutable HashMap<String, RID> menu_names;
+
+	RID _get_rid_from_name(NativeMenu *p_nmenu, const String &p_menu_root) const;
+	RID _accessibility_create_sub_text_edit_elements_bind_compat_113459(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1);
+#endif
+
+	LocalVector<ObjectID> additional_outputs;
 
 public:
 	_FORCE_INLINE_ static DisplayServer *get_singleton() {
 		return singleton;
 	}
 
-	/* CREATE */
+	enum WindowMode {
+		WINDOW_MODE_WINDOWED,
+		WINDOW_MODE_MINIMIZED,
+		WINDOW_MODE_MAXIMIZED,
+		WINDOW_MODE_FULLSCREEN,
+		WINDOW_MODE_EXCLUSIVE_FULLSCREEN,
+	};
+
+	// Keep the VSyncMode enum values in sync with the `display/window/vsync/vsync_mode`
+	// project setting hint.
+	enum VSyncMode {
+		VSYNC_DISABLED,
+		VSYNC_ENABLED,
+		VSYNC_ADAPTIVE,
+		VSYNC_MAILBOX
+	};
+
+	enum HandleType {
+		DISPLAY_HANDLE,
+		WINDOW_HANDLE,
+		WINDOW_VIEW,
+		OPENGL_CONTEXT,
+		EGL_DISPLAY,
+		EGL_CONFIG,
+	};
+
+	enum Context {
+		CONTEXT_EDITOR,
+		CONTEXT_PROJECTMAN,
+		CONTEXT_ENGINE,
+	};
+
+	typedef DisplayServer *(*CreateFunction)(const String &, WindowMode, VSyncMode, uint32_t, const Point2i *, const Size2i &, int p_screen, Context, int64_t p_parent_window, Error &r_error);
+	typedef Vector<String> (*GetRenderingDriversFunction)();
 
 private:
+	static void _input_set_mouse_mode(Input::MouseMode p_mode);
+	static Input::MouseMode _input_get_mouse_mode();
+	static void _input_set_mouse_mode_override(Input::MouseMode p_mode);
+	static Input::MouseMode _input_get_mouse_mode_override();
+	static void _input_set_mouse_mode_override_enabled(bool p_enabled);
+	static bool _input_is_mouse_mode_override_enabled();
+	static void _input_warp(const Vector2 &p_to_pos);
+	static Input::CursorShape _input_get_current_cursor_shape();
+	static void _input_set_custom_mouse_cursor_func(const Ref<Resource> &, Input::CursorShape, const Vector2 &p_hotspot);
+
+protected:
+	static void _bind_methods();
+
+#ifndef DISABLE_DEPRECATED
+	static void _bind_compatibility_methods();
+#endif
+
+	static Ref<Image> _get_cursor_image_from_resource(const Ref<Resource> &p_cursor, const Vector2 &p_hotspot);
+
 	enum {
 		MAX_SERVERS = 64
 	};
 
-	typedef DisplayServer *(*CreateFunction)(const String &, DisplayServerEnums::WindowMode, DisplayServerEnums::VSyncMode, uint32_t, const Point2i *, const Size2i &, int p_screen, DisplayServerEnums::Context, int64_t p_parent_window, Error &r_error);
-	typedef Vector<String> (*GetRenderingDriversFunction)();
-
 	struct DisplayServerCreate {
 		const char *name;
 		CreateFunction create_function;
@@ -88,64 +128,55 @@ private:
 	static DisplayServerCreate server_create_functions[MAX_SERVERS];
 	static int server_create_count;
 
+	friend class RendererViewport;
+
 public:
-	static void register_create_function(const char *p_name, CreateFunction p_function, GetRenderingDriversFunction p_get_drivers);
-	static int get_create_function_count();
-	static const char *get_create_function_name(int p_index);
-	static Vector<String> get_create_function_rendering_drivers(int p_index);
-	static DisplayServer *create(int p_index, const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
-
-	DisplayServer();
-	~DisplayServer();
-
-protected:
-	static void _bind_methods();
-
+	enum Feature {
 #ifndef DISABLE_DEPRECATED
-	static void _bind_compatibility_methods();
+		FEATURE_GLOBAL_MENU,
 #endif
+		FEATURE_SUBWINDOWS,
+		FEATURE_TOUCHSCREEN,
+		FEATURE_MOUSE,
+		FEATURE_MOUSE_WARP,
+		FEATURE_CLIPBOARD,
+		FEATURE_VIRTUAL_KEYBOARD,
+		FEATURE_CURSOR_SHAPE,
+		FEATURE_CUSTOM_CURSOR_SHAPE,
+		FEATURE_NATIVE_DIALOG,
+		FEATURE_IME,
+		FEATURE_WINDOW_TRANSPARENCY,
+		FEATURE_HIDPI,
+		FEATURE_ICON,
+		FEATURE_NATIVE_ICON,
+		FEATURE_ORIENTATION,
+		FEATURE_SWAP_BUFFERS,
+		FEATURE_KEEP_SCREEN_ON,
+		FEATURE_CLIPBOARD_PRIMARY,
+		FEATURE_TEXT_TO_SPEECH,
+		FEATURE_EXTEND_TO_TITLE,
+		FEATURE_SCREEN_CAPTURE,
+		FEATURE_STATUS_INDICATOR,
+		FEATURE_NATIVE_HELP,
+		FEATURE_NATIVE_DIALOG_INPUT,
+		FEATURE_NATIVE_DIALOG_FILE,
+		FEATURE_NATIVE_DIALOG_FILE_EXTRA,
+		FEATURE_WINDOW_DRAG,
+		FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE,
+		FEATURE_WINDOW_EMBEDDING,
+		FEATURE_NATIVE_DIALOG_FILE_MIME,
+		FEATURE_EMOJI_AND_SYMBOL_PICKER,
+		FEATURE_NATIVE_COLOR_PICKER,
+		FEATURE_SELF_FITTING_WINDOWS,
+		FEATURE_ACCESSIBILITY_SCREEN_READER,
+	};
 
-	/* MAIN */
-
-public:
+	virtual bool has_feature(Feature p_feature) const = 0;
 	virtual String get_name() const = 0;
 
-	virtual void set_context(DisplayServerEnums::Context p_context);
-	virtual void set_native_icon(const String &p_filename);
-	virtual void set_icon(const Ref<Image> &p_icon);
-
-	virtual bool has_feature(DisplayServerEnums::Feature p_feature) const = 0;
-
-	virtual void process_events() = 0;
-	virtual void force_process_and_drop_events();
-
-	virtual void release_rendering_thread();
-	virtual void swap_buffers();
-
-	virtual void beep() const;
-
-	/* RENDERING DEVICE */
-
-	// Used to cache the result of `can_create_rendering_device()` when RenderingDevice isn't currently being used.
-	// This is done as creating a RenderingDevice is quite slow.
-	static inline DisplayServerEnums::RenderingDeviceCreationStatus created_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::UNKNOWN;
-	static bool can_create_rendering_device();
-
-	static inline DisplayServerEnums::RenderingDeviceCreationStatus supported_rendering_device = DisplayServerEnums::RenderingDeviceCreationStatus::UNKNOWN;
-	static bool is_rendering_device_supported();
-
-	/* GLOBAL MENU */
-
-public:
 	virtual void help_set_search_callbacks(const Callable &p_search_callback = Callable(), const Callable &p_action_callback = Callable());
 
 #ifndef DISABLE_DEPRECATED
-private:
-	mutable HashMap<String, RID> menu_names;
-
-	RID _get_rid_from_name(NativeMenu *p_nmenu, const String &p_menu_root) const;
-
-public:
 	virtual void global_menu_set_popup_callbacks(const String &p_menu_root, const Callable &p_open_callback = Callable(), const Callable &p_close_callback = Callable());
 
 	virtual int global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index = -1);
@@ -202,12 +233,27 @@ public:
 	virtual void global_menu_clear(const String &p_menu_root);
 
 	virtual Dictionary global_menu_get_system_menu_roots() const;
-#endif // DISABLE_DEPRECATED
+#endif
 
-	/* TTS */
+	struct TTSUtterance {
+		String text;
+		String voice;
+		int volume = 50;
+		float pitch = 1.f;
+		float rate = 1.f;
+		int64_t id = 0;
+	};
+
+	enum TTSUtteranceEvent {
+		TTS_UTTERANCE_STARTED,
+		TTS_UTTERANCE_ENDED,
+		TTS_UTTERANCE_CANCELED,
+		TTS_UTTERANCE_BOUNDARY,
+		TTS_UTTERANCE_MAX,
+	};
 
 private:
-	Callable utterance_callback[DisplayServerEnums::TTS_UTTERANCE_MAX];
+	Callable utterance_callback[TTS_UTTERANCE_MAX];
 
 public:
 	virtual bool tts_is_speaking() const;
@@ -220,10 +266,8 @@ public:
 	virtual void tts_resume();
 	virtual void tts_stop();
 
-	virtual void tts_set_utterance_callback(DisplayServerEnums::TTSUtteranceEvent p_event, const Callable &p_callable);
-	virtual void tts_post_utterance_event(DisplayServerEnums::TTSUtteranceEvent p_event, int64_t p_id, int p_pos = 0);
-
-	/* THEME */
+	virtual void tts_set_utterance_callback(TTSUtteranceEvent p_event, const Callable &p_callable);
+	virtual void tts_post_utterance_event(TTSUtteranceEvent p_event, int64_t p_id, int p_pos = 0);
 
 	virtual bool is_dark_mode_supported() const { return false; }
 	virtual bool is_dark_mode() const { return false; }
@@ -232,135 +276,6 @@ public:
 	virtual void set_system_theme_change_callback(const Callable &p_callable) {}
 	virtual void set_hardware_keyboard_connection_change_callback(const Callable &p_callable) {}
 
-	/* MOUSE */
-
-private:
-	static void _input_set_mouse_mode(InputClassEnums::MouseMode p_mode);
-	static InputClassEnums::MouseMode _input_get_mouse_mode();
-	static void _input_set_mouse_mode_override(InputClassEnums::MouseMode p_mode);
-	static InputClassEnums::MouseMode _input_get_mouse_mode_override();
-	static void _input_set_mouse_mode_override_enabled(bool p_enabled);
-	static bool _input_is_mouse_mode_override_enabled();
-	static void _input_warp(const Vector2 &p_to_pos);
-	static InputClassEnums::CursorShape _input_get_current_cursor_shape();
-	static void _input_set_custom_mouse_cursor_func(const Ref<Resource> &, InputClassEnums::CursorShape, const Vector2 &p_hotspot);
-
-protected:
-	static Ref<Image> _get_cursor_image_from_resource(const Ref<Resource> &p_cursor, const Vector2 &p_hotspot);
-
-public:
-	virtual void mouse_set_mode(DisplayServerEnums::MouseMode p_mode);
-	virtual DisplayServerEnums::MouseMode mouse_get_mode() const;
-	virtual void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode);
-	virtual DisplayServerEnums::MouseMode mouse_get_mode_override() const;
-	virtual void mouse_set_mode_override_enabled(bool p_override_enabled);
-	virtual bool mouse_is_mode_override_enabled() const;
-
-	virtual void warp_mouse(const Point2i &p_position);
-	virtual Point2i mouse_get_position() const;
-	virtual BitField<MouseButtonMask> mouse_get_button_state() const;
-
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape);
-	virtual DisplayServerEnums::CursorShape cursor_get_shape() const;
-	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
-
-	/* KEYBOARD */
-
-	virtual Point2i ime_get_selection() const;
-	virtual String ime_get_text() const;
-
-	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), DisplayServerEnums::VirtualKeyboardType p_type = DisplayServerEnums::KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
-	virtual void virtual_keyboard_hide();
-
-	// Returns height of the currently shown virtual keyboard (0 if keyboard is hidden).
-	virtual int virtual_keyboard_get_height() const;
-
-	virtual bool has_hardware_keyboard() const;
-
-	virtual int keyboard_get_layout_count() const;
-	virtual int keyboard_get_current_layout() const;
-	virtual void keyboard_set_current_layout(int p_index);
-	virtual String keyboard_get_layout_language(int p_index) const;
-	virtual String keyboard_get_layout_name(int p_index) const;
-	virtual Key keyboard_get_keycode_from_physical(Key p_keycode) const;
-	virtual Key keyboard_get_label_from_physical(Key p_keycode) const;
-
-	/* TABLET */
-
-	virtual int tablet_get_driver_count() const { return 1; }
-	virtual String tablet_get_driver_name(int p_driver) const { return "default"; }
-	virtual String tablet_get_current_driver() const { return "default"; }
-	virtual void tablet_set_current_driver(const String &p_driver) {}
-
-	/* CLIPBOARD */
-
-	virtual void clipboard_set(const String &p_text);
-	virtual String clipboard_get() const;
-	virtual Ref<Image> clipboard_get_image() const;
-	virtual bool clipboard_has() const;
-	virtual bool clipboard_has_image() const;
-	virtual void clipboard_set_primary(const String &p_text);
-	virtual String clipboard_get_primary() const;
-
-	/* SCREEN */
-
-	const float SCREEN_REFRESH_RATE_FALLBACK = -1.0; // Returned by screen_get_refresh_rate if the method fails.
-
-	virtual TypedArray<Rect2> get_display_cutouts() const { return TypedArray<Rect2>(); }
-	virtual Rect2i get_display_safe_area() const { return screen_get_usable_rect(); }
-
-	int _get_screen_index(int p_screen) const {
-		switch (p_screen) {
-			case DisplayServerEnums::SCREEN_WITH_MOUSE_FOCUS: {
-				const Rect2i rect = Rect2i(mouse_get_position(), Vector2i(1, 1));
-				return get_screen_from_rect(rect);
-			} break;
-			case DisplayServerEnums::SCREEN_WITH_KEYBOARD_FOCUS: {
-				return get_keyboard_focus_screen();
-			} break;
-			case DisplayServerEnums::SCREEN_PRIMARY: {
-				return get_primary_screen();
-			} break;
-			case DisplayServerEnums::SCREEN_OF_MAIN_WINDOW: {
-				return window_get_current_screen(DisplayServerEnums::MAIN_WINDOW_ID);
-			} break;
-			default: {
-				return p_screen;
-			} break;
-		}
-	}
-
-	virtual int get_screen_count() const = 0;
-	virtual int get_primary_screen() const = 0;
-	virtual int get_keyboard_focus_screen() const { return get_primary_screen(); }
-	virtual int get_screen_from_rect(const Rect2 &p_rect) const;
-	virtual Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const = 0;
-	virtual Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const = 0;
-	virtual Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const = 0;
-	virtual int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const = 0;
-	virtual float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const;
-	virtual float screen_get_max_scale() const {
-		float max_scale = 1.f;
-		int screen_count = get_screen_count();
-		for (int i = 0; i < screen_count; i++) {
-			max_scale = std::fmax(max_scale, screen_get_scale(i));
-		}
-		return max_scale;
-	}
-	virtual float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const = 0;
-	virtual Color screen_get_pixel(const Point2i &p_position) const { return Color(); }
-	virtual Ref<Image> screen_get_image(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const { return Ref<Image>(); }
-	virtual Ref<Image> screen_get_image_rect(const Rect2i &p_rect) const { return Ref<Image>(); }
-	virtual bool is_touchscreen_available() const;
-
-	virtual void screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW);
-	virtual DisplayServerEnums::ScreenOrientation screen_get_orientation(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const;
-
-	virtual void screen_set_keep_on(bool p_enable); //disable screensaver
-	virtual bool screen_is_kept_on() const;
-
-	/* WINDOW */
-
 private:
 	static bool window_early_clear_override_enabled;
 	static Color window_early_clear_override_color;
@@ -371,191 +286,404 @@ protected:
 public:
 	static void set_early_window_clear_color_override(bool p_enabled, Color p_color = Color(0, 0, 0, 0));
 
-	virtual Vector<DisplayServerEnums::WindowID> get_window_list() const = 0;
+	enum MouseMode {
+		MOUSE_MODE_VISIBLE = Input::MOUSE_MODE_VISIBLE,
+		MOUSE_MODE_HIDDEN = Input::MOUSE_MODE_HIDDEN,
+		MOUSE_MODE_CAPTURED = Input::MOUSE_MODE_CAPTURED,
+		MOUSE_MODE_CONFINED = Input::MOUSE_MODE_CONFINED,
+		MOUSE_MODE_CONFINED_HIDDEN = Input::MOUSE_MODE_CONFINED_HIDDEN,
+		MOUSE_MODE_MAX = Input::MOUSE_MODE_MAX,
+	};
 
-	virtual DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID);
-	virtual void show_window(DisplayServerEnums::WindowID p_id);
-	virtual void delete_sub_window(DisplayServerEnums::WindowID p_id);
+	virtual void mouse_set_mode(MouseMode p_mode);
+	virtual MouseMode mouse_get_mode() const;
+	virtual void mouse_set_mode_override(MouseMode p_mode);
+	virtual MouseMode mouse_get_mode_override() const;
+	virtual void mouse_set_mode_override_enabled(bool p_override_enabled);
+	virtual bool mouse_is_mode_override_enabled() const;
 
-	virtual DisplayServerEnums::WindowID window_get_active_popup() const { return DisplayServerEnums::INVALID_WINDOW_ID; }
-	virtual void window_set_popup_safe_rect(DisplayServerEnums::WindowID p_window, const Rect2i &p_rect) {}
-	virtual Rect2i window_get_popup_safe_rect(DisplayServerEnums::WindowID p_window) const { return Rect2i(); }
+	virtual void warp_mouse(const Point2i &p_position);
+	virtual Point2i mouse_get_position() const;
+	virtual BitField<MouseButtonMask> mouse_get_button_state() const;
 
-	virtual int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual void clipboard_set(const String &p_text);
+	virtual String clipboard_get() const;
+	virtual Ref<Image> clipboard_get_image() const;
+	virtual bool clipboard_has() const;
+	virtual bool clipboard_has_image() const;
+	virtual void clipboard_set_primary(const String &p_text);
+	virtual String clipboard_get_primary() const;
 
-	virtual DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const = 0;
+	virtual TypedArray<Rect2> get_display_cutouts() const { return TypedArray<Rect2>(); }
+	virtual Rect2i get_display_safe_area() const { return screen_get_usable_rect(); }
 
-	virtual void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0; // Note: internal method used by Window, do not expose.
-	virtual ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	enum {
+		INVALID_SCREEN = -1,
+		SCREEN_WITH_MOUSE_FOCUS = -4,
+		SCREEN_WITH_KEYBOARD_FOCUS = -3,
+		SCREEN_PRIMARY = -2,
+		SCREEN_OF_MAIN_WINDOW = -1, // Note: for the main window, determine screen from position.
+	};
 
-	virtual void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+	const float SCREEN_REFRESH_RATE_FALLBACK = -1.0; // Returned by screen_get_refresh_rate if the method fails.
 
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+	int _get_screen_index(int p_screen) const {
+		switch (p_screen) {
+			case SCREEN_WITH_MOUSE_FOCUS: {
+				const Rect2i rect = Rect2i(mouse_get_position(), Vector2i(1, 1));
+				return get_screen_from_rect(rect);
+			} break;
+			case SCREEN_WITH_KEYBOARD_FOCUS: {
+				return get_keyboard_focus_screen();
+			} break;
+			case SCREEN_PRIMARY: {
+				return get_primary_screen();
+			} break;
+			case SCREEN_OF_MAIN_WINDOW: {
+				return window_get_current_screen(MAIN_WINDOW_ID);
+			} break;
+			default: {
+				return p_screen;
+			} break;
+		}
+	}
 
-	virtual void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+	virtual int get_screen_count() const = 0;
+	virtual int get_primary_screen() const = 0;
+	virtual int get_keyboard_focus_screen() const { return get_primary_screen(); }
+	virtual int get_screen_from_rect(const Rect2 &p_rect) const;
+	virtual Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
+	virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
+	virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
+	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
+	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const;
+	virtual float screen_get_max_scale() const {
+		float max_scale = 1.f;
+		int screen_count = get_screen_count();
+		for (int i = 0; i < screen_count; i++) {
+			max_scale = std::fmax(max_scale, screen_get_scale(i));
+		}
+		return max_scale;
+	}
+	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
+	virtual Color screen_get_pixel(const Point2i &p_position) const { return Color(); }
+	virtual Ref<Image> screen_get_image(int p_screen = SCREEN_OF_MAIN_WINDOW) const { return Ref<Image>(); }
+	virtual Ref<Image> screen_get_image_rect(const Rect2i &p_rect) const { return Ref<Image>(); }
+	virtual bool is_touchscreen_available() const;
 
-	virtual void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual Size2i window_get_title_size(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const { return Size2i(); }
+	// Keep the ScreenOrientation enum values in sync with the `display/window/handheld/orientation`
+	// project setting hint.
+	enum ScreenOrientation {
+		SCREEN_LANDSCAPE,
+		SCREEN_PORTRAIT,
+		SCREEN_REVERSE_LANDSCAPE,
+		SCREEN_REVERSE_PORTRAIT,
+		SCREEN_SENSOR_LANDSCAPE,
+		SCREEN_SENSOR_PORTRAIT,
+		SCREEN_SENSOR,
+	};
 
-	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
+	virtual void screen_set_orientation(ScreenOrientation p_orientation, int p_screen = SCREEN_OF_MAIN_WINDOW);
+	virtual ScreenOrientation screen_get_orientation(int p_screen = SCREEN_OF_MAIN_WINDOW) const;
 
-	virtual int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-	virtual void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+	virtual void screen_set_keep_on(bool p_enable); //disable screensaver
+	virtual bool screen_is_kept_on() const;
+	enum {
+		MAIN_WINDOW_ID = 0,
+		INVALID_WINDOW_ID = -1,
+		INVALID_INDICATOR_ID = -1
+	};
 
-	virtual Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-	virtual Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-	virtual void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+public:
+	typedef int WindowID;
+	typedef int IndicatorID;
 
-	virtual void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) = 0;
-	virtual void window_set_exclusive(DisplayServerEnums::WindowID p_window, bool p_exclusive);
+	virtual Vector<DisplayServer::WindowID> get_window_list() const = 0;
 
-	virtual void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	enum WindowFlags {
+		WINDOW_FLAG_RESIZE_DISABLED,
+		WINDOW_FLAG_BORDERLESS,
+		WINDOW_FLAG_ALWAYS_ON_TOP,
+		WINDOW_FLAG_TRANSPARENT,
+		WINDOW_FLAG_NO_FOCUS,
+		WINDOW_FLAG_POPUP,
+		WINDOW_FLAG_EXTEND_TO_TITLE,
+		WINDOW_FLAG_MOUSE_PASSTHROUGH,
+		WINDOW_FLAG_SHARP_CORNERS,
+		WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
+		WINDOW_FLAG_POPUP_WM_HINT,
+		WINDOW_FLAG_MINIMIZE_DISABLED,
+		WINDOW_FLAG_MAXIMIZE_DISABLED,
+		WINDOW_FLAG_MAX,
+	};
 
-	virtual void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	// Separate enum otherwise we get warnings in switches not handling all values.
+	enum WindowFlagsBit {
+		WINDOW_FLAG_RESIZE_DISABLED_BIT = (1 << WINDOW_FLAG_RESIZE_DISABLED),
+		WINDOW_FLAG_BORDERLESS_BIT = (1 << WINDOW_FLAG_BORDERLESS),
+		WINDOW_FLAG_ALWAYS_ON_TOP_BIT = (1 << WINDOW_FLAG_ALWAYS_ON_TOP),
+		WINDOW_FLAG_TRANSPARENT_BIT = (1 << WINDOW_FLAG_TRANSPARENT),
+		WINDOW_FLAG_NO_FOCUS_BIT = (1 << WINDOW_FLAG_NO_FOCUS),
+		WINDOW_FLAG_POPUP_BIT = (1 << WINDOW_FLAG_POPUP),
+		WINDOW_FLAG_EXTEND_TO_TITLE_BIT = (1 << WINDOW_FLAG_EXTEND_TO_TITLE),
+		WINDOW_FLAG_MOUSE_PASSTHROUGH_BIT = (1 << WINDOW_FLAG_MOUSE_PASSTHROUGH),
+		WINDOW_FLAG_SHARP_CORNERS_BIT = (1 << WINDOW_FLAG_SHARP_CORNERS),
+		WINDOW_FLAG_EXCLUDE_FROM_CAPTURE_BIT = (1 << WINDOW_FLAG_EXCLUDE_FROM_CAPTURE),
+		WINDOW_FLAG_POPUP_WM_HINT_BIT = (1 << WINDOW_FLAG_POPUP_WM_HINT),
+		WINDOW_FLAG_MINIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MINIMIZE_DISABLED),
+		WINDOW_FLAG_MAXIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MAXIMIZE_DISABLED),
+	};
 
-	virtual void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-	virtual Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID);
+	virtual void show_window(WindowID p_id);
+	virtual void delete_sub_window(WindowID p_id);
 
-	virtual float window_get_scale(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const {
+	virtual WindowID window_get_active_popup() const { return INVALID_WINDOW_ID; }
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {}
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const { return Rect2i(); }
+
+	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const;
+
+	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const = 0;
+
+	virtual void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) = 0; // Note: internal method used by Window, do not expose.
+	virtual ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+
+	virtual void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
+
+	enum WindowEvent {
+		WINDOW_EVENT_MOUSE_ENTER,
+		WINDOW_EVENT_MOUSE_EXIT,
+		WINDOW_EVENT_FOCUS_IN,
+		WINDOW_EVENT_FOCUS_OUT,
+		WINDOW_EVENT_CLOSE_REQUEST,
+		WINDOW_EVENT_GO_BACK_REQUEST,
+		WINDOW_EVENT_DPI_CHANGE,
+		WINDOW_EVENT_TITLEBAR_CHANGE,
+		WINDOW_EVENT_FORCE_CLOSE,
+	};
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
+
+	virtual void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
+
+	virtual void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual Size2i window_get_title_size(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) const { return Size2i(); }
+
+	virtual void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window = MAIN_WINDOW_ID);
+
+	virtual int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+	virtual void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) = 0;
+
+	virtual Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+	virtual Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) = 0;
+
+	virtual void window_set_transient(WindowID p_window, WindowID p_parent) = 0;
+	virtual void window_set_exclusive(WindowID p_window, bool p_exclusive);
+
+	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+
+	virtual void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+
+	virtual void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+	virtual Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const = 0;
+
+	virtual float window_get_scale(WindowID p_window = MAIN_WINDOW_ID) const {
 		int screen = window_get_current_screen(p_window);
 		return screen_get_scale(screen);
 	}
 
-	virtual void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	virtual void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const = 0;
 
-	virtual void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const;
+	virtual void window_set_vsync_mode(VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID);
+	virtual VSyncMode window_get_vsync_mode(WindowID p_window) const;
 
-	virtual bool window_is_hdr_output_supported(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const = 0;
 
-	virtual void window_request_hdr_output(const bool p_enable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual bool window_is_hdr_output_requested(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	virtual bool window_is_hdr_output_enabled(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const = 0;
 
-	virtual void window_set_hdr_output_reference_luminance(const float p_reference_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	virtual float window_get_hdr_output_current_reference_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) = 0;
+	virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const = 0;
 
-	virtual void window_set_hdr_output_max_luminance(const float p_max_luminance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	virtual float window_get_hdr_output_current_max_luminance(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual WindowID get_focused_window() const;
 
-	virtual void window_set_icon(const Ref<Image> &p_icon, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
+	virtual void window_set_window_buttons_offset(const Vector2i &p_offset, WindowID p_window = MAIN_WINDOW_ID) {}
+	virtual Vector3i window_get_safe_title_margins(WindowID p_window = MAIN_WINDOW_ID) const { return Vector3i(); }
 
-	virtual float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const;
-
-	virtual bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-
-	virtual void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-
-	virtual void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual void window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
-	virtual void window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
-	virtual void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
-	virtual bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
-
-	virtual DisplayServerEnums::WindowID get_focused_window() const;
-
-	virtual void window_set_window_buttons_offset(const Vector2i &p_offset, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
-	virtual Vector3i window_get_safe_title_margins(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const { return Vector3i(); }
-
-	virtual bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const = 0;
 
 	virtual bool can_any_window_draw() const = 0;
 
-	virtual void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID);
+	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID);
+	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID);
 
 	virtual bool window_maximize_on_title_dbl_click() const { return false; }
 	virtual bool window_minimize_on_title_dbl_click() const { return false; }
 
-	virtual void window_start_drag(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
+	virtual void window_start_drag(WindowID p_window = MAIN_WINDOW_ID) {}
 
 	virtual void window_set_color(const Color &p_color) {}
 
-	virtual void window_start_resize(DisplayServerEnums::WindowResizeEdge p_edge, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
+	enum WindowResizeEdge {
+		WINDOW_EDGE_TOP_LEFT,
+		WINDOW_EDGE_TOP,
+		WINDOW_EDGE_TOP_RIGHT,
+		WINDOW_EDGE_LEFT,
+		WINDOW_EDGE_RIGHT,
+		WINDOW_EDGE_BOTTOM_LEFT,
+		WINDOW_EDGE_BOTTOM,
+		WINDOW_EDGE_BOTTOM_RIGHT,
+		WINDOW_EDGE_MAX,
+	};
 
-	// necessary for GL focus, may be able to use one of the existing functions for this, not sure yet
-	virtual void gl_window_make_current(DisplayServerEnums::WindowID p_window_id);
+	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window = MAIN_WINDOW_ID) {}
 
-	virtual bool is_window_transparency_available() const { return false; }
+	// Accessibility.
 
-	/* PROCESS */
+	enum AccessibilityMode {
+		ACCESSIBILITY_AUTO,
+		ACCESSIBILITY_ALWAYS,
+		ACCESSIBILITY_DISABLED,
+	};
 
-	virtual void enable_for_stealing_focus(ProcessID pid);
-
-	virtual Error embed_process(DisplayServerEnums::WindowID p_window, ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus);
-	virtual Error request_close_embedded_process(ProcessID p_pid);
-	virtual Error remove_embedded_process(ProcessID p_pid);
-	virtual ProcessID get_focused_process_id();
-
-	/* DIALOGS */
-
-	virtual bool get_swap_cancel_ok();
-
-	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback);
-	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback);
-
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID);
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id = DisplayServerEnums::MAIN_WINDOW_ID);
-
-#ifndef DISABLE_DEPRECATED
-	Error _file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback);
-	Error _file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback);
-#endif
-
-	virtual void show_emoji_and_symbol_picker() const;
-	virtual bool color_picker(const Callable &p_callback);
-
-	/* STATUS INDICATOR */
-
-	virtual DisplayServerEnums::IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback);
-	virtual void status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon);
-	virtual void status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip);
-	virtual void status_indicator_set_menu(DisplayServerEnums::IndicatorID p_id, const RID &p_menu_rid);
-	virtual void status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback);
-	virtual Rect2 status_indicator_get_rect(DisplayServerEnums::IndicatorID p_id) const;
-	virtual void delete_status_indicator(DisplayServerEnums::IndicatorID p_id);
-
-	/* OUTPUT */
-
-private:
-	LocalVector<ObjectID> additional_outputs;
+protected:
+	AccessibilityDriver *accessibility_driver = nullptr;
+	static AccessibilityMode accessibility_mode;
 
 public:
-	void register_additional_output(Object *p_output);
-	void unregister_additional_output(Object *p_output);
-	bool has_additional_outputs() const { return additional_outputs.size() > 0; }
+	enum AccessibilityRole {
+		ROLE_UNKNOWN,
+		ROLE_DEFAULT_BUTTON,
+		ROLE_AUDIO,
+		ROLE_VIDEO,
+		ROLE_STATIC_TEXT,
+		ROLE_CONTAINER,
+		ROLE_PANEL,
+		ROLE_BUTTON,
+		ROLE_LINK,
+		ROLE_CHECK_BOX,
+		ROLE_RADIO_BUTTON,
+		ROLE_CHECK_BUTTON,
+		ROLE_SCROLL_BAR,
+		ROLE_SCROLL_VIEW,
+		ROLE_SPLITTER,
+		ROLE_SLIDER,
+		ROLE_SPIN_BUTTON,
+		ROLE_PROGRESS_INDICATOR,
+		ROLE_TEXT_FIELD,
+		ROLE_MULTILINE_TEXT_FIELD,
+		ROLE_COLOR_PICKER,
+		ROLE_TABLE,
+		ROLE_CELL,
+		ROLE_ROW,
+		ROLE_ROW_GROUP,
+		ROLE_ROW_HEADER,
+		ROLE_COLUMN_HEADER,
+		ROLE_TREE,
+		ROLE_TREE_ITEM,
+		ROLE_LIST,
+		ROLE_LIST_ITEM,
+		ROLE_LIST_BOX,
+		ROLE_LIST_BOX_OPTION,
+		ROLE_TAB_BAR,
+		ROLE_TAB,
+		ROLE_TAB_PANEL,
+		ROLE_MENU_BAR,
+		ROLE_MENU,
+		ROLE_MENU_ITEM,
+		ROLE_MENU_ITEM_CHECK_BOX,
+		ROLE_MENU_ITEM_RADIO,
+		ROLE_IMAGE,
+		ROLE_WINDOW,
+		ROLE_TITLE_BAR,
+		ROLE_DIALOG,
+		ROLE_TOOLTIP,
+	};
 
-	/* PICTURE_IN_PICTURE */
-	virtual bool is_in_pip_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) { return false; }
-	virtual void pip_mode_enter(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
-	virtual void pip_mode_set_aspect_ratio(int p_numerator, int p_denominator, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
-	virtual void pip_mode_set_auto_enter_on_background(bool p_auto_enter_on_background, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) {}
+	enum AccessibilityPopupType {
+		POPUP_MENU,
+		POPUP_LIST,
+		POPUP_TREE,
+		POPUP_DIALOG,
+	};
 
-	/* ACCESSIBILITY */
+	enum AccessibilityFlags {
+		FLAG_HIDDEN,
+		FLAG_MULTISELECTABLE,
+		FLAG_REQUIRED,
+		FLAG_VISITED,
+		FLAG_BUSY,
+		FLAG_MODAL,
+		FLAG_TOUCH_PASSTHROUGH,
+		FLAG_READONLY,
+		FLAG_DISABLED,
+		FLAG_CLIPS_CHILDREN,
+	};
 
-#ifndef DISABLE_DEPRECATED
-private:
-	RID _accessibility_create_sub_text_edit_elements_bind_compat_113459(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1);
-#endif
+	enum AccessibilityAction {
+		ACTION_CLICK,
+		ACTION_FOCUS,
+		ACTION_BLUR,
+		ACTION_COLLAPSE,
+		ACTION_EXPAND,
+		ACTION_DECREMENT,
+		ACTION_INCREMENT,
+		ACTION_HIDE_TOOLTIP,
+		ACTION_SHOW_TOOLTIP,
+		ACTION_SET_TEXT_SELECTION,
+		ACTION_REPLACE_SELECTED_TEXT,
+		ACTION_SCROLL_BACKWARD,
+		ACTION_SCROLL_DOWN,
+		ACTION_SCROLL_FORWARD,
+		ACTION_SCROLL_LEFT,
+		ACTION_SCROLL_RIGHT,
+		ACTION_SCROLL_UP,
+		ACTION_SCROLL_INTO_VIEW,
+		ACTION_SCROLL_TO_POINT,
+		ACTION_SET_SCROLL_OFFSET,
+		ACTION_SET_VALUE,
+		ACTION_SHOW_CONTEXT_MENU,
+		ACTION_CUSTOM,
+	};
+
+	enum AccessibilityLiveMode {
+		LIVE_OFF,
+		LIVE_POLITE,
+		LIVE_ASSERTIVE,
+	};
+
+	enum AccessibilityScrollUnit {
+		SCROLL_UNIT_ITEM,
+		SCROLL_UNIT_PAGE,
+	};
+
+	enum AccessibilityScrollHint {
+		SCROLL_HINT_TOP_LEFT,
+		SCROLL_HINT_BOTTOM_RIGHT,
+		SCROLL_HINT_TOP_EDGE,
+		SCROLL_HINT_BOTTOM_EDGE,
+		SCROLL_HINT_LEFT_EDGE,
+		SCROLL_HINT_RIGHT_EDGE,
+	};
+
+	static AccessibilityMode accessibility_get_mode() { return accessibility_mode; }
+	static void accessibility_set_mode(AccessibilityMode p_mode) { accessibility_mode = p_mode; }
 
-public:
 	virtual int accessibility_should_increase_contrast() const { return -1; }
 	virtual int accessibility_should_reduce_animation() const { return -1; }
 	virtual int accessibility_should_reduce_transparency() const { return -1; }
 	virtual int accessibility_screen_reader_active() const { return -1; }
 
-#ifndef DISABLE_DEPRECATED
-	virtual RID accessibility_create_element(DisplayServerEnums::WindowID p_window_id, DisplayServerEnums::AccessibilityRole p_role);
-	virtual RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServerEnums::AccessibilityRole p_role, int p_insert_pos = -1);
+	virtual RID accessibility_create_element(WindowID p_window_id, DisplayServer::AccessibilityRole p_role);
+	virtual RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1);
 	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false);
 	virtual bool accessibility_has_element(const RID &p_id) const;
 	virtual void accessibility_free_element(const RID &p_id);
@@ -566,15 +694,15 @@ public:
 	virtual void accessibility_update_if_active(const Callable &p_callable);
 
 	virtual void accessibility_update_set_focus(const RID &p_id);
-	virtual RID accessibility_get_window_root(DisplayServerEnums::WindowID p_window_id) const;
+	virtual RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const;
 
-	virtual void accessibility_set_window_rect(DisplayServerEnums::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in);
-	virtual void accessibility_set_window_focused(DisplayServerEnums::WindowID p_window_id, bool p_focused);
-	virtual void accessibility_set_window_callbacks(DisplayServerEnums::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable); // Note: internal method used by Window, do not expose.
-	virtual void accessibility_window_activation_completed(DisplayServerEnums::WindowID p_window_id); // Note: internal method used by Window, do not expose.
-	virtual void accessibility_window_deactivation_completed(DisplayServerEnums::WindowID p_window_id); // Note: internal method used by Window, do not expose.
+	virtual void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in);
+	virtual void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused);
+	virtual void accessibility_set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable); // Note: internal method used by Window, do not expose.
+	virtual void accessibility_window_activation_completed(DisplayServer::WindowID p_window_id); // Note: internal method used by Window, do not expose.
+	virtual void accessibility_window_deactivation_completed(DisplayServer::WindowID p_window_id); // Note: internal method used by Window, do not expose.
 
-	virtual void accessibility_update_set_role(const RID &p_id, DisplayServerEnums::AccessibilityRole p_role);
+	virtual void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role);
 	virtual void accessibility_update_set_name(const RID &p_id, const String &p_name);
 	virtual void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info);
 	virtual void accessibility_update_set_description(const RID &p_id, const String &p_description);
@@ -595,8 +723,8 @@ public:
 	virtual void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id);
 	virtual void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id);
 	virtual void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id);
-	virtual void accessibility_update_set_live(const RID &p_id, DisplayServerEnums::AccessibilityLiveMode p_live);
-	virtual void accessibility_update_add_action(const RID &p_id, DisplayServerEnums::AccessibilityAction p_action, const Callable &p_callable);
+	virtual void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live);
+	virtual void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable);
 	virtual void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description);
 	virtual void accessibility_update_set_table_row_count(const RID &p_id, int p_count);
 	virtual void accessibility_update_set_table_column_count(const RID &p_id, int p_count);
@@ -609,7 +737,7 @@ public:
 	virtual void accessibility_update_set_list_item_level(const RID &p_id, int p_level);
 	virtual void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected);
 	virtual void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded);
-	virtual void accessibility_update_set_popup_type(const RID &p_id, DisplayServerEnums::AccessibilityPopupType p_popup);
+	virtual void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup);
 	virtual void accessibility_update_set_checked(const RID &p_id, bool p_checekd);
 	virtual void accessibility_update_set_num_value(const RID &p_id, double p_position);
 	virtual void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max);
@@ -622,7 +750,7 @@ public:
 	virtual void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline);
 	virtual void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align);
 	virtual void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char);
-	virtual void accessibility_update_set_flag(const RID &p_id, DisplayServerEnums::AccessibilityFlags p_flag, bool p_value);
+	virtual void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value);
 	virtual void accessibility_update_set_classname(const RID &p_id, const String &p_classname);
 	virtual void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder);
 	virtual void accessibility_update_set_language(const RID &p_id, const String &p_language);
@@ -635,30 +763,264 @@ public:
 	virtual void accessibility_update_set_color_value(const RID &p_id, const Color &p_color);
 	virtual void accessibility_update_set_background_color(const RID &p_id, const Color &p_color);
 	virtual void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color);
-#endif // DISABLE_DEPRECATED
-};
 
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::Feature, DisplayServer::Feature)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::TTSUtteranceEvent, DisplayServer::TTSUtteranceEvent)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::MouseMode, DisplayServer::MouseMode)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::CursorShape, DisplayServer::CursorShape)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::VirtualKeyboardType, DisplayServer::VirtualKeyboardType)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::ScreenOrientation, DisplayServer::ScreenOrientation)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::HandleType, DisplayServer::HandleType)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::WindowMode, DisplayServer::WindowMode)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::WindowFlags, DisplayServer::WindowFlags)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::WindowEvent, DisplayServer::WindowEvent)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::WindowResizeEdge, DisplayServer::WindowResizeEdge)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::VSyncMode, DisplayServer::VSyncMode)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::ProgressState, DisplayServer::ProgressState)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::FileDialogMode, DisplayServer::FileDialogMode)
+	// necessary for GL focus, may be able to use one of the existing functions for this, not sure yet
+	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id);
+
+	virtual Point2i ime_get_selection() const;
+	virtual String ime_get_text() const;
+
+	enum VirtualKeyboardType {
+		KEYBOARD_TYPE_DEFAULT,
+		KEYBOARD_TYPE_MULTILINE,
+		KEYBOARD_TYPE_NUMBER,
+		KEYBOARD_TYPE_NUMBER_DECIMAL,
+		KEYBOARD_TYPE_PHONE,
+		KEYBOARD_TYPE_EMAIL_ADDRESS,
+		KEYBOARD_TYPE_PASSWORD,
+		KEYBOARD_TYPE_URL
+	};
+
+	virtual void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1);
+	virtual void virtual_keyboard_hide();
+
+	// returns height of the currently shown virtual keyboard (0 if keyboard is hidden)
+	virtual int virtual_keyboard_get_height() const;
+
+	virtual bool has_hardware_keyboard() const;
+
+	enum CursorShape {
+		CURSOR_ARROW,
+		CURSOR_IBEAM,
+		CURSOR_POINTING_HAND,
+		CURSOR_CROSS,
+		CURSOR_WAIT,
+		CURSOR_BUSY,
+		CURSOR_DRAG,
+		CURSOR_CAN_DROP,
+		CURSOR_FORBIDDEN,
+		CURSOR_VSIZE,
+		CURSOR_HSIZE,
+		CURSOR_BDIAGSIZE,
+		CURSOR_FDIAGSIZE,
+		CURSOR_MOVE,
+		CURSOR_VSPLIT,
+		CURSOR_HSPLIT,
+		CURSOR_HELP,
+		CURSOR_MAX
+	};
+	virtual void cursor_set_shape(CursorShape p_shape);
+	virtual CursorShape cursor_get_shape() const;
+	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2());
+
+	virtual bool get_swap_cancel_ok();
+
+	virtual void enable_for_stealing_focus(OS::ProcessID pid);
+
+	virtual Error embed_process(WindowID p_window, OS::ProcessID p_pid, const Rect2i &p_rect, bool p_visible, bool p_grab_focus);
+	virtual Error request_close_embedded_process(OS::ProcessID p_pid);
+	virtual Error remove_embedded_process(OS::ProcessID p_pid);
+	virtual OS::ProcessID get_focused_process_id();
+
+	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback);
+	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback);
+
+	enum FileDialogMode {
+		FILE_DIALOG_MODE_OPEN_FILE,
+		FILE_DIALOG_MODE_OPEN_FILES,
+		FILE_DIALOG_MODE_OPEN_DIR,
+		FILE_DIALOG_MODE_OPEN_ANY,
+		FILE_DIALOG_MODE_SAVE_FILE,
+		FILE_DIALOG_MODE_SAVE_MAX
+	};
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id = MAIN_WINDOW_ID);
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id = MAIN_WINDOW_ID);
 
 #ifndef DISABLE_DEPRECATED
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityRole, DisplayServer::AccessibilityRole)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityPopupType, DisplayServer::AccessibilityPopupType)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityFlags, DisplayServer::AccessibilityFlags)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityAction, DisplayServer::AccessibilityAction)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityLiveMode, DisplayServer::AccessibilityLiveMode)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityScrollUnit, DisplayServer::AccessibilityScrollUnit)
-VARIANT_ENUM_CAST_EXT(DisplayServerEnums::AccessibilityScrollHint, DisplayServer::AccessibilityScrollHint)
-#endif // DISABLE_DEPRECATED
+	Error _file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback);
+	Error _file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback);
+#endif
+
+	virtual void beep() const;
+
+	virtual int keyboard_get_layout_count() const;
+	virtual int keyboard_get_current_layout() const;
+	virtual void keyboard_set_current_layout(int p_index);
+	virtual String keyboard_get_layout_language(int p_index) const;
+	virtual String keyboard_get_layout_name(int p_index) const;
+	virtual Key keyboard_get_keycode_from_physical(Key p_keycode) const;
+	virtual Key keyboard_get_label_from_physical(Key p_keycode) const;
+	virtual void show_emoji_and_symbol_picker() const;
+	virtual bool color_picker(const Callable &p_callback);
+
+	virtual int tablet_get_driver_count() const { return 1; }
+	virtual String tablet_get_driver_name(int p_driver) const { return "default"; }
+	virtual String tablet_get_current_driver() const { return "default"; }
+	virtual void tablet_set_current_driver(const String &p_driver) {}
+
+	virtual void process_events() = 0;
+
+	virtual void force_process_and_drop_events();
+
+	virtual void release_rendering_thread();
+	virtual void swap_buffers();
+
+	virtual void set_native_icon(const String &p_filename);
+	virtual void set_icon(const Ref<Image> &p_icon);
+
+	virtual IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback);
+	virtual void status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon);
+	virtual void status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip);
+	virtual void status_indicator_set_menu(IndicatorID p_id, const RID &p_menu_rid);
+	virtual void status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback);
+	virtual Rect2 status_indicator_get_rect(IndicatorID p_id) const;
+	virtual void delete_status_indicator(IndicatorID p_id);
+
+	virtual void set_context(Context p_context);
+
+	virtual bool is_window_transparency_available() const { return false; }
+
+	void register_additional_output(Object *p_output);
+	void unregister_additional_output(Object *p_output);
+	bool has_additional_outputs() const { return additional_outputs.size() > 0; }
+
+	static void register_create_function(const char *p_name, CreateFunction p_function, GetRenderingDriversFunction p_get_drivers);
+	static int get_create_function_count();
+	static const char *get_create_function_name(int p_index);
+	static Vector<String> get_create_function_rendering_drivers(int p_index);
+	static DisplayServer *create(int p_index, const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
+
+	enum RenderingDeviceCreationStatus {
+		UNKNOWN,
+		SUCCESS,
+		FAILURE,
+	};
+
+	// Used to cache the result of `can_create_rendering_device()` when RenderingDevice isn't currently being used.
+	// This is done as creating a RenderingDevice is quite slow.
+	static inline RenderingDeviceCreationStatus created_rendering_device = RenderingDeviceCreationStatus::UNKNOWN;
+	static bool can_create_rendering_device();
+
+	static inline RenderingDeviceCreationStatus supported_rendering_device = RenderingDeviceCreationStatus::UNKNOWN;
+	static bool is_rendering_device_supported();
+
+	DisplayServer();
+	~DisplayServer();
+};
+
+/**************************************************************************/
+
+class AccessibilityDriver {
+public:
+	virtual Error init() = 0;
+
+	virtual bool window_create(DisplayServer::WindowID p_window_id, void *p_handle) = 0;
+	virtual void window_destroy(DisplayServer::WindowID p_window_id) = 0;
+
+	virtual RID accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) = 0;
+	virtual RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1) = 0;
+	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1, bool p_is_last_line = false) = 0;
+	virtual bool accessibility_has_element(const RID &p_id) const = 0;
+	virtual void accessibility_free_element(const RID &p_id) = 0;
+
+	virtual void accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) = 0;
+	virtual Variant accessibility_element_get_meta(const RID &p_id) const = 0;
+
+	virtual void accessibility_update_if_active(const Callable &p_callable) = 0;
+
+	virtual RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const = 0;
+	virtual void accessibility_update_set_focus(const RID &p_id) = 0;
+
+	virtual void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) = 0;
+	virtual void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) = 0;
+	virtual void accessibility_set_window_callbacks(DisplayServer::WindowID p_window_id, const Callable &p_activate_callable, const Callable &p_deativate_callable) = 0;
+	virtual void accessibility_window_activation_completed(DisplayServer::WindowID p_window_id) = 0;
+	virtual void accessibility_window_deactivation_completed(DisplayServer::WindowID p_window_id) = 0;
+
+	virtual void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) = 0;
+	virtual void accessibility_update_set_name(const RID &p_id, const String &p_name) = 0;
+	virtual void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) = 0;
+	virtual void accessibility_update_set_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_value(const RID &p_id, const String &p_value) = 0;
+	virtual void accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) = 0;
+	virtual void accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) = 0;
+	virtual void accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) = 0;
+	virtual void accessibility_update_add_child(const RID &p_id, const RID &p_child_id) = 0;
+	virtual void accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) = 0;
+	virtual void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) = 0;
+	virtual void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) = 0;
+	virtual void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) = 0;
+	virtual void accessibility_update_set_table_row_count(const RID &p_id, int p_count) = 0;
+	virtual void accessibility_update_set_table_column_count(const RID &p_id, int p_count) = 0;
+	virtual void accessibility_update_set_table_row_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_table_column_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) = 0;
+	virtual void accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) = 0;
+	virtual void accessibility_update_set_list_item_count(const RID &p_id, int p_size) = 0;
+	virtual void accessibility_update_set_list_item_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_list_item_level(const RID &p_id, int p_level) = 0;
+	virtual void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) = 0;
+	virtual void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) = 0;
+	virtual void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) = 0;
+	virtual void accessibility_update_set_checked(const RID &p_id, bool p_checekd) = 0;
+	virtual void accessibility_update_set_num_value(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_num_step(const RID &p_id, double p_step) = 0;
+	virtual void accessibility_update_set_num_jump(const RID &p_id, double p_jump) = 0;
+	virtual void accessibility_update_set_scroll_x(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_scroll_y(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) = 0;
+	virtual void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) = 0;
+	virtual void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) = 0;
+	virtual void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) = 0;
+	virtual void accessibility_update_set_classname(const RID &p_id, const String &p_classname) = 0;
+	virtual void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) = 0;
+	virtual void accessibility_update_set_language(const RID &p_id, const String &p_language) = 0;
+	virtual void accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) = 0;
+	virtual void accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) = 0;
+	virtual void accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) = 0;
+	virtual void accessibility_update_set_url(const RID &p_id, const String &p_url) = 0;
+	virtual void accessibility_update_set_role_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_state_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_color_value(const RID &p_id, const Color &p_color) = 0;
+	virtual void accessibility_update_set_background_color(const RID &p_id, const Color &p_color) = 0;
+	virtual void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) = 0;
+
+	AccessibilityDriver() {}
+	virtual ~AccessibilityDriver() {}
+};
+
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityAction)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityFlags)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityLiveMode)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityPopupType)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityRole)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityScrollUnit)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityScrollHint)
+
+VARIANT_ENUM_CAST(DisplayServer::WindowEvent)
+VARIANT_ENUM_CAST(DisplayServer::Feature)
+VARIANT_ENUM_CAST(DisplayServer::MouseMode)
+VARIANT_ENUM_CAST(DisplayServer::ScreenOrientation)
+VARIANT_ENUM_CAST(DisplayServer::WindowMode)
+VARIANT_ENUM_CAST(DisplayServer::WindowFlags)
+VARIANT_ENUM_CAST(DisplayServer::WindowResizeEdge)
+VARIANT_ENUM_CAST(DisplayServer::HandleType)
+VARIANT_ENUM_CAST(DisplayServer::VirtualKeyboardType);
+VARIANT_ENUM_CAST(DisplayServer::CursorShape)
+VARIANT_ENUM_CAST(DisplayServer::VSyncMode)
+VARIANT_ENUM_CAST(DisplayServer::TTSUtteranceEvent)
+VARIANT_ENUM_CAST(DisplayServer::FileDialogMode)
diff --git a/engine/servers/display/display_server_enums.h b/engine/servers/display/display_server_enums.h
deleted file mode 100644
index 5c8b7e99..00000000
--- a/engine/servers/display/display_server_enums.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/**************************************************************************/
-/*  display_server_enums.h                                                */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-namespace DisplayServerEnums {
-
-/* MAIN */
-
-enum Context {
-	CONTEXT_EDITOR,
-	CONTEXT_PROJECTMAN,
-	CONTEXT_ENGINE,
-};
-
-enum Feature {
-#ifndef DISABLE_DEPRECATED
-	FEATURE_GLOBAL_MENU,
-#endif
-	FEATURE_SUBWINDOWS,
-	FEATURE_TOUCHSCREEN,
-	FEATURE_MOUSE,
-	FEATURE_MOUSE_WARP,
-	FEATURE_CLIPBOARD,
-	FEATURE_VIRTUAL_KEYBOARD,
-	FEATURE_CURSOR_SHAPE,
-	FEATURE_CUSTOM_CURSOR_SHAPE,
-	FEATURE_NATIVE_DIALOG,
-	FEATURE_IME,
-	FEATURE_WINDOW_TRANSPARENCY,
-	FEATURE_HIDPI,
-	FEATURE_ICON,
-	FEATURE_NATIVE_ICON,
-	FEATURE_ORIENTATION,
-	FEATURE_SWAP_BUFFERS,
-	FEATURE_KEEP_SCREEN_ON,
-	FEATURE_CLIPBOARD_PRIMARY,
-	FEATURE_TEXT_TO_SPEECH,
-	FEATURE_EXTEND_TO_TITLE,
-	FEATURE_SCREEN_CAPTURE,
-	FEATURE_STATUS_INDICATOR,
-	FEATURE_NATIVE_HELP,
-	FEATURE_NATIVE_DIALOG_INPUT,
-	FEATURE_NATIVE_DIALOG_FILE,
-	FEATURE_NATIVE_DIALOG_FILE_EXTRA,
-	FEATURE_WINDOW_DRAG,
-	FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE,
-	FEATURE_WINDOW_EMBEDDING,
-	FEATURE_NATIVE_DIALOG_FILE_MIME,
-	FEATURE_EMOJI_AND_SYMBOL_PICKER,
-	FEATURE_NATIVE_COLOR_PICKER,
-	FEATURE_SELF_FITTING_WINDOWS,
-	FEATURE_ACCESSIBILITY_SCREEN_READER,
-	FEATURE_HDR_OUTPUT,
-	FEATURE_PIP_MODE,
-};
-
-/* RENDERING DEVICE */
-
-enum RenderingDeviceCreationStatus {
-	UNKNOWN,
-	SUCCESS,
-	FAILURE,
-};
-
-/* TTS */
-
-enum TTSUtteranceEvent {
-	TTS_UTTERANCE_STARTED,
-	TTS_UTTERANCE_ENDED,
-	TTS_UTTERANCE_CANCELED,
-	TTS_UTTERANCE_BOUNDARY,
-	TTS_UTTERANCE_MAX,
-};
-
-/* MOUSE */
-
-// Keep synced with InputClassEnums::MouseMode enum.
-enum MouseMode {
-	MOUSE_MODE_VISIBLE, // Input::MouseMode::MOUSE_MODE_VISIBLE
-	MOUSE_MODE_HIDDEN, // Input::MouseMode::MOUSE_MODE_HIDDEN
-	MOUSE_MODE_CAPTURED, // Input::MouseMode::MOUSE_MODE_CAPTURED
-	MOUSE_MODE_CONFINED, // Input::MouseMode::MOUSE_MODE_CONFINED
-	MOUSE_MODE_CONFINED_HIDDEN, // Input::MouseMode::MOUSE_MODE_CONFINED_HIDDEN
-	MOUSE_MODE_MAX, // Input::MouseMode::MOUSE_MODE_MAX
-};
-
-// Keep synced with InputClassEnums and Control enums.
-#undef CursorShape
-enum CursorShape {
-	CURSOR_ARROW,
-	CURSOR_IBEAM,
-	CURSOR_POINTING_HAND,
-	CURSOR_CROSS,
-	CURSOR_WAIT,
-	CURSOR_BUSY,
-	CURSOR_DRAG,
-	CURSOR_CAN_DROP,
-	CURSOR_FORBIDDEN,
-	CURSOR_VSIZE,
-	CURSOR_HSIZE,
-	CURSOR_BDIAGSIZE,
-	CURSOR_FDIAGSIZE,
-	CURSOR_MOVE,
-	CURSOR_VSPLIT,
-	CURSOR_HSPLIT,
-	CURSOR_HELP,
-	CURSOR_MAX
-};
-
-/* KEYBOARD */
-
-// Keep synced with LineEdit::VirtualKeyboardType enum.
-enum VirtualKeyboardType {
-	KEYBOARD_TYPE_DEFAULT,
-	KEYBOARD_TYPE_MULTILINE,
-	KEYBOARD_TYPE_NUMBER,
-	KEYBOARD_TYPE_NUMBER_DECIMAL,
-	KEYBOARD_TYPE_PHONE,
-	KEYBOARD_TYPE_EMAIL_ADDRESS,
-	KEYBOARD_TYPE_PASSWORD,
-	KEYBOARD_TYPE_URL
-};
-
-/* SCREEN */
-
-// Keep synced with EditorSettings::InitialScreen enum.
-enum {
-	INVALID_SCREEN = -1,
-	SCREEN_WITH_MOUSE_FOCUS = -4,
-	SCREEN_WITH_KEYBOARD_FOCUS = -3,
-	SCREEN_PRIMARY = -2,
-	SCREEN_OF_MAIN_WINDOW = -1, // Note: for the main window, determine screen from position.
-};
-
-// Keep the ScreenOrientation enum values in sync with the `display/window/handheld/orientation`
-// project setting hint.
-enum ScreenOrientation {
-	SCREEN_LANDSCAPE,
-	SCREEN_PORTRAIT,
-	SCREEN_REVERSE_LANDSCAPE,
-	SCREEN_REVERSE_PORTRAIT,
-	SCREEN_SENSOR_LANDSCAPE,
-	SCREEN_SENSOR_PORTRAIT,
-	SCREEN_SENSOR,
-};
-
-/* WINDOW */
-
-typedef int WindowID;
-
-enum {
-	MAIN_WINDOW_ID = 0,
-	INVALID_WINDOW_ID = -1,
-	INVALID_INDICATOR_ID = -1
-};
-
-enum HandleType {
-	DISPLAY_HANDLE,
-	WINDOW_HANDLE,
-	WINDOW_VIEW,
-	OPENGL_CONTEXT,
-	EGL_DISPLAY,
-	EGL_CONFIG,
-	GLX_VISUALID,
-	GLX_FBCONFIG,
-};
-
-enum WindowMode {
-	WINDOW_MODE_WINDOWED,
-	WINDOW_MODE_MINIMIZED,
-	WINDOW_MODE_MAXIMIZED,
-	WINDOW_MODE_FULLSCREEN,
-	WINDOW_MODE_EXCLUSIVE_FULLSCREEN,
-};
-
-enum WindowFlags {
-	WINDOW_FLAG_RESIZE_DISABLED,
-	WINDOW_FLAG_BORDERLESS,
-	WINDOW_FLAG_ALWAYS_ON_TOP,
-	WINDOW_FLAG_TRANSPARENT,
-	WINDOW_FLAG_NO_FOCUS,
-	WINDOW_FLAG_POPUP,
-	WINDOW_FLAG_EXTEND_TO_TITLE,
-	WINDOW_FLAG_MOUSE_PASSTHROUGH,
-	WINDOW_FLAG_SHARP_CORNERS,
-	WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
-	WINDOW_FLAG_POPUP_WM_HINT,
-	WINDOW_FLAG_MINIMIZE_DISABLED,
-	WINDOW_FLAG_MAXIMIZE_DISABLED,
-	WINDOW_FLAG_MAX,
-};
-
-// Separate enum otherwise we get warnings in switches not handling all values.
-enum WindowFlagsBit {
-	WINDOW_FLAG_RESIZE_DISABLED_BIT = (1 << WINDOW_FLAG_RESIZE_DISABLED),
-	WINDOW_FLAG_BORDERLESS_BIT = (1 << WINDOW_FLAG_BORDERLESS),
-	WINDOW_FLAG_ALWAYS_ON_TOP_BIT = (1 << WINDOW_FLAG_ALWAYS_ON_TOP),
-	WINDOW_FLAG_TRANSPARENT_BIT = (1 << WINDOW_FLAG_TRANSPARENT),
-	WINDOW_FLAG_NO_FOCUS_BIT = (1 << WINDOW_FLAG_NO_FOCUS),
-	WINDOW_FLAG_POPUP_BIT = (1 << WINDOW_FLAG_POPUP),
-	WINDOW_FLAG_EXTEND_TO_TITLE_BIT = (1 << WINDOW_FLAG_EXTEND_TO_TITLE),
-	WINDOW_FLAG_MOUSE_PASSTHROUGH_BIT = (1 << WINDOW_FLAG_MOUSE_PASSTHROUGH),
-	WINDOW_FLAG_SHARP_CORNERS_BIT = (1 << WINDOW_FLAG_SHARP_CORNERS),
-	WINDOW_FLAG_EXCLUDE_FROM_CAPTURE_BIT = (1 << WINDOW_FLAG_EXCLUDE_FROM_CAPTURE),
-	WINDOW_FLAG_POPUP_WM_HINT_BIT = (1 << WINDOW_FLAG_POPUP_WM_HINT),
-	WINDOW_FLAG_MINIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MINIMIZE_DISABLED),
-	WINDOW_FLAG_MAXIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MAXIMIZE_DISABLED),
-};
-
-enum WindowEvent {
-	WINDOW_EVENT_MOUSE_ENTER,
-	WINDOW_EVENT_MOUSE_EXIT,
-	WINDOW_EVENT_FOCUS_IN,
-	WINDOW_EVENT_FOCUS_OUT,
-	WINDOW_EVENT_CLOSE_REQUEST,
-	WINDOW_EVENT_GO_BACK_REQUEST,
-	WINDOW_EVENT_DPI_CHANGE,
-	WINDOW_EVENT_TITLEBAR_CHANGE,
-	WINDOW_EVENT_FORCE_CLOSE,
-	WINDOW_EVENT_OUTPUT_MAX_LINEAR_VALUE_CHANGED,
-};
-
-enum WindowResizeEdge {
-	WINDOW_EDGE_TOP_LEFT,
-	WINDOW_EDGE_TOP,
-	WINDOW_EDGE_TOP_RIGHT,
-	WINDOW_EDGE_LEFT,
-	WINDOW_EDGE_RIGHT,
-	WINDOW_EDGE_BOTTOM_LEFT,
-	WINDOW_EDGE_BOTTOM,
-	WINDOW_EDGE_BOTTOM_RIGHT,
-	WINDOW_EDGE_MAX,
-};
-
-// Keep the VSyncMode enum values in sync with the `display/window/vsync/vsync_mode`
-// project setting hint.
-enum VSyncMode {
-	VSYNC_DISABLED,
-	VSYNC_ENABLED,
-	VSYNC_ADAPTIVE,
-	VSYNC_MAILBOX
-};
-
-enum ProgressState {
-	PROGRESS_STATE_NOPROGRESS,
-	PROGRESS_STATE_INDETERMINATE,
-	PROGRESS_STATE_NORMAL,
-	PROGRESS_STATE_ERROR,
-	PROGRESS_STATE_PAUSED,
-};
-
-/* DIALOGS */
-
-enum FileDialogMode {
-	FILE_DIALOG_MODE_OPEN_FILE,
-	FILE_DIALOG_MODE_OPEN_FILES,
-	FILE_DIALOG_MODE_OPEN_DIR,
-	FILE_DIALOG_MODE_OPEN_ANY,
-	FILE_DIALOG_MODE_SAVE_FILE,
-	FILE_DIALOG_MODE_SAVE_MAX
-};
-
-/* STATUS INDICATOR */
-
-typedef int IndicatorID;
-
-#ifndef DISABLE_DEPRECATED
-
-/* ACCESSIBILITY */
-
-enum AccessibilityRole {
-	ROLE_UNKNOWN,
-	ROLE_DEFAULT_BUTTON,
-	ROLE_AUDIO,
-	ROLE_VIDEO,
-	ROLE_STATIC_TEXT,
-	ROLE_CONTAINER,
-	ROLE_PANEL,
-	ROLE_BUTTON,
-	ROLE_LINK,
-	ROLE_CHECK_BOX,
-	ROLE_RADIO_BUTTON,
-	ROLE_CHECK_BUTTON,
-	ROLE_SCROLL_BAR,
-	ROLE_SCROLL_VIEW,
-	ROLE_SPLITTER,
-	ROLE_SLIDER,
-	ROLE_SPIN_BUTTON,
-	ROLE_PROGRESS_INDICATOR,
-	ROLE_TEXT_FIELD,
-	ROLE_MULTILINE_TEXT_FIELD,
-	ROLE_COLOR_PICKER,
-	ROLE_TABLE,
-	ROLE_CELL,
-	ROLE_ROW,
-	ROLE_ROW_GROUP,
-	ROLE_ROW_HEADER,
-	ROLE_COLUMN_HEADER,
-	ROLE_TREE,
-	ROLE_TREE_ITEM,
-	ROLE_LIST,
-	ROLE_LIST_ITEM,
-	ROLE_LIST_BOX,
-	ROLE_LIST_BOX_OPTION,
-	ROLE_TAB_BAR,
-	ROLE_TAB,
-	ROLE_TAB_PANEL,
-	ROLE_MENU_BAR,
-	ROLE_MENU,
-	ROLE_MENU_ITEM,
-	ROLE_MENU_ITEM_CHECK_BOX,
-	ROLE_MENU_ITEM_RADIO,
-	ROLE_IMAGE,
-	ROLE_WINDOW,
-	ROLE_TITLE_BAR,
-	ROLE_DIALOG,
-	ROLE_TOOLTIP,
-	ROLE_REGION,
-	ROLE_TEXT_RUN,
-};
-
-enum AccessibilityPopupType {
-	POPUP_MENU,
-	POPUP_LIST,
-	POPUP_TREE,
-	POPUP_DIALOG,
-};
-
-enum AccessibilityFlags {
-	FLAG_HIDDEN,
-	FLAG_MULTISELECTABLE,
-	FLAG_REQUIRED,
-	FLAG_VISITED,
-	FLAG_BUSY,
-	FLAG_MODAL,
-	FLAG_TOUCH_PASSTHROUGH,
-	FLAG_READONLY,
-	FLAG_DISABLED,
-	FLAG_CLIPS_CHILDREN,
-};
-
-enum AccessibilityAction {
-	ACTION_CLICK,
-	ACTION_FOCUS,
-	ACTION_BLUR,
-	ACTION_COLLAPSE,
-	ACTION_EXPAND,
-	ACTION_DECREMENT,
-	ACTION_INCREMENT,
-	ACTION_HIDE_TOOLTIP,
-	ACTION_SHOW_TOOLTIP,
-	ACTION_SET_TEXT_SELECTION,
-	ACTION_REPLACE_SELECTED_TEXT,
-	ACTION_SCROLL_BACKWARD,
-	ACTION_SCROLL_DOWN,
-	ACTION_SCROLL_FORWARD,
-	ACTION_SCROLL_LEFT,
-	ACTION_SCROLL_RIGHT,
-	ACTION_SCROLL_UP,
-	ACTION_SCROLL_INTO_VIEW,
-	ACTION_SCROLL_TO_POINT,
-	ACTION_SET_SCROLL_OFFSET,
-	ACTION_SET_VALUE,
-	ACTION_SHOW_CONTEXT_MENU,
-	ACTION_CUSTOM,
-};
-
-enum AccessibilityLiveMode {
-	LIVE_OFF,
-	LIVE_POLITE,
-	LIVE_ASSERTIVE,
-};
-
-enum AccessibilityScrollUnit {
-	SCROLL_UNIT_ITEM,
-	SCROLL_UNIT_PAGE,
-};
-
-enum AccessibilityScrollHint {
-	SCROLL_HINT_TOP_LEFT,
-	SCROLL_HINT_BOTTOM_RIGHT,
-	SCROLL_HINT_TOP_EDGE,
-	SCROLL_HINT_BOTTOM_EDGE,
-	SCROLL_HINT_LEFT_EDGE,
-	SCROLL_HINT_RIGHT_EDGE,
-};
-
-#endif // DISABLE_DEPRECATED
-
-} // namespace DisplayServerEnums
diff --git a/engine/servers/display/display_server_headless.h b/engine/servers/display/display_server_headless.h
index d5c13fd2..4069373e 100644
--- a/engine/servers/display/display_server_headless.h
+++ b/engine/servers/display/display_server_headless.h
@@ -32,8 +32,7 @@
 
 #include "servers/display/display_server.h"
 
-class InputEvent;
-class NativeMenu;
+#include "servers/rendering/dummy/rasterizer_dummy.h"
 
 class DisplayServerHeadless : public DisplayServer {
 	GDSOFTCLASS(DisplayServerHeadless, DisplayServer);
@@ -47,16 +46,27 @@ private:
 		return drivers;
 	}
 
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
+		r_error = OK;
+		RasterizerDummy::make_current();
+		return memnew(DisplayServerHeadless());
+	}
 
-	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
-	void _dispatch_input_event(const Ref<InputEvent> &p_event);
+	static void _dispatch_input_events(const Ref<InputEvent> &p_event) {
+		static_cast<DisplayServerHeadless *>(get_singleton())->_dispatch_input_event(p_event);
+	}
+
+	void _dispatch_input_event(const Ref<InputEvent> &p_event) {
+		if (input_event_callback.is_valid()) {
+			input_event_callback.call(p_event);
+		}
+	}
 
 	NativeMenu *native_menu = nullptr;
 	Callable input_event_callback;
 
 public:
-	bool has_feature(DisplayServerEnums::Feature p_feature) const override { return false; }
+	bool has_feature(Feature p_feature) const override { return false; }
 	String get_name() const override { return "headless"; }
 
 	// Stub implementations to prevent warnings from being printed for methods
@@ -64,88 +74,88 @@ public:
 
 	int get_screen_count() const override { return 0; }
 	int get_primary_screen() const override { return 0; }
-	Point2i screen_get_position(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return Point2i(); }
-	Size2i screen_get_size(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return Size2i(); }
-	Rect2i screen_get_usable_rect(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return Rect2i(); }
-	int screen_get_dpi(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return 96; /* 0 might cause issues */ }
-	float screen_get_scale(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return 1; }
+	Point2i screen_get_position(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return Point2i(); }
+	Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return Size2i(); }
+	Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return Rect2i(); }
+	int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return 96; /* 0 might cause issues */ }
+	float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return 1; }
 	float screen_get_max_scale() const override { return 1; }
-	float screen_get_refresh_rate(int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) const override { return SCREEN_REFRESH_RATE_FALLBACK; }
-	void screen_set_orientation(DisplayServerEnums::ScreenOrientation p_orientation, int p_screen = DisplayServerEnums::SCREEN_OF_MAIN_WINDOW) override {}
+	float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const override { return SCREEN_REFRESH_RATE_FALLBACK; }
+	void screen_set_orientation(ScreenOrientation p_orientation, int p_screen = SCREEN_OF_MAIN_WINDOW) override {}
 	void screen_set_keep_on(bool p_enable) override {}
 
-	Vector<DisplayServerEnums::WindowID> get_window_list() const override { return Vector<DisplayServerEnums::WindowID>(); }
+	Vector<DisplayServer::WindowID> get_window_list() const override { return Vector<DisplayServer::WindowID>(); }
 
-	DisplayServerEnums::WindowID create_sub_window(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, DisplayServerEnums::WindowID p_transient_parent = DisplayServerEnums::INVALID_WINDOW_ID) override { return 0; }
-	void show_window(DisplayServerEnums::WindowID p_id) override {}
-	void delete_sub_window(DisplayServerEnums::WindowID p_id) override {}
+	WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override { return 0; }
+	void show_window(WindowID p_id) override {}
+	void delete_sub_window(WindowID p_id) override {}
 
-	DisplayServerEnums::WindowID get_window_at_screen_position(const Point2i &p_position) const override { return 0; }
+	WindowID get_window_at_screen_position(const Point2i &p_position) const override { return 0; }
 
-	void window_attach_instance_id(ObjectID p_instance, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	ObjectID window_get_attached_instance_id(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return ObjectID(); }
+	void window_attach_instance_id(ObjectID p_instance, WindowID p_window = MAIN_WINDOW_ID) override {}
+	ObjectID window_get_attached_instance_id(WindowID p_window = MAIN_WINDOW_ID) const override { return ObjectID(); }
 
-	void window_set_rect_changed_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	void window_set_input_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {
+	void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {
 		input_event_callback = p_callable;
 	}
 
-	void window_set_input_text_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	void window_set_drop_files_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_input_text_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {}
+	void window_set_drop_files_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	void window_set_title(const String &p_title, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_title(const String &p_title, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	void window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	int window_get_current_screen(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return DisplayServerEnums::INVALID_SCREEN; }
-	void window_set_current_screen(int p_screen, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	int window_get_current_screen(WindowID p_window = MAIN_WINDOW_ID) const override { return INVALID_SCREEN; }
+	void window_set_current_screen(int p_screen, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	Point2i window_get_position(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Point2i(); }
-	Point2i window_get_position_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Point2i(); }
-	void window_set_position(const Point2i &p_position, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	Point2i window_get_position(WindowID p_window = MAIN_WINDOW_ID) const override { return Point2i(); }
+	Point2i window_get_position_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override { return Point2i(); }
+	void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	void window_set_transient(DisplayServerEnums::WindowID p_window, DisplayServerEnums::WindowID p_parent) override {}
+	void window_set_transient(WindowID p_window, WindowID p_parent) override {}
 
-	void window_set_max_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	Size2i window_get_max_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Size2i(); }
+	void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override {}
+	Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override { return Size2i(); }
 
-	void window_set_min_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	Size2i window_get_min_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Size2i(); }
+	void window_set_min_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override {}
+	Size2i window_get_min_size(WindowID p_window = MAIN_WINDOW_ID) const override { return Size2i(); }
 
-	void window_set_size(const Size2i p_size, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Size2i(); }
-	Size2i window_get_size_with_decorations(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return Size2i(); }
+	void window_set_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override {}
+	Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override { return Size2i(); }
+	Size2i window_get_size_with_decorations(WindowID p_window = MAIN_WINDOW_ID) const override { return Size2i(); }
 
-	void window_set_mode(DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	DisplayServerEnums::WindowMode window_get_mode(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return DisplayServerEnums::WINDOW_MODE_MINIMIZED; }
+	void window_set_mode(WindowMode p_mode, WindowID p_window = MAIN_WINDOW_ID) override {}
+	WindowMode window_get_mode(WindowID p_window = MAIN_WINDOW_ID) const override { return WINDOW_MODE_MINIMIZED; }
 
-	void window_set_vsync_mode(DisplayServerEnums::VSyncMode p_vsync_mode, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const override { return DisplayServerEnums::VSyncMode::VSYNC_ENABLED; }
+	void window_set_vsync_mode(VSyncMode p_vsync_mode, WindowID p_window = MAIN_WINDOW_ID) override {}
+	VSyncMode window_get_vsync_mode(WindowID p_window) const override { return VSyncMode::VSYNC_ENABLED; }
 
-	bool window_is_maximize_allowed(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return false; }
+	bool window_is_maximize_allowed(WindowID p_window = MAIN_WINDOW_ID) const override { return false; }
 
-	void window_set_flag(DisplayServerEnums::WindowFlags p_flag, bool p_enabled, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	bool window_get_flag(DisplayServerEnums::WindowFlags p_flag, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return false; }
+	void window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window = MAIN_WINDOW_ID) override {}
+	bool window_get_flag(WindowFlags p_flag, WindowID p_window = MAIN_WINDOW_ID) const override { return false; }
 
-	void window_request_attention(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	void window_set_taskbar_progress_value(float p_value, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	void window_set_taskbar_progress_state(DisplayServerEnums::ProgressState p_state, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	void window_move_to_foreground(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	bool window_is_focused(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return true; }
+	void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override {}
+	void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override {}
+	bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override { return true; }
 
-	bool window_can_draw(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return false; }
+	bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override { return false; }
 
 	bool can_any_window_draw() const override { return false; }
 
-	void window_set_ime_active(const bool p_active, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
-	void window_set_ime_position(const Point2i &p_pos, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {}
+	void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override {}
+	void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override {}
 
-	int64_t window_get_native_handle(DisplayServerEnums::HandleType p_handle_type, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override { return 0; }
+	int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override { return 0; }
 
-	void process_events() override;
+	void process_events() override {
+		Input::get_singleton()->flush_buffered_events();
+	}
 
 	void set_native_icon(const String &p_filename) override {}
 	void set_icon(const Ref<Image> &p_icon) override {}
@@ -160,33 +170,42 @@ public:
 	void tts_resume() override {}
 	void tts_stop() override {}
 
-	void mouse_set_mode(DisplayServerEnums::MouseMode p_mode) override {}
-	void mouse_set_mode_override(DisplayServerEnums::MouseMode p_mode) override {}
+	void mouse_set_mode(MouseMode p_mode) override {}
+	void mouse_set_mode_override(MouseMode p_mode) override {}
 	void mouse_set_mode_override_enabled(bool p_override_enabled) override {}
 	Point2i mouse_get_position() const override { return Point2i(); }
 	void clipboard_set(const String &p_text) override {}
 	void clipboard_set_primary(const String &p_text) override {}
 
-	void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), DisplayServerEnums::VirtualKeyboardType p_type = DisplayServerEnums::KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override {}
+	void virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), VirtualKeyboardType p_type = KEYBOARD_TYPE_DEFAULT, int p_max_length = -1, int p_cursor_start = -1, int p_cursor_end = -1) override {}
 	void virtual_keyboard_hide() override {}
 
-	void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override {}
-	void cursor_set_custom_image(const Ref<Resource> &p_cursor, DisplayServerEnums::CursorShape p_shape = DisplayServerEnums::CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override {}
+	void cursor_set_shape(CursorShape p_shape) override {}
+	void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override {}
 
 	Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
 	Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
-	Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override { return ERR_UNAVAILABLE; }
-	Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, DisplayServerEnums::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, DisplayServerEnums::WindowID p_window_id) override { return ERR_UNAVAILABLE; }
+	Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override { return ERR_UNAVAILABLE; }
+	Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override { return ERR_UNAVAILABLE; }
 
 	void release_rendering_thread() override {}
 	void swap_buffers() override {}
 
-	DisplayServerEnums::IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override { return DisplayServerEnums::INVALID_INDICATOR_ID; }
-	void status_indicator_set_icon(DisplayServerEnums::IndicatorID p_id, const Ref<Texture2D> &p_icon) override {}
-	void status_indicator_set_tooltip(DisplayServerEnums::IndicatorID p_id, const String &p_tooltip) override {}
-	void status_indicator_set_callback(DisplayServerEnums::IndicatorID p_id, const Callable &p_callback) override {}
-	void delete_status_indicator(DisplayServerEnums::IndicatorID p_id) override {}
+	IndicatorID create_status_indicator(const Ref<Texture2D> &p_icon, const String &p_tooltip, const Callable &p_callback) override { return INVALID_INDICATOR_ID; }
+	void status_indicator_set_icon(IndicatorID p_id, const Ref<Texture2D> &p_icon) override {}
+	void status_indicator_set_tooltip(IndicatorID p_id, const String &p_tooltip) override {}
+	void status_indicator_set_callback(IndicatorID p_id, const Callable &p_callback) override {}
+	void delete_status_indicator(IndicatorID p_id) override {}
 
-	DisplayServerHeadless();
-	~DisplayServerHeadless();
+	DisplayServerHeadless() {
+		native_menu = memnew(NativeMenu);
+		Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
+	}
+
+	~DisplayServerHeadless() {
+		if (native_menu) {
+			memdelete(native_menu);
+			native_menu = nullptr;
+		}
+	}
 };
diff --git a/engine/servers/display/native_menu.cpp b/engine/servers/display/native_menu.cpp
index e906288d..d1a5bfd7 100644
--- a/engine/servers/display/native_menu.cpp
+++ b/engine/servers/display/native_menu.cpp
@@ -30,8 +30,7 @@
 
 #include "native_menu.h"
 
-#include "core/object/class_db.h"
-#include "scene/resources/texture.h"
+#include "scene/resources/image_texture.h"
 
 NativeMenu *NativeMenu::singleton = nullptr;
 
@@ -110,7 +109,6 @@ void NativeMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_max_states", "rid", "idx", "max_states"), &NativeMenu::set_item_max_states);
 	ClassDB::bind_method(D_METHOD("set_item_icon", "rid", "idx", "icon"), &NativeMenu::set_item_icon);
 	ClassDB::bind_method(D_METHOD("set_item_indentation_level", "rid", "idx", "level"), &NativeMenu::set_item_indentation_level);
-	ClassDB::bind_method(D_METHOD("set_item_index", "rid", "idx", "target_idx"), &NativeMenu::set_item_index);
 
 	ClassDB::bind_method(D_METHOD("get_item_count", "rid"), &NativeMenu::get_item_count);
 	ClassDB::bind_method(D_METHOD("is_system_menu", "rid"), &NativeMenu::is_system_menu);
@@ -446,11 +444,6 @@ void NativeMenu::set_item_indentation_level(const RID &p_rid, int p_idx, int p_l
 	WARN_PRINT("Global menus are not supported on this platform.");
 }
 
-int NativeMenu::set_item_index(const RID &p_rid, int p_idx, int p_target_idx) {
-	WARN_PRINT("Global menus are not supported on this platform.");
-	return -1;
-}
-
 int NativeMenu::get_item_count(const RID &p_rid) const {
 	WARN_PRINT("Global menus are not supported on this platform.");
 	return 0;
diff --git a/engine/servers/display/native_menu.h b/engine/servers/display/native_menu.h
index 3adf8299..a58dce6c 100644
--- a/engine/servers/display/native_menu.h
+++ b/engine/servers/display/native_menu.h
@@ -30,10 +30,8 @@
 
 #pragma once
 
-#include "core/object/object.h"
-#include "core/os/keyboard.h"
+#include "core/input/input.h"
 #include "core/variant/callable.h"
-#include "core/variant/type_info.h"
 
 class Texture2D;
 
@@ -142,7 +140,6 @@ public:
 	virtual void set_item_max_states(const RID &p_rid, int p_idx, int p_max_states);
 	virtual void set_item_icon(const RID &p_rid, int p_idx, const Ref<Texture2D> &p_icon);
 	virtual void set_item_indentation_level(const RID &p_rid, int p_idx, int p_level);
-	virtual int set_item_index(const RID &p_rid, int p_idx, int p_target_idx);
 
 	virtual int get_item_count(const RID &p_rid) const;
 	virtual bool is_system_menu(const RID &p_rid) const;
diff --git a/engine/servers/movie_writer/movie_writer.cpp b/engine/servers/movie_writer/movie_writer.cpp
index ba5e1013..964f69f8 100644
--- a/engine/servers/movie_writer/movie_writer.cpp
+++ b/engine/servers/movie_writer/movie_writer.cpp
@@ -29,16 +29,12 @@
 /**************************************************************************/
 
 #include "movie_writer.h"
-
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/object/class_db.h"
 #include "core/os/time.h"
-#include "core/templates/rb_set.h"
 #include "scene/main/window.h"
 #include "servers/audio/audio_driver_dummy.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 MovieWriter *MovieWriter::writers[MovieWriter::MAX_WRITERS];
@@ -192,12 +188,12 @@ void MovieWriter::add_frame() {
 			String::num(movie_time_seconds % 60, 0).pad_zeros(2),
 			String::num(frame_remainder, 0).pad_zeros(2));
 
-	Window *main_window = Window::get_from_id(DisplayServerEnums::MAIN_WINDOW_ID);
+	Window *main_window = Window::get_from_id(DisplayServer::MAIN_WINDOW_ID);
 	if (main_window) {
 		main_window->set_title(vformat("MovieWriter: Frame %d (time: %s) - %s", Engine::get_singleton()->get_frames_drawn(), movie_time, project_name));
 	}
 
-	RID main_vp_rid = RenderingServer::get_singleton()->viewport_find_from_screen_attachment(DisplayServerEnums::MAIN_WINDOW_ID);
+	RID main_vp_rid = RenderingServer::get_singleton()->viewport_find_from_screen_attachment(DisplayServer::MAIN_WINDOW_ID);
 	RID main_vp_texture = RenderingServer::get_singleton()->viewport_get_texture(main_vp_rid);
 	Ref<Image> vp_tex = RenderingServer::get_singleton()->texture_2d_get(main_vp_texture);
 
diff --git a/engine/servers/movie_writer/movie_writer_pngwav.cpp b/engine/servers/movie_writer/movie_writer_pngwav.cpp
index 3b6c81cc..d39d3f7a 100644
--- a/engine/servers/movie_writer/movie_writer_pngwav.cpp
+++ b/engine/servers/movie_writer/movie_writer_pngwav.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "movie_writer_pngwav.h"
-
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
diff --git a/engine/servers/navigation_2d/navigation_path_query_parameters_2d.cpp b/engine/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
index 88c4a536..f82890b0 100644
--- a/engine/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
+++ b/engine/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_path_query_parameters_2d.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationPathQueryParameters2D::set_pathfinding_algorithm(const NavigationPathQueryParameters2D::PathfindingAlgorithm p_pathfinding_algorithm) {
diff --git a/engine/servers/navigation_2d/navigation_path_query_parameters_2d.h b/engine/servers/navigation_2d/navigation_path_query_parameters_2d.h
index 381b16f7..11fa44ab 100644
--- a/engine/servers/navigation_2d/navigation_path_query_parameters_2d.h
+++ b/engine/servers/navigation_2d/navigation_path_query_parameters_2d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
 class NavigationPathQueryParameters2D : public RefCounted {
diff --git a/engine/servers/navigation_2d/navigation_path_query_result_2d.cpp b/engine/servers/navigation_2d/navigation_path_query_result_2d.cpp
index d6ec5762..f41c2e85 100644
--- a/engine/servers/navigation_2d/navigation_path_query_result_2d.cpp
+++ b/engine/servers/navigation_2d/navigation_path_query_result_2d.cpp
@@ -30,8 +30,6 @@
 
 #include "navigation_path_query_result_2d.h"
 
-#include "core/object/class_db.h"
-
 void NavigationPathQueryResult2D::set_path(const Vector<Vector2> &p_path) {
 	path = p_path;
 }
diff --git a/engine/servers/navigation_2d/navigation_path_query_result_2d.h b/engine/servers/navigation_2d/navigation_path_query_result_2d.h
index 41c99215..71118f47 100644
--- a/engine/servers/navigation_2d/navigation_path_query_result_2d.h
+++ b/engine/servers/navigation_2d/navigation_path_query_result_2d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
diff --git a/engine/servers/navigation_2d/navigation_server_2d.compat.inc b/engine/servers/navigation_2d/navigation_server_2d.compat.inc
index 6a1b6fab..14205ef5 100644
--- a/engine/servers/navigation_2d/navigation_server_2d.compat.inc
+++ b/engine/servers/navigation_2d/navigation_server_2d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "navigation_server_2d.h"
-
-#include "core/object/class_db.h"
-
 Vector<Vector2> NavigationServer2D::_map_get_path_bind_compat_100129(RID p_map, Vector2 p_origin, Vector2 p_destination, bool p_optimize, uint32_t p_navigation_layers) const {
 	return const_cast<NavigationServer2D *>(this)->map_get_path(p_map, p_origin, p_destination, p_optimize, p_navigation_layers);
 }
diff --git a/engine/servers/navigation_2d/navigation_server_2d.cpp b/engine/servers/navigation_2d/navigation_server_2d.cpp
index e5d252eb..e462d112 100644
--- a/engine/servers/navigation_2d/navigation_server_2d.cpp
+++ b/engine/servers/navigation_2d/navigation_server_2d.cpp
@@ -31,11 +31,8 @@
 #include "navigation_server_2d.h"
 #include "navigation_server_2d.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/node.h" // IWYU pragma: keep. Needed to bind `Node *` arg.
+#include "scene/main/node.h"
 #include "servers/navigation_2d/navigation_server_2d_dummy.h"
 
 NavigationServer2D *NavigationServer2D::singleton = nullptr;
diff --git a/engine/servers/navigation_2d/navigation_server_2d.h b/engine/servers/navigation_2d/navigation_server_2d.h
index 8f933291..9b637d59 100644
--- a/engine/servers/navigation_2d/navigation_server_2d.h
+++ b/engine/servers/navigation_2d/navigation_server_2d.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "core/templates/rid_owner.h"
+#include "core/object/class_db.h"
+#include "core/templates/rid.h"
+
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
 #include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
-class Node;
-
 #ifdef CLIPPER2_ENABLED
 class NavMeshGenerator2D;
 #endif // CLIPPER2_ENABLED
diff --git a/engine/servers/navigation_3d/navigation_path_query_parameters_3d.cpp b/engine/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
index f7be656c..1e6947b4 100644
--- a/engine/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
+++ b/engine/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_path_query_parameters_3d.h"
 
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationPathQueryParameters3D::set_pathfinding_algorithm(const NavigationPathQueryParameters3D::PathfindingAlgorithm p_pathfinding_algorithm) {
diff --git a/engine/servers/navigation_3d/navigation_path_query_parameters_3d.h b/engine/servers/navigation_3d/navigation_path_query_parameters_3d.h
index 43ab6e48..760553b5 100644
--- a/engine/servers/navigation_3d/navigation_path_query_parameters_3d.h
+++ b/engine/servers/navigation_3d/navigation_path_query_parameters_3d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
 class NavigationPathQueryParameters3D : public RefCounted {
diff --git a/engine/servers/navigation_3d/navigation_path_query_result_3d.cpp b/engine/servers/navigation_3d/navigation_path_query_result_3d.cpp
index 247f1b23..dad81795 100644
--- a/engine/servers/navigation_3d/navigation_path_query_result_3d.cpp
+++ b/engine/servers/navigation_3d/navigation_path_query_result_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "navigation_path_query_result_3d.h"
 
-#include "core/object/class_db.h"
-
 void NavigationPathQueryResult3D::set_path(const Vector<Vector3> &p_path) {
 	path = p_path;
 }
diff --git a/engine/servers/navigation_3d/navigation_path_query_result_3d.h b/engine/servers/navigation_3d/navigation_path_query_result_3d.h
index cc2e4b0e..b73a16f3 100644
--- a/engine/servers/navigation_3d/navigation_path_query_result_3d.h
+++ b/engine/servers/navigation_3d/navigation_path_query_result_3d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
diff --git a/engine/servers/navigation_3d/navigation_server_3d.compat.inc b/engine/servers/navigation_3d/navigation_server_3d.compat.inc
index 250320be..633e4d5d 100644
--- a/engine/servers/navigation_3d/navigation_server_3d.compat.inc
+++ b/engine/servers/navigation_3d/navigation_server_3d.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "navigation_server_3d.h"
-
-#include "core/object/class_db.h"
-
 Vector<Vector3> NavigationServer3D::_map_get_path_bind_compat_100129(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers) const {
 	return const_cast<NavigationServer3D *>(this)->map_get_path(p_map, p_origin, p_destination, p_optimize, p_navigation_layers);
 }
diff --git a/engine/servers/navigation_3d/navigation_server_3d.cpp b/engine/servers/navigation_3d/navigation_server_3d.cpp
index 3b4f8cd1..ed0f05ef 100644
--- a/engine/servers/navigation_3d/navigation_server_3d.cpp
+++ b/engine/servers/navigation_3d/navigation_server_3d.cpp
@@ -31,11 +31,8 @@
 #include "navigation_server_3d.h"
 #include "navigation_server_3d.compat.inc"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "scene/main/node.h" // IWYU pragma: keep. Needed to bind `Node *` arg.
+#include "scene/main/node.h"
 #include "servers/navigation_3d/navigation_server_3d_dummy.h"
 
 NavigationServer3D *NavigationServer3D::singleton = nullptr;
@@ -256,23 +253,23 @@ NavigationServer3D::NavigationServer3D() {
 
 #ifdef DEBUG_ENABLED
 #ifndef DISABLE_DEPRECATED
-#define MOVE_PROJECT_SETTING_1(m_old_setting, m_new_setting) \
+#define MOVE_PROJECT_SETTING_1(m_old_setting, m_new_setting)                                                                             \
 	if (!ProjectSettings::get_singleton()->has_setting(m_new_setting) && ProjectSettings::get_singleton()->has_setting(m_old_setting)) { \
-		Variant value = GLOBAL_GET(m_old_setting); \
-		ProjectSettings::get_singleton()->set_setting(m_new_setting, value); \
-		ProjectSettings::get_singleton()->clear(m_old_setting); \
+		Variant value = GLOBAL_GET(m_old_setting);                                                                                       \
+		ProjectSettings::get_singleton()->set_setting(m_new_setting, value);                                                             \
+		ProjectSettings::get_singleton()->clear(m_old_setting);                                                                          \
 	}
-#define MOVE_PROJECT_SETTING_2(m_old_setting, m_new_setting_1, m_new_setting_2) \
+#define MOVE_PROJECT_SETTING_2(m_old_setting, m_new_setting_1, m_new_setting_2)                                                                 \
 	if ((!ProjectSettings::get_singleton()->has_setting(m_new_setting_1) || !ProjectSettings::get_singleton()->has_setting(m_new_setting_2)) && \
-			ProjectSettings::get_singleton()->has_setting(m_old_setting)) { \
-		Variant value = GLOBAL_GET(m_old_setting); \
-		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_1)) { \
-			ProjectSettings::get_singleton()->set_setting(m_new_setting_1, value); \
-		} \
-		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_2)) { \
-			ProjectSettings::get_singleton()->set_setting(m_new_setting_2, value); \
-		} \
-		ProjectSettings::get_singleton()->clear(m_old_setting); \
+			ProjectSettings::get_singleton()->has_setting(m_old_setting)) {                                                                     \
+		Variant value = GLOBAL_GET(m_old_setting);                                                                                              \
+		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_1)) {                                                                  \
+			ProjectSettings::get_singleton()->set_setting(m_new_setting_1, value);                                                              \
+		}                                                                                                                                       \
+		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_2)) {                                                                  \
+			ProjectSettings::get_singleton()->set_setting(m_new_setting_2, value);                                                              \
+		}                                                                                                                                       \
+		ProjectSettings::get_singleton()->clear(m_old_setting);                                                                                 \
 	}
 	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/edge_connection_color", "debug/shapes/navigation/2d/edge_connection_color", "debug/shapes/navigation/3d/edge_connection_color");
 	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/geometry_edge_color", "debug/shapes/navigation/2d/geometry_edge_color", "debug/shapes/navigation/3d/geometry_edge_color");
diff --git a/engine/servers/navigation_3d/navigation_server_3d.h b/engine/servers/navigation_3d/navigation_server_3d.h
index f886c563..cb02194a 100644
--- a/engine/servers/navigation_3d/navigation_server_3d.h
+++ b/engine/servers/navigation_3d/navigation_server_3d.h
@@ -30,14 +30,14 @@
 
 #pragma once
 
-#include "core/templates/rid_owner.h"
+#include "core/object/class_db.h"
+#include "core/templates/rid.h"
+
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
 #include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
-class Node;
-
 struct NavMeshGeometryParser3D {
 	RID self;
 	Callable callback;
diff --git a/engine/servers/physics_2d/physics_server_2d.compat.inc b/engine/servers/physics_2d/physics_server_2d.compat.inc
deleted file mode 100644
index 42dd9b4c..00000000
--- a/engine/servers/physics_2d/physics_server_2d.compat.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************/
-/*  physics_server_2d.compat.inc                                          */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef DISABLE_DEPRECATED
-
-#include "physics_server_2d.h"
-
-#include "core/object/class_db.h"
-
-void PhysicsServer2D::_body_set_shape_as_one_way_collision_bind_compat_104736(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin) {
-	body_set_shape_as_one_way_collision(p_body, p_shape_idx, p_enable, p_margin, Vector2(0, 1));
-}
-
-void PhysicsServer2D::_bind_compatibility_methods() {
-	ClassDB::bind_compatibility_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin"), &PhysicsServer2D::_body_set_shape_as_one_way_collision_bind_compat_104736);
-}
-
-#endif // DISABLE_DEPRECATED
diff --git a/engine/servers/physics_2d/physics_server_2d.cpp b/engine/servers/physics_2d/physics_server_2d.cpp
index 56cd195f..9f4870a3 100644
--- a/engine/servers/physics_2d/physics_server_2d.cpp
+++ b/engine/servers/physics_2d/physics_server_2d.cpp
@@ -29,10 +29,8 @@
 /**************************************************************************/
 
 #include "physics_server_2d.h"
-#include "physics_server_2d.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 PhysicsServer2D *PhysicsServer2D::singleton = nullptr;
@@ -706,7 +704,7 @@ void PhysicsServer2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("body_clear_shapes", "body"), &PhysicsServer2D::body_clear_shapes);
 
 	ClassDB::bind_method(D_METHOD("body_set_shape_disabled", "body", "shape_idx", "disabled"), &PhysicsServer2D::body_set_shape_disabled);
-	ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin", "direction"), &PhysicsServer2D::body_set_shape_as_one_way_collision, Vector2(0, 1));
+	ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin"), &PhysicsServer2D::body_set_shape_as_one_way_collision);
 
 	ClassDB::bind_method(D_METHOD("body_attach_object_instance_id", "body", "id"), &PhysicsServer2D::body_attach_object_instance_id);
 	ClassDB::bind_method(D_METHOD("body_get_object_instance_id", "body"), &PhysicsServer2D::body_get_object_instance_id);
diff --git a/engine/servers/physics_2d/physics_server_2d.h b/engine/servers/physics_2d/physics_server_2d.h
index d185fcd2..3a9d8d4e 100644
--- a/engine/servers/physics_2d/physics_server_2d.h
+++ b/engine/servers/physics_2d/physics_server_2d.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 
 constexpr int MAX_CONTACTS_REPORTED_2D_MAX = 4096;
@@ -220,11 +221,6 @@ class PhysicsServer2D : public Object {
 protected:
 	static void _bind_methods();
 
-#ifndef DISABLE_DEPRECATED
-	void _body_set_shape_as_one_way_collision_bind_compat_104736(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin);
-	static void _bind_compatibility_methods();
-#endif
-
 public:
 	static PhysicsServer2D *get_singleton();
 
@@ -384,7 +380,7 @@ public:
 	virtual Transform2D body_get_shape_transform(RID p_body, int p_shape_idx) const = 0;
 
 	virtual void body_set_shape_disabled(RID p_body, int p_shape, bool p_disabled) = 0;
-	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape, bool p_enabled, real_t p_margin = 0, const Vector2 &p_direction = Vector2(0, 1)) = 0;
+	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape, bool p_enabled, real_t p_margin = 0) = 0;
 
 	virtual void body_remove_shape(RID p_body, int p_shape_idx) = 0;
 	virtual void body_clear_shapes(RID p_body) = 0;
diff --git a/engine/servers/physics_2d/physics_server_2d_dummy.h b/engine/servers/physics_2d/physics_server_2d_dummy.h
index 340e10df..1f0b7f71 100644
--- a/engine/servers/physics_2d/physics_server_2d_dummy.h
+++ b/engine/servers/physics_2d/physics_server_2d_dummy.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/physics_2d/physics_server_2d.h"
+#include "physics_server_2d.h"
 
 class PhysicsDirectBodyState2DDummy : public PhysicsDirectBodyState2D {
 	GDCLASS(PhysicsDirectBodyState2DDummy, PhysicsDirectBodyState2D);
@@ -227,7 +227,7 @@ public:
 	virtual Transform2D body_get_shape_transform(RID p_body, int p_shape_idx) const override { return Transform2D(); }
 
 	virtual void body_set_shape_disabled(RID p_body, int p_shape, bool p_disabled) override {}
-	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape, bool p_enabled, real_t p_margin = 0, const Vector2 &p_direction = Vector2(0, 1)) override {}
+	virtual void body_set_shape_as_one_way_collision(RID p_body, int p_shape, bool p_enabled, real_t p_margin = 0) override {}
 
 	virtual void body_remove_shape(RID p_body, int p_shape_idx) override {}
 	virtual void body_clear_shapes(RID p_body) override {}
diff --git a/engine/servers/physics_2d/physics_server_2d_extension.cpp b/engine/servers/physics_2d/physics_server_2d_extension.cpp
index 0fad8384..ea4e229e 100644
--- a/engine/servers/physics_2d/physics_server_2d_extension.cpp
+++ b/engine/servers/physics_2d/physics_server_2d_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "physics_server_2d_extension.h"
 
-#include "core/object/class_db.h"
-
 bool PhysicsDirectSpaceState2DExtension::is_body_excluded_from_query(const RID &p_body) const {
 	return exclude && exclude->has(p_body);
 }
@@ -234,7 +232,7 @@ void PhysicsServer2DExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_body_get_shape_transform, "body", "shape_idx");
 
 	GDVIRTUAL_BIND(_body_set_shape_disabled, "body", "shape_idx", "disabled");
-	GDVIRTUAL_BIND(_body_set_shape_as_one_way_collision, "body", "shape_idx", "enable", "margin", "direction");
+	GDVIRTUAL_BIND(_body_set_shape_as_one_way_collision, "body", "shape_idx", "enable", "margin");
 
 	GDVIRTUAL_BIND(_body_remove_shape, "body", "shape_idx");
 	GDVIRTUAL_BIND(_body_clear_shapes, "body");
@@ -350,10 +348,6 @@ void PhysicsServer2DExtension::_bind_methods() {
 
 	GDVIRTUAL_BIND(_is_flushing_queries);
 	GDVIRTUAL_BIND(_get_process_info, "process_info");
-
-#ifndef DISABLE_DEPRECATED
-	GDVIRTUAL_BIND_COMPAT(_body_set_shape_as_one_way_collision_bind_compat_104736, "body", "shape_idx", "enable", "margin");
-#endif
 }
 
 PhysicsServer2DExtension::PhysicsServer2DExtension() {
diff --git a/engine/servers/physics_2d/physics_server_2d_extension.h b/engine/servers/physics_2d/physics_server_2d_extension.h
index 788b3160..1145ec9f 100644
--- a/engine/servers/physics_2d/physics_server_2d_extension.h
+++ b/engine/servers/physics_2d/physics_server_2d_extension.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/extension/ext_wrappers.gen.inc"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
 #include "servers/physics_2d/physics_server_2d.h"
@@ -199,10 +199,6 @@ protected:
 
 	GDVIRTUAL8R_REQUIRED(bool, _body_collide_shape, RID, int, RID, const Transform2D &, const Vector2 &, GDExtensionPtr<Vector2>, int, GDExtensionPtr<int>)
 
-#ifndef DISABLE_DEPRECATED
-	GDVIRTUAL4_COMPAT(_body_set_shape_as_one_way_collision_bind_compat_104736, _body_set_shape_as_one_way_collision, RID, int, bool, real_t)
-#endif
-
 public:
 	// The warning is valid, but unavoidable. If the function is not overridden it will error anyway.
 
@@ -309,7 +305,7 @@ public:
 	EXBIND2RC(Transform2D, body_get_shape_transform, RID, int)
 
 	EXBIND3(body_set_shape_disabled, RID, int, bool)
-	EXBIND5(body_set_shape_as_one_way_collision, RID, int, bool, real_t, const Vector2 &)
+	EXBIND4(body_set_shape_as_one_way_collision, RID, int, bool, real_t)
 
 	EXBIND2(body_remove_shape, RID, int)
 	EXBIND1(body_clear_shapes, RID)
diff --git a/engine/servers/physics_2d/physics_server_2d_wrap_mt.cpp b/engine/servers/physics_2d/physics_server_2d_wrap_mt.cpp
index 33cbbc64..b6f09684 100644
--- a/engine/servers/physics_2d/physics_server_2d_wrap_mt.cpp
+++ b/engine/servers/physics_2d/physics_server_2d_wrap_mt.cpp
@@ -30,8 +30,6 @@
 
 #include "physics_server_2d_wrap_mt.h"
 
-#include "core/object/callable_mp.h"
-
 void PhysicsServer2DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;
diff --git a/engine/servers/physics_2d/physics_server_2d_wrap_mt.h b/engine/servers/physics_2d/physics_server_2d_wrap_mt.h
index 7f0c39c3..194d548c 100644
--- a/engine/servers/physics_2d/physics_server_2d_wrap_mt.h
+++ b/engine/servers/physics_2d/physics_server_2d_wrap_mt.h
@@ -53,13 +53,6 @@
 #endif
 #endif
 
-#define ServerName PhysicsServer2D
-#define ServerNameWrapMT PhysicsServer2DWrapMT
-#define server_name physics_server_2d
-#define WRITE_ACTION
-
-#include "servers/server_wrap_mt_common.h"
-
 class PhysicsServer2DWrapMT : public PhysicsServer2D {
 	GDSOFTCLASS(PhysicsServer2DWrapMT, PhysicsServer2D);
 
@@ -79,6 +72,13 @@ class PhysicsServer2DWrapMT : public PhysicsServer2D {
 	void _thread_sync();
 
 public:
+#define ServerName PhysicsServer2D
+#define ServerNameWrapMT PhysicsServer2DWrapMT
+#define server_name physics_server_2d
+#define WRITE_ACTION
+
+#include "servers/server_wrap_mt_common.h"
+
 	//FUNC1RID(shape,ShapeType); todo fix
 	FUNCRID(world_boundary_shape)
 	FUNCRID(separation_ray_shape)
@@ -191,7 +191,7 @@ public:
 	FUNC2RC(RID, body_get_shape, RID, int);
 
 	FUNC3(body_set_shape_disabled, RID, int, bool);
-	FUNC5(body_set_shape_as_one_way_collision, RID, int, bool, real_t, const Vector2 &);
+	FUNC4(body_set_shape_as_one_way_collision, RID, int, bool, real_t);
 
 	FUNC2(body_remove_shape, RID, int);
 	FUNC1(body_clear_shapes, RID);
diff --git a/engine/servers/physics_3d/physics_server_3d.cpp b/engine/servers/physics_3d/physics_server_3d.cpp
index 67dee00f..b1e0905c 100644
--- a/engine/servers/physics_3d/physics_server_3d.cpp
+++ b/engine/servers/physics_3d/physics_server_3d.cpp
@@ -31,7 +31,6 @@
 #include "physics_server_3d.h"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void PhysicsServer3DRenderingServerHandler::set_vertex(int p_vertex_id, const Vector3 &p_vertex) {
diff --git a/engine/servers/physics_3d/physics_server_3d.h b/engine/servers/physics_3d/physics_server_3d.h
index 3738c1ee..77536d60 100644
--- a/engine/servers/physics_3d/physics_server_3d.h
+++ b/engine/servers/physics_3d/physics_server_3d.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 
 constexpr int MAX_CONTACTS_REPORTED_3D_MAX = 4096;
 
diff --git a/engine/servers/physics_3d/physics_server_3d_extension.cpp b/engine/servers/physics_3d/physics_server_3d_extension.cpp
index d753aa39..f630b093 100644
--- a/engine/servers/physics_3d/physics_server_3d_extension.cpp
+++ b/engine/servers/physics_3d/physics_server_3d_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "physics_server_3d_extension.h"
 
-#include "core/object/class_db.h"
-
 bool PhysicsDirectSpaceState3DExtension::is_body_excluded_from_query(const RID &p_body) const {
 	return exclude && exclude->has(p_body);
 }
diff --git a/engine/servers/physics_3d/physics_server_3d_extension.h b/engine/servers/physics_3d/physics_server_3d_extension.h
index 086208e7..de7e2571 100644
--- a/engine/servers/physics_3d/physics_server_3d_extension.h
+++ b/engine/servers/physics_3d/physics_server_3d_extension.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/extension/ext_wrappers.gen.h"
+#include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
diff --git a/engine/servers/physics_3d/physics_server_3d_wrap_mt.cpp b/engine/servers/physics_3d/physics_server_3d_wrap_mt.cpp
index 376ab69e..744b5510 100644
--- a/engine/servers/physics_3d/physics_server_3d_wrap_mt.cpp
+++ b/engine/servers/physics_3d/physics_server_3d_wrap_mt.cpp
@@ -30,8 +30,6 @@
 
 #include "physics_server_3d_wrap_mt.h"
 
-#include "core/object/callable_mp.h"
-
 void PhysicsServer3DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;
diff --git a/engine/servers/physics_3d/physics_server_3d_wrap_mt.h b/engine/servers/physics_3d/physics_server_3d_wrap_mt.h
index 9912eb3d..b0c15424 100644
--- a/engine/servers/physics_3d/physics_server_3d_wrap_mt.h
+++ b/engine/servers/physics_3d/physics_server_3d_wrap_mt.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
@@ -53,13 +54,6 @@
 #endif
 #endif
 
-#define ServerName PhysicsServer3D
-#define ServerNameWrapMT PhysicsServer3DWrapMT
-#define server_name physics_server_3d
-#define WRITE_ACTION
-
-#include "servers/server_wrap_mt_common.h"
-
 class PhysicsServer3DWrapMT : public PhysicsServer3D {
 	GDSOFTCLASS(PhysicsServer3DWrapMT, PhysicsServer3D);
 
@@ -80,6 +74,13 @@ class PhysicsServer3DWrapMT : public PhysicsServer3D {
 	void _thread_sync();
 
 public:
+#define ServerName PhysicsServer3D
+#define ServerNameWrapMT PhysicsServer3DWrapMT
+#define server_name physics_server_3d
+#define WRITE_ACTION
+
+#include "servers/server_wrap_mt_common.h"
+
 	//FUNC1RID(shape,ShapeType); todo fix
 	FUNCRID(world_boundary_shape)
 	FUNCRID(separation_ray_shape)
@@ -413,12 +414,12 @@ public:
 
 	PhysicsServer3DWrapMT(PhysicsServer3D *p_contained, bool p_create_thread);
 	~PhysicsServer3DWrapMT();
-};
 
 #undef ServerNameWrapMT
 #undef ServerName
 #undef server_name
 #undef WRITE_ACTION
+};
 
 #ifdef DEBUG_SYNC
 #undef DEBUG_SYNC
diff --git a/engine/servers/register_server_types.cpp b/engine/servers/register_server_types.cpp
index 4169c8da..bee17012 100644
--- a/engine/servers/register_server_types.cpp
+++ b/engine/servers/register_server_types.cpp
@@ -32,56 +32,52 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/os/os.h"
-#include "servers/audio/audio_effect.h"
-#include "servers/audio/audio_server.h"
-#include "servers/audio/audio_stream.h"
-#include "servers/audio/effects/audio_effect_amplify.h"
-#include "servers/audio/effects/audio_effect_capture.h"
-#include "servers/audio/effects/audio_effect_chorus.h"
-#include "servers/audio/effects/audio_effect_compressor.h"
-#include "servers/audio/effects/audio_effect_delay.h"
-#include "servers/audio/effects/audio_effect_distortion.h"
-#include "servers/audio/effects/audio_effect_eq.h"
-#include "servers/audio/effects/audio_effect_filter.h"
-#include "servers/audio/effects/audio_effect_hard_limiter.h"
-#include "servers/audio/effects/audio_effect_panner.h"
-#include "servers/audio/effects/audio_effect_phaser.h"
-#include "servers/audio/effects/audio_effect_pitch_shift.h"
-#include "servers/audio/effects/audio_effect_record.h"
-#include "servers/audio/effects/audio_effect_reverb.h"
-#include "servers/audio/effects/audio_effect_spectrum_analyzer.h"
-#include "servers/audio/effects/audio_effect_stereo_enhance.h"
-#include "servers/audio/effects/audio_stream_generator.h"
-#include "servers/camera/camera_feed.h"
-#include "servers/camera/camera_server.h"
-#include "servers/debugger/servers_debugger.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/display/display_server.h"
-#include "servers/display/native_menu.h"
-#include "servers/movie_writer/movie_writer.h"
-#include "servers/movie_writer/movie_writer_pngwav.h"
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_data_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/shader_include_db.h"
-#include "servers/rendering/shader_types.h"
-#include "servers/rendering/storage/render_data.h"
-#include "servers/rendering/storage/render_data_extension.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
-#include "servers/rendering/storage/render_scene_data.h"
-#include "servers/text/text_server.h"
-#include "servers/text/text_server_dummy.h"
-#include "servers/text/text_server_extension.h"
 
+#include "audio/audio_effect.h"
+#include "audio/audio_server.h"
+#include "audio/audio_stream.h"
+#include "audio/effects/audio_effect_amplify.h"
+#include "audio/effects/audio_effect_capture.h"
+#include "audio/effects/audio_effect_chorus.h"
+#include "audio/effects/audio_effect_compressor.h"
+#include "audio/effects/audio_effect_delay.h"
+#include "audio/effects/audio_effect_distortion.h"
+#include "audio/effects/audio_effect_eq.h"
+#include "audio/effects/audio_effect_filter.h"
+#include "audio/effects/audio_effect_hard_limiter.h"
+#include "audio/effects/audio_effect_panner.h"
+#include "audio/effects/audio_effect_phaser.h"
+#include "audio/effects/audio_effect_pitch_shift.h"
+#include "audio/effects/audio_effect_record.h"
+#include "audio/effects/audio_effect_reverb.h"
+#include "audio/effects/audio_effect_spectrum_analyzer.h"
+#include "audio/effects/audio_effect_stereo_enhance.h"
+#include "audio/effects/audio_stream_generator.h"
+#include "camera/camera_feed.h"
+#include "camera/camera_server.h"
+#include "debugger/servers_debugger.h"
+#include "display/display_server.h"
+#include "display/native_menu.h"
+#include "movie_writer/movie_writer.h"
+#include "movie_writer/movie_writer_pngwav.h"
+#include "rendering/renderer_rd/framebuffer_cache_rd.h"
+#include "rendering/renderer_rd/storage_rd/render_data_rd.h"
+#include "rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
+#include "rendering/renderer_rd/storage_rd/render_scene_data_rd.h"
+#include "rendering/renderer_rd/uniform_set_cache_rd.h"
+#include "rendering/rendering_device.h"
+#include "rendering/rendering_device_binds.h"
+#include "rendering/rendering_server.h"
+#include "rendering/shader_include_db.h"
+#include "rendering/storage/render_data.h"
+#include "rendering/storage/render_scene_buffers.h"
+#include "rendering/storage/render_scene_data.h"
+#include "servers/rendering/shader_types.h"
+#include "text/text_server.h"
+#include "text/text_server_dummy.h"
+#include "text/text_server_extension.h"
 #ifndef DISABLE_DEPRECATED
-#include "servers/audio/effects/audio_effect_limiter.h"
+#include "audio/effects/audio_effect_limiter.h"
 #endif
 
 // 2D physics and navigation.
@@ -103,18 +99,15 @@
 #include "servers/physics_3d/physics_server_3d_dummy.h"
 #include "servers/physics_3d/physics_server_3d_extension.h"
 #endif // PHYSICS_3D_DISABLED
-
-// XR
 #ifndef XR_DISABLED
-#include "servers/xr/xr_body_tracker.h"
-#include "servers/xr/xr_controller_tracker.h"
-#include "servers/xr/xr_face_tracker.h"
-#include "servers/xr/xr_hand_tracker.h"
-#include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_interface_extension.h"
-#include "servers/xr/xr_positional_tracker.h"
-#include "servers/xr/xr_server.h"
-#include "servers/xr/xr_vrs.h"
+#include "xr/xr_body_tracker.h"
+#include "xr/xr_controller_tracker.h"
+#include "xr/xr_face_tracker.h"
+#include "xr/xr_hand_tracker.h"
+#include "xr/xr_interface.h"
+#include "xr/xr_interface_extension.h"
+#include "xr/xr_positional_tracker.h"
+#include "xr/xr_server.h"
 #endif // XR_DISABLED
 
 ShaderTypes *shader_types = nullptr;
@@ -160,7 +153,6 @@ void register_server_types() {
 
 	OS::get_singleton()->set_has_server_feature_callback(has_server_feature_callback);
 
-	GDREGISTER_ABSTRACT_CLASS(AccessibilityServer);
 	GDREGISTER_ABSTRACT_CLASS(DisplayServer);
 	GDREGISTER_ABSTRACT_CLASS(RenderingServer);
 	GDREGISTER_CLASS(AudioServer);
@@ -245,7 +237,6 @@ void register_server_types() {
 	GDREGISTER_CLASS(RDShaderSPIRV);
 	GDREGISTER_CLASS(RDShaderFile);
 	GDREGISTER_CLASS(RDPipelineSpecializationConstant);
-	GDREGISTER_CLASS(RDAccelerationStructureGeometry);
 
 	GDREGISTER_ABSTRACT_CLASS(RenderData);
 	GDREGISTER_CLASS(RenderDataExtension);
@@ -390,7 +381,6 @@ void unregister_server_types() {
 void register_server_singletons() {
 	OS::get_singleton()->benchmark_begin_measure("Servers", "Register Singletons");
 
-	Engine::get_singleton()->add_singleton(Engine::Singleton("AccessibilityServer", AccessibilityServer::get_singleton(), "AccessibilityServer"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton(), "AudioServer"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("CameraServer", CameraServer::get_singleton(), "CameraServer"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("DisplayServer", DisplayServer::get_singleton(), "DisplayServer"));
diff --git a/engine/servers/rendering/dummy/environment/fog.h b/engine/servers/rendering/dummy/environment/fog.h
index bef65500..792faf2a 100644
--- a/engine/servers/rendering/dummy/environment/fog.h
+++ b/engine/servers/rendering/dummy/environment/fog.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "core/math/aabb.h"
-#include "core/templates/rid.h"
 #include "servers/rendering/environment/renderer_fog.h"
 
 namespace RendererDummy {
@@ -44,11 +42,11 @@ public:
 	virtual void fog_volume_initialize(RID p_rid) override {}
 	virtual void fog_volume_free(RID p_rid) override {}
 
-	virtual void fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) override {}
+	virtual void fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) override {}
 	virtual void fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) override {}
 	virtual void fog_volume_set_material(RID p_fog_volume, RID p_material) override {}
 	virtual AABB fog_volume_get_aabb(RID p_fog_volume) const override { return AABB(); }
-	virtual RSE::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override { return RSE::FOG_VOLUME_SHAPE_BOX; }
+	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override { return RS::FOG_VOLUME_SHAPE_BOX; }
 };
 
 } // namespace RendererDummy
diff --git a/engine/servers/rendering/dummy/environment/gi.h b/engine/servers/rendering/dummy/environment/gi.h
index 944749aa..ad549bac 100644
--- a/engine/servers/rendering/dummy/environment/gi.h
+++ b/engine/servers/rendering/dummy/environment/gi.h
@@ -30,10 +30,6 @@
 
 #pragma once
 
-#include "core/math/aabb.h"
-#include "core/math/transform_3d.h"
-#include "core/math/vector3i.h"
-#include "core/templates/rid.h"
 #include "servers/rendering/environment/renderer_gi.h"
 
 namespace RendererDummy {
diff --git a/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h b/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
index 98cf58c2..7f4c8a14 100644
--- a/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
@@ -37,7 +37,7 @@ public:
 	PolygonID request_polygon(const Vector<int> &p_indices, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), const Vector<int> &p_bones = Vector<int>(), const Vector<float> &p_weights = Vector<float>(), int p_count = -1) override { return 0; }
 	void free_polygon(PolygonID p_polygon) override {}
 
-	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info = nullptr) override {}
+	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info = nullptr) override {}
 
 	RID light_create() override { return RID(); }
 	void light_set_texture(RID p_rid, RID p_texture) override {}
@@ -48,14 +48,14 @@ public:
 	void render_sdf(RID p_render_target, LightOccluderInstance *p_occluders) override {}
 	RID occluder_polygon_create() override { return RID(); }
 	void occluder_polygon_set_shape(RID p_occluder, const Vector<Vector2> &p_points, bool p_closed) override {}
-	void occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) override {}
+	void occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) override {}
 	void set_shadow_texture_size(int p_size) override {}
 
 	bool free(RID p_rid) override { return true; }
 	void update() override {}
 
 	virtual void set_debug_redraw(bool p_enabled, double p_time, const Color &p_color) override {}
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override { return 0; }
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override { return 0; }
 
 	RasterizerCanvasDummy() {}
 	~RasterizerCanvasDummy() {}
diff --git a/engine/servers/rendering/dummy/rasterizer_dummy.cpp b/engine/servers/rendering/dummy/rasterizer_dummy.cpp
deleted file mode 100644
index 83f49086..00000000
--- a/engine/servers/rendering/dummy/rasterizer_dummy.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**************************************************************************/
-/*  rasterizer_dummy.cpp                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "rasterizer_dummy.h"
-
-#include "servers/display/display_server.h"
-#include "servers/rendering/dummy/environment/fog.h"
-#include "servers/rendering/dummy/environment/gi.h"
-#include "servers/rendering/dummy/rasterizer_canvas_dummy.h"
-#include "servers/rendering/dummy/rasterizer_scene_dummy.h"
-#include "servers/rendering/dummy/storage/light_storage.h"
-#include "servers/rendering/dummy/storage/material_storage.h"
-#include "servers/rendering/dummy/storage/mesh_storage.h"
-#include "servers/rendering/dummy/storage/particles_storage.h"
-#include "servers/rendering/dummy/storage/texture_storage.h"
-#include "servers/rendering/dummy/storage/utilities.h"
-
-void RasterizerDummy::end_frame(bool p_present) {
-	if (p_present) {
-		DisplayServer::get_singleton()->swap_buffers();
-	}
-}
-
-RendererCanvasRender *RasterizerDummy::get_canvas() {
-	return canvas;
-}
-RendererSceneRender *RasterizerDummy::get_scene() {
-	return scene;
-}
-
-RendererFog *RasterizerDummy::get_fog() {
-	return fog;
-}
-RendererGI *RasterizerDummy::get_gi() {
-	return gi;
-}
-RendererLightStorage *RasterizerDummy::get_light_storage() {
-	return light_storage;
-}
-RendererMaterialStorage *RasterizerDummy::get_material_storage() {
-	return material_storage;
-}
-RendererMeshStorage *RasterizerDummy::get_mesh_storage() {
-	return mesh_storage;
-}
-RendererParticlesStorage *RasterizerDummy::get_particles_storage() {
-	return particles_storage;
-}
-RendererTextureStorage *RasterizerDummy::get_texture_storage() {
-	return texture_storage;
-}
-RendererUtilities *RasterizerDummy::get_utilities() {
-	return utilities;
-}
-
-RasterizerDummy::RasterizerDummy() {
-	canvas = memnew(RasterizerCanvasDummy);
-	scene = memnew(RasterizerSceneDummy);
-
-	fog = memnew(RendererDummy::Fog);
-	gi = memnew(RendererDummy::GI);
-	light_storage = memnew(RendererDummy::LightStorage);
-	material_storage = memnew(RendererDummy::MaterialStorage);
-	mesh_storage = memnew(RendererDummy::MeshStorage);
-	particles_storage = memnew(RendererDummy::ParticlesStorage);
-	texture_storage = memnew(RendererDummy::TextureStorage);
-	utilities = memnew(RendererDummy::Utilities);
-}
-
-RasterizerDummy::~RasterizerDummy() {
-	memdelete(canvas);
-	memdelete(scene);
-
-	memdelete(fog);
-	memdelete(gi);
-	memdelete(light_storage);
-	memdelete(material_storage);
-	memdelete(mesh_storage);
-	memdelete(particles_storage);
-	memdelete(texture_storage);
-	memdelete(utilities);
-}
diff --git a/engine/servers/rendering/dummy/rasterizer_dummy.h b/engine/servers/rendering/dummy/rasterizer_dummy.h
index 397fc236..8ac89574 100644
--- a/engine/servers/rendering/dummy/rasterizer_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_dummy.h
@@ -30,22 +30,21 @@
 
 #pragma once
 
+#include "core/templates/rid_owner.h"
+#include "core/templates/self_list.h"
+#include "scene/resources/mesh.h"
+#include "servers/rendering/dummy/environment/fog.h"
+#include "servers/rendering/dummy/environment/gi.h"
+#include "servers/rendering/dummy/rasterizer_canvas_dummy.h"
+#include "servers/rendering/dummy/rasterizer_scene_dummy.h"
+#include "servers/rendering/dummy/storage/light_storage.h"
+#include "servers/rendering/dummy/storage/material_storage.h"
+#include "servers/rendering/dummy/storage/mesh_storage.h"
+#include "servers/rendering/dummy/storage/particles_storage.h"
+#include "servers/rendering/dummy/storage/texture_storage.h"
+#include "servers/rendering/dummy/storage/utilities.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/rendering_server_enums.h"
-
-class RasterizerCanvasDummy;
-class RasterizerSceneDummy;
-
-namespace RendererDummy {
-class Fog;
-class GI;
-class LightStorage;
-class MaterialStorage;
-class MeshStorage;
-class ParticlesStorage;
-class TextureStorage;
-class Utilities;
-} //namespace RendererDummy
+#include "servers/rendering/rendering_server.h"
 
 class RasterizerDummy : public RendererCompositor {
 private:
@@ -54,32 +53,31 @@ private:
 	double time = 0.0;
 
 protected:
-	RasterizerCanvasDummy *canvas = nullptr;
-	RasterizerSceneDummy *scene = nullptr;
-
-	RendererDummy::Fog *fog = nullptr;
-	RendererDummy::GI *gi = nullptr;
-	RendererDummy::LightStorage *light_storage = nullptr;
-	RendererDummy::MaterialStorage *material_storage = nullptr;
-	RendererDummy::MeshStorage *mesh_storage = nullptr;
-	RendererDummy::ParticlesStorage *particles_storage = nullptr;
-	RendererDummy::TextureStorage *texture_storage = nullptr;
-	RendererDummy::Utilities *utilities = nullptr;
+	RasterizerCanvasDummy canvas;
+	RendererDummy::Utilities utilities;
+	RendererDummy::LightStorage light_storage;
+	RendererDummy::MaterialStorage material_storage;
+	RendererDummy::MeshStorage mesh_storage;
+	RendererDummy::ParticlesStorage particles_storage;
+	RendererDummy::TextureStorage texture_storage;
+	RendererDummy::GI gi;
+	RendererDummy::Fog fog;
+	RasterizerSceneDummy scene;
 
 public:
-	RendererCanvasRender *get_canvas() override;
-	RendererSceneRender *get_scene() override;
+	RendererUtilities *get_utilities() override { return &utilities; }
+	RendererLightStorage *get_light_storage() override { return &light_storage; }
+	RendererMaterialStorage *get_material_storage() override { return &material_storage; }
+	RendererMeshStorage *get_mesh_storage() override { return &mesh_storage; }
+	RendererParticlesStorage *get_particles_storage() override { return &particles_storage; }
+	RendererTextureStorage *get_texture_storage() override { return &texture_storage; }
+	RendererGI *get_gi() override { return &gi; }
+	RendererFog *get_fog() override { return &fog; }
+	RendererCanvasRender *get_canvas() override { return &canvas; }
+	RendererSceneRender *get_scene() override { return &scene; }
 
-	RendererFog *get_fog() override;
-	RendererGI *get_gi() override;
-	RendererLightStorage *get_light_storage() override;
-	RendererMaterialStorage *get_material_storage() override;
-	RendererMeshStorage *get_mesh_storage() override;
-	RendererParticlesStorage *get_particles_storage() override;
-	RendererTextureStorage *get_texture_storage() override;
-	RendererUtilities *get_utilities() override;
-
-	void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter = true) override {}
+	void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter = true) override {}
+	void set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter = true) override {}
 
 	void initialize() override {}
 	void begin_frame(double frame_step) override {
@@ -88,12 +86,16 @@ public:
 		time += frame_step;
 	}
 
-	void blit_render_targets_to_screen(int p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount) override {}
+	void blit_render_targets_to_screen(int p_screen, const BlitToScreen *p_render_targets, int p_amount) override {}
 
 	bool is_opengl() override { return false; }
 	void gl_end_frame(bool p_swap_buffers) override {}
 
-	void end_frame(bool p_present) override;
+	void end_frame(bool p_present) override {
+		if (p_present) {
+			DisplayServer::get_singleton()->swap_buffers();
+		}
+	}
 
 	void finalize() override {}
 
@@ -111,6 +113,6 @@ public:
 	double get_total_time() const override { return time; }
 	bool can_create_resources_async() const override { return false; }
 
-	RasterizerDummy();
-	~RasterizerDummy();
+	RasterizerDummy() {}
+	~RasterizerDummy() {}
 };
diff --git a/engine/servers/rendering/dummy/rasterizer_scene_dummy.cpp b/engine/servers/rendering/dummy/rasterizer_scene_dummy.cpp
deleted file mode 100644
index 3b79e672..00000000
--- a/engine/servers/rendering/dummy/rasterizer_scene_dummy.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************/
-/*  rasterizer_scene_dummy.cpp                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "rasterizer_scene_dummy.h"
-
-#include "core/io/image.h"
-#include "core/variant/typed_array.h"
-#include "servers/rendering/rendering_server_globals.h"
-
-TypedArray<Image> RasterizerSceneDummy::bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) {
-	return TypedArray<Image>();
-}
-
-bool RasterizerSceneDummy::free(RID p_rid) {
-	if (is_environment(p_rid)) {
-		environment_free(p_rid);
-		return true;
-	} else if (is_compositor(p_rid)) {
-		compositor_free(p_rid);
-		return true;
-	} else if (is_compositor_effect(p_rid)) {
-		compositor_effect_free(p_rid);
-		return true;
-	} else if (RSG::camera_attributes->owns_camera_attributes(p_rid)) {
-		RSG::camera_attributes->camera_attributes_free(p_rid);
-		return true;
-	} else {
-		return false;
-	}
-}
diff --git a/engine/servers/rendering/dummy/rasterizer_scene_dummy.h b/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
index 19b6b4f1..ad255124 100644
--- a/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
@@ -31,13 +31,9 @@
 #pragma once
 
 #include "core/templates/paged_allocator.h"
-#include "servers/rendering/dummy/storage/utilities.h"
 #include "servers/rendering/renderer_scene_render.h"
-
-class Image;
-
-template <typename T>
-class TypedArray;
+#include "servers/rendering/rendering_server_globals.h"
+#include "storage/utilities.h"
 
 class RasterizerSceneDummy : public RendererSceneRender {
 public:
@@ -70,8 +66,7 @@ public:
 		virtual Transform3D get_transform() override { return Transform3D(); }
 		virtual AABB get_aabb() override { return AABB(); }
 
-		virtual void clear_light_instances() override {}
-		virtual void pair_light_instance(const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) override {}
+		virtual void pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) override {}
 		virtual void pair_reflection_probe_instances(const RID *p_reflection_probe_instances, uint32_t p_reflection_probe_instance_count) override {}
 		virtual void pair_decal_instances(const RID *p_decal_instances, uint32_t p_decal_instance_count) override {}
 		virtual void pair_voxel_gi_instances(const RID *p_voxel_gi_instances, uint32_t p_voxel_gi_instance_count) override {}
@@ -83,8 +78,8 @@ public:
 
 public:
 	RenderGeometryInstance *geometry_instance_create(RID p_base) override {
-		RSE::InstanceType type = RendererDummy::Utilities::get_singleton()->get_base_type(p_base);
-		ERR_FAIL_COND_V(!((1 << type) & RSE::INSTANCE_GEOMETRY_MASK), nullptr);
+		RS::InstanceType type = RendererDummy::Utilities::get_singleton()->get_base_type(p_base);
+		ERR_FAIL_COND_V(!((1 << type) & RS::INSTANCE_GEOMETRY_MASK), nullptr);
 
 		GeometryInstanceDummy *ginstance = geometry_instance_alloc.alloc();
 
@@ -100,13 +95,10 @@ public:
 
 	uint32_t geometry_instance_get_pair_mask() override { return 0; }
 
-	virtual uint32_t get_max_lights_total() override { return 0; }
-	virtual uint32_t get_max_lights_per_mesh() override { return 0; }
-
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) override {}
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override { return 0; }
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override { return 0; }
 
 	/* SDFGI UPDATE */
 
@@ -120,7 +112,7 @@ public:
 	RID sky_allocate() override { return RID(); }
 	void sky_initialize(RID p_rid) override {}
 	void sky_set_radiance_size(RID p_sky, int p_radiance_size) override {}
-	void sky_set_mode(RID p_sky, RSE::SkyMode p_samples) override {}
+	void sky_set_mode(RID p_sky, RS::SkyMode p_samples) override {}
 	void sky_set_material(RID p_sky, RID p_material) override {}
 	Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) override { return Ref<Image>(); }
 
@@ -129,23 +121,23 @@ public:
 	void environment_glow_set_use_bicubic_upscale(bool p_enable) override {}
 
 	void environment_set_ssr_half_size(bool p_half_size) override {}
-	void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) override {}
+	void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override {}
 
-	void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
+	void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
 
-	void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
+	void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
 
-	void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) override {}
-	void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) override {}
-	void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) override {}
+	void environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) override {}
+	void environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) override {}
+	void environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) override {}
 
 	void environment_set_volumetric_fog_volume_size(int p_size, int p_depth) override {}
 	void environment_set_volumetric_fog_filter_active(bool p_enable) override {}
 
 	Ref<Image> environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) override { return Ref<Image>(); }
 
-	void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override {}
-	void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override {}
+	void positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override {}
+	void directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override {}
 
 	RID fog_volume_instance_create(RID p_fog_volume) override { return RID(); }
 	void fog_volume_instance_set_transform(RID p_fog_volume_instance, const Transform3D &p_transform) override {}
@@ -158,15 +150,15 @@ public:
 	bool voxel_gi_needs_update(RID p_probe) const override { return false; }
 	void voxel_gi_update(RID p_probe, bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects) override {}
 
-	void voxel_gi_set_quality(RSE::VoxelGIQuality) override {}
+	void voxel_gi_set_quality(RS::VoxelGIQuality) override {}
 
-	void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingServerTypes::RenderInfo *r_info = nullptr) override {}
+	void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingMethod::RenderInfo *r_info = nullptr) override {}
 	void render_material(const Transform3D &p_cam_transform, const Projection &p_cam_projection, bool p_cam_orthogonal, const PagedArray<RenderGeometryInstance *> &p_instances, RID p_framebuffer, const Rect2i &p_region) override {}
 	void render_particle_collider_heightfield(RID p_collider, const Transform3D &p_transform, const PagedArray<RenderGeometryInstance *> &p_instances) override {}
 
 	void set_scene_pass(uint64_t p_pass) override {}
 	void set_time(double p_time, double p_step) override {}
-	void set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) override {}
+	void set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) override {}
 
 	Ref<RenderSceneBuffers> render_buffers_create() override { return Ref<RenderSceneBuffers>(); }
 	void gi_set_use_half_resolution(bool p_enable) override {}
@@ -174,17 +166,33 @@ public:
 	void screen_space_roughness_limiter_set_active(bool p_enable, float p_amount, float p_curve) override {}
 	bool screen_space_roughness_limiter_is_active() const override { return false; }
 
-	void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) override {}
+	void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override {}
 	void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override {}
 
-	TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) override;
+	TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) override { return TypedArray<Image>(); }
 
-	bool free(RID p_rid) override;
+	bool free(RID p_rid) override {
+		if (is_environment(p_rid)) {
+			environment_free(p_rid);
+			return true;
+		} else if (is_compositor(p_rid)) {
+			compositor_free(p_rid);
+			return true;
+		} else if (is_compositor_effect(p_rid)) {
+			compositor_effect_free(p_rid);
+			return true;
+		} else if (RSG::camera_attributes->owns_camera_attributes(p_rid)) {
+			RSG::camera_attributes->camera_attributes_free(p_rid);
+			return true;
+		} else {
+			return false;
+		}
+	}
 	void update() override {}
 	void sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) override {}
 
-	virtual void decals_set_filter(RSE::DecalFilter p_filter) override {}
-	virtual void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) override {}
+	virtual void decals_set_filter(RS::DecalFilter p_filter) override {}
+	virtual void light_projectors_set_filter(RS::LightProjectorFilter p_filter) override {}
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) override {}
 	virtual void material_set_use_debanding(bool p_enable) override {}
 
diff --git a/engine/servers/rendering/dummy/storage/light_storage.h b/engine/servers/rendering/dummy/storage/light_storage.h
index 5213c3f5..ba50245e 100644
--- a/engine/servers/rendering/dummy/storage/light_storage.h
+++ b/engine/servers/rendering/dummy/storage/light_storage.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/light_storage.h"
 
 namespace RendererDummy {
@@ -71,7 +70,7 @@ public:
 	virtual void light_free(RID p_rid) override {}
 
 	virtual void light_set_color(RID p_light, const Color &p_color) override {}
-	virtual void light_set_param(RID p_light, RSE::LightParam p_param, float p_value) override {}
+	virtual void light_set_param(RID p_light, RS::LightParam p_param, float p_value) override {}
 	virtual void light_set_shadow(RID p_light, bool p_enabled) override {}
 	virtual void light_set_projector(RID p_light, RID p_texture) override {}
 	virtual void light_set_negative(RID p_light, bool p_enable) override {}
@@ -80,29 +79,29 @@ public:
 	virtual void light_set_reverse_cull_face_mode(RID p_light, bool p_enabled) override {}
 	virtual void light_set_shadow_caster_mask(RID p_light, uint32_t p_caster_mask) override {}
 	virtual uint32_t light_get_shadow_caster_mask(RID p_light) const override { return 0xFFFFFFFF; }
-	virtual void light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) override {}
+	virtual void light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) override {}
 	virtual void light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade) override {}
 
-	virtual void light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) override {}
+	virtual void light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) override {}
 
-	virtual void light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) override {}
+	virtual void light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) override {}
 	virtual void light_directional_set_blend_splits(RID p_light, bool p_enable) override {}
 	virtual bool light_directional_get_blend_splits(RID p_light) const override { return false; }
-	virtual void light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) override {}
-	virtual RSE::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override { return RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY; }
+	virtual void light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) override {}
+	virtual RS::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override { return RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY; }
 
-	virtual RSE::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override { return RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL; }
-	virtual RSE::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override { return RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID; }
+	virtual RS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override { return RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL; }
+	virtual RS::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override { return RS::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID; }
 
 	virtual bool light_has_shadow(RID p_light) const override { return false; }
 	virtual bool light_has_projector(RID p_light) const override { return false; }
 
-	virtual RSE::LightType light_get_type(RID p_light) const override { return RSE::LIGHT_OMNI; }
+	virtual RS::LightType light_get_type(RID p_light) const override { return RS::LIGHT_OMNI; }
 	virtual AABB light_get_aabb(RID p_light) const override { return AABB(); }
-	virtual float light_get_param(RID p_light, RSE::LightParam p_param) override { return 0.0; }
+	virtual float light_get_param(RID p_light, RS::LightParam p_param) override { return 0.0; }
 	virtual Color light_get_color(RID p_light) override { return Color(); }
 	virtual bool light_get_reverse_cull_face_mode(RID p_light) const override { return false; }
-	virtual RSE::LightBakeMode light_get_bake_mode(RID p_light) override { return RSE::LIGHT_BAKE_DISABLED; }
+	virtual RS::LightBakeMode light_get_bake_mode(RID p_light) override { return RS::LIGHT_BAKE_DISABLED; }
 	virtual uint32_t light_get_max_sdfgi_cascade(RID p_light) override { return 0; }
 	virtual uint64_t light_get_version(RID p_light) const override { return 0; }
 	virtual uint32_t light_get_cull_mask(RID p_light) const override { return 0; }
@@ -122,10 +121,10 @@ public:
 	virtual void reflection_probe_initialize(RID p_rid) override {}
 	virtual void reflection_probe_free(RID p_rid) override {}
 
-	virtual void reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) override {}
+	virtual void reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) override {}
 	virtual void reflection_probe_set_intensity(RID p_probe, float p_intensity) override {}
 	virtual void reflection_probe_set_blend_distance(RID p_probe, float p_blend_distance) override {}
-	virtual void reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) override {}
+	virtual void reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) override {}
 	virtual void reflection_probe_set_ambient_color(RID p_probe, const Color &p_color) override {}
 	virtual void reflection_probe_set_ambient_energy(RID p_probe, float p_energy) override {}
 	virtual void reflection_probe_set_max_distance(RID p_probe, float p_distance) override {}
@@ -141,7 +140,7 @@ public:
 	virtual float reflection_probe_get_mesh_lod_threshold(RID p_probe) const override { return 0.0; }
 
 	virtual AABB reflection_probe_get_aabb(RID p_probe) const override { return AABB(); }
-	virtual RSE::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override { return RSE::REFLECTION_PROBE_UPDATE_ONCE; }
+	virtual RS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override { return RenderingServer::REFLECTION_PROBE_UPDATE_ONCE; }
 	virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const override { return 0; }
 	virtual uint32_t reflection_probe_get_reflection_mask(RID p_probe) const override { return 0; }
 	virtual Vector3 reflection_probe_get_size(RID p_probe) const override { return Vector3(); }
@@ -194,8 +193,8 @@ public:
 	virtual float lightmap_get_probe_capture_update_speed() const override { return 0; }
 
 	virtual void lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow) override {}
-	virtual RSE::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override { return RSE::SHADOWMASK_MODE_NONE; }
-	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) override {}
+	virtual RS::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override { return RS::SHADOWMASK_MODE_NONE; }
+	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) override {}
 
 	/* LIGHTMAP INSTANCE */
 
diff --git a/engine/servers/rendering/dummy/storage/material_storage.cpp b/engine/servers/rendering/dummy/storage/material_storage.cpp
index c5aee0fe..8276eba1 100644
--- a/engine/servers/rendering/dummy/storage/material_storage.cpp
+++ b/engine/servers/rendering/dummy/storage/material_storage.cpp
@@ -47,7 +47,7 @@ MaterialStorage::~MaterialStorage() {
 	global_shader_variables.clear();
 }
 
-void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) {
+void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) {
 	ERR_FAIL_COND(global_shader_variables.has(p_name));
 
 	global_shader_variables[p_name] = p_type;
@@ -63,17 +63,17 @@ void MaterialStorage::global_shader_parameter_remove(const StringName &p_name) {
 
 Vector<StringName> MaterialStorage::global_shader_parameter_get_list() const {
 	Vector<StringName> names;
-	for (const KeyValue<StringName, RSE::GlobalShaderParameterType> &E : global_shader_variables) {
+	for (const KeyValue<StringName, RS::GlobalShaderParameterType> &E : global_shader_variables) {
 		names.push_back(E.key);
 	}
 	names.sort_custom<StringName::AlphCompare>();
 	return names;
 }
 
-RSE::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
+RS::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
 	if (!global_shader_variables.has(p_name)) {
 		print_line("don't have name, sorry");
-		return RSE::GLOBAL_VAR_TYPE_MAX;
+		return RS::GLOBAL_VAR_TYPE_MAX;
 	}
 
 	return global_shader_variables[p_name];
@@ -93,7 +93,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 			String type = d["type"];
 
-			static const char *global_var_type_names[RSE::GLOBAL_VAR_TYPE_MAX] = {
+			static const char *global_var_type_names[RS::GLOBAL_VAR_TYPE_MAX] = {
 				"bool",
 				"bvec2",
 				"bvec3",
@@ -125,16 +125,16 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 				"samplerExternalOES"
 			};
 
-			RSE::GlobalShaderParameterType gvtype = RSE::GLOBAL_VAR_TYPE_MAX;
+			RS::GlobalShaderParameterType gvtype = RS::GLOBAL_VAR_TYPE_MAX;
 
-			for (int i = 0; i < RSE::GLOBAL_VAR_TYPE_MAX; i++) {
+			for (int i = 0; i < RS::GLOBAL_VAR_TYPE_MAX; i++) {
 				if (global_var_type_names[i] == type) {
-					gvtype = RSE::GlobalShaderParameterType(i);
+					gvtype = RS::GlobalShaderParameterType(i);
 					break;
 				}
 			}
 
-			ERR_CONTINUE(gvtype == RSE::GLOBAL_VAR_TYPE_MAX); //type invalid
+			ERR_CONTINUE(gvtype == RS::GLOBAL_VAR_TYPE_MAX); //type invalid
 
 			if (!global_shader_variables.has(name)) {
 				global_shader_parameter_add(name, gvtype, Variant());
@@ -167,21 +167,19 @@ void MaterialStorage::shader_set_code(RID p_shader, const String &p_code) {
 
 	String mode_string = ShaderLanguage::get_shader_type(p_code);
 
-	RSE::ShaderMode new_mode;
+	RS::ShaderMode new_mode;
 	if (mode_string == "canvas_item") {
-		new_mode = RSE::SHADER_CANVAS_ITEM;
+		new_mode = RS::SHADER_CANVAS_ITEM;
 	} else if (mode_string == "particles") {
-		new_mode = RSE::SHADER_PARTICLES;
+		new_mode = RS::SHADER_PARTICLES;
 	} else if (mode_string == "spatial") {
-		new_mode = RSE::SHADER_SPATIAL;
+		new_mode = RS::SHADER_SPATIAL;
 	} else if (mode_string == "sky") {
-		new_mode = RSE::SHADER_SKY;
+		new_mode = RS::SHADER_SKY;
 	} else if (mode_string == "fog") {
-		new_mode = RSE::SHADER_FOG;
-	} else if (mode_string == "texture_blit") {
-		new_mode = RSE::SHADER_TEXTURE_BLIT;
+		new_mode = RS::SHADER_FOG;
 	} else {
-		new_mode = RSE::SHADER_MAX;
+		new_mode = RS::SHADER_MAX;
 		ERR_FAIL_MSG("Shader type " + mode_string + " not supported in Dummy renderer.");
 	}
 	ShaderCompiler::IdentifierActions actions;
diff --git a/engine/servers/rendering/dummy/storage/material_storage.h b/engine/servers/rendering/dummy/storage/material_storage.h
index 3d7e5a9c..77bf7e06 100644
--- a/engine/servers/rendering/dummy/storage/material_storage.h
+++ b/engine/servers/rendering/dummy/storage/material_storage.h
@@ -30,13 +30,10 @@
 
 #pragma once
 
-#include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"
-
-class DependencyTracker;
+#include "servers/rendering/storage/utilities.h"
 
 namespace RendererDummy {
 
@@ -44,7 +41,7 @@ class MaterialStorage : public RendererMaterialStorage {
 private:
 	static MaterialStorage *singleton;
 
-	HashMap<StringName, RSE::GlobalShaderParameterType> global_shader_variables;
+	HashMap<StringName, RS::GlobalShaderParameterType> global_shader_variables;
 
 	struct DummyShader {
 		HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> uniforms;
@@ -70,14 +67,14 @@ public:
 
 	/* GLOBAL SHADER UNIFORM API */
 
-	virtual void global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) override;
+	virtual void global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) override;
 	virtual void global_shader_parameter_remove(const StringName &p_name) override;
 	virtual Vector<StringName> global_shader_parameter_get_list() const override;
 
 	virtual void global_shader_parameter_set(const StringName &p_name, const Variant &p_value) override {}
 	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) override {}
 	virtual Variant global_shader_parameter_get(const StringName &p_name) const override { return Variant(); }
-	virtual RSE::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
+	virtual RS::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
 
 	virtual void global_shader_parameters_load_settings(bool p_load_textures = true) override;
 	virtual void global_shader_parameters_clear() override {}
@@ -104,7 +101,7 @@ public:
 	virtual RID shader_get_default_texture_parameter(RID p_shader, const StringName &p_name, int p_index) const override { return RID(); }
 	virtual Variant shader_get_parameter_default(RID p_material, const StringName &p_param) const override { return Variant(); }
 
-	virtual RenderingServerTypes::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override { return RenderingServerTypes::ShaderNativeSourceCode(); }
+	virtual RS::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override { return RS::ShaderNativeSourceCode(); }
 	virtual void shader_embedded_set_lock() override {}
 	virtual const HashSet<RID> &shader_embedded_set_get() const override { return dummy_embedded_set; }
 	virtual void shader_embedded_set_unlock() override {}
@@ -127,7 +124,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) override { return false; }
 	virtual bool material_casts_shadows(RID p_material) override { return false; }
-	virtual RSE::CullMode material_get_cull_mode(RID p_material) const override { return RSE::CULL_MODE_DISABLED; }
+	virtual RS::CullMode material_get_cull_mode(RID p_material) const override { return RS::CULL_MODE_DISABLED; }
 
 	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override;
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) override {}
diff --git a/engine/servers/rendering/dummy/storage/mesh_storage.h b/engine/servers/rendering/dummy/storage/mesh_storage.h
index 09bbd1f1..0871c91a 100644
--- a/engine/servers/rendering/dummy/storage/mesh_storage.h
+++ b/engine/servers/rendering/dummy/storage/mesh_storage.h
@@ -36,9 +36,9 @@
 namespace RendererDummy {
 
 struct DummyMesh {
-	Vector<RenderingServerTypes::SurfaceData> surfaces;
+	Vector<RS::SurfaceData> surfaces;
 	int blend_shape_count;
-	RSE::BlendShapeMode blend_shape_mode;
+	RS::BlendShapeMode blend_shape_mode;
 	PackedFloat32Array blend_shape_values;
 	Dependency dependency;
 };
@@ -76,11 +76,11 @@ public:
 	}
 	virtual bool mesh_needs_instance(RID p_mesh, bool p_has_skeleton) override { return false; }
 
-	virtual void mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) override {
+	virtual void mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) override {
 		DummyMesh *m = mesh_owner.get_or_null(p_mesh);
 		ERR_FAIL_NULL(m);
-		m->surfaces.push_back(RenderingServerTypes::SurfaceData());
-		RenderingServerTypes::SurfaceData *s = &m->surfaces.write[m->surfaces.size() - 1];
+		m->surfaces.push_back(RS::SurfaceData());
+		RS::SurfaceData *s = &m->surfaces.write[m->surfaces.size() - 1];
 		s->format = p_surface.format;
 		s->primitive = p_surface.primitive;
 		s->vertex_data = p_surface.vertex_data;
@@ -105,15 +105,15 @@ public:
 		return m->blend_shape_count;
 	}
 
-	virtual void mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) override {
+	virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) override {
 		DummyMesh *m = mesh_owner.get_or_null(p_mesh);
 		ERR_FAIL_NULL(m);
 		m->blend_shape_mode = p_mode;
 	}
 
-	virtual RSE::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override {
+	virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override {
 		DummyMesh *m = mesh_owner.get_or_null(p_mesh);
-		ERR_FAIL_NULL_V(m, RSE::BLEND_SHAPE_MODE_NORMALIZED);
+		ERR_FAIL_NULL_V(m, RS::BLEND_SHAPE_MODE_NORMALIZED);
 		return m->blend_shape_mode;
 	}
 
@@ -125,11 +125,11 @@ public:
 	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material) override {}
 	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const override { return RID(); }
 
-	virtual RenderingServerTypes::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override {
+	virtual RS::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override {
 		DummyMesh *m = mesh_owner.get_or_null(p_mesh);
-		ERR_FAIL_NULL_V(m, RenderingServerTypes::SurfaceData());
-		ERR_FAIL_INDEX_V(p_surface, m->surfaces.size(), RenderingServerTypes::SurfaceData());
-		RenderingServerTypes::SurfaceData s = m->surfaces[p_surface];
+		ERR_FAIL_NULL_V(m, RS::SurfaceData());
+		ERR_FAIL_INDEX_V(p_surface, m->surfaces.size(), RS::SurfaceData());
+		RS::SurfaceData s = m->surfaces[p_surface];
 		return s;
 	}
 
@@ -150,7 +150,7 @@ public:
 
 	virtual void mesh_surface_remove(RID p_mesh, int p_surface) override;
 	virtual void mesh_clear(RID p_mesh) override;
-	virtual void mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) override {}
+	virtual void mesh_debug_usage(List<RS::MeshInfo> *r_info) override {}
 
 	/* MESH INSTANCE */
 
@@ -171,7 +171,7 @@ public:
 	virtual void _multimesh_initialize(RID p_rid) override;
 	virtual void _multimesh_free(RID p_rid) override;
 
-	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override {}
+	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override {}
 	virtual int _multimesh_get_instance_count(RID p_multimesh) const override { return 0; }
 
 	virtual void _multimesh_set_mesh(RID p_multimesh, RID p_mesh) override {}
diff --git a/engine/servers/rendering/dummy/storage/particles_storage.h b/engine/servers/rendering/dummy/storage/particles_storage.h
index 9b356803..e3e7d6aa 100644
--- a/engine/servers/rendering/dummy/storage/particles_storage.h
+++ b/engine/servers/rendering/dummy/storage/particles_storage.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "core/math/transform_3d.h"
-#include "core/templates/rid.h"
 #include "servers/rendering/storage/particles_storage.h"
 
 namespace RendererDummy {
@@ -44,7 +42,7 @@ public:
 	virtual void particles_initialize(RID p_rid) override {}
 	virtual void particles_free(RID p_rid) override {}
 
-	virtual void particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) override {}
+	virtual void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) override {}
 	virtual void particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) override {}
 	virtual void particles_set_emitting(RID p_particles, bool p_emitting) override {}
 	virtual void particles_set_amount(RID p_particles, int p_amount) override {}
@@ -52,7 +50,7 @@ public:
 	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) override {}
 	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) override {}
 	virtual void particles_set_pre_process_time(RID p_particles, double p_time) override {}
-	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_particles_request_process_time) override {}
+	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time) override {}
 	virtual void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) override {}
 	virtual void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) override {}
 	virtual void particles_set_seed(RID p_particles, uint32_t p_seed) override {}
@@ -68,16 +66,14 @@ public:
 	virtual void particles_set_view_axis(RID p_particles, const Vector3 &p_axis, const Vector3 &p_up_axis) override {}
 	virtual void particles_set_collision_base_size(RID p_particles, real_t p_size) override {}
 
-	virtual void particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) override {}
-	virtual void particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_transform_align_channel_filter) override {}
-	virtual void particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) override {}
+	virtual void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) override {}
 
 	virtual void particles_set_trails(RID p_particles, bool p_enable, double p_length) override {}
 	virtual void particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) override {}
 
 	virtual void particles_restart(RID p_particles) override {}
 
-	virtual void particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) override {}
+	virtual void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) override {}
 
 	virtual void particles_set_draw_passes(RID p_particles, int p_count) override {}
 	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) override {}
@@ -105,7 +101,7 @@ public:
 	virtual void particles_collision_initialize(RID p_rid) override {}
 	virtual void particles_collision_free(RID p_rid) override {}
 
-	virtual void particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) override {}
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) override {}
 	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) override {}
 	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) override {}
 	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) override {}
@@ -114,7 +110,7 @@ public:
 	virtual void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) override {}
 	virtual void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) override {}
 	virtual void particles_collision_height_field_update(RID p_particles_collision) override {}
-	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) override {}
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) override {}
 	virtual AABB particles_collision_get_aabb(RID p_particles_collision) const override { return AABB(); }
 	virtual bool particles_collision_is_heightfield(RID p_particles_collision) const override { return false; }
 	virtual uint32_t particles_collision_get_height_field_mask(RID p_particles_collision) const override { return 0; }
diff --git a/engine/servers/rendering/dummy/storage/texture_storage.h b/engine/servers/rendering/dummy/storage/texture_storage.h
index e0f1b170..0d5d38c9 100644
--- a/engine/servers/rendering/dummy/storage/texture_storage.h
+++ b/engine/servers/rendering/dummy/storage/texture_storage.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/texture_storage.h"
 
 namespace RendererDummy {
@@ -56,11 +55,11 @@ public:
 	virtual void canvas_texture_initialize(RID p_rid) override {}
 	virtual void canvas_texture_free(RID p_rid) override {}
 
-	virtual void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) override {}
+	virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) override {}
 	virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) override {}
 
-	virtual void canvas_texture_set_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) override {}
-	virtual void canvas_texture_set_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) override {}
+	virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) override {}
+	virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) override {}
 
 	/* Texture API */
 
@@ -85,24 +84,21 @@ public:
 		ERR_FAIL_NULL(t);
 		t->image = p_image->duplicate();
 	}
-	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) override {}
+	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) override {}
 	virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) override {}
 	virtual void texture_external_initialize(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) override {}
 	virtual void texture_proxy_initialize(RID p_texture, RID p_base) override {} //all slices, then all the mipmaps, must be coherent
-	virtual void texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) override {}
 
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override { return RID(); }
+	virtual RID texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RS::TextureLayeredType p_layered_type = RS::TEXTURE_LAYERED_2D_ARRAY) override { return RID(); }
 
 	virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) override {}
 	virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) override {}
 	virtual void texture_external_update(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) override {}
 	virtual void texture_proxy_update(RID p_proxy, RID p_base) override {}
 
-	virtual void texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) override {}
-
 	//these two APIs can be used together or in combination with the others.
 	virtual void texture_2d_placeholder_initialize(RID p_texture) override {}
-	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) override {}
+	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) override {}
 	virtual void texture_3d_placeholder_initialize(RID p_texture) override {}
 
 	virtual Ref<Image> texture_2d_get(RID p_texture) const override {
@@ -113,9 +109,6 @@ public:
 	virtual Ref<Image> texture_2d_layer_get(RID p_texture, int p_layer) const override { return Ref<Image>(); }
 	virtual Vector<Ref<Image>> texture_3d_get(RID p_texture) const override { return Vector<Ref<Image>>(); }
 
-	virtual void texture_drawable_generate_mipmaps(RID p_texture) override {}
-	virtual RID texture_drawable_get_default_material() const override { return RID(); }
-
 	virtual void texture_replace(RID p_texture, RID p_by_texture) override { texture_free(p_by_texture); }
 	virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) override {}
 
@@ -124,17 +117,17 @@ public:
 
 	virtual Image::Format texture_get_format(RID p_texture) const override { return Image::FORMAT_MAX; }
 
-	virtual void texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override {}
-	virtual void texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override {}
-	virtual void texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) override {}
+	virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override {}
+	virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override {}
+	virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) override {}
 
-	virtual void texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) override {}
+	virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) override {}
 
 	virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) override {}
 
 	virtual Size2 texture_size_with_proxy(RID p_proxy) override { return Size2(); }
 
-	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override {}
+	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type = RS::TEXTURE_LAYERED_2D_ARRAY) override {}
 	virtual RID texture_get_rd_texture(RID p_texture, bool p_srgb = false) const override { return RID(); }
 	virtual uint64_t texture_get_native_handle(RID p_texture, bool p_srgb = false) const override { return 0; }
 
@@ -144,7 +137,7 @@ public:
 	virtual void decal_free(RID p_rid) override {}
 
 	virtual void decal_set_size(RID p_decal, const Vector3 &p_size) override {}
-	virtual void decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) override {}
+	virtual void decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) override {}
 	virtual void decal_set_emission_energy(RID p_decal, float p_energy) override {}
 	virtual void decal_set_albedo_mix(RID p_decal, float p_mix) override {}
 	virtual void decal_set_modulate(RID p_decal, const Color &p_modulate) override {}
@@ -180,8 +173,8 @@ public:
 	virtual bool render_target_get_direct_to_screen(RID p_render_target) const override { return false; }
 	virtual bool render_target_was_used(RID p_render_target) const override { return false; }
 	virtual void render_target_set_as_unused(RID p_render_target) override {}
-	virtual void render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) override {}
-	virtual RSE::ViewportMSAA render_target_get_msaa(RID p_render_target) const override { return RSE::VIEWPORT_MSAA_DISABLED; }
+	virtual void render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) override {}
+	virtual RS::ViewportMSAA render_target_get_msaa(RID p_render_target) const override { return RS::VIEWPORT_MSAA_DISABLED; }
 	virtual void render_target_set_msaa_needs_resolve(RID p_render_target, bool p_needs_resolve) override {}
 	virtual bool render_target_get_msaa_needs_resolve(RID p_render_target) const override { return false; }
 	virtual void render_target_do_msaa_resolve(RID p_render_target) override {}
@@ -196,14 +189,14 @@ public:
 	virtual void render_target_disable_clear_request(RID p_render_target) override {}
 	virtual void render_target_do_clear_request(RID p_render_target) override {}
 
-	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) override {}
+	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) override {}
 	virtual Rect2i render_target_get_sdf_rect(RID p_render_target) const override { return Rect2i(); }
 	virtual void render_target_mark_sdf_enabled(RID p_render_target, bool p_enabled) override {}
 
-	virtual void render_target_set_vrs_mode(RID p_render_target, RSE::ViewportVRSMode p_mode) override {}
-	virtual RSE::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override { return RSE::VIEWPORT_VRS_DISABLED; }
-	virtual void render_target_set_vrs_update_mode(RID p_render_target, RSE::ViewportVRSUpdateMode p_mode) override {}
-	virtual RSE::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override { return RSE::VIEWPORT_VRS_UPDATE_DISABLED; }
+	virtual void render_target_set_vrs_mode(RID p_render_target, RS::ViewportVRSMode p_mode) override {}
+	virtual RS::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override { return RS::VIEWPORT_VRS_DISABLED; }
+	virtual void render_target_set_vrs_update_mode(RID p_render_target, RS::ViewportVRSUpdateMode p_mode) override {}
+	virtual RS::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override { return RS::VIEWPORT_VRS_UPDATE_DISABLED; }
 	virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {}
 	virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); }
 
@@ -216,12 +209,6 @@ public:
 	virtual void render_target_set_render_region(RID p_render_target, const Rect2i &p_render_region) override {}
 	virtual Rect2i render_target_get_render_region(RID p_render_target) const override { return Rect2i(); }
 
-	virtual void render_target_set_subsampled_enabled(RID p_render_target, bool p_enabled) override {}
-	virtual bool render_target_is_subsampled_enabled(RID p_render_target) const override { return false; }
-
-	virtual void render_target_set_subsampled_allowed(RID p_render_target, bool p_allowed) override {}
-	virtual bool render_target_is_subsampled_allowed(RID p_render_target) const override { return false; }
-
 	virtual RID render_target_get_texture(RID p_render_target) override { return RID(); }
 
 	virtual void render_target_set_velocity_target_size(RID p_render_target, const Size2i &p_target_size) override {}
diff --git a/engine/servers/rendering/dummy/storage/utilities.cpp b/engine/servers/rendering/dummy/storage/utilities.cpp
index a4c114c3..680a0d3f 100644
--- a/engine/servers/rendering/dummy/storage/utilities.cpp
+++ b/engine/servers/rendering/dummy/storage/utilities.cpp
@@ -30,24 +30,24 @@
 
 #include "utilities.h"
 
-#include "servers/rendering/dummy/storage/light_storage.h"
-#include "servers/rendering/dummy/storage/material_storage.h"
-#include "servers/rendering/dummy/storage/mesh_storage.h"
-#include "servers/rendering/dummy/storage/texture_storage.h"
+#include "light_storage.h"
+#include "material_storage.h"
+#include "mesh_storage.h"
+#include "texture_storage.h"
 
 using namespace RendererDummy;
 
 Utilities *Utilities::singleton = nullptr;
 
-RSE::InstanceType Utilities::get_base_type(RID p_rid) const {
+RS::InstanceType Utilities::get_base_type(RID p_rid) const {
 	if (RendererDummy::MeshStorage::get_singleton()->owns_mesh(p_rid)) {
-		return RSE::INSTANCE_MESH;
+		return RS::INSTANCE_MESH;
 	} else if (RendererDummy::MeshStorage::get_singleton()->owns_multimesh(p_rid)) {
-		return RSE::INSTANCE_MULTIMESH;
+		return RS::INSTANCE_MULTIMESH;
 	} else if (RendererDummy::LightStorage::get_singleton()->owns_lightmap(p_rid)) {
-		return RSE::INSTANCE_LIGHTMAP;
+		return RS::INSTANCE_LIGHTMAP;
 	}
-	return RSE::INSTANCE_NONE;
+	return RS::INSTANCE_NONE;
 }
 
 bool Utilities::free(RID p_rid) {
diff --git a/engine/servers/rendering/dummy/storage/utilities.h b/engine/servers/rendering/dummy/storage/utilities.h
index d36775ac..d8862cdb 100644
--- a/engine/servers/rendering/dummy/storage/utilities.h
+++ b/engine/servers/rendering/dummy/storage/utilities.h
@@ -46,7 +46,7 @@ public:
 
 	/* INSTANCES */
 
-	virtual RSE::InstanceType get_base_type(RID p_rid) const override;
+	virtual RS::InstanceType get_base_type(RID p_rid) const override;
 	virtual bool free(RID p_rid) override;
 
 	/* DEPENDENCIES */
@@ -86,10 +86,10 @@ public:
 
 	virtual void update_memory_info() override {}
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) override { return 0; }
+	virtual uint64_t get_rendering_info(RS::RenderingInfo p_info) override { return 0; }
 	virtual String get_video_adapter_name() const override { return String(); }
 	virtual String get_video_adapter_vendor() const override { return String(); }
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const override { return RenderingDeviceEnums::DeviceType::DEVICE_TYPE_OTHER; }
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const override { return RenderingDevice::DeviceType::DEVICE_TYPE_OTHER; }
 	virtual String get_video_adapter_api_version() const override { return String(); }
 
 	virtual Size2i get_maximum_viewport_size() const override { return Size2i(); }
diff --git a/engine/servers/rendering/environment/renderer_fog.h b/engine/servers/rendering/environment/renderer_fog.h
index 693cfcbc..be50e5bc 100644
--- a/engine/servers/rendering/environment/renderer_fog.h
+++ b/engine/servers/rendering/environment/renderer_fog.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-
-class RID;
-struct AABB;
-struct Vector3;
+#include "servers/rendering/rendering_server.h"
 
 class RendererFog {
 public:
@@ -46,9 +42,9 @@ public:
 	virtual void fog_volume_initialize(RID p_rid) = 0;
 	virtual void fog_volume_free(RID p_rid) = 0;
 
-	virtual void fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) = 0;
+	virtual void fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) = 0;
 	virtual void fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) = 0;
 	virtual void fog_volume_set_material(RID p_fog_volume, RID p_material) = 0;
 	virtual AABB fog_volume_get_aabb(RID p_fog_volume) const = 0;
-	virtual RSE::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const = 0;
+	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const = 0;
 };
diff --git a/engine/servers/rendering/environment/renderer_gi.h b/engine/servers/rendering/environment/renderer_gi.h
index 972b12e1..7f2c21cb 100644
--- a/engine/servers/rendering/environment/renderer_gi.h
+++ b/engine/servers/rendering/environment/renderer_gi.h
@@ -30,16 +30,7 @@
 
 #pragma once
 
-#include <cstdint>
-
-class RID;
-struct AABB;
-struct Transform3D;
-struct Vector3;
-struct Vector3i;
-
-template <typename T>
-class Vector;
+#include "servers/rendering/rendering_server.h"
 
 class RendererGI {
 public:
diff --git a/engine/servers/rendering/instance_uniforms.cpp b/engine/servers/rendering/instance_uniforms.cpp
index 425e3599..6fa607fd 100644
--- a/engine/servers/rendering/instance_uniforms.cpp
+++ b/engine/servers/rendering/instance_uniforms.cpp
@@ -30,7 +30,7 @@
 
 #include "instance_uniforms.h"
 
-#include "servers/rendering/rendering_server_globals.h"
+#include "rendering_server_globals.h"
 
 void InstanceUniforms::free(RID p_self) {
 	ERR_FAIL_COND(p_self.is_null());
diff --git a/engine/servers/rendering/multi_uma_buffer.h b/engine/servers/rendering/multi_uma_buffer.h
index a8063040..febbced2 100644
--- a/engine/servers/rendering/multi_uma_buffer.h
+++ b/engine/servers/rendering/multi_uma_buffer.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_server.h"
 
 class MultiUmaBufferBase {
 protected:
diff --git a/engine/servers/rendering/renderer_canvas_cull.cpp b/engine/servers/rendering/renderer_canvas_cull.cpp
index 0622b905..808a7495 100644
--- a/engine/servers/rendering/renderer_canvas_cull.cpp
+++ b/engine/servers/rendering/renderer_canvas_cull.cpp
@@ -30,13 +30,12 @@
 
 #include "renderer_canvas_cull.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/transform_interpolator.h"
-#include "servers/rendering/renderer_viewport.h"
-#include "servers/rendering/rendering_server_default.h"
-#include "servers/rendering/rendering_server_globals.h"
+#include "renderer_viewport.h"
+#include "rendering_server_default.h"
+#include "rendering_server_globals.h"
 #include "servers/rendering/storage/texture_storage.h"
 
 // Use the same antialiasing feather size as StyleBoxFlat's default
@@ -68,7 +67,7 @@ void RendererCanvasCull::_dependency_deleted(const RID &p_dependency, Dependency
 	_canvas_cull_singleton->_item_queue_update(item, true);
 }
 
-void RendererCanvasCull::_render_canvas_item_tree(RID p_to_render_target, Canvas::ChildItem *p_child_items, int p_child_item_count, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererCanvasCull::_render_canvas_item_tree(RID p_to_render_target, Canvas::ChildItem *p_child_items, int p_child_item_count, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, RenderingServer::CanvasItemTextureFilter p_default_filter, RenderingServer::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingMethod::RenderInfo *r_render_info) {
 	RENDER_TIMESTAMP("Cull CanvasItem Tree");
 
 	// This is used to avoid passing the camera transform down the rendering
@@ -144,7 +143,7 @@ void RendererCanvasCull::_collect_ysort_children(RendererCanvasCull::Item *p_can
 				// Y sorted canvas items are flattened into r_items. Calculate their absolute z index to use when rendering r_items.
 				int abs_z = 0;
 				if (child_items[i]->z_relative) {
-					abs_z = CLAMP(p_z + child_items[i]->z_index, RSE::CANVAS_ITEM_Z_MIN, RSE::CANVAS_ITEM_Z_MAX);
+					abs_z = CLAMP(p_z + child_items[i]->z_index, RS::CANVAS_ITEM_Z_MIN, RS::CANVAS_ITEM_Z_MAX);
 				} else {
 					abs_z = child_items[i]->z_index;
 				}
@@ -195,7 +194,7 @@ void RendererCanvasCull::_attach_canvas_item_for_draw(RendererCanvasCull::Item *
 	}
 
 	if (p_use_canvas_group) {
-		int zidx = p_z - RSE::CANVAS_ITEM_Z_MIN;
+		int zidx = p_z - RS::CANVAS_ITEM_Z_MIN;
 		if (r_canvas_group_from == nullptr) {
 			// no list before processing this item, means must put stuff in group from the beginning of list.
 			r_canvas_group_from = r_z_list[zidx];
@@ -271,7 +270,7 @@ void RendererCanvasCull::_attach_canvas_item_for_draw(RendererCanvasCull::Item *
 			ci->global_rect_cache.position -= p_clip_rect.position;
 			ci->light_masked = false;
 
-			int zidx = p_z - RSE::CANVAS_ITEM_Z_MIN;
+			int zidx = p_z - RS::CANVAS_ITEM_Z_MIN;
 
 			if (r_z_last_list[zidx]) {
 				r_z_last_list[zidx]->next = ci;
@@ -430,7 +429,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2
 
 	int parent_z = p_z;
 	if (ci->z_relative) {
-		p_z = CLAMP(p_z + ci->z_index, RSE::CANVAS_ITEM_Z_MIN, RSE::CANVAS_ITEM_Z_MAX);
+		p_z = CLAMP(p_z + ci->z_index, RS::CANVAS_ITEM_Z_MIN, RS::CANVAS_ITEM_Z_MAX);
 	} else {
 		p_z = ci->z_index;
 	}
@@ -462,7 +461,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2
 			RendererCanvasRender::Item *canvas_group_from = nullptr;
 			bool use_canvas_group = ci->canvas_group != nullptr && (ci->canvas_group->fit_empty || ci->commands != nullptr);
 			if (use_canvas_group) {
-				int zidx = p_z - RSE::CANVAS_ITEM_Z_MIN;
+				int zidx = p_z - RS::CANVAS_ITEM_Z_MIN;
 				canvas_group_from = r_z_last_list[zidx];
 			}
 
@@ -472,7 +471,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2
 		RendererCanvasRender::Item *canvas_group_from = nullptr;
 		bool use_canvas_group = ci->canvas_group != nullptr && (ci->canvas_group->fit_empty || ci->commands != nullptr);
 		if (use_canvas_group) {
-			int zidx = p_z - RSE::CANVAS_ITEM_Z_MIN;
+			int zidx = p_z - RS::CANVAS_ITEM_Z_MIN;
 			canvas_group_from = r_z_last_list[zidx];
 		}
 
@@ -492,7 +491,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2
 	}
 }
 
-void RendererCanvasCull::render_canvas(RID p_render_target, Canvas *p_canvas, const Transform2D &p_transform, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, const Rect2 &p_clip_rect, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_transforms_to_pixel, bool p_snap_2d_vertices_to_pixel, uint32_t canvas_cull_mask, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererCanvasCull::render_canvas(RID p_render_target, Canvas *p_canvas, const Transform2D &p_transform, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, const Rect2 &p_clip_rect, RenderingServer::CanvasItemTextureFilter p_default_filter, RenderingServer::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_transforms_to_pixel, bool p_snap_2d_vertices_to_pixel, uint32_t canvas_cull_mask, RenderingMethod::RenderInfo *r_render_info) {
 	RENDER_TIMESTAMP("> Render Canvas");
 
 	sdf_used = false;
@@ -725,29 +724,6 @@ void RendererCanvasCull::canvas_item_set_update_when_visible(RID p_item, bool p_
 	canvas_item->update_when_visible = p_update;
 }
 
-// Compensate the width added by the antialiasing feather by reducing the base line width.
-// For line widths lower than or equal to 1.0, this is done with a multiplier,
-// while line widths greater than 1.0 use a constant offset clamped to a width of 1.0.
-// While the offset is not equal to `FEATHER_SIZE`, this is empirically determined
-// to give a good result on various foreground/background colors.
-// This method assumes the check for whether the line is antialiased
-// has already been done.
-float RendererCanvasCull::canvas_item_get_compensated_antialiasing_width(float p_width) const {
-	if (p_width > 0.0f) {
-		if (p_width <= (FEATHER_SIZE * 2.0f + CMP_EPSILON)) {
-			return p_width * 0.5f;
-		} else if (p_width <= (FEATHER_SIZE * 4.0f + CMP_EPSILON)) {
-			// Progressively lerp between the two methods (multiplier and offset).
-			return Math::remap(p_width, FEATHER_SIZE * 2.0f, FEATHER_SIZE * 4.0f, p_width * 0.5f, p_width - FEATHER_SIZE * 0.5f);
-		} else {
-			// Use a constant offset.
-			return p_width - FEATHER_SIZE * 0.5f;
-		}
-	}
-
-	return p_width;
-}
-
 void RendererCanvasCull::canvas_item_add_line(RID p_item, const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width, bool p_antialiased) {
 	Item *canvas_item = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(canvas_item);
@@ -757,11 +733,6 @@ void RendererCanvasCull::canvas_item_add_line(RID p_item, const Point2 &p_from,
 
 	Vector2 diff = (p_from - p_to);
 	Vector2 dir = diff.orthogonal().normalized();
-
-	if (p_antialiased) {
-		p_width = canvas_item_get_compensated_antialiasing_width(p_width);
-	}
-
 	Vector2 t = dir * p_width * 0.5;
 
 	Vector2 begin_left;
@@ -994,16 +965,12 @@ void RendererCanvasCull::canvas_item_add_polyline(RID p_item, const Vector<Point
 	Item::CommandPolygon *pline = canvas_item->alloc_command<Item::CommandPolygon>();
 	ERR_FAIL_NULL(pline);
 
-	if (p_antialiased) {
-		p_width = canvas_item_get_compensated_antialiasing_width(p_width);
-	}
-
 	if (p_width < 0) {
 		if (p_antialiased) {
 			WARN_PRINT("Antialiasing is not supported for thin polylines drawn using line strips (`p_width < 0`).");
 		}
 
-		pline->primitive = RSE::PRIMITIVE_LINE_STRIP;
+		pline->primitive = RS::PRIMITIVE_LINE_STRIP;
 
 		if (p_colors.size() == 1 || p_colors.size() == point_count) {
 			pline->polygon.create(indices, p_points, p_colors);
@@ -1198,10 +1165,10 @@ void RendererCanvasCull::canvas_item_add_polyline(RID p_item, const Vector<Point
 			prev_segment_dir = segment_dir;
 		}
 
-		pline_left->primitive = RSE::PRIMITIVE_TRIANGLE_STRIP;
+		pline_left->primitive = RS::PRIMITIVE_TRIANGLE_STRIP;
 		pline_left->polygon.create(indices, points_left, colors_left);
 
-		pline_right->primitive = RSE::PRIMITIVE_TRIANGLE_STRIP;
+		pline_right->primitive = RS::PRIMITIVE_TRIANGLE_STRIP;
 		pline_right->polygon.create(indices, points_right, colors_right);
 	} else {
 		// Makes a single triangle strip for drawing the line.
@@ -1244,7 +1211,7 @@ void RendererCanvasCull::canvas_item_add_polyline(RID p_item, const Vector<Point
 		}
 	}
 
-	pline->primitive = RSE::PRIMITIVE_TRIANGLE_STRIP;
+	pline->primitive = RS::PRIMITIVE_TRIANGLE_STRIP;
 	pline->polygon.create(indices, points, colors);
 }
 
@@ -1252,9 +1219,6 @@ void RendererCanvasCull::canvas_item_add_multiline(RID p_item, const Vector<Poin
 	ERR_FAIL_COND(p_points.is_empty() || p_points.size() % 2 != 0);
 	ERR_FAIL_COND(p_colors.size() != 1 && p_colors.size() * 2 != p_points.size());
 
-	// We don't need to compensate width for antialiasing here,
-	// since the width is already compensated in `canvas_item_add_line()`.
-
 	// TODO: `canvas_item_add_line`(`multiline`, `polyline`) share logic, should factor out.
 	if (p_width < 0) {
 		if (p_antialiased) {
@@ -1278,7 +1242,7 @@ void RendererCanvasCull::canvas_item_add_multiline(RID p_item, const Vector<Poin
 
 		Item::CommandPolygon *pline = canvas_item->alloc_command<Item::CommandPolygon>();
 		ERR_FAIL_NULL(pline);
-		pline->primitive = RSE::PRIMITIVE_LINES;
+		pline->primitive = RS::PRIMITIVE_LINES;
 		pline->polygon.create(Vector<int>(), p_points, colors);
 	} else {
 		if (p_colors.size() == 1) {
@@ -1305,30 +1269,27 @@ void RendererCanvasCull::canvas_item_add_rect(RID p_item, const Rect2 &p_rect, c
 	Item *canvas_item = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(canvas_item);
 
-	// Adjust the rectangle size to account for the antialiasing width.
-	const Rect2 &rect_adjusted = p_antialiased ? p_rect.grow(-FEATHER_SIZE * 0.25f) : p_rect;
-
 	Item::CommandRect *rect = canvas_item->alloc_command<Item::CommandRect>();
 	ERR_FAIL_NULL(rect);
 	rect->modulate = p_color;
-	rect->rect = rect_adjusted;
+	rect->rect = p_rect;
 
 	// Add feathers.
 	if (p_antialiased) {
 		float border_size = FEATHER_SIZE;
 
-		const real_t size = MIN(rect_adjusted.size.width, rect_adjusted.size.height);
+		const real_t size = MIN(p_rect.size.width, p_rect.size.height);
 		if (0.0f <= size && size < 1.0f) {
 			border_size *= size;
 		}
 
-		const Vector2 vec_down = Vector2(0.0f, rect_adjusted.size.height);
-		const Vector2 vec_right = Vector2(rect_adjusted.size.width, 0.0f);
+		const Vector2 vec_down = Vector2(0.0f, p_rect.size.height);
+		const Vector2 vec_right = Vector2(p_rect.size.width, 0.0f);
 
-		const Vector2 begin_left = rect_adjusted.position;
-		const Vector2 begin_right = rect_adjusted.position + vec_down;
-		const Vector2 end_left = rect_adjusted.position + vec_right;
-		const Vector2 end_right = rect_adjusted.position + rect_adjusted.size;
+		const Vector2 begin_left = p_rect.position;
+		const Vector2 begin_right = p_rect.position + vec_down;
+		const Vector2 end_left = p_rect.position + vec_right;
+		const Vector2 end_right = p_rect.position + p_rect.size;
 
 		const Vector2 dir = Vector2(0.0f, -1.0f);
 		const Vector2 dir2 = Vector2(-1.0f, 0.0f);
@@ -1474,19 +1435,11 @@ void RendererCanvasCull::canvas_item_add_ellipse(RID p_item, const Point2 &p_pos
 
 	static const int ellipse_segments = 64;
 
-	float major = p_major;
-	float minor = p_minor;
-	if (p_antialiased) {
-		// Adjust the diameter to account for the antialiasing width.
-		major = MAX(0.0f, major - FEATHER_SIZE * 0.25f);
-		minor = MAX(0.0f, minor - FEATHER_SIZE * 0.25f);
-	}
-
 	{
 		Item::CommandPolygon *ellipse = canvas_item->alloc_command<Item::CommandPolygon>();
 		ERR_FAIL_NULL(ellipse);
 
-		ellipse->primitive = RSE::PRIMITIVE_TRIANGLES;
+		ellipse->primitive = RS::PRIMITIVE_TRIANGLES;
 
 		Vector<int> indices;
 		Vector<Vector2> points;
@@ -1501,8 +1454,8 @@ void RendererCanvasCull::canvas_item_add_ellipse(RID p_item, const Point2 &p_pos
 
 		for (int i = 0; i < ellipse_segments + 1; i++) {
 			float angle = i * ellipse_point_step;
-			points_ptr[i].x = Math::cos(angle) * major;
-			points_ptr[i].y = Math::sin(angle) * minor;
+			points_ptr[i].x = Math::cos(angle) * p_major;
+			points_ptr[i].y = Math::sin(angle) * p_minor;
 			points_ptr[i] += p_pos;
 		}
 
@@ -1523,14 +1476,14 @@ void RendererCanvasCull::canvas_item_add_ellipse(RID p_item, const Point2 &p_pos
 	if (p_antialiased) {
 		float border_size = FEATHER_SIZE;
 
-		const float max_axis = fmax(major, minor) * 2.0f;
+		const float max_axis = fmax(p_major, p_minor) * 2.0f;
 		if (0.0f <= max_axis && max_axis < 1.0f) {
 			border_size *= max_axis * 0.5f;
 		}
 
 		Item::CommandPolygon *feather = canvas_item->alloc_command<Item::CommandPolygon>();
 		ERR_FAIL_NULL(feather);
-		feather->primitive = RSE::PRIMITIVE_TRIANGLE_STRIP;
+		feather->primitive = RS::PRIMITIVE_TRIANGLE_STRIP;
 
 		Color transparent = Color(p_color, 0.0);
 
@@ -1551,12 +1504,12 @@ void RendererCanvasCull::canvas_item_add_ellipse(RID p_item, const Point2 &p_pos
 			const float c = Math::cos(angle);
 			const float s = Math::sin(angle);
 
-			points_ptr[i * 2].x = c * major;
-			points_ptr[i * 2].y = s * minor;
+			points_ptr[i * 2].x = c * p_major;
+			points_ptr[i * 2].y = s * p_minor;
 			points_ptr[i * 2] += p_pos;
 
-			points_ptr[i * 2 + 1].x = c * (major + border_size);
-			points_ptr[i * 2 + 1].y = s * (minor + border_size);
+			points_ptr[i * 2 + 1].x = c * (p_major + border_size);
+			points_ptr[i * 2 + 1].y = s * (p_minor + border_size);
 			points_ptr[i * 2 + 1] += p_pos;
 
 			colors_ptr[i * 2] = p_color;
@@ -1709,7 +1662,7 @@ void RendererCanvasCull::canvas_item_add_texture_rect_region(RID p_item, const R
 	}
 }
 
-void RendererCanvasCull::canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, RSE::NinePatchAxisMode p_x_axis_mode, RSE::NinePatchAxisMode p_y_axis_mode, bool p_draw_center, const Color &p_modulate) {
+void RendererCanvasCull::canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, RS::NinePatchAxisMode p_x_axis_mode, RS::NinePatchAxisMode p_y_axis_mode, bool p_draw_center, const Color &p_modulate) {
 	Item *canvas_item = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(canvas_item);
 
@@ -1775,7 +1728,7 @@ void RendererCanvasCull::canvas_item_add_polygon(RID p_item, const Vector<Point2
 
 	Item::CommandPolygon *polygon = canvas_item->alloc_command<Item::CommandPolygon>();
 	ERR_FAIL_NULL(polygon);
-	polygon->primitive = RSE::PRIMITIVE_TRIANGLES;
+	polygon->primitive = RS::PRIMITIVE_TRIANGLES;
 	polygon->texture = p_texture;
 	polygon->polygon.create(indices, p_points, p_colors, p_uvs);
 }
@@ -1798,7 +1751,7 @@ void RendererCanvasCull::canvas_item_add_triangle_array(RID p_item, const Vector
 
 	polygon->polygon.create(p_indices, p_points, p_colors, p_uvs, p_bones, p_weights, p_count);
 
-	polygon->primitive = RSE::PRIMITIVE_TRIANGLES;
+	polygon->primitive = RS::PRIMITIVE_TRIANGLES;
 }
 
 void RendererCanvasCull::canvas_item_add_set_transform(RID p_item, const Transform2D &p_transform) {
@@ -1885,7 +1838,7 @@ void RendererCanvasCull::canvas_item_set_sort_children_by_y(RID p_item, bool p_e
 }
 
 void RendererCanvasCull::canvas_item_set_z_index(RID p_item, int p_z) {
-	ERR_FAIL_COND(p_z < RSE::CANVAS_ITEM_Z_MIN || p_z > RSE::CANVAS_ITEM_Z_MAX);
+	ERR_FAIL_COND(p_z < RS::CANVAS_ITEM_Z_MIN || p_z > RS::CANVAS_ITEM_Z_MAX);
 
 	Item *canvas_item = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(canvas_item);
@@ -2073,11 +2026,11 @@ void RendererCanvasCull::canvas_item_transform_physics_interpolation(RID p_item,
 	canvas_item->xform_curr = p_transform * canvas_item->xform_curr;
 }
 
-void RendererCanvasCull::canvas_item_set_canvas_group_mode(RID p_item, RSE::CanvasGroupMode p_mode, float p_clear_margin, bool p_fit_empty, float p_fit_margin, bool p_blur_mipmaps) {
+void RendererCanvasCull::canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin, bool p_fit_empty, float p_fit_margin, bool p_blur_mipmaps) {
 	Item *canvas_item = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(canvas_item);
 
-	if (p_mode == RSE::CANVAS_GROUP_MODE_DISABLED) {
+	if (p_mode == RS::CANVAS_GROUP_MODE_DISABLED) {
 		if (canvas_item->canvas_group != nullptr) {
 			memdelete(canvas_item->canvas_group);
 			canvas_item->canvas_group = nullptr;
@@ -2103,7 +2056,7 @@ void RendererCanvasCull::canvas_light_initialize(RID p_rid) {
 	clight->light_internal = RSG::canvas_render->light_create();
 }
 
-void RendererCanvasCull::canvas_light_set_mode(RID p_light, RSE::CanvasLightMode p_mode) {
+void RendererCanvasCull::canvas_light_set_mode(RID p_light, RS::CanvasLightMode p_mode) {
 	RendererCanvasRender::Light *clight = canvas_light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(clight);
 
@@ -2130,7 +2083,7 @@ void RendererCanvasCull::canvas_light_attach_to_canvas(RID p_light, RID p_canvas
 
 	if (clight->canvas.is_valid()) {
 		Canvas *canvas = canvas_owner.get_or_null(clight->canvas);
-		if (clight->mode == RSE::CANVAS_LIGHT_MODE_POINT) {
+		if (clight->mode == RS::CANVAS_LIGHT_MODE_POINT) {
 			canvas->lights.erase(clight);
 		} else {
 			canvas->directional_lights.erase(clight);
@@ -2145,7 +2098,7 @@ void RendererCanvasCull::canvas_light_attach_to_canvas(RID p_light, RID p_canvas
 
 	if (clight->canvas.is_valid()) {
 		Canvas *canvas = canvas_owner.get_or_null(clight->canvas);
-		if (clight->mode == RSE::CANVAS_LIGHT_MODE_POINT) {
+		if (clight->mode == RS::CANVAS_LIGHT_MODE_POINT) {
 			canvas->lights.insert(clight);
 		} else {
 			canvas->directional_lights.insert(clight);
@@ -2260,7 +2213,7 @@ void RendererCanvasCull::canvas_light_set_directional_distance(RID p_light, floa
 	clight->directional_distance = p_distance;
 }
 
-void RendererCanvasCull::canvas_light_set_blend_mode(RID p_light, RSE::CanvasLightBlendMode p_mode) {
+void RendererCanvasCull::canvas_light_set_blend_mode(RID p_light, RS::CanvasLightBlendMode p_mode) {
 	RendererCanvasRender::Light *clight = canvas_light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(clight);
 
@@ -2279,7 +2232,7 @@ void RendererCanvasCull::canvas_light_set_shadow_enabled(RID p_light, bool p_ena
 	RSG::canvas_render->light_set_use_shadow(clight->light_internal, clight->use_shadow);
 }
 
-void RendererCanvasCull::canvas_light_set_shadow_filter(RID p_light, RSE::CanvasLightShadowFilter p_filter) {
+void RendererCanvasCull::canvas_light_set_shadow_filter(RID p_light, RS::CanvasLightShadowFilter p_filter) {
 	RendererCanvasRender::Light *clight = canvas_light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(clight);
 
@@ -2463,7 +2416,7 @@ void RendererCanvasCull::canvas_occluder_polygon_set_shape(RID p_occluder_polygo
 	}
 }
 
-void RendererCanvasCull::canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, RSE::CanvasOccluderPolygonCullMode p_mode) {
+void RendererCanvasCull::canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, RS::CanvasOccluderPolygonCullMode p_mode) {
 	LightOccluderPolygon *occluder_poly = canvas_light_occluder_polygon_owner.get_or_null(p_occluder_polygon);
 	ERR_FAIL_NULL(occluder_poly);
 	occluder_poly->cull_mode = p_mode;
@@ -2484,7 +2437,7 @@ void RendererCanvasCull::canvas_texture_initialize(RID p_rid) {
 	RSG::texture_storage->canvas_texture_initialize(p_rid);
 }
 
-void RendererCanvasCull::canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) {
+void RendererCanvasCull::canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) {
 	RSG::texture_storage->canvas_texture_set_channel(p_canvas_texture, p_channel, p_texture);
 }
 
@@ -2492,20 +2445,20 @@ void RendererCanvasCull::canvas_texture_set_shading_parameters(RID p_canvas_text
 	RSG::texture_storage->canvas_texture_set_shading_parameters(p_canvas_texture, p_base_color, p_shininess);
 }
 
-void RendererCanvasCull::canvas_texture_set_texture_filter(RID p_canvas_texture, RSE::CanvasItemTextureFilter p_filter) {
+void RendererCanvasCull::canvas_texture_set_texture_filter(RID p_canvas_texture, RS::CanvasItemTextureFilter p_filter) {
 	RSG::texture_storage->canvas_texture_set_texture_filter(p_canvas_texture, p_filter);
 }
 
-void RendererCanvasCull::canvas_texture_set_texture_repeat(RID p_canvas_texture, RSE::CanvasItemTextureRepeat p_repeat) {
+void RendererCanvasCull::canvas_texture_set_texture_repeat(RID p_canvas_texture, RS::CanvasItemTextureRepeat p_repeat) {
 	RSG::texture_storage->canvas_texture_set_texture_repeat(p_canvas_texture, p_repeat);
 }
 
-void RendererCanvasCull::canvas_item_set_default_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) {
+void RendererCanvasCull::canvas_item_set_default_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) {
 	Item *ci = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(ci);
 	ci->texture_filter = p_filter;
 }
-void RendererCanvasCull::canvas_item_set_default_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) {
+void RendererCanvasCull::canvas_item_set_default_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) {
 	Item *ci = canvas_item_owner.get_or_null(p_item);
 	ERR_FAIL_NULL(ci);
 	ci->texture_repeat = p_repeat;
@@ -2759,29 +2712,29 @@ void RendererCanvasCull::tick() {
 }
 
 void RendererCanvasCull::update_interpolation_tick(bool p_process) {
-#define GODOT_UPDATE_INTERPOLATION_TICK(m_list_prev, m_list_curr, m_type, m_owner_list) \
-	/* Detect any that were on the previous transform list that are no longer active. */ \
-	for (unsigned int n = 0; n < _interpolation_data.m_list_prev->size(); n++) { \
-		const RID &rid = (*_interpolation_data.m_list_prev)[n]; \
-		m_type *item = m_owner_list.get_or_null(rid); \
+#define GODOT_UPDATE_INTERPOLATION_TICK(m_list_prev, m_list_curr, m_type, m_owner_list)      \
+	/* Detect any that were on the previous transform list that are no longer active. */     \
+	for (unsigned int n = 0; n < _interpolation_data.m_list_prev->size(); n++) {             \
+		const RID &rid = (*_interpolation_data.m_list_prev)[n];                              \
+		m_type *item = m_owner_list.get_or_null(rid);                                        \
 		/* no longer active? (either the instance deleted or no longer being transformed) */ \
-		if (item && !item->on_interpolate_transform_list) { \
-			item->xform_prev = item->xform_curr; \
-		} \
-	} \
-	/* and now for any in the transform list (being actively interpolated), */ \
-	/* keep the previous transform value up to date and ready for next tick */ \
-	if (p_process) { \
-		for (unsigned int n = 0; n < _interpolation_data.m_list_curr->size(); n++) { \
-			const RID &rid = (*_interpolation_data.m_list_curr)[n]; \
-			m_type *item = m_owner_list.get_or_null(rid); \
-			if (item) { \
-				item->xform_prev = item->xform_curr; \
-				item->on_interpolate_transform_list = false; \
-			} \
-		} \
-	} \
-	SWAP(_interpolation_data.m_list_curr, _interpolation_data.m_list_prev); \
+		if (item && !item->on_interpolate_transform_list) {                                  \
+			item->xform_prev = item->xform_curr;                                             \
+		}                                                                                    \
+	}                                                                                        \
+	/* and now for any in the transform list (being actively interpolated), */               \
+	/* keep the previous transform value up to date and ready for next tick */               \
+	if (p_process) {                                                                         \
+		for (unsigned int n = 0; n < _interpolation_data.m_list_curr->size(); n++) {         \
+			const RID &rid = (*_interpolation_data.m_list_curr)[n];                          \
+			m_type *item = m_owner_list.get_or_null(rid);                                    \
+			if (item) {                                                                      \
+				item->xform_prev = item->xform_curr;                                         \
+				item->on_interpolate_transform_list = false;                                 \
+			}                                                                                \
+		}                                                                                    \
+	}                                                                                        \
+	SWAP(_interpolation_data.m_list_curr, _interpolation_data.m_list_prev);                  \
 	_interpolation_data.m_list_curr->clear();
 
 	GODOT_UPDATE_INTERPOLATION_TICK(canvas_item_transform_update_list_prev, canvas_item_transform_update_list_curr, Item, canvas_item_owner);
diff --git a/engine/servers/rendering/renderer_canvas_cull.h b/engine/servers/rendering/renderer_canvas_cull.h
index de9b9290..e59b9d4d 100644
--- a/engine/servers/rendering/renderer_canvas_cull.h
+++ b/engine/servers/rendering/renderer_canvas_cull.h
@@ -31,11 +31,9 @@
 #pragma once
 
 #include "core/templates/paged_allocator.h"
+#include "renderer_compositor.h"
+#include "renderer_viewport.h"
 #include "servers/rendering/instance_uniforms.h"
-#include "servers/rendering/renderer_canvas_render.h"
-#include "servers/rendering/renderer_viewport.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
 
 class RendererCanvasCull {
 	static void _dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *p_tracker);
@@ -129,13 +127,13 @@ public:
 	struct LightOccluderPolygon {
 		bool active;
 		Rect2 aabb;
-		RSE::CanvasOccluderPolygonCullMode cull_mode;
+		RS::CanvasOccluderPolygonCullMode cull_mode;
 		RID occluder;
 		HashSet<RendererCanvasRender::LightOccluderInstance *> owners;
 
 		LightOccluderPolygon() {
 			active = false;
-			cull_mode = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+			cull_mode = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 		}
 	};
 
@@ -206,14 +204,14 @@ public:
 	_FORCE_INLINE_ void _attach_canvas_item_for_draw(Item *ci, Item *p_canvas_clip, RendererCanvasRender::Item **r_z_list, RendererCanvasRender::Item **r_z_last_list, const Transform2D &p_transform, const Rect2 &p_clip_rect, Rect2 p_global_rect, const Color &modulate, int p_z, RendererCanvasCull::Item *p_material_owner, bool p_use_canvas_group, RendererCanvasRender::Item *r_canvas_group_from);
 
 private:
-	void _render_canvas_item_tree(RID p_to_render_target, Canvas::ChildItem *p_child_items, int p_child_item_count, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void _render_canvas_item_tree(RID p_to_render_target, Canvas::ChildItem *p_child_items, int p_child_item_count, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingMethod::RenderInfo *r_render_info = nullptr);
 	void _cull_canvas_item(Item *p_canvas_item, const Transform2D &p_parent_xform, const Rect2 &p_clip_rect, const Color &p_modulate, int p_z, RendererCanvasRender::Item **r_z_list, RendererCanvasRender::Item **r_z_last_list, Item *p_canvas_clip, Item *p_material_owner, bool p_is_already_y_sorted, uint32_t p_canvas_cull_mask, const Point2 &p_repeat_size, int p_repeat_times, RendererCanvasRender::Item *p_repeat_source_item);
 
 	void _collect_ysort_children(RendererCanvasCull::Item *p_canvas_item, RendererCanvasCull::Item *p_material_owner, const Color &p_modulate, RendererCanvasCull::Item **r_items, int &r_index, int &r_ysort_children_count, int p_z, uint32_t p_canvas_cull_mask);
 	int _count_ysort_children(RendererCanvasCull::Item *p_canvas_item);
 	void _mark_ysort_dirty(RendererCanvasCull::Item *ysort_owner);
 
-	static constexpr int z_range = RSE::CANVAS_ITEM_Z_MAX - RSE::CANVAS_ITEM_Z_MIN + 1;
+	static constexpr int z_range = RS::CANVAS_ITEM_Z_MAX - RS::CANVAS_ITEM_Z_MIN + 1;
 
 	RendererCanvasRender::Item **z_list;
 	RendererCanvasRender::Item **z_last_list;
@@ -221,7 +219,7 @@ private:
 	Transform2D _current_camera_transform;
 
 public:
-	void render_canvas(RID p_render_target, Canvas *p_canvas, const Transform2D &p_transform, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, const Rect2 &p_clip_rect, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_transforms_to_pixel, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void render_canvas(RID p_render_target, Canvas *p_canvas, const Transform2D &p_transform, RendererCanvasRender::Light *p_lights, RendererCanvasRender::Light *p_directional_lights, const Rect2 &p_clip_rect, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_transforms_to_pixel, bool p_snap_2d_vertices_to_pixel, uint32_t p_canvas_cull_mask, RenderingMethod::RenderInfo *r_render_info = nullptr);
 
 	bool was_sdf_used();
 
@@ -257,8 +255,6 @@ public:
 
 	void canvas_item_set_update_when_visible(RID p_item, bool p_update);
 
-	float canvas_item_get_compensated_antialiasing_width(float p_width) const;
-
 	void canvas_item_add_line(RID p_item, const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width = -1.0, bool p_antialiased = false);
 	void canvas_item_add_polyline(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = -1.0, bool p_antialiased = false);
 	void canvas_item_add_multiline(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = -1.0, bool p_antialiased = false);
@@ -269,7 +265,7 @@ public:
 	void canvas_item_add_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = false);
 	void canvas_item_add_msdf_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, float p_px_range = 1.0, float p_scale = 1.0);
 	void canvas_item_add_lcd_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1));
-	void canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, RSE::NinePatchAxisMode p_x_axis_mode = RSE::NINE_PATCH_STRETCH, RSE::NinePatchAxisMode p_y_axis_mode = RSE::NINE_PATCH_STRETCH, bool p_draw_center = true, const Color &p_modulate = Color(1, 1, 1));
+	void canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, RS::NinePatchAxisMode p_x_axis_mode = RS::NINE_PATCH_STRETCH, RS::NinePatchAxisMode p_y_axis_mode = RS::NINE_PATCH_STRETCH, bool p_draw_center = true, const Color &p_modulate = Color(1, 1, 1));
 	void canvas_item_add_primitive(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, RID p_texture);
 	void canvas_item_add_polygon(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), RID p_texture = RID());
 	void canvas_item_add_triangle_array(RID p_item, const Vector<int> &p_indices, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), const Vector<int> &p_bones = Vector<int>(), const Vector<float> &p_weights = Vector<float>(), RID p_texture = RID(), int p_count = -1);
@@ -300,7 +296,7 @@ public:
 
 	void canvas_item_set_visibility_notifier(RID p_item, bool p_enable, const Rect2 &p_area, const Callable &p_enter_callable, const Callable &p_exit_callable);
 
-	void canvas_item_set_canvas_group_mode(RID p_item, RSE::CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false);
+	void canvas_item_set_canvas_group_mode(RID p_item, RS::CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false);
 
 	void canvas_item_set_debug_redraw(bool p_enabled);
 	bool canvas_item_get_debug_redraw() const;
@@ -314,7 +310,7 @@ public:
 
 	void update();
 
-	void canvas_light_set_mode(RID p_light, RSE::CanvasLightMode p_mode);
+	void canvas_light_set_mode(RID p_light, RS::CanvasLightMode p_mode);
 	void canvas_light_attach_to_canvas(RID p_light, RID p_canvas);
 	void canvas_light_set_enabled(RID p_light, bool p_enabled);
 	void canvas_light_set_texture_scale(RID p_light, float p_scale);
@@ -330,10 +326,10 @@ public:
 	void canvas_light_set_item_shadow_cull_mask(RID p_light, int p_mask);
 	void canvas_light_set_directional_distance(RID p_light, float p_distance);
 
-	void canvas_light_set_blend_mode(RID p_light, RSE::CanvasLightBlendMode p_mode);
+	void canvas_light_set_blend_mode(RID p_light, RS::CanvasLightBlendMode p_mode);
 
 	void canvas_light_set_shadow_enabled(RID p_light, bool p_enabled);
-	void canvas_light_set_shadow_filter(RID p_light, RSE::CanvasLightShadowFilter p_filter);
+	void canvas_light_set_shadow_filter(RID p_light, RS::CanvasLightShadowFilter p_filter);
 	void canvas_light_set_shadow_color(RID p_light, const Color &p_color);
 	void canvas_light_set_shadow_smooth(RID p_light, float p_smooth);
 
@@ -360,21 +356,21 @@ public:
 
 	void canvas_occluder_polygon_set_shape(RID p_occluder_polygon, const Vector<Vector2> &p_shape, bool p_closed);
 
-	void canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, RSE::CanvasOccluderPolygonCullMode p_mode);
+	void canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, RS::CanvasOccluderPolygonCullMode p_mode);
 
 	void canvas_set_shadow_texture_size(int p_size);
 
 	RID canvas_texture_allocate();
 	void canvas_texture_initialize(RID p_rid);
 
-	void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture);
+	void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture);
 	void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess);
 
-	void canvas_texture_set_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter);
-	void canvas_texture_set_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat);
+	void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter);
+	void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat);
 
-	void canvas_item_set_default_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter);
-	void canvas_item_set_default_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat);
+	void canvas_item_set_default_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter);
+	void canvas_item_set_default_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat);
 
 	void update_visibility_notifiers();
 	void update_dirty_items();
diff --git a/engine/servers/rendering/renderer_canvas_render.cpp b/engine/servers/rendering/renderer_canvas_render.cpp
index a6ad263d..6eb7bab9 100644
--- a/engine/servers/rendering/renderer_canvas_render.cpp
+++ b/engine/servers/rendering/renderer_canvas_render.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "renderer_canvas_render.h"
-
 #include "servers/rendering/rendering_server_globals.h"
 
 RendererCanvasRender *RendererCanvasRender::singleton = nullptr;
diff --git a/engine/servers/rendering/renderer_canvas_render.h b/engine/servers/rendering/renderer_canvas_render.h
index d452bc36..ea0a1749 100644
--- a/engine/servers/rendering/renderer_canvas_render.h
+++ b/engine/servers/rendering/renderer_canvas_render.h
@@ -30,10 +30,8 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-
-class RenderingServer;
+#include "servers/rendering/rendering_method.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCanvasRender {
 public:
@@ -68,14 +66,14 @@ public:
 		int item_mask;
 		int item_shadow_mask;
 		float directional_distance;
-		RSE::CanvasLightMode mode;
-		RSE::CanvasLightBlendMode blend_mode;
+		RS::CanvasLightMode mode;
+		RS::CanvasLightBlendMode blend_mode;
 		RID texture;
 		Vector2 texture_offset;
 		RID canvas;
 		bool use_shadow;
 		int shadow_buffer_size;
-		RSE::CanvasLightShadowFilter shadow_filter;
+		RS::CanvasLightShadowFilter shadow_filter;
 		Color shadow_color;
 		float shadow_smooth;
 
@@ -114,15 +112,15 @@ public:
 			scale = 1.0;
 			energy = 1.0;
 			item_shadow_mask = 1;
-			mode = RSE::CANVAS_LIGHT_MODE_POINT;
-			blend_mode = RSE::CANVAS_LIGHT_BLEND_MODE_ADD;
+			mode = RS::CANVAS_LIGHT_MODE_POINT;
+			blend_mode = RS::CANVAS_LIGHT_BLEND_MODE_ADD;
 			//			texture_cache = nullptr;
 			next_ptr = nullptr;
 			directional_next_ptr = nullptr;
 			filter_next_ptr = nullptr;
 			use_shadow = false;
 			shadow_buffer_size = 2048;
-			shadow_filter = RSE::CANVAS_LIGHT_FILTER_NONE;
+			shadow_filter = RS::CANVAS_LIGHT_FILTER_NONE;
 			shadow_smooth = 0.0;
 			render_index_cache = -1;
 			directional_distance = 10000.0;
@@ -221,8 +219,8 @@ public:
 			float margin[4];
 			bool draw_center;
 			Color color;
-			RSE::NinePatchAxisMode axis_x;
-			RSE::NinePatchAxisMode axis_y;
+			RS::NinePatchAxisMode axis_x;
+			RS::NinePatchAxisMode axis_y;
 
 			RID texture;
 
@@ -233,7 +231,7 @@ public:
 		};
 
 		struct CommandPolygon : public Command {
-			RSE::PrimitiveType primitive;
+			RS::PrimitiveType primitive;
 			Polygon polygon;
 
 			RID texture;
@@ -327,7 +325,7 @@ public:
 		bool use_identity_transform : 1;
 
 		struct CanvasGroup {
-			RSE::CanvasGroupMode mode;
+			RS::CanvasGroupMode mode;
 			bool fit_empty;
 			float fit_margin;
 			bool blur_mipmaps;
@@ -461,8 +459,8 @@ public:
 			light_masked = false;
 		}
 
-		RSE::CanvasItemTextureFilter texture_filter;
-		RSE::CanvasItemTextureRepeat texture_repeat;
+		RS::CanvasItemTextureFilter texture_filter;
+		RS::CanvasItemTextureRepeat texture_repeat;
 
 		Item() {
 			commands = nullptr;
@@ -485,8 +483,8 @@ public:
 			light_masked = false;
 			update_when_visible = false;
 			z_final = 0;
-			texture_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
-			texture_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
+			texture_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
+			texture_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
 			repeat_source = false;
 			on_interpolate_transform_list = false;
 			interpolated = true;
@@ -503,7 +501,7 @@ public:
 		}
 	};
 
-	virtual void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info = nullptr) = 0;
+	virtual void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info = nullptr) = 0;
 
 	struct LightOccluderInstance {
 		bool enabled : 1;
@@ -518,7 +516,7 @@ public:
 		Transform2D xform_cache;
 		int light_mask;
 		bool sdf_collision;
-		RSE::CanvasOccluderPolygonCullMode cull_cache;
+		RS::CanvasOccluderPolygonCullMode cull_cache;
 
 		LightOccluderInstance *next = nullptr;
 
@@ -529,7 +527,7 @@ public:
 			sdf_collision = false;
 			next = nullptr;
 			light_mask = 1;
-			cull_cache = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+			cull_cache = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 		}
 	};
 
@@ -543,14 +541,14 @@ public:
 
 	virtual RID occluder_polygon_create() = 0;
 	virtual void occluder_polygon_set_shape(RID p_occluder, const Vector<Vector2> &p_points, bool p_closed) = 0;
-	virtual void occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) = 0;
+	virtual void occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) = 0;
 	virtual void set_shadow_texture_size(int p_size) = 0;
 
 	virtual bool free(RID p_rid) = 0;
 	virtual void update() = 0;
 
 	virtual void set_debug_redraw(bool p_enabled, double p_time, const Color &p_color) = 0;
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) = 0;
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) = 0;
 
 	RendererCanvasRender() {
 		ERR_FAIL_COND_MSG(singleton != nullptr, "A RendererCanvasRender singleton already exists.");
diff --git a/engine/servers/rendering/renderer_compositor.cpp b/engine/servers/rendering/renderer_compositor.cpp
index e9cef62b..ab5ad2f6 100644
--- a/engine/servers/rendering/renderer_compositor.cpp
+++ b/engine/servers/rendering/renderer_compositor.cpp
@@ -30,8 +30,9 @@
 
 #include "renderer_compositor.h"
 
-#ifndef XR_DISABLED
 #include "core/config/project_settings.h"
+
+#ifndef XR_DISABLED
 #include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
@@ -44,6 +45,11 @@ RendererCompositor *RendererCompositor::create() {
 	return _create_func();
 }
 
+void RendererCompositor::set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter) {
+	RenderingServer::SplashStretchMode stretch_mode = RenderingServer::map_scaling_option_to_stretch_mode(p_scale);
+	set_boot_image_with_stretch(p_image, p_color, stretch_mode, p_use_filter);
+}
+
 bool RendererCompositor::is_xr_enabled() const {
 	return xr_enabled;
 }
diff --git a/engine/servers/rendering/renderer_compositor.h b/engine/servers/rendering/renderer_compositor.h
index 418cad2e..782daff4 100644
--- a/engine/servers/rendering/renderer_compositor.h
+++ b/engine/servers/rendering/renderer_compositor.h
@@ -30,24 +30,38 @@
 
 #pragma once
 
-#include "servers/display/display_server_enums.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/environment/renderer_fog.h"
+#include "servers/rendering/environment/renderer_gi.h"
+#include "servers/rendering/renderer_canvas_render.h"
+#include "servers/rendering/storage/light_storage.h"
+#include "servers/rendering/storage/material_storage.h"
+#include "servers/rendering/storage/mesh_storage.h"
+#include "servers/rendering/storage/particles_storage.h"
+#include "servers/rendering/storage/texture_storage.h"
+#include "servers/rendering/storage/utilities.h"
 
-class RendererCanvasRender;
 class RendererSceneRender;
+struct BlitToScreen {
+	RID render_target;
+	Rect2 src_rect = Rect2(0.0, 0.0, 1.0, 1.0);
+	Rect2i dst_rect;
 
-class RendererFog;
-class RendererGI;
-class RendererLightStorage;
-class RendererMaterialStorage;
-class RendererMeshStorage;
-class RendererParticlesStorage;
-class RendererTextureStorage;
-class RendererUtilities;
+	struct {
+		bool use_layer = false;
+		uint32_t layer = 0;
+	} multi_view;
 
-class Image;
-struct Color;
+	struct {
+		//lens distorted parameters for VR
+		bool apply = false;
+		Vector2 eye_center;
+		float k1 = 0.0;
+		float k2 = 0.0;
+
+		float upscale = 1.0;
+		float aspect_ratio = 1.0;
+	} lens_distortion;
+};
 
 class RendererCompositor {
 private:
@@ -62,24 +76,24 @@ protected:
 public:
 	static RendererCompositor *create();
 
-	virtual RendererCanvasRender *get_canvas() = 0;
-	virtual RendererSceneRender *get_scene() = 0;
-
-	virtual RendererFog *get_fog() = 0;
-	virtual RendererGI *get_gi() = 0;
+	virtual RendererUtilities *get_utilities() = 0;
 	virtual RendererLightStorage *get_light_storage() = 0;
 	virtual RendererMaterialStorage *get_material_storage() = 0;
 	virtual RendererMeshStorage *get_mesh_storage() = 0;
 	virtual RendererParticlesStorage *get_particles_storage() = 0;
 	virtual RendererTextureStorage *get_texture_storage() = 0;
-	virtual RendererUtilities *get_utilities() = 0;
+	virtual RendererGI *get_gi() = 0;
+	virtual RendererFog *get_fog() = 0;
+	virtual RendererCanvasRender *get_canvas() = 0;
+	virtual RendererSceneRender *get_scene() = 0;
 
-	virtual void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter = true) = 0;
+	virtual void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter = true) = 0;
+	virtual void set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter = true);
 
 	virtual void initialize() = 0;
 	virtual void begin_frame(double frame_step) = 0;
 
-	virtual void blit_render_targets_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount) = 0;
+	virtual void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount) = 0;
 
 	virtual bool is_opengl() = 0;
 	virtual void gl_end_frame(bool p_swap_buffers) = 0;
diff --git a/engine/servers/rendering/renderer_geometry_instance.h b/engine/servers/rendering/renderer_geometry_instance.h
index 7c7991e1..eb613072 100644
--- a/engine/servers/rendering/renderer_geometry_instance.h
+++ b/engine/servers/rendering/renderer_geometry_instance.h
@@ -30,11 +30,10 @@
 
 #pragma once
 
-#include "core/math/color.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_3d.h"
 #include "core/templates/rid.h"
-#include "servers/rendering/storage/utilities.h"
+#include "storage/utilities.h"
 
 // API definition for our RenderGeometryInstance class so we can expose this through GDExtension in the near future
 class RenderGeometryInstance {
@@ -67,8 +66,7 @@ public:
 	virtual Transform3D get_transform() = 0;
 	virtual AABB get_aabb() = 0;
 
-	virtual void clear_light_instances() = 0;
-	virtual void pair_light_instance(const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) = 0;
+	virtual void pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) = 0;
 	virtual void pair_reflection_probe_instances(const RID *p_reflection_probe_instances, uint32_t p_reflection_probe_instance_count) = 0;
 	virtual void pair_decal_instances(const RID *p_decal_instances, uint32_t p_decal_instance_count) = 0;
 	virtual void pair_voxel_gi_instances(const RID *p_voxel_gi_instances, uint32_t p_voxel_gi_instance_count) = 0;
@@ -114,7 +112,7 @@ public:
 	struct Data {
 		//data used less often goes into regular heap
 		RID base;
-		RSE::InstanceType base_type;
+		RS::InstanceType base_type;
 
 		RID skeleton;
 		Vector<RID> surface_materials;
diff --git a/engine/servers/rendering/renderer_rd/cluster_builder_rd.cpp b/engine/servers/rendering/renderer_rd/cluster_builder_rd.cpp
index ff94a38b..65be4094 100644
--- a/engine/servers/rendering/renderer_rd/cluster_builder_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/cluster_builder_rd.cpp
@@ -29,9 +29,8 @@
 /**************************************************************************/
 
 #include "cluster_builder_rd.h"
-
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_globals.h" // IWYU pragma: keep. RENDER_TIMESTAMP macro uses RSG.
+#include "servers/rendering/rendering_server_globals.h"
 
 ClusterBuilderSharedDataRD::ClusterBuilderSharedDataRD() {
 	RD::VertexFormatID vertex_format;
@@ -58,40 +57,89 @@ ClusterBuilderSharedDataRD::ClusterBuilderSharedDataRD() {
 		Vector<String> variants;
 		variants.push_back("");
 		variants.push_back("\n#define USE_ATTACHMENT\n");
+		variants.push_back("\n#define MOLTENVK_USED\n#define NO_IMAGE_ATOMICS\n");
+		variants.push_back("\n#define USE_ATTACHMENT\n#define MOLTENVK_USED\n#define NO_IMAGE_ATOMICS\n");
+		variants.push_back("\n#define NO_IMAGE_ATOMICS\n");
+		variants.push_back("\n#define MOLTENVK_USED\n#define NO_IMAGE_ATOMICS\n");
 
 		ClusterRender::ShaderVariant shader_variant;
 		RenderingDevice *rd = RD::get_singleton();
 		if (rd->has_feature(RD::SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS)) {
 			fb_format = rd->framebuffer_format_create_empty();
 			blend_state = RD::PipelineColorBlendState::create_disabled();
-			shader_variant = ClusterRender::SHADER_NORMAL;
+#if (defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED))
+			if (rd->get_device_capabilities().device_family == RDD::DEVICE_VULKAN) {
+				shader_variant = ClusterRender::SHADER_NORMAL_MOLTENVK;
+			} else if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+				shader_variant = ClusterRender::SHADER_NORMAL;
+			} else {
+				shader_variant = ClusterRender::SHADER_NORMAL_NO_ATOMICS;
+			}
+#else
+			if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+				shader_variant = ClusterRender::SHADER_NORMAL;
+			} else {
+				shader_variant = ClusterRender::SHADER_NORMAL_NO_ATOMICS;
+			}
+#endif
 		} else {
 			Vector<RD::AttachmentFormat> afs;
 			afs.push_back(RD::AttachmentFormat());
 			afs.write[0].usage_flags = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 			fb_format = rd->framebuffer_format_create(afs);
 			blend_state = RD::PipelineColorBlendState::create_blend();
-			shader_variant = ClusterRender::SHADER_USE_ATTACHMENT;
+#if (defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED))
+			if (rd->get_device_capabilities().device_family == RDD::DEVICE_VULKAN) {
+				shader_variant = ClusterRender::SHADER_USE_ATTACHMENT_MOLTENVK;
+			} else if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+				shader_variant = ClusterRender::SHADER_USE_ATTACHMENT;
+			} else {
+				shader_variant = ClusterRender::SHADER_USE_ATTACHMENT_NO_ATOMICS;
+			}
+#else
+			if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+				shader_variant = ClusterRender::SHADER_USE_ATTACHMENT;
+			} else {
+				shader_variant = ClusterRender::SHADER_USE_ATTACHMENT_NO_ATOMICS;
+			}
+#endif
 		}
 
 		cluster_render.cluster_render_shader.initialize(variants);
+#if (defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED))
+		if (rd->get_device_capabilities().device_family == RDD::DEVICE_VULKAN) {
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_NO_ATOMICS, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_NO_ATOMICS, false);
+		} else if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_NO_ATOMICS, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_NO_ATOMICS, false);
+		} else {
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_MOLTENVK, false);
+		}
+#else
+		if (rd->has_feature(RD::SUPPORTS_IMAGE_ATOMIC_32_BIT)) {
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_NO_ATOMICS, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_NO_ATOMICS, false);
+		} else {
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_NORMAL_MOLTENVK, false);
+			cluster_render.cluster_render_shader.set_variant_enabled(ClusterRender::SHADER_USE_ATTACHMENT_MOLTENVK, false);
+		}
+#endif
 		cluster_render.shader_version = cluster_render.cluster_render_shader.version_create();
 		cluster_render.shader = cluster_render.cluster_render_shader.version_get_shader(cluster_render.shader_version, shader_variant);
 		cluster_render.shader_pipelines[ClusterRender::PIPELINE_NORMAL] = RD::get_singleton()->render_pipeline_create(cluster_render.shader, fb_format, vertex_format, RD::RENDER_PRIMITIVE_TRIANGLES, rasterization_state, RD::PipelineMultisampleState(), RD::PipelineDepthStencilState(), blend_state, 0);
-
-		// On Apple platforms, gl_HelperInvocation (simd_is_helper_thread()) is unreliable with MSAA, causing rendering artifacts.
-		// Disable the helper invocation check for the MSAA pipeline via specialization constant.
-		Vector<RD::PipelineSpecializationConstant> specialization_constants;
-#if defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
-		{
-			RD::PipelineSpecializationConstant sc;
-			sc.type = RD::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_BOOL;
-			sc.constant_id = 0; // sc_use_helper_check
-			sc.bool_value = false;
-			specialization_constants.push_back(sc);
-		}
-#endif
-		cluster_render.shader_pipelines[ClusterRender::PIPELINE_MSAA] = RD::get_singleton()->render_pipeline_create(cluster_render.shader, fb_format, vertex_format, RD::RENDER_PRIMITIVE_TRIANGLES, rasterization_state, ms, RD::PipelineDepthStencilState(), blend_state, 0, 0, specialization_constants);
+		cluster_render.shader_pipelines[ClusterRender::PIPELINE_MSAA] = RD::get_singleton()->render_pipeline_create(cluster_render.shader, fb_format, vertex_format, RD::RENDER_PRIMITIVE_TRIANGLES, rasterization_state, ms, RD::PipelineDepthStencilState(), blend_state, 0);
 	}
 	{
 		Vector<String> versions;
@@ -453,7 +501,7 @@ void ClusterBuilderRD::bake_cluster() {
 
 			RendererRD::MaterialStorage::store_camera(adjusted_projection, state.projection);
 			state.inv_z_far = 1.0 / z_far;
-			state.screen_to_clusters_shift = Math::get_shift_from_power_of_2(cluster_size);
+			state.screen_to_clusters_shift = get_shift_from_power_of_2(cluster_size);
 			state.screen_to_clusters_shift -= divisor; //screen is smaller, shift one less
 
 			state.cluster_screen_width = cluster_screen_size.x;
@@ -552,7 +600,7 @@ void ClusterBuilderRD::debug(ElementType p_element) {
 	push_constant.screen_size[1] = screen_size.y;
 	push_constant.cluster_screen_size[0] = cluster_screen_size.x;
 	push_constant.cluster_screen_size[1] = cluster_screen_size.y;
-	push_constant.cluster_shift = Math::get_shift_from_power_of_2(cluster_size);
+	push_constant.cluster_shift = get_shift_from_power_of_2(cluster_size);
 	push_constant.cluster_type = p_element;
 	push_constant.orthogonal = camera_orthogonal;
 	push_constant.z_far = z_far;
diff --git a/engine/servers/rendering/renderer_rd/cluster_builder_rd.h b/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
index 7839e602..b6acf2a3 100644
--- a/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
+++ b/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
@@ -76,6 +76,10 @@ class ClusterBuilderSharedDataRD {
 		enum ShaderVariant {
 			SHADER_NORMAL,
 			SHADER_USE_ATTACHMENT,
+			SHADER_NORMAL_MOLTENVK,
+			SHADER_USE_ATTACHMENT_MOLTENVK,
+			SHADER_NORMAL_NO_ATOMICS,
+			SHADER_USE_ATTACHMENT_NO_ATOMICS,
 		};
 
 		enum PipelineVersion {
@@ -189,7 +193,14 @@ private:
 	};
 
 	uint32_t cluster_size = 32;
+#if defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
+	// Results in visual artifacts on macOS and iOS/visionOS when using MSAA and subgroups.
+	// Using subgroups and disabling MSAA is the optimal solution for now and also works
+	// with MoltenVK.
+	bool use_msaa = false;
+#else
 	bool use_msaa = true;
+#endif
 	Divisor divisor = DIVISOR_4;
 
 	Size2i screen_size;
@@ -290,11 +301,11 @@ public:
 			// Approximate, probably better to use a cone support function.
 			float max_d = -1e20;
 			float min_d = 1e20;
-#define CONE_MINMAX(m_x, m_y) \
-	{ \
+#define CONE_MINMAX(m_x, m_y)                                             \
+	{                                                                     \
 		float d = -xform.xform(Vector3(len * m_x, len * m_y, -radius)).z; \
-		min_d = MIN(d, min_d); \
-		max_d = MAX(d, max_d); \
+		min_d = MIN(d, min_d);                                            \
+		max_d = MAX(d, max_d);                                            \
 	}
 
 			CONE_MINMAX(1, 1);
diff --git a/engine/servers/rendering/renderer_rd/effects/SCsub b/engine/servers/rendering/renderer_rd/effects/SCsub
index e76f2589..30656a42 100644
--- a/engine/servers/rendering/renderer_rd/effects/SCsub
+++ b/engine/servers/rendering/renderer_rd/effects/SCsub
@@ -7,10 +7,6 @@ Import("env")
 
 env_effects = env.Clone()
 
-# metal-cpp headers for Metal FX
-if env["metal"]:
-    env_effects.Prepend(CPPPATH=["#thirdparty/metal-cpp"])
-
 # Thirdparty source files
 
 thirdparty_obj = []
@@ -73,6 +69,8 @@ env.servers_sources += thirdparty_obj
 module_obj = []
 
 env_effects.add_source_files(module_obj, "*.cpp")
+if env["metal"]:
+    env_effects.add_source_files(module_obj, "metal_fx.mm")
 env.servers_sources += module_obj
 
 # Needed to force rebuilding the module files when the thirdparty library is updated.
diff --git a/engine/servers/rendering/renderer_rd/effects/bokeh_dof.cpp b/engine/servers/rendering/renderer_rd/effects/bokeh_dof.cpp
index b7b78701..56fcbcfd 100644
--- a/engine/servers/rendering/renderer_rd/effects/bokeh_dof.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/bokeh_dof.cpp
@@ -29,11 +29,9 @@
 /**************************************************************************/
 
 #include "bokeh_dof.h"
-
-#include "servers/rendering/renderer_rd/effects/copy_effects.h"
+#include "copy_effects.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-#include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/camera_attributes_storage.h"
 
 using namespace RendererRD;
@@ -107,8 +105,8 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 	float bokeh_size = RSG::camera_attributes->camera_attributes_get_dof_blur_amount(p_camera_attributes) * 64; // Base 64 pixel radius.
 
 	bool use_jitter = RSG::camera_attributes->camera_attributes_get_dof_blur_use_jitter();
-	RSE::DOFBokehShape bokeh_shape = RSG::camera_attributes->camera_attributes_get_dof_blur_bokeh_shape();
-	RSE::DOFBlurQuality blur_quality = RSG::camera_attributes->camera_attributes_get_dof_blur_quality();
+	RS::DOFBokehShape bokeh_shape = RSG::camera_attributes->camera_attributes_get_dof_blur_bokeh_shape();
+	RS::DOFBlurQuality blur_quality = RSG::camera_attributes->camera_attributes_get_dof_blur_quality();
 
 	// setup our push constant
 	memset(&bokeh.push_constant, 0, sizeof(BokehPushConstant));
@@ -138,7 +136,7 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 	bokeh.push_constant.blur_scale = 0.5;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_base_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_buffers.base_texture }));
 	RD::Uniform u_depth_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_buffers.depth_texture }));
@@ -173,9 +171,9 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 	RD::get_singleton()->compute_list_dispatch_threads(compute_list, p_buffers.base_texture_size.x, p_buffers.base_texture_size.y, 1);
 	RD::get_singleton()->compute_list_add_barrier(compute_list);
 
-	if (bokeh_shape == RSE::DOF_BOKEH_BOX || bokeh_shape == RSE::DOF_BOKEH_HEXAGON) {
+	if (bokeh_shape == RS::DOF_BOKEH_BOX || bokeh_shape == RS::DOF_BOKEH_HEXAGON) {
 		//second pass
-		BokehMode mode = bokeh_shape == RSE::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX : BOKEH_GEN_BOKEH_HEXAGONAL;
+		BokehMode mode = bokeh_shape == RS::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX : BOKEH_GEN_BOKEH_HEXAGONAL;
 		shader = bokeh.compute_shader.version_get_shader(bokeh.shader_version, mode);
 		ERR_FAIL_COND(shader.is_null());
 
@@ -185,7 +183,7 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 
 		bokeh.push_constant.steps = quality_samples[blur_quality];
 
-		if (blur_quality == RSE::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RSE::DOF_BLUR_QUALITY_LOW) {
+		if (blur_quality == RS::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RS::DOF_BLUR_QUALITY_LOW) {
 			//box and hexagon are more or less the same, and they can work in either half (very low and low quality) or full (medium and high quality_ sizes)
 
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(shader, 0, u_half_image0), 0);
@@ -210,7 +208,7 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 		//third pass
 		bokeh.push_constant.second_pass = true;
 
-		if (blur_quality == RSE::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RSE::DOF_BLUR_QUALITY_LOW) {
+		if (blur_quality == RS::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RS::DOF_BLUR_QUALITY_LOW) {
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(shader, 0, u_half_image1), 0);
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(shader, 1, u_half_texture0), 1);
 		} else {
@@ -223,7 +221,7 @@ void BokehDOF::bokeh_dof_compute(const BokehBuffers &p_buffers, RID p_camera_att
 		RD::get_singleton()->compute_list_dispatch_threads(compute_list, bokeh.push_constant.size[0], bokeh.push_constant.size[1], 1);
 		RD::get_singleton()->compute_list_add_barrier(compute_list);
 
-		if (blur_quality == RSE::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RSE::DOF_BLUR_QUALITY_LOW) {
+		if (blur_quality == RS::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RS::DOF_BLUR_QUALITY_LOW) {
 			//forth pass, upscale for low quality
 
 			shader = bokeh.compute_shader.version_get_shader(bokeh.shader_version, BOKEH_COMPOSITE);
@@ -312,8 +310,8 @@ void BokehDOF::bokeh_dof_raster(const BokehBuffers &p_buffers, RID p_camera_attr
 	float dof_near_size = RSG::camera_attributes->camera_attributes_get_dof_near_transition(p_camera_attributes);
 	float bokeh_size = RSG::camera_attributes->camera_attributes_get_dof_blur_amount(p_camera_attributes) * 64; // Base 64 pixel radius.
 
-	RSE::DOFBokehShape bokeh_shape = RSG::camera_attributes->camera_attributes_get_dof_blur_bokeh_shape();
-	RSE::DOFBlurQuality blur_quality = RSG::camera_attributes->camera_attributes_get_dof_blur_quality();
+	RS::DOFBokehShape bokeh_shape = RSG::camera_attributes->camera_attributes_get_dof_blur_bokeh_shape();
+	RS::DOFBlurQuality blur_quality = RSG::camera_attributes->camera_attributes_get_dof_blur_quality();
 
 	// setup our base push constant
 	memset(&bokeh.push_constant, 0, sizeof(BokehPushConstant));
@@ -329,7 +327,7 @@ void BokehDOF::bokeh_dof_raster(const BokehBuffers &p_buffers, RID p_camera_attr
 	bokeh.push_constant.blur_size = bokeh_size;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_base_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_buffers.base_texture }));
 	RD::Uniform u_depth_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_buffers.depth_texture }));
@@ -370,14 +368,14 @@ void BokehDOF::bokeh_dof_raster(const BokehBuffers &p_buffers, RID p_camera_attr
 			RD::get_singleton()->draw_list_end();
 		}
 
-		if (bokeh_shape == RSE::DOF_BOKEH_BOX || bokeh_shape == RSE::DOF_BOKEH_HEXAGON) {
+		if (bokeh_shape == RS::DOF_BOKEH_BOX || bokeh_shape == RS::DOF_BOKEH_HEXAGON) {
 			// double pass approach
-			BokehMode mode = bokeh_shape == RSE::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX : BOKEH_GEN_BOKEH_HEXAGONAL;
+			BokehMode mode = bokeh_shape == RS::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX : BOKEH_GEN_BOKEH_HEXAGONAL;
 
 			RID shader = bokeh.raster_shader.version_get_shader(bokeh.shader_version, mode);
 			ERR_FAIL_COND(shader.is_null());
 
-			if (blur_quality == RSE::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RSE::DOF_BLUR_QUALITY_LOW) {
+			if (blur_quality == RS::DOF_BLUR_QUALITY_VERY_LOW || blur_quality == RS::DOF_BLUR_QUALITY_LOW) {
 				//box and hexagon are more or less the same, and they can work in either half (very low and low quality) or full (medium and high quality_ sizes)
 				bokeh.push_constant.size[0] = p_buffers.base_texture_size.x >> 1;
 				bokeh.push_constant.size[1] = p_buffers.base_texture_size.y >> 1;
@@ -405,7 +403,7 @@ void BokehDOF::bokeh_dof_raster(const BokehBuffers &p_buffers, RID p_camera_attr
 			// Pass 2
 			if (!bokeh.push_constant.half_size) {
 				// do not output weight, we're writing back into our base buffer
-				mode = bokeh_shape == RSE::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX_NOWEIGHT : BOKEH_GEN_BOKEH_HEXAGONAL_NOWEIGHT;
+				mode = bokeh_shape == RS::DOF_BOKEH_BOX ? BOKEH_GEN_BOKEH_BOX_NOWEIGHT : BOKEH_GEN_BOKEH_HEXAGONAL_NOWEIGHT;
 
 				shader = bokeh.raster_shader.version_get_shader(bokeh.shader_version, mode);
 				ERR_FAIL_COND(shader.is_null());
diff --git a/engine/servers/rendering/renderer_rd/effects/copy_effects.cpp b/engine/servers/rendering/renderer_rd/effects/copy_effects.cpp
index beccf38f..e210397b 100644
--- a/engine/servers/rendering/renderer_rd/effects/copy_effects.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/copy_effects.cpp
@@ -29,13 +29,11 @@
 /**************************************************************************/
 
 #include "copy_effects.h"
-
 #include "core/config/project_settings.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-
-#include <thirdparty/misc/cubemap_coeffs.h>
+#include "thirdparty/misc/cubemap_coeffs.h"
 
 using namespace RendererRD;
 
@@ -436,7 +434,7 @@ void CopyEffects::copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, cons
 	copy.push_constant.target[1] = p_rect.position.y;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_dest_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_texture);
@@ -476,7 +474,7 @@ void CopyEffects::copy_octmap_to_panorama(RID p_source_octmap, RID p_dest_panora
 	copy.push_constant.luminance_multiplier = raster_effects.has_flag(RASTER_EFFECT_COPY) ? 2.0 : 1.0;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_octmap(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_octmap }));
 	RD::Uniform u_dest_panorama(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_panorama);
@@ -513,7 +511,7 @@ void CopyEffects::copy_depth_to_rect(RID p_source_rd_texture, RID p_dest_texture
 	copy.push_constant.target[1] = p_rect.position.y;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_dest_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_texture);
@@ -552,7 +550,7 @@ void CopyEffects::copy_depth_to_rect_and_linearize(RID p_source_rd_texture, RID
 	copy.push_constant.camera_z_near = p_z_near;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_dest_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_texture);
@@ -591,7 +589,7 @@ void CopyEffects::copy_to_atlas_fb(RID p_source_rd_texture, RID p_dest_framebuff
 	copy_to_fb.push_constant.luminance_multiplier = 1.0;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -649,7 +647,7 @@ void CopyEffects::copy_to_fb_rect(RID p_source_rd_texture, RID p_dest_framebuffe
 	}
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -692,7 +690,7 @@ void CopyEffects::copy_to_drawlist(RD::DrawListID p_draw_list, RD::FramebufferFo
 	}
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -720,7 +718,7 @@ void CopyEffects::copy_raster(RID p_source_texture, RID p_dest_framebuffer) {
 	memset(&blur_raster.push_constant, 0, sizeof(BlurRasterPushConstant));
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_texture }));
 
@@ -755,7 +753,7 @@ void CopyEffects::gaussian_blur(RID p_source_rd_texture, RID p_texture, const Re
 	copy.push_constant.section[3] = p_size.height;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_texture);
@@ -794,7 +792,7 @@ void CopyEffects::gaussian_blur_raster(RID p_source_rd_texture, RID p_dest_textu
 	blur_raster.push_constant.dest_pixel_size[1] = 1.0 / float(p_size.y);
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -838,7 +836,7 @@ void CopyEffects::gaussian_glow(RID p_source_rd_texture, RID p_back_texture, con
 	copy.push_constant.glow_auto_exposure_scale = p_auto_exposure_scale; //unused also
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_back_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_back_texture);
@@ -931,7 +929,7 @@ void CopyEffects::gaussian_glow_upsample_raster(RID p_source_rd_texture, RID p_d
 	spec_constant |= p_level > 0.01 ? 2 : 0;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_blend_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_blend_texture }));
 
@@ -965,7 +963,7 @@ void CopyEffects::make_mipmap(RID p_source_rd_texture, RID p_dest_texture, const
 	copy.push_constant.section[3] = p_size.height;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 	RD::Uniform u_dest_texture(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_texture);
@@ -1001,7 +999,7 @@ void CopyEffects::make_mipmap_raster(RID p_source_rd_texture, RID p_dest_texture
 	blur_raster.push_constant.dest_pixel_size[1] = 1.0 / float(p_size.y);
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -1103,7 +1101,7 @@ void CopyEffects::copy_cubemap_to_dp(RID p_source_rd_texture, RID p_dst_framebuf
 	push_constant.texel_size[0] *= p_dp_flip ? -1.0f : 1.0f; // Encode dp flip as x size sign
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -1130,7 +1128,7 @@ void CopyEffects::copy_cubemap_to_octmap(RID p_source_rd_texture, RID p_dst_fram
 
 	cube_to_octmap.push_constant.border_size = 1.0f - p_border_size * 2.0f;
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
 	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(p_dst_framebuffer);
@@ -1154,7 +1152,7 @@ void CopyEffects::octmap_downsample(RID p_source_octmap, RID p_dest_octmap, cons
 	octmap_downsampler.push_constant.border_size = 1.0f - p_border_size * 2.0f;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_octmap(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_octmap }));
 	RD::Uniform u_dest_octmap(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ p_dest_octmap }));
@@ -1204,7 +1202,7 @@ void CopyEffects::octmap_downsample_raster(RID p_source_octmap, RID p_dest_frame
 	octmap_downsampler.push_constant.border_size = 1.0f - p_border_size * 2.0f;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_cubemap(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_octmap }));
 
@@ -1251,6 +1249,7 @@ void CopyEffects::octmap_filter(RID p_source_octmap, const Vector<RID> &p_dest_o
 	OctmapFilterPushConstant push_constant;
 	push_constant.border_size[0] = p_border_size;
 	push_constant.border_size[1] = 1.0f - p_border_size * 2.0f;
+	push_constant.size = 320;
 
 	Vector<RD::Uniform> uniforms;
 	for (int i = 0; i < p_dest_octmap.size(); i++) {
@@ -1266,7 +1265,7 @@ void CopyEffects::octmap_filter(RID p_source_octmap, const Vector<RID> &p_dest_o
 	filter.image_uniform_set = RD::get_singleton()->uniform_set_create(uniforms, filter.compute_shader.version_get_shader(filter.shader_version, 0), 2);
 
 	// setup our uniforms
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_octmap(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_mipmap_sampler, p_source_octmap }));
 
@@ -1321,7 +1320,7 @@ void CopyEffects::octmap_filter_raster(RID p_source_octmap, RID p_dest_framebuff
 	push_constant.mip_level = p_mip_level;
 
 	// setup our uniforms
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_octmap(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_mipmap_sampler, p_source_octmap }));
 
@@ -1364,7 +1363,7 @@ void CopyEffects::octmap_roughness(RID p_source_rd_texture, RID p_dest_texture,
 	roughness.push_constant.border_size[1] = 1.0f - p_border_size * 2.0;
 
 	// setup our uniforms
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_mipmap_sampler, p_source_rd_texture }));
 	RD::Uniform u_dest_texture(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ p_dest_texture }));
@@ -1421,7 +1420,7 @@ void CopyEffects::octmap_roughness_raster(RID p_source_rd_texture, RID p_dest_fr
 	roughness.push_constant.border_size[1] = 1.0f - p_border_size * 2.0;
 
 	// Setup our uniforms.
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -1444,7 +1443,7 @@ void CopyEffects::merge_specular(RID p_dest_framebuffer, RID p_specular, RID p_b
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 	ERR_FAIL_NULL(material_storage);
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::get_singleton()->draw_command_begin_label("Merge Specular");
 
diff --git a/engine/servers/rendering/renderer_rd/effects/copy_effects.h b/engine/servers/rendering/renderer_rd/effects/copy_effects.h
index 4144ce2a..e15fd4a5 100644
--- a/engine/servers/rendering/renderer_rd/effects/copy_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/copy_effects.h
@@ -44,6 +44,9 @@
 #include "servers/rendering/renderer_rd/shaders/effects/octmap_roughness.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/octmap_roughness_raster.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/specular_merge.glsl.gen.h"
+#include "servers/rendering/renderer_scene_render.h"
+
+#include "servers/rendering/rendering_server.h"
 
 namespace RendererRD {
 
@@ -234,7 +237,7 @@ private:
 
 	struct CopyToOctmapPushConstant {
 		float border_size;
-		uint32_t pad[3];
+		float pad[3];
 	};
 
 	struct CopyToOctmap {
@@ -279,8 +282,8 @@ private:
 
 	struct OctmapFilterPushConstant {
 		float border_size[2];
-		uint32_t pad1;
-		uint32_t pad2;
+		uint32_t size;
+		uint32_t pad;
 	};
 
 	struct OctmapFilterRasterPushConstant {
diff --git a/engine/servers/rendering/renderer_rd/effects/debug_effects.cpp b/engine/servers/rendering/renderer_rd/effects/debug_effects.cpp
index 036826b7..64286cde 100644
--- a/engine/servers/rendering/renderer_rd/effects/debug_effects.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/debug_effects.cpp
@@ -29,11 +29,9 @@
 /**************************************************************************/
 
 #include "debug_effects.h"
-
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-#include "servers/rendering/rendering_server_globals.h"
 
 using namespace RendererRD;
 
@@ -183,7 +181,7 @@ void DebugEffects::draw_shadow_frustum(RID p_light, const Projection &p_cam_proj
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
 	RID base = light_storage->light_instance_get_base_light(p_light);
-	ERR_FAIL_COND(light_storage->light_get_type(base) != RSE::LIGHT_DIRECTIONAL);
+	ERR_FAIL_COND(light_storage->light_get_type(base) != RS::LIGHT_DIRECTIONAL);
 
 	// Make sure our buffers and arrays exist.
 	_create_frustum_arrays();
@@ -193,12 +191,12 @@ void DebugEffects::draw_shadow_frustum(RID p_light, const Projection &p_cam_proj
 	points.resize(8 * sizeof(float) * 3);
 
 	// Get info about our splits.
-	RSE::LightDirectionalShadowMode shadow_mode = light_storage->light_directional_get_shadow_mode(base);
+	RS::LightDirectionalShadowMode shadow_mode = light_storage->light_directional_get_shadow_mode(base);
 	bool overlap = light_storage->light_directional_get_blend_splits(base);
 	int splits = 1;
-	if (shadow_mode == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
+	if (shadow_mode == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
 		splits = 4;
-	} else if (shadow_mode == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
+	} else if (shadow_mode == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
 		splits = 2;
 	}
 
@@ -214,7 +212,7 @@ void DebugEffects::draw_shadow_frustum(RID p_light, const Projection &p_cam_proj
 	}
 	real_t min_distance = p_cam_projection.get_z_near();
 	real_t max_distance = p_cam_projection.get_z_far();
-	real_t shadow_max = RSG::light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
+	real_t shadow_max = RSG::light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
 	if (shadow_max > 0 && !is_orthogonal) {
 		max_distance = MIN(shadow_max, max_distance);
 	}
@@ -227,7 +225,7 @@ void DebugEffects::draw_shadow_frustum(RID p_light, const Projection &p_cam_proj
 	real_t distances[5];
 	distances[0] = min_distance;
 	for (int i = 0; i < splits; i++) {
-		distances[i + 1] = min_distance + RSG::light_storage->light_get_param(base, RSE::LightParam(RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET + i)) * range;
+		distances[i + 1] = min_distance + RSG::light_storage->light_get_param(base, RS::LightParam(RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET + i)) * range;
 	};
 	distances[splits] = max_distance;
 
@@ -348,7 +346,7 @@ void DebugEffects::draw_motion_vectors(RID p_velocity, RID p_depth, RID p_dest_f
 	UniformSetCacheRD *uniform_set_cache = UniformSetCacheRD::get_singleton();
 	ERR_FAIL_NULL(uniform_set_cache);
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	RD::Uniform u_source_velocity(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_velocity }));
 	RD::Uniform u_source_depth(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 1, Vector<RID>({ default_sampler, p_depth }));
 
diff --git a/engine/servers/rendering/renderer_rd/effects/debug_effects.h b/engine/servers/rendering/renderer_rd/effects/debug_effects.h
index 9f9a85eb..40ebdd96 100644
--- a/engine/servers/rendering/renderer_rd/effects/debug_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/debug_effects.h
@@ -71,7 +71,7 @@ private:
 		float reprojection_matrix[16];
 		float resolution[2];
 		uint32_t force_derive_from_depth;
-		uint32_t pad;
+		float pad;
 	};
 
 	struct {
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr.cpp b/engine/servers/rendering/renderer_rd/effects/fsr.cpp
index 10796cad..1c0b5f7c 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/fsr.cpp
@@ -29,9 +29,8 @@
 /**************************************************************************/
 
 #include "fsr.h"
-
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
+#include "../storage_rd/material_storage.h"
+#include "../uniform_set_cache_rd.h"
 
 using namespace RendererRD;
 
@@ -95,7 +94,7 @@ void FSR::process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_rd_te
 	RID shader = fsr_shader.version_get_shader(shader_version, 0);
 	ERR_FAIL_COND(shader.is_null());
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	//FSR Easc
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, { default_sampler, p_source_rd_texture });
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr.h b/engine/servers/rendering/renderer_rd/effects/fsr.h
index e1766cb1..7f308be2 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr.h
+++ b/engine/servers/rendering/renderer_rd/effects/fsr.h
@@ -30,10 +30,11 @@
 
 #pragma once
 
-#include "servers/rendering/renderer_rd/effects/spatial_upscaler.h"
+#include "spatial_upscaler.h"
+
+#include "../storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/pipeline_deferred_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 
 namespace RendererRD {
 
@@ -64,7 +65,7 @@ private:
 		float upscaled_height;
 		float sharpness;
 		int pass;
-		int pad[2];
+		int _unused0, _unused1;
 	};
 
 	FsrUpscaleShaderRD fsr_shader;
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr2.cpp b/engine/servers/rendering/renderer_rd/effects/fsr2.cpp
index 207bb29a..a0a8d8a5 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr2.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/fsr2.cpp
@@ -30,8 +30,8 @@
 
 #include "fsr2.h"
 
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
+#include "../storage_rd/material_storage.h"
+#include "../uniform_set_cache_rd.h"
 
 using namespace RendererRD;
 
@@ -267,7 +267,7 @@ static FfxErrorCode register_resource_rd(FfxFsr2Interface *p_backend_interface,
 
 static FfxErrorCode unregister_resources_rd(FfxFsr2Interface *p_backend_interface) {
 	FSR2Context::Scratch &scratch = *reinterpret_cast<FSR2Context::Scratch *>(p_backend_interface->scratchBuffer);
-	LocalVector<uint32_t> dynamic_list_copy(scratch.resources.dynamic_list);
+	LocalVector<uint32_t> dynamic_list_copy = scratch.resources.dynamic_list;
 	for (uint32_t i : dynamic_list_copy) {
 		scratch.resources.remove(i);
 	}
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr2.h b/engine/servers/rendering/renderer_rd/effects/fsr2.h
index 5c1d1fc4..6554588d 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr2.h
+++ b/engine/servers/rendering/renderer_rd/effects/fsr2.h
@@ -45,7 +45,7 @@
 #define FFX_GCC
 #endif
 
-#include <thirdparty/amd-fsr2/ffx_fsr2.h>
+#include "thirdparty/amd-fsr2/ffx_fsr2.h"
 
 #define FSR2_MAX_QUEUED_FRAMES (4)
 #define FSR2_MAX_UNIFORM_BUFFERS (4)
diff --git a/engine/servers/rendering/renderer_rd/effects/luminance.cpp b/engine/servers/rendering/renderer_rd/effects/luminance.cpp
index 7d83aa1b..1e0d3d8b 100644
--- a/engine/servers/rendering/renderer_rd/effects/luminance.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/luminance.cpp
@@ -29,10 +29,9 @@
 /**************************************************************************/
 
 #include "luminance.h"
-
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
+#include "../framebuffer_cache_rd.h"
+#include "../uniform_set_cache_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 
 using namespace RendererRD;
 
@@ -163,7 +162,7 @@ void Luminance::luminance_reduction(RID p_source_texture, const Size2i p_source_
 	ERR_FAIL_NULL(material_storage);
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	if (prefer_raster_effects) {
 		LuminanceReduceRasterPushConstant push_constant;
diff --git a/engine/servers/rendering/renderer_rd/effects/metal_fx.h b/engine/servers/rendering/renderer_rd/effects/metal_fx.h
index c4886973..b2a68aa1 100644
--- a/engine/servers/rendering/renderer_rd/effects/metal_fx.h
+++ b/engine/servers/rendering/renderer_rd/effects/metal_fx.h
@@ -36,33 +36,37 @@
 
 #ifdef METAL_ENABLED
 
-#include "core/templates/paged_allocator.h"
-#include "servers/rendering/renderer_rd/effects/spatial_upscaler.h"
-#include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering/rendering_device_driver.h"
+#include "spatial_upscaler.h"
 
-namespace MTLFX {
-class SpatialScalerBase;
-class TemporalScalerBase;
-} //namespace MTLFX
+#include "core/templates/paged_allocator.h"
+#include "servers/rendering/renderer_scene_render.h"
+
+#ifdef __OBJC__
+@protocol MTLFXSpatialScaler;
+@protocol MTLFXTemporalScaler;
+#endif
 
 namespace RendererRD {
 
 struct MFXSpatialContext {
-	MTLFX::SpatialScalerBase *scaler = nullptr;
+#ifdef __OBJC__
+	id<MTLFXSpatialScaler> scaler = nullptr;
+#else
+	void *scaler = nullptr;
+#endif
 	MFXSpatialContext() = default;
 	~MFXSpatialContext();
 };
 
 class MFXSpatialEffect : public SpatialUpscaler {
 	struct CallbackArgs {
-		MFXSpatialEffect *owner = nullptr;
-		MTLFX::SpatialScalerBase *scaler = nullptr;
+		MFXSpatialEffect *owner;
 		RDD::TextureID src;
 		RDD::TextureID dst;
+		MFXSpatialContext ctx;
 
-		CallbackArgs(MFXSpatialEffect *p_owner, RDD::TextureID p_src, RDD::TextureID p_dst, const MFXSpatialContext &p_ctx) :
-				owner(p_owner), scaler(p_ctx.scaler), src(p_src), dst(p_dst) {}
+		CallbackArgs(MFXSpatialEffect *p_owner, RDD::TextureID p_src, RDD::TextureID p_dst, MFXSpatialContext p_ctx) :
+				owner(p_owner), src(p_src), dst(p_dst), ctx(p_ctx) {}
 
 		static void free(CallbackArgs **p_args) {
 			(*p_args)->owner->args_allocator.free(*p_args);
@@ -81,8 +85,8 @@ public:
 	struct CreateParams {
 		Vector2i input_size;
 		Vector2i output_size;
-		RDD::DataFormat input_format;
-		RDD::DataFormat output_format;
+		RD::DataFormat input_format;
+		RD::DataFormat output_format;
 	};
 
 	MFXSpatialContext *create_context(CreateParams p_params) const;
@@ -94,21 +98,25 @@ public:
 #ifdef METAL_MFXTEMPORAL_ENABLED
 
 struct MFXTemporalContext {
-	MTLFX::TemporalScalerBase *scaler = nullptr;
+#ifdef __OBJC__
+	id<MTLFXTemporalScaler> scaler = nullptr;
+#else
+	void *scaler = nullptr;
+#endif
 	MFXTemporalContext() = default;
 	~MFXTemporalContext();
 };
 
 class MFXTemporalEffect {
 	struct CallbackArgs {
-		MFXTemporalEffect *owner = nullptr;
-		MTLFX::TemporalScalerBase *scaler = nullptr;
+		MFXTemporalEffect *owner;
 		RDD::TextureID src;
 		RDD::TextureID depth;
 		RDD::TextureID motion;
 		RDD::TextureID exposure;
 		Vector2 jitter_offset;
 		RDD::TextureID dst;
+		MFXTemporalContext ctx;
 		bool reset = false;
 
 		CallbackArgs(
@@ -119,16 +127,16 @@ class MFXTemporalEffect {
 				RDD::TextureID p_exposure,
 				Vector2 p_jitter_offset,
 				RDD::TextureID p_dst,
-				const MFXTemporalContext &p_ctx,
+				MFXTemporalContext p_ctx,
 				bool p_reset) :
 				owner(p_owner),
-				scaler(p_ctx.scaler),
 				src(p_src),
 				depth(p_depth),
 				motion(p_motion),
 				exposure(p_exposure),
 				jitter_offset(p_jitter_offset),
 				dst(p_dst),
+				ctx(p_ctx),
 				reset(p_reset) {}
 
 		static void free(CallbackArgs **p_args) {
@@ -148,11 +156,11 @@ public:
 	struct CreateParams {
 		Vector2i input_size;
 		Vector2i output_size;
-		RDD::DataFormat input_format;
-		RDD::DataFormat depth_format;
-		RDD::DataFormat motion_format;
-		RDD::DataFormat reactive_format;
-		RDD::DataFormat output_format;
+		RD::DataFormat input_format;
+		RD::DataFormat depth_format;
+		RD::DataFormat motion_format;
+		RD::DataFormat reactive_format;
+		RD::DataFormat output_format;
 		Vector2 motion_vector_scale;
 	};
 
diff --git a/engine/servers/rendering/renderer_rd/effects/metal_fx.cpp b/engine/servers/rendering/renderer_rd/effects/metal_fx.mm
similarity index 59%
rename from engine/servers/rendering/renderer_rd/effects/metal_fx.cpp
rename to engine/servers/rendering/renderer_rd/effects/metal_fx.mm
index e596ae91..0f6152d5 100644
--- a/engine/servers/rendering/renderer_rd/effects/metal_fx.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/metal_fx.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  metal_fx.cpp                                                          */
+/*  metal_fx.mm                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,24 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef METAL_ENABLED
+#import "metal_fx.h"
 
-#include "metal_fx.h"
+#import "../storage_rd/render_scene_buffers_rd.h"
+#import "drivers/metal/pixel_formats.h"
+#import "drivers/metal/rendering_device_driver_metal.h"
 
-#include "drivers/metal/pixel_formats.h"
-#include "drivers/metal/rendering_device_driver_metal3.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
-
-#include <MetalFX/MetalFX.hpp>
+#import <Metal/Metal.h>
+#import <MetalFX/MetalFX.h>
 
 using namespace RendererRD;
 
 #pragma mark - Spatial Scaler
 
 MFXSpatialContext::~MFXSpatialContext() {
-	if (scaler) {
-		scaler->release();
-	}
 }
 
 MFXSpatialEffect::MFXSpatialEffect() {
@@ -55,21 +51,28 @@ MFXSpatialEffect::~MFXSpatialEffect() {
 }
 
 void MFXSpatialEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata) {
-	MDCommandBufferBase *obj = (MDCommandBufferBase *)(p_command_buffer.id);
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
+
+	MDCommandBuffer *obj = (MDCommandBuffer *)(p_command_buffer.id);
 	obj->end();
 
-	MTL::Texture *src_texture = reinterpret_cast<MTL::Texture *>(p_userdata->src.id);
-	MTL::Texture *dst_texture = reinterpret_cast<MTL::Texture *>(p_userdata->dst.id);
+	id<MTLTexture> src_texture = rid::get(p_userdata->src);
+	id<MTLTexture> dst_texture = rid::get(p_userdata->dst);
 
-	MTLFX::SpatialScalerBase *scaler = p_userdata->scaler;
-	scaler->setColorTexture(src_texture);
-	scaler->setOutputTexture(dst_texture);
-	MTLFX::SpatialScaler *s = static_cast<MTLFX::SpatialScaler *>(scaler);
-	MTL3::MDCommandBuffer *cmd = (MTL3::MDCommandBuffer *)(p_command_buffer.id);
-	s->encodeToCommandBuffer(cmd->get_command_buffer());
-	obj->retain_resource(scaler);
+	__block id<MTLFXSpatialScaler> scaler = p_userdata->ctx.scaler;
+	scaler.colorTexture = src_texture;
+	scaler.outputTexture = dst_texture;
+	[scaler encodeToCommandBuffer:obj->get_command_buffer()];
+	// TODO(sgc): add API to retain objects until the command buffer completes
+	[obj->get_command_buffer() addCompletedHandler:^(id<MTLCommandBuffer> _Nonnull) {
+		// This block retains a reference to the scaler until the command buffer.
+		// completes.
+		scaler = nil;
+	}];
 
 	CallbackArgs::free(&p_userdata);
+
+	GODOT_CLANG_WARNING_POP
 }
 
 void MFXSpatialEffect::ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) {
@@ -95,23 +98,27 @@ void MFXSpatialEffect::process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p
 MFXSpatialContext *MFXSpatialEffect::create_context(CreateParams p_params) const {
 	DEV_ASSERT(RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL));
 
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
+
 	RenderingDeviceDriverMetal *rdd = (RenderingDeviceDriverMetal *)RD::get_singleton()->get_device_driver();
 	PixelFormats &pf = rdd->get_pixel_formats();
-	MTL::Device *dev = rdd->get_device();
+	id<MTLDevice> dev = rdd->get_device();
 
-	NS::SharedPtr<MTLFX::SpatialScalerDescriptor> desc = NS::TransferPtr(MTLFX::SpatialScalerDescriptor::alloc()->init());
-	desc->setInputWidth((NS::UInteger)p_params.input_size.width);
-	desc->setInputHeight((NS::UInteger)p_params.input_size.height);
+	MTLFXSpatialScalerDescriptor *desc = [MTLFXSpatialScalerDescriptor new];
+	desc.inputWidth = (NSUInteger)p_params.input_size.width;
+	desc.inputHeight = (NSUInteger)p_params.input_size.height;
 
-	desc->setOutputWidth((NS::UInteger)p_params.output_size.width);
-	desc->setOutputHeight((NS::UInteger)p_params.output_size.height);
-
-	desc->setColorTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.input_format));
-	desc->setOutputTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.output_format));
-	desc->setColorProcessingMode(MTLFX::SpatialScalerColorProcessingModeLinear);
+	desc.outputWidth = (NSUInteger)p_params.output_size.width;
+	desc.outputHeight = (NSUInteger)p_params.output_size.height;
 
+	desc.colorTextureFormat = pf.getMTLPixelFormat(p_params.input_format);
+	desc.outputTextureFormat = pf.getMTLPixelFormat(p_params.output_format);
+	desc.colorProcessingMode = MTLFXSpatialScalerColorProcessingModeLinear;
+	id<MTLFXSpatialScaler> scaler = [desc newSpatialScalerWithDevice:dev];
 	MFXSpatialContext *context = memnew(MFXSpatialContext);
-	context->scaler = desc->newSpatialScaler(dev);
+	context->scaler = scaler;
+
+	GODOT_CLANG_WARNING_POP
 
 	return context;
 }
@@ -120,11 +127,7 @@ MFXSpatialContext *MFXSpatialEffect::create_context(CreateParams p_params) const
 
 #pragma mark - Temporal Scaler
 
-MFXTemporalContext::~MFXTemporalContext() {
-	if (scaler) {
-		scaler->release();
-	}
-}
+MFXTemporalContext::~MFXTemporalContext() {}
 
 MFXTemporalEffect::MFXTemporalEffect() {}
 MFXTemporalEffect::~MFXTemporalEffect() {}
@@ -132,29 +135,35 @@ MFXTemporalEffect::~MFXTemporalEffect() {}
 MFXTemporalContext *MFXTemporalEffect::create_context(CreateParams p_params) const {
 	DEV_ASSERT(RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL));
 
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
+
 	RenderingDeviceDriverMetal *rdd = (RenderingDeviceDriverMetal *)RD::get_singleton()->get_device_driver();
 	PixelFormats &pf = rdd->get_pixel_formats();
-	MTL::Device *dev = rdd->get_device();
+	id<MTLDevice> dev = rdd->get_device();
 
-	NS::SharedPtr<MTLFX::TemporalScalerDescriptor> desc = NS::TransferPtr(MTLFX::TemporalScalerDescriptor::alloc()->init());
-	desc->setInputWidth((NS::UInteger)p_params.input_size.width);
-	desc->setInputHeight((NS::UInteger)p_params.input_size.height);
+	MTLFXTemporalScalerDescriptor *desc = [MTLFXTemporalScalerDescriptor new];
+	desc.inputWidth = (NSUInteger)p_params.input_size.width;
+	desc.inputHeight = (NSUInteger)p_params.input_size.height;
 
-	desc->setOutputWidth((NS::UInteger)p_params.output_size.width);
-	desc->setOutputHeight((NS::UInteger)p_params.output_size.height);
+	desc.outputWidth = (NSUInteger)p_params.output_size.width;
+	desc.outputHeight = (NSUInteger)p_params.output_size.height;
 
-	desc->setColorTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.input_format));
-	desc->setDepthTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.depth_format));
-	desc->setMotionTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.motion_format));
-	desc->setAutoExposureEnabled(false);
+	desc.colorTextureFormat = pf.getMTLPixelFormat(p_params.input_format);
+	desc.depthTextureFormat = pf.getMTLPixelFormat(p_params.depth_format);
+	desc.motionTextureFormat = pf.getMTLPixelFormat(p_params.motion_format);
+	desc.autoExposureEnabled = NO;
 
-	desc->setOutputTextureFormat((MTL::PixelFormat)pf.getMTLPixelFormat(p_params.output_format));
+	desc.outputTextureFormat = pf.getMTLPixelFormat(p_params.output_format);
 
+	id<MTLFXTemporalScaler> scaler = [desc newTemporalScalerWithDevice:dev];
 	MFXTemporalContext *context = memnew(MFXTemporalContext);
-	context->scaler = desc->newTemporalScaler(dev);
-	context->scaler->setMotionVectorScaleX(p_params.motion_vector_scale.x);
-	context->scaler->setMotionVectorScaleY(p_params.motion_vector_scale.y);
-	context->scaler->setDepthReversed(true); // Godot uses reverse Z per https://github.com/godotengine/godot/pull/88328
+	context->scaler = scaler;
+
+	scaler.motionVectorScaleX = p_params.motion_vector_scale.x;
+	scaler.motionVectorScaleY = p_params.motion_vector_scale.y;
+	scaler.depthReversed = true; // Godot uses reverse Z per https://github.com/godotengine/godot/pull/88328
+
+	GODOT_CLANG_WARNING_POP
 
 	return context;
 }
@@ -179,33 +188,38 @@ void MFXTemporalEffect::process(RendererRD::MFXTemporalContext *p_ctx, RendererR
 }
 
 void MFXTemporalEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata) {
-	MDCommandBufferBase *obj = (MDCommandBufferBase *)(p_command_buffer.id);
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
+
+	MDCommandBuffer *obj = (MDCommandBuffer *)(p_command_buffer.id);
 	obj->end();
 
-	MTL::Texture *src_texture = reinterpret_cast<MTL::Texture *>(p_userdata->src.id);
-	MTL::Texture *depth = reinterpret_cast<MTL::Texture *>(p_userdata->depth.id);
-	MTL::Texture *motion = reinterpret_cast<MTL::Texture *>(p_userdata->motion.id);
-	MTL::Texture *exposure = reinterpret_cast<MTL::Texture *>(p_userdata->exposure.id);
+	id<MTLTexture> src_texture = rid::get(p_userdata->src);
+	id<MTLTexture> depth = rid::get(p_userdata->depth);
+	id<MTLTexture> motion = rid::get(p_userdata->motion);
+	id<MTLTexture> exposure = rid::get(p_userdata->exposure);
 
-	MTL::Texture *dst_texture = reinterpret_cast<MTL::Texture *>(p_userdata->dst.id);
+	id<MTLTexture> dst_texture = rid::get(p_userdata->dst);
 
-	MTLFX::TemporalScalerBase *scaler = p_userdata->scaler;
-	scaler->setReset(p_userdata->reset);
-	scaler->setColorTexture(src_texture);
-	scaler->setDepthTexture(depth);
-	scaler->setMotionTexture(motion);
-	scaler->setExposureTexture(exposure);
-	scaler->setJitterOffsetX(p_userdata->jitter_offset.x);
-	scaler->setJitterOffsetY(p_userdata->jitter_offset.y);
-	scaler->setOutputTexture(dst_texture);
-	MTLFX::TemporalScaler *s = static_cast<MTLFX::TemporalScaler *>(scaler);
-	MTL3::MDCommandBuffer *cmd = (MTL3::MDCommandBuffer *)(p_command_buffer.id);
-	s->encodeToCommandBuffer(cmd->get_command_buffer());
-	obj->retain_resource(scaler);
+	__block id<MTLFXTemporalScaler> scaler = p_userdata->ctx.scaler;
+	scaler.reset = p_userdata->reset;
+	scaler.colorTexture = src_texture;
+	scaler.depthTexture = depth;
+	scaler.motionTexture = motion;
+	scaler.exposureTexture = exposure;
+	scaler.jitterOffsetX = p_userdata->jitter_offset.x;
+	scaler.jitterOffsetY = p_userdata->jitter_offset.y;
+	scaler.outputTexture = dst_texture;
+	[scaler encodeToCommandBuffer:obj->get_command_buffer()];
+	// TODO(sgc): add API to retain objects until the command buffer completes
+	[obj->get_command_buffer() addCompletedHandler:^(id<MTLCommandBuffer> _Nonnull) {
+		// This block retains a reference to the scaler until the command buffer.
+		// completes.
+		scaler = nil;
+	}];
 
 	CallbackArgs::free(&p_userdata);
+
+	GODOT_CLANG_WARNING_POP
 }
 
 #endif
-
-#endif
diff --git a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.cpp b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.cpp
index 7715d0d1..6413b86f 100644
--- a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.cpp
@@ -71,7 +71,7 @@ void MotionVectorsStore::process(Ref<RenderSceneBuffersRD> p_render_buffers,
 		RendererRD::MaterialStorage::store_camera(reprojection, push_constant.reprojection_matrix);
 	}
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::get_singleton()->draw_command_begin_label("Motion Vector Store");
 
diff --git a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
index fe4110d5..51e39ede 100644
--- a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
+++ b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
@@ -30,8 +30,11 @@
 
 #pragma once
 
+#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/motion_vectors_store.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
+#include "servers/rendering/renderer_scene_render.h"
+#include "servers/rendering/rendering_server.h"
 
 namespace RendererRD {
 class MotionVectorsStore {
diff --git a/engine/servers/rendering/renderer_rd/effects/resolve.cpp b/engine/servers/rendering/renderer_rd/effects/resolve.cpp
index 1c218b10..ffbdaac1 100644
--- a/engine/servers/rendering/renderer_rd/effects/resolve.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/resolve.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "resolve.h"
-
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 
@@ -83,7 +82,7 @@ void Resolve::resolve_gi(RID p_source_depth, RID p_source_normal_roughness, RID
 	push_constant.samples = p_samples;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_depth(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_depth }));
 	RD::Uniform u_source_normal_roughness(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 1, Vector<RID>({ default_sampler, p_source_normal_roughness }));
@@ -127,7 +126,7 @@ void Resolve::resolve_depth(RID p_source_depth, RID p_dest_depth, Vector2i p_scr
 	push_constant.samples = p_samples;
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_depth(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_depth }));
 	RD::Uniform u_dest_depth(RD::UNIFORM_TYPE_IMAGE, 0, p_dest_depth);
@@ -155,7 +154,7 @@ void Resolve::resolve_depth_raster(RID p_source_rd_texture, RID p_dest_framebuff
 	memset(&resolve_raster.push_constant, 0, sizeof(ResolvePushConstant));
 	resolve_raster.push_constant.samples = p_samples;
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
diff --git a/engine/servers/rendering/renderer_rd/effects/roughness_limiter.cpp b/engine/servers/rendering/renderer_rd/effects/roughness_limiter.cpp
index 337dc131..7200ae54 100644
--- a/engine/servers/rendering/renderer_rd/effects/roughness_limiter.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/roughness_limiter.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "roughness_limiter.h"
-
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 
@@ -61,7 +60,7 @@ void RoughnessLimiter::roughness_limit(RID p_source_normal, RID p_roughness, con
 	push_constant.screen_size[1] = p_size.y;
 	push_constant.curve = p_curve;
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	RID rl_shader = shader.version_get_shader(shader_version, 0);
 
 	RD::Uniform u_source_normal(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_normal }));
diff --git a/engine/servers/rendering/renderer_rd/effects/smaa.cpp b/engine/servers/rendering/renderer_rd/effects/smaa.cpp
index 856e6f87..381da967 100644
--- a/engine/servers/rendering/renderer_rd/effects/smaa.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/smaa.cpp
@@ -31,9 +31,10 @@
 #include "smaa.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/image_loader.h"
 #include "servers/rendering/renderer_rd/effects/smaa_area_tex.gen.h"
 #include "servers/rendering/renderer_rd/effects/smaa_search_tex.gen.h"
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
+#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
@@ -182,7 +183,7 @@ void SMAA::process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_colo
 	smaa.blend_push_constant.inv_size[1] = inv_size.y;
 	smaa.blend_push_constant.use_debanding = p_use_debanding;
 
-	RID linear_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID linear_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	allocate_render_targets(p_render_buffers);
 	RID edges_tex = p_render_buffers->get_texture(RB_SCOPE_SMAA, RB_EDGES);
diff --git a/engine/servers/rendering/renderer_rd/effects/smaa.h b/engine/servers/rendering/renderer_rd/effects/smaa.h
index 508711d0..509bf194 100644
--- a/engine/servers/rendering/renderer_rd/effects/smaa.h
+++ b/engine/servers/rendering/renderer_rd/effects/smaa.h
@@ -35,6 +35,9 @@
 #include "servers/rendering/renderer_rd/shaders/effects/smaa_edge_detection.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/smaa_weight_calculation.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
+#include "servers/rendering/renderer_scene_render.h"
+
+#include "servers/rendering/rendering_server.h"
 
 #define RB_SCOPE_SMAA SNAME("rb_smaa")
 
diff --git a/engine/servers/rendering/renderer_rd/effects/sort_effects.h b/engine/servers/rendering/renderer_rd/effects/sort_effects.h
index 1ebbfc3a..fce5e8ee 100644
--- a/engine/servers/rendering/renderer_rd/effects/sort_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/sort_effects.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "servers/rendering/renderer_rd/shader_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/sort.glsl.gen.h"
 
 namespace RendererRD {
diff --git a/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp b/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
index b449ea31..7e10a40e 100644
--- a/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
@@ -100,7 +100,7 @@ SSEffects::SSEffects() {
 	}
 
 	// Initialize Screen Space Indirect Lighting (SSIL)
-	ssil_set_quality(RSE::EnvironmentSSILQuality(int(GLOBAL_GET("rendering/environment/ssil/quality"))), GLOBAL_GET("rendering/environment/ssil/half_size"), GLOBAL_GET("rendering/environment/ssil/adaptive_target"), GLOBAL_GET("rendering/environment/ssil/blur_passes"), GLOBAL_GET("rendering/environment/ssil/fadeout_from"), GLOBAL_GET("rendering/environment/ssil/fadeout_to"));
+	ssil_set_quality(RS::EnvironmentSSILQuality(int(GLOBAL_GET("rendering/environment/ssil/quality"))), GLOBAL_GET("rendering/environment/ssil/half_size"), GLOBAL_GET("rendering/environment/ssil/adaptive_target"), GLOBAL_GET("rendering/environment/ssil/blur_passes"), GLOBAL_GET("rendering/environment/ssil/fadeout_from"), GLOBAL_GET("rendering/environment/ssil/fadeout_to"));
 
 	{
 		Vector<String> ssil_modes;
@@ -177,7 +177,7 @@ SSEffects::SSEffects() {
 	}
 
 	// Initialize Screen Space Ambient Occlusion (SSAO)
-	ssao_set_quality(RSE::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/environment/ssao/quality"))), GLOBAL_GET("rendering/environment/ssao/half_size"), GLOBAL_GET("rendering/environment/ssao/adaptive_target"), GLOBAL_GET("rendering/environment/ssao/blur_passes"), GLOBAL_GET("rendering/environment/ssao/fadeout_from"), GLOBAL_GET("rendering/environment/ssao/fadeout_to"));
+	ssao_set_quality(RS::EnvironmentSSAOQuality(int(GLOBAL_GET("rendering/environment/ssao/quality"))), GLOBAL_GET("rendering/environment/ssao/half_size"), GLOBAL_GET("rendering/environment/ssao/adaptive_target"), GLOBAL_GET("rendering/environment/ssao/blur_passes"), GLOBAL_GET("rendering/environment/ssao/fadeout_from"), GLOBAL_GET("rendering/environment/ssao/fadeout_to"));
 
 	{
 		RD::SamplerState sampler;
@@ -343,7 +343,7 @@ SSEffects::SSEffects() {
 	}
 
 	// Subsurface scattering
-	sss_quality = RSE::SubSurfaceScatteringQuality(int(GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_quality")));
+	sss_quality = RS::SubSurfaceScatteringQuality(int(GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_quality")));
 	sss_scale = GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_scale");
 	sss_depth_scale = GLOBAL_GET("rendering/environment/subsurface_scattering/subsurface_scattering_depth_scale");
 
@@ -518,9 +518,9 @@ void SSEffects::downsample_depth(Ref<RenderSceneBuffersRD> p_render_buffers, uin
 	RD::ComputeListID compute_list = RD::get_singleton()->compute_list_begin();
 
 	int downsample_mode = SS_EFFECTS_DOWNSAMPLE;
-	bool use_mips = ssao_quality > RSE::ENV_SSAO_QUALITY_MEDIUM || ssil_quality > RSE::ENV_SSIL_QUALITY_MEDIUM;
+	bool use_mips = ssao_quality > RS::ENV_SSAO_QUALITY_MEDIUM || ssil_quality > RS::ENV_SSIL_QUALITY_MEDIUM;
 
-	if (ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW && ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) {
+	if (ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW && ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) {
 		downsample_mode = SS_EFFECTS_DOWNSAMPLE_HALF;
 	} else if (use_mips) {
 		downsample_mode = SS_EFFECTS_DOWNSAMPLE_MIPMAP;
@@ -594,7 +594,7 @@ void SSEffects::downsample_depth(Ref<RenderSceneBuffersRD> p_render_buffers, uin
 	ss_effects.downsample_push_constant.pixel_size[1] = 1.0 / full_screen_size.y;
 	ss_effects.downsample_push_constant.radius_sq = 1.0;
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RID depth_texture = p_render_buffers->get_depth_texture(p_view);
 	RID depth_mipmap = p_render_buffers->get_texture_slice(RB_SCOPE_SSDS, RB_LINEAR_DEPTH, p_view * 4, depth_index, 4, 1);
@@ -627,7 +627,7 @@ void SSEffects::downsample_depth(Ref<RenderSceneBuffersRD> p_render_buffers, uin
 
 /* SSIL */
 
-void SSEffects::ssil_set_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void SSEffects::ssil_set_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 	ssil_quality = p_quality;
 	ssil_half_size = p_half_size;
 	ssil_adaptive_target = p_adaptive_target;
@@ -641,7 +641,7 @@ void SSEffects::gather_ssil(RD::ComputeListID p_compute_list, const RID *p_ssil_
 	ERR_FAIL_NULL(uniform_set_cache);
 
 	RD::get_singleton()->compute_list_bind_uniform_set(p_compute_list, p_gather_uniform_set, 0);
-	if ((ssil_quality == RSE::ENV_SSIL_QUALITY_ULTRA) && !p_adaptive_base_pass) {
+	if ((ssil_quality == RS::ENV_SSIL_QUALITY_ULTRA) && !p_adaptive_base_pass) {
 		RD::get_singleton()->compute_list_bind_uniform_set(p_compute_list, p_importance_map_uniform_set, 1);
 	}
 	RD::get_singleton()->compute_list_bind_uniform_set(p_compute_list, p_projection_uniform_set, 3);
@@ -649,7 +649,7 @@ void SSEffects::gather_ssil(RD::ComputeListID p_compute_list, const RID *p_ssil_
 	RID shader = ssil.gather_shader.version_get_shader(ssil.gather_shader_version, 0);
 
 	for (int i = 0; i < 4; i++) {
-		if ((ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
+		if ((ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
 			continue;
 		}
 
@@ -754,8 +754,8 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 	memset(&ssil.gather_push_constant, 0, sizeof(SSILGatherPushConstant));
 
 	RID shader = ssil.gather_shader.version_get_shader(ssil.gather_shader_version, SSIL_GATHER);
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::ComputeListID compute_list = RD::get_singleton()->compute_list_begin();
 	{
@@ -783,10 +783,10 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 
 		ssil.gather_push_constant.radius = p_settings.radius;
 		float radius_near_limit = (p_settings.radius * 1.2f);
-		if (ssil_quality <= RSE::ENV_SSIL_QUALITY_LOW) {
+		if (ssil_quality <= RS::ENV_SSIL_QUALITY_LOW) {
 			radius_near_limit *= 1.50f;
 
-			if (ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) {
+			if (ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) {
 				ssil.gather_push_constant.radius *= 0.8f;
 			}
 		}
@@ -869,7 +869,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 			importance_map_uniform_set = uniform_set_cache->get_cache(shader_adaptive, 1, u_pong, u_importance_map, u_load_counter);
 		}
 
-		if (ssil_quality == RSE::ENV_SSIL_QUALITY_ULTRA) {
+		if (ssil_quality == RS::ENV_SSIL_QUALITY_ULTRA) {
 			RD::get_singleton()->draw_command_begin_label("Generate Importance Map");
 			ssil.importance_map_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssil_buffers.buffer_width;
 			ssil.importance_map_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssil_buffers.buffer_height;
@@ -932,13 +932,13 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 		ssil.blur_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssil_buffers.buffer_width;
 		ssil.blur_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssil_buffers.buffer_height;
 
-		int blur_passes = ssil_quality > RSE::ENV_SSIL_QUALITY_VERY_LOW ? ssil_blur_passes : 1;
+		int blur_passes = ssil_quality > RS::ENV_SSIL_QUALITY_VERY_LOW ? ssil_blur_passes : 1;
 
 		shader = ssil.blur_shader.version_get_shader(ssil.blur_shader_version, 0);
 
 		for (int pass = 0; pass < blur_passes; pass++) {
 			int blur_pipeline = SSIL_BLUR_PASS;
-			if (ssil_quality > RSE::ENV_SSIL_QUALITY_VERY_LOW) {
+			if (ssil_quality > RS::ENV_SSIL_QUALITY_VERY_LOW) {
 				blur_pipeline = SSIL_BLUR_PASS_SMART;
 				if (pass < blur_passes - 2) {
 					blur_pipeline = SSIL_BLUR_PASS_WIDE;
@@ -948,13 +948,13 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 			RID blur_shader = ssil.blur_shader.version_get_shader(ssil.blur_shader_version, blur_pipeline - SSIL_BLUR_PASS);
 
 			for (int i = 0; i < 4; i++) {
-				if ((ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
+				if ((ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
 					continue;
 				}
 
 				RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, ssil.pipelines[blur_pipeline].get_rid());
 				if (pass % 2 == 0) {
-					if (ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) {
+					if (ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) {
 						RD::Uniform u_ssil_slice(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, deinterleaved_slices[i] }));
 						RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 0, u_ssil_slice), 0);
 					} else {
@@ -965,7 +965,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 					RD::Uniform u_ssil_pong_slice(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ deinterleaved_pong_slices[i] }));
 					RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 1, u_ssil_pong_slice), 1);
 				} else {
-					if (ssil_quality == RSE::ENV_SSIL_QUALITY_VERY_LOW) {
+					if (ssil_quality == RS::ENV_SSIL_QUALITY_VERY_LOW) {
 						RD::Uniform u_ssil_pong_slice(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, deinterleaved_pong_slices[i] }));
 						RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 0, u_ssil_pong_slice), 0);
 					} else {
@@ -1003,9 +1003,9 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 		ssil.interleave_push_constant.size_modifier = uint32_t(ssil_half_size ? 4 : 2);
 
 		int interleave_pipeline = SSIL_INTERLEAVE_HALF;
-		if (ssil_quality == RSE::ENV_SSIL_QUALITY_LOW) {
+		if (ssil_quality == RS::ENV_SSIL_QUALITY_LOW) {
 			interleave_pipeline = SSIL_INTERLEAVE;
-		} else if (ssil_quality >= RSE::ENV_SSIL_QUALITY_MEDIUM) {
+		} else if (ssil_quality >= RS::ENV_SSIL_QUALITY_MEDIUM) {
 			interleave_pipeline = SSIL_INTERLEAVE_SMART;
 		}
 
@@ -1017,7 +1017,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 		RD::Uniform u_destination(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ final }));
 		RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(shader, 0, u_destination), 0);
 
-		if (ssil_quality > RSE::ENV_SSIL_QUALITY_VERY_LOW && ssil_blur_passes % 2 == 0) {
+		if (ssil_quality > RS::ENV_SSIL_QUALITY_VERY_LOW && ssil_blur_passes % 2 == 0) {
 			RD::Uniform u_ssil(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, deinterleaved }));
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(shader, 1, u_ssil), 1);
 		} else {
@@ -1045,7 +1045,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 
 /* SSAO */
 
-void SSEffects::ssao_set_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void SSEffects::ssao_set_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 	ssao_quality = p_quality;
 	ssao_half_size = p_half_size;
 	ssao_adaptive_target = p_adaptive_target;
@@ -1059,14 +1059,14 @@ void SSEffects::gather_ssao(RD::ComputeListID p_compute_list, const RID *p_ao_sl
 	ERR_FAIL_NULL(uniform_set_cache);
 
 	RD::get_singleton()->compute_list_bind_uniform_set(p_compute_list, p_gather_uniform_set, 0);
-	if ((ssao_quality == RSE::ENV_SSAO_QUALITY_ULTRA) && !p_adaptive_base_pass) {
+	if ((ssao_quality == RS::ENV_SSAO_QUALITY_ULTRA) && !p_adaptive_base_pass) {
 		RD::get_singleton()->compute_list_bind_uniform_set(p_compute_list, p_importance_map_uniform_set, 1);
 	}
 
 	RID shader = ssao.gather_shader.version_get_shader(ssao.gather_shader_version, 1); //
 
 	for (int i = 0; i < 4; i++) {
-		if ((ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
+		if ((ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
 			continue;
 		}
 
@@ -1152,7 +1152,7 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 	/* FIRST PASS */
 
 	RID shader = ssao.gather_shader.version_get_shader(ssao.gather_shader_version, SSAO_GATHER);
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::get_singleton()->draw_command_begin_label("Process Screen-Space Ambient Occlusion");
 	/* SECOND PASS */
@@ -1180,10 +1180,10 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 
 		ssao.gather_push_constant.radius = p_settings.radius;
 		float radius_near_limit = (p_settings.radius * 1.2f);
-		if (ssao_quality <= RSE::ENV_SSAO_QUALITY_LOW) {
+		if (ssao_quality <= RS::ENV_SSAO_QUALITY_LOW) {
 			radius_near_limit *= 1.50f;
 
-			if (ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW) {
+			if (ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW) {
 				ssao.gather_push_constant.radius *= 0.8f;
 			}
 		}
@@ -1252,7 +1252,7 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 			importance_map_uniform_set = uniform_set_cache->get_cache(shader_adaptive, 1, u_pong, u_importance_map, u_load_counter);
 		}
 
-		if (ssao_quality == RSE::ENV_SSAO_QUALITY_ULTRA) {
+		if (ssao_quality == RS::ENV_SSAO_QUALITY_ULTRA) {
 			RD::get_singleton()->draw_command_begin_label("Generate Importance Map");
 			ssao.importance_map_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssao_buffers.buffer_width;
 			ssao.importance_map_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssao_buffers.buffer_height;
@@ -1323,13 +1323,13 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 		ssao.blur_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssao_buffers.buffer_width;
 		ssao.blur_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssao_buffers.buffer_height;
 
-		int blur_passes = ssao_quality > RSE::ENV_SSAO_QUALITY_VERY_LOW ? ssao_blur_passes : 1;
+		int blur_passes = ssao_quality > RS::ENV_SSAO_QUALITY_VERY_LOW ? ssao_blur_passes : 1;
 
 		shader = ssao.blur_shader.version_get_shader(ssao.blur_shader_version, 0);
 
 		for (int pass = 0; pass < blur_passes; pass++) {
 			int blur_pipeline = SSAO_BLUR_PASS;
-			if (ssao_quality > RSE::ENV_SSAO_QUALITY_VERY_LOW) {
+			if (ssao_quality > RS::ENV_SSAO_QUALITY_VERY_LOW) {
 				if (pass < blur_passes - 2) {
 					blur_pipeline = SSAO_BLUR_PASS_WIDE;
 				} else {
@@ -1338,14 +1338,14 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 			}
 
 			for (int i = 0; i < 4; i++) {
-				if ((ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
+				if ((ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW) && ((i == 1) || (i == 2))) {
 					continue;
 				}
 
 				RID blur_shader = ssao.blur_shader.version_get_shader(ssao.blur_shader_version, blur_pipeline - SSAO_BLUR_PASS);
 				RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, ssao.pipelines[blur_pipeline].get_rid());
 				if (pass % 2 == 0) {
-					if (ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW) {
+					if (ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW) {
 						RD::Uniform u_ao_slices_with_sampler(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, ao_deinterleaved_slices[i] }));
 						RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 0, u_ao_slices_with_sampler), 0);
 					} else {
@@ -1356,7 +1356,7 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 					RD::Uniform u_ao_pong_slices(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ ao_pong_slices[i] }));
 					RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 1, u_ao_pong_slices), 1);
 				} else {
-					if (ssao_quality == RSE::ENV_SSAO_QUALITY_VERY_LOW) {
+					if (ssao_quality == RS::ENV_SSAO_QUALITY_VERY_LOW) {
 						RD::Uniform u_ao_pong_slices_with_sampler(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, ao_pong_slices[i] }));
 						RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(blur_shader, 0, u_ao_pong_slices_with_sampler), 0);
 					} else {
@@ -1390,9 +1390,9 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 		shader = ssao.interleave_shader.version_get_shader(ssao.interleave_shader_version, 0);
 
 		int interleave_pipeline = SSAO_INTERLEAVE_HALF;
-		if (ssao_quality == RSE::ENV_SSAO_QUALITY_LOW) {
+		if (ssao_quality == RS::ENV_SSAO_QUALITY_LOW) {
 			interleave_pipeline = SSAO_INTERLEAVE;
-		} else if (ssao_quality >= RSE::ENV_SSAO_QUALITY_MEDIUM) {
+		} else if (ssao_quality >= RS::ENV_SSAO_QUALITY_MEDIUM) {
 			interleave_pipeline = SSAO_INTERLEAVE_SMART;
 		}
 
@@ -1402,7 +1402,7 @@ void SSEffects::generate_ssao(Ref<RenderSceneBuffersRD> p_render_buffers, SSAORe
 		RD::Uniform u_upscale_buffer(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ ao_final }));
 		RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(interleave_shader, 0, u_upscale_buffer), 0);
 
-		if (ssao_quality > RSE::ENV_SSAO_QUALITY_VERY_LOW && ssao_blur_passes % 2 == 0) {
+		if (ssao_quality > RS::ENV_SSAO_QUALITY_VERY_LOW && ssao_blur_passes % 2 == 0) {
 			RD::Uniform u_ao(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, ao_deinterleaved }));
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, uniform_set_cache->get_cache(interleave_shader, 1, u_ao), 1);
 		} else {
@@ -1501,8 +1501,8 @@ void SSEffects::screen_space_reflection(Ref<RenderSceneBuffersRD> p_render_buffe
 		RD::get_singleton()->buffer_update(ssr.ubo, 0, sizeof(ScreenSpaceReflectionSceneData), &scene_data);
 	}
 
-	RID linear_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID nearest_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID linear_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID nearest_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	if (ssr_half_size) {
 		RD::get_singleton()->draw_command_begin_label("SSR Downsample");
@@ -1733,11 +1733,11 @@ void SSEffects::screen_space_reflection(Ref<RenderSceneBuffersRD> p_render_buffe
 
 /* Subsurface scattering */
 
-void SSEffects::sss_set_quality(RSE::SubSurfaceScatteringQuality p_quality) {
+void SSEffects::sss_set_quality(RS::SubSurfaceScatteringQuality p_quality) {
 	sss_quality = p_quality;
 }
 
-RSE::SubSurfaceScatteringQuality SSEffects::sss_get_quality() const {
+RS::SubSurfaceScatteringQuality SSEffects::sss_get_quality() const {
 	return sss_quality;
 }
 
@@ -1752,7 +1752,7 @@ void SSEffects::sub_surface_scattering(Ref<RenderSceneBuffersRD> p_render_buffer
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 	ERR_FAIL_NULL(material_storage);
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	// Our intermediate buffer is only created if we haven't created it already.
 	RD::DataFormat format = p_render_buffers->get_base_data_format();
diff --git a/engine/servers/rendering/renderer_rd/effects/ss_effects.h b/engine/servers/rendering/renderer_rd/effects/ss_effects.h
index de44afa5..f41f871b 100644
--- a/engine/servers/rendering/renderer_rd/effects/ss_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/ss_effects.h
@@ -46,6 +46,7 @@
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_importance_map.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_interleave.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/subsurface_scattering.glsl.gen.h"
+#include "servers/rendering/rendering_server.h"
 
 #define RB_SCOPE_SSLF SNAME("rb_sslf")
 #define RB_SCOPE_SSDS SNAME("rb_ssds")
@@ -93,7 +94,7 @@ public:
 	void downsample_depth(Ref<RenderSceneBuffersRD> p_render_buffers, uint32_t p_view, const Projection &p_projection);
 
 	/* SSIL */
-	void ssil_set_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to);
+	void ssil_set_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to);
 
 	struct SSILRenderBuffers {
 		bool half_size = false;
@@ -116,7 +117,7 @@ public:
 	void screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_render_buffers, SSILRenderBuffers &p_ssil_buffers, uint32_t p_view, RID p_normal_buffer, const Projection &p_projection, const Projection &p_last_projection, const SSILSettings &p_settings);
 
 	/* SSAO */
-	void ssao_set_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to);
+	void ssao_set_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to);
 
 	struct SSAORenderBuffers {
 		bool half_size = false;
@@ -153,8 +154,8 @@ public:
 	void screen_space_reflection(Ref<RenderSceneBuffersRD> p_render_buffers, SSRRenderBuffers &p_ssr_buffers, const RID *p_normal_roughness_slices, int p_max_steps, float p_fade_in, float p_fade_out, float p_tolerance, const Projection *p_projections, const Projection *p_reprojections, const Vector3 *p_eye_offsets, RendererRD::CopyEffects &p_copy_effects);
 
 	/* subsurface scattering */
-	void sss_set_quality(RSE::SubSurfaceScatteringQuality p_quality);
-	RSE::SubSurfaceScatteringQuality sss_get_quality() const;
+	void sss_set_quality(RS::SubSurfaceScatteringQuality p_quality);
+	RS::SubSurfaceScatteringQuality sss_get_quality() const;
 	void sss_set_scale(float p_scale, float p_depth_scale);
 
 	void sub_surface_scattering(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_diffuse, RID p_depth, const Projection &p_camera, const Size2i &p_screen_size);
@@ -162,14 +163,14 @@ public:
 private:
 	/* Settings */
 
-	RSE::EnvironmentSSAOQuality ssao_quality = RSE::ENV_SSAO_QUALITY_MEDIUM;
+	RS::EnvironmentSSAOQuality ssao_quality = RS::ENV_SSAO_QUALITY_MEDIUM;
 	bool ssao_half_size = false;
 	float ssao_adaptive_target = 0.5;
 	int ssao_blur_passes = 2;
 	float ssao_fadeout_from = 50.0;
 	float ssao_fadeout_to = 300.0;
 
-	RSE::EnvironmentSSILQuality ssil_quality = RSE::ENV_SSIL_QUALITY_MEDIUM;
+	RS::EnvironmentSSILQuality ssil_quality = RS::ENV_SSIL_QUALITY_MEDIUM;
 	bool ssil_half_size = false;
 	float ssil_adaptive_target = 0.5;
 	int ssil_blur_passes = 4;
@@ -178,7 +179,7 @@ private:
 
 	bool ssr_half_size = false;
 
-	RSE::SubSurfaceScatteringQuality sss_quality = RSE::SUB_SURFACE_SCATTERING_QUALITY_MEDIUM;
+	RS::SubSurfaceScatteringQuality sss_quality = RS::SUB_SURFACE_SCATTERING_QUALITY_MEDIUM;
 	float sss_scale = 0.05;
 	float sss_depth_scale = 0.01;
 
diff --git a/engine/servers/rendering/renderer_rd/effects/taa.cpp b/engine/servers/rendering/renderer_rd/effects/taa.cpp
index 9125301c..84bb43a1 100644
--- a/engine/servers/rendering/renderer_rd/effects/taa.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/taa.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "taa.h"
-
 #include "servers/rendering/renderer_rd/effects/copy_effects.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
@@ -57,7 +56,7 @@ void TAA::resolve(RID p_frame, RID p_temp, RID p_depth, RID p_velocity, RID p_pr
 	RID shader = taa_shader.version_get_shader(shader_version, 0);
 	ERR_FAIL_COND(shader.is_null());
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	float base_variance = 1.1f;
 	float base_variance_min = 0.75f;
diff --git a/engine/servers/rendering/renderer_rd/effects/tone_mapper.cpp b/engine/servers/rendering/renderer_rd/effects/tone_mapper.cpp
index 3ee5b78a..0f18f926 100644
--- a/engine/servers/rendering/renderer_rd/effects/tone_mapper.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/tone_mapper.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "tone_mapper.h"
-
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
@@ -157,7 +156,6 @@ void ToneMapper::tonemapper(RID p_source_color, RID p_dst_framebuffer, const Ton
 	tonemap.push_constant.white = p_settings.white;
 	tonemap.push_constant.auto_exposure_scale = p_settings.auto_exposure_scale;
 	tonemap.push_constant.luminance_multiplier = p_settings.luminance_multiplier;
-	tonemap.push_constant.output_max_value = MAX(p_settings.max_value, 1.0f);
 
 	tonemap.push_constant.flags |= p_settings.use_color_correction ? TONEMAP_FLAG_USE_COLOR_CORRECTION : 0;
 
@@ -175,11 +173,10 @@ void ToneMapper::tonemapper(RID p_source_color, RID p_dst_framebuffer, const Ton
 		mode += 4;
 	}
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID nearest_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
-	RD::Uniform u_source_color(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ p_settings.bilinear_filtering ? default_sampler : nearest_sampler, p_source_color }));
+	RD::Uniform u_source_color(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_color }));
 
 	RD::Uniform u_exposure_texture;
 	u_exposure_texture.uniform_type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE;
@@ -243,7 +240,6 @@ void ToneMapper::tonemapper_mobile(RID p_source_color, RID p_dst_framebuffer, co
 	tonemap_mobile.push_constant.exposure = p_settings.exposure;
 	tonemap_mobile.push_constant.white = p_settings.white;
 	tonemap_mobile.push_constant.luminance_multiplier = p_settings.luminance_multiplier;
-	tonemap_mobile.push_constant.output_max_value = MAX(p_settings.max_value, 1.0f);
 
 	tonemap_mobile.push_constant.tonemapper_params[0] = p_settings.tonemapper_params[0];
 	tonemap_mobile.push_constant.tonemapper_params[1] = p_settings.tonemapper_params[1];
@@ -259,16 +255,16 @@ void ToneMapper::tonemapper_mobile(RID p_source_color, RID p_dst_framebuffer, co
 	spec_constant |= p_settings.debanding_mode == TonemapSettings::DEBANDING_MODE_8_BIT ? TONEMAP_MOBILE_FLAG_USE_8_BIT_DEBANDING : 0;
 	spec_constant |= p_settings.debanding_mode == TonemapSettings::DEBANDING_MODE_10_BIT ? TONEMAP_MOBILE_FLAG_USE_10_BIT_DEBANDING : 0;
 	spec_constant |= p_settings.convert_to_srgb ? TONEMAP_MOBILE_FLAG_CONVERT_TO_SRGB : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_LINEAR ? TONEMAP_MOBILE_FLAG_TONEMAPPER_LINEAR : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_REINHARD ? TONEMAP_MOBILE_FLAG_TONEMAPPER_REINHARD : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_FILMIC ? TONEMAP_MOBILE_FLAG_TONEMAPPER_FILMIC : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_ACES ? TONEMAP_MOBILE_FLAG_TONEMAPPER_ACES : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_AGX ? TONEMAP_MOBILE_FLAG_TONEMAPPER_AGX : 0;
-	spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_ADDITIVE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_ADD : 0;
-	spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_SCREEN ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SCREEN : 0;
-	spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_SOFTLIGHT ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SOFTLIGHT : 0;
-	spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_REPLACE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_REPLACE : 0;
-	spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_MIX ? TONEMAP_MOBILE_FLAG_GLOW_MODE_MIX : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_LINEAR ? TONEMAP_MOBILE_FLAG_TONEMAPPER_LINEAR : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_REINHARD ? TONEMAP_MOBILE_FLAG_TONEMAPPER_REINHARD : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_FILMIC ? TONEMAP_MOBILE_FLAG_TONEMAPPER_FILMIC : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_ACES ? TONEMAP_MOBILE_FLAG_TONEMAPPER_ACES : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_AGX ? TONEMAP_MOBILE_FLAG_TONEMAPPER_AGX : 0;
+	spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_ADDITIVE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_ADD : 0;
+	spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_SCREEN ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SCREEN : 0;
+	spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_SOFTLIGHT ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SOFTLIGHT : 0;
+	spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_REPLACE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_REPLACE : 0;
+	spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_MIX ? TONEMAP_MOBILE_FLAG_GLOW_MODE_MIX : 0;
 
 	int mode = p_settings.use_1d_color_correction ? TONEMAP_MOBILE_MODE_1D_LUT : TONEMAP_MOBILE_MODE_NORMAL;
 
@@ -277,11 +273,10 @@ void ToneMapper::tonemapper_mobile(RID p_source_color, RID p_dst_framebuffer, co
 		mode += 4;
 	}
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID nearest_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
-	RD::Uniform u_source_color(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ p_settings.bilinear_filtering ? default_sampler : nearest_sampler, p_source_color }));
+	RD::Uniform u_source_color(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_color }));
 
 	RD::Uniform u_glow_texture;
 	u_glow_texture.uniform_type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE;
@@ -334,7 +329,6 @@ void ToneMapper::tonemapper_subpass(RD::DrawListID p_subpass_draw_list, RID p_so
 	tonemap_mobile.push_constant.exposure = p_settings.exposure;
 	tonemap_mobile.push_constant.white = p_settings.white;
 	tonemap_mobile.push_constant.luminance_multiplier = p_settings.luminance_multiplier;
-	tonemap_mobile.push_constant.output_max_value = MAX(p_settings.max_value, 1.0f);
 
 	tonemap_mobile.push_constant.tonemapper_params[0] = p_settings.tonemapper_params[0];
 	tonemap_mobile.push_constant.tonemapper_params[1] = p_settings.tonemapper_params[1];
@@ -345,20 +339,20 @@ void ToneMapper::tonemapper_subpass(RD::DrawListID p_subpass_draw_list, RID p_so
 	spec_constant |= p_settings.use_bcs ? TONEMAP_MOBILE_FLAG_USE_BCS : 0;
 	//spec_constant |= p_settings.use_glow ? TONEMAP_MOBILE_FLAG_USE_GLOW : 0;
 	//spec_constant |= p_settings.glow_map_strength > 0.01 ? TONEMAP_MOBILE_FLAG_USE_GLOW_MAP : 0;
-	spec_constant |= p_settings.use_color_correction ? TONEMAP_MOBILE_FLAG_USE_COLOR_CORRECTION : 0;
+	//spec_constant |= p_settings.use_color_correction ? TONEMAP_MOBILE_FLAG_USE_COLOR_CORRECTION : 0;
 	//spec_constant |= p_settings.use_fxaa ? TONEMAP_MOBILE_FLAG_USE_FXAA : 0;
 	spec_constant |= p_settings.debanding_mode == TonemapSettings::DEBANDING_MODE_8_BIT ? TONEMAP_MOBILE_FLAG_USE_8_BIT_DEBANDING : 0;
 	spec_constant |= p_settings.convert_to_srgb ? TONEMAP_MOBILE_FLAG_CONVERT_TO_SRGB : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_LINEAR ? TONEMAP_MOBILE_FLAG_TONEMAPPER_LINEAR : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_REINHARD ? TONEMAP_MOBILE_FLAG_TONEMAPPER_REINHARD : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_FILMIC ? TONEMAP_MOBILE_FLAG_TONEMAPPER_FILMIC : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_ACES ? TONEMAP_MOBILE_FLAG_TONEMAPPER_ACES : 0;
-	spec_constant |= p_settings.tonemap_mode == RSE::ENV_TONE_MAPPER_AGX ? TONEMAP_MOBILE_FLAG_TONEMAPPER_AGX : 0;
-	//spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_ADDITIVE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_ADD : 0;
-	//spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_SCREEN ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SCREEN : 0;
-	//spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_SOFTLIGHT ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SOFTLIGHT : 0;
-	//spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_REPLACE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_REPLACE : 0;
-	//spec_constant |= p_settings.glow_mode == RSE::ENV_GLOW_BLEND_MODE_MIX ? TONEMAP_MOBILE_FLAG_GLOW_MODE_MIX : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_LINEAR ? TONEMAP_MOBILE_FLAG_TONEMAPPER_LINEAR : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_REINHARD ? TONEMAP_MOBILE_FLAG_TONEMAPPER_REINHARD : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_FILMIC ? TONEMAP_MOBILE_FLAG_TONEMAPPER_FILMIC : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_ACES ? TONEMAP_MOBILE_FLAG_TONEMAPPER_ACES : 0;
+	spec_constant |= p_settings.tonemap_mode == RS::ENV_TONE_MAPPER_AGX ? TONEMAP_MOBILE_FLAG_TONEMAPPER_AGX : 0;
+	//spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_ADDITIVE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_ADD : 0;
+	//spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_SCREEN ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SCREEN : 0;
+	//spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_SOFTLIGHT ? TONEMAP_MOBILE_FLAG_GLOW_MODE_SOFTLIGHT : 0;
+	//spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_REPLACE ? TONEMAP_MOBILE_FLAG_GLOW_MODE_REPLACE : 0;
+	//spec_constant |= p_settings.glow_mode == RS::ENV_GLOW_BLEND_MODE_MIX ? TONEMAP_MOBILE_FLAG_GLOW_MODE_MIX : 0;
 
 	int mode = p_settings.use_1d_color_correction ? TONEMAP_MOBILE_MODE_SUBPASS_1D_LUT : TONEMAP_MOBILE_MODE_SUBPASS;
 	if (p_settings.view_count > 1) {
@@ -366,8 +360,8 @@ void ToneMapper::tonemapper_subpass(RD::DrawListID p_subpass_draw_list, RID p_so
 		mode += 4;
 	}
 
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_mipmap_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_color;
 	u_source_color.uniform_type = RD::UNIFORM_TYPE_INPUT_ATTACHMENT;
diff --git a/engine/servers/rendering/renderer_rd/effects/tone_mapper.h b/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
index 68b6da17..9301be02 100644
--- a/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
+++ b/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
@@ -34,6 +34,8 @@
 #include "servers/rendering/renderer_rd/shaders/effects/tonemap.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl.gen.h"
 
+#include "servers/rendering/rendering_server.h"
+
 namespace RendererRD {
 
 class ToneMapper {
@@ -107,7 +109,7 @@ private:
 
 		float pixel_size[2]; //  8 - 24
 		uint32_t tonemapper; //  4 - 28
-		float output_max_value; //  4 - 32
+		uint32_t pad; //  4 - 32
 
 		uint32_t glow_texture_size[2]; //  8 - 40
 		float glow_intensity; //  4 - 44
@@ -137,8 +139,6 @@ private:
 		float white; //  4 - 48
 
 		float tonemapper_params[4]; //  16 - 64
-		float output_max_value; //  4 - 68
-		float pad[3]; //  12 - 80
 	};
 
 	/* tonemap actually writes to a framebuffer, which is
@@ -165,7 +165,7 @@ public:
 
 	struct TonemapSettings {
 		bool use_glow = false;
-		RSE::EnvironmentGlowBlendMode glow_mode = RSE::ENV_GLOW_BLEND_MODE_SCREEN;
+		RS::EnvironmentGlowBlendMode glow_mode = RS::ENV_GLOW_BLEND_MODE_SCREEN;
 		float glow_intensity = 0.3;
 		float glow_map_strength = 0.0f;
 		float glow_levels[7] = { 1.0, 0.8, 0.4, 0.1, 0.0, 0.0, 0.0 };
@@ -174,11 +174,10 @@ public:
 		RID glow_texture;
 		RID glow_map;
 
-		RSE::EnvironmentToneMapper tonemap_mode = RSE::ENV_TONE_MAPPER_LINEAR;
+		RS::EnvironmentToneMapper tonemap_mode = RS::ENV_TONE_MAPPER_LINEAR;
 		float tonemapper_params[4] = { 0.0, 0.0, 0.0, 0.0 };
 		float exposure = 1.0;
 		float white = 1.0;
-		float max_value = 1.0;
 
 		bool use_auto_exposure = false;
 		float auto_exposure_scale = 0.5;
@@ -204,7 +203,6 @@ public:
 		Vector2i texture_size;
 		Vector2i dest_texture_size;
 		uint32_t view_count = 1;
-		bool bilinear_filtering = true;
 
 		bool convert_to_srgb = false;
 	};
diff --git a/engine/servers/rendering/renderer_rd/effects/vrs.cpp b/engine/servers/rendering/renderer_rd/effects/vrs.cpp
index 573199a5..98ff01cd 100644
--- a/engine/servers/rendering/renderer_rd/effects/vrs.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/vrs.cpp
@@ -29,13 +29,11 @@
 /**************************************************************************/
 
 #include "vrs.h"
-
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
+#include "../renderer_compositor_rd.h"
+#include "../storage_rd/texture_storage.h"
+#include "../uniform_set_cache_rd.h"
 
 #ifndef XR_DISABLED
-#include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
@@ -80,7 +78,7 @@ void VRS::copy_vrs(RID p_source_rd_texture, RID p_dest_framebuffer, bool p_multi
 	ERR_FAIL_NULL(material_storage);
 
 	// setup our uniforms
-	RID default_sampler = material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
@@ -100,7 +98,7 @@ void VRS::copy_vrs(RID p_source_rd_texture, RID p_dest_framebuffer, bool p_multi
 	RID shader = vrs_shader.shader.version_get_shader(vrs_shader.shader_version, mode);
 	ERR_FAIL_COND(shader.is_null());
 
-	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(p_dest_framebuffer, RD::DRAW_IGNORE_ALL);
+	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(p_dest_framebuffer);
 	RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, vrs_shader.pipelines[mode].get_render_pipeline(RD::INVALID_ID, RD::get_singleton()->framebuffer_get_format(p_dest_framebuffer)));
 	RD::get_singleton()->draw_list_bind_uniform_set(draw_list, uniform_set_cache->get_cache(shader, 0, u_source_rd_texture), 0);
 	RD::get_singleton()->draw_list_set_push_constant(draw_list, &push_constant, sizeof(VRSPushConstant));
@@ -115,13 +113,13 @@ Size2i VRS::get_vrs_texture_size(const Size2i p_base_size) const {
 
 void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
 	TextureStorage *texture_storage = TextureStorage::get_singleton();
-	RSE::ViewportVRSMode vrs_mode = texture_storage->render_target_get_vrs_mode(p_render_target);
-	RSE::ViewportVRSUpdateMode vrs_update_mode = texture_storage->render_target_get_vrs_update_mode(p_render_target);
+	RS::ViewportVRSMode vrs_mode = texture_storage->render_target_get_vrs_mode(p_render_target);
+	RS::ViewportVRSUpdateMode vrs_update_mode = texture_storage->render_target_get_vrs_update_mode(p_render_target);
 
-	if (vrs_mode != RSE::VIEWPORT_VRS_DISABLED && vrs_update_mode != RSE::VIEWPORT_VRS_UPDATE_DISABLED) {
+	if (vrs_mode != RS::VIEWPORT_VRS_DISABLED && vrs_update_mode != RS::VIEWPORT_VRS_UPDATE_DISABLED) {
 		RD::get_singleton()->draw_command_begin_label("VRS Setup");
 
-		if (vrs_mode == RSE::VIEWPORT_VRS_TEXTURE) {
+		if (vrs_mode == RS::VIEWPORT_VRS_TEXTURE) {
 			RID vrs_texture = texture_storage->render_target_get_vrs_texture(p_render_target);
 			if (vrs_texture.is_valid()) {
 				RID rd_texture = texture_storage->texture_get_rd_texture(vrs_texture);
@@ -132,7 +130,7 @@ void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
 				}
 			}
 #ifndef XR_DISABLED
-		} else if (vrs_mode == RSE::VIEWPORT_VRS_XR) {
+		} else if (vrs_mode == RS::VIEWPORT_VRS_XR) {
 			Ref<XRInterface> interface = XRServer::get_singleton()->get_primary_interface();
 			if (interface.is_valid() && interface->get_vrs_texture_format() == XRInterface::XR_VRS_TEXTURE_FORMAT_UNIFIED) {
 				RID vrs_texture = interface->get_vrs_texture();
@@ -149,8 +147,8 @@ void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
 #endif // XR_DISABLED
 		}
 
-		if (vrs_update_mode == RSE::VIEWPORT_VRS_UPDATE_ONCE) {
-			texture_storage->render_target_set_vrs_update_mode(p_render_target, RSE::VIEWPORT_VRS_UPDATE_DISABLED);
+		if (vrs_update_mode == RS::VIEWPORT_VRS_UPDATE_ONCE) {
+			texture_storage->render_target_set_vrs_update_mode(p_render_target, RS::VIEWPORT_VRS_UPDATE_DISABLED);
 		}
 
 		RD::get_singleton()->draw_command_end_label();
diff --git a/engine/servers/rendering/renderer_rd/environment/fog.cpp b/engine/servers/rendering/renderer_rd/environment/fog.cpp
index 6509b08a..a4d68d09 100644
--- a/engine/servers/rendering/renderer_rd/environment/fog.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/fog.cpp
@@ -30,8 +30,7 @@
 
 #include "fog.h"
 
-#include "servers/rendering/renderer_rd/cluster_builder_rd.h"
-#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
+#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_default.h"
@@ -96,7 +95,7 @@ Dependency *Fog::fog_volume_get_dependency(RID p_fog_volume) const {
 	return &fog_volume->dependency;
 }
 
-void Fog::fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) {
+void Fog::fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) {
 	FogVolume *fog_volume = fog_volume_owner.get_or_null(p_fog_volume);
 	ERR_FAIL_NULL(fog_volume);
 
@@ -129,9 +128,9 @@ RID Fog::fog_volume_get_material(RID p_fog_volume) const {
 	return fog_volume->material;
 }
 
-RSE::FogVolumeShape Fog::fog_volume_get_shape(RID p_fog_volume) const {
+RS::FogVolumeShape Fog::fog_volume_get_shape(RID p_fog_volume) const {
 	FogVolume *fog_volume = fog_volume_owner.get_or_null(p_fog_volume);
-	ERR_FAIL_NULL_V(fog_volume, RSE::FOG_VOLUME_SHAPE_BOX);
+	ERR_FAIL_NULL_V(fog_volume, RS::FOG_VOLUME_SHAPE_BOX);
 
 	return fog_volume->shape;
 }
@@ -141,10 +140,10 @@ AABB Fog::fog_volume_get_aabb(RID p_fog_volume) const {
 	ERR_FAIL_NULL_V(fog_volume, AABB());
 
 	switch (fog_volume->shape) {
-		case RSE::FOG_VOLUME_SHAPE_ELLIPSOID:
-		case RSE::FOG_VOLUME_SHAPE_CONE:
-		case RSE::FOG_VOLUME_SHAPE_CYLINDER:
-		case RSE::FOG_VOLUME_SHAPE_BOX: {
+		case RS::FOG_VOLUME_SHAPE_ELLIPSOID:
+		case RS::FOG_VOLUME_SHAPE_CONE:
+		case RS::FOG_VOLUME_SHAPE_CYLINDER:
+		case RS::FOG_VOLUME_SHAPE_BOX: {
 			AABB aabb;
 			aabb.position = -fog_volume->size / 2;
 			aabb.size = fog_volume->size;
@@ -378,7 +377,7 @@ void Fog::FogShaderData::set_code(const String &p_code) {
 
 	Fog *fog_singleton = Fog::get_singleton();
 
-	Error err = fog_singleton->volumetric_fog.compiler.compile(RSE::SHADER_FOG, code, &actions, path, gen_code);
+	Error err = fog_singleton->volumetric_fog.compiler.compile(RS::SHADER_FOG, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Fog shader compilation failed.");
 
 	if (version.is_null()) {
@@ -407,7 +406,7 @@ bool Fog::FogShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode Fog::FogShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode Fog::FogShaderData::get_native_source_code() const {
 	Fog *fog_singleton = Fog::get_singleton();
 
 	return fog_singleton->volumetric_fog.shader.version_get_native_source_code(version);
@@ -697,10 +696,10 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 			Vector3i kernel_size;
 
 			Vector3 fog_position = fog_volume_instance->transform.get_origin();
-			RSE::FogVolumeShape volume_type = RendererRD::Fog::get_singleton()->fog_volume_get_shape(fog_volume);
+			RS::FogVolumeShape volume_type = RendererRD::Fog::get_singleton()->fog_volume_get_shape(fog_volume);
 			Vector3 extents = RendererRD::Fog::get_singleton()->fog_volume_get_size(fog_volume) / 2;
 
-			if (volume_type != RSE::FOG_VOLUME_SHAPE_WORLD) {
+			if (volume_type != RS::FOG_VOLUME_SHAPE_WORLD) {
 				// Local fog volume.
 				Vector3 fog_size = Vector3(fog->width, fog->height, fog->depth);
 				float volumetric_fog_detail_spread = RendererSceneRenderRD::get_singleton()->environment_get_volumetric_fog_detail_spread(p_settings.env);
@@ -870,7 +869,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 			RD::Uniform u;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 			u.binding = 7;
-			u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 			copy_uniforms.push_back(u);
 		}
@@ -932,7 +931,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 			RD::Uniform u;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 			u.binding = 13;
-			u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 			copy_uniforms.push_back(u);
 		}
@@ -1128,7 +1127,7 @@ void Fog::volumetric_fog_update(const VolumetricFogSettings &p_settings, const P
 
 	{
 		uint32_t cluster_size = p_settings.cluster_builder->get_cluster_size();
-		params.cluster_shift = Math::get_shift_from_power_of_2(cluster_size);
+		params.cluster_shift = get_shift_from_power_of_2(cluster_size);
 
 		uint32_t cluster_screen_width = Math::division_round_up((uint32_t)p_settings.rb_size.x, cluster_size);
 		uint32_t cluster_screen_height = Math::division_round_up((uint32_t)p_settings.rb_size.y, cluster_size);
diff --git a/engine/servers/rendering/renderer_rd/environment/fog.h b/engine/servers/rendering/renderer_rd/environment/fog.h
index 53b1b4d4..db8e3352 100644
--- a/engine/servers/rendering/renderer_rd/environment/fog.h
+++ b/engine/servers/rendering/renderer_rd/environment/fog.h
@@ -30,8 +30,10 @@
 
 #pragma once
 
+#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/environment/renderer_fog.h"
+#include "servers/rendering/renderer_rd/cluster_builder_rd.h"
 #include "servers/rendering/renderer_rd/environment/gi.h"
 #include "servers/rendering/renderer_rd/pipeline_deferred_rd.h"
 #include "servers/rendering/renderer_rd/shaders/environment/volumetric_fog.glsl.gen.h"
@@ -41,8 +43,6 @@
 
 #define RB_SCOPE_FOG SNAME("Fog")
 
-class ClusterBuilderRD;
-
 namespace RendererRD {
 
 class Fog : public RendererFog {
@@ -59,7 +59,7 @@ private:
 		RID material;
 		Vector3 size = Vector3(2, 2, 2);
 
-		RSE::FogVolumeShape shape = RSE::FOG_VOLUME_SHAPE_BOX;
+		RS::FogVolumeShape shape = RS::FOG_VOLUME_SHAPE_BOX;
 
 		Dependency dependency;
 	};
@@ -216,7 +216,7 @@ private:
 		virtual void set_code(const String &p_Code);
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 
 		FogShaderData() {}
@@ -255,10 +255,10 @@ public:
 	virtual void fog_volume_free(RID p_rid) override;
 	Dependency *fog_volume_get_dependency(RID p_fog_volume) const;
 
-	virtual void fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) override;
+	virtual void fog_volume_set_shape(RID p_fog_volume, RS::FogVolumeShape p_shape) override;
 	virtual void fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) override;
 	virtual void fog_volume_set_material(RID p_fog_volume, RID p_material) override;
-	virtual RSE::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override;
+	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const override;
 	RID fog_volume_get_material(RID p_fog_volume) const;
 	virtual AABB fog_volume_get_aabb(RID p_fog_volume) const override;
 	Vector3 fog_volume_get_size(RID p_fog_volume) const;
diff --git a/engine/servers/rendering/renderer_rd/environment/gi.cpp b/engine/servers/rendering/renderer_rd/environment/gi.cpp
index 3fea03ae..c32dc533 100644
--- a/engine/servers/rendering/renderer_rd/environment/gi.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/gi.cpp
@@ -31,13 +31,12 @@
 #include "gi.h"
 
 #include "core/config/project_settings.h"
-#include "core/math/geometry_3d.h"
-#include "servers/rendering/renderer_rd/environment/fog.h"
+#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_globals.h"
+#include "servers/rendering/rendering_server_default.h"
 
 using namespace RendererRD;
 
@@ -484,7 +483,7 @@ void GI::SDFGI::create(RID p_env, const Vector3 &p_world_position, uint32_t p_re
 	RD::TextureFormat tf_aniso1 = tf_sdf;
 	tf_aniso1.format = RD::DATA_FORMAT_R8G8_UNORM;
 
-	int passes = Math::nearest_shift(cascade_size) - 1;
+	int passes = nearest_shift(cascade_size) - 1;
 
 	//store lightprobe SH
 	RD::TextureFormat tf_probes;
@@ -756,7 +755,7 @@ void GI::SDFGI::create(RID p_env, const Vector3 &p_world_position, uint32_t p_re
 			RD::Uniform u;
 			u.binding = 2;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
-			u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 		}
 		{
@@ -1039,7 +1038,7 @@ void GI::SDFGI::create(RID p_env, const Vector3 &p_world_position, uint32_t p_re
 			RD::Uniform u;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 			u.binding = 6;
-			u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 		}
 
@@ -1266,11 +1265,11 @@ void GI::SDFGI::update_light() {
 		push_constant.light_count = cascade_dynamic_light_count[i];
 		push_constant.cascade = i;
 
-		if (cascades[i].all_dynamic_lights_dirty || gi->sdfgi_frames_to_update_light == RSE::ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME) {
+		if (cascades[i].all_dynamic_lights_dirty || gi->sdfgi_frames_to_update_light == RS::ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME) {
 			push_constant.process_offset = 0;
 			push_constant.process_increment = 1;
 		} else {
-			static const uint32_t frames_to_update_table[RSE::ENV_SDFGI_UPDATE_LIGHT_MAX] = {
+			static const uint32_t frames_to_update_table[RS::ENV_SDFGI_UPDATE_LIGHT_MAX] = {
 				1, 2, 4, 8, 16
 			};
 
@@ -1300,7 +1299,7 @@ void GI::SDFGI::update_probes(RID p_env, SkyRD::Sky *p_sky) {
 	push_constant.probe_axis_size = probe_axis_count;
 	push_constant.history_index = render_pass % history_size;
 	push_constant.history_size = history_size;
-	static const uint32_t ray_count[RSE::ENV_SDFGI_RAY_COUNT_MAX] = { 4, 8, 16, 32, 64, 96, 128 };
+	static const uint32_t ray_count[RS::ENV_SDFGI_RAY_COUNT_MAX] = { 4, 8, 16, 32, 64, 96, 128 };
 	push_constant.ray_count = ray_count[gi->sdfgi_ray_count];
 	push_constant.ray_bias = probe_bias;
 	push_constant.image_size[0] = probe_axis_count * probe_axis_count;
@@ -1318,20 +1317,20 @@ void GI::SDFGI::update_probes(RID p_env, SkyRD::Sky *p_sky) {
 	if (reads_sky && p_env.is_valid()) {
 		push_constant.sky_energy = RendererSceneRenderRD::get_singleton()->environment_get_bg_energy_multiplier(p_env);
 
-		if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RSE::ENV_BG_CLEAR_COLOR) {
+		if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RS::ENV_BG_CLEAR_COLOR) {
 			push_constant.sky_flags |= SDFGIShader::IntegratePushConstant::SKY_FLAGS_MODE_COLOR;
 			Color c = RSG::texture_storage->get_default_clear_color().srgb_to_linear();
 			push_constant.sky_color_or_orientation[0] = c.r;
 			push_constant.sky_color_or_orientation[1] = c.g;
 			push_constant.sky_color_or_orientation[2] = c.b;
-		} else if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RSE::ENV_BG_COLOR) {
+		} else if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RS::ENV_BG_COLOR) {
 			push_constant.sky_flags |= SDFGIShader::IntegratePushConstant::SKY_FLAGS_MODE_COLOR;
 			Color c = RendererSceneRenderRD::get_singleton()->environment_get_bg_color(p_env);
 			push_constant.sky_color_or_orientation[0] = c.r;
 			push_constant.sky_color_or_orientation[1] = c.g;
 			push_constant.sky_color_or_orientation[2] = c.b;
 
-		} else if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RSE::ENV_BG_SKY) {
+		} else if (RendererSceneRenderRD::get_singleton()->environment_get_background(p_env) == RS::ENV_BG_SKY) {
 			if (p_sky && p_sky->radiance.is_valid()) {
 				if (integrate_sky_uniform_set.is_null() || !RD::get_singleton()->uniform_set_is_valid(integrate_sky_uniform_set)) {
 					Vector<RD::Uniform> uniforms;
@@ -1348,7 +1347,7 @@ void GI::SDFGI::update_probes(RID p_env, SkyRD::Sky *p_sky) {
 						RD::Uniform u;
 						u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 						u.binding = 1;
-						u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+						u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 						uniforms.push_back(u);
 					}
 
@@ -1403,7 +1402,7 @@ void GI::SDFGI::store_probes() {
 	push_constant.probe_axis_size = probe_axis_count;
 	push_constant.history_index = render_pass % history_size;
 	push_constant.history_size = history_size;
-	static const uint32_t ray_count[RSE::ENV_SDFGI_RAY_COUNT_MAX] = { 4, 8, 16, 32, 64, 96, 128 };
+	static const uint32_t ray_count[RS::ENV_SDFGI_RAY_COUNT_MAX] = { 4, 8, 16, 32, 64, 96, 128 };
 	push_constant.ray_count = ray_count[gi->sdfgi_ray_count];
 	push_constant.ray_bias = probe_bias;
 	push_constant.image_size[0] = probe_axis_count * probe_axis_count;
@@ -1584,7 +1583,7 @@ void GI::SDFGI::debug_draw(uint32_t p_view_count, const Projection *p_projection
 				RD::Uniform u;
 				u.binding = 8;
 				u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
-				u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+				u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 				uniforms.push_back(u);
 			}
 			{
@@ -1712,7 +1711,7 @@ void GI::SDFGI::debug_probes(RID p_framebuffer, const uint32_t p_view_count, con
 			RD::Uniform u;
 			u.binding = 3;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
-			u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 		}
 		{
@@ -1902,7 +1901,7 @@ void GI::SDFGI::pre_process_gi(const Transform3D &p_transform, RenderDataRD *p_r
 			RID light = light_storage->light_instance_get_base_light(light_instance);
 			Transform3D light_transform = light_storage->light_instance_get_base_transform(light_instance);
 
-			if (RSG::light_storage->light_directional_get_sky_mode(light) == RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
+			if (RSG::light_storage->light_directional_get_sky_mode(light) == RS::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
 				continue;
 			}
 
@@ -1917,10 +1916,10 @@ void GI::SDFGI::pre_process_gi(const Transform3D &p_transform, RenderDataRD *p_r
 			lights[idx].color[0] = color.r;
 			lights[idx].color[1] = color.g;
 			lights[idx].color[2] = color.b;
-			lights[idx].type = RSE::LIGHT_DIRECTIONAL;
-			lights[idx].energy = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
+			lights[idx].type = RS::LIGHT_DIRECTIONAL;
+			lights[idx].energy = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INDIRECT_ENERGY);
 			if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-				lights[idx].energy *= RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INTENSITY);
+				lights[idx].energy *= RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INTENSITY);
 			}
 
 			if (p_render_data->camera_attributes.is_valid()) {
@@ -1976,14 +1975,14 @@ void GI::SDFGI::pre_process_gi(const Transform3D &p_transform, RenderDataRD *p_r
 			lights[idx].color[2] = color.b;
 			lights[idx].type = RSG::light_storage->light_get_type(light);
 
-			lights[idx].energy = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
+			lights[idx].energy = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INDIRECT_ENERGY);
 			if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-				lights[idx].energy *= RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INTENSITY);
+				lights[idx].energy *= RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INTENSITY);
 
 				// Convert from Luminous Power to Luminous Intensity
-				if (lights[idx].type == RSE::LIGHT_OMNI) {
+				if (lights[idx].type == RS::LIGHT_OMNI) {
 					lights[idx].energy *= 1.0 / (Math::PI * 4.0);
-				} else if (lights[idx].type == RSE::LIGHT_SPOT) {
+				} else if (lights[idx].type == RS::LIGHT_SPOT) {
 					// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 					// We make this assumption to keep them easy to control.
 					lights[idx].energy *= 1.0 / Math::PI;
@@ -1995,10 +1994,10 @@ void GI::SDFGI::pre_process_gi(const Transform3D &p_transform, RenderDataRD *p_r
 			}
 
 			lights[idx].has_shadow = RSG::light_storage->light_has_shadow(light);
-			lights[idx].attenuation = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ATTENUATION);
-			lights[idx].radius = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_RANGE);
-			lights[idx].cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ANGLE)));
-			lights[idx].inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+			lights[idx].attenuation = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ATTENUATION);
+			lights[idx].radius = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_RANGE);
+			lights[idx].cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ANGLE)));
+			lights[idx].inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 
 			idx++;
 		}
@@ -2421,7 +2420,7 @@ void GI::SDFGI::render_static_lights(RenderDataRD *p_render_data, Ref<RenderScen
 				lights[idx].type = RSG::light_storage->light_get_type(light);
 
 				Vector3 dir = -light_transform.basis.get_column(Vector3::AXIS_Z);
-				if (lights[idx].type == RSE::LIGHT_DIRECTIONAL) {
+				if (lights[idx].type == RS::LIGHT_DIRECTIONAL) {
 					dir.y *= y_mult; //only makes sense for directional
 					dir.normalize();
 				}
@@ -2439,14 +2438,14 @@ void GI::SDFGI::render_static_lights(RenderDataRD *p_render_data, Ref<RenderScen
 				lights[idx].color[1] = color.g;
 				lights[idx].color[2] = color.b;
 
-				lights[idx].energy = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
+				lights[idx].energy = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INDIRECT_ENERGY);
 				if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-					lights[idx].energy *= RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INTENSITY);
+					lights[idx].energy *= RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INTENSITY);
 
 					// Convert from Luminous Power to Luminous Intensity
-					if (lights[idx].type == RSE::LIGHT_OMNI) {
+					if (lights[idx].type == RS::LIGHT_OMNI) {
 						lights[idx].energy *= 1.0 / (Math::PI * 4.0);
-					} else if (lights[idx].type == RSE::LIGHT_SPOT) {
+					} else if (lights[idx].type == RS::LIGHT_SPOT) {
 						// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 						// We make this assumption to keep them easy to control.
 						lights[idx].energy *= 1.0 / Math::PI;
@@ -2458,10 +2457,10 @@ void GI::SDFGI::render_static_lights(RenderDataRD *p_render_data, Ref<RenderScen
 				}
 
 				lights[idx].has_shadow = RSG::light_storage->light_has_shadow(light);
-				lights[idx].attenuation = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ATTENUATION);
-				lights[idx].radius = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_RANGE);
-				lights[idx].cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ANGLE)));
-				lights[idx].inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+				lights[idx].attenuation = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ATTENUATION);
+				lights[idx].radius = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_RANGE);
+				lights[idx].cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ANGLE)));
+				lights[idx].inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 
 				idx++;
 			}
@@ -2612,7 +2611,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 					RD::Uniform u;
 					u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 					u.binding = 10;
-					u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+					u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 					uniforms.push_back(u);
 				}
 
@@ -2659,7 +2658,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 
 			{
 				uint32_t dynamic_map_size = MAX(MAX(octree_size.x, octree_size.y), octree_size.z);
-				uint32_t oversample = Math::nearest_power_of_2_templated(4);
+				uint32_t oversample = nearest_power_of_2_templated(4);
 				int mipmap_index = 0;
 
 				while (mipmap_index < mipmaps.size()) {
@@ -2772,7 +2771,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 								RD::Uniform u;
 								u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 								u.binding = 10;
-								u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+								u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 								uniforms.push_back(u);
 							}
 							{
@@ -2841,7 +2840,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 							RD::Uniform u;
 							u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 							u.binding = 10;
-							u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+							u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 							uniforms.push_back(u);
 						}
 
@@ -2896,37 +2895,37 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 				RID light = light_storage->light_instance_get_base_light(light_instance);
 
 				l.type = RSG::light_storage->light_get_type(light);
-				if (l.type == RSE::LIGHT_DIRECTIONAL && RSG::light_storage->light_directional_get_sky_mode(light) == RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
+				if (l.type == RS::LIGHT_DIRECTIONAL && RSG::light_storage->light_directional_get_sky_mode(light) == RS::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
 					light_count--;
 					continue;
 				}
 
-				l.attenuation = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ATTENUATION);
-				l.energy = RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
+				l.attenuation = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ATTENUATION);
+				l.energy = RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_ENERGY) * RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INDIRECT_ENERGY);
 
 				if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-					l.energy *= RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_INTENSITY);
+					l.energy *= RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_INTENSITY);
 
 					l.energy *= gi->voxel_gi_get_baked_exposure_normalization(probe);
 
 					// Convert from Luminous Power to Luminous Intensity
-					if (l.type == RSE::LIGHT_OMNI) {
+					if (l.type == RS::LIGHT_OMNI) {
 						l.energy *= 1.0 / (Math::PI * 4.0);
-					} else if (l.type == RSE::LIGHT_SPOT) {
+					} else if (l.type == RS::LIGHT_SPOT) {
 						// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 						// We make this assumption to keep them easy to control.
 						l.energy *= 1.0 / Math::PI;
 					}
 				}
 
-				l.radius = to_cell.basis.xform(Vector3(RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_RANGE), 0, 0)).length();
+				l.radius = to_cell.basis.xform(Vector3(RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_RANGE), 0, 0)).length();
 				Color color = RSG::light_storage->light_get_color(light).srgb_to_linear();
 				l.color[0] = color.r;
 				l.color[1] = color.g;
 				l.color[2] = color.b;
 
-				l.cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ANGLE)));
-				l.inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+				l.cos_spot_angle = Math::cos(Math::deg_to_rad(RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ANGLE)));
+				l.inv_spot_attenuation = 1.0f / RSG::light_storage->light_get_param(light, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 
 				Transform3D xform = light_storage->light_instance_get_base_transform(light_instance);
 
@@ -3339,7 +3338,7 @@ void GI::VoxelGIInstance::debug(RD::DrawListID p_draw_list, RID p_framebuffer, c
 		RD::Uniform u;
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		u.binding = 3;
-		u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+		u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 		uniforms.push_back(u);
 	}
 
@@ -3372,9 +3371,9 @@ void GI::VoxelGIInstance::debug(RD::DrawListID p_draw_list, RID p_framebuffer, c
 GI::GI() {
 	singleton = this;
 
-	sdfgi_ray_count = RSE::EnvironmentSDFGIRayCount(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/probe_ray_count")), 0, int32_t(RSE::ENV_SDFGI_RAY_COUNT_MAX - 1)));
-	sdfgi_frames_to_converge = RSE::EnvironmentSDFGIFramesToConverge(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_converge")), 0, int32_t(RSE::ENV_SDFGI_CONVERGE_MAX - 1)));
-	sdfgi_frames_to_update_light = RSE::EnvironmentSDFGIFramesToUpdateLight(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_update_lights")), 0, int32_t(RSE::ENV_SDFGI_UPDATE_LIGHT_MAX - 1)));
+	sdfgi_ray_count = RS::EnvironmentSDFGIRayCount(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/probe_ray_count")), 0, int32_t(RS::ENV_SDFGI_RAY_COUNT_MAX - 1)));
+	sdfgi_frames_to_converge = RS::EnvironmentSDFGIFramesToConverge(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_converge")), 0, int32_t(RS::ENV_SDFGI_CONVERGE_MAX - 1)));
+	sdfgi_frames_to_update_light = RS::EnvironmentSDFGIFramesToUpdateLight(CLAMP(int32_t(GLOBAL_GET("rendering/global_illumination/sdfgi/frames_to_update_lights")), 0, int32_t(RS::ENV_SDFGI_UPDATE_LIGHT_MAX - 1)));
 }
 
 GI::~GI() {
@@ -3441,7 +3440,7 @@ void GI::init(SkyRD *p_sky) {
 
 		voxel_gi_lights = memnew_arr(VoxelGILight, voxel_gi_max_lights);
 		voxel_gi_lights_uniform = RD::get_singleton()->uniform_buffer_create(voxel_gi_max_lights * sizeof(VoxelGILight));
-		voxel_gi_quality = RSE::VoxelGIQuality(CLAMP(int(GLOBAL_GET("rendering/global_illumination/voxel_gi/quality")), 0, 1));
+		voxel_gi_quality = RS::VoxelGIQuality(CLAMP(int(GLOBAL_GET("rendering/global_illumination/voxel_gi/quality")), 0, 1));
 
 		String defines = "\n#define MAX_LIGHTS " + itos(voxel_gi_max_lights) + "\n";
 
@@ -3560,7 +3559,7 @@ void GI::init(SkyRD *p_sky) {
 				RD::Uniform u;
 				u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 				u.binding = 1;
-				u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+				u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 				uniforms.push_back(u);
 			}
 
@@ -3900,7 +3899,7 @@ void GI::process_gi(Ref<RenderSceneBuffersRD> p_render_buffers, const RID *p_nor
 	PushConstant push_constant;
 
 	push_constant.max_voxel_gi_instances = MIN((uint64_t)MAX_VOXEL_GI_INSTANCES, p_voxel_gi_instances.size());
-	push_constant.high_quality_vct = voxel_gi_quality == RSE::VOXEL_GI_QUALITY_HIGH;
+	push_constant.high_quality_vct = voxel_gi_quality == RS::VOXEL_GI_QUALITY_HIGH;
 
 	// these should be the same for all views
 	push_constant.orthogonal = p_projections[0].is_orthogonal();
@@ -4016,14 +4015,14 @@ void GI::process_gi(Ref<RenderSceneBuffersRD> p_render_buffers, const RID *p_nor
 				RD::Uniform u;
 				u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 				u.binding = 6;
-				u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+				u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 				uniforms.push_back(u);
 			}
 			{
 				RD::Uniform u;
 				u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 				u.binding = 7;
-				u.append_id(material_storage->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+				u.append_id(material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 				uniforms.push_back(u);
 			}
 			{
diff --git a/engine/servers/rendering/renderer_rd/environment/gi.h b/engine/servers/rendering/renderer_rd/environment/gi.h
index 16fbd75b..a46b44bd 100644
--- a/engine/servers/rendering/renderer_rd/environment/gi.h
+++ b/engine/servers/rendering/renderer_rd/environment/gi.h
@@ -541,7 +541,7 @@ public:
 
 	void voxel_gi_instance_free(RID p_rid);
 
-	RSE::VoxelGIQuality voxel_gi_quality = RSE::VOXEL_GI_QUALITY_LOW;
+	RS::VoxelGIQuality voxel_gi_quality = RS::VOXEL_GI_QUALITY_LOW;
 
 	/* SDFGI */
 
@@ -667,7 +667,7 @@ public:
 		float energy = 1.0;
 		float normal_bias = 1.1;
 		float probe_bias = 1.1;
-		RSE::EnvironmentSDFGIYScale y_scale_mode = RSE::ENV_SDFGI_Y_SCALE_75_PERCENT;
+		RS::EnvironmentSDFGIYScale y_scale_mode = RS::ENV_SDFGI_Y_SCALE_75_PERCENT;
 
 		float y_mult = 1.0;
 
@@ -697,9 +697,9 @@ public:
 		void render_static_lights(RenderDataRD *p_render_data, Ref<RenderSceneBuffersRD> p_render_buffers, uint32_t p_cascade_count, const uint32_t *p_cascade_indices, const PagedArray<RID> *p_positional_light_cull_result);
 	};
 
-	RSE::EnvironmentSDFGIRayCount sdfgi_ray_count = RSE::ENV_SDFGI_RAY_COUNT_16;
-	RSE::EnvironmentSDFGIFramesToConverge sdfgi_frames_to_converge = RSE::ENV_SDFGI_CONVERGE_IN_30_FRAMES;
-	RSE::EnvironmentSDFGIFramesToUpdateLight sdfgi_frames_to_update_light = RSE::ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES;
+	RS::EnvironmentSDFGIRayCount sdfgi_ray_count = RS::ENV_SDFGI_RAY_COUNT_16;
+	RS::EnvironmentSDFGIFramesToConverge sdfgi_frames_to_converge = RS::ENV_SDFGI_CONVERGE_IN_30_FRAMES;
+	RS::EnvironmentSDFGIFramesToUpdateLight sdfgi_frames_to_update_light = RS::ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES;
 
 	float sdfgi_solid_cell_ratio = 0.25;
 	Vector3 sdfgi_debug_probe_pos;
diff --git a/engine/servers/rendering/renderer_rd/environment/sky.cpp b/engine/servers/rendering/renderer_rd/environment/sky.cpp
index 91fca3b2..d5bd402b 100644
--- a/engine/servers/rendering/renderer_rd/environment/sky.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/sky.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "sky.h"
-
 #include "core/config/project_settings.h"
 #include "core/math/math_defs.h"
 #include "servers/rendering/renderer_rd/effects/copy_effects.h"
@@ -37,7 +36,6 @@
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_data_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
@@ -106,7 +104,7 @@ void SkyRD::SkyShaderData::set_code(const String &p_code) {
 	// !BAS! Contemplate making `SkyShader sky` accessible from this struct or even part of this struct.
 	RendererSceneRenderRD *scene_singleton = static_cast<RendererSceneRenderRD *>(RendererSceneRenderRD::singleton);
 
-	Error err = scene_singleton->sky.sky_shader.compiler.compile(RSE::SHADER_SKY, code, &actions, path, gen_code);
+	Error err = scene_singleton->sky.sky_shader.compiler.compile(RS::SHADER_SKY, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -164,7 +162,7 @@ bool SkyRD::SkyShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode SkyRD::SkyShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode SkyRD::SkyShaderData::get_native_source_code() const {
 	RendererSceneRenderRD *scene_singleton = static_cast<RendererSceneRenderRD *>(RendererSceneRenderRD::singleton);
 
 	return scene_singleton->sky.sky_shader.shader.version_get_native_source_code(version);
@@ -590,7 +588,7 @@ bool SkyRD::Sky::set_radiance_size(int p_radiance_size) {
 	}
 	radiance_size = p_radiance_size;
 
-	if (mode == RSE::SKY_MODE_REALTIME && radiance_size != REAL_TIME_SIZE) {
+	if (mode == RS::SKY_MODE_REALTIME && radiance_size != REAL_TIME_SIZE) {
 		WARN_PRINT(vformat("Realtime Skies can only use a radiance size of %d. Radiance size will be set to %d internally.", REAL_TIME_SIZE, REAL_TIME_SIZE));
 		radiance_size = REAL_TIME_SIZE;
 	}
@@ -608,14 +606,14 @@ int SkyRD::Sky::get_radiance_size() const {
 	return radiance_size;
 }
 
-bool SkyRD::Sky::set_mode(RSE::SkyMode p_mode) {
+bool SkyRD::Sky::set_mode(RS::SkyMode p_mode) {
 	if (mode == p_mode) {
 		return false;
 	}
 
 	mode = p_mode;
 
-	if (mode == RSE::SKY_MODE_REALTIME && radiance_size != REAL_TIME_SIZE) {
+	if (mode == RS::SKY_MODE_REALTIME && radiance_size != REAL_TIME_SIZE) {
 		WARN_PRINT(vformat("Realtime Skies can only use a radiance size of %d. Radiance size will be set to %d internally.", REAL_TIME_SIZE, REAL_TIME_SIZE));
 		set_radiance_size(REAL_TIME_SIZE);
 	}
@@ -1041,8 +1039,8 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
 
 			ERR_CONTINUE(base.is_null());
 
-			RSE::LightType type = light_storage->light_get_type(base);
-			if (type == RSE::LIGHT_DIRECTIONAL && light_storage->light_directional_get_sky_mode(base) != RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY) {
+			RS::LightType type = light_storage->light_get_type(base);
+			if (type == RS::LIGHT_DIRECTIONAL && light_storage->light_directional_get_sky_mode(base) != RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY) {
 				SkyDirectionalLightData &sky_light_data = sky_scene_state.directional_lights[sky_scene_state.ubo.directional_light_count];
 				Transform3D light_transform = light_storage->light_instance_get_base_transform(lights[i]);
 				Vector3 world_direction = light_transform.basis.xform(Vector3(0, 0, 1)).normalized();
@@ -1052,10 +1050,10 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
 				sky_light_data.direction[2] = world_direction.z;
 
 				float sign = light_storage->light_is_negative(base) ? -1 : 1;
-				sky_light_data.energy = sign * light_storage->light_get_param(base, RSE::LIGHT_PARAM_ENERGY);
+				sky_light_data.energy = sign * light_storage->light_get_param(base, RS::LIGHT_PARAM_ENERGY);
 
 				if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-					sky_light_data.energy *= light_storage->light_get_param(base, RSE::LIGHT_PARAM_INTENSITY);
+					sky_light_data.energy *= light_storage->light_get_param(base, RS::LIGHT_PARAM_INTENSITY);
 				}
 
 				if (p_render_data->camera_attributes.is_valid()) {
@@ -1069,7 +1067,7 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
 
 				sky_light_data.enabled = true;
 
-				float angular_diameter = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SIZE);
+				float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
 				sky_light_data.size = Math::deg_to_rad(angular_diameter);
 				sky_scene_state.ubo.directional_light_count++;
 				if (sky_scene_state.ubo.directional_light_count >= sky_scene_state.max_directional_lights) {
@@ -1151,6 +1149,10 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
 	correction.add_jitter_offset(p_render_data->scene_data->taa_jitter);
 
 	Projection projection = p_render_data->scene_data->cam_projection;
+	if (p_render_data->scene_data->cam_frustum) {
+		// We don't use a full projection matrix for the sky, this is enough to make up for it.
+		projection[2].y = -projection[2].y;
+	}
 
 	float custom_fov = RendererSceneRenderRD::get_singleton()->environment_get_sky_custom_fov(p_render_data->environment);
 
@@ -1231,28 +1233,28 @@ void SkyRD::update_radiance_buffers(Ref<RenderSceneBuffersRD> p_render_buffers,
 
 	ERR_FAIL_NULL(shader_data);
 
-	bool update_single_frame = sky->mode == RSE::SKY_MODE_REALTIME || sky->mode == RSE::SKY_MODE_QUALITY;
-	RSE::SkyMode sky_mode = sky->mode;
+	bool update_single_frame = sky->mode == RS::SKY_MODE_REALTIME || sky->mode == RS::SKY_MODE_QUALITY;
+	RS::SkyMode sky_mode = sky->mode;
 
-	if (sky_mode == RSE::SKY_MODE_AUTOMATIC) {
+	if (sky_mode == RS::SKY_MODE_AUTOMATIC) {
 		bool sun_scatter_enabled = RendererSceneRenderRD::get_singleton()->environment_get_fog_enabled(p_env) && RendererSceneRenderRD::get_singleton()->environment_get_fog_sun_scatter(p_env) > 0.001;
 
 		if ((shader_data->uses_time || shader_data->uses_position) && sky->radiance_size == Sky::REAL_TIME_SIZE) {
 			update_single_frame = true;
-			sky_mode = RSE::SKY_MODE_REALTIME;
+			sky_mode = RS::SKY_MODE_REALTIME;
 		} else if (shader_data->uses_light || sun_scatter_enabled || shader_data->ubo_size > 0) {
 			update_single_frame = false;
-			sky_mode = RSE::SKY_MODE_INCREMENTAL;
+			sky_mode = RS::SKY_MODE_INCREMENTAL;
 		} else {
 			update_single_frame = true;
-			sky_mode = RSE::SKY_MODE_QUALITY;
+			sky_mode = RS::SKY_MODE_QUALITY;
 		}
 	}
 
-	if (sky->processing_layer == 0 && sky_mode == RSE::SKY_MODE_INCREMENTAL) {
+	if (sky->processing_layer == 0 && sky_mode == RS::SKY_MODE_INCREMENTAL) {
 		// On the first frame after creating sky, rebuild in single frame
 		update_single_frame = true;
-		sky_mode = RSE::SKY_MODE_QUALITY;
+		sky_mode = RS::SKY_MODE_QUALITY;
 	}
 
 	int max_processing_layer = sky_use_octmap_array ? sky->reflection.layers.size() : sky->reflection.layers[0].mipmaps.size();
@@ -1318,7 +1320,7 @@ void SkyRD::update_radiance_buffers(Ref<RenderSceneBuffersRD> p_render_buffers,
 
 		RD::get_singleton()->draw_command_end_label();
 
-		if (sky_mode == RSE::SKY_MODE_REALTIME) {
+		if (sky_mode == RS::SKY_MODE_REALTIME) {
 			sky->reflection.create_reflection_fast_filter(sky_use_octmap_array);
 			if (sky_use_octmap_array) {
 				sky->reflection.update_reflection_mipmaps(0, sky->reflection.layers.size());
@@ -1343,7 +1345,7 @@ void SkyRD::update_radiance_buffers(Ref<RenderSceneBuffersRD> p_render_buffers,
 		sky->reflection.dirty = false;
 
 	} else {
-		if (sky_mode == RSE::SKY_MODE_INCREMENTAL && sky->processing_layer < max_processing_layer) {
+		if (sky_mode == RS::SKY_MODE_INCREMENTAL && sky->processing_layer < max_processing_layer) {
 			sky->reflection.create_reflection_importance_sample(sky_use_octmap_array, sky->processing_layer, sky_ggx_samples_quality);
 
 			if (sky_use_octmap_array) {
@@ -1365,9 +1367,9 @@ void SkyRD::update_res_buffers(Ref<RenderSceneBuffersRD> p_render_buffers, RID p
 	SkyMaterialData *material = nullptr;
 	RID sky_material;
 
-	RSE::EnvironmentBG background = RendererSceneRenderRD::get_singleton()->environment_get_background(p_env);
+	RS::EnvironmentBG background = RendererSceneRenderRD::get_singleton()->environment_get_background(p_env);
 
-	if (!(background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) || sky) {
+	if (!(background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) || sky) {
 		ERR_FAIL_NULL(sky);
 		sky_material = sky_get_material(RendererSceneRenderRD::get_singleton()->environment_get_sky(p_env));
 
@@ -1384,7 +1386,7 @@ void SkyRD::update_res_buffers(Ref<RenderSceneBuffersRD> p_render_buffers, RID p
 		}
 	}
 
-	if (background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) {
+	if (background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) {
 		sky_material = sky_scene_state.fog_material;
 		material = static_cast<SkyMaterialData *>(material_storage->material_get_data(sky_material, RendererRD::MaterialStorage::SHADER_TYPE_SKY));
 	}
@@ -1456,9 +1458,9 @@ void SkyRD::draw_sky(RD::DrawListID p_draw_list, Ref<RenderSceneBuffersRD> p_ren
 	SkyMaterialData *material = nullptr;
 	RID sky_material;
 
-	RSE::EnvironmentBG background = RendererSceneRenderRD::get_singleton()->environment_get_background(p_env);
+	RS::EnvironmentBG background = RendererSceneRenderRD::get_singleton()->environment_get_background(p_env);
 
-	if (!(background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) || sky) {
+	if (!(background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) || sky) {
 		ERR_FAIL_NULL(sky);
 		sky_material = sky_get_material(RendererSceneRenderRD::get_singleton()->environment_get_sky(p_env));
 
@@ -1475,7 +1477,7 @@ void SkyRD::draw_sky(RD::DrawListID p_draw_list, Ref<RenderSceneBuffersRD> p_ren
 		}
 	}
 
-	if (background == RSE::ENV_BG_CLEAR_COLOR || background == RSE::ENV_BG_COLOR) {
+	if (background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) {
 		sky_material = sky_scene_state.fog_material;
 		material = static_cast<SkyMaterialData *>(material_storage->material_get_data(sky_material, RendererRD::MaterialStorage::SHADER_TYPE_SKY));
 	}
@@ -1531,7 +1533,7 @@ void SkyRD::update_dirty_skys() {
 			int mipmaps = Image::get_image_required_mipmaps(sky->radiance_size, sky->radiance_size, Image::FORMAT_RGBAH) + 1;
 
 			int layers = roughness_layers;
-			if (sky->mode == RSE::SKY_MODE_REALTIME) {
+			if (sky->mode == RS::SKY_MODE_REALTIME) {
 				layers = Sky::REAL_TIME_ROUGHNESS_LAYERS;
 				if (roughness_layers != layers) {
 					WARN_PRINT(vformat("When using the Real-Time sky update mode (or Automatic with a sky shader using \"TIME\"), \"rendering/reflections/sky_reflections/roughness_layers\" should be set to %d in the project settings for best quality reflections.", Sky::REAL_TIME_ROUGHNESS_LAYERS));
@@ -1561,7 +1563,7 @@ void SkyRD::update_dirty_skys() {
 
 				sky->radiance = RD::get_singleton()->texture_create(tf, RD::TextureView());
 
-				sky->reflection.update_reflection_data(w, mipmaps, true, sky->radiance, 0, sky->mode == RSE::SKY_MODE_REALTIME, roughness_layers, texture_format, sky->uv_border_size);
+				sky->reflection.update_reflection_data(w, mipmaps, true, sky->radiance, 0, sky->mode == RS::SKY_MODE_REALTIME, roughness_layers, texture_format, sky->uv_border_size);
 			} else {
 				// Double size to approximate texel density of cubemaps + add border for proper filtering/mipmapping.
 				uint32_t padding_pixels = (1 << (MIN(mipmaps, layers) - 1));
@@ -1582,7 +1584,7 @@ void SkyRD::update_dirty_skys() {
 
 				sky->radiance = RD::get_singleton()->texture_create(tf, RD::TextureView());
 
-				sky->reflection.update_reflection_data(w, MIN(mipmaps, layers), false, sky->radiance, 0, sky->mode == RSE::SKY_MODE_REALTIME, roughness_layers, texture_format, sky->uv_border_size);
+				sky->reflection.update_reflection_data(w, MIN(mipmaps, layers), false, sky->radiance, 0, sky->mode == RS::SKY_MODE_REALTIME, roughness_layers, texture_format, sky->uv_border_size);
 			}
 		}
 
@@ -1648,7 +1650,7 @@ int SkyRD::sky_get_radiance_size(RID p_sky) const {
 	return sky->get_radiance_size();
 }
 
-void SkyRD::sky_set_mode(RID p_sky, RSE::SkyMode p_mode) {
+void SkyRD::sky_set_mode(RID p_sky, RS::SkyMode p_mode) {
 	Sky *sky = get_sky(p_sky);
 	ERR_FAIL_NULL(sky);
 
diff --git a/engine/servers/rendering/renderer_rd/environment/sky.h b/engine/servers/rendering/renderer_rd/environment/sky.h
index 07801dd7..f562c002 100644
--- a/engine/servers/rendering/renderer_rd/environment/sky.h
+++ b/engine/servers/rendering/renderer_rd/environment/sky.h
@@ -31,17 +31,17 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
+#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/environment/sky.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
+#include "servers/rendering/renderer_rd/storage_rd/render_data_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 
 // Forward declare RendererSceneRenderRD so we can pass it into some of our methods, these classes are pretty tightly bound
 class RendererSceneRenderRD;
-class RenderDataRD;
 class RenderSceneBuffersRD;
 
 namespace RendererRD {
@@ -127,7 +127,7 @@ private:
 		virtual void set_code(const String &p_Code);
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 
 		SkyShaderData() {}
@@ -261,7 +261,7 @@ public:
 		int radiance_size = REAL_TIME_SIZE;
 		float uv_border_size = 0.0; // Border size in UV space.
 
-		RSE::SkyMode mode = RSE::SKY_MODE_AUTOMATIC;
+		RS::SkyMode mode = RS::SKY_MODE_AUTOMATIC;
 
 		ReflectionData reflection;
 		bool dirty = false;
@@ -279,7 +279,7 @@ public:
 		RID get_textures(SkyTextureSetVersion p_version, RID p_default_shader_rd, Ref<RenderSceneBuffersRD> p_render_buffers);
 		bool set_radiance_size(int p_radiance_size);
 		int get_radiance_size() const;
-		bool set_mode(RSE::SkyMode p_mode);
+		bool set_mode(RS::SkyMode p_mode);
 		bool set_material(RID p_material);
 		Ref<Image> bake_panorama(float p_energy, int p_roughness_layers, const Size2i &p_size);
 	};
@@ -320,7 +320,7 @@ public:
 	void free_sky(RID p_sky);
 	void sky_set_radiance_size(RID p_sky, int p_radiance_size);
 	int sky_get_radiance_size(RID p_sky) const;
-	void sky_set_mode(RID p_sky, RSE::SkyMode p_mode);
+	void sky_set_mode(RID p_sky, RS::SkyMode p_mode);
 	void sky_set_material(RID p_sky, RID p_material);
 	Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size);
 	float sky_get_uv_border_size(RID p_sky);
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
index 678fdc4a..28fe6ac5 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "render_forward_clustered.h"
-
 #include "core/config/project_settings.h"
 #include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
@@ -51,7 +50,7 @@ void RenderForwardClustered::RenderBufferDataForwardClustered::ensure_specular()
 	ERR_FAIL_NULL(render_buffers);
 
 	if (!render_buffers->has_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_SPECULAR)) {
-		bool msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+		bool msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 		render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_SPECULAR, get_specular_format(), get_specular_usage_bits(msaa, false, render_buffers->get_can_be_storage()));
 		if (msaa) {
 			render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_SPECULAR_MSAA, get_specular_format(), get_specular_usage_bits(false, msaa, render_buffers->get_can_be_storage()), render_buffers->get_texture_samples());
@@ -63,7 +62,7 @@ void RenderForwardClustered::RenderBufferDataForwardClustered::ensure_normal_rou
 	ERR_FAIL_NULL(render_buffers);
 
 	if (!render_buffers->has_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_NORMAL_ROUGHNESS)) {
-		bool msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+		bool msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 		render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_NORMAL_ROUGHNESS, get_normal_roughness_format(), get_normal_roughness_usage_bits(msaa, false, render_buffers->get_can_be_storage()));
 		if (msaa) {
 			render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_NORMAL_ROUGHNESS_MSAA, get_normal_roughness_format(), get_normal_roughness_usage_bits(false, msaa, render_buffers->get_can_be_storage()), render_buffers->get_texture_samples());
@@ -75,7 +74,7 @@ void RenderForwardClustered::RenderBufferDataForwardClustered::ensure_voxelgi()
 	ERR_FAIL_NULL(render_buffers);
 
 	if (!render_buffers->has_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_VOXEL_GI)) {
-		bool msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+		bool msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 		render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_VOXEL_GI, get_voxelgi_format(), get_voxelgi_usage_bits(msaa, false, render_buffers->get_can_be_storage()));
 		if (msaa) {
 			render_buffers->create_texture(RB_SCOPE_FORWARD_CLUSTERED, RB_TEX_VOXEL_GI_MSAA, get_voxelgi_format(), get_voxelgi_usage_bits(false, msaa, render_buffers->get_can_be_storage()), render_buffers->get_texture_samples());
@@ -154,14 +153,14 @@ void RenderForwardClustered::RenderBufferDataForwardClustered::configure(RenderS
 	}
 	cluster_builder->set_shared(RenderForwardClustered::get_singleton()->get_cluster_builder_shared());
 
-	RID sampler = RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	RID sampler = RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 	cluster_builder->setup(p_render_buffers->get_internal_size(), p_render_buffers->get_max_cluster_elements(), p_render_buffers->get_depth_texture(), sampler, p_render_buffers->get_internal_texture());
 }
 
 RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_only_fb() {
 	ERR_FAIL_NULL_V(render_buffers, RID());
 
-	bool use_msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+	bool use_msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 
 	RID color = use_msaa ? render_buffers->get_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR_MSAA) : render_buffers->get_internal_texture();
 	RID depth = use_msaa ? render_buffers->get_texture(RB_SCOPE_BUFFERS, RB_TEX_DEPTH_MSAA) : render_buffers->get_depth_texture();
@@ -176,7 +175,7 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_only_fb(
 
 RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_pass_fb(uint32_t p_color_pass_flags) {
 	ERR_FAIL_NULL_V(render_buffers, RID());
-	bool use_msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+	bool use_msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 
 	int v_count = (p_color_pass_flags & COLOR_PASS_FLAG_MULTIVIEW) ? render_buffers->get_view_count() : 1;
 	RID color = use_msaa ? render_buffers->get_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR_MSAA) : render_buffers->get_internal_texture();
@@ -205,7 +204,7 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_pass_fb(
 
 RID RenderForwardClustered::RenderBufferDataForwardClustered::get_depth_fb(DepthFrameBufferType p_type) {
 	ERR_FAIL_NULL_V(render_buffers, RID());
-	bool use_msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+	bool use_msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 
 	RID depth = use_msaa ? render_buffers->get_texture(RB_SCOPE_BUFFERS, RB_TEX_DEPTH_MSAA) : render_buffers->get_depth_texture();
 
@@ -236,7 +235,7 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_depth_fb(Depth
 }
 
 RID RenderForwardClustered::RenderBufferDataForwardClustered::get_specular_only_fb() {
-	bool use_msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+	bool use_msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 
 	RID specular = render_buffers->get_texture(RB_SCOPE_FORWARD_CLUSTERED, use_msaa ? RB_TEX_SPECULAR_MSAA : RB_TEX_SPECULAR);
 
@@ -244,7 +243,7 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_specular_only_
 }
 
 RID RenderForwardClustered::RenderBufferDataForwardClustered::get_velocity_only_fb() {
-	bool use_msaa = render_buffers->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED;
+	bool use_msaa = render_buffers->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED;
 
 	RID velocity = render_buffers->get_texture(RB_SCOPE_BUFFERS, use_msaa ? RB_TEX_VELOCITY_MSAA : RB_TEX_VELOCITY);
 
@@ -363,13 +362,13 @@ void RenderForwardClustered::_render_list_template(RenderingDevice::DrawListID p
 
 		} else {
 #ifdef DEBUG_ENABLED
-			if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
+			if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
 				material_uniform_set = scene_shader.default_material_uniform_set;
 				shader = scene_shader.default_material_shader_ptr;
-			} else if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
+			} else if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
 				material_uniform_set = scene_shader.overdraw_material_uniform_set;
 				shader = scene_shader.overdraw_material_shader_ptr;
-			} else if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS)) {
+			} else if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS)) {
 				material_uniform_set = scene_shader.debug_shadow_splits_material_uniform_set;
 				shader = scene_shader.debug_shadow_splits_material_shader_ptr;
 			} else {
@@ -518,7 +517,7 @@ void RenderForwardClustered::_render_list_template(RenderingDevice::DrawListID p
 			pipeline_hash = pipeline_key.hash();
 
 			if (shader != prev_shader || pipeline_hash != prev_pipeline_hash) {
-				RSE::PipelineSource pipeline_source = pipeline_key.ubershader ? RSE::PIPELINE_SOURCE_DRAW : RSE::PIPELINE_SOURCE_SPECIALIZATION;
+				RS::PipelineSource pipeline_source = pipeline_key.ubershader ? RS::PIPELINE_SOURCE_DRAW : RS::PIPELINE_SOURCE_SPECIALIZATION;
 				pipeline_rd = shader->pipeline_hash_map.get_pipeline(pipeline_key, pipeline_hash, pipeline_key.ubershader, pipeline_source);
 
 				if (pipeline_rd.is_valid()) {
@@ -626,8 +625,8 @@ void RenderForwardClustered::_render_list(RenderingDevice::DrawListID p_draw_lis
 	//use template for faster performance (pass mode comparisons are inlined)
 
 	switch (p_params->pass_mode) {
-#define VALID_FLAG_COMBINATION(f) \
-	case f: { \
+#define VALID_FLAG_COMBINATION(f)                                                                                             \
+	case f: {                                                                                                                 \
 		_render_list_template<PASS_MODE_COLOR, f>(p_draw_list, p_framebuffer_Format, p_params, p_from_element, p_to_element); \
 	} break;
 
@@ -687,7 +686,7 @@ void RenderForwardClustered::_render_list_with_draw_list(RenderListParameters *p
 	RD::get_singleton()->draw_list_end();
 }
 
-uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render_data, bool p_no_fog, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier, bool p_pancake_shadows) {
+void RenderForwardClustered::_setup_environment(const RenderDataRD *p_render_data, bool p_no_fog, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier, bool p_pancake_shadows, int p_index) {
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
 	Ref<RenderSceneBuffersRD> rd = p_render_data->render_buffers;
@@ -695,12 +694,9 @@ uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render
 	RID reflection_probe_instance = p_render_data->reflection_probe.is_valid() ? light_storage->reflection_probe_instance_get_probe(p_render_data->reflection_probe) : RID();
 
 	// May do this earlier in RenderSceneRenderRD::render_scene
-	uint32_t uniform_buffer_index = scene_state.used_uniform_buffer_count;
-	++scene_state.used_uniform_buffer_count;
-
-	if (uniform_buffer_index >= scene_state.uniform_buffers.size()) {
+	if (p_index >= (int)scene_state.uniform_buffers.size()) {
 		uint32_t from = scene_state.uniform_buffers.size();
-		scene_state.uniform_buffers.resize(uniform_buffer_index + 1);
+		scene_state.uniform_buffers.resize(p_index + 1);
 		for (uint32_t i = from; i < scene_state.uniform_buffers.size(); i++) {
 			scene_state.uniform_buffers[i] = p_render_data->scene_data->create_uniform_buffer();
 		}
@@ -708,11 +704,11 @@ uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render
 
 	float luminance_multiplier = rd.is_valid() ? rd->get_luminance_multiplier() : 1.0;
 
-	p_render_data->scene_data->update_ubo(scene_state.uniform_buffers[uniform_buffer_index], get_debug_draw_mode(), env, reflection_probe_instance, p_render_data->camera_attributes, p_pancake_shadows, p_screen_size, p_viewport_size, p_default_bg_color, luminance_multiplier, p_opaque_render_buffers, p_apply_alpha_multiplier);
+	p_render_data->scene_data->update_ubo(scene_state.uniform_buffers[p_index], get_debug_draw_mode(), env, reflection_probe_instance, p_render_data->camera_attributes, p_pancake_shadows, p_screen_size, p_viewport_size, p_default_bg_color, luminance_multiplier, p_opaque_render_buffers, p_apply_alpha_multiplier);
 
 	// now do implementation UBO
 
-	scene_state.ubo.cluster_shift = Math::get_shift_from_power_of_2(p_render_data->cluster_size);
+	scene_state.ubo.cluster_shift = get_shift_from_power_of_2(p_render_data->cluster_size);
 	scene_state.ubo.max_cluster_element_count_div_32 = p_render_data->cluster_max_elements / 32;
 	{
 		uint32_t cluster_screen_width = Math::division_round_up((uint32_t)p_screen_size.width, p_render_data->cluster_size);
@@ -725,7 +721,7 @@ uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render
 	scene_state.ubo.volumetric_fog_enabled = false;
 
 	if (rd.is_valid()) {
-		if (rd->get_msaa_3d() != RSE::VIEWPORT_MSAA_DISABLED) {
+		if (rd->get_msaa_3d() != RS::VIEWPORT_MSAA_DISABLED) {
 			scene_state.ubo.gi_upscale_for_msaa = true;
 		}
 
@@ -749,7 +745,7 @@ uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render
 		}
 	}
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 		scene_state.ubo.ss_effects_flags = 0;
 	} else if (p_render_data->reflection_probe.is_null() && is_environment(p_render_data->environment)) {
 		scene_state.ubo.ssao_ao_affect = environment_get_ssao_ao_channel_affect(p_render_data->environment);
@@ -773,24 +769,22 @@ uint32_t RenderForwardClustered::_setup_environment(const RenderDataRD *p_render
 		scene_state.ubo.ss_effects_flags = 0;
 	}
 
-	if (uniform_buffer_index >= scene_state.implementation_uniform_buffers.size()) {
+	if (p_index >= (int)scene_state.implementation_uniform_buffers.size()) {
 		uint32_t from = scene_state.implementation_uniform_buffers.size();
-		scene_state.implementation_uniform_buffers.resize(uniform_buffer_index + 1);
+		scene_state.implementation_uniform_buffers.resize(p_index + 1);
 		for (uint32_t i = from; i < scene_state.implementation_uniform_buffers.size(); i++) {
 			scene_state.implementation_uniform_buffers[i] = RD::get_singleton()->uniform_buffer_create(sizeof(SceneState::UBO));
 		}
 	}
 
-	RD::get_singleton()->buffer_update(scene_state.implementation_uniform_buffers[uniform_buffer_index], 0, sizeof(SceneState::UBO), &scene_state.ubo);
-
-	return uniform_buffer_index;
+	RD::get_singleton()->buffer_update(scene_state.implementation_uniform_buffers[p_index], 0, sizeof(SceneState::UBO), &scene_state.ubo);
 }
 
 void RenderForwardClustered::SceneState::grow_instance_buffer(RenderListType p_render_list, uint32_t p_req_element_count, bool p_append) {
 	if (p_req_element_count > 0) {
 		if (instance_buffer[p_render_list].get_size(0u) < p_req_element_count * sizeof(SceneState::InstanceData)) {
 			instance_buffer[p_render_list].uninit();
-			uint32_t new_size = Math::nearest_power_of_2_templated(MAX(uint64_t(INSTANCE_DATA_BUFFER_MIN_SIZE), p_req_element_count));
+			uint32_t new_size = nearest_power_of_2_templated(MAX(uint64_t(INSTANCE_DATA_BUFFER_MIN_SIZE), p_req_element_count));
 			instance_buffer[p_render_list].set_storage_size(0u, new_size * sizeof(SceneState::InstanceData));
 			curr_gpu_ptr[p_render_list] = nullptr;
 		}
@@ -819,7 +813,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 	}
 
 	if (p_render_info) {
-		p_render_info[RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += element_total;
+		p_render_info[RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += element_total;
 	}
 
 	uint32_t repeats = 0;
@@ -859,7 +853,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 		uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(surface->surface);
 		Vector4 uv_scale = Vector4(0.0, 0.0, 0.0, 0.0);
 
-		if (format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+		if (format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 			surface_aabb = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_aabb(surface->surface);
 			uv_scale = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_uv_scale(surface->surface);
 		}
@@ -882,7 +876,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 			}
 			repeats = 1;
 			if (p_render_info) {
-				p_render_info[RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				p_render_info[RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 		}
 
@@ -908,9 +902,9 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 	}
 }
 
-_FORCE_INLINE_ static uint32_t _indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) {
-	static const uint32_t divisor[RSE::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RSE::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
+_FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
+	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, const RenderDataRD *p_render_data, PassMode p_pass_mode, bool p_using_sdfgi, bool p_using_opaque_gi, bool p_using_motion_pass, bool p_append) {
@@ -1103,9 +1097,9 @@ void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, con
 				if (p_render_data->render_info) {
 					indices = _indices_to_primitives(surf->primitive, indices);
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					}
 				}
 			} else {
@@ -1116,9 +1110,9 @@ void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, con
 					to_draw = _indices_to_primitives(surf->primitive, to_draw);
 					to_draw *= inst->instance_count;
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					}
 				}
 			}
@@ -1126,7 +1120,7 @@ void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, con
 			// ADD Element
 			if (p_pass_mode == PASS_MODE_COLOR) {
 #ifdef DEBUG_ENABLED
-				bool force_alpha = unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW);
+				bool force_alpha = unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW);
 #else
 				bool force_alpha = false;
 #endif
@@ -1277,21 +1271,21 @@ void RenderForwardClustered::_update_sdfgi(RenderDataRD *p_render_data) {
 
 void RenderForwardClustered::_debug_draw_cluster(Ref<RenderSceneBuffersRD> p_render_buffers) {
 	if (p_render_buffers.is_valid() && current_cluster_builder != nullptr) {
-		RSE::ViewportDebugDraw dd = get_debug_draw_mode();
+		RS::ViewportDebugDraw dd = get_debug_draw_mode();
 
-		if (dd == RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS || dd == RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS || dd == RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS || dd == RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES) {
+		if (dd == RS::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS || dd == RS::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS || dd == RS::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS || dd == RS::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES) {
 			ClusterBuilderRD::ElementType elem_type = ClusterBuilderRD::ELEMENT_TYPE_MAX;
 			switch (dd) {
-				case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS:
+				case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS:
 					elem_type = ClusterBuilderRD::ELEMENT_TYPE_OMNI_LIGHT;
 					break;
-				case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS:
+				case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS:
 					elem_type = ClusterBuilderRD::ELEMENT_TYPE_SPOT_LIGHT;
 					break;
-				case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS:
+				case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS:
 					elem_type = ClusterBuilderRD::ELEMENT_TYPE_DECAL;
 					break;
-				case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES:
+				case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES:
 					elem_type = ClusterBuilderRD::ELEMENT_TYPE_REFLECTION_PROBE;
 					break;
 				default: {
@@ -1385,9 +1379,9 @@ void RenderForwardClustered::setup_added_reflection_probe(const Transform3D &p_t
 	}
 }
 
-void RenderForwardClustered::setup_added_light(const RSE::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) {
+void RenderForwardClustered::setup_added_light(const RS::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) {
 	if (current_cluster_builder != nullptr) {
-		current_cluster_builder->add_light(p_type == RSE::LIGHT_SPOT ? ClusterBuilderRD::LIGHT_TYPE_SPOT : ClusterBuilderRD::LIGHT_TYPE_OMNI, p_transform, p_radius, p_spot_aperture);
+		current_cluster_builder->add_light(p_type == RS::LIGHT_SPOT ? ClusterBuilderRD::LIGHT_TYPE_SPOT : ClusterBuilderRD::LIGHT_TYPE_OMNI, p_transform, p_radius, p_spot_aperture);
 	}
 }
 
@@ -1527,9 +1521,9 @@ void RenderForwardClustered::_pre_opaque_render(RenderDataRD *p_render_data, boo
 			RID li = p_render_data->render_shadows[i].light;
 			RID base = light_storage->light_instance_get_base_light(li);
 
-			if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+			if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 				p_render_data->directional_shadows.push_back(i);
-			} else if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+			} else if (light_storage->light_get_type(base) == RS::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				p_render_data->cube_shadows.push_back(i);
 			} else {
 				p_render_data->shadows.push_back(i);
@@ -1678,8 +1672,6 @@ void RenderForwardClustered::_process_sss(Ref<RenderSceneBuffersRD> p_render_buf
 }
 
 void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Color &p_default_bg_color) {
-	scene_state.used_uniform_buffer_count = 0;
-
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
 	ERR_FAIL_NULL(p_render_data);
@@ -1694,7 +1686,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	}
 	bool is_reflection_probe = p_render_data->reflection_probe.is_valid();
 
-	static const int texture_multisamples[RSE::VIEWPORT_MSAA_MAX] = { 1, 2, 4, 8 };
+	static const int texture_multisamples[RS::VIEWPORT_MSAA_MAX] = { 1, 2, 4, 8 };
 
 	//first of all, make a new render pass
 	//fill up ubo
@@ -1702,9 +1694,9 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	RENDER_TIMESTAMP("Prepare 3D Scene");
 
 	// get info about our rendering effects
-	bool ce_needs_motion_vectors = _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
-	bool ce_needs_normal_roughness = _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS);
-	bool ce_needs_separate_specular = _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR);
+	bool ce_needs_motion_vectors = _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
+	bool ce_needs_normal_roughness = _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS);
+	bool ce_needs_separate_specular = _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR);
 
 	// sdfgi first
 	_update_sdfgi(p_render_data);
@@ -1753,7 +1745,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 	RENDER_TIMESTAMP("Setup 3D Scene");
 
-	bool using_debug_mvs = get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS;
+	bool using_debug_mvs = get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS;
 	bool using_taa = rb->get_use_taa();
 
 	enum {
@@ -1763,10 +1755,10 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	} scale_type = SCALE_NONE;
 
 	switch (rb->get_scaling_3d_mode()) {
-		case RSE::VIEWPORT_SCALING_3D_MODE_FSR2:
+		case RS::VIEWPORT_SCALING_3D_MODE_FSR2:
 			scale_type = SCALE_FSR2;
 			break;
-		case RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL:
+		case RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL:
 #ifdef METAL_MFXTEMPORAL_ENABLED
 			scale_type = SCALE_MFX;
 #else
@@ -1849,7 +1841,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 
 		if (p_render_data->environment.is_valid()) {
-			if (environment_get_sdfgi_enabled(p_render_data->environment) && get_debug_draw_mode() != RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+			if (environment_get_sdfgi_enabled(p_render_data->environment) && get_debug_draw_mode() != RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 				using_sdfgi = true;
 			}
 			if (environment_get_ssr_enabled(p_render_data->environment)) {
@@ -1881,7 +1873,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 	_setup_lightmaps(p_render_data, *p_render_data->lightmaps, p_render_data->scene_data->cam_transform);
 	_setup_voxelgis(*p_render_data->voxel_gi_instances);
-	uint32_t depth_prepass_uniform_buffer_index = _setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, false);
+	_setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, false);
 
 	// May have changed due to the above (light buffer enlarged, as an example).
 	_update_render_base_uniform_set();
@@ -1891,7 +1883,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	render_list[RENDER_LIST_MOTION].sort_by_key();
 	render_list[RENDER_LIST_ALPHA].sort_by_reverse_depth_and_priority();
 
-	int *render_info = p_render_data->render_info ? p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE] : (int *)nullptr;
+	int *render_info = p_render_data->render_info ? p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE] : (int *)nullptr;
 	_fill_instance_data(RENDER_LIST_OPAQUE, render_info);
 	_fill_instance_data(RENDER_LIST_MOTION, render_info);
 	_fill_instance_data(RENDER_LIST_ALPHA, render_info);
@@ -1907,11 +1899,11 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 					environment_get_ssao_enabled(p_render_data->environment) ||
 					using_ssil ||
 					ce_needs_normal_roughness ||
-					get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER ||
+					get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER ||
 					scene_state.used_normal_texture) {
 				depth_pass_mode = PASS_MODE_DEPTH_NORMAL_ROUGHNESS;
 			}
-		} else if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER || scene_state.used_normal_texture) {
+		} else if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER || scene_state.used_normal_texture) {
 			depth_pass_mode = PASS_MODE_DEPTH_NORMAL_ROUGHNESS;
 		}
 
@@ -1933,7 +1925,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 	}
 
-	bool using_sss = rb_data.is_valid() && !is_reflection_probe && scene_state.used_sss && ss_effects->sss_get_quality() != RSE::SUB_SURFACE_SCATTERING_QUALITY_DISABLED;
+	bool using_sss = rb_data.is_valid() && !is_reflection_probe && scene_state.used_sss && ss_effects->sss_get_quality() != RS::SUB_SURFACE_SCATTERING_QUALITY_DISABLED;
 
 	if (using_sss && p_render_data->transparent_bg) {
 		WARN_PRINT_ONCE("Sub-surface scattering is not supported in viewports with a transparent background. Disabling SSS in transparent viewport.");
@@ -1989,20 +1981,20 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	Color clear_color;
 	bool load_color = false;
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
 		clear_color = Color(0, 0, 0, 1); //in overdraw mode, BG should always be black
 	} else if (is_environment(p_render_data->environment)) {
-		RSE::EnvironmentBG bg_mode = environment_get_background(p_render_data->environment);
+		RS::EnvironmentBG bg_mode = environment_get_background(p_render_data->environment);
 		float bg_energy_multiplier = environment_get_bg_energy_multiplier(p_render_data->environment);
 		bg_energy_multiplier *= environment_get_bg_intensity(p_render_data->environment);
-		RSE::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(p_render_data->environment);
+		RS::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(p_render_data->environment);
 
 		if (p_render_data->camera_attributes.is_valid()) {
 			bg_energy_multiplier *= RSG::camera_attributes->camera_attributes_get_exposure_normalization_factor(p_render_data->camera_attributes);
 		}
 
 		switch (bg_mode) {
-			case RSE::ENV_BG_CLEAR_COLOR: {
+			case RS::ENV_BG_CLEAR_COLOR: {
 				clear_color = p_default_bg_color;
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
@@ -2012,7 +2004,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 					RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
 				}
 			} break;
-			case RSE::ENV_BG_COLOR: {
+			case RS::ENV_BG_COLOR: {
 				clear_color = environment_get_bg_color(p_render_data->environment);
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
@@ -2022,10 +2014,10 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 					RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
 				}
 			} break;
-			case RSE::ENV_BG_SKY: {
+			case RS::ENV_BG_SKY: {
 				draw_sky = !p_render_data->transparent_bg;
 			} break;
-			case RSE::ENV_BG_CANVAS: {
+			case RS::ENV_BG_CANVAS: {
 				if (!is_reflection_probe) {
 					RID texture = RendererRD::TextureStorage::get_singleton()->render_target_get_rd_texture(rb->get_render_target());
 					bool convert_to_linear = !RendererRD::TextureStorage::get_singleton()->render_target_is_using_hdr(rb->get_render_target());
@@ -2033,17 +2025,17 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 				}
 				load_color = true;
 			} break;
-			case RSE::ENV_BG_KEEP: {
+			case RS::ENV_BG_KEEP: {
 				load_color = true;
 			} break;
-			case RSE::ENV_BG_CAMERA_FEED: {
+			case RS::ENV_BG_CAMERA_FEED: {
 			} break;
 			default: {
 			}
 		}
 
 		// setup sky if used for ambient, reflections, or background
-		if (draw_sky || draw_sky_fog_only || (reflection_source == RSE::ENV_REFLECTION_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY) || reflection_source == RSE::ENV_REFLECTION_SOURCE_SKY || environment_get_ambient_source(p_render_data->environment) == RSE::ENV_AMBIENT_SOURCE_SKY) {
+		if (draw_sky || draw_sky_fog_only || (reflection_source == RS::ENV_REFLECTION_SOURCE_BG && bg_mode == RS::ENV_BG_SKY) || reflection_source == RS::ENV_REFLECTION_SOURCE_SKY || environment_get_ambient_source(p_render_data->environment) == RS::ENV_AMBIENT_SOURCE_SKY) {
 			RENDER_TIMESTAMP("Setup Sky");
 			RD::get_singleton()->draw_command_begin_label("Setup Sky");
 
@@ -2072,24 +2064,24 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		clear_color = p_default_bg_color;
 	}
 
-	RSE::ViewportMSAA msaa = rb->get_msaa_3d();
-	bool use_msaa = msaa != RSE::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportMSAA msaa = rb->get_msaa_3d();
+	bool use_msaa = msaa != RS::VIEWPORT_MSAA_DISABLED;
 
-	bool ce_pre_opaque_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
-	bool ce_post_opaque_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
-	bool ce_pre_transparent_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
+	bool ce_pre_opaque_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
+	bool ce_post_opaque_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
+	bool ce_pre_transparent_resolved_color = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
 
-	bool ce_pre_opaque_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
-	bool ce_post_opaque_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
-	bool ce_pre_transparent_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
+	bool ce_pre_opaque_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
+	bool ce_post_opaque_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
+	bool ce_pre_transparent_resolved_depth = use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
 
-	bool debug_voxelgis = get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO || get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING || get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION;
-	bool debug_sdfgi_probes = get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_SDFGI_PROBES;
+	bool debug_voxelgis = get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO || get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING || get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION;
+	bool debug_sdfgi_probes = get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_SDFGI_PROBES;
 	bool force_depth_pre_pass = scene_state.used_opaque_stencil;
 	bool depth_pre_pass = (force_depth_pre_pass || bool(GLOBAL_GET_CACHED(bool, "rendering/driver/depth_prepass/enable"))) && depth_framebuffer.is_valid();
 
 	SceneShaderForwardClustered::ShaderSpecialization base_specialization = scene_shader.default_specialization;
-	base_specialization.use_depth_fog = p_render_data->environment.is_valid() && environment_get_fog_mode(p_render_data->environment) == RSE::EnvironmentFogMode::ENV_FOG_MODE_DEPTH;
+	base_specialization.use_depth_fog = p_render_data->environment.is_valid() && environment_get_fog_mode(p_render_data->environment) == RS::EnvironmentFogMode::ENV_FOG_MODE_DEPTH;
 
 	bool using_ssao = depth_pre_pass && !is_reflection_probe && p_render_data->environment.is_valid() && environment_get_ssao_enabled(p_render_data->environment);
 
@@ -2110,10 +2102,10 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 		RD::get_singleton()->draw_command_begin_label("Render Depth Pre-Pass");
 
-		RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_OPAQUE, nullptr, RID(), samplers, depth_prepass_uniform_buffer_index);
+		RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_OPAQUE, nullptr, RID(), samplers);
 
 		bool finish_depth = using_ssao || using_ssil || using_sdfgi || using_voxelgi || ce_pre_opaque_resolved_depth || ce_post_opaque_resolved_depth;
-		RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, depth_pass_mode, 0, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
+		RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, depth_pass_mode, 0, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
 		_render_list_with_draw_list(&render_list_params, depth_framebuffer, RD::DrawFlags(needs_pre_resolve ? RD::DRAW_DEFAULT_ALL : RD::DRAW_CLEAR_ALL), depth_pass_clear, 0.0f, 0u, p_render_data->render_region);
 
 		RD::get_singleton()->draw_command_end_label();
@@ -2146,7 +2138,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 
 		RENDER_TIMESTAMP("Process Pre Opaque Compositor Effects");
-		_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE, p_render_data);
+		_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE, p_render_data);
 	}
 
 	RID normal_roughness_views[RendererSceneRender::MAX_RENDER_VIEWS];
@@ -2167,9 +2159,9 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	// Shadow pass can change the base uniform set samplers.
 	_update_render_base_uniform_set();
 
-	uint32_t opaque_pass_uniform_buffer_index = _setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, true, using_motion_pass);
+	_setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, true, using_motion_pass);
 
-	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_OPAQUE, p_render_data, radiance_texture, samplers, opaque_pass_uniform_buffer_index, true);
+	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_OPAQUE, p_render_data, radiance_texture, samplers, true);
 
 	{
 		bool render_motion_pass = !render_list[RENDER_LIST_MOTION].elements.is_empty();
@@ -2192,7 +2184,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 			uint32_t opaque_color_pass_flags = using_motion_pass ? (color_pass_flags & ~uint32_t(COLOR_PASS_FLAG_MOTION_VECTORS)) : color_pass_flags;
 			RID opaque_framebuffer = using_motion_pass ? rb_data->get_color_pass_fb(opaque_color_pass_flags) : color_framebuffer;
-			RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, PASS_MODE_COLOR, opaque_color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
+			RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, PASS_MODE_COLOR, opaque_color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
 			_render_list_with_draw_list(&render_list_params, opaque_framebuffer, RD::DrawFlags(load_color ? RD::DRAW_DEFAULT_ALL : RD::DRAW_CLEAR_COLOR_ALL) | (depth_pre_pass ? RD::DRAW_DEFAULT_ALL : RD::DRAW_CLEAR_DEPTH), c, 0.0f, 0u, p_render_data->render_region);
 		}
 
@@ -2216,9 +2208,9 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 			RENDER_TIMESTAMP("Render Motion Pass");
 
-			rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_MOTION, p_render_data, radiance_texture, samplers, opaque_pass_uniform_buffer_index, true);
+			rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_MOTION, p_render_data, radiance_texture, samplers, true);
 
-			RenderListParameters render_list_params(render_list[RENDER_LIST_MOTION].elements.ptr(), render_list[RENDER_LIST_MOTION].element_info.ptr(), render_list[RENDER_LIST_MOTION].elements.size(), reverse_cull, PASS_MODE_COLOR, color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
+			RenderListParameters render_list_params(render_list[RENDER_LIST_MOTION].elements.ptr(), render_list[RENDER_LIST_MOTION].element_info.ptr(), render_list[RENDER_LIST_MOTION].elements.size(), reverse_cull, PASS_MODE_COLOR, color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
 			_render_list_with_draw_list(&render_list_params, color_framebuffer);
 
 			RD::get_singleton()->draw_command_end_label();
@@ -2239,7 +2231,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 
 		RENDER_TIMESTAMP("Process Post Opaque Compositor Effects");
-		_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE, p_render_data);
+		_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE, p_render_data);
 	}
 
 	if (debug_voxelgis) {
@@ -2249,7 +2241,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(color_only_framebuffer);
 		RD::get_singleton()->draw_command_begin_label("Debug VoxelGIs");
 		for (int i = 0; i < (int)p_render_data->voxel_gi_instances->size(); i++) {
-			gi.debug_voxel_gi((*p_render_data->voxel_gi_instances)[i], draw_list, color_only_framebuffer, cm, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION, 1.0);
+			gi.debug_voxel_gi((*p_render_data->voxel_gi_instances)[i], draw_list, color_only_framebuffer, cm, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION, 1.0);
 		}
 		RD::get_singleton()->draw_command_end_label();
 		RD::get_singleton()->draw_list_end();
@@ -2301,7 +2293,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	{
 		RENDER_TIMESTAMP("Process Post Sky Compositor Effects");
 		// Don't need to check for depth or color resolve here, we've already triggered it.
-		_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY, p_render_data);
+		_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY, p_render_data);
 	}
 
 	if (using_separate_specular) {
@@ -2319,7 +2311,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 	}
 
-	if (using_separate_specular && is_environment(p_render_data->environment) && (environment_get_background(p_render_data->environment) == RSE::ENV_BG_CANVAS)) {
+	if (using_separate_specular && is_environment(p_render_data->environment) && (environment_get_background(p_render_data->environment) == RS::ENV_BG_CANVAS)) {
 		// Canvas background mode does not clear the color buffer, but copies over it. If screen-space specular effects are enabled and the background is blank,
 		// this results in ghosting due to the separate specular buffer copy. Need to explicitly clear the specular buffer once we're done with it to fix it.
 		RENDER_TIMESTAMP("Clear Separate Specular (Canvas Background Mode)");
@@ -2377,16 +2369,16 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		}
 
 		RENDER_TIMESTAMP("Process Pre Transparent Compositor Effects");
-		_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
+		_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
 	}
 
 	RENDER_TIMESTAMP("Render 3D Transparent Pass");
 
 	RD::get_singleton()->draw_command_begin_label("Render 3D Transparent Pass");
 
-	uint32_t transparent_pass_uniform_buffer_index = _setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, false);
+	rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_ALPHA, p_render_data, radiance_texture, samplers, true);
 
-	rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_ALPHA, p_render_data, radiance_texture, samplers, transparent_pass_uniform_buffer_index, true);
+	_setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, false);
 
 	{
 		uint32_t transparent_color_pass_flags = (color_pass_flags | uint32_t(COLOR_PASS_FLAG_TRANSPARENT)) & ~uint32_t(COLOR_PASS_FLAG_SEPARATE_SPECULAR);
@@ -2394,7 +2386,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		transparent_color_pass_flags &= ~uint32_t(COLOR_PASS_FLAG_MOTION_VECTORS);
 
 		RID alpha_framebuffer = rb_data.is_valid() ? rb_data->get_color_pass_fb(transparent_color_pass_flags) : color_only_framebuffer;
-		RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR, transparent_color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
+		RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR, transparent_color_pass_flags, rb_data.is_null(), p_render_data->directional_light_soft_shadows, rp_uniform_set, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count, 0, base_specialization);
 		_render_list_with_draw_list(&render_list_params, alpha_framebuffer, RD::DRAW_DEFAULT_ALL, Vector<Color>(), 0.0f, 0u, p_render_data->render_region);
 	}
 
@@ -2427,7 +2419,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 
 	{
 		RENDER_TIMESTAMP("Process Post Transparent Compositor Effects");
-		_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
+		_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
 	}
 
 	if (rb_data.is_valid() && (using_upscaling || using_taa)) {
@@ -2525,7 +2517,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 	if (rb_data.is_valid()) {
 		_render_buffers_debug_draw(p_render_data);
 
-		if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_SDFGI && rb->has_custom_data(RB_SCOPE_SDFGI)) {
+		if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_SDFGI && rb->has_custom_data(RB_SCOPE_SDFGI)) {
 			Ref<RendererRD::GI::SDFGI> sdfgi = rb->get_custom_data(RB_SCOPE_SDFGI);
 			Vector<RID> view_rids;
 
@@ -2554,19 +2546,19 @@ void RenderForwardClustered::_render_buffers_debug_draw(const RenderDataRD *p_re
 
 	RID render_target = rb->get_render_target();
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_SSAO && rb->has_texture(RB_SCOPE_SSAO, RB_FINAL)) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_SSAO && rb->has_texture(RB_SCOPE_SSAO, RB_FINAL)) {
 		RID final = rb->get_texture_slice(RB_SCOPE_SSAO, RB_FINAL, 0, 0);
 		Size2i rtsize = texture_storage->render_target_get_size(render_target);
 		copy_effects->copy_to_fb_rect(final, texture_storage->render_target_get_rd_framebuffer(render_target), Rect2(Vector2(), rtsize), false, true);
 	}
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_SSIL && rb->has_texture(RB_SCOPE_SSIL, RB_FINAL)) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_SSIL && rb->has_texture(RB_SCOPE_SSIL, RB_FINAL)) {
 		RID final = rb->get_texture_slice(RB_SCOPE_SSIL, RB_FINAL, 0, 0);
 		Size2i rtsize = texture_storage->render_target_get_size(render_target);
 		copy_effects->copy_to_fb_rect(final, texture_storage->render_target_get_rd_framebuffer(render_target), Rect2(Vector2(), rtsize), false, false);
 	}
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_GI_BUFFER && rb->has_texture(RB_SCOPE_GI, RB_TEX_AMBIENT)) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_GI_BUFFER && rb->has_texture(RB_SCOPE_GI, RB_TEX_AMBIENT)) {
 		Size2i rtsize = texture_storage->render_target_get_size(render_target);
 		RID ambient_texture = rb->get_texture(RB_SCOPE_GI, RB_TEX_AMBIENT);
 		RID reflection_texture = rb->get_texture(RB_SCOPE_GI, RB_TEX_REFLECTION);
@@ -2574,7 +2566,7 @@ void RenderForwardClustered::_render_buffers_debug_draw(const RenderDataRD *p_re
 	}
 }
 
-void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, bool p_open_pass, bool p_close_pass, bool p_clear_region, RenderingServerTypes::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
+void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, bool p_open_pass, bool p_close_pass, bool p_clear_region, RenderingMethod::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
 	ERR_FAIL_COND(!light_storage->owns_light_instance(p_light));
@@ -2602,7 +2594,7 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 	Projection light_projection;
 	Transform3D light_transform;
 
-	if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+	if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 		//set pssm stuff
 		uint64_t last_scene_shadow_pass = light_storage->light_instance_get_shadow_pass(p_light);
 		if (last_scene_shadow_pass != get_scene_pass()) {
@@ -2611,13 +2603,13 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 			light_storage->light_instance_set_shadow_pass(p_light, get_scene_pass());
 		}
 
-		use_pancake = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
+		use_pancake = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
 		light_projection = light_storage->light_instance_get_shadow_camera(p_light, p_pass);
 		light_transform = light_storage->light_instance_get_shadow_transform(p_light, p_pass);
 
 		atlas_rect = light_storage->light_instance_get_directional_rect(p_light);
 
-		if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
+		if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
 			atlas_rect.size.width /= 2;
 			atlas_rect.size.height /= 2;
 
@@ -2628,7 +2620,7 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 			} else if (p_pass == 3) {
 				atlas_rect.position += atlas_rect.size;
 			}
-		} else if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
+		} else if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
 			atlas_rect.size.height /= 2;
 
 			if (p_pass == 0) {
@@ -2643,7 +2635,7 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 		atlas_rect_norm.size /= directional_shadow_size;
 		light_storage->light_instance_set_directional_shadow_atlas_rect(p_light, p_pass, atlas_rect_norm);
 
-		zfar = RSG::light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = RSG::light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 
 		render_fb = light_storage->direction_shadow_get_fb();
 		render_texture = RID();
@@ -2678,13 +2670,13 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 		atlas_rect.size.width = shadow_size;
 		atlas_rect.size.height = shadow_size;
 
-		zfar = light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 
-		if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI) {
+		if (light_storage->light_get_type(base) == RS::LIGHT_OMNI) {
 			bool wrap = (shadow + 1) % subdivision == 0;
 			dual_paraboloid_offset = wrap ? Vector2i(1 - subdivision, 1) : Vector2i(1, 0);
 
-			if (light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+			if (light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				render_texture = light_storage->get_cubemap(shadow_size / 2);
 				render_fb = light_storage->get_cubemap_fb(shadow_size / 2, p_pass);
 
@@ -2717,7 +2709,7 @@ void RenderForwardClustered::_render_shadow_pass(RID p_light, RID p_shadow_atlas
 				flip_y = true;
 			}
 
-		} else if (light_storage->light_get_type(base) == RSE::LIGHT_SPOT) {
+		} else if (light_storage->light_get_type(base) == RS::LIGHT_SPOT) {
 			light_projection = light_storage->light_instance_get_shadow_camera(p_light, 0);
 			light_transform = light_storage->light_instance_get_shadow_transform(p_light, 0);
 
@@ -2761,7 +2753,9 @@ void RenderForwardClustered::_render_shadow_begin() {
 	// because _fill_instance_data will do that if it detects p_offset == 0u.
 }
 
-void RenderForwardClustered::_render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_reverse_cull_face, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, const Rect2i &p_rect, bool p_flip_y, bool p_clear_region, bool p_begin, bool p_end, RenderingServerTypes::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
+void RenderForwardClustered::_render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_reverse_cull_face, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, const Rect2i &p_rect, bool p_flip_y, bool p_clear_region, bool p_begin, bool p_end, RenderingMethod::RenderInfo *p_render_info, const Size2i &p_viewport_size, const Transform3D &p_main_cam_transform) {
+	uint32_t shadow_pass_index = scene_state.shadow_passes.size();
+
 	SceneState::ShadowPass shadow_pass;
 
 	RenderSceneDataRD scene_data;
@@ -2791,9 +2785,9 @@ void RenderForwardClustered::_render_shadow_append(RID p_framebuffer, const Page
 	if (viewport_size == Size2()) {
 		viewport_size = screen_size;
 	}
-	uint32_t uniform_buffer_index = _setup_environment(&render_data, true, screen_size, viewport_size, Color(), false, false, p_use_pancake);
+	_setup_environment(&render_data, true, screen_size, viewport_size, Color(), false, false, p_use_pancake, shadow_pass_index);
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
 		scene_data.screen_mesh_lod_threshold = 0.0;
 	} else {
 		scene_data.screen_mesh_lod_threshold = p_screen_mesh_lod_threshold;
@@ -2805,7 +2799,7 @@ void RenderForwardClustered::_render_shadow_append(RID p_framebuffer, const Page
 	_fill_render_list(RENDER_LIST_SECONDARY, &render_data, pass_mode, false, false, false, true);
 	uint32_t render_list_size = render_list[RENDER_LIST_SECONDARY].elements.size() - render_list_from;
 	render_list[RENDER_LIST_SECONDARY].sort_by_key_range(render_list_from, render_list_size);
-	_fill_instance_data(RENDER_LIST_SECONDARY, p_render_info ? p_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW] : (int *)nullptr, render_list_from, render_list_size, false);
+	_fill_instance_data(RENDER_LIST_SECONDARY, p_render_info ? p_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW] : (int *)nullptr, render_list_from, render_list_size, false);
 
 	{
 		//regular forward for now
@@ -2831,8 +2825,6 @@ void RenderForwardClustered::_render_shadow_append(RID p_framebuffer, const Page
 		shadow_pass.clear_depth = p_begin || p_clear_region;
 		shadow_pass.rect = p_rect;
 
-		shadow_pass.uniform_buffer_index = uniform_buffer_index;
-
 		scene_state.shadow_passes.push_back(shadow_pass);
 	}
 }
@@ -2848,7 +2840,7 @@ void RenderForwardClustered::_render_shadow_process() {
 	for (uint32_t i = 0; i < scene_state.shadow_passes.size(); i++) {
 		//render passes need to be configured after instance buffer is done, since they need the latest version
 		SceneState::ShadowPass &shadow_pass = scene_state.shadow_passes[i];
-		shadow_pass.rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), shadow_pass.uniform_buffer_index, false);
+		shadow_pass.rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), false, i);
 	}
 
 	RD::get_singleton()->draw_command_end_label();
@@ -2892,7 +2884,7 @@ void RenderForwardClustered::_render_particle_collider_heightfield(RID p_fb, con
 	_update_render_base_uniform_set();
 
 	Size2i screen_size = RD::get_singleton()->framebuffer_get_size(p_fb);
-	uint32_t uniform_buffer_index = _setup_environment(&render_data, true, screen_size, screen_size, Color(), false, false, false);
+	_setup_environment(&render_data, true, screen_size, screen_size, Color(), false, false, false);
 
 	PassMode pass_mode = PASS_MODE_SHADOW;
 
@@ -2900,7 +2892,7 @@ void RenderForwardClustered::_render_particle_collider_heightfield(RID p_fb, con
 	render_list[RENDER_LIST_SECONDARY].sort_by_key();
 	_fill_instance_data(RENDER_LIST_SECONDARY);
 
-	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), uniform_buffer_index);
+	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default());
 
 	RENDER_TIMESTAMP("Render Collider Heightfield");
 
@@ -2944,14 +2936,14 @@ void RenderForwardClustered::_render_material(const Transform3D &p_cam_transform
 	if (viewport_size == Size2()) {
 		viewport_size = screen_size;
 	}
-	uint32_t uniform_buffer_index = _setup_environment(&render_data, true, screen_size, viewport_size, Color());
+	_setup_environment(&render_data, true, screen_size, viewport_size, Color());
 
 	PassMode pass_mode = PASS_MODE_DEPTH_MATERIAL;
 	_fill_render_list(RENDER_LIST_SECONDARY, &render_data, pass_mode);
 	render_list[RENDER_LIST_SECONDARY].sort_by_key();
 	_fill_instance_data(RENDER_LIST_SECONDARY);
 
-	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), uniform_buffer_index);
+	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default());
 
 	RENDER_TIMESTAMP("Render 3D Material");
 
@@ -3000,14 +2992,14 @@ void RenderForwardClustered::_render_uv2(const PagedArray<RenderGeometryInstance
 	if (viewport_size == Size2()) {
 		viewport_size = screen_size;
 	}
-	uint32_t uniform_buffer_index = _setup_environment(&render_data, true, screen_size, viewport_size, Color());
+	_setup_environment(&render_data, true, screen_size, viewport_size, Color());
 
 	PassMode pass_mode = PASS_MODE_DEPTH_MATERIAL;
 	_fill_render_list(RENDER_LIST_SECONDARY, &render_data, pass_mode);
 	render_list[RENDER_LIST_SECONDARY].sort_by_key();
 	_fill_instance_data(RENDER_LIST_SECONDARY);
 
-	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), uniform_buffer_index);
+	RID rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_SECONDARY, nullptr, RID(), RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default());
 
 	RENDER_TIMESTAMP("Render 3D Material");
 
@@ -3119,9 +3111,9 @@ void RenderForwardClustered::_render_sdfgi(Ref<RenderSceneBuffersRD> p_render_bu
 		RendererRD::MaterialStorage::store_transform(to_bounds.affine_inverse() * scene_data.cam_transform, scene_state.ubo.sdf_to_bounds);
 
 		scene_data.emissive_exposure_normalization = p_exposure_normalization;
-		uint32_t uniform_buffer_index = _setup_environment(&render_data, true, fb_size, fb_size, Color());
+		_setup_environment(&render_data, true, fb_size, fb_size, Color());
 
-		RID rp_uniform_set = _setup_sdfgi_render_pass_uniform_set(p_albedo_texture, p_emission_texture, p_emission_aniso_texture, p_geom_facing_texture, RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default(), uniform_buffer_index);
+		RID rp_uniform_set = _setup_sdfgi_render_pass_uniform_set(p_albedo_texture, p_emission_texture, p_emission_aniso_texture, p_geom_facing_texture, RendererRD::MaterialStorage::get_singleton()->samplers_rd_get_default());
 
 		HashMap<Size2i, RID>::Iterator E = sdfgi_framebuffer_size_cache.find(fb_size);
 		if (!E) {
@@ -3250,7 +3242,7 @@ void RenderForwardClustered::_update_render_base_uniform_set() {
 			RD::Uniform u;
 			u.binding = 14;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
-			u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 		}
 
@@ -3274,7 +3266,7 @@ void RenderForwardClustered::_update_render_base_uniform_set() {
 	}
 }
 
-RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_render_list, const RenderDataRD *p_render_data, RID p_radiance_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, uint32_t p_uniform_buffer_index, bool p_use_directional_shadow_atlas) {
+RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_render_list, const RenderDataRD *p_render_data, RID p_radiance_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, bool p_use_directional_shadow_atlas, int p_index) {
 	RendererRD::TextureStorage *texture_storage = RendererRD::TextureStorage::get_singleton();
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
@@ -3301,14 +3293,14 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 		RD::Uniform u;
 		u.binding = 0;
 		u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
-		u.append_id(scene_state.uniform_buffers[p_uniform_buffer_index]);
+		u.append_id(scene_state.uniform_buffers[p_index]);
 		uniforms.push_back(u);
 	}
 	{
 		RD::Uniform u;
 		u.binding = 1;
 		u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
-		u.append_id(scene_state.implementation_uniform_buffers[p_uniform_buffer_index]);
+		u.append_id(scene_state.implementation_uniform_buffers[p_index]);
 		uniforms.push_back(u);
 	}
 	{
@@ -3442,23 +3434,23 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (decals_get_filter()) {
-			case RSE::DECAL_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -3472,23 +3464,23 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (light_projectors_get_filter()) {
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -3661,7 +3653,7 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 	return UniformSetCacheRD::get_singleton()->get_cache_vec(scene_shader.default_shader_rd, RENDER_PASS_UNIFORM_SET, uniforms);
 }
 
-RID RenderForwardClustered::_setup_sdfgi_render_pass_uniform_set(RID p_albedo_texture, RID p_emission_texture, RID p_emission_aniso_texture, RID p_geom_facing_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, uint32_t p_uniform_buffer_index) {
+RID RenderForwardClustered::_setup_sdfgi_render_pass_uniform_set(RID p_albedo_texture, RID p_emission_texture, RID p_emission_aniso_texture, RID p_geom_facing_texture, const RendererRD::MaterialStorage::Samplers &p_samplers) {
 	RendererRD::TextureStorage *texture_storage = RendererRD::TextureStorage::get_singleton();
 	thread_local LocalVector<RD::Uniform> uniforms;
 	uniforms.clear();
@@ -3670,14 +3662,14 @@ RID RenderForwardClustered::_setup_sdfgi_render_pass_uniform_set(RID p_albedo_te
 		RD::Uniform u;
 		u.binding = 0;
 		u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
-		u.append_id(scene_state.uniform_buffers[p_uniform_buffer_index]);
+		u.append_id(scene_state.uniform_buffers[0]);
 		uniforms.push_back(u);
 	}
 	{
 		RD::Uniform u;
 		u.binding = 1;
 		u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
-		u.append_id(scene_state.implementation_uniform_buffers[p_uniform_buffer_index]);
+		u.append_id(scene_state.implementation_uniform_buffers[0]);
 		uniforms.push_back(u);
 	}
 	{
@@ -3777,23 +3769,23 @@ RID RenderForwardClustered::_setup_sdfgi_render_pass_uniform_set(RID p_albedo_te
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (decals_get_filter()) {
-			case RSE::DECAL_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -3807,23 +3799,23 @@ RID RenderForwardClustered::_setup_sdfgi_render_pass_uniform_set(RID p_albedo_te
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (light_projectors_get_filter()) {
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -3885,15 +3877,15 @@ RID RenderForwardClustered::_render_buffers_get_velocity_texture(Ref<RenderScene
 	return p_render_buffers->get_velocity_buffer(false);
 }
 
-void RenderForwardClustered::environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void RenderForwardClustered::environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 	ERR_FAIL_NULL(ss_effects);
-	ERR_FAIL_COND(p_quality < RSE::EnvironmentSSAOQuality::ENV_SSAO_QUALITY_VERY_LOW || p_quality > RSE::EnvironmentSSAOQuality::ENV_SSAO_QUALITY_ULTRA);
+	ERR_FAIL_COND(p_quality < RS::EnvironmentSSAOQuality::ENV_SSAO_QUALITY_VERY_LOW || p_quality > RS::EnvironmentSSAOQuality::ENV_SSAO_QUALITY_ULTRA);
 	ss_effects->ssao_set_quality(p_quality, p_half_size, p_adaptive_target, p_blur_passes, p_fadeout_from, p_fadeout_to);
 }
 
-void RenderForwardClustered::environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
+void RenderForwardClustered::environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) {
 	ERR_FAIL_NULL(ss_effects);
-	ERR_FAIL_COND(p_quality < RSE::EnvironmentSSILQuality::ENV_SSIL_QUALITY_VERY_LOW || p_quality > RSE::EnvironmentSSILQuality::ENV_SSIL_QUALITY_ULTRA);
+	ERR_FAIL_COND(p_quality < RS::EnvironmentSSILQuality::ENV_SSIL_QUALITY_VERY_LOW || p_quality > RS::EnvironmentSSILQuality::ENV_SSIL_QUALITY_ULTRA);
 	ss_effects->ssil_set_quality(p_quality, p_half_size, p_adaptive_target, p_blur_passes, p_fadeout_from, p_fadeout_to);
 }
 
@@ -3902,13 +3894,13 @@ void RenderForwardClustered::environment_set_ssr_half_size(bool p_half_size) {
 	ss_effects->ssr_set_half_size(p_half_size);
 }
 
-void RenderForwardClustered::environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) {
+void RenderForwardClustered::environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) {
 	WARN_PRINT_ONCE("environment_set_ssr_roughness_quality has been deprecated and no longer does anything.");
 }
 
-void RenderForwardClustered::sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) {
+void RenderForwardClustered::sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) {
 	ERR_FAIL_NULL(ss_effects);
-	ERR_FAIL_COND(p_quality < RSE::SubSurfaceScatteringQuality::SUB_SURFACE_SCATTERING_QUALITY_DISABLED || p_quality > RSE::SubSurfaceScatteringQuality::SUB_SURFACE_SCATTERING_QUALITY_HIGH);
+	ERR_FAIL_COND(p_quality < RS::SubSurfaceScatteringQuality::SUB_SURFACE_SCATTERING_QUALITY_DISABLED || p_quality > RS::SubSurfaceScatteringQuality::SUB_SURFACE_SCATTERING_QUALITY_HIGH);
 	ss_effects->sss_set_quality(p_quality);
 }
 
@@ -3946,7 +3938,7 @@ void RenderForwardClustered::sdfgi_update(const Ref<RenderSceneBuffers> &p_rende
 	// Call here as this is the first entry point for SDFGI.
 	scene_shader.enable_advanced_shader_group();
 
-	static const uint32_t history_frames_to_converge[RSE::ENV_SDFGI_CONVERGE_MAX] = { 5, 10, 15, 20, 25, 30 };
+	static const uint32_t history_frames_to_converge[RS::ENV_SDFGI_CONVERGE_MAX] = { 5, 10, 15, 20, 25, 30 };
 	uint32_t requested_history_size = history_frames_to_converge[gi.sdfgi_frames_to_converge];
 
 	if (sdfgi.is_valid() && (sdfgi->num_cascades != environment_get_sdfgi_cascades(p_environment) || sdfgi->min_cell_size != environment_get_sdfgi_min_cell_size(p_environment) || requested_history_size != sdfgi->history_size || sdfgi->uses_occlusion != environment_get_sdfgi_use_occlusion(p_environment) || sdfgi->y_scale_mode != environment_get_sdfgi_y_scale(p_environment))) {
@@ -4043,7 +4035,7 @@ void RenderForwardClustered::_update_global_pipeline_data_requirements_from_proj
 	const bool positional_shadow_16_bits = GLOBAL_GET_CACHED(bool, "rendering/lights_and_shadows/positional_shadow/atlas_16_bits");
 	global_pipeline_data_required.use_16_bit_shadows = directional_shadow_16_bits || positional_shadow_16_bits;
 	global_pipeline_data_required.use_32_bit_shadows = !directional_shadow_16_bits || !positional_shadow_16_bits;
-	global_pipeline_data_required.texture_samples = RenderSceneBuffersRD::msaa_to_samples(RSE::ViewportMSAA(msaa_3d_mode));
+	global_pipeline_data_required.texture_samples = RenderSceneBuffersRD::msaa_to_samples(RS::ViewportMSAA(msaa_3d_mode));
 }
 
 void RenderForwardClustered::_update_global_pipeline_data_requirements_from_light_storage() {
@@ -4171,7 +4163,7 @@ void RenderForwardClustered::_geometry_instance_add_surface_with_material(Geomet
 	sdcache->sort.uses_softshadow = ginstance->using_softshadows;
 
 	uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(sdcache->surface);
-	if (p_material->shader_data->uses_tangent && !(format & RSE::ARRAY_FORMAT_TANGENT)) {
+	if (p_material->shader_data->uses_tangent && !(format & RS::ARRAY_FORMAT_TANGENT)) {
 		String shader_path = p_material->shader_data->path.is_empty() ? "" : "(" + p_material->shader_data->path + ")";
 		String mesh_path = mesh_storage->mesh_get_path(p_mesh).is_empty() ? "" : "(" + mesh_storage->mesh_get_path(p_mesh) + ")";
 		WARN_PRINT_ED(vformat("Attempting to use a shader %s that requires tangents with a mesh %s that doesn't contain tangents. Ensure that meshes are imported with the 'ensure_tangents' option. If creating your own meshes, add an `ARRAY_TANGENT` array (when using ArrayMesh) or call `generate_tangents()` (when using SurfaceTool).", shader_path, mesh_path));
@@ -4260,7 +4252,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 
 	//add geometry for drawing
 	switch (ginstance->data->base_type) {
-		case RSE::INSTANCE_MESH: {
+		case RS::INSTANCE_MESH: {
 			const RID *materials = nullptr;
 			uint32_t surface_count;
 			RID mesh = ginstance->data->base;
@@ -4281,7 +4273,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 
 		} break;
 
-		case RSE::INSTANCE_MULTIMESH: {
+		case RS::INSTANCE_MULTIMESH: {
 			RID mesh = mesh_storage->multimesh_get_mesh(ginstance->data->base);
 			if (mesh.is_valid()) {
 				const RID *materials = nullptr;
@@ -4299,7 +4291,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 
 		} break;
 #if 0
-		case RSE::INSTANCE_IMMEDIATE: {
+		case RS::INSTANCE_IMMEDIATE: {
 			RasterizerStorageGLES3::Immediate *immediate = storage->immediate_owner.get_or_null(inst->base);
 			ERR_CONTINUE(!immediate);
 
@@ -4307,7 +4299,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 
 		} break;
 #endif
-		case RSE::INSTANCE_PARTICLES: {
+		case RS::INSTANCE_PARTICLES: {
 			int draw_passes = particles_storage->particles_get_draw_passes(ginstance->data->base);
 
 			for (int j = 0; j < draw_passes; j++) {
@@ -4340,10 +4332,10 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 	ginstance->base_flags = 0;
 
 	bool store_transform = true;
-	if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+	if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
 
-		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RSE::MULTIMESH_TRANSFORM_2D) {
+		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RS::MULTIMESH_TRANSFORM_2D) {
 			ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH_FORMAT_2D;
 		}
 		if (mesh_storage->multimesh_uses_colors(ginstance->data->base)) {
@@ -4358,7 +4350,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 
 		ginstance->transforms_uniform_set = mesh_storage->multimesh_get_3d_uniform_set(ginstance->data->base, scene_shader.default_shader_rd, TRANSFORMS_UNIFORM_SET);
 
-	} else if (ginstance->data->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_PARTICLES) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_PARTICLES;
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
 
@@ -4381,7 +4373,7 @@ void RenderForwardClustered::_geometry_instance_update(RenderGeometryInstance *p
 		if (ginstance->data->dirty_dependencies) {
 			particles_storage->particles_update_dependency(ginstance->data->base, &ginstance->data->dependency_tracker);
 		}
-	} else if (ginstance->data->base_type == RSE::INSTANCE_MESH) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_MESH) {
 		if (mesh_storage->skeleton_is_valid(ginstance->data->skeleton)) {
 			ginstance->transforms_uniform_set = mesh_storage->skeleton_get_3d_uniform_set(ginstance->data->skeleton, scene_shader.default_shader_rd, TRANSFORMS_UNIFORM_SET);
 			if (ginstance->data->dirty_dependencies) {
@@ -4550,7 +4542,7 @@ static RD::FramebufferFormatID _get_reflection_probe_depth_framebuffer_format_fo
 	return RD::get_singleton()->framebuffer_format_create(Vector<RD::AttachmentFormat>(attachments));
 }
 
-void RenderForwardClustered::_mesh_compile_pipeline_for_surface(SceneShaderForwardClustered::ShaderData *p_shader, void *p_mesh_surface, bool p_ubershader, bool p_instanced_surface, RSE::PipelineSource p_source, SceneShaderForwardClustered::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
+void RenderForwardClustered::_mesh_compile_pipeline_for_surface(SceneShaderForwardClustered::ShaderData *p_shader, void *p_mesh_surface, bool p_ubershader, bool p_instanced_surface, RS::PipelineSource p_source, SceneShaderForwardClustered::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
 	uint64_t input_mask = p_shader->get_vertex_input_mask(r_pipeline_key.version, r_pipeline_key.color_pass_flags, p_ubershader);
 	bool pipeline_motion_vectors = r_pipeline_key.color_pass_flags & SceneShaderForwardClustered::PIPELINE_COLOR_PASS_FLAG_MOTION_VECTORS;
@@ -4565,7 +4557,7 @@ void RenderForwardClustered::_mesh_compile_pipeline_for_surface(SceneShaderForwa
 	}
 }
 
-void RenderForwardClustered::_mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RSE::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
+void RenderForwardClustered::_mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RS::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
 	bool octmap_use_storage = !copy_effects->get_raster_effects().has_flag(RendererRD::CopyEffects::RASTER_EFFECT_OCTMAP);
 
@@ -4726,7 +4718,7 @@ void RenderForwardClustered::_mesh_generate_all_pipelines_for_surface_cache(Geom
 	surface.uses_transparent = uses_alpha_pass || uses_fade;
 	surface.uses_depth = (p_surface_cache->flags & (GeometryInstanceSurfaceDataCache::FLAG_PASS_DEPTH | GeometryInstanceSurfaceDataCache::FLAG_PASS_OPAQUE | GeometryInstanceSurfaceDataCache::FLAG_PASS_SHADOW)) != 0;
 	surface.can_use_lightmap = p_surface_cache->owner->lightmap_instance.is_valid() || p_surface_cache->owner->lightmap_sh;
-	_mesh_compile_pipelines_for_surface(surface, p_global, RSE::PIPELINE_SOURCE_SURFACE);
+	_mesh_compile_pipelines_for_surface(surface, p_global, RS::PIPELINE_SOURCE_SURFACE);
 }
 
 void RenderForwardClustered::_update_dirty_geometry_instances() {
@@ -4781,7 +4773,7 @@ void RenderForwardClustered::_geometry_instance_dependency_changed(Dependency::D
 		} break;
 		case Dependency::DEPENDENCY_CHANGED_MULTIMESH_VISIBLE_INSTANCES: {
 			GeometryInstanceForwardClustered *ginstance = static_cast<GeometryInstanceForwardClustered *>(p_tracker->userdata);
-			if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+			if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 				ginstance->instance_count = RendererRD::MeshStorage::get_singleton()->multimesh_get_instances_to_draw(ginstance->data->base);
 			}
 		} break;
@@ -4796,8 +4788,8 @@ void RenderForwardClustered::_geometry_instance_dependency_deleted(const RID &p_
 }
 
 RenderGeometryInstance *RenderForwardClustered::geometry_instance_create(RID p_base) {
-	RSE::InstanceType type = RSG::utilities->get_base_type(p_base);
-	ERR_FAIL_COND_V(!((1 << type) & RSE::INSTANCE_GEOMETRY_MASK), nullptr);
+	RS::InstanceType type = RSG::utilities->get_base_type(p_base);
+	ERR_FAIL_COND_V(!((1 << type) & RS::INSTANCE_GEOMETRY_MASK), nullptr);
 
 	GeometryInstanceForwardClustered *ginstance = geometry_instance_alloc.alloc();
 	ginstance->data = memnew(GeometryInstanceForwardClustered::Data);
@@ -4872,7 +4864,7 @@ void RenderForwardClustered::geometry_instance_free(RenderGeometryInstance *p_ge
 }
 
 uint32_t RenderForwardClustered::geometry_instance_get_pair_mask() {
-	return (1 << RSE::INSTANCE_VOXEL_GI);
+	return (1 << RS::INSTANCE_VOXEL_GI);
 }
 
 void RenderForwardClustered::mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) {
@@ -4919,8 +4911,8 @@ void RenderForwardClustered::mesh_generate_pipelines(RID p_mesh, bool p_backgrou
 		surface.uses_opaque = !material->shader_data->uses_alpha_pass();
 		surface.uses_transparent = material->shader_data->uses_alpha_pass();
 		surface.uses_depth = surface.uses_opaque || (surface.uses_transparent && material->shader_data->uses_depth_in_alpha_pass());
-		surface.can_use_lightmap = mesh_storage->mesh_surface_get_format(mesh_surface) & RSE::ARRAY_FORMAT_TEX_UV2;
-		_mesh_compile_pipelines_for_surface(surface, global_pipeline_data_required, RSE::PIPELINE_SOURCE_MESH, &pipeline_pairs);
+		surface.can_use_lightmap = mesh_storage->mesh_surface_get_format(mesh_surface) & RS::ARRAY_FORMAT_TEX_UV2;
+		_mesh_compile_pipelines_for_surface(surface, global_pipeline_data_required, RS::PIPELINE_SOURCE_MESH, &pipeline_pairs);
 	}
 
 	// Wait for all the pipelines that were compiled. This will force the loader to wait on all ubershader pipelines to be ready.
@@ -4931,7 +4923,7 @@ void RenderForwardClustered::mesh_generate_pipelines(RID p_mesh, bool p_backgrou
 	}
 }
 
-uint32_t RenderForwardClustered::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t RenderForwardClustered::get_pipeline_compilations(RS::PipelineSource p_source) {
 	return scene_shader.get_pipeline_compilations(p_source);
 }
 
@@ -4975,15 +4967,15 @@ void RenderForwardClustered::GeometryInstanceForwardClustered::set_softshadow_pr
 
 void RenderForwardClustered::_update_shader_quality_settings() {
 	SceneShaderForwardClustered::ShaderSpecialization specialization = {};
-	specialization.decal_use_mipmaps = decals_get_filter() == RSE::DECAL_FILTER_NEAREST_MIPMAPS ||
-			decals_get_filter() == RSE::DECAL_FILTER_LINEAR_MIPMAPS ||
-			decals_get_filter() == RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
-			decals_get_filter() == RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
+	specialization.decal_use_mipmaps = decals_get_filter() == RS::DECAL_FILTER_NEAREST_MIPMAPS ||
+			decals_get_filter() == RS::DECAL_FILTER_LINEAR_MIPMAPS ||
+			decals_get_filter() == RS::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
+			decals_get_filter() == RS::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
 	;
-	specialization.projector_use_mipmaps = light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
+	specialization.projector_use_mipmaps = light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
 
 	specialization.soft_shadow_samples = soft_shadow_samples_get();
 	specialization.penumbra_shadow_samples = penumbra_shadow_samples_get();
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
index 941450ba..5332563f 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
@@ -34,6 +34,9 @@
 #include "servers/rendering/multi_uma_buffer.h"
 #include "servers/rendering/renderer_rd/cluster_builder_rd.h"
 #include "servers/rendering/renderer_rd/effects/fsr2.h"
+#ifdef METAL_ENABLED
+#include "servers/rendering/renderer_rd/effects/metal_fx.h"
+#endif
 #include "servers/rendering/renderer_rd/effects/motion_vectors_store.h"
 #include "servers/rendering/renderer_rd/effects/ss_effects.h"
 #include "servers/rendering/renderer_rd/effects/taa.h"
@@ -42,10 +45,6 @@
 #include "servers/rendering/renderer_rd/shaders/forward_clustered/best_fit_normal.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/forward_clustered/integrate_dfg.glsl.gen.h"
 
-#ifdef METAL_ENABLED
-#include "servers/rendering/renderer_rd/effects/metal_fx.h"
-#endif
-
 #define RB_SCOPE_FORWARD_CLUSTERED SNAME("forward_clustered")
 
 #define RB_TEX_SPECULAR SNAME("specular")
@@ -175,8 +174,8 @@ private:
 	uint64_t lightmap_texture_array_version = 0xFFFFFFFF;
 
 	void _update_render_base_uniform_set();
-	RID _setup_sdfgi_render_pass_uniform_set(RID p_albedo_texture, RID p_emission_texture, RID p_emission_aniso_texture, RID p_geom_facing_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, uint32_t p_uniform_buffer_index);
-	RID _setup_render_pass_uniform_set(RenderListType p_render_list, const RenderDataRD *p_render_data, RID p_radiance_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, uint32_t p_uniform_buffer_index, bool p_use_directional_shadow_atlas = false);
+	RID _setup_sdfgi_render_pass_uniform_set(RID p_albedo_texture, RID p_emission_texture, RID p_emission_aniso_texture, RID p_geom_facing_texture, const RendererRD::MaterialStorage::Samplers &p_samplers);
+	RID _setup_render_pass_uniform_set(RenderListType p_render_list, const RenderDataRD *p_render_data, RID p_radiance_texture, const RendererRD::MaterialStorage::Samplers &p_samplers, bool p_use_directional_shadow_atlas = false, int p_index = 0);
 
 	struct BestFitNormal {
 		BestFitNormalShaderRD shader;
@@ -392,7 +391,6 @@ private:
 
 		LocalVector<RID> uniform_buffers;
 		LocalVector<RID> implementation_uniform_buffers;
-		uint32_t used_uniform_buffer_count = 0;
 
 		LightmapData lightmaps[MAX_LIGHTMAPS];
 		RID lightmap_ids[MAX_LIGHTMAPS];
@@ -431,8 +429,6 @@ private:
 			Rect2i rect;
 			bool clear_depth;
 			bool flip_cull;
-
-			uint32_t uniform_buffer_index;
 		};
 
 		LocalVector<ShadowPass> shadow_passes;
@@ -442,7 +438,7 @@ private:
 
 	static RenderForwardClustered *singleton;
 
-	uint32_t _setup_environment(const RenderDataRD *p_render_data, bool p_no_fog, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, bool p_opaque_render_buffers = false, bool p_apply_alpha_multiplier = false, bool p_pancake_shadows = false);
+	void _setup_environment(const RenderDataRD *p_render_data, bool p_no_fog, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, bool p_opaque_render_buffers = false, bool p_apply_alpha_multiplier = false, bool p_pancake_shadows = false, int p_index = 0);
 	void _setup_voxelgis(const PagedArray<RID> &p_voxelgis);
 	void _setup_lightmaps(const RenderDataRD *p_render_data, const PagedArray<RID> &p_lightmaps, const Transform3D &p_cam_transform);
 
@@ -526,7 +522,7 @@ private:
 			};
 		} sort;
 
-		RSE::PrimitiveType primitive = RSE::PRIMITIVE_MAX;
+		RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
 		uint32_t flags = 0;
 		uint32_t surface_index = 0;
 		uint32_t color_pass_inclusion_mask = 0;
@@ -590,8 +586,7 @@ private:
 		virtual void set_use_lightmap(RID p_lightmap_instance, const Rect2 &p_lightmap_uv_scale, int p_lightmap_slice_index) override;
 		virtual void set_lightmap_capture(const Color *p_sh9) override;
 
-		virtual void clear_light_instances() override {}
-		virtual void pair_light_instance(const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) override {}
+		virtual void pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) override {}
 		virtual void pair_reflection_probe_instances(const RID *p_reflection_probe_instances, uint32_t p_reflection_probe_instance_count) override {}
 		virtual void pair_decal_instances(const RID *p_decal_instances, uint32_t p_decal_instance_count) override {}
 		virtual void pair_voxel_gi_instances(const RID *p_voxel_gi_instances, uint32_t p_voxel_gi_instance_count) override;
@@ -599,10 +594,6 @@ private:
 		virtual void set_softshadow_projector_pairing(bool p_softshadow, bool p_projector) override;
 	};
 
-	// These are not used in the Forward+ path, it has different light clustering tech.
-	virtual uint32_t get_max_lights_total() override { return 0; }
-	virtual uint32_t get_max_lights_per_mesh() override { return 0; }
-
 	static void _geometry_instance_dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *p_tracker);
 	static void _geometry_instance_dependency_deleted(const RID &p_dependency, DependencyTracker *p_tracker);
 
@@ -659,8 +650,8 @@ private:
 	void _geometry_instance_add_surface_with_material_chain(GeometryInstanceForwardClustered *ginstance, uint32_t p_surface, SceneShaderForwardClustered::MaterialData *p_material, RID p_mat_src, RID p_mesh);
 	void _geometry_instance_add_surface(GeometryInstanceForwardClustered *ginstance, uint32_t p_surface, RID p_material, RID p_mesh);
 	void _geometry_instance_update(RenderGeometryInstance *p_geometry_instance);
-	void _mesh_compile_pipeline_for_surface(SceneShaderForwardClustered::ShaderData *p_shader, void *p_mesh_surface, bool p_ubershader, bool p_instanced_surface, RSE::PipelineSource p_source, SceneShaderForwardClustered::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
-	void _mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RSE::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
+	void _mesh_compile_pipeline_for_surface(SceneShaderForwardClustered::ShaderData *p_shader, void *p_mesh_surface, bool p_ubershader, bool p_instanced_surface, RS::PipelineSource p_source, SceneShaderForwardClustered::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
+	void _mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RS::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
 	void _mesh_generate_all_pipelines_for_surface_cache(GeometryInstanceSurfaceDataCache *p_surface_cache, const GlobalPipelineData &p_global);
 	void _update_dirty_geometry_instances();
 	void _update_dirty_geometry_pipelines();
@@ -761,9 +752,9 @@ private:
 
 	/* Render shadows */
 
-	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, bool p_open_pass = true, bool p_close_pass = true, bool p_clear_region = true, RenderingServerTypes::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
+	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, bool p_open_pass = true, bool p_close_pass = true, bool p_clear_region = true, RenderingMethod::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
 	void _render_shadow_begin();
-	void _render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_reverse_cull_face, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier = 0.0, float p_screen_mesh_lod_threshold = 0.0, const Rect2i &p_rect = Rect2i(), bool p_flip_y = false, bool p_clear_region = true, bool p_begin = true, bool p_end = true, RenderingServerTypes::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
+	void _render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_reverse_cull_face, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier = 0.0, float p_screen_mesh_lod_threshold = 0.0, const Rect2i &p_rect = Rect2i(), bool p_flip_y = false, bool p_clear_region = true, bool p_begin = true, bool p_end = true, RenderingMethod::RenderInfo *p_render_info = nullptr, const Size2i &p_viewport_size = Size2i(1, 1), const Transform3D &p_main_cam_transform = Transform3D());
 	void _render_shadow_process();
 	void _render_shadow_end();
 
@@ -784,12 +775,12 @@ protected:
 	virtual RID _render_buffers_get_normal_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
 	virtual RID _render_buffers_get_velocity_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
 
-	virtual void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
-	virtual void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
+	virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
+	virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override;
 	virtual void environment_set_ssr_half_size(bool p_half_size) override;
-	virtual void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) override;
+	virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override;
 
-	virtual void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) override;
+	virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override;
 	virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override;
 
 	/* Rendering */
@@ -810,7 +801,7 @@ public:
 
 	/* callback from updating our lighting UBOs, used to populate cluster builder */
 	virtual void setup_added_reflection_probe(const Transform3D &p_transform, const Vector3 &p_half_size) override;
-	virtual void setup_added_light(const RSE::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) override;
+	virtual void setup_added_light(const RS::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) override;
 	virtual void setup_added_decal(const Transform3D &p_transform, const Vector3 &p_half_size) override;
 
 	virtual void base_uniforms_changed() override;
@@ -833,7 +824,7 @@ public:
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) override;
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override;
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override;
 
 	/* SHADER LIBRARY */
 
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
index 6287585b..3f88581b 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
@@ -29,10 +29,9 @@
 /**************************************************************************/
 
 #include "scene_shader_forward_clustered.h"
-
 #include "core/config/project_settings.h"
 #include "core/math/math_defs.h"
-#include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
+#include "render_forward_clustered.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 
@@ -56,7 +55,7 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) {
 	depth_test_disabledi = 0;
 	depth_test_invertedi = 0;
 	alpha_antialiasing_mode = ALPHA_ANTIALIASING_OFF;
-	int cull_modei = RSE::CULL_MODE_BACK;
+	int cull_modei = RS::CULL_MODE_BACK;
 
 	uses_point_size = false;
 	uses_alpha = false;
@@ -112,9 +111,9 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) {
 	actions.render_mode_values["depth_test_disabled"] = Pair<int *, int>(&depth_test_disabledi, 1);
 	actions.render_mode_values["depth_test_inverted"] = Pair<int *, int>(&depth_test_invertedi, 1);
 
-	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_DISABLED);
-	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_FRONT);
-	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_modei, RSE::CULL_MODE_BACK);
+	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_DISABLED);
+	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_FRONT);
+	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_modei, RS::CULL_MODE_BACK);
 
 	actions.render_mode_flags["unshaded"] = &unshaded;
 	actions.render_mode_flags["wireframe"] = &wireframe;
@@ -171,7 +170,7 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) {
 	Error err = OK;
 	{
 		MutexLock lock(SceneShaderForwardClustered::singleton_mutex);
-		err = SceneShaderForwardClustered::singleton->compiler.compile(RSE::SHADER_SPATIAL, code, &actions, path, gen_code);
+		err = SceneShaderForwardClustered::singleton->compiler.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code);
 	}
 
 	if (err != OK) {
@@ -194,7 +193,7 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) {
 	} else {
 		depth_test = DEPTH_TEST_ENABLED;
 	}
-	cull_mode = RSE::CullMode(cull_modei);
+	cull_mode = RS::CullMode(cull_modei);
 	uses_screen_texture_mipmaps = gen_code.uses_screen_texture_mipmaps;
 	uses_screen_texture = gen_code.uses_screen_texture;
 	uses_depth_texture = gen_code.uses_depth_texture;
@@ -256,11 +255,11 @@ bool SceneShaderForwardClustered::ShaderData::casts_shadows() const {
 	return !has_alpha || (uses_depth_prepass_alpha && !(depth_draw == DEPTH_DRAW_DISABLED || depth_test != DEPTH_TEST_ENABLED));
 }
 
-RenderingServerTypes::ShaderNativeSourceCode SceneShaderForwardClustered::ShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode SceneShaderForwardClustered::ShaderData::get_native_source_code() const {
 	if (version.is_valid()) {
 		return SceneShaderForwardClustered::singleton->shader.version_get_native_source_code(version);
 	} else {
-		return RenderingServerTypes::ShaderNativeSourceCode();
+		return RS::ShaderNativeSourceCode();
 	}
 }
 
@@ -404,7 +403,7 @@ void SceneShaderForwardClustered::ShaderData::_create_pipeline(PipelineKey p_pip
 
 	bool depth_pre_pass_enabled = bool(GLOBAL_GET_CACHED(bool, "rendering/driver/depth_prepass/enable"));
 
-	RD::RenderPrimitive primitive_rd_table[RSE::PRIMITIVE_MAX] = {
+	RD::RenderPrimitive primitive_rd_table[RS::PRIMITIVE_MAX] = {
 		RD::RENDER_PRIMITIVE_POINTS,
 		RD::RENDER_PRIMITIVE_LINES,
 		RD::RENDER_PRIMITIVE_LINESTRIPS,
@@ -581,7 +580,7 @@ RendererRD::MaterialStorage::ShaderData *SceneShaderForwardClustered::_create_sh
 }
 
 void SceneShaderForwardClustered::MaterialData::set_render_priority(int p_priority) {
-	priority = p_priority - RSE::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
+	priority = p_priority - RS::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
 }
 
 void SceneShaderForwardClustered::MaterialData::set_next_pass(RID p_pass) {
@@ -1034,7 +1033,7 @@ bool SceneShaderForwardClustered::is_advanced_shader_group_enabled(bool p_multiv
 	}
 }
 
-uint32_t SceneShaderForwardClustered::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t SceneShaderForwardClustered::get_pipeline_compilations(RS::PipelineSource p_source) {
 	MutexLock lock(SceneShaderForwardClustered::singleton_mutex);
 	return pipeline_compilations[p_source];
 }
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
index bf708420..c0df98e2 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
+#include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
 #include "servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/rendering_server_types.h"
 
 namespace RendererSceneRenderImplementation {
 
@@ -190,7 +189,7 @@ public:
 			RD::VertexFormatID vertex_format_id;
 			RD::FramebufferFormatID framebuffer_format_id;
 			RD::PolygonCullMode cull_mode = RD::POLYGON_CULL_MAX;
-			RSE::PrimitiveType primitive_type = RSE::PRIMITIVE_MAX;
+			RS::PrimitiveType primitive_type = RS::PRIMITIVE_MAX;
 			PipelineVersion version = PipelineVersion::PIPELINE_VERSION_MAX;
 			uint32_t color_pass_flags = 0;
 			ShaderSpecialization shader_specialization = {};
@@ -266,7 +265,7 @@ public:
 		bool uses_world_coordinates = false;
 		bool uses_screen_texture_mipmaps = false;
 		bool uses_z_clip_scale = false;
-		RSE::CullMode cull_mode = RSE::CULL_MODE_DISABLED;
+		RS::CullMode cull_mode = RS::CULL_MODE_DISABLED;
 
 		bool stencil_enabled = false;
 		uint32_t stencil_flags = 0;
@@ -293,7 +292,7 @@ public:
 		}
 
 		_FORCE_INLINE_ bool uses_shared_shadow_material() const {
-			bool backface_culling = cull_mode == RSE::CULL_MODE_BACK;
+			bool backface_culling = cull_mode == RS::CULL_MODE_BACK;
 			return !uses_particle_trails && !writes_modelview_or_projection && !uses_vertex && !uses_position && !uses_discard && !uses_depth_prepass_alpha && !uses_alpha_clip && !uses_alpha_antialiasing && backface_culling && !uses_point_size && !uses_world_coordinates && !wireframe && !uses_z_clip_scale && !stencil_enabled;
 		}
 
@@ -301,7 +300,7 @@ public:
 
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 		uint16_t _get_shader_version(PipelineVersion p_pipeline_version, uint32_t p_color_pass_flags, bool p_ubershader) const;
 		RID _get_shader_variant(uint16_t p_shader_version) const;
@@ -370,7 +369,7 @@ public:
 
 	ShaderSpecialization default_specialization = {};
 
-	uint32_t pipeline_compilations[RSE::PIPELINE_SOURCE_MAX] = {};
+	uint32_t pipeline_compilations[RS::PIPELINE_SOURCE_MAX] = {};
 
 	SceneShaderForwardClustered();
 	~SceneShaderForwardClustered();
@@ -381,7 +380,7 @@ public:
 	void enable_advanced_shader_group(bool p_needs_multiview = false);
 	bool is_multiview_shader_group_enabled() const;
 	bool is_advanced_shader_group_enabled(bool p_multiview) const;
-	uint32_t get_pipeline_compilations(RSE::PipelineSource p_source);
+	uint32_t get_pipeline_compilations(RS::PipelineSource p_source);
 };
 
 } // namespace RendererSceneRenderImplementation
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
index 878409fe..ad57551a 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "render_forward_mobile.h"
-
 #include "core/config/project_settings.h"
 #include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
@@ -40,11 +39,6 @@
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server_default.h"
 
-#ifndef XR_DISABLED
-#include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_server.h"
-#endif
-
 #define PRELOAD_PIPELINES_ON_SURFACE_CACHE_CONSTRUCTION 1
 
 using namespace RendererSceneRenderImplementation;
@@ -211,14 +205,14 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe
 	// In the (near) future this means that if we cycle through a texture chain for our render target, we'll also support
 	// this.
 
-	RSE::ViewportMSAA msaa_3d = render_buffers->get_msaa_3d();
-	bool use_msaa = msaa_3d != RSE::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportMSAA msaa_3d = render_buffers->get_msaa_3d();
+	bool use_msaa = msaa_3d != RS::VIEWPORT_MSAA_DISABLED;
 
 	uint32_t view_count = render_buffers->get_view_count();
 
 	RID vrs_texture;
 #ifndef XR_DISABLED
-	if (render_buffers->get_vrs_mode() == RSE::VIEWPORT_VRS_XR) {
+	if (render_buffers->get_vrs_mode() == RS::VIEWPORT_VRS_XR) {
 		Ref<XRInterface> interface = XRServer::get_singleton()->get_primary_interface();
 		if (interface.is_valid() && RD::get_singleton()->vrs_get_method() == RD::VRS_METHOD_FRAGMENT_DENSITY_MAP && interface->get_vrs_texture_format() == XRInterface::XR_VRS_TEXTURE_FORMAT_FRAGMENT_DENSITY_MAP) {
 			vrs_texture = interface->get_vrs_texture();
@@ -232,13 +226,8 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe
 	Vector<RID> textures;
 	int color_buffer_id = 0;
 	int depth_buffer_id = 1;
-	if (p_config_type == FB_CONFIG_RENDER_AND_POST_PASS && vrs_texture.is_valid() && texture_storage->render_target_is_subsampled_enabled(render_buffers->get_render_target())) {
-		textures.push_back(use_msaa ? render_buffers->get_color_msaa_subsampled() : render_buffers->get_color_subsampled()); // 0 - color buffer.
-		textures.push_back(use_msaa ? render_buffers->get_depth_msaa_subsampled() : render_buffers->get_depth_subsampled()); // 1 - depth buffer.
-	} else {
-		textures.push_back(use_msaa ? render_buffers->get_color_msaa() : render_buffers->get_internal_texture()); // 0 - color buffer.
-		textures.push_back(use_msaa ? render_buffers->get_depth_msaa() : render_buffers->get_depth_texture()); // 1 - depth buffer.
-	}
+	textures.push_back(use_msaa ? render_buffers->get_color_msaa() : render_buffers->get_internal_texture()); // 0 - color buffer.
+	textures.push_back(use_msaa ? render_buffers->get_depth_msaa() : render_buffers->get_depth_texture()); // 1 - depth buffer.
 	if (vrs_texture.is_valid()) {
 		textures.push_back(vrs_texture); // 2 - vrs texture.
 	}
@@ -301,7 +290,7 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe
 			RID render_target = render_buffers->get_render_target();
 			ERR_FAIL_COND_V(render_target.is_null(), RID());
 			RID target_buffer;
-			if (view_count > 1 || texture_storage->render_target_get_msaa(render_target) == RSE::VIEWPORT_MSAA_DISABLED) {
+			if (view_count > 1 || texture_storage->render_target_get_msaa(render_target) == RS::VIEWPORT_MSAA_DISABLED) {
 				target_buffer = texture_storage->render_target_get_rd_texture(render_target);
 			} else {
 				target_buffer = texture_storage->render_target_get_rd_texture_msaa(render_target);
@@ -387,8 +376,8 @@ void RenderForwardMobile::mesh_generate_pipelines(RID p_mesh, bool p_background_
 		surface.uses_opaque = !material->shader_data->uses_alpha_pass();
 		surface.uses_transparent = material->shader_data->uses_alpha_pass();
 		surface.uses_depth = surface.uses_opaque || (surface.uses_transparent && material->shader_data->uses_depth_in_alpha_pass());
-		surface.can_use_lightmap = mesh_storage->mesh_surface_get_format(mesh_surface) & RSE::ARRAY_FORMAT_TEX_UV2;
-		_mesh_compile_pipelines_for_surface(surface, global_pipeline_data_required, RSE::PIPELINE_SOURCE_MESH, &pipeline_pairs);
+		surface.can_use_lightmap = mesh_storage->mesh_surface_get_format(mesh_surface) & RS::ARRAY_FORMAT_TEX_UV2;
+		_mesh_compile_pipelines_for_surface(surface, global_pipeline_data_required, RS::PIPELINE_SOURCE_MESH, &pipeline_pairs);
 	}
 
 	// Try to wait for all the pipelines that were compiled. This will force the loader to wait on all ubershader pipelines to be ready.
@@ -399,7 +388,7 @@ void RenderForwardMobile::mesh_generate_pipelines(RID p_mesh, bool p_background_
 	}
 }
 
-uint32_t RenderForwardMobile::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t RenderForwardMobile::get_pipeline_compilations(RS::PipelineSource p_source) {
 	return scene_shader.get_pipeline_compilations(p_source);
 }
 
@@ -648,23 +637,23 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (decals_get_filter()) {
-			case RSE::DECAL_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -678,23 +667,23 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 		u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
 		RID sampler;
 		switch (light_projectors_get_filter()) {
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
-			case RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
-				sampler = p_samplers.get_sampler(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+			case RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC: {
+				sampler = p_samplers.get_sampler(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
 			} break;
 		}
 
@@ -761,9 +750,9 @@ void RenderForwardMobile::_pre_opaque_render(RenderDataRD *p_render_data) {
 			RID li = p_render_data->render_shadows[i].light;
 			RID base = light_storage->light_instance_get_base_light(li);
 
-			if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+			if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 				p_render_data->directional_shadows.push_back(i);
-			} else if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+			} else if (light_storage->light_get_type(base) == RS::LIGHT_OMNI && light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				p_render_data->cube_shadows.push_back(i);
 			} else {
 				p_render_data->shadows.push_back(i);
@@ -862,13 +851,13 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 	RendererRD::MaterialStorage::Samplers samplers;
 	bool hdr_render_target = false;
 
-	RSE::ViewportMSAA msaa = rb->get_msaa_3d();
-	bool use_msaa = msaa != RSE::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportMSAA msaa = rb->get_msaa_3d();
+	bool use_msaa = msaa != RS::VIEWPORT_MSAA_DISABLED;
 	bool resolve_depth_buffer = (use_msaa && has_depth_texture_override); // We'll check more conditions later.
 
-	bool ce_has_post_opaque = _has_compositor_effect(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE, p_render_data);
-	bool ce_has_pre_transparent = _has_compositor_effect(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
-	bool ce_has_post_transparent = _has_compositor_effect(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
+	bool ce_has_post_opaque = _has_compositor_effect(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE, p_render_data);
+	bool ce_has_pre_transparent = _has_compositor_effect(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
+	bool ce_has_post_transparent = _has_compositor_effect(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
 
 	if (ce_has_post_opaque) {
 		// As we're doing opaque and sky in subpasses we don't support this *yet*
@@ -884,7 +873,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 		using_subpass_post_process = false;
 	}
 
-	if (use_msaa && _compositor_effects_has_flag(p_render_data, RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY)) {
+	if (use_msaa && _compositor_effects_has_flag(p_render_data, RS::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY)) {
 		// We'll be able to do this when we finish PR #78598
 		WARN_PRINT_ONCE("Depth buffer resolve for rendering effect callback is not supported in the mobile renderer");
 	}
@@ -926,8 +915,8 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 	_fill_instance_data(RENDER_LIST_ALPHA);
 
 	if (p_render_data->render_info) {
-		p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] = p_render_data->instances->size();
-		p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] = p_render_data->instances->size();
+		p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] = p_render_data->instances->size();
+		p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] = p_render_data->instances->size();
 	}
 
 	if (is_reflection_probe) {
@@ -952,15 +941,15 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 		// setup rendering to render buffer
 		screen_size = p_render_data->render_buffers->get_internal_size();
 
-		if (rb->get_scaling_3d_mode() != RSE::VIEWPORT_SCALING_3D_MODE_OFF) {
+		if (rb->get_scaling_3d_mode() != RS::VIEWPORT_SCALING_3D_MODE_OFF) {
 			// can't do blit subpass because we're scaling
 			using_subpass_post_process = false;
-		} else if (p_render_data->environment.is_valid() && (environment_get_glow_enabled(p_render_data->environment) || RSG::camera_attributes->camera_attributes_uses_auto_exposure(p_render_data->camera_attributes) || RSG::camera_attributes->camera_attributes_uses_dof(p_render_data->camera_attributes) || environment_get_background(p_render_data->environment) == RSE::ENV_BG_CANVAS)) {
+		} else if (p_render_data->environment.is_valid() && (environment_get_glow_enabled(p_render_data->environment) || RSG::camera_attributes->camera_attributes_uses_auto_exposure(p_render_data->camera_attributes) || RSG::camera_attributes->camera_attributes_uses_dof(p_render_data->camera_attributes) || environment_get_background(p_render_data->environment) == RS::ENV_BG_CANVAS)) {
 			// can't do blit subpass because we're using post processes
 			using_subpass_post_process = false;
 		}
 
-		if (rb->get_screen_space_aa() != RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED) {
+		if (rb->get_screen_space_aa() != RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED) {
 			// Can't do blit subpass because we're using screen space AA.
 			using_subpass_post_process = false;
 		}
@@ -1002,9 +991,6 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 		ERR_FAIL(); //bug?
 	}
 
-	// Set subsampled images as not allowed on this render target, if we are using incompatible rendering features.
-	texture_storage->render_target_set_subsampled_allowed(render_target, using_subpass_post_process);
-
 	if (p_render_data->scene_data->view_count > 1) {
 		global_pipeline_data_required.use_multiview = true;
 	}
@@ -1049,23 +1035,23 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 	bool use_ambient_cubemap = false;
 	bool use_reflection_cubemap = false;
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
 		clear_color = Color(0, 0, 0, 1); //in overdraw mode, BG should always be black
 	} else if (is_environment(p_render_data->environment)) {
-		RSE::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_render_data->environment);
-		RSE::EnvironmentBG bg_mode = environment_get_background(p_render_data->environment);
+		RS::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_render_data->environment);
+		RS::EnvironmentBG bg_mode = environment_get_background(p_render_data->environment);
 		float bg_energy_multiplier = environment_get_bg_energy_multiplier(p_render_data->environment);
 		bg_energy_multiplier *= environment_get_bg_intensity(p_render_data->environment);
-		RSE::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(p_render_data->environment);
-		use_ambient_cubemap = (ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY) || ambient_source == RSE::ENV_AMBIENT_SOURCE_SKY;
-		use_reflection_cubemap = (reflection_source == RSE::ENV_REFLECTION_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY) || reflection_source == RSE::ENV_REFLECTION_SOURCE_SKY;
+		RS::EnvironmentReflectionSource reflection_source = environment_get_reflection_source(p_render_data->environment);
+		use_ambient_cubemap = (ambient_source == RS::ENV_AMBIENT_SOURCE_BG && bg_mode == RS::ENV_BG_SKY) || ambient_source == RS::ENV_AMBIENT_SOURCE_SKY;
+		use_reflection_cubemap = (reflection_source == RS::ENV_REFLECTION_SOURCE_BG && bg_mode == RS::ENV_BG_SKY) || reflection_source == RS::ENV_REFLECTION_SOURCE_SKY;
 
 		if (p_render_data->camera_attributes.is_valid()) {
 			bg_energy_multiplier *= RSG::camera_attributes->camera_attributes_get_exposure_normalization_factor(p_render_data->camera_attributes);
 		}
 
 		switch (bg_mode) {
-			case RSE::ENV_BG_CLEAR_COLOR: {
+			case RS::ENV_BG_CLEAR_COLOR: {
 				clear_color = p_default_bg_color;
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
@@ -1075,7 +1061,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 					RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
 				}
 			} break;
-			case RSE::ENV_BG_COLOR: {
+			case RS::ENV_BG_COLOR: {
 				clear_color = environment_get_bg_color(p_render_data->environment);
 				clear_color.r *= bg_energy_multiplier;
 				clear_color.g *= bg_energy_multiplier;
@@ -1085,25 +1071,25 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 					RendererRD::MaterialStorage::get_singleton()->material_set_param(sky.sky_scene_state.fog_material, "clear_color", Variant(clear_color.srgb_to_linear()));
 				}
 			} break;
-			case RSE::ENV_BG_SKY: {
+			case RS::ENV_BG_SKY: {
 				draw_sky = !p_render_data->transparent_bg;
 			} break;
-			case RSE::ENV_BG_CANVAS: {
+			case RS::ENV_BG_CANVAS: {
 				if (rb_data.is_valid()) {
 					copy_canvas = true;
 				}
 			} break;
-			case RSE::ENV_BG_KEEP: {
+			case RS::ENV_BG_KEEP: {
 				load_color = true;
 			} break;
-			case RSE::ENV_BG_CAMERA_FEED: {
+			case RS::ENV_BG_CAMERA_FEED: {
 			} break;
 			default: {
 			}
 		}
 
 		// setup sky if used for ambient, reflections, or background
-		if (draw_sky || draw_sky_fog_only || (reflection_source == RSE::ENV_REFLECTION_SOURCE_BG && bg_mode == RSE::ENV_BG_SKY) || reflection_source == RSE::ENV_REFLECTION_SOURCE_SKY || ambient_source == RSE::ENV_AMBIENT_SOURCE_SKY) {
+		if (draw_sky || draw_sky_fog_only || (reflection_source == RS::ENV_REFLECTION_SOURCE_BG && bg_mode == RS::ENV_BG_SKY) || reflection_source == RS::ENV_REFLECTION_SOURCE_SKY || ambient_source == RS::ENV_AMBIENT_SOURCE_SKY) {
 			RENDER_TIMESTAMP("Setup Sky");
 			RD::get_singleton()->draw_command_begin_label("Setup Sky");
 
@@ -1131,7 +1117,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 	}
 
 	// We don't have access to any rendered buffers but we may be able to effect mesh data...
-	_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE, p_render_data);
+	_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE, p_render_data);
 
 	_pre_opaque_render(p_render_data);
 
@@ -1153,7 +1139,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 			base_specialization.use_fog_aerial_perspective = environment_get_fog_aerial_perspective(p_render_data->environment) > 0.0;
 			base_specialization.use_fog_sun_scatter = environment_get_fog_sun_scatter(p_render_data->environment) > 0.001;
 			base_specialization.use_fog_height_density = std::abs(environment_get_fog_height_density(p_render_data->environment)) >= 0.0001;
-			base_specialization.use_depth_fog = p_render_data->environment.is_valid() && environment_get_fog_mode(p_render_data->environment) == RSE::EnvironmentFogMode::ENV_FOG_MODE_DEPTH;
+			base_specialization.use_depth_fog = p_render_data->environment.is_valid() && environment_get_fog_mode(p_render_data->environment) == RS::EnvironmentFogMode::ENV_FOG_MODE_DEPTH;
 		}
 
 		base_specialization.scene_use_ambient_cubemap = use_ambient_cubemap;
@@ -1245,7 +1231,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 		}
 
 		if (render_list[RENDER_LIST_OPAQUE].elements.size() > 0) {
-			RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, PASS_MODE_COLOR, rp_uniform_set, base_specialization, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
+			RenderListParameters render_list_params(render_list[RENDER_LIST_OPAQUE].elements.ptr(), render_list[RENDER_LIST_OPAQUE].element_info.ptr(), render_list[RENDER_LIST_OPAQUE].elements.size(), reverse_cull, PASS_MODE_COLOR, rp_uniform_set, base_specialization, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
 			render_list_params.framebuffer_format = fb_format;
 			render_list_params.subpass = RD::get_singleton()->draw_list_get_current_pass(); // Should now always be 0.
 
@@ -1272,7 +1258,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 
 				rp_uniform_set = _setup_render_pass_uniform_set(RENDER_LIST_ALPHA, p_render_data, radiance_texture, samplers, true);
 
-				RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR_TRANSPARENT, rp_uniform_set, base_specialization, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
+				RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR_TRANSPARENT, rp_uniform_set, base_specialization, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
 				render_list_params.framebuffer_format = fb_format;
 				render_list_params.subpass = RD::get_singleton()->draw_list_get_current_pass(); // Should now always be 0.
 
@@ -1306,7 +1292,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 
 			// rendering effects
 			if (ce_has_pre_transparent) {
-				_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
+				_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
 			}
 
 			if (scene_state.used_screen_texture || global_surface_data.screen_texture_used) {
@@ -1341,7 +1327,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 				// this may be needed if we re-introduced steps that change info, not sure which do so in the previous implementation
 				//_setup_environment(p_render_data, is_reflection_probe, screen_size, screen_size, p_default_bg_color, false);
 
-				RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR, rp_uniform_set, base_specialization, get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
+				RenderListParameters render_list_params(render_list[RENDER_LIST_ALPHA].elements.ptr(), render_list[RENDER_LIST_ALPHA].element_info.ptr(), render_list[RENDER_LIST_ALPHA].elements.size(), reverse_cull, PASS_MODE_COLOR, rp_uniform_set, base_specialization, get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_WIREFRAME, Vector2(), p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, p_render_data->scene_data->view_count);
 				render_list_params.framebuffer_format = fb_format;
 				render_list_params.subpass = RD::get_singleton()->draw_list_get_current_pass(); // Should now always be 0.
 
@@ -1358,7 +1344,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 		RD::get_singleton()->draw_command_begin_label("Post Process Pass");
 
 		if (ce_has_post_transparent) {
-			_process_compositor_effects(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
+			_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data);
 		}
 
 		// If we need extra effects we do this in its own pass
@@ -1378,7 +1364,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 
 /* these are being called from RendererSceneRenderRD::_pre_opaque_render */
 
-void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, bool p_open_pass, bool p_close_pass, bool p_clear_region, RenderingServerTypes::RenderInfo *p_render_info, const Transform3D &p_main_cam_transform) {
+void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, bool p_open_pass, bool p_close_pass, bool p_clear_region, RenderingMethod::RenderInfo *p_render_info, const Transform3D &p_main_cam_transform) {
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
 	ERR_FAIL_COND(!light_storage->owns_light_instance(p_light));
@@ -1405,7 +1391,7 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 	Projection light_projection;
 	Transform3D light_transform;
 
-	if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+	if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 		//set pssm stuff
 		uint64_t last_scene_shadow_pass = light_storage->light_instance_get_shadow_pass(p_light);
 		if (last_scene_shadow_pass != get_scene_pass()) {
@@ -1414,13 +1400,13 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 			light_storage->light_instance_set_shadow_pass(p_light, get_scene_pass());
 		}
 
-		use_pancake = light_storage->light_get_param(base, RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
+		use_pancake = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE) > 0;
 		light_projection = light_storage->light_instance_get_shadow_camera(p_light, p_pass);
 		light_transform = light_storage->light_instance_get_shadow_transform(p_light, p_pass);
 
 		atlas_rect = light_storage->light_instance_get_directional_rect(p_light);
 
-		if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
+		if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
 			atlas_rect.size.width /= 2;
 			atlas_rect.size.height /= 2;
 
@@ -1431,7 +1417,7 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 			} else if (p_pass == 3) {
 				atlas_rect.position += atlas_rect.size;
 			}
-		} else if (light_storage->light_directional_get_shadow_mode(base) == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
+		} else if (light_storage->light_directional_get_shadow_mode(base) == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
 			atlas_rect.size.height /= 2;
 
 			if (p_pass == 0) {
@@ -1446,7 +1432,7 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 		atlas_rect_norm.size /= directional_shadow_size;
 		light_storage->light_instance_set_directional_shadow_atlas_rect(p_light, p_pass, atlas_rect_norm);
 
-		zfar = RSG::light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = RSG::light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 
 		render_fb = light_storage->direction_shadow_get_fb();
 		render_texture = RID();
@@ -1481,13 +1467,13 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 		atlas_rect.size.width = shadow_size;
 		atlas_rect.size.height = shadow_size;
 
-		zfar = light_storage->light_get_param(base, RSE::LIGHT_PARAM_RANGE);
+		zfar = light_storage->light_get_param(base, RS::LIGHT_PARAM_RANGE);
 
-		if (light_storage->light_get_type(base) == RSE::LIGHT_OMNI) {
+		if (light_storage->light_get_type(base) == RS::LIGHT_OMNI) {
 			bool wrap = (shadow + 1) % subdivision == 0;
 			dual_paraboloid_offset = wrap ? Vector2i(1 - subdivision, 1) : Vector2i(1, 0);
 
-			if (light_storage->light_omni_get_shadow_mode(base) == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+			if (light_storage->light_omni_get_shadow_mode(base) == RS::LIGHT_OMNI_SHADOW_CUBE) {
 				render_texture = light_storage->get_cubemap(shadow_size / 2);
 				render_fb = light_storage->get_cubemap_fb(shadow_size / 2, p_pass);
 
@@ -1520,7 +1506,7 @@ void RenderForwardMobile::_render_shadow_pass(RID p_light, RID p_shadow_atlas, i
 				flip_y = true;
 			}
 
-		} else if (light_storage->light_get_type(base) == RSE::LIGHT_SPOT) {
+		} else if (light_storage->light_get_type(base) == RS::LIGHT_SPOT) {
 			light_projection = light_storage->light_instance_get_shadow_camera(p_light, 0);
 			light_transform = light_storage->light_instance_get_shadow_transform(p_light, 0);
 
@@ -1563,12 +1549,12 @@ void RenderForwardMobile::_render_shadow_begin() {
 	render_list[RENDER_LIST_SECONDARY].clear();
 }
 
-void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, const Rect2i &p_rect, bool p_flip_y, bool p_clear_region, bool p_begin, bool p_end, RenderingServerTypes::RenderInfo *p_render_info, const Transform3D &p_main_cam_transform) {
+void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, const Rect2i &p_rect, bool p_flip_y, bool p_clear_region, bool p_begin, bool p_end, RenderingMethod::RenderInfo *p_render_info, const Transform3D &p_main_cam_transform) {
 	SceneState::ShadowPass shadow_pass;
 
 	if (p_render_info) {
-		p_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] = p_instances.size();
-		p_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] = p_instances.size();
+		p_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] = p_instances.size();
+		p_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] = p_instances.size();
 	}
 
 	RenderSceneDataRD scene_data;
@@ -1597,7 +1583,7 @@ void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedAr
 	}
 	_setup_environment(&render_data, true, screen_size, viewport_size, Color(), false, p_use_pancake);
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
 		scene_data.screen_mesh_lod_threshold = 0.0;
 	} else {
 		scene_data.screen_mesh_lod_threshold = p_screen_mesh_lod_threshold;
@@ -1954,7 +1940,7 @@ void RenderForwardMobile::_update_render_base_uniform_set() {
 			RD::Uniform u;
 			u.binding = 13;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER;
-			u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RSE::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
+			u.append_id(RendererRD::MaterialStorage::get_singleton()->sampler_rd_get_default(RS::CanvasItemTextureFilter::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RS::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED));
 			uniforms.push_back(u);
 		}
 
@@ -1974,7 +1960,7 @@ void RenderForwardMobile::SceneState::grow_instance_buffer(RenderListType p_rend
 	if (p_req_element_count > 0) {
 		if (instance_buffer[p_render_list].get_size(0u) < p_req_element_count * sizeof(SceneState::InstanceData)) {
 			instance_buffer[p_render_list].uninit();
-			uint32_t new_size = Math::nearest_power_of_2_templated(MAX(uint64_t(INSTANCE_DATA_BUFFER_MIN_SIZE), p_req_element_count));
+			uint32_t new_size = nearest_power_of_2_templated(MAX(uint64_t(INSTANCE_DATA_BUFFER_MIN_SIZE), p_req_element_count));
 			instance_buffer[p_render_list].set_storage_size(0u, new_size * sizeof(SceneState::InstanceData));
 			curr_gpu_ptr[p_render_list] = nullptr;
 		}
@@ -2041,7 +2027,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 		uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(surface->surface);
 		Vector4 uv_scale = Vector4(0.0, 0.0, 0.0, 0.0);
 
-		if (format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+		if (format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 			surface_aabb = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_aabb(surface->surface);
 			uv_scale = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_uv_scale(surface->surface);
 		}
@@ -2064,9 +2050,9 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 	}
 }
 
-_FORCE_INLINE_ static uint32_t _indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) {
-	static const uint32_t divisor[RSE::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RSE::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
+_FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
+	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
@@ -2190,9 +2176,9 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 				if (p_render_data->render_info) {
 					indices = _indices_to_primitives(surf->primitive, indices);
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += indices;
 					}
 				}
 			} else {
@@ -2202,9 +2188,9 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 					to_draw = _indices_to_primitives(surf->primitive, to_draw);
 					to_draw *= inst->instance_count;
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					} else if (p_render_list == RENDER_LIST_SECONDARY) { //shadow
-						p_render_data->render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
+						p_render_data->render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += to_draw;
 					}
 				}
 			}
@@ -2212,7 +2198,7 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 			// ADD Element
 			if (p_pass_mode == PASS_MODE_COLOR || p_pass_mode == PASS_MODE_COLOR_TRANSPARENT || p_pass_mode == PASS_MODE_MOTION_VECTORS) {
 #ifdef DEBUG_ENABLED
-				bool force_alpha = unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW);
+				bool force_alpha = unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW);
 #else
 				bool force_alpha = false;
 #endif
@@ -2384,13 +2370,13 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
 			pipeline_specialization.decals = inst->decals_count > 0;
 
 #ifdef DEBUG_ENABLED
-			if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
+			if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_LIGHTING)) {
 				material_uniform_set = scene_shader.default_material_uniform_set;
 				shader = scene_shader.default_material_shader_ptr;
-			} else if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
+			} else if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW)) {
 				material_uniform_set = scene_shader.overdraw_material_uniform_set;
 				shader = scene_shader.overdraw_material_shader_ptr;
-			} else if (unlikely(get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS)) {
+			} else if (unlikely(get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS)) {
 				material_uniform_set = scene_shader.debug_shadow_splits_material_uniform_set;
 				shader = scene_shader.debug_shadow_splits_material_shader_ptr;
 			} else {
@@ -2490,7 +2476,7 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
 			pipeline_hash = pipeline_key.hash();
 
 			if (shader != prev_shader || pipeline_hash != prev_pipeline_hash) {
-				RSE::PipelineSource pipeline_source = pipeline_key.ubershader ? RSE::PIPELINE_SOURCE_DRAW : RSE::PIPELINE_SOURCE_SPECIALIZATION;
+				RS::PipelineSource pipeline_source = pipeline_key.ubershader ? RS::PIPELINE_SOURCE_DRAW : RS::PIPELINE_SOURCE_SPECIALIZATION;
 				pipeline_rd = shader->pipeline_hash_map.get_pipeline(pipeline_key, pipeline_hash, pipeline_key.ubershader, pipeline_source);
 
 				if (pipeline_rd.is_valid()) {
@@ -2595,8 +2581,8 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
 /* Geometry instance */
 
 RenderGeometryInstance *RenderForwardMobile::geometry_instance_create(RID p_base) {
-	RSE::InstanceType type = RSG::utilities->get_base_type(p_base);
-	ERR_FAIL_COND_V(!((1 << type) & RSE::INSTANCE_GEOMETRY_MASK), nullptr);
+	RS::InstanceType type = RSG::utilities->get_base_type(p_base);
+	ERR_FAIL_COND_V(!((1 << type) & RS::INSTANCE_GEOMETRY_MASK), nullptr);
 
 	GeometryInstanceForwardMobile *ginstance = geometry_instance_alloc.alloc();
 	ginstance->data = memnew(GeometryInstanceForwardMobile::Data);
@@ -2664,37 +2650,26 @@ void RenderForwardMobile::geometry_instance_free(RenderGeometryInstance *p_geome
 }
 
 uint32_t RenderForwardMobile::geometry_instance_get_pair_mask() {
-	return ((1 << RSE::INSTANCE_LIGHT) + (1 << RSE::INSTANCE_REFLECTION_PROBE) + (1 << RSE::INSTANCE_DECAL));
+	return ((1 << RS::INSTANCE_LIGHT) + (1 << RS::INSTANCE_REFLECTION_PROBE) + (1 << RS::INSTANCE_DECAL));
 }
 
-uint32_t RenderForwardMobile::get_max_lights_total() {
-	return (uint32_t)get_singleton()->get_max_elements();
-}
-
-uint32_t RenderForwardMobile::get_max_lights_per_mesh() {
-	return (uint32_t)MAX_RDL_CULL;
-}
-
-void RenderForwardMobile::GeometryInstanceForwardMobile::clear_light_instances() {
+void RenderForwardMobile::GeometryInstanceForwardMobile::pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) {
 	omni_light_count = 0;
 	spot_light_count = 0;
-}
 
-void RenderForwardMobile::GeometryInstanceForwardMobile::pair_light_instance(
-		const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) {
-	if (placement_idx < (uint32_t)MAX_RDL_CULL) {
-		RendererRD::ForwardID light_id = RendererRD::LightStorage::get_singleton()->light_instance_get_forward_id(p_light_instance);
-		switch (light_type) {
-			case RSE::LIGHT_OMNI: {
-				omni_lights[placement_idx] = light_id;
-				if (placement_idx >= omni_light_count) {
-					omni_light_count = placement_idx + 1;
+	for (uint32_t i = 0; i < p_light_instance_count; i++) {
+		RS::LightType type = RendererRD::LightStorage::get_singleton()->light_instance_get_type(p_light_instances[i]);
+		switch (type) {
+			case RS::LIGHT_OMNI: {
+				if (omni_light_count < (uint32_t)MAX_RDL_CULL) {
+					omni_lights[omni_light_count] = RendererRD::LightStorage::get_singleton()->light_instance_get_forward_id(p_light_instances[i]);
+					omni_light_count++;
 				}
 			} break;
-			case RSE::LIGHT_SPOT: {
-				spot_lights[placement_idx] = light_id;
-				if (placement_idx >= spot_light_count) {
-					spot_light_count = placement_idx + 1;
+			case RS::LIGHT_SPOT: {
+				if (spot_light_count < (uint32_t)MAX_RDL_CULL) {
+					spot_lights[spot_light_count] = RendererRD::LightStorage::get_singleton()->light_instance_get_forward_id(p_light_instances[i]);
+					spot_light_count++;
 				}
 			} break;
 			default:
@@ -2748,8 +2723,8 @@ void RenderForwardMobile::_update_global_pipeline_data_requirements_from_project
 	const bool positional_shadow_16_bits = GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/atlas_16_bits");
 	global_pipeline_data_required.use_16_bit_shadows = directional_shadow_16_bits || positional_shadow_16_bits;
 	global_pipeline_data_required.use_32_bit_shadows = !directional_shadow_16_bits || !positional_shadow_16_bits;
-	global_pipeline_data_required.target_samples = RenderSceneBuffersRD::msaa_to_samples(RSE::ViewportMSAA(msaa_2d_mode));
-	global_pipeline_data_required.texture_samples = RenderSceneBuffersRD::msaa_to_samples(RSE::ViewportMSAA(msaa_3d_mode));
+	global_pipeline_data_required.target_samples = RenderSceneBuffersRD::msaa_to_samples(RS::ViewportMSAA(msaa_2d_mode));
+	global_pipeline_data_required.texture_samples = RenderSceneBuffersRD::msaa_to_samples(RS::ViewportMSAA(msaa_3d_mode));
 }
 
 void RenderForwardMobile::_update_global_pipeline_data_requirements_from_light_storage() {
@@ -2870,7 +2845,7 @@ void RenderForwardMobile::_geometry_instance_add_surface_with_material(GeometryI
 	sdcache->sort.priority = p_material->priority;
 
 	uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(sdcache->surface);
-	if (p_material->shader_data->uses_tangent && !(format & RSE::ARRAY_FORMAT_TANGENT)) {
+	if (p_material->shader_data->uses_tangent && !(format & RS::ARRAY_FORMAT_TANGENT)) {
 		String shader_path = p_material->shader_data->path.is_empty() ? "" : "(" + p_material->shader_data->path + ")";
 		String mesh_path = mesh_storage->mesh_get_path(p_mesh).is_empty() ? "" : "(" + mesh_storage->mesh_get_path(p_mesh) + ")";
 		WARN_PRINT_ED(vformat("Attempting to use a shader %s that requires tangents with a mesh %s that doesn't contain tangents. Ensure that meshes are imported with the 'ensure_tangents' option. If creating your own meshes, add an `ARRAY_TANGENT` array (when using ArrayMesh) or call `generate_tangents()` (when using SurfaceTool).", shader_path, mesh_path));
@@ -2959,7 +2934,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 
 	//add geometry for drawing
 	switch (ginstance->data->base_type) {
-		case RSE::INSTANCE_MESH: {
+		case RS::INSTANCE_MESH: {
 			const RID *materials = nullptr;
 			uint32_t surface_count;
 			RID mesh = ginstance->data->base;
@@ -2980,7 +2955,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 
 		} break;
 
-		case RSE::INSTANCE_MULTIMESH: {
+		case RS::INSTANCE_MULTIMESH: {
 			RID mesh = mesh_storage->multimesh_get_mesh(ginstance->data->base);
 			if (mesh.is_valid()) {
 				const RID *materials = nullptr;
@@ -2998,7 +2973,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 
 		} break;
 #if 0
-		case RSE::INSTANCE_IMMEDIATE: {
+		case RS::INSTANCE_IMMEDIATE: {
 			RasterizerStorageGLES3::Immediate *immediate = storage->immediate_owner.get_or_null(inst->base);
 			ERR_CONTINUE(!immediate);
 
@@ -3006,7 +2981,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 
 		} break;
 #endif
-		case RSE::INSTANCE_PARTICLES: {
+		case RS::INSTANCE_PARTICLES: {
 			int draw_passes = particles_storage->particles_get_draw_passes(ginstance->data->base);
 
 			for (int j = 0; j < draw_passes; j++) {
@@ -3039,10 +3014,10 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 	bool store_transform = true;
 	ginstance->base_flags = 0;
 
-	if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+	if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
 
-		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RSE::MULTIMESH_TRANSFORM_2D) {
+		if (mesh_storage->multimesh_get_transform_format(ginstance->data->base) == RS::MULTIMESH_TRANSFORM_2D) {
 			ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH_FORMAT_2D;
 		}
 		if (mesh_storage->multimesh_uses_colors(ginstance->data->base)) {
@@ -3057,7 +3032,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 
 		ginstance->transforms_uniform_set = mesh_storage->multimesh_get_3d_uniform_set(ginstance->data->base, scene_shader.default_shader_rd, TRANSFORMS_UNIFORM_SET);
 
-	} else if (ginstance->data->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_PARTICLES) {
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_PARTICLES;
 		ginstance->base_flags |= INSTANCE_DATA_FLAG_MULTIMESH;
 		if (false) { // 2D particles
@@ -3083,7 +3058,7 @@ void RenderForwardMobile::_geometry_instance_update(RenderGeometryInstance *p_ge
 		if (ginstance->data->dirty_dependencies) {
 			particles_storage->particles_update_dependency(ginstance->data->base, &ginstance->data->dependency_tracker);
 		}
-	} else if (ginstance->data->base_type == RSE::INSTANCE_MESH) {
+	} else if (ginstance->data->base_type == RS::INSTANCE_MESH) {
 		if (mesh_storage->skeleton_is_valid(ginstance->data->skeleton)) {
 			ginstance->transforms_uniform_set = mesh_storage->skeleton_get_3d_uniform_set(ginstance->data->skeleton, scene_shader.default_shader_rd, TRANSFORMS_UNIFORM_SET);
 			if (ginstance->data->dirty_dependencies) {
@@ -3218,7 +3193,7 @@ static RD::FramebufferFormatID _get_shadow_atlas_framebuffer_format_for_pipeline
 	return RD::get_singleton()->framebuffer_format_create(Vector<RD::AttachmentFormat>(attachments));
 }
 
-void RenderForwardMobile::_mesh_compile_pipeline_for_surface(SceneShaderForwardMobile::ShaderData *p_shader, void *p_mesh_surface, bool p_instanced_surface, RSE::PipelineSource p_source, SceneShaderForwardMobile::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
+void RenderForwardMobile::_mesh_compile_pipeline_for_surface(SceneShaderForwardMobile::ShaderData *p_shader, void *p_mesh_surface, bool p_instanced_surface, RS::PipelineSource p_source, SceneShaderForwardMobile::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
 	uint64_t input_mask = p_shader->get_vertex_input_mask(r_pipeline_key.version, true);
 	bool emulate_point_size = p_shader->uses_point_size && scene_shader.emulate_point_size;
@@ -3231,7 +3206,7 @@ void RenderForwardMobile::_mesh_compile_pipeline_for_surface(SceneShaderForwardM
 	}
 }
 
-void RenderForwardMobile::_mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RSE::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
+void RenderForwardMobile::_mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RS::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs) {
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
 	bool octmap_use_storage = !copy_effects->get_raster_effects().has_flag(RendererRD::CopyEffects::RASTER_EFFECT_OCTMAP);
 
@@ -3328,7 +3303,7 @@ void RenderForwardMobile::_mesh_generate_all_pipelines_for_surface_cache(Geometr
 	surface.uses_transparent = uses_alpha_pass;
 	surface.uses_depth = (p_surface_cache->flags & (GeometryInstanceSurfaceDataCache::FLAG_PASS_DEPTH | GeometryInstanceSurfaceDataCache::FLAG_PASS_OPAQUE | GeometryInstanceSurfaceDataCache::FLAG_PASS_SHADOW)) != 0;
 	surface.can_use_lightmap = p_surface_cache->owner->lightmap_instance.is_valid() || p_surface_cache->owner->lightmap_sh;
-	_mesh_compile_pipelines_for_surface(surface, p_global, RSE::PIPELINE_SOURCE_SURFACE);
+	_mesh_compile_pipelines_for_surface(surface, p_global, RS::PIPELINE_SOURCE_SURFACE);
 }
 
 void RenderForwardMobile::_update_dirty_geometry_instances() {
@@ -3382,7 +3357,7 @@ void RenderForwardMobile::_geometry_instance_dependency_changed(Dependency::Depe
 		} break;
 		case Dependency::DEPENDENCY_CHANGED_MULTIMESH_VISIBLE_INSTANCES: {
 			GeometryInstanceForwardMobile *ginstance = static_cast<GeometryInstanceForwardMobile *>(p_tracker->userdata);
-			if (ginstance->data->base_type == RSE::INSTANCE_MULTIMESH) {
+			if (ginstance->data->base_type == RS::INSTANCE_MULTIMESH) {
 				ginstance->instance_count = RendererRD::MeshStorage::get_singleton()->multimesh_get_instances_to_draw(ginstance->data->base);
 			}
 		} break;
@@ -3419,16 +3394,16 @@ void RenderForwardMobile::_update_shader_quality_settings() {
 	specialization.directional_soft_shadow_samples = directional_soft_shadow_samples_get();
 	specialization.directional_penumbra_shadow_samples = directional_penumbra_shadow_samples_get();
 	specialization.decal_use_mipmaps =
-			decals_get_filter() == RSE::DECAL_FILTER_NEAREST_MIPMAPS ||
-			decals_get_filter() == RSE::DECAL_FILTER_LINEAR_MIPMAPS ||
-			decals_get_filter() == RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
-			decals_get_filter() == RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
+			decals_get_filter() == RS::DECAL_FILTER_NEAREST_MIPMAPS ||
+			decals_get_filter() == RS::DECAL_FILTER_LINEAR_MIPMAPS ||
+			decals_get_filter() == RS::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
+			decals_get_filter() == RS::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
 
 	specialization.projector_use_mipmaps =
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
-			light_projectors_get_filter() == RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC ||
+			light_projectors_get_filter() == RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC;
 
 	specialization.use_lightmap_bicubic_filter = lightmap_filter_bicubic_get();
 	specialization.use_material_debanding = material_use_debanding_get();
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
index 23710616..a5545417 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
@@ -154,9 +154,9 @@ private:
 
 	/* Render shadows */
 
-	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, bool p_open_pass = true, bool p_close_pass = true, bool p_clear_region = true, RenderingServerTypes::RenderInfo *p_render_info = nullptr, const Transform3D &p_main_cam_transform = Transform3D());
+	void _render_shadow_pass(RID p_light, RID p_shadow_atlas, int p_pass, const PagedArray<RenderGeometryInstance *> &p_instances, float p_lod_distance_multiplier = 0, float p_screen_mesh_lod_threshold = 0.0, bool p_open_pass = true, bool p_close_pass = true, bool p_clear_region = true, RenderingMethod::RenderInfo *p_render_info = nullptr, const Transform3D &p_main_cam_transform = Transform3D());
 	void _render_shadow_begin();
-	void _render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier = 0.0, float p_screen_mesh_lod_threshold = 0.0, const Rect2i &p_rect = Rect2i(), bool p_flip_y = false, bool p_clear_region = true, bool p_begin = true, bool p_end = true, RenderingServerTypes::RenderInfo *p_render_info = nullptr, const Transform3D &p_main_cam_transform = Transform3D());
+	void _render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier = 0.0, float p_screen_mesh_lod_threshold = 0.0, const Rect2i &p_rect = Rect2i(), bool p_flip_y = false, bool p_clear_region = true, bool p_begin = true, bool p_end = true, RenderingMethod::RenderInfo *p_render_info = nullptr, const Transform3D &p_main_cam_transform = Transform3D());
 	void _render_shadow_process();
 	void _render_shadow_end();
 
@@ -420,12 +420,12 @@ protected:
 	virtual RID _render_buffers_get_normal_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
 	virtual RID _render_buffers_get_velocity_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
 
-	virtual void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
-	virtual void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
+	virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
+	virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {}
 	virtual void environment_set_ssr_half_size(bool p_half_size) override {}
-	virtual void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) override {}
+	virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override {}
 
-	virtual void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) override {}
+	virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override {}
 	virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override {}
 
 	/* Geometry instance */
@@ -498,7 +498,7 @@ protected:
 			};
 		} sort;
 
-		RSE::PrimitiveType primitive = RSE::PRIMITIVE_MAX;
+		RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
 		uint32_t flags = 0;
 		uint32_t surface_index = 0;
 
@@ -566,8 +566,7 @@ protected:
 		virtual void set_use_lightmap(RID p_lightmap_instance, const Rect2 &p_lightmap_uv_scale, int p_lightmap_slice_index) override;
 		virtual void set_lightmap_capture(const Color *p_sh9) override;
 
-		virtual void clear_light_instances() override;
-		virtual void pair_light_instance(const RID p_light_instance, RSE::LightType light_type, uint32_t placement_idx) override;
+		virtual void pair_light_instances(const RID *p_light_instances, uint32_t p_light_instance_count) override;
 		virtual void pair_reflection_probe_instances(const RID *p_reflection_probe_instances, uint32_t p_reflection_probe_instance_count) override;
 		virtual void pair_decal_instances(const RID *p_decal_instances, uint32_t p_decal_instance_count) override;
 		virtual void pair_voxel_gi_instances(const RID *p_voxel_gi_instances, uint32_t p_voxel_gi_instance_count) override {}
@@ -575,9 +574,6 @@ protected:
 		virtual void set_softshadow_projector_pairing(bool p_softshadow, bool p_projector) override;
 	};
 
-	virtual uint32_t get_max_lights_total() override;
-	virtual uint32_t get_max_lights_per_mesh() override;
-
 	/* Rendering */
 
 	virtual void _render_scene(RenderDataRD *p_render_data, const Color &p_default_bg_color) override;
@@ -694,8 +690,8 @@ public:
 	void _geometry_instance_add_surface_with_material_chain(GeometryInstanceForwardMobile *ginstance, uint32_t p_surface, SceneShaderForwardMobile::MaterialData *p_material, RID p_mat_src, RID p_mesh);
 	void _geometry_instance_add_surface(GeometryInstanceForwardMobile *ginstance, uint32_t p_surface, RID p_material, RID p_mesh);
 	void _geometry_instance_update(RenderGeometryInstance *p_geometry_instance);
-	void _mesh_compile_pipeline_for_surface(SceneShaderForwardMobile::ShaderData *p_shader, void *p_mesh_surface, bool p_instanced_surface, RSE::PipelineSource p_source, SceneShaderForwardMobile::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
-	void _mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RSE::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
+	void _mesh_compile_pipeline_for_surface(SceneShaderForwardMobile::ShaderData *p_shader, void *p_mesh_surface, bool p_instanced_surface, RS::PipelineSource p_source, SceneShaderForwardMobile::ShaderData::PipelineKey &r_pipeline_key, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
+	void _mesh_compile_pipelines_for_surface(const SurfacePipelineData &p_surface, const GlobalPipelineData &p_global, RS::PipelineSource p_source, Vector<ShaderPipelinePair> *r_pipeline_pairs = nullptr);
 	void _mesh_generate_all_pipelines_for_surface_cache(GeometryInstanceSurfaceDataCache *p_surface_cache, const GlobalPipelineData &p_global);
 	void _update_dirty_geometry_instances();
 	void _update_dirty_geometry_pipelines();
@@ -714,7 +710,7 @@ public:
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) override;
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override;
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override;
 
 	/* SHADER LIBRARY */
 
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
index ba5a174b..8279cd63 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
@@ -29,10 +29,9 @@
 /**************************************************************************/
 
 #include "scene_shader_forward_mobile.h"
-
 #include "core/config/project_settings.h"
 #include "core/math/math_defs.h"
-#include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"
+#include "render_forward_mobile.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 
@@ -58,7 +57,7 @@ void SceneShaderForwardMobile::ShaderData::set_code(const String &p_code) {
 	depth_test_disabledi = 0;
 	depth_test_invertedi = 0;
 	alpha_antialiasing_mode = ALPHA_ANTIALIASING_OFF;
-	cull_mode = RSE::CULL_MODE_BACK;
+	cull_mode = RS::CULL_MODE_BACK;
 
 	uses_point_size = false;
 	uses_alpha = false;
@@ -112,9 +111,9 @@ void SceneShaderForwardMobile::ShaderData::set_code(const String &p_code) {
 	actions.render_mode_values["depth_test_disabled"] = Pair<int *, int>(&depth_test_disabledi, 1);
 	actions.render_mode_values["depth_test_inverted"] = Pair<int *, int>(&depth_test_invertedi, 1);
 
-	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_mode, RSE::CULL_MODE_DISABLED);
-	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_mode, RSE::CULL_MODE_FRONT);
-	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_mode, RSE::CULL_MODE_BACK);
+	actions.render_mode_values["cull_disabled"] = Pair<int *, int>(&cull_mode, RS::CULL_MODE_DISABLED);
+	actions.render_mode_values["cull_front"] = Pair<int *, int>(&cull_mode, RS::CULL_MODE_FRONT);
+	actions.render_mode_values["cull_back"] = Pair<int *, int>(&cull_mode, RS::CULL_MODE_BACK);
 
 	actions.render_mode_flags["unshaded"] = &unshaded;
 	actions.render_mode_flags["wireframe"] = &wireframe;
@@ -167,7 +166,7 @@ void SceneShaderForwardMobile::ShaderData::set_code(const String &p_code) {
 	actions.uniforms = &uniforms;
 
 	MutexLock lock(SceneShaderForwardMobile::singleton_mutex);
-	Error err = SceneShaderForwardMobile::singleton->compiler.compile(RSE::SHADER_SPATIAL, code, &actions, path, gen_code);
+	Error err = SceneShaderForwardMobile::singleton->compiler.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code);
 
 	if (err != OK) {
 		if (version.is_valid()) {
@@ -261,12 +260,12 @@ bool SceneShaderForwardMobile::ShaderData::casts_shadows() const {
 	return !has_alpha || (uses_depth_prepass_alpha && !(depth_draw == DEPTH_DRAW_DISABLED || depth_test != DEPTH_TEST_ENABLED));
 }
 
-RenderingServerTypes::ShaderNativeSourceCode SceneShaderForwardMobile::ShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode SceneShaderForwardMobile::ShaderData::get_native_source_code() const {
 	if (version.is_valid()) {
 		MutexLock lock(SceneShaderForwardMobile::singleton_mutex);
 		return SceneShaderForwardMobile::singleton->shader.version_get_native_source_code(version);
 	} else {
-		return RenderingServerTypes::ShaderNativeSourceCode();
+		return RS::ShaderNativeSourceCode();
 	}
 }
 
@@ -318,7 +317,7 @@ void SceneShaderForwardMobile::ShaderData::_create_pipeline(PipelineKey p_pipeli
 		}
 	}
 
-	RD::RenderPrimitive primitive_rd_table[RSE::PRIMITIVE_MAX] = {
+	RD::RenderPrimitive primitive_rd_table[RS::PRIMITIVE_MAX] = {
 		RD::RENDER_PRIMITIVE_POINTS,
 		RD::RENDER_PRIMITIVE_LINES,
 		RD::RENDER_PRIMITIVE_LINESTRIPS,
@@ -529,7 +528,7 @@ RendererRD::MaterialStorage::ShaderData *SceneShaderForwardMobile::_create_shade
 }
 
 void SceneShaderForwardMobile::MaterialData::set_render_priority(int p_priority) {
-	priority = p_priority - RSE::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
+	priority = p_priority - RS::MATERIAL_RENDER_PRIORITY_MIN; //8 bits
 }
 
 void SceneShaderForwardMobile::MaterialData::set_next_pass(RID p_pass) {
@@ -938,7 +937,7 @@ void SceneShaderForwardMobile::set_default_specialization(const ShaderSpecializa
 	}
 }
 
-uint32_t SceneShaderForwardMobile::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t SceneShaderForwardMobile::get_pipeline_compilations(RS::PipelineSource p_source) {
 	MutexLock lock(SceneShaderForwardMobile::singleton_mutex);
 	return pipeline_compilations[p_source];
 }
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
index 8d018f9e..f1d216ec 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
+#include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
 #include "servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/rendering_server_types.h"
 
 namespace RendererSceneRenderImplementation {
 
@@ -196,7 +195,7 @@ public:
 			RD::VertexFormatID vertex_format_id;
 			RD::FramebufferFormatID framebuffer_format_id;
 			RD::PolygonCullMode cull_mode = RD::POLYGON_CULL_MAX;
-			RSE::PrimitiveType primitive_type = RSE::PRIMITIVE_MAX;
+			RS::PrimitiveType primitive_type = RS::PRIMITIVE_MAX;
 			ShaderSpecialization shader_specialization = {};
 			ShaderVersion version = SHADER_VERSION_MAX;
 			uint32_t render_pass = 0;
@@ -241,7 +240,7 @@ public:
 		int depth_test_disabledi = 0;
 		int depth_test_invertedi = 0;
 		int alpha_antialiasing_mode = ALPHA_ANTIALIASING_OFF;
-		int cull_mode = RSE::CULL_MODE_BACK;
+		int cull_mode = RS::CULL_MODE_BACK;
 
 		bool uses_point_size = false;
 		bool uses_alpha = false;
@@ -297,14 +296,14 @@ public:
 		}
 
 		_FORCE_INLINE_ bool uses_shared_shadow_material() const {
-			bool backface_culling = cull_mode == RSE::CULL_MODE_BACK;
+			bool backface_culling = cull_mode == RS::CULL_MODE_BACK;
 			return !uses_particle_trails && !writes_modelview_or_projection && !uses_vertex && !uses_discard && !uses_depth_prepass_alpha && !uses_alpha_clip && !uses_alpha_antialiasing && !uses_point_size && !uses_world_coordinates && !wireframe && !stencil_enabled && backface_culling;
 		}
 
 		virtual void set_code(const String &p_Code);
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 		RD::PolygonCullMode get_cull_mode_from_cull_variant(CullVariant p_cull_variant);
 		void _clear_vertex_input_mask_cache();
@@ -375,11 +374,11 @@ public:
 
 	ShaderSpecialization default_specialization = {};
 
-	uint32_t pipeline_compilations[RSE::PIPELINE_SOURCE_MAX] = {};
+	uint32_t pipeline_compilations[RS::PIPELINE_SOURCE_MAX] = {};
 
 	void init(const String p_defines);
 	void set_default_specialization(const ShaderSpecialization &p_specialization);
-	uint32_t get_pipeline_compilations(RSE::PipelineSource p_source);
+	uint32_t get_pipeline_compilations(RS::PipelineSource p_source);
 	void enable_fp32_shader_group();
 	void enable_fp16_shader_group();
 	void enable_multiview_shader_group();
diff --git a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
index 4e45779a..ec037b71 100644
--- a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
@@ -30,9 +30,6 @@
 
 #include "framebuffer_cache_rd.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_device_binds.h"
-
 FramebufferCacheRD *FramebufferCacheRD::singleton = nullptr;
 
 void FramebufferCacheRD::_bind_methods() {
diff --git a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
index 839b5b40..383e231a 100644
--- a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
+++ b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
@@ -33,6 +33,7 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 class FramebufferCacheRD : public Object {
 	GDCLASS(FramebufferCacheRD, Object)
diff --git a/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h b/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
index 18a5ef6d..2b98e5be 100644
--- a/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
+++ b/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
@@ -30,16 +30,8 @@
 
 #pragma once
 
-#include "core/object/worker_thread_pool.h"
-#include "core/os/mutex.h"
-#include "core/templates/hash_map.h"
-#include "core/templates/local_vector.h"
-#include "core/templates/rb_map.h"
-#include "core/templates/rb_set.h"
-#include "core/templates/rid.h"
-#include "core/templates/vector.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 #define PRINT_PIPELINE_COMPILATION_KEYS 0
 
@@ -107,7 +99,7 @@ public:
 	}
 
 	// Start compilation of a pipeline ahead of time in the background. Returns true if the compilation was started, false if it wasn't required. Source is only used for collecting statistics.
-	void compile_pipeline(const Key &p_key, uint32_t p_key_hash, RSE::PipelineSource p_source, bool p_high_priority) {
+	void compile_pipeline(const Key &p_key, uint32_t p_key_hash, RS::PipelineSource p_source, bool p_high_priority) {
 		DEV_ASSERT((creation_object != nullptr) && (creation_function != nullptr) && "Creation object and function was not set before attempting to compile a pipeline.");
 
 		MutexLock local_lock(local_mutex);
@@ -127,19 +119,19 @@ public:
 #if PRINT_PIPELINE_COMPILATION_KEYS
 		String source_name = "UNKNOWN";
 		switch (p_source) {
-			case RSE::PIPELINE_SOURCE_CANVAS:
+			case RS::PIPELINE_SOURCE_CANVAS:
 				source_name = "CANVAS";
 				break;
-			case RSE::PIPELINE_SOURCE_MESH:
+			case RS::PIPELINE_SOURCE_MESH:
 				source_name = "MESH";
 				break;
-			case RSE::PIPELINE_SOURCE_SURFACE:
+			case RS::PIPELINE_SOURCE_SURFACE:
 				source_name = "SURFACE";
 				break;
-			case RSE::PIPELINE_SOURCE_DRAW:
+			case RS::PIPELINE_SOURCE_DRAW:
 				source_name = "DRAW";
 				break;
-			case RSE::PIPELINE_SOURCE_SPECIALIZATION:
+			case RS::PIPELINE_SOURCE_SPECIALIZATION:
 				source_name = "SPECIALIZATION";
 				break;
 		}
@@ -176,7 +168,7 @@ public:
 	}
 
 	// Retrieve a pipeline. It'll return an empty pipeline if it's not available yet, but it'll be guaranteed to succeed if 'wait for compilation' is true and stall as necessary. Source is just an optional number to aid debugging.
-	RID get_pipeline(const Key &p_key, uint32_t p_key_hash, bool p_wait_for_compilation, RSE::PipelineSource p_source) {
+	RID get_pipeline(const Key &p_key, uint32_t p_key_hash, bool p_wait_for_compilation, RS::PipelineSource p_source) {
 		RBMap<uint32_t, RID>::Element *e = hash_map.find(p_key_hash);
 
 		if (e == nullptr) {
diff --git a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
index 489970a3..87e6ecaa 100644
--- a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
@@ -30,7 +30,6 @@
 
 #include "renderer_canvas_render_rd.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/math_defs.h"
@@ -143,7 +142,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32_SFLOAT;
 			vd.offset = base_offset * sizeof(float);
-			vd.location = RSE::ARRAY_VERTEX;
+			vd.location = RS::ARRAY_VERTEX;
 			vd.stride = stride * sizeof(float);
 
 			descriptions.write[0] = vd;
@@ -163,7 +162,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
 			vd.offset = base_offset * sizeof(float);
-			vd.location = RSE::ARRAY_COLOR;
+			vd.location = RS::ARRAY_COLOR;
 			vd.stride = stride * sizeof(float);
 
 			descriptions.write[1] = vd;
@@ -191,7 +190,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
 			vd.offset = 0;
-			vd.location = RSE::ARRAY_COLOR;
+			vd.location = RS::ARRAY_COLOR;
 			vd.stride = 0;
 
 			descriptions.write[1] = vd;
@@ -203,7 +202,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32_SFLOAT;
 			vd.offset = base_offset * sizeof(float);
-			vd.location = RSE::ARRAY_TEX_UV;
+			vd.location = RS::ARRAY_TEX_UV;
 			vd.stride = stride * sizeof(float);
 
 			descriptions.write[2] = vd;
@@ -219,7 +218,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32_SFLOAT;
 			vd.offset = 0;
-			vd.location = RSE::ARRAY_TEX_UV;
+			vd.location = RS::ARRAY_TEX_UV;
 			vd.stride = 0;
 
 			descriptions.write[2] = vd;
@@ -231,7 +230,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R16G16B16A16_UINT;
 			vd.offset = base_offset * sizeof(float);
-			vd.location = RSE::ARRAY_BONES;
+			vd.location = RS::ARRAY_BONES;
 			vd.stride = stride * sizeof(float);
 
 			descriptions.write[3] = vd;
@@ -252,7 +251,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32B32A32_UINT;
 			vd.offset = 0;
-			vd.location = RSE::ARRAY_BONES;
+			vd.location = RS::ARRAY_BONES;
 			vd.stride = 0;
 
 			descriptions.write[3] = vd;
@@ -264,7 +263,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R16G16B16A16_UNORM;
 			vd.offset = base_offset * sizeof(float);
-			vd.location = RSE::ARRAY_WEIGHTS;
+			vd.location = RS::ARRAY_WEIGHTS;
 			vd.stride = stride * sizeof(float);
 
 			descriptions.write[4] = vd;
@@ -285,7 +284,7 @@ RendererCanvasRender::PolygonID RendererCanvasRenderRD::request_polygon(const Ve
 			RD::VertexAttribute vd;
 			vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
 			vd.offset = 0;
-			vd.location = RSE::ARRAY_WEIGHTS;
+			vd.location = RS::ARRAY_WEIGHTS;
 			vd.stride = 0;
 
 			descriptions.write[4] = vd;
@@ -353,26 +352,26 @@ void RendererCanvasRenderRD::free_polygon(PolygonID p_polygon) {
 
 ////////////////////
 
-static RD::RenderPrimitive _primitive_type_to_render_primitive(RSE::PrimitiveType p_primitive) {
+static RD::RenderPrimitive _primitive_type_to_render_primitive(RS::PrimitiveType p_primitive) {
 	switch (p_primitive) {
-		case RSE::PRIMITIVE_POINTS:
+		case RS::PRIMITIVE_POINTS:
 			return RD::RENDER_PRIMITIVE_POINTS;
-		case RSE::PRIMITIVE_LINES:
+		case RS::PRIMITIVE_LINES:
 			return RD::RENDER_PRIMITIVE_LINES;
-		case RSE::PRIMITIVE_LINE_STRIP:
+		case RS::PRIMITIVE_LINE_STRIP:
 			return RD::RENDER_PRIMITIVE_LINESTRIPS;
-		case RSE::PRIMITIVE_TRIANGLES:
+		case RS::PRIMITIVE_TRIANGLES:
 			return RD::RENDER_PRIMITIVE_TRIANGLES;
-		case RSE::PRIMITIVE_TRIANGLE_STRIP:
+		case RS::PRIMITIVE_TRIANGLE_STRIP:
 			return RD::RENDER_PRIMITIVE_TRIANGLE_STRIPS;
 		default:
 			return RD::RENDER_PRIMITIVE_MAX;
 	}
 }
 
-_FORCE_INLINE_ static uint32_t _indices_to_primitives(RSE::PrimitiveType p_primitive, uint32_t p_indices) {
-	static const uint32_t divisor[RSE::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RSE::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
+_FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
+	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
@@ -493,7 +492,7 @@ RID RendererCanvasRenderRD::_get_pipeline_specialization_or_ubershader(CanvasSha
 		}
 
 		bool wait_for_compilation = r_pipeline_key.ubershader || ubershader_iterations == 1;
-		RSE::PipelineSource source = RSE::PIPELINE_SOURCE_CANVAS;
+		RS::PipelineSource source = RS::PIPELINE_SOURCE_CANVAS;
 		RID pipeline = p_shader_data->pipeline_hash_map.get_pipeline(r_pipeline_key, r_pipeline_key.hash(), wait_for_compilation, source);
 		if (pipeline.is_valid()) {
 			return pipeline;
@@ -506,7 +505,7 @@ RID RendererCanvasRenderRD::_get_pipeline_specialization_or_ubershader(CanvasSha
 	return RID();
 }
 
-void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RenderingServer::CanvasItemTextureFilter p_default_filter, RenderingServer::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info) {
 	RendererRD::TextureStorage *texture_storage = RendererRD::TextureStorage::get_singleton();
 	RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
@@ -820,10 +819,10 @@ void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p
 				_render_batch_items(to_render_target, item_count, canvas_transform_inverse, p_light_list, r_sdf_used, false, r_render_info);
 				item_count = 0;
 
-				if (ci->canvas_group_owner->canvas_group->mode != RSE::CANVAS_GROUP_MODE_TRANSPARENT) {
+				if (ci->canvas_group_owner->canvas_group->mode != RS::CANVAS_GROUP_MODE_TRANSPARENT) {
 					Rect2i group_rect = ci->canvas_group_owner->global_rect_cache;
 					texture_storage->render_target_copy_to_back_buffer(p_to_render_target, group_rect, false);
-					if (ci->canvas_group_owner->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+					if (ci->canvas_group_owner->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 						ci->canvas_group_owner->use_canvas_group = false;
 						items[item_count++] = ci->canvas_group_owner;
 					}
@@ -839,7 +838,7 @@ void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p
 			ci->canvas_group_owner = nullptr; //must be cleared
 		}
 
-		if (canvas_group_owner == nullptr && ci->canvas_group != nullptr && ci->canvas_group->mode != RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+		if (canvas_group_owner == nullptr && ci->canvas_group != nullptr && ci->canvas_group->mode != RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 			skip_item = true;
 		}
 
@@ -1003,7 +1002,7 @@ void RendererCanvasRenderRD::_update_occluder_buffer(uint32_t p_size) {
 
 	if (p_size > state.shadow_occluder_buffer_size) {
 		needs_update = true;
-		state.shadow_occluder_buffer_size = Math::next_power_of_2(p_size);
+		state.shadow_occluder_buffer_size = next_power_of_2(p_size);
 		if (state.shadow_occluder_buffer.is_valid()) {
 			RD::get_singleton()->free_rid(state.shadow_occluder_buffer);
 		}
@@ -1279,7 +1278,7 @@ RID RendererCanvasRenderRD::occluder_polygon_create() {
 	occluder.line_point_count = 0;
 	occluder.sdf_point_count = 0;
 	occluder.sdf_index_count = 0;
-	occluder.cull_mode = RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
+	occluder.cull_mode = RS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
 	return occluder_polygon_owner.make_rid(occluder);
 }
 
@@ -1475,7 +1474,7 @@ void RendererCanvasRenderRD::occluder_polygon_set_shape(RID p_occluder, const Ve
 	}
 }
 
-void RendererCanvasRenderRD::occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) {
+void RendererCanvasRenderRD::occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) {
 	OccluderPolygon *oc = occluder_polygon_owner.get_or_null(p_occluder);
 	ERR_FAIL_NULL(oc);
 	oc->cull_mode = p_mode;
@@ -1579,7 +1578,7 @@ void RendererCanvasRenderRD::CanvasShaderData::set_code(const String &p_code) {
 	RendererCanvasRenderRD *canvas_singleton = static_cast<RendererCanvasRenderRD *>(RendererCanvasRender::singleton);
 	MutexLock lock(canvas_singleton->shader.mutex);
 
-	Error err = canvas_singleton->shader.compiler.compile(RSE::SHADER_CANVAS_ITEM, code, &actions, path, gen_code);
+	Error err = canvas_singleton->shader.compiler.compile(RS::SHADER_CANVAS_ITEM, code, &actions, path, gen_code);
 	if (err != OK) {
 		if (version.is_valid()) {
 			canvas_singleton->shader.canvas_shader.version_free(version);
@@ -1629,7 +1628,7 @@ bool RendererCanvasRenderRD::CanvasShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode RendererCanvasRenderRD::CanvasShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode RendererCanvasRenderRD::CanvasShaderData::get_native_source_code() const {
 	RendererCanvasRenderRD *canvas_singleton = static_cast<RendererCanvasRenderRD *>(RendererCanvasRender::singleton);
 	MutexLock lock(canvas_singleton->shader.mutex);
 	return canvas_singleton->shader.canvas_shader.version_get_native_source_code(version);
@@ -1731,8 +1730,8 @@ RendererCanvasRenderRD::RendererCanvasRenderRD() {
 
 	{ //create default samplers
 
-		default_samplers.default_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-		default_samplers.default_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
+		default_samplers.default_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
+		default_samplers.default_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
 	}
 
 	// preallocate slots for uniform set 3
@@ -2147,7 +2146,7 @@ bool RendererCanvasRenderRD::free(RID p_rid) {
 }
 
 void RendererCanvasRenderRD::set_shadow_texture_size(int p_size) {
-	p_size = MAX(1, Math::nearest_power_of_2_templated(p_size));
+	p_size = MAX(1, nearest_power_of_2_templated(p_size));
 	if (p_size == state.shadow_texture_size) {
 		return;
 	}
@@ -2177,13 +2176,13 @@ void RendererCanvasRenderRD::set_debug_redraw(bool p_enabled, double p_time, con
 	debug_redraw_color = p_color;
 }
 
-uint32_t RendererCanvasRenderRD::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t RendererCanvasRenderRD::get_pipeline_compilations(RS::PipelineSource p_source) {
 	RendererCanvasRenderRD *canvas_singleton = static_cast<RendererCanvasRenderRD *>(RendererCanvasRender::singleton);
 	MutexLock lock(canvas_singleton->shader.mutex);
 	return shader.pipeline_compilations[p_source];
 }
 
-void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer, RenderingMethod::RenderInfo *r_render_info) {
 	// Record batches
 	{
 		RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
@@ -2206,11 +2205,11 @@ void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target
 			RID material = ci->material_owner == nullptr ? ci->material : ci->material_owner->material;
 
 			if (ci->use_canvas_group) {
-				if (ci->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
+				if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_AND_DRAW) {
 					material = default_clip_children_material;
 				} else {
 					if (material.is_null()) {
-						if (ci->canvas_group->mode == RSE::CANVAS_GROUP_MODE_CLIP_ONLY) {
+						if (ci->canvas_group->mode == RS::CANVAS_GROUP_MODE_CLIP_ONLY) {
 							material = default_clip_children_material;
 						} else {
 							material = default_canvas_group_material;
@@ -2341,8 +2340,8 @@ void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target
 }
 
 void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTarget p_render_target, const Transform2D &p_base_transform, Item *&r_current_clip, Light *p_lights, bool &r_batch_broken, bool &r_sdf_used, Batch *&r_current_batch) {
-	const RSE::CanvasItemTextureFilter texture_filter = p_item->texture_filter == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? default_filter : p_item->texture_filter;
-	const RSE::CanvasItemTextureRepeat texture_repeat = p_item->texture_repeat == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? default_repeat : p_item->texture_repeat;
+	const RenderingServer::CanvasItemTextureFilter texture_filter = p_item->texture_filter == RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? default_filter : p_item->texture_filter;
+	const RenderingServer::CanvasItemTextureRepeat texture_repeat = p_item->texture_repeat == RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? default_repeat : p_item->texture_repeat;
 
 	Transform2D base_transform = p_base_transform;
 
@@ -2418,9 +2417,9 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
 					r_current_batch->flags = 0;
 				}
 
-				RSE::CanvasItemTextureRepeat rect_repeat = texture_repeat;
+				RenderingServer::CanvasItemTextureRepeat rect_repeat = texture_repeat;
 				if (bool(rect->flags & CANVAS_RECT_TILE)) {
-					rect_repeat = RSE::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED;
+					rect_repeat = RenderingServer::CanvasItemTextureRepeat::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED;
 				}
 
 				Color modulated = rect->modulate * base_color;
@@ -2636,8 +2635,8 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
 
 				// pipeline variant
 				{
-					ERR_CONTINUE(polygon->primitive < 0 || polygon->primitive >= RSE::PRIMITIVE_MAX);
-					r_current_batch->shader_variant = polygon->primitive == RSE::PRIMITIVE_POINTS ? SHADER_VARIANT_ATTRIBUTES_POINTS : SHADER_VARIANT_ATTRIBUTES;
+					ERR_CONTINUE(polygon->primitive < 0 || polygon->primitive >= RS::PRIMITIVE_MAX);
+					r_current_batch->shader_variant = polygon->primitive == RS::PRIMITIVE_POINTS ? SHADER_VARIANT_ATTRIBUTES_POINTS : SHADER_VARIANT_ATTRIBUTES;
 					r_current_batch->render_primitive = _primitive_type_to_render_primitive(polygon->primitive);
 				}
 
@@ -2773,7 +2772,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
 					const Item::CommandMultiMesh *mm = static_cast<const Item::CommandMultiMesh *>(c);
 					RID multimesh = mm->multimesh;
 
-					if (mesh_storage->multimesh_get_transform_format(multimesh) != RSE::MULTIMESH_TRANSFORM_2D) {
+					if (mesh_storage->multimesh_get_transform_format(multimesh) != RS::MULTIMESH_TRANSFORM_2D) {
 						break;
 					}
 
@@ -3004,7 +3003,7 @@ void RendererCanvasRenderRD::_canvas_texture_invalidation_callback(bool p_delete
 	}
 }
 
-void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasShaderData *p_shader_data, RenderingDevice::FramebufferFormatID p_framebuffer_format, Light *p_lights, Batch const *p_batch, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasShaderData *p_shader_data, RenderingDevice::FramebufferFormatID p_framebuffer_format, Light *p_lights, Batch const *p_batch, RenderingMethod::RenderInfo *r_render_info) {
 	{
 		RendererRD::TextureStorage *ts = RendererRD::TextureStorage::get_singleton();
 
@@ -3075,9 +3074,9 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 			RD::get_singleton()->draw_list_draw(p_draw_list, true, p_batch->instance_count);
 
 			if (r_render_info) {
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += p_batch->instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += 2 * p_batch->instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += p_batch->instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += 2 * p_batch->instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 		} break;
 
@@ -3102,9 +3101,9 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 
 			RD::get_singleton()->draw_list_draw(p_draw_list, pb->indices.is_valid());
 			if (r_render_info) {
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(polygon->primitive, pb->primitive_count);
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(polygon->primitive, pb->primitive_count);
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 		} break;
 
@@ -3127,10 +3126,10 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 			RD::get_singleton()->draw_list_draw(p_draw_list, true, instance_count);
 
 			if (r_render_info) {
-				const RSE::PrimitiveType rs_primitive[5] = { RSE::PRIMITIVE_POINTS, RSE::PRIMITIVE_POINTS, RSE::PRIMITIVE_LINES, RSE::PRIMITIVE_TRIANGLES, RSE::PRIMITIVE_TRIANGLES };
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(rs_primitive[p_batch->primitive_points], p_batch->primitive_points) * instance_count;
-				r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+				const RenderingServer::PrimitiveType rs_primitive[5] = { RS::PRIMITIVE_POINTS, RS::PRIMITIVE_POINTS, RS::PRIMITIVE_LINES, RS::PRIMITIVE_TRIANGLES, RS::PRIMITIVE_TRIANGLES };
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(rs_primitive[p_batch->primitive_points], p_batch->primitive_points) * instance_count;
+				r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 			}
 		} break;
 
@@ -3163,7 +3162,7 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 				RID particles = pt->particles;
 				mesh = particles_storage->particles_get_draw_pass_mesh(particles, 0);
 
-				ERR_BREAK(particles_storage->particles_get_mode(particles) != RSE::PARTICLES_MODE_2D);
+				ERR_BREAK(particles_storage->particles_get_mode(particles) != RS::PARTICLES_MODE_2D);
 				particles_storage->particles_request_process(particles);
 
 				if (particles_storage->particles_is_inactive(particles)) {
@@ -3190,11 +3189,11 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 			for (uint32_t j = 0; j < surf_count; j++) {
 				void *surface = mesh_storage->mesh_get_surface(mesh, j);
 
-				RSE::PrimitiveType primitive = mesh_storage->mesh_surface_get_primitive(surface);
-				ERR_CONTINUE(primitive < 0 || primitive >= RSE::PRIMITIVE_MAX);
+				RS::PrimitiveType primitive = mesh_storage->mesh_surface_get_primitive(surface);
+				ERR_CONTINUE(primitive < 0 || primitive >= RS::PRIMITIVE_MAX);
 
 				RID vertex_array;
-				pipeline_key.variant = primitive == RSE::PRIMITIVE_POINTS ? SHADER_VARIANT_ATTRIBUTES_POINTS : SHADER_VARIANT_ATTRIBUTES;
+				pipeline_key.variant = primitive == RS::PRIMITIVE_POINTS ? SHADER_VARIANT_ATTRIBUTES_POINTS : SHADER_VARIANT_ATTRIBUTES;
 				pipeline_key.render_primitive = _primitive_type_to_render_primitive(primitive);
 				pipeline_key.vertex_format_id = RD::INVALID_FORMAT_ID;
 
@@ -3213,9 +3212,9 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 				RD::get_singleton()->draw_list_draw(p_draw_list, index_array.is_valid(), p_batch->mesh_instance_count);
 
 				if (r_render_info) {
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(primitive, mesh_storage->mesh_surface_get_vertices_drawn_count(surface)) * p_batch->mesh_instance_count;
-					r_render_info->info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME]++;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] += _indices_to_primitives(primitive, mesh_storage->mesh_surface_get_vertices_drawn_count(surface)) * p_batch->mesh_instance_count;
+					r_render_info->info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME]++;
 				}
 			}
 		} break;
diff --git a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
index dbdddafe..12b2b395 100644
--- a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
@@ -38,7 +38,6 @@
 #include "servers/rendering/renderer_rd/shaders/canvas_occlusion.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 
 class RendererCanvasRenderRD : public RendererCanvasRender {
@@ -170,7 +169,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 		virtual void set_code(const String &p_Code);
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 		RID get_shader(ShaderVariant p_shader_variant, bool p_ubershader) const;
 		uint64_t get_vertex_input_mask(ShaderVariant p_shader_variant, bool p_ubershader);
@@ -190,7 +189,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 		RD::VertexFormatID quad_vertex_format_id;
 		RD::VertexFormatID primitive_vertex_format_id;
 		ShaderCompiler compiler;
-		uint32_t pipeline_compilations[RSE::PIPELINE_SOURCE_MAX] = {};
+		uint32_t pipeline_compilations[RS::PIPELINE_SOURCE_MAX] = {};
 		Mutex mutex;
 	} shader;
 
@@ -220,8 +219,8 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 	/**************************/
 
 	struct {
-		RSE::CanvasItemTextureFilter default_filter;
-		RSE::CanvasItemTextureRepeat default_repeat;
+		RS::CanvasItemTextureFilter default_filter;
+		RS::CanvasItemTextureRepeat default_repeat;
 	} default_samplers;
 
 	/******************/
@@ -290,7 +289,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 	};
 
 	struct OccluderPolygon {
-		RSE::CanvasOccluderPolygonCullMode cull_mode;
+		RS::CanvasOccluderPolygonCullMode cull_mode;
 		int line_point_count;
 		RID vertex_buffer;
 		RID vertex_array;
@@ -423,7 +422,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 
 		TextureState() {}
 
-		TextureState(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat, bool p_texture_is_data, bool p_use_linear_colors) {
+		TextureState(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, bool p_texture_is_data, bool p_use_linear_colors) {
 			texture = p_texture;
 			other = (((uint32_t)p_base_filter & FILTER_MASK) << FILTER_SHIFT) |
 					(((uint32_t)p_base_repeat & REPEAT_MASK) << REPEAT_SHIFT) |
@@ -431,12 +430,12 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 					(((uint32_t)p_use_linear_colors & LINEAR_COLORS_MASK) << LINEAR_COLORS_SHIFT);
 		}
 
-		_ALWAYS_INLINE_ RSE::CanvasItemTextureFilter texture_filter() const {
-			return (RSE::CanvasItemTextureFilter)((other >> FILTER_SHIFT) & FILTER_MASK);
+		_ALWAYS_INLINE_ RS::CanvasItemTextureFilter texture_filter() const {
+			return (RS::CanvasItemTextureFilter)((other >> FILTER_SHIFT) & FILTER_MASK);
 		}
 
-		_ALWAYS_INLINE_ RSE::CanvasItemTextureRepeat texture_repeat() const {
-			return (RSE::CanvasItemTextureRepeat)((other >> REPEAT_SHIFT) & REPEAT_MASK);
+		_ALWAYS_INLINE_ RS::CanvasItemTextureRepeat texture_repeat() const {
+			return (RS::CanvasItemTextureRepeat)((other >> REPEAT_SHIFT) & REPEAT_MASK);
 		}
 
 		_ALWAYS_INLINE_ bool linear_colors() const {
@@ -656,8 +655,8 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 	RID default_clip_children_material;
 	RID default_clip_children_shader;
 
-	RSE::CanvasItemTextureFilter default_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-	RSE::CanvasItemTextureRepeat default_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
+	RS::CanvasItemTextureFilter default_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
+	RS::CanvasItemTextureRepeat default_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
 
 	RID _create_base_uniform_set(RID p_to_render_target, bool p_backbuffer);
 
@@ -673,9 +672,9 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 	};
 
 	inline RID _get_pipeline_specialization_or_ubershader(CanvasShaderData *p_shader_data, PipelineKey &r_pipeline_key, PushConstant &r_push_constant, RID p_mesh_instance = RID(), void *p_surface = nullptr, uint32_t p_surface_index = 0, RID *r_vertex_array = nullptr);
-	void _render_batch_items(RenderTarget p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer = false, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void _render_batch_items(RenderTarget p_to_render_target, int p_item_count, const Transform2D &p_canvas_transform_inverse, Light *p_lights, bool &r_sdf_used, bool p_to_backbuffer = false, RenderingMethod::RenderInfo *r_render_info = nullptr);
 	void _record_item_commands(const Item *p_item, RenderTarget p_render_target, const Transform2D &p_base_transform, Item *&r_current_clip, Light *p_lights, bool &r_batch_broken, bool &r_sdf_used, Batch *&r_current_batch);
-	void _render_batch(RD::DrawListID p_draw_list, CanvasShaderData *p_shader_data, RenderingDevice::FramebufferFormatID p_framebuffer_format, Light *p_lights, Batch const *p_batch, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void _render_batch(RD::DrawListID p_draw_list, CanvasShaderData *p_shader_data, RenderingDevice::FramebufferFormatID p_framebuffer_format, Light *p_lights, Batch const *p_batch, RenderingMethod::RenderInfo *r_render_info = nullptr);
 	void _prepare_batch_texture_info(RID p_texture, TextureState &p_state, TextureInfo *p_info);
 
 	// non-UMA
@@ -707,14 +706,14 @@ public:
 
 	RID occluder_polygon_create() override;
 	void occluder_polygon_set_shape(RID p_occluder, const Vector<Vector2> &p_points, bool p_closed) override;
-	void occluder_polygon_set_cull_mode(RID p_occluder, RSE::CanvasOccluderPolygonCullMode p_mode) override;
+	void occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) override;
 
-	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RSE::CanvasItemTextureFilter p_default_filter, RSE::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingServerTypes::RenderInfo *r_render_info = nullptr) override;
+	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_light_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used, RenderingMethod::RenderInfo *r_render_info = nullptr) override;
 
 	virtual void set_shadow_texture_size(int p_size) override;
 
 	void set_debug_redraw(bool p_enabled, double p_time, const Color &p_color) override;
-	uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) override;
+	uint32_t get_pipeline_compilations(RS::PipelineSource p_source) override;
 
 	void set_time(double p_time);
 	void update() override;
diff --git a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
index 06535cfb..517d8337 100644
--- a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
@@ -30,33 +30,22 @@
 
 #include "renderer_compositor_rd.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/os/os.h"
-#include "servers/display/display_server.h"
+
 #include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
 #include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"
-#include "servers/rendering/rendering_server_types.h"
 
-void RendererCompositorRD::blit_render_targets_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount) {
+void RendererCompositorRD::blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount) {
 	Error err = RD::get_singleton()->screen_prepare_for_drawing(p_screen);
 	if (err != OK) {
 		// Window is minimized and does not have valid swapchain, skip drawing without printing errors.
 		return;
 	}
 
-	BlitPipelines blit_pipelines = _get_blit_pipelines_for_format(RD::get_singleton()->screen_get_framebuffer_format(p_screen));
-
 	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin_for_screen(p_screen);
 	ERR_FAIL_COND(draw_list == RD::INVALID_ID);
 
-	const RD::ColorSpace color_space = RD::get_singleton()->screen_get_color_space(p_screen);
-	const float reference_luminance = RD::get_singleton()->get_context_driver()->window_get_hdr_output_reference_luminance(p_screen);
-	const float linear_luminance_scale = RD::get_singleton()->get_context_driver()->window_get_hdr_output_linear_luminance_scale(p_screen);
-	const float output_max_value = RD::get_singleton()->get_context_driver()->window_get_output_max_linear_value(p_screen);
-	const float reference_multiplier = _compute_reference_multiplier(color_space, reference_luminance, linear_luminance_scale);
-
 	for (int i = 0; i < p_amount; i++) {
 		RID rd_texture = texture_storage->render_target_get_rd_texture(p_render_targets[i].render_target);
 		ERR_CONTINUE(rd_texture.is_null());
@@ -77,8 +66,7 @@ void RendererCompositorRD::blit_render_targets_to_screen(DisplayServerEnums::Win
 
 		Size2 screen_size(RD::get_singleton()->screen_get_width(p_screen), RD::get_singleton()->screen_get_height(p_screen));
 		BlitMode mode = p_render_targets[i].lens_distortion.apply ? BLIT_MODE_LENS : (p_render_targets[i].multi_view.use_layer ? BLIT_MODE_USE_LAYER : BLIT_MODE_NORMAL);
-
-		RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, blit_pipelines.pipelines[mode]);
+		RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, blit.pipelines[mode]);
 		RD::get_singleton()->draw_list_bind_index_array(draw_list, blit.array);
 		RD::get_singleton()->draw_list_bind_uniform_set(draw_list, it->value, 0);
 
@@ -107,11 +95,8 @@ void RendererCompositorRD::blit_render_targets_to_screen(DisplayServerEnums::Win
 		blit.push_constant.k2 = p_render_targets[i].lens_distortion.k2;
 		blit.push_constant.upscale = p_render_targets[i].lens_distortion.upscale;
 		blit.push_constant.aspect_ratio = p_render_targets[i].lens_distortion.aspect_ratio;
-		blit.push_constant.source_is_srgb = !texture_storage->render_target_is_using_hdr(p_render_targets[i].render_target);
+		blit.push_constant.convert_to_srgb = texture_storage->render_target_is_using_hdr(p_render_targets[i].render_target);
 		blit.push_constant.use_debanding = texture_storage->render_target_is_using_debanding(p_render_targets[i].render_target);
-		blit.push_constant.target_color_space = color_space;
-		blit.push_constant.reference_multiplier = reference_multiplier;
-		blit.push_constant.output_max_value = output_max_value;
 
 		RD::get_singleton()->draw_list_set_push_constant(draw_list, &blit.push_constant, sizeof(BlitPushConstant));
 		RD::get_singleton()->draw_list_draw(draw_list, true);
@@ -146,8 +131,16 @@ void RendererCompositorRD::initialize() {
 		blit_modes.push_back("\n");
 
 		blit.shader.initialize(blit_modes);
+
 		blit.shader_version = blit.shader.version_create();
 
+		for (int i = 0; i < BLIT_MODE_MAX; i++) {
+			blit.pipelines[i] = RD::get_singleton()->render_pipeline_create(blit.shader.version_get_shader(blit.shader_version, i), RD::get_singleton()->screen_get_framebuffer_format(DisplayServer::MAIN_WINDOW_ID), RD::INVALID_ID, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), RD::PipelineDepthStencilState(), i == BLIT_MODE_NORMAL_ALPHA ? RenderingDevice::PipelineColorBlendState::create_blend() : RenderingDevice::PipelineColorBlendState::create_disabled(), 0);
+
+			// Unload shader modules to save memory.
+			RD::get_singleton()->shader_destroy_modules(blit.shader.version_get_shader(blit.shader_version, i));
+		}
+
 		//create index array for copy shader
 		Vector<uint8_t> pv;
 		pv.resize(6 * 2);
@@ -171,7 +164,6 @@ void RendererCompositorRD::initialize() {
 uint64_t RendererCompositorRD::frame = 1;
 
 void RendererCompositorRD::finalize() {
-	texture_storage->_tex_blit_shader_free();
 	memdelete(scene);
 	memdelete(canvas);
 	memdelete(fog);
@@ -188,42 +180,17 @@ void RendererCompositorRD::finalize() {
 	RD::get_singleton()->free_rid(blit.sampler);
 }
 
-RendererCompositorRD::BlitPipelines RendererCompositorRD::_get_blit_pipelines_for_format(RenderingDevice::FramebufferFormatID format) {
-	HashMap<RenderingDevice::FramebufferFormatID, BlitPipelines>::Iterator it = blit.pipelines_by_format.find(format);
-	if (it != blit.pipelines_by_format.end()) {
-		return it->value;
-	}
-
-	BlitPipelines pipelines;
-	for (int i = 0; i < BLIT_MODE_MAX; i++) {
-		pipelines.pipelines[i] = RD::get_singleton()->render_pipeline_create(blit.shader.version_get_shader(blit.shader_version, i), format, RD::INVALID_ID, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), RD::PipelineDepthStencilState(), i == BLIT_MODE_NORMAL_ALPHA ? RenderingDevice::PipelineColorBlendState::create_blend() : RenderingDevice::PipelineColorBlendState::create_disabled(), 0);
-	}
-	blit.pipelines_by_format.insert(format, pipelines);
-	return pipelines;
-}
-
-float RendererCompositorRD::_compute_reference_multiplier(RD::ColorSpace p_color_space, const float p_reference_luminance, const float p_linear_luminance_scale) {
-	switch (p_color_space) {
-		case RD::COLOR_SPACE_REC709_LINEAR:
-			return p_reference_luminance / p_linear_luminance_scale;
-		default:
-			return 1.0f;
-	}
-}
-
-void RendererCompositorRD::set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter) {
+void RendererCompositorRD::set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter) {
 	if (p_image.is_null() || p_image->is_empty()) {
 		return;
 	}
 
-	Error err = RD::get_singleton()->screen_prepare_for_drawing(DisplayServerEnums::MAIN_WINDOW_ID);
+	Error err = RD::get_singleton()->screen_prepare_for_drawing(DisplayServer::MAIN_WINDOW_ID);
 	if (err != OK) {
 		// Window is minimized and does not have valid swapchain, skip drawing without printing errors.
 		return;
 	}
 
-	BlitPipelines blit_pipelines = _get_blit_pipelines_for_format(RD::get_singleton()->screen_get_framebuffer_format(DisplayServerEnums::MAIN_WINDOW_ID));
-
 	RID texture = texture_storage->texture_allocate();
 	texture_storage->texture_2d_initialize(texture, p_image);
 	RID rd_texture = texture_storage->texture_get_rd_texture(texture, false);
@@ -248,33 +215,19 @@ void RendererCompositorRD::set_boot_image_with_stretch(const Ref<Image> &p_image
 
 	Size2 window_size = DisplayServer::get_singleton()->window_get_size();
 
-	Rect2 screenrect = RenderingServerTypes::get_splash_stretched_screen_rect(p_image->get_size(), window_size, p_stretch_mode);
+	Rect2 screenrect = RenderingServer::get_splash_stretched_screen_rect(p_image->get_size(), window_size, p_stretch_mode);
 	screenrect.position /= window_size;
 	screenrect.size /= window_size;
 
-	const RD::ColorSpace color_space = RD::get_singleton()->screen_get_color_space(DisplayServerEnums::MAIN_WINDOW_ID);
-	const float reference_luminance = RD::get_singleton()->get_context_driver()->window_get_hdr_output_reference_luminance(DisplayServerEnums::MAIN_WINDOW_ID);
-	const float linear_luminance_scale = RD::get_singleton()->get_context_driver()->window_get_hdr_output_linear_luminance_scale(DisplayServerEnums::MAIN_WINDOW_ID);
-	const float output_max_value = RD::get_singleton()->get_context_driver()->window_get_output_max_linear_value(DisplayServerEnums::MAIN_WINDOW_ID);
-	const float reference_multiplier = _compute_reference_multiplier(color_space, reference_luminance, linear_luminance_scale);
+	// p_color never needs to be converted to linear encoding because HDR 2D is always disabled for the boot image.
+	// If HDR 2D can ever be enabled during the boot image, p_color must be converted to linear encoding for this case.
+	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin_for_screen(DisplayServer::MAIN_WINDOW_ID, p_color);
 
-	Color clear_color = p_color;
-	if (color_space != RD::COLOR_SPACE_REC709_NONLINEAR_SRGB) {
-		// draw_list_begin_for_screen requires linear-encoded Color when using an HDR buffer.
-		clear_color = p_color.srgb_to_linear();
-
-		clear_color.r *= reference_multiplier;
-		clear_color.g *= reference_multiplier;
-		clear_color.b *= reference_multiplier;
-	}
-
-	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin_for_screen(DisplayServerEnums::MAIN_WINDOW_ID, clear_color);
-
-	RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, blit_pipelines.pipelines[BLIT_MODE_NORMAL_ALPHA]);
+	RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, blit.pipelines[BLIT_MODE_NORMAL_ALPHA]);
 	RD::get_singleton()->draw_list_bind_index_array(draw_list, blit.array);
 	RD::get_singleton()->draw_list_bind_uniform_set(draw_list, uset, 0);
 
-	const int screen_rotation_degrees = -RD::get_singleton()->screen_get_pre_rotation_degrees(DisplayServerEnums::MAIN_WINDOW_ID);
+	const int screen_rotation_degrees = -RD::get_singleton()->screen_get_pre_rotation_degrees(DisplayServer::MAIN_WINDOW_ID);
 	float screen_rotation = Math::deg_to_rad((float)screen_rotation_degrees);
 	blit.push_constant.rotation_cos = Math::cos(screen_rotation);
 	blit.push_constant.rotation_sin = Math::sin(screen_rotation);
@@ -293,11 +246,8 @@ void RendererCompositorRD::set_boot_image_with_stretch(const Ref<Image> &p_image
 	blit.push_constant.k2 = 0;
 	blit.push_constant.upscale = 1.0;
 	blit.push_constant.aspect_ratio = 1.0;
-	blit.push_constant.source_is_srgb = true;
+	blit.push_constant.convert_to_srgb = false;
 	blit.push_constant.use_debanding = false;
-	blit.push_constant.target_color_space = color_space;
-	blit.push_constant.reference_multiplier = reference_multiplier;
-	blit.push_constant.output_max_value = output_max_value;
 
 	RD::get_singleton()->draw_list_set_push_constant(draw_list, &blit.push_constant, sizeof(BlitPushConstant));
 	RD::get_singleton()->draw_list_draw(draw_list, true);
@@ -368,7 +318,6 @@ RendererCompositorRD::RendererCompositorRD() {
 	particles_storage = memnew(RendererRD::ParticlesStorage);
 	fog = memnew(RendererRD::Fog);
 	canvas = memnew(RendererCanvasRenderRD());
-	texture_storage->_tex_blit_shader_initialize();
 
 	String rendering_method = OS::get_singleton()->get_current_rendering_method();
 	uint64_t textures_per_stage = RD::get_singleton()->limit_get(RD::LIMIT_MAX_TEXTURES_PER_SHADER_STAGE);
diff --git a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
index 50619096..6218869a 100644
--- a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
@@ -49,17 +49,15 @@ class RendererCompositorRD : public RendererCompositor {
 protected:
 	UniformSetCacheRD *uniform_set_cache = nullptr;
 	FramebufferCacheRD *framebuffer_cache = nullptr;
-
 	RendererCanvasRenderRD *canvas = nullptr;
-	RendererSceneRenderRD *scene = nullptr;
-
-	RendererRD::Fog *fog = nullptr;
+	RendererRD::Utilities *utilities = nullptr;
 	RendererRD::LightStorage *light_storage = nullptr;
 	RendererRD::MaterialStorage *material_storage = nullptr;
 	RendererRD::MeshStorage *mesh_storage = nullptr;
 	RendererRD::ParticlesStorage *particles_storage = nullptr;
 	RendererRD::TextureStorage *texture_storage = nullptr;
-	RendererRD::Utilities *utilities = nullptr;
+	RendererRD::Fog *fog = nullptr;
+	RendererSceneRenderRD *scene = nullptr;
 
 	enum BlitMode {
 		BLIT_MODE_NORMAL,
@@ -70,37 +68,29 @@ protected:
 	};
 
 	struct BlitPushConstant {
-		float src_rect[4]; // 16 - 16
-		float dst_rect[4]; // 16 - 32
+		float src_rect[4];
+		float dst_rect[4];
 
-		float rotation_sin; // 4 - 36
-		float rotation_cos; // 4 - 40
-		float eye_center[2]; // 8 - 48
+		float rotation_sin;
+		float rotation_cos;
 
-		float k1; // 4 - 52
-		float k2; // 4 - 56
-		float upscale; // 4 - 60
-		float aspect_ratio; // 4 - 64
+		float eye_center[2];
+		float k1;
+		float k2;
 
-		uint32_t layer; // 4 - 68
-		uint32_t source_is_srgb; // 4 - 72
-		uint32_t use_debanding; // 4 - 76
-		uint32_t target_color_space; // 4 - 80
-
-		float reference_multiplier; // 4 - 84
-		float output_max_value; // 4 - 88
-		uint32_t pad[2]; // 8 - 96 (padding to reach 16-byte boundary)
-	};
-
-	struct BlitPipelines {
-		RID pipelines[BLIT_MODE_MAX];
+		float upscale;
+		float aspect_ratio;
+		uint32_t layer;
+		uint32_t convert_to_srgb;
+		uint32_t use_debanding;
+		float pad;
 	};
 
 	struct Blit {
 		BlitPushConstant push_constant;
 		BlitShaderRD shader;
 		RID shader_version;
-		HashMap<RenderingDevice::FramebufferFormatID, BlitPipelines> pipelines_by_format;
+		RID pipelines[BLIT_MODE_MAX];
 		RID index_buffer;
 		RID array;
 		RID sampler;
@@ -114,41 +104,38 @@ protected:
 	static uint64_t frame;
 	static RendererCompositorRD *singleton;
 
-	BlitPipelines _get_blit_pipelines_for_format(RenderingDevice::FramebufferFormatID format);
-	float _compute_reference_multiplier(RD::ColorSpace p_color_space, const float p_reference_luminance, const float p_linear_luminance_scale);
-
 public:
-	virtual RendererUtilities *get_utilities() override { return utilities; }
-	virtual RendererLightStorage *get_light_storage() override { return light_storage; }
-	virtual RendererMaterialStorage *get_material_storage() override { return material_storage; }
-	virtual RendererMeshStorage *get_mesh_storage() override { return mesh_storage; }
-	virtual RendererParticlesStorage *get_particles_storage() override { return particles_storage; }
-	virtual RendererTextureStorage *get_texture_storage() override { return texture_storage; }
-	virtual RendererGI *get_gi() override {
+	RendererUtilities *get_utilities() { return utilities; }
+	RendererLightStorage *get_light_storage() { return light_storage; }
+	RendererMaterialStorage *get_material_storage() { return material_storage; }
+	RendererMeshStorage *get_mesh_storage() { return mesh_storage; }
+	RendererParticlesStorage *get_particles_storage() { return particles_storage; }
+	RendererTextureStorage *get_texture_storage() { return texture_storage; }
+	RendererGI *get_gi() {
 		ERR_FAIL_NULL_V(scene, nullptr);
 		return scene->get_gi();
 	}
-	virtual RendererFog *get_fog() override { return fog; }
-	virtual RendererCanvasRender *get_canvas() override { return canvas; }
-	virtual RendererSceneRender *get_scene() override { return scene; }
+	RendererFog *get_fog() { return fog; }
+	RendererCanvasRender *get_canvas() { return canvas; }
+	RendererSceneRender *get_scene() { return scene; }
 
-	virtual void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter) override;
+	void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RenderingServer::SplashStretchMode p_stretch_mode, bool p_use_filter);
 
-	virtual void initialize() override;
-	virtual void begin_frame(double frame_step) override;
-	virtual void blit_render_targets_to_screen(DisplayServerEnums::WindowID p_screen, const RenderingServerTypes::BlitToScreen *p_render_targets, int p_amount) override;
+	void initialize();
+	void begin_frame(double frame_step);
+	void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount);
 
-	virtual bool is_opengl() override { return false; }
-	virtual void gl_end_frame(bool p_swap_buffers) override {}
-	virtual void end_frame(bool p_present) override;
-	virtual void finalize() override;
+	bool is_opengl() { return false; }
+	void gl_end_frame(bool p_swap_buffers) {}
+	void end_frame(bool p_present);
+	void finalize();
 
-	_ALWAYS_INLINE_ virtual uint64_t get_frame_number() const override { return frame; }
-	_ALWAYS_INLINE_ virtual double get_frame_delta_time() const override { return delta; }
-	_ALWAYS_INLINE_ virtual double get_total_time() const override { return time; }
-	_ALWAYS_INLINE_ virtual bool can_create_resources_async() const override { return true; }
+	_ALWAYS_INLINE_ uint64_t get_frame_number() const { return frame; }
+	_ALWAYS_INLINE_ double get_frame_delta_time() const { return delta; }
+	_ALWAYS_INLINE_ double get_total_time() const { return time; }
+	_ALWAYS_INLINE_ bool can_create_resources_async() const { return true; }
 
-	virtual bool is_xr_enabled() const override { return RendererCompositor::is_xr_enabled(); }
+	virtual bool is_xr_enabled() const { return RendererCompositor::is_xr_enabled(); }
 
 	static Error is_viable() {
 		return OK;
diff --git a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
index 4ddc9acb..a786260b 100644
--- a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
@@ -32,15 +32,13 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
+#include "renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/environment/fog.h"
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/decal_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/light_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/scene_data_inc.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_default.h"
-#include "servers/rendering/rendering_server_enums.h"
 #include "servers/rendering/shader_include_db.h"
 #include "servers/rendering/storage/camera_attributes_storage.h"
 
@@ -67,7 +65,7 @@ void RendererSceneRenderRD::sky_set_radiance_size(RID p_sky, int p_radiance_size
 	sky.sky_set_radiance_size(p_sky, p_radiance_size);
 }
 
-void RendererSceneRenderRD::sky_set_mode(RID p_sky, RSE::SkyMode p_mode) {
+void RendererSceneRenderRD::sky_set_mode(RID p_sky, RS::SkyMode p_mode) {
 	sky.sky_set_mode(p_sky, p_mode);
 }
 
@@ -92,37 +90,37 @@ void RendererSceneRenderRD::environment_set_volumetric_fog_filter_active(bool p_
 	volumetric_fog_filter_active = p_enable;
 }
 
-void RendererSceneRenderRD::environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) {
+void RendererSceneRenderRD::environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) {
 	gi.sdfgi_ray_count = p_ray_count;
 }
 
-void RendererSceneRenderRD::environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) {
+void RendererSceneRenderRD::environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) {
 	gi.sdfgi_frames_to_converge = p_frames;
 }
-void RendererSceneRenderRD::environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) {
+void RendererSceneRenderRD::environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) {
 	gi.sdfgi_frames_to_update_light = p_update;
 }
 
 Ref<Image> RendererSceneRenderRD::environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) {
 	ERR_FAIL_COND_V(p_env.is_null(), Ref<Image>());
 
-	RSE::EnvironmentBG environment_background = environment_get_background(p_env);
+	RS::EnvironmentBG environment_background = environment_get_background(p_env);
 
-	if (environment_background == RSE::ENV_BG_CAMERA_FEED || environment_background == RSE::ENV_BG_CANVAS || environment_background == RSE::ENV_BG_KEEP) {
+	if (environment_background == RS::ENV_BG_CAMERA_FEED || environment_background == RS::ENV_BG_CANVAS || environment_background == RS::ENV_BG_KEEP) {
 		return Ref<Image>(); //nothing to bake
 	}
 
-	RSE::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_env);
+	RS::EnvironmentAmbientSource ambient_source = environment_get_ambient_source(p_env);
 
 	bool use_ambient_light = false;
 	bool use_octmap = false;
-	if (ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && (environment_background == RSE::ENV_BG_CLEAR_COLOR || environment_background == RSE::ENV_BG_COLOR)) {
+	if (ambient_source == RS::ENV_AMBIENT_SOURCE_BG && (environment_background == RS::ENV_BG_CLEAR_COLOR || environment_background == RS::ENV_BG_COLOR)) {
 		use_ambient_light = true;
 	} else {
-		use_octmap = (ambient_source == RSE::ENV_AMBIENT_SOURCE_BG && environment_background == RSE::ENV_BG_SKY) || ambient_source == RSE::ENV_AMBIENT_SOURCE_SKY;
-		use_ambient_light = use_octmap || ambient_source == RSE::ENV_AMBIENT_SOURCE_COLOR;
+		use_octmap = (ambient_source == RS::ENV_AMBIENT_SOURCE_BG && environment_background == RS::ENV_BG_SKY) || ambient_source == RS::ENV_AMBIENT_SOURCE_SKY;
+		use_ambient_light = use_octmap || ambient_source == RS::ENV_AMBIENT_SOURCE_COLOR;
 	}
-	use_octmap = use_octmap || (environment_background == RSE::ENV_BG_SKY && environment_get_sky(p_env).is_valid());
+	use_octmap = use_octmap || (environment_background == RS::ENV_BG_SKY && environment_get_sky(p_env).is_valid());
 
 	Color ambient_color;
 	float ambient_color_sky_mix = 0.0;
@@ -148,7 +146,7 @@ Ref<Image> RendererSceneRenderRD::environment_bake_panorama(RID p_env, bool p_ba
 		return panorama;
 	} else {
 		const float bg_energy_multiplier = environment_get_bg_energy_multiplier(p_env);
-		Color panorama_color = ((environment_background == RSE::ENV_BG_CLEAR_COLOR) ? RSG::texture_storage->get_default_clear_color() : environment_get_bg_color(p_env));
+		Color panorama_color = ((environment_background == RS::ENV_BG_CLEAR_COLOR) ? RSG::texture_storage->get_default_clear_color() : environment_get_bg_color(p_env));
 		panorama_color = panorama_color.srgb_to_linear();
 		panorama_color.r *= bg_energy_multiplier;
 		panorama_color.g *= bg_energy_multiplier;
@@ -254,7 +252,7 @@ Ref<RenderSceneBuffers> RendererSceneRenderRD::render_buffers_create() {
 	return rb;
 }
 
-bool RendererSceneRenderRD::_compositor_effects_has_flag(const RenderDataRD *p_render_data, RSE::CompositorEffectFlags p_flag, RSE::CompositorEffectCallbackType p_callback_type) {
+bool RendererSceneRenderRD::_compositor_effects_has_flag(const RenderDataRD *p_render_data, RS::CompositorEffectFlags p_flag, RS::CompositorEffectCallbackType p_callback_type) {
 	RendererCompositorStorage *comp_storage = RendererCompositorStorage::get_singleton();
 
 	if (p_render_data->compositor.is_null()) {
@@ -277,7 +275,7 @@ bool RendererSceneRenderRD::_compositor_effects_has_flag(const RenderDataRD *p_r
 	return false;
 }
 
-bool RendererSceneRenderRD::_has_compositor_effect(RSE::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data) {
+bool RendererSceneRenderRD::_has_compositor_effect(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data) {
 	RendererCompositorStorage *comp_storage = RendererCompositorStorage::get_singleton();
 
 	if (p_render_data->compositor.is_null()) {
@@ -295,7 +293,7 @@ bool RendererSceneRenderRD::_has_compositor_effect(RSE::CompositorEffectCallback
 	return effects.size() > 0;
 }
 
-void RendererSceneRenderRD::_process_compositor_effects(RSE::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data) {
+void RendererSceneRenderRD::_process_compositor_effects(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data) {
 	RendererCompositorStorage *comp_storage = RendererCompositorStorage::get_singleton();
 
 	if (p_render_data->compositor.is_null()) {
@@ -440,7 +438,7 @@ void RendererSceneRenderRD::_render_buffers_copy_depth_texture(const RenderDataR
 		} else {
 			RID depth_back_fb = FramebufferCacheRD::get_singleton()->get_cache(depth_back_texture);
 			if (p_use_msaa) {
-				static const int texture_multisamples[RSE::VIEWPORT_MSAA_MAX] = { 1, 2, 4, 8 };
+				static const int texture_multisamples[RS::VIEWPORT_MSAA_MAX] = { 1, 2, 4, 8 };
 
 				resolve_effects->resolve_depth_raster(rb->get_depth_msaa(v), depth_back_fb, texture_multisamples[rb->get_msaa_3d()]);
 			} else {
@@ -469,26 +467,26 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 	can_use_effects &= _debug_draw_can_use_effects(debug_draw);
 	bool can_use_storage = _render_buffers_can_be_storage();
 
-	RSE::ViewportScaling3DMode scale_mode = rb->get_scaling_3d_mode();
-	bool use_upscaled_texture = rb->has_upscaled_texture() && (scale_mode == RSE::VIEWPORT_SCALING_3D_MODE_FSR2 || scale_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL);
+	RS::ViewportScaling3DMode scale_mode = rb->get_scaling_3d_mode();
+	bool use_upscaled_texture = rb->has_upscaled_texture() && (scale_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR2 || scale_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL);
 	SpatialUpscaler *spatial_upscaler = nullptr;
 	if (can_use_effects) {
-		if (scale_mode == RSE::VIEWPORT_SCALING_3D_MODE_FSR) {
+		if (scale_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) {
 			spatial_upscaler = fsr;
-		} else if (scale_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
+		} else if (scale_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
 #if METAL_ENABLED
 			spatial_upscaler = mfx_spatial;
 #endif
 		}
 	}
 
-	bool use_smaa = smaa && rb->get_screen_space_aa() == RSE::VIEWPORT_SCREEN_SPACE_AA_SMAA;
+	bool use_smaa = smaa && rb->get_screen_space_aa() == RS::VIEWPORT_SCREEN_SPACE_AA_SMAA;
 
 	RID render_target = rb->get_render_target();
 	RID color_texture = use_upscaled_texture ? rb->get_upscaled_texture() : rb->get_internal_texture();
 	Size2i color_size = use_upscaled_texture ? target_size : rb->get_internal_size();
 
-	bool dest_is_msaa_2d = rb->get_view_count() == 1 && texture_storage->render_target_get_msaa(render_target) != RSE::VIEWPORT_MSAA_DISABLED;
+	bool dest_is_msaa_2d = rb->get_view_count() == 1 && texture_storage->render_target_get_msaa(render_target) != RS::VIEWPORT_MSAA_DISABLED;
 
 	bool using_dof = RSG::camera_attributes->camera_attributes_uses_dof(p_render_data->camera_attributes);
 
@@ -584,8 +582,8 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 		bool use_debanding = rb->get_use_debanding() && !texture_storage->render_target_is_using_hdr(render_target);
 
 		int max_glow_index = -1;
-		int min_glow_level = RSE::MAX_GLOW_LEVELS;
-		for (int i = 0; i < RSE::MAX_GLOW_LEVELS; i++) {
+		int min_glow_level = RS::MAX_GLOW_LEVELS;
+		for (int i = 0; i < RS::MAX_GLOW_LEVELS; i++) {
 			if (glow_levels[i] > 0.01) {
 				max_glow_index = MAX(max_glow_index, i);
 				min_glow_level = MIN(min_glow_level, i);
@@ -688,8 +686,8 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 		if (can_use_effects && p_render_data->environment.is_valid() && environment_get_glow_enabled(p_render_data->environment)) {
 			tonemap.use_glow = true;
 			tonemap.glow_mode = environment_get_glow_blend_mode(p_render_data->environment);
-			tonemap.glow_intensity = tonemap.glow_mode == RSE::ENV_GLOW_BLEND_MODE_MIX ? environment_get_glow_mix(p_render_data->environment) : environment_get_glow_intensity(p_render_data->environment);
-			for (int i = 0; i < RSE::MAX_GLOW_LEVELS; i++) {
+			tonemap.glow_intensity = tonemap.glow_mode == RS::ENV_GLOW_BLEND_MODE_MIX ? environment_get_glow_mix(p_render_data->environment) : environment_get_glow_intensity(p_render_data->environment);
+			for (int i = 0; i < RS::MAX_GLOW_LEVELS; i++) {
 				tonemap.glow_levels[i] = environment_get_glow_levels(p_render_data->environment)[i];
 			}
 
@@ -717,7 +715,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 			tonemap.glow_map = texture_storage->texture_rd_get_default(RendererRD::TextureStorage::DEFAULT_RD_TEXTURE_WHITE);
 		}
 
-		if (rb->get_screen_space_aa() == RSE::VIEWPORT_SCREEN_SPACE_AA_FXAA) {
+		if (rb->get_screen_space_aa() == RS::VIEWPORT_SCREEN_SPACE_AA_FXAA) {
 			tonemap.use_fxaa = true;
 		}
 
@@ -730,20 +728,14 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 			// to a high white value.
 			bool limit_agx_white = rb->get_base_data_format() == RD::DATA_FORMAT_A2B10G10R10_UNORM_PACK32;
 
-			// When using HDR 2D, we use the parent window's output max value.
-			// Otherwise, we're tonemapping to an SDR low bit depth buffer, so
-			// we need to use SDR range with a max value of 1.0.
-			float max_value = using_hdr ? p_render_data->window_output_max_value : 1.0;
-
 			tonemap.tonemap_mode = environment_get_tone_mapper(p_render_data->environment);
-			RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(p_render_data->environment, limit_agx_white, max_value);
+			RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(p_render_data->environment, limit_agx_white);
 			tonemap.tonemapper_params[0] = params.tonemapper_params[0];
 			tonemap.tonemapper_params[1] = params.tonemapper_params[1];
 			tonemap.tonemapper_params[2] = params.tonemapper_params[2];
 			tonemap.tonemapper_params[3] = params.tonemapper_params[3];
-			tonemap.white = environment_get_white(p_render_data->environment, limit_agx_white, max_value);
+			tonemap.white = environment_get_white(p_render_data->environment, limit_agx_white);
 			tonemap.exposure = environment_get_exposure(p_render_data->environment);
-			tonemap.max_value = max_value;
 		}
 
 		tonemap.use_color_correction = false;
@@ -768,7 +760,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 
 		RID dest_fb;
 		RD::DataFormat dest_fb_format;
-		if (spatial_upscaler || use_smaa) {
+		if (spatial_upscaler != nullptr || use_smaa) {
 			// If we use a spatial upscaler to upscale or SMAA to antialias we need to write our result into an intermediate buffer.
 			// Note that this is cached so we only create the texture the first time.
 			dest_fb_format = rb->get_base_data_format();
@@ -776,7 +768,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 			dest_fb = FramebufferCacheRD::get_singleton()->get_cache(dest_texture);
 			tonemap.dest_texture_size = rb->get_internal_size();
 		} else {
-			// If we do a nearest or bilinear upscale, we just render into our render target and our shader will upscale automatically.
+			// If we do a bilinear upscale we just render into our render target and our shader will upscale automatically.
 			// Target size in this case is lying as we never get our real target size communicated.
 			// Bit nasty but...
 
@@ -787,8 +779,6 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende
 				dest_fb = texture_storage->render_target_get_rd_framebuffer(render_target);
 			}
 			tonemap.dest_texture_size = texture_storage->render_target_get_size(render_target);
-
-			tonemap.bilinear_filtering = scale_mode != RSE::VIEWPORT_SCALING_3D_MODE_NEAREST;
 		}
 
 		tonemap.debanding_mode = RendererRD::ToneMapper::TonemapSettings::DebandingMode::DEBANDING_MODE_DISABLED;
@@ -903,14 +893,12 @@ void RendererSceneRenderRD::_post_process_subpass(RID p_source_texture, RID p_fr
 	// FIXME: Our input it our internal_texture, shouldn't this be using internal_size ??
 	// Seeing we don't support FSR in our mobile renderer right now target_size = internal_size...
 	Size2i target_size = rb->get_target_size();
-	bool can_use_effects = target_size.x >= 8 && target_size.y >= 8 && debug_draw == RSE::VIEWPORT_DEBUG_DRAW_DISABLED;
+	bool can_use_effects = target_size.x >= 8 && target_size.y >= 8 && debug_draw == RS::VIEWPORT_DEBUG_DRAW_DISABLED;
 
 	RD::DrawListID draw_list = RD::get_singleton()->draw_list_switch_to_next_pass();
 
 	RendererRD::ToneMapper::TonemapSettings tonemap;
 
-	bool using_hdr = texture_storage->render_target_is_using_hdr(rb->get_render_target());
-
 	if (p_render_data->environment.is_valid()) {
 		// When we are using RGB10A2 render buffer format, our scene
 		// is limited to a maximum of 2.0. In this case we should limit
@@ -918,20 +906,14 @@ void RendererSceneRenderRD::_post_process_subpass(RID p_source_texture, RID p_fr
 		// to a high white value.
 		bool limit_agx_white = rb->get_base_data_format() == RD::DATA_FORMAT_A2B10G10R10_UNORM_PACK32;
 
-		// When using HDR 2D, we use the parent window's output max value.
-		// Otherwise, we're tonemapping to an SDR low bit depth buffer, so
-		// we need to use SDR range with a max value of 1.0.
-		float max_value = using_hdr ? p_render_data->window_output_max_value : 1.0;
-
 		tonemap.tonemap_mode = environment_get_tone_mapper(p_render_data->environment);
-		RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(p_render_data->environment, limit_agx_white, max_value);
+		RendererEnvironmentStorage::TonemapParameters params = environment_get_tonemap_parameters(p_render_data->environment, limit_agx_white);
 		tonemap.tonemapper_params[0] = params.tonemapper_params[0];
 		tonemap.tonemapper_params[1] = params.tonemapper_params[1];
 		tonemap.tonemapper_params[2] = params.tonemapper_params[2];
 		tonemap.tonemapper_params[3] = params.tonemapper_params[3];
 		tonemap.exposure = environment_get_exposure(p_render_data->environment);
-		tonemap.white = environment_get_white(p_render_data->environment, limit_agx_white, max_value);
-		tonemap.max_value = max_value;
+		tonemap.white = environment_get_white(p_render_data->environment, limit_agx_white);
 	}
 
 	// We don't support glow or auto exposure here, if they are needed, don't use subpasses!
@@ -945,6 +927,8 @@ void RendererSceneRenderRD::_post_process_subpass(RID p_source_texture, RID p_fr
 		ERR_FAIL_MSG("Auto Exposure is not supported when using subpasses.");
 	}
 
+	bool using_hdr = texture_storage->render_target_is_using_hdr(rb->get_render_target());
+
 	tonemap.use_glow = false;
 	tonemap.glow_texture = texture_storage->texture_rd_get_default(RendererRD::TextureStorage::DEFAULT_RD_TEXTURE_BLACK);
 	tonemap.glow_map = texture_storage->texture_rd_get_default(RendererRD::TextureStorage::DEFAULT_RD_TEXTURE_WHITE);
@@ -991,47 +975,47 @@ void RendererSceneRenderRD::_disable_clear_request(const RenderDataRD *p_render_
 	texture_storage->render_target_disable_clear_request(p_render_data->render_buffers->get_render_target());
 }
 
-bool RendererSceneRenderRD::_debug_draw_can_use_effects(RSE::ViewportDebugDraw p_debug_draw) {
+bool RendererSceneRenderRD::_debug_draw_can_use_effects(RS::ViewportDebugDraw p_debug_draw) {
 	bool can_use_effects = true;
 	switch (p_debug_draw) {
 		// No debug draw, use camera effects
-		case RSE::VIEWPORT_DEBUG_DRAW_DISABLED:
+		case RS::VIEWPORT_DEBUG_DRAW_DISABLED:
 			can_use_effects = true;
 			break;
 		// Modes that completely override rendering to draw debug information should disable camera effects.
-		case RSE::VIEWPORT_DEBUG_DRAW_UNSHADED:
-		case RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW:
-		case RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME:
-		case RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO:
-		case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS:
-		case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS:
-		case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS:
-		case RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES:
-		case RSE::VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER:
+		case RS::VIEWPORT_DEBUG_DRAW_UNSHADED:
+		case RS::VIEWPORT_DEBUG_DRAW_OVERDRAW:
+		case RS::VIEWPORT_DEBUG_DRAW_WIREFRAME:
+		case RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO:
+		case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS:
+		case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS:
+		case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS:
+		case RS::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES:
+		case RS::VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER:
 			can_use_effects = false;
 			break;
 		// Modes that draws information over part of the viewport needs camera effects because we see partially the normal draw mode.
-		case RSE::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS:
-		case RSE::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS:
-		case RSE::VIEWPORT_DEBUG_DRAW_DECAL_ATLAS:
-		case RSE::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS:
+		case RS::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS:
+		case RS::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS:
+		case RS::VIEWPORT_DEBUG_DRAW_DECAL_ATLAS:
+		case RS::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS:
 		// Modes that draws a buffer over viewport needs camera effects because if the buffer is not available it will be equivalent to normal draw mode.
-		case RSE::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER:
-		case RSE::VIEWPORT_DEBUG_DRAW_SSAO:
-		case RSE::VIEWPORT_DEBUG_DRAW_SSIL:
-		case RSE::VIEWPORT_DEBUG_DRAW_SDFGI:
-		case RSE::VIEWPORT_DEBUG_DRAW_GI_BUFFER:
-		case RSE::VIEWPORT_DEBUG_DRAW_OCCLUDERS:
+		case RS::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER:
+		case RS::VIEWPORT_DEBUG_DRAW_SSAO:
+		case RS::VIEWPORT_DEBUG_DRAW_SSIL:
+		case RS::VIEWPORT_DEBUG_DRAW_SDFGI:
+		case RS::VIEWPORT_DEBUG_DRAW_GI_BUFFER:
+		case RS::VIEWPORT_DEBUG_DRAW_OCCLUDERS:
 			can_use_effects = true;
 			break;
 		// Other debug draw modes keep camera effects.
-		case RSE::VIEWPORT_DEBUG_DRAW_LIGHTING:
-		case RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING:
-		case RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION:
-		case RSE::VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE:
-		case RSE::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS:
-		case RSE::VIEWPORT_DEBUG_DRAW_SDFGI_PROBES:
-		case RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD:
+		case RS::VIEWPORT_DEBUG_DRAW_LIGHTING:
+		case RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING:
+		case RS::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION:
+		case RS::VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE:
+		case RS::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS:
+		case RS::VIEWPORT_DEBUG_DRAW_SDFGI_PROBES:
+		case RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD:
 			can_use_effects = true;
 			break;
 		default:
@@ -1050,7 +1034,7 @@ void RendererSceneRenderRD::_render_buffers_debug_draw(const RenderDataRD *p_ren
 
 	RID render_target = rb->get_render_target();
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS) {
 		if (p_render_data->shadow_atlas.is_valid()) {
 			RID shadow_atlas_texture = RendererRD::LightStorage::get_singleton()->shadow_atlas_get_texture(p_render_data->shadow_atlas);
 
@@ -1063,7 +1047,7 @@ void RendererSceneRenderRD::_render_buffers_debug_draw(const RenderDataRD *p_ren
 		}
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS) {
 		if (RendererRD::LightStorage::get_singleton()->directional_shadow_get_texture().is_valid()) {
 			RID shadow_atlas_texture = RendererRD::LightStorage::get_singleton()->directional_shadow_get_texture();
 			Size2i rtsize = texture_storage->render_target_get_size(render_target);
@@ -1084,14 +1068,14 @@ void RendererSceneRenderRD::_render_buffers_debug_draw(const RenderDataRD *p_ren
 				RID light = p_render_data->render_shadows[i].light;
 				RID base = light_storage->light_instance_get_base_light(light);
 
-				if (light_storage->light_get_type(base) == RSE::LIGHT_DIRECTIONAL) {
+				if (light_storage->light_get_type(base) == RS::LIGHT_DIRECTIONAL) {
 					debug_effects->draw_shadow_frustum(light, p_render_data->scene_data->cam_projection, p_render_data->scene_data->cam_transform, dest_fb, Rect2(Size2(), size));
 				}
 			}
 		}
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_DECAL_ATLAS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_DECAL_ATLAS) {
 		RID decal_atlas = RendererRD::TextureStorage::get_singleton()->decal_atlas_get_texture();
 
 		if (decal_atlas.is_valid()) {
@@ -1101,7 +1085,7 @@ void RendererSceneRenderRD::_render_buffers_debug_draw(const RenderDataRD *p_ren
 		}
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE) {
 		RID luminance_texture = luminance->get_current_luminance_buffer(rb);
 		if (luminance_texture.is_valid()) {
 			Size2i rtsize = texture_storage->render_target_get_size(render_target);
@@ -1110,24 +1094,24 @@ void RendererSceneRenderRD::_render_buffers_debug_draw(const RenderDataRD *p_ren
 		}
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER) {
 		Size2 rtsize = texture_storage->render_target_get_size(render_target);
 		copy_effects->copy_to_fb_rect(rb->get_internal_texture(), texture_storage->render_target_get_rd_framebuffer(render_target), Rect2(Vector2(), rtsize), false, false);
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER && _render_buffers_get_normal_texture(rb).is_valid()) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER && _render_buffers_get_normal_texture(rb).is_valid()) {
 		Size2 rtsize = texture_storage->render_target_get_size(render_target);
 		copy_effects->copy_to_fb_rect(_render_buffers_get_normal_texture(rb), texture_storage->render_target_get_rd_framebuffer(render_target), Rect2(Vector2(), rtsize), false, false, false, false, RID(), false, false, false, true);
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_OCCLUDERS) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_OCCLUDERS) {
 		if (p_render_data->occluder_debug_tex.is_valid()) {
 			Size2i rtsize = texture_storage->render_target_get_size(render_target);
 			copy_effects->copy_to_fb_rect(texture_storage->texture_get_rd_texture(p_render_data->occluder_debug_tex), texture_storage->render_target_get_rd_framebuffer(render_target), Rect2i(Vector2(), rtsize), true, false);
 		}
 	}
 
-	if (debug_draw == RSE::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS && _render_buffers_get_velocity_texture(rb).is_valid()) {
+	if (debug_draw == RS::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS && _render_buffers_get_velocity_texture(rb).is_valid()) {
 		RID velocity = _render_buffers_get_velocity_texture(rb);
 		RID depth = rb->get_depth_texture();
 		RID dest_fb = texture_storage->render_target_get_rd_framebuffer(render_target);
@@ -1153,44 +1137,44 @@ void RendererSceneRenderRD::gi_set_use_half_resolution(bool p_enable) {
 	gi.half_resolution = p_enable;
 }
 
-void RendererSceneRenderRD::positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) {
-	ERR_FAIL_INDEX_MSG(p_quality, RSE::SHADOW_QUALITY_MAX, "Shadow quality too high, please see RenderingServer's ShadowQuality enum");
+void RendererSceneRenderRD::positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) {
+	ERR_FAIL_INDEX_MSG(p_quality, RS::SHADOW_QUALITY_MAX, "Shadow quality too high, please see RenderingServer's ShadowQuality enum");
 
 	if (shadows_quality != p_quality) {
 		shadows_quality = p_quality;
 
 		switch (shadows_quality) {
-			case RSE::SHADOW_QUALITY_HARD: {
+			case RS::SHADOW_QUALITY_HARD: {
 				penumbra_shadow_samples = 4;
 				soft_shadow_samples = 0;
 				shadows_quality_radius = 1.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_VERY_LOW: {
+			case RS::SHADOW_QUALITY_SOFT_VERY_LOW: {
 				penumbra_shadow_samples = 4;
 				soft_shadow_samples = 1;
 				shadows_quality_radius = 1.5;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_LOW: {
+			case RS::SHADOW_QUALITY_SOFT_LOW: {
 				penumbra_shadow_samples = 8;
 				soft_shadow_samples = 4;
 				shadows_quality_radius = 2.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_MEDIUM: {
+			case RS::SHADOW_QUALITY_SOFT_MEDIUM: {
 				penumbra_shadow_samples = 12;
 				soft_shadow_samples = 8;
 				shadows_quality_radius = 2.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_HIGH: {
+			case RS::SHADOW_QUALITY_SOFT_HIGH: {
 				penumbra_shadow_samples = 24;
 				soft_shadow_samples = 16;
 				shadows_quality_radius = 3.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_ULTRA: {
+			case RS::SHADOW_QUALITY_SOFT_ULTRA: {
 				penumbra_shadow_samples = 32;
 				soft_shadow_samples = 32;
 				shadows_quality_radius = 4.0;
 			} break;
-			case RSE::SHADOW_QUALITY_MAX:
+			case RS::SHADOW_QUALITY_MAX:
 				break;
 		}
 		get_vogel_disk(penumbra_shadow_kernel, penumbra_shadow_samples);
@@ -1200,44 +1184,44 @@ void RendererSceneRenderRD::positional_soft_shadow_filter_set_quality(RSE::Shado
 	_update_shader_quality_settings();
 }
 
-void RendererSceneRenderRD::directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) {
-	ERR_FAIL_INDEX_MSG(p_quality, RSE::SHADOW_QUALITY_MAX, "Shadow quality too high, please see RenderingServer's ShadowQuality enum");
+void RendererSceneRenderRD::directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) {
+	ERR_FAIL_INDEX_MSG(p_quality, RS::SHADOW_QUALITY_MAX, "Shadow quality too high, please see RenderingServer's ShadowQuality enum");
 
 	if (directional_shadow_quality != p_quality) {
 		directional_shadow_quality = p_quality;
 
 		switch (directional_shadow_quality) {
-			case RSE::SHADOW_QUALITY_HARD: {
+			case RS::SHADOW_QUALITY_HARD: {
 				directional_penumbra_shadow_samples = 4;
 				directional_soft_shadow_samples = 0;
 				directional_shadow_quality_radius = 1.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_VERY_LOW: {
+			case RS::SHADOW_QUALITY_SOFT_VERY_LOW: {
 				directional_penumbra_shadow_samples = 4;
 				directional_soft_shadow_samples = 1;
 				directional_shadow_quality_radius = 1.5;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_LOW: {
+			case RS::SHADOW_QUALITY_SOFT_LOW: {
 				directional_penumbra_shadow_samples = 8;
 				directional_soft_shadow_samples = 4;
 				directional_shadow_quality_radius = 2.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_MEDIUM: {
+			case RS::SHADOW_QUALITY_SOFT_MEDIUM: {
 				directional_penumbra_shadow_samples = 12;
 				directional_soft_shadow_samples = 8;
 				directional_shadow_quality_radius = 2.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_HIGH: {
+			case RS::SHADOW_QUALITY_SOFT_HIGH: {
 				directional_penumbra_shadow_samples = 24;
 				directional_soft_shadow_samples = 16;
 				directional_shadow_quality_radius = 3.0;
 			} break;
-			case RSE::SHADOW_QUALITY_SOFT_ULTRA: {
+			case RS::SHADOW_QUALITY_SOFT_ULTRA: {
 				directional_penumbra_shadow_samples = 32;
 				directional_soft_shadow_samples = 32;
 				directional_shadow_quality_radius = 4.0;
 			} break;
-			case RSE::SHADOW_QUALITY_MAX:
+			case RS::SHADOW_QUALITY_MAX:
 				break;
 		}
 		get_vogel_disk(directional_penumbra_shadow_kernel, directional_penumbra_shadow_samples);
@@ -1247,14 +1231,14 @@ void RendererSceneRenderRD::directional_soft_shadow_filter_set_quality(RSE::Shad
 	_update_shader_quality_settings();
 }
 
-void RendererSceneRenderRD::decals_set_filter(RSE::DecalFilter p_filter) {
+void RendererSceneRenderRD::decals_set_filter(RenderingServer::DecalFilter p_filter) {
 	if (decals_filter == p_filter) {
 		return;
 	}
 	decals_filter = p_filter;
 	_update_shader_quality_settings();
 }
-void RendererSceneRenderRD::light_projectors_set_filter(RSE::LightProjectorFilter p_filter) {
+void RendererSceneRenderRD::light_projectors_set_filter(RenderingServer::LightProjectorFilter p_filter) {
 	if (light_projectors_filter == p_filter) {
 		return;
 	}
@@ -1297,8 +1281,8 @@ void RendererSceneRenderRD::_update_vrs(Ref<RenderSceneBuffersRD> p_render_buffe
 	if (vrs) {
 		RendererRD::TextureStorage *texture_storage = RendererRD::TextureStorage::get_singleton();
 
-		RSE::ViewportVRSMode vrs_mode = texture_storage->render_target_get_vrs_mode(render_target);
-		if (vrs_mode != RSE::VIEWPORT_VRS_DISABLED) {
+		RS::ViewportVRSMode vrs_mode = texture_storage->render_target_get_vrs_mode(render_target);
+		if (vrs_mode != RS::VIEWPORT_VRS_DISABLED) {
 			RID vrs_texture = p_render_buffers->get_texture(RB_SCOPE_VRS, RB_TEXTURE);
 
 			// We use get_cache_multipass instead of get_cache_multiview because the default behavior is for
@@ -1340,7 +1324,7 @@ void RendererSceneRenderRD::_post_prepass_render(RenderDataRD *p_render_data, bo
 	}
 }
 
-void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data, RenderingMethod::RenderInfo *r_render_info) {
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 	RendererRD::TextureStorage *texture_storage = RendererRD::TextureStorage::get_singleton();
 
@@ -1356,6 +1340,7 @@ void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render
 		scene_data.cam_transform = p_camera_data->main_transform;
 		scene_data.cam_projection = p_camera_data->main_projection;
 		scene_data.cam_orthogonal = p_camera_data->is_orthogonal;
+		scene_data.cam_frustum = p_camera_data->is_frustum;
 		scene_data.camera_visible_layers = p_camera_data->visible_layers;
 		scene_data.taa_jitter = p_camera_data->taa_jitter;
 		scene_data.taa_frame_count = p_camera_data->taa_frame_count;
@@ -1387,7 +1372,7 @@ void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render
 		const float scaling_3d_scale = GLOBAL_GET_CACHED(float, "rendering/scaling_3d/scale");
 		scene_data.lod_distance_multiplier = lod_distance_multiplier * (1.0 / scaling_3d_scale);
 
-		if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
+		if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_DISABLE_LOD) {
 			scene_data.screen_mesh_lod_threshold = 0.0;
 		} else {
 			scene_data.screen_mesh_lod_threshold = p_screen_mesh_lod_threshold;
@@ -1451,7 +1436,6 @@ void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render
 		render_data.render_sdfgi_regions = p_render_sdfgi_regions;
 		render_data.render_sdfgi_region_count = p_render_sdfgi_region_count;
 		render_data.sdfgi_update_data = p_sdfgi_update_data;
-		render_data.window_output_max_value = p_window_output_max_value;
 
 		render_data.render_info = r_render_info;
 
@@ -1463,17 +1447,17 @@ void RendererSceneRenderRD::render_scene(const Ref<RenderSceneBuffers> &p_render
 
 	PagedArray<RID> empty;
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED || get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED || get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW) {
 		render_data.lights = &empty;
 		render_data.reflection_probes = &empty;
 		render_data.voxel_gi_instances = &empty;
 		render_data.lightmaps = &empty;
 	}
 
-	if (get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED ||
-			get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW ||
-			get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_LIGHTING ||
-			get_debug_draw_mode() == RSE::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS) {
+	if (get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_UNSHADED ||
+			get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_OVERDRAW ||
+			get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_LIGHTING ||
+			get_debug_draw_mode() == RS::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS) {
 		render_data.decals = &empty;
 	}
 
@@ -1534,7 +1518,7 @@ bool RendererSceneRenderRD::free(RID p_rid) {
 	return true;
 }
 
-void RendererSceneRenderRD::set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) {
+void RendererSceneRenderRD::set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) {
 	debug_draw = p_debug_draw;
 }
 
@@ -1723,8 +1707,8 @@ void RendererSceneRenderRD::init() {
 		RendererRD::Fog::get_singleton()->init_fog_shader(RendererRD::LightStorage::get_singleton()->get_max_directional_lights(), get_roughness_layers(), is_using_radiance_octmap_array());
 	}
 
-	RSG::camera_attributes->camera_attributes_set_dof_blur_bokeh_shape(RSE::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape"))));
-	RSG::camera_attributes->camera_attributes_set_dof_blur_quality(RSE::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality"))), GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_use_jitter"));
+	RSG::camera_attributes->camera_attributes_set_dof_blur_bokeh_shape(RS::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape"))));
+	RSG::camera_attributes->camera_attributes_set_dof_blur_quality(RS::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality"))), GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_use_jitter"));
 	use_physical_light_units = GLOBAL_GET("rendering/lights_and_shadows/use_physical_light_units");
 
 	screen_space_roughness_limiter = GLOBAL_GET("rendering/anti_aliasing/screen_space_roughness_limiter/enabled");
@@ -1736,14 +1720,14 @@ void RendererSceneRenderRD::init() {
 	directional_soft_shadow_kernel = memnew_arr(float, 128);
 	penumbra_shadow_kernel = memnew_arr(float, 128);
 	soft_shadow_kernel = memnew_arr(float, 128);
-	positional_soft_shadow_filter_set_quality(RSE::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality"))));
-	directional_soft_shadow_filter_set_quality(RSE::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality"))));
+	positional_soft_shadow_filter_set_quality(RS::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/positional_shadow/soft_shadow_filter_quality"))));
+	directional_soft_shadow_filter_set_quality(RS::ShadowQuality(int(GLOBAL_GET("rendering/lights_and_shadows/directional_shadow/soft_shadow_filter_quality"))));
 
 	environment_set_volumetric_fog_volume_size(GLOBAL_GET("rendering/environment/volumetric_fog/volume_size"), GLOBAL_GET("rendering/environment/volumetric_fog/volume_depth"));
 	environment_set_volumetric_fog_filter_active(GLOBAL_GET("rendering/environment/volumetric_fog/use_filter"));
 
-	decals_set_filter(RSE::DecalFilter(int(GLOBAL_GET("rendering/textures/decals/filter"))));
-	light_projectors_set_filter(RSE::LightProjectorFilter(int(GLOBAL_GET("rendering/textures/light_projectors/filter"))));
+	decals_set_filter(RS::DecalFilter(int(GLOBAL_GET("rendering/textures/decals/filter"))));
+	light_projectors_set_filter(RS::LightProjectorFilter(int(GLOBAL_GET("rendering/textures/light_projectors/filter"))));
 	lightmaps_set_bicubic_filter(GLOBAL_GET("rendering/lightmapping/lightmap_gi/use_bicubic_filter"));
 	material_set_use_debanding(GLOBAL_GET("rendering/anti_aliasing/quality/use_debanding"));
 
diff --git a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
index 9764e083..266323e2 100644
--- a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
@@ -36,6 +36,9 @@
 #include "servers/rendering/renderer_rd/effects/debug_effects.h"
 #include "servers/rendering/renderer_rd/effects/fsr.h"
 #include "servers/rendering/renderer_rd/effects/luminance.h"
+#ifdef METAL_ENABLED
+#include "servers/rendering/renderer_rd/effects/metal_fx.h"
+#endif
 #include "servers/rendering/renderer_rd/effects/resolve.h"
 #include "servers/rendering/renderer_rd/effects/smaa.h"
 #include "servers/rendering/renderer_rd/effects/tone_mapper.h"
@@ -47,13 +50,9 @@
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/rendering_shader_library.h"
 
-#ifdef METAL_ENABLED
-#include "servers/rendering/renderer_rd/effects/metal_fx.h"
-#endif
-
 class RendererSceneRenderRD : public RendererSceneRender, public RenderingShaderLibrary {
 	friend RendererRD::SkyRD;
 	friend RendererRD::GI;
@@ -105,9 +104,9 @@ protected:
 	bool _needs_post_prepass_render(RenderDataRD *p_render_data, bool p_use_gi);
 	void _post_prepass_render(RenderDataRD *p_render_data, bool p_use_gi);
 
-	bool _compositor_effects_has_flag(const RenderDataRD *p_render_data, RSE::CompositorEffectFlags p_flag, RSE::CompositorEffectCallbackType p_callback_type = RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY);
-	bool _has_compositor_effect(RSE::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
-	void _process_compositor_effects(RSE::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
+	bool _compositor_effects_has_flag(const RenderDataRD *p_render_data, RS::CompositorEffectFlags p_flag, RS::CompositorEffectCallbackType p_callback_type = RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY);
+	bool _has_compositor_effect(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
+	void _process_compositor_effects(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
 	void _render_buffers_ensure_screen_texture(const RenderDataRD *p_render_data);
 	void _render_buffers_copy_screen_texture(const RenderDataRD *p_render_data);
 	void _render_buffers_ensure_depth_texture(const RenderDataRD *p_render_data);
@@ -124,15 +123,15 @@ protected:
 	RendererRD::GI gi;
 
 	virtual void _update_shader_quality_settings() {}
-	static bool _debug_draw_can_use_effects(RSE::ViewportDebugDraw p_debug_draw);
+	static bool _debug_draw_can_use_effects(RS::ViewportDebugDraw p_debug_draw);
 
 private:
-	RSE::ViewportDebugDraw debug_draw = RSE::VIEWPORT_DEBUG_DRAW_DISABLED;
+	RS::ViewportDebugDraw debug_draw = RS::VIEWPORT_DEBUG_DRAW_DISABLED;
 	static RendererSceneRenderRD *singleton;
 
 	/* Shadow atlas */
-	RSE::ShadowQuality shadows_quality = RSE::SHADOW_QUALITY_MAX; //So it always updates when first set
-	RSE::ShadowQuality directional_shadow_quality = RSE::SHADOW_QUALITY_MAX;
+	RS::ShadowQuality shadows_quality = RS::SHADOW_QUALITY_MAX; //So it always updates when first set
+	RS::ShadowQuality directional_shadow_quality = RS::SHADOW_QUALITY_MAX;
 	float shadows_quality_radius = 1.0;
 	float directional_shadow_quality_radius = 1.0;
 
@@ -145,8 +144,8 @@ private:
 	int directional_soft_shadow_samples = 0;
 	int penumbra_shadow_samples = 0;
 	int soft_shadow_samples = 0;
-	RSE::DecalFilter decals_filter = RSE::DECAL_FILTER_LINEAR_MIPMAPS;
-	RSE::LightProjectorFilter light_projectors_filter = RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS;
+	RS::DecalFilter decals_filter = RS::DECAL_FILTER_LINEAR_MIPMAPS;
+	RS::LightProjectorFilter light_projectors_filter = RS::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS;
 	bool material_use_debanding = false;
 
 	/* RENDER BUFFERS */
@@ -174,7 +173,7 @@ public:
 	/* LIGHTING */
 
 	virtual void setup_added_reflection_probe(const Transform3D &p_transform, const Vector3 &p_half_size) {}
-	virtual void setup_added_light(const RSE::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) {}
+	virtual void setup_added_light(const RS::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) {}
 	virtual void setup_added_decal(const Transform3D &p_transform, const Vector3 &p_half_size) {}
 
 	/* GI */
@@ -191,7 +190,7 @@ public:
 	virtual void sky_initialize(RID p_rid) override;
 
 	virtual void sky_set_radiance_size(RID p_sky, int p_radiance_size) override;
-	virtual void sky_set_mode(RID p_sky, RSE::SkyMode p_mode) override;
+	virtual void sky_set_mode(RID p_sky, RS::SkyMode p_mode) override;
 	virtual void sky_set_material(RID p_sky, RID p_material) override;
 	virtual Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) override;
 
@@ -202,9 +201,9 @@ public:
 	virtual void environment_set_volumetric_fog_volume_size(int p_size, int p_depth) override;
 	virtual void environment_set_volumetric_fog_filter_active(bool p_enable) override;
 
-	virtual void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) override;
-	virtual void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) override;
-	virtual void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) override;
+	virtual void environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) override;
+	virtual void environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) override;
+	virtual void environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) override;
 
 	virtual Ref<Image> environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) override;
 
@@ -234,7 +233,7 @@ public:
 	virtual void voxel_gi_instance_set_transform_to_data(RID p_probe, const Transform3D &p_xform) override;
 	virtual bool voxel_gi_needs_update(RID p_probe) const override;
 	virtual void voxel_gi_update(RID p_probe, bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects) override;
-	virtual void voxel_gi_set_quality(RSE::VoxelGIQuality p_quality) override { gi.voxel_gi_quality = p_quality; }
+	virtual void voxel_gi_set_quality(RS::VoxelGIQuality p_quality) override { gi.voxel_gi_quality = p_quality; }
 
 	/* render buffers */
 	virtual RD::DataFormat _render_buffers_get_preferred_color_format();
@@ -246,7 +245,7 @@ public:
 
 	virtual void base_uniforms_changed() = 0;
 
-	virtual void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingServerTypes::RenderInfo *r_render_info = nullptr) override;
+	virtual void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingMethod::RenderInfo *r_render_info = nullptr) override;
 
 	virtual void render_material(const Transform3D &p_cam_transform, const Projection &p_cam_projection, bool p_cam_orthogonal, const PagedArray<RenderGeometryInstance *> &p_instances, RID p_framebuffer, const Rect2i &p_region) override;
 
@@ -264,18 +263,18 @@ public:
 	virtual float screen_space_roughness_limiter_get_amount() const;
 	virtual float screen_space_roughness_limiter_get_limit() const;
 
-	virtual void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override;
-	virtual void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) override;
+	virtual void positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override;
+	virtual void directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) override;
 
-	virtual void decals_set_filter(RSE::DecalFilter p_filter) override;
-	virtual void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) override;
+	virtual void decals_set_filter(RS::DecalFilter p_filter) override;
+	virtual void light_projectors_set_filter(RS::LightProjectorFilter p_filter) override;
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) override;
 	virtual void material_set_use_debanding(bool p_enable) override;
 
-	_FORCE_INLINE_ RSE::ShadowQuality shadows_quality_get() const {
+	_FORCE_INLINE_ RS::ShadowQuality shadows_quality_get() const {
 		return shadows_quality;
 	}
-	_FORCE_INLINE_ RSE::ShadowQuality directional_shadow_quality_get() const {
+	_FORCE_INLINE_ RS::ShadowQuality directional_shadow_quality_get() const {
 		return directional_shadow_quality;
 	}
 	_FORCE_INLINE_ float shadows_quality_radius_get() const {
@@ -314,10 +313,10 @@ public:
 		return soft_shadow_samples;
 	}
 
-	_FORCE_INLINE_ RSE::LightProjectorFilter light_projectors_get_filter() const {
+	_FORCE_INLINE_ RS::LightProjectorFilter light_projectors_get_filter() const {
 		return light_projectors_filter;
 	}
-	_FORCE_INLINE_ RSE::DecalFilter decals_get_filter() const {
+	_FORCE_INLINE_ RS::DecalFilter decals_get_filter() const {
 		return decals_filter;
 	}
 
@@ -334,8 +333,8 @@ public:
 
 	virtual void update() override;
 
-	virtual void set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) override;
-	_FORCE_INLINE_ RSE::ViewportDebugDraw get_debug_draw_mode() const {
+	virtual void set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) override;
+	_FORCE_INLINE_ RS::ViewportDebugDraw get_debug_draw_mode() const {
 		return debug_draw;
 	}
 
diff --git a/engine/servers/rendering/renderer_rd/shader_rd.cpp b/engine/servers/rendering/renderer_rd/shader_rd.cpp
index d264f260..1429a7d2 100644
--- a/engine/servers/rendering/renderer_rd/shader_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/shader_rd.cpp
@@ -30,13 +30,11 @@
 
 #include "shader_rd.h"
 
-#include "core/config/engine.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
-#include "core/string/string_builder.h"
 #include "core/version.h"
+#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/shader_include_db.h"
 
 #define ENABLE_SHADER_CACHE 1
@@ -67,21 +65,6 @@ void ShaderRD::_add_stage(const char *p_code, StageType p_stage_type) {
 				case STAGE_TYPE_COMPUTE:
 					chunk.type = StageTemplate::Chunk::TYPE_COMPUTE_GLOBALS;
 					break;
-				case STAGE_TYPE_RAYGEN:
-					chunk.type = StageTemplate::Chunk::TYPE_RAYGEN_GLOBALS;
-					break;
-				case STAGE_TYPE_ANY_HIT:
-					chunk.type = StageTemplate::Chunk::TYPE_ANY_HIT_GLOBALS;
-					break;
-				case STAGE_TYPE_CLOSEST_HIT:
-					chunk.type = StageTemplate::Chunk::TYPE_CLOSEST_HIT_GLOBALS;
-					break;
-				case STAGE_TYPE_MISS:
-					chunk.type = StageTemplate::Chunk::TYPE_MISS_GLOBALS;
-					break;
-				case STAGE_TYPE_INTERSECTION:
-					chunk.type = StageTemplate::Chunk::TYPE_INTERSECTION_GLOBALS;
-					break;
 				default: {
 				}
 			}
@@ -153,9 +136,9 @@ void ShaderRD::setup(const char *p_vertex_code, const char *p_fragment_code, con
 
 	if (p_compute_code) {
 		_add_stage(p_compute_code, STAGE_TYPE_COMPUTE);
-		pipeline_type = RD::PIPELINE_TYPE_COMPUTE;
+		is_compute = true;
 	} else {
-		pipeline_type = RD::PIPELINE_TYPE_RASTERIZATION;
+		is_compute = false;
 		if (p_vertex_code) {
 			_add_stage(p_vertex_code, STAGE_TYPE_VERTEX);
 		}
@@ -181,47 +164,6 @@ void ShaderRD::setup(const char *p_vertex_code, const char *p_fragment_code, con
 	base_sha256 = tohash.as_string().sha256_text();
 }
 
-void ShaderRD::setup_raytracing(const char *p_raygen_code, const char *p_any_hit_code, const char *p_closest_hit_code, const char *p_miss_code, const char *p_intersection_code, const char *p_name) {
-	name = p_name;
-
-	pipeline_type = RD::PIPELINE_TYPE_RAYTRACING;
-	if (p_raygen_code) {
-		_add_stage(p_raygen_code, STAGE_TYPE_RAYGEN);
-	}
-	if (p_any_hit_code) {
-		_add_stage(p_any_hit_code, STAGE_TYPE_ANY_HIT);
-	}
-	if (p_closest_hit_code) {
-		_add_stage(p_closest_hit_code, STAGE_TYPE_CLOSEST_HIT);
-	}
-	if (p_miss_code) {
-		_add_stage(p_miss_code, STAGE_TYPE_MISS);
-	}
-	if (p_intersection_code) {
-		_add_stage(p_intersection_code, STAGE_TYPE_INTERSECTION);
-	}
-
-	StringBuilder tohash;
-	tohash.append("[GodotVersionNumber]");
-	tohash.append(GODOT_VERSION_NUMBER);
-	tohash.append("[GodotVersionHash]");
-	tohash.append(GODOT_VERSION_HASH);
-	tohash.append("[Raygen]");
-	tohash.append(p_raygen_code ? p_raygen_code : "");
-	tohash.append("[AnyHit]");
-	tohash.append(p_any_hit_code ? p_any_hit_code : "");
-	tohash.append("[ClosestHit]");
-	tohash.append(p_closest_hit_code ? p_closest_hit_code : "");
-	tohash.append("[Miss]");
-	tohash.append(p_miss_code ? p_miss_code : "");
-	tohash.append("[Intersection]");
-	tohash.append(p_intersection_code ? p_intersection_code : "");
-	tohash.append("[DebugInfo]");
-	tohash.append(Engine::get_singleton()->is_generate_spirv_debug_info_enabled() ? "1" : "0");
-
-	base_sha256 = tohash.as_string().sha256_text();
-}
-
 RID ShaderRD::version_create(bool p_embedded) {
 	//initialize() was never called
 	ERR_FAIL_COND_V(group_to_variant_map.is_empty(), RID());
@@ -309,21 +251,6 @@ void ShaderRD::_build_variant_code(StringBuilder &builder, uint32_t p_variant, c
 			case StageTemplate::Chunk::TYPE_COMPUTE_GLOBALS: {
 				builder.append(p_version->compute_globals.get_data()); // compute globals
 			} break;
-			case StageTemplate::Chunk::TYPE_RAYGEN_GLOBALS: {
-				builder.append(p_version->raygen_globals.get_data()); // raygen globals
-			} break;
-			case StageTemplate::Chunk::TYPE_ANY_HIT_GLOBALS: {
-				builder.append(p_version->any_hit_globals.get_data()); // any_hit globals
-			} break;
-			case StageTemplate::Chunk::TYPE_CLOSEST_HIT_GLOBALS: {
-				builder.append(p_version->closest_hit_globals.get_data()); // closest_hit globals
-			} break;
-			case StageTemplate::Chunk::TYPE_MISS_GLOBALS: {
-				builder.append(p_version->miss_globals.get_data()); // miss globals
-			} break;
-			case StageTemplate::Chunk::TYPE_INTERSECTION_GLOBALS: {
-				builder.append(p_version->intersection_globals.get_data()); // intersection globals
-			} break;
 			case StageTemplate::Chunk::TYPE_CODE: {
 				if (p_version->code_sections.has(chunk.code)) {
 					builder.append(p_version->code_sections[chunk.code].get_data());
@@ -344,46 +271,11 @@ Vector<String> ShaderRD::_build_variant_stage_sources(uint32_t p_variant, Compil
 	Vector<String> stage_sources;
 	stage_sources.resize(RD::SHADER_STAGE_MAX);
 
-	if (pipeline_type == RD::PIPELINE_TYPE_COMPUTE) {
+	if (is_compute) {
 		// Compute stage.
 		StringBuilder builder;
 		_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_COMPUTE]);
 		stage_sources.write[RD::SHADER_STAGE_COMPUTE] = builder.as_string();
-	} else if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-		{
-			// Raygen stage.
-			StringBuilder builder;
-			_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_RAYGEN]);
-			stage_sources.write[RD::SHADER_STAGE_RAYGEN] = builder.as_string();
-		}
-
-		{
-			// Any hit stage.
-			StringBuilder builder;
-			_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_ANY_HIT]);
-			stage_sources.write[RD::SHADER_STAGE_ANY_HIT] = builder.as_string();
-		}
-
-		{
-			// Closest hit stage.
-			StringBuilder builder;
-			_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_CLOSEST_HIT]);
-			stage_sources.write[RD::SHADER_STAGE_CLOSEST_HIT] = builder.as_string();
-		}
-
-		{
-			// Miss stage.
-			StringBuilder builder;
-			_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_MISS]);
-			stage_sources.write[RD::SHADER_STAGE_MISS] = builder.as_string();
-		}
-
-		{
-			// Intersection stage.
-			StringBuilder builder;
-			_build_variant_code(builder, p_variant, p_data.version, stage_templates[STAGE_TYPE_INTERSECTION]);
-			stage_sources.write[RD::SHADER_STAGE_INTERSECTION] = builder.as_string();
-		}
 	} else {
 		{
 			// Vertex stage.
@@ -436,9 +328,9 @@ Vector<String> ShaderRD::version_build_variant_stage_sources(RID p_version, int
 	return _build_variant_stage_sources(p_variant, compile_data);
 }
 
-RenderingServerTypes::ShaderNativeSourceCode ShaderRD::version_get_native_source_code(RID p_version) {
+RS::ShaderNativeSourceCode ShaderRD::version_get_native_source_code(RID p_version) {
 	Version *version = version_owner.get_or_null(p_version);
-	RenderingServerTypes::ShaderNativeSourceCode source_code;
+	RS::ShaderNativeSourceCode source_code;
 	ERR_FAIL_NULL_V(version, source_code);
 
 	MutexLock lock(*version->mutex);
@@ -446,105 +338,44 @@ RenderingServerTypes::ShaderNativeSourceCode ShaderRD::version_get_native_source
 	source_code.versions.resize(variant_defines.size());
 
 	for (int i = 0; i < source_code.versions.size(); i++) {
-		if (pipeline_type == RD::PIPELINE_TYPE_RASTERIZATION) {
-			// Vertex stage.
+		if (!is_compute) {
+			//vertex stage
 
 			StringBuilder builder;
 			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_VERTEX]);
 
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
+			RS::ShaderNativeSourceCode::Version::Stage stage;
 			stage.name = "vertex";
 			stage.code = builder.as_string();
 
 			source_code.versions.write[i].stages.push_back(stage);
 		}
 
-		if (pipeline_type == RD::PIPELINE_TYPE_RASTERIZATION) {
-			// Fragment stage.
+		if (!is_compute) {
+			//fragment stage
 
 			StringBuilder builder;
 			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_FRAGMENT]);
 
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
+			RS::ShaderNativeSourceCode::Version::Stage stage;
 			stage.name = "fragment";
 			stage.code = builder.as_string();
 
 			source_code.versions.write[i].stages.push_back(stage);
 		}
 
-		if (pipeline_type == RD::PIPELINE_TYPE_COMPUTE) {
-			// Compute stage.
+		if (is_compute) {
+			//compute stage
 
 			StringBuilder builder;
 			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_COMPUTE]);
 
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
+			RS::ShaderNativeSourceCode::Version::Stage stage;
 			stage.name = "compute";
 			stage.code = builder.as_string();
 
 			source_code.versions.write[i].stages.push_back(stage);
 		}
-
-		if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-			// Raygen stage.
-
-			StringBuilder builder;
-			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_RAYGEN]);
-
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
-			stage.name = "raygen";
-			stage.code = builder.as_string();
-
-			source_code.versions.write[i].stages.push_back(stage);
-		}
-		if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-			// Any hit stage.
-
-			StringBuilder builder;
-			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_ANY_HIT]);
-
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
-			stage.name = "any_hit";
-			stage.code = builder.as_string();
-
-			source_code.versions.write[i].stages.push_back(stage);
-		}
-		if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-			// Closest hit stage.
-
-			StringBuilder builder;
-			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_CLOSEST_HIT]);
-
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
-			stage.name = "closest_hit";
-			stage.code = builder.as_string();
-
-			source_code.versions.write[i].stages.push_back(stage);
-		}
-		if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-			// Miss stage.
-
-			StringBuilder builder;
-			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_MISS]);
-
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
-			stage.name = "miss";
-			stage.code = builder.as_string();
-
-			source_code.versions.write[i].stages.push_back(stage);
-		}
-		if (pipeline_type == RD::PIPELINE_TYPE_RAYTRACING) {
-			// Intersection stage.
-
-			StringBuilder builder;
-			_build_variant_code(builder, i, version, stage_templates[STAGE_TYPE_INTERSECTION]);
-
-			RenderingServerTypes::ShaderNativeSourceCode::Version::Stage stage;
-			stage.name = "intersection";
-			stage.code = builder.as_string();
-
-			source_code.versions.write[i].stages.push_back(stage);
-		}
 	}
 
 	return source_code;
@@ -568,16 +399,6 @@ String ShaderRD::_version_get_sha1(Version *p_version) const {
 	hash_build.append(p_version->fragment_globals.get_data());
 	hash_build.append("[compute_globals]");
 	hash_build.append(p_version->compute_globals.get_data());
-	hash_build.append("[raygen_globals]");
-	hash_build.append(p_version->raygen_globals.get_data());
-	hash_build.append("[any_hit_globals]");
-	hash_build.append(p_version->any_hit_globals.get_data());
-	hash_build.append("[closest_hit_globals]");
-	hash_build.append(p_version->closest_hit_globals.get_data());
-	hash_build.append("[miss_globals]");
-	hash_build.append(p_version->miss_globals.get_data());
-	hash_build.append("[intersection_globals]");
-	hash_build.append(p_version->intersection_globals.get_data());
 
 	Vector<StringName> code_sections;
 	for (const KeyValue<StringName, CharString> &E : p_version->code_sections) {
@@ -787,33 +608,8 @@ void ShaderRD::_compile_ensure_finished(Version *p_version) {
 	}
 }
 
-void ShaderRD::_version_set(Version *p_version, const HashMap<String, String> &p_code, const Vector<String> &p_custom_defines) {
-	p_version->code_sections.clear();
-	for (const KeyValue<String, String> &E : p_code) {
-		p_version->code_sections[StringName(E.key.to_upper())] = E.value.utf8();
-	}
-
-	p_version->custom_defines.clear();
-	for (const String &custom_define : p_custom_defines) {
-		p_version->custom_defines.push_back(custom_define.utf8());
-	}
-
-	p_version->dirty = true;
-	if (p_version->initialize_needed) {
-		_initialize_version(p_version);
-		for (int i = 0; i < group_enabled.size(); i++) {
-			if (!group_enabled[i]) {
-				_allocate_placeholders(p_version, i);
-				continue;
-			}
-			_compile_version_start(p_version, i);
-		}
-		p_version->initialize_needed = false;
-	}
-}
-
 void ShaderRD::version_set_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_vertex_globals, const String &p_fragment_globals, const Vector<String> &p_custom_defines) {
-	ERR_FAIL_COND(pipeline_type != RD::PIPELINE_TYPE_RASTERIZATION);
+	ERR_FAIL_COND(is_compute);
 
 	Version *version = version_owner.get_or_null(p_version);
 	ERR_FAIL_NULL(version);
@@ -825,12 +621,32 @@ void ShaderRD::version_set_code(RID p_version, const HashMap<String, String> &p_
 	version->vertex_globals = p_vertex_globals.utf8();
 	version->fragment_globals = p_fragment_globals.utf8();
 	version->uniforms = p_uniforms.utf8();
+	version->code_sections.clear();
+	for (const KeyValue<String, String> &E : p_code) {
+		version->code_sections[StringName(E.key.to_upper())] = E.value.utf8();
+	}
 
-	_version_set(version, p_code, p_custom_defines);
+	version->custom_defines.clear();
+	for (int i = 0; i < p_custom_defines.size(); i++) {
+		version->custom_defines.push_back(p_custom_defines[i].utf8());
+	}
+
+	version->dirty = true;
+	if (version->initialize_needed) {
+		_initialize_version(version);
+		for (int i = 0; i < group_enabled.size(); i++) {
+			if (!group_enabled[i]) {
+				_allocate_placeholders(version, i);
+				continue;
+			}
+			_compile_version_start(version, i);
+		}
+		version->initialize_needed = false;
+	}
 }
 
 void ShaderRD::version_set_compute_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_compute_globals, const Vector<String> &p_custom_defines) {
-	ERR_FAIL_COND(pipeline_type != RD::PIPELINE_TYPE_COMPUTE);
+	ERR_FAIL_COND(!is_compute);
 
 	Version *version = version_owner.get_or_null(p_version);
 	ERR_FAIL_NULL(version);
@@ -842,23 +658,28 @@ void ShaderRD::version_set_compute_code(RID p_version, const HashMap<String, Str
 	version->compute_globals = p_compute_globals.utf8();
 	version->uniforms = p_uniforms.utf8();
 
-	_version_set(version, p_code, p_custom_defines);
-}
+	version->code_sections.clear();
+	for (const KeyValue<String, String> &E : p_code) {
+		version->code_sections[StringName(E.key.to_upper())] = E.value.utf8();
+	}
 
-void ShaderRD::version_set_raytracing_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_raygen_globals, const String &p_any_hit_globals, const String &p_closest_hit_globals, const String &p_miss_globals, const String &p_intersection_globals, const Vector<String> &p_custom_defines) {
-	ERR_FAIL_COND(pipeline_type != RD::PIPELINE_TYPE_RAYTRACING);
+	version->custom_defines.clear();
+	for (int i = 0; i < p_custom_defines.size(); i++) {
+		version->custom_defines.push_back(p_custom_defines[i].utf8());
+	}
 
-	Version *version = version_owner.get_or_null(p_version);
-	ERR_FAIL_NULL(version);
-
-	version->raygen_globals = p_raygen_globals.utf8();
-	version->any_hit_globals = p_any_hit_globals.utf8();
-	version->closest_hit_globals = p_closest_hit_globals.utf8();
-	version->miss_globals = p_miss_globals.utf8();
-	version->intersection_globals = p_intersection_globals.utf8();
-	version->uniforms = p_uniforms.utf8();
-
-	_version_set(version, p_code, p_custom_defines);
+	version->dirty = true;
+	if (version->initialize_needed) {
+		_initialize_version(version);
+		for (int i = 0; i < group_enabled.size(); i++) {
+			if (!group_enabled[i]) {
+				_allocate_placeholders(version, i);
+				continue;
+			}
+			_compile_version_start(version, i);
+		}
+		version->initialize_needed = false;
+	}
 }
 
 bool ShaderRD::version_is_valid(RID p_version) {
diff --git a/engine/servers/rendering/renderer_rd/shader_rd.h b/engine/servers/rendering/renderer_rd/shader_rd.h
index 9ec4cbd0..e5bd4e5b 100644
--- a/engine/servers/rendering/renderer_rd/shader_rd.h
+++ b/engine/servers/rendering/renderer_rd/shader_rd.h
@@ -31,13 +31,12 @@
 #pragma once
 
 #include "core/os/mutex.h"
+#include "core/string/string_builder.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_types.h"
-
-class StringBuilder;
+#include "core/templates/self_list.h"
+#include "servers/rendering/rendering_server.h"
 
 class ShaderRD {
 public:
@@ -74,11 +73,6 @@ private:
 		CharString vertex_globals;
 		CharString compute_globals;
 		CharString fragment_globals;
-		CharString raygen_globals;
-		CharString any_hit_globals;
-		CharString closest_hit_globals;
-		CharString miss_globals;
-		CharString intersection_globals;
 		HashMap<StringName, CharString> code_sections;
 		Vector<CharString> custom_defines;
 		Vector<WorkerThreadPool::GroupID> group_compilation_tasks;
@@ -119,11 +113,6 @@ private:
 				TYPE_VERTEX_GLOBALS,
 				TYPE_FRAGMENT_GLOBALS,
 				TYPE_COMPUTE_GLOBALS,
-				TYPE_RAYGEN_GLOBALS,
-				TYPE_ANY_HIT_GLOBALS,
-				TYPE_CLOSEST_HIT_GLOBALS,
-				TYPE_MISS_GLOBALS,
-				TYPE_INTERSECTION_GLOBALS,
 				TYPE_CODE,
 				TYPE_TEXT
 			};
@@ -135,7 +124,7 @@ private:
 		LocalVector<Chunk> chunks;
 	};
 
-	RD::PipelineType pipeline_type = RD::PIPELINE_TYPE_RASTERIZATION;
+	bool is_compute = false;
 
 	String name;
 
@@ -160,11 +149,6 @@ private:
 		STAGE_TYPE_VERTEX,
 		STAGE_TYPE_FRAGMENT,
 		STAGE_TYPE_COMPUTE,
-		STAGE_TYPE_RAYGEN,
-		STAGE_TYPE_ANY_HIT,
-		STAGE_TYPE_CLOSEST_HIT,
-		STAGE_TYPE_MISS,
-		STAGE_TYPE_INTERSECTION,
 		STAGE_TYPE_MAX,
 	};
 
@@ -181,19 +165,16 @@ private:
 	bool _load_from_cache(Version *p_version, int p_group);
 	void _save_to_cache(Version *p_version, int p_group);
 	void _initialize_cache();
-	void _version_set(Version *p_version, const HashMap<String, String> &p_code, const Vector<String> &p_custom_defines);
 
 protected:
 	ShaderRD();
 	void setup(const char *p_vertex_code, const char *p_fragment_code, const char *p_compute_code, const char *p_name);
-	void setup_raytracing(const char *p_raygen_code, const char *p_any_hit_code, const char *p_closest_hit_code, const char *p_miss_code, const char *p_intersection_code, const char *p_name);
 
 public:
 	RID version_create(bool p_embedded = true);
 
 	void version_set_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_vertex_globals, const String &p_fragment_globals, const Vector<String> &p_custom_defines);
 	void version_set_compute_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_compute_globals, const Vector<String> &p_custom_defines);
-	void version_set_raytracing_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_raygen_globals, const String &p_any_hit_globals, const String &p_closest_hit_globals, const String &p_miss_globals, const String &p_intersection_globals, const Vector<String> &p_custom_defines);
 
 	_FORCE_INLINE_ RID version_get_shader(RID p_version, int p_variant) {
 		ERR_FAIL_INDEX_V(p_variant, variant_defines.size(), RID());
@@ -263,7 +244,7 @@ public:
 	static PackedByteArray save_shader_cache_bytes(const LocalVector<int> &p_variants, const Vector<Vector<uint8_t>> &p_variant_data);
 
 	Vector<String> version_build_variant_stage_sources(RID p_version, int p_variant);
-	RenderingServerTypes::ShaderNativeSourceCode version_get_native_source_code(RID p_version);
+	RS::ShaderNativeSourceCode version_get_native_source_code(RID p_version);
 	String version_get_cache_file_relative_path(RID p_version, int p_group, const String &p_api_name);
 
 	struct DynamicBuffer {
diff --git a/engine/servers/rendering/renderer_rd/shaders/blit.glsl b/engine/servers/rendering/renderer_rd/shaders/blit.glsl
index 78b22eef..d8ba4493 100644
--- a/engine/servers/rendering/renderer_rd/shaders/blit.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/blit.glsl
@@ -10,22 +10,17 @@ layout(push_constant, std140) uniform Pos {
 
 	float rotation_sin;
 	float rotation_cos;
-	vec2 eye_center;
 
+	vec2 eye_center;
 	float k1;
 	float k2;
+
 	float upscale;
 	float aspect_ratio;
-
 	uint layer;
-	bool source_is_srgb;
+	bool convert_to_srgb;
 	bool use_debanding;
-	uint target_color_space;
-
-	float reference_multiplier;
-	float output_max_value;
-	uint pad1;
-	uint pad2;
+	float pad;
 }
 data;
 
@@ -56,22 +51,17 @@ layout(push_constant, std140) uniform Pos {
 
 	float rotation_sin;
 	float rotation_cos;
-	vec2 eye_center;
 
+	vec2 eye_center;
 	float k1;
 	float k2;
+
 	float upscale;
 	float aspect_ratio;
-
 	uint layer;
-	bool source_is_srgb;
+	bool convert_to_srgb;
 	bool use_debanding;
-	uint target_color_space;
-
-	float reference_multiplier;
-	float output_max_value;
-	uint pad1;
-	uint pad2;
+	float pad;
 }
 data;
 
@@ -85,14 +75,6 @@ layout(binding = 0) uniform sampler2DArray src_rt;
 layout(binding = 0) uniform sampler2D src_rt;
 #endif
 
-// Keep in sync with `RenderingDeviceCommons::ColorSpace`.
-#define COLOR_SPACE_REC709_LINEAR 0
-#define COLOR_SPACE_REC709_NONLINEAR_SRGB 1
-
-vec3 srgb_to_linear(vec3 color) {
-	return mix(pow((color.rgb + vec3(0.055)) * (1.0 / (1.0 + 0.055)), vec3(2.4)), color.rgb * (1.0 / 12.92), lessThan(color.rgb, vec3(0.04045)));
-}
-
 vec3 linear_to_srgb(vec3 color) {
 	const vec3 a = vec3(0.055f);
 	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
@@ -151,41 +133,19 @@ void main() {
 	color = texture(src_rt, uv);
 #endif
 
-	// Colorspace conversion for final blit.
-	if (data.target_color_space == COLOR_SPACE_REC709_LINEAR) {
-		if (data.source_is_srgb == true) {
-			// sRGB -> linear conversion
-			color.rgb = srgb_to_linear(color.rgb);
+	if (data.convert_to_srgb) {
+		color.rgb = linear_to_srgb(color.rgb); // Regular linear -> SRGB conversion.
+
+		// Even if debanding was applied earlier in the rendering process, it must
+		// be reapplied after the linear_to_srgb floating point operations.
+		// When the linear_to_srgb operation was not performed, the source is
+		// already an 8-bit format and debanding cannot be effective. In this
+		// case, GPU driver rounding error can add noise so debanding should be
+		// skipped entirely.
+		if (data.use_debanding) {
+			color.rgb += screen_space_dither(gl_FragCoord.xy);
 		}
 
-		// Negative values may be interpreted as scRGB colors,
-		// so clip them to the intended Rec. 709 colors.
-		// Additionally, it is important that the game developer can trust that
-		// Window.output_max_linear_value is truly the max output value, even if
-		// the max luminance has been misconfigured by the player. This ensures that
-		// the resulting image will always be as the game developer expects when they
-		// use Window.output_max_linear_value and tonemapping functions will behave
-		// as expected.
-		color.rgb = clamp(color.rgb, vec3(0.0), vec3(data.output_max_value));
-
-		// Adjust brightness of SDR content to reference luminance.
-		color.rgb *= data.reference_multiplier;
-	} else if (data.target_color_space == COLOR_SPACE_REC709_NONLINEAR_SRGB) {
-		// Negative values and values above 1.0 will be clipped by the target,
-		// so no need to clip them here.
-		if (data.source_is_srgb == false) {
-			// linear -> sRGB conversion
-			color.rgb = linear_to_srgb(color.rgb);
-
-			// Even if debanding was applied earlier in the rendering process, it must
-			// be reapplied after the linear_to_srgb floating point operations.
-			// When the linear_to_srgb operation was not performed, the source is
-			// already an 8-bit format and debanding cannot be effective. In this
-			// case, GPU driver rounding error can add noise so debanding should be
-			// skipped entirely.
-			if (data.use_debanding) {
-				color.rgb += screen_space_dither(gl_FragCoord.xy);
-			}
-		}
+		color.rgb = clamp(color.rgb, vec3(0.0), vec3(1.0));
 	}
 }
diff --git a/engine/servers/rendering/renderer_rd/shaders/cluster_render.glsl b/engine/servers/rendering/renderer_rd/shaders/cluster_render.glsl
index 126bd75f..91ab7488 100644
--- a/engine/servers/rendering/renderer_rd/shaders/cluster_render.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/cluster_render.glsl
@@ -69,10 +69,6 @@ void main() {
 #extension GL_KHR_shader_subgroup_arithmetic : enable
 #extension GL_KHR_shader_subgroup_vote : enable
 
-// On Apple platforms, gl_HelperInvocation (simd_is_helper_thread()) is unreliable with MSAA, causing rendering artifacts.
-// Setting this to false will disable the helper invocation check.
-layout(constant_id = 0) const bool sc_use_helper_check = true;
-
 layout(location = 0) in float depth_interp;
 layout(location = 1) in flat uint element_index;
 
@@ -118,7 +114,11 @@ void main() {
 	uint aux = 0;
 
 	uint cluster_thread_group_index;
-	if (!sc_use_helper_check || !gl_HelperInvocation) {
+#ifndef MOLTENVK_USED
+	if (!gl_HelperInvocation) {
+#else
+	{
+#endif
 		//https://advances.realtimerendering.com/s2017/2017_Sig_Improved_Culling_final.pdf
 
 		uvec4 mask;
@@ -151,7 +151,11 @@ void main() {
 	uint z_write_offset = cluster_offset + state.cluster_depth_offset + element_index;
 	uint z_write_bit = 1 << z_bit;
 
-	if (!sc_use_helper_check || !gl_HelperInvocation) {
+#ifndef MOLTENVK_USED
+	if (!gl_HelperInvocation) {
+#else
+	{
+#endif
 		z_write_bit = subgroupOr(z_write_bit); //merge all Zs
 		if (cluster_thread_group_index == 0) {
 			aux = atomicOr(cluster_render.data[z_write_offset], z_write_bit);
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/copy_to_fb.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/copy_to_fb.glsl
index 39382a08..a348bc99 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/copy_to_fb.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/copy_to_fb.glsl
@@ -106,6 +106,8 @@ layout(set = 1, binding = 0) uniform sampler2D source_color2;
 layout(location = 0) out vec4 frag_color;
 
 vec3 linear_to_srgb(vec3 color) {
+	//if going to srgb, clamp from 0 to 1.
+	color = clamp(color, vec3(0.0), vec3(1.0));
 	const vec3 a = vec3(0.055f);
 	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
 }
@@ -177,7 +179,6 @@ void main() {
 	}
 	if (bool(params.flags & FLAG_SRGB)) {
 		color.rgb = linear_to_srgb(color.rgb);
-		color.rgb = clamp(color.rgb, vec3(0.0), vec3(1.0));
 	}
 	if (bool(params.flags & FLAG_ALPHA_TO_ONE)) {
 		color.a = 1.0;
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/cube_to_octmap.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/cube_to_octmap.glsl
index 0c51dffe..faf62fa0 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/cube_to_octmap.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/cube_to_octmap.glsl
@@ -27,9 +27,6 @@ layout(set = 0, binding = 0) uniform samplerCube source_cube;
 
 layout(push_constant, std430) uniform Params {
 	float border_size;
-	uint pad1;
-	uint pad2;
-	uint pad3;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl
index ed262ab6..221e97be 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl
@@ -60,8 +60,6 @@ layout(push_constant, std430) uniform Params {
 	float upscaled_height;
 	float sharpness;
 	int pass;
-	int pad1;
-	int pad2;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl
index 64e2108d..d02ffe0b 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl
@@ -30,8 +30,7 @@ layout(location = 0) out vec4 frag_color;
 layout(push_constant, std430) uniform Params {
 	highp mat4 reprojection_matrix;
 	vec2 resolution;
-	uint force_derive_from_depth;
-	uint pad;
+	bool force_derive_from_depth;
 }
 params;
 
@@ -56,7 +55,7 @@ void main() {
 	vec2 cell_pos_pixel = floor(pos_pixel / cell_size) * cell_size + (cell_size * 0.5f);
 	vec2 cell_pos_uv = cell_pos_pixel / params.resolution;
 	vec2 cell_pos_velocity = textureLod(source_velocity, cell_pos_uv, 0.0f).xy;
-	bool derive_velocity = bool(params.force_derive_from_depth) || all(lessThanEqual(cell_pos_velocity, vec2(-1.0f, -1.0f)));
+	bool derive_velocity = params.force_derive_from_depth || all(lessThanEqual(cell_pos_velocity, vec2(-1.0f, -1.0f)));
 	if (derive_velocity) {
 		float depth = textureLod(source_depth, cell_pos_uv, 0.0f).x;
 		cell_pos_velocity = derive_motion_vector(cell_pos_uv, depth, params.reprojection_matrix);
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler.glsl
index ff5cb2c3..1ae91212 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler.glsl
@@ -37,7 +37,7 @@ layout(OCTMAP_FORMAT, set = 1, binding = 0) uniform restrict writeonly image2D d
 layout(push_constant, std430) uniform Params {
 	float border_size;
 	uint size;
-	uint pad1;
+	uint pad;
 	uint pad2;
 }
 params;
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler_raster.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler_raster.glsl
index 16a922f9..24097e66 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler_raster.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/octmap_downsampler_raster.glsl
@@ -28,10 +28,7 @@
 #include "../oct_inc.glsl"
 
 layout(push_constant, std430) uniform Params {
-	float border_size;
 	uint size;
-	uint pad1;
-	uint pad2;
 }
 params;
 
@@ -67,10 +64,7 @@ void main() {
 #include "../oct_inc.glsl"
 
 layout(push_constant, std430) uniform Params {
-	float border_size;
 	uint size;
-	uint pad1;
-	uint pad2;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl
index 3d00480e..e043d6e8 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl
@@ -29,9 +29,6 @@ layout(push_constant, std430) uniform Params {
 	float depth_tolerance;
 	bool orthogonal;
 	int view_index;
-	int pad1;
-	int pad2;
-	int pad3;
 }
 params;
 
@@ -311,11 +308,7 @@ void main() {
 				blur_radius = (a * (sqrt(a2 + fh2) - a)) / (4.0 * h);
 			}
 
-			// We approximate the integration in world space with a blur in screen space,
-			// and use a mip bias, `log2(/* screen_space_blur_radius */ + 1.0)`, to approximate the screen space blur.
-			// This + 1.0 is needed because mip level is logarithmic to the diameter (in pixels) of sampling region,
-			// which is 1 pixel when no blur is applied (log2(1) = 0).
-			mip_level = clamp(log2(blur_radius * max(params.screen_size.x, params.screen_size.y) / 16.0 + 1.0), 0, params.mipmaps - 1);
+			mip_level = clamp(log2(blur_radius * max(params.screen_size.x, params.screen_size.y) / 16.0), 0, params.mipmaps - 1);
 		}
 
 		// Because we still write mip level for invalid pixels to allow for smooth roughness transitions,
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_downsample.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_downsample.glsl
index 712623d7..ec96454d 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_downsample.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_downsample.glsl
@@ -13,7 +13,6 @@ layout(rgba8, set = 0, binding = 3) uniform restrict writeonly image2D dest_norm
 
 layout(push_constant, std430) uniform Params {
 	ivec2 screen_size;
-	ivec2 pad;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl
index 6ca626ee..05d69fed 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl
@@ -12,7 +12,6 @@ layout(set = 0, binding = 1) uniform restrict writeonly image2D dest;
 layout(push_constant, std430) uniform Params {
 	ivec2 screen_size;
 	uint mip_level;
-	int pad;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_hiz.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_hiz.glsl
index 3d1f273e..8b05d382 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_hiz.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_hiz.glsl
@@ -11,7 +11,6 @@ layout(r32f, set = 0, binding = 1) uniform restrict writeonly image2D dest;
 
 layout(push_constant, std430) uniform Params {
 	ivec2 screen_size;
-	ivec2 pad;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_resolve.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_resolve.glsl
index d50093f4..db2a79fe 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_resolve.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_resolve.glsl
@@ -16,7 +16,6 @@ layout(rgba16f, set = 0, binding = 6) uniform restrict writeonly image2D output_
 
 layout(push_constant, std430) uniform Params {
 	ivec2 screen_size;
-	ivec2 pad;
 }
 params;
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/smaa_blending.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/smaa_blending.glsl
index 525f455a..9d9765f3 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/smaa_blending.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/smaa_blending.glsl
@@ -75,6 +75,8 @@ params;
 #define textureLinear(tex, uv) srgb_to_linear(textureLod(tex, uv, 0.0).rgb)
 
 vec3 linear_to_srgb(vec3 color) {
+	// If going to srgb, clamp from 0 to 1.
+	color = clamp(color, vec3(0.0), vec3(1.0));
 	const vec3 a = vec3(0.055f);
 	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
 }
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
index 0d665925..85690090 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
@@ -69,7 +69,7 @@ layout(push_constant, std430) uniform Params {
 
 	vec2 pixel_size;
 	uint tonemapper;
-	float output_max_value;
+	uint pad;
 
 	uvec2 glow_texture_size;
 	float glow_intensity;
@@ -92,8 +92,9 @@ layout(location = 0) out vec4 frag_color;
 // Based on Reinhard's extended formula, see equation 4 in https://doi.org/cjbgrt
 vec3 tonemap_reinhard(vec3 color) {
 	float white_squared = params.tonemapper_params.x;
-	// Updated version of the Reinhard tonemapper supporting HDR rendering.
-	return color * (1.0f + color / white_squared) / (1.0f + color / params.output_max_value);
+	vec3 white_squared_color = white_squared * color;
+	// Equivalent to color * (1 + color / white_squared) / (1 + color)
+	return (white_squared_color + color * color) / (white_squared_color + white_squared);
 }
 
 vec3 tonemap_filmic(vec3 color) {
@@ -147,12 +148,14 @@ vec3 tonemap_aces(vec3 color) {
 // Source and details: https://allenwp.com/blog/2025/05/29/allenwp-tonemapping-curve/
 // Input must be a non-negative linear scene value.
 vec3 allenwp_curve(vec3 x) {
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0
+
 	// These constants must match the those in the C++ code that calculates the parameters.
 	// 18% "middle gray" is perceptually 50% of the brightness of reference white.
 	const float awp_crossover_point = 0.18;
 	// When output_max_value and/or awp_crossover_point are no longer constant,
 	// awp_shoulder_max can be calculated on the CPU and passed in as params.tonemap_e.
-	const float awp_shoulder_max = params.output_max_value - awp_crossover_point;
+	const float awp_shoulder_max = output_max_value - awp_crossover_point;
 
 	float awp_contrast = params.tonemapper_params.x;
 	float awp_toe_a = params.tonemapper_params.y;
@@ -207,6 +210,8 @@ vec3 tonemap_agx(vec3 color) {
 			-0.855988495690215, 1.32639796461980, -0.238183969428088,
 			-0.108898916004672, -0.0270845997150571, 1.40253671195648);
 
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0
+
 	// Apply inset matrix.
 	color = rec709_to_rec2020_agx_inset_matrix * color;
 
@@ -216,7 +221,7 @@ vec3 tonemap_agx(vec3 color) {
 
 	// Clipping to output_max_value is required to address a cyan colour that occurs
 	// with very bright inputs.
-	color = min(vec3(params.output_max_value), color);
+	color = min(vec3(output_max_value), color);
 
 	// Apply outset to make the result more chroma-laden and then go back to Rec. 709.
 	color = agx_outset_rec2020_to_rec709_matrix * color;
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl
index b3f3d944..369cd25d 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/tonemap_mobile.glsl
@@ -92,9 +92,6 @@ layout(push_constant, std430) uniform Params {
 	float white;
 
 	vec4 tonemapper_params;
-
-	float output_max_value;
-	float pad[3];
 }
 params;
 
@@ -103,8 +100,9 @@ layout(location = 0) out vec4 frag_color;
 // Based on Reinhard's extended formula, see equation 4 in https://doi.org/cjbgrt
 vec3 tonemap_reinhard(vec3 color) {
 	float white_squared = params.tonemapper_params.x;
-	// Updated version of the Reinhard tonemapper supporting HDR rendering.
-	return color * (1.0f + color / white_squared) / (1.0f + color / params.output_max_value);
+	vec3 white_squared_color = white_squared * color;
+	// Equivalent to color * (1 + color / white_squared) / (1 + color)
+	return (white_squared_color + color * color) / (white_squared_color + white_squared);
 }
 
 vec3 tonemap_filmic(vec3 color) {
@@ -158,12 +156,14 @@ vec3 tonemap_aces(vec3 color) {
 // Source and details: https://allenwp.com/blog/2025/05/29/allenwp-tonemapping-curve/
 // Input must be a non-negative linear scene value.
 vec3 allenwp_curve(vec3 x) {
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0
+
 	// These constants must match the those in the C++ code that calculates the parameters.
 	// 18% "middle gray" is perceptually 50% of the brightness of reference white.
 	const float awp_crossover_point = 0.18;
 	// When output_max_value and/or awp_crossover_point are no longer constant,
 	// awp_shoulder_max can be calculated on the CPU and passed in as params.tonemap_e.
-	const float awp_shoulder_max = params.output_max_value - awp_crossover_point;
+	const float awp_shoulder_max = output_max_value - awp_crossover_point;
 
 	float awp_contrast = params.tonemapper_params.x;
 	float awp_toe_a = params.tonemapper_params.y;
@@ -218,6 +218,8 @@ vec3 tonemap_agx(vec3 color) {
 			-0.855988495690215, 1.32639796461980, -0.238183969428088,
 			-0.108898916004672, -0.0270845997150571, 1.40253671195648);
 
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0
+
 	// Apply inset matrix.
 	color = rec709_to_rec2020_agx_inset_matrix * color;
 
@@ -227,7 +229,7 @@ vec3 tonemap_agx(vec3 color) {
 
 	// Clipping to output_max_value is required to address a cyan colour that occurs
 	// with very bright inputs.
-	color = min(vec3(params.output_max_value), color);
+	color = min(vec3(output_max_value), color);
 
 	// Apply outset to make the result more chroma-laden and then go back to Rec. 709.
 	color = agx_outset_rec2020_to_rec709_matrix * color;
diff --git a/engine/servers/rendering/renderer_rd/shaders/environment/sdfgi_debug.glsl b/engine/servers/rendering/renderer_rd/shaders/environment/sdfgi_debug.glsl
index 947941ec..177dab16 100644
--- a/engine/servers/rendering/renderer_rd/shaders/environment/sdfgi_debug.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/environment/sdfgi_debug.glsl
@@ -50,6 +50,8 @@ layout(push_constant, std430) uniform Params {
 params;
 
 vec3 linear_to_srgb(vec3 color) {
+	//if going to srgb, clamp from 0 to 1.
+	color = clamp(color, vec3(0.0), vec3(1.0));
 	const vec3 a = vec3(0.055f);
 	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
 }
@@ -179,5 +181,5 @@ void main() {
 
 #endif
 
-	imageStore(screen_buffer, screen_pos, vec4(clamp(linear_to_srgb(light), vec3(0.0), vec3(1.0)), 1.0));
+	imageStore(screen_buffer, screen_pos, vec4(linear_to_srgb(light), 1.0));
 }
diff --git a/engine/servers/rendering/renderer_rd/shaders/environment/sky.glsl b/engine/servers/rendering/renderer_rd/shaders/environment/sky.glsl
index 1662007b..a34ead01 100644
--- a/engine/servers/rendering/renderer_rd/shaders/environment/sky.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/environment/sky.glsl
@@ -216,8 +216,8 @@ void main() {
 	cube_normal += sky_scene_data.view_eye_offsets[ViewIndex].xyz;
 #else
 	cube_normal.z = -1.0;
-	cube_normal.x = (uv_interp.x + params.projection.x) / params.projection.y;
-	cube_normal.y = (uv_interp.y + params.projection.z) / params.projection.w;
+	cube_normal.x = (cube_normal.z * (-uv_interp.x - params.projection.x)) / params.projection.y;
+	cube_normal.y = -(cube_normal.z * (uv_interp.y - params.projection.z)) / params.projection.w;
 #endif
 	cube_normal = mat3(params.orientation) * cube_normal;
 	cube_normal = normalize(cube_normal);
diff --git a/engine/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl b/engine/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
index c75e4aca..09505902 100644
--- a/engine/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
@@ -1754,32 +1754,37 @@ void fragment_shader(in SceneData scene_data) {
 #endif
 
 #ifdef LIGHT_CLEARCOAT_USED
-	vec3 cc_specular_light = vec3(0.0);
-	vec3 cc_ref_vec = vec3(0.0);
 
 	if (bool(scene_data.flags & SCENE_DATA_FLAGS_USE_REFLECTION_CUBEMAP)) {
-		cc_ref_vec = reflect(-view, geo_normal);
-		cc_ref_vec = mix(cc_ref_vec, geo_normal, mix(0.001, 0.1, clearcoat_roughness));
+		float NoV = max(dot(geo_normal, view), 0.0001); // We want to use geometric normal, not normal_map
+		vec3 ref_vec = reflect(-view, geo_normal);
+		ref_vec = mix(ref_vec, geo_normal, clearcoat_roughness * clearcoat_roughness);
+		// The clear coat layer assumes an IOR of 1.5 (4% reflectance)
+		float Fc = clearcoat * (0.04 + 0.96 * SchlickFresnel(NoV));
+		float attenuation = 1.0 - Fc;
+		ambient_light *= attenuation;
+		indirect_specular_light *= attenuation;
 
-		vec3 cc_radiance_ref_vec = scene_data.radiance_inverse_xform * cc_ref_vec;
-		float roughness_lod = sqrt(mix(0.001, 0.1, clearcoat_roughness)) * MAX_ROUGHNESS_LOD;
+		float horizon = min(1.0 + dot(ref_vec, indirect_normal), 1.0);
+		ref_vec = scene_data.radiance_inverse_xform * ref_vec;
+		float roughness_lod = mix(0.001, 0.1, sqrt(clearcoat_roughness)) * MAX_ROUGHNESS_LOD;
 #ifdef USE_RADIANCE_OCTMAP_ARRAY
 
 		float lod, blend;
 		blend = modf(roughness_lod, lod);
 
-		float ref_lod = vec3_to_oct_lod(dFdx(cc_radiance_ref_vec), dFdy(cc_radiance_ref_vec), scene_data_block.data.radiance_pixel_size);
-		vec2 ref_uv = vec3_to_oct_with_border(cc_radiance_ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
+		float ref_lod = vec3_to_oct_lod(dFdx(ref_vec), dFdy(ref_vec), scene_data_block.data.radiance_pixel_size);
+		vec2 ref_uv = vec3_to_oct_with_border(ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
 		vec3 clearcoat_sample_a = textureLod(sampler2DArray(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), vec3(ref_uv, lod), ref_lod).rgb;
 		vec3 clearcoat_sample_b = textureLod(sampler2DArray(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), vec3(ref_uv, lod + 1), ref_lod).rgb;
 		vec3 clearcoat_light = mix(clearcoat_sample_a, clearcoat_sample_b, blend);
 
 #else
-		vec2 ref_uv = vec3_to_oct_with_border(cc_radiance_ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
+		vec2 ref_uv = vec3_to_oct_with_border(ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
 		vec3 clearcoat_light = textureLod(sampler2D(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), ref_uv, roughness_lod).rgb;
 
 #endif //USE_RADIANCE_OCTMAP_ARRAY
-		cc_specular_light += clearcoat_light * scene_data.IBL_exposure_normalization * scene_data.ambient_light_color_energy.a;
+		indirect_specular_light += clearcoat_light * horizon * horizon * Fc * scene_data.ambient_light_color_energy.a;
 	}
 #endif // LIGHT_CLEARCOAT_USED
 #endif // !AMBIENT_LIGHT_DISABLED
@@ -2031,9 +2036,6 @@ void fragment_shader(in SceneData scene_data) {
 
 		vec4 reflection_accum = vec4(0.0, 0.0, 0.0, 0.0);
 		vec4 ambient_accum = vec4(0.0, 0.0, 0.0, 0.0);
-#ifdef LIGHT_CLEARCOAT_USED
-		vec3 cc_reflection_accum = vec3(0.0, 0.0, 0.0);
-#endif
 
 		uint cluster_reflection_offset = cluster_offset + implementation_data.cluster_type_size * 3;
 
@@ -2083,11 +2085,7 @@ void fragment_shader(in SceneData scene_data) {
 					break;
 				}
 
-				reflection_process(reflection_index, vertex, ref_vec, normal, roughness, ambient_light, indirect_specular_light,
-#ifdef LIGHT_CLEARCOAT_USED
-						cc_specular_light, cc_ref_vec, mix(0.001, 0.1, clearcoat_roughness), cc_reflection_accum,
-#endif
-						ambient_accum, reflection_accum);
+				reflection_process(reflection_index, vertex, ref_vec, normal, roughness, ambient_light, indirect_specular_light, ambient_accum, reflection_accum);
 			}
 		}
 
@@ -2101,9 +2099,6 @@ void fragment_shader(in SceneData scene_data) {
 
 		if (reflection_accum.a > 0.0) {
 			indirect_specular_light = reflection_accum.rgb;
-#ifdef LIGHT_CLEARCOAT_USED
-			cc_specular_light = cc_reflection_accum.rgb;
-#endif
 		}
 
 #if !defined(USE_LIGHTMAP)
@@ -2211,15 +2206,6 @@ void fragment_shader(in SceneData scene_data) {
 
 	//this saves some VGPRs
 	vec3 f0 = F0(metallic, specular, albedo);
-
-#ifdef LIGHT_CLEARCOAT_USED
-	// The base layer's f0 is computed assuming an interface from air to an IOR
-	// of 1.5, but the clear coat layer forms an interface from IOR 1.5 to IOR
-	// 1.5. We recompute f0 by first computing its IOR, then reconverting to f0
-	// by using the correct interface
-	f0 = mix(f0, f0_Clear_Coat_To_Surface(f0), clearcoat);
-#endif
-
 #ifndef AMBIENT_LIGHT_DISABLED
 	{
 #if defined(DIFFUSE_TOON)
@@ -2235,24 +2221,7 @@ void fragment_shader(in SceneData scene_data) {
 		// cheap luminance approximation
 		float f90 = clamp(50.0 * f0.g, metallic, 1.0);
 		indirect_specular_light *= energy_compensation * ((f90 - f0) * envBRDF.x + f0 * envBRDF.y);
-
-#ifdef LIGHT_CLEARCOAT_USED
-		float geo_NdotV = max(dot(geo_normal, view), 0.0001); // We want to use geometric normal, not normal_map
-		// The clearcoat layer assumes an IOR of 1.5 (4% reflectance).
-		// Attenuate underlying diffuse/specular by clearcoat fresnel (ONLY fresnel, hence we don't just invert the BRDF below).
-		float NdotV5 = SchlickFresnel(geo_NdotV);
-		float F = mix(0.04, 1.0, NdotV5) * clearcoat;
-		float cc_attenuation = 1.0 - F;
-
-		ambient_light *= cc_attenuation;
-		indirect_specular_light *= cc_attenuation;
-
-		// Clearcoat Layer
-		// We don't need DFG for clearcoat, so we can use the fresnel directly.
-		indirect_specular_light += cc_specular_light * F;
 #endif
-
-#endif // DIFFUSE_TOON
 	}
 
 #endif // !AMBIENT_LIGHT_DISABLED
diff --git a/engine/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl b/engine/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
index 4ab5d23d..c1abc32e 100644
--- a/engine/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
@@ -1652,31 +1652,34 @@ void main() {
 	ambient_light = mix(ambient_light, custom_irradiance.rgb, custom_irradiance.a);
 #endif // CUSTOM_IRRADIANCE_USED
 #ifdef LIGHT_CLEARCOAT_USED
-	hvec3 cc_specular_light = hvec3(0.0);
-	hvec3 cc_ref_vec = hvec3(0.0);
 
 	if (sc_scene_use_reflection_cubemap()) {
-		cc_ref_vec = reflect(-view, geo_normal);
-		cc_ref_vec = mix(cc_ref_vec, geo_normal, mix(half(0.001), half(0.1), clearcoat_roughness));
+		half NoV = max(dot(geo_normal, view), half(0.0001));
+		hvec3 ref_vec = reflect(-view, geo_normal);
+		ref_vec = mix(ref_vec, geo_normal, clearcoat_roughness * clearcoat_roughness);
+		// The clear coat layer assumes an IOR of 1.5 (4% reflectance)
+		half Fc = clearcoat * (half(0.04) + half(0.96) * SchlickFresnel(NoV));
+		half attenuation = half(1.0) - Fc;
+		ambient_light *= attenuation;
+		indirect_specular_light *= attenuation;
 
-		hvec3 cc_radiance_ref_vec = hvec3(scene_data.radiance_inverse_xform * vec3(cc_ref_vec));
-		float roughness_lod = sqrt(mix(0.001, 0.1, float(clearcoat_roughness))) * MAX_ROUGHNESS_LOD;
+		half horizon = min(half(1.0) + dot(ref_vec, indirect_normal), half(1.0));
+		ref_vec = hvec3(scene_data.radiance_inverse_xform * vec3(ref_vec));
+		float roughness_lod = mix(0.001, 0.1, sqrt(float(clearcoat_roughness))) * MAX_ROUGHNESS_LOD;
 #ifdef USE_RADIANCE_OCTMAP_ARRAY
-
 		float lod;
 		half blend = half(modf(roughness_lod, lod));
 
-		float ref_lod = vec3_to_oct_lod(dFdx(cc_radiance_ref_vec), dFdy(cc_radiance_ref_vec), scene_data_block.data.radiance_pixel_size);
-		vec2 ref_uv = vec3_to_oct_with_border(cc_radiance_ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
+		float ref_lod = vec3_to_oct_lod(dFdx(vec3(ref_vec)), dFdy(vec3(ref_vec)), scene_data_block.data.radiance_pixel_size);
+		vec2 ref_uv = vec3_to_oct_with_border(ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
 		hvec3 clearcoat_sample_a = hvec3(textureLod(sampler2DArray(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), vec3(ref_uv, lod), ref_lod).rgb);
 		hvec3 clearcoat_sample_b = hvec3(textureLod(sampler2DArray(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), vec3(ref_uv, lod + 1), ref_lod).rgb);
 		hvec3 clearcoat_light = mix(clearcoat_sample_a, clearcoat_sample_b, blend);
 #else
-		vec2 ref_uv = vec3_to_oct_with_border(cc_radiance_ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
+		vec2 ref_uv = vec3_to_oct_with_border(ref_vec, vec2(scene_data_block.data.radiance_border_size, 1.0 - scene_data_block.data.radiance_border_size * 2.0));
 		hvec3 clearcoat_light = hvec3(textureLod(sampler2D(radiance_octmap, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), ref_uv, roughness_lod).rgb);
-
 #endif //USE_RADIANCE_OCTMAP_ARRAY
-		cc_specular_light += clearcoat_light * half(scene_data.IBL_exposure_normalization) * half(scene_data.ambient_light_color_energy.a);
+		indirect_specular_light += clearcoat_light * horizon * horizon * Fc * half(scene_data.ambient_light_color_energy.a);
 	}
 #endif // LIGHT_CLEARCOAT_USED
 #endif // !AMBIENT_LIGHT_DISABLED
@@ -1768,9 +1771,6 @@ void main() {
 	if (reflection_probe_count > 0) {
 		hvec4 reflection_accum = hvec4(0.0);
 		hvec4 ambient_accum = hvec4(0.0);
-#ifdef LIGHT_CLEARCOAT_USED
-		hvec3 cc_reflection_accum = hvec3(0.0);
-#endif
 
 #ifdef LIGHT_ANISOTROPY_USED
 		// https://google.github.io/filament/Filament.html#lighting/imagebasedlights/anisotropy
@@ -1796,11 +1796,7 @@ void main() {
 				break;
 			}
 
-			reflection_process(reflection_index, vertex, ref_vec, normal, roughness, ambient_light, indirect_specular_light,
-#ifdef LIGHT_CLEARCOAT_USED
-					cc_specular_light, cc_ref_vec, mix(half(0.001), half(0.1), clearcoat_roughness), cc_reflection_accum,
-#endif
-					ambient_accum, reflection_accum);
+			reflection_process(reflection_index, vertex, ref_vec, normal, roughness, ambient_light, indirect_specular_light, ambient_accum, reflection_accum);
 		}
 
 		if (ambient_accum.a < half(1.0)) {
@@ -1813,9 +1809,6 @@ void main() {
 
 		if (reflection_accum.a > half(0.0)) {
 			indirect_specular_light = reflection_accum.rgb;
-#ifdef LIGHT_CLEARCOAT_USED
-			cc_specular_light = cc_reflection_accum.rgb;
-#endif
 		}
 
 #if !defined(USE_LIGHTMAP)
@@ -1855,14 +1848,6 @@ void main() {
 	//this saves some VGPRs
 	hvec3 f0 = F0(metallic, specular, albedo);
 
-#ifdef LIGHT_CLEARCOAT_USED
-	// The base layer's f0 is computed assuming an interface from air to an IOR
-	// of 1.5, but the clear coat layer forms an interface from IOR 1.5 to IOR
-	// 1.5. We recompute f0 by first computing its IOR, then reconverting to f0
-	// by using the correct interface
-	f0 = mix(f0, f0_Clear_Coat_To_Surface(f0), clearcoat);
-#endif
-
 #ifndef AMBIENT_LIGHT_DISABLED
 	{
 #if defined(DIFFUSE_TOON)
@@ -1882,23 +1867,7 @@ void main() {
 		hvec2 env = hvec2(-1.04, 1.04) * a004 + r.zw;
 
 		indirect_specular_light *= env.x * f0 + env.y * clamp(half(50.0) * f0.g, metallic, half(1.0));
-
-#ifdef LIGHT_CLEARCOAT_USED
-		half geo_NdotV = max(dot(geo_normal, view), half(0.0001)); // We want to use geometric normal, not normal_map
-		// The clearcoat layer assumes an IOR of 1.5 (4% reflectance).
-		// Attenuate underlying diffuse/specular by clearcoat fresnel (ONLY fresnel, hence we don't just invert the BRDF below).
-		half NdotV5 = SchlickFresnel(geo_NdotV);
-		half F = mix(half(0.04), half(1.0), NdotV5) * clearcoat;
-		half cc_attenuation = half(1.0) - F;
-
-		ambient_light *= cc_attenuation;
-		indirect_specular_light *= cc_attenuation;
-
-		// We don't need a BRDF approximation for clearcoat, so we can use the fresnel directly.
-		indirect_specular_light += cc_specular_light * F;
 #endif
-
-#endif // DIFFUSE_TOON
 	}
 
 #endif // !AMBIENT_LIGHT_DISABLED
diff --git a/engine/servers/rendering/renderer_rd/shaders/particles_copy.glsl b/engine/servers/rendering/renderer_rd/shaders/particles_copy.glsl
index 28cfd415..93c4d100 100644
--- a/engine/servers/rendering/renderer_rd/shaders/particles_copy.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/particles_copy.glsl
@@ -65,30 +65,14 @@ layout(push_constant, std430) uniform Params {
 	uint motion_vectors_current_offset;
 	uint flags;
 
-	float inv_emission_transform[12];
-
-	uint align_channel_filter;
-	uint align_axis;
-	uint pad1;
-	uint pad2;
+	mat4 inv_emission_transform;
 }
 params;
 
-#define ALIGN_DISABLED 0
-#define ALIGN_BILLBOARD 1
-#define ALIGN_Y_TO_VELOCITY 2
-#define ALIGN_Z_BILLBOARD_Y_TO_VELOCITY 3
-#define ALIGN_LOCAL_BILLBOARD 4
-
-#define CHANNEL_FILTER_NONE 0
-#define CHANNEL_FILTER_X 1
-#define CHANNEL_FILTER_Y 2
-#define CHANNEL_FILTER_Z 3
-#define CHANNEL_FILTER_W 4
-
-#define ALIGN_AXIS_X 0
-#define ALIGN_AXIS_Y 1
-#define ALIGN_AXIS_Z 2
+#define TRANSFORM_ALIGN_DISABLED 0
+#define TRANSFORM_ALIGN_Z_BILLBOARD 1
+#define TRANSFORM_ALIGN_Y_TO_VELOCITY 2
+#define TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY 3
 
 void main() {
 #ifdef MODE_FILL_SORT_BUFFER
@@ -171,89 +155,31 @@ void main() {
 		}
 
 		switch (params.align_mode) {
-			case ALIGN_DISABLED: {
+			case TRANSFORM_ALIGN_DISABLED: {
 			} break; //nothing
-			case ALIGN_BILLBOARD: {
-				float angle = 0.;
-				switch (params.align_channel_filter) {
-					case CHANNEL_FILTER_X: {
-						angle = particles.data[particle].custom.x;
-					} break;
-					case CHANNEL_FILTER_Y: {
-						angle = particles.data[particle].custom.y;
-					} break;
-					case CHANNEL_FILTER_Z: {
-						angle = particles.data[particle].custom.z;
-					} break;
-					case CHANNEL_FILTER_W: {
-						angle = particles.data[particle].custom.w;
-					} break;
-				}
-				vec3 axis = normalize(params.sort_direction);
-				float s = sin(angle);
-				float c = cos(angle);
-				float oc = 1.0 - c;
-				mat3 rotated = mat3(
-						oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s,
-						oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s,
-						oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c);
-				vec3 new_up = rotated * params.align_up;
-				mat3 local = mat3(normalize(cross(new_up, params.sort_direction)), new_up, params.sort_direction);
+			case TRANSFORM_ALIGN_Z_BILLBOARD: {
+				mat3 local = mat3(normalize(cross(params.align_up, params.sort_direction)), params.align_up, params.sort_direction);
 				local = local * mat3(txform);
 				txform[0].xyz = local[0];
 				txform[1].xyz = local[1];
 				txform[2].xyz = local[2];
 
 			} break;
-			case ALIGN_Y_TO_VELOCITY: {
+			case TRANSFORM_ALIGN_Y_TO_VELOCITY: {
 				vec3 v = particles.data[particle].velocity;
-				v = normalize(v);
-				switch (params.align_axis) {
-					case ALIGN_AXIS_X: {
-						vec3 len = vec3(
-								length(txform[0].xyz),
-								length(txform[1].xyz),
-								length(txform[2].xyz));
-
-						txform[0].xyz = v;
-						txform[1].xyz = normalize(cross(txform[2].xyz / len.z, txform[0].xyz));
-						txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-						txform[0].xyz *= len.x;
-						txform[1].xyz *= len.y;
-						txform[2].xyz *= len.z;
-					} break;
-					case ALIGN_AXIS_Y: {
-						vec3 len = vec3(
-								length(txform[0].xyz),
-								length(txform[1].xyz),
-								length(txform[2].xyz));
-
-						txform[0].xyz = normalize(cross(v, txform[2].xyz / len.z));
-						txform[1].xyz = v;
-						txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-						txform[0].xyz *= len.x;
-						txform[1].xyz *= len.y;
-						txform[2].xyz *= len.z;
-					} break;
-					case ALIGN_AXIS_Z: {
-						vec3 len = vec3(
-								length(txform[0].xyz),
-								length(txform[1].xyz),
-								length(txform[2].xyz));
-
-						txform[0].xyz = normalize(cross(txform[1].xyz / len.y, v));
-						txform[2].xyz = v;
-						txform[1].xyz = normalize(cross(txform[2].xyz, txform[0].xyz));
-
-						txform[0].xyz *= len.x;
-						txform[1].xyz *= len.y;
-						txform[2].xyz *= len.z;
-					} break;
+				float s = (length(txform[0]) + length(txform[1]) + length(txform[2])) / 3.0;
+				if (length(v) > 0.0) {
+					txform[1].xyz = normalize(v);
+				} else {
+					txform[1].xyz = normalize(txform[1].xyz);
 				}
+
+				txform[0].xyz = normalize(cross(txform[1].xyz, txform[2].xyz));
+				txform[2].xyz = vec3(0.0, 0.0, 1.0) * s;
+				txform[0].xyz *= s;
+				txform[1].xyz *= s;
 			} break;
-			case ALIGN_Z_BILLBOARD_Y_TO_VELOCITY: {
+			case TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY: {
 				vec3 v = particles.data[particle].velocity;
 				vec3 sv = v - params.sort_direction * dot(params.sort_direction, v); //screen velocity
 
@@ -268,39 +194,6 @@ void main() {
 				txform[2].xyz = params.sort_direction * length(txform[2]);
 
 			} break;
-			case ALIGN_LOCAL_BILLBOARD: {
-				switch (params.align_axis) {
-					case ALIGN_AXIS_X: {
-						vec3 len = vec3(
-								length(txform[0].xyz),
-								length(txform[1].xyz),
-								length(txform[2].xyz));
-
-						txform[0].xyz = normalize(txform[0].xyz);
-						txform[1].xyz = normalize(cross(params.sort_direction, txform[0].xyz));
-						txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-						txform[0].xyz *= len.x;
-						txform[1].xyz *= len.y;
-						txform[2].xyz *= len.z;
-					} break;
-					case ALIGN_AXIS_Y: {
-						vec3 len = vec3(
-								length(txform[0].xyz),
-								length(txform[1].xyz),
-								length(txform[2].xyz));
-
-						txform[1].xyz = normalize(txform[1].xyz);
-						txform[0].xyz = normalize(cross(txform[1].xyz, params.sort_direction));
-						txform[2].xyz = cross(txform[0].xyz, txform[1].xyz);
-
-						txform[0].xyz *= len.x;
-						txform[1].xyz *= len.y;
-						txform[2].xyz *= len.z;
-					} break;
-				}
-
-			} break;
 		}
 
 		txform[3].xyz += particles.data[particle].velocity * params.frame_remainder;
@@ -313,13 +206,7 @@ void main() {
 		if (bool(params.flags & PARAMS_FLAG_COPY_MODE_2D)) {
 			// In global mode, bring 2D particles to local coordinates
 			// as they will be drawn with the node position as origin.
-			mat4 inv_emission_transform;
-			inv_emission_transform[0] = vec4(params.inv_emission_transform[0], params.inv_emission_transform[1], params.inv_emission_transform[2], 0.0);
-			inv_emission_transform[1] = vec4(params.inv_emission_transform[3], params.inv_emission_transform[4], params.inv_emission_transform[5], 0.0);
-			inv_emission_transform[2] = vec4(params.inv_emission_transform[6], params.inv_emission_transform[7], params.inv_emission_transform[8], 0.0);
-			inv_emission_transform[3] = vec4(params.inv_emission_transform[9], params.inv_emission_transform[10], params.inv_emission_transform[11], 1.0);
-
-			txform = inv_emission_transform * txform;
+			txform = params.inv_emission_transform * txform;
 		}
 	} else {
 		// Set scale to zero and translate to -INF so particle will be invisible
diff --git a/engine/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl b/engine/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
index 60d92516..bebd2089 100644
--- a/engine/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
@@ -59,18 +59,6 @@ hvec3 F0(half metallic, half specular, hvec3 albedo) {
 	return mix(hvec3(dielectric), albedo, hvec3(metallic));
 }
 
-half V_Kelemen(half LdotH) {
-	// Kelemen 2001, "A Microfacet Based Coupled Specular-Matte BRDF Model with Importance Sampling"
-	return saturateHalf(half(0.25) / (LdotH * LdotH + half(1e-4)));
-}
-
-hvec3 f0_Clear_Coat_To_Surface(hvec3 f0) {
-	// Approximation of iorTof0(f0ToIor(f0), 1.5)
-	// This assumes that the clear coat layer has an IOR of 1.5
-	// see https://github.com/google/filament/blob/837b2715a05f4656d4f524bce50d1b23ff8f84c9/shaders/src/surface_material.fs#L54-L62
-	return clamp(f0 * (f0 * (half(0.941892) - half(0.263008) * f0) + half(0.346479)) - half(0.0285998), half(0.0), half(1.0));
-}
-
 void light_compute(hvec3 N, hvec3 L, hvec3 V, half A, hvec3 light_color, bool is_directional, half attenuation, hvec3 f0, half roughness, half metallic, half specular_amount, hvec3 albedo, inout half alpha, vec2 screen_uv, hvec3 energy_compensation,
 #ifdef LIGHT_BACKLIGHT_USED
 		hvec3 backlight,
@@ -175,8 +163,6 @@ void light_compute(hvec3 N, hvec3 L, hvec3 V, half A, hvec3 light_color, bool is
 	diffuse_light += rim_light * rim * mix(hvec3(1.0), albedo, rim_tint) * light_color;
 #endif
 
-	half cc_attenuation = half(1.0);
-
 	// We skip checking on attenuation on directional lights to avoid a branch that is not as beneficial for directional lights as the other ones.
 	if (is_directional || attenuation > HALF_FLT_MIN) {
 		half cNdotL = max(NdotL, half(0.0));
@@ -184,19 +170,22 @@ void light_compute(hvec3 N, hvec3 L, hvec3 V, half A, hvec3 light_color, bool is
 		hvec3 H = normalize(V + L);
 		half cLdotH = clamp(A + dot(L, H), half(0.0), half(1.0));
 #endif
-
 #if defined(LIGHT_CLEARCOAT_USED)
 		// Clearcoat ignores normal_map, use vertex normal instead
 		half ccNdotL = clamp(A + dot(vertex_normal, L), half(0.0), half(1.0));
 		half ccNdotH = clamp(A + dot(vertex_normal, H), half(0.0), half(1.0));
+		half ccNdotV = max(dot(vertex_normal, V), half(1e-4));
 		half cLdotH5 = SchlickFresnel(cLdotH);
 
 		half Dr = D_GGX(ccNdotH, half(mix(half(0.001), half(0.1), clearcoat_roughness)), vertex_normal, H);
-		half Gr = V_Kelemen(cLdotH);
-		half Fr = mix(half(0.04), half(1.0), cLdotH5) * clearcoat;
-		cc_attenuation = half(1.0) - Fr;
-		half clearcoat_specular_brdf_NL = Dr * Gr * Fr * ccNdotL;
+		half Gr = half(0.25) / (cLdotH * cLdotH + half(1e-4));
+		half Fr = mix(half(0.04), half(1.0), cLdotH5);
+		half clearcoat_specular_brdf_NL = clearcoat * Gr * Fr * Dr * cNdotL;
+
 		specular_light += clearcoat_specular_brdf_NL * light_color * attenuation * specular_amount;
+
+		// TODO: Clearcoat adds light to the scene right now (it is non-energy conserving), both diffuse and specular need to be scaled by (1.0 - FR)
+		// but to do so we need to rearrange this entire function
 #endif // LIGHT_CLEARCOAT_USED
 
 		if (metallic < half(1.0)) {
@@ -223,7 +212,7 @@ void light_compute(hvec3 N, hvec3 L, hvec3 V, half A, hvec3 light_color, bool is
 			diffuse_brdf_NL = cNdotL * half(1.0 / M_PI);
 #endif
 
-			diffuse_light += light_color * diffuse_brdf_NL * attenuation * cc_attenuation;
+			diffuse_light += light_color * diffuse_brdf_NL * attenuation;
 
 #if defined(LIGHT_BACKLIGHT_USED)
 			diffuse_light += light_color * (hvec3(1.0 / M_PI) - diffuse_brdf_NL) * backlight * attenuation;
@@ -271,7 +260,7 @@ void light_compute(hvec3 N, hvec3 L, hvec3 V, half A, hvec3 light_color, bool is
 			half f90 = clamp(dot(f0, hvec3(50.0 * 0.33)), metallic, half(1.0));
 			hvec3 F = f0 + (f90 - f0) * cLdotH5;
 			hvec3 specular_brdf_NL = energy_compensation * cNdotL * D * F * G;
-			specular_light += specular_brdf_NL * light_color * attenuation * cc_attenuation * specular_amount;
+			specular_light += specular_brdf_NL * light_color * attenuation * specular_amount;
 #endif
 		}
 
@@ -665,10 +654,6 @@ void light_process_omni(uint idx, vec3 vertex, hvec3 eye_vec, hvec3 normal, vec3
 		local_v.xy = local_v.xy * 0.5 + 0.5;
 		vec2 proj_uv = local_v.xy * atlas_rect.zw;
 
-		// Clamp the uv coordinates to prevent bleeding from neighboring decals.
-		vec2 texel_size = 1.0 / vec2(textureSize(sampler2D(decal_atlas_srgb, light_projector_sampler), 0));
-		proj_uv = clamp(proj_uv, texel_size * 0.5, atlas_rect.zw - texel_size * 0.5);
-
 		if (sc_projector_use_mipmaps()) {
 			vec2 proj_uv_ddx;
 			vec2 proj_uv_ddy;
@@ -935,11 +920,7 @@ void light_process_spot(uint idx, vec3 vertex, hvec3 eye_vec, hvec3 normal, vec3
 			diffuse_light, specular_light);
 }
 
-void reflection_process(uint ref_index, vec3 vertex, hvec3 ref_vec, hvec3 normal, half roughness, hvec3 ambient_light, hvec3 specular_light,
-#ifdef LIGHT_CLEARCOAT_USED
-		hvec3 cc_specular_light, hvec3 cc_ref_vec, half cc_roughness, inout hvec3 cc_reflection_accum,
-#endif
-		inout hvec4 ambient_accum, inout hvec4 reflection_accum) {
+void reflection_process(uint ref_index, vec3 vertex, hvec3 ref_vec, hvec3 normal, half roughness, hvec3 ambient_light, hvec3 specular_light, inout hvec4 ambient_accum, inout hvec4 reflection_accum) {
 	vec3 box_extents = reflections.data[ref_index].box_extents;
 	vec3 local_pos = (reflections.data[ref_index].local_matrix * vec4(vertex, 1.0)).xyz;
 
@@ -989,33 +970,6 @@ void reflection_process(uint ref_index, vec3 vertex, hvec3 ref_vec, hvec3 normal
 		reflection_accum += reflection;
 	}
 
-#ifdef LIGHT_CLEARCOAT_USED
-	vec3 local_cc_ref_vec = (reflections.data[ref_index].local_matrix * vec4(cc_ref_vec, 0.0)).xyz;
-
-	if (reflections.data[ref_index].box_project) { // Box project.
-
-		vec3 nrdir = normalize(local_cc_ref_vec);
-		vec3 rbmax = (box_extents - local_pos) / nrdir;
-		vec3 rbmin = (-box_extents - local_pos) / nrdir;
-
-		vec3 rbminmax = mix(rbmin, rbmax, greaterThan(nrdir, vec3(0.0, 0.0, 0.0)));
-
-		float fa = min(min(rbminmax.x, rbminmax.y), rbminmax.z);
-		vec3 posonbox = local_pos + nrdir * fa;
-		local_cc_ref_vec = posonbox - reflections.data[ref_index].box_offset;
-	}
-
-	float cc_roughness_lod = sqrt(cc_roughness) * MAX_ROUGHNESS_LOD;
-	vec2 cc_reflection_uv = vec3_to_oct_with_border(local_cc_ref_vec, border_size);
-	hvec3 cc_reflection = hvec3(textureLod(sampler2DArray(reflection_atlas, DEFAULT_SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP), vec3(cc_reflection_uv, reflections.data[ref_index].index), cc_roughness_lod).rgb) * REFLECTION_MULTIPLIER;
-	cc_reflection *= half(reflections.data[ref_index].exposure_normalization);
-	if (reflections.data[ref_index].exterior) {
-		cc_reflection = mix(cc_specular_light, cc_reflection, blend);
-	}
-	cc_reflection *= half(reflections.data[ref_index].intensity) * blend;
-	cc_reflection_accum += cc_reflection;
-#endif // LIGHT_CLEARCOAT_USED
-
 	if (ambient_accum.a >= half(1.0)) {
 		return;
 	}
diff --git a/engine/servers/rendering/renderer_rd/shaders/tex_blit.glsl b/engine/servers/rendering/renderer_rd/shaders/tex_blit.glsl
deleted file mode 100644
index 99f06b64..00000000
--- a/engine/servers/rendering/renderer_rd/shaders/tex_blit.glsl
+++ /dev/null
@@ -1,128 +0,0 @@
-/* clang-format off */
-
-#[vertex]
-
-#version 450
-
-// Has to be same push_constant for vertex & frag
-layout(push_constant, std430) uniform TexBlitData {
-	vec2 offset;
-	vec2 size;
-	vec4 modulate;
-	vec2 pad;
-	int convert_to_srgb;
-	float time;
-} data;
-
-layout(location = 0) out vec2 uv;
-
-void main() {
-	vec2 base_arr[6] = vec2[](vec2(0.0, 0.0), vec2(0.0, 1.0), vec2(1.0, 1.0), vec2(0.0), vec2(1.0, 0.0), vec2(1.0, 1.0));
-	uv = base_arr[gl_VertexIndex];
-	// gl_Position = vec4(uv * 2.0 - 1.0, 0.0, 1.0);
-
-	gl_Position = vec4( (data.offset + (uv * data.size)) * 2.0 - 1.0, 1.0, 1.0);
-}
-
-#[fragment]
-
-#version 450
-
-#VERSION_DEFINES
-
-#include "samplers_inc.glsl"
-
-#define OUTPUT0_SRGB uint(1)
-#define OUTPUT1_SRGB uint(2)
-#define OUTPUT2_SRGB uint(4)
-#define OUTPUT3_SRGB uint(8)
-
-layout(push_constant, std430) uniform TexBlitData {
-	vec2 offset;
-	vec2 size;
-	vec4 modulate;
-	vec2 pad;
-	int convert_to_srgb;
-	float time;
-} data;
-
-layout(set = 0, binding = 0) uniform texture2D source0;
-
-layout(set = 0, binding = 1) uniform texture2D source1;
-
-layout(set = 0, binding = 2) uniform texture2D source2;
-
-layout(set = 0, binding = 3) uniform texture2D source3;
-
-layout(location = 0) in vec2 uv;
-
-layout (location = 0) out vec4 out_color0;
-
-#ifdef USE_OUTPUT1
-layout (location = 1) out vec4 out_color1;
-#endif
-
-#ifdef USE_OUTPUT2
-layout (location = 2) out vec4 out_color2;
-#endif
-
-#ifdef USE_OUTPUT3
-layout (location = 3) out vec4 out_color3;
-#endif
-
-#ifdef MATERIAL_UNIFORMS_USED
-layout(set = 1, binding = 0, std140) uniform MaterialUniforms {
-#MATERIAL_UNIFORMS
-} material;
-#endif
-
-#GLOBALS
-
-vec3 linear_to_srgb(vec3 color) {
-	// If going to srgb, clamp from 0 to 1.
-	color = clamp(color, vec3(0.0), vec3(1.0));
-	const vec3 a = vec3(0.055f);
-	return mix((vec3(1.0f) + a) * pow(color.rgb, vec3(1.0f / 2.4f)) - a, 12.92f * color.rgb, lessThan(color.rgb, vec3(0.0031308f)));
-}
-
-void main() {
-	// Handles the case where user code uses extra outputs, but extra output targets were not bound
-	vec4 color0 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color1 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color2 = vec4(0.0, 0.0, 0.0, 1.0);
-	vec4 color3 = vec4(0.0, 0.0, 0.0, 1.0);
-
-#CODE : BLIT
-
-	// Discards extra outputs if extra output targets were not bound
-	out_color0 = color0;
-
-#ifdef USE_OUTPUT1
-	out_color1 = color1;
-#endif
-#ifdef USE_OUTPUT2
-	out_color2 = color2;
-#endif
-#ifdef USE_OUTPUT3
-	out_color3 = color3;
-#endif
-
-	if (bool(data.convert_to_srgb & OUTPUT0_SRGB)) {
-		out_color0.rgb = linear_to_srgb(out_color0.rgb); // Regular linear -> SRGB conversion.
-	}
-#ifdef USE_OUTPUT1
-	if (bool(data.convert_to_srgb & OUTPUT1_SRGB)) {
-		out_color1.rgb = linear_to_srgb(out_color1.rgb);
-	}
-#endif
-#ifdef USE_OUTPUT2
-	if (bool(data.convert_to_srgb & OUTPUT2_SRGB)) {
-		out_color2.rgb = linear_to_srgb(out_color2.rgb);
-	}
-#endif
-#ifdef USE_OUTPUT3
-	if (bool(data.convert_to_srgb & OUTPUT3_SRGB)) {
-		out_color3.rgb = linear_to_srgb(out_color3.rgb);
-	}
-#endif
-}
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
index 056ef6ae..0c716857 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
@@ -29,13 +29,9 @@
 /**************************************************************************/
 
 #include "light_storage.h"
-
 #include "core/config/project_settings.h"
-#include "core/math/geometry_3d.h"
-#include "core/os/os.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_globals.h"
+#include "texture_storage.h"
 
 using namespace RendererRD;
 
@@ -120,31 +116,31 @@ bool LightStorage::free(RID p_rid) {
 
 /* LIGHT */
 
-void LightStorage::_light_initialize(RID p_light, RSE::LightType p_type) {
+void LightStorage::_light_initialize(RID p_light, RS::LightType p_type) {
 	Light light;
 	light.type = p_type;
 
-	light.param[RSE::LIGHT_PARAM_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_INDIRECT_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SPECULAR] = 0.5;
-	light.param[RSE::LIGHT_PARAM_RANGE] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SIZE] = 0.0;
-	light.param[RSE::LIGHT_PARAM_ATTENUATION] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SPOT_ANGLE] = 45;
-	light.param[RSE::LIGHT_PARAM_SPOT_ATTENUATION] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE] = 0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET] = 0.1;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET] = 0.3;
-	light.param[RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET] = 0.6;
-	light.param[RSE::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
-	light.param[RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
-	light.param[RSE::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_BLUR] = 0;
-	light.param[RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
-	light.param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS] = 0.05;
-	light.param[RSE::LIGHT_PARAM_INTENSITY] = p_type == RSE::LIGHT_DIRECTIONAL ? 100000.0 : 1000.0;
+	light.param[RS::LIGHT_PARAM_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_INDIRECT_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY] = 1.0;
+	light.param[RS::LIGHT_PARAM_SPECULAR] = 0.5;
+	light.param[RS::LIGHT_PARAM_RANGE] = 1.0;
+	light.param[RS::LIGHT_PARAM_SIZE] = 0.0;
+	light.param[RS::LIGHT_PARAM_ATTENUATION] = 1.0;
+	light.param[RS::LIGHT_PARAM_SPOT_ANGLE] = 45;
+	light.param[RS::LIGHT_PARAM_SPOT_ATTENUATION] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE] = 0;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET] = 0.1;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET] = 0.3;
+	light.param[RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET] = 0.6;
+	light.param[RS::LIGHT_PARAM_SHADOW_FADE_START] = 0.8;
+	light.param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_BIAS] = 0.02;
+	light.param[RS::LIGHT_PARAM_SHADOW_OPACITY] = 1.0;
+	light.param[RS::LIGHT_PARAM_SHADOW_BLUR] = 0;
+	light.param[RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE] = 20.0;
+	light.param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS] = 0.05;
+	light.param[RS::LIGHT_PARAM_INTENSITY] = p_type == RS::LIGHT_DIRECTIONAL ? 100000.0 : 1000.0;
 
 	light_owner.initialize_rid(p_light, light);
 }
@@ -154,7 +150,7 @@ RID LightStorage::directional_light_allocate() {
 }
 
 void LightStorage::directional_light_initialize(RID p_light) {
-	_light_initialize(p_light, RSE::LIGHT_DIRECTIONAL);
+	_light_initialize(p_light, RS::LIGHT_DIRECTIONAL);
 }
 
 RID LightStorage::omni_light_allocate() {
@@ -162,7 +158,7 @@ RID LightStorage::omni_light_allocate() {
 }
 
 void LightStorage::omni_light_initialize(RID p_light) {
-	_light_initialize(p_light, RSE::LIGHT_OMNI);
+	_light_initialize(p_light, RS::LIGHT_OMNI);
 }
 
 RID LightStorage::spot_light_allocate() {
@@ -170,7 +166,7 @@ RID LightStorage::spot_light_allocate() {
 }
 
 void LightStorage::spot_light_initialize(RID p_light) {
-	_light_initialize(p_light, RSE::LIGHT_SPOT);
+	_light_initialize(p_light, RS::LIGHT_SPOT);
 }
 
 void LightStorage::light_free(RID p_rid) {
@@ -189,29 +185,29 @@ void LightStorage::light_set_color(RID p_light, const Color &p_color) {
 	light->color = p_color;
 }
 
-void LightStorage::light_set_param(RID p_light, RSE::LightParam p_param, float p_value) {
+void LightStorage::light_set_param(RID p_light, RS::LightParam p_param, float p_value) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
-	ERR_FAIL_INDEX(p_param, RSE::LIGHT_PARAM_MAX);
+	ERR_FAIL_INDEX(p_param, RS::LIGHT_PARAM_MAX);
 
 	if (light->param[p_param] == p_value) {
 		return;
 	}
 
 	switch (p_param) {
-		case RSE::LIGHT_PARAM_RANGE:
-		case RSE::LIGHT_PARAM_SPOT_ANGLE:
-		case RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET:
-		case RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS:
-		case RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE:
-		case RSE::LIGHT_PARAM_SHADOW_BIAS: {
+		case RS::LIGHT_PARAM_RANGE:
+		case RS::LIGHT_PARAM_SPOT_ANGLE:
+		case RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET:
+		case RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS:
+		case RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE:
+		case RS::LIGHT_PARAM_SHADOW_BIAS: {
 			light->version++;
 			light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 		} break;
-		case RSE::LIGHT_PARAM_SIZE: {
+		case RS::LIGHT_PARAM_SIZE: {
 			if ((light->param[p_param] > CMP_EPSILON) != (p_value > CMP_EPSILON)) {
 				//changing from no size to size and the opposite
 				light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT_SOFT_SHADOW_AND_PROJECTOR);
@@ -244,15 +240,15 @@ void LightStorage::light_set_projector(RID p_light, RID p_texture) {
 
 	ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
 
-	if (light->type != RSE::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
-		texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RSE::LIGHT_OMNI);
+	if (light->type != RS::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
+		texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
 	}
 
 	light->projector = p_texture;
 
-	if (light->type != RSE::LIGHT_DIRECTIONAL) {
+	if (light->type != RS::LIGHT_DIRECTIONAL) {
 		if (light->projector.is_valid()) {
-			texture_storage->texture_add_to_decal_atlas(light->projector, light->type == RSE::LIGHT_OMNI);
+			texture_storage->texture_add_to_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
 		}
 		light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT_SOFT_SHADOW_AND_PROJECTOR);
 	}
@@ -312,7 +308,7 @@ uint32_t LightStorage::light_get_shadow_caster_mask(RID p_light) const {
 	return light->shadow_caster_mask;
 }
 
-void LightStorage::light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) {
+void LightStorage::light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -332,7 +328,7 @@ void LightStorage::light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade)
 	light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 }
 
-void LightStorage::light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) {
+void LightStorage::light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -341,21 +337,21 @@ void LightStorage::light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowM
 	light->version++;
 	light->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_LIGHT);
 
-	if (p_mode == RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID) {
+	if (p_mode == RS::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID) {
 		shadow_dual_paraboloid_used = true;
-	} else if (p_mode == RSE::LIGHT_OMNI_SHADOW_CUBE) {
+	} else if (p_mode == RS::LIGHT_OMNI_SHADOW_CUBE) {
 		shadow_cubemaps_used = true;
 	}
 }
 
-RSE::LightOmniShadowMode LightStorage::light_omni_get_shadow_mode(RID p_light) {
+RS::LightOmniShadowMode LightStorage::light_omni_get_shadow_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_OMNI_SHADOW_CUBE);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_OMNI_SHADOW_CUBE);
 
 	return light->omni_shadow_mode;
 }
 
-void LightStorage::light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) {
+void LightStorage::light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
@@ -380,23 +376,23 @@ bool LightStorage::light_directional_get_blend_splits(RID p_light) const {
 	return light->directional_blend_splits;
 }
 
-void LightStorage::light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) {
+void LightStorage::light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) {
 	Light *light = light_owner.get_or_null(p_light);
 	ERR_FAIL_NULL(light);
 
 	light->directional_sky_mode = p_mode;
 }
 
-RSE::LightDirectionalSkyMode LightStorage::light_directional_get_sky_mode(RID p_light) const {
+RS::LightDirectionalSkyMode LightStorage::light_directional_get_sky_mode(RID p_light) const {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
 
 	return light->directional_sky_mode;
 }
 
-RSE::LightDirectionalShadowMode LightStorage::light_directional_get_shadow_mode(RID p_light) {
+RS::LightDirectionalShadowMode LightStorage::light_directional_get_shadow_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
 
 	return light->directional_shadow_mode;
 }
@@ -408,9 +404,9 @@ uint32_t LightStorage::light_get_max_sdfgi_cascade(RID p_light) {
 	return light->max_sdfgi_cascade;
 }
 
-RSE::LightBakeMode LightStorage::light_get_bake_mode(RID p_light) {
+RS::LightBakeMode LightStorage::light_get_bake_mode(RID p_light) {
 	const Light *light = light_owner.get_or_null(p_light);
-	ERR_FAIL_NULL_V(light, RSE::LIGHT_BAKE_DISABLED);
+	ERR_FAIL_NULL_V(light, RS::LIGHT_BAKE_DISABLED);
 
 	return light->bake_mode;
 }
@@ -434,9 +430,9 @@ AABB LightStorage::light_get_aabb(RID p_light) const {
 	ERR_FAIL_NULL_V(light, AABB());
 
 	switch (light->type) {
-		case RSE::LIGHT_SPOT: {
-			float len = light->param[RSE::LIGHT_PARAM_RANGE];
-			float angle = Math::deg_to_rad(light->param[RSE::LIGHT_PARAM_SPOT_ANGLE]);
+		case RS::LIGHT_SPOT: {
+			float len = light->param[RS::LIGHT_PARAM_RANGE];
+			float angle = Math::deg_to_rad(light->param[RS::LIGHT_PARAM_SPOT_ANGLE]);
 
 			if (angle > Math::PI * 0.5) {
 				// Light casts backwards as well.
@@ -446,11 +442,11 @@ AABB LightStorage::light_get_aabb(RID p_light) const {
 			float size = Math::sin(angle) * len;
 			return AABB(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len));
 		};
-		case RSE::LIGHT_OMNI: {
-			float r = light->param[RSE::LIGHT_PARAM_RANGE];
+		case RS::LIGHT_OMNI: {
+			float r = light->param[RS::LIGHT_PARAM_RANGE];
 			return AABB(-Vector3(r, r, r), Vector3(r, r, r) * 2);
 		};
-		case RSE::LIGHT_DIRECTIONAL: {
+		case RS::LIGHT_DIRECTIONAL: {
 			return AABB();
 		};
 	}
@@ -475,8 +471,8 @@ RID LightStorage::light_instance_create(RID p_light) {
 	light_instance->self = li;
 	light_instance->light = p_light;
 	light_instance->light_type = light_get_type(p_light);
-	if (light_instance->light_type != RSE::LIGHT_DIRECTIONAL) {
-		light_instance->forward_id = ForwardIDStorage::get_singleton()->allocate_forward_id(light_instance->light_type == RSE::LIGHT_OMNI ? FORWARD_ID_TYPE_OMNI_LIGHT : FORWARD_ID_TYPE_SPOT_LIGHT);
+	if (light_instance->light_type != RS::LIGHT_DIRECTIONAL) {
+		light_instance->forward_id = ForwardIDStorage::get_singleton()->allocate_forward_id(light_instance->light_type == RS::LIGHT_OMNI ? FORWARD_ID_TYPE_OMNI_LIGHT : FORWARD_ID_TYPE_SPOT_LIGHT);
 	}
 
 	return li;
@@ -503,8 +499,8 @@ void LightStorage::light_instance_free(RID p_light) {
 		shadow_atlas->shadow_owners.erase(p_light);
 	}
 
-	if (light_instance->light_type != RSE::LIGHT_DIRECTIONAL) {
-		ForwardIDStorage::get_singleton()->free_forward_id(light_instance->light_type == RSE::LIGHT_OMNI ? FORWARD_ID_TYPE_OMNI_LIGHT : FORWARD_ID_TYPE_SPOT_LIGHT, light_instance->forward_id);
+	if (light_instance->light_type != RS::LIGHT_DIRECTIONAL) {
+		ForwardIDStorage::get_singleton()->free_forward_id(light_instance->light_type == RS::LIGHT_OMNI ? FORWARD_ID_TYPE_OMNI_LIGHT : FORWARD_ID_TYPE_SPOT_LIGHT, light_instance->forward_id);
 	}
 	light_instance_owner.free(p_light);
 }
@@ -632,8 +628,8 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		ERR_CONTINUE(light == nullptr);
 
 		switch (light->type) {
-			case RSE::LIGHT_DIRECTIONAL: {
-				if (r_directional_light_count >= max_directional_lights || light->directional_sky_mode == RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
+			case RS::LIGHT_DIRECTIONAL: {
+				if (r_directional_light_count >= max_directional_lights || light->directional_sky_mode == RS::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY) {
 					continue;
 				}
 
@@ -649,10 +645,10 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 
 				float sign = light->negative ? -1 : 1;
 
-				light_data.energy = sign * light->param[RSE::LIGHT_PARAM_ENERGY];
+				light_data.energy = sign * light->param[RS::LIGHT_PARAM_ENERGY];
 
 				if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-					light_data.energy *= light->param[RSE::LIGHT_PARAM_INTENSITY];
+					light_data.energy *= light->param[RS::LIGHT_PARAM_INTENSITY];
 				} else {
 					light_data.energy *= Math::PI;
 				}
@@ -666,25 +662,25 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 				light_data.color[1] = linear_col.g;
 				light_data.color[2] = linear_col.b;
 
-				light_data.specular = light->param[RSE::LIGHT_PARAM_SPECULAR];
-				light_data.volumetric_fog_energy = light->param[RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY];
+				light_data.specular = light->param[RS::LIGHT_PARAM_SPECULAR];
+				light_data.volumetric_fog_energy = light->param[RS::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY];
 				light_data.mask = light->cull_mask;
 
-				float size = light->param[RSE::LIGHT_PARAM_SIZE];
+				float size = light->param[RS::LIGHT_PARAM_SIZE];
 
 				light_data.size = 1.0 - Math::cos(Math::deg_to_rad(size)); //angle to cosine offset
 
 				light_data.shadow_opacity = (p_using_shadows && light->shadow)
-						? light->param[RSE::LIGHT_PARAM_SHADOW_OPACITY]
+						? light->param[RS::LIGHT_PARAM_SHADOW_OPACITY]
 						: 0.0;
 
-				float angular_diameter = light->param[RSE::LIGHT_PARAM_SIZE];
+				float angular_diameter = light->param[RS::LIGHT_PARAM_SIZE];
 				if (angular_diameter > 0.0) {
 					// I know tan(0) is 0, but let's not risk it with numerical precision.
 					// technically this will keep expanding until reaching the sun, but all we care
 					// is expand until we reach the radius of the near plane (there can't be more occluders than that)
 					angular_diameter = Math::tan(Math::deg_to_rad(angular_diameter));
-					if (light->shadow && light->param[RSE::LIGHT_PARAM_SHADOW_BLUR] > 0.0) {
+					if (light->shadow && light->param[RS::LIGHT_PARAM_SHADOW_BLUR] > 0.0) {
 						// Only enable PCSS-like soft shadows if blurring is enabled.
 						// Otherwise, performance would decrease with no visual difference.
 						r_directional_light_soft_shadows = true;
@@ -696,17 +692,17 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 				light_data.bake_mode = light->bake_mode;
 
 				if (light_data.shadow_opacity > 0.001) {
-					RSE::LightDirectionalShadowMode smode = light->directional_shadow_mode;
+					RS::LightDirectionalShadowMode smode = light->directional_shadow_mode;
 
-					light_data.soft_shadow_scale = light->param[RSE::LIGHT_PARAM_SHADOW_BLUR];
+					light_data.soft_shadow_scale = light->param[RS::LIGHT_PARAM_SHADOW_BLUR];
 					light_data.softshadow_angle = angular_diameter;
 
 					if (angular_diameter <= 0.0) {
 						light_data.soft_shadow_scale *= RendererSceneRenderRD::get_singleton()->directional_shadow_quality_radius_get(); // Only use quality radius for PCF
 					}
 
-					int limit = smode == RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL ? 0 : (smode == RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS ? 1 : 3);
-					light_data.blend_splits = (smode != RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL) && light->directional_blend_splits;
+					int limit = smode == RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL ? 0 : (smode == RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS ? 1 : 3);
+					light_data.blend_splits = (smode != RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL) && light->directional_blend_splits;
 					for (int j = 0; j < 4; j++) {
 						Rect2 atlas_rect = light_instance->shadow_transform[j].atlas_rect;
 						Projection correction;
@@ -724,9 +720,9 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 						Projection shadow_mtx = rectm * bias * matrix * modelview;
 						light_data.shadow_split_offsets[j] = split;
 						float bias_scale = light_instance->shadow_transform[j].bias_scale * light_data.soft_shadow_scale;
-						light_data.shadow_bias[j] = light->param[RSE::LIGHT_PARAM_SHADOW_BIAS] / 100.0 * bias_scale;
-						light_data.shadow_normal_bias[j] = light->param[RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * light_instance->shadow_transform[j].shadow_texel_size;
-						light_data.shadow_transmittance_bias[j] = light->param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS] / 100.0 * bias_scale;
+						light_data.shadow_bias[j] = light->param[RS::LIGHT_PARAM_SHADOW_BIAS] / 100.0 * bias_scale;
+						light_data.shadow_normal_bias[j] = light->param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * light_instance->shadow_transform[j].shadow_texel_size;
+						light_data.shadow_transmittance_bias[j] = light->param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS] / 100.0 * bias_scale;
 						light_data.shadow_z_range[j] = light_instance->shadow_transform[j].farplane;
 						light_data.shadow_range_begin[j] = light_instance->shadow_transform[j].range_begin;
 						RendererRD::MaterialStorage::store_camera(shadow_mtx, light_data.shadow_matrices[j]);
@@ -753,14 +749,14 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 						}
 					}
 
-					float fade_start = light->param[RSE::LIGHT_PARAM_SHADOW_FADE_START];
+					float fade_start = light->param[RS::LIGHT_PARAM_SHADOW_FADE_START];
 					light_data.fade_from = -light_data.shadow_split_offsets[3] * MIN(fade_start, 0.999); //using 1.0 would break smoothstep
 					light_data.fade_to = -light_data.shadow_split_offsets[3];
 				}
 
 				r_directional_light_count++;
 			} break;
-			case RSE::LIGHT_OMNI: {
+			case RS::LIGHT_OMNI: {
 				if (omni_light_count >= max_lights) {
 					continue;
 				}
@@ -785,7 +781,7 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 				omni_light_sort[omni_light_count].depth = distance;
 				omni_light_count++;
 			} break;
-			case RSE::LIGHT_SPOT: {
+			case RS::LIGHT_SPOT: {
 				if (spot_light_count >= max_lights) {
 					continue;
 				}
@@ -830,13 +826,13 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 	for (uint32_t i = 0; i < (omni_light_count + spot_light_count); i++) {
 		uint32_t index = (i < omni_light_count) ? i : i - (omni_light_count);
 		LightData &light_data = (i < omni_light_count) ? omni_lights[index] : spot_lights[index];
-		RSE::LightType type = (i < omni_light_count) ? RSE::LIGHT_OMNI : RSE::LIGHT_SPOT;
+		RS::LightType type = (i < omni_light_count) ? RS::LIGHT_OMNI : RS::LIGHT_SPOT;
 		LightInstance *light_instance = (i < omni_light_count) ? omni_light_sort[index].light_instance : spot_light_sort[index].light_instance;
 		Light *light = (i < omni_light_count) ? omni_light_sort[index].light : spot_light_sort[index].light;
 		real_t distance = (i < omni_light_count) ? omni_light_sort[index].depth : spot_light_sort[index].depth;
 
 		if (using_forward_ids) {
-			forward_id_storage->map_forward_id(type == RSE::LIGHT_OMNI ? RendererRD::FORWARD_ID_TYPE_OMNI_LIGHT : RendererRD::FORWARD_ID_TYPE_SPOT_LIGHT, light_instance->forward_id, index, light_instance->last_pass);
+			forward_id_storage->map_forward_id(type == RS::LIGHT_OMNI ? RendererRD::FORWARD_ID_TYPE_OMNI_LIGHT : RendererRD::FORWARD_ID_TYPE_SPOT_LIGHT, light_instance->forward_id, index, light_instance->last_pass);
 		}
 
 		Transform3D light_transform = light_instance->transform;
@@ -844,7 +840,7 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		float sign = light->negative ? -1 : 1;
 		Color linear_col = light->color.srgb_to_linear();
 
-		light_data.attenuation = light->param[RSE::LIGHT_PARAM_ATTENUATION];
+		light_data.attenuation = light->param[RS::LIGHT_PARAM_ATTENUATION];
 
 		// Reuse fade begin, fade length and distance for shadow LOD determination later.
 		float fade_begin = 0.0;
@@ -868,13 +864,13 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 			}
 		}
 
-		float energy = sign * light->param[RSE::LIGHT_PARAM_ENERGY] * fade;
+		float energy = sign * light->param[RS::LIGHT_PARAM_ENERGY] * fade;
 
 		if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
-			energy *= light->param[RSE::LIGHT_PARAM_INTENSITY];
+			energy *= light->param[RS::LIGHT_PARAM_INTENSITY];
 
 			// Convert from Luminous Power to Luminous Intensity
-			if (type == RSE::LIGHT_OMNI) {
+			if (type == RS::LIGHT_OMNI) {
 				energy *= 1.0 / (Math::PI * 4.0);
 			} else {
 				// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
@@ -892,11 +888,11 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		light_data.color[0] = linear_col.r * energy;
 		light_data.color[1] = linear_col.g * energy;
 		light_data.color[2] = linear_col.b * energy;
-		light_data.specular_amount = light->param[RSE::LIGHT_PARAM_SPECULAR] * 2.0;
-		light_data.volumetric_fog_energy = light->param[RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY];
+		light_data.specular_amount = light->param[RS::LIGHT_PARAM_SPECULAR] * 2.0;
+		light_data.volumetric_fog_energy = light->param[RS::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY];
 		light_data.bake_mode = light->bake_mode;
 
-		float radius = MAX(0.001, light->param[RSE::LIGHT_PARAM_RANGE]);
+		float radius = MAX(0.001, light->param[RS::LIGHT_PARAM_RANGE]);
 		light_data.inv_radius = 1.0 / radius;
 
 		Vector3 pos = inverse_transform.xform(light_transform.origin);
@@ -911,12 +907,12 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		light_data.direction[1] = direction.y;
 		light_data.direction[2] = direction.z;
 
-		float size = light->param[RSE::LIGHT_PARAM_SIZE];
+		float size = light->param[RS::LIGHT_PARAM_SIZE];
 
 		light_data.size = size;
 
-		light_data.inv_spot_attenuation = 1.0f / light->param[RSE::LIGHT_PARAM_SPOT_ATTENUATION];
-		float spot_angle = light->param[RSE::LIGHT_PARAM_SPOT_ANGLE];
+		light_data.inv_spot_attenuation = 1.0f / light->param[RS::LIGHT_PARAM_SPOT_ATTENUATION];
+		float spot_angle = light->param[RS::LIGHT_PARAM_SPOT_ANGLE];
 		light_data.cos_spot_angle = Math::cos(Math::deg_to_rad(spot_angle));
 
 		light_data.mask = light->cull_mask;
@@ -931,7 +927,7 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		if (projector.is_valid()) {
 			Rect2 rect = texture_storage->decal_atlas_get_texture_rect(projector);
 
-			if (type == RSE::LIGHT_SPOT) {
+			if (type == RS::LIGHT_SPOT) {
 				light_data.projector_rect[0] = rect.position.x;
 				light_data.projector_rect[1] = rect.position.y + rect.size.height; //flip because shadow is flipped
 				light_data.projector_rect[2] = rect.size.width;
@@ -966,18 +962,18 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 		if (needs_shadow && in_shadow_range) {
 			// fill in the shadow information
 
-			light_data.shadow_opacity = light->param[RSE::LIGHT_PARAM_SHADOW_OPACITY] * shadow_opacity_fade;
+			light_data.shadow_opacity = light->param[RS::LIGHT_PARAM_SHADOW_OPACITY] * shadow_opacity_fade;
 
 			float shadow_texel_size = light_instance_get_shadow_texel_size(light_instance->self, p_shadow_atlas);
-			light_data.shadow_normal_bias = light->param[RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * shadow_texel_size * 10.0;
+			light_data.shadow_normal_bias = light->param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * shadow_texel_size * 10.0;
 
-			if (type == RSE::LIGHT_SPOT) {
-				light_data.shadow_bias = light->param[RSE::LIGHT_PARAM_SHADOW_BIAS] / 100.0;
+			if (type == RS::LIGHT_SPOT) {
+				light_data.shadow_bias = light->param[RS::LIGHT_PARAM_SHADOW_BIAS] / 100.0;
 			} else { //omni
-				light_data.shadow_bias = light->param[RSE::LIGHT_PARAM_SHADOW_BIAS];
+				light_data.shadow_bias = light->param[RS::LIGHT_PARAM_SHADOW_BIAS];
 			}
 
-			light_data.transmittance_bias = light->param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS];
+			light_data.transmittance_bias = light->param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS];
 
 			Vector2i omni_offset;
 			Rect2 rect = light_instance_get_shadow_atlas_rect(light_instance->self, p_shadow_atlas, omni_offset);
@@ -987,9 +983,9 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 			light_data.atlas_rect[2] = rect.size.width;
 			light_data.atlas_rect[3] = rect.size.height;
 
-			light_data.soft_shadow_scale = light->param[RSE::LIGHT_PARAM_SHADOW_BLUR];
+			light_data.soft_shadow_scale = light->param[RS::LIGHT_PARAM_SHADOW_BLUR];
 
-			if (type == RSE::LIGHT_OMNI) {
+			if (type == RS::LIGHT_OMNI) {
 				Transform3D proj = (inverse_transform * light_transform).inverse();
 
 				RendererRD::MaterialStorage::store_transform(proj, light_data.shadow_matrix);
@@ -1005,7 +1001,7 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 
 				light_data.direction[0] = omni_offset.x * float(rect.size.width);
 				light_data.direction[1] = omni_offset.y * float(rect.size.height);
-			} else if (type == RSE::LIGHT_SPOT) {
+			} else if (type == RS::LIGHT_SPOT) {
 				Transform3D modelview = (inverse_transform * light_transform).inverse();
 				Projection bias;
 				bias.set_light_bias();
@@ -1069,7 +1065,7 @@ void LightStorage::reflection_probe_free(RID p_rid) {
 	reflection_probe_owner.free(p_rid);
 }
 
-void LightStorage::reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) {
+void LightStorage::reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) {
 	ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
 	ERR_FAIL_NULL(reflection_probe);
 
@@ -1091,7 +1087,7 @@ void LightStorage::reflection_probe_set_blend_distance(RID p_probe, float p_blen
 	reflection_probe->blend_distance = p_blend_distance;
 }
 
-void LightStorage::reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) {
+void LightStorage::reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) {
 	ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
 	ERR_FAIL_NULL(reflection_probe);
 
@@ -1210,9 +1206,9 @@ AABB LightStorage::reflection_probe_get_aabb(RID p_probe) const {
 	return aabb;
 }
 
-RSE::ReflectionProbeUpdateMode LightStorage::reflection_probe_get_update_mode(RID p_probe) const {
+RS::ReflectionProbeUpdateMode LightStorage::reflection_probe_get_update_mode(RID p_probe) const {
 	const ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
-	ERR_FAIL_NULL_V(reflection_probe, RSE::REFLECTION_PROBE_UPDATE_ALWAYS);
+	ERR_FAIL_NULL_V(reflection_probe, RS::REFLECTION_PROBE_UPDATE_ALWAYS);
 
 	return reflection_probe->update_mode;
 }
@@ -1301,9 +1297,9 @@ bool LightStorage::reflection_probe_is_box_projection(RID p_probe) const {
 	return reflection_probe->box_projection;
 }
 
-RSE::ReflectionProbeAmbientMode LightStorage::reflection_probe_get_ambient_mode(RID p_probe) const {
+RS::ReflectionProbeAmbientMode LightStorage::reflection_probe_get_ambient_mode(RID p_probe) const {
 	const ReflectionProbe *reflection_probe = reflection_probe_owner.get_or_null(p_probe);
-	ERR_FAIL_NULL_V(reflection_probe, RSE::REFLECTION_PROBE_AMBIENT_DISABLED);
+	ERR_FAIL_NULL_V(reflection_probe, RS::REFLECTION_PROBE_AMBIENT_DISABLED);
 	return reflection_probe->ambient_mode;
 }
 
@@ -1474,7 +1470,7 @@ bool LightStorage::reflection_probe_instance_needs_redraw(RID p_instance) {
 		return true;
 	}
 
-	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RSE::REFLECTION_PROBE_UPDATE_ALWAYS) {
+	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS) {
 		return true;
 	}
 
@@ -1505,7 +1501,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_
 
 	RD::get_singleton()->draw_command_begin_label("Reflection Probe Render");
 
-	const bool update_always = LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RSE::REFLECTION_PROBE_UPDATE_ALWAYS;
+	const bool update_always = LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS;
 	if (update_always && atlas->reflection.is_valid() && atlas->size != 256) {
 		WARN_PRINT("ReflectionProbes set to UPDATE_ALWAYS must have an atlas size of 256. Please update the atlas size in the ProjectSettings.");
 		reflection_atlas_set_size(p_reflection_atlas, 256, atlas->count);
@@ -1654,7 +1650,7 @@ bool LightStorage::reflection_probe_instance_postprocess_step(RID p_instance) {
 		return false;
 	}
 
-	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RSE::REFLECTION_PROBE_UPDATE_ALWAYS) {
+	if (LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS) {
 		// Using real time reflections, all roughness is done in one step
 		atlas->reflections.write[rpi->atlas_index].data.create_reflection_fast_filter(false);
 		rpi->rendering = false;
@@ -2098,14 +2094,14 @@ void LightStorage::lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow
 	shadowmask_textures.write[lm->array_index] = t->rd_texture;
 }
 
-RSE::ShadowmaskMode LightStorage::lightmap_get_shadowmask_mode(RID p_lightmap) {
+RS::ShadowmaskMode LightStorage::lightmap_get_shadowmask_mode(RID p_lightmap) {
 	Lightmap *lm = lightmap_owner.get_or_null(p_lightmap);
-	ERR_FAIL_NULL_V(lm, RSE::SHADOWMASK_MODE_NONE);
+	ERR_FAIL_NULL_V(lm, RS::SHADOWMASK_MODE_NONE);
 
 	return lm->shadowmask_mode;
 }
 
-void LightStorage::lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) {
+void LightStorage::lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) {
 	Lightmap *lm = lightmap_owner.get_or_null(p_lightmap);
 	ERR_FAIL_NULL(lm);
 
@@ -2160,7 +2156,7 @@ void LightStorage::shadow_atlas_set_size(RID p_atlas, int p_size, bool p_16_bits
 	ShadowAtlas *shadow_atlas = shadow_atlas_owner.get_or_null(p_atlas);
 	ERR_FAIL_NULL(shadow_atlas);
 	ERR_FAIL_COND(p_size < 0);
-	p_size = Math::next_power_of_2((uint32_t)p_size);
+	p_size = next_power_of_2((uint32_t)p_size);
 
 	if (p_size == shadow_atlas->size && p_16_bits == shadow_atlas->use_16_bits) {
 		return;
@@ -2197,7 +2193,7 @@ void LightStorage::shadow_atlas_set_quadrant_subdivision(RID p_atlas, int p_quad
 	ERR_FAIL_INDEX(p_quadrant, 4);
 	ERR_FAIL_INDEX(p_subdivision, 16384);
 
-	uint32_t subdiv = Math::next_power_of_2((uint32_t)p_subdivision);
+	uint32_t subdiv = next_power_of_2((uint32_t)p_subdivision);
 	if (subdiv & 0xaaaaaaaa) { //sqrt(subdiv) must be integer
 		subdiv <<= 1;
 	}
@@ -2392,7 +2388,7 @@ bool LightStorage::shadow_atlas_update_light(RID p_atlas, RID p_light_instance,
 	}
 
 	uint32_t quad_size = shadow_atlas->size >> 1;
-	int desired_fit = MIN(quad_size / shadow_atlas->smallest_subdiv, Math::next_power_of_2(uint32_t(quad_size * p_coverage)));
+	int desired_fit = MIN(quad_size / shadow_atlas->smallest_subdiv, next_power_of_2(uint32_t(quad_size * p_coverage)));
 
 	int valid_quadrants[4];
 	int valid_quadrant_count = 0;
@@ -2450,7 +2446,7 @@ bool LightStorage::shadow_atlas_update_light(RID p_atlas, RID p_light_instance,
 		old_subdivision = shadow_atlas->quadrants[old_quadrant].subdivision;
 	}
 
-	bool is_omni = li->light_type == RSE::LIGHT_OMNI;
+	bool is_omni = li->light_type == RS::LIGHT_OMNI;
 	bool found_shadow = false;
 	int new_quadrant = -1;
 	int new_shadow = -1;
@@ -2557,7 +2553,7 @@ void LightStorage::update_directional_shadow_atlas() {
 	}
 }
 void LightStorage::directional_shadow_atlas_set_size(int p_size, bool p_16_bits) {
-	p_size = Math::nearest_power_of_2_templated(p_size);
+	p_size = nearest_power_of_2_templated(p_size);
 
 	if (directional_shadow.size == p_size && directional_shadow.use_16_bits == p_16_bits) {
 		return;
@@ -2613,12 +2609,12 @@ int LightStorage::get_directional_light_shadow_size(RID p_light_instance) {
 	ERR_FAIL_NULL_V(light_instance, 0);
 
 	switch (light_directional_get_shadow_mode(light_instance->light)) {
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
 			break; //none
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
 			r.size.height /= 2;
 			break;
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
 			r.size /= 2;
 			break;
 	}
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
index beeacefd..6603ad7a 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
@@ -30,8 +30,10 @@
 
 #pragma once
 
+#include "core/templates/local_vector.h"
 #include "core/templates/paged_array.h"
 #include "core/templates/rid_owner.h"
+#include "core/templates/self_list.h"
 #include "servers/rendering/renderer_rd/cluster_builder_rd.h"
 #include "servers/rendering/renderer_rd/environment/sky.h"
 #include "servers/rendering/renderer_rd/storage_rd/forward_id_storage.h"
@@ -59,14 +61,14 @@ private:
 
 	/* LIGHT */
 	struct Light {
-		RSE::LightType type;
-		float param[RSE::LIGHT_PARAM_MAX];
+		RS::LightType type;
+		float param[RS::LIGHT_PARAM_MAX];
 		Color color = Color(1, 1, 1, 1);
 		RID projector;
 		bool shadow = false;
 		bool negative = false;
 		bool reverse_cull = false;
-		RSE::LightBakeMode bake_mode = RSE::LIGHT_BAKE_DYNAMIC;
+		RS::LightBakeMode bake_mode = RS::LIGHT_BAKE_DYNAMIC;
 		uint32_t max_sdfgi_cascade = 2;
 		uint32_t cull_mask = 0xFFFFFFFF;
 		uint32_t shadow_caster_mask = 0xFFFFFFFF;
@@ -74,10 +76,10 @@ private:
 		real_t distance_fade_begin = 40.0;
 		real_t distance_fade_shadow = 50.0;
 		real_t distance_fade_length = 10.0;
-		RSE::LightOmniShadowMode omni_shadow_mode = RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID;
-		RSE::LightDirectionalShadowMode directional_shadow_mode = RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL;
+		RS::LightOmniShadowMode omni_shadow_mode = RS::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID;
+		RS::LightDirectionalShadowMode directional_shadow_mode = RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL;
 		bool directional_blend_splits = false;
-		RSE::LightDirectionalSkyMode directional_sky_mode = RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY;
+		RS::LightDirectionalSkyMode directional_sky_mode = RS::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY;
 		uint64_t version = 0;
 
 		Dependency dependency;
@@ -100,7 +102,7 @@ private:
 			Vector2 uv_scale;
 		};
 
-		RSE::LightType light_type = RSE::LIGHT_DIRECTIONAL;
+		RS::LightType light_type = RS::LIGHT_DIRECTIONAL;
 
 		ShadowTransform shadow_transform[6];
 
@@ -217,10 +219,10 @@ private:
 	/* REFLECTION PROBE */
 
 	struct ReflectionProbe {
-		RSE::ReflectionProbeUpdateMode update_mode = RSE::REFLECTION_PROBE_UPDATE_ONCE;
+		RS::ReflectionProbeUpdateMode update_mode = RS::REFLECTION_PROBE_UPDATE_ONCE;
 		float intensity = 1.0;
 		float blend_distance = 1.0;
-		RSE::ReflectionProbeAmbientMode ambient_mode = RSE::REFLECTION_PROBE_AMBIENT_ENVIRONMENT;
+		RS::ReflectionProbeAmbientMode ambient_mode = RS::REFLECTION_PROBE_AMBIENT_ENVIRONMENT;
 		Color ambient_color;
 		float ambient_color_energy = 1.0;
 		float max_distance = 0;
@@ -337,7 +339,7 @@ private:
 	struct Lightmap {
 		RID light_texture;
 		RID shadow_texture;
-		RSE::ShadowmaskMode shadowmask_mode = RSE::SHADOWMASK_MODE_NONE;
+		RS::ShadowmaskMode shadowmask_mode = RS::SHADOWMASK_MODE_NONE;
 		bool uses_spherical_harmonics = false;
 		bool interior = false;
 		AABB bounds = AABB(Vector3(), Vector3(1, 1, 1));
@@ -471,7 +473,7 @@ public:
 
 	bool owns_light(RID p_rid) { return light_owner.owns(p_rid); }
 
-	void _light_initialize(RID p_rid, RSE::LightType p_type);
+	void _light_initialize(RID p_rid, RS::LightType p_type);
 
 	virtual RID directional_light_allocate() override;
 	virtual void directional_light_initialize(RID p_light) override;
@@ -485,7 +487,7 @@ public:
 	virtual void light_free(RID p_rid) override;
 
 	virtual void light_set_color(RID p_light, const Color &p_color) override;
-	virtual void light_set_param(RID p_light, RSE::LightParam p_param, float p_value) override;
+	virtual void light_set_param(RID p_light, RS::LightParam p_param, float p_value) override;
 	virtual void light_set_shadow(RID p_light, bool p_enabled) override;
 	virtual void light_set_projector(RID p_light, RID p_texture) override;
 	virtual void light_set_negative(RID p_light, bool p_enable) override;
@@ -494,29 +496,29 @@ public:
 	virtual void light_set_reverse_cull_face_mode(RID p_light, bool p_enabled) override;
 	virtual void light_set_shadow_caster_mask(RID p_light, uint32_t p_caster_mask) override;
 	virtual uint32_t light_get_shadow_caster_mask(RID p_light) const override;
-	virtual void light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) override;
+	virtual void light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) override;
 	virtual void light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade) override;
 
-	virtual void light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) override;
+	virtual void light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) override;
 
-	virtual void light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) override;
+	virtual void light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) override;
 	virtual void light_directional_set_blend_splits(RID p_light, bool p_enable) override;
 	virtual bool light_directional_get_blend_splits(RID p_light) const override;
-	virtual void light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) override;
-	virtual RSE::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override;
+	virtual void light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) override;
+	virtual RS::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const override;
 
-	virtual RSE::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override;
-	virtual RSE::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override;
+	virtual RS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override;
+	virtual RS::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) override;
 
-	virtual RSE::LightType light_get_type(RID p_light) const override {
+	virtual RS::LightType light_get_type(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->type;
 	}
 	virtual AABB light_get_aabb(RID p_light) const override;
 
-	virtual float light_get_param(RID p_light, RSE::LightParam p_param) override {
+	virtual float light_get_param(RID p_light, RS::LightParam p_param) override {
 		const Light *light = light_owner.get_or_null(p_light);
 		ERR_FAIL_NULL_V(light, 0);
 
@@ -559,21 +561,21 @@ public:
 
 	virtual bool light_has_shadow(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->shadow;
 	}
 
 	virtual bool light_has_projector(RID p_light) const override {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return TextureStorage::get_singleton()->owns_texture(light->projector);
 	}
 
 	_FORCE_INLINE_ bool light_is_negative(RID p_light) const {
 		const Light *light = light_owner.get_or_null(p_light);
-		ERR_FAIL_NULL_V(light, RSE::LIGHT_DIRECTIONAL);
+		ERR_FAIL_NULL_V(light, RS::LIGHT_DIRECTIONAL);
 
 		return light->negative;
 	}
@@ -582,7 +584,7 @@ public:
 		const Light *light = light_owner.get_or_null(p_light);
 		ERR_FAIL_NULL_V(light, 0.0);
 
-		return light->param[RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS];
+		return light->param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS];
 	}
 
 	virtual bool light_get_reverse_cull_face_mode(RID p_light) const override {
@@ -592,7 +594,7 @@ public:
 		return light->reverse_cull;
 	}
 
-	virtual RSE::LightBakeMode light_get_bake_mode(RID p_light) override;
+	virtual RS::LightBakeMode light_get_bake_mode(RID p_light) override;
 	virtual uint32_t light_get_max_sdfgi_cascade(RID p_light) override;
 	virtual uint64_t light_get_version(RID p_light) const override;
 	virtual uint32_t light_get_cull_mask(RID p_light) const override;
@@ -787,7 +789,7 @@ public:
 		return li->forward_id;
 	}
 
-	_FORCE_INLINE_ RSE::LightType light_instance_get_type(RID p_light_instance) {
+	_FORCE_INLINE_ RS::LightType light_instance_get_type(RID p_light_instance) {
 		LightInstance *li = light_instance_owner.get_or_null(p_light_instance);
 		return li->light_type;
 	}
@@ -838,10 +840,10 @@ public:
 	virtual void reflection_probe_initialize(RID p_reflection_probe) override;
 	virtual void reflection_probe_free(RID p_rid) override;
 
-	virtual void reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) override;
+	virtual void reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) override;
 	virtual void reflection_probe_set_intensity(RID p_probe, float p_intensity) override;
 	virtual void reflection_probe_set_blend_distance(RID p_probe, float p_blend_distance) override;
-	virtual void reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) override;
+	virtual void reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) override;
 	virtual void reflection_probe_set_ambient_color(RID p_probe, const Color &p_color) override;
 	virtual void reflection_probe_set_ambient_energy(RID p_probe, float p_energy) override;
 	virtual void reflection_probe_set_max_distance(RID p_probe, float p_distance) override;
@@ -858,7 +860,7 @@ public:
 	void reflection_probe_set_baked_exposure(RID p_probe, float p_exposure);
 
 	virtual AABB reflection_probe_get_aabb(RID p_probe) const override;
-	virtual RSE::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override;
+	virtual RS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const override;
 	virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const override;
 	virtual uint32_t reflection_probe_get_reflection_mask(RID p_probe) const override;
 	virtual Vector3 reflection_probe_get_size(RID p_probe) const override;
@@ -873,7 +875,7 @@ public:
 	float reflection_probe_get_blend_distance(RID p_probe) const;
 	bool reflection_probe_is_interior(RID p_probe) const;
 	bool reflection_probe_is_box_projection(RID p_probe) const;
-	RSE::ReflectionProbeAmbientMode reflection_probe_get_ambient_mode(RID p_probe) const;
+	RS::ReflectionProbeAmbientMode reflection_probe_get_ambient_mode(RID p_probe) const;
 	Color reflection_probe_get_ambient_color(RID p_probe) const;
 	float reflection_probe_get_ambient_color_energy(RID p_probe) const;
 
@@ -1011,8 +1013,8 @@ public:
 	Dependency *lightmap_get_dependency(RID p_lightmap) const;
 
 	virtual void lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow) override;
-	virtual RSE::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override;
-	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) override;
+	virtual RS::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) override;
+	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) override;
 
 	virtual float lightmap_get_probe_capture_update_speed() const override {
 		return lightmap_probe_capture_update_speed;
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
index beec6cc7..bf117eea 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
@@ -29,16 +29,13 @@
 /**************************************************************************/
 
 #include "material_storage.h"
-
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "core/math/projection.h"
-#include "core/templates/local_vector.h"
 #include "servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h"
 #include "servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/storage/variant_converters.h"
+#include "texture_storage.h"
 
 using namespace RendererRD;
 
@@ -868,11 +865,12 @@ MaterialStorage::MaterialData::~MaterialData() {
 }
 
 void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Variant> &p_parameters, const HashMap<StringName, HashMap<int, RID>> &p_default_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, RID *p_textures, bool p_use_linear_color, bool p_3d_material) {
+	TextureStorage *texture_storage = TextureStorage::get_singleton();
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 
 #ifdef TOOLS_ENABLED
 	TextureStorage::Texture *roughness_detect_texture = nullptr;
-	RSE::TextureDetectRoughnessChannel roughness_channel = RSE::TEXTURE_DETECT_ROUGHNESS_R;
+	RS::TextureDetectRoughnessChannel roughness_channel = RS::TEXTURE_DETECT_ROUGHNESS_R;
 	TextureStorage::Texture *normal_detect_texture = nullptr;
 #endif
 
@@ -961,9 +959,98 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
 			}
 		}
 
+		RID rd_texture;
+
 		if (textures.is_empty()) {
 			//check default usage
-			RID rd_texture = get_default_texture_id(p_texture_uniforms[i].type, p_texture_uniforms[i].hint);
+			switch (p_texture_uniforms[i].type) {
+				case ShaderLanguage::TYPE_ISAMPLER2D:
+				case ShaderLanguage::TYPE_USAMPLER2D:
+				case ShaderLanguage::TYPE_SAMPLER2D: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_TRANSPARENT);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_ANISO);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_NORMAL);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_NORMAL: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_NORMAL);
+						} break;
+						default: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_WHITE);
+						} break;
+					}
+				} break;
+
+				case ShaderLanguage::TYPE_SAMPLERCUBE: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_TRANSPARENT);
+						} break;
+						default: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_WHITE);
+						} break;
+					}
+				} break;
+				case ShaderLanguage::TYPE_SAMPLERCUBEARRAY: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_WHITE: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_WHITE);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_TRANSPARENT);
+						} break;
+						default: { // previously this only had the black texture available. Keeping black as the default to minimize breaking anything.
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_BLACK);
+						} break;
+					}
+				} break;
+
+				case ShaderLanguage::TYPE_ISAMPLER3D:
+				case ShaderLanguage::TYPE_USAMPLER3D:
+				case ShaderLanguage::TYPE_SAMPLER3D: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_TRANSPARENT);
+						} break;
+						default: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_WHITE);
+						} break;
+					}
+				} break;
+
+				case ShaderLanguage::TYPE_ISAMPLER2DARRAY:
+				case ShaderLanguage::TYPE_USAMPLER2DARRAY:
+				case ShaderLanguage::TYPE_SAMPLER2DARRAY: {
+					switch (p_texture_uniforms[i].hint) {
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_BLACK);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_TRANSPARENT);
+						} break;
+						default: {
+							rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_WHITE);
+						} break;
+					}
+				} break;
+
+				default: {
+				}
+			}
 #ifdef TOOLS_ENABLED
 			if (roughness_detect_texture && normal_detect_texture && !normal_detect_texture->path.is_empty()) {
 				roughness_detect_texture->detect_roughness_callback(roughness_detect_texture->detect_roughness_callback_ud, normal_detect_texture->path, roughness_channel);
@@ -978,11 +1065,9 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
 			}
 		} else {
 			bool srgb = p_use_linear_color && p_texture_uniforms[i].use_color;
-			RID rd_default;
 
 			for (int j = 0; j < textures.size(); j++) {
 				TextureStorage::Texture *tex = TextureStorage::get_singleton()->get_texture(textures[j]);
-				RID rd_texture;
 
 				if (tex) {
 					rd_texture = (srgb && tex->rd_texture_srgb.is_valid()) ? tex->rd_texture_srgb : tex->rd_texture;
@@ -999,7 +1084,7 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
 					if (tex->detect_roughness_callback && (p_texture_uniforms[i].hint >= ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R || p_texture_uniforms[i].hint <= ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_GRAY)) {
 						//find the normal texture
 						roughness_detect_texture = tex;
-						roughness_channel = RSE::TextureDetectRoughnessChannel(p_texture_uniforms[i].hint - ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R);
+						roughness_channel = RS::TextureDetectRoughnessChannel(p_texture_uniforms[i].hint - ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_R);
 					}
 #endif // TOOLS_ENABLED
 					if (tex->render_target) {
@@ -1008,10 +1093,7 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
 					}
 				}
 				if (rd_texture.is_null()) {
-					if (rd_default.is_null()) {
-						rd_default = get_default_texture_id(p_texture_uniforms[i].type, p_texture_uniforms[i].hint);
-					}
-					rd_texture = rd_default;
+					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_WHITE);
 				}
 #ifdef TOOLS_ENABLED
 				if (roughness_detect_texture && normal_detect_texture && !normal_detect_texture->path.is_empty()) {
@@ -1052,102 +1134,6 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
 	}
 }
 
-RID MaterialStorage::MaterialData::get_default_texture_id(ShaderLanguage::DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint) {
-	TextureStorage *texture_storage = TextureStorage::get_singleton();
-	RID rd_texture;
-
-	switch (p_type) {
-		case ShaderLanguage::TYPE_ISAMPLER2D:
-		case ShaderLanguage::TYPE_USAMPLER2D:
-		case ShaderLanguage::TYPE_SAMPLER2D: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_TRANSPARENT);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_ANISO);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_NORMAL);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_NORMAL: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_NORMAL);
-				} break;
-				default: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_WHITE);
-				} break;
-			}
-		} break;
-
-		case ShaderLanguage::TYPE_SAMPLERCUBE: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_TRANSPARENT);
-				} break;
-				default: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_WHITE);
-				} break;
-			}
-		} break;
-		case ShaderLanguage::TYPE_SAMPLERCUBEARRAY: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_WHITE: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_WHITE);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_TRANSPARENT);
-				} break;
-				default: { // previously this only had the black texture available. Keeping black as the default to minimize breaking anything.
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_CUBEMAP_ARRAY_BLACK);
-				} break;
-			}
-		} break;
-
-		case ShaderLanguage::TYPE_ISAMPLER3D:
-		case ShaderLanguage::TYPE_USAMPLER3D:
-		case ShaderLanguage::TYPE_SAMPLER3D: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_TRANSPARENT);
-				} break;
-				default: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_3D_WHITE);
-				} break;
-			}
-		} break;
-
-		case ShaderLanguage::TYPE_ISAMPLER2DARRAY:
-		case ShaderLanguage::TYPE_USAMPLER2DARRAY:
-		case ShaderLanguage::TYPE_SAMPLER2DARRAY: {
-			switch (p_hint) {
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_BLACK: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_BLACK);
-				} break;
-				case ShaderLanguage::ShaderNode::Uniform::HINT_DEFAULT_TRANSPARENT: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_TRANSPARENT);
-				} break;
-				default: {
-					rd_texture = texture_storage->texture_rd_get_default(TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_WHITE);
-				} break;
-			}
-		} break;
-
-		default: {
-		}
-	}
-
-	return rd_texture;
-}
-
 void MaterialStorage::MaterialData::free_parameters_uniform_set(RID p_uniform_set) {
 	if (p_uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(p_uniform_set)) {
 		RD::get_singleton()->uniform_set_set_invalidation_callback(p_uniform_set, nullptr, nullptr);
@@ -1257,178 +1243,6 @@ void MaterialStorage::MaterialData::set_as_used() {
 	}
 }
 
-/* TextureBlit SHADER */
-
-void MaterialStorage::TexBlitShaderData::set_code(const String &p_code) {
-	TextureStorage *texture_storage = TextureStorage::get_singleton();
-	// Initialize and compile the shader.
-
-	code = p_code;
-	valid = false;
-	ubo_size = 0;
-	uniforms.clear();
-
-	if (code.is_empty()) {
-		return; // Just invalid, but no error.
-	}
-
-	ShaderCompiler::GeneratedCode gen_code;
-
-	// Actual enum set further down after compilation.
-	int blend_modei = BLEND_MODE_DISABLED;
-
-	ShaderCompiler::IdentifierActions actions;
-	actions.entry_point_stages["blit"] = ShaderCompiler::STAGE_FRAGMENT;
-
-	actions.render_mode_values["blend_add"] = Pair<int *, int>(&blend_modei, BLEND_MODE_ADD);
-	actions.render_mode_values["blend_mix"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MIX);
-	actions.render_mode_values["blend_sub"] = Pair<int *, int>(&blend_modei, BLEND_MODE_SUB);
-	actions.render_mode_values["blend_mul"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MUL);
-	actions.render_mode_values["blend_disabled"] = Pair<int *, int>(&blend_modei, BLEND_MODE_DISABLED);
-
-	actions.uniforms = &uniforms;
-	Error err = texture_storage->tex_blit_shader.compiler.compile(RSE::SHADER_TEXTURE_BLIT, code, &actions, path, gen_code);
-	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
-
-	if (version.is_null()) {
-		version = texture_storage->tex_blit_shader.shader.version_create();
-	}
-
-	blend_mode = BlendMode(blend_modei);
-
-#if 0
-	print_line("**compiling shader:");
-	print_line("**defines:\n");
-	for (int i = 0; i < gen_code.defines.size(); i++) {
-		print_line(gen_code.defines[i]);
-	}
-
-	HashMap<String, String>::Iterator el = gen_code.code.begin();
-	while (el) {
-		print_line("\n**code " + el->key + ":\n" + el->value);
-		++el;
-	}
-
-	print_line("\n**uniforms:\n" + gen_code.uniforms);
-	print_line("\n**vertex_globals:\n" + gen_code.stage_globals[ShaderCompiler::STAGE_VERTEX]);
-	print_line("\n**fragment_globals:\n" + gen_code.stage_globals[ShaderCompiler::STAGE_FRAGMENT]);
-#endif
-
-	texture_storage->tex_blit_shader.shader.version_set_code(version, gen_code.code, gen_code.uniforms, gen_code.stage_globals[ShaderCompiler::STAGE_VERTEX], gen_code.stage_globals[ShaderCompiler::STAGE_FRAGMENT], gen_code.defines);
-	ERR_FAIL_COND(!texture_storage->tex_blit_shader.shader.version_is_valid(version));
-
-	ubo_size = gen_code.uniform_total_size;
-	ubo_offsets = gen_code.uniform_offsets;
-	texture_uniforms = gen_code.texture_uniforms;
-
-	RD::PipelineColorBlendState blend_state_color_blend;
-	RD::PipelineColorBlendState::Attachment attachment;
-
-	// blend_mode_to_blend_attachment(blend_mode) does not work
-	// Because we want BlendAdd and BlendSub to behave differently for Texture_Blit
-	switch (blend_mode) {
-		case BLEND_MODE_MIX: {
-			attachment.enable_blend = true;
-			attachment.alpha_blend_op = RD::BLEND_OP_ADD;
-			attachment.color_blend_op = RD::BLEND_OP_ADD;
-			attachment.src_color_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA;
-			attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
-			attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.dst_alpha_blend_factor = RD::BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
-		} break;
-		case BLEND_MODE_ADD: {
-			attachment.enable_blend = true;
-			attachment.alpha_blend_op = RD::BLEND_OP_ADD;
-			attachment.color_blend_op = RD::BLEND_OP_ADD;
-			attachment.src_color_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.dst_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
-		} break;
-		case BLEND_MODE_SUB: {
-			attachment.enable_blend = true;
-			attachment.alpha_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT;
-			attachment.color_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT;
-			attachment.src_color_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
-			attachment.dst_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
-		} break;
-		case BLEND_MODE_MUL: {
-			attachment.enable_blend = true;
-			attachment.alpha_blend_op = RD::BLEND_OP_ADD;
-			attachment.color_blend_op = RD::BLEND_OP_ADD;
-			attachment.src_color_blend_factor = RD::BLEND_FACTOR_DST_COLOR;
-			attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ZERO;
-			attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_DST_ALPHA;
-			attachment.dst_alpha_blend_factor = RD::BLEND_FACTOR_ZERO;
-		} break;
-		case BLEND_MODE_DISABLED:
-		default: {
-			// Use default attachment values.
-		} break;
-	}
-
-	blend_state_color_blend.attachments = { attachment, attachment, attachment, attachment };
-
-	// Update Pipelines
-	for (int i = 0; i < 4; i++) {
-		RID shader_variant = texture_storage->tex_blit_shader.shader.version_get_shader(version, i);
-
-		pipelines[i].setup(shader_variant, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), RD::PipelineDepthStencilState(), blend_state_color_blend, 0);
-	}
-
-	valid = true;
-}
-
-bool MaterialStorage::TexBlitShaderData::is_animated() const {
-	return false;
-}
-
-bool MaterialStorage::TexBlitShaderData::casts_shadows() const {
-	return false;
-}
-
-RenderingServerTypes::ShaderNativeSourceCode MaterialStorage::TexBlitShaderData::get_native_source_code() const {
-	return TextureStorage::get_singleton()->tex_blit_shader.shader.version_get_native_source_code(version);
-}
-
-Pair<ShaderRD *, RID> MaterialStorage::TexBlitShaderData::get_native_shader_and_version() const {
-	return { &TextureStorage::get_singleton()->tex_blit_shader.shader, version };
-}
-
-MaterialStorage::TexBlitShaderData::TexBlitShaderData() {
-	valid = false;
-}
-
-MaterialStorage::TexBlitShaderData::~TexBlitShaderData() {
-	if (version.is_valid()) {
-		TextureStorage::get_singleton()->tex_blit_shader.shader.version_free(version);
-	}
-}
-
-MaterialStorage::ShaderData *MaterialStorage::_create_tex_blit_shader_func() {
-	MaterialStorage::TexBlitShaderData *shader_data = memnew(MaterialStorage::TexBlitShaderData);
-	return shader_data;
-}
-
-bool MaterialStorage::TexBlitMaterialData::update_parameters(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty) {
-	uniform_set_updated = true;
-
-	return update_parameters_uniform_set(p_parameters, p_uniform_dirty, p_textures_dirty, shader_data->uniforms, shader_data->ubo_offsets.ptr(), shader_data->texture_uniforms, shader_data->default_texture_params, shader_data->ubo_size, uniform_set, TextureStorage::get_singleton()->tex_blit_shader.shader.version_get_shader(shader_data->version, 0), 1, true, false);
-}
-
-MaterialStorage::TexBlitMaterialData::~TexBlitMaterialData() {
-	free_parameters_uniform_set(uniform_set);
-}
-
-MaterialStorage::MaterialData *MaterialStorage::_create_tex_blit_material_func(MaterialStorage::ShaderData *p_shader) {
-	MaterialStorage::TexBlitMaterialData *material_data = memnew(TexBlitMaterialData);
-	material_data->shader_data = static_cast<TexBlitShaderData *>(p_shader);
-	//update will happen later anyway so do nothing.
-	return material_data;
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // MaterialStorage::Samplers
 
@@ -1439,18 +1253,18 @@ template void MaterialStorage::Samplers::append_uniforms(Vector<RD::Uniform> &p_
 template <typename Collection>
 void MaterialStorage::Samplers::append_uniforms(Collection &p_uniforms, int p_first_index) const {
 	// Binding ids are aligned with samplers_inc.glsl.
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 0, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 1, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 2, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 3, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 4, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 5, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC][RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 6, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 7, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 8, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 9, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 10, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
-	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 11, rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC][RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 0, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 1, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 2, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 3, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 4, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 5, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC][RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 6, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 7, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 8, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 9, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 10, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
+	p_uniforms.push_back(RD::Uniform(RD::UNIFORM_TYPE_SAMPLER, p_first_index + 11, rids[RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC][RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED]));
 }
 
 bool MaterialStorage::Samplers::is_valid() const {
@@ -1566,9 +1380,9 @@ int32_t MaterialStorage::_global_shader_uniform_allocate(uint32_t p_elements) {
 	return -1;
 }
 
-void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RSE::GlobalShaderParameterType p_type, const Variant &p_value) {
+void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS::GlobalShaderParameterType p_type, const Variant &p_value) {
 	switch (p_type) {
-		case RSE::GLOBAL_VAR_TYPE_BOOL: {
+		case RS::GLOBAL_VAR_TYPE_BOOL: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			bool b = p_value;
 			bv.x = b ? 1.0 : 0.0;
@@ -1577,7 +1391,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.w = 0.0;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC2: {
+		case RS::GLOBAL_VAR_TYPE_BVEC2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1585,7 +1399,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0.0;
 			bv.w = 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC3: {
+		case RS::GLOBAL_VAR_TYPE_BVEC3: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1593,7 +1407,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = (bvec & 4) ? 1.0 : 0.0;
 			bv.w = 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_BVEC4: {
+		case RS::GLOBAL_VAR_TYPE_BVEC4: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			uint32_t bvec = p_value;
 			bv.x = (bvec & 1) ? 1.0 : 0.0;
@@ -1601,7 +1415,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = (bvec & 4) ? 1.0 : 0.0;
 			bv.w = (bvec & 8) ? 1.0 : 0.0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_INT: {
+		case RS::GLOBAL_VAR_TYPE_INT: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			int32_t v = p_value;
 			bv.x = v;
@@ -1609,7 +1423,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC2: {
+		case RS::GLOBAL_VAR_TYPE_IVEC2: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector2i v = convert_to_vector<Vector2i>(p_value);
 			bv.x = v.x;
@@ -1617,7 +1431,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC3: {
+		case RS::GLOBAL_VAR_TYPE_IVEC3: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector3i v = convert_to_vector<Vector3i>(p_value);
 			bv.x = v.x;
@@ -1625,7 +1439,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_IVEC4: {
+		case RS::GLOBAL_VAR_TYPE_IVEC4: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector4i v = convert_to_vector<Vector4i>(p_value);
 			bv.x = v.x;
@@ -1633,7 +1447,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_RECT2I: {
+		case RS::GLOBAL_VAR_TYPE_RECT2I: {
 			GlobalShaderUniforms::ValueInt &bv = *(GlobalShaderUniforms::ValueInt *)&global_shader_uniforms.buffer_values[p_index];
 			Rect2i v = p_value;
 			bv.x = v.position.x;
@@ -1641,7 +1455,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.size.x;
 			bv.w = v.size.y;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UINT: {
+		case RS::GLOBAL_VAR_TYPE_UINT: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			uint32_t v = p_value;
 			bv.x = v;
@@ -1649,7 +1463,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC2: {
+		case RS::GLOBAL_VAR_TYPE_UVEC2: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector2i v = convert_to_vector<Vector2i>(p_value);
 			bv.x = v.x;
@@ -1657,7 +1471,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC3: {
+		case RS::GLOBAL_VAR_TYPE_UVEC3: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector3i v = convert_to_vector<Vector3i>(p_value);
 			bv.x = v.x;
@@ -1665,7 +1479,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_UVEC4: {
+		case RS::GLOBAL_VAR_TYPE_UVEC4: {
 			GlobalShaderUniforms::ValueUInt &bv = *(GlobalShaderUniforms::ValueUInt *)&global_shader_uniforms.buffer_values[p_index];
 			Vector4i v = convert_to_vector<Vector4i>(p_value);
 			bv.x = v.x;
@@ -1673,7 +1487,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_FLOAT: {
+		case RS::GLOBAL_VAR_TYPE_FLOAT: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			float v = p_value;
 			bv.x = v;
@@ -1681,7 +1495,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC2: {
+		case RS::GLOBAL_VAR_TYPE_VEC2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector2 v = convert_to_vector<Vector2>(p_value);
 			bv.x = v.x;
@@ -1689,7 +1503,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = 0;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC3: {
+		case RS::GLOBAL_VAR_TYPE_VEC3: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector3 v = convert_to_vector<Vector3>(p_value);
 			bv.x = v.x;
@@ -1697,7 +1511,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = 0;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_VEC4: {
+		case RS::GLOBAL_VAR_TYPE_VEC4: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Vector4 v = convert_to_vector<Vector4>(p_value);
 			bv.x = v.x;
@@ -1705,7 +1519,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.z;
 			bv.w = v.w;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_COLOR: {
+		case RS::GLOBAL_VAR_TYPE_COLOR: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Color v = p_value;
 			bv.x = v.r;
@@ -1721,7 +1535,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv_linear.w = v.a;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_RECT2: {
+		case RS::GLOBAL_VAR_TYPE_RECT2: {
 			GlobalShaderUniforms::Value &bv = global_shader_uniforms.buffer_values[p_index];
 			Rect2 v = p_value;
 			bv.x = v.position.x;
@@ -1729,7 +1543,7 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv.z = v.size.x;
 			bv.w = v.size.y;
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT2: {
+		case RS::GLOBAL_VAR_TYPE_MAT2: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Vector<float> m2 = p_value;
 			if (m2.size() < 4) {
@@ -1746,25 +1560,25 @@ void MaterialStorage::_global_shader_uniform_store_in_buffer(int32_t p_index, RS
 			bv[1].w = 0;
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT3: {
+		case RS::GLOBAL_VAR_TYPE_MAT3: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Basis v = p_value;
 			convert_item_std140<Basis>(v, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_MAT4: {
+		case RS::GLOBAL_VAR_TYPE_MAT4: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Projection m = p_value;
 			convert_item_std140<Projection>(m, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Transform2D v = p_value;
 			convert_item_std140<Transform2D>(v, &bv->x);
 
 		} break;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM: {
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 			GlobalShaderUniforms::Value *bv = &global_shader_uniforms.buffer_values[p_index];
 			Transform3D v = p_value;
 			convert_item_std140<Transform3D>(v, &bv->x);
@@ -1792,27 +1606,27 @@ void MaterialStorage::_global_shader_uniform_mark_buffer_dirty(int32_t p_index,
 	}
 }
 
-void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) {
+void MaterialStorage::global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) {
 	ERR_FAIL_COND(global_shader_uniforms.variables.has(p_name));
 	GlobalShaderUniforms::Variable gv;
 	gv.type = p_type;
 	gv.value = p_value;
 	gv.buffer_index = -1;
 
-	if (p_type >= RSE::GLOBAL_VAR_TYPE_SAMPLER2D) {
+	if (p_type >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
 		//is texture
 		global_shader_uniforms.must_update_texture_materials = true; //normally there are none
 	} else {
 		gv.buffer_elements = 1;
-		if (p_type == RSE::GLOBAL_VAR_TYPE_COLOR || p_type == RSE::GLOBAL_VAR_TYPE_MAT2) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_COLOR || p_type == RS::GLOBAL_VAR_TYPE_MAT2) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 2;
 		}
-		if (p_type == RSE::GLOBAL_VAR_TYPE_MAT3 || p_type == RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_MAT3 || p_type == RS::GLOBAL_VAR_TYPE_TRANSFORM_2D) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 3;
 		}
-		if (p_type == RSE::GLOBAL_VAR_TYPE_MAT4 || p_type == RSE::GLOBAL_VAR_TYPE_TRANSFORM) {
+		if (p_type == RS::GLOBAL_VAR_TYPE_MAT4 || p_type == RS::GLOBAL_VAR_TYPE_TRANSFORM) {
 			//color needs to elements to store srgb and linear
 			gv.buffer_elements = 4;
 		}
@@ -1923,17 +1737,17 @@ Variant MaterialStorage::global_shader_parameter_get(const StringName &p_name) c
 	return global_shader_uniforms.variables[p_name].value;
 }
 
-RSE::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type_internal(const StringName &p_name) const {
+RS::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type_internal(const StringName &p_name) const {
 	if (!global_shader_uniforms.variables.has(p_name)) {
-		return RSE::GLOBAL_VAR_TYPE_MAX;
+		return RS::GLOBAL_VAR_TYPE_MAX;
 	}
 
 	return global_shader_uniforms.variables[p_name].type;
 }
 
-RSE::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
+RS::GlobalShaderParameterType MaterialStorage::global_shader_parameter_get_type(const StringName &p_name) const {
 	if (!Engine::get_singleton()->is_editor_hint()) {
-		ERR_FAIL_V_MSG(RSE::GLOBAL_VAR_TYPE_MAX, "This function should never be used outside the editor, it can severely damage performance.");
+		ERR_FAIL_V_MSG(RS::GLOBAL_VAR_TYPE_MAX, "This function should never be used outside the editor, it can severely damage performance.");
 	}
 
 	return global_shader_parameter_get_type_internal(p_name);
@@ -1953,7 +1767,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 			String type = d["type"];
 
-			static const char *global_var_type_names[RSE::GLOBAL_VAR_TYPE_MAX] = {
+			static const char *global_var_type_names[RS::GLOBAL_VAR_TYPE_MAX] = {
 				"bool",
 				"bvec2",
 				"bvec3",
@@ -1985,20 +1799,20 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 				"samplerExternalOES",
 			};
 
-			RSE::GlobalShaderParameterType gvtype = RSE::GLOBAL_VAR_TYPE_MAX;
+			RS::GlobalShaderParameterType gvtype = RS::GLOBAL_VAR_TYPE_MAX;
 
-			for (int i = 0; i < RSE::GLOBAL_VAR_TYPE_MAX; i++) {
+			for (int i = 0; i < RS::GLOBAL_VAR_TYPE_MAX; i++) {
 				if (global_var_type_names[i] == type) {
-					gvtype = RSE::GlobalShaderParameterType(i);
+					gvtype = RS::GlobalShaderParameterType(i);
 					break;
 				}
 			}
 
-			ERR_CONTINUE(gvtype == RSE::GLOBAL_VAR_TYPE_MAX); //type invalid
+			ERR_CONTINUE(gvtype == RS::GLOBAL_VAR_TYPE_MAX); //type invalid
 
 			Variant value = d["value"];
 
-			if (gvtype >= RSE::GLOBAL_VAR_TYPE_SAMPLER2D) {
+			if (gvtype >= RS::GLOBAL_VAR_TYPE_SAMPLER2D) {
 				String path = value;
 				// Don't load the textures, but still add the parameter so shaders compile correctly while loading.
 				if (!p_load_textures || path.is_empty()) {
@@ -2219,8 +2033,6 @@ void MaterialStorage::shader_set_code(RID p_shader, const String &p_code) {
 		new_type = SHADER_TYPE_SKY;
 	} else if (mode_string == "fog") {
 		new_type = SHADER_TYPE_FOG;
-	} else if (mode_string == "texture_blit") {
-		new_type = SHADER_TYPE_TEXTURE_BLIT;
 	} else {
 		new_type = SHADER_TYPE_MAX;
 	}
@@ -2361,13 +2173,13 @@ MaterialStorage::ShaderData *MaterialStorage::shader_get_data(RID p_shader) cons
 	return shader->data;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode MaterialStorage::shader_get_native_source_code(RID p_shader) const {
+RS::ShaderNativeSourceCode MaterialStorage::shader_get_native_source_code(RID p_shader) const {
 	Shader *shader = shader_owner.get_or_null(p_shader);
-	ERR_FAIL_NULL_V(shader, RenderingServerTypes::ShaderNativeSourceCode());
+	ERR_FAIL_NULL_V(shader, RS::ShaderNativeSourceCode());
 	if (shader->data) {
 		return shader->data->get_native_source_code();
 	}
-	return RenderingServerTypes::ShaderNativeSourceCode();
+	return RS::ShaderNativeSourceCode();
 }
 
 void MaterialStorage::shader_embedded_set_lock() {
@@ -2600,22 +2412,22 @@ bool MaterialStorage::material_casts_shadows(RID p_material) {
 	return true; //by default everything casts shadows
 }
 
-RSE::CullMode RendererRD::MaterialStorage::material_get_cull_mode(RID p_material) const {
+RS::CullMode RendererRD::MaterialStorage::material_get_cull_mode(RID p_material) const {
 	Material *material = material_owner.get_or_null(p_material);
-	ERR_FAIL_NULL_V(material, RSE::CULL_MODE_DISABLED);
-	ERR_FAIL_NULL_V(material->shader, RSE::CULL_MODE_DISABLED);
+	ERR_FAIL_NULL_V(material, RS::CULL_MODE_DISABLED);
+	ERR_FAIL_NULL_V(material->shader, RS::CULL_MODE_DISABLED);
 	if (material->shader->type == ShaderType::SHADER_TYPE_3D && material->shader->data) {
 		RendererSceneRenderImplementation::SceneShaderForwardClustered::ShaderData *sd_clustered = dynamic_cast<RendererSceneRenderImplementation::SceneShaderForwardClustered::ShaderData *>(material->shader->data);
 		if (sd_clustered) {
-			return (RSE::CullMode)sd_clustered->cull_mode;
+			return (RS::CullMode)sd_clustered->cull_mode;
 		}
 
 		RendererSceneRenderImplementation::SceneShaderForwardMobile::ShaderData *sd_mobile = dynamic_cast<RendererSceneRenderImplementation::SceneShaderForwardMobile::ShaderData *>(material->shader->data);
 		if (sd_mobile) {
-			return (RSE::CullMode)sd_mobile->cull_mode;
+			return (RS::CullMode)sd_mobile->cull_mode;
 		}
 	}
-	return RSE::CULL_MODE_DISABLED;
+	return RS::CULL_MODE_DISABLED;
 }
 
 void MaterialStorage::material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) {
@@ -2639,7 +2451,7 @@ void MaterialStorage::material_update_dependency(RID p_material, DependencyTrack
 	}
 }
 
-MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_bias, RSE::ViewportAnisotropicFiltering anisotropic_filtering_level) const {
+MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_bias, RS::ViewportAnisotropicFiltering anisotropic_filtering_level) const {
 	Samplers samplers;
 	samplers.mipmap_bias = p_mipmap_bias;
 	samplers.anisotropic_filtering_level = (int)anisotropic_filtering_level;
@@ -2648,34 +2460,34 @@ MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_b
 	RD::SamplerFilter mip_filter = samplers.use_nearest_mipmap_filter ? RD::SAMPLER_FILTER_NEAREST : RD::SAMPLER_FILTER_LINEAR;
 	float anisotropy_max = float(1 << samplers.anisotropic_filtering_level);
 
-	for (int i = 1; i < RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX; i++) {
-		for (int j = 1; j < RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX; j++) {
+	for (int i = 1; i < RS::CANVAS_ITEM_TEXTURE_FILTER_MAX; i++) {
+		for (int j = 1; j < RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX; j++) {
 			RD::SamplerState sampler_state;
 			switch (i) {
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.max_lod = 0;
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.max_lod = 0;
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.mip_filter = mip_filter;
 					sampler_state.lod_bias = samplers.mipmap_bias;
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.mip_filter = mip_filter;
 					sampler_state.lod_bias = samplers.mipmap_bias;
 
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_NEAREST;
 					sampler_state.mip_filter = mip_filter;
@@ -2683,7 +2495,7 @@ MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_b
 					sampler_state.use_anisotropy = true;
 					sampler_state.anisotropy_max = anisotropy_max;
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC: {
+				case RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC: {
 					sampler_state.mag_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.min_filter = RD::SAMPLER_FILTER_LINEAR;
 					sampler_state.mip_filter = mip_filter;
@@ -2696,18 +2508,18 @@ MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_b
 				}
 			}
 			switch (j) {
-				case RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: {
+				case RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: {
 					sampler_state.repeat_u = RD::SAMPLER_REPEAT_MODE_CLAMP_TO_EDGE;
 					sampler_state.repeat_v = RD::SAMPLER_REPEAT_MODE_CLAMP_TO_EDGE;
 					sampler_state.repeat_w = RD::SAMPLER_REPEAT_MODE_CLAMP_TO_EDGE;
 
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: {
+				case RS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: {
 					sampler_state.repeat_u = RD::SAMPLER_REPEAT_MODE_REPEAT;
 					sampler_state.repeat_v = RD::SAMPLER_REPEAT_MODE_REPEAT;
 					sampler_state.repeat_w = RD::SAMPLER_REPEAT_MODE_REPEAT;
 				} break;
-				case RSE::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: {
+				case RS::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: {
 					sampler_state.repeat_u = RD::SAMPLER_REPEAT_MODE_MIRRORED_REPEAT;
 					sampler_state.repeat_v = RD::SAMPLER_REPEAT_MODE_MIRRORED_REPEAT;
 					sampler_state.repeat_w = RD::SAMPLER_REPEAT_MODE_MIRRORED_REPEAT;
@@ -2724,8 +2536,8 @@ MaterialStorage::Samplers MaterialStorage::samplers_rd_allocate(float p_mipmap_b
 }
 
 void MaterialStorage::samplers_rd_free(Samplers &p_samplers) const {
-	for (int i = 1; i < RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX; i++) {
-		for (int j = 1; j < RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX; j++) {
+	for (int i = 1; i < RS::CANVAS_ITEM_TEXTURE_FILTER_MAX; i++) {
+		for (int j = 1; j < RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX; j++) {
 			if (p_samplers.rids[i][j].is_valid()) {
 				RD::get_singleton()->free_rid(p_samplers.rids[i][j]);
 				p_samplers.rids[i][j] = RID();
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
index 6cfd169e..3ca15064 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
@@ -30,18 +30,17 @@
 
 #pragma once
 
+#include "texture_storage.h"
+
+#include "core/math/projection.h"
+#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
-struct Projection;
-
 namespace RendererRD {
 
 class MaterialStorage : public RendererMaterialStorage {
@@ -52,7 +51,6 @@ public:
 		SHADER_TYPE_PARTICLES,
 		SHADER_TYPE_SKY,
 		SHADER_TYPE_FOG,
-		SHADER_TYPE_TEXTURE_BLIT,
 		SHADER_TYPE_MAX
 	};
 
@@ -81,7 +79,7 @@ public:
 		virtual void set_code(const String &p_Code) = 0;
 		virtual bool is_animated() const = 0;
 		virtual bool casts_shadows() const = 0;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const = 0;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const = 0;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const = 0;
 
 		virtual ~ShaderData() {}
@@ -95,7 +93,6 @@ public:
 		void update_uniform_buffer(const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const HashMap<StringName, Variant> &p_parameters, uint8_t *p_buffer, uint32_t p_buffer_size, bool p_use_linear_color);
 		void update_textures(const HashMap<StringName, Variant> &p_parameters, const HashMap<StringName, HashMap<int, RID>> &p_default_textures, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, RID *p_textures, bool p_use_linear_color, bool p_3d_material);
 		void set_as_used();
-		RID get_default_texture_id(ShaderLanguage::DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint);
 
 		virtual void set_render_priority(int p_priority) = 0;
 		virtual void set_next_pass(RID p_pass) = 0;
@@ -122,12 +119,12 @@ public:
 	};
 
 	struct Samplers {
-		RID rids[RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX][RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX];
+		RID rids[RS::CANVAS_ITEM_TEXTURE_FILTER_MAX][RS::CANVAS_ITEM_TEXTURE_REPEAT_MAX];
 		float mipmap_bias = 0.0f;
 		bool use_nearest_mipmap_filter = false;
 		int anisotropic_filtering_level = 2;
 
-		_FORCE_INLINE_ RID get_sampler(RSE::CanvasItemTextureFilter p_filter, RSE::CanvasItemTextureRepeat p_repeat) const {
+		_FORCE_INLINE_ RID get_sampler(RS::CanvasItemTextureFilter p_filter, RS::CanvasItemTextureRepeat p_repeat) const {
 			return rids[p_filter][p_repeat];
 		}
 
@@ -137,53 +134,6 @@ public:
 		bool is_null() const;
 	};
 
-	/* Texture Blit Shader */
-
-	struct TexBlitShaderData : public ShaderData {
-		bool valid;
-		RID version;
-
-		PipelineCacheRD pipelines[4];
-		Vector<ShaderCompiler::GeneratedCode::Texture> texture_uniforms;
-
-		Vector<uint32_t> ubo_offsets;
-		uint32_t ubo_size;
-
-		String code;
-
-		BlendMode blend_mode;
-
-		virtual void set_code(const String &p_Code);
-		virtual bool is_animated() const;
-		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
-		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
-
-		TexBlitShaderData();
-		virtual ~TexBlitShaderData();
-	};
-
-	ShaderData *_create_tex_blit_shader_func();
-	static MaterialStorage::ShaderData *_create_tex_blit_shader_funcs() {
-		return get_singleton()->_create_tex_blit_shader_func();
-	}
-
-	struct TexBlitMaterialData : public MaterialData {
-		TexBlitShaderData *shader_data = nullptr;
-		RID uniform_set;
-		bool uniform_set_updated;
-
-		virtual void set_render_priority(int p_priority) {}
-		virtual void set_next_pass(RID p_pass) {}
-		virtual bool update_parameters(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty);
-		virtual ~TexBlitMaterialData();
-	};
-
-	MaterialData *_create_tex_blit_material_func(ShaderData *p_shader);
-	static MaterialStorage::MaterialData *_create_tex_blit_material_funcs(MaterialStorage::ShaderData *p_shader) {
-		return get_singleton()->_create_tex_blit_material_func(static_cast<TexBlitShaderData *>(p_shader));
-	}
-
 private:
 	static MaterialStorage *singleton;
 
@@ -205,7 +155,7 @@ private:
 		struct Variable {
 			HashSet<RID> texture_materials; // materials using this
 
-			RSE::GlobalShaderParameterType type;
+			RS::GlobalShaderParameterType type;
 			Variant value;
 			Variant override;
 			int32_t buffer_index; //for vectors
@@ -257,7 +207,7 @@ private:
 	} global_shader_uniforms;
 
 	int32_t _global_shader_uniform_allocate(uint32_t p_elements);
-	void _global_shader_uniform_store_in_buffer(int32_t p_index, RSE::GlobalShaderParameterType p_type, const Variant &p_value);
+	void _global_shader_uniform_store_in_buffer(int32_t p_index, RS::GlobalShaderParameterType p_type, const Variant &p_value);
 	void _global_shader_uniform_mark_buffer_dirty(int32_t p_index, int32_t p_elements);
 
 	/* SHADER API */
@@ -417,10 +367,10 @@ public:
 
 	/* Samplers */
 
-	Samplers samplers_rd_allocate(float p_mipmap_bias = 0.0f, RSE::ViewportAnisotropicFiltering anisotropic_filtering_level = RSE::ViewportAnisotropicFiltering::VIEWPORT_ANISOTROPY_4X) const;
+	Samplers samplers_rd_allocate(float p_mipmap_bias = 0.0f, RS::ViewportAnisotropicFiltering anisotropic_filtering_level = RS::ViewportAnisotropicFiltering::VIEWPORT_ANISOTROPY_4X) const;
 	void samplers_rd_free(Samplers &p_samplers) const;
 
-	_FORCE_INLINE_ RID sampler_rd_get_default(RSE::CanvasItemTextureFilter p_filter, RSE::CanvasItemTextureRepeat p_repeat) {
+	_FORCE_INLINE_ RID sampler_rd_get_default(RS::CanvasItemTextureFilter p_filter, RS::CanvasItemTextureRepeat p_repeat) {
 		return default_samplers.get_sampler(p_filter, p_repeat);
 	}
 
@@ -436,15 +386,15 @@ public:
 
 	void _update_global_shader_uniforms();
 
-	virtual void global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) override;
+	virtual void global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) override;
 	virtual void global_shader_parameter_remove(const StringName &p_name) override;
 	virtual Vector<StringName> global_shader_parameter_get_list() const override;
 
 	virtual void global_shader_parameter_set(const StringName &p_name, const Variant &p_value) override;
 	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) override;
 	virtual Variant global_shader_parameter_get(const StringName &p_name) const override;
-	virtual RSE::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
-	RSE::GlobalShaderParameterType global_shader_parameter_get_type_internal(const StringName &p_name) const;
+	virtual RS::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override;
+	RS::GlobalShaderParameterType global_shader_parameter_get_type_internal(const StringName &p_name) const;
 
 	virtual void global_shader_parameters_load_settings(bool p_load_textures = true) override;
 	virtual void global_shader_parameters_clear() override;
@@ -474,7 +424,7 @@ public:
 	void shader_set_data_request_function(ShaderType p_shader_type, ShaderDataRequestFunction p_function);
 	ShaderData *shader_get_data(RID p_shader) const;
 
-	virtual RenderingServerTypes::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override;
+	virtual RS::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override;
 	virtual void shader_embedded_set_lock() override;
 	virtual const HashSet<RID> &shader_embedded_set_get() const override;
 	virtual void shader_embedded_set_unlock() override;
@@ -501,7 +451,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) override;
 	virtual bool material_casts_shadows(RID p_material) override;
-	virtual RSE::CullMode material_get_cull_mode(RID p_material) const override;
+	virtual RS::CullMode material_get_cull_mode(RID p_material) const override;
 
 	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override;
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
index b5c69b44..189262f4 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
@@ -30,10 +30,6 @@
 
 #include "mesh_storage.h"
 
-#include "servers/rendering/renderer_viewport.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_types.h"
-
 using namespace RendererRD;
 
 MeshStorage *MeshStorage::singleton = nullptr;
@@ -121,7 +117,7 @@ MeshStorage::MeshStorage() {
 			mesh_default_rd_buffers[DEFAULT_RD_BUFFER_TEX_UV2] = RD::get_singleton()->vertex_buffer_create(buffer.size(), buffer);
 		}
 
-		for (int i = 0; i < RSE::ARRAY_CUSTOM_COUNT; i++) {
+		for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) {
 			buffer.resize(sizeof(float) * 4);
 			{
 				uint8_t *w = buffer.ptrw();
@@ -260,11 +256,11 @@ void MeshStorage::mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count
 }
 
 /// Returns stride
-void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) {
+void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
 	ERR_FAIL_NULL(mesh);
 
-	ERR_FAIL_COND(mesh->surface_count == RSE::MAX_MESH_SURFACES);
+	ERR_FAIL_COND(mesh->surface_count == RS::MAX_MESH_SURFACES);
 
 #ifdef DEBUG_ENABLED
 	//do a validation, to catch errors first
@@ -273,60 +269,60 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		uint32_t attrib_stride = 0;
 		uint32_t skin_stride = 0;
 
-		for (int i = 0; i < RSE::ARRAY_WEIGHTS; i++) {
+		for (int i = 0; i < RS::ARRAY_WEIGHTS; i++) {
 			if ((p_surface.format & (1ULL << i))) {
 				switch (i) {
-					case RSE::ARRAY_VERTEX: {
-						if ((p_surface.format & RSE::ARRAY_FLAG_USE_2D_VERTICES) || (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					case RS::ARRAY_VERTEX: {
+						if ((p_surface.format & RS::ARRAY_FLAG_USE_2D_VERTICES) || (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 							stride += sizeof(float) * 2;
 						} else {
 							stride += sizeof(float) * 3;
 						}
 
 					} break;
-					case RSE::ARRAY_NORMAL: {
+					case RS::ARRAY_NORMAL: {
 						stride += sizeof(uint16_t) * 2;
 
 					} break;
-					case RSE::ARRAY_TANGENT: {
-						if (!(p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					case RS::ARRAY_TANGENT: {
+						if (!(p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 							stride += sizeof(uint16_t) * 2;
 						}
 					} break;
-					case RSE::ARRAY_COLOR: {
+					case RS::ARRAY_COLOR: {
 						attrib_stride += sizeof(uint32_t);
 					} break;
-					case RSE::ARRAY_TEX_UV: {
-						if (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					case RS::ARRAY_TEX_UV: {
+						if (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 							attrib_stride += sizeof(uint16_t) * 2;
 						} else {
 							attrib_stride += sizeof(float) * 2;
 						}
 
 					} break;
-					case RSE::ARRAY_TEX_UV2: {
-						if (p_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					case RS::ARRAY_TEX_UV2: {
+						if (p_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 							attrib_stride += sizeof(uint16_t) * 2;
 						} else {
 							attrib_stride += sizeof(float) * 2;
 						}
 
 					} break;
-					case RSE::ARRAY_CUSTOM0:
-					case RSE::ARRAY_CUSTOM1:
-					case RSE::ARRAY_CUSTOM2:
-					case RSE::ARRAY_CUSTOM3: {
-						int idx = i - RSE::ARRAY_CUSTOM0;
-						const uint32_t fmt_shift[RSE::ARRAY_CUSTOM_COUNT] = { RSE::ARRAY_FORMAT_CUSTOM0_SHIFT, RSE::ARRAY_FORMAT_CUSTOM1_SHIFT, RSE::ARRAY_FORMAT_CUSTOM2_SHIFT, RSE::ARRAY_FORMAT_CUSTOM3_SHIFT };
-						uint32_t fmt = (p_surface.format >> fmt_shift[idx]) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
-						const uint32_t fmtsize[RSE::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
+					case RS::ARRAY_CUSTOM0:
+					case RS::ARRAY_CUSTOM1:
+					case RS::ARRAY_CUSTOM2:
+					case RS::ARRAY_CUSTOM3: {
+						int idx = i - RS::ARRAY_CUSTOM0;
+						const uint32_t fmt_shift[RS::ARRAY_CUSTOM_COUNT] = { RS::ARRAY_FORMAT_CUSTOM0_SHIFT, RS::ARRAY_FORMAT_CUSTOM1_SHIFT, RS::ARRAY_FORMAT_CUSTOM2_SHIFT, RS::ARRAY_FORMAT_CUSTOM3_SHIFT };
+						uint32_t fmt = (p_surface.format >> fmt_shift[idx]) & RS::ARRAY_FORMAT_CUSTOM_MASK;
+						const uint32_t fmtsize[RS::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
 						attrib_stride += fmtsize[fmt];
 
 					} break;
-					case RSE::ARRAY_WEIGHTS:
-					case RSE::ARRAY_BONES: {
+					case RS::ARRAY_WEIGHTS:
+					case RS::ARRAY_BONES: {
 						//uses a separate array
-						bool use_8 = p_surface.format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+						bool use_8 = p_surface.format & RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 						skin_stride += sizeof(int16_t) * (use_8 ? 16 : 8);
 					} break;
 				}
@@ -343,7 +339,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		int expected_attrib_size = attrib_stride * p_surface.vertex_count;
 		ERR_FAIL_COND_MSG(expected_attrib_size != p_surface.attribute_data.size(), "Size of attribute data provided (" + itos(p_surface.attribute_data.size()) + ") does not match expected (" + itos(expected_attrib_size) + ")");
 
-		if ((p_surface.format & RSE::ARRAY_FORMAT_WEIGHTS) && (p_surface.format & RSE::ARRAY_FORMAT_BONES)) {
+		if ((p_surface.format & RS::ARRAY_FORMAT_WEIGHTS) && (p_surface.format & RS::ARRAY_FORMAT_BONES)) {
 			expected_size = skin_stride * p_surface.vertex_count;
 			ERR_FAIL_COND_MSG(expected_size != p_surface.skin_data.size(), "Size of skin data provided (" + itos(p_surface.skin_data.size()) + ") does not match expected (" + itos(expected_size) + ")");
 		}
@@ -351,21 +347,21 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 
 #endif
 
-	uint64_t surface_version = p_surface.format & (uint64_t(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK) << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	RenderingServerTypes::SurfaceData new_surface = p_surface;
+	uint64_t surface_version = p_surface.format & (uint64_t(RS::ARRAY_FLAG_FORMAT_VERSION_MASK) << RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	RS::SurfaceData new_surface = p_surface;
 #ifdef DISABLE_DEPRECATED
 
-	ERR_FAIL_COND_MSG(surface_version != RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Surface version provided (" + itos(int(surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT)) + ") does not match current version (" + itos(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) + ")");
+	ERR_FAIL_COND_MSG(surface_version != RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Surface version provided (" + itos(int(surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT)) + ") does not match current version (" + itos(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) + ")");
 
 #else
 
-	if (surface_version != uint64_t(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION)) {
+	if (surface_version != uint64_t(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION)) {
 		RS::get_singleton()->fix_surface_compatibility(new_surface);
-		surface_version = new_surface.format & (RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-		ERR_FAIL_COND_MSG(surface_version != RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
+		surface_version = new_surface.format & (RS::ARRAY_FLAG_FORMAT_VERSION_MASK << RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+		ERR_FAIL_COND_MSG(surface_version != RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION,
 				vformat("Surface version provided (%d) does not match current version (%d).",
-						(surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK,
-						(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK));
+						(surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK,
+						(RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK));
 	}
 #endif
 
@@ -384,7 +380,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 		// This allows us to avoid adding a shader permutation, and avoid passing dummy tangents. Since the stride is kept small
 		// this should still be a net win for bandwidth.
 		// If we do this, then the last normal will read past the end of the array. So we need to pad the array with dummy data.
-		if (!(new_surface.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (new_surface.format & RSE::ARRAY_FORMAT_NORMAL) && !(new_surface.format & RSE::ARRAY_FORMAT_TANGENT)) {
+		if (!(new_surface.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (new_surface.format & RS::ARRAY_FORMAT_NORMAL) && !(new_surface.format & RS::ARRAY_FORMAT_TANGENT)) {
 			// Unfortunately, we need to copy the buffer, which is fine as doing a resize triggers a CoW anyway.
 			Vector<uint8_t> new_vertex_data;
 			new_vertex_data.resize_initialized(new_surface.vertex_data.size() + sizeof(uint16_t) * 2);
@@ -408,7 +404,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RenderingServerTypes::Surfa
 
 	s->vertex_count = new_surface.vertex_count;
 
-	if (new_surface.format & RSE::ARRAY_FORMAT_BONES) {
+	if (new_surface.format & RS::ARRAY_FORMAT_BONES) {
 		mesh->has_bone_weights = true;
 	}
 
@@ -554,7 +550,7 @@ int MeshStorage::mesh_get_blend_shape_count(RID p_mesh) const {
 	return mesh->blend_shape_count;
 }
 
-void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) {
+void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
 	ERR_FAIL_NULL(mesh);
 	ERR_FAIL_INDEX((int)p_mode, 2);
@@ -562,9 +558,9 @@ void MeshStorage::mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mo
 	mesh->blend_shape_mode = p_mode;
 }
 
-RSE::BlendShapeMode MeshStorage::mesh_get_blend_shape_mode(RID p_mesh) const {
+RS::BlendShapeMode MeshStorage::mesh_get_blend_shape_mode(RID p_mesh) const {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
-	ERR_FAIL_NULL_V(mesh, RSE::BLEND_SHAPE_MODE_NORMALIZED);
+	ERR_FAIL_NULL_V(mesh, RS::BLEND_SHAPE_MODE_NORMALIZED);
 	return mesh->blend_shape_mode;
 }
 
@@ -638,19 +634,19 @@ RID MeshStorage::mesh_surface_get_material(RID p_mesh, int p_surface) const {
 	return mesh->surfaces[p_surface]->material;
 }
 
-RenderingServerTypes::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int p_surface) const {
+RS::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int p_surface) const {
 	Mesh *mesh = mesh_owner.get_or_null(p_mesh);
-	ERR_FAIL_NULL_V(mesh, RenderingServerTypes::SurfaceData());
-	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_surface, mesh->surface_count, RenderingServerTypes::SurfaceData());
+	ERR_FAIL_NULL_V(mesh, RS::SurfaceData());
+	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_surface, mesh->surface_count, RS::SurfaceData());
 
 	Mesh::Surface &s = *mesh->surfaces[p_surface];
 
-	RenderingServerTypes::SurfaceData sd;
+	RS::SurfaceData sd;
 	sd.format = s.format;
 	if (s.vertex_buffer.is_valid()) {
 		sd.vertex_data = RD::get_singleton()->buffer_get_data(s.vertex_buffer);
 		// When using an uncompressed buffer with normals, but without tangents, we have to trim the padding.
-		if (!(s.format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (s.format & RSE::ARRAY_FORMAT_NORMAL) && !(s.format & RSE::ARRAY_FORMAT_TANGENT)) {
+		if (!(s.format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && (s.format & RS::ARRAY_FORMAT_NORMAL) && !(s.format & RS::ARRAY_FORMAT_TANGENT)) {
 			sd.vertex_data.resize(sd.vertex_data.size() - sizeof(uint16_t) * 2);
 		}
 	}
@@ -670,7 +666,7 @@ RenderingServerTypes::SurfaceData MeshStorage::mesh_get_surface(RID p_mesh, int
 	sd.aabb = s.aabb;
 	sd.uv_scale = s.uv_scale;
 	for (uint32_t i = 0; i < s.lod_count; i++) {
-		RenderingServerTypes::SurfaceData::LOD lod;
+		RS::SurfaceData::LOD lod;
 		lod.edge_length = s.lods[i].edge_length;
 		lod.index_data = RD::get_singleton()->buffer_get_data(s.lods[i].index_buffer);
 		sd.lods.push_back(lod);
@@ -726,7 +722,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 	for (uint32_t i = 0; i < mesh->surface_count; i++) {
 		AABB laabb;
 		const Mesh::Surface &surface = *mesh->surfaces[i];
-		if ((surface.format & RSE::ARRAY_FORMAT_BONES) && surface.bone_aabbs.size()) {
+		if ((surface.format & RS::ARRAY_FORMAT_BONES) && surface.bone_aabbs.size()) {
 			int bs = surface.bone_aabbs.size();
 			const AABB *skbones = surface.bone_aabbs.ptr();
 
@@ -916,7 +912,7 @@ void MeshStorage::mesh_surface_remove(RID p_mesh, int p_surface) {
 	if (mesh->has_bone_weights) {
 		mesh->has_bone_weights = false;
 		for (uint32_t i = 0; i < mesh->surface_count; i++) {
-			if (mesh->surfaces[i]->format & RSE::ARRAY_FORMAT_BONES) {
+			if (mesh->surfaces[i]->format & RS::ARRAY_FORMAT_BONES) {
 				mesh->has_bone_weights = true;
 				break;
 			}
@@ -941,13 +937,13 @@ void MeshStorage::mesh_surface_remove(RID p_mesh, int p_surface) {
 	}
 }
 
-void MeshStorage::mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) {
+void MeshStorage::mesh_debug_usage(List<RS::MeshInfo> *r_info) {
 	for (const RID &mesh_rid : mesh_owner.get_owned_list()) {
 		Mesh *mesh = mesh_owner.get_or_null(mesh_rid);
 		if (!mesh) {
 			continue;
 		}
-		RenderingServerTypes::MeshInfo mesh_info;
+		RS::MeshInfo mesh_info;
 		mesh_info.mesh = mesh_rid;
 		mesh_info.path = mesh->path;
 
@@ -1052,7 +1048,7 @@ void MeshStorage::_mesh_instance_add_surface(MeshInstance *mi, Mesh *mesh, uint3
 	}
 
 	MeshInstance::Surface s;
-	if ((mesh->blend_shape_count > 0 || (mesh->surfaces[p_surface]->format & RSE::ARRAY_FORMAT_BONES)) && mesh->surfaces[p_surface]->vertex_buffer_size > 0) {
+	if ((mesh->blend_shape_count > 0 || (mesh->surfaces[p_surface]->format & RS::ARRAY_FORMAT_BONES)) && mesh->surfaces[p_surface]->vertex_buffer_size > 0) {
 		_mesh_instance_add_surface_buffer(mi, mesh, &s, p_surface, 0);
 	}
 
@@ -1198,7 +1194,7 @@ void MeshStorage::update_mesh_instances() {
 				continue;
 			}
 
-			bool array_is_2d = mi->mesh->surfaces[i]->format & RSE::ARRAY_FLAG_USE_2D_VERTICES;
+			bool array_is_2d = mi->mesh->surfaces[i]->format & RS::ARRAY_FLAG_USE_2D_VERTICES;
 
 			RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, skeleton_shader.pipeline[array_is_2d ? SkeletonShader::SHADER_MODE_2D : SkeletonShader::SHADER_MODE_3D]);
 
@@ -1212,9 +1208,9 @@ void MeshStorage::update_mesh_instances() {
 
 			SkeletonShader::PushConstant push_constant;
 
-			push_constant.has_normal = mi->mesh->surfaces[i]->format & RSE::ARRAY_FORMAT_NORMAL;
-			push_constant.has_tangent = mi->mesh->surfaces[i]->format & RSE::ARRAY_FORMAT_TANGENT;
-			push_constant.has_skeleton = sk != nullptr && sk->use_2d == array_is_2d && (mi->mesh->surfaces[i]->format & RSE::ARRAY_FORMAT_BONES);
+			push_constant.has_normal = mi->mesh->surfaces[i]->format & RS::ARRAY_FORMAT_NORMAL;
+			push_constant.has_tangent = mi->mesh->surfaces[i]->format & RS::ARRAY_FORMAT_TANGENT;
+			push_constant.has_skeleton = sk != nullptr && sk->use_2d == array_is_2d && (mi->mesh->surfaces[i]->format & RS::ARRAY_FORMAT_BONES);
 			push_constant.has_blend_shape = mi->mesh->blend_shape_count > 0;
 
 			push_constant.normal_tangent_stride = (push_constant.has_normal ? 1 : 0) + (push_constant.has_tangent ? 1 : 0);
@@ -1222,7 +1218,7 @@ void MeshStorage::update_mesh_instances() {
 			push_constant.vertex_count = mi->mesh->surfaces[i]->vertex_count;
 			push_constant.vertex_stride = ((mi->mesh->surfaces[i]->vertex_buffer_size / mi->mesh->surfaces[i]->vertex_count) / 4) - push_constant.normal_tangent_stride;
 			push_constant.skin_stride = (mi->mesh->surfaces[i]->skin_buffer_size / mi->mesh->surfaces[i]->vertex_count) / 4;
-			push_constant.skin_weight_offset = (mi->mesh->surfaces[i]->format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 4 : 2;
+			push_constant.skin_weight_offset = (mi->mesh->surfaces[i]->format & RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 4 : 2;
 
 			Transform2D transform = Transform2D();
 			if (sk && sk->use_2d) {
@@ -1244,7 +1240,7 @@ void MeshStorage::update_mesh_instances() {
 			push_constant.inverse_transform_offset[1] = inverse_transform.columns[2][1];
 
 			push_constant.blend_shape_count = mi->mesh->blend_shape_count;
-			push_constant.normalized_blend_shapes = mi->mesh->blend_shape_mode == RSE::BLEND_SHAPE_MODE_NORMALIZED;
+			push_constant.normalized_blend_shapes = mi->mesh->blend_shape_mode == RS::BLEND_SHAPE_MODE_NORMALIZED;
 			push_constant.pad1 = 0;
 
 			RD::get_singleton()->compute_list_set_push_constant(compute_list, &push_constant, sizeof(SkeletonShader::PushConstant));
@@ -1271,31 +1267,31 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 
 	r_position_stride = 0;
 
-	for (int i = 0; i < RSE::ARRAY_INDEX; i++) {
+	for (int i = 0; i < RS::ARRAY_INDEX; i++) {
 		RD::VertexAttribute vd;
 		vd.location = i;
 
 		if (!(p_surface_format & (1ULL << i))) {
 			vd.stride = 0;
 			switch (i) {
-				case RSE::ARRAY_VERTEX:
-				case RSE::ARRAY_NORMAL:
+				case RS::ARRAY_VERTEX:
+				case RS::ARRAY_NORMAL:
 					vd.format = RD::DATA_FORMAT_R32G32B32_SFLOAT;
 					break;
-				case RSE::ARRAY_TEX_UV:
-				case RSE::ARRAY_TEX_UV2:
+				case RS::ARRAY_TEX_UV:
+				case RS::ARRAY_TEX_UV2:
 					vd.format = RD::DATA_FORMAT_R32G32_SFLOAT;
 					break;
-				case RSE::ARRAY_BONES:
+				case RS::ARRAY_BONES:
 					vd.format = RD::DATA_FORMAT_R32G32B32A32_UINT;
 					break;
-				case RSE::ARRAY_TANGENT:
-				case RSE::ARRAY_COLOR:
-				case RSE::ARRAY_CUSTOM0:
-				case RSE::ARRAY_CUSTOM1:
-				case RSE::ARRAY_CUSTOM2:
-				case RSE::ARRAY_CUSTOM3:
-				case RSE::ARRAY_WEIGHTS:
+				case RS::ARRAY_TANGENT:
+				case RS::ARRAY_COLOR:
+				case RS::ARRAY_CUSTOM0:
+				case RS::ARRAY_CUSTOM1:
+				case RS::ARRAY_CUSTOM2:
+				case RS::ARRAY_CUSTOM3:
+				case RS::ARRAY_WEIGHTS:
 					vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
 					break;
 				default:
@@ -1307,14 +1303,14 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 			vd.stride = 1;
 
 			switch (i) {
-				case RSE::ARRAY_VERTEX: {
+				case RS::ARRAY_VERTEX: {
 					vd.offset = r_position_stride;
 
-					if (p_surface_format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+					if (p_surface_format & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 						vd.format = RD::DATA_FORMAT_R32G32_SFLOAT;
 						r_position_stride = sizeof(float) * 2;
 					} else {
-						if (!p_instanced_surface && (p_surface_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+						if (!p_instanced_surface && (p_surface_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 							vd.format = RD::DATA_FORMAT_R16G16B16A16_UNORM;
 							r_position_stride = sizeof(uint16_t) * 4;
 						} else {
@@ -1324,10 +1320,10 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 					}
 
 				} break;
-				case RSE::ARRAY_NORMAL: {
+				case RS::ARRAY_NORMAL: {
 					vd.offset = 0;
 
-					if (!p_instanced_surface && (p_surface_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+					if (!p_instanced_surface && (p_surface_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 						vd.format = RD::DATA_FORMAT_R16G16_UNORM;
 						normal_tangent_stride += sizeof(uint16_t) * 2;
 					} else {
@@ -1335,26 +1331,26 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 						// A small trick here: if we are uncompressed and we have normals, but no tangents. We need
 						// the shader to think there are 4 components to "axis_tangent_attrib". So we give a size of 4,
 						// but a stride based on only having 2 elements.
-						if (!(p_surface_format & RSE::ARRAY_FORMAT_TANGENT)) {
+						if (!(p_surface_format & RS::ARRAY_FORMAT_TANGENT)) {
 							normal_tangent_stride += sizeof(uint16_t) * 2;
 						} else {
 							normal_tangent_stride += sizeof(uint16_t) * 4;
 						}
 					}
 				} break;
-				case RSE::ARRAY_TANGENT: {
+				case RS::ARRAY_TANGENT: {
 					vd.stride = 0;
 					vd.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
 				} break;
-				case RSE::ARRAY_COLOR: {
+				case RS::ARRAY_COLOR: {
 					vd.offset = attribute_stride;
 
 					vd.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
 					attribute_stride += sizeof(int8_t) * 4;
 				} break;
-				case RSE::ARRAY_TEX_UV: {
+				case RS::ARRAY_TEX_UV: {
 					vd.offset = attribute_stride;
-					if (p_surface_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					if (p_surface_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 						vd.format = RD::DATA_FORMAT_R16G16_UNORM;
 						attribute_stride += sizeof(uint16_t) * 2;
 					} else {
@@ -1363,9 +1359,9 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 					}
 
 				} break;
-				case RSE::ARRAY_TEX_UV2: {
+				case RS::ARRAY_TEX_UV2: {
 					vd.offset = attribute_stride;
-					if (p_surface_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+					if (p_surface_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 						vd.format = RD::DATA_FORMAT_R16G16_UNORM;
 						attribute_stride += sizeof(uint16_t) * 2;
 					} else {
@@ -1373,27 +1369,27 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 						attribute_stride += sizeof(float) * 2;
 					}
 				} break;
-				case RSE::ARRAY_CUSTOM0:
-				case RSE::ARRAY_CUSTOM1:
-				case RSE::ARRAY_CUSTOM2:
-				case RSE::ARRAY_CUSTOM3: {
+				case RS::ARRAY_CUSTOM0:
+				case RS::ARRAY_CUSTOM1:
+				case RS::ARRAY_CUSTOM2:
+				case RS::ARRAY_CUSTOM3: {
 					vd.offset = attribute_stride;
 
-					int idx = i - RSE::ARRAY_CUSTOM0;
-					const uint32_t fmt_shift[RSE::ARRAY_CUSTOM_COUNT] = { RSE::ARRAY_FORMAT_CUSTOM0_SHIFT, RSE::ARRAY_FORMAT_CUSTOM1_SHIFT, RSE::ARRAY_FORMAT_CUSTOM2_SHIFT, RSE::ARRAY_FORMAT_CUSTOM3_SHIFT };
-					uint32_t fmt = (p_surface_format >> fmt_shift[idx]) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
-					const uint32_t fmtsize[RSE::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
-					const RD::DataFormat fmtrd[RSE::ARRAY_CUSTOM_MAX] = { RD::DATA_FORMAT_R8G8B8A8_UNORM, RD::DATA_FORMAT_R8G8B8A8_SNORM, RD::DATA_FORMAT_R16G16_SFLOAT, RD::DATA_FORMAT_R16G16B16A16_SFLOAT, RD::DATA_FORMAT_R32_SFLOAT, RD::DATA_FORMAT_R32G32_SFLOAT, RD::DATA_FORMAT_R32G32B32_SFLOAT, RD::DATA_FORMAT_R32G32B32A32_SFLOAT };
+					int idx = i - RS::ARRAY_CUSTOM0;
+					const uint32_t fmt_shift[RS::ARRAY_CUSTOM_COUNT] = { RS::ARRAY_FORMAT_CUSTOM0_SHIFT, RS::ARRAY_FORMAT_CUSTOM1_SHIFT, RS::ARRAY_FORMAT_CUSTOM2_SHIFT, RS::ARRAY_FORMAT_CUSTOM3_SHIFT };
+					uint32_t fmt = (p_surface_format >> fmt_shift[idx]) & RS::ARRAY_FORMAT_CUSTOM_MASK;
+					const uint32_t fmtsize[RS::ARRAY_CUSTOM_MAX] = { 4, 4, 4, 8, 4, 8, 12, 16 };
+					const RD::DataFormat fmtrd[RS::ARRAY_CUSTOM_MAX] = { RD::DATA_FORMAT_R8G8B8A8_UNORM, RD::DATA_FORMAT_R8G8B8A8_SNORM, RD::DATA_FORMAT_R16G16_SFLOAT, RD::DATA_FORMAT_R16G16B16A16_SFLOAT, RD::DATA_FORMAT_R32_SFLOAT, RD::DATA_FORMAT_R32G32_SFLOAT, RD::DATA_FORMAT_R32G32B32_SFLOAT, RD::DATA_FORMAT_R32G32B32A32_SFLOAT };
 					vd.format = fmtrd[fmt];
 					attribute_stride += fmtsize[fmt];
 				} break;
-				case RSE::ARRAY_BONES: {
+				case RS::ARRAY_BONES: {
 					vd.offset = skin_stride;
 
 					vd.format = RD::DATA_FORMAT_R16G16B16A16_UINT;
 					skin_stride += sizeof(int16_t) * 4;
 				} break;
-				case RSE::ARRAY_WEIGHTS: {
+				case RS::ARRAY_WEIGHTS: {
 					vd.offset = skin_stride;
 
 					vd.format = RD::DATA_FORMAT_R16G16B16A16_UNORM;
@@ -1416,13 +1412,13 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 			// Since the previous vertex, normal and tangent can't be part of the vertex format but they are required when
 			// motion vectors are enabled, we opt to push a copy of the vertex attribute with a different location.
 			switch (i) {
-				case RSE::ARRAY_VERTEX: {
+				case RS::ARRAY_VERTEX: {
 					vd.location = ATTRIBUTE_LOCATION_PREV_VERTEX;
 				} break;
-				case RSE::ARRAY_NORMAL: {
+				case RS::ARRAY_NORMAL: {
 					vd.location = ATTRIBUTE_LOCATION_PREV_NORMAL;
 				} break;
-				case RSE::ARRAY_TANGENT: {
+				case RS::ARRAY_TANGENT: {
 					vd.location = ATTRIBUTE_LOCATION_PREV_TANGENT;
 				} break;
 			}
@@ -1441,11 +1437,11 @@ RD::VertexFormatID MeshStorage::_mesh_surface_generate_vertex_format(uint64_t p_
 		}
 
 		int loc = attributes[i].location;
-		if (loc == RSE::ARRAY_VERTEX || loc == ATTRIBUTE_LOCATION_PREV_VERTEX) {
+		if (loc == RS::ARRAY_VERTEX || loc == ATTRIBUTE_LOCATION_PREV_VERTEX) {
 			attributes.write[i].stride = r_position_stride;
-		} else if ((loc < RSE::ARRAY_COLOR) || ((loc >= ATTRIBUTE_LOCATION_PREV_NORMAL) && (loc <= ATTRIBUTE_LOCATION_PREV_TANGENT))) {
+		} else if ((loc < RS::ARRAY_COLOR) || ((loc >= ATTRIBUTE_LOCATION_PREV_NORMAL) && (loc <= ATTRIBUTE_LOCATION_PREV_TANGENT))) {
 			attributes.write[i].stride = normal_tangent_stride;
-		} else if (loc < RSE::ARRAY_BONES) {
+		} else if (loc < RS::ARRAY_BONES) {
 			attributes.write[i].stride = attribute_stride;
 		} else {
 			attributes.write[i].stride = skin_stride;
@@ -1463,7 +1459,7 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 	Vector<uint64_t> offsets;
 	RID buffer;
 	uint64_t offset = 0;
-	for (int i = 0; i < RSE::ARRAY_INDEX; i++) {
+	for (int i = 0; i < RS::ARRAY_INDEX; i++) {
 		offset = 0;
 
 		if (!(s->format & (1ULL << i))) {
@@ -1472,25 +1468,25 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 		} else {
 			// Supplied by surface, use buffer.
 			switch (i) {
-				case RSE::ARRAY_VERTEX:
-				case RSE::ARRAY_NORMAL:
-					offset = i == RSE::ARRAY_NORMAL ? position_stride * s->vertex_count : 0;
+				case RS::ARRAY_VERTEX:
+				case RS::ARRAY_NORMAL:
+					offset = i == RS::ARRAY_NORMAL ? position_stride * s->vertex_count : 0;
 					buffer = mis != nullptr ? mis->vertex_buffer[p_current_buffer] : s->vertex_buffer;
 					break;
-				case RSE::ARRAY_TANGENT:
+				case RS::ARRAY_TANGENT:
 					buffer = mesh_default_rd_buffers[i];
 					break;
-				case RSE::ARRAY_COLOR:
-				case RSE::ARRAY_TEX_UV:
-				case RSE::ARRAY_TEX_UV2:
-				case RSE::ARRAY_CUSTOM0:
-				case RSE::ARRAY_CUSTOM1:
-				case RSE::ARRAY_CUSTOM2:
-				case RSE::ARRAY_CUSTOM3:
+				case RS::ARRAY_COLOR:
+				case RS::ARRAY_TEX_UV:
+				case RS::ARRAY_TEX_UV2:
+				case RS::ARRAY_CUSTOM0:
+				case RS::ARRAY_CUSTOM1:
+				case RS::ARRAY_CUSTOM2:
+				case RS::ARRAY_CUSTOM3:
 					buffer = s->attribute_buffer;
 					break;
-				case RSE::ARRAY_BONES:
-				case RSE::ARRAY_WEIGHTS:
+				case RS::ARRAY_BONES:
+				case RS::ARRAY_WEIGHTS:
 					buffer = s->skin_buffer;
 					break;
 			}
@@ -1505,7 +1501,7 @@ void MeshStorage::_mesh_surface_generate_version_for_input_mask(Mesh::Surface::V
 
 		if (p_input_motion_vectors) {
 			// Push the buffer for motion vector inputs.
-			if (i == RSE::ARRAY_VERTEX || i == RSE::ARRAY_NORMAL || i == RSE::ARRAY_TANGENT) {
+			if (i == RS::ARRAY_VERTEX || i == RS::ARRAY_NORMAL || i == RS::ARRAY_TANGENT) {
 				if (mis && buffer != mesh_default_rd_buffers[i]) {
 					buffers.push_back(mis->vertex_buffer[p_previous_buffer]);
 				} else {
@@ -1538,13 +1534,13 @@ void MeshStorage::_multimesh_free(RID p_rid) {
 	// Remove from interpolator.
 	_interpolation_data.notify_free_multimesh(p_rid);
 	_update_dirty_multimeshes();
-	multimesh_allocate_data(p_rid, 0, RSE::MULTIMESH_TRANSFORM_2D);
+	multimesh_allocate_data(p_rid, 0, RS::MULTIMESH_TRANSFORM_2D);
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_rid);
 	multimesh->dependency.deleted_notify(p_rid);
 	multimesh_owner.free(p_rid);
 }
 
-void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
+void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 
@@ -1574,7 +1570,7 @@ void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RSE
 	multimesh->instances = p_instances;
 	multimesh->xform_format = p_transform_format;
 	multimesh->uses_colors = p_use_colors;
-	multimesh->color_offset_cache = p_transform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12;
+	multimesh->color_offset_cache = p_transform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
 	multimesh->uses_custom_data = p_use_custom_data;
 	multimesh->custom_data_offset_cache = multimesh->color_offset_cache + (p_use_colors ? 4 : 0);
 	multimesh->stride_cache = multimesh->custom_data_offset_cache + (p_use_custom_data ? 4 : 0);
@@ -1583,7 +1579,7 @@ void MeshStorage::_multimesh_allocate_data(RID p_multimesh, int p_instances, RSE
 	multimesh->indirect = p_use_indirect;
 	multimesh->command_buffer = RID();
 
-	//print_line("allocate, elements: " + itos(p_instances) + " 2D: " + itos(p_transform_format == RSE::MULTIMESH_TRANSFORM_2D) + " colors " + itos(multimesh->uses_colors) + " data " + itos(multimesh->uses_custom_data) + " stride " + itos(multimesh->stride_cache) + " total size " + itos(multimesh->stride_cache * multimesh->instances));
+	//print_line("allocate, elements: " + itos(p_instances) + " 2D: " + itos(p_transform_format == RS::MULTIMESH_TRANSFORM_2D) + " colors " + itos(multimesh->uses_colors) + " data " + itos(multimesh->uses_custom_data) + " stride " + itos(multimesh->stride_cache) + " total size " + itos(multimesh->stride_cache * multimesh->instances));
 	multimesh->data_cache = Vector<float>();
 	multimesh->aabb = AABB();
 	multimesh->aabb_dirty = false;
@@ -1843,7 +1839,7 @@ void MeshStorage::_multimesh_re_create_aabb(MultiMesh *multimesh, const float *p
 		const float *data = p_data + multimesh->stride_cache * i;
 		Transform3D t;
 
-		if (multimesh->xform_format == RSE::MULTIMESH_TRANSFORM_3D) {
+		if (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_3D) {
 			t.basis.rows[0][0] = data[0];
 			t.basis.rows[0][1] = data[1];
 			t.basis.rows[0][2] = data[2];
@@ -1881,7 +1877,7 @@ void MeshStorage::_multimesh_instance_set_transform(RID p_multimesh, int p_index
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 	ERR_FAIL_INDEX(p_index, multimesh->instances);
-	ERR_FAIL_COND(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_3D);
+	ERR_FAIL_COND(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_3D);
 
 	_multimesh_make_local(multimesh);
 
@@ -1918,7 +1914,7 @@ void MeshStorage::_multimesh_instance_set_transform_2d(RID p_multimesh, int p_in
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL(multimesh);
 	ERR_FAIL_INDEX(p_index, multimesh->instances);
-	ERR_FAIL_COND(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_2D);
+	ERR_FAIL_COND(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_2D);
 
 	_multimesh_make_local(multimesh);
 	_multimesh_update_motion_vectors_data_cache(multimesh);
@@ -2005,7 +2001,7 @@ Transform3D MeshStorage::_multimesh_instance_get_transform(RID p_multimesh, int
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, Transform3D());
 	ERR_FAIL_INDEX_V(p_index, multimesh->instances, Transform3D());
-	ERR_FAIL_COND_V(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_3D, Transform3D());
+	ERR_FAIL_COND_V(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_3D, Transform3D());
 
 	_multimesh_make_local(multimesh);
 
@@ -2036,7 +2032,7 @@ Transform2D MeshStorage::_multimesh_instance_get_transform_2d(RID p_multimesh, i
 	MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
 	ERR_FAIL_NULL_V(multimesh, Transform2D());
 	ERR_FAIL_INDEX_V(p_index, multimesh->instances, Transform2D());
-	ERR_FAIL_COND_V(multimesh->xform_format != RSE::MULTIMESH_TRANSFORM_2D, Transform2D());
+	ERR_FAIL_COND_V(multimesh->xform_format != RS::MULTIMESH_TRANSFORM_2D, Transform2D());
 
 	_multimesh_make_local(multimesh);
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
index b409f94f..776c8603 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
@@ -30,12 +30,11 @@
 
 #pragma once
 
+#include "../../rendering_server_globals.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_rd/shaders/skeleton.glsl.gen.h"
-#include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/mesh_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
@@ -76,7 +75,7 @@ private:
 
 	struct Mesh {
 		struct Surface {
-			RSE::PrimitiveType primitive = RSE::PRIMITIVE_POINTS;
+			RS::PrimitiveType primitive = RS::PRIMITIVE_POINTS;
 			uint64_t format = 0;
 
 			uint32_t vertex_count = 0;
@@ -154,7 +153,7 @@ private:
 		};
 
 		uint32_t blend_shape_count = 0;
-		RSE::BlendShapeMode blend_shape_mode = RSE::BLEND_SHAPE_MODE_NORMALIZED;
+		RS::BlendShapeMode blend_shape_mode = RS::BLEND_SHAPE_MODE_NORMALIZED;
 
 		Surface **surfaces = nullptr;
 		uint32_t surface_count = 0;
@@ -229,7 +228,7 @@ private:
 	struct MultiMesh {
 		RID mesh;
 		int instances = 0;
-		RSE::MultimeshTransformFormat xform_format = RSE::MULTIMESH_TRANSFORM_3D;
+		RS::MultimeshTransformFormat xform_format = RS::MULTIMESH_TRANSFORM_3D;
 		bool uses_colors = false;
 		bool uses_custom_data = false;
 		int visible_instances = -1;
@@ -375,12 +374,12 @@ public:
 	virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) override;
 
 	/// Return stride
-	virtual void mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) override;
+	virtual void mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) override;
 
 	virtual int mesh_get_blend_shape_count(RID p_mesh) const override;
 
-	virtual void mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) override;
-	virtual RSE::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override;
+	virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) override;
+	virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override;
 
 	virtual void mesh_surface_update_vertex_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override;
 	virtual void mesh_surface_update_attribute_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override;
@@ -390,7 +389,7 @@ public:
 	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material) override;
 	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const override;
 
-	virtual RenderingServerTypes::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override;
+	virtual RS::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override;
 
 	virtual int mesh_get_surface_count(RID p_mesh) const override;
 
@@ -406,7 +405,7 @@ public:
 	virtual void mesh_clear(RID p_mesh) override;
 	virtual void mesh_surface_remove(RID p_mesh, int p_surface) override;
 
-	virtual void mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) override;
+	virtual void mesh_debug_usage(List<RS::MeshInfo> *r_info) override;
 
 	virtual bool mesh_needs_instance(RID p_mesh, bool p_has_skeleton) override;
 
@@ -442,7 +441,7 @@ public:
 		return mesh->shadow_mesh;
 	}
 
-	_FORCE_INLINE_ RSE::PrimitiveType mesh_surface_get_primitive(void *p_surface) {
+	_FORCE_INLINE_ RS::PrimitiveType mesh_surface_get_primitive(void *p_surface) {
 		Mesh::Surface *surface = reinterpret_cast<Mesh::Surface *>(p_surface);
 		return surface->primitive;
 	}
@@ -658,7 +657,7 @@ public:
 	virtual void _multimesh_initialize(RID p_multimesh) override;
 	virtual void _multimesh_free(RID p_rid) override;
 
-	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override;
+	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) override;
 	virtual int _multimesh_get_instance_count(RID p_multimesh) const override;
 
 	virtual void _multimesh_set_mesh(RID p_multimesh, RID p_mesh) override;
@@ -700,9 +699,9 @@ public:
 		return multimesh->indirect;
 	}
 
-	_FORCE_INLINE_ RSE::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
+	_FORCE_INLINE_ RS::MultimeshTransformFormat multimesh_get_transform_format(RID p_multimesh) const {
 		MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
-		ERR_FAIL_NULL_V(multimesh, RSE::MULTIMESH_TRANSFORM_3D);
+		ERR_FAIL_NULL_V(multimesh, RS::MULTIMESH_TRANSFORM_3D);
 		return multimesh->xform_format;
 	}
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
index 4f1cb25a..cc7b172f 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -30,11 +30,9 @@
 
 #include "particles_storage.h"
 
-#include "servers/rendering/renderer_rd/effects/sort_effects.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/renderer_viewport.h"
 #include "servers/rendering/rendering_server_globals.h"
+#include "texture_storage.h"
 
 using namespace RendererRD;
 
@@ -244,7 +242,7 @@ void ParticlesStorage::particles_free(RID p_rid) {
 	particles_owner.free(p_rid);
 }
 
-void ParticlesStorage::particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) {
+void ParticlesStorage::particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 	if (particles->mode == p_mode) {
@@ -375,11 +373,10 @@ void ParticlesStorage::particles_set_pre_process_time(RID p_particles, double p_
 	particles->pre_process_time = p_time;
 }
 
-void ParticlesStorage::particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual) {
+void ParticlesStorage::particles_request_process_time(RID p_particles, real_t p_request_process_time) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 	particles->request_process_time = p_request_process_time;
-	particles->request_process_time_residual = p_request_process_time_residual;
 }
 
 void ParticlesStorage::particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) {
@@ -487,27 +484,13 @@ void ParticlesStorage::particles_set_collision_base_size(RID p_particles, real_t
 	particles->collision_base_size = p_size;
 }
 
-void ParticlesStorage::particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) {
+void ParticlesStorage::particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
 	particles->transform_align = p_transform_align;
 }
 
-void ParticlesStorage::particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_transform_align_channel_filter) {
-	Particles *particles = particles_owner.get_or_null(p_particles);
-	ERR_FAIL_NULL(particles);
-
-	particles->transform_align_src = p_transform_align_channel_filter;
-}
-
-void ParticlesStorage::particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) {
-	Particles *particles = particles_owner.get_or_null(p_particles);
-	ERR_FAIL_NULL(particles);
-
-	particles->transform_align_axis = p_rotation_axis;
-}
-
 void ParticlesStorage::particles_set_process_material(RID p_particles, RID p_material) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
@@ -523,7 +506,7 @@ RID ParticlesStorage::particles_get_process_material(RID p_particles) const {
 	return particles->process_material;
 }
 
-void ParticlesStorage::particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) {
+void ParticlesStorage::particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) {
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
@@ -837,7 +820,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 		p_particles->particles_material_uniform_set = RD::get_singleton()->uniform_set_create(uniforms, particles_shader.default_shader_rd, 1);
 	}
 
-	double new_phase = Math::fmod((double)(p_particles->phase + (p_delta / p_particles->lifetime)), 1.0);
+	double new_phase = Math::fmod((double)p_particles->phase + (p_delta / p_particles->lifetime), 1.0);
 
 	//move back history (if there is any)
 	for (uint32_t i = p_particles->frame_history.size() - 1; i > 0; i--) {
@@ -965,7 +948,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 			Vector3 scale = to_collider.basis.get_scale();
 			to_collider.basis.orthonormalize();
 
-			if (pc->type <= RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
+			if (pc->type <= RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT) {
 				//attractor
 				if (frame_params.attractor_count >= ParticlesFrameParams::MAX_ATTRACTORS) {
 					continue;
@@ -979,7 +962,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 				attr.directionality = pc->attractor_directionality;
 
 				switch (pc->type) {
-					case RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT: {
 						attr.type = ParticlesFrameParams::ATTRACTOR_TYPE_SPHERE;
 						float radius = pc->radius;
 						radius *= (scale.x + scale.y + scale.z) / 3.0;
@@ -987,14 +970,14 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 						attr.extents[1] = radius;
 						attr.extents[2] = radius;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_BOX_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_BOX_ATTRACT: {
 						attr.type = ParticlesFrameParams::ATTRACTOR_TYPE_BOX;
 						Vector3 extents = pc->extents * scale;
 						attr.extents[0] = extents.x;
 						attr.extents[1] = extents.y;
 						attr.extents[2] = extents.z;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT: {
+					case RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT: {
 						if (collision_3d_textures_used >= ParticlesFrameParams::MAX_3D_TEXTURES) {
 							continue;
 						}
@@ -1023,7 +1006,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 
 				RendererRD::MaterialStorage::store_transform(to_collider, col.transform);
 				switch (pc->type) {
-					case RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
 						col.type = ParticlesFrameParams::COLLISION_TYPE_SPHERE;
 						float radius = pc->radius;
 						radius *= (scale.x + scale.y + scale.z) / 3.0;
@@ -1031,14 +1014,14 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 						col.extents[1] = radius;
 						col.extents[2] = radius;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_BOX_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_BOX_COLLIDE: {
 						col.type = ParticlesFrameParams::COLLISION_TYPE_BOX;
 						Vector3 extents = pc->extents * scale;
 						col.extents[0] = extents.x;
 						col.extents[1] = extents.y;
 						col.extents[2] = extents.z;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_SDF_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_SDF_COLLIDE: {
 						if (collision_3d_textures_used >= ParticlesFrameParams::MAX_3D_TEXTURES) {
 							continue;
 						}
@@ -1053,7 +1036,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 						collision_3d_textures[collision_3d_textures_used] = pc->field_texture;
 						collision_3d_textures_used++;
 					} break;
-					case RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE: {
+					case RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE: {
 						if (collision_heightmap_texture != RID()) { //already taken
 							continue;
 						}
@@ -1237,7 +1220,7 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 	Particles *particles = particles_owner.get_or_null(p_particles);
 	ERR_FAIL_NULL(particles);
 
-	if (particles->draw_order != RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD) {
+	if (particles->draw_order != RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
 		return;
 	}
 
@@ -1245,7 +1228,7 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 		return; //particles have not processed yet
 	}
 
-	bool do_sort = particles->draw_order == RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH;
+	bool do_sort = particles->draw_order == RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH;
 
 	//copy to sort buffer
 	if (do_sort && particles->particles_sort_buffer == RID()) {
@@ -1288,9 +1271,9 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 		copy_push_constant.frame_delta = 0.0;
 	}
 
-	copy_push_constant.order_by_lifetime = (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_LIFETIME || particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
+	copy_push_constant.order_by_lifetime = (particles->draw_order == RS::PARTICLES_DRAW_ORDER_LIFETIME || particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
 	copy_push_constant.lifetime_split = (MIN(int(particles->amount * particles->phase), particles->amount - 1) + 1) % particles->amount;
-	copy_push_constant.lifetime_reverse = particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME;
+	copy_push_constant.lifetime_reverse = particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME;
 	copy_push_constant.motion_vectors_current_offset = particles->instance_motion_vectors_current_offset;
 
 	copy_push_constant.frame_remainder = particles->interpolate ? particles->frame_remainder : 0.0;
@@ -1312,9 +1295,6 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 	copy_push_constant.align_up[2] = p_up_axis.z;
 
 	copy_push_constant.align_mode = particles->transform_align;
-	copy_push_constant.align_src = particles->transform_align_src;
-	copy_push_constant.align_axis = uint32_t(particles->transform_align_axis);
-	copy_push_constant.pad2 = uint32_t(0);
 
 	if (do_sort) {
 		RD::ComputeListID compute_list = RD::get_singleton()->compute_list_begin();
@@ -1337,7 +1317,7 @@ void ParticlesStorage::particles_set_view_axis(RID p_particles, const Vector3 &p
 
 	RD::ComputeListID compute_list = RD::get_singleton()->compute_list_begin();
 	uint32_t copy_mode = do_sort ? ParticlesShader::COPY_MODE_FILL_INSTANCES_WITH_SORT_BUFFER : ParticlesShader::COPY_MODE_FILL_INSTANCES;
-	copy_push_constant.copy_mode_2d = particles->mode == RSE::PARTICLES_MODE_2D ? 1 : 0;
+	copy_push_constant.copy_mode_2d = particles->mode == RS::PARTICLES_MODE_2D ? 1 : 0;
 	RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, particles_shader.copy_pipelines[particles->userdata_count][copy_mode].get_rid());
 	RD::get_singleton()->compute_list_bind_uniform_set(compute_list, particles->particles_copy_uniform_set, 0);
 	if (do_sort) {
@@ -1363,7 +1343,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 	}
 
 	bool uses_motion_vectors = RSG::viewport->get_num_viewports_with_motion_vectors() > 0 || (RendererCompositorStorage::get_singleton()->get_num_compositor_effects_with_motion_vectors() > 0);
-	bool index_draw_order = particles->draw_order == RSE::ParticlesDrawOrder::PARTICLES_DRAW_ORDER_INDEX;
+	bool index_draw_order = particles->draw_order == RS::ParticlesDrawOrder::PARTICLES_DRAW_ORDER_INDEX;
 	bool enable_motion_vectors = uses_motion_vectors && index_draw_order && !particles->instance_motion_vectors_enabled;
 	bool only_instances_changed = false;
 
@@ -1390,7 +1370,7 @@ void ParticlesStorage::_particles_update_buffers(Particles *particles) {
 			total_amount *= particles->trail_bind_poses.size();
 		}
 
-		uint32_t xform_size = particles->mode == RSE::PARTICLES_MODE_2D ? 2 : 3;
+		uint32_t xform_size = particles->mode == RS::PARTICLES_MODE_2D ? 2 : 3;
 		if (particles->particle_buffer.is_null()) {
 			particles->particle_buffer = RD::get_singleton()->storage_buffer_create((sizeof(ParticleData) + userdata_count * sizeof(float) * 4) * total_amount);
 			particles->userdata_count = userdata_count;
@@ -1462,13 +1442,13 @@ void ParticlesStorage::update_particles() {
 			particles->prev_phase = 0;
 			particles->clear = true;
 			particles->restart_request = false;
-			particles->frame_remainder = 0.0;
 		}
 
 		if (particles->inactive && !particles->emitting) {
 			//go next
 			continue;
 		}
+
 		if (particles->emitting) {
 			if (particles->inactive) {
 				//restart system from scratch
@@ -1559,12 +1539,13 @@ void ParticlesStorage::update_particles() {
 			}
 		}
 
-		float todo = particles->clear ? particles->pre_process_time : 0;
-		todo = todo > particles->request_process_time ? todo : particles->request_process_time;
-		todo = todo > particles->request_process_time_residual ? todo : particles->request_process_time_residual;
+		double todo = particles->request_process_time;
+		if (particles->clear) {
+			todo += particles->pre_process_time;
+		}
 
 		if (todo > 0.0) {
-			real_t frame_time;
+			double frame_time;
 			if (fixed_fps > 0) {
 				frame_time = 1.0 / fixed_fps;
 			} else {
@@ -1574,38 +1555,19 @@ void ParticlesStorage::update_particles() {
 			float tmp_scale = particles->speed_scale;
 			// We need this otherwise the speed scale of the particle system influences the TODO.
 			particles->speed_scale = 1.0;
-			if (particles->clear) {
-				todo = particles->pre_process_time;
-				while (todo > 0.0) {
-					_particles_process(particles, frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (particles->request_process_time > 0.0) {
-				todo = particles->request_process_time;
-				while (todo > 0.0) {
-					_particles_process(particles, frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
-			}
-			if (particles->request_process_time_residual > 0.0) {
-				particles->emitting = false;
-				todo = particles->request_process_time_residual;
-				while (todo > 0.0) {
-					_particles_process(particles, frame_time > todo ? todo : frame_time);
-					todo -= frame_time;
-				}
+			while (todo >= 0) {
+				_particles_process(particles, frame_time);
+				todo -= frame_time;
 			}
+			particles->request_process_time = 0.0;
 			particles->speed_scale = tmp_scale;
 		}
 
-		particles->request_process_time = 0.0;
-		particles->request_process_time_residual = 0.0;
+		double time_scale = MAX(particles->speed_scale, 0.0);
 
-		float time_scale = MAX(particles->speed_scale, 0.0);
 		if (fixed_fps > 0) {
-			float frame_time = 1.0 / fixed_fps;
-			float delta = (float)RendererCompositorRD::get_singleton()->get_frame_delta_time();
+			double frame_time = 1.0 / fixed_fps;
+			double delta = RendererCompositorRD::get_singleton()->get_frame_delta_time();
 			if (delta > 0.1) { //avoid recursive stalls if fps goes below 10
 				delta = 0.1;
 			} else if (delta <= 0.0) { //unlikely but..
@@ -1622,6 +1584,7 @@ void ParticlesStorage::update_particles() {
 		} else {
 			_particles_process(particles, RendererCompositorRD::get_singleton()->get_frame_delta_time() * time_scale);
 		}
+
 		// Ensure that memory is initialized (the code above should ensure that _particles_process is always called at least once upon clearing).
 		DEV_ASSERT(!particles->clear);
 
@@ -1631,7 +1594,7 @@ void ParticlesStorage::update_particles() {
 		}
 
 		// Swap offsets for motion vectors. Motion vectors can only be used when the draw order keeps the indices consistent across frames.
-		bool index_draw_order = particles->draw_order == RSE::ParticlesDrawOrder::PARTICLES_DRAW_ORDER_INDEX;
+		bool index_draw_order = particles->draw_order == RS::ParticlesDrawOrder::PARTICLES_DRAW_ORDER_INDEX;
 		particles->instance_motion_vectors_previous_offset = particles->instance_motion_vectors_current_offset;
 		if (uses_motion_vectors && index_draw_order && particles->instance_motion_vectors_enabled && (frame - particles->instance_motion_vectors_last_change) == 1) {
 			particles->instance_motion_vectors_current_offset = total_amount - particles->instance_motion_vectors_current_offset;
@@ -1640,7 +1603,7 @@ void ParticlesStorage::update_particles() {
 		particles->instance_motion_vectors_last_change = frame;
 
 		// Copy particles to instance buffer.
-		if (particles->draw_order != RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
+		if (particles->draw_order != RS::PARTICLES_DRAW_ORDER_VIEW_DEPTH && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD && particles->transform_align != RS::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY) {
 			//does not need view dependent operation, do copy here
 			ParticlesShader::CopyPushConstant copy_push_constant;
 
@@ -1649,37 +1612,14 @@ void ParticlesStorage::update_particles() {
 				// In local mode, particle positions are calculated locally (relative to the node position)
 				// and they're also drawn locally.
 				// It works as expected, so we just pass an identity transform.
-				//RendererRD::MaterialStorage::store_transform(Transform3D(), copy_push_constant.inv_emission_transform);
-				copy_push_constant.inv_emission_transform[0] = 1.0;
-				copy_push_constant.inv_emission_transform[1] = 0.0;
-				copy_push_constant.inv_emission_transform[2] = 0.0;
-				copy_push_constant.inv_emission_transform[3] = 0.0;
-				copy_push_constant.inv_emission_transform[4] = 1.0;
-				copy_push_constant.inv_emission_transform[5] = 0.0;
-				copy_push_constant.inv_emission_transform[6] = 0.0;
-				copy_push_constant.inv_emission_transform[7] = 0.0;
-				copy_push_constant.inv_emission_transform[8] = 1.0;
-				copy_push_constant.inv_emission_transform[9] = 0.0;
-				copy_push_constant.inv_emission_transform[10] = 0.0;
-				copy_push_constant.inv_emission_transform[11] = 0.0;
+				RendererRD::MaterialStorage::store_transform(Transform3D(), copy_push_constant.inv_emission_transform);
 			} else {
 				// In global mode, particle positions are calculated globally (relative to the canvas origin)
 				// but they're drawn locally.
 				// So, we need to pass the inverse of the emission transform to bring the
 				// particles to local coordinates before drawing.
 				Transform3D inv = particles->emission_transform.affine_inverse();
-				copy_push_constant.inv_emission_transform[0] = inv.basis.rows[0][0];
-				copy_push_constant.inv_emission_transform[1] = inv.basis.rows[1][0];
-				copy_push_constant.inv_emission_transform[2] = inv.basis.rows[2][0];
-				copy_push_constant.inv_emission_transform[3] = inv.basis.rows[0][1];
-				copy_push_constant.inv_emission_transform[4] = inv.basis.rows[1][1];
-				copy_push_constant.inv_emission_transform[5] = inv.basis.rows[2][1];
-				copy_push_constant.inv_emission_transform[6] = inv.basis.rows[0][2];
-				copy_push_constant.inv_emission_transform[7] = inv.basis.rows[1][2];
-				copy_push_constant.inv_emission_transform[8] = inv.basis.rows[2][2];
-				copy_push_constant.inv_emission_transform[9] = inv.origin.x;
-				copy_push_constant.inv_emission_transform[10] = inv.origin.y;
-				copy_push_constant.inv_emission_transform[11] = inv.origin.z;
+				RendererRD::MaterialStorage::store_transform(inv, copy_push_constant.inv_emission_transform);
 			}
 
 			copy_push_constant.total_particles = total_amount;
@@ -1688,8 +1628,6 @@ void ParticlesStorage::update_particles() {
 			copy_push_constant.align_up[0] = 0;
 			copy_push_constant.align_up[1] = 0;
 			copy_push_constant.align_up[2] = 0;
-			copy_push_constant.align_src = particles->transform_align_src;
-			copy_push_constant.align_axis = uint32_t(particles->transform_align_axis);
 
 			if (particles->trails_enabled && particles->trail_bind_poses.size() > 1) {
 				copy_push_constant.trail_size = particles->trail_bind_poses.size();
@@ -1701,13 +1639,13 @@ void ParticlesStorage::update_particles() {
 				copy_push_constant.frame_delta = 0.0;
 			}
 
-			copy_push_constant.order_by_lifetime = (particles->draw_order == RSE::PARTICLES_DRAW_ORDER_LIFETIME || particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
+			copy_push_constant.order_by_lifetime = (particles->draw_order == RS::PARTICLES_DRAW_ORDER_LIFETIME || particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
 			copy_push_constant.lifetime_split = (MIN(int(particles->amount * particles->phase), particles->amount - 1) + 1) % particles->amount;
-			copy_push_constant.lifetime_reverse = particles->draw_order == RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME;
+			copy_push_constant.lifetime_reverse = particles->draw_order == RS::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME;
 			copy_push_constant.motion_vectors_current_offset = particles->instance_motion_vectors_current_offset;
 
 			RD::ComputeListID compute_list = RD::get_singleton()->compute_list_begin();
-			copy_push_constant.copy_mode_2d = particles->mode == RSE::PARTICLES_MODE_2D ? 1 : 0;
+			copy_push_constant.copy_mode_2d = particles->mode == RS::PARTICLES_MODE_2D ? 1 : 0;
 			RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, particles_shader.copy_pipelines[particles->userdata_count][ParticlesShader::COPY_MODE_FILL_INSTANCES].get_rid());
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, particles->particles_copy_uniform_set, 0);
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, particles->trail_bind_pose_uniform_set, 2);
@@ -1775,7 +1713,7 @@ void ParticlesStorage::ParticlesShaderData::set_code(const String &p_code) {
 
 	actions.uniforms = &uniforms;
 
-	Error err = particles_storage->particles_shader.compiler.compile(RSE::SHADER_PARTICLES, code, &actions, path, gen_code);
+	Error err = particles_storage->particles_shader.compiler.compile(RS::SHADER_PARTICLES, code, &actions, path, gen_code);
 	ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
 
 	if (version.is_null()) {
@@ -1812,7 +1750,7 @@ bool ParticlesStorage::ParticlesShaderData::casts_shadows() const {
 	return false;
 }
 
-RenderingServerTypes::ShaderNativeSourceCode ParticlesStorage::ParticlesShaderData::get_native_source_code() const {
+RS::ShaderNativeSourceCode ParticlesStorage::ParticlesShaderData::get_native_source_code() const {
 	return ParticlesStorage::get_singleton()->particles_shader.shader.version_get_native_source_code(version);
 }
 
@@ -1871,11 +1809,11 @@ void ParticlesStorage::particles_collision_free(RID p_rid) {
 RID ParticlesStorage::particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL_V(particles_collision, RID());
-	ERR_FAIL_COND_V(particles_collision->type != RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, RID());
+	ERR_FAIL_COND_V(particles_collision->type != RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE, RID());
 
 	if (particles_collision->heightfield_texture == RID()) {
 		//create
-		const int resolutions[RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX] = { 256, 512, 1024, 2048, 4096, 8192 };
+		const int resolutions[RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX] = { 256, 512, 1024, 2048, 4096, 8192 };
 		Size2i size;
 		if (particles_collision->extents.x > particles_collision->extents.z) {
 			size.x = resolutions[particles_collision->heightfield_resolution];
@@ -1903,7 +1841,7 @@ RID ParticlesStorage::particles_collision_get_heightfield_framebuffer(RID p_part
 	return particles_collision->heightfield_fb;
 }
 
-void ParticlesStorage::particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) {
+void ParticlesStorage::particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL(particles_collision);
 
@@ -1994,10 +1932,10 @@ void ParticlesStorage::particles_collision_height_field_update(RID p_particles_c
 	particles_collision->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
 }
 
-void ParticlesStorage::particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) {
+void ParticlesStorage::particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) {
 	ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL(particles_collision);
-	ERR_FAIL_INDEX(p_resolution, RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
+	ERR_FAIL_INDEX(p_resolution, RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
 
 	if (particles_collision->heightfield_resolution == p_resolution) {
 		return;
@@ -2016,8 +1954,8 @@ AABB ParticlesStorage::particles_collision_get_aabb(RID p_particles_collision) c
 	ERR_FAIL_NULL_V(particles_collision, AABB());
 
 	switch (particles_collision->type) {
-		case RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT:
-		case RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
+		case RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT:
+		case RS::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE: {
 			AABB aabb;
 			aabb.position = -Vector3(1, 1, 1) * particles_collision->radius;
 			aabb.size = Vector3(2, 2, 2) * particles_collision->radius;
@@ -2041,7 +1979,7 @@ Vector3 ParticlesStorage::particles_collision_get_extents(RID p_particles_collis
 bool ParticlesStorage::particles_collision_is_heightfield(RID p_particles_collision) const {
 	const ParticlesCollision *particles_collision = particles_collision_owner.get_or_null(p_particles_collision);
 	ERR_FAIL_NULL_V(particles_collision, false);
-	return particles_collision->type == RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE;
+	return particles_collision->type == RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE;
 }
 
 Dependency *ParticlesStorage::particles_collision_get_dependency(RID p_particles_collision) const {
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
index b95b756a..a1c82d7f 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
@@ -33,19 +33,17 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
+#include "servers/rendering/renderer_rd/effects/sort_effects.h"
 #include "servers/rendering/renderer_rd/pipeline_deferred_rd.h"
 #include "servers/rendering/renderer_rd/shaders/particles.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/particles_copy.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/storage/particles_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
 namespace RendererRD {
 
-class SortEffects;
-
 class ParticlesStorage : public RendererParticlesStorage {
 private:
 	static ParticlesStorage *singleton;
@@ -160,7 +158,7 @@ private:
 	};
 
 	struct Particles {
-		RSE::ParticlesMode mode = RSE::PARTICLES_MODE_3D;
+		RS::ParticlesMode mode = RS::PARTICLES_MODE_3D;
 		bool inactive = true;
 		double inactive_time = 0.0;
 		bool emitting = false;
@@ -169,7 +167,6 @@ private:
 		double lifetime = 1.0;
 		double pre_process_time = 0.0;
 		real_t request_process_time = 0.0;
-		real_t request_process_time_residual = 0.0;
 		real_t explosiveness = 0.0;
 		real_t randomness = 0.0;
 		bool restart_request = false;
@@ -184,12 +181,9 @@ private:
 
 		RID process_material;
 		uint32_t frame_counter = 0;
+		RS::ParticlesTransformAlign transform_align = RS::PARTICLES_TRANSFORM_ALIGN_DISABLED;
 
-		RSE::ParticlesTransformAlign transform_align = RSE::PARTICLES_TRANSFORM_ALIGN_DISABLED;
-		RSE::ParticlesTransformAlignCustomSrc transform_align_src = RSE::PARTICLES_ALIGN_CHANNEL_FILTER_X;
-		RSE::ParticlesTransformAlignAxis transform_align_axis = RSE::ParticlesTransformAlignAxis::PARTICLES_ALIGN_AXIS_Y;
-
-		RSE::ParticlesDrawOrder draw_order = RSE::PARTICLES_DRAW_ORDER_INDEX;
+		RS::ParticlesDrawOrder draw_order = RS::PARTICLES_DRAW_ORDER_INDEX;
 
 		Vector<RID> draw_passes;
 		Vector<Transform3D> trail_bind_poses;
@@ -321,12 +315,7 @@ private:
 				uint32_t copy_mode_2d : 1;
 			};
 
-			float inv_emission_transform[12];
-
-			uint32_t align_src;
-			uint32_t align_axis;
-			uint32_t pad1;
-			uint32_t pad2;
+			float inv_emission_transform[16];
 		};
 
 		enum {
@@ -375,7 +364,7 @@ private:
 		virtual void set_code(const String &p_Code);
 		virtual bool is_animated() const;
 		virtual bool casts_shadows() const;
-		virtual RenderingServerTypes::ShaderNativeSourceCode get_native_source_code() const;
+		virtual RS::ShaderNativeSourceCode get_native_source_code() const;
 		virtual Pair<ShaderRD *, RID> get_native_shader_and_version() const;
 
 		ParticlesShaderData() {}
@@ -405,7 +394,7 @@ private:
 	/* Particles Collision */
 
 	struct ParticlesCollision {
-		RSE::ParticlesCollisionType type = RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT;
+		RS::ParticlesCollisionType type = RS::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT;
 		uint32_t cull_mask = 0xFFFFFFFF;
 		float radius = 1.0;
 		Vector3 extents = Vector3(1, 1, 1);
@@ -418,7 +407,7 @@ private:
 		Size2i heightfield_fb_size;
 		uint32_t heightfield_mask = (1 << 20) - 1;
 
-		RSE::ParticlesCollisionHeightfieldResolution heightfield_resolution = RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024;
+		RS::ParticlesCollisionHeightfieldResolution heightfield_resolution = RS::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024;
 
 		Dependency dependency;
 	};
@@ -449,14 +438,14 @@ public:
 	virtual void particles_initialize(RID p_rid) override;
 	virtual void particles_free(RID p_rid) override;
 
-	virtual void particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) override;
+	virtual void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) override;
 	virtual void particles_set_emitting(RID p_particles, bool p_emitting) override;
 	virtual void particles_set_amount(RID p_particles, int p_amount) override;
 	virtual void particles_set_amount_ratio(RID p_particles, float p_amount_ratio) override;
 	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) override;
 	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) override;
 	virtual void particles_set_pre_process_time(RID p_particles, double p_time) override;
-	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual) override;
+	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time) override;
 	virtual void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) override;
 	virtual void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) override;
 	virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) override;
@@ -469,11 +458,7 @@ public:
 	virtual void particles_set_interpolate(RID p_particles, bool p_enable) override;
 	virtual void particles_set_fractional_delta(RID p_particles, bool p_enable) override;
 	virtual void particles_set_collision_base_size(RID p_particles, real_t p_size) override;
-
-	virtual void particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) override;
-	virtual void particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_transform_align_channel_filter) override;
-	virtual void particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) override;
-
+	virtual void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) override;
 	virtual void particles_set_seed(RID p_particles, uint32_t p_seed) override;
 
 	virtual void particles_set_trails(RID p_particles, bool p_enable, double p_length) override;
@@ -484,7 +469,7 @@ public:
 
 	virtual void particles_set_subemitter(RID p_particles, RID p_subemitter_particles) override;
 
-	virtual void particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) override;
+	virtual void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) override;
 
 	virtual void particles_set_draw_passes(RID p_particles, int p_count) override;
 	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) override;
@@ -505,9 +490,9 @@ public:
 
 	virtual bool particles_is_inactive(RID p_particles) const override;
 
-	_FORCE_INLINE_ RSE::ParticlesMode particles_get_mode(RID p_particles) {
+	_FORCE_INLINE_ RS::ParticlesMode particles_get_mode(RID p_particles) {
 		Particles *particles = particles_owner.get_or_null(p_particles);
-		ERR_FAIL_NULL_V(particles, RSE::PARTICLES_MODE_2D);
+		ERR_FAIL_NULL_V(particles, RS::PARTICLES_MODE_2D);
 		return particles->mode;
 	}
 
@@ -584,7 +569,7 @@ public:
 	virtual void particles_collision_initialize(RID p_particles_collision) override;
 	virtual void particles_collision_free(RID p_rid) override;
 
-	virtual void particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) override;
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) override;
 	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) override;
 	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) override; //for spheres
 	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) override; //for non-spheres
@@ -593,7 +578,7 @@ public:
 	virtual void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) override;
 	virtual void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) override; //for SDF and vector field, heightfield is dynamic
 	virtual void particles_collision_height_field_update(RID p_particles_collision) override; //for SDF and vector field
-	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) override; //for SDF and vector field
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) override; //for SDF and vector field
 	virtual AABB particles_collision_get_aabb(RID p_particles_collision) const override;
 	Vector3 particles_collision_get_extents(RID p_particles_collision) const;
 	virtual bool particles_collision_is_heightfield(RID p_particles_collision) const override;
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
index b11ed366..5fadfeb5 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
@@ -32,7 +32,6 @@
 
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/storage/render_data.h"
 
 class RenderDataRD : public RenderData {
@@ -75,9 +74,7 @@ public:
 
 	bool lightmap_bicubic_filter = false;
 
-	float window_output_max_value = 1.0;
-
-	RenderingServerTypes::RenderInfo *render_info = nullptr;
+	RenderingMethod::RenderInfo *render_info = nullptr;
 
 	/* Viewport data */
 	bool transparent_bg = false;
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
index 5a66951b..dc49366d 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
@@ -30,32 +30,28 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "render_scene_buffers_rd.h"
-
-#include "core/object/class_db.h"
-
 RID RenderSceneBuffersRD::_get_color_texture_compat_80214() {
-	return _get_color_texture(msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_color_texture(msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_get_color_layer_compat_80214(const uint32_t p_layer) {
-	return _get_color_layer(p_layer, msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_color_layer(p_layer, msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_get_depth_texture_compat_80214() {
-	return _get_depth_texture(msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_depth_texture(msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_get_depth_layer_compat_80214(const uint32_t p_layer) {
-	return _get_depth_layer(p_layer, msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_depth_layer(p_layer, msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_get_velocity_texture_compat_80214() {
-	return _get_velocity_texture(msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_velocity_texture(msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_get_velocity_layer_compat_80214(const uint32_t p_layer) {
-	return _get_velocity_layer(p_layer, msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
+	return _get_velocity_layer(p_layer, msaa_3d != RS::VIEWPORT_MSAA_DISABLED);
 }
 
 RID RenderSceneBuffersRD::_create_texture_bind_compat_98670(const StringName &p_context, const StringName &p_texture_name, const RD::DataFormat p_data_format, const uint32_t p_usage_bits, const RD::TextureSamples p_texture_samples, const Size2i p_size, const uint32_t p_layers, const uint32_t p_mipmaps, bool p_unique) {
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
index 1d68bacf..45fe456f 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
@@ -31,11 +31,7 @@
 #include "render_scene_buffers_rd.h"
 #include "render_scene_buffers_rd.compat.inc"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
-#include "servers/rendering/rendering_server_enums.h"
 
 RenderSceneBuffersRD::RenderSceneBuffersRD() {
 }
@@ -106,14 +102,14 @@ void RenderSceneBuffersRD::free_named_texture(NamedTexture &p_named_texture) {
 void RenderSceneBuffersRD::update_samplers() {
 	float computed_mipmap_bias = texture_mipmap_bias;
 
-	if (use_taa || (RSE::scaling_3d_mode_type(scaling_3d_mode) == RSE::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {
+	if (use_taa || (RS::scaling_3d_mode_type(scaling_3d_mode) == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {
 		// Use negative mipmap LOD bias when TAA or FSR2 is enabled to compensate for loss of sharpness.
 		// This restores sharpness in still images to be roughly at the same level as without TAA,
 		// but moving scenes will still be blurrier.
 		computed_mipmap_bias -= 0.5;
 	}
 
-	if (screen_space_aa == RSE::VIEWPORT_SCREEN_SPACE_AA_FXAA) {
+	if (screen_space_aa == RS::VIEWPORT_SCREEN_SPACE_AA_FXAA) {
 		// Use negative mipmap LOD bias when FXAA is enabled to compensate for loss of sharpness.
 		// If both TAA and FXAA are enabled, combine their negative LOD biases together.
 		computed_mipmap_bias -= 0.25;
@@ -182,17 +178,17 @@ void RenderSceneBuffersRD::configure(const RenderSceneBuffersConfiguration *p_co
 	cleanup();
 
 	// Create our color buffer.
-	const bool resolve_target = msaa_3d != RSE::VIEWPORT_MSAA_DISABLED;
-	create_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR, get_base_data_format(), get_color_usage_bits(resolve_target, false, can_be_storage), RD::TEXTURE_SAMPLES_1, Size2i(), 0, 1, true, true);
+	const bool resolve_target = msaa_3d != RS::VIEWPORT_MSAA_DISABLED;
+	create_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR, get_base_data_format(), get_color_usage_bits(resolve_target, false, can_be_storage));
 
 	// TODO: Detect when it is safe to use RD::TEXTURE_USAGE_TRANSIENT_BIT for RB_TEX_DEPTH, RB_TEX_COLOR_MSAA and/or RB_TEX_DEPTH_MSAA.
 	// (it means we cannot sample from it, we cannot copy from/to it) to save VRAM (and maybe performance too).
 
 	// Create our depth buffer.
-	create_texture(RB_SCOPE_BUFFERS, RB_TEX_DEPTH, get_depth_format(resolve_target, false, can_be_storage), get_depth_usage_bits(resolve_target, false, can_be_storage), RD::TEXTURE_SAMPLES_1, Size2i(), 0, 1, true, true);
+	create_texture(RB_SCOPE_BUFFERS, RB_TEX_DEPTH, get_depth_format(resolve_target, false, can_be_storage), get_depth_usage_bits(resolve_target, false, can_be_storage));
 
 	// Create our MSAA buffers.
-	if (msaa_3d == RSE::VIEWPORT_MSAA_DISABLED) {
+	if (msaa_3d == RS::VIEWPORT_MSAA_DISABLED) {
 		texture_samples = RD::TEXTURE_SAMPLES_1;
 	} else {
 		texture_samples = msaa_to_samples(msaa_3d);
@@ -202,8 +198,8 @@ void RenderSceneBuffersRD::configure(const RenderSceneBuffersConfiguration *p_co
 
 	// VRS (note, our vrs object will only be set if VRS is supported)
 	RID vrs_texture;
-	if (vrs && vrs_mode != RSE::VIEWPORT_VRS_DISABLED) {
-		vrs_texture = create_texture(RB_SCOPE_VRS, RB_TEXTURE, get_vrs_format(), get_vrs_usage_bits(), RD::TEXTURE_SAMPLES_1, vrs->get_vrs_texture_size(internal_size), 0, 1, true, true);
+	if (vrs && vrs_mode != RS::VIEWPORT_VRS_DISABLED) {
+		vrs_texture = create_texture(RB_SCOPE_VRS, RB_TEXTURE, get_vrs_format(), get_vrs_usage_bits(), RD::TEXTURE_SAMPLES_1, vrs->get_vrs_texture_size(internal_size));
 	}
 
 	// (re-)configure any named buffers
@@ -219,10 +215,10 @@ void RenderSceneBuffersRD::configure_for_reflections(const Size2i p_reflection_s
 	target_size = p_reflection_size;
 	internal_size = p_reflection_size;
 	render_target = RID();
-	scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+	scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 	fsr_sharpness = 0.0;
-	msaa_3d = RSE::VIEWPORT_MSAA_DISABLED;
-	screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+	msaa_3d = RS::VIEWPORT_MSAA_DISABLED;
+	screen_space_aa = RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
 	use_taa = false;
 	use_debanding = false;
 	view_count = 1;
@@ -246,7 +242,7 @@ void RenderSceneBuffersRD::set_texture_mipmap_bias(float p_texture_mipmap_bias)
 	update_samplers();
 }
 
-void RenderSceneBuffersRD::set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
+void RenderSceneBuffersRD::set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
 	anisotropic_filtering_level = p_anisotropic_filtering_level;
 
 	update_samplers();
@@ -517,7 +513,7 @@ void RenderSceneBuffersRD::allocate_blur_textures() {
 	}
 
 	Size2i blur_size = internal_size;
-	if (RSE::scaling_3d_mode_type(scaling_3d_mode) == RSE::VIEWPORT_SCALING_3D_TYPE_TEMPORAL) {
+	if (RS::scaling_3d_mode_type(scaling_3d_mode) == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL) {
 		// The blur texture should be as big as the target size when using an upscaler.
 		blur_size = target_size;
 	}
@@ -531,8 +527,8 @@ void RenderSceneBuffersRD::allocate_blur_textures() {
 		usage_bits += RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 	}
 
-	create_texture(RB_SCOPE_BUFFERS, RB_TEX_BLUR_0, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, blur_size, view_count, mipmaps_required, true, true);
-	create_texture(RB_SCOPE_BUFFERS, RB_TEX_BLUR_1, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, Size2i(blur_size.x >> 1, blur_size.y >> 1), view_count, mipmaps_required - 1, true, true);
+	create_texture(RB_SCOPE_BUFFERS, RB_TEX_BLUR_0, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, blur_size, view_count, mipmaps_required);
+	create_texture(RB_SCOPE_BUFFERS, RB_TEX_BLUR_1, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, Size2i(blur_size.x >> 1, blur_size.y >> 1), view_count, mipmaps_required - 1);
 
 	// TODO redo this:
 	if (!can_be_storage) {
@@ -641,87 +637,13 @@ RID RenderSceneBuffersRD::get_depth_texture(const uint32_t p_layer) {
 	}
 }
 
-// Subsampled textures.
-
-RID RenderSceneBuffersRD::get_color_subsampled() {
-	const bool use_msaa = (msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
-
-	RD::TextureFormat tf;
-	tf.format = get_base_data_format();
-	if (view_count > 1) {
-		tf.texture_type = RD::TEXTURE_TYPE_2D_ARRAY;
-	}
-	tf.width = internal_size.x;
-	tf.height = internal_size.y;
-	tf.array_layers = view_count;
-	tf.usage_bits = get_color_usage_bits(use_msaa, false, can_be_storage);
-	tf.is_subsampled = true;
-
-	return create_texture_from_format(RB_SCOPE_BUFFERS, RB_TEX_COLOR_SUBSAMPLED, tf);
-}
-
-RID RenderSceneBuffersRD::get_color_msaa_subsampled() {
-	ERR_FAIL_COND_V(msaa_3d == RSE::VIEWPORT_MSAA_DISABLED, RID());
-
-	RD::TextureFormat tf;
-	tf.format = get_base_data_format();
-	if (view_count > 1) {
-		tf.texture_type = RD::TEXTURE_TYPE_2D_ARRAY;
-	}
-	tf.width = internal_size.x;
-	tf.height = internal_size.y;
-	tf.array_layers = view_count;
-	tf.samples = msaa_to_samples(msaa_3d);
-	tf.usage_bits = get_color_usage_bits(false, true, can_be_storage);
-	tf.is_discardable = true;
-	tf.is_subsampled = true;
-
-	return create_texture_from_format(RB_SCOPE_BUFFERS, RB_TEX_COLOR_MSAA_SUBSAMPLED, tf);
-}
-
-RID RenderSceneBuffersRD::get_depth_subsampled() {
-	const bool use_msaa = (msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
-
-	RD::TextureFormat tf;
-	tf.format = get_depth_format(use_msaa, false, can_be_storage);
-	if (view_count > 1) {
-		tf.texture_type = RD::TEXTURE_TYPE_2D_ARRAY;
-	}
-	tf.width = internal_size.x;
-	tf.height = internal_size.y;
-	tf.array_layers = view_count;
-	tf.usage_bits = get_depth_usage_bits(use_msaa, false, can_be_storage);
-	tf.is_subsampled = true;
-
-	return create_texture_from_format(RB_SCOPE_BUFFERS, RB_TEX_DEPTH_SUBSAMPLED, tf);
-}
-
-RID RenderSceneBuffersRD::get_depth_msaa_subsampled() {
-	ERR_FAIL_COND_V(msaa_3d == RSE::VIEWPORT_MSAA_DISABLED, RID());
-
-	RD::TextureFormat tf;
-	tf.format = get_depth_format(false, true, can_be_storage);
-	if (view_count > 1) {
-		tf.texture_type = RD::TEXTURE_TYPE_2D_ARRAY;
-	}
-	tf.width = internal_size.x;
-	tf.height = internal_size.y;
-	tf.array_layers = view_count;
-	tf.samples = msaa_to_samples(msaa_3d);
-	tf.usage_bits = get_depth_usage_bits(false, true, can_be_storage);
-	tf.is_discardable = true;
-	tf.is_subsampled = true;
-
-	return create_texture_from_format(RB_SCOPE_BUFFERS, RB_TEX_DEPTH_MSAA_SUBSAMPLED, tf);
-}
-
 // Upscaled texture.
 
 void RenderSceneBuffersRD::ensure_upscaled() {
 	if (!has_upscaled_texture()) {
 		uint32_t usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | (can_be_storage ? RD::TEXTURE_USAGE_STORAGE_BIT : 0) | RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 		usage_bits |= RD::TEXTURE_USAGE_INPUT_ATTACHMENT_BIT;
-		create_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR_UPSCALED, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, target_size, 0, 1, true, true);
+		create_texture(RB_SCOPE_BUFFERS, RB_TEX_COLOR_UPSCALED, get_base_data_format(), usage_bits, RD::TEXTURE_SAMPLES_1, target_size);
 	}
 }
 
@@ -729,11 +651,11 @@ void RenderSceneBuffersRD::ensure_upscaled() {
 
 void RenderSceneBuffersRD::ensure_velocity() {
 	if (!has_texture(RB_SCOPE_BUFFERS, RB_TEX_VELOCITY)) {
-		const bool msaa = msaa_3d != RSE::VIEWPORT_MSAA_DISABLED;
-		create_texture(RB_SCOPE_BUFFERS, RB_TEX_VELOCITY, get_velocity_format(), get_velocity_usage_bits(msaa, false, can_be_storage), RD::TEXTURE_SAMPLES_1, Size2i(), 0, 1, true, true);
+		const bool msaa = msaa_3d != RS::VIEWPORT_MSAA_DISABLED;
+		create_texture(RB_SCOPE_BUFFERS, RB_TEX_VELOCITY, get_velocity_format(), get_velocity_usage_bits(msaa, false, can_be_storage));
 
 		if (msaa) {
-			create_texture(RB_SCOPE_BUFFERS, RB_TEX_VELOCITY_MSAA, get_velocity_format(), get_velocity_usage_bits(false, msaa, can_be_storage), texture_samples, Size2i(), 0, 1, true, true);
+			create_texture(RB_SCOPE_BUFFERS, RB_TEX_VELOCITY_MSAA, get_velocity_format(), get_velocity_usage_bits(false, msaa, can_be_storage), texture_samples);
 		}
 	}
 }
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
index cae09e19..e2c2175e 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
@@ -30,16 +30,16 @@
 
 #pragma once
 
-#include "core/templates/hash_map.h"
-#include "servers/rendering/renderer_rd/effects/vrs.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
-
 #ifdef METAL_ENABLED
-#include "servers/rendering/renderer_rd/effects/metal_fx.h"
+#include "../effects/metal_fx.h"
 #endif
+#include "../effects/vrs.h"
+#include "core/templates/hash_map.h"
+#include "material_storage.h"
+#include "render_buffer_custom_data_rd.h"
+#include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device_binds.h"
+#include "servers/rendering/storage/render_scene_buffers.h"
 
 #define RB_SCOPE_BUFFERS SNAME("render_buffers")
 #define RB_SCOPE_VRS SNAME("VRS")
@@ -48,12 +48,8 @@
 #define RB_TEX_COLOR SNAME("color")
 #define RB_TEX_COLOR_MSAA SNAME("color_msaa")
 #define RB_TEX_COLOR_UPSCALED SNAME("color_upscaled")
-#define RB_TEX_COLOR_SUBSAMPLED SNAME("color_subsampled")
-#define RB_TEX_COLOR_MSAA_SUBSAMPLED SNAME("color_msaa_subsampled")
 #define RB_TEX_DEPTH SNAME("depth")
 #define RB_TEX_DEPTH_MSAA SNAME("depth_msaa")
-#define RB_TEX_DEPTH_SUBSAMPLED SNAME("depth_subsampled")
-#define RB_TEX_DEPTH_MSAA_SUBSAMPLED SNAME("depth_msaa_subsampled")
 #define RB_TEX_VELOCITY SNAME("velocity")
 #define RB_TEX_VELOCITY_MSAA SNAME("velocity_msaa")
 
@@ -73,7 +69,7 @@ private:
 	RD::DataFormat preferred_data_format = RD::DATA_FORMAT_MAX;
 	RendererRD::VRS *vrs = nullptr;
 	uint64_t auto_exposure_version = 1;
-	RSE::ViewportVRSMode vrs_mode = RSE::VIEWPORT_VRS_DISABLED;
+	RS::ViewportVRSMode vrs_mode = RS::VIEWPORT_VRS_DISABLED;
 
 	// Our render target represents our final destination that we display on screen.
 	RID render_target;
@@ -82,18 +78,18 @@ private:
 
 	// The internal size of the textures we render 3D to in case we render at a lower resolution and upscale
 	Size2i internal_size = Size2i(0, 0);
-	RSE::ViewportScaling3DMode scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+	RS::ViewportScaling3DMode scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 	float fsr_sharpness = 0.2f;
 	float texture_mipmap_bias = 0.0f;
-	RSE::ViewportAnisotropicFiltering anisotropic_filtering_level = RSE::VIEWPORT_ANISOTROPY_4X;
+	RS::ViewportAnisotropicFiltering anisotropic_filtering_level = RS::VIEWPORT_ANISOTROPY_4X;
 
 #ifdef METAL_ENABLED
 	RendererRD::MFXSpatialContext *mfx_spatial_context = nullptr;
 #endif
 
 	// Aliasing settings
-	RSE::ViewportMSAA msaa_3d = RSE::VIEWPORT_MSAA_DISABLED;
-	RSE::ViewportScreenSpaceAA screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+	RS::ViewportMSAA msaa_3d = RS::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportScreenSpaceAA screen_space_aa = RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
 	bool use_taa = false;
 	bool use_debanding = false;
 	RD::TextureSamples texture_samples = RD::TEXTURE_SAMPLES_1;
@@ -195,14 +191,14 @@ public:
 	RD::DataFormat get_base_data_format() const { return force_hdr ? RD::DATA_FORMAT_R16G16B16A16_SFLOAT : preferred_data_format; }
 	float get_luminance_multiplier() const;
 	void set_vrs(RendererRD::VRS *p_vrs) { vrs = p_vrs; }
-	RSE::ViewportVRSMode get_vrs_mode() { return vrs_mode; }
+	RS::ViewportVRSMode get_vrs_mode() { return vrs_mode; }
 
 	void cleanup();
 	virtual void configure(const RenderSceneBuffersConfiguration *p_config) override;
 	void configure_for_reflections(const Size2i p_reflection_size);
 	virtual void set_fsr_sharpness(float p_fsr_sharpness) override;
 	virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override;
-	virtual void set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override;
+	virtual void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override;
 	virtual void set_use_debanding(bool p_use_debanding) override;
 
 #ifdef METAL_ENABLED
@@ -238,11 +234,11 @@ public:
 	_FORCE_INLINE_ uint32_t get_view_count() const { return view_count; }
 	_FORCE_INLINE_ Size2i get_internal_size() const { return internal_size; }
 	_FORCE_INLINE_ Size2i get_target_size() const { return target_size; }
-	_FORCE_INLINE_ RSE::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
+	_FORCE_INLINE_ RS::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
 	_FORCE_INLINE_ float get_fsr_sharpness() const { return fsr_sharpness; }
-	_FORCE_INLINE_ RSE::ViewportMSAA get_msaa_3d() const { return msaa_3d; }
+	_FORCE_INLINE_ RS::ViewportMSAA get_msaa_3d() const { return msaa_3d; }
 	_FORCE_INLINE_ RD::TextureSamples get_texture_samples() const { return texture_samples; }
-	_FORCE_INLINE_ RSE::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
+	_FORCE_INLINE_ RS::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
 	_FORCE_INLINE_ bool get_use_taa() const { return use_taa; }
 	_FORCE_INLINE_ bool get_use_debanding() const { return use_debanding; }
 
@@ -286,11 +282,6 @@ public:
 		return get_texture_slice(RB_SCOPE_BUFFERS, RB_TEX_DEPTH_MSAA, p_layer, 0);
 	}
 
-	RID get_color_subsampled();
-	RID get_color_msaa_subsampled();
-	RID get_depth_subsampled();
-	RID get_depth_msaa_subsampled();
-
 	// back buffer (color)
 	RID get_back_buffer_texture() const {
 		// Prefer returning the dedicated backbuffer color texture if it was created. Return the reused blur texture otherwise.
@@ -331,15 +322,15 @@ public:
 		return samplers;
 	}
 
-	_FORCE_INLINE_ static RD::TextureSamples msaa_to_samples(RSE::ViewportMSAA p_msaa) {
+	_FORCE_INLINE_ static RD::TextureSamples msaa_to_samples(RS::ViewportMSAA p_msaa) {
 		switch (p_msaa) {
-			case RSE::VIEWPORT_MSAA_DISABLED:
+			case RS::VIEWPORT_MSAA_DISABLED:
 				return RD::TEXTURE_SAMPLES_1;
-			case RSE::VIEWPORT_MSAA_2X:
+			case RS::VIEWPORT_MSAA_2X:
 				return RD::TEXTURE_SAMPLES_2;
-			case RSE::VIEWPORT_MSAA_4X:
+			case RS::VIEWPORT_MSAA_4X:
 				return RD::TEXTURE_SAMPLES_4;
-			case RSE::VIEWPORT_MSAA_8X:
+			case RS::VIEWPORT_MSAA_8X:
 				return RD::TEXTURE_SAMPLES_8;
 			default:
 				DEV_ASSERT(false && "Unknown MSAA option.");
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.cpp b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.cpp
index 7120d536..412d94ac 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.cpp
@@ -29,11 +29,9 @@
 /**************************************************************************/
 
 #include "render_scene_data_rd.h"
-
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_globals.h"
 
 Transform3D RenderSceneDataRD::get_cam_transform() const {
 	return cam_transform;
@@ -71,7 +69,7 @@ RID RenderSceneDataRD::create_uniform_buffer() {
 	return RD::get_singleton()->uniform_buffer_create(sizeof(UBODATA));
 }
 
-void RenderSceneDataRD::update_ubo(RID p_uniform_buffer, RSE::ViewportDebugDraw p_debug_mode, RID p_env, RID p_reflection_probe_instance, RID p_camera_attributes, bool p_pancake_shadows, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, float p_luminance_multiplier, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier) {
+void RenderSceneDataRD::update_ubo(RID p_uniform_buffer, RS::ViewportDebugDraw p_debug_mode, RID p_env, RID p_reflection_probe_instance, RID p_camera_attributes, bool p_pancake_shadows, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, float p_luminance_multiplier, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier) {
 	RendererSceneRenderRD *render_scene_render = RendererSceneRenderRD::get_singleton();
 
 	UBODATA ubo_data;
@@ -156,15 +154,15 @@ void RenderSceneDataRD::update_ubo(RID p_uniform_buffer, RSE::ViewportDebugDraw
 	ubo.flags |= material_uv2_mode ? SCENE_DATA_FLAGS_USE_UV2_MATERIAL : 0;
 	ubo.flags |= shadow_pass ? SCENE_DATA_FLAGS_IN_SHADOW_PASS : 0;
 
-	if (p_debug_mode == RSE::VIEWPORT_DEBUG_DRAW_UNSHADED) {
+	if (p_debug_mode == RS::VIEWPORT_DEBUG_DRAW_UNSHADED) {
 		ubo.flags |= SCENE_DATA_FLAGS_USE_AMBIENT_LIGHT;
 		ubo.ambient_light_color_energy[0] = 1;
 		ubo.ambient_light_color_energy[1] = 1;
 		ubo.ambient_light_color_energy[2] = 1;
 		ubo.ambient_light_color_energy[3] = 1.0;
 	} else if (p_env.is_valid()) {
-		RSE::EnvironmentBG env_bg = render_scene_render->environment_get_background(p_env);
-		RSE::EnvironmentAmbientSource ambient_src = render_scene_render->environment_get_ambient_source(p_env);
+		RS::EnvironmentBG env_bg = render_scene_render->environment_get_background(p_env);
+		RS::EnvironmentAmbientSource ambient_src = render_scene_render->environment_get_ambient_source(p_env);
 
 		float bg_energy_multiplier = render_scene_render->environment_get_bg_energy_multiplier(p_env);
 
@@ -173,8 +171,8 @@ void RenderSceneDataRD::update_ubo(RID p_uniform_buffer, RSE::ViewportDebugDraw
 		ubo.ambient_color_sky_mix = render_scene_render->environment_get_ambient_sky_contribution(p_env);
 
 		//ambient
-		if (ambient_src == RSE::ENV_AMBIENT_SOURCE_BG && (env_bg == RSE::ENV_BG_CLEAR_COLOR || env_bg == RSE::ENV_BG_COLOR)) {
-			Color color = env_bg == RSE::ENV_BG_CLEAR_COLOR ? p_default_bg_color : render_scene_render->environment_get_bg_color(p_env);
+		if (ambient_src == RS::ENV_AMBIENT_SOURCE_BG && (env_bg == RS::ENV_BG_CLEAR_COLOR || env_bg == RS::ENV_BG_COLOR)) {
+			Color color = env_bg == RS::ENV_BG_CLEAR_COLOR ? p_default_bg_color : render_scene_render->environment_get_bg_color(p_env);
 			color = color.srgb_to_linear();
 
 			ubo.ambient_light_color_energy[0] = color.r * bg_energy_multiplier;
@@ -189,15 +187,15 @@ void RenderSceneDataRD::update_ubo(RID p_uniform_buffer, RSE::ViewportDebugDraw
 			ubo.ambient_light_color_energy[1] = color.g * energy;
 			ubo.ambient_light_color_energy[2] = color.b * energy;
 
-			bool use_ambient_cubemap = (ambient_src == RSE::ENV_AMBIENT_SOURCE_BG && env_bg == RSE::ENV_BG_SKY) || ambient_src == RSE::ENV_AMBIENT_SOURCE_SKY;
-			bool use_ambient_light = use_ambient_cubemap || ambient_src == RSE::ENV_AMBIENT_SOURCE_COLOR;
+			bool use_ambient_cubemap = (ambient_src == RS::ENV_AMBIENT_SOURCE_BG && env_bg == RS::ENV_BG_SKY) || ambient_src == RS::ENV_AMBIENT_SOURCE_SKY;
+			bool use_ambient_light = use_ambient_cubemap || ambient_src == RS::ENV_AMBIENT_SOURCE_COLOR;
 			ubo.flags |= use_ambient_cubemap ? SCENE_DATA_FLAGS_USE_AMBIENT_CUBEMAP : 0;
 			ubo.flags |= use_ambient_light ? SCENE_DATA_FLAGS_USE_AMBIENT_LIGHT : 0;
 		}
 
 		//specular
-		RSE::EnvironmentReflectionSource ref_src = render_scene_render->environment_get_reflection_source(p_env);
-		if ((ref_src == RSE::ENV_REFLECTION_SOURCE_BG && env_bg == RSE::ENV_BG_SKY) || ref_src == RSE::ENV_REFLECTION_SOURCE_SKY) {
+		RS::EnvironmentReflectionSource ref_src = render_scene_render->environment_get_reflection_source(p_env);
+		if ((ref_src == RS::ENV_REFLECTION_SOURCE_BG && env_bg == RS::ENV_BG_SKY) || ref_src == RS::ENV_REFLECTION_SOURCE_SKY) {
 			ubo.flags |= SCENE_DATA_FLAGS_USE_REFLECTION_CUBEMAP;
 		}
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
index 85a9a1e9..fdb71afb 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
@@ -48,6 +48,7 @@ public:
 	float taa_frame_count = 0.0f;
 	uint32_t camera_visible_layers;
 	bool cam_orthogonal = false;
+	bool cam_frustum = false;
 	bool flip_y = false;
 
 	// For billboards to cast correct shadows.
@@ -94,7 +95,7 @@ public:
 	virtual Projection get_view_projection(uint32_t p_view) const override;
 
 	RID create_uniform_buffer();
-	void update_ubo(RID p_uniform_buffer, RSE::ViewportDebugDraw p_debug_mode, RID p_env, RID p_reflection_probe_instance, RID p_camera_attributes, bool p_pancake_shadows, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, float p_luminance_multiplier, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier);
+	void update_ubo(RID p_uniform_buffer, RS::ViewportDebugDraw p_debug_mode, RID p_env, RID p_reflection_probe_instance, RID p_camera_attributes, bool p_pancake_shadows, const Size2i &p_screen_size, const Size2 &p_viewport_size, const Color &p_default_bg_color, float p_luminance_multiplier, bool p_opaque_render_buffers, bool p_apply_alpha_multiplier);
 	virtual RID get_uniform_buffer() const override;
 
 	static uint32_t get_uniform_buffer_size_bytes() { return sizeof(UBODATA); }
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
index 98be8e01..3c079cc8 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
@@ -30,13 +30,10 @@
 
 #include "texture_storage.h"
 
-#include "core/config/engine.h"
-#include "servers/rendering/renderer_rd/effects/copy_effects.h"
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
+#include "../effects/copy_effects.h"
+#include "../framebuffer_cache_rd.h"
+#include "material_storage.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-#include "servers/rendering/rendering_server_globals.h"
 
 using namespace RendererRD;
 
@@ -636,92 +633,6 @@ TextureStorage::~TextureStorage() {
 	singleton = nullptr;
 }
 
-// Has to be a separate call from TextureStorage initialization due to interacting with Material Storage
-void TextureStorage::_tex_blit_shader_initialize() {
-	MaterialStorage *material_storage = MaterialStorage::get_singleton();
-
-	{
-		Vector<String> tex_blit_modes;
-		tex_blit_modes.push_back(""); // Only 1 Output
-		tex_blit_modes.push_back("\n#define USE_OUTPUT1\n"); // 2 Outputs
-		tex_blit_modes.push_back("\n#define USE_OUTPUT1\n#define USE_OUTPUT2\n"); // 3 Outputs
-		tex_blit_modes.push_back("\n#define USE_OUTPUT1\n#define USE_OUTPUT2\n#define USE_OUTPUT3\n"); // 4 Outputs
-		String global_defines;
-		global_defines += "\n#define SAMPLERS_BINDING_FIRST_INDEX " + itos(SAMPLERS_BINDING_FIRST_INDEX) + "\n";
-		global_defines += "#define MAX_GLOBAL_SHADER_UNIFORMS 256\n"; // TODO: this is arbitrary for now
-		tex_blit_shader.shader.initialize(tex_blit_modes, global_defines);
-	}
-	material_storage->shader_set_data_request_function(MaterialStorage::SHADER_TYPE_TEXTURE_BLIT, MaterialStorage::_create_tex_blit_shader_funcs);
-	material_storage->material_set_data_request_function(MaterialStorage::SHADER_TYPE_TEXTURE_BLIT, MaterialStorage::_create_tex_blit_material_funcs);
-
-	{
-		// Setup TextureBlit compiler
-		ShaderCompiler::DefaultIdentifierActions actions;
-
-		actions.renames["TIME"] = "data.time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
-
-		actions.renames["FRAGCOORD"] = "gl_FragCoord";
-
-		actions.renames["UV"] = "uv";
-		actions.renames["MODULATE"] = "data.modulate";
-
-		actions.renames["COLOR0"] = "color0";
-		actions.renames["COLOR1"] = "color1";
-		actions.renames["COLOR2"] = "color2";
-		actions.renames["COLOR3"] = "color3";
-
-		actions.base_uniform_string = "material.";
-		actions.base_texture_binding_index = 1;
-		actions.texture_layout_set = 1;
-
-		tex_blit_shader.compiler.initialize(actions);
-	}
-
-	{
-		// default material and shader for Texture Blit shader
-		tex_blit_shader.default_shader = material_storage->shader_allocate();
-		material_storage->shader_initialize(tex_blit_shader.default_shader);
-		material_storage->shader_set_code(tex_blit_shader.default_shader, R"(
-// Default Texture Blit shader.
-
-shader_type texture_blit;
-render_mode blend_mix;
-
-uniform sampler2D source_texture0 : hint_blit_source0;
-uniform sampler2D source_texture1 : hint_blit_source1;
-uniform sampler2D source_texture2 : hint_blit_source2;
-uniform sampler2D source_texture3 : hint_blit_source3;
-
-void blit() {
-	// Copies from each whole source texture to a rect on each output texture.
-	COLOR0 = texture(source_texture0, UV) * MODULATE;
-	COLOR1 = texture(source_texture1, UV) * MODULATE;
-	COLOR2 = texture(source_texture2, UV) * MODULATE;
-	COLOR3 = texture(source_texture3, UV) * MODULATE;
-}
-)");
-		tex_blit_shader.default_material = material_storage->material_allocate();
-		material_storage->material_initialize(tex_blit_shader.default_material);
-		material_storage->material_set_shader(tex_blit_shader.default_material, tex_blit_shader.default_shader);
-	}
-
-	tex_blit_shader.initialized = true;
-}
-
-// Has to be a separate call from TextureStorage destruction due to interacting with Material Storage
-void TextureStorage::_tex_blit_shader_free() {
-	if (tex_blit_shader.initialized) {
-		MaterialStorage *material_storage = MaterialStorage::get_singleton();
-
-		print_verbose("Freeing Default Tex_Blit Shader");
-		material_storage->material_free(tex_blit_shader.default_material);
-		material_storage->shader_free(tex_blit_shader.default_shader);
-	}
-}
-
 bool TextureStorage::free(RID p_rid) {
 	if (owns_texture(p_rid)) {
 		texture_free(p_rid);
@@ -757,18 +668,18 @@ void TextureStorage::canvas_texture_free(RID p_rid) {
 	canvas_texture_owner.free(p_rid);
 }
 
-void TextureStorage::canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) {
+void TextureStorage::canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
 	switch (p_channel) {
-		case RSE::CANVAS_TEXTURE_CHANNEL_DIFFUSE: {
+		case RS::CANVAS_TEXTURE_CHANNEL_DIFFUSE: {
 			ct->diffuse = p_texture;
 		} break;
-		case RSE::CANVAS_TEXTURE_CHANNEL_NORMAL: {
+		case RS::CANVAS_TEXTURE_CHANNEL_NORMAL: {
 			ct->normal_map = p_texture;
 		} break;
-		case RSE::CANVAS_TEXTURE_CHANNEL_SPECULAR: {
+		case RS::CANVAS_TEXTURE_CHANNEL_SPECULAR: {
 			ct->specular = p_texture;
 		} break;
 	}
@@ -785,21 +696,21 @@ void TextureStorage::canvas_texture_set_shading_parameters(RID p_canvas_texture,
 	ct->specular_color.a = p_shininess;
 }
 
-void TextureStorage::canvas_texture_set_texture_filter(RID p_canvas_texture, RSE::CanvasItemTextureFilter p_filter) {
+void TextureStorage::canvas_texture_set_texture_filter(RID p_canvas_texture, RS::CanvasItemTextureFilter p_filter) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
 	ct->texture_filter = p_filter;
 }
 
-void TextureStorage::canvas_texture_set_texture_repeat(RID p_canvas_texture, RSE::CanvasItemTextureRepeat p_repeat) {
+void TextureStorage::canvas_texture_set_texture_repeat(RID p_canvas_texture, RS::CanvasItemTextureRepeat p_repeat) {
 	CanvasTexture *ct = canvas_texture_owner.get_or_null(p_canvas_texture);
 	ERR_FAIL_NULL(ct);
 
 	ct->texture_repeat = p_repeat;
 }
 
-TextureStorage::CanvasTextureInfo TextureStorage::canvas_texture_get_info(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat, bool p_use_srgb, bool p_texture_is_data) {
+TextureStorage::CanvasTextureInfo TextureStorage::canvas_texture_get_info(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, bool p_use_srgb, bool p_texture_is_data) {
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 
 	CanvasTexture *ct = nullptr;
@@ -824,11 +735,11 @@ TextureStorage::CanvasTextureInfo TextureStorage::canvas_texture_get_info(RID p_
 		return CanvasTextureInfo(); //invalid texture RID
 	}
 
-	RSE::CanvasItemTextureFilter filter = ct->texture_filter != RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? ct->texture_filter : p_base_filter;
-	ERR_FAIL_COND_V(filter == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, CanvasTextureInfo());
+	RS::CanvasItemTextureFilter filter = ct->texture_filter != RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT ? ct->texture_filter : p_base_filter;
+	ERR_FAIL_COND_V(filter == RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, CanvasTextureInfo());
 
-	RSE::CanvasItemTextureRepeat repeat = ct->texture_repeat != RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? ct->texture_repeat : p_base_repeat;
-	ERR_FAIL_COND_V(repeat == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, CanvasTextureInfo());
+	RS::CanvasItemTextureRepeat repeat = ct->texture_repeat != RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT ? ct->texture_repeat : p_base_repeat;
+	ERR_FAIL_COND_V(repeat == RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, CanvasTextureInfo());
 
 	CanvasTextureCache &ctc = ct->info_cache[int(p_use_srgb)];
 	if (!RD::get_singleton()->texture_is_valid(ctc.diffuse) ||
@@ -1000,11 +911,11 @@ void TextureStorage::texture_2d_initialize(RID p_texture, const Ref<Image> &p_im
 	texture_owner.initialize_rid(p_texture, texture);
 }
 
-void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) {
+void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) {
 	ERR_FAIL_COND(p_layers.is_empty());
 
-	ERR_FAIL_COND(p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP && p_layers.size() != 6);
-	ERR_FAIL_COND(p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY && (p_layers.size() < 6 || (p_layers.size() % 6) != 0));
+	ERR_FAIL_COND(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP && p_layers.size() != 6);
+	ERR_FAIL_COND(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP_ARRAY && (p_layers.size() < 6 || (p_layers.size() % 6) != 0));
 
 	TextureToRDFormat ret_format;
 	Vector<Ref<Image>> images;
@@ -1047,13 +958,13 @@ void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<R
 	texture.validated_format = images[0]->get_format();
 
 	switch (p_layered_type) {
-		case RSE::TEXTURE_LAYERED_2D_ARRAY: {
+		case RS::TEXTURE_LAYERED_2D_ARRAY: {
 			texture.rd_type = RD::TEXTURE_TYPE_2D_ARRAY;
 		} break;
-		case RSE::TEXTURE_LAYERED_CUBEMAP: {
+		case RS::TEXTURE_LAYERED_CUBEMAP: {
 			texture.rd_type = RD::TEXTURE_TYPE_CUBE;
 		} break;
-		case RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY: {
+		case RS::TEXTURE_LAYERED_CUBEMAP_ARRAY: {
 			texture.rd_type = RD::TEXTURE_TYPE_CUBE_ARRAY;
 		} break;
 		default:
@@ -1253,125 +1164,25 @@ void TextureStorage::texture_proxy_initialize(RID p_texture, RID p_base) {
 	tex->proxies.push_back(p_texture);
 }
 
-void TextureStorage::texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) {
-	// Near identical to  Texture_2D_initialize, Generates an empty white image based on parameters
-
-	// GUARDRAIL: Bad Widths/Heights
-	ERR_FAIL_COND_MSG(p_width <= 0 || p_height <= 0, "Drawable Texture Width or Height cannot be less than 1.");
-	ERR_FAIL_COND_MSG(p_width >= 16384 || p_height >= 16384, "Drawable Texture Width or Height cannot be greater than 16383.");
-
-	Image::Format format;
-	switch (p_format) {
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8:
-			format = Image::FORMAT_RGBA8;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB:
-			format = Image::FORMAT_RGBA8;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBAH:
-			format = Image::FORMAT_RGBAH;
-			break;
-		case RSE::TEXTURE_DRAWABLE_FORMAT_RGBAF:
-			format = Image::FORMAT_RGBAF;
-			break;
-		default:
-			format = Image::FORMAT_RGBA8;
-	}
-
-	Ref<Image> image = Image::create_empty(p_width, p_height, p_with_mipmaps, format);
-	image->fill(p_color);
-	TextureToRDFormat ret_format;
-
-	Ref<Image> valid_image = _validate_texture_format(image, ret_format);
-	Texture texture;
-
-	texture.type = TextureStorage::TYPE_2D;
-
-	texture.width = p_width;
-	texture.height = p_height;
-	texture.layers = 1;
-	texture.mipmaps = image->get_mipmap_count() + 1;
-	texture.depth = 1;
-	texture.format = image->get_format();
-	texture.validated_format = image->get_format();
-
-	texture.rd_type = RD::TEXTURE_TYPE_2D;
-	texture.rd_format = ret_format.format;
-	texture.rd_format_srgb = ret_format.format_srgb;
-
-	RD::TextureFormat rd_format;
-	RD::TextureView rd_view;
-	{ //attempt register
-		rd_format.format = texture.rd_format;
-		rd_format.width = texture.width;
-		rd_format.height = texture.height;
-		rd_format.depth = 1;
-		rd_format.array_layers = 1;
-		rd_format.mipmaps = texture.mipmaps;
-		rd_format.texture_type = texture.rd_type;
-		rd_format.samples = RD::TEXTURE_SAMPLES_1;
-		// The Color Attachment Usage bit here is what differentiates a DrawableTexture from a regular Texture2D
-		rd_format.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_CAN_COPY_FROM_BIT | RD::TEXTURE_USAGE_STORAGE_BIT;
-		if (texture.rd_format_srgb != RD::DATA_FORMAT_MAX) {
-			rd_format.shareable_formats.push_back(texture.rd_format);
-			rd_format.shareable_formats.push_back(texture.rd_format_srgb);
-		}
-	}
-	{
-		rd_view.swizzle_r = ret_format.swizzle_r;
-		rd_view.swizzle_g = ret_format.swizzle_g;
-		rd_view.swizzle_b = ret_format.swizzle_b;
-		rd_view.swizzle_a = ret_format.swizzle_a;
-	}
-
-	Vector<uint8_t> data = image->get_data(); //use image data
-	Vector<Vector<uint8_t>> data_slices;
-	data_slices.push_back(data);
-	texture.rd_texture = RD::get_singleton()->texture_create(rd_format, rd_view, data_slices);
-	ERR_FAIL_COND(texture.rd_texture.is_null());
-	if (texture.rd_format_srgb != RD::DATA_FORMAT_MAX) {
-		rd_view.format_override = texture.rd_format_srgb;
-		texture.rd_texture_srgb = RD::get_singleton()->texture_create_shared(rd_view, texture.rd_texture);
-		if (texture.rd_texture_srgb.is_null()) {
-			RD::get_singleton()->free_rid(texture.rd_texture);
-			ERR_FAIL_COND(texture.rd_texture_srgb.is_null());
-		}
-	}
-
-	// Used for Drawable Textures.
-	for (int i = 0; i < texture.mipmaps; i++) {
-		texture.cached_rd_slices.append(RD::get_singleton()->texture_create_shared_from_slice(RD::TextureView(), texture.rd_texture, 0, i));
-	}
-
-	//used for 2D, overridable
-	texture.width_2d = texture.width;
-	texture.height_2d = texture.height;
-	texture.is_render_target = false;
-	texture.rd_view = rd_view;
-	texture.is_proxy = false;
-
-	texture_owner.initialize_rid(p_texture, texture);
-}
-
 // Note: We make some big assumptions about format and usage. If developers need more control,
 // they should use RD::texture_create_from_extension() instead.
-RID TextureStorage::texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers, RSE::TextureLayeredType p_layered_type) {
+RID TextureStorage::texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers, RS::TextureLayeredType p_layered_type) {
 	RD::TextureType type;
 	switch (p_type) {
-		case RSE::TEXTURE_TYPE_2D:
+		case RS::TEXTURE_TYPE_2D:
 			type = RD::TEXTURE_TYPE_2D;
 			break;
 
-		case RSE::TEXTURE_TYPE_3D:
+		case RS::TEXTURE_TYPE_3D:
 			type = RD::TEXTURE_TYPE_3D;
 			break;
 
-		case RSE::TEXTURE_TYPE_LAYERED:
-			if (p_layered_type == RSE::TEXTURE_LAYERED_2D_ARRAY) {
+		case RS::TEXTURE_TYPE_LAYERED:
+			if (p_layered_type == RS::TEXTURE_LAYERED_2D_ARRAY) {
 				type = RD::TEXTURE_TYPE_2D_ARRAY;
-			} else if (p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP) {
+			} else if (p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP) {
 				type = RD::TEXTURE_TYPE_CUBE;
-			} else if (p_layered_type == RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY) {
+			} else if (p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP_ARRAY) {
 				type = RD::TEXTURE_TYPE_CUBE_ARRAY;
 			} else {
 				// Arbitrary fallback.
@@ -1663,152 +1474,13 @@ void TextureStorage::texture_proxy_update(RID p_texture, RID p_proxy_to) {
 	}
 }
 
-// Output textures in p_textures must ALL BE THE SAME SIZE
-void TextureStorage::texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) {
-	ERR_FAIL_COND_MSG(!tex_blit_shader.initialized, "Texture Blit shader & materials not yet initialized.");
-	ERR_FAIL_COND_MSG(p_textures.is_empty() || p_source_textures.is_empty(), "Blit Rect texture output and source arrays must contain at least 1 texture.");
-	const RID default_tex_rid = texture_rd_get_default(DEFAULT_RD_TEXTURE_WHITE);
-	RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
-
-	RendererRD::MaterialStorage::TexBlitMaterialData *m = static_cast<RendererRD::MaterialStorage::TexBlitMaterialData *>(material_storage->material_get_data(p_material, RendererRD::MaterialStorage::SHADER_TYPE_TEXTURE_BLIT));
-	if (!m) {
-		m = static_cast<RendererRD::MaterialStorage::TexBlitMaterialData *>(material_storage->material_get_data(tex_blit_shader.default_material, RendererRD::MaterialStorage::SHADER_TYPE_TEXTURE_BLIT));
-	}
-	// GUARDRAIL:: p_material MUST BE ShaderType TextureBlit
-	ERR_FAIL_NULL(m);
-
-	RendererRD::MaterialStorage::TexBlitShaderData *shader_data = m->shader_data;
-	ERR_FAIL_NULL(shader_data);
-	material_storage->_update_queued_materials();
-	RID shaderRD = tex_blit_shader.shader.version_get_shader(shader_data->version, p_source_textures.size() - 1);
-
-	RID tar_textures[4];
-	Texture *src_textures[4];
-
-	RID uniform_texture_set;
-	int TEX_BLIT_MATERIAL_SET = 1;
-	int TEX_BLIT_TEXTURE_SET = 0;
-	int srgb_mask = 0;
-	const int srgbMaskArray[4] = { 1, 2, 4, 8 };
-	LocalVector<RD::Uniform> texture_uniforms;
-
-	int i = 0;
-	while (i < 4) {
-		// Load Target Textures
-		if (i < p_textures.size()) {
-			Texture *tex = get_texture(p_textures[i]);
-			srgb_mask += get_texture(p_textures[i])->drawable_type == RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB ? srgbMaskArray[i] : 0;
-			ERR_FAIL_NULL_MSG(tex, "Drawable Texture target cannot be null.");
-			ERR_FAIL_COND_MSG(p_to_mipmap >= tex->mipmaps || p_to_mipmap >= tex->cached_rd_slices.size(), vformat("Drawable Texture Target does not have mipmap level %d.", p_to_mipmap));
-			if (i > 0) {
-				ERR_FAIL_COND_MSG(texture_2d_get_size(p_textures[i - 1]) != texture_2d_get_size(p_textures[i]), "All Blit_Rect output textures must be same size.");
-			}
-			tar_textures[i] = tex->cached_rd_slices[p_to_mipmap];
-		}
-
-		// Load and bind source textures, load default Black if source is bad.
-		RD::Uniform u;
-		u.uniform_type = RD::UNIFORM_TYPE_TEXTURE;
-		u.binding = i;
-		if (i < p_source_textures.size()) {
-			src_textures[i] = get_texture(p_source_textures[i]);
-			if (!src_textures[i]) {
-				u.append_id(default_tex_rid);
-			} else {
-				u.append_id(src_textures[i]->rd_texture);
-			}
-		} else {
-			u.append_id(default_tex_rid);
-		}
-		texture_uniforms.push_back(u);
-
-		i += 1;
-	}
-
-	// Calculates the Rects Offset & Size in UV space for Shader to scale Vertex Quad correctly
-	Vector2i size = texture_2d_get_size(p_textures[0]);
-	Vector2 offset = Vector2(float(p_rect.position.x) / size.x, float(p_rect.position.y) / size.y);
-	Vector2 rect_size = Vector2(float(p_rect.size.x) / size.x, float(p_rect.size.y) / size.y);
-
-	// Select Pipeline based on # of targets.
-	RID tex_blit_fb;
-	PipelineCacheRD *pipeline;
-	switch (p_textures.size()) {
-		case 1:
-			tex_blit_fb = FramebufferCacheRD::get_singleton()->get_cache(tar_textures[0]);
-			pipeline = &shader_data->pipelines[0];
-			break;
-		case 2:
-			tex_blit_fb = FramebufferCacheRD::get_singleton()->get_cache(tar_textures[0], tar_textures[1]);
-			pipeline = &shader_data->pipelines[1];
-			break;
-		case 3:
-			tex_blit_fb = FramebufferCacheRD::get_singleton()->get_cache(tar_textures[0], tar_textures[1], tar_textures[2]);
-			pipeline = &shader_data->pipelines[2];
-			break;
-		case 4:
-			tex_blit_fb = FramebufferCacheRD::get_singleton()->get_cache(tar_textures[0], tar_textures[1], tar_textures[2], tar_textures[3]);
-			pipeline = &shader_data->pipelines[3];
-			break;
-		default:
-			tex_blit_fb = FramebufferCacheRD::get_singleton()->get_cache(tar_textures[0], tar_textures[1], tar_textures[2], tar_textures[3]);
-			pipeline = &shader_data->pipelines[3];
-	}
-
-	// Bind uniforms via push_constant
-	TexBlitPushConstant push_constant;
-	memset(&push_constant, 0, sizeof(TexBlitPushConstant));
-
-	push_constant.offset[0] = offset.x;
-	push_constant.offset[1] = offset.y;
-	push_constant.size[0] = rect_size.x;
-	push_constant.size[1] = rect_size.y;
-	push_constant.modulate[0] = p_modulate.r;
-	push_constant.modulate[1] = p_modulate.g;
-	push_constant.modulate[2] = p_modulate.b;
-	push_constant.modulate[3] = p_modulate.a;
-	push_constant.convert_to_srgb = srgb_mask;
-	push_constant.time = RSG::rasterizer->get_total_time();
-
-	Rect2i tex_blit_rr;
-
-	RD::get_singleton()->draw_command_begin_label("Blit Rect");
-	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(tex_blit_fb, RD::DRAW_DEFAULT_ALL, Vector<Color>(), 1.0f, 0u, tex_blit_rr);
-
-	RD::FramebufferFormatID fb_format = RD::get_singleton()->framebuffer_get_format(tex_blit_fb);
-	RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, pipeline->get_render_pipeline(RD::INVALID_ID, fb_format, false, 0));
-
-	material_storage->samplers_rd_get_default().append_uniforms(texture_uniforms, 4);
-
-	uniform_texture_set = UniformSetCacheRD::get_singleton()->get_cache_vec(shaderRD, TEX_BLIT_TEXTURE_SET, texture_uniforms);
-
-	{
-		// Push Constants
-		RD::get_singleton()->draw_list_set_push_constant(draw_list, &push_constant, sizeof(TexBlitPushConstant));
-
-		// Material Uniforms
-		if (m->uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(m->uniform_set)) { // Material may not have a uniform set.
-			RD::get_singleton()->draw_list_bind_uniform_set(draw_list, m->uniform_set, TEX_BLIT_MATERIAL_SET);
-		}
-
-		// Texture Uniforms
-		RD::get_singleton()->draw_list_bind_uniform_set(draw_list, uniform_texture_set, TEX_BLIT_TEXTURE_SET);
-	}
-
-	// DRAW!!
-	RD::get_singleton()->draw_list_draw(draw_list, false, 1u, 6u);
-
-	RD::get_singleton()->draw_list_end();
-	RD::get_singleton()->draw_command_end_label();
-}
-
 //these two APIs can be used together or in combination with the others.
 void TextureStorage::texture_2d_placeholder_initialize(RID p_texture) {
 	texture_2d_initialize(p_texture, texture_2d_placeholder);
 }
 
-void TextureStorage::texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) {
-	if (p_layered_type == RSE::TEXTURE_LAYERED_2D_ARRAY) {
+void TextureStorage::texture_2d_layered_placeholder_initialize(RID p_texture, RS::TextureLayeredType p_layered_type) {
+	if (p_layered_type == RS::TEXTURE_LAYERED_2D_ARRAY) {
 		texture_2d_layered_initialize(p_texture, texture_2d_array_placeholder, p_layered_type);
 	} else {
 		texture_2d_layered_initialize(p_texture, cubemap_placeholder, p_layered_type);
@@ -1927,38 +1599,6 @@ Vector<Ref<Image>> TextureStorage::texture_3d_get(RID p_texture) const {
 	return ret;
 }
 
-void TextureStorage::texture_drawable_generate_mipmaps(RID p_texture) {
-	Texture *tex = get_texture(p_texture);
-	CopyEffects *copy_effects = CopyEffects::get_singleton();
-	ERR_FAIL_NULL(copy_effects);
-
-	uint32_t mipmaps = tex->mipmaps;
-	int width = tex->width;
-	int height = tex->height;
-
-	RID source = tex->rd_texture;
-	RID dest = tex->cached_rd_slices[0];
-
-	for (uint32_t m = 1; m < mipmaps; m++) {
-		width = MAX(1, width >> 1);
-		height = MAX(1, height >> 1);
-
-		source = dest;
-		dest = RD::get_singleton()->texture_create_shared_from_slice(RD::TextureView(), source, 0, m, 1, RD::TEXTURE_SLICE_2D);
-
-		if (copy_effects->get_raster_effects().has_flag(CopyEffects::RASTER_EFFECT_COPY)) {
-			copy_effects->make_mipmap_raster(source, dest, Size2i(width, height));
-		} else {
-			copy_effects->make_mipmap(source, dest, Size2i(width, height));
-		}
-	}
-}
-
-RID TextureStorage::texture_drawable_get_default_material() const {
-	// Return a material with a default Texture_Blit shader for DrawableTexture2D to use
-	return tex_blit_shader.default_material;
-}
-
 void TextureStorage::texture_replace(RID p_texture, RID p_by_texture) {
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex);
@@ -2034,7 +1674,7 @@ Image::Format TextureStorage::texture_get_format(RID p_texture) const {
 	return tex->format;
 }
 
-void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) {
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex);
 
@@ -2042,7 +1682,7 @@ void TextureStorage::texture_set_detect_3d_callback(RID p_texture, RenderingServ
 	tex->detect_3d_callback = p_callback;
 }
 
-void TextureStorage::texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) {
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex);
 
@@ -2050,7 +1690,7 @@ void TextureStorage::texture_set_detect_normal_callback(RID p_texture, Rendering
 	tex->detect_normal_callback = p_callback;
 }
 
-void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) {
+void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) {
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex);
 
@@ -2058,19 +1698,19 @@ void TextureStorage::texture_set_detect_roughness_callback(RID p_texture, Render
 	tex->detect_roughness_callback = p_callback;
 }
 
-void TextureStorage::texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) {
+void TextureStorage::texture_debug_usage(List<RS::TextureInfo> *r_info) {
 	for (const RID &rid : texture_owner.get_owned_list()) {
 		Texture *t = texture_owner.get_or_null(rid);
 		if (!t) {
 			continue;
 		}
-		RenderingServerTypes::TextureInfo tinfo;
+		RS::TextureInfo tinfo;
 		tinfo.path = t->path;
 		tinfo.format = t->format;
 		tinfo.width = t->width;
 		tinfo.height = t->height;
 		tinfo.bytes = Image::get_image_data_size(t->width, t->height, t->format, t->mipmaps > 1);
-		tinfo.type = static_cast<RSE::TextureType>(t->type);
+		tinfo.type = static_cast<RenderingServer::TextureType>(t->type);
 
 		switch (t->type) {
 			case TextureType::TYPE_3D:
@@ -2099,7 +1739,7 @@ Size2 TextureStorage::texture_size_with_proxy(RID p_proxy) {
 	return texture_2d_get_size(p_proxy);
 }
 
-void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type) {
+void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type) {
 	ERR_FAIL_COND(!RD::get_singleton()->texture_is_valid(p_rd_texture));
 
 	// TODO : investigate if we can support this, will need to be able to obtain the order and obtain the slice info
@@ -2153,22 +1793,14 @@ void TextureStorage::texture_rd_initialize(RID p_texture, const RID &p_rd_textur
 	rd_view.swizzle_a = imfmt.swizzle_a;
 
 	texture.rd_type = tf.texture_type;
-	texture.rd_format = imfmt.rd_format;
-	texture.rd_format_srgb = imfmt.rd_format_srgb;
 	texture.rd_view = rd_view;
-
-	if (imfmt.rd_format_srgb != RD::DATA_FORMAT_MAX) {
-		// Allow creating a shared sRGB texture even if users didn't explicitly add them.
-		RD::get_singleton()->_texture_ensure_shareable_format(p_rd_texture, texture.rd_format);
-		RD::get_singleton()->_texture_ensure_shareable_format(p_rd_texture, texture.rd_format_srgb);
-	}
-
+	texture.rd_format = imfmt.rd_format;
 	// We create a shared texture here even if our view matches, so we don't obtain ownership.
 	texture.rd_texture = RD::get_singleton()->texture_create_shared(rd_view, p_rd_texture);
 	if (imfmt.rd_format_srgb != RD::DATA_FORMAT_MAX) {
-		// The texture supports sRGB override, create it for 3D usage.
-		rd_view.format_override = imfmt.rd_format_srgb == tf.format ? RD::DATA_FORMAT_MAX : imfmt.rd_format_srgb;
+		rd_view.format_override = imfmt.rd_format_srgb == tf.format ? RD::DATA_FORMAT_MAX : imfmt.rd_format;
 		texture.rd_format_srgb = imfmt.rd_format_srgb;
+		// We create a shared texture here even if our view matches, so we don't obtain ownership.
 		texture.rd_texture_srgb = RD::get_singleton()->texture_create_shared(rd_view, p_rd_texture);
 	}
 
@@ -3281,7 +2913,7 @@ void TextureStorage::decal_initialize(RID p_decal) {
 
 void TextureStorage::decal_free(RID p_rid) {
 	Decal *decal = decal_owner.get_or_null(p_rid);
-	for (int i = 0; i < RSE::DECAL_TEXTURE_MAX; i++) {
+	for (int i = 0; i < RS::DECAL_TEXTURE_MAX; i++) {
 		if (decal->textures[i].is_valid() && owns_texture(decal->textures[i])) {
 			texture_remove_from_decal_atlas(decal->textures[i]);
 		}
@@ -3297,10 +2929,10 @@ void TextureStorage::decal_set_size(RID p_decal, const Vector3 &p_size) {
 	decal->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
 }
 
-void TextureStorage::decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) {
+void TextureStorage::decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) {
 	Decal *decal = decal_owner.get_or_null(p_decal);
 	ERR_FAIL_NULL(decal);
-	ERR_FAIL_INDEX(p_type, RSE::DECAL_TEXTURE_MAX);
+	ERR_FAIL_INDEX(p_type, RS::DECAL_TEXTURE_MAX);
 
 	if (decal->textures[p_type] == p_texture) {
 		return;
@@ -3440,7 +3072,7 @@ void TextureStorage::update_decal_atlas() {
 			si.pixel_size = Size2i(src_tex->width, src_tex->height);
 
 			if (base_size < (uint32_t)si.size.width) {
-				base_size = Math::nearest_power_of_2_templated(si.size.width);
+				base_size = nearest_power_of_2_templated(si.size.width);
 			}
 
 			si.texture = E.key;
@@ -3463,8 +3095,7 @@ void TextureStorage::update_decal_atlas() {
 			int *v_offsets = v_offsetsv.ptrw();
 			memset(v_offsets, 0, sizeof(int) * base_size);
 
-			// Take border into account for minimum height.
-			int max_height = 2;
+			int max_height = 0;
 
 			for (int i = 0; i < item_count; i++) {
 				//best fit
@@ -3511,7 +3142,7 @@ void TextureStorage::update_decal_atlas() {
 		}
 
 		decal_atlas.size.width = base_size * border;
-		decal_atlas.size.height = Math::nearest_power_of_2_templated(atlas_height * border);
+		decal_atlas.size.height = nearest_power_of_2_templated(atlas_height * border);
 
 		for (int i = 0; i < item_count; i++) {
 			DecalAtlas::Texture *t = decal_atlas.textures.getptr(items[i].texture);
@@ -3776,8 +3407,8 @@ void TextureStorage::update_decal_buffer(const PagedArray<RID> &p_decals, const
 		dd.normal[2] = normal.z;
 		dd.normal_fade = decal->normal_fade;
 
-		RID albedo_tex = decal->textures[RSE::DECAL_TEXTURE_ALBEDO];
-		RID emission_tex = decal->textures[RSE::DECAL_TEXTURE_EMISSION];
+		RID albedo_tex = decal->textures[RS::DECAL_TEXTURE_ALBEDO];
+		RID emission_tex = decal->textures[RS::DECAL_TEXTURE_EMISSION];
 		if (albedo_tex.is_valid()) {
 			Rect2 rect = decal_atlas_get_texture_rect(albedo_tex);
 			dd.albedo_rect[0] = rect.position.x;
@@ -3794,7 +3425,7 @@ void TextureStorage::update_decal_buffer(const PagedArray<RID> &p_decals, const
 			dd.albedo_rect[3] = 0;
 		}
 
-		RID normal_tex = decal->textures[RSE::DECAL_TEXTURE_NORMAL];
+		RID normal_tex = decal->textures[RS::DECAL_TEXTURE_NORMAL];
 
 		if (normal_tex.is_valid()) {
 			Rect2 rect = decal_atlas_get_texture_rect(normal_tex);
@@ -3812,7 +3443,7 @@ void TextureStorage::update_decal_buffer(const PagedArray<RID> &p_decals, const
 			dd.normal_rect[3] = 0;
 		}
 
-		RID orm_tex = decal->textures[RSE::DECAL_TEXTURE_ORM];
+		RID orm_tex = decal->textures[RS::DECAL_TEXTURE_ORM];
 		if (orm_tex.is_valid()) {
 			Rect2 rect = decal_atlas_get_texture_rect(orm_tex);
 			dd.orm_rect[0] = rect.position.x;
@@ -3865,7 +3496,7 @@ RID TextureStorage::RenderTarget::get_framebuffer() {
 	// We can't resolve into our overridden buffer as it won't be marked as a resolve buffer.
 	// This is only applicable when OpenXR is used and 2D rendering is skipped.
 
-	if (msaa != RSE::VIEWPORT_MSAA_DISABLED && overridden.color.is_null()) {
+	if (msaa != RS::VIEWPORT_MSAA_DISABLED && overridden.color.is_null()) {
 		// Render into our MSAA buffer and resolve into our color buffer.
 		return FramebufferCacheRD::get_singleton()->get_cache_multiview(view_count, color_multisample, color);
 	} else {
@@ -3961,7 +3592,7 @@ void TextureStorage::_update_render_target(RenderTarget *rt) {
 		rd_color_attachment_format.usage_bits = render_target_get_color_usage_bits(false);
 		rd_color_attachment_format.shareable_formats.push_back(rt->color_format);
 		rd_color_attachment_format.shareable_formats.push_back(rt->color_format_srgb);
-		if (rt->msaa != RSE::VIEWPORT_MSAA_DISABLED) {
+		if (rt->msaa != RS::VIEWPORT_MSAA_DISABLED) {
 			rd_color_attachment_format.is_resolve_buffer = true;
 		}
 	}
@@ -3970,10 +3601,10 @@ void TextureStorage::_update_render_target(RenderTarget *rt) {
 	rt->color = RD::get_singleton()->texture_create(rd_color_attachment_format, rd_view);
 	ERR_FAIL_COND(rt->color.is_null());
 
-	if (rt->msaa != RSE::VIEWPORT_MSAA_DISABLED) {
+	if (rt->msaa != RS::VIEWPORT_MSAA_DISABLED) {
 		// Use the texture format of the color attachment for the multisample color attachment.
 		RD::TextureFormat rd_color_multisample_format = rd_color_attachment_format;
-		const RD::TextureSamples texture_samples[RSE::VIEWPORT_MSAA_MAX] = {
+		const RD::TextureSamples texture_samples[RS::VIEWPORT_MSAA_MAX] = {
 			RD::TEXTURE_SAMPLES_1,
 			RD::TEXTURE_SAMPLES_2,
 			RD::TEXTURE_SAMPLES_4,
@@ -3983,7 +3614,6 @@ void TextureStorage::_update_render_target(RenderTarget *rt) {
 		rd_color_multisample_format.usage_bits = render_target_get_color_usage_bits(true);
 		RD::TextureView rd_view_multisample;
 		rd_color_multisample_format.is_resolve_buffer = false;
-		rd_color_multisample_format.is_discardable = true;
 		rt->color_multisample = RD::get_singleton()->texture_create(rd_color_multisample_format, rd_view_multisample);
 		ERR_FAIL_COND(rt->color_multisample.is_null());
 	}
@@ -4044,7 +3674,6 @@ void TextureStorage::_create_render_target_backbuffer(RenderTarget *rt) {
 	tf.texture_type = RD::TEXTURE_TYPE_2D;
 	tf.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_COPY_TO_BIT;
 	tf.mipmaps = mipmaps_required;
-	tf.is_discardable = true;
 
 	rt->backbuffer = RD::get_singleton()->texture_create(tf, RD::TextureView());
 	RD::get_singleton()->set_resource_name(rt->backbuffer, "Render Target Back Buffer");
@@ -4219,34 +3848,6 @@ Rect2i RendererRD::TextureStorage::render_target_get_render_region(RID p_render_
 	return rt->render_region;
 }
 
-void RendererRD::TextureStorage::render_target_set_subsampled_enabled(RID p_render_target, bool p_enabled) {
-	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL(rt);
-
-	rt->subsampled_enabled = p_enabled;
-}
-
-bool RendererRD::TextureStorage::render_target_is_subsampled_enabled(RID p_render_target) const {
-	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, false);
-
-	return rt->subsampled_enabled;
-}
-
-void RendererRD::TextureStorage::render_target_set_subsampled_allowed(RID p_render_target, bool p_allowed) {
-	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL(rt);
-
-	rt->subsampled_allowed = p_allowed;
-}
-
-bool RendererRD::TextureStorage::render_target_is_subsampled_allowed(RID p_render_target) const {
-	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, false);
-
-	return rt->subsampled_allowed;
-}
-
 void TextureStorage::render_target_set_transparent(RID p_render_target, bool p_is_transparent) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
@@ -4280,7 +3881,7 @@ void TextureStorage::render_target_set_as_unused(RID p_render_target) {
 	rt->was_used = false;
 }
 
-void TextureStorage::render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) {
+void TextureStorage::render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 	if (p_msaa == rt->msaa) {
@@ -4291,9 +3892,9 @@ void TextureStorage::render_target_set_msaa(RID p_render_target, RSE::ViewportMS
 	_update_render_target(rt);
 }
 
-RSE::ViewportMSAA TextureStorage::render_target_get_msaa(RID p_render_target) const {
+RS::ViewportMSAA TextureStorage::render_target_get_msaa(RID p_render_target) const {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, RSE::VIEWPORT_MSAA_DISABLED);
+	ERR_FAIL_NULL_V(rt, RS::VIEWPORT_MSAA_DISABLED);
 
 	return rt->msaa;
 }
@@ -4455,7 +4056,7 @@ void TextureStorage::render_target_do_clear_request(RID p_render_target) {
 	rt->msaa_needs_resolve = false;
 }
 
-void TextureStorage::render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) {
+void TextureStorage::render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 	if (rt->sdf_oversize == p_size && rt->sdf_scale == p_scale) {
@@ -4472,16 +4073,16 @@ Rect2i TextureStorage::_render_target_get_sdf_rect(const RenderTarget *rt) const
 	Size2i margin;
 	int scale;
 	switch (rt->sdf_oversize) {
-		case RSE::VIEWPORT_SDF_OVERSIZE_100_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_100_PERCENT: {
 			scale = 100;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_120_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_120_PERCENT: {
 			scale = 120;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_150_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_150_PERCENT: {
 			scale = 150;
 		} break;
-		case RSE::VIEWPORT_SDF_OVERSIZE_200_PERCENT: {
+		case RS::VIEWPORT_SDF_OVERSIZE_200_PERCENT: {
 			scale = 200;
 		} break;
 		default: {
@@ -4558,7 +4159,6 @@ void TextureStorage::_render_target_allocate_sdf(RenderTarget *rt) {
 	tformat.height = size.height;
 	tformat.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 	tformat.texture_type = RD::TEXTURE_TYPE_2D;
-	tformat.is_discardable = true;
 
 	rt->sdf_buffer_write = RD::get_singleton()->texture_create(tformat, RD::TextureView());
 
@@ -4570,13 +4170,13 @@ void TextureStorage::_render_target_allocate_sdf(RenderTarget *rt) {
 
 	int scale;
 	switch (rt->sdf_scale) {
-		case RSE::VIEWPORT_SDF_SCALE_100_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_100_PERCENT: {
 			scale = 100;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_50_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_50_PERCENT: {
 			scale = 50;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_25_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_25_PERCENT: {
 			scale = 25;
 		} break;
 		default: {
@@ -4688,13 +4288,13 @@ void TextureStorage::render_target_sdf_process(RID p_render_target) {
 	bool shrink = false;
 
 	switch (rt->sdf_scale) {
-		case RSE::VIEWPORT_SDF_SCALE_50_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_50_PERCENT: {
 			push_constant.size[0] >>= 1;
 			push_constant.size[1] >>= 1;
 			push_constant.shift = 1;
 			shrink = true;
 		} break;
-		case RSE::VIEWPORT_SDF_SCALE_25_PERCENT: {
+		case RS::VIEWPORT_SDF_SCALE_25_PERCENT: {
 			push_constant.size[0] >>= 2;
 			push_constant.size[1] >>= 2;
 			push_constant.shift = 2;
@@ -4716,7 +4316,7 @@ void TextureStorage::render_target_sdf_process(RID p_render_target) {
 
 	/* Process */
 
-	int stride = Math::nearest_power_of_2_templated(MAX(push_constant.size[0], push_constant.size[1]) / 2);
+	int stride = nearest_power_of_2_templated(MAX(push_constant.size[0], push_constant.size[1]) / 2);
 
 	RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, rt_sdf.pipelines[RenderTargetSDF::SHADER_PROCESS]);
 
@@ -4896,30 +4496,30 @@ void TextureStorage::render_target_set_backbuffer_uniform_set(RID p_render_targe
 	rt->backbuffer_uniform_set = p_uniform_set;
 }
 
-void TextureStorage::render_target_set_vrs_mode(RID p_render_target, RSE::ViewportVRSMode p_mode) {
+void TextureStorage::render_target_set_vrs_mode(RID p_render_target, RS::ViewportVRSMode p_mode) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 
 	rt->vrs_mode = p_mode;
 }
 
-RSE::ViewportVRSMode TextureStorage::render_target_get_vrs_mode(RID p_render_target) const {
+RS::ViewportVRSMode TextureStorage::render_target_get_vrs_mode(RID p_render_target) const {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, RSE::VIEWPORT_VRS_DISABLED);
+	ERR_FAIL_NULL_V(rt, RS::VIEWPORT_VRS_DISABLED);
 
 	return rt->vrs_mode;
 }
 
-void TextureStorage::render_target_set_vrs_update_mode(RID p_render_target, RSE::ViewportVRSUpdateMode p_mode) {
+void TextureStorage::render_target_set_vrs_update_mode(RID p_render_target, RS::ViewportVRSUpdateMode p_mode) {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
 	ERR_FAIL_NULL(rt);
 
 	rt->vrs_update_mode = p_mode;
 }
 
-RSE::ViewportVRSUpdateMode TextureStorage::render_target_get_vrs_update_mode(RID p_render_target) const {
+RS::ViewportVRSUpdateMode TextureStorage::render_target_get_vrs_update_mode(RID p_render_target) const {
 	RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
-	ERR_FAIL_NULL_V(rt, RSE::VIEWPORT_VRS_UPDATE_DISABLED);
+	ERR_FAIL_NULL_V(rt, RS::VIEWPORT_VRS_UPDATE_DISABLED);
 
 	return rt->vrs_update_mode;
 }
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
index bbbfba0e..4a4767f9 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
@@ -33,10 +33,8 @@
 #include "core/templates/paged_array.h"
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_rd/shaders/canvas_sdf.glsl.gen.h"
-#include "servers/rendering/renderer_rd/shaders/tex_blit.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/forward_id_storage.h"
-#include "servers/rendering/rendering_server_types.h"
-#include "servers/rendering/shader_compiler.h"
+#include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/storage/texture_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
@@ -47,8 +45,6 @@ class MaterialStorage;
 
 class TextureStorage : public RendererTextureStorage {
 public:
-	const int SAMPLERS_BINDING_FIRST_INDEX = 4;
-
 	enum DefaultRDTexture {
 		DEFAULT_RD_TEXTURE_WHITE,
 		DEFAULT_RD_TEXTURE_BLACK,
@@ -123,8 +119,8 @@ private:
 		Color specular_color = Color(1, 1, 1, 1);
 		float shininess = 1.0;
 
-		RSE::CanvasItemTextureFilter texture_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
-		RSE::CanvasItemTextureRepeat texture_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
+		RS::CanvasItemTextureFilter texture_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT;
+		RS::CanvasItemTextureRepeat texture_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT;
 		CanvasTextureCache info_cache[2];
 
 		InvalidationCallback invalidated_callback = nullptr;
@@ -147,15 +143,13 @@ private:
 	class Texture {
 	public:
 		TextureType type;
-		RSE::TextureLayeredType layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY;
-		RSE::TextureDrawableFormat drawable_type = RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8;
+		RS::TextureLayeredType layered_type = RS::TEXTURE_LAYERED_2D_ARRAY;
 
 		RenderingDevice::TextureType rd_type;
 		RID rd_texture;
 		RID rd_texture_srgb;
 		RenderingDevice::DataFormat rd_format;
 		RenderingDevice::DataFormat rd_format_srgb;
-		Vector<RID> cached_rd_slices;
 
 		RD::TextureView rd_view;
 
@@ -191,13 +185,13 @@ private:
 
 		HashSet<RID> lightmap_users;
 
-		RenderingServerTypes::TextureDetectCallback detect_3d_callback = nullptr;
+		RS::TextureDetectCallback detect_3d_callback = nullptr;
 		void *detect_3d_callback_ud = nullptr;
 
-		RenderingServerTypes::TextureDetectCallback detect_normal_callback = nullptr;
+		RS::TextureDetectCallback detect_normal_callback = nullptr;
 		void *detect_normal_callback_ud = nullptr;
 
-		RenderingServerTypes::TextureDetectRoughnessCallback detect_roughness_callback = nullptr;
+		RS::TextureDetectRoughnessCallback detect_roughness_callback = nullptr;
 		void *detect_roughness_callback_ud = nullptr;
 
 		CanvasTexture *canvas_texture = nullptr;
@@ -293,7 +287,7 @@ private:
 
 	struct Decal {
 		Vector3 size = Vector3(2, 2, 2);
-		RID textures[RSE::DECAL_TEXTURE_MAX];
+		RID textures[RS::DECAL_TEXTURE_MAX];
 		float emission_energy = 1.0;
 		float albedo_mix = 1.0;
 		Color modulate = Color(1, 1, 1, 1);
@@ -366,7 +360,7 @@ private:
 		Vector<RID> color_slices;
 		RID color_multisample; // Needed when 2D MSAA is enabled.
 
-		RSE::ViewportMSAA msaa = RSE::VIEWPORT_MSAA_DISABLED; // 2D MSAA mode
+		RS::ViewportMSAA msaa = RS::VIEWPORT_MSAA_DISABLED; // 2D MSAA mode
 		bool msaa_needs_resolve = false; // 2D MSAA needs resolved
 
 		//used for retrieving from CPU
@@ -394,18 +388,16 @@ private:
 		RID sdf_buffer_process[2];
 		RID sdf_buffer_read;
 		RID sdf_buffer_process_uniform_sets[2];
-		RSE::ViewportSDFOversize sdf_oversize = RSE::VIEWPORT_SDF_OVERSIZE_120_PERCENT;
-		RSE::ViewportSDFScale sdf_scale = RSE::VIEWPORT_SDF_SCALE_50_PERCENT;
+		RS::ViewportSDFOversize sdf_oversize = RS::VIEWPORT_SDF_OVERSIZE_120_PERCENT;
+		RS::ViewportSDFScale sdf_scale = RS::VIEWPORT_SDF_SCALE_50_PERCENT;
 		Size2i process_size;
 
 		// VRS
-		RSE::ViewportVRSMode vrs_mode = RSE::VIEWPORT_VRS_DISABLED;
-		RSE::ViewportVRSUpdateMode vrs_update_mode = RSE::VIEWPORT_VRS_UPDATE_ONCE;
+		RS::ViewportVRSMode vrs_mode = RS::VIEWPORT_VRS_DISABLED;
+		RS::ViewportVRSUpdateMode vrs_update_mode = RS::VIEWPORT_VRS_UPDATE_ONCE;
 		RID vrs_texture;
 
 		Rect2i render_region;
-		bool subsampled_enabled = false;
-		bool subsampled_allowed = true;
 
 		// overridden textures
 		struct RTOverridden {
@@ -490,32 +482,9 @@ private:
 		RID pipelines[SHADER_MAX];
 	} rt_sdf;
 
-	struct TextureBlitShader {
-		TexBlitShaderRD shader;
-		ShaderCompiler compiler;
-
-		bool initialized = false;
-		RID default_shader;
-		RID default_material;
-		RID default_shader_version;
-	} tex_blit_shader;
-
-	struct TexBlitPushConstant {
-		float offset[2]; // 8 - 8
-		float size[2]; // 8 - 16
-		float modulate[4]; // 16 - 32
-		float pad[2]; // 8 - 40
-		uint32_t convert_to_srgb; // 4 - 44
-		float time; // 4 - 48
-		// 128 is the max size of a push constant. We can replace "pad" but we can't add any more.
-	};
-
 public:
 	static TextureStorage *get_singleton();
 
-	void _tex_blit_shader_initialize();
-	void _tex_blit_shader_free();
-
 	_FORCE_INLINE_ RID texture_rd_get_default(DefaultRDTexture p_texture) {
 		return default_rd_textures[p_texture];
 	}
@@ -533,13 +502,13 @@ public:
 	virtual void canvas_texture_initialize(RID p_rid) override;
 	virtual void canvas_texture_free(RID p_rid) override;
 
-	virtual void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) override;
+	virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) override;
 	virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) override;
 
-	virtual void canvas_texture_set_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) override;
-	virtual void canvas_texture_set_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) override;
+	virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) override;
+	virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) override;
 
-	CanvasTextureInfo canvas_texture_get_info(RID p_texture, RSE::CanvasItemTextureFilter p_base_filter, RSE::CanvasItemTextureRepeat p_base_repeat, bool p_use_srgb, bool p_texture_is_data);
+	CanvasTextureInfo canvas_texture_get_info(RID p_texture, RS::CanvasItemTextureFilter p_base_filter, RS::CanvasItemTextureRepeat p_base_repeat, bool p_use_srgb, bool p_texture_is_data);
 	void canvas_texture_set_invalidation_callback(RID p_canvas_texture, InvalidationCallback p_callback, void *p_userdata);
 
 	/* Texture API */
@@ -550,21 +519,18 @@ public:
 	virtual void texture_free(RID p_rid) override;
 
 	virtual void texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) override;
-	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) override;
+	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) override;
 	virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) override;
 	virtual void texture_external_initialize(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) override;
 	virtual void texture_proxy_initialize(RID p_texture, RID p_base) override; //all slices, then all the mipmaps, must be coherent
-	virtual void texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) override;
 
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override;
+	virtual RID texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RS::TextureLayeredType p_layered_type = RS::TEXTURE_LAYERED_2D_ARRAY) override;
 
 	virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) override;
 	virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) override;
 	virtual void texture_external_update(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) override;
 	virtual void texture_proxy_update(RID p_proxy, RID p_base) override;
 
-	virtual void texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) override;
-
 	Ref<Image> texture_2d_placeholder;
 	Vector<Ref<Image>> texture_2d_array_placeholder;
 	Vector<Ref<Image>> cubemap_placeholder;
@@ -572,16 +538,13 @@ public:
 
 	//these two APIs can be used together or in combination with the others.
 	virtual void texture_2d_placeholder_initialize(RID p_texture) override;
-	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) override;
+	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) override;
 	virtual void texture_3d_placeholder_initialize(RID p_texture) override;
 
 	virtual Ref<Image> texture_2d_get(RID p_texture) const override;
 	virtual Ref<Image> texture_2d_layer_get(RID p_texture, int p_layer) const override;
 	virtual Vector<Ref<Image>> texture_3d_get(RID p_texture) const override;
 
-	virtual void texture_drawable_generate_mipmaps(RID p_texture) override;
-	virtual RID texture_drawable_get_default_material() const override;
-
 	virtual void texture_replace(RID p_texture, RID p_by_texture) override;
 	virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) override;
 
@@ -590,17 +553,17 @@ public:
 
 	virtual Image::Format texture_get_format(RID p_texture) const override;
 
-	virtual void texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override;
-	virtual void texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) override;
-	virtual void texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) override;
+	virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override;
+	virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override;
+	virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) override;
 
-	virtual void texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) override;
+	virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) override;
 
 	virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) override;
 
 	virtual Size2 texture_size_with_proxy(RID p_proxy) override;
 
-	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override;
+	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type = RS::TEXTURE_LAYERED_2D_ARRAY) override;
 	virtual RID texture_get_rd_texture(RID p_texture, bool p_srgb = false) const override;
 	virtual uint64_t texture_get_native_handle(RID p_texture, bool p_srgb = false) const override;
 
@@ -657,7 +620,7 @@ public:
 	virtual void decal_free(RID p_rid) override;
 
 	virtual void decal_set_size(RID p_decal, const Vector3 &p_size) override;
-	virtual void decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) override;
+	virtual void decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) override;
 	virtual void decal_set_emission_energy(RID p_decal, float p_energy) override;
 	virtual void decal_set_albedo_mix(RID p_decal, float p_mix) override;
 	virtual void decal_set_modulate(RID p_decal, const Color &p_modulate) override;
@@ -677,7 +640,7 @@ public:
 		return decal->size;
 	}
 
-	_FORCE_INLINE_ RID decal_get_texture(RID p_decal, RSE::DecalTexture p_texture) {
+	_FORCE_INLINE_ RID decal_get_texture(RID p_decal, RS::DecalTexture p_texture) {
 		const Decal *decal = decal_owner.get_or_null(p_decal);
 		return decal->textures[p_texture];
 	}
@@ -794,8 +757,8 @@ public:
 	virtual bool render_target_get_direct_to_screen(RID p_render_target) const override;
 	virtual bool render_target_was_used(RID p_render_target) const override;
 	virtual void render_target_set_as_unused(RID p_render_target) override;
-	virtual void render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) override;
-	virtual RSE::ViewportMSAA render_target_get_msaa(RID p_render_target) const override;
+	virtual void render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) override;
+	virtual RS::ViewportMSAA render_target_get_msaa(RID p_render_target) const override;
 	virtual void render_target_set_msaa_needs_resolve(RID p_render_target, bool p_needs_resolve) override;
 	virtual bool render_target_get_msaa_needs_resolve(RID p_render_target) const override;
 	virtual void render_target_do_msaa_resolve(RID p_render_target) override;
@@ -815,7 +778,7 @@ public:
 	virtual void render_target_disable_clear_request(RID p_render_target) override;
 	virtual void render_target_do_clear_request(RID p_render_target) override;
 
-	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) override;
+	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) override;
 	RID render_target_get_sdf_texture(RID p_render_target);
 	RID render_target_get_sdf_framebuffer(RID p_render_target);
 	void render_target_sdf_process(RID p_render_target);
@@ -823,10 +786,10 @@ public:
 	virtual void render_target_mark_sdf_enabled(RID p_render_target, bool p_enabled) override;
 	bool render_target_is_sdf_enabled(RID p_render_target) const;
 
-	virtual void render_target_set_vrs_mode(RID p_render_target, RSE::ViewportVRSMode p_mode) override;
-	virtual RSE::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override;
-	virtual void render_target_set_vrs_update_mode(RID p_render_target, RSE::ViewportVRSUpdateMode p_mode) override;
-	virtual RSE::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override;
+	virtual void render_target_set_vrs_mode(RID p_render_target, RS::ViewportVRSMode p_mode) override;
+	virtual RS::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const override;
+	virtual void render_target_set_vrs_update_mode(RID p_render_target, RS::ViewportVRSUpdateMode p_mode) override;
+	virtual RS::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const override;
 	virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override;
 	virtual RID render_target_get_vrs_texture(RID p_render_target) const override;
 
@@ -841,12 +804,6 @@ public:
 	virtual void render_target_set_render_region(RID p_render_target, const Rect2i &p_render_region) override;
 	virtual Rect2i render_target_get_render_region(RID p_render_target) const override;
 
-	virtual void render_target_set_subsampled_enabled(RID p_render_target, bool p_enabled) override;
-	virtual bool render_target_is_subsampled_enabled(RID p_render_target) const override;
-
-	virtual void render_target_set_subsampled_allowed(RID p_render_target, bool p_allowed) override;
-	virtual bool render_target_is_subsampled_allowed(RID p_render_target) const override;
-
 	virtual RID render_target_get_texture(RID p_render_target) override;
 
 	virtual void render_target_set_velocity_target_size(RID p_render_target, const Size2i &p_target_size) override {}
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp b/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
index c6475e50..374eeb69 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
@@ -29,13 +29,12 @@
 /**************************************************************************/
 
 #include "utilities.h"
-
-#include "servers/rendering/renderer_rd/environment/fog.h"
-#include "servers/rendering/renderer_rd/environment/gi.h"
-#include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
+#include "../environment/fog.h"
+#include "../environment/gi.h"
+#include "light_storage.h"
+#include "mesh_storage.h"
+#include "particles_storage.h"
+#include "texture_storage.h"
 
 using namespace RendererRD;
 
@@ -51,42 +50,42 @@ Utilities::~Utilities() {
 
 /* INSTANCES */
 
-RSE::InstanceType Utilities::get_base_type(RID p_rid) const {
+RS::InstanceType Utilities::get_base_type(RID p_rid) const {
 	if (RendererRD::MeshStorage::get_singleton()->owns_mesh(p_rid)) {
-		return RSE::INSTANCE_MESH;
+		return RS::INSTANCE_MESH;
 	}
 	if (RendererRD::MeshStorage::get_singleton()->owns_multimesh(p_rid)) {
-		return RSE::INSTANCE_MULTIMESH;
+		return RS::INSTANCE_MULTIMESH;
 	}
 	if (RendererRD::LightStorage::get_singleton()->owns_reflection_probe(p_rid)) {
-		return RSE::INSTANCE_REFLECTION_PROBE;
+		return RS::INSTANCE_REFLECTION_PROBE;
 	}
 	if (RendererRD::TextureStorage::get_singleton()->owns_decal(p_rid)) {
-		return RSE::INSTANCE_DECAL;
+		return RS::INSTANCE_DECAL;
 	}
 	if (RendererRD::GI::get_singleton()->owns_voxel_gi(p_rid)) {
-		return RSE::INSTANCE_VOXEL_GI;
+		return RS::INSTANCE_VOXEL_GI;
 	}
 	if (RendererRD::LightStorage::get_singleton()->owns_light(p_rid)) {
-		return RSE::INSTANCE_LIGHT;
+		return RS::INSTANCE_LIGHT;
 	}
 	if (RendererRD::LightStorage::get_singleton()->owns_lightmap(p_rid)) {
-		return RSE::INSTANCE_LIGHTMAP;
+		return RS::INSTANCE_LIGHTMAP;
 	}
 	if (RendererRD::ParticlesStorage::get_singleton()->owns_particles(p_rid)) {
-		return RSE::INSTANCE_PARTICLES;
+		return RS::INSTANCE_PARTICLES;
 	}
 	if (RendererRD::ParticlesStorage::get_singleton()->owns_particles_collision(p_rid)) {
-		return RSE::INSTANCE_PARTICLES_COLLISION;
+		return RS::INSTANCE_PARTICLES_COLLISION;
 	}
 	if (RendererRD::Fog::get_singleton()->owns_fog_volume(p_rid)) {
-		return RSE::INSTANCE_FOG_VOLUME;
+		return RS::INSTANCE_FOG_VOLUME;
 	}
 	if (owns_visibility_notifier(p_rid)) {
-		return RSE::INSTANCE_VISIBLITY_NOTIFIER;
+		return RS::INSTANCE_VISIBLITY_NOTIFIER;
 	}
 
-	return RSE::INSTANCE_NONE;
+	return RS::INSTANCE_NONE;
 }
 
 bool Utilities::free(RID p_rid) {
@@ -300,12 +299,12 @@ void Utilities::update_memory_info() {
 	total_mem_cache = RenderingDevice::get_singleton()->get_memory_usage(RenderingDevice::MEMORY_TOTAL);
 }
 
-uint64_t Utilities::get_rendering_info(RSE::RenderingInfo p_info) {
-	if (p_info == RSE::RENDERING_INFO_TEXTURE_MEM_USED) {
+uint64_t Utilities::get_rendering_info(RS::RenderingInfo p_info) {
+	if (p_info == RS::RENDERING_INFO_TEXTURE_MEM_USED) {
 		return texture_mem_cache;
-	} else if (p_info == RSE::RENDERING_INFO_BUFFER_MEM_USED) {
+	} else if (p_info == RS::RENDERING_INFO_BUFFER_MEM_USED) {
 		return buffer_mem_cache;
-	} else if (p_info == RSE::RENDERING_INFO_VIDEO_MEM_USED) {
+	} else if (p_info == RS::RENDERING_INFO_VIDEO_MEM_USED) {
 		return total_mem_cache;
 	}
 	return 0;
@@ -319,7 +318,7 @@ String Utilities::get_video_adapter_vendor() const {
 	return RenderingDevice::get_singleton()->get_device_vendor_name();
 }
 
-RenderingDeviceEnums::DeviceType Utilities::get_video_adapter_type() const {
+RenderingDevice::DeviceType Utilities::get_video_adapter_type() const {
 	return RenderingDevice::get_singleton()->get_device_type();
 }
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/utilities.h b/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
index 5a1246ba..dc21b2f7 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
@@ -67,7 +67,7 @@ public:
 
 	/* INSTANCES */
 
-	virtual RSE::InstanceType get_base_type(RID p_rid) const override;
+	virtual RS::InstanceType get_base_type(RID p_rid) const override;
 	virtual bool free(RID p_rid) override;
 
 	/* DEPENDENCIES */
@@ -108,11 +108,11 @@ public:
 
 	virtual void update_memory_info() override;
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) override;
+	virtual uint64_t get_rendering_info(RS::RenderingInfo p_info) override;
 
 	virtual String get_video_adapter_name() const override;
 	virtual String get_video_adapter_vendor() const override;
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const override;
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const override;
 	virtual String get_video_adapter_api_version() const override;
 
 	virtual Size2i get_maximum_viewport_size() const override;
diff --git a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
index ff4602aa..54be667d 100644
--- a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
@@ -30,9 +30,6 @@
 
 #include "uniform_set_cache_rd.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_device_binds.h"
-
 UniformSetCacheRD *UniformSetCacheRD::singleton = nullptr;
 
 void UniformSetCacheRD::_bind_methods() {
diff --git a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
index f8f807db..ffbd5cf3 100644
--- a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
+++ b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
@@ -33,6 +33,7 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 class UniformSetCacheRD : public Object {
 	GDCLASS(UniformSetCacheRD, Object)
diff --git a/engine/servers/rendering/renderer_scene_cull.cpp b/engine/servers/rendering/renderer_scene_cull.cpp
index db875a69..8bcddc1b 100644
--- a/engine/servers/rendering/renderer_scene_cull.cpp
+++ b/engine/servers/rendering/renderer_scene_cull.cpp
@@ -30,23 +30,14 @@
 
 #include "renderer_scene_cull.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/math/geometry_3d.h"
-#include "core/object/callable_mp.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/rendering/rendering_light_culler.h"
-#include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_default.h"
+#include "rendering_light_culler.h"
+#include "rendering_server_default.h"
 
-#ifndef XR_DISABLED
-#include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_server.h"
-#endif
-
-//#define DEBUG_CULL_TIME
-#ifdef DEBUG_CULL_TIME
-#include "core/os/os.h"
+#if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
+// This is used only to obtain node paths for user-friendly physics interpolation warnings.
+#include "scene/main/node.h"
 #endif
 
 /* HALTON SEQUENCE */
@@ -183,7 +174,7 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 		SWAP(A, B); //lesser always first
 	}
 
-	if (B->base_type == RSE::INSTANCE_LIGHT && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	if (B->base_type == RS::INSTANCE_LIGHT && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceLightData *light = static_cast<InstanceLightData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -220,7 +211,7 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 			}
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_REFLECTION_PROBE) && B->base_type == RSE::INSTANCE_REFLECTION_PROBE && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_REFLECTION_PROBE) && B->base_type == RS::INSTANCE_REFLECTION_PROBE && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		if (!(A->layer_mask & RSG::light_storage->reflection_probe_get_reflection_mask(B->base))) {
 			// Early return if the object's layer mask doesn't match the reflection mask.
 			return;
@@ -237,7 +228,7 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_REFLECTION_DIRTY;
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_DECAL) && B->base_type == RSE::INSTANCE_DECAL && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_DECAL) && B->base_type == RS::INSTANCE_DECAL && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceDecalData *decal = static_cast<InstanceDecalData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -254,7 +245,7 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_DECAL_DIRTY;
 		}
 
-	} else if (B->base_type == RSE::INSTANCE_LIGHTMAP && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (B->base_type == RS::INSTANCE_LIGHTMAP && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceLightmapData *lightmap_data = static_cast<InstanceLightmapData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -269,7 +260,7 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 			((RendererSceneCull *)self)->_instance_queue_update(A, false, false); //need to update capture
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_VOXEL_GI) && B->base_type == RSE::INSTANCE_VOXEL_GI && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_VOXEL_GI) && B->base_type == RS::INSTANCE_VOXEL_GI && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -286,10 +277,10 @@ void RendererSceneCull::_instance_pair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_VOXEL_GI_DIRTY;
 		}
 
-	} else if (B->base_type == RSE::INSTANCE_VOXEL_GI && A->base_type == RSE::INSTANCE_LIGHT) {
+	} else if (B->base_type == RS::INSTANCE_VOXEL_GI && A->base_type == RS::INSTANCE_LIGHT) {
 		InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(B->base_data);
 		voxel_gi->lights.insert(A);
-	} else if (B->base_type == RSE::INSTANCE_PARTICLES_COLLISION && A->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (B->base_type == RS::INSTANCE_PARTICLES_COLLISION && A->base_type == RS::INSTANCE_PARTICLES) {
 		InstanceParticlesCollisionData *collision = static_cast<InstanceParticlesCollisionData *>(B->base_data);
 
 		if ((collision->cull_mask & A->layer_mask)) {
@@ -308,7 +299,7 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 		SWAP(A, B); //lesser always first
 	}
 
-	if (B->base_type == RSE::INSTANCE_LIGHT && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	if (B->base_type == RS::INSTANCE_LIGHT && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceLightData *light = static_cast<InstanceLightData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -355,7 +346,7 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 			}
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_REFLECTION_PROBE) && B->base_type == RSE::INSTANCE_REFLECTION_PROBE && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_REFLECTION_PROBE) && B->base_type == RS::INSTANCE_REFLECTION_PROBE && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceReflectionProbeData *reflection_probe = static_cast<InstanceReflectionProbeData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -367,7 +358,7 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_REFLECTION_DIRTY;
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_DECAL) && B->base_type == RSE::INSTANCE_DECAL && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_DECAL) && B->base_type == RS::INSTANCE_DECAL && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceDecalData *decal = static_cast<InstanceDecalData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -384,7 +375,7 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_DECAL_DIRTY;
 		}
 
-	} else if (B->base_type == RSE::INSTANCE_LIGHTMAP && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (B->base_type == RS::INSTANCE_LIGHTMAP && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceLightmapData *lightmap_data = static_cast<InstanceLightmapData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 		if (A->dynamic_gi) {
@@ -399,7 +390,7 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 			self->_instance_queue_update(A, false, false); //need to update capture
 		}
 
-	} else if (self->geometry_instance_pair_mask & (1 << RSE::INSTANCE_VOXEL_GI) && B->base_type == RSE::INSTANCE_VOXEL_GI && ((1 << A->base_type) & RSE::INSTANCE_GEOMETRY_MASK)) {
+	} else if (self->geometry_instance_pair_mask & (1 << RS::INSTANCE_VOXEL_GI) && B->base_type == RS::INSTANCE_VOXEL_GI && ((1 << A->base_type) & RS::INSTANCE_GEOMETRY_MASK)) {
 		InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(B->base_data);
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(A->base_data);
 
@@ -415,10 +406,10 @@ void RendererSceneCull::_instance_unpair(Instance *p_A, Instance *p_B) {
 			idata.flags |= InstanceData::FLAG_GEOM_VOXEL_GI_DIRTY;
 		}
 
-	} else if (B->base_type == RSE::INSTANCE_VOXEL_GI && A->base_type == RSE::INSTANCE_LIGHT) {
+	} else if (B->base_type == RS::INSTANCE_VOXEL_GI && A->base_type == RS::INSTANCE_LIGHT) {
 		InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(B->base_data);
 		voxel_gi->lights.erase(A);
-	} else if (B->base_type == RSE::INSTANCE_PARTICLES_COLLISION && A->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (B->base_type == RS::INSTANCE_PARTICLES_COLLISION && A->base_type == RS::INSTANCE_PARTICLES) {
 		InstanceParticlesCollisionData *collision = static_cast<InstanceParticlesCollisionData *>(B->base_data);
 
 		if ((collision->cull_mask & A->layer_mask)) {
@@ -584,7 +575,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 
 	Scenario *scenario = instance->scenario;
 
-	if (instance->base_type != RSE::INSTANCE_NONE) {
+	if (instance->base_type != RS::INSTANCE_NONE) {
 		//free anything related to that base
 
 		if (scenario && instance->indexer_id.is_valid()) {
@@ -598,16 +589,16 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 		}
 
 		switch (instance->base_type) {
-			case RSE::INSTANCE_MESH:
-			case RSE::INSTANCE_MULTIMESH:
-			case RSE::INSTANCE_PARTICLES: {
+			case RS::INSTANCE_MESH:
+			case RS::INSTANCE_MULTIMESH:
+			case RS::INSTANCE_PARTICLES: {
 				InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 				scene_render->geometry_instance_free(geom->geometry_instance);
 			} break;
-			case RSE::INSTANCE_LIGHT: {
+			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light = static_cast<InstanceLightData *>(instance->base_data);
 
-				if (scenario && instance->visible && RSG::light_storage->light_get_type(instance->base) != RSE::LIGHT_DIRECTIONAL && light->bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
+				if (scenario && instance->visible && RSG::light_storage->light_get_type(instance->base) != RS::LIGHT_DIRECTIONAL && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
 					scenario->dynamic_lights.erase(light->instance);
 				}
 
@@ -622,30 +613,30 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				}
 				RSG::light_storage->light_instance_free(light->instance);
 			} break;
-			case RSE::INSTANCE_PARTICLES_COLLISION: {
+			case RS::INSTANCE_PARTICLES_COLLISION: {
 				InstanceParticlesCollisionData *collision = static_cast<InstanceParticlesCollisionData *>(instance->base_data);
 				RSG::utilities->free(collision->instance);
 			} break;
-			case RSE::INSTANCE_FOG_VOLUME: {
+			case RS::INSTANCE_FOG_VOLUME: {
 				InstanceFogVolumeData *volume = static_cast<InstanceFogVolumeData *>(instance->base_data);
 				scene_render->free(volume->instance);
 			} break;
-			case RSE::INSTANCE_VISIBLITY_NOTIFIER: {
+			case RS::INSTANCE_VISIBLITY_NOTIFIER: {
 				//none
 			} break;
-			case RSE::INSTANCE_REFLECTION_PROBE: {
+			case RS::INSTANCE_REFLECTION_PROBE: {
 				InstanceReflectionProbeData *reflection_probe = static_cast<InstanceReflectionProbeData *>(instance->base_data);
 				RSG::light_storage->reflection_probe_instance_free(reflection_probe->instance);
 				if (reflection_probe->update_list.in_list()) {
 					reflection_probe_render_list.remove(&reflection_probe->update_list);
 				}
 			} break;
-			case RSE::INSTANCE_DECAL: {
+			case RS::INSTANCE_DECAL: {
 				InstanceDecalData *decal = static_cast<InstanceDecalData *>(instance->base_data);
 				RSG::texture_storage->decal_instance_free(decal->instance);
 
 			} break;
-			case RSE::INSTANCE_LIGHTMAP: {
+			case RS::INSTANCE_LIGHTMAP: {
 				InstanceLightmapData *lightmap_data = static_cast<InstanceLightmapData *>(instance->base_data);
 				//erase dependencies, since no longer a lightmap
 				while (lightmap_data->users.begin()) {
@@ -653,7 +644,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				}
 				RSG::light_storage->lightmap_instance_free(lightmap_data->instance);
 			} break;
-			case RSE::INSTANCE_VOXEL_GI: {
+			case RS::INSTANCE_VOXEL_GI: {
 				InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(instance->base_data);
 #ifdef DEBUG_ENABLED
 				if (voxel_gi->geometries.size()) {
@@ -672,7 +663,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				scene_render->free(voxel_gi->probe_instance);
 
 			} break;
-			case RSE::INSTANCE_OCCLUDER: {
+			case RS::INSTANCE_OCCLUDER: {
 				if (scenario && instance->visible) {
 					RendererSceneOcclusionCull::get_singleton()->scenario_remove_instance(instance->scenario->self, p_instance);
 				}
@@ -689,26 +680,26 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 		instance->materials.clear();
 	}
 
-	instance->base_type = RSE::INSTANCE_NONE;
+	instance->base_type = RS::INSTANCE_NONE;
 	instance->base = RID();
 
 	if (p_base.is_valid()) {
 		instance->base_type = RSG::utilities->get_base_type(p_base);
 
 		// fix up a specific malfunctioning case before the switch, so it can be handled
-		if (instance->base_type == RSE::INSTANCE_NONE && RendererSceneOcclusionCull::get_singleton()->is_occluder(p_base)) {
-			instance->base_type = RSE::INSTANCE_OCCLUDER;
+		if (instance->base_type == RS::INSTANCE_NONE && RendererSceneOcclusionCull::get_singleton()->is_occluder(p_base)) {
+			instance->base_type = RS::INSTANCE_OCCLUDER;
 		}
 
 		switch (instance->base_type) {
-			case RSE::INSTANCE_NONE: {
+			case RS::INSTANCE_NONE: {
 				ERR_PRINT_ONCE("unimplemented base type encountered in renderer scene cull");
 				return;
 			}
-			case RSE::INSTANCE_LIGHT: {
+			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light = memnew(InstanceLightData);
 
-				if (scenario && RSG::light_storage->light_get_type(p_base) == RSE::LIGHT_DIRECTIONAL) {
+				if (scenario && RSG::light_storage->light_get_type(p_base) == RS::LIGHT_DIRECTIONAL) {
 					light->D = scenario->directional_lights.push_back(instance);
 				}
 
@@ -716,9 +707,9 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 
 				instance->base_data = light;
 			} break;
-			case RSE::INSTANCE_MESH:
-			case RSE::INSTANCE_MULTIMESH:
-			case RSE::INSTANCE_PARTICLES: {
+			case RS::INSTANCE_MESH:
+			case RS::INSTANCE_MULTIMESH:
+			case RS::INSTANCE_PARTICLES: {
 				InstanceGeometryData *geom = memnew(InstanceGeometryData);
 				instance->base_data = geom;
 				geom->geometry_instance = scene_render->geometry_instance_create(p_base);
@@ -738,7 +729,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				geom->geometry_instance->set_use_dynamic_gi(instance->dynamic_gi);
 				geom->geometry_instance->set_use_lightmap(RID(), instance->lightmap_uv_scale, instance->lightmap_slice_index);
 				geom->geometry_instance->set_instance_shader_uniforms_offset(instance->instance_uniforms.location());
-				geom->geometry_instance->set_cast_double_sided_shadows(instance->cast_shadows == RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
+				geom->geometry_instance->set_cast_double_sided_shadows(instance->cast_shadows == RS::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
 				if (instance->lightmap_sh.size() == 9) {
 					geom->geometry_instance->set_lightmap_capture(instance->lightmap_sh.ptr());
 				}
@@ -750,31 +741,31 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 					dep_instance->scenario->instance_data[dep_instance->array_index].parent_array_index = instance->array_index;
 				}
 			} break;
-			case RSE::INSTANCE_PARTICLES_COLLISION: {
+			case RS::INSTANCE_PARTICLES_COLLISION: {
 				InstanceParticlesCollisionData *collision = memnew(InstanceParticlesCollisionData);
 				collision->instance = RSG::particles_storage->particles_collision_instance_create(p_base);
 				RSG::particles_storage->particles_collision_instance_set_active(collision->instance, instance->visible);
 				instance->base_data = collision;
 			} break;
-			case RSE::INSTANCE_FOG_VOLUME: {
+			case RS::INSTANCE_FOG_VOLUME: {
 				InstanceFogVolumeData *volume = memnew(InstanceFogVolumeData);
 				volume->instance = scene_render->fog_volume_instance_create(p_base);
 				scene_render->fog_volume_instance_set_active(volume->instance, instance->visible);
 				instance->base_data = volume;
 			} break;
-			case RSE::INSTANCE_VISIBLITY_NOTIFIER: {
+			case RS::INSTANCE_VISIBLITY_NOTIFIER: {
 				InstanceVisibilityNotifierData *vnd = memnew(InstanceVisibilityNotifierData);
 				vnd->base = p_base;
 				instance->base_data = vnd;
 			} break;
-			case RSE::INSTANCE_REFLECTION_PROBE: {
+			case RS::INSTANCE_REFLECTION_PROBE: {
 				InstanceReflectionProbeData *reflection_probe = memnew(InstanceReflectionProbeData);
 				reflection_probe->owner = instance;
 				instance->base_data = reflection_probe;
 
 				reflection_probe->instance = RSG::light_storage->reflection_probe_instance_create(p_base);
 			} break;
-			case RSE::INSTANCE_DECAL: {
+			case RS::INSTANCE_DECAL: {
 				InstanceDecalData *decal = memnew(InstanceDecalData);
 				decal->owner = instance;
 				instance->base_data = decal;
@@ -782,12 +773,12 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				decal->instance = RSG::texture_storage->decal_instance_create(p_base);
 				RSG::texture_storage->decal_instance_set_sorting_offset(decal->instance, instance->sorting_offset);
 			} break;
-			case RSE::INSTANCE_LIGHTMAP: {
+			case RS::INSTANCE_LIGHTMAP: {
 				InstanceLightmapData *lightmap_data = memnew(InstanceLightmapData);
 				instance->base_data = lightmap_data;
 				lightmap_data->instance = RSG::light_storage->lightmap_instance_create(p_base);
 			} break;
-			case RSE::INSTANCE_VOXEL_GI: {
+			case RS::INSTANCE_VOXEL_GI: {
 				InstanceVoxelGIData *voxel_gi = memnew(InstanceVoxelGIData);
 				instance->base_data = voxel_gi;
 				voxel_gi->owner = instance;
@@ -799,7 +790,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 				voxel_gi->probe_instance = scene_render->voxel_gi_instance_create(p_base);
 
 			} break;
-			case RSE::INSTANCE_OCCLUDER: {
+			case RS::INSTANCE_OCCLUDER: {
 				if (scenario) {
 					RendererSceneOcclusionCull::get_singleton()->scenario_set_instance(scenario->self, p_instance, p_base, instance->transform, instance->visible);
 				}
@@ -810,7 +801,7 @@ void RendererSceneCull::instance_set_base(RID p_instance, RID p_base) {
 
 		instance->base = p_base;
 
-		if (instance->base_type == RSE::INSTANCE_MESH) {
+		if (instance->base_type == RS::INSTANCE_MESH) {
 			_instance_update_mesh_instance(instance);
 		}
 
@@ -833,9 +824,9 @@ void RendererSceneCull::instance_set_scenario(RID p_instance, RID p_scenario) {
 		}
 
 		switch (instance->base_type) {
-			case RSE::INSTANCE_LIGHT: {
+			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light = static_cast<InstanceLightData *>(instance->base_data);
-				if (instance->visible && RSG::light_storage->light_get_type(instance->base) != RSE::LIGHT_DIRECTIONAL && light->bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
+				if (instance->visible && RSG::light_storage->light_get_type(instance->base) != RS::LIGHT_DIRECTIONAL && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
 					instance->scenario->dynamic_lights.erase(light->instance);
 				}
 
@@ -849,15 +840,15 @@ void RendererSceneCull::instance_set_scenario(RID p_instance, RID p_scenario) {
 					light->D = nullptr;
 				}
 			} break;
-			case RSE::INSTANCE_REFLECTION_PROBE: {
+			case RS::INSTANCE_REFLECTION_PROBE: {
 				InstanceReflectionProbeData *reflection_probe = static_cast<InstanceReflectionProbeData *>(instance->base_data);
 				RSG::light_storage->reflection_probe_release_atlas_index(reflection_probe->instance);
 
 			} break;
-			case RSE::INSTANCE_PARTICLES_COLLISION: {
+			case RS::INSTANCE_PARTICLES_COLLISION: {
 				heightfield_particle_colliders_update_list.erase(instance);
 			} break;
-			case RSE::INSTANCE_VOXEL_GI: {
+			case RS::INSTANCE_VOXEL_GI: {
 				InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(instance->base_data);
 
 #ifdef DEBUG_ENABLED
@@ -875,7 +866,7 @@ void RendererSceneCull::instance_set_scenario(RID p_instance, RID p_scenario) {
 					voxel_gi_update_list.remove(&voxel_gi->update_element);
 				}
 			} break;
-			case RSE::INSTANCE_OCCLUDER: {
+			case RS::INSTANCE_OCCLUDER: {
 				if (instance->visible) {
 					RendererSceneOcclusionCull::get_singleton()->scenario_remove_instance(instance->scenario->self, p_instance);
 				}
@@ -896,20 +887,20 @@ void RendererSceneCull::instance_set_scenario(RID p_instance, RID p_scenario) {
 		scenario->instances.add(&instance->scenario_item);
 
 		switch (instance->base_type) {
-			case RSE::INSTANCE_LIGHT: {
+			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light = static_cast<InstanceLightData *>(instance->base_data);
 
-				if (RSG::light_storage->light_get_type(instance->base) == RSE::LIGHT_DIRECTIONAL) {
+				if (RSG::light_storage->light_get_type(instance->base) == RS::LIGHT_DIRECTIONAL) {
 					light->D = scenario->directional_lights.push_back(instance);
 				}
 			} break;
-			case RSE::INSTANCE_VOXEL_GI: {
+			case RS::INSTANCE_VOXEL_GI: {
 				InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(instance->base_data);
 				if (!voxel_gi->update_element.in_list()) {
 					voxel_gi_update_list.add(&voxel_gi->update_element);
 				}
 			} break;
-			case RSE::INSTANCE_OCCLUDER: {
+			case RS::INSTANCE_OCCLUDER: {
 				RendererSceneOcclusionCull::get_singleton()->scenario_set_instance(scenario->self, p_instance, instance->base, instance->transform, instance->visible);
 			} break;
 			default: {
@@ -930,8 +921,8 @@ void RendererSceneCull::instance_set_layer_mask(RID p_instance, uint32_t p_mask)
 
 	// Particles always need to be unpaired. Geometry may need to be unpaired, but only if lights or decals use pairing.
 	// Needs to happen before layer mask changes so we can avoid attempting to unpair something that was never paired.
-	if (instance->base_type == RSE::INSTANCE_PARTICLES ||
-			(((geometry_instance_pair_mask & (1 << RSE::INSTANCE_LIGHT)) || (geometry_instance_pair_mask & (1 << RSE::INSTANCE_DECAL))) && ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK))) {
+	if (instance->base_type == RS::INSTANCE_PARTICLES ||
+			(((geometry_instance_pair_mask & (1 << RS::INSTANCE_LIGHT)) || (geometry_instance_pair_mask & (1 << RS::INSTANCE_DECAL))) && ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK))) {
 		_unpair_instance(instance);
 		singleton->_instance_queue_update(instance, false, false);
 	}
@@ -941,7 +932,7 @@ void RendererSceneCull::instance_set_layer_mask(RID p_instance, uint32_t p_mask)
 		instance->scenario->instance_data[instance->array_index].layer_mask = p_mask;
 	}
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_layer_mask(p_mask);
@@ -962,11 +953,11 @@ void RendererSceneCull::instance_set_pivot_data(RID p_instance, float p_sorting_
 	instance->sorting_offset = p_sorting_offset;
 	instance->use_aabb_center = p_use_aabb_center;
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_pivot_data(p_sorting_offset, p_use_aabb_center);
-	} else if (instance->base_type == RSE::INSTANCE_DECAL && instance->base_data) {
+	} else if (instance->base_type == RS::INSTANCE_DECAL && instance->base_data) {
 		InstanceDecalData *decal = static_cast<InstanceDecalData *>(instance->base_data);
 		RSG::texture_storage->decal_instance_set_sorting_offset(decal->instance, instance->sorting_offset);
 	}
@@ -978,7 +969,7 @@ void RendererSceneCull::instance_geometry_set_transparency(RID p_instance, float
 
 	instance->transparency = p_transparency;
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_transparency(p_transparency);
@@ -1031,7 +1022,7 @@ void RendererSceneCull::instance_set_surface_override_material(RID p_instance, i
 	Instance *instance = instance_owner.get_or_null(p_instance);
 	ERR_FAIL_NULL(instance);
 
-	if (instance->base_type == RSE::INSTANCE_MESH) {
+	if (instance->base_type == RS::INSTANCE_MESH) {
 		//may not have been updated yet, may also have not been set yet. When updated will be correcte, worst case
 		instance->materials.resize(MAX(p_surface + 1, RSG::mesh_storage->mesh_get_surface_count(instance->base)));
 	}
@@ -1061,9 +1052,9 @@ void RendererSceneCull::instance_set_visible(RID p_instance, bool p_visible) {
 		_unpair_instance(instance);
 	}
 
-	if (instance->base_type == RSE::INSTANCE_LIGHT) {
+	if (instance->base_type == RS::INSTANCE_LIGHT) {
 		InstanceLightData *light = static_cast<InstanceLightData *>(instance->base_data);
-		if (instance->scenario && RSG::light_storage->light_get_type(instance->base) != RSE::LIGHT_DIRECTIONAL && light->bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
+		if (instance->scenario && RSG::light_storage->light_get_type(instance->base) != RS::LIGHT_DIRECTIONAL && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
 			if (p_visible) {
 				instance->scenario->dynamic_lights.push_back(light->instance);
 			} else {
@@ -1072,17 +1063,17 @@ void RendererSceneCull::instance_set_visible(RID p_instance, bool p_visible) {
 		}
 	}
 
-	if (instance->base_type == RSE::INSTANCE_PARTICLES_COLLISION) {
+	if (instance->base_type == RS::INSTANCE_PARTICLES_COLLISION) {
 		InstanceParticlesCollisionData *collision = static_cast<InstanceParticlesCollisionData *>(instance->base_data);
 		RSG::particles_storage->particles_collision_instance_set_active(collision->instance, p_visible);
 	}
 
-	if (instance->base_type == RSE::INSTANCE_FOG_VOLUME) {
+	if (instance->base_type == RS::INSTANCE_FOG_VOLUME) {
 		InstanceFogVolumeData *volume = static_cast<InstanceFogVolumeData *>(instance->base_data);
 		scene_render->fog_volume_instance_set_active(volume->instance, p_visible);
 	}
 
-	if (instance->base_type == RSE::INSTANCE_OCCLUDER) {
+	if (instance->base_type == RS::INSTANCE_OCCLUDER) {
 		if (instance->scenario) {
 			RendererSceneOcclusionCull::get_singleton()->scenario_set_instance(instance->scenario->self, p_instance, instance->base, instance->transform, p_visible);
 		}
@@ -1136,7 +1127,7 @@ void RendererSceneCull::instance_attach_skeleton(RID p_instance, RID p_skeleton)
 
 	_instance_queue_update(instance, true, true);
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		_instance_update_mesh_instance(instance);
 
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
@@ -1240,14 +1231,14 @@ Vector<ObjectID> RendererSceneCull::instances_cull_convex(const Vector<Plane> &p
 	return cull_convex.instances;
 }
 
-void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RSE::InstanceFlags p_flags, bool p_enabled) {
+void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RS::InstanceFlags p_flags, bool p_enabled) {
 	Instance *instance = instance_owner.get_or_null(p_instance);
 	ERR_FAIL_NULL(instance);
 
-	//ERR_FAIL_COND(((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK));
+	//ERR_FAIL_COND(((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK));
 
 	switch (p_flags) {
-		case RSE::INSTANCE_FLAG_USE_BAKED_LIGHT: {
+		case RS::INSTANCE_FLAG_USE_BAKED_LIGHT: {
 			instance->baked_light = p_enabled;
 
 			if (instance->scenario && instance->array_index >= 0) {
@@ -1259,14 +1250,14 @@ void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RSE::Instance
 				}
 			}
 
-			if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+			if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 				InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 				ERR_FAIL_NULL(geom->geometry_instance);
 				geom->geometry_instance->set_use_baked_light(p_enabled);
 			}
 
 		} break;
-		case RSE::INSTANCE_FLAG_USE_DYNAMIC_GI: {
+		case RS::INSTANCE_FLAG_USE_DYNAMIC_GI: {
 			if (p_enabled == instance->dynamic_gi) {
 				//bye, redundant
 				return;
@@ -1280,14 +1271,14 @@ void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RSE::Instance
 			//once out of octree, can be changed
 			instance->dynamic_gi = p_enabled;
 
-			if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+			if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 				InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 				ERR_FAIL_NULL(geom->geometry_instance);
 				geom->geometry_instance->set_use_dynamic_gi(p_enabled);
 			}
 
 		} break;
-		case RSE::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE: {
+		case RS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE: {
 			instance->redraw_if_visible = p_enabled;
 
 			if (instance->scenario && instance->array_index >= 0) {
@@ -1300,7 +1291,7 @@ void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RSE::Instance
 			}
 
 		} break;
-		case RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING: {
+		case RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING: {
 			instance->ignore_occlusion_culling = p_enabled;
 
 			if (instance->scenario && instance->array_index >= 0) {
@@ -1317,7 +1308,7 @@ void RendererSceneCull::instance_geometry_set_flag(RID p_instance, RSE::Instance
 	}
 }
 
-void RendererSceneCull::instance_geometry_set_cast_shadows_setting(RID p_instance, RSE::ShadowCastingSetting p_shadow_casting_setting) {
+void RendererSceneCull::instance_geometry_set_cast_shadows_setting(RID p_instance, RS::ShadowCastingSetting p_shadow_casting_setting) {
 	Instance *instance = instance_owner.get_or_null(p_instance);
 	ERR_FAIL_NULL(instance);
 
@@ -1326,24 +1317,24 @@ void RendererSceneCull::instance_geometry_set_cast_shadows_setting(RID p_instanc
 	if (instance->scenario && instance->array_index >= 0) {
 		InstanceData &idata = instance->scenario->instance_data[instance->array_index];
 
-		if (instance->cast_shadows != RSE::SHADOW_CASTING_SETTING_OFF) {
+		if (instance->cast_shadows != RS::SHADOW_CASTING_SETTING_OFF) {
 			idata.flags |= InstanceData::FLAG_CAST_SHADOWS;
 		} else {
 			idata.flags &= ~InstanceData::FLAG_CAST_SHADOWS;
 		}
 
-		if (instance->cast_shadows == RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY) {
+		if (instance->cast_shadows == RS::SHADOW_CASTING_SETTING_SHADOWS_ONLY) {
 			idata.flags |= InstanceData::FLAG_CAST_SHADOWS_ONLY;
 		} else {
 			idata.flags &= ~InstanceData::FLAG_CAST_SHADOWS_ONLY;
 		}
 	}
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 
-		geom->geometry_instance->set_cast_double_sided_shadows(instance->cast_shadows == RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
+		geom->geometry_instance->set_cast_double_sided_shadows(instance->cast_shadows == RS::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
 	}
 
 	_instance_queue_update(instance, false, true);
@@ -1356,7 +1347,7 @@ void RendererSceneCull::instance_geometry_set_material_override(RID p_instance,
 	instance->material_override = p_material;
 	_instance_queue_update(instance, false, true);
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_material_override(p_material);
@@ -1370,14 +1361,14 @@ void RendererSceneCull::instance_geometry_set_material_overlay(RID p_instance, R
 	instance->material_overlay = p_material;
 	_instance_queue_update(instance, false, true);
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_material_overlay(p_material);
 	}
 }
 
-void RendererSceneCull::instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RSE::VisibilityRangeFadeMode p_fade_mode) {
+void RendererSceneCull::instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RS::VisibilityRangeFadeMode p_fade_mode) {
 	Instance *instance = instance_owner.get_or_null(p_instance);
 	ERR_FAIL_NULL(instance);
 
@@ -1463,7 +1454,7 @@ bool RendererSceneCull::_update_instance_visibility_depth(Instance *p_instance)
 }
 
 void RendererSceneCull::_update_instance_visibility_dependencies(Instance *p_instance) const {
-	bool is_geometry_instance = ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) && p_instance->base_data;
+	bool is_geometry_instance = ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) && p_instance->base_data;
 	bool has_visibility_range = p_instance->visibility_range_begin > 0.0 || p_instance->visibility_range_end > 0.0;
 	bool needs_visibility_cull = has_visibility_range && is_geometry_instance && p_instance->array_index != -1;
 
@@ -1489,7 +1480,7 @@ void RendererSceneCull::_update_instance_visibility_dependencies(Instance *p_ins
 		idata.visibility_index = p_instance->visibility_index;
 
 		if (is_geometry_instance) {
-			if (has_visibility_range && p_instance->visibility_range_fade_mode == RSE::VISIBILITY_RANGE_FADE_SELF) {
+			if (has_visibility_range && p_instance->visibility_range_fade_mode == RS::VISIBILITY_RANGE_FADE_SELF) {
 				bool begin_enabled = p_instance->visibility_range_begin > 0.0f;
 				float begin_min = p_instance->visibility_range_begin - p_instance->visibility_range_begin_margin;
 				float begin_max = p_instance->visibility_range_begin + p_instance->visibility_range_begin_margin;
@@ -1543,7 +1534,7 @@ void RendererSceneCull::instance_geometry_set_lightmap(RID p_instance, RID p_lig
 		lightmap_instance_rid = lightmap_data->instance;
 	}
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_use_lightmap(lightmap_instance_rid, p_lightmap_uv_scale, p_slice_index);
@@ -1556,7 +1547,7 @@ void RendererSceneCull::instance_geometry_set_lod_bias(RID p_instance, float p_l
 
 	instance->lod_bias = p_lod_bias;
 
-	if ((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK && instance->base_data) {
+	if ((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK && instance->base_data) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 		geom->geometry_instance->set_lod_bias(p_lod_bias);
@@ -1588,7 +1579,7 @@ void RendererSceneCull::mesh_generate_pipelines(RID p_mesh, bool p_background_co
 	scene_render->mesh_generate_pipelines(p_mesh, p_background_compilation);
 }
 
-uint32_t RendererSceneCull::get_pipeline_compilations(RSE::PipelineSource p_source) {
+uint32_t RendererSceneCull::get_pipeline_compilations(RS::PipelineSource p_source) {
 	return scene_render->get_pipeline_compilations(p_source);
 }
 
@@ -1616,22 +1607,22 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 	// However it does seem that using the interpolated transform (transform) works for keeping AABBs
 	// up to date to avoid culling errors.
 
-	if (p_instance->base_type == RSE::INSTANCE_LIGHT) {
+	if (p_instance->base_type == RS::INSTANCE_LIGHT) {
 		InstanceLightData *light = static_cast<InstanceLightData *>(p_instance->base_data);
 
 		RSG::light_storage->light_instance_set_transform(light->instance, *instance_xform);
 		RSG::light_storage->light_instance_set_aabb(light->instance, instance_xform->xform(p_instance->aabb));
 		light->make_shadow_dirty();
 
-		RSE::LightBakeMode bake_mode = RSG::light_storage->light_get_bake_mode(p_instance->base);
-		if (RSG::light_storage->light_get_type(p_instance->base) != RSE::LIGHT_DIRECTIONAL && bake_mode != light->bake_mode) {
-			if (p_instance->visible && p_instance->scenario && light->bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
+		RS::LightBakeMode bake_mode = RSG::light_storage->light_get_bake_mode(p_instance->base);
+		if (RSG::light_storage->light_get_type(p_instance->base) != RS::LIGHT_DIRECTIONAL && bake_mode != light->bake_mode) {
+			if (p_instance->visible && p_instance->scenario && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
 				p_instance->scenario->dynamic_lights.erase(light->instance);
 			}
 
 			light->bake_mode = bake_mode;
 
-			if (p_instance->visible && p_instance->scenario && light->bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
+			if (p_instance->visible && p_instance->scenario && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
 				p_instance->scenario->dynamic_lights.push_back(light->instance);
 			}
 		}
@@ -1641,7 +1632,7 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 			light->max_sdfgi_cascade = max_sdfgi_cascade; //should most likely make sdfgi dirty in scenario
 		}
 		light->cull_mask = RSG::light_storage->light_get_cull_mask(p_instance->base);
-	} else if (p_instance->base_type == RSE::INSTANCE_REFLECTION_PROBE) {
+	} else if (p_instance->base_type == RS::INSTANCE_REFLECTION_PROBE) {
 		InstanceReflectionProbeData *reflection_probe = static_cast<InstanceReflectionProbeData *>(p_instance->base_data);
 
 		RSG::light_storage->reflection_probe_instance_set_transform(reflection_probe->instance, *instance_xform);
@@ -1650,22 +1641,22 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 			InstanceData &idata = p_instance->scenario->instance_data[p_instance->array_index];
 			idata.flags |= InstanceData::FLAG_REFLECTION_PROBE_DIRTY;
 		}
-	} else if (p_instance->base_type == RSE::INSTANCE_DECAL) {
+	} else if (p_instance->base_type == RS::INSTANCE_DECAL) {
 		InstanceDecalData *decal = static_cast<InstanceDecalData *>(p_instance->base_data);
 
 		RSG::texture_storage->decal_instance_set_transform(decal->instance, *instance_xform);
 		decal->cull_mask = RSG::texture_storage->decal_get_cull_mask(p_instance->base);
-	} else if (p_instance->base_type == RSE::INSTANCE_LIGHTMAP) {
+	} else if (p_instance->base_type == RS::INSTANCE_LIGHTMAP) {
 		InstanceLightmapData *lightmap = static_cast<InstanceLightmapData *>(p_instance->base_data);
 
 		RSG::light_storage->lightmap_instance_set_transform(lightmap->instance, *instance_xform);
-	} else if (p_instance->base_type == RSE::INSTANCE_VOXEL_GI) {
+	} else if (p_instance->base_type == RS::INSTANCE_VOXEL_GI) {
 		InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(p_instance->base_data);
 
 		scene_render->voxel_gi_instance_set_transform_to_data(voxel_gi->probe_instance, *instance_xform);
-	} else if (p_instance->base_type == RSE::INSTANCE_PARTICLES) {
+	} else if (p_instance->base_type == RS::INSTANCE_PARTICLES) {
 		RSG::particles_storage->particles_set_emission_transform(p_instance->base, *instance_xform);
-	} else if (p_instance->base_type == RSE::INSTANCE_PARTICLES_COLLISION) {
+	} else if (p_instance->base_type == RS::INSTANCE_PARTICLES_COLLISION) {
 		InstanceParticlesCollisionData *collision = static_cast<InstanceParticlesCollisionData *>(p_instance->base_data);
 
 		//remove materials no longer used and un-own them
@@ -1674,14 +1665,14 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 		}
 		RSG::particles_storage->particles_collision_instance_set_transform(collision->instance, *instance_xform);
 		collision->cull_mask = RSG::particles_storage->particles_collision_get_cull_mask(p_instance->base);
-	} else if (p_instance->base_type == RSE::INSTANCE_FOG_VOLUME) {
+	} else if (p_instance->base_type == RS::INSTANCE_FOG_VOLUME) {
 		InstanceFogVolumeData *volume = static_cast<InstanceFogVolumeData *>(p_instance->base_data);
 		scene_render->fog_volume_instance_set_transform(volume->instance, *instance_xform);
-	} else if (p_instance->base_type == RSE::INSTANCE_OCCLUDER) {
+	} else if (p_instance->base_type == RS::INSTANCE_OCCLUDER) {
 		if (p_instance->scenario) {
 			RendererSceneOcclusionCull::get_singleton()->scenario_set_instance(p_instance->scenario->self, p_instance->self, p_instance->base, *instance_xform, p_instance->visible);
 		}
-	} else if (p_instance->base_type == RSE::INSTANCE_NONE) {
+	} else if (p_instance->base_type == RS::INSTANCE_NONE) {
 		return;
 	}
 
@@ -1689,7 +1680,7 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 		return;
 	}
 
-	if (p_instance->base_type == RSE::INSTANCE_LIGHTMAP) {
+	if (p_instance->base_type == RS::INSTANCE_LIGHTMAP) {
 		//if this moved, update the captured objects
 		InstanceLightmapData *lightmap_data = static_cast<InstanceLightmapData *>(p_instance->base_data);
 		//erase dependencies, since no longer a lightmap
@@ -1704,7 +1695,7 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 	new_aabb = instance_xform->xform(p_instance->aabb);
 	p_instance->transformed_aabb = new_aabb;
 
-	if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+	if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(p_instance->base_data);
 		//make sure lights are updated if it casts shadow
 
@@ -1758,7 +1749,7 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 	}
 
 	if (!p_instance->indexer_id.is_valid()) {
-		if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+		if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 			p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].insert(bvh_aabb, p_instance);
 		} else {
 			p_instance->indexer_id = p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].insert(bvh_aabb, p_instance);
@@ -1782,49 +1773,49 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 		}
 
 		switch (p_instance->base_type) {
-			case RSE::INSTANCE_MESH:
-			case RSE::INSTANCE_MULTIMESH:
-			case RSE::INSTANCE_PARTICLES: {
+			case RS::INSTANCE_MESH:
+			case RS::INSTANCE_MULTIMESH:
+			case RS::INSTANCE_PARTICLES: {
 				InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(p_instance->base_data);
 				idata.instance_geometry = geom->geometry_instance;
 			} break;
-			case RSE::INSTANCE_LIGHT: {
+			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light_data = static_cast<InstanceLightData *>(p_instance->base_data);
 				idata.instance_data_rid = light_data->instance.get_id();
 				light_data->uses_projector = RSG::light_storage->light_has_projector(p_instance->base);
-				light_data->uses_softshadow = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_SIZE) > CMP_EPSILON;
+				light_data->uses_softshadow = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_SIZE) > CMP_EPSILON;
 
 			} break;
-			case RSE::INSTANCE_REFLECTION_PROBE: {
+			case RS::INSTANCE_REFLECTION_PROBE: {
 				idata.instance_data_rid = static_cast<InstanceReflectionProbeData *>(p_instance->base_data)->instance.get_id();
 			} break;
-			case RSE::INSTANCE_DECAL: {
+			case RS::INSTANCE_DECAL: {
 				idata.instance_data_rid = static_cast<InstanceDecalData *>(p_instance->base_data)->instance.get_id();
 			} break;
-			case RSE::INSTANCE_LIGHTMAP: {
+			case RS::INSTANCE_LIGHTMAP: {
 				idata.instance_data_rid = static_cast<InstanceLightmapData *>(p_instance->base_data)->instance.get_id();
 			} break;
-			case RSE::INSTANCE_VOXEL_GI: {
+			case RS::INSTANCE_VOXEL_GI: {
 				idata.instance_data_rid = static_cast<InstanceVoxelGIData *>(p_instance->base_data)->probe_instance.get_id();
 			} break;
-			case RSE::INSTANCE_FOG_VOLUME: {
+			case RS::INSTANCE_FOG_VOLUME: {
 				idata.instance_data_rid = static_cast<InstanceFogVolumeData *>(p_instance->base_data)->instance.get_id();
 			} break;
-			case RSE::INSTANCE_VISIBLITY_NOTIFIER: {
+			case RS::INSTANCE_VISIBLITY_NOTIFIER: {
 				idata.visibility_notifier = static_cast<InstanceVisibilityNotifierData *>(p_instance->base_data);
 			} break;
 			default: {
 			}
 		}
 
-		if (p_instance->base_type == RSE::INSTANCE_REFLECTION_PROBE) {
+		if (p_instance->base_type == RS::INSTANCE_REFLECTION_PROBE) {
 			//always dirty when added
 			idata.flags |= InstanceData::FLAG_REFLECTION_PROBE_DIRTY;
 		}
-		if (p_instance->cast_shadows != RSE::SHADOW_CASTING_SETTING_OFF) {
+		if (p_instance->cast_shadows != RS::SHADOW_CASTING_SETTING_OFF) {
 			idata.flags |= InstanceData::FLAG_CAST_SHADOWS;
 		}
-		if (p_instance->cast_shadows == RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY) {
+		if (p_instance->cast_shadows == RS::SHADOW_CASTING_SETTING_SHADOWS_ONLY) {
 			idata.flags |= InstanceData::FLAG_CAST_SHADOWS_ONLY;
 		}
 		if (p_instance->redraw_if_visible) {
@@ -1848,7 +1839,7 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 		p_instance->scenario->instance_aabbs.push_back(InstanceBounds(p_instance->transformed_aabb));
 		_update_instance_visibility_dependencies(p_instance);
 	} else {
-		if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+		if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 			p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].update(p_instance->indexer_id, bvh_aabb);
 		} else {
 			p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].update(p_instance->indexer_id, bvh_aabb);
@@ -1870,41 +1861,41 @@ void RendererSceneCull::_update_instance(Instance *p_instance) const {
 	pair.pair_pass = pair_pass;
 	pair.pair_mask = 0;
 
-	if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
-		pair.pair_mask |= 1 << RSE::INSTANCE_LIGHT;
-		pair.pair_mask |= 1 << RSE::INSTANCE_VOXEL_GI;
-		pair.pair_mask |= 1 << RSE::INSTANCE_LIGHTMAP;
-		if (p_instance->base_type == RSE::INSTANCE_PARTICLES) {
-			pair.pair_mask |= 1 << RSE::INSTANCE_PARTICLES_COLLISION;
+	if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
+		pair.pair_mask |= 1 << RS::INSTANCE_LIGHT;
+		pair.pair_mask |= 1 << RS::INSTANCE_VOXEL_GI;
+		pair.pair_mask |= 1 << RS::INSTANCE_LIGHTMAP;
+		if (p_instance->base_type == RS::INSTANCE_PARTICLES) {
+			pair.pair_mask |= 1 << RS::INSTANCE_PARTICLES_COLLISION;
 		}
 
 		pair.pair_mask |= geometry_instance_pair_mask;
 
 		pair.bvh2 = &p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES];
-	} else if (p_instance->base_type == RSE::INSTANCE_LIGHT) {
-		pair.pair_mask |= RSE::INSTANCE_GEOMETRY_MASK;
+	} else if (p_instance->base_type == RS::INSTANCE_LIGHT) {
+		pair.pair_mask |= RS::INSTANCE_GEOMETRY_MASK;
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
 
-		RSE::LightBakeMode bake_mode = RSG::light_storage->light_get_bake_mode(p_instance->base);
-		if (bake_mode == RSE::LIGHT_BAKE_STATIC || bake_mode == RSE::LIGHT_BAKE_DYNAMIC) {
-			pair.pair_mask |= (1 << RSE::INSTANCE_VOXEL_GI);
+		RS::LightBakeMode bake_mode = RSG::light_storage->light_get_bake_mode(p_instance->base);
+		if (bake_mode == RS::LIGHT_BAKE_STATIC || bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
+			pair.pair_mask |= (1 << RS::INSTANCE_VOXEL_GI);
 			pair.bvh2 = &p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES];
 		}
-	} else if (p_instance->base_type == RSE::INSTANCE_LIGHTMAP) {
-		pair.pair_mask = RSE::INSTANCE_GEOMETRY_MASK;
+	} else if (p_instance->base_type == RS::INSTANCE_LIGHTMAP) {
+		pair.pair_mask = RS::INSTANCE_GEOMETRY_MASK;
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
-	} else if (geometry_instance_pair_mask & (1 << RSE::INSTANCE_REFLECTION_PROBE) && (p_instance->base_type == RSE::INSTANCE_REFLECTION_PROBE)) {
-		pair.pair_mask = RSE::INSTANCE_GEOMETRY_MASK;
+	} else if (geometry_instance_pair_mask & (1 << RS::INSTANCE_REFLECTION_PROBE) && (p_instance->base_type == RS::INSTANCE_REFLECTION_PROBE)) {
+		pair.pair_mask = RS::INSTANCE_GEOMETRY_MASK;
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
-	} else if (geometry_instance_pair_mask & (1 << RSE::INSTANCE_DECAL) && (p_instance->base_type == RSE::INSTANCE_DECAL)) {
-		pair.pair_mask = RSE::INSTANCE_GEOMETRY_MASK;
+	} else if (geometry_instance_pair_mask & (1 << RS::INSTANCE_DECAL) && (p_instance->base_type == RS::INSTANCE_DECAL)) {
+		pair.pair_mask = RS::INSTANCE_GEOMETRY_MASK;
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
-	} else if (p_instance->base_type == RSE::INSTANCE_PARTICLES_COLLISION) {
-		pair.pair_mask = (1 << RSE::INSTANCE_PARTICLES);
+	} else if (p_instance->base_type == RS::INSTANCE_PARTICLES_COLLISION) {
+		pair.pair_mask = (1 << RS::INSTANCE_PARTICLES);
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
-	} else if (p_instance->base_type == RSE::INSTANCE_VOXEL_GI) {
+	} else if (p_instance->base_type == RS::INSTANCE_VOXEL_GI) {
 		//lights and geometries
-		pair.pair_mask = RSE::INSTANCE_GEOMETRY_MASK | (1 << RSE::INSTANCE_LIGHT);
+		pair.pair_mask = RS::INSTANCE_GEOMETRY_MASK | (1 << RS::INSTANCE_LIGHT);
 		pair.bvh = &p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY];
 		pair.bvh2 = &p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES];
 	}
@@ -1926,7 +1917,7 @@ void RendererSceneCull::_unpair_instance(Instance *p_instance) {
 		pair_allocator.free(pair);
 	}
 
-	if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+	if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 		p_instance->scenario->indexers[Scenario::INDEXER_GEOMETRY].remove(p_instance->indexer_id);
 	} else {
 		p_instance->scenario->indexers[Scenario::INDEXER_VOLUMES].remove(p_instance->indexer_id);
@@ -1960,12 +1951,12 @@ void RendererSceneCull::_unpair_instance(Instance *p_instance) {
 
 	//uninitialize
 	p_instance->array_index = -1;
-	if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+	if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 		// Clear these now because the InstanceData containing the dirty flags is gone
 		InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(p_instance->base_data);
 		ERR_FAIL_NULL(geom->geometry_instance);
 
-		geom->geometry_instance->clear_light_instances();
+		geom->geometry_instance->pair_light_instances(nullptr, 0);
 		geom->geometry_instance->pair_reflection_probe_instances(nullptr, 0);
 		geom->geometry_instance->pair_decal_instances(nullptr, 0);
 		geom->geometry_instance->pair_voxel_gi_instances(nullptr, 0);
@@ -1975,7 +1966,7 @@ void RendererSceneCull::_unpair_instance(Instance *p_instance) {
 		Instance *dep_instance = E;
 		if (dep_instance->array_index != -1) {
 			dep_instance->scenario->instance_data[dep_instance->array_index].parent_array_index = -1;
-			if ((1 << dep_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+			if ((1 << dep_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 				dep_instance->scenario->instance_data[dep_instance->array_index].instance_geometry->set_parent_fade_alpha(1.0f);
 			}
 		}
@@ -1987,13 +1978,13 @@ void RendererSceneCull::_unpair_instance(Instance *p_instance) {
 void RendererSceneCull::_update_instance_aabb(Instance *p_instance) const {
 	AABB new_aabb;
 
-	ERR_FAIL_COND(p_instance->base_type != RSE::INSTANCE_NONE && !p_instance->base.is_valid());
+	ERR_FAIL_COND(p_instance->base_type != RS::INSTANCE_NONE && !p_instance->base.is_valid());
 
 	switch (p_instance->base_type) {
-		case RSE::INSTANCE_NONE: {
+		case RenderingServer::INSTANCE_NONE: {
 			// do nothing
 		} break;
-		case RSE::INSTANCE_MESH: {
+		case RenderingServer::INSTANCE_MESH: {
 			if (p_instance->custom_aabb) {
 				new_aabb = *p_instance->custom_aabb;
 			} else {
@@ -2002,7 +1993,7 @@ void RendererSceneCull::_update_instance_aabb(Instance *p_instance) const {
 
 		} break;
 
-		case RSE::INSTANCE_MULTIMESH: {
+		case RenderingServer::INSTANCE_MULTIMESH: {
 			if (p_instance->custom_aabb) {
 				new_aabb = *p_instance->custom_aabb;
 			} else {
@@ -2010,7 +2001,7 @@ void RendererSceneCull::_update_instance_aabb(Instance *p_instance) const {
 			}
 
 		} break;
-		case RSE::INSTANCE_PARTICLES: {
+		case RenderingServer::INSTANCE_PARTICLES: {
 			if (p_instance->custom_aabb) {
 				new_aabb = *p_instance->custom_aabb;
 			} else {
@@ -2018,33 +2009,33 @@ void RendererSceneCull::_update_instance_aabb(Instance *p_instance) const {
 			}
 
 		} break;
-		case RSE::INSTANCE_PARTICLES_COLLISION: {
+		case RenderingServer::INSTANCE_PARTICLES_COLLISION: {
 			new_aabb = RSG::particles_storage->particles_collision_get_aabb(p_instance->base);
 
 		} break;
-		case RSE::INSTANCE_FOG_VOLUME: {
+		case RenderingServer::INSTANCE_FOG_VOLUME: {
 			new_aabb = RSG::fog->fog_volume_get_aabb(p_instance->base);
 		} break;
-		case RSE::INSTANCE_VISIBLITY_NOTIFIER: {
+		case RenderingServer::INSTANCE_VISIBLITY_NOTIFIER: {
 			new_aabb = RSG::utilities->visibility_notifier_get_aabb(p_instance->base);
 		} break;
-		case RSE::INSTANCE_LIGHT: {
+		case RenderingServer::INSTANCE_LIGHT: {
 			new_aabb = RSG::light_storage->light_get_aabb(p_instance->base);
 
 		} break;
-		case RSE::INSTANCE_REFLECTION_PROBE: {
+		case RenderingServer::INSTANCE_REFLECTION_PROBE: {
 			new_aabb = RSG::light_storage->reflection_probe_get_aabb(p_instance->base);
 
 		} break;
-		case RSE::INSTANCE_DECAL: {
+		case RenderingServer::INSTANCE_DECAL: {
 			new_aabb = RSG::texture_storage->decal_get_aabb(p_instance->base);
 
 		} break;
-		case RSE::INSTANCE_VOXEL_GI: {
+		case RenderingServer::INSTANCE_VOXEL_GI: {
 			new_aabb = RSG::gi->voxel_gi_get_bounds(p_instance->base);
 
 		} break;
-		case RSE::INSTANCE_LIGHTMAP: {
+		case RenderingServer::INSTANCE_LIGHTMAP: {
 			new_aabb = RSG::light_storage->lightmap_get_aabb(p_instance->base);
 
 		} break;
@@ -2150,26 +2141,26 @@ void RendererSceneCull::_light_instance_setup_directional_shadow(int p_shadow_in
 	light_transform.orthonormalize(); //scale does not count on lights
 
 	real_t max_distance = p_cam_projection.get_z_far();
-	real_t shadow_max = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
+	real_t shadow_max = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
 	if (shadow_max > 0 && !p_cam_orthogonal) { //its impractical (and leads to unwanted behaviors) to set max distance in orthogonal camera
 		max_distance = MIN(shadow_max, max_distance);
 	}
 	max_distance = MAX(max_distance, p_cam_projection.get_z_near() + 0.001);
 	real_t min_distance = MIN(p_cam_projection.get_z_near(), max_distance);
 
-	real_t pancake_size = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE);
+	real_t pancake_size = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_SHADOW_PANCAKE_SIZE);
 
 	real_t range = max_distance - min_distance;
 
 	int splits = 0;
 	switch (RSG::light_storage->light_directional_get_shadow_mode(p_instance->base)) {
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
 			splits = 1;
 			break;
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
 			splits = 2;
 			break;
-		case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
+		case RS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
 			splits = 4;
 			break;
 	}
@@ -2178,7 +2169,7 @@ void RendererSceneCull::_light_instance_setup_directional_shadow(int p_shadow_in
 
 	distances[0] = min_distance;
 	for (int i = 0; i < splits; i++) {
-		distances[i + 1] = min_distance + RSG::light_storage->light_get_param(p_instance->base, RSE::LightParam(RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET + i)) * range;
+		distances[i + 1] = min_distance + RSG::light_storage->light_get_param(p_instance->base, RS::LightParam(RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET + i)) * range;
 	};
 
 	distances[splits] = max_distance;
@@ -2293,7 +2284,7 @@ void RendererSceneCull::_light_instance_setup_directional_shadow(int p_shadow_in
 			z_min_cam = z_vec.dot(center) - radius;
 
 			{
-				float soft_shadow_angle = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_SIZE);
+				float soft_shadow_angle = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_SIZE);
 
 				if (soft_shadow_angle > 0.0) {
 					float z_range = (z_vec.dot(center) + radius + pancake_size) - z_min_cam;
@@ -2370,12 +2361,12 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 	bool animated_material_found = false;
 
 	switch (RSG::light_storage->light_get_type(p_instance->base)) {
-		case RSE::LIGHT_DIRECTIONAL: {
+		case RS::LIGHT_DIRECTIONAL: {
 		} break;
-		case RSE::LIGHT_OMNI: {
-			RSE::LightOmniShadowMode shadow_mode = RSG::light_storage->light_omni_get_shadow_mode(p_instance->base);
+		case RS::LIGHT_OMNI: {
+			RS::LightOmniShadowMode shadow_mode = RSG::light_storage->light_omni_get_shadow_mode(p_instance->base);
 
-			if (shadow_mode == RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID || !RSG::light_storage->light_instances_can_render_shadow_cube()) {
+			if (shadow_mode == RS::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID || !RSG::light_storage->light_instances_can_render_shadow_cube()) {
 				if (max_shadows_used + 2 > MAX_UPDATE_SHADOWS) {
 					return true;
 				}
@@ -2383,7 +2374,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 					//using this one ensures that raster deferred will have it
 					RENDER_TIMESTAMP("Cull OmniLight3D Shadow Paraboloid, Half " + itos(i));
 
-					real_t radius = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_RANGE);
+					real_t radius = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_RANGE);
 
 					real_t z = i == 0 ? -1 : 1;
 					Vector<Plane> planes;
@@ -2421,7 +2412,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 
 					for (int j = 0; j < (int)instance_shadow_cull_result.size(); j++) {
 						Instance *instance = instance_shadow_cull_result[j];
-						if (!instance->visible || !((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
+						if (!instance->visible || !((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
 							continue;
 						} else {
 							if (static_cast<InstanceGeometryData *>(instance->base_data)->material_is_animated) {
@@ -2448,7 +2439,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 					return true;
 				}
 
-				real_t radius = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_RANGE);
+				real_t radius = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_RANGE);
 				real_t z_near = MIN(0.025f, radius);
 				Projection cm;
 				cm.set_perspective(90, 1, z_near, radius);
@@ -2504,7 +2495,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 
 					for (int j = 0; j < (int)instance_shadow_cull_result.size(); j++) {
 						Instance *instance = instance_shadow_cull_result[j];
-						if (!instance->visible || !((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
+						if (!instance->visible || !((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
 							continue;
 						} else {
 							if (static_cast<InstanceGeometryData *>(instance->base_data)->material_is_animated) {
@@ -2530,15 +2521,15 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 			}
 
 		} break;
-		case RSE::LIGHT_SPOT: {
+		case RS::LIGHT_SPOT: {
 			RENDER_TIMESTAMP("Cull SpotLight3D Shadow");
 
 			if (max_shadows_used + 1 > MAX_UPDATE_SHADOWS) {
 				return true;
 			}
 
-			real_t radius = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_RANGE);
-			real_t angle = RSG::light_storage->light_get_param(p_instance->base, RSE::LIGHT_PARAM_SPOT_ANGLE);
+			real_t radius = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_RANGE);
+			real_t angle = RSG::light_storage->light_get_param(p_instance->base, RS::LIGHT_PARAM_SPOT_ANGLE);
 			real_t z_near = MIN(0.025f, radius);
 
 			Projection cm;
@@ -2572,7 +2563,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 
 			for (int j = 0; j < (int)instance_shadow_cull_result.size(); j++) {
 				Instance *instance = instance_shadow_cull_result[j];
-				if (!instance->visible || !((1 << instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
+				if (!instance->visible || !((1 << instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) || !static_cast<InstanceGeometryData *>(instance->base_data)->can_cast_shadows || !(p_visible_layers & instance->layer_mask & RSG::light_storage->light_get_shadow_caster_mask(p_instance->base))) {
 					continue;
 				} else {
 					if (static_cast<InstanceGeometryData *>(instance->base_data)->material_is_animated) {
@@ -2598,7 +2589,7 @@ bool RendererSceneCull::_light_instance_update_shadow(Instance *p_instance, cons
 	return animated_material_found;
 }
 
-void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_screen_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, float p_window_output_max_value, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_screen_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, RenderInfo *r_render_info) {
 #ifndef _3D_DISABLED
 
 	Camera *camera = camera_owner.get_or_null(p_camera);
@@ -2631,6 +2622,7 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 		Projection projection;
 		bool vaspect = camera->vaspect;
 		bool is_orthogonal = false;
+		bool is_frustum = false;
 
 		switch (camera->type) {
 			case Camera::ORTHOGONAL: {
@@ -2659,10 +2651,11 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 						camera->znear,
 						camera->zfar,
 						camera->vaspect);
+				is_frustum = true;
 			} break;
 		}
 
-		camera_data.set_camera(transform, projection, is_orthogonal, vaspect, jitter, taa_frame_count, camera->visible_layers);
+		camera_data.set_camera(transform, projection, is_orthogonal, is_frustum, vaspect, jitter, taa_frame_count, camera->visible_layers);
 #ifndef XR_DISABLED
 	} else {
 		XRServer *xr_server = XRServer::get_singleton();
@@ -2695,9 +2688,9 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 		}
 
 		if (view_count == 1) {
-			camera_data.set_camera(transforms[0], projections[0], false, camera->vaspect, jitter, p_jitter_phase_count, camera->visible_layers);
+			camera_data.set_camera(transforms[0], projections[0], false, false, camera->vaspect, jitter, p_jitter_phase_count, camera->visible_layers);
 		} else if (view_count == 2) {
-			camera_data.set_multiview_camera(view_count, transforms, projections, false, camera->vaspect, camera->visible_layers);
+			camera_data.set_multiview_camera(view_count, transforms, projections, false, false, camera->vaspect, camera->visible_layers);
 		} else {
 			// this won't be called (see fail check above) but keeping this comment to indicate we may support more then 2 views in the future...
 		}
@@ -2711,7 +2704,7 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 	// For now just cull on the first camera
 	RendererSceneOcclusionCull::get_singleton()->buffer_update(p_viewport, camera_data.main_transform, camera_data.main_projection, camera_data.is_orthogonal);
 
-	_render_scene(&camera_data, p_render_buffers, environment, camera->attributes, compositor, camera->visible_layers, p_scenario, p_viewport, p_shadow_atlas, RID(), -1, p_screen_mesh_lod_threshold, p_window_output_max_value, true, r_render_info);
+	_render_scene(&camera_data, p_render_buffers, environment, camera->attributes, compositor, camera->visible_layers, p_scenario, p_viewport, p_shadow_atlas, RID(), -1, p_screen_mesh_lod_threshold, true, r_render_info);
 #endif
 }
 
@@ -2765,12 +2758,12 @@ void RendererSceneCull::_visibility_cull(const VisibilityCullData &cull_data, ui
 template <bool p_fade_check>
 int RendererSceneCull::_visibility_range_check(InstanceVisibilityData &r_vis_data, const Vector3 &p_camera_pos, uint64_t p_viewport_mask) {
 	float dist = p_camera_pos.distance_to(r_vis_data.position);
-	const RSE::VisibilityRangeFadeMode &fade_mode = r_vis_data.fade_mode;
+	const RS::VisibilityRangeFadeMode &fade_mode = r_vis_data.fade_mode;
 
 	float begin_offset = -r_vis_data.range_begin_margin;
 	float end_offset = r_vis_data.range_end_margin;
 
-	if (fade_mode == RSE::VISIBILITY_RANGE_FADE_DISABLED && !(p_viewport_mask & r_vis_data.viewport_state)) {
+	if (fade_mode == RS::VISIBILITY_RANGE_FADE_DISABLED && !(p_viewport_mask & r_vis_data.viewport_state)) {
 		begin_offset = -begin_offset;
 		end_offset = -end_offset;
 	}
@@ -2784,15 +2777,15 @@ int RendererSceneCull::_visibility_range_check(InstanceVisibilityData &r_vis_dat
 	} else {
 		r_vis_data.viewport_state |= p_viewport_mask;
 		if (p_fade_check) {
-			if (fade_mode != RSE::VISIBILITY_RANGE_FADE_DISABLED) {
+			if (fade_mode != RS::VISIBILITY_RANGE_FADE_DISABLED) {
 				r_vis_data.children_fade_alpha = 1.0f;
 				if (r_vis_data.range_end > 0.0f && dist > r_vis_data.range_end - end_offset) {
-					if (fade_mode == RSE::VISIBILITY_RANGE_FADE_DEPENDENCIES) {
+					if (fade_mode == RS::VISIBILITY_RANGE_FADE_DEPENDENCIES) {
 						r_vis_data.children_fade_alpha = MIN(1.0f, (dist - (r_vis_data.range_end - end_offset)) / (2.0f * r_vis_data.range_end_margin));
 					}
 					return 2;
 				} else if (r_vis_data.range_begin > 0.0f && dist < r_vis_data.range_begin - begin_offset) {
-					if (fade_mode == RSE::VISIBILITY_RANGE_FADE_DEPENDENCIES) {
+					if (fade_mode == RS::VISIBILITY_RANGE_FADE_DEPENDENCIES) {
 						r_vis_data.children_fade_alpha = MIN(1.0f, 1.0 - (dist - (r_vis_data.range_begin + begin_offset)) / (2.0f * r_vis_data.range_begin_margin));
 					}
 					return 2;
@@ -2829,14 +2822,6 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 
 	RID instance_pair_buffer[MAX_INSTANCE_PAIRS];
 
-	// Minimize allocations when picking the most relevant lights per mesh.
-	// We need to track the score and current index of the best N lights.
-	thread_local LocalVector<Pair<float, uint32_t>> omni_score_idx, spot_score_idx;
-	omni_score_idx.clear();
-	spot_score_idx.clear();
-	uint32_t max_lights_per_mesh = scene_render->get_max_lights_per_mesh();
-	uint32_t max_lights_total = scene_render->get_max_lights_total();
-
 	Transform3D inv_cam_transform = cull_data.cam_transform.inverse();
 	float z_near = cull_data.camera_matrix->get_z_near();
 	bool is_orthogonal = cull_data.camera_matrix->is_orthogonal();
@@ -2859,14 +2844,14 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 		if (!HIDDEN_BY_VISIBILITY_CHECKS) {
 			if ((LAYER_CHECK && IN_FRUSTUM(cull_data.cull->frustum) && VIS_CHECK && !OCCLUSION_CULLED) || (cull_data.scenario->instance_data[i].flags & InstanceData::FLAG_IGNORE_ALL_CULLING)) {
 				uint32_t base_type = idata.flags & InstanceData::FLAG_BASE_TYPE_MASK;
-				if (base_type == RSE::INSTANCE_LIGHT) {
+				if (base_type == RS::INSTANCE_LIGHT) {
 					cull_result.lights.push_back(idata.instance);
 					cull_result.light_instances.push_back(RID::from_uint64(idata.instance_data_rid));
 					if (cull_data.shadow_atlas.is_valid() && RSG::light_storage->light_has_shadow(idata.base_rid)) {
 						RSG::light_storage->light_instance_mark_visible(RID::from_uint64(idata.instance_data_rid)); //mark it visible for shadow allocation later
 					}
 
-				} else if (base_type == RSE::INSTANCE_REFLECTION_PROBE) {
+				} else if (base_type == RS::INSTANCE_REFLECTION_PROBE) {
 					if (cull_data.render_reflection_probe != idata.instance) {
 						//avoid entering The Matrix
 
@@ -2886,10 +2871,10 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 							cull_result.reflections.push_back(RID::from_uint64(idata.instance_data_rid));
 						}
 					}
-				} else if (base_type == RSE::INSTANCE_DECAL) {
+				} else if (base_type == RS::INSTANCE_DECAL) {
 					cull_result.decals.push_back(RID::from_uint64(idata.instance_data_rid));
 
-				} else if (base_type == RSE::INSTANCE_VOXEL_GI) {
+				} else if (base_type == RS::INSTANCE_VOXEL_GI) {
 					InstanceVoxelGIData *voxel_gi = static_cast<InstanceVoxelGIData *>(idata.instance->base_data);
 					cull_data.cull->lock.lock();
 					if (!voxel_gi->update_element.in_list()) {
@@ -2898,11 +2883,11 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 					cull_data.cull->lock.unlock();
 					cull_result.voxel_gi_instances.push_back(RID::from_uint64(idata.instance_data_rid));
 
-				} else if (base_type == RSE::INSTANCE_LIGHTMAP) {
+				} else if (base_type == RS::INSTANCE_LIGHTMAP) {
 					cull_result.lightmaps.push_back(RID::from_uint64(idata.instance_data_rid));
-				} else if (base_type == RSE::INSTANCE_FOG_VOLUME) {
+				} else if (base_type == RS::INSTANCE_FOG_VOLUME) {
 					cull_result.fog_volumes.push_back(RID::from_uint64(idata.instance_data_rid));
-				} else if (base_type == RSE::INSTANCE_VISIBLITY_NOTIFIER) {
+				} else if (base_type == RS::INSTANCE_VISIBLITY_NOTIFIER) {
 					InstanceVisibilityNotifierData *vnd = idata.visibility_notifier;
 					if (!vnd->list_element.in_list()) {
 						visible_notifier_list_lock.lock();
@@ -2911,16 +2896,16 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 						vnd->just_visible = true;
 					}
 					vnd->visible_in_frame = RSG::rasterizer->get_frame_number();
-				} else if (((1 << base_type) & RSE::INSTANCE_GEOMETRY_MASK) && !(idata.flags & InstanceData::FLAG_CAST_SHADOWS_ONLY)) {
+				} else if (((1 << base_type) & RS::INSTANCE_GEOMETRY_MASK) && !(idata.flags & InstanceData::FLAG_CAST_SHADOWS_ONLY)) {
 					bool keep = true;
 
 					if (idata.flags & InstanceData::FLAG_REDRAW_IF_VISIBLE) {
 						RenderingServerDefault::redraw_request();
 					}
 
-					if (base_type == RSE::INSTANCE_MESH) {
+					if (base_type == RS::INSTANCE_MESH) {
 						mesh_visible = true;
-					} else if (base_type == RSE::INSTANCE_PARTICLES) {
+					} else if (base_type == RS::INSTANCE_PARTICLES) {
 						//particles visible? process them
 						if (RSG::particles_storage->particles_is_inactive(idata.base_rid)) {
 							//but if nothing is going on, don't do it.
@@ -2946,111 +2931,28 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 						idata.instance_geometry->set_parent_fade_alpha(fade);
 					}
 
-					if (geometry_instance_pair_mask & (1 << RSE::INSTANCE_LIGHT) && (idata.flags & InstanceData::FLAG_GEOM_LIGHTING_DIRTY)) {
+					if (geometry_instance_pair_mask & (1 << RS::INSTANCE_LIGHT) && (idata.flags & InstanceData::FLAG_GEOM_LIGHTING_DIRTY)) {
 						InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(idata.instance->base_data);
-						ERR_FAIL_NULL(geom->geometry_instance);
-						// Clear any existing light instances for this mesh and find the max count per-mesh, and total (per-scene).
-						geom->geometry_instance->clear_light_instances();
-						if ((max_lights_per_mesh > 0) && (max_lights_total > 0)) {
-							// For the top N lights, track the score and the index into the internal light storage array.
-							uint32_t total_omni_count = 0, total_spot_count = 0;
-							bool omni_needs_heap = true, spot_needs_heap = true;
-							uint32_t omni_count = 0, spot_count = 0;
-							omni_score_idx.clear();
-							spot_score_idx.clear();
-							SortArray<Pair<float, uint32_t>> heapify; // SortArray has heap functions, but no local storage.
-							// Iterate over the lights (possibly > max_renderable_lights), keeping the closest to the mesh center.
-							Vector3 mesh_center = idata.instance->transformed_aabb.get_center();
-							for (const Instance *E : geom->lights) {
-								RSE::LightType light_type = RSG::light_storage->light_get_type(E->base);
-								if (((RSE::LIGHT_OMNI == light_type) && (total_omni_count++ < max_lights_total)) ||
-										((RSE::LIGHT_SPOT == light_type) && (total_spot_count++ < max_lights_total))) {
-									// Perform culling.
-									if (!(RSG::light_storage->light_get_cull_mask(E->base) & idata.layer_mask)) {
-										continue;
-									}
-									if ((RSG::light_storage->light_get_bake_mode(E->base) == RSE::LIGHT_BAKE_STATIC) && idata.instance->lightmap) {
-										continue;
-									}
+						uint32_t idx = 0;
 
-									InstanceLightData *light = static_cast<InstanceLightData *>(E->base_data);
-									// Large scores are worse, so linear with distance, inverse with energy and range.
-									Vector3 light_center = E->transformed_aabb.get_center();
-									float light_range_energy =
-											RSG::light_storage->light_get_param(E->base, RSE::LightParam::LIGHT_PARAM_RANGE) *
-											RSG::light_storage->light_get_param(E->base, RSE::LightParam::LIGHT_PARAM_ENERGY);
-									float light_inst_score = mesh_center.distance_to(light_center) / MAX(0.01f, light_range_energy);
-									// Of the N lights (on a per-light-type basis, Omni or Spot) keep only the M "best" lights.
-									// If N <= M, we can simply store the lights, but once we exceed M, we need check each new
-									// light and see if it's score is better than the worst light stored to date.  If the new
-									// light is better, we can replace the current worst light with the new one.  In order to
-									// efficiently track our currently worst light we use a "max heap".  This loosely orders
-									// the elements in an array as a binary-tree structure, and has the properties that finding
-									// the worst score element is O(1) (it will always be stored in element [0]), and removing
-									// the old max and inserting a new value is O(log M).
-#define VERIFY_RELEVANT_LIGHT_HEAP 0
-#if VERIFY_RELEVANT_LIGHT_HEAP
-									WARN_PRINT_ONCE("VERIFY_RELEVANT_LIGHT_HEAP is True");
-#endif
-									switch (light_type) {
-										case RSE::LIGHT_OMNI: {
-											if (omni_count < max_lights_per_mesh) {
-												// We have room to just add it, and track the score and where it goes.
-												omni_score_idx.push_back(Pair(light_inst_score, omni_count));
-												geom->geometry_instance->pair_light_instance(light->instance, light_type, omni_count++);
-											} else {
-												if (omni_needs_heap) {
-													// We need to make this a heap one time.
-													heapify.make_heap(0, omni_count, &omni_score_idx[0]);
-													omni_needs_heap = false;
-												}
-												if (light_inst_score < omni_score_idx[0].first) {
-#if VERIFY_RELEVANT_LIGHT_HEAP
-													// The [0] element should have the max score.
-													for (uint32_t vi = 1; vi < max_lights_per_mesh; ++vi) {
-														if (omni_score_idx[vi].first > omni_score_idx[0].first) {
-															ERR_PRINT_ONCE("Relevant Omni Light Heap Error");
-														}
-													}
-#endif
-													uint32_t replace_index = omni_score_idx[0].second;
-													geom->geometry_instance->pair_light_instance(light->instance, light_type, replace_index);
-													heapify.adjust_heap(0, 0, omni_count, Pair(light_inst_score, replace_index), &omni_score_idx[0]);
-												}
-											}
-										} break;
-										case RSE::LIGHT_SPOT: {
-											if (spot_count < max_lights_per_mesh) {
-												// We have room to just add it, and track the score and where it goes.
-												spot_score_idx.push_back(Pair(light_inst_score, spot_count));
-												geom->geometry_instance->pair_light_instance(light->instance, light_type, spot_count++);
-											} else {
-												if (spot_needs_heap) {
-													// We need to make this a heap one time.
-													heapify.make_heap(0, spot_count, &spot_score_idx[0]);
-													spot_needs_heap = false;
-												}
-												if (light_inst_score < spot_score_idx[0].first) {
-#if VERIFY_RELEVANT_LIGHT_HEAP
-													// The [0] element should have the max score.
-													for (uint32_t vi = 1; vi < max_lights_per_mesh; ++vi) {
-														if (spot_score_idx[vi].first > spot_score_idx[0].first) {
-															ERR_PRINT_ONCE("Relevant Spot Light Heap Error");
-														}
-													}
-#endif
-													uint32_t replace_index = spot_score_idx[0].second;
-													geom->geometry_instance->pair_light_instance(light->instance, light_type, replace_index);
-													heapify.adjust_heap(0, 0, spot_count, Pair(light_inst_score, replace_index), &spot_score_idx[0]);
-												}
-											}
-										} break;
-										default:
-											break;
-									}
-								}
+						for (const Instance *E : geom->lights) {
+							InstanceLightData *light = static_cast<InstanceLightData *>(E->base_data);
+							if (!(RSG::light_storage->light_get_cull_mask(E->base) & idata.layer_mask)) {
+								continue;
+							}
+
+							if ((RSG::light_storage->light_get_bake_mode(E->base) == RS::LIGHT_BAKE_STATIC) && idata.instance->lightmap) {
+								continue;
+							}
+
+							instance_pair_buffer[idx++] = light->instance;
+							if (idx == MAX_INSTANCE_PAIRS) {
+								break;
 							}
 						}
+
+						ERR_FAIL_NULL(geom->geometry_instance);
+						geom->geometry_instance->pair_light_instances(instance_pair_buffer, idx);
 						idata.flags &= ~InstanceData::FLAG_GEOM_LIGHTING_DIRTY;
 					}
 
@@ -3064,7 +2966,7 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 						idata.flags &= ~InstanceData::FLAG_GEOM_PROJECTOR_SOFTSHADOW_DIRTY;
 					}
 
-					if (geometry_instance_pair_mask & (1 << RSE::INSTANCE_REFLECTION_PROBE) && (idata.flags & InstanceData::FLAG_GEOM_REFLECTION_DIRTY)) {
+					if (geometry_instance_pair_mask & (1 << RS::INSTANCE_REFLECTION_PROBE) && (idata.flags & InstanceData::FLAG_GEOM_REFLECTION_DIRTY)) {
 						InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(idata.instance->base_data);
 						uint32_t idx = 0;
 
@@ -3082,7 +2984,7 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 						idata.flags &= ~InstanceData::FLAG_GEOM_REFLECTION_DIRTY;
 					}
 
-					if (geometry_instance_pair_mask & (1 << RSE::INSTANCE_DECAL) && (idata.flags & InstanceData::FLAG_GEOM_DECAL_DIRTY)) {
+					if (geometry_instance_pair_mask & (1 << RS::INSTANCE_DECAL) && (idata.flags & InstanceData::FLAG_GEOM_DECAL_DIRTY)) {
 						InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(idata.instance->base_data);
 						uint32_t idx = 0;
 
@@ -3140,14 +3042,14 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 			}
 
 			for (uint32_t j = 0; j < cull_data.cull->shadow_count; j++) {
+				if (!light_culler->cull_directional_light(cull_data.scenario->instance_aabbs[i], j)) {
+					continue;
+				}
 				for (uint32_t k = 0; k < cull_data.cull->shadows[j].cascade_count; k++) {
-					if (!light_culler->cull_directional_light(cull_data.scenario->instance_aabbs[i], j, k)) { // pass the cascade index
-						continue;
-					}
 					if (IN_FRUSTUM(cull_data.cull->shadows[j].cascades[k].frustum) && VIS_CHECK) {
 						uint32_t base_type = idata.flags & InstanceData::FLAG_BASE_TYPE_MASK;
 
-						if (((1 << base_type) & RSE::INSTANCE_GEOMETRY_MASK) && idata.flags & InstanceData::FLAG_CAST_SHADOWS && (LAYER_CHECK & cull_data.cull->shadows[j].caster_mask)) {
+						if (((1 << base_type) & RS::INSTANCE_GEOMETRY_MASK) && idata.flags & InstanceData::FLAG_CAST_SHADOWS && (LAYER_CHECK & cull_data.cull->shadows[j].caster_mask)) {
 							cull_result.directional_shadows[j].cascade_geometry_instances[k].push_back(idata.instance_geometry);
 							mesh_visible = true;
 						}
@@ -3168,17 +3070,17 @@ void RendererSceneCull::_scene_cull(CullData &cull_data, InstanceCullResult &cul
 			if (cull_data.scenario->instance_aabbs[i].in_aabb(cull_data.cull->sdfgi.region_aabb[j])) {
 				uint32_t base_type = idata.flags & InstanceData::FLAG_BASE_TYPE_MASK;
 
-				if (base_type == RSE::INSTANCE_LIGHT) {
+				if (base_type == RS::INSTANCE_LIGHT) {
 					InstanceLightData *instance_light = (InstanceLightData *)idata.instance->base_data;
-					if (instance_light->bake_mode == RSE::LIGHT_BAKE_STATIC && cull_data.cull->sdfgi.region_cascade[j] <= instance_light->max_sdfgi_cascade) {
+					if (instance_light->bake_mode == RS::LIGHT_BAKE_STATIC && cull_data.cull->sdfgi.region_cascade[j] <= instance_light->max_sdfgi_cascade) {
 						if (sdfgi_last_light_index != i || sdfgi_last_light_cascade != cull_data.cull->sdfgi.region_cascade[j]) {
 							sdfgi_last_light_index = i;
 							sdfgi_last_light_cascade = cull_data.cull->sdfgi.region_cascade[j];
 							cull_result.sdfgi_cascade_lights[sdfgi_last_light_cascade].push_back(instance_light->instance);
 						}
 					}
-				} else if ((1 << base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
-					if ((idata.flags & InstanceData::FLAG_USES_BAKED_LIGHT) && (cull_data.visible_layers & idata.layer_mask)) {
+				} else if ((1 << base_type) & RS::INSTANCE_GEOMETRY_MASK) {
+					if (idata.flags & InstanceData::FLAG_USES_BAKED_LIGHT) {
 						cull_result.sdfgi_region_geometry_instances[j].push_back(idata.instance_geometry);
 						mesh_visible = true;
 					}
@@ -3196,7 +3098,7 @@ void RendererSceneCull::_scene_particles_set_view_axis(RID p_particles, const Ve
 	RSG::particles_storage->particles_set_view_axis(p_particles, p_axis, p_up_axis);
 }
 
-void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_camera_data, const Ref<RenderSceneBuffers> &p_render_buffers, RID p_environment, RID p_force_camera_attributes, RID p_compositor, uint32_t p_visible_layers, RID p_scenario, RID p_viewport, RID p_shadow_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, float p_window_output_max_value, bool p_using_shadows, RenderingServerTypes::RenderInfo *r_render_info) {
+void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_camera_data, const Ref<RenderSceneBuffers> &p_render_buffers, RID p_environment, RID p_force_camera_attributes, RID p_compositor, uint32_t p_visible_layers, RID p_scenario, RID p_viewport, RID p_shadow_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, bool p_using_shadows, RenderingMethod::RenderInfo *r_render_info) {
 	Instance *render_reflection_probe = instance_owner.get_or_null(p_reflection_probe); //if null, not rendering to it
 
 	// Prepare the light - camera volume culling system.
@@ -3275,7 +3177,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 			//check shadow..
 
 			if (light) {
-				if (p_using_shadows && p_shadow_atlas.is_valid() && RSG::light_storage->light_has_shadow(E->base) && !(RSG::light_storage->light_get_type(E->base) == RSE::LIGHT_DIRECTIONAL && RSG::light_storage->light_directional_get_sky_mode(E->base) == RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY)) {
+				if (p_using_shadows && p_shadow_atlas.is_valid() && RSG::light_storage->light_has_shadow(E->base) && !(RSG::light_storage->light_get_type(E->base) == RS::LIGHT_DIRECTIONAL && RSG::light_storage->light_directional_get_sky_mode(E->base) == RS::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY)) {
 					lights_with_shadow.push_back(E);
 				}
 				//add to list
@@ -3333,6 +3235,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 		cull_data.occlusion_buffer = RendererSceneOcclusionCull::get_singleton()->buffer_get_ptr(p_viewport);
 		cull_data.camera_matrix = &p_camera_data->main_projection;
 		cull_data.visibility_viewport_mask = scenario->viewport_visibility_masks.has(p_viewport) ? scenario->viewport_visibility_masks[p_viewport] : 0;
+//#define DEBUG_CULL_TIME
 #ifdef DEBUG_CULL_TIME
 		uint64_t time_from = OS::get_singleton()->get_ticks_usec();
 #endif
@@ -3420,8 +3323,8 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 				Vector2 vp_half_extents = p_camera_data->main_projection.get_viewport_half_extents();
 
 				switch (RSG::light_storage->light_get_type(ins->base)) {
-					case RSE::LIGHT_OMNI: {
-						float radius = RSG::light_storage->light_get_param(ins->base, RSE::LIGHT_PARAM_RANGE);
+					case RS::LIGHT_OMNI: {
+						float radius = RSG::light_storage->light_get_param(ins->base, RS::LIGHT_PARAM_RANGE);
 
 						//get two points parallel to near plane
 						Vector3 points[2] = {
@@ -3443,9 +3346,9 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 						float screen_diameter = points[0].distance_to(points[1]) * 2;
 						coverage = screen_diameter / (vp_half_extents.x + vp_half_extents.y);
 					} break;
-					case RSE::LIGHT_SPOT: {
-						float radius = RSG::light_storage->light_get_param(ins->base, RSE::LIGHT_PARAM_RANGE);
-						float angle = RSG::light_storage->light_get_param(ins->base, RSE::LIGHT_PARAM_SPOT_ANGLE);
+					case RS::LIGHT_SPOT: {
+						float radius = RSG::light_storage->light_get_param(ins->base, RS::LIGHT_PARAM_RANGE);
+						float angle = RSG::light_storage->light_get_param(ins->base, RS::LIGHT_PARAM_SPOT_ANGLE);
 
 						float w = radius * Math::sin(Math::deg_to_rad(angle));
 						float d = radius * Math::cos(Math::deg_to_rad(angle));
@@ -3491,7 +3394,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 
 				// Directional lights aren't handled here, _light_instance_update_shadow is called from elsewhere.
 				// Checking for this in case this changes, as this is assumed.
-				DEV_CHECK_ONCE(RSG::light_storage->light_get_type(ins->base) != RSE::LIGHT_DIRECTIONAL);
+				DEV_CHECK_ONCE(RSG::light_storage->light_get_type(ins->base) != RS::LIGHT_DIRECTIONAL);
 
 				// Tighter caster culling to the camera frustum should work correctly with multiple viewports + cameras.
 				// The first camera will cull tightly, but if the light is present on more than 1 camera, the second will
@@ -3581,7 +3484,7 @@ void RendererSceneCull::_render_scene(const RendererSceneRender::CameraData *p_c
 	}
 
 	RENDER_TIMESTAMP("Render 3D Scene");
-	scene_render->render_scene(p_render_buffers, p_camera_data, prev_camera_data, scene_cull_result.geometry_instances, scene_cull_result.light_instances, scene_cull_result.reflections, scene_cull_result.voxel_gi_instances, scene_cull_result.decals, scene_cull_result.lightmaps, scene_cull_result.fog_volumes, p_environment, camera_attributes, p_compositor, p_shadow_atlas, occluders_tex, p_reflection_probe.is_valid() ? RID() : scenario->reflection_atlas, p_reflection_probe, p_reflection_probe_pass, p_screen_mesh_lod_threshold, render_shadow_data, max_shadows_used, render_sdfgi_data, cull.sdfgi.region_count, p_window_output_max_value, &sdfgi_update_data, r_render_info);
+	scene_render->render_scene(p_render_buffers, p_camera_data, prev_camera_data, scene_cull_result.geometry_instances, scene_cull_result.light_instances, scene_cull_result.reflections, scene_cull_result.voxel_gi_instances, scene_cull_result.decals, scene_cull_result.lightmaps, scene_cull_result.fog_volumes, p_environment, camera_attributes, p_compositor, p_shadow_atlas, occluders_tex, p_reflection_probe.is_valid() ? RID() : scenario->reflection_atlas, p_reflection_probe, p_reflection_probe_pass, p_screen_mesh_lod_threshold, render_shadow_data, max_shadows_used, render_sdfgi_data, cull.sdfgi.region_count, &sdfgi_update_data, r_render_info);
 
 	if (p_viewport.is_valid()) {
 		RSG::viewport->viewport_set_prev_camera_data(p_viewport, p_camera_data);
@@ -3632,7 +3535,7 @@ RID RendererSceneCull::_render_get_compositor(RID p_camera, RID p_scenario) {
 	return RID();
 }
 
-void RendererSceneCull::render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas, float p_window_output_max_value) {
+void RendererSceneCull::render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas) {
 #ifndef _3D_DISABLED
 	Scenario *scenario = scenario_owner.get_or_null(p_scenario);
 
@@ -3646,9 +3549,9 @@ void RendererSceneCull::render_empty_scene(const Ref<RenderSceneBuffers> &p_rend
 	RENDER_TIMESTAMP("Render Empty 3D Scene");
 
 	RendererSceneRender::CameraData camera_data;
-	camera_data.set_camera(Transform3D(), Projection(), true, false);
+	camera_data.set_camera(Transform3D(), Projection(), true, false, false);
 
-	scene_render->render_scene(p_render_buffers, &camera_data, &camera_data, PagedArray<RenderGeometryInstance *>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), environment, RID(), compositor, p_shadow_atlas, RID(), scenario->reflection_atlas, RID(), 0, 0, nullptr, 0, nullptr, 0, p_window_output_max_value, nullptr);
+	scene_render->render_scene(p_render_buffers, &camera_data, &camera_data, PagedArray<RenderGeometryInstance *>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), PagedArray<RID>(), environment, RID(), compositor, p_shadow_atlas, RID(), scenario->reflection_atlas, RID(), 0, 0, nullptr, 0, nullptr, 0, nullptr);
 #endif
 }
 
@@ -3712,7 +3615,7 @@ bool RendererSceneCull::_render_reflection_probe_step(Instance *p_instance, int
 
 			RendererSceneRender::CameraData camera_data;
 			Transform3D xform = p_instance->transform * local_view;
-			camera_data.set_camera(xform, cm, false, false);
+			camera_data.set_camera(xform, cm, false, false, false);
 
 			RENDER_TIMESTAMP("Render ReflectionProbe, Face " + itos(face));
 			_render_scene(&camera_data, render_buffers, environment, RID(), RID(), RSG::light_storage->reflection_probe_get_cull_mask(p_instance->base), p_instance->scenario->self, RID(), shadow_atlas, reflection_probe->instance, face, mesh_lod_threshold, use_shadows);
@@ -3744,7 +3647,7 @@ void RendererSceneCull::render_probes() {
 			RID base = ref_probe->self()->owner->base;
 
 			switch (RSG::light_storage->reflection_probe_get_update_mode(base)) {
-				case RSE::REFLECTION_PROBE_UPDATE_ONCE: {
+				case RS::REFLECTION_PROBE_UPDATE_ONCE: {
 					if (busy) { // Already rendering something.
 						break;
 					}
@@ -3758,7 +3661,7 @@ void RendererSceneCull::render_probes() {
 
 					busy = true; // Do not render another one of this kind.
 				} break;
-				case RSE::REFLECTION_PROBE_UPDATE_ALWAYS: {
+				case RS::REFLECTION_PROBE_UPDATE_ALWAYS: {
 					int step = 0;
 					bool done = false;
 					while (!done) {
@@ -3822,13 +3725,13 @@ void RendererSceneCull::render_probes() {
 							cache->type != RSG::light_storage->light_get_type(instance->base) ||
 							cache->transform != instance->transform ||
 							cache->color != RSG::light_storage->light_get_color(instance->base) ||
-							cache->energy != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ENERGY) ||
-							cache->intensity != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INTENSITY) ||
-							cache->bake_energy != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INDIRECT_ENERGY) ||
-							cache->radius != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_RANGE) ||
-							cache->attenuation != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ATTENUATION) ||
-							cache->spot_angle != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ANGLE) ||
-							cache->spot_attenuation != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ATTENUATION)) {
+							cache->energy != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ENERGY) ||
+							cache->intensity != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INTENSITY) ||
+							cache->bake_energy != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INDIRECT_ENERGY) ||
+							cache->radius != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_RANGE) ||
+							cache->attenuation != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ATTENUATION) ||
+							cache->spot_angle != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ANGLE) ||
+							cache->spot_attenuation != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ATTENUATION)) {
 						cache_dirty = true;
 					}
 				}
@@ -3854,13 +3757,13 @@ void RendererSceneCull::render_probes() {
 							cache->type != RSG::light_storage->light_get_type(instance->base) ||
 							cache->transform != instance->transform ||
 							cache->color != RSG::light_storage->light_get_color(instance->base) ||
-							cache->energy != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ENERGY) ||
-							cache->intensity != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INTENSITY) ||
-							cache->bake_energy != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INDIRECT_ENERGY) ||
-							cache->radius != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_RANGE) ||
-							cache->attenuation != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ATTENUATION) ||
-							cache->spot_angle != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ANGLE) ||
-							cache->spot_attenuation != RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ATTENUATION) ||
+							cache->energy != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ENERGY) ||
+							cache->intensity != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INTENSITY) ||
+							cache->bake_energy != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INDIRECT_ENERGY) ||
+							cache->radius != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_RANGE) ||
+							cache->attenuation != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ATTENUATION) ||
+							cache->spot_angle != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ANGLE) ||
+							cache->spot_attenuation != RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ATTENUATION) ||
 							cache->sky_mode != RSG::light_storage->light_directional_get_sky_mode(instance->base)) {
 						cache_dirty = true;
 					}
@@ -3901,13 +3804,13 @@ void RendererSceneCull::render_probes() {
 					cache->type = RSG::light_storage->light_get_type(instance->base);
 					cache->transform = instance->transform;
 					cache->color = RSG::light_storage->light_get_color(instance->base);
-					cache->energy = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ENERGY);
-					cache->intensity = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INTENSITY);
-					cache->bake_energy = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
-					cache->radius = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_RANGE);
-					cache->attenuation = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ATTENUATION);
-					cache->spot_angle = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ANGLE);
-					cache->spot_attenuation = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+					cache->energy = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ENERGY);
+					cache->intensity = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INTENSITY);
+					cache->bake_energy = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INDIRECT_ENERGY);
+					cache->radius = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_RANGE);
+					cache->attenuation = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ATTENUATION);
+					cache->spot_angle = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ANGLE);
+					cache->spot_attenuation = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 
 					idx++;
 				}
@@ -3924,13 +3827,13 @@ void RendererSceneCull::render_probes() {
 					cache->type = RSG::light_storage->light_get_type(instance->base);
 					cache->transform = instance->transform;
 					cache->color = RSG::light_storage->light_get_color(instance->base);
-					cache->energy = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ENERGY);
-					cache->intensity = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INTENSITY);
-					cache->bake_energy = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_INDIRECT_ENERGY);
-					cache->radius = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_RANGE);
-					cache->attenuation = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_ATTENUATION);
-					cache->spot_angle = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ANGLE);
-					cache->spot_attenuation = RSG::light_storage->light_get_param(instance->base, RSE::LIGHT_PARAM_SPOT_ATTENUATION);
+					cache->energy = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ENERGY);
+					cache->intensity = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INTENSITY);
+					cache->bake_energy = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_INDIRECT_ENERGY);
+					cache->radius = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_RANGE);
+					cache->attenuation = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_ATTENUATION);
+					cache->spot_angle = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ANGLE);
+					cache->spot_attenuation = RSG::light_storage->light_get_param(instance->base, RS::LIGHT_PARAM_SPOT_ATTENUATION);
 					cache->sky_mode = RSG::light_storage->light_directional_get_sky_mode(instance->base);
 
 					idx++;
@@ -3984,7 +3887,7 @@ void RendererSceneCull::render_particle_colliders() {
 	while (heightfield_particle_colliders_update_list.begin()) {
 		Instance *hfpc = *heightfield_particle_colliders_update_list.begin();
 
-		if (hfpc->scenario && hfpc->base_type == RSE::INSTANCE_PARTICLES_COLLISION && RSG::particles_storage->particles_collision_is_heightfield(hfpc->base)) {
+		if (hfpc->scenario && hfpc->base_type == RS::INSTANCE_PARTICLES_COLLISION && RSG::particles_storage->particles_collision_is_heightfield(hfpc->base)) {
 			//update heightfield
 			instance_cull_result.clear();
 			scene_cull_result.geometry_instances.clear();
@@ -4009,7 +3912,7 @@ void RendererSceneCull::render_particle_colliders() {
 
 			for (int i = 0; i < (int)instance_cull_result.size(); i++) {
 				Instance *instance = instance_cull_result[i];
-				if (!instance || !((1 << instance->base_type) & (RSE::INSTANCE_GEOMETRY_MASK & (~(1 << RSE::INSTANCE_PARTICLES))))) { //all but particles to avoid self collision
+				if (!instance || !((1 << instance->base_type) & (RS::INSTANCE_GEOMETRY_MASK & (~(1 << RS::INSTANCE_PARTICLES))))) { //all but particles to avoid self collision
 					continue;
 				}
 				InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(instance->base_data);
@@ -4043,7 +3946,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 			RSG::material_storage->material_update_dependency(p_instance->material_overlay, &p_instance->dependency_tracker);
 		}
 
-		if (p_instance->base_type == RSE::INSTANCE_MESH) {
+		if (p_instance->base_type == RS::INSTANCE_MESH) {
 			//remove materials no longer used and un-own them
 
 			int new_mat_count = RSG::mesh_storage->mesh_get_surface_count(p_instance->base);
@@ -4052,7 +3955,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 			_instance_update_mesh_instance(p_instance);
 		}
 
-		if (p_instance->base_type == RSE::INSTANCE_PARTICLES) {
+		if (p_instance->base_type == RS::INSTANCE_PARTICLES) {
 			// update the process material dependency
 
 			RID particle_material = RSG::particles_storage->particles_get_process_material(p_instance->base);
@@ -4061,7 +3964,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 			}
 		}
 
-		if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+		if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 			InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(p_instance->base_data);
 
 			bool can_cast_shadows = true;
@@ -4069,7 +3972,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 
 			p_instance->instance_uniforms.materials_start();
 
-			if (p_instance->cast_shadows == RSE::SHADOW_CASTING_SETTING_OFF) {
+			if (p_instance->cast_shadows == RS::SHADOW_CASTING_SETTING_OFF) {
 				can_cast_shadows = false;
 			}
 
@@ -4080,7 +3983,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 				is_animated = RSG::material_storage->material_is_animated(p_instance->material_override);
 				p_instance->instance_uniforms.materials_append(p_instance->material_override);
 			} else {
-				if (p_instance->base_type == RSE::INSTANCE_MESH) {
+				if (p_instance->base_type == RS::INSTANCE_MESH) {
 					RID mesh = p_instance->base;
 
 					if (mesh.is_valid()) {
@@ -4111,7 +4014,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 						}
 					}
 
-				} else if (p_instance->base_type == RSE::INSTANCE_MULTIMESH) {
+				} else if (p_instance->base_type == RS::INSTANCE_MULTIMESH) {
 					RID mesh = RSG::mesh_storage->multimesh_get_mesh(p_instance->base);
 					if (mesh.is_valid()) {
 						bool cast_shadows = false;
@@ -4143,7 +4046,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 
 						RSG::utilities->base_update_dependency(mesh, &p_instance->dependency_tracker);
 					}
-				} else if (p_instance->base_type == RSE::INSTANCE_PARTICLES) {
+				} else if (p_instance->base_type == RS::INSTANCE_PARTICLES) {
 					bool cast_shadows = false;
 
 					int dp = RSG::particles_storage->particles_get_draw_passes(p_instance->base);
@@ -4211,7 +4114,7 @@ void RendererSceneCull::_update_dirty_instance(Instance *p_instance) const {
 
 		p_instance->dependency_tracker.update_end();
 
-		if ((1 << p_instance->base_type) & RSE::INSTANCE_GEOMETRY_MASK) {
+		if ((1 << p_instance->base_type) & RS::INSTANCE_GEOMETRY_MASK) {
 			InstanceGeometryData *geom = static_cast<InstanceGeometryData *>(p_instance->base_data);
 			ERR_FAIL_NULL(geom->geometry_instance);
 			geom->geometry_instance->set_surface_materials(p_instance->materials);
diff --git a/engine/servers/rendering/renderer_scene_cull.h b/engine/servers/rendering/renderer_scene_cull.h
index db572f9d..00104d9d 100644
--- a/engine/servers/rendering/renderer_scene_cull.h
+++ b/engine/servers/rendering/renderer_scene_cull.h
@@ -44,7 +44,6 @@
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_method.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/storage/utilities.h"
 
 class RenderingLightCuller;
@@ -301,7 +300,7 @@ public:
 	struct InstanceVisibilityData {
 		uint64_t viewport_state = 0;
 		int32_t array_index = -1;
-		RSE::VisibilityRangeFadeMode fade_mode = RSE::VISIBILITY_RANGE_FADE_DISABLED;
+		RS::VisibilityRangeFadeMode fade_mode = RS::VISIBILITY_RANGE_FADE_DISABLED;
 		Vector3 position;
 		Instance *instance = nullptr;
 		float range_begin = 0.0f;
@@ -400,7 +399,7 @@ public:
 	};
 
 	struct Instance {
-		RSE::InstanceType base_type;
+		RS::InstanceType base_type;
 		RID base;
 
 		RID skeleton;
@@ -419,7 +418,7 @@ public:
 
 		Vector<RID> materials;
 
-		RSE::ShadowCastingSetting cast_shadows;
+		RS::ShadowCastingSetting cast_shadows;
 
 		uint32_t layer_mask;
 		// Fit in 32 bits.
@@ -453,7 +452,7 @@ public:
 		float visibility_range_end = 0.0f;
 		float visibility_range_begin_margin = 0.0f;
 		float visibility_range_end_margin = 0.0f;
-		RSE::VisibilityRangeFadeMode visibility_range_fade_mode = RSE::VISIBILITY_RANGE_FADE_DISABLED;
+		RS::VisibilityRangeFadeMode visibility_range_fade_mode = RS::VISIBILITY_RANGE_FADE_DISABLED;
 		Instance *visibility_parent = nullptr;
 		HashSet<Instance *> visibility_dependencies;
 		uint32_t visibility_dependencies_depth = 0;
@@ -545,7 +544,7 @@ public:
 						singleton->instance_set_surface_override_material(instance->self, i, RID());
 					}
 				}
-				if (instance->base_type == RSE::INSTANCE_PARTICLES) {
+				if (instance->base_type == RS::INSTANCE_PARTICLES) {
 					RID particle_material = RSG::particles_storage->particles_get_process_material(instance->base);
 					if (p_dependency == particle_material) {
 						RSG::particles_storage->particles_set_process_material(instance->base, RID());
@@ -562,8 +561,8 @@ public:
 		Instance() :
 				scenario_item(this),
 				update_item(this) {
-			base_type = RSE::INSTANCE_NONE;
-			cast_shadows = RSE::SHADOW_CASTING_SETTING_ON;
+			base_type = RS::INSTANCE_NONE;
+			cast_shadows = RS::SHADOW_CASTING_SETTING_ON;
 			receive_shadows = true;
 			visible = true;
 			layer_mask = 1;
@@ -701,7 +700,7 @@ public:
 
 		Instance *baked_light = nullptr;
 
-		RSE::LightBakeMode bake_mode;
+		RS::LightBakeMode bake_mode;
 		uint32_t max_sdfgi_cascade = 2;
 		uint32_t cull_mask = 0xFFFFFFFF;
 
@@ -749,7 +748,7 @@ public:
 		bool is_shadow_update_full() const { return shadow_dirty_count == 0; }
 
 		InstanceLightData() {
-			bake_mode = RSE::LIGHT_BAKE_DISABLED;
+			bake_mode = RS::LIGHT_BAKE_DISABLED;
 			D = nullptr;
 			last_version = 0;
 			baked_light = nullptr;
@@ -770,7 +769,7 @@ public:
 		HashSet<Instance *> lights;
 
 		struct LightCache {
-			RSE::LightType type;
+			RS::LightType type;
 			Transform3D transform;
 			Color color;
 			float energy;
@@ -781,7 +780,7 @@ public:
 			float spot_angle;
 			float spot_attenuation;
 			bool has_shadow;
-			RSE::LightDirectionalSkyMode sky_mode;
+			RS::LightDirectionalSkyMode sky_mode;
 		};
 
 		Vector<LightCache> light_cache;
@@ -1052,12 +1051,12 @@ public:
 	virtual Vector<ObjectID> instances_cull_ray(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const;
 	virtual Vector<ObjectID> instances_cull_convex(const Vector<Plane> &p_convex, RID p_scenario = RID()) const;
 
-	virtual void instance_geometry_set_flag(RID p_instance, RSE::InstanceFlags p_flags, bool p_enabled);
-	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, RSE::ShadowCastingSetting p_shadow_casting_setting);
+	virtual void instance_geometry_set_flag(RID p_instance, RS::InstanceFlags p_flags, bool p_enabled);
+	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, RS::ShadowCastingSetting p_shadow_casting_setting);
 	virtual void instance_geometry_set_material_override(RID p_instance, RID p_material);
 	virtual void instance_geometry_set_material_overlay(RID p_instance, RID p_material);
 
-	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RSE::VisibilityRangeFadeMode p_fade_mode);
+	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RS::VisibilityRangeFadeMode p_fade_mode);
 
 	virtual void instance_geometry_set_lightmap(RID p_instance, RID p_lightmap, const Rect2 &p_lightmap_uv_scale, int p_slice_index);
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias);
@@ -1068,7 +1067,7 @@ public:
 	virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &p_parameter) const;
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation);
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source);
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source);
 
 	_FORCE_INLINE_ void _update_instance(Instance *p_instance) const;
 	_FORCE_INLINE_ void _update_instance_aabb(Instance *p_instance) const;
@@ -1154,10 +1153,10 @@ public:
 
 	bool _render_reflection_probe_step(Instance *p_instance, int p_step);
 
-	void _render_scene(const RendererSceneRender::CameraData *p_camera_data, const Ref<RenderSceneBuffers> &p_render_buffers, RID p_environment, RID p_force_camera_attributes, RID p_compositor, uint32_t p_visible_layers, RID p_scenario, RID p_viewport, RID p_shadow_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, float p_window_output_max_value, bool p_using_shadows = true, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
-	void render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas, float p_window_output_max_value);
+	void _render_scene(const RendererSceneRender::CameraData *p_camera_data, const Ref<RenderSceneBuffers> &p_render_buffers, RID p_environment, RID p_force_camera_attributes, RID p_compositor, uint32_t p_visible_layers, RID p_scenario, RID p_viewport, RID p_shadow_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, bool p_using_shadows = true, RenderInfo *r_render_info = nullptr);
+	void render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas);
 
-	void render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_screen_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, float p_window_output_max_value, RenderingServerTypes::RenderInfo *r_render_info = nullptr);
+	void render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_screen_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, RenderingMethod::RenderInfo *r_render_info = nullptr);
 	void update_dirty_instances() const;
 
 	void render_particle_colliders();
@@ -1175,7 +1174,7 @@ public:
 
 #define PASSBASE scene_render
 
-	PASS1(voxel_gi_set_quality, RSE::VoxelGIQuality)
+	PASS1(voxel_gi_set_quality, RS::VoxelGIQuality)
 
 	/* SKY API */
 
@@ -1183,7 +1182,7 @@ public:
 	PASS1(sky_initialize, RID)
 
 	PASS2(sky_set_radiance_size, RID, int)
-	PASS2(sky_set_mode, RID, RSE::SkyMode)
+	PASS2(sky_set_mode, RID, RS::SkyMode)
 	PASS2(sky_set_material, RID, RID)
 	PASS4R(Ref<Image>, sky_bake_panorama, RID, float, bool, const Size2i &)
 
@@ -1195,8 +1194,8 @@ public:
 	PASS1RC(bool, is_compositor_effect, RID)
 
 	PASS2(compositor_effect_set_enabled, RID, bool)
-	PASS3(compositor_effect_set_callback, RID, RSE::CompositorEffectCallbackType, const Callable &)
-	PASS3(compositor_effect_set_flag, RID, RSE::CompositorEffectFlags, bool)
+	PASS3(compositor_effect_set_callback, RID, RS::CompositorEffectCallbackType, const Callable &)
+	PASS3(compositor_effect_set_flag, RID, RS::CompositorEffectFlags, bool)
 
 	// Compositor
 
@@ -1215,17 +1214,17 @@ public:
 	PASS1RC(bool, is_environment, RID)
 
 	// Background
-	PASS2(environment_set_background, RID, RSE::EnvironmentBG)
+	PASS2(environment_set_background, RID, RS::EnvironmentBG)
 	PASS2(environment_set_sky, RID, RID)
 	PASS2(environment_set_sky_custom_fov, RID, float)
 	PASS2(environment_set_sky_orientation, RID, const Basis &)
 	PASS2(environment_set_bg_color, RID, const Color &)
 	PASS3(environment_set_bg_energy, RID, float, float)
 	PASS2(environment_set_canvas_max_layer, RID, int)
-	PASS6(environment_set_ambient_light, RID, const Color &, RSE::EnvironmentAmbientSource, float, float, RSE::EnvironmentReflectionSource)
+	PASS6(environment_set_ambient_light, RID, const Color &, RS::EnvironmentAmbientSource, float, float, RS::EnvironmentReflectionSource)
 	PASS2(environment_set_camera_feed_id, RID, int)
 
-	PASS1RC(RSE::EnvironmentBG, environment_get_background, RID)
+	PASS1RC(RS::EnvironmentBG, environment_get_background, RID)
 	PASS1RC(RID, environment_get_sky, RID)
 	PASS1RC(float, environment_get_sky_custom_fov, RID)
 	PASS1RC(Basis, environment_get_sky_orientation, RID)
@@ -1233,21 +1232,21 @@ public:
 	PASS1RC(float, environment_get_bg_energy_multiplier, RID)
 	PASS1RC(float, environment_get_bg_intensity, RID)
 	PASS1RC(int, environment_get_canvas_max_layer, RID)
-	PASS1RC(RSE::EnvironmentAmbientSource, environment_get_ambient_source, RID)
+	PASS1RC(RS::EnvironmentAmbientSource, environment_get_ambient_source, RID)
 	PASS1RC(Color, environment_get_ambient_light, RID)
 	PASS1RC(float, environment_get_ambient_light_energy, RID)
 	PASS1RC(float, environment_get_ambient_sky_contribution, RID)
-	PASS1RC(RSE::EnvironmentReflectionSource, environment_get_reflection_source, RID)
+	PASS1RC(RS::EnvironmentReflectionSource, environment_get_reflection_source, RID)
 
 	// Tonemap
-	PASS4(environment_set_tonemap, RID, RSE::EnvironmentToneMapper, float, float)
+	PASS4(environment_set_tonemap, RID, RS::EnvironmentToneMapper, float, float)
 	PASS2(environment_set_tonemap_agx_contrast, RID, float)
-	PASS1RC(RSE::EnvironmentToneMapper, environment_get_tone_mapper, RID)
+	PASS1RC(RS::EnvironmentToneMapper, environment_get_tone_mapper, RID)
 	PASS1RC(float, environment_get_exposure, RID)
-	PASS3RC(float, environment_get_white, RID, bool, float)
+	PASS2RC(float, environment_get_white, RID, bool)
 
 	// Fog
-	PASS11(environment_set_fog, RID, bool, const Color &, float, float, float, float, float, float, float, RSE::EnvironmentFogMode)
+	PASS11(environment_set_fog, RID, bool, const Color &, float, float, float, float, float, float, float, RS::EnvironmentFogMode)
 
 	PASS1RC(bool, environment_get_fog_enabled, RID)
 	PASS1RC(Color, environment_get_fog_light_color, RID)
@@ -1258,7 +1257,7 @@ public:
 	PASS1RC(float, environment_get_fog_height, RID)
 	PASS1RC(float, environment_get_fog_height_density, RID)
 	PASS1RC(float, environment_get_fog_aerial_perspective, RID)
-	PASS1RC(RSE::EnvironmentFogMode, environment_get_fog_mode, RID)
+	PASS1RC(RS::EnvironmentFogMode, environment_get_fog_mode, RID)
 
 	PASS2(environment_set_volumetric_fog_volume_size, int, int)
 	PASS1(environment_set_volumetric_fog_filter_active, bool)
@@ -1287,7 +1286,7 @@ public:
 	PASS1RC(float, environment_get_volumetric_fog_ambient_inject, RID)
 
 	// Glow
-	PASS13(environment_set_glow, RID, bool, Vector<float>, float, float, float, float, RSE::EnvironmentGlowBlendMode, float, float, float, float, RID)
+	PASS13(environment_set_glow, RID, bool, Vector<float>, float, float, float, float, RS::EnvironmentGlowBlendMode, float, float, float, float, RID)
 
 	PASS1RC(bool, environment_get_glow_enabled, RID)
 	PASS1RC(Vector<float>, environment_get_glow_levels, RID)
@@ -1295,7 +1294,7 @@ public:
 	PASS1RC(float, environment_get_glow_strength, RID)
 	PASS1RC(float, environment_get_glow_bloom, RID)
 	PASS1RC(float, environment_get_glow_mix, RID)
-	PASS1RC(RSE::EnvironmentGlowBlendMode, environment_get_glow_blend_mode, RID)
+	PASS1RC(RS::EnvironmentGlowBlendMode, environment_get_glow_blend_mode, RID)
 	PASS1RC(float, environment_get_glow_hdr_bleed_threshold, RID)
 	PASS1RC(float, environment_get_glow_hdr_luminance_cap, RID)
 	PASS1RC(float, environment_get_glow_hdr_bleed_scale, RID)
@@ -1314,7 +1313,7 @@ public:
 	PASS1RC(float, environment_get_ssr_depth_tolerance, RID)
 
 	PASS1(environment_set_ssr_half_size, bool)
-	PASS1(environment_set_ssr_roughness_quality, RSE::EnvironmentSSRRoughnessQuality)
+	PASS1(environment_set_ssr_roughness_quality, RS::EnvironmentSSRRoughnessQuality)
 
 	// SSAO
 	PASS10(environment_set_ssao, RID, bool, float, float, float, float, float, float, float, float)
@@ -1329,7 +1328,7 @@ public:
 	PASS1RC(float, environment_get_ssao_direct_light_affect, RID)
 	PASS1RC(float, environment_get_ssao_ao_channel_affect, RID)
 
-	PASS6(environment_set_ssao_quality, RSE::EnvironmentSSAOQuality, bool, float, int, float, float)
+	PASS6(environment_set_ssao_quality, RS::EnvironmentSSAOQuality, bool, float, int, float, float)
 
 	// SSIL
 	PASS6(environment_set_ssil, RID, bool, float, float, float, float)
@@ -1340,11 +1339,11 @@ public:
 	PASS1RC(float, environment_get_ssil_sharpness, RID)
 	PASS1RC(float, environment_get_ssil_normal_rejection, RID)
 
-	PASS6(environment_set_ssil_quality, RSE::EnvironmentSSILQuality, bool, float, int, float, float)
+	PASS6(environment_set_ssil_quality, RS::EnvironmentSSILQuality, bool, float, int, float, float)
 
 	// SDFGI
 
-	PASS11(environment_set_sdfgi, RID, bool, int, float, RSE::EnvironmentSDFGIYScale, bool, float, bool, float, float, float)
+	PASS11(environment_set_sdfgi, RID, bool, int, float, RS::EnvironmentSDFGIYScale, bool, float, bool, float, float, float)
 
 	PASS1RC(bool, environment_get_sdfgi_enabled, RID)
 	PASS1RC(int, environment_get_sdfgi_cascades, RID)
@@ -1355,11 +1354,11 @@ public:
 	PASS1RC(float, environment_get_sdfgi_energy, RID)
 	PASS1RC(float, environment_get_sdfgi_normal_bias, RID)
 	PASS1RC(float, environment_get_sdfgi_probe_bias, RID)
-	PASS1RC(RSE::EnvironmentSDFGIYScale, environment_get_sdfgi_y_scale, RID)
+	PASS1RC(RS::EnvironmentSDFGIYScale, environment_get_sdfgi_y_scale, RID)
 
-	PASS1(environment_set_sdfgi_ray_count, RSE::EnvironmentSDFGIRayCount)
-	PASS1(environment_set_sdfgi_frames_to_converge, RSE::EnvironmentSDFGIFramesToConverge)
-	PASS1(environment_set_sdfgi_frames_to_update_light, RSE::EnvironmentSDFGIFramesToUpdateLight)
+	PASS1(environment_set_sdfgi_ray_count, RS::EnvironmentSDFGIRayCount)
+	PASS1(environment_set_sdfgi_frames_to_converge, RS::EnvironmentSDFGIFramesToConverge)
+	PASS1(environment_set_sdfgi_frames_to_update_light, RS::EnvironmentSDFGIFramesToUpdateLight)
 
 	// Adjustment
 	PASS7(environment_set_adjustment, RID, bool, float, float, float, bool, RID)
@@ -1374,11 +1373,11 @@ public:
 	PASS3R(Ref<Image>, environment_bake_panorama, RID, bool, const Size2i &)
 
 	PASS3(screen_space_roughness_limiter_set_active, bool, float, float)
-	PASS1(sub_surface_scattering_set_quality, RSE::SubSurfaceScatteringQuality)
+	PASS1(sub_surface_scattering_set_quality, RS::SubSurfaceScatteringQuality)
 	PASS2(sub_surface_scattering_set_scale, float, float)
 
-	PASS1(positional_soft_shadow_filter_set_quality, RSE::ShadowQuality)
-	PASS1(directional_soft_shadow_filter_set_quality, RSE::ShadowQuality)
+	PASS1(positional_soft_shadow_filter_set_quality, RS::ShadowQuality)
+	PASS1(directional_soft_shadow_filter_set_quality, RS::ShadowQuality)
 
 	PASS2(sdfgi_set_debug_probe_select, const Vector3 &, const Vector3 &)
 
@@ -1388,10 +1387,10 @@ public:
 	PASS1(gi_set_use_half_resolution, bool)
 
 	/* Misc */
-	PASS1(set_debug_draw_mode, RSE::ViewportDebugDraw)
+	PASS1(set_debug_draw_mode, RS::ViewportDebugDraw)
 
-	PASS1(decals_set_filter, RSE::DecalFilter)
-	PASS1(light_projectors_set_filter, RSE::LightProjectorFilter)
+	PASS1(decals_set_filter, RS::DecalFilter)
+	PASS1(light_projectors_set_filter, RS::LightProjectorFilter)
 	PASS1(lightmaps_set_bicubic_filter, bool)
 	PASS1(material_set_use_debanding, bool)
 
diff --git a/engine/servers/rendering/renderer_scene_occlusion_cull.cpp b/engine/servers/rendering/renderer_scene_occlusion_cull.cpp
index 1ca7520a..6f9f4bf9 100644
--- a/engine/servers/rendering/renderer_scene_occlusion_cull.cpp
+++ b/engine/servers/rendering/renderer_scene_occlusion_cull.cpp
@@ -30,9 +30,6 @@
 
 #include "renderer_scene_occlusion_cull.h"
 
-#include "core/config/engine.h"
-#include "servers/rendering/rendering_server.h"
-
 RendererSceneOcclusionCull *RendererSceneOcclusionCull::singleton = nullptr;
 
 bool RendererSceneOcclusionCull::HZBuffer::occlusion_jitter_enabled = false;
diff --git a/engine/servers/rendering/renderer_scene_occlusion_cull.h b/engine/servers/rendering/renderer_scene_occlusion_cull.h
index 675a80f4..749d5160 100644
--- a/engine/servers/rendering/renderer_scene_occlusion_cull.h
+++ b/engine/servers/rendering/renderer_scene_occlusion_cull.h
@@ -30,12 +30,9 @@
 
 #pragma once
 
-#include "core/io/image.h"
 #include "core/math/projection.h"
 #include "core/templates/local_vector.h"
-#include "servers/rendering/rendering_server_enums.h"
-
-#include <cfloat> // FLT_MIN, FLT_MAX
+#include "servers/rendering/rendering_server.h"
 
 class RendererSceneOcclusionCull {
 protected:
@@ -236,7 +233,7 @@ public:
 		return RID();
 	}
 
-	virtual void set_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality) {}
+	virtual void set_build_quality(RS::ViewportOcclusionCullingBuildQuality p_quality) {}
 
 	RendererSceneOcclusionCull() {
 		singleton = this;
diff --git a/engine/servers/rendering/renderer_scene_render.cpp b/engine/servers/rendering/renderer_scene_render.cpp
index 6223cbaa..997824ea 100644
--- a/engine/servers/rendering/renderer_scene_render.cpp
+++ b/engine/servers/rendering/renderer_scene_render.cpp
@@ -30,14 +30,13 @@
 
 #include "renderer_scene_render.h"
 
-#include "core/variant/typed_array.h"
-
 /////////////////////////////////////////////////////////////////////////////
 // CameraData
 
-void RendererSceneRender::CameraData::set_camera(const Transform3D p_transform, const Projection p_projection, bool p_is_orthogonal, bool p_vaspect, const Vector2 &p_taa_jitter, float p_taa_frame_count, uint32_t p_visible_layers) {
+void RendererSceneRender::CameraData::set_camera(const Transform3D p_transform, const Projection p_projection, bool p_is_orthogonal, bool p_is_frustum, bool p_vaspect, const Vector2 &p_taa_jitter, float p_taa_frame_count, uint32_t p_visible_layers) {
 	view_count = 1;
 	is_orthogonal = p_is_orthogonal;
+	is_frustum = p_is_frustum;
 	vaspect = p_vaspect;
 
 	main_transform = p_transform;
@@ -50,12 +49,13 @@ void RendererSceneRender::CameraData::set_camera(const Transform3D p_transform,
 	taa_frame_count = p_taa_frame_count;
 }
 
-void RendererSceneRender::CameraData::set_multiview_camera(uint32_t p_view_count, const Transform3D *p_transforms, const Projection *p_projections, bool p_is_orthogonal, bool p_vaspect, uint32_t p_visible_layers) {
+void RendererSceneRender::CameraData::set_multiview_camera(uint32_t p_view_count, const Transform3D *p_transforms, const Projection *p_projections, bool p_is_orthogonal, bool p_is_frustum, bool p_vaspect, uint32_t p_visible_layers) {
 	ERR_FAIL_COND_MSG(p_view_count != 2, "Incorrect view count for stereoscopic view");
 
 	visible_layers = p_visible_layers;
 	view_count = p_view_count;
 	is_orthogonal = p_is_orthogonal;
+	is_frustum = p_is_frustum;
 	vaspect = p_vaspect;
 	Vector<Plane> planes[2];
 
@@ -211,11 +211,11 @@ void RendererSceneRender::compositor_effect_set_enabled(RID p_effect, bool p_ena
 	compositor_storage.compositor_effect_set_enabled(p_effect, p_enabled);
 }
 
-void RendererSceneRender::compositor_effect_set_callback(RID p_effect, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) {
+void RendererSceneRender::compositor_effect_set_callback(RID p_effect, RS::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) {
 	compositor_storage.compositor_effect_set_callback(p_effect, p_callback_type, p_callback);
 }
 
-void RendererSceneRender::compositor_effect_set_flag(RID p_effect, RSE::CompositorEffectFlags p_flag, bool p_set) {
+void RendererSceneRender::compositor_effect_set_flag(RID p_effect, RS::CompositorEffectFlags p_flag, bool p_set) {
 	compositor_storage.compositor_effect_set_flag(p_effect, p_flag, p_set);
 }
 
@@ -267,7 +267,7 @@ bool RendererSceneRender::is_environment(RID p_rid) const {
 
 // background
 
-void RendererSceneRender::environment_set_background(RID p_env, RSE::EnvironmentBG p_bg) {
+void RendererSceneRender::environment_set_background(RID p_env, RS::EnvironmentBG p_bg) {
 	environment_storage.environment_set_background(p_env, p_bg);
 }
 
@@ -295,11 +295,11 @@ void RendererSceneRender::environment_set_canvas_max_layer(RID p_env, int p_max_
 	environment_storage.environment_set_canvas_max_layer(p_env, p_max_layer);
 }
 
-void RendererSceneRender::environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RSE::EnvironmentReflectionSource p_reflection_source) {
+void RendererSceneRender::environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RS::EnvironmentReflectionSource p_reflection_source) {
 	environment_storage.environment_set_ambient_light(p_env, p_color, p_ambient, p_energy, p_sky_contribution, p_reflection_source);
 }
 
-RSE::EnvironmentBG RendererSceneRender::environment_get_background(RID p_env) const {
+RS::EnvironmentBG RendererSceneRender::environment_get_background(RID p_env) const {
 	return environment_storage.environment_get_background(p_env);
 }
 
@@ -331,7 +331,7 @@ int RendererSceneRender::environment_get_canvas_max_layer(RID p_env) const {
 	return environment_storage.environment_get_canvas_max_layer(p_env);
 }
 
-RSE::EnvironmentAmbientSource RendererSceneRender::environment_get_ambient_source(RID p_env) const {
+RS::EnvironmentAmbientSource RendererSceneRender::environment_get_ambient_source(RID p_env) const {
 	return environment_storage.environment_get_ambient_source(p_env);
 }
 
@@ -347,7 +347,7 @@ float RendererSceneRender::environment_get_ambient_sky_contribution(RID p_env) c
 	return environment_storage.environment_get_ambient_sky_contribution(p_env);
 }
 
-RSE::EnvironmentReflectionSource RendererSceneRender::environment_get_reflection_source(RID p_env) const {
+RS::EnvironmentReflectionSource RendererSceneRender::environment_get_reflection_source(RID p_env) const {
 	return environment_storage.environment_get_reflection_source(p_env);
 }
 
@@ -361,11 +361,11 @@ int RendererSceneRender::environment_get_camera_feed_id(RID p_env) const {
 
 // Tonemap
 
-void RendererSceneRender::environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) {
+void RendererSceneRender::environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) {
 	environment_storage.environment_set_tonemap(p_env, p_tone_mapper, p_exposure, p_white);
 }
 
-RSE::EnvironmentToneMapper RendererSceneRender::environment_get_tone_mapper(RID p_env) const {
+RS::EnvironmentToneMapper RendererSceneRender::environment_get_tone_mapper(RID p_env) const {
 	return environment_storage.environment_get_tone_mapper(p_env);
 }
 
@@ -373,8 +373,8 @@ float RendererSceneRender::environment_get_exposure(RID p_env) const {
 	return environment_storage.environment_get_exposure(p_env);
 }
 
-float RendererSceneRender::environment_get_white(RID p_env, bool p_limit_agx_white, float p_output_max_value) const {
-	return environment_storage.environment_get_white(p_env, p_limit_agx_white, p_output_max_value);
+float RendererSceneRender::environment_get_white(RID p_env, bool p_limit_agx_white) const {
+	return environment_storage.environment_get_white(p_env, p_limit_agx_white);
 }
 
 void RendererSceneRender::environment_set_tonemap_agx_contrast(RID p_env, float p_agx_contrast) {
@@ -385,13 +385,13 @@ float RendererSceneRender::environment_get_tonemap_agx_contrast(RID p_env) const
 	return environment_storage.environment_get_tonemap_agx_contrast(p_env);
 }
 
-RendererEnvironmentStorage::TonemapParameters RendererSceneRender::environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white, float p_output_max_value) const {
-	return environment_storage.environment_get_tonemap_parameters(p_env, p_limit_agx_white, p_output_max_value);
+RendererEnvironmentStorage::TonemapParameters RendererSceneRender::environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white) const {
+	return environment_storage.environment_get_tonemap_parameters(p_env, p_limit_agx_white);
 }
 
 // Fog
 
-void RendererSceneRender::environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode) {
+void RendererSceneRender::environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RS::EnvironmentFogMode p_mode) {
 	environment_storage.environment_set_fog(p_env, p_enable, p_light_color, p_light_energy, p_sun_scatter, p_density, p_height, p_height_density, p_aerial_perspective, p_sky_affect, p_mode);
 }
 
@@ -399,7 +399,7 @@ bool RendererSceneRender::environment_get_fog_enabled(RID p_env) const {
 	return environment_storage.environment_get_fog_enabled(p_env);
 }
 
-RSE::EnvironmentFogMode RendererSceneRender::environment_get_fog_mode(RID p_env) const {
+RS::EnvironmentFogMode RendererSceneRender::environment_get_fog_mode(RID p_env) const {
 	return environment_storage.environment_get_fog_mode(p_env);
 }
 
@@ -513,7 +513,7 @@ float RendererSceneRender::environment_get_volumetric_fog_ambient_inject(RID p_e
 
 // GLOW
 
-void RendererSceneRender::environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) {
+void RendererSceneRender::environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) {
 	environment_storage.environment_set_glow(p_env, p_enable, p_levels, p_intensity, p_strength, p_mix, p_bloom_threshold, p_blend_mode, p_hdr_bleed_threshold, p_hdr_bleed_scale, p_hdr_luminance_cap, p_glow_map_strength, p_glow_map);
 }
 
@@ -541,7 +541,7 @@ float RendererSceneRender::environment_get_glow_mix(RID p_env) const {
 	return environment_storage.environment_get_glow_mix(p_env);
 }
 
-RSE::EnvironmentGlowBlendMode RendererSceneRender::environment_get_glow_blend_mode(RID p_env) const {
+RS::EnvironmentGlowBlendMode RendererSceneRender::environment_get_glow_blend_mode(RID p_env) const {
 	return environment_storage.environment_get_glow_blend_mode(p_env);
 }
 
@@ -661,7 +661,7 @@ float RendererSceneRender::environment_get_ssil_normal_rejection(RID p_env) cons
 
 // SDFGI
 
-void RendererSceneRender::environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) {
+void RendererSceneRender::environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) {
 	environment_storage.environment_set_sdfgi(p_env, p_enable, p_cascades, p_min_cell_size, p_y_scale, p_use_occlusion, p_bounce_feedback, p_read_sky, p_energy, p_normal_bias, p_probe_bias);
 }
 
@@ -701,7 +701,7 @@ float RendererSceneRender::environment_get_sdfgi_probe_bias(RID p_env) const {
 	return environment_storage.environment_get_sdfgi_probe_bias(p_env);
 }
 
-RSE::EnvironmentSDFGIYScale RendererSceneRender::environment_get_sdfgi_y_scale(RID p_env) const {
+RS::EnvironmentSDFGIYScale RendererSceneRender::environment_get_sdfgi_y_scale(RID p_env) const {
 	return environment_storage.environment_get_sdfgi_y_scale(p_env);
 }
 
diff --git a/engine/servers/rendering/renderer_scene_render.h b/engine/servers/rendering/renderer_scene_render.h
index 371d2de1..34285f9c 100644
--- a/engine/servers/rendering/renderer_scene_render.h
+++ b/engine/servers/rendering/renderer_scene_render.h
@@ -33,10 +33,10 @@
 #include "core/math/projection.h"
 #include "core/templates/paged_array.h"
 #include "servers/rendering/renderer_geometry_instance.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/storage/compositor_storage.h"
 #include "servers/rendering/storage/environment_storage.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
+#include "storage/render_scene_buffers.h"
 
 class RendererSceneRender {
 private:
@@ -56,14 +56,10 @@ public:
 	virtual void geometry_instance_free(RenderGeometryInstance *p_geometry_instance) = 0;
 	virtual uint32_t geometry_instance_get_pair_mask() = 0;
 
-	/* Lights matched up to Geometry Instances */
-	virtual uint32_t get_max_lights_total() = 0;
-	virtual uint32_t get_max_lights_per_mesh() = 0;
-
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) = 0;
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) = 0;
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) = 0;
 
 	/* SDFGI UPDATE */
 
@@ -78,7 +74,7 @@ public:
 	virtual void sky_initialize(RID p_rid) = 0;
 
 	virtual void sky_set_radiance_size(RID p_sky, int p_radiance_size) = 0;
-	virtual void sky_set_mode(RID p_sky, RSE::SkyMode p_samples) = 0;
+	virtual void sky_set_mode(RID p_sky, RS::SkyMode p_samples) = 0;
 	virtual void sky_set_material(RID p_sky, RID p_material) = 0;
 	virtual Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) = 0;
 
@@ -90,8 +86,8 @@ public:
 
 	bool is_compositor_effect(RID p_compositor) const;
 	void compositor_effect_set_enabled(RID p_compositor, bool p_enabled);
-	void compositor_effect_set_callback(RID p_compositor, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback);
-	void compositor_effect_set_flag(RID p_compositor, RSE::CompositorEffectFlags p_flag, bool p_set);
+	void compositor_effect_set_callback(RID p_compositor, RS::CompositorEffectCallbackType p_callback_type, const Callable &p_callback);
+	void compositor_effect_set_flag(RID p_compositor, RS::CompositorEffectFlags p_flag, bool p_set);
 
 	/* COMPOSITOR API */
 
@@ -112,17 +108,17 @@ public:
 	bool is_environment(RID p_env) const;
 
 	// Background
-	void environment_set_background(RID p_env, RSE::EnvironmentBG p_bg);
+	void environment_set_background(RID p_env, RS::EnvironmentBG p_bg);
 	void environment_set_sky(RID p_env, RID p_sky);
 	void environment_set_sky_custom_fov(RID p_env, float p_scale);
 	void environment_set_sky_orientation(RID p_env, const Basis &p_orientation);
 	void environment_set_bg_color(RID p_env, const Color &p_color);
 	void environment_set_bg_energy(RID p_env, float p_multiplier, float p_exposure_value);
 	void environment_set_canvas_max_layer(RID p_env, int p_max_layer);
-	void environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient = RSE::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RSE::EnvironmentReflectionSource p_reflection_source = RSE::ENV_REFLECTION_SOURCE_BG);
+	void environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient = RS::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RS::EnvironmentReflectionSource p_reflection_source = RS::ENV_REFLECTION_SOURCE_BG);
 	void environment_set_camera_feed_id(RID p_env, int p_camera_feed_id);
 
-	RSE::EnvironmentBG environment_get_background(RID p_env) const;
+	RS::EnvironmentBG environment_get_background(RID p_env) const;
 	RID environment_get_sky(RID p_env) const;
 	float environment_get_sky_custom_fov(RID p_env) const;
 	Basis environment_get_sky_orientation(RID p_env) const;
@@ -130,26 +126,26 @@ public:
 	float environment_get_bg_energy_multiplier(RID p_env) const;
 	float environment_get_bg_intensity(RID p_env) const;
 	int environment_get_canvas_max_layer(RID p_env) const;
-	RSE::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const;
+	RS::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const;
 	Color environment_get_ambient_light(RID p_env) const;
 	float environment_get_ambient_light_energy(RID p_env) const;
 	float environment_get_ambient_sky_contribution(RID p_env) const;
-	RSE::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const;
+	RS::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const;
 	int environment_get_camera_feed_id(RID p_env) const;
 
 	// Tonemap
-	void environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white);
-	RSE::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const;
+	void environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white);
+	RS::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const;
 	float environment_get_exposure(RID p_env) const;
-	float environment_get_white(RID p_env, bool p_limit_agx_white, float p_output_max_value) const;
+	float environment_get_white(RID p_env, bool p_limit_agx_white) const;
 	void environment_set_tonemap_agx_contrast(RID p_env, float p_agx_contrast);
 	float environment_get_tonemap_agx_contrast(RID p_env) const;
-	RendererEnvironmentStorage::TonemapParameters environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white, float p_output_max_value) const;
+	RendererEnvironmentStorage::TonemapParameters environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white) const;
 
 	// Fog
-	void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode);
+	void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RS::EnvironmentFogMode p_mode);
 	bool environment_get_fog_enabled(RID p_env) const;
-	RSE::EnvironmentFogMode environment_get_fog_mode(RID p_env) const;
+	RS::EnvironmentFogMode environment_get_fog_mode(RID p_env) const;
 	Color environment_get_fog_light_color(RID p_env) const;
 	float environment_get_fog_light_energy(RID p_env) const;
 	float environment_get_fog_sun_scatter(RID p_env) const;
@@ -185,14 +181,14 @@ public:
 	virtual void environment_set_volumetric_fog_filter_active(bool p_enable) = 0;
 
 	// GLOW
-	void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map);
+	void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map);
 	bool environment_get_glow_enabled(RID p_env) const;
 	Vector<float> environment_get_glow_levels(RID p_env) const;
 	float environment_get_glow_intensity(RID p_env) const;
 	float environment_get_glow_strength(RID p_env) const;
 	float environment_get_glow_bloom(RID p_env) const;
 	float environment_get_glow_mix(RID p_env) const;
-	RSE::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const;
+	RS::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const;
 	float environment_get_glow_hdr_bleed_threshold(RID p_env) const;
 	float environment_get_glow_hdr_luminance_cap(RID p_env) const;
 	float environment_get_glow_hdr_bleed_scale(RID p_env) const;
@@ -210,7 +206,7 @@ public:
 	float environment_get_ssr_depth_tolerance(RID p_env) const;
 
 	virtual void environment_set_ssr_half_size(bool p_half_size) = 0;
-	virtual void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) = 0;
+	virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) = 0;
 
 	// SSAO
 	void environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_power, float p_detail, float p_horizon, float p_sharpness, float p_light_affect, float p_ao_channel_affect);
@@ -224,7 +220,7 @@ public:
 	float environment_get_ssao_direct_light_affect(RID p_env) const;
 	float environment_get_ssao_ao_channel_affect(RID p_env) const;
 
-	virtual void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
 	// SSIL
 	void environment_set_ssil(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_sharpness, float p_normal_rejection);
@@ -234,10 +230,10 @@ public:
 	float environment_get_ssil_sharpness(RID p_env) const;
 	float environment_get_ssil_normal_rejection(RID p_env) const;
 
-	virtual void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
 	// SDFGI
-	void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias);
+	void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias);
 	bool environment_get_sdfgi_enabled(RID p_env) const;
 	int environment_get_sdfgi_cascades(RID p_env) const;
 	float environment_get_sdfgi_min_cell_size(RID p_env) const;
@@ -247,11 +243,11 @@ public:
 	float environment_get_sdfgi_energy(RID p_env) const;
 	float environment_get_sdfgi_normal_bias(RID p_env) const;
 	float environment_get_sdfgi_probe_bias(RID p_env) const;
-	RSE::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const;
+	RS::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const;
 
-	virtual void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) = 0;
-	virtual void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) = 0;
-	virtual void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
+	virtual void environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) = 0;
+	virtual void environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) = 0;
+	virtual void environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
 
 	// Adjustment
 	void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, bool p_use_1d_color_correction, RID p_color_correction);
@@ -264,8 +260,8 @@ public:
 
 	virtual Ref<Image> environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) = 0;
 
-	virtual void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
-	virtual void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
+	virtual void positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) = 0;
+	virtual void directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) = 0;
 
 	virtual RID fog_volume_instance_create(RID p_fog_volume) = 0;
 	virtual void fog_volume_instance_set_transform(RID p_fog_volume_instance, const Transform3D &p_transform) = 0;
@@ -278,7 +274,7 @@ public:
 	virtual bool voxel_gi_needs_update(RID p_probe) const = 0;
 	virtual void voxel_gi_update(RID p_probe, bool p_update_light_instances, const Vector<RID> &p_light_instances, const PagedArray<RenderGeometryInstance *> &p_dynamic_objects) = 0;
 
-	virtual void voxel_gi_set_quality(RSE::VoxelGIQuality) = 0;
+	virtual void voxel_gi_set_quality(RS::VoxelGIQuality) = 0;
 
 	struct RenderShadowData {
 		RID light;
@@ -306,6 +302,7 @@ public:
 		// flags
 		uint32_t view_count;
 		bool is_orthogonal;
+		bool is_frustum;
 		uint32_t visible_layers;
 		bool vaspect;
 
@@ -318,18 +315,18 @@ public:
 		Vector2 taa_jitter;
 		float taa_frame_count = 0.0f;
 
-		void set_camera(const Transform3D p_transform, const Projection p_projection, bool p_is_orthogonal, bool p_vaspect, const Vector2 &p_taa_jitter = Vector2(), float p_taa_frame_count = 0.0f, uint32_t p_visible_layers = 0xFFFFFFFF);
-		void set_multiview_camera(uint32_t p_view_count, const Transform3D *p_transforms, const Projection *p_projections, bool p_is_orthogonal, bool p_vaspect, uint32_t p_visible_layers = 0xFFFFFFFF);
+		void set_camera(const Transform3D p_transform, const Projection p_projection, bool p_is_orthogonal, bool p_is_frustum, bool p_vaspect, const Vector2 &p_taa_jitter = Vector2(), float p_taa_frame_count = 0.0f, uint32_t p_visible_layers = 0xFFFFFFFF);
+		void set_multiview_camera(uint32_t p_view_count, const Transform3D *p_transforms, const Projection *p_projections, bool p_is_orthogonal, bool p_is_frustum, bool p_vaspect, uint32_t p_visible_layers = 0xFFFFFFFF);
 	};
 
-	virtual void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, float p_window_output_max_value, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingServerTypes::RenderInfo *r_render_info = nullptr) = 0;
+	virtual void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_compositor, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingMethod::RenderInfo *r_render_info = nullptr) = 0;
 
 	virtual void render_material(const Transform3D &p_cam_transform, const Projection &p_cam_projection, bool p_cam_orthogonal, const PagedArray<RenderGeometryInstance *> &p_instances, RID p_framebuffer, const Rect2i &p_region) = 0;
 	virtual void render_particle_collider_heightfield(RID p_collider, const Transform3D &p_transform, const PagedArray<RenderGeometryInstance *> &p_instances) = 0;
 
 	virtual void set_scene_pass(uint64_t p_pass) = 0;
 	virtual void set_time(double p_time, double p_step) = 0;
-	virtual void set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) = 0;
+	virtual void set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) = 0;
 
 	virtual Ref<RenderSceneBuffers> render_buffers_create() = 0;
 	virtual void gi_set_use_half_resolution(bool p_enable) = 0;
@@ -337,7 +334,7 @@ public:
 	virtual void screen_space_roughness_limiter_set_active(bool p_enable, float p_amount, float p_limit) = 0;
 	virtual bool screen_space_roughness_limiter_is_active() const = 0;
 
-	virtual void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) = 0;
+	virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) = 0;
 	virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) = 0;
 
 	virtual TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) = 0;
@@ -346,8 +343,8 @@ public:
 
 	virtual void sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) = 0;
 
-	virtual void decals_set_filter(RSE::DecalFilter p_filter) = 0;
-	virtual void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) = 0;
+	virtual void decals_set_filter(RS::DecalFilter p_filter) = 0;
+	virtual void light_projectors_set_filter(RS::LightProjectorFilter p_filter) = 0;
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) = 0;
 	virtual void material_set_use_debanding(bool p_enable) = 0;
 
diff --git a/engine/servers/rendering/renderer_viewport.cpp b/engine/servers/rendering/renderer_viewport.cpp
index 10733aa1..b965ec61 100644
--- a/engine/servers/rendering/renderer_viewport.cpp
+++ b/engine/servers/rendering/renderer_viewport.cpp
@@ -30,24 +30,17 @@
 
 #include "renderer_viewport.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/math/transform_interpolator.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/renderer_canvas_cull.h"
-#include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/renderer_scene_occlusion_cull.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_method.h"
-#include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/storage/texture_storage.h"
+#include "renderer_canvas_cull.h"
+#include "renderer_scene_cull.h"
+#include "rendering_server_globals.h"
+#include "storage/texture_storage.h"
 
 #ifndef XR_DISABLED
 #include "servers/xr/xr_interface.h"
-#include "servers/xr/xr_server.h"
 #endif // XR_DISABLED
 
 static Transform2D _canvas_get_transform(RendererViewport::Viewport *p_viewport, RendererCanvasCull::Canvas *p_canvas, RendererViewport::Viewport::CanvasData *p_canvas_data, const Vector2 &p_vp_size) {
@@ -140,78 +133,78 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 		} else {
 			const float EPSILON = 0.0001;
 			float scaling_3d_scale = p_viewport->scaling_3d_scale;
-			RSE::ViewportScaling3DMode scaling_3d_mode = p_viewport->scaling_3d_mode;
+			RS::ViewportScaling3DMode scaling_3d_mode = p_viewport->scaling_3d_mode;
 			bool upscaler_available = p_viewport->fsr_enabled;
-			RSE::ViewportScaling3DType scaling_type = RSE::scaling_3d_mode_type(scaling_3d_mode);
+			RS::ViewportScaling3DType scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 
-			if ((!upscaler_available || (scaling_type == RSE::VIEWPORT_SCALING_3D_TYPE_SPATIAL)) && scaling_3d_scale >= (1.0 - EPSILON) && scaling_3d_scale <= (1.0 + EPSILON)) {
+			if ((!upscaler_available || (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_SPATIAL)) && scaling_3d_scale >= (1.0 - EPSILON) && scaling_3d_scale <= (1.0 + EPSILON)) {
 				// No 3D scaling for spatial modes? Ignore scaling mode, this just introduces overhead.
 				// - Mobile can't perform optimal path
 				// - FSR does an extra pass (or 2 extra passes if 2D-MSAA is enabled)
 				// Scaling = 1.0 on FSR2 and MetalFX temporal has benefits
 				scaling_3d_scale = 1.0;
-				scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 			}
 
-			if (scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF && scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR && scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_NEAREST && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
-				scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
-				scaling_type = RSE::scaling_3d_mode_type(scaling_3d_mode);
+			if (scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF && scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_BILINEAR && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 				WARN_PRINT_ONCE("MetalFX and FSR upscaling are not supported in the Compatibility renderer. Falling back to bilinear scaling.");
 			}
 
-			if (scaling_3d_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL)) {
+			if (scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL)) {
 				if (RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL)) {
 					// Prefer MetalFX spatial if it is supported, which will be much more efficient than FSR2,
 					// as the hardware already will struggle with FSR2.
-					scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL;
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL;
 					WARN_PRINT_ONCE("MetalFX temporal upscaling is not supported by the current renderer or hardware. Falling back to MetalFX Spatial scaling.");
 				} else {
-					scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_FSR2;
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR2;
 					WARN_PRINT_ONCE("MetalFX upscaling is not supported by the current renderer or hardware. Falling back to FSR 2 scaling.");
 				}
-				scaling_type = RSE::scaling_3d_mode_type(scaling_3d_mode);
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 			}
 
-			if (scaling_3d_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL)) {
-				scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_FSR;
+			if (scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL)) {
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR;
 				WARN_PRINT_ONCE("MetalFX spatial upscaling is not supported by the current renderer or hardware. Falling back to FSR scaling.");
 			}
 
-			RSE::ViewportMSAA msaa_3d = p_viewport->msaa_3d;
+			RS::ViewportMSAA msaa_3d = p_viewport->msaa_3d;
 
 			// If MetalFX Temporal upscaling is supported, verify limits.
-			if (scaling_3d_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
+			if (scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
 				double min_scale = (double)RD::get_singleton()->limit_get(RD::LIMIT_METALFX_TEMPORAL_SCALER_MIN_SCALE) / 1000'000.0;
 				double max_scale = (double)RD::get_singleton()->limit_get(RD::LIMIT_METALFX_TEMPORAL_SCALER_MAX_SCALE) / 1000'000.0;
 				if ((double)scaling_3d_scale < min_scale || (double)scaling_3d_scale > max_scale) {
-					scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_FSR2;
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR2;
 					WARN_PRINT_ONCE(vformat("MetalFX temporal upscaling scale is outside limits; scale must be between %f and %f. Falling back to FSR 2 3D resolution scaling.", min_scale, max_scale));
-				} else if (msaa_3d != RSE::VIEWPORT_MSAA_DISABLED) {
+				} else if (msaa_3d != RS::VIEWPORT_MSAA_DISABLED) {
 					WARN_PRINT_ONCE("MetalFX temporal upscaling does not support 3D MSAA. Disabling 3D MSAA internally.");
-					msaa_3d = RSE::VIEWPORT_MSAA_DISABLED;
+					msaa_3d = RS::VIEWPORT_MSAA_DISABLED;
 				}
 			}
 
-			bool scaling_3d_is_not_bilinear = scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_OFF && scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+			bool scaling_3d_is_not_bilinear = scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF && scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
 			bool use_taa = p_viewport->use_taa;
 
-			if (scaling_3d_is_not_bilinear && scaling_3d_scale >= (1.0 + EPSILON)) {
-				// FSR, MetalFX, and nearest-neighbor scaling are not designed for downsampling.
+			if (scaling_3d_is_not_bilinear && (scaling_3d_scale >= (1.0 + EPSILON))) {
+				// FSR and MetalFX is not designed for downsampling.
 				// Fall back to bilinear scaling.
-				WARN_PRINT_ONCE("FSR, MetalFX, and nearest-neighbor 3D resolution scaling are not designed for downsampling. Falling back to bilinear 3D resolution scaling.");
-				scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
-				scaling_type = RSE::scaling_3d_mode_type(scaling_3d_mode);
+				WARN_PRINT_ONCE("FSR 3D resolution scaling is not designed for downsampling. Falling back to bilinear 3D resolution scaling.");
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 			}
 
-			if (scaling_3d_is_not_bilinear && scaling_3d_mode != RSE::VIEWPORT_SCALING_3D_MODE_NEAREST && !upscaler_available) {
+			if (scaling_3d_is_not_bilinear && !upscaler_available) {
 				// FSR is not actually available.
 				// Fall back to bilinear scaling.
 				WARN_PRINT_ONCE("FSR 3D resolution scaling is not available. Falling back to bilinear 3D resolution scaling.");
-				scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
-				scaling_type = RSE::scaling_3d_mode_type(scaling_3d_mode);
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 			}
 
-			if (use_taa && scaling_type == RSE::VIEWPORT_SCALING_3D_TYPE_TEMPORAL) {
+			if (use_taa && (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {
 				// Temporal upscalers can't be used with TAA.
 				// Turn it off and prefer using the temporal upscaler.
 				WARN_PRINT_ONCE("FSR 2 or MetalFX Temporal is not compatible with TAA. Disabling TAA internally.");
@@ -224,8 +217,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 			int render_height;
 
 			switch (scaling_3d_mode) {
-				case RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR:
-				case RSE::VIEWPORT_SCALING_3D_MODE_NEAREST:
+				case RS::VIEWPORT_SCALING_3D_MODE_BILINEAR:
 					// Clamp 3D rendering resolution to reasonable values supported on most hardware.
 					// This prevents freezing the engine or outright crashing on lower-end GPUs.
 					target_width = p_viewport->size.width;
@@ -233,16 +225,16 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 					render_width = CLAMP(target_width * scaling_3d_scale, 1, 16384);
 					render_height = CLAMP(target_height * scaling_3d_scale, 1, 16384);
 					break;
-				case RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL:
-				case RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL:
-				case RSE::VIEWPORT_SCALING_3D_MODE_FSR:
-				case RSE::VIEWPORT_SCALING_3D_MODE_FSR2:
+				case RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL:
+				case RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL:
+				case RS::VIEWPORT_SCALING_3D_MODE_FSR:
+				case RS::VIEWPORT_SCALING_3D_MODE_FSR2:
 					target_width = p_viewport->size.width;
 					target_height = p_viewport->size.height;
 					render_width = MAX(target_width * scaling_3d_scale, 1.0); // target_width / (target_width * scaling)
 					render_height = MAX(target_height * scaling_3d_scale, 1.0);
 					break;
-				case RSE::VIEWPORT_SCALING_3D_MODE_OFF:
+				case RS::VIEWPORT_SCALING_3D_MODE_OFF:
 					target_width = p_viewport->size.width;
 					target_height = p_viewport->size.height;
 					render_width = target_width;
@@ -251,7 +243,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 				default:
 					// This is an unknown mode.
 					WARN_PRINT_ONCE(vformat("Unknown scaling mode: %d. Disabling 3D resolution scaling.", scaling_3d_mode));
-					scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 					scaling_3d_scale = 1.0;
 					target_width = p_viewport->size.width;
 					target_height = p_viewport->size.height;
@@ -261,7 +253,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 			}
 
 			uint32_t jitter_phase_count = 0;
-			if (scaling_type == RSE::VIEWPORT_SCALING_3D_TYPE_TEMPORAL) {
+			if (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL) {
 				// Implementation has been copied from ffxFsr2GetJitterPhaseCount.
 				// Also used for MetalFX Temporal scaling.
 				jitter_phase_count = uint32_t(8.0f * std::pow(float(target_width) / render_width, 2.0f));
@@ -323,7 +315,7 @@ void RendererViewport::_draw_3d(Viewport *p_viewport) {
 	}
 
 	float screen_mesh_lod_threshold = p_viewport->mesh_lod_threshold / float(p_viewport->size.width);
-	RSG::scene->render_camera(p_viewport->render_buffers, p_viewport->camera, p_viewport->scenario, p_viewport->self, p_viewport->internal_size, p_viewport->jitter_phase_count, screen_mesh_lod_threshold, p_viewport->shadow_atlas, xr_interface, p_viewport->window_output_max_value, &p_viewport->render_info);
+	RSG::scene->render_camera(p_viewport->render_buffers, p_viewport->camera, p_viewport->scenario, p_viewport->self, p_viewport->internal_size, p_viewport->jitter_phase_count, screen_mesh_lod_threshold, p_viewport->shadow_atlas, xr_interface, &p_viewport->render_info);
 
 	RENDER_TIMESTAMP("< Render 3D Scene");
 #endif // _3D_DISABLED
@@ -348,8 +340,8 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 	int scenario_canvas_max_layer = 0;
 	bool force_clear_render_target = false;
 
-	for (int i = 0; i < RSE::VIEWPORT_RENDER_INFO_TYPE_MAX; i++) {
-		for (int j = 0; j < RSE::VIEWPORT_RENDER_INFO_MAX; j++) {
+	for (int i = 0; i < RS::VIEWPORT_RENDER_INFO_TYPE_MAX; i++) {
+		for (int j = 0; j < RS::VIEWPORT_RENDER_INFO_MAX; j++) {
 			p_viewport->render_info.info[i][j] = 0;
 		}
 	}
@@ -358,22 +350,13 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 		RID environment = RSG::scene->scenario_get_environment(p_viewport->scenario);
 		if (RSG::scene->is_environment(environment)) {
 			if (can_draw_2d && !viewport_is_environment_disabled(p_viewport)) {
-				scenario_draw_canvas_bg = RSG::scene->environment_get_background(environment) == RSE::ENV_BG_CANVAS;
+				scenario_draw_canvas_bg = RSG::scene->environment_get_background(environment) == RS::ENV_BG_CANVAS;
 				scenario_canvas_max_layer = RSG::scene->environment_get_canvas_max_layer(environment);
-			} else if (RSG::scene->environment_get_background(environment) == RSE::ENV_BG_CANVAS) {
+			} else if (RSG::scene->environment_get_background(environment) == RS::ENV_BG_CANVAS) {
 				// The scene renderer will still copy over the last frame, so we need to clear the render target.
 				force_clear_render_target = true;
 			}
 		}
-
-		p_viewport->window_output_max_value = 1.0;
-		DisplayServerEnums::WindowID parent_window = _get_containing_window(p_viewport);
-		if (RD::get_singleton() && parent_window != DisplayServerEnums::INVALID_WINDOW_ID) {
-			RenderingContextDriver *context_driver = RD::get_singleton()->get_context_driver();
-			if (context_driver->window_get_hdr_output_enabled(parent_window)) {
-				p_viewport->window_output_max_value = context_driver->window_get_output_max_linear_value(parent_window);
-			}
-		}
 	}
 
 	bool can_draw_3d = RSG::scene->is_camera(p_viewport->camera) && !p_viewport->disable_3d;
@@ -387,10 +370,10 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 
 	Color bgcolor = p_viewport->transparent_bg ? Color(0, 0, 0, 0) : RSG::texture_storage->get_default_clear_color();
 
-	if (p_viewport->clear_mode != RSE::VIEWPORT_CLEAR_NEVER) {
+	if (p_viewport->clear_mode != RS::VIEWPORT_CLEAR_NEVER) {
 		RSG::texture_storage->render_target_request_clear(p_viewport->render_target, bgcolor);
-		if (p_viewport->clear_mode == RSE::VIEWPORT_CLEAR_ONLY_NEXT_FRAME) {
-			p_viewport->clear_mode = RSE::VIEWPORT_CLEAR_NEVER;
+		if (p_viewport->clear_mode == RS::VIEWPORT_CLEAR_ONLY_NEXT_FRAME) {
+			p_viewport->clear_mode = RS::VIEWPORT_CLEAR_NEVER;
 		}
 	}
 
@@ -525,7 +508,7 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 
 					directional_light_count++;
 
-					if (directional_light_count == RSE::MAX_2D_DIRECTIONAL_LIGHTS) {
+					if (directional_light_count == RS::MAX_2D_DIRECTIONAL_LIGHTS) {
 						break;
 					}
 				}
@@ -669,7 +652,7 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 			// Clear now otherwise we copy over garbage from the render target.
 			RSG::texture_storage->render_target_do_clear_request(p_viewport->render_target);
 			if (!can_draw_3d) {
-				RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas, p_viewport->window_output_max_value);
+				RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas);
 			} else {
 				_draw_3d(p_viewport);
 			}
@@ -712,7 +695,7 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 				// Clear now otherwise we copy over garbage from the render target.
 				RSG::texture_storage->render_target_do_clear_request(p_viewport->render_target);
 				if (!can_draw_3d) {
-					RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas, p_viewport->window_output_max_value);
+					RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas);
 				} else {
 					_draw_3d(p_viewport);
 				}
@@ -726,7 +709,7 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 			// Clear now otherwise we copy over garbage from the render target.
 			RSG::texture_storage->render_target_do_clear_request(p_viewport->render_target);
 			if (!can_draw_3d) {
-				RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas, p_viewport->window_output_max_value);
+				RSG::scene->render_empty_scene(p_viewport->render_buffers, p_viewport->scenario, p_viewport->shadow_atlas);
 			} else {
 				_draw_3d(p_viewport);
 			}
@@ -750,21 +733,6 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 	}
 }
 
-DisplayServerEnums::WindowID RendererViewport::_get_containing_window(Viewport *p_viewport) {
-	if (p_viewport->viewport_to_screen != DisplayServerEnums::INVALID_WINDOW_ID) {
-		return p_viewport->viewport_to_screen;
-	}
-
-	if (p_viewport->parent.is_valid()) {
-		Viewport *parent = viewport_owner.get_or_null(p_viewport->parent);
-		if (parent) {
-			return _get_containing_window(parent);
-		}
-	}
-
-	return DisplayServerEnums::INVALID_WINDOW_ID;
-}
-
 void RendererViewport::draw_viewports(bool p_swap_buffers) {
 	GodotProfileZoneGroupedFirst(_profile_zone, "prepare viewports");
 	timestamp_vp_map.clear();
@@ -789,7 +757,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 		sorted_active_viewports_dirty = false;
 	}
 
-	HashMap<DisplayServerEnums::WindowID, Vector<RenderingServerTypes::BlitToScreen>> blit_to_screen_list;
+	HashMap<DisplayServer::WindowID, Vector<BlitToScreen>> blit_to_screen_list;
 	//draw viewports
 	RENDER_TIMESTAMP("> Render Viewports");
 
@@ -801,7 +769,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 	for (int i = sorted_active_viewports.size() - 1; i >= 0; i--) { //to compute parent dependency, must go in reverse draw order
 		Viewport *vp = sorted_active_viewports[i];
 
-		if (vp->update_mode == RSE::VIEWPORT_UPDATE_DISABLED) {
+		if (vp->update_mode == RS::VIEWPORT_UPDATE_DISABLED) {
 			continue;
 		}
 
@@ -814,19 +782,30 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 
 #ifndef XR_DISABLED
 		if (vp->use_xr) {
-			visible = xr_interface.is_valid();
+			if (xr_interface.is_valid()) {
+				// Ignore update mode we have to commit frames to our XR interface
+				visible = true;
+
+				// Override our size, make sure it matches our required size and is created as a stereo target
+				Size2 xr_size = xr_interface->get_render_target_size();
+				_viewport_set_size(vp, xr_size.width, xr_size.height, xr_interface->get_view_count());
+			} else {
+				// don't render anything
+				visible = false;
+				vp->size = Size2();
+			}
 		} else
 #endif // XR_DISABLED
 		{
-			if (vp->update_mode == RSE::VIEWPORT_UPDATE_ALWAYS || vp->update_mode == RSE::VIEWPORT_UPDATE_ONCE) {
+			if (vp->update_mode == RS::VIEWPORT_UPDATE_ALWAYS || vp->update_mode == RS::VIEWPORT_UPDATE_ONCE) {
 				visible = true;
 			}
 
-			if (vp->update_mode == RSE::VIEWPORT_UPDATE_WHEN_VISIBLE && RSG::texture_storage->render_target_was_used(vp->render_target)) {
+			if (vp->update_mode == RS::VIEWPORT_UPDATE_WHEN_VISIBLE && RSG::texture_storage->render_target_was_used(vp->render_target)) {
 				visible = true;
 			}
 
-			if (vp->update_mode == RSE::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE) {
+			if (vp->update_mode == RS::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE) {
 				Viewport *parent = viewport_owner.get_or_null(vp->parent);
 				if (parent && parent->last_pass == draw_viewports_pass) {
 					visible = true;
@@ -834,7 +813,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 			}
 		}
 
-		visible = visible && vp->size.x > 1 && vp->size.y > 1 && vp->view_count > 0;
+		visible = visible && vp->size.x > 1 && vp->size.y > 1;
 
 		if (visible) {
 			vp->last_pass = draw_viewports_pass;
@@ -888,8 +867,8 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 				_draw_viewport(vp);
 
 				// commit our eyes
-				Vector<RenderingServerTypes::BlitToScreen> blits = xr_interface->post_draw_viewport(vp->render_target, vp->viewport_to_screen_rect);
-				if (vp->viewport_to_screen != DisplayServerEnums::INVALID_WINDOW_ID) {
+				Vector<BlitToScreen> blits = xr_interface->post_draw_viewport(vp->render_target, vp->viewport_to_screen_rect);
+				if (vp->viewport_to_screen != DisplayServer::INVALID_WINDOW_ID) {
 					if (RSG::rasterizer->is_opengl()) {
 						if (blits.size() > 0) {
 							RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, blits.ptr(), blits.size());
@@ -897,7 +876,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 						}
 					} else if (blits.size() > 0) {
 						if (!blit_to_screen_list.has(vp->viewport_to_screen)) {
-							blit_to_screen_list[vp->viewport_to_screen] = Vector<RenderingServerTypes::BlitToScreen>();
+							blit_to_screen_list[vp->viewport_to_screen] = Vector<BlitToScreen>();
 						}
 
 						for (int b = 0; b < blits.size(); b++) {
@@ -914,9 +893,9 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 			// render standard mono camera
 			_draw_viewport(vp);
 
-			if (vp->viewport_to_screen != DisplayServerEnums::INVALID_WINDOW_ID && (!vp->viewport_render_direct_to_screen || !RSG::rasterizer->is_low_end())) {
+			if (vp->viewport_to_screen != DisplayServer::INVALID_WINDOW_ID && (!vp->viewport_render_direct_to_screen || !RSG::rasterizer->is_low_end())) {
 				//copy to screen if set as such
-				RenderingServerTypes::BlitToScreen blit;
+				BlitToScreen blit;
 				blit.render_target = vp->render_target;
 				if (vp->viewport_to_screen_rect != Rect2()) {
 					blit.dst_rect = vp->viewport_to_screen_rect;
@@ -929,32 +908,32 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 					RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, &blit, 1);
 					RSG::rasterizer->gl_end_frame(p_swap_buffers);
 				} else {
-					Vector<RenderingServerTypes::BlitToScreen> *blits = blit_to_screen_list.getptr(vp->viewport_to_screen);
+					Vector<BlitToScreen> *blits = blit_to_screen_list.getptr(vp->viewport_to_screen);
 					if (blits == nullptr) {
-						blits = &blit_to_screen_list.insert(vp->viewport_to_screen, Vector<RenderingServerTypes::BlitToScreen>())->value;
+						blits = &blit_to_screen_list.insert(vp->viewport_to_screen, Vector<BlitToScreen>())->value;
 					}
 					blits->push_back(blit);
 				}
 			}
 		}
 
-		if (vp->update_mode == RSE::VIEWPORT_UPDATE_ONCE) {
-			vp->update_mode = RSE::VIEWPORT_UPDATE_DISABLED;
+		if (vp->update_mode == RS::VIEWPORT_UPDATE_ONCE) {
+			vp->update_mode = RS::VIEWPORT_UPDATE_DISABLED;
 		}
 
 		RENDER_TIMESTAMP("< Render Viewport " + itos(i));
 
 		// 3D render info.
-		objects_drawn += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] + vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME];
-		vertices_drawn += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] + vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME];
-		draw_calls_used += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] + vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME];
+		objects_drawn += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] + vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME];
+		vertices_drawn += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME] + vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME];
+		draw_calls_used += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_VISIBLE][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME] + vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_SHADOW][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME];
 		// 2D render info.
-		objects_drawn += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME];
-		vertices_drawn += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME];
-		draw_calls_used += vp->render_info.info[RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME];
+		objects_drawn += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME];
+		vertices_drawn += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME];
+		draw_calls_used += vp->render_info.info[RS::VIEWPORT_RENDER_INFO_TYPE_CANVAS][RS::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME];
 	}
 
-	RSG::scene->set_debug_draw_mode(RSE::VIEWPORT_DEBUG_DRAW_DISABLED);
+	RSG::scene->set_debug_draw_mode(RS::VIEWPORT_DEBUG_DRAW_DISABLED);
 
 	total_objects_drawn = objects_drawn;
 	total_vertices_drawn = vertices_drawn;
@@ -964,7 +943,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 
 	GodotProfileZoneGrouped(_profile_zone, "rasterizer->blit_render_targets_to_screen");
 	if (p_swap_buffers && !blit_to_screen_list.is_empty()) {
-		for (const KeyValue<int, Vector<RenderingServerTypes::BlitToScreen>> &E : blit_to_screen_list) {
+		for (const KeyValue<int, Vector<BlitToScreen>> &E : blit_to_screen_list) {
 			RSG::rasterizer->blit_render_targets_to_screen(E.key, E.value.ptr(), E.value.size());
 		}
 	}
@@ -1005,23 +984,23 @@ void RendererViewport::viewport_set_use_xr(RID p_viewport, bool p_use_xr) {
 }
 #endif // !XR_DISABLED
 
-void RendererViewport::viewport_set_scaling_3d_mode(RID p_viewport, RSE::ViewportScaling3DMode p_mode) {
+void RendererViewport::viewport_set_scaling_3d_mode(RID p_viewport, RS::ViewportScaling3DMode p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 #ifdef DEBUG_ENABLED
 	const String rendering_method = OS::get_singleton()->get_current_rendering_method();
 	if (rendering_method != "forward_plus") {
-		if (p_mode == RSE::VIEWPORT_SCALING_3D_MODE_FSR) {
+		if (p_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) {
 			WARN_PRINT_ONCE_ED("FSR1 3D scaling is only available when using the Forward+ renderer.");
 		}
-		if (p_mode == RSE::VIEWPORT_SCALING_3D_MODE_FSR2) {
+		if (p_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR2) {
 			WARN_PRINT_ONCE_ED("FSR2 3D scaling is only available when using the Forward+ renderer.");
 		}
-		if (p_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
+		if (p_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
 			WARN_PRINT_ONCE_ED("MetalFX Temporal 3D scaling is only available when using the Forward+ renderer.");
 		}
 	}
-	if (rendering_method == "gl_compatibility" && p_mode == RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
+	if (rendering_method == "gl_compatibility" && p_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
 		WARN_PRINT_ONCE_ED("MetalFX Spatial 3D scaling is only available when using the Forward+ or Mobile renderer.");
 	}
 #endif
@@ -1057,7 +1036,7 @@ void RendererViewport::viewport_set_texture_mipmap_bias(RID p_viewport, float p_
 	_configure_3d_render_buffers(viewport);
 }
 
-void RendererViewport::viewport_set_anisotropic_filtering_level(RID p_viewport, RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
+void RendererViewport::viewport_set_anisotropic_filtering_level(RID p_viewport, RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1080,13 +1059,14 @@ void RendererViewport::viewport_set_scaling_3d_scale(RID p_viewport, float p_sca
 	_configure_3d_render_buffers(viewport);
 }
 
-void RendererViewport::viewport_set_size(RID p_viewport, int p_width, int p_height, int p_view_count) {
-	ERR_FAIL_COND(p_width < 0 || p_height < 0 || p_view_count < 0);
+void RendererViewport::viewport_set_size(RID p_viewport, int p_width, int p_height) {
+	ERR_FAIL_COND(p_width < 0 || p_height < 0);
 
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
+	ERR_FAIL_COND_MSG(viewport->use_xr, "Cannot set viewport size when using XR");
 
-	_viewport_set_size(viewport, p_width, p_height, p_view_count);
+	_viewport_set_size(viewport, p_width, p_height, 1);
 }
 
 void RendererViewport::_viewport_set_size(Viewport *p_viewport, int p_width, int p_height, uint32_t p_view_count) {
@@ -1104,8 +1084,8 @@ void RendererViewport::_viewport_set_size(Viewport *p_viewport, int p_width, int
 
 bool RendererViewport::_viewport_requires_motion_vectors(Viewport *p_viewport) {
 	return p_viewport->use_taa ||
-			RSE::scaling_3d_mode_type(p_viewport->scaling_3d_mode) == RSE::VIEWPORT_SCALING_3D_TYPE_TEMPORAL ||
-			p_viewport->debug_draw == RSE::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS || p_viewport->force_motion_vectors;
+			RS::scaling_3d_mode_type(p_viewport->scaling_3d_mode) == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL ||
+			p_viewport->debug_draw == RenderingServer::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS || p_viewport->force_motion_vectors;
 }
 
 void RendererViewport::viewport_set_active(RID p_viewport, bool p_active) {
@@ -1130,18 +1110,18 @@ void RendererViewport::viewport_set_parent_viewport(RID p_viewport, RID p_parent
 	viewport->parent = p_parent_viewport;
 }
 
-void RendererViewport::viewport_set_clear_mode(RID p_viewport, RSE::ViewportClearMode p_clear_mode) {
+void RendererViewport::viewport_set_clear_mode(RID p_viewport, RS::ViewportClearMode p_clear_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
 	viewport->clear_mode = p_clear_mode;
 }
 
-void RendererViewport::viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect, DisplayServerEnums::WindowID p_screen) {
+void RendererViewport::viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect, DisplayServer::WindowID p_screen) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
-	if (p_screen != DisplayServerEnums::INVALID_WINDOW_ID) {
+	if (p_screen != DisplayServer::INVALID_WINDOW_ID) {
 		// If using OpenGL we can optimize this operation by rendering directly to system_fbo
 		// instead of rendering to fbo and copying to system_fbo after
 		if (RSG::rasterizer->is_low_end() && viewport->viewport_render_direct_to_screen) {
@@ -1159,7 +1139,7 @@ void RendererViewport::viewport_attach_to_screen(RID p_viewport, const Rect2 &p_
 		}
 
 		viewport->viewport_to_screen_rect = Rect2();
-		viewport->viewport_to_screen = DisplayServerEnums::INVALID_WINDOW_ID;
+		viewport->viewport_to_screen = DisplayServer::INVALID_WINDOW_ID;
 	}
 }
 
@@ -1187,16 +1167,16 @@ void RendererViewport::viewport_set_render_direct_to_screen(RID p_viewport, bool
 	}
 }
 
-void RendererViewport::viewport_set_update_mode(RID p_viewport, RSE::ViewportUpdateMode p_mode) {
+void RendererViewport::viewport_set_update_mode(RID p_viewport, RS::ViewportUpdateMode p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
 	viewport->update_mode = p_mode;
 }
 
-RSE::ViewportUpdateMode RendererViewport::viewport_get_update_mode(RID p_viewport) const {
+RS::ViewportUpdateMode RendererViewport::viewport_get_update_mode(RID p_viewport) const {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
-	ERR_FAIL_NULL_V(viewport, RSE::VIEWPORT_UPDATE_DISABLED);
+	ERR_FAIL_NULL_V(viewport, RS::VIEWPORT_UPDATE_DISABLED);
 
 	return viewport->update_mode;
 }
@@ -1219,7 +1199,7 @@ RID RendererViewport::viewport_get_occluder_debug_texture(RID p_viewport) const
 	const Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL_V(viewport, RID());
 
-	if (viewport->use_occlusion_culling && viewport->debug_draw == RSE::VIEWPORT_DEBUG_DRAW_OCCLUDERS) {
+	if (viewport->use_occlusion_culling && viewport->debug_draw == RenderingServer::VIEWPORT_DEBUG_DRAW_OCCLUDERS) {
 		return RendererSceneOcclusionCull::get_singleton()->buffer_get_debug_texture(p_viewport);
 	}
 	return RID();
@@ -1248,7 +1228,7 @@ void RendererViewport::viewport_set_disable_2d(RID p_viewport, bool p_disable) {
 	viewport->disable_2d = p_disable;
 }
 
-void RendererViewport::viewport_set_environment_mode(RID p_viewport, RSE::ViewportEnvironmentMode p_mode) {
+void RendererViewport::viewport_set_environment_mode(RID p_viewport, RS::ViewportEnvironmentMode p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1258,11 +1238,11 @@ void RendererViewport::viewport_set_environment_mode(RID p_viewport, RSE::Viewpo
 bool RendererViewport::viewport_is_environment_disabled(Viewport *viewport) {
 	ERR_FAIL_NULL_V(viewport, false);
 
-	if (viewport->parent.is_valid() && viewport->disable_environment == RSE::VIEWPORT_ENVIRONMENT_INHERIT) {
+	if (viewport->parent.is_valid() && viewport->disable_environment == RS::VIEWPORT_ENVIRONMENT_INHERIT) {
 		Viewport *parent = viewport_owner.get_or_null(viewport->parent);
 		return viewport_is_environment_disabled(parent);
 	}
-	return viewport->disable_environment == RSE::VIEWPORT_ENVIRONMENT_DISABLED;
+	return viewport->disable_environment == RS::VIEWPORT_ENVIRONMENT_DISABLED;
 }
 
 void RendererViewport::viewport_set_disable_3d(RID p_viewport, bool p_disable) {
@@ -1371,7 +1351,7 @@ void RendererViewport::viewport_set_positional_shadow_atlas_quadrant_subdivision
 	RSG::light_storage->shadow_atlas_set_quadrant_subdivision(viewport->shadow_atlas, p_quadrant, p_subdiv);
 }
 
-void RendererViewport::viewport_set_msaa_2d(RID p_viewport, RSE::ViewportMSAA p_msaa) {
+void RendererViewport::viewport_set_msaa_2d(RID p_viewport, RS::ViewportMSAA p_msaa) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1382,7 +1362,7 @@ void RendererViewport::viewport_set_msaa_2d(RID p_viewport, RSE::ViewportMSAA p_
 	RSG::texture_storage->render_target_set_msaa(viewport->render_target, p_msaa);
 }
 
-void RendererViewport::viewport_set_msaa_3d(RID p_viewport, RSE::ViewportMSAA p_msaa) {
+void RendererViewport::viewport_set_msaa_3d(RID p_viewport, RS::ViewportMSAA p_msaa) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1412,11 +1392,11 @@ bool RendererViewport::viewport_is_using_hdr_2d(RID p_viewport) const {
 	return viewport->use_hdr_2d;
 }
 
-void RendererViewport::viewport_set_screen_space_aa(RID p_viewport, RSE::ViewportScreenSpaceAA p_mode) {
+void RendererViewport::viewport_set_screen_space_aa(RID p_viewport, RS::ViewportScreenSpaceAA p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 #ifdef DEBUG_ENABLED
-	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" && p_mode != RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED) {
+	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" && p_mode != RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED) {
 		WARN_PRINT_ONCE_ED("Screen-space AA is only available when using the Forward+ or Mobile renderer.");
 	}
 #endif
@@ -1518,7 +1498,7 @@ void RendererViewport::viewport_set_occlusion_rays_per_thread(int p_rays_per_thr
 	}
 }
 
-void RendererViewport::viewport_set_occlusion_culling_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality) {
+void RendererViewport::viewport_set_occlusion_culling_build_quality(RS::ViewportOcclusionCullingBuildQuality p_quality) {
 	RendererSceneOcclusionCull::get_singleton()->set_build_quality(p_quality);
 }
 
@@ -1529,9 +1509,9 @@ void RendererViewport::viewport_set_mesh_lod_threshold(RID p_viewport, float p_p
 	viewport->mesh_lod_threshold = p_pixels;
 }
 
-int RendererViewport::viewport_get_render_info(RID p_viewport, RSE::ViewportRenderInfoType p_type, RSE::ViewportRenderInfo p_info) {
-	ERR_FAIL_INDEX_V(p_type, RSE::VIEWPORT_RENDER_INFO_TYPE_MAX, -1);
-	ERR_FAIL_INDEX_V(p_info, RSE::VIEWPORT_RENDER_INFO_MAX, -1);
+int RendererViewport::viewport_get_render_info(RID p_viewport, RS::ViewportRenderInfoType p_type, RS::ViewportRenderInfo p_info) {
+	ERR_FAIL_INDEX_V(p_type, RS::VIEWPORT_RENDER_INFO_TYPE_MAX, -1);
+	ERR_FAIL_INDEX_V(p_info, RS::VIEWPORT_RENDER_INFO_MAX, -1);
 
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	if (!viewport) {
@@ -1541,7 +1521,7 @@ int RendererViewport::viewport_get_render_info(RID p_viewport, RSE::ViewportRend
 	return viewport->render_info.info[p_type][p_info];
 }
 
-void RendererViewport::viewport_set_debug_draw(RID p_viewport, RSE::ViewportDebugDraw p_draw) {
+void RendererViewport::viewport_set_debug_draw(RID p_viewport, RS::ViewportDebugDraw p_draw) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1587,29 +1567,29 @@ void RendererViewport::viewport_set_snap_2d_vertices_to_pixel(RID p_viewport, bo
 	viewport->snap_2d_vertices_to_pixel = p_enabled;
 }
 
-void RendererViewport::viewport_set_default_canvas_item_texture_filter(RID p_viewport, RSE::CanvasItemTextureFilter p_filter) {
-	ERR_FAIL_COND_MSG(p_filter == RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, "Viewport does not accept DEFAULT as texture filter (it's the topmost choice already).)");
+void RendererViewport::viewport_set_default_canvas_item_texture_filter(RID p_viewport, RS::CanvasItemTextureFilter p_filter) {
+	ERR_FAIL_COND_MSG(p_filter == RS::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, "Viewport does not accept DEFAULT as texture filter (it's the topmost choice already).)");
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
 	viewport->texture_filter = p_filter;
 }
-void RendererViewport::viewport_set_default_canvas_item_texture_repeat(RID p_viewport, RSE::CanvasItemTextureRepeat p_repeat) {
-	ERR_FAIL_COND_MSG(p_repeat == RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, "Viewport does not accept DEFAULT as texture repeat (it's the topmost choice already).)");
+void RendererViewport::viewport_set_default_canvas_item_texture_repeat(RID p_viewport, RS::CanvasItemTextureRepeat p_repeat) {
+	ERR_FAIL_COND_MSG(p_repeat == RS::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, "Viewport does not accept DEFAULT as texture repeat (it's the topmost choice already).)");
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
 	viewport->texture_repeat = p_repeat;
 }
 
-void RendererViewport::viewport_set_sdf_oversize_and_scale(RID p_viewport, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) {
+void RendererViewport::viewport_set_sdf_oversize_and_scale(RID p_viewport, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
 	RSG::texture_storage->render_target_set_sdf_size_and_scale(viewport->render_target, p_size, p_scale);
 }
 
-RID RendererViewport::viewport_find_from_screen_attachment(DisplayServerEnums::WindowID p_id) const {
+RID RendererViewport::viewport_find_from_screen_attachment(DisplayServer::WindowID p_id) const {
 	RID *rids = nullptr;
 	uint32_t rid_count = viewport_owner.get_rid_count();
 	rids = (RID *)alloca(sizeof(RID) * rid_count);
@@ -1623,7 +1603,7 @@ RID RendererViewport::viewport_find_from_screen_attachment(DisplayServerEnums::W
 	return RID();
 }
 
-void RendererViewport::viewport_set_vrs_mode(RID p_viewport, RSE::ViewportVRSMode p_mode) {
+void RendererViewport::viewport_set_vrs_mode(RID p_viewport, RS::ViewportVRSMode p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1631,7 +1611,7 @@ void RendererViewport::viewport_set_vrs_mode(RID p_viewport, RSE::ViewportVRSMod
 	_configure_3d_render_buffers(viewport);
 }
 
-void RendererViewport::viewport_set_vrs_update_mode(RID p_viewport, RSE::ViewportVRSUpdateMode p_mode) {
+void RendererViewport::viewport_set_vrs_update_mode(RID p_viewport, RS::ViewportVRSUpdateMode p_mode) {
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
@@ -1709,7 +1689,7 @@ void RendererViewport::viewport_set_canvas_cull_mask(RID p_viewport, uint32_t p_
 }
 
 // Workaround for setting this on thread.
-void RendererViewport::call_set_vsync_mode(DisplayServerEnums::VSyncMode p_mode, DisplayServerEnums::WindowID p_window) {
+void RendererViewport::call_set_vsync_mode(DisplayServer::VSyncMode p_mode, DisplayServer::WindowID p_window) {
 	DisplayServer::get_singleton()->window_set_vsync_mode(p_mode, p_window);
 }
 
diff --git a/engine/servers/rendering/renderer_viewport.h b/engine/servers/rendering/renderer_viewport.h
index 2c70de5e..fa506be9 100644
--- a/engine/servers/rendering/renderer_viewport.h
+++ b/engine/servers/rendering/renderer_viewport.h
@@ -31,11 +31,10 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/display/display_server_enums.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
+#include "servers/rendering/rendering_method.h"
+#include "servers/rendering/rendering_server.h"
+#include "storage/render_scene_buffers.h"
 
 class RendererViewport {
 public:
@@ -55,21 +54,21 @@ public:
 		RID camera;
 		RID scenario;
 
-		RSE::ViewportScaling3DMode scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+		RS::ViewportScaling3DMode scaling_3d_mode = RenderingServer::VIEWPORT_SCALING_3D_MODE_BILINEAR;
 		float scaling_3d_scale = 1.0;
 		float fsr_sharpness = 0.2f;
 		float texture_mipmap_bias = 0.0f;
-		RSE::ViewportAnisotropicFiltering anisotropic_filtering_level = RSE::VIEWPORT_ANISOTROPY_4X;
+		RS::ViewportAnisotropicFiltering anisotropic_filtering_level = RenderingServer::VIEWPORT_ANISOTROPY_4X;
 		bool fsr_enabled = false;
 		uint32_t jitter_phase_count = 0;
-		RSE::ViewportUpdateMode update_mode = RSE::VIEWPORT_UPDATE_WHEN_VISIBLE;
+		RS::ViewportUpdateMode update_mode = RenderingServer::VIEWPORT_UPDATE_WHEN_VISIBLE;
 		RID render_target;
 		RID render_target_texture;
 		Ref<RenderSceneBuffers> render_buffers;
 
-		RSE::ViewportMSAA msaa_2d = RSE::VIEWPORT_MSAA_DISABLED;
-		RSE::ViewportMSAA msaa_3d = RSE::VIEWPORT_MSAA_DISABLED;
-		RSE::ViewportScreenSpaceAA screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+		RS::ViewportMSAA msaa_2d = RenderingServer::VIEWPORT_MSAA_DISABLED;
+		RS::ViewportMSAA msaa_3d = RenderingServer::VIEWPORT_MSAA_DISABLED;
+		RS::ViewportScreenSpaceAA screen_space_aa = RenderingServer::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
 		bool use_taa = false;
 		bool use_debanding = false;
 		bool force_motion_vectors = false;
@@ -80,12 +79,12 @@ public:
 		bool use_occlusion_culling = false;
 		bool occlusion_buffer_dirty = false;
 
-		DisplayServerEnums::WindowID viewport_to_screen = DisplayServerEnums::INVALID_WINDOW_ID;
+		DisplayServer::WindowID viewport_to_screen;
 		Rect2 viewport_to_screen_rect;
-		bool viewport_render_direct_to_screen = false;
+		bool viewport_render_direct_to_screen;
 
 		bool disable_2d = false;
-		RSE::ViewportEnvironmentMode disable_environment = RSE::VIEWPORT_ENVIRONMENT_INHERIT;
+		RS::ViewportEnvironmentMode disable_environment = RS::VIEWPORT_ENVIRONMENT_INHERIT;
 		bool disable_3d = false;
 		bool measure_render_time = false;
 
@@ -108,16 +107,15 @@ public:
 
 		uint64_t last_pass = 0;
 
-		RSE::ViewportDebugDraw debug_draw = RSE::VIEWPORT_DEBUG_DRAW_DISABLED;
+		RS::ViewportDebugDraw debug_draw = RenderingServer::VIEWPORT_DEBUG_DRAW_DISABLED;
 
-		RSE::ViewportClearMode clear_mode = RSE::VIEWPORT_CLEAR_ALWAYS;
+		RS::ViewportClearMode clear_mode = RenderingServer::VIEWPORT_CLEAR_ALWAYS;
 
-		RSE::CanvasItemTextureFilter texture_filter = RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
-		RSE::CanvasItemTextureRepeat texture_repeat = RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
+		RS::CanvasItemTextureFilter texture_filter = RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
+		RS::CanvasItemTextureRepeat texture_repeat = RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
 
 		bool transparent_bg = false;
 		bool use_hdr_2d = false;
-		float window_output_max_value = 1.0;
 
 		uint32_t canvas_cull_mask = 0xffffffff;
 
@@ -152,22 +150,21 @@ public:
 
 		HashMap<RID, CanvasData> canvas_map;
 
-		RenderingServerTypes::RenderInfo render_info;
+		RenderingMethod::RenderInfo render_info;
 
 		Viewport() {
 			view_count = 1;
-			update_mode = RSE::VIEWPORT_UPDATE_WHEN_VISIBLE;
-			clear_mode = RSE::VIEWPORT_CLEAR_ALWAYS;
+			update_mode = RS::VIEWPORT_UPDATE_WHEN_VISIBLE;
+			clear_mode = RS::VIEWPORT_CLEAR_ALWAYS;
 			transparent_bg = false;
 			use_hdr_2d = false;
-			window_output_max_value = 1.0;
 
-			viewport_to_screen = DisplayServerEnums::INVALID_WINDOW_ID;
+			viewport_to_screen = DisplayServer::INVALID_WINDOW_ID;
 			shadow_atlas_size = 0;
 			measure_render_time = false;
 
-			debug_draw = RSE::VIEWPORT_DEBUG_DRAW_DISABLED;
-			screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+			debug_draw = RS::VIEWPORT_DEBUG_DRAW_DISABLED;
+			screen_space_aa = RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
 			use_debanding = false;
 			use_occlusion_culling = false;
 			occlusion_buffer_dirty = true;
@@ -210,7 +207,6 @@ private:
 	void _configure_3d_render_buffers(Viewport *p_viewport);
 	void _draw_3d(Viewport *p_viewport);
 	void _draw_viewport(Viewport *p_viewport);
-	DisplayServerEnums::WindowID _get_containing_window(Viewport *p_viewport);
 
 	int occlusion_rays_per_thread = 512;
 
@@ -224,25 +220,25 @@ public:
 	void viewport_set_use_xr(RID p_viewport, bool p_use_xr);
 #endif // XR_DISABLED
 
-	void viewport_set_size(RID p_viewport, int p_width, int p_height, int p_view_count = 1);
+	void viewport_set_size(RID p_viewport, int p_width, int p_height);
 
-	void viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect = Rect2(), DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID);
+	void viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect = Rect2(), DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID);
 	void viewport_set_render_direct_to_screen(RID p_viewport, bool p_enable);
 
 	void viewport_set_active(RID p_viewport, bool p_active);
 	void viewport_set_parent_viewport(RID p_viewport, RID p_parent_viewport);
 
-	void viewport_set_scaling_3d_mode(RID p_viewport, RSE::ViewportScaling3DMode p_mode);
+	void viewport_set_scaling_3d_mode(RID p_viewport, RS::ViewportScaling3DMode p_mode);
 	void viewport_set_scaling_3d_scale(RID p_viewport, float p_scaling_3d_scale);
 	void viewport_set_fsr_sharpness(RID p_viewport, float p_sharpness);
 	void viewport_set_texture_mipmap_bias(RID p_viewport, float p_mipmap_bias);
-	void viewport_set_anisotropic_filtering_level(RID p_viewport, RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level);
+	void viewport_set_anisotropic_filtering_level(RID p_viewport, RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level);
 
-	void viewport_set_update_mode(RID p_viewport, RSE::ViewportUpdateMode p_mode);
-	RSE::ViewportUpdateMode viewport_get_update_mode(RID p_viewport) const;
+	void viewport_set_update_mode(RID p_viewport, RS::ViewportUpdateMode p_mode);
+	RS::ViewportUpdateMode viewport_get_update_mode(RID p_viewport) const;
 	void viewport_set_vflip(RID p_viewport, bool p_enable);
 
-	void viewport_set_clear_mode(RID p_viewport, RSE::ViewportClearMode p_clear_mode);
+	void viewport_set_clear_mode(RID p_viewport, RS::ViewportClearMode p_clear_mode);
 
 	RID viewport_get_render_target(RID p_viewport) const;
 	RID viewport_get_texture(RID p_viewport) const;
@@ -252,7 +248,7 @@ public:
 	const RendererSceneRender::CameraData *viewport_get_prev_camera_data(RID p_viewport);
 
 	void viewport_set_disable_2d(RID p_viewport, bool p_disable);
-	void viewport_set_environment_mode(RID p_viewport, RSE::ViewportEnvironmentMode p_mode);
+	void viewport_set_environment_mode(RID p_viewport, RS::ViewportEnvironmentMode p_mode);
 	void viewport_set_disable_3d(RID p_viewport, bool p_disable);
 
 	bool viewport_is_environment_disabled(Viewport *viewport);
@@ -275,19 +271,19 @@ public:
 	void viewport_set_positional_shadow_atlas_size(RID p_viewport, int p_size, bool p_16_bits = true);
 	void viewport_set_positional_shadow_atlas_quadrant_subdivision(RID p_viewport, int p_quadrant, int p_subdiv);
 
-	void viewport_set_msaa_2d(RID p_viewport, RSE::ViewportMSAA p_msaa);
-	void viewport_set_msaa_3d(RID p_viewport, RSE::ViewportMSAA p_msaa);
-	void viewport_set_screen_space_aa(RID p_viewport, RSE::ViewportScreenSpaceAA p_mode);
+	void viewport_set_msaa_2d(RID p_viewport, RS::ViewportMSAA p_msaa);
+	void viewport_set_msaa_3d(RID p_viewport, RS::ViewportMSAA p_msaa);
+	void viewport_set_screen_space_aa(RID p_viewport, RS::ViewportScreenSpaceAA p_mode);
 	void viewport_set_use_taa(RID p_viewport, bool p_use_taa);
 	void viewport_set_use_debanding(RID p_viewport, bool p_use_debanding);
 	void viewport_set_force_motion_vectors(RID p_viewport, bool p_force_motion_vectors);
 	void viewport_set_use_occlusion_culling(RID p_viewport, bool p_use_occlusion_culling);
 	void viewport_set_occlusion_rays_per_thread(int p_rays_per_thread);
-	void viewport_set_occlusion_culling_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality);
+	void viewport_set_occlusion_culling_build_quality(RS::ViewportOcclusionCullingBuildQuality p_quality);
 	void viewport_set_mesh_lod_threshold(RID p_viewport, float p_pixels);
 
-	virtual int viewport_get_render_info(RID p_viewport, RSE::ViewportRenderInfoType p_type, RSE::ViewportRenderInfo p_info);
-	virtual void viewport_set_debug_draw(RID p_viewport, RSE::ViewportDebugDraw p_draw);
+	virtual int viewport_get_render_info(RID p_viewport, RS::ViewportRenderInfoType p_type, RS::ViewportRenderInfo p_info);
+	virtual void viewport_set_debug_draw(RID p_viewport, RS::ViewportDebugDraw p_draw);
 
 	void viewport_set_measure_render_time(RID p_viewport, bool p_enable);
 	float viewport_get_measured_render_time_cpu(RID p_viewport) const;
@@ -296,15 +292,15 @@ public:
 	void viewport_set_snap_2d_transforms_to_pixel(RID p_viewport, bool p_enabled);
 	void viewport_set_snap_2d_vertices_to_pixel(RID p_viewport, bool p_enabled);
 
-	void viewport_set_default_canvas_item_texture_filter(RID p_viewport, RSE::CanvasItemTextureFilter p_filter);
-	void viewport_set_default_canvas_item_texture_repeat(RID p_viewport, RSE::CanvasItemTextureRepeat p_repeat);
+	void viewport_set_default_canvas_item_texture_filter(RID p_viewport, RS::CanvasItemTextureFilter p_filter);
+	void viewport_set_default_canvas_item_texture_repeat(RID p_viewport, RS::CanvasItemTextureRepeat p_repeat);
 
-	void viewport_set_sdf_oversize_and_scale(RID p_viewport, RSE::ViewportSDFOversize p_over_size, RSE::ViewportSDFScale p_scale);
+	void viewport_set_sdf_oversize_and_scale(RID p_viewport, RS::ViewportSDFOversize p_over_size, RS::ViewportSDFScale p_scale);
 
-	virtual RID viewport_find_from_screen_attachment(DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const;
+	virtual RID viewport_find_from_screen_attachment(DisplayServer::WindowID p_id = DisplayServer::MAIN_WINDOW_ID) const;
 
-	void viewport_set_vrs_mode(RID p_viewport, RSE::ViewportVRSMode p_mode);
-	void viewport_set_vrs_update_mode(RID p_viewport, RSE::ViewportVRSUpdateMode p_mode);
+	void viewport_set_vrs_mode(RID p_viewport, RS::ViewportVRSMode p_mode);
+	void viewport_set_vrs_update_mode(RID p_viewport, RS::ViewportVRSUpdateMode p_mode);
 	void viewport_set_vrs_texture(RID p_viewport, RID p_texture);
 
 	void handle_timestamp(String p_timestamp, uint64_t p_cpu_time, uint64_t p_gpu_time);
@@ -319,7 +315,7 @@ public:
 	int get_num_viewports_with_motion_vectors() const;
 
 	// Workaround for setting this on thread.
-	void call_set_vsync_mode(DisplayServerEnums::VSyncMode p_mode, DisplayServerEnums::WindowID p_window);
+	void call_set_vsync_mode(DisplayServer::VSyncMode p_mode, DisplayServer::WindowID p_window);
 
 	RendererViewport();
 	virtual ~RendererViewport() {}
diff --git a/engine/servers/rendering/rendering_context_driver.cpp b/engine/servers/rendering/rendering_context_driver.cpp
index b88b9f5e..b623be40 100644
--- a/engine/servers/rendering/rendering_context_driver.cpp
+++ b/engine/servers/rendering/rendering_context_driver.cpp
@@ -33,8 +33,8 @@
 RenderingContextDriver::~RenderingContextDriver() {
 }
 
-RenderingContextDriver::SurfaceID RenderingContextDriver::surface_get_from_window(DisplayServerEnums::WindowID p_window) const {
-	HashMap<DisplayServerEnums::WindowID, SurfaceID>::ConstIterator it = window_surface_map.find(p_window);
+RenderingContextDriver::SurfaceID RenderingContextDriver::surface_get_from_window(DisplayServer::WindowID p_window) const {
+	HashMap<DisplayServer::WindowID, SurfaceID>::ConstIterator it = window_surface_map.find(p_window);
 	if (it != window_surface_map.end()) {
 		return it->value;
 	} else {
@@ -42,7 +42,7 @@ RenderingContextDriver::SurfaceID RenderingContextDriver::surface_get_from_windo
 	}
 }
 
-Error RenderingContextDriver::window_create(DisplayServerEnums::WindowID p_window, const void *p_platform_data) {
+Error RenderingContextDriver::window_create(DisplayServer::WindowID p_window, const void *p_platform_data) {
 	SurfaceID surface = surface_create(p_platform_data);
 	if (surface != 0) {
 		window_surface_map[p_window] = surface;
@@ -52,104 +52,30 @@ Error RenderingContextDriver::window_create(DisplayServerEnums::WindowID p_windo
 	}
 }
 
-void RenderingContextDriver::window_set_size(DisplayServerEnums::WindowID p_window, uint32_t p_width, uint32_t p_height) {
+void RenderingContextDriver::window_set_size(DisplayServer::WindowID p_window, uint32_t p_width, uint32_t p_height) {
 	SurfaceID surface = surface_get_from_window(p_window);
 	if (surface) {
 		surface_set_size(surface, p_width, p_height);
 	}
 }
 
-void RenderingContextDriver::window_set_vsync_mode(DisplayServerEnums::WindowID p_window, DisplayServerEnums::VSyncMode p_vsync_mode) {
+void RenderingContextDriver::window_set_vsync_mode(DisplayServer::WindowID p_window, DisplayServer::VSyncMode p_vsync_mode) {
 	SurfaceID surface = surface_get_from_window(p_window);
 	if (surface) {
 		surface_set_vsync_mode(surface, p_vsync_mode);
 	}
 }
 
-DisplayServerEnums::VSyncMode RenderingContextDriver::window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const {
+DisplayServer::VSyncMode RenderingContextDriver::window_get_vsync_mode(DisplayServer::WindowID p_window) const {
 	SurfaceID surface = surface_get_from_window(p_window);
 	if (surface) {
 		return surface_get_vsync_mode(surface);
 	} else {
-		return DisplayServerEnums::VSYNC_DISABLED;
+		return DisplayServer::VSYNC_DISABLED;
 	}
 }
 
-void RenderingContextDriver::window_set_hdr_output_enabled(DisplayServerEnums::WindowID p_window, bool p_enabled) {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		surface_set_hdr_output_enabled(surface, p_enabled);
-	}
-}
-
-bool RenderingContextDriver::window_get_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		return surface_get_hdr_output_enabled(surface);
-	} else {
-		return false;
-	}
-}
-
-void RenderingContextDriver::window_set_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window, float p_reference_luminance) {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		surface_set_hdr_output_reference_luminance(surface, p_reference_luminance);
-	}
-}
-
-float RenderingContextDriver::window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		return surface_get_hdr_output_reference_luminance(surface);
-	} else {
-		return 0.0f;
-	}
-}
-
-void RenderingContextDriver::window_set_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window, float p_max_luminance) {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		surface_set_hdr_output_max_luminance(surface, p_max_luminance);
-	}
-}
-
-float RenderingContextDriver::window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		return surface_get_hdr_output_max_luminance(surface);
-	} else {
-		return 0.0f;
-	}
-}
-
-void RenderingContextDriver::window_set_hdr_output_linear_luminance_scale(DisplayServerEnums::WindowID p_window, float p_linear_luminance_scale) {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		surface_set_hdr_output_linear_luminance_scale(surface, p_linear_luminance_scale);
-	}
-}
-
-float RenderingContextDriver::window_get_hdr_output_linear_luminance_scale(DisplayServerEnums::WindowID p_window) const {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		return surface_get_hdr_output_linear_luminance_scale(surface);
-	} else {
-		return 0.0f;
-	}
-}
-
-float RenderingContextDriver::window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const {
-	SurfaceID surface = surface_get_from_window(p_window);
-	if (surface) {
-		if (surface_get_hdr_output_enabled(surface)) {
-			return surface_get_hdr_output_max_value(surface);
-		}
-	}
-	return 1.0f; // SDR
-}
-
-void RenderingContextDriver::window_destroy(DisplayServerEnums::WindowID p_window) {
+void RenderingContextDriver::window_destroy(DisplayServer::WindowID p_window) {
 	SurfaceID surface = surface_get_from_window(p_window);
 	if (surface) {
 		surface_destroy(surface);
diff --git a/engine/servers/rendering/rendering_context_driver.h b/engine/servers/rendering/rendering_context_driver.h
index dfe4bfbd..f30880b0 100644
--- a/engine/servers/rendering/rendering_context_driver.h
+++ b/engine/servers/rendering/rendering_context_driver.h
@@ -30,11 +30,7 @@
 
 #pragma once
 
-#include "core/string/ustring.h"
-#include "core/templates/hash_map.h"
-#include "servers/display/display_server_enums.h"
-
-#include <cstdint>
+#include "servers/display/display_server.h"
 
 class RenderingDeviceDriver;
 
@@ -43,24 +39,15 @@ public:
 	typedef uint64_t SurfaceID;
 
 private:
-	HashMap<DisplayServerEnums::WindowID, SurfaceID> window_surface_map;
+	HashMap<DisplayServer::WindowID, SurfaceID> window_surface_map;
 
 public:
-	SurfaceID surface_get_from_window(DisplayServerEnums::WindowID p_window) const;
-	Error window_create(DisplayServerEnums::WindowID p_window, const void *p_platform_data);
-	void window_set_size(DisplayServerEnums::WindowID p_window, uint32_t p_width, uint32_t p_height);
-	void window_set_vsync_mode(DisplayServerEnums::WindowID p_window, DisplayServerEnums::VSyncMode p_vsync_mode);
-	DisplayServerEnums::VSyncMode window_get_vsync_mode(DisplayServerEnums::WindowID p_window) const;
-	void window_set_hdr_output_enabled(DisplayServerEnums::WindowID p_window, bool p_enabled);
-	bool window_get_hdr_output_enabled(DisplayServerEnums::WindowID p_window) const;
-	void window_set_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window, float p_reference_luminance);
-	float window_get_hdr_output_reference_luminance(DisplayServerEnums::WindowID p_window) const;
-	void window_set_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window, float p_max_luminance);
-	float window_get_hdr_output_max_luminance(DisplayServerEnums::WindowID p_window) const;
-	void window_set_hdr_output_linear_luminance_scale(DisplayServerEnums::WindowID p_window, float p_linear_luminance_scale);
-	float window_get_hdr_output_linear_luminance_scale(DisplayServerEnums::WindowID p_window) const;
-	float window_get_output_max_linear_value(DisplayServerEnums::WindowID p_window) const;
-	void window_destroy(DisplayServerEnums::WindowID p_window);
+	SurfaceID surface_get_from_window(DisplayServer::WindowID p_window) const;
+	Error window_create(DisplayServer::WindowID p_window, const void *p_platform_data);
+	void window_set_size(DisplayServer::WindowID p_window, uint32_t p_width, uint32_t p_height);
+	void window_set_vsync_mode(DisplayServer::WindowID p_window, DisplayServer::VSyncMode p_vsync_mode);
+	DisplayServer::VSyncMode window_get_vsync_mode(DisplayServer::WindowID p_window) const;
+	void window_destroy(DisplayServer::WindowID p_window);
 
 public:
 	// Not an enum as these values are matched against values returned by
@@ -108,17 +95,8 @@ public:
 	virtual void driver_free(RenderingDeviceDriver *p_driver) = 0;
 	virtual SurfaceID surface_create(const void *p_platform_data) = 0;
 	virtual void surface_set_size(SurfaceID p_surface, uint32_t p_width, uint32_t p_height) = 0;
-	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServerEnums::VSyncMode p_vsync_mode) = 0;
-	virtual DisplayServerEnums::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const = 0;
-	virtual void surface_set_hdr_output_enabled(SurfaceID p_surface, bool p_enabled) = 0;
-	virtual bool surface_get_hdr_output_enabled(SurfaceID p_surface) const = 0;
-	virtual void surface_set_hdr_output_reference_luminance(SurfaceID p_surface, float p_reference_luminance) = 0;
-	virtual float surface_get_hdr_output_reference_luminance(SurfaceID p_surface) const = 0;
-	virtual void surface_set_hdr_output_max_luminance(SurfaceID p_surface, float p_max_luminance) = 0;
-	virtual float surface_get_hdr_output_max_luminance(SurfaceID p_surface) const = 0;
-	virtual void surface_set_hdr_output_linear_luminance_scale(SurfaceID p_surface, float p_linear_luminance_scale) = 0;
-	virtual float surface_get_hdr_output_linear_luminance_scale(SurfaceID p_surface) const = 0;
-	virtual float surface_get_hdr_output_max_value(SurfaceID p_surface) const = 0;
+	virtual void surface_set_vsync_mode(SurfaceID p_surface, DisplayServer::VSyncMode p_vsync_mode) = 0;
+	virtual DisplayServer::VSyncMode surface_get_vsync_mode(SurfaceID p_surface) const = 0;
 	virtual uint32_t surface_get_width(SurfaceID p_surface) const = 0;
 	virtual uint32_t surface_get_height(SurfaceID p_surface) const = 0;
 	virtual void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) = 0;
diff --git a/engine/servers/rendering/rendering_device.compat.inc b/engine/servers/rendering/rendering_device.compat.inc
index e5bcf7ac..024a88a4 100644
--- a/engine/servers/rendering/rendering_device.compat.inc
+++ b/engine/servers/rendering/rendering_device.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "rendering_device.h"
-
-#include "core/object/class_db.h"
-
 RID RenderingDevice::_shader_create_from_bytecode_bind_compat_79606(const Vector<uint8_t> &p_shader_binary) {
 	return shader_create_from_bytecode(p_shader_binary, RID());
 }
@@ -144,7 +140,7 @@ Error RenderingDevice::_texture_resolve_multisample_bind_compat_84976(RID p_from
 }
 
 RenderingDevice::FramebufferFormatID RenderingDevice::_screen_get_framebuffer_format_bind_compat_87340() const {
-	return screen_get_framebuffer_format(DisplayServerEnums::MAIN_WINDOW_ID);
+	return screen_get_framebuffer_format(DisplayServer::MAIN_WINDOW_ID);
 }
 
 RID RenderingDevice::_uniform_buffer_create_bind_compat_101561(uint32_t p_size_bytes, const Vector<uint8_t> &p_data) {
@@ -199,4 +195,4 @@ void RenderingDevice::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("texture_create_from_extension", "type", "format", "samples", "usage_flags", "image", "width", "height", "depth", "layers"), &RenderingDevice::_texture_create_from_extension_compat_105570);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/servers/rendering/rendering_device.cpp b/engine/servers/rendering/rendering_device.cpp
index 290bebdd..7f3cc888 100644
--- a/engine/servers/rendering/rendering_device.cpp
+++ b/engine/servers/rendering/rendering_device.cpp
@@ -31,19 +31,16 @@
 #include "rendering_device.h"
 #include "rendering_device.compat.inc"
 
-#include "core/config/engine.h"
+#include "rendering_device_binds.h"
+#include "shader_include_db.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "core/templates/fixed_vector.h"
-#include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_shader_container.h"
-#include "servers/rendering/shader_include_db.h"
-
 #include "modules/modules_enabled.gen.h"
+#include "servers/rendering/rendering_shader_container.h"
 
 #ifdef MODULE_GLSLANG_ENABLED
 #include "modules/glslang/shader_compile.h"
@@ -219,251 +216,6 @@ RID RenderingDevice::shader_create_from_spirv(const Vector<ShaderStageSPIRVData>
 	return shader_create_from_bytecode(bytecode);
 }
 
-/********************************/
-/**** ACCELERATION STRUCTURE ****/
-/********************************/
-
-RID RenderingDevice::blas_create(Span<AccelerationStructureGeometry> p_geometries) {
-	ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), RID(), "The current rendering device has neither raytracing pipeline nor ray query support.");
-
-	thread_local LocalVector<RDD::AccelerationStructureGeometry> rdd_geometries;
-	rdd_geometries.resize(p_geometries.size());
-
-	Vector<RDG::ResourceTracker *> draw_trackers;
-	HashSet<RID> untracked_buffers;
-
-	for (uint64_t i = 0; i < p_geometries.size(); i++) {
-		const AccelerationStructureGeometry &rd_geometry = p_geometries[i];
-		if (rd_geometry.index_buffer.is_valid()) {
-			ERR_FAIL_COND_V_MSG((rd_geometry.index_count % 3) != 0, RID(), "An indexed geometry must have an index count that is a multiple of 3.");
-		} else {
-			ERR_FAIL_COND_V_MSG((rd_geometry.vertex_count % 3) != 0, RID(), "A non-indexed geometry must have a vertex count that is a multiple of 3.");
-		}
-
-		RDD::AccelerationStructureGeometry &rdd_geometry = rdd_geometries[i];
-		rdd_geometry = {};
-		rdd_geometry.flags = rd_geometry.flags;
-
-		Buffer *vertex_buffer = vertex_buffer_owner.get_or_null(rd_geometry.vertex_buffer);
-		ERR_FAIL_NULL_V(vertex_buffer, RID());
-
-		ERR_FAIL_COND_V_MSG((rd_geometry.vertex_offset + rd_geometry.vertex_count * rd_geometry.vertex_stride) > vertex_buffer->size, RID(), "The specified vertex offset and count are outside the range of the vertex buffer.");
-		ERR_FAIL_COND_V_MSG(rd_geometry.vertex_format >= DataFormat::DATA_FORMAT_MAX, RID(), "An invalid vertex format was specified.");
-
-		rdd_geometry.vertex_buffer = vertex_buffer->driver_id;
-		rdd_geometry.vertex_offset = rd_geometry.vertex_offset;
-		rdd_geometry.vertex_stride = rd_geometry.vertex_stride;
-		rdd_geometry.vertex_count = rd_geometry.vertex_count;
-		rdd_geometry.vertex_format = rd_geometry.vertex_format;
-
-		if (vertex_buffer->draw_tracker != nullptr) {
-			draw_trackers.push_back(vertex_buffer->draw_tracker);
-		} else {
-			untracked_buffers.insert(rd_geometry.vertex_buffer);
-		}
-
-		_check_transfer_worker_buffer(vertex_buffer);
-
-		if (rd_geometry.index_buffer.is_valid()) {
-			IndexBuffer *index_buffer = index_buffer_owner.get_or_null(rd_geometry.index_buffer);
-			ERR_FAIL_NULL_V(index_buffer, RID());
-
-			uint32_t index_stride = (index_buffer->format == INDEX_BUFFER_FORMAT_UINT32 ? sizeof(uint32_t) : sizeof(uint16_t));
-			ERR_FAIL_COND_V_MSG((rd_geometry.index_offset + rd_geometry.index_count * index_stride) > index_buffer->size, RID(), "The specified index offset and count are outside the range of the index buffer.");
-			ERR_FAIL_COND_V_MSG(index_buffer->max_index >= rd_geometry.vertex_count, RID(), "The index buffer contains an index that is outside the specified vertex range.");
-
-			rdd_geometry.index_buffer = index_buffer->driver_id;
-			rdd_geometry.index_offset = rd_geometry.index_offset;
-			rdd_geometry.index_count = rd_geometry.index_count;
-			rdd_geometry.index_format = index_buffer->format;
-
-			if (index_buffer->draw_tracker != nullptr) {
-				draw_trackers.push_back(index_buffer->draw_tracker);
-			} else {
-				untracked_buffers.insert(rd_geometry.index_buffer);
-			}
-
-			_check_transfer_worker_buffer(index_buffer);
-		}
-	}
-
-	AccelerationStructure acceleration_structure;
-	acceleration_structure.type = RDD::ACCELERATION_STRUCTURE_TYPE_BLAS;
-	acceleration_structure.driver_id = driver->blas_create(rdd_geometries);
-	ERR_FAIL_COND_V_MSG(!acceleration_structure.driver_id, RID(), "Failed to create BLAS.");
-
-	acceleration_structure.draw_tracker = RDG::resource_tracker_create();
-	acceleration_structure.draw_tracker->acceleration_structure_driver_id = acceleration_structure.driver_id;
-	// Assume we are going to build this acceleration structure
-	acceleration_structure.draw_tracker->usage = RDG::RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE;
-
-	acceleration_structure.draw_trackers = std::move(draw_trackers);
-	acceleration_structure.untracked_buffers = std::move(untracked_buffers);
-
-	RID id = acceleration_structure_owner.make_rid(acceleration_structure);
-#ifdef DEV_ENABLED
-	set_resource_name(id, "RID:" + itos(id.get_id()));
-#endif
-
-	for (uint32_t i = 0; i < p_geometries.size(); i++) {
-		const AccelerationStructureGeometry &geometry = p_geometries[i];
-		_add_dependency(id, geometry.vertex_buffer);
-
-		if (geometry.index_buffer.is_valid()) {
-			_add_dependency(id, geometry.index_buffer);
-		}
-	}
-
-	return id;
-}
-
-BitField<RDD::BufferUsageBits> RenderingDevice::_creation_to_usage_bits(BitField<RD::BufferCreationBits> p_creation_bits) {
-	BitField<RDD::BufferUsageBits> usage = 0;
-
-	if (p_creation_bits.has_flag(BUFFER_CREATION_AS_STORAGE_BIT)) {
-		usage.set_flag(RDD::BUFFER_USAGE_STORAGE_BIT);
-	}
-
-	if (p_creation_bits.has_flag(BUFFER_CREATION_DEVICE_ADDRESS_BIT)) {
-#ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_BUFFER_DEVICE_ADDRESS), 0,
-				"The GPU doesn't support buffer address flag.");
-#endif
-		usage.set_flag(RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT);
-	}
-
-	if (p_creation_bits.has_flag(BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT)) {
-#ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), 0,
-				"The GPU doesn't support acceleration structure build input flag.");
-#endif
-		usage.set_flag(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT);
-	}
-
-	return usage;
-}
-
-RID RenderingDevice::tlas_instances_buffer_create(uint32_t p_instance_count, BitField<BufferCreationBits> p_creation_bits) {
-	ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), RID(), "The current rendering device has neither raytracing pipeline nor ray query support.");
-	ERR_FAIL_COND_V(p_instance_count == 0, RID());
-
-	uint32_t instances_buffer_size_bytes = driver->tlas_instances_buffer_get_size_bytes(p_instance_count);
-
-	InstancesBuffer instances_buffer;
-	instances_buffer.instance_count = p_instance_count;
-	instances_buffer.buffer.size = instances_buffer_size_bytes;
-	instances_buffer.buffer.usage = _creation_to_usage_bits(p_creation_bits) | RDD::BUFFER_USAGE_TRANSFER_FROM_BIT | RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT | RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT;
-	instances_buffer.buffer.driver_id = driver->buffer_create(instances_buffer.buffer.size, instances_buffer.buffer.usage, RDD::MEMORY_ALLOCATION_TYPE_CPU, frames_drawn);
-	ERR_FAIL_COND_V_MSG(!instances_buffer.buffer.driver_id, RID(), "Failed to create instances buffer.");
-
-	_THREAD_SAFE_LOCK_
-	buffer_memory += instances_buffer.buffer.size;
-	_THREAD_SAFE_UNLOCK_
-
-	RID id = instances_buffer_owner.make_rid(instances_buffer);
-#ifdef DEV_ENABLED
-	set_resource_name(id, "RID:" + itos(id.get_id()));
-#endif
-	return id;
-}
-
-void RenderingDevice::tlas_instances_buffer_fill(RID p_instances_buffer, const Vector<RID> &p_blases, VectorView<Transform3D> p_transforms) {
-	ERR_FAIL_COND_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), "The current rendering device has neither raytracing pipeline nor ray query support.");
-
-	InstancesBuffer *instances_buffer = instances_buffer_owner.get_or_null(p_instances_buffer);
-	ERR_FAIL_NULL_MSG(instances_buffer, "Instances buffer input is not valid.");
-
-	uint32_t blases_count = p_blases.size();
-	ERR_FAIL_COND_MSG(blases_count != instances_buffer->instance_count, "The number of blases is not equal to the instance count of the instances buffer.");
-	ERR_FAIL_COND_MSG(blases_count != p_transforms.size(), "Blases and transforms vectors must have the same size.");
-
-	thread_local LocalVector<RDD::AccelerationStructureID> blases;
-	blases.resize(blases_count);
-
-	for (uint32_t i = 0; i < blases_count; i++) {
-		const AccelerationStructure *blas = acceleration_structure_owner.get_or_null(p_blases[i]);
-		ERR_FAIL_NULL_MSG(blas, "BLAS input is not valid.");
-		ERR_FAIL_COND_MSG(blas->type != RDD::ACCELERATION_STRUCTURE_TYPE_BLAS, "Acceleration structure input is not a BLAS.");
-		blases[i] = blas->driver_id;
-	}
-
-	instances_buffer->blases = p_blases;
-
-	driver->tlas_instances_buffer_fill(instances_buffer->buffer.driver_id, blases, p_transforms);
-}
-
-RID RenderingDevice::tlas_create(RID p_instances_buffer) {
-	ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), RID(), "The current rendering device has neither raytracing pipeline nor ray query support.");
-
-	const InstancesBuffer *instances_buffer = instances_buffer_owner.get_or_null(p_instances_buffer);
-	ERR_FAIL_NULL_V_MSG(instances_buffer, RID(), "Instances buffer input is not valid.");
-
-	AccelerationStructure acceleration_structure;
-	acceleration_structure.type = RDD::ACCELERATION_STRUCTURE_TYPE_TLAS;
-	acceleration_structure.driver_id = driver->tlas_create(instances_buffer->buffer.driver_id);
-	ERR_FAIL_COND_V_MSG(!acceleration_structure.driver_id, RID(), "Failed to create TLAS.");
-
-	acceleration_structure.draw_tracker = RDG::resource_tracker_create();
-	acceleration_structure.draw_tracker->acceleration_structure_driver_id = acceleration_structure.driver_id;
-	// Assume we are going to build this acceleration structure
-	acceleration_structure.draw_tracker->usage = RDG::RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE;
-
-	for (Vector<RID>::ConstIterator itr = instances_buffer->blases.begin(); itr != instances_buffer->blases.end(); ++itr) {
-		const AccelerationStructure *blas = acceleration_structure_owner.get_or_null(*itr);
-		ERR_FAIL_NULL_V_MSG(blas, RID(), "BLAS input is not valid.");
-		if (blas->draw_tracker) {
-			acceleration_structure.draw_trackers.push_back(blas->draw_tracker);
-		}
-	}
-
-	RID id = acceleration_structure_owner.make_rid(acceleration_structure);
-#ifdef DEV_ENABLED
-	set_resource_name(id, "RID:" + itos(id.get_id()));
-#endif
-	return id;
-}
-
-Error RenderingDevice::acceleration_structure_build(RID p_acceleration_structure) {
-	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
-
-	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
-			"Building acceleration structures is forbidden during creation of a draw list.");
-	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
-			"Building acceleration structures is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, ERR_INVALID_PARAMETER,
-			"Building acceleration structures is forbidden during creation of a raytracing list.");
-
-	AccelerationStructure *accel = acceleration_structure_owner.get_or_null(p_acceleration_structure);
-	ERR_FAIL_NULL_V_MSG(accel, ERR_INVALID_PARAMETER, "Acceleration structure argument is not valid.");
-
-	uint64_t scratch_size = driver->acceleration_structure_get_scratch_size_bytes(accel->driver_id);
-
-	if (accel->scratch_buffer) {
-		uint64_t scratch_buffer_size = driver->buffer_get_allocation_size(accel->scratch_buffer);
-		if (scratch_buffer_size < scratch_size) {
-			Buffer to_dispose = Buffer();
-			to_dispose.driver_id = accel->scratch_buffer;
-			DEV_ASSERT(scratch_buffer_size <= UINT32_MAX);
-			to_dispose.size = scratch_buffer_size;
-			frames[frame].buffers_to_dispose_of.push_back(to_dispose);
-			accel->scratch_buffer = RDD::BufferID();
-		}
-	}
-
-	if (!accel->scratch_buffer) {
-		accel->scratch_buffer = driver->buffer_create(scratch_size, RDD::BUFFER_USAGE_STORAGE_BIT | RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT, RDD::MEMORY_ALLOCATION_TYPE_GPU, frames_drawn);
-		ERR_FAIL_COND_V(!accel->scratch_buffer, ERR_CANT_CREATE);
-
-		_THREAD_SAFE_LOCK_
-		buffer_memory += scratch_size;
-		_THREAD_SAFE_UNLOCK_
-	}
-
-	draw_graph.add_acceleration_structure_build(accel->driver_id, accel->scratch_buffer, accel->draw_tracker, accel->draw_trackers);
-
-	return OK;
-}
-
 /***************************/
 /**** BUFFER MANAGEMENT ****/
 /***************************/
@@ -481,8 +233,6 @@ RenderingDevice::Buffer *RenderingDevice::_get_buffer_from_owner(RID p_buffer) {
 		//buffer = texture_buffer_owner.get_or_null(p_buffer)->buffer;
 	} else if (storage_buffer_owner.owns(p_buffer)) {
 		buffer = storage_buffer_owner.get_or_null(p_buffer);
-	} else if (instances_buffer_owner.owns(p_buffer)) {
-		buffer = &instances_buffer_owner.get_or_null(p_buffer)->buffer;
 	}
 	return buffer;
 }
@@ -676,11 +426,9 @@ Error RenderingDevice::buffer_copy(RID p_src_buffer, RID p_dst_buffer, uint32_t
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
 	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
-			"Copying buffers is forbidden during creation of a draw list.");
+			"Copying buffers is forbidden during creation of a draw list");
 	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
-			"Copying buffers is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, ERR_INVALID_PARAMETER,
-			"Copying buffers is forbidden during creation of a raytracing list.");
+			"Copying buffers is forbidden during creation of a compute list");
 
 	Buffer *src_buffer = _get_buffer_from_owner(p_src_buffer);
 	if (!src_buffer) {
@@ -721,11 +469,9 @@ Error RenderingDevice::buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p
 	copy_bytes_count += p_size;
 
 	ERR_FAIL_COND_V_MSG(draw_list.active && !p_skip_check, ERR_INVALID_PARAMETER,
-			"Updating buffers is forbidden during creation of a draw list.");
+			"Updating buffers is forbidden during creation of a draw list");
 	ERR_FAIL_COND_V_MSG(compute_list.active && !p_skip_check, ERR_INVALID_PARAMETER,
-			"Updating buffers is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active && !p_skip_check, ERR_INVALID_PARAMETER,
-			"Updating buffers is forbidden during creation of a raytracing list.");
+			"Updating buffers is forbidden during creation of a compute list");
 
 	Buffer *buffer = _get_buffer_from_owner(p_buffer);
 	ERR_FAIL_NULL_V_MSG(buffer, ERR_INVALID_PARAMETER, "Buffer argument is not a valid buffer of any type.");
@@ -811,11 +557,9 @@ Error RenderingDevice::driver_callback_add(RDD::DriverCallback p_callback, void
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
 	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
-			"Driver callback is forbidden during creation of a draw list.");
+			"Driver callback is forbidden during creation of a draw list");
 	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
-			"Driver callback is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, ERR_INVALID_PARAMETER,
-			"Driver callback is forbidden during creation of a raytracing list.");
+			"Driver callback is forbidden during creation of a compute list");
 
 	thread_local LocalVector<RDG::ResourceTracker *> trackers;
 	thread_local LocalVector<RDG::ResourceUsage> usages;
@@ -884,13 +628,11 @@ Error RenderingDevice::buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
 	ERR_FAIL_COND_V_MSG((p_size % 4) != 0, ERR_INVALID_PARAMETER,
-			"Size must be a multiple of four.");
+			"Size must be a multiple of four");
 	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
-			"Updating buffers in is forbidden during creation of a draw list.");
+			"Updating buffers in is forbidden during creation of a draw list");
 	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
-			"Updating buffers is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, ERR_INVALID_PARAMETER,
-			"Updating buffers is forbidden during creation of a raytracing list.");
+			"Updating buffers is forbidden during creation of a compute list");
 
 	Buffer *buffer = _get_buffer_from_owner(p_buffer);
 	if (!buffer) {
@@ -1098,14 +840,6 @@ RID RenderingDevice::storage_buffer_create(uint32_t p_size_bytes, Span<uint8_t>
 
 		buffer.usage.set_flag(RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT);
 	}
-	if (p_creation_bits.has_flag(BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT)) {
-#ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE) && !has_feature(SUPPORTS_RAY_QUERY), RID(),
-				"The GPU doesn't support acceleration structure build input flag.");
-#endif
-		buffer.usage.set_flag(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT);
-	}
-
 	buffer.driver_id = driver->buffer_create(buffer.size, buffer.usage, RDD::MEMORY_ALLOCATION_TYPE_GPU, frames_drawn);
 	ERR_FAIL_COND_V(!buffer.driver_id, RID());
 
@@ -1340,7 +1074,6 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 	texture.base_layer = 0;
 	texture.is_resolve_buffer = format.is_resolve_buffer;
 	texture.is_discardable = format.is_discardable;
-	texture.is_subsampled = format.is_subsampled;
 	texture.usage_flags = format.usage_bits & ~forced_usage_bits;
 	texture.samples = format.samples;
 	texture.allowed_shared_formats = format.shareable_formats;
@@ -1795,7 +1528,7 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
 				tb.subresources.mipmap_count = texture->mipmaps;
 				tb.subresources.base_layer = p_layer;
 				tb.subresources.layer_count = 1;
-				driver->command_pipeline_barrier(transfer_worker->command_buffer, RDD::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, RDD::PIPELINE_STAGE_COPY_BIT, {}, {}, tb, {});
+				driver->command_pipeline_barrier(transfer_worker->command_buffer, RDD::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, RDD::PIPELINE_STAGE_COPY_BIT, {}, {}, tb);
 			}
 		}
 
@@ -1881,9 +1614,7 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
 Error RenderingDevice::texture_update(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data) {
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
-	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a draw list.");
-	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a compute list.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a raytracing list.");
+	ERR_FAIL_COND_V_MSG(draw_list.active || compute_list.active, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a draw or compute list");
 
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL_V(texture, ERR_INVALID_PARAMETER);
@@ -2215,14 +1946,6 @@ uint32_t RenderingDevice::_texture_vrs_method_to_usage_bits() const {
 	}
 }
 
-void RenderingDevice::_texture_ensure_shareable_format(RID p_texture, const DataFormat &p_shareable_format) {
-	Texture *texture = texture_owner.get_or_null(p_texture);
-	ERR_FAIL_NULL(texture);
-	if (!texture->allowed_shared_formats.has(p_shareable_format)) {
-		texture->allowed_shared_formats.push_back(p_shareable_format);
-	}
-}
-
 void RenderingDevice::_texture_check_pending_clear(RID p_texture_rid, Texture *p_texture) {
 	DEV_ASSERT(p_texture != nullptr);
 
@@ -3463,9 +3186,6 @@ RID RenderingDevice::vertex_buffer_create(uint32_t p_size_bytes, Span<uint8_t> p
 	if (p_creation_bits.has_flag(BUFFER_CREATION_DEVICE_ADDRESS_BIT)) {
 		buffer.usage.set_flag(RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT);
 	}
-	if (p_creation_bits.has_flag(BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT)) {
-		buffer.usage.set_flag(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT);
-	}
 	buffer.driver_id = driver->buffer_create(buffer.size, buffer.usage, RDD::MEMORY_ALLOCATION_TYPE_GPU, frames_drawn);
 	ERR_FAIL_COND_V(!buffer.driver_id, RID());
 
@@ -3668,15 +3388,9 @@ RID RenderingDevice::index_buffer_create(uint32_t p_index_count, IndexBufferForm
 #endif
 	index_buffer.size = size_bytes;
 	index_buffer.usage = (RDD::BUFFER_USAGE_TRANSFER_FROM_BIT | RDD::BUFFER_USAGE_TRANSFER_TO_BIT | RDD::BUFFER_USAGE_INDEX_BIT);
-	if (p_creation_bits.has_flag(BUFFER_CREATION_AS_STORAGE_BIT)) {
-		index_buffer.usage.set_flag(RDD::BUFFER_USAGE_STORAGE_BIT);
-	}
 	if (p_creation_bits.has_flag(BUFFER_CREATION_DEVICE_ADDRESS_BIT)) {
 		index_buffer.usage.set_flag(RDD::BUFFER_USAGE_DEVICE_ADDRESS_BIT);
 	}
-	if (p_creation_bits.has_flag(BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT)) {
-		index_buffer.usage.set_flag(RDD::BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT);
-	}
 	index_buffer.driver_id = driver->buffer_create(index_buffer.size, index_buffer.usage, RDD::MEMORY_ALLOCATION_TYPE_GPU, frames_drawn);
 	ERR_FAIL_COND_V(!index_buffer.driver_id, RID());
 
@@ -3869,13 +3583,6 @@ RID RenderingDevice::shader_create_from_bytecode_with_samplers(const Vector<uint
 			case SHADER_STAGE_COMPUTE:
 				shader->stage_bits.set_flag(RDD::PIPELINE_STAGE_COMPUTE_SHADER_BIT);
 				break;
-			case SHADER_STAGE_RAYGEN:
-			case SHADER_STAGE_ANY_HIT:
-			case SHADER_STAGE_CLOSEST_HIT:
-			case SHADER_STAGE_MISS:
-			case SHADER_STAGE_INTERSECTION:
-				shader->stage_bits.set_flag(RDD::PIPELINE_STAGE_RAY_TRACING_SHADER_BIT);
-				break;
 			default:
 				DEV_ASSERT(false && "Unknown shader stage.");
 				break;
@@ -4331,7 +4038,7 @@ RID RenderingDevice::uniform_set_create(const VectorView<RD::Uniform> &p_uniform
 				_check_transfer_worker_buffer(buffer);
 			} break;
 			case UNIFORM_TYPE_INPUT_ATTACHMENT: {
-				ERR_FAIL_COND_V_MSG(shader->pipeline_type != PIPELINE_TYPE_RASTERIZATION, RID(), "InputAttachment (binding: " + itos(uniform.binding) + ") supplied for non-render shader (this is not allowed).");
+				ERR_FAIL_COND_V_MSG(shader->is_compute, RID(), "InputAttachment (binding: " + itos(uniform.binding) + ") supplied for compute shader (this is not allowed).");
 
 				if (uniform.get_id_count() != (uint32_t)set_uniform.length) {
 					if (set_uniform.length > 1) {
@@ -4357,22 +4064,6 @@ RID RenderingDevice::uniform_set_create(const VectorView<RD::Uniform> &p_uniform
 					_check_transfer_worker_texture(texture);
 				}
 			} break;
-			case UNIFORM_TYPE_ACCELERATION_STRUCTURE: {
-				ERR_FAIL_COND_V_MSG(uniform.get_id_count() != 1, RID(),
-						"Acceleration structure supplied (binding: " + itos(uniform.binding) + ") must provide one ID (" + itos(uniform.get_id_count()) + " provided).");
-
-				RID accel_id = uniform.get_id(0);
-				AccelerationStructure *accel = acceleration_structure_owner.get_or_null(accel_id);
-				ERR_FAIL_NULL_V_MSG(accel, RID(), "Acceleration Structure supplied (binding: " + itos(uniform.binding) + ") is invalid.");
-
-				if (accel->draw_tracker != nullptr) {
-					draw_trackers.push_back(accel->draw_tracker);
-					// Acceleration structure is never going to be writable from raytracing shaders
-					draw_trackers_usage.push_back(RDG::RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ);
-				}
-
-				driver_uniform.ids.push_back(accel->driver_id);
-			} break;
 			default: {
 			}
 		}
@@ -4437,8 +4128,7 @@ RID RenderingDevice::render_pipeline_create(RID p_shader, FramebufferFormatID p_
 	// Needs a shader.
 	Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_NULL_V(shader, RID());
-	ERR_FAIL_COND_V_MSG(shader->pipeline_type != PIPELINE_TYPE_RASTERIZATION, RID(),
-			"Only render shaders can be used in render pipelines");
+	ERR_FAIL_COND_V_MSG(shader->is_compute, RID(), "Compute shaders can't be used in render pipelines");
 
 	// Validate pre-raster shader. One of stages must be vertex shader or mesh shader (not implemented yet).
 	ERR_FAIL_COND_V_MSG(!shader->stage_bits.has_flag(RDD::PIPELINE_STAGE_VERTEX_SHADER_BIT), RID(), "Pre-raster shader (vertex shader) is not provided for pipeline creation.");
@@ -4631,7 +4321,7 @@ RID RenderingDevice::compute_pipeline_create(RID p_shader, const Vector<Pipeline
 		shader = shader_owner.get_or_null(p_shader);
 		ERR_FAIL_NULL_V(shader, RID());
 
-		ERR_FAIL_COND_V_MSG(shader->pipeline_type != PIPELINE_TYPE_COMPUTE, RID(),
+		ERR_FAIL_COND_V_MSG(!shader->is_compute, RID(),
 				"Non-compute shaders can't be used in compute pipelines");
 	}
 
@@ -4684,57 +4374,6 @@ bool RenderingDevice::compute_pipeline_is_valid(RID p_pipeline) {
 	return compute_pipeline_owner.owns(p_pipeline);
 }
 
-RID RenderingDevice::raytracing_pipeline_create(RID p_shader, const Vector<PipelineSpecializationConstant> &p_specialization_constants) {
-	_THREAD_SAFE_METHOD_
-
-	// Needs a shader.
-	Shader *shader = shader_owner.get_or_null(p_shader);
-	ERR_FAIL_NULL_V(shader, RID());
-
-	ERR_FAIL_COND_V_MSG(shader->pipeline_type != PIPELINE_TYPE_RAYTRACING, RID(),
-			"Only raytracing shaders can be used in raytracing pipelines");
-
-	for (int i = 0; i < shader->specialization_constants.size(); i++) {
-		const ShaderSpecializationConstant &sc = shader->specialization_constants[i];
-		for (int j = 0; j < p_specialization_constants.size(); j++) {
-			const PipelineSpecializationConstant &psc = p_specialization_constants[j];
-			if (psc.constant_id == sc.constant_id) {
-				ERR_FAIL_COND_V_MSG(psc.type != sc.type, RID(), "Specialization constant provided for id (" + itos(sc.constant_id) + ") is of the wrong type.");
-				break;
-			}
-		}
-	}
-
-	RaytracingPipeline pipeline;
-	pipeline.driver_id = driver->raytracing_pipeline_create(shader->driver_id, p_specialization_constants);
-	ERR_FAIL_COND_V(!pipeline.driver_id, RID());
-
-	if (pipeline_cache_enabled) {
-		update_pipeline_cache();
-	}
-
-	pipeline.shader = p_shader;
-	pipeline.shader_driver_id = shader->driver_id;
-	pipeline.shader_layout_hash = shader->layout_hash;
-	pipeline.set_formats = shader->set_formats;
-	pipeline.push_constant_size = shader->push_constant_size;
-
-	// Create ID to associate with this pipeline.
-	RID id = raytracing_pipeline_owner.make_rid(pipeline);
-#ifdef DEV_ENABLED
-	set_resource_name(id, "RID:" + itos(id.get_id()));
-#endif
-	// Now add all the dependencies.
-	_add_dependency(id, p_shader);
-	return id;
-}
-
-bool RenderingDevice::raytracing_pipeline_is_valid(RID p_pipeline) {
-	_THREAD_SAFE_METHOD_
-
-	return raytracing_pipeline_owner.owns(p_pipeline);
-}
-
 /****************/
 /**** SCREEN ****/
 /****************/
@@ -4743,13 +4382,13 @@ uint32_t RenderingDevice::_get_swap_chain_desired_count() const {
 	return MAX(2U, uint32_t(GLOBAL_GET_CACHED(uint32_t, "rendering/rendering_device/vsync/swapchain_image_count")));
 }
 
-Error RenderingDevice::screen_create(DisplayServerEnums::WindowID p_screen) {
+Error RenderingDevice::screen_create(DisplayServer::WindowID p_screen) {
 	_THREAD_SAFE_METHOD_
 
 	RenderingContextDriver::SurfaceID surface = context->surface_get_from_window(p_screen);
 	ERR_FAIL_COND_V_MSG(surface == 0, ERR_CANT_CREATE, "A surface was not created for the screen.");
 
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
 	ERR_FAIL_COND_V_MSG(it != screen_swap_chains.end(), ERR_CANT_CREATE, "A swap chain was already created for the screen.");
 
 	RDD::SwapChainID swap_chain = driver->swap_chain_create(surface);
@@ -4760,11 +4399,11 @@ Error RenderingDevice::screen_create(DisplayServerEnums::WindowID p_screen) {
 	return OK;
 }
 
-Error RenderingDevice::screen_prepare_for_drawing(DisplayServerEnums::WindowID p_screen) {
+Error RenderingDevice::screen_prepare_for_drawing(DisplayServer::WindowID p_screen) {
 	_THREAD_SAFE_METHOD_
 
 	// After submitting work, acquire the swapchain image(s).
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
 	ERR_FAIL_COND_V_MSG(it == screen_swap_chains.end(), ERR_CANT_CREATE, "A swap chain was not created for the screen.");
 
 	// Erase the framebuffer corresponding to this screen from the map in case any of the operations fail.
@@ -4810,7 +4449,7 @@ Error RenderingDevice::screen_prepare_for_drawing(DisplayServerEnums::WindowID p
 	return OK;
 }
 
-int RenderingDevice::screen_get_width(DisplayServerEnums::WindowID p_screen) const {
+int RenderingDevice::screen_get_width(DisplayServer::WindowID p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	RenderingContextDriver::SurfaceID surface = context->surface_get_from_window(p_screen);
@@ -4818,7 +4457,7 @@ int RenderingDevice::screen_get_width(DisplayServerEnums::WindowID p_screen) con
 	return context->surface_get_width(surface);
 }
 
-int RenderingDevice::screen_get_height(DisplayServerEnums::WindowID p_screen) const {
+int RenderingDevice::screen_get_height(DisplayServer::WindowID p_screen) const {
 	_THREAD_SAFE_METHOD_
 
 	RenderingContextDriver::SurfaceID surface = context->surface_get_from_window(p_screen);
@@ -4826,19 +4465,19 @@ int RenderingDevice::screen_get_height(DisplayServerEnums::WindowID p_screen) co
 	return context->surface_get_height(surface);
 }
 
-int RenderingDevice::screen_get_pre_rotation_degrees(DisplayServerEnums::WindowID p_screen) const {
+int RenderingDevice::screen_get_pre_rotation_degrees(DisplayServer::WindowID p_screen) const {
 	_THREAD_SAFE_METHOD_
 
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
 	ERR_FAIL_COND_V_MSG(it == screen_swap_chains.end(), ERR_CANT_CREATE, "A swap chain was not created for the screen.");
 
 	return driver->swap_chain_get_pre_rotation_degrees(it->value);
 }
 
-RenderingDevice::FramebufferFormatID RenderingDevice::screen_get_framebuffer_format(DisplayServerEnums::WindowID p_screen) const {
+RenderingDevice::FramebufferFormatID RenderingDevice::screen_get_framebuffer_format(DisplayServer::WindowID p_screen) const {
 	_THREAD_SAFE_METHOD_
 
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
 	ERR_FAIL_COND_V_MSG(it == screen_swap_chains.end(), INVALID_ID, "Screen was never prepared.");
 
 	DataFormat format = driver->swap_chain_get_format(it->value);
@@ -4853,27 +4492,16 @@ RenderingDevice::FramebufferFormatID RenderingDevice::screen_get_framebuffer_for
 	return const_cast<RenderingDevice *>(this)->framebuffer_format_create(screen_attachment);
 }
 
-RenderingDevice::ColorSpace RenderingDevice::screen_get_color_space(DisplayServerEnums::WindowID p_screen) const {
+Error RenderingDevice::screen_free(DisplayServer::WindowID p_screen) {
 	_THREAD_SAFE_METHOD_
 
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
-	ERR_FAIL_COND_V_MSG(it == screen_swap_chains.end(), COLOR_SPACE_MAX, "Screen was never prepared.");
-
-	ColorSpace color_space = driver->swap_chain_get_color_space(it->value);
-	ERR_FAIL_COND_V_MSG(color_space == COLOR_SPACE_MAX, COLOR_SPACE_MAX, "Unknown color space.");
-	return color_space;
-}
-
-Error RenderingDevice::screen_free(DisplayServerEnums::WindowID p_screen) {
-	_THREAD_SAFE_METHOD_
-
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator it = screen_swap_chains.find(p_screen);
 	ERR_FAIL_COND_V_MSG(it == screen_swap_chains.end(), FAILED, "Screen was never created.");
 
 	// Flush everything so nothing can be using the swap chain before erasing it.
 	_flush_and_stall_for_all_frames();
 
-	const DisplayServerEnums::WindowID screen = it->key;
+	const DisplayServer::WindowID screen = it->key;
 	const RDD::SwapChainID swap_chain = it->value;
 	driver->swap_chain_free(swap_chain);
 	screen_framebuffers.erase(screen);
@@ -4886,16 +4514,15 @@ Error RenderingDevice::screen_free(DisplayServerEnums::WindowID p_screen) {
 /**** DRAW LIST ****/
 /*******************/
 
-RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayServerEnums::WindowID p_screen, const Color &p_clear_color) {
+RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayServer::WindowID p_screen, const Color &p_clear_color) {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
 	ERR_FAIL_COND_V_MSG(draw_list.active, INVALID_ID, "Only one draw list can be active at the same time.");
 	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one draw/compute list can be active at the same time.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, INVALID_ID, "Only one draw/raytracing list can be active at the same time.");
 
 	RenderingContextDriver::SurfaceID surface = context->surface_get_from_window(p_screen);
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID>::ConstIterator sc_it = screen_swap_chains.find(p_screen);
-	HashMap<DisplayServerEnums::WindowID, RDD::FramebufferID>::ConstIterator fb_it = screen_framebuffers.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator sc_it = screen_swap_chains.find(p_screen);
+	HashMap<DisplayServer::WindowID, RDD::FramebufferID>::ConstIterator fb_it = screen_framebuffers.find(p_screen);
 	ERR_FAIL_COND_V_MSG(surface == 0, 0, "A surface was not created for the screen.");
 	ERR_FAIL_COND_V_MSG(sc_it == screen_swap_chains.end(), INVALID_ID, "Screen was never prepared.");
 	ERR_FAIL_COND_V_MSG(fb_it == screen_framebuffers.end(), INVALID_ID, "Framebuffer was never prepared.");
@@ -5738,236 +5365,6 @@ void RenderingDevice::draw_list_end() {
 	draw_list_bound_textures.clear();
 }
 
-/***************************/
-/**** RAYTRACING LISTS ****/
-/**************************/
-
-RenderingDevice::RaytracingListID RenderingDevice::raytracing_list_begin() {
-	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
-
-	ERR_FAIL_COND_V_MSG(!has_feature(SUPPORTS_RAYTRACING_PIPELINE), INVALID_ID, "The current rendering device has no raytracing pipeline support.");
-
-	ERR_FAIL_COND_V_MSG(draw_list.active, INVALID_ID, "Only one draw/raytracing list can be active at the same time.");
-	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one compute/raytracing list can be active at the same time.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, INVALID_ID, "Only one raytracing list can be active at the same time.");
-
-	raytracing_list.active = true;
-
-	draw_graph.add_raytracing_list_begin();
-
-	return ID_TYPE_RAYTRACING_LIST;
-}
-
-void RenderingDevice::raytracing_list_bind_raytracing_pipeline(RaytracingListID p_list, RID p_raytracing_pipeline) {
-	ERR_RENDER_THREAD_GUARD();
-
-	ERR_FAIL_COND(p_list != ID_TYPE_RAYTRACING_LIST);
-	ERR_FAIL_COND(!raytracing_list.active);
-
-	const RaytracingPipeline *pipeline = raytracing_pipeline_owner.get_or_null(p_raytracing_pipeline);
-	ERR_FAIL_NULL(pipeline);
-
-	if (p_raytracing_pipeline == raytracing_list.state.pipeline) {
-		return; // Redundant state, return.
-	}
-
-	raytracing_list.state.pipeline = p_raytracing_pipeline;
-	raytracing_list.state.pipeline_driver_id = pipeline->driver_id;
-
-	draw_graph.add_raytracing_list_bind_pipeline(pipeline->driver_id);
-
-	if (raytracing_list.state.pipeline_shader != pipeline->shader) {
-		// Shader changed, so descriptor sets may become incompatible.
-
-		uint32_t pcount = pipeline->set_formats.size(); // Formats count in this pipeline.
-		raytracing_list.state.set_count = MAX(raytracing_list.state.set_count, pcount);
-		const uint32_t *pformats = pipeline->set_formats.ptr(); // Pipeline set formats.
-
-		uint32_t first_invalid_set = UINT32_MAX; // All valid by default.
-		switch (driver->api_trait_get(RDD::API_TRAIT_SHADER_CHANGE_INVALIDATION)) {
-			case RDD::SHADER_CHANGE_INVALIDATION_ALL_BOUND_UNIFORM_SETS: {
-				first_invalid_set = 0;
-			} break;
-			case RDD::SHADER_CHANGE_INVALIDATION_INCOMPATIBLE_SETS_PLUS_CASCADE: {
-				for (uint32_t i = 0; i < pcount; i++) {
-					if (raytracing_list.state.sets[i].pipeline_expected_format != pformats[i]) {
-						first_invalid_set = i;
-						break;
-					}
-				}
-			} break;
-			case RDD::SHADER_CHANGE_INVALIDATION_ALL_OR_NONE_ACCORDING_TO_LAYOUT_HASH: {
-				if (raytracing_list.state.pipeline_shader_layout_hash != pipeline->shader_layout_hash) {
-					first_invalid_set = 0;
-				}
-			} break;
-		}
-
-		for (uint32_t i = 0; i < pcount; i++) {
-			raytracing_list.state.sets[i].bound = raytracing_list.state.sets[i].bound && i < first_invalid_set;
-			raytracing_list.state.sets[i].pipeline_expected_format = pformats[i];
-		}
-
-		for (uint32_t i = pcount; i < raytracing_list.state.set_count; i++) {
-			// Unbind the ones above (not used) if exist.
-			raytracing_list.state.sets[i].bound = false;
-		}
-
-		raytracing_list.state.set_count = pcount; // Update set count.
-
-		if (pipeline->push_constant_size) {
-#ifdef DEBUG_ENABLED
-			raytracing_list.validation.pipeline_push_constant_supplied = false;
-#endif
-		}
-
-		raytracing_list.state.pipeline_shader = pipeline->shader;
-		raytracing_list.state.pipeline_shader_driver_id = pipeline->shader_driver_id;
-		raytracing_list.state.pipeline_shader_layout_hash = pipeline->shader_layout_hash;
-	}
-
-#ifdef DEBUG_ENABLED
-	// Update raytracing pass pipeline info.
-	raytracing_list.validation.pipeline_active = true;
-	raytracing_list.validation.pipeline_push_constant_size = pipeline->push_constant_size;
-#endif
-}
-
-void RenderingDevice::raytracing_list_bind_uniform_set(RaytracingListID p_list, RID p_uniform_set, uint32_t p_index) {
-	ERR_RENDER_THREAD_GUARD();
-
-	ERR_FAIL_COND(p_list != ID_TYPE_RAYTRACING_LIST);
-	ERR_FAIL_COND(!raytracing_list.active);
-
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(p_index >= driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS) || p_index >= MAX_UNIFORM_SETS,
-			"Attempting to bind a descriptor set (" + itos(p_index) + ") greater than what the hardware supports (" + itos(driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS)) + ").");
-#endif
-
-	UniformSet *uniform_set = uniform_set_owner.get_or_null(p_uniform_set);
-	ERR_FAIL_NULL(uniform_set);
-
-	if (p_index > raytracing_list.state.set_count) {
-		raytracing_list.state.set_count = p_index;
-	}
-
-	raytracing_list.state.sets[p_index].uniform_set_driver_id = uniform_set->driver_id; // Update set pointer.
-	raytracing_list.state.sets[p_index].bound = false; // Needs rebind.
-	raytracing_list.state.sets[p_index].uniform_set_format = uniform_set->format;
-	raytracing_list.state.sets[p_index].uniform_set = p_uniform_set;
-}
-
-void RenderingDevice::raytracing_list_set_push_constant(RaytracingListID p_list, const void *p_data, uint32_t p_data_size) {
-	ERR_RENDER_THREAD_GUARD();
-
-	ERR_FAIL_COND(p_list != ID_TYPE_RAYTRACING_LIST);
-	ERR_FAIL_COND(!raytracing_list.active);
-
-	ERR_FAIL_COND_MSG(p_data_size > MAX_PUSH_CONSTANT_SIZE, "Push constants can't be bigger than 128 bytes to maintain compatibility.");
-
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(p_data_size != raytracing_list.validation.pipeline_push_constant_size,
-			"This raytracing pipeline requires (" + itos(raytracing_list.validation.pipeline_push_constant_size) + ") bytes of push constant data, supplied: (" + itos(p_data_size) + ")");
-#endif
-
-	draw_graph.add_raytracing_list_set_push_constant(raytracing_list.state.pipeline_shader_driver_id, p_data, p_data_size);
-
-	// Store it in the state in case we need to restart the raytracing list.
-	memcpy(raytracing_list.state.push_constant_data, p_data, p_data_size);
-	raytracing_list.state.push_constant_size = p_data_size;
-
-#ifdef DEBUG_ENABLED
-	raytracing_list.validation.pipeline_push_constant_supplied = true;
-#endif
-}
-
-void RenderingDevice::raytracing_list_trace_rays(RaytracingListID p_list, uint32_t p_width, uint32_t p_height) {
-	ERR_RENDER_THREAD_GUARD();
-
-	ERR_FAIL_COND(p_list != ID_TYPE_RAYTRACING_LIST);
-	ERR_FAIL_COND(!raytracing_list.active);
-
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_NULL_MSG(shader_owner.get_or_null(raytracing_list.state.pipeline_shader), "No shader was set before attempting to trace rays.");
-	ERR_FAIL_NULL_MSG(raytracing_pipeline_owner.get_or_null(raytracing_list.state.pipeline), "No raytracing pipeline was set before attempting to trace rays.");
-#endif
-
-#ifdef DEBUG_ENABLED
-
-	ERR_FAIL_COND_MSG(!raytracing_list.validation.pipeline_active, "No raytracing pipeline was set before attempting to draw.");
-
-	if (raytracing_list.validation.pipeline_push_constant_size > 0) {
-		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!raytracing_list.validation.pipeline_push_constant_supplied,
-				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
-	}
-
-#endif
-
-#ifdef DEBUG_ENABLED
-	for (uint32_t i = 0; i < raytracing_list.state.set_count; i++) {
-		if (raytracing_list.state.sets[i].pipeline_expected_format == 0) {
-			// Nothing expected by this pipeline.
-			continue;
-		}
-
-		if (raytracing_list.state.sets[i].pipeline_expected_format != raytracing_list.state.sets[i].uniform_set_format) {
-			if (raytracing_list.state.sets[i].uniform_set_format == 0) {
-				ERR_FAIL_MSG("Uniforms were never supplied for set (" + itos(i) + ") at the time of drawing, which are required by the pipeline.");
-			} else if (uniform_set_owner.owns(raytracing_list.state.sets[i].uniform_set)) {
-				UniformSet *us = uniform_set_owner.get_or_null(raytracing_list.state.sets[i].uniform_set);
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(raytracing_list.state.pipeline_shader));
-			} else {
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(raytracing_list.state.pipeline_shader));
-			}
-		}
-	}
-#endif
-
-	// Prepare descriptor sets if the API doesn't use pipeline barriers.
-	if (!driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
-		for (uint32_t i = 0; i < raytracing_list.state.set_count; i++) {
-			if (raytracing_list.state.sets[i].pipeline_expected_format == 0) {
-				// Nothing expected by this pipeline.
-				continue;
-			}
-
-			draw_graph.add_raytracing_list_uniform_set_prepare_for_use(raytracing_list.state.pipeline_shader_driver_id, raytracing_list.state.sets[i].uniform_set_driver_id, i);
-		}
-	}
-
-	// Bind descriptor sets.
-	for (uint32_t i = 0; i < raytracing_list.state.set_count; i++) {
-		if (raytracing_list.state.sets[i].pipeline_expected_format == 0) {
-			continue; // Nothing expected by this pipeline.
-		}
-		if (!raytracing_list.state.sets[i].bound) {
-			// All good, see if this requires re-binding.
-			draw_graph.add_raytracing_list_bind_uniform_set(raytracing_list.state.pipeline_shader_driver_id, raytracing_list.state.sets[i].uniform_set_driver_id, i);
-
-			UniformSet *uniform_set = uniform_set_owner.get_or_null(raytracing_list.state.sets[i].uniform_set);
-			_uniform_set_update_shared(uniform_set);
-
-			draw_graph.add_raytracing_list_usages(uniform_set->draw_trackers, uniform_set->draw_trackers_usage);
-
-			raytracing_list.state.sets[i].bound = true;
-		}
-	}
-
-	draw_graph.add_raytracing_list_trace_rays(p_width, p_height);
-	raytracing_list.state.trace_count++;
-}
-
-void RenderingDevice::raytracing_list_end() {
-	ERR_RENDER_THREAD_GUARD();
-
-	ERR_FAIL_COND(!raytracing_list.active);
-
-	draw_graph.add_raytracing_list_end();
-
-	raytracing_list = RaytracingList();
-}
-
 /***********************/
 /**** COMPUTE LISTS ****/
 /***********************/
@@ -5975,8 +5372,7 @@ void RenderingDevice::raytracing_list_end() {
 RenderingDevice::ComputeListID RenderingDevice::compute_list_begin() {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
-	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one compute list can be active at the same time.");
-	ERR_FAIL_COND_V_MSG(raytracing_list.active, INVALID_ID, "Only one raytracing list can be active at the same time.");
+	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one draw/compute list can be active at the same time.");
 
 	compute_list.active = true;
 
@@ -6453,7 +5849,7 @@ RenderingDevice::TransferWorker *RenderingDevice::_acquire_transfer_worker(uint3
 		MutexLock pool_lock(transfer_worker_pool_mutex);
 
 		// If no workers are available and we've reached the max pool capacity, wait until one of them becomes available.
-		bool transfer_worker_pool_full = transfer_worker_pool_size >= transfer_worker_pool_max_size;
+		bool transfer_worker_pool_full = transfer_worker_pool.size() >= transfer_worker_pool_max_size;
 		while (transfer_worker_pool_available_list.is_empty() && transfer_worker_pool_full) {
 			transfer_worker_pool_condition.wait(pool_lock);
 		}
@@ -6516,16 +5912,13 @@ RenderingDevice::TransferWorker *RenderingDevice::_acquire_transfer_worker(uint3
 			DEV_ASSERT(!transfer_worker_pool_full && "A transfer worker should never be created when the pool is full.");
 
 			// No existing worker was picked, we create a new one.
-			uint32_t transfer_worker_index = transfer_worker_pool_size;
-			++transfer_worker_pool_size;
-
 			transfer_worker = memnew(TransferWorker);
 			transfer_worker->command_fence = driver->fence_create();
 			transfer_worker->command_pool = driver->command_pool_create(transfer_queue_family, RDD::COMMAND_BUFFER_TYPE_PRIMARY);
 			transfer_worker->command_buffer = driver->command_buffer_create(transfer_worker->command_pool);
-			transfer_worker->index = transfer_worker_index;
-			transfer_worker_pool[transfer_worker_index] = transfer_worker;
-			transfer_worker_operation_used_by_draw[transfer_worker_index] = 0;
+			transfer_worker->index = transfer_worker_pool.size();
+			transfer_worker_pool.push_back(transfer_worker);
+			transfer_worker_operation_used_by_draw.push_back(0);
 			transfer_worker->thread_mutex.lock();
 		}
 	}
@@ -6560,7 +5953,7 @@ RenderingDevice::TransferWorker *RenderingDevice::_acquire_transfer_worker(uint3
 				driver->buffer_free(transfer_worker->staging_buffer);
 			}
 
-			uint32_t new_staging_buffer_size = Math::next_power_of_2(expected_buffer_size);
+			uint32_t new_staging_buffer_size = next_power_of_2(expected_buffer_size);
 			transfer_worker->staging_buffer_size_allocated = new_staging_buffer_size;
 			transfer_worker->staging_buffer = driver->buffer_create(new_staging_buffer_size, RDD::BUFFER_USAGE_TRANSFER_FROM_BIT, RDD::MEMORY_ALLOCATION_TYPE_CPU, frames_drawn);
 		}
@@ -6679,7 +6072,7 @@ void RenderingDevice::_check_transfer_worker_index_array(IndexArray *p_index_arr
 
 void RenderingDevice::_submit_transfer_workers(RDD::CommandBufferID p_draw_command_buffer) {
 	MutexLock transfer_worker_lock(transfer_worker_pool_mutex);
-	for (uint32_t i = 0; i < transfer_worker_pool_size; i++) {
+	for (uint32_t i = 0; i < transfer_worker_pool.size(); i++) {
 		TransferWorker *worker = transfer_worker_pool[i];
 		if (p_draw_command_buffer) {
 			MutexLock lock(worker->operations_mutex);
@@ -6707,15 +6100,14 @@ void RenderingDevice::_submit_transfer_workers(RDD::CommandBufferID p_draw_comma
 void RenderingDevice::_submit_transfer_barriers(RDD::CommandBufferID p_draw_command_buffer) {
 	MutexLock transfer_worker_lock(transfer_worker_pool_texture_barriers_mutex);
 	if (!transfer_worker_pool_texture_barriers.is_empty()) {
-		driver->command_pipeline_barrier(p_draw_command_buffer, RDD::PIPELINE_STAGE_COPY_BIT, RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT, {}, {}, transfer_worker_pool_texture_barriers, {});
+		driver->command_pipeline_barrier(p_draw_command_buffer, RDD::PIPELINE_STAGE_COPY_BIT, RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT, {}, {}, transfer_worker_pool_texture_barriers);
 		transfer_worker_pool_texture_barriers.clear();
 	}
 }
 
 void RenderingDevice::_wait_for_transfer_workers() {
 	MutexLock transfer_worker_lock(transfer_worker_pool_mutex);
-	for (uint32_t i = 0; i < transfer_worker_pool_size; i++) {
-		TransferWorker *worker = transfer_worker_pool[i];
+	for (TransferWorker *worker : transfer_worker_pool) {
 		MutexLock lock(worker->thread_mutex);
 		if (worker->submitted) {
 			_wait_for_transfer_worker(worker);
@@ -6725,15 +6117,14 @@ void RenderingDevice::_wait_for_transfer_workers() {
 
 void RenderingDevice::_free_transfer_workers() {
 	MutexLock transfer_worker_lock(transfer_worker_pool_mutex);
-	for (uint32_t i = 0; i < transfer_worker_pool_size; i++) {
-		TransferWorker *worker = transfer_worker_pool[i];
+	for (TransferWorker *worker : transfer_worker_pool) {
 		driver->fence_free(worker->command_fence);
 		driver->buffer_free(worker->staging_buffer);
 		driver->command_pool_free(worker->command_pool);
 		memdelete(worker);
 	}
 
-	transfer_worker_pool_size = 0;
+	transfer_worker_pool.clear();
 }
 
 /***********************/
@@ -6866,18 +6257,6 @@ bool RenderingDevice::_uniform_set_make_mutable(UniformSet *p_uniform_set, RID p
 	}
 }
 
-bool RenderingDevice::_acceleration_structure_make_mutable(AccelerationStructure *p_acceleration_structure, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker) {
-	if (!p_acceleration_structure->untracked_buffers.has(p_resource_id)) {
-		// Acceleration structure thinks the buffer is already tracked or does not use it.
-		return false;
-	} else {
-		// Acceleration structure is aware of the buffer but it isn't being tracked.
-		p_acceleration_structure->draw_trackers.push_back(p_resource_tracker);
-		p_acceleration_structure->untracked_buffers.erase(p_resource_id);
-		return true;
-	}
-}
-
 bool RenderingDevice::_dependency_make_mutable(RID p_id, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker) {
 	if (texture_owner.owns(p_id)) {
 		Texture *texture = texture_owner.get_or_null(p_id);
@@ -6891,9 +6270,6 @@ bool RenderingDevice::_dependency_make_mutable(RID p_id, RID p_resource_id, RDG:
 	} else if (uniform_set_owner.owns(p_id)) {
 		UniformSet *uniform_set = uniform_set_owner.get_or_null(p_id);
 		return _uniform_set_make_mutable(uniform_set, p_resource_id, p_resource_tracker);
-	} else if (acceleration_structure_owner.owns(p_id)) {
-		AccelerationStructure *acceleration_structure = acceleration_structure_owner.get_or_null(p_id);
-		return _acceleration_structure_make_mutable(acceleration_structure, p_resource_id, p_resource_tracker);
 	} else {
 		DEV_ASSERT(false && "Unknown resource type to make mutable.");
 		return false;
@@ -7023,13 +6399,6 @@ void RenderingDevice::_free_internal(RID p_id) {
 		RDG::resource_tracker_free(storage_buffer->draw_tracker);
 		frames[frame].buffers_to_dispose_of.push_back(*storage_buffer);
 		storage_buffer_owner.free(p_id);
-	} else if (instances_buffer_owner.owns(p_id)) {
-		InstancesBuffer *instances_buffer = instances_buffer_owner.get_or_null(p_id);
-		_check_transfer_worker_buffer(&instances_buffer->buffer);
-
-		RDG::resource_tracker_free(instances_buffer->buffer.draw_tracker);
-		frames[frame].buffers_to_dispose_of.push_back(instances_buffer->buffer);
-		instances_buffer_owner.free(p_id);
 	} else if (uniform_set_owner.owns(p_id)) {
 		UniformSet *uniform_set = uniform_set_owner.get_or_null(p_id);
 		frames[frame].uniform_sets_to_dispose_of.push_back(*uniform_set);
@@ -7046,15 +6415,6 @@ void RenderingDevice::_free_internal(RID p_id) {
 		ComputePipeline *pipeline = compute_pipeline_owner.get_or_null(p_id);
 		frames[frame].compute_pipelines_to_dispose_of.push_back(*pipeline);
 		compute_pipeline_owner.free(p_id);
-	} else if (acceleration_structure_owner.owns(p_id)) {
-		AccelerationStructure *acceleration_structure = acceleration_structure_owner.get_or_null(p_id);
-		RDG::resource_tracker_free(acceleration_structure->draw_tracker);
-		frames[frame].acceleration_structures_to_dispose_of.push_back(*acceleration_structure);
-		acceleration_structure_owner.free(p_id);
-	} else if (raytracing_pipeline_owner.owns(p_id)) {
-		RaytracingPipeline *pipeline = raytracing_pipeline_owner.get_or_null(p_id);
-		frames[frame].raytracing_pipelines_to_dispose_of.push_back(*pipeline);
-		raytracing_pipeline_owner.free(p_id);
 	} else {
 #ifdef DEV_ENABLED
 		ERR_PRINT("Attempted to free invalid ID: " + itos(p_id.get_id()) + " " + resource_name);
@@ -7098,9 +6458,6 @@ void RenderingDevice::set_resource_name(RID p_id, const String &p_name) {
 	} else if (storage_buffer_owner.owns(p_id)) {
 		Buffer *storage_buffer = storage_buffer_owner.get_or_null(p_id);
 		driver->set_object_name(RDD::OBJECT_TYPE_BUFFER, storage_buffer->driver_id, p_name);
-	} else if (instances_buffer_owner.owns(p_id)) {
-		InstancesBuffer *instances_buffer = instances_buffer_owner.get_or_null(p_id);
-		driver->set_object_name(RDD::OBJECT_TYPE_BUFFER, instances_buffer->buffer.driver_id, p_name);
 	} else if (uniform_set_owner.owns(p_id)) {
 		UniformSet *uniform_set = uniform_set_owner.get_or_null(p_id);
 		driver->set_object_name(RDD::OBJECT_TYPE_UNIFORM_SET, uniform_set->driver_id, p_name);
@@ -7110,12 +6467,6 @@ void RenderingDevice::set_resource_name(RID p_id, const String &p_name) {
 	} else if (compute_pipeline_owner.owns(p_id)) {
 		ComputePipeline *pipeline = compute_pipeline_owner.get_or_null(p_id);
 		driver->set_object_name(RDD::OBJECT_TYPE_PIPELINE, pipeline->driver_id, p_name);
-	} else if (acceleration_structure_owner.owns(p_id)) {
-		AccelerationStructure *acceleration_structure = acceleration_structure_owner.get_or_null(p_id);
-		driver->set_object_name(RDD::OBJECT_TYPE_ACCELERATION_STRUCTURE, acceleration_structure->driver_id, p_name);
-	} else if (raytracing_pipeline_owner.owns(p_id)) {
-		RaytracingPipeline *pipeline = raytracing_pipeline_owner.get_or_null(p_id);
-		driver->set_object_name(RDD::OBJECT_TYPE_RAYTRACING_PIPELINE, pipeline->driver_id, p_name);
 	} else {
 		ERR_PRINT("Attempted to name invalid ID: " + itos(p_id.get_id()));
 		return;
@@ -7159,8 +6510,8 @@ String RenderingDevice::get_device_name() const {
 	return device.name;
 }
 
-RenderingDeviceEnums::DeviceType RenderingDevice::get_device_type() const {
-	return RenderingDeviceEnums::DeviceType(device.type);
+RenderingDevice::DeviceType RenderingDevice::get_device_type() const {
+	return DeviceType(device.type);
 }
 
 String RenderingDevice::get_device_api_name() const {
@@ -7233,32 +6584,6 @@ void RenderingDevice::_free_pending_resources(int p_frame) {
 		frames[p_frame].compute_pipelines_to_dispose_of.pop_front();
 	}
 
-	while (frames[p_frame].raytracing_pipelines_to_dispose_of.front()) {
-		RaytracingPipeline *pipeline = &frames[p_frame].raytracing_pipelines_to_dispose_of.front()->get();
-
-		driver->raytracing_pipeline_free(pipeline->driver_id);
-
-		frames[p_frame].raytracing_pipelines_to_dispose_of.pop_front();
-	}
-
-	// Acceleration structures.
-	while (frames[p_frame].acceleration_structures_to_dispose_of.front()) {
-		AccelerationStructure &acceleration_structure = frames[p_frame].acceleration_structures_to_dispose_of.front()->get();
-
-		driver->acceleration_structure_free(acceleration_structure.driver_id);
-
-		if (acceleration_structure.scratch_buffer) {
-			size_t scratch_size = driver->buffer_get_allocation_size(acceleration_structure.scratch_buffer);
-			_THREAD_SAFE_LOCK_
-			buffer_memory -= scratch_size;
-			_THREAD_SAFE_UNLOCK_
-
-			driver->buffer_free(acceleration_structure.scratch_buffer);
-		}
-
-		frames[p_frame].acceleration_structures_to_dispose_of.pop_front();
-	}
-
 	// Uniform sets.
 	while (frames[p_frame].uniform_sets_to_dispose_of.front()) {
 		UniformSet *uniform_set = &frames[p_frame].uniform_sets_to_dispose_of.front()->get();
@@ -7407,10 +6732,6 @@ void RenderingDevice::_end_frame() {
 		ERR_PRINT("Found open compute list at the end of the frame, this should never happen (further compute will likely not work).");
 	}
 
-	if (raytracing_list.active) {
-		ERR_PRINT("Found open raytracing list at the end of the frame, this should never happen (further raytracing will likely not work).");
-	}
-
 	// The command buffer must be copied into a stack variable as the driver workarounds can change the command buffer in use.
 	RDD::CommandBufferID command_buffer = frames[frame].command_buffer;
 	GodotProfileZoneGroupedFirst(_profile_zone, "_submit_transfer_workers");
@@ -7419,7 +6740,7 @@ void RenderingDevice::_end_frame() {
 	_submit_transfer_barriers(command_buffer);
 
 	GodotProfileZoneGrouped(_profile_zone, "draw_graph.end");
-	draw_graph.end(RENDER_GRAPH_REORDER == 1, RENDER_GRAPH_FULL_BARRIERS == 1, command_buffer, frames[frame].command_buffer_pool);
+	draw_graph.end(RENDER_GRAPH_REORDER, RENDER_GRAPH_FULL_BARRIERS, command_buffer, frames[frame].command_buffer_pool);
 	GodotProfileZoneGrouped(_profile_zone, "driver->command_buffer_end");
 	driver->command_buffer_end(command_buffer);
 	GodotProfileZoneGrouped(_profile_zone, "driver->end_segment");
@@ -7616,13 +6937,13 @@ void RenderingDevice::_flush_and_stall_for_all_frames(bool p_begin_frame) {
 	}
 }
 
-Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServerEnums::WindowID p_main_window) {
+Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServer::WindowID p_main_window) {
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
 	Error err;
 	RenderingContextDriver::SurfaceID main_surface = 0;
-	is_main_instance = (singleton == this) && (p_main_window != DisplayServerEnums::INVALID_WINDOW_ID);
-	if (p_main_window != DisplayServerEnums::INVALID_WINDOW_ID) {
+	is_main_instance = (singleton == this) && (p_main_window != DisplayServer::INVALID_WINDOW_ID);
+	if (p_main_window != DisplayServer::INVALID_WINDOW_ID) {
 		// Retrieve the surface from the main window if it was specified.
 		main_surface = p_context->surface_get_from_window(p_main_window);
 		ERR_FAIL_COND_V(main_surface == 0, FAILED);
@@ -7729,10 +7050,6 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 	// Use the processor count as the max amount of transfer workers that can be created.
 	transfer_worker_pool_max_size = OS::get_singleton()->get_processor_count();
 
-	// Pre-allocate to avoid locking a mutex when indexing into them.
-	transfer_worker_pool.resize(transfer_worker_pool_max_size);
-	transfer_worker_operation_used_by_draw.resize(transfer_worker_pool_max_size);
-
 	frames.resize(frame_count);
 
 	// Create data for all the frames.
@@ -7843,10 +7160,10 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 	download_staging_buffers.max_size = upload_staging_buffers.max_size;
 
 	texture_upload_region_size_px = GLOBAL_GET("rendering/rendering_device/staging_buffer/texture_upload_region_size_px");
-	texture_upload_region_size_px = Math::nearest_power_of_2_templated(texture_upload_region_size_px);
+	texture_upload_region_size_px = nearest_power_of_2_templated(texture_upload_region_size_px);
 
 	texture_download_region_size_px = GLOBAL_GET("rendering/rendering_device/staging_buffer/texture_download_region_size_px");
-	texture_download_region_size_px = Math::nearest_power_of_2_templated(texture_download_region_size_px);
+	texture_download_region_size_px = nearest_power_of_2_templated(texture_download_region_size_px);
 
 	// Ensure current staging block is valid and at least one per frame exists.
 	upload_staging_buffers.current = 0;
@@ -7868,7 +7185,6 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 
 	draw_list = DrawList();
 	compute_list = ComputeList();
-	raytracing_list = RaytracingList();
 
 	bool project_pipeline_cache_enable = GLOBAL_GET("rendering/rendering_device/pipeline_cache/enable");
 	if (is_main_instance && project_pipeline_cache_enable) {
@@ -7994,7 +7310,6 @@ void RenderingDevice::capture_timestamp(const String &p_name) {
 
 	ERR_FAIL_COND_MSG(draw_list.active && draw_list.state.draw_count > 0, "Capturing timestamps during draw list creation is not allowed. Offending timestamp was: " + p_name);
 	ERR_FAIL_COND_MSG(compute_list.active && compute_list.state.dispatch_count > 0, "Capturing timestamps during compute list creation is not allowed. Offending timestamp was: " + p_name);
-	ERR_FAIL_COND_MSG(raytracing_list.active && raytracing_list.state.trace_count > 0, "Capturing timestamps during raytracing list creation is not allowed. Offending timestamp was: " + p_name);
 	ERR_FAIL_COND_MSG(frames[frame].timestamp_count >= max_timestamp_query_elements, vformat("Tried capturing more timestamps than the configured maximum (%d). You can increase this limit in the project settings under 'Debug/Settings' called 'Max Timestamp Query Elements'.", max_timestamp_query_elements));
 
 	draw_graph.add_capture_timestamp(frames[frame].timestamp_pool, frames[frame].timestamp_count);
@@ -8051,8 +7366,6 @@ uint64_t RenderingDevice::get_driver_resource(DriverResource p_resource, RID p_r
 				buffer = texture_buffer_owner.get_or_null(p_rid);
 			} else if (storage_buffer_owner.owns(p_rid)) {
 				buffer = storage_buffer_owner.get_or_null(p_rid);
-			} else if (instances_buffer_owner.owns(p_rid)) {
-				buffer = &instances_buffer_owner.get_or_null(p_rid)->buffer;
 			}
 			ERR_FAIL_NULL_V(buffer, 0);
 
@@ -8174,7 +7487,6 @@ void RenderingDevice::finalize() {
 	_free_rids(uniform_set_owner, "UniformSet");
 	_free_rids(texture_buffer_owner, "TextureBuffer");
 	_free_rids(storage_buffer_owner, "StorageBuffer");
-	_free_rids(instances_buffer_owner, "InstancesBuffer");
 	_free_rids(uniform_buffer_owner, "UniformBuffer");
 	_free_rids(shader_owner, "Shader");
 	_free_rids(index_array_owner, "IndexArray");
@@ -8269,7 +7581,7 @@ void RenderingDevice::finalize() {
 	framebuffer_formats.clear();
 
 	// Delete the swap chains created for the screens.
-	for (const KeyValue<DisplayServerEnums::WindowID, RDD::SwapChainID> &it : screen_swap_chains) {
+	for (const KeyValue<DisplayServer::WindowID, RDD::SwapChainID> &it : screen_swap_chains) {
 		driver->swap_chain_free(it.value);
 	}
 
@@ -8311,7 +7623,7 @@ void RenderingDevice::finalize() {
 }
 
 void RenderingDevice::_set_max_fps(int p_max_fps) {
-	for (const KeyValue<DisplayServerEnums::WindowID, RDD::SwapChainID> &it : screen_swap_chains) {
+	for (const KeyValue<DisplayServer::WindowID, RDD::SwapChainID> &it : screen_swap_chains) {
 		driver->swap_chain_set_max_fps(it.value, p_max_fps);
 	}
 }
@@ -8417,20 +7729,11 @@ void RenderingDevice::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("compute_pipeline_create", "shader", "specialization_constants"), &RenderingDevice::_compute_pipeline_create, DEFVAL(TypedArray<RDPipelineSpecializationConstant>()));
 	ClassDB::bind_method(D_METHOD("compute_pipeline_is_valid", "compute_pipeline"), &RenderingDevice::compute_pipeline_is_valid);
 
-	ClassDB::bind_method(D_METHOD("raytracing_pipeline_create", "shader", "specialization_constants"), &RenderingDevice::_raytracing_pipeline_create, DEFVAL(TypedArray<RDPipelineSpecializationConstant>()));
-	ClassDB::bind_method(D_METHOD("raytracing_pipeline_is_valid", "raytracing_pipeline"), &RenderingDevice::raytracing_pipeline_is_valid);
+	ClassDB::bind_method(D_METHOD("screen_get_width", "screen"), &RenderingDevice::screen_get_width, DEFVAL(DisplayServer::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("screen_get_height", "screen"), &RenderingDevice::screen_get_height, DEFVAL(DisplayServer::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("screen_get_framebuffer_format", "screen"), &RenderingDevice::screen_get_framebuffer_format, DEFVAL(DisplayServer::MAIN_WINDOW_ID));
 
-	ClassDB::bind_method(D_METHOD("blas_create", "geometries"), &RenderingDevice::_blas_create);
-	ClassDB::bind_method(D_METHOD("tlas_instances_buffer_create", "instance_count", "creation_bits"), &RenderingDevice::tlas_instances_buffer_create, DEFVAL(0));
-	ClassDB::bind_method(D_METHOD("tlas_instances_buffer_fill", "instances_buffer", "blases", "transforms"), &RenderingDevice::_tlas_instances_buffer_fill);
-	ClassDB::bind_method(D_METHOD("tlas_create", "instances_buffer"), &RenderingDevice::tlas_create);
-	ClassDB::bind_method(D_METHOD("acceleration_structure_build", "acceleration_structure"), &RenderingDevice::acceleration_structure_build);
-
-	ClassDB::bind_method(D_METHOD("screen_get_width", "screen"), &RenderingDevice::screen_get_width, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("screen_get_height", "screen"), &RenderingDevice::screen_get_height, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-	ClassDB::bind_method(D_METHOD("screen_get_framebuffer_format", "screen"), &RenderingDevice::screen_get_framebuffer_format, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
-
-	ClassDB::bind_method(D_METHOD("draw_list_begin_for_screen", "screen", "clear_color"), &RenderingDevice::draw_list_begin_for_screen, DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID), DEFVAL(Color()));
+	ClassDB::bind_method(D_METHOD("draw_list_begin_for_screen", "screen", "clear_color"), &RenderingDevice::draw_list_begin_for_screen, DEFVAL(DisplayServer::MAIN_WINDOW_ID), DEFVAL(Color()));
 
 	ClassDB::bind_method(D_METHOD("draw_list_begin", "framebuffer", "draw_flags", "clear_color_values", "clear_depth_value", "clear_stencil_value", "region", "breadcrumb"), &RenderingDevice::_draw_list_begin_bind, DEFVAL(DRAW_DEFAULT_ALL), DEFVAL(Vector<Color>()), DEFVAL(1.0), DEFVAL(0), DEFVAL(Rect2()), DEFVAL(0));
 #ifndef DISABLE_DEPRECATED
@@ -8467,13 +7770,6 @@ void RenderingDevice::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("compute_list_add_barrier", "compute_list"), &RenderingDevice::compute_list_add_barrier);
 	ClassDB::bind_method(D_METHOD("compute_list_end"), &RenderingDevice::compute_list_end);
 
-	ClassDB::bind_method(D_METHOD("raytracing_list_begin"), &RenderingDevice::raytracing_list_begin);
-	ClassDB::bind_method(D_METHOD("raytracing_list_bind_raytracing_pipeline", "raytracing_list", "raytracing_pipeline"), &RenderingDevice::raytracing_list_bind_raytracing_pipeline);
-	ClassDB::bind_method(D_METHOD("raytracing_list_set_push_constant", "raytracing_list", "buffer", "size_bytes"), &RenderingDevice::_raytracing_list_set_push_constant);
-	ClassDB::bind_method(D_METHOD("raytracing_list_bind_uniform_set", "raytracing_list", "uniform_set", "set_index"), &RenderingDevice::raytracing_list_bind_uniform_set);
-	ClassDB::bind_method(D_METHOD("raytracing_list_trace_rays", "raytracing_list", "width", "height"), &RenderingDevice::raytracing_list_trace_rays);
-	ClassDB::bind_method(D_METHOD("raytracing_list_end"), &RenderingDevice::raytracing_list_end);
-
 	ClassDB::bind_method(D_METHOD("free_rid", "rid"), &RenderingDevice::free_rid);
 
 	ClassDB::bind_method(D_METHOD("capture_timestamp", "name"), &RenderingDevice::capture_timestamp);
@@ -8526,12 +7822,12 @@ void RenderingDevice::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_device_memory_by_object_type", "type"), &RenderingDevice::get_device_memory_by_object_type);
 	ClassDB::bind_method(D_METHOD("get_device_allocs_by_object_type", "type"), &RenderingDevice::get_device_allocs_by_object_type);
 
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_OTHER);
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_INTEGRATED_GPU);
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_DISCRETE_GPU);
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_VIRTUAL_GPU);
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_CPU);
-	BIND_ENUM_CONSTANT(RenderingDeviceEnums::DEVICE_TYPE_MAX);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_OTHER);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_INTEGRATED_GPU);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_DISCRETE_GPU);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_VIRTUAL_GPU);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_CPU);
+	BIND_ENUM_CONSTANT(DEVICE_TYPE_MAX);
 
 	BIND_ENUM_CONSTANT(DRIVER_RESOURCE_LOGICAL_DEVICE);
 	BIND_ENUM_CONSTANT(DRIVER_RESOURCE_PHYSICAL_DEVICE);
@@ -8878,10 +8174,6 @@ void RenderingDevice::_bind_methods() {
 	BIND_BITFIELD_FLAG(BUFFER_CREATION_AS_STORAGE_BIT);
 	// Not exposed on purpose. This flag is too dangerous to be exposed to regular GD users.
 	//BIND_BITFIELD_FLAG(BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT);
-	BIND_BITFIELD_FLAG(BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT);
-
-	BIND_BITFIELD_FLAG(ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT);
-	BIND_BITFIELD_FLAG(ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT);
 
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_SAMPLER); //for sampling only (sampler GLSL type)
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_SAMPLER_WITH_TEXTURE); // for sampling only); but includes a texture); (samplerXX GLSL type)); first a sampler then a texture
@@ -8895,7 +8187,6 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_INPUT_ATTACHMENT); //used for sub-pass read/write); for mobile mostly
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_UNIFORM_BUFFER_DYNAMIC); // Exposed in case a BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT buffer created by C++ makes it into GD users.
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC); // Exposed in case a BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT buffer created by C++ makes it into GD users.
-	BIND_ENUM_CONSTANT(UNIFORM_TYPE_ACCELERATION_STRUCTURE); //acceleration structure (TLAS)); for raytracing
 	BIND_ENUM_CONSTANT(UNIFORM_TYPE_MAX);
 
 	BIND_ENUM_CONSTANT(RENDER_PRIMITIVE_POINTS);
@@ -9015,22 +8306,12 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(SHADER_STAGE_TESSELATION_CONTROL);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_TESSELATION_EVALUATION);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_COMPUTE);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_RAYGEN);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_ANY_HIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_CLOSEST_HIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_MISS);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_INTERSECTION);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_MAX);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_VERTEX_BIT);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_FRAGMENT_BIT);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_TESSELATION_CONTROL_BIT);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_TESSELATION_EVALUATION_BIT);
 	BIND_ENUM_CONSTANT(SHADER_STAGE_COMPUTE_BIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_RAYGEN_BIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_ANY_HIT_BIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_CLOSEST_HIT_BIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_MISS_BIT);
-	BIND_ENUM_CONSTANT(SHADER_STAGE_INTERSECTION_BIT);
 
 	BIND_ENUM_CONSTANT(SHADER_LANGUAGE_GLSL);
 	BIND_ENUM_CONSTANT(SHADER_LANGUAGE_HLSL);
@@ -9043,9 +8324,6 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(SUPPORTS_METALFX_TEMPORAL);
 	BIND_ENUM_CONSTANT(SUPPORTS_BUFFER_DEVICE_ADDRESS);
 	BIND_ENUM_CONSTANT(SUPPORTS_IMAGE_ATOMIC_32_BIT);
-	BIND_ENUM_CONSTANT(SUPPORTS_RAY_QUERY);
-	BIND_ENUM_CONSTANT(SUPPORTS_RAYTRACING_PIPELINE);
-	BIND_ENUM_CONSTANT(SUPPORTS_HDR_OUTPUT);
 
 	BIND_ENUM_CONSTANT(LIMIT_MAX_BOUND_UNIFORM_SETS);
 	BIND_ENUM_CONSTANT(LIMIT_MAX_FRAMEBUFFER_COLOR_ATTACHMENTS);
@@ -9357,29 +8635,6 @@ Error RenderingDevice::_buffer_update_bind(RID p_buffer, uint32_t p_offset, uint
 	return buffer_update(p_buffer, p_offset, p_size, p_data.ptr());
 }
 
-RID RenderingDevice::_blas_create(const TypedArray<RDAccelerationStructureGeometry> &p_geometries) {
-	thread_local LocalVector<AccelerationStructureGeometry> geometries;
-	geometries.resize(p_geometries.size());
-
-	for (int i = 0; i < p_geometries.size(); i++) {
-		Ref<RDAccelerationStructureGeometry> geometry = p_geometries[i];
-		ERR_FAIL_COND_V(geometry.is_null(), RID());
-		geometries[i] = geometry->base;
-	}
-
-	return blas_create(geometries);
-}
-
-void RenderingDevice::_tlas_instances_buffer_fill(RID p_instances_buffer, const TypedArray<RID> &p_blases, const TypedArray<Transform3D> &p_transforms) {
-	Vector<RID> blases = Variant(p_blases);
-	Vector<Transform3D> transforms;
-	transforms.resize(p_transforms.size());
-	for (int i = 0; i < p_transforms.size(); i++) {
-		transforms.write[i] = p_transforms[i];
-	}
-	tlas_instances_buffer_fill(p_instances_buffer, blases, transforms);
-}
-
 static Vector<RenderingDevice::PipelineSpecializationConstant> _get_spec_constants(const TypedArray<RDPipelineSpecializationConstant> &p_constants) {
 	Vector<RenderingDevice::PipelineSpecializationConstant> ret;
 	ret.resize(p_constants.size());
@@ -9448,10 +8703,6 @@ RID RenderingDevice::_compute_pipeline_create(RID p_shader, const TypedArray<RDP
 	return compute_pipeline_create(p_shader, _get_spec_constants(p_specialization_constants));
 }
 
-RID RenderingDevice::_raytracing_pipeline_create(RID p_shader, const TypedArray<RDPipelineSpecializationConstant> &p_specialization_constants = TypedArray<RDPipelineSpecializationConstant>()) {
-	return raytracing_pipeline_create(p_shader, _get_spec_constants(p_specialization_constants));
-}
-
 #ifndef DISABLE_DEPRECATED
 Vector<int64_t> RenderingDevice::_draw_list_begin_split(RID p_framebuffer, uint32_t p_splits, InitialAction p_initial_color_action, FinalAction p_final_color_action, InitialAction p_initial_depth_action, FinalAction p_final_depth_action, const Vector<Color> &p_clear_color_values, float p_clear_depth, uint32_t p_clear_stencil, const Rect2 &p_region, const TypedArray<RID> &p_storage_textures) {
 	ERR_FAIL_V_MSG(Vector<int64_t>(), "Deprecated. Split draw lists are used automatically by RenderingDevice.");
@@ -9472,11 +8723,6 @@ void RenderingDevice::_compute_list_set_push_constant(ComputeListID p_list, cons
 	compute_list_set_push_constant(p_list, p_data.ptr(), p_data_size);
 }
 
-void RenderingDevice::_raytracing_list_set_push_constant(RaytracingListID p_list, const Vector<uint8_t> &p_data, uint32_t p_data_size) {
-	ERR_FAIL_COND(p_data_size > (uint32_t)p_data.size());
-	raytracing_list_set_push_constant(p_list, p_data.ptr(), p_data_size);
-}
-
 static_assert(ENUM_MEMBERS_EQUAL(RD::CALLBACK_RESOURCE_USAGE_NONE, RDG::RESOURCE_USAGE_NONE));
 static_assert(ENUM_MEMBERS_EQUAL(RD::CALLBACK_RESOURCE_USAGE_COPY_FROM, RDG::RESOURCE_USAGE_COPY_FROM));
 static_assert(ENUM_MEMBERS_EQUAL(RD::CALLBACK_RESOURCE_USAGE_COPY_TO, RDG::RESOURCE_USAGE_COPY_TO));
diff --git a/engine/servers/rendering/rendering_device.h b/engine/servers/rendering/rendering_device.h
index 83b524cd..20ad2e50 100644
--- a/engine/servers/rendering/rendering_device.h
+++ b/engine/servers/rendering/rendering_device.h
@@ -34,14 +34,11 @@
 #include "core/os/condition_variable.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/rid_owner.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
-#include "servers/display/display_server_enums.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_device_commons.h"
 #include "servers/rendering/rendering_device_driver.h"
-#include "servers/rendering/rendering_device_enums.h"
 #include "servers/rendering/rendering_device_graph.h"
 
 class RDTextureFormat;
@@ -58,7 +55,6 @@ class RDPipelineDepthStencilState;
 class RDPipelineColorBlendState;
 class RDFramebufferPass;
 class RDPipelineSpecializationConstant;
-class RDAccelerationStructureGeometry;
 
 class RenderingDevice : public RenderingDeviceCommons {
 	GDCLASS(RenderingDevice, Object)
@@ -71,7 +67,6 @@ private:
 public:
 	typedef int64_t DrawListID;
 	typedef int64_t ComputeListID;
-	typedef int64_t RaytracingListID;
 
 	typedef void (*InvalidationCallback)(void *);
 
@@ -108,7 +103,6 @@ public:
 		ID_TYPE_VERTEX_FORMAT,
 		ID_TYPE_DRAW_LIST,
 		ID_TYPE_COMPUTE_LIST = 4,
-		ID_TYPE_RAYTRACING_LIST = 5,
 		ID_TYPE_MAX,
 		ID_BASE_SHIFT = 58, // 5 bits for ID types.
 		ID_MASK = (ID_BASE_SHIFT - 1),
@@ -297,9 +291,6 @@ public:
 		CALLBACK_RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ,
 		CALLBACK_RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ,
 		CALLBACK_RESOURCE_USAGE_GENERAL,
-		CALLBACK_RESOURCE_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT,
-		CALLBACK_RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ,
-		CALLBACK_RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE,
 		CALLBACK_RESOURCE_USAGE_MAX
 	};
 
@@ -357,7 +348,6 @@ public:
 
 		bool is_resolve_buffer = false;
 		bool is_discardable = false;
-		bool is_subsampled = false;
 		bool has_initial_data = false;
 		bool pending_clear = false;
 
@@ -416,7 +406,6 @@ public:
 	void _texture_clear_color(RID p_texture_rid, Texture *p_texture, const Color &p_color, uint32_t p_base_mipmap, uint32_t p_mipmaps, uint32_t p_base_layer, uint32_t p_layers);
 	void _texture_clear_depth_stencil(RID p_texture_rid, Texture *p_texture, float p_depth, uint8_t p_stencil, uint32_t p_base_mipmap, uint32_t p_mipmaps, uint32_t p_base_layer, uint32_t p_layers);
 	uint32_t _texture_vrs_method_to_usage_bits() const;
-	void _texture_ensure_shareable_format(RID p_texture, const DataFormat &p_shareable_format);
 
 	struct TextureGetDataRequest {
 		uint32_t frame_local_index = 0;
@@ -851,7 +840,6 @@ public:
 		BUFFER_CREATION_DEVICE_ADDRESS_BIT = (1 << 0),
 		BUFFER_CREATION_AS_STORAGE_BIT = (1 << 1),
 		BUFFER_CREATION_DYNAMIC_PERSISTENT_BIT = (1 << 2),
-		BUFFER_CREATION_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT = (1 << 3),
 	};
 
 	enum StorageBufferUsage {
@@ -874,9 +862,6 @@ public:
 
 	RID index_array_create(RID p_index_buffer, uint32_t p_index_offset, uint32_t p_index_count);
 
-private:
-	BitField<RDD::BufferUsageBits> _creation_to_usage_bits(BitField<BufferCreationBits> p_creation_bits);
-
 	/****************/
 	/**** SHADER ****/
 	/****************/
@@ -1244,17 +1229,6 @@ private:
 
 	RID_Owner<ComputePipeline, true> compute_pipeline_owner;
 
-	struct RaytracingPipeline {
-		RID shader;
-		RDD::ShaderID shader_driver_id;
-		uint32_t shader_layout_hash = 0;
-		Vector<uint32_t> set_formats;
-		RDD::RaytracingPipelineID driver_id;
-		uint32_t push_constant_size = 0;
-	};
-
-	RID_Owner<RaytracingPipeline> raytracing_pipeline_owner;
-
 public:
 	RID render_pipeline_create(RID p_shader, FramebufferFormatID p_framebuffer_format, VertexFormatID p_vertex_format, RenderPrimitive p_render_primitive, const PipelineRasterizationState &p_rasterization_state, const PipelineMultisampleState &p_multisample_state, const PipelineDepthStencilState &p_depth_stencil_state, const PipelineColorBlendState &p_blend_state, BitField<PipelineDynamicStateFlags> p_dynamic_state_flags = 0, uint32_t p_for_render_pass = 0, const Vector<PipelineSpecializationConstant> &p_specialization_constants = Vector<PipelineSpecializationConstant>());
 	bool render_pipeline_is_valid(RID p_pipeline);
@@ -1262,73 +1236,25 @@ public:
 	RID compute_pipeline_create(RID p_shader, const Vector<PipelineSpecializationConstant> &p_specialization_constants = Vector<PipelineSpecializationConstant>());
 	bool compute_pipeline_is_valid(RID p_pipeline);
 
-	RID raytracing_pipeline_create(RID p_shader, const Vector<PipelineSpecializationConstant> &p_specialization_constants = Vector<PipelineSpecializationConstant>());
-	bool raytracing_pipeline_is_valid(RID p_pipeline);
-
 	void update_pipeline_cache(bool p_closing = false);
 
 private:
 	/****************/
 	/**** SCREEN ****/
 	/****************/
-	HashMap<DisplayServerEnums::WindowID, RDD::SwapChainID> screen_swap_chains;
-	HashMap<DisplayServerEnums::WindowID, RDD::FramebufferID> screen_framebuffers;
+	HashMap<DisplayServer::WindowID, RDD::SwapChainID> screen_swap_chains;
+	HashMap<DisplayServer::WindowID, RDD::FramebufferID> screen_framebuffers;
 
 	uint32_t _get_swap_chain_desired_count() const;
 
 public:
-	Error screen_create(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID);
-	Error screen_prepare_for_drawing(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID);
-	int screen_get_width(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	int screen_get_height(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	int screen_get_pre_rotation_degrees(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	FramebufferFormatID screen_get_framebuffer_format(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	ColorSpace screen_get_color_space(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) const;
-	Error screen_free(DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID);
-
-private:
-	/********************************/
-	/**** ACCELERATION STRUCTURE ****/
-	/********************************/
-
-	struct InstancesBuffer {
-		Buffer buffer;
-		uint32_t instance_count;
-		Vector<RID> blases;
-	};
-
-	struct AccelerationStructure {
-		RDD::AccelerationStructureID driver_id;
-		RDD::AccelerationStructureType type = RDD::ACCELERATION_STRUCTURE_TYPE_BLAS;
-		RDG::ResourceTracker *draw_tracker = nullptr;
-		Vector<RDG::ResourceTracker *> draw_trackers;
-		HashSet<RID> untracked_buffers;
-
-		// Scratch buffer used during build, owned by the AS.
-		RDD::BufferID scratch_buffer;
-	};
-
-	RID_Owner<InstancesBuffer, true> instances_buffer_owner;
-	RID_Owner<AccelerationStructure, true> acceleration_structure_owner;
-
-public:
-	struct AccelerationStructureGeometry {
-		BitField<AccelerationStructureGeometryFlagBits> flags = {};
-		RID vertex_buffer;
-		uint32_t vertex_offset = 0;
-		uint32_t vertex_stride = 0;
-		uint32_t vertex_count = 0;
-		DataFormat vertex_format = DATA_FORMAT_MAX;
-		RID index_buffer;
-		uint32_t index_offset = 0;
-		uint32_t index_count = 0;
-	};
-
-	RID blas_create(Span<AccelerationStructureGeometry> p_geometries);
-	RID tlas_instances_buffer_create(uint32_t p_instance_count, BitField<BufferCreationBits> p_creation_bits = 0);
-	void tlas_instances_buffer_fill(RID p_buffer, const Vector<RID> &p_blases, VectorView<Transform3D> p_transforms);
-	RID tlas_create(RID p_instances_buffer);
-	Error acceleration_structure_build(RID p_acceleration_structure);
+	Error screen_create(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID);
+	Error screen_prepare_for_drawing(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID);
+	int screen_get_width(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID) const;
+	int screen_get_height(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID) const;
+	int screen_get_pre_rotation_degrees(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID) const;
+	FramebufferFormatID screen_get_framebuffer_format(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID) const;
+	Error screen_free(DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID);
 
 	/*************************/
 	/**** DRAW LISTS (II) ****/
@@ -1444,7 +1370,7 @@ public:
 	/**
 	 * @param p_clear_color Must use linear encoding when HDR 2D is active.
 	 */
-	DrawListID draw_list_begin_for_screen(DisplayServerEnums::WindowID p_screen = 0, const Color &p_clear_color = Color());
+	DrawListID draw_list_begin_for_screen(DisplayServer::WindowID p_screen = 0, const Color &p_clear_color = Color());
 	/**
 	 * @param p_clear_color_values Color values must use linear encoding when HDR 2D is active.
 	 */
@@ -1472,61 +1398,6 @@ public:
 
 	void draw_list_end();
 
-private:
-	/**************************/
-	/**** RAYTRACING LISTS ****/
-	/**************************/
-
-	struct RaytracingList {
-		bool active = false;
-		struct SetState {
-			uint32_t pipeline_expected_format = 0;
-			uint32_t uniform_set_format = 0;
-			RDD::UniformSetID uniform_set_driver_id;
-			RID uniform_set;
-			bool bound = false;
-		};
-
-		struct State {
-			SetState sets[MAX_UNIFORM_SETS];
-			uint32_t set_count = 0;
-			RID pipeline;
-			RDD::RaytracingPipelineID pipeline_driver_id;
-			RID pipeline_shader;
-			RDD::ShaderID pipeline_shader_driver_id;
-			uint32_t pipeline_shader_layout_hash = 0;
-			uint8_t push_constant_data[MAX_PUSH_CONSTANT_SIZE] = {};
-			uint32_t push_constant_size = 0;
-			uint32_t trace_count = 0;
-		} state;
-
-#ifdef DEBUG_ENABLED
-		struct Validation {
-			bool active = true; // Means command buffer was not closed, so you can keep adding things.
-			Vector<uint32_t> set_formats;
-			Vector<bool> set_bound;
-			Vector<RID> set_rids;
-			// Last pipeline set values.
-			bool pipeline_active = false;
-			RID pipeline_shader;
-			uint32_t invalid_set_from = 0;
-			uint32_t pipeline_push_constant_size = 0;
-			bool pipeline_push_constant_supplied = false;
-		} validation;
-#endif
-	};
-
-	RaytracingList raytracing_list;
-	RaytracingList::State raytracing_list_barrier_state;
-
-public:
-	RaytracingListID raytracing_list_begin();
-	void raytracing_list_bind_raytracing_pipeline(RaytracingListID p_list, RID p_raytracing_pipeline);
-	void raytracing_list_bind_uniform_set(RaytracingListID p_list, RID p_uniform_set, uint32_t p_index);
-	void raytracing_list_set_push_constant(RaytracingListID p_list, const void *p_data, uint32_t p_data_size);
-	void raytracing_list_trace_rays(RaytracingListID p_list, uint32_t p_width, uint32_t p_height);
-	void raytracing_list_end();
-
 private:
 	/***********************/
 	/**** COMPUTE LISTS ****/
@@ -1609,10 +1480,9 @@ private:
 		BinaryMutex operations_mutex;
 	};
 
-	TightLocalVector<TransferWorker *> transfer_worker_pool;
-	uint32_t transfer_worker_pool_size = 0;
+	LocalVector<TransferWorker *> transfer_worker_pool;
 	uint32_t transfer_worker_pool_max_size = 1;
-	TightLocalVector<uint64_t> transfer_worker_operation_used_by_draw;
+	LocalVector<uint64_t> transfer_worker_operation_used_by_draw;
 	LocalVector<uint32_t> transfer_worker_pool_available_list;
 	LocalVector<RDD::TextureBarrier> transfer_worker_pool_texture_barriers;
 	BinaryMutex transfer_worker_pool_mutex;
@@ -1644,7 +1514,6 @@ private:
 	bool _vertex_array_make_mutable(VertexArray *p_vertex_array, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker);
 	bool _index_array_make_mutable(IndexArray *p_index_array, RDG::ResourceTracker *p_resource_tracker);
 	bool _uniform_set_make_mutable(UniformSet *p_uniform_set, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker);
-	bool _acceleration_structure_make_mutable(AccelerationStructure *p_acceleration_structure, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker);
 	bool _dependency_make_mutable(RID p_id, RID p_resource_id, RDG::ResourceTracker *p_resource_tracker);
 	bool _dependencies_make_mutable_recursive(RID p_id, RDG::ResourceTracker *p_resource_tracker);
 	bool _dependencies_make_mutable(RID p_id, RDG::ResourceTracker *p_resource_tracker);
@@ -1690,8 +1559,6 @@ private:
 		List<UniformSet> uniform_sets_to_dispose_of;
 		List<RenderPipeline> render_pipelines_to_dispose_of;
 		List<ComputePipeline> compute_pipelines_to_dispose_of;
-		List<AccelerationStructure> acceleration_structures_to_dispose_of;
-		List<RaytracingPipeline> raytracing_pipelines_to_dispose_of;
 
 		// Pending asynchronous data transfer for buffers.
 		LocalVector<RDD::BufferID> download_buffer_staging_buffers;
@@ -1792,7 +1659,7 @@ public:
 #endif
 
 public:
-	Error initialize(RenderingContextDriver *p_context, DisplayServerEnums::WindowID p_main_window = DisplayServerEnums::INVALID_WINDOW_ID);
+	Error initialize(RenderingContextDriver *p_context, DisplayServer::WindowID p_main_window = DisplayServer::INVALID_WINDOW_ID);
 	void finalize();
 
 	void _set_max_fps(int p_max_fps);
@@ -1846,7 +1713,7 @@ public:
 
 	String get_device_vendor_name() const;
 	String get_device_name() const;
-	RenderingDeviceEnums::DeviceType get_device_type() const;
+	DeviceType get_device_type() const;
 	String get_device_api_name() const;
 	String get_device_api_version() const;
 	String get_device_pipeline_cache_uuid() const;
@@ -1908,19 +1775,14 @@ private:
 
 	Error _buffer_update_bind(RID p_buffer, uint32_t p_offset, uint32_t p_size, const Vector<uint8_t> &p_data);
 
-	RID _blas_create(const TypedArray<RDAccelerationStructureGeometry> &p_geometries);
-	void _tlas_instances_buffer_fill(RID p_buffer, const TypedArray<RID> &p_blases, const TypedArray<Transform3D> &p_transforms);
-
 	RID _render_pipeline_create(RID p_shader, FramebufferFormatID p_framebuffer_format, VertexFormatID p_vertex_format, RenderPrimitive p_render_primitive, const Ref<RDPipelineRasterizationState> &p_rasterization_state, const Ref<RDPipelineMultisampleState> &p_multisample_state, const Ref<RDPipelineDepthStencilState> &p_depth_stencil_state, const Ref<RDPipelineColorBlendState> &p_blend_state, BitField<PipelineDynamicStateFlags> p_dynamic_state_flags, uint32_t p_for_render_pass, const TypedArray<RDPipelineSpecializationConstant> &p_specialization_constants);
 	RID _compute_pipeline_create(RID p_shader, const TypedArray<RDPipelineSpecializationConstant> &p_specialization_constants);
-	RID _raytracing_pipeline_create(RID p_shader, const TypedArray<RDPipelineSpecializationConstant> &p_specialization_constants);
 
 	void _draw_list_set_push_constant(DrawListID p_list, const Vector<uint8_t> &p_data, uint32_t p_data_size);
 	void _compute_list_set_push_constant(ComputeListID p_list, const Vector<uint8_t> &p_data, uint32_t p_data_size);
-	void _raytracing_list_set_push_constant(RaytracingListID p_list, const Vector<uint8_t> &p_data, uint32_t p_data_size);
 };
 
-VARIANT_ENUM_CAST_EXT(RenderingDeviceEnums::DeviceType, RenderingDevice::DeviceType)
+VARIANT_ENUM_CAST(RenderingDevice::DeviceType)
 VARIANT_ENUM_CAST(RenderingDevice::DriverResource)
 VARIANT_ENUM_CAST(RenderingDevice::ShaderStage)
 VARIANT_ENUM_CAST(RenderingDevice::ShaderLanguage)
@@ -1938,7 +1800,6 @@ VARIANT_ENUM_CAST(RenderingDevice::VertexFrequency)
 VARIANT_ENUM_CAST(RenderingDevice::IndexBufferFormat)
 VARIANT_BITFIELD_CAST(RenderingDevice::StorageBufferUsage)
 VARIANT_BITFIELD_CAST(RenderingDevice::BufferCreationBits)
-VARIANT_BITFIELD_CAST(RenderingDevice::AccelerationStructureGeometryFlagBits)
 VARIANT_ENUM_CAST(RenderingDevice::UniformType)
 VARIANT_ENUM_CAST(RenderingDevice::RenderPrimitive)
 VARIANT_ENUM_CAST(RenderingDevice::PolygonCullMode)
diff --git a/engine/servers/rendering/rendering_device_binds.cpp b/engine/servers/rendering/rendering_device_binds.cpp
index f021d8ba..14e38682 100644
--- a/engine/servers/rendering/rendering_device_binds.cpp
+++ b/engine/servers/rendering/rendering_device_binds.cpp
@@ -35,13 +35,13 @@
 #include "modules/glslang/shader_compile.h"
 #endif
 
-#include "servers/rendering/shader_include_db.h"
+#include "shader_include_db.h"
 
 Error RDShaderFile::parse_versions_from_text(const String &p_text, const String p_defines, OpenIncludeFunction p_include_func, void *p_include_func_userdata) {
 	Vector<String> lines = p_text.split("\n");
 
 	bool reading_versions = false;
-	bool stage_found[RD::SHADER_STAGE_MAX] = {};
+	bool stage_found[RD::SHADER_STAGE_MAX] = { false, false, false, false, false };
 	RD::ShaderStage stage = RD::SHADER_STAGE_MAX;
 	static const char *stage_str[RD::SHADER_STAGE_MAX] = {
 		"vertex",
@@ -49,11 +49,6 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String
 		"tesselation_control",
 		"tesselation_evaluation",
 		"compute",
-		"raygen",
-		"any_hit",
-		"closest_hit",
-		"miss",
-		"intersection",
 	};
 	String stage_code[RD::SHADER_STAGE_MAX];
 	int stages_found = 0;
@@ -198,7 +193,7 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String
 				code = code.replace("VERSION_DEFINES", E.value);
 				String error;
 #ifdef MODULE_GLSLANG_ENABLED
-				Vector<uint8_t> spirv = compile_glslang_shader(RD::ShaderStage(i), ShaderIncludeDB::parse_include_files(code), RD::SHADER_LANGUAGE_VULKAN_VERSION_1_1, RD::SHADER_SPIRV_VERSION_1_4, &error);
+				Vector<uint8_t> spirv = compile_glslang_shader(RD::ShaderStage(i), ShaderIncludeDB::parse_include_files(code), RD::SHADER_LANGUAGE_VULKAN_VERSION_1_1, RD::SHADER_SPIRV_VERSION_1_3, &error);
 				bytecode->set_stage_bytecode(RD::ShaderStage(i), spirv);
 #else
 				error = "Shader compilation is not supported because glslang was not enabled.";
diff --git a/engine/servers/rendering/rendering_device_binds.h b/engine/servers/rendering/rendering_device_binds.h
index 4064dc63..9d8c81e3 100644
--- a/engine/servers/rendering/rendering_device_binds.h
+++ b/engine/servers/rendering/rendering_device_binds.h
@@ -30,34 +30,32 @@
 
 #pragma once
 
-#include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "servers/rendering/rendering_device.h"
 
-#define RD_SETGET(m_type, m_member) \
+#define RD_SETGET(m_type, m_member)            \
 	void set_##m_member(m_type p_##m_member) { \
-		base.m_member = p_##m_member; \
-	} \
-	m_type get_##m_member() const { \
-		return base.m_member; \
+		base.m_member = p_##m_member;          \
+	}                                          \
+	m_type get_##m_member() const {            \
+		return base.m_member;                  \
 	}
 
-#define RD_BIND(m_variant_type, m_class, m_member) \
+#define RD_BIND(m_variant_type, m_class, m_member)                                                          \
 	ClassDB::bind_method(D_METHOD("set_" _MKSTR(m_member), "p_" _MKSTR(member)), &m_class::set_##m_member); \
-	ClassDB::bind_method(D_METHOD("get_" _MKSTR(m_member)), &m_class::get_##m_member); \
+	ClassDB::bind_method(D_METHOD("get_" _MKSTR(m_member)), &m_class::get_##m_member);                      \
 	ADD_PROPERTY(PropertyInfo(m_variant_type, #m_member), "set_" _MKSTR(m_member), "get_" _MKSTR(m_member))
 
-#define RD_SETGET_SUB(m_type, m_sub, m_member) \
+#define RD_SETGET_SUB(m_type, m_sub, m_member)           \
 	void set_##m_sub##_##m_member(m_type p_##m_member) { \
-		base.m_sub.m_member = p_##m_member; \
-	} \
-	m_type get_##m_sub##_##m_member() const { \
-		return base.m_sub.m_member; \
+		base.m_sub.m_member = p_##m_member;              \
+	}                                                    \
+	m_type get_##m_sub##_##m_member() const {            \
+		return base.m_sub.m_member;                      \
 	}
 
-#define RD_BIND_SUB(m_variant_type, m_class, m_sub, m_member) \
+#define RD_BIND_SUB(m_variant_type, m_class, m_sub, m_member)                                                                           \
 	ClassDB::bind_method(D_METHOD("set_" _MKSTR(m_sub) "_" _MKSTR(m_member), "p_" _MKSTR(member)), &m_class::set_##m_sub##_##m_member); \
-	ClassDB::bind_method(D_METHOD("get_" _MKSTR(m_sub) "_" _MKSTR(m_member)), &m_class::get_##m_sub##_##m_member); \
+	ClassDB::bind_method(D_METHOD("get_" _MKSTR(m_sub) "_" _MKSTR(m_member)), &m_class::get_##m_sub##_##m_member);                      \
 	ADD_PROPERTY(PropertyInfo(m_variant_type, _MKSTR(m_sub) "_" _MKSTR(m_member)), "set_" _MKSTR(m_sub) "_" _MKSTR(m_member), "get_" _MKSTR(m_sub) "_" _MKSTR(m_member))
 
 class RDTextureFormat : public RefCounted {
@@ -278,11 +276,6 @@ protected:
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_tesselation_control"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_TESSELATION_CONTROL);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_tesselation_evaluation"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_TESSELATION_EVALUATION);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_compute"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_COMPUTE);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_raygen"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_RAYGEN);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_any_hit"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_ANY_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_closest_hit"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_CLOSEST_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_miss"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_MISS);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "source_intersection"), "set_stage_source", "get_stage_source", RD::SHADER_STAGE_INTERSECTION);
 		ADD_GROUP("Syntax", "source_");
 		ADD_PROPERTY(PropertyInfo(Variant::INT, "language", PROPERTY_HINT_RANGE, "GLSL,HLSL"), "set_language", "get_language");
 	}
@@ -342,22 +335,12 @@ protected:
 		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_tesselation_control"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_TESSELATION_CONTROL);
 		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_tesselation_evaluation"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_TESSELATION_EVALUATION);
 		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_compute"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_COMPUTE);
-		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_raygen"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_RAYGEN);
-		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_any_hit"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_ANY_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_closest_hit"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_CLOSEST_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_miss"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_MISS);
-		ADD_PROPERTYI(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytecode_intersection"), "set_stage_bytecode", "get_stage_bytecode", RD::SHADER_STAGE_INTERSECTION);
 		ADD_GROUP("Compile Error", "compile_error_");
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_vertex"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_VERTEX);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_fragment"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_FRAGMENT);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_tesselation_control"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_TESSELATION_CONTROL);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_tesselation_evaluation"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_TESSELATION_EVALUATION);
 		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_compute"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_COMPUTE);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_raygen"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_RAYGEN);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_any_hit"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_ANY_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_closest_hit"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_CLOSEST_HIT);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_miss"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_MISS);
-		ADD_PROPERTYI(PropertyInfo(Variant::STRING, "compile_error_intersection"), "set_stage_compile_error", "get_stage_compile_error", RD::SHADER_STAGE_INTERSECTION);
 	}
 };
 
@@ -745,33 +728,3 @@ protected:
 		ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "attachments", PROPERTY_HINT_ARRAY_TYPE, "RDPipelineColorBlendStateAttachment"), "set_attachments", "get_attachments");
 	}
 };
-
-class RDAccelerationStructureGeometry : public RefCounted {
-	GDCLASS(RDAccelerationStructureGeometry, RefCounted)
-	friend class RenderingDevice;
-	RD::AccelerationStructureGeometry base;
-
-public:
-	RD_SETGET(BitField<RD::AccelerationStructureGeometryFlagBits>, flags)
-	RD_SETGET(RID, vertex_buffer)
-	RD_SETGET(uint32_t, vertex_offset)
-	RD_SETGET(uint32_t, vertex_stride)
-	RD_SETGET(uint32_t, vertex_count)
-	RD_SETGET(RD::DataFormat, vertex_format)
-	RD_SETGET(RID, index_buffer)
-	RD_SETGET(uint32_t, index_offset)
-	RD_SETGET(uint32_t, index_count)
-
-protected:
-	static void _bind_methods() {
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, flags);
-		RD_BIND(Variant::RID, RDAccelerationStructureGeometry, vertex_buffer);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, vertex_offset);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, vertex_stride);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, vertex_count);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, vertex_format);
-		RD_BIND(Variant::RID, RDAccelerationStructureGeometry, index_buffer);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, index_offset);
-		RD_BIND(Variant::INT, RDAccelerationStructureGeometry, index_count);
-	}
-};
diff --git a/engine/servers/rendering/rendering_device_commons.h b/engine/servers/rendering/rendering_device_commons.h
index 1810cc45..7948f85d 100644
--- a/engine/servers/rendering/rendering_device_commons.h
+++ b/engine/servers/rendering/rendering_device_commons.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/object/object.h"
+#include "core/variant/type_info.h"
 
 #define STEPIFY(m_number, m_alignment) ((((m_number) + ((m_alignment) - 1)) / (m_alignment)) * (m_alignment))
 
@@ -316,12 +317,6 @@ public:
 		DATA_FORMAT_MAX,
 	};
 
-	enum ColorSpace {
-		COLOR_SPACE_REC709_LINEAR,
-		COLOR_SPACE_REC709_NONLINEAR_SRGB,
-		COLOR_SPACE_MAX,
-	};
-
 	// Breadcrumb markers are useful for debugging GPU crashes (i.e. DEVICE_LOST). Internally
 	// they're just an uint32_t to "tag" a GPU command. These are only used for debugging and do not
 	// (or at least shouldn't) alter the execution behavior in any way.
@@ -443,7 +438,6 @@ public:
 		Vector<DataFormat> shareable_formats;
 		bool is_resolve_buffer = false;
 		bool is_discardable = false;
-		bool is_subsampled = false;
 
 		bool operator==(const TextureFormat &b) const {
 			if (format != b.format) {
@@ -592,22 +586,12 @@ public:
 		SHADER_STAGE_TESSELATION_CONTROL,
 		SHADER_STAGE_TESSELATION_EVALUATION,
 		SHADER_STAGE_COMPUTE,
-		SHADER_STAGE_RAYGEN,
-		SHADER_STAGE_ANY_HIT,
-		SHADER_STAGE_CLOSEST_HIT,
-		SHADER_STAGE_MISS,
-		SHADER_STAGE_INTERSECTION,
 		SHADER_STAGE_MAX,
 		SHADER_STAGE_VERTEX_BIT = (1 << SHADER_STAGE_VERTEX),
 		SHADER_STAGE_FRAGMENT_BIT = (1 << SHADER_STAGE_FRAGMENT),
 		SHADER_STAGE_TESSELATION_CONTROL_BIT = (1 << SHADER_STAGE_TESSELATION_CONTROL),
 		SHADER_STAGE_TESSELATION_EVALUATION_BIT = (1 << SHADER_STAGE_TESSELATION_EVALUATION),
 		SHADER_STAGE_COMPUTE_BIT = (1 << SHADER_STAGE_COMPUTE),
-		SHADER_STAGE_RAYGEN_BIT = (1 << SHADER_STAGE_RAYGEN),
-		SHADER_STAGE_ANY_HIT_BIT = (1 << SHADER_STAGE_ANY_HIT),
-		SHADER_STAGE_CLOSEST_HIT_BIT = (1 << SHADER_STAGE_CLOSEST_HIT),
-		SHADER_STAGE_MISS_BIT = (1 << SHADER_STAGE_MISS),
-		SHADER_STAGE_INTERSECTION_BIT = (1 << SHADER_STAGE_INTERSECTION),
 	};
 
 	enum ShaderLanguage {
@@ -660,7 +644,6 @@ public:
 		UNIFORM_TYPE_INPUT_ATTACHMENT, // Used for sub-pass read/write, for mobile mostly.
 		UNIFORM_TYPE_UNIFORM_BUFFER_DYNAMIC, // Same as UNIFORM but created with BUFFER_USAGE_DYNAMIC_PERSISTENT_BIT.
 		UNIFORM_TYPE_STORAGE_BUFFER_DYNAMIC, // Same as STORAGE but created with BUFFER_USAGE_DYNAMIC_PERSISTENT_BIT.
-		UNIFORM_TYPE_ACCELERATION_STRUCTURE, // Bounding Volume Hierarchy (Top + Bottom Level acceleration structures), for raytracing only.
 		UNIFORM_TYPE_MAX
 	};
 
@@ -690,13 +673,6 @@ public:
 
 	// ----- PIPELINE -----
 
-	// Rendering Shader Container expects this type to be 4 bytes for proper alignment with the shaders.
-	enum PipelineType : uint32_t {
-		PIPELINE_TYPE_RASTERIZATION,
-		PIPELINE_TYPE_COMPUTE,
-		PIPELINE_TYPE_RAYTRACING,
-	};
-
 	enum RenderPrimitive {
 		RENDER_PRIMITIVE_POINTS,
 		RENDER_PRIMITIVE_LINES,
@@ -889,19 +865,21 @@ public:
 		DYNAMIC_STATE_STENCIL_REFERENCE = (1 << 6),
 	};
 
-	/********************/
-	/**** RAYTRACING ****/
-	/********************/
-
-	enum AccelerationStructureGeometryFlagBits {
-		ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT = (1 << 0),
-		ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT = (1 << 1),
-	};
-
 	/**************/
 	/**** MISC ****/
 	/**************/
 
+	// This enum matches VkPhysicalDeviceType (except for `DEVICE_TYPE_MAX`).
+	// Unlike VkPhysicalDeviceType, DeviceType is exposed to the scripting API.
+	enum DeviceType {
+		DEVICE_TYPE_OTHER,
+		DEVICE_TYPE_INTEGRATED_GPU,
+		DEVICE_TYPE_DISCRETE_GPU,
+		DEVICE_TYPE_VIRTUAL_GPU,
+		DEVICE_TYPE_CPU,
+		DEVICE_TYPE_MAX
+	};
+
 	// Defined in an API-agnostic way.
 	// Some may not make sense for the underlying API; in that case, 0 is returned.
 	enum DriverResource {
@@ -996,9 +974,6 @@ public:
 		SUPPORTS_VULKAN_MEMORY_MODEL,
 		SUPPORTS_FRAMEBUFFER_DEPTH_RESOLVE,
 		SUPPORTS_POINT_SIZE,
-		SUPPORTS_RAY_QUERY,
-		SUPPORTS_RAYTRACING_PIPELINE,
-		SUPPORTS_HDR_OUTPUT,
 	};
 
 	enum SubgroupOperations {
@@ -1106,7 +1081,7 @@ public:
 	struct ShaderReflection {
 		uint64_t vertex_input_mask = 0;
 		uint32_t fragment_output_mask = 0;
-		PipelineType pipeline_type = PIPELINE_TYPE_RASTERIZATION;
+		bool is_compute = false;
 		bool has_multiview = false;
 		bool has_dynamic_buffers = false;
 		uint32_t compute_local_size[3] = {};
diff --git a/engine/servers/rendering/rendering_device_driver.h b/engine/servers/rendering/rendering_device_driver.h
index a3535b62..1e1ffc8a 100644
--- a/engine/servers/rendering/rendering_device_driver.h
+++ b/engine/servers/rendering/rendering_device_driver.h
@@ -46,7 +46,7 @@
 // ***********************************************************************************
 
 #include "core/object/object.h"
-#include "core/templates/paged_allocator.h"
+#include "core/variant/type_info.h"
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device_commons.h"
 
@@ -98,28 +98,28 @@ public:
 				id(p_id) {}
 	};
 
-#define DEFINE_ID(m_name) \
-	struct m_name##ID : public ID { \
-		_ALWAYS_INLINE_ explicit operator bool() const { \
-			return id != 0; \
-		} \
-		_ALWAYS_INLINE_ m_name##ID &operator=(m_name##ID p_other) { \
-			id = p_other.id; \
-			return *this; \
-		} \
-		_ALWAYS_INLINE_ bool operator<(const m_name##ID &p_other) const { \
-			return id < p_other.id; \
-		} \
-		_ALWAYS_INLINE_ bool operator==(const m_name##ID &p_other) const { \
-			return id == p_other.id; \
-		} \
-		_ALWAYS_INLINE_ bool operator!=(const m_name##ID &p_other) const { \
-			return id != p_other.id; \
-		} \
+#define DEFINE_ID(m_name)                                                         \
+	struct m_name##ID : public ID {                                               \
+		_ALWAYS_INLINE_ explicit operator bool() const {                          \
+			return id != 0;                                                       \
+		}                                                                         \
+		_ALWAYS_INLINE_ m_name##ID &operator=(m_name##ID p_other) {               \
+			id = p_other.id;                                                      \
+			return *this;                                                         \
+		}                                                                         \
+		_ALWAYS_INLINE_ bool operator<(const m_name##ID &p_other) const {         \
+			return id < p_other.id;                                               \
+		}                                                                         \
+		_ALWAYS_INLINE_ bool operator==(const m_name##ID &p_other) const {        \
+			return id == p_other.id;                                              \
+		}                                                                         \
+		_ALWAYS_INLINE_ bool operator!=(const m_name##ID &p_other) const {        \
+			return id != p_other.id;                                              \
+		}                                                                         \
 		_ALWAYS_INLINE_ m_name##ID(const m_name##ID &p_other) : ID(p_other.id) {} \
-		_ALWAYS_INLINE_ explicit m_name##ID(uint64_t p_int) : ID(p_int) {} \
+		_ALWAYS_INLINE_ explicit m_name##ID(uint64_t p_int) : ID(p_int) {}        \
 		_ALWAYS_INLINE_ explicit m_name##ID(void *p_ptr) : ID((uint64_t)p_ptr) {} \
-		_ALWAYS_INLINE_ m_name##ID() = default; \
+		_ALWAYS_INLINE_ m_name##ID() = default;                                   \
 	};
 
 	// Id types declared before anything else to prevent cyclic dependencies between the different concerns.
@@ -140,8 +140,6 @@ public:
 	DEFINE_ID(QueryPool);
 	DEFINE_ID(Fence);
 	DEFINE_ID(Semaphore);
-	DEFINE_ID(AccelerationStructure);
-	DEFINE_ID(RaytracingPipeline);
 
 public:
 	/*****************/
@@ -172,10 +170,7 @@ public:
 		BUFFER_USAGE_INDEX_BIT = (1 << 6),
 		BUFFER_USAGE_VERTEX_BIT = (1 << 7),
 		BUFFER_USAGE_INDIRECT_BIT = (1 << 8),
-		BUFFER_USAGE_SHADER_BINDING_TABLE_BIT = (1 << 10),
 		BUFFER_USAGE_DEVICE_ADDRESS_BIT = (1 << 17),
-		BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT = (1 << 19),
-		BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT = (1 << 20),
 		// There are no Vulkan-equivalent. Try to use unused/unclaimed bits.
 		BUFFER_USAGE_DYNAMIC_PERSISTENT_BIT = (1 << 31),
 	};
@@ -330,10 +325,8 @@ public:
 		PIPELINE_STAGE_ALL_GRAPHICS_BIT = (1 << 15),
 		PIPELINE_STAGE_ALL_COMMANDS_BIT = (1 << 16),
 		PIPELINE_STAGE_CLEAR_STORAGE_BIT = (1 << 17),
-		PIPELINE_STAGE_RAY_TRACING_SHADER_BIT = (1 << 21),
 		PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT = (1 << 22),
 		PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT = (1 << 23),
-		PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT = (1 << 25),
 	};
 
 	enum BarrierAccessBits {
@@ -354,8 +347,6 @@ public:
 		BARRIER_ACCESS_HOST_WRITE_BIT = (1 << 14),
 		BARRIER_ACCESS_MEMORY_READ_BIT = (1 << 15),
 		BARRIER_ACCESS_MEMORY_WRITE_BIT = (1 << 16),
-		BARRIER_ACCESS_ACCELERATION_STRUCTURE_READ_BIT = (1 << 21),
-		BARRIER_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT = (1 << 22),
 		BARRIER_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT = (1 << 23),
 		BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT = (1 << 24),
 		BARRIER_ACCESS_RESOLVE_READ_BIT = (1 << 25),
@@ -386,22 +377,13 @@ public:
 		TextureSubresourceRange subresources;
 	};
 
-	struct AccelerationStructureBarrier {
-		AccelerationStructureID acceleration_structure;
-		BitField<BarrierAccessBits> src_access;
-		BitField<BarrierAccessBits> dst_access;
-		uint64_t offset = 0;
-		uint64_t size = 0;
-	};
-
 	virtual void command_pipeline_barrier(
 			CommandBufferID p_cmd_buffer,
 			BitField<PipelineStageBits> p_src_stages,
 			BitField<PipelineStageBits> p_dst_stages,
 			VectorView<MemoryAccessBarrier> p_memory_barriers,
 			VectorView<BufferBarrier> p_buffer_barriers,
-			VectorView<TextureBarrier> p_texture_barriers,
-			VectorView<AccelerationStructureBarrier> p_acceleration_structure_barriers) = 0;
+			VectorView<TextureBarrier> p_texture_barriers) = 0;
 
 	/****************/
 	/**** FENCES ****/
@@ -481,9 +463,6 @@ public:
 	// Retrieve the format used by the swap chain's framebuffers.
 	virtual DataFormat swap_chain_get_format(SwapChainID p_swap_chain) = 0;
 
-	// Retrieve the color space used by the swap chain's framebuffers.
-	virtual ColorSpace swap_chain_get_color_space(SwapChainID p_swap_chain) = 0;
-
 	// Tells the swapchain the max_fps so it can use the proper frame pacing.
 	// Android uses this with Swappy library. Some implementations or platforms may ignore this hint.
 	virtual void swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) {}
@@ -736,49 +715,6 @@ public:
 
 	virtual PipelineID compute_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) = 0;
 
-	/********************/
-	/**** RAYTRACING ****/
-	/********************/
-
-	// ----- ACCELERATION STRUCTURE -----
-
-	enum AccelerationStructureType {
-		ACCELERATION_STRUCTURE_TYPE_BLAS,
-		ACCELERATION_STRUCTURE_TYPE_TLAS,
-	};
-
-	struct AccelerationStructureGeometry {
-		BitField<AccelerationStructureGeometryFlagBits> flags = {};
-		BufferID vertex_buffer;
-		uint32_t vertex_offset = 0;
-		uint32_t vertex_stride = 0;
-		uint32_t vertex_count = 0;
-		DataFormat vertex_format = DATA_FORMAT_MAX;
-		BufferID index_buffer;
-		uint32_t index_offset = 0;
-		uint32_t index_count = 0;
-		IndexBufferFormat index_format = {};
-	};
-
-	virtual AccelerationStructureID blas_create(VectorView<AccelerationStructureGeometry> p_geometries) = 0;
-	virtual uint32_t tlas_instances_buffer_get_size_bytes(uint32_t p_instance_count) = 0;
-	virtual void tlas_instances_buffer_fill(BufferID p_instances_buffer, VectorView<AccelerationStructureID> p_blases, VectorView<Transform3D> p_transforms) = 0;
-	virtual AccelerationStructureID tlas_create(BufferID p_instances_buffer) = 0;
-	virtual void acceleration_structure_free(AccelerationStructureID p_acceleration_structure) = 0;
-	virtual uint32_t acceleration_structure_get_scratch_size_bytes(AccelerationStructureID p_acceleration_structure) = 0;
-
-	// ----- PIPELINE -----
-
-	virtual RaytracingPipelineID raytracing_pipeline_create(ShaderID p_shader, VectorView<PipelineSpecializationConstant> p_specialization_constants) = 0;
-	virtual void raytracing_pipeline_free(RaytracingPipelineID p_pipeline) = 0;
-
-	// ----- COMMANDS -----
-
-	virtual void command_build_acceleration_structure(CommandBufferID p_cmd_buffer, AccelerationStructureID p_acceleration_structure, BufferID p_scratch_buffer) = 0;
-	virtual void command_bind_raytracing_pipeline(CommandBufferID p_cmd_buffer, RaytracingPipelineID p_pipeline) = 0;
-	virtual void command_bind_raytracing_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) = 0;
-	virtual void command_trace_rays(CommandBufferID p_cmd_buffer, uint32_t p_width, uint32_t p_height) = 0;
-
 	/******************/
 	/**** CALLBACK ****/
 	/******************/
@@ -831,8 +767,6 @@ public:
 		OBJECT_TYPE_SHADER,
 		OBJECT_TYPE_UNIFORM_SET,
 		OBJECT_TYPE_PIPELINE,
-		OBJECT_TYPE_ACCELERATION_STRUCTURE,
-		OBJECT_TYPE_RAYTRACING_PIPELINE,
 	};
 
 	struct MultiviewCapabilities {
diff --git a/engine/servers/rendering/rendering_device_enums.h b/engine/servers/rendering/rendering_device_enums.h
deleted file mode 100644
index db7747c0..00000000
--- a/engine/servers/rendering/rendering_device_enums.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************/
-/*  rendering_device_enums.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-namespace RenderingDeviceEnums {
-
-// This enum matches VkPhysicalDeviceType (except for `DEVICE_TYPE_MAX`).
-// Unlike VkPhysicalDeviceType, DeviceType is exposed to the scripting API.
-enum DeviceType {
-	DEVICE_TYPE_OTHER,
-	DEVICE_TYPE_INTEGRATED_GPU,
-	DEVICE_TYPE_DISCRETE_GPU,
-	DEVICE_TYPE_VIRTUAL_GPU,
-	DEVICE_TYPE_CPU,
-	DEVICE_TYPE_MAX
-};
-
-} //namespace RenderingDeviceEnums
diff --git a/engine/servers/rendering/rendering_device_graph.cpp b/engine/servers/rendering/rendering_device_graph.cpp
index f371c682..1af1cbba 100644
--- a/engine/servers/rendering/rendering_device_graph.cpp
+++ b/engine/servers/rendering/rendering_device_graph.cpp
@@ -105,8 +105,6 @@ bool RenderingDeviceGraph::_is_write_usage(ResourceUsage p_usage) {
 		case RESOURCE_USAGE_STORAGE_IMAGE_READ:
 		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ:
 		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ:
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT:
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ:
 			return false;
 		case RESOURCE_USAGE_COPY_TO:
 		case RESOURCE_USAGE_RESOLVE_TO:
@@ -116,7 +114,6 @@ bool RenderingDeviceGraph::_is_write_usage(ResourceUsage p_usage) {
 		case RESOURCE_USAGE_ATTACHMENT_COLOR_READ_WRITE:
 		case RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE:
 		case RESOURCE_USAGE_GENERAL:
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE:
 			return true;
 		default:
 			DEV_ASSERT(false && "Invalid resource tracker usage.");
@@ -176,12 +173,6 @@ RDD::BarrierAccessBits RenderingDeviceGraph::_usage_to_access_bits(ResourceUsage
 			return RDD::BARRIER_ACCESS_UNIFORM_READ_BIT;
 		case RESOURCE_USAGE_INDIRECT_BUFFER_READ:
 			return RDD::BARRIER_ACCESS_INDIRECT_COMMAND_READ_BIT;
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT:
-			// Acceleration structure build inputs can be either storage buffers with vertices, indices, transforms, or
-			// other acceleration structures (BLAS)
-			return RDD::BarrierAccessBits(RDD::BARRIER_ACCESS_COPY_READ_BIT | RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_READ_BIT);
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ:
-			return RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_READ_BIT;
 		case RESOURCE_USAGE_STORAGE_BUFFER_READ:
 		case RESOURCE_USAGE_STORAGE_IMAGE_READ:
 		case RESOURCE_USAGE_TEXTURE_BUFFER_READ:
@@ -205,8 +196,6 @@ RDD::BarrierAccessBits RenderingDeviceGraph::_usage_to_access_bits(ResourceUsage
 			return RDD::BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT;
 		case RESOURCE_USAGE_GENERAL:
 			return RDD::BarrierAccessBits(RDD::BARRIER_ACCESS_MEMORY_READ_BIT | RDD::BARRIER_ACCESS_MEMORY_WRITE_BIT);
-		case RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE:
-			return RDD::BarrierAccessBits(RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_READ_BIT | RDD::BARRIER_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT);
 		default:
 			DEV_ASSERT(false && "Invalid usage.");
 			return RDD::BarrierAccessBits(0);
@@ -362,12 +351,6 @@ void RenderingDeviceGraph::_check_discardable_attachment_dependency(ResourceTrac
 	}
 }
 
-RenderingDeviceGraph::RaytracingListInstruction *RenderingDeviceGraph::_allocate_raytracing_list_instruction(uint32_t p_instruction_size) {
-	uint32_t raytracing_list_data_offset = raytracing_instruction_list.data.size();
-	raytracing_instruction_list.data.resize(raytracing_list_data_offset + p_instruction_size);
-	return reinterpret_cast<RaytracingListInstruction *>(&raytracing_instruction_list.data[raytracing_list_data_offset]);
-}
-
 void RenderingDeviceGraph::_add_command_to_graph(ResourceTracker **p_resource_trackers, ResourceUsage *p_resource_usages, uint32_t p_resource_count, int32_t p_command_index, RecordedCommand *r_command) {
 	// Assign the next stages derived from the stages the command requires first.
 	r_command->next_stages = r_command->self_stages;
@@ -585,11 +568,6 @@ void RenderingDeviceGraph::_add_command_to_graph(ResourceTracker **p_resource_tr
 				// Memory barriers are pushed regardless of buffer barriers being used or not.
 				r_command->memory_barrier.src_access = r_command->memory_barrier.src_access | resource_tracker->usage_access;
 				r_command->memory_barrier.dst_access = r_command->memory_barrier.dst_access | new_usage_access;
-			} else if (resource_tracker->acceleration_structure_driver_id.id != 0) {
-				// Make sure the acceleration structure has been built before accessing it from raytracing shaders.
-				_add_acceleration_structure_barrier_to_command(resource_tracker->acceleration_structure_driver_id, resource_tracker->usage_access, new_usage_access, command_acceleration_structure_barriers, r_command->acceleration_structure_barrier_index, r_command->acceleration_structure_barrier_count);
-				r_command->memory_barrier.src_access = r_command->memory_barrier.src_access | resource_tracker->usage_access;
-				r_command->memory_barrier.dst_access = r_command->memory_barrier.dst_access | new_usage_access;
 			} else {
 				DEV_ASSERT(false && "Resource tracker does not contain a valid buffer or texture ID.");
 			}
@@ -780,66 +758,6 @@ void RenderingDeviceGraph::_add_buffer_barrier_to_command(RDD::BufferID p_buffer
 }
 #endif
 
-void RenderingDeviceGraph::_add_acceleration_structure_barrier_to_command(RDD::AccelerationStructureID p_acceleration_structure_id, BitField<RDD::BarrierAccessBits> p_src_access, BitField<RDD::BarrierAccessBits> p_dst_access, LocalVector<RDD::AccelerationStructureBarrier> &r_barrier_vector, int32_t &r_barrier_index, int32_t &r_barrier_count) {
-	if (!driver_honors_barriers) {
-		return;
-	}
-
-	if (r_barrier_index < 0) {
-		r_barrier_index = r_barrier_vector.size();
-	}
-
-	RDD::AccelerationStructureBarrier accel_barrier;
-	accel_barrier.acceleration_structure = p_acceleration_structure_id;
-	accel_barrier.src_access = p_src_access;
-	accel_barrier.dst_access = p_dst_access;
-	accel_barrier.offset = 0;
-	accel_barrier.size = RDD::BUFFER_WHOLE_SIZE;
-	r_barrier_vector.push_back(accel_barrier);
-	r_barrier_count++;
-}
-
-void RenderingDeviceGraph::_run_raytracing_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size) {
-	uint32_t instruction_data_cursor = 0;
-	while (instruction_data_cursor < p_instruction_data_size) {
-		DEV_ASSERT((instruction_data_cursor + sizeof(RaytracingListInstruction)) <= p_instruction_data_size);
-
-		const RaytracingListInstruction *instruction = reinterpret_cast<const RaytracingListInstruction *>(&p_instruction_data[instruction_data_cursor]);
-		switch (instruction->type) {
-			case RaytracingListInstruction::TYPE_BIND_PIPELINE: {
-				const RaytracingListBindPipelineInstruction *bind_pipeline_instruction = reinterpret_cast<const RaytracingListBindPipelineInstruction *>(instruction);
-				driver->command_bind_raytracing_pipeline(p_command_buffer, bind_pipeline_instruction->pipeline);
-				instruction_data_cursor += sizeof(RaytracingListBindPipelineInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_BIND_UNIFORM_SET: {
-				const RaytracingListBindUniformSetInstruction *bind_uniform_set_instruction = reinterpret_cast<const RaytracingListBindUniformSetInstruction *>(instruction);
-				driver->command_bind_raytracing_uniform_set(p_command_buffer, bind_uniform_set_instruction->uniform_set, bind_uniform_set_instruction->shader, bind_uniform_set_instruction->set_index);
-				instruction_data_cursor += sizeof(RaytracingListBindUniformSetInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_TRACE_RAYS: {
-				const RaytracingListTraceRaysInstruction *trace_rays_instruction = reinterpret_cast<const RaytracingListTraceRaysInstruction *>(instruction);
-				driver->command_trace_rays(p_command_buffer, trace_rays_instruction->width, trace_rays_instruction->height);
-				instruction_data_cursor += sizeof(RaytracingListTraceRaysInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_SET_PUSH_CONSTANT: {
-				const RaytracingListSetPushConstantInstruction *set_push_constant_instruction = reinterpret_cast<const RaytracingListSetPushConstantInstruction *>(instruction);
-				const VectorView push_constant_data_view(reinterpret_cast<const uint32_t *>(set_push_constant_instruction->data()), set_push_constant_instruction->size / sizeof(uint32_t));
-				driver->command_bind_push_constants(p_command_buffer, set_push_constant_instruction->shader, 0, push_constant_data_view);
-				instruction_data_cursor += sizeof(RaytracingListSetPushConstantInstruction);
-				instruction_data_cursor += set_push_constant_instruction->size;
-			} break;
-			case RaytracingListInstruction::TYPE_UNIFORM_SET_PREPARE_FOR_USE: {
-				const RaytracingListUniformSetPrepareForUseInstruction *uniform_set_prepare_for_use_instruction = reinterpret_cast<const RaytracingListUniformSetPrepareForUseInstruction *>(instruction);
-				driver->command_uniform_set_prepare_for_use(p_command_buffer, uniform_set_prepare_for_use_instruction->uniform_set, uniform_set_prepare_for_use_instruction->shader, uniform_set_prepare_for_use_instruction->set_index);
-				instruction_data_cursor += sizeof(RaytracingListUniformSetPrepareForUseInstruction);
-			} break;
-			default:
-				DEV_ASSERT(false && "Unknown raytracing list instruction type.");
-				return;
-		}
-	}
-}
-
 void RenderingDeviceGraph::_run_compute_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size) {
 	uint32_t instruction_data_cursor = 0;
 	while (instruction_data_cursor < p_instruction_data_size) {
@@ -1086,10 +1004,6 @@ void RenderingDeviceGraph::_run_render_commands(int32_t p_level, const RecordedC
 		_run_label_command_change(r_command_buffer, command->label_index, p_level, false, true, &p_sorted_commands[i], p_sorted_commands_count - i, r_current_label_index, r_current_label_level);
 
 		switch (command->type) {
-			case RecordedCommand::TYPE_ACCELERATION_STRUCTURE_BUILD: {
-				const RecordedAccelerationStructureBuildCommand *as_build_command = reinterpret_cast<const RecordedAccelerationStructureBuildCommand *>(command);
-				driver->command_build_acceleration_structure(r_command_buffer, as_build_command->acceleration_structure, as_build_command->scratch_buffer);
-			} break;
 			case RecordedCommand::TYPE_BUFFER_CLEAR: {
 				const RecordedBufferClearCommand *buffer_clear_command = reinterpret_cast<const RecordedBufferClearCommand *>(command);
 				driver->command_clear_buffer(r_command_buffer, buffer_clear_command->buffer, buffer_clear_command->offset, buffer_clear_command->size);
@@ -1113,10 +1027,6 @@ void RenderingDeviceGraph::_run_render_commands(int32_t p_level, const RecordedC
 				const RecordedDriverCallbackCommand *driver_callback_command = reinterpret_cast<const RecordedDriverCallbackCommand *>(command);
 				driver_callback_command->callback(driver, r_command_buffer, driver_callback_command->userdata);
 			} break;
-			case RecordedCommand::TYPE_RAYTRACING_LIST: {
-				const RecordedRaytracingListCommand *raytracing_list_command = reinterpret_cast<const RecordedRaytracingListCommand *>(command);
-				_run_raytracing_list_command(r_command_buffer, raytracing_list_command->instruction_data(), raytracing_list_command->instruction_data_size);
-			} break;
 			case RecordedCommand::TYPE_COMPUTE_LIST: {
 				if (device.workarounds.avoid_compute_after_draw && workarounds_state.draw_list_found) {
 					// Avoid compute after draw workaround. Refer to the comment that enables this in the Vulkan driver for more information.
@@ -1403,12 +1313,6 @@ void RenderingDeviceGraph::_group_barriers_for_render_commands(RDD::CommandBuffe
 			barrier_group.buffer_barriers.push_back(recorded_barrier);
 		}
 #endif
-
-		// Gather acceleration structure barriers.
-		for (int32_t j = 0; j < command->acceleration_structure_barrier_count; j++) {
-			const RDD::AccelerationStructureBarrier &recorded_barrier = command_acceleration_structure_barriers[command->acceleration_structure_barrier_index + j];
-			barrier_group.acceleration_structure_barriers.push_back(recorded_barrier);
-		}
 	}
 
 	if (p_full_memory_barrier) {
@@ -1425,8 +1329,7 @@ void RenderingDeviceGraph::_group_barriers_for_render_commands(RDD::CommandBuffe
 #else
 	const bool are_buffer_barriers_empty = true;
 #endif
-	const bool are_acceleration_structure_barriers_empty = barrier_group.acceleration_structure_barriers.is_empty();
-	if (is_memory_barrier_empty && are_texture_barriers_empty && are_buffer_barriers_empty && are_acceleration_structure_barriers_empty) {
+	if (is_memory_barrier_empty && are_texture_barriers_empty && are_buffer_barriers_empty) {
 		// Commands don't require synchronization.
 		return;
 	}
@@ -1438,13 +1341,12 @@ void RenderingDeviceGraph::_group_barriers_for_render_commands(RDD::CommandBuffe
 #else
 	const VectorView<RDD::BufferBarrier> buffer_barriers = VectorView<RDD::BufferBarrier>();
 #endif
-	const VectorView<RDD::AccelerationStructureBarrier> acceleration_structure_barriers = !are_acceleration_structure_barriers_empty ? barrier_group.acceleration_structure_barriers : VectorView<RDD::AccelerationStructureBarrier>();
 
-	driver->command_pipeline_barrier(p_command_buffer, barrier_group.src_stages, barrier_group.dst_stages, memory_barriers, buffer_barriers, texture_barriers, acceleration_structure_barriers);
+	driver->command_pipeline_barrier(p_command_buffer, barrier_group.src_stages, barrier_group.dst_stages, memory_barriers, buffer_barriers, texture_barriers);
 
 	bool separate_texture_barriers = !barrier_group.normalization_barriers.is_empty() && !barrier_group.transition_barriers.is_empty();
 	if (separate_texture_barriers) {
-		driver->command_pipeline_barrier(p_command_buffer, barrier_group.src_stages, barrier_group.dst_stages, VectorView<RDD::MemoryAccessBarrier>(), VectorView<RDD::BufferBarrier>(), barrier_group.transition_barriers, VectorView<RDD::AccelerationStructureBarrier>());
+		driver->command_pipeline_barrier(p_command_buffer, barrier_group.src_stages, barrier_group.dst_stages, VectorView<RDD::MemoryAccessBarrier>(), VectorView<RDD::BufferBarrier>(), barrier_group.transition_barriers);
 	}
 }
 
@@ -1623,46 +1525,6 @@ void RenderingDeviceGraph::_print_draw_list(const uint8_t *p_instruction_data, u
 	}
 }
 
-void RenderingDeviceGraph::_print_raytracing_list(const uint8_t *p_instruction_data, uint32_t p_instruction_data_size) {
-	uint32_t instruction_data_cursor = 0;
-	while (instruction_data_cursor < p_instruction_data_size) {
-		DEV_ASSERT((instruction_data_cursor + sizeof(RaytracingListInstruction)) <= p_instruction_data_size);
-
-		const RaytracingListInstruction *instruction = reinterpret_cast<const RaytracingListInstruction *>(&p_instruction_data[instruction_data_cursor]);
-		switch (instruction->type) {
-			case RaytracingListInstruction::TYPE_BIND_PIPELINE: {
-				const RaytracingListBindPipelineInstruction *bind_pipeline_instruction = reinterpret_cast<const RaytracingListBindPipelineInstruction *>(instruction);
-				print_line("\tBIND PIPELINE ID", itos(bind_pipeline_instruction->pipeline.id));
-				instruction_data_cursor += sizeof(RaytracingListBindPipelineInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_BIND_UNIFORM_SET: {
-				const RaytracingListBindUniformSetInstruction *bind_uniform_set_instruction = reinterpret_cast<const RaytracingListBindUniformSetInstruction *>(instruction);
-				print_line("\tBIND UNIFORM SET ID", itos(bind_uniform_set_instruction->uniform_set.id), "SHADER ID", itos(bind_uniform_set_instruction->shader.id));
-				instruction_data_cursor += sizeof(RaytracingListBindUniformSetInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_SET_PUSH_CONSTANT: {
-				const RaytracingListSetPushConstantInstruction *set_push_constant_instruction = reinterpret_cast<const RaytracingListSetPushConstantInstruction *>(instruction);
-				print_line("\tSET PUSH CONSTANT SIZE", set_push_constant_instruction->size);
-				instruction_data_cursor += sizeof(RaytracingListSetPushConstantInstruction);
-				instruction_data_cursor += set_push_constant_instruction->size;
-			} break;
-			case RaytracingListInstruction::TYPE_TRACE_RAYS: {
-				const RaytracingListTraceRaysInstruction *trace_rays_instruction = reinterpret_cast<const RaytracingListTraceRaysInstruction *>(instruction);
-				print_line("\tTRACE RAYS WIDTH", itos(trace_rays_instruction->width), "HEIGHT", itos(trace_rays_instruction->height));
-				instruction_data_cursor += sizeof(RaytracingListTraceRaysInstruction);
-			} break;
-			case RaytracingListInstruction::TYPE_UNIFORM_SET_PREPARE_FOR_USE: {
-				const RaytracingListUniformSetPrepareForUseInstruction *uniform_set_prepare_for_use_instruction = reinterpret_cast<const RaytracingListUniformSetPrepareForUseInstruction *>(instruction);
-				print_line("\tUNIFORM SET PREPARE FOR USE ID", itos(uniform_set_prepare_for_use_instruction->uniform_set.id), "SHADER ID", itos(uniform_set_prepare_for_use_instruction->shader.id), "INDEX", itos(uniform_set_prepare_for_use_instruction->set_index));
-				instruction_data_cursor += sizeof(RaytracingListUniformSetPrepareForUseInstruction);
-			} break;
-			default:
-				DEV_ASSERT(false && "Unknown raytracing list instruction type.");
-				return;
-		}
-	}
-}
-
 void RenderingDeviceGraph::_print_compute_list(const uint8_t *p_instruction_data, uint32_t p_instruction_data_size) {
 	uint32_t instruction_data_cursor = 0;
 	while (instruction_data_cursor < p_instruction_data_size) {
@@ -1761,7 +1623,6 @@ void RenderingDeviceGraph::begin() {
 	command_normalization_barriers.clear();
 	command_transition_barriers.clear();
 	command_buffer_barriers.clear();
-	command_acceleration_structure_barriers.clear();
 	command_label_chars.clear();
 	command_label_colors.clear();
 	command_label_offsets.clear();
@@ -1784,33 +1645,6 @@ void RenderingDeviceGraph::begin() {
 #endif
 }
 
-void RenderingDeviceGraph::add_acceleration_structure_build(RDD::AccelerationStructureID p_acceleration_structure, RDD::BufferID p_scratch_buffer, ResourceTracker *p_dst_tracker, VectorView<ResourceTracker *> p_src_trackers) {
-	int32_t command_index;
-	RecordedAccelerationStructureBuildCommand *command = static_cast<RecordedAccelerationStructureBuildCommand *>(_allocate_command(sizeof(RecordedAccelerationStructureBuildCommand), command_index));
-	command->type = RecordedCommand::TYPE_ACCELERATION_STRUCTURE_BUILD;
-	command->self_stages = RDD::PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT;
-	command->acceleration_structure = p_acceleration_structure;
-	command->scratch_buffer = p_scratch_buffer;
-
-	thread_local LocalVector<ResourceTracker *> trackers;
-	thread_local LocalVector<ResourceUsage> usages;
-
-	// Sources and destination.
-	uint32_t resource_count = p_src_trackers.size() + 1;
-	trackers.resize(resource_count);
-	usages.resize(resource_count);
-
-	for (uint32_t i = 0; i < p_src_trackers.size(); ++i) {
-		trackers[i] = p_src_trackers[i];
-		usages[i] = RESOURCE_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT;
-	}
-
-	trackers[resource_count - 1] = p_dst_tracker;
-	usages[resource_count - 1] = RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE;
-
-	_add_command_to_graph(trackers.ptr(), usages.ptr(), usages.size(), command_index, command);
-}
-
 void RenderingDeviceGraph::add_buffer_clear(RDD::BufferID p_dst, ResourceTracker *p_dst_tracker, uint32_t p_offset, uint32_t p_size) {
 	DEV_ASSERT(p_dst_tracker != nullptr);
 
@@ -1901,88 +1735,6 @@ void RenderingDeviceGraph::add_driver_callback(RDD::DriverCallback p_callback, v
 	_add_command_to_graph((ResourceTracker **)p_trackers.ptr(), (ResourceUsage *)p_usages.ptr(), p_trackers.size(), command_index, command);
 }
 
-void RenderingDeviceGraph::add_raytracing_list_begin() {
-	raytracing_instruction_list.clear();
-	raytracing_instruction_list.index++;
-}
-
-void RenderingDeviceGraph::add_raytracing_list_bind_pipeline(RDD::RaytracingPipelineID p_pipeline) {
-	RaytracingListBindPipelineInstruction *instruction = reinterpret_cast<RaytracingListBindPipelineInstruction *>(_allocate_raytracing_list_instruction(sizeof(RaytracingListBindPipelineInstruction)));
-	instruction->type = RaytracingListInstruction::TYPE_BIND_PIPELINE;
-	instruction->pipeline = p_pipeline;
-	raytracing_instruction_list.stages.set_flag(RDD::PIPELINE_STAGE_RAY_TRACING_SHADER_BIT);
-}
-
-void RenderingDeviceGraph::add_raytracing_list_bind_uniform_set(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index) {
-	RaytracingListBindUniformSetInstruction *instruction = reinterpret_cast<RaytracingListBindUniformSetInstruction *>(_allocate_raytracing_list_instruction(sizeof(RaytracingListBindUniformSetInstruction)));
-	instruction->type = RaytracingListInstruction::TYPE_BIND_UNIFORM_SET;
-	instruction->shader = p_shader;
-	instruction->uniform_set = p_uniform_set;
-	instruction->set_index = set_index;
-}
-
-void RenderingDeviceGraph::add_raytracing_list_set_push_constant(RDD::ShaderID p_shader, const void *p_data, uint32_t p_data_size) {
-	uint32_t instruction_size = sizeof(RaytracingListSetPushConstantInstruction) + p_data_size;
-	RaytracingListSetPushConstantInstruction *instruction = reinterpret_cast<RaytracingListSetPushConstantInstruction *>(_allocate_raytracing_list_instruction(instruction_size));
-	instruction->type = RaytracingListInstruction::TYPE_SET_PUSH_CONSTANT;
-	instruction->size = p_data_size;
-	instruction->shader = p_shader;
-	memcpy(instruction->data(), p_data, p_data_size);
-}
-
-void RenderingDeviceGraph::add_raytracing_list_trace_rays(uint32_t p_width, uint32_t p_height) {
-	RaytracingListTraceRaysInstruction *instruction = reinterpret_cast<RaytracingListTraceRaysInstruction *>(_allocate_raytracing_list_instruction(sizeof(RaytracingListTraceRaysInstruction)));
-	instruction->type = RaytracingListInstruction::TYPE_TRACE_RAYS;
-	instruction->width = p_width;
-	instruction->height = p_height;
-}
-
-void RenderingDeviceGraph::add_raytracing_list_uniform_set_prepare_for_use(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index) {
-	RaytracingListUniformSetPrepareForUseInstruction *instruction = reinterpret_cast<RaytracingListUniformSetPrepareForUseInstruction *>(_allocate_raytracing_list_instruction(sizeof(RaytracingListUniformSetPrepareForUseInstruction)));
-	instruction->type = RaytracingListInstruction::TYPE_UNIFORM_SET_PREPARE_FOR_USE;
-	instruction->shader = p_shader;
-	instruction->uniform_set = p_uniform_set;
-	instruction->set_index = set_index;
-}
-
-void RenderingDeviceGraph::add_raytracing_list_usage(ResourceTracker *p_tracker, ResourceUsage p_usage) {
-	DEV_ASSERT(p_tracker != nullptr);
-
-	p_tracker->reset_if_outdated(tracking_frame);
-
-	if (p_tracker->raytracing_list_index != raytracing_instruction_list.index) {
-		raytracing_instruction_list.command_trackers.push_back(p_tracker);
-		raytracing_instruction_list.command_tracker_usages.push_back(p_usage);
-		p_tracker->raytracing_list_index = raytracing_instruction_list.index;
-		p_tracker->raytracing_list_usage = p_usage;
-	}
-#ifdef DEV_ENABLED
-	else if (p_tracker->raytracing_list_usage != p_usage) {
-		ERR_FAIL_MSG(vformat("Tracker can't have more than one type of usage in the same raytracing list. Raytracing list usage is %d and the requested usage is %d.", p_tracker->raytracing_list_usage, p_usage));
-	}
-#endif
-}
-
-void RenderingDeviceGraph::add_raytracing_list_usages(VectorView<ResourceTracker *> p_trackers, VectorView<ResourceUsage> p_usages) {
-	DEV_ASSERT(p_trackers.size() == p_usages.size());
-
-	for (uint32_t i = 0; i < p_trackers.size(); i++) {
-		add_raytracing_list_usage(p_trackers[i], p_usages[i]);
-	}
-}
-
-void RenderingDeviceGraph::add_raytracing_list_end() {
-	int32_t command_index;
-	uint32_t instruction_data_size = raytracing_instruction_list.data.size();
-	uint32_t command_size = sizeof(RecordedRaytracingListCommand) + instruction_data_size;
-	RecordedRaytracingListCommand *command = static_cast<RecordedRaytracingListCommand *>(_allocate_command(command_size, command_index));
-	command->type = RecordedCommand::TYPE_RAYTRACING_LIST;
-	command->self_stages = raytracing_instruction_list.stages;
-	command->instruction_data_size = instruction_data_size;
-	memcpy(command->instruction_data(), raytracing_instruction_list.data.ptr(), instruction_data_size);
-	_add_command_to_graph(raytracing_instruction_list.command_trackers.ptr(), raytracing_instruction_list.command_tracker_usages.ptr(), raytracing_instruction_list.command_trackers.size(), command_index, command);
-}
-
 void RenderingDeviceGraph::add_compute_list_begin(RDD::BreadcrumbMarker p_phase, uint32_t p_breadcrumb_data) {
 	compute_instruction_list.clear();
 #if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)
diff --git a/engine/servers/rendering/rendering_device_graph.h b/engine/servers/rendering/rendering_device_graph.h
index ce1be7ee..246c64c0 100644
--- a/engine/servers/rendering/rendering_device_graph.h
+++ b/engine/servers/rendering/rendering_device_graph.h
@@ -31,12 +31,8 @@
 #pragma once
 
 #include "core/object/worker_thread_pool.h"
-#include "servers/rendering/rendering_device_commons.h"
-#include "servers/rendering/rendering_device_driver.h"
-
-#ifdef DEV_ENABLED
-#include "core/templates/rb_map.h"
-#endif
+#include "rendering_device_commons.h"
+#include "rendering_device_driver.h"
 
 // Buffer barriers have not shown any significant improvement or shown to be
 // even detrimental to performance. However, there are currently some known
@@ -48,19 +44,6 @@
 
 class RenderingDeviceGraph {
 public:
-	struct RaytracingListInstruction {
-		enum Type {
-			TYPE_NONE,
-			TYPE_BIND_PIPELINE,
-			TYPE_BIND_UNIFORM_SET,
-			TYPE_SET_PUSH_CONSTANT,
-			TYPE_TRACE_RAYS,
-			TYPE_UNIFORM_SET_PREPARE_FOR_USE,
-		};
-
-		Type type = TYPE_NONE;
-	};
-
 	struct ComputeListInstruction {
 		enum Type {
 			TYPE_NONE,
@@ -103,13 +86,11 @@ public:
 	struct RecordedCommand {
 		enum Type {
 			TYPE_NONE,
-			TYPE_ACCELERATION_STRUCTURE_BUILD,
 			TYPE_BUFFER_CLEAR,
 			TYPE_BUFFER_COPY,
 			TYPE_BUFFER_GET_DATA,
 			TYPE_BUFFER_UPDATE,
 			TYPE_COMPUTE_LIST,
-			TYPE_RAYTRACING_LIST,
 			TYPE_DRAW_LIST,
 			TYPE_TEXTURE_CLEAR_COLOR,
 			TYPE_TEXTURE_CLEAR_DEPTH_STENCIL,
@@ -133,8 +114,6 @@ public:
 		int32_t buffer_barrier_index = -1;
 		int32_t buffer_barrier_count = 0;
 #endif
-		int32_t acceleration_structure_barrier_index = -1;
-		int32_t acceleration_structure_barrier_count = 0;
 		int32_t label_index = -1;
 		BitField<RDD::PipelineStageBits> previous_stages = {};
 		BitField<RDD::PipelineStageBits> next_stages = {};
@@ -173,9 +152,6 @@ public:
 		RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ,
 		RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ,
 		RESOURCE_USAGE_GENERAL,
-		RESOURCE_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT,
-		RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ,
-		RESOURCE_USAGE_ACCELERATION_STRUCTURE_READ_WRITE,
 		RESOURCE_USAGE_MAX
 	};
 
@@ -190,14 +166,11 @@ public:
 		int32_t draw_list_index = -1;
 		ResourceUsage draw_list_usage = RESOURCE_USAGE_NONE;
 		int32_t compute_list_index = -1;
-		int32_t raytracing_list_index = -1;
 		ResourceUsage compute_list_usage = RESOURCE_USAGE_NONE;
-		ResourceUsage raytracing_list_usage = RESOURCE_USAGE_NONE;
 		ResourceUsage usage = RESOURCE_USAGE_NONE;
 		BitField<RDD::BarrierAccessBits> usage_access = {};
 		RDD::BufferID buffer_driver_id;
 		RDD::TextureID texture_driver_id;
-		RDD::AccelerationStructureID acceleration_structure_driver_id;
 		RDD::TextureSubresourceRange texture_subresources;
 		Size2i texture_size;
 		uint32_t texture_usage = 0;
@@ -220,7 +193,6 @@ public:
 				write_command_or_list_index = -1;
 				draw_list_index = -1;
 				compute_list_index = -1;
-				raytracing_list_index = -1;
 				texture_slice_command_index = -1;
 				write_command_list_enabled = false;
 			}
@@ -288,10 +260,6 @@ private:
 #endif
 	};
 
-	struct RaytracingInstructionList : InstructionList {
-		// No extra contents.
-	};
-
 	struct DrawInstructionList : InstructionList {
 		FramebufferCache *framebuffer_cache = nullptr;
 		RDD::RenderPassID render_pass;
@@ -342,11 +310,6 @@ private:
 		bool partial_coverage = false;
 	};
 
-	struct RecordedAccelerationStructureBuildCommand : RecordedCommand {
-		RDD::AccelerationStructureID acceleration_structure;
-		RDD::BufferID scratch_buffer;
-	};
-
 	struct RecordedBufferClearCommand : RecordedCommand {
 		RDD::BufferID buffer;
 		uint32_t offset = 0;
@@ -383,18 +346,6 @@ private:
 		void *userdata = nullptr;
 	};
 
-	struct RecordedRaytracingListCommand : RecordedCommand {
-		uint32_t instruction_data_size = 0;
-
-		_FORCE_INLINE_ uint8_t *instruction_data() {
-			return reinterpret_cast<uint8_t *>(&this[1]);
-		}
-
-		_FORCE_INLINE_ const uint8_t *instruction_data() const {
-			return reinterpret_cast<const uint8_t *>(&this[1]);
-		}
-	};
-
 	struct RecordedComputeListCommand : RecordedCommand {
 		uint32_t instruction_data_size = 0;
 		uint32_t breadcrumb = 0;
@@ -671,45 +622,6 @@ private:
 		uint32_t set_index = 0;
 	};
 
-	struct RaytracingListBuildAccelerationStructureInstruction : RaytracingListInstruction {
-		RDD::AccelerationStructureID acceleration_structure;
-		RDD::AccelerationStructureType acceleration_structure_type;
-	};
-
-	struct RaytracingListBindPipelineInstruction : RaytracingListInstruction {
-		RDD::RaytracingPipelineID pipeline;
-	};
-
-	struct RaytracingListBindUniformSetInstruction : RaytracingListInstruction {
-		RDD::UniformSetID uniform_set;
-		RDD::ShaderID shader;
-		uint32_t set_index = 0;
-	};
-
-	struct RaytracingListSetPushConstantInstruction : RaytracingListInstruction {
-		uint32_t size = 0;
-		RDD::ShaderID shader;
-
-		_FORCE_INLINE_ uint8_t *data() {
-			return reinterpret_cast<uint8_t *>(&this[1]);
-		}
-
-		_FORCE_INLINE_ const uint8_t *data() const {
-			return reinterpret_cast<const uint8_t *>(&this[1]);
-		}
-	};
-
-	struct RaytracingListTraceRaysInstruction : RaytracingListInstruction {
-		uint32_t width = 0;
-		uint32_t height = 0;
-	};
-
-	struct RaytracingListUniformSetPrepareForUseInstruction : RaytracingListInstruction {
-		RDD::UniformSetID uniform_set;
-		RDD::ShaderID shader;
-		uint32_t set_index = 0;
-	};
-
 	struct ComputeListBindPipelineInstruction : ComputeListInstruction {
 		RDD::PipelineID pipeline;
 	};
@@ -768,7 +680,6 @@ private:
 #if USE_BUFFER_BARRIERS
 		LocalVector<RDD::BufferBarrier> buffer_barriers;
 #endif
-		LocalVector<RDD::AccelerationStructureBarrier> acceleration_structure_barriers;
 
 		void clear() {
 			src_stages.clear();
@@ -780,7 +691,6 @@ private:
 #if USE_BUFFER_BARRIERS
 			buffer_barriers.clear();
 #endif
-			acceleration_structure_barriers.clear();
 		}
 	};
 
@@ -807,14 +717,12 @@ private:
 	LocalVector<RDD::TextureBarrier> command_normalization_barriers;
 	LocalVector<RDD::TextureBarrier> command_transition_barriers;
 	LocalVector<RDD::BufferBarrier> command_buffer_barriers;
-	LocalVector<RDD::AccelerationStructureBarrier> command_acceleration_structure_barriers;
 	LocalVector<char> command_label_chars;
 	LocalVector<Color> command_label_colors;
 	LocalVector<uint32_t> command_label_offsets;
 	int32_t command_label_index = -1;
 	DrawInstructionList draw_instruction_list;
 	ComputeInstructionList compute_instruction_list;
-	RaytracingInstructionList raytracing_instruction_list;
 	uint32_t command_count = 0;
 	uint32_t command_label_count = 0;
 	LocalVector<RecordedCommandListNode> command_list_nodes;
@@ -849,16 +757,13 @@ private:
 	DrawListInstruction *_allocate_draw_list_instruction(uint32_t p_instruction_size);
 	ComputeListInstruction *_allocate_compute_list_instruction(uint32_t p_instruction_size);
 	void _check_discardable_attachment_dependency(ResourceTracker *p_resource_tracker, int32_t p_previous_command_index, int32_t p_command_index);
-	RaytracingListInstruction *_allocate_raytracing_list_instruction(uint32_t p_instruction_size);
 	void _add_command_to_graph(ResourceTracker **p_resource_trackers, ResourceUsage *p_resource_usages, uint32_t p_resource_count, int32_t p_command_index, RecordedCommand *r_command);
 	void _add_texture_barrier_to_command(RDD::TextureID p_texture_id, BitField<RDD::BarrierAccessBits> p_src_access, BitField<RDD::BarrierAccessBits> p_dst_access, ResourceUsage p_prev_usage, ResourceUsage p_next_usage, RDD::TextureSubresourceRange p_subresources, LocalVector<RDD::TextureBarrier> &r_barrier_vector, int32_t &r_barrier_index, int32_t &r_barrier_count);
 #if USE_BUFFER_BARRIERS
 	void _add_buffer_barrier_to_command(RDD::BufferID p_buffer_id, BitField<RDD::BarrierAccessBits> p_src_access, BitField<RDD::BarrierAccessBits> p_dst_access, int32_t &r_barrier_index, int32_t &r_barrier_count);
 #endif
-	void _add_acceleration_structure_barrier_to_command(RDD::AccelerationStructureID p_acceleration_structure_id, BitField<RDD::BarrierAccessBits> p_src_access, BitField<RDD::BarrierAccessBits> p_dst_access, LocalVector<RDD::AccelerationStructureBarrier> &r_barrier_vector, int32_t &r_barrier_index, int32_t &r_barrier_count);
 	void _run_compute_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 	void _get_draw_list_render_pass_and_framebuffer(const RecordedDrawListCommand *p_draw_list_command, RDD::RenderPassID &r_render_pass, RDD::FramebufferID &r_framebuffer);
-	void _run_raytracing_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 	void _run_draw_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 	void _add_draw_list_begin(FramebufferCache *p_framebuffer_cache, RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb, bool p_split_cmd_buffer);
 	void _run_secondary_command_buffer_task(const SecondaryCommandBuffer *p_secondary);
@@ -870,7 +775,6 @@ private:
 	void _print_render_commands(const RecordedCommandSort *p_sorted_commands, uint32_t p_sorted_commands_count);
 	void _print_draw_list(const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 	void _print_compute_list(const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
-	void _print_raytracing_list(const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 
 public:
 	RenderingDeviceGraph();
@@ -878,21 +782,11 @@ public:
 	void initialize(RDD *p_driver, RenderingContextDriver::Device p_device, RenderPassCreationFunction p_render_pass_creation_function, uint32_t p_frame_count, RDD::CommandQueueFamilyID p_secondary_command_queue_family, uint32_t p_secondary_command_buffers_per_frame);
 	void finalize();
 	void begin();
-	void add_acceleration_structure_build(RDD::AccelerationStructureID p_acceleration_structure, RDD::BufferID p_scratch_buffer, ResourceTracker *p_dst_tracker, VectorView<ResourceTracker *> p_src_trackers);
 	void add_buffer_clear(RDD::BufferID p_dst, ResourceTracker *p_dst_tracker, uint32_t p_offset, uint32_t p_size);
 	void add_buffer_copy(RDD::BufferID p_src, ResourceTracker *p_src_tracker, RDD::BufferID p_dst, ResourceTracker *p_dst_tracker, RDD::BufferCopyRegion p_region);
 	void add_buffer_get_data(RDD::BufferID p_src, ResourceTracker *p_src_tracker, RDD::BufferID p_dst, RDD::BufferCopyRegion p_region);
 	void add_buffer_update(RDD::BufferID p_dst, ResourceTracker *p_dst_tracker, VectorView<RecordedBufferCopy> p_buffer_copies);
 	void add_driver_callback(RDD::DriverCallback p_callback, void *p_userdata, VectorView<ResourceTracker *> p_trackers, VectorView<ResourceUsage> p_usages);
-	void add_raytracing_list_begin();
-	void add_raytracing_list_bind_pipeline(RDD::RaytracingPipelineID p_pipeline);
-	void add_raytracing_list_bind_uniform_set(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index);
-	void add_raytracing_list_set_push_constant(RDD::ShaderID p_shader, const void *p_data, uint32_t p_data_size);
-	void add_raytracing_list_trace_rays(uint32_t p_width, uint32_t p_height);
-	void add_raytracing_list_uniform_set_prepare_for_use(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index);
-	void add_raytracing_list_usage(ResourceTracker *p_tracker, ResourceUsage p_usage);
-	void add_raytracing_list_usages(VectorView<ResourceTracker *> p_trackers, VectorView<ResourceUsage> p_usages);
-	void add_raytracing_list_end();
 	void add_compute_list_begin(RDD::BreadcrumbMarker p_phase = RDD::BreadcrumbMarker::NONE, uint32_t p_breadcrumb_data = 0);
 	void add_compute_list_bind_pipeline(RDD::PipelineID p_pipeline);
 	void add_compute_list_bind_uniform_set(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index);
diff --git a/engine/servers/rendering/rendering_light_culler.cpp b/engine/servers/rendering/rendering_light_culler.cpp
index 74c92891..962e70c7 100644
--- a/engine/servers/rendering/rendering_light_culler.cpp
+++ b/engine/servers/rendering/rendering_light_culler.cpp
@@ -32,11 +32,7 @@
 
 #include "core/math/plane.h"
 #include "core/math/projection.h"
-#include "servers/rendering/rendering_server_globals.h"
-
-#ifdef LIGHT_CULLER_DEBUG_FLASH
-#include "core/config/engine.h"
-#endif
+#include "rendering_server_globals.h"
 
 #ifdef RENDERING_LIGHT_CULLER_DEBUG_STRINGS
 const char *RenderingLightCuller::Data::string_planes[] = {
@@ -93,37 +89,19 @@ bool RenderingLightCuller::_prepare_light(const RendererSceneCull::Instance &p_i
 
 	LightSource lsource;
 	switch (RSG::light_storage->light_get_type(p_instance.base)) {
-		case RSE::LIGHT_SPOT:
+		case RS::LIGHT_SPOT:
 			lsource.type = LightSource::ST_SPOTLIGHT;
-			lsource.angle = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_SPOT_ANGLE);
-			lsource.range = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_RANGE);
+			lsource.angle = RSG::light_storage->light_get_param(p_instance.base, RS::LIGHT_PARAM_SPOT_ANGLE);
+			lsource.range = RSG::light_storage->light_get_param(p_instance.base, RS::LIGHT_PARAM_RANGE);
 			break;
-		case RSE::LIGHT_OMNI:
+		case RS::LIGHT_OMNI:
 			lsource.type = LightSource::ST_OMNI;
-			lsource.range = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_RANGE);
+			lsource.range = RSG::light_storage->light_get_param(p_instance.base, RS::LIGHT_PARAM_RANGE);
 			break;
-		case RSE::LIGHT_DIRECTIONAL:
+		case RS::LIGHT_DIRECTIONAL:
 			lsource.type = LightSource::ST_DIRECTIONAL;
-
-			lsource.range = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
-			switch (RSG::light_storage->light_directional_get_shadow_mode(p_instance.base)) {
-				case RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL:
-					lsource.cascade_count = 1;
-					break;
-				case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
-					lsource.cascade_count = 2;
-					break;
-				case RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS:
-					lsource.cascade_count = 4;
-					break;
-				default:
-					ERR_FAIL_V_MSG(false, "Only directional lights with 1, 2, or 4 shadow cascades are supported.");
-					break;
-			}
-			lsource.cascade_splits[0] = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET);
-			lsource.cascade_splits[1] = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET);
-			lsource.cascade_splits[2] = RSG::light_storage->light_get_param(p_instance.base, RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET);
-			lsource.blend_splits = RSG::light_storage->light_directional_get_blend_splits(p_instance.base);
+			// Could deal with a max directional shadow range here? NYI
+			// LIGHT_PARAM_SHADOW_MAX_DISTANCE
 			break;
 	}
 
@@ -131,84 +109,11 @@ bool RenderingLightCuller::_prepare_light(const RendererSceneCull::Instance &p_i
 	lsource.dir = -p_instance.transform.basis.get_column(2);
 	lsource.dir.normalize();
 
-	// In reality there's always going to be at least one cascade, but the compiler can't know that.
-	// If SOMEHOW there's actually 0 cascades though, I suppose there isn't going to be anything visible after all.
-	bool visible = false;
+	bool visible;
 	if (p_directional_light_id == -1) {
-		visible = _add_light_camera_planes(data.regular_cull_planes, lsource, { &data.frustum_planes[0], data.frustum_points });
+		visible = _add_light_camera_planes(data.regular_cull_planes, lsource);
 	} else {
-		int used_planes = 1 + lsource.cascade_count; // 2 for ortho (near+far), 3 for pssm2 (near+mid+far), 5 for pssm4 (near+3mids+far).
-		Plane boundary_planes[5];
-		{
-			constexpr const int MAX_PLANES = 5;
-			real_t plane_distances[MAX_PLANES] = {
-				data.camera_projection.get_z_near(),
-				lsource.cascade_splits[0] * lsource.range,
-				lsource.cascade_splits[1] * lsource.range,
-				lsource.cascade_splits[2] * lsource.range,
-				lsource.range,
-			};
-			//If not 4 cascades, replace last used cascade plane distance with max shadow range (shadow far plane distance).
-			plane_distances[used_planes - 1] = lsource.range;
-#ifdef LIGHT_CULLER_DEBUG_LOGGING
-			if (is_logging()) {
-				print_line("cascade split planes (first " + itos(used_planes) + " used): " +
-						String(Variant(plane_distances[0])) + "m, " +
-						String(Variant(plane_distances[1])) + "m, " +
-						String(Variant(plane_distances[2])) + "m, " +
-						String(Variant(plane_distances[3])) + "m, " +
-						String(Variant(plane_distances[4])) + "m");
-			}
-#endif
-			Vector3 camera_normal = data.camera_transform.basis.xform(Vector3(0, 0, 1)).normalized();
-			for (int i = 0; i < used_planes; i++) {
-				real_t plane_distance = plane_distances[i];
-
-				//Plane compute
-				boundary_planes[i] = Plane(
-						camera_normal,
-						data.camera_transform.origin + camera_normal * -plane_distance);
-			}
-		}
-
-		for (int i = 0; i < lsource.cascade_count; i++) {
-			/*
-			enum PlaneOrder {
-				PLANE_NEAR,
-				PLANE_FAR,
-				PLANE_LEFT,
-				PLANE_TOP,
-				PLANE_RIGHT,
-				PLANE_BOTTOM,
-				PLANE_TOTAL,
-			};
-			*/
-			Plane cull_planes[6] = {
-				boundary_planes[MAX(i - (lsource.blend_splits ? 1 : 0), 0)],
-				Plane(-boundary_planes[i + 1].normal, -boundary_planes[i + 1].d), // Normal flip to ensure far is outward-facing.
-				data.frustum_planes[2],
-				data.frustum_planes[3],
-				data.frustum_planes[4],
-				data.frustum_planes[5],
-			};
-
-#ifdef LIGHT_CULLER_DEBUG_LOGGING
-			if (is_logging()) {
-				for (int p = 0; p < 6; p++) {
-					print_line("cascade " + itos(i) + " plane " + itos(p) + " : " + String(cull_planes[p]));
-				}
-			}
-#endif
-
-			// Frustum point calculation
-			Vector3 frustum_points[8];
-			bool success = create_frustum_points(cull_planes, frustum_points);
-			ERR_FAIL_COND_V(!success, false);
-
-			// Replace frustum arguments with cascade's.
-			LightCullPlanes &destination = data.directional_cull_planes[p_directional_light_id].planes[i];
-			visible = _add_light_camera_planes(destination, lsource, { cull_planes, frustum_points });
-		}
+		visible = _add_light_camera_planes(data.directional_cull_planes[p_directional_light_id], lsource);
 	}
 
 	if (data.light_culling_active) {
@@ -217,14 +122,14 @@ bool RenderingLightCuller::_prepare_light(const RendererSceneCull::Instance &p_i
 	return true;
 }
 
-bool RenderingLightCuller::cull_directional_light(const RendererSceneCull::InstanceBounds &p_bound, int32_t p_directional_light_id, int32_t p_cascade) {
+bool RenderingLightCuller::cull_directional_light(const RendererSceneCull::InstanceBounds &p_bound, int32_t p_directional_light_id) {
 	if (!data.is_active() || !is_caster_culling_active()) {
 		return true;
 	}
 
 	ERR_FAIL_INDEX_V(p_directional_light_id, (int32_t)data.directional_cull_planes.size(), true);
 
-	LightCullPlanes &cull_planes = data.directional_cull_planes[p_directional_light_id].planes[p_cascade];
+	LightCullPlanes &cull_planes = data.directional_cull_planes[p_directional_light_id];
 
 	Vector3 mins = Vector3(p_bound.bounds[0], p_bound.bounds[1], p_bound.bounds[2]);
 	Vector3 maxs = Vector3(p_bound.bounds[3], p_bound.bounds[4], p_bound.bounds[5]);
@@ -323,20 +228,18 @@ void RenderingLightCuller::LightCullPlanes::add_cull_plane(const Plane &p) {
 
 // Directional lights are different to points, as the origin is infinitely in the distance, so the plane third
 // points are derived differently.
-bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &r_cull_planes, const LightSource &p_light_source, const CullFrustumData &p_cull_frustum) {
+bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &r_cull_planes, const LightSource &p_light_source) {
 	uint32_t lookup = 0;
 	r_cull_planes.num_cull_planes = 0;
 
-	const Plane *const cull_frustum_planes = p_cull_frustum.frustum_planes;
-
 	// Directional light, we will use dot against the light direction to determine back facing planes.
 	for (int n = 0; n < 6; n++) {
-		float dot = cull_frustum_planes[n].normal.dot(p_light_source.dir);
+		float dot = data.frustum_planes[n].normal.dot(p_light_source.dir);
 		if (dot > 0.0f) {
 			lookup |= 1 << n;
 
 			// Add backfacing camera frustum planes.
-			r_cull_planes.add_cull_plane(cull_frustum_planes[n]);
+			r_cull_planes.add_cull_plane(data.frustum_planes[n]);
 		}
 	}
 
@@ -349,8 +252,8 @@ bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &
 	// Should never happen with directional light?? This may be able to be removed.
 	if (lookup == 63) {
 		r_cull_planes.num_cull_planes = 0;
-		for (int n = 0; n < 6; n++) {
-			r_cull_planes.add_cull_plane(cull_frustum_planes[n]);
+		for (int n = 0; n < data.frustum_planes.size(); n++) {
+			r_cull_planes.add_cull_plane(data.frustum_planes[n]);
 		}
 
 		return true;
@@ -367,14 +270,11 @@ bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &
 	int n_edges = data.LUT_entry_sizes[lookup] - 1;
 #endif
 
-	const Vector3 *const frustum_points = p_cull_frustum.frustum_points;
-
 	for (int e = 0; e < n_edges; e++) {
 		int i0 = entry[e];
 		int i1 = entry[e + 1];
-
-		const Vector3 &pt0 = frustum_points[i0];
-		const Vector3 &pt1 = frustum_points[i1];
+		const Vector3 &pt0 = data.frustum_points[i0];
+		const Vector3 &pt1 = data.frustum_points[i1];
 
 		// Create a third point from the light direction.
 		Vector3 pt2 = pt0 - p_light_source.dir;
@@ -391,8 +291,8 @@ bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &
 		int i0 = entry[n_edges]; // Last.
 		int i1 = entry[0]; // First.
 
-		const Vector3 &pt0 = frustum_points[i0];
-		const Vector3 &pt1 = frustum_points[i1];
+		const Vector3 &pt0 = data.frustum_points[i0];
+		const Vector3 &pt1 = data.frustum_points[i1];
 
 		// Create a third point from the light direction.
 		Vector3 pt2 = pt0 - p_light_source.dir;
@@ -413,19 +313,20 @@ bool RenderingLightCuller::add_light_camera_planes_directional(LightCullPlanes &
 	return true;
 }
 
-bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_planes, const LightSource &p_light_source, const CullFrustumData &p_cull_frustum) {
+bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_planes, const LightSource &p_light_source) {
 	if (!data.is_active()) {
 		return true;
 	}
 
-	const Plane *const cull_frustum_planes = p_cull_frustum.frustum_planes;
+	// We should have called prepare_camera before this.
+	ERR_FAIL_COND_V(data.frustum_planes.size() != 6, true);
 
 	switch (p_light_source.type) {
 		case LightSource::ST_SPOTLIGHT:
 		case LightSource::ST_OMNI:
 			break;
 		case LightSource::ST_DIRECTIONAL:
-			return add_light_camera_planes_directional(r_cull_planes, p_light_source, p_cull_frustum);
+			return add_light_camera_planes_directional(r_cull_planes, p_light_source);
 			break;
 		default:
 			return false; // not yet supported
@@ -451,12 +352,12 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 	// OMNIS
 	if (p_light_source.type == LightSource::ST_OMNI) {
 		for (int n = 0; n < 6; n++) {
-			float dist = cull_frustum_planes[n].distance_to(p_light_source.pos);
+			float dist = data.frustum_planes[n].distance_to(p_light_source.pos);
 			if (dist < 0.0f) {
 				lookup |= 1 << n;
 
 				// Add backfacing camera frustum planes.
-				r_cull_planes.add_cull_plane(cull_frustum_planes[n]);
+				r_cull_planes.add_cull_plane(data.frustum_planes[n]);
 			} else {
 				// Is the light out of range?
 				// This is one of the tests. If the point source is more than range distance from a frustum plane, it can't
@@ -480,13 +381,13 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 		float end_cone_radius = radius_at_dist_one * p_light_source.range;
 
 		for (int n = 0; n < 6; n++) {
-			float dist = cull_frustum_planes[n].distance_to(p_light_source.pos);
+			float dist = data.frustum_planes[n].distance_to(p_light_source.pos);
 			if (dist < 0.0f) {
 				// Either the plane is backfacing or we are inside the frustum.
 				lookup |= 1 << n;
 
 				// Add backfacing camera frustum planes.
-				r_cull_planes.add_cull_plane(cull_frustum_planes[n]);
+				r_cull_planes.add_cull_plane(data.frustum_planes[n]);
 			} else {
 				// The light is in front of the plane.
 
@@ -501,7 +402,7 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 				// If the cone end point is further than the maximum possible distance to the plane
 				// we can guarantee that the cone does not cross the plane, and hence the cone
 				// is outside the frustum.
-				float dist_end = cull_frustum_planes[n].distance_to(pos_end);
+				float dist_end = data.frustum_planes[n].distance_to(pos_end);
 
 				if (dist_end >= end_cone_radius) {
 					data.out_of_range = true;
@@ -519,8 +420,8 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 	// render shadow casters outside the frustum as shadows can never re-enter the frustum.
 	if (lookup == 63) {
 		r_cull_planes.num_cull_planes = 0;
-		for (int n = 0; n < 6; n++) {
-			r_cull_planes.add_cull_plane(cull_frustum_planes[n]);
+		for (int n = 0; n < data.frustum_planes.size(); n++) {
+			r_cull_planes.add_cull_plane(data.frustum_planes[n]);
 		}
 
 		return true;
@@ -530,15 +431,13 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 	uint8_t *entry = &data.LUT_entries[lookup][0];
 	int n_edges = data.LUT_entry_sizes[lookup] - 1;
 
-	const Vector3 *const frustum_points = p_cull_frustum.frustum_points;
-
 	const Vector3 &pt2 = p_light_source.pos;
 
 	for (int e = 0; e < n_edges; e++) {
 		int i0 = entry[e];
 		int i1 = entry[e + 1];
-		const Vector3 &pt0 = frustum_points[i0];
-		const Vector3 &pt1 = frustum_points[i1];
+		const Vector3 &pt0 = data.frustum_points[i0];
+		const Vector3 &pt1 = data.frustum_points[i1];
 
 		if (!_is_colinear_tri(pt0, pt1, pt2)) {
 			// Create plane from 3 points.
@@ -552,8 +451,8 @@ bool RenderingLightCuller::_add_light_camera_planes(LightCullPlanes &r_cull_plan
 		int i0 = entry[n_edges]; // Last.
 		int i1 = entry[0]; // First.
 
-		const Vector3 &pt0 = frustum_points[i0];
-		const Vector3 &pt1 = frustum_points[i1];
+		const Vector3 &pt0 = data.frustum_points[i0];
+		const Vector3 &pt1 = data.frustum_points[i1];
 
 		if (!_is_colinear_tri(pt0, pt1, pt2)) {
 			// Create plane from 3 points.
@@ -594,9 +493,6 @@ bool RenderingLightCuller::prepare_camera(const Transform3D &p_cam_transform, co
 	if (!data.is_active()) {
 		return false;
 	}
-	// These are needed later to build per-cascade cull frustums for directional lights.
-	data.camera_transform = p_cam_transform;
-	data.camera_projection = p_cam_matrix;
 
 	// Get the camera frustum planes in world space.
 	data.frustum_planes = p_cam_matrix.get_projection_planes(p_cam_transform);
@@ -628,10 +524,6 @@ bool RenderingLightCuller::prepare_camera(const Transform3D &p_cam_transform, co
 	}
 #endif
 
-	return create_frustum_points(&data.frustum_planes[0], data.frustum_points);
-}
-
-bool RenderingLightCuller::create_frustum_points(const Plane *p_frustum_planes, Vector3 *r_result) const {
 	// We want to calculate the frustum corners in a specific order.
 	const Projection::Planes intersections[8][3] = {
 		{ Projection::PLANE_FAR, Projection::PLANE_LEFT, Projection::PLANE_TOP },
@@ -646,17 +538,18 @@ bool RenderingLightCuller::create_frustum_points(const Plane *p_frustum_planes,
 
 	for (int i = 0; i < 8; i++) {
 		// 3 plane intersection, gives us a point.
-		bool res = p_frustum_planes[intersections[i][0]].intersect_3(p_frustum_planes[intersections[i][1]], p_frustum_planes[intersections[i][2]], &r_result[i]);
+		bool res = data.frustum_planes[intersections[i][0]].intersect_3(data.frustum_planes[intersections[i][1]], data.frustum_planes[intersections[i][2]], &data.frustum_points[i]);
 
 		// What happens with a zero frustum? NYI - deal with this.
 		ERR_FAIL_COND_V(!res, false);
 
 #ifdef LIGHT_CULLER_DEBUG_LOGGING
 		if (is_logging()) {
-			print_line("point " + itos(i) + " -> " + String(result[i]));
+			print_line("point " + itos(i) + " -> " + String(data.frustum_points[i]));
 		}
 #endif
 	}
+
 	return true;
 }
 
diff --git a/engine/servers/rendering/rendering_light_culler.h b/engine/servers/rendering/rendering_light_culler.h
index 4a40b34e..2de786e8 100644
--- a/engine/servers/rendering/rendering_light_culler.h
+++ b/engine/servers/rendering/rendering_light_culler.h
@@ -32,7 +32,7 @@
 
 #include "core/math/plane.h"
 #include "core/math/vector3.h"
-#include "servers/rendering/renderer_scene_cull.h"
+#include "renderer_scene_cull.h"
 
 struct Projection;
 struct Transform3D;
@@ -43,7 +43,7 @@ struct Transform3D;
 // Uncomment LIGHT_CULLER_DEBUG_LOGGING to get periodic print of the number of casters culled before / after.
 // Uncomment LIGHT_CULLER_DEBUG_DIRECTIONAL_LIGHT to get periodic print of the number of casters culled for the directional light..
 
-// #define LIGHT_CULLER_DEBUG_LOGGING
+//  #define LIGHT_CULLER_DEBUG_LOGGING
 // #define LIGHT_CULLER_DEBUG_DIRECTIONAL_LIGHT
 // #define LIGHT_CULLER_DEBUG_REGULAR_LIGHT
 // #define LIGHT_CULLER_DEBUG_FLASH
@@ -84,9 +84,6 @@ private:
 			type = ST_UNKNOWN;
 			angle = 0.0f;
 			range = FLT_MAX;
-			cascade_count = 0;
-			cascade_splits[0] = cascade_splits[1] = cascade_splits[2] = 0;
-			blend_splits = false;
 		}
 
 		// All in world space, culling done in world space.
@@ -96,18 +93,6 @@ private:
 
 		float angle; // For spotlight.
 		float range;
-
-		int cascade_count;
-		float cascade_splits[3]; // Max 4 cascades, which only has 3 splits.
-		bool blend_splits;
-	};
-
-	// Directional lights have separate cull frustums for each cascade, so this struct is needed to specify which one to use for each cull step.
-	struct CullFrustumData {
-		// Functions expect this to store a frustum, so it must be ALWAYS at least Plane[6]. Undefined behavior otherwise.
-		const Plane *frustum_planes = nullptr;
-		// Functions expect this to store frustum corners, so it must be ALWAYS at least Vector3[8]. UB otherwise.
-		const Vector3 *frustum_points = nullptr;
 	};
 
 	// Same order as godot.
@@ -159,7 +144,7 @@ public:
 	void prepare_directional_light(const RendererSceneCull::Instance *p_instance, int32_t p_directional_light_id);
 
 	// Return false if the instance is to be culled.
-	bool cull_directional_light(const RendererSceneCull::InstanceBounds &p_bound, int32_t p_directional_light_id, int32_t p_cascade);
+	bool cull_directional_light(const RendererSceneCull::InstanceBounds &p_bound, int32_t p_directional_light_id);
 
 	// Can turn on and off from the engine if desired.
 	void set_caster_culling_active(bool p_active) { data.caster_culling_active = p_active; }
@@ -175,20 +160,11 @@ private:
 #endif
 	};
 
-	struct DirectionalCullPlanes {
-		LightCullPlanes planes[4]; // One set of cull planes per cascade
-	};
-
 	bool _prepare_light(const RendererSceneCull::Instance &p_instance, int32_t p_directional_light_id = -1);
 
 	// Avoid adding extra culling planes derived from near colinear triangles.
 	// The normals derived from these will be inaccurate, and can lead to false
 	// culling of objects that should be within the light volume.
-	// See:
-	// - issue GH-89702 "Tighter Shadow Caster Culling causes some object shadows to not render for a Frame"
-	// - issue GH-89560 "Directional Shadows disappear with large Camera Z Far values at some angles"
-	// - issue GH-91976 "SpotLight3D shadows exhibit flickering when moved around."
-	// - PR GH-92078 which gave it the current value.
 	bool _is_colinear_tri(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c) const {
 		// Lengths of sides a, b and c.
 		float la = (p_b - p_a).length();
@@ -211,14 +187,6 @@ private:
 			float ld = ((la + lb) - lc) / lc;
 
 			// ld will be close to zero for colinear tris.
-
-			// Long frustums are made out of significantly stretched-out triangles,
-			// so large threshold will produce large amounts of cullable but unculled meshes.
-			// For example: 0.001 fails to cull cullable meshes with camera FOV of 70 and ortho shadows at ~50m at certain view angles.
-			// 0.0001 fails to cull cullable meshes with camera FOV of 70 and ortho shadows at ~500m at certain view angles.
-			// ...These apply less to cascades since they have large near planes in comparison to far planes, unlike ortho lights.
-			// If you're reading this and the value for directional lights is still 0.001f,
-			// that is fine as is and it only means GH-115176 didn't make it.
 			return ld < 0.001f;
 		}
 
@@ -228,18 +196,15 @@ private:
 	}
 
 	// Internal version uses LightSource.
-	bool _add_light_camera_planes(LightCullPlanes &r_cull_planes, const LightSource &p_light_source, const CullFrustumData &p_cull_frustum);
+	bool _add_light_camera_planes(LightCullPlanes &r_cull_planes, const LightSource &p_light_source);
 
 	// Directional light gives parallel culling planes (as opposed to point lights).
-	bool add_light_camera_planes_directional(LightCullPlanes &r_cull_planes, const LightSource &p_light_source, const CullFrustumData &p_cull_frustum);
+	bool add_light_camera_planes_directional(LightCullPlanes &r_cull_planes, const LightSource &p_light_source);
 
 	// Is the light culler active? maybe not in the editor...
 	bool is_caster_culling_active() const { return data.caster_culling_active; }
 	bool is_light_culling_active() const { return data.light_culling_active; }
 
-	// Ensure result is at least a Plane[6] for the frustum input and Vector3[8] to store result before calling. If not, undefined behavior.
-	bool create_frustum_points(const Plane *p_frustum_planes, Vector3 *r_result) const;
-
 	// Do we want to log some debug output?
 	bool is_logging() const { return data.debug_count == 0; }
 
@@ -255,10 +220,7 @@ private:
 		// chops and changes between culling different lights
 		// instead of doing one by one, and we don't want to prepare
 		// lights multiple times per frame.
-		LocalVector<DirectionalCullPlanes> directional_cull_planes;
-
-		Transform3D camera_transform;
-		Projection camera_projection;
+		LocalVector<LightCullPlanes> directional_cull_planes;
 
 		// Single threaded cull planes for regular lights
 		// (OMNI, SPOT). These lights reuse the same set of cull plane data.
diff --git a/engine/servers/rendering/rendering_method.h b/engine/servers/rendering/rendering_method.h
index 54f2dc63..6550faa0 100644
--- a/engine/servers/rendering/rendering_method.h
+++ b/engine/servers/rendering/rendering_method.h
@@ -30,21 +30,17 @@
 
 #pragma once
 
-#include "core/variant/variant.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/storage/render_scene_buffers.h"
 
 #ifdef XR_DISABLED
-// RendererSceneCull::render_camera is empty when XR is disabled, but
+// RendererSceneCull::render_camera is empty when 3D is disabled, but
 // it and RenderingMethod::render_camera have a parameter for XRInterface.
 #define XRInterface RefCounted
 #else
-class XRInterface;
+#include "servers/xr/xr_interface.h"
 #endif // XR_DISABLED
 
-class Image;
-class RenderSceneBuffers;
-
 class RenderingMethod {
 public:
 	virtual RID camera_allocate() = 0;
@@ -108,12 +104,12 @@ public:
 	virtual Vector<ObjectID> instances_cull_ray(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const = 0;
 	virtual Vector<ObjectID> instances_cull_convex(const Vector<Plane> &p_convex, RID p_scenario = RID()) const = 0;
 
-	virtual void instance_geometry_set_flag(RID p_instance, RSE::InstanceFlags p_flags, bool p_enabled) = 0;
-	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, RSE::ShadowCastingSetting p_shadow_casting_setting) = 0;
+	virtual void instance_geometry_set_flag(RID p_instance, RS::InstanceFlags p_flags, bool p_enabled) = 0;
+	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, RS::ShadowCastingSetting p_shadow_casting_setting) = 0;
 	virtual void instance_geometry_set_material_override(RID p_instance, RID p_material) = 0;
 	virtual void instance_geometry_set_material_overlay(RID p_instance, RID p_material) = 0;
 
-	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RSE::VisibilityRangeFadeMode p_fade_mode) = 0;
+	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RS::VisibilityRangeFadeMode p_fade_mode) = 0;
 	virtual void instance_geometry_set_lightmap(RID p_instance, RID p_lightmap, const Rect2 &p_lightmap_uv_scale, int p_slice_index) = 0;
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias) = 0;
 	virtual void instance_geometry_set_shader_parameter(RID p_instance, const StringName &p_parameter, const Variant &p_value) = 0;
@@ -124,7 +120,7 @@ public:
 	/* PIPELINES */
 
 	virtual void mesh_generate_pipelines(RID p_mesh, bool p_background_compilation) = 0;
-	virtual uint32_t get_pipeline_compilations(RSE::PipelineSource p_source) = 0;
+	virtual uint32_t get_pipeline_compilations(RS::PipelineSource p_source) = 0;
 
 	/* SKY API */
 
@@ -132,7 +128,7 @@ public:
 	virtual void sky_initialize(RID p_rid) = 0;
 
 	virtual void sky_set_radiance_size(RID p_sky, int p_radiance_size) = 0;
-	virtual void sky_set_mode(RID p_sky, RSE::SkyMode p_samples) = 0;
+	virtual void sky_set_mode(RID p_sky, RS::SkyMode p_samples) = 0;
 	virtual void sky_set_material(RID p_sky, RID p_material) = 0;
 	virtual Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) = 0;
 
@@ -145,8 +141,8 @@ public:
 
 	virtual void compositor_effect_set_enabled(RID p_compositor, bool p_enabled) = 0;
 
-	virtual void compositor_effect_set_callback(RID p_compositor, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) = 0;
-	virtual void compositor_effect_set_flag(RID p_compositor, RSE::CompositorEffectFlags p_flag, bool p_set) = 0;
+	virtual void compositor_effect_set_callback(RID p_compositor, RS::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) = 0;
+	virtual void compositor_effect_set_flag(RID p_compositor, RS::CompositorEffectFlags p_flag, bool p_set) = 0;
 
 	/* COMPOSITOR API */
 
@@ -163,17 +159,17 @@ public:
 	virtual void environment_initialize(RID p_rid) = 0;
 
 	// Background
-	virtual void environment_set_background(RID p_env, RSE::EnvironmentBG p_bg) = 0;
+	virtual void environment_set_background(RID p_env, RS::EnvironmentBG p_bg) = 0;
 	virtual void environment_set_sky(RID p_env, RID p_sky) = 0;
 	virtual void environment_set_sky_custom_fov(RID p_env, float p_scale) = 0;
 	virtual void environment_set_sky_orientation(RID p_env, const Basis &p_orientation) = 0;
 	virtual void environment_set_bg_color(RID p_env, const Color &p_color) = 0;
 	virtual void environment_set_bg_energy(RID p_env, float p_multiplier, float p_exposure_value) = 0;
 	virtual void environment_set_canvas_max_layer(RID p_env, int p_max_layer) = 0;
-	virtual void environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient = RSE::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RSE::EnvironmentReflectionSource p_reflection_source = RSE::ENV_REFLECTION_SOURCE_BG) = 0;
+	virtual void environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient = RS::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RS::EnvironmentReflectionSource p_reflection_source = RS::ENV_REFLECTION_SOURCE_BG) = 0;
 	virtual void environment_set_camera_feed_id(RID p_env, int p_camera_feed_id) = 0;
 
-	virtual RSE::EnvironmentBG environment_get_background(RID p_Env) const = 0;
+	virtual RS::EnvironmentBG environment_get_background(RID p_Env) const = 0;
 	virtual RID environment_get_sky(RID p_env) const = 0;
 	virtual float environment_get_sky_custom_fov(RID p_env) const = 0;
 	virtual Basis environment_get_sky_orientation(RID p_env) const = 0;
@@ -181,25 +177,25 @@ public:
 	virtual float environment_get_bg_energy_multiplier(RID p_env) const = 0;
 	virtual float environment_get_bg_intensity(RID p_env) const = 0;
 	virtual int environment_get_canvas_max_layer(RID p_env) const = 0;
-	virtual RSE::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const = 0;
+	virtual RS::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const = 0;
 	virtual Color environment_get_ambient_light(RID p_env) const = 0;
 	virtual float environment_get_ambient_light_energy(RID p_env) const = 0;
 	virtual float environment_get_ambient_sky_contribution(RID p_env) const = 0;
-	virtual RSE::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const = 0;
+	virtual RS::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const = 0;
 
 	// Tonemap
-	virtual void environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) = 0;
+	virtual void environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) = 0;
 	virtual void environment_set_tonemap_agx_contrast(RID p_env, float p_agx_contrast) = 0;
 
-	virtual RSE::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const = 0;
+	virtual RS::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const = 0;
 	virtual float environment_get_exposure(RID p_env) const = 0;
-	virtual float environment_get_white(RID p_env, bool p_limit_agx_white, float p_output_max_value) const = 0;
+	virtual float environment_get_white(RID p_env, bool p_limit_agx_white) const = 0;
 
 	// Fog
-	virtual void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode = RSE::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL) = 0;
+	virtual void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RS::EnvironmentFogMode p_mode = RS::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL) = 0;
 
 	virtual bool environment_get_fog_enabled(RID p_env) const = 0;
-	virtual RSE::EnvironmentFogMode environment_get_fog_mode(RID p_env) const = 0;
+	virtual RS::EnvironmentFogMode environment_get_fog_mode(RID p_env) const = 0;
 	virtual Color environment_get_fog_light_color(RID p_env) const = 0;
 	virtual float environment_get_fog_light_energy(RID p_env) const = 0;
 	virtual float environment_get_fog_sun_scatter(RID p_env) const = 0;
@@ -238,7 +234,7 @@ public:
 
 	// Glow
 
-	virtual void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) = 0;
+	virtual void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) = 0;
 
 	virtual bool environment_get_glow_enabled(RID p_env) const = 0;
 	virtual Vector<float> environment_get_glow_levels(RID p_env) const = 0;
@@ -246,7 +242,7 @@ public:
 	virtual float environment_get_glow_strength(RID p_env) const = 0;
 	virtual float environment_get_glow_bloom(RID p_env) const = 0;
 	virtual float environment_get_glow_mix(RID p_env) const = 0;
-	virtual RSE::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const = 0;
+	virtual RS::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const = 0;
 	virtual float environment_get_glow_hdr_bleed_threshold(RID p_env) const = 0;
 	virtual float environment_get_glow_hdr_luminance_cap(RID p_env) const = 0;
 	virtual float environment_get_glow_hdr_bleed_scale(RID p_env) const = 0;
@@ -266,7 +262,7 @@ public:
 	virtual float environment_get_ssr_depth_tolerance(RID p_env) const = 0;
 
 	virtual void environment_set_ssr_half_size(bool p_half_size) = 0;
-	virtual void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) = 0;
+	virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) = 0;
 
 	// SSAO
 	virtual void environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_power, float p_detail, float p_horizon, float p_sharpness, float p_light_affect, float p_ao_channel_affect) = 0;
@@ -281,7 +277,7 @@ public:
 	virtual float environment_get_ssao_direct_light_affect(RID p_env) const = 0;
 	virtual float environment_get_ssao_ao_channel_affect(RID p_env) const = 0;
 
-	virtual void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
 	// SSIL
 
@@ -293,10 +289,10 @@ public:
 	virtual float environment_get_ssil_sharpness(RID p_env) const = 0;
 	virtual float environment_get_ssil_normal_rejection(RID p_env) const = 0;
 
-	virtual void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
 	// SDFGI
-	virtual void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) = 0;
+	virtual void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) = 0;
 
 	virtual bool environment_get_sdfgi_enabled(RID p_env) const = 0;
 	virtual int environment_get_sdfgi_cascades(RID p_env) const = 0;
@@ -307,11 +303,11 @@ public:
 	virtual float environment_get_sdfgi_energy(RID p_env) const = 0;
 	virtual float environment_get_sdfgi_normal_bias(RID p_env) const = 0;
 	virtual float environment_get_sdfgi_probe_bias(RID p_env) const = 0;
-	virtual RSE::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const = 0;
+	virtual RS::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const = 0;
 
-	virtual void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) = 0;
-	virtual void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) = 0;
-	virtual void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
+	virtual void environment_set_sdfgi_ray_count(RS::EnvironmentSDFGIRayCount p_ray_count) = 0;
+	virtual void environment_set_sdfgi_frames_to_converge(RS::EnvironmentSDFGIFramesToConverge p_frames) = 0;
+	virtual void environment_set_sdfgi_frames_to_update_light(RS::EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
 
 	virtual void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, bool p_use_1d_color_correction, RID p_color_correction) = 0;
 
@@ -327,11 +323,11 @@ public:
 	virtual bool is_environment(RID p_environment) const = 0;
 
 	virtual void screen_space_roughness_limiter_set_active(bool p_enable, float p_amount, float p_limit) = 0;
-	virtual void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) = 0;
+	virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) = 0;
 	virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) = 0;
 
-	virtual void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
-	virtual void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
+	virtual void positional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) = 0;
+	virtual void directional_soft_shadow_filter_set_quality(RS::ShadowQuality p_quality) = 0;
 
 	/* Render Buffers */
 
@@ -339,23 +335,27 @@ public:
 
 	virtual void gi_set_use_half_resolution(bool p_enable) = 0;
 
-	virtual void set_debug_draw_mode(RSE::ViewportDebugDraw p_debug_draw) = 0;
+	virtual void set_debug_draw_mode(RS::ViewportDebugDraw p_debug_draw) = 0;
 
 	virtual TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) = 0;
-	virtual void voxel_gi_set_quality(RSE::VoxelGIQuality) = 0;
+	virtual void voxel_gi_set_quality(RS::VoxelGIQuality) = 0;
 
 	virtual void sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) = 0;
 
-	virtual void render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas, float p_window_output_max_value) = 0;
+	virtual void render_empty_scene(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_scenario, RID p_shadow_atlas) = 0;
 
-	virtual void render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, float p_window_output_max_value, RenderingServerTypes::RenderInfo *r_render_info = nullptr) = 0;
+	struct RenderInfo {
+		int info[RS::VIEWPORT_RENDER_INFO_TYPE_MAX][RS::VIEWPORT_RENDER_INFO_MAX] = {};
+	};
+
+	virtual void render_camera(const Ref<RenderSceneBuffers> &p_render_buffers, RID p_camera, RID p_scenario, RID p_viewport, Size2 p_viewport_size, uint32_t p_jitter_phase_count, float p_mesh_lod_threshold, RID p_shadow_atlas, Ref<XRInterface> &p_xr_interface, RenderInfo *r_render_info = nullptr) = 0;
 
 	virtual void update() = 0;
 	virtual void render_probes() = 0;
 	virtual void update_visibility_notifiers() = 0;
 
-	virtual void decals_set_filter(RSE::DecalFilter p_filter) = 0;
-	virtual void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) = 0;
+	virtual void decals_set_filter(RS::DecalFilter p_filter) = 0;
+	virtual void light_projectors_set_filter(RS::LightProjectorFilter p_filter) = 0;
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) = 0;
 	virtual void material_set_use_debanding(bool p_enable) = 0;
 
diff --git a/engine/servers/rendering/rendering_server.compat.inc b/engine/servers/rendering/rendering_server.compat.inc
index bbe5a7d9..b3ccaa2d 100644
--- a/engine/servers/rendering/rendering_server.compat.inc
+++ b/engine/servers/rendering/rendering_server.compat.inc
@@ -30,16 +30,12 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "rendering_server.h"
-
-#include "core/object/class_db.h"
-
-void RenderingServer::_multimesh_allocate_data_bind_compat_99455(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data) {
+void RenderingServer::_multimesh_allocate_data_bind_compat_99455(RID p_multimesh, int p_instances, MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data) {
 	multimesh_allocate_data(p_multimesh, p_instances, p_transform_format, p_use_colors, p_use_custom_data, false);
 }
 
 void RenderingServer::_environment_set_fog_bind_compat_84792(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect) {
-	environment_set_fog(p_env, p_enable, p_light_color, p_light_energy, p_sun_scatter, p_density, p_height, p_height_density, p_aerial_perspective, p_sky_affect, RSE::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL);
+	environment_set_fog(p_env, p_enable, p_light_color, p_light_energy, p_sun_scatter, p_density, p_height, p_height_density, p_aerial_perspective, p_sky_affect, RS::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL);
 }
 
 void RenderingServer::_canvas_item_add_multiline_bind_compat_84523(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width) {
@@ -62,14 +58,6 @@ void RenderingServer::_instance_reset_physics_interpolation_bind_compat_104269(R
 	WARN_PRINT_ONCE("instance_reset_physics_interpolation() is deprecated.");
 }
 
-void RenderingServer::_viewport_set_size_compat_115799(RID p_viewport, int p_width, int p_height) {
-	viewport_set_size(p_viewport, p_width, p_height, 1);
-}
-
-void RenderingServer::_particles_request_process_time_bind_compat_109142(RID p_particles, real_t p_request_process_time) {
-	particles_request_process_time(p_particles, p_request_process_time, 0.0);
-}
-
 void RenderingServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("multimesh_allocate_data", "multimesh", "instances", "transform_format", "color_format", "custom_data_format"), &RenderingServer::_multimesh_allocate_data_bind_compat_99455, DEFVAL(false), DEFVAL(false));
 	ClassDB::bind_compatibility_method(D_METHOD("environment_set_fog", "env", "enable", "light_color", "light_energy", "sun_scatter", "density", "height", "height_density", "aerial_perspective", "sky_affect"), &RenderingServer::_environment_set_fog_bind_compat_84792);
@@ -78,8 +66,6 @@ void RenderingServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("canvas_item_add_circle", "item", "pos", "radius", "color"), &RenderingServer::_canvas_item_add_circle_bind_compat_84523);
 	ClassDB::bind_compatibility_method(D_METHOD("instance_set_interpolated", "instance", "interpolated"), &RenderingServer::_instance_set_interpolated_bind_compat_104269);
 	ClassDB::bind_compatibility_method(D_METHOD("instance_reset_physics_interpolation", "instance"), &RenderingServer::_instance_reset_physics_interpolation_bind_compat_104269);
-	ClassDB::bind_compatibility_method(D_METHOD("viewport_set_size", "viewport", "width", "height"), &RenderingServer::_viewport_set_size_compat_115799);
-	ClassDB::bind_compatibility_method(D_METHOD("particles_request_process_time", "particles", "process_time"), &RenderingServer::_particles_request_process_time_bind_compat_109142);
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/servers/rendering/rendering_server.cpp b/engine/servers/rendering/rendering_server.cpp
index 63952784..1a7ff9d2 100644
--- a/engine/servers/rendering/rendering_server.cpp
+++ b/engine/servers/rendering/rendering_server.cpp
@@ -32,12 +32,7 @@
 #include "rendering_server.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/math/geometry_3d.h"
-#include "core/object/class_db.h"
-#include "core/os/os.h"
 #include "core/variant/typed_array.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/shader_warnings.h"
 
@@ -59,10 +54,10 @@ RenderingServer *RenderingServer::create() {
 }
 
 Array RenderingServer::_texture_debug_usage_bind() {
-	List<RenderingServerTypes::TextureInfo> list;
+	List<TextureInfo> list;
 	texture_debug_usage(&list);
 	Array arr;
-	for (const RenderingServerTypes::TextureInfo &E : list) {
+	for (const TextureInfo &E : list) {
 		Dictionary dict;
 		dict["texture"] = E.texture;
 		dict["width"] = E.width;
@@ -168,13 +163,13 @@ RID RenderingServer::_make_test_cube() {
 	Vector<float> tangents;
 	Vector<Vector3> uvs;
 
-#define ADD_VTX(m_idx) \
-	vertices.push_back(face_points[m_idx]); \
-	normals.push_back(normal_points[m_idx]); \
+#define ADD_VTX(m_idx)                           \
+	vertices.push_back(face_points[m_idx]);      \
+	normals.push_back(normal_points[m_idx]);     \
 	tangents.push_back(normal_points[m_idx][1]); \
 	tangents.push_back(normal_points[m_idx][2]); \
 	tangents.push_back(normal_points[m_idx][0]); \
-	tangents.push_back(1.0); \
+	tangents.push_back(1.0);                     \
 	uvs.push_back(Vector3(uv_points[m_idx * 2 + 0], uv_points[m_idx * 2 + 1], 0));
 
 	for (int i = 0; i < 6; i++) {
@@ -212,20 +207,20 @@ RID RenderingServer::_make_test_cube() {
 	RID test_cube = mesh_create();
 
 	Array d;
-	d.resize(RSE::ARRAY_MAX);
-	d[RSE::ARRAY_NORMAL] = normals;
-	d[RSE::ARRAY_TANGENT] = tangents;
-	d[RSE::ARRAY_TEX_UV] = uvs;
-	d[RSE::ARRAY_VERTEX] = vertices;
+	d.resize(RS::ARRAY_MAX);
+	d[RenderingServer::ARRAY_NORMAL] = normals;
+	d[RenderingServer::ARRAY_TANGENT] = tangents;
+	d[RenderingServer::ARRAY_TEX_UV] = uvs;
+	d[RenderingServer::ARRAY_VERTEX] = vertices;
 
 	Vector<int> indices;
 	indices.resize(vertices.size());
 	for (int i = 0; i < vertices.size(); i++) {
 		indices.set(i, i);
 	}
-	d[RSE::ARRAY_INDEX] = indices;
+	d[RenderingServer::ARRAY_INDEX] = indices;
 
-	mesh_add_surface_from_arrays(test_cube, RSE::PRIMITIVE_TRIANGLES, d);
+	mesh_add_surface_from_arrays(test_cube, PRIMITIVE_TRIANGLES, d);
 
 	/*
 	test_material = fixed_material_create();
@@ -273,7 +268,7 @@ RID RenderingServer::make_sphere_mesh(int p_lats, int p_lons, real_t p_radius) {
 				Vector3(x0 * zr0, z0, y0 * zr0)
 			};
 
-#define ADD_POINT(m_idx) \
+#define ADD_POINT(m_idx)         \
 	normals.push_back(v[m_idx]); \
 	vertices.push_back(v[m_idx] * p_radius);
 
@@ -289,12 +284,12 @@ RID RenderingServer::make_sphere_mesh(int p_lats, int p_lons, real_t p_radius) {
 
 	RID mesh = mesh_create();
 	Array d;
-	d.resize(RSE::ARRAY_MAX);
+	d.resize(RS::ARRAY_MAX);
 
-	d[RSE::ARRAY_VERTEX] = vertices;
-	d[RSE::ARRAY_NORMAL] = normals;
+	d[ARRAY_VERTEX] = vertices;
+	d[ARRAY_NORMAL] = normals;
 
-	mesh_add_surface_from_arrays(mesh, RSE::PRIMITIVE_TRIANGLES, d);
+	mesh_add_surface_from_arrays(mesh, PRIMITIVE_TRIANGLES, d);
 
 	return mesh;
 }
@@ -379,16 +374,16 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 	int max_bone = 0;
 
 	// Preprocess UVs if compression is enabled
-	if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES && ((p_format & RSE::ARRAY_FORMAT_TEX_UV) || (p_format & RSE::ARRAY_FORMAT_TEX_UV2))) {
+	if (p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES && ((p_format & RS::ARRAY_FORMAT_TEX_UV) || (p_format & RS::ARRAY_FORMAT_TEX_UV2))) {
 		const Vector2 *uv_src = nullptr;
-		if (p_format & RSE::ARRAY_FORMAT_TEX_UV) {
-			Vector<Vector2> array = p_arrays[RSE::ARRAY_TEX_UV];
+		if (p_format & RS::ARRAY_FORMAT_TEX_UV) {
+			Vector<Vector2> array = p_arrays[RS::ARRAY_TEX_UV];
 			uv_src = array.ptr();
 		}
 
 		const Vector2 *uv2_src = nullptr;
-		if (p_format & RSE::ARRAY_FORMAT_TEX_UV2) {
-			Vector<Vector2> array = p_arrays[RSE::ARRAY_TEX_UV2];
+		if (p_format & RS::ARRAY_FORMAT_TEX_UV2) {
+			Vector<Vector2> array = p_arrays[RS::ARRAY_TEX_UV2];
 			uv2_src = array.ptr();
 		}
 
@@ -398,11 +393,11 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 		Vector2 min_val2 = Vector2(0.0, 0.0);
 
 		for (int i = 0; i < p_vertex_array_len; i++) {
-			if (p_format & RSE::ARRAY_FORMAT_TEX_UV) {
+			if (p_format & RS::ARRAY_FORMAT_TEX_UV) {
 				max_val = max_val.max(uv_src[i]);
 				min_val = min_val.min(uv_src[i]);
 			}
-			if (p_format & RSE::ARRAY_FORMAT_TEX_UV2) {
+			if (p_format & RS::ARRAY_FORMAT_TEX_UV2) {
 				max_val2 = max_val2.max(uv2_src[i]);
 				min_val2 = min_val2.min(uv2_src[i]);
 			}
@@ -421,14 +416,14 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 		}
 	}
 
-	for (int ai = 0; ai < RSE::ARRAY_MAX; ai++) {
+	for (int ai = 0; ai < RS::ARRAY_MAX; ai++) {
 		if (!(p_format & (1ULL << ai))) { // No array
 			continue;
 		}
 
 		switch (ai) {
-			case RSE::ARRAY_VERTEX: {
-				if (p_format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+			case RS::ARRAY_VERTEX: {
+				if (p_format & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 					Vector<Vector2> array = p_arrays[ai];
 					ERR_FAIL_COND_V(array.size() != p_vertex_array_len, ERR_INVALID_PARAMETER);
 
@@ -462,8 +457,8 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 					r_aabb = _compute_aabb_from_points(src, p_vertex_array_len);
 					r_aabb.size = r_aabb.size.max(SMALL_VEC3);
 
-					if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
-						if (!(p_format & RSE::ARRAY_FORMAT_NORMAL)) {
+					if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+						if (!(p_format & RS::ARRAY_FORMAT_NORMAL)) {
 							// Early out if we are only setting vertex positions.
 							for (int i = 0; i < p_vertex_array_len; i++) {
 								Vector3 pos = (src[i] - r_aabb.position) / r_aabb.size;
@@ -480,18 +475,18 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 						}
 
 						// Validate normal and tangent arrays.
-						ERR_FAIL_COND_V(p_arrays[RSE::ARRAY_NORMAL].get_type() != Variant::PACKED_VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
+						ERR_FAIL_COND_V(p_arrays[RS::ARRAY_NORMAL].get_type() != Variant::PACKED_VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
 
-						Vector<Vector3> normal_array = p_arrays[RSE::ARRAY_NORMAL];
+						Vector<Vector3> normal_array = p_arrays[RS::ARRAY_NORMAL];
 						ERR_FAIL_COND_V(normal_array.size() != p_vertex_array_len, ERR_INVALID_PARAMETER);
 						const Vector3 *normal_src = normal_array.ptr();
 
-						Variant::Type tangent_type = p_arrays[RSE::ARRAY_TANGENT].get_type();
+						Variant::Type tangent_type = p_arrays[RS::ARRAY_TANGENT].get_type();
 						ERR_FAIL_COND_V(tangent_type != Variant::PACKED_FLOAT32_ARRAY && tangent_type != Variant::PACKED_FLOAT64_ARRAY && tangent_type != Variant::NIL, ERR_INVALID_PARAMETER);
 
 						// We need a different version if using double precision tangents.
 						if (tangent_type == Variant::PACKED_FLOAT32_ARRAY) {
-							Vector<float> tangent_array = p_arrays[RSE::ARRAY_TANGENT];
+							Vector<float> tangent_array = p_arrays[RS::ARRAY_TANGENT];
 							ERR_FAIL_COND_V(tangent_array.size() != p_vertex_array_len * 4, ERR_INVALID_PARAMETER);
 							const float *tangent_src = tangent_array.ptr();
 
@@ -510,7 +505,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 										(uint16_t)CLAMP(res.y * 65535, 0, 65535),
 									};
 
-									memcpy(&vw[p_offsets[RSE::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
+									memcpy(&vw[p_offsets[RS::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
 								}
 
 								// Store vertex position + angle.
@@ -527,7 +522,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 								}
 							}
 						} else if (tangent_type == Variant::PACKED_FLOAT64_ARRAY) {
-							Vector<double> tangent_array = p_arrays[RSE::ARRAY_TANGENT];
+							Vector<double> tangent_array = p_arrays[RS::ARRAY_TANGENT];
 							ERR_FAIL_COND_V(tangent_array.size() != p_vertex_array_len * 4, ERR_INVALID_PARAMETER);
 							const double *tangent_src = tangent_array.ptr();
 
@@ -546,7 +541,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 										(uint16_t)CLAMP(res.y * 65535, 0, 65535),
 									};
 
-									memcpy(&vw[p_offsets[RSE::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
+									memcpy(&vw[p_offsets[RS::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
 								}
 
 								// Store vertex position + angle.
@@ -581,7 +576,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 										(uint16_t)CLAMP(res.y * 65535, 0, 65535),
 									};
 
-									memcpy(&vw[p_offsets[RSE::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
+									memcpy(&vw[p_offsets[RS::ARRAY_NORMAL] + i * p_normal_stride], vector, 4);
 								}
 
 								// Store vertex position + angle.
@@ -608,9 +603,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 				}
 
 			} break;
-			case RSE::ARRAY_NORMAL: {
+			case RS::ARRAY_NORMAL: {
 				// If using compression we store normal while storing vertices.
-				if (!(p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+				if (!(p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 					ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
 
 					Vector<Vector3> array = p_arrays[ai];
@@ -629,9 +624,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 				}
 			} break;
 
-			case RSE::ARRAY_TANGENT: {
+			case RS::ARRAY_TANGENT: {
 				// If using compression we store tangent while storing vertices.
-				if (!(p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+				if (!(p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 					Variant::Type type = p_arrays[ai].get_type();
 					ERR_FAIL_COND_V(type != Variant::PACKED_FLOAT32_ARRAY && type != Variant::PACKED_FLOAT64_ARRAY && type != Variant::NIL, ERR_INVALID_PARAMETER);
 
@@ -678,9 +673,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 							memcpy(&vw[p_offsets[ai] + i * p_normal_stride], vector, 4);
 						}
 					} else { // No tangent array.
-						ERR_FAIL_COND_V(p_arrays[RSE::ARRAY_NORMAL].get_type() != Variant::PACKED_VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
+						ERR_FAIL_COND_V(p_arrays[RS::ARRAY_NORMAL].get_type() != Variant::PACKED_VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
 
-						Vector<Vector3> normal_array = p_arrays[RSE::ARRAY_NORMAL];
+						Vector<Vector3> normal_array = p_arrays[RS::ARRAY_NORMAL];
 						ERR_FAIL_COND_V(normal_array.size() != p_vertex_array_len, ERR_INVALID_PARAMETER);
 						const Vector3 *normal_src = normal_array.ptr();
 						// Set data for tangent.
@@ -705,7 +700,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 					}
 				}
 			} break;
-			case RSE::ARRAY_COLOR: {
+			case RS::ARRAY_COLOR: {
 				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_COLOR_ARRAY, ERR_INVALID_PARAMETER);
 
 				Vector<Color> array = p_arrays[ai];
@@ -723,7 +718,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 					memcpy(&aw[p_offsets[ai] + i * p_attrib_stride], color8, 4);
 				}
 			} break;
-			case RSE::ARRAY_TEX_UV: {
+			case RS::ARRAY_TEX_UV: {
 				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_VECTOR3_ARRAY && p_arrays[ai].get_type() != Variant::PACKED_VECTOR2_ARRAY, ERR_INVALID_PARAMETER);
 
 				Vector<Vector2> array = p_arrays[ai];
@@ -731,7 +726,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 				ERR_FAIL_COND_V(array.size() != p_vertex_array_len, ERR_INVALID_PARAMETER);
 
 				const Vector2 *src = array.ptr();
-				if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					for (int i = 0; i < p_vertex_array_len; i++) {
 						Vector2 vec = src[i];
 						if (!r_uv_scale.is_zero_approx()) {
@@ -750,7 +745,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 				}
 			} break;
 
-			case RSE::ARRAY_TEX_UV2: {
+			case RS::ARRAY_TEX_UV2: {
 				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_VECTOR3_ARRAY && p_arrays[ai].get_type() != Variant::PACKED_VECTOR2_ARRAY, ERR_INVALID_PARAMETER);
 
 				Vector<Vector2> array = p_arrays[ai];
@@ -759,7 +754,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 
 				const Vector2 *src = array.ptr();
 
-				if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					for (int i = 0; i < p_vertex_array_len; i++) {
 						Vector2 vec = src[i];
 						if (!r_uv_scale.is_zero_approx()) {
@@ -776,15 +771,15 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 					}
 				}
 			} break;
-			case RSE::ARRAY_CUSTOM0:
-			case RSE::ARRAY_CUSTOM1:
-			case RSE::ARRAY_CUSTOM2:
-			case RSE::ARRAY_CUSTOM3: {
-				uint32_t type = (p_format >> (RSE::ARRAY_FORMAT_CUSTOM_BASE + RSE::ARRAY_FORMAT_CUSTOM_BITS * (ai - RSE::ARRAY_CUSTOM0))) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
+			case RS::ARRAY_CUSTOM0:
+			case RS::ARRAY_CUSTOM1:
+			case RS::ARRAY_CUSTOM2:
+			case RS::ARRAY_CUSTOM3: {
+				uint32_t type = (p_format >> (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * (ai - RS::ARRAY_CUSTOM0))) & ARRAY_FORMAT_CUSTOM_MASK;
 				switch (type) {
-					case RSE::ARRAY_CUSTOM_RGBA8_UNORM:
-					case RSE::ARRAY_CUSTOM_RGBA8_SNORM:
-					case RSE::ARRAY_CUSTOM_RG_HALF: {
+					case ARRAY_CUSTOM_RGBA8_UNORM:
+					case ARRAY_CUSTOM_RGBA8_SNORM:
+					case ARRAY_CUSTOM_RG_HALF: {
 						// Size 4
 						ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_BYTE_ARRAY, ERR_INVALID_PARAMETER);
 
@@ -799,7 +794,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 						}
 
 					} break;
-					case RSE::ARRAY_CUSTOM_RGBA_HALF: {
+					case ARRAY_CUSTOM_RGBA_HALF: {
 						// Size 8
 						ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_BYTE_ARRAY, ERR_INVALID_PARAMETER);
 
@@ -813,15 +808,15 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 							memcpy(&aw[p_offsets[ai] + i * p_attrib_stride], &src[i * 8], 8);
 						}
 					} break;
-					case RSE::ARRAY_CUSTOM_R_FLOAT:
-					case RSE::ARRAY_CUSTOM_RG_FLOAT:
-					case RSE::ARRAY_CUSTOM_RGB_FLOAT:
-					case RSE::ARRAY_CUSTOM_RGBA_FLOAT: {
+					case ARRAY_CUSTOM_R_FLOAT:
+					case ARRAY_CUSTOM_RG_FLOAT:
+					case ARRAY_CUSTOM_RGB_FLOAT:
+					case ARRAY_CUSTOM_RGBA_FLOAT: {
 						// RF
 						ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_FLOAT32_ARRAY, ERR_INVALID_PARAMETER);
 
 						Vector<float> array = p_arrays[ai];
-						int32_t s = type - RSE::ARRAY_CUSTOM_R_FLOAT + 1;
+						int32_t s = type - ARRAY_CUSTOM_R_FLOAT + 1;
 
 						ERR_FAIL_COND_V(array.size() != p_vertex_array_len * s, ERR_INVALID_PARAMETER);
 
@@ -836,10 +831,10 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 				}
 
 			} break;
-			case RSE::ARRAY_WEIGHTS: {
+			case RS::ARRAY_WEIGHTS: {
 				Variant::Type type = p_arrays[ai].get_type();
 				ERR_FAIL_COND_V(type != Variant::PACKED_FLOAT32_ARRAY && type != Variant::PACKED_FLOAT64_ARRAY, ERR_INVALID_PARAMETER);
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 				if (type == Variant::PACKED_FLOAT32_ARRAY) {
 					Vector<float> array = p_arrays[ai];
 					ERR_FAIL_COND_V(array.size() != (int32_t)(p_vertex_array_len * bone_count), ERR_INVALID_PARAMETER);
@@ -870,12 +865,12 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 					}
 				}
 			} break;
-			case RSE::ARRAY_BONES: {
+			case RS::ARRAY_BONES: {
 				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_INT32_ARRAY && p_arrays[ai].get_type() != Variant::PACKED_FLOAT32_ARRAY, ERR_INVALID_PARAMETER);
 
 				Vector<int> array = p_arrays[ai];
 
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 
 				ERR_FAIL_COND_V(array.size() != (int32_t)(p_vertex_array_len * bone_count), ERR_INVALID_PARAMETER);
 
@@ -894,7 +889,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 
 			} break;
 
-			case RSE::ARRAY_INDEX: {
+			case RS::ARRAY_INDEX: {
 				ERR_FAIL_NULL_V(iw, ERR_INVALID_DATA);
 				ERR_FAIL_COND_V(p_index_array_len <= 0, ERR_INVALID_DATA);
 				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::PACKED_INT32_ARRAY, ERR_INVALID_PARAMETER);
@@ -925,7 +920,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 		}
 	}
 
-	if (p_format & RSE::ARRAY_FORMAT_BONES) {
+	if (p_format & RS::ARRAY_FORMAT_BONES) {
 		// Create AABBs for each detected bone.
 		int total_bones = max_bone + 1;
 
@@ -933,7 +928,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 
 		r_bone_aabb.resize(total_bones);
 
-		int weight_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+		int weight_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 
 		if (first) {
 			for (int i = 0; i < total_bones; i++) {
@@ -941,9 +936,9 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 			}
 		}
 
-		Vector<Vector3> vertices = p_arrays[RSE::ARRAY_VERTEX];
-		Vector<int> bones = p_arrays[RSE::ARRAY_BONES];
-		Vector<float> weights = p_arrays[RSE::ARRAY_WEIGHTS];
+		Vector<Vector3> vertices = p_arrays[RS::ARRAY_VERTEX];
+		Vector<int> bones = p_arrays[RS::ARRAY_BONES];
+		Vector<float> weights = p_arrays[RS::ARRAY_WEIGHTS];
 
 		bool any_valid = false;
 
@@ -983,10 +978,10 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 	return OK;
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_offset(BitField<RSE::ArrayFormat> p_format, int p_vertex_len, int p_array_index) const {
-	ERR_FAIL_INDEX_V(p_array_index, RSE::ARRAY_MAX, 0);
-	p_format = uint64_t(p_format) & ~RSE::ARRAY_FORMAT_INDEX;
-	uint32_t offsets[RSE::ARRAY_MAX];
+uint32_t RenderingServer::mesh_surface_get_format_offset(BitField<ArrayFormat> p_format, int p_vertex_len, int p_array_index) const {
+	ERR_FAIL_INDEX_V(p_array_index, ARRAY_MAX, 0);
+	p_format = uint64_t(p_format) & ~ARRAY_FORMAT_INDEX;
+	uint32_t offsets[ARRAY_MAX];
 	uint32_t vstr;
 	uint32_t ntstr;
 	uint32_t astr;
@@ -995,9 +990,9 @@ uint32_t RenderingServer::mesh_surface_get_format_offset(BitField<RSE::ArrayForm
 	return offsets[p_array_index];
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_vertex_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const {
-	p_format = uint64_t(p_format) & ~RSE::ARRAY_FORMAT_INDEX;
-	uint32_t offsets[RSE::ARRAY_MAX];
+uint32_t RenderingServer::mesh_surface_get_format_vertex_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const {
+	p_format = uint64_t(p_format) & ~ARRAY_FORMAT_INDEX;
+	uint32_t offsets[ARRAY_MAX];
 	uint32_t vstr;
 	uint32_t ntstr;
 	uint32_t astr;
@@ -1006,9 +1001,9 @@ uint32_t RenderingServer::mesh_surface_get_format_vertex_stride(BitField<RSE::Ar
 	return vstr;
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_normal_tangent_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const {
-	p_format = uint64_t(p_format) & ~RSE::ARRAY_FORMAT_INDEX;
-	uint32_t offsets[RSE::ARRAY_MAX];
+uint32_t RenderingServer::mesh_surface_get_format_normal_tangent_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const {
+	p_format = uint64_t(p_format) & ~ARRAY_FORMAT_INDEX;
+	uint32_t offsets[ARRAY_MAX];
 	uint32_t vstr;
 	uint32_t ntstr;
 	uint32_t astr;
@@ -1017,9 +1012,9 @@ uint32_t RenderingServer::mesh_surface_get_format_normal_tangent_stride(BitField
 	return ntstr;
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_attribute_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const {
-	p_format = uint64_t(p_format) & ~RSE::ARRAY_FORMAT_INDEX;
-	uint32_t offsets[RSE::ARRAY_MAX];
+uint32_t RenderingServer::mesh_surface_get_format_attribute_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const {
+	p_format = uint64_t(p_format) & ~ARRAY_FORMAT_INDEX;
+	uint32_t offsets[ARRAY_MAX];
 	uint32_t vstr;
 	uint32_t ntstr;
 	uint32_t astr;
@@ -1028,9 +1023,9 @@ uint32_t RenderingServer::mesh_surface_get_format_attribute_stride(BitField<RSE:
 	return astr;
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_skin_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const {
-	p_format = uint64_t(p_format) & ~RSE::ARRAY_FORMAT_INDEX;
-	uint32_t offsets[RSE::ARRAY_MAX];
+uint32_t RenderingServer::mesh_surface_get_format_skin_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const {
+	p_format = uint64_t(p_format) & ~ARRAY_FORMAT_INDEX;
+	uint32_t offsets[ARRAY_MAX];
 	uint32_t vstr;
 	uint32_t ntstr;
 	uint32_t astr;
@@ -1039,8 +1034,8 @@ uint32_t RenderingServer::mesh_surface_get_format_skin_stride(BitField<RSE::Arra
 	return sstr;
 }
 
-uint32_t RenderingServer::mesh_surface_get_format_index_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const {
-	if (!(p_format & RSE::ARRAY_FORMAT_INDEX)) {
+uint32_t RenderingServer::mesh_surface_get_format_index_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const {
+	if (!(p_format & ARRAY_FORMAT_INDEX)) {
 		return 0;
 	}
 
@@ -1060,16 +1055,16 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint64_t p_format, i
 
 	uint32_t *size_accum = nullptr;
 
-	for (int i = 0; i < RSE::ARRAY_MAX; i++) {
+	for (int i = 0; i < RS::ARRAY_MAX; i++) {
 		r_offsets[i] = 0; // Reset
 
-		if (i == RSE::ARRAY_VERTEX) {
+		if (i == RS::ARRAY_VERTEX) {
 			size_accum = &r_vertex_element_size;
-		} else if (i == RSE::ARRAY_NORMAL) {
+		} else if (i == RS::ARRAY_NORMAL) {
 			size_accum = &r_normal_element_size;
-		} else if (i == RSE::ARRAY_COLOR) {
+		} else if (i == RS::ARRAY_COLOR) {
 			size_accum = &r_attrib_element_size;
-		} else if (i == RSE::ARRAY_BONES) {
+		} else if (i == RS::ARRAY_BONES) {
 			size_accum = &r_skin_element_size;
 		}
 
@@ -1080,72 +1075,72 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint64_t p_format, i
 		int elem_size = 0;
 
 		switch (i) {
-			case RSE::ARRAY_VERTEX: {
-				if (p_format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+			case RS::ARRAY_VERTEX: {
+				if (p_format & ARRAY_FLAG_USE_2D_VERTICES) {
 					elem_size = 2;
 				} else {
-					elem_size = (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 2 : 3;
+					elem_size = (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 2 : 3;
 				}
 
 				elem_size *= sizeof(float);
 			} break;
-			case RSE::ARRAY_NORMAL: {
+			case RS::ARRAY_NORMAL: {
 				elem_size = 4;
 			} break;
-			case RSE::ARRAY_TANGENT: {
-				elem_size = (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 0 : 4;
+			case RS::ARRAY_TANGENT: {
+				elem_size = (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 0 : 4;
 			} break;
-			case RSE::ARRAY_COLOR: {
+			case RS::ARRAY_COLOR: {
 				elem_size = 4;
 			} break;
-			case RSE::ARRAY_TEX_UV: {
-				elem_size = (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 4 : 8;
+			case RS::ARRAY_TEX_UV: {
+				elem_size = (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 4 : 8;
 			} break;
-			case RSE::ARRAY_TEX_UV2: {
-				elem_size = (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 4 : 8;
+			case RS::ARRAY_TEX_UV2: {
+				elem_size = (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) ? 4 : 8;
 			} break;
-			case RSE::ARRAY_CUSTOM0:
-			case RSE::ARRAY_CUSTOM1:
-			case RSE::ARRAY_CUSTOM2:
-			case RSE::ARRAY_CUSTOM3: {
-				uint64_t format = (p_format >> (RSE::ARRAY_FORMAT_CUSTOM_BASE + (RSE::ARRAY_FORMAT_CUSTOM_BITS * (i - RSE::ARRAY_CUSTOM0)))) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
+			case RS::ARRAY_CUSTOM0:
+			case RS::ARRAY_CUSTOM1:
+			case RS::ARRAY_CUSTOM2:
+			case RS::ARRAY_CUSTOM3: {
+				uint64_t format = (p_format >> (ARRAY_FORMAT_CUSTOM_BASE + (ARRAY_FORMAT_CUSTOM_BITS * (i - ARRAY_CUSTOM0)))) & ARRAY_FORMAT_CUSTOM_MASK;
 				switch (format) {
-					case RSE::ARRAY_CUSTOM_RGBA8_UNORM: {
+					case ARRAY_CUSTOM_RGBA8_UNORM: {
 						elem_size = 4;
 					} break;
-					case RSE::ARRAY_CUSTOM_RGBA8_SNORM: {
+					case ARRAY_CUSTOM_RGBA8_SNORM: {
 						elem_size = 4;
 					} break;
-					case RSE::ARRAY_CUSTOM_RG_HALF: {
+					case ARRAY_CUSTOM_RG_HALF: {
 						elem_size = 4;
 					} break;
-					case RSE::ARRAY_CUSTOM_RGBA_HALF: {
+					case ARRAY_CUSTOM_RGBA_HALF: {
 						elem_size = 8;
 					} break;
-					case RSE::ARRAY_CUSTOM_R_FLOAT: {
+					case ARRAY_CUSTOM_R_FLOAT: {
 						elem_size = 4;
 					} break;
-					case RSE::ARRAY_CUSTOM_RG_FLOAT: {
+					case ARRAY_CUSTOM_RG_FLOAT: {
 						elem_size = 8;
 					} break;
-					case RSE::ARRAY_CUSTOM_RGB_FLOAT: {
+					case ARRAY_CUSTOM_RGB_FLOAT: {
 						elem_size = 12;
 					} break;
-					case RSE::ARRAY_CUSTOM_RGBA_FLOAT: {
+					case ARRAY_CUSTOM_RGBA_FLOAT: {
 						elem_size = 16;
 					} break;
 				}
 			} break;
-			case RSE::ARRAY_WEIGHTS: {
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+			case RS::ARRAY_WEIGHTS: {
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 				elem_size = sizeof(uint16_t) * bone_count;
 
 			} break;
-			case RSE::ARRAY_BONES: {
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+			case RS::ARRAY_BONES: {
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 				elem_size = sizeof(uint16_t) * bone_count;
 			} break;
-			case RSE::ARRAY_INDEX: {
+			case RS::ARRAY_INDEX: {
 				if (p_index_len <= 0) {
 					ERR_PRINT("index_array_len==NO_INDEX_ARRAY");
 					break;
@@ -1166,7 +1161,7 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint64_t p_format, i
 
 		if (size_accum != nullptr) {
 			r_offsets[i] = (*size_accum);
-			if (i == RSE::ARRAY_NORMAL || i == RSE::ARRAY_TANGENT) {
+			if (i == RS::ARRAY_NORMAL || i == RS::ARRAY_TANGENT) {
 				r_offsets[i] += r_vertex_element_size * p_vertex_len;
 			}
 			(*size_accum) += elem_size;
@@ -1176,9 +1171,9 @@ void RenderingServer::mesh_surface_make_offsets_from_format(uint64_t p_format, i
 	}
 }
 
-Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes::SurfaceData *r_surface_data, RSE::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, const Dictionary &p_lods, uint64_t p_compress_format) {
-	ERR_FAIL_INDEX_V(p_primitive, RSE::PRIMITIVE_MAX, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_arrays.size() != RSE::ARRAY_MAX, ERR_INVALID_PARAMETER);
+Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surface_data, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, const Dictionary &p_lods, uint64_t p_compress_format) {
+	ERR_FAIL_INDEX_V(p_primitive, RS::PRIMITIVE_MAX, ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V(p_arrays.size() != RS::ARRAY_MAX, ERR_INVALID_PARAMETER);
 
 	uint64_t format = 0;
 
@@ -1193,15 +1188,15 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 
 		format |= (1ULL << i);
 
-		if (i == RSE::ARRAY_VERTEX) {
+		if (i == RS::ARRAY_VERTEX) {
 			switch (p_arrays[i].get_type()) {
 				case Variant::PACKED_VECTOR2_ARRAY: {
 					Vector<Vector2> v2 = p_arrays[i];
 					array_len = v2.size();
-					format |= RSE::ARRAY_FLAG_USE_2D_VERTICES;
+					format |= ARRAY_FLAG_USE_2D_VERTICES;
 				} break;
 				case Variant::PACKED_VECTOR3_ARRAY: {
-					ERR_FAIL_COND_V(p_compress_format & RSE::ARRAY_FLAG_USE_2D_VERTICES, ERR_INVALID_PARAMETER);
+					ERR_FAIL_COND_V(p_compress_format & ARRAY_FLAG_USE_2D_VERTICES, ERR_INVALID_PARAMETER);
 					Vector<Vector3> v3 = p_arrays[i];
 					array_len = v3.size();
 				} break;
@@ -1210,27 +1205,27 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 				} break;
 			}
 			ERR_FAIL_COND_V(array_len == 0, ERR_INVALID_DATA);
-		} else if (i == RSE::ARRAY_NORMAL) {
-			if (p_arrays[RSE::ARRAY_TANGENT].get_type() == Variant::NIL) {
+		} else if (i == RS::ARRAY_NORMAL) {
+			if (p_arrays[RS::ARRAY_TANGENT].get_type() == Variant::NIL) {
 				// We must use tangents if using normals.
-				format |= (1ULL << RSE::ARRAY_TANGENT);
+				format |= (1ULL << RS::ARRAY_TANGENT);
 			}
-		} else if (i == RSE::ARRAY_BONES) {
+		} else if (i == RS::ARRAY_BONES) {
 			switch (p_arrays[i].get_type()) {
 				case Variant::PACKED_INT32_ARRAY: {
-					Vector<Vector3> vertices = p_arrays[RSE::ARRAY_VERTEX];
+					Vector<Vector3> vertices = p_arrays[RS::ARRAY_VERTEX];
 					Vector<int32_t> bones = p_arrays[i];
-					int32_t bone_8_group_count = bones.size() / (RSE::ARRAY_WEIGHTS_SIZE * 2);
+					int32_t bone_8_group_count = bones.size() / (ARRAY_WEIGHTS_SIZE * 2);
 					int32_t vertex_count = vertices.size();
 					if (vertex_count == bone_8_group_count) {
-						format |= RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
+						format |= RS::ARRAY_FLAG_USE_8_BONE_WEIGHTS;
 					}
 				} break;
 				default: {
 					ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Bones array must be a PackedInt32Array.");
 				} break;
 			}
-		} else if (i == RSE::ARRAY_INDEX) {
+		} else if (i == RS::ARRAY_INDEX) {
 			index_array_len = PackedInt32Array(p_arrays[i]).size();
 		}
 	}
@@ -1245,54 +1240,54 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 					bsformat |= (1 << j);
 				}
 			}
-			if (bsformat & RSE::ARRAY_FORMAT_NORMAL) {
+			if (bsformat & RS::ARRAY_FORMAT_NORMAL) {
 				// We must use tangents if using normals.
-				bsformat |= RSE::ARRAY_FORMAT_TANGENT;
+				bsformat |= RS::ARRAY_FORMAT_TANGENT;
 			}
 
-			ERR_FAIL_COND_V_MSG(bsformat != (format & RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK), ERR_INVALID_PARAMETER, "Blend shape format must match the main array format for Vertex, Normal and Tangent arrays.");
+			ERR_FAIL_COND_V_MSG(bsformat != (format & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK), ERR_INVALID_PARAMETER, "Blend shape format must match the main array format for Vertex, Normal and Tangent arrays.");
 		}
 	}
 
-	for (uint32_t i = 0; i < RSE::ARRAY_CUSTOM_COUNT; ++i) {
+	for (uint32_t i = 0; i < RS::ARRAY_CUSTOM_COUNT; ++i) {
 		// Include custom array format type.
-		if (format & (1ULL << (RSE::ARRAY_CUSTOM0 + i))) {
-			format |= (RSE::ARRAY_FORMAT_CUSTOM_MASK << (RSE::ARRAY_FORMAT_CUSTOM_BASE + i * RSE::ARRAY_FORMAT_CUSTOM_BITS)) & p_compress_format;
+		if (format & (1ULL << (ARRAY_CUSTOM0 + i))) {
+			format |= (RS::ARRAY_FORMAT_CUSTOM_MASK << (RS::ARRAY_FORMAT_CUSTOM_BASE + i * RS::ARRAY_FORMAT_CUSTOM_BITS)) & p_compress_format;
 		}
 	}
 
-	uint32_t offsets[RSE::ARRAY_MAX];
+	uint32_t offsets[RS::ARRAY_MAX];
 
 	uint32_t vertex_element_size;
 	uint32_t normal_element_size;
 	uint32_t attrib_element_size;
 	uint32_t skin_element_size;
 
-	uint64_t mask = (1ULL << RSE::ARRAY_MAX) - 1ULL;
+	uint64_t mask = (1ULL << ARRAY_MAX) - 1ULL;
 	format |= (~mask) & p_compress_format; // Make the full format.
 
 	// Force version to the current version as this function will always return a surface with the current version.
-	format &= ~(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	format |= RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION & (RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	format &= ~(ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	format |= ARRAY_FLAG_FORMAT_CURRENT_VERSION & (ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
 
 	mesh_surface_make_offsets_from_format(format, array_len, index_array_len, offsets, vertex_element_size, normal_element_size, attrib_element_size, skin_element_size);
 
-	if ((format & RSE::ARRAY_FORMAT_VERTEX) == 0 && !(format & RSE::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY)) {
-		ERR_PRINT("Mesh created without vertex array. This mesh will not be visible with the default shader. If using an empty vertex array is intentional, create the mesh with the RSE::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY flag to silence this error.");
+	if ((format & RS::ARRAY_FORMAT_VERTEX) == 0 && !(format & RS::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY)) {
+		ERR_PRINT("Mesh created without vertex array. This mesh will not be visible with the default shader. If using an empty vertex array is intentional, create the mesh with the ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY flag to silence this error.");
 		// Set the flag here after warning to suppress errors down the pipeline.
-		format |= RSE::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY;
+		format |= RS::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY;
 	}
 
-	if ((format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && ((format & RSE::ARRAY_FORMAT_NORMAL) || (format & RSE::ARRAY_FORMAT_TANGENT))) {
+	if ((format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES) && ((format & RS::ARRAY_FORMAT_NORMAL) || (format & RS::ARRAY_FORMAT_TANGENT))) {
 		// If using normals or tangents, then we need all three.
-		ERR_FAIL_COND_V_MSG(!(format & RSE::ARRAY_FORMAT_VERTEX), ERR_INVALID_PARAMETER, "Can't use compression flag 'RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES' while using normals or tangents without vertex array.");
-		ERR_FAIL_COND_V_MSG(!(format & RSE::ARRAY_FORMAT_NORMAL), ERR_INVALID_PARAMETER, "Can't use compression flag 'RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES' while using tangents without normal array.");
+		ERR_FAIL_COND_V_MSG(!(format & RS::ARRAY_FORMAT_VERTEX), ERR_INVALID_PARAMETER, "Can't use compression flag 'ARRAY_FLAG_COMPRESS_ATTRIBUTES' while using normals or tangents without vertex array.");
+		ERR_FAIL_COND_V_MSG(!(format & RS::ARRAY_FORMAT_NORMAL), ERR_INVALID_PARAMETER, "Can't use compression flag 'ARRAY_FLAG_COMPRESS_ATTRIBUTES' while using tangents without normal array.");
 	}
 
 	int vertex_array_size = (vertex_element_size + normal_element_size) * array_len;
 	int attrib_array_size = attrib_element_size * array_len;
 	int skin_array_size = skin_element_size * array_len;
-	int index_array_size = offsets[RSE::ARRAY_INDEX] * index_array_len;
+	int index_array_size = offsets[RS::ARRAY_INDEX] * index_array_len;
 
 	Vector<uint8_t> vertex_array;
 	vertex_array.resize(vertex_array_size);
@@ -1317,7 +1312,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 	Vector<uint8_t> blend_shape_data;
 
 	if (p_blend_shapes.size()) {
-		uint32_t bs_format = format & RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK;
+		uint32_t bs_format = format & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK;
 		for (int i = 0; i < p_blend_shapes.size(); i++) {
 			Vector<uint8_t> vertex_array_shape;
 			vertex_array_shape.resize(vertex_array_size);
@@ -1334,7 +1329,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 			blend_shape_data.append_array(vertex_array_shape);
 		}
 	}
-	Vector<RenderingServerTypes::SurfaceData::LOD> lods;
+	Vector<SurfaceData::LOD> lods;
 	if (index_array_len) {
 		LocalVector<Variant> keys = p_lods.get_key_list();
 		keys.sort(); // otherwise lod levels may get skipped
@@ -1367,14 +1362,14 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 				}
 			}
 
-			RenderingServerTypes::SurfaceData::LOD lod;
+			SurfaceData::LOD lod;
 			lod.edge_length = distance;
 			lod.index_data = data;
 			lods.push_back(lod);
 		}
 	}
 
-	RenderingServerTypes::SurfaceData &surface_data = *r_surface_data;
+	SurfaceData &surface_data = *r_surface_data;
 	surface_data.format = format;
 	surface_data.primitive = p_primitive;
 	surface_data.aabb = aabb;
@@ -1392,8 +1387,8 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(RenderingServerTypes
 	return OK;
 }
 
-void RenderingServer::mesh_add_surface_from_arrays(RID p_mesh, RSE::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, const Dictionary &p_lods, BitField<RSE::ArrayFormat> p_compress_format) {
-	RenderingServerTypes::SurfaceData sd;
+void RenderingServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, const Dictionary &p_lods, BitField<ArrayFormat> p_compress_format) {
+	SurfaceData sd;
 	Error err = mesh_create_surface_data_from_arrays(&sd, p_primitive, p_arrays, p_blend_shapes, p_lods, p_compress_format);
 	if (err != OK) {
 		return;
@@ -1402,7 +1397,7 @@ void RenderingServer::mesh_add_surface_from_arrays(RID p_mesh, RSE::PrimitiveTyp
 }
 
 Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t> p_vertex_data, Vector<uint8_t> p_attrib_data, Vector<uint8_t> p_skin_data, int p_vertex_len, Vector<uint8_t> p_index_data, int p_index_len, const AABB &p_aabb, const Vector4 &p_uv_scale) const {
-	uint32_t offsets[RSE::ARRAY_MAX];
+	uint32_t offsets[RS::ARRAY_MAX];
 
 	uint32_t vertex_elem_size;
 	uint32_t normal_elem_size;
@@ -1411,20 +1406,20 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 	mesh_surface_make_offsets_from_format(p_format, p_vertex_len, p_index_len, offsets, vertex_elem_size, normal_elem_size, attrib_elem_size, skin_elem_size);
 
 	Array ret;
-	ret.resize(RSE::ARRAY_MAX);
+	ret.resize(RS::ARRAY_MAX);
 
 	const uint8_t *r = p_vertex_data.ptr();
 	const uint8_t *ar = p_attrib_data.ptr();
 	const uint8_t *sr = p_skin_data.ptr();
 
-	for (int i = 0; i < RSE::ARRAY_MAX; i++) {
+	for (int i = 0; i < RS::ARRAY_MAX; i++) {
 		if (!(p_format & (1ULL << i))) {
 			continue;
 		}
 
 		switch (i) {
-			case RSE::ARRAY_VERTEX: {
-				if (p_format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+			case RS::ARRAY_VERTEX: {
+				if (p_format & ARRAY_FLAG_USE_2D_VERTICES) {
 					Vector<Vector2> arr_2d;
 					arr_2d.resize(p_vertex_len);
 
@@ -1445,9 +1440,9 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 					{
 						Vector3 *w = arr_3d.ptrw();
 
-						if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+						if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 							// We only have vertices to read, so just read them and skip everything else.
-							if (!(p_format & RSE::ARRAY_FORMAT_NORMAL)) {
+							if (!(p_format & RS::ARRAY_FORMAT_NORMAL)) {
 								for (int j = 0; j < p_vertex_len; j++) {
 									const uint16_t *v = reinterpret_cast<const uint16_t *>(&r[j * vertex_elem_size + offsets[i]]);
 									Vector3 vec = Vector3(float(v[0]) / 65535.0, float(v[1]) / 65535.0, float(v[2]) / 65535.0);
@@ -1465,7 +1460,7 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 							float *tangentsw = tangents.ptrw();
 
 							for (int j = 0; j < p_vertex_len; j++) {
-								const uint32_t n = *(const uint32_t *)&r[j * normal_elem_size + offsets[RSE::ARRAY_NORMAL]];
+								const uint32_t n = *(const uint32_t *)&r[j * normal_elem_size + offsets[RS::ARRAY_NORMAL]];
 								Vector3 axis = Vector3::octahedron_decode(Vector2((n & 0xFFFF) / 65535.0, ((n >> 16) & 0xFFFF) / 65535.0));
 
 								const uint16_t *v = reinterpret_cast<const uint16_t *>(&r[j * vertex_elem_size + offsets[i]]);
@@ -1483,8 +1478,8 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 								tangentsw[j * 4 + 2] = tan.z;
 								tangentsw[j * 4 + 3] = tan.w;
 							}
-							ret[RSE::ARRAY_NORMAL] = normals;
-							ret[RSE::ARRAY_TANGENT] = tangents;
+							ret[RS::ARRAY_NORMAL] = normals;
+							ret[RS::ARRAY_TANGENT] = tangents;
 
 						} else {
 							for (int j = 0; j < p_vertex_len; j++) {
@@ -1498,8 +1493,8 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				}
 
 			} break;
-			case RSE::ARRAY_NORMAL: {
-				if (!(p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+			case RS::ARRAY_NORMAL: {
+				if (!(p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 					Vector<Vector3> arr;
 					arr.resize(p_vertex_len);
 
@@ -1515,8 +1510,8 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				}
 			} break;
 
-			case RSE::ARRAY_TANGENT: {
-				if (!(p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
+			case RS::ARRAY_TANGENT: {
+				if (!(p_format & RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES)) {
 					Vector<float> arr;
 					arr.resize(p_vertex_len * 4);
 
@@ -1535,7 +1530,7 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 					ret[i] = arr;
 				}
 			} break;
-			case RSE::ARRAY_COLOR: {
+			case RS::ARRAY_COLOR: {
 				Vector<Color> arr;
 				arr.resize(p_vertex_len);
 
@@ -1549,12 +1544,12 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 
 				ret[i] = arr;
 			} break;
-			case RSE::ARRAY_TEX_UV: {
+			case RS::ARRAY_TEX_UV: {
 				Vector<Vector2> arr;
 				arr.resize(p_vertex_len);
 
 				Vector2 *w = arr.ptrw();
-				if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					for (int j = 0; j < p_vertex_len; j++) {
 						const uint16_t *v = reinterpret_cast<const uint16_t *>(&ar[j * attrib_elem_size + offsets[i]]);
 						Vector2 vec = Vector2(float(v[0]) / 65535.0, float(v[1]) / 65535.0);
@@ -1573,13 +1568,13 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				ret[i] = arr;
 			} break;
 
-			case RSE::ARRAY_TEX_UV2: {
+			case RS::ARRAY_TEX_UV2: {
 				Vector<Vector2> arr;
 				arr.resize(p_vertex_len);
 
 				Vector2 *w = arr.ptrw();
 
-				if (p_format & RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
+				if (p_format & ARRAY_FLAG_COMPRESS_ATTRIBUTES) {
 					for (int j = 0; j < p_vertex_len; j++) {
 						const uint16_t *v = reinterpret_cast<const uint16_t *>(&ar[j * attrib_elem_size + offsets[i]]);
 						Vector2 vec = Vector2(float(v[0]) / 65535.0, float(v[1]) / 65535.0);
@@ -1598,18 +1593,18 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				ret[i] = arr;
 
 			} break;
-			case RSE::ARRAY_CUSTOM0:
-			case RSE::ARRAY_CUSTOM1:
-			case RSE::ARRAY_CUSTOM2:
-			case RSE::ARRAY_CUSTOM3: {
-				uint32_t type = (p_format >> (RSE::ARRAY_FORMAT_CUSTOM_BASE + RSE::ARRAY_FORMAT_CUSTOM_BITS * (i - RSE::ARRAY_CUSTOM0))) & RSE::ARRAY_FORMAT_CUSTOM_MASK;
+			case RS::ARRAY_CUSTOM0:
+			case RS::ARRAY_CUSTOM1:
+			case RS::ARRAY_CUSTOM2:
+			case RS::ARRAY_CUSTOM3: {
+				uint32_t type = (p_format >> (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * (i - RS::ARRAY_CUSTOM0))) & ARRAY_FORMAT_CUSTOM_MASK;
 				switch (type) {
-					case RSE::ARRAY_CUSTOM_RGBA8_UNORM:
-					case RSE::ARRAY_CUSTOM_RGBA8_SNORM:
-					case RSE::ARRAY_CUSTOM_RG_HALF:
-					case RSE::ARRAY_CUSTOM_RGBA_HALF: {
+					case ARRAY_CUSTOM_RGBA8_UNORM:
+					case ARRAY_CUSTOM_RGBA8_SNORM:
+					case ARRAY_CUSTOM_RG_HALF:
+					case ARRAY_CUSTOM_RGBA_HALF: {
 						// Size 4
-						int s = type == RSE::ARRAY_CUSTOM_RGBA_HALF ? 8 : 4;
+						int s = type == ARRAY_CUSTOM_RGBA_HALF ? 8 : 4;
 						Vector<uint8_t> arr;
 						arr.resize(p_vertex_len * s);
 
@@ -1623,11 +1618,11 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 						ret[i] = arr;
 
 					} break;
-					case RSE::ARRAY_CUSTOM_R_FLOAT:
-					case RSE::ARRAY_CUSTOM_RG_FLOAT:
-					case RSE::ARRAY_CUSTOM_RGB_FLOAT:
-					case RSE::ARRAY_CUSTOM_RGBA_FLOAT: {
-						uint32_t s = type - RSE::ARRAY_CUSTOM_R_FLOAT + 1;
+					case ARRAY_CUSTOM_R_FLOAT:
+					case ARRAY_CUSTOM_RG_FLOAT:
+					case ARRAY_CUSTOM_RGB_FLOAT:
+					case ARRAY_CUSTOM_RGBA_FLOAT: {
+						uint32_t s = type - ARRAY_CUSTOM_R_FLOAT + 1;
 
 						Vector<float> arr;
 						arr.resize(s * p_vertex_len);
@@ -1646,8 +1641,8 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				}
 
 			} break;
-			case RSE::ARRAY_WEIGHTS: {
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+			case RS::ARRAY_WEIGHTS: {
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 
 				Vector<float> arr;
 				arr.resize(p_vertex_len * bone_count);
@@ -1665,8 +1660,8 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				ret[i] = arr;
 
 			} break;
-			case RSE::ARRAY_BONES: {
-				uint32_t bone_count = (p_format & RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
+			case RS::ARRAY_BONES: {
+				uint32_t bone_count = (p_format & ARRAY_FLAG_USE_8_BONE_WEIGHTS) ? 8 : 4;
 
 				Vector<int> arr;
 				arr.resize(p_vertex_len * bone_count);
@@ -1683,7 +1678,7 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 				ret[i] = arr;
 
 			} break;
-			case RSE::ARRAY_INDEX: {
+			case RS::ARRAY_INDEX: {
 				/* determine whether using 16 or 32 bits indices */
 
 				const uint8_t *ir = p_index_data.ptr();
@@ -1717,12 +1712,12 @@ Array RenderingServer::_get_array_from_surface(uint64_t p_format, Vector<uint8_t
 }
 
 Array RenderingServer::mesh_surface_get_arrays(RID p_mesh, int p_surface) const {
-	RenderingServerTypes::SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
+	SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
 	return mesh_create_arrays_from_surface_data(sd);
 }
 
 Dictionary RenderingServer::mesh_surface_get_lods(RID p_mesh, int p_surface) const {
-	RenderingServerTypes::SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
+	SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
 	ERR_FAIL_COND_V(sd.vertex_count == 0, Dictionary());
 
 	Dictionary ret;
@@ -1756,14 +1751,14 @@ Dictionary RenderingServer::mesh_surface_get_lods(RID p_mesh, int p_surface) con
 }
 
 TypedArray<Array> RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const {
-	RenderingServerTypes::SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
+	SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
 	ERR_FAIL_COND_V(sd.vertex_count == 0, Array());
 
 	Vector<uint8_t> blend_shape_data = sd.blend_shape_data;
 
 	if (blend_shape_data.size() > 0) {
-		uint32_t bs_offsets[RSE::ARRAY_MAX];
-		uint32_t bs_format = (sd.format & RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK);
+		uint32_t bs_offsets[RS::ARRAY_MAX];
+		uint32_t bs_format = (sd.format & RS::ARRAY_FORMAT_BLEND_SHAPE_MASK);
 		uint32_t vertex_elem_size;
 		uint32_t normal_elem_size;
 		uint32_t attrib_elem_size;
@@ -1792,12 +1787,12 @@ TypedArray<Array> RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mes
 	}
 }
 
-Array RenderingServer::mesh_create_arrays_from_surface_data(const RenderingServerTypes::SurfaceData &p_data) const {
+Array RenderingServer::mesh_create_arrays_from_surface_data(const SurfaceData &p_data) const {
 	Vector<uint8_t> vertex_data = p_data.vertex_data;
 	Vector<uint8_t> attrib_data = p_data.attribute_data;
 	Vector<uint8_t> skin_data = p_data.skin_data;
 
-	ERR_FAIL_COND_V(vertex_data.is_empty() && (p_data.format & RSE::ARRAY_FORMAT_VERTEX), Array());
+	ERR_FAIL_COND_V(vertex_data.is_empty() && (p_data.format & RS::ARRAY_FORMAT_VERTEX), Array());
 	int vertex_len = p_data.vertex_count;
 
 	Vector<uint8_t> index_data = p_data.index_data;
@@ -1807,6 +1802,16 @@ Array RenderingServer::mesh_create_arrays_from_surface_data(const RenderingServe
 
 	return _get_array_from_surface(format, vertex_data, attrib_data, skin_data, vertex_len, index_data, index_len, p_data.aabb, p_data.uv_scale);
 }
+#if 0
+Array RenderingServer::_mesh_surface_get_skeleton_aabb_bind(RID p_mesh, int p_surface) const {
+	Vector<AABB> vec = RS::get_singleton()->mesh_surface_get_skeleton_aabb(p_mesh, p_surface);
+	Array arr;
+	for (int i = 0; i < vec.size(); i++) {
+		arr[i] = vec[i];
+	}
+	return arr;
+}
+#endif
 
 Rect2 RenderingServer::debug_canvas_item_get_rect(RID p_item) {
 #ifdef TOOLS_ENABLED
@@ -1816,71 +1821,128 @@ Rect2 RenderingServer::debug_canvas_item_get_rect(RID p_item) {
 #endif
 }
 
-int RenderingServer::global_shader_uniform_type_get_shader_datatype(RSE::GlobalShaderParameterType p_type) {
+int RenderingServer::global_shader_uniform_type_get_shader_datatype(GlobalShaderParameterType p_type) {
 	switch (p_type) {
-		case RSE::GLOBAL_VAR_TYPE_BOOL:
+		case RS::GLOBAL_VAR_TYPE_BOOL:
 			return ShaderLanguage::TYPE_BOOL;
-		case RSE::GLOBAL_VAR_TYPE_BVEC2:
+		case RS::GLOBAL_VAR_TYPE_BVEC2:
 			return ShaderLanguage::TYPE_BVEC2;
-		case RSE::GLOBAL_VAR_TYPE_BVEC3:
+		case RS::GLOBAL_VAR_TYPE_BVEC3:
 			return ShaderLanguage::TYPE_BVEC3;
-		case RSE::GLOBAL_VAR_TYPE_BVEC4:
+		case RS::GLOBAL_VAR_TYPE_BVEC4:
 			return ShaderLanguage::TYPE_BVEC4;
-		case RSE::GLOBAL_VAR_TYPE_INT:
+		case RS::GLOBAL_VAR_TYPE_INT:
 			return ShaderLanguage::TYPE_INT;
-		case RSE::GLOBAL_VAR_TYPE_IVEC2:
+		case RS::GLOBAL_VAR_TYPE_IVEC2:
 			return ShaderLanguage::TYPE_IVEC2;
-		case RSE::GLOBAL_VAR_TYPE_IVEC3:
+		case RS::GLOBAL_VAR_TYPE_IVEC3:
 			return ShaderLanguage::TYPE_IVEC3;
-		case RSE::GLOBAL_VAR_TYPE_IVEC4:
+		case RS::GLOBAL_VAR_TYPE_IVEC4:
 			return ShaderLanguage::TYPE_IVEC4;
-		case RSE::GLOBAL_VAR_TYPE_RECT2I:
+		case RS::GLOBAL_VAR_TYPE_RECT2I:
 			return ShaderLanguage::TYPE_IVEC4;
-		case RSE::GLOBAL_VAR_TYPE_UINT:
+		case RS::GLOBAL_VAR_TYPE_UINT:
 			return ShaderLanguage::TYPE_UINT;
-		case RSE::GLOBAL_VAR_TYPE_UVEC2:
+		case RS::GLOBAL_VAR_TYPE_UVEC2:
 			return ShaderLanguage::TYPE_UVEC2;
-		case RSE::GLOBAL_VAR_TYPE_UVEC3:
+		case RS::GLOBAL_VAR_TYPE_UVEC3:
 			return ShaderLanguage::TYPE_UVEC3;
-		case RSE::GLOBAL_VAR_TYPE_UVEC4:
+		case RS::GLOBAL_VAR_TYPE_UVEC4:
 			return ShaderLanguage::TYPE_UVEC4;
-		case RSE::GLOBAL_VAR_TYPE_FLOAT:
+		case RS::GLOBAL_VAR_TYPE_FLOAT:
 			return ShaderLanguage::TYPE_FLOAT;
-		case RSE::GLOBAL_VAR_TYPE_VEC2:
+		case RS::GLOBAL_VAR_TYPE_VEC2:
 			return ShaderLanguage::TYPE_VEC2;
-		case RSE::GLOBAL_VAR_TYPE_VEC3:
+		case RS::GLOBAL_VAR_TYPE_VEC3:
 			return ShaderLanguage::TYPE_VEC3;
-		case RSE::GLOBAL_VAR_TYPE_VEC4:
+		case RS::GLOBAL_VAR_TYPE_VEC4:
 			return ShaderLanguage::TYPE_VEC4;
-		case RSE::GLOBAL_VAR_TYPE_COLOR:
+		case RS::GLOBAL_VAR_TYPE_COLOR:
 			return ShaderLanguage::TYPE_VEC4;
-		case RSE::GLOBAL_VAR_TYPE_RECT2:
+		case RS::GLOBAL_VAR_TYPE_RECT2:
 			return ShaderLanguage::TYPE_VEC4;
-		case RSE::GLOBAL_VAR_TYPE_MAT2:
+		case RS::GLOBAL_VAR_TYPE_MAT2:
 			return ShaderLanguage::TYPE_MAT2;
-		case RSE::GLOBAL_VAR_TYPE_MAT3:
+		case RS::GLOBAL_VAR_TYPE_MAT3:
 			return ShaderLanguage::TYPE_MAT3;
-		case RSE::GLOBAL_VAR_TYPE_MAT4:
+		case RS::GLOBAL_VAR_TYPE_MAT4:
 			return ShaderLanguage::TYPE_MAT4;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D:
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D:
 			return ShaderLanguage::TYPE_MAT3;
-		case RSE::GLOBAL_VAR_TYPE_TRANSFORM:
+		case RS::GLOBAL_VAR_TYPE_TRANSFORM:
 			return ShaderLanguage::TYPE_MAT4;
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER2D:
+		case RS::GLOBAL_VAR_TYPE_SAMPLER2D:
 			return ShaderLanguage::TYPE_SAMPLER2D;
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY:
+		case RS::GLOBAL_VAR_TYPE_SAMPLER2DARRAY:
 			return ShaderLanguage::TYPE_SAMPLER2DARRAY;
-		case RSE::GLOBAL_VAR_TYPE_SAMPLER3D:
+		case RS::GLOBAL_VAR_TYPE_SAMPLER3D:
 			return ShaderLanguage::TYPE_SAMPLER3D;
-		case RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE:
+		case RS::GLOBAL_VAR_TYPE_SAMPLERCUBE:
 			return ShaderLanguage::TYPE_SAMPLERCUBE;
-		case RSE::GLOBAL_VAR_TYPE_SAMPLEREXT:
+		case RS::GLOBAL_VAR_TYPE_SAMPLEREXT:
 			return ShaderLanguage::TYPE_SAMPLEREXT;
 		default:
 			return ShaderLanguage::TYPE_MAX; // Invalid or not found.
 	}
 }
 
+Rect2 RenderingServer::get_splash_stretched_screen_rect(const Size2 &p_image_size, const Size2 &p_window_size, SplashStretchMode p_stretch_mode) {
+	Size2 imgsize = p_image_size;
+	Rect2 screenrect;
+	switch (p_stretch_mode) {
+		case SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED: {
+			screenrect.size = imgsize;
+			screenrect.position = ((p_window_size - screenrect.size) / 2.0).floor();
+		} break;
+		case SplashStretchMode::SPLASH_STRETCH_MODE_KEEP: {
+			if (p_window_size.width > p_window_size.height) {
+				// Scale horizontally.
+				screenrect.size.y = p_window_size.height;
+				screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
+				screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
+			} else {
+				// Scale vertically.
+				screenrect.size.x = p_window_size.width;
+				screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
+				screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
+			}
+		} break;
+		case SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_WIDTH: {
+			// Scale vertically.
+			screenrect.size.x = p_window_size.width;
+			screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
+			screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
+		} break;
+		case SplashStretchMode::SPLASH_STRETCH_MODE_KEEP_HEIGHT: {
+			// Scale horizontally.
+			screenrect.size.y = p_window_size.height;
+			screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
+			screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
+		} break;
+		case SplashStretchMode::SPLASH_STRETCH_MODE_COVER: {
+			double window_aspect = (double)p_window_size.width / p_window_size.height;
+			double img_aspect = imgsize.width / imgsize.height;
+
+			if (window_aspect > img_aspect) {
+				// Scale vertically.
+				screenrect.size.x = p_window_size.width;
+				screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
+				screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
+			} else {
+				// Scale horizontally.
+				screenrect.size.y = p_window_size.height;
+				screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
+				screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
+			}
+		} break;
+		case SplashStretchMode::SPLASH_STRETCH_MODE_IGNORE: {
+			screenrect.size.x = p_window_size.width;
+			screenrect.size.y = p_window_size.height;
+		} break;
+	}
+	return screenrect;
+}
+
 RenderingDevice *RenderingServer::get_rendering_device() const {
 	// Return the rendering device we're using globally.
 	return RenderingDevice::get_singleton();
@@ -1902,8 +1964,7 @@ static Vector<Ref<Image>> _get_imgvec(const TypedArray<Image> &p_layers) {
 	}
 	return images;
 }
-
-RID RenderingServer::_texture_2d_layered_create(const TypedArray<Image> &p_layers, RSE::TextureLayeredType p_layered_type) {
+RID RenderingServer::_texture_2d_layered_create(const TypedArray<Image> &p_layers, TextureLayeredType p_layered_type) {
 	return texture_2d_layered_create(_get_imgvec(p_layers), p_layered_type);
 }
 RID RenderingServer::_texture_3d_create(Image::Format p_format, int p_width, int p_height, int p_depth, bool p_mipmaps, const TypedArray<Image> &p_data) {
@@ -1930,16 +1991,16 @@ TypedArray<Dictionary> RenderingServer::_shader_get_shader_parameter_list(RID p_
 	return convert_property_list(&l);
 }
 
-static RenderingServerTypes::SurfaceData _dict_to_surf(const Dictionary &p_dictionary) {
-	ERR_FAIL_COND_V(!p_dictionary.has("primitive"), RenderingServerTypes::SurfaceData());
-	ERR_FAIL_COND_V(!p_dictionary.has("format"), RenderingServerTypes::SurfaceData());
-	ERR_FAIL_COND_V(!p_dictionary.has("vertex_data"), RenderingServerTypes::SurfaceData());
-	ERR_FAIL_COND_V(!p_dictionary.has("vertex_count"), RenderingServerTypes::SurfaceData());
-	ERR_FAIL_COND_V(!p_dictionary.has("aabb"), RenderingServerTypes::SurfaceData());
+static RS::SurfaceData _dict_to_surf(const Dictionary &p_dictionary) {
+	ERR_FAIL_COND_V(!p_dictionary.has("primitive"), RS::SurfaceData());
+	ERR_FAIL_COND_V(!p_dictionary.has("format"), RS::SurfaceData());
+	ERR_FAIL_COND_V(!p_dictionary.has("vertex_data"), RS::SurfaceData());
+	ERR_FAIL_COND_V(!p_dictionary.has("vertex_count"), RS::SurfaceData());
+	ERR_FAIL_COND_V(!p_dictionary.has("aabb"), RS::SurfaceData());
 
-	RenderingServerTypes::SurfaceData sd;
+	RS::SurfaceData sd;
 
-	sd.primitive = RSE::PrimitiveType(int(p_dictionary["primitive"]));
+	sd.primitive = RS::PrimitiveType(int(p_dictionary["primitive"]));
 	sd.format = p_dictionary["format"];
 	sd.vertex_data = p_dictionary["vertex_data"];
 	if (p_dictionary.has("attribute_data")) {
@@ -1953,7 +2014,7 @@ static RenderingServerTypes::SurfaceData _dict_to_surf(const Dictionary &p_dicti
 
 	if (p_dictionary.has("index_data")) {
 		sd.index_data = p_dictionary["index_data"];
-		ERR_FAIL_COND_V(!p_dictionary.has("index_count"), RenderingServerTypes::SurfaceData());
+		ERR_FAIL_COND_V(!p_dictionary.has("index_count"), RS::SurfaceData());
 		sd.index_count = p_dictionary["index_count"];
 	}
 
@@ -1968,7 +2029,7 @@ static RenderingServerTypes::SurfaceData _dict_to_surf(const Dictionary &p_dicti
 			Dictionary lod = lods[i];
 			ERR_CONTINUE(!lod.has("edge_length"));
 			ERR_CONTINUE(!lod.has("index_data"));
-			RenderingServerTypes::SurfaceData::LOD l;
+			RS::SurfaceData::LOD l;
 			l.edge_length = lod["edge_length"];
 			l.index_data = lod["index_data"];
 			sd.lods.push_back(l);
@@ -1994,7 +2055,7 @@ static RenderingServerTypes::SurfaceData _dict_to_surf(const Dictionary &p_dicti
 	return sd;
 }
 RID RenderingServer::_mesh_create_from_surfaces(const TypedArray<Dictionary> &p_surfaces, int p_blend_shape_count) {
-	Vector<RenderingServerTypes::SurfaceData> surfaces;
+	Vector<RS::SurfaceData> surfaces;
 	for (int i = 0; i < p_surfaces.size(); i++) {
 		surfaces.push_back(_dict_to_surf(p_surfaces[i]));
 	}
@@ -2004,7 +2065,7 @@ void RenderingServer::_mesh_add_surface(RID p_mesh, const Dictionary &p_surface)
 	mesh_add_surface(p_mesh, _dict_to_surf(p_surface));
 }
 Dictionary RenderingServer::_mesh_get_surface(RID p_mesh, int p_idx) {
-	RenderingServerTypes::SurfaceData sd = mesh_get_surface(p_mesh, p_idx);
+	RS::SurfaceData sd = mesh_get_surface(p_mesh, p_idx);
 
 	Dictionary d;
 	d["primitive"] = sd.primitive;
@@ -2101,13 +2162,13 @@ Vector<uint8_t> _convert_surface_version_1_to_surface_version_2(uint64_t p_forma
 
 	uint32_t position_size = p_position_stride * p_vertex_count;
 
-	for (uint32_t j = 0; j < RSE::ARRAY_COLOR; j++) {
+	for (uint32_t j = 0; j < RS::ARRAY_COLOR; j++) {
 		if (!(p_format & (1ULL << j))) {
 			continue;
 		}
 		switch (j) {
-			case RSE::ARRAY_VERTEX: {
-				if (p_format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+			case RS::ARRAY_VERTEX: {
+				if (p_format & RS::ARRAY_FLAG_USE_2D_VERTICES) {
 					for (uint32_t i = 0; i < p_vertex_count; i++) {
 						const float *src = (const float *)&src_vertex_ptr[i * p_old_stride];
 						float *dst = (float *)&dst_vertex_ptr[i * p_position_stride];
@@ -2124,7 +2185,7 @@ Vector<uint8_t> _convert_surface_version_1_to_surface_version_2(uint64_t p_forma
 					}
 				}
 			} break;
-			case RSE::ARRAY_NORMAL: {
+			case RS::ARRAY_NORMAL: {
 				for (uint32_t i = 0; i < p_vertex_count; i++) {
 					const uint16_t *src = (const uint16_t *)&src_vertex_ptr[i * p_old_stride + p_vertex_size];
 					uint16_t *dst = (uint16_t *)&dst_vertex_ptr[i * p_normal_tangent_stride + position_size];
@@ -2133,7 +2194,7 @@ Vector<uint8_t> _convert_surface_version_1_to_surface_version_2(uint64_t p_forma
 					dst[1] = src[1];
 				}
 			} break;
-			case RSE::ARRAY_TANGENT: {
+			case RS::ARRAY_TANGENT: {
 				for (uint32_t i = 0; i < p_vertex_count; i++) {
 					const uint16_t *src = (const uint16_t *)&src_vertex_ptr[i * p_old_stride + p_vertex_size + p_normal_size];
 					uint16_t *dst = (uint16_t *)&dst_vertex_ptr[i * p_normal_tangent_stride + position_size + p_normal_size];
@@ -2158,9 +2219,9 @@ void RenderingServer::set_warn_on_surface_upgrade(bool p_warn) {
 #endif
 
 #ifndef DISABLE_DEPRECATED
-void RenderingServer::fix_surface_compatibility(RenderingServerTypes::SurfaceData &p_surface, const String &p_path) {
-	uint64_t surface_version = p_surface.format & (RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	ERR_FAIL_COND_MSG(surface_version > RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Cannot convert surface with version provided (" + itos((surface_version >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK) + ") to current version (" + itos((RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RSE::ARRAY_FLAG_FORMAT_VERSION_MASK) + ")");
+void RenderingServer::fix_surface_compatibility(SurfaceData &p_surface, const String &p_path) {
+	uint64_t surface_version = p_surface.format & (ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	ERR_FAIL_COND_MSG(surface_version > ARRAY_FLAG_FORMAT_CURRENT_VERSION, "Cannot convert surface with version provided (" + itos((surface_version >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK) + ") to current version (" + itos((RS::ARRAY_FLAG_FORMAT_CURRENT_VERSION >> RS::ARRAY_FLAG_FORMAT_VERSION_SHIFT) & RS::ARRAY_FLAG_FORMAT_VERSION_MASK) + ")");
 
 #ifdef TOOLS_ENABLED
 	// Editor callback to ask user about re-saving all meshes.
@@ -2177,7 +2238,7 @@ void RenderingServer::fix_surface_compatibility(RenderingServerTypes::SurfaceDat
 	}
 #endif
 
-	if (surface_version == RSE::ARRAY_FLAG_FORMAT_VERSION_1) {
+	if (surface_version == ARRAY_FLAG_FORMAT_VERSION_1) {
 		// The only difference for now is that Version 1 uses interleaved vertex positions while version 2 does not.
 		// I.e. PNTPNTPNT -> PPPNTNTNT.
 
@@ -2185,17 +2246,17 @@ void RenderingServer::fix_surface_compatibility(RenderingServerTypes::SurfaceDat
 			int vertex_size = 0;
 			int normal_size = 0;
 			int tangent_size = 0;
-			if (p_surface.format & RSE::ARRAY_FORMAT_VERTEX) {
-				if (p_surface.format & RSE::ARRAY_FLAG_USE_2D_VERTICES) {
+			if (p_surface.format & ARRAY_FORMAT_VERTEX) {
+				if (p_surface.format & ARRAY_FLAG_USE_2D_VERTICES) {
 					vertex_size = sizeof(float) * 2;
 				} else {
 					vertex_size = sizeof(float) * 3;
 				}
 			}
-			if (p_surface.format & RSE::ARRAY_FORMAT_NORMAL) {
+			if (p_surface.format & ARRAY_FORMAT_NORMAL) {
 				normal_size += sizeof(uint16_t) * 2;
 			}
-			if (p_surface.format & RSE::ARRAY_FORMAT_TANGENT) {
+			if (p_surface.format & ARRAY_FORMAT_TANGENT) {
 				tangent_size = sizeof(uint16_t) * 2;
 			}
 			int stride = p_surface.vertex_data.size() / p_surface.vertex_count;
@@ -2224,8 +2285,8 @@ void RenderingServer::fix_surface_compatibility(RenderingServerTypes::SurfaceDat
 			}
 		}
 	}
-	p_surface.format &= ~(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	p_surface.format |= RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION & (RSE::ARRAY_FLAG_FORMAT_VERSION_MASK << RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	p_surface.format &= ~(ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	p_surface.format |= ARRAY_FLAG_FORMAT_CURRENT_VERSION & (ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
 }
 #endif
 
@@ -2249,16 +2310,16 @@ void RenderingServer::get_argument_options(const StringName &p_function, int p_i
 #endif
 
 void RenderingServer::_bind_methods() {
-	BIND_CONSTANT(RSE::NO_INDEX_ARRAY);
-	BIND_CONSTANT(RSE::ARRAY_WEIGHTS_SIZE);
-	BIND_CONSTANT(RSE::CANVAS_ITEM_Z_MIN);
-	BIND_CONSTANT(RSE::CANVAS_ITEM_Z_MAX);
-	BIND_CONSTANT(RSE::CANVAS_LAYER_MIN);
-	BIND_CONSTANT(RSE::CANVAS_LAYER_MAX);
-	BIND_CONSTANT(RSE::MAX_GLOW_LEVELS);
-	BIND_CONSTANT(RSE::MAX_CURSORS);
-	BIND_CONSTANT(RSE::MAX_2D_DIRECTIONAL_LIGHTS);
-	BIND_CONSTANT(RSE::MAX_MESH_SURFACES);
+	BIND_CONSTANT(NO_INDEX_ARRAY);
+	BIND_CONSTANT(ARRAY_WEIGHTS_SIZE);
+	BIND_CONSTANT(CANVAS_ITEM_Z_MIN);
+	BIND_CONSTANT(CANVAS_ITEM_Z_MAX);
+	BIND_CONSTANT(CANVAS_LAYER_MIN);
+	BIND_CONSTANT(CANVAS_LAYER_MAX);
+	BIND_CONSTANT(MAX_GLOW_LEVELS);
+	BIND_CONSTANT(MAX_CURSORS);
+	BIND_CONSTANT(MAX_2D_DIRECTIONAL_LIGHTS);
+	BIND_CONSTANT(MAX_MESH_SURFACES);
 
 	/* TEXTURE */
 
@@ -2266,15 +2327,12 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("texture_2d_layered_create", "layers", "layered_type"), &RenderingServer::_texture_2d_layered_create);
 	ClassDB::bind_method(D_METHOD("texture_3d_create", "format", "width", "height", "depth", "mipmaps", "data"), &RenderingServer::_texture_3d_create);
 	ClassDB::bind_method(D_METHOD("texture_proxy_create", "base"), &RenderingServer::texture_proxy_create);
-	ClassDB::bind_method(D_METHOD("texture_create_from_native_handle", "type", "format", "native_handle", "width", "height", "depth", "layers", "layered_type"), &RenderingServer::texture_create_from_native_handle, DEFVAL(1), DEFVAL(RSE::TEXTURE_LAYERED_2D_ARRAY));
-	ClassDB::bind_method(D_METHOD("texture_drawable_create", "width", "height", "format", "color", "with_mipmaps"), &RenderingServer::texture_drawable_create, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("texture_create_from_native_handle", "type", "format", "native_handle", "width", "height", "depth", "layers", "layered_type"), &RenderingServer::texture_create_from_native_handle, DEFVAL(1), DEFVAL(TEXTURE_LAYERED_2D_ARRAY));
 
 	ClassDB::bind_method(D_METHOD("texture_2d_update", "texture", "image", "layer"), &RenderingServer::texture_2d_update);
 	ClassDB::bind_method(D_METHOD("texture_3d_update", "texture", "data"), &RenderingServer::_texture_3d_update);
 	ClassDB::bind_method(D_METHOD("texture_proxy_update", "texture", "proxy_to"), &RenderingServer::texture_proxy_update);
 
-	ClassDB::bind_method(D_METHOD("texture_drawable_blit_rect", "textures", "rect", "material", "modulate", "source_textures", "to_mipmap"), &RenderingServer::texture_drawable_blit_rect, DEFVAL(0));
-
 	ClassDB::bind_method(D_METHOD("texture_2d_placeholder_create"), &RenderingServer::texture_2d_placeholder_create);
 	ClassDB::bind_method(D_METHOD("texture_2d_layered_placeholder_create", "layered_type"), &RenderingServer::texture_2d_layered_placeholder_create);
 	ClassDB::bind_method(D_METHOD("texture_3d_placeholder_create"), &RenderingServer::texture_3d_placeholder_create);
@@ -2283,9 +2341,6 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("texture_2d_layer_get", "texture", "layer"), &RenderingServer::texture_2d_layer_get);
 	ClassDB::bind_method(D_METHOD("texture_3d_get", "texture"), &RenderingServer::_texture_3d_get);
 
-	ClassDB::bind_method(D_METHOD("texture_drawable_generate_mipmaps", "texture"), &RenderingServer::texture_drawable_generate_mipmaps);
-	ClassDB::bind_method(D_METHOD("texture_drawable_get_default_material"), &RenderingServer::texture_drawable_get_default_material);
-
 	ClassDB::bind_method(D_METHOD("texture_replace", "texture", "by_texture"), &RenderingServer::texture_replace);
 	ClassDB::bind_method(D_METHOD("texture_set_size_override", "texture", "width", "height"), &RenderingServer::texture_set_size_override);
 
@@ -2295,29 +2350,24 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("texture_get_format", "texture"), &RenderingServer::texture_get_format);
 
 	ClassDB::bind_method(D_METHOD("texture_set_force_redraw_if_visible", "texture", "enable"), &RenderingServer::texture_set_force_redraw_if_visible);
-	ClassDB::bind_method(D_METHOD("texture_rd_create", "rd_texture", "layer_type"), &RenderingServer::texture_rd_create, DEFVAL(RSE::TEXTURE_LAYERED_2D_ARRAY));
+	ClassDB::bind_method(D_METHOD("texture_rd_create", "rd_texture", "layer_type"), &RenderingServer::texture_rd_create, DEFVAL(RenderingServer::TEXTURE_LAYERED_2D_ARRAY));
 	ClassDB::bind_method(D_METHOD("texture_get_rd_texture", "texture", "srgb"), &RenderingServer::texture_get_rd_texture, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("texture_get_native_handle", "texture", "srgb"), &RenderingServer::texture_get_native_handle, DEFVAL(false));
 
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_TYPE_2D);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_TYPE_LAYERED);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_TYPE_3D);
+	BIND_ENUM_CONSTANT(TEXTURE_TYPE_2D);
+	BIND_ENUM_CONSTANT(TEXTURE_TYPE_LAYERED);
+	BIND_ENUM_CONSTANT(TEXTURE_TYPE_3D);
 
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_LAYERED_2D_ARRAY);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_LAYERED_CUBEMAP);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_LAYERED_CUBEMAP_ARRAY);
+	BIND_ENUM_CONSTANT(TEXTURE_LAYERED_2D_ARRAY);
+	BIND_ENUM_CONSTANT(TEXTURE_LAYERED_CUBEMAP);
+	BIND_ENUM_CONSTANT(TEXTURE_LAYERED_CUBEMAP_ARRAY);
 
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_LEFT);
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_RIGHT);
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_BOTTOM);
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_TOP);
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_FRONT);
-	BIND_ENUM_CONSTANT(RSE::CUBEMAP_LAYER_BACK);
-
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_DRAWABLE_FORMAT_RGBAH);
-	BIND_ENUM_CONSTANT(RSE::TEXTURE_DRAWABLE_FORMAT_RGBAF);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_LEFT);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_RIGHT);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_BOTTOM);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_TOP);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_FRONT);
+	BIND_ENUM_CONSTANT(CUBEMAP_LAYER_BACK);
 
 	/* SHADER */
 
@@ -2331,13 +2381,12 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("shader_set_default_texture_parameter", "shader", "name", "texture", "index"), &RenderingServer::shader_set_default_texture_parameter, DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("shader_get_default_texture_parameter", "shader", "name", "index"), &RenderingServer::shader_get_default_texture_parameter, DEFVAL(0));
 
-	BIND_ENUM_CONSTANT(RSE::SHADER_SPATIAL);
-	BIND_ENUM_CONSTANT(RSE::SHADER_CANVAS_ITEM);
-	BIND_ENUM_CONSTANT(RSE::SHADER_PARTICLES);
-	BIND_ENUM_CONSTANT(RSE::SHADER_SKY);
-	BIND_ENUM_CONSTANT(RSE::SHADER_FOG);
-	BIND_ENUM_CONSTANT(RSE::SHADER_TEXTURE_BLIT);
-	BIND_ENUM_CONSTANT(RSE::SHADER_MAX);
+	BIND_ENUM_CONSTANT(SHADER_SPATIAL);
+	BIND_ENUM_CONSTANT(SHADER_CANVAS_ITEM);
+	BIND_ENUM_CONSTANT(SHADER_PARTICLES);
+	BIND_ENUM_CONSTANT(SHADER_SKY);
+	BIND_ENUM_CONSTANT(SHADER_FOG);
+	BIND_ENUM_CONSTANT(SHADER_MAX);
 
 	/* MATERIAL */
 
@@ -2351,8 +2400,8 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("material_set_use_debanding", "enable"), &RenderingServer::material_set_use_debanding);
 
-	BIND_CONSTANT(RSE::MATERIAL_RENDER_PRIORITY_MIN);
-	BIND_CONSTANT(RSE::MATERIAL_RENDER_PRIORITY_MAX);
+	BIND_CONSTANT(MATERIAL_RENDER_PRIORITY_MIN);
+	BIND_CONSTANT(MATERIAL_RENDER_PRIORITY_MAX);
 
 	/* MESH API */
 
@@ -2388,82 +2437,82 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("mesh_set_shadow_mesh", "mesh", "shadow_mesh"), &RenderingServer::mesh_set_shadow_mesh);
 
-	BIND_ENUM_CONSTANT(RSE::ARRAY_VERTEX);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_NORMAL);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_TANGENT);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_COLOR);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_TEX_UV);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_TEX_UV2);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM0);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM1);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM2);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM3);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_BONES);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_WEIGHTS);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_INDEX);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_MAX);
+	BIND_ENUM_CONSTANT(ARRAY_VERTEX);
+	BIND_ENUM_CONSTANT(ARRAY_NORMAL);
+	BIND_ENUM_CONSTANT(ARRAY_TANGENT);
+	BIND_ENUM_CONSTANT(ARRAY_COLOR);
+	BIND_ENUM_CONSTANT(ARRAY_TEX_UV);
+	BIND_ENUM_CONSTANT(ARRAY_TEX_UV2);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM0);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM1);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM2);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM3);
+	BIND_ENUM_CONSTANT(ARRAY_BONES);
+	BIND_ENUM_CONSTANT(ARRAY_WEIGHTS);
+	BIND_ENUM_CONSTANT(ARRAY_INDEX);
+	BIND_ENUM_CONSTANT(ARRAY_MAX);
 
-	BIND_CONSTANT(RSE::ARRAY_CUSTOM_COUNT);
+	BIND_CONSTANT(ARRAY_CUSTOM_COUNT);
 
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RGBA8_UNORM);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RGBA8_SNORM);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RG_HALF);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RGBA_HALF);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_R_FLOAT);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RG_FLOAT);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RGB_FLOAT);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_RGBA_FLOAT);
-	BIND_ENUM_CONSTANT(RSE::ARRAY_CUSTOM_MAX);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RGBA8_UNORM);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RGBA8_SNORM);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RG_HALF);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RGBA_HALF);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_R_FLOAT);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RG_FLOAT);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RGB_FLOAT);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_RGBA_FLOAT);
+	BIND_ENUM_CONSTANT(ARRAY_CUSTOM_MAX);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_VERTEX);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_NORMAL);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_TANGENT);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_COLOR);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_TEX_UV);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_TEX_UV2);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM0);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM1);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM2);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM3);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_BONES);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_WEIGHTS);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_INDEX);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_VERTEX);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_NORMAL);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_TANGENT);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_COLOR);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_TEX_UV);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_TEX_UV2);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM0);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM1);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM2);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM3);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_BONES);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_WEIGHTS);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_INDEX);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_BLEND_SHAPE_MASK);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM_BASE);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM_BITS);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM0_SHIFT);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM1_SHIFT);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM2_SHIFT);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM3_SHIFT);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM_BASE);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM_BITS);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM0_SHIFT);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM1_SHIFT);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM2_SHIFT);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM3_SHIFT);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FORMAT_CUSTOM_MASK);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_COMPRESS_FLAGS_BASE);
+	BIND_BITFIELD_FLAG(ARRAY_FORMAT_CUSTOM_MASK);
+	BIND_BITFIELD_FLAG(ARRAY_COMPRESS_FLAGS_BASE);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_USE_2D_VERTICES);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_USE_8_BONE_WEIGHTS);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_USE_2D_VERTICES);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_USE_DYNAMIC_UPDATE);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_USE_8_BONE_WEIGHTS);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_COMPRESS_ATTRIBUTES);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_COMPRESS_ATTRIBUTES);
 
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_VERSION_BASE);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_VERSION_SHIFT);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_VERSION_1);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_VERSION_2);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION);
-	BIND_BITFIELD_FLAG(RSE::ARRAY_FLAG_FORMAT_VERSION_MASK);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_VERSION_BASE);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_VERSION_SHIFT);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_VERSION_1);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_VERSION_2);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_CURRENT_VERSION);
+	BIND_BITFIELD_FLAG(ARRAY_FLAG_FORMAT_VERSION_MASK);
 
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_POINTS);
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_LINES);
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_LINE_STRIP);
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_TRIANGLES);
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_TRIANGLE_STRIP);
-	BIND_ENUM_CONSTANT(RSE::PRIMITIVE_MAX);
+	BIND_ENUM_CONSTANT(PRIMITIVE_POINTS);
+	BIND_ENUM_CONSTANT(PRIMITIVE_LINES);
+	BIND_ENUM_CONSTANT(PRIMITIVE_LINE_STRIP);
+	BIND_ENUM_CONSTANT(PRIMITIVE_TRIANGLES);
+	BIND_ENUM_CONSTANT(PRIMITIVE_TRIANGLE_STRIP);
+	BIND_ENUM_CONSTANT(PRIMITIVE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::BLEND_SHAPE_MODE_NORMALIZED);
-	BIND_ENUM_CONSTANT(RSE::BLEND_SHAPE_MODE_RELATIVE);
+	BIND_ENUM_CONSTANT(BLEND_SHAPE_MODE_NORMALIZED);
+	BIND_ENUM_CONSTANT(BLEND_SHAPE_MODE_RELATIVE);
 
 	/* MULTIMESH API */
 
@@ -2496,10 +2545,10 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("multimesh_instance_reset_physics_interpolation", "multimesh", "index"), &RenderingServer::multimesh_instance_reset_physics_interpolation);
 	ClassDB::bind_method(D_METHOD("multimesh_instances_reset_physics_interpolation", "multimesh"), &RenderingServer::multimesh_instances_reset_physics_interpolation);
 
-	BIND_ENUM_CONSTANT(RSE::MULTIMESH_TRANSFORM_2D);
-	BIND_ENUM_CONSTANT(RSE::MULTIMESH_TRANSFORM_3D);
-	BIND_ENUM_CONSTANT(RSE::MULTIMESH_INTERP_QUALITY_FAST);
-	BIND_ENUM_CONSTANT(RSE::MULTIMESH_INTERP_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(MULTIMESH_TRANSFORM_2D);
+	BIND_ENUM_CONSTANT(MULTIMESH_TRANSFORM_3D);
+	BIND_ENUM_CONSTANT(MULTIMESH_INTERP_QUALITY_FAST);
+	BIND_ENUM_CONSTANT(MULTIMESH_INTERP_QUALITY_HIGH);
 
 	/* SKELETON API */
 
@@ -2539,66 +2588,66 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("light_projectors_set_filter", "filter"), &RenderingServer::light_projectors_set_filter);
 	ClassDB::bind_method(D_METHOD("lightmaps_set_bicubic_filter", "enable"), &RenderingServer::lightmaps_set_bicubic_filter);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_NEAREST);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_LINEAR);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_NEAREST);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_LINEAR);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_OMNI);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_SPOT);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL);
+	BIND_ENUM_CONSTANT(LIGHT_OMNI);
+	BIND_ENUM_CONSTANT(LIGHT_SPOT);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_ENERGY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_INDIRECT_ENERGY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SPECULAR);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_RANGE);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SIZE);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_ATTENUATION);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SPOT_ANGLE);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SPOT_ATTENUATION);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_MAX_DISTANCE);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_FADE_START);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_NORMAL_BIAS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_BIAS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_PANCAKE_SIZE);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_OPACITY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_SHADOW_BLUR);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_TRANSMITTANCE_BIAS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_INTENSITY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_PARAM_MAX);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_ENERGY);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_INDIRECT_ENERGY);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SPECULAR);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_RANGE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SIZE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_ATTENUATION);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SPOT_ANGLE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SPOT_ATTENUATION);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_MAX_DISTANCE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_FADE_START);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_NORMAL_BIAS);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_BIAS);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_PANCAKE_SIZE);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_OPACITY);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_SHADOW_BLUR);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_TRANSMITTANCE_BIAS);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_INTENSITY);
+	BIND_ENUM_CONSTANT(LIGHT_PARAM_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_BAKE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_BAKE_STATIC);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_BAKE_DYNAMIC);
+	BIND_ENUM_CONSTANT(LIGHT_BAKE_DISABLED);
+	BIND_ENUM_CONSTANT(LIGHT_BAKE_STATIC);
+	BIND_ENUM_CONSTANT(LIGHT_BAKE_DYNAMIC);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_OMNI_SHADOW_DUAL_PARABOLOID);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_OMNI_SHADOW_CUBE);
+	BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_DUAL_PARABOLOID);
+	BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_CUBE);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS);
 
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY);
-	BIND_ENUM_CONSTANT(RSE::LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY);
+	BIND_ENUM_CONSTANT(LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY);
 
 	ClassDB::bind_method(D_METHOD("positional_soft_shadow_filter_set_quality", "quality"), &RenderingServer::positional_soft_shadow_filter_set_quality);
 	ClassDB::bind_method(D_METHOD("directional_soft_shadow_filter_set_quality", "quality"), &RenderingServer::directional_soft_shadow_filter_set_quality);
 	ClassDB::bind_method(D_METHOD("directional_shadow_atlas_set_size", "size", "is_16bits"), &RenderingServer::directional_shadow_atlas_set_size);
 
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_HARD);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_SOFT_VERY_LOW);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_SOFT_LOW);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_SOFT_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_SOFT_HIGH);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_SOFT_ULTRA);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_QUALITY_MAX);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_HARD);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_SOFT_VERY_LOW);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_SOFT_LOW);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_SOFT_MEDIUM);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_SOFT_HIGH);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_SOFT_ULTRA);
+	BIND_ENUM_CONSTANT(SHADOW_QUALITY_MAX);
 
 	/* REFLECTION PROBE */
 
@@ -2620,12 +2669,12 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("reflection_probe_set_resolution", "probe", "resolution"), &RenderingServer::reflection_probe_set_resolution);
 	ClassDB::bind_method(D_METHOD("reflection_probe_set_mesh_lod_threshold", "probe", "pixels"), &RenderingServer::reflection_probe_set_mesh_lod_threshold);
 
-	BIND_ENUM_CONSTANT(RSE::REFLECTION_PROBE_UPDATE_ONCE);
-	BIND_ENUM_CONSTANT(RSE::REFLECTION_PROBE_UPDATE_ALWAYS);
+	BIND_ENUM_CONSTANT(REFLECTION_PROBE_UPDATE_ONCE);
+	BIND_ENUM_CONSTANT(REFLECTION_PROBE_UPDATE_ALWAYS);
 
-	BIND_ENUM_CONSTANT(RSE::REFLECTION_PROBE_AMBIENT_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::REFLECTION_PROBE_AMBIENT_ENVIRONMENT);
-	BIND_ENUM_CONSTANT(RSE::REFLECTION_PROBE_AMBIENT_COLOR);
+	BIND_ENUM_CONSTANT(REFLECTION_PROBE_AMBIENT_DISABLED);
+	BIND_ENUM_CONSTANT(REFLECTION_PROBE_AMBIENT_ENVIRONMENT);
+	BIND_ENUM_CONSTANT(REFLECTION_PROBE_AMBIENT_COLOR);
 
 	/* DECAL */
 
@@ -2642,18 +2691,18 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("decals_set_filter", "filter"), &RenderingServer::decals_set_filter);
 
-	BIND_ENUM_CONSTANT(RSE::DECAL_TEXTURE_ALBEDO);
-	BIND_ENUM_CONSTANT(RSE::DECAL_TEXTURE_NORMAL);
-	BIND_ENUM_CONSTANT(RSE::DECAL_TEXTURE_ORM);
-	BIND_ENUM_CONSTANT(RSE::DECAL_TEXTURE_EMISSION);
-	BIND_ENUM_CONSTANT(RSE::DECAL_TEXTURE_MAX);
+	BIND_ENUM_CONSTANT(DECAL_TEXTURE_ALBEDO);
+	BIND_ENUM_CONSTANT(DECAL_TEXTURE_NORMAL);
+	BIND_ENUM_CONSTANT(DECAL_TEXTURE_ORM);
+	BIND_ENUM_CONSTANT(DECAL_TEXTURE_EMISSION);
+	BIND_ENUM_CONSTANT(DECAL_TEXTURE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_NEAREST);
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_LINEAR);
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_NEAREST_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_LINEAR_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC);
-	BIND_ENUM_CONSTANT(RSE::DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_NEAREST);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_LINEAR);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_NEAREST_MIPMAPS);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_LINEAR_MIPMAPS);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC);
 
 	/* GI API (affects VoxelGI and SDFGI) */
 
@@ -2681,8 +2730,8 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("voxel_gi_set_quality", "quality"), &RenderingServer::voxel_gi_set_quality);
 
-	BIND_ENUM_CONSTANT(RSE::VOXEL_GI_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::VOXEL_GI_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(VOXEL_GI_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(VOXEL_GI_QUALITY_HIGH);
 
 	/* LIGHTMAP */
 
@@ -2710,7 +2759,7 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("particles_set_lifetime", "particles", "lifetime"), &RenderingServer::particles_set_lifetime);
 	ClassDB::bind_method(D_METHOD("particles_set_one_shot", "particles", "one_shot"), &RenderingServer::particles_set_one_shot);
 	ClassDB::bind_method(D_METHOD("particles_set_pre_process_time", "particles", "time"), &RenderingServer::particles_set_pre_process_time);
-	ClassDB::bind_method(D_METHOD("particles_request_process_time", "particles", "process_time", "process_time_residual"), &RenderingServer::particles_request_process_time, DEFVAL(0.0f));
+	ClassDB::bind_method(D_METHOD("particles_request_process_time", "particles", "time"), &RenderingServer::particles_request_process_time);
 	ClassDB::bind_method(D_METHOD("particles_set_explosiveness_ratio", "particles", "ratio"), &RenderingServer::particles_set_explosiveness_ratio);
 	ClassDB::bind_method(D_METHOD("particles_set_randomness_ratio", "particles", "ratio"), &RenderingServer::particles_set_randomness_ratio);
 	ClassDB::bind_method(D_METHOD("particles_set_interp_to_end", "particles", "factor"), &RenderingServer::particles_set_interp_to_end);
@@ -2724,8 +2773,6 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("particles_set_fractional_delta", "particles", "enable"), &RenderingServer::particles_set_fractional_delta);
 	ClassDB::bind_method(D_METHOD("particles_set_collision_base_size", "particles", "size"), &RenderingServer::particles_set_collision_base_size);
 	ClassDB::bind_method(D_METHOD("particles_set_transform_align", "particles", "align"), &RenderingServer::particles_set_transform_align);
-	ClassDB::bind_method(D_METHOD("particles_set_transform_align_channel_filter", "particles", "channel_filter"), &RenderingServer::particles_set_transform_align_channel_filter);
-	ClassDB::bind_method(D_METHOD("particles_set_transform_align_axis", "particles", "p_rotation_axis"), &RenderingServer::particles_set_transform_align_axis);
 	ClassDB::bind_method(D_METHOD("particles_set_trails", "particles", "enable", "length_sec"), &RenderingServer::particles_set_trails);
 	ClassDB::bind_method(D_METHOD("particles_set_trail_bind_poses", "particles", "bind_poses"), &RenderingServer::_particles_set_trail_bind_poses);
 
@@ -2742,34 +2789,24 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("particles_get_current_aabb", "particles"), &RenderingServer::particles_get_current_aabb);
 	ClassDB::bind_method(D_METHOD("particles_set_emission_transform", "particles", "transform"), &RenderingServer::particles_set_emission_transform);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_MODE_2D);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_MODE_3D);
+	BIND_ENUM_CONSTANT(PARTICLES_MODE_2D);
+	BIND_ENUM_CONSTANT(PARTICLES_MODE_3D);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_TRANSFORM_ALIGN_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD);
+	BIND_ENUM_CONSTANT(PARTICLES_TRANSFORM_ALIGN_DISABLED);
+	BIND_ENUM_CONSTANT(PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD);
+	BIND_ENUM_CONSTANT(PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY);
+	BIND_ENUM_CONSTANT(PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_CHANNEL_FILTER_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_CHANNEL_FILTER_X);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_CHANNEL_FILTER_Y);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_CHANNEL_FILTER_Z);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_CHANNEL_FILTER_W);
+	BIND_CONSTANT(PARTICLES_EMIT_FLAG_POSITION);
+	BIND_CONSTANT(PARTICLES_EMIT_FLAG_ROTATION_SCALE);
+	BIND_CONSTANT(PARTICLES_EMIT_FLAG_VELOCITY);
+	BIND_CONSTANT(PARTICLES_EMIT_FLAG_COLOR);
+	BIND_CONSTANT(PARTICLES_EMIT_FLAG_CUSTOM);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_AXIS_X)
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_ALIGN_AXIS_Y)
-
-	BIND_CONSTANT(RSE::PARTICLES_EMIT_FLAG_POSITION);
-	BIND_CONSTANT(RSE::PARTICLES_EMIT_FLAG_ROTATION_SCALE);
-	BIND_CONSTANT(RSE::PARTICLES_EMIT_FLAG_VELOCITY);
-	BIND_CONSTANT(RSE::PARTICLES_EMIT_FLAG_COLOR);
-	BIND_CONSTANT(RSE::PARTICLES_EMIT_FLAG_CUSTOM);
-
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_DRAW_ORDER_INDEX);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_DRAW_ORDER_LIFETIME);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_DRAW_ORDER_VIEW_DEPTH);
+	BIND_ENUM_CONSTANT(PARTICLES_DRAW_ORDER_INDEX);
+	BIND_ENUM_CONSTANT(PARTICLES_DRAW_ORDER_LIFETIME);
+	BIND_ENUM_CONSTANT(PARTICLES_DRAW_ORDER_REVERSE_LIFETIME);
+	BIND_ENUM_CONSTANT(PARTICLES_DRAW_ORDER_VIEW_DEPTH);
 
 	/* PARTICLES COLLISION */
 
@@ -2787,21 +2824,21 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("particles_collision_set_height_field_resolution", "particles_collision", "resolution"), &RenderingServer::particles_collision_set_height_field_resolution);
 	ClassDB::bind_method(D_METHOD("particles_collision_set_height_field_mask", "particles_collision", "mask"), &RenderingServer::particles_collision_set_height_field_mask);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_BOX_ATTRACT);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_BOX_COLLIDE);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_SDF_COLLIDE);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_BOX_ATTRACT);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_BOX_COLLIDE);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_SDF_COLLIDE);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE);
 
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_256);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_512);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_2048);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_4096);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_8192);
-	BIND_ENUM_CONSTANT(RSE::PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_256);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_512);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_2048);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_4096);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_8192);
+	BIND_ENUM_CONSTANT(PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX);
 
 	/* FOG VOLUMES */
 
@@ -2810,12 +2847,12 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("fog_volume_set_size", "fog_volume", "size"), &RenderingServer::fog_volume_set_size);
 	ClassDB::bind_method(D_METHOD("fog_volume_set_material", "fog_volume", "material"), &RenderingServer::fog_volume_set_material);
 
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_ELLIPSOID);
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_CONE);
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_CYLINDER);
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_BOX);
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_WORLD);
-	BIND_ENUM_CONSTANT(RSE::FOG_VOLUME_SHAPE_MAX);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_ELLIPSOID);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_CONE);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_CYLINDER);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_BOX);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_WORLD);
+	BIND_ENUM_CONSTANT(FOG_VOLUME_SHAPE_MAX);
 
 	/* VISIBILITY NOTIFIER */
 
@@ -2847,10 +2884,10 @@ void RenderingServer::_bind_methods() {
 #ifndef XR_DISABLED
 	ClassDB::bind_method(D_METHOD("viewport_set_use_xr", "viewport", "use_xr"), &RenderingServer::viewport_set_use_xr);
 #endif // XR_DISABLED
-	ClassDB::bind_method(D_METHOD("viewport_set_size", "viewport", "width", "height", "view_count"), &RenderingServer::viewport_set_size, DEFVAL(1));
+	ClassDB::bind_method(D_METHOD("viewport_set_size", "viewport", "width", "height"), &RenderingServer::viewport_set_size);
 	ClassDB::bind_method(D_METHOD("viewport_set_active", "viewport", "active"), &RenderingServer::viewport_set_active);
 	ClassDB::bind_method(D_METHOD("viewport_set_parent_viewport", "viewport", "parent_viewport"), &RenderingServer::viewport_set_parent_viewport);
-	ClassDB::bind_method(D_METHOD("viewport_attach_to_screen", "viewport", "rect", "screen"), &RenderingServer::viewport_attach_to_screen, DEFVAL(Rect2()), DEFVAL(DisplayServerEnums::MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("viewport_attach_to_screen", "viewport", "rect", "screen"), &RenderingServer::viewport_attach_to_screen, DEFVAL(Rect2()), DEFVAL(DisplayServer::MAIN_WINDOW_ID));
 	ClassDB::bind_method(D_METHOD("viewport_set_render_direct_to_screen", "viewport", "enabled"), &RenderingServer::viewport_set_render_direct_to_screen);
 	ClassDB::bind_method(D_METHOD("viewport_set_canvas_cull_mask", "viewport", "canvas_cull_mask"), &RenderingServer::viewport_set_canvas_cull_mask);
 
@@ -2909,109 +2946,108 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("viewport_set_vrs_update_mode", "viewport", "mode"), &RenderingServer::viewport_set_vrs_update_mode);
 	ClassDB::bind_method(D_METHOD("viewport_set_vrs_texture", "viewport", "texture"), &RenderingServer::viewport_set_vrs_texture);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_BILINEAR);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_FSR);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_FSR2);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_NEAREST);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCALING_3D_MODE_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_BILINEAR);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_FSR);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_FSR2);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCALING_3D_MODE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_UPDATE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_UPDATE_ONCE); // Then goes to disabled, must be manually updated.
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_UPDATE_WHEN_VISIBLE); // Default
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_UPDATE_ALWAYS);
+	BIND_ENUM_CONSTANT(VIEWPORT_UPDATE_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_UPDATE_ONCE); // Then goes to disabled, must be manually updated.
+	BIND_ENUM_CONSTANT(VIEWPORT_UPDATE_WHEN_VISIBLE); // Default
+	BIND_ENUM_CONSTANT(VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
+	BIND_ENUM_CONSTANT(VIEWPORT_UPDATE_ALWAYS);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_CLEAR_ALWAYS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_CLEAR_NEVER);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_CLEAR_ONLY_NEXT_FRAME);
+	BIND_ENUM_CONSTANT(VIEWPORT_CLEAR_ALWAYS);
+	BIND_ENUM_CONSTANT(VIEWPORT_CLEAR_NEVER);
+	BIND_ENUM_CONSTANT(VIEWPORT_CLEAR_ONLY_NEXT_FRAME);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ENVIRONMENT_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ENVIRONMENT_ENABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ENVIRONMENT_INHERIT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ENVIRONMENT_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_ENVIRONMENT_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_ENVIRONMENT_ENABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_ENVIRONMENT_INHERIT);
+	BIND_ENUM_CONSTANT(VIEWPORT_ENVIRONMENT_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_OVERSIZE_100_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_OVERSIZE_120_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_OVERSIZE_150_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_OVERSIZE_200_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_OVERSIZE_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_OVERSIZE_100_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_OVERSIZE_120_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_OVERSIZE_150_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_OVERSIZE_200_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_OVERSIZE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_SCALE_100_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_SCALE_50_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_SCALE_25_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SDF_SCALE_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_SCALE_100_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_SCALE_50_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_SCALE_25_PERCENT);
+	BIND_ENUM_CONSTANT(VIEWPORT_SDF_SCALE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_MSAA_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_MSAA_2X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_MSAA_4X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_MSAA_8X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_MSAA_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_MSAA_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_MSAA_2X);
+	BIND_ENUM_CONSTANT(VIEWPORT_MSAA_4X);
+	BIND_ENUM_CONSTANT(VIEWPORT_MSAA_8X);
+	BIND_ENUM_CONSTANT(VIEWPORT_MSAA_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_2X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_4X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_8X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_16X);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_ANISOTROPY_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_2X);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_4X);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_8X);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_16X);
+	BIND_ENUM_CONSTANT(VIEWPORT_ANISOTROPY_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCREEN_SPACE_AA_FXAA);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCREEN_SPACE_AA_SMAA);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_SCREEN_SPACE_AA_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCREEN_SPACE_AA_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCREEN_SPACE_AA_FXAA);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCREEN_SPACE_AA_SMAA);
+	BIND_ENUM_CONSTANT(VIEWPORT_SCREEN_SPACE_AA_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_OCCLUSION_BUILD_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_OCCLUSION_BUILD_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_OCCLUSION_BUILD_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(VIEWPORT_OCCLUSION_BUILD_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(VIEWPORT_OCCLUSION_BUILD_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(VIEWPORT_OCCLUSION_BUILD_QUALITY_HIGH);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_TYPE_VISIBLE);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_TYPE_SHADOW);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_TYPE_CANVAS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_RENDER_INFO_TYPE_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_TYPE_VISIBLE);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_TYPE_SHADOW);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_TYPE_CANVAS);
+	BIND_ENUM_CONSTANT(VIEWPORT_RENDER_INFO_TYPE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_UNSHADED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_LIGHTING);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_OVERDRAW);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_WIREFRAME);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SSAO);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SSIL);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_PSSM_SPLITS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_DECAL_ATLAS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SDFGI);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_SDFGI_PROBES);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_GI_BUFFER);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_DISABLE_LOD);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_OCCLUDERS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_MOTION_VECTORS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_UNSHADED);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_LIGHTING);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_OVERDRAW);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_WIREFRAME);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SSAO);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SSIL);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_PSSM_SPLITS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_DECAL_ATLAS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SDFGI);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_SDFGI_PROBES);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_GI_BUFFER);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_DISABLE_LOD);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_OCCLUDERS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_MOTION_VECTORS);
+	BIND_ENUM_CONSTANT(VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_TEXTURE);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_XR);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_TEXTURE);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_XR);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_UPDATE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_UPDATE_ONCE); // Then goes to disabled, must be manually updated.
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_UPDATE_ALWAYS);
-	BIND_ENUM_CONSTANT(RSE::VIEWPORT_VRS_UPDATE_MAX);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_UPDATE_DISABLED);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_UPDATE_ONCE); // Then goes to disabled, must be manually updated.
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_UPDATE_ALWAYS);
+	BIND_ENUM_CONSTANT(VIEWPORT_VRS_UPDATE_MAX);
 
 	/* SKY API */
 
@@ -3021,10 +3057,10 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("sky_set_material", "sky", "material"), &RenderingServer::sky_set_material);
 	ClassDB::bind_method(D_METHOD("sky_bake_panorama", "sky", "energy", "bake_irradiance", "size"), &RenderingServer::sky_bake_panorama);
 
-	BIND_ENUM_CONSTANT(RSE::SKY_MODE_AUTOMATIC);
-	BIND_ENUM_CONSTANT(RSE::SKY_MODE_QUALITY);
-	BIND_ENUM_CONSTANT(RSE::SKY_MODE_INCREMENTAL);
-	BIND_ENUM_CONSTANT(RSE::SKY_MODE_REALTIME);
+	BIND_ENUM_CONSTANT(SKY_MODE_AUTOMATIC);
+	BIND_ENUM_CONSTANT(SKY_MODE_QUALITY);
+	BIND_ENUM_CONSTANT(SKY_MODE_INCREMENTAL);
+	BIND_ENUM_CONSTANT(SKY_MODE_REALTIME);
 
 	/* COMPOSITOR EFFECT API */
 
@@ -3033,18 +3069,18 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("compositor_effect_set_callback", "effect", "callback_type", "callback"), &RenderingServer::compositor_effect_set_callback);
 	ClassDB::bind_method(D_METHOD("compositor_effect_set_flag", "effect", "flag", "set"), &RenderingServer::compositor_effect_set_flag);
 
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR);
 
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT);
-	BIND_ENUM_CONSTANT(RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT);
+	BIND_ENUM_CONSTANT(COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY);
 
 	/* COMPOSITOR */
 
@@ -3063,14 +3099,14 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("environment_set_bg_color", "env", "color"), &RenderingServer::environment_set_bg_color);
 	ClassDB::bind_method(D_METHOD("environment_set_bg_energy", "env", "multiplier", "exposure_value"), &RenderingServer::environment_set_bg_energy);
 	ClassDB::bind_method(D_METHOD("environment_set_canvas_max_layer", "env", "max_layer"), &RenderingServer::environment_set_canvas_max_layer);
-	ClassDB::bind_method(D_METHOD("environment_set_ambient_light", "env", "color", "ambient", "energy", "sky_contribution", "reflection_source"), &RenderingServer::environment_set_ambient_light, DEFVAL(RSE::ENV_AMBIENT_SOURCE_BG), DEFVAL(1.0), DEFVAL(0.0), DEFVAL(RSE::ENV_REFLECTION_SOURCE_BG));
+	ClassDB::bind_method(D_METHOD("environment_set_ambient_light", "env", "color", "ambient", "energy", "sky_contribution", "reflection_source"), &RenderingServer::environment_set_ambient_light, DEFVAL(RS::ENV_AMBIENT_SOURCE_BG), DEFVAL(1.0), DEFVAL(0.0), DEFVAL(RS::ENV_REFLECTION_SOURCE_BG));
 	ClassDB::bind_method(D_METHOD("environment_set_glow", "env", "enable", "levels", "intensity", "strength", "mix", "bloom_threshold", "blend_mode", "hdr_bleed_threshold", "hdr_bleed_scale", "hdr_luminance_cap", "glow_map_strength", "glow_map"), &RenderingServer::environment_set_glow);
 	ClassDB::bind_method(D_METHOD("environment_set_tonemap", "env", "tone_mapper", "exposure", "white"), &RenderingServer::environment_set_tonemap);
 	ClassDB::bind_method(D_METHOD("environment_set_tonemap_agx_contrast", "env", "agx_contrast"), &RenderingServer::environment_set_tonemap_agx_contrast);
 	ClassDB::bind_method(D_METHOD("environment_set_adjustment", "env", "enable", "brightness", "contrast", "saturation", "use_1d_color_correction", "color_correction"), &RenderingServer::environment_set_adjustment);
 	ClassDB::bind_method(D_METHOD("environment_set_ssr", "env", "enable", "max_steps", "fade_in", "fade_out", "depth_tolerance"), &RenderingServer::environment_set_ssr);
 	ClassDB::bind_method(D_METHOD("environment_set_ssao", "env", "enable", "radius", "intensity", "power", "detail", "horizon", "sharpness", "light_affect", "ao_channel_affect"), &RenderingServer::environment_set_ssao);
-	ClassDB::bind_method(D_METHOD("environment_set_fog", "env", "enable", "light_color", "light_energy", "sun_scatter", "density", "height", "height_density", "aerial_perspective", "sky_affect", "fog_mode"), &RenderingServer::environment_set_fog, DEFVAL(RSE::ENV_FOG_MODE_EXPONENTIAL));
+	ClassDB::bind_method(D_METHOD("environment_set_fog", "env", "enable", "light_color", "light_energy", "sun_scatter", "density", "height", "height_density", "aerial_perspective", "sky_affect", "fog_mode"), &RenderingServer::environment_set_fog, DEFVAL(RS::ENV_FOG_MODE_EXPONENTIAL));
 	ClassDB::bind_method(D_METHOD("environment_set_fog_depth", "env", "curve", "begin", "end"), &RenderingServer::environment_set_fog_depth);
 	ClassDB::bind_method(D_METHOD("environment_set_sdfgi", "env", "enable", "cascades", "min_cell_size", "y_scale", "use_occlusion", "bounce_feedback", "read_sky", "energy", "normal_bias", "probe_bias"), &RenderingServer::environment_set_sdfgi);
 	ClassDB::bind_method(D_METHOD("environment_set_volumetric_fog", "env", "enable", "density", "albedo", "emission", "emission_energy", "anisotropy", "length", "p_detail_spread", "gi_inject", "temporal_reprojection", "temporal_reprojection_amount", "ambient_inject", "sky_affect"), &RenderingServer::environment_set_volumetric_fog);
@@ -3092,87 +3128,87 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("sub_surface_scattering_set_quality", "quality"), &RenderingServer::sub_surface_scattering_set_quality);
 	ClassDB::bind_method(D_METHOD("sub_surface_scattering_set_scale", "scale", "depth_scale"), &RenderingServer::sub_surface_scattering_set_scale);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_CLEAR_COLOR);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_COLOR);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_SKY);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_CANVAS);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_KEEP);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_CAMERA_FEED);
-	BIND_ENUM_CONSTANT(RSE::ENV_BG_MAX);
+	BIND_ENUM_CONSTANT(ENV_BG_CLEAR_COLOR);
+	BIND_ENUM_CONSTANT(ENV_BG_COLOR);
+	BIND_ENUM_CONSTANT(ENV_BG_SKY);
+	BIND_ENUM_CONSTANT(ENV_BG_CANVAS);
+	BIND_ENUM_CONSTANT(ENV_BG_KEEP);
+	BIND_ENUM_CONSTANT(ENV_BG_CAMERA_FEED);
+	BIND_ENUM_CONSTANT(ENV_BG_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_AMBIENT_SOURCE_BG);
-	BIND_ENUM_CONSTANT(RSE::ENV_AMBIENT_SOURCE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::ENV_AMBIENT_SOURCE_COLOR);
-	BIND_ENUM_CONSTANT(RSE::ENV_AMBIENT_SOURCE_SKY);
+	BIND_ENUM_CONSTANT(ENV_AMBIENT_SOURCE_BG);
+	BIND_ENUM_CONSTANT(ENV_AMBIENT_SOURCE_DISABLED);
+	BIND_ENUM_CONSTANT(ENV_AMBIENT_SOURCE_COLOR);
+	BIND_ENUM_CONSTANT(ENV_AMBIENT_SOURCE_SKY);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_REFLECTION_SOURCE_BG);
-	BIND_ENUM_CONSTANT(RSE::ENV_REFLECTION_SOURCE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::ENV_REFLECTION_SOURCE_SKY);
+	BIND_ENUM_CONSTANT(ENV_REFLECTION_SOURCE_BG);
+	BIND_ENUM_CONSTANT(ENV_REFLECTION_SOURCE_DISABLED);
+	BIND_ENUM_CONSTANT(ENV_REFLECTION_SOURCE_SKY);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_GLOW_BLEND_MODE_ADDITIVE);
-	BIND_ENUM_CONSTANT(RSE::ENV_GLOW_BLEND_MODE_SCREEN);
-	BIND_ENUM_CONSTANT(RSE::ENV_GLOW_BLEND_MODE_SOFTLIGHT);
-	BIND_ENUM_CONSTANT(RSE::ENV_GLOW_BLEND_MODE_REPLACE);
-	BIND_ENUM_CONSTANT(RSE::ENV_GLOW_BLEND_MODE_MIX);
+	BIND_ENUM_CONSTANT(ENV_GLOW_BLEND_MODE_ADDITIVE);
+	BIND_ENUM_CONSTANT(ENV_GLOW_BLEND_MODE_SCREEN);
+	BIND_ENUM_CONSTANT(ENV_GLOW_BLEND_MODE_SOFTLIGHT);
+	BIND_ENUM_CONSTANT(ENV_GLOW_BLEND_MODE_REPLACE);
+	BIND_ENUM_CONSTANT(ENV_GLOW_BLEND_MODE_MIX);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_FOG_MODE_EXPONENTIAL);
-	BIND_ENUM_CONSTANT(RSE::ENV_FOG_MODE_DEPTH);
+	BIND_ENUM_CONSTANT(ENV_FOG_MODE_EXPONENTIAL);
+	BIND_ENUM_CONSTANT(ENV_FOG_MODE_DEPTH);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_TONE_MAPPER_LINEAR);
-	BIND_ENUM_CONSTANT(RSE::ENV_TONE_MAPPER_REINHARD);
-	BIND_ENUM_CONSTANT(RSE::ENV_TONE_MAPPER_FILMIC);
-	BIND_ENUM_CONSTANT(RSE::ENV_TONE_MAPPER_ACES);
-	BIND_ENUM_CONSTANT(RSE::ENV_TONE_MAPPER_AGX);
+	BIND_ENUM_CONSTANT(ENV_TONE_MAPPER_LINEAR);
+	BIND_ENUM_CONSTANT(ENV_TONE_MAPPER_REINHARD);
+	BIND_ENUM_CONSTANT(ENV_TONE_MAPPER_FILMIC);
+	BIND_ENUM_CONSTANT(ENV_TONE_MAPPER_ACES);
+	BIND_ENUM_CONSTANT(ENV_TONE_MAPPER_AGX);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SSR_ROUGHNESS_QUALITY_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSR_ROUGHNESS_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSR_ROUGHNESS_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSR_ROUGHNESS_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(ENV_SSR_ROUGHNESS_QUALITY_DISABLED);
+	BIND_ENUM_CONSTANT(ENV_SSR_ROUGHNESS_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(ENV_SSR_ROUGHNESS_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(ENV_SSR_ROUGHNESS_QUALITY_HIGH);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SSAO_QUALITY_VERY_LOW);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSAO_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSAO_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSAO_QUALITY_HIGH);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSAO_QUALITY_ULTRA);
+	BIND_ENUM_CONSTANT(ENV_SSAO_QUALITY_VERY_LOW);
+	BIND_ENUM_CONSTANT(ENV_SSAO_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(ENV_SSAO_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(ENV_SSAO_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(ENV_SSAO_QUALITY_ULTRA);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SSIL_QUALITY_VERY_LOW);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSIL_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSIL_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSIL_QUALITY_HIGH);
-	BIND_ENUM_CONSTANT(RSE::ENV_SSIL_QUALITY_ULTRA);
+	BIND_ENUM_CONSTANT(ENV_SSIL_QUALITY_VERY_LOW);
+	BIND_ENUM_CONSTANT(ENV_SSIL_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(ENV_SSIL_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(ENV_SSIL_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(ENV_SSIL_QUALITY_ULTRA);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_Y_SCALE_50_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_Y_SCALE_75_PERCENT);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_Y_SCALE_100_PERCENT);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_Y_SCALE_50_PERCENT);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_Y_SCALE_75_PERCENT);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_Y_SCALE_100_PERCENT);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_4);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_8);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_16);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_32);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_64);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_96);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_128);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_RAY_COUNT_MAX);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_4);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_8);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_16);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_32);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_64);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_96);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_128);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_RAY_COUNT_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_5_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_10_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_15_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_20_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_25_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_IN_30_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_CONVERGE_MAX);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_5_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_10_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_15_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_20_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_25_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_IN_30_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_CONVERGE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_IN_2_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_IN_8_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_IN_16_FRAMES);
-	BIND_ENUM_CONSTANT(RSE::ENV_SDFGI_UPDATE_LIGHT_MAX);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_IN_2_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_IN_8_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_IN_16_FRAMES);
+	BIND_ENUM_CONSTANT(ENV_SDFGI_UPDATE_LIGHT_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::SUB_SURFACE_SCATTERING_QUALITY_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::SUB_SURFACE_SCATTERING_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::SUB_SURFACE_SCATTERING_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::SUB_SURFACE_SCATTERING_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(SUB_SURFACE_SCATTERING_QUALITY_DISABLED);
+	BIND_ENUM_CONSTANT(SUB_SURFACE_SCATTERING_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(SUB_SURFACE_SCATTERING_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(SUB_SURFACE_SCATTERING_QUALITY_HIGH);
 
 	/* CAMERA EFFECTS */
 
@@ -3185,14 +3221,14 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_exposure", "camera_attributes", "multiplier", "normalization"), &RenderingServer::camera_attributes_set_exposure);
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_auto_exposure", "camera_attributes", "enable", "min_sensitivity", "max_sensitivity", "speed", "scale"), &RenderingServer::camera_attributes_set_auto_exposure);
 
-	BIND_ENUM_CONSTANT(RSE::DOF_BOKEH_BOX);
-	BIND_ENUM_CONSTANT(RSE::DOF_BOKEH_HEXAGON);
-	BIND_ENUM_CONSTANT(RSE::DOF_BOKEH_CIRCLE);
+	BIND_ENUM_CONSTANT(DOF_BOKEH_BOX);
+	BIND_ENUM_CONSTANT(DOF_BOKEH_HEXAGON);
+	BIND_ENUM_CONSTANT(DOF_BOKEH_CIRCLE);
 
-	BIND_ENUM_CONSTANT(RSE::DOF_BLUR_QUALITY_VERY_LOW);
-	BIND_ENUM_CONSTANT(RSE::DOF_BLUR_QUALITY_LOW);
-	BIND_ENUM_CONSTANT(RSE::DOF_BLUR_QUALITY_MEDIUM);
-	BIND_ENUM_CONSTANT(RSE::DOF_BLUR_QUALITY_HIGH);
+	BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_VERY_LOW);
+	BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_LOW);
+	BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_MEDIUM);
+	BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_HIGH);
 
 	/* SCENARIO */
 
@@ -3243,46 +3279,46 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("instances_cull_ray", "from", "to", "scenario"), &RenderingServer::_instances_cull_ray_bind, DEFVAL(RID()));
 	ClassDB::bind_method(D_METHOD("instances_cull_convex", "convex", "scenario"), &RenderingServer::_instances_cull_convex_bind, DEFVAL(RID()));
 
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_NONE);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_MESH);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_MULTIMESH);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_PARTICLES);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_PARTICLES_COLLISION);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_LIGHT);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_REFLECTION_PROBE);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_DECAL);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_VOXEL_GI);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_LIGHTMAP);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_OCCLUDER);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_VISIBLITY_NOTIFIER);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FOG_VOLUME);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_MAX);
+	BIND_ENUM_CONSTANT(INSTANCE_NONE);
+	BIND_ENUM_CONSTANT(INSTANCE_MESH);
+	BIND_ENUM_CONSTANT(INSTANCE_MULTIMESH);
+	BIND_ENUM_CONSTANT(INSTANCE_PARTICLES);
+	BIND_ENUM_CONSTANT(INSTANCE_PARTICLES_COLLISION);
+	BIND_ENUM_CONSTANT(INSTANCE_LIGHT);
+	BIND_ENUM_CONSTANT(INSTANCE_REFLECTION_PROBE);
+	BIND_ENUM_CONSTANT(INSTANCE_DECAL);
+	BIND_ENUM_CONSTANT(INSTANCE_VOXEL_GI);
+	BIND_ENUM_CONSTANT(INSTANCE_LIGHTMAP);
+	BIND_ENUM_CONSTANT(INSTANCE_OCCLUDER);
+	BIND_ENUM_CONSTANT(INSTANCE_VISIBLITY_NOTIFIER);
+	BIND_ENUM_CONSTANT(INSTANCE_FOG_VOLUME);
+	BIND_ENUM_CONSTANT(INSTANCE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_GEOMETRY_MASK);
+	BIND_ENUM_CONSTANT(INSTANCE_GEOMETRY_MASK);
 
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FLAG_USE_BAKED_LIGHT);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FLAG_USE_DYNAMIC_GI);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING);
-	BIND_ENUM_CONSTANT(RSE::INSTANCE_FLAG_MAX);
+	BIND_ENUM_CONSTANT(INSTANCE_FLAG_USE_BAKED_LIGHT);
+	BIND_ENUM_CONSTANT(INSTANCE_FLAG_USE_DYNAMIC_GI);
+	BIND_ENUM_CONSTANT(INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE);
+	BIND_ENUM_CONSTANT(INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING);
+	BIND_ENUM_CONSTANT(INSTANCE_FLAG_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::SHADOW_CASTING_SETTING_OFF);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_CASTING_SETTING_ON);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED);
-	BIND_ENUM_CONSTANT(RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY);
+	BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_OFF);
+	BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_ON);
+	BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_DOUBLE_SIDED);
+	BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_SHADOWS_ONLY);
 
-	BIND_ENUM_CONSTANT(RSE::VISIBILITY_RANGE_FADE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::VISIBILITY_RANGE_FADE_SELF);
-	BIND_ENUM_CONSTANT(RSE::VISIBILITY_RANGE_FADE_DEPENDENCIES);
+	BIND_ENUM_CONSTANT(VISIBILITY_RANGE_FADE_DISABLED);
+	BIND_ENUM_CONSTANT(VISIBILITY_RANGE_FADE_SELF);
+	BIND_ENUM_CONSTANT(VISIBILITY_RANGE_FADE_DEPENDENCIES);
 
 	/* Bake 3D Object */
 
 	ClassDB::bind_method(D_METHOD("bake_render_uv2", "base", "material_overrides", "image_size"), &RenderingServer::bake_render_uv2);
 
-	BIND_ENUM_CONSTANT(RSE::BAKE_CHANNEL_ALBEDO_ALPHA);
-	BIND_ENUM_CONSTANT(RSE::BAKE_CHANNEL_NORMAL);
-	BIND_ENUM_CONSTANT(RSE::BAKE_CHANNEL_ORM);
-	BIND_ENUM_CONSTANT(RSE::BAKE_CHANNEL_EMISSION);
+	BIND_ENUM_CONSTANT(BAKE_CHANNEL_ALBEDO_ALPHA);
+	BIND_ENUM_CONSTANT(BAKE_CHANNEL_NORMAL);
+	BIND_ENUM_CONSTANT(BAKE_CHANNEL_ORM);
+	BIND_ENUM_CONSTANT(BAKE_CHANNEL_EMISSION);
 
 	/* CANVAS (2D) */
 
@@ -3301,9 +3337,9 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("canvas_texture_set_texture_filter", "canvas_texture", "filter"), &RenderingServer::canvas_texture_set_texture_filter);
 	ClassDB::bind_method(D_METHOD("canvas_texture_set_texture_repeat", "canvas_texture", "repeat"), &RenderingServer::canvas_texture_set_texture_repeat);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_TEXTURE_CHANNEL_DIFFUSE);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_TEXTURE_CHANNEL_NORMAL);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_TEXTURE_CHANNEL_SPECULAR);
+	BIND_ENUM_CONSTANT(CANVAS_TEXTURE_CHANNEL_DIFFUSE);
+	BIND_ENUM_CONSTANT(CANVAS_TEXTURE_CHANNEL_NORMAL);
+	BIND_ENUM_CONSTANT(CANVAS_TEXTURE_CHANNEL_SPECULAR);
 
 	/* CANVAS ITEM */
 
@@ -3337,7 +3373,7 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("canvas_item_add_msdf_texture_rect_region", "item", "rect", "texture", "src_rect", "modulate", "outline_size", "px_range", "scale"), &RenderingServer::canvas_item_add_msdf_texture_rect_region, DEFVAL(Color(1, 1, 1)), DEFVAL(0), DEFVAL(1.0), DEFVAL(1.0));
 	ClassDB::bind_method(D_METHOD("canvas_item_add_lcd_texture_rect_region", "item", "rect", "texture", "src_rect", "modulate"), &RenderingServer::canvas_item_add_lcd_texture_rect_region);
 	ClassDB::bind_method(D_METHOD("canvas_item_add_texture_rect_region", "item", "rect", "texture", "src_rect", "modulate", "transpose", "clip_uv"), &RenderingServer::canvas_item_add_texture_rect_region, DEFVAL(Color(1, 1, 1)), DEFVAL(false), DEFVAL(true));
-	ClassDB::bind_method(D_METHOD("canvas_item_add_nine_patch", "item", "rect", "source", "texture", "topleft", "bottomright", "x_axis_mode", "y_axis_mode", "draw_center", "modulate"), &RenderingServer::canvas_item_add_nine_patch, DEFVAL(RSE::NINE_PATCH_STRETCH), DEFVAL(RSE::NINE_PATCH_STRETCH), DEFVAL(true), DEFVAL(Color(1, 1, 1)));
+	ClassDB::bind_method(D_METHOD("canvas_item_add_nine_patch", "item", "rect", "source", "texture", "topleft", "bottomright", "x_axis_mode", "y_axis_mode", "draw_center", "modulate"), &RenderingServer::canvas_item_add_nine_patch, DEFVAL(NINE_PATCH_STRETCH), DEFVAL(NINE_PATCH_STRETCH), DEFVAL(true), DEFVAL(Color(1, 1, 1)));
 	ClassDB::bind_method(D_METHOD("canvas_item_add_primitive", "item", "points", "colors", "uvs", "texture"), &RenderingServer::canvas_item_add_primitive);
 	ClassDB::bind_method(D_METHOD("canvas_item_add_polygon", "item", "points", "colors", "uvs", "texture"), &RenderingServer::canvas_item_add_polygon, DEFVAL(Vector<Point2>()), DEFVAL(RID()));
 	ClassDB::bind_method(D_METHOD("canvas_item_add_triangle_array", "item", "indices", "points", "colors", "uvs", "bones", "weights", "texture", "count"), &RenderingServer::canvas_item_add_triangle_array, DEFVAL(Vector<Point2>()), DEFVAL(Vector<int>()), DEFVAL(Vector<float>()), DEFVAL(RID()), DEFVAL(-1));
@@ -3368,29 +3404,29 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("debug_canvas_item_get_rect", "item"), &RenderingServer::debug_canvas_item_get_rect);
 
-	BIND_ENUM_CONSTANT(RSE::NINE_PATCH_STRETCH);
-	BIND_ENUM_CONSTANT(RSE::NINE_PATCH_TILE);
-	BIND_ENUM_CONSTANT(RSE::NINE_PATCH_TILE_FIT);
+	BIND_ENUM_CONSTANT(NINE_PATCH_STRETCH);
+	BIND_ENUM_CONSTANT(NINE_PATCH_TILE);
+	BIND_ENUM_CONSTANT(NINE_PATCH_TILE_FIT);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_DEFAULT);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_FILTER_MAX);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_DEFAULT);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_NEAREST);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_LINEAR);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_FILTER_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_ITEM_TEXTURE_REPEAT_MAX);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_REPEAT_ENABLED);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_REPEAT_MIRROR);
+	BIND_ENUM_CONSTANT(CANVAS_ITEM_TEXTURE_REPEAT_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_GROUP_MODE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_GROUP_MODE_CLIP_ONLY);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_GROUP_MODE_CLIP_AND_DRAW);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_GROUP_MODE_TRANSPARENT);
+	BIND_ENUM_CONSTANT(CANVAS_GROUP_MODE_DISABLED);
+	BIND_ENUM_CONSTANT(CANVAS_GROUP_MODE_CLIP_ONLY);
+	BIND_ENUM_CONSTANT(CANVAS_GROUP_MODE_CLIP_AND_DRAW);
+	BIND_ENUM_CONSTANT(CANVAS_GROUP_MODE_TRANSPARENT);
 
 	/* CANVAS LIGHT */
 
@@ -3418,17 +3454,17 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("canvas_light_reset_physics_interpolation", "light"), &RenderingServer::canvas_light_reset_physics_interpolation);
 	ClassDB::bind_method(D_METHOD("canvas_light_transform_physics_interpolation", "light", "transform"), &RenderingServer::canvas_light_transform_physics_interpolation);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_MODE_POINT);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_MODE_DIRECTIONAL);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_MODE_POINT);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_MODE_DIRECTIONAL);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_BLEND_MODE_ADD);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_BLEND_MODE_SUB);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_BLEND_MODE_MIX);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_BLEND_MODE_ADD);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_BLEND_MODE_SUB);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_BLEND_MODE_MIX);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_FILTER_NONE);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_FILTER_PCF5);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_FILTER_PCF13);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_LIGHT_FILTER_MAX);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_FILTER_NONE);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_FILTER_PCF5);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_FILTER_PCF13);
+	BIND_ENUM_CONSTANT(CANVAS_LIGHT_FILTER_MAX);
 
 	/* CANVAS OCCLUDER */
 
@@ -3451,9 +3487,9 @@ void RenderingServer::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("canvas_set_shadow_texture_size", "size"), &RenderingServer::canvas_set_shadow_texture_size);
 
-	BIND_ENUM_CONSTANT(RSE::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE);
-	BIND_ENUM_CONSTANT(RSE::CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE);
+	BIND_ENUM_CONSTANT(CANVAS_OCCLUDER_POLYGON_CULL_DISABLED);
+	BIND_ENUM_CONSTANT(CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE);
+	BIND_ENUM_CONSTANT(CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE);
 
 	/* GLOBAL SHADER UNIFORMS */
 
@@ -3465,36 +3501,36 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("global_shader_parameter_get", "name"), &RenderingServer::global_shader_parameter_get);
 	ClassDB::bind_method(D_METHOD("global_shader_parameter_get_type", "name"), &RenderingServer::global_shader_parameter_get_type);
 
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_BOOL);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_BVEC2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_BVEC3);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_BVEC4);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_INT);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_IVEC2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_IVEC3);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_IVEC4);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_RECT2I);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_UINT);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_UVEC2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_UVEC3);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_UVEC4);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_FLOAT);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_VEC2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_VEC3);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_VEC4);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_COLOR);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_RECT2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_MAT2);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_MAT3);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_MAT4);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_TRANSFORM_2D);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_TRANSFORM);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_SAMPLER2D);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_SAMPLER2DARRAY);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_SAMPLER3D);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_SAMPLERCUBE);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_SAMPLEREXT);
-	BIND_ENUM_CONSTANT(RSE::GLOBAL_VAR_TYPE_MAX);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_BOOL);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_BVEC2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_BVEC3);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_BVEC4);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_INT);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_IVEC2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_IVEC3);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_IVEC4);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_RECT2I);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_UINT);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_UVEC2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_UVEC3);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_UVEC4);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_FLOAT);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_VEC2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_VEC3);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_VEC4);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_COLOR);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_RECT2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_MAT2);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_MAT3);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_MAT4);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_TRANSFORM_2D);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_TRANSFORM);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_SAMPLER2D);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_SAMPLER2DARRAY);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_SAMPLER3D);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_SAMPLERCUBE);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_SAMPLEREXT);
+	BIND_ENUM_CONSTANT(GLOBAL_VAR_TYPE_MAX);
 
 	/* Free */
 	ClassDB::bind_method(D_METHOD("free_rid", "rid"), &RenderingServer::free_rid);
@@ -3535,31 +3571,31 @@ void RenderingServer::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "render_loop_enabled"), "set_render_loop_enabled", "is_render_loop_enabled");
 
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_TEXTURE_MEM_USED);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_BUFFER_MEM_USED);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_VIDEO_MEM_USED);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_MESH);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
-	BIND_ENUM_CONSTANT(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_TEXTURE_MEM_USED);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_BUFFER_MEM_USED);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_VIDEO_MEM_USED);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_PIPELINE_COMPILATIONS_MESH);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
+	BIND_ENUM_CONSTANT(RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
 
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_CANVAS);
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_MESH);
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_SURFACE);
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_DRAW);
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_SPECIALIZATION);
-	BIND_ENUM_CONSTANT(RSE::PIPELINE_SOURCE_MAX);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_CANVAS);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_MESH);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_SURFACE);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_DRAW);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_SPECIALIZATION);
+	BIND_ENUM_CONSTANT(PIPELINE_SOURCE_MAX);
 
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_DISABLED);
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_KEEP);
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_KEEP_WIDTH);
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_KEEP_HEIGHT);
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_COVER);
-	BIND_ENUM_CONSTANT(RSE::SPLASH_STRETCH_MODE_IGNORE);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_DISABLED);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_KEEP);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_KEEP_WIDTH);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_KEEP_HEIGHT);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_COVER);
+	BIND_ENUM_CONSTANT(SPLASH_STRETCH_MODE_IGNORE);
 
 	ADD_SIGNAL(MethodInfo("frame_pre_draw"));
 	ADD_SIGNAL(MethodInfo("frame_post_draw"));
@@ -3575,8 +3611,8 @@ void RenderingServer::_bind_methods() {
 #ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("has_feature", "feature"), &RenderingServer::has_feature);
 
-	BIND_ENUM_CONSTANT(RSE::FEATURE_SHADERS);
-	BIND_ENUM_CONSTANT(RSE::FEATURE_MULTITHREADED);
+	BIND_ENUM_CONSTANT(FEATURE_SHADERS);
+	BIND_ENUM_CONSTANT(FEATURE_MULTITHREADED);
 #endif
 }
 
@@ -3598,10 +3634,10 @@ void RenderingServer::mesh_add_surface_from_mesh_data(RID p_mesh, const Geometry
 	}
 
 	Array d;
-	d.resize(RSE::ARRAY_MAX);
-	d[RSE::ARRAY_VERTEX] = vertices;
-	d[RSE::ARRAY_NORMAL] = normals;
-	mesh_add_surface_from_arrays(p_mesh, RSE::PRIMITIVE_TRIANGLES, d);
+	d.resize(RS::ARRAY_MAX);
+	d[ARRAY_VERTEX] = vertices;
+	d[ARRAY_NORMAL] = normals;
+	mesh_add_surface_from_arrays(p_mesh, PRIMITIVE_TRIANGLES, d);
 }
 
 void RenderingServer::mesh_add_surface_from_planes(RID p_mesh, const Vector<Plane> &p_planes) {
@@ -3611,7 +3647,7 @@ void RenderingServer::mesh_add_surface_from_planes(RID p_mesh, const Vector<Plan
 
 #ifndef DISABLE_DEPRECATED
 void RenderingServer::set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter) {
-	RSE::SplashStretchMode stretch_mode = p_scale ? RSE::SPLASH_STRETCH_MODE_KEEP : RSE::SPLASH_STRETCH_MODE_DISABLED;
+	SplashStretchMode stretch_mode = map_scaling_option_to_stretch_mode(p_scale);
 	set_boot_image_with_stretch(p_image, p_color, stretch_mode, p_use_filter);
 }
 #endif
@@ -3749,11 +3785,11 @@ void RenderingServer::init() {
 		String mode_hints;
 		String mode_hints_metal;
 		{
-			Vector<String> mode_hints_arr = { "Nearest (Fastest):5", "Bilinear (Fastest):0", "FSR 1.0 (Fast):1", "FSR 2.2 (Slow):2" };
+			Vector<String> mode_hints_arr = { "Bilinear (Fastest)", "FSR 1.0 (Fast)", "FSR 2.2 (Slow)" };
 			mode_hints = String(",").join(mode_hints_arr);
 
-			mode_hints_arr.push_back("MetalFX (Spatial - Fast):3");
-			mode_hints_arr.push_back("MetalFX (Temporal - Slow):4");
+			mode_hints_arr.push_back("MetalFX (Spatial)");
+			mode_hints_arr.push_back("MetalFX (Temporal)");
 			mode_hints_metal = String(",").join(mode_hints_arr);
 		}
 
@@ -3761,12 +3797,12 @@ void RenderingServer::init() {
 		GLOBAL_DEF_NOVAL(PropertyInfo(Variant::INT, "rendering/scaling_3d/mode.ios", PROPERTY_HINT_ENUM, mode_hints_metal), 0);
 		GLOBAL_DEF_NOVAL(PropertyInfo(Variant::INT, "rendering/scaling_3d/mode.macos", PROPERTY_HINT_ENUM, mode_hints_metal), 0);
 	}
-	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/scaling_3d/scale", PROPERTY_HINT_RANGE, "0.1,2.0,0.0001"), 1.0);
-	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/scaling_3d/fsr_sharpness", PROPERTY_HINT_RANGE, "0,2,0.01"), 0.2f);
+	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/scaling_3d/scale", PROPERTY_HINT_RANGE, "0.25,2.0,0.01"), 1.0);
+	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/scaling_3d/fsr_sharpness", PROPERTY_HINT_RANGE, "0,2,0.1"), 0.2f);
 
 	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/textures/default_filters/texture_mipmap_bias", PROPERTY_HINT_RANGE, "-2,2,0.001"), 0.0f);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/decals/filter", PROPERTY_HINT_ENUM, "Nearest (Fast),Linear (Fast),Nearest Mipmap (Fast),Linear Mipmap (Fast),Nearest Mipmap Anisotropic (Average),Linear Mipmap Anisotropic (Average)"), RSE::DECAL_FILTER_LINEAR_MIPMAPS);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/light_projectors/filter", PROPERTY_HINT_ENUM, "Nearest (Fast),Linear (Fast),Nearest Mipmap (Fast),Linear Mipmap (Fast),Nearest Mipmap Anisotropic (Average),Linear Mipmap Anisotropic (Average)"), RSE::LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/decals/filter", PROPERTY_HINT_ENUM, "Nearest (Fast),Linear (Fast),Nearest Mipmap (Fast),Linear Mipmap (Fast),Nearest Mipmap Anisotropic (Average),Linear Mipmap Anisotropic (Average)"), DECAL_FILTER_LINEAR_MIPMAPS);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/light_projectors/filter", PROPERTY_HINT_ENUM, "Nearest (Fast),Linear (Fast),Nearest Mipmap (Fast),Linear Mipmap (Fast),Nearest Mipmap Anisotropic (Average),Linear Mipmap Anisotropic (Average)"), LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS);
 
 	GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/occlusion_culling/occlusion_rays_per_thread", PROPERTY_HINT_RANGE, "1,2048,1,or_greater"), 512);
 
diff --git a/engine/servers/rendering/rendering_server.h b/engine/servers/rendering/rendering_server.h
index 0c81a0fa..6cf24e66 100644
--- a/engine/servers/rendering/rendering_server.h
+++ b/engine/servers/rendering/rendering_server.h
@@ -31,36 +31,30 @@
 #pragma once
 
 #include "core/io/image.h"
+#include "core/math/geometry_3d.h"
+#include "core/math/transform_2d.h"
 #include "core/templates/rid.h"
 #include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
-#include "servers/display/display_server_enums.h"
-#include "servers/rendering/rendering_device_enums.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-
-namespace Geometry3D {
-struct MeshData;
-}
+#include "servers/display/display_server.h"
+#include "servers/rendering/rendering_device.h"
 
 // Helper macros for code outside of the rendering server, but that is
 // called by the rendering server.
 #ifdef DEBUG_ENABLED
-#define ERR_NOT_ON_RENDER_THREAD \
+#define ERR_NOT_ON_RENDER_THREAD                                          \
 	RenderingServer *rendering_server = RenderingServer::get_singleton(); \
-	ERR_FAIL_NULL(rendering_server); \
+	ERR_FAIL_NULL(rendering_server);                                      \
 	ERR_FAIL_COND(!rendering_server->is_on_render_thread());
-#define ERR_NOT_ON_RENDER_THREAD_V(m_ret) \
+#define ERR_NOT_ON_RENDER_THREAD_V(m_ret)                                 \
 	RenderingServer *rendering_server = RenderingServer::get_singleton(); \
-	ERR_FAIL_NULL_V(rendering_server, m_ret); \
+	ERR_FAIL_NULL_V(rendering_server, m_ret);                             \
 	ERR_FAIL_COND_V(!rendering_server->is_on_render_thread(), m_ret);
 #else
 #define ERR_NOT_ON_RENDER_THREAD
 #define ERR_NOT_ON_RENDER_THREAD_V(m_ret)
 #endif
 
-class RenderingDevice;
-
 class RenderingServer : public Object {
 	GDCLASS(RenderingServer, Object);
 
@@ -95,8 +89,6 @@ protected:
 	void _canvas_item_add_circle_bind_compat_84523(RID p_item, const Point2 &p_pos, float p_radius, const Color &p_color);
 	void _instance_set_interpolated_bind_compat_104269(RID p_instance, bool p_interpolated);
 	void _instance_reset_physics_interpolation_bind_compat_104269(RID p_instance);
-	void _viewport_set_size_compat_115799(RID p_viewport, int p_width, int p_height);
-	void _particles_request_process_time_bind_compat_109142(RID p_particles, real_t p_request_process_time);
 
 	static void _bind_compatibility_methods();
 #endif
@@ -105,27 +97,58 @@ public:
 	static RenderingServer *get_singleton();
 	static RenderingServer *create();
 
+	enum {
+		NO_INDEX_ARRAY = -1,
+		ARRAY_WEIGHTS_SIZE = 4,
+		CANVAS_ITEM_Z_MIN = -4096,
+		CANVAS_ITEM_Z_MAX = 4096,
+		CANVAS_LAYER_MIN = -2147483648,
+		CANVAS_LAYER_MAX = 2147483647,
+		MAX_GLOW_LEVELS = 7,
+		MAX_CURSORS = 8,
+		MAX_2D_DIRECTIONAL_LIGHTS = 8,
+		MAX_MESH_SURFACES = 256
+	};
+
 	/* TEXTURE API */
 
+	enum TextureType {
+		TEXTURE_TYPE_2D,
+		TEXTURE_TYPE_LAYERED,
+		TEXTURE_TYPE_3D,
+	};
+
+	enum TextureLayeredType {
+		TEXTURE_LAYERED_2D_ARRAY,
+		TEXTURE_LAYERED_CUBEMAP,
+		TEXTURE_LAYERED_CUBEMAP_ARRAY,
+	};
+
+	enum CubeMapLayer {
+		CUBEMAP_LAYER_LEFT,
+		CUBEMAP_LAYER_RIGHT,
+		CUBEMAP_LAYER_BOTTOM,
+		CUBEMAP_LAYER_TOP,
+		CUBEMAP_LAYER_FRONT,
+		CUBEMAP_LAYER_BACK
+	};
+
 	virtual RID texture_2d_create(const Ref<Image> &p_image) = 0;
-	virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) = 0;
+	virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, TextureLayeredType p_layered_type) = 0;
 	virtual RID texture_3d_create(Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) = 0; //all slices, then all the mipmaps, must be coherent
 	virtual RID texture_external_create(int p_width, int p_height, uint64_t p_external_buffer = 0) = 0;
 	virtual RID texture_proxy_create(RID p_base) = 0;
-	virtual RID texture_drawable_create(int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color = Color(1, 1, 1, 1), bool p_with_mipmaps = false) = 0;
 
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) = 0;
+	virtual RID texture_create_from_native_handle(TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, TextureLayeredType p_layered_type = TEXTURE_LAYERED_2D_ARRAY) = 0;
 
 	virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) = 0;
 	virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) = 0;
 	virtual void texture_external_update(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer = 0) = 0;
 	virtual void texture_proxy_update(RID p_texture, RID p_proxy_to) = 0;
 
-	virtual void texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap = 0) = 0;
-
 	// These two APIs can be used together or in combination with the others.
 	virtual RID texture_2d_placeholder_create() = 0;
-	virtual RID texture_2d_layered_placeholder_create(RSE::TextureLayeredType p_layered_type) = 0;
+	virtual RID texture_2d_layered_placeholder_create(TextureLayeredType p_layered_type) = 0;
 	virtual RID texture_3d_placeholder_create() = 0;
 
 	virtual Ref<Image> texture_2d_get(RID p_texture) const = 0;
@@ -138,26 +161,72 @@ public:
 	virtual void texture_set_path(RID p_texture, const String &p_path) = 0;
 	virtual String texture_get_path(RID p_texture) const = 0;
 
-	virtual void texture_drawable_generate_mipmaps(RID p_texture) = 0; // Update mipmaps if modified
-	virtual RID texture_drawable_get_default_material() const = 0; // To use with simplified functions in DrawableTexture2D
-
 	virtual Image::Format texture_get_format(RID p_texture) const = 0;
 
-	virtual void texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) = 0;
-	virtual void texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) = 0;
-	virtual void texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) = 0;
+	typedef void (*TextureDetectCallback)(void *);
 
-	virtual void texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) = 0;
+	virtual void texture_set_detect_3d_callback(RID p_texture, TextureDetectCallback p_callback, void *p_userdata) = 0;
+	virtual void texture_set_detect_normal_callback(RID p_texture, TextureDetectCallback p_callback, void *p_userdata) = 0;
+
+	enum TextureDetectRoughnessChannel {
+		TEXTURE_DETECT_ROUGHNESS_R,
+		TEXTURE_DETECT_ROUGHNESS_G,
+		TEXTURE_DETECT_ROUGHNESS_B,
+		TEXTURE_DETECT_ROUGHNESS_A,
+		TEXTURE_DETECT_ROUGHNESS_GRAY,
+	};
+
+	typedef void (*TextureDetectRoughnessCallback)(void *, const String &, TextureDetectRoughnessChannel);
+	virtual void texture_set_detect_roughness_callback(RID p_texture, TextureDetectRoughnessCallback p_callback, void *p_userdata) = 0;
+
+	struct TextureInfo {
+		RID texture;
+		uint32_t width;
+		uint32_t height;
+		uint32_t depth;
+		Image::Format format;
+		int64_t bytes;
+		String path;
+		TextureType type;
+	};
+
+	virtual void texture_debug_usage(List<TextureInfo> *r_info) = 0;
 	Array _texture_debug_usage_bind();
 
 	virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) = 0;
 
-	virtual RID texture_rd_create(const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY) = 0;
+	virtual RID texture_rd_create(const RID &p_rd_texture, const RenderingServer::TextureLayeredType p_layer_type = RenderingServer::TEXTURE_LAYERED_2D_ARRAY) = 0;
 	virtual RID texture_get_rd_texture(RID p_texture, bool p_srgb = false) const = 0;
 	virtual uint64_t texture_get_native_handle(RID p_texture, bool p_srgb = false) const = 0;
 
+	/* PIPELINES API */
+
+	enum PipelineSource {
+		PIPELINE_SOURCE_CANVAS,
+		PIPELINE_SOURCE_MESH,
+		PIPELINE_SOURCE_SURFACE,
+		PIPELINE_SOURCE_DRAW,
+		PIPELINE_SOURCE_SPECIALIZATION,
+		PIPELINE_SOURCE_MAX
+	};
+
 	/* SHADER API */
 
+	enum ShaderMode {
+		SHADER_SPATIAL,
+		SHADER_CANVAS_ITEM,
+		SHADER_PARTICLES,
+		SHADER_SKY,
+		SHADER_FOG,
+		SHADER_MAX
+	};
+
+	enum CullMode {
+		CULL_MODE_DISABLED,
+		CULL_MODE_FRONT,
+		CULL_MODE_BACK,
+	};
+
 	virtual RID shader_create() = 0;
 	virtual RID shader_create_from_code(const String &p_code, const String &p_path_hint = String()) = 0;
 
@@ -170,10 +239,26 @@ public:
 	virtual void shader_set_default_texture_parameter(RID p_shader, const StringName &p_name, RID p_texture, int p_index = 0) = 0;
 	virtual RID shader_get_default_texture_parameter(RID p_shader, const StringName &p_name, int p_index = 0) const = 0;
 
-	virtual RenderingServerTypes::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const = 0;
+	struct ShaderNativeSourceCode {
+		struct Version {
+			struct Stage {
+				String name;
+				String code;
+			};
+			Vector<Stage> stages;
+		};
+		Vector<Version> versions;
+	};
+
+	virtual ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const = 0;
 
 	/* COMMON MATERIAL API */
 
+	enum {
+		MATERIAL_RENDER_PRIORITY_MIN = -128,
+		MATERIAL_RENDER_PRIORITY_MAX = 127,
+	};
+
 	virtual RID material_create() = 0;
 	virtual RID material_create_from_shader(RID p_next_pass, int p_render_priority, RID p_shader) = 0;
 
@@ -190,33 +275,158 @@ public:
 
 	/* MESH API */
 
-	virtual RID mesh_create_from_surfaces(const Vector<RenderingServerTypes::SurfaceData> &p_surfaces, int p_blend_shape_count = 0) = 0;
+	enum ArrayType {
+		ARRAY_VERTEX = 0, // RG32F (2D), RGB32F, RGBA16 (compressed)
+		ARRAY_NORMAL = 1, // RG16
+		ARRAY_TANGENT = 2, // BA16 (with normal) or A16 (with vertex, when compressed)
+		ARRAY_COLOR = 3, // RGBA8
+		ARRAY_TEX_UV = 4, // RG32F or RG16
+		ARRAY_TEX_UV2 = 5, // RG32F or RG16
+		ARRAY_CUSTOM0 = 6, // Depends on ArrayCustomFormat.
+		ARRAY_CUSTOM1 = 7,
+		ARRAY_CUSTOM2 = 8,
+		ARRAY_CUSTOM3 = 9,
+		ARRAY_BONES = 10, // RGBA16UI (x2 if 8 weights)
+		ARRAY_WEIGHTS = 11, // RGBA16UNORM (x2 if 8 weights)
+		ARRAY_INDEX = 12, // 16 or 32 bits depending on length > 0xFFFF.
+		ARRAY_MAX = 13
+	};
+
+	enum {
+		ARRAY_CUSTOM_COUNT = ARRAY_BONES - ARRAY_CUSTOM0
+	};
+
+	enum ArrayCustomFormat {
+		ARRAY_CUSTOM_RGBA8_UNORM,
+		ARRAY_CUSTOM_RGBA8_SNORM,
+		ARRAY_CUSTOM_RG_HALF,
+		ARRAY_CUSTOM_RGBA_HALF,
+		ARRAY_CUSTOM_R_FLOAT,
+		ARRAY_CUSTOM_RG_FLOAT,
+		ARRAY_CUSTOM_RGB_FLOAT,
+		ARRAY_CUSTOM_RGBA_FLOAT,
+		ARRAY_CUSTOM_MAX
+	};
+
+	enum ArrayFormat : uint64_t {
+		/* ARRAY FORMAT FLAGS */
+		ARRAY_FORMAT_VERTEX = 1 << ARRAY_VERTEX,
+		ARRAY_FORMAT_NORMAL = 1 << ARRAY_NORMAL,
+		ARRAY_FORMAT_TANGENT = 1 << ARRAY_TANGENT,
+		ARRAY_FORMAT_COLOR = 1 << ARRAY_COLOR,
+		ARRAY_FORMAT_TEX_UV = 1 << ARRAY_TEX_UV,
+		ARRAY_FORMAT_TEX_UV2 = 1 << ARRAY_TEX_UV2,
+		ARRAY_FORMAT_CUSTOM0 = 1 << ARRAY_CUSTOM0,
+		ARRAY_FORMAT_CUSTOM1 = 1 << ARRAY_CUSTOM1,
+		ARRAY_FORMAT_CUSTOM2 = 1 << ARRAY_CUSTOM2,
+		ARRAY_FORMAT_CUSTOM3 = 1 << ARRAY_CUSTOM3,
+		ARRAY_FORMAT_BONES = 1 << ARRAY_BONES,
+		ARRAY_FORMAT_WEIGHTS = 1 << ARRAY_WEIGHTS,
+		ARRAY_FORMAT_INDEX = 1 << ARRAY_INDEX,
+
+		ARRAY_FORMAT_BLEND_SHAPE_MASK = ARRAY_FORMAT_VERTEX | ARRAY_FORMAT_NORMAL | ARRAY_FORMAT_TANGENT,
+
+		ARRAY_FORMAT_CUSTOM_BASE = (ARRAY_INDEX + 1),
+		ARRAY_FORMAT_CUSTOM_BITS = 3,
+		ARRAY_FORMAT_CUSTOM_MASK = 0x7,
+		ARRAY_FORMAT_CUSTOM0_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + 0),
+		ARRAY_FORMAT_CUSTOM1_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS),
+		ARRAY_FORMAT_CUSTOM2_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * 2),
+		ARRAY_FORMAT_CUSTOM3_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * 3),
+
+		ARRAY_COMPRESS_FLAGS_BASE = (ARRAY_INDEX + 1 + 12),
+
+		ARRAY_FLAG_USE_2D_VERTICES = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 0),
+		ARRAY_FLAG_USE_DYNAMIC_UPDATE = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 1),
+		ARRAY_FLAG_USE_8_BONE_WEIGHTS = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 2),
+
+		ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 3),
+
+		ARRAY_FLAG_COMPRESS_ATTRIBUTES = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 4),
+		// We leave enough room for up to 5 more compression flags.
+
+		ARRAY_FLAG_FORMAT_VERSION_BASE = ARRAY_COMPRESS_FLAGS_BASE + 10,
+		ARRAY_FLAG_FORMAT_VERSION_SHIFT = ARRAY_FLAG_FORMAT_VERSION_BASE,
+		// When changes are made to the mesh format, add a new version and use it for the CURRENT_VERSION.
+		ARRAY_FLAG_FORMAT_VERSION_1 = 0,
+		ARRAY_FLAG_FORMAT_VERSION_2 = 1ULL << ARRAY_FLAG_FORMAT_VERSION_SHIFT,
+		ARRAY_FLAG_FORMAT_CURRENT_VERSION = ARRAY_FLAG_FORMAT_VERSION_2,
+		ARRAY_FLAG_FORMAT_VERSION_MASK = 0xFF, // 8 bits version
+	};
+
+	static_assert(sizeof(ArrayFormat) == 8, "ArrayFormat should be 64 bits long.");
+
+	enum PrimitiveType {
+		PRIMITIVE_POINTS,
+		PRIMITIVE_LINES,
+		PRIMITIVE_LINE_STRIP,
+		PRIMITIVE_TRIANGLES,
+		PRIMITIVE_TRIANGLE_STRIP,
+		PRIMITIVE_MAX,
+	};
+
+	struct SurfaceData {
+		PrimitiveType primitive = PRIMITIVE_MAX;
+
+		uint64_t format = ARRAY_FLAG_FORMAT_CURRENT_VERSION;
+		Vector<uint8_t> vertex_data; // Vertex, Normal, Tangent (change with skinning, blendshape).
+		Vector<uint8_t> attribute_data; // Color, UV, UV2, Custom0-3.
+		Vector<uint8_t> skin_data; // Bone index, Bone weight.
+		uint32_t vertex_count = 0;
+		Vector<uint8_t> index_data;
+		uint32_t index_count = 0;
+
+		AABB aabb;
+		struct LOD {
+			float edge_length = 0.0f;
+			Vector<uint8_t> index_data;
+		};
+		Vector<LOD> lods;
+		Vector<AABB> bone_aabbs;
+
+		// Transforms used in runtime bone AABBs compute.
+		// Since bone AABBs is saved in Mesh space, but bones is in Skeleton space.
+		Transform3D mesh_to_skeleton_xform;
+
+		Vector<uint8_t> blend_shape_data;
+
+		Vector4 uv_scale;
+
+		RID material;
+	};
+
+	virtual RID mesh_create_from_surfaces(const Vector<SurfaceData> &p_surfaces, int p_blend_shape_count = 0) = 0;
 	virtual RID mesh_create() = 0;
 
 	virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) = 0;
 
-	virtual uint32_t mesh_surface_get_format_offset(BitField<RSE::ArrayFormat> p_format, int p_vertex_len, int p_array_index) const;
-	virtual uint32_t mesh_surface_get_format_vertex_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const;
-	virtual uint32_t mesh_surface_get_format_normal_tangent_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const;
-	virtual uint32_t mesh_surface_get_format_attribute_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const;
-	virtual uint32_t mesh_surface_get_format_skin_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const;
-	virtual uint32_t mesh_surface_get_format_index_stride(BitField<RSE::ArrayFormat> p_format, int p_vertex_len) const;
+	virtual uint32_t mesh_surface_get_format_offset(BitField<ArrayFormat> p_format, int p_vertex_len, int p_array_index) const;
+	virtual uint32_t mesh_surface_get_format_vertex_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const;
+	virtual uint32_t mesh_surface_get_format_normal_tangent_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const;
+	virtual uint32_t mesh_surface_get_format_attribute_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const;
+	virtual uint32_t mesh_surface_get_format_skin_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const;
+	virtual uint32_t mesh_surface_get_format_index_stride(BitField<ArrayFormat> p_format, int p_vertex_len) const;
 
 	/// Returns stride
 	virtual void mesh_surface_make_offsets_from_format(uint64_t p_format, int p_vertex_len, int p_index_len, uint32_t *r_offsets, uint32_t &r_vertex_element_size, uint32_t &r_normal_element_size, uint32_t &r_attrib_element_size, uint32_t &r_skin_element_size) const;
-	virtual Error mesh_create_surface_data_from_arrays(RenderingServerTypes::SurfaceData *r_surface_data, RSE::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), uint64_t p_compress_format = 0);
-	Array mesh_create_arrays_from_surface_data(const RenderingServerTypes::SurfaceData &p_data) const;
+	virtual Error mesh_create_surface_data_from_arrays(SurfaceData *r_surface_data, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), uint64_t p_compress_format = 0);
+	Array mesh_create_arrays_from_surface_data(const SurfaceData &p_data) const;
 	Array mesh_surface_get_arrays(RID p_mesh, int p_surface) const;
 	TypedArray<Array> mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const;
 	Dictionary mesh_surface_get_lods(RID p_mesh, int p_surface) const;
 
-	virtual void mesh_add_surface_from_arrays(RID p_mesh, RSE::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), BitField<RSE::ArrayFormat> p_compress_format = 0);
-	virtual void mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) = 0;
+	virtual void mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), BitField<ArrayFormat> p_compress_format = 0);
+	virtual void mesh_add_surface(RID p_mesh, const SurfaceData &p_surface) = 0;
 
 	virtual int mesh_get_blend_shape_count(RID p_mesh) const = 0;
 
-	virtual void mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) = 0;
-	virtual RSE::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const = 0;
+	enum BlendShapeMode {
+		BLEND_SHAPE_MODE_NORMALIZED,
+		BLEND_SHAPE_MODE_RELATIVE,
+	};
+
+	virtual void mesh_set_blend_shape_mode(RID p_mesh, BlendShapeMode p_mode) = 0;
+	virtual BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const = 0;
 
 	virtual void mesh_surface_update_vertex_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) = 0;
 	virtual void mesh_surface_update_attribute_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) = 0;
@@ -226,7 +436,7 @@ public:
 	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material) = 0;
 	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const = 0;
 
-	virtual RenderingServerTypes::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const = 0;
+	virtual SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const = 0;
 
 	virtual int mesh_get_surface_count(RID p_mesh) const = 0;
 
@@ -241,18 +451,40 @@ public:
 	virtual void mesh_surface_remove(RID p_mesh, int p_surface) = 0;
 	virtual void mesh_clear(RID p_mesh) = 0;
 
-	virtual void mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) = 0;
+	struct MeshInfo {
+		RID mesh;
+		String path;
+		uint32_t vertex_buffer_size = 0;
+		uint32_t attribute_buffer_size = 0;
+		uint32_t skin_buffer_size = 0;
+		uint32_t index_buffer_size = 0;
+		uint32_t blend_shape_buffer_size = 0;
+		uint32_t lod_index_buffers_size = 0;
+		uint64_t vertex_count = 0;
+	};
+
+	virtual void mesh_debug_usage(List<MeshInfo> *r_info) = 0;
 
 	/* MULTIMESH API */
 
 	virtual RID multimesh_create() = 0;
 
+	enum MultimeshTransformFormat {
+		MULTIMESH_TRANSFORM_2D,
+		MULTIMESH_TRANSFORM_3D,
+	};
+
+	enum MultimeshPhysicsInterpolationQuality {
+		MULTIMESH_INTERP_QUALITY_FAST,
+		MULTIMESH_INTERP_QUALITY_HIGH,
+	};
+
 protected:
 #ifndef DISABLE_DEPRECATED
-	void _multimesh_allocate_data_bind_compat_99455(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data);
+	void _multimesh_allocate_data_bind_compat_99455(RID p_multimesh, int p_instances, MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data);
 #endif
 public:
-	virtual void multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) = 0;
+	virtual void multimesh_allocate_data(RID p_multimesh, int p_instances, MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) = 0;
 	virtual int multimesh_get_instance_count(RID p_multimesh) const = 0;
 
 	virtual void multimesh_set_mesh(RID p_multimesh, RID p_mesh) = 0;
@@ -280,7 +512,7 @@ public:
 	// Interpolation.
 	virtual void multimesh_set_buffer_interpolated(RID p_multimesh, const Vector<float> &p_buffer_curr, const Vector<float> &p_buffer_prev) = 0;
 	virtual void multimesh_set_physics_interpolated(RID p_multimesh, bool p_interpolated) = 0;
-	virtual void multimesh_set_physics_interpolation_quality(RID p_multimesh, RSE::MultimeshPhysicsInterpolationQuality p_quality) = 0;
+	virtual void multimesh_set_physics_interpolation_quality(RID p_multimesh, MultimeshPhysicsInterpolationQuality p_quality) = 0;
 	virtual void multimesh_instance_reset_physics_interpolation(RID p_multimesh, int p_index) = 0;
 	virtual void multimesh_instances_reset_physics_interpolation(RID p_multimesh) = 0;
 
@@ -298,14 +530,45 @@ public:
 	virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton, int p_bone) const = 0;
 	virtual void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) = 0;
 
-	/* LIGHT API */
+	/* Light API */
+
+	enum LightType {
+		LIGHT_DIRECTIONAL,
+		LIGHT_OMNI,
+		LIGHT_SPOT
+	};
+
+	enum LightParam {
+		LIGHT_PARAM_ENERGY,
+		LIGHT_PARAM_INDIRECT_ENERGY,
+		LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY,
+		LIGHT_PARAM_SPECULAR,
+		LIGHT_PARAM_RANGE,
+		LIGHT_PARAM_SIZE,
+		LIGHT_PARAM_ATTENUATION,
+		LIGHT_PARAM_SPOT_ANGLE,
+		LIGHT_PARAM_SPOT_ATTENUATION,
+		LIGHT_PARAM_SHADOW_MAX_DISTANCE,
+		LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
+		LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
+		LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET,
+		LIGHT_PARAM_SHADOW_FADE_START,
+		LIGHT_PARAM_SHADOW_NORMAL_BIAS,
+		LIGHT_PARAM_SHADOW_BIAS,
+		LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
+		LIGHT_PARAM_SHADOW_OPACITY,
+		LIGHT_PARAM_SHADOW_BLUR,
+		LIGHT_PARAM_TRANSMITTANCE_BIAS,
+		LIGHT_PARAM_INTENSITY,
+		LIGHT_PARAM_MAX
+	};
 
 	virtual RID directional_light_create() = 0;
 	virtual RID omni_light_create() = 0;
 	virtual RID spot_light_create() = 0;
 
 	virtual void light_set_color(RID p_light, const Color &p_color) = 0;
-	virtual void light_set_param(RID p_light, RSE::LightParam p_param, float p_value) = 0;
+	virtual void light_set_param(RID p_light, LightParam p_param, float p_value) = 0;
 	virtual void light_set_shadow(RID p_light, bool p_enabled) = 0;
 	virtual void light_set_projector(RID p_light, RID p_texture) = 0;
 	virtual void light_set_negative(RID p_light, bool p_enable) = 0;
@@ -314,18 +577,39 @@ public:
 	virtual void light_set_reverse_cull_face_mode(RID p_light, bool p_enabled) = 0;
 	virtual void light_set_shadow_caster_mask(RID p_light, uint32_t p_caster_mask) = 0;
 
-	virtual void light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) = 0;
+	enum LightBakeMode {
+		LIGHT_BAKE_DISABLED,
+		LIGHT_BAKE_STATIC,
+		LIGHT_BAKE_DYNAMIC,
+	};
+
+	virtual void light_set_bake_mode(RID p_light, LightBakeMode p_bake_mode) = 0;
 	virtual void light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade) = 0;
 
 	// Omni light
+	enum LightOmniShadowMode {
+		LIGHT_OMNI_SHADOW_DUAL_PARABOLOID,
+		LIGHT_OMNI_SHADOW_CUBE,
+	};
 
-	virtual void light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) = 0;
+	virtual void light_omni_set_shadow_mode(RID p_light, LightOmniShadowMode p_mode) = 0;
 
 	// Directional light
+	enum LightDirectionalShadowMode {
+		LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL,
+		LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS,
+		LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS,
+	};
 
-	virtual void light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) = 0;
+	enum LightDirectionalSkyMode {
+		LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY,
+		LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY,
+		LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY,
+	};
+
+	virtual void light_directional_set_shadow_mode(RID p_light, LightDirectionalShadowMode p_mode) = 0;
 	virtual void light_directional_set_blend_splits(RID p_light, bool p_enable) = 0;
-	virtual void light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) = 0;
+	virtual void light_directional_set_sky_mode(RID p_light, LightDirectionalSkyMode p_mode) = 0;
 
 	// Shadow atlas
 
@@ -335,20 +619,50 @@ public:
 
 	virtual void directional_shadow_atlas_set_size(int p_size, bool p_16_bits = true) = 0;
 
-	virtual void positional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
-	virtual void directional_soft_shadow_filter_set_quality(RSE::ShadowQuality p_quality) = 0;
+	enum ShadowQuality {
+		SHADOW_QUALITY_HARD,
+		SHADOW_QUALITY_SOFT_VERY_LOW,
+		SHADOW_QUALITY_SOFT_LOW,
+		SHADOW_QUALITY_SOFT_MEDIUM,
+		SHADOW_QUALITY_SOFT_HIGH,
+		SHADOW_QUALITY_SOFT_ULTRA,
+		SHADOW_QUALITY_MAX
+	};
 
-	virtual void light_projectors_set_filter(RSE::LightProjectorFilter p_filter) = 0;
+	virtual void positional_soft_shadow_filter_set_quality(ShadowQuality p_quality) = 0;
+	virtual void directional_soft_shadow_filter_set_quality(ShadowQuality p_quality) = 0;
 
-	/* REFLECTION PROBE API */
+	enum LightProjectorFilter {
+		LIGHT_PROJECTOR_FILTER_NEAREST,
+		LIGHT_PROJECTOR_FILTER_LINEAR,
+		LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS,
+		LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS,
+		LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC,
+		LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC,
+	};
+
+	virtual void light_projectors_set_filter(LightProjectorFilter p_filter) = 0;
+
+	/* PROBE API */
 
 	virtual RID reflection_probe_create() = 0;
 
-	virtual void reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) = 0;
+	enum ReflectionProbeUpdateMode {
+		REFLECTION_PROBE_UPDATE_ONCE,
+		REFLECTION_PROBE_UPDATE_ALWAYS,
+	};
+
+	virtual void reflection_probe_set_update_mode(RID p_probe, ReflectionProbeUpdateMode p_mode) = 0;
 	virtual void reflection_probe_set_intensity(RID p_probe, float p_intensity) = 0;
 	virtual void reflection_probe_set_blend_distance(RID p_probe, float p_blend_distance) = 0;
 
-	virtual void reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) = 0;
+	enum ReflectionProbeAmbientMode {
+		REFLECTION_PROBE_AMBIENT_DISABLED,
+		REFLECTION_PROBE_AMBIENT_ENVIRONMENT,
+		REFLECTION_PROBE_AMBIENT_COLOR,
+	};
+
+	virtual void reflection_probe_set_ambient_mode(RID p_probe, ReflectionProbeAmbientMode p_mode) = 0;
 	virtual void reflection_probe_set_ambient_color(RID p_probe, const Color &p_color) = 0;
 	virtual void reflection_probe_set_ambient_energy(RID p_probe, float p_energy) = 0;
 	virtual void reflection_probe_set_max_distance(RID p_probe, float p_distance) = 0;
@@ -364,9 +678,17 @@ public:
 
 	/* DECAL API */
 
+	enum DecalTexture {
+		DECAL_TEXTURE_ALBEDO,
+		DECAL_TEXTURE_NORMAL,
+		DECAL_TEXTURE_ORM,
+		DECAL_TEXTURE_EMISSION,
+		DECAL_TEXTURE_MAX
+	};
+
 	virtual RID decal_create() = 0;
 	virtual void decal_set_size(RID p_decal, const Vector3 &p_size) = 0;
-	virtual void decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) = 0;
+	virtual void decal_set_texture(RID p_decal, DecalTexture p_type, RID p_texture) = 0;
 	virtual void decal_set_emission_energy(RID p_decal, float p_energy) = 0;
 	virtual void decal_set_albedo_mix(RID p_decal, float p_mix) = 0;
 	virtual void decal_set_modulate(RID p_decal, const Color &p_modulate) = 0;
@@ -375,7 +697,16 @@ public:
 	virtual void decal_set_fade(RID p_decal, float p_above, float p_below) = 0;
 	virtual void decal_set_normal_fade(RID p_decal, float p_fade) = 0;
 
-	virtual void decals_set_filter(RSE::DecalFilter p_quality) = 0;
+	enum DecalFilter {
+		DECAL_FILTER_NEAREST,
+		DECAL_FILTER_LINEAR,
+		DECAL_FILTER_NEAREST_MIPMAPS,
+		DECAL_FILTER_LINEAR_MIPMAPS,
+		DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC,
+		DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC,
+	};
+
+	virtual void decals_set_filter(DecalFilter p_quality) = 0;
 
 	/* VOXEL GI API */
 
@@ -400,11 +731,23 @@ public:
 	virtual void voxel_gi_set_interior(RID p_voxel_gi, bool p_enable) = 0;
 	virtual void voxel_gi_set_use_two_bounces(RID p_voxel_gi, bool p_enable) = 0;
 
-	virtual void voxel_gi_set_quality(RSE::VoxelGIQuality) = 0;
+	enum VoxelGIQuality {
+		VOXEL_GI_QUALITY_LOW,
+		VOXEL_GI_QUALITY_HIGH,
+	};
+
+	virtual void voxel_gi_set_quality(VoxelGIQuality) = 0;
 
 	virtual void sdfgi_reset() = 0;
 
-	/* LIGHTMAP API */
+	/* LIGHTMAP */
+
+	enum ShadowmaskMode {
+		SHADOWMASK_MODE_NONE,
+		SHADOWMASK_MODE_REPLACE,
+		SHADOWMASK_MODE_OVERLAY,
+		SHADOWMASK_MODE_ONLY,
+	};
 
 	virtual RID lightmap_create() = 0;
 
@@ -422,13 +765,18 @@ public:
 	virtual void lightmaps_set_bicubic_filter(bool p_enable) = 0;
 
 	virtual void lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow) = 0;
-	virtual RSE::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) = 0;
-	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) = 0;
+	virtual ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) = 0;
+	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, ShadowmaskMode p_mode) = 0;
 
 	/* PARTICLES API */
 
 	virtual RID particles_create() = 0;
-	virtual void particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) = 0;
+
+	enum ParticlesMode {
+		PARTICLES_MODE_2D,
+		PARTICLES_MODE_3D
+	};
+	virtual void particles_set_mode(RID p_particles, ParticlesMode p_mode) = 0;
 
 	virtual void particles_set_emitting(RID p_particles, bool p_enable) = 0;
 	virtual bool particles_get_emitting(RID p_particles) = 0;
@@ -437,7 +785,7 @@ public:
 	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) = 0;
 	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) = 0;
 	virtual void particles_set_pre_process_time(RID p_particles, double p_time) = 0;
-	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual = 0.0) = 0;
+	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time) = 0;
 	virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio) = 0;
 	virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio) = 0;
 	virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) = 0;
@@ -450,9 +798,14 @@ public:
 	virtual void particles_set_collision_base_size(RID p_particles, float p_size) = 0;
 	virtual void particles_set_seed(RID p_particles, uint32_t p_seed) = 0;
 
-	virtual void particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) = 0;
-	virtual void particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_transform_align_channel_filter) = 0;
-	virtual void particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) = 0;
+	enum ParticlesTransformAlign {
+		PARTICLES_TRANSFORM_ALIGN_DISABLED,
+		PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD,
+		PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY,
+		PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY,
+	};
+
+	virtual void particles_set_transform_align(RID p_particles, ParticlesTransformAlign p_transform_align) = 0;
 
 	virtual void particles_set_trails(RID p_particles, bool p_enable, float p_length_sec) = 0;
 	virtual void particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) = 0;
@@ -463,9 +816,24 @@ public:
 
 	virtual void particles_set_subemitter(RID p_particles, RID p_subemitter_particles) = 0;
 
+	enum ParticlesEmitFlags {
+		PARTICLES_EMIT_FLAG_POSITION = 1,
+		PARTICLES_EMIT_FLAG_ROTATION_SCALE = 2,
+		PARTICLES_EMIT_FLAG_VELOCITY = 4,
+		PARTICLES_EMIT_FLAG_COLOR = 8,
+		PARTICLES_EMIT_FLAG_CUSTOM = 16
+	};
+
 	virtual void particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) = 0;
 
-	virtual void particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) = 0;
+	enum ParticlesDrawOrder {
+		PARTICLES_DRAW_ORDER_INDEX,
+		PARTICLES_DRAW_ORDER_LIFETIME,
+		PARTICLES_DRAW_ORDER_REVERSE_LIFETIME,
+		PARTICLES_DRAW_ORDER_VIEW_DEPTH,
+	};
+
+	virtual void particles_set_draw_order(RID p_particles, ParticlesDrawOrder p_order) = 0;
 
 	virtual void particles_set_draw_passes(RID p_particles, int p_count) = 0;
 	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) = 0;
@@ -480,7 +848,17 @@ public:
 
 	virtual RID particles_collision_create() = 0;
 
-	virtual void particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) = 0;
+	enum ParticlesCollisionType {
+		PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT,
+		PARTICLES_COLLISION_TYPE_BOX_ATTRACT,
+		PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT,
+		PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE,
+		PARTICLES_COLLISION_TYPE_BOX_COLLIDE,
+		PARTICLES_COLLISION_TYPE_SDF_COLLIDE,
+		PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE,
+	};
+
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, ParticlesCollisionType p_type) = 0;
 	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) = 0;
 	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) = 0; // For spheres.
 	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) = 0; // For non-spheres.
@@ -491,14 +869,33 @@ public:
 
 	virtual void particles_collision_height_field_update(RID p_particles_collision) = 0; // For SDF and vector field.
 
-	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) = 0; // For SDF and vector field.
+	enum ParticlesCollisionHeightfieldResolution { // Longest axis resolution.
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_256,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_512,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_2048,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_4096,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_8192,
+		PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX,
+	};
+
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, ParticlesCollisionHeightfieldResolution p_resolution) = 0; // For SDF and vector field.
 	virtual void particles_collision_set_height_field_mask(RID p_particles_collision, uint32_t p_heightfield_mask) = 0;
 
 	/* FOG VOLUME API */
 
 	virtual RID fog_volume_create() = 0;
 
-	virtual void fog_volume_set_shape(RID p_fog_volume, RSE::FogVolumeShape p_shape) = 0;
+	enum FogVolumeShape {
+		FOG_VOLUME_SHAPE_ELLIPSOID,
+		FOG_VOLUME_SHAPE_CONE,
+		FOG_VOLUME_SHAPE_CYLINDER,
+		FOG_VOLUME_SHAPE_BOX,
+		FOG_VOLUME_SHAPE_WORLD,
+		FOG_VOLUME_SHAPE_MAX,
+	};
+
+	virtual void fog_volume_set_shape(RID p_fog_volume, FogVolumeShape p_shape) = 0;
 	virtual void fog_volume_set_size(RID p_fog_volume, const Vector3 &p_size) = 0;
 	virtual void fog_volume_set_material(RID p_fog_volume, RID p_material) = 0;
 
@@ -528,35 +925,110 @@ public:
 
 	/* VIEWPORT API */
 
+	enum CanvasItemTextureFilter {
+		CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, // Uses canvas item setting for draw command, uses global setting for canvas item.
+		CANVAS_ITEM_TEXTURE_FILTER_NEAREST,
+		CANVAS_ITEM_TEXTURE_FILTER_LINEAR,
+		CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS,
+		CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS,
+		CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC,
+		CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC,
+		CANVAS_ITEM_TEXTURE_FILTER_MAX
+	};
+
+	enum CanvasItemTextureRepeat {
+		CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, // Uses canvas item setting for draw command, uses global setting for canvas item.
+		CANVAS_ITEM_TEXTURE_REPEAT_DISABLED,
+		CANVAS_ITEM_TEXTURE_REPEAT_ENABLED,
+		CANVAS_ITEM_TEXTURE_REPEAT_MIRROR,
+		CANVAS_ITEM_TEXTURE_REPEAT_MAX,
+	};
+
 	virtual RID viewport_create() = 0;
 
+	enum ViewportScaling3DMode {
+		VIEWPORT_SCALING_3D_MODE_BILINEAR,
+		VIEWPORT_SCALING_3D_MODE_FSR,
+		VIEWPORT_SCALING_3D_MODE_FSR2,
+		VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL,
+		VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL,
+		VIEWPORT_SCALING_3D_MODE_MAX,
+		VIEWPORT_SCALING_3D_MODE_OFF = 255, // for internal use only
+	};
+
+	enum ViewportAnisotropicFiltering {
+		VIEWPORT_ANISOTROPY_DISABLED,
+		VIEWPORT_ANISOTROPY_2X,
+		VIEWPORT_ANISOTROPY_4X,
+		VIEWPORT_ANISOTROPY_8X,
+		VIEWPORT_ANISOTROPY_16X,
+		VIEWPORT_ANISOTROPY_MAX
+	};
+
+	enum ViewportScaling3DType {
+		VIEWPORT_SCALING_3D_TYPE_NONE,
+		VIEWPORT_SCALING_3D_TYPE_TEMPORAL,
+		VIEWPORT_SCALING_3D_TYPE_SPATIAL,
+		VIEWPORT_SCALING_3D_TYPE_MAX,
+	};
+
+	_ALWAYS_INLINE_ static ViewportScaling3DType scaling_3d_mode_type(ViewportScaling3DMode p_mode) {
+		if (p_mode == VIEWPORT_SCALING_3D_MODE_BILINEAR || p_mode == VIEWPORT_SCALING_3D_MODE_FSR || p_mode == VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
+			return VIEWPORT_SCALING_3D_TYPE_SPATIAL;
+		} else if (p_mode == VIEWPORT_SCALING_3D_MODE_FSR2 || p_mode == VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
+			return VIEWPORT_SCALING_3D_TYPE_TEMPORAL;
+		}
+		return VIEWPORT_SCALING_3D_TYPE_NONE;
+	}
+
 #ifndef XR_DISABLED
 	virtual void viewport_set_use_xr(RID p_viewport, bool p_use_xr) = 0;
 #endif // !XR_DISABLED
 
-	virtual void viewport_set_size(RID p_viewport, int p_width, int p_height, int p_view_count = 1) = 0;
+	virtual void viewport_set_size(RID p_viewport, int p_width, int p_height) = 0;
 	virtual void viewport_set_active(RID p_viewport, bool p_active) = 0;
 	virtual void viewport_set_parent_viewport(RID p_viewport, RID p_parent_viewport) = 0;
 	virtual void viewport_set_canvas_cull_mask(RID p_viewport, uint32_t p_canvas_cull_mask) = 0;
 
-	virtual void viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect = Rect2(), DisplayServerEnums::WindowID p_screen = DisplayServerEnums::MAIN_WINDOW_ID) = 0;
+	virtual void viewport_attach_to_screen(RID p_viewport, const Rect2 &p_rect = Rect2(), DisplayServer::WindowID p_screen = DisplayServer::MAIN_WINDOW_ID) = 0;
 	virtual void viewport_set_render_direct_to_screen(RID p_viewport, bool p_enable) = 0;
 
-	virtual void viewport_set_scaling_3d_mode(RID p_viewport, RSE::ViewportScaling3DMode p_scaling_3d_mode) = 0;
+	virtual void viewport_set_scaling_3d_mode(RID p_viewport, ViewportScaling3DMode p_scaling_3d_mode) = 0;
 	virtual void viewport_set_scaling_3d_scale(RID p_viewport, float p_scaling_3d_scale) = 0;
 	virtual void viewport_set_fsr_sharpness(RID p_viewport, float p_fsr_sharpness) = 0;
 	virtual void viewport_set_texture_mipmap_bias(RID p_viewport, float p_texture_mipmap_bias) = 0;
-	virtual void viewport_set_anisotropic_filtering_level(RID p_viewport, RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) = 0;
+	virtual void viewport_set_anisotropic_filtering_level(RID p_viewport, ViewportAnisotropicFiltering p_anisotropic_filtering_level) = 0;
 
-	virtual void viewport_set_update_mode(RID p_viewport, RSE::ViewportUpdateMode p_mode) = 0;
-	virtual RSE::ViewportUpdateMode viewport_get_update_mode(RID p_viewport) const = 0;
+	enum ViewportUpdateMode {
+		VIEWPORT_UPDATE_DISABLED,
+		VIEWPORT_UPDATE_ONCE, // Then goes to disabled, must be manually updated.
+		VIEWPORT_UPDATE_WHEN_VISIBLE, // Default
+		VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE,
+		VIEWPORT_UPDATE_ALWAYS
+	};
 
-	virtual void viewport_set_clear_mode(RID p_viewport, RSE::ViewportClearMode p_clear_mode) = 0;
+	virtual void viewport_set_update_mode(RID p_viewport, ViewportUpdateMode p_mode) = 0;
+	virtual ViewportUpdateMode viewport_get_update_mode(RID p_viewport) const = 0;
+
+	enum ViewportClearMode {
+		VIEWPORT_CLEAR_ALWAYS,
+		VIEWPORT_CLEAR_NEVER,
+		VIEWPORT_CLEAR_ONLY_NEXT_FRAME
+	};
+
+	virtual void viewport_set_clear_mode(RID p_viewport, ViewportClearMode p_clear_mode) = 0;
 
 	virtual RID viewport_get_render_target(RID p_viewport) const = 0;
 	virtual RID viewport_get_texture(RID p_viewport) const = 0;
 
-	virtual void viewport_set_environment_mode(RID p_viewport, RSE::ViewportEnvironmentMode p_mode) = 0;
+	enum ViewportEnvironmentMode {
+		VIEWPORT_ENVIRONMENT_DISABLED,
+		VIEWPORT_ENVIRONMENT_ENABLED,
+		VIEWPORT_ENVIRONMENT_INHERIT,
+		VIEWPORT_ENVIRONMENT_MAX,
+	};
+
+	virtual void viewport_set_environment_mode(RID p_viewport, ViewportEnvironmentMode p_mode) = 0;
 	virtual void viewport_set_disable_3d(RID p_viewport, bool p_disable) = 0;
 	virtual void viewport_set_disable_2d(RID p_viewport, bool p_disable) = 0;
 
@@ -571,21 +1043,51 @@ public:
 	virtual void viewport_set_snap_2d_transforms_to_pixel(RID p_viewport, bool p_enabled) = 0;
 	virtual void viewport_set_snap_2d_vertices_to_pixel(RID p_viewport, bool p_enabled) = 0;
 
-	virtual void viewport_set_default_canvas_item_texture_filter(RID p_viewport, RSE::CanvasItemTextureFilter p_filter) = 0;
-	virtual void viewport_set_default_canvas_item_texture_repeat(RID p_viewport, RSE::CanvasItemTextureRepeat p_repeat) = 0;
+	virtual void viewport_set_default_canvas_item_texture_filter(RID p_viewport, CanvasItemTextureFilter p_filter) = 0;
+	virtual void viewport_set_default_canvas_item_texture_repeat(RID p_viewport, CanvasItemTextureRepeat p_repeat) = 0;
 
 	virtual void viewport_set_global_canvas_transform(RID p_viewport, const Transform2D &p_transform) = 0;
 	virtual void viewport_set_canvas_stacking(RID p_viewport, RID p_canvas, int p_layer, int p_sublayer) = 0;
 
-	virtual void viewport_set_sdf_oversize_and_scale(RID p_viewport, RSE::ViewportSDFOversize p_oversize, RSE::ViewportSDFScale p_scale) = 0;
+	enum ViewportSDFOversize {
+		VIEWPORT_SDF_OVERSIZE_100_PERCENT,
+		VIEWPORT_SDF_OVERSIZE_120_PERCENT,
+		VIEWPORT_SDF_OVERSIZE_150_PERCENT,
+		VIEWPORT_SDF_OVERSIZE_200_PERCENT,
+		VIEWPORT_SDF_OVERSIZE_MAX
+	};
+
+	enum ViewportSDFScale {
+		VIEWPORT_SDF_SCALE_100_PERCENT,
+		VIEWPORT_SDF_SCALE_50_PERCENT,
+		VIEWPORT_SDF_SCALE_25_PERCENT,
+		VIEWPORT_SDF_SCALE_MAX
+	};
+
+	virtual void viewport_set_sdf_oversize_and_scale(RID p_viewport, ViewportSDFOversize p_oversize, ViewportSDFScale p_scale) = 0;
 
 	virtual void viewport_set_positional_shadow_atlas_size(RID p_viewport, int p_size, bool p_16_bits = true) = 0;
 	virtual void viewport_set_positional_shadow_atlas_quadrant_subdivision(RID p_viewport, int p_quadrant, int p_subdiv) = 0;
 
-	virtual void viewport_set_msaa_3d(RID p_viewport, RSE::ViewportMSAA p_msaa) = 0;
-	virtual void viewport_set_msaa_2d(RID p_viewport, RSE::ViewportMSAA p_msaa) = 0;
+	enum ViewportMSAA {
+		VIEWPORT_MSAA_DISABLED,
+		VIEWPORT_MSAA_2X,
+		VIEWPORT_MSAA_4X,
+		VIEWPORT_MSAA_8X,
+		VIEWPORT_MSAA_MAX,
+	};
 
-	virtual void viewport_set_screen_space_aa(RID p_viewport, RSE::ViewportScreenSpaceAA p_mode) = 0;
+	virtual void viewport_set_msaa_3d(RID p_viewport, ViewportMSAA p_msaa) = 0;
+	virtual void viewport_set_msaa_2d(RID p_viewport, ViewportMSAA p_msaa) = 0;
+
+	enum ViewportScreenSpaceAA {
+		VIEWPORT_SCREEN_SPACE_AA_DISABLED,
+		VIEWPORT_SCREEN_SPACE_AA_FXAA,
+		VIEWPORT_SCREEN_SPACE_AA_SMAA,
+		VIEWPORT_SCREEN_SPACE_AA_MAX,
+	};
+
+	virtual void viewport_set_screen_space_aa(RID p_viewport, ViewportScreenSpaceAA p_mode) = 0;
 
 	virtual void viewport_set_use_taa(RID p_viewport, bool p_use_taa) = 0;
 
@@ -598,36 +1100,125 @@ public:
 	virtual void viewport_set_use_occlusion_culling(RID p_viewport, bool p_use_occlusion_culling) = 0;
 	virtual void viewport_set_occlusion_rays_per_thread(int p_rays_per_thread) = 0;
 
-	virtual void viewport_set_occlusion_culling_build_quality(RSE::ViewportOcclusionCullingBuildQuality p_quality) = 0;
+	enum ViewportOcclusionCullingBuildQuality {
+		VIEWPORT_OCCLUSION_BUILD_QUALITY_LOW = 0,
+		VIEWPORT_OCCLUSION_BUILD_QUALITY_MEDIUM = 1,
+		VIEWPORT_OCCLUSION_BUILD_QUALITY_HIGH = 2,
+	};
 
-	virtual int viewport_get_render_info(RID p_viewport, RSE::ViewportRenderInfoType p_type, RSE::ViewportRenderInfo p_info) = 0;
+	virtual void viewport_set_occlusion_culling_build_quality(ViewportOcclusionCullingBuildQuality p_quality) = 0;
 
-	virtual void viewport_set_debug_draw(RID p_viewport, RSE::ViewportDebugDraw p_draw) = 0;
+	enum ViewportRenderInfo {
+		VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME,
+		VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME,
+		VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME,
+		VIEWPORT_RENDER_INFO_MAX,
+	};
+
+	enum ViewportRenderInfoType {
+		VIEWPORT_RENDER_INFO_TYPE_VISIBLE,
+		VIEWPORT_RENDER_INFO_TYPE_SHADOW,
+		VIEWPORT_RENDER_INFO_TYPE_CANVAS,
+		VIEWPORT_RENDER_INFO_TYPE_MAX
+	};
+
+	virtual int viewport_get_render_info(RID p_viewport, ViewportRenderInfoType p_type, ViewportRenderInfo p_info) = 0;
+
+	enum ViewportDebugDraw {
+		VIEWPORT_DEBUG_DRAW_DISABLED,
+		VIEWPORT_DEBUG_DRAW_UNSHADED,
+		VIEWPORT_DEBUG_DRAW_LIGHTING,
+		VIEWPORT_DEBUG_DRAW_OVERDRAW,
+		VIEWPORT_DEBUG_DRAW_WIREFRAME,
+		VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER,
+		VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO,
+		VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING,
+		VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION,
+		VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS,
+		VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS,
+		VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE,
+		VIEWPORT_DEBUG_DRAW_SSAO,
+		VIEWPORT_DEBUG_DRAW_SSIL,
+		VIEWPORT_DEBUG_DRAW_PSSM_SPLITS,
+		VIEWPORT_DEBUG_DRAW_DECAL_ATLAS,
+		VIEWPORT_DEBUG_DRAW_SDFGI,
+		VIEWPORT_DEBUG_DRAW_SDFGI_PROBES,
+		VIEWPORT_DEBUG_DRAW_GI_BUFFER,
+		VIEWPORT_DEBUG_DRAW_DISABLE_LOD,
+		VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS,
+		VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS,
+		VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS,
+		VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES,
+		VIEWPORT_DEBUG_DRAW_OCCLUDERS,
+		VIEWPORT_DEBUG_DRAW_MOTION_VECTORS,
+		VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER,
+	};
+
+	virtual void viewport_set_debug_draw(RID p_viewport, ViewportDebugDraw p_draw) = 0;
 
 	virtual void viewport_set_measure_render_time(RID p_viewport, bool p_enable) = 0;
 	virtual double viewport_get_measured_render_time_cpu(RID p_viewport) const = 0;
 	virtual double viewport_get_measured_render_time_gpu(RID p_viewport) const = 0;
 
-	virtual RID viewport_find_from_screen_attachment(DisplayServerEnums::WindowID p_id = DisplayServerEnums::MAIN_WINDOW_ID) const = 0;
+	virtual RID viewport_find_from_screen_attachment(DisplayServer::WindowID p_id = DisplayServer::MAIN_WINDOW_ID) const = 0;
 
-	virtual void viewport_set_vrs_mode(RID p_viewport, RSE::ViewportVRSMode p_mode) = 0;
-	virtual void viewport_set_vrs_update_mode(RID p_viewport, RSE::ViewportVRSUpdateMode p_mode) = 0;
+	enum ViewportVRSMode {
+		VIEWPORT_VRS_DISABLED,
+		VIEWPORT_VRS_TEXTURE,
+		VIEWPORT_VRS_XR,
+		VIEWPORT_VRS_MAX,
+	};
+
+	enum ViewportVRSUpdateMode {
+		VIEWPORT_VRS_UPDATE_DISABLED,
+		VIEWPORT_VRS_UPDATE_ONCE,
+		VIEWPORT_VRS_UPDATE_ALWAYS,
+		VIEWPORT_VRS_UPDATE_MAX,
+	};
+
+	virtual void viewport_set_vrs_mode(RID p_viewport, ViewportVRSMode p_mode) = 0;
+	virtual void viewport_set_vrs_update_mode(RID p_viewport, ViewportVRSUpdateMode p_mode) = 0;
 	virtual void viewport_set_vrs_texture(RID p_viewport, RID p_texture) = 0;
 
 	/* SKY API */
 
+	enum SkyMode {
+		SKY_MODE_AUTOMATIC,
+		SKY_MODE_QUALITY,
+		SKY_MODE_INCREMENTAL,
+		SKY_MODE_REALTIME
+	};
+
 	virtual RID sky_create() = 0;
 	virtual void sky_set_radiance_size(RID p_sky, int p_radiance_size) = 0;
-	virtual void sky_set_mode(RID p_sky, RSE::SkyMode p_mode) = 0;
+	virtual void sky_set_mode(RID p_sky, SkyMode p_mode) = 0;
 	virtual void sky_set_material(RID p_sky, RID p_material) = 0;
 	virtual Ref<Image> sky_bake_panorama(RID p_sky, float p_energy, bool p_bake_irradiance, const Size2i &p_size) = 0;
 
 	/* COMPOSITOR EFFECTS API */
 
+	enum CompositorEffectFlags {
+		COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR = 1,
+		COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH = 2,
+		COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS = 4,
+		COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS = 8,
+		COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR = 16,
+	};
+
+	enum CompositorEffectCallbackType {
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_MAX,
+		COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY = -1,
+	};
+
 	virtual RID compositor_effect_create() = 0;
 	virtual void compositor_effect_set_enabled(RID p_effect, bool p_enabled) = 0;
-	virtual void compositor_effect_set_callback(RID p_effect, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) = 0;
-	virtual void compositor_effect_set_flag(RID p_effect, RSE::CompositorEffectFlags p_flag, bool p_set) = 0;
+	virtual void compositor_effect_set_callback(RID p_effect, CompositorEffectCallbackType p_callback_type, const Callable &p_callback) = 0;
+	virtual void compositor_effect_set_flag(RID p_effect, CompositorEffectFlags p_flag, bool p_set) = 0;
 
 	/* COMPOSITOR API */
 
@@ -639,21 +1230,60 @@ public:
 
 	virtual RID environment_create() = 0;
 
-	virtual void environment_set_background(RID p_env, RSE::EnvironmentBG p_bg) = 0;
+	enum EnvironmentBG {
+		ENV_BG_CLEAR_COLOR,
+		ENV_BG_COLOR,
+		ENV_BG_SKY,
+		ENV_BG_CANVAS,
+		ENV_BG_KEEP,
+		ENV_BG_CAMERA_FEED,
+		ENV_BG_MAX
+	};
+
+	enum EnvironmentAmbientSource {
+		ENV_AMBIENT_SOURCE_BG,
+		ENV_AMBIENT_SOURCE_DISABLED,
+		ENV_AMBIENT_SOURCE_COLOR,
+		ENV_AMBIENT_SOURCE_SKY,
+	};
+
+	enum EnvironmentReflectionSource {
+		ENV_REFLECTION_SOURCE_BG,
+		ENV_REFLECTION_SOURCE_DISABLED,
+		ENV_REFLECTION_SOURCE_SKY,
+	};
+
+	virtual void environment_set_background(RID p_env, EnvironmentBG p_bg) = 0;
 	virtual void environment_set_sky(RID p_env, RID p_sky) = 0;
 	virtual void environment_set_sky_custom_fov(RID p_env, float p_scale) = 0;
 	virtual void environment_set_sky_orientation(RID p_env, const Basis &p_orientation) = 0;
 	virtual void environment_set_bg_color(RID p_env, const Color &p_color) = 0;
 	virtual void environment_set_bg_energy(RID p_env, float p_multiplier, float p_exposure_value) = 0;
 	virtual void environment_set_canvas_max_layer(RID p_env, int p_max_layer) = 0;
-	virtual void environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient = RSE::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RSE::EnvironmentReflectionSource p_reflection_source = RSE::ENV_REFLECTION_SOURCE_BG) = 0;
+	virtual void environment_set_ambient_light(RID p_env, const Color &p_color, EnvironmentAmbientSource p_ambient = ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, EnvironmentReflectionSource p_reflection_source = ENV_REFLECTION_SOURCE_BG) = 0;
 	virtual void environment_set_camera_feed_id(RID p_env, int p_camera_feed_id) = 0;
 
-	virtual void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) = 0;
+	enum EnvironmentGlowBlendMode {
+		ENV_GLOW_BLEND_MODE_ADDITIVE,
+		ENV_GLOW_BLEND_MODE_SCREEN,
+		ENV_GLOW_BLEND_MODE_SOFTLIGHT,
+		ENV_GLOW_BLEND_MODE_REPLACE,
+		ENV_GLOW_BLEND_MODE_MIX,
+	};
+
+	virtual void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) = 0;
 
 	virtual void environment_glow_set_use_bicubic_upscale(bool p_enable) = 0;
 
-	virtual void environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) = 0;
+	enum EnvironmentToneMapper {
+		ENV_TONE_MAPPER_LINEAR,
+		ENV_TONE_MAPPER_REINHARD,
+		ENV_TONE_MAPPER_FILMIC,
+		ENV_TONE_MAPPER_ACES,
+		ENV_TONE_MAPPER_AGX,
+	};
+
+	virtual void environment_set_tonemap(RID p_env, EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) = 0;
 	virtual void environment_set_tonemap_agx_contrast(RID p_env, float p_agx_contrast) = 0;
 	virtual void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, bool p_use_1d_color_correction, RID p_color_correction) = 0;
 
@@ -661,25 +1291,89 @@ public:
 
 	virtual void environment_set_ssr_half_size(bool p_half_size) = 0;
 
-	virtual void environment_set_ssr_roughness_quality(RSE::EnvironmentSSRRoughnessQuality p_quality) = 0;
+	enum EnvironmentSSRRoughnessQuality {
+		ENV_SSR_ROUGHNESS_QUALITY_DISABLED,
+		ENV_SSR_ROUGHNESS_QUALITY_LOW,
+		ENV_SSR_ROUGHNESS_QUALITY_MEDIUM,
+		ENV_SSR_ROUGHNESS_QUALITY_HIGH,
+	};
+
+	virtual void environment_set_ssr_roughness_quality(EnvironmentSSRRoughnessQuality p_quality) = 0;
 
 	virtual void environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_power, float p_detail, float p_horizon, float p_sharpness, float p_light_affect, float p_ao_channel_affect) = 0;
 
-	virtual void environment_set_ssao_quality(RSE::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	enum EnvironmentSSAOQuality {
+		ENV_SSAO_QUALITY_VERY_LOW,
+		ENV_SSAO_QUALITY_LOW,
+		ENV_SSAO_QUALITY_MEDIUM,
+		ENV_SSAO_QUALITY_HIGH,
+		ENV_SSAO_QUALITY_ULTRA,
+	};
+
+	virtual void environment_set_ssao_quality(EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
 	virtual void environment_set_ssil(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_sharpness, float p_normal_rejection) = 0;
 
-	virtual void environment_set_ssil_quality(RSE::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
+	enum EnvironmentSSILQuality {
+		ENV_SSIL_QUALITY_VERY_LOW,
+		ENV_SSIL_QUALITY_LOW,
+		ENV_SSIL_QUALITY_MEDIUM,
+		ENV_SSIL_QUALITY_HIGH,
+		ENV_SSIL_QUALITY_ULTRA,
+	};
 
-	virtual void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) = 0;
+	virtual void environment_set_ssil_quality(EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) = 0;
 
-	virtual void environment_set_sdfgi_ray_count(RSE::EnvironmentSDFGIRayCount p_ray_count) = 0;
+	enum EnvironmentSDFGIYScale {
+		ENV_SDFGI_Y_SCALE_50_PERCENT,
+		ENV_SDFGI_Y_SCALE_75_PERCENT,
+		ENV_SDFGI_Y_SCALE_100_PERCENT,
+	};
 
-	virtual void environment_set_sdfgi_frames_to_converge(RSE::EnvironmentSDFGIFramesToConverge p_frames) = 0;
+	virtual void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) = 0;
 
-	virtual void environment_set_sdfgi_frames_to_update_light(RSE::EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
+	enum EnvironmentSDFGIRayCount {
+		ENV_SDFGI_RAY_COUNT_4,
+		ENV_SDFGI_RAY_COUNT_8,
+		ENV_SDFGI_RAY_COUNT_16,
+		ENV_SDFGI_RAY_COUNT_32,
+		ENV_SDFGI_RAY_COUNT_64,
+		ENV_SDFGI_RAY_COUNT_96,
+		ENV_SDFGI_RAY_COUNT_128,
+		ENV_SDFGI_RAY_COUNT_MAX,
+	};
 
-	virtual void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode = RSE::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL) = 0;
+	virtual void environment_set_sdfgi_ray_count(EnvironmentSDFGIRayCount p_ray_count) = 0;
+
+	enum EnvironmentSDFGIFramesToConverge {
+		ENV_SDFGI_CONVERGE_IN_5_FRAMES,
+		ENV_SDFGI_CONVERGE_IN_10_FRAMES,
+		ENV_SDFGI_CONVERGE_IN_15_FRAMES,
+		ENV_SDFGI_CONVERGE_IN_20_FRAMES,
+		ENV_SDFGI_CONVERGE_IN_25_FRAMES,
+		ENV_SDFGI_CONVERGE_IN_30_FRAMES,
+		ENV_SDFGI_CONVERGE_MAX
+	};
+
+	virtual void environment_set_sdfgi_frames_to_converge(EnvironmentSDFGIFramesToConverge p_frames) = 0;
+
+	enum EnvironmentSDFGIFramesToUpdateLight {
+		ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME,
+		ENV_SDFGI_UPDATE_LIGHT_IN_2_FRAMES,
+		ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES,
+		ENV_SDFGI_UPDATE_LIGHT_IN_8_FRAMES,
+		ENV_SDFGI_UPDATE_LIGHT_IN_16_FRAMES,
+		ENV_SDFGI_UPDATE_LIGHT_MAX,
+	};
+
+	virtual void environment_set_sdfgi_frames_to_update_light(EnvironmentSDFGIFramesToUpdateLight p_update) = 0;
+
+	enum EnvironmentFogMode {
+		ENV_FOG_MODE_EXPONENTIAL,
+		ENV_FOG_MODE_DEPTH,
+	};
+
+	virtual void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, EnvironmentFogMode p_mode = EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL) = 0;
 	virtual void environment_set_fog_depth(RID p_env, float p_curve, float p_begin, float p_end) = 0;
 
 	virtual void environment_set_volumetric_fog(RID p_env, bool p_enable, float p_density, const Color &p_albedo, const Color &p_emission, float p_emission_energy, float p_anisotropy, float p_length, float p_detail_spread, float p_gi_inject, bool p_temporal_reprojection, float p_temporal_reprojection_amount, float p_ambient_inject, float p_sky_affect) = 0;
@@ -690,16 +1384,36 @@ public:
 
 	virtual void screen_space_roughness_limiter_set_active(bool p_enable, float p_amount, float p_limit) = 0;
 
-	virtual void sub_surface_scattering_set_quality(RSE::SubSurfaceScatteringQuality p_quality) = 0;
+	enum SubSurfaceScatteringQuality {
+		SUB_SURFACE_SCATTERING_QUALITY_DISABLED,
+		SUB_SURFACE_SCATTERING_QUALITY_LOW,
+		SUB_SURFACE_SCATTERING_QUALITY_MEDIUM,
+		SUB_SURFACE_SCATTERING_QUALITY_HIGH,
+	};
+
+	virtual void sub_surface_scattering_set_quality(SubSurfaceScatteringQuality p_quality) = 0;
 	virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) = 0;
 
-	/* CAMERA ATTRIBUTES API */
+	/* CAMERA EFFECTS */
 
 	virtual RID camera_attributes_create() = 0;
 
-	virtual void camera_attributes_set_dof_blur_quality(RSE::DOFBlurQuality p_quality, bool p_use_jitter) = 0;
+	enum DOFBlurQuality {
+		DOF_BLUR_QUALITY_VERY_LOW,
+		DOF_BLUR_QUALITY_LOW,
+		DOF_BLUR_QUALITY_MEDIUM,
+		DOF_BLUR_QUALITY_HIGH,
+	};
 
-	virtual void camera_attributes_set_dof_blur_bokeh_shape(RSE::DOFBokehShape p_shape) = 0;
+	virtual void camera_attributes_set_dof_blur_quality(DOFBlurQuality p_quality, bool p_use_jitter) = 0;
+
+	enum DOFBokehShape {
+		DOF_BOKEH_BOX,
+		DOF_BOKEH_HEXAGON,
+		DOF_BOKEH_CIRCLE
+	};
+
+	virtual void camera_attributes_set_dof_blur_bokeh_shape(DOFBokehShape p_shape) = 0;
 
 	virtual void camera_attributes_set_dof_blur(RID p_camera_attributes, bool p_far_enable, float p_far_distance, float p_far_transition, bool p_near_enable, float p_near_distance, float p_near_transition, float p_amount) = 0;
 	virtual void camera_attributes_set_exposure(RID p_camera_attributes, float p_multiplier, float p_exposure_normalization) = 0;
@@ -716,6 +1430,25 @@ public:
 
 	/* INSTANCING API */
 
+	enum InstanceType {
+		INSTANCE_NONE,
+		INSTANCE_MESH,
+		INSTANCE_MULTIMESH,
+		INSTANCE_PARTICLES,
+		INSTANCE_PARTICLES_COLLISION,
+		INSTANCE_LIGHT,
+		INSTANCE_REFLECTION_PROBE,
+		INSTANCE_DECAL,
+		INSTANCE_VOXEL_GI,
+		INSTANCE_LIGHTMAP,
+		INSTANCE_OCCLUDER,
+		INSTANCE_VISIBLITY_NOTIFIER, // TODO: Fix typo in "VISIBILITY" (in 5.0).
+		INSTANCE_FOG_VOLUME,
+		INSTANCE_MAX,
+
+		INSTANCE_GEOMETRY_MASK = (1 << INSTANCE_MESH) | (1 << INSTANCE_MULTIMESH) | (1 << INSTANCE_PARTICLES)
+	};
+
 	virtual RID instance_create2(RID p_base, RID p_scenario);
 
 	virtual RID instance_create() = 0;
@@ -750,11 +1483,32 @@ public:
 	PackedInt64Array _instances_cull_ray_bind(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const;
 	PackedInt64Array _instances_cull_convex_bind(const TypedArray<Plane> &p_convex, RID p_scenario = RID()) const;
 
-	virtual void instance_geometry_set_flag(RID p_instance, RSE::InstanceFlags p_flags, bool p_enabled) = 0;
-	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, RSE::ShadowCastingSetting p_shadow_casting_setting) = 0;
+	enum InstanceFlags {
+		INSTANCE_FLAG_USE_BAKED_LIGHT,
+		INSTANCE_FLAG_USE_DYNAMIC_GI,
+		INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE,
+		INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING,
+		INSTANCE_FLAG_MAX
+	};
+
+	enum ShadowCastingSetting {
+		SHADOW_CASTING_SETTING_OFF,
+		SHADOW_CASTING_SETTING_ON,
+		SHADOW_CASTING_SETTING_DOUBLE_SIDED,
+		SHADOW_CASTING_SETTING_SHADOWS_ONLY,
+	};
+
+	enum VisibilityRangeFadeMode {
+		VISIBILITY_RANGE_FADE_DISABLED,
+		VISIBILITY_RANGE_FADE_SELF,
+		VISIBILITY_RANGE_FADE_DEPENDENCIES,
+	};
+
+	virtual void instance_geometry_set_flag(RID p_instance, InstanceFlags p_flags, bool p_enabled) = 0;
+	virtual void instance_geometry_set_cast_shadows_setting(RID p_instance, ShadowCastingSetting p_shadow_casting_setting) = 0;
 	virtual void instance_geometry_set_material_override(RID p_instance, RID p_material) = 0;
 	virtual void instance_geometry_set_material_overlay(RID p_instance, RID p_material) = 0;
-	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, RSE::VisibilityRangeFadeMode p_fade_mode) = 0;
+	virtual void instance_geometry_set_visibility_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin, VisibilityRangeFadeMode p_fade_mode) = 0;
 	virtual void instance_geometry_set_lightmap(RID p_instance, RID p_lightmap, const Rect2 &p_lightmap_uv_scale, int p_lightmap_slice) = 0;
 	virtual void instance_geometry_set_lod_bias(RID p_instance, float p_lod_bias) = 0;
 	virtual void instance_geometry_set_transparency(RID p_instance, float p_transparency) = 0;
@@ -764,11 +1518,18 @@ public:
 	virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &) const = 0;
 	virtual void instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const = 0;
 
-	/* BAKE API */
+	/* Bake 3D objects */
+
+	enum BakeChannels {
+		BAKE_CHANNEL_ALBEDO_ALPHA,
+		BAKE_CHANNEL_NORMAL,
+		BAKE_CHANNEL_ORM,
+		BAKE_CHANNEL_EMISSION
+	};
 
 	virtual TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) = 0;
 
-	/* CANVAS API (2D) */
+	/* CANVAS (2D) */
 
 	virtual RID canvas_create() = 0;
 	virtual void canvas_set_item_mirroring(RID p_canvas, RID p_item, const Point2 &p_mirroring) = 0;
@@ -778,23 +1539,28 @@ public:
 
 	virtual void canvas_set_disable_scale(bool p_disable) = 0;
 
-	/* CANVAS TEXTURE API*/
-
+	/* CANVAS TEXTURE */
 	virtual RID canvas_texture_create() = 0;
-	virtual void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) = 0;
+
+	enum CanvasTextureChannel {
+		CANVAS_TEXTURE_CHANNEL_DIFFUSE,
+		CANVAS_TEXTURE_CHANNEL_NORMAL,
+		CANVAS_TEXTURE_CHANNEL_SPECULAR,
+	};
+	virtual void canvas_texture_set_channel(RID p_canvas_texture, CanvasTextureChannel p_channel, RID p_texture) = 0;
 	virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) = 0;
 
 	// Takes effect only for new draw commands.
-	virtual void canvas_texture_set_texture_filter(RID p_canvas_texture, RSE::CanvasItemTextureFilter p_filter) = 0;
-	virtual void canvas_texture_set_texture_repeat(RID p_canvas_texture, RSE::CanvasItemTextureRepeat p_repeat) = 0;
+	virtual void canvas_texture_set_texture_filter(RID p_canvas_texture, CanvasItemTextureFilter p_filter) = 0;
+	virtual void canvas_texture_set_texture_repeat(RID p_canvas_texture, CanvasItemTextureRepeat p_repeat) = 0;
 
-	/* CANVAS ITEM API */
+	/* CANVAS ITEM */
 
 	virtual RID canvas_item_create() = 0;
 	virtual void canvas_item_set_parent(RID p_item, RID p_parent) = 0;
 
-	virtual void canvas_item_set_default_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) = 0;
-	virtual void canvas_item_set_default_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) = 0;
+	virtual void canvas_item_set_default_texture_filter(RID p_item, CanvasItemTextureFilter p_filter) = 0;
+	virtual void canvas_item_set_default_texture_repeat(RID p_item, CanvasItemTextureRepeat p_repeat) = 0;
 
 	virtual void canvas_item_set_visible(RID p_item, bool p_visible) = 0;
 	virtual void canvas_item_set_light_mask(RID p_item, int p_mask) = 0;
@@ -812,6 +1578,12 @@ public:
 	virtual void canvas_item_set_draw_behind_parent(RID p_item, bool p_enable) = 0;
 	virtual void canvas_item_set_use_identity_transform(RID p_item, bool p_enabled) = 0;
 
+	enum NinePatchAxisMode {
+		NINE_PATCH_STRETCH,
+		NINE_PATCH_TILE,
+		NINE_PATCH_TILE_FIT,
+	};
+
 	virtual void canvas_item_add_line(RID p_item, const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width = -1.0, bool p_antialiased = false) = 0;
 	virtual void canvas_item_add_polyline(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = -1.0, bool p_antialiased = false) = 0;
 	virtual void canvas_item_add_multiline(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = -1.0, bool p_antialiased = false) = 0;
@@ -822,7 +1594,7 @@ public:
 	virtual void canvas_item_add_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = false) = 0;
 	virtual void canvas_item_add_msdf_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), int p_outline_size = 0, float p_px_range = 1.0, float p_scale = 1.0) = 0;
 	virtual void canvas_item_add_lcd_texture_rect_region(RID p_item, const Rect2 &p_rect, RID p_texture, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1)) = 0;
-	virtual void canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, RSE::NinePatchAxisMode p_x_axis_mode = RSE::NINE_PATCH_STRETCH, RSE::NinePatchAxisMode p_y_axis_mode = RSE::NINE_PATCH_STRETCH, bool p_draw_center = true, const Color &p_modulate = Color(1, 1, 1)) = 0;
+	virtual void canvas_item_add_nine_patch(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector2 &p_topleft, const Vector2 &p_bottomright, NinePatchAxisMode p_x_axis_mode = NINE_PATCH_STRETCH, NinePatchAxisMode p_y_axis_mode = NINE_PATCH_STRETCH, bool p_draw_center = true, const Color &p_modulate = Color(1, 1, 1)) = 0;
 	virtual void canvas_item_add_primitive(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, RID p_texture) = 0;
 	virtual void canvas_item_add_polygon(RID p_item, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), RID p_texture = RID()) = 0;
 	virtual void canvas_item_add_triangle_array(RID p_item, const Vector<int> &p_indices, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), const Vector<int> &p_bones = Vector<int>(), const Vector<float> &p_weights = Vector<float>(), RID p_texture = RID(), int p_count = -1) = 0;
@@ -854,7 +1626,14 @@ public:
 
 	virtual void canvas_item_set_visibility_notifier(RID p_item, bool p_enable, const Rect2 &p_area, const Callable &p_enter_callbable, const Callable &p_exit_callable) = 0;
 
-	virtual void canvas_item_set_canvas_group_mode(RID p_item, RSE::CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false) = 0;
+	enum CanvasGroupMode {
+		CANVAS_GROUP_MODE_DISABLED,
+		CANVAS_GROUP_MODE_CLIP_ONLY,
+		CANVAS_GROUP_MODE_CLIP_AND_DRAW,
+		CANVAS_GROUP_MODE_TRANSPARENT,
+	};
+
+	virtual void canvas_item_set_canvas_group_mode(RID p_item, CanvasGroupMode p_mode, float p_clear_margin = 5.0, bool p_fit_empty = false, float p_fit_margin = 0.0, bool p_blur_mipmaps = false) = 0;
 
 	virtual void canvas_item_set_debug_redraw(bool p_enabled) = 0;
 	virtual bool canvas_item_get_debug_redraw() const = 0;
@@ -864,10 +1643,14 @@ public:
 	virtual void canvas_item_transform_physics_interpolation(RID p_item, const Transform2D &p_transform) = 0;
 
 	/* CANVAS LIGHT */
-
 	virtual RID canvas_light_create() = 0;
 
-	virtual void canvas_light_set_mode(RID p_light, RSE::CanvasLightMode p_mode) = 0;
+	enum CanvasLightMode {
+		CANVAS_LIGHT_MODE_POINT,
+		CANVAS_LIGHT_MODE_DIRECTIONAL,
+	};
+
+	virtual void canvas_light_set_mode(RID p_light, CanvasLightMode p_mode) = 0;
 
 	virtual void canvas_light_attach_to_canvas(RID p_light, RID p_canvas) = 0;
 	virtual void canvas_light_set_enabled(RID p_light, bool p_enabled) = 0;
@@ -886,10 +1669,23 @@ public:
 	virtual void canvas_light_set_texture(RID p_light, RID p_texture) = 0;
 	virtual void canvas_light_set_texture_offset(RID p_light, const Vector2 &p_offset) = 0;
 
-	virtual void canvas_light_set_blend_mode(RID p_light, RSE::CanvasLightBlendMode p_mode) = 0;
+	enum CanvasLightBlendMode {
+		CANVAS_LIGHT_BLEND_MODE_ADD,
+		CANVAS_LIGHT_BLEND_MODE_SUB,
+		CANVAS_LIGHT_BLEND_MODE_MIX,
+	};
+
+	virtual void canvas_light_set_blend_mode(RID p_light, CanvasLightBlendMode p_mode) = 0;
+
+	enum CanvasLightShadowFilter {
+		CANVAS_LIGHT_FILTER_NONE,
+		CANVAS_LIGHT_FILTER_PCF5,
+		CANVAS_LIGHT_FILTER_PCF13,
+		CANVAS_LIGHT_FILTER_MAX
+	};
 
 	virtual void canvas_light_set_shadow_enabled(RID p_light, bool p_enabled) = 0;
-	virtual void canvas_light_set_shadow_filter(RID p_light, RSE::CanvasLightShadowFilter p_filter) = 0;
+	virtual void canvas_light_set_shadow_filter(RID p_light, CanvasLightShadowFilter p_filter) = 0;
 	virtual void canvas_light_set_shadow_color(RID p_light, const Color &p_color) = 0;
 	virtual void canvas_light_set_shadow_smooth(RID p_light, float p_smooth) = 0;
 
@@ -897,7 +1693,7 @@ public:
 	virtual void canvas_light_reset_physics_interpolation(RID p_light) = 0;
 	virtual void canvas_light_transform_physics_interpolation(RID p_light, const Transform2D &p_transform) = 0;
 
-	/* CANVAS LIGHT OCCLUDER API */
+	/* CANVAS LIGHT OCCLUDER */
 
 	virtual RID canvas_light_occluder_create() = 0;
 	virtual void canvas_light_occluder_attach_to_canvas(RID p_occluder, RID p_canvas) = 0;
@@ -911,21 +1707,60 @@ public:
 	virtual void canvas_light_occluder_reset_physics_interpolation(RID p_occluder) = 0;
 	virtual void canvas_light_occluder_transform_physics_interpolation(RID p_occluder, const Transform2D &p_transform) = 0;
 
-	/* CANVAS OCCLUDER POLYGON API */
+	/* CANVAS LIGHT OCCLUDER POLYGON */
 
 	virtual RID canvas_occluder_polygon_create() = 0;
 	virtual void canvas_occluder_polygon_set_shape(RID p_occluder_polygon, const Vector<Vector2> &p_shape, bool p_closed) = 0;
 
-	virtual void canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, RSE::CanvasOccluderPolygonCullMode p_mode) = 0;
+	enum CanvasOccluderPolygonCullMode {
+		CANVAS_OCCLUDER_POLYGON_CULL_DISABLED,
+		CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE,
+		CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE,
+	};
+
+	virtual void canvas_occluder_polygon_set_cull_mode(RID p_occluder_polygon, CanvasOccluderPolygonCullMode p_mode) = 0;
 
 	virtual void canvas_set_shadow_texture_size(int p_size) = 0;
 
 	Rect2 debug_canvas_item_get_rect(RID p_item);
 	virtual Rect2 _debug_canvas_item_get_rect(RID p_item) = 0;
 
-	/* GLOBAL SHADER PARAMETERS API */
+	/* GLOBAL SHADER UNIFORMS */
 
-	virtual void global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) = 0;
+	enum GlobalShaderParameterType {
+		GLOBAL_VAR_TYPE_BOOL,
+		GLOBAL_VAR_TYPE_BVEC2,
+		GLOBAL_VAR_TYPE_BVEC3,
+		GLOBAL_VAR_TYPE_BVEC4,
+		GLOBAL_VAR_TYPE_INT,
+		GLOBAL_VAR_TYPE_IVEC2,
+		GLOBAL_VAR_TYPE_IVEC3,
+		GLOBAL_VAR_TYPE_IVEC4,
+		GLOBAL_VAR_TYPE_RECT2I,
+		GLOBAL_VAR_TYPE_UINT,
+		GLOBAL_VAR_TYPE_UVEC2,
+		GLOBAL_VAR_TYPE_UVEC3,
+		GLOBAL_VAR_TYPE_UVEC4,
+		GLOBAL_VAR_TYPE_FLOAT,
+		GLOBAL_VAR_TYPE_VEC2,
+		GLOBAL_VAR_TYPE_VEC3,
+		GLOBAL_VAR_TYPE_VEC4,
+		GLOBAL_VAR_TYPE_COLOR,
+		GLOBAL_VAR_TYPE_RECT2,
+		GLOBAL_VAR_TYPE_MAT2,
+		GLOBAL_VAR_TYPE_MAT3,
+		GLOBAL_VAR_TYPE_MAT4,
+		GLOBAL_VAR_TYPE_TRANSFORM_2D,
+		GLOBAL_VAR_TYPE_TRANSFORM,
+		GLOBAL_VAR_TYPE_SAMPLER2D,
+		GLOBAL_VAR_TYPE_SAMPLER2DARRAY,
+		GLOBAL_VAR_TYPE_SAMPLER3D,
+		GLOBAL_VAR_TYPE_SAMPLERCUBE,
+		GLOBAL_VAR_TYPE_SAMPLEREXT,
+		GLOBAL_VAR_TYPE_MAX
+	};
+
+	virtual void global_shader_parameter_add(const StringName &p_name, GlobalShaderParameterType p_type, const Variant &p_value) = 0;
 	virtual void global_shader_parameter_remove(const StringName &p_name) = 0;
 	virtual Vector<StringName> global_shader_parameter_get_list() const = 0;
 
@@ -933,12 +1768,12 @@ public:
 	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) = 0;
 
 	virtual Variant global_shader_parameter_get(const StringName &p_name) const = 0;
-	virtual RSE::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const = 0;
+	virtual GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const = 0;
 
 	virtual void global_shader_parameters_load_settings(bool p_load_textures) = 0;
 	virtual void global_shader_parameters_clear() = 0;
 
-	static int global_shader_uniform_type_get_shader_datatype(RSE::GlobalShaderParameterType p_type);
+	static int global_shader_uniform_type_get_shader_datatype(GlobalShaderParameterType p_type);
 
 	/* FREE */
 
@@ -967,14 +1802,35 @@ public:
 
 	/* STATUS INFORMATION */
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) = 0;
+	enum RenderingInfo {
+		RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME,
+		RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME,
+		RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME,
+		RENDERING_INFO_TEXTURE_MEM_USED,
+		RENDERING_INFO_BUFFER_MEM_USED,
+		RENDERING_INFO_VIDEO_MEM_USED,
+		RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS,
+		RENDERING_INFO_PIPELINE_COMPILATIONS_MESH,
+		RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE,
+		RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW,
+		RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION,
+		RENDERING_INFO_MAX
+	};
+
+	virtual uint64_t get_rendering_info(RenderingInfo p_info) = 0;
 	virtual String get_video_adapter_name() const = 0;
 	virtual String get_video_adapter_vendor() const = 0;
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const = 0;
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const = 0;
 	virtual String get_video_adapter_api_version() const = 0;
 
+	struct FrameProfileArea {
+		String name;
+		double gpu_msec;
+		double cpu_msec;
+	};
+
 	virtual void set_frame_profiling_enabled(bool p_enable) = 0;
-	virtual Vector<RenderingServerTypes::FrameProfileArea> get_frame_profile() = 0;
+	virtual Vector<FrameProfileArea> get_frame_profile() = 0;
 	virtual uint64_t get_frame_profile_frame() = 0;
 
 	virtual double get_frame_setup_time_cpu() const = 0;
@@ -995,27 +1851,39 @@ public:
 	virtual void mesh_add_surface_from_mesh_data(RID p_mesh, const Geometry3D::MeshData &p_mesh_data);
 	virtual void mesh_add_surface_from_planes(RID p_mesh, const Vector<Plane> &p_planes);
 
-	/* BACKGROUND */
+	enum SplashStretchMode {
+		SPLASH_STRETCH_MODE_DISABLED,
+		SPLASH_STRETCH_MODE_KEEP,
+		SPLASH_STRETCH_MODE_KEEP_WIDTH,
+		SPLASH_STRETCH_MODE_KEEP_HEIGHT,
+		SPLASH_STRETCH_MODE_COVER,
+		SPLASH_STRETCH_MODE_IGNORE,
+	};
 
-	virtual void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, RSE::SplashStretchMode p_stretch_mode, bool p_use_filter = true) = 0;
+	virtual void set_boot_image_with_stretch(const Ref<Image> &p_image, const Color &p_color, SplashStretchMode p_stretch_mode, bool p_use_filter = true) = 0;
+	static Rect2 get_splash_stretched_screen_rect(const Size2 &p_image_size, const Size2 &p_window_size, SplashStretchMode p_stretch_mode); // Helper for splash screen
 #ifndef DISABLE_DEPRECATED
 	void set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter = true); // Superseded, but left to preserve compat.
 #endif
-
+	_ALWAYS_INLINE_ static SplashStretchMode map_scaling_option_to_stretch_mode(bool p_scale) {
+		return p_scale ? SplashStretchMode::SPLASH_STRETCH_MODE_KEEP : SplashStretchMode::SPLASH_STRETCH_MODE_DISABLED;
+	}
 	virtual Color get_default_clear_color() = 0;
 	virtual void set_default_clear_color(const Color &p_color) = 0;
 
-	/* MISC */
-
 #ifndef DISABLE_DEPRECATED
 	// Never actually used, should be removed when we can break compatibility.
-	virtual bool has_feature(RSE::Features p_feature) const = 0;
+	enum Features {
+		FEATURE_SHADERS,
+		FEATURE_MULTITHREADED,
+	};
+	virtual bool has_feature(Features p_feature) const = 0;
 #endif
 	virtual bool has_os_feature(const String &p_feature) const = 0;
 
 	virtual void set_debug_generate_wireframes(bool p_generate) = 0;
 
-	virtual void call_set_vsync_mode(DisplayServerEnums::VSyncMode p_mode, DisplayServerEnums::WindowID p_window) = 0;
+	virtual void call_set_vsync_mode(DisplayServer::VSyncMode p_mode, DisplayServer::WindowID p_window) = 0;
 
 	virtual bool is_low_end() const = 0;
 
@@ -1049,12 +1917,12 @@ public:
 #endif
 
 #ifndef DISABLE_DEPRECATED
-	void fix_surface_compatibility(RenderingServerTypes::SurfaceData &p_surface, const String &p_path = "");
+	void fix_surface_compatibility(SurfaceData &p_surface, const String &p_path = "");
 #endif
 
 private:
 	// Binder helpers
-	RID _texture_2d_layered_create(const TypedArray<Image> &p_layers, RSE::TextureLayeredType p_layered_type);
+	RID _texture_2d_layered_create(const TypedArray<Image> &p_layers, TextureLayeredType p_layered_type);
 	RID _texture_3d_create(Image::Format p_format, int p_width, int p_height, int p_depth, bool p_mipmaps, const TypedArray<Image> &p_data);
 	void _texture_3d_update(RID p_texture, const TypedArray<Image> &p_data);
 	TypedArray<Image> _texture_3d_get(RID p_texture) const;
@@ -1073,96 +1941,92 @@ private:
 };
 
 // Make variant understand the enums.
-
-VARIANT_ENUM_CAST_EXT(RSE::TextureType, RenderingServer::TextureType);
-VARIANT_ENUM_CAST_EXT(RSE::TextureLayeredType, RenderingServer::TextureLayeredType);
-VARIANT_ENUM_CAST_EXT(RSE::CubeMapLayer, RenderingServer::CubeMapLayer);
-VARIANT_ENUM_CAST_EXT(RSE::TextureDrawableFormat, RenderingServer::TextureDrawableFormat);
-VARIANT_ENUM_CAST_EXT(RSE::PipelineSource, RenderingServer::PipelineSource);
-VARIANT_ENUM_CAST_EXT(RSE::ShaderMode, RenderingServer::ShaderMode);
-VARIANT_ENUM_CAST_EXT(RSE::ArrayType, RenderingServer::ArrayType);
-VARIANT_BITFIELD_CAST_EXT(RSE::ArrayFormat, RenderingServer::ArrayFormat);
-VARIANT_ENUM_CAST_EXT(RSE::ArrayCustomFormat, RenderingServer::ArrayCustomFormat);
-VARIANT_ENUM_CAST_EXT(RSE::PrimitiveType, RenderingServer::PrimitiveType);
-VARIANT_ENUM_CAST_EXT(RSE::BlendShapeMode, RenderingServer::BlendShapeMode);
-VARIANT_ENUM_CAST_EXT(RSE::MultimeshTransformFormat, RenderingServer::MultimeshTransformFormat);
-VARIANT_ENUM_CAST_EXT(RSE::MultimeshPhysicsInterpolationQuality, RenderingServer::MultimeshPhysicsInterpolationQuality);
-VARIANT_ENUM_CAST_EXT(RSE::LightType, RenderingServer::LightType);
-VARIANT_ENUM_CAST_EXT(RSE::LightParam, RenderingServer::LightParam);
-VARIANT_ENUM_CAST_EXT(RSE::LightBakeMode, RenderingServer::LightBakeMode);
-VARIANT_ENUM_CAST_EXT(RSE::LightOmniShadowMode, RenderingServer::LightOmniShadowMode);
-VARIANT_ENUM_CAST_EXT(RSE::LightDirectionalShadowMode, RenderingServer::LightDirectionalShadowMode);
-VARIANT_ENUM_CAST_EXT(RSE::LightDirectionalSkyMode, RenderingServer::LightDirectionalSkyMode);
-VARIANT_ENUM_CAST_EXT(RSE::LightProjectorFilter, RenderingServer::LightProjectorFilter);
-VARIANT_ENUM_CAST_EXT(RSE::ReflectionProbeUpdateMode, RenderingServer::ReflectionProbeUpdateMode);
-VARIANT_ENUM_CAST_EXT(RSE::ReflectionProbeAmbientMode, RenderingServer::ReflectionProbeAmbientMode);
-VARIANT_ENUM_CAST_EXT(RSE::VoxelGIQuality, RenderingServer::VoxelGIQuality);
-VARIANT_ENUM_CAST_EXT(RSE::DecalTexture, RenderingServer::DecalTexture);
-VARIANT_ENUM_CAST_EXT(RSE::DecalFilter, RenderingServer::DecalFilter);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesMode, RenderingServer::ParticlesMode);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesTransformAlign, RenderingServer::ParticlesTransformAlign);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesTransformAlignCustomSrc, RenderingServer::ParticlesTransformAlignCustomSrc);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesTransformAlignAxis, RenderingServer::ParticlesTransformAlignAxis);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesDrawOrder, RenderingServer::ParticlesDrawOrder);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesEmitFlags, RenderingServer::ParticlesEmitFlags);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesCollisionType, RenderingServer::ParticlesCollisionType);
-VARIANT_ENUM_CAST_EXT(RSE::ParticlesCollisionHeightfieldResolution, RenderingServer::ParticlesCollisionHeightfieldResolution);
-VARIANT_ENUM_CAST_EXT(RSE::FogVolumeShape, RenderingServer::FogVolumeShape);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportScaling3DMode, RenderingServer::ViewportScaling3DMode);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportUpdateMode, RenderingServer::ViewportUpdateMode);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportClearMode, RenderingServer::ViewportClearMode);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportEnvironmentMode, RenderingServer::ViewportEnvironmentMode);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportMSAA, RenderingServer::ViewportMSAA);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportAnisotropicFiltering, RenderingServer::ViewportAnisotropicFiltering);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportScreenSpaceAA, RenderingServer::ViewportScreenSpaceAA);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportRenderInfo, RenderingServer::ViewportRenderInfo);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportRenderInfoType, RenderingServer::ViewportRenderInfoType);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportDebugDraw, RenderingServer::ViewportDebugDraw);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportOcclusionCullingBuildQuality, RenderingServer::ViewportOcclusionCullingBuildQuality);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportSDFOversize, RenderingServer::ViewportSDFOversize);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportSDFScale, RenderingServer::ViewportSDFScale);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportVRSMode, RenderingServer::ViewportVRSMode);
-VARIANT_ENUM_CAST_EXT(RSE::ViewportVRSUpdateMode, RenderingServer::ViewportVRSUpdateMode);
-VARIANT_ENUM_CAST_EXT(RSE::SkyMode, RenderingServer::SkyMode);
-VARIANT_ENUM_CAST_EXT(RSE::CompositorEffectCallbackType, RenderingServer::CompositorEffectCallbackType);
-VARIANT_ENUM_CAST_EXT(RSE::CompositorEffectFlags, RenderingServer::CompositorEffectFlags);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentBG, RenderingServer::EnvironmentBG);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentAmbientSource, RenderingServer::EnvironmentAmbientSource);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentReflectionSource, RenderingServer::EnvironmentReflectionSource);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentGlowBlendMode, RenderingServer::EnvironmentGlowBlendMode);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentFogMode, RenderingServer::EnvironmentFogMode);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentToneMapper, RenderingServer::EnvironmentToneMapper);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSSRRoughnessQuality, RenderingServer::EnvironmentSSRRoughnessQuality);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSSAOQuality, RenderingServer::EnvironmentSSAOQuality);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSSILQuality, RenderingServer::EnvironmentSSILQuality);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSDFGIFramesToConverge, RenderingServer::EnvironmentSDFGIFramesToConverge);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSDFGIRayCount, RenderingServer::EnvironmentSDFGIRayCount);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSDFGIFramesToUpdateLight, RenderingServer::EnvironmentSDFGIFramesToUpdateLight);
-VARIANT_ENUM_CAST_EXT(RSE::EnvironmentSDFGIYScale, RenderingServer::EnvironmentSDFGIYScale);
-VARIANT_ENUM_CAST_EXT(RSE::SubSurfaceScatteringQuality, RenderingServer::SubSurfaceScatteringQuality);
-VARIANT_ENUM_CAST_EXT(RSE::DOFBlurQuality, RenderingServer::DOFBlurQuality);
-VARIANT_ENUM_CAST_EXT(RSE::DOFBokehShape, RenderingServer::DOFBokehShape);
-VARIANT_ENUM_CAST_EXT(RSE::ShadowQuality, RenderingServer::ShadowQuality);
-VARIANT_ENUM_CAST_EXT(RSE::InstanceType, RenderingServer::InstanceType);
-VARIANT_ENUM_CAST_EXT(RSE::InstanceFlags, RenderingServer::InstanceFlags);
-VARIANT_ENUM_CAST_EXT(RSE::ShadowCastingSetting, RenderingServer::ShadowCastingSetting);
-VARIANT_ENUM_CAST_EXT(RSE::VisibilityRangeFadeMode, RenderingServer::VisibilityRangeFadeMode);
-VARIANT_ENUM_CAST_EXT(RSE::NinePatchAxisMode, RenderingServer::NinePatchAxisMode);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasItemTextureFilter, RenderingServer::CanvasItemTextureFilter);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasItemTextureRepeat, RenderingServer::CanvasItemTextureRepeat);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasGroupMode, RenderingServer::CanvasGroupMode);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasLightMode, RenderingServer::CanvasLightMode);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasLightBlendMode, RenderingServer::CanvasLightBlendMode);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasLightShadowFilter, RenderingServer::CanvasLightShadowFilter);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasOccluderPolygonCullMode, RenderingServer::CanvasOccluderPolygonCullMode);
-VARIANT_ENUM_CAST_EXT(RSE::GlobalShaderParameterType, RenderingServer::GlobalShaderParameterType);
-VARIANT_ENUM_CAST_EXT(RSE::RenderingInfo, RenderingServer::RenderingInfo);
-VARIANT_ENUM_CAST_EXT(RSE::SplashStretchMode, RenderingServer::SplashStretchMode);
-VARIANT_ENUM_CAST_EXT(RSE::CanvasTextureChannel, RenderingServer::CanvasTextureChannel);
-VARIANT_ENUM_CAST_EXT(RSE::BakeChannels, RenderingServer::BakeChannels);
+VARIANT_ENUM_CAST(RenderingServer::TextureType);
+VARIANT_ENUM_CAST(RenderingServer::TextureLayeredType);
+VARIANT_ENUM_CAST(RenderingServer::CubeMapLayer);
+VARIANT_ENUM_CAST(RenderingServer::PipelineSource);
+VARIANT_ENUM_CAST(RenderingServer::ShaderMode);
+VARIANT_ENUM_CAST(RenderingServer::ArrayType);
+VARIANT_BITFIELD_CAST(RenderingServer::ArrayFormat);
+VARIANT_ENUM_CAST(RenderingServer::ArrayCustomFormat);
+VARIANT_ENUM_CAST(RenderingServer::PrimitiveType);
+VARIANT_ENUM_CAST(RenderingServer::BlendShapeMode);
+VARIANT_ENUM_CAST(RenderingServer::MultimeshTransformFormat);
+VARIANT_ENUM_CAST(RenderingServer::MultimeshPhysicsInterpolationQuality);
+VARIANT_ENUM_CAST(RenderingServer::LightType);
+VARIANT_ENUM_CAST(RenderingServer::LightParam);
+VARIANT_ENUM_CAST(RenderingServer::LightBakeMode);
+VARIANT_ENUM_CAST(RenderingServer::LightOmniShadowMode);
+VARIANT_ENUM_CAST(RenderingServer::LightDirectionalShadowMode);
+VARIANT_ENUM_CAST(RenderingServer::LightDirectionalSkyMode);
+VARIANT_ENUM_CAST(RenderingServer::LightProjectorFilter);
+VARIANT_ENUM_CAST(RenderingServer::ReflectionProbeUpdateMode);
+VARIANT_ENUM_CAST(RenderingServer::ReflectionProbeAmbientMode);
+VARIANT_ENUM_CAST(RenderingServer::VoxelGIQuality);
+VARIANT_ENUM_CAST(RenderingServer::DecalTexture);
+VARIANT_ENUM_CAST(RenderingServer::DecalFilter);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesMode);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesTransformAlign);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesDrawOrder);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesEmitFlags);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesCollisionType);
+VARIANT_ENUM_CAST(RenderingServer::ParticlesCollisionHeightfieldResolution);
+VARIANT_ENUM_CAST(RenderingServer::FogVolumeShape);
+VARIANT_ENUM_CAST(RenderingServer::ViewportScaling3DMode);
+VARIANT_ENUM_CAST(RenderingServer::ViewportUpdateMode);
+VARIANT_ENUM_CAST(RenderingServer::ViewportClearMode);
+VARIANT_ENUM_CAST(RenderingServer::ViewportEnvironmentMode);
+VARIANT_ENUM_CAST(RenderingServer::ViewportMSAA);
+VARIANT_ENUM_CAST(RenderingServer::ViewportAnisotropicFiltering);
+VARIANT_ENUM_CAST(RenderingServer::ViewportScreenSpaceAA);
+VARIANT_ENUM_CAST(RenderingServer::ViewportRenderInfo);
+VARIANT_ENUM_CAST(RenderingServer::ViewportRenderInfoType);
+VARIANT_ENUM_CAST(RenderingServer::ViewportDebugDraw);
+VARIANT_ENUM_CAST(RenderingServer::ViewportOcclusionCullingBuildQuality);
+VARIANT_ENUM_CAST(RenderingServer::ViewportSDFOversize);
+VARIANT_ENUM_CAST(RenderingServer::ViewportSDFScale);
+VARIANT_ENUM_CAST(RenderingServer::ViewportVRSMode);
+VARIANT_ENUM_CAST(RenderingServer::ViewportVRSUpdateMode);
+VARIANT_ENUM_CAST(RenderingServer::SkyMode);
+VARIANT_ENUM_CAST(RenderingServer::CompositorEffectCallbackType);
+VARIANT_ENUM_CAST(RenderingServer::CompositorEffectFlags);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentBG);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentAmbientSource);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentReflectionSource);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentGlowBlendMode);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentFogMode);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentToneMapper);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSSRRoughnessQuality);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSSAOQuality);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSSILQuality);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIFramesToConverge);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIRayCount);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIFramesToUpdateLight);
+VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIYScale);
+VARIANT_ENUM_CAST(RenderingServer::SubSurfaceScatteringQuality);
+VARIANT_ENUM_CAST(RenderingServer::DOFBlurQuality);
+VARIANT_ENUM_CAST(RenderingServer::DOFBokehShape);
+VARIANT_ENUM_CAST(RenderingServer::ShadowQuality);
+VARIANT_ENUM_CAST(RenderingServer::InstanceType);
+VARIANT_ENUM_CAST(RenderingServer::InstanceFlags);
+VARIANT_ENUM_CAST(RenderingServer::ShadowCastingSetting);
+VARIANT_ENUM_CAST(RenderingServer::VisibilityRangeFadeMode);
+VARIANT_ENUM_CAST(RenderingServer::NinePatchAxisMode);
+VARIANT_ENUM_CAST(RenderingServer::CanvasItemTextureFilter);
+VARIANT_ENUM_CAST(RenderingServer::CanvasItemTextureRepeat);
+VARIANT_ENUM_CAST(RenderingServer::CanvasGroupMode);
+VARIANT_ENUM_CAST(RenderingServer::CanvasLightMode);
+VARIANT_ENUM_CAST(RenderingServer::CanvasLightBlendMode);
+VARIANT_ENUM_CAST(RenderingServer::CanvasLightShadowFilter);
+VARIANT_ENUM_CAST(RenderingServer::CanvasOccluderPolygonCullMode);
+VARIANT_ENUM_CAST(RenderingServer::GlobalShaderParameterType);
+VARIANT_ENUM_CAST(RenderingServer::RenderingInfo);
+VARIANT_ENUM_CAST(RenderingServer::SplashStretchMode);
+VARIANT_ENUM_CAST(RenderingServer::CanvasTextureChannel);
+VARIANT_ENUM_CAST(RenderingServer::BakeChannels);
 
 #ifndef DISABLE_DEPRECATED
-VARIANT_ENUM_CAST_EXT(RSE::Features, RenderingServer::Features);
+VARIANT_ENUM_CAST(RenderingServer::Features);
 #endif
 
 // Alias to make it easier to use.
diff --git a/engine/drivers/d3d12/godot_d3dx12.h b/engine/servers/rendering/rendering_server_constants.h
similarity index 78%
rename from engine/drivers/d3d12/godot_d3dx12.h
rename to engine/servers/rendering/rendering_server_constants.h
index 3c2cd4f9..74cbe311 100644
--- a/engine/drivers/d3d12/godot_d3dx12.h
+++ b/engine/servers/rendering/rendering_server_constants.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  godot_d3dx12.h                                                        */
+/*  rendering_server_constants.h                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -30,17 +30,16 @@
 
 #pragma once
 
-#include "core/typedefs.h"
+// Use for constants etc. that need not be included as often as rendering_server.h
+// to reduce dependencies and prevent slow compilation.
 
-#if !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
-// Match current version used by MinGW, MSVC and Direct3D 12 headers use 500.
-#define __REQUIRED_RPCNDR_H_VERSION__ 475
-#endif // !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+// This is a "cheap" include, and can be used from scene side code as well as servers.
 
-GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
-GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
+// N.B. ONLY allow these defined in DEV_ENABLED builds, they will slow
+// performance, and are only necessary to use for debugging.
+#ifdef DEV_ENABLED
 
-#include <thirdparty/directx_headers/include/directx/d3dx12.h> // IWYU pragma: export.
+// Uncomment this define to produce debugging output for physics interpolation.
+//#define RENDERING_SERVER_DEBUG_PHYSICS_INTERPOLATION
 
-GODOT_GCC_WARNING_POP
-GODOT_CLANG_WARNING_POP
+#endif // DEV_ENABLED
diff --git a/engine/servers/rendering/rendering_server_default.cpp b/engine/servers/rendering/rendering_server_default.cpp
index 49b80b10..d2abea79 100644
--- a/engine/servers/rendering/rendering_server_default.cpp
+++ b/engine/servers/rendering/rendering_server_default.cpp
@@ -30,18 +30,11 @@
 
 #include "rendering_server_default.h"
 
-#include "core/object/callable_mp.h"
 #include "core/os/os.h"
 #include "core/profiling/profiling.h"
-#include "servers/display/display_server.h"
-#include "servers/rendering/renderer_canvas_cull.h"
-#include "servers/rendering/renderer_scene_cull.h"
-#include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_server_globals.h"
-
-#ifndef XR_DISABLED
-#include "servers/xr/xr_server.h"
-#endif
+#include "renderer_canvas_cull.h"
+#include "renderer_scene_cull.h"
+#include "rendering_server_globals.h"
 
 // careful, these may run in different threads than the rendering server
 
@@ -135,7 +128,7 @@ void RenderingServerDefault::_draw(bool p_swap_buffers, double frame_step) {
 
 	if (RSG::utilities->get_captured_timestamps_count()) {
 		GodotProfileZoneGrouped(_profile_zone, "frame_profile");
-		Vector<RenderingServerTypes::FrameProfileArea> new_profile;
+		Vector<FrameProfileArea> new_profile;
 		if (RSG::utilities->capturing_timestamps) {
 			new_profile.resize(RSG::utilities->get_captured_timestamps_count());
 		}
@@ -304,28 +297,28 @@ void RenderingServerDefault::finish() {
 
 /* STATUS INFORMATION */
 
-uint64_t RenderingServerDefault::get_rendering_info(RSE::RenderingInfo p_info) {
-	if (p_info == RSE::RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME) {
+uint64_t RenderingServerDefault::get_rendering_info(RenderingInfo p_info) {
+	if (p_info == RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME) {
 		return RSG::viewport->get_total_objects_drawn();
-	} else if (p_info == RSE::RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME) {
+	} else if (p_info == RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME) {
 		return RSG::viewport->get_total_primitives_drawn();
-	} else if (p_info == RSE::RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME) {
+	} else if (p_info == RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME) {
 		return RSG::viewport->get_total_draw_calls_used();
-	} else if (p_info == RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS) {
-		return RSG::canvas_render->get_pipeline_compilations(RSE::PIPELINE_SOURCE_CANVAS);
-	} else if (p_info == RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_MESH) {
-		return RSG::canvas_render->get_pipeline_compilations(RSE::PIPELINE_SOURCE_MESH) + RSG::scene->get_pipeline_compilations(RSE::PIPELINE_SOURCE_MESH);
-	} else if (p_info == RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE) {
-		return RSG::scene->get_pipeline_compilations(RSE::PIPELINE_SOURCE_SURFACE);
-	} else if (p_info == RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW) {
-		return RSG::canvas_render->get_pipeline_compilations(RSE::PIPELINE_SOURCE_DRAW) + RSG::scene->get_pipeline_compilations(RSE::PIPELINE_SOURCE_DRAW);
-	} else if (p_info == RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION) {
-		return RSG::canvas_render->get_pipeline_compilations(RSE::PIPELINE_SOURCE_SPECIALIZATION) + RSG::scene->get_pipeline_compilations(RSE::PIPELINE_SOURCE_SPECIALIZATION);
+	} else if (p_info == RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS) {
+		return RSG::canvas_render->get_pipeline_compilations(PIPELINE_SOURCE_CANVAS);
+	} else if (p_info == RENDERING_INFO_PIPELINE_COMPILATIONS_MESH) {
+		return RSG::canvas_render->get_pipeline_compilations(PIPELINE_SOURCE_MESH) + RSG::scene->get_pipeline_compilations(PIPELINE_SOURCE_MESH);
+	} else if (p_info == RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE) {
+		return RSG::scene->get_pipeline_compilations(PIPELINE_SOURCE_SURFACE);
+	} else if (p_info == RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW) {
+		return RSG::canvas_render->get_pipeline_compilations(PIPELINE_SOURCE_DRAW) + RSG::scene->get_pipeline_compilations(PIPELINE_SOURCE_DRAW);
+	} else if (p_info == RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION) {
+		return RSG::canvas_render->get_pipeline_compilations(PIPELINE_SOURCE_SPECIALIZATION) + RSG::scene->get_pipeline_compilations(PIPELINE_SOURCE_SPECIALIZATION);
 	}
 	return RSG::utilities->get_rendering_info(p_info);
 }
 
-RenderingDeviceEnums::DeviceType RenderingServerDefault::get_video_adapter_type() const {
+RenderingDevice::DeviceType RenderingServerDefault::get_video_adapter_type() const {
 	return RSG::utilities->get_video_adapter_type();
 }
 
@@ -337,7 +330,7 @@ uint64_t RenderingServerDefault::get_frame_profile_frame() {
 	return frame_profile_frame;
 }
 
-Vector<RenderingServerTypes::FrameProfileArea> RenderingServerDefault::get_frame_profile() {
+Vector<RenderingServer::FrameProfileArea> RenderingServerDefault::get_frame_profile() {
 	return frame_profile;
 }
 
@@ -352,7 +345,7 @@ void RenderingServerDefault::set_default_clear_color(const Color &p_color) {
 }
 
 #ifndef DISABLE_DEPRECATED
-bool RenderingServerDefault::has_feature(RSE::Features p_feature) const {
+bool RenderingServerDefault::has_feature(Features p_feature) const {
 	return false;
 }
 #endif
@@ -413,7 +406,7 @@ void RenderingServerDefault::_thread_exit() {
 }
 
 void RenderingServerDefault::_thread_loop() {
-	DisplayServer::get_singleton()->gl_window_make_current(DisplayServerEnums::MAIN_WINDOW_ID); // Move GL to this thread.
+	DisplayServer::get_singleton()->gl_window_make_current(DisplayServer::MAIN_WINDOW_ID); // Move GL to this thread.
 
 	while (!exit) {
 		WorkerThreadPool::get_singleton()->yield();
diff --git a/engine/servers/rendering/rendering_server_default.h b/engine/servers/rendering/rendering_server_default.h
index 832b6c79..5ddde49c 100644
--- a/engine/servers/rendering/rendering_server_default.h
+++ b/engine/servers/rendering/rendering_server_default.h
@@ -34,14 +34,11 @@
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
 #include "core/templates/hash_map.h"
-#include "servers/rendering/renderer_canvas_cull.h"
+#include "renderer_canvas_cull.h"
+#include "renderer_viewport.h"
+#include "rendering_server_globals.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/renderer_viewport.h"
-#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/rendering_server.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/rendering_server_types.h"
 #include "servers/server_wrap_mt_common.h"
 
 class RenderingServerDefault : public RenderingServer {
@@ -67,7 +64,7 @@ class RenderingServerDefault : public RenderingServer {
 	static void _changes_changed() {}
 
 	uint64_t frame_profile_frame = 0;
-	Vector<RenderingServerTypes::FrameProfileArea> frame_profile;
+	Vector<FrameProfileArea> frame_profile;
 
 	double frame_setup_time = 0;
 
@@ -133,93 +130,70 @@ public:
 #define ServerName RendererTextureStorage
 #define server_name RSG::texture_storage
 
-#define FUNCRIDTEX0(m_type) \
-	virtual RID m_type##_create() override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
+#define FUNCRIDTEX0(m_type)                                                                              \
+	virtual RID m_type##_create() override {                                                             \
+		RID ret = RSG::texture_storage->texture_allocate();                                              \
 		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret); \
-		} else { \
+			RSG::texture_storage->m_type##_initialize(ret);                                              \
+		} else {                                                                                         \
 			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret); \
-		} \
-		return ret; \
+		}                                                                                                \
+		return ret;                                                                                      \
 	}
 
-#define FUNCRIDTEX1(m_type, m_type1) \
-	virtual RID m_type##_create(m_type1 p1) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1); \
-		} else { \
+#define FUNCRIDTEX1(m_type, m_type1)                                                                         \
+	virtual RID m_type##_create(m_type1 p1) override {                                                       \
+		RID ret = RSG::texture_storage->texture_allocate();                                                  \
+		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) {     \
+			RSG::texture_storage->m_type##_initialize(ret, p1);                                              \
+		} else {                                                                                             \
 			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1); \
-		} \
-		return ret; \
+		}                                                                                                    \
+		return ret;                                                                                          \
 	}
 
-#define FUNCRIDTEX2(m_type, m_type1, m_type2) \
-	virtual RID m_type##_create(m_type1 p1, m_type2 p2) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1, p2); \
-		} else { \
+#define FUNCRIDTEX2(m_type, m_type1, m_type2)                                                                    \
+	virtual RID m_type##_create(m_type1 p1, m_type2 p2) override {                                               \
+		RID ret = RSG::texture_storage->texture_allocate();                                                      \
+		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) {         \
+			RSG::texture_storage->m_type##_initialize(ret, p1, p2);                                              \
+		} else {                                                                                                 \
 			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1, p2); \
-		} \
-		return ret; \
+		}                                                                                                        \
+		return ret;                                                                                              \
 	}
 
-#define FUNCRIDTEX3(m_type, m_type1, m_type2, m_type3) \
-	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3); \
-		} else { \
+#define FUNCRIDTEX3(m_type, m_type1, m_type2, m_type3)                                                               \
+	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3) override {                                       \
+		RID ret = RSG::texture_storage->texture_allocate();                                                          \
+		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) {             \
+			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3);                                              \
+		} else {                                                                                                     \
 			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1, p2, p3); \
-		} \
-		return ret; \
+		}                                                                                                            \
+		return ret;                                                                                                  \
 	}
 
-#define FUNCRIDTEX4(m_type, m_type1, m_type2, m_type3, m_type4) \
-	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3, m_type4 p4) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3, p4); \
-		} else { \
-			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1, p2, p3, p4); \
-		} \
-		return ret; \
-	}
-
-#define FUNCRIDTEX5(m_type, m_type1, m_type2, m_type3, m_type4, m_type5) \
-	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3, m_type4 p4, m_type5 p5) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3, p4, p5); \
-		} else { \
-			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1, p2, p3, p4, p5); \
-		} \
-		return ret; \
-	}
-
-#define FUNCRIDTEX6(m_type, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6) \
-	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3, m_type4 p4, m_type5 p5, m_type6 p6) override { \
-		RID ret = RSG::texture_storage->texture_allocate(); \
-		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) { \
-			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3, p4, p5, p6); \
-		} else { \
+#define FUNCRIDTEX6(m_type, m_type1, m_type2, m_type3, m_type4, m_type5, m_type6)                                                \
+	virtual RID m_type##_create(m_type1 p1, m_type2 p2, m_type3 p3, m_type4 p4, m_type5 p5, m_type6 p6) override {               \
+		RID ret = RSG::texture_storage->texture_allocate();                                                                      \
+		if (Thread::get_caller_id() == server_thread || RSG::rasterizer->can_create_resources_async()) {                         \
+			RSG::texture_storage->m_type##_initialize(ret, p1, p2, p3, p4, p5, p6);                                              \
+		} else {                                                                                                                 \
 			command_queue.push(RSG::texture_storage, &RendererTextureStorage::m_type##_initialize, ret, p1, p2, p3, p4, p5, p6); \
-		} \
-		return ret; \
+		}                                                                                                                        \
+		return ret;                                                                                                              \
 	}
 
 	//these go pass-through, as they can be called from any thread
 	FUNCRIDTEX1(texture_2d, const Ref<Image> &)
-	FUNCRIDTEX2(texture_2d_layered, const Vector<Ref<Image>> &, RSE::TextureLayeredType)
+	FUNCRIDTEX2(texture_2d_layered, const Vector<Ref<Image>> &, TextureLayeredType)
 	FUNCRIDTEX6(texture_3d, Image::Format, int, int, int, bool, const Vector<Ref<Image>> &)
 	FUNCRIDTEX3(texture_external, int, int, uint64_t)
 	FUNCRIDTEX1(texture_proxy, RID)
-	FUNCRIDTEX5(texture_drawable, int, int, RSE::TextureDrawableFormat, const Color &, bool)
 
 	// Called directly, not through the command queue.
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) override {
+	virtual RID texture_create_from_native_handle(TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, TextureLayeredType p_layered_type = TEXTURE_LAYERED_2D_ARRAY) override {
 		return RSG::texture_storage->texture_create_from_native_handle(p_type, p_format, p_native_handle, p_width, p_height, p_depth, p_layers, p_layered_type);
 	}
 
@@ -229,20 +203,15 @@ public:
 	FUNC4(texture_external_update, RID, int, int, uint64_t)
 	FUNC2(texture_proxy_update, RID, RID)
 
-	FUNC6(texture_drawable_blit_rect, const TypedArray<RID> &, const Rect2i &, RID, const Color &, const TypedArray<RID> &, int)
-
 	//these also go pass-through
 	FUNCRIDTEX0(texture_2d_placeholder)
-	FUNCRIDTEX1(texture_2d_layered_placeholder, RSE::TextureLayeredType)
+	FUNCRIDTEX1(texture_2d_layered_placeholder, TextureLayeredType)
 	FUNCRIDTEX0(texture_3d_placeholder)
 
 	FUNC1RC(Ref<Image>, texture_2d_get, RID)
 	FUNC2RC(Ref<Image>, texture_2d_layer_get, RID, int)
 	FUNC1RC(Vector<Ref<Image>>, texture_3d_get, RID)
 
-	FUNC1(texture_drawable_generate_mipmaps, RID)
-	FUNC0RC(RID, texture_drawable_get_default_material)
-
 	FUNC2(texture_replace, RID, RID)
 
 	FUNC3(texture_set_size_override, RID, int, int)
@@ -251,19 +220,19 @@ public:
 	FUNC2(texture_bind, RID, uint32_t)
 #endif
 
-	FUNC3(texture_set_detect_3d_callback, RID, RenderingServerTypes::TextureDetectCallback, void *)
-	FUNC3(texture_set_detect_normal_callback, RID, RenderingServerTypes::TextureDetectCallback, void *)
-	FUNC3(texture_set_detect_roughness_callback, RID, RenderingServerTypes::TextureDetectRoughnessCallback, void *)
+	FUNC3(texture_set_detect_3d_callback, RID, TextureDetectCallback, void *)
+	FUNC3(texture_set_detect_normal_callback, RID, TextureDetectCallback, void *)
+	FUNC3(texture_set_detect_roughness_callback, RID, TextureDetectRoughnessCallback, void *)
 
 	FUNC2(texture_set_path, RID, const String &)
 	FUNC1RC(String, texture_get_path, RID)
 
 	FUNC1RC(Image::Format, texture_get_format, RID)
 
-	FUNC1(texture_debug_usage, List<RenderingServerTypes::TextureInfo> *)
+	FUNC1(texture_debug_usage, List<TextureInfo> *)
 
 	FUNC2(texture_set_force_redraw_if_visible, RID, bool)
-	FUNCRIDTEX2(texture_rd, const RID &, const RSE::TextureLayeredType)
+	FUNCRIDTEX2(texture_rd, const RID &, const RS::TextureLayeredType)
 	FUNC2RC(RID, texture_get_rd_texture, RID, bool)
 	FUNC2RC(uint64_t, texture_get_native_handle, RID, bool)
 
@@ -315,7 +284,7 @@ public:
 	FUNC3RC(RID, shader_get_default_texture_parameter, RID, const StringName &, int)
 	FUNC2RC(Variant, shader_get_parameter_default, RID, const StringName &)
 
-	FUNC1RC(RenderingServerTypes::ShaderNativeSourceCode, shader_get_native_source_code, RID)
+	FUNC1RC(ShaderNativeSourceCode, shader_get_native_source_code, RID)
 
 	/* COMMON MATERIAL API */
 
@@ -360,7 +329,7 @@ public:
 #define ServerName RendererMeshStorage
 #define server_name RSG::mesh_storage
 
-	virtual RID mesh_create_from_surfaces(const Vector<RenderingServerTypes::SurfaceData> &p_surfaces, int p_blend_shape_count = 0) override {
+	virtual RID mesh_create_from_surfaces(const Vector<SurfaceData> &p_surfaces, int p_blend_shape_count = 0) override {
 		RID mesh = RSG::mesh_storage->mesh_allocate();
 
 		bool using_server_thread = Thread::get_caller_id() == server_thread;
@@ -390,12 +359,12 @@ public:
 
 	FUNCRIDSPLIT(mesh)
 
-	FUNC2(mesh_add_surface, RID, const RenderingServerTypes::SurfaceData &)
+	FUNC2(mesh_add_surface, RID, const SurfaceData &)
 
 	FUNC1RC(int, mesh_get_blend_shape_count, RID)
 
-	FUNC2(mesh_set_blend_shape_mode, RID, RSE::BlendShapeMode)
-	FUNC1RC(RSE::BlendShapeMode, mesh_get_blend_shape_mode, RID)
+	FUNC2(mesh_set_blend_shape_mode, RID, BlendShapeMode)
+	FUNC1RC(BlendShapeMode, mesh_get_blend_shape_mode, RID)
 
 	FUNC4(mesh_surface_update_vertex_region, RID, int, int, const Vector<uint8_t> &)
 	FUNC4(mesh_surface_update_attribute_region, RID, int, int, const Vector<uint8_t> &)
@@ -405,7 +374,7 @@ public:
 	FUNC3(mesh_surface_set_material, RID, int, RID)
 	FUNC2RC(RID, mesh_surface_get_material, RID, int)
 
-	FUNC2RC(RenderingServerTypes::SurfaceData, mesh_get_surface, RID, int)
+	FUNC2RC(SurfaceData, mesh_get_surface, RID, int)
 
 	FUNC1RC(int, mesh_get_surface_count, RID)
 
@@ -420,13 +389,13 @@ public:
 	FUNC2(mesh_surface_remove, RID, int)
 	FUNC1(mesh_clear, RID)
 
-	FUNC1(mesh_debug_usage, List<RenderingServerTypes::MeshInfo> *)
+	FUNC1(mesh_debug_usage, List<MeshInfo> *)
 
 	/* MULTIMESH API */
 
 	FUNCRIDSPLIT(multimesh)
 
-	FUNC6(multimesh_allocate_data, RID, int, RSE::MultimeshTransformFormat, bool, bool, bool)
+	FUNC6(multimesh_allocate_data, RID, int, MultimeshTransformFormat, bool, bool, bool)
 	FUNC1RC(int, multimesh_get_instance_count, RID)
 
 	FUNC2(multimesh_set_mesh, RID, RID)
@@ -453,7 +422,7 @@ public:
 
 	FUNC3(multimesh_set_buffer_interpolated, RID, const Vector<float> &, const Vector<float> &)
 	FUNC2(multimesh_set_physics_interpolated, RID, bool)
-	FUNC2(multimesh_set_physics_interpolation_quality, RID, RSE::MultimeshPhysicsInterpolationQuality)
+	FUNC2(multimesh_set_physics_interpolation_quality, RID, MultimeshPhysicsInterpolationQuality)
 	FUNC2(multimesh_instance_reset_physics_interpolation, RID, int)
 	FUNC1(multimesh_instances_reset_physics_interpolation, RID)
 
@@ -483,7 +452,7 @@ public:
 	FUNCRIDSPLIT(spot_light)
 
 	FUNC2(light_set_color, RID, const Color &)
-	FUNC3(light_set_param, RID, RSE::LightParam, float)
+	FUNC3(light_set_param, RID, LightParam, float)
 	FUNC2(light_set_shadow, RID, bool)
 	FUNC2(light_set_projector, RID, RID)
 	FUNC2(light_set_negative, RID, bool)
@@ -491,25 +460,25 @@ public:
 	FUNC5(light_set_distance_fade, RID, bool, float, float, float)
 	FUNC2(light_set_reverse_cull_face_mode, RID, bool)
 	FUNC2(light_set_shadow_caster_mask, RID, uint32_t)
-	FUNC2(light_set_bake_mode, RID, RSE::LightBakeMode)
+	FUNC2(light_set_bake_mode, RID, LightBakeMode)
 	FUNC2(light_set_max_sdfgi_cascade, RID, uint32_t)
 
-	FUNC2(light_omni_set_shadow_mode, RID, RSE::LightOmniShadowMode)
+	FUNC2(light_omni_set_shadow_mode, RID, LightOmniShadowMode)
 
-	FUNC2(light_directional_set_shadow_mode, RID, RSE::LightDirectionalShadowMode)
+	FUNC2(light_directional_set_shadow_mode, RID, LightDirectionalShadowMode)
 	FUNC2(light_directional_set_blend_splits, RID, bool)
-	FUNC2(light_directional_set_sky_mode, RID, RSE::LightDirectionalSkyMode)
+	FUNC2(light_directional_set_sky_mode, RID, LightDirectionalSkyMode)
 
 	/* PROBE API */
 
 	FUNCRIDSPLIT(reflection_probe)
 
-	FUNC2(reflection_probe_set_update_mode, RID, RSE::ReflectionProbeUpdateMode)
+	FUNC2(reflection_probe_set_update_mode, RID, ReflectionProbeUpdateMode)
 	FUNC2(reflection_probe_set_intensity, RID, float)
 	FUNC2(reflection_probe_set_blend_distance, RID, float)
 	FUNC2(reflection_probe_set_ambient_color, RID, const Color &)
 	FUNC2(reflection_probe_set_ambient_energy, RID, float)
-	FUNC2(reflection_probe_set_ambient_mode, RID, RSE::ReflectionProbeAmbientMode)
+	FUNC2(reflection_probe_set_ambient_mode, RID, ReflectionProbeAmbientMode)
 	FUNC2(reflection_probe_set_max_distance, RID, float)
 	FUNC2(reflection_probe_set_size, RID, const Vector3 &)
 	FUNC2(reflection_probe_set_origin_offset, RID, const Vector3 &)
@@ -537,8 +506,8 @@ public:
 	FUNC1(lightmap_set_probe_capture_update_speed, float)
 
 	FUNC2(lightmap_set_shadowmask_textures, RID, RID)
-	FUNC1R(RSE::ShadowmaskMode, lightmap_get_shadowmask_mode, RID)
-	FUNC2(lightmap_set_shadowmask_mode, RID, RSE::ShadowmaskMode)
+	FUNC1R(ShadowmaskMode, lightmap_get_shadowmask_mode, RID)
+	FUNC2(lightmap_set_shadowmask_mode, RID, ShadowmaskMode)
 
 	/* Shadow Atlas */
 	FUNC0R(RID, shadow_atlas_create)
@@ -558,7 +527,7 @@ public:
 	FUNCRIDSPLIT(decal)
 
 	FUNC2(decal_set_size, RID, const Vector3 &)
-	FUNC3(decal_set_texture, RID, RSE::DecalTexture, RID)
+	FUNC3(decal_set_texture, RID, DecalTexture, RID)
 	FUNC2(decal_set_emission_energy, RID, float)
 	FUNC2(decal_set_albedo_mix, RID, float)
 	FUNC2(decal_set_modulate, RID, const Color &)
@@ -609,7 +578,7 @@ public:
 
 	FUNCRIDSPLIT(particles)
 
-	FUNC2(particles_set_mode, RID, RSE::ParticlesMode)
+	FUNC2(particles_set_mode, RID, ParticlesMode)
 	FUNC2(particles_set_emitting, RID, bool)
 	FUNC1R(bool, particles_get_emitting, RID)
 	FUNC2(particles_set_amount, RID, int)
@@ -617,7 +586,7 @@ public:
 	FUNC2(particles_set_lifetime, RID, double)
 	FUNC2(particles_set_one_shot, RID, bool)
 	FUNC2(particles_set_pre_process_time, RID, double)
-	FUNC3(particles_request_process_time, RID, real_t, real_t)
+	FUNC2(particles_request_process_time, RID, real_t)
 	FUNC2(particles_set_explosiveness_ratio, RID, float)
 	FUNC2(particles_set_randomness_ratio, RID, float)
 	FUNC2(particles_set_seed, RID, uint32_t)
@@ -638,11 +607,9 @@ public:
 	FUNC2(particles_set_subemitter, RID, RID)
 	FUNC2(particles_set_collision_base_size, RID, float)
 
-	FUNC2(particles_set_transform_align, RID, RSE::ParticlesTransformAlign)
-	FUNC2(particles_set_transform_align_channel_filter, RID, RSE::ParticlesTransformAlignCustomSrc)
-	FUNC2(particles_set_transform_align_axis, RID, RSE::ParticlesTransformAlignAxis)
+	FUNC2(particles_set_transform_align, RID, RS::ParticlesTransformAlign)
 
-	FUNC2(particles_set_draw_order, RID, RSE::ParticlesDrawOrder)
+	FUNC2(particles_set_draw_order, RID, RS::ParticlesDrawOrder)
 
 	FUNC2(particles_set_draw_passes, RID, int)
 	FUNC3(particles_set_draw_pass_mesh, RID, int, RID)
@@ -656,7 +623,7 @@ public:
 
 	FUNCRIDSPLIT(particles_collision)
 
-	FUNC2(particles_collision_set_collision_type, RID, RSE::ParticlesCollisionType)
+	FUNC2(particles_collision_set_collision_type, RID, ParticlesCollisionType)
 	FUNC2(particles_collision_set_cull_mask, RID, uint32_t)
 	FUNC2(particles_collision_set_sphere_radius, RID, real_t)
 	FUNC2(particles_collision_set_box_extents, RID, const Vector3 &)
@@ -666,7 +633,7 @@ public:
 	FUNC2(particles_collision_set_field_texture, RID, RID)
 	FUNC1(particles_collision_height_field_update, RID)
 	FUNC2(particles_collision_set_height_field_mask, RID, uint32_t)
-	FUNC2(particles_collision_set_height_field_resolution, RID, RSE::ParticlesCollisionHeightfieldResolution)
+	FUNC2(particles_collision_set_height_field_resolution, RID, ParticlesCollisionHeightfieldResolution)
 
 	/* FOG VOLUME */
 
@@ -678,7 +645,7 @@ public:
 
 	FUNCRIDSPLIT(fog_volume)
 
-	FUNC2(fog_volume_set_shape, RID, RSE::FogVolumeShape)
+	FUNC2(fog_volume_set_shape, RID, FogVolumeShape)
 	FUNC2(fog_volume_set_size, RID, const Vector3 &)
 	FUNC2(fog_volume_set_material, RID, RID)
 
@@ -731,30 +698,30 @@ public:
 	FUNC2(viewport_set_use_xr, RID, bool)
 #endif // XR_DISABLED
 
-	FUNC4(viewport_set_size, RID, int, int, int)
+	FUNC3(viewport_set_size, RID, int, int)
 
 	FUNC2(viewport_set_active, RID, bool)
 	FUNC2(viewport_set_parent_viewport, RID, RID)
 
-	FUNC2(viewport_set_clear_mode, RID, RSE::ViewportClearMode)
+	FUNC2(viewport_set_clear_mode, RID, ViewportClearMode)
 
 	FUNC3(viewport_attach_to_screen, RID, const Rect2 &, int)
 	FUNC2(viewport_set_render_direct_to_screen, RID, bool)
 
-	FUNC2(viewport_set_scaling_3d_mode, RID, RSE::ViewportScaling3DMode)
+	FUNC2(viewport_set_scaling_3d_mode, RID, ViewportScaling3DMode)
 	FUNC2(viewport_set_scaling_3d_scale, RID, float)
 	FUNC2(viewport_set_fsr_sharpness, RID, float)
 	FUNC2(viewport_set_texture_mipmap_bias, RID, float)
-	FUNC2(viewport_set_anisotropic_filtering_level, RID, RSE::ViewportAnisotropicFiltering)
+	FUNC2(viewport_set_anisotropic_filtering_level, RID, ViewportAnisotropicFiltering)
 
-	FUNC2(viewport_set_update_mode, RID, RSE::ViewportUpdateMode)
-	FUNC1RC(RSE::ViewportUpdateMode, viewport_get_update_mode, RID)
+	FUNC2(viewport_set_update_mode, RID, ViewportUpdateMode)
+	FUNC1RC(ViewportUpdateMode, viewport_get_update_mode, RID)
 
 	FUNC1RC(RID, viewport_get_render_target, RID)
 	FUNC1RC(RID, viewport_get_texture, RID)
 
 	FUNC2(viewport_set_disable_2d, RID, bool)
-	FUNC2(viewport_set_environment_mode, RID, RSE::ViewportEnvironmentMode)
+	FUNC2(viewport_set_environment_mode, RID, ViewportEnvironmentMode)
 	FUNC2(viewport_set_disable_3d, RID, bool)
 
 	FUNC2(viewport_set_canvas_cull_mask, RID, uint32_t)
@@ -771,37 +738,37 @@ public:
 	FUNC2(viewport_set_snap_2d_transforms_to_pixel, RID, bool)
 	FUNC2(viewport_set_snap_2d_vertices_to_pixel, RID, bool)
 
-	FUNC2(viewport_set_default_canvas_item_texture_filter, RID, RSE::CanvasItemTextureFilter)
-	FUNC2(viewport_set_default_canvas_item_texture_repeat, RID, RSE::CanvasItemTextureRepeat)
+	FUNC2(viewport_set_default_canvas_item_texture_filter, RID, CanvasItemTextureFilter)
+	FUNC2(viewport_set_default_canvas_item_texture_repeat, RID, CanvasItemTextureRepeat)
 
 	FUNC2(viewport_set_global_canvas_transform, RID, const Transform2D &)
 	FUNC4(viewport_set_canvas_stacking, RID, RID, int, int)
 	FUNC3(viewport_set_positional_shadow_atlas_size, RID, int, bool)
-	FUNC3(viewport_set_sdf_oversize_and_scale, RID, RSE::ViewportSDFOversize, RSE::ViewportSDFScale)
+	FUNC3(viewport_set_sdf_oversize_and_scale, RID, ViewportSDFOversize, ViewportSDFScale)
 	FUNC3(viewport_set_positional_shadow_atlas_quadrant_subdivision, RID, int, int)
-	FUNC2(viewport_set_msaa_2d, RID, RSE::ViewportMSAA)
-	FUNC2(viewport_set_msaa_3d, RID, RSE::ViewportMSAA)
-	FUNC2(viewport_set_screen_space_aa, RID, RSE::ViewportScreenSpaceAA)
+	FUNC2(viewport_set_msaa_2d, RID, ViewportMSAA)
+	FUNC2(viewport_set_msaa_3d, RID, ViewportMSAA)
+	FUNC2(viewport_set_screen_space_aa, RID, ViewportScreenSpaceAA)
 	FUNC2(viewport_set_use_taa, RID, bool)
 	FUNC2(viewport_set_use_debanding, RID, bool)
 	FUNC2(viewport_set_force_motion_vectors, RID, bool)
 	FUNC2(viewport_set_use_occlusion_culling, RID, bool)
 	FUNC1(viewport_set_occlusion_rays_per_thread, int)
-	FUNC1(viewport_set_occlusion_culling_build_quality, RSE::ViewportOcclusionCullingBuildQuality)
+	FUNC1(viewport_set_occlusion_culling_build_quality, ViewportOcclusionCullingBuildQuality)
 	FUNC2(viewport_set_mesh_lod_threshold, RID, float)
 
-	FUNC3R(int, viewport_get_render_info, RID, RSE::ViewportRenderInfoType, RSE::ViewportRenderInfo)
-	FUNC2(viewport_set_debug_draw, RID, RSE::ViewportDebugDraw)
+	FUNC3R(int, viewport_get_render_info, RID, ViewportRenderInfoType, ViewportRenderInfo)
+	FUNC2(viewport_set_debug_draw, RID, ViewportDebugDraw)
 
 	FUNC2(viewport_set_measure_render_time, RID, bool)
 	FUNC1RC(double, viewport_get_measured_render_time_cpu, RID)
 	FUNC1RC(double, viewport_get_measured_render_time_gpu, RID)
-	FUNC1RC(RID, viewport_find_from_screen_attachment, DisplayServerEnums::WindowID)
+	FUNC1RC(RID, viewport_find_from_screen_attachment, DisplayServer::WindowID)
 
-	FUNC2(call_set_vsync_mode, DisplayServerEnums::VSyncMode, DisplayServerEnums::WindowID)
+	FUNC2(call_set_vsync_mode, DisplayServer::VSyncMode, DisplayServer::WindowID)
 
-	FUNC2(viewport_set_vrs_mode, RID, RSE::ViewportVRSMode)
-	FUNC2(viewport_set_vrs_update_mode, RID, RSE::ViewportVRSUpdateMode)
+	FUNC2(viewport_set_vrs_mode, RID, ViewportVRSMode)
+	FUNC2(viewport_set_vrs_update_mode, RID, ViewportVRSUpdateMode)
 	FUNC2(viewport_set_vrs_texture, RID, RID)
 
 	/* COMPOSITOR EFFECT */
@@ -814,8 +781,8 @@ public:
 
 	FUNCRIDSPLIT(compositor_effect)
 	FUNC2(compositor_effect_set_enabled, RID, bool)
-	FUNC3(compositor_effect_set_callback, RID, RSE::CompositorEffectCallbackType, const Callable &)
-	FUNC3(compositor_effect_set_flag, RID, RSE::CompositorEffectFlags, bool)
+	FUNC3(compositor_effect_set_callback, RID, CompositorEffectCallbackType, const Callable &)
+	FUNC3(compositor_effect_set_flag, RID, CompositorEffectFlags, bool)
 
 	/* COMPOSITOR */
 
@@ -825,13 +792,13 @@ public:
 
 	/* ENVIRONMENT API */
 
-	FUNC1(voxel_gi_set_quality, RSE::VoxelGIQuality)
+	FUNC1(voxel_gi_set_quality, VoxelGIQuality)
 
 	/* SKY API */
 
 	FUNCRIDSPLIT(sky)
 	FUNC2(sky_set_radiance_size, RID, int)
-	FUNC2(sky_set_mode, RID, RSE::SkyMode)
+	FUNC2(sky_set_mode, RID, SkyMode)
 	FUNC2(sky_set_material, RID, RID)
 	FUNC4R(Ref<Image>, sky_bake_panorama, RID, float, bool, const Size2i &)
 
@@ -839,36 +806,36 @@ public:
 
 	FUNCRIDSPLIT(environment)
 
-	FUNC2(environment_set_background, RID, RSE::EnvironmentBG)
+	FUNC2(environment_set_background, RID, EnvironmentBG)
 	FUNC2(environment_set_sky, RID, RID)
 	FUNC2(environment_set_sky_custom_fov, RID, float)
 	FUNC2(environment_set_sky_orientation, RID, const Basis &)
 	FUNC2(environment_set_bg_color, RID, const Color &)
 	FUNC3(environment_set_bg_energy, RID, float, float)
 	FUNC2(environment_set_canvas_max_layer, RID, int)
-	FUNC6(environment_set_ambient_light, RID, const Color &, RSE::EnvironmentAmbientSource, float, float, RSE::EnvironmentReflectionSource)
+	FUNC6(environment_set_ambient_light, RID, const Color &, EnvironmentAmbientSource, float, float, EnvironmentReflectionSource)
 
 	FUNC2(environment_set_camera_feed_id, RID, int)
 
 	FUNC6(environment_set_ssr, RID, bool, int, float, float, float)
 	FUNC1(environment_set_ssr_half_size, bool)
-	FUNC1(environment_set_ssr_roughness_quality, RSE::EnvironmentSSRRoughnessQuality)
+	FUNC1(environment_set_ssr_roughness_quality, EnvironmentSSRRoughnessQuality)
 
 	FUNC10(environment_set_ssao, RID, bool, float, float, float, float, float, float, float, float)
-	FUNC6(environment_set_ssao_quality, RSE::EnvironmentSSAOQuality, bool, float, int, float, float)
+	FUNC6(environment_set_ssao_quality, EnvironmentSSAOQuality, bool, float, int, float, float)
 
 	FUNC6(environment_set_ssil, RID, bool, float, float, float, float)
-	FUNC6(environment_set_ssil_quality, RSE::EnvironmentSSILQuality, bool, float, int, float, float)
+	FUNC6(environment_set_ssil_quality, EnvironmentSSILQuality, bool, float, int, float, float)
 
-	FUNC13(environment_set_glow, RID, bool, Vector<float>, float, float, float, float, RSE::EnvironmentGlowBlendMode, float, float, float, float, RID)
+	FUNC13(environment_set_glow, RID, bool, Vector<float>, float, float, float, float, EnvironmentGlowBlendMode, float, float, float, float, RID)
 	FUNC1(environment_glow_set_use_bicubic_upscale, bool)
 
-	FUNC4(environment_set_tonemap, RID, RSE::EnvironmentToneMapper, float, float)
+	FUNC4(environment_set_tonemap, RID, EnvironmentToneMapper, float, float)
 	FUNC2(environment_set_tonemap_agx_contrast, RID, float)
 
 	FUNC7(environment_set_adjustment, RID, bool, float, float, float, bool, RID)
 
-	FUNC11(environment_set_fog, RID, bool, const Color &, float, float, float, float, float, float, float, RSE::EnvironmentFogMode)
+	FUNC11(environment_set_fog, RID, bool, const Color &, float, float, float, float, float, float, float, EnvironmentFogMode)
 
 	FUNC4(environment_set_fog_depth, RID, float, float, float)
 	FUNC14(environment_set_volumetric_fog, RID, bool, float, const Color &, const Color &, float, float, float, float, float, bool, float, float, float)
@@ -876,21 +843,21 @@ public:
 	FUNC2(environment_set_volumetric_fog_volume_size, int, int)
 	FUNC1(environment_set_volumetric_fog_filter_active, bool)
 
-	FUNC11(environment_set_sdfgi, RID, bool, int, float, RSE::EnvironmentSDFGIYScale, bool, float, bool, float, float, float)
-	FUNC1(environment_set_sdfgi_ray_count, RSE::EnvironmentSDFGIRayCount)
-	FUNC1(environment_set_sdfgi_frames_to_converge, RSE::EnvironmentSDFGIFramesToConverge)
-	FUNC1(environment_set_sdfgi_frames_to_update_light, RSE::EnvironmentSDFGIFramesToUpdateLight)
+	FUNC11(environment_set_sdfgi, RID, bool, int, float, EnvironmentSDFGIYScale, bool, float, bool, float, float, float)
+	FUNC1(environment_set_sdfgi_ray_count, EnvironmentSDFGIRayCount)
+	FUNC1(environment_set_sdfgi_frames_to_converge, EnvironmentSDFGIFramesToConverge)
+	FUNC1(environment_set_sdfgi_frames_to_update_light, EnvironmentSDFGIFramesToUpdateLight)
 
 	FUNC3R(Ref<Image>, environment_bake_panorama, RID, bool, const Size2i &)
 
 	FUNC3(screen_space_roughness_limiter_set_active, bool, float, float)
-	FUNC1(sub_surface_scattering_set_quality, RSE::SubSurfaceScatteringQuality)
+	FUNC1(sub_surface_scattering_set_quality, SubSurfaceScatteringQuality)
 	FUNC2(sub_surface_scattering_set_scale, float, float)
 
-	FUNC1(positional_soft_shadow_filter_set_quality, RSE::ShadowQuality);
-	FUNC1(directional_soft_shadow_filter_set_quality, RSE::ShadowQuality);
-	FUNC1(decals_set_filter, RSE::DecalFilter);
-	FUNC1(light_projectors_set_filter, RSE::LightProjectorFilter);
+	FUNC1(positional_soft_shadow_filter_set_quality, ShadowQuality);
+	FUNC1(directional_soft_shadow_filter_set_quality, ShadowQuality);
+	FUNC1(decals_set_filter, RS::DecalFilter);
+	FUNC1(light_projectors_set_filter, RS::LightProjectorFilter);
 	FUNC1(lightmaps_set_bicubic_filter, bool);
 	FUNC1(material_set_use_debanding, bool);
 
@@ -904,8 +871,8 @@ public:
 
 	FUNCRIDSPLIT(camera_attributes)
 
-	FUNC2(camera_attributes_set_dof_blur_quality, RSE::DOFBlurQuality, bool)
-	FUNC1(camera_attributes_set_dof_blur_bokeh_shape, RSE::DOFBokehShape)
+	FUNC2(camera_attributes_set_dof_blur_quality, DOFBlurQuality, bool)
+	FUNC1(camera_attributes_set_dof_blur_bokeh_shape, DOFBokehShape)
 
 	FUNC8(camera_attributes_set_dof_blur, RID, bool, float, float, bool, float, float, float)
 	FUNC3(camera_attributes_set_exposure, RID, float, float)
@@ -955,12 +922,12 @@ public:
 	FUNC3RC(Vector<ObjectID>, instances_cull_ray, const Vector3 &, const Vector3 &, RID)
 	FUNC2RC(Vector<ObjectID>, instances_cull_convex, const Vector<Plane> &, RID)
 
-	FUNC3(instance_geometry_set_flag, RID, RSE::InstanceFlags, bool)
-	FUNC2(instance_geometry_set_cast_shadows_setting, RID, RSE::ShadowCastingSetting)
+	FUNC3(instance_geometry_set_flag, RID, InstanceFlags, bool)
+	FUNC2(instance_geometry_set_cast_shadows_setting, RID, ShadowCastingSetting)
 	FUNC2(instance_geometry_set_material_override, RID, RID)
 	FUNC2(instance_geometry_set_material_overlay, RID, RID)
 
-	FUNC6(instance_geometry_set_visibility_range, RID, float, float, float, float, RSE::VisibilityRangeFadeMode)
+	FUNC6(instance_geometry_set_visibility_range, RID, float, float, float, float, VisibilityRangeFadeMode)
 	FUNC4(instance_geometry_set_lightmap, RID, RID, const Rect2 &, int)
 	FUNC2(instance_geometry_set_lod_bias, RID, float)
 	FUNC2(instance_geometry_set_transparency, RID, float)
@@ -989,17 +956,17 @@ public:
 	FUNC1(canvas_set_disable_scale, bool)
 
 	FUNCRIDSPLIT(canvas_texture)
-	FUNC3(canvas_texture_set_channel, RID, RSE::CanvasTextureChannel, RID)
+	FUNC3(canvas_texture_set_channel, RID, CanvasTextureChannel, RID)
 	FUNC3(canvas_texture_set_shading_parameters, RID, const Color &, float)
 
-	FUNC2(canvas_texture_set_texture_filter, RID, RSE::CanvasItemTextureFilter)
-	FUNC2(canvas_texture_set_texture_repeat, RID, RSE::CanvasItemTextureRepeat)
+	FUNC2(canvas_texture_set_texture_filter, RID, CanvasItemTextureFilter)
+	FUNC2(canvas_texture_set_texture_repeat, RID, CanvasItemTextureRepeat)
 
 	FUNCRIDSPLIT(canvas_item)
 	FUNC2(canvas_item_set_parent, RID, RID)
 
-	FUNC2(canvas_item_set_default_texture_filter, RID, RSE::CanvasItemTextureFilter)
-	FUNC2(canvas_item_set_default_texture_repeat, RID, RSE::CanvasItemTextureRepeat)
+	FUNC2(canvas_item_set_default_texture_filter, RID, CanvasItemTextureFilter)
+	FUNC2(canvas_item_set_default_texture_repeat, RID, CanvasItemTextureRepeat)
 
 	FUNC2(canvas_item_set_visible, RID, bool)
 	FUNC2(canvas_item_set_light_mask, RID, int)
@@ -1028,7 +995,7 @@ public:
 	FUNC7(canvas_item_add_texture_rect_region, RID, const Rect2 &, RID, const Rect2 &, const Color &, bool, bool)
 	FUNC8(canvas_item_add_msdf_texture_rect_region, RID, const Rect2 &, RID, const Rect2 &, const Color &, int, float, float)
 	FUNC5(canvas_item_add_lcd_texture_rect_region, RID, const Rect2 &, RID, const Rect2 &, const Color &)
-	FUNC10(canvas_item_add_nine_patch, RID, const Rect2 &, const Rect2 &, RID, const Vector2 &, const Vector2 &, RSE::NinePatchAxisMode, RSE::NinePatchAxisMode, bool, const Color &)
+	FUNC10(canvas_item_add_nine_patch, RID, const Rect2 &, const Rect2 &, RID, const Vector2 &, const Vector2 &, NinePatchAxisMode, NinePatchAxisMode, bool, const Color &)
 	FUNC5(canvas_item_add_primitive, RID, const Vector<Point2> &, const Vector<Color> &, const Vector<Point2> &, RID)
 	FUNC5(canvas_item_add_polygon, RID, const Vector<Point2> &, const Vector<Color> &, const Vector<Point2> &, RID)
 	FUNC9(canvas_item_add_triangle_array, RID, const Vector<int> &, const Vector<Point2> &, const Vector<Color> &, const Vector<Point2> &, const Vector<int> &, const Vector<float> &, RID, int)
@@ -1059,7 +1026,7 @@ public:
 
 	FUNC5(canvas_item_set_visibility_notifier, RID, bool, const Rect2 &, const Callable &, const Callable &)
 
-	FUNC6(canvas_item_set_canvas_group_mode, RID, RSE::CanvasGroupMode, float, bool, float, bool)
+	FUNC6(canvas_item_set_canvas_group_mode, RID, CanvasGroupMode, float, bool, float, bool)
 
 	FUNC1(canvas_item_set_debug_redraw, bool)
 	FUNC0RC(bool, canvas_item_get_debug_redraw)
@@ -1070,7 +1037,7 @@ public:
 
 	FUNCRIDSPLIT(canvas_light)
 
-	FUNC2(canvas_light_set_mode, RID, RSE::CanvasLightMode)
+	FUNC2(canvas_light_set_mode, RID, CanvasLightMode)
 
 	FUNC2(canvas_light_attach_to_canvas, RID, RID)
 	FUNC2(canvas_light_set_enabled, RID, bool)
@@ -1087,10 +1054,10 @@ public:
 	FUNC2(canvas_light_set_item_shadow_cull_mask, RID, int)
 	FUNC2(canvas_light_set_directional_distance, RID, float)
 
-	FUNC2(canvas_light_set_blend_mode, RID, RSE::CanvasLightBlendMode)
+	FUNC2(canvas_light_set_blend_mode, RID, CanvasLightBlendMode)
 
 	FUNC2(canvas_light_set_shadow_enabled, RID, bool)
-	FUNC2(canvas_light_set_shadow_filter, RID, RSE::CanvasLightShadowFilter)
+	FUNC2(canvas_light_set_shadow_filter, RID, CanvasLightShadowFilter)
 	FUNC2(canvas_light_set_shadow_color, RID, const Color &)
 	FUNC2(canvas_light_set_shadow_smooth, RID, float)
 
@@ -1113,7 +1080,7 @@ public:
 	FUNCRIDSPLIT(canvas_occluder_polygon)
 	FUNC3(canvas_occluder_polygon_set_shape, RID, const Vector<Vector2> &, bool)
 
-	FUNC2(canvas_occluder_polygon_set_cull_mode, RID, RSE::CanvasOccluderPolygonCullMode)
+	FUNC2(canvas_occluder_polygon_set_cull_mode, RID, CanvasOccluderPolygonCullMode)
 
 	FUNC1(canvas_set_shadow_texture_size, int)
 
@@ -1127,12 +1094,12 @@ public:
 #define ServerName RendererMaterialStorage
 #define server_name RSG::material_storage
 
-	FUNC3(global_shader_parameter_add, const StringName &, RSE::GlobalShaderParameterType, const Variant &)
+	FUNC3(global_shader_parameter_add, const StringName &, GlobalShaderParameterType, const Variant &)
 	FUNC1(global_shader_parameter_remove, const StringName &)
 	FUNC0RC(Vector<StringName>, global_shader_parameter_get_list)
 	FUNC2(global_shader_parameter_set, const StringName &, const Variant &)
 	FUNC2(global_shader_parameter_set_override, const StringName &, const Variant &)
-	FUNC1RC(RSE::GlobalShaderParameterType, global_shader_parameter_get_type, const StringName &)
+	FUNC1RC(GlobalShaderParameterType, global_shader_parameter_get_type, const StringName &)
 	FUNC1RC(Variant, global_shader_parameter_get, const StringName &)
 
 	FUNC1(global_shader_parameters_load_settings, bool)
@@ -1145,7 +1112,7 @@ public:
 #define ServerName RendererCompositor
 #define server_name RSG::rasterizer
 
-	FUNC4S(set_boot_image_with_stretch, const Ref<Image> &, const Color &, RSE::SplashStretchMode, bool)
+	FUNC4S(set_boot_image_with_stretch, const Ref<Image> &, const Color &, RenderingServer::SplashStretchMode, bool)
 
 	/* STATUS INFORMATION */
 
@@ -1167,11 +1134,11 @@ public:
 #undef MAIN_THREAD_SYNC_WARN
 #endif
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) override;
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const override;
+	virtual uint64_t get_rendering_info(RenderingInfo p_info) override;
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const override;
 
 	virtual void set_frame_profiling_enabled(bool p_enable) override;
-	virtual Vector<RenderingServerTypes::FrameProfileArea> get_frame_profile() override;
+	virtual Vector<FrameProfileArea> get_frame_profile() override;
 	virtual uint64_t get_frame_profile_frame() override;
 
 	virtual RID get_test_cube() override;
@@ -1224,7 +1191,7 @@ public:
 	virtual void set_default_clear_color(const Color &p_color) override;
 
 #ifndef DISABLE_DEPRECATED
-	virtual bool has_feature(RSE::Features p_feature) const override;
+	virtual bool has_feature(Features p_feature) const override;
 #endif
 
 	virtual bool has_os_feature(const String &p_feature) const override;
diff --git a/engine/servers/rendering/rendering_server_enums.h b/engine/servers/rendering/rendering_server_enums.h
deleted file mode 100644
index 4bc1e229..00000000
--- a/engine/servers/rendering/rendering_server_enums.h
+++ /dev/null
@@ -1,942 +0,0 @@
-/**************************************************************************/
-/*  rendering_server_enums.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include <cstdint>
-
-namespace RenderingServerEnums {
-
-enum {
-	NO_INDEX_ARRAY = -1,
-	ARRAY_WEIGHTS_SIZE = 4,
-	CANVAS_ITEM_Z_MIN = -4096,
-	CANVAS_ITEM_Z_MAX = 4096,
-	CANVAS_LAYER_MIN = -2147483648,
-	CANVAS_LAYER_MAX = 2147483647,
-	MAX_GLOW_LEVELS = 7,
-	MAX_CURSORS = 8,
-	MAX_2D_DIRECTIONAL_LIGHTS = 8,
-	MAX_MESH_SURFACES = 256,
-};
-
-/* TEXTURE API */
-
-enum TextureType {
-	TEXTURE_TYPE_2D,
-	TEXTURE_TYPE_LAYERED,
-	TEXTURE_TYPE_3D,
-};
-
-enum TextureLayeredType {
-	TEXTURE_LAYERED_2D_ARRAY,
-	TEXTURE_LAYERED_CUBEMAP,
-	TEXTURE_LAYERED_CUBEMAP_ARRAY,
-};
-
-enum CubeMapLayer {
-	CUBEMAP_LAYER_LEFT,
-	CUBEMAP_LAYER_RIGHT,
-	CUBEMAP_LAYER_BOTTOM,
-	CUBEMAP_LAYER_TOP,
-	CUBEMAP_LAYER_FRONT,
-	CUBEMAP_LAYER_BACK,
-};
-
-enum TextureDrawableFormat {
-	TEXTURE_DRAWABLE_FORMAT_RGBA8,
-	TEXTURE_DRAWABLE_FORMAT_RGBA8_SRGB, // Use this if you want to read the result from both 2D (non-hdr) and 3D.
-	TEXTURE_DRAWABLE_FORMAT_RGBAH,
-	TEXTURE_DRAWABLE_FORMAT_RGBAF,
-};
-
-enum TextureDetectRoughnessChannel {
-	TEXTURE_DETECT_ROUGHNESS_R,
-	TEXTURE_DETECT_ROUGHNESS_G,
-	TEXTURE_DETECT_ROUGHNESS_B,
-	TEXTURE_DETECT_ROUGHNESS_A,
-	TEXTURE_DETECT_ROUGHNESS_GRAY,
-};
-
-/* PIPELINES API */
-
-enum PipelineSource {
-	PIPELINE_SOURCE_CANVAS,
-	PIPELINE_SOURCE_MESH,
-	PIPELINE_SOURCE_SURFACE,
-	PIPELINE_SOURCE_DRAW,
-	PIPELINE_SOURCE_SPECIALIZATION,
-	PIPELINE_SOURCE_MAX,
-};
-
-/* SHADER API */
-
-enum ShaderMode {
-	SHADER_SPATIAL,
-	SHADER_CANVAS_ITEM,
-	SHADER_PARTICLES,
-	SHADER_SKY,
-	SHADER_FOG,
-	SHADER_TEXTURE_BLIT,
-	SHADER_MAX,
-};
-
-enum CullMode {
-	CULL_MODE_DISABLED,
-	CULL_MODE_FRONT,
-	CULL_MODE_BACK,
-};
-
-/* COMMON MATERIAL API */
-
-enum {
-	MATERIAL_RENDER_PRIORITY_MIN = -128,
-	MATERIAL_RENDER_PRIORITY_MAX = 127,
-};
-
-/* MESH API */
-
-enum ArrayType {
-	ARRAY_VERTEX = 0, // RG32F (2D), RGB32F, RGBA16 (compressed)
-	ARRAY_NORMAL = 1, // RG16
-	ARRAY_TANGENT = 2, // BA16 (with normal) or A16 (with vertex, when compressed)
-	ARRAY_COLOR = 3, // RGBA8
-	ARRAY_TEX_UV = 4, // RG32F or RG16
-	ARRAY_TEX_UV2 = 5, // RG32F or RG16
-	ARRAY_CUSTOM0 = 6, // Depends on ArrayCustomFormat.
-	ARRAY_CUSTOM1 = 7,
-	ARRAY_CUSTOM2 = 8,
-	ARRAY_CUSTOM3 = 9,
-	ARRAY_BONES = 10, // RGBA16UI (x2 if 8 weights)
-	ARRAY_WEIGHTS = 11, // RGBA16UNORM (x2 if 8 weights)
-	ARRAY_INDEX = 12, // 16 or 32 bits depending on length > 0xFFFF.
-	ARRAY_MAX = 13,
-};
-
-enum {
-	ARRAY_CUSTOM_COUNT = ARRAY_BONES - ARRAY_CUSTOM0
-};
-
-enum ArrayCustomFormat {
-	ARRAY_CUSTOM_RGBA8_UNORM,
-	ARRAY_CUSTOM_RGBA8_SNORM,
-	ARRAY_CUSTOM_RG_HALF,
-	ARRAY_CUSTOM_RGBA_HALF,
-	ARRAY_CUSTOM_R_FLOAT,
-	ARRAY_CUSTOM_RG_FLOAT,
-	ARRAY_CUSTOM_RGB_FLOAT,
-	ARRAY_CUSTOM_RGBA_FLOAT,
-	ARRAY_CUSTOM_MAX,
-};
-
-enum ArrayFormat : uint64_t {
-	/* ARRAY FORMAT FLAGS */
-	ARRAY_FORMAT_VERTEX = 1 << ARRAY_VERTEX,
-	ARRAY_FORMAT_NORMAL = 1 << ARRAY_NORMAL,
-	ARRAY_FORMAT_TANGENT = 1 << ARRAY_TANGENT,
-	ARRAY_FORMAT_COLOR = 1 << ARRAY_COLOR,
-	ARRAY_FORMAT_TEX_UV = 1 << ARRAY_TEX_UV,
-	ARRAY_FORMAT_TEX_UV2 = 1 << ARRAY_TEX_UV2,
-	ARRAY_FORMAT_CUSTOM0 = 1 << ARRAY_CUSTOM0,
-	ARRAY_FORMAT_CUSTOM1 = 1 << ARRAY_CUSTOM1,
-	ARRAY_FORMAT_CUSTOM2 = 1 << ARRAY_CUSTOM2,
-	ARRAY_FORMAT_CUSTOM3 = 1 << ARRAY_CUSTOM3,
-	ARRAY_FORMAT_BONES = 1 << ARRAY_BONES,
-	ARRAY_FORMAT_WEIGHTS = 1 << ARRAY_WEIGHTS,
-	ARRAY_FORMAT_INDEX = 1 << ARRAY_INDEX,
-
-	ARRAY_FORMAT_BLEND_SHAPE_MASK = ARRAY_FORMAT_VERTEX | ARRAY_FORMAT_NORMAL | ARRAY_FORMAT_TANGENT,
-
-	ARRAY_FORMAT_CUSTOM_BASE = (ARRAY_INDEX + 1),
-	ARRAY_FORMAT_CUSTOM_BITS = 3,
-	ARRAY_FORMAT_CUSTOM_MASK = 0x7,
-	ARRAY_FORMAT_CUSTOM0_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + 0),
-	ARRAY_FORMAT_CUSTOM1_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS),
-	ARRAY_FORMAT_CUSTOM2_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * 2),
-	ARRAY_FORMAT_CUSTOM3_SHIFT = (ARRAY_FORMAT_CUSTOM_BASE + ARRAY_FORMAT_CUSTOM_BITS * 3),
-
-	ARRAY_COMPRESS_FLAGS_BASE = (ARRAY_INDEX + 1 + 12),
-
-	ARRAY_FLAG_USE_2D_VERTICES = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 0),
-	ARRAY_FLAG_USE_DYNAMIC_UPDATE = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 1),
-	ARRAY_FLAG_USE_8_BONE_WEIGHTS = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 2),
-
-	ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 3),
-
-	ARRAY_FLAG_COMPRESS_ATTRIBUTES = 1 << (ARRAY_COMPRESS_FLAGS_BASE + 4),
-	// We leave enough room for up to 5 more compression flags.
-
-	ARRAY_FLAG_FORMAT_VERSION_BASE = ARRAY_COMPRESS_FLAGS_BASE + 10,
-	ARRAY_FLAG_FORMAT_VERSION_SHIFT = ARRAY_FLAG_FORMAT_VERSION_BASE,
-	// When changes are made to the mesh format, add a new version and use it for the CURRENT_VERSION.
-	ARRAY_FLAG_FORMAT_VERSION_1 = 0,
-	ARRAY_FLAG_FORMAT_VERSION_2 = 1ULL << ARRAY_FLAG_FORMAT_VERSION_SHIFT,
-	ARRAY_FLAG_FORMAT_CURRENT_VERSION = ARRAY_FLAG_FORMAT_VERSION_2,
-	ARRAY_FLAG_FORMAT_VERSION_MASK = 0xFF, // 8 bits version
-};
-
-static_assert(sizeof(ArrayFormat) == 8, "ArrayFormat should be 64 bits long.");
-
-enum PrimitiveType {
-	PRIMITIVE_POINTS,
-	PRIMITIVE_LINES,
-	PRIMITIVE_LINE_STRIP,
-	PRIMITIVE_TRIANGLES,
-	PRIMITIVE_TRIANGLE_STRIP,
-	PRIMITIVE_MAX,
-};
-
-enum BlendShapeMode {
-	BLEND_SHAPE_MODE_NORMALIZED,
-	BLEND_SHAPE_MODE_RELATIVE,
-};
-
-/* MULTIMESH API */
-
-enum MultimeshTransformFormat {
-	MULTIMESH_TRANSFORM_2D,
-	MULTIMESH_TRANSFORM_3D,
-};
-
-enum MultimeshPhysicsInterpolationQuality {
-	MULTIMESH_INTERP_QUALITY_FAST,
-	MULTIMESH_INTERP_QUALITY_HIGH,
-};
-
-/* LIGHT API */
-
-enum LightType {
-	LIGHT_DIRECTIONAL,
-	LIGHT_OMNI,
-	LIGHT_SPOT,
-};
-
-enum LightParam {
-	LIGHT_PARAM_ENERGY,
-	LIGHT_PARAM_INDIRECT_ENERGY,
-	LIGHT_PARAM_VOLUMETRIC_FOG_ENERGY,
-	LIGHT_PARAM_SPECULAR,
-	LIGHT_PARAM_RANGE,
-	LIGHT_PARAM_SIZE,
-	LIGHT_PARAM_ATTENUATION,
-	LIGHT_PARAM_SPOT_ANGLE,
-	LIGHT_PARAM_SPOT_ATTENUATION,
-	LIGHT_PARAM_SHADOW_MAX_DISTANCE,
-	LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
-	LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
-	LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET,
-	LIGHT_PARAM_SHADOW_FADE_START,
-	LIGHT_PARAM_SHADOW_NORMAL_BIAS,
-	LIGHT_PARAM_SHADOW_BIAS,
-	LIGHT_PARAM_SHADOW_PANCAKE_SIZE,
-	LIGHT_PARAM_SHADOW_OPACITY,
-	LIGHT_PARAM_SHADOW_BLUR,
-	LIGHT_PARAM_TRANSMITTANCE_BIAS,
-	LIGHT_PARAM_INTENSITY,
-	LIGHT_PARAM_MAX,
-};
-
-enum LightBakeMode {
-	LIGHT_BAKE_DISABLED,
-	LIGHT_BAKE_STATIC,
-	LIGHT_BAKE_DYNAMIC,
-};
-
-enum LightOmniShadowMode {
-	LIGHT_OMNI_SHADOW_DUAL_PARABOLOID,
-	LIGHT_OMNI_SHADOW_CUBE,
-};
-
-enum LightDirectionalShadowMode {
-	LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL,
-	LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS,
-	LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS,
-};
-
-enum LightDirectionalSkyMode {
-	LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_AND_SKY,
-	LIGHT_DIRECTIONAL_SKY_MODE_LIGHT_ONLY,
-	LIGHT_DIRECTIONAL_SKY_MODE_SKY_ONLY,
-};
-
-enum ShadowQuality {
-	SHADOW_QUALITY_HARD,
-	SHADOW_QUALITY_SOFT_VERY_LOW,
-	SHADOW_QUALITY_SOFT_LOW,
-	SHADOW_QUALITY_SOFT_MEDIUM,
-	SHADOW_QUALITY_SOFT_HIGH,
-	SHADOW_QUALITY_SOFT_ULTRA,
-	SHADOW_QUALITY_MAX,
-};
-
-enum LightProjectorFilter {
-	LIGHT_PROJECTOR_FILTER_NEAREST,
-	LIGHT_PROJECTOR_FILTER_LINEAR,
-	LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS,
-	LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS,
-	LIGHT_PROJECTOR_FILTER_NEAREST_MIPMAPS_ANISOTROPIC,
-	LIGHT_PROJECTOR_FILTER_LINEAR_MIPMAPS_ANISOTROPIC,
-};
-
-/* REFLECTION PROBE API */
-
-enum ReflectionProbeUpdateMode {
-	REFLECTION_PROBE_UPDATE_ONCE,
-	REFLECTION_PROBE_UPDATE_ALWAYS,
-};
-
-enum ReflectionProbeAmbientMode {
-	REFLECTION_PROBE_AMBIENT_DISABLED,
-	REFLECTION_PROBE_AMBIENT_ENVIRONMENT,
-	REFLECTION_PROBE_AMBIENT_COLOR,
-};
-
-/* DECAL API */
-
-enum DecalTexture {
-	DECAL_TEXTURE_ALBEDO,
-	DECAL_TEXTURE_NORMAL,
-	DECAL_TEXTURE_ORM,
-	DECAL_TEXTURE_EMISSION,
-	DECAL_TEXTURE_MAX,
-};
-
-enum DecalFilter {
-	DECAL_FILTER_NEAREST,
-	DECAL_FILTER_LINEAR,
-	DECAL_FILTER_NEAREST_MIPMAPS,
-	DECAL_FILTER_LINEAR_MIPMAPS,
-	DECAL_FILTER_NEAREST_MIPMAPS_ANISOTROPIC,
-	DECAL_FILTER_LINEAR_MIPMAPS_ANISOTROPIC,
-};
-
-/* VOXEL GI API */
-
-enum VoxelGIQuality {
-	VOXEL_GI_QUALITY_LOW,
-	VOXEL_GI_QUALITY_HIGH,
-};
-
-/* LIGHTMAP API */
-
-enum ShadowmaskMode {
-	SHADOWMASK_MODE_NONE,
-	SHADOWMASK_MODE_REPLACE,
-	SHADOWMASK_MODE_OVERLAY,
-	SHADOWMASK_MODE_ONLY,
-};
-
-/* PARTICLES API */
-
-enum ParticlesMode {
-	PARTICLES_MODE_2D,
-	PARTICLES_MODE_3D,
-};
-
-enum ParticlesTransformAlign {
-	PARTICLES_TRANSFORM_ALIGN_DISABLED,
-	PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD,
-	PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY,
-	PARTICLES_TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY,
-	PARTICLES_TRANSFORM_ALIGN_LOCAL_BILLBOARD,
-};
-
-enum ParticlesEmitFlags {
-	PARTICLES_EMIT_FLAG_POSITION = 1,
-	PARTICLES_EMIT_FLAG_ROTATION_SCALE = 2,
-	PARTICLES_EMIT_FLAG_VELOCITY = 4,
-	PARTICLES_EMIT_FLAG_COLOR = 8,
-	PARTICLES_EMIT_FLAG_CUSTOM = 16,
-};
-
-enum ParticlesDrawOrder {
-	PARTICLES_DRAW_ORDER_INDEX,
-	PARTICLES_DRAW_ORDER_LIFETIME,
-	PARTICLES_DRAW_ORDER_REVERSE_LIFETIME,
-	PARTICLES_DRAW_ORDER_VIEW_DEPTH,
-};
-
-enum ParticlesTransformAlignCustomSrc {
-	PARTICLES_ALIGN_CHANNEL_FILTER_DISABLED,
-	PARTICLES_ALIGN_CHANNEL_FILTER_X,
-	PARTICLES_ALIGN_CHANNEL_FILTER_Y,
-	PARTICLES_ALIGN_CHANNEL_FILTER_Z,
-	PARTICLES_ALIGN_CHANNEL_FILTER_W,
-	PARTICLES_ALIGN_CHANNEL_FILTER_MAX,
-};
-
-enum ParticlesTransformAlignAxis {
-	PARTICLES_ALIGN_AXIS_X,
-	PARTICLES_ALIGN_AXIS_Y,
-	PARTICLES_ALIGN_AXIS_MAX,
-};
-
-/* PARTICLES COLLISION API */
-
-enum ParticlesCollisionType {
-	PARTICLES_COLLISION_TYPE_SPHERE_ATTRACT,
-	PARTICLES_COLLISION_TYPE_BOX_ATTRACT,
-	PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT,
-	PARTICLES_COLLISION_TYPE_SPHERE_COLLIDE,
-	PARTICLES_COLLISION_TYPE_BOX_COLLIDE,
-	PARTICLES_COLLISION_TYPE_SDF_COLLIDE,
-	PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE,
-};
-
-enum ParticlesCollisionHeightfieldResolution { // Longest axis resolution.
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_256,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_512,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_1024,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_2048,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_4096,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_8192,
-	PARTICLES_COLLISION_HEIGHTFIELD_RESOLUTION_MAX,
-};
-
-/* FOG VOLUME API */
-
-enum FogVolumeShape {
-	FOG_VOLUME_SHAPE_ELLIPSOID,
-	FOG_VOLUME_SHAPE_CONE,
-	FOG_VOLUME_SHAPE_CYLINDER,
-	FOG_VOLUME_SHAPE_BOX,
-	FOG_VOLUME_SHAPE_WORLD,
-	FOG_VOLUME_SHAPE_MAX,
-};
-
-/* VIEWPORT API */
-
-enum CanvasItemTextureFilter {
-	CANVAS_ITEM_TEXTURE_FILTER_DEFAULT, // Uses canvas item setting for draw command, uses global setting for canvas item.
-	CANVAS_ITEM_TEXTURE_FILTER_NEAREST,
-	CANVAS_ITEM_TEXTURE_FILTER_LINEAR,
-	CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS,
-	CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS,
-	CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC,
-	CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC,
-	CANVAS_ITEM_TEXTURE_FILTER_MAX,
-};
-
-enum CanvasItemTextureRepeat {
-	CANVAS_ITEM_TEXTURE_REPEAT_DEFAULT, // Uses canvas item setting for draw command, uses global setting for canvas item.
-	CANVAS_ITEM_TEXTURE_REPEAT_DISABLED,
-	CANVAS_ITEM_TEXTURE_REPEAT_ENABLED,
-	CANVAS_ITEM_TEXTURE_REPEAT_MIRROR,
-	CANVAS_ITEM_TEXTURE_REPEAT_MAX,
-};
-
-enum ViewportScaling3DMode {
-	VIEWPORT_SCALING_3D_MODE_BILINEAR,
-	VIEWPORT_SCALING_3D_MODE_FSR,
-	VIEWPORT_SCALING_3D_MODE_FSR2,
-	VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL,
-	VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL,
-	VIEWPORT_SCALING_3D_MODE_NEAREST,
-	VIEWPORT_SCALING_3D_MODE_MAX,
-	VIEWPORT_SCALING_3D_MODE_OFF = 255, // for internal use only
-};
-
-enum ViewportScaling3DType {
-	VIEWPORT_SCALING_3D_TYPE_NONE,
-	VIEWPORT_SCALING_3D_TYPE_TEMPORAL,
-	VIEWPORT_SCALING_3D_TYPE_SPATIAL,
-	VIEWPORT_SCALING_3D_TYPE_MAX,
-};
-
-inline ViewportScaling3DType scaling_3d_mode_type(ViewportScaling3DMode p_mode) {
-	if (p_mode == VIEWPORT_SCALING_3D_MODE_NEAREST || p_mode == VIEWPORT_SCALING_3D_MODE_BILINEAR || p_mode == VIEWPORT_SCALING_3D_MODE_FSR || p_mode == VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL) {
-		return VIEWPORT_SCALING_3D_TYPE_SPATIAL;
-	} else if (p_mode == VIEWPORT_SCALING_3D_MODE_FSR2 || p_mode == VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL) {
-		return VIEWPORT_SCALING_3D_TYPE_TEMPORAL;
-	}
-	return VIEWPORT_SCALING_3D_TYPE_NONE;
-}
-
-enum ViewportAnisotropicFiltering {
-	VIEWPORT_ANISOTROPY_DISABLED,
-	VIEWPORT_ANISOTROPY_2X,
-	VIEWPORT_ANISOTROPY_4X,
-	VIEWPORT_ANISOTROPY_8X,
-	VIEWPORT_ANISOTROPY_16X,
-	VIEWPORT_ANISOTROPY_MAX,
-};
-
-enum ViewportUpdateMode {
-	VIEWPORT_UPDATE_DISABLED,
-	VIEWPORT_UPDATE_ONCE, // Then goes to disabled, must be manually updated.
-	VIEWPORT_UPDATE_WHEN_VISIBLE, // Default
-	VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE,
-	VIEWPORT_UPDATE_ALWAYS,
-};
-
-enum ViewportClearMode {
-	VIEWPORT_CLEAR_ALWAYS,
-	VIEWPORT_CLEAR_NEVER,
-	VIEWPORT_CLEAR_ONLY_NEXT_FRAME,
-};
-
-enum ViewportEnvironmentMode {
-	VIEWPORT_ENVIRONMENT_DISABLED,
-	VIEWPORT_ENVIRONMENT_ENABLED,
-	VIEWPORT_ENVIRONMENT_INHERIT,
-	VIEWPORT_ENVIRONMENT_MAX,
-};
-
-enum ViewportSDFOversize {
-	VIEWPORT_SDF_OVERSIZE_100_PERCENT,
-	VIEWPORT_SDF_OVERSIZE_120_PERCENT,
-	VIEWPORT_SDF_OVERSIZE_150_PERCENT,
-	VIEWPORT_SDF_OVERSIZE_200_PERCENT,
-	VIEWPORT_SDF_OVERSIZE_MAX,
-};
-
-enum ViewportSDFScale {
-	VIEWPORT_SDF_SCALE_100_PERCENT,
-	VIEWPORT_SDF_SCALE_50_PERCENT,
-	VIEWPORT_SDF_SCALE_25_PERCENT,
-	VIEWPORT_SDF_SCALE_MAX,
-};
-
-enum ViewportMSAA {
-	VIEWPORT_MSAA_DISABLED,
-	VIEWPORT_MSAA_2X,
-	VIEWPORT_MSAA_4X,
-	VIEWPORT_MSAA_8X,
-	VIEWPORT_MSAA_MAX,
-};
-
-enum ViewportScreenSpaceAA {
-	VIEWPORT_SCREEN_SPACE_AA_DISABLED,
-	VIEWPORT_SCREEN_SPACE_AA_FXAA,
-	VIEWPORT_SCREEN_SPACE_AA_SMAA,
-	VIEWPORT_SCREEN_SPACE_AA_MAX,
-};
-
-enum ViewportOcclusionCullingBuildQuality {
-	VIEWPORT_OCCLUSION_BUILD_QUALITY_LOW = 0,
-	VIEWPORT_OCCLUSION_BUILD_QUALITY_MEDIUM = 1,
-	VIEWPORT_OCCLUSION_BUILD_QUALITY_HIGH = 2,
-};
-
-enum ViewportRenderInfo {
-	VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME,
-	VIEWPORT_RENDER_INFO_PRIMITIVES_IN_FRAME,
-	VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME,
-	VIEWPORT_RENDER_INFO_MAX,
-};
-
-enum ViewportRenderInfoType {
-	VIEWPORT_RENDER_INFO_TYPE_VISIBLE,
-	VIEWPORT_RENDER_INFO_TYPE_SHADOW,
-	VIEWPORT_RENDER_INFO_TYPE_CANVAS,
-	VIEWPORT_RENDER_INFO_TYPE_MAX,
-};
-
-enum ViewportDebugDraw {
-	VIEWPORT_DEBUG_DRAW_DISABLED,
-	VIEWPORT_DEBUG_DRAW_UNSHADED,
-	VIEWPORT_DEBUG_DRAW_LIGHTING,
-	VIEWPORT_DEBUG_DRAW_OVERDRAW,
-	VIEWPORT_DEBUG_DRAW_WIREFRAME,
-	VIEWPORT_DEBUG_DRAW_NORMAL_BUFFER,
-	VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO,
-	VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING,
-	VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION,
-	VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS,
-	VIEWPORT_DEBUG_DRAW_DIRECTIONAL_SHADOW_ATLAS,
-	VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE,
-	VIEWPORT_DEBUG_DRAW_SSAO,
-	VIEWPORT_DEBUG_DRAW_SSIL,
-	VIEWPORT_DEBUG_DRAW_PSSM_SPLITS,
-	VIEWPORT_DEBUG_DRAW_DECAL_ATLAS,
-	VIEWPORT_DEBUG_DRAW_SDFGI,
-	VIEWPORT_DEBUG_DRAW_SDFGI_PROBES,
-	VIEWPORT_DEBUG_DRAW_GI_BUFFER,
-	VIEWPORT_DEBUG_DRAW_DISABLE_LOD,
-	VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS,
-	VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS,
-	VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS,
-	VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES,
-	VIEWPORT_DEBUG_DRAW_OCCLUDERS,
-	VIEWPORT_DEBUG_DRAW_MOTION_VECTORS,
-	VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER,
-};
-
-enum ViewportVRSMode {
-	VIEWPORT_VRS_DISABLED,
-	VIEWPORT_VRS_TEXTURE,
-	VIEWPORT_VRS_XR,
-	VIEWPORT_VRS_MAX,
-};
-
-enum ViewportVRSUpdateMode {
-	VIEWPORT_VRS_UPDATE_DISABLED,
-	VIEWPORT_VRS_UPDATE_ONCE,
-	VIEWPORT_VRS_UPDATE_ALWAYS,
-	VIEWPORT_VRS_UPDATE_MAX,
-};
-
-/* SKY API */
-
-enum SkyMode {
-	SKY_MODE_AUTOMATIC,
-	SKY_MODE_QUALITY,
-	SKY_MODE_INCREMENTAL,
-	SKY_MODE_REALTIME,
-};
-
-/* COMPOSITOR EFFECTS API */
-
-enum CompositorEffectFlags {
-	COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_COLOR = 1,
-	COMPOSITOR_EFFECT_FLAG_ACCESS_RESOLVED_DEPTH = 2,
-	COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS = 4,
-	COMPOSITOR_EFFECT_FLAG_NEEDS_ROUGHNESS = 8,
-	COMPOSITOR_EFFECT_FLAG_NEEDS_SEPARATE_SPECULAR = 16,
-};
-
-enum CompositorEffectCallbackType {
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_OPAQUE,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_OPAQUE,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_SKY,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_MAX,
-	COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY = -1,
-};
-
-/* ENVIRONMENT API */
-
-enum EnvironmentBG {
-	ENV_BG_CLEAR_COLOR,
-	ENV_BG_COLOR,
-	ENV_BG_SKY,
-	ENV_BG_CANVAS,
-	ENV_BG_KEEP,
-	ENV_BG_CAMERA_FEED,
-	ENV_BG_MAX,
-};
-
-enum EnvironmentAmbientSource {
-	ENV_AMBIENT_SOURCE_BG,
-	ENV_AMBIENT_SOURCE_DISABLED,
-	ENV_AMBIENT_SOURCE_COLOR,
-	ENV_AMBIENT_SOURCE_SKY,
-};
-
-enum EnvironmentReflectionSource {
-	ENV_REFLECTION_SOURCE_BG,
-	ENV_REFLECTION_SOURCE_DISABLED,
-	ENV_REFLECTION_SOURCE_SKY,
-};
-
-enum EnvironmentGlowBlendMode {
-	ENV_GLOW_BLEND_MODE_ADDITIVE,
-	ENV_GLOW_BLEND_MODE_SCREEN,
-	ENV_GLOW_BLEND_MODE_SOFTLIGHT,
-	ENV_GLOW_BLEND_MODE_REPLACE,
-	ENV_GLOW_BLEND_MODE_MIX,
-};
-
-enum EnvironmentToneMapper {
-	ENV_TONE_MAPPER_LINEAR,
-	ENV_TONE_MAPPER_REINHARD,
-	ENV_TONE_MAPPER_FILMIC,
-	ENV_TONE_MAPPER_ACES,
-	ENV_TONE_MAPPER_AGX,
-};
-
-enum EnvironmentSSRRoughnessQuality {
-	ENV_SSR_ROUGHNESS_QUALITY_DISABLED,
-	ENV_SSR_ROUGHNESS_QUALITY_LOW,
-	ENV_SSR_ROUGHNESS_QUALITY_MEDIUM,
-	ENV_SSR_ROUGHNESS_QUALITY_HIGH,
-};
-
-enum EnvironmentSSAOQuality {
-	ENV_SSAO_QUALITY_VERY_LOW,
-	ENV_SSAO_QUALITY_LOW,
-	ENV_SSAO_QUALITY_MEDIUM,
-	ENV_SSAO_QUALITY_HIGH,
-	ENV_SSAO_QUALITY_ULTRA,
-};
-
-enum EnvironmentSSILQuality {
-	ENV_SSIL_QUALITY_VERY_LOW,
-	ENV_SSIL_QUALITY_LOW,
-	ENV_SSIL_QUALITY_MEDIUM,
-	ENV_SSIL_QUALITY_HIGH,
-	ENV_SSIL_QUALITY_ULTRA,
-};
-
-enum EnvironmentSDFGIYScale {
-	ENV_SDFGI_Y_SCALE_50_PERCENT,
-	ENV_SDFGI_Y_SCALE_75_PERCENT,
-	ENV_SDFGI_Y_SCALE_100_PERCENT,
-};
-
-enum EnvironmentSDFGIRayCount {
-	ENV_SDFGI_RAY_COUNT_4,
-	ENV_SDFGI_RAY_COUNT_8,
-	ENV_SDFGI_RAY_COUNT_16,
-	ENV_SDFGI_RAY_COUNT_32,
-	ENV_SDFGI_RAY_COUNT_64,
-	ENV_SDFGI_RAY_COUNT_96,
-	ENV_SDFGI_RAY_COUNT_128,
-	ENV_SDFGI_RAY_COUNT_MAX,
-};
-
-enum EnvironmentSDFGIFramesToConverge {
-	ENV_SDFGI_CONVERGE_IN_5_FRAMES,
-	ENV_SDFGI_CONVERGE_IN_10_FRAMES,
-	ENV_SDFGI_CONVERGE_IN_15_FRAMES,
-	ENV_SDFGI_CONVERGE_IN_20_FRAMES,
-	ENV_SDFGI_CONVERGE_IN_25_FRAMES,
-	ENV_SDFGI_CONVERGE_IN_30_FRAMES,
-	ENV_SDFGI_CONVERGE_MAX
-};
-
-enum EnvironmentSDFGIFramesToUpdateLight {
-	ENV_SDFGI_UPDATE_LIGHT_IN_1_FRAME,
-	ENV_SDFGI_UPDATE_LIGHT_IN_2_FRAMES,
-	ENV_SDFGI_UPDATE_LIGHT_IN_4_FRAMES,
-	ENV_SDFGI_UPDATE_LIGHT_IN_8_FRAMES,
-	ENV_SDFGI_UPDATE_LIGHT_IN_16_FRAMES,
-	ENV_SDFGI_UPDATE_LIGHT_MAX,
-};
-
-enum EnvironmentFogMode {
-	ENV_FOG_MODE_EXPONENTIAL,
-	ENV_FOG_MODE_DEPTH,
-};
-
-enum SubSurfaceScatteringQuality {
-	SUB_SURFACE_SCATTERING_QUALITY_DISABLED,
-	SUB_SURFACE_SCATTERING_QUALITY_LOW,
-	SUB_SURFACE_SCATTERING_QUALITY_MEDIUM,
-	SUB_SURFACE_SCATTERING_QUALITY_HIGH,
-};
-
-/* CAMERA ATTRIBUTES API */
-
-enum DOFBlurQuality {
-	DOF_BLUR_QUALITY_VERY_LOW,
-	DOF_BLUR_QUALITY_LOW,
-	DOF_BLUR_QUALITY_MEDIUM,
-	DOF_BLUR_QUALITY_HIGH,
-};
-
-enum DOFBokehShape {
-	DOF_BOKEH_BOX,
-	DOF_BOKEH_HEXAGON,
-	DOF_BOKEH_CIRCLE,
-};
-
-/* INSTANCING API */
-
-enum InstanceType {
-	INSTANCE_NONE,
-	INSTANCE_MESH,
-	INSTANCE_MULTIMESH,
-	INSTANCE_PARTICLES,
-	INSTANCE_PARTICLES_COLLISION,
-	INSTANCE_LIGHT,
-	INSTANCE_REFLECTION_PROBE,
-	INSTANCE_DECAL,
-	INSTANCE_VOXEL_GI,
-	INSTANCE_LIGHTMAP,
-	INSTANCE_OCCLUDER,
-	INSTANCE_VISIBLITY_NOTIFIER, // TODO: Fix typo in "VISIBILITY" (in 5.0).
-	INSTANCE_FOG_VOLUME,
-	INSTANCE_MAX,
-
-	INSTANCE_GEOMETRY_MASK = (1 << INSTANCE_MESH) | (1 << INSTANCE_MULTIMESH) | (1 << INSTANCE_PARTICLES)
-};
-
-enum InstanceFlags {
-	INSTANCE_FLAG_USE_BAKED_LIGHT,
-	INSTANCE_FLAG_USE_DYNAMIC_GI,
-	INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE,
-	INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING,
-	INSTANCE_FLAG_MAX,
-};
-
-enum ShadowCastingSetting {
-	SHADOW_CASTING_SETTING_OFF,
-	SHADOW_CASTING_SETTING_ON,
-	SHADOW_CASTING_SETTING_DOUBLE_SIDED,
-	SHADOW_CASTING_SETTING_SHADOWS_ONLY,
-};
-
-enum VisibilityRangeFadeMode {
-	VISIBILITY_RANGE_FADE_DISABLED,
-	VISIBILITY_RANGE_FADE_SELF,
-	VISIBILITY_RANGE_FADE_DEPENDENCIES,
-};
-
-/* BAKE API */
-
-enum BakeChannels {
-	BAKE_CHANNEL_ALBEDO_ALPHA,
-	BAKE_CHANNEL_NORMAL,
-	BAKE_CHANNEL_ORM,
-	BAKE_CHANNEL_EMISSION,
-};
-
-/* CANVAS TEXTURE API */
-
-enum CanvasTextureChannel {
-	CANVAS_TEXTURE_CHANNEL_DIFFUSE,
-	CANVAS_TEXTURE_CHANNEL_NORMAL,
-	CANVAS_TEXTURE_CHANNEL_SPECULAR,
-};
-
-/* CANVAS ITEM API */
-
-enum NinePatchAxisMode {
-	NINE_PATCH_STRETCH,
-	NINE_PATCH_TILE,
-	NINE_PATCH_TILE_FIT,
-};
-
-enum CanvasGroupMode {
-	CANVAS_GROUP_MODE_DISABLED,
-	CANVAS_GROUP_MODE_CLIP_ONLY,
-	CANVAS_GROUP_MODE_CLIP_AND_DRAW,
-	CANVAS_GROUP_MODE_TRANSPARENT,
-};
-
-/* CANVAS LIGHT API */
-
-enum CanvasLightMode {
-	CANVAS_LIGHT_MODE_POINT,
-	CANVAS_LIGHT_MODE_DIRECTIONAL,
-};
-
-enum CanvasLightBlendMode {
-	CANVAS_LIGHT_BLEND_MODE_ADD,
-	CANVAS_LIGHT_BLEND_MODE_SUB,
-	CANVAS_LIGHT_BLEND_MODE_MIX,
-};
-
-enum CanvasLightShadowFilter {
-	CANVAS_LIGHT_FILTER_NONE,
-	CANVAS_LIGHT_FILTER_PCF5,
-	CANVAS_LIGHT_FILTER_PCF13,
-	CANVAS_LIGHT_FILTER_MAX,
-};
-
-/* CANVAS OCCLUDER POLYGON API */
-
-enum CanvasOccluderPolygonCullMode {
-	CANVAS_OCCLUDER_POLYGON_CULL_DISABLED,
-	CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE,
-	CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE,
-};
-
-/* GLOBAL SHADER PARAMETERS API */
-
-enum GlobalShaderParameterType {
-	GLOBAL_VAR_TYPE_BOOL,
-	GLOBAL_VAR_TYPE_BVEC2,
-	GLOBAL_VAR_TYPE_BVEC3,
-	GLOBAL_VAR_TYPE_BVEC4,
-	GLOBAL_VAR_TYPE_INT,
-	GLOBAL_VAR_TYPE_IVEC2,
-	GLOBAL_VAR_TYPE_IVEC3,
-	GLOBAL_VAR_TYPE_IVEC4,
-	GLOBAL_VAR_TYPE_RECT2I,
-	GLOBAL_VAR_TYPE_UINT,
-	GLOBAL_VAR_TYPE_UVEC2,
-	GLOBAL_VAR_TYPE_UVEC3,
-	GLOBAL_VAR_TYPE_UVEC4,
-	GLOBAL_VAR_TYPE_FLOAT,
-	GLOBAL_VAR_TYPE_VEC2,
-	GLOBAL_VAR_TYPE_VEC3,
-	GLOBAL_VAR_TYPE_VEC4,
-	GLOBAL_VAR_TYPE_COLOR,
-	GLOBAL_VAR_TYPE_RECT2,
-	GLOBAL_VAR_TYPE_MAT2,
-	GLOBAL_VAR_TYPE_MAT3,
-	GLOBAL_VAR_TYPE_MAT4,
-	GLOBAL_VAR_TYPE_TRANSFORM_2D,
-	GLOBAL_VAR_TYPE_TRANSFORM,
-	GLOBAL_VAR_TYPE_SAMPLER2D,
-	GLOBAL_VAR_TYPE_SAMPLER2DARRAY,
-	GLOBAL_VAR_TYPE_SAMPLER3D,
-	GLOBAL_VAR_TYPE_SAMPLERCUBE,
-	GLOBAL_VAR_TYPE_SAMPLEREXT,
-	GLOBAL_VAR_TYPE_MAX,
-};
-
-/* STATUS INFORMATION */
-
-enum RenderingInfo {
-	RENDERING_INFO_TOTAL_OBJECTS_IN_FRAME,
-	RENDERING_INFO_TOTAL_PRIMITIVES_IN_FRAME,
-	RENDERING_INFO_TOTAL_DRAW_CALLS_IN_FRAME,
-	RENDERING_INFO_TEXTURE_MEM_USED,
-	RENDERING_INFO_BUFFER_MEM_USED,
-	RENDERING_INFO_VIDEO_MEM_USED,
-	RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS,
-	RENDERING_INFO_PIPELINE_COMPILATIONS_MESH,
-	RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE,
-	RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW,
-	RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION,
-	RENDERING_INFO_MAX,
-};
-
-/* BACKGROUND */
-
-// If this is modified, review the conversion code in `project_settings.cpp`
-// which is hardcoded to avoid coupling `core` with `servers`.
-enum SplashStretchMode {
-	SPLASH_STRETCH_MODE_DISABLED,
-	SPLASH_STRETCH_MODE_KEEP,
-	SPLASH_STRETCH_MODE_KEEP_WIDTH,
-	SPLASH_STRETCH_MODE_KEEP_HEIGHT,
-	SPLASH_STRETCH_MODE_COVER,
-	SPLASH_STRETCH_MODE_IGNORE,
-};
-
-/* MISC */
-
-#ifndef DISABLE_DEPRECATED
-// Never actually used, should be removed when we can break compatibility.
-enum Features {
-	FEATURE_SHADERS,
-	FEATURE_MULTITHREADED,
-};
-#endif
-
-} // namespace RenderingServerEnums
-
-// Alias to make it easier to use.
-#define RSE RenderingServerEnums
diff --git a/engine/servers/rendering/rendering_server_globals.h b/engine/servers/rendering/rendering_server_globals.h
index 9ace8699..7c28e336 100644
--- a/engine/servers/rendering/rendering_server_globals.h
+++ b/engine/servers/rendering/rendering_server_globals.h
@@ -32,6 +32,9 @@
 
 #include "servers/rendering/environment/renderer_fog.h"
 #include "servers/rendering/environment/renderer_gi.h"
+#include "servers/rendering/renderer_canvas_cull.h"
+#include "servers/rendering/renderer_canvas_render.h"
+#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/storage/camera_attributes_storage.h"
 #include "servers/rendering/storage/light_storage.h"
 #include "servers/rendering/storage/material_storage.h"
@@ -40,9 +43,7 @@
 #include "servers/rendering/storage/texture_storage.h"
 #include "servers/rendering/storage/utilities.h"
 
-class RendererCompositor;
 class RendererCanvasCull;
-class RendererCanvasRender;
 class RendererViewport;
 class RenderingMethod;
 
diff --git a/engine/servers/rendering/rendering_server_types.h b/engine/servers/rendering/rendering_server_types.h
deleted file mode 100644
index 8dab2c28..00000000
--- a/engine/servers/rendering/rendering_server_types.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/**************************************************************************/
-/*  rendering_server_types.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/io/image.h"
-#include "core/math/aabb.h"
-#include "core/math/rect2.h"
-#include "core/math/rect2i.h"
-#include "core/math/transform_3d.h"
-#include "core/math/vector2.h"
-#include "core/math/vector4.h"
-#include "core/string/ustring.h"
-#include "core/templates/rid.h"
-#include "core/templates/vector.h"
-#include "servers/rendering/rendering_server_enums.h"
-
-#include <cstdint>
-
-template <typename T>
-class Vector;
-
-namespace RenderingServerTypes {
-
-/* TEXTURE API */
-
-typedef void (*TextureDetectCallback)(void *);
-typedef void (*TextureDetectRoughnessCallback)(void *, const String &, RSE::TextureDetectRoughnessChannel);
-
-struct TextureInfo {
-	RID texture;
-	uint32_t width;
-	uint32_t height;
-	uint32_t depth;
-	Image::Format format;
-	int64_t bytes;
-	String path;
-	RSE::TextureType type;
-};
-
-/* SHADER API */
-
-struct ShaderNativeSourceCode {
-	struct Version {
-		struct Stage {
-			String name;
-			String code;
-		};
-		Vector<Stage> stages;
-	};
-	Vector<Version> versions;
-};
-
-/* MESH API */
-
-struct SurfaceData {
-	RSE::PrimitiveType primitive = RSE::PRIMITIVE_MAX;
-
-	uint64_t format = RSE::ARRAY_FLAG_FORMAT_CURRENT_VERSION;
-	Vector<uint8_t> vertex_data; // Vertex, Normal, Tangent (change with skinning, blendshape).
-	Vector<uint8_t> attribute_data; // Color, UV, UV2, Custom0-3.
-	Vector<uint8_t> skin_data; // Bone index, Bone weight.
-	uint32_t vertex_count = 0;
-	Vector<uint8_t> index_data;
-	uint32_t index_count = 0;
-
-	AABB aabb;
-	struct LOD {
-		float edge_length = 0.0f;
-		Vector<uint8_t> index_data;
-	};
-	Vector<LOD> lods;
-	Vector<AABB> bone_aabbs;
-
-	// Transforms used in runtime bone AABBs compute.
-	// Since bone AABBs is saved in Mesh space, but bones is in Skeleton space.
-	Transform3D mesh_to_skeleton_xform;
-
-	Vector<uint8_t> blend_shape_data;
-
-	Vector4 uv_scale;
-
-	RID material;
-};
-
-struct MeshInfo {
-	RID mesh;
-	String path;
-	uint32_t vertex_buffer_size = 0;
-	uint32_t attribute_buffer_size = 0;
-	uint32_t skin_buffer_size = 0;
-	uint32_t index_buffer_size = 0;
-	uint32_t blend_shape_buffer_size = 0;
-	uint32_t lod_index_buffers_size = 0;
-	uint64_t vertex_count = 0;
-};
-
-/* STATUS INFORMATION */
-
-struct FrameProfileArea {
-	String name;
-	double gpu_msec;
-	double cpu_msec;
-};
-
-/* COMPOSITOR */
-
-struct BlitToScreen {
-	RID render_target;
-	Rect2 src_rect = Rect2(0.0, 0.0, 1.0, 1.0);
-	Rect2i dst_rect;
-
-	struct {
-		bool use_layer = false;
-		uint32_t layer = 0;
-	} multi_view;
-
-	struct {
-		//lens distorted parameters for VR
-		bool apply = false;
-		Vector2 eye_center;
-		float k1 = 0.0;
-		float k2 = 0.0;
-
-		float upscale = 1.0;
-		float aspect_ratio = 1.0;
-	} lens_distortion;
-};
-
-/* BACKGROUND */
-
-// Helper for RSE::SplashStretchMode, put here for convenience.
-inline Rect2 get_splash_stretched_screen_rect(const Size2 &p_image_size, const Size2 &p_window_size, RSE::SplashStretchMode p_stretch_mode) {
-	Size2 imgsize = p_image_size;
-	Rect2 screenrect;
-	switch (p_stretch_mode) {
-		case RSE::SPLASH_STRETCH_MODE_DISABLED: {
-			screenrect.size = imgsize;
-			screenrect.position = ((p_window_size - screenrect.size) / 2.0).floor();
-		} break;
-		case RSE::SPLASH_STRETCH_MODE_KEEP: {
-			if (p_window_size.width > p_window_size.height) {
-				// Scale horizontally.
-				screenrect.size.y = p_window_size.height;
-				screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
-				screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
-			} else {
-				// Scale vertically.
-				screenrect.size.x = p_window_size.width;
-				screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
-				screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
-			}
-		} break;
-		case RSE::SPLASH_STRETCH_MODE_KEEP_WIDTH: {
-			// Scale vertically.
-			screenrect.size.x = p_window_size.width;
-			screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
-			screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
-		} break;
-		case RSE::SPLASH_STRETCH_MODE_KEEP_HEIGHT: {
-			// Scale horizontally.
-			screenrect.size.y = p_window_size.height;
-			screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
-			screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
-		} break;
-		case RSE::SPLASH_STRETCH_MODE_COVER: {
-			double window_aspect = (double)p_window_size.width / p_window_size.height;
-			double img_aspect = imgsize.width / imgsize.height;
-
-			if (window_aspect > img_aspect) {
-				// Scale vertically.
-				screenrect.size.x = p_window_size.width;
-				screenrect.size.y = imgsize.height * p_window_size.width / imgsize.width;
-				screenrect.position.y = (p_window_size.height - screenrect.size.y) / 2;
-			} else {
-				// Scale horizontally.
-				screenrect.size.y = p_window_size.height;
-				screenrect.size.x = imgsize.width * p_window_size.height / imgsize.height;
-				screenrect.position.x = (p_window_size.width - screenrect.size.x) / 2;
-			}
-		} break;
-		case RSE::SPLASH_STRETCH_MODE_IGNORE: {
-			screenrect.size.x = p_window_size.width;
-			screenrect.size.y = p_window_size.height;
-		} break;
-	}
-	return screenrect;
-}
-
-/* RENDERING METHOD */
-
-struct RenderInfo {
-	int info[RSE::VIEWPORT_RENDER_INFO_TYPE_MAX][RSE::VIEWPORT_RENDER_INFO_MAX] = {};
-};
-
-} // namespace RenderingServerTypes
diff --git a/engine/servers/rendering/rendering_shader_container.cpp b/engine/servers/rendering/rendering_shader_container.cpp
index a74bcedc..dab68d7b 100644
--- a/engine/servers/rendering/rendering_shader_container.cpp
+++ b/engine/servers/rendering/rendering_shader_container.cpp
@@ -31,9 +31,9 @@
 #include "rendering_shader_container.h"
 
 #include "core/io/compression.h"
-#include "servers/rendering/renderer_rd/shader_rd.h"
 
-#include <thirdparty/spirv-reflect/spirv_reflect.h>
+#include "servers/rendering/renderer_rd/shader_rd.h"
+#include "thirdparty/spirv-reflect/spirv_reflect.h"
 
 static inline uint32_t aligned_to(uint32_t p_size, uint32_t p_alignment) {
 	if (p_size % p_alignment) {
@@ -242,38 +242,12 @@ Error RenderingShaderContainer::reflect_spirv(const String &p_shader_name, Span<
 	LocalVector<ReflectShaderStage> &r_refl = r_shader.shader_stages;
 	r_refl.resize(spirv_size);
 
-	bool pipeline_type_detected = false;
 	for (uint32_t i = 0; i < spirv_size; i++) {
 		RDC::ShaderStage stage = p_spirv[i].shader_stage;
 		RDC::ShaderStage stage_flag = (RDC::ShaderStage)(1 << stage);
 		r_refl[i].shader_stage = stage;
 		r_refl[i]._spirv_data = p_spirv[i].spirv;
 
-		if (!pipeline_type_detected) {
-			switch (stage) {
-				case RDC::SHADER_STAGE_VERTEX:
-				case RDC::SHADER_STAGE_FRAGMENT:
-				case RDC::SHADER_STAGE_TESSELATION_CONTROL:
-				case RDC::SHADER_STAGE_TESSELATION_EVALUATION:
-					r_shader.pipeline_type = RDC::PIPELINE_TYPE_RASTERIZATION;
-					break;
-				case RDC::SHADER_STAGE_COMPUTE:
-					r_shader.pipeline_type = RDC::PIPELINE_TYPE_COMPUTE;
-					break;
-				case RDC::SHADER_STAGE_RAYGEN:
-				case RDC::SHADER_STAGE_ANY_HIT:
-				case RDC::SHADER_STAGE_CLOSEST_HIT:
-				case RDC::SHADER_STAGE_MISS:
-				case RDC::SHADER_STAGE_INTERSECTION:
-					r_shader.pipeline_type = RDC::PIPELINE_TYPE_RAYTRACING;
-					break;
-				default:
-					DEV_ASSERT(false && "Unknown shader stage.");
-			}
-
-			pipeline_type_detected = true;
-		}
-
 		const Vector<uint64_t> &dynamic_buffers = p_spirv[i].dynamic_buffers;
 
 		if (stage == RDC::SHADER_STAGE_COMPUTE) {
@@ -281,7 +255,7 @@ Error RenderingShaderContainer::reflect_spirv(const String &p_shader_name, Span<
 					"Compute shaders can only receive one stage, dedicated to compute.");
 		}
 		ERR_FAIL_COND_V_MSG(reflection.stages_bits.has_flag(stage_flag), FAILED,
-				"Stage " + String(RDC::SHADER_STAGE_NAMES[stage]) + " submitted more than once.");
+				"Stage " + String(RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage]) + " submitted more than once.");
 		reflection.stages_bits.set_flag(stage_flag);
 
 		{
@@ -396,7 +370,8 @@ Error RenderingShaderContainer::reflect_spirv(const String &p_shader_name, Span<
 							is_image = true;
 						} break;
 						case SPV_REFLECT_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR: {
-							uniform.type = RDC::UNIFORM_TYPE_ACCELERATION_STRUCTURE;
+							ERR_PRINT("Acceleration structure not supported.");
+							continue;
 						} break;
 					}
 
@@ -492,31 +467,22 @@ Error RenderingShaderContainer::reflect_spirv(const String &p_shader_name, Span<
 						SpvReflectSpecializationConstant *spc = spec_constants[j];
 						sconst.set_spv_reflect(stage, spc);
 
-						if (spc->default_value_size != 4) {
-							ERR_FAIL_V_MSG(FAILED, vformat("Reflection of SPIR-V shader stage '%s' failed because the specialization constant #%d's default value is not 4 bytes long (%d) and is currently not supported.", RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage], spc->constant_id, spc->default_value_size));
-						}
-
 						sconst.constant_id = spc->constant_id;
 						sconst.int_value = 0; // Clear previous value JIC.
-
-						switch (spc->type_description->op) {
-							case SpvOpTypeBool:
+						switch (spc->constant_type) {
+							case SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL: {
 								sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_BOOL;
-								sconst.bool_value = *(uint32_t *)(spc->default_value);
-								break;
-							case SpvOpTypeInt:
+								sconst.bool_value = spc->default_value.int_bool_value != 0;
+							} break;
+							case SPV_REFLECT_SPECIALIZATION_CONSTANT_INT: {
 								sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_INT;
-								sconst.int_value = *(uint32_t *)(spc->default_value);
-								break;
-							case SpvOpTypeFloat:
+								sconst.int_value = spc->default_value.int_bool_value;
+							} break;
+							case SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT: {
 								sconst.type = RDC::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_FLOAT;
-								sconst.float_value = *(float *)(spc->default_value);
-								break;
-							default:
-								ERR_FAIL_V_MSG(FAILED, vformat("Reflection of SPIR-V shader stage '%s' failed because the specialization constant #%d does not use a known operation (%d).", RDC::SHADER_STAGE_NAMES[p_spirv[i].shader_stage], spc->constant_id, spc->type_description->op));
-								break;
+								sconst.float_value = spc->default_value.float_value;
+							} break;
 						}
-
 						sconst.stages.set_flag(stage_flag);
 
 						for (uint32_t k = 0; k < reflection.specialization_constants.size(); k++) {
@@ -645,7 +611,7 @@ void RenderingShaderContainer::set_from_shader_reflection(const ReflectShader &p
 	reflection_data.vertex_input_mask = p_reflection.vertex_input_mask;
 	reflection_data.fragment_output_mask = p_reflection.fragment_output_mask;
 	reflection_data.specialization_constants_count = p_reflection.specialization_constants.size();
-	reflection_data.pipeline_type = p_reflection.pipeline_type;
+	reflection_data.is_compute = p_reflection.is_compute();
 	reflection_data.has_multiview = p_reflection.has_multiview;
 	reflection_data.has_dynamic_buffers = p_reflection.has_dynamic_buffers;
 	reflection_data.compute_local_size[0] = p_reflection.compute_local_size[0];
@@ -702,7 +668,7 @@ RenderingDeviceCommons::ShaderReflection RenderingShaderContainer::get_shader_re
 	shader_refl.push_constant_stages = reflection_data.push_constant_stages_mask;
 	shader_refl.vertex_input_mask = reflection_data.vertex_input_mask;
 	shader_refl.fragment_output_mask = reflection_data.fragment_output_mask;
-	shader_refl.pipeline_type = reflection_data.pipeline_type;
+	shader_refl.is_compute = reflection_data.is_compute;
 	shader_refl.has_multiview = reflection_data.has_multiview;
 	shader_refl.has_dynamic_buffers = reflection_data.has_dynamic_buffers;
 	shader_refl.compute_local_size[0] = reflection_data.compute_local_size[0];
diff --git a/engine/servers/rendering/rendering_shader_container.h b/engine/servers/rendering/rendering_shader_container.h
index 45151b0d..364294d2 100644
--- a/engine/servers/rendering/rendering_shader_container.h
+++ b/engine/servers/rendering/rendering_shader_container.h
@@ -59,7 +59,7 @@ protected:
 		uint64_t vertex_input_mask = 0;
 		uint32_t fragment_output_mask = 0;
 		uint32_t specialization_constants_count = 0;
-		RDC::PipelineType pipeline_type = RDC::PIPELINE_TYPE_RASTERIZATION;
+		uint32_t is_compute = 0;
 		uint32_t has_multiview = 0;
 		uint32_t has_dynamic_buffers = 0;
 		uint32_t compute_local_size[3] = {};
@@ -232,7 +232,6 @@ protected:
 		uint32_t push_constant_size = 0;
 		bool has_multiview = false;
 		bool has_dynamic_buffers = false;
-		RDC::PipelineType pipeline_type = RDC::PIPELINE_TYPE_RASTERIZATION;
 
 		LocalVector<ReflectShaderStage> shader_stages;
 		LocalVector<ReflectDescriptorSet> uniform_sets;
diff --git a/engine/servers/rendering/shader_compiler.cpp b/engine/servers/rendering/shader_compiler.cpp
index 44d933f5..b60b9110 100644
--- a/engine/servers/rendering/shader_compiler.cpp
+++ b/engine/servers/rendering/shader_compiler.cpp
@@ -30,7 +30,6 @@
 
 #include "shader_compiler.h"
 
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/shader_types.h"
 
@@ -528,11 +527,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 				if (SL::is_sampler_type(E.value.type)) {
 					if (E.value.hint == SL::ShaderNode::Uniform::HINT_SCREEN_TEXTURE ||
 							E.value.hint == SL::ShaderNode::Uniform::HINT_NORMAL_ROUGHNESS_TEXTURE ||
-							E.value.hint == SL::ShaderNode::Uniform::HINT_DEPTH_TEXTURE ||
-							E.value.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE0 ||
-							E.value.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE1 ||
-							E.value.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE2 ||
-							E.value.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE3) {
+							E.value.hint == SL::ShaderNode::Uniform::HINT_DEPTH_TEXTURE) {
 						continue; // Don't create uniforms in the generated code for these.
 					}
 					max_texture_uniforms++;
@@ -577,11 +572,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 
 				if (uniform.hint == SL::ShaderNode::Uniform::HINT_SCREEN_TEXTURE ||
 						uniform.hint == SL::ShaderNode::Uniform::HINT_NORMAL_ROUGHNESS_TEXTURE ||
-						uniform.hint == SL::ShaderNode::Uniform::HINT_DEPTH_TEXTURE ||
-						uniform.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE0 ||
-						uniform.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE1 ||
-						uniform.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE2 ||
-						uniform.hint == SL::ShaderNode::Uniform::HINT_BLIT_SOURCE3) {
+						uniform.hint == SL::ShaderNode::Uniform::HINT_DEPTH_TEXTURE) {
 					continue; // Don't create uniforms in the generated code for these.
 				}
 
@@ -946,14 +937,6 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 						} else if (u.hint == ShaderLanguage::ShaderNode::Uniform::HINT_DEPTH_TEXTURE) {
 							name = "depth_buffer";
 							r_gen_code.uses_depth_texture = true;
-						} else if (u.hint == ShaderLanguage::ShaderNode::Uniform::HINT_BLIT_SOURCE0) {
-							name = "source0";
-						} else if (u.hint == ShaderLanguage::ShaderNode::Uniform::HINT_BLIT_SOURCE1) {
-							name = "source1";
-						} else if (u.hint == ShaderLanguage::ShaderNode::Uniform::HINT_BLIT_SOURCE2) {
-							name = "source2";
-						} else if (u.hint == ShaderLanguage::ShaderNode::Uniform::HINT_BLIT_SOURCE3) {
-							name = "source3";
 						} else {
 							name = _mkid(vnode->name); //texture, use as is
 						}
@@ -1519,11 +1502,11 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 }
 
 ShaderLanguage::DataType ShaderCompiler::_get_global_shader_uniform_type(const StringName &p_name) {
-	RSE::GlobalShaderParameterType gvt = RSG::material_storage->global_shader_parameter_get_type(p_name);
+	RS::GlobalShaderParameterType gvt = RSG::material_storage->global_shader_parameter_get_type(p_name);
 	return (ShaderLanguage::DataType)RS::global_shader_uniform_type_get_shader_datatype(gvt);
 }
 
-Error ShaderCompiler::compile(RSE::ShaderMode p_mode, const String &p_code, IdentifierActions *p_actions, const String &p_path, GeneratedCode &r_gen_code) {
+Error ShaderCompiler::compile(RS::ShaderMode p_mode, const String &p_code, IdentifierActions *p_actions, const String &p_path, GeneratedCode &r_gen_code) {
 	SL::ShaderCompileInfo info;
 	info.functions = ShaderTypes::get_singleton()->get_functions(p_mode);
 	info.render_modes = ShaderTypes::get_singleton()->get_modes(p_mode);
diff --git a/engine/servers/rendering/shader_compiler.h b/engine/servers/rendering/shader_compiler.h
index 93afcd8e..433f8fa2 100644
--- a/engine/servers/rendering/shader_compiler.h
+++ b/engine/servers/rendering/shader_compiler.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/pair.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
 
 class ShaderCompiler {
@@ -40,11 +40,6 @@ public:
 		STAGE_VERTEX,
 		STAGE_FRAGMENT,
 		STAGE_COMPUTE,
-		STAGE_RAYGEN,
-		STAGE_ANY_HIT,
-		STAGE_CLOSEST_HIT,
-		STAGE_MISS,
-		STAGE_INTERSECTION,
 		STAGE_MAX
 	};
 
@@ -134,7 +129,7 @@ private:
 	static ShaderLanguage::DataType _get_global_shader_uniform_type(const StringName &p_name);
 
 public:
-	Error compile(RSE::ShaderMode p_mode, const String &p_code, IdentifierActions *p_actions, const String &p_path, GeneratedCode &r_gen_code);
+	Error compile(RS::ShaderMode p_mode, const String &p_code, IdentifierActions *p_actions, const String &p_path, GeneratedCode &r_gen_code);
 
 	void initialize(DefaultIdentifierActions p_actions);
 	ShaderCompiler();
diff --git a/engine/servers/rendering/shader_expression.cpp b/engine/servers/rendering/shader_expression.cpp
deleted file mode 100644
index 40fb94b5..00000000
--- a/engine/servers/rendering/shader_expression.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/**************************************************************************/
-/*  shader_expression.cpp                                                 */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "shader_expression.h"
-
-Error ShaderExpression::_get_token(Token &r_token) {
-	while (true) {
-#define GET_CHAR() (str_ofs >= expression.length() ? 0 : expression[str_ofs++])
-
-		char32_t cchar = GET_CHAR();
-		bool invalid_character = false;
-
-		switch (cchar) {
-			case 0: {
-				r_token.type = TK_EOF;
-				return OK;
-			}
-			case '{': {
-				invalid_character = true;
-				break;
-			}
-			case '}': {
-				invalid_character = true;
-				break;
-			}
-			case '[': {
-				invalid_character = true;
-				break;
-			}
-			case ']': {
-				invalid_character = true;
-				break;
-			}
-			case '(': {
-				r_token.type = TK_PARENTHESIS_OPEN;
-				return OK;
-			}
-			case ')': {
-				r_token.type = TK_PARENTHESIS_CLOSE;
-				return OK;
-			}
-			case ',': {
-				invalid_character = true;
-				break;
-			}
-			case ':': {
-				invalid_character = true;
-				break;
-			}
-			case '$': {
-				invalid_character = true;
-				break;
-			}
-			case '=': {
-				cchar = GET_CHAR();
-				if (cchar == '=') {
-					r_token.type = TK_OP_EQUAL;
-				} else {
-					_set_error("Expected '='.");
-					r_token.type = TK_ERROR;
-					return ERR_PARSE_ERROR;
-				}
-				return OK;
-			}
-			case '!': {
-				if (expression[str_ofs] == '=') {
-					r_token.type = TK_OP_NOT_EQUAL;
-					str_ofs++;
-				} else {
-					r_token.type = TK_OP_NOT;
-				}
-				return OK;
-			}
-			case '>': {
-				if (expression[str_ofs] == '=') {
-					r_token.type = TK_OP_GREATER_EQUAL;
-					str_ofs++;
-				} else if (expression[str_ofs] == '>') {
-					r_token.type = TK_OP_SHIFT_RIGHT;
-					str_ofs++;
-				} else {
-					r_token.type = TK_OP_GREATER;
-				}
-				return OK;
-			}
-			case '<': {
-				if (expression[str_ofs] == '=') {
-					r_token.type = TK_OP_LESS_EQUAL;
-					str_ofs++;
-				} else if (expression[str_ofs] == '<') {
-					r_token.type = TK_OP_SHIFT_LEFT;
-					str_ofs++;
-				} else {
-					r_token.type = TK_OP_LESS;
-				}
-				return OK;
-			}
-			case '+': {
-				r_token.type = TK_OP_ADD;
-				return OK;
-			}
-			case '-': {
-				r_token.type = TK_OP_SUB;
-				return OK;
-			}
-			case '/': {
-				r_token.type = TK_OP_DIV;
-				return OK;
-			}
-			case '*': {
-				r_token.type = TK_OP_MUL;
-				return OK;
-			}
-			case '%': {
-				r_token.type = TK_OP_MOD;
-				return OK;
-			}
-			case '&': {
-				if (expression[str_ofs] == '&') {
-					r_token.type = TK_OP_AND;
-					str_ofs++;
-				} else {
-					r_token.type = TK_OP_BIT_AND;
-				}
-				return OK;
-			}
-			case '|': {
-				if (expression[str_ofs] == '|') {
-					r_token.type = TK_OP_OR;
-					str_ofs++;
-				} else {
-					r_token.type = TK_OP_BIT_OR;
-				}
-				return OK;
-			}
-			case '^': {
-				invalid_character = true;
-				break;
-			}
-			case '~': {
-				invalid_character = true;
-				break;
-			}
-			case '\'': {
-				invalid_character = true;
-				break;
-			}
-			case '"': {
-				invalid_character = true;
-				break;
-			}
-			default: {
-				if (cchar <= 32) {
-					break;
-				}
-
-				char32_t next_char = (str_ofs >= expression.length()) ? 0 : expression[str_ofs];
-				if (is_digit(cchar)) {
-					//a number
-
-					String num;
-#define READING_SIGN 0
-#define READING_INT 1
-#define READING_HEX 2
-#define READING_BIN 3
-#define READING_DEC 4
-#define READING_EXP 5
-#define READING_DONE 6
-					int reading = READING_INT;
-
-					char32_t c = cchar;
-					bool exp_sign = false;
-					bool exp_beg = false;
-					bool bin_beg = false;
-					bool hex_beg = false;
-					bool is_float = false;
-					bool is_first_char = true;
-
-					while (true) {
-						switch (reading) {
-							case READING_INT: {
-								if (is_digit(c)) {
-									if (is_first_char && c == '0') {
-										if (next_char == 'b' || next_char == 'B') {
-											reading = READING_BIN;
-										} else if (next_char == 'x' || next_char == 'X') {
-											reading = READING_HEX;
-										}
-									}
-								} else if (c == '.') {
-									reading = READING_DEC;
-									is_float = true;
-								} else if (c == 'e' || c == 'E') {
-									reading = READING_EXP;
-									is_float = true;
-								} else {
-									reading = READING_DONE;
-								}
-								if (is_float) {
-									_set_error("Floating-point number operations are not supported by the shader preprocessor.");
-									r_token.type = TK_ERROR;
-									return ERR_PARSE_ERROR;
-								}
-							} break;
-							case READING_BIN: {
-								if (bin_beg && !is_binary_digit(c)) {
-									reading = READING_DONE;
-								} else if (c == 'b' || c == 'B') {
-									bin_beg = true;
-								}
-
-							} break;
-							case READING_HEX: {
-								if (hex_beg && !is_hex_digit(c)) {
-									reading = READING_DONE;
-								} else if (c == 'x' || c == 'X') {
-									hex_beg = true;
-								}
-
-							} break;
-							case READING_DEC: {
-								if (is_digit(c)) {
-								} else if (c == 'e' || c == 'E') {
-									reading = READING_EXP;
-								} else {
-									reading = READING_DONE;
-								}
-
-							} break;
-							case READING_EXP: {
-								if (is_digit(c)) {
-									exp_beg = true;
-
-								} else if ((c == '-' || c == '+') && !exp_sign && !exp_beg) {
-									exp_sign = true;
-
-								} else {
-									reading = READING_DONE;
-								}
-							} break;
-						}
-
-						if (reading == READING_DONE) {
-							break;
-						}
-						num += c;
-						c = GET_CHAR();
-						is_first_char = false;
-					}
-
-					if (c != 0) {
-						str_ofs--;
-					}
-
-					r_token.type = TK_CONSTANT;
-
-					if (is_float) {
-						r_token.value = num.to_float();
-					} else if (bin_beg) {
-						r_token.value = num.bin_to_int();
-					} else if (hex_beg) {
-						r_token.value = num.hex_to_int();
-					} else {
-						r_token.value = num.to_int();
-					}
-					return OK;
-
-				} else if (is_unicode_identifier_start(cchar)) {
-					String id = String::chr(cchar);
-					cchar = GET_CHAR();
-
-					while (is_unicode_identifier_continue(cchar)) {
-						id += cchar;
-						cchar = GET_CHAR();
-					}
-
-					str_ofs--; //go back one
-
-					if (id == "true") {
-						r_token.type = TK_CONSTANT;
-						r_token.value = true;
-					} else if (id == "false") {
-						r_token.type = TK_CONSTANT;
-						r_token.value = false;
-					} else {
-						r_token.type = TK_IDENTIFIER;
-						r_token.value = id;
-					}
-
-					return OK;
-				} else {
-					invalid_character = true;
-				}
-			}
-		}
-		if (invalid_character) {
-			_set_error("Unexpected character.");
-			r_token.type = TK_ERROR;
-			return ERR_PARSE_ERROR;
-		}
-#undef GET_CHAR
-	}
-
-	r_token.type = TK_ERROR;
-	return ERR_PARSE_ERROR;
-}
diff --git a/engine/servers/rendering/shader_expression.h b/engine/servers/rendering/shader_expression.h
deleted file mode 100644
index e7789f49..00000000
--- a/engine/servers/rendering/shader_expression.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************/
-/*  shader_expression.h                                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/math/expression.h"
-
-class ShaderExpression : public Expression {
-	GDCLASS(ShaderExpression, Expression);
-
-protected:
-	virtual Error _get_token(Token &r_token) override;
-};
diff --git a/engine/servers/rendering/shader_include_db.cpp b/engine/servers/rendering/shader_include_db.cpp
index 48403a22..bc62c1fe 100644
--- a/engine/servers/rendering/shader_include_db.cpp
+++ b/engine/servers/rendering/shader_include_db.cpp
@@ -30,8 +30,6 @@
 
 #include "shader_include_db.h"
 
-#include "core/object/class_db.h"
-
 HashMap<String, String> ShaderIncludeDB::built_in_includes;
 
 void ShaderIncludeDB::_bind_methods() {
diff --git a/engine/servers/rendering/shader_include_db.h b/engine/servers/rendering/shader_include_db.h
index 314ea0e4..c73e5bf1 100644
--- a/engine/servers/rendering/shader_include_db.h
+++ b/engine/servers/rendering/shader_include_db.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/object.h"
+#include "core/object/class_db.h"
 
 class ShaderIncludeDB : public Object {
 	GDCLASS(ShaderIncludeDB, Object)
diff --git a/engine/servers/rendering/shader_language.cpp b/engine/servers/rendering/shader_language.cpp
index b1c248a6..c577e5c7 100644
--- a/engine/servers/rendering/shader_language.cpp
+++ b/engine/servers/rendering/shader_language.cpp
@@ -30,14 +30,12 @@
 
 #include "shader_language.h"
 
-#include "core/config/engine.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rb_set.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "servers/rendering/shader_types.h"
+#include "shader_types.h"
 
 #define HAS_WARNING(flag) (warning_flags & flag)
 
@@ -222,10 +220,6 @@ const char *ShaderLanguage::token_names[TK_MAX] = {
 	"HINT_SCREEN_TEXTURE",
 	"HINT_NORMAL_ROUGHNESS_TEXTURE",
 	"HINT_DEPTH_TEXTURE",
-	"HINT_BLIT_SOURCE0",
-	"HINT_BLIT_SOURCE1",
-	"HINT_BLIT_SOURCE2",
-	"HINT_BLIT_SOURCE3",
 	"FILTER_NEAREST",
 	"FILTER_LINEAR",
 	"FILTER_NEAREST_MIPMAP",
@@ -398,11 +392,6 @@ const ShaderLanguage::KeyWord ShaderLanguage::keyword_list[] = {
 	{ TK_HINT_NORMAL_ROUGHNESS_TEXTURE, "hint_normal_roughness_texture", CF_UNSPECIFIED, {}, {} },
 	{ TK_HINT_DEPTH_TEXTURE, "hint_depth_texture", CF_UNSPECIFIED, {}, {} },
 
-	{ TK_HINT_BLIT_SOURCE0, "hint_blit_source0", CF_UNSPECIFIED, {}, {} },
-	{ TK_HINT_BLIT_SOURCE1, "hint_blit_source1", CF_UNSPECIFIED, {}, {} },
-	{ TK_HINT_BLIT_SOURCE2, "hint_blit_source2", CF_UNSPECIFIED, {}, {} },
-	{ TK_HINT_BLIT_SOURCE3, "hint_blit_source3", CF_UNSPECIFIED, {}, {} },
-
 	{ TK_FILTER_NEAREST, "filter_nearest", CF_UNSPECIFIED, {}, {} },
 	{ TK_FILTER_LINEAR, "filter_linear", CF_UNSPECIFIED, {}, {} },
 	{ TK_FILTER_NEAREST_MIPMAP, "filter_nearest_mipmap", CF_UNSPECIFIED, {}, {} },
@@ -1247,18 +1236,6 @@ String ShaderLanguage::get_uniform_hint_name(ShaderNode::Uniform::Hint p_hint) {
 		case ShaderNode::Uniform::HINT_DEPTH_TEXTURE: {
 			result = "hint_depth_texture";
 		} break;
-		case ShaderNode::Uniform::HINT_BLIT_SOURCE0: {
-			result = "hint_blit_source0";
-		} break;
-		case ShaderNode::Uniform::HINT_BLIT_SOURCE1: {
-			result = "hint_blit_source1";
-		} break;
-		case ShaderNode::Uniform::HINT_BLIT_SOURCE2: {
-			result = "hint_blit_source2";
-		} break;
-		case ShaderNode::Uniform::HINT_BLIT_SOURCE3: {
-			result = "hint_blit_source3";
-		} break;
 		default:
 			break;
 	}
@@ -1399,8 +1376,8 @@ void ShaderLanguage::_parse_used_identifier(const StringName &p_identifier, Iden
 
 bool ShaderLanguage::_find_identifier(const BlockNode *p_block, bool p_allow_reassign, const FunctionInfo &p_function_info, const StringName &p_identifier, DataType *r_data_type, IdentifierType *r_type, bool *r_is_const, int *r_array_size, StringName *r_struct_name, Vector<Scalar> *r_constant_values) {
 	if (is_shader_inc) {
-		for (int i = 0; i < RSE::SHADER_MAX; i++) {
-			for (const KeyValue<StringName, FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(i))) {
+		for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+			for (const KeyValue<StringName, FunctionInfo> &E : ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(i))) {
 				if ((current_function == E.key || E.key == "global" || E.key == "constants") && E.value.built_ins.has(p_identifier)) {
 					if (r_data_type) {
 						*r_data_type = E.value.built_ins[p_identifier].type;
@@ -3313,20 +3290,20 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
 
 	// textureGather
 
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, true },
-	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, true },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC2, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2D, TYPE_VEC2, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2DARRAY, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_IVEC4, { TYPE_ISAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_UVEC4, { TYPE_USAMPLER2DARRAY, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_VOID }, { "sampler", "coords" }, TAG_GLOBAL, false },
+	{ "textureGather", TYPE_VEC4, { TYPE_SAMPLERCUBE, TYPE_VEC3, TYPE_INT, TYPE_VOID }, { "sampler", "coords", "comp" }, TAG_GLOBAL, false },
 
 	// textureQueryLod
 
@@ -3648,36 +3625,8 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
 	int builtin_idx = 0;
 
 	if (argcount <= 4) {
-		// Test builtins.
+		// test builtins
 		int idx = 0;
-		int full_match_index = 0;
-
-		while (builtin_func_defs[idx].name) {
-			if (completion_class != builtin_func_defs[idx].tag) {
-				idx++;
-				continue;
-			}
-
-			if (name == builtin_func_defs[idx].name) {
-				bool fail = false;
-
-				for (int i = 0; i < argcount; i++) {
-					if (args[i] != builtin_func_defs[idx].args[i]) {
-						fail = true;
-						break;
-					}
-				}
-
-				if (!fail) {
-					// Full match.
-					full_match_index = idx;
-					break;
-				}
-			}
-
-			idx++;
-		}
-		idx = full_match_index;
 
 		while (builtin_func_defs[idx].name) {
 			if (completion_class != builtin_func_defs[idx].tag) {
@@ -3697,7 +3646,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
 						}
 					}
 					if (get_scalar_type(args[i]) == args[i] && p_func->arguments[i + 1]->type == Node::NODE_TYPE_CONSTANT && convert_constant(static_cast<ConstantNode *>(p_func->arguments[i + 1]), builtin_func_defs[idx].args[i])) {
-						// All good, but needs implicit conversion later.
+						//all good, but needs implicit conversion later
 					} else if (args[i] != builtin_func_defs[idx].args[i]) {
 						fail = true;
 						break;
@@ -3715,7 +3664,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
 				}
 
 				if (!fail && argcount < 4 && builtin_func_defs[idx].args[argcount] != TYPE_VOID) {
-					fail = true; // Make sure the number of arguments matches.
+					fail = true; //make sure the number of arguments matches
 				}
 
 				if (!fail) {
@@ -3750,7 +3699,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
 						}
 					}
 
-					// Make sure it's not an out argument used in the wrong way.
+					//make sure its not an out argument used in the wrong way
 					int outarg_idx = 0;
 					while (builtin_func_out_args[outarg_idx].name) {
 						if (String(name) == builtin_func_out_args[outarg_idx].name) {
@@ -3849,14 +3798,14 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, const FunctionI
 						}
 						outarg_idx++;
 					}
-					// Implicitly convert values if possible.
+					//implicitly convert values if possible
 					for (int i = 0; i < argcount; i++) {
 						if (get_scalar_type(args[i]) != args[i] || args[i] == builtin_func_defs[idx].args[i] || p_func->arguments[i + 1]->type != Node::NODE_TYPE_CONSTANT) {
-							// Can't do implicit conversion here.
+							//can't do implicit conversion here
 							continue;
 						}
 
-						// This is an implicit conversion.
+						//this is an implicit conversion
 						ConstantNode *constant = static_cast<ConstantNode *>(p_func->arguments[i + 1]);
 						ConstantNode *conversion = alloc_node<ConstantNode>();
 
@@ -8023,7 +7972,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
 			}
 		}
 
-		bool is_struct = shader->structs.has(tk.text) && !(p_block && _find_identifier(p_block, false, p_function_info, tk.text));
+		bool is_struct = shader->structs.has(tk.text);
 		bool is_var_init = false;
 		bool is_condition = false;
 
@@ -10080,42 +10029,6 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
 										return ERR_PARSE_ERROR;
 									}
 								} break;
-								case TK_HINT_BLIT_SOURCE0: {
-									new_hint = ShaderNode::Uniform::HINT_BLIT_SOURCE0;
-									--texture_uniforms;
-									--texture_binding;
-									if (shader_type_identifier != StringName() && String(shader_type_identifier) != "texture_blit") {
-										_set_error(vformat(RTR("'hint_blit_source' is not supported in '%s' shaders."), shader_type_identifier));
-										return ERR_PARSE_ERROR;
-									}
-								} break;
-								case TK_HINT_BLIT_SOURCE1: {
-									new_hint = ShaderNode::Uniform::HINT_BLIT_SOURCE1;
-									--texture_uniforms;
-									--texture_binding;
-									if (shader_type_identifier != StringName() && String(shader_type_identifier) != "texture_blit") {
-										_set_error(vformat(RTR("'hint_blit_source' is not supported in '%s' shaders."), shader_type_identifier));
-										return ERR_PARSE_ERROR;
-									}
-								} break;
-								case TK_HINT_BLIT_SOURCE2: {
-									new_hint = ShaderNode::Uniform::HINT_BLIT_SOURCE2;
-									--texture_uniforms;
-									--texture_binding;
-									if (shader_type_identifier != StringName() && String(shader_type_identifier) != "texture_blit") {
-										_set_error(vformat(RTR("'hint_blit_source' is not supported in '%s' shaders."), shader_type_identifier));
-										return ERR_PARSE_ERROR;
-									}
-								} break;
-								case TK_HINT_BLIT_SOURCE3: {
-									new_hint = ShaderNode::Uniform::HINT_BLIT_SOURCE3;
-									--texture_uniforms;
-									--texture_binding;
-									if (shader_type_identifier != StringName() && String(shader_type_identifier) != "texture_blit") {
-										_set_error(vformat(RTR("'hint_blit_source' is not supported in '%s' shaders."), shader_type_identifier));
-										return ERR_PARSE_ERROR;
-									}
-								} break;
 								case TK_FILTER_NEAREST: {
 									new_filter = FILTER_NEAREST;
 								} break;
@@ -11231,8 +11144,8 @@ Error ShaderLanguage::_parse_shader_mode(bool p_is_stencil, const Vector<ModeInf
 	bool found = false;
 
 	if (is_shader_inc) {
-		for (int i = 0; i < RSE::SHADER_MAX; i++) {
-			const Vector<ModeInfo> modes = p_is_stencil ? ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(i)) : ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(i));
+		for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+			const Vector<ModeInfo> modes = p_is_stencil ? ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(i)) : ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(i));
 
 			for (const ModeInfo &info : modes) {
 				const String name = String(info.name);
@@ -11516,8 +11429,8 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
 		} break;
 		case COMPLETION_RENDER_MODE: {
 			if (is_shader_inc) {
-				for (int i = 0; i < RSE::SHADER_MAX; i++) {
-					const Vector<ModeInfo> modes = ShaderTypes::get_singleton()->get_modes(RSE::ShaderMode(i));
+				for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+					const Vector<ModeInfo> modes = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(i));
 
 					for (int j = 0; j < modes.size(); j++) {
 						const ModeInfo &info = modes[j];
@@ -11581,8 +11494,8 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
 		} break;
 		case COMPLETION_STENCIL_MODE: {
 			if (is_shader_inc) {
-				for (int i = 0; i < RSE::SHADER_MAX; i++) {
-					const Vector<ModeInfo> modes = ShaderTypes::get_singleton()->get_stencil_modes(RSE::ShaderMode(i));
+				for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+					const Vector<ModeInfo> modes = ShaderTypes::get_singleton()->get_stencil_modes(RenderingServer::ShaderMode(i));
 
 					for (const ModeInfo &info : modes) {
 						if (!info.options.is_empty()) {
@@ -11702,8 +11615,8 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
 
 				if (comp_ident) {
 					if (is_shader_inc) {
-						for (int i = 0; i < RSE::SHADER_MAX; i++) {
-							const HashMap<StringName, ShaderLanguage::FunctionInfo> &info = ShaderTypes::get_singleton()->get_functions(RSE::ShaderMode(i));
+						for (int i = 0; i < RenderingServer::SHADER_MAX; i++) {
+							const HashMap<StringName, ShaderLanguage::FunctionInfo> info = ShaderTypes::get_singleton()->get_functions(RenderingServer::ShaderMode(i));
 
 							if (info.has("global")) {
 								for (const KeyValue<StringName, BuiltInInfo> &E : info["global"].built_ins) {
@@ -12159,10 +12072,6 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
 						options.push_back("hint_screen_texture");
 						options.push_back("hint_normal_roughness_texture");
 						options.push_back("hint_depth_texture");
-						options.push_back("hint_blit_source0");
-						options.push_back("hint_blit_source1");
-						options.push_back("hint_blit_source2");
-						options.push_back("hint_blit_source3");
 						options.push_back("source_color");
 					}
 				}
diff --git a/engine/servers/rendering/shader_language.h b/engine/servers/rendering/shader_language.h
index 63b64dcf..674ab5f2 100644
--- a/engine/servers/rendering/shader_language.h
+++ b/engine/servers/rendering/shader_language.h
@@ -38,9 +38,10 @@
 #include "core/templates/safe_refcount.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
+#include "scene/resources/shader_include.h"
 
 #ifdef DEBUG_ENABLED
-#include "servers/rendering/shader_warnings.h"
+#include "shader_warnings.h"
 #endif // DEBUG_ENABLED
 
 class ShaderLanguage {
@@ -183,10 +184,6 @@ public:
 		TK_HINT_SCREEN_TEXTURE,
 		TK_HINT_NORMAL_ROUGHNESS_TEXTURE,
 		TK_HINT_DEPTH_TEXTURE,
-		TK_HINT_BLIT_SOURCE0,
-		TK_HINT_BLIT_SOURCE1,
-		TK_HINT_BLIT_SOURCE2,
-		TK_HINT_BLIT_SOURCE3,
 		TK_FILTER_NEAREST,
 		TK_FILTER_LINEAR,
 		TK_FILTER_NEAREST_MIPMAP,
@@ -679,10 +676,6 @@ public:
 				HINT_DEFAULT_TRANSPARENT,
 				HINT_ANISOTROPY,
 				HINT_SCREEN_TEXTURE,
-				HINT_BLIT_SOURCE0,
-				HINT_BLIT_SOURCE1,
-				HINT_BLIT_SOURCE2,
-				HINT_BLIT_SOURCE3,
 				HINT_NORMAL_ROUGHNESS_TEXTURE,
 				HINT_DEPTH_TEXTURE,
 				HINT_MAX
diff --git a/engine/servers/rendering/shader_preprocessor.cpp b/engine/servers/rendering/shader_preprocessor.cpp
index 2cdb1442..e5ea5fff 100644
--- a/engine/servers/rendering/shader_preprocessor.cpp
+++ b/engine/servers/rendering/shader_preprocessor.cpp
@@ -29,10 +29,7 @@
 /**************************************************************************/
 
 #include "shader_preprocessor.h"
-
-#include "core/io/resource_loader.h"
-#include "core/os/os.h"
-#include "servers/rendering/shader_expression.h"
+#include "core/math/expression.h"
 
 const char32_t CURSOR = 0xFFFF;
 
@@ -494,7 +491,7 @@ void ShaderPreprocessor::process_elif(Tokenizer *p_tokenizer) {
 		return;
 	}
 
-	ShaderExpression expression;
+	Expression expression;
 	Vector<String> names;
 	error = expression.parse(body, names);
 	if (error != OK) {
@@ -615,7 +612,7 @@ void ShaderPreprocessor::process_if(Tokenizer *p_tokenizer) {
 		return;
 	}
 
-	ShaderExpression expression;
+	Expression expression;
 	Vector<String> names;
 	error = expression.parse(body, names);
 	if (error != OK) {
diff --git a/engine/servers/rendering/shader_preprocessor.h b/engine/servers/rendering/shader_preprocessor.h
index b3440fe4..f30b8ccc 100644
--- a/engine/servers/rendering/shader_preprocessor.h
+++ b/engine/servers/rendering/shader_preprocessor.h
@@ -30,12 +30,13 @@
 
 #pragma once
 
-#include "core/object/script_language.h"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
+
+#include "core/object/script_language.h"
 #include "scene/resources/shader_include.h"
 
 class ShaderPreprocessor {
diff --git a/engine/servers/rendering/shader_types.cpp b/engine/servers/rendering/shader_types.cpp
index 01856945..af6948c4 100644
--- a/engine/servers/rendering/shader_types.cpp
+++ b/engine/servers/rendering/shader_types.cpp
@@ -30,19 +30,17 @@
 
 #include "shader_types.h"
 
-#ifdef DEV_ENABLED
 #include "scene/resources/shader.h"
-#endif
 
-const HashMap<StringName, ShaderLanguage::FunctionInfo> &ShaderTypes::get_functions(RSE::ShaderMode p_mode) const {
+const HashMap<StringName, ShaderLanguage::FunctionInfo> &ShaderTypes::get_functions(RS::ShaderMode p_mode) const {
 	return shader_modes[p_mode].functions;
 }
 
-const Vector<ShaderLanguage::ModeInfo> &ShaderTypes::get_modes(RSE::ShaderMode p_mode) const {
+const Vector<ShaderLanguage::ModeInfo> &ShaderTypes::get_modes(RS::ShaderMode p_mode) const {
 	return shader_modes[p_mode].modes;
 }
 
-const Vector<ShaderLanguage::ModeInfo> &ShaderTypes::get_stencil_modes(RSE::ShaderMode p_mode) const {
+const Vector<ShaderLanguage::ModeInfo> &ShaderTypes::get_stencil_modes(RS::ShaderMode p_mode) const {
 	return shader_modes[p_mode].stencil_modes;
 }
 
@@ -78,248 +76,248 @@ ShaderTypes::ShaderTypes() {
 	ShaderLanguage::Scalar e_scalar;
 	e_scalar.real = Math::E;
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["global"].built_ins["EXPOSURE"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["global"].built_ins["IN_SHADOW_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["PI"] = constvt(ShaderLanguage::TYPE_FLOAT, { pi_scalar });
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["TAU"] = constvt(ShaderLanguage::TYPE_FLOAT, { tau_scalar });
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["E"] = constvt(ShaderLanguage::TYPE_FLOAT, { e_scalar });
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["OUTPUT_IS_SRGB"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["CLIP_SPACE_FAR"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["constants"].built_ins["IS_MULTIVIEW"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SPATIAL].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["global"].built_ins["EXPOSURE"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["global"].built_ins["IN_SHADOW_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["PI"] = constvt(ShaderLanguage::TYPE_FLOAT, { pi_scalar });
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["TAU"] = constvt(ShaderLanguage::TYPE_FLOAT, { tau_scalar });
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["E"] = constvt(ShaderLanguage::TYPE_FLOAT, { e_scalar });
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["OUTPUT_IS_SRGB"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["CLIP_SPACE_FAR"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["constants"].built_ins["IS_MULTIVIEW"] = constt(ShaderLanguage::TYPE_BOOL);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["TANGENT"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["BINORMAL"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["POSITION"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["UV"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["UV2"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["POINT_SIZE"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["Z_CLIP_SCALE"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["INSTANCE_ID"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["INSTANCE_CUSTOM"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VERTEX_ID"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["BONE_INDICES"] = constt(ShaderLanguage::TYPE_UVEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["BONE_WEIGHTS"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM0"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM1"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM2"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM3"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].can_discard = false;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].main_function = true;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["TANGENT"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["BINORMAL"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["POSITION"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["UV"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["UV2"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["POINT_SIZE"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["Z_CLIP_SCALE"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["INSTANCE_ID"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["INSTANCE_CUSTOM"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VERTEX_ID"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["BONE_INDICES"] = constt(ShaderLanguage::TYPE_UVEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["BONE_WEIGHTS"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM0"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM1"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM2"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CUSTOM3"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].can_discard = false;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].main_function = true;
 
 	//builtins
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["MODEL_NORMAL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["PROJECTION_MATRIX"] = ShaderLanguage::TYPE_MAT4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["MODELVIEW_MATRIX"] = ShaderLanguage::TYPE_MAT4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["MODELVIEW_NORMAL_MATRIX"] = ShaderLanguage::TYPE_MAT3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["MAIN_CAM_INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["MODEL_NORMAL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["PROJECTION_MATRIX"] = ShaderLanguage::TYPE_MAT4;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["MODELVIEW_MATRIX"] = ShaderLanguage::TYPE_MAT4;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["MODELVIEW_NORMAL_MATRIX"] = ShaderLanguage::TYPE_MAT3;
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["MAIN_CAM_INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["NODE_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_DIRECTION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_VISIBLE_LAYERS"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["NODE_POSITION_VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["NODE_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_DIRECTION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["CAMERA_VISIBLE_LAYERS"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["NODE_POSITION_VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_INDEX"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_MONO_LEFT"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_RIGHT"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["vertex"].built_ins["EYE_OFFSET"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_INDEX"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_MONO_LEFT"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["VIEW_RIGHT"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["vertex"].built_ins["EYE_OFFSET"] = constt(ShaderLanguage::TYPE_VEC3);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VERTEX"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["LIGHT_VERTEX"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["FRONT_FACING"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["TANGENT"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["BINORMAL"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL_MAP_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["BENT_NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["UV2"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALBEDO"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["PREMUL_ALPHA_FACTOR"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["METALLIC"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SPECULAR"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["RIM"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["RIM_TINT"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["CLEARCOAT"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["CLEARCOAT_ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY_FLOW"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_STRENGTH"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_BOOST"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["BACKLIGHT"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["AO"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["AO_LIGHT_AFFECT"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["EMISSION"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["DEPTH"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VERTEX"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["LIGHT_VERTEX"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["FRONT_FACING"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["TANGENT"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["BINORMAL"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["NORMAL_MAP_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["BENT_NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["UV2"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALBEDO"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["PREMUL_ALPHA_FACTOR"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["METALLIC"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SPECULAR"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["RIM"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["RIM_TINT"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["CLEARCOAT"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["CLEARCOAT_ROUGHNESS"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY_FLOW"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_STRENGTH"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_TRANSMITTANCE_BOOST"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["BACKLIGHT"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["AO"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["AO_LIGHT_AFFECT"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["EMISSION"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["DEPTH"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["NODE_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_DIRECTION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_VISIBLE_LAYERS"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["NODE_POSITION_VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["NODE_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_POSITION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_DIRECTION_WORLD"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["CAMERA_VISIBLE_LAYERS"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["NODE_POSITION_VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_INDEX"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_MONO_LEFT"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_RIGHT"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["EYE_OFFSET"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_INDEX"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_MONO_LEFT"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_RIGHT"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["EYE_OFFSET"] = constt(ShaderLanguage::TYPE_VEC3);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["MODEL_NORMAL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["FOG"] = ShaderLanguage::TYPE_VEC4; // TODO consider adding to light shader
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["RADIANCE"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["IRRADIANCE"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].can_discard = true;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].main_function = true;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["MODEL_NORMAL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT3);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["FOG"] = ShaderLanguage::TYPE_VEC4; // TODO consider adding to light shader
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["RADIANCE"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["IRRADIANCE"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].can_discard = true;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].main_function = true;
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_SCISSOR_THRESHOLD"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_HASH_SCALE"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_ANTIALIASING_EDGE"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_TEXTURE_COORDINATE"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_SCISSOR_THRESHOLD"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_HASH_SCALE"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_ANTIALIASING_EDGE"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA_TEXTURE_COORDINATE"] = ShaderLanguage::TYPE_VEC2;
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["INV_VIEW_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["INV_PROJECTION_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["VIEWPORT_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["UV2"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["SPECULAR_AMOUNT"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["LIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["LIGHT_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["LIGHT_IS_DIRECTIONAL"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["ATTENUATION"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["ALBEDO"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["BACKLIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["METALLIC"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["ROUGHNESS"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["DIFFUSE_LIGHT"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["SPECULAR_LIGHT"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["UV2"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["VIEW"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["SPECULAR_AMOUNT"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["LIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["LIGHT_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["LIGHT_IS_DIRECTIONAL"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ATTENUATION"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ALBEDO"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["BACKLIGHT"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["METALLIC"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ROUGHNESS"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["DIFFUSE_LIGHT"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["SPECULAR_LIGHT"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
 
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].can_discard = true;
-	shader_modes[RSE::SHADER_SPATIAL].functions["light"].main_function = true;
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].can_discard = true;
+	shader_modes[RS::SHADER_SPATIAL].functions["light"].main_function = true;
 
 	// spatial render modes
 	{
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premul_alpha" });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("depth_draw"), "opaque", "always", "never" });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("depth_prepass_alpha") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("depth_test"), { "default", "disabled", "inverted" } });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("sss_mode_skin") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("cull"), "back", "front", "disabled" });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("unshaded") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("wireframe") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("diffuse"), "lambert", "lambert_wrap", "burley", "toon" });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("specular"), "schlick_ggx", "toon", "disabled" });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("skip_vertex_transform") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("world_vertex_coords") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("ensure_correct_normals") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("shadows_disabled") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("ambient_light_disabled") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("shadow_to_opacity") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("vertex_lighting") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("particle_trails") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("alpha_to_coverage") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("alpha_to_coverage_and_one") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("debug_shadow_splits") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("fog_disabled") });
-		shader_modes[RSE::SHADER_SPATIAL].modes.push_back({ PNAME("specular_occlusion_disabled") });
-		shader_modes[RSE::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("read") });
-		shader_modes[RSE::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("write") });
-		shader_modes[RSE::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("write_depth_fail") });
-		shader_modes[RSE::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("compare"), { "always", "less", "equal", "less_or_equal", "greater", "not_equal", "greater_or_equal" } });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premul_alpha" });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_draw"), "opaque", "always", "never" });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_prepass_alpha") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_test"), { "default", "disabled", "inverted" } });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("sss_mode_skin") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("cull"), "back", "front", "disabled" });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("unshaded") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("wireframe") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("diffuse"), "lambert", "lambert_wrap", "burley", "toon" });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("specular"), "schlick_ggx", "toon", "disabled" });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("skip_vertex_transform") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("world_vertex_coords") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("ensure_correct_normals") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("shadows_disabled") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("ambient_light_disabled") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("shadow_to_opacity") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("vertex_lighting") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("particle_trails") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("alpha_to_coverage") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("alpha_to_coverage_and_one") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("debug_shadow_splits") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("fog_disabled") });
+		shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("specular_occlusion_disabled") });
+		shader_modes[RS::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("read") });
+		shader_modes[RS::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("write") });
+		shader_modes[RS::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("write_depth_fail") });
+		shader_modes[RS::SHADER_SPATIAL].stencil_modes.push_back({ PNAME("compare"), { "always", "less", "equal", "less_or_equal", "greater", "not_equal", "greater_or_equal" } });
 	}
 
 	/************ CANVAS ITEM **************************/
 
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
 
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["UV"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["POINT_SIZE"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["UV"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["POINT_SIZE"] = ShaderLanguage::TYPE_FLOAT;
 
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CANVAS_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["SCREEN_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["INSTANCE_CUSTOM"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["INSTANCE_ID"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["VERTEX_ID"] = constt(ShaderLanguage::TYPE_INT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["AT_LIGHT_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CUSTOM0"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CUSTOM1"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].can_discard = false;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["vertex"].main_function = true;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["MODEL_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CANVAS_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["SCREEN_MATRIX"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["INSTANCE_CUSTOM"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["INSTANCE_ID"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["VERTEX_ID"] = constt(ShaderLanguage::TYPE_INT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["AT_LIGHT_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CUSTOM0"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].built_ins["CUSTOM1"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].can_discard = false;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["vertex"].main_function = true;
 
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SHADOW_VERTEX"] = ShaderLanguage::TYPE_VEC2;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["LIGHT_VERTEX"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_MAP_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SPECULAR_SHININESS_TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SPECULAR_SHININESS"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["REGION_RECT"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SCREEN_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["AT_LIGHT_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].can_discard = true;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].main_function = true;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["VERTEX"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SHADOW_VERTEX"] = ShaderLanguage::TYPE_VEC2;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["LIGHT_VERTEX"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_MAP"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_MAP_DEPTH"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["NORMAL_TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SPECULAR_SHININESS_TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SPECULAR_SHININESS"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["REGION_RECT"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["SCREEN_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].built_ins["AT_LIGHT_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].can_discard = true;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].main_function = true;
 
 	{
 		ShaderLanguage::StageFunctionInfo func;
 		func.skip_function = "vertex";
 		func.arguments.push_back(ShaderLanguage::StageFunctionInfo::Argument("sdf_pos", ShaderLanguage::TYPE_VEC2));
 		func.return_type = ShaderLanguage::TYPE_FLOAT; //whether it could emit
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["texture_sdf"] = func;
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].stage_functions["texture_sdf"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["texture_sdf"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].stage_functions["texture_sdf"] = func;
 		func.return_type = ShaderLanguage::TYPE_VEC2; //whether it could emit
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["sdf_to_screen_uv"] = func;
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].stage_functions["sdf_to_screen_uv"] = func;
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["texture_sdf_normal"] = func;
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].stage_functions["texture_sdf_normal"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["sdf_to_screen_uv"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].stage_functions["sdf_to_screen_uv"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["texture_sdf_normal"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].stage_functions["texture_sdf_normal"] = func;
 	}
 
 	{
@@ -327,111 +325,111 @@ ShaderTypes::ShaderTypes() {
 		func.skip_function = "vertex";
 		func.arguments.push_back(ShaderLanguage::StageFunctionInfo::Argument("uv", ShaderLanguage::TYPE_VEC2));
 		func.return_type = ShaderLanguage::TYPE_VEC2; //whether it could emit
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["screen_uv_to_sdf"] = func;
-		shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].stage_functions["screen_uv_to_sdf"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["fragment"].stage_functions["screen_uv_to_sdf"] = func;
+		shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].stage_functions["screen_uv_to_sdf"] = func;
 	}
 
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["SPECULAR_SHININESS"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_IS_DIRECTIONAL"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_VERTEX"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["SHADOW_MODULATE"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].can_discard = true;
-	shader_modes[RSE::SHADER_CANVAS_ITEM].functions["light"].main_function = true;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["SPECULAR_SHININESS"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_IS_DIRECTIONAL"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT_VERTEX"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["LIGHT"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["SHADOW_MODULATE"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["TEXTURE"] = constt(ShaderLanguage::TYPE_SAMPLER2D);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["TEXTURE_PIXEL_SIZE"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].built_ins["POINT_COORD"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].can_discard = true;
+	shader_modes[RS::SHADER_CANVAS_ITEM].functions["light"].main_function = true;
 
 	// canvasitem render modes
 	{
-		shader_modes[RSE::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("skip_vertex_transform") });
-		shader_modes[RSE::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premul_alpha", "disabled" });
-		shader_modes[RSE::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("unshaded") });
-		shader_modes[RSE::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("light_only") });
-		shader_modes[RSE::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("world_vertex_coords") });
+		shader_modes[RS::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("skip_vertex_transform") });
+		shader_modes[RS::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premul_alpha", "disabled" });
+		shader_modes[RS::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("unshaded") });
+		shader_modes[RS::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("light_only") });
+		shader_modes[RS::SHADER_CANVAS_ITEM].modes.push_back({ PNAME("world_vertex_coords") });
 	}
 
 	/************ PARTICLES **************************/
 
-	shader_modes[RSE::SHADER_PARTICLES].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
 
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["VELOCITY"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["MASS"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["ACTIVE"] = ShaderLanguage::TYPE_BOOL;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["CUSTOM"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA1"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA2"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA3"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA4"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA5"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["USERDATA6"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["TRANSFORM"] = ShaderLanguage::TYPE_MAT4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["LIFETIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["DELTA"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["NUMBER"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["INDEX"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["EMISSION_TRANSFORM"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["EMITTER_VELOCITY"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["INTERPOLATE_TO_END"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RANDOM_SEED"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_POSITION"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_ROT_SCALE"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_VELOCITY"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_COLOR"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_CUSTOM"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RESTART_POSITION"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RESTART_ROT_SCALE"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RESTART_VELOCITY"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RESTART_COLOR"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["RESTART_CUSTOM"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].built_ins["AMOUNT_RATIO"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["start"].main_function = true;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["VELOCITY"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["MASS"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["ACTIVE"] = ShaderLanguage::TYPE_BOOL;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["CUSTOM"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA1"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA2"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA3"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA4"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA5"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["USERDATA6"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["TRANSFORM"] = ShaderLanguage::TYPE_MAT4;
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["LIFETIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["DELTA"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["NUMBER"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["INDEX"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["EMISSION_TRANSFORM"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["EMITTER_VELOCITY"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["INTERPOLATE_TO_END"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RANDOM_SEED"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_POSITION"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_ROT_SCALE"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_VELOCITY"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_COLOR"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["FLAG_EMIT_CUSTOM"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RESTART_POSITION"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RESTART_ROT_SCALE"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RESTART_VELOCITY"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RESTART_COLOR"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["RESTART_CUSTOM"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].built_ins["AMOUNT_RATIO"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["start"].main_function = true;
 
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["VELOCITY"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["MASS"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["ACTIVE"] = ShaderLanguage::TYPE_BOOL;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["RESTART"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["CUSTOM"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA1"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA2"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA3"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA4"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA5"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["USERDATA6"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["TRANSFORM"] = ShaderLanguage::TYPE_MAT4;
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["LIFETIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["DELTA"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["NUMBER"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["INDEX"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["EMISSION_TRANSFORM"] = constt(ShaderLanguage::TYPE_MAT4);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["EMITTER_VELOCITY"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["INTERPOLATE_TO_END"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["RANDOM_SEED"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_POSITION"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_ROT_SCALE"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_VELOCITY"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_COLOR"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_CUSTOM"] = constt(ShaderLanguage::TYPE_UINT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["COLLIDED"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["COLLISION_NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["COLLISION_DEPTH"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["ATTRACTOR_FORCE"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].built_ins["AMOUNT_RATIO"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_PARTICLES].functions["process"].main_function = true;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["VELOCITY"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["MASS"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["ACTIVE"] = ShaderLanguage::TYPE_BOOL;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["RESTART"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["CUSTOM"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA1"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA2"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA3"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA4"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA5"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["USERDATA6"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["TRANSFORM"] = ShaderLanguage::TYPE_MAT4;
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["LIFETIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["DELTA"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["NUMBER"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["INDEX"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["EMISSION_TRANSFORM"] = constt(ShaderLanguage::TYPE_MAT4);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["EMITTER_VELOCITY"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["INTERPOLATE_TO_END"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["RANDOM_SEED"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_POSITION"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_ROT_SCALE"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_VELOCITY"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_COLOR"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["FLAG_EMIT_CUSTOM"] = constt(ShaderLanguage::TYPE_UINT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["COLLIDED"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["COLLISION_NORMAL"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["COLLISION_DEPTH"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["ATTRACTOR_FORCE"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].built_ins["AMOUNT_RATIO"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_PARTICLES].functions["process"].main_function = true;
 
 	{
 		ShaderLanguage::StageFunctionInfo emit_vertex_func;
@@ -441,109 +439,85 @@ ShaderTypes::ShaderTypes() {
 		emit_vertex_func.arguments.push_back(ShaderLanguage::StageFunctionInfo::Argument("custom", ShaderLanguage::TYPE_VEC4));
 		emit_vertex_func.arguments.push_back(ShaderLanguage::StageFunctionInfo::Argument("flags", ShaderLanguage::TYPE_UINT));
 		emit_vertex_func.return_type = ShaderLanguage::TYPE_BOOL; //whether it could emit
-		shader_modes[RSE::SHADER_PARTICLES].functions["start"].stage_functions["emit_subparticle"] = emit_vertex_func;
-		shader_modes[RSE::SHADER_PARTICLES].functions["process"].stage_functions["emit_subparticle"] = emit_vertex_func;
+		shader_modes[RS::SHADER_PARTICLES].functions["start"].stage_functions["emit_subparticle"] = emit_vertex_func;
+		shader_modes[RS::SHADER_PARTICLES].functions["process"].stage_functions["emit_subparticle"] = emit_vertex_func;
 	}
 
 	// particles render modes
 	{
-		shader_modes[RSE::SHADER_PARTICLES].modes.push_back({ PNAME("collision_use_scale") });
-		shader_modes[RSE::SHADER_PARTICLES].modes.push_back({ PNAME("disable_force") });
-		shader_modes[RSE::SHADER_PARTICLES].modes.push_back({ PNAME("disable_velocity") });
-		shader_modes[RSE::SHADER_PARTICLES].modes.push_back({ PNAME("keep_data") });
+		shader_modes[RS::SHADER_PARTICLES].modes.push_back({ PNAME("collision_use_scale") });
+		shader_modes[RS::SHADER_PARTICLES].modes.push_back({ PNAME("disable_force") });
+		shader_modes[RS::SHADER_PARTICLES].modes.push_back({ PNAME("disable_velocity") });
+		shader_modes[RS::SHADER_PARTICLES].modes.push_back({ PNAME("keep_data") });
 	}
 
 	/************ SKY **************************/
 
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["RADIANCE"] = constt(ShaderLanguage::TYPE_SAMPLERCUBE);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["AT_HALF_RES_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["AT_QUARTER_RES_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["AT_CUBEMAP_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT0_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT0_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT0_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT0_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT0_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT1_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT1_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT1_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT1_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT1_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT2_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT2_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT2_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT2_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT2_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT3_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT3_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT3_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT3_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["global"].built_ins["LIGHT3_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["RADIANCE"] = constt(ShaderLanguage::TYPE_SAMPLERCUBE);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["AT_HALF_RES_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["AT_QUARTER_RES_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["AT_CUBEMAP_PASS"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT0_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT0_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT0_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT0_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT0_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT1_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT1_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT1_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT1_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT1_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT2_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT2_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT2_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT2_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT2_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT3_ENABLED"] = constt(ShaderLanguage::TYPE_BOOL);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT3_DIRECTION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT3_ENERGY"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT3_COLOR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["global"].built_ins["LIGHT3_SIZE"] = constt(ShaderLanguage::TYPE_FLOAT);
 
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["EYEDIR"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["SKY_COORDS"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["HALF_RES_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["QUARTER_RES_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
-	shader_modes[RSE::SHADER_SKY].functions["sky"].built_ins["FOG"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_SKY].functions["sky"].main_function = true;
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["COLOR"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["EYEDIR"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["SCREEN_UV"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["SKY_COORDS"] = constt(ShaderLanguage::TYPE_VEC2);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["HALF_RES_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["QUARTER_RES_COLOR"] = constt(ShaderLanguage::TYPE_VEC4);
+	shader_modes[RS::SHADER_SKY].functions["sky"].built_ins["FOG"] = ShaderLanguage::TYPE_VEC4;
+	shader_modes[RS::SHADER_SKY].functions["sky"].main_function = true;
 
 	// sky render modes
 	{
-		shader_modes[RSE::SHADER_SKY].modes.push_back({ PNAME("use_half_res_pass") });
-		shader_modes[RSE::SHADER_SKY].modes.push_back({ PNAME("use_quarter_res_pass") });
-		shader_modes[RSE::SHADER_SKY].modes.push_back({ PNAME("disable_fog") });
-		shader_modes[RSE::SHADER_SKY].modes.push_back({ PNAME("use_debanding") });
+		shader_modes[RS::SHADER_SKY].modes.push_back({ PNAME("use_half_res_pass") });
+		shader_modes[RS::SHADER_SKY].modes.push_back({ PNAME("use_quarter_res_pass") });
+		shader_modes[RS::SHADER_SKY].modes.push_back({ PNAME("disable_fog") });
+		shader_modes[RS::SHADER_SKY].modes.push_back({ PNAME("use_debanding") });
 	}
 
 	/************ FOG **************************/
 
-	shader_modes[RSE::SHADER_FOG].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_FOG].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_FOG].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_FOG].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_FOG].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_FOG].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_FOG].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_FOG].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
 
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["WORLD_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["OBJECT_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["UVW"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["SIZE"] = constt(ShaderLanguage::TYPE_VEC3);
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["SDF"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["ALBEDO"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["DENSITY"] = ShaderLanguage::TYPE_FLOAT;
-	shader_modes[RSE::SHADER_FOG].functions["fog"].built_ins["EMISSION"] = ShaderLanguage::TYPE_VEC3;
-	shader_modes[RSE::SHADER_FOG].functions["fog"].main_function = true;
-
-	/************ TEXTURE_BLIT **************************/
-
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["global"].built_ins["TIME"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["constants"].built_ins["PI"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["constants"].built_ins["TAU"] = constt(ShaderLanguage::TYPE_FLOAT);
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["constants"].built_ins["E"] = constt(ShaderLanguage::TYPE_FLOAT);
-
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["FRAGCOORD"] = constt(ShaderLanguage::TYPE_VEC4);
-
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["UV"] = constt(ShaderLanguage::TYPE_VEC2);
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["MODULATE"] = constt(ShaderLanguage::TYPE_VEC4);
-
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["COLOR0"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["COLOR1"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["COLOR2"] = ShaderLanguage::TYPE_VEC4;
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].built_ins["COLOR3"] = ShaderLanguage::TYPE_VEC4;
-
-	shader_modes[RSE::SHADER_TEXTURE_BLIT].functions["blit"].main_function = true;
-
-	// Texture Blit Modes
-	{
-		shader_modes[RSE::SHADER_TEXTURE_BLIT].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "disabled" });
-	}
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["WORLD_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["OBJECT_POSITION"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["UVW"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["SIZE"] = constt(ShaderLanguage::TYPE_VEC3);
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["SDF"] = constt(ShaderLanguage::TYPE_FLOAT);
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["ALBEDO"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["DENSITY"] = ShaderLanguage::TYPE_FLOAT;
+	shader_modes[RS::SHADER_FOG].functions["fog"].built_ins["EMISSION"] = ShaderLanguage::TYPE_VEC3;
+	shader_modes[RS::SHADER_FOG].functions["fog"].main_function = true;
 
 	// Must be kept in sync with the Shader::Mode enum.
 	shader_types_list.push_back("spatial");
@@ -551,7 +525,6 @@ ShaderTypes::ShaderTypes() {
 	shader_types_list.push_back("particles");
 	shader_types_list.push_back("sky");
 	shader_types_list.push_back("fog");
-	shader_types_list.push_back("texture_blit");
 	DEV_ASSERT(shader_types_list.size() == Shader::MODE_MAX);
 
 	for (const String &type : shader_types_list) {
diff --git a/engine/servers/rendering/shader_types.h b/engine/servers/rendering/shader_types.h
index d3fd1241..b9dc5b6e 100644
--- a/engine/servers/rendering/shader_types.h
+++ b/engine/servers/rendering/shader_types.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/shader_language.h"
+#include "servers/rendering/rendering_server.h"
+#include "shader_language.h"
 
 class ShaderTypes {
 	struct Type {
@@ -40,7 +40,7 @@ class ShaderTypes {
 		Vector<ShaderLanguage::ModeInfo> stencil_modes;
 	};
 
-	HashMap<RSE::ShaderMode, Type> shader_modes;
+	HashMap<RS::ShaderMode, Type> shader_modes;
 
 	static ShaderTypes *singleton;
 
@@ -50,9 +50,9 @@ class ShaderTypes {
 public:
 	static ShaderTypes *get_singleton() { return singleton; }
 
-	const HashMap<StringName, ShaderLanguage::FunctionInfo> &get_functions(RSE::ShaderMode p_mode) const;
-	const Vector<ShaderLanguage::ModeInfo> &get_modes(RSE::ShaderMode p_mode) const;
-	const Vector<ShaderLanguage::ModeInfo> &get_stencil_modes(RSE::ShaderMode p_mode) const;
+	const HashMap<StringName, ShaderLanguage::FunctionInfo> &get_functions(RS::ShaderMode p_mode) const;
+	const Vector<ShaderLanguage::ModeInfo> &get_modes(RS::ShaderMode p_mode) const;
+	const Vector<ShaderLanguage::ModeInfo> &get_stencil_modes(RS::ShaderMode p_mode) const;
 	const HashSet<String> &get_types() const;
 	const List<String> &get_types_list() const;
 
diff --git a/engine/servers/rendering/shader_warnings.cpp b/engine/servers/rendering/shader_warnings.cpp
index 0115b64e..1da61cf7 100644
--- a/engine/servers/rendering/shader_warnings.cpp
+++ b/engine/servers/rendering/shader_warnings.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "shader_warnings.h"
-
 #include "core/variant/variant.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/engine/servers/rendering/storage/camera_attributes_storage.cpp b/engine/servers/rendering/storage/camera_attributes_storage.cpp
index a8f00572..51921b0a 100644
--- a/engine/servers/rendering/storage/camera_attributes_storage.cpp
+++ b/engine/servers/rendering/storage/camera_attributes_storage.cpp
@@ -30,10 +30,6 @@
 
 #include "camera_attributes_storage.h"
 
-#ifdef DEBUG_ENABLED
-#include "core/os/os.h"
-#endif
-
 RendererCameraAttributes *RendererCameraAttributes::singleton = nullptr;
 uint64_t RendererCameraAttributes::auto_exposure_counter = 2;
 
@@ -57,12 +53,12 @@ void RendererCameraAttributes::camera_attributes_free(RID p_rid) {
 	camera_attributes_owner.free(p_rid);
 }
 
-void RendererCameraAttributes::camera_attributes_set_dof_blur_quality(RSE::DOFBlurQuality p_quality, bool p_use_jitter) {
+void RendererCameraAttributes::camera_attributes_set_dof_blur_quality(RS::DOFBlurQuality p_quality, bool p_use_jitter) {
 	dof_blur_quality = p_quality;
 	dof_blur_use_jitter = p_use_jitter;
 }
 
-void RendererCameraAttributes::camera_attributes_set_dof_blur_bokeh_shape(RSE::DOFBokehShape p_shape) {
+void RendererCameraAttributes::camera_attributes_set_dof_blur_bokeh_shape(RS::DOFBokehShape p_shape) {
 	dof_blur_bokeh_shape = p_shape;
 }
 
@@ -148,8 +144,8 @@ void RendererCameraAttributes::camera_attributes_set_auto_exposure(RID p_camera_
 		cam_attributes->auto_exposure_version = ++auto_exposure_counter;
 	}
 #ifdef DEBUG_ENABLED
-	if ((OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "mobile") && p_enable) {
-		WARN_PRINT_ONCE_ED("Auto-exposure is only available when using the Forward+ renderer.");
+	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" && p_enable) {
+		WARN_PRINT_ONCE_ED("Auto-exposure is only available when using the Forward+ or Mobile renderer.");
 	}
 #endif
 	cam_attributes->use_auto_exposure = p_enable;
diff --git a/engine/servers/rendering/storage/camera_attributes_storage.h b/engine/servers/rendering/storage/camera_attributes_storage.h
index e8afd981..d2de4af5 100644
--- a/engine/servers/rendering/storage/camera_attributes_storage.h
+++ b/engine/servers/rendering/storage/camera_attributes_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCameraAttributes {
 private:
@@ -58,8 +58,8 @@ private:
 		float dof_blur_amount = 0.1;
 	};
 
-	RSE::DOFBlurQuality dof_blur_quality = RSE::DOF_BLUR_QUALITY_MEDIUM;
-	RSE::DOFBokehShape dof_blur_bokeh_shape = RSE::DOF_BOKEH_HEXAGON;
+	RS::DOFBlurQuality dof_blur_quality = RS::DOF_BLUR_QUALITY_MEDIUM;
+	RS::DOFBokehShape dof_blur_bokeh_shape = RS::DOF_BOKEH_HEXAGON;
 	bool dof_blur_use_jitter = false;
 	static uint64_t auto_exposure_counter;
 
@@ -78,8 +78,8 @@ public:
 	void camera_attributes_initialize(RID p_rid);
 	void camera_attributes_free(RID p_rid);
 
-	void camera_attributes_set_dof_blur_quality(RSE::DOFBlurQuality p_quality, bool p_use_jitter);
-	void camera_attributes_set_dof_blur_bokeh_shape(RSE::DOFBokehShape p_shape);
+	void camera_attributes_set_dof_blur_quality(RS::DOFBlurQuality p_quality, bool p_use_jitter);
+	void camera_attributes_set_dof_blur_bokeh_shape(RS::DOFBokehShape p_shape);
 
 	void camera_attributes_set_dof_blur(RID p_camera_attributes, bool p_far_enable, float p_far_distance, float p_far_transition, bool p_near_enable, float p_near_distance, float p_near_transition, float p_amount);
 	bool camera_attributes_get_dof_far_enabled(RID p_camera_attributes);
@@ -112,11 +112,11 @@ public:
 		return cam_attributes && cam_attributes->use_auto_exposure;
 	}
 
-	_FORCE_INLINE_ RSE::DOFBlurQuality camera_attributes_get_dof_blur_quality() {
+	_FORCE_INLINE_ RS::DOFBlurQuality camera_attributes_get_dof_blur_quality() {
 		return dof_blur_quality;
 	}
 
-	_FORCE_INLINE_ RSE::DOFBokehShape camera_attributes_get_dof_blur_bokeh_shape() {
+	_FORCE_INLINE_ RS::DOFBokehShape camera_attributes_get_dof_blur_bokeh_shape() {
 		return dof_blur_bokeh_shape;
 	}
 
diff --git a/engine/servers/rendering/storage/compositor_storage.cpp b/engine/servers/rendering/storage/compositor_storage.cpp
index 0d7139aa..06b6b4cb 100644
--- a/engine/servers/rendering/storage/compositor_storage.cpp
+++ b/engine/servers/rendering/storage/compositor_storage.cpp
@@ -65,14 +65,14 @@ void RendererCompositorStorage::compositor_effect_free(RID p_rid) {
 	}
 
 	// Update motion vector count if needed.
-	if (effect->is_enabled && effect->flags.has_flag(RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS)) {
+	if (effect->is_enabled && effect->flags.has_flag(RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS)) {
 		num_compositor_effects_with_motion_vectors--;
 	}
 
 	compositor_effects_owner.free(p_rid);
 }
 
-void RendererCompositorStorage::compositor_effect_set_callback(RID p_effect, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) {
+void RendererCompositorStorage::compositor_effect_set_callback(RID p_effect, RS::CompositorEffectCallbackType p_callback_type, const Callable &p_callback) {
 	CompositorEffect *effect = compositor_effects_owner.get_or_null(p_effect);
 	ERR_FAIL_NULL(effect);
 
@@ -84,7 +84,7 @@ void RendererCompositorStorage::compositor_effect_set_enabled(RID p_effect, bool
 	CompositorEffect *effect = compositor_effects_owner.get_or_null(p_effect);
 	ERR_FAIL_NULL(effect);
 
-	if (effect->is_enabled != p_enabled && effect->flags.has_flag(RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS)) {
+	if (effect->is_enabled != p_enabled && effect->flags.has_flag(RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS)) {
 		if (p_enabled) {
 			num_compositor_effects_with_motion_vectors++;
 		} else {
@@ -102,9 +102,9 @@ bool RendererCompositorStorage::compositor_effect_get_enabled(RID p_effect) cons
 	return effect->is_enabled;
 }
 
-RSE::CompositorEffectCallbackType RendererCompositorStorage::compositor_effect_get_callback_type(RID p_effect) const {
+RS::CompositorEffectCallbackType RendererCompositorStorage::compositor_effect_get_callback_type(RID p_effect) const {
 	CompositorEffect *effect = compositor_effects_owner.get_or_null(p_effect);
-	ERR_FAIL_NULL_V(effect, RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_MAX);
+	ERR_FAIL_NULL_V(effect, RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_MAX);
 
 	return effect->callback_type;
 }
@@ -116,12 +116,12 @@ Callable RendererCompositorStorage::compositor_effect_get_callback(RID p_effect)
 	return effect->callback;
 }
 
-void RendererCompositorStorage::compositor_effect_set_flag(RID p_effect, RSE::CompositorEffectFlags p_flag, bool p_set) {
+void RendererCompositorStorage::compositor_effect_set_flag(RID p_effect, RS::CompositorEffectFlags p_flag, bool p_set) {
 	CompositorEffect *effect = compositor_effects_owner.get_or_null(p_effect);
 	ERR_FAIL_NULL(effect);
 
-	if (effect->is_enabled && p_flag == RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS) {
-		bool was_set = effect->flags.has_flag(RSE::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
+	if (effect->is_enabled && p_flag == RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS) {
+		bool was_set = effect->flags.has_flag(RS::CompositorEffectFlags::COMPOSITOR_EFFECT_FLAG_NEEDS_MOTION_VECTORS);
 
 		if (was_set != p_set) {
 			if (p_set) {
@@ -139,7 +139,7 @@ void RendererCompositorStorage::compositor_effect_set_flag(RID p_effect, RSE::Co
 	}
 }
 
-bool RendererCompositorStorage::compositor_effect_get_flag(RID p_effect, RSE::CompositorEffectFlags p_flag) const {
+bool RendererCompositorStorage::compositor_effect_get_flag(RID p_effect, RS::CompositorEffectFlags p_flag) const {
 	CompositorEffect *effect = compositor_effects_owner.get_or_null(p_effect);
 	ERR_FAIL_NULL_V(effect, false);
 
@@ -174,15 +174,15 @@ void RendererCompositorStorage::compositor_set_compositor_effects(RID p_composit
 	}
 }
 
-Vector<RID> RendererCompositorStorage::compositor_get_compositor_effects(RID p_compositor, RSE::CompositorEffectCallbackType p_callback_type, bool p_enabled_only) const {
+Vector<RID> RendererCompositorStorage::compositor_get_compositor_effects(RID p_compositor, RS::CompositorEffectCallbackType p_callback_type, bool p_enabled_only) const {
 	Compositor *compositor = compositor_owner.get_or_null(p_compositor);
 	ERR_FAIL_NULL_V(compositor, Vector<RID>());
 
-	if (p_enabled_only || p_callback_type != RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY) {
+	if (p_enabled_only || p_callback_type != RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY) {
 		Vector<RID> effects;
 
 		for (RID rid : compositor->compositor_effects) {
-			if ((!p_enabled_only || compositor_effect_get_enabled(rid)) && (p_callback_type == RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY || compositor_effect_get_callback_type(rid) == p_callback_type)) {
+			if ((!p_enabled_only || compositor_effect_get_enabled(rid)) && (p_callback_type == RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY || compositor_effect_get_callback_type(rid) == p_callback_type)) {
 				effects.push_back(rid);
 			}
 		}
diff --git a/engine/servers/rendering/storage/compositor_storage.h b/engine/servers/rendering/storage/compositor_storage.h
index 539fde8c..001b482d 100644
--- a/engine/servers/rendering/storage/compositor_storage.h
+++ b/engine/servers/rendering/storage/compositor_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererCompositorStorage {
 private:
@@ -41,10 +41,10 @@ private:
 	// Compositor effect
 	struct CompositorEffect {
 		bool is_enabled = true;
-		RSE::CompositorEffectCallbackType callback_type;
+		RS::CompositorEffectCallbackType callback_type;
 		Callable callback;
 
-		BitField<RSE::CompositorEffectFlags> flags = {};
+		BitField<RS::CompositorEffectFlags> flags = {};
 	};
 
 	mutable RID_Owner<CompositorEffect, true> compositor_effects_owner;
@@ -76,12 +76,12 @@ public:
 	void compositor_effect_set_enabled(RID p_effect, bool p_enabled);
 	bool compositor_effect_get_enabled(RID p_effect) const;
 
-	void compositor_effect_set_callback(RID p_effect, RSE::CompositorEffectCallbackType p_callback_type, const Callable &p_callback);
-	RSE::CompositorEffectCallbackType compositor_effect_get_callback_type(RID p_effect) const;
+	void compositor_effect_set_callback(RID p_effect, RS::CompositorEffectCallbackType p_callback_type, const Callable &p_callback);
+	RS::CompositorEffectCallbackType compositor_effect_get_callback_type(RID p_effect) const;
 	Callable compositor_effect_get_callback(RID p_effect) const;
 
-	void compositor_effect_set_flag(RID p_effect, RSE::CompositorEffectFlags p_flag, bool p_set);
-	bool compositor_effect_get_flag(RID p_effect, RSE::CompositorEffectFlags p_flag) const;
+	void compositor_effect_set_flag(RID p_effect, RS::CompositorEffectFlags p_flag, bool p_set);
+	bool compositor_effect_get_flag(RID p_effect, RS::CompositorEffectFlags p_flag) const;
 
 	// Compositor
 	RID compositor_allocate();
@@ -93,5 +93,5 @@ public:
 	}
 
 	void compositor_set_compositor_effects(RID p_compositor, const Vector<RID> &p_effects);
-	Vector<RID> compositor_get_compositor_effects(RID p_compositor, RSE::CompositorEffectCallbackType p_callback_type = RSE::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY, bool p_enabled_only = true) const;
+	Vector<RID> compositor_get_compositor_effects(RID p_compositor, RS::CompositorEffectCallbackType p_callback_type = RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY, bool p_enabled_only = true) const;
 };
diff --git a/engine/servers/rendering/storage/environment_storage.cpp b/engine/servers/rendering/storage/environment_storage.cpp
index 6ad85ed1..3efeca39 100644
--- a/engine/servers/rendering/storage/environment_storage.cpp
+++ b/engine/servers/rendering/storage/environment_storage.cpp
@@ -30,10 +30,6 @@
 
 #include "environment_storage.h"
 
-#ifdef DEBUG_ENABLED
-#include "core/os/os.h"
-#endif
-
 // Storage
 
 RendererEnvironmentStorage *RendererEnvironmentStorage::singleton = nullptr;
@@ -62,7 +58,7 @@ void RendererEnvironmentStorage::environment_free(RID p_rid) {
 
 // Background
 
-void RendererEnvironmentStorage::environment_set_background(RID p_env, RSE::EnvironmentBG p_bg) {
+void RendererEnvironmentStorage::environment_set_background(RID p_env, RS::EnvironmentBG p_bg) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 	env->background = p_bg;
@@ -105,7 +101,7 @@ void RendererEnvironmentStorage::environment_set_canvas_max_layer(RID p_env, int
 	env->canvas_max_layer = p_max_layer;
 }
 
-void RendererEnvironmentStorage::environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RSE::EnvironmentReflectionSource p_reflection_source) {
+void RendererEnvironmentStorage::environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RS::EnvironmentReflectionSource p_reflection_source) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 	env->ambient_light = p_color;
@@ -115,9 +111,9 @@ void RendererEnvironmentStorage::environment_set_ambient_light(RID p_env, const
 	env->reflection_source = p_reflection_source;
 }
 
-RSE::EnvironmentBG RendererEnvironmentStorage::environment_get_background(RID p_env) const {
+RS::EnvironmentBG RendererEnvironmentStorage::environment_get_background(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_BG_CLEAR_COLOR);
+	ERR_FAIL_NULL_V(env, RS::ENV_BG_CLEAR_COLOR);
 	return env->background;
 }
 
@@ -163,9 +159,9 @@ int RendererEnvironmentStorage::environment_get_canvas_max_layer(RID p_env) cons
 	return env->canvas_max_layer;
 }
 
-RSE::EnvironmentAmbientSource RendererEnvironmentStorage::environment_get_ambient_source(RID p_env) const {
+RS::EnvironmentAmbientSource RendererEnvironmentStorage::environment_get_ambient_source(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_AMBIENT_SOURCE_BG);
+	ERR_FAIL_NULL_V(env, RS::ENV_AMBIENT_SOURCE_BG);
 	return env->ambient_source;
 }
 
@@ -187,9 +183,9 @@ float RendererEnvironmentStorage::environment_get_ambient_sky_contribution(RID p
 	return env->ambient_sky_contribution;
 }
 
-RSE::EnvironmentReflectionSource RendererEnvironmentStorage::environment_get_reflection_source(RID p_env) const {
+RS::EnvironmentReflectionSource RendererEnvironmentStorage::environment_get_reflection_source(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_REFLECTION_SOURCE_BG);
+	ERR_FAIL_NULL_V(env, RS::ENV_REFLECTION_SOURCE_BG);
 	return env->reflection_source;
 }
 
@@ -207,7 +203,7 @@ int RendererEnvironmentStorage::environment_get_camera_feed_id(RID p_env) const
 
 // Tonemap
 
-void RendererEnvironmentStorage::environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) {
+void RendererEnvironmentStorage::environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 	env->exposure = p_exposure;
@@ -215,9 +211,9 @@ void RendererEnvironmentStorage::environment_set_tonemap(RID p_env, RSE::Environ
 	env->white = p_white;
 }
 
-RSE::EnvironmentToneMapper RendererEnvironmentStorage::environment_get_tone_mapper(RID p_env) const {
+RS::EnvironmentToneMapper RendererEnvironmentStorage::environment_get_tone_mapper(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_TONE_MAPPER_LINEAR);
+	ERR_FAIL_NULL_V(env, RS::ENV_TONE_MAPPER_LINEAR);
 	return env->tone_mapper;
 }
 
@@ -227,19 +223,21 @@ float RendererEnvironmentStorage::environment_get_exposure(RID p_env) const {
 	return env->exposure;
 }
 
-float RendererEnvironmentStorage::environment_get_white(RID p_env, bool p_limit_agx_white, float p_output_max_value) const {
+float RendererEnvironmentStorage::environment_get_white(RID p_env, bool p_limit_agx_white) const {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL_V(env, 1.0);
 
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0.
+
 	// Glow with screen blend mode does not work when white < 1.0, so make sure
 	// it is at least 1.0 for all tonemappers:
-	if (env->tone_mapper == RSE::ENV_TONE_MAPPER_LINEAR) {
-		return p_output_max_value;
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_FILMIC || env->tone_mapper == RSE::ENV_TONE_MAPPER_ACES) {
+	if (env->tone_mapper == RS::ENV_TONE_MAPPER_LINEAR) {
+		return output_max_value;
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_FILMIC || env->tone_mapper == RS::ENV_TONE_MAPPER_ACES) {
 		// Filmic and ACES only support SDR; their white is stable regardless
 		// of output_max_value.
 		return MAX(1.0, env->white);
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_AGX) {
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_AGX) {
 		// AgX works best with a high white. 2.0 is the minimum required for
 		// good behavior with Mobile rendering method.
 		if (p_limit_agx_white) {
@@ -249,7 +247,7 @@ float RendererEnvironmentStorage::environment_get_white(RID p_env, bool p_limit_
 			// Instead of constraining by matching the output_max_value, constrain
 			// by multiplying to ensure the desired non-uniform scaling behavior
 			// is maintained in the shoulder.
-			return agx_white * p_output_max_value;
+			return agx_white * output_max_value;
 		}
 	} else { // Reinhard
 		// The Reinhard tonemapper is not designed to have a white parameter
@@ -257,7 +255,7 @@ float RendererEnvironmentStorage::environment_get_white(RID p_env, bool p_limit_
 		// in the variable Extended Dynamic Range (EDR) paradigm where the
 		// output max value may change to be greater or less than the white
 		// parameter, depending on the available dynamic range.
-		return MAX(p_output_max_value, env->white);
+		return MAX(output_max_value, env->white);
 	}
 }
 
@@ -273,18 +271,20 @@ float RendererEnvironmentStorage::environment_get_tonemap_agx_contrast(RID p_env
 	return env->tonemap_agx_contrast;
 }
 
-RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white, float p_output_max_value) const {
+RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white) const {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL_V(env, TonemapParameters());
 
-	float white = environment_get_white(p_env, p_limit_agx_white, p_output_max_value);
+	const float output_max_value = 1.0; // SDR always has an output_max_value of 1.0.
+
+	float white = environment_get_white(p_env, p_limit_agx_white);
 	TonemapParameters tonemap_parameters = TonemapParameters();
 
-	if (env->tone_mapper == RSE::ENV_TONE_MAPPER_LINEAR) {
+	if (env->tone_mapper == RS::ENV_TONE_MAPPER_LINEAR) {
 		// Linear has no tonemapping parameters
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_REINHARD) {
-		tonemap_parameters.white_squared = (white * white) / p_output_max_value;
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_FILMIC) {
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_REINHARD) {
+		tonemap_parameters.white_squared = white * white;
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_FILMIC) {
 		// These constants must match those in the shader code.
 		// exposure_bias: Input scale (color *= bias, white *= bias) to make the brightness consistent with other tonemappers
 		// also useful to scale the input to the range that the tonemapper is designed for (some require very high input values).
@@ -298,7 +298,7 @@ RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::enviro
 		const float F = 0.30f;
 
 		tonemap_parameters.white_tonemapped = ((white * (A * white + C * B) + D * E) / (white * (A * white + B) + D * F)) - E / F;
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_ACES) {
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_ACES) {
 		// These constants must match those in the shader code.
 		const float exposure_bias = 1.8f;
 		const float A = 0.0245786f;
@@ -310,7 +310,7 @@ RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::enviro
 		white *= exposure_bias;
 		float white_tonemapped = (white * (white + A) - B) / (white * (C * white + D) + E);
 		tonemap_parameters.white_tonemapped = white_tonemapped;
-	} else if (env->tone_mapper == RSE::ENV_TONE_MAPPER_AGX) {
+	} else if (env->tone_mapper == RS::ENV_TONE_MAPPER_AGX) {
 		// Calculate allenwp tonemapping curve parameters on the CPU to improve shader performance.
 		// Source and details: https://allenwp.com/blog/2025/05/29/allenwp-tonemapping-curve/
 
@@ -319,7 +319,7 @@ RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::enviro
 		const float awp_crossover_point = 0.18;
 		// When output_max_value and/or awp_crossover_point are no longer constant, awp_shoulder_max can
 		// be calculated on the CPU and passed in as tonemap_parameters.tonemap_e.
-		const float awp_shoulder_max = p_output_max_value - awp_crossover_point;
+		const float awp_shoulder_max = output_max_value - awp_crossover_point;
 
 		float awp_high_clip = white;
 
@@ -345,7 +345,7 @@ RendererEnvironmentStorage::TonemapParameters RendererEnvironmentStorage::enviro
 
 // Fog
 
-void RendererEnvironmentStorage::environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_fog_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode) {
+void RendererEnvironmentStorage::environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_fog_aerial_perspective, float p_sky_affect, RS::EnvironmentFogMode p_mode) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 	env->fog_enabled = p_enable;
@@ -366,9 +366,9 @@ bool RendererEnvironmentStorage::environment_get_fog_enabled(RID p_env) const {
 	return env->fog_enabled;
 }
 
-RSE::EnvironmentFogMode RendererEnvironmentStorage::environment_get_fog_mode(RID p_env) const {
+RS::EnvironmentFogMode RendererEnvironmentStorage::environment_get_fog_mode(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_FOG_MODE_EXPONENTIAL);
+	ERR_FAIL_NULL_V(env, RS::ENV_FOG_MODE_EXPONENTIAL);
 	return env->fog_mode;
 }
 
@@ -553,7 +553,7 @@ float RendererEnvironmentStorage::environment_get_volumetric_fog_ambient_inject(
 
 // GLOW
 
-void RendererEnvironmentStorage::environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) {
+void RendererEnvironmentStorage::environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 	ERR_FAIL_COND_MSG(p_levels.size() != 7, "Size of array of glow levels must be 7");
@@ -607,9 +607,9 @@ float RendererEnvironmentStorage::environment_get_glow_mix(RID p_env) const {
 	return env->glow_mix;
 }
 
-RSE::EnvironmentGlowBlendMode RendererEnvironmentStorage::environment_get_glow_blend_mode(RID p_env) const {
+RS::EnvironmentGlowBlendMode RendererEnvironmentStorage::environment_get_glow_blend_mode(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_GLOW_BLEND_MODE_SCREEN);
+	ERR_FAIL_NULL_V(env, RS::ENV_GLOW_BLEND_MODE_SCREEN);
 	return env->glow_blend_mode;
 }
 
@@ -814,7 +814,7 @@ float RendererEnvironmentStorage::environment_get_ssil_normal_rejection(RID p_en
 
 // SDFGI
 
-void RendererEnvironmentStorage::environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) {
+void RendererEnvironmentStorage::environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) {
 	Environment *env = environment_owner.get_or_null(p_env);
 	ERR_FAIL_NULL(env);
 #ifdef DEBUG_ENABLED
@@ -888,9 +888,9 @@ float RendererEnvironmentStorage::environment_get_sdfgi_probe_bias(RID p_env) co
 	return env->sdfgi_probe_bias;
 }
 
-RSE::EnvironmentSDFGIYScale RendererEnvironmentStorage::environment_get_sdfgi_y_scale(RID p_env) const {
+RS::EnvironmentSDFGIYScale RendererEnvironmentStorage::environment_get_sdfgi_y_scale(RID p_env) const {
 	Environment *env = environment_owner.get_or_null(p_env);
-	ERR_FAIL_NULL_V(env, RSE::ENV_SDFGI_Y_SCALE_75_PERCENT);
+	ERR_FAIL_NULL_V(env, RS::ENV_SDFGI_Y_SCALE_75_PERCENT);
 	return env->sdfgi_y_scale;
 }
 
diff --git a/engine/servers/rendering/storage/environment_storage.h b/engine/servers/rendering/storage/environment_storage.h
index d188204b..d9d2a8d0 100644
--- a/engine/servers/rendering/storage/environment_storage.h
+++ b/engine/servers/rendering/storage/environment_storage.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/templates/rid_owner.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererEnvironmentStorage {
 public:
@@ -67,7 +67,7 @@ private:
 		// Not all renderers support all effects and should just ignore the bits they don't support.
 
 		// Background
-		RSE::EnvironmentBG background = RSE::ENV_BG_CLEAR_COLOR;
+		RS::EnvironmentBG background = RS::ENV_BG_CLEAR_COLOR;
 		RID sky;
 		float sky_custom_fov = 0.0;
 		Basis sky_orientation;
@@ -75,23 +75,22 @@ private:
 		float bg_energy_multiplier = 1.0;
 		float bg_intensity = 1.0; // Measured in nits or candela/m^2. Default to 1.0 so this doesn't impact rendering when Physical Light Units disabled.
 		int canvas_max_layer = 0;
-		RSE::EnvironmentAmbientSource ambient_source = RSE::ENV_AMBIENT_SOURCE_BG;
+		RS::EnvironmentAmbientSource ambient_source = RS::ENV_AMBIENT_SOURCE_BG;
 		Color ambient_light;
 		float ambient_light_energy = 1.0;
 		float ambient_sky_contribution = 1.0;
-		RSE::EnvironmentReflectionSource reflection_source = RSE::ENV_REFLECTION_SOURCE_BG;
+		RS::EnvironmentReflectionSource reflection_source = RS::ENV_REFLECTION_SOURCE_BG;
 		int camera_feed_id = 0;
 
 		// Tonemap
-		RSE::EnvironmentToneMapper tone_mapper;
+		RS::EnvironmentToneMapper tone_mapper;
 		float exposure = 1.0;
 		float white = 1.0;
 		float tonemap_agx_contrast = 1.25; // Default to approximately Blender's AgX contrast
-		float max_value = 1.0;
 
 		// Fog
 		bool fog_enabled = false;
-		RSE::EnvironmentFogMode fog_mode = RSE::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL;
+		RS::EnvironmentFogMode fog_mode = RS::EnvironmentFogMode::ENV_FOG_MODE_EXPONENTIAL;
 		Color fog_light_color = Color(0.518, 0.553, 0.608);
 		float fog_light_energy = 1.0;
 		float fog_sun_scatter = 0.0;
@@ -128,7 +127,7 @@ private:
 		float glow_strength = 1.0;
 		float glow_bloom = 0.0;
 		float glow_mix = 0.01;
-		RSE::EnvironmentGlowBlendMode glow_blend_mode = RSE::ENV_GLOW_BLEND_MODE_SCREEN;
+		RS::EnvironmentGlowBlendMode glow_blend_mode = RS::ENV_GLOW_BLEND_MODE_SCREEN;
 		float glow_hdr_bleed_threshold = 1.0;
 		float glow_hdr_luminance_cap = 12.0;
 		float glow_hdr_bleed_scale = 2.0;
@@ -170,7 +169,7 @@ private:
 		float sdfgi_energy = 1.0;
 		float sdfgi_normal_bias = 1.1;
 		float sdfgi_probe_bias = 1.1;
-		RSE::EnvironmentSDFGIYScale sdfgi_y_scale = RSE::ENV_SDFGI_Y_SCALE_75_PERCENT;
+		RS::EnvironmentSDFGIYScale sdfgi_y_scale = RS::ENV_SDFGI_Y_SCALE_75_PERCENT;
 
 		// Adjustments
 		bool adjustments_enabled = false;
@@ -199,18 +198,18 @@ public:
 	}
 
 	// Background
-	void environment_set_background(RID p_env, RSE::EnvironmentBG p_bg);
+	void environment_set_background(RID p_env, RS::EnvironmentBG p_bg);
 	void environment_set_sky(RID p_env, RID p_sky);
 	void environment_set_sky_custom_fov(RID p_env, float p_scale);
 	void environment_set_sky_orientation(RID p_env, const Basis &p_orientation);
 	void environment_set_bg_color(RID p_env, const Color &p_color);
 	void environment_set_bg_energy(RID p_env, float p_multiplier, float p_exposure_value);
 	void environment_set_canvas_max_layer(RID p_env, int p_max_layer);
-	void environment_set_ambient_light(RID p_env, const Color &p_color, RSE::EnvironmentAmbientSource p_ambient = RSE::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RSE::EnvironmentReflectionSource p_reflection_source = RSE::ENV_REFLECTION_SOURCE_BG);
+	void environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient = RS::ENV_AMBIENT_SOURCE_BG, float p_energy = 1.0, float p_sky_contribution = 0.0, RS::EnvironmentReflectionSource p_reflection_source = RS::ENV_REFLECTION_SOURCE_BG);
 	void environment_set_camera_feed_id(RID p_env, int p_camera_feed_id);
 	int environment_get_camera_feed_id(RID p_env) const;
 
-	RSE::EnvironmentBG environment_get_background(RID p_env) const;
+	RS::EnvironmentBG environment_get_background(RID p_env) const;
 	RID environment_get_sky(RID p_env) const;
 	float environment_get_sky_custom_fov(RID p_env) const;
 	Basis environment_get_sky_orientation(RID p_env) const;
@@ -218,25 +217,25 @@ public:
 	float environment_get_bg_energy_multiplier(RID p_env) const;
 	float environment_get_bg_intensity(RID p_env) const;
 	int environment_get_canvas_max_layer(RID p_env) const;
-	RSE::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const;
+	RS::EnvironmentAmbientSource environment_get_ambient_source(RID p_env) const;
 	Color environment_get_ambient_light(RID p_env) const;
 	float environment_get_ambient_light_energy(RID p_env) const;
 	float environment_get_ambient_sky_contribution(RID p_env) const;
-	RSE::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const;
+	RS::EnvironmentReflectionSource environment_get_reflection_source(RID p_env) const;
 
 	// Tonemap
-	void environment_set_tonemap(RID p_env, RSE::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white);
-	RSE::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const;
+	void environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white);
+	RS::EnvironmentToneMapper environment_get_tone_mapper(RID p_env) const;
 	float environment_get_exposure(RID p_env) const;
-	float environment_get_white(RID p_env, bool p_limit_agx_white, float p_output_max_value) const;
+	float environment_get_white(RID p_env, bool p_limit_agx_white) const;
 	void environment_set_tonemap_agx_contrast(RID p_env, float p_agx_contrast);
 	float environment_get_tonemap_agx_contrast(RID p_env) const;
-	TonemapParameters environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white, float p_output_max_value) const;
+	TonemapParameters environment_get_tonemap_parameters(RID p_env, bool p_limit_agx_white) const;
 
 	// Fog
-	void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RSE::EnvironmentFogMode p_mode);
+	void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective, float p_sky_affect, RS::EnvironmentFogMode p_mode);
 	bool environment_get_fog_enabled(RID p_env) const;
-	RSE::EnvironmentFogMode environment_get_fog_mode(RID p_env) const;
+	RS::EnvironmentFogMode environment_get_fog_mode(RID p_env) const;
 	Color environment_get_fog_light_color(RID p_env) const;
 	float environment_get_fog_light_energy(RID p_env) const;
 	float environment_get_fog_sun_scatter(RID p_env) const;
@@ -269,14 +268,14 @@ public:
 	float environment_get_volumetric_fog_ambient_inject(RID p_env) const;
 
 	// GLOW
-	void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RSE::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map);
+	void environment_set_glow(RID p_env, bool p_enable, Vector<float> p_levels, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap, float p_glow_map_strength, RID p_glow_map);
 	bool environment_get_glow_enabled(RID p_env) const;
 	Vector<float> environment_get_glow_levels(RID p_env) const;
 	float environment_get_glow_intensity(RID p_env) const;
 	float environment_get_glow_strength(RID p_env) const;
 	float environment_get_glow_bloom(RID p_env) const;
 	float environment_get_glow_mix(RID p_env) const;
-	RSE::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const;
+	RS::EnvironmentGlowBlendMode environment_get_glow_blend_mode(RID p_env) const;
 	float environment_get_glow_hdr_bleed_threshold(RID p_env) const;
 	float environment_get_glow_hdr_luminance_cap(RID p_env) const;
 	float environment_get_glow_hdr_bleed_scale(RID p_env) const;
@@ -312,7 +311,7 @@ public:
 	float environment_get_ssil_normal_rejection(RID p_env) const;
 
 	// SDFGI
-	void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RSE::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias);
+	void environment_set_sdfgi(RID p_env, bool p_enable, int p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, float p_bounce_feedback, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias);
 	bool environment_get_sdfgi_enabled(RID p_env) const;
 	int environment_get_sdfgi_cascades(RID p_env) const;
 	float environment_get_sdfgi_min_cell_size(RID p_env) const;
@@ -322,7 +321,7 @@ public:
 	float environment_get_sdfgi_energy(RID p_env) const;
 	float environment_get_sdfgi_normal_bias(RID p_env) const;
 	float environment_get_sdfgi_probe_bias(RID p_env) const;
-	RSE::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const;
+	RS::EnvironmentSDFGIYScale environment_get_sdfgi_y_scale(RID p_env) const;
 
 	// Adjustment
 	void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, bool p_use_1d_color_correction, RID p_color_correction);
diff --git a/engine/servers/rendering/storage/light_storage.h b/engine/servers/rendering/storage/light_storage.h
index fb7af2dc..956e6324 100644
--- a/engine/servers/rendering/storage/light_storage.h
+++ b/engine/servers/rendering/storage/light_storage.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
+#include "render_scene_buffers.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererLightStorage {
 public:
@@ -51,7 +51,7 @@ public:
 	virtual void light_free(RID p_rid) = 0;
 
 	virtual void light_set_color(RID p_light, const Color &p_color) = 0;
-	virtual void light_set_param(RID p_light, RSE::LightParam p_param, float p_value) = 0;
+	virtual void light_set_param(RID p_light, RS::LightParam p_param, float p_value) = 0;
 	virtual void light_set_shadow(RID p_light, bool p_enabled) = 0;
 	virtual void light_set_projector(RID p_light, RID p_texture) = 0;
 	virtual void light_set_negative(RID p_light, bool p_enable) = 0;
@@ -60,30 +60,30 @@ public:
 	virtual void light_set_reverse_cull_face_mode(RID p_light, bool p_enabled) = 0;
 	virtual void light_set_shadow_caster_mask(RID p_light, uint32_t p_caster_mask) = 0;
 	virtual uint32_t light_get_shadow_caster_mask(RID p_light) const = 0;
-	virtual void light_set_bake_mode(RID p_light, RSE::LightBakeMode p_bake_mode) = 0;
+	virtual void light_set_bake_mode(RID p_light, RS::LightBakeMode p_bake_mode) = 0;
 	virtual void light_set_max_sdfgi_cascade(RID p_light, uint32_t p_cascade) = 0;
 
-	virtual void light_omni_set_shadow_mode(RID p_light, RSE::LightOmniShadowMode p_mode) = 0;
+	virtual void light_omni_set_shadow_mode(RID p_light, RS::LightOmniShadowMode p_mode) = 0;
 
-	virtual void light_directional_set_shadow_mode(RID p_light, RSE::LightDirectionalShadowMode p_mode) = 0;
+	virtual void light_directional_set_shadow_mode(RID p_light, RS::LightDirectionalShadowMode p_mode) = 0;
 	virtual void light_directional_set_blend_splits(RID p_light, bool p_enable) = 0;
 	virtual bool light_directional_get_blend_splits(RID p_light) const = 0;
-	virtual void light_directional_set_sky_mode(RID p_light, RSE::LightDirectionalSkyMode p_mode) = 0;
-	virtual RSE::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const = 0;
+	virtual void light_directional_set_sky_mode(RID p_light, RS::LightDirectionalSkyMode p_mode) = 0;
+	virtual RS::LightDirectionalSkyMode light_directional_get_sky_mode(RID p_light) const = 0;
 
-	virtual RSE::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) = 0;
-	virtual RSE::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) = 0;
+	virtual RS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) = 0;
+	virtual RS::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) = 0;
 
 	virtual bool light_has_shadow(RID p_light) const = 0;
 
 	virtual bool light_has_projector(RID p_light) const = 0;
 
-	virtual RSE::LightType light_get_type(RID p_light) const = 0;
+	virtual RS::LightType light_get_type(RID p_light) const = 0;
 	virtual AABB light_get_aabb(RID p_light) const = 0;
-	virtual float light_get_param(RID p_light, RSE::LightParam p_param) = 0;
+	virtual float light_get_param(RID p_light, RS::LightParam p_param) = 0;
 	virtual Color light_get_color(RID p_light) = 0;
 	virtual bool light_get_reverse_cull_face_mode(RID p_light) const = 0;
-	virtual RSE::LightBakeMode light_get_bake_mode(RID p_light) = 0;
+	virtual RS::LightBakeMode light_get_bake_mode(RID p_light) = 0;
 	virtual uint32_t light_get_max_sdfgi_cascade(RID p_light) = 0;
 	virtual uint64_t light_get_version(RID p_light) const = 0;
 	virtual uint32_t light_get_cull_mask(RID p_light) const = 0;
@@ -107,11 +107,11 @@ public:
 	virtual void reflection_probe_initialize(RID p_rid) = 0;
 	virtual void reflection_probe_free(RID p_rid) = 0;
 
-	virtual void reflection_probe_set_update_mode(RID p_probe, RSE::ReflectionProbeUpdateMode p_mode) = 0;
+	virtual void reflection_probe_set_update_mode(RID p_probe, RS::ReflectionProbeUpdateMode p_mode) = 0;
 	virtual void reflection_probe_set_resolution(RID p_probe, int p_resolution) = 0;
 	virtual void reflection_probe_set_intensity(RID p_probe, float p_intensity) = 0;
 	virtual void reflection_probe_set_blend_distance(RID p_probe, float p_blend_distance) = 0;
-	virtual void reflection_probe_set_ambient_mode(RID p_probe, RSE::ReflectionProbeAmbientMode p_mode) = 0;
+	virtual void reflection_probe_set_ambient_mode(RID p_probe, RS::ReflectionProbeAmbientMode p_mode) = 0;
 	virtual void reflection_probe_set_ambient_color(RID p_probe, const Color &p_color) = 0;
 	virtual void reflection_probe_set_ambient_energy(RID p_probe, float p_energy) = 0;
 	virtual void reflection_probe_set_max_distance(RID p_probe, float p_distance) = 0;
@@ -125,7 +125,7 @@ public:
 	virtual void reflection_probe_set_mesh_lod_threshold(RID p_probe, float p_ratio) = 0;
 
 	virtual AABB reflection_probe_get_aabb(RID p_probe) const = 0;
-	virtual RSE::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const = 0;
+	virtual RS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const = 0;
 	virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const = 0;
 	virtual uint32_t reflection_probe_get_reflection_mask(RID p_probe) const = 0;
 	virtual Vector3 reflection_probe_get_size(RID p_probe) const = 0;
@@ -177,8 +177,8 @@ public:
 	virtual float lightmap_get_probe_capture_update_speed() const = 0;
 
 	virtual void lightmap_set_shadowmask_textures(RID p_lightmap, RID p_shadow) = 0;
-	virtual RSE::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) = 0;
-	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RSE::ShadowmaskMode p_mode) = 0;
+	virtual RS::ShadowmaskMode lightmap_get_shadowmask_mode(RID p_lightmap) = 0;
+	virtual void lightmap_set_shadowmask_mode(RID p_lightmap, RS::ShadowmaskMode p_mode) = 0;
 
 	/* LIGHTMAP INSTANCE */
 
diff --git a/engine/servers/rendering/storage/material_storage.h b/engine/servers/rendering/storage/material_storage.h
index 2c30cade..c38b6d68 100644
--- a/engine/servers/rendering/storage/material_storage.h
+++ b/engine/servers/rendering/storage/material_storage.h
@@ -30,23 +30,22 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-#include "servers/rendering/storage/utilities.h"
+#include "servers/rendering/rendering_server.h"
+#include "utilities.h"
 
 class RendererMaterialStorage {
 public:
 	virtual ~RendererMaterialStorage() {}
 
 	/* GLOBAL SHADER UNIFORM API */
-	virtual void global_shader_parameter_add(const StringName &p_name, RSE::GlobalShaderParameterType p_type, const Variant &p_value) = 0;
+	virtual void global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) = 0;
 	virtual void global_shader_parameter_remove(const StringName &p_name) = 0;
 	virtual Vector<StringName> global_shader_parameter_get_list() const = 0;
 
 	virtual void global_shader_parameter_set(const StringName &p_name, const Variant &p_value) = 0;
 	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) = 0;
 	virtual Variant global_shader_parameter_get(const StringName &p_name) const = 0;
-	virtual RSE::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const = 0;
+	virtual RS::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const = 0;
 
 	virtual void global_shader_parameters_load_settings(bool p_load_textures = true) = 0;
 	virtual void global_shader_parameters_clear() = 0;
@@ -69,7 +68,7 @@ public:
 	virtual RID shader_get_default_texture_parameter(RID p_shader, const StringName &p_name, int p_index) const = 0;
 	virtual Variant shader_get_parameter_default(RID p_material, const StringName &p_param) const = 0;
 
-	virtual RenderingServerTypes::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const = 0;
+	virtual RS::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const = 0;
 	virtual void shader_embedded_set_lock() = 0;
 	virtual const HashSet<RID> &shader_embedded_set_get() const = 0;
 	virtual void shader_embedded_set_unlock() = 0;
@@ -90,7 +89,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) = 0;
 	virtual bool material_casts_shadows(RID p_material) = 0;
-	virtual RSE::CullMode material_get_cull_mode(RID p_material) const = 0;
+	virtual RS::CullMode material_get_cull_mode(RID p_material) const = 0;
 
 	struct InstanceShaderParam {
 		PropertyInfo info;
diff --git a/engine/servers/rendering/storage/mesh_storage.cpp b/engine/servers/rendering/storage/mesh_storage.cpp
index a2ab8d53..c2829813 100644
--- a/engine/servers/rendering/storage/mesh_storage.cpp
+++ b/engine/servers/rendering/storage/mesh_storage.cpp
@@ -30,9 +30,12 @@
 
 #include "mesh_storage.h"
 
-#include "core/config/engine.h"
 #include "core/math/transform_interpolator.h"
 
+#if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
+#include "core/config/project_settings.h"
+#endif
+
 RID RendererMeshStorage::multimesh_allocate() {
 	return _multimesh_allocate();
 }
@@ -45,7 +48,7 @@ void RendererMeshStorage::multimesh_free(RID p_rid) {
 	_multimesh_free(p_rid);
 }
 
-void RendererMeshStorage::multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
+void RendererMeshStorage::multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data, bool p_use_indirect) {
 	MultiMeshInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
 	if (mmi) {
 		mmi->_transform_format = p_transform_format;
@@ -53,7 +56,7 @@ void RendererMeshStorage::multimesh_allocate_data(RID p_multimesh, int p_instanc
 		mmi->_use_custom_data = p_use_custom_data;
 		mmi->_num_instances = p_instances;
 
-		mmi->_vf_size_xform = p_transform_format == RSE::MULTIMESH_TRANSFORM_2D ? 8 : 12;
+		mmi->_vf_size_xform = p_transform_format == RS::MULTIMESH_TRANSFORM_2D ? 8 : 12;
 		mmi->_vf_size_color = p_use_colors ? 4 : 0;
 		mmi->_vf_size_data = p_use_custom_data ? 4 : 0;
 
@@ -234,7 +237,7 @@ Color RendererMeshStorage::multimesh_instance_get_custom_data(RID p_multimesh, i
 void RendererMeshStorage::multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_buffer) {
 	MultiMeshInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
 	if (mmi && mmi->interpolated) {
-		ERR_FAIL_COND_MSG(p_buffer.size() != mmi->_data_curr.size(), "Buffer should have " + itos(mmi->_data_curr.size()) + " elements, got " + itos(p_buffer.size()) + " instead.");
+		ERR_FAIL_COND_MSG(p_buffer.size() != mmi->_data_curr.size(), vformat("Buffer should have %d elements, got %d instead.", mmi->_data_curr.size(), p_buffer.size()));
 
 		mmi->_data_curr = p_buffer;
 		_multimesh_add_to_interpolation_lists(p_multimesh, *mmi);
@@ -266,8 +269,8 @@ Vector<float> RendererMeshStorage::multimesh_get_buffer(RID p_multimesh) const {
 void RendererMeshStorage::multimesh_set_buffer_interpolated(RID p_multimesh, const Vector<float> &p_buffer, const Vector<float> &p_buffer_prev) {
 	MultiMeshInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
 	if (mmi) {
-		ERR_FAIL_COND_MSG(p_buffer.size() != mmi->_data_curr.size(), "Buffer for current frame should have " + itos(mmi->_data_curr.size()) + " elements, got " + itos(p_buffer.size()) + " instead.");
-		ERR_FAIL_COND_MSG(p_buffer_prev.size() != mmi->_data_prev.size(), "Buffer for previous frame should have " + itos(mmi->_data_prev.size()) + " elements, got " + itos(p_buffer_prev.size()) + " instead.");
+		ERR_FAIL_COND_MSG(p_buffer.size() != mmi->_data_curr.size(), vformat("Buffer for current frame should have %d elements, got %d instead.", mmi->_data_curr.size(), p_buffer.size()));
+		ERR_FAIL_COND_MSG(p_buffer_prev.size() != mmi->_data_prev.size(), vformat("Buffer for previous frame should have %d elements, got %d instead.", mmi->_data_prev.size(), p_buffer_prev.size()));
 
 		// We are assuming that mmi->interpolated is the case. (Can possibly assert this?)
 		// Even if this flag hasn't been set - just calling this function suggests interpolation is desired.
@@ -303,7 +306,7 @@ void RendererMeshStorage::multimesh_set_physics_interpolated(RID p_multimesh, bo
 	}
 }
 
-void RendererMeshStorage::multimesh_set_physics_interpolation_quality(RID p_multimesh, RSE::MultimeshPhysicsInterpolationQuality p_quality) {
+void RendererMeshStorage::multimesh_set_physics_interpolation_quality(RID p_multimesh, RS::MultimeshPhysicsInterpolationQuality p_quality) {
 	ERR_FAIL_COND((p_quality < 0) || (p_quality > 1));
 	MultiMeshInterpolator *mmi = _multimesh_get_interpolator(p_multimesh);
 	if (mmi) {
diff --git a/engine/servers/rendering/storage/mesh_storage.h b/engine/servers/rendering/storage/mesh_storage.h
index bbbaebd6..153750bf 100644
--- a/engine/servers/rendering/storage/mesh_storage.h
+++ b/engine/servers/rendering/storage/mesh_storage.h
@@ -30,12 +30,8 @@
 
 #pragma once
 
-#include "core/math/color.h"
-#include "core/math/transform_2d.h"
-#include "core/templates/local_vector.h"
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
-#include "servers/rendering/storage/utilities.h"
+#include "servers/rendering/rendering_server.h"
+#include "utilities.h"
 
 class RendererMeshStorage {
 public:
@@ -50,12 +46,12 @@ public:
 	virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) = 0;
 
 	/// Returns stride
-	virtual void mesh_add_surface(RID p_mesh, const RenderingServerTypes::SurfaceData &p_surface) = 0;
+	virtual void mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) = 0;
 
 	virtual int mesh_get_blend_shape_count(RID p_mesh) const = 0;
 
-	virtual void mesh_set_blend_shape_mode(RID p_mesh, RSE::BlendShapeMode p_mode) = 0;
-	virtual RSE::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const = 0;
+	virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) = 0;
+	virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const = 0;
 
 	virtual void mesh_surface_update_vertex_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) = 0;
 	virtual void mesh_surface_update_attribute_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) = 0;
@@ -65,7 +61,7 @@ public:
 	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material) = 0;
 	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const = 0;
 
-	virtual RenderingServerTypes::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const = 0;
+	virtual RS::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const = 0;
 
 	virtual int mesh_get_surface_count(RID p_mesh) const = 0;
 
@@ -81,7 +77,7 @@ public:
 	virtual void mesh_surface_remove(RID p_mesh, int p_surface) = 0;
 	virtual void mesh_clear(RID p_mesh) = 0;
 
-	virtual void mesh_debug_usage(List<RenderingServerTypes::MeshInfo> *r_info) = 0;
+	virtual void mesh_debug_usage(List<RS::MeshInfo> *r_info) = 0;
 
 	virtual bool mesh_needs_instance(RID p_mesh, bool p_has_skeleton) = 0;
 
@@ -97,7 +93,7 @@ public:
 
 	/* MULTIMESH API */
 	struct MultiMeshInterpolator {
-		RSE::MultimeshTransformFormat _transform_format = RSE::MULTIMESH_TRANSFORM_3D;
+		RS::MultimeshTransformFormat _transform_format = RS::MULTIMESH_TRANSFORM_3D;
 		bool _use_colors = false;
 		bool _use_custom_data = false;
 
@@ -127,7 +123,7 @@ public:
 	virtual void multimesh_initialize(RID p_rid);
 	virtual void multimesh_free(RID p_rid);
 
-	virtual void multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false);
+	virtual void multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false);
 
 	virtual int multimesh_get_instance_count(RID p_multimesh) const;
 
@@ -154,7 +150,7 @@ public:
 
 	virtual void multimesh_set_buffer_interpolated(RID p_multimesh, const Vector<float> &p_buffer, const Vector<float> &p_buffer_prev);
 	virtual void multimesh_set_physics_interpolated(RID p_multimesh, bool p_interpolated);
-	virtual void multimesh_set_physics_interpolation_quality(RID p_multimesh, RSE::MultimeshPhysicsInterpolationQuality p_quality);
+	virtual void multimesh_set_physics_interpolation_quality(RID p_multimesh, RS::MultimeshPhysicsInterpolationQuality p_quality);
 	virtual void multimesh_instance_reset_physics_interpolation(RID p_multimesh, int p_index);
 	virtual void multimesh_instances_reset_physics_interpolation(RID p_multimesh);
 
@@ -167,7 +163,7 @@ public:
 	virtual void _multimesh_initialize(RID p_rid) = 0;
 	virtual void _multimesh_free(RID p_rid) = 0;
 
-	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) = 0;
+	virtual void _multimesh_allocate_data(RID p_multimesh, int p_instances, RS::MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false, bool p_use_indirect = false) = 0;
 
 	virtual int _multimesh_get_instance_count(RID p_multimesh) const = 0;
 
diff --git a/engine/servers/rendering/storage/particles_storage.h b/engine/servers/rendering/storage/particles_storage.h
index 12057e9b..4570f69d 100644
--- a/engine/servers/rendering/storage/particles_storage.h
+++ b/engine/servers/rendering/storage/particles_storage.h
@@ -30,17 +30,7 @@
 
 #pragma once
 
-#include "core/math/math_defs.h" // real_t
-#include "servers/rendering/rendering_server_enums.h"
-
-class RID;
-struct AABB;
-struct Color;
-struct Transform3D;
-struct Vector3;
-
-template <typename T>
-class Vector;
+#include "servers/rendering/rendering_server.h"
 
 class RendererParticlesStorage {
 public:
@@ -52,7 +42,7 @@ public:
 	virtual void particles_initialize(RID p_rid) = 0;
 	virtual void particles_free(RID p_rid) = 0;
 
-	virtual void particles_set_mode(RID p_particles, RSE::ParticlesMode p_mode) = 0;
+	virtual void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) = 0;
 
 	virtual void particles_set_emitting(RID p_particles, bool p_emitting) = 0;
 	virtual bool particles_get_emitting(RID p_particles) = 0;
@@ -62,7 +52,7 @@ public:
 	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) = 0;
 	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) = 0;
 	virtual void particles_set_pre_process_time(RID p_particles, double p_time) = 0;
-	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time, real_t p_request_process_time_residual = 0.0) = 0;
+	virtual void particles_request_process_time(RID p_particles, real_t p_request_process_time) = 0;
 	virtual void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) = 0;
 	virtual void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) = 0;
 	virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) = 0;
@@ -75,9 +65,7 @@ public:
 	virtual void particles_set_fractional_delta(RID p_particles, bool p_enable) = 0;
 	virtual void particles_set_collision_base_size(RID p_particles, real_t p_size) = 0;
 
-	virtual void particles_set_transform_align(RID p_particles, RSE::ParticlesTransformAlign p_transform_align) = 0;
-	virtual void particles_set_transform_align_channel_filter(RID p_particles, RSE::ParticlesTransformAlignCustomSrc p_channel_filter) = 0;
-	virtual void particles_set_transform_align_axis(RID p_particles, RSE::ParticlesTransformAlignAxis p_rotation_axis) = 0;
+	virtual void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) = 0;
 
 	virtual void particles_set_seed(RID p_particles, uint32_t p_seed) = 0;
 
@@ -90,7 +78,7 @@ public:
 
 	virtual bool particles_is_inactive(RID p_particles) const = 0;
 
-	virtual void particles_set_draw_order(RID p_particles, RSE::ParticlesDrawOrder p_order) = 0;
+	virtual void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) = 0;
 
 	virtual void particles_set_draw_passes(RID p_particles, int p_count) = 0;
 	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) = 0;
@@ -119,7 +107,7 @@ public:
 	virtual void particles_collision_initialize(RID p_rid) = 0;
 	virtual void particles_collision_free(RID p_rid) = 0;
 
-	virtual void particles_collision_set_collision_type(RID p_particles_collision, RSE::ParticlesCollisionType p_type) = 0;
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) = 0;
 	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) = 0;
 	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) = 0; //for spheres
 	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) = 0; //for non-spheres
@@ -128,7 +116,7 @@ public:
 	virtual void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) = 0;
 	virtual void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) = 0; //for SDF and vector field, heightfield is dynamic
 	virtual void particles_collision_height_field_update(RID p_particles_collision) = 0; //for SDF and vector field
-	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RSE::ParticlesCollisionHeightfieldResolution p_resolution) = 0; //for SDF and vector field
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) = 0; //for SDF and vector field
 	virtual AABB particles_collision_get_aabb(RID p_particles_collision) const = 0;
 	virtual bool particles_collision_is_heightfield(RID p_particles_collision) const = 0;
 	virtual uint32_t particles_collision_get_height_field_mask(RID p_particles_collision) const = 0;
diff --git a/engine/servers/rendering/storage/render_data.cpp b/engine/servers/rendering/storage/render_data.cpp
index 188530a3..fa00a5c6 100644
--- a/engine/servers/rendering/storage/render_data.cpp
+++ b/engine/servers/rendering/storage/render_data.cpp
@@ -30,11 +30,40 @@
 
 #include "render_data.h"
 
-#include "core/object/class_db.h"
-
 void RenderData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_render_scene_buffers"), &RenderData::get_render_scene_buffers);
 	ClassDB::bind_method(D_METHOD("get_render_scene_data"), &RenderData::get_render_scene_data);
 	ClassDB::bind_method(D_METHOD("get_environment"), &RenderData::get_environment);
 	ClassDB::bind_method(D_METHOD("get_camera_attributes"), &RenderData::get_camera_attributes);
 }
+
+void RenderDataExtension::_bind_methods() {
+	GDVIRTUAL_BIND(_get_render_scene_buffers);
+	GDVIRTUAL_BIND(_get_render_scene_data)
+	GDVIRTUAL_BIND(_get_environment)
+	GDVIRTUAL_BIND(_get_camera_attributes)
+}
+
+Ref<RenderSceneBuffers> RenderDataExtension::get_render_scene_buffers() const {
+	Ref<RenderSceneBuffers> ret;
+	GDVIRTUAL_CALL(_get_render_scene_buffers, ret);
+	return ret;
+}
+
+RenderSceneData *RenderDataExtension::get_render_scene_data() const {
+	RenderSceneData *ret = nullptr;
+	GDVIRTUAL_CALL(_get_render_scene_data, ret);
+	return ret;
+}
+
+RID RenderDataExtension::get_environment() const {
+	RID ret;
+	GDVIRTUAL_CALL(_get_environment, ret);
+	return ret;
+}
+
+RID RenderDataExtension::get_camera_attributes() const {
+	RID ret;
+	GDVIRTUAL_CALL(_get_camera_attributes, ret);
+	return ret;
+}
diff --git a/engine/servers/rendering/storage/render_data.h b/engine/servers/rendering/storage/render_data.h
index 25bddc23..6afe4dc0 100644
--- a/engine/servers/rendering/storage/render_data.h
+++ b/engine/servers/rendering/storage/render_data.h
@@ -31,8 +31,8 @@
 #pragma once
 
 #include "core/object/object.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
-#include "servers/rendering/storage/render_scene_data.h"
+#include "render_scene_buffers.h"
+#include "render_scene_data.h"
 
 class RenderData : public Object {
 	GDCLASS(RenderData, Object);
@@ -47,3 +47,21 @@ public:
 	virtual RID get_environment() const = 0;
 	virtual RID get_camera_attributes() const = 0;
 };
+
+class RenderDataExtension : public RenderData {
+	GDCLASS(RenderDataExtension, RenderData);
+
+protected:
+	static void _bind_methods();
+
+	virtual Ref<RenderSceneBuffers> get_render_scene_buffers() const override;
+	virtual RenderSceneData *get_render_scene_data() const override;
+
+	virtual RID get_environment() const override;
+	virtual RID get_camera_attributes() const override;
+
+	GDVIRTUAL0RC(Ref<RenderSceneBuffers>, _get_render_scene_buffers)
+	GDVIRTUAL0RC(RenderSceneData *, _get_render_scene_data)
+	GDVIRTUAL0RC(RID, _get_environment)
+	GDVIRTUAL0RC(RID, _get_camera_attributes)
+};
diff --git a/engine/servers/rendering/storage/render_data_extension.cpp b/engine/servers/rendering/storage/render_data_extension.cpp
deleted file mode 100644
index 1663acd4..00000000
--- a/engine/servers/rendering/storage/render_data_extension.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/**************************************************************************/
-/*  render_data_extension.cpp                                             */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "render_data_extension.h"
-
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
-
-// RenderSceneBuffersExtension
-
-void RenderSceneBuffersExtension::_bind_methods() {
-	GDVIRTUAL_BIND(_configure, "config");
-	GDVIRTUAL_BIND(_set_fsr_sharpness, "fsr_sharpness");
-	GDVIRTUAL_BIND(_set_texture_mipmap_bias, "texture_mipmap_bias");
-	GDVIRTUAL_BIND(_set_anisotropic_filtering_level, "anisotropic_filtering_level");
-	GDVIRTUAL_BIND(_set_use_debanding, "use_debanding");
-}
-
-void RenderSceneBuffersExtension::configure(const RenderSceneBuffersConfiguration *p_config) {
-	GDVIRTUAL_CALL(_configure, p_config);
-}
-
-void RenderSceneBuffersExtension::set_fsr_sharpness(float p_fsr_sharpness) {
-	GDVIRTUAL_CALL(_set_fsr_sharpness, p_fsr_sharpness);
-}
-
-void RenderSceneBuffersExtension::set_texture_mipmap_bias(float p_texture_mipmap_bias) {
-	GDVIRTUAL_CALL(_set_texture_mipmap_bias, p_texture_mipmap_bias);
-}
-
-void RenderSceneBuffersExtension::set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
-	GDVIRTUAL_CALL(_set_anisotropic_filtering_level, p_anisotropic_filtering_level);
-}
-
-void RenderSceneBuffersExtension::set_use_debanding(bool p_use_debanding) {
-	GDVIRTUAL_CALL(_set_use_debanding, p_use_debanding);
-}
-
-// RenderSceneDataExtension
-
-void RenderSceneDataExtension::_bind_methods() {
-	GDVIRTUAL_BIND(_get_cam_transform);
-	GDVIRTUAL_BIND(_get_cam_projection);
-	GDVIRTUAL_BIND(_get_view_count);
-	GDVIRTUAL_BIND(_get_view_eye_offset, "view");
-	GDVIRTUAL_BIND(_get_view_projection, "view");
-
-	GDVIRTUAL_BIND(_get_uniform_buffer);
-}
-
-Transform3D RenderSceneDataExtension::get_cam_transform() const {
-	Transform3D ret;
-	GDVIRTUAL_CALL(_get_cam_transform, ret);
-	return ret;
-}
-
-Projection RenderSceneDataExtension::get_cam_projection() const {
-	Projection ret;
-	GDVIRTUAL_CALL(_get_cam_projection, ret);
-	return ret;
-}
-
-uint32_t RenderSceneDataExtension::get_view_count() const {
-	uint32_t ret = 0;
-	GDVIRTUAL_CALL(_get_view_count, ret);
-	return ret;
-}
-
-Vector3 RenderSceneDataExtension::get_view_eye_offset(uint32_t p_view) const {
-	Vector3 ret;
-	GDVIRTUAL_CALL(_get_view_eye_offset, p_view, ret);
-	return ret;
-}
-
-Projection RenderSceneDataExtension::get_view_projection(uint32_t p_view) const {
-	Projection ret;
-	GDVIRTUAL_CALL(_get_view_projection, p_view, ret);
-	return ret;
-}
-
-RID RenderSceneDataExtension::get_uniform_buffer() const {
-	RID ret;
-	GDVIRTUAL_CALL(_get_uniform_buffer, ret);
-	return ret;
-}
-
-// RenderDataExtension
-
-void RenderDataExtension::_bind_methods() {
-	GDVIRTUAL_BIND(_get_render_scene_buffers);
-	GDVIRTUAL_BIND(_get_render_scene_data)
-	GDVIRTUAL_BIND(_get_environment)
-	GDVIRTUAL_BIND(_get_camera_attributes)
-}
-
-Ref<RenderSceneBuffers> RenderDataExtension::get_render_scene_buffers() const {
-	Ref<RenderSceneBuffers> ret;
-	GDVIRTUAL_CALL(_get_render_scene_buffers, ret);
-	return ret;
-}
-
-RenderSceneData *RenderDataExtension::get_render_scene_data() const {
-	RenderSceneData *ret = nullptr;
-	GDVIRTUAL_CALL(_get_render_scene_data, ret);
-	return ret;
-}
-
-RID RenderDataExtension::get_environment() const {
-	RID ret;
-	GDVIRTUAL_CALL(_get_environment, ret);
-	return ret;
-}
-
-RID RenderDataExtension::get_camera_attributes() const {
-	RID ret;
-	GDVIRTUAL_CALL(_get_camera_attributes, ret);
-	return ret;
-}
diff --git a/engine/servers/rendering/storage/render_data_extension.h b/engine/servers/rendering/storage/render_data_extension.h
deleted file mode 100644
index 11556f5f..00000000
--- a/engine/servers/rendering/storage/render_data_extension.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**************************************************************************/
-/*  render_data_extension.h                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/gdvirtual.gen.h"
-#include "servers/rendering/storage/render_data.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
-#include "servers/rendering/storage/render_scene_data.h"
-
-class RenderSceneBuffersExtension : public RenderSceneBuffers {
-	GDCLASS(RenderSceneBuffersExtension, RenderSceneBuffers);
-
-protected:
-	static void _bind_methods();
-
-	GDVIRTUAL1(_configure, const RenderSceneBuffersConfiguration *)
-	GDVIRTUAL1(_set_fsr_sharpness, float)
-	GDVIRTUAL1(_set_texture_mipmap_bias, float)
-	GDVIRTUAL1(_set_anisotropic_filtering_level, int)
-	GDVIRTUAL1(_set_use_debanding, bool)
-
-public:
-	virtual ~RenderSceneBuffersExtension() {}
-
-	virtual void configure(const RenderSceneBuffersConfiguration *p_config) override;
-
-	virtual void set_fsr_sharpness(float p_fsr_sharpness) override;
-	virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override;
-	virtual void set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override;
-	virtual void set_use_debanding(bool p_use_debanding) override;
-};
-
-class RenderSceneDataExtension : public RenderSceneData {
-	GDCLASS(RenderSceneDataExtension, RenderSceneData);
-
-protected:
-	static void _bind_methods();
-
-public:
-	virtual Transform3D get_cam_transform() const override;
-	virtual Projection get_cam_projection() const override;
-
-	virtual uint32_t get_view_count() const override;
-	virtual Vector3 get_view_eye_offset(uint32_t p_view) const override;
-	virtual Projection get_view_projection(uint32_t p_view) const override;
-
-	virtual RID get_uniform_buffer() const override;
-
-	GDVIRTUAL0RC(Transform3D, _get_cam_transform)
-	GDVIRTUAL0RC(Projection, _get_cam_projection)
-
-	GDVIRTUAL0RC(uint32_t, _get_view_count)
-	GDVIRTUAL1RC(Vector3, _get_view_eye_offset, uint32_t)
-	GDVIRTUAL1RC(Projection, _get_view_projection, uint32_t)
-
-	GDVIRTUAL0RC(RID, _get_uniform_buffer)
-};
-
-class RenderDataExtension : public RenderData {
-	GDCLASS(RenderDataExtension, RenderData);
-
-protected:
-	static void _bind_methods();
-
-	virtual Ref<RenderSceneBuffers> get_render_scene_buffers() const override;
-	virtual RenderSceneData *get_render_scene_data() const override;
-
-	virtual RID get_environment() const override;
-	virtual RID get_camera_attributes() const override;
-
-	GDVIRTUAL0RC(Ref<RenderSceneBuffers>, _get_render_scene_buffers)
-	GDVIRTUAL0RC(RenderSceneData *, _get_render_scene_data)
-	GDVIRTUAL0RC(RID, _get_environment)
-	GDVIRTUAL0RC(RID, _get_camera_attributes)
-};
diff --git a/engine/servers/rendering/storage/render_scene_buffers.cpp b/engine/servers/rendering/storage/render_scene_buffers.cpp
index 37367098..67135a4c 100644
--- a/engine/servers/rendering/storage/render_scene_buffers.cpp
+++ b/engine/servers/rendering/storage/render_scene_buffers.cpp
@@ -30,9 +30,6 @@
 
 #include "render_scene_buffers.h"
 
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
-
 void RenderSceneBuffersConfiguration::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_render_target"), &RenderSceneBuffersConfiguration::get_render_target);
 	ClassDB::bind_method(D_METHOD("set_render_target", "render_target"), &RenderSceneBuffersConfiguration::set_render_target);
@@ -52,7 +49,7 @@ void RenderSceneBuffersConfiguration::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_scaling_3d_mode"), &RenderSceneBuffersConfiguration::get_scaling_3d_mode);
 	ClassDB::bind_method(D_METHOD("set_scaling_3d_mode", "scaling_3d_mode"), &RenderSceneBuffersConfiguration::set_scaling_3d_mode);
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "scaling_3d_mode", PROPERTY_HINT_ENUM, "Nearest (Fastest):5,Bilinear (Fastest):0,FSR 1.0 (Fast):1,FSR 2.2 (Slow):2,MetalFX (Spatial - Fast):3,MetalFX (Temporal - Slow):4"), "set_scaling_3d_mode", "get_scaling_3d_mode"); // TODO VIEWPORT_SCALING_3D_MODE_OFF is possible here too, but we can't specify an enum string for it.
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "scaling_3d_mode", PROPERTY_HINT_ENUM, "Bilinear (Fastest),FSR 1.0 (Fast),FSR 2.2 (Slow),MetalFX (Spatial),MetalFX (Temporal)"), "set_scaling_3d_mode", "get_scaling_3d_mode"); // TODO VIEWPORT_SCALING_3D_MODE_OFF is possible here too, but we can't specify an enum string for it.
 
 	ClassDB::bind_method(D_METHOD("get_msaa_3d"), &RenderSceneBuffersConfiguration::get_msaa_3d);
 	ClassDB::bind_method(D_METHOD("set_msaa_3d", "msaa_3d"), &RenderSceneBuffersConfiguration::set_msaa_3d);
@@ -78,3 +75,31 @@ void RenderSceneBuffersConfiguration::_bind_methods() {
 void RenderSceneBuffers::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("configure", "config"), &RenderSceneBuffers::configure);
 }
+
+void RenderSceneBuffersExtension::_bind_methods() {
+	GDVIRTUAL_BIND(_configure, "config");
+	GDVIRTUAL_BIND(_set_fsr_sharpness, "fsr_sharpness");
+	GDVIRTUAL_BIND(_set_texture_mipmap_bias, "texture_mipmap_bias");
+	GDVIRTUAL_BIND(_set_anisotropic_filtering_level, "anisotropic_filtering_level");
+	GDVIRTUAL_BIND(_set_use_debanding, "use_debanding");
+}
+
+void RenderSceneBuffersExtension::configure(const RenderSceneBuffersConfiguration *p_config) {
+	GDVIRTUAL_CALL(_configure, p_config);
+}
+
+void RenderSceneBuffersExtension::set_fsr_sharpness(float p_fsr_sharpness) {
+	GDVIRTUAL_CALL(_set_fsr_sharpness, p_fsr_sharpness);
+}
+
+void RenderSceneBuffersExtension::set_texture_mipmap_bias(float p_texture_mipmap_bias) {
+	GDVIRTUAL_CALL(_set_texture_mipmap_bias, p_texture_mipmap_bias);
+}
+
+void RenderSceneBuffersExtension::set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) {
+	GDVIRTUAL_CALL(_set_anisotropic_filtering_level, p_anisotropic_filtering_level);
+}
+
+void RenderSceneBuffersExtension::set_use_debanding(bool p_use_debanding) {
+	GDVIRTUAL_CALL(_set_use_debanding, p_use_debanding);
+}
diff --git a/engine/servers/rendering/storage/render_scene_buffers.h b/engine/servers/rendering/storage/render_scene_buffers.h
index c67a022b..fead81c6 100644
--- a/engine/servers/rendering/storage/render_scene_buffers.h
+++ b/engine/servers/rendering/storage/render_scene_buffers.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class RenderSceneBuffersConfiguration : public RefCounted {
 	GDCLASS(RenderSceneBuffersConfiguration, RefCounted);
@@ -43,10 +43,10 @@ private:
 	Size2i target_size;
 	uint32_t view_count = 1;
 
-	RSE::ViewportScaling3DMode scaling_3d_mode = RSE::VIEWPORT_SCALING_3D_MODE_OFF;
-	RSE::ViewportMSAA msaa_3d = RSE::VIEWPORT_MSAA_DISABLED;
-	RSE::ViewportScreenSpaceAA screen_space_aa = RSE::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
-	RSE::ViewportAnisotropicFiltering anisotropic_filtering_level = RSE::VIEWPORT_ANISOTROPY_4X;
+	RS::ViewportScaling3DMode scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
+	RS::ViewportMSAA msaa_3d = RS::VIEWPORT_MSAA_DISABLED;
+	RS::ViewportScreenSpaceAA screen_space_aa = RS::VIEWPORT_SCREEN_SPACE_AA_DISABLED;
+	RS::ViewportAnisotropicFiltering anisotropic_filtering_level = RS::VIEWPORT_ANISOTROPY_4X;
 
 	float fsr_sharpness = 0.0;
 	float texture_mipmap_bias = 0.0;
@@ -69,14 +69,14 @@ public:
 	uint32_t get_view_count() const { return view_count; }
 	void set_view_count(uint32_t p_view_count) { view_count = p_view_count; }
 
-	RSE::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
-	void set_scaling_3d_mode(RSE::ViewportScaling3DMode p_scaling_3d_mode) { scaling_3d_mode = p_scaling_3d_mode; }
+	RS::ViewportScaling3DMode get_scaling_3d_mode() const { return scaling_3d_mode; }
+	void set_scaling_3d_mode(RS::ViewportScaling3DMode p_scaling_3d_mode) { scaling_3d_mode = p_scaling_3d_mode; }
 
-	RSE::ViewportMSAA get_msaa_3d() const { return msaa_3d; }
-	void set_msaa_3d(RSE::ViewportMSAA p_msaa_3d) { msaa_3d = p_msaa_3d; }
+	RS::ViewportMSAA get_msaa_3d() const { return msaa_3d; }
+	void set_msaa_3d(RS::ViewportMSAA p_msaa_3d) { msaa_3d = p_msaa_3d; }
 
-	RSE::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
-	void set_screen_space_aa(RSE::ViewportScreenSpaceAA p_screen_space_aa) { screen_space_aa = p_screen_space_aa; }
+	RS::ViewportScreenSpaceAA get_screen_space_aa() const { return screen_space_aa; }
+	void set_screen_space_aa(RS::ViewportScreenSpaceAA p_screen_space_aa) { screen_space_aa = p_screen_space_aa; }
 
 	float get_fsr_sharpness() const { return fsr_sharpness; }
 	void set_fsr_sharpness(float p_fsr_sharpness) { fsr_sharpness = p_fsr_sharpness; }
@@ -84,8 +84,8 @@ public:
 	float get_texture_mipmap_bias() const { return texture_mipmap_bias; }
 	void set_texture_mipmap_bias(float p_texture_mipmap_bias) { texture_mipmap_bias = p_texture_mipmap_bias; }
 
-	RSE::ViewportAnisotropicFiltering get_anisotropic_filtering_level() const { return anisotropic_filtering_level; }
-	void set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) { anisotropic_filtering_level = p_anisotropic_filtering_level; }
+	RS::ViewportAnisotropicFiltering get_anisotropic_filtering_level() const { return anisotropic_filtering_level; }
+	void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) { anisotropic_filtering_level = p_anisotropic_filtering_level; }
 
 	bool get_use_taa() const { return use_taa; }
 	void set_use_taa(bool p_use_taa) { use_taa = p_use_taa; }
@@ -112,6 +112,29 @@ public:
 	// for those settings that are unlikely to require buffers to be recreated, we'll add setters
 	virtual void set_fsr_sharpness(float p_fsr_sharpness) = 0;
 	virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) = 0;
-	virtual void set_anisotropic_filtering_level(RSE::ViewportAnisotropicFiltering p_anisotropic_filtering_level) = 0;
+	virtual void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) = 0;
 	virtual void set_use_debanding(bool p_use_debanding) = 0;
 };
+
+class RenderSceneBuffersExtension : public RenderSceneBuffers {
+	GDCLASS(RenderSceneBuffersExtension, RenderSceneBuffers);
+
+protected:
+	static void _bind_methods();
+
+	GDVIRTUAL1(_configure, const RenderSceneBuffersConfiguration *)
+	GDVIRTUAL1(_set_fsr_sharpness, float)
+	GDVIRTUAL1(_set_texture_mipmap_bias, float)
+	GDVIRTUAL1(_set_anisotropic_filtering_level, int)
+	GDVIRTUAL1(_set_use_debanding, bool)
+
+public:
+	virtual ~RenderSceneBuffersExtension() {}
+
+	virtual void configure(const RenderSceneBuffersConfiguration *p_config) override;
+
+	virtual void set_fsr_sharpness(float p_fsr_sharpness) override;
+	virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override;
+	virtual void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override;
+	virtual void set_use_debanding(bool p_use_debanding) override;
+};
diff --git a/engine/servers/rendering/storage/render_scene_data.cpp b/engine/servers/rendering/storage/render_scene_data.cpp
index 0140fd3a..a1d8f524 100644
--- a/engine/servers/rendering/storage/render_scene_data.cpp
+++ b/engine/servers/rendering/storage/render_scene_data.cpp
@@ -30,8 +30,6 @@
 
 #include "render_scene_data.h"
 
-#include "core/object/class_db.h"
-
 void RenderSceneData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_cam_transform"), &RenderSceneData::get_cam_transform);
 	ClassDB::bind_method(D_METHOD("get_cam_projection"), &RenderSceneData::get_cam_projection);
@@ -42,3 +40,49 @@ void RenderSceneData::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_uniform_buffer"), &RenderSceneData::get_uniform_buffer);
 }
+
+void RenderSceneDataExtension::_bind_methods() {
+	GDVIRTUAL_BIND(_get_cam_transform);
+	GDVIRTUAL_BIND(_get_cam_projection);
+	GDVIRTUAL_BIND(_get_view_count);
+	GDVIRTUAL_BIND(_get_view_eye_offset, "view");
+	GDVIRTUAL_BIND(_get_view_projection, "view");
+
+	GDVIRTUAL_BIND(_get_uniform_buffer);
+}
+
+Transform3D RenderSceneDataExtension::get_cam_transform() const {
+	Transform3D ret;
+	GDVIRTUAL_CALL(_get_cam_transform, ret);
+	return ret;
+}
+
+Projection RenderSceneDataExtension::get_cam_projection() const {
+	Projection ret;
+	GDVIRTUAL_CALL(_get_cam_projection, ret);
+	return ret;
+}
+
+uint32_t RenderSceneDataExtension::get_view_count() const {
+	uint32_t ret = 0;
+	GDVIRTUAL_CALL(_get_view_count, ret);
+	return ret;
+}
+
+Vector3 RenderSceneDataExtension::get_view_eye_offset(uint32_t p_view) const {
+	Vector3 ret;
+	GDVIRTUAL_CALL(_get_view_eye_offset, p_view, ret);
+	return ret;
+}
+
+Projection RenderSceneDataExtension::get_view_projection(uint32_t p_view) const {
+	Projection ret;
+	GDVIRTUAL_CALL(_get_view_projection, p_view, ret);
+	return ret;
+}
+
+RID RenderSceneDataExtension::get_uniform_buffer() const {
+	RID ret;
+	GDVIRTUAL_CALL(_get_uniform_buffer, ret);
+	return ret;
+}
diff --git a/engine/servers/rendering/storage/render_scene_data.h b/engine/servers/rendering/storage/render_scene_data.h
index 583d5bf4..a201f973 100644
--- a/engine/servers/rendering/storage/render_scene_data.h
+++ b/engine/servers/rendering/storage/render_scene_data.h
@@ -30,7 +30,10 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/object/object.h"
+#include "core/object/script_language.h"
 
 class RenderSceneData : public Object {
 	GDCLASS(RenderSceneData, Object);
@@ -48,3 +51,29 @@ public:
 
 	virtual RID get_uniform_buffer() const = 0;
 };
+
+class RenderSceneDataExtension : public RenderSceneData {
+	GDCLASS(RenderSceneDataExtension, RenderSceneData);
+
+protected:
+	static void _bind_methods();
+
+public:
+	virtual Transform3D get_cam_transform() const override;
+	virtual Projection get_cam_projection() const override;
+
+	virtual uint32_t get_view_count() const override;
+	virtual Vector3 get_view_eye_offset(uint32_t p_view) const override;
+	virtual Projection get_view_projection(uint32_t p_view) const override;
+
+	virtual RID get_uniform_buffer() const override;
+
+	GDVIRTUAL0RC(Transform3D, _get_cam_transform)
+	GDVIRTUAL0RC(Projection, _get_cam_projection)
+
+	GDVIRTUAL0RC(uint32_t, _get_view_count)
+	GDVIRTUAL1RC(Vector3, _get_view_eye_offset, uint32_t)
+	GDVIRTUAL1RC(Projection, _get_view_projection, uint32_t)
+
+	GDVIRTUAL0RC(RID, _get_uniform_buffer)
+};
diff --git a/engine/servers/rendering/storage/texture_storage.h b/engine/servers/rendering/storage/texture_storage.h
index fbc799ad..cef1ae2b 100644
--- a/engine/servers/rendering/storage/texture_storage.h
+++ b/engine/servers/rendering/storage/texture_storage.h
@@ -30,8 +30,7 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/rendering_server_types.h"
+#include "servers/rendering/rendering_server.h"
 
 class RendererTextureStorage {
 private:
@@ -52,11 +51,11 @@ public:
 	virtual void canvas_texture_initialize(RID p_rid) = 0;
 	virtual void canvas_texture_free(RID p_rid) = 0;
 
-	virtual void canvas_texture_set_channel(RID p_canvas_texture, RSE::CanvasTextureChannel p_channel, RID p_texture) = 0;
+	virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) = 0;
 	virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) = 0;
 
-	virtual void canvas_texture_set_texture_filter(RID p_item, RSE::CanvasItemTextureFilter p_filter) = 0;
-	virtual void canvas_texture_set_texture_repeat(RID p_item, RSE::CanvasItemTextureRepeat p_repeat) = 0;
+	virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) = 0;
+	virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) = 0;
 
 	/* Texture API */
 
@@ -66,33 +65,27 @@ public:
 	virtual void texture_free(RID p_rid) = 0;
 
 	virtual void texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) = 0;
-	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RSE::TextureLayeredType p_layered_type) = 0;
+	virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) = 0;
 	virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) = 0;
 	virtual void texture_external_initialize(RID p_texture, int p_width, int p_height, uint64_t p_external_buffer) = 0;
 	virtual void texture_proxy_initialize(RID p_texture, RID p_base) = 0; //all slices, then all the mipmaps, must be coherent
-	virtual void texture_drawable_initialize(RID p_texture, int p_width, int p_height, RSE::TextureDrawableFormat p_format, const Color &p_color, bool p_with_mipmaps) = 0;
 
-	virtual RID texture_create_from_native_handle(RSE::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RSE::TextureLayeredType p_layered_type = RSE::TEXTURE_LAYERED_2D_ARRAY) = 0;
+	virtual RID texture_create_from_native_handle(RS::TextureType p_type, Image::Format p_format, uint64_t p_native_handle, int p_width, int p_height, int p_depth, int p_layers = 1, RS::TextureLayeredType p_layered_type = RS::TEXTURE_LAYERED_2D_ARRAY) = 0;
 
 	virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) = 0;
 	virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) = 0;
 	virtual void texture_external_update(RID p_proxy, int p_width, int p_height, uint64_t p_external_buffer) = 0;
 	virtual void texture_proxy_update(RID p_proxy, RID p_base) = 0;
 
-	virtual void texture_drawable_blit_rect(const TypedArray<RID> &p_textures, const Rect2i &p_rect, RID p_material, const Color &p_modulate, const TypedArray<RID> &p_source_textures, int p_to_mipmap) = 0;
-
 	//these two APIs can be used together or in combination with the others.
 	virtual void texture_2d_placeholder_initialize(RID p_texture) = 0;
-	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RSE::TextureLayeredType p_layered_type) = 0;
+	virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) = 0;
 	virtual void texture_3d_placeholder_initialize(RID p_texture) = 0;
 
 	virtual Ref<Image> texture_2d_get(RID p_texture) const = 0;
 	virtual Ref<Image> texture_2d_layer_get(RID p_texture, int p_layer) const = 0;
 	virtual Vector<Ref<Image>> texture_3d_get(RID p_texture) const = 0;
 
-	virtual void texture_drawable_generate_mipmaps(RID p_texture) = 0;
-	virtual RID texture_drawable_get_default_material() const = 0;
-
 	virtual void texture_replace(RID p_texture, RID p_by_texture) = 0;
 	virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) = 0;
 
@@ -101,17 +94,17 @@ public:
 
 	virtual Image::Format texture_get_format(RID p_texture) const = 0;
 
-	virtual void texture_set_detect_3d_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) = 0;
-	virtual void texture_set_detect_normal_callback(RID p_texture, RenderingServerTypes::TextureDetectCallback p_callback, void *p_userdata) = 0;
-	virtual void texture_set_detect_roughness_callback(RID p_texture, RenderingServerTypes::TextureDetectRoughnessCallback p_callback, void *p_userdata) = 0;
+	virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) = 0;
+	virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) = 0;
+	virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) = 0;
 
-	virtual void texture_debug_usage(List<RenderingServerTypes::TextureInfo> *r_info) = 0;
+	virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) = 0;
 
 	virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) = 0;
 
 	virtual Size2 texture_size_with_proxy(RID p_proxy) = 0;
 
-	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RSE::TextureLayeredType p_layer_type = RSE::TEXTURE_LAYERED_2D_ARRAY) = 0;
+	virtual void texture_rd_initialize(RID p_texture, const RID &p_rd_texture, const RS::TextureLayeredType p_layer_type = RS::TEXTURE_LAYERED_2D_ARRAY) = 0;
 	virtual RID texture_get_rd_texture(RID p_texture, bool p_srgb = false) const = 0;
 	virtual uint64_t texture_get_native_handle(RID p_texture, bool p_srgb = false) const = 0;
 
@@ -121,7 +114,7 @@ public:
 	virtual void decal_free(RID p_rid) = 0;
 
 	virtual void decal_set_size(RID p_decal, const Vector3 &p_size) = 0;
-	virtual void decal_set_texture(RID p_decal, RSE::DecalTexture p_type, RID p_texture) = 0;
+	virtual void decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) = 0;
 	virtual void decal_set_emission_energy(RID p_decal, float p_energy) = 0;
 	virtual void decal_set_albedo_mix(RID p_decal, float p_mix) = 0;
 	virtual void decal_set_modulate(RID p_decal, const Color &p_modulate) = 0;
@@ -158,8 +151,8 @@ public:
 	virtual bool render_target_get_direct_to_screen(RID p_render_target) const = 0;
 	virtual bool render_target_was_used(RID p_render_target) const = 0;
 	virtual void render_target_set_as_unused(RID p_render_target) = 0;
-	virtual void render_target_set_msaa(RID p_render_target, RSE::ViewportMSAA p_msaa) = 0;
-	virtual RSE::ViewportMSAA render_target_get_msaa(RID p_render_target) const = 0;
+	virtual void render_target_set_msaa(RID p_render_target, RS::ViewportMSAA p_msaa) = 0;
+	virtual RS::ViewportMSAA render_target_get_msaa(RID p_render_target) const = 0;
 	virtual void render_target_set_msaa_needs_resolve(RID p_render_target, bool p_needs_resolve) = 0;
 	virtual bool render_target_get_msaa_needs_resolve(RID p_render_target) const = 0;
 	virtual void render_target_do_msaa_resolve(RID p_render_target) = 0;
@@ -174,14 +167,14 @@ public:
 	virtual void render_target_disable_clear_request(RID p_render_target) = 0;
 	virtual void render_target_do_clear_request(RID p_render_target) = 0;
 
-	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RSE::ViewportSDFOversize p_size, RSE::ViewportSDFScale p_scale) = 0;
+	virtual void render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) = 0;
 	virtual Rect2i render_target_get_sdf_rect(RID p_render_target) const = 0;
 	virtual void render_target_mark_sdf_enabled(RID p_render_target, bool p_enabled) = 0;
 
-	virtual void render_target_set_vrs_mode(RID p_render_target, RSE::ViewportVRSMode p_mode) = 0;
-	virtual RSE::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const = 0;
-	virtual void render_target_set_vrs_update_mode(RID p_render_target, RSE::ViewportVRSUpdateMode p_mode) = 0;
-	virtual RSE::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const = 0;
+	virtual void render_target_set_vrs_mode(RID p_render_target, RS::ViewportVRSMode p_mode) = 0;
+	virtual RS::ViewportVRSMode render_target_get_vrs_mode(RID p_render_target) const = 0;
+	virtual void render_target_set_vrs_update_mode(RID p_render_target, RS::ViewportVRSUpdateMode p_mode) = 0;
+	virtual RS::ViewportVRSUpdateMode render_target_get_vrs_update_mode(RID p_render_target) const = 0;
 	virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) = 0;
 	virtual RID render_target_get_vrs_texture(RID p_render_target) const = 0;
 
@@ -195,12 +188,6 @@ public:
 	virtual void render_target_set_render_region(RID p_render_target, const Rect2i &p_render_region) = 0;
 	virtual Rect2i render_target_get_render_region(RID p_render_target) const = 0;
 
-	virtual void render_target_set_subsampled_enabled(RID p_render_target, bool p_enabled) = 0;
-	virtual bool render_target_is_subsampled_enabled(RID p_render_target) const = 0;
-
-	virtual void render_target_set_subsampled_allowed(RID p_render_target, bool p_allowed) = 0;
-	virtual bool render_target_is_subsampled_allowed(RID p_render_target) const = 0;
-
 	// get textures
 	virtual RID render_target_get_texture(RID p_render_target) = 0;
 
diff --git a/engine/servers/rendering/storage/utilities.h b/engine/servers/rendering/storage/utilities.h
index 4f94d191..9191cfaf 100644
--- a/engine/servers/rendering/storage/utilities.h
+++ b/engine/servers/rendering/storage/utilities.h
@@ -30,17 +30,7 @@
 
 #pragma once
 
-#include "core/math/aabb.h"
-#include "core/math/vector2i.h"
-#include "core/string/ustring.h"
-#include "core/templates/hash_map.h"
-#include "core/templates/hash_set.h"
-#include "core/templates/list.h"
-#include "core/templates/pair.h"
-#include "core/templates/rid.h"
-#include "core/variant/callable.h"
-#include "servers/rendering/rendering_device_enums.h"
-#include "servers/rendering/rendering_server_enums.h"
+#include "servers/rendering/rendering_server.h"
 
 class DependencyTracker;
 
@@ -135,7 +125,7 @@ public:
 
 	/* INSTANCES */
 
-	virtual RSE::InstanceType get_base_type(RID p_rid) const = 0;
+	virtual RS::InstanceType get_base_type(RID p_rid) const = 0;
 	virtual bool free(RID p_rid) = 0;
 
 	/* DEPENDENCIES */
@@ -158,15 +148,15 @@ public:
 
 	bool capturing_timestamps = false;
 
-#define TIMESTAMP_BEGIN() \
-	{ \
-		if (RSG::utilities->capturing_timestamps) \
+#define TIMESTAMP_BEGIN()                               \
+	{                                                   \
+		if (RSG::utilities->capturing_timestamps)       \
 			RSG::utilities->capture_timestamps_begin(); \
 	}
 
-#define RENDER_TIMESTAMP(m_text) \
-	{ \
-		if (RSG::utilities->capturing_timestamps) \
+#define RENDER_TIMESTAMP(m_text)                       \
+	{                                                  \
+		if (RSG::utilities->capturing_timestamps)      \
 			RSG::utilities->capture_timestamp(m_text); \
 	}
 
@@ -187,10 +177,10 @@ public:
 
 	virtual void update_memory_info() = 0;
 
-	virtual uint64_t get_rendering_info(RSE::RenderingInfo p_info) = 0;
+	virtual uint64_t get_rendering_info(RS::RenderingInfo p_info) = 0;
 	virtual String get_video_adapter_name() const = 0;
 	virtual String get_video_adapter_vendor() const = 0;
-	virtual RenderingDeviceEnums::DeviceType get_video_adapter_type() const = 0;
+	virtual RenderingDevice::DeviceType get_video_adapter_type() const = 0;
 	virtual String get_video_adapter_api_version() const = 0;
 
 	virtual Size2i get_maximum_viewport_size() const = 0;
diff --git a/engine/servers/server_wrap_mt_common.h b/engine/servers/server_wrap_mt_common.h
index c55b91b8..04484951 100644
--- a/engine/servers/server_wrap_mt_common.h
+++ b/engine/servers/server_wrap_mt_common.h
@@ -31,783 +31,781 @@
 #pragma once
 
 #ifdef DEBUG_ENABLED
-#include "core/config/engine.h" // IWYU pragma: keep. Used in macro.
-
-#define MAIN_THREAD_SYNC_CHECK \
+#define MAIN_THREAD_SYNC_CHECK                                                                         \
 	if (unlikely(Thread::is_main_thread() && Engine::get_singleton()->notify_frame_server_synced())) { \
-		MAIN_THREAD_SYNC_WARN \
+		MAIN_THREAD_SYNC_WARN                                                                          \
 	}
 #else
 #define MAIN_THREAD_SYNC_CHECK
 #endif
 
-#define FUNC0R(m_r, m_type) \
-	virtual m_r m_type() override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC0R(m_r, m_type)                                                     \
+	virtual m_r m_type() override {                                             \
+		if (ASYNC_COND_PUSH_AND_RET) {                                          \
+			m_r ret;                                                            \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(); \
-		} \
+			SYNC_DEBUG                                                          \
+			MAIN_THREAD_SYNC_CHECK                                              \
+			return ret;                                                         \
+		} else {                                                                \
+			command_queue.flush_if_pending();                                   \
+			return server_name->m_type();                                       \
+		}                                                                       \
 	}
 
-#define FUNCRIDSPLIT(m_type) \
-	virtual RID m_type##_create() override { \
-		RID ret = server_name->m_type##_allocate(); \
-		if (ASYNC_COND_PUSH) { \
+#define FUNCRIDSPLIT(m_type)                                                        \
+	virtual RID m_type##_create() override {                                        \
+		RID ret = server_name->m_type##_allocate();                                 \
+		if (ASYNC_COND_PUSH) {                                                      \
 			command_queue.push(server_name, &ServerName::m_type##_initialize, ret); \
-		} else { \
-			server_name->m_type##_initialize(ret); \
-		} \
-		return ret; \
+		} else {                                                                    \
+			server_name->m_type##_initialize(ret);                                  \
+		}                                                                           \
+		return ret;                                                                 \
 	}
 
 //RID now returns directly, ensure thread safety yourself
-#define FUNCRID(m_type) \
-	virtual RID m_type##_create() override { \
+#define FUNCRID(m_type)                        \
+	virtual RID m_type##_create() override {   \
 		return server_name->m_type##_create(); \
 	}
 
-#define FUNC0RC(m_r, m_type) \
-	virtual m_r m_type() const override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC0RC(m_r, m_type)                                                    \
+	virtual m_r m_type() const override {                                       \
+		WRITE_ACTION                                                            \
+		if (ASYNC_COND_PUSH_AND_RET) {                                          \
+			m_r ret;                                                            \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(); \
-		} \
+			SYNC_DEBUG                                                          \
+			MAIN_THREAD_SYNC_CHECK                                              \
+			return ret;                                                         \
+		} else {                                                                \
+			command_queue.flush_if_pending();                                   \
+			return server_name->m_type();                                       \
+		}                                                                       \
 	}
 
-#define FUNC0(m_type) \
-	virtual void m_type() override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC0(m_type)                                             \
+	virtual void m_type() override {                              \
+		WRITE_ACTION                                              \
+		if (ASYNC_COND_PUSH) {                                    \
 			command_queue.push(server_name, &ServerName::m_type); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(); \
-		} \
+		} else {                                                  \
+			command_queue.flush_if_pending();                     \
+			server_name->m_type();                                \
+		}                                                         \
 	}
 
-#define FUNC0C(m_type) \
-	virtual void m_type() const override { \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC0C(m_type)                                            \
+	virtual void m_type() const override {                        \
+		if (ASYNC_COND_PUSH) {                                    \
 			command_queue.push(server_name, &ServerName::m_type); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(); \
-		} \
+		} else {                                                  \
+			command_queue.flush_if_pending();                     \
+			server_name->m_type();                                \
+		}                                                         \
 	}
 
-#define FUNC0S(m_type) \
-	virtual void m_type() override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC0S(m_type)                                                     \
+	virtual void m_type() override {                                       \
+		WRITE_ACTION                                                       \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                    \
 			command_queue.push_and_sync(server_name, &ServerName::m_type); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(); \
-		} \
+			SYNC_DEBUG                                                     \
+			MAIN_THREAD_SYNC_CHECK                                         \
+		} else {                                                           \
+			command_queue.flush_if_pending();                              \
+			server_name->m_type();                                         \
+		}                                                                  \
 	}
 
-#define FUNC0SC(m_type) \
-	virtual void m_type() const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC0SC(m_type)                                                    \
+	virtual void m_type() const override {                                 \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                    \
 			command_queue.push_and_sync(server_name, &ServerName::m_type); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(); \
-		} \
+			SYNC_DEBUG                                                     \
+			MAIN_THREAD_SYNC_CHECK                                         \
+		} else {                                                           \
+			command_queue.flush_if_pending();                              \
+			server_name->m_type();                                         \
+		}                                                                  \
 	}
 
 ///////////////////////////////////////////////
 
-#define FUNC1R(m_r, m_type, m_arg1) \
-	virtual m_r m_type(m_arg1 p1) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC1R(m_r, m_type, m_arg1)                                                 \
+	virtual m_r m_type(m_arg1 p1) override {                                        \
+		WRITE_ACTION                                                                \
+		if (ASYNC_COND_PUSH_AND_RET) {                                              \
+			m_r ret;                                                                \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1); \
-		} \
+			SYNC_DEBUG                                                              \
+			MAIN_THREAD_SYNC_CHECK                                                  \
+			return ret;                                                             \
+		} else {                                                                    \
+			command_queue.flush_if_pending();                                       \
+			return server_name->m_type(p1);                                         \
+		}                                                                           \
 	}
 
-#define FUNC1RC(m_r, m_type, m_arg1) \
-	virtual m_r m_type(m_arg1 p1) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC1RC(m_r, m_type, m_arg1)                                                \
+	virtual m_r m_type(m_arg1 p1) const override {                                  \
+		if (ASYNC_COND_PUSH_AND_RET) {                                              \
+			m_r ret;                                                                \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1); \
-		} \
+			SYNC_DEBUG                                                              \
+			MAIN_THREAD_SYNC_CHECK                                                  \
+			return ret;                                                             \
+		} else {                                                                    \
+			command_queue.flush_if_pending();                                       \
+			return server_name->m_type(p1);                                         \
+		}                                                                           \
 	}
 
-#define FUNC1S(m_type, m_arg1) \
-	virtual void m_type(m_arg1 p1) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC1S(m_type, m_arg1)                                                 \
+	virtual void m_type(m_arg1 p1) override {                                  \
+		WRITE_ACTION                                                           \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                        \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1); \
-		} \
+			SYNC_DEBUG                                                         \
+			MAIN_THREAD_SYNC_CHECK                                             \
+		} else {                                                               \
+			command_queue.flush_if_pending();                                  \
+			server_name->m_type(p1);                                           \
+		}                                                                      \
 	}
 
-#define FUNC1SC(m_type, m_arg1) \
-	virtual void m_type(m_arg1 p1) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC1SC(m_type, m_arg1)                                                \
+	virtual void m_type(m_arg1 p1) const override {                            \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                        \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1); \
-		} \
+			SYNC_DEBUG                                                         \
+			MAIN_THREAD_SYNC_CHECK                                             \
+		} else {                                                               \
+			command_queue.flush_if_pending();                                  \
+			server_name->m_type(p1);                                           \
+		}                                                                      \
 	}
 
-#define FUNC1(m_type, m_arg1) \
-	virtual void m_type(m_arg1 p1) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC1(m_type, m_arg1)                                         \
+	virtual void m_type(m_arg1 p1) override {                         \
+		WRITE_ACTION                                                  \
+		if (ASYNC_COND_PUSH) {                                        \
 			command_queue.push(server_name, &ServerName::m_type, p1); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1); \
-		} \
+		} else {                                                      \
+			command_queue.flush_if_pending();                         \
+			server_name->m_type(p1);                                  \
+		}                                                             \
 	}
 
-#define FUNC1C(m_type, m_arg1) \
-	virtual void m_type(m_arg1 p1) const override { \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC1C(m_type, m_arg1)                                        \
+	virtual void m_type(m_arg1 p1) const override {                   \
+		if (ASYNC_COND_PUSH) {                                        \
 			command_queue.push(server_name, &ServerName::m_type, p1); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1); \
-		} \
+		} else {                                                      \
+			command_queue.flush_if_pending();                         \
+			server_name->m_type(p1);                                  \
+		}                                                             \
 	}
 
-#define FUNC2R(m_r, m_type, m_arg1, m_arg2) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC2R(m_r, m_type, m_arg1, m_arg2)                                             \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2) override {                                 \
+		WRITE_ACTION                                                                    \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                  \
+			m_r ret;                                                                    \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2); \
-		} \
+			SYNC_DEBUG                                                                  \
+			MAIN_THREAD_SYNC_CHECK                                                      \
+			return ret;                                                                 \
+		} else {                                                                        \
+			command_queue.flush_if_pending();                                           \
+			return server_name->m_type(p1, p2);                                         \
+		}                                                                               \
 	}
 
-#define FUNC2RC(m_r, m_type, m_arg1, m_arg2) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC2RC(m_r, m_type, m_arg1, m_arg2)                                            \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2) const override {                           \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                  \
+			m_r ret;                                                                    \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2); \
-		} \
+			SYNC_DEBUG                                                                  \
+			MAIN_THREAD_SYNC_CHECK                                                      \
+			return ret;                                                                 \
+		} else {                                                                        \
+			command_queue.flush_if_pending();                                           \
+			return server_name->m_type(p1, p2);                                         \
+		}                                                                               \
 	}
 
-#define FUNC2S(m_type, m_arg1, m_arg2) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC2S(m_type, m_arg1, m_arg2)                                             \
+	virtual void m_type(m_arg1 p1, m_arg2 p2) override {                           \
+		WRITE_ACTION                                                               \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                            \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2); \
-		} \
+			SYNC_DEBUG                                                             \
+			MAIN_THREAD_SYNC_CHECK                                                 \
+		} else {                                                                   \
+			command_queue.flush_if_pending();                                      \
+			server_name->m_type(p1, p2);                                           \
+		}                                                                          \
 	}
 
-#define FUNC2SC(m_type, m_arg1, m_arg2) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC2SC(m_type, m_arg1, m_arg2)                                            \
+	virtual void m_type(m_arg1 p1, m_arg2 p2) const override {                     \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                            \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2); \
-		} \
+			SYNC_DEBUG                                                             \
+			MAIN_THREAD_SYNC_CHECK                                                 \
+		} else {                                                                   \
+			command_queue.flush_if_pending();                                      \
+			server_name->m_type(p1, p2);                                           \
+		}                                                                          \
 	}
 
-#define FUNC2(m_type, m_arg1, m_arg2) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC2(m_type, m_arg1, m_arg2)                                     \
+	virtual void m_type(m_arg1 p1, m_arg2 p2) override {                  \
+		WRITE_ACTION                                                      \
+		if (ASYNC_COND_PUSH) {                                            \
 			command_queue.push(server_name, &ServerName::m_type, p1, p2); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2); \
-		} \
+		} else {                                                          \
+			command_queue.flush_if_pending();                             \
+			server_name->m_type(p1, p2);                                  \
+		}                                                                 \
 	}
 
-#define FUNC2C(m_type, m_arg1, m_arg2) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2) const override { \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC2C(m_type, m_arg1, m_arg2)                                    \
+	virtual void m_type(m_arg1 p1, m_arg2 p2) const override {            \
+		if (ASYNC_COND_PUSH) {                                            \
 			command_queue.push(server_name, &ServerName::m_type, p1, p2); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2); \
-		} \
+		} else {                                                          \
+			command_queue.flush_if_pending();                             \
+			server_name->m_type(p1, p2);                                  \
+		}                                                                 \
 	}
 
-#define FUNC3R(m_r, m_type, m_arg1, m_arg2, m_arg3) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC3R(m_r, m_type, m_arg1, m_arg2, m_arg3)                                         \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override {                          \
+		WRITE_ACTION                                                                        \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                      \
+			m_r ret;                                                                        \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3); \
-		} \
+			SYNC_DEBUG                                                                      \
+			MAIN_THREAD_SYNC_CHECK                                                          \
+			return ret;                                                                     \
+		} else {                                                                            \
+			command_queue.flush_if_pending();                                               \
+			return server_name->m_type(p1, p2, p3);                                         \
+		}                                                                                   \
 	}
 
-#define FUNC3RC(m_r, m_type, m_arg1, m_arg2, m_arg3) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC3RC(m_r, m_type, m_arg1, m_arg2, m_arg3)                                        \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override {                    \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                      \
+			m_r ret;                                                                        \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3); \
-		} \
+			SYNC_DEBUG                                                                      \
+			MAIN_THREAD_SYNC_CHECK                                                          \
+			return ret;                                                                     \
+		} else {                                                                            \
+			command_queue.flush_if_pending();                                               \
+			return server_name->m_type(p1, p2, p3);                                         \
+		}                                                                                   \
 	}
 
-#define FUNC3S(m_type, m_arg1, m_arg2, m_arg3) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC3S(m_type, m_arg1, m_arg2, m_arg3)                                         \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override {                    \
+		WRITE_ACTION                                                                   \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3); \
-		} \
+			SYNC_DEBUG                                                                 \
+			MAIN_THREAD_SYNC_CHECK                                                     \
+		} else {                                                                       \
+			command_queue.flush_if_pending();                                          \
+			server_name->m_type(p1, p2, p3);                                           \
+		}                                                                              \
 	}
 
-#define FUNC3SC(m_type, m_arg1, m_arg2, m_arg3) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC3SC(m_type, m_arg1, m_arg2, m_arg3)                                        \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override {              \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3); \
-		} \
+			SYNC_DEBUG                                                                 \
+			MAIN_THREAD_SYNC_CHECK                                                     \
+		} else {                                                                       \
+			command_queue.flush_if_pending();                                          \
+			server_name->m_type(p1, p2, p3);                                           \
+		}                                                                              \
 	}
 
-#define FUNC3(m_type, m_arg1, m_arg2, m_arg3) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC3(m_type, m_arg1, m_arg2, m_arg3)                                 \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) override {           \
+		WRITE_ACTION                                                          \
+		if (ASYNC_COND_PUSH) {                                                \
 			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3); \
-		} \
+		} else {                                                              \
+			command_queue.flush_if_pending();                                 \
+			server_name->m_type(p1, p2, p3);                                  \
+		}                                                                     \
 	}
 
-#define FUNC3C(m_type, m_arg1, m_arg2, m_arg3) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override { \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC3C(m_type, m_arg1, m_arg2, m_arg3)                                \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const override {     \
+		if (ASYNC_COND_PUSH) {                                                \
 			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3); \
-		} \
+		} else {                                                              \
+			command_queue.flush_if_pending();                                 \
+			server_name->m_type(p1, p2, p3);                                  \
+		}                                                                     \
 	}
 
-#define FUNC4R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC4R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4)                                     \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override {                   \
+		WRITE_ACTION                                                                            \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                          \
+			m_r ret;                                                                            \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4); \
-		} \
+			SYNC_DEBUG                                                                          \
+			MAIN_THREAD_SYNC_CHECK                                                              \
+			return ret;                                                                         \
+		} else {                                                                                \
+			command_queue.flush_if_pending();                                                   \
+			return server_name->m_type(p1, p2, p3, p4);                                         \
+		}                                                                                       \
 	}
 
-#define FUNC4RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC4RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4)                                    \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const override {             \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                          \
+			m_r ret;                                                                            \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4); \
-		} \
+			SYNC_DEBUG                                                                          \
+			MAIN_THREAD_SYNC_CHECK                                                              \
+			return ret;                                                                         \
+		} else {                                                                                \
+			command_queue.flush_if_pending();                                                   \
+			return server_name->m_type(p1, p2, p3, p4);                                         \
+		}                                                                                       \
 	}
 
-#define FUNC4S(m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC4S(m_type, m_arg1, m_arg2, m_arg3, m_arg4)                                     \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override {             \
+		WRITE_ACTION                                                                       \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                    \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4); \
-		} \
+			SYNC_DEBUG                                                                     \
+			MAIN_THREAD_SYNC_CHECK                                                         \
+		} else {                                                                           \
+			command_queue.flush_if_pending();                                              \
+			server_name->m_type(p1, p2, p3, p4);                                           \
+		}                                                                                  \
 	}
 
-#define FUNC4SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC4SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4)                                    \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const override {       \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                    \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4); \
-		} \
+			SYNC_DEBUG                                                                     \
+			MAIN_THREAD_SYNC_CHECK                                                         \
+		} else {                                                                           \
+			command_queue.flush_if_pending();                                              \
+			server_name->m_type(p1, p2, p3, p4);                                           \
+		}                                                                                  \
 	}
 
-#define FUNC4(m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
+#define FUNC4(m_type, m_arg1, m_arg2, m_arg3, m_arg4)                             \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) override {    \
+		WRITE_ACTION                                                              \
+		if (ASYNC_COND_PUSH) {                                                    \
 			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4); \
-		} \
+		} else {                                                                  \
+			command_queue.flush_if_pending();                                     \
+			server_name->m_type(p1, p2, p3, p4);                                  \
+		}                                                                         \
 	}
 
-#define FUNC4C(m_type, m_arg1, m_arg2, m_arg3, m_arg4) \
+#define FUNC4C(m_type, m_arg1, m_arg2, m_arg3, m_arg4)                               \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const override { \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4); \
-		} \
+		if (ASYNC_COND_PUSH) {                                                       \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4);    \
+		} else {                                                                     \
+			command_queue.flush_if_pending();                                        \
+			server_name->m_type(p1, p2, p3, p4);                                     \
+		}                                                                            \
 	}
 
-#define FUNC5R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC5R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                                 \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) {                     \
+		WRITE_ACTION                                                                                \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                              \
+			m_r ret;                                                                                \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+			SYNC_DEBUG                                                                              \
+			MAIN_THREAD_SYNC_CHECK                                                                  \
+			return ret;                                                                             \
+		} else {                                                                                    \
+			command_queue.flush_if_pending();                                                       \
+			return server_name->m_type(p1, p2, p3, p4, p5);                                         \
+		}                                                                                           \
 	}
 
-#define FUNC5RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC5RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                                \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) const override {      \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                              \
+			m_r ret;                                                                                \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+			SYNC_DEBUG                                                                              \
+			MAIN_THREAD_SYNC_CHECK                                                                  \
+			return ret;                                                                             \
+		} else {                                                                                    \
+			command_queue.flush_if_pending();                                                       \
+			return server_name->m_type(p1, p2, p3, p4, p5);                                         \
+		}                                                                                           \
 	}
 
-#define FUNC5S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
-	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
+#define FUNC5S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                                 \
+	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) override {      \
+		WRITE_ACTION                                                                           \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                        \
 			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+			SYNC_DEBUG                                                                         \
+			MAIN_THREAD_SYNC_CHECK                                                             \
+		} else {                                                                               \
+			command_queue.flush_if_pending();                                                  \
+			server_name->m_type(p1, p2, p3, p4, p5);                                           \
+		}                                                                                      \
 	}
 
-#define FUNC5SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
+#define FUNC5SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                                 \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                         \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5);  \
+			SYNC_DEBUG                                                                          \
+			MAIN_THREAD_SYNC_CHECK                                                              \
+		} else {                                                                                \
+			command_queue.flush_if_pending();                                                   \
+			server_name->m_type(p1, p2, p3, p4, p5);                                            \
+		}                                                                                       \
 	}
 
-#define FUNC5(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
+#define FUNC5(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                             \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+		WRITE_ACTION                                                                      \
+		if (ASYNC_COND_PUSH) {                                                            \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5);     \
+		} else {                                                                          \
+			command_queue.flush_if_pending();                                             \
+			server_name->m_type(p1, p2, p3, p4, p5);                                      \
+		}                                                                                 \
 	}
 
-#define FUNC5C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5) \
+#define FUNC5C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5)                                  \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) const override { \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5); \
-		} \
+		if (ASYNC_COND_PUSH) {                                                                  \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5);           \
+		} else {                                                                                \
+			command_queue.flush_if_pending();                                                   \
+			server_name->m_type(p1, p2, p3, p4, p5);                                            \
+		}                                                                                       \
 	}
 
-#define FUNC6R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
-	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
+#define FUNC6R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                             \
+	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) {              \
+		WRITE_ACTION                                                                                    \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                  \
+			m_r ret;                                                                                    \
 			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+			SYNC_DEBUG                                                                                  \
+			MAIN_THREAD_SYNC_CHECK                                                                      \
+			return ret;                                                                                 \
+		} else {                                                                                        \
+			command_queue.flush_if_pending();                                                           \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6);                                         \
+		}                                                                                               \
 	}
 
-#define FUNC6RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
+#define FUNC6RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                              \
 	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
-			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                    \
+			m_r ret;                                                                                      \
+			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6);   \
+			SYNC_DEBUG                                                                                    \
+			MAIN_THREAD_SYNC_CHECK                                                                        \
+			return ret;                                                                                   \
+		} else {                                                                                          \
+			command_queue.flush_if_pending();                                                             \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6);                                           \
+		}                                                                                                 \
 	}
 
-#define FUNC6S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
+#define FUNC6S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                               \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+		WRITE_ACTION                                                                                 \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                              \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6);   \
+			SYNC_DEBUG                                                                               \
+			MAIN_THREAD_SYNC_CHECK                                                                   \
+		} else {                                                                                     \
+			command_queue.flush_if_pending();                                                        \
+			server_name->m_type(p1, p2, p3, p4, p5, p6);                                             \
+		}                                                                                            \
 	}
 
-#define FUNC6SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
+#define FUNC6SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                                    \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                                    \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6);         \
+			SYNC_DEBUG                                                                                     \
+			MAIN_THREAD_SYNC_CHECK                                                                         \
+		} else {                                                                                           \
+			command_queue.flush_if_pending();                                                              \
+			server_name->m_type(p1, p2, p3, p4, p5, p6);                                                   \
+		}                                                                                                  \
 	}
 
-#define FUNC6(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
+#define FUNC6(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                                \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+		WRITE_ACTION                                                                                 \
+		if (ASYNC_COND_PUSH) {                                                                       \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6);            \
+		} else {                                                                                     \
+			command_queue.flush_if_pending();                                                        \
+			server_name->m_type(p1, p2, p3, p4, p5, p6);                                             \
+		}                                                                                            \
 	}
 
-#define FUNC6C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6) \
+#define FUNC6C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6)                                     \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) const override { \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6); \
-		} \
+		if (ASYNC_COND_PUSH) {                                                                             \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6);                  \
+		} else {                                                                                           \
+			command_queue.flush_if_pending();                                                              \
+			server_name->m_type(p1, p2, p3, p4, p5, p6);                                                   \
+		}                                                                                                  \
 	}
 
-#define FUNC7R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                            \
 	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
-			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		WRITE_ACTION                                                                                           \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                         \
+			m_r ret;                                                                                           \
+			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7);    \
+			SYNC_DEBUG                                                                                         \
+			MAIN_THREAD_SYNC_CHECK                                                                             \
+			return ret;                                                                                        \
+		} else {                                                                                               \
+			command_queue.flush_if_pending();                                                                  \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                            \
+		}                                                                                                      \
 	}
 
-#define FUNC7RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                                 \
 	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
-			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                               \
+			m_r ret;                                                                                                 \
+			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7);          \
+			SYNC_DEBUG                                                                                               \
+			MAIN_THREAD_SYNC_CHECK                                                                                   \
+			return ret;                                                                                              \
+		} else {                                                                                                     \
+			command_queue.flush_if_pending();                                                                        \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                                  \
+		}                                                                                                            \
 	}
 
-#define FUNC7S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                                  \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		WRITE_ACTION                                                                                            \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                                         \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7);          \
+			SYNC_DEBUG                                                                                          \
+			MAIN_THREAD_SYNC_CHECK                                                                              \
+		} else {                                                                                                \
+			command_queue.flush_if_pending();                                                                   \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                                    \
+		}                                                                                                       \
 	}
 
-#define FUNC7SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                                       \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                                               \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7);                \
+			SYNC_DEBUG                                                                                                \
+			MAIN_THREAD_SYNC_CHECK                                                                                    \
+		} else {                                                                                                      \
+			command_queue.flush_if_pending();                                                                         \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                                          \
+		}                                                                                                             \
 	}
 
-#define FUNC7(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                                   \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		WRITE_ACTION                                                                                            \
+		if (ASYNC_COND_PUSH) {                                                                                  \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7);                   \
+		} else {                                                                                                \
+			command_queue.flush_if_pending();                                                                   \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                                    \
+		}                                                                                                       \
 	}
 
-#define FUNC7C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7) \
+#define FUNC7C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7)                                        \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) const override { \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \
-		} \
+		if (ASYNC_COND_PUSH) {                                                                                        \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7);                         \
+		} else {                                                                                                      \
+			command_queue.flush_if_pending();                                                                         \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7);                                                          \
+		}                                                                                                             \
 	}
 
-#define FUNC8R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8R(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                               \
 	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
-			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7, p8); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		WRITE_ACTION                                                                                                      \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                                    \
+			m_r ret;                                                                                                      \
+			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7, p8);           \
+			SYNC_DEBUG                                                                                                    \
+			MAIN_THREAD_SYNC_CHECK                                                                                        \
+			return ret;                                                                                                   \
+		} else {                                                                                                          \
+			command_queue.flush_if_pending();                                                                             \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                   \
+		}                                                                                                                 \
 	}
 
-#define FUNC8RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8RC(m_r, m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                                    \
 	virtual m_r m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) const override { \
-		if (ASYNC_COND_PUSH_AND_RET) { \
-			m_r ret; \
-			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7, p8); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-			return ret; \
-		} else { \
-			command_queue.flush_if_pending(); \
-			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		if (ASYNC_COND_PUSH_AND_RET) {                                                                                          \
+			m_r ret;                                                                                                            \
+			command_queue.push_and_ret(server_name, &ServerName::m_type, &ret, p1, p2, p3, p4, p5, p6, p7, p8);                 \
+			SYNC_DEBUG                                                                                                          \
+			MAIN_THREAD_SYNC_CHECK                                                                                              \
+			return ret;                                                                                                         \
+		} else {                                                                                                                \
+			command_queue.flush_if_pending();                                                                                   \
+			return server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                         \
+		}                                                                                                                       \
 	}
 
-#define FUNC8S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8S(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                                     \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		WRITE_ACTION                                                                                                       \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                                                    \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8);                 \
+			SYNC_DEBUG                                                                                                     \
+			MAIN_THREAD_SYNC_CHECK                                                                                         \
+		} else {                                                                                                           \
+			command_queue.flush_if_pending();                                                                              \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                           \
+		}                                                                                                                  \
 	}
 
-#define FUNC8SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8SC(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                                          \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) const override { \
-		if (ASYNC_COND_PUSH_AND_SYNC) { \
-			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \
-			SYNC_DEBUG \
-			MAIN_THREAD_SYNC_CHECK \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		if (ASYNC_COND_PUSH_AND_SYNC) {                                                                                          \
+			command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8);                       \
+			SYNC_DEBUG                                                                                                           \
+			MAIN_THREAD_SYNC_CHECK                                                                                               \
+		} else {                                                                                                                 \
+			command_queue.flush_if_pending();                                                                                    \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                                 \
+		}                                                                                                                        \
 	}
 
-#define FUNC8(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                                      \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		WRITE_ACTION                                                                                                       \
+		if (ASYNC_COND_PUSH) {                                                                                             \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8);                          \
+		} else {                                                                                                           \
+			command_queue.flush_if_pending();                                                                              \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                           \
+		}                                                                                                                  \
 	}
 
-#define FUNC8C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8) \
+#define FUNC8C(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8)                                           \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) const override { \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \
-		} \
+		if (ASYNC_COND_PUSH) {                                                                                                   \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8);                                \
+		} else {                                                                                                                 \
+			command_queue.flush_if_pending();                                                                                    \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8);                                                                 \
+		}                                                                                                                        \
 	}
 
-#define FUNC9(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9) \
+#define FUNC9(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9)                                         \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9); \
-		} \
+		WRITE_ACTION                                                                                                                  \
+		if (ASYNC_COND_PUSH) {                                                                                                        \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9);                                 \
+		} else {                                                                                                                      \
+			command_queue.flush_if_pending();                                                                                         \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9);                                                                  \
+		}                                                                                                                             \
 	}
 
-#define FUNC10(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10) \
+#define FUNC10(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10)                                            \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); \
-		} \
+		WRITE_ACTION                                                                                                                               \
+		if (ASYNC_COND_PUSH) {                                                                                                                     \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);                                         \
+		} else {                                                                                                                                   \
+			command_queue.flush_if_pending();                                                                                                      \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);                                                                          \
+		}                                                                                                                                          \
 	}
 
-#define FUNC11(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11) \
+#define FUNC11(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11)                                                \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10, m_arg11 p11) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); \
-		} \
+		WRITE_ACTION                                                                                                                                            \
+		if (ASYNC_COND_PUSH) {                                                                                                                                  \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);                                                 \
+		} else {                                                                                                                                                \
+			command_queue.flush_if_pending();                                                                                                                   \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);                                                                                  \
+		}                                                                                                                                                       \
 	}
 
-#define FUNC12(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12) \
+#define FUNC12(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12)                                                    \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10, m_arg11 p11, m_arg12 p12) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); \
-		} \
+		WRITE_ACTION                                                                                                                                                         \
+		if (ASYNC_COND_PUSH) {                                                                                                                                               \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);                                                         \
+		} else {                                                                                                                                                             \
+			command_queue.flush_if_pending();                                                                                                                                \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);                                                                                          \
+		}                                                                                                                                                                    \
 	}
 
-#define FUNC13(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13) \
+#define FUNC13(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13)                                                        \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10, m_arg11 p11, m_arg12 p12, m_arg13 p13) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); \
-		} \
+		WRITE_ACTION                                                                                                                                                                      \
+		if (ASYNC_COND_PUSH) {                                                                                                                                                            \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);                                                                 \
+		} else {                                                                                                                                                                          \
+			command_queue.flush_if_pending();                                                                                                                                             \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);                                                                                                  \
+		}                                                                                                                                                                                 \
 	}
 
-#define FUNC14(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13, m_arg14) \
+#define FUNC14(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13, m_arg14)                                                            \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10, m_arg11 p11, m_arg12 p12, m_arg13 p13, m_arg14 p14) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14); \
-		} \
+		WRITE_ACTION                                                                                                                                                                                   \
+		if (ASYNC_COND_PUSH) {                                                                                                                                                                         \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);                                                                         \
+		} else {                                                                                                                                                                                       \
+			command_queue.flush_if_pending();                                                                                                                                                          \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);                                                                                                          \
+		}                                                                                                                                                                                              \
 	}
 
-#define FUNC15(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13, m_arg14, m_arg15) \
+#define FUNC15(m_type, m_arg1, m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_arg8, m_arg9, m_arg10, m_arg11, m_arg12, m_arg13, m_arg14, m_arg15)                                                                \
 	virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8, m_arg9 p9, m_arg10 p10, m_arg11 p11, m_arg12 p12, m_arg13 p13, m_arg14 p14, m_arg15 p15) override { \
-		WRITE_ACTION \
-		if (ASYNC_COND_PUSH) { \
-			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15); \
-		} else { \
-			command_queue.flush_if_pending(); \
-			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15); \
-		} \
+		WRITE_ACTION                                                                                                                                                                                                \
+		if (ASYNC_COND_PUSH) {                                                                                                                                                                                      \
+			command_queue.push(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);                                                                                 \
+		} else {                                                                                                                                                                                                    \
+			command_queue.flush_if_pending();                                                                                                                                                                       \
+			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);                                                                                                                  \
+		}                                                                                                                                                                                                           \
 	}
diff --git a/engine/servers/text/text_server.compat.inc b/engine/servers/text/text_server.compat.inc
index d614043d..2e035c97 100644
--- a/engine/servers/text/text_server.compat.inc
+++ b/engine/servers/text/text_server.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "text_server.h"
-
-#include "core/object/class_db.h"
-
 void TextServer::_font_draw_glyph_bind_compat_104872(const RID &p_font, const RID &p_canvas, int64_t p_size, const Vector2 &p_pos, int64_t p_index, const Color &p_color) const {
 	font_draw_glyph(p_font, p_canvas, p_size, p_pos, p_index, p_color, 0.0);
 }
@@ -62,4 +58,4 @@ void TextServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("shaped_text_get_word_breaks", "shaped", "grapheme_flags"), &TextServer::_shaped_text_get_word_breaks_bind_compat_90732, DEFVAL(GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION));
 }
 
-#endif // DISABLE_DEPRECATED
+#endif
diff --git a/engine/servers/text/text_server.cpp b/engine/servers/text/text_server.cpp
index 12a408b7..5514ec95 100644
--- a/engine/servers/text/text_server.cpp
+++ b/engine/servers/text/text_server.cpp
@@ -32,9 +32,7 @@
 #include "text_server.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
-#include "core/os/os.h"
 #include "core/variant/typed_array.h"
 #include "servers/rendering/rendering_server.h"
 
@@ -276,17 +274,9 @@ void TextServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("font_set_force_autohinter", "font_rid", "force_autohinter"), &TextServer::font_set_force_autohinter);
 	ClassDB::bind_method(D_METHOD("font_is_force_autohinter", "font_rid"), &TextServer::font_is_force_autohinter);
 
-	ClassDB::bind_method(D_METHOD("font_set_modulate_color_glyphs", "font_rid", "modulate"), &TextServer::font_set_modulate_color_glyphs);
+	ClassDB::bind_method(D_METHOD("font_set_modulate_color_glyphs", "font_rid", "force_autohinter"), &TextServer::font_set_modulate_color_glyphs);
 	ClassDB::bind_method(D_METHOD("font_is_modulate_color_glyphs", "font_rid"), &TextServer::font_is_modulate_color_glyphs);
 
-	ClassDB::bind_method(D_METHOD("font_get_palette_count", "font_rid"), &TextServer::font_get_palette_count);
-	ClassDB::bind_method(D_METHOD("font_get_palette_name", "font_rid", "index"), &TextServer::font_get_palette_name);
-	ClassDB::bind_method(D_METHOD("font_get_palette_colors", "font_rid", "index"), &TextServer::font_get_palette_colors);
-	ClassDB::bind_method(D_METHOD("font_set_palette_custom_colors", "font_rid", "colors"), &TextServer::font_set_palette_custom_colors);
-	ClassDB::bind_method(D_METHOD("font_get_palette_custom_colors", "font_rid"), &TextServer::font_get_palette_custom_colors);
-	ClassDB::bind_method(D_METHOD("font_get_used_palette", "font_rid"), &TextServer::font_get_used_palette);
-	ClassDB::bind_method(D_METHOD("font_set_used_palette", "font_rid", "index"), &TextServer::font_set_used_palette);
-
 	ClassDB::bind_method(D_METHOD("font_set_hinting", "font_rid", "hinting"), &TextServer::font_set_hinting);
 	ClassDB::bind_method(D_METHOD("font_get_hinting", "font_rid"), &TextServer::font_get_hinting);
 
@@ -2321,7 +2311,6 @@ TypedArray<Dictionary> TextServer::_shaped_text_get_glyphs_wrapper(const RID &p_
 		glyph["font_rid"] = glyphs[i].font_rid;
 		glyph["font_size"] = glyphs[i].font_size;
 		glyph["index"] = glyphs[i].index;
-		glyph["span_index"] = glyphs[i].span_index;
 
 		ret.push_back(glyph);
 	}
@@ -2347,7 +2336,6 @@ TypedArray<Dictionary> TextServer::_shaped_text_sort_logical_wrapper(const RID &
 		glyph["font_rid"] = glyphs[i].font_rid;
 		glyph["font_size"] = glyphs[i].font_size;
 		glyph["index"] = glyphs[i].index;
-		glyph["span_index"] = glyphs[i].span_index;
 
 		ret.push_back(glyph);
 	}
@@ -2373,7 +2361,6 @@ TypedArray<Dictionary> TextServer::_shaped_text_get_ellipsis_glyphs_wrapper(cons
 		glyph["font_rid"] = glyphs[i].font_rid;
 		glyph["font_size"] = glyphs[i].font_size;
 		glyph["index"] = glyphs[i].index;
-		glyph["span_index"] = glyphs[i].span_index;
 
 		ret.push_back(glyph);
 	}
diff --git a/engine/servers/text/text_server.h b/engine/servers/text/text_server.h
index f2da4fc3..89c9b5ef 100644
--- a/engine/servers/text/text_server.h
+++ b/engine/servers/text/text_server.h
@@ -332,14 +332,6 @@ public:
 	virtual void font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) = 0;
 	virtual bool font_is_modulate_color_glyphs(const RID &p_font_rid) const = 0;
 
-	virtual int64_t font_get_palette_count(const RID &p_font_rid) const = 0;
-	virtual String font_get_palette_name(const RID &p_font_rid, int64_t p_index) const = 0;
-	virtual Vector<Color> font_get_palette_colors(const RID &p_font_rid, int64_t p_index) const = 0;
-	virtual void font_set_palette_custom_colors(const RID &p_font_rid, const Vector<Color> &p_colors) = 0;
-	virtual Vector<Color> font_get_palette_custom_colors(const RID &p_font_rid) const = 0;
-	virtual int64_t font_get_used_palette(const RID &p_font_rid) const = 0;
-	virtual void font_set_used_palette(const RID &p_font_rid, int64_t p_index) = 0;
-
 	virtual void font_set_hinting(const RID &p_font_rid, Hinting p_hinting) = 0;
 	virtual Hinting font_get_hinting(const RID &p_font_rid) const = 0;
 
diff --git a/engine/servers/text/text_server_extension.cpp b/engine/servers/text/text_server_extension.cpp
index 49b3e1ec..0add1a9c 100644
--- a/engine/servers/text/text_server_extension.cpp
+++ b/engine/servers/text/text_server_extension.cpp
@@ -30,8 +30,6 @@
 
 #include "text_server_extension.h"
 
-#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
-
 void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_has_feature, "feature");
 	GDVIRTUAL_BIND(_get_name);
@@ -115,14 +113,6 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_font_set_modulate_color_glyphs, "font_rid", "modulate");
 	GDVIRTUAL_BIND(_font_is_modulate_color_glyphs, "font_rid");
 
-	GDVIRTUAL_BIND(_font_get_palette_count, "font_rid");
-	GDVIRTUAL_BIND(_font_get_palette_name, "font_rid", "index");
-	GDVIRTUAL_BIND(_font_get_palette_colors, "font_rid", "index");
-	GDVIRTUAL_BIND(_font_set_palette_custom_colors, "font_rid", "colors");
-	GDVIRTUAL_BIND(_font_get_palette_custom_colors, "font_rid");
-	GDVIRTUAL_BIND(_font_get_used_palette, "font_rid");
-	GDVIRTUAL_BIND(_font_set_used_palette, "font_rid", "index");
-
 	GDVIRTUAL_BIND(_font_set_hinting, "font_rid", "hinting");
 	GDVIRTUAL_BIND(_font_get_hinting, "font_rid");
 
@@ -698,43 +688,6 @@ bool TextServerExtension::font_is_modulate_color_glyphs(const RID &p_font_rid) c
 	return ret;
 }
 
-int64_t TextServerExtension::font_get_palette_count(const RID &p_font_rid) const {
-	int64_t ret = 0;
-	GDVIRTUAL_CALL(_font_get_palette_count, p_font_rid, ret);
-	return ret;
-}
-
-String TextServerExtension::font_get_palette_name(const RID &p_font_rid, int64_t p_index) const {
-	String ret;
-	GDVIRTUAL_CALL(_font_get_palette_name, p_font_rid, p_index, ret);
-	return ret;
-}
-Vector<Color> TextServerExtension::font_get_palette_colors(const RID &p_font_rid, int64_t p_index) const {
-	Vector<Color> ret;
-	GDVIRTUAL_CALL(_font_get_palette_colors, p_font_rid, p_index, ret);
-	return ret;
-}
-
-void TextServerExtension::font_set_palette_custom_colors(const RID &p_font_rid, const Vector<Color> &p_colors) {
-	GDVIRTUAL_CALL(_font_set_palette_custom_colors, p_font_rid, p_colors);
-}
-
-Vector<Color> TextServerExtension::font_get_palette_custom_colors(const RID &p_font_rid) const {
-	Vector<Color> ret;
-	GDVIRTUAL_CALL(_font_get_palette_custom_colors, p_font_rid, ret);
-	return ret;
-}
-
-int64_t TextServerExtension::font_get_used_palette(const RID &p_font_rid) const {
-	int64_t ret = 0;
-	GDVIRTUAL_CALL(_font_get_used_palette, p_font_rid, ret);
-	return ret;
-}
-
-void TextServerExtension::font_set_used_palette(const RID &p_font_rid, int64_t p_index) {
-	GDVIRTUAL_CALL(_font_set_used_palette, p_font_rid, p_index);
-}
-
 void TextServerExtension::font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	GDVIRTUAL_CALL(_font_set_hinting, p_font_rid, p_hinting);
 }
diff --git a/engine/servers/text/text_server_extension.h b/engine/servers/text/text_server_extension.h
index 407aa55c..0924758d 100644
--- a/engine/servers/text/text_server_extension.h
+++ b/engine/servers/text/text_server_extension.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"
@@ -213,21 +213,6 @@ public:
 	GDVIRTUAL2(_font_set_modulate_color_glyphs, RID, bool);
 	GDVIRTUAL1RC(bool, _font_is_modulate_color_glyphs, RID);
 
-	virtual int64_t font_get_palette_count(const RID &p_font_rid) const override;
-	GDVIRTUAL1RC(int64_t, _font_get_palette_count, const RID &);
-	virtual String font_get_palette_name(const RID &p_font_rid, int64_t p_index) const override;
-	GDVIRTUAL2RC(String, _font_get_palette_name, const RID &, int64_t);
-	virtual Vector<Color> font_get_palette_colors(const RID &p_font_rid, int64_t p_index) const override;
-	GDVIRTUAL2RC(Vector<Color>, _font_get_palette_colors, const RID &, int64_t);
-	virtual void font_set_palette_custom_colors(const RID &p_font_rid, const Vector<Color> &p_colors) override;
-	GDVIRTUAL2(_font_set_palette_custom_colors, const RID &, const Vector<Color> &);
-	virtual Vector<Color> font_get_palette_custom_colors(const RID &p_font_rid) const override;
-	GDVIRTUAL1RC(Vector<Color>, _font_get_palette_custom_colors, const RID &);
-	virtual int64_t font_get_used_palette(const RID &p_font_rid) const override;
-	GDVIRTUAL1RC(int64_t, _font_get_used_palette, const RID &);
-	virtual void font_set_used_palette(const RID &p_font_rid, int64_t p_index) override;
-	GDVIRTUAL2(_font_set_used_palette, const RID &, int64_t);
-
 	virtual void font_set_hinting(const RID &p_font_rid, Hinting p_hinting) override;
 	virtual Hinting font_get_hinting(const RID &p_font_rid) const override;
 	GDVIRTUAL2(_font_set_hinting, RID, Hinting);
diff --git a/engine/servers/xr/xr_body_tracker.cpp b/engine/servers/xr/xr_body_tracker.cpp
index a5f82846..93722fea 100644
--- a/engine/servers/xr/xr_body_tracker.cpp
+++ b/engine/servers/xr/xr_body_tracker.cpp
@@ -30,8 +30,6 @@
 
 #include "xr_body_tracker.h"
 
-#include "core/object/class_db.h"
-
 void XRBodyTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_has_tracking_data", "has_data"), &XRBodyTracker::set_has_tracking_data);
 	ClassDB::bind_method(D_METHOD("get_has_tracking_data"), &XRBodyTracker::get_has_tracking_data);
diff --git a/engine/servers/xr/xr_face_tracker.cpp b/engine/servers/xr/xr_face_tracker.cpp
index f61434a8..7015cd08 100644
--- a/engine/servers/xr/xr_face_tracker.cpp
+++ b/engine/servers/xr/xr_face_tracker.cpp
@@ -30,8 +30,6 @@
 
 #include "xr_face_tracker.h"
 
-#include "core/object/class_db.h"
-
 void XRFaceTracker::_bind_methods() {
 	// Base Shapes
 	BIND_ENUM_CONSTANT(FT_EYE_LOOK_OUT_RIGHT);
diff --git a/engine/servers/xr/xr_hand_tracker.cpp b/engine/servers/xr/xr_hand_tracker.cpp
index 4edfccce..9013d885 100644
--- a/engine/servers/xr/xr_hand_tracker.cpp
+++ b/engine/servers/xr/xr_hand_tracker.cpp
@@ -30,8 +30,6 @@
 
 #include "xr_hand_tracker.h"
 
-#include "core/object/class_db.h"
-
 void XRHandTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_has_tracking_data", "has_data"), &XRHandTracker::set_has_tracking_data);
 	ClassDB::bind_method(D_METHOD("get_has_tracking_data"), &XRHandTracker::get_has_tracking_data);
diff --git a/engine/servers/xr/xr_interface.cpp b/engine/servers/xr/xr_interface.cpp
index 1800c91d..d841cb30 100644
--- a/engine/servers/xr/xr_interface.cpp
+++ b/engine/servers/xr/xr_interface.cpp
@@ -30,9 +30,6 @@
 
 #include "xr_interface.h"
 
-#include "core/object/class_db.h"
-#include "servers/xr/xr_server.h"
-
 void XRInterface::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("play_area_changed", PropertyInfo(Variant::INT, "mode")));
 
diff --git a/engine/servers/xr/xr_interface.h b/engine/servers/xr/xr_interface.h
index 5c8bd894..5af4f947 100644
--- a/engine/servers/xr/xr_interface.h
+++ b/engine/servers/xr/xr_interface.h
@@ -30,9 +30,13 @@
 
 #pragma once
 
-#include "core/object/ref_counted.h"
+#include "core/math/projection.h"
 #include "core/os/thread_safe.h"
-#include "core/variant/type_info.h"
+#include "servers/xr/xr_server.h"
+#include "xr_vrs.h"
+
+// forward declaration
+struct BlitToScreen;
 
 /**
 	The XR interface is a template class on top of which we build interface to different AR, VR and tracking SDKs.
@@ -44,12 +48,6 @@
 	Note that we may make this into a fully instantiable class for GDExtension support.
 */
 
-struct Projection;
-
-namespace RenderingServerTypes {
-struct BlitToScreen;
-}
-
 class XRInterface : public RefCounted {
 	GDCLASS(XRInterface, RefCounted);
 
@@ -150,7 +148,7 @@ public:
 	virtual Rect2i get_render_region();
 	virtual void pre_render() {}
 	virtual bool pre_draw_viewport(RID p_render_target) { return true; } /* inform XR interface we are about to start our viewport draw process */
-	virtual Vector<RenderingServerTypes::BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) = 0; /* inform XR interface we finished our viewport draw process */
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) = 0; /* inform XR interface we finished our viewport draw process */
 	virtual void end_frame() {}
 
 	/** passthrough **/
diff --git a/engine/servers/xr/xr_interface_extension.cpp b/engine/servers/xr/xr_interface_extension.cpp
index 505570f1..782c358f 100644
--- a/engine/servers/xr/xr_interface_extension.cpp
+++ b/engine/servers/xr/xr_interface_extension.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "xr_interface_extension.h"
-
-#include "core/object/class_db.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 
 void XRInterfaceExtension::_bind_methods() {
@@ -272,7 +270,7 @@ RID XRInterfaceExtension::get_velocity_texture() {
 }
 
 void XRInterfaceExtension::add_blit(RID p_render_target, Rect2 p_src_rect, Rect2i p_dst_rect, bool p_use_layer, uint32_t p_layer, bool p_apply_lens_distortion, Vector2 p_eye_center, double p_k1, double p_k2, double p_upscale, double p_aspect_ratio) {
-	RenderingServerTypes::BlitToScreen blit;
+	BlitToScreen blit;
 
 	ERR_FAIL_COND_MSG(!can_add_blits, "add_blit can only be called from an XR plugin from within _post_draw_viewport!");
 
@@ -307,7 +305,7 @@ bool XRInterfaceExtension::pre_draw_viewport(RID p_render_target) {
 	return do_render; // If not implemented we're returning true.
 }
 
-Vector<RenderingServerTypes::BlitToScreen> XRInterfaceExtension::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
+Vector<BlitToScreen> XRInterfaceExtension::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
 	// This is just so our XR plugin can add blits...
 	blits.clear();
 	can_add_blits = true;
diff --git a/engine/servers/xr/xr_interface_extension.h b/engine/servers/xr/xr_interface_extension.h
index aac93282..fd427ff6 100644
--- a/engine/servers/xr/xr_interface_extension.h
+++ b/engine/servers/xr/xr_interface_extension.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/gdvirtual.gen.h"
 #include "servers/xr/xr_interface.h"
 
 class XRInterfaceExtension : public XRInterface {
@@ -39,7 +38,7 @@ class XRInterfaceExtension : public XRInterface {
 public:
 private:
 	bool can_add_blits = false;
-	Vector<RenderingServerTypes::BlitToScreen> blits;
+	Vector<BlitToScreen> blits;
 
 protected:
 	_THREAD_SAFE_CLASS_
@@ -125,7 +124,7 @@ public:
 	virtual void process() override;
 	virtual void pre_render() override;
 	virtual bool pre_draw_viewport(RID p_render_target) override;
-	virtual Vector<RenderingServerTypes::BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
 	virtual void end_frame() override;
 
 	GDVIRTUAL0(_process);
diff --git a/engine/servers/xr/xr_pose.cpp b/engine/servers/xr/xr_pose.cpp
index 6d83b11d..32628dce 100644
--- a/engine/servers/xr/xr_pose.cpp
+++ b/engine/servers/xr/xr_pose.cpp
@@ -30,7 +30,6 @@
 
 #include "xr_pose.h"
 
-#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 void XRPose::_bind_methods() {
diff --git a/engine/servers/xr/xr_pose.h b/engine/servers/xr/xr_pose.h
index 65a15b32..647ad1a0 100644
--- a/engine/servers/xr/xr_pose.h
+++ b/engine/servers/xr/xr_pose.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/object/ref_counted.h"
-#include "core/variant/type_info.h"
 
 class XRPose : public RefCounted {
 	GDCLASS(XRPose, RefCounted);
diff --git a/engine/servers/xr/xr_positional_tracker.cpp b/engine/servers/xr/xr_positional_tracker.cpp
index 7e1ee275..c8fd3b84 100644
--- a/engine/servers/xr/xr_positional_tracker.cpp
+++ b/engine/servers/xr/xr_positional_tracker.cpp
@@ -30,8 +30,7 @@
 
 #include "xr_positional_tracker.h"
 
-#include "core/object/class_db.h"
-#include "servers/xr/xr_controller_tracker.h"
+#include "xr_controller_tracker.h"
 
 void XRPositionalTracker::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRACKER_HAND_UNKNOWN);
@@ -51,8 +50,8 @@ void XRPositionalTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_pose", "name"), &XRPositionalTracker::get_pose);
 	ClassDB::bind_method(D_METHOD("invalidate_pose", "name"), &XRPositionalTracker::invalidate_pose);
 	ClassDB::bind_method(D_METHOD("set_pose", "name", "transform", "linear_velocity", "angular_velocity", "tracking_confidence"), &XRPositionalTracker::set_pose);
-	ADD_SIGNAL(MethodInfo("pose_changed", PropertyInfo(Variant::OBJECT, "pose", PROPERTY_HINT_RESOURCE_TYPE, XRPose::get_class_static())));
-	ADD_SIGNAL(MethodInfo("pose_lost_tracking", PropertyInfo(Variant::OBJECT, "pose", PROPERTY_HINT_RESOURCE_TYPE, XRPose::get_class_static())));
+	ADD_SIGNAL(MethodInfo("pose_changed", PropertyInfo(Variant::OBJECT, "pose", PROPERTY_HINT_RESOURCE_TYPE, "XRPose")));
+	ADD_SIGNAL(MethodInfo("pose_lost_tracking", PropertyInfo(Variant::OBJECT, "pose", PROPERTY_HINT_RESOURCE_TYPE, "XRPose")));
 
 	ClassDB::bind_method(D_METHOD("get_input", "name"), &XRPositionalTracker::get_input);
 	ClassDB::bind_method(D_METHOD("set_input", "name", "value"), &XRPositionalTracker::set_input);
diff --git a/engine/servers/xr/xr_server.compat.inc b/engine/servers/xr/xr_server.compat.inc
index 878dec02..967666fa 100644
--- a/engine/servers/xr/xr_server.compat.inc
+++ b/engine/servers/xr/xr_server.compat.inc
@@ -30,10 +30,6 @@
 
 #ifndef DISABLE_DEPRECATED
 
-#include "xr_server.h"
-
-#include "core/object/class_db.h"
-
 void XRServer::_add_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker) {
 	add_tracker(p_tracker);
 }
diff --git a/engine/servers/xr/xr_server.cpp b/engine/servers/xr/xr_server.cpp
index 2c16e21b..a42ee886 100644
--- a/engine/servers/xr/xr_server.cpp
+++ b/engine/servers/xr/xr_server.cpp
@@ -32,9 +32,6 @@
 #include "xr_server.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_positional_tracker.h"
 
@@ -110,8 +107,6 @@ void XRServer::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("tracker_added", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
 	ADD_SIGNAL(MethodInfo("tracker_updated", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
 	ADD_SIGNAL(MethodInfo("tracker_removed", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
-
-	ADD_SIGNAL(MethodInfo("world_origin_changed"));
 }
 
 double XRServer::get_world_scale() const {
@@ -162,7 +157,6 @@ Transform3D XRServer::get_world_origin() const {
 
 void XRServer::set_world_origin(const Transform3D &p_world_origin) {
 	world_origin = p_world_origin;
-	emit_signal(SNAME("world_origin_changed"));
 	set_render_world_origin(world_origin);
 }
 
@@ -240,30 +234,6 @@ void XRServer::_set_render_reference_frame(const Transform3D &p_reference_frame)
 	xr_server->render_state.reference_frame = p_reference_frame;
 }
 
-void XRServer::set_render_world_scale(double p_world_scale) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_world_scale).bind(p_world_scale));
-}
-
-void XRServer::set_render_world_origin(const Transform3D &p_world_origin) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_world_origin).bind(p_world_origin));
-}
-
-void XRServer::set_render_reference_frame(const Transform3D &p_reference_frame) {
-	// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
-	RenderingServer *rendering_server = RenderingServer::get_singleton();
-	ERR_FAIL_NULL(rendering_server);
-
-	rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_reference_frame).bind(p_reference_frame));
-}
-
 Transform3D XRServer::get_hmd_transform() {
 	Transform3D hmd_transform;
 	if (primary_interface.is_valid()) {
@@ -279,9 +249,11 @@ void XRServer::set_camera_locked_to_origin(bool p_enable) {
 void XRServer::add_interface(const Ref<XRInterface> &p_interface) {
 	ERR_FAIL_COND(p_interface.is_null());
 
-	if (interfaces.has(p_interface)) {
-		ERR_PRINT("Interface was already added");
-		return;
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i] == p_interface) {
+			ERR_PRINT("Interface was already added");
+			return;
+		}
 	}
 
 	interfaces.push_back(p_interface);
@@ -291,7 +263,14 @@ void XRServer::add_interface(const Ref<XRInterface> &p_interface) {
 void XRServer::remove_interface(const Ref<XRInterface> &p_interface) {
 	ERR_FAIL_COND(p_interface.is_null());
 
-	int idx = interfaces.find(p_interface);
+	int idx = -1;
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i] == p_interface) {
+			idx = i;
+			break;
+		}
+	}
+
 	ERR_FAIL_COND_MSG(idx == -1, "Interface not found.");
 	print_verbose("XR: Removed interface \"" + p_interface->get_name() + "\"");
 	emit_signal(SNAME("interface_removed"), p_interface->get_name());
@@ -303,15 +282,15 @@ int XRServer::get_interface_count() const {
 }
 
 Ref<XRInterface> XRServer::get_interface(int p_index) const {
-	ERR_FAIL_INDEX_V(p_index, (int)interfaces.size(), nullptr);
+	ERR_FAIL_INDEX_V(p_index, interfaces.size(), nullptr);
 
 	return interfaces[p_index];
 }
 
 Ref<XRInterface> XRServer::find_interface(const String &p_name) const {
-	for (const Ref<XRInterface> &interface : interfaces) {
-		if (interface->get_name() == p_name) {
-			return interface;
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i]->get_name() == p_name) {
+			return interfaces[i];
 		}
 	}
 	return Ref<XRInterface>();
@@ -320,7 +299,7 @@ Ref<XRInterface> XRServer::find_interface(const String &p_name) const {
 TypedArray<Dictionary> XRServer::get_interfaces() const {
 	Array ret;
 
-	for (uint32_t i = 0; i < interfaces.size(); i++) {
+	for (int i = 0; i < interfaces.size(); i++) {
 		Dictionary iface_info;
 
 		iface_info["id"] = i;
@@ -401,11 +380,12 @@ Ref<XRTracker> XRServer::get_tracker(const StringName &p_name) const {
 PackedStringArray XRServer::get_suggested_tracker_names() const {
 	PackedStringArray arr;
 
-	for (const Ref<XRInterface> &interface : interfaces) {
+	for (int i = 0; i < interfaces.size(); i++) {
+		Ref<XRInterface> interface = interfaces[i];
 		PackedStringArray interface_arr = interface->get_suggested_tracker_names();
-		for (int i = 0; i < interface_arr.size(); i++) {
-			if (!arr.has(interface_arr[i])) {
-				arr.push_back(interface_arr[i]);
+		for (int a = 0; a < interface_arr.size(); a++) {
+			if (!arr.has(interface_arr[a])) {
+				arr.push_back(interface_arr[a]);
 			}
 		}
 	}
@@ -423,7 +403,8 @@ PackedStringArray XRServer::get_suggested_tracker_names() const {
 PackedStringArray XRServer::get_suggested_pose_names(const StringName &p_tracker_name) const {
 	PackedStringArray arr;
 
-	for (const Ref<XRInterface> &interface : interfaces) {
+	for (int i = 0; i < interfaces.size(); i++) {
+		Ref<XRInterface> interface = interfaces[i];
 		PackedStringArray interface_arr = interface->get_suggested_pose_names(p_tracker_name);
 		for (int a = 0; a < interface_arr.size(); a++) {
 			if (!arr.has(interface_arr[a])) {
@@ -451,11 +432,11 @@ void XRServer::_process() {
 	// note that we can have multiple interfaces active if we have interfaces that purely handle tracking
 
 	// process all active interfaces
-	for (const Ref<XRInterface> &interface : interfaces) {
-		if (interface.is_null()) {
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i].is_null()) {
 			// ignore, not a valid reference
-		} else if (interface->is_initialized()) {
-			interface->process();
+		} else if (interfaces[i]->is_initialized()) {
+			interfaces.write[i]->process();
 		}
 	}
 }
@@ -465,11 +446,11 @@ void XRServer::pre_render() {
 	// note that we can have multiple interfaces active if we have interfaces that purely handle tracking
 
 	// process all active interfaces
-	for (const Ref<XRInterface> &interface : interfaces) {
-		if (interface.is_null()) {
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i].is_null()) {
 			// ignore, not a valid reference
-		} else if (interface->is_initialized()) {
-			interface->pre_render();
+		} else if (interfaces[i]->is_initialized()) {
+			interfaces.write[i]->pre_render();
 		}
 	}
 }
@@ -478,11 +459,11 @@ void XRServer::end_frame() {
 	// called from RenderingServerDefault after Vulkan queues have been submitted
 
 	// process all active interfaces
-	for (const Ref<XRInterface> &interface : interfaces) {
-		if (interface.is_null()) {
+	for (int i = 0; i < interfaces.size(); i++) {
+		if (interfaces[i].is_null()) {
 			// ignore, not a valid reference
-		} else if (interface->is_initialized()) {
-			interface->end_frame();
+		} else if (interfaces[i]->is_initialized()) {
+			interfaces.write[i]->end_frame();
 		}
 	}
 }
diff --git a/engine/servers/xr/xr_server.h b/engine/servers/xr/xr_server.h
index 31bc4df1..e76c5672 100644
--- a/engine/servers/xr/xr_server.h
+++ b/engine/servers/xr/xr_server.h
@@ -32,8 +32,8 @@
 
 #include "core/object/ref_counted.h"
 #include "core/os/thread_safe.h"
-#include "core/variant/type_info.h"
 #include "core/variant/variant.h"
+#include "servers/rendering/rendering_server.h"
 
 class XRInterface;
 class XRTracker;
@@ -85,7 +85,7 @@ public:
 private:
 	static XRMode xr_mode;
 
-	LocalVector<Ref<XRInterface>> interfaces;
+	Vector<Ref<XRInterface>> interfaces;
 	Dictionary trackers;
 
 	Ref<XRInterface> primary_interface; /* we'll identify one interface as primary, this will be used by our viewports */
@@ -107,9 +107,29 @@ private:
 	static void _set_render_world_origin(const Transform3D &p_world_origin);
 	static void _set_render_reference_frame(const Transform3D &p_reference_frame);
 
-	void set_render_world_scale(double p_world_scale);
-	void set_render_world_origin(const Transform3D &p_world_origin);
-	void set_render_reference_frame(const Transform3D &p_reference_frame);
+	_FORCE_INLINE_ void set_render_world_scale(double p_world_scale) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_world_scale).bind(p_world_scale));
+	}
+
+	_FORCE_INLINE_ void set_render_world_origin(const Transform3D &p_world_origin) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_world_origin).bind(p_world_origin));
+	}
+
+	_FORCE_INLINE_ void set_render_reference_frame(const Transform3D &p_reference_frame) {
+		// If we're rendering on a separate thread, we may still be processing the last frame, don't communicate this till we're ready...
+		RenderingServer *rendering_server = RenderingServer::get_singleton();
+		ERR_FAIL_NULL(rendering_server);
+
+		rendering_server->call_on_render_thread(callable_mp_static(&XRServer::_set_render_reference_frame).bind(p_reference_frame));
+	}
 
 protected:
 	static XRServer *singleton;
diff --git a/engine/servers/xr/xr_tracker.cpp b/engine/servers/xr/xr_tracker.cpp
index 22f87da2..b0b2f3f3 100644
--- a/engine/servers/xr/xr_tracker.cpp
+++ b/engine/servers/xr/xr_tracker.cpp
@@ -30,8 +30,6 @@
 
 #include "xr_tracker.h"
 
-#include "core/object/class_db.h"
-
 void XRTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_tracker_type"), &XRTracker::get_tracker_type);
 	ClassDB::bind_method(D_METHOD("set_tracker_type", "type"), &XRTracker::set_tracker_type);
diff --git a/engine/servers/xr/xr_vrs.cpp b/engine/servers/xr/xr_vrs.cpp
index 0a6b38c5..0fdadfdb 100644
--- a/engine/servers/xr/xr_vrs.cpp
+++ b/engine/servers/xr/xr_vrs.cpp
@@ -30,9 +30,7 @@
 
 #include "xr_vrs.h"
 
-#include "core/object/class_db.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server.h"
 
 void XRVRS::_bind_methods() {
@@ -103,7 +101,7 @@ void XRVRS::set_vrs_render_region(const Rect2i &p_vrs_render_region) {
 	vrs_dirty = true;
 }
 
-RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const Vector<Vector2> &p_eye_foci) {
+RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci) {
 	ERR_FAIL_COND_V(p_eye_foci.is_empty(), RID());
 
 	Size2i texel_size = RD::get_singleton()->vrs_get_texel_size();
@@ -171,7 +169,7 @@ RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const Vector<Vector2> &p
 		if (images.size() == 1) {
 			vrs_texture = RS::get_singleton()->texture_2d_create(images[0]);
 		} else {
-			vrs_texture = RS::get_singleton()->texture_2d_layered_create(images, RSE::TEXTURE_LAYERED_2D_ARRAY);
+			vrs_texture = RS::get_singleton()->texture_2d_layered_create(images, RS::TEXTURE_LAYERED_2D_ARRAY);
 		}
 
 		vrs_dirty = false;
diff --git a/engine/servers/xr/xr_vrs.h b/engine/servers/xr/xr_vrs.h
index 9d5e6621..231124c1 100644
--- a/engine/servers/xr/xr_vrs.h
+++ b/engine/servers/xr/xr_vrs.h
@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "core/math/vector2i.h"
+#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/templates/rid.h"
-#include "core/templates/vector.h"
+#include "core/variant/variant.h"
 
 /* This is a helper class for generating stereoscopic VRS images */
 
@@ -48,7 +48,7 @@ private:
 
 	RID vrs_texture;
 	Size2i target_size;
-	Vector<Vector2> eye_foci;
+	PackedVector2Array eye_foci;
 
 protected:
 	static void _bind_methods();
@@ -63,5 +63,5 @@ public:
 	Rect2i get_vrs_render_region() const;
 	void set_vrs_render_region(const Rect2i &p_vrs_render_region);
 
-	RID make_vrs_texture(const Size2 &p_target_size, const Vector<Vector2> &p_eye_foci);
+	RID make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci);
 };
diff --git a/engine/tests/SCsub b/engine/tests/SCsub
index acf69849..169c7c1e 100644
--- a/engine/tests/SCsub
+++ b/engine/tests/SCsub
@@ -1,25 +1,23 @@
 #!/usr/bin/env python
 from misc.utility.scons_hints import *
 
-import glob
-
-import test_builders
-
 Import("env")
 
-# Sources with tests must be explicitly linked first.
-force_link_sources = glob.glob("*/**/*.cpp", recursive=True)
-force_link_header = env.CommandNoCache(
-    "force_link.gen.h", env.Value(force_link_sources), env.Run(test_builders.force_link_builder)
-)
-env.Depends(force_link_header, "test_builders.py")
+env.tests_sources = []
 
-tests_obj = []
-if env["scu_build"]:
-    # HACK: SCU setup doesn't support recursive/dynamic setup, so we must manually pass the files.
-    env.add_source_files(tests_obj, glob.glob(".scu/*.cpp"))
-else:
-    env.add_source_files(tests_obj, glob.glob("*.cpp") + force_link_sources)
+env_tests = env.Clone()
 
-lib = env.add_library("tests", tests_obj)
+# We must disable the THREAD_LOCAL entirely in doctest to prevent crashes on debugging
+# Since we link with /MT thread_local is always expired when the header is used
+# So the debugger crashes the engine and it causes weird errors
+# Explained in https://github.com/onqtam/doctest/issues/401
+if env_tests["platform"] == "windows":
+    env_tests.Append(CPPDEFINES=[("DOCTEST_THREAD_LOCAL", "")])
+
+if env["disable_exceptions"]:
+    env_tests.Append(CPPDEFINES=["DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS"])
+
+env_tests.add_source_files(env.tests_sources, "*.cpp")
+
+lib = env_tests.add_library("tests", env.tests_sources)
 env.Prepend(LIBS=[lib])
diff --git a/engine/tests/compatibility_test/.gitignore b/engine/tests/compatibility_test/.gitignore
deleted file mode 100644
index 5823eb7e..00000000
--- a/engine/tests/compatibility_test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-godot/.godot
-src/deps/gdextension_interface.h
diff --git a/engine/tests/compatibility_test/SConstruct b/engine/tests/compatibility_test/SConstruct
deleted file mode 100644
index f89eb7bf..00000000
--- a/engine/tests/compatibility_test/SConstruct
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# ruff: noqa: F821
-
-env = Environment()
-
-env.Append(CPPPATH=["src"])
-env.Append(CFLAGS=["-O0", "-g"])
-
-library = env.SharedLibrary(
-    target="#godot/compatibility_test",
-    source="#src/compat_checker.c",
-)
-
-env.Default(library)
diff --git a/engine/tests/compatibility_test/godot/compatibility_test.gdextension b/engine/tests/compatibility_test/godot/compatibility_test.gdextension
deleted file mode 100644
index f71f86d0..00000000
--- a/engine/tests/compatibility_test/godot/compatibility_test.gdextension
+++ /dev/null
@@ -1,6 +0,0 @@
-[configuration]
-entry_symbol = "compatibility_test_init"
-compatibility_minimum = 4.1
-
-[libraries]
-linux.debug.x86_64 = "res://libcompatibility_test.so"
diff --git a/engine/tests/compatibility_test/godot/compatibility_test.gdextension.uid b/engine/tests/compatibility_test/godot/compatibility_test.gdextension.uid
deleted file mode 100644
index 6e36a101..00000000
--- a/engine/tests/compatibility_test/godot/compatibility_test.gdextension.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://0h75rfqrneh3
diff --git a/engine/tests/compatibility_test/godot/project.godot b/engine/tests/compatibility_test/godot/project.godot
deleted file mode 100644
index c333f9ed..00000000
--- a/engine/tests/compatibility_test/godot/project.godot
+++ /dev/null
@@ -1,14 +0,0 @@
-; Engine configuration file.
-; It's best edited using the editor UI and not directly,
-; since the parameters that go here are not all obvious.
-;
-; Format:
-;   [section] ; section goes between []
-;   param=value ; assign values to parameters
-
-config_version=5
-
-[application]
-
-config/name="CompatibilityTest"
-run/flush_stdout_on_print=true
diff --git a/engine/tests/compatibility_test/run_compatibility_test.py b/engine/tests/compatibility_test/run_compatibility_test.py
deleted file mode 100755
index cb898f63..00000000
--- a/engine/tests/compatibility_test/run_compatibility_test.py
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-import itertools
-import json
-import os
-import pathlib
-import subprocess
-import urllib.request
-from typing import Any
-
-PROJECT_PATH = pathlib.Path(__file__).parent.resolve().joinpath("godot")
-CLASS_METHODS_FILE = PROJECT_PATH.joinpath("class_methods.txt")
-BUILTIN_METHODS_FILE = PROJECT_PATH.joinpath("builtin_methods.txt")
-UTILITY_FUNCTIONS_FILE = PROJECT_PATH.joinpath("utility_functions.txt")
-
-
-def download_gdextension_api(reftag: str) -> dict[str, Any]:
-    with urllib.request.urlopen(
-        f"https://raw.githubusercontent.com/godotengine/godot-cpp/godot-{reftag}/gdextension/extension_api.json"
-    ) as f:
-        gdextension_api_json: dict[str, Any] = json.load(f)
-    return gdextension_api_json
-
-
-def remove_test_data_files():
-    for test_data in [CLASS_METHODS_FILE, BUILTIN_METHODS_FILE, UTILITY_FUNCTIONS_FILE]:
-        if os.path.isfile(test_data):
-            os.remove(test_data)
-
-
-def generate_test_data_files(reftag: str):
-    """
-    Parses methods specified in given Godot version into a form readable by the compatibility checker GDExtension.
-    """
-    gdextension_reference_json = download_gdextension_api(reftag)
-
-    with open(CLASS_METHODS_FILE, "w") as classes_file:
-        classes_file.writelines([
-            f"{klass['name']} {func['name']} {func['hash']}\n"
-            for (klass, func) in itertools.chain(
-                (
-                    (klass, method)
-                    for klass in gdextension_reference_json["classes"]
-                    for method in klass.get("methods", [])
-                    if not method.get("is_virtual")
-                ),
-            )
-        ])
-
-    variant_types: dict[str, int] | None = None
-    for global_enum in gdextension_reference_json["global_enums"]:
-        if global_enum.get("name") != "Variant.Type":
-            continue
-        variant_types = {
-            variant_type.get("name").removeprefix("TYPE_").lower().replace("_", ""): variant_type.get("value")
-            for variant_type in global_enum.get("values")
-        }
-
-    if not variant_types:
-        return
-
-    with open(BUILTIN_METHODS_FILE, "w") as f:
-        f.writelines([
-            f"{variant_types[klass['name'].lower()]} {func['name']} {func['hash']}\n"
-            for (klass, func) in itertools.chain(
-                (
-                    (klass, method)
-                    for klass in gdextension_reference_json["builtin_classes"]
-                    for method in klass.get("methods", [])
-                ),
-            )
-        ])
-
-    with open(UTILITY_FUNCTIONS_FILE, "w") as f:
-        f.writelines([f"{func['name']} {func['hash']}\n" for func in gdextension_reference_json["utility_functions"]])
-
-
-def has_compatibility_test_failed(errors: str) -> bool:
-    """
-    Checks if provided errors are related to the compatibility test.
-
-    Makes sure that test won't fail on unrelated account (for example editor misconfiguration).
-    """
-    compatibility_errors = [
-        "Error loading extension",
-        "Failed to load interface method",
-        'Parameter "mb" is null.',
-        'Parameter "bfi" is null.',
-        "Method bind not found:",
-        "Utility function not found:",
-        "has changed and no compatibility fallback has been provided",
-        "Failed to open file `builtin_methods.txt`",
-        "Failed to open file `class_methods.txt`",
-        "Failed to open file `utility_functions.txt`",
-        "Failed to open file `platform_methods.txt`",
-        "Outcome = FAILURE",
-    ]
-
-    return any(compatibility_error in errors for compatibility_error in compatibility_errors)
-
-
-def process_compatibility_test(proc: subprocess.Popen[bytes], timeout: int = 5) -> str | None:
-    """
-    Returns the stderr output as a string, if any.
-
-    Terminates test if nothing has been written to stdout/stderr for specified time.
-    """
-    errors = bytearray()
-
-    while True:
-        try:
-            _out, err = proc.communicate(timeout=timeout)
-            if err:
-                errors.extend(err)
-        except subprocess.TimeoutExpired:
-            proc.kill()
-            _out, err = proc.communicate()
-            if err:
-                errors.extend(err)
-            break
-
-    return errors.decode("utf-8") if errors else None
-
-
-def compatibility_check(godot4_bin: str) -> bool:
-    """
-    Checks if methods specified for previous Godot versions can be properly loaded with
-    the latest Godot4 binary.
-    """
-    # A bit crude albeit working solution – use stderr to check for compatibility-related errors.
-    proc = subprocess.Popen(
-        [godot4_bin, "--headless", "-e", "--path", PROJECT_PATH],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-
-    if (errors := process_compatibility_test(proc)) and has_compatibility_test_failed(errors):
-        print(f"Compatibility test failed. Errors:\n {errors}")
-        return False
-    return True
-
-
-if __name__ == "__main__":
-    godot4_bin = os.environ["GODOT4_BIN"]
-    reftags = os.environ["REFTAGS"].split(",")
-    is_success = True
-    for reftag in reftags:
-        generate_test_data_files(reftag)
-        if not compatibility_check(godot4_bin):
-            print(f"Compatibility test against Godot{reftag} failed")
-            is_success = False
-        remove_test_data_files()
-
-    if not is_success:
-        exit(1)
diff --git a/engine/tests/compatibility_test/src/compat_checker.c b/engine/tests/compatibility_test/src/compat_checker.c
deleted file mode 100644
index 1a18d6e9..00000000
--- a/engine/tests/compatibility_test/src/compat_checker.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/**************************************************************************/
-/*  compat_checker.c                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "compat_checker.h"
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-GDExtensionInterfaceClassdbGetMethodBind classdb_get_method_bind = NULL;
-GDExtensionInterfaceVariantGetPtrBuiltinMethod variant_get_ptr_builtin_method = NULL;
-GDExtensionInterfaceVariantGetPtrUtilityFunction variant_get_ptr_utility_function = NULL;
-
-GDExtensionPtrDestructor string_name_destructor = NULL;
-GDExtensionInterfaceStringNameNewWithLatin1Chars string_name_new_with_latin1_chars = NULL;
-
-typedef struct
-{
-	uint8_t data[8];
-} StringName;
-
-/**
- * Platform APIs are being registered only after extensions, making them unavailable during initialization (on any level).
- *
- * Due to that we run the tests in Mainloop `startup_callback` (available since Godot 4.5), called after the initialization.
- */
-void startup_func() {
-	bool success = (builtin_methods_compatibility_test() && class_methods_compatibility_test() && utility_functions_compatibility_test());
-	if (success) {
-		fprintf(stdout, "Outcome = SUCCESS\n");
-	} else {
-		fprintf(stderr, "Outcome = FAILURE\n");
-	}
-	fprintf(stdout, "COMPATIBILITY TEST FINISHED.\n");
-}
-
-GDExtensionMainLoopCallbacks callbacks = {
-	(GDExtensionMainLoopStartupCallback)startup_func,
-	NULL,
-	NULL
-};
-
-void initialize_compatibility_test(void *p_userdata, GDExtensionInitializationLevel p_level) {}
-
-void deinitialize_compatibility_test(void *p_userdata, GDExtensionInitializationLevel p_level) {}
-
-GDExtensionBool builtin_methods_compatibility_test() {
-	FILE *file = fopen("./builtin_methods.txt", "r");
-	if (file == NULL) {
-		fprintf(stderr, "Failed to open file `builtin_methods.txt` \n");
-		return false;
-	}
-
-	bool ret = true;
-	char line[512];
-
-	while (fgets(line, sizeof line, file) != NULL) {
-		int variant_type;
-		char method_name[128];
-		GDExtensionInt hash;
-		if (sscanf(line, "%d %s %ld", &variant_type, method_name, &hash) != 3) {
-			continue;
-		}
-
-		StringName method_stringname;
-		string_name_new_with_latin1_chars(&method_stringname, method_name, false);
-		GDExtensionPtrBuiltInMethod method_bind = variant_get_ptr_builtin_method(variant_type, &method_stringname, hash);
-
-		if (method_bind == NULL) {
-			fprintf(stderr, "Method bind not found: %d::%s (hash: %ld)\n", variant_type, method_name, hash);
-			ret = false;
-		}
-
-		string_name_destructor(&method_stringname);
-	}
-
-	fclose(file);
-	return ret;
-}
-
-GDExtensionBool utility_functions_compatibility_test() {
-	FILE *file = fopen("./utility_functions.txt", "r");
-	if (file == NULL) {
-		fprintf(stderr, "Failed to open file `utility_functions.txt` \n");
-		return false;
-	}
-
-	bool ret = true;
-	char line[256];
-
-	while (fgets(line, sizeof line, file) != NULL) {
-		char method_name[128];
-		GDExtensionInt hash;
-		if (sscanf(line, "%s %ld", method_name, &hash) != 2) {
-			continue;
-		}
-
-		StringName method_stringname;
-		string_name_new_with_latin1_chars(&method_stringname, method_name, false);
-		GDExtensionPtrUtilityFunction function_bind = variant_get_ptr_utility_function(&method_stringname, hash);
-
-		if (function_bind == NULL) {
-			fprintf(stderr, "Utility function not found: %s (hash: %ld)\n", method_name, hash);
-			ret = false;
-		}
-
-		string_name_destructor(&method_stringname);
-	}
-
-	fclose(file);
-	return ret;
-}
-
-GDExtensionBool class_methods_compatibility_test() {
-	FILE *file = fopen("./class_methods.txt", "r");
-	if (file == NULL) {
-		fprintf(stderr, "Failed to open file `class_methods.txt` \n");
-		return false;
-	}
-
-	char current_class_name[128] = "";
-	bool ret = true;
-	char line[512];
-	bool has_class_string = false;
-	StringName p_classname;
-
-	while (fgets(line, sizeof(line), file) != NULL) {
-		GDExtensionInt hash;
-		StringName p_methodname;
-		char class_name[128];
-		char method_name[128];
-
-		if (sscanf(line, "%s %s %ld", class_name, method_name, &hash) != 3) {
-			continue;
-		}
-
-		if (strcmp(current_class_name, class_name) != 0) {
-			if (has_class_string) {
-				string_name_destructor(&p_classname);
-			}
-			strcpy(current_class_name, class_name);
-
-			string_name_new_with_latin1_chars(&p_classname, current_class_name, false);
-
-			has_class_string = true;
-		}
-
-		string_name_new_with_latin1_chars(&p_methodname, method_name, false);
-		GDExtensionMethodBindPtr method_bind = classdb_get_method_bind(&p_classname, &p_methodname, hash);
-
-		if (method_bind == NULL) {
-			fprintf(stderr, "Method bind not found: %s.%s (hash: %ld)\n", class_name, method_name, hash);
-			ret = false;
-		}
-
-		string_name_destructor(&p_methodname);
-	}
-
-	if (has_class_string) {
-		string_name_destructor(&p_classname);
-	}
-
-	fclose(file);
-	return ret;
-}
-
-GDExtensionBool __attribute__((visibility("default"))) compatibility_test_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-	classdb_get_method_bind = (GDExtensionInterfaceClassdbGetMethodBind)p_get_proc_address("classdb_get_method_bind");
-	if (classdb_get_method_bind == NULL) {
-		fprintf(stderr, "Failed to load interface method `classdb_get_method_bind`\n");
-		return false;
-	}
-
-	variant_get_ptr_builtin_method = (GDExtensionInterfaceVariantGetPtrBuiltinMethod)p_get_proc_address("variant_get_ptr_builtin_method");
-	if (variant_get_ptr_builtin_method == NULL) {
-		fprintf(stderr, "Failed to load interface method `variant_get_ptr_builtin_method`\n");
-		return false;
-	}
-
-	variant_get_ptr_utility_function = (GDExtensionInterfaceVariantGetPtrUtilityFunction)p_get_proc_address("variant_get_ptr_utility_function");
-	if (variant_get_ptr_utility_function == NULL) {
-		fprintf(stderr, "Failed to load interface method `variant_get_ptr_utility_function`\n");
-		return false;
-	}
-
-	GDExtensionInterfaceVariantGetPtrDestructor variant_get_ptr_destructor = (GDExtensionInterfaceVariantGetPtrDestructor)p_get_proc_address("variant_get_ptr_destructor");
-	if (variant_get_ptr_destructor == NULL) {
-		fprintf(stderr, "Failed to load interface method `variant_get_ptr_destructor`\n");
-		return false;
-	}
-	string_name_destructor = variant_get_ptr_destructor(GDEXTENSION_VARIANT_TYPE_STRING_NAME);
-
-	string_name_new_with_latin1_chars = (GDExtensionInterfaceStringNameNewWithLatin1Chars)p_get_proc_address("string_name_new_with_latin1_chars");
-	if (classdb_get_method_bind == NULL) {
-		fprintf(stderr, "Failed to load interface method `string_name_new_with_latin1_chars`\n");
-		return false;
-	}
-
-	GDExtensionInterfaceRegisterMainLoopCallbacks register_main_loop_callbacks = (GDExtensionInterfaceRegisterMainLoopCallbacks)p_get_proc_address("register_main_loop_callbacks");
-	if (register_main_loop_callbacks == NULL) {
-		fprintf(stderr, "Failed to load interface method `register_main_loop_callbacks`\n");
-		return false;
-	}
-
-	register_main_loop_callbacks(p_library, &callbacks);
-
-	r_initialization->initialize = initialize_compatibility_test;
-	r_initialization->deinitialize = deinitialize_compatibility_test;
-	r_initialization->userdata = NULL;
-	r_initialization->minimum_initialization_level = GDEXTENSION_INITIALIZATION_EDITOR;
-
-	return true;
-}
diff --git a/engine/tests/compatibility_test/src/compat_checker.h b/engine/tests/compatibility_test/src/compat_checker.h
deleted file mode 100644
index 77cd95ee..00000000
--- a/engine/tests/compatibility_test/src/compat_checker.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************/
-/*  compat_checker.h                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "deps/gdextension_interface.h"
-
-void initialize_compatibility_test(void *p_userdata, GDExtensionInitializationLevel p_level);
-void deinitialize_compatibility_test(void *p_userdata, GDExtensionInitializationLevel p_level);
-GDExtensionBool class_methods_compatibility_test();
-GDExtensionBool builtin_methods_compatibility_test();
-GDExtensionBool utility_functions_compatibility_test();
-GDExtensionBool __attribute__((visibility("default"))) compatibility_test_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization);
diff --git a/engine/tests/core/config/test_project_settings.cpp b/engine/tests/core/config/test_project_settings.h
similarity index 98%
rename from engine/tests/core/config/test_project_settings.cpp
rename to engine/tests/core/config/test_project_settings.h
index 1d8146a2..b79d38da 100644
--- a/engine/tests/core/config/test_project_settings.cpp
+++ b/engine/tests/core/config/test_project_settings.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_project_settings.cpp                                             */
+/*  test_project_settings.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,19 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_project_settings)
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/object/message_queue.h"
 #include "core/variant/variant.h"
-#include "tests/signal_watcher.h"
-#include "tests/test_utils.h"
+#include "tests/test_macros.h"
+
+class TestProjectSettingsInternalsAccessor {
+public:
+	static String &resource_path() {
+		return ProjectSettings::get_singleton()->resource_path;
+	}
+};
 
 namespace TestProjectSettings {
 
diff --git a/engine/tests/core/input/test_input_event.cpp b/engine/tests/core/input/test_input_event.h
similarity index 96%
rename from engine/tests/core/input/test_input_event.cpp
rename to engine/tests/core/input/test_input_event.h
index 724f17fc..094bb674 100644
--- a/engine/tests/core/input/test_input_event.cpp
+++ b/engine/tests/core/input/test_input_event.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_input_event.cpp                                                  */
+/*  test_input_event.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_input_event)
+#pragma once
 
 #include "core/input/input_event.h"
-#include "core/input/input_map.h"
 #include "core/math/rect2.h"
+#include "core/os/memory.h"
 #include "core/variant/array.h"
-#include "tests/signal_watcher.h"
+
+#include "tests/test_macros.h"
 
 namespace TestInputEvent {
-
 TEST_CASE("[InputEvent] Signal is emitted when device is changed") {
 	Ref<InputEventKey> input_event;
 	input_event.instantiate();
@@ -109,5 +107,4 @@ TEST_CASE("[InputEvent] Test xformed_by") {
 
 	CHECK(iemm2->get_position().is_equal_approx(Vector2(2.0f, 3.0f)));
 }
-
 } // namespace TestInputEvent
diff --git a/engine/tests/core/input/test_input_event_key.cpp b/engine/tests/core/input/test_input_event_key.h
similarity index 99%
rename from engine/tests/core/input/test_input_event_key.cpp
rename to engine/tests/core/input/test_input_event_key.h
index cc2add3d..a0da97c0 100644
--- a/engine/tests/core/input/test_input_event_key.cpp
+++ b/engine/tests/core/input/test_input_event_key.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_input_event_key.cpp                                              */
+/*  test_input_event_key.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_input_event_key)
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 
+#include "tests/test_macros.h"
+
 namespace TestInputEventKey {
 
 TEST_CASE("[InputEventKey] Key correctly registers being pressed") {
@@ -372,5 +372,4 @@ TEST_CASE("[IsMatch] Keys are correctly matched") {
 	key3.set_keycode(Key::SHIFT);
 	CHECK(key3.is_match(loc_ref, false) == true);
 }
-
 } // namespace TestInputEventKey
diff --git a/engine/tests/core/input/test_input_event_mouse.cpp b/engine/tests/core/input/test_input_event_mouse.h
similarity index 97%
rename from engine/tests/core/input/test_input_event_mouse.cpp
rename to engine/tests/core/input/test_input_event_mouse.h
index 62cf9622..0fa0f8dc 100644
--- a/engine/tests/core/input/test_input_event_mouse.cpp
+++ b/engine/tests/core/input/test_input_event_mouse.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_input_event_mouse.cpp                                            */
+/*  test_input_event_mouse.h                                              */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_input_event_mouse)
+#pragma once
 
 #include "core/input/input_event.h"
+#include "tests/test_macros.h"
 
 namespace TestInputEventMouse {
 
@@ -76,5 +75,4 @@ TEST_CASE("[InputEventMouse] Setting the global mouse position works correctly")
 	CHECK(mousekey.get_global_position() == Vector2{ -1, -1 });
 	CHECK(mousekey.get_global_position() != Vector2{ 1, 1 });
 }
-
 } // namespace TestInputEventMouse
diff --git a/engine/tests/core/input/test_shortcut.cpp b/engine/tests/core/input/test_shortcut.h
similarity index 98%
rename from engine/tests/core/input/test_shortcut.cpp
rename to engine/tests/core/input/test_shortcut.h
index 4fe23018..7c1acfbf 100644
--- a/engine/tests/core/input/test_shortcut.cpp
+++ b/engine/tests/core/input/test_shortcut.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_shortcut.cpp                                                     */
+/*  test_shortcut.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_shortcut)
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/input/shortcut.h"
+#include "core/io/config_file.h"
 #include "core/object/ref_counted.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
+
+#include "tests/test_macros.h"
 
 namespace TestShortcut {
 
@@ -213,5 +215,4 @@ TEST_CASE("[Shortcut] Equal arrays should be recognized as such.") {
 	CHECK(s.is_event_array_equal(same, different2) == false);
 	CHECK(s.is_event_array_equal(same, different3) == false);
 }
-
 } // namespace TestShortcut
diff --git a/engine/tests/core/io/test_config_file.cpp b/engine/tests/core/io/test_config_file.h
similarity index 97%
rename from engine/tests/core/io/test_config_file.cpp
rename to engine/tests/core/io/test_config_file.h
index 77d4f2c1..c17f9c9c 100644
--- a/engine/tests/core/io/test_config_file.cpp
+++ b/engine/tests/core/io/test_config_file.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_config_file.cpp                                                  */
+/*  test_config_file.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_config_file)
+#pragma once
 
 #include "core/io/config_file.h"
-
-#ifdef WINDOWS_ENABLED
 #include "core/os/os.h"
-#endif
+
+#include "tests/test_macros.h"
 
 namespace TestConfigFile {
 
@@ -161,5 +158,4 @@ antiAliasing=false
 	CHECK_MESSAGE(file->get_as_utf8_string() == contents,
 			"The saved configuration file should match the expected format.");
 }
-
 } // namespace TestConfigFile
diff --git a/engine/tests/core/io/test_file_access.cpp b/engine/tests/core/io/test_file_access.h
similarity index 89%
rename from engine/tests/core/io/test_file_access.cpp
rename to engine/tests/core/io/test_file_access.h
index 038eaa4b..7c6a0ab3 100644
--- a/engine/tests/core/io/test_file_access.cpp
+++ b/engine/tests/core/io/test_file_access.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_file_access.cpp                                                  */
+/*  test_file_access.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_file_access)
-
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
 namespace TestFileAccess {
@@ -250,51 +248,4 @@ TEST_CASE("[FileAccess] Get/Store floating point half precision values") {
 	}
 }
 
-TEST_CASE("[FileAccess] Cursor positioning") {
-	Ref<FileAccess> f = FileAccess::open(TestUtils::get_data_path("line_endings_lf.test.txt"), FileAccess::READ);
-	REQUIRE(f.is_valid());
-
-	String full = f->get_as_utf8_string();
-	int64_t len = full.length();
-
-	SUBCASE("Initial position is zero") {
-		f->seek(0);
-		CHECK(f->get_position() == 0);
-	}
-
-	SUBCASE("seek() moves cursor to absolute position") {
-		f->seek(5);
-		CHECK(f->get_position() == 5);
-	}
-
-	SUBCASE("seek() moves cursor beyond file size") {
-		f->seek(len + 10);
-		CHECK(f->get_position() == len + 10);
-	}
-
-	SUBCASE("seek_end() moves cursor to end of file") {
-		f->seek_end(0);
-		CHECK(f->get_position() == len);
-	}
-
-	SUBCASE("seek_end() with positive offset") {
-		f->seek_end(1);
-		CHECK(f->get_position() == len + 1);
-	}
-
-	SUBCASE("seek_end() with negative offset") {
-		f->seek_end(-1);
-		CHECK(f->get_position() == len - 1);
-
-		char last_char = full[full.length() - 1];
-		CHECK(f->get_8() == last_char);
-	}
-
-	SUBCASE("seek_end() beyond file size") {
-		f->seek(5);
-		f->seek_end(-len - 10); // seeking to a position below 0; ignored.
-		CHECK(f->get_position() == 5);
-	}
-}
-
 } // namespace TestFileAccess
diff --git a/engine/tests/core/io/test_http_client.cpp b/engine/tests/core/io/test_http_client.h
similarity index 95%
rename from engine/tests/core/io/test_http_client.cpp
rename to engine/tests/core/io/test_http_client.h
index c69f1cff..db4fb79d 100644
--- a/engine/tests/core/io/test_http_client.cpp
+++ b/engine/tests/core/io/test_http_client.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_http_client.cpp                                                  */
+/*  test_http_client.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_http_client)
+#pragma once
 
 #include "core/io/http_client.h"
 
-#include "modules/modules_enabled.gen.h" // For mbedtls.
+#include "tests/test_macros.h"
+
+#include "modules/modules_enabled.gen.h"
 
 namespace TestHTTPClient {
 
@@ -99,6 +99,6 @@ TEST_CASE("[HTTPClient] connect_to_host") {
 	Error err = client->connect_to_host(host, port, tls_options);
 	CHECK_MESSAGE(err == OK, "Expected OK for successful connection");
 }
-#endif // defined(MODULE_MBEDTLS_ENABLED) || defined(WEB_ENABLED)
+#endif // MODULE_MBEDTLS_ENABLED || WEB_ENABLED
 
 } // namespace TestHTTPClient
diff --git a/engine/tests/core/io/test_image.cpp b/engine/tests/core/io/test_image.h
similarity index 98%
rename from engine/tests/core/io/test_image.cpp
rename to engine/tests/core/io/test_image.h
index 59d90e0d..b528ab4f 100644
--- a/engine/tests/core/io/test_image.cpp
+++ b/engine/tests/core/io/test_image.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_image.cpp                                                        */
+/*  test_image.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_image)
-
-#include "core/io/file_access.h"
 #include "core/io/image.h"
+#include "core/os/os.h"
+
 #include "tests/test_utils.h"
 
-#include "modules/modules_enabled.gen.h" // For bmp, jpg, svg, webp, tga.
+#include "modules/modules_enabled.gen.h"
+
+#include "thirdparty/doctest/doctest.h"
 
 namespace TestImage {
 
diff --git a/engine/tests/core/io/test_ip.cpp b/engine/tests/core/io/test_ip.h
similarity index 96%
rename from engine/tests/core/io/test_ip.cpp
rename to engine/tests/core/io/test_ip.h
index 092ec802..88fc2270 100644
--- a/engine/tests/core/io/test_ip.cpp
+++ b/engine/tests/core/io/test_ip.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_ip.cpp                                                           */
+/*  test_ip.h                                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_ip)
+#pragma once
 
 #include "core/io/ip.h"
 
+#include "tests/test_macros.h"
+
 namespace TestIP {
 
 TEST_CASE("[IP] resolve_hostname") {
diff --git a/engine/tests/core/io/test_ip_address.cpp b/engine/tests/core/io/test_ip_address.h
similarity index 99%
rename from engine/tests/core/io/test_ip_address.cpp
rename to engine/tests/core/io/test_ip_address.h
index 5ec6b67d..c9bcde3f 100644
--- a/engine/tests/core/io/test_ip_address.cpp
+++ b/engine/tests/core/io/test_ip_address.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_ip_address.cpp                                                   */
+/*  test_ip_address.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_ip_address)
+#pragma once
 
 #include "core/io/ip_address.h"
 
+#include "tests/test_macros.h"
+
 namespace TestIPAddress {
 
 struct IPTester : public IPAddress {
diff --git a/engine/tests/core/io/test_json.cpp b/engine/tests/core/io/test_json.h
similarity index 98%
rename from engine/tests/core/io/test_json.cpp
rename to engine/tests/core/io/test_json.h
index 7eb28d98..77dd5f45 100644
--- a/engine/tests/core/io/test_json.cpp
+++ b/engine/tests/core/io/test_json.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_json.cpp                                                         */
+/*  test_json.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_json)
+#pragma once
 
 #include "core/io/json.h"
-#include "core/variant/typed_array.h"
 
-#include <cfloat> // DBL_MAX
+#include "thirdparty/doctest/doctest.h"
 
 namespace TestJSON {
 
@@ -426,5 +423,4 @@ TEST_CASE("[JSON] Serialization") {
 		}
 	}
 }
-
 } // namespace TestJSON
diff --git a/engine/tests/core/io/test_json_native.cpp b/engine/tests/core/io/test_json_native.h
similarity index 98%
rename from engine/tests/core/io/test_json_native.cpp
rename to engine/tests/core/io/test_json_native.h
index ff4ef525..f6e06774 100644
--- a/engine/tests/core/io/test_json_native.cpp
+++ b/engine/tests/core/io/test_json_native.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_json_native.cpp                                                  */
+/*  test_json_native.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_json_native)
+#pragma once
 
 #include "core/io/json.h"
+
 #include "core/variant/typed_array.h"
 #include "core/variant/typed_dictionary.h"
+#include "tests/test_macros.h"
 
 namespace TestJSONNative {
 
diff --git a/engine/tests/core/io/test_logger.cpp b/engine/tests/core/io/test_logger.h
similarity index 97%
rename from engine/tests/core/io/test_logger.cpp
rename to engine/tests/core/io/test_logger.h
index f4edcdb6..e61b66df 100644
--- a/engine/tests/core/io/test_logger.cpp
+++ b/engine/tests/core/io/test_logger.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_logger.cpp                                                       */
+/*  test_logger.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_logger)
-
-#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
 #include "core/io/logger.h"
-#include "core/os/os.h"
+#include "modules/regex/regex.h"
+#include "tests/test_macros.h"
 
 namespace TestLogger {
 
diff --git a/engine/tests/core/io/test_marshalls.cpp b/engine/tests/core/io/test_marshalls.h
similarity index 99%
rename from engine/tests/core/io/test_marshalls.cpp
rename to engine/tests/core/io/test_marshalls.h
index 995b1978..d16a3ea5 100644
--- a/engine/tests/core/io/test_marshalls.cpp
+++ b/engine/tests/core/io/test_marshalls.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_marshalls.cpp                                                    */
+/*  test_marshalls.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_marshalls)
+#pragma once
 
 #include "core/io/marshalls.h"
-#include "core/object/script_language.h"
+
+#include "tests/test_macros.h"
 
 namespace TestMarshalls {
 
diff --git a/engine/tests/core/io/test_packet_peer.cpp b/engine/tests/core/io/test_packet_peer.h
similarity index 98%
rename from engine/tests/core/io/test_packet_peer.cpp
rename to engine/tests/core/io/test_packet_peer.h
index 044f566e..a47b14fe 100644
--- a/engine/tests/core/io/test_packet_peer.cpp
+++ b/engine/tests/core/io/test_packet_peer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_packet_peer.cpp                                                  */
+/*  test_packet_peer.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_packet_peer)
+#pragma once
 
 #include "core/io/packet_peer.h"
+#include "tests/test_macros.h"
 
 namespace TestPacketPeer {
 
diff --git a/engine/tests/core/io/test_pck_packer.cpp b/engine/tests/core/io/test_pck_packer.h
similarity index 93%
rename from engine/tests/core/io/test_pck_packer.cpp
rename to engine/tests/core/io/test_pck_packer.h
index 4fbe6584..725564a9 100644
--- a/engine/tests/core/io/test_pck_packer.cpp
+++ b/engine/tests/core/io/test_pck_packer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_pck_packer.cpp                                                   */
+/*  test_pck_packer.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_pck_packer)
-
-#include "core/io/file_access.h"
+#include "core/io/file_access_pack.h"
 #include "core/io/pck_packer.h"
 #include "core/os/os.h"
+
 #include "tests/test_utils.h"
+#include "thirdparty/doctest/doctest.h"
 
 namespace TestPCKPacker {
 
@@ -100,9 +100,6 @@ TEST_CASE("[PCKPacker] Pack a PCK file with some files and directories") {
 	CHECK_MESSAGE(
 			pck_packer.add_file("some/directories with spaces/to/create/icon.png", base_dir.path_join("../logo.png")) == OK,
 			"Overriding a non-flushed file to an existing subdirectory in the PCK should return an OK error code.");
-	CHECK_MESSAGE(
-			pck_packer.add_file_from_buffer("buffer/new.txt", String("Hello world!").to_utf8_buffer()) == OK,
-			"Adding a file from a buffer to the PCK in a new subdirectory should return an OK error code.");
 	CHECK_MESSAGE(
 			pck_packer.flush() == OK,
 			"Flushing the PCK should return an OK error code.");
@@ -119,5 +116,4 @@ TEST_CASE("[PCKPacker] Pack a PCK file with some files and directories") {
 			f->get_length() <= 27000,
 			"The generated non-empty PCK file shouldn't be too large.");
 }
-
 } // namespace TestPCKPacker
diff --git a/engine/tests/core/io/test_resource.cpp b/engine/tests/core/io/test_resource.h
similarity index 63%
rename from engine/tests/core/io/test_resource.cpp
rename to engine/tests/core/io/test_resource.h
index 44e25f36..f68dad98 100644
--- a/engine/tests/core/io/test_resource.cpp
+++ b/engine/tests/core/io/test_resource.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_resource.cpp                                                     */
+/*  test_resource.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_resource)
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "scene/main/node.h"
-#include "tests/test_utils.h"
+
+#include "thirdparty/doctest/doctest.h"
+
+#include "tests/test_macros.h"
 
 #include <functional>
 
@@ -255,109 +255,109 @@ public:
 	}
 };
 
-#define DEFINE_DUPLICATE_GUINEA_PIG(m_class_name, m_property_usage) \
-	class m_class_name : public Resource { \
-		GDCLASS(m_class_name, Resource) \
-\
-		DuplicateGuineaPigData data; \
-\
-	public: \
-		void set_obj(Object *p_obj) { \
-			data.obj = p_obj; \
-		} \
-		Object *get_obj() const { \
-			return data.obj; \
-		} \
-\
-		void set_arr(const Array &p_arr) { \
-			data.arr = p_arr; \
-		} \
-		Array get_arr() const { \
-			return data.arr; \
-		} \
-\
-		void set_dict(const Dictionary &p_dict) { \
-			data.dict = p_dict; \
-		} \
-		Dictionary get_dict() const { \
-			return data.dict; \
-		} \
-\
-		void set_packed(const Variant &p_packed) { \
-			data.packed = p_packed; \
-		} \
-		Variant get_packed() const { \
-			return data.packed; \
-		} \
-\
-		void set_subres(const Ref<Resource> &p_subres) { \
-			data.subres = p_subres; \
-		} \
-		Ref<Resource> get_subres() const { \
-			return data.subres; \
-		} \
-\
-		void set_subres_sl(const Ref<Resource> &p_subres) { \
-			data.subres_sl = p_subres; \
-		} \
-		Ref<Resource> get_subres_sl() const { \
-			return data.subres_sl; \
-		} \
-\
-		void set_defaults() { \
-			data.set_defaults(); \
-		} \
-\
-		Object *get_data() { \
-			return &data; \
-		} \
-\
-		void verify_duplication(const Ref<Resource> &p_orig, int p_test_mode, int p_deep_mode) const { \
-			const DuplicateGuineaPigData *orig_data = Object::cast_to<DuplicateGuineaPigData>(p_orig->call("get_data")); \
-			data.verify_duplication(orig_data, m_property_usage, (TestDuplicateMode)p_test_mode, (ResourceDeepDuplicateMode)p_deep_mode); \
-		} \
-\
-	protected: \
-		static void _bind_methods() { \
-			ClassDB::bind_method(D_METHOD("set_obj", "obj"), &m_class_name::set_obj); \
-			ClassDB::bind_method(D_METHOD("get_obj"), &m_class_name::get_obj); \
-\
-			ClassDB::bind_method(D_METHOD("set_arr", "arr"), &m_class_name::set_arr); \
-			ClassDB::bind_method(D_METHOD("get_arr"), &m_class_name::get_arr); \
-\
-			ClassDB::bind_method(D_METHOD("set_dict", "dict"), &m_class_name::set_dict); \
-			ClassDB::bind_method(D_METHOD("get_dict"), &m_class_name::get_dict); \
-\
-			ClassDB::bind_method(D_METHOD("set_packed", "packed"), &m_class_name::set_packed); \
-			ClassDB::bind_method(D_METHOD("get_packed"), &m_class_name::get_packed); \
-\
-			ClassDB::bind_method(D_METHOD("set_subres", "subres"), &m_class_name::set_subres); \
-			ClassDB::bind_method(D_METHOD("get_subres"), &m_class_name::get_subres); \
-\
-			ClassDB::bind_method(D_METHOD("set_subres_sl", "subres"), &m_class_name::set_subres_sl); \
-			ClassDB::bind_method(D_METHOD("get_subres_sl"), &m_class_name::get_subres_sl); \
-\
-			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "obj", PROPERTY_HINT_NONE, "", m_property_usage), "set_obj", "get_obj"); \
-			ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "arr", PROPERTY_HINT_NONE, "", m_property_usage), "set_arr", "get_arr"); \
-			ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "dict", PROPERTY_HINT_NONE, "", m_property_usage), "set_dict", "get_dict"); \
+#define DEFINE_DUPLICATE_GUINEA_PIG(m_class_name, m_property_usage)                                                                                 \
+	class m_class_name : public Resource {                                                                                                          \
+		GDCLASS(m_class_name, Resource)                                                                                                             \
+                                                                                                                                                    \
+		DuplicateGuineaPigData data;                                                                                                                \
+                                                                                                                                                    \
+	public:                                                                                                                                         \
+		void set_obj(Object *p_obj) {                                                                                                               \
+			data.obj = p_obj;                                                                                                                       \
+		}                                                                                                                                           \
+		Object *get_obj() const {                                                                                                                   \
+			return data.obj;                                                                                                                        \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_arr(const Array &p_arr) {                                                                                                          \
+			data.arr = p_arr;                                                                                                                       \
+		}                                                                                                                                           \
+		Array get_arr() const {                                                                                                                     \
+			return data.arr;                                                                                                                        \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_dict(const Dictionary &p_dict) {                                                                                                   \
+			data.dict = p_dict;                                                                                                                     \
+		}                                                                                                                                           \
+		Dictionary get_dict() const {                                                                                                               \
+			return data.dict;                                                                                                                       \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_packed(const Variant &p_packed) {                                                                                                  \
+			data.packed = p_packed;                                                                                                                 \
+		}                                                                                                                                           \
+		Variant get_packed() const {                                                                                                                \
+			return data.packed;                                                                                                                     \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_subres(const Ref<Resource> &p_subres) {                                                                                            \
+			data.subres = p_subres;                                                                                                                 \
+		}                                                                                                                                           \
+		Ref<Resource> get_subres() const {                                                                                                          \
+			return data.subres;                                                                                                                     \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_subres_sl(const Ref<Resource> &p_subres) {                                                                                         \
+			data.subres_sl = p_subres;                                                                                                              \
+		}                                                                                                                                           \
+		Ref<Resource> get_subres_sl() const {                                                                                                       \
+			return data.subres_sl;                                                                                                                  \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void set_defaults() {                                                                                                                       \
+			data.set_defaults();                                                                                                                    \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		Object *get_data() {                                                                                                                        \
+			return &data;                                                                                                                           \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+		void verify_duplication(const Ref<Resource> &p_orig, int p_test_mode, int p_deep_mode) const {                                              \
+			const DuplicateGuineaPigData *orig_data = Object::cast_to<DuplicateGuineaPigData>(p_orig->call("get_data"));                            \
+			data.verify_duplication(orig_data, m_property_usage, (TestDuplicateMode)p_test_mode, (ResourceDeepDuplicateMode)p_deep_mode);           \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+	protected:                                                                                                                                      \
+		static void _bind_methods() {                                                                                                               \
+			ClassDB::bind_method(D_METHOD("set_obj", "obj"), &m_class_name::set_obj);                                                               \
+			ClassDB::bind_method(D_METHOD("get_obj"), &m_class_name::get_obj);                                                                      \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_arr", "arr"), &m_class_name::set_arr);                                                               \
+			ClassDB::bind_method(D_METHOD("get_arr"), &m_class_name::get_arr);                                                                      \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_dict", "dict"), &m_class_name::set_dict);                                                            \
+			ClassDB::bind_method(D_METHOD("get_dict"), &m_class_name::get_dict);                                                                    \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_packed", "packed"), &m_class_name::set_packed);                                                      \
+			ClassDB::bind_method(D_METHOD("get_packed"), &m_class_name::get_packed);                                                                \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_subres", "subres"), &m_class_name::set_subres);                                                      \
+			ClassDB::bind_method(D_METHOD("get_subres"), &m_class_name::get_subres);                                                                \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_subres_sl", "subres"), &m_class_name::set_subres_sl);                                                \
+			ClassDB::bind_method(D_METHOD("get_subres_sl"), &m_class_name::get_subres_sl);                                                          \
+                                                                                                                                                    \
+			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "obj", PROPERTY_HINT_NONE, "", m_property_usage), "set_obj", "get_obj");                     \
+			ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "arr", PROPERTY_HINT_NONE, "", m_property_usage), "set_arr", "get_arr");                      \
+			ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "dict", PROPERTY_HINT_NONE, "", m_property_usage), "set_dict", "get_dict");              \
 			ADD_PROPERTY(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "packed", PROPERTY_HINT_NONE, "", m_property_usage), "set_packed", "get_packed"); \
-			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "subres", PROPERTY_HINT_NONE, "", m_property_usage), "set_subres", "get_subres"); \
-			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "subres_sl", PROPERTY_HINT_NONE, "", m_property_usage), "set_subres_sl", "get_subres_sl"); \
-\
-			ClassDB::bind_method(D_METHOD("set_defaults"), &m_class_name::set_defaults); \
-			ClassDB::bind_method(D_METHOD("get_data"), &m_class_name::get_data); \
-			ClassDB::bind_method(D_METHOD("verify_duplication", "orig", "test_mode", "deep_mode"), &m_class_name::verify_duplication); \
-		} \
-\
-	public: \
-		static Ref<m_class_name> register_and_instantiate() { \
-			static bool registered = false; \
-			if (!registered) { \
-				GDREGISTER_CLASS(m_class_name); \
-				registered = true; \
-			} \
-			return memnew(m_class_name); \
-		} \
+			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "subres", PROPERTY_HINT_NONE, "", m_property_usage), "set_subres", "get_subres");            \
+			ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "subres_sl", PROPERTY_HINT_NONE, "", m_property_usage), "set_subres_sl", "get_subres_sl");   \
+                                                                                                                                                    \
+			ClassDB::bind_method(D_METHOD("set_defaults"), &m_class_name::set_defaults);                                                            \
+			ClassDB::bind_method(D_METHOD("get_data"), &m_class_name::get_data);                                                                    \
+			ClassDB::bind_method(D_METHOD("verify_duplication", "orig", "test_mode", "deep_mode"), &m_class_name::verify_duplication);              \
+		}                                                                                                                                           \
+                                                                                                                                                    \
+	public:                                                                                                                                         \
+		static m_class_name *register_and_instantiate() {                                                                                           \
+			static bool registered = false;                                                                                                         \
+			if (!registered) {                                                                                                                      \
+				GDREGISTER_CLASS(m_class_name);                                                                                                     \
+				registered = true;                                                                                                                  \
+			}                                                                                                                                       \
+			return memnew(m_class_name);                                                                                                            \
+		}                                                                                                                                           \
 	};
 
 DEFINE_DUPLICATE_GUINEA_PIG(DuplicateGuineaPig_None, PROPERTY_USAGE_NONE)
@@ -627,5 +627,4 @@ TEST_CASE("[Resource] Breaking circular references on save") {
 	// Break circular reference to avoid memory leak
 	resource_c->remove_meta("next");
 }
-
 } // namespace TestResource
diff --git a/engine/tests/core/io/test_resource_uid.cpp b/engine/tests/core/io/test_resource_uid.h
similarity index 97%
rename from engine/tests/core/io/test_resource_uid.cpp
rename to engine/tests/core/io/test_resource_uid.h
index 1ad86c3f..0a8f04e8 100644
--- a/engine/tests/core/io/test_resource_uid.cpp
+++ b/engine/tests/core/io/test_resource_uid.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_resource_uid.cpp                                                 */
+/*  test_resource_uid.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_resource_uid)
+#pragma once
 
 #include "core/io/resource_uid.h"
 
+#include "thirdparty/doctest/doctest.h"
+
+#include "tests/test_macros.h"
+
 namespace TestResourceUID {
 
 TEST_CASE("[ResourceUID] Must encode/decode maximum/minimum UID correctly") {
diff --git a/engine/tests/core/io/test_stream_peer.cpp b/engine/tests/core/io/test_stream_peer.h
similarity index 98%
rename from engine/tests/core/io/test_stream_peer.cpp
rename to engine/tests/core/io/test_stream_peer.h
index 1c300882..0aa7302e 100644
--- a/engine/tests/core/io/test_stream_peer.cpp
+++ b/engine/tests/core/io/test_stream_peer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_stream_peer.cpp                                                  */
+/*  test_stream_peer.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_stream_peer)
+#pragma once
 
 #include "core/io/stream_peer.h"
+#include "tests/test_macros.h"
 
 namespace TestStreamPeer {
 
diff --git a/engine/tests/core/io/test_stream_peer_buffer.cpp b/engine/tests/core/io/test_stream_peer_buffer.h
similarity index 98%
rename from engine/tests/core/io/test_stream_peer_buffer.cpp
rename to engine/tests/core/io/test_stream_peer_buffer.h
index cb45548e..766ccf41 100644
--- a/engine/tests/core/io/test_stream_peer_buffer.cpp
+++ b/engine/tests/core/io/test_stream_peer_buffer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_stream_peer_buffer.cpp                                           */
+/*  test_stream_peer_buffer.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_stream_peer_buffer)
+#pragma once
 
 #include "core/io/stream_peer.h"
+#include "tests/test_macros.h"
 
 namespace TestStreamPeerBuffer {
 
diff --git a/engine/tests/core/io/test_stream_peer_gzip.cpp b/engine/tests/core/io/test_stream_peer_gzip.h
similarity index 98%
rename from engine/tests/core/io/test_stream_peer_gzip.cpp
rename to engine/tests/core/io/test_stream_peer_gzip.h
index 2384dac6..54935e20 100644
--- a/engine/tests/core/io/test_stream_peer_gzip.cpp
+++ b/engine/tests/core/io/test_stream_peer_gzip.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_stream_peer_gzip.cpp                                             */
+/*  test_stream_peer_gzip.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_stream_peer_gzip)
+#pragma once
 
 #include "core/io/stream_peer_gzip.h"
+#include "tests/test_macros.h"
 
 namespace TestStreamPeerGZIP {
 
diff --git a/engine/tests/core/io/test_stream_peer_tcp.cpp b/engine/tests/core/io/test_stream_peer_tcp.h
similarity index 98%
rename from engine/tests/core/io/test_stream_peer_tcp.cpp
rename to engine/tests/core/io/test_stream_peer_tcp.h
index b4e5b574..f0ef21b8 100644
--- a/engine/tests/core/io/test_stream_peer_tcp.cpp
+++ b/engine/tests/core/io/test_stream_peer_tcp.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_stream_peer_tcp.cpp                                              */
+/*  test_stream_peer_tcp.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_stream_peer_tcp)
+#pragma once
 
 #include "core/io/net_socket.h"
 #include "core/io/stream_peer_tcp.h"
+#include "tests/test_macros.h"
 
 namespace TestStreamPeerTCP {
 
@@ -81,7 +80,7 @@ public:
 	~MockNetSocket() override;
 
 protected:
-	static Ref<NetSocket> _create_func();
+	static NetSocket *_create_func();
 
 private:
 	bool _is_open = false;
@@ -90,7 +89,7 @@ private:
 	uint8_t *_recv_data = nullptr;
 };
 
-Ref<NetSocket> MockNetSocket::_create_func() {
+NetSocket *MockNetSocket::_create_func() {
 	return memnew(MockNetSocket);
 }
 
diff --git a/engine/tests/core/io/test_tcp_server.cpp b/engine/tests/core/io/test_tcp_server.h
similarity index 98%
rename from engine/tests/core/io/test_tcp_server.cpp
rename to engine/tests/core/io/test_tcp_server.h
index aa530000..590567d0 100644
--- a/engine/tests/core/io/test_tcp_server.cpp
+++ b/engine/tests/core/io/test_tcp_server.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_tcp_server.cpp                                                   */
+/*  test_tcp_server.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_tcp_server)
-
-#include "core/config/project_settings.h"
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
-#include "core/os/os.h"
+#include "tests/test_macros.h"
 
 #include <functional>
 
diff --git a/engine/tests/core/io/test_udp_server.cpp b/engine/tests/core/io/test_udp_server.h
similarity index 98%
rename from engine/tests/core/io/test_udp_server.cpp
rename to engine/tests/core/io/test_udp_server.h
index 84e8cf81..9403ddc0 100644
--- a/engine/tests/core/io/test_udp_server.cpp
+++ b/engine/tests/core/io/test_udp_server.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_udp_server.cpp                                                   */
+/*  test_udp_server.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_udp_server)
+#pragma once
 
 #include "core/io/packet_peer_udp.h"
 #include "core/io/udp_server.h"
-#include "core/os/os.h"
-
-#include <functional>
+#include "tests/test_macros.h"
 
 namespace TestUDPServer {
 
diff --git a/engine/tests/core/io/test_uds_server.cpp b/engine/tests/core/io/test_uds_server.h
similarity index 98%
rename from engine/tests/core/io/test_uds_server.cpp
rename to engine/tests/core/io/test_uds_server.h
index b796abda..84e6b346 100644
--- a/engine/tests/core/io/test_uds_server.cpp
+++ b/engine/tests/core/io/test_uds_server.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_uds_server.cpp                                                   */
+/*  test_uds_server.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,22 +28,19 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_uds_server)
-
-#ifdef UNIX_ENABLED
-
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/stream_peer_uds.h"
 #include "core/io/uds_server.h"
-#include "core/os/os.h"
+#include "tests/test_macros.h"
 
 #include <functional>
 
 namespace TestUDSServer {
 
+#ifdef UNIX_ENABLED
+
 const String SOCKET_PATH = "/tmp/godot_test_uds_socket";
 const uint32_t SLEEP_DURATION = 1000;
 const uint64_t MAX_WAIT_USEC = 2000000;
@@ -300,6 +297,6 @@ TEST_CASE("[UDSServer] Test with different socket paths") {
 	}
 }
 
-} // namespace TestUDSServer
+#endif
 
-#endif // UNIX_ENABLED
+} // namespace TestUDSServer
diff --git a/engine/tests/core/io/test_xml_parser.cpp b/engine/tests/core/io/test_xml_parser.h
similarity index 98%
rename from engine/tests/core/io/test_xml_parser.cpp
rename to engine/tests/core/io/test_xml_parser.h
index ac0fd8a9..33020c7e 100644
--- a/engine/tests/core/io/test_xml_parser.cpp
+++ b/engine/tests/core/io/test_xml_parser.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_xml_parser.cpp                                                   */
+/*  test_xml_parser.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_xml_parser)
+#pragma once
 
 #include "core/io/xml_parser.h"
 
-namespace TestXMLParser {
+#include "tests/test_macros.h"
 
+namespace TestXMLParser {
 TEST_CASE("[XMLParser] End-to-end") {
 	String source = "<?xml version = \"1.0\" encoding=\"UTF-8\" ?>\
 <top attr=\"attr value\">\
@@ -230,5 +229,4 @@ TEST_CASE("[XMLParser] CDATA") {
 	CHECK_EQ(parser.get_node_type(), XMLParser::NodeType::NODE_ELEMENT_END);
 	CHECK_EQ(parser.get_node_name(), "a");
 }
-
 } // namespace TestXMLParser
diff --git a/engine/tests/core/math/test_aabb.cpp b/engine/tests/core/math/test_aabb.h
similarity index 99%
rename from engine/tests/core/math/test_aabb.cpp
rename to engine/tests/core/math/test_aabb.h
index 8131255b..6c912b5c 100644
--- a/engine/tests/core/math/test_aabb.cpp
+++ b/engine/tests/core/math/test_aabb.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_aabb.cpp                                                         */
+/*  test_aabb.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_aabb)
+#pragma once
 
 #include "core/math/aabb.h"
 
+#include "tests/test_macros.h"
+
 namespace TestAABB {
 
 TEST_CASE("[AABB] Constructor methods") {
diff --git a/engine/tests/core/math/test_astar.cpp b/engine/tests/core/math/test_astar.h
similarity index 98%
rename from engine/tests/core/math/test_astar.cpp
rename to engine/tests/core/math/test_astar.h
index fc973d3c..c0997c88 100644
--- a/engine/tests/core/math/test_astar.cpp
+++ b/engine/tests/core/math/test_astar.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_astar.cpp                                                        */
+/*  test_astar.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_astar)
+#pragma once
 
 #include "core/math/a_star.h"
 
+#include "tests/test_macros.h"
+
 namespace TestAStar {
 
 class ABCX : public AStar3D {
@@ -233,5 +233,4 @@ TEST_CASE("[AStar3D] Path from disabled point is empty") {
 	CHECK(a.get_point_path(1, 1).is_empty());
 	CHECK(a.get_point_path(1, 2).is_empty());
 }
-
 } // namespace TestAStar
diff --git a/engine/tests/core/math/test_basis.cpp b/engine/tests/core/math/test_basis.h
similarity index 99%
rename from engine/tests/core/math/test_basis.cpp
rename to engine/tests/core/math/test_basis.h
index f8b2f127..3f44d3df 100644
--- a/engine/tests/core/math/test_basis.cpp
+++ b/engine/tests/core/math/test_basis.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_basis.cpp                                                        */
+/*  test_basis.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_basis)
+#pragma once
 
 #include "core/math/basis.h"
+#include "core/math/random_number_generator.h"
+
+#include "tests/test_macros.h"
 
 namespace TestBasis {
 
diff --git a/engine/tests/core/math/test_color.cpp b/engine/tests/core/math/test_color.h
similarity index 98%
rename from engine/tests/core/math/test_color.cpp
rename to engine/tests/core/math/test_color.h
index 9f7a5620..1e4e7c54 100644
--- a/engine/tests/core/math/test_color.cpp
+++ b/engine/tests/core/math/test_color.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_color.cpp                                                        */
+/*  test_color.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_color)
+#pragma once
 
 #include "core/math/color.h"
 
+#include "tests/test_macros.h"
+
 namespace TestColor {
 
 TEST_CASE("[Color] Constructor methods") {
@@ -61,7 +61,7 @@ TEST_CASE("[Color] Constructor methods") {
 			"Creation with invalid HTML notation should result in a Color with the default values.");
 
 	constexpr Color green_rgba = Color(0, 1, 0, 0.25);
-	const Color green_hsva = Color::from_hsv(120 / 360.0, 1, 1, 0.25);
+	const Color green_hsva = Color(0, 0, 0).from_hsv(120 / 360.0, 1, 1, 0.25);
 
 	CHECK_MESSAGE(
 			green_rgba.is_equal_approx(green_hsva),
@@ -225,5 +225,4 @@ TEST_CASE("[Color] Manipulation methods") {
 			red.lerp(yellow, 0.5).is_equal_approx(Color(1, 0.5, 0, 0.5)),
 			"Red interpolated with yellow should be orange (with interpolated alpha).");
 }
-
 } // namespace TestColor
diff --git a/engine/tests/core/math/test_expression.cpp b/engine/tests/core/math/test_expression.h
similarity index 99%
rename from engine/tests/core/math/test_expression.cpp
rename to engine/tests/core/math/test_expression.h
index 30c65615..26c90b65 100644
--- a/engine/tests/core/math/test_expression.cpp
+++ b/engine/tests/core/math/test_expression.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_expression.cpp                                                   */
+/*  test_expression.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_expression)
+#pragma once
 
 #include "core/math/expression.h"
 
+#include "tests/test_macros.h"
+
 namespace TestExpression {
 
 TEST_CASE("[Expression] Integer arithmetic") {
@@ -487,5 +487,4 @@ TEST_CASE("[Expression] Unusual expressions") {
 	//		int64_t(expression.execute()) == 0,
 	//		"`(-9223372036854775807 - 1) / -1` should return the expected result.");
 }
-
 } // namespace TestExpression
diff --git a/engine/tests/core/math/test_geometry_2d.cpp b/engine/tests/core/math/test_geometry_2d.h
similarity index 99%
rename from engine/tests/core/math/test_geometry_2d.cpp
rename to engine/tests/core/math/test_geometry_2d.h
index 4b9981ce..415912fe 100644
--- a/engine/tests/core/math/test_geometry_2d.cpp
+++ b/engine/tests/core/math/test_geometry_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_geometry_2d.cpp                                                  */
+/*  test_geometry_2d.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_geometry_2d)
+#pragma once
 
 #include "core/math/geometry_2d.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestGeometry2D {
 
 TEST_CASE("[Geometry2D] Point in circle") {
@@ -889,5 +889,4 @@ TEST_CASE("[Geometry2D] Bresenham line") {
 		CHECK(r[11] == Vector2i(11, 5));
 	}
 }
-
 } // namespace TestGeometry2D
diff --git a/engine/tests/core/math/test_geometry_3d.cpp b/engine/tests/core/math/test_geometry_3d.h
similarity index 99%
rename from engine/tests/core/math/test_geometry_3d.cpp
rename to engine/tests/core/math/test_geometry_3d.h
index 203e161c..b44e85ee 100644
--- a/engine/tests/core/math/test_geometry_3d.cpp
+++ b/engine/tests/core/math/test_geometry_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_geometry_3d.cpp                                                  */
+/*  test_geometry_3d.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_geometry_3d)
+#pragma once
 
 #include "core/math/geometry_3d.h"
+#include "tests/test_macros.h"
 
 namespace TestGeometry3D {
-
 TEST_CASE("[Geometry3D] Closest Points Between Segments") {
 	Vector3 ps, qt;
 	Geometry3D::get_closest_points_between_segments(Vector3(1, -1, 1), Vector3(1, 1, -1), Vector3(-1, -2, -1), Vector3(-1, 1, 1), ps, qt);
@@ -201,5 +199,4 @@ TEST_CASE("[Geometry3D] Triangle and Sphere Intersect") {
 	CHECK(Geometry3D::triangle_sphere_intersection_test(triangle_a, triangle_b, triangle_c, Vector3(0, 1, 0), Vector3(0, 0, 0), 5, triangle_contact, sphere_contact) == true);
 	CHECK(Geometry3D::triangle_sphere_intersection_test(triangle_a, triangle_b, triangle_c, Vector3(0, 1, 0), Vector3(20, 0, 0), 5, triangle_contact, sphere_contact) == false);
 }
-
 } // namespace TestGeometry3D
diff --git a/engine/tests/core/math/test_math_funcs.cpp b/engine/tests/core/math/test_math_funcs.h
similarity index 95%
rename from engine/tests/core/math/test_math_funcs.cpp
rename to engine/tests/core/math/test_math_funcs.h
index 11c302ac..f75bb7db 100644
--- a/engine/tests/core/math/test_math_funcs.cpp
+++ b/engine/tests/core/math/test_math_funcs.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_math_funcs.cpp                                                   */
+/*  test_math_funcs.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "core/math/math_funcs_binary.h"
+#pragma once
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_math_funcs)
-
-namespace TestMathFuncs {
+namespace TestMath {
 
 TEST_CASE("[Math] C++ macros") {
 	CHECK(MIN(-2, 2) == -2);
@@ -59,35 +58,35 @@ TEST_CASE("[Math] C++ macros") {
 }
 
 TEST_CASE("[Math] Power of two functions") {
-	CHECK(Math::next_power_of_2((uint32_t)0) == 0);
-	CHECK(Math::next_power_of_2((uint32_t)1) == 1);
-	CHECK(Math::next_power_of_2((uint32_t)16) == 16);
-	CHECK(Math::next_power_of_2((uint32_t)17) == 32);
-	CHECK(Math::next_power_of_2((uint32_t)65535) == 65536);
+	CHECK(next_power_of_2((uint32_t)0) == 0);
+	CHECK(next_power_of_2((uint32_t)1) == 1);
+	CHECK(next_power_of_2((uint32_t)16) == 16);
+	CHECK(next_power_of_2((uint32_t)17) == 32);
+	CHECK(next_power_of_2((uint32_t)65535) == 65536);
 
-	CHECK(Math::previous_power_of_2((uint32_t)0) == 0);
-	CHECK(Math::previous_power_of_2((uint32_t)1) == 1);
-	CHECK(Math::previous_power_of_2((uint32_t)16) == 16);
-	CHECK(Math::previous_power_of_2((uint32_t)17) == 16);
-	CHECK(Math::previous_power_of_2((uint32_t)65535) == 32768);
+	CHECK(previous_power_of_2((uint32_t)0) == 0);
+	CHECK(previous_power_of_2((uint32_t)1) == 1);
+	CHECK(previous_power_of_2((uint32_t)16) == 16);
+	CHECK(previous_power_of_2((uint32_t)17) == 16);
+	CHECK(previous_power_of_2((uint32_t)65535) == 32768);
 
-	CHECK(Math::closest_power_of_2((uint32_t)0) == 0);
-	CHECK(Math::closest_power_of_2((uint32_t)1) == 1);
-	CHECK(Math::closest_power_of_2((uint32_t)16) == 16);
-	CHECK(Math::closest_power_of_2((uint32_t)17) == 16);
-	CHECK(Math::closest_power_of_2((uint32_t)65535) == 65536);
+	CHECK(closest_power_of_2((uint32_t)0) == 0);
+	CHECK(closest_power_of_2((uint32_t)1) == 1);
+	CHECK(closest_power_of_2((uint32_t)16) == 16);
+	CHECK(closest_power_of_2((uint32_t)17) == 16);
+	CHECK(closest_power_of_2((uint32_t)65535) == 65536);
 
-	CHECK(Math::get_shift_from_power_of_2((uint32_t)0) == -1);
-	CHECK(Math::get_shift_from_power_of_2((uint32_t)1) == 0);
-	CHECK(Math::get_shift_from_power_of_2((uint32_t)16) == 4);
-	CHECK(Math::get_shift_from_power_of_2((uint32_t)17) == -1);
-	CHECK(Math::get_shift_from_power_of_2((uint32_t)65535) == -1);
+	CHECK(get_shift_from_power_of_2((uint32_t)0) == -1);
+	CHECK(get_shift_from_power_of_2((uint32_t)1) == 0);
+	CHECK(get_shift_from_power_of_2((uint32_t)16) == 4);
+	CHECK(get_shift_from_power_of_2((uint32_t)17) == -1);
+	CHECK(get_shift_from_power_of_2((uint32_t)65535) == -1);
 
-	CHECK(Math::nearest_shift((uint32_t)0) == 0);
-	CHECK(Math::nearest_shift((uint32_t)1) == 1);
-	CHECK(Math::nearest_shift((uint32_t)16) == 5);
-	CHECK(Math::nearest_shift((uint32_t)17) == 5);
-	CHECK(Math::nearest_shift((uint32_t)65535) == 16);
+	CHECK(nearest_shift((uint32_t)0) == 0);
+	CHECK(nearest_shift((uint32_t)1) == 1);
+	CHECK(nearest_shift((uint32_t)16) == 5);
+	CHECK(nearest_shift((uint32_t)17) == 5);
+	CHECK(nearest_shift((uint32_t)65535) == 16);
 }
 
 TEST_CASE_TEMPLATE("[Math] abs", T, int, float, double) {
@@ -639,4 +638,4 @@ TEST_CASE_TEMPLATE("[Math] bezier_interpolate", T, float, double) {
 	CHECK(Math::bezier_interpolate((T)0.0, (T)0.2, (T)0.8, (T)1.0, (T)1.0) == doctest::Approx((T)1.0));
 }
 
-} // namespace TestMathFuncs
+} // namespace TestMath
diff --git a/engine/tests/core/math/test_plane.cpp b/engine/tests/core/math/test_plane.h
similarity index 98%
rename from engine/tests/core/math/test_plane.cpp
rename to engine/tests/core/math/test_plane.h
index 24304d3e..aefd27ca 100644
--- a/engine/tests/core/math/test_plane.cpp
+++ b/engine/tests/core/math/test_plane.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_plane.cpp                                                        */
+/*  test_plane.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_plane)
+#pragma once
 
 #include "core/math/plane.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestPlane {
 
+// Plane
+
 TEST_CASE("[Plane] Constructor methods") {
 	constexpr Plane plane = Plane(32, 22, 16, 3);
 	constexpr Plane plane_vector = Plane(Vector3(32, 22, 16), 3);
diff --git a/engine/tests/core/math/test_projection.cpp b/engine/tests/core/math/test_projection.h
similarity index 99%
rename from engine/tests/core/math/test_projection.cpp
rename to engine/tests/core/math/test_projection.h
index dea0d29d..d3bf3e2d 100644
--- a/engine/tests/core/math/test_projection.cpp
+++ b/engine/tests/core/math/test_projection.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_projection.cpp                                                   */
+/*  test_projection.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,9 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_projection)
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
@@ -38,6 +36,8 @@ TEST_FORCE_LINK(test_projection)
 #include "core/math/rect2.h"
 #include "core/math/transform_3d.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestProjection {
 
 TEST_CASE("[Projection] Construction") {
@@ -691,5 +691,4 @@ TEST_CASE("[Projection] Pixels per meter") {
 	ppm = proj.get_pixels_per_meter(800);
 	CHECK(ppm == 400);
 }
-
-} // namespace TestProjection
+} //namespace TestProjection
diff --git a/engine/tests/core/math/test_quaternion.cpp b/engine/tests/core/math/test_quaternion.h
similarity index 99%
rename from engine/tests/core/math/test_quaternion.cpp
rename to engine/tests/core/math/test_quaternion.h
index 19938e54..ea4c5ea8 100644
--- a/engine/tests/core/math/test_quaternion.cpp
+++ b/engine/tests/core/math/test_quaternion.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_quaternion.cpp                                                   */
+/*  test_quaternion.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_quaternion)
+#pragma once
 
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/quaternion.h"
 #include "core/math/vector3.h"
 
+#include "tests/test_macros.h"
+
 namespace TestQuaternion {
 
 Quaternion quat_euler_yxz_deg(Vector3 angle) {
diff --git a/engine/tests/core/math/test_random_number_generator.cpp b/engine/tests/core/math/test_random_number_generator.h
similarity index 98%
rename from engine/tests/core/math/test_random_number_generator.cpp
rename to engine/tests/core/math/test_random_number_generator.h
index 11aef835..57360a27 100644
--- a/engine/tests/core/math/test_random_number_generator.cpp
+++ b/engine/tests/core/math/test_random_number_generator.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_random_number_generator.cpp                                      */
+/*  test_random_number_generator.h                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_random_number_generator)
+#pragma once
 
 #include "core/math/random_number_generator.h"
+#include "tests/test_macros.h"
 
 namespace TestRandomNumberGenerator {
 
@@ -270,5 +269,4 @@ TEST_CASE_MAY_FAIL("[RandomNumberGenerator] randi_range bias check") {
 		CHECK_MESSAGE(std::abs(vals[i] / 1000000.0 - 0.1) < 0.01, "Each element should appear roughly 10% of the time");
 	}
 }
-
 } // namespace TestRandomNumberGenerator
diff --git a/engine/tests/core/math/test_rect2.cpp b/engine/tests/core/math/test_rect2.h
similarity index 99%
rename from engine/tests/core/math/test_rect2.cpp
rename to engine/tests/core/math/test_rect2.h
index 1c92eaa8..69280fe6 100644
--- a/engine/tests/core/math/test_rect2.cpp
+++ b/engine/tests/core/math/test_rect2.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_rect2.cpp                                                        */
+/*  test_rect2.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_rect2)
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/math/rect2i.h"
 
-namespace TestRect2 {
+#include "thirdparty/doctest/doctest.h"
 
+namespace TestRect2 {
 TEST_CASE("[Rect2] Constructor methods") {
 	constexpr Rect2 rect = Rect2(0, 100, 1280, 720);
 	constexpr Rect2 rect_vector = Rect2(Vector2(0, 100), Vector2(1280, 720));
diff --git a/engine/tests/core/math/test_rect2i.cpp b/engine/tests/core/math/test_rect2i.h
similarity index 99%
rename from engine/tests/core/math/test_rect2i.cpp
rename to engine/tests/core/math/test_rect2i.h
index ec4597ce..68495bac 100644
--- a/engine/tests/core/math/test_rect2i.cpp
+++ b/engine/tests/core/math/test_rect2i.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_rect2i.cpp                                                       */
+/*  test_rect2i.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_rect2i)
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/math/rect2i.h"
 
-namespace TestRect2i {
+#include "thirdparty/doctest/doctest.h"
 
+namespace TestRect2i {
 TEST_CASE("[Rect2i] Constructor methods") {
 	constexpr Rect2i recti = Rect2i(0, 100, 1280, 720);
 	constexpr Rect2i recti_vector = Rect2i(Vector2i(0, 100), Vector2i(1280, 720));
@@ -306,5 +305,4 @@ TEST_CASE("[Rect2i] Merging") {
 			Rect2i(0, 100, 1280, 720).merge(Rect2i(-4000, -4000, 100, 100)) == Rect2i(-4000, -4000, 5280, 4820),
 			"merge() with non-enclosed Rect2i should return the expected result.");
 }
-
 } // namespace TestRect2i
diff --git a/engine/tests/core/math/test_transform_2d.cpp b/engine/tests/core/math/test_transform_2d.h
similarity index 99%
rename from engine/tests/core/math/test_transform_2d.cpp
rename to engine/tests/core/math/test_transform_2d.h
index 2706b6a0..b6f18bd7 100644
--- a/engine/tests/core/math/test_transform_2d.cpp
+++ b/engine/tests/core/math/test_transform_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_transform_2d.cpp                                                 */
+/*  test_transform_2d.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_transform_2d)
+#pragma once
 
 #include "core/math/transform_2d.h"
 
+#include "tests/test_macros.h"
+
 namespace TestTransform2D {
 
 Transform2D create_dummy_transform() {
diff --git a/engine/tests/core/math/test_transform_3d.cpp b/engine/tests/core/math/test_transform_3d.h
similarity index 98%
rename from engine/tests/core/math/test_transform_3d.cpp
rename to engine/tests/core/math/test_transform_3d.h
index abd306da..c1030d57 100644
--- a/engine/tests/core/math/test_transform_3d.cpp
+++ b/engine/tests/core/math/test_transform_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_transform_3d.cpp                                                 */
+/*  test_transform_3d.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_transform_3d)
+#pragma once
 
 #include "core/math/transform_3d.h"
 
+#include "tests/test_macros.h"
+
 namespace TestTransform3D {
 
 Transform3D create_dummy_transform() {
@@ -135,5 +135,4 @@ TEST_CASE("[Transform3D] Rotate in-place (local rotation)") {
 	const Transform3D rotated_transform = Transform3D(transform.rotated_local(Vector3(0, 1, 0), Math::PI));
 	CHECK_MESSAGE(rotated_transform.is_equal_approx(expected), "The rotated transform should have a new orientation but still be based on the same origin.");
 }
-
 } // namespace TestTransform3D
diff --git a/engine/tests/core/math/test_triangle_mesh.cpp b/engine/tests/core/math/test_triangle_mesh.h
similarity index 96%
rename from engine/tests/core/math/test_triangle_mesh.cpp
rename to engine/tests/core/math/test_triangle_mesh.h
index 333ae5eb..f138b554 100644
--- a/engine/tests/core/math/test_triangle_mesh.cpp
+++ b/engine/tests/core/math/test_triangle_mesh.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_triangle_mesh.cpp                                                */
+/*  test_triangle_mesh.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_triangle_mesh)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "core/math/triangle_mesh.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
+#include "tests/test_macros.h"
+
 namespace TestTriangleMesh {
 
 TEST_CASE("[SceneTree][TriangleMesh] BVH creation and intersection") {
@@ -81,7 +79,4 @@ TEST_CASE("[SceneTree][TriangleMesh] BVH creation and intersection") {
 		CHECK(face_index == 8);
 	}
 }
-
 } // namespace TestTriangleMesh
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/core/math/test_vector2.cpp b/engine/tests/core/math/test_vector2.h
similarity index 99%
rename from engine/tests/core/math/test_vector2.cpp
rename to engine/tests/core/math/test_vector2.h
index 75c80b43..683da430 100644
--- a/engine/tests/core/math/test_vector2.cpp
+++ b/engine/tests/core/math/test_vector2.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector2.cpp                                                      */
+/*  test_vector2.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector2)
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
+#include "tests/test_macros.h"
 
 namespace TestVector2 {
 
diff --git a/engine/tests/core/math/test_vector2i.cpp b/engine/tests/core/math/test_vector2i.h
similarity index 98%
rename from engine/tests/core/math/test_vector2i.cpp
rename to engine/tests/core/math/test_vector2i.h
index 7aa2bcda..edd2f7a8 100644
--- a/engine/tests/core/math/test_vector2i.cpp
+++ b/engine/tests/core/math/test_vector2i.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector2i.cpp                                                     */
+/*  test_vector2i.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector2i)
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
+#include "tests/test_macros.h"
 
 namespace TestVector2i {
 
@@ -166,5 +165,4 @@ TEST_CASE("[Vector2i] Abs and sign methods") {
 			vector2.sign() == Vector2i(1, -1),
 			"Vector2i sign should work as expected.");
 }
-
 } // namespace TestVector2i
diff --git a/engine/tests/core/math/test_vector3.cpp b/engine/tests/core/math/test_vector3.h
similarity index 99%
rename from engine/tests/core/math/test_vector3.cpp
rename to engine/tests/core/math/test_vector3.h
index 76b5acaa..c8f377dd 100644
--- a/engine/tests/core/math/test_vector3.cpp
+++ b/engine/tests/core/math/test_vector3.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector3.cpp                                                      */
+/*  test_vector3.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector3)
+#pragma once
 
 #include "core/math/vector3.h"
+#include "tests/test_macros.h"
 
 namespace TestVector3 {
 
diff --git a/engine/tests/core/math/test_vector3i.cpp b/engine/tests/core/math/test_vector3i.h
similarity index 98%
rename from engine/tests/core/math/test_vector3i.cpp
rename to engine/tests/core/math/test_vector3i.h
index 2aaa1e53..cec23525 100644
--- a/engine/tests/core/math/test_vector3i.cpp
+++ b/engine/tests/core/math/test_vector3i.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector3i.cpp                                                     */
+/*  test_vector3i.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector3i)
+#pragma once
 
 #include "core/math/vector3i.h"
+#include "tests/test_macros.h"
 
 namespace TestVector3i {
 
@@ -165,5 +164,4 @@ TEST_CASE("[Vector3i] Abs and sign methods") {
 			vector2.sign() == Vector3i(1, -1, -1),
 			"Vector3i sign should work as expected.");
 }
-
 } // namespace TestVector3i
diff --git a/engine/tests/core/math/test_vector4.cpp b/engine/tests/core/math/test_vector4.h
similarity index 99%
rename from engine/tests/core/math/test_vector4.cpp
rename to engine/tests/core/math/test_vector4.h
index 1c05a406..457c5327 100644
--- a/engine/tests/core/math/test_vector4.cpp
+++ b/engine/tests/core/math/test_vector4.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector4.cpp                                                      */
+/*  test_vector4.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector4)
+#pragma once
 
 #include "core/math/vector4.h"
+#include "tests/test_macros.h"
 
 namespace TestVector4 {
 
diff --git a/engine/tests/core/math/test_vector4i.cpp b/engine/tests/core/math/test_vector4i.h
similarity index 98%
rename from engine/tests/core/math/test_vector4i.cpp
rename to engine/tests/core/math/test_vector4i.h
index d95fded5..661cc369 100644
--- a/engine/tests/core/math/test_vector4i.cpp
+++ b/engine/tests/core/math/test_vector4i.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector4i.cpp                                                     */
+/*  test_vector4i.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector4i)
+#pragma once
 
 #include "core/math/vector4i.h"
+#include "tests/test_macros.h"
 
 namespace TestVector4i {
 
@@ -169,5 +168,4 @@ TEST_CASE("[Vector4i] Abs and sign methods") {
 			vector2.sign() == Vector4i(1, -1, -1, 1),
 			"Vector4i sign should work as expected.");
 }
-
 } // namespace TestVector4i
diff --git a/engine/tests/core/object/test_class_db.cpp b/engine/tests/core/object/test_class_db.h
similarity index 96%
rename from engine/tests/core/object/test_class_db.cpp
rename to engine/tests/core/object/test_class_db.h
index 28c8405f..012279c0 100644
--- a/engine/tests/core/object/test_class_db.cpp
+++ b/engine/tests/core/object/test_class_db.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_class_db.cpp                                                     */
+/*  test_class_db.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_class_db)
-
-#include "core/config/engine.h"
+#include "core/core_bind.h"
 #include "core/core_constants.h"
 #include "core/object/class_db.h"
 
+#include "tests/test_macros.h"
+
 namespace TestClassDB {
 
 struct TypeReference {
@@ -496,6 +496,9 @@ void validate_class(const Context &p_context, const ExposedClass &p_exposed_clas
 				"Object class is registered as a singleton.");
 	}
 
+	TEST_FAIL_COND((p_exposed_class.is_singleton && p_exposed_class.base != p_context.names_cache.object_class),
+			"Singleton base class '", String(p_exposed_class.base), "' is not Object, for class '", p_exposed_class.name, "'.");
+
 	TEST_FAIL_COND((is_derived_type && !p_context.exposed_classes.has(p_exposed_class.base)),
 			"Base type '", p_exposed_class.base.operator String(), "' does not exist, for class '", p_exposed_class.name, "'.");
 
@@ -711,12 +714,12 @@ void add_exposed_classes(Context &r_context) {
 
 		// Add signals
 
-		const AHashMap<StringName, const MethodInfo *> &signal_map = class_info->gdtype->get_signal_map(true);
+		const AHashMap<StringName, MethodInfo> &signal_map = class_info->signal_map;
 
-		for (const KeyValue<StringName, const MethodInfo *> &K : signal_map) {
+		for (const KeyValue<StringName, MethodInfo> &K : signal_map) {
 			SignalData signal;
 
-			const MethodInfo &method_info = *signal_map.get(K.key);
+			const MethodInfo &method_info = signal_map.get(K.key);
 
 			signal.name = method_info.name;
 			TEST_FAIL_COND(!String(signal.name).is_valid_ascii_identifier(),
@@ -764,18 +767,18 @@ void add_exposed_classes(Context &r_context) {
 		List<String> constants;
 		ClassDB::get_integer_constant_list(class_name, &constants, true);
 
-		const AHashMap<StringName, const GDType::EnumInfo *> &enum_map = class_info->gdtype->get_enum_map(true);
+		const HashMap<StringName, ClassDB::ClassInfo::EnumInfo> &enum_map = class_info->enum_map;
 
-		for (const KeyValue<StringName, const GDType::EnumInfo *> &kv_enum : enum_map) {
+		for (const KeyValue<StringName, ClassDB::ClassInfo::EnumInfo> &K : enum_map) {
 			EnumData enum_;
-			enum_.name = kv_enum.key;
+			enum_.name = K.key;
 
-			for (const KeyValue<StringName, int64_t> &kv_case : kv_enum.value->values) {
-				const StringName &constant_name = kv_case.key;
+			for (const StringName &E : K.value.constants) {
+				const StringName &constant_name = E;
 				TEST_FAIL_COND(String(constant_name).contains("::"),
 						"Enum constant contains '::', check bindings to remove the scope: '",
 						String(class_name), ".", String(enum_.name), ".", String(constant_name), "'.");
-				const int64_t *value = class_info->gdtype->get_integer_constant_map(false).getptr(constant_name);
+				int64_t *value = class_info->constant_map.getptr(constant_name);
 				TEST_FAIL_COND(!value, "Missing enum constant value: '",
 						String(class_name), ".", String(enum_.name), ".", String(constant_name), "'.");
 				constants.erase(constant_name);
@@ -789,7 +792,7 @@ void add_exposed_classes(Context &r_context) {
 
 			exposed_class.enums.push_back(enum_);
 
-			r_context.enum_types.push_back(String(class_name) + "." + String(kv_enum.key));
+			r_context.enum_types.push_back(String(class_name) + "." + String(K.key));
 		}
 
 		for (const String &E : constants) {
@@ -797,7 +800,7 @@ void add_exposed_classes(Context &r_context) {
 			TEST_FAIL_COND(constant_name.contains("::"),
 					"Constant contains '::', check bindings to remove the scope: '",
 					String(class_name), ".", constant_name, "'.");
-			const int64_t *value = class_info->gdtype->get_integer_constant_map(false).getptr(StringName(E));
+			int64_t *value = class_info->constant_map.getptr(StringName(E));
 			TEST_FAIL_COND(!value, "Missing constant value: '", String(class_name), ".", String(constant_name), "'.");
 
 			ConstantData constant;
@@ -887,5 +890,4 @@ TEST_SUITE("[ClassDB]") {
 		}
 	}
 }
-
 } // namespace TestClassDB
diff --git a/engine/tests/core/object/test_method_bind.cpp b/engine/tests/core/object/test_method_bind.h
similarity index 98%
rename from engine/tests/core/object/test_method_bind.cpp
rename to engine/tests/core/object/test_method_bind.h
index f88ab828..4f278f5b 100644
--- a/engine/tests/core/object/test_method_bind.cpp
+++ b/engine/tests/core/object/test_method_bind.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_method_bind.cpp                                                  */
+/*  test_method_bind.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_method_bind)
+#pragma once
 
 #include "core/object/class_db.h"
 
+#include "tests/test_macros.h"
+
 namespace TestMethodBind {
 
 class MethodBindTester : public Object {
@@ -171,5 +171,4 @@ TEST_CASE("[MethodBind] check all method binds") {
 
 	memdelete(mbt);
 }
-
 } // namespace TestMethodBind
diff --git a/engine/tests/core/object/test_object.cpp b/engine/tests/core/object/test_object.h
similarity index 97%
rename from engine/tests/core/object/test_object.cpp
rename to engine/tests/core/object/test_object.h
index d241b616..e683568a 100644
--- a/engine/tests/core/object/test_object.cpp
+++ b/engine/tests/core/object/test_object.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_object.cpp                                                       */
+/*  test_object.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,27 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_object)
-
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/script_language.h"
-#include "tests/signal_watcher.h"
 
-namespace TestObject {
+#include "tests/test_macros.h"
 
+#ifdef SANITIZERS_ENABLED
+#ifdef __has_feature
+#if __has_feature(address_sanitizer) || __has_feature(thread_sanitizer)
+#define ASAN_OR_TSAN_ENABLED
+#endif
+#elif defined(__SANITIZE_ADDRESS__) || defined(__SANITIZE_THREAD__)
+#define ASAN_OR_TSAN_ENABLED
+#endif
+#endif
+
+// Declared in global namespace because of GDCLASS macro warning (Windows):
+// "Unqualified friend declaration referring to type outside of the nearest enclosing namespace
+// is a Microsoft extension; add a nested name specifier".
 class _TestDerivedObject : public Object {
 	GDCLASS(_TestDerivedObject, Object);
 
@@ -57,6 +66,8 @@ public:
 	int get_property() const { return property_value; }
 };
 
+namespace TestObject {
+
 class _MockScriptInstance : public ScriptInstance {
 	StringName property_name = "NO_NAME";
 	Variant property_value;
@@ -594,7 +605,7 @@ TEST_CASE("[Object] Destruction at the end of the call chain is safe") {
 
 		// This has to be static because ~Object() also destroys the script instance.
 		static void free_self(Object *p_self) {
-#if defined(ASAN_ENABLED) || defined(TSAN_ENABLED)
+#if defined(ASAN_OR_TSAN_ENABLED)
 			// Regular deletion is enough becausa asan/tsan will catch a potential heap-after-use.
 			memdelete(p_self);
 #else
diff --git a/engine/tests/core/object/test_undo_redo.cpp b/engine/tests/core/object/test_undo_redo.h
similarity index 95%
rename from engine/tests/core/object/test_undo_redo.cpp
rename to engine/tests/core/object/test_undo_redo.h
index 87bc1480..51b2b000 100644
--- a/engine/tests/core/object/test_undo_redo.cpp
+++ b/engine/tests/core/object/test_undo_redo.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_undo_redo.cpp                                                    */
+/*  test_undo_redo.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "core/object/undo_redo.h"
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_undo_redo)
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-#include "core/object/undo_redo.h"
-
-namespace TestUndoRedo {
-
+// Declared in global namespace because of GDCLASS macro warning (Windows):
+// "Unqualified friend declaration referring to type outside of the nearest enclosing namespace
+// is a Microsoft extension; add a nested name specifier".
 class _TestUndoRedoObject : public Object {
 	GDCLASS(_TestUndoRedoObject, Object);
 	int property_value = 0;
@@ -56,6 +54,8 @@ public:
 	void subtract_from_property(int value) { property_value -= value; }
 };
 
+namespace TestUndoRedo {
+
 void set_property_action(UndoRedo *undo_redo, const String &name, _TestUndoRedoObject *test_object, int value, UndoRedo::MergeMode merge_mode = UndoRedo::MERGE_DISABLE) {
 	undo_redo->create_action(name, merge_mode);
 	undo_redo->add_do_property(test_object, "property", value);
@@ -196,4 +196,4 @@ TEST_CASE("[UndoRedo] Merge Method UndoRedo") {
 	memdelete(undo_redo);
 }
 
-} // namespace TestUndoRedo
+} //namespace TestUndoRedo
diff --git a/engine/tests/core/os/test_os.cpp b/engine/tests/core/os/test_os.h
similarity index 98%
rename from engine/tests/core/os/test_os.cpp
rename to engine/tests/core/os/test_os.h
index 29c98995..15d3b3af 100644
--- a/engine/tests/core/os/test_os.cpp
+++ b/engine/tests/core/os/test_os.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_os.cpp                                                           */
+/*  test_os.h                                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_os)
+#pragma once
 
 #include "core/os/os.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestOS {
 
 TEST_CASE("[OS] Environment variables") {
diff --git a/engine/tests/core/string/test_fuzzy_search.cpp b/engine/tests/core/string/test_fuzzy_search.h
similarity index 95%
rename from engine/tests/core/string/test_fuzzy_search.cpp
rename to engine/tests/core/string/test_fuzzy_search.h
index 9d1536ef..a7e52be1 100644
--- a/engine/tests/core/string/test_fuzzy_search.cpp
+++ b/engine/tests/core/string/test_fuzzy_search.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_fuzzy_search.cpp                                                 */
+/*  test_fuzzy_search.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_fuzzy_search)
-
-#include "core/io/file_access.h"
 #include "core/string/fuzzy_search.h"
-#include "tests/test_utils.h"
+#include "tests/test_macros.h"
 
 namespace TestFuzzySearch {
 
@@ -80,4 +77,4 @@ TEST_CASE("[FuzzySearch] Test fuzzy search results") {
 	}
 }
 
-} // namespace TestFuzzySearch
+} //namespace TestFuzzySearch
diff --git a/engine/tests/core/string/test_node_path.cpp b/engine/tests/core/string/test_node_path.h
similarity index 99%
rename from engine/tests/core/string/test_node_path.cpp
rename to engine/tests/core/string/test_node_path.h
index d33d1352..a30430dc 100644
--- a/engine/tests/core/string/test_node_path.cpp
+++ b/engine/tests/core/string/test_node_path.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_node_path.cpp                                                    */
+/*  test_node_path.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_node_path)
+#pragma once
 
 #include "core/string/node_path.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNodePath {
 
 TEST_CASE("[NodePath] Relative path") {
diff --git a/engine/tests/core/string/test_string.cpp b/engine/tests/core/string/test_string.h
similarity index 97%
rename from engine/tests/core/string/test_string.cpp
rename to engine/tests/core/string/test_string.h
index 331a066f..de0ae8cc 100644
--- a/engine/tests/core/string/test_string.cpp
+++ b/engine/tests/core/string/test_string.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_string.cpp                                                       */
+/*  test_string.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_string)
+#pragma once
 
 #include "core/string/ustring.h"
 
+#include "tests/test_macros.h"
+
 namespace TestString {
 
 int u32scmp(const char32_t *l, const char32_t *r) {
@@ -1296,15 +1296,6 @@ TEST_CASE("[String] sprintf") {
 	REQUIRE(error == false);
 	CHECK(output == String("fish     99.990 frog"));
 
-	///// Argument indices.
-	format = "fish %2$d frog %1$s xx";
-	args.clear();
-	args.push_back("test");
-	args.push_back(5);
-	output = format.sprintf(args, &error);
-	REQUIRE(error == false);
-	CHECK(output == String("fish 5 frog test xx"));
-
 	///// Errors
 
 	// More formats than arguments.
@@ -1631,9 +1622,9 @@ TEST_CASE("[String] Checking string is empty when it should be") {
 }
 
 TEST_CASE("[String] lstrip and rstrip") {
-#define STRIP_TEST(x) \
-	{ \
-		bool success = x; \
+#define STRIP_TEST(x)             \
+	{                             \
+		bool success = x;         \
 		state = state && success; \
 	}
 
@@ -2192,17 +2183,17 @@ TEST_CASE("[String] Variant ptr indexed set") {
 
 TEST_CASE("[String][URL] Parse URL") {
 #define CHECK_URL(m_url_to_parse, m_expected_schema, m_expected_host, m_expected_port, m_expected_path, m_expected_fragment, m_expected_error) \
-	if (true) { \
-		int port; \
-		String url(m_url_to_parse), schema, host, path, fragment; \
-\
-		CHECK_EQ(url.parse_url(schema, host, port, path, fragment), m_expected_error); \
-		CHECK_EQ(schema, m_expected_schema); \
-		CHECK_EQ(host, m_expected_host); \
-		CHECK_EQ(path, m_expected_path); \
-		CHECK_EQ(fragment, m_expected_fragment); \
-		CHECK_EQ(port, m_expected_port); \
-	} else \
+	if (true) {                                                                                                                                \
+		int port;                                                                                                                              \
+		String url(m_url_to_parse), schema, host, path, fragment;                                                                              \
+                                                                                                                                               \
+		CHECK_EQ(url.parse_url(schema, host, port, path, fragment), m_expected_error);                                                         \
+		CHECK_EQ(schema, m_expected_schema);                                                                                                   \
+		CHECK_EQ(host, m_expected_host);                                                                                                       \
+		CHECK_EQ(path, m_expected_path);                                                                                                       \
+		CHECK_EQ(fragment, m_expected_fragment);                                                                                               \
+		CHECK_EQ(port, m_expected_port);                                                                                                       \
+	} else                                                                                                                                     \
 		((void)0)
 
 	// All elements.
@@ -2244,5 +2235,4 @@ TEST_CASE("[String][URL] Parse URL") {
 
 #undef CHECK_URL
 }
-
 } // namespace TestString
diff --git a/engine/tests/core/string/test_translation.cpp b/engine/tests/core/string/test_translation.h
similarity index 98%
rename from engine/tests/core/string/test_translation.cpp
rename to engine/tests/core/string/test_translation.h
index 25474383..d2f2bd16 100644
--- a/engine/tests/core/string/test_translation.cpp
+++ b/engine/tests/core/string/test_translation.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_translation.cpp                                                  */
+/*  test_translation.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_translation)
-
-#include "core/io/resource_loader.h"
 #include "core/string/optimized_translation.h"
 #include "core/string/plural_rules.h"
 #include "core/string/translation.h"
@@ -42,6 +39,7 @@ TEST_FORCE_LINK(test_translation)
 #include "editor/import/resource_importer_csv_translation.h"
 #endif
 
+#include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
 namespace TestTranslation {
@@ -262,7 +260,6 @@ TEST_CASE("[TranslationCSV] CSV import") {
 
 	TranslationServer::get_singleton()->remove_domain("godot.test");
 }
-
 #endif // TOOLS_ENABLED
 
 } // namespace TestTranslation
diff --git a/engine/tests/core/string/test_translation_server.cpp b/engine/tests/core/string/test_translation_server.h
similarity index 98%
rename from engine/tests/core/string/test_translation_server.cpp
rename to engine/tests/core/string/test_translation_server.h
index 5b503096..e7cf57c2 100644
--- a/engine/tests/core/string/test_translation_server.cpp
+++ b/engine/tests/core/string/test_translation_server.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_translation_server.cpp                                           */
+/*  test_translation_server.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_translation_server)
+#pragma once
 
 #include "core/string/translation_server.h"
 
-namespace TestTranslationServer {
+#include "tests/test_macros.h"
 
+namespace TestTranslationServer {
 TEST_CASE("[TranslationServer] Translation operations") {
 	Ref<TranslationDomain> td = TranslationServer::get_singleton()->get_or_add_domain("godot.test");
 	CHECK(td->get_translations().is_empty());
@@ -237,5 +236,4 @@ TEST_CASE("[TranslationServer] Comparing locales") {
 
 	CHECK(res == 10);
 }
-
 } // namespace TestTranslationServer
diff --git a/engine/tests/core/templates/test_a_hash_map.cpp b/engine/tests/core/templates/test_a_hash_map.h
similarity index 98%
rename from engine/tests/core/templates/test_a_hash_map.cpp
rename to engine/tests/core/templates/test_a_hash_map.h
index e3ec8599..ae51bdad 100644
--- a/engine/tests/core/templates/test_a_hash_map.cpp
+++ b/engine/tests/core/templates/test_a_hash_map.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_a_hash_map.cpp                                                   */
+/*  test_a_hash_map.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_a_hash_map)
+#pragma once
 
 #include "core/templates/a_hash_map.h"
 
+#include "tests/test_macros.h"
+
 namespace TestAHashMap {
 
 TEST_CASE("[AHashMap] List initialization") {
@@ -137,7 +137,7 @@ TEST_CASE("[AHashMap] Const iteration") {
 	map.insert(123485, 1238888);
 	map.insert(123, 111111);
 
-	const AHashMap<int, int> const_map(map);
+	const AHashMap<int, int> const_map = map;
 
 	Vector<Pair<int, int>> expected;
 	expected.push_back(Pair<int, int>(42, 84));
diff --git a/engine/tests/core/templates/test_command_queue.cpp b/engine/tests/core/templates/test_command_queue.h
similarity index 99%
rename from engine/tests/core/templates/test_command_queue.cpp
rename to engine/tests/core/templates/test_command_queue.h
index f1206ff5..06795461 100644
--- a/engine/tests/core/templates/test_command_queue.cpp
+++ b/engine/tests/core/templates/test_command_queue.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_command_queue.cpp                                                */
+/*  test_command_queue.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_command_queue)
+#pragma once
 
 #include "core/config/project_settings.h"
+#include "core/math/random_number_generator.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
+#include "tests/test_macros.h"
 
 namespace TestCommandQueue {
 
@@ -518,5 +518,4 @@ TEST_CASE("[CommandQueue] Test Parameter Passing Semantics") {
 
 	sts.destroy_threads();
 }
-
 } // namespace TestCommandQueue
diff --git a/engine/tests/core/templates/test_fixed_vector.cpp b/engine/tests/core/templates/test_fixed_vector.h
similarity index 97%
rename from engine/tests/core/templates/test_fixed_vector.cpp
rename to engine/tests/core/templates/test_fixed_vector.h
index b6569519..72631f5f 100644
--- a/engine/tests/core/templates/test_fixed_vector.cpp
+++ b/engine/tests/core/templates/test_fixed_vector.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_fixed_vector.cpp                                                 */
+/*  test_fixed_vector.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_fixed_vector)
+#pragma once
 
 #include "core/templates/fixed_vector.h"
 
+#include "tests/test_macros.h"
+
 namespace TestFixedVector {
 
 struct MoveOnly {
@@ -133,4 +133,4 @@ TEST_CASE("[FixedVector] Alignment Checks") {
 	CHECK((size_t)&vector_uint64[3] % alignof(uint64_t) == 0);
 }
 
-} // namespace TestFixedVector
+} //namespace TestFixedVector
diff --git a/engine/tests/core/templates/test_hash_map.cpp b/engine/tests/core/templates/test_hash_map.h
similarity index 97%
rename from engine/tests/core/templates/test_hash_map.cpp
rename to engine/tests/core/templates/test_hash_map.h
index 59a8e063..fa022b30 100644
--- a/engine/tests/core/templates/test_hash_map.cpp
+++ b/engine/tests/core/templates/test_hash_map.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_hash_map.cpp                                                     */
+/*  test_hash_map.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_hash_map)
+#pragma once
 
 #include "core/templates/hash_map.h"
 
+#include "tests/test_macros.h"
+
 namespace TestHashMap {
 
 TEST_CASE("[HashMap] List initialization") {
@@ -130,7 +130,7 @@ TEST_CASE("[HashMap] Const iteration") {
 	map.insert(123485, 1238888);
 	map.insert(123, 111111);
 
-	const HashMap<int, int> const_map(map);
+	const HashMap<int, int> const_map = map;
 
 	Vector<Pair<int, int>> expected;
 	expected.push_back(Pair<int, int>(42, 84));
@@ -173,5 +173,4 @@ TEST_CASE("[HashMap] Sort") {
 		CHECK_EQ(kv.key, i);
 	}
 }
-
 } // namespace TestHashMap
diff --git a/engine/tests/core/templates/test_hash_set.cpp b/engine/tests/core/templates/test_hash_set.h
similarity index 97%
rename from engine/tests/core/templates/test_hash_set.cpp
rename to engine/tests/core/templates/test_hash_set.h
index 85807d85..d4b5e498 100644
--- a/engine/tests/core/templates/test_hash_set.cpp
+++ b/engine/tests/core/templates/test_hash_set.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_hash_set.cpp                                                     */
+/*  test_hash_set.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_hash_set)
+#pragma once
 
 #include "core/templates/hash_set.h"
 
+#include "tests/test_macros.h"
+
 namespace TestHashSet {
 
 TEST_CASE("[HashSet] List initialization") {
@@ -221,8 +221,7 @@ TEST_CASE("[HashSet] Copy") {
 	expected.push_back(0);
 	expected.push_back(123485);
 
-	HashSet<int> copy_assign;
-	copy_assign = set;
+	HashSet<int> copy_assign = set;
 
 	int idx = 0;
 	for (const int &E : copy_assign) {
diff --git a/engine/tests/core/templates/test_list.cpp b/engine/tests/core/templates/test_list.h
similarity index 99%
rename from engine/tests/core/templates/test_list.cpp
rename to engine/tests/core/templates/test_list.h
index d37243ad..7f6b8e04 100644
--- a/engine/tests/core/templates/test_list.cpp
+++ b/engine/tests/core/templates/test_list.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_list.cpp                                                         */
+/*  test_list.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_list)
+#pragma once
 
 #include "core/templates/list.h"
 
+#include "tests/test_macros.h"
+
 namespace TestList {
 
 static void populate_integers(List<int> &p_list, List<int>::Element *r_elements[], int num_elements) {
@@ -545,5 +545,4 @@ TEST_CASE("[List] Swap adjacent back and front (reverse order of elements)") {
 		}
 	}
 }
-
 } // namespace TestList
diff --git a/engine/tests/core/templates/test_local_vector.cpp b/engine/tests/core/templates/test_local_vector.h
similarity index 98%
rename from engine/tests/core/templates/test_local_vector.cpp
rename to engine/tests/core/templates/test_local_vector.h
index 25a098a1..dc56a484 100644
--- a/engine/tests/core/templates/test_local_vector.cpp
+++ b/engine/tests/core/templates/test_local_vector.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_local_vector.cpp                                                 */
+/*  test_local_vector.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_local_vector)
+#pragma once
 
 #include "core/templates/local_vector.h"
 
+#include "tests/test_macros.h"
+
 namespace TestLocalVector {
 
 TEST_CASE("[LocalVector] List Initialization.") {
@@ -260,5 +260,4 @@ TEST_CASE("[LocalVector] Size / Resize / Reserve.") {
 	CHECK(vector.size() == 4);
 	CHECK(vector.get_capacity() >= 4);
 }
-
 } // namespace TestLocalVector
diff --git a/engine/tests/core/templates/test_lru.cpp b/engine/tests/core/templates/test_lru.h
similarity index 97%
rename from engine/tests/core/templates/test_lru.cpp
rename to engine/tests/core/templates/test_lru.h
index 0b9b9efe..44f6287e 100644
--- a/engine/tests/core/templates/test_lru.cpp
+++ b/engine/tests/core/templates/test_lru.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_lru.cpp                                                          */
+/*  test_lru.h                                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_lru)
+#pragma once
 
 #include "core/templates/lru.h"
 
+#include "tests/test_macros.h"
+
 namespace TestLRU {
 
 TEST_CASE("[LRU] Store and read") {
@@ -93,5 +93,4 @@ TEST_CASE("[LRU] Resize and clear") {
 	CHECK(!lru.has(3));
 	CHECK(!lru.has(4));
 }
-
 } // namespace TestLRU
diff --git a/engine/tests/core/templates/test_paged_array.cpp b/engine/tests/core/templates/test_paged_array.h
similarity index 97%
rename from engine/tests/core/templates/test_paged_array.cpp
rename to engine/tests/core/templates/test_paged_array.h
index b3d80cdf..e5cf3a77 100644
--- a/engine/tests/core/templates/test_paged_array.cpp
+++ b/engine/tests/core/templates/test_paged_array.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_paged_array.cpp                                                  */
+/*  test_paged_array.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_paged_array)
+#pragma once
 
 #include "core/templates/paged_array.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestPagedArray {
 
+// PagedArray
+
 TEST_CASE("[PagedArray] Simple fill and refill") {
 	PagedArrayPool<uint32_t> pool;
 	PagedArray<uint32_t> array;
diff --git a/engine/tests/core/templates/test_rid.cpp b/engine/tests/core/templates/test_rid.h
similarity index 96%
rename from engine/tests/core/templates/test_rid.cpp
rename to engine/tests/core/templates/test_rid.h
index e812fbc5..ed0f1947 100644
--- a/engine/tests/core/templates/test_rid.cpp
+++ b/engine/tests/core/templates/test_rid.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_rid.cpp                                                          */
+/*  test_rid.h                                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,22 +28,32 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_rid)
-
-#include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 #include "core/templates/rid_owner.h"
 
+#include "tests/test_macros.h"
+
+#ifdef THREADS_ENABLED
+#ifdef SANITIZERS_ENABLED
+#ifdef __has_feature
+#if __has_feature(thread_sanitizer)
+#define TSAN_ENABLED
+#endif
+#elif defined(__SANITIZE_THREAD__)
+#define TSAN_ENABLED
+#endif
+#endif // SANITIZERS_ENABLED
+#endif // THREADS_ENABLED
+
 #ifdef TSAN_ENABLED
 #include <sanitizer/tsan_interface.h>
 #endif
 
 namespace TestRID {
-
 TEST_CASE("[RID] Default Constructor") {
 	RID rid;
 
diff --git a/engine/tests/core/templates/test_self_list.cpp b/engine/tests/core/templates/test_self_list.h
similarity index 96%
rename from engine/tests/core/templates/test_self_list.cpp
rename to engine/tests/core/templates/test_self_list.h
index 6bff7d63..1abfc026 100644
--- a/engine/tests/core/templates/test_self_list.cpp
+++ b/engine/tests/core/templates/test_self_list.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_self_list.cpp                                                    */
+/*  test_self_list.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_self_list)
+#pragma once
 
 #include "core/templates/self_list.h"
 
+#include "tests/test_macros.h"
+
 namespace TestSelfList {
 
 TEST_CASE("[SelfList] Sort") {
@@ -69,5 +69,4 @@ TEST_CASE("[SelfList] Sort") {
 		element.remove_from_list();
 	}
 }
-
 } // namespace TestSelfList
diff --git a/engine/tests/core/templates/test_span.cpp b/engine/tests/core/templates/test_span.h
similarity index 97%
rename from engine/tests/core/templates/test_span.cpp
rename to engine/tests/core/templates/test_span.h
index da71c923..869f8e42 100644
--- a/engine/tests/core/templates/test_span.cpp
+++ b/engine/tests/core/templates/test_span.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_span.cpp                                                         */
+/*  test_span.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_span)
+#pragma once
 
 #include "core/templates/span.h"
 
+#include "tests/test_macros.h"
+
 namespace TestSpan {
 
 TEST_CASE("[Span] Constexpr Validators") {
diff --git a/engine/tests/core/templates/test_vector.cpp b/engine/tests/core/templates/test_vector.h
similarity index 98%
rename from engine/tests/core/templates/test_vector.cpp
rename to engine/tests/core/templates/test_vector.h
index 21b11dd8..6c6df5b7 100644
--- a/engine/tests/core/templates/test_vector.cpp
+++ b/engine/tests/core/templates/test_vector.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vector.cpp                                                       */
+/*  test_vector.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vector)
+#pragma once
 
 #include "core/templates/vector.h"
 
+#include "tests/test_macros.h"
+
 namespace TestVector {
 
 TEST_CASE("[Vector] List initialization") {
@@ -692,8 +692,6 @@ struct CyclicVectorHolder {
 	}
 };
 
-// Disable this test with ASAN, it will otherwise (rightfully) complain about use-after-poison.
-#ifndef ASAN_ENABLED
 TEST_CASE("[Vector] Cyclic Reference") {
 	// Create a stack-space vector.
 	Vector<CyclicVectorHolder> vector;
@@ -705,6 +703,5 @@ TEST_CASE("[Vector] Cyclic Reference") {
 	vector.ptrw()[0].is_destructing = true;
 	// The vector goes out of scope and destructs, calling CyclicVectorHolder's destructor.
 }
-#endif
 
 } // namespace TestVector
diff --git a/engine/tests/core/templates/test_vset.cpp b/engine/tests/core/templates/test_vset.h
similarity index 97%
rename from engine/tests/core/templates/test_vset.cpp
rename to engine/tests/core/templates/test_vset.h
index df57475c..f9def880 100644
--- a/engine/tests/core/templates/test_vset.cpp
+++ b/engine/tests/core/templates/test_vset.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_vset.cpp                                                         */
+/*  test_vset.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_vset)
+#pragma once
 
 #include "core/templates/vset.h"
 
+#include "tests/test_macros.h"
+
 namespace TestVSet {
 
 template <typename T>
diff --git a/engine/tests/core/test_crypto.cpp b/engine/tests/core/test_crypto.h
similarity index 97%
rename from engine/tests/core/test_crypto.cpp
rename to engine/tests/core/test_crypto.h
index d9a1c423..97564e35 100644
--- a/engine/tests/core/test_crypto.cpp
+++ b/engine/tests/core/test_crypto.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_crypto.cpp                                                       */
+/*  test_crypto.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_crypto)
+#pragma once
 
 #include "core/crypto/crypto.h"
+#include "tests/test_macros.h"
 
 namespace TestCrypto {
 
@@ -68,5 +67,4 @@ TEST_CASE("[Crypto] PackedByteArray constant time compare") {
 	equal = crypto.constant_time_compare(p1, p2);
 	CHECK(!equal);
 }
-
 } // namespace TestCrypto
diff --git a/engine/tests/core/test_hashing_context.cpp b/engine/tests/core/test_hashing_context.h
similarity index 98%
rename from engine/tests/core/test_hashing_context.cpp
rename to engine/tests/core/test_hashing_context.h
index 9537631b..89136b05 100644
--- a/engine/tests/core/test_hashing_context.cpp
+++ b/engine/tests/core/test_hashing_context.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_hashing_context.cpp                                              */
+/*  test_hashing_context.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_hashing_context)
+#pragma once
 
 #include "core/crypto/hashing_context.h"
 
+#include "tests/test_macros.h"
+
 namespace TestHashingContext {
 
 TEST_CASE("[HashingContext] Default - MD5/SHA1/SHA256") {
@@ -159,5 +159,4 @@ TEST_CASE("[HashingContext] Invalid use of finish") {
 			"Calling 'finish' before 'start' should return an empty byte array.");
 	ERR_PRINT_ON;
 }
-
 } // namespace TestHashingContext
diff --git a/engine/tests/core/test_time.cpp b/engine/tests/core/test_time.h
similarity index 99%
rename from engine/tests/core/test_time.cpp
rename to engine/tests/core/test_time.h
index cfdf9542..41a6eb97 100644
--- a/engine/tests/core/test_time.cpp
+++ b/engine/tests/core/test_time.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_time.cpp                                                         */
+/*  test_time.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_time)
+#pragma once
 
 #include "core/os/time.h"
 
-namespace TestTime {
+#include "thirdparty/doctest/doctest.h"
 
 #define YEAR_KEY "year"
 #define MONTH_KEY "month"
@@ -45,6 +43,8 @@ namespace TestTime {
 #define SECOND_KEY "second"
 #define DST_KEY "dst"
 
+namespace TestTime {
+
 TEST_CASE("[Time] Unix time conversion to/from datetime string") {
 	const Time *time = Time::get_singleton();
 
diff --git a/engine/tests/core/threads/test_worker_thread_pool.cpp b/engine/tests/core/threads/test_worker_thread_pool.h
similarity index 97%
rename from engine/tests/core/threads/test_worker_thread_pool.cpp
rename to engine/tests/core/threads/test_worker_thread_pool.h
index 5b43865e..26f08d72 100644
--- a/engine/tests/core/threads/test_worker_thread_pool.cpp
+++ b/engine/tests/core/threads/test_worker_thread_pool.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_worker_thread_pool.cpp                                           */
+/*  test_worker_thread_pool.h                                             */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_worker_thread_pool)
-
-#include "core/object/callable_mp.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
+
+#include "tests/test_macros.h"
 
 namespace TestWorkerThreadPool {
 
diff --git a/engine/tests/core/variant/test_array.cpp b/engine/tests/core/variant/test_array.h
similarity index 99%
rename from engine/tests/core/variant/test_array.cpp
rename to engine/tests/core/variant/test_array.h
index fd78e8cc..62e1b396 100644
--- a/engine/tests/core/variant/test_array.cpp
+++ b/engine/tests/core/variant/test_array.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_array.cpp                                                        */
+/*  test_array.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_array)
-
-#include "core/object/callable_mp.h"
 #include "core/variant/array.h"
-#include "core/variant/typed_array.h"
+#include "tests/test_macros.h"
 #include "tests/test_tools.h"
 
 namespace TestArray {
-
 TEST_CASE("[Array] initializer list") {
 	Array arr = { 0, 1, "test", true, { 0.0, 1.0 } };
 	CHECK(arr.size() == 5);
diff --git a/engine/tests/core/variant/test_callable.cpp b/engine/tests/core/variant/test_callable.h
similarity index 98%
rename from engine/tests/core/variant/test_callable.cpp
rename to engine/tests/core/variant/test_callable.h
index 03fcbf0f..a046be3b 100644
--- a/engine/tests/core/variant/test_callable.cpp
+++ b/engine/tests/core/variant/test_callable.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_callable.cpp                                                     */
+/*  test_callable.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_callable)
-
-#include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/object.h"
 
+#include "tests/test_macros.h"
+
 namespace TestCallable {
 
 class TestClass : public Object {
diff --git a/engine/tests/core/variant/test_dictionary.cpp b/engine/tests/core/variant/test_dictionary.h
similarity index 99%
rename from engine/tests/core/variant/test_dictionary.cpp
rename to engine/tests/core/variant/test_dictionary.h
index 9b3b06f2..7f5a5995 100644
--- a/engine/tests/core/variant/test_dictionary.cpp
+++ b/engine/tests/core/variant/test_dictionary.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_dictionary.cpp                                                   */
+/*  test_dictionary.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "core/variant/typed_dictionary.h"
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_dictionary)
-
-#include "core/object/ref_counted.h"
-#include "core/variant/typed_dictionary.h"
-
 namespace TestDictionary {
-
 TEST_CASE("[Dictionary] Assignment using bracket notation ([])") {
 	Dictionary map;
 	map["Hello"] = 0;
diff --git a/engine/tests/core/variant/test_variant.cpp b/engine/tests/core/variant/test_variant.h
similarity index 99%
rename from engine/tests/core/variant/test_variant.cpp
rename to engine/tests/core/variant/test_variant.h
index a442735c..aa1331b8 100644
--- a/engine/tests/core/variant/test_variant.cpp
+++ b/engine/tests/core/variant/test_variant.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_variant.cpp                                                      */
+/*  test_variant.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_variant)
+#pragma once
 
 #include "core/variant/variant.h"
 #include "core/variant/variant_parser.h"
 
-namespace TestVariant {
+#include "tests/test_macros.h"
 
+namespace TestVariant {
 TEST_CASE("[Variant] Writer and parser integer") {
 	int64_t a32 = 2147483648; // 2^31, so out of bounds for 32-bit signed int [-2^31, +2^31-1].
 	String a32_str;
diff --git a/engine/tests/core/variant/test_variant_utility.cpp b/engine/tests/core/variant/test_variant_utility.h
similarity index 98%
rename from engine/tests/core/variant/test_variant_utility.cpp
rename to engine/tests/core/variant/test_variant_utility.h
index 4a48cd55..c184b659 100644
--- a/engine/tests/core/variant/test_variant_utility.cpp
+++ b/engine/tests/core/variant/test_variant_utility.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_variant_utility.cpp                                              */
+/*  test_variant_utility.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_variant_utility)
+#pragma once
 
 #include "core/variant/variant_utility.h"
 
+#include "tests/test_macros.h"
+
 namespace TestVariantUtility {
 
 TEST_CASE("[VariantUtility] Type conversion") {
diff --git a/engine/tests/display_server_mock.cpp b/engine/tests/display_server_mock.cpp
deleted file mode 100644
index 97d8fe7e..00000000
--- a/engine/tests/display_server_mock.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/**************************************************************************/
-/*  display_server_mock.cpp                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "display_server_mock.h"
-
-#include "core/input/input.h"
-#include "core/input/input_event.h"
-#include "servers/rendering/dummy/rasterizer_dummy.h"
-
-Vector<String> DisplayServerMock::get_rendering_drivers_func() {
-	Vector<String> drivers;
-	drivers.push_back("dummy");
-	return drivers;
-}
-
-void DisplayServerMock::_set_mouse_position(const Point2i &p_position) {
-	if (mouse_position == p_position) {
-		return;
-	}
-	mouse_position = p_position;
-	_set_window_over(Rect2i(Point2i(0, 0), window_get_size()).has_point(p_position));
-}
-void DisplayServerMock::_set_window_over(bool p_over) {
-	if (p_over == window_over) {
-		return;
-	}
-	window_over = p_over;
-	_send_window_event(p_over ? DisplayServerEnums::WINDOW_EVENT_MOUSE_ENTER : DisplayServerEnums::WINDOW_EVENT_MOUSE_EXIT);
-}
-void DisplayServerMock::_send_window_event(DisplayServerEnums::WindowEvent p_event) {
-	if (event_callback.is_valid()) {
-		Variant event = int(p_event);
-		event_callback.call(event);
-	}
-}
-
-bool DisplayServerMock::has_feature(DisplayServerEnums::Feature p_feature) const {
-	switch (p_feature) {
-		case DisplayServerEnums::FEATURE_MOUSE:
-		case DisplayServerEnums::FEATURE_CURSOR_SHAPE:
-		case DisplayServerEnums::FEATURE_CLIPBOARD:
-		case DisplayServerEnums::FEATURE_CLIPBOARD_PRIMARY:
-			return true;
-		default: {
-		}
-	}
-	return false;
-}
-
-DisplayServer *DisplayServerMock::create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error) {
-	r_error = OK;
-	RasterizerDummy::make_current();
-	return memnew(DisplayServerMock());
-}
-
-void DisplayServerMock::simulate_event(Ref<InputEvent> p_event) {
-	Ref<InputEvent> event = p_event;
-	Ref<InputEventMouse> me = p_event;
-	if (me.is_valid()) {
-		Ref<InputEventMouseMotion> mm = p_event;
-		if (mm.is_valid()) {
-			mm->set_relative(mm->get_position() - mouse_position);
-			event = mm;
-		}
-		_set_mouse_position(me->get_position());
-	}
-	Input::get_singleton()->parse_input_event(event);
-}
diff --git a/engine/tests/display_server_mock.h b/engine/tests/display_server_mock.h
index 1026ce39..631f4f57 100644
--- a/engine/tests/display_server_mock.h
+++ b/engine/tests/display_server_mock.h
@@ -32,6 +32,8 @@
 
 #include "servers/display/display_server_headless.h"
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 // Specialized DisplayServer for unittests based on DisplayServerHeadless, that
 // additionally supports things like mouse enter/exit events and clipboard.
 class DisplayServerMock : public DisplayServerHeadless {
@@ -41,22 +43,61 @@ private:
 	friend class DisplayServer;
 
 	Point2i mouse_position = Point2i(-1, -1); // Outside of Window.
-	DisplayServerEnums::CursorShape cursor_shape = DisplayServerEnums::CursorShape::CURSOR_ARROW;
+	CursorShape cursor_shape = CursorShape::CURSOR_ARROW;
 	bool window_over = false;
 	Callable event_callback;
 
 	String clipboard_text;
 	String primary_clipboard_text;
 
-	static Vector<String> get_rendering_drivers_func();
-	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServerEnums::WindowMode p_mode, DisplayServerEnums::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, DisplayServerEnums::Context p_context, int64_t p_parent_window, Error &r_error);
+	static Vector<String> get_rendering_drivers_func() {
+		Vector<String> drivers;
+		drivers.push_back("dummy");
+		return drivers;
+	}
 
-	void _set_mouse_position(const Point2i &p_position);
-	void _set_window_over(bool p_over);
-	void _send_window_event(DisplayServerEnums::WindowEvent p_event);
+	static DisplayServer *create_func(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
+		r_error = OK;
+		RasterizerDummy::make_current();
+		return memnew(DisplayServerMock());
+	}
+
+	void _set_mouse_position(const Point2i &p_position) {
+		if (mouse_position == p_position) {
+			return;
+		}
+		mouse_position = p_position;
+		_set_window_over(Rect2i(Point2i(0, 0), window_get_size()).has_point(p_position));
+	}
+
+	void _set_window_over(bool p_over) {
+		if (p_over == window_over) {
+			return;
+		}
+		window_over = p_over;
+		_send_window_event(p_over ? WINDOW_EVENT_MOUSE_ENTER : WINDOW_EVENT_MOUSE_EXIT);
+	}
+
+	void _send_window_event(WindowEvent p_event) {
+		if (event_callback.is_valid()) {
+			Variant event = int(p_event);
+			event_callback.call(event);
+		}
+	}
 
 public:
-	bool has_feature(DisplayServerEnums::Feature p_feature) const override;
+	bool has_feature(Feature p_feature) const override {
+		switch (p_feature) {
+			case FEATURE_MOUSE:
+			case FEATURE_CURSOR_SHAPE:
+			case FEATURE_CLIPBOARD:
+			case FEATURE_CLIPBOARD_PRIMARY:
+				return true;
+			default: {
+			}
+		}
+		return false;
+	}
 
 	String get_name() const override { return "mock"; }
 
@@ -64,10 +105,22 @@ public:
 	// The events will be delivered to Godot's Input-system.
 	// Mouse-events (Button & Motion) will additionally update the DisplayServer's mouse position.
 	// For Mouse motion events, the `relative`-property is set based on the distance to the previous mouse position.
-	void simulate_event(Ref<InputEvent> p_event);
+	void simulate_event(Ref<InputEvent> p_event) {
+		Ref<InputEvent> event = p_event;
+		Ref<InputEventMouse> me = p_event;
+		if (me.is_valid()) {
+			Ref<InputEventMouseMotion> mm = p_event;
+			if (mm.is_valid()) {
+				mm->set_relative(mm->get_position() - mouse_position);
+				event = mm;
+			}
+			_set_mouse_position(me->get_position());
+		}
+		Input::get_singleton()->parse_input_event(event);
+	}
 
 	// Returns the current cursor shape.
-	DisplayServerEnums::CursorShape get_cursor_shape() {
+	CursorShape get_cursor_shape() {
 		return cursor_shape;
 	}
 
@@ -78,15 +131,15 @@ public:
 	virtual void clipboard_set_primary(const String &p_text) override { primary_clipboard_text = p_text; }
 	virtual String clipboard_get_primary() const override { return primary_clipboard_text; }
 
-	virtual Size2i window_get_size(DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) const override {
+	virtual Size2i window_get_size(WindowID p_window = MAIN_WINDOW_ID) const override {
 		return Size2i(1920, 1080);
 	}
 
-	virtual void cursor_set_shape(DisplayServerEnums::CursorShape p_shape) override {
+	virtual void cursor_set_shape(CursorShape p_shape) override {
 		cursor_shape = p_shape;
 	}
 
-	virtual void window_set_window_event_callback(const Callable &p_callable, DisplayServerEnums::WindowID p_window = DisplayServerEnums::MAIN_WINDOW_ID) override {
+	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override {
 		event_callback = p_callable;
 	}
 
@@ -94,109 +147,3 @@ public:
 		register_create_function("mock", create_func, get_rendering_drivers_func);
 	}
 };
-
-// Utility macros to send an event actions to a given object
-// Requires Message Queue and InputMap to be setup.
-// SEND_GUI_ACTION    - takes an input map key. e.g SEND_GUI_ACTION("ui_text_newline").
-// SEND_GUI_KEY_EVENT - takes a keycode set.   e.g SEND_GUI_KEY_EVENT(Key::A | KeyModifierMask::META).
-// SEND_GUI_KEY_UP_EVENT - takes a keycode set.   e.g SEND_GUI_KEY_UP_EVENT(Key::A | KeyModifierMask::META).
-// SEND_GUI_MOUSE_BUTTON_EVENT - takes a position, mouse button, mouse mask and modifiers e.g SEND_GUI_MOUSE_BUTTON_EVENT(Vector2(50, 50), MOUSE_BUTTON_NONE, MOUSE_BUTTON_NONE, Key::None);
-// SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT - takes a position, mouse button, mouse mask and modifiers e.g SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(Vector2(50, 50), MOUSE_BUTTON_NONE, MOUSE_BUTTON_NONE, Key::None);
-// SEND_GUI_MOUSE_MOTION_EVENT - takes a position, mouse mask and modifiers e.g SEND_GUI_MOUSE_MOTION_EVENT(Vector2(50, 50), MouseButtonMask::LEFT, KeyModifierMask::META);
-// SEND_GUI_DOUBLE_CLICK - takes a position and modifiers. e.g SEND_GUI_DOUBLE_CLICK(Vector2(50, 50), KeyModifierMask::META);
-
-#define _SEND_DISPLAYSERVER_EVENT(m_event) ((DisplayServerMock *)(DisplayServer::get_singleton()))->simulate_event(m_event);
-
-#define SEND_GUI_ACTION(m_action) \
-	{ \
-		const List<Ref<InputEvent>> *events = InputMap::get_singleton()->action_get_events(m_action); \
-		const List<Ref<InputEvent>>::Element *first_event = events->front(); \
-		Ref<InputEventKey> event = first_event->get()->duplicate(); \
-		event->set_pressed(true); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-#define SEND_GUI_KEY_EVENT(m_input) \
-	{ \
-		Ref<InputEventKey> event = InputEventKey::create_reference(m_input); \
-		event->set_pressed(true); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-#define SEND_GUI_KEY_UP_EVENT(m_input) \
-	{ \
-		Ref<InputEventKey> event = InputEventKey::create_reference(m_input); \
-		event->set_pressed(false); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-#define _UPDATE_EVENT_MODIFIERS(m_event, m_modifiers) \
-	m_event->set_shift_pressed(((m_modifiers) & KeyModifierMask::SHIFT) != Key::NONE); \
-	m_event->set_alt_pressed(((m_modifiers) & KeyModifierMask::ALT) != Key::NONE); \
-	m_event->set_ctrl_pressed(((m_modifiers) & KeyModifierMask::CTRL) != Key::NONE); \
-	m_event->set_meta_pressed(((m_modifiers) & KeyModifierMask::META) != Key::NONE);
-
-#define _CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
-	Ref<InputEventMouseButton> event; \
-	event.instantiate(); \
-	event->set_position(m_screen_pos); \
-	event->set_button_index(m_input); \
-	event->set_button_mask(m_mask); \
-	event->set_factor(1); \
-	_UPDATE_EVENT_MODIFIERS(event, m_modifiers); \
-	event->set_pressed(true);
-
-#define _CREATE_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double) \
-	Ref<InputEventScreenTouch> event; \
-	event.instantiate(); \
-	event->set_position(m_screen_pos); \
-	event->set_pressed(m_pressed); \
-	event->set_double_tap(m_double);
-
-#define SEND_GUI_MOUSE_BUTTON_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
-	{ \
-		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-#define SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
-	{ \
-		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers); \
-		event->set_pressed(false); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-#define SEND_GUI_DOUBLE_CLICK(m_screen_pos, m_modifiers) \
-	{ \
-		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, MouseButton::LEFT, MouseButtonMask::NONE, m_modifiers); \
-		event->set_double_click(true); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
-
-// We toggle _print_error_enabled to prevent display server not supported warnings.
-#define SEND_GUI_MOUSE_MOTION_EVENT(m_screen_pos, m_mask, m_modifiers) \
-	{ \
-		bool errors_enabled = CoreGlobals::print_error_enabled; \
-		CoreGlobals::print_error_enabled = false; \
-		Ref<InputEventMouseMotion> event; \
-		event.instantiate(); \
-		event->set_position(m_screen_pos); \
-		event->set_button_mask(m_mask); \
-		_UPDATE_EVENT_MODIFIERS(event, m_modifiers); \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-		CoreGlobals::print_error_enabled = errors_enabled; \
-	}
-
-#define SEND_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double) \
-	{ \
-		_CREATE_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double) \
-		_SEND_DISPLAYSERVER_EVENT(event); \
-		MessageQueue::get_singleton()->flush(); \
-	}
diff --git a/engine/tests/scene/test_animation.cpp b/engine/tests/scene/test_animation.h
similarity index 99%
rename from engine/tests/scene/test_animation.cpp
rename to engine/tests/scene/test_animation.h
index 78a9fe52..1fae6edb 100644
--- a/engine/tests/scene/test_animation.cpp
+++ b/engine/tests/scene/test_animation.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_animation.cpp                                                    */
+/*  test_animation.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_animation)
+#pragma once
 
 #include "scene/resources/animation.h"
 
+#include "tests/test_macros.h"
+
 namespace TestAnimation {
 
 TEST_CASE("[Animation] Empty animation getters") {
diff --git a/engine/tests/scene/test_animation_blend_tree.cpp b/engine/tests/scene/test_animation_blend_tree.h
similarity index 88%
rename from engine/tests/scene/test_animation_blend_tree.cpp
rename to engine/tests/scene/test_animation_blend_tree.h
index 2266aef1..3d0727d6 100644
--- a/engine/tests/scene/test_animation_blend_tree.cpp
+++ b/engine/tests/scene/test_animation_blend_tree.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_animation_blend_tree.cpp                                         */
+/*  test_animation_blend_tree.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_animation_blend_tree)
+#pragma once
 
 #include "scene/animation/animation_blend_tree.h"
 
-namespace TestAnimationBlendTree {
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
 
+namespace TestAnimationBlendTree {
 TEST_CASE("[SceneTree][AnimationBlendTree] Create AnimationBlendTree and add AnimationNode") {
 	Ref<AnimationNodeBlendTree> blend_tree;
 	blend_tree.instantiate();
@@ -61,9 +61,9 @@ TEST_CASE("[SceneTree][AnimationBlendTree] Create AnimationBlendTree and add Ani
 	CHECK_EQ(blend_tree->can_connect_node("output", 0, "test_node"), AnimationNodeBlendTree::CONNECTION_OK);
 	blend_tree->connect_node("output", 0, "test_node");
 
-	const LocalVector<StringName> *connections = blend_tree->get_node_connection_array("output");
-	CHECK_EQ(connections->size(), 1);
-	CHECK_EQ(connections->operator[](0), StringName("test_node"));
+	Vector<StringName> connections = blend_tree->get_node_connection_array("output");
+	CHECK_EQ(connections.size(), 1);
+	CHECK_EQ(connections[0], StringName("test_node"));
 
 	// Test node rename.
 	blend_tree->rename_node("test_node", "renamed_node");
@@ -71,14 +71,14 @@ TEST_CASE("[SceneTree][AnimationBlendTree] Create AnimationBlendTree and add Ani
 	CHECK(blend_tree->has_node("renamed_node"));
 
 	connections = blend_tree->get_node_connection_array("output");
-	CHECK_EQ(connections->operator[](0), StringName("renamed_node"));
+	CHECK_EQ(connections[0], StringName("renamed_node"));
 
 	// Test node removal.
 	blend_tree->remove_node("renamed_node");
 	CHECK_FALSE(blend_tree->has_node("renamed_node"));
 
 	connections = blend_tree->get_node_connection_array("output");
-	CHECK_EQ(connections->operator[](0), StringName());
+	CHECK_EQ(connections[0], StringName());
 }
 
-} // namespace TestAnimationBlendTree
+} //namespace TestAnimationBlendTree
diff --git a/engine/tests/scene/test_animation_player.cpp b/engine/tests/scene/test_animation_player.h
similarity index 96%
rename from engine/tests/scene/test_animation_player.cpp
rename to engine/tests/scene/test_animation_player.h
index 597d72bb..f1589a20 100644
--- a/engine/tests/scene/test_animation_player.cpp
+++ b/engine/tests/scene/test_animation_player.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_animation_player.cpp                                             */
+/*  test_animation_player.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_animation_player)
+#pragma once
 
 #include "scene/animation/animation_player.h"
 #include "scene/resources/animation.h"
+#include "tests/test_macros.h"
 
 namespace TestAnimationPlayer {
 
diff --git a/engine/tests/scene/test_arraymesh.cpp b/engine/tests/scene/test_arraymesh.h
similarity index 96%
rename from engine/tests/scene/test_arraymesh.cpp
rename to engine/tests/scene/test_arraymesh.h
index a369ce13..73cd29a6 100644
--- a/engine/tests/scene/test_arraymesh.cpp
+++ b/engine/tests/scene/test_arraymesh.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_arraymesh.cpp                                                    */
+/*  test_arraymesh.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_arraymesh)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rendering_server.h"
+
+#include "tests/test_macros.h"
 
 namespace TestArrayMesh {
 
@@ -231,13 +228,13 @@ TEST_CASE("[SceneTree][ArrayMesh] Surface metadata tests.") {
 	}
 
 	SUBCASE("Get the array length of a particular surface.") {
-		CHECK(mesh->surface_get_array_len(0) == static_cast<Vector<Vector3>>(cylinder_array[RSE::ARRAY_VERTEX]).size());
-		CHECK(mesh->surface_get_array_len(1) == static_cast<Vector<Vector3>>(box_array[RSE::ARRAY_VERTEX]).size());
+		CHECK(mesh->surface_get_array_len(0) == static_cast<Vector<Vector3>>(cylinder_array[RenderingServer::ARRAY_VERTEX]).size());
+		CHECK(mesh->surface_get_array_len(1) == static_cast<Vector<Vector3>>(box_array[RenderingServer::ARRAY_VERTEX]).size());
 	}
 
 	SUBCASE("Get the index array length of a particular surface.") {
-		CHECK(mesh->surface_get_array_index_len(0) == static_cast<Vector<Vector3>>(cylinder_array[RSE::ARRAY_INDEX]).size());
-		CHECK(mesh->surface_get_array_index_len(1) == static_cast<Vector<Vector3>>(box_array[RSE::ARRAY_INDEX]).size());
+		CHECK(mesh->surface_get_array_index_len(0) == static_cast<Vector<Vector3>>(cylinder_array[RenderingServer::ARRAY_INDEX]).size());
+		CHECK(mesh->surface_get_array_index_len(1) == static_cast<Vector<Vector3>>(box_array[RenderingServer::ARRAY_INDEX]).size());
 	}
 
 	SUBCASE("Get correct primitive type") {
@@ -248,7 +245,7 @@ TEST_CASE("[SceneTree][ArrayMesh] Surface metadata tests.") {
 	}
 
 	SUBCASE("Returns correct format for the mesh") {
-		int format = RSE::ARRAY_FORMAT_BLEND_SHAPE_MASK | RSE::ARRAY_FORMAT_TEX_UV | RSE::ARRAY_FORMAT_INDEX;
+		int format = RS::ARRAY_FORMAT_BLEND_SHAPE_MASK | RS::ARRAY_FORMAT_TEX_UV | RS::ARRAY_FORMAT_INDEX;
 		CHECK((mesh->surface_get_format(0) & format) != 0);
 		CHECK((mesh->surface_get_format(1) & format) != 0);
 	}
@@ -397,7 +394,7 @@ TEST_CASE("[SceneTree][ArrayMesh] Get/Set mesh metadata and actions") {
 
 	SUBCASE("Create surface from raw SurfaceData data.") {
 		RID mesh_rid = mesh->get_rid();
-		RenderingServerTypes::SurfaceData surface_data = RS::get_singleton()->mesh_get_surface(mesh_rid, 0);
+		RS::SurfaceData surface_data = RS::get_singleton()->mesh_get_surface(mesh_rid, 0);
 		Ref<ArrayMesh> mesh2;
 		mesh2.instantiate();
 		mesh2->add_surface(surface_data.format, Mesh::PRIMITIVE_TRIANGLES, surface_data.vertex_data, surface_data.attribute_data,
@@ -447,5 +444,3 @@ TEST_CASE("[SceneTree][ArrayMesh] Get/Set mesh metadata and actions") {
 }
 
 } // namespace TestArrayMesh
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_audio_stream_wav.cpp b/engine/tests/scene/test_audio_stream_wav.h
similarity index 97%
rename from engine/tests/scene/test_audio_stream_wav.cpp
rename to engine/tests/scene/test_audio_stream_wav.h
index 287082e9..58d24f51 100644
--- a/engine/tests/scene/test_audio_stream_wav.cpp
+++ b/engine/tests/scene/test_audio_stream_wav.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_audio_stream_wav.cpp                                             */
+/*  test_audio_stream_wav.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_audio_stream_wav)
-
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "scene/resources/audio_stream_wav.h"
-#include "tests/test_utils.h"
+
+#include "tests/test_macros.h"
 
 namespace TestAudioStreamWAV {
 
diff --git a/engine/tests/scene/test_bit_map.cpp b/engine/tests/scene/test_bit_map.h
similarity index 99%
rename from engine/tests/scene/test_bit_map.cpp
rename to engine/tests/scene/test_bit_map.h
index 89ebf6d3..8c1e0195 100644
--- a/engine/tests/scene/test_bit_map.cpp
+++ b/engine/tests/scene/test_bit_map.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_bit_map.cpp                                                      */
+/*  test_bit_map.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "core/os/memory.h"
+#include "scene/resources/bit_map.h"
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_bit_map)
-
-#include "scene/resources/bit_map.h"
-
-namespace TestBitMap {
+namespace TestBitmap {
 
 void reset_bit_map(BitMap &p_bm) {
 	Size2i size = p_bm.get_size();
@@ -499,4 +499,4 @@ TEST_CASE("[BitMap] Clip to polygon") {
 	CHECK_MESSAGE(polygons[0].size() == 6, "The polygon should have exactly 6 points");
 }
 
-} // namespace TestBitMap
+} // namespace TestBitmap
diff --git a/engine/tests/scene/test_button.cpp b/engine/tests/scene/test_button.h
similarity index 94%
rename from engine/tests/scene/test_button.cpp
rename to engine/tests/scene/test_button.h
index 7960fdc8..adb466f9 100644
--- a/engine/tests/scene/test_button.cpp
+++ b/engine/tests/scene/test_button.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_button.cpp                                                       */
+/*  test_button.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_button)
+#pragma once
 
 #include "scene/gui/button.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "tests/display_server_mock.h"
+
+#include "tests/test_macros.h"
 
 namespace TestButton {
-
 TEST_CASE("[SceneTree][Button] is_hovered()") {
 	// Create new button instance.
 	Button *button = memnew(Button);
@@ -64,4 +61,4 @@ TEST_CASE("[SceneTree][Button] is_hovered()") {
 	memdelete(button);
 }
 
-} // namespace TestButton
+} //namespace TestButton
diff --git a/engine/tests/scene/test_camera_2d.cpp b/engine/tests/scene/test_camera_2d.h
similarity index 99%
rename from engine/tests/scene/test_camera_2d.cpp
rename to engine/tests/scene/test_camera_2d.h
index e0f5949f..73f1aff0 100644
--- a/engine/tests/scene/test_camera_2d.cpp
+++ b/engine/tests/scene/test_camera_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_camera_2d.cpp                                                    */
+/*  test_camera_2d.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_camera_2d)
+#pragma once
 
 #include "scene/2d/camera_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
+#include "tests/test_macros.h"
 
 namespace TestCamera2D {
 
diff --git a/engine/tests/scene/test_camera_3d.cpp b/engine/tests/scene/test_camera_3d.h
similarity index 98%
rename from engine/tests/scene/test_camera_3d.cpp
rename to engine/tests/scene/test_camera_3d.h
index 1b70bdbb..f4173a12 100644
--- a/engine/tests/scene/test_camera_3d.cpp
+++ b/engine/tests/scene/test_camera_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_camera_3d.cpp                                                    */
+/*  test_camera_3d.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_camera_3d)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/3d/camera_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
 
-namespace TestCamera3D {
+#include "tests/test_macros.h"
 
 TEST_CASE("[SceneTree][Camera3D] Getters and setters") {
 	Camera3D *test_camera = memnew(Camera3D);
@@ -371,7 +366,3 @@ TEST_CASE("[SceneTree][Camera3D] Project ray") {
 	memdelete(test_camera);
 	memdelete(mock_viewport);
 }
-
-} // namespace TestCamera3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_code_edit.cpp b/engine/tests/scene/test_code_edit.h
similarity index 99%
rename from engine/tests/scene/test_code_edit.cpp
rename to engine/tests/scene/test_code_edit.h
index ae7a8726..62c9552a 100644
--- a/engine/tests/scene/test_code_edit.cpp
+++ b/engine/tests/scene/test_code_edit.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_code_edit.cpp                                                    */
+/*  test_code_edit.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "scene/gui/code_edit.h"
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_code_edit)
-
-#ifndef ADVANCED_GUI_DISABLED
-
-#include "core/input/input_map.h"
-#include "scene/gui/code_edit.h"
-#include "scene/main/scene_tree.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
-
 namespace TestCodeEdit {
-
 TEST_CASE("[SceneTree][CodeEdit] line gutters") {
 	CodeEdit *code_edit = memnew(CodeEdit);
 	SceneTree::get_singleton()->get_root()->add_child(code_edit);
@@ -5715,5 +5708,3 @@ func _ready():
 }
 
 } // namespace TestCodeEdit
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_color_picker.cpp b/engine/tests/scene/test_color_picker.h
similarity index 93%
rename from engine/tests/scene/test_color_picker.cpp
rename to engine/tests/scene/test_color_picker.h
index 92013e8b..ba034514 100644
--- a/engine/tests/scene/test_color_picker.cpp
+++ b/engine/tests/scene/test_color_picker.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_color_picker.cpp                                                 */
+/*  test_color_picker.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_color_picker)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/color_picker.h"
-#include "scene/main/scene_tree.h"
-#include "tests/display_server_mock.h"
+
+#include "tests/test_macros.h"
 
 namespace TestColorPicker {
 
@@ -60,5 +56,3 @@ TEST_CASE("[SceneTree][ColorPicker]") {
 }
 
 } // namespace TestColorPicker
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_control.cpp b/engine/tests/scene/test_control.h
similarity index 99%
rename from engine/tests/scene/test_control.cpp
rename to engine/tests/scene/test_control.h
index da69adb7..e42c9c3a 100644
--- a/engine/tests/scene/test_control.cpp
+++ b/engine/tests/scene/test_control.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_control.cpp                                                      */
+/*  test_control.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_control)
-
-#include "core/input/input_map.h" // IWYU pragma: keep // Used by `SEND_GUI_ACTION` macro.
 #include "scene/2d/node_2d.h"
 #include "scene/gui/control.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
+
+#include "tests/test_macros.h"
 
 namespace TestControl {
 
diff --git a/engine/tests/scene/test_convert_transform_modifier_3d.cpp b/engine/tests/scene/test_convert_transform_modifier_3d.h
similarity index 97%
rename from engine/tests/scene/test_convert_transform_modifier_3d.cpp
rename to engine/tests/scene/test_convert_transform_modifier_3d.h
index c3d79193..302b428d 100644
--- a/engine/tests/scene/test_convert_transform_modifier_3d.cpp
+++ b/engine/tests/scene/test_convert_transform_modifier_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_convert_transform_modifier_3d.cpp                                */
+/*  test_convert_transform_modifier_3d.h                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_convert_transform_modifier_3d)
-
-#ifndef _3D_DISABLED
-
-#include "core/math/random_number_generator.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/convert_transform_modifier_3d.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 
 namespace TestConvertTransformModifier3D {
 
@@ -260,7 +255,4 @@ TEST_CASE("[SceneTree][ConvertTransformModifier3D]") {
 	memdelete(mod);
 	memdelete(skeleton);
 }
-
 } // namespace TestConvertTransformModifier3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_copy_transform_modifier_3d.cpp b/engine/tests/scene/test_copy_transform_modifier_3d.h
similarity index 99%
rename from engine/tests/scene/test_copy_transform_modifier_3d.cpp
rename to engine/tests/scene/test_copy_transform_modifier_3d.h
index 366265b4..093cefa4 100644
--- a/engine/tests/scene/test_copy_transform_modifier_3d.cpp
+++ b/engine/tests/scene/test_copy_transform_modifier_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_copy_transform_modifier_3d.cpp                                   */
+/*  test_copy_transform_modifier_3d.h                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_copy_transform_modifier_3d)
-
-#ifndef _3D_DISABLED
-
-#include "core/math/random_number_generator.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/copy_transform_modifier_3d.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 
 namespace TestCopyTransformModifier3D {
 
@@ -531,7 +526,4 @@ TEST_CASE("[SceneTree][CopyTransformModifier3D]") {
 	memdelete(mod);
 	memdelete(skeleton);
 }
-
 } // namespace TestCopyTransformModifier3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_curve.cpp b/engine/tests/scene/test_curve.h
similarity index 99%
rename from engine/tests/scene/test_curve.cpp
rename to engine/tests/scene/test_curve.h
index 48f24e22..8f2aacc8 100644
--- a/engine/tests/scene/test_curve.cpp
+++ b/engine/tests/scene/test_curve.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_curve.cpp                                                        */
+/*  test_curve.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_curve)
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
 
+#include "tests/test_macros.h"
+
 namespace TestCurve {
 
 TEST_CASE("[Curve] Default curve") {
diff --git a/engine/tests/scene/test_curve_2d.cpp b/engine/tests/scene/test_curve_2d.h
similarity index 99%
rename from engine/tests/scene/test_curve_2d.cpp
rename to engine/tests/scene/test_curve_2d.h
index 3c1f546d..9b070bb7 100644
--- a/engine/tests/scene/test_curve_2d.cpp
+++ b/engine/tests/scene/test_curve_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_curve_2d.cpp                                                     */
+/*  test_curve_2d.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_curve_2d)
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
 
+#include "tests/test_macros.h"
+
 namespace TestCurve2D {
 
 void add_sample_curve_points(Ref<Curve2D> &curve) {
diff --git a/engine/tests/scene/test_curve_3d.cpp b/engine/tests/scene/test_curve_3d.h
similarity index 99%
rename from engine/tests/scene/test_curve_3d.cpp
rename to engine/tests/scene/test_curve_3d.h
index 25d49917..97221219 100644
--- a/engine/tests/scene/test_curve_3d.cpp
+++ b/engine/tests/scene/test_curve_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_curve_3d.cpp                                                     */
+/*  test_curve_3d.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_curve_3d)
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
 
+#include "tests/test_macros.h"
+
 namespace TestCurve3D {
 
 void add_sample_curve_points(Ref<Curve3D> &curve) {
diff --git a/engine/tests/scene/test_decal.cpp b/engine/tests/scene/test_decal.h
similarity index 97%
rename from engine/tests/scene/test_decal.cpp
rename to engine/tests/scene/test_decal.h
index 7dc52971..951b9b15 100644
--- a/engine/tests/scene/test_decal.cpp
+++ b/engine/tests/scene/test_decal.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_decal.cpp                                                        */
+/*  test_decal.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_decal)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/3d/decal.h"
 
-namespace TestDecal {
+#include "tests/test_macros.h"
 
+namespace TestDecal {
 TEST_CASE("[SceneTree][Decal] Getters/Setters") {
 	Decal *decal = memnew(Decal);
 	AABB default_aabb{
@@ -133,6 +130,4 @@ TEST_CASE("[SceneTree][Decal] Getters/Setters") {
 	memdelete(decal);
 }
 
-} // namespace TestDecal
-
-#endif // _3D_DISABLED
+} //namespace TestDecal
diff --git a/engine/tests/scene/test_fontfile.cpp b/engine/tests/scene/test_fontfile.h
similarity index 87%
rename from engine/tests/scene/test_fontfile.cpp
rename to engine/tests/scene/test_fontfile.h
index 7bd7b34a..c9e57e8e 100644
--- a/engine/tests/scene/test_fontfile.cpp
+++ b/engine/tests/scene/test_fontfile.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_fontfile.cpp                                                     */
+/*  test_fontfile.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_fontfile)
+#include "modules/modules_enabled.gen.h"
 
 #include "scene/resources/font.h"
+#include "tests/test_macros.h"
 
-#include "modules/modules_enabled.gen.h" // For freetype.
-
-namespace TestFontFile {
+namespace TestFontfile {
 
 TEST_CASE("[FontFile] Load Dynamic Font - getters") {
 #ifdef MODULE_FREETYPE_ENABLED
@@ -54,21 +53,21 @@ TEST_CASE("[FontFile] Load Dynamic Font - getters") {
 
 	Dictionary expected_ot_name_strings;
 	Dictionary en_dict;
-	en_dict["copyright"] = "Copyright 2024 The Noto Project Authors (https://github.com/notofonts/hebrew)";
+	en_dict["copyright"] = "Copyright 2022 The Noto Project Authors (https://github.com/notofonts/hebrew)";
 	en_dict["family_name"] = "Noto Sans Hebrew";
 	en_dict["subfamily_name"] = "Regular";
-	en_dict["unique_identifier"] = "3.001;GOOG;NotoSansHebrew-Regular";
 	en_dict["full_name"] = "Noto Sans Hebrew Regular";
-	en_dict["version"] = "Version 3.001";
+	en_dict["unique_identifier"] = "2.003;GOOG;NotoSansHebrew-Regular";
+	en_dict["version"] = "Version 2.003";
 	en_dict["postscript_name"] = "NotoSansHebrew-Regular";
 	en_dict["trademark"] = "Noto is a trademark of Google Inc.";
-	en_dict["manufacturer"] = "Google LLC";
-	en_dict["designer"] = "Ben Nathan";
-	en_dict["description"] = "Designed by Ben Nathan";
+	en_dict["license"] = "This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: https://scripts.sil.org/OFL";
+	en_dict["license_url"] = "https://scripts.sil.org/OFL";
+	en_dict["designer"] = "Monotype Design Team";
+	en_dict["designer_url"] = "http://www.monotype.com/studio";
+	en_dict["description"] = "Designed by Monotype design team.";
+	en_dict["manufacturer"] = "Monotype Imaging Inc.";
 	en_dict["vendor_url"] = "http://www.google.com/get/noto/";
-	en_dict["designer_url"] = "https://hafontia.com/";
-	en_dict["license"] = "This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the SIL Open Font License for the specific language, permissions and limitations governing your use of this Font Software.";
-	en_dict["license_url"] = "http://scripts.sil.org/OFL";
 	expected_ot_name_strings["en"] = en_dict;
 	CHECK(ff->get_ot_name_strings() == expected_ot_name_strings);
 
@@ -125,4 +124,4 @@ TEST_CASE("[FontFile] Create font file and check data") {
 #endif
 }
 
-} // namespace TestFontFile
+} // namespace TestFontfile
diff --git a/engine/tests/scene/test_gltf_document.cpp b/engine/tests/scene/test_gltf_document.h
similarity index 96%
rename from engine/tests/scene/test_gltf_document.cpp
rename to engine/tests/scene/test_gltf_document.h
index 237a9bd6..dfaf0759 100644
--- a/engine/tests/scene/test_gltf_document.cpp
+++ b/engine/tests/scene/test_gltf_document.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_gltf_document.cpp                                                */
+/*  test_gltf_document.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_gltf_document)
-
-#ifndef _3D_DISABLED
-
-#include "modules/modules_enabled.gen.h" // For gltf.
-
-#ifdef MODULE_GLTF_ENABLED
-
-#include "tests/test_utils.h"
+#pragma once
 
 #include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "modules/gltf/gltf_document.h"
 
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
+
 namespace TestGLTFDocument {
 
 struct GLTFArraySize {
@@ -252,7 +245,3 @@ TEST_CASE("[SceneTree][GLTFDocument] Load suzanne.glb") {
 }
 
 } // namespace TestGLTFDocument
-
-#endif // MODULE_GLTF_ENABLED
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_gradient.cpp b/engine/tests/scene/test_gradient.h
similarity index 98%
rename from engine/tests/scene/test_gradient.cpp
rename to engine/tests/scene/test_gradient.h
index 8f721dc8..e8a69792 100644
--- a/engine/tests/scene/test_gradient.cpp
+++ b/engine/tests/scene/test_gradient.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_gradient.cpp                                                     */
+/*  test_gradient.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_gradient)
+#pragma once
 
 #include "scene/resources/gradient.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestGradient {
 
 TEST_CASE("[Gradient] Default gradient") {
@@ -141,5 +141,4 @@ TEST_CASE("[Gradient] Custom gradient (points specified out-of-order)") {
 			gradient->get_color_at_offset(0.1).is_equal_approx(Color(1, 0, 0)),
 			"Custom out-of-order gradient should return the expected interpolated value at offset 0.1 after removing point at index 0.");
 }
-
 } // namespace TestGradient
diff --git a/engine/tests/scene/test_gradient_texture.cpp b/engine/tests/scene/test_gradient_texture.h
similarity index 96%
rename from engine/tests/scene/test_gradient_texture.cpp
rename to engine/tests/scene/test_gradient_texture.h
index 029cfebf..c6e52466 100644
--- a/engine/tests/scene/test_gradient_texture.cpp
+++ b/engine/tests/scene/test_gradient_texture.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_gradient_texture.cpp                                             */
+/*  test_gradient_texture.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_gradient_texture)
+#pragma once
 
 #include "scene/resources/gradient_texture.h"
 
+#include "tests/test_macros.h"
+
 namespace TestGradientTexture {
 
 // [SceneTree] in a test case name enables initializing a mock render server,
@@ -81,4 +81,4 @@ TEST_CASE("[SceneTree][GradientTexture2D] Create GradientTexture2D") {
 	CHECK(gradient_texture->get_repeat() == GradientTexture2D::Repeat::REPEAT);
 }
 
-} // namespace TestGradientTexture
+} //namespace TestGradientTexture
diff --git a/engine/tests/scene/test_graph_node.cpp b/engine/tests/scene/test_graph_node.h
similarity index 94%
rename from engine/tests/scene/test_graph_node.cpp
rename to engine/tests/scene/test_graph_node.h
index ff75af4d..ca507bb2 100644
--- a/engine/tests/scene/test_graph_node.cpp
+++ b/engine/tests/scene/test_graph_node.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_graph_node.cpp                                                   */
+/*  test_graph_node.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_graph_node)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/graph_node.h"
+#include "scene/main/window.h"
+
+#include "tests/test_macros.h"
 
 namespace TestGraphNode {
 
@@ -57,5 +56,3 @@ TEST_CASE("[GraphNode][SceneTree]") {
 }
 
 } // namespace TestGraphNode
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_height_map_shape_3d.cpp b/engine/tests/scene/test_height_map_shape_3d.h
similarity index 96%
rename from engine/tests/scene/test_height_map_shape_3d.cpp
rename to engine/tests/scene/test_height_map_shape_3d.h
index 0e7d0c61..92a63789 100644
--- a/engine/tests/scene/test_height_map_shape_3d.cpp
+++ b/engine/tests/scene/test_height_map_shape_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_height_map_shape_3d.cpp                                          */
+/*  test_height_map_shape_3d.h                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_height_map_shape_3d)
-
-#ifndef PHYSICS_3D_DISABLED
-
-#include "core/io/image.h"
 #include "scene/resources/3d/height_map_shape_3d.h"
+#include "scene/resources/image_texture.h"
+
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
 
 namespace TestHeightMapShape3D {
 
@@ -118,5 +117,3 @@ TEST_CASE("[SceneTree][HeightMapShape3D] update_map_data_from_image") {
 }
 
 } // namespace TestHeightMapShape3D
-
-#endif // PHYSICS_3D_DISABLED
diff --git a/engine/tests/scene/test_image_texture.cpp b/engine/tests/scene/test_image_texture.h
similarity index 97%
rename from engine/tests/scene/test_image_texture.cpp
rename to engine/tests/scene/test_image_texture.h
index 1ee7b59d..c1c53b89 100644
--- a/engine/tests/scene/test_image_texture.cpp
+++ b/engine/tests/scene/test_image_texture.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_image_texture.cpp                                                */
+/*  test_image_texture.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_image_texture)
+#pragma once
 
 #include "core/io/image.h"
 #include "scene/resources/image_texture.h"
+
+#include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
 namespace TestImageTexture {
@@ -105,4 +105,4 @@ TEST_CASE("[SceneTree][ImageTexture] set_path") {
 	CHECK(image_texture->get_path() == path);
 }
 
-} // namespace TestImageTexture
+} //namespace TestImageTexture
diff --git a/engine/tests/scene/test_image_texture_3d.cpp b/engine/tests/scene/test_image_texture_3d.h
similarity index 97%
rename from engine/tests/scene/test_image_texture_3d.cpp
rename to engine/tests/scene/test_image_texture_3d.h
index b80e8823..2ec77dee 100644
--- a/engine/tests/scene/test_image_texture_3d.cpp
+++ b/engine/tests/scene/test_image_texture_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_image_texture_3d.cpp                                             */
+/*  test_image_texture_3d.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_image_texture_3d)
+#pragma once
 
 #include "core/io/image.h"
 #include "scene/resources/image_texture.h"
+
+#include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
 namespace TestImageTexture3D {
@@ -95,4 +95,4 @@ TEST_CASE("[SceneTree][ImageTexture3D] set_path") {
 	CHECK(image_texture_3d->get_path() == path);
 }
 
-} // namespace TestImageTexture3D
+} //namespace TestImageTexture3D
diff --git a/engine/tests/scene/test_instance_placeholder.cpp b/engine/tests/scene/test_instance_placeholder.h
similarity index 98%
rename from engine/tests/scene/test_instance_placeholder.cpp
rename to engine/tests/scene/test_instance_placeholder.h
index 9ac9c77f..2c06093b 100644
--- a/engine/tests/scene/test_instance_placeholder.cpp
+++ b/engine/tests/scene/test_instance_placeholder.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_instance_placeholder.cpp                                         */
+/*  test_instance_placeholder.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_instance_placeholder)
-
-#include "core/io/dir_access.h"
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
-#include "core/object/class_db.h"
 #include "scene/main/instance_placeholder.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
-#include "tests/test_utils.h"
 
-namespace TestInstancePlaceholder {
+#include "tests/test_macros.h"
 
 class _TestInstancePlaceholderNode : public Node {
 	GDCLASS(_TestInstancePlaceholderNode, Node);
@@ -102,6 +93,8 @@ public:
 	}
 };
 
+namespace TestInstancePlaceholder {
+
 TEST_CASE("[SceneTree][InstancePlaceholder] Instantiate from placeholder with no overrides") {
 	GDREGISTER_CLASS(_TestInstancePlaceholderNode);
 
@@ -534,7 +527,6 @@ TEST_CASE("[SceneTree][InstancePlaceholder] Instance a PackedScene containing an
 	DirAccess::remove_file_or_error(internal_path);
 	DirAccess::remove_file_or_error(main_path);
 }
-
 #endif // TOOLS_ENABLED
 
-} // namespace TestInstancePlaceholder
+} //namespace TestInstancePlaceholder
diff --git a/engine/tests/scene/test_navigation_agent_2d.cpp b/engine/tests/scene/test_navigation_agent_2d.h
similarity index 91%
rename from engine/tests/scene/test_navigation_agent_2d.cpp
rename to engine/tests/scene/test_navigation_agent_2d.h
index db02dae4..929e8127 100644
--- a/engine/tests/scene/test_navigation_agent_2d.cpp
+++ b/engine/tests/scene/test_navigation_agent_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_agent_2d.cpp                                          */
+/*  test_navigation_agent_2d.h                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_agent_2d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 2D.
-
-#ifdef MODULE_NAVIGATION_2D_ENABLED
+#pragma once
 
 #include "scene/2d/navigation/navigation_agent_2d.h"
 #include "scene/2d/node_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/world_2d.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNavigationAgent2D {
 
 TEST_SUITE("[Navigation2D]") {
@@ -71,6 +66,4 @@ TEST_SUITE("[Navigation2D]") {
 	}
 }
 
-} // namespace TestNavigationAgent2D
-
-#endif // MODULE_NAVIGATION_2D_ENABLED
+} //namespace TestNavigationAgent2D
diff --git a/engine/tests/scene/test_navigation_agent_3d.cpp b/engine/tests/scene/test_navigation_agent_3d.h
similarity index 91%
rename from engine/tests/scene/test_navigation_agent_3d.cpp
rename to engine/tests/scene/test_navigation_agent_3d.h
index da0e6902..649bf612 100644
--- a/engine/tests/scene/test_navigation_agent_3d.cpp
+++ b/engine/tests/scene/test_navigation_agent_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_agent_3d.cpp                                          */
+/*  test_navigation_agent_3d.h                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,19 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_agent_3d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 3D.
-
-#ifdef MODULE_NAVIGATION_3D_ENABLED
+#pragma once
 
 #include "scene/3d/navigation/navigation_agent_3d.h"
 #include "scene/3d/node_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNavigationAgent3D {
 
 TEST_SUITE("[Navigation3D]") {
@@ -70,6 +65,4 @@ TEST_SUITE("[Navigation3D]") {
 	}
 }
 
-} // namespace TestNavigationAgent3D
-
-#endif // MODULE_NAVIGATION_3D_ENABLED
+} //namespace TestNavigationAgent3D
diff --git a/engine/tests/scene/test_navigation_obstacle_2d.cpp b/engine/tests/scene/test_navigation_obstacle_2d.h
similarity index 90%
rename from engine/tests/scene/test_navigation_obstacle_2d.cpp
rename to engine/tests/scene/test_navigation_obstacle_2d.h
index c9288c19..8c17a696 100644
--- a/engine/tests/scene/test_navigation_obstacle_2d.cpp
+++ b/engine/tests/scene/test_navigation_obstacle_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_obstacle_2d.cpp                                       */
+/*  test_navigation_obstacle_2d.h                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_obstacle_2d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 2D.
-
-#ifdef MODULE_NAVIGATION_2D_ENABLED
+#pragma once
 
 #include "scene/2d/navigation/navigation_obstacle_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "scene/resources/world_2d.h"
+
+#include "tests/test_macros.h"
 
 namespace TestNavigationObstacle2D {
 
@@ -69,6 +63,4 @@ TEST_SUITE("[Navigation2D]") {
 	}
 }
 
-} // namespace TestNavigationObstacle2D
-
-#endif // MODULE_NAVIGATION_2D_ENABLED
+} //namespace TestNavigationObstacle2D
diff --git a/engine/tests/scene/test_navigation_obstacle_3d.cpp b/engine/tests/scene/test_navigation_obstacle_3d.h
similarity index 91%
rename from engine/tests/scene/test_navigation_obstacle_3d.cpp
rename to engine/tests/scene/test_navigation_obstacle_3d.h
index 4b7b2aaf..c2d9c1ce 100644
--- a/engine/tests/scene/test_navigation_obstacle_3d.cpp
+++ b/engine/tests/scene/test_navigation_obstacle_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_obstacle_3d.cpp                                       */
+/*  test_navigation_obstacle_3d.h                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_obstacle_3d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 3D.
-
-#ifdef MODULE_NAVIGATION_3D_ENABLED
+#pragma once
 
 #include "scene/3d/navigation/navigation_obstacle_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNavigationObstacle3D {
 
 TEST_SUITE("[Navigation3D]") {
@@ -68,6 +63,4 @@ TEST_SUITE("[Navigation3D]") {
 	}
 }
 
-} // namespace TestNavigationObstacle3D
-
-#endif // MODULE_NAVIGATION_3D_ENABLED
+} //namespace TestNavigationObstacle3D
diff --git a/engine/tests/scene/test_navigation_region_2d.cpp b/engine/tests/scene/test_navigation_region_2d.h
similarity index 89%
rename from engine/tests/scene/test_navigation_region_2d.cpp
rename to engine/tests/scene/test_navigation_region_2d.h
index a3349897..8a76215a 100644
--- a/engine/tests/scene/test_navigation_region_2d.cpp
+++ b/engine/tests/scene/test_navigation_region_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_region_2d.cpp                                         */
+/*  test_navigation_region_2d.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_region_2d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 2D.
-
-#ifdef MODULE_NAVIGATION_2D_ENABLED
+#pragma once
 
 #include "scene/2d/navigation/navigation_region_2d.h"
+#include "scene/main/window.h"
+
+#include "tests/test_macros.h"
 
 namespace TestNavigationRegion2D {
 
@@ -48,6 +45,4 @@ TEST_SUITE("[Navigation2D]") {
 	}
 }
 
-} // namespace TestNavigationRegion2D
-
-#endif // MODULE_NAVIGATION_2D_ENABLED
+} //namespace TestNavigationRegion2D
diff --git a/engine/tests/scene/test_navigation_region_3d.cpp b/engine/tests/scene/test_navigation_region_3d.h
similarity index 92%
rename from engine/tests/scene/test_navigation_region_3d.cpp
rename to engine/tests/scene/test_navigation_region_3d.h
index f4335467..1a5777c5 100644
--- a/engine/tests/scene/test_navigation_region_3d.cpp
+++ b/engine/tests/scene/test_navigation_region_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_region_3d.cpp                                         */
+/*  test_navigation_region_3d.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_navigation_region_3d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 3D.
-
-#ifdef MODULE_NAVIGATION_3D_ENABLED
+#pragma once
 
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation/navigation_region_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNavigationRegion3D {
 
 TEST_SUITE("[Navigation3D]") {
@@ -83,6 +78,4 @@ TEST_SUITE("[Navigation3D]") {
 	}
 }
 
-} // namespace TestNavigationRegion3D
-
-#endif // MODULE_NAVIGATION_3D_ENABLED
+} //namespace TestNavigationRegion3D
diff --git a/engine/tests/scene/test_node.cpp b/engine/tests/scene/test_node.h
similarity index 99%
rename from engine/tests/scene/test_node.cpp
rename to engine/tests/scene/test_node.h
index 5a7af799..500d34fd 100644
--- a/engine/tests/scene/test_node.cpp
+++ b/engine/tests/scene/test_node.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_node.cpp                                                         */
+/*  test_node.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_node)
-
-#include "core/io/file_access.h"
-#include "core/io/resource_saver.h"
 #include "core/object/class_db.h"
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
-#include "tests/test_utils.h"
+
+#include "tests/test_macros.h"
 
 namespace TestNode {
 
diff --git a/engine/tests/scene/test_node_2d.cpp b/engine/tests/scene/test_node_2d.h
similarity index 98%
rename from engine/tests/scene/test_node_2d.cpp
rename to engine/tests/scene/test_node_2d.h
index c7c6133c..21f9ea13 100644
--- a/engine/tests/scene/test_node_2d.cpp
+++ b/engine/tests/scene/test_node_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_node_2d.cpp                                                      */
+/*  test_node_2d.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_node_2d)
+#pragma once
 
 #include "scene/2d/node_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
+#include "tests/test_macros.h"
+
 namespace TestNode2D {
 
 TEST_CASE("[SceneTree][Node2D]") {
diff --git a/engine/tests/scene/test_option_button.cpp b/engine/tests/scene/test_option_button.h
similarity index 97%
rename from engine/tests/scene/test_option_button.cpp
rename to engine/tests/scene/test_option_button.h
index 8e8fcf90..59966b7d 100644
--- a/engine/tests/scene/test_option_button.cpp
+++ b/engine/tests/scene/test_option_button.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_option_button.cpp                                                */
+/*  test_option_button.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_option_button)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/option_button.h"
 
+#include "tests/test_macros.h"
+
 namespace TestOptionButton {
 
 TEST_CASE("[SceneTree][OptionButton] Initialization") {
@@ -158,5 +156,3 @@ TEST_CASE("[SceneTree][OptionButton] Many items") {
 }
 
 } // namespace TestOptionButton
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_packed_scene.cpp b/engine/tests/scene/test_packed_scene.h
similarity index 96%
rename from engine/tests/scene/test_packed_scene.cpp
rename to engine/tests/scene/test_packed_scene.h
index ac91dffe..b3cea7b7 100644
--- a/engine/tests/scene/test_packed_scene.cpp
+++ b/engine/tests/scene/test_packed_scene.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_packed_scene.cpp                                                 */
+/*  test_packed_scene.h                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_packed_scene)
-
-#include "core/object/callable_mp.h"
 #include "scene/resources/packed_scene.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPackedScene {
 
 TEST_CASE("[PackedScene] Pack Scene and Retrieve State") {
@@ -267,15 +266,14 @@ TEST_CASE("[PackedScene] Recreate State") {
 	scene->set_name("TestScene");
 
 	// Pack the scene.
-	Ref<PackedScene> packed_scene;
-	packed_scene.instantiate();
-	packed_scene->pack(scene);
+	PackedScene packed_scene;
+	packed_scene.pack(scene);
 
 	// Recreate the state.
-	packed_scene->recreate_state();
+	packed_scene.recreate_state();
 
 	// Check if the state has been recreated.
-	Ref<SceneState> state = packed_scene->get_state();
+	Ref<SceneState> state = packed_scene.get_state();
 	CHECK(state.is_valid());
 	CHECK(state->get_node_count() == 0); // Since the state was recreated, it should be empty.
 
diff --git a/engine/tests/scene/test_parallax_2d.cpp b/engine/tests/scene/test_parallax_2d.h
similarity index 98%
rename from engine/tests/scene/test_parallax_2d.cpp
rename to engine/tests/scene/test_parallax_2d.h
index f2e4b4d8..0396db4c 100644
--- a/engine/tests/scene/test_parallax_2d.cpp
+++ b/engine/tests/scene/test_parallax_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_parallax_2d.cpp                                                  */
+/*  test_parallax_2d.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_parallax_2d)
+#pragma once
 
 #include "scene/2d/parallax_2d.h"
-
-// Test cases for the Parallax2D class to ensure its properties are set and retrieved correctly.
+#include "tests/test_macros.h"
 
 namespace TestParallax2D {
 
+// Test cases for the Parallax2D class to ensure its properties are set and retrieved correctly.
+
 TEST_CASE("[SceneTree][Parallax2D] Scroll Scale") {
 	// Test setting and getting the scroll scale.
 	Parallax2D *parallax = memnew(Parallax2D);
diff --git a/engine/tests/scene/test_path_2d.cpp b/engine/tests/scene/test_path_2d.h
similarity index 97%
rename from engine/tests/scene/test_path_2d.cpp
rename to engine/tests/scene/test_path_2d.h
index 3cc6d8f9..0095d44a 100644
--- a/engine/tests/scene/test_path_2d.cpp
+++ b/engine/tests/scene/test_path_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_path_2d.cpp                                                      */
+/*  test_path_2d.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_path_2d)
+#pragma once
 
 #include "scene/2d/path_2d.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPath2D {
 
 TEST_CASE("[SceneTree][Path2D] Initialization") {
diff --git a/engine/tests/scene/test_path_3d.cpp b/engine/tests/scene/test_path_3d.h
similarity index 96%
rename from engine/tests/scene/test_path_3d.cpp
rename to engine/tests/scene/test_path_3d.h
index d7fda0fc..835a2ca4 100644
--- a/engine/tests/scene/test_path_3d.cpp
+++ b/engine/tests/scene/test_path_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_path_3d.cpp                                                      */
+/*  test_path_3d.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_path_3d)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/3d/path_3d.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPath3D {
 
 TEST_CASE("[Path3D] Initialization") {
@@ -81,5 +79,3 @@ TEST_CASE("[Path3D] Curve setter and getter") {
 }
 
 } // namespace TestPath3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_path_follow_2d.cpp b/engine/tests/scene/test_path_follow_2d.h
similarity index 98%
rename from engine/tests/scene/test_path_follow_2d.cpp
rename to engine/tests/scene/test_path_follow_2d.h
index bf07d9c8..56cc24a4 100644
--- a/engine/tests/scene/test_path_follow_2d.cpp
+++ b/engine/tests/scene/test_path_follow_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_path_follow_2d.cpp                                               */
+/*  test_path_follow_2d.h                                                 */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_path_follow_2d)
+#pragma once
 
 #include "scene/2d/path_2d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPathFollow2D {
 
 bool is_equal_approx(const Vector2 &p_a, const Vector2 &p_b) {
@@ -253,5 +252,4 @@ TEST_CASE("[SceneTree][PathFollow2D] Progress out of range") {
 
 	memdelete(path);
 }
-
 } // namespace TestPathFollow2D
diff --git a/engine/tests/scene/test_path_follow_3d.cpp b/engine/tests/scene/test_path_follow_3d.h
similarity index 98%
rename from engine/tests/scene/test_path_follow_3d.cpp
rename to engine/tests/scene/test_path_follow_3d.h
index 83c7b589..8c39f936 100644
--- a/engine/tests/scene/test_path_follow_3d.cpp
+++ b/engine/tests/scene/test_path_follow_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_path_follow_3d.cpp                                               */
+/*  test_path_follow_3d.h                                                 */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,16 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_path_follow_3d)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/3d/path_3d.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPathFollow3D {
 
 bool is_equal_approx(const Vector3 &p_a, const Vector3 &p_b) {
@@ -341,5 +338,3 @@ TEST_CASE("[SceneTree][PathFollow3D] Calculate forward vector with degenerate cu
 }
 
 } // namespace TestPathFollow3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_physics_material.cpp b/engine/tests/scene/test_physics_material.h
similarity index 94%
rename from engine/tests/scene/test_physics_material.cpp
rename to engine/tests/scene/test_physics_material.h
index a56fde81..a7a1a5c9 100644
--- a/engine/tests/scene/test_physics_material.cpp
+++ b/engine/tests/scene/test_physics_material.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_physics_material.cpp                                             */
+/*  test_physics_material.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_physics_material)
-
-#ifndef PHYSICS_3D_DISABLED
+#pragma once
 
 #include "scene/resources/physics_material.h"
+#include "tests/test_macros.h"
 
-namespace TestPhysicsMaterial {
+namespace TestPhysics_material {
 
 TEST_CASE("[Physics_material] Defaults") {
 	Ref<PhysicsMaterial> physics_material;
@@ -104,6 +101,4 @@ TEST_CASE("[Physics_material] Absorbent") {
 	CHECK(physics_material->computed_bounce() == bounce);
 }
 
-} // namespace TestPhysicsMaterial
-
-#endif // PHYSICS_3D_DISABLED
+} // namespace TestPhysics_material
diff --git a/engine/tests/scene/test_primitives.cpp b/engine/tests/scene/test_primitives.h
similarity index 96%
rename from engine/tests/scene/test_primitives.cpp
rename to engine/tests/scene/test_primitives.h
index 530acb74..ecc49317 100644
--- a/engine/tests/scene/test_primitives.cpp
+++ b/engine/tests/scene/test_primitives.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_primitives.cpp                                                   */
+/*  test_primitives.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_primitives)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/resources/3d/primitive_meshes.h"
 
+#include "tests/test_macros.h"
+
 namespace TestPrimitives {
 
 TEST_CASE("[SceneTree][Primitive][Capsule] Capsule Primitive") {
@@ -90,13 +88,13 @@ TEST_CASE("[SceneTree][Primitive][Capsule] Capsule Primitive") {
 
 	SUBCASE("[Primitive][Capsule] Check mesh is correct") {
 		Array data{};
-		data.resize(RSE::ARRAY_MAX);
+		data.resize(RS::ARRAY_MAX);
 		float radius{ 0.5f };
 		float height{ 4.f };
 		int num_radial_segments{ 4 };
 		int num_rings{ 8 };
 		CapsuleMesh::create_mesh_array(data, radius, height, num_radial_segments, num_rings);
-		Vector<Vector3> points = data[RSE::ARRAY_VERTEX];
+		Vector<Vector3> points = data[RS::ARRAY_VERTEX];
 
 		SUBCASE("[Primitive][Capsule] Ensure all vertices positions are within bounding radius and height") {
 			// Get mesh data
@@ -128,7 +126,7 @@ TEST_CASE("[SceneTree][Primitive][Capsule] Capsule Primitive") {
 		}
 
 		SUBCASE("[Primitive][Capsule] If normal.y == 0, then mesh makes a cylinder.") {
-			Vector<Vector3> normals = data[RSE::ARRAY_NORMAL];
+			Vector<Vector3> normals = data[RS::ARRAY_NORMAL];
 			for (int ii = 0; ii < points.size(); ++ii) {
 				float point_dist_from_yaxis = Math::sqrt(points[ii].x * points[ii].x + points[ii].z * points[ii].z);
 				Vector3 yaxis_to_point{ points[ii].x / point_dist_from_yaxis, 0.f, points[ii].z / point_dist_from_yaxis };
@@ -184,14 +182,14 @@ TEST_CASE("[SceneTree][Primitive][Box] Box Primitive") {
 
 	SUBCASE("[Primitive][Box] Check mesh is correct.") {
 		Array data{};
-		data.resize(RSE::ARRAY_MAX);
+		data.resize(RS::ARRAY_MAX);
 		Vector3 size{ 0.5f, 1.2f, .9f };
 		int subdivide_width{ 3 };
 		int subdivide_height{ 2 };
 		int subdivide_depth{ 8 };
 		BoxMesh::create_mesh_array(data, size, subdivide_width, subdivide_height, subdivide_depth);
-		Vector<Vector3> points = data[RSE::ARRAY_VERTEX];
-		Vector<Vector3> normals = data[RSE::ARRAY_NORMAL];
+		Vector<Vector3> points = data[RS::ARRAY_VERTEX];
+		Vector<Vector3> normals = data[RS::ARRAY_NORMAL];
 
 		SUBCASE("Only 6 distinct normals.") {
 			Vector<Vector3> distinct_normals{};
@@ -276,7 +274,7 @@ TEST_CASE("[SceneTree][Primitive][Cylinder] Cylinder Primitive") {
 
 	SUBCASE("[Primitive][Cylinder] Actual cylinder mesh tests (top and bottom radius the same).") {
 		Array data{};
-		data.resize(RSE::ARRAY_MAX);
+		data.resize(RS::ARRAY_MAX);
 		real_t radius = .9f;
 		real_t height = 3.2f;
 		int radial_segments = 8;
@@ -284,8 +282,8 @@ TEST_CASE("[SceneTree][Primitive][Cylinder] Cylinder Primitive") {
 		bool top_cap = true;
 		bool bottom_cap = true;
 		CylinderMesh::create_mesh_array(data, radius, radius, height, radial_segments, rings, top_cap, bottom_cap);
-		Vector<Vector3> points = data[RSE::ARRAY_VERTEX];
-		Vector<Vector3> normals = data[RSE::ARRAY_NORMAL];
+		Vector<Vector3> points = data[RS::ARRAY_VERTEX];
+		Vector<Vector3> normals = data[RS::ARRAY_NORMAL];
 
 		SUBCASE("[Primitive][Cylinder] Side points are radius away from y-axis.") {
 			bool is_radius_correct{ true };
@@ -344,8 +342,8 @@ TEST_CASE("[SceneTree][Primitive][Cylinder] Cylinder Primitive") {
 
 		SUBCASE("[Primitive][Cylinder] Does mesh obey cap parameters?") {
 			CylinderMesh::create_mesh_array(data, radius, radius, height, radial_segments, rings, top_cap, false);
-			points = data[RSE::ARRAY_VERTEX];
-			normals = data[RSE::ARRAY_NORMAL];
+			points = data[RS::ARRAY_VERTEX];
+			normals = data[RS::ARRAY_NORMAL];
 			bool no_bottom_cap{ true };
 
 			for (int index = 0; index < normals.size(); ++index) {
@@ -361,8 +359,8 @@ TEST_CASE("[SceneTree][Primitive][Cylinder] Cylinder Primitive") {
 					"Check there is no bottom cap.");
 
 			CylinderMesh::create_mesh_array(data, radius, radius, height, radial_segments, rings, false, bottom_cap);
-			points = data[RSE::ARRAY_VERTEX];
-			normals = data[RSE::ARRAY_NORMAL];
+			points = data[RS::ARRAY_VERTEX];
+			normals = data[RS::ARRAY_NORMAL];
 			bool no_top_cap{ true };
 
 			for (int index = 0; index < normals.size(); ++index) {
@@ -381,15 +379,15 @@ TEST_CASE("[SceneTree][Primitive][Cylinder] Cylinder Primitive") {
 
 	SUBCASE("[Primitive][Cylinder] Slanted cylinder mesh (top and bottom radius different).") {
 		Array data{};
-		data.resize(RSE::ARRAY_MAX);
+		data.resize(RS::ARRAY_MAX);
 		real_t top_radius = 2.f;
 		real_t bottom_radius = 1.f;
 		real_t height = 1.f;
 		int radial_segments = 8;
 		int rings = 5;
 		CylinderMesh::create_mesh_array(data, top_radius, bottom_radius, height, radial_segments, rings, false, false);
-		Vector<Vector3> points = data[RSE::ARRAY_VERTEX];
-		Vector<Vector3> normals = data[RSE::ARRAY_NORMAL];
+		Vector<Vector3> points = data[RS::ARRAY_VERTEX];
+		Vector<Vector3> normals = data[RS::ARRAY_NORMAL];
 
 		SUBCASE("[Primitive][Cylinder] Side points lie correct distance from y-axis") {
 			bool is_radius_correct{ true };
@@ -549,13 +547,13 @@ TEST_CASE("[SceneTree][Primitive][Sphere] Sphere Primitive") {
 
 	SUBCASE("[Primitive][Sphere] Sphere mesh tests.") {
 		Array data{};
-		data.resize(RSE::ARRAY_MAX);
+		data.resize(RS::ARRAY_MAX);
 		real_t radius = 1.1f;
 		int radial_segments = 8;
 		int rings = 5;
 		SphereMesh::create_mesh_array(data, radius, 2 * radius, radial_segments, rings);
-		Vector<Vector3> points = data[RSE::ARRAY_VERTEX];
-		Vector<Vector3> normals = data[RSE::ARRAY_NORMAL];
+		Vector<Vector3> points = data[RS::ARRAY_VERTEX];
+		Vector<Vector3> normals = data[RS::ARRAY_NORMAL];
 
 		SUBCASE("[Primitive][Sphere] All points lie radius away from origin.") {
 			bool is_radius_correct = true;
@@ -865,5 +863,3 @@ TEST_CASE("[SceneTree][Primitive][Text] Text Primitive") {
 }
 
 } // namespace TestPrimitives
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_skeleton_3d.cpp b/engine/tests/scene/test_skeleton_3d.h
similarity index 96%
rename from engine/tests/scene/test_skeleton_3d.cpp
rename to engine/tests/scene/test_skeleton_3d.h
index 7f7c3660..047a9ce8 100644
--- a/engine/tests/scene/test_skeleton_3d.cpp
+++ b/engine/tests/scene/test_skeleton_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_skeleton_3d.cpp                                                  */
+/*  test_skeleton_3d.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_skeleton_3d)
-
-#ifndef _3D_DISABLED
-
 #include "scene/3d/skeleton_3d.h"
 
 namespace TestSkeleton3D {
@@ -74,7 +72,4 @@ TEST_CASE("[Skeleton3D] Test per-bone meta") {
 	skeleton->set_bone_meta(0, "non-existing-key", Variant());
 	memdelete(skeleton);
 }
-
 } // namespace TestSkeleton3D
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_sky.cpp b/engine/tests/scene/test_sky.h
similarity index 98%
rename from engine/tests/scene/test_sky.cpp
rename to engine/tests/scene/test_sky.h
index f7cb35c5..b2965c83 100644
--- a/engine/tests/scene/test_sky.cpp
+++ b/engine/tests/scene/test_sky.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_sky.cpp                                                          */
+/*  test_sky.h                                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_sky)
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "scene/resources/sky.h"
 
+#include "tests/test_macros.h"
+
 namespace TestSky {
 
 TEST_CASE("[SceneTree][Sky] Constructor") {
@@ -219,5 +217,3 @@ TEST_CASE("[SceneTree][Sky] RID generation") {
 }
 
 } // namespace TestSky
-
-#endif // _3D_DISABLED
diff --git a/engine/tests/scene/test_split_container.cpp b/engine/tests/scene/test_split_container.h
similarity index 99%
rename from engine/tests/scene/test_split_container.cpp
rename to engine/tests/scene/test_split_container.h
index 25e74ee9..aef9d100 100644
--- a/engine/tests/scene/test_split_container.cpp
+++ b/engine/tests/scene/test_split_container.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_split_container.cpp                                              */
+/*  test_split_container.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,23 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_split_container)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/split_container.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
+
+#include "tests/test_macros.h"
 
 namespace TestSplitContainer {
 
-#define CHECK_RECTS(m_rects, m_child_rects) \
-	CHECK(m_rects.size() == m_child_rects.size()); \
-	for (int i = 0; i < (int)m_child_rects.size(); i++) { \
+#define CHECK_RECTS(m_rects, m_child_rects)                                                                                                                   \
+	CHECK(m_rects.size() == m_child_rects.size());                                                                                                            \
+	for (int i = 0; i < (int)m_child_rects.size(); i++) {                                                                                                     \
 		CHECK_MESSAGE(m_child_rects[i] == m_rects[i], vformat("Child %s is the wrong size. Child rect: %s, expected: %s.", i, m_child_rects[i], m_rects[i])); \
 	}
 
@@ -279,7 +274,7 @@ TEST_CASE("[SceneTree][SplitContainer] Collapsed") {
 
 		// Cursor is default.
 		SEND_GUI_MOUSE_MOTION_EVENT(Point2(1, 1), MouseButtonMask::NONE, Key::NONE);
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 		// Dragger is disabled, cannot drag.
 		SEND_GUI_MOUSE_BUTTON_EVENT(Point2(1, 1), MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
@@ -378,20 +373,20 @@ TEST_CASE("[SceneTree][SplitContainer] Cursor shape") {
 
 	// Default cursor shape.
 	SEND_GUI_MOUSE_MOTION_EVENT(not_on_dragger, MouseButtonMask::NONE, Key::NONE);
-	CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+	CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 	// Horizontal cursor shape.
 	SEND_GUI_MOUSE_MOTION_EVENT(on_dragger, MouseButtonMask::NONE, Key::NONE);
-	CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_HSPLIT);
+	CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_HSPLIT);
 
 	// Vertical cursor shape.
 	split_container->set_vertical(true);
 	SEND_GUI_MOUSE_MOTION_EVENT(on_dragger, MouseButtonMask::NONE, Key::NONE);
-	CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_VSPLIT);
+	CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_VSPLIT);
 
 	// Move off, default cursor shape.
 	SEND_GUI_MOUSE_MOTION_EVENT(not_on_dragger, MouseButtonMask::NONE, Key::NONE);
-	CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+	CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 	memdelete(child_a);
 	memdelete(child_b);
@@ -2362,5 +2357,3 @@ TEST_CASE("[SceneTree][SplitContainer] More children") {
 }
 
 } // namespace TestSplitContainer
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_sprite_2d.cpp b/engine/tests/scene/test_sprite_2d.h
similarity index 98%
rename from engine/tests/scene/test_sprite_2d.cpp
rename to engine/tests/scene/test_sprite_2d.h
index 668710cf..e8218963 100644
--- a/engine/tests/scene/test_sprite_2d.cpp
+++ b/engine/tests/scene/test_sprite_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_sprite_2d.cpp                                                    */
+/*  test_sprite_2d.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_sprite_2d)
+#pragma once
 
 #include "scene/2d/sprite_2d.h"
 
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
+
 namespace TestSprite2D {
 
 TEST_CASE("[SceneTree][Sprite2D] Constructor") {
diff --git a/engine/tests/scene/test_sprite_frames.cpp b/engine/tests/scene/test_sprite_frames.h
similarity index 98%
rename from engine/tests/scene/test_sprite_frames.cpp
rename to engine/tests/scene/test_sprite_frames.h
index ccdeee4d..db7a44eb 100644
--- a/engine/tests/scene/test_sprite_frames.cpp
+++ b/engine/tests/scene/test_sprite_frames.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_sprite_frames.cpp                                                */
+/*  test_sprite_frames.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_sprite_frames)
+#pragma once
 
 #include "scene/resources/sprite_frames.h"
 
-namespace TestSpriteFrames {
+#include "tests/test_macros.h"
 
+namespace TestSpriteFrames {
 const String test_animation_name = "GodotTest";
 
 TEST_CASE("[SpriteFrames] Constructor methods") {
@@ -243,5 +242,4 @@ TEST_CASE("[SpriteFrames] Frame addition, removal, and retrieval") {
 			frames.get_frame_count(test_animation_name) == 0,
 			"Clears frames.");
 }
-
 } // namespace TestSpriteFrames
diff --git a/engine/tests/scene/test_style_box_empty.cpp b/engine/tests/scene/test_style_box_empty.cpp
deleted file mode 100644
index bb5d0d9d..00000000
--- a/engine/tests/scene/test_style_box_empty.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/**************************************************************************/
-/*  test_style_box_empty.cpp                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_style_box_empty)
-
-#include "scene/resources/style_box.h"
-
-namespace TestStyleBoxEmpty {
-
-TEST_CASE("[StyleBoxEmpty] Constructor") {
-	Ref<StyleBoxEmpty> style_box_empty = memnew(StyleBoxEmpty);
-
-	CHECK(style_box_empty->get_offset() == Point2(0, 0));
-	CHECK(style_box_empty->get_current_item_drawn() == nullptr);
-}
-
-TEST_CASE("[StyleBoxEmpty] set_content_margin, set_content_margin_all, set_content_margin_individual, get_content_margin, get_margin") {
-	Ref<StyleBoxEmpty> style_box_empty = memnew(StyleBoxEmpty);
-
-	SUBCASE("set_content_margin, get_content_margin") {
-		style_box_empty->set_content_margin(SIDE_LEFT, 2);
-		style_box_empty->set_content_margin(SIDE_TOP, 3);
-		style_box_empty->set_content_margin(SIDE_RIGHT, 4);
-		style_box_empty->set_content_margin(SIDE_BOTTOM, 5);
-
-		CHECK(style_box_empty->get_content_margin(SIDE_LEFT) == 2);
-		CHECK(style_box_empty->get_content_margin(SIDE_TOP) == 3);
-		CHECK(style_box_empty->get_content_margin(SIDE_RIGHT) == 4);
-		CHECK(style_box_empty->get_content_margin(SIDE_BOTTOM) == 5);
-	}
-
-	SUBCASE("set_content_margin_all, get_content_margin") {
-		style_box_empty->set_content_margin_all(10);
-
-		CHECK(style_box_empty->get_content_margin(SIDE_LEFT) == 10);
-		CHECK(style_box_empty->get_content_margin(SIDE_TOP) == 10);
-		CHECK(style_box_empty->get_content_margin(SIDE_RIGHT) == 10);
-		CHECK(style_box_empty->get_content_margin(SIDE_BOTTOM) == 10);
-	}
-
-	SUBCASE("set_content_margin, get_margin") {
-		style_box_empty->set_content_margin(SIDE_LEFT, -1);
-		style_box_empty->set_content_margin(SIDE_RIGHT, -2);
-		style_box_empty->set_content_margin(SIDE_TOP, 3);
-		style_box_empty->set_content_margin(SIDE_BOTTOM, 4);
-
-		CHECK_MESSAGE(style_box_empty->get_margin(SIDE_LEFT) == 0,
-				"Value is lesser than zero, so it returns 0");
-		CHECK_MESSAGE(style_box_empty->get_margin(SIDE_RIGHT) == 0,
-				"Value is lesser than zero, so it returns 0");
-		CHECK_MESSAGE(style_box_empty->get_margin(SIDE_TOP) == 3,
-				"Value is higher than zero, so it returns value");
-		CHECK_MESSAGE(style_box_empty->get_margin(SIDE_BOTTOM) == 4,
-				"Value is higher than zero, so it returns value");
-	}
-
-	SUBCASE("set_content_margin_individual, get_minimum_size") {
-		style_box_empty->set_content_margin_individual(-1, 2, 5, 15);
-
-		CHECK(style_box_empty->get_minimum_size() == Size2(5, 17));
-	}
-
-	SUBCASE("set_content_margin_individual, get_offset") {
-		style_box_empty->set_content_margin_individual(-3, 5, 1, 2);
-
-		CHECK_MESSAGE(style_box_empty->get_offset() == Point2(0, 5),
-				"Returns Point2 with get_margin of SIDE_LEFT and SIDE_TOP");
-	}
-}
-
-} // namespace TestStyleBoxEmpty
diff --git a/engine/tests/scene/test_style_box_line.cpp b/engine/tests/scene/test_style_box_line.cpp
deleted file mode 100644
index b11ef9c9..00000000
--- a/engine/tests/scene/test_style_box_line.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/**************************************************************************/
-/*  test_style_box_line.cpp                                               */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_style_box_line)
-
-#include "scene/resources/style_box_line.h"
-
-namespace TestStyleBoxLine {
-
-TEST_CASE("[StyleBoxLine] Constructor") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-
-	CHECK(style_box_line->get_color() == Color(0, 0, 0, 1));
-	CHECK(style_box_line->get_thickness() == 1);
-	CHECK(style_box_line->is_vertical() == false);
-	CHECK(style_box_line->get_grow_begin() == 1.0);
-	CHECK(style_box_line->get_grow_end() == 1.0);
-}
-
-TEST_CASE("[StyleBoxLine] set_color, get_color") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-	Color color = Color(0.1, 0.2, 0.3, 1.0);
-
-	style_box_line->set_color(color);
-	CHECK(style_box_line->get_color() == color);
-}
-
-TEST_CASE("[StyleBoxLine] set_thickness, get_thickness") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-
-	style_box_line->set_thickness(5);
-	CHECK(style_box_line->get_thickness() == 5);
-}
-
-TEST_CASE("[StyleBoxLine] set_vertical, is_vertical") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-
-	style_box_line->set_vertical(true);
-	CHECK(style_box_line->is_vertical() == true);
-}
-
-TEST_CASE("[StyleBoxLine] set_vertical, is_vertical") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-
-	style_box_line->set_vertical(true);
-	CHECK(style_box_line->is_vertical() == true);
-}
-
-TEST_CASE("[StyleBoxLine] set_grow_begin, get_grow_begin, set_grow_end, get_grow_end") {
-	Ref<StyleBoxLine> style_box_line = memnew(StyleBoxLine);
-	float grow_value = 3.5;
-
-	SUBCASE("set_grow_begin, get_grow_begin") {
-		style_box_line->set_grow_begin(grow_value);
-		CHECK(style_box_line->get_grow_begin() == grow_value);
-	}
-
-	SUBCASE("set_grow_end, get_grow_end") {
-		style_box_line->set_grow_end(grow_value);
-		CHECK(style_box_line->get_grow_end() == grow_value);
-	}
-}
-
-} // namespace TestStyleBoxLine
diff --git a/engine/tests/scene/test_style_box_texture.cpp b/engine/tests/scene/test_style_box_texture.h
similarity index 98%
rename from engine/tests/scene/test_style_box_texture.cpp
rename to engine/tests/scene/test_style_box_texture.h
index d0946f80..7dd0bcc4 100644
--- a/engine/tests/scene/test_style_box_texture.cpp
+++ b/engine/tests/scene/test_style_box_texture.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_style_box_texture.cpp                                            */
+/*  test_style_box_texture.h                                              */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_style_box_texture)
+#pragma once
 
 #include "scene/resources/style_box_texture.h"
 
+#include "tests/test_macros.h"
+
 namespace TestStyleBoxTexture {
 
 TEST_CASE("[StyleBoxTexture] Constructor") {
diff --git a/engine/tests/scene/test_tab_bar.cpp b/engine/tests/scene/test_tab_bar.h
similarity index 99%
rename from engine/tests/scene/test_tab_bar.cpp
rename to engine/tests/scene/test_tab_bar.h
index 7ab02acd..058641ce 100644
--- a/engine/tests/scene/test_tab_bar.cpp
+++ b/engine/tests/scene/test_tab_bar.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_tab_bar.cpp                                                      */
+/*  test_tab_bar.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_tab_bar)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/tab_bar.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
+
+#include "tests/test_macros.h"
 
 namespace TestTabBar {
-
 TEST_CASE("[SceneTree][TabBar] tab operations") {
 	TabBar *tab_bar = memnew(TabBar);
 	SceneTree::get_singleton()->get_root()->add_child(tab_bar);
@@ -1165,5 +1159,3 @@ TEST_CASE("[SceneTree][TabBar] Mouse interaction") {
 // FIXME: Add tests for keyboard navigation and other methods.
 
 } // namespace TestTabBar
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_tab_container.cpp b/engine/tests/scene/test_tab_container.h
similarity index 95%
rename from engine/tests/scene/test_tab_container.cpp
rename to engine/tests/scene/test_tab_container.h
index e78e7f3c..e8b01a48 100644
--- a/engine/tests/scene/test_tab_container.cpp
+++ b/engine/tests/scene/test_tab_container.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_tab_container.cpp                                                */
+/*  test_tab_container.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "scene/gui/tab_container.h"
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_tab_container)
-
-#ifndef ADVANCED_GUI_DISABLED
-
-#include "scene/gui/box_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
-
 namespace TestTabContainer {
-
 TEST_CASE("[SceneTree][TabContainer] tab operations") {
 	TabContainer *tab_container = memnew(TabContainer);
 	SceneTree::get_singleton()->get_root()->add_child(tab_container);
@@ -550,7 +542,6 @@ TEST_CASE("[SceneTree][TabContainer] layout and offset") {
 	Size2 all_tabs_size = tab_container->get_size();
 	const float side_margin = tab_container->get_theme_constant("side_margin");
 
-	HBoxContainer *internal_container = tab_container->get_internal_container();
 	TabBar *tab_bar = tab_container->get_tab_bar();
 
 	Vector<Rect2> tab_rects = {
@@ -589,14 +580,14 @@ TEST_CASE("[SceneTree][TabContainer] layout and offset") {
 
 		// Initial position, same as top position.
 		// Tab bar is at the top.
-		CHECK(internal_container->get_anchor(SIDE_TOP) == 0);
-		CHECK(internal_container->get_anchor(SIDE_BOTTOM) == 0);
-		CHECK(internal_container->get_anchor(SIDE_LEFT) == 0);
-		CHECK(internal_container->get_anchor(SIDE_RIGHT) == 1);
-		CHECK(internal_container->get_offset(SIDE_TOP) == 0);
-		CHECK(internal_container->get_offset(SIDE_BOTTOM) == tab_height);
-		CHECK(internal_container->get_offset(SIDE_LEFT) == side_margin);
-		CHECK(internal_container->get_offset(SIDE_RIGHT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_TOP) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_BOTTOM) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_LEFT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_RIGHT) == 1);
+		CHECK(tab_bar->get_offset(SIDE_TOP) == 0);
+		CHECK(tab_bar->get_offset(SIDE_BOTTOM) == tab_height);
+		CHECK(tab_bar->get_offset(SIDE_LEFT) == side_margin);
+		CHECK(tab_bar->get_offset(SIDE_RIGHT) == 0);
 
 		// Child is expanded and below the tab bar.
 		CHECK(tab0->get_anchor(SIDE_TOP) == 0);
@@ -614,14 +605,14 @@ TEST_CASE("[SceneTree][TabContainer] layout and offset") {
 		MessageQueue::get_singleton()->flush();
 
 		// Tab bar is at the bottom.
-		CHECK(internal_container->get_anchor(SIDE_TOP) == 1);
-		CHECK(internal_container->get_anchor(SIDE_BOTTOM) == 1);
-		CHECK(internal_container->get_anchor(SIDE_LEFT) == 0);
-		CHECK(internal_container->get_anchor(SIDE_RIGHT) == 1);
-		CHECK(internal_container->get_offset(SIDE_TOP) == -tab_height);
-		CHECK(internal_container->get_offset(SIDE_BOTTOM) == 0);
-		CHECK(internal_container->get_offset(SIDE_LEFT) == side_margin);
-		CHECK(internal_container->get_offset(SIDE_RIGHT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_TOP) == 1);
+		CHECK(tab_bar->get_anchor(SIDE_BOTTOM) == 1);
+		CHECK(tab_bar->get_anchor(SIDE_LEFT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_RIGHT) == 1);
+		CHECK(tab_bar->get_offset(SIDE_TOP) == -tab_height);
+		CHECK(tab_bar->get_offset(SIDE_BOTTOM) == 0);
+		CHECK(tab_bar->get_offset(SIDE_LEFT) == side_margin);
+		CHECK(tab_bar->get_offset(SIDE_RIGHT) == 0);
 
 		// Child is expanded and above the tab bar.
 		CHECK(tab0->get_anchor(SIDE_TOP) == 0);
@@ -639,14 +630,14 @@ TEST_CASE("[SceneTree][TabContainer] layout and offset") {
 		MessageQueue::get_singleton()->flush();
 
 		// Tab bar is at the top.
-		CHECK(internal_container->get_anchor(SIDE_TOP) == 0);
-		CHECK(internal_container->get_anchor(SIDE_BOTTOM) == 0);
-		CHECK(internal_container->get_anchor(SIDE_LEFT) == 0);
-		CHECK(internal_container->get_anchor(SIDE_RIGHT) == 1);
-		CHECK(internal_container->get_offset(SIDE_TOP) == 0);
-		CHECK(internal_container->get_offset(SIDE_BOTTOM) == tab_height);
-		CHECK(internal_container->get_offset(SIDE_LEFT) == side_margin);
-		CHECK(internal_container->get_offset(SIDE_RIGHT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_TOP) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_BOTTOM) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_LEFT) == 0);
+		CHECK(tab_bar->get_anchor(SIDE_RIGHT) == 1);
+		CHECK(tab_bar->get_offset(SIDE_TOP) == 0);
+		CHECK(tab_bar->get_offset(SIDE_BOTTOM) == tab_height);
+		CHECK(tab_bar->get_offset(SIDE_LEFT) == side_margin);
+		CHECK(tab_bar->get_offset(SIDE_RIGHT) == 0);
 
 		// Child is expanded and below the tab bar.
 		CHECK(tab0->get_anchor(SIDE_TOP) == 0);
@@ -926,5 +917,3 @@ TEST_CASE("[SceneTree][TabContainer] Mouse interaction") {
 // FIXME: Add tests for keyboard navigation and other methods.
 
 } // namespace TestTabContainer
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_text_edit.cpp b/engine/tests/scene/test_text_edit.h
similarity index 99%
rename from engine/tests/scene/test_text_edit.cpp
rename to engine/tests/scene/test_text_edit.h
index 2232c6de..85ecceea 100644
--- a/engine/tests/scene/test_text_edit.cpp
+++ b/engine/tests/scene/test_text_edit.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_text_edit.cpp                                                    */
+/*  test_text_edit.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
+#include "scene/gui/text_edit.h"
+
 #include "tests/test_macros.h"
 
-TEST_FORCE_LINK(test_text_edit)
-
-#ifndef ADVANCED_GUI_DISABLED
-
-#include "core/input/input_map.h"
-#include "scene/gui/text_edit.h"
-#include "scene/main/scene_tree.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
-
 namespace TestTextEdit {
-
 static inline Array reverse_nested(Array array) {
 	Array reversed_array = array.duplicate(true);
 	reversed_array.reverse();
@@ -6795,7 +6788,7 @@ TEST_CASE("[SceneTree][TextEdit] caret") {
 
 	// Should this work?
 	text_edit->set_caret_column(5);
-	CHECK(text_edit->get_word_under_caret() == "Lorem");
+	CHECK(text_edit->get_word_under_caret() == "");
 
 	text_edit->set_caret_column(6);
 	CHECK(text_edit->get_word_under_caret() == "");
@@ -8304,13 +8297,13 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 
 		// Defaults to none.
 		CHECK(text_edit->get_hovered_gutter() == Vector2i(-1, -1));
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 		// Hover over gutter.
 		SEND_GUI_MOUSE_MOTION_EVENT(Point2(5, line_height + line_height / 2), MouseButtonMask::NONE, Key::NONE);
 		CHECK(text_edit->get_hovered_gutter() == Vector2i(0, 1));
 		SIGNAL_CHECK_FALSE("gutter_clicked");
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_POINTING_HAND);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_POINTING_HAND);
 
 		// Click on gutter.
 		SEND_GUI_MOUSE_BUTTON_EVENT(Point2(5, line_height / 2), MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
@@ -8326,19 +8319,19 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 		SEND_GUI_MOUSE_MOTION_EVENT(Point2(15, line_height + line_height / 2), MouseButtonMask::NONE, Key::NONE);
 		CHECK(text_edit->get_hovered_gutter() == Vector2i(1, 1));
 		SIGNAL_CHECK_FALSE("gutter_clicked");
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 		// Unclickable gutter can be clicked.
 		SEND_GUI_MOUSE_BUTTON_EVENT(Point2(15, line_height * 2 + line_height / 2), MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
 		CHECK(text_edit->get_hovered_gutter() == Vector2i(1, 2));
 		SIGNAL_CHECK("gutter_clicked", Array({ { 2, 1 } }));
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 		// Hover past last line.
 		SEND_GUI_MOUSE_MOTION_EVENT(Point2(5, line_height * 5), MouseButtonMask::NONE, Key::NONE);
 		CHECK(text_edit->get_hovered_gutter() == Vector2i(-1, -1));
 		SIGNAL_CHECK_FALSE("gutter_clicked");
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 		// Click on gutter past last line.
 		SEND_GUI_MOUSE_BUTTON_EVENT(Point2(5, line_height * 5), MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
@@ -8369,5 +8362,3 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 }
 
 } // namespace TestTextEdit
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_texture_progress_bar.cpp b/engine/tests/scene/test_texture_progress_bar.h
similarity index 97%
rename from engine/tests/scene/test_texture_progress_bar.cpp
rename to engine/tests/scene/test_texture_progress_bar.h
index 8b8a616d..68ac88f3 100644
--- a/engine/tests/scene/test_texture_progress_bar.cpp
+++ b/engine/tests/scene/test_texture_progress_bar.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_texture_progress_bar.cpp                                         */
+/*  test_texture_progress_bar.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_texture_progress_bar)
+#pragma once
 
 #include "scene/gui/texture_progress_bar.h"
 
+#include "tests/test_macros.h"
+
 namespace TestTextureProgressBar {
 
 TEST_CASE("[SceneTree][TextureProgressBar]") {
diff --git a/engine/tests/scene/test_theme.cpp b/engine/tests/scene/test_theme.h
similarity index 98%
rename from engine/tests/scene/test_theme.cpp
rename to engine/tests/scene/test_theme.h
index 009ac169..3296e54e 100644
--- a/engine/tests/scene/test_theme.cpp
+++ b/engine/tests/scene/test_theme.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_theme.cpp                                                        */
+/*  test_theme.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_theme)
+#pragma once
 
 #include "scene/resources/image_texture.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/theme.h"
 #include "tests/test_tools.h"
 
+#include "thirdparty/doctest/doctest.h"
+
 namespace TestTheme {
 
 class Fixture {
diff --git a/engine/tests/scene/test_timer.cpp b/engine/tests/scene/test_timer.h
similarity index 97%
rename from engine/tests/scene/test_timer.cpp
rename to engine/tests/scene/test_timer.h
index 65e41bcb..c47a1a2e 100644
--- a/engine/tests/scene/test_timer.cpp
+++ b/engine/tests/scene/test_timer.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_timer.cpp                                                        */
+/*  test_timer.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_timer)
-
-#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
-#include "scene/main/window.h"
-#include "tests/signal_watcher.h"
+
+#include "tests/test_macros.h"
 
 namespace TestTimer {
 
diff --git a/engine/tests/scene/test_tree.cpp b/engine/tests/scene/test_tree.h
similarity index 98%
rename from engine/tests/scene/test_tree.cpp
rename to engine/tests/scene/test_tree.h
index 3d550e64..2db6e8f4 100644
--- a/engine/tests/scene/test_tree.cpp
+++ b/engine/tests/scene/test_tree.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_tree.cpp                                                         */
+/*  test_tree.h                                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_tree)
-
-#ifndef ADVANCED_GUI_DISABLED
+#pragma once
 
 #include "scene/gui/tree.h"
 
+#include "tests/test_macros.h"
+
 namespace TestTree {
 
 TEST_CASE("[SceneTree][Tree]") {
@@ -298,5 +296,3 @@ TEST_CASE("[SceneTree][Tree]") {
 }
 
 } // namespace TestTree
-
-#endif // ADVANCED_GUI_DISABLED
diff --git a/engine/tests/scene/test_viewport.cpp b/engine/tests/scene/test_viewport.h
similarity index 98%
rename from engine/tests/scene/test_viewport.cpp
rename to engine/tests/scene/test_viewport.h
index 96583d49..47905d14 100644
--- a/engine/tests/scene/test_viewport.cpp
+++ b/engine/tests/scene/test_viewport.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_viewport.cpp                                                     */
+/*  test_viewport.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,19 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_viewport)
-
-#include "core/object/callable_mp.h"
 #include "scene/2d/node_2d.h"
 #include "scene/gui/control.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/canvas_layer.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "tests/display_server_mock.h"
-#include "tests/signal_watcher.h"
 
 #ifndef PHYSICS_2D_DISABLED
 #include "scene/2d/physics/area_2d.h"
@@ -49,6 +43,8 @@ TEST_FORCE_LINK(test_viewport)
 #include "servers/physics_2d/physics_server_2d_dummy.h"
 #endif // PHYSICS_2D_DISABLED
 
+#include "tests/test_macros.h"
+
 namespace TestViewport {
 
 class NotificationControlViewport : public Control {
@@ -1172,7 +1168,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 
 				// Move above a Control, that is a Drop target and allows dropping at this point.
 				SEND_GUI_MOUSE_MOTION_EVENT(on_d, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				CHECK(root->gui_is_dragging());
 				CHECK_FALSE(root->gui_is_drag_successful());
@@ -1196,11 +1192,11 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 
 				// Move above a Control, that is not a Drop target.
 				SEND_GUI_MOUSE_MOTION_EVENT(on_a, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_FORBIDDEN);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_FORBIDDEN);
 
 				// Move above a Control, that is a Drop target, but has disallowed this point.
 				SEND_GUI_MOUSE_MOTION_EVENT(on_d + Point2i(20, 0), MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_FORBIDDEN);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_FORBIDDEN);
 				CHECK(root->gui_is_dragging());
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_d + Point2i(20, 0), MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
@@ -1222,7 +1218,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 
 				// Move away from Controls.
 				SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
 
 				CHECK(root->gui_is_dragging());
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_background, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
@@ -1239,7 +1235,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(root->gui_is_dragging());
 
 				SEND_GUI_MOUSE_MOTION_EVENT(on_d, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				// Move outside of window.
 				SEND_GUI_MOUSE_MOTION_EVENT(on_outside, MouseButtonMask::LEFT, Key::NONE);
@@ -1446,7 +1442,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(root->gui_is_dragging());
 				CHECK(sv_b->during_drag);
 				SEND_GUI_MOUSE_MOTION_EVENT(on_svb, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_svb, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
 				CHECK(sv_b->valid_drop);
@@ -1460,7 +1456,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(sv->gui_is_dragging());
 				CHECK(node_d->during_drag);
 				SEND_GUI_MOUSE_MOTION_EVENT(on_d, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_d, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
 				CHECK(node_d->valid_drop);
@@ -1474,7 +1470,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(root->gui_is_dragging());
 				CHECK(ew_b->during_drag);
 				SEND_GUI_MOUSE_MOTION_EVENT(on_ewb, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_ewb, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
 				CHECK(ew_b->valid_drop);
@@ -1488,7 +1484,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(ew->gui_is_dragging());
 				CHECK(node_d->during_drag);
 				SEND_GUI_MOUSE_MOTION_EVENT(on_d, MouseButtonMask::LEFT, Key::NONE);
-				CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_CAN_DROP);
+				CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_CAN_DROP);
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_d, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
 				CHECK(node_d->valid_drop);
@@ -1549,7 +1545,7 @@ TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
 		Point2i on_c = Point2i(5, 5);
 
 		SEND_GUI_MOUSE_MOTION_EVENT(on_c, MouseButtonMask::NONE, Key::NONE);
-		CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_FORBIDDEN); // GH-74805
+		CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_FORBIDDEN); // GH-74805
 
 		memdelete(node_c);
 		memdelete(node_b);
diff --git a/engine/tests/scene/test_visual_shader.cpp b/engine/tests/scene/test_visual_shader.h
similarity index 97%
rename from engine/tests/scene/test_visual_shader.cpp
rename to engine/tests/scene/test_visual_shader.h
index 98816e5d..8ec17168 100644
--- a/engine/tests/scene/test_visual_shader.cpp
+++ b/engine/tests/scene/test_visual_shader.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_visual_shader.cpp                                                */
+/*  test_visual_shader.h                                                  */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_visual_shader)
+#pragma once
 
 #include "scene/resources/visual_shader.h"
 
-namespace TestVisualShader {
+#include "tests/test_macros.h"
+
+namespace TestVisualArray {
 
 TEST_CASE("[SceneTree][VisualShader] Object creation and parameter") {
 	Ref<VisualShader> vs = memnew(VisualShader);
@@ -145,4 +145,4 @@ TEST_CASE("[SceneTree][VisualShader] Testing Varyings") {
 	ERR_PRINT_ON;
 }
 
-} // namespace TestVisualShader
+} //namespace TestVisualArray
diff --git a/engine/tests/scene/test_window.cpp b/engine/tests/scene/test_window.h
similarity index 93%
rename from engine/tests/scene/test_window.cpp
rename to engine/tests/scene/test_window.h
index 69693fdc..5eaea314 100644
--- a/engine/tests/scene/test_window.cpp
+++ b/engine/tests/scene/test_window.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_window.cpp                                                       */
+/*  test_window.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_window)
-
-#include "core/input/input_map.h" // IWYU pragma: keep // Used by `SEND_GUI_MOUSE_MOTION_EVENT` macro.
 #include "scene/gui/control.h"
-#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-#include "tests/display_server_mock.h"
+
+#include "tests/test_macros.h"
 
 namespace TestWindow {
 
diff --git a/engine/tests/servers/rendering/test_shader_preprocessor.cpp b/engine/tests/servers/rendering/test_shader_preprocessor.h
similarity index 99%
rename from engine/tests/servers/rendering/test_shader_preprocessor.cpp
rename to engine/tests/servers/rendering/test_shader_preprocessor.h
index 16286fc3..8e9f71d7 100644
--- a/engine/tests/servers/rendering/test_shader_preprocessor.cpp
+++ b/engine/tests/servers/rendering/test_shader_preprocessor.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_shader_preprocessor.cpp                                          */
+/*  test_shader_preprocessor.h                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_shader_preprocessor)
+#pragma once
 
 #include "servers/rendering/shader_preprocessor.h"
 
+#include "tests/test_macros.h"
+
 #include <cctype>
 
 namespace TestShaderPreprocessor {
diff --git a/engine/tests/servers/test_nav_heap.cpp b/engine/tests/servers/test_nav_heap.h
similarity index 97%
rename from engine/tests/servers/test_nav_heap.cpp
rename to engine/tests/servers/test_nav_heap.h
index ff14ca89..919049e7 100644
--- a/engine/tests/servers/test_nav_heap.cpp
+++ b/engine/tests/servers/test_nav_heap.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_nav_heap.cpp                                                     */
+/*  test_nav_heap.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_nav_heap)
+#pragma once
 
 #include "servers/nav_heap.h"
 
-namespace TestNavHeap {
+#include "tests/test_macros.h"
 
+namespace TestHeap {
 struct GreaterThan {
 	bool operator()(int p_a, int p_b) const { return p_a > p_b; }
 };
@@ -194,5 +193,4 @@ TEST_CASE("[Heap] clear") {
 	CHECK(heap_indexes[2] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
 	CHECK(heap_indexes[3] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
 }
-
-} // namespace TestNavHeap
+} //namespace TestHeap
diff --git a/engine/tests/servers/test_navigation_server_2d.cpp b/engine/tests/servers/test_navigation_server_2d.h
similarity index 98%
rename from engine/tests/servers/test_navigation_server_2d.cpp
rename to engine/tests/servers/test_navigation_server_2d.h
index e42fc7ab..f8b0587b 100644
--- a/engine/tests/servers/test_navigation_server_2d.cpp
+++ b/engine/tests/servers/test_navigation_server_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_server_2d.cpp                                         */
+/*  test_navigation_server_2d.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_navigation_server_2d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 2D.
-
-#ifdef MODULE_NAVIGATION_2D_ENABLED
-
-#include "core/object/callable_mp.h"
-#include "scene/2d/polygon_2d.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
+#include "modules/navigation_2d/nav_utils_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
-#include "tests/signal_watcher.h"
+
+#include "scene/2d/polygon_2d.h"
+
+#include "tests/test_macros.h"
 
 namespace TestNavigationServer2D {
 
@@ -762,7 +756,4 @@ TEST_SUITE("[Navigation2D]") {
 		CHECK_EQ(simplified_path.size(), 4);
 	}
 }
-
-} // namespace TestNavigationServer2D
-
-#endif // MODULE_NAVIGATION_2D_ENABLED
+} //namespace TestNavigationServer2D
diff --git a/engine/tests/servers/test_navigation_server_3d.cpp b/engine/tests/servers/test_navigation_server_3d.h
similarity index 98%
rename from engine/tests/servers/test_navigation_server_3d.cpp
rename to engine/tests/servers/test_navigation_server_3d.h
index 062f6f8c..f16ed014 100644
--- a/engine/tests/servers/test_navigation_server_3d.cpp
+++ b/engine/tests/servers/test_navigation_server_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_navigation_server_3d.cpp                                         */
+/*  test_navigation_server_3d.h                                           */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
+#pragma once
 
-TEST_FORCE_LINK(test_navigation_server_3d)
-
-#include "modules/modules_enabled.gen.h" // For navigation 3D.
-
-#ifdef MODULE_NAVIGATION_3D_ENABLED
-
-#include "core/object/callable_mp.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
-#include "tests/signal_watcher.h"
 
 namespace TestNavigationServer3D {
 
@@ -682,7 +672,7 @@ TEST_SUITE("[Navigation3D]") {
 		Ref<NavigationMeshSourceGeometryData3D> source_geometry = memnew(NavigationMeshSourceGeometryData3D);
 
 		Array arr;
-		arr.resize(RSE::ARRAY_MAX);
+		arr.resize(RS::ARRAY_MAX);
 		BoxMesh::create_mesh_array(arr, Vector3(10.0, 0.001, 10.0));
 		source_geometry->add_mesh_array(arr, Transform3D());
 		navigation_server->bake_from_source_geometry_data(navigation_mesh, source_geometry, Callable());
@@ -821,7 +811,7 @@ TEST_SUITE("[Navigation3D]") {
 		Ref<NavigationMeshSourceGeometryData3D> source_geometry = memnew(NavigationMeshSourceGeometryData3D);
 
 		Array arr;
-		arr.resize(RSE::ARRAY_MAX);
+		arr.resize(RS::ARRAY_MAX);
 		BoxMesh::create_mesh_array(arr, Vector3(10.0, 0.001, 10.0));
 		source_geometry->add_mesh_array(arr, Transform3D());
 
@@ -849,7 +839,4 @@ TEST_SUITE("[Navigation3D]") {
 		CHECK_EQ(simplified_path.size(), 4);
 	}
 }
-
-} // namespace TestNavigationServer3D
-
-#endif // MODULE_NAVIGATION_3D_ENABLED
+} //namespace TestNavigationServer3D
diff --git a/engine/tests/servers/test_text_server.cpp b/engine/tests/servers/test_text_server.h
similarity index 99%
rename from engine/tests/servers/test_text_server.cpp
rename to engine/tests/servers/test_text_server.h
index 2b79e409..01e53f68 100644
--- a/engine/tests/servers/test_text_server.cpp
+++ b/engine/tests/servers/test_text_server.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_text_server.cpp                                                  */
+/*  test_text_server.h                                                    */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_text_server)
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
-#include "core/variant/typed_array.h"
 #include "editor/themes/builtin_fonts.gen.h"
 #include "servers/text/text_server.h"
+#include "tests/test_macros.h"
 
 namespace TestTextServer {
 
@@ -1016,7 +1014,6 @@ TEST_SUITE("[TextServer]") {
 		}
 	}
 }
-
-} // namespace TestTextServer
+}; // namespace TestTextServer
 
 #endif // TOOLS_ENABLED
diff --git a/engine/tests/servers/test_triangle2.cpp b/engine/tests/servers/test_triangle2.h
similarity index 93%
rename from engine/tests/servers/test_triangle2.cpp
rename to engine/tests/servers/test_triangle2.h
index b422913d..ca3593e2 100644
--- a/engine/tests/servers/test_triangle2.cpp
+++ b/engine/tests/servers/test_triangle2.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_triangle2.cpp                                                    */
+/*  test_triangle2.h                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_triangle2)
-
-#include "modules/modules_enabled.gen.h" // For navigation 2D.
-
-#ifdef MODULE_NAVIGATION_2D_ENABLED
+#pragma once
 
 #include "modules/navigation_2d/triangle2.h"
 
-namespace TestTriangle2 {
+#include "tests/test_macros.h"
 
+namespace TestTriangle2 {
 TEST_SUITE("[Triangle2]") {
 	TEST_CASE("[Triangle2] Test get_area") {
 		const Vector2 p0(5.0, 5.0);
@@ -72,7 +67,4 @@ TEST_SUITE("[Triangle2]") {
 		CHECK(t.get_closest_point_to(p4).is_equal_approx(p4));
 	}
 }
-
 } // namespace TestTriangle2
-
-#endif // MODULE_NAVIGATION_2D_ENABLED
diff --git a/engine/tests/signal_watcher.cpp b/engine/tests/signal_watcher.cpp
deleted file mode 100644
index 802b9f5e..00000000
--- a/engine/tests/signal_watcher.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/**************************************************************************/
-/*  signal_watcher.cpp                                                    */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "signal_watcher.h"
-
-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
-
-void SignalWatcher::_add_signal_entry(const Array &p_args, const String &p_name) {
-	if (!_signals.has(p_name)) {
-		_signals[p_name] = Array();
-	}
-	_signals[p_name].push_back(p_args);
-}
-
-void SignalWatcher::_signal_callback_zero(const String &p_name) {
-	Array args;
-	_add_signal_entry(args, p_name);
-}
-
-void SignalWatcher::_signal_callback_one(Variant p_arg1, const String &p_name) {
-	Array args = { p_arg1 };
-	_add_signal_entry(args, p_name);
-}
-
-void SignalWatcher::_signal_callback_two(Variant p_arg1, Variant p_arg2, const String &p_name) {
-	Array args = { p_arg1, p_arg2 };
-	_add_signal_entry(args, p_name);
-}
-
-void SignalWatcher::_signal_callback_three(Variant p_arg1, Variant p_arg2, Variant p_arg3, const String &p_name) {
-	Array args = { p_arg1, p_arg2, p_arg3 };
-	_add_signal_entry(args, p_name);
-}
-
-void SignalWatcher::watch_signal(Object *p_object, const String &p_signal) {
-	MethodInfo method_info;
-	ClassDB::get_signal(p_object->get_class(), p_signal, &method_info);
-	switch (method_info.arguments.size()) {
-		case 0: {
-			p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_zero).bind(p_signal));
-		} break;
-		case 1: {
-			p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_one).bind(p_signal));
-		} break;
-		case 2: {
-			p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_two).bind(p_signal));
-		} break;
-		case 3: {
-			p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_three).bind(p_signal));
-		} break;
-		default: {
-			MESSAGE("Signal ", p_signal, " arg count not supported.");
-		} break;
-	}
-}
-
-void SignalWatcher::unwatch_signal(Object *p_object, const String &p_signal) {
-	MethodInfo method_info;
-	ClassDB::get_signal(p_object->get_class(), p_signal, &method_info);
-	switch (method_info.arguments.size()) {
-		case 0: {
-			p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_zero));
-		} break;
-		case 1: {
-			p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_one));
-		} break;
-		case 2: {
-			p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_two));
-		} break;
-		case 3: {
-			p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_three));
-		} break;
-		default: {
-			MESSAGE("Signal ", p_signal, " arg count not supported.");
-		} break;
-	}
-}
-
-bool SignalWatcher::check(const String &p_name, const Array &p_args) {
-	if (!_signals.has(p_name)) {
-		MESSAGE("Signal ", p_name, " not emitted");
-		return false;
-	}
-
-	if (p_args.size() != _signals[p_name].size()) {
-		MESSAGE("Signal has " << _signals[p_name] << " expected " << p_args);
-		discard_signal(p_name);
-		return false;
-	}
-
-	bool match = true;
-	for (int i = 0; i < p_args.size(); i++) {
-		if (((Array)p_args[i]).size() != ((Array)_signals[p_name][i]).size()) {
-			MESSAGE("Signal has " << _signals[p_name][i] << " expected " << p_args[i]);
-			match = false;
-			continue;
-		}
-
-		for (int j = 0; j < ((Array)p_args[i]).size(); j++) {
-			if (((Array)p_args[i])[j] != ((Array)_signals[p_name][i])[j]) {
-				MESSAGE("Signal has " << _signals[p_name][i] << " expected " << p_args[i]);
-				match = false;
-				break;
-			}
-		}
-	}
-
-	discard_signal(p_name);
-	return match;
-}
-
-bool SignalWatcher::check_false(const String &p_name) {
-	bool has = _signals.has(p_name);
-	if (has) {
-		MESSAGE("Signal has " << _signals[p_name] << " expected none.");
-	}
-	discard_signal(p_name);
-	return !has;
-}
-
-void SignalWatcher::discard_signal(const String &p_name) {
-	if (_signals.has(p_name)) {
-		_signals.erase(p_name);
-	}
-}
-
-void SignalWatcher::_clear_signals() {
-	_signals.clear();
-}
-
-SignalWatcher::SignalWatcher() {
-	ERR_FAIL_COND_MSG(singleton, "Singleton in SignalWatcher already exists.");
-	singleton = this;
-}
-
-SignalWatcher::~SignalWatcher() {
-	if (this == singleton) {
-		singleton = nullptr;
-	}
-}
diff --git a/engine/tests/signal_watcher.h b/engine/tests/signal_watcher.h
deleted file mode 100644
index 0b20b677..00000000
--- a/engine/tests/signal_watcher.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************/
-/*  signal_watcher.h                                                      */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#pragma once
-
-#include "core/object/object.h"
-#include "tests/test_macros.h"
-
-// Utility class / macros for testing signals
-//
-// Use SIGNAL_WATCH(*object, "signal_name") to start watching
-// Makes sure to call SIGNAL_UNWATCH(*object, "signal_name") to stop watching in cleanup, this is not done automatically.
-//
-// The SignalWatcher will capture all signals and their args sent between checks.
-//
-// Use SIGNAL_CHECK("signal_name"), Vector<Vector<Variant>>), to check the arguments of all fired signals.
-// The outer vector is each fired signal, the inner vector the list of arguments for that signal. Order does matter.
-//
-// Use SIGNAL_CHECK_FALSE("signal_name") to check if a signal was not fired.
-//
-// Use SIGNAL_DISCARD("signal_name") to discard records all of the given signal, use only in placed you don't need to check.
-//
-// All signals are automatically discarded between test/sub test cases.
-
-class SignalWatcher : public Object {
-	inline static SignalWatcher *singleton = nullptr;
-
-	HashMap<String, Array> _signals;
-
-	void _add_signal_entry(const Array &p_args, const String &p_name);
-	void _signal_callback_zero(const String &p_name);
-	void _signal_callback_one(Variant p_arg1, const String &p_name);
-	void _signal_callback_two(Variant p_arg1, Variant p_arg2, const String &p_name);
-	void _signal_callback_three(Variant p_arg1, Variant p_arg2, Variant p_arg3, const String &p_name);
-
-public:
-	static SignalWatcher *get_singleton() { return singleton; }
-
-	void watch_signal(Object *p_object, const String &p_signal);
-	void unwatch_signal(Object *p_object, const String &p_signal);
-	bool check(const String &p_name, const Array &p_args);
-	bool check_false(const String &p_name);
-	void discard_signal(const String &p_name);
-
-	void _clear_signals();
-
-	SignalWatcher();
-	~SignalWatcher();
-};
-
-#define SIGNAL_WATCH(m_object, m_signal) SignalWatcher::get_singleton()->watch_signal(m_object, m_signal);
-#define SIGNAL_UNWATCH(m_object, m_signal) SignalWatcher::get_singleton()->unwatch_signal(m_object, m_signal);
-
-#define SIGNAL_CHECK(m_signal, m_args) CHECK(SignalWatcher::get_singleton()->check(m_signal, m_args));
-#define SIGNAL_CHECK_FALSE(m_signal) CHECK(SignalWatcher::get_singleton()->check_false(m_signal));
-#define SIGNAL_DISCARD(m_signal) SignalWatcher::get_singleton()->discard_signal(m_signal);
diff --git a/engine/tests/test_builders.py b/engine/tests/test_builders.py
deleted file mode 100644
index 91f99691..00000000
--- a/engine/tests/test_builders.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""Functions used to generate source files during build time"""
-
-import re
-
-import methods
-
-RE_PATH_SPLIT = re.compile(r"[^/\\]+?(?=\.)")
-
-TEMPLATE = """\
-#ifndef _WIN32
-#define TEST_DLL_PRIVATE __attribute__((visibility("hidden")))
-#else
-#define TEST_DLL_PRIVATE
-#endif // _WIN32
-
-namespace ForceLink {{
-	TEST_DLL_PRIVATE void force_link_tests();
-	{TESTS_DECLARE}
-}} // namespace ForceLink
-
-void ForceLink::force_link_tests() {{
-	{TESTS_CALL}
-}}
-"""
-
-
-def force_link_builder(target, source, env):
-    names = [RE_PATH_SPLIT.search(str(path)).group() for path in source[0].read()]
-    declares = [f"TEST_DLL_PRIVATE void force_link_{name}();" for name in names]
-    calls = [f"force_link_{name}();" for name in names]
-
-    with methods.generated_wrapper(str(target[0])) as file:
-        file.write(
-            TEMPLATE.format(
-                TESTS_DECLARE="\n\t".join(declares),
-                TESTS_CALL="\n\t".join(calls),
-            )
-        )
diff --git a/engine/tests/test_macros.h b/engine/tests/test_macros.h
index 7fb9561e..5354fcb9 100644
--- a/engine/tests/test_macros.h
+++ b/engine/tests/test_macros.h
@@ -30,30 +30,16 @@
 
 #pragma once
 
-#include "core/core_globals.h" // IWYU pragma: keep. Used in macro.
+#include "display_server_mock.h"
+
+#include "core/core_globals.h"
+#include "core/input/input_map.h"
+#include "core/object/message_queue.h"
 #include "core/variant/variant.h"
 
-#if defined(_MSC_VER) && !defined(DOCTEST_THREAD_LOCAL)
-// NOTE: We must disable the THREAD_LOCAL entirely in doctest to prevent crashes on debugging.
-//  Since we link with /MT, thread_local is always expired when the header is used, so the
-//  debugger crashes the engine and it causes weird errors.
-// See: https://github.com/onqtam/doctest/issues/401
-#define DOCTEST_THREAD_LOCAL
-#endif
-
-#if !__cpp_exceptions && !__EXCEPTIONS && !defined(DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS)
-#define DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-#endif
-
 // See documentation for doctest at:
 // https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference
-#include <thirdparty/doctest/doctest.h>
-
-// Forces a test file to be linked.
-#define TEST_FORCE_LINK(m_name) \
-	namespace ForceLink { \
-	void force_link_##m_name() {} \
-	}
+#include "thirdparty/doctest/doctest.h"
 
 // The test is skipped with this, run pending tests with `--test --no-skip`.
 #define TEST_CASE_PENDING(name) TEST_CASE(name *doctest::skip())
@@ -79,22 +65,22 @@
 // Stringify all `Variant` compatible types for doctest output by default.
 // https://github.com/onqtam/doctest/blob/master/doc/markdown/stringification.md
 
-#define DOCTEST_STRINGIFY_VARIANT(m_type) \
-	template <> \
-	struct doctest::StringMaker<m_type> { \
+#define DOCTEST_STRINGIFY_VARIANT(m_type)                     \
+	template <>                                               \
+	struct doctest::StringMaker<m_type> {                     \
 		static doctest::String convert(const m_type &p_val) { \
-			const Variant val = p_val; \
+			const Variant val = p_val;                        \
 			return val.operator ::String().utf8().get_data(); \
-		} \
+		}                                                     \
 	};
 
-#define DOCTEST_STRINGIFY_VARIANT_POINTER(m_type) \
-	template <> \
-	struct doctest::StringMaker<m_type> { \
+#define DOCTEST_STRINGIFY_VARIANT_POINTER(m_type)             \
+	template <>                                               \
+	struct doctest::StringMaker<m_type> {                     \
 		static doctest::String convert(const m_type *p_val) { \
-			const Variant val = p_val; \
+			const Variant val = p_val;                        \
 			return val.operator ::String().utf8().get_data(); \
-		} \
+		}                                                     \
 	};
 
 DOCTEST_STRINGIFY_VARIANT(Variant);
@@ -145,73 +131,343 @@ typedef void (*TestFunc)();
 extern HashMap<String, TestFunc> *test_commands;
 int register_test_command(String p_command, TestFunc p_function);
 
-#define REGISTER_TEST_COMMAND(m_command, m_function) \
-	DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(GODOT_DOCTEST_ANON_VAR_), \
+#define REGISTER_TEST_COMMAND(m_command, m_function)                 \
+	DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), \
 			register_test_command(m_command, m_function))
 
+// Utility macros to send an event actions to a given object
+// Requires Message Queue and InputMap to be setup.
+// SEND_GUI_ACTION    - takes an input map key. e.g SEND_GUI_ACTION("ui_text_newline").
+// SEND_GUI_KEY_EVENT - takes a keycode set.   e.g SEND_GUI_KEY_EVENT(Key::A | KeyModifierMask::META).
+// SEND_GUI_KEY_UP_EVENT - takes a keycode set.   e.g SEND_GUI_KEY_UP_EVENT(Key::A | KeyModifierMask::META).
+// SEND_GUI_MOUSE_BUTTON_EVENT - takes a position, mouse button, mouse mask and modifiers e.g SEND_GUI_MOUSE_BUTTON_EVENT(Vector2(50, 50), MOUSE_BUTTON_NONE, MOUSE_BUTTON_NONE, Key::None);
+// SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT - takes a position, mouse button, mouse mask and modifiers e.g SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(Vector2(50, 50), MOUSE_BUTTON_NONE, MOUSE_BUTTON_NONE, Key::None);
+// SEND_GUI_MOUSE_MOTION_EVENT - takes a position, mouse mask and modifiers e.g SEND_GUI_MOUSE_MOTION_EVENT(Vector2(50, 50), MouseButtonMask::LEFT, KeyModifierMask::META);
+// SEND_GUI_DOUBLE_CLICK - takes a position and modifiers. e.g SEND_GUI_DOUBLE_CLICK(Vector2(50, 50), KeyModifierMask::META);
+
+#define _SEND_DISPLAYSERVER_EVENT(m_event) ((DisplayServerMock *)(DisplayServer::get_singleton()))->simulate_event(m_event);
+
+#define SEND_GUI_ACTION(m_action)                                                                     \
+	{                                                                                                 \
+		const List<Ref<InputEvent>> *events = InputMap::get_singleton()->action_get_events(m_action); \
+		const List<Ref<InputEvent>>::Element *first_event = events->front();                          \
+		Ref<InputEventKey> event = first_event->get()->duplicate();                                   \
+		event->set_pressed(true);                                                                     \
+		_SEND_DISPLAYSERVER_EVENT(event);                                                             \
+		MessageQueue::get_singleton()->flush();                                                       \
+	}
+
+#define SEND_GUI_KEY_EVENT(m_input)                                          \
+	{                                                                        \
+		Ref<InputEventKey> event = InputEventKey::create_reference(m_input); \
+		event->set_pressed(true);                                            \
+		_SEND_DISPLAYSERVER_EVENT(event);                                    \
+		MessageQueue::get_singleton()->flush();                              \
+	}
+
+#define SEND_GUI_KEY_UP_EVENT(m_input)                                       \
+	{                                                                        \
+		Ref<InputEventKey> event = InputEventKey::create_reference(m_input); \
+		event->set_pressed(false);                                           \
+		_SEND_DISPLAYSERVER_EVENT(event);                                    \
+		MessageQueue::get_singleton()->flush();                              \
+	}
+
+#define _UPDATE_EVENT_MODIFIERS(m_event, m_modifiers)                                  \
+	m_event->set_shift_pressed(((m_modifiers) & KeyModifierMask::SHIFT) != Key::NONE); \
+	m_event->set_alt_pressed(((m_modifiers) & KeyModifierMask::ALT) != Key::NONE);     \
+	m_event->set_ctrl_pressed(((m_modifiers) & KeyModifierMask::CTRL) != Key::NONE);   \
+	m_event->set_meta_pressed(((m_modifiers) & KeyModifierMask::META) != Key::NONE);
+
+#define _CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
+	Ref<InputEventMouseButton> event;                                       \
+	event.instantiate();                                                    \
+	event->set_position(m_screen_pos);                                      \
+	event->set_button_index(m_input);                                       \
+	event->set_button_mask(m_mask);                                         \
+	event->set_factor(1);                                                   \
+	_UPDATE_EVENT_MODIFIERS(event, m_modifiers);                            \
+	event->set_pressed(true);
+
+#define _CREATE_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double) \
+	Ref<InputEventScreenTouch> event;                              \
+	event.instantiate();                                           \
+	event->set_position(m_screen_pos);                             \
+	event->set_pressed(m_pressed);                                 \
+	event->set_double_tap(m_double);
+
+#define SEND_GUI_MOUSE_BUTTON_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
+	{                                                                           \
+		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers);    \
+		_SEND_DISPLAYSERVER_EVENT(event);                                       \
+		MessageQueue::get_singleton()->flush();                                 \
+	}
+
+#define SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(m_screen_pos, m_input, m_mask, m_modifiers) \
+	{                                                                                    \
+		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, m_input, m_mask, m_modifiers);             \
+		event->set_pressed(false);                                                       \
+		_SEND_DISPLAYSERVER_EVENT(event);                                                \
+		MessageQueue::get_singleton()->flush();                                          \
+	}
+
+#define SEND_GUI_DOUBLE_CLICK(m_screen_pos, m_modifiers)                                              \
+	{                                                                                                 \
+		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, MouseButton::LEFT, MouseButtonMask::NONE, m_modifiers); \
+		event->set_double_click(true);                                                                \
+		_SEND_DISPLAYSERVER_EVENT(event);                                                             \
+		MessageQueue::get_singleton()->flush();                                                       \
+	}
+
+// We toggle _print_error_enabled to prevent display server not supported warnings.
+#define SEND_GUI_MOUSE_MOTION_EVENT(m_screen_pos, m_mask, m_modifiers) \
+	{                                                                  \
+		bool errors_enabled = CoreGlobals::print_error_enabled;        \
+		CoreGlobals::print_error_enabled = false;                      \
+		Ref<InputEventMouseMotion> event;                              \
+		event.instantiate();                                           \
+		event->set_position(m_screen_pos);                             \
+		event->set_button_mask(m_mask);                                \
+		_UPDATE_EVENT_MODIFIERS(event, m_modifiers);                   \
+		_SEND_DISPLAYSERVER_EVENT(event);                              \
+		MessageQueue::get_singleton()->flush();                        \
+		CoreGlobals::print_error_enabled = errors_enabled;             \
+	}
+
+#define SEND_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double)    \
+	{                                                              \
+		_CREATE_GUI_TOUCH_EVENT(m_screen_pos, m_pressed, m_double) \
+		_SEND_DISPLAYSERVER_EVENT(event);                          \
+		MessageQueue::get_singleton()->flush();                    \
+	}
+
+// Utility class / macros for testing signals
+//
+// Use SIGNAL_WATCH(*object, "signal_name") to start watching
+// Makes sure to call SIGNAL_UNWATCH(*object, "signal_name") to stop watching in cleanup, this is not done automatically.
+//
+// The SignalWatcher will capture all signals and their args sent between checks.
+//
+// Use SIGNAL_CHECK("signal_name"), Vector<Vector<Variant>>), to check the arguments of all fired signals.
+// The outer vector is each fired signal, the inner vector the list of arguments for that signal. Order does matter.
+//
+// Use SIGNAL_CHECK_FALSE("signal_name") to check if a signal was not fired.
+//
+// Use SIGNAL_DISCARD("signal_name") to discard records all of the given signal, use only in placed you don't need to check.
+//
+// All signals are automatically discarded between test/sub test cases.
+
+class SignalWatcher : public Object {
+private:
+	inline static SignalWatcher *singleton;
+
+	/* Equal to: RBMap<String, Vector<Vector<Variant>>> */
+	HashMap<String, Array> _signals;
+	void _add_signal_entry(const Array &p_args, const String &p_name) {
+		if (!_signals.has(p_name)) {
+			_signals[p_name] = Array();
+		}
+		_signals[p_name].push_back(p_args);
+	}
+
+	void _signal_callback_zero(const String &p_name) {
+		Array args;
+		_add_signal_entry(args, p_name);
+	}
+
+	void _signal_callback_one(Variant p_arg1, const String &p_name) {
+		Array args = { p_arg1 };
+		_add_signal_entry(args, p_name);
+	}
+
+	void _signal_callback_two(Variant p_arg1, Variant p_arg2, const String &p_name) {
+		Array args = { p_arg1, p_arg2 };
+		_add_signal_entry(args, p_name);
+	}
+
+	void _signal_callback_three(Variant p_arg1, Variant p_arg2, Variant p_arg3, const String &p_name) {
+		Array args = { p_arg1, p_arg2, p_arg3 };
+		_add_signal_entry(args, p_name);
+	}
+
+public:
+	static SignalWatcher *get_singleton() { return singleton; }
+
+	void watch_signal(Object *p_object, const String &p_signal) {
+		MethodInfo method_info;
+		ClassDB::get_signal(p_object->get_class(), p_signal, &method_info);
+		switch (method_info.arguments.size()) {
+			case 0: {
+				p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_zero).bind(p_signal));
+			} break;
+			case 1: {
+				p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_one).bind(p_signal));
+			} break;
+			case 2: {
+				p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_two).bind(p_signal));
+			} break;
+			case 3: {
+				p_object->connect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_three).bind(p_signal));
+			} break;
+			default: {
+				MESSAGE("Signal ", p_signal, " arg count not supported.");
+			} break;
+		}
+	}
+
+	void unwatch_signal(Object *p_object, const String &p_signal) {
+		MethodInfo method_info;
+		ClassDB::get_signal(p_object->get_class(), p_signal, &method_info);
+		switch (method_info.arguments.size()) {
+			case 0: {
+				p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_zero));
+			} break;
+			case 1: {
+				p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_one));
+			} break;
+			case 2: {
+				p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_two));
+			} break;
+			case 3: {
+				p_object->disconnect(p_signal, callable_mp(this, &SignalWatcher::_signal_callback_three));
+			} break;
+			default: {
+				MESSAGE("Signal ", p_signal, " arg count not supported.");
+			} break;
+		}
+	}
+
+	bool check(const String &p_name, const Array &p_args) {
+		if (!_signals.has(p_name)) {
+			MESSAGE("Signal ", p_name, " not emitted");
+			return false;
+		}
+
+		if (p_args.size() != _signals[p_name].size()) {
+			MESSAGE("Signal has " << _signals[p_name] << " expected " << p_args);
+			discard_signal(p_name);
+			return false;
+		}
+
+		bool match = true;
+		for (int i = 0; i < p_args.size(); i++) {
+			if (((Array)p_args[i]).size() != ((Array)_signals[p_name][i]).size()) {
+				MESSAGE("Signal has " << _signals[p_name][i] << " expected " << p_args[i]);
+				match = false;
+				continue;
+			}
+
+			for (int j = 0; j < ((Array)p_args[i]).size(); j++) {
+				if (((Array)p_args[i])[j] != ((Array)_signals[p_name][i])[j]) {
+					MESSAGE("Signal has " << _signals[p_name][i] << " expected " << p_args[i]);
+					match = false;
+					break;
+				}
+			}
+		}
+
+		discard_signal(p_name);
+		return match;
+	}
+
+	bool check_false(const String &p_name) {
+		bool has = _signals.has(p_name);
+		if (has) {
+			MESSAGE("Signal has " << _signals[p_name] << " expected none.");
+		}
+		discard_signal(p_name);
+		return !has;
+	}
+
+	void discard_signal(const String &p_name) {
+		if (_signals.has(p_name)) {
+			_signals.erase(p_name);
+		}
+	}
+
+	void _clear_signals() {
+		_signals.clear();
+	}
+
+	SignalWatcher() {
+		singleton = this;
+	}
+
+	~SignalWatcher() {
+		singleton = nullptr;
+	}
+};
+
+#define SIGNAL_WATCH(m_object, m_signal) SignalWatcher::get_singleton()->watch_signal(m_object, m_signal);
+#define SIGNAL_UNWATCH(m_object, m_signal) SignalWatcher::get_singleton()->unwatch_signal(m_object, m_signal);
+
+#define SIGNAL_CHECK(m_signal, m_args) CHECK(SignalWatcher::get_singleton()->check(m_signal, m_args));
+#define SIGNAL_CHECK_FALSE(m_signal) CHECK(SignalWatcher::get_singleton()->check_false(m_signal));
+#define SIGNAL_DISCARD(m_signal) SignalWatcher::get_singleton()->discard_signal(m_signal);
+
 #define MULTICHECK_STRING_EQ(m_obj, m_func, m_param1, m_eq) \
-	CHECK(m_obj.m_func(m_param1) == m_eq); \
-	CHECK(m_obj.m_func(U##m_param1) == m_eq); \
-	CHECK(m_obj.m_func(L##m_param1) == m_eq); \
+	CHECK(m_obj.m_func(m_param1) == m_eq);                  \
+	CHECK(m_obj.m_func(U##m_param1) == m_eq);               \
+	CHECK(m_obj.m_func(L##m_param1) == m_eq);               \
 	CHECK(m_obj.m_func(String(m_param1)) == m_eq);
 
 #define MULTICHECK_STRING_INT_EQ(m_obj, m_func, m_param1, m_param2, m_eq) \
-	CHECK(m_obj.m_func(m_param1, m_param2) == m_eq); \
-	CHECK(m_obj.m_func(U##m_param1, m_param2) == m_eq); \
-	CHECK(m_obj.m_func(L##m_param1, m_param2) == m_eq); \
+	CHECK(m_obj.m_func(m_param1, m_param2) == m_eq);                      \
+	CHECK(m_obj.m_func(U##m_param1, m_param2) == m_eq);                   \
+	CHECK(m_obj.m_func(L##m_param1, m_param2) == m_eq);                   \
 	CHECK(m_obj.m_func(String(m_param1), m_param2) == m_eq);
 
 #define MULTICHECK_STRING_INT_INT_EQ(m_obj, m_func, m_param1, m_param2, m_param3, m_eq) \
-	CHECK(m_obj.m_func(m_param1, m_param2, m_param3) == m_eq); \
-	CHECK(m_obj.m_func(U##m_param1, m_param2, m_param3) == m_eq); \
-	CHECK(m_obj.m_func(L##m_param1, m_param2, m_param3) == m_eq); \
+	CHECK(m_obj.m_func(m_param1, m_param2, m_param3) == m_eq);                          \
+	CHECK(m_obj.m_func(U##m_param1, m_param2, m_param3) == m_eq);                       \
+	CHECK(m_obj.m_func(L##m_param1, m_param2, m_param3) == m_eq);                       \
 	CHECK(m_obj.m_func(String(m_param1), m_param2, m_param3) == m_eq);
 
 #define MULTICHECK_STRING_STRING_EQ(m_obj, m_func, m_param1, m_param2, m_eq) \
-	CHECK(m_obj.m_func(m_param1, m_param2) == m_eq); \
-	CHECK(m_obj.m_func(U##m_param1, U##m_param2) == m_eq); \
-	CHECK(m_obj.m_func(L##m_param1, L##m_param2) == m_eq); \
+	CHECK(m_obj.m_func(m_param1, m_param2) == m_eq);                         \
+	CHECK(m_obj.m_func(U##m_param1, U##m_param2) == m_eq);                   \
+	CHECK(m_obj.m_func(L##m_param1, L##m_param2) == m_eq);                   \
 	CHECK(m_obj.m_func(String(m_param1), String(m_param2)) == m_eq);
 
-#define MULTICHECK_GET_SLICE(m_obj, m_param1, m_slices) \
-	for (int i = 0; i < m_obj.get_slice_count(m_param1); ++i) { \
-		CHECK(m_obj.get_slice(m_param1, i) == m_slices[i]); \
-	} \
-	for (int i = 0; i < m_obj.get_slice_count(U##m_param1); ++i) { \
-		CHECK(m_obj.get_slice(U##m_param1, i) == m_slices[i]); \
-	} \
-	for (int i = 0; i < m_obj.get_slice_count(L##m_param1); ++i) { \
-		CHECK(m_obj.get_slice(L##m_param1, i) == m_slices[i]); \
-	} \
+#define MULTICHECK_GET_SLICE(m_obj, m_param1, m_slices)                 \
+	for (int i = 0; i < m_obj.get_slice_count(m_param1); ++i) {         \
+		CHECK(m_obj.get_slice(m_param1, i) == m_slices[i]);             \
+	}                                                                   \
+	for (int i = 0; i < m_obj.get_slice_count(U##m_param1); ++i) {      \
+		CHECK(m_obj.get_slice(U##m_param1, i) == m_slices[i]);          \
+	}                                                                   \
+	for (int i = 0; i < m_obj.get_slice_count(L##m_param1); ++i) {      \
+		CHECK(m_obj.get_slice(L##m_param1, i) == m_slices[i]);          \
+	}                                                                   \
 	for (int i = 0; i < m_obj.get_slice_count(String(m_param1)); ++i) { \
-		CHECK(m_obj.get_slice(String(m_param1), i) == m_slices[i]); \
+		CHECK(m_obj.get_slice(String(m_param1), i) == m_slices[i]);     \
 	}
 
 #define MULTICHECK_SPLIT(m_obj, m_func, m_param1, m_param2, m_param3, m_slices, m_expected_size) \
-	do { \
-		Vector<String> string_list; \
-\
-		string_list = m_obj.m_func(m_param1, m_param2, m_param3); \
-		CHECK(m_expected_size == string_list.size()); \
-		for (int i = 0; i < string_list.size(); ++i) { \
-			CHECK(string_list[i] == m_slices[i]); \
-		} \
-\
-		string_list = m_obj.m_func(U##m_param1, m_param2, m_param3); \
-		CHECK(m_expected_size == string_list.size()); \
-		for (int i = 0; i < string_list.size(); ++i) { \
-			CHECK(string_list[i] == m_slices[i]); \
-		} \
-\
-		string_list = m_obj.m_func(L##m_param1, m_param2, m_param3); \
-		CHECK(m_expected_size == string_list.size()); \
-		for (int i = 0; i < string_list.size(); ++i) { \
-			CHECK(string_list[i] == m_slices[i]); \
-		} \
-\
-		string_list = m_obj.m_func(String(m_param1), m_param2, m_param3); \
-		CHECK(m_expected_size == string_list.size()); \
-		for (int i = 0; i < string_list.size(); ++i) { \
-			CHECK(string_list[i] == m_slices[i]); \
-		} \
+	do {                                                                                         \
+		Vector<String> string_list;                                                              \
+                                                                                                 \
+		string_list = m_obj.m_func(m_param1, m_param2, m_param3);                                \
+		CHECK(m_expected_size == string_list.size());                                            \
+		for (int i = 0; i < string_list.size(); ++i) {                                           \
+			CHECK(string_list[i] == m_slices[i]);                                                \
+		}                                                                                        \
+                                                                                                 \
+		string_list = m_obj.m_func(U##m_param1, m_param2, m_param3);                             \
+		CHECK(m_expected_size == string_list.size());                                            \
+		for (int i = 0; i < string_list.size(); ++i) {                                           \
+			CHECK(string_list[i] == m_slices[i]);                                                \
+		}                                                                                        \
+                                                                                                 \
+		string_list = m_obj.m_func(L##m_param1, m_param2, m_param3);                             \
+		CHECK(m_expected_size == string_list.size());                                            \
+		for (int i = 0; i < string_list.size(); ++i) {                                           \
+			CHECK(string_list[i] == m_slices[i]);                                                \
+		}                                                                                        \
+                                                                                                 \
+		string_list = m_obj.m_func(String(m_param1), m_param2, m_param3);                        \
+		CHECK(m_expected_size == string_list.size());                                            \
+		for (int i = 0; i < string_list.size(); ++i) {                                           \
+			CHECK(string_list[i] == m_slices[i]);                                                \
+		}                                                                                        \
 	} while (false)
diff --git a/engine/tests/test_main.cpp b/engine/tests/test_main.cpp
index c29ea999..704c75fa 100644
--- a/engine/tests/test_main.cpp
+++ b/engine/tests/test_main.cpp
@@ -30,30 +30,190 @@
 
 #include "test_main.h"
 
-#include "core/config/engine.h"
-#include "core/input/input.h"
-#include "core/input/input_map.h"
+#include "core/error/error_macros.h"
 #include "core/io/dir_access.h"
-#include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
-#include "core/string/translation_server.h"
-#include "scene/main/scene_tree.h"
-#include "scene/main/window.h"
-#include "scene/theme/theme_db.h"
-#include "servers/audio/audio_server.h"
-#include "servers/display/accessibility_server.h"
-#include "servers/rendering/rendering_server.h"
-#include "tests/display_server_mock.h"
-#include "tests/force_link.gen.h"
-#include "tests/signal_watcher.h"
-#include "tests/test_macros.h"
-#include "tests/test_utils.h"
+#include "modules/modules_enabled.gen.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
 #endif // TOOLS_ENABLED
 
+#include "tests/core/config/test_project_settings.h"
+#include "tests/core/input/test_input_event.h"
+#include "tests/core/input/test_input_event_key.h"
+#include "tests/core/input/test_input_event_mouse.h"
+#include "tests/core/input/test_shortcut.h"
+#include "tests/core/io/test_config_file.h"
+#include "tests/core/io/test_file_access.h"
+#include "tests/core/io/test_http_client.h"
+#include "tests/core/io/test_image.h"
+#include "tests/core/io/test_ip.h"
+#include "tests/core/io/test_ip_address.h"
+#include "tests/core/io/test_json.h"
+#include "tests/core/io/test_json_native.h"
+#include "tests/core/io/test_logger.h"
+#include "tests/core/io/test_marshalls.h"
+#include "tests/core/io/test_packet_peer.h"
+#include "tests/core/io/test_pck_packer.h"
+#include "tests/core/io/test_resource.h"
+#include "tests/core/io/test_resource_uid.h"
+#include "tests/core/io/test_stream_peer.h"
+#include "tests/core/io/test_stream_peer_buffer.h"
+#include "tests/core/io/test_stream_peer_gzip.h"
+#include "tests/core/io/test_stream_peer_tcp.h"
+#include "tests/core/io/test_tcp_server.h"
+#include "tests/core/io/test_udp_server.h"
+#include "tests/core/io/test_uds_server.h"
+#include "tests/core/io/test_xml_parser.h"
+#include "tests/core/math/test_aabb.h"
+#include "tests/core/math/test_astar.h"
+#include "tests/core/math/test_basis.h"
+#include "tests/core/math/test_color.h"
+#include "tests/core/math/test_expression.h"
+#include "tests/core/math/test_geometry_2d.h"
+#include "tests/core/math/test_geometry_3d.h"
+#include "tests/core/math/test_math_funcs.h"
+#include "tests/core/math/test_plane.h"
+#include "tests/core/math/test_projection.h"
+#include "tests/core/math/test_quaternion.h"
+#include "tests/core/math/test_random_number_generator.h"
+#include "tests/core/math/test_rect2.h"
+#include "tests/core/math/test_rect2i.h"
+#include "tests/core/math/test_transform_2d.h"
+#include "tests/core/math/test_transform_3d.h"
+#include "tests/core/math/test_vector2.h"
+#include "tests/core/math/test_vector2i.h"
+#include "tests/core/math/test_vector3.h"
+#include "tests/core/math/test_vector3i.h"
+#include "tests/core/math/test_vector4.h"
+#include "tests/core/math/test_vector4i.h"
+#include "tests/core/object/test_class_db.h"
+#include "tests/core/object/test_method_bind.h"
+#include "tests/core/object/test_object.h"
+#include "tests/core/object/test_undo_redo.h"
+#include "tests/core/os/test_os.h"
+#include "tests/core/string/test_fuzzy_search.h"
+#include "tests/core/string/test_node_path.h"
+#include "tests/core/string/test_string.h"
+#include "tests/core/string/test_translation.h"
+#include "tests/core/string/test_translation_server.h"
+#include "tests/core/templates/test_a_hash_map.h"
+#include "tests/core/templates/test_command_queue.h"
+#include "tests/core/templates/test_fixed_vector.h"
+#include "tests/core/templates/test_hash_map.h"
+#include "tests/core/templates/test_hash_set.h"
+#include "tests/core/templates/test_list.h"
+#include "tests/core/templates/test_local_vector.h"
+#include "tests/core/templates/test_lru.h"
+#include "tests/core/templates/test_paged_array.h"
+#include "tests/core/templates/test_rid.h"
+#include "tests/core/templates/test_self_list.h"
+#include "tests/core/templates/test_span.h"
+#include "tests/core/templates/test_vector.h"
+#include "tests/core/templates/test_vset.h"
+#include "tests/core/test_crypto.h"
+#include "tests/core/test_hashing_context.h"
+#include "tests/core/test_time.h"
+#include "tests/core/threads/test_worker_thread_pool.h"
+#include "tests/core/variant/test_array.h"
+#include "tests/core/variant/test_callable.h"
+#include "tests/core/variant/test_dictionary.h"
+#include "tests/core/variant/test_variant.h"
+#include "tests/core/variant/test_variant_utility.h"
+#include "tests/scene/test_animation.h"
+#include "tests/scene/test_animation_blend_tree.h"
+#include "tests/scene/test_animation_player.h"
+#include "tests/scene/test_audio_stream_wav.h"
+#include "tests/scene/test_bit_map.h"
+#include "tests/scene/test_button.h"
+#include "tests/scene/test_camera_2d.h"
+#include "tests/scene/test_control.h"
+#include "tests/scene/test_curve.h"
+#include "tests/scene/test_curve_2d.h"
+#include "tests/scene/test_curve_3d.h"
+#include "tests/scene/test_fontfile.h"
+#include "tests/scene/test_gradient.h"
+#include "tests/scene/test_gradient_texture.h"
+#include "tests/scene/test_image_texture.h"
+#include "tests/scene/test_image_texture_3d.h"
+#include "tests/scene/test_instance_placeholder.h"
+#include "tests/scene/test_node.h"
+#include "tests/scene/test_node_2d.h"
+#include "tests/scene/test_packed_scene.h"
+#include "tests/scene/test_parallax_2d.h"
+#include "tests/scene/test_path_2d.h"
+#include "tests/scene/test_path_follow_2d.h"
+#include "tests/scene/test_sprite_2d.h"
+#include "tests/scene/test_sprite_frames.h"
+#include "tests/scene/test_style_box_texture.h"
+#include "tests/scene/test_texture_progress_bar.h"
+#include "tests/scene/test_theme.h"
+#include "tests/scene/test_timer.h"
+#include "tests/scene/test_viewport.h"
+#include "tests/scene/test_visual_shader.h"
+#include "tests/scene/test_window.h"
+#include "tests/servers/rendering/test_shader_preprocessor.h"
+#include "tests/servers/test_nav_heap.h"
+#include "tests/servers/test_text_server.h"
+#include "tests/test_validate_testing.h"
+
+#ifndef ADVANCED_GUI_DISABLED
+#include "tests/scene/test_code_edit.h"
+#include "tests/scene/test_color_picker.h"
+#include "tests/scene/test_graph_node.h"
+#include "tests/scene/test_option_button.h"
+#include "tests/scene/test_split_container.h"
+#include "tests/scene/test_tab_bar.h"
+#include "tests/scene/test_tab_container.h"
+#include "tests/scene/test_text_edit.h"
+#include "tests/scene/test_tree.h"
+#endif // ADVANCED_GUI_DISABLED
+
+#ifndef _3D_DISABLED
+#include "tests/core/math/test_triangle_mesh.h"
+#include "tests/scene/test_arraymesh.h"
+#include "tests/scene/test_camera_3d.h"
+#include "tests/scene/test_convert_transform_modifier_3d.h"
+#include "tests/scene/test_copy_transform_modifier_3d.h"
+#include "tests/scene/test_decal.h"
+#ifdef MODULE_GLTF_ENABLED
+#include "tests/scene/test_gltf_document.h"
+#endif
+#include "tests/scene/test_path_3d.h"
+#include "tests/scene/test_path_follow_3d.h"
+#include "tests/scene/test_primitives.h"
+#include "tests/scene/test_skeleton_3d.h"
+#include "tests/scene/test_sky.h"
+#endif // _3D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
+#include "tests/scene/test_height_map_shape_3d.h"
+#include "tests/scene/test_physics_material.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifdef MODULE_NAVIGATION_2D_ENABLED
+#include "tests/scene/test_navigation_agent_2d.h"
+#include "tests/scene/test_navigation_obstacle_2d.h"
+#include "tests/scene/test_navigation_region_2d.h"
+#include "tests/servers/test_navigation_server_2d.h"
+#include "tests/servers/test_triangle2.h"
+#endif // MODULE_NAVIGATION_2D_ENABLED
+
+#ifdef MODULE_NAVIGATION_3D_ENABLED
+#include "tests/scene/test_navigation_agent_3d.h"
+#include "tests/scene/test_navigation_obstacle_3d.h"
+#include "tests/scene/test_navigation_region_3d.h"
+#include "tests/servers/test_navigation_server_3d.h"
+#endif // MODULE_NAVIGATION_3D_ENABLED
+
+#include "modules/modules_tests.gen.h"
+
+#include "tests/display_server_mock.h"
+#include "tests/test_macros.h"
+
+#include "scene/theme/theme_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_2d/navigation_server_2d.h"
 #endif // NAVIGATION_2D_DISABLED
@@ -70,11 +230,9 @@
 #include "servers/physics_3d/physics_server_3d_dummy.h"
 #endif // PHYSICS_3D_DISABLED
 
-#include "modules/modules_tests.gen.h" // IWYU pragma: keep // TODO: Migrate module tests to compilation files.
+#include "servers/rendering/rendering_server_default.h"
 
 int test_main(int argc, char *argv[]) {
-	ForceLink::force_link_tests();
-
 	bool run_tests = true;
 
 	// Convert arguments to Godot's command-line.
@@ -174,25 +332,22 @@ struct GodotTestCaseListener : public doctest::IReporter {
 		String suite_name = String(p_in.m_test_suite);
 
 		if (name.contains("[SceneTree]") || name.contains("[Editor]")) {
+			memnew(MessageQueue);
+
 			memnew(Input);
 			Input::get_singleton()->set_use_accumulated_input(false);
 
 			Error err = OK;
 			OS::get_singleton()->set_has_server_feature_callback(nullptr);
-
-			for (int i = 0; i < AccessibilityServer::get_create_function_count(); i++) {
-				if (String("dummy") == AccessibilityServer::get_create_function_name(i)) {
-					AccessibilityServer::create(i, err);
-					break;
-				}
-			}
-
 			for (int i = 0; i < DisplayServer::get_create_function_count(); i++) {
 				if (String("mock") == DisplayServer::get_create_function_name(i)) {
-					DisplayServer::create(i, "", DisplayServerEnums::WindowMode::WINDOW_MODE_MINIMIZED, DisplayServerEnums::VSyncMode::VSYNC_ENABLED, 0, nullptr, Vector2i(0, 0), DisplayServerEnums::SCREEN_PRIMARY, DisplayServerEnums::CONTEXT_EDITOR, 0, err);
+					DisplayServer::create(i, "", DisplayServer::WindowMode::WINDOW_MODE_MINIMIZED, DisplayServer::VSyncMode::VSYNC_ENABLED, 0, nullptr, Vector2i(0, 0), DisplayServer::SCREEN_PRIMARY, DisplayServer::CONTEXT_EDITOR, 0, err);
 					break;
 				}
 			}
+			memnew(RenderingServerDefault());
+			RenderingServerDefault::get_singleton()->init();
+			RenderingServerDefault::get_singleton()->set_render_loop_enabled(false);
 
 			// ThemeDB requires RenderingServer to initialize the default theme.
 			// So we have to do this for each test case. Also make sure there is
@@ -230,7 +385,7 @@ struct GodotTestCaseListener : public doctest::IReporter {
 
 			memnew(SceneTree);
 			SceneTree::get_singleton()->initialize();
-			if (!DisplayServer::get_singleton()->has_feature(DisplayServerEnums::FEATURE_SUBWINDOWS)) {
+			if (!DisplayServer::get_singleton()->has_feature(DisplayServer::Feature::FEATURE_SUBWINDOWS)) {
 				SceneTree::get_singleton()->get_root()->set_embedding_subwindows(true);
 			}
 
@@ -335,11 +490,14 @@ struct GodotTestCaseListener : public doctest::IReporter {
 		}
 
 		if (RenderingServer::get_singleton()) {
+			// ThemeDB requires RenderingServer to finalize the default theme.
+			// So we have to do this for each test case.
 			ThemeDB::get_singleton()->finalize_theme();
-		}
 
-		if (AccessibilityServer::get_singleton()) {
-			memdelete(AccessibilityServer::get_singleton());
+			RenderingServer::get_singleton()->sync();
+			RenderingServer::get_singleton()->global_shader_parameters_clear();
+			RenderingServer::get_singleton()->finish();
+			memdelete(RenderingServer::get_singleton());
 		}
 
 		if (DisplayServer::get_singleton()) {
@@ -350,6 +508,11 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			memdelete(InputMap::get_singleton());
 		}
 
+		if (MessageQueue::get_singleton()) {
+			MessageQueue::get_singleton()->flush();
+			memdelete(MessageQueue::get_singleton());
+		}
+
 		if (AudioServer::get_singleton()) {
 			AudioServer::get_singleton()->finish();
 			memdelete(AudioServer::get_singleton());
diff --git a/engine/tests/test_tools.h b/engine/tests/test_tools.h
index 49b51c79..ff0191d4 100644
--- a/engine/tests/test_tools.h
+++ b/engine/tests/test_tools.h
@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "core/error/error_macros.h"
-
 struct ErrorDetector {
 	ErrorDetector() {
 		eh.errfunc = _detect_error;
diff --git a/engine/tests/test_utils.cpp b/engine/tests/test_utils.cpp
index cbf15875..9d41e740 100644
--- a/engine/tests/test_utils.cpp
+++ b/engine/tests/test_utils.cpp
@@ -30,7 +30,6 @@
 
 #include "tests/test_utils.h"
 
-#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
 
@@ -48,7 +47,3 @@ String TestUtils::get_temp_path(const String &p_suffix) {
 	DirAccess::make_dir_absolute(temp_base); // Ensure the directory exists.
 	return temp_base.path_join(p_suffix);
 }
-
-String &TestProjectSettingsInternalsAccessor::resource_path() {
-	return ProjectSettings::get_singleton()->resource_path;
-}
diff --git a/engine/tests/test_utils.h b/engine/tests/test_utils.h
index 169a16ca..5b3be371 100644
--- a/engine/tests/test_utils.h
+++ b/engine/tests/test_utils.h
@@ -38,11 +38,3 @@ String get_data_path(const String &p_file);
 String get_executable_dir();
 String get_temp_path(const String &p_suffix);
 } // namespace TestUtils
-
-// FIXME: This was originally constrained to `tests/core/config/test_project_settings.h`, but that
-//  file is no longer a header. Some other tests relied on the ability to override the resource
-//  path, so relocating the accessor is the least-intrusive workaround.
-class TestProjectSettingsInternalsAccessor {
-public:
-	static String &resource_path();
-};
diff --git a/engine/tests/core/test_validate_testing.cpp b/engine/tests/test_validate_testing.h
similarity index 96%
rename from engine/tests/core/test_validate_testing.cpp
rename to engine/tests/test_validate_testing.h
index f8b36e58..f5df3990 100644
--- a/engine/tests/core/test_validate_testing.cpp
+++ b/engine/tests/test_validate_testing.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  test_validate_testing.cpp                                             */
+/*  test_validate_testing.h                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tests/test_macros.h"
-
-TEST_FORCE_LINK(test_validate_testing)
+#pragma once
 
 #include "core/core_globals.h"
-#include "core/object/object.h"
-#include "tests/test_tools.h"
+#include "core/os/os.h"
 
-namespace TestValidateTesting {
+#include "tests/test_macros.h"
+#include "tests/test_tools.h"
 
 TEST_SUITE("Validate tests") {
 	TEST_CASE("Always pass") {
@@ -202,5 +200,3 @@ TEST_SUITE("Validate tests") {
 		REQUIRE(ed.has_error);
 	}
 }
-
-} // namespace TestValidateTesting
diff --git a/engine/thirdparty/README.md b/engine/thirdparty/README.md
index 2075c091..db534c7c 100644
--- a/engine/thirdparty/README.md
+++ b/engine/thirdparty/README.md
@@ -153,7 +153,7 @@ Patches:
 ## d3d12ma
 
 - Upstream: https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator
-- Version: 3.1.0 (0fa62ed3a0a69b73230a8ec1faa752d4061c8dc8, 2026)
+- Version: 2.1.0-development (4d16e802e0b9451c9d3c27cd308928c13b73acd6, 2023)
 - License: MIT
 
 Files extracted from upstream source:
@@ -170,7 +170,7 @@ Patches:
 ## directx_headers
 
 - Upstream: https://github.com/microsoft/DirectX-Headers
-- Version: main (25411c74bb9cc7c416b2ff01b3ad8a306811dfdd, 2025)
+- Version: 1.618.2 (dde59d560da2760fec612d6634124edc2a26b82f, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -299,19 +299,19 @@ Patches:
   * License: OFL-1.1
 - `NotoSansBengali*.woff2`:
   * Upstream: https://github.com/notofonts/bengali
-  * Version: 3.011 (85d80394cbbbb798ca0a41c983902e6cf77be3a3, 2026)
+  * Version: 2.003 (020a5701f6fc6a363d5eccbae45e37714c0ad686, 2022)
   * License: OFL-1.1
 - `NotoSansDevanagari*.woff2`:
   * Upstream: https://github.com/notofonts/devanagari
-  * Version: 2.006 (bb8d2566a1708ef2dcc6396ee2eb261a18967f76, 2024)
+  * Version: 2.004 (f8f27e49da0ec9e5e38ecf3628671f05b24dd955, 2023)
   * License: OFL-1.1
 - `NotoSansGeorgian*.woff2`:
   * Upstream: https://github.com/notofonts/georgian
-  * Version: 2.005 (c02e5483c2dd63c5cf223845010ebd6e6dc56aec, 2024)
+  * Version: 2.002 (243ec9aa1d4ec58cc42120d30faac1a102fbfeb9, 2022)
   * License: OFL-1.1
 - `NotoSansHebrew*.woff2`:
   * Upstream: https://github.com/notofonts/hebrew
-  * Version: 3.001 (caa7ab0614fb5b37cc003d9bf3d7d3e765331110, 2024)
+  * Version: 2.003 (caa7ab0614fb5b37cc003d9bf3d7d3e765331110, 2022)
   * License: OFL-1.1
 - `NotoSansMalayalam*.woff2`:
   * Upstream: https://github.com/notofonts/malayalam
@@ -319,11 +319,11 @@ Patches:
   * License: OFL-1.1
 - `NotoSansOriya*.woff2`:
   * Upstream: https://github.com/notofonts/oriya
-  * Version: 2.006 (97abab82ec512f8a4a98c389352f194a03385ce2, 2024)
+  * Version: 2.005 (9377f242b247df12d0bf4cecd93b9c4b18036fbd, 2023)
   * License: OFL-1.1
 - `NotoSansSinhala*.woff2`:
   * Upstream: https://github.com/notofonts/sinhala
-  * Version: 3.000 (032355e96de5bac83fd996535af3d13b1fbfeccf, 2025)
+  * Version: 2.006 (66e5a2ed9797e575222d6e7c5b3710c7bf68be79, 2022)
   * License: OFL-1.1
 - `NotoSansTamil*.woff2`:
   * Upstream: https://github.com/notofonts/tamil
@@ -331,11 +331,11 @@ Patches:
   * License: OFL-1.1
 - `NotoSansTelugu*.woff2`:
   * Upstream: https://github.com/notofonts/telugu
-  * Version: 2.005 (e97c3409a8347d68cccd06a82a68b418c315ee0c, 2023)
+  * Version: 2.004 (68a6a8170cba5b2e9b45029ef36994961e8f614c, 2023)
   * License: OFL-1.1
 - `NotoSansThai*.woff2`:
   * Upstream: https://github.com/notofonts/thai
-  * Version: 2.002 (f8b482c158650260bba5d5edba9da3e8bb7185b4, 2023)
+  * Version: 2.001 (09af528011390f35abf15cf86068dae208f512c4, 2022)
   * License: OFL-1.1
 - `OpenSans_SemiBold.woff2`:
   * Upstream: https://github.com/googlefonts/opensans
@@ -368,21 +368,6 @@ Files extracted from upstream source:
 - `LICENSE.TXT` and `docs/FTL.TXT`
 
 
-## gamepadmotionhelpers
-
-- Upstream: https://github.com/JibbSmart/GamepadMotionHelpers
-- Version: 39b578aacf34c3a1c584d8f7f194adc776f88055, 2023
-- License: MIT
-
-Files extracted from upstream source:
-
-- `GamepadMotion.hpp`
-- `LICENSE.TXT`
-
-Patches:
-
-- `0001-fix-warnings.patch` ([GH-111679](https://github.com/godotengine/godot/pull/111679))
-
 ## glad
 
 - Upstream: https://github.com/Dav1dde/glad
@@ -413,7 +398,7 @@ Patches:
 ## glslang
 
 - Upstream: https://github.com/KhronosGroup/glslang
-- Version: vulkan-sdk-1.4.335.0 (b5782e52ee2f7b3e40bb9c80d15b47016e008bc9, 2025)
+- Version: vulkan-sdk-1.3.283.0 (e8dd0b6903b34f1879520b444634c75ea2deedf5, 2024)
 - License: glslang
 
 Version should be kept in sync with the one of the used Vulkan SDK (see `vulkan`
@@ -424,8 +409,6 @@ Files extracted from upstream source:
 - `glslang/` folder (except the `glslang/HLSL` and `glslang/ExtensionHeaders`
   subfolders), `SPIRV/` folder
   * Remove C interface code: `CInterface/` folders, files matching `"*_c[_\.]*"`
-  * Remove `glslang/stub.cpp`
-  * Remove `SPIRV/spirv.hpp11` (should use copy from `thirdparty/spirv-headers`)
 - Run `cmake . && make` and copy generated `include/glslang/build_info.h`
   to `glslang/build_info.h`
 - `LICENSE.txt`
@@ -434,7 +417,7 @@ Files extracted from upstream source:
 Patches:
 
 - `0001-apple-disable-absolute-paths.patch` ([GH-92010](https://github.com/godotengine/godot/pull/92010))
-- `0002-apple-m1-msaa-fix.patch` ([GH-115893](https://github.com/godotengine/godot/issues/115893))
+- `0002-gcc15-include-fix.patch` ([GH-102022](https://github.com/godotengine/godot/pull/102022))
 
 
 ## graphite
@@ -468,7 +451,7 @@ Patches:
 ## harfbuzz
 
 - Upstream: https://github.com/harfbuzz/harfbuzz
-- Version: 13.1.1 (70b812d8d2fb4a2b6386c04bfd8565a0fcc05f9b, 2026)
+- Version: 12.2.0 (0426759f2b03e479495e987608f10e0866e70180, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -510,7 +493,7 @@ Files generated from upstream source:
 ## jolt_physics
 
 - Upstream: https://github.com/jrouwe/JoltPhysics
-- Version: 5.5.0 (23dadd0e603f1b321142d4c74df07fce85064989, 2025)
+- Version: 5.4.0 (036ea7b1d717b3e713ac9d8cbd47118fb9cd5d60, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -520,11 +503,13 @@ Files extracted from upstream source:
 
 Patches:
 
-- `0001-backport-upstream-commit-ee3725250.patch` (GH-115089)
-- `0002-backport-upstream-commit-bc7f1fb8c.patch` (GH-115305)
-- `0003-backport-upstream-commit-365a15367.patch` (GH-115305)
-- `0004-backport-upstream-commit-e0a6a9a16.patch` (GH-115327)
-- `0005-backport-upstream-commit-449b645.patch` (GH-117194)
+- `0001-backport-upstream-commit-b385bc3d7.patch` ([GH-111087](https://github.com/godotengine/godot/pull/111087))
+- `0002-backport-upstream-commit-ccfe0a0df.patch` ([GH-111408](https://github.com/godotengine/godot/pull/111408))
+- `0003-backport-upstream-commit-9e48d59be.patch` ([GH-111767](https://github.com/godotengine/godot/pull/111767))
+- `0004-backport-upstream-commit-ee3725250.patch` ([GH-115089](https://github.com/godotengine/godot/pull/115089))
+- `0005-backport-upstream-commit-bc7f1fb8c.patch` ([GH-115305](https://github.com/godotengine/godot/pull/115305))
+- `0006-backport-upstream-commit-365a15367.patch` ([GH-115305](https://github.com/godotengine/godot/pull/115305))
+- `0007-backport-upstream-commit-e0a6a9a16.patch` ([GH-115327](https://github.com/godotengine/godot/pull/115327))
 
 
 ## libbacktrace
@@ -561,7 +546,6 @@ Files extracted from upstream source:
 Patches:
 
 - `0001-cmake-generated-headers.patch` ([GH-104347](https://github.com/godotengine/godot/pull/104347))
-  * Compare with CMake-generated headers to bump version and added potential new config values.
 - `0002-disable-16bitlossless.patch` ([GH-104347](https://github.com/godotengine/godot/pull/104347))
 - `0003-remove-bmp-ppm-support.patch` ([GH-104347](https://github.com/godotengine/godot/pull/104347))
 
@@ -703,18 +687,6 @@ Patches:
 - `0001-msvc-2019-psa-redeclaration.patch` ([GH-90535](https://github.com/godotengine/godot/pull/90535))
 
 
-## metal-cpp
-
-- Upstream: https://developer.apple.com/metal/cpp/
-- Version: 26.0 (2025)
-- License: Apache 2.0
-
-Update instructions:
-
-- Download latest metal-cpp ZIP from https://developer.apple.com/metal/cpp/:
-- Run `update-metal-cpp.sh <path to the downloaded zip>` to extract the relevant files and apply patches.
-
-
 ## meshoptimizer
 
 - Upstream: https://github.com/zeux/meshoptimizer
@@ -1015,18 +987,17 @@ Patches:
 - `0004-errno-include.patch` ([GH-108354](https://github.com/godotengine/godot/pull/108354))
 - `0005-fix-libudev-dbus.patch` ([GH-108373](https://github.com/godotengine/godot/pull/108373))
 - `0006-fix-cs-environ.patch` ([GH-109283](https://github.com/godotengine/godot/pull/109283))
-- `0007-shield-duplicate-macos.patch` ([GH-115510](https://github.com/godotengine/godot/pull/115510))
 
 
 ## spirv-cross
 
 - Upstream: https://github.com/KhronosGroup/SPIRV-Cross
-- Version: git (fb0c1a307cca4b4a9d891837bf4c44d17fe2d324, 2025)
+- Version: git (d7440cbc6c50332600fdf21c45e6a5df0b07e54c, 2025)
 - License: Apache 2.0
 
 Files extracted from upstream source:
 
-- All `.cpp`, `.hpp` and `.h` files, minus `main.cpp`, `spirv.h*`, `spirv_cross_c.*`, `spirv_hlsl.*`, `spirv_cpp.*`
+- All `.cpp`, `.hpp` and `.h` files, minus `main.cpp`, `spirv_cross_c.*`, `spirv_hlsl.*`, `spirv_cpp.*`
 - `include/` folder
 - `LICENSE` and `LICENSES/` folder, minus `CC-BY-4.0.txt`
 
@@ -1037,19 +1008,17 @@ to generate Metal source from Vulkan SPIR-V.
 ## spirv-headers
 
 - Upstream: https://github.com/KhronosGroup/SPIRV-Headers
-- Version: vulkan-sdk-1.4.335.0 (b824a462d4256d720bebb40e78b9eb8f78bbb305, 2025)
-- License: MIT
+- Version: vulkan-sdk-1.4.328.1 (01e0577914a75a2569c846778c2f93aa8e6feddd, 2025)
 
 Files extracted from upstream source:
-
-- `include/spirv/unified1/spirv.{h,hpp,hpp11}` with the same folder structure
-- `LICENSE` (edited to keep only relevant license)
+- `include/spirv/unified1` folder with only `spirv.h` and `spirv.hpp`
+- `LICENSE`
 
 
 ## spirv-reflect
 
 - Upstream: https://github.com/KhronosGroup/SPIRV-Reflect
-- Version: vulkan-sdk-1.4.335.0 (ef913b3ab3da1becca3cf46b15a10667c67bebe5, 2025)
+- Version: vulkan-sdk-1.3.283.0 (ee5b57fba6a986381f998567761bbc064428e645, 2024)
 - License: Apache 2.0
 
 Version should be kept in sync with the one of the used Vulkan SDK (see `vulkan`
@@ -1058,12 +1027,14 @@ section).
 Files extracted from upstream source:
 
 - `spirv_reflect.h`, `spirv_reflect.c`
+- `include/` folder
 - `LICENSE`
 
 Patches:
 
-- `0001-zero-size-for-sc-sized-arrays.patch` ([GH-94985](https://github.com/godotengine/godot/pull/94985))
-- `0002-spirv-headers.patch` ([GH-111452](https://github.com/godotengine/godot/pull/111452))
+- `0001-specialization-constants.patch` ([GH-50325](https://github.com/godotengine/godot/pull/50325))
+- `0002-zero-size-for-sc-sized-arrays.patch` ([GH-94985](https://github.com/godotengine/godot/pull/94985))
+- `0003-spirv-headers.patch` ([GH-111452](https://github.com/godotengine/godot/pull/111452))
 
 
 ## swappy-frame-pacing
@@ -1082,7 +1053,7 @@ Files extracted from upstream source:
 ## thorvg
 
 - Upstream: https://github.com/thorvg/thorvg
-- Version: 1.0.3 (d114cd9e3c32d7f77bc9b324ae5c71d7775cb7ae, 2026)
+- Version: 0.15.16 (e15069de7afcc5e853edf1561e69d9b8383e2c6c, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -1092,7 +1063,9 @@ Files extracted from upstream source:
 
 Patches:
 
-- `0001-let-delete-be-delete.patch` ([GH-116024](https://github.com/godotengine/godot/pull/116024))
+- `0001-revert-tvglines-bezier-precision.patch` ([GH-96658](https://github.com/godotengine/godot/pull/96658))
+- `0002-use-heap-alloc.patch` ([GH-109530](https://github.com/godotengine/godot/pull/109530))
+- `0003-explicit-includes.patch` ([GH-111557](https://github.com/godotengine/godot/pull/111557))
 
 
 ## tinyexr
@@ -1113,7 +1086,7 @@ Patches:
 ## ufbx
 
 - Upstream: https://github.com/ufbx/ufbx
-- Version: 0.21.2 (6ecd6177af59c82ec363356ac36c3a4245b85321, 2025)
+- Version: 0.20.0 (a63ff0a47485328880b3300e7bcdf01413343a45, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -1146,7 +1119,7 @@ Patches:
 ## volk
 
 - Upstream: https://github.com/zeux/volk
-- Version: vulkan-sdk-1.4.335.0 (4f3bcee79618a9abe79f4c717c50379197c77512, 2025)
+- Version: vulkan-sdk-1.3.283.0 (3a8068a57417940cf2bf9d837a7bb60d015ca2f1, 2024)
 - License: MIT
 
 Version should be kept in sync with the one of the used Vulkan SDK (see `vulkan`
@@ -1161,7 +1134,7 @@ Files extracted from upstream source:
 ## vulkan
 
 - Upstream: https://github.com/KhronosGroup/Vulkan-Headers
-- Version: vulkan-sdk-1.4.335.0 (2fa203425eb4af9dfc6b03f97ef72b0b5bcb8350, 2025)
+- Version: vulkan-sdk-1.3.283.0 (eaa319dade959cb61ed2229c8ea42e307cc8f8b3, 2024)
 - License: Apache 2.0
 
 Unless there is a specific reason to package a more recent version, please stick
@@ -1170,8 +1143,6 @@ to tagged SDK releases. All Vulkan libraries and headers should be kept in sync
 - Update Vulkan SDK components to the matching tag (see "vulkan")
 - Update volk (see "volk")
 - Update glslang (see "glslang")
-- Update spirv-headers (see "spriv-headers")
-- Update spirv-cross (see "spirv-cross")
 - Update spirv-reflect (see "spirv-reflect")
 
 Files extracted from upstream source:
@@ -1183,7 +1154,7 @@ Files extracted from upstream source:
 SDK release: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/blob/main/include/vulkan/vk_enum_string_helper.h
 
 `vk_mem_alloc.h` is taken from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-Version: 3.3.0 (1d8f600fd424278486eade7ed3e877c99f0846b1, 2025)
+Version: 3.1.0 (009ecd192c1289c7529bff248a16cfe896254816, 2024)
 `vk_mem_alloc.cpp` is a Godot file and should be preserved on updates.
 
 Patches:
@@ -1208,7 +1179,7 @@ Files extracted from upstream source:
 # wayland-protocols
 
 - Upstream: https://gitlab.freedesktop.org/wayland/wayland-protocols
-- Version: 1.47 (88223018d1b578d0d8869866da66d9608e05f928, 2025)
+- Version: 1.46 (6141e1154303dadd5c3e480bc4a16e26f1dcb2af, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -1219,15 +1190,11 @@ Files extracted from upstream source:
 - `stable/viewporter/viewporter.xml`
 - `stable/xdg-shell/README`
 - `stable/xdg-shell/xdg-shell.xml`
-- `staging/color-management/README.md`
-- `staging/color-management/color-management-v1.xml`
 - `staging/fractional-scale/README`
 - `staging/fractional-scale/fractional-scale-v1.xml`
 - `staging/xdg-activation/README`
 - `staging/xdg-activation/xdg-activation-v1.xml`
 - `staging/xdg-system-bell/xdg-system-bell-v1.xml`
-- `staging/pointer-warp/pointer-warp-v1.xml`
-- `staging/pointer-warp/README`
 - `unstable/idle-inhibit/README`
 - `unstable/idle-inhibit/idle-inhibit-unstable-v1.xml`
 - `unstable/pointer-constraints/README`
diff --git a/engine/thirdparty/d3d12ma/D3D12MemAlloc.cpp b/engine/thirdparty/d3d12ma/D3D12MemAlloc.cpp
index 29791070..89b71ffe 100644
--- a/engine/thirdparty/d3d12ma/D3D12MemAlloc.cpp
+++ b/engine/thirdparty/d3d12ma/D3D12MemAlloc.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -49,14 +49,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef _D3D12MA_CONFIGURATION
 
-#if !defined(D3D12MA_CPP20)
-    #if __cplusplus >= 202002L || _MSVC_LANG >= 202002L // C++20
-        #define D3D12MA_CPP20 1
-    #else
-        #define D3D12MA_CPP20 0
-    #endif
-#endif
-
 #ifdef _WIN32
     #if !defined(WINVER) || WINVER < 0x0600
         #error Required at least WinAPI version supporting: client = Windows Vista, server = Windows Server 2008.
@@ -79,10 +71,6 @@
     #define D3D12MA_ASSERT(cond) assert(cond)
 #endif
 
-#if D3D12MA_CPP20
-    #include <bit>
-#endif
-
 // Assert that will be called very often, like inside data structures e.g. operator[].
 // Making it non-empty can make program slow.
 #ifndef D3D12MA_HEAVY_ASSERT
@@ -93,14 +81,6 @@
     #endif
 #endif
 
-#ifndef D3D12MA_DEFAULT_ALIGNMENT
-    /*
-    Default alignment of allocations in default pools and custom pools with MinAllocationAlignment == 0.
-    Can be lowered for custom pools by specifying custom MinAllocationAlignment > 0.
-    */
-    #define D3D12MA_DEFAULT_ALIGNMENT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT
-#endif
-
 #ifndef D3D12MA_DEBUG_ALIGNMENT
     /*
     Minimum alignment of all allocations, in bytes.
@@ -134,14 +114,6 @@ especially to test compatibility with D3D12_RESOURCE_HEAP_TIER_1 on modern GPUs.
    #define D3D12MA_DEFAULT_BLOCK_SIZE (64ull * 1024 * 1024)
 #endif
 
-#ifndef D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    #if D3D12_SDK_VERSION >= 618
-        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 1
-    #else
-        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 0
-    #endif
-#endif
-
 #ifndef D3D12MA_OPTIONS16_SUPPORTED
     #if D3D12_SDK_VERSION >= 610
         #define D3D12MA_OPTIONS16_SUPPORTED 1
@@ -202,7 +174,6 @@ static const D3D12_HEAP_FLAGS RESOURCE_CLASS_HEAP_FLAGS =
 static const D3D12_RESIDENCY_PRIORITY D3D12_RESIDENCY_PRIORITY_NONE = D3D12_RESIDENCY_PRIORITY(0);
 
 static const D3D12_HEAP_TYPE D3D12_HEAP_TYPE_GPU_UPLOAD_COPY = (D3D12_HEAP_TYPE)5;
-static const D3D12_RESOURCE_FLAGS D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY = (D3D12_RESOURCE_FLAGS)0x400;
 
 #ifndef _D3D12MA_ENUM_DECLARATIONS
 
@@ -332,10 +303,6 @@ static UINT8 BitScanLSB(UINT64 mask)
     if (_BitScanForward64(&pos, mask))
         return static_cast<UINT8>(pos);
     return UINT8_MAX;
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return static_cast<uint8_t>(std::countr_zero(mask));
-    return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
     return static_cast<UINT8>(__builtin_ffsll(mask)) - 1U;
 #else
@@ -358,10 +325,6 @@ static UINT8 BitScanLSB(UINT32 mask)
     if (_BitScanForward(&pos, mask))
         return static_cast<UINT8>(pos);
     return UINT8_MAX;
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return static_cast<uint8_t>(std::countr_zero(mask));
-    return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
     return static_cast<UINT8>(__builtin_ffs(mask)) - 1U;
 #else
@@ -384,9 +347,6 @@ static UINT8 BitScanMSB(UINT64 mask)
     unsigned long pos;
     if (_BitScanReverse64(&pos, mask))
         return static_cast<UINT8>(pos);
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return 63 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
     if (mask)
         return 63 - static_cast<UINT8>(__builtin_clzll(mask));
@@ -409,9 +369,6 @@ static UINT8 BitScanMSB(UINT32 mask)
     unsigned long pos;
     if (_BitScanReverse(&pos, mask))
         return static_cast<UINT8>(pos);
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return 31 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
     if (mask)
         return 31 - static_cast<UINT8>(__builtin_clz(mask));
@@ -804,9 +761,11 @@ static bool ValidateAllocateMemoryParameters(
     return pAllocDesc &&
         pAllocInfo &&
         ppAllocation &&
-        IsPow2(pAllocInfo->Alignment) &&
-        pAllocInfo->SizeInBytes > 0 &&
-        pAllocInfo->SizeInBytes % 4 == 0;
+        (pAllocInfo->Alignment == 0 ||
+            pAllocInfo->Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT ||
+            pAllocInfo->Alignment == D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) &&
+        pAllocInfo->SizeInBytes != 0 &&
+        pAllocInfo->SizeInBytes % (64ull * 1024) == 0;
 }
 
 #endif // _D3D12MA_FUNCTIONS
@@ -3034,7 +2993,7 @@ void BlockMetadata::DebugLogAllocation(UINT64 offset, UINT64 size, void* private
         LPCWSTR name = allocation->GetName();
 
         D3D12MA_DEBUG_LOG(L"UNFREED ALLOCATION; Offset: %llu; Size: %llu; PrivateData: %p; Name: %s",
-            offset, size, privateData, name ? name : L"");
+            offset, size, privateData, name ? name : L"D3D12MA_Empty");
     }
 }
 
@@ -5421,8 +5380,8 @@ struct CREATE_RESOURCE_PARAMS
 {
     CREATE_RESOURCE_PARAMS() = delete;
     CREATE_RESOURCE_PARAMS(
-        const D3D12_RESOURCE_DESC* pResourceDesc,
-        D3D12_RESOURCE_STATES InitialResourceState,
+        const D3D12_RESOURCE_DESC* pResourceDesc, 
+        D3D12_RESOURCE_STATES InitialResourceState, 
         const D3D12_CLEAR_VALUE* pOptimizedClearValue)
         : Variant(VARIANT_WITH_STATE)
         , pResourceDesc(pResourceDesc)
@@ -5432,8 +5391,8 @@ struct CREATE_RESOURCE_PARAMS
     }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     CREATE_RESOURCE_PARAMS(
-        const D3D12_RESOURCE_DESC1* pResourceDesc,
-        D3D12_RESOURCE_STATES InitialResourceState,
+        const D3D12_RESOURCE_DESC1* pResourceDesc, 
+        D3D12_RESOURCE_STATES InitialResourceState, 
         const D3D12_CLEAR_VALUE* pOptimizedClearValue)
         : Variant(VARIANT_WITH_STATE_AND_DESC1)
         , pResourceDesc1(pResourceDesc)
@@ -5448,7 +5407,7 @@ struct CREATE_RESOURCE_PARAMS
         D3D12_BARRIER_LAYOUT InitialLayout,
         const D3D12_CLEAR_VALUE* pOptimizedClearValue,
         UINT32 NumCastableFormats,
-        const DXGI_FORMAT* pCastableFormats)
+        DXGI_FORMAT* pCastableFormats)
         : Variant(VARIANT_WITH_LAYOUT)
         , pResourceDesc1(pResourceDesc)
         , InitialLayout(InitialLayout)
@@ -5518,7 +5477,7 @@ struct CREATE_RESOURCE_PARAMS
         D3D12MA_ASSERT(Variant >= VARIANT_WITH_LAYOUT);
         return NumCastableFormats;
     }
-    const DXGI_FORMAT* GetCastableFormats() const
+    DXGI_FORMAT* GetCastableFormats() const
     {
         D3D12MA_ASSERT(Variant >= VARIANT_WITH_LAYOUT);
         return pCastableFormats;
@@ -5543,7 +5502,7 @@ private:
     const D3D12_CLEAR_VALUE* pOptimizedClearValue;
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     UINT32 NumCastableFormats;
-    const DXGI_FORMAT* pCastableFormats;
+    DXGI_FORMAT* pCastableFormats;
 #endif
 };
 
@@ -5593,7 +5552,6 @@ public:
         UINT64 size,
         UINT64 alignment,
         const ALLOCATION_DESC& allocDesc,
-        bool committedAllowed,
         size_t allocationCount,
         Allocation** pAllocations);
 
@@ -5604,7 +5562,6 @@ public:
         UINT64 alignment,
         const ALLOCATION_DESC& allocDesc,
         const CREATE_RESOURCE_PARAMS& createParams,
-        bool committedAllowed,
         Allocation** ppAllocation,
         REFIID riidResource,
         void** ppvResource);
@@ -5655,7 +5612,6 @@ private:
         UINT64 size,
         UINT64 alignment,
         const ALLOCATION_DESC& allocDesc,
-        bool committedAllowed,
         Allocation** pAllocation);
 
     HRESULT AllocateFromBlock(
@@ -5761,31 +5717,29 @@ HRESULT CurrentBudgetData::UpdateBudget(IDXGIAdapter3* adapter3, bool useMutex)
     DXGI_QUERY_VIDEO_MEMORY_INFO infoLocal = {};
     DXGI_QUERY_VIDEO_MEMORY_INFO infoNonLocal = {};
     const HRESULT hrLocal = adapter3->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &infoLocal);
-    if (FAILED(hrLocal))
-    {
-        return hrLocal;
-    }
     const HRESULT hrNonLocal = adapter3->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &infoNonLocal);
-    if (FAILED(hrNonLocal))
-    {
-        return hrNonLocal;
-    }
 
+    if (SUCCEEDED(hrLocal) || SUCCEEDED(hrNonLocal))
     {
         MutexLockWrite lockWrite(m_BudgetMutex, useMutex);
 
-        m_D3D12Usage[0] = infoLocal.CurrentUsage;
-        m_D3D12Budget[0] = infoLocal.Budget;
-
-        m_D3D12Usage[1] = infoNonLocal.CurrentUsage;
-        m_D3D12Budget[1] = infoNonLocal.Budget;
+        if (SUCCEEDED(hrLocal))
+        {
+            m_D3D12Usage[0] = infoLocal.CurrentUsage;
+            m_D3D12Budget[0] = infoLocal.Budget;
+        }
+        if (SUCCEEDED(hrNonLocal))
+        {
+            m_D3D12Usage[1] = infoNonLocal.CurrentUsage;
+            m_D3D12Budget[1] = infoNonLocal.Budget;
+        }
 
         m_BlockBytesAtD3D12Fetch[0] = m_BlockBytes[0];
         m_BlockBytesAtD3D12Fetch[1] = m_BlockBytes[1];
         m_OperationsSinceBudgetFetch = 0;
     }
 
-    return S_OK;
+    return FAILED(hrLocal) ? hrLocal : hrNonLocal;
 }
 #endif // #if D3D12MA_DXGI_1_4
 
@@ -5961,12 +5915,6 @@ public:
 #endif
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     ID3D12Device8* GetDevice8() const { return m_Device8; }
-#endif
-#ifdef __ID3D12Device10_INTERFACE_DEFINED__
-    ID3D12Device10* GetDevice10() const { return m_Device10; }
-#endif
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    ID3D12Device12* GetDevice12() const { return m_Device12; }
 #endif
     // Shortcut for "Allocation Callbacks", because this function is called so often.
     const ALLOCATION_CALLBACKS& GetAllocs() const { return m_AllocationCallbacks; }
@@ -5975,8 +5923,6 @@ public:
     BOOL IsCacheCoherentUMA() const { return m_D3D12Architecture.CacheCoherentUMA; }
     bool SupportsResourceHeapTier2() const { return m_D3D12Options.ResourceHeapTier >= D3D12_RESOURCE_HEAP_TIER_2; }
     bool IsGPUUploadHeapSupported() const { return m_GPUUploadHeapSupported != FALSE; }
-    bool IsTightAlignmentSupported() const { return m_TightAlignmentSupported != FALSE; }
-    bool IsTightAlignmentEnabled() const { return IsTightAlignmentSupported() && m_UseTightAlignment; }
     bool UseMutex() const { return m_UseMutex; }
     AllocationObjectAllocator& GetAllocationObjectAllocator() { return m_AllocationObjectAllocator; }
     UINT GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
@@ -6063,8 +6009,7 @@ private:
     const bool m_UseMutex;
     const bool m_AlwaysCommitted;
     const bool m_MsaaAlwaysCommitted;
-    bool m_PreferSmallBuffersCommitted;
-    const bool m_UseTightAlignment;
+    const bool m_PreferSmallBuffersCommitted;
     bool m_DefaultPoolsNotZeroed = false;
     ID3D12Device* m_Device; // AddRef
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
@@ -6078,9 +6023,6 @@ private:
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     ID3D12Device10* m_Device10 = NULL;  // AddRef, optional
-#endif
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    ID3D12Device12* m_Device12 = NULL;  // AddRef, optional
 #endif
     IDXGIAdapter* m_Adapter; // AddRef
 #if D3D12MA_DXGI_1_4
@@ -6092,7 +6034,6 @@ private:
     DXGI_ADAPTER_DESC m_AdapterDesc;
     D3D12_FEATURE_DATA_D3D12_OPTIONS m_D3D12Options;
     BOOL m_GPUUploadHeapSupported = FALSE;
-    BOOL m_TightAlignmentSupported = FALSE;
     D3D12_FEATURE_DATA_ARCHITECTURE m_D3D12Architecture;
     AllocationObjectAllocator m_AllocationObjectAllocator;
 
@@ -6142,26 +6083,12 @@ private:
     HRESULT UpdateD3D12Budget();
     
     D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC& resourceDesc) const;
-    HRESULT GetResourceAllocationInfoMiddle(D3D12_RESOURCE_DESC& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
-
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo2Native(const D3D12_RESOURCE_DESC1& resourceDesc) const;
-    HRESULT GetResourceAllocationInfoMiddle(D3D12_RESOURCE_DESC1& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
-#endif
-
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo3Native(const D3D12_RESOURCE_DESC1& resourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats) const;
+    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC1& resourceDesc) const;
 #endif
 
     template<typename D3D12_RESOURCE_DESC_T>
-    HRESULT GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
+    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc) const;
 
     bool NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size);
 
@@ -6174,8 +6101,7 @@ AllocatorPimpl::AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks,
     : m_UseMutex((desc.Flags & ALLOCATOR_FLAG_SINGLETHREADED) == 0),
     m_AlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_ALWAYS_COMMITTED) != 0),
     m_MsaaAlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0),
-    m_PreferSmallBuffersCommitted((desc.Flags& ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
-    m_UseTightAlignment((desc.Flags & ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT) == 0),
+    m_PreferSmallBuffersCommitted((desc.Flags & ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
     m_Device(desc.pDevice),
     m_Adapter(desc.pAdapter),
     m_PreferredBlockSize(desc.PreferredBlockSize != 0 ? desc.PreferredBlockSize : D3D12MA_DEFAULT_BLOCK_SIZE),
@@ -6234,10 +6160,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
     m_Device->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Device10));
 #endif
 
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    m_Device->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Device12));
-#endif
-
     HRESULT hr = m_Adapter->GetDesc(&m_AdapterDesc);
     if (FAILED(hr))
     {
@@ -6264,25 +6186,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
     }
 #endif // #if D3D12MA_OPTIONS16_SUPPORTED
 
-#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    {
-        D3D12_FEATURE_DATA_TIGHT_ALIGNMENT tightAlignment = {};
-        hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_TIGHT_ALIGNMENT, &tightAlignment, sizeof(tightAlignment));
-        if (SUCCEEDED(hr))
-        {
-            m_TightAlignmentSupported = tightAlignment.SupportTier >= D3D12_TIGHT_ALIGNMENT_TIER_1;
-            
-            // If tight alignment is supported (checked by the code above) and wasn't disabled by the developer
-            // (with ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT), disable the preference for creating small buffers as committed,
-            // as if ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED was specified.
-            if (IsTightAlignmentEnabled())
-            {
-                m_PreferSmallBuffersCommitted = false;
-            }
-        }
-    }
-#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-
     hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &m_D3D12Architecture, sizeof(m_D3D12Architecture));
     if (FAILED(hr))
     {
@@ -6312,7 +6215,7 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
             0, // minBlockCount
             SIZE_MAX, // maxBlockCount
             false, // explicitBlockSize
-            (UINT64)D3D12MA_DEFAULT_ALIGNMENT, // minAllocationAlignment
+            D3D12MA_DEBUG_ALIGNMENT, // minAllocationAlignment
             0, // Default algorithm,
             m_MsaaAlwaysCommitted,
             NULL, // pProtectedSession
@@ -6329,9 +6232,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
 
 AllocatorPimpl::~AllocatorPimpl()
 {
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    SAFE_RELEASE(m_Device12);
-#endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     SAFE_RELEASE(m_Device10);
 #endif
@@ -6428,15 +6328,12 @@ HRESULT AllocatorPimpl::CreatePlacedResourceWrap(
         {
             return E_NOINTERFACE;
         }
-        // Microsoft defined pCastableFormats parameter as pointer to non-const and only fixed it in later Agility SDK,
-        // thus we need const_cast.
         return m_Device10->CreatePlacedResource2(pHeap, HeapOffset,
             createParams.GetResourceDesc1(), createParams.GetInitialLayout(),
             createParams.GetOptimizedClearValue(), createParams.GetNumCastableFormats(),
-            const_cast<DXGI_FORMAT*>(createParams.GetCastableFormats()), riidResource, ppvResource);
-    }
+            createParams.GetCastableFormats(), riidResource, ppvResource);
+    } else
 #endif
-
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
     {
@@ -6447,20 +6344,22 @@ HRESULT AllocatorPimpl::CreatePlacedResourceWrap(
         return m_Device8->CreatePlacedResource1(pHeap, HeapOffset,
             createParams.GetResourceDesc1(), createParams.GetInitialResourceState(),
             createParams.GetOptimizedClearValue(), riidResource, ppvResource);
-    }
+    } else 
 #endif
-
     if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE)
     {
         return m_Device->CreatePlacedResource(pHeap, HeapOffset,
             createParams.GetResourceDesc(), createParams.GetInitialResourceState(),
             createParams.GetOptimizedClearValue(), riidResource, ppvResource);
     }
-
-    D3D12MA_ASSERT(0);
-    return E_INVALIDARG;
+    else
+    {
+        D3D12MA_ASSERT(0);
+        return E_INVALIDARG;
+    }
 }
 
+
 HRESULT AllocatorPimpl::CreateResource(
     const ALLOCATION_DESC* pAllocDesc,
     const CREATE_RESOURCE_PARAMS& createParams,
@@ -6476,7 +6375,6 @@ HRESULT AllocatorPimpl::CreateResource(
         *ppvResource = NULL;
     }
 
-    HRESULT hr = E_NOINTERFACE;
     CREATE_RESOURCE_PARAMS finalCreateParams = createParams;
     D3D12_RESOURCE_DESC finalResourceDesc;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
@@ -6487,49 +6385,45 @@ HRESULT AllocatorPimpl::CreateResource(
     {
         finalResourceDesc = *createParams.GetResourceDesc();
         finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc);
     }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
     {
-        if (m_Device8 != NULL)
+        if (!m_Device8)
         {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
+            return E_NOINTERFACE;
         }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
     }
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_LAYOUT)
     {
-        if (m_Device10 != NULL)
+        if (!m_Device10)
         {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
+            return E_NOINTERFACE;
         }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
     }
 #endif
     else
     {
         D3D12MA_ASSERT(0);
-        hr = E_INVALIDARG;
+        return E_INVALIDARG;
     }
-
-    if (FAILED(hr))
-        return hr;
-
     D3D12MA_ASSERT(IsPow2(resAllocInfo.Alignment));
-    // We've seen UINT64_MAX returned when the call to GetResourceAllocationInfo was invalid.
-    D3D12MA_ASSERT(resAllocInfo.SizeInBytes != UINT64_MAX);
     D3D12MA_ASSERT(resAllocInfo.SizeInBytes > 0);
 
     BlockVector* blockVector = NULL;
     CommittedAllocationParameters committedAllocationParams = {};
     bool preferCommitted = false;
     
+    HRESULT hr;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     if (createParams.Variant >= CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
     {
@@ -6560,7 +6454,7 @@ HRESULT AllocatorPimpl::CreateResource(
     if (blockVector != NULL)
     {
         hr = blockVector->CreateResource(resAllocInfo.SizeInBytes, resAllocInfo.Alignment,
-            *pAllocDesc, finalCreateParams, committedAllocationParams.IsValid(),
+            *pAllocDesc, finalCreateParams,
             ppAllocation, riidResource, ppvResource);
         if (SUCCEEDED(hr))
             return hr;
@@ -6603,7 +6497,7 @@ HRESULT AllocatorPimpl::AllocateMemory(
     if (blockVector != NULL)
     {
         hr = blockVector->Allocate(pAllocInfo->SizeInBytes, pAllocInfo->Alignment,
-            *pAllocDesc, committedAllocationParams.IsValid(), 1, (Allocation**)ppAllocation);
+            *pAllocDesc, 1, (Allocation**)ppAllocation);
         if (SUCCEEDED(hr))
             return hr;
     }
@@ -6625,7 +6519,6 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
 {
     *ppvResource = NULL;
 
-    HRESULT hr = E_NOINTERFACE;
     CREATE_RESOURCE_PARAMS finalCreateParams = createParams;
     D3D12_RESOURCE_DESC finalResourceDesc;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
@@ -6636,40 +6529,37 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
     {
         finalResourceDesc = *createParams.GetResourceDesc();
         finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc);
     }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
     {
-        if (m_Device8 != NULL)
+        if (!m_Device8)
         {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
+            return E_NOINTERFACE;
         }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
     }
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_LAYOUT)
     {
-        if (m_Device10 != NULL)
+        if (!m_Device10)
         {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
+            return E_NOINTERFACE;
         }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
     }
 #endif
     else
     {
         D3D12MA_ASSERT(0);
-        hr = E_INVALIDARG;
+        return E_INVALIDARG;
     }
-
-    if (FAILED(hr))
-        return hr;
-
     D3D12MA_ASSERT(IsPow2(resAllocInfo.Alignment));
     D3D12MA_ASSERT(resAllocInfo.SizeInBytes > 0);
 
@@ -6892,41 +6782,42 @@ void AllocatorPimpl::GetBudget(Budget* outLocalBudget, Budget* outNonLocalBudget
                 outLocalBudget ? &outLocalBudget->BudgetBytes : NULL,
                 outNonLocalBudget ? &outNonLocalBudget->UsageBytes : NULL,
                 outNonLocalBudget ? &outNonLocalBudget->BudgetBytes : NULL);
-            return;
         }
-
-        if (SUCCEEDED(UpdateD3D12Budget()))
+        else
         {
-            GetBudget(outLocalBudget, outNonLocalBudget); // Recursion.
-            return;
+            UpdateD3D12Budget();
+            GetBudget(outLocalBudget, outNonLocalBudget); // Recursion
         }
     }
+    else
 #endif
-
-    // Fallback path - manual calculation, not real budget.
-    if (outLocalBudget)
     {
-        outLocalBudget->UsageBytes = outLocalBudget->Stats.BlockBytes;
-        outLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY) * 8 / 10; // 80% heuristics.
-    }
-    if (outNonLocalBudget)
-    {
-        outNonLocalBudget->UsageBytes = outNonLocalBudget->Stats.BlockBytes;
-        outNonLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        if (outLocalBudget)
+        {
+            outLocalBudget->UsageBytes = outLocalBudget->Stats.BlockBytes;
+            outLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        }
+        if (outNonLocalBudget)
+        {
+            outNonLocalBudget->UsageBytes = outNonLocalBudget->Stats.BlockBytes;
+            outNonLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        }
     }
 }
 
 void AllocatorPimpl::GetBudgetForHeapType(Budget& outBudget, D3D12_HEAP_TYPE heapType)
 {
-    const bool isLocal = StandardHeapTypeToMemorySegmentGroup(heapType) ==
-        DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY;
-    if (isLocal)
+    switch (heapType)
     {
+    case D3D12_HEAP_TYPE_DEFAULT:
+    case D3D12_HEAP_TYPE_GPU_UPLOAD_COPY:
         GetBudget(&outBudget, NULL);
-    }
-    else
-    {
+        break;
+    case D3D12_HEAP_TYPE_UPLOAD:
+    case D3D12_HEAP_TYPE_READBACK:
         GetBudget(NULL, &outBudget);
+        break;
+    default: D3D12MA_ASSERT(0);
     }
 }
 
@@ -6979,9 +6870,6 @@ void AllocatorPimpl::BuildStatsString(WCHAR** ppStatsString, BOOL detailedMap)
 
                 json.WriteString(L"GPUUploadHeapSupported");
                 json.WriteBool(m_GPUUploadHeapSupported != FALSE);
-
-                json.WriteString(L"TightAlignmentSupported");
-                json.WriteBool(m_TightAlignmentSupported != FALSE);
             }
             json.EndObject();
         }
@@ -7369,15 +7257,12 @@ HRESULT AllocatorPimpl::AllocateCommittedResource(
         {
             return E_NOINTERFACE;
         }
-
-        // Microsoft defined pCastableFormats parameter as pointer to non-const and only fixed it in later Agility SDK,
-        // thus we need const_cast.
         hr = m_Device10->CreateCommittedResource3(
                 &committedAllocParams.m_HeapProperties,
                 committedAllocParams.m_HeapFlags & ~RESOURCE_CLASS_HEAP_FLAGS,
                 createParams.GetResourceDesc1(), createParams.GetInitialLayout(),
                 createParams.GetOptimizedClearValue(), committedAllocParams.m_ProtectedSession,
-                createParams.GetNumCastableFormats(), const_cast<DXGI_FORMAT*>(createParams.GetCastableFormats()),
+                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(),
                 D3D12MA_IID_PPV_ARGS(&res));
     } else
 #endif
@@ -7717,7 +7602,7 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(c
 }
 
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo2Native(const D3D12_RESOURCE_DESC1& resourceDesc) const
+D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC1& resourceDesc) const
 {
     D3D12MA_ASSERT(m_Device8 != NULL);
     D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
@@ -7733,91 +7618,12 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo2Native(
 }
 #endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__
 
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo3Native(const D3D12_RESOURCE_DESC1& resourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats) const
-{
-    D3D12MA_ASSERT(m_Device12 != NULL);
-    D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
-
-    // This is how new D3D12 headers define GetResourceAllocationInfo function -
-    // different signature depending on these macros.
-#if defined(_MSC_VER) || !defined(_WIN32)
-    return m_Device12->GetResourceAllocationInfo3(0, 1, &resourceDesc,
-        &NumCastableFormats, &pCastableFormats, &info1Unused);
-#else
-    D3D12_RESOURCE_ALLOCATION_INFO retVal;
-    return *m_Device12->GetResourceAllocationInfo3(&retVal, 0, 1, &resourceDesc,
-        &NumCastableFormats, &pCastableFormats, &info1Unused);
-#endif
-}
-#endif // #ifdef __ID3D12Device12_INTERFACE_DEFINED__
-
-HRESULT AllocatorPimpl::GetResourceAllocationInfoMiddle(
-    D3D12_RESOURCE_DESC& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
-{
-    if (NumCastableFormats > 0)
-    {
-        return E_NOTIMPL;
-    }
-    
-    outAllocInfo = GetResourceAllocationInfoNative(inOutResourceDesc);
-    return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-}
-
-#ifdef __ID3D12Device8_INTERFACE_DEFINED__
-
-HRESULT AllocatorPimpl::GetResourceAllocationInfoMiddle(
-    D3D12_RESOURCE_DESC1& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
-{
-    if (NumCastableFormats > 0)
-    {
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-        if (m_Device12 != NULL)
-        {
-            outAllocInfo = GetResourceAllocationInfo3Native(inOutResourceDesc, NumCastableFormats, pCastableFormats);
-            return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-        }
-#else
-        return E_NOTIMPL;
-#endif
-    }
-
-    outAllocInfo = GetResourceAllocationInfo2Native(inOutResourceDesc);
-    return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-}
-
-#endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-
 template<typename D3D12_RESOURCE_DESC_T>
-HRESULT AllocatorPimpl::GetResourceAllocationInfo(
-    D3D12_RESOURCE_DESC_T& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
+D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc) const
 {
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
-
-#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    if (IsTightAlignmentEnabled())
-    {
-        // Don't allow USE_TIGHT_ALIGNMENT together with ALLOW_CROSS_ADAPTER as there is a D3D Debug Layer error:
-        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT will be ignored since D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER is set. [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
-        // Also don't allow it together with D3D12_TEXTURE_LAYOUT_64KB_*_SWIZZLE, as there is this error (see issue #86):
-        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT is not valid when the layout is either D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE or D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE (...). [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
-        if((inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER) == 0
-            && (inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE && inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE))
-        {
-            inOutResourceDesc.Flags |= D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT;
-        }
-    }
-#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-
-    /* Optional optimization: Microsoft documentation of the ID3D12Device::
-    GetResourceAllocationInfo function says:
+    /* Optional optimization: Microsoft documentation says:
+    https://docs.microsoft.com/en-us/windows/win32/api/d3d12/nf-d3d12-id3d12device-getresourceallocationinfo
 
     Your application can forgo using GetResourceAllocationInfo for buffer resources
     (D3D12_RESOURCE_DIMENSION_BUFFER). Buffers have the same size on all adapters,
@@ -7825,25 +7631,17 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
     D3D12_RESOURCE_DESC::Width.
     */
     if (inOutResourceDesc.Alignment == 0 &&
-        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
-        !IsTightAlignmentEnabled())
+        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
     {
-        outAllocInfo = {
+        return {
             AlignUp<UINT64>(inOutResourceDesc.Width, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT), // SizeInBytes
             D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT }; // Alignment
-        return S_OK;
     }
-
 #endif // #ifdef __ID3D12Device1_INTERFACE_DEFINED__
 
-    HRESULT hr = S_OK;
-
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT
     if (inOutResourceDesc.Alignment == 0 &&
-        (inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY) == 0 &&
-        (inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE1D ||
-            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D ||
-            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) &&
+        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
         (inOutResourceDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) == 0
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT == 1
         && CanUseSmallAlignment(inOutResourceDesc)
@@ -7858,19 +7656,17 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
             D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT :
             D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT;
         inOutResourceDesc.Alignment = smallAlignmentToTry;
-        hr = GetResourceAllocationInfoMiddle(
-            inOutResourceDesc, NumCastableFormats, pCastableFormats, outAllocInfo);
+        const D3D12_RESOURCE_ALLOCATION_INFO smallAllocInfo = GetResourceAllocationInfoNative(inOutResourceDesc);
         // Check if alignment requested has been granted.
-        if (SUCCEEDED(hr) && outAllocInfo.Alignment == smallAlignmentToTry)
+        if (smallAllocInfo.Alignment == smallAlignmentToTry)
         {
-            return S_OK;
+            return smallAllocInfo;
         }
         inOutResourceDesc.Alignment = 0; // Restore original
     }
 #endif // #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT
 
-    return GetResourceAllocationInfoMiddle(
-        inOutResourceDesc, NumCastableFormats, pCastableFormats, outAllocInfo);
+    return GetResourceAllocationInfoNative(inOutResourceDesc);
 }
 
 bool AllocatorPimpl::NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size)
@@ -8151,7 +7947,7 @@ BlockVector::BlockVector(
     m_MinBlockCount(minBlockCount),
     m_MaxBlockCount(maxBlockCount),
     m_ExplicitBlockSize(explicitBlockSize),
-    m_MinAllocationAlignment(D3D12MA_MAX(minAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT)),
+    m_MinAllocationAlignment(minAllocationAlignment),
     m_Algorithm(algorithm),
     m_DenyMsaaTextures(denyMsaaTextures),
     m_ProtectedSession(pProtectedSession),
@@ -8191,7 +7987,6 @@ HRESULT BlockVector::Allocate(
     UINT64 size,
     UINT64 alignment,
     const ALLOCATION_DESC& allocDesc,
-    bool committedAllowed,
     size_t allocationCount,
     Allocation** pAllocations)
 {
@@ -8206,7 +8001,6 @@ HRESULT BlockVector::Allocate(
                 size,
                 alignment,
                 allocDesc,
-                committedAllowed,
                 pAllocations + allocIndex);
             if (FAILED(hr))
             {
@@ -8295,43 +8089,40 @@ HRESULT BlockVector::CreateResource(
     UINT64 alignment,
     const ALLOCATION_DESC& allocDesc,
     const CREATE_RESOURCE_PARAMS& createParams,
-    bool committedAllowed,
     Allocation** ppAllocation,
     REFIID riidResource,
     void** ppvResource)
 {
-    HRESULT hr = Allocate(size, alignment, allocDesc, committedAllowed, 1, ppAllocation);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    ID3D12Resource* res = NULL;
-    hr = m_hAllocator->CreatePlacedResourceWrap(
-        (*ppAllocation)->m_Placed.block->GetHeap(),
-        (*ppAllocation)->GetOffset(),
-        createParams,
-        D3D12MA_IID_PPV_ARGS(&res));
+    HRESULT hr = Allocate(size, alignment, allocDesc, 1, ppAllocation);
     if (SUCCEEDED(hr))
     {
-        if (ppvResource != NULL)
-        {
-            hr = res->QueryInterface(riidResource, ppvResource);
-        }
+        ID3D12Resource* res = NULL;
+        hr = m_hAllocator->CreatePlacedResourceWrap(
+            (*ppAllocation)->m_Placed.block->GetHeap(),
+            (*ppAllocation)->GetOffset(),
+            createParams,
+            D3D12MA_IID_PPV_ARGS(&res));
         if (SUCCEEDED(hr))
         {
-            (*ppAllocation)->SetResourcePointer(res, createParams.GetBaseResourceDesc());
+            if (ppvResource != NULL)
+            {
+                hr = res->QueryInterface(riidResource, ppvResource);
+            }
+            if (SUCCEEDED(hr))
+            {
+                (*ppAllocation)->SetResourcePointer(res, createParams.GetBaseResourceDesc());
+            }
+            else
+            {
+                res->Release();
+                SAFE_RELEASE(*ppAllocation);
+            }
         }
         else
         {
-            res->Release();
             SAFE_RELEASE(*ppAllocation);
         }
     }
-    else
-    {
-        SAFE_RELEASE(*ppAllocation);
-    }
     return hr;
 }
 
@@ -8449,7 +8240,6 @@ HRESULT BlockVector::AllocatePage(
     UINT64 size,
     UINT64 alignment,
     const ALLOCATION_DESC& allocDesc,
-    bool committedAllowed,
     Allocation** pAllocation)
 {
     // Early reject: requested allocation size is larger that maximum block size for this block vector.
@@ -8466,19 +8256,13 @@ HRESULT BlockVector::AllocatePage(
         freeMemory = (budget.UsageBytes < budget.BudgetBytes) ? (budget.BudgetBytes - budget.UsageBytes) : 0;
     }
 
-    const bool canExceedFreeMemory = !committedAllowed;
-
-    bool canCreateNewBlock =
+    const bool canCreateNewBlock =
         ((allocDesc.Flags & ALLOCATION_FLAG_NEVER_ALLOCATE) == 0) &&
-        (m_Blocks.size() < m_MaxBlockCount);
-
-    // Even if we don't have to stay within budget with this allocation, when the
-    // budget would be exceeded, we don't want to allocate new blocks, but always
-    // create resources as committed.
-    if (freeMemory < size && !canExceedFreeMemory)
-    {
-        canCreateNewBlock = false;
-    }
+        (m_Blocks.size() < m_MaxBlockCount) &&
+        // Even if we don't have to stay within budget with this allocation, when the
+        // budget would be exceeded, we don't want to allocate new blocks, but always
+        // create resources as committed.
+        freeMemory >= size;
 
     // 1. Search existing allocations
     {
@@ -8528,29 +8312,26 @@ HRESULT BlockVector::AllocatePage(
             }
         }
 
-        size_t newBlockIndex = SIZE_MAX;
-        HRESULT hr = E_OUTOFMEMORY;
-        if (newBlockSize <= freeMemory || canExceedFreeMemory)
-        {
-            hr = CreateBlock(newBlockSize, &newBlockIndex);
-        }
+        size_t newBlockIndex = 0;
+        HRESULT hr = newBlockSize <= freeMemory ?
+            CreateBlock(newBlockSize, &newBlockIndex) : E_OUTOFMEMORY;
         // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize.
         if (!m_ExplicitBlockSize)
         {
             while (FAILED(hr) && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)
             {
                 const UINT64 smallerNewBlockSize = newBlockSize / 2;
-                if (smallerNewBlockSize < size)
+                if (smallerNewBlockSize >= size)
+                {
+                    newBlockSize = smallerNewBlockSize;
+                    ++newBlockSizeShift;
+                    hr = newBlockSize <= freeMemory ?
+                        CreateBlock(newBlockSize, &newBlockIndex) : E_OUTOFMEMORY;
+                }
+                else
                 {
                     break;
                 }
-
-                newBlockSize = smallerNewBlockSize;
-                ++newBlockSizeShift;
-                if (newBlockSize <= freeMemory || canExceedFreeMemory)
-                {
-                    hr = CreateBlock(newBlockSize, &newBlockIndex);
-                }
             }
         }
 
@@ -9304,14 +9085,12 @@ PoolPimpl::PoolPimpl(AllocatorPimpl* allocator, const POOL_DESC& desc)
     D3D12MA_ASSERT(m_Desc.pProtectedSession == NULL);
 #endif
 
-    const UINT64 minAlignment = desc.MinAllocationAlignment > 0 ? desc.MinAllocationAlignment : D3D12MA_DEFAULT_ALIGNMENT;
-
     m_BlockVector = D3D12MA_NEW(allocator->GetAllocs(), BlockVector)(
         allocator, desc.HeapProperties, desc.HeapFlags,
         preferredBlockSize,
         desc.MinBlockCount, maxBlockCount,
         explicitBlockSize,
-        minAlignment,
+        D3D12MA_MAX(desc.MinAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT),
         (desc.Flags & POOL_FLAG_ALGORITHM_MASK) != 0,
         (desc.Flags & POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0,
         desc.pProtectedSession,
@@ -9774,11 +9553,6 @@ BOOL Allocator::IsGPUUploadHeapSupported() const
     return m_Pimpl->IsGPUUploadHeapSupported();
 }
 
-BOOL Allocator::IsTightAlignmentSupported() const
-{
-    return m_Pimpl->IsTightAlignmentSupported();
-}
-
 UINT64 Allocator::GetMemoryCapacity(UINT memorySegmentGroup) const
 {
     return m_Pimpl->GetMemoryCapacity(memorySegmentGroup);
@@ -9839,7 +9613,7 @@ HRESULT Allocator::CreateResource3(
     D3D12_BARRIER_LAYOUT InitialLayout,
     const D3D12_CLEAR_VALUE* pOptimizedClearValue,
     UINT32 NumCastableFormats,
-    const DXGI_FORMAT* pCastableFormats,
+    DXGI_FORMAT* pCastableFormats,
     Allocation** ppAllocation,
     REFIID riidResource,
     void** ppvResource)
@@ -9870,7 +9644,7 @@ HRESULT Allocator::AllocateMemory(
         return E_INVALIDARG;
     }
     D3D12MA_DEBUG_GLOBAL_MUTEX_LOCK
-    return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
+        return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
 }
 
 HRESULT Allocator::CreateAliasingResource(
@@ -9929,7 +9703,7 @@ HRESULT Allocator::CreateAliasingResource2(
     D3D12_BARRIER_LAYOUT InitialLayout,
     const D3D12_CLEAR_VALUE* pOptimizedClearValue,
     UINT32 NumCastableFormats,
-    const DXGI_FORMAT* pCastableFormats,
+    DXGI_FORMAT* pCastableFormats,
     REFIID riidResource,
     void** ppvResource)
 {
diff --git a/engine/thirdparty/d3d12ma/D3D12MemAlloc.h b/engine/thirdparty/d3d12ma/D3D12MemAlloc.h
index 32fe908c..9cd1c33e 100644
--- a/engine/thirdparty/d3d12ma/D3D12MemAlloc.h
+++ b/engine/thirdparty/d3d12ma/D3D12MemAlloc.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,16 +24,15 @@
 
 /** \mainpage D3D12 Memory Allocator
 
-<b>Version 3.1.0</b> (2026-02-23)
+<b>Version 2.1.0-development</b> (2024-07-05)
 
-Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved. \n
+Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved. \n
 License: MIT
 
 Documentation of all members: D3D12MemAlloc.h
 
 \section main_table_of_contents Table of contents
 
-- \subpage faq
 - \subpage quick_start
     - [Project setup](@ref quick_start_project_setup)
     - [Creating resources](@ref quick_start_creating_resources)
@@ -64,7 +63,7 @@ Documentation of all members: D3D12MemAlloc.h
         
 \section main_see_also Web links
 
-- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/d3d12-memory-allocator/) - product page
+- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/gaming-product/d3d12-memory-allocator/) - product page
 - [GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator at GitHub.com](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator) - source code repository
 */
 
@@ -125,7 +124,7 @@ Documentation of all members: D3D12MemAlloc.h
 
 #ifndef D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS
     /// Set of flags recommended for use in D3D12MA::ALLOCATOR_DESC::Flags for optimal performance.
-    #define D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS (D3D12MA::ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED | D3D12MA::ALLOCATOR_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED)
+    #define D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS (ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED | ALLOCATOR_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED)
 #endif
 
 #ifndef D3D12MA_RECOMMENDED_HEAP_FLAGS
@@ -139,7 +138,7 @@ Documentation of all members: D3D12MemAlloc.h
 
 #ifndef D3D12MA_RECOMMENDED_POOL_FLAGS
     /// Set of flags recommended for use in D3D12MA::POOL_DESC::Flags for optimal performance.
-    #define D3D12MA_RECOMMENDED_POOL_FLAGS (D3D12MA::POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED)
+    #define D3D12MA_RECOMMENDED_POOL_FLAGS (POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED)
 #endif
 
 
@@ -1112,19 +1111,8 @@ enum ALLOCATOR_FLAGS
     which may take longer than creating placed resources in existing heaps.
     Passing this flag will disable this committed preference globally for the allocator.
     It can also be disabled for a single allocation by using #ALLOCATION_FLAG_STRATEGY_MIN_TIME.
-
-    If the tight resource alignment feature is used by the library (which happens automatically whenever supported,
-    unless you use flag #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT), then small buffers are not preferred as committed.
-    Long story short, you don't need to specify any of these flags.
-    The library chooses the most optimal method automatically.
     */
     ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED = 0x10,
-    /** Disables the use of the tight alignment feature even when it is supported on the current system.
-    By default, the feature is used whenever available.
-
-    Support can be checked by D3D12MA::Allocator::IsTightAlignmentSupported() regardless of using this flag.
-    */
-    ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT = 0x20,
 };
 
 /// \brief Parameters of created Allocator object. To be used with CreateAllocator().
@@ -1200,12 +1188,6 @@ public:
     This flag is fetched from `D3D12_FEATURE_D3D12_OPTIONS16::GPUUploadHeapSupported`.
     */
     BOOL IsGPUUploadHeapSupported() const;
-    /** \brief Returns true if resource tight alignment is supported on the current system.
-    When supported, it is automatically used by the library, unless
-    #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT flag was specified on allocator creation.
-    This flag is fetched from `D3D12_FEATURE_DATA_TIGHT_ALIGNMENT::SupportTier`.
-    */
-    BOOL IsTightAlignmentSupported() const;
     /** \brief Returns total amount of memory of specific segment group, in bytes.
     
     \param memorySegmentGroup use `DXGI_MEMORY_SEGMENT_GROUP_LOCAL` or `DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL`.
@@ -1285,14 +1267,13 @@ public:
     It internally uses `ID3D12Device10::CreateCommittedResource3` or `ID3D12Device10::CreatePlacedResource2`.
 
     To work correctly, `ID3D12Device10` interface must be available in the current system. Otherwise, `E_NOINTERFACE` is returned.
-    If you use `pCastableFormats`, `ID3D12Device12` must albo be available.
     */
     HRESULT CreateResource3(const ALLOCATION_DESC* pAllocDesc,
         const D3D12_RESOURCE_DESC1* pResourceDesc,
         D3D12_BARRIER_LAYOUT InitialLayout,
         const D3D12_CLEAR_VALUE* pOptimizedClearValue,
         UINT32 NumCastableFormats,
-        const DXGI_FORMAT* pCastableFormats,
+        DXGI_FORMAT* pCastableFormats,
         Allocation** ppAllocation,
         REFIID riidResource,
         void** ppvResource);
@@ -1371,12 +1352,11 @@ public:
 
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
     /** \brief Similar to Allocator::CreateAliasingResource1, but there are initial layout instead of state and 
-    castable formats list.
+    castable formats list
 
     It internally uses `ID3D12Device10::CreatePlacedResource2`.
 
     To work correctly, `ID3D12Device10` interface must be available in the current system. Otherwise, `E_NOINTERFACE` is returned.
-    If you use `pCastableFormats`, `ID3D12Device12` must albo be available.
     */
     HRESULT CreateAliasingResource2(Allocation* pAllocation,
         UINT64 AllocationLocalOffset,
@@ -1384,7 +1364,7 @@ public:
         D3D12_BARRIER_LAYOUT InitialLayout,
         const D3D12_CLEAR_VALUE* pOptimizedClearValue,
         UINT32 NumCastableFormats,
-        const DXGI_FORMAT* pCastableFormats,
+        DXGI_FORMAT* pCastableFormats,
         REFIID riidResource,
         void** ppvResource);
 #endif  // #ifdef __ID3D12Device10_INTERFACE_DEFINED__
@@ -1817,221 +1797,6 @@ DEFINE_ENUM_FLAG_OPERATORS(D3D12MA::VIRTUAL_ALLOCATION_FLAGS);
 /// \endcond
 
 /**
-\page faq Frequently asked questions
-
-<b>What is %D3D12MA?</b>
-
-D3D12 Memory Allocator (%D3D12MA) is a software library for developers who use the DirectX(R) 12 graphics API in their code.
-It is written in C++.
-
-<b>What is the license of %D3D12MA?</b>
-
-%D3D12MA is licensed under MIT, which means it is open source and free software.
-
-<b>What is the purpose of %D3D12MA?</b>
-
-%D3D12MA helps with handling one aspect of DX12 usage, which is GPU memory management -
-allocation of `ID3D12Heap` objects and creation of `ID3D12Resource` objects - buffers and textures.
-
-<b>Do I need to use %D3D12MA?</b>
-
-You don't need to, but it may be beneficial in many cases.
-DX12 is a complex and low-level API, so libraries like this that abstract certain aspects of the API
-and bring them to a higher level are useful.
-When developing any non-trivial graphics application, you may benefit from using a memory allocator.
-Using %D3D12MA can save time compared to implementing your own.
-
-In DX12 you can create each resource separately with its own implicit memory heap by calling `CreateCommittedResource`,
-but this may not be the optimal solution.
-For more information, see [Committed versus placed resources](@ref optimal_allocation_committed_vs_placed).
-
-<b>When should I not use %D3D12MA?</b>
-
-While %D3D12MA is useful for many applications that use the DX12 API, there are cases
-when it may be a better choice not to use it.
-For example, if the application is very simple, e.g. serving as a sample or a learning exercise
-to help you understand or teach others the basics of DX12,
-and it creates only a small number of buffers and textures, then including %D3D12MA may be an overkill.
-Developing your own memory allocator may also be a good learning exercise.
-
-<b>What are the benefits of using %D3D12MA?</b>
-
--# %D3D12MA allocates large blocks of `ID3D12Heap` memory and sub-allocates parts of them to create your placed resources.
-   Allocating a new block of GPU memory may be a time-consuming operation.
-   Sub-allocating parts of a memory block requires implementing an allocation algorithm,
-   which is a non-trivial task.
-   %D3D12MA does that, using an advanced and efficient algorithm that works well in various use cases.
--# %D3D12MA offers a simple API that allows creating placed buffers and textures within one function call
-   like D3D12MA::Allocator::CreateResource.
-
-The library is doing much more under the hood.
-For example, it keeps buffers separate from textures when needed, respecting `D3D12_RESOURCE_HEAP_TIER`.
-It also makes use of the "small texture alignment" automatically, so you don't need to think about it.
-
-<b>Which version should I pick?</b>
-
-You can just pick [the latest version from the "master" branch](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator).
-It is kept in a good shape most of the time, compiling and working correctly,
-with no compatibility-breaking changes and no unfinished code.
-
-If you want an even more stable version, you can pick
-[the latest official release](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator/releases).
-Current code from the master branch is occasionally tagged as a release,
-with [CHANGELOG](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator/blob/master/CHANGELOG.md)
-carefully curated to enumerate all important changes since the previous version.
-
-The library uses [Semantic Versioning](https://semver.org/),
-which means versions that only differ in the patch number are forward and backward compatible
-(e.g., only fixing some bugs), while versions that differ in the minor number are backward compatible
-(e.g., only adding new functions to the API, but not removing or changing existing ones).
-
-<b>How to integrate it with my code?</b>
-
-%D3D12MA is an small library fully implemented in a single pair of CPP + H files.
-
-You can pull the entire GitHub repository, e.g. using Git submodules.
-The repository contains ancillary files like the Cmake script, Doxygen config file,
-sample application, test suite, and others.
-You can compile it as a library and link with your project.
-
-However, a simpler way is taking only files "include\D3D12MemAlloc.h", "src\D3D12MemAlloc.cpp"
-and including them in your project.
-These files contain all you need: a copyright notice,
-declarations of the public library interface (API), its internal implementation,
-and even the documentation in form of Doxygen-style comments.
-
-<b>I am not a fan of modern C++. Can I still use it?</b>
-
-Very likely yes.
-We acknowledge that many C++ developers, especially in the games industry,
-do not appreciate all the latest features that the language has to offer.
-
-- %D3D12MA doesn't throw or catch any C++ exceptions.
-  It reports errors by returning a `HRESULT` value instead, just like DX12.
-  If you don't use exceptions in your project, your code is not exception-safe,
-  or even if you disable exception handling in the compiler options, you can still use %D3D12MA.
-- %D3D12MA doesn't use C++ run-time type information like `typeid` or `dynamic_cast`,
-  so if you disable RTTI in the compiler options, you can still use the library.
-- %D3D12MA uses only a limited subset of standard C and C++ library.
-  It doesn't use STL containers like `std::vector`, `map`, or `string`,
-  either in the public interface nor in the internal implementation.
-  It implements its own containers instead.
-- If you don't use the default heap memory allocator through `malloc/free` or `new/delete`
-  but implement your own allocator instead, you can pass it to %D3D12MA as
-  D3D12MA::ALLOCATOR_DESC::pAllocationCallbacks
-  and the library will use your functions for every dynamic heap allocation made internally.
-
-<b>Is it available for other programming languages?</b>
-
-%D3D12MA is a C++ library in similar style as DX12.
-Bindings to other programming languages are out of scope of this project,
-but they are welcome as external projects.
-Some of them are listed in [README.md, "See also" section](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator/?tab=readme-ov-file#see-also),
-including binding to C.
-Before using any of them, please check if they are still maintained and updated to use a recent version of %D3D12MA.
-
-<b>What platforms does it support?</b>
-
-%D3D12MA relies only on DX12 and some parts of the standard C and C++ library,
-so it could support any platform where a C++ compiler and DX12 are available.
-However, it is developed and tested only on Microsoft(R) Windows(R).
-
-<b>Does it only work on AMD GPUs?</b>
-
-No! While %D3D12MA is published by AMD, it works on any GPU that supports DX12,
-whether a discrete PC graphics card or a processor integrated graphics.
-It doesn't give AMD GPUs any advantage over any other GPUs.
-
-<b>What DirectX 12 versions are supported?</b>
-
-%D3D12MA is updated to support latest versions of DirectX 12, as available through recent retail versions of the
-[DirectX 12 Agility SDK](https://devblogs.microsoft.com/directx/directx12agility/).
-Support for new features added in the preview version of the Agility SDK is developed on separate branches until they are included in the retail version.
-
-The library also supports older versions down to the base DX12 shipping with Windows SDK.
-Features added by later versions of the Agility SDK are automatically enabled conditionally using
-`#ifdef` preprocessor macros depending on the version of the SDK that you compile your project with.
-
-<b>Does it support other graphics APIs, like Vulkan(R)?</b>
-
-No, but we offer an equivalent library for Vulkan:
-[Vulkan Memory Allocator](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator).
-It uses the same core allocation algorithm.
-It also shares many features with %D3D12MA, like the support for custom pools and virtual allocator.
-However, it is not identical in terms of the features supported.
-Its API also looks different, because while the interface of %D3D12MA is similar in style to DX12,
-the interface of VMA is similar to Vulkan.
-
-<b>Is the library lightweight?</b>
-
-Yes.
-%D3D12MA is implemented with high-performance and real-time applications like video games in mind.
-The CPU performance overhead of using this library is low.
-It uses a high-quality allocation algorithm called Two-Level Segregated Fit (TLSF),
-which in most cases can find a free place for a new allocation in few steps.
-The library also doesn't perform too many CPU heap allocations.
-In many cases, the allocation happens with 0 new CPU heap allocations performed by the library.
-Even the creation of a D3D12MA::Allocation object doesn't typically feature an CPU allocation,
-because these objects are returned out of a dedicated memory pool.
-
-That said, %D3D12MA needs some extra memory and extra time
-to maintain the metadata about the occupied and free regions of the memory blocks,
-and the algorithms and data structures used must be generic enough to work well in most cases.
-
-<b>Does it have a documentation?</b>
-
-Yes! %D3D12MA comes with full documentation of all elements of the API (classes, structures, enums),
-as well as many generic chapters that provide an introduction,
-describe core concepts of the library, good practices, etc.
-The entire documentation is written in form of code comments inside "D3D12MemAlloc.h", in Doxygen format.
-You can access it in multiple ways:
-
-- Browsable online: https://gpuopen-librariesandsdks.github.io/D3D12MemoryAllocator/html/
-- Local HTML pages available after you clone the repository and open file "docs\html\index.html".
-- You can rebuild the documentation in HTML or some other format from the source code using Doxygen.
-  Configuration file "Doxyfile" is part of the repository.
-- Finally, you can just read the comments preceding declarations of any public classes and functions of the library.
-
-<b>Is it a mature project?</b>
-
-Yes! The library is in development since May 2019, has over 300 commits, and multiple contributors.
-It is used by many software projects, including some large and popular ones like Qt or Godot Engine,
-as well as some AAA games.
-
-<b>How can I contribute to the project?</b>
-
-If you have an idea for improvement or a feature request,
-you can go to [the library repository](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator)
-and create an Issue ticket, describing your idea.
-You can also implement it yourself by forking the repository, making changes to the code,
-and creating a Pull request.
-
-If you want to ask a question, you can also create a ticket the same way.
-Before doing this, please make sure you read the relevant part of the DX12 documentation and %D3D12MA documentation,
-where you may find the answers to your question.
-
-If you want to report a suspected bug, you can also create a ticket the same way.
-Before doing this, please put some effort into the investigation of whether the bug is really
-in the library and not in your code or in the DX12 implementation (the GPU driver) on your platform:
-
-- Enable D3D Debug Layer and make sure it is free from any errors.
-- Make sure `D3D12MA_ASSERT` is defined to an implementation that can report a failure and not ignore it.
-- Try making your allocation using pure DX12 functions like `CreateCommittedResource()` rather than %D3D12MA and see if the bug persists.
-
-<b>I found some compilation warnings. How can we fix them?</b>
-
-Seeing compiler warnings may be annoying to some developers,
-but it is a design decision to not fix all of them.
-Due to the nature of the C++ language, certain preprocessor macros can make some variables unused,
-function parameters unreferenced, or conditional expressions constant in some configurations.
-The code of this library should not be bigger or more complicated just to silence these warnings.
-It is recommended to disable such warnings instead.
-For more information, see [Features not supported](@ref general_considerations_features_not_supported).
-
-However, if you observe a warning that is really dangerous, e.g.,
-about an implicit conversion from a larger to a smaller integer type, please report it and it will be fixed ASAP.
-
-
 \page quick_start Quick start
 
 \section quick_start_project_setup Project setup and initialization
@@ -2881,23 +2646,6 @@ and D3D12MA::POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED on the creation of any cus
 With those flags, the alignment of the heaps created by %D3D12MA can be lower, but any MSAA textures are created as committed.
 You should always use these flags in your code unless you really need to create some MSAA textures as placed.
 
-With DirectX 12 Agility SDK 1.618.1, Microsoft added a new feature called **"tight alignment"**.
-Note this is a separate feature than the "small alignment" described earlier.
-When using this new SDK and a compatible graphics driver, the API exposes support for this new feature.
-Then, a new flag `D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT` can be added when creating a resource.
-D3D12 can then return the alignment required for the resource smaller than the default ones described above.
-This library automatically makes use of the tight alignment feature when available and adds that new resource flag.
-When the tight alignment is enabled, the heuristics that creates small buffers as committed described above is deactivated,
-as it is no longer needed.
-
-You can check if the tight alignment it is available in the current system by calling D3D12MA::Allocator::IsTightAlignmentSupported().
-You can tell the library to not use it by specifying D3D12MA::ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT.
-Typically, you don't need to do any of those.
-
-The library automatically aligns all buffers to at least 256 B, even when the system supports smaller alignment.
-This is the alignment required for constant buffers, expressed by `D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT` constant.
-You can override this logic for \subpage custom_pools with a specific D3D12MA::POOL_DESC::MinAllocationAlignment.
-
 \page defragmentation Defragmentation
 
 Interleaved allocations and deallocations of many objects of varying size can
@@ -3592,7 +3340,7 @@ Features deliberately excluded from the scope of this library:
 - **Descriptor allocation.** Although also called "heaps", objects that represent
   descriptors are separate part of the D3D12 API from buffers and textures.
   You can still use \ref virtual_allocator to manage descriptors and their ranges inside a descriptor heap.
-- **Support for reserved (tiled) resources.** We don't recommend using them. For more information, see [1].
+- **Support for reserved (tiled) resources.** We don't recommend using them.
 - Support for `ID3D12Device::Evict` and `MakeResident`. We don't recommend using them.
   You can call them on the D3D12 objects manually.
   Plese keep in mind, however, that eviction happens on the level of entire `ID3D12Heap` memory blocks
@@ -3609,6 +3357,4 @@ Features deliberately excluded from the scope of this library:
   It is recommended to disable such warnings instead.
 - This is a C++ library. **Bindings or ports to any other programming languages** are welcome as external projects but
   are not going to be included into this repository.
-
-[1] Antoine Richermoz, Fabrice Neyret. The Sad State of Hardware Virtual Textures. UGA - Universite Grenoble Alpes; INRIA Grenoble - Rhone-Alpes. 2025, pp.13. hal-05138369
 */
diff --git a/engine/thirdparty/d3d12ma/LICENSE.txt b/engine/thirdparty/d3d12ma/LICENSE.txt
index 3d5a69a6..eb08d9e8 100644
--- a/engine/thirdparty/d3d12ma/LICENSE.txt
+++ b/engine/thirdparty/d3d12ma/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/engine/thirdparty/d3d12ma/README.md b/engine/thirdparty/d3d12ma/README.md
index d13081bf..0536781e 100644
--- a/engine/thirdparty/d3d12ma/README.md
+++ b/engine/thirdparty/d3d12ma/README.md
@@ -1,10 +1,8 @@
 Upstream:
 https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator
 
-commit 0fa62ed3a0a69b73230a8ec1faa752d4061c8dc8
-Author: jlacroixAMD <45055644+jlacroixAMD@users.noreply.github.com>
-Date:   Tue Feb 24 11:41:07 2026 +0900
+commit d26c54a6f40c66611dd33c77df4198784b53a8e2
+Author: Adam Sawicki <adam.sawicki@amd.com>
+Date:   Wed Apr 9 15:07:43 2025 +0200
 
-    Merge pull request #87 from sawickiap/master
-
-    New updates to D3D12 Memory Allocator (v3.1.0)
+    Minor fixes after #71
diff --git a/engine/thirdparty/d3d12ma/patches/0001-mingw-support.patch b/engine/thirdparty/d3d12ma/patches/0001-mingw-support.patch
deleted file mode 100644
index 6fb33097..00000000
--- a/engine/thirdparty/d3d12ma/patches/0001-mingw-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/thirdparty/d3d12ma/D3D12MemAlloc.cpp b/thirdparty/d3d12ma/D3D12MemAlloc.cpp
-index 61e9e4a34d..94c646b5fc 100644
---- a/thirdparty/d3d12ma/D3D12MemAlloc.cpp
-+++ b/thirdparty/d3d12ma/D3D12MemAlloc.cpp
-@@ -33,24 +33,11 @@
-     #include <shared_mutex>
- #endif
- 
--// On older mingw versions, using the Agility SDK will cause linker errors unless dxguids.h is included.
--// But on newer mingw versions, the includes aren't necessary thus no need to grab DirectX-Headers.
--// Release cycles are slow for LTS distros on Linux, so this codeblock will need to stay for a few years.
--#if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR) && \
--	defined(__MINGW64_VERSION_BUGFIX) && defined(__ID3D12Device8_INTERFACE_DEFINED__)
--    #define D3D12MA_MAKE_MINGW_VERSION(x, y, z) ((x << 20u) | (y << 10u) | (z))
--    #if D3D12MA_MAKE_MINGW_VERSION(__MINGW64_VERSION_MAJOR, __MINGW64_VERSION_MINOR, \
--								  __MINGW64_VERSION_BUGFIX) <= D3D12MA_MAKE_MINGW_VERSION(11, 0, 1)
--        #if defined(__has_include)
--            #if !__has_include(<dxguids.h>)
--                #error "mingw or gcc detected. dxguids.h is needed. You can grab it from https://github.com/microsoft/DirectX-Headers or if you're on Ubuntu just run sudo apt install directx-headers-dev"
--            #endif
--        #endif
--        #include <guiddef.h>
--        // // guiddef.h must be included first.
--        #include <dxguids.h>
--    #endif
--    #undef D3D12MA_MAKE_MINGW_VERSION
-+// Includes needed for MinGW - see #71.
-+#ifndef _MSC_VER
-+    #include <guiddef.h>
-+    // guiddef.h must be included first.
-+    #include <dxguids.h>
- #endif
- 
- ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/thirdparty/directx_headers/include/dxguids/dxguids.h b/engine/thirdparty/directx_headers/include/dxguids/dxguids.h
index d38a1070..76155708 100644
--- a/engine/thirdparty/directx_headers/include/dxguids/dxguids.h
+++ b/engine/thirdparty/directx_headers/include/dxguids/dxguids.h
@@ -79,7 +79,6 @@ WINADAPTER_IID(ID3D12CommandAllocator, 0x6102dee4, 0xaf59, 0x4b09, 0xb9, 0x99, 0
 WINADAPTER_IID(ID3D12Fence, 0x0a753dcf, 0xc4d8, 0x4b91, 0xad, 0xf6, 0xbe, 0x5a, 0x60, 0xd9, 0x5a, 0x76);
 WINADAPTER_IID(ID3D12Fence1, 0x433685fe, 0xe22b, 0x4ca0, 0xa8, 0xdb, 0xb5, 0xb4, 0xf4, 0xdd, 0x0e, 0x4a);
 WINADAPTER_IID(ID3D12PipelineState, 0x765a30f3, 0xf624, 0x4c6f, 0xa8, 0x28, 0xac, 0xe9, 0x48, 0x62, 0x24, 0x45);
-WINADAPTER_IID(ID3D12PipelineState1, 0x5646804c, 0x9638, 0x48f7, 0x91, 0x82, 0xb3, 0xee, 0x5a, 0x6b, 0x60, 0xfb);
 WINADAPTER_IID(ID3D12DescriptorHeap, 0x8efb471d, 0x616c, 0x4f49, 0x90, 0xf7, 0x12, 0x7b, 0xb7, 0x63, 0xfa, 0x51);
 WINADAPTER_IID(ID3D12QueryHeap, 0x0d9658ae, 0xed45, 0x469e, 0xa6, 0x1d, 0x97, 0x0e, 0xc5, 0x83, 0xca, 0xb4);
 WINADAPTER_IID(ID3D12CommandSignature, 0xc36a797c, 0xec80, 0x4f0a, 0x89, 0x85, 0xa7, 0xb2, 0x47, 0x50, 0x82, 0xd1);
@@ -103,9 +102,6 @@ WINADAPTER_IID(ID3D12SwapChainAssistant, 0xf1df64b6, 0x57fd, 0x49cd, 0x88, 0x07,
 WINADAPTER_IID(ID3D12LifetimeTracker, 0x3fd03d36, 0x4eb1, 0x424a, 0xa5, 0x82, 0x49, 0x4e, 0xcb, 0x8b, 0xa8, 0x13);
 WINADAPTER_IID(ID3D12StateObject, 0x47016943, 0xfca8, 0x4594, 0x93, 0xea, 0xaf, 0x25, 0x8b, 0x55, 0x34, 0x6d);
 WINADAPTER_IID(ID3D12StateObjectProperties, 0xde5fa827, 0x9bf9, 0x4f26, 0x89, 0xff, 0xd7, 0xf5, 0x6f, 0xde, 0x38, 0x60);
-WINADAPTER_IID(ID3D12StateObjectProperties1, 0x460caac7, 0x1d24, 0x446a, 0xa1, 0x84, 0xca, 0x67, 0xdb, 0x49, 0x41, 0x38);
-WINADAPTER_IID(ID3D12StateObjectProperties2, 0xd5e82917, 0xf0f1, 0x44cf, 0xae, 0x5e, 0xce, 0x22, 0x2d, 0xd0, 0xb8, 0x84);
-WINADAPTER_IID(ID3D12WorkGraphProperties, 0x065acf71, 0xf863, 0x4b89, 0x82, 0xf4, 0x02, 0xe4, 0xd5, 0x88, 0x67, 0x57);
 WINADAPTER_IID(ID3D12Device5, 0x8b4f173b, 0x2fea, 0x4b80, 0x8f, 0x58, 0x43, 0x07, 0x19, 0x1a, 0xb9, 0x5d);
 WINADAPTER_IID(ID3D12DeviceRemovedExtendedDataSettings, 0x82BC481C, 0x6B9B, 0x4030, 0xAE, 0xDB, 0x7E, 0xE3, 0xD1, 0xDF, 0x1E, 0x63);
 WINADAPTER_IID(ID3D12DeviceRemovedExtendedDataSettings1, 0xDBD5AE51, 0x3317, 0x4F0A, 0xAD, 0xF9, 0x1D, 0x7C, 0xED, 0xCA, 0xAE, 0x0B);
@@ -127,31 +123,16 @@ WINADAPTER_IID(ID3D12ShaderCacheSession, 0x28e2495d, 0x0f64, 0x4ae4, 0xa6, 0xec,
 WINADAPTER_IID(ID3D12Device9, 0x4c80e962, 0xf032, 0x4f60, 0xbc, 0x9e, 0xeb, 0xc2, 0xcf, 0xa1, 0xd8, 0x3c);
 WINADAPTER_IID(ID3D12Device10, 0x517f8718, 0xaa66, 0x49f9, 0xb0, 0x2b, 0xa7, 0xab, 0x89, 0xc0, 0x60, 0x31);
 WINADAPTER_IID(ID3D12Device11, 0x5405c344, 0xd457, 0x444e, 0xb4, 0xdd, 0x23, 0x66, 0xe4, 0x5a, 0xee, 0x39);
-WINADAPTER_IID(ID3D12Device12, 0x5af5c532, 0x4c91, 0x4cd0, 0xb5, 0x41, 0x15, 0xa4, 0x05, 0x39, 0x5f, 0xc5);
-WINADAPTER_IID(ID3D12Device13, 0x14eecffc, 0x4df8, 0x40f7, 0xa1, 0x18, 0x5c, 0x81, 0x6f, 0x45, 0x69, 0x5e);
-WINADAPTER_IID(ID3D12Device14, 0x5f6e592d, 0xd895, 0x44c2, 0x8e, 0x4a, 0x88, 0xad, 0x49, 0x26, 0xd3, 0x23);
-WINADAPTER_IID(ID3D12StateObjectDatabase, 0xc56060b7, 0xb5fc, 0x4135, 0x98, 0xe0, 0xa1, 0xe9, 0x99, 0x7e, 0xac, 0xe0);
 WINADAPTER_IID(ID3D12VirtualizationGuestDevice, 0xbc66d368, 0x7373, 0x4943, 0x87, 0x57, 0xfc, 0x87, 0xdc, 0x79, 0xe4, 0x76);
 WINADAPTER_IID(ID3D12Tools, 0x7071e1f0, 0xe84b, 0x4b33, 0x97, 0x4f, 0x12, 0xfa, 0x49, 0xde, 0x65, 0xc5);
-WINADAPTER_IID(ID3D12Tools1, 0xe4fbc019, 0xdd3c, 0x43e1, 0x8f, 0x32, 0x7f, 0x64, 0x95, 0x75, 0xf0, 0xa0);
-WINADAPTER_IID(ID3D12Tools2, 0x01d393c5, 0xc9b0, 0x42a1, 0x95, 0x8c, 0xc2, 0x6b, 0x02, 0xd4, 0xd0, 0x97);
-WINADAPTER_IID(ID3D12PageableTools, 0x8f1359db, 0xd8d1, 0x42f9, 0xb5, 0xcf, 0x79, 0xf4, 0xcb, 0xad, 0x0d, 0x3d);
-WINADAPTER_IID(ID3D12DeviceTools, 0x2ea68e9c, 0x19c3, 0x4e47, 0xa1, 0x09, 0x6c, 0xda, 0xdf, 0xf0, 0xac, 0xa9);
-WINADAPTER_IID(ID3D12DeviceTools1, 0xe30e9fc7, 0xe641, 0x4d6e, 0x8a, 0x81, 0x9d, 0xd9, 0x20, 0x6e, 0xc4, 0x7a);
 WINADAPTER_IID(ID3D12SDKConfiguration, 0xe9eb5314, 0x33aa, 0x42b2, 0xa7, 0x18, 0xd7, 0x7f, 0x58, 0xb1, 0xf1, 0xc7);
 WINADAPTER_IID(ID3D12SDKConfiguration1, 0x8aaf9303, 0xad25, 0x48b9, 0x9a, 0x57, 0xd9, 0xc3, 0x7e, 0x00, 0x9d, 0x9f);
 WINADAPTER_IID(ID3D12DeviceFactory, 0x61f307d3, 0xd34e, 0x4e7c, 0x83, 0x74, 0x3b, 0xa4, 0xde, 0x23, 0xcc, 0xcb);
 WINADAPTER_IID(ID3D12DeviceConfiguration, 0x78dbf87b, 0xf766, 0x422b, 0xa6, 0x1c, 0xc8, 0xc4, 0x46, 0xbd, 0xb9, 0xad);
-WINADAPTER_IID(ID3D12DeviceConfiguration1, 0xed342442, 0x6343, 0x4e16, 0xbb, 0x82, 0xa3, 0xa5, 0x77, 0x87, 0x4e, 0x56);
-WINADAPTER_IID(ID3D12StateObjectDatabaseFactory, 0xf5b066f0, 0x648a, 0x4611, 0xbd, 0x41, 0x27, 0xfd, 0x09, 0x48, 0xb9, 0xeb);
 WINADAPTER_IID(ID3D12GraphicsCommandList5, 0x55050859, 0x4024, 0x474c, 0x87, 0xf5, 0x64, 0x72, 0xea, 0xee, 0x44, 0xea);
 WINADAPTER_IID(ID3D12GraphicsCommandList6, 0xc3827890, 0xe548, 0x4cfa, 0x96, 0xcf, 0x56, 0x89, 0xa9, 0x37, 0x0f, 0x80);
 WINADAPTER_IID(ID3D12GraphicsCommandList7, 0xdd171223, 0x8b61, 0x4769, 0x90, 0xe3, 0x16, 0x0c, 0xcd, 0xe4, 0xe2, 0xc1);
 WINADAPTER_IID(ID3D12GraphicsCommandList8, 0xee936ef9, 0x599d, 0x4d28, 0x93, 0x8e, 0x23, 0xc4, 0xad, 0x05, 0xce, 0x51);
-WINADAPTER_IID(ID3D12GraphicsCommandList9, 0x34ed2808, 0xffe6, 0x4c2b, 0xb1, 0x1a, 0xca, 0xbd, 0x2b, 0x0c, 0x59, 0xe1);
-WINADAPTER_IID(ID3D12GraphicsCommandList10, 0x7013c015, 0xd161, 0x4b63, 0xa0, 0x8c, 0x23, 0x85, 0x52, 0xdd, 0x8a, 0xcc);
-WINADAPTER_IID(ID3D12DSRDeviceFactory, 0xf343d1a0, 0xafe3, 0x439f, 0xb1, 0x3d, 0xcd, 0x87, 0xa4, 0x3b, 0x70, 0xca);
-WINADAPTER_IID(ID3D12GBVDiagnostics, 0x597985ab, 0x9b75, 0x4dbb, 0xbe, 0x23, 0x07, 0x61, 0x19, 0x5b, 0xeb, 0xee);
 #endif
 
 // Direct3D Video
diff --git a/engine/thirdparty/enet/enet/enet_godot_ext.h b/engine/thirdparty/enet/enet/enet_godot_ext.h
index 693e6b49..ba81c78b 100644
--- a/engine/thirdparty/enet/enet/enet_godot_ext.h
+++ b/engine/thirdparty/enet/enet/enet_godot_ext.h
@@ -49,7 +49,5 @@ ENET_API void enet_address_set_ip(ENetAddress * address, const uint8_t * ip, siz
 ENET_API int enet_host_dtls_server_setup (ENetHost *, void *);
 ENET_API int enet_host_dtls_client_setup (ENetHost *, const char *, void *);
 ENET_API void enet_host_refuse_new_connections (ENetHost *, int);
-ENET_API void enet_peer_socket_bind (ENetPeer *);
-ENET_API void enet_peer_socket_destroy (ENetPeer *);
 
 #endif // __ENET_GODOT_EXT_H__
diff --git a/engine/thirdparty/enet/enet_godot.cpp b/engine/thirdparty/enet/enet_godot.cpp
index 3d53f77e..f1fd0775 100644
--- a/engine/thirdparty/enet/enet_godot.cpp
+++ b/engine/thirdparty/enet/enet_godot.cpp
@@ -54,8 +54,6 @@ public:
 	virtual void close() = 0;
 	virtual void set_refuse_new_connections(bool p_enable) {} /* Only used by dtls server */
 	virtual bool can_upgrade() { return false; } /* Only true in ENetUDP */
-	virtual void disconnect_peer(ENetPeer *p_peer) {}
-	virtual void bind_peer(ENetPeer *p_peer) {}
 	virtual ~ENetGodotSocket() {}
 };
 
@@ -173,8 +171,6 @@ class ENetDTLSClient : public ENetGodotSocket {
 	Ref<TLSOptions> tls_options;
 	String for_hostname;
 	IPAddress local_address;
-	uint16_t local_port = 0;
-	bool bound = false;
 
 public:
 	ENetDTLSClient(ENetUDP *p_base, String p_for_hostname, Ref<TLSOptions> p_options) {
@@ -183,9 +179,10 @@ public:
 		udp.instantiate();
 		dtls = Ref<PacketPeerDTLS>(PacketPeerDTLS::create());
 		if (p_base->bound) {
-			p_base->get_socket_address(&local_address, &local_port);
+			uint16_t port;
+			p_base->get_socket_address(&local_address, &port);
 			p_base->close();
-			bind(local_address, local_port);
+			bind(local_address, port);
 		}
 	}
 
@@ -194,9 +191,7 @@ public:
 	}
 
 	Error bind(IPAddress p_ip, uint16_t p_port) {
-		bound = true;
 		local_address = p_ip;
-		local_port = p_port;
 		return udp->bind(p_port, p_ip);
 	}
 
@@ -213,11 +208,7 @@ public:
 		if (!connected) {
 			udp->connect_to_host(p_ip, p_port);
 			if (dtls->connect_to_peer(udp, for_hostname, tls_options)) {
-				close();
-				if (bound) {
-					bind(local_address, local_port);
-				}
-				return FAILED; // May still retry...
+				return FAILED;
 			}
 			connected = true;
 		}
@@ -225,11 +216,7 @@ public:
 		if (dtls->get_status() == PacketPeerDTLS::STATUS_HANDSHAKING) {
 			return ERR_BUSY;
 		} else if (dtls->get_status() != PacketPeerDTLS::STATUS_CONNECTED) {
-			close();
-			if (bound) {
-				bind(local_address, local_port);
-			}
-			return FAILED; // May still retry...
+			return FAILED;
 		}
 		r_sent = p_len;
 		return dtls->put_packet(p_buffer, p_len);
@@ -241,10 +228,6 @@ public:
 			return ERR_BUSY;
 		}
 		if (dtls->get_status() != PacketPeerDTLS::STATUS_CONNECTED) {
-			close();
-			if (bound) {
-				bind(local_address, local_port);
-			}
 			return FAILED;
 		}
 		int pc = dtls->get_available_packet_count();
@@ -272,7 +255,6 @@ public:
 	void close() {
 		dtls->disconnect_from_peer();
 		udp->close();
-		connected = false;
 	}
 };
 
@@ -280,24 +262,12 @@ public:
 class ENetDTLSServer : public ENetGodotSocket {
 	Ref<DTLSServer> server;
 	Ref<UDPServer> udp_server;
-
-	enum {
-		ENET_DTLS_TIMEOUT_MS = 8000,
-	};
-
-	struct Peer {
-		Ref<PacketPeerDTLS> conn;
-		bool bound = false;
-		uint64_t timeout = 0;
-	};
-
-	HashMap<String, Peer> peers;
+	HashMap<String, Ref<PacketPeerDTLS>> peers;
+	int last_service = 0;
 	IPAddress local_address;
-	size_t max_clients = 0;
 
 public:
-	ENetDTLSServer(ENetUDP *p_base, Ref<TLSOptions> p_options, size_t p_max_clients) {
-		max_clients = p_max_clients;
+	ENetDTLSServer(ENetUDP *p_base, Ref<TLSOptions> p_options) {
 		udp_server.instantiate();
 		if (p_base->bound) {
 			uint16_t port;
@@ -333,14 +303,14 @@ public:
 
 	Error sendto(const uint8_t *p_buffer, int p_len, int &r_sent, IPAddress p_ip, uint16_t p_port) {
 		String key = String(p_ip) + ":" + itos(p_port);
-		Peer *peer = peers.getptr(key);
-		if (unlikely(peer == nullptr)) {
+		if (unlikely(!peers.has(key))) {
 			// The peer might have been disconnected due to a DTLS error.
 			// We need to wait for it to time out, just mark the packet as sent.
 			r_sent = p_len;
 			return OK;
 		}
-		Error err = peer->conn->put_packet(p_buffer, p_len);
+		Ref<PacketPeerDTLS> peer = peers[key];
+		Error err = peer->put_packet(p_buffer, p_len);
 		if (err == OK) {
 			r_sent = p_len;
 		} else if (err == ERR_BUSY) {
@@ -363,12 +333,9 @@ public:
 			int peer_port = udp->get_packet_port();
 			Ref<PacketPeerDTLS> peer = server->take_connection(udp);
 			PacketPeerDTLS::Status status = peer->get_status();
-			if (peers.size() < max_clients && status == PacketPeerDTLS::STATUS_HANDSHAKING || status == PacketPeerDTLS::STATUS_CONNECTED) {
+			if (status == PacketPeerDTLS::STATUS_HANDSHAKING || status == PacketPeerDTLS::STATUS_CONNECTED) {
 				String key = String(peer_ip) + ":" + itos(peer_port);
-				Peer p;
-				p.conn = peer;
-				p.timeout = OS::get_singleton()->get_ticks_msec() + ENET_DTLS_TIMEOUT_MS;
-				peers[key] = p;
+				peers[key] = peer;
 			}
 		}
 
@@ -376,12 +343,8 @@ public:
 		Error err = ERR_BUSY;
 		// TODO this needs to be fair!
 
-		for (KeyValue<String, Peer> &E : peers) {
-			if (unlikely(!E.value.bound && OS::get_singleton()->get_ticks_msec() >= E.value.timeout)) {
-				remove.push_back(E.key);
-				continue;
-			}
-			Ref<PacketPeerDTLS> peer = E.value.conn;
+		for (KeyValue<String, Ref<PacketPeerDTLS>> &E : peers) {
+			Ref<PacketPeerDTLS> peer = E.value;
 			peer->poll();
 
 			if (peer->get_status() == PacketPeerDTLS::STATUS_HANDSHAKING) {
@@ -425,35 +388,9 @@ public:
 		return -1;
 	}
 
-	void bind_peer(ENetPeer *p_peer) {
-		if (p_peer == nullptr) {
-			return;
-		}
-		IPAddress ip;
-		ip.set_ipv6((uint8_t *)&(p_peer->address.host));
-		int port = p_peer->address.port;
-		const String key = String(ip) + ":" + itos(port);
-		Peer *p = peers.getptr(key);
-		if (p == nullptr) {
-			return;
-		}
-		p->bound = true;
-	}
-
-	void disconnect_peer(ENetPeer *p_peer) {
-		if (p_peer == nullptr) {
-			return;
-		}
-		IPAddress ip;
-		ip.set_ipv6((uint8_t *)&(p_peer->address.host));
-		int port = p_peer->address.port;
-		const String key = String(ip) + ":" + itos(port);
-		peers.erase(key);
-	};
-
 	void close() {
-		for (KeyValue<String, Peer> &E : peers) {
-			E.value.conn->disconnect_from_peer();
+		for (KeyValue<String, Ref<PacketPeerDTLS>> &E : peers) {
+			E.value->disconnect_from_peer();
 		}
 		peers.clear();
 		udp_server->stop();
@@ -511,35 +448,13 @@ ENetSocket enet_socket_create(ENetSocketType type) {
 	return socket;
 }
 
-void enet_peer_socket_bind(ENetPeer *p_peer) {
-	if (p_peer == nullptr || p_peer->host == nullptr) {
-		return;
-	}
-	ENetGodotSocket *sock = (ENetGodotSocket *)p_peer->host->socket;
-	if (sock == nullptr) {
-		return;
-	}
-	sock->bind_peer(p_peer);
-}
-
-void enet_peer_socket_destroy(ENetPeer *p_peer) {
-	if (p_peer == nullptr || p_peer->host == nullptr) {
-		return;
-	}
-	ENetGodotSocket *sock = (ENetGodotSocket *)p_peer->host->socket;
-	if (sock == nullptr) {
-		return;
-	}
-	sock->disconnect_peer(p_peer);
-}
-
 int enet_host_dtls_server_setup(ENetHost *host, void *p_options) {
 	ERR_FAIL_COND_V_MSG(!DTLSServer::is_available(), -1, "DTLS server is not available in this build.");
 	ENetGodotSocket *sock = (ENetGodotSocket *)host->socket;
 	if (!sock->can_upgrade()) {
 		return -1;
 	}
-	host->socket = memnew(ENetDTLSServer(static_cast<ENetUDP *>(sock), Ref<TLSOptions>(static_cast<TLSOptions *>(p_options)), host->peerCount));
+	host->socket = memnew(ENetDTLSServer(static_cast<ENetUDP *>(sock), Ref<TLSOptions>(static_cast<TLSOptions *>(p_options))));
 	memdelete(sock);
 	return 0;
 }
diff --git a/engine/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 b/engine/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2
new file mode 100644
index 00000000..c0087a24
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansBengaliUI_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 b/engine/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2
new file mode 100644
index 00000000..21979229
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansBengaliUI_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansBengali_Bold.woff2 b/engine/thirdparty/fonts/NotoSansBengali_Bold.woff2
deleted file mode 100644
index 96abcde1..00000000
Binary files a/engine/thirdparty/fonts/NotoSansBengali_Bold.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansBengali_Regular.woff2 b/engine/thirdparty/fonts/NotoSansBengali_Regular.woff2
deleted file mode 100644
index 74bbd5f7..00000000
Binary files a/engine/thirdparty/fonts/NotoSansBengali_Regular.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 b/engine/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2
new file mode 100644
index 00000000..d3d34ff8
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansDevanagariUI_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 b/engine/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2
new file mode 100644
index 00000000..333562f4
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansDevanagariUI_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansDevanagari_Bold.woff2 b/engine/thirdparty/fonts/NotoSansDevanagari_Bold.woff2
deleted file mode 100644
index 6510f1eb..00000000
Binary files a/engine/thirdparty/fonts/NotoSansDevanagari_Bold.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansDevanagari_Regular.woff2 b/engine/thirdparty/fonts/NotoSansDevanagari_Regular.woff2
deleted file mode 100644
index 25c54cb8..00000000
Binary files a/engine/thirdparty/fonts/NotoSansDevanagari_Regular.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 b/engine/thirdparty/fonts/NotoSansGeorgian_Bold.woff2
index 0222e9ab..c5e25ffe 100644
Binary files a/engine/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 and b/engine/thirdparty/fonts/NotoSansGeorgian_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 b/engine/thirdparty/fonts/NotoSansGeorgian_Regular.woff2
index 77fc36f6..64ff0e84 100644
Binary files a/engine/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 and b/engine/thirdparty/fonts/NotoSansGeorgian_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansHebrew_Bold.woff2 b/engine/thirdparty/fonts/NotoSansHebrew_Bold.woff2
index 895c6c4a..01768b64 100644
Binary files a/engine/thirdparty/fonts/NotoSansHebrew_Bold.woff2 and b/engine/thirdparty/fonts/NotoSansHebrew_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansHebrew_Regular.woff2 b/engine/thirdparty/fonts/NotoSansHebrew_Regular.woff2
index bf706296..980b7d3b 100644
Binary files a/engine/thirdparty/fonts/NotoSansHebrew_Regular.woff2 and b/engine/thirdparty/fonts/NotoSansHebrew_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansOriya_Bold.woff2 b/engine/thirdparty/fonts/NotoSansOriya_Bold.woff2
index eb22374a..333abfaa 100644
Binary files a/engine/thirdparty/fonts/NotoSansOriya_Bold.woff2 and b/engine/thirdparty/fonts/NotoSansOriya_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansOriya_Regular.woff2 b/engine/thirdparty/fonts/NotoSansOriya_Regular.woff2
index 1e74bbd2..c9b7c4a7 100644
Binary files a/engine/thirdparty/fonts/NotoSansOriya_Regular.woff2 and b/engine/thirdparty/fonts/NotoSansOriya_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 b/engine/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2
new file mode 100644
index 00000000..7facb291
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansSinhalaUI_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 b/engine/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2
new file mode 100644
index 00000000..8059db38
Binary files /dev/null and b/engine/thirdparty/fonts/NotoSansSinhalaUI_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansSinhala_Bold.woff2 b/engine/thirdparty/fonts/NotoSansSinhala_Bold.woff2
deleted file mode 100644
index 310b4ebd..00000000
Binary files a/engine/thirdparty/fonts/NotoSansSinhala_Bold.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansSinhala_Regular.woff2 b/engine/thirdparty/fonts/NotoSansSinhala_Regular.woff2
deleted file mode 100644
index b067e96c..00000000
Binary files a/engine/thirdparty/fonts/NotoSansSinhala_Regular.woff2 and /dev/null differ
diff --git a/engine/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 b/engine/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2
index d1b53d2f..4de7b9f2 100644
Binary files a/engine/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 and b/engine/thirdparty/fonts/NotoSansTeluguUI_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 b/engine/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2
index 4ea34eeb..0d9fe71d 100644
Binary files a/engine/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 and b/engine/thirdparty/fonts/NotoSansTeluguUI_Regular.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansThai_Bold.woff2 b/engine/thirdparty/fonts/NotoSansThai_Bold.woff2
index 16567f13..68dc6c13 100644
Binary files a/engine/thirdparty/fonts/NotoSansThai_Bold.woff2 and b/engine/thirdparty/fonts/NotoSansThai_Bold.woff2 differ
diff --git a/engine/thirdparty/fonts/NotoSansThai_Regular.woff2 b/engine/thirdparty/fonts/NotoSansThai_Regular.woff2
index 9b0e02e7..ae29cbdb 100644
Binary files a/engine/thirdparty/fonts/NotoSansThai_Regular.woff2 and b/engine/thirdparty/fonts/NotoSansThai_Regular.woff2 differ
diff --git a/engine/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp b/engine/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp
deleted file mode 100644
index 7d89f86d..00000000
--- a/engine/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp
+++ /dev/null
@@ -1,1298 +0,0 @@
-// Copyright (c) 2020-2023 Julian "Jibb" Smart
-// Released under the MIT license. See https://github.com/JibbSmart/GamepadMotionHelpers/blob/main/LICENSE for more info
-// Version 9
-
-#pragma once
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <algorithm> // std::min, std::max and std::clamp
-
-// You don't need to look at these. These will just be used internally by the GamepadMotion class declared below.
-// You can ignore anything in namespace GamepadMotionHelpers.
-class GamepadMotionSettings;
-class GamepadMotion;
-
-namespace GamepadMotionHelpers
-{
-	struct GyroCalibration
-	{
-		float X;
-		float Y;
-		float Z;
-		float AccelMagnitude;
-		int NumSamples;
-	};
-
-	struct Quat
-	{
-		float w;
-		float x;
-		float y;
-		float z;
-
-		Quat();
-		Quat(float inW, float inX, float inY, float inZ);
-		void Set(float inW, float inX, float inY, float inZ);
-		Quat& operator*=(const Quat& rhs);
-		friend Quat operator*(Quat lhs, const Quat& rhs);
-		void Normalize();
-		Quat Normalized() const;
-		void Invert();
-		Quat Inverse() const;
-	};
-
-	struct Vec
-	{
-		float x;
-		float y;
-		float z;
-
-		Vec();
-		Vec(float inValue);
-		Vec(float inX, float inY, float inZ);
-		void Set(float inX, float inY, float inZ);
-		float Length() const;
-		float LengthSquared() const;
-		void Normalize();
-		Vec Normalized() const;
-		float Dot(const Vec& other) const;
-		Vec Cross(const Vec& other) const;
-		Vec Min(const Vec& other) const;
-		Vec Max(const Vec& other) const;
-		Vec Abs() const;
-		Vec Lerp(const Vec& other, float factor) const;
-		Vec Lerp(const Vec& other, const Vec& factor) const;
-		Vec& operator+=(const Vec& rhs);
-		friend Vec operator+(Vec lhs, const Vec& rhs);
-		Vec& operator-=(const Vec& rhs);
-		friend Vec operator-(Vec lhs, const Vec& rhs);
-		Vec& operator*=(const float rhs);
-		friend Vec operator*(Vec lhs, const float rhs);
-		Vec& operator/=(const float rhs);
-		friend Vec operator/(Vec lhs, const float rhs);
-		Vec& operator*=(const Quat& rhs);
-		friend Vec operator*(Vec lhs, const Quat& rhs);
-		Vec operator-() const;
-	};
-
-	struct SensorMinMaxWindow
-	{
-		Vec MinGyro;
-		Vec MaxGyro;
-		Vec MeanGyro;
-		Vec MinAccel;
-		Vec MaxAccel;
-		Vec MeanAccel;
-		Vec StartAccel;
-		int NumSamples = 0;
-		float TimeSampled = 0.f;
-
-		SensorMinMaxWindow();
-		void Reset(float remainder);
-		void AddSample(const Vec& inGyro, const Vec& inAccel, float deltaTime);
-		Vec GetMidGyro();
-	};
-
-	struct AutoCalibration
-	{
-		SensorMinMaxWindow MinMaxWindow;
-		Vec SmoothedAngularVelocityGyro;
-		Vec SmoothedAngularVelocityAccel;
-		Vec SmoothedPreviousAccel;
-		Vec PreviousAccel;
-
-		AutoCalibration();
-		void Reset();
-		bool AddSampleStillness(const Vec& inGyro, const Vec& inAccel, float deltaTime, bool doSensorFusion);
-		void NoSampleStillness();
-		bool AddSampleSensorFusion(const Vec& inGyro, const Vec& inAccel, float deltaTime);
-		void NoSampleSensorFusion();
-		void SetCalibrationData(GyroCalibration* calibrationData);
-		void SetSettings(GamepadMotionSettings* settings);
-		
-		float Confidence = 0.f;
-		bool IsSteady() { return bIsSteady; }
-
-	private:
-		Vec MinDeltaGyro = Vec(1.f);
-		Vec MinDeltaAccel = Vec(0.25f);
-		float RecalibrateThreshold = 1.f;
-		float SensorFusionSkippedTime = 0.f;
-		float TimeSteadySensorFusion = 0.f;
-		float TimeSteadyStillness = 0.f;
-		bool bIsSteady = false;
-
-		GyroCalibration* CalibrationData;
-		GamepadMotionSettings* Settings;
-	};
-
-	struct Motion
-	{
-		Quat Quaternion;
-		Vec Accel;
-		Vec Grav;
-
-		Vec SmoothAccel = Vec();
-		float Shakiness = 0.f;
-		const float ShortSteadinessHalfTime = 0.25f;
-		const float LongSteadinessHalfTime = 1.f;
-
-		Motion();
-		void Reset();
-		void Update(float inGyroX, float inGyroY, float inGyroZ, float inAccelX, float inAccelY, float inAccelZ, float gravityLength, float deltaTime);
-		void SetSettings(GamepadMotionSettings* settings);
-
-	private:
-		GamepadMotionSettings* Settings;
-	};
-
-	enum CalibrationMode
-	{
-		Manual = 0,
-		Stillness = 1,
-		SensorFusion = 2,
-	};
-	
-	// https://stackoverflow.com/a/1448478/1130520
-	inline CalibrationMode operator|(CalibrationMode a, CalibrationMode b)
-	{
-	    return static_cast<CalibrationMode>(static_cast<int>(a) | static_cast<int>(b));
-	}
-	
-	inline CalibrationMode operator&(CalibrationMode a, CalibrationMode b)
-	{
-	    return static_cast<CalibrationMode>(static_cast<int>(a) & static_cast<int>(b));
-	}
-	
-	inline CalibrationMode operator~(CalibrationMode a)
-	{
-		return static_cast<CalibrationMode>(~static_cast<int>(a));
-	}
-	
-	// https://stackoverflow.com/a/23152590/1130520
-	inline CalibrationMode& operator|=(CalibrationMode& a, CalibrationMode b)
-	{
-		return (CalibrationMode&)((int&)(a) |= static_cast<int>(b));
-	}
-	
-	inline CalibrationMode& operator&=(CalibrationMode& a, CalibrationMode b)
-	{
-		return (CalibrationMode&)((int&)(a) &= static_cast<int>(b));
-	}
-}
-
-// Note that I'm using a Y-up coordinate system. This is to follow the convention set by the motion sensors in
-// PlayStation controllers, which was what I was using when writing in this. But for the record, Z-up is
-// better for most games (XY ground-plane in 3D games simplifies using 2D vectors in navigation, for example).
-
-// Gyro units should be degrees per second. Accelerometer should be g-force (approx. 9.8 m/s^2 = 1 g). If you're using
-// radians per second, meters per second squared, etc, conversion should be simple.
-
-class GamepadMotionSettings
-{
-public:
-	int MinStillnessSamples = 10;
-	float MinStillnessCollectionTime = 0.5f;
-	float MinStillnessCorrectionTime = 2.f;
-	float MaxStillnessError = 2.f;
-	float StillnessSampleDeteriorationRate = 0.2f;
-	float StillnessErrorClimbRate = 0.1f;
-	float StillnessErrorDropOnRecalibrate = 0.1f;
-	float StillnessCalibrationEaseInTime = 3.f;
-	float StillnessCalibrationHalfTime = 0.1f;
-	float StillnessConfidenceRate = 1.f;
-
-	float StillnessGyroDelta = -1.f;
-	float StillnessAccelDelta = -1.f;
-
-	float SensorFusionCalibrationSmoothingStrength = 2.f;
-	float SensorFusionAngularAccelerationThreshold = 20.f;
-	float SensorFusionCalibrationEaseInTime = 3.f;
-	float SensorFusionCalibrationHalfTime = 0.1f;
-	float SensorFusionConfidenceRate = 1.f;
-
-	float GravityCorrectionShakinessMaxThreshold = 0.4f;
-	float GravityCorrectionShakinessMinThreshold = 0.01f;
-
-	float GravityCorrectionStillSpeed = 1.f;
-	float GravityCorrectionShakySpeed = 0.1f;
-
-	float GravityCorrectionGyroFactor = 0.1f;
-	float GravityCorrectionGyroMinThreshold = 0.05f;
-	float GravityCorrectionGyroMaxThreshold = 0.25f;
-
-	float GravityCorrectionMinimumSpeed = 0.01f;
-};
-
-class GamepadMotion
-{
-public:
-	GamepadMotion();
-
-	void Reset();
-
-	void ProcessMotion(float gyroX, float gyroY, float gyroZ,
-		float accelX, float accelY, float accelZ, float deltaTime);
-
-	// reading the current state
-	void GetCalibratedGyro(float& x, float& y, float& z);
-	void GetGravity(float& x, float& y, float& z);
-	void GetProcessedAcceleration(float& x, float& y, float& z);
-	void GetOrientation(float& w, float& x, float& y, float& z);
-	void GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor = 1.41f);
-	static void CalculatePlayerSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float yawRelaxFactor = 1.41f);
-	void GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold = 0.125f);
-	static void CalculateWorldSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float sideReductionThreshold = 0.125f);
-
-	// gyro calibration functions
-	void StartContinuousCalibration();
-	void PauseContinuousCalibration();
-	void ResetContinuousCalibration();
-	void GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset);
-	void SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight);
-	float GetAutoCalibrationConfidence();
-	void SetAutoCalibrationConfidence(float newConfidence);
-	bool GetAutoCalibrationIsSteady();
-
-	GamepadMotionHelpers::CalibrationMode GetCalibrationMode();
-	void SetCalibrationMode(GamepadMotionHelpers::CalibrationMode calibrationMode);
-
-	void ResetMotion();
-
-	GamepadMotionSettings Settings;
-
-private:
-	GamepadMotionHelpers::Vec Gyro;
-	GamepadMotionHelpers::Vec RawAccel;
-	GamepadMotionHelpers::Motion Motion;
-	GamepadMotionHelpers::GyroCalibration GyroCalibration;
-	GamepadMotionHelpers::AutoCalibration AutoCalibration;
-	GamepadMotionHelpers::CalibrationMode CurrentCalibrationMode;
-
-	bool IsCalibrating;
-	void PushSensorSamples(float gyroX, float gyroY, float gyroZ, float accelMagnitude);
-	void GetCalibratedSensor(float& gyroOffsetX, float& gyroOffsetY, float& gyroOffsetZ, float& accelMagnitude);
-};
-
-///////////// Everything below here are just implementation details /////////////
-
-namespace GamepadMotionHelpers
-{
-	inline Quat::Quat()
-	{
-		w = 1.0f;
-		x = 0.0f;
-		y = 0.0f;
-		z = 0.0f;
-	}
-
-	inline Quat::Quat(float inW, float inX, float inY, float inZ)
-	{
-		w = inW;
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline static Quat AngleAxis(float inAngle, float inX, float inY, float inZ)
-	{
-		const float sinHalfAngle = sinf(inAngle * 0.5f);
-		Vec inAxis = Vec(inX, inY, inZ);
-		inAxis.Normalize();
-		inAxis *= sinHalfAngle;
-		Quat result = Quat(cosf(inAngle * 0.5f), inAxis.x, inAxis.y, inAxis.z);
-		return result;
-	}
-
-	inline void Quat::Set(float inW, float inX, float inY, float inZ)
-	{
-		w = inW;
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline Quat& Quat::operator*=(const Quat& rhs)
-	{
-		Set(w * rhs.w - x * rhs.x - y * rhs.y - z * rhs.z,
-			w * rhs.x + x * rhs.w + y * rhs.z - z * rhs.y,
-			w * rhs.y - x * rhs.z + y * rhs.w + z * rhs.x,
-			w * rhs.z + x * rhs.y - y * rhs.x + z * rhs.w);
-		return *this;
-	}
-
-	inline Quat operator*(Quat lhs, const Quat& rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline void Quat::Normalize()
-	{
-		const float length = sqrtf(w * w + x * x + y * y + z * z);
-		const float fixFactor = 1.0f / length;
-
-		w *= fixFactor;
-		x *= fixFactor;
-		y *= fixFactor;
-		z *= fixFactor;
-
-		return;
-	}
-
-	inline Quat Quat::Normalized() const
-	{
-		Quat result = *this;
-		result.Normalize();
-		return result;
-	}
-
-	inline void Quat::Invert()
-	{
-		x = -x;
-		y = -y;
-		z = -z;
-		return;
-	}
-
-	inline Quat Quat::Inverse() const
-	{
-		Quat result = *this;
-		result.Invert();
-		return result;
-	}
-
-	inline Vec::Vec()
-	{
-		x = 0.0f;
-		y = 0.0f;
-		z = 0.0f;
-	}
-
-	inline Vec::Vec(float inValue)
-	{
-		x = inValue;
-		y = inValue;
-		z = inValue;
-	}
-
-	inline Vec::Vec(float inX, float inY, float inZ)
-	{
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline void Vec::Set(float inX, float inY, float inZ)
-	{
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline float Vec::Length() const
-	{
-		return sqrtf(x * x + y * y + z * z);
-	}
-
-	inline float Vec::LengthSquared() const
-	{
-		return x * x + y * y + z * z;
-	}
-
-	inline void Vec::Normalize()
-	{
-		const float length = Length();
-		if (length == 0.0)
-		{
-			return;
-		}
-		const float fixFactor = 1.0f / length;
-
-		x *= fixFactor;
-		y *= fixFactor;
-		z *= fixFactor;
-		return;
-	}
-
-	inline Vec Vec::Normalized() const
-	{
-		Vec result = *this;
-		result.Normalize();
-		return result;
-	}
-
-	inline Vec& Vec::operator+=(const Vec& rhs)
-	{
-		Set(x + rhs.x, y + rhs.y, z + rhs.z);
-		return *this;
-	}
-
-	inline Vec operator+(Vec lhs, const Vec& rhs)
-	{
-		lhs += rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator-=(const Vec& rhs)
-	{
-		Set(x - rhs.x, y - rhs.y, z - rhs.z);
-		return *this;
-	}
-
-	inline Vec operator-(Vec lhs, const Vec& rhs)
-	{
-		lhs -= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator*=(const float rhs)
-	{
-		Set(x * rhs, y * rhs, z * rhs);
-		return *this;
-	}
-
-	inline Vec operator*(Vec lhs, const float rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator/=(const float rhs)
-	{
-		Set(x / rhs, y / rhs, z / rhs);
-		return *this;
-	}
-
-	inline Vec operator/(Vec lhs, const float rhs)
-	{
-		lhs /= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator*=(const Quat& rhs)
-	{
-		Quat temp = rhs * Quat(0.0f, x, y, z) * rhs.Inverse();
-		Set(temp.x, temp.y, temp.z);
-		return *this;
-	}
-
-	inline Vec operator*(Vec lhs, const Quat& rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline Vec Vec::operator-() const
-	{
-		Vec result = Vec(-x, -y, -z);
-		return result;
-	}
-
-	inline float Vec::Dot(const Vec& other) const
-	{
-		return x * other.x + y * other.y + z * other.z;
-	}
-
-	inline Vec Vec::Cross(const Vec& other) const
-	{
-		return Vec(y * other.z - z * other.y,
-			z * other.x - x * other.z,
-			x * other.y - y * other.x);
-	}
-
-	inline Vec Vec::Min(const Vec& other) const
-	{
-		return Vec(x < other.x ? x : other.x,
-			y < other.y ? y : other.y,
-			z < other.z ? z : other.z);
-	}
-	
-	inline Vec Vec::Max(const Vec& other) const
-	{
-		return Vec(x > other.x ? x : other.x,
-			y > other.y ? y : other.y,
-			z > other.z ? z : other.z);
-	}
-
-	inline Vec Vec::Abs() const
-	{
-		return Vec(x > 0 ? x : -x,
-			y > 0 ? y : -y,
-			z > 0 ? z : -z);
-	}
-
-	inline Vec Vec::Lerp(const Vec& other, float factor) const
-	{
-		return *this + (other - *this) * factor;
-	}
-
-	inline Vec Vec::Lerp(const Vec& other, const Vec& factor) const
-	{
-		return Vec(this->x + (other.x - this->x) * factor.x,
-			this->y + (other.y - this->y) * factor.y,
-			this->z + (other.z - this->z) * factor.z);
-	}
-
-	inline Motion::Motion()
-	{
-		Reset();
-	}
-
-	inline void Motion::Reset()
-	{
-		Quaternion.Set(1.f, 0.f, 0.f, 0.f);
-		Accel.Set(0.f, 0.f, 0.f);
-		Grav.Set(0.f, 0.f, 0.f);
-		SmoothAccel.Set(0.f, 0.f, 0.f);
-		Shakiness = 0.f;
-	}
-
-	/// <summary>
-	/// The gyro inputs should be calibrated degrees per second but have no other processing. Acceleration is in G units (1 = approx. 9.8m/s^2)
-	/// </summary>
-	inline void Motion::Update(float inGyroX, float inGyroY, float inGyroZ, float inAccelX, float inAccelY, float inAccelZ, float gravityLength, float deltaTime)
-	{
-		if (!Settings)
-		{
-			return;
-		}
-
-		// get settings
-		const float gravityCorrectionShakinessMinThreshold = Settings->GravityCorrectionShakinessMinThreshold;
-		const float gravityCorrectionShakinessMaxThreshold = Settings->GravityCorrectionShakinessMaxThreshold;
-		const float gravityCorrectionStillSpeed = Settings->GravityCorrectionStillSpeed;
-		const float gravityCorrectionShakySpeed = Settings->GravityCorrectionShakySpeed;
-		const float gravityCorrectionGyroFactor = Settings->GravityCorrectionGyroFactor;
-		const float gravityCorrectionGyroMinThreshold = Settings->GravityCorrectionGyroMinThreshold;
-		const float gravityCorrectionGyroMaxThreshold = Settings->GravityCorrectionGyroMaxThreshold;
-		const float gravityCorrectionMinimumSpeed = Settings->GravityCorrectionMinimumSpeed;
-
-		const Vec axis = Vec(inGyroX, inGyroY, inGyroZ);
-		const Vec accel = Vec(inAccelX, inAccelY, inAccelZ);
-		const float angleSpeed = axis.Length() * (float)M_PI / 180.0f;
-		const float angle = angleSpeed * deltaTime;
-
-		// rotate
-		Quat rotation = AngleAxis(angle, axis.x, axis.y, axis.z);
-		Quaternion *= rotation; // do it this way because it's a local rotation, not global
-
-		//printf("Quat: %.4f %.4f %.4f %.4f\n",
-		//	Quaternion.w, Quaternion.x, Quaternion.y, Quaternion.z);
-		float accelMagnitude = accel.Length();
-		if (accelMagnitude > 0.0f)
-		{
-			const Vec accelNorm = accel / accelMagnitude;
-			// account for rotation when tracking smoothed acceleration
-			SmoothAccel *= rotation.Inverse();
-			//printf("Absolute Accel: %.4f %.4f %.4f\n",
-			//	absoluteAccel.x, absoluteAccel.y, absoluteAccel.z);
-			const float smoothFactor = ShortSteadinessHalfTime <= 0.f ? 0.f : exp2f(-deltaTime / ShortSteadinessHalfTime);
-			Shakiness *= smoothFactor;
-			Shakiness = std::max(Shakiness, (accel - SmoothAccel).Length());
-			SmoothAccel = accel.Lerp(SmoothAccel, smoothFactor);
-
-			//printf("Shakiness: %.4f\n", Shakiness);
-
-			// update grav by rotation
-			Grav *= rotation.Inverse();
-			// we want to close the gap between grav and raw acceleration. What's the difference
-			const Vec gravToAccel = (accelNorm * -gravityLength) - Grav;
-			const Vec gravToAccelDir = gravToAccel.Normalized();
-			// adjustment rate
-			float gravCorrectionSpeed;
-			if (gravityCorrectionShakinessMinThreshold < gravityCorrectionShakinessMaxThreshold)
-			{
-				gravCorrectionSpeed = gravityCorrectionStillSpeed + (gravityCorrectionShakySpeed - gravityCorrectionStillSpeed) * std::clamp((Shakiness - gravityCorrectionShakinessMinThreshold) / (gravityCorrectionShakinessMaxThreshold - gravityCorrectionShakinessMinThreshold), 0.f, 1.f);
-			}
-			else
-			{
-				gravCorrectionSpeed = Shakiness < gravityCorrectionShakinessMaxThreshold ? gravityCorrectionStillSpeed : gravityCorrectionShakySpeed;
-			}
-			// we also limit it to be no faster than a given proportion of the gyro rate, or the minimum gravity correction speed
-			const float gyroGravCorrectionLimit = std::max(angleSpeed * gravityCorrectionGyroFactor, gravityCorrectionMinimumSpeed);
-			if (gravCorrectionSpeed > gyroGravCorrectionLimit)
-			{
-				float closeEnoughFactor;
-				if (gravityCorrectionGyroMinThreshold < gravityCorrectionGyroMaxThreshold)
-				{
-					closeEnoughFactor = std::clamp((gravToAccel.Length() - gravityCorrectionGyroMinThreshold) / (gravityCorrectionGyroMaxThreshold - gravityCorrectionGyroMinThreshold), 0.f, 1.f);
-				}
-				else
-				{
-					closeEnoughFactor = gravToAccel.Length() < gravityCorrectionGyroMaxThreshold ? 0.f : 1.f;
-				}
-				gravCorrectionSpeed = gyroGravCorrectionLimit + (gravCorrectionSpeed - gyroGravCorrectionLimit) * closeEnoughFactor;
-			}
-			const Vec gravToAccelDelta = gravToAccelDir * gravCorrectionSpeed * deltaTime;
-			if (gravToAccelDelta.LengthSquared() < gravToAccel.LengthSquared())
-			{
-				Grav += gravToAccelDelta;
-			}
-			else
-			{
-				Grav = accelNorm * -gravityLength;
-			}
-
-			const Vec gravityDirection = Grav.Normalized() * Quaternion.Inverse(); // absolute gravity direction
-			const float errorAngle = acosf(std::clamp(Vec(0.0f, -1.0f, 0.0f).Dot(gravityDirection), -1.f, 1.f));
-			const Vec flattened = Vec(0.0f, -1.0f, 0.0f).Cross(gravityDirection);
-			Quat correctionQuat = AngleAxis(errorAngle, flattened.x, flattened.y, flattened.z);
-			Quaternion = Quaternion * correctionQuat;
-			
-			Accel = accel + Grav;
-		}
-		else
-		{
-			Grav *= rotation.Inverse();
-			Accel = Grav;
-		}
-		Quaternion.Normalize();
-	}
-
-	inline void Motion::SetSettings(GamepadMotionSettings* settings)
-	{
-		Settings = settings;
-	}
-
-	inline SensorMinMaxWindow::SensorMinMaxWindow()
-	{
-		Reset(0.f);
-	}
-
-	inline void SensorMinMaxWindow::Reset(float remainder)
-	{
-		NumSamples = 0;
-		TimeSampled = remainder;
-	}
-
-	inline void SensorMinMaxWindow::AddSample(const Vec& inGyro, const Vec& inAccel, float deltaTime)
-	{
-		if (NumSamples == 0)
-		{
-			MaxGyro = inGyro;
-			MinGyro = inGyro;
-			MeanGyro = inGyro;
-			MaxAccel = inAccel;
-			MinAccel = inAccel;
-			MeanAccel = inAccel;
-			StartAccel = inAccel;
-			NumSamples = 1;
-			TimeSampled += deltaTime;
-			return;
-		}
-
-		MaxGyro = MaxGyro.Max(inGyro);
-		MinGyro = MinGyro.Min(inGyro);
-		MaxAccel = MaxAccel.Max(inAccel);
-		MinAccel = MinAccel.Min(inAccel);
-
-		NumSamples++;
-		TimeSampled += deltaTime;
-
-		Vec delta = inGyro - MeanGyro;
-		MeanGyro += delta * (1.f / NumSamples);
-		delta = inAccel - MeanAccel;
-		MeanAccel += delta * (1.f / NumSamples);
-	}
-
-	inline Vec SensorMinMaxWindow::GetMidGyro()
-	{
-		return MeanGyro;
-	}
-
-	inline AutoCalibration::AutoCalibration()
-	{
-		CalibrationData = nullptr;
-		Reset();
-	}
-
-	inline void AutoCalibration::Reset()
-	{
-		MinMaxWindow.Reset(0.f);
-		Confidence = 0.f;
-		bIsSteady = false;
-		MinDeltaGyro = Vec(1.f);
-		MinDeltaAccel = Vec(0.25f);
-		RecalibrateThreshold = 1.f;
-		SensorFusionSkippedTime = 0.f;
-		TimeSteadySensorFusion = 0.f;
-		TimeSteadyStillness = 0.f;
-	}
-
-	inline bool AutoCalibration::AddSampleStillness(const Vec& inGyro, const Vec& inAccel, float deltaTime, bool doSensorFusion)
-	{
-		if (inGyro.x == 0.f && inGyro.y == 0.f && inGyro.z == 0.f &&
-			inAccel.x == 0.f && inAccel.y == 0.f && inAccel.z == 0.f)
-		{
-			// zeroes are almost certainly not valid inputs
-			return false;
-		}
-
-		if (!Settings)
-		{
-			return false;
-		}
-
-		if (!CalibrationData)
-		{
-			return false;
-		}
-
-		// get settings
-		const int minStillnessSamples = Settings->MinStillnessSamples;
-		const float minStillnessCollectionTime = Settings->MinStillnessCollectionTime;
-		const float minStillnessCorrectionTime = Settings->MinStillnessCorrectionTime;
-		const float maxStillnessError = Settings->MaxStillnessError;
-		const float stillnessSampleDeteriorationRate = Settings->StillnessSampleDeteriorationRate;
-		const float stillnessErrorClimbRate = Settings->StillnessErrorClimbRate;
-		const float stillnessErrorDropOnRecalibrate = Settings->StillnessErrorDropOnRecalibrate;
-		const float stillnessCalibrationEaseInTime = Settings->StillnessCalibrationEaseInTime;
-		const float stillnessCalibrationHalfTime = Settings->StillnessCalibrationHalfTime * Confidence;
-		const float stillnessConfidenceRate = Settings->StillnessConfidenceRate;
-		const float stillnessGyroDelta = Settings->StillnessGyroDelta;
-		const float stillnessAccelDelta = Settings->StillnessAccelDelta;
-
-		MinMaxWindow.AddSample(inGyro, inAccel, deltaTime);
-		// get deltas
-		const Vec gyroDelta = MinMaxWindow.MaxGyro - MinMaxWindow.MinGyro;
-		const Vec accelDelta = MinMaxWindow.MaxAccel - MinMaxWindow.MinAccel;
-
-		bool calibrated = false;
-		bool isSteady = false;
-		const Vec climbThisTick = Vec(stillnessSampleDeteriorationRate * deltaTime);
-		if (stillnessGyroDelta < 0.f)
-		{
-			if (Confidence < 1.f)
-			{
-				MinDeltaGyro += climbThisTick;
-			}
-		}
-		else
-		{
-			MinDeltaGyro = Vec(stillnessGyroDelta);
-		}
-		if (stillnessAccelDelta < 0.f)
-		{
-			if (Confidence < 1.f)
-			{
-				MinDeltaAccel += climbThisTick;
-			}
-		}
-		else
-		{
-			MinDeltaAccel = Vec(stillnessAccelDelta);
-		}
-
-		//printf("Deltas: %.4f %.4f %.4f; %.4f %.4f %.4f\n",
-		//	gyroDelta.x, gyroDelta.y, gyroDelta.z,
-		//	accelDelta.x, accelDelta.y, accelDelta.z);
-
-		if (MinMaxWindow.NumSamples >= minStillnessSamples && MinMaxWindow.TimeSampled >= minStillnessCollectionTime)
-		{
-			MinDeltaGyro = MinDeltaGyro.Min(gyroDelta);
-			MinDeltaAccel = MinDeltaAccel.Min(accelDelta);
-		}
-		else
-		{
-			RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			return false;
-		}
-
-		// check that all inputs are below appropriate thresholds to be considered "still"
-		if (gyroDelta.x <= MinDeltaGyro.x * RecalibrateThreshold &&
-			gyroDelta.y <= MinDeltaGyro.y * RecalibrateThreshold &&
-			gyroDelta.z <= MinDeltaGyro.z * RecalibrateThreshold &&
-			accelDelta.x <= MinDeltaAccel.x * RecalibrateThreshold &&
-			accelDelta.y <= MinDeltaAccel.y * RecalibrateThreshold &&
-			accelDelta.z <= MinDeltaAccel.z * RecalibrateThreshold)
-		{
-			if (MinMaxWindow.NumSamples >= minStillnessSamples && MinMaxWindow.TimeSampled >= minStillnessCorrectionTime)
-			{
-				TimeSteadyStillness = std::min(TimeSteadyStillness + deltaTime, stillnessCalibrationEaseInTime);
-				const float calibrationEaseIn = stillnessCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadyStillness / stillnessCalibrationEaseInTime;
-
-				const Vec calibratedGyro = MinMaxWindow.GetMidGyro();
-
-				const Vec oldGyroBias = Vec(CalibrationData->X, CalibrationData->Y, CalibrationData->Z) / std::max((float)CalibrationData->NumSamples, 1.f);
-				const float stillnessLerpFactor = stillnessCalibrationHalfTime <= 0.f ? 0.f : exp2f(-calibrationEaseIn * deltaTime / stillnessCalibrationHalfTime);
-				Vec newGyroBias = calibratedGyro.Lerp(oldGyroBias, stillnessLerpFactor);
-				Confidence = std::min(Confidence + deltaTime * stillnessConfidenceRate, 1.f);
-				isSteady = true;
-
-				if (doSensorFusion)
-				{
-					const Vec previousNormal = MinMaxWindow.StartAccel.Normalized();
-					const Vec thisNormal = inAccel.Normalized();
-					Vec angularVelocity = thisNormal.Cross(previousNormal);
-					const float crossLength = angularVelocity.Length();
-					if (crossLength > 0.f)
-					{
-						const float thisDotPrev = std::clamp(thisNormal.Dot(previousNormal), -1.f, 1.f);
-						const float angleChange = acosf(thisDotPrev) * 180.0f / (float)M_PI;
-						const float anglePerSecond = angleChange / MinMaxWindow.TimeSampled;
-						angularVelocity *= anglePerSecond / crossLength;
-					}
-
-					Vec axisCalibrationStrength = thisNormal.Abs();
-					Vec sensorFusionBias = (calibratedGyro - angularVelocity).Lerp(oldGyroBias, stillnessLerpFactor);
-					if (axisCalibrationStrength.x <= 0.7f)
-					{
-						newGyroBias.x = sensorFusionBias.x;
-					}
-					if (axisCalibrationStrength.y <= 0.7f)
-					{
-						newGyroBias.y = sensorFusionBias.y;
-					}
-					if (axisCalibrationStrength.z <= 0.7f)
-					{
-						newGyroBias.z = sensorFusionBias.z;
-					}
-				}
-
-				CalibrationData->X = newGyroBias.x;
-				CalibrationData->Y = newGyroBias.y;
-				CalibrationData->Z = newGyroBias.z;
-
-				CalibrationData->AccelMagnitude = MinMaxWindow.MeanAccel.Length();
-				CalibrationData->NumSamples = 1;
-
-				calibrated = true;
-			}
-			else
-			{
-				RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			}
-		}
-		else if (TimeSteadyStillness > 0.f)
-		{
-			//printf("Moved!\n");
-			RecalibrateThreshold -= stillnessErrorDropOnRecalibrate;
-			if (RecalibrateThreshold < 1.f) RecalibrateThreshold = 1.f;
-
-			TimeSteadyStillness = 0.f;
-			MinMaxWindow.Reset(0.f);
-		}
-		else
-		{
-			RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			MinMaxWindow.Reset(0.f);
-		}
-
-		bIsSteady = isSteady;
-		return calibrated;
-	}
-
-	inline void AutoCalibration::NoSampleStillness()
-	{
-		MinMaxWindow.Reset(0.f);
-	}
-
-	inline bool AutoCalibration::AddSampleSensorFusion(const Vec& inGyro, const Vec& inAccel, float deltaTime)
-	{
-		if (deltaTime <= 0.f)
-		{
-			return false;
-		}
-
-		if (inGyro.x == 0.f && inGyro.y == 0.f && inGyro.z == 0.f &&
-			inAccel.x == 0.f && inAccel.y == 0.f && inAccel.z == 0.f)
-		{
-			// all zeroes are almost certainly not valid inputs
-			TimeSteadySensorFusion = 0.f;
-			SensorFusionSkippedTime = 0.f;
-			PreviousAccel = inAccel;
-			SmoothedPreviousAccel = inAccel;
-			SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-			SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-			return false;
-		}
-
-		if (PreviousAccel.x == 0.f && PreviousAccel.y == 0.f && PreviousAccel.z == 0.f)
-		{
-			TimeSteadySensorFusion = 0.f;
-			SensorFusionSkippedTime = 0.f;
-			PreviousAccel = inAccel;
-			SmoothedPreviousAccel = inAccel;
-			SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-			SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-			return false;
-		}
-
-		// in case the controller state hasn't updated between samples
-		if (inAccel.x == PreviousAccel.x && inAccel.y == PreviousAccel.y && inAccel.z == PreviousAccel.z)
-		{
-			SensorFusionSkippedTime += deltaTime;
-			return false;
-		}
-
-		if (!Settings)
-		{
-			return false;
-		}
-
-		// get settings
-		const float sensorFusionCalibrationSmoothingStrength = Settings->SensorFusionCalibrationSmoothingStrength;
-		const float sensorFusionAngularAccelerationThreshold = Settings->SensorFusionAngularAccelerationThreshold;
-		const float sensorFusionCalibrationEaseInTime = Settings->SensorFusionCalibrationEaseInTime;
-		const float sensorFusionCalibrationHalfTime = Settings->SensorFusionCalibrationHalfTime * Confidence;
-		const float sensorFusionConfidenceRate = Settings->SensorFusionConfidenceRate;
-
-		deltaTime += SensorFusionSkippedTime;
-		SensorFusionSkippedTime = 0.f;
-		bool calibrated = false;
-		bool isSteady = false;
-		
-		// framerate independent lerp smoothing: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php
-		const float smoothingLerpFactor = exp2f(-sensorFusionCalibrationSmoothingStrength * deltaTime);
-		// velocity from smoothed accel matches better if we also smooth gyro
-		const Vec previousGyro = SmoothedAngularVelocityGyro;
-		SmoothedAngularVelocityGyro = inGyro.Lerp(SmoothedAngularVelocityGyro, smoothingLerpFactor); // smooth what remains
-		const float gyroAccelerationMag = (SmoothedAngularVelocityGyro - previousGyro).Length() / deltaTime;
-		// get angle between old and new accel
-		const Vec previousNormal = SmoothedPreviousAccel.Normalized();
-		const Vec thisAccel = inAccel.Lerp(SmoothedPreviousAccel, smoothingLerpFactor);
-		const Vec thisNormal = thisAccel.Normalized();
-		Vec angularVelocity = thisNormal.Cross(previousNormal);
-		const float crossLength = angularVelocity.Length();
-		if (crossLength > 0.f)
-		{
-			const float thisDotPrev = std::clamp(thisNormal.Dot(previousNormal), -1.f, 1.f);
-			const float angleChange = acosf(thisDotPrev) * 180.0f / (float)M_PI;
-			const float anglePerSecond = angleChange / deltaTime;
-			angularVelocity *= anglePerSecond / crossLength;
-		}
-		SmoothedAngularVelocityAccel = angularVelocity;
-
-		// apply corrections
-		if (gyroAccelerationMag > sensorFusionAngularAccelerationThreshold || CalibrationData == nullptr)
-		{
-			TimeSteadySensorFusion = 0.f;
-			//printf("No calibration due to acceleration of %.4f\n", gyroAccelerationMag);
-		}
-		else
-		{
-			TimeSteadySensorFusion = std::min(TimeSteadySensorFusion + deltaTime, sensorFusionCalibrationEaseInTime);
-			const float calibrationEaseIn = sensorFusionCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadySensorFusion / sensorFusionCalibrationEaseInTime;
-			const Vec oldGyroBias = Vec(CalibrationData->X, CalibrationData->Y, CalibrationData->Z) / std::max((float)CalibrationData->NumSamples, 1.f);
-			// recalibrate over time proportional to the difference between the calculated bias and the current assumed bias
-			const float sensorFusionLerpFactor = sensorFusionCalibrationHalfTime <= 0.f ? 0.f : exp2f(-calibrationEaseIn * deltaTime / sensorFusionCalibrationHalfTime);
-			Vec newGyroBias = (SmoothedAngularVelocityGyro - SmoothedAngularVelocityAccel).Lerp(oldGyroBias, sensorFusionLerpFactor);
-			Confidence = std::min(Confidence + deltaTime * sensorFusionConfidenceRate, 1.f);
-			isSteady = true;
-			// don't change bias in axes that can't be affected by the gravity direction
-			Vec axisCalibrationStrength = thisNormal.Abs();
-			if (axisCalibrationStrength.x > 0.7f)
-			{
-				axisCalibrationStrength.x = 1.f;
-			}
-			if (axisCalibrationStrength.y > 0.7f)
-			{
-				axisCalibrationStrength.y = 1.f;
-			}
-			if (axisCalibrationStrength.z > 0.7f)
-			{
-				axisCalibrationStrength.z = 1.f;
-			}
-			newGyroBias = newGyroBias.Lerp(oldGyroBias, axisCalibrationStrength.Min(Vec(1.f)));
-
-			CalibrationData->X = newGyroBias.x;
-			CalibrationData->Y = newGyroBias.y;
-			CalibrationData->Z = newGyroBias.z;
-
-			CalibrationData->AccelMagnitude = thisAccel.Length();
-
-			CalibrationData->NumSamples = 1;
-
-			calibrated = true;
-
-			//printf("Recalibrating at a strength of %.4f\n", calibrationEaseIn);
-		}
-
-		SmoothedPreviousAccel = thisAccel;
-		PreviousAccel = inAccel;
-
-		//printf("Gyro: %.4f, %.4f, %.4f | Accel: %.4f, %.4f, %.4f\n",
-		//	SmoothedAngularVelocityGyro.x, SmoothedAngularVelocityGyro.y, SmoothedAngularVelocityGyro.z,
-		//	SmoothedAngularVelocityAccel.x, SmoothedAngularVelocityAccel.y, SmoothedAngularVelocityAccel.z);
-
-		bIsSteady = isSteady;
-
-		return calibrated;
-	}
-
-	inline void AutoCalibration::NoSampleSensorFusion()
-	{
-		TimeSteadySensorFusion = 0.f;
-		SensorFusionSkippedTime = 0.f;
-		PreviousAccel = GamepadMotionHelpers::Vec();
-		SmoothedPreviousAccel = GamepadMotionHelpers::Vec();
-		SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-		SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-	}
-
-	inline void AutoCalibration::SetCalibrationData(GyroCalibration* calibrationData)
-	{
-		CalibrationData = calibrationData;
-	}
-
-	inline void AutoCalibration::SetSettings(GamepadMotionSettings* settings)
-	{
-		Settings = settings;
-	}
-
-} // namespace GamepadMotionHelpers
-
-inline GamepadMotion::GamepadMotion()
-{
-	IsCalibrating = false;
-	CurrentCalibrationMode = GamepadMotionHelpers::CalibrationMode::Manual;
-	Reset();
-	AutoCalibration.SetCalibrationData(&GyroCalibration);
-	AutoCalibration.SetSettings(&Settings);
-	Motion.SetSettings(&Settings);
-}
-
-inline void GamepadMotion::Reset()
-{
-	GyroCalibration = {};
-	Gyro = {};
-	RawAccel = {};
-	Settings = GamepadMotionSettings();
-	Motion.Reset();
-}
-
-inline void GamepadMotion::ProcessMotion(float gyroX, float gyroY, float gyroZ,
-	float accelX, float accelY, float accelZ, float deltaTime)
-{
-	if (gyroX == 0.f && gyroY == 0.f && gyroZ == 0.f &&
-		accelX == 0.f && accelY == 0.f && accelZ == 0.f)
-	{
-		// all zeroes are almost certainly not valid inputs
-		return;
-	}
-
-	float accelMagnitude = sqrtf(accelX * accelX + accelY * accelY + accelZ * accelZ);
-
-	if (IsCalibrating)
-	{
-		// manual calibration
-		PushSensorSamples(gyroX, gyroY, gyroZ, accelMagnitude);
-		AutoCalibration.NoSampleSensorFusion();
-		AutoCalibration.NoSampleStillness();
-	}
-	else if (CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::Stillness)
-	{
-		AutoCalibration.AddSampleStillness(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ), GamepadMotionHelpers::Vec(accelX, accelY, accelZ), deltaTime, CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::SensorFusion);
-		AutoCalibration.NoSampleSensorFusion();
-	}
-	else
-	{
-		AutoCalibration.NoSampleStillness();
-		if (CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::SensorFusion)
-		{
-			AutoCalibration.AddSampleSensorFusion(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ), GamepadMotionHelpers::Vec(accelX, accelY, accelZ), deltaTime);
-		}
-		else
-		{
-			AutoCalibration.NoSampleSensorFusion();
-		}
-	}
-
-	float gyroOffsetX, gyroOffsetY, gyroOffsetZ;
-	GetCalibratedSensor(gyroOffsetX, gyroOffsetY, gyroOffsetZ, accelMagnitude);
-
-	gyroX -= gyroOffsetX;
-	gyroY -= gyroOffsetY;
-	gyroZ -= gyroOffsetZ;
-
-	Motion.Update(gyroX, gyroY, gyroZ, accelX, accelY, accelZ, accelMagnitude, deltaTime);
-
-	Gyro.x = gyroX;
-	Gyro.y = gyroY;
-	Gyro.z = gyroZ;
-	RawAccel.x = accelX;
-	RawAccel.y = accelY;
-	RawAccel.z = accelZ;
-}
-
-// reading the current state
-inline void GamepadMotion::GetCalibratedGyro(float& x, float& y, float& z)
-{
-	x = Gyro.x;
-	y = Gyro.y;
-	z = Gyro.z;
-}
-
-inline void GamepadMotion::GetGravity(float& x, float& y, float& z)
-{
-	x = Motion.Grav.x;
-	y = Motion.Grav.y;
-	z = Motion.Grav.z;
-}
-
-inline void GamepadMotion::GetProcessedAcceleration(float& x, float& y, float& z)
-{
-	x = Motion.Accel.x;
-	y = Motion.Accel.y;
-	z = Motion.Accel.z;
-}
-
-inline void GamepadMotion::GetOrientation(float& w, float& x, float& y, float& z)
-{
-	w = Motion.Quaternion.w;
-	x = Motion.Quaternion.x;
-	y = Motion.Quaternion.y;
-	z = Motion.Quaternion.z;
-}
-
-inline void GamepadMotion::GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor)
-{
-	CalculatePlayerSpaceGyro(x, y, Gyro.x, Gyro.y, Gyro.z, Motion.Grav.x, Motion.Grav.y, Motion.Grav.z, yawRelaxFactor);
-}
-
-inline void GamepadMotion::CalculatePlayerSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float yawRelaxFactor)
-{
-	// take gravity into account without taking on any error from gravity. Explained in depth at http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc7
-	const float worldYaw = -(gravY * gyroY + gravZ * gyroZ);
-	const float worldYawSign = worldYaw < 0.f ? -1.f : 1.f;
-	y = worldYawSign * std::min(std::abs(worldYaw) * yawRelaxFactor, sqrtf(gyroY * gyroY + gyroZ * gyroZ));
-	x = gyroX;
-}
-
-inline void GamepadMotion::GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold)
-{
-	CalculateWorldSpaceGyro(x, y, Gyro.x, Gyro.y, Gyro.z, Motion.Grav.x, Motion.Grav.y, Motion.Grav.z, sideReductionThreshold);
-}
-
-inline void GamepadMotion::CalculateWorldSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float sideReductionThreshold)
-{
-	// use the gravity direction as the yaw axis, and derive an appropriate pitch axis. Explained in depth at http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc6
-	const float worldYaw = -gravX * gyroX - gravY * gyroY - gravZ * gyroZ;
-	// project local pitch axis (X) onto gravity plane
-	const float gravDotPitchAxis = gravX;
-	GamepadMotionHelpers::Vec pitchAxis(1.f - gravX * gravDotPitchAxis,
-		-gravY * gravDotPitchAxis,
-		-gravZ * gravDotPitchAxis);
-	// normalize
-	const float pitchAxisLengthSquared = pitchAxis.LengthSquared();
-	if (pitchAxisLengthSquared > 0.f)
-	{
-		const float pitchAxisLength = sqrtf(pitchAxisLengthSquared);
-		const float lengthReciprocal = 1.f / pitchAxisLength;
-		pitchAxis *= lengthReciprocal;
-
-		const float flatness = std::abs(gravY);
-		const float upness = std::abs(gravZ);
-		const float sideReduction = sideReductionThreshold <= 0.f ? 1.f : std::clamp((std::max(flatness, upness) - sideReductionThreshold) / sideReductionThreshold, 0.f, 1.f);
-
-		x = sideReduction * pitchAxis.Dot(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ));
-	}
-	else
-	{
-		x = 0.f;
-	}
-
-	y = worldYaw;
-}
-
-// gyro calibration functions
-inline void GamepadMotion::StartContinuousCalibration()
-{
-	IsCalibrating = true;
-}
-
-inline void GamepadMotion::PauseContinuousCalibration()
-{
-	IsCalibrating = false;
-}
-
-inline void GamepadMotion::ResetContinuousCalibration()
-{
-	GyroCalibration = {};
-	AutoCalibration.Reset();
-}
-
-inline void GamepadMotion::GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset)
-{
-	float accelMagnitude;
-	GetCalibratedSensor(xOffset, yOffset, zOffset, accelMagnitude);
-}
-
-inline void GamepadMotion::SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight)
-{
-	if (GyroCalibration.NumSamples > 1)
-	{
-		GyroCalibration.AccelMagnitude *= ((float)weight) / GyroCalibration.NumSamples;
-	}
-	else
-	{
-		GyroCalibration.AccelMagnitude = (float)weight;
-	}
-
-	GyroCalibration.NumSamples = weight;
-	GyroCalibration.X = xOffset * weight;
-	GyroCalibration.Y = yOffset * weight;
-	GyroCalibration.Z = zOffset * weight;
-}
-
-inline float GamepadMotion::GetAutoCalibrationConfidence()
-{
-	return AutoCalibration.Confidence;
-}
-
-inline void GamepadMotion::SetAutoCalibrationConfidence(float newConfidence)
-{
-	AutoCalibration.Confidence = newConfidence;
-}
-
-inline bool GamepadMotion::GetAutoCalibrationIsSteady()
-{
-	return AutoCalibration.IsSteady();
-}
-
-inline GamepadMotionHelpers::CalibrationMode GamepadMotion::GetCalibrationMode()
-{
-	return CurrentCalibrationMode;
-}
-
-inline void GamepadMotion::SetCalibrationMode(GamepadMotionHelpers::CalibrationMode calibrationMode)
-{
-	CurrentCalibrationMode = calibrationMode;
-}
-
-inline void GamepadMotion::ResetMotion()
-{
-	Motion.Reset();
-}
-
-// Private Methods
-
-inline void GamepadMotion::PushSensorSamples(float gyroX, float gyroY, float gyroZ, float accelMagnitude)
-{
-	// accumulate
-	GyroCalibration.NumSamples++;
-	GyroCalibration.X += gyroX;
-	GyroCalibration.Y += gyroY;
-	GyroCalibration.Z += gyroZ;
-	GyroCalibration.AccelMagnitude += accelMagnitude;
-}
-
-inline void GamepadMotion::GetCalibratedSensor(float& gyroOffsetX, float& gyroOffsetY, float& gyroOffsetZ, float& accelMagnitude)
-{
-	if (GyroCalibration.NumSamples <= 0)
-	{
-		gyroOffsetX = 0.f;
-		gyroOffsetY = 0.f;
-		gyroOffsetZ = 0.f;
-		accelMagnitude = 1.f;
-		return;
-	}
-
-	const float inverseSamples = 1.f / GyroCalibration.NumSamples;
-	gyroOffsetX = GyroCalibration.X * inverseSamples;
-	gyroOffsetY = GyroCalibration.Y * inverseSamples;
-	gyroOffsetZ = GyroCalibration.Z * inverseSamples;
-	accelMagnitude = GyroCalibration.AccelMagnitude * inverseSamples;
-}
diff --git a/engine/thirdparty/gamepadmotionhelpers/LICENSE.txt b/engine/thirdparty/gamepadmotionhelpers/LICENSE.txt
deleted file mode 100644
index a46396a3..00000000
--- a/engine/thirdparty/gamepadmotionhelpers/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2023 Julian "Jibb" Smart
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/engine/thirdparty/gamepadmotionhelpers/patches/0001-fix-warnings.patch b/engine/thirdparty/gamepadmotionhelpers/patches/0001-fix-warnings.patch
deleted file mode 100644
index 3b3c0ce7..00000000
--- a/engine/thirdparty/gamepadmotionhelpers/patches/0001-fix-warnings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp b/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp
-index 02497ac953..7d89f86d7f 100644
---- a/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp
-+++ b/thirdparty/gamepadmotionhelpers/GamepadMotion.hpp
-@@ -810,11 +810,6 @@ namespace GamepadMotionHelpers
- 		{
- 			if (MinMaxWindow.NumSamples >= minStillnessSamples && MinMaxWindow.TimeSampled >= minStillnessCorrectionTime)
- 			{
--				/*if (TimeSteadyStillness == 0.f)
--				{
--					printf("Still!\n");
--				}/**/
--
- 				TimeSteadyStillness = std::min(TimeSteadyStillness + deltaTime, stillnessCalibrationEaseInTime);
- 				const float calibrationEaseIn = stillnessCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadyStillness / stillnessCalibrationEaseInTime;
- 
-@@ -973,20 +968,11 @@ namespace GamepadMotionHelpers
- 		// apply corrections
- 		if (gyroAccelerationMag > sensorFusionAngularAccelerationThreshold || CalibrationData == nullptr)
- 		{
--			/*if (TimeSteadySensorFusion > 0.f)
--			{
--				printf("Shaken!\n");
--			}/**/
- 			TimeSteadySensorFusion = 0.f;
- 			//printf("No calibration due to acceleration of %.4f\n", gyroAccelerationMag);
- 		}
- 		else
- 		{
--			/*if (TimeSteadySensorFusion == 0.f)
--			{
--				printf("Steady!\n");
--			}/**/
--
- 			TimeSteadySensorFusion = std::min(TimeSteadySensorFusion + deltaTime, sensorFusionCalibrationEaseInTime);
- 			const float calibrationEaseIn = sensorFusionCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadySensorFusion / sensorFusionCalibrationEaseInTime;
- 			const Vec oldGyroBias = Vec(CalibrationData->X, CalibrationData->Y, CalibrationData->Z) / std::max((float)CalibrationData->NumSamples, 1.f);
diff --git a/engine/thirdparty/glad/glad/gl.h b/engine/thirdparty/glad/glad/gl.h
index 7f77d6a1..307ea4db 100644
--- a/engine/thirdparty/glad/glad/gl.h
+++ b/engine/thirdparty/glad/glad/gl.h
@@ -67,6 +67,7 @@
 #endif
 
 #define GLAD_GL
+#define GLAD_GLES2
 #define GLAD_OPTION_GL_LOADER
 
 #ifdef __cplusplus
diff --git a/engine/thirdparty/glad/patches/0001-enable-both-gl-and-gles.patch b/engine/thirdparty/glad/patches/0001-enable-both-gl-and-gles.patch
index 1704d8c7..b8274020 100644
--- a/engine/thirdparty/glad/patches/0001-enable-both-gl-and-gles.patch
+++ b/engine/thirdparty/glad/patches/0001-enable-both-gl-and-gles.patch
@@ -47,3 +47,16 @@ index e8cc5ff1d9..ee0cc188fc 100644
 +        _glad_gles_loader_handle = NULL;
      }
  }
+ 
+diff --git a/thirdparty/glad/glad/gl.h b/thirdparty/glad/glad/gl.h
+index 7f77d6a13f..307ea4dbb8 100644
+--- a/thirdparty/glad/glad/gl.h
++++ b/thirdparty/glad/glad/gl.h
+@@ -67,6 +67,7 @@
+ #endif
+ 
+ #define GLAD_GL
++#define GLAD_GLES2
+ #define GLAD_OPTION_GL_LOADER
+ 
+ #ifdef __cplusplus
diff --git a/engine/thirdparty/glslang/LICENSE.txt b/engine/thirdparty/glslang/LICENSE.txt
index 1ea89c03..054e68a4 100644
--- a/engine/thirdparty/glslang/LICENSE.txt
+++ b/engine/thirdparty/glslang/LICENSE.txt
@@ -13,6 +13,9 @@ Other parts, outside of glslang proper, include:
 - update_glslang_sources.py, which is not part of the project proper and does
   not need to be used.
 
+- the SPIR-V "remapper", which is optional, but has the same license as
+  glslang proper
+
 - Google tests and SPIR-V tools, and anything in the external subdirectory
   are external and optional; see them for their respective licenses.
 
diff --git a/engine/thirdparty/glslang/SPIRV/GLSL.ext.ARM.h b/engine/thirdparty/glslang/SPIRV/GLSL.ext.ARM.h
index eef5b03e..14425be1 100644
--- a/engine/thirdparty/glslang/SPIRV/GLSL.ext.ARM.h
+++ b/engine/thirdparty/glslang/SPIRV/GLSL.ext.ARM.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2022, 2025 ARM Limited
+** Copyright (c) 2022 ARM Limited
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
@@ -28,10 +28,8 @@
 #define GLSLextARM_H
 
 static const int GLSLextARMVersion = 100;
-static const int GLSLextARMRevision = 2;
+static const int GLSLextARMRevision = 1;
 
-static const char* const E_SPV_ARM_core_builtins = "SPV_ARM_core_builtins";
-static const char* const E_SPV_ARM_cooperative_matrix_layouts = "SPV_ARM_cooperative_matrix_layouts";
-static const char* const E_SPV_ARM_tensors = "SPV_ARM_tensors";
+static const char * const E_SPV_ARM_core_builtins = "SPV_ARM_core_builtins";
 
 #endif  // #ifndef GLSLextARM_H
diff --git a/engine/thirdparty/glslang/SPIRV/GLSL.ext.EXT.h b/engine/thirdparty/glslang/SPIRV/GLSL.ext.EXT.h
index a5c24252..caab2793 100644
--- a/engine/thirdparty/glslang/SPIRV/GLSL.ext.EXT.h
+++ b/engine/thirdparty/glslang/SPIRV/GLSL.ext.EXT.h
@@ -41,8 +41,5 @@ static const char* const E_SPV_EXT_shader_atomic_float_min_max = "SPV_EXT_shader
 static const char* const E_SPV_EXT_shader_image_int64 = "SPV_EXT_shader_image_int64";
 static const char* const E_SPV_EXT_shader_tile_image = "SPV_EXT_shader_tile_image";
 static const char* const E_SPV_EXT_mesh_shader = "SPV_EXT_mesh_shader";
-static const char* const E_SPV_EXT_float8 = "SPV_EXT_float8";
-static const char* const E_SPV_EXT_shader_64bit_indexing = "SPV_EXT_shader_64bit_indexing";
-static const char* const E_SPV_EXT_shader_invocation_reorder = "SPV_EXT_shader_invocation_reorder";
 
 #endif  // #ifndef GLSLextEXT_H
diff --git a/engine/thirdparty/glslang/SPIRV/GLSL.ext.KHR.h b/engine/thirdparty/glslang/SPIRV/GLSL.ext.KHR.h
index 25dd88ff..1d3af140 100644
--- a/engine/thirdparty/glslang/SPIRV/GLSL.ext.KHR.h
+++ b/engine/thirdparty/glslang/SPIRV/GLSL.ext.KHR.h
@@ -61,10 +61,5 @@ static const char* const E_SPV_KHR_cooperative_matrix           = "SPV_KHR_coope
 static const char* const E_SPV_KHR_maximal_reconvergence        = "SPV_KHR_maximal_reconvergence";
 static const char* const E_SPV_KHR_subgroup_rotate              = "SPV_KHR_subgroup_rotate";
 static const char* const E_SPV_KHR_expect_assume                = "SPV_KHR_expect_assume";
-static const char* const E_SPV_EXT_replicated_composites        = "SPV_EXT_replicated_composites";
-static const char* const E_SPV_KHR_relaxed_extended_instruction = "SPV_KHR_relaxed_extended_instruction";
-static const char* const E_SPV_KHR_integer_dot_product          = "SPV_KHR_integer_dot_product";
-static const char* const E_SPV_NV_cooperative_vector            = "SPV_NV_cooperative_vector";
-static const char* const E_SPV_KHR_bfloat16                     = "SPV_KHR_bfloat16";
 
 #endif  // #ifndef GLSLextKHR_H
diff --git a/engine/thirdparty/glslang/SPIRV/GLSL.ext.NV.h b/engine/thirdparty/glslang/SPIRV/GLSL.ext.NV.h
index 4516d2d5..e4f11e4b 100644
--- a/engine/thirdparty/glslang/SPIRV/GLSL.ext.NV.h
+++ b/engine/thirdparty/glslang/SPIRV/GLSL.ext.NV.h
@@ -27,10 +27,10 @@
 #ifndef GLSLextNV_H
 #define GLSLextNV_H
 
-enum class BuiltIn : unsigned;
-enum class Decoration : unsigned;
-enum class Op : unsigned;
-enum class Capability : unsigned;
+enum BuiltIn;
+enum Decoration;
+enum Op;
+enum Capability;
 
 static const int GLSLextNVVersion = 100;
 static const int GLSLextNVRevision = 11;
@@ -90,15 +90,4 @@ const char* const E_SPV_NV_displacement_micromap = "SPV_NV_displacement_micromap
 //SPV_NV_shader_atomic_fp16_vector
 const char* const E_SPV_NV_shader_atomic_fp16_vector = "SPV_NV_shader_atomic_fp16_vector";
 
-//SPV_NV_tensor_addressing
-const char* const E_SPV_NV_tensor_addressing = "SPV_NV_tensor_addressing";
-
-//SPV_NV_cooperative_matrix2
-const char* const E_SPV_NV_cooperative_matrix2 = "SPV_NV_cooperative_matrix2";
-
-//SPV_NV_cluster_acceleration_structure
-const char* const E_SPV_NV_cluster_acceleration_structure = "SPV_NV_cluster_acceleration_structure";
-
-//SPV_NV_linear_swept_spheres
-const char* const E_SPV_NV_linear_swept_spheres = "SPV_NV_linear_swept_spheres";
 #endif  // #ifndef GLSLextNV_H
diff --git a/engine/thirdparty/glslang/SPIRV/GLSL.ext.QCOM.h b/engine/thirdparty/glslang/SPIRV/GLSL.ext.QCOM.h
index 7633d407..b52990f0 100644
--- a/engine/thirdparty/glslang/SPIRV/GLSL.ext.QCOM.h
+++ b/engine/thirdparty/glslang/SPIRV/GLSL.ext.QCOM.h
@@ -27,10 +27,10 @@
 #ifndef GLSLextQCOM_H
 #define GLSLextQCOM_H
 
-enum class BuiltIn : unsigned;
-enum class Decoration : unsigned;
-enum class Op : unsigned;
-enum class Capability : unsigned;
+enum BuiltIn;
+enum Decoration;
+enum Op;
+enum Capability;
 
 static const int GLSLextQCOMVersion = 100;
 static const int GLSLextQCOMRevision = 1;
@@ -39,10 +39,5 @@ static const int GLSLextQCOMRevision = 1;
 const char* const E_SPV_QCOM_image_processing = "SPV_QCOM_image_processing";
 //SPV_QCOM_image_processing2
 const char* const E_SPV_QCOM_image_processing2 = "SPV_QCOM_image_processing2";
-//SPV_QCOM_cooperative_matrix_conversion
-const char* const E_SPV_QCOM_cooperative_matrix_conversion = "SPV_QCOM_cooperative_matrix_conversion";
-
-//SPV_QCOM_tile_shading
-const char* const E_SPV_QCOM_tile_shading = "SPV_QCOM_tile_shading";
 
 #endif  // #ifndef GLSLextQCOM_H
diff --git a/engine/thirdparty/glslang/SPIRV/GlslangToSpv.cpp b/engine/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
index d4af42f7..1674c550 100644
--- a/engine/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
+++ b/engine/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2014-2016 LunarG, Inc.
 // Copyright (C) 2015-2020 Google, Inc.
-// Copyright (C) 2017, 2022-2025 Arm Limited.
+// Copyright (C) 2017, 2022-2024 Arm Limited.
 // Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
 //
 // All rights reserved.
@@ -40,12 +40,10 @@
 // translate them to SPIR-V.
 //
 
-#include "spirv.hpp11"
+#include "spirv.hpp"
 #include "GlslangToSpv.h"
 #include "SpvBuilder.h"
 #include "SpvTools.h"
-#include "spvUtil.h"
-
 namespace spv {
     #include "GLSL.std.450.h"
     #include "GLSL.ext.KHR.h"
@@ -127,16 +125,15 @@ public:
         glslang::SpvOptions& options);
     virtual ~TGlslangToSpvTraverser() { }
 
-    bool visitAggregate(glslang::TVisit, glslang::TIntermAggregate*) override;
-    bool visitBinary(glslang::TVisit, glslang::TIntermBinary*) override;
-    void visitConstantUnion(glslang::TIntermConstantUnion*) override;
-    bool visitSelection(glslang::TVisit, glslang::TIntermSelection*) override;
-    bool visitSwitch(glslang::TVisit, glslang::TIntermSwitch*) override;
-    void visitSymbol(glslang::TIntermSymbol* symbol) override;
-    bool visitUnary(glslang::TVisit, glslang::TIntermUnary*) override;
-    bool visitLoop(glslang::TVisit, glslang::TIntermLoop*) override;
-    bool visitBranch(glslang::TVisit visit, glslang::TIntermBranch*) override;
-    bool visitVariableDecl(glslang::TVisit, glslang::TIntermVariableDecl*) override;
+    bool visitAggregate(glslang::TVisit, glslang::TIntermAggregate*);
+    bool visitBinary(glslang::TVisit, glslang::TIntermBinary*);
+    void visitConstantUnion(glslang::TIntermConstantUnion*);
+    bool visitSelection(glslang::TVisit, glslang::TIntermSelection*);
+    bool visitSwitch(glslang::TVisit, glslang::TIntermSwitch*);
+    void visitSymbol(glslang::TIntermSymbol* symbol);
+    bool visitUnary(glslang::TVisit, glslang::TIntermUnary*);
+    bool visitLoop(glslang::TVisit, glslang::TIntermLoop*);
+    bool visitBranch(glslang::TVisit visit, glslang::TIntermBranch*);
 
     void finishSpv(bool compileOnly);
     void dumpSpv(std::vector<unsigned int>& out);
@@ -176,7 +173,7 @@ protected:
     spv::LinkageType convertGlslangLinkageToSpv(glslang::TLinkType glslangLinkType);
     void decorateStructType(const glslang::TType&, const glslang::TTypeList* glslangStruct, glslang::TLayoutPacking,
                             const glslang::TQualifier&, spv::Id, const std::vector<spv::Id>& spvMembers);
-    spv::Id makeArraySizeId(const glslang::TArraySizes&, int dim, bool allowZero = false, bool boolType = false);
+    spv::Id makeArraySizeId(const glslang::TArraySizes&, int dim, bool allowZero = false);
     spv::Id accessChainLoad(const glslang::TType& type);
     void    accessChainStore(const glslang::TType& type, spv::Id rvalue);
     void multiTypeStore(const glslang::TType&, spv::Id rValue);
@@ -195,6 +192,7 @@ protected:
     void makeGlobalInitializers(const glslang::TIntermSequence&);
     void collectRayTracingLinkerObjects();
     void visitFunctions(const glslang::TIntermSequence&);
+    void handleFunctionEntry(const glslang::TIntermAggregate* node);
     void translateArguments(const glslang::TIntermAggregate& node, std::vector<spv::Id>& arguments,
         spv::Builder::AccessChain::CoherentFlags &lvalueCoherentFlags);
     void translateArguments(glslang::TIntermUnary& node, std::vector<spv::Id>& arguments);
@@ -211,9 +209,8 @@ protected:
     spv::Id createUnaryMatrixOperation(spv::Op op, OpDecorations&, spv::Id typeId, spv::Id operand,
                                        glslang::TBasicType typeProxy);
     spv::Id createConversion(glslang::TOperator op, OpDecorations&, spv::Id destTypeId, spv::Id operand,
-                             glslang::TBasicType resultBasicType, glslang::TBasicType operandBasicType);
-    spv::Id createIntWidthConversion(spv::Id operand, int vectorSize, spv::Id destType,
-                                     glslang::TBasicType resultBasicType, glslang::TBasicType operandBasicType);
+                             glslang::TBasicType typeProxy);
+    spv::Id createIntWidthConversion(glslang::TOperator op, spv::Id operand, int vectorSize, spv::Id destType);
     spv::Id makeSmearedConstant(spv::Id constant, int vectorSize);
     spv::Id createAtomicOperation(glslang::TOperator op, spv::Decoration precision, spv::Id typeId,
         std::vector<spv::Id>& operands, glslang::TBasicType typeProxy,
@@ -303,16 +300,16 @@ spv::SourceLanguage TranslateSourceLanguage(glslang::EShSource source, EProfile
         case ENoProfile:
         case ECoreProfile:
         case ECompatibilityProfile:
-            return spv::SourceLanguage::GLSL;
+            return spv::SourceLanguageGLSL;
         case EEsProfile:
-            return spv::SourceLanguage::ESSL;
+            return spv::SourceLanguageESSL;
         default:
-            return spv::SourceLanguage::Unknown;
+            return spv::SourceLanguageUnknown;
         }
     case glslang::EShSourceHlsl:
-        return spv::SourceLanguage::HLSL;
+        return spv::SourceLanguageHLSL;
     default:
-        return spv::SourceLanguage::Unknown;
+        return spv::SourceLanguageUnknown;
     }
 }
 
@@ -320,23 +317,23 @@ spv::SourceLanguage TranslateSourceLanguage(glslang::EShSource source, EProfile
 spv::ExecutionModel TranslateExecutionModel(EShLanguage stage, bool isMeshShaderEXT = false)
 {
     switch (stage) {
-    case EShLangVertex:           return spv::ExecutionModel::Vertex;
-    case EShLangFragment:         return spv::ExecutionModel::Fragment;
-    case EShLangCompute:          return spv::ExecutionModel::GLCompute;
-    case EShLangTessControl:      return spv::ExecutionModel::TessellationControl;
-    case EShLangTessEvaluation:   return spv::ExecutionModel::TessellationEvaluation;
-    case EShLangGeometry:         return spv::ExecutionModel::Geometry;
-    case EShLangRayGen:           return spv::ExecutionModel::RayGenerationKHR;
-    case EShLangIntersect:        return spv::ExecutionModel::IntersectionKHR;
-    case EShLangAnyHit:           return spv::ExecutionModel::AnyHitKHR;
-    case EShLangClosestHit:       return spv::ExecutionModel::ClosestHitKHR;
-    case EShLangMiss:             return spv::ExecutionModel::MissKHR;
-    case EShLangCallable:         return spv::ExecutionModel::CallableKHR;
-    case EShLangTask:             return (isMeshShaderEXT)? spv::ExecutionModel::TaskEXT : spv::ExecutionModel::TaskNV;
-    case EShLangMesh:             return (isMeshShaderEXT)? spv::ExecutionModel::MeshEXT : spv::ExecutionModel::MeshNV;
+    case EShLangVertex:           return spv::ExecutionModelVertex;
+    case EShLangFragment:         return spv::ExecutionModelFragment;
+    case EShLangCompute:          return spv::ExecutionModelGLCompute;
+    case EShLangTessControl:      return spv::ExecutionModelTessellationControl;
+    case EShLangTessEvaluation:   return spv::ExecutionModelTessellationEvaluation;
+    case EShLangGeometry:         return spv::ExecutionModelGeometry;
+    case EShLangRayGen:           return spv::ExecutionModelRayGenerationKHR;
+    case EShLangIntersect:        return spv::ExecutionModelIntersectionKHR;
+    case EShLangAnyHit:           return spv::ExecutionModelAnyHitKHR;
+    case EShLangClosestHit:       return spv::ExecutionModelClosestHitKHR;
+    case EShLangMiss:             return spv::ExecutionModelMissKHR;
+    case EShLangCallable:         return spv::ExecutionModelCallableKHR;
+    case EShLangTask:             return (isMeshShaderEXT)? spv::ExecutionModelTaskEXT : spv::ExecutionModelTaskNV;
+    case EShLangMesh:             return (isMeshShaderEXT)? spv::ExecutionModelMeshEXT: spv::ExecutionModelMeshNV;
     default:
         assert(0);
-        return spv::ExecutionModel::Fragment;
+        return spv::ExecutionModelFragment;
     }
 }
 
@@ -344,17 +341,17 @@ spv::ExecutionModel TranslateExecutionModel(EShLanguage stage, bool isMeshShader
 spv::Dim TranslateDimensionality(const glslang::TSampler& sampler)
 {
     switch (sampler.dim) {
-    case glslang::Esd1D:      return spv::Dim::Dim1D;
-    case glslang::Esd2D:      return spv::Dim::Dim2D;
-    case glslang::Esd3D:      return spv::Dim::Dim3D;
-    case glslang::EsdCube:    return spv::Dim::Cube;
-    case glslang::EsdRect:    return spv::Dim::Rect;
-    case glslang::EsdBuffer:  return spv::Dim::Buffer;
-    case glslang::EsdSubpass: return spv::Dim::SubpassData;
-    case glslang::EsdAttachmentEXT: return spv::Dim::TileImageDataEXT;
+    case glslang::Esd1D:      return spv::Dim1D;
+    case glslang::Esd2D:      return spv::Dim2D;
+    case glslang::Esd3D:      return spv::Dim3D;
+    case glslang::EsdCube:    return spv::DimCube;
+    case glslang::EsdRect:    return spv::DimRect;
+    case glslang::EsdBuffer:  return spv::DimBuffer;
+    case glslang::EsdSubpass: return spv::DimSubpassData;
+    case glslang::EsdAttachmentEXT: return spv::DimTileImageDataEXT;
     default:
         assert(0);
-        return spv::Dim::Dim2D;
+        return spv::Dim2D;
     }
 }
 
@@ -362,8 +359,8 @@ spv::Dim TranslateDimensionality(const glslang::TSampler& sampler)
 spv::Decoration TranslatePrecisionDecoration(glslang::TPrecisionQualifier glslangPrecision)
 {
     switch (glslangPrecision) {
-    case glslang::EpqLow:    return spv::Decoration::RelaxedPrecision;
-    case glslang::EpqMedium: return spv::Decoration::RelaxedPrecision;
+    case glslang::EpqLow:    return spv::DecorationRelaxedPrecision;
+    case glslang::EpqMedium: return spv::DecorationRelaxedPrecision;
     default:
         return spv::NoPrecision;
     }
@@ -379,24 +376,23 @@ spv::Decoration TranslatePrecisionDecoration(const glslang::TType& type)
 spv::Decoration TranslateBlockDecoration(const glslang::TStorageQualifier storage, bool useStorageBuffer)
 {
     switch (storage) {
-    case glslang::EvqUniform:      return spv::Decoration::Block;
-    case glslang::EvqBuffer:       return useStorageBuffer ? spv::Decoration::Block : spv::Decoration::BufferBlock;
-    case glslang::EvqVaryingIn:    return spv::Decoration::Block;
-    case glslang::EvqVaryingOut:   return spv::Decoration::Block;
-    case glslang::EvqShared:       return spv::Decoration::Block;
-    case glslang::EvqPayload:      return spv::Decoration::Block;
-    case glslang::EvqPayloadIn:    return spv::Decoration::Block;
-    case glslang::EvqHitAttr:      return spv::Decoration::Block;
-    case glslang::EvqCallableData:   return spv::Decoration::Block;
-    case glslang::EvqCallableDataIn: return spv::Decoration::Block;
-    case glslang::EvqHitObjectAttrNV: return spv::Decoration::Block;
-    case glslang::EvqHitObjectAttrEXT: return spv::Decoration::Block;
+    case glslang::EvqUniform:      return spv::DecorationBlock;
+    case glslang::EvqBuffer:       return useStorageBuffer ? spv::DecorationBlock : spv::DecorationBufferBlock;
+    case glslang::EvqVaryingIn:    return spv::DecorationBlock;
+    case glslang::EvqVaryingOut:   return spv::DecorationBlock;
+    case glslang::EvqShared:       return spv::DecorationBlock;
+    case glslang::EvqPayload:      return spv::DecorationBlock;
+    case glslang::EvqPayloadIn:    return spv::DecorationBlock;
+    case glslang::EvqHitAttr:      return spv::DecorationBlock;
+    case glslang::EvqCallableData:   return spv::DecorationBlock;
+    case glslang::EvqCallableDataIn: return spv::DecorationBlock;
+    case glslang::EvqHitObjectAttrNV: return spv::DecorationBlock;
     default:
         assert(0);
         break;
     }
 
-    return spv::Decoration::Max;
+    return spv::DecorationMax;
 }
 
 // Translate glslang type to SPIR-V memory decorations.
@@ -405,18 +401,18 @@ void TranslateMemoryDecoration(const glslang::TQualifier& qualifier, std::vector
 {
     if (!useVulkanMemoryModel) {
         if (qualifier.isVolatile()) {
-            memory.push_back(spv::Decoration::Volatile);
-            memory.push_back(spv::Decoration::Coherent);
+            memory.push_back(spv::DecorationVolatile);
+            memory.push_back(spv::DecorationCoherent);
         } else if (qualifier.isCoherent()) {
-            memory.push_back(spv::Decoration::Coherent);
+            memory.push_back(spv::DecorationCoherent);
         }
     }
     if (qualifier.isRestrict())
-        memory.push_back(spv::Decoration::Restrict);
+        memory.push_back(spv::DecorationRestrict);
     if (qualifier.isReadOnly())
-        memory.push_back(spv::Decoration::NonWritable);
+        memory.push_back(spv::DecorationNonWritable);
     if (qualifier.isWriteOnly())
-        memory.push_back(spv::Decoration::NonReadable);
+       memory.push_back(spv::DecorationNonReadable);
 }
 
 // Translate glslang type to SPIR-V layout decorations.
@@ -425,17 +421,17 @@ spv::Decoration TranslateLayoutDecoration(const glslang::TType& type, glslang::T
     if (type.isMatrix()) {
         switch (matrixLayout) {
         case glslang::ElmRowMajor:
-            return spv::Decoration::RowMajor;
+            return spv::DecorationRowMajor;
         case glslang::ElmColumnMajor:
-            return spv::Decoration::ColMajor;
+            return spv::DecorationColMajor;
         default:
             // opaque layouts don't need a majorness
-            return spv::Decoration::Max;
+            return spv::DecorationMax;
         }
     } else {
         switch (type.getBasicType()) {
         default:
-            return spv::Decoration::Max;
+            return spv::DecorationMax;
             break;
         case glslang::EbtBlock:
             switch (type.getQualifier().storage) {
@@ -443,92 +439,91 @@ spv::Decoration TranslateLayoutDecoration(const glslang::TType& type, glslang::T
             case glslang::EvqUniform:
             case glslang::EvqBuffer:
                 switch (type.getQualifier().layoutPacking) {
-                case glslang::ElpShared:  return spv::Decoration::GLSLShared;
-                case glslang::ElpPacked:  return spv::Decoration::GLSLPacked;
+                case glslang::ElpShared:  return spv::DecorationGLSLShared;
+                case glslang::ElpPacked:  return spv::DecorationGLSLPacked;
                 default:
-                    return spv::Decoration::Max;
+                    return spv::DecorationMax;
                 }
             case glslang::EvqVaryingIn:
             case glslang::EvqVaryingOut:
                 if (type.getQualifier().isTaskMemory()) {
                     switch (type.getQualifier().layoutPacking) {
-                    case glslang::ElpShared:  return spv::Decoration::GLSLShared;
-                    case glslang::ElpPacked:  return spv::Decoration::GLSLPacked;
+                    case glslang::ElpShared:  return spv::DecorationGLSLShared;
+                    case glslang::ElpPacked:  return spv::DecorationGLSLPacked;
                     default: break;
                     }
                 } else {
                     assert(type.getQualifier().layoutPacking == glslang::ElpNone);
                 }
-                return spv::Decoration::Max;
+                return spv::DecorationMax;
             case glslang::EvqPayload:
             case glslang::EvqPayloadIn:
             case glslang::EvqHitAttr:
             case glslang::EvqCallableData:
             case glslang::EvqCallableDataIn:
             case glslang::EvqHitObjectAttrNV:
-            case glslang::EvqHitObjectAttrEXT:
-                return spv::Decoration::Max;
+                return spv::DecorationMax;
             default:
                 assert(0);
-                return spv::Decoration::Max;
+                return spv::DecorationMax;
             }
         }
     }
 }
 
 // Translate glslang type to SPIR-V interpolation decorations.
-// Returns spv::Decoration::Max when no decoration
+// Returns spv::DecorationMax when no decoration
 // should be applied.
 spv::Decoration TGlslangToSpvTraverser::TranslateInterpolationDecoration(const glslang::TQualifier& qualifier)
 {
     if (qualifier.smooth)
         // Smooth decoration doesn't exist in SPIR-V 1.0
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
     else if (qualifier.isNonPerspective())
-        return spv::Decoration::NoPerspective;
+        return spv::DecorationNoPerspective;
     else if (qualifier.flat)
-        return spv::Decoration::Flat;
+        return spv::DecorationFlat;
     else if (qualifier.isExplicitInterpolation()) {
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::Decoration::ExplicitInterpAMD;
+        return spv::DecorationExplicitInterpAMD;
     }
     else
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
 }
 
 // Translate glslang type to SPIR-V auxiliary storage decorations.
-// Returns spv::Decoration::Max when no decoration
+// Returns spv::DecorationMax when no decoration
 // should be applied.
 spv::Decoration TGlslangToSpvTraverser::TranslateAuxiliaryStorageDecoration(const glslang::TQualifier& qualifier)
 {
     if (qualifier.centroid)
-        return spv::Decoration::Centroid;
+        return spv::DecorationCentroid;
     else if (qualifier.patch)
-        return spv::Decoration::Patch;
+        return spv::DecorationPatch;
     else if (qualifier.sample) {
-        builder.addCapability(spv::Capability::SampleRateShading);
-        return spv::Decoration::Sample;
+        builder.addCapability(spv::CapabilitySampleRateShading);
+        return spv::DecorationSample;
     }
 
-    return spv::Decoration::Max;
+    return spv::DecorationMax;
 }
 
 // If glslang type is invariant, return SPIR-V invariant decoration.
 spv::Decoration TranslateInvariantDecoration(const glslang::TQualifier& qualifier)
 {
     if (qualifier.invariant)
-        return spv::Decoration::Invariant;
+        return spv::DecorationInvariant;
     else
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
 }
 
 // If glslang type is noContraction, return SPIR-V NoContraction decoration.
 spv::Decoration TranslateNoContractionDecoration(const glslang::TQualifier& qualifier)
 {
     if (qualifier.isNoContraction())
-        return spv::Decoration::NoContraction;
+        return spv::DecorationNoContraction;
     else
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
 }
 
 // If glslang type is nonUniform, return SPIR-V NonUniform decoration.
@@ -536,10 +531,10 @@ spv::Decoration TGlslangToSpvTraverser::TranslateNonUniformDecoration(const glsl
 {
     if (qualifier.isNonUniform()) {
         builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-        builder.addCapability(spv::Capability::ShaderNonUniformEXT);
-        return spv::Decoration::NonUniformEXT;
+        builder.addCapability(spv::CapabilityShaderNonUniformEXT);
+        return spv::DecorationNonUniformEXT;
     } else
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
 }
 
 // If lvalue flags contains nonUniform, return SPIR-V NonUniform decoration.
@@ -548,36 +543,33 @@ spv::Decoration TGlslangToSpvTraverser::TranslateNonUniformDecoration(
 {
     if (coherentFlags.isNonUniform()) {
         builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-        builder.addCapability(spv::Capability::ShaderNonUniformEXT);
-        return spv::Decoration::NonUniformEXT;
+        builder.addCapability(spv::CapabilityShaderNonUniformEXT);
+        return spv::DecorationNonUniformEXT;
     } else
-        return spv::Decoration::Max;
+        return spv::DecorationMax;
 }
 
 spv::MemoryAccessMask TGlslangToSpvTraverser::TranslateMemoryAccess(
     const spv::Builder::AccessChain::CoherentFlags &coherentFlags)
 {
-    spv::MemoryAccessMask mask = spv::MemoryAccessMask::MaskNone;
+    spv::MemoryAccessMask mask = spv::MemoryAccessMaskNone;
 
     if (!glslangIntermediate->usingVulkanMemoryModel() || coherentFlags.isImage)
         return mask;
 
     if (coherentFlags.isVolatile() || coherentFlags.anyCoherent()) {
-        mask = mask | spv::MemoryAccessMask::MakePointerAvailableKHR | 
-                      spv::MemoryAccessMask::MakePointerVisibleKHR;
+        mask = mask | spv::MemoryAccessMakePointerAvailableKHRMask |
+                      spv::MemoryAccessMakePointerVisibleKHRMask;
     }
 
     if (coherentFlags.nonprivate) {
-        mask = mask | spv::MemoryAccessMask::NonPrivatePointerKHR;
+        mask = mask | spv::MemoryAccessNonPrivatePointerKHRMask;
     }
     if (coherentFlags.volatil) {
-        mask = mask | spv::MemoryAccessMask::Volatile;
+        mask = mask | spv::MemoryAccessVolatileMask;
     }
-    if (coherentFlags.nontemporal) {
-        mask = mask | spv::MemoryAccessMask::Nontemporal;
-    }
-    if (mask != spv::MemoryAccessMask::MaskNone) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+    if (mask != spv::MemoryAccessMaskNone) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
     }
 
     return mask;
@@ -586,27 +578,24 @@ spv::MemoryAccessMask TGlslangToSpvTraverser::TranslateMemoryAccess(
 spv::ImageOperandsMask TGlslangToSpvTraverser::TranslateImageOperands(
     const spv::Builder::AccessChain::CoherentFlags &coherentFlags)
 {
-    spv::ImageOperandsMask mask = spv::ImageOperandsMask::MaskNone;
+    spv::ImageOperandsMask mask = spv::ImageOperandsMaskNone;
 
     if (!glslangIntermediate->usingVulkanMemoryModel())
         return mask;
 
     if (coherentFlags.volatil ||
         coherentFlags.anyCoherent()) {
-        mask = mask | spv::ImageOperandsMask::MakeTexelAvailableKHR |
-                      spv::ImageOperandsMask::MakeTexelVisibleKHR;
+        mask = mask | spv::ImageOperandsMakeTexelAvailableKHRMask |
+                      spv::ImageOperandsMakeTexelVisibleKHRMask;
     }
     if (coherentFlags.nonprivate) {
-        mask = mask | spv::ImageOperandsMask::NonPrivateTexelKHR;
+        mask = mask | spv::ImageOperandsNonPrivateTexelKHRMask;
     }
     if (coherentFlags.volatil) {
-        mask = mask | spv::ImageOperandsMask::VolatileTexelKHR;
+        mask = mask | spv::ImageOperandsVolatileTexelKHRMask;
     }
-    if (coherentFlags.nontemporal && builder.getSpvVersion() >= spv::Spv_1_6) {
-        mask = mask | spv::ImageOperandsMask::Nontemporal;
-    }
-    if (mask != spv::ImageOperandsMask::MaskNone) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+    if (mask != spv::ImageOperandsMaskNone) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
     }
 
     return mask;
@@ -624,7 +613,6 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere
     flags.subgroupcoherent = type.getQualifier().subgroupcoherent;
     flags.shadercallcoherent = type.getQualifier().shadercallcoherent;
     flags.volatil = type.getQualifier().volatil;
-    flags.nontemporal = type.getQualifier().nontemporal;
     // *coherent variables are implicitly nonprivate in GLSL
     flags.nonprivate = type.getQualifier().nonprivate ||
                        flags.anyCoherent() ||
@@ -637,24 +625,24 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere
 spv::Scope TGlslangToSpvTraverser::TranslateMemoryScope(
     const spv::Builder::AccessChain::CoherentFlags &coherentFlags)
 {
-    spv::Scope scope = spv::Scope::Max;
+    spv::Scope scope = spv::ScopeMax;
 
     if (coherentFlags.volatil || coherentFlags.coherent) {
         // coherent defaults to Device scope in the old model, QueueFamilyKHR scope in the new model
-        scope = glslangIntermediate->usingVulkanMemoryModel() ? spv::Scope::QueueFamilyKHR : spv::Scope::Device;
+        scope = glslangIntermediate->usingVulkanMemoryModel() ? spv::ScopeQueueFamilyKHR : spv::ScopeDevice;
     } else if (coherentFlags.devicecoherent) {
-        scope = spv::Scope::Device;
+        scope = spv::ScopeDevice;
     } else if (coherentFlags.queuefamilycoherent) {
-        scope = spv::Scope::QueueFamilyKHR;
+        scope = spv::ScopeQueueFamilyKHR;
     } else if (coherentFlags.workgroupcoherent) {
-        scope = spv::Scope::Workgroup;
+        scope = spv::ScopeWorkgroup;
     } else if (coherentFlags.subgroupcoherent) {
-        scope = spv::Scope::Subgroup;
+        scope = spv::ScopeSubgroup;
     } else if (coherentFlags.shadercallcoherent) {
-        scope = spv::Scope::ShaderCallKHR;
+        scope = spv::ScopeShaderCallKHR;
     }
-    if (glslangIntermediate->usingVulkanMemoryModel() && scope == spv::Scope::Device) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelDeviceScopeKHR);
+    if (glslangIntermediate->usingVulkanMemoryModel() && scope == spv::ScopeDevice) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
     }
 
     return scope;
@@ -674,35 +662,35 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
         if (! memberDeclaration) {
             switch (glslangIntermediate->getStage()) {
             case EShLangGeometry:
-                builder.addCapability(spv::Capability::GeometryPointSize);
+                builder.addCapability(spv::CapabilityGeometryPointSize);
                 break;
             case EShLangTessControl:
             case EShLangTessEvaluation:
-                builder.addCapability(spv::Capability::TessellationPointSize);
+                builder.addCapability(spv::CapabilityTessellationPointSize);
                 break;
             default:
                 break;
             }
         }
-        return spv::BuiltIn::PointSize;
+        return spv::BuiltInPointSize;
 
-    case glslang::EbvPosition:             return spv::BuiltIn::Position;
-    case glslang::EbvVertexId:             return spv::BuiltIn::VertexId;
-    case glslang::EbvInstanceId:           return spv::BuiltIn::InstanceId;
-    case glslang::EbvVertexIndex:          return spv::BuiltIn::VertexIndex;
-    case glslang::EbvInstanceIndex:        return spv::BuiltIn::InstanceIndex;
+    case glslang::EbvPosition:             return spv::BuiltInPosition;
+    case glslang::EbvVertexId:             return spv::BuiltInVertexId;
+    case glslang::EbvInstanceId:           return spv::BuiltInInstanceId;
+    case glslang::EbvVertexIndex:          return spv::BuiltInVertexIndex;
+    case glslang::EbvInstanceIndex:        return spv::BuiltInInstanceIndex;
 
-    case glslang::EbvFragCoord:            return spv::BuiltIn::FragCoord;
-    case glslang::EbvPointCoord:           return spv::BuiltIn::PointCoord;
-    case glslang::EbvFace:                 return spv::BuiltIn::FrontFacing;
-    case glslang::EbvFragDepth:            return spv::BuiltIn::FragDepth;
+    case glslang::EbvFragCoord:            return spv::BuiltInFragCoord;
+    case glslang::EbvPointCoord:           return spv::BuiltInPointCoord;
+    case glslang::EbvFace:                 return spv::BuiltInFrontFacing;
+    case glslang::EbvFragDepth:            return spv::BuiltInFragDepth;
 
-    case glslang::EbvNumWorkGroups:        return spv::BuiltIn::NumWorkgroups;
-    case glslang::EbvWorkGroupSize:        return spv::BuiltIn::WorkgroupSize;
-    case glslang::EbvWorkGroupId:          return spv::BuiltIn::WorkgroupId;
-    case glslang::EbvLocalInvocationId:    return spv::BuiltIn::LocalInvocationId;
-    case glslang::EbvLocalInvocationIndex: return spv::BuiltIn::LocalInvocationIndex;
-    case glslang::EbvGlobalInvocationId:   return spv::BuiltIn::GlobalInvocationId;
+    case glslang::EbvNumWorkGroups:        return spv::BuiltInNumWorkgroups;
+    case glslang::EbvWorkGroupSize:        return spv::BuiltInWorkgroupSize;
+    case glslang::EbvWorkGroupId:          return spv::BuiltInWorkgroupId;
+    case glslang::EbvLocalInvocationId:    return spv::BuiltInLocalInvocationId;
+    case glslang::EbvLocalInvocationIndex: return spv::BuiltInLocalInvocationIndex;
+    case glslang::EbvGlobalInvocationId:   return spv::BuiltInGlobalInvocationId;
 
     // These *Distance capabilities logically belong here, but if the member is declared and
     // then never used, consumers of SPIR-V prefer the capability not be declared.
@@ -712,18 +700,18 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
     //
     case glslang::EbvClipDistance:
         if (!memberDeclaration)
-            builder.addCapability(spv::Capability::ClipDistance);
-        return spv::BuiltIn::ClipDistance;
+            builder.addCapability(spv::CapabilityClipDistance);
+        return spv::BuiltInClipDistance;
 
     case glslang::EbvCullDistance:
         if (!memberDeclaration)
-            builder.addCapability(spv::Capability::CullDistance);
-        return spv::BuiltIn::CullDistance;
+            builder.addCapability(spv::CapabilityCullDistance);
+        return spv::BuiltInCullDistance;
 
     case glslang::EbvViewportIndex:
         if (glslangIntermediate->getStage() == EShLangGeometry ||
             glslangIntermediate->getStage() == EShLangFragment) {
-            builder.addCapability(spv::Capability::MultiViewport);
+            builder.addCapability(spv::CapabilityMultiViewport);
         }
         if (glslangIntermediate->getStage() == EShLangVertex ||
             glslangIntermediate->getStage() == EShLangTessControl ||
@@ -731,31 +719,31 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
 
             if (builder.getSpvVersion() < spv::Spv_1_5) {
                 builder.addIncorporatedExtension(spv::E_SPV_EXT_shader_viewport_index_layer, spv::Spv_1_5);
-                builder.addCapability(spv::Capability::ShaderViewportIndexLayerEXT);
+                builder.addCapability(spv::CapabilityShaderViewportIndexLayerEXT);
             }
             else
-                builder.addCapability(spv::Capability::ShaderViewportIndex);
+                builder.addCapability(spv::CapabilityShaderViewportIndex);
         }
-        return spv::BuiltIn::ViewportIndex;
+        return spv::BuiltInViewportIndex;
 
     case glslang::EbvSampleId:
-        builder.addCapability(spv::Capability::SampleRateShading);
-        return spv::BuiltIn::SampleId;
+        builder.addCapability(spv::CapabilitySampleRateShading);
+        return spv::BuiltInSampleId;
 
     case glslang::EbvSamplePosition:
-        builder.addCapability(spv::Capability::SampleRateShading);
-        return spv::BuiltIn::SamplePosition;
+        builder.addCapability(spv::CapabilitySampleRateShading);
+        return spv::BuiltInSamplePosition;
 
     case glslang::EbvSampleMask:
-        return spv::BuiltIn::SampleMask;
+        return spv::BuiltInSampleMask;
 
     case glslang::EbvLayer:
         if (glslangIntermediate->getStage() == EShLangMesh) {
-            return spv::BuiltIn::Layer;
+            return spv::BuiltInLayer;
         }
         if (glslangIntermediate->getStage() == EShLangGeometry ||
             glslangIntermediate->getStage() == EShLangFragment) {
-            builder.addCapability(spv::Capability::Geometry);
+            builder.addCapability(spv::CapabilityGeometry);
         }
         if (glslangIntermediate->getStage() == EShLangVertex ||
             glslangIntermediate->getStage() == EShLangTessControl ||
@@ -763,405 +751,378 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
 
             if (builder.getSpvVersion() < spv::Spv_1_5) {
                 builder.addIncorporatedExtension(spv::E_SPV_EXT_shader_viewport_index_layer, spv::Spv_1_5);
-                builder.addCapability(spv::Capability::ShaderViewportIndexLayerEXT);
+                builder.addCapability(spv::CapabilityShaderViewportIndexLayerEXT);
             } else
-                builder.addCapability(spv::Capability::ShaderLayer);
+                builder.addCapability(spv::CapabilityShaderLayer);
         }
-        return spv::BuiltIn::Layer;
+        return spv::BuiltInLayer;
 
     case glslang::EbvBaseVertex:
         builder.addIncorporatedExtension(spv::E_SPV_KHR_shader_draw_parameters, spv::Spv_1_3);
-        builder.addCapability(spv::Capability::DrawParameters);
-        return spv::BuiltIn::BaseVertex;
+        builder.addCapability(spv::CapabilityDrawParameters);
+        return spv::BuiltInBaseVertex;
 
     case glslang::EbvBaseInstance:
         builder.addIncorporatedExtension(spv::E_SPV_KHR_shader_draw_parameters, spv::Spv_1_3);
-        builder.addCapability(spv::Capability::DrawParameters);
-        return spv::BuiltIn::BaseInstance;
+        builder.addCapability(spv::CapabilityDrawParameters);
+        return spv::BuiltInBaseInstance;
 
     case glslang::EbvDrawId:
         builder.addIncorporatedExtension(spv::E_SPV_KHR_shader_draw_parameters, spv::Spv_1_3);
-        builder.addCapability(spv::Capability::DrawParameters);
-        return spv::BuiltIn::DrawIndex;
+        builder.addCapability(spv::CapabilityDrawParameters);
+        return spv::BuiltInDrawIndex;
 
     case glslang::EbvPrimitiveId:
         if (glslangIntermediate->getStage() == EShLangFragment)
-            builder.addCapability(spv::Capability::Geometry);
-        return spv::BuiltIn::PrimitiveId;
+            builder.addCapability(spv::CapabilityGeometry);
+        return spv::BuiltInPrimitiveId;
 
     case glslang::EbvFragStencilRef:
         builder.addExtension(spv::E_SPV_EXT_shader_stencil_export);
-        builder.addCapability(spv::Capability::StencilExportEXT);
-        return spv::BuiltIn::FragStencilRefEXT;
+        builder.addCapability(spv::CapabilityStencilExportEXT);
+        return spv::BuiltInFragStencilRefEXT;
 
     case glslang::EbvShadingRateKHR:
         builder.addExtension(spv::E_SPV_KHR_fragment_shading_rate);
-        builder.addCapability(spv::Capability::FragmentShadingRateKHR);
-        return spv::BuiltIn::ShadingRateKHR;
+        builder.addCapability(spv::CapabilityFragmentShadingRateKHR);
+        return spv::BuiltInShadingRateKHR;
 
     case glslang::EbvPrimitiveShadingRateKHR:
         builder.addExtension(spv::E_SPV_KHR_fragment_shading_rate);
-        builder.addCapability(spv::Capability::FragmentShadingRateKHR);
-        return spv::BuiltIn::PrimitiveShadingRateKHR;
+        builder.addCapability(spv::CapabilityFragmentShadingRateKHR);
+        return spv::BuiltInPrimitiveShadingRateKHR;
 
-    case glslang::EbvInvocationId:         return spv::BuiltIn::InvocationId;
-    case glslang::EbvTessLevelInner:       return spv::BuiltIn::TessLevelInner;
-    case glslang::EbvTessLevelOuter:       return spv::BuiltIn::TessLevelOuter;
-    case glslang::EbvTessCoord:            return spv::BuiltIn::TessCoord;
-    case glslang::EbvPatchVertices:        return spv::BuiltIn::PatchVertices;
-    case glslang::EbvHelperInvocation:     return spv::BuiltIn::HelperInvocation;
+    case glslang::EbvInvocationId:         return spv::BuiltInInvocationId;
+    case glslang::EbvTessLevelInner:       return spv::BuiltInTessLevelInner;
+    case glslang::EbvTessLevelOuter:       return spv::BuiltInTessLevelOuter;
+    case glslang::EbvTessCoord:            return spv::BuiltInTessCoord;
+    case glslang::EbvPatchVertices:        return spv::BuiltInPatchVertices;
+    case glslang::EbvHelperInvocation:     return spv::BuiltInHelperInvocation;
 
     case glslang::EbvSubGroupSize:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupSize;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupSize;
 
     case glslang::EbvSubGroupInvocation:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupLocalInvocationId;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupLocalInvocationId;
 
     case glslang::EbvSubGroupEqMask:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupEqMask;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupEqMask;
 
     case glslang::EbvSubGroupGeMask:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupGeMask;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupGeMask;
 
     case glslang::EbvSubGroupGtMask:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupGtMask;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupGtMask;
 
     case glslang::EbvSubGroupLeMask:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupLeMask;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupLeMask;
 
     case glslang::EbvSubGroupLtMask:
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
-        return spv::BuiltIn::SubgroupLtMask;
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
+        return spv::BuiltInSubgroupLtMask;
 
     case glslang::EbvNumSubgroups:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        return spv::BuiltIn::NumSubgroups;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        return spv::BuiltInNumSubgroups;
 
     case glslang::EbvSubgroupID:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        return spv::BuiltIn::SubgroupId;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        return spv::BuiltInSubgroupId;
 
     case glslang::EbvSubgroupSize2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        return spv::BuiltIn::SubgroupSize;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        return spv::BuiltInSubgroupSize;
 
     case glslang::EbvSubgroupInvocation2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        return spv::BuiltIn::SubgroupLocalInvocationId;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        return spv::BuiltInSubgroupLocalInvocationId;
 
     case glslang::EbvSubgroupEqMask2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
-        return spv::BuiltIn::SubgroupEqMask;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
+        return spv::BuiltInSubgroupEqMask;
 
     case glslang::EbvSubgroupGeMask2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
-        return spv::BuiltIn::SubgroupGeMask;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
+        return spv::BuiltInSubgroupGeMask;
 
     case glslang::EbvSubgroupGtMask2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
-        return spv::BuiltIn::SubgroupGtMask;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
+        return spv::BuiltInSubgroupGtMask;
 
     case glslang::EbvSubgroupLeMask2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
-        return spv::BuiltIn::SubgroupLeMask;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
+        return spv::BuiltInSubgroupLeMask;
 
     case glslang::EbvSubgroupLtMask2:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
-        return spv::BuiltIn::SubgroupLtMask;
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
+        return spv::BuiltInSubgroupLtMask;
 
     case glslang::EbvBaryCoordNoPersp:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordNoPerspAMD;
+        return spv::BuiltInBaryCoordNoPerspAMD;
 
     case glslang::EbvBaryCoordNoPerspCentroid:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordNoPerspCentroidAMD;
+        return spv::BuiltInBaryCoordNoPerspCentroidAMD;
 
     case glslang::EbvBaryCoordNoPerspSample:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordNoPerspSampleAMD;
+        return spv::BuiltInBaryCoordNoPerspSampleAMD;
 
     case glslang::EbvBaryCoordSmooth:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordSmoothAMD;
+        return spv::BuiltInBaryCoordSmoothAMD;
 
     case glslang::EbvBaryCoordSmoothCentroid:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordSmoothCentroidAMD;
+        return spv::BuiltInBaryCoordSmoothCentroidAMD;
 
     case glslang::EbvBaryCoordSmoothSample:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordSmoothSampleAMD;
+        return spv::BuiltInBaryCoordSmoothSampleAMD;
 
     case glslang::EbvBaryCoordPullModel:
         builder.addExtension(spv::E_SPV_AMD_shader_explicit_vertex_parameter);
-        return spv::BuiltIn::BaryCoordPullModelAMD;
+        return spv::BuiltInBaryCoordPullModelAMD;
 
     case glslang::EbvDeviceIndex:
         builder.addIncorporatedExtension(spv::E_SPV_KHR_device_group, spv::Spv_1_3);
-        builder.addCapability(spv::Capability::DeviceGroup);
-        return spv::BuiltIn::DeviceIndex;
+        builder.addCapability(spv::CapabilityDeviceGroup);
+        return spv::BuiltInDeviceIndex;
 
     case glslang::EbvViewIndex:
         builder.addIncorporatedExtension(spv::E_SPV_KHR_multiview, spv::Spv_1_3);
-        builder.addCapability(spv::Capability::MultiView);
-        return spv::BuiltIn::ViewIndex;
+        builder.addCapability(spv::CapabilityMultiView);
+        return spv::BuiltInViewIndex;
 
     case glslang::EbvFragSizeEXT:
         builder.addExtension(spv::E_SPV_EXT_fragment_invocation_density);
-        builder.addCapability(spv::Capability::FragmentDensityEXT);
-        return spv::BuiltIn::FragSizeEXT;
+        builder.addCapability(spv::CapabilityFragmentDensityEXT);
+        return spv::BuiltInFragSizeEXT;
 
     case glslang::EbvFragInvocationCountEXT:
         builder.addExtension(spv::E_SPV_EXT_fragment_invocation_density);
-        builder.addCapability(spv::Capability::FragmentDensityEXT);
-        return spv::BuiltIn::FragInvocationCountEXT;
+        builder.addCapability(spv::CapabilityFragmentDensityEXT);
+        return spv::BuiltInFragInvocationCountEXT;
 
     case glslang::EbvViewportMaskNV:
         if (!memberDeclaration) {
             builder.addExtension(spv::E_SPV_NV_viewport_array2);
-            builder.addCapability(spv::Capability::ShaderViewportMaskNV);
+            builder.addCapability(spv::CapabilityShaderViewportMaskNV);
         }
-        return spv::BuiltIn::ViewportMaskNV;
+        return spv::BuiltInViewportMaskNV;
     case glslang::EbvSecondaryPositionNV:
         if (!memberDeclaration) {
             builder.addExtension(spv::E_SPV_NV_stereo_view_rendering);
-            builder.addCapability(spv::Capability::ShaderStereoViewNV);
+            builder.addCapability(spv::CapabilityShaderStereoViewNV);
         }
-        return spv::BuiltIn::SecondaryPositionNV;
+        return spv::BuiltInSecondaryPositionNV;
     case glslang::EbvSecondaryViewportMaskNV:
         if (!memberDeclaration) {
             builder.addExtension(spv::E_SPV_NV_stereo_view_rendering);
-            builder.addCapability(spv::Capability::ShaderStereoViewNV);
+            builder.addCapability(spv::CapabilityShaderStereoViewNV);
         }
-        return spv::BuiltIn::SecondaryViewportMaskNV;
+        return spv::BuiltInSecondaryViewportMaskNV;
     case glslang::EbvPositionPerViewNV:
         if (!memberDeclaration) {
             builder.addExtension(spv::E_SPV_NVX_multiview_per_view_attributes);
-            builder.addCapability(spv::Capability::PerViewAttributesNV);
+            builder.addCapability(spv::CapabilityPerViewAttributesNV);
         }
-        return spv::BuiltIn::PositionPerViewNV;
+        return spv::BuiltInPositionPerViewNV;
     case glslang::EbvViewportMaskPerViewNV:
         if (!memberDeclaration) {
             builder.addExtension(spv::E_SPV_NVX_multiview_per_view_attributes);
-            builder.addCapability(spv::Capability::PerViewAttributesNV);
+            builder.addCapability(spv::CapabilityPerViewAttributesNV);
         }
-        return spv::BuiltIn::ViewportMaskPerViewNV;
+        return spv::BuiltInViewportMaskPerViewNV;
     case glslang::EbvFragFullyCoveredNV:
         builder.addExtension(spv::E_SPV_EXT_fragment_fully_covered);
-        builder.addCapability(spv::Capability::FragmentFullyCoveredEXT);
-        return spv::BuiltIn::FullyCoveredEXT;
+        builder.addCapability(spv::CapabilityFragmentFullyCoveredEXT);
+        return spv::BuiltInFullyCoveredEXT;
     case glslang::EbvFragmentSizeNV:
         builder.addExtension(spv::E_SPV_NV_shading_rate);
-        builder.addCapability(spv::Capability::ShadingRateNV);
-        return spv::BuiltIn::FragmentSizeNV;
+        builder.addCapability(spv::CapabilityShadingRateNV);
+        return spv::BuiltInFragmentSizeNV;
     case glslang::EbvInvocationsPerPixelNV:
         builder.addExtension(spv::E_SPV_NV_shading_rate);
-        builder.addCapability(spv::Capability::ShadingRateNV);
-        return spv::BuiltIn::InvocationsPerPixelNV;
+        builder.addCapability(spv::CapabilityShadingRateNV);
+        return spv::BuiltInInvocationsPerPixelNV;
 
     // ray tracing
     case glslang::EbvLaunchId:
-        return spv::BuiltIn::LaunchIdKHR;
+        return spv::BuiltInLaunchIdKHR;
     case glslang::EbvLaunchSize:
-        return spv::BuiltIn::LaunchSizeKHR;
+        return spv::BuiltInLaunchSizeKHR;
     case glslang::EbvWorldRayOrigin:
-        return spv::BuiltIn::WorldRayOriginKHR;
+        return spv::BuiltInWorldRayOriginKHR;
     case glslang::EbvWorldRayDirection:
-        return spv::BuiltIn::WorldRayDirectionKHR;
+        return spv::BuiltInWorldRayDirectionKHR;
     case glslang::EbvObjectRayOrigin:
-        return spv::BuiltIn::ObjectRayOriginKHR;
+        return spv::BuiltInObjectRayOriginKHR;
     case glslang::EbvObjectRayDirection:
-        return spv::BuiltIn::ObjectRayDirectionKHR;
+        return spv::BuiltInObjectRayDirectionKHR;
     case glslang::EbvRayTmin:
-        return spv::BuiltIn::RayTminKHR;
+        return spv::BuiltInRayTminKHR;
     case glslang::EbvRayTmax:
-        return spv::BuiltIn::RayTmaxKHR;
+        return spv::BuiltInRayTmaxKHR;
     case glslang::EbvCullMask:
-        return spv::BuiltIn::CullMaskKHR;
+        return spv::BuiltInCullMaskKHR;
     case glslang::EbvPositionFetch:
-        return spv::BuiltIn::HitTriangleVertexPositionsKHR;
+        return spv::BuiltInHitTriangleVertexPositionsKHR;
     case glslang::EbvInstanceCustomIndex:
-        return spv::BuiltIn::InstanceCustomIndexKHR;
+        return spv::BuiltInInstanceCustomIndexKHR;
+    case glslang::EbvHitT:
+        {
+            // this is a GLSL alias of RayTmax
+            // in SPV_NV_ray_tracing it has a dedicated builtin
+            // but in SPV_KHR_ray_tracing it gets mapped to RayTmax
+            auto& extensions = glslangIntermediate->getRequestedExtensions();
+            if (extensions.find("GL_NV_ray_tracing") != extensions.end()) {
+                return spv::BuiltInHitTNV;
+            } else {
+                return spv::BuiltInRayTmaxKHR;
+            }
+        }
     case glslang::EbvHitKind:
-        return spv::BuiltIn::HitKindKHR;
+        return spv::BuiltInHitKindKHR;
     case glslang::EbvObjectToWorld:
     case glslang::EbvObjectToWorld3x4:
-        return spv::BuiltIn::ObjectToWorldKHR;
+        return spv::BuiltInObjectToWorldKHR;
     case glslang::EbvWorldToObject:
     case glslang::EbvWorldToObject3x4:
-        return spv::BuiltIn::WorldToObjectKHR;
+        return spv::BuiltInWorldToObjectKHR;
     case glslang::EbvIncomingRayFlags:
-        return spv::BuiltIn::IncomingRayFlagsKHR;
+        return spv::BuiltInIncomingRayFlagsKHR;
     case glslang::EbvGeometryIndex:
-        return spv::BuiltIn::RayGeometryIndexKHR;
+        return spv::BuiltInRayGeometryIndexKHR;
     case glslang::EbvCurrentRayTimeNV:
         builder.addExtension(spv::E_SPV_NV_ray_tracing_motion_blur);
-        builder.addCapability(spv::Capability::RayTracingMotionBlurNV);
-        return spv::BuiltIn::CurrentRayTimeNV;
+        builder.addCapability(spv::CapabilityRayTracingMotionBlurNV);
+        return spv::BuiltInCurrentRayTimeNV;
     case glslang::EbvMicroTrianglePositionNV:
-        builder.addCapability(spv::Capability::RayTracingDisplacementMicromapNV);
+        builder.addCapability(spv::CapabilityRayTracingDisplacementMicromapNV);
         builder.addExtension("SPV_NV_displacement_micromap");
-        return spv::BuiltIn::HitMicroTriangleVertexPositionsNV;
+        return spv::BuiltInHitMicroTriangleVertexPositionsNV;
     case glslang::EbvMicroTriangleBaryNV:
-        builder.addCapability(spv::Capability::RayTracingDisplacementMicromapNV);
+        builder.addCapability(spv::CapabilityRayTracingDisplacementMicromapNV);
         builder.addExtension("SPV_NV_displacement_micromap");
-        return spv::BuiltIn::HitMicroTriangleVertexBarycentricsNV;
+        return spv::BuiltInHitMicroTriangleVertexBarycentricsNV;
     case glslang::EbvHitKindFrontFacingMicroTriangleNV:
-        builder.addCapability(spv::Capability::RayTracingDisplacementMicromapNV);
+        builder.addCapability(spv::CapabilityRayTracingDisplacementMicromapNV);
         builder.addExtension("SPV_NV_displacement_micromap");
-        return spv::BuiltIn::HitKindFrontFacingMicroTriangleNV;
+        return spv::BuiltInHitKindFrontFacingMicroTriangleNV;
     case glslang::EbvHitKindBackFacingMicroTriangleNV:
-        builder.addCapability(spv::Capability::RayTracingDisplacementMicromapNV);
+        builder.addCapability(spv::CapabilityRayTracingDisplacementMicromapNV);
         builder.addExtension("SPV_NV_displacement_micromap");
-        return spv::BuiltIn::HitKindBackFacingMicroTriangleNV;
-    case glslang::EbvClusterIDNV:
-        builder.addCapability(spv::Capability::RayTracingClusterAccelerationStructureNV);
-        builder.addExtension("SPV_NV_cluster_acceleration_structure");
-        return spv::BuiltIn::ClusterIDNV;
-    case glslang::EbvHitIsSphereNV:
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitIsSphereNV;
-    case glslang::EbvHitIsLSSNV:
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitIsLSSNV;
-    case glslang::EbvHitSpherePositionNV:
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitSpherePositionNV;
-    case glslang::EbvHitSphereRadiusNV:
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitSphereRadiusNV;
-    case glslang::EbvHitLSSPositionsNV:
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitLSSPositionsNV;
-    case glslang::EbvHitLSSRadiiNV:
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        builder.addExtension("SPV_NV_linear_swept_spheres");
-        return spv::BuiltIn::HitLSSRadiiNV;
+        return spv::BuiltInHitKindBackFacingMicroTriangleNV;
 
     // barycentrics
     case glslang::EbvBaryCoordNV:
         builder.addExtension(spv::E_SPV_NV_fragment_shader_barycentric);
-        builder.addCapability(spv::Capability::FragmentBarycentricNV);
-        return spv::BuiltIn::BaryCoordNV;
+        builder.addCapability(spv::CapabilityFragmentBarycentricNV);
+        return spv::BuiltInBaryCoordNV;
     case glslang::EbvBaryCoordNoPerspNV:
         builder.addExtension(spv::E_SPV_NV_fragment_shader_barycentric);
-        builder.addCapability(spv::Capability::FragmentBarycentricNV);
-        return spv::BuiltIn::BaryCoordNoPerspNV;
+        builder.addCapability(spv::CapabilityFragmentBarycentricNV);
+        return spv::BuiltInBaryCoordNoPerspNV;
 
     case glslang::EbvBaryCoordEXT:
         builder.addExtension(spv::E_SPV_KHR_fragment_shader_barycentric);
-        builder.addCapability(spv::Capability::FragmentBarycentricKHR);
-        return spv::BuiltIn::BaryCoordKHR;
+        builder.addCapability(spv::CapabilityFragmentBarycentricKHR);
+        return spv::BuiltInBaryCoordKHR;
     case glslang::EbvBaryCoordNoPerspEXT:
         builder.addExtension(spv::E_SPV_KHR_fragment_shader_barycentric);
-        builder.addCapability(spv::Capability::FragmentBarycentricKHR);
-        return spv::BuiltIn::BaryCoordNoPerspKHR;
+        builder.addCapability(spv::CapabilityFragmentBarycentricKHR);
+        return spv::BuiltInBaryCoordNoPerspKHR;
 
     // mesh shaders
     case glslang::EbvTaskCountNV:
-        return spv::BuiltIn::TaskCountNV;
+        return spv::BuiltInTaskCountNV;
     case glslang::EbvPrimitiveCountNV:
-        return spv::BuiltIn::PrimitiveCountNV;
+        return spv::BuiltInPrimitiveCountNV;
     case glslang::EbvPrimitiveIndicesNV:
-        return spv::BuiltIn::PrimitiveIndicesNV;
+        return spv::BuiltInPrimitiveIndicesNV;
     case glslang::EbvClipDistancePerViewNV:
-        return spv::BuiltIn::ClipDistancePerViewNV;
+        return spv::BuiltInClipDistancePerViewNV;
     case glslang::EbvCullDistancePerViewNV:
-        return spv::BuiltIn::CullDistancePerViewNV;
+        return spv::BuiltInCullDistancePerViewNV;
     case glslang::EbvLayerPerViewNV:
-        return spv::BuiltIn::LayerPerViewNV;
+        return spv::BuiltInLayerPerViewNV;
     case glslang::EbvMeshViewCountNV:
-        return spv::BuiltIn::MeshViewCountNV;
+        return spv::BuiltInMeshViewCountNV;
     case glslang::EbvMeshViewIndicesNV:
-        return spv::BuiltIn::MeshViewIndicesNV;
+        return spv::BuiltInMeshViewIndicesNV;
 
     // SPV_EXT_mesh_shader
     case glslang::EbvPrimitivePointIndicesEXT:
-        return spv::BuiltIn::PrimitivePointIndicesEXT;
+        return spv::BuiltInPrimitivePointIndicesEXT;
     case glslang::EbvPrimitiveLineIndicesEXT:
-        return spv::BuiltIn::PrimitiveLineIndicesEXT;
+        return spv::BuiltInPrimitiveLineIndicesEXT;
     case glslang::EbvPrimitiveTriangleIndicesEXT:
-        return spv::BuiltIn::PrimitiveTriangleIndicesEXT;
+        return spv::BuiltInPrimitiveTriangleIndicesEXT;
     case glslang::EbvCullPrimitiveEXT:
-        return spv::BuiltIn::CullPrimitiveEXT;
+        return spv::BuiltInCullPrimitiveEXT;
 
     // sm builtins
     case glslang::EbvWarpsPerSM:
         builder.addExtension(spv::E_SPV_NV_shader_sm_builtins);
-        builder.addCapability(spv::Capability::ShaderSMBuiltinsNV);
-        return spv::BuiltIn::WarpsPerSMNV;
+        builder.addCapability(spv::CapabilityShaderSMBuiltinsNV);
+        return spv::BuiltInWarpsPerSMNV;
     case glslang::EbvSMCount:
         builder.addExtension(spv::E_SPV_NV_shader_sm_builtins);
-        builder.addCapability(spv::Capability::ShaderSMBuiltinsNV);
-        return spv::BuiltIn::SMCountNV;
+        builder.addCapability(spv::CapabilityShaderSMBuiltinsNV);
+        return spv::BuiltInSMCountNV;
     case glslang::EbvWarpID:
         builder.addExtension(spv::E_SPV_NV_shader_sm_builtins);
-        builder.addCapability(spv::Capability::ShaderSMBuiltinsNV);
-        return spv::BuiltIn::WarpIDNV;
+        builder.addCapability(spv::CapabilityShaderSMBuiltinsNV);
+        return spv::BuiltInWarpIDNV;
     case glslang::EbvSMID:
         builder.addExtension(spv::E_SPV_NV_shader_sm_builtins);
-        builder.addCapability(spv::Capability::ShaderSMBuiltinsNV);
-        return spv::BuiltIn::SMIDNV;
+        builder.addCapability(spv::CapabilityShaderSMBuiltinsNV);
+        return spv::BuiltInSMIDNV;
 
    // ARM builtins
     case glslang::EbvCoreCountARM:
         builder.addExtension(spv::E_SPV_ARM_core_builtins);
-        builder.addCapability(spv::Capability::CoreBuiltinsARM);
-        return spv::BuiltIn::CoreCountARM;
+        builder.addCapability(spv::CapabilityCoreBuiltinsARM);
+        return spv::BuiltInCoreCountARM;
     case glslang::EbvCoreIDARM:
         builder.addExtension(spv::E_SPV_ARM_core_builtins);
-        builder.addCapability(spv::Capability::CoreBuiltinsARM);
-        return spv::BuiltIn::CoreIDARM;
+        builder.addCapability(spv::CapabilityCoreBuiltinsARM);
+        return spv::BuiltInCoreIDARM;
     case glslang::EbvCoreMaxIDARM:
         builder.addExtension(spv::E_SPV_ARM_core_builtins);
-        builder.addCapability(spv::Capability::CoreBuiltinsARM);
-        return spv::BuiltIn::CoreMaxIDARM;
+        builder.addCapability(spv::CapabilityCoreBuiltinsARM);
+        return spv::BuiltInCoreMaxIDARM;
     case glslang::EbvWarpIDARM:
         builder.addExtension(spv::E_SPV_ARM_core_builtins);
-        builder.addCapability(spv::Capability::CoreBuiltinsARM);
-        return spv::BuiltIn::WarpIDARM;
+        builder.addCapability(spv::CapabilityCoreBuiltinsARM);
+        return spv::BuiltInWarpIDARM;
     case glslang::EbvWarpMaxIDARM:
         builder.addExtension(spv::E_SPV_ARM_core_builtins);
-        builder.addCapability(spv::Capability::CoreBuiltinsARM);
-        return spv::BuiltIn::WarpMaxIDARM;
-
-    // QCOM builtins
-    case glslang::EbvTileOffsetQCOM:
-        builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        return spv::BuiltIn::TileOffsetQCOM;
-    case glslang::EbvTileDimensionQCOM:
-        builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        return spv::BuiltIn::TileDimensionQCOM;
-    case glslang::EbvTileApronSizeQCOM:
-        builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        return spv::BuiltIn::TileApronSizeQCOM;
+        builder.addCapability(spv::CapabilityCoreBuiltinsARM);
+        return spv::BuiltInWarpMaxIDARM;
 
     default:
-        return spv::BuiltIn::Max;
+        return spv::BuiltInMax;
     }
 }
 
@@ -1200,13 +1161,13 @@ spv::ImageFormat TGlslangToSpvTraverser::TranslateImageFormat(const glslang::TTy
     case glslang::ElfRg8ui:
     case glslang::ElfR16ui:
     case glslang::ElfR8ui:
-        builder.addCapability(spv::Capability::StorageImageExtendedFormats);
+        builder.addCapability(spv::CapabilityStorageImageExtendedFormats);
         break;
 
     case glslang::ElfR64ui:
     case glslang::ElfR64i:
         builder.addExtension(spv::E_SPV_EXT_shader_image_int64);
-        builder.addCapability(spv::Capability::Int64ImageEXT);
+        builder.addCapability(spv::CapabilityInt64ImageEXT);
         break;
     default:
         break;
@@ -1214,49 +1175,49 @@ spv::ImageFormat TGlslangToSpvTraverser::TranslateImageFormat(const glslang::TTy
 
     // do the translation
     switch (type.getQualifier().getFormat()) {
-    case glslang::ElfNone:          return spv::ImageFormat::Unknown;
-    case glslang::ElfRgba32f:       return spv::ImageFormat::Rgba32f;
-    case glslang::ElfRgba16f:       return spv::ImageFormat::Rgba16f;
-    case glslang::ElfR32f:          return spv::ImageFormat::R32f;
-    case glslang::ElfRgba8:         return spv::ImageFormat::Rgba8;
-    case glslang::ElfRgba8Snorm:    return spv::ImageFormat::Rgba8Snorm;
-    case glslang::ElfRg32f:         return spv::ImageFormat::Rg32f;
-    case glslang::ElfRg16f:         return spv::ImageFormat::Rg16f;
-    case glslang::ElfR11fG11fB10f:  return spv::ImageFormat::R11fG11fB10f;
-    case glslang::ElfR16f:          return spv::ImageFormat::R16f;
-    case glslang::ElfRgba16:        return spv::ImageFormat::Rgba16;
-    case glslang::ElfRgb10A2:       return spv::ImageFormat::Rgb10A2;
-    case glslang::ElfRg16:          return spv::ImageFormat::Rg16;
-    case glslang::ElfRg8:           return spv::ImageFormat::Rg8;
-    case glslang::ElfR16:           return spv::ImageFormat::R16;
-    case glslang::ElfR8:            return spv::ImageFormat::R8;
-    case glslang::ElfRgba16Snorm:   return spv::ImageFormat::Rgba16Snorm;
-    case glslang::ElfRg16Snorm:     return spv::ImageFormat::Rg16Snorm;
-    case glslang::ElfRg8Snorm:      return spv::ImageFormat::Rg8Snorm;
-    case glslang::ElfR16Snorm:      return spv::ImageFormat::R16Snorm;
-    case glslang::ElfR8Snorm:       return spv::ImageFormat::R8Snorm;
-    case glslang::ElfRgba32i:       return spv::ImageFormat::Rgba32i;
-    case glslang::ElfRgba16i:       return spv::ImageFormat::Rgba16i;
-    case glslang::ElfRgba8i:        return spv::ImageFormat::Rgba8i;
-    case glslang::ElfR32i:          return spv::ImageFormat::R32i;
-    case glslang::ElfRg32i:         return spv::ImageFormat::Rg32i;
-    case glslang::ElfRg16i:         return spv::ImageFormat::Rg16i;
-    case glslang::ElfRg8i:          return spv::ImageFormat::Rg8i;
-    case glslang::ElfR16i:          return spv::ImageFormat::R16i;
-    case glslang::ElfR8i:           return spv::ImageFormat::R8i;
-    case glslang::ElfRgba32ui:      return spv::ImageFormat::Rgba32ui;
-    case glslang::ElfRgba16ui:      return spv::ImageFormat::Rgba16ui;
-    case glslang::ElfRgba8ui:       return spv::ImageFormat::Rgba8ui;
-    case glslang::ElfR32ui:         return spv::ImageFormat::R32ui;
-    case glslang::ElfRg32ui:        return spv::ImageFormat::Rg32ui;
-    case glslang::ElfRg16ui:        return spv::ImageFormat::Rg16ui;
-    case glslang::ElfRgb10a2ui:     return spv::ImageFormat::Rgb10a2ui;
-    case glslang::ElfRg8ui:         return spv::ImageFormat::Rg8ui;
-    case glslang::ElfR16ui:         return spv::ImageFormat::R16ui;
-    case glslang::ElfR8ui:          return spv::ImageFormat::R8ui;
-    case glslang::ElfR64ui:         return spv::ImageFormat::R64ui;
-    case glslang::ElfR64i:          return spv::ImageFormat::R64i;
-    default:                        return spv::ImageFormat::Max;
+    case glslang::ElfNone:          return spv::ImageFormatUnknown;
+    case glslang::ElfRgba32f:       return spv::ImageFormatRgba32f;
+    case glslang::ElfRgba16f:       return spv::ImageFormatRgba16f;
+    case glslang::ElfR32f:          return spv::ImageFormatR32f;
+    case glslang::ElfRgba8:         return spv::ImageFormatRgba8;
+    case glslang::ElfRgba8Snorm:    return spv::ImageFormatRgba8Snorm;
+    case glslang::ElfRg32f:         return spv::ImageFormatRg32f;
+    case glslang::ElfRg16f:         return spv::ImageFormatRg16f;
+    case glslang::ElfR11fG11fB10f:  return spv::ImageFormatR11fG11fB10f;
+    case glslang::ElfR16f:          return spv::ImageFormatR16f;
+    case glslang::ElfRgba16:        return spv::ImageFormatRgba16;
+    case glslang::ElfRgb10A2:       return spv::ImageFormatRgb10A2;
+    case glslang::ElfRg16:          return spv::ImageFormatRg16;
+    case glslang::ElfRg8:           return spv::ImageFormatRg8;
+    case glslang::ElfR16:           return spv::ImageFormatR16;
+    case glslang::ElfR8:            return spv::ImageFormatR8;
+    case glslang::ElfRgba16Snorm:   return spv::ImageFormatRgba16Snorm;
+    case glslang::ElfRg16Snorm:     return spv::ImageFormatRg16Snorm;
+    case glslang::ElfRg8Snorm:      return spv::ImageFormatRg8Snorm;
+    case glslang::ElfR16Snorm:      return spv::ImageFormatR16Snorm;
+    case glslang::ElfR8Snorm:       return spv::ImageFormatR8Snorm;
+    case glslang::ElfRgba32i:       return spv::ImageFormatRgba32i;
+    case glslang::ElfRgba16i:       return spv::ImageFormatRgba16i;
+    case glslang::ElfRgba8i:        return spv::ImageFormatRgba8i;
+    case glslang::ElfR32i:          return spv::ImageFormatR32i;
+    case glslang::ElfRg32i:         return spv::ImageFormatRg32i;
+    case glslang::ElfRg16i:         return spv::ImageFormatRg16i;
+    case glslang::ElfRg8i:          return spv::ImageFormatRg8i;
+    case glslang::ElfR16i:          return spv::ImageFormatR16i;
+    case glslang::ElfR8i:           return spv::ImageFormatR8i;
+    case glslang::ElfRgba32ui:      return spv::ImageFormatRgba32ui;
+    case glslang::ElfRgba16ui:      return spv::ImageFormatRgba16ui;
+    case glslang::ElfRgba8ui:       return spv::ImageFormatRgba8ui;
+    case glslang::ElfR32ui:         return spv::ImageFormatR32ui;
+    case glslang::ElfRg32ui:        return spv::ImageFormatRg32ui;
+    case glslang::ElfRg16ui:        return spv::ImageFormatRg16ui;
+    case glslang::ElfRgb10a2ui:     return spv::ImageFormatRgb10a2ui;
+    case glslang::ElfRg8ui:         return spv::ImageFormatRg8ui;
+    case glslang::ElfR16ui:         return spv::ImageFormatR16ui;
+    case glslang::ElfR8ui:          return spv::ImageFormatR8ui;
+    case glslang::ElfR64ui:         return spv::ImageFormatR64ui;
+    case glslang::ElfR64i:          return spv::ImageFormatR64i;
+    default:                        return spv::ImageFormatMax;
     }
 }
 
@@ -1264,57 +1225,57 @@ spv::SelectionControlMask TGlslangToSpvTraverser::TranslateSelectionControl(
     const glslang::TIntermSelection& selectionNode) const
 {
     if (selectionNode.getFlatten())
-        return spv::SelectionControlMask::Flatten;
+        return spv::SelectionControlFlattenMask;
     if (selectionNode.getDontFlatten())
-        return spv::SelectionControlMask::DontFlatten;
-    return spv::SelectionControlMask::MaskNone;
+        return spv::SelectionControlDontFlattenMask;
+    return spv::SelectionControlMaskNone;
 }
 
 spv::SelectionControlMask TGlslangToSpvTraverser::TranslateSwitchControl(const glslang::TIntermSwitch& switchNode)
     const
 {
     if (switchNode.getFlatten())
-        return spv::SelectionControlMask::Flatten;
+        return spv::SelectionControlFlattenMask;
     if (switchNode.getDontFlatten())
-        return spv::SelectionControlMask::DontFlatten;
-    return spv::SelectionControlMask::MaskNone;
+        return spv::SelectionControlDontFlattenMask;
+    return spv::SelectionControlMaskNone;
 }
 
 // return a non-0 dependency if the dependency argument must be set
 spv::LoopControlMask TGlslangToSpvTraverser::TranslateLoopControl(const glslang::TIntermLoop& loopNode,
     std::vector<unsigned int>& operands) const
 {
-    spv::LoopControlMask control = spv::LoopControlMask::MaskNone;
+    spv::LoopControlMask control = spv::LoopControlMaskNone;
 
     if (loopNode.getDontUnroll())
-        control = control | spv::LoopControlMask::DontUnroll;
+        control = control | spv::LoopControlDontUnrollMask;
     if (loopNode.getUnroll())
-        control = control | spv::LoopControlMask::Unroll;
+        control = control | spv::LoopControlUnrollMask;
     if (unsigned(loopNode.getLoopDependency()) == glslang::TIntermLoop::dependencyInfinite)
-        control = control | spv::LoopControlMask::DependencyInfinite;
+        control = control | spv::LoopControlDependencyInfiniteMask;
     else if (loopNode.getLoopDependency() > 0) {
-        control = control | spv::LoopControlMask::DependencyLength;
+        control = control | spv::LoopControlDependencyLengthMask;
         operands.push_back((unsigned int)loopNode.getLoopDependency());
     }
     if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_4) {
         if (loopNode.getMinIterations() > 0) {
-            control = control | spv::LoopControlMask::MinIterations;
+            control = control | spv::LoopControlMinIterationsMask;
             operands.push_back(loopNode.getMinIterations());
         }
         if (loopNode.getMaxIterations() < glslang::TIntermLoop::iterationsInfinite) {
-            control = control | spv::LoopControlMask::MaxIterations;
+            control = control | spv::LoopControlMaxIterationsMask;
             operands.push_back(loopNode.getMaxIterations());
         }
         if (loopNode.getIterationMultiple() > 1) {
-            control = control | spv::LoopControlMask::IterationMultiple;
+            control = control | spv::LoopControlIterationMultipleMask;
             operands.push_back(loopNode.getIterationMultiple());
         }
         if (loopNode.getPeelCount() > 0) {
-            control = control | spv::LoopControlMask::PeelCount;
+            control = control | spv::LoopControlPeelCountMask;
             operands.push_back(loopNode.getPeelCount());
         }
         if (loopNode.getPartialCount() > 0) {
-            control = control | spv::LoopControlMask::PartialCount;
+            control = control | spv::LoopControlPartialCountMask;
             operands.push_back(loopNode.getPartialCount());
         }
     }
@@ -1325,81 +1286,73 @@ spv::LoopControlMask TGlslangToSpvTraverser::TranslateLoopControl(const glslang:
 // Translate glslang type to SPIR-V storage class.
 spv::StorageClass TGlslangToSpvTraverser::TranslateStorageClass(const glslang::TType& type)
 {
-    if (type.getBasicType() == glslang::EbtRayQuery || type.getBasicType() == glslang::EbtHitObjectNV 
-        || type.getBasicType() == glslang::EbtHitObjectEXT)
-        return spv::StorageClass::Private;
+    if (type.getBasicType() == glslang::EbtRayQuery || type.getBasicType() == glslang::EbtHitObjectNV)
+        return spv::StorageClassPrivate;
     if (type.getQualifier().isSpirvByReference()) {
         if (type.getQualifier().isParamInput() || type.getQualifier().isParamOutput())
-            return spv::StorageClass::Function;
+            return spv::StorageClassFunction;
     }
     if (type.getQualifier().isPipeInput())
-        return spv::StorageClass::Input;
+        return spv::StorageClassInput;
     if (type.getQualifier().isPipeOutput())
-        return spv::StorageClass::Output;
+        return spv::StorageClassOutput;
     if (type.getQualifier().storage == glslang::EvqTileImageEXT || type.isAttachmentEXT()) {
         builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
-        builder.addCapability(spv::Capability::TileImageColorReadAccessEXT);
-        return spv::StorageClass::TileImageEXT;
-    }
-
-    if (type.getQualifier().isTileAttachmentQCOM()) {
-        builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        builder.addCapability(spv::Capability::TileShadingQCOM);
-        return spv::StorageClass::TileAttachmentQCOM;
+        builder.addCapability(spv::CapabilityTileImageColorReadAccessEXT);
+        return spv::StorageClassTileImageEXT;
     }
 
     if (glslangIntermediate->getSource() != glslang::EShSourceHlsl ||
             type.getQualifier().storage == glslang::EvqUniform) {
         if (type.isAtomic())
-            return spv::StorageClass::AtomicCounter;
+            return spv::StorageClassAtomicCounter;
         if (type.containsOpaque() && !glslangIntermediate->getBindlessMode())
-            return spv::StorageClass::UniformConstant;
+            return spv::StorageClassUniformConstant;
     }
 
     if (type.getQualifier().isUniformOrBuffer() &&
         type.getQualifier().isShaderRecord()) {
-        return spv::StorageClass::ShaderRecordBufferKHR;
+        return spv::StorageClassShaderRecordBufferKHR;
     }
 
     if (glslangIntermediate->usingStorageBuffer() && type.getQualifier().storage == glslang::EvqBuffer) {
         builder.addIncorporatedExtension(spv::E_SPV_KHR_storage_buffer_storage_class, spv::Spv_1_3);
-        return spv::StorageClass::StorageBuffer;
+        return spv::StorageClassStorageBuffer;
     }
 
     if (type.getQualifier().isUniformOrBuffer()) {
         if (type.getQualifier().isPushConstant())
-            return spv::StorageClass::PushConstant;
+            return spv::StorageClassPushConstant;
         if (type.getBasicType() == glslang::EbtBlock)
-            return spv::StorageClass::Uniform;
-        return spv::StorageClass::UniformConstant;
+            return spv::StorageClassUniform;
+        return spv::StorageClassUniformConstant;
     }
 
     if (type.getQualifier().storage == glslang::EvqShared && type.getBasicType() == glslang::EbtBlock) {
         builder.addExtension(spv::E_SPV_KHR_workgroup_memory_explicit_layout);
-        builder.addCapability(spv::Capability::WorkgroupMemoryExplicitLayoutKHR);
-        return spv::StorageClass::Workgroup;
+        builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayoutKHR);
+        return spv::StorageClassWorkgroup;
     }
 
     switch (type.getQualifier().storage) {
-    case glslang::EvqGlobal:        return spv::StorageClass::Private;
-    case glslang::EvqConstReadOnly: return spv::StorageClass::Function;
-    case glslang::EvqTemporary:     return spv::StorageClass::Function;
-    case glslang::EvqShared:           return spv::StorageClass::Workgroup;
-    case glslang::EvqPayload:        return spv::StorageClass::RayPayloadKHR;
-    case glslang::EvqPayloadIn:      return spv::StorageClass::IncomingRayPayloadKHR;
-    case glslang::EvqHitAttr:        return spv::StorageClass::HitAttributeKHR;
-    case glslang::EvqCallableData:   return spv::StorageClass::CallableDataKHR;
-    case glslang::EvqCallableDataIn: return spv::StorageClass::IncomingCallableDataKHR;
-    case glslang::EvqtaskPayloadSharedEXT : return spv::StorageClass::TaskPayloadWorkgroupEXT;
-    case glslang::EvqHitObjectAttrNV: return spv::StorageClass::HitObjectAttributeNV;
-    case glslang::EvqHitObjectAttrEXT: return spv::StorageClass::HitObjectAttributeEXT;
+    case glslang::EvqGlobal:        return spv::StorageClassPrivate;
+    case glslang::EvqConstReadOnly: return spv::StorageClassFunction;
+    case glslang::EvqTemporary:     return spv::StorageClassFunction;
+    case glslang::EvqShared:           return spv::StorageClassWorkgroup;
+    case glslang::EvqPayload:        return spv::StorageClassRayPayloadKHR;
+    case glslang::EvqPayloadIn:      return spv::StorageClassIncomingRayPayloadKHR;
+    case glslang::EvqHitAttr:        return spv::StorageClassHitAttributeKHR;
+    case glslang::EvqCallableData:   return spv::StorageClassCallableDataKHR;
+    case glslang::EvqCallableDataIn: return spv::StorageClassIncomingCallableDataKHR;
+    case glslang::EvqtaskPayloadSharedEXT : return spv::StorageClassTaskPayloadWorkgroupEXT;
+    case glslang::EvqHitObjectAttrNV: return spv::StorageClassHitObjectAttributeNV;
     case glslang::EvqSpirvStorageClass: return static_cast<spv::StorageClass>(type.getQualifier().spirvStorageClass);
     default:
         assert(0);
         break;
     }
 
-    return spv::StorageClass::Function;
+    return spv::StorageClassFunction;
 }
 
 // Translate glslang constants to SPIR-V literals
@@ -1459,33 +1412,33 @@ void TGlslangToSpvTraverser::addIndirectionIndexCapabilities(const glslang::TTyp
         // SPV_EXT_descriptor_indexing already added in TranslateNonUniformDecoration
         if (baseType.getBasicType() == glslang::EbtSampler) {
             if (baseType.getQualifier().hasAttachment())
-                builder.addCapability(spv::Capability::InputAttachmentArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityInputAttachmentArrayNonUniformIndexingEXT);
             else if (baseType.isImage() && baseType.getSampler().isBuffer())
-                builder.addCapability(spv::Capability::StorageTexelBufferArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityStorageTexelBufferArrayNonUniformIndexingEXT);
             else if (baseType.isTexture() && baseType.getSampler().isBuffer())
-                builder.addCapability(spv::Capability::UniformTexelBufferArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityUniformTexelBufferArrayNonUniformIndexingEXT);
             else if (baseType.isImage())
-                builder.addCapability(spv::Capability::StorageImageArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityStorageImageArrayNonUniformIndexingEXT);
             else if (baseType.isTexture())
-                builder.addCapability(spv::Capability::SampledImageArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilitySampledImageArrayNonUniformIndexingEXT);
         } else if (baseType.getBasicType() == glslang::EbtBlock) {
             if (baseType.getQualifier().storage == glslang::EvqBuffer)
-                builder.addCapability(spv::Capability::StorageBufferArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityStorageBufferArrayNonUniformIndexingEXT);
             else if (baseType.getQualifier().storage == glslang::EvqUniform)
-                builder.addCapability(spv::Capability::UniformBufferArrayNonUniformIndexingEXT);
+                builder.addCapability(spv::CapabilityUniformBufferArrayNonUniformIndexingEXT);
         }
     } else {
         // assume a dynamically uniform index
         if (baseType.getBasicType() == glslang::EbtSampler) {
             if (baseType.getQualifier().hasAttachment()) {
                 builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-                builder.addCapability(spv::Capability::InputAttachmentArrayDynamicIndexingEXT);
+                builder.addCapability(spv::CapabilityInputAttachmentArrayDynamicIndexingEXT);
             } else if (baseType.isImage() && baseType.getSampler().isBuffer()) {
                 builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-                builder.addCapability(spv::Capability::StorageTexelBufferArrayDynamicIndexingEXT);
+                builder.addCapability(spv::CapabilityStorageTexelBufferArrayDynamicIndexingEXT);
             } else if (baseType.isTexture() && baseType.getSampler().isBuffer()) {
                 builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-                builder.addCapability(spv::Capability::UniformTexelBufferArrayDynamicIndexingEXT);
+                builder.addCapability(spv::CapabilityUniformTexelBufferArrayDynamicIndexingEXT);
             }
         }
     }
@@ -1509,10 +1462,6 @@ bool IsDescriptorResource(const glslang::TType& type)
         type.getBasicType() == glslang::EbtAccStruct)
         return type.getQualifier().isUniformOrBuffer();
 
-    // Tensors are tied to a descriptor.
-    if (type.isTensorARM())
-        return true;
-
     // None of the above.
     return false;
 }
@@ -1560,8 +1509,6 @@ void InheritQualifiers(glslang::TQualifier& child, const glslang::TQualifier& pa
         child.nonprivate = true;
     if (parent.volatil)
         child.volatil = true;
-    if (parent.nontemporal)
-        child.nontemporal = true;
     if (parent.restrict)
         child.restrict = true;
     if (parent.readonly)
@@ -1623,7 +1570,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
         else {
             builder.setEmitSpirvDebugInfo();
         }
-        builder.setDebugMainSourceFile(glslangIntermediate->getSourceFile());
+        builder.setDebugSourceFile(glslangIntermediate->getSourceFile());
 
         // Set the source shader's text. If for SPV version 1.0, include
         // a preamble in comments stating the OpModuleProcessed instructions.
@@ -1648,27 +1595,25 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
             builder.addInclude(iItr->first, iItr->second);
     }
 
-    builder.setUseReplicatedComposites(glslangIntermediate->usingReplicatedComposites());
-
     stdBuiltins = builder.import("GLSL.std.450");
 
-    spv::AddressingModel addressingModel = spv::AddressingModel::Logical;
-    spv::MemoryModel memoryModel = spv::MemoryModel::GLSL450;
+    spv::AddressingModel addressingModel = spv::AddressingModelLogical;
+    spv::MemoryModel memoryModel = spv::MemoryModelGLSL450;
 
     if (glslangIntermediate->usingPhysicalStorageBuffer()) {
-        addressingModel = spv::AddressingModel::PhysicalStorageBuffer64EXT;
+        addressingModel = spv::AddressingModelPhysicalStorageBuffer64EXT;
         builder.addIncorporatedExtension(spv::E_SPV_KHR_physical_storage_buffer, spv::Spv_1_5);
-        builder.addCapability(spv::Capability::PhysicalStorageBufferAddressesEXT);
+        builder.addCapability(spv::CapabilityPhysicalStorageBufferAddressesEXT);
     }
     if (glslangIntermediate->usingVulkanMemoryModel()) {
-        memoryModel = spv::MemoryModel::VulkanKHR;
-        builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+        memoryModel = spv::MemoryModelVulkanKHR;
+        builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
         builder.addIncorporatedExtension(spv::E_SPV_KHR_vulkan_memory_model, spv::Spv_1_5);
     }
     builder.setMemoryModel(addressingModel, memoryModel);
 
     if (glslangIntermediate->usingVariablePointers()) {
-        builder.addCapability(spv::Capability::VariablePointers);
+        builder.addCapability(spv::CapabilityVariablePointers);
     }
 
     // If not linking, there is no entry point
@@ -1686,160 +1631,147 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
     // Add the top-level modes for this shader.
 
     if (glslangIntermediate->getXfbMode()) {
-        builder.addCapability(spv::Capability::TransformFeedback);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::Xfb);
+        builder.addCapability(spv::CapabilityTransformFeedback);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeXfb);
     }
 
     if (glslangIntermediate->getLayoutPrimitiveCulling()) {
-        builder.addCapability(spv::Capability::RayTraversalPrimitiveCullingKHR);
+        builder.addCapability(spv::CapabilityRayTraversalPrimitiveCullingKHR);
     }
 
     if (glslangIntermediate->getSubgroupUniformControlFlow()) {
         builder.addExtension(spv::E_SPV_KHR_subgroup_uniform_control_flow);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::SubgroupUniformControlFlowKHR);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeSubgroupUniformControlFlowKHR);
     }
     if (glslangIntermediate->getMaximallyReconverges()) {
         builder.addExtension(spv::E_SPV_KHR_maximal_reconvergence);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::MaximallyReconvergesKHR);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeMaximallyReconvergesKHR);
     }
 
     if (glslangIntermediate->getQuadDerivMode())
     {
-        builder.addCapability(spv::Capability::QuadControlKHR);
+        builder.addCapability(spv::CapabilityQuadControlKHR);
         builder.addExtension(spv::E_SPV_KHR_quad_control);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::QuadDerivativesKHR);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeQuadDerivativesKHR);
     }
 
     if (glslangIntermediate->getReqFullQuadsMode())
     {
-        builder.addCapability(spv::Capability::QuadControlKHR);
+        builder.addCapability(spv::CapabilityQuadControlKHR);
         builder.addExtension(spv::E_SPV_KHR_quad_control);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::RequireFullQuadsKHR);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeRequireFullQuadsKHR);
     }
 
-    if (glslangIntermediate->usingShader64BitIndexing())
-    {
-        builder.addCapability(spv::Capability::Shader64BitIndexingEXT);
-        builder.addExtension(spv::E_SPV_EXT_shader_64bit_indexing);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::Shader64BitIndexingEXT);
-    }
-
-    spv::ExecutionMode mode;
+    unsigned int mode;
     switch (glslangIntermediate->getStage()) {
     case EShLangVertex:
-        builder.addCapability(spv::Capability::Shader);
+        builder.addCapability(spv::CapabilityShader);
         break;
 
     case EShLangFragment:
-        builder.addCapability(spv::Capability::Shader);
+        builder.addCapability(spv::CapabilityShader);
         if (glslangIntermediate->getPixelCenterInteger())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::PixelCenterInteger);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModePixelCenterInteger);
 
         if (glslangIntermediate->getOriginUpperLeft())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OriginUpperLeft);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOriginUpperLeft);
         else
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OriginLowerLeft);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOriginLowerLeft);
 
         if (glslangIntermediate->getEarlyFragmentTests())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::EarlyFragmentTests);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeEarlyFragmentTests);
 
         if (glslangIntermediate->getEarlyAndLateFragmentTestsAMD())
         {
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::EarlyAndLateFragmentTestsAMD);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeEarlyAndLateFragmentTestsAMD);
             builder.addExtension(spv::E_SPV_AMD_shader_early_and_late_fragment_tests);
         }
 
         if (glslangIntermediate->getPostDepthCoverage()) {
-            builder.addCapability(spv::Capability::SampleMaskPostDepthCoverage);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::PostDepthCoverage);
+            builder.addCapability(spv::CapabilitySampleMaskPostDepthCoverage);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModePostDepthCoverage);
             builder.addExtension(spv::E_SPV_KHR_post_depth_coverage);
         }
 
         if (glslangIntermediate->getNonCoherentColorAttachmentReadEXT()) {
-            builder.addCapability(spv::Capability::TileImageColorReadAccessEXT);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::NonCoherentColorAttachmentReadEXT);
+            builder.addCapability(spv::CapabilityTileImageColorReadAccessEXT);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeNonCoherentColorAttachmentReadEXT);
             builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
         }
 
         if (glslangIntermediate->getNonCoherentDepthAttachmentReadEXT()) {
-            builder.addCapability(spv::Capability::TileImageDepthReadAccessEXT);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::NonCoherentDepthAttachmentReadEXT);
+            builder.addCapability(spv::CapabilityTileImageDepthReadAccessEXT);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeNonCoherentDepthAttachmentReadEXT);
             builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
         }
 
         if (glslangIntermediate->getNonCoherentStencilAttachmentReadEXT()) {
-            builder.addCapability(spv::Capability::TileImageStencilReadAccessEXT);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::NonCoherentStencilAttachmentReadEXT);
+            builder.addCapability(spv::CapabilityTileImageStencilReadAccessEXT);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeNonCoherentStencilAttachmentReadEXT);
             builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
         }
 
-        if (glslangIntermediate->getNonCoherentTileAttachmentReadQCOM()) {
-            builder.addCapability(spv::Capability::TileShadingQCOM);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::NonCoherentTileAttachmentReadQCOM);
-            builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        }
-
         if (glslangIntermediate->isDepthReplacing())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::DepthReplacing);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeDepthReplacing);
 
         if (glslangIntermediate->isStencilReplacing())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::StencilRefReplacingEXT);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeStencilRefReplacingEXT);
 
         switch(glslangIntermediate->getDepth()) {
-        case glslang::EldGreater:   mode = spv::ExecutionMode::DepthGreater;   break;
-        case glslang::EldLess:      mode = spv::ExecutionMode::DepthLess;      break;
-        case glslang::EldUnchanged: mode = spv::ExecutionMode::DepthUnchanged; break;
-        default:                    mode = spv::ExecutionMode::Max;            break;
+        case glslang::EldGreater:   mode = spv::ExecutionModeDepthGreater;   break;
+        case glslang::EldLess:      mode = spv::ExecutionModeDepthLess;      break;
+        case glslang::EldUnchanged: mode = spv::ExecutionModeDepthUnchanged; break;
+        default:                    mode = spv::ExecutionModeMax;            break;
         }
 
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
 
         switch (glslangIntermediate->getStencil()) {
-        case glslang::ElsRefUnchangedFrontAMD:  mode = spv::ExecutionMode::StencilRefUnchangedFrontAMD; break;
-        case glslang::ElsRefGreaterFrontAMD:    mode = spv::ExecutionMode::StencilRefGreaterFrontAMD;   break;
-        case glslang::ElsRefLessFrontAMD:       mode = spv::ExecutionMode::StencilRefLessFrontAMD;      break;
-        case glslang::ElsRefUnchangedBackAMD:   mode = spv::ExecutionMode::StencilRefUnchangedBackAMD;  break;
-        case glslang::ElsRefGreaterBackAMD:     mode = spv::ExecutionMode::StencilRefGreaterBackAMD;    break;
-        case glslang::ElsRefLessBackAMD:        mode = spv::ExecutionMode::StencilRefLessBackAMD;       break;
-        default:                       mode = spv::ExecutionMode::Max;                         break;
+        case glslang::ElsRefUnchangedFrontAMD:  mode = spv::ExecutionModeStencilRefUnchangedFrontAMD; break;
+        case glslang::ElsRefGreaterFrontAMD:    mode = spv::ExecutionModeStencilRefGreaterFrontAMD;   break;
+        case glslang::ElsRefLessFrontAMD:       mode = spv::ExecutionModeStencilRefLessFrontAMD;      break;
+        case glslang::ElsRefUnchangedBackAMD:   mode = spv::ExecutionModeStencilRefUnchangedBackAMD;  break;
+        case glslang::ElsRefGreaterBackAMD:     mode = spv::ExecutionModeStencilRefGreaterBackAMD;    break;
+        case glslang::ElsRefLessBackAMD:        mode = spv::ExecutionModeStencilRefLessBackAMD;       break;
+        default:                       mode = spv::ExecutionModeMax;                         break;
         }
 
-        if (mode != spv::ExecutionMode::Max)
+        if (mode != spv::ExecutionModeMax)
             builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
         switch (glslangIntermediate->getInterlockOrdering()) {
-        case glslang::EioPixelInterlockOrdered:         mode = spv::ExecutionMode::PixelInterlockOrderedEXT;
+        case glslang::EioPixelInterlockOrdered:         mode = spv::ExecutionModePixelInterlockOrderedEXT;
             break;
-        case glslang::EioPixelInterlockUnordered:       mode = spv::ExecutionMode::PixelInterlockUnorderedEXT;
+        case glslang::EioPixelInterlockUnordered:       mode = spv::ExecutionModePixelInterlockUnorderedEXT;
             break;
-        case glslang::EioSampleInterlockOrdered:        mode = spv::ExecutionMode::SampleInterlockOrderedEXT;
+        case glslang::EioSampleInterlockOrdered:        mode = spv::ExecutionModeSampleInterlockOrderedEXT;
             break;
-        case glslang::EioSampleInterlockUnordered:      mode = spv::ExecutionMode::SampleInterlockUnorderedEXT;
+        case glslang::EioSampleInterlockUnordered:      mode = spv::ExecutionModeSampleInterlockUnorderedEXT;
             break;
-        case glslang::EioShadingRateInterlockOrdered:   mode = spv::ExecutionMode::ShadingRateInterlockOrderedEXT;
+        case glslang::EioShadingRateInterlockOrdered:   mode = spv::ExecutionModeShadingRateInterlockOrderedEXT;
             break;
-        case glslang::EioShadingRateInterlockUnordered: mode = spv::ExecutionMode::ShadingRateInterlockUnorderedEXT;
+        case glslang::EioShadingRateInterlockUnordered: mode = spv::ExecutionModeShadingRateInterlockUnorderedEXT;
             break;
-        default:                                        mode = spv::ExecutionMode::Max;
+        default:                                        mode = spv::ExecutionModeMax;
             break;
         }
-        if (mode != spv::ExecutionMode::Max) {
+        if (mode != spv::ExecutionModeMax) {
             builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
-            if (mode == spv::ExecutionMode::ShadingRateInterlockOrderedEXT ||
-                mode == spv::ExecutionMode::ShadingRateInterlockUnorderedEXT) {
-                builder.addCapability(spv::Capability::FragmentShaderShadingRateInterlockEXT);
-            } else if (mode == spv::ExecutionMode::PixelInterlockOrderedEXT ||
-                       mode == spv::ExecutionMode::PixelInterlockUnorderedEXT) {
-                builder.addCapability(spv::Capability::FragmentShaderPixelInterlockEXT);
+            if (mode == spv::ExecutionModeShadingRateInterlockOrderedEXT ||
+                mode == spv::ExecutionModeShadingRateInterlockUnorderedEXT) {
+                builder.addCapability(spv::CapabilityFragmentShaderShadingRateInterlockEXT);
+            } else if (mode == spv::ExecutionModePixelInterlockOrderedEXT ||
+                       mode == spv::ExecutionModePixelInterlockUnorderedEXT) {
+                builder.addCapability(spv::CapabilityFragmentShaderPixelInterlockEXT);
             } else {
-                builder.addCapability(spv::Capability::FragmentShaderSampleInterlockEXT);
+                builder.addCapability(spv::CapabilityFragmentShaderSampleInterlockEXT);
             }
             builder.addExtension(spv::E_SPV_EXT_fragment_shader_interlock);
         }
     break;
 
     case EShLangCompute: {
-        builder.addCapability(spv::Capability::Shader);
+        builder.addCapability(spv::CapabilityShader);
         bool needSizeId = false;
         for (int dim = 0; dim < 3; ++dim) {
             if ((glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet)) {
@@ -1853,53 +1785,36 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
                 bool specConst = (glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet);
                 dimConstId.push_back(builder.makeUintConstant(glslangIntermediate->getLocalSize(dim), specConst));
                 if (specConst) {
-                    builder.addDecoration(dimConstId.back(), spv::Decoration::SpecId,
+                    builder.addDecoration(dimConstId.back(), spv::DecorationSpecId,
                                           glslangIntermediate->getLocalSizeSpecId(dim));
                     needSizeId = true;
                 }
             }
-            builder.addExecutionModeId(shaderEntry, spv::ExecutionMode::LocalSizeId, dimConstId);
+            builder.addExecutionModeId(shaderEntry, spv::ExecutionModeLocalSizeId, dimConstId);
         } else {
-            if (glslangIntermediate->getTileShadingRateQCOM(0) >= 1 || glslangIntermediate->getTileShadingRateQCOM(1) >= 1 || glslangIntermediate->getTileShadingRateQCOM(2) >= 1) {
-                auto rate_x = glslangIntermediate->getTileShadingRateQCOM(0);
-                auto rate_y = glslangIntermediate->getTileShadingRateQCOM(1);
-                auto rate_z = glslangIntermediate->getTileShadingRateQCOM(2);
-                rate_x = ( rate_x == 0 ? 1 : rate_x );
-                rate_y = ( rate_y == 0 ? 1 : rate_y );
-                rate_z = ( rate_z == 0 ? 1 : rate_z );
-                builder.addExecutionMode(shaderEntry, spv::ExecutionMode::TileShadingRateQCOM, rate_x, rate_y, rate_z);
-            } else {
-                builder.addExecutionMode(shaderEntry, spv::ExecutionMode::LocalSize, glslangIntermediate->getLocalSize(0),
-                                                                                   glslangIntermediate->getLocalSize(1),
-                                                                                   glslangIntermediate->getLocalSize(2));
-            }
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeLocalSize, glslangIntermediate->getLocalSize(0),
+                                                                               glslangIntermediate->getLocalSize(1),
+                                                                               glslangIntermediate->getLocalSize(2));
         }
         if (glslangIntermediate->getLayoutDerivativeModeNone() == glslang::LayoutDerivativeGroupQuads) {
-            builder.addCapability(spv::Capability::ComputeDerivativeGroupQuadsNV);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::DerivativeGroupQuadsNV);
+            builder.addCapability(spv::CapabilityComputeDerivativeGroupQuadsNV);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeDerivativeGroupQuadsNV);
             builder.addExtension(spv::E_SPV_NV_compute_shader_derivatives);
         } else if (glslangIntermediate->getLayoutDerivativeModeNone() == glslang::LayoutDerivativeGroupLinear) {
-            builder.addCapability(spv::Capability::ComputeDerivativeGroupLinearNV);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::DerivativeGroupLinearNV);
+            builder.addCapability(spv::CapabilityComputeDerivativeGroupLinearNV);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeDerivativeGroupLinearNV);
             builder.addExtension(spv::E_SPV_NV_compute_shader_derivatives);
         }
-
-        if (glslangIntermediate->getNonCoherentTileAttachmentReadQCOM()) {
-            builder.addCapability(spv::Capability::TileShadingQCOM);
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::NonCoherentTileAttachmentReadQCOM);
-            builder.addExtension(spv::E_SPV_QCOM_tile_shading);
-        }
-
         break;
     }
     case EShLangTessEvaluation:
     case EShLangTessControl:
-        builder.addCapability(spv::Capability::Tessellation);
+        builder.addCapability(spv::CapabilityTessellation);
 
         glslang::TLayoutGeometry primitive;
 
         if (glslangIntermediate->getStage() == EShLangTessControl) {
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OutputVertices,
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputVertices,
                 glslangIntermediate->getVertices());
             primitive = glslangIntermediate->getOutputPrimitive();
         } else {
@@ -1907,59 +1822,59 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
         }
 
         switch (primitive) {
-        case glslang::ElgTriangles:           mode = spv::ExecutionMode::Triangles;     break;
-        case glslang::ElgQuads:               mode = spv::ExecutionMode::Quads;         break;
-        case glslang::ElgIsolines:            mode = spv::ExecutionMode::Isolines;      break;
-        default:                              mode = spv::ExecutionMode::Max;           break;
+        case glslang::ElgTriangles:           mode = spv::ExecutionModeTriangles;     break;
+        case glslang::ElgQuads:               mode = spv::ExecutionModeQuads;         break;
+        case glslang::ElgIsolines:            mode = spv::ExecutionModeIsolines;      break;
+        default:                              mode = spv::ExecutionModeMax;           break;
         }
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
 
         switch (glslangIntermediate->getVertexSpacing()) {
-        case glslang::EvsEqual:            mode = spv::ExecutionMode::SpacingEqual;          break;
-        case glslang::EvsFractionalEven:   mode = spv::ExecutionMode::SpacingFractionalEven; break;
-        case glslang::EvsFractionalOdd:    mode = spv::ExecutionMode::SpacingFractionalOdd;  break;
-        default:                           mode = spv::ExecutionMode::Max;                   break;
+        case glslang::EvsEqual:            mode = spv::ExecutionModeSpacingEqual;          break;
+        case glslang::EvsFractionalEven:   mode = spv::ExecutionModeSpacingFractionalEven; break;
+        case glslang::EvsFractionalOdd:    mode = spv::ExecutionModeSpacingFractionalOdd;  break;
+        default:                           mode = spv::ExecutionModeMax;                   break;
         }
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
 
         switch (glslangIntermediate->getVertexOrder()) {
-        case glslang::EvoCw:     mode = spv::ExecutionMode::VertexOrderCw;  break;
-        case glslang::EvoCcw:    mode = spv::ExecutionMode::VertexOrderCcw; break;
-        default:                 mode = spv::ExecutionMode::Max;            break;
+        case glslang::EvoCw:     mode = spv::ExecutionModeVertexOrderCw;  break;
+        case glslang::EvoCcw:    mode = spv::ExecutionModeVertexOrderCcw; break;
+        default:                 mode = spv::ExecutionModeMax;            break;
         }
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
 
         if (glslangIntermediate->getPointMode())
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::PointMode);
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModePointMode);
         break;
 
     case EShLangGeometry:
-        builder.addCapability(spv::Capability::Geometry);
+        builder.addCapability(spv::CapabilityGeometry);
         switch (glslangIntermediate->getInputPrimitive()) {
-        case glslang::ElgPoints:             mode = spv::ExecutionMode::InputPoints;             break;
-        case glslang::ElgLines:              mode = spv::ExecutionMode::InputLines;              break;
-        case glslang::ElgLinesAdjacency:     mode = spv::ExecutionMode::InputLinesAdjacency;     break;
-        case glslang::ElgTriangles:          mode = spv::ExecutionMode::Triangles;               break;
-        case glslang::ElgTrianglesAdjacency: mode = spv::ExecutionMode::InputTrianglesAdjacency; break;
-        default:                             mode = spv::ExecutionMode::Max;                     break;
+        case glslang::ElgPoints:             mode = spv::ExecutionModeInputPoints;             break;
+        case glslang::ElgLines:              mode = spv::ExecutionModeInputLines;              break;
+        case glslang::ElgLinesAdjacency:     mode = spv::ExecutionModeInputLinesAdjacency;     break;
+        case glslang::ElgTriangles:          mode = spv::ExecutionModeTriangles;               break;
+        case glslang::ElgTrianglesAdjacency: mode = spv::ExecutionModeInputTrianglesAdjacency; break;
+        default:                             mode = spv::ExecutionModeMax;                     break;
         }
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
 
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::Invocations, glslangIntermediate->getInvocations());
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeInvocations, glslangIntermediate->getInvocations());
 
         switch (glslangIntermediate->getOutputPrimitive()) {
-        case glslang::ElgPoints:        mode = spv::ExecutionMode::OutputPoints;                 break;
-        case glslang::ElgLineStrip:     mode = spv::ExecutionMode::OutputLineStrip;              break;
-        case glslang::ElgTriangleStrip: mode = spv::ExecutionMode::OutputTriangleStrip;          break;
-        default:                        mode = spv::ExecutionMode::Max;                          break;
+        case glslang::ElgPoints:        mode = spv::ExecutionModeOutputPoints;                 break;
+        case glslang::ElgLineStrip:     mode = spv::ExecutionModeOutputLineStrip;              break;
+        case glslang::ElgTriangleStrip: mode = spv::ExecutionModeOutputTriangleStrip;          break;
+        default:                        mode = spv::ExecutionModeMax;                          break;
         }
-        if (mode != spv::ExecutionMode::Max)
-            builder.addExecutionMode(shaderEntry, mode);
-        builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OutputVertices, glslangIntermediate->getVertices());
+        if (mode != spv::ExecutionModeMax)
+            builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
+        builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputVertices, glslangIntermediate->getVertices());
         break;
 
     case EShLangRayGen:
@@ -1970,25 +1885,21 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
     case EShLangCallable:
     {
         auto& extensions = glslangIntermediate->getRequestedExtensions();
-        if (extensions.find("GL_EXT_opacity_micromap") != extensions.end()) {
-            builder.addCapability(spv::Capability::RayTracingOpacityMicromapEXT);
-            builder.addExtension("SPV_EXT_opacity_micromap");
-        }
         if (extensions.find("GL_NV_ray_tracing") == extensions.end()) {
-            builder.addCapability(spv::Capability::RayTracingKHR);
+            builder.addCapability(spv::CapabilityRayTracingKHR);
             builder.addExtension("SPV_KHR_ray_tracing");
         }
         else {
-            builder.addCapability(spv::Capability::RayTracingNV);
+            builder.addCapability(spv::CapabilityRayTracingNV);
             builder.addExtension("SPV_NV_ray_tracing");
         }
         if (glslangIntermediate->getStage() != EShLangRayGen && glslangIntermediate->getStage() != EShLangCallable) {
             if (extensions.find("GL_EXT_ray_cull_mask") != extensions.end()) {
-                builder.addCapability(spv::Capability::RayCullMaskKHR);
+                builder.addCapability(spv::CapabilityRayCullMaskKHR);
                 builder.addExtension("SPV_KHR_ray_cull_mask");
             }
             if (extensions.find("GL_EXT_ray_tracing_position_fetch") != extensions.end()) {
-                builder.addCapability(spv::Capability::RayTracingPositionFetchKHR);
+                builder.addCapability(spv::CapabilityRayTracingPositionFetchKHR);
                 builder.addExtension("SPV_KHR_ray_tracing_position_fetch");
             }
         }
@@ -1997,10 +1908,10 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
     case EShLangTask:
     case EShLangMesh:
         if(isMeshShaderExt) {
-            builder.addCapability(spv::Capability::MeshShadingEXT);
+            builder.addCapability(spv::CapabilityMeshShadingEXT);
             builder.addExtension(spv::E_SPV_EXT_mesh_shader);
         } else {
-            builder.addCapability(spv::Capability::MeshShadingNV);
+            builder.addCapability(spv::CapabilityMeshShadingNV);
             builder.addExtension(spv::E_SPV_NV_mesh_shader);
         }
         if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6) {
@@ -2009,29 +1920,29 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
                 bool specConst = (glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet);
                 dimConstId.push_back(builder.makeUintConstant(glslangIntermediate->getLocalSize(dim), specConst));
                 if (specConst) {
-                    builder.addDecoration(dimConstId.back(), spv::Decoration::SpecId,
+                    builder.addDecoration(dimConstId.back(), spv::DecorationSpecId,
                                           glslangIntermediate->getLocalSizeSpecId(dim));
                 }
             }
-            builder.addExecutionModeId(shaderEntry, spv::ExecutionMode::LocalSizeId, dimConstId);
+            builder.addExecutionModeId(shaderEntry, spv::ExecutionModeLocalSizeId, dimConstId);
         } else {
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::LocalSize, glslangIntermediate->getLocalSize(0),
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeLocalSize, glslangIntermediate->getLocalSize(0),
                                                                                glslangIntermediate->getLocalSize(1),
                                                                                glslangIntermediate->getLocalSize(2));
         }
         if (glslangIntermediate->getStage() == EShLangMesh) {
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OutputVertices,
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputVertices,
                 glslangIntermediate->getVertices());
-            builder.addExecutionMode(shaderEntry, spv::ExecutionMode::OutputPrimitivesNV,
+            builder.addExecutionMode(shaderEntry, spv::ExecutionModeOutputPrimitivesNV,
                 glslangIntermediate->getPrimitives());
 
             switch (glslangIntermediate->getOutputPrimitive()) {
-            case glslang::ElgPoints:        mode = spv::ExecutionMode::OutputPoints;      break;
-            case glslang::ElgLines:         mode = spv::ExecutionMode::OutputLinesNV;     break;
-            case glslang::ElgTriangles:     mode = spv::ExecutionMode::OutputTrianglesNV; break;
-            default:                        mode = spv::ExecutionMode::Max;               break;
+            case glslang::ElgPoints:        mode = spv::ExecutionModeOutputPoints;      break;
+            case glslang::ElgLines:         mode = spv::ExecutionModeOutputLinesNV;     break;
+            case glslang::ElgTriangles:     mode = spv::ExecutionModeOutputTrianglesNV; break;
+            default:                        mode = spv::ExecutionModeMax;               break;
             }
-            if (mode != spv::ExecutionMode::Max)
+            if (mode != spv::ExecutionModeMax)
                 builder.addExecutionMode(shaderEntry, (spv::ExecutionMode)mode);
         }
         break;
@@ -2139,10 +2050,6 @@ void TGlslangToSpvTraverser::visitSymbol(glslang::TIntermSymbol* symbol)
         builder.setDebugSourceLocation(symbol->getLoc().line, symbol->getLoc().getFilename());
     }
 
-    if (symbol->getBasicType() == glslang::EbtFunction) {
-        return;
-    }
-
     SpecConstantOpModeGuard spec_constant_op_mode_setter(&builder);
     if (symbol->getType().isStruct())
         glslangTypeToIdMap[symbol->getType().getStruct()] = symbol->getId();
@@ -2173,7 +2080,7 @@ void TGlslangToSpvTraverser::visitSymbol(glslang::TIntermSymbol* symbol)
                 // Before SPIR-V 1.4, we only want to include Input and Output.
                 // Starting with SPIR-V 1.4, we want all globals.
                 if ((glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_4 && builder.isGlobalVariable(id)) ||
-                    (sc == spv::StorageClass::Input || sc == spv::StorageClass::Output)) {
+                    (sc == spv::StorageClassInput || sc == spv::StorageClassOutput)) {
                     iOSet.insert(id);
                 }
             }
@@ -2237,7 +2144,7 @@ void TGlslangToSpvTraverser::visitSymbol(glslang::TIntermSymbol* symbol)
                             spv::Id counterId = getSymbolId(symbol);
                             if (counterId != spv::NoResult) {
                                 builder.addExtension("SPV_GOOGLE_hlsl_functionality1");
-                                builder.addDecorationId(id, spv::Decoration::HlslCounterBufferGOOGLE, counterId);
+                                builder.addDecorationId(id, spv::DecorationHlslCounterBufferGOOGLE, counterId);
                             }
                         }
                     }
@@ -2384,20 +2291,10 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T
                 coherentFlags.nonUniform = 0;
 
                 // normal case for indexing array or structure or block
-                if ((node->getRight()->getType().getBasicType() == glslang::EbtUint && glslangIntermediate->usingPromoteUint32Indices()) ||
-                     node->getRight()->getType().contains64BitInt()) {
-                    int64_t idx = node->getRight()->getType().contains64BitInt() ?
-                                    node->getRight()->getAsConstantUnion()->getConstArray()[0].getI64Const() :
-                                    node->getRight()->getAsConstantUnion()->getConstArray()[0].getUConst();
-                    builder.accessChainPush(builder.makeInt64Constant(idx),
-                            coherentFlags,
-                            node->getLeft()->getType().getBufferReferenceAlignment());
+                builder.accessChainPush(builder.makeIntConstant(spvIndex),
+                        coherentFlags,
+                        node->getLeft()->getType().getBufferReferenceAlignment());
 
-                } else {
-                    builder.accessChainPush(builder.makeIntConstant(spvIndex),
-                            coherentFlags,
-                            node->getLeft()->getType().getBufferReferenceAlignment());
-                }
                 // Add capabilities here for accessing PointSize and clip/cull distance.
                 // We have deferred generation of associated capabilities until now.
                 if (node->getLeft()->getType().isStruct() && ! node->getLeft()->getType().isArray())
@@ -2424,16 +2321,6 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T
             node->getRight()->traverse(this);
             spv::Id index = accessChainLoad(node->getRight()->getType());
 
-            // Zero-extend smaller unsigned integer types for array indexing.
-            // SPIR-V OpAccessChain treats indices as signed, so we need to zero-extend
-            // unsigned types to preserve their values (signed types are fine as-is).
-            spv::Id indexType = builder.getTypeId(index);
-            if (builder.isUintType(indexType) && builder.getScalarTypeWidth(indexType) < 32) {
-                // Zero-extend unsigned types to preserve their values
-                spv::Id uintType = builder.makeUintType(32);
-                index = builder.createUnaryOp(spv::Op::OpUConvert, uintType, index);
-            }
-
             addIndirectionIndexCapabilities(node->getLeft()->getType(), node->getRight()->getType());
 
             // restore the saved access chain
@@ -2450,15 +2337,9 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T
                     index, convertGlslangToSpvType(node->getLeft()->getType()), coherent_flags,
                                                 glslangIntermediate->getBaseAlignmentScalar(node->getLeft()->getType(),
                                                 dummySize));
-            } else {
-                if (glslangIntermediate->usingPromoteUint32Indices() &&
-                    node->getRight()->getType().getBasicType() == glslang::EbtUint) {
-                    index = createIntWidthConversion(index, 0, builder.makeIntegerType(64, true), glslang::EbtInt64, node->getRight()->getType().getBasicType());
-                }
-
+            } else
                 builder.accessChainPush(index, coherent_flags,
                                         node->getLeft()->getType().getBufferReferenceAlignment());
-            }
         }
         return false;
     case glslang::EOpVectorSwizzle:
@@ -2534,13 +2415,13 @@ spv::Id TGlslangToSpvTraverser::convertLoadedBoolInUniformToUint(const glslang::
         // Conversion for bool
         spv::Id boolType = builder.makeBoolType();
         if (nominalTypeId != boolType)
-            return builder.createBinOp(spv::Op::OpINotEqual, boolType, loadedId, builder.makeUintConstant(0));
+            return builder.createBinOp(spv::OpINotEqual, boolType, loadedId, builder.makeUintConstant(0));
     } else if (builder.isVectorType(nominalTypeId)) {
         // Conversion for bvec
         int vecSize = builder.getNumTypeComponents(nominalTypeId);
         spv::Id bvecType = builder.makeVectorType(builder.makeBoolType(), vecSize);
         if (nominalTypeId != bvecType)
-            loadedId = builder.createBinOp(spv::Op::OpINotEqual, bvecType, loadedId,
+            loadedId = builder.createBinOp(spv::OpINotEqual, bvecType, loadedId,
                 makeSmearedConstant(builder.makeUintConstant(0), vecSize));
     } else if (builder.isArrayType(nominalTypeId)) {
         // Conversion for bool array
@@ -2549,7 +2430,7 @@ spv::Id TGlslangToSpvTraverser::convertLoadedBoolInUniformToUint(const glslang::
         {
             // Use OpCopyLogical from SPIR-V 1.4 if available.
             if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_4)
-                return builder.createUnaryOp(spv::Op::OpCopyLogical, boolArrayTypeId, loadedId);
+                return builder.createUnaryOp(spv::OpCopyLogical, boolArrayTypeId, loadedId);
 
             glslang::TType glslangElementType(type, 0);
             spv::Id elementNominalTypeId = builder.getContainedTypeId(nominalTypeId);
@@ -2626,13 +2507,13 @@ spv::Id TGlslangToSpvTraverser::translateForcedType(spv::Id object)
             // handle 32-bit v.xy* -> 64-bit
             builder.clearAccessChain();
             builder.setAccessChainLValue(object);
-            object = builder.accessChainLoad(spv::NoPrecision, spv::Decoration::Max, spv::Decoration::Max, objectTypeId);
+            object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, spv::DecorationMax, objectTypeId);
             std::vector<spv::Id> components;
             components.push_back(builder.createCompositeExtract(object, builder.getContainedTypeId(objectTypeId), 0));
             components.push_back(builder.createCompositeExtract(object, builder.getContainedTypeId(objectTypeId), 1));
 
             spv::Id vecType = builder.makeVectorType(builder.getContainedTypeId(objectTypeId), 2);
-            return builder.createUnaryOp(spv::Op::OpBitcast, desiredTypeId,
+            return builder.createUnaryOp(spv::OpBitcast, desiredTypeId,
                                          builder.createCompositeConstruct(vecType, components));
         } else {
             logger->missingFunctionality("forcing 32-bit vector type to non 64-bit scalar");
@@ -2642,8 +2523,8 @@ spv::Id TGlslangToSpvTraverser::translateForcedType(spv::Id object)
             // and we insert a transpose after loading the original non-transposed builtins
             builder.clearAccessChain();
             builder.setAccessChainLValue(object);
-            object = builder.accessChainLoad(spv::NoPrecision, spv::Decoration::Max, spv::Decoration::Max, objectTypeId);
-            return builder.createUnaryOp(spv::Op::OpTranspose, desiredTypeId, object);
+            object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, spv::DecorationMax, objectTypeId);
+            return builder.createUnaryOp(spv::OpTranspose, desiredTypeId, object);
 
     } else  {
         logger->missingFunctionality("forcing non 32-bit vector type");
@@ -2685,8 +2566,6 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
         // So, this has to be block.lastMember.length().
         // SPV wants "block" and member number as the operands, go get them.
 
-        uint32_t bits = node->getType().contains64BitInt() ? 64 : 32;
-
         spv::Id length;
         if (node->getOperand()->getType().isCoopMat()) {
             spv::Id typeId = convertGlslangToSpvType(node->getOperand()->getType());
@@ -2698,15 +2577,12 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
                 spec_constant_op_mode_setter.turnOnSpecConstantOpMode();
                 length = builder.createCooperativeMatrixLengthNV(typeId);
             }
-        } else if (node->getOperand()->getType().isCoopVecNV()) {
-            spv::Id typeId = convertGlslangToSpvType(node->getOperand()->getType());
-            length = builder.getCooperativeVectorNumComponents(typeId);
         } else {
             glslang::TIntermTyped* block = node->getOperand()->getAsBinaryNode()->getLeft();
             block->traverse(this);
             unsigned int member = node->getOperand()->getAsBinaryNode()->getRight()->getAsConstantUnion()
                 ->getConstArray()[0].getUConst();
-            length = builder.createArrayLength(builder.accessChainGetLValue(), member, bits);
+            length = builder.createArrayLength(builder.accessChainGetLValue(), member);
         }
 
         // GLSL semantics say the result of .length() is an int, while SPIR-V says
@@ -2714,9 +2590,9 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
         // AST expectation of a signed result.
         if (glslangIntermediate->getSource() == glslang::EShSourceGlsl) {
             if (builder.isInSpecConstCodeGenMode()) {
-                length = builder.createBinOp(spv::Op::OpIAdd, builder.makeIntType(bits), length, builder.makeIntConstant(0));
+                length = builder.createBinOp(spv::OpIAdd, builder.makeIntType(32), length, builder.makeIntConstant(0));
             } else {
-                length = builder.createUnaryOp(spv::Op::OpBitcast, builder.makeIntType(bits), length);
+                length = builder.createUnaryOp(spv::OpBitcast, builder.makeIntType(32), length);
             }
         }
 
@@ -2780,33 +2656,6 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
             case glslang::EOpHitObjectRecordEmptyNV:
             case glslang::EOpHitObjectGetShaderBindingTableRecordIndexNV:
             case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
-            case glslang::EOpHitObjectGetClusterIdNV:
-            case glslang::EOpHitObjectGetSpherePositionNV:
-            case glslang::EOpHitObjectGetSphereRadiusNV:
-            case glslang::EOpHitObjectIsSphereHitNV:
-            case glslang::EOpHitObjectIsLSSHitNV:
-            case glslang::EOpReorderThreadEXT:
-            case glslang::EOpHitObjectGetCurrentTimeEXT:
-            case glslang::EOpHitObjectGetHitKindEXT:
-            case glslang::EOpHitObjectGetPrimitiveIndexEXT:
-            case glslang::EOpHitObjectGetGeometryIndexEXT:
-            case glslang::EOpHitObjectGetInstanceIdEXT:
-            case glslang::EOpHitObjectGetInstanceCustomIndexEXT:
-            case glslang::EOpHitObjectGetObjectRayDirectionEXT:
-            case glslang::EOpHitObjectGetObjectRayOriginEXT:
-            case glslang::EOpHitObjectGetWorldRayDirectionEXT:
-            case glslang::EOpHitObjectGetWorldRayOriginEXT:
-            case glslang::EOpHitObjectGetWorldToObjectEXT:
-            case glslang::EOpHitObjectGetObjectToWorldEXT:
-            case glslang::EOpHitObjectGetRayTMaxEXT:
-            case glslang::EOpHitObjectGetRayTMinEXT:
-            case glslang::EOpHitObjectGetRayFlagsEXT:
-            case glslang::EOpHitObjectIsEmptyEXT:
-            case glslang::EOpHitObjectIsHitEXT:
-            case glslang::EOpHitObjectIsMissEXT:
-            case glslang::EOpHitObjectRecordEmptyEXT:
-            case glslang::EOpHitObjectGetShaderBindingTableRecordIndexEXT:
-            case glslang::EOpHitObjectGetShaderRecordBufferHandleEXT:
                 return true;
             default:
                 return false;
@@ -2843,18 +2692,9 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
                                   TranslateNonUniformDecoration(node->getType().getQualifier()) };
 
     // it could be a conversion
-    if (! result) {
+    if (! result)
         result = createConversion(node->getOp(), decorations, resultType(), operand,
-            node->getType().getBasicType(), node->getOperand()->getBasicType());
-        if (result) {
-            if (node->getType().isCoopMatKHR() && node->getOperand()->getAsTyped()->getType().isCoopMatKHR() &&
-                !node->getAsTyped()->getType().sameCoopMatUse(node->getOperand()->getAsTyped()->getType())) {
-                // Conversions that change use need CapabilityCooperativeMatrixConversionsNV
-                builder.addCapability(spv::Capability::CooperativeMatrixConversionsNV);
-                builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-            }
-        }
-    }
+            node->getOperand()->getBasicType());
 
     // if not, then possibly an operation
     if (! result)
@@ -2918,12 +2758,6 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
                 one = builder.makeDoubleConstant(1.0);
             else if (node->getBasicType() == glslang::EbtFloat16)
                 one = builder.makeFloat16Constant(1.0F);
-            else if (node->getBasicType() == glslang::EbtBFloat16)
-                one = builder.makeBFloat16Constant(1.0F);
-            else if (node->getBasicType() == glslang::EbtFloatE5M2)
-                one = builder.makeFloatE5M2Constant(1.0F);
-            else if (node->getBasicType() == glslang::EbtFloatE4M3)
-                one = builder.makeFloatE4M3Constant(1.0F);
             else if (node->getBasicType() == glslang::EbtInt8  || node->getBasicType() == glslang::EbtUint8)
                 one = builder.makeInt8Constant(1);
             else if (node->getBasicType() == glslang::EbtInt16 || node->getBasicType() == glslang::EbtUint16)
@@ -2959,45 +2793,27 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
         return false;
 
     case glslang::EOpAssumeEXT:
-        builder.addCapability(spv::Capability::ExpectAssumeKHR);
+        builder.addCapability(spv::CapabilityExpectAssumeKHR);
         builder.addExtension(spv::E_SPV_KHR_expect_assume);
-        builder.createNoResultOp(spv::Op::OpAssumeTrueKHR, operand);
+        builder.createNoResultOp(spv::OpAssumeTrueKHR, operand);
         return false;
     case glslang::EOpEmitStreamVertex:
-        builder.createNoResultOp(spv::Op::OpEmitStreamVertex, operand);
+        builder.createNoResultOp(spv::OpEmitStreamVertex, operand);
         return false;
     case glslang::EOpEndStreamPrimitive:
-        builder.createNoResultOp(spv::Op::OpEndStreamPrimitive, operand);
+        builder.createNoResultOp(spv::OpEndStreamPrimitive, operand);
         return false;
     case glslang::EOpRayQueryTerminate:
-        builder.createNoResultOp(spv::Op::OpRayQueryTerminateKHR, operand);
+        builder.createNoResultOp(spv::OpRayQueryTerminateKHR, operand);
         return false;
     case glslang::EOpRayQueryConfirmIntersection:
-        builder.createNoResultOp(spv::Op::OpRayQueryConfirmIntersectionKHR, operand);
+        builder.createNoResultOp(spv::OpRayQueryConfirmIntersectionKHR, operand);
         return false;
     case glslang::EOpReorderThreadNV:
-        builder.createNoResultOp(spv::Op::OpReorderThreadWithHitObjectNV, operand);
-        return false;
-    case glslang::EOpReorderThreadEXT:
-        builder.createNoResultOp(spv::Op::OpReorderThreadWithHitObjectEXT, operand);
+        builder.createNoResultOp(spv::OpReorderThreadWithHitObjectNV, operand);
         return false;
     case glslang::EOpHitObjectRecordEmptyNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordEmptyNV, operand);
-        return false;
-    case glslang::EOpHitObjectRecordEmptyEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordEmptyEXT, operand);
-        return false;
-
-    case glslang::EOpCreateTensorLayoutNV:
-        result = builder.createOp(spv::Op::OpCreateTensorLayoutNV, resultType(), std::vector<spv::Id>{});
-        builder.clearAccessChain();
-        builder.setAccessChainRValue(result);
-        return false;
-
-    case glslang::EOpCreateTensorViewNV:
-        result = builder.createOp(spv::Op::OpCreateTensorViewNV, resultType(), std::vector<spv::Id>{});
-        builder.clearAccessChain();
-        builder.setAccessChainRValue(result);
+        builder.createNoResultOp(spv::OpHitObjectRecordEmptyNV, operand);
         return false;
 
     default:
@@ -3015,7 +2831,7 @@ spv::Id TGlslangToSpvTraverser::createCompositeConstruct(spv::Id resultTypeId, s
         spv::Id rType = builder.getTypeId(constituent);
         if (lType != rType) {
             if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_4) {
-                constituent = builder.createUnaryOp(spv::Op::OpCopyLogical, lType, constituent);
+                constituent = builder.createUnaryOp(spv::OpCopyLogical, lType, constituent);
             } else if (builder.isStructType(rType)) {
                 std::vector<spv::Id> rTypeConstituents;
                 int numrTypeConstituents = builder.getNumTypeConstituents(rType);
@@ -3052,16 +2868,9 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                                                             // SPIR-V, for an out parameter
     std::vector<spv::Id> temporaryLvalues;                  // temporaries to pass, as proxies for complexLValues
 
-    auto resultType = [&invertedType, &node, this](){
-        if (invertedType != spv::NoType) {
-            return invertedType;
-        } else {
-            auto ret = convertGlslangToSpvType(node->getType());
-            // convertGlslangToSpvType may clobber the debug location, reset it
-            builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
-            return ret;
-        }
-    };
+    auto resultType = [&invertedType, &node, this](){ return invertedType != spv::NoType ?
+        invertedType :
+        convertGlslangToSpvType(node->getType()); };
 
     // try texturing
     result = createImageTextureFunctionCall(node);
@@ -3118,10 +2927,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
 
                 return false;
             } else {
-                if (node->getOp() == glslang::EOpScope) {
-                    auto loc = node->getLoc();
-                    builder.enterLexicalBlock(loc.line, loc.column);
-                }
+                if (node->getOp() == glslang::EOpScope)
+                    builder.enterLexicalBlock(0);
             }
         } else {
             if (sequenceDepth > 1 && node->getOp() == glslang::EOpScope)
@@ -3161,12 +2968,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                 builder.enterFunction(shaderEntry);
                 currentFunction = shaderEntry;
             } else {
-                // SPIR-V functions should already be in the functionMap from the prepass
-                // that called makeFunctions().
-                currentFunction = functionMap[node->getName().c_str()];
-                spv::Block* functionBlock = currentFunction->getEntryBlock();
-                builder.setBuildPoint(functionBlock);
-                builder.enterFunction(currentFunction);
+                handleFunctionEntry(node);
             }
             if (options.generateDebugInfo && !options.emitNonSemanticShaderDebugInfo) {
                 const auto& loc = node->getLoc();
@@ -3175,18 +2977,10 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                 currentFunction->setDebugLineInfo(sourceFileId, loc.line, loc.column);
             }
         } else {
-            // Here we have finished visiting the function (post-visit). Finalize it.
-            if (options.generateDebugInfo) {
-                if (glslangIntermediate->getSource() == glslang::EShSourceGlsl && node->getSequence().size() > 1) {
-                    auto endLoc = node->getSequence()[1]->getAsAggregate()->getEndLoc();
-                    builder.setDebugSourceLocation(endLoc.line, endLoc.getFilename());
-                }
-            }
             if (inEntryPoint)
                 entryPointTerminated = true;
             builder.leaveFunction();
             inEntryPoint = false;
-            currentFunction = nullptr;
         }
 
         return true;
@@ -3276,18 +3070,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpConstructF16Vec2:
     case glslang::EOpConstructF16Vec3:
     case glslang::EOpConstructF16Vec4:
-    case glslang::EOpConstructBFloat16:
-    case glslang::EOpConstructBF16Vec2:
-    case glslang::EOpConstructBF16Vec3:
-    case glslang::EOpConstructBF16Vec4:
-    case glslang::EOpConstructFloatE5M2:
-    case glslang::EOpConstructFloatE5M2Vec2:
-    case glslang::EOpConstructFloatE5M2Vec3:
-    case glslang::EOpConstructFloatE5M2Vec4:
-    case glslang::EOpConstructFloatE4M3:
-    case glslang::EOpConstructFloatE4M3Vec2:
-    case glslang::EOpConstructFloatE4M3Vec3:
-    case glslang::EOpConstructFloatE4M3Vec4:
     case glslang::EOpConstructBool:
     case glslang::EOpConstructBVec2:
     case glslang::EOpConstructBVec3:
@@ -3329,8 +3111,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpConstructReference:
     case glslang::EOpConstructCooperativeMatrixNV:
     case glslang::EOpConstructCooperativeMatrixKHR:
-    case glslang::EOpConstructCooperativeVectorNV:
-    case glslang::EOpConstructSaturated:
     {
         builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
         std::vector<spv::Id> arguments;
@@ -3345,44 +3125,22 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                 // and textureBuffer is the result going forward
                 constructed = arguments[0];
             } else
-                constructed = builder.createOp(spv::Op::OpSampledImage, resultType(), arguments);
-        } else if (node->getOp() == glslang::EOpConstructCooperativeMatrixKHR &&
-                   node->getType().isCoopMatKHR() && node->getSequence()[0]->getAsTyped()->getType().isCoopMatKHR()) {
-            builder.addCapability(spv::Capability::CooperativeMatrixConversionsNV);
-            builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-            constructed = builder.createCooperativeMatrixConversion(resultType(), arguments[0]);
-        } else if (node->getOp() == glslang::EOpConstructCooperativeVectorNV &&
-                   arguments.size() == 1 &&
-                   builder.getTypeId(arguments[0]) == resultType()) {
-            constructed = arguments[0];
+                constructed = builder.createOp(spv::OpSampledImage, resultType(), arguments);
         } else if (node->getOp() == glslang::EOpConstructStruct ||
                  node->getOp() == glslang::EOpConstructCooperativeMatrixNV ||
                  node->getOp() == glslang::EOpConstructCooperativeMatrixKHR ||
-                 node->getType().isArray() ||
-                 // Handle constructing coopvec from one component here, to avoid the component
-                 // getting smeared
-                 (node->getOp() == glslang::EOpConstructCooperativeVectorNV && arguments.size() == 1 && builder.isScalar(arguments[0]))) {
+                 node->getType().isArray()) {
             std::vector<spv::Id> constituents;
             for (int c = 0; c < (int)arguments.size(); ++c)
                 constituents.push_back(arguments[c]);
             constructed = createCompositeConstruct(resultType(), constituents);
         } else if (isMatrix)
             constructed = builder.createMatrixConstructor(precision, arguments, resultType());
-        else if (node->getOp() == glslang::EOpConstructSaturated) {
-            OpDecorations decorations = { TranslatePrecisionDecoration(node->getOperationPrecision()),
-                                          TranslateNoContractionDecoration(node->getType().getQualifier()),
-                                          TranslateNonUniformDecoration(lvalueCoherentFlags) };
-
-            constructed = createConversion(node->getOp(), decorations, resultType(), arguments[1],
-                                           node->getType().getBasicType(), node->getSequence()[1]->getAsTyped()->getBasicType());
-            builder.addDecoration(constructed, spv::Decoration::SaturatedToLargestFloat8NormalConversionEXT);
-            builder.createStore(constructed, arguments[0]);
-        }
         else
             constructed = builder.createConstructor(precision, arguments, resultType());
 
         if (node->getType().getQualifier().isNonUniform()) {
-            builder.addDecoration(constructed, spv::Decoration::NonUniformEXT);
+            builder.addDecoration(constructed, spv::DecorationNonUniformEXT);
         }
 
         builder.clearAccessChain();
@@ -3485,7 +3243,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpAtomicCounterExchange:
     case glslang::EOpAtomicCounterCompSwap:
         builder.addExtension("SPV_KHR_shader_atomic_counter_ops");
-        builder.addCapability(spv::Capability::AtomicStorageOps);
+        builder.addCapability(spv::CapabilityAtomicStorageOps);
         atomic = true;
         break;
 
@@ -3495,13 +3253,13 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpAverage:
     case glslang::EOpAverageRounded:
     case glslang::EOpMul32x16:
-        builder.addCapability(spv::Capability::IntegerFunctions2INTEL);
+        builder.addCapability(spv::CapabilityIntegerFunctions2INTEL);
         builder.addExtension("SPV_INTEL_shader_integer_functions2");
         binOp = node->getOp();
         break;
 
     case glslang::EOpExpectEXT:
-        builder.addCapability(spv::Capability::ExpectAssumeKHR);
+        builder.addCapability(spv::CapabilityExpectAssumeKHR);
         builder.addExtension(spv::E_SPV_KHR_expect_assume);
         binOp = node->getOp();
         break;
@@ -3523,7 +3281,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpRayQueryGenerateIntersection:
     case glslang::EOpRayQueryConfirmIntersection:
         builder.addExtension("SPV_KHR_ray_query");
-        builder.addCapability(spv::Capability::RayQueryKHR);
+        builder.addCapability(spv::CapabilityRayQueryKHR);
         noReturnValue = true;
         break;
     case glslang::EOpRayQueryProceed:
@@ -3546,23 +3304,12 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpRayQueryGetIntersectionObjectToWorld:
     case glslang::EOpRayQueryGetIntersectionWorldToObject:
         builder.addExtension("SPV_KHR_ray_query");
-        builder.addCapability(spv::Capability::RayQueryKHR);
+        builder.addCapability(spv::CapabilityRayQueryKHR);
         break;
     case glslang::EOpCooperativeMatrixLoad:
     case glslang::EOpCooperativeMatrixStore:
     case glslang::EOpCooperativeMatrixLoadNV:
     case glslang::EOpCooperativeMatrixStoreNV:
-    case glslang::EOpCooperativeMatrixLoadTensorNV:
-    case glslang::EOpCooperativeMatrixStoreTensorNV:
-    case glslang::EOpCooperativeMatrixReduceNV:
-    case glslang::EOpCooperativeMatrixPerElementOpNV:
-    case glslang::EOpCooperativeMatrixTransposeNV:
-    case glslang::EOpCooperativeVectorMatMulNV:
-    case glslang::EOpCooperativeVectorMatMulAddNV:
-    case glslang::EOpCooperativeVectorLoadNV:
-    case glslang::EOpCooperativeVectorStoreNV:
-    case glslang::EOpCooperativeVectorOuterProductAccumulateNV:
-    case glslang::EOpCooperativeVectorReduceSumAccumulateNV:
         noReturnValue = true;
         break;
     case glslang::EOpBeginInvocationInterlock:
@@ -3605,129 +3352,48 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpHitObjectGetShaderBindingTableRecordIndexNV:
     case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
         builder.addExtension(spv::E_SPV_NV_shader_invocation_reorder);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
+        builder.addCapability(spv::CapabilityShaderInvocationReorderNV);
         break;
-
-    case glslang::EOpHitObjectGetLSSPositionsNV:
-    case glslang::EOpHitObjectGetLSSRadiiNV:
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        noReturnValue = true;
-        break;
-
-    case glslang::EOpRayQueryGetIntersectionLSSPositionsNV:
-    case glslang::EOpRayQueryGetIntersectionLSSRadiiNV:
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::RayQueryKHR);
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        noReturnValue = true;
-        break;
-
-    case glslang::EOpRayQueryGetIntersectionSpherePositionNV:
-    case glslang::EOpRayQueryGetIntersectionSphereRadiusNV:
-    case glslang::EOpRayQueryIsSphereHitNV:
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::RayQueryKHR);
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        break;
-
-    case glslang::EOpRayQueryGetIntersectionLSSHitValueNV:
-    case glslang::EOpRayQueryIsLSSHitNV:
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::RayQueryKHR);
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        break;
-
-    case glslang::EOpHitObjectTraceRayEXT:
-    case glslang::EOpHitObjectTraceRayMotionEXT:
-    case glslang::EOpHitObjectGetAttributesEXT:
-    case glslang::EOpHitObjectExecuteShaderEXT:
-    case glslang::EOpHitObjectRecordEmptyEXT:
-    case glslang::EOpHitObjectRecordMissEXT:
-    case glslang::EOpHitObjectRecordMissMotionEXT:
-    case glslang::EOpReorderThreadEXT:
-    case glslang::EOpHitObjectSetShaderBindingTableRecordIndexEXT:
-    case glslang::EOpHitObjectReorderExecuteEXT:
-    case glslang::EOpHitObjectTraceReorderExecuteEXT:
-    case glslang::EOpHitObjectTraceMotionReorderExecuteEXT:
-    case glslang::EOpHitObjectRecordFromQueryEXT:
-    case glslang::EOpHitObjectGetIntersectionTriangleVertexPositionsEXT:
-        noReturnValue = true;
-        [[fallthrough]];
-    case glslang::EOpHitObjectIsEmptyEXT:
-    case glslang::EOpHitObjectIsMissEXT:
-    case glslang::EOpHitObjectIsHitEXT:
-    case glslang::EOpHitObjectGetRayTMinEXT:
-    case glslang::EOpHitObjectGetRayTMaxEXT:
-    case glslang::EOpHitObjectGetRayFlagsEXT:
-    case glslang::EOpHitObjectGetObjectRayOriginEXT:
-    case glslang::EOpHitObjectGetObjectRayDirectionEXT:
-    case glslang::EOpHitObjectGetWorldRayOriginEXT:
-    case glslang::EOpHitObjectGetWorldRayDirectionEXT:
-    case glslang::EOpHitObjectGetObjectToWorldEXT:
-    case glslang::EOpHitObjectGetWorldToObjectEXT:
-    case glslang::EOpHitObjectGetInstanceCustomIndexEXT:
-    case glslang::EOpHitObjectGetInstanceIdEXT:
-    case glslang::EOpHitObjectGetGeometryIndexEXT:
-    case glslang::EOpHitObjectGetPrimitiveIndexEXT:
-    case glslang::EOpHitObjectGetHitKindEXT:
-    case glslang::EOpHitObjectGetCurrentTimeEXT:
-    case glslang::EOpHitObjectGetShaderBindingTableRecordIndexEXT:
-    case glslang::EOpHitObjectGetShaderRecordBufferHandleEXT:
-        builder.addExtension(spv::E_SPV_EXT_shader_invocation_reorder);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderEXT);
-        break;
-
     case glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT:
         builder.addExtension(spv::E_SPV_KHR_ray_tracing_position_fetch);
-        builder.addCapability(spv::Capability::RayQueryPositionFetchKHR);
+        builder.addCapability(spv::CapabilityRayQueryPositionFetchKHR);
         noReturnValue = true;
         break;
+
     case glslang::EOpImageSampleWeightedQCOM:
-        builder.addCapability(spv::Capability::TextureSampleWeightedQCOM);
+        builder.addCapability(spv::CapabilityTextureSampleWeightedQCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing);
         break;
     case glslang::EOpImageBoxFilterQCOM:
-        builder.addCapability(spv::Capability::TextureBoxFilterQCOM);
+        builder.addCapability(spv::CapabilityTextureBoxFilterQCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing);
         break;
     case glslang::EOpImageBlockMatchSADQCOM:
     case glslang::EOpImageBlockMatchSSDQCOM:
-        builder.addCapability(spv::Capability::TextureBlockMatchQCOM);
+        builder.addCapability(spv::CapabilityTextureBlockMatchQCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing);
         break;
-    case glslang::EOpTensorWriteARM:
-        noReturnValue = true;
-        break;
 
     case glslang::EOpImageBlockMatchWindowSSDQCOM:
     case glslang::EOpImageBlockMatchWindowSADQCOM:
-        builder.addCapability(spv::Capability::TextureBlockMatchQCOM);
+        builder.addCapability(spv::CapabilityTextureBlockMatchQCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing);
-        builder.addCapability(spv::Capability::TextureBlockMatch2QCOM);
+        builder.addCapability(spv::CapabilityTextureBlockMatch2QCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing2);
         break;
 
     case glslang::EOpImageBlockMatchGatherSSDQCOM:
     case glslang::EOpImageBlockMatchGatherSADQCOM:
-        builder.addCapability(spv::Capability::TextureBlockMatchQCOM);
+        builder.addCapability(spv::CapabilityTextureBlockMatchQCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing);
-        builder.addCapability(spv::Capability::TextureBlockMatch2QCOM);
+        builder.addCapability(spv::CapabilityTextureBlockMatch2QCOM);
         builder.addExtension(spv::E_SPV_QCOM_image_processing2);
         break;
 
     case glslang::EOpFetchMicroTriangleVertexPositionNV:
     case glslang::EOpFetchMicroTriangleVertexBarycentricNV:
         builder.addExtension(spv::E_SPV_NV_displacement_micromap);
-        builder.addCapability(spv::Capability::DisplacementMicromapNV);
-        break;
-
-    case glslang::EOpRayQueryGetIntersectionClusterIdNV:
-        builder.addExtension(spv::E_SPV_NV_cluster_acceleration_structure);
-        builder.addCapability(spv::Capability::RayQueryKHR);
-        builder.addCapability(spv::Capability::RayTracingClusterAccelerationStructureNV);
+        builder.addCapability(spv::CapabilityDisplacementMicromapNV);
         break;
 
     case glslang::EOpDebugPrintf:
@@ -3787,12 +3453,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
 
 
 
-        case glslang::EOpHitObjectRecordFromQueryEXT:
-        case glslang::EOpHitObjectGetIntersectionTriangleVertexPositionsEXT:
-            if (arg == 0 || arg == 1)
-                lvalue = true;
-            break;
-
         case glslang::EOpHitObjectRecordHitNV:
         case glslang::EOpHitObjectRecordHitMotionNV:
         case glslang::EOpHitObjectRecordHitWithIndexNV:
@@ -3803,26 +3463,10 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         case glslang::EOpHitObjectRecordMissNV:
         case glslang::EOpHitObjectRecordMissMotionNV:
         case glslang::EOpHitObjectGetAttributesNV:
-        case glslang::EOpHitObjectGetClusterIdNV:
-        case glslang::EOpHitObjectTraceRayEXT:
-        case glslang::EOpHitObjectTraceRayMotionEXT:
-        case glslang::EOpHitObjectExecuteShaderEXT:
-        case glslang::EOpHitObjectRecordMissEXT:
-        case glslang::EOpHitObjectRecordMissMotionEXT:
-        case glslang::EOpHitObjectGetAttributesEXT:
-        case glslang::EOpHitObjectSetShaderBindingTableRecordIndexEXT:
-        case glslang::EOpHitObjectReorderExecuteEXT:
-        case glslang::EOpHitObjectTraceReorderExecuteEXT:
-        case glslang::EOpHitObjectTraceMotionReorderExecuteEXT:
             if (arg == 0)
                 lvalue = true;
             break;
 
-        case glslang::EOpHitObjectGetLSSPositionsNV:
-        case glslang::EOpHitObjectGetLSSRadiiNV:
-            lvalue = true;
-            break;
-
         case glslang::EOpRayQueryInitialize:
         case glslang::EOpRayQueryTerminate:
         case glslang::EOpRayQueryConfirmIntersection:
@@ -3841,12 +3485,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         case glslang::EOpRayQueryGetIntersectionObjectRayOrigin:
         case glslang::EOpRayQueryGetIntersectionObjectToWorld:
         case glslang::EOpRayQueryGetIntersectionWorldToObject:
-        case glslang::EOpRayQueryGetIntersectionClusterIdNV:
-        case glslang::EOpRayQueryGetIntersectionSpherePositionNV:
-        case glslang::EOpRayQueryGetIntersectionSphereRadiusNV:
-        case glslang::EOpRayQueryGetIntersectionLSSHitValueNV:
-        case glslang::EOpRayQueryIsSphereHitNV:
-        case glslang::EOpRayQueryIsLSSHitNV:
             if (arg == 0)
                 lvalue = true;
             break;
@@ -3918,60 +3556,27 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
             break;
         case glslang::EOpCooperativeMatrixLoad:
         case glslang::EOpCooperativeMatrixLoadNV:
-        case glslang::EOpCooperativeMatrixLoadTensorNV:
-        case glslang::EOpCooperativeVectorLoadNV:
             if (arg == 0 || arg == 1)
                 lvalue = true;
             break;
         case glslang::EOpCooperativeMatrixStore:
         case glslang::EOpCooperativeMatrixStoreNV:
-        case glslang::EOpCooperativeMatrixStoreTensorNV:
-        case glslang::EOpCooperativeVectorStoreNV:
             if (arg == 1)
                 lvalue = true;
             break;
-        case glslang::EOpCooperativeVectorMatMulNV:
-            if (arg == 0 || arg == 3)
-                lvalue = true;
-            break;
-        case glslang::EOpCooperativeVectorMatMulAddNV:
-            if (arg == 0 || arg == 3 || arg == 6)
-                lvalue = true;
-            break;
-        case glslang::EOpCooperativeVectorOuterProductAccumulateNV:
-            if (arg == 2)
-                lvalue = true;
-            break;
-        case glslang::EOpCooperativeVectorReduceSumAccumulateNV:
-            if (arg == 1)
-                lvalue = true;
-            break;
-        case glslang::EOpCooperativeMatrixReduceNV:
-        case glslang::EOpCooperativeMatrixPerElementOpNV:
-        case glslang::EOpCooperativeMatrixTransposeNV:
-            if (arg == 0)
-                lvalue = true;
-            break;
         case glslang::EOpSpirvInst:
             if (glslangOperands[arg]->getAsTyped()->getQualifier().isSpirvByReference())
                 lvalue = true;
             break;
         case glslang::EOpReorderThreadNV:
-        case glslang::EOpReorderThreadEXT:
             //Three variants of reorderThreadNV, two of them use hitObjectNV
             if (arg == 0 && glslangOperands.size() != 2)
                 lvalue = true;
             break;
         case glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT:
-        case glslang::EOpRayQueryGetIntersectionLSSPositionsNV:
-        case glslang::EOpRayQueryGetIntersectionLSSRadiiNV:
             if (arg == 0 || arg == 2)
                 lvalue = true;
             break;
-        case glslang::EOpTensorReadARM:
-            if (arg == 2)
-                lvalue = true;
-            break;
         default:
             break;
         }
@@ -3981,69 +3586,53 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         else
             glslangOperands[arg]->traverse(this);
 
-        bool isCoopMat = node->getOp() == glslang::EOpCooperativeMatrixLoad ||
-                         node->getOp() == glslang::EOpCooperativeMatrixStore ||
-                         node->getOp() == glslang::EOpCooperativeMatrixLoadNV ||
-                         node->getOp() == glslang::EOpCooperativeMatrixStoreNV ||
-                         node->getOp() == glslang::EOpCooperativeMatrixLoadTensorNV ||
-                         node->getOp() == glslang::EOpCooperativeMatrixStoreTensorNV;
-        bool isCoopVec = node->getOp() == glslang::EOpCooperativeVectorLoadNV ||
-                         node->getOp() == glslang::EOpCooperativeVectorStoreNV;
-        if (isCoopMat || isCoopVec) {
+        if (node->getOp() == glslang::EOpCooperativeMatrixLoad ||
+            node->getOp() == glslang::EOpCooperativeMatrixStore ||
+            node->getOp() == glslang::EOpCooperativeMatrixLoadNV ||
+            node->getOp() == glslang::EOpCooperativeMatrixStoreNV) {
 
             if (arg == 1) {
-                spv::Builder::AccessChain::CoherentFlags coherentFlags {};
-                unsigned int alignment {};
-                if (isCoopMat) {
-                    // fold "element" parameter into the access chain
-                    spv::Builder::AccessChain save = builder.getAccessChain();
-                    builder.clearAccessChain();
-                    glslangOperands[2]->traverse(this);
+                // fold "element" parameter into the access chain
+                spv::Builder::AccessChain save = builder.getAccessChain();
+                builder.clearAccessChain();
+                glslangOperands[2]->traverse(this);
 
-                    spv::Id elementId = accessChainLoad(glslangOperands[2]->getAsTyped()->getType());
+                spv::Id elementId = accessChainLoad(glslangOperands[2]->getAsTyped()->getType());
 
-                    builder.setAccessChain(save);
+                builder.setAccessChain(save);
 
-                    // Point to the first element of the array.
-                    builder.accessChainPush(elementId,
-                        TranslateCoherent(glslangOperands[arg]->getAsTyped()->getType()),
-                                          glslangOperands[arg]->getAsTyped()->getType().getBufferReferenceAlignment());
-                    coherentFlags = builder.getAccessChain().coherentFlags;
-                    alignment = builder.getAccessChain().alignment;
-                } else {
-                    coherentFlags = builder.getAccessChain().coherentFlags;
-                    coherentFlags |= TranslateCoherent(glslangOperands[arg]->getAsTyped()->getType());
-                    alignment = 16;
-                }
+                // Point to the first element of the array.
+                builder.accessChainPush(elementId,
+                    TranslateCoherent(glslangOperands[arg]->getAsTyped()->getType()),
+                                      glslangOperands[arg]->getAsTyped()->getType().getBufferReferenceAlignment());
 
-                spv::MemoryAccessMask memoryAccess = TranslateMemoryAccess(coherentFlags);
+                spv::Builder::AccessChain::CoherentFlags coherentFlags = builder.getAccessChain().coherentFlags;
+                unsigned int alignment = builder.getAccessChain().alignment;
+
+                int memoryAccess = TranslateMemoryAccess(coherentFlags);
                 if (node->getOp() == glslang::EOpCooperativeMatrixLoad ||
-                    node->getOp() == glslang::EOpCooperativeMatrixLoadNV ||
-                    node->getOp() == glslang::EOpCooperativeMatrixLoadTensorNV ||
-                    node->getOp() == glslang::EOpCooperativeVectorLoadNV)
-                    memoryAccess = (memoryAccess & ~spv::MemoryAccessMask::MakePointerAvailableKHR);
+                    node->getOp() == glslang::EOpCooperativeMatrixLoadNV)
+                    memoryAccess &= ~spv::MemoryAccessMakePointerAvailableKHRMask;
                 if (node->getOp() == glslang::EOpCooperativeMatrixStore ||
-                    node->getOp() == glslang::EOpCooperativeMatrixStoreNV ||
-                    node->getOp() == glslang::EOpCooperativeMatrixStoreTensorNV ||
-                    node->getOp() == glslang::EOpCooperativeVectorStoreNV)
-                    memoryAccess = (memoryAccess & ~spv::MemoryAccessMask::MakePointerVisibleKHR);
+                    node->getOp() == glslang::EOpCooperativeMatrixStoreNV)
+                    memoryAccess &= ~spv::MemoryAccessMakePointerVisibleKHRMask;
                 if (builder.getStorageClass(builder.getAccessChain().base) ==
-                    spv::StorageClass::PhysicalStorageBufferEXT) {
-                    memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessMask::Aligned);
+                    spv::StorageClassPhysicalStorageBufferEXT) {
+                    memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessAlignedMask);
                 }
 
                 memoryAccessOperands.push_back(spv::IdImmediate(false, memoryAccess));
 
-                if (anySet(memoryAccess, spv::MemoryAccessMask::Aligned)) {
+                if (memoryAccess & spv::MemoryAccessAlignedMask) {
                     memoryAccessOperands.push_back(spv::IdImmediate(false, alignment));
                 }
 
-                if (anySet(memoryAccess,
-                    spv::MemoryAccessMask::MakePointerAvailableKHR | spv::MemoryAccessMask::MakePointerVisibleKHR)) {
+                if (memoryAccess &
+                    (spv::MemoryAccessMakePointerAvailableKHRMask | spv::MemoryAccessMakePointerVisibleKHRMask)) {
                     memoryAccessOperands.push_back(spv::IdImmediate(true,
                         builder.makeUintConstant(TranslateMemoryScope(coherentFlags))));
                 }
-            } else if (isCoopMat && arg == 2) {
+            } else if (arg == 2) {
                 continue;
             }
         }
@@ -4057,7 +3646,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                 // l-value.
                 complexLvalues.push_back(builder.getAccessChain());
                 temporaryLvalues.push_back(builder.createVariable(
-                    spv::NoPrecision, spv::StorageClass::Function,
+                    spv::NoPrecision, spv::StorageClassFunction,
                     builder.accessChainGetInferredType(), "swizzleTemp"));
                 operands.push_back(temporaryLvalues.back());
             } else {
@@ -4067,8 +3656,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
             lvalueCoherentFlags |= TranslateCoherent(glslangOperands[arg]->getAsTyped()->getType());
         } else {
             builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
-            glslang::TOperator glslangOp = node->getOp();
-            if (arg == 1 &&
+             glslang::TOperator glslangOp = node->getOp();
+             if (arg == 1 &&
                 (glslangOp == glslang::EOpRayQueryGetIntersectionType ||
                  glslangOp == glslang::EOpRayQueryGetIntersectionT ||
                  glslangOp == glslang::EOpRayQueryGetIntersectionInstanceCustomIndex ||
@@ -4082,15 +3671,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                  glslangOp == glslang::EOpRayQueryGetIntersectionObjectRayOrigin ||
                  glslangOp == glslang::EOpRayQueryGetIntersectionObjectToWorld ||
                  glslangOp == glslang::EOpRayQueryGetIntersectionWorldToObject ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionClusterIdNV ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionSpherePositionNV ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionSphereRadiusNV ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionLSSHitValueNV ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionLSSPositionsNV ||
-                 glslangOp == glslang::EOpRayQueryGetIntersectionLSSRadiiNV ||
-                 glslangOp == glslang::EOpRayQueryIsLSSHitNV ||
-                 glslangOp == glslang::EOpRayQueryIsSphereHitNV
+                 glslangOp == glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT
                     )) {
                 bool cond = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getBConst();
                 operands.push_back(builder.makeIntConstant(cond ? 1 : 0));
@@ -4098,17 +3679,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                         (arg == 11 && glslangOp == glslang::EOpTraceRayMotionNV) ||
                         (arg == 1  && glslangOp == glslang::EOpExecuteCallableKHR) ||
                         (arg == 1  && glslangOp == glslang::EOpHitObjectExecuteShaderNV) ||
-                        (arg == 1  && glslangOp == glslang::EOpHitObjectExecuteShaderEXT) ||
                         (arg == 11 && glslangOp == glslang::EOpHitObjectTraceRayNV) ||
-                        (arg == 11 && glslangOp == glslang::EOpHitObjectTraceRayEXT) ||
-                        (arg == 12 && glslangOp == glslang::EOpHitObjectTraceRayMotionNV) ||
-                        (arg == 12 && glslangOp == glslang::EOpHitObjectTraceRayMotionEXT) ||
-                        (arg == 12 && glslangOp == glslang::EOpHitObjectTraceMotionReorderExecuteEXT && glslangOperands.size() == 13) ||
-                        (arg == 14 && glslangOp == glslang::EOpHitObjectTraceMotionReorderExecuteEXT && glslangOperands.size() == 15) ||
-                        (arg == 11 && glslangOp == glslang::EOpHitObjectTraceReorderExecuteEXT && glslangOperands.size() == 12) ||
-                        (arg == 13 && glslangOp == glslang::EOpHitObjectTraceReorderExecuteEXT && glslangOperands.size() == 14) ||
-                        (arg == 1  && glslangOp == glslang::EOpHitObjectReorderExecuteEXT && glslangOperands.size() == 2) ||
-                        (arg == 3  && glslangOp == glslang::EOpHitObjectReorderExecuteEXT && glslangOperands.size() == 4)) {
+                        (arg == 12 && glslangOp == glslang::EOpHitObjectTraceRayMotionNV)) {
                  const int set = glslangOp == glslang::EOpExecuteCallableKHR ? 1 : 0;
                  const int location = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getUConst();
                  auto itNode = locationToSymbol[set].find(location);
@@ -4119,8 +3691,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                        (arg == 13 && glslangOp == glslang::EOpHitObjectRecordHitMotionNV) ||
                        (arg == 11 && glslangOp == glslang::EOpHitObjectRecordHitWithIndexNV) ||
                        (arg == 12 && glslangOp == glslang::EOpHitObjectRecordHitWithIndexMotionNV) ||
-                       (arg == 3  && glslangOp == glslang::EOpHitObjectRecordFromQueryEXT) ||
-                       (arg == 1  && glslangOp == glslang::EOpHitObjectGetAttributesEXT) ||
                        (arg == 1  && glslangOp == glslang::EOpHitObjectGetAttributesNV)) {
                  const int location = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getUConst();
                  const int set = 2;
@@ -4128,70 +3698,23 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                  visitSymbol(itNode->second);
                  spv::Id symId = getSymbolId(itNode->second);
                  operands.push_back(symId);
-            } else if (glslangOperands[arg]->getAsTyped()->getQualifier().isSpirvLiteral()) {
-                // Will be translated to a literal value, make a placeholder here
-                operands.push_back(spv::NoResult);
-            } else if (glslangOperands[arg]->getAsTyped()->getBasicType() == glslang::EbtFunction) {
-                spv::Function* function = functionMap[glslangOperands[arg]->getAsSymbolNode()->getMangledName().c_str()];
-                assert(function);
-                operands.push_back(function->getId());
-            } else  {
-               operands.push_back(accessChainLoad(glslangOperands[arg]->getAsTyped()->getType()));
-            }
+             } else if (glslangOperands[arg]->getAsTyped()->getQualifier().isSpirvLiteral()) {
+                 // Will be translated to a literal value, make a placeholder here
+                 operands.push_back(spv::NoResult);
+             } else  {
+                operands.push_back(accessChainLoad(glslangOperands[arg]->getAsTyped()->getType()));
+             }
         }
     }
 
     builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
-    if (node->getOp() == glslang::EOpCooperativeMatrixLoadTensorNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        builder.addCapability(spv::Capability::CooperativeMatrixTensorAddressingNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-
-        spv::Id object = builder.createLoad(operands[0], spv::NoPrecision);
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // Pointer
-        idImmOps.push_back(spv::IdImmediate(true, object)); // Object
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // tensorLayout
-
-        idImmOps.insert(idImmOps.end(), memoryAccessOperands.begin(), memoryAccessOperands.end()); // memoryaccess
-
-        // initialize tensor operands to zero, then OR in flags based on the operands
-        size_t tensorOpIdx = idImmOps.size();
-        idImmOps.push_back(spv::IdImmediate(false, 0));
-
-        for (uint32_t i = 3; i < operands.size(); ++i) {
-            if (builder.isTensorView(operands[i])) {
-                addMask(idImmOps[tensorOpIdx].word, spv::TensorAddressingOperandsMask::TensorView);
-            } else {
-                // must be the decode func
-                addMask(idImmOps[tensorOpIdx].word, spv::TensorAddressingOperandsMask::DecodeFunc);
-                builder.addCapability(spv::Capability::CooperativeMatrixBlockLoadsNV);
-            }
-            idImmOps.push_back(spv::IdImmediate(true, operands[i])); // tensorView or decodeFunc
-        }
-
-        // get the pointee type
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeMatrixType(typeId));
-        // do the op
-        spv::Id result = builder.createOp(spv::Op::OpCooperativeMatrixLoadTensorNV, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeMatrixLoad ||
-               node->getOp() == glslang::EOpCooperativeMatrixLoadNV) {
+    if (node->getOp() == glslang::EOpCooperativeMatrixLoad ||
+        node->getOp() == glslang::EOpCooperativeMatrixLoadNV) {
         std::vector<spv::IdImmediate> idImmOps;
 
         idImmOps.push_back(spv::IdImmediate(true, operands[1])); // buf
         if (node->getOp() == glslang::EOpCooperativeMatrixLoad) {
             idImmOps.push_back(spv::IdImmediate(true, operands[3])); // matrixLayout
-            auto layout = (spv::CooperativeMatrixLayout)builder.getConstantScalar(operands[3]);
-            if (layout == spv::CooperativeMatrixLayout::RowBlockedInterleavedARM ||
-                layout == spv::CooperativeMatrixLayout::ColumnBlockedInterleavedARM) {
-                builder.addExtension(spv::E_SPV_ARM_cooperative_matrix_layouts);
-                builder.addCapability(spv::Capability::CooperativeMatrixLayoutsARM);
-            }
             idImmOps.push_back(spv::IdImmediate(true, operands[2])); // stride
         } else {
             idImmOps.push_back(spv::IdImmediate(true, operands[2])); // stride
@@ -4203,33 +3726,11 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         assert(builder.isCooperativeMatrixType(typeId));
         // do the op
         spv::Id result = node->getOp() == glslang::EOpCooperativeMatrixLoad
-                       ? builder.createOp(spv::Op::OpCooperativeMatrixLoadKHR, typeId, idImmOps)
-                       : builder.createOp(spv::Op::OpCooperativeMatrixLoadNV, typeId, idImmOps);
+                       ? builder.createOp(spv::OpCooperativeMatrixLoadKHR, typeId, idImmOps)
+                       : builder.createOp(spv::OpCooperativeMatrixLoadNV, typeId, idImmOps);
         // store the result to the pointer (out param 'm')
         builder.createStore(result, operands[0]);
         result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeMatrixStoreTensorNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // buf
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // object
-
-        builder.addCapability(spv::Capability::CooperativeMatrixTensorAddressingNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // tensorLayout
-
-        idImmOps.insert(idImmOps.end(), memoryAccessOperands.begin(), memoryAccessOperands.end()); // memoryaccess
-
-        if (operands.size() > 3) {
-            idImmOps.push_back(spv::IdImmediate(false, spv::TensorAddressingOperandsMask::TensorView));
-            idImmOps.push_back(spv::IdImmediate(true, operands[3])); // tensorView
-        } else {
-            idImmOps.push_back(spv::IdImmediate(false, 0));
-        }
-
-        builder.createNoResultOp(spv::Op::OpCooperativeMatrixStoreTensorNV, idImmOps);
-        result = 0;
     } else if (node->getOp() == glslang::EOpCooperativeMatrixStore ||
                node->getOp() == glslang::EOpCooperativeMatrixStoreNV) {
         std::vector<spv::IdImmediate> idImmOps;
@@ -4238,12 +3739,6 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         idImmOps.push_back(spv::IdImmediate(true, operands[0])); // object
         if (node->getOp() == glslang::EOpCooperativeMatrixStore) {
             idImmOps.push_back(spv::IdImmediate(true, operands[3])); // matrixLayout
-            auto layout = (spv::CooperativeMatrixLayout)builder.getConstantScalar(operands[3]);
-            if (layout == spv::CooperativeMatrixLayout::RowBlockedInterleavedARM ||
-                layout == spv::CooperativeMatrixLayout::ColumnBlockedInterleavedARM) {
-                builder.addExtension(spv::E_SPV_ARM_cooperative_matrix_layouts);
-                builder.addCapability(spv::Capability::CooperativeMatrixLayoutsARM);
-            }
             idImmOps.push_back(spv::IdImmediate(true, operands[2])); // stride
         } else {
             idImmOps.push_back(spv::IdImmediate(true, operands[2])); // stride
@@ -4252,9 +3747,9 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         idImmOps.insert(idImmOps.end(), memoryAccessOperands.begin(), memoryAccessOperands.end());
 
         if (node->getOp() == glslang::EOpCooperativeMatrixStore)
-            builder.createNoResultOp(spv::Op::OpCooperativeMatrixStoreKHR, idImmOps);
+            builder.createNoResultOp(spv::OpCooperativeMatrixStoreKHR, idImmOps);
         else
-            builder.createNoResultOp(spv::Op::OpCooperativeMatrixStoreNV, idImmOps);
+            builder.createNoResultOp(spv::OpCooperativeMatrixStoreNV, idImmOps);
         result = 0;
     } else if (node->getOp() == glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT) {
         std::vector<spv::IdImmediate> idImmOps;
@@ -4266,314 +3761,38 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                                                builder.makeUintConstant(3), 0);
         // do the op
 
-        spv::Op spvOp = spv::Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR;
+        spv::Op spvOp = spv::OpRayQueryGetIntersectionTriangleVertexPositionsKHR;
 
         spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
         // store the result to the pointer (out param 'm')
         builder.createStore(result, operands[2]);
         result = 0;
-    } else if (node->getOp() == glslang::EOpRayQueryGetIntersectionLSSPositionsNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // q
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // committed
-
-        spv::Id typeId = builder.makeArrayType(builder.makeVectorType(builder.makeFloatType(32), 3),
-                                               builder.makeUintConstant(2), 0);
-        // do the op
-
-        spv::Op spvOp = spv::Op::OpRayQueryGetIntersectionLSSPositionsNV;
-
-        spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[2]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpRayQueryGetIntersectionLSSRadiiNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // q
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // committed
-
-        spv::Id typeId = builder.makeArrayType(builder.makeFloatType(32),
-                                               builder.makeUintConstant(2), 0);
-        // do the op
-
-        spv::Op spvOp = spv::Op::OpRayQueryGetIntersectionLSSRadiiNV;
-
-        spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[2]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpHitObjectGetLSSPositionsNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // hitObject
-
-        spv::Op spvOp = spv::Op::OpHitObjectGetLSSPositionsNV;
-        spv::Id typeId = builder.makeArrayType(builder.makeVectorType(builder.makeFloatType(32), 3),
-                                               builder.makeUintConstant(2), 0);
-
-        spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[1]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpHitObjectGetLSSRadiiNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // hitObject
-
-        spv::Op spvOp = spv::Op::OpHitObjectGetLSSRadiiNV;
-        spv::Id typeId = builder.makeArrayType(builder.makeFloatType(32),
-                                               builder.makeUintConstant(2), 0);
-
-        spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[1]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpHitObjectGetIntersectionTriangleVertexPositionsEXT) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // hitObject
-
-        spv::Op spvOp = spv::Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT;
-        spv::Id typeId = builder.makeArrayType(builder.makeVectorType(builder.makeFloatType(32), 3),
-                                               builder.makeUintConstant(3), 0);
-
-        spv::Id result = builder.createOp(spvOp, typeId, idImmOps);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[1]);
-        result = 0;
     } else if (node->getOp() == glslang::EOpCooperativeMatrixMulAdd) {
-        auto matrixOperands = spv::CooperativeMatrixOperandsMask::MaskNone;
+        uint32_t matrixOperands = 0;
 
         // If the optional operand is present, initialize matrixOperands to that value.
         if (glslangOperands.size() == 4 && glslangOperands[3]->getAsConstantUnion()) {
-            matrixOperands = (spv::CooperativeMatrixOperandsMask)glslangOperands[3]->getAsConstantUnion()->getConstArray()[0].getIConst();
+            matrixOperands = glslangOperands[3]->getAsConstantUnion()->getConstArray()[0].getIConst();
         }
 
         // Determine Cooperative Matrix Operands bits from the signedness of the types.
         if (isTypeSignedInt(glslangOperands[0]->getAsTyped()->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixASignedComponentsKHR);
+            matrixOperands |= spv::CooperativeMatrixOperandsMatrixASignedComponentsKHRMask;
         if (isTypeSignedInt(glslangOperands[1]->getAsTyped()->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixBSignedComponentsKHR);
+            matrixOperands |= spv::CooperativeMatrixOperandsMatrixBSignedComponentsKHRMask;
         if (isTypeSignedInt(glslangOperands[2]->getAsTyped()->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixCSignedComponentsKHR);
+            matrixOperands |= spv::CooperativeMatrixOperandsMatrixCSignedComponentsKHRMask;
         if (isTypeSignedInt(node->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixResultSignedComponentsKHR);
+            matrixOperands |= spv::CooperativeMatrixOperandsMatrixResultSignedComponentsKHRMask;
 
         std::vector<spv::IdImmediate> idImmOps;
         idImmOps.push_back(spv::IdImmediate(true, operands[0]));
         idImmOps.push_back(spv::IdImmediate(true, operands[1]));
         idImmOps.push_back(spv::IdImmediate(true, operands[2]));
-        if (matrixOperands != spv::CooperativeMatrixOperandsMask::MaskNone)
+        if (matrixOperands != 0)
             idImmOps.push_back(spv::IdImmediate(false, matrixOperands));
 
-        result = builder.createOp(spv::Op::OpCooperativeMatrixMulAddKHR, resultType(), idImmOps);
-    } else if (node->getOp() == glslang::EOpCooperativeMatrixReduceNV) {
-        builder.addCapability(spv::Capability::CooperativeMatrixReductionsNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-
-        spv::Op opcode = spv::Op::OpCooperativeMatrixReduceNV;
-        unsigned mask = glslangOperands[2]->getAsConstantUnion()->getConstArray()[0].getUConst();
-
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeMatrixType(typeId));
-
-        result = builder.createCooperativeMatrixReduce(opcode, typeId, operands[1], mask, operands[3]);
-        // store the result to the pointer (out param 'm')
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeMatrixPerElementOpNV) {
-        builder.addCapability(spv::Capability::CooperativeMatrixPerElementOperationsNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeMatrixType(typeId));
-
-        result = builder.createCooperativeMatrixPerElementOp(typeId, operands);
-        // store the result to the pointer
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeMatrixTransposeNV) {
-
-        builder.addCapability(spv::Capability::CooperativeMatrixConversionsNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_matrix2);
-
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeMatrixType(typeId));
-
-        result = builder.createUnaryOp(spv::Op::OpCooperativeMatrixTransposeNV, typeId, operands[1]);
-        // store the result to the pointer
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpBitCastArrayQCOM) {
-        builder.addCapability(spv::Capability::CooperativeMatrixConversionQCOM);
-        builder.addExtension(spv::E_SPV_QCOM_cooperative_matrix_conversion);
-        result = builder.createUnaryOp(spv::Op::OpBitCastArrayQCOM, resultType(), operands[0]);
-    } else if (node->getOp() == glslang::EOpCompositeConstructCoopMatQCOM) {
-        builder.addCapability(spv::Capability::CooperativeMatrixConversionQCOM);
-        builder.addExtension(spv::E_SPV_QCOM_cooperative_matrix_conversion);
-        result = builder.createUnaryOp(spv::Op::OpCompositeConstructCoopMatQCOM, resultType(), operands[0]);
-    } else if (node->getOp() == glslang::EOpCompositeExtractCoopMatQCOM) {
-        builder.addCapability(spv::Capability::CooperativeMatrixConversionQCOM);
-        builder.addExtension(spv::E_SPV_QCOM_cooperative_matrix_conversion);
-        result = builder.createUnaryOp(spv::Op::OpCompositeExtractCoopMatQCOM, resultType(), operands[0]);
-    } else if (node->getOp() == glslang::EOpExtractSubArrayQCOM) {
-        builder.addCapability(spv::Capability::CooperativeMatrixConversionQCOM);
-        builder.addExtension(spv::E_SPV_QCOM_cooperative_matrix_conversion);
-
-        std::vector<spv::Id> arguments { operands[0], operands[1] };;
-        result = builder.createOp(spv::Op::OpExtractSubArrayQCOM, resultType(), arguments);
-    } else if (node->getOp() == glslang::EOpCooperativeVectorMatMulNV ||
-               node->getOp() == glslang::EOpCooperativeVectorMatMulAddNV) {
-        auto matrixOperands = spv::CooperativeMatrixOperandsMask::MaskNone;
-
-        bool isMulAdd = node->getOp() == glslang::EOpCooperativeVectorMatMulAddNV;
-
-        // Determine Cooperative Matrix Operands bits from the signedness of the types.
-
-        if (isTypeSignedInt(glslangOperands[1]->getAsTyped()->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixBSignedComponentsKHR);
-        if (isTypeSignedInt(glslangOperands[0]->getAsTyped()->getBasicType()))
-            addMask(matrixOperands, spv::CooperativeMatrixOperandsMask::MatrixResultSignedComponentsKHR);
-
-        uint32_t opIdx = 1;
-        std::vector<spv::IdImmediate> idImmOps;
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // Input
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // InputInterpretation
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // Matrix
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // MatrixOffset
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // MatrixInterpretation
-        if (isMulAdd) {
-            idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // Bias
-            idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // BiasOffset
-            idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // BiasInterpretation
-        }
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // M
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // K
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // MemoryLayout
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // Transpose
-        idImmOps.push_back(spv::IdImmediate(true, operands[opIdx++])); // MatrixStride
-        if (matrixOperands != spv::CooperativeMatrixOperandsMask::MaskNone)
-            idImmOps.push_back(spv::IdImmediate(false, matrixOperands));  // Cooperative Matrix Operands
-
-        // get the pointee type
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeVectorType(typeId));
-        // do the op
-        spv::Id result = builder.createOp(isMulAdd ? spv::Op::OpCooperativeVectorMatrixMulAddNV : spv::Op::OpCooperativeVectorMatrixMulNV, typeId, idImmOps);
-        // store the result to the pointer (out param 'res')
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeVectorLoadNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // buf
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // offset
-        idImmOps.insert(idImmOps.end(), memoryAccessOperands.begin(), memoryAccessOperands.end());
-        // get the pointee type
-        spv::Id typeId = builder.getContainedTypeId(builder.getTypeId(operands[0]));
-        assert(builder.isCooperativeVectorType(typeId));
-        // do the op
-        spv::Id result = builder.createOp(spv::Op::OpCooperativeVectorLoadNV, typeId, idImmOps);
-        // store the result to the pointer (out param 'v')
-        builder.createStore(result, operands[0]);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeVectorStoreNV) {
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // buf
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // offset
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // object
-        idImmOps.insert(idImmOps.end(), memoryAccessOperands.begin(), memoryAccessOperands.end());
-        builder.createNoResultOp(spv::Op::OpCooperativeVectorStoreNV, idImmOps);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeVectorOuterProductAccumulateNV) {
-        builder.addCapability(spv::Capability::CooperativeVectorTrainingNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_vector);
-
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // Matrix
-        idImmOps.push_back(spv::IdImmediate(true, operands[3])); // Offset
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // A
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // B
-        idImmOps.push_back(spv::IdImmediate(true, operands[5])); // MemoryLayout
-        idImmOps.push_back(spv::IdImmediate(true, operands[6])); // MatrixInterpretation
-        idImmOps.push_back(spv::IdImmediate(true, operands[4])); // Stride
-        builder.createNoResultOp(spv::Op::OpCooperativeVectorOuterProductAccumulateNV, idImmOps);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpCooperativeVectorReduceSumAccumulateNV) {
-        builder.addCapability(spv::Capability::CooperativeVectorTrainingNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_vector);
-
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // Buf
-        idImmOps.push_back(spv::IdImmediate(true, operands[2])); // Offset
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // A
-        builder.createNoResultOp(spv::Op::OpCooperativeVectorReduceSumAccumulateNV, idImmOps);
-        result = 0;
-    } else if (node->getOp() == glslang::EOpTensorReadARM ||
-               node->getOp() == glslang::EOpTensorWriteARM) {
-        const bool isWrite = node->getOp() == glslang::EOpTensorWriteARM;
-        const unsigned int tensorMinOperandCount = 3;
-        assert(operands.size() >= tensorMinOperandCount);
-        std::vector<spv::IdImmediate> idImmOps;
-
-        idImmOps.push_back(spv::IdImmediate(true, operands[0])); // tensor
-        idImmOps.push_back(spv::IdImmediate(true, operands[1])); // coords
-        if (isWrite) {
-            idImmOps.push_back(spv::IdImmediate(true, operands[2])); // value
-        }
-
-        // Analyze the tensor operands
-        spv::IdImmediate tensorOperands = { false, uint32_t(spv::TensorOperandsMask::MaskNone) };
-        bool pushExtraArg = false;
-        if (operands.size() > tensorMinOperandCount) {
-            auto enumVal = builder.getConstantScalar(operands[tensorMinOperandCount]);
-
-            if (enumVal & uint32_t(spv::TensorOperandsMask::NontemporalARM)) {
-                tensorOperands.word |= uint32_t(spv::TensorOperandsMask::NontemporalARM);
-            }
-            if (enumVal & uint32_t(spv::TensorOperandsMask::OutOfBoundsValueARM)) {
-                tensorOperands.word |= uint32_t(spv::TensorOperandsMask::OutOfBoundsValueARM);
-                assert(operands.size() >= tensorMinOperandCount + 2 &&
-                    "TensorOperandsOutOfBoundsValueMask requires an additional value");
-                pushExtraArg = true;
-            }
-        }
-
-        // Append optional tensor operands if the mask was non-zero.
-        if (tensorOperands.word) {
-            idImmOps.push_back(tensorOperands);
-            if (pushExtraArg)
-                idImmOps.push_back(spv::IdImmediate(true, operands[tensorMinOperandCount + 1]));
-        }
-
-        if (isWrite) {
-            builder.createNoResultOp(spv::Op::OpTensorWriteARM, idImmOps);
-            result = 0;
-        } else {
-            // Use the result argument type as the OpTensorReadARM result type.
-            const glslang::TType &resArgType = glslangOperands[2]->getAsTyped()->getType();
-            spv::Id retType = convertGlslangToSpvType(resArgType);
-            result = builder.createOp(spv::Op::OpTensorReadARM, retType, idImmOps);
-            // Store the result to the result argument.
-            builder.createStore(result, operands[2]);
-        }
-    } else if (node->getOp() == glslang::EOpTensorSizeARM) {
-        // Expected operands are (tensor, dimension)
-        assert(operands.size() == 2);
-
-        spv::Id tensorOp = operands[0];
-        spv::Id dimOp = operands[1];
-        assert(builder.isTensorTypeARM(builder.getTypeId(tensorOp)) && "operand #0 must be a tensor");
-
-        std::vector<spv::IdImmediate> idImmOps;
-        idImmOps.push_back(spv::IdImmediate(true, tensorOp));
-        idImmOps.push_back(spv::IdImmediate(true, dimOp));
-        result = builder.createOp(spv::Op::OpTensorQuerySizeARM, resultType(), idImmOps);
+        result = builder.createOp(spv::OpCooperativeMatrixMulAddKHR, resultType(), idImmOps);
     } else if (atomic) {
         // Handle all atomics
         glslang::TBasicType typeProxy = (node->getOp() == glslang::EOpAtomicStore)
@@ -4752,14 +3971,14 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
             // Since isOpSelectable only lets us get here for SPIR-V >= 1.4, we can use OpCopyObject
             // to get matching types.
             if (builder.getTypeId(trueValue) != resultType) {
-                trueValue = builder.createUnaryOp(spv::Op::OpCopyLogical, resultType, trueValue);
+                trueValue = builder.createUnaryOp(spv::OpCopyLogical, resultType, trueValue);
             }
             if (builder.getTypeId(falseValue) != resultType) {
-                falseValue = builder.createUnaryOp(spv::Op::OpCopyLogical, resultType, falseValue);
+                falseValue = builder.createUnaryOp(spv::OpCopyLogical, resultType, falseValue);
             }
 
             // OpSelect
-            result = builder.createTriOp(spv::Op::OpSelect, resultType, condition, trueValue, falseValue);
+            result = builder.createTriOp(spv::OpSelect, resultType, condition, trueValue, falseValue);
 
             builder.clearAccessChain();
             builder.setAccessChainRValue(result);
@@ -4767,7 +3986,7 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
             // We need control flow to select the result.
             // TODO: Once SPIR-V OpSelect allows arbitrary types, eliminate this path.
             result = builder.createVariable(TranslatePrecisionDecoration(node->getType()),
-                spv::StorageClass::Function, resultType);
+                spv::StorageClassFunction, resultType);
 
             // Selection control:
             const spv::SelectionControlMask control = TranslateSelectionControl(*node);
@@ -4798,7 +4017,7 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
     const auto executeOneSide = [&]() {
         // Always emit control flow.
         if (node->getBasicType() != glslang::EbtVoid) {
-            result = builder.createVariable(TranslatePrecisionDecoration(node->getType()), spv::StorageClass::Function,
+            result = builder.createVariable(TranslatePrecisionDecoration(node->getType()), spv::StorageClassFunction,
                 convertGlslangToSpvType(node->getType()));
         }
 
@@ -4899,7 +4118,7 @@ bool TGlslangToSpvTraverser::visitSwitch(glslang::TVisit /* visit */, glslang::T
         if (codeSegments[s])
             codeSegments[s]->traverse(this);
         else
-            builder.addSwitchBreak(true);
+            builder.addSwitchBreak();
     }
     breakForLoop.pop();
 
@@ -4923,7 +4142,7 @@ void TGlslangToSpvTraverser::visitConstantUnion(glslang::TIntermConstantUnion* n
 bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIntermLoop* node)
 {
     auto blocks = builder.makeNewLoop();
-    builder.createBranch(true, &blocks.head);
+    builder.createBranch(&blocks.head);
 
     // Loop control:
     std::vector<unsigned int> operands;
@@ -4940,33 +4159,33 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
     builder.createLoopMerge(&blocks.merge, &blocks.continue_target, control, operands);
     if (node->testFirst() && node->getTest()) {
         spv::Block& test = builder.makeNewBlock();
-        builder.createBranch(true, &test);
+        builder.createBranch(&test);
 
         builder.setBuildPoint(&test);
         node->getTest()->traverse(this);
-        spv::Id condition = accessChainLoad(node->getTestExpr()->getType());
+        spv::Id condition = accessChainLoad(node->getTest()->getType());
         builder.createConditionalBranch(condition, &blocks.body, &blocks.merge);
 
         builder.setBuildPoint(&blocks.body);
         breakForLoop.push(true);
         if (node->getBody())
             node->getBody()->traverse(this);
-        builder.createBranch(true, &blocks.continue_target);
+        builder.createBranch(&blocks.continue_target);
         breakForLoop.pop();
 
         builder.setBuildPoint(&blocks.continue_target);
         if (node->getTerminal())
             node->getTerminal()->traverse(this);
-        builder.createBranch(true, &blocks.head);
+        builder.createBranch(&blocks.head);
     } else {
         builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
-        builder.createBranch(true, &blocks.body);
+        builder.createBranch(&blocks.body);
 
         breakForLoop.push(true);
         builder.setBuildPoint(&blocks.body);
         if (node->getBody())
             node->getBody()->traverse(this);
-        builder.createBranch(true, &blocks.continue_target);
+        builder.createBranch(&blocks.continue_target);
         breakForLoop.pop();
 
         builder.setBuildPoint(&blocks.continue_target);
@@ -4975,13 +4194,13 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
         if (node->getTest()) {
             node->getTest()->traverse(this);
             spv::Id condition =
-                accessChainLoad(node->getTestExpr()->getType());
+                accessChainLoad(node->getTest()->getType());
             builder.createConditionalBranch(condition, &blocks.head, &blocks.merge);
         } else {
             // TODO: unless there was a break/return/discard instruction
             // somewhere in the body, this is an infinite loop, so we should
             // issue a warning.
-            builder.createBranch(true, &blocks.head);
+            builder.createBranch(&blocks.head);
         }
     }
     builder.setBuildPoint(&blocks.merge);
@@ -4999,21 +4218,25 @@ bool TGlslangToSpvTraverser::visitBranch(glslang::TVisit /* visit */, glslang::T
     switch (node->getFlowOp()) {
     case glslang::EOpKill:
         if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6) {
-            builder.addCapability(spv::Capability::DemoteToHelperInvocation);
-            builder.createNoResultOp(spv::Op::OpDemoteToHelperInvocationEXT);
+            if (glslangIntermediate->getSource() == glslang::EShSourceHlsl) {
+              builder.addCapability(spv::CapabilityDemoteToHelperInvocation);
+              builder.createNoResultOp(spv::OpDemoteToHelperInvocationEXT);
+            } else {
+                builder.makeStatementTerminator(spv::OpTerminateInvocation, "post-terminate-invocation");
+            }
         } else {
-            builder.makeStatementTerminator(spv::Op::OpKill, "post-discard");
+            builder.makeStatementTerminator(spv::OpKill, "post-discard");
         }
         break;
     case glslang::EOpTerminateInvocation:
         builder.addExtension(spv::E_SPV_KHR_terminate_invocation);
-        builder.makeStatementTerminator(spv::Op::OpTerminateInvocation, "post-terminate-invocation");
+        builder.makeStatementTerminator(spv::OpTerminateInvocation, "post-terminate-invocation");
         break;
     case glslang::EOpBreak:
         if (breakForLoop.top())
             builder.createLoopExit();
         else
-            builder.addSwitchBreak(false);
+            builder.addSwitchBreak();
         break;
     case glslang::EOpContinue:
         builder.createLoopContinue();
@@ -5026,7 +4249,7 @@ bool TGlslangToSpvTraverser::visitBranch(glslang::TVisit /* visit */, glslang::T
                 TranslatePrecisionDecoration(glslangReturnType) != currentFunction->getReturnPrecision()) {
                 builder.clearAccessChain();
                 spv::Id copyId = builder.createVariable(currentFunction->getReturnPrecision(),
-                    spv::StorageClass::Function, currentFunction->getReturnType());
+                    spv::StorageClassFunction, currentFunction->getReturnType());
                 builder.setAccessChainLValue(copyId);
                 multiTypeStore(glslangReturnType, returnId);
                 returnId = builder.createLoad(copyId, currentFunction->getReturnPrecision());
@@ -5039,15 +4262,15 @@ bool TGlslangToSpvTraverser::visitBranch(glslang::TVisit /* visit */, glslang::T
         break;
 
     case glslang::EOpDemote:
-        builder.createNoResultOp(spv::Op::OpDemoteToHelperInvocationEXT);
+        builder.createNoResultOp(spv::OpDemoteToHelperInvocationEXT);
         builder.addExtension(spv::E_SPV_EXT_demote_to_helper_invocation);
-        builder.addCapability(spv::Capability::DemoteToHelperInvocationEXT);
+        builder.addCapability(spv::CapabilityDemoteToHelperInvocationEXT);
         break;
     case glslang::EOpTerminateRayKHR:
-        builder.makeStatementTerminator(spv::Op::OpTerminateRayKHR, "post-terminateRayKHR");
+        builder.makeStatementTerminator(spv::OpTerminateRayKHR, "post-terminateRayKHR");
         break;
     case glslang::EOpIgnoreIntersectionKHR:
-        builder.makeStatementTerminator(spv::Op::OpIgnoreIntersectionKHR, "post-ignoreIntersectionKHR");
+        builder.makeStatementTerminator(spv::OpIgnoreIntersectionKHR, "post-ignoreIntersectionKHR");
         break;
 
     default:
@@ -5058,18 +4281,6 @@ bool TGlslangToSpvTraverser::visitBranch(glslang::TVisit /* visit */, glslang::T
     return false;
 }
 
-bool TGlslangToSpvTraverser::visitVariableDecl(glslang::TVisit visit, glslang::TIntermVariableDecl* node)
-{
-    if (visit == glslang::EvPreVisit) {
-        builder.setDebugSourceLocation(node->getDeclSymbol()->getLoc().line, node->getDeclSymbol()->getLoc().getFilename());
-        // We touch the symbol once here to create the debug info.
-        getSymbolId(node->getDeclSymbol());
-    }
-
-    return true;
-}
-
-
 spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol* node, spv::Id forcedType)
 {
     // First, steer off constants, which are not SPIR-V variables, but
@@ -5077,12 +4288,8 @@ spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol*
     // This includes specialization constants.
     if (node->getQualifier().isConstant()) {
         spv::Id result = createSpvConstant(*node);
-        if (result != spv::NoResult) {
-            auto name = node->getAsSymbolNode()->getAccessName().c_str();
-            auto typeId = convertGlslangToSpvType(node->getType());
-            builder.createConstVariable(typeId, name, result, currentFunction == nullptr);
+        if (result != spv::NoResult)
             return result;
-        }
     }
 
     // Now, handle actual variables
@@ -5094,59 +4301,56 @@ spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol*
                                    node->getType().contains16BitInt();
     if (contains16BitType) {
         switch (storageClass) {
-        case spv::StorageClass::Input:
-        case spv::StorageClass::Output:
+        case spv::StorageClassInput:
+        case spv::StorageClassOutput:
             builder.addIncorporatedExtension(spv::E_SPV_KHR_16bit_storage, spv::Spv_1_3);
-            builder.addCapability(spv::Capability::StorageInputOutput16);
+            builder.addCapability(spv::CapabilityStorageInputOutput16);
             break;
-        case spv::StorageClass::Uniform:
+        case spv::StorageClassUniform:
             builder.addIncorporatedExtension(spv::E_SPV_KHR_16bit_storage, spv::Spv_1_3);
             if (node->getType().getQualifier().storage == glslang::EvqBuffer)
-                builder.addCapability(spv::Capability::StorageUniformBufferBlock16);
+                builder.addCapability(spv::CapabilityStorageUniformBufferBlock16);
             else
-                builder.addCapability(spv::Capability::StorageUniform16);
+                builder.addCapability(spv::CapabilityStorageUniform16);
             break;
-        case spv::StorageClass::PushConstant:
+        case spv::StorageClassPushConstant:
             builder.addIncorporatedExtension(spv::E_SPV_KHR_16bit_storage, spv::Spv_1_3);
-            builder.addCapability(spv::Capability::StoragePushConstant16);
+            builder.addCapability(spv::CapabilityStoragePushConstant16);
             break;
-        case spv::StorageClass::StorageBuffer:
-        case spv::StorageClass::PhysicalStorageBufferEXT:
+        case spv::StorageClassStorageBuffer:
+        case spv::StorageClassPhysicalStorageBufferEXT:
             builder.addIncorporatedExtension(spv::E_SPV_KHR_16bit_storage, spv::Spv_1_3);
-            builder.addCapability(spv::Capability::StorageUniformBufferBlock16);
-            break;
-        case spv::StorageClass::TileAttachmentQCOM:
-            builder.addCapability(spv::Capability::TileShadingQCOM);
+            builder.addCapability(spv::CapabilityStorageUniformBufferBlock16);
             break;
         default:
-            if (storageClass == spv::StorageClass::Workgroup &&
+            if (storageClass == spv::StorageClassWorkgroup &&
                 node->getType().getBasicType() == glslang::EbtBlock) {
-                builder.addCapability(spv::Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR);
+                builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR);
                 break;
             }
             if (node->getType().contains16BitFloat())
-                builder.addCapability(spv::Capability::Float16);
+                builder.addCapability(spv::CapabilityFloat16);
             if (node->getType().contains16BitInt())
-                builder.addCapability(spv::Capability::Int16);
+                builder.addCapability(spv::CapabilityInt16);
             break;
         }
     }
 
     if (node->getType().contains8BitInt()) {
-        if (storageClass == spv::StorageClass::PushConstant) {
+        if (storageClass == spv::StorageClassPushConstant) {
             builder.addIncorporatedExtension(spv::E_SPV_KHR_8bit_storage, spv::Spv_1_5);
-            builder.addCapability(spv::Capability::StoragePushConstant8);
-        } else if (storageClass == spv::StorageClass::Uniform) {
+            builder.addCapability(spv::CapabilityStoragePushConstant8);
+        } else if (storageClass == spv::StorageClassUniform) {
             builder.addIncorporatedExtension(spv::E_SPV_KHR_8bit_storage, spv::Spv_1_5);
-            builder.addCapability(spv::Capability::UniformAndStorageBuffer8BitAccess);
-        } else if (storageClass == spv::StorageClass::StorageBuffer) {
+            builder.addCapability(spv::CapabilityUniformAndStorageBuffer8BitAccess);
+        } else if (storageClass == spv::StorageClassStorageBuffer) {
             builder.addIncorporatedExtension(spv::E_SPV_KHR_8bit_storage, spv::Spv_1_5);
-            builder.addCapability(spv::Capability::StorageBuffer8BitAccess);
-        } else if (storageClass == spv::StorageClass::Workgroup &&
+            builder.addCapability(spv::CapabilityStorageBuffer8BitAccess);
+        } else if (storageClass == spv::StorageClassWorkgroup &&
                    node->getType().getBasicType() == glslang::EbtBlock) {
-            builder.addCapability(spv::Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR);
+            builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR);
         } else {
-            builder.addCapability(spv::Capability::Int8);
+            builder.addCapability(spv::CapabilityInt8);
         }
     }
 
@@ -5166,29 +4370,7 @@ spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol*
         initializer = builder.makeNullConstant(spvType);
     }
 
-    spv::Id var = builder.createVariable(spv::NoPrecision, storageClass, spvType, name, initializer, false);
-
-    if (options.emitNonSemanticShaderDebugInfo && storageClass != spv::StorageClass::Function) {
-        // Create variable alias for retargeted symbols if any.
-        // Notably, this is only applicable to built-in variables so that it is okay to only use name as the key.
-        auto [itBegin, itEnd] = glslangIntermediate->getBuiltinAliasLookup().equal_range(name);
-        for (auto it = itBegin; it != itEnd; ++it) {
-            builder.createDebugGlobalVariable(builder.getDebugType(spvType), it->second.c_str(), var);
-        }
-    }
-
-    std::vector<spv::Decoration> topLevelDecorations;
-    glslang::TQualifier typeQualifier = node->getType().getQualifier();
-    TranslateMemoryDecoration(typeQualifier, topLevelDecorations, glslangIntermediate->usingVulkanMemoryModel());
-    for (auto deco : topLevelDecorations) {
-#ifdef __APPLE__
-        if (deco != spv::Decoration::Restrict &&
-            deco != spv::Decoration::RestrictPointer &&
-            deco != spv::Decoration::RestrictPointerEXT)
-#endif
-        builder.addDecoration(var, deco);
-    }
-    return var;
+    return builder.createVariable(spv::NoPrecision, storageClass, spvType, name, initializer, false);
 }
 
 // Return type Id of the sampled type.
@@ -5200,15 +4382,15 @@ spv::Id TGlslangToSpvTraverser::getSampledType(const glslang::TSampler& sampler)
         case glslang::EbtFloat:    return builder.makeFloatType(32);
         case glslang::EbtFloat16:
             builder.addExtension(spv::E_SPV_AMD_gpu_shader_half_float_fetch);
-            builder.addCapability(spv::Capability::Float16ImageAMD);
+            builder.addCapability(spv::CapabilityFloat16ImageAMD);
             return builder.makeFloatType(16);
         case glslang::EbtInt64:
             builder.addExtension(spv::E_SPV_EXT_shader_image_int64);
-            builder.addCapability(spv::Capability::Int64ImageEXT);
+            builder.addCapability(spv::CapabilityInt64ImageEXT);
             return builder.makeIntType(64);
         case glslang::EbtUint64:
             builder.addExtension(spv::E_SPV_EXT_shader_image_int64);
-            builder.addCapability(spv::Capability::Int64ImageEXT);
+            builder.addCapability(spv::CapabilityInt64ImageEXT);
             return builder.makeUintType(64);
         default:
             assert(0);
@@ -5258,9 +4440,9 @@ spv::LinkageType TGlslangToSpvTraverser::convertGlslangLinkageToSpv(glslang::TLi
 {
     switch (linkType) {
     case glslang::ELinkExport:
-        return spv::LinkageType::Export;
+        return spv::LinkageTypeExport;
     default:
-        return spv::LinkageType::Max;
+        return spv::LinkageTypeMax;
     }
 }
 
@@ -5301,15 +4483,6 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
     case glslang::EbtFloat16:
         spvType = builder.makeFloatType(16);
         break;
-    case glslang::EbtBFloat16:
-        spvType = builder.makeBFloat16Type();
-        break;
-    case glslang::EbtFloatE5M2:
-        spvType = builder.makeFloatE5M2Type();
-        break;
-    case glslang::EbtFloatE4M3:
-        spvType = builder.makeFloatE4M3Type();
-        break;
     case glslang::EbtInt8:
         spvType = builder.makeIntType(8);
         break;
@@ -5329,7 +4502,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
         spvType = builder.makeUintType(64);
         break;
     case glslang::EbtAtomicUint:
-        builder.addCapability(spv::Capability::AtomicStorage);
+        builder.addCapability(spv::CapabilityAtomicStorage);
         spvType = builder.makeUintType(32);
         break;
     case glslang::EbtAccStruct:
@@ -5347,7 +4520,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
                 auto& extensions = glslangIntermediate->getRequestedExtensions();
                 if (extensions.find("GL_EXT_ray_query") != extensions.end()) {
                     builder.addExtension(spv::E_SPV_KHR_ray_query);
-                    builder.addCapability(spv::Capability::RayQueryKHR);
+                    builder.addCapability(spv::CapabilityRayQueryKHR);
                 }
             }
             break;
@@ -5359,7 +4532,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
             auto& extensions = glslangIntermediate->getRequestedExtensions();
             if (extensions.find("GL_EXT_ray_query") != extensions.end()) {
                 builder.addExtension(spv::E_SPV_KHR_ray_query);
-                builder.addCapability(spv::Capability::RayQueryKHR);
+                builder.addCapability(spv::CapabilityRayQueryKHR);
             }
             spvType = builder.makeRayQueryType();
         }
@@ -5369,13 +4542,13 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
             // Make the forward pointer, then recurse to convert the structure type, then
             // patch up the forward pointer with a real pointer type.
             if (forwardPointers.find(type.getReferentType()) == forwardPointers.end()) {
-                spv::Id forwardId = builder.makeForwardPointer(spv::StorageClass::PhysicalStorageBufferEXT);
+                spv::Id forwardId = builder.makeForwardPointer(spv::StorageClassPhysicalStorageBufferEXT);
                 forwardPointers[type.getReferentType()] = forwardId;
             }
             spvType = forwardPointers[type.getReferentType()];
             if (!forwardReferenceOnly) {
                 spv::Id referentType = convertGlslangToSpvType(*type.getReferentType());
-                builder.makePointerFromForwardPointer(spv::StorageClass::PhysicalStorageBufferEXT,
+                builder.makePointerFromForwardPointer(spv::StorageClassPhysicalStorageBufferEXT,
                                                       forwardPointers[type.getReferentType()],
                                                       referentType);
             }
@@ -5384,50 +4557,18 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
     case glslang::EbtSampler:
         {
             const glslang::TSampler& sampler = type.getSampler();
-            std::string debugName;
-
             if (sampler.isPureSampler()) {
-                if (options.emitNonSemanticShaderDebugInfo) {
-                    if (glslangIntermediate->getSource() == glslang::EShSourceGlsl) {
-                        debugName = sampler.getString();
-                    }
-                    else {
-                        debugName = "type.sampler";
-                    }
-                }
-                spvType = builder.makeSamplerType(debugName.c_str());
+                spvType = builder.makeSamplerType();
             } else {
                 // an image is present, make its type
-                if (options.emitNonSemanticShaderDebugInfo) {
-                    if (glslangIntermediate->getSource() == glslang::EShSourceGlsl) {
-                        debugName = sampler.removeCombined().getString();
-                    }
-                    else {
-                        switch (sampler.dim) {
-                        case glslang::Esd1D:           debugName = "type.1d.image"; break;
-                        case glslang::Esd2D:           debugName = "type.2d.image"; break;
-                        case glslang::Esd3D:           debugName = "type.3d.image"; break;
-                        case glslang::EsdCube:         debugName = "type.cube.image"; break;
-                        default:                       debugName = "type.image"; break;
-                        }
-                    }
-                }
                 spvType = builder.makeImageType(getSampledType(sampler), TranslateDimensionality(sampler),
                                                 sampler.isShadow(), sampler.isArrayed(), sampler.isMultiSample(),
-                                                sampler.isImageClass() ? 2 : 1, TranslateImageFormat(type), debugName.c_str());
+                                                sampler.isImageClass() ? 2 : 1, TranslateImageFormat(type));
                 if (sampler.isCombined() &&
                     (!sampler.isBuffer() || glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_6)) {
                     // Already has both image and sampler, make the combined type. Only combine sampler to
                     // buffer if before SPIR-V 1.6.
-                    if (options.emitNonSemanticShaderDebugInfo) {
-                        if (glslangIntermediate->getSource() == glslang::EShSourceGlsl) {
-                            debugName = sampler.getString();
-                        }
-                        else {
-                            debugName = "type.sampled.image";
-                        }
-                    }
-                    spvType = builder.makeSampledImageType(spvType, debugName.c_str());
+                    spvType = builder.makeSampledImageType(spvType);
                 }
             }
         }
@@ -5457,17 +4598,10 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
 
     case glslang::EbtHitObjectNV: {
         builder.addExtension(spv::E_SPV_NV_shader_invocation_reorder);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
+        builder.addCapability(spv::CapabilityShaderInvocationReorderNV);
         spvType = builder.makeHitObjectNVType();
     }
     break;
-
-    case glslang::EbtHitObjectEXT: {
-        builder.addExtension(spv::E_SPV_EXT_shader_invocation_reorder);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderEXT);
-        spvType = builder.makeHitObjectEXTType();
-    }
-    break;
     case glslang::EbtSpirvType: {
         // GL_EXT_spirv_intrinsics
         const auto& spirvType = type.getSpirvType();
@@ -5533,32 +4667,6 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
 
         break;
     }
-    case glslang::EbtTensorLayoutNV:
-    {
-        builder.addCapability(spv::Capability::TensorAddressingNV);
-        builder.addExtension(spv::E_SPV_NV_tensor_addressing);
-
-        std::vector<spv::IdImmediate> operands;
-        for (uint32_t i = 0; i < 2; ++i) {
-            operands.push_back({true, makeArraySizeId(*type.getTypeParameters()->arraySizes, i, true)});
-        }
-        spvType = builder.makeGenericType(spv::Op::OpTypeTensorLayoutNV, operands);
-        break;
-    }
-    case glslang::EbtTensorViewNV:
-    {
-        builder.addCapability(spv::Capability::TensorAddressingNV);
-        builder.addExtension(spv::E_SPV_NV_tensor_addressing);
-
-        uint32_t dim = type.getTypeParameters()->arraySizes->getDimSize(0);
-        assert(dim >= 1 && dim <= 5);
-        std::vector<spv::IdImmediate> operands;
-        for (uint32_t i = 0; i < dim + 2; ++i) {
-            operands.push_back({true, makeArraySizeId(*type.getTypeParameters()->arraySizes, i, true, i==1)});
-        }
-        spvType = builder.makeGenericType(spv::Op::OpTypeTensorViewNV, operands);
-        break;
-    }
     default:
         assert(0);
         break;
@@ -5573,14 +4681,14 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
     }
 
     if (type.isCoopMatNV()) {
-        builder.addCapability(spv::Capability::CooperativeMatrixNV);
+        builder.addCapability(spv::CapabilityCooperativeMatrixNV);
         builder.addExtension(spv::E_SPV_NV_cooperative_matrix);
 
         if (type.getBasicType() == glslang::EbtFloat16)
-            builder.addCapability(spv::Capability::Float16);
+            builder.addCapability(spv::CapabilityFloat16);
         if (type.getBasicType() == glslang::EbtUint8 ||
             type.getBasicType() == glslang::EbtInt8) {
-            builder.addCapability(spv::Capability::Int8);
+            builder.addCapability(spv::CapabilityInt8);
         }
 
         spv::Id scope = makeArraySizeId(*type.getTypeParameters()->arraySizes, 1);
@@ -5591,66 +4699,22 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
     }
 
     if (type.isCoopMatKHR()) {
-        builder.addCapability(spv::Capability::CooperativeMatrixKHR);
+        builder.addCapability(spv::CapabilityCooperativeMatrixKHR);
         builder.addExtension(spv::E_SPV_KHR_cooperative_matrix);
 
-        if (type.getBasicType() == glslang::EbtBFloat16) {
-            builder.addExtension(spv::E_SPV_KHR_bfloat16);
-            builder.addCapability(spv::Capability::BFloat16CooperativeMatrixKHR);
-        }
-
-        if (type.getBasicType() == glslang::EbtFloatE5M2 || type.getBasicType() == glslang::EbtFloatE4M3) {
-            builder.addExtension(spv::E_SPV_EXT_float8);
-            builder.addCapability(spv::Capability::Float8CooperativeMatrixEXT);
-        }
-
         if (type.getBasicType() == glslang::EbtFloat16)
-            builder.addCapability(spv::Capability::Float16);
+            builder.addCapability(spv::CapabilityFloat16);
         if (type.getBasicType() == glslang::EbtUint8 || type.getBasicType() == glslang::EbtInt8) {
-            builder.addCapability(spv::Capability::Int8);
+            builder.addCapability(spv::CapabilityInt8);
         }
 
         spv::Id scope = makeArraySizeId(*type.getTypeParameters()->arraySizes, 0);
         spv::Id rows = makeArraySizeId(*type.getTypeParameters()->arraySizes, 1);
         spv::Id cols = makeArraySizeId(*type.getTypeParameters()->arraySizes, 2);
-        spv::Id use = makeArraySizeId(*type.getTypeParameters()->arraySizes, 3, true);
+        spv::Id use = builder.makeUintConstant(type.getCoopMatKHRuse());
 
         spvType = builder.makeCooperativeMatrixTypeKHR(spvType, scope, rows, cols, use);
     }
-    else if (type.isTensorARM()) {
-        builder.addCapability(spv::Capability::TensorsARM);
-        builder.addExtension(spv::E_SPV_ARM_tensors);
-        if (type.getBasicType() == glslang::EbtInt8 || type.getBasicType() == glslang::EbtUint8) {
-            builder.addCapability(spv::Capability::Int8);
-        } else if (type.getBasicType() == glslang::EbtInt16 ||
-                   type.getBasicType() == glslang::EbtUint16) {
-            builder.addCapability(spv::Capability::Int16);
-        } else if (type.getBasicType() == glslang::EbtInt64 ||
-                   type.getBasicType() == glslang::EbtUint64) {
-            builder.addCapability(spv::Capability::Int64);
-        } else if (type.getBasicType() == glslang::EbtFloat16) {
-            builder.addCapability(spv::Capability::Float16);
-        }
-
-        spv::Id rank = makeArraySizeId(*type.getTypeParameters()->arraySizes, 0);
-
-        spvType = builder.makeTensorTypeARM(spvType, rank);
-    }
-
-    if (type.isCoopVecNV()) {
-        builder.addCapability(spv::Capability::CooperativeVectorNV);
-        builder.addExtension(spv::E_SPV_NV_cooperative_vector);
-
-        if (type.getBasicType() == glslang::EbtFloat16)
-            builder.addCapability(spv::Capability::Float16);
-        if (type.getBasicType() == glslang::EbtUint8 || type.getBasicType() == glslang::EbtInt8) {
-            builder.addCapability(spv::Capability::Int8);
-        }
-
-        spv::Id components = makeArraySizeId(*type.getTypeParameters()->arraySizes, 0);
-
-        spvType = builder.makeCooperativeVectorTypeNV(spvType, components);
-    }
 
     if (type.isArray()) {
         int stride = 0;  // keep this 0 unless doing an explicit layout; 0 will mean no decoration, no stride
@@ -5674,7 +4738,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
             for (int dim = type.getArraySizes()->getNumDims() - 1; dim > 0; --dim) {
                 spvType = builder.makeArrayType(spvType, makeArraySizeId(*type.getArraySizes(), dim), stride);
                 if (stride > 0)
-                    builder.addDecoration(spvType, spv::Decoration::ArrayStride, stride);
+                    builder.addDecoration(spvType, spv::DecorationArrayStride, stride);
                 stride *= type.getArraySizes()->getDimSize(dim);
             }
         } else {
@@ -5690,15 +4754,14 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
         if (type.isSizedArray())
             spvType = builder.makeArrayType(spvType, makeArraySizeId(*type.getArraySizes(), 0), stride);
         else {
-            // If we see an runtime array in a buffer_reference, it is not a descriptor
-            if (!lastBufferBlockMember && type.getBasicType() != glslang::EbtReference) {
+            if (!lastBufferBlockMember) {
                 builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
-                builder.addCapability(spv::Capability::RuntimeDescriptorArrayEXT);
+                builder.addCapability(spv::CapabilityRuntimeDescriptorArrayEXT);
             }
             spvType = builder.makeRuntimeArray(spvType);
         }
         if (stride > 0)
-            builder.addDecoration(spvType, spv::Decoration::ArrayStride, stride);
+            builder.addDecoration(spvType, spv::DecorationArrayStride, stride);
     }
 
     return spvType;
@@ -5796,7 +4859,7 @@ bool TGlslangToSpvTraverser::filterMember(const glslang::TType& member)
     }
 
     return false;
-}
+};
 
 // Do full recursive conversion of a glslang structure (or block) type to a SPIR-V Id.
 // explicitLayout can be kept the same throughout the hierarchical recursive walk.
@@ -5811,7 +4874,6 @@ spv::Id TGlslangToSpvTraverser::convertGlslangStructToSpvType(const glslang::TTy
     int memberDelta = 0;  // how much the member's index changes from glslang to SPIR-V, normally 0,
                           // except sometimes for blocks
     std::vector<std::pair<glslang::TType*, glslang::TQualifier> > deferredForwardPointers;
-    std::vector<spv::StructMemberDebugInfo> memberDebugInfo;
     for (int i = 0; i < (int)glslangMembers->size(); i++) {
         auto& glslangMember = (*glslangMembers)[i];
         if (glslangMember.type->hiddenMember()) {
@@ -5862,39 +4924,15 @@ spv::Id TGlslangToSpvTraverser::convertGlslangStructToSpvType(const glslang::TTy
             //  + Not as clean as desired. Traverser queries/sets persistent state. This is fragile.
             //  + Table lookup during creation of composite debug types. This really shouldn't be necessary.
             if(options.emitNonSemanticShaderDebugInfo) {
-                spv::StructMemberDebugInfo debugInfo{};
-                debugInfo.name = glslangMember.type->getFieldName();
-                debugInfo.line = glslangMember.loc.line;
-                debugInfo.column = glslangMember.loc.column;
-
-                // Per the GLSL spec, bool variables inside of a uniform or buffer block are generated as uint.
-                // But for debug info, we want to represent them as bool because that is the original type in
-                // the source code. The bool type can be nested within a vector or a multidimensional array,
-                // so we must construct the chain of types up from the scalar bool.
-                if (glslangIntermediate->getSource() == glslang::EShSourceGlsl && explicitLayout != glslang::ElpNone &&
-                    glslangMember.type->getBasicType() == glslang::EbtBool) {
-                    auto typeId = builder.makeBoolType();
-                    if (glslangMember.type->isVector()) {
-                        typeId = builder.makeVectorType(typeId, glslangMember.type->getVectorSize());
-                    }
-                    if (glslangMember.type->isArray()) {
-                        const auto* arraySizes = glslangMember.type->getArraySizes();
-                        int dims = arraySizes->getNumDims();
-                        for (int i = dims - 1; i >= 0; --i) {
-                            spv::Id size = builder.makeIntConstant(arraySizes->getDimSize(i));
-                            typeId = builder.makeArrayType(typeId, size, 0);
-                        }
-                    }
-                    debugInfo.debugTypeOverride = builder.getDebugType(typeId);
-                }
-
-                memberDebugInfo.push_back(debugInfo);
+                builder.debugTypeLocs[spvMember].name = glslangMember.type->getFieldName().c_str();
+                builder.debugTypeLocs[spvMember].line = glslangMember.loc.line;
+                builder.debugTypeLocs[spvMember].column = glslangMember.loc.column;
             }
         }
     }
 
     // Make the SPIR-V type
-    spv::Id spvType = builder.makeStructType(spvMembers, memberDebugInfo, type.getTypeName().c_str(), false);
+    spv::Id spvType = builder.makeStructType(spvMembers, type.getTypeName().c_str(), false);
     if (! HasNonLayoutQualifiers(type, qualifier))
         structMap[explicitLayout][qualifier.layoutMatrix][glslangMembers] = spvType;
 
@@ -5968,60 +5006,60 @@ void TGlslangToSpvTraverser::decorateStructType(const glslang::TType& type,
         // Ignore member locations if the container is an array, as that's
         // ill-specified and decisions have been made to not allow this.
         if (!memberLocationInvalid && memberQualifier.hasLocation())
-            builder.addMemberDecoration(spvType, member, spv::Decoration::Location, memberQualifier.layoutLocation);
+            builder.addMemberDecoration(spvType, member, spv::DecorationLocation, memberQualifier.layoutLocation);
 
         // component, XFB, others
         if (glslangMember.getQualifier().hasComponent())
-            builder.addMemberDecoration(spvType, member, spv::Decoration::Component,
+            builder.addMemberDecoration(spvType, member, spv::DecorationComponent,
                                         glslangMember.getQualifier().layoutComponent);
         if (glslangMember.getQualifier().hasXfbOffset())
-            builder.addMemberDecoration(spvType, member, spv::Decoration::Offset,
+            builder.addMemberDecoration(spvType, member, spv::DecorationOffset,
                                         glslangMember.getQualifier().layoutXfbOffset);
         else if (explicitLayout != glslang::ElpNone) {
             // figure out what to do with offset, which is accumulating
             int nextOffset;
             updateMemberOffset(type, glslangMember, offset, nextOffset, explicitLayout, memberQualifier.layoutMatrix);
             if (offset >= 0)
-                builder.addMemberDecoration(spvType, member, spv::Decoration::Offset, offset);
+                builder.addMemberDecoration(spvType, member, spv::DecorationOffset, offset);
             offset = nextOffset;
         }
 
         if (glslangMember.isMatrix() && explicitLayout != glslang::ElpNone)
-            builder.addMemberDecoration(spvType, member, spv::Decoration::MatrixStride,
+            builder.addMemberDecoration(spvType, member, spv::DecorationMatrixStride,
                                         getMatrixStride(glslangMember, explicitLayout, memberQualifier.layoutMatrix));
 
         // built-in variable decorations
         spv::BuiltIn builtIn = TranslateBuiltInDecoration(glslangMember.getQualifier().builtIn, true);
-        if (builtIn != spv::BuiltIn::Max)
-            builder.addMemberDecoration(spvType, member, spv::Decoration::BuiltIn, (int)builtIn);
+        if (builtIn != spv::BuiltInMax)
+            builder.addMemberDecoration(spvType, member, spv::DecorationBuiltIn, (int)builtIn);
 
         // nonuniform
         builder.addMemberDecoration(spvType, member, TranslateNonUniformDecoration(glslangMember.getQualifier()));
 
         if (glslangIntermediate->getHlslFunctionality1() && memberQualifier.semanticName != nullptr) {
             builder.addExtension("SPV_GOOGLE_hlsl_functionality1");
-            builder.addMemberDecoration(spvType, member, spv::Decoration::HlslSemanticGOOGLE,
+            builder.addMemberDecoration(spvType, member, (spv::Decoration)spv::DecorationHlslSemanticGOOGLE,
                                         memberQualifier.semanticName);
         }
 
-        if (builtIn == spv::BuiltIn::Layer) {
+        if (builtIn == spv::BuiltInLayer) {
             // SPV_NV_viewport_array2 extension
             if (glslangMember.getQualifier().layoutViewportRelative){
-                builder.addMemberDecoration(spvType, member, spv::Decoration::ViewportRelativeNV);
-                builder.addCapability(spv::Capability::ShaderViewportMaskNV);
+                builder.addMemberDecoration(spvType, member, (spv::Decoration)spv::DecorationViewportRelativeNV);
+                builder.addCapability(spv::CapabilityShaderViewportMaskNV);
                 builder.addExtension(spv::E_SPV_NV_viewport_array2);
             }
             if (glslangMember.getQualifier().layoutSecondaryViewportRelativeOffset != -2048){
                 builder.addMemberDecoration(spvType, member,
-                                            spv::Decoration::SecondaryViewportRelativeNV,
+                                            (spv::Decoration)spv::DecorationSecondaryViewportRelativeNV,
                                             glslangMember.getQualifier().layoutSecondaryViewportRelativeOffset);
-                builder.addCapability(spv::Capability::ShaderStereoViewNV);
+                builder.addCapability(spv::CapabilityShaderStereoViewNV);
                 builder.addExtension(spv::E_SPV_NV_stereo_view_rendering);
             }
         }
         if (glslangMember.getQualifier().layoutPassthrough) {
-            builder.addMemberDecoration(spvType, member, spv::Decoration::PassthroughNV);
-            builder.addCapability(spv::Capability::GeometryShaderPassthroughNV);
+            builder.addMemberDecoration(spvType, member, (spv::Decoration)spv::DecorationPassthroughNV);
+            builder.addCapability(spv::CapabilityGeometryShaderPassthroughNV);
             builder.addExtension(spv::E_SPV_NV_geometry_shader_passthrough);
         }
 
@@ -6037,23 +5075,21 @@ void TGlslangToSpvTraverser::decorateStructType(const glslang::TType& type,
     if (basicType == glslang::EbtBlock) {
         builder.addDecoration(spvType, TranslateBlockDecoration(typeStorageQualifier, glslangIntermediate->usingStorageBuffer()));
     } else if (basicType == glslang::EbtStruct && glslangIntermediate->getSpv().vulkan > 0) {
-        const auto hasRuntimeArray = !spvMembers.empty() && builder.getOpCode(spvMembers.back()) == spv::Op::OpTypeRuntimeArray;
+        const auto hasRuntimeArray = !spvMembers.empty() && builder.getOpCode(spvMembers.back()) == spv::OpTypeRuntimeArray;
         if (hasRuntimeArray) {
             builder.addDecoration(spvType, TranslateBlockDecoration(typeStorageQualifier, glslangIntermediate->usingStorageBuffer()));
         }
     }
 
     if (qualifier.hasHitObjectShaderRecordNV())
-        builder.addDecoration(spvType, spv::Decoration::HitObjectShaderRecordBufferNV);
-    if (qualifier.hasHitObjectShaderRecordEXT())
-        builder.addDecoration(spvType, spv::Decoration::HitObjectShaderRecordBufferEXT);
+        builder.addDecoration(spvType, spv::DecorationHitObjectShaderRecordBufferNV);
 }
 
 // Turn the expression forming the array size into an id.
 // This is not quite trivial, because of specialization constants.
 // Sometimes, a raw constant is turned into an Id, and sometimes
 // a specialization constant expression is.
-spv::Id TGlslangToSpvTraverser::makeArraySizeId(const glslang::TArraySizes& arraySizes, int dim, bool allowZero, bool boolType)
+spv::Id TGlslangToSpvTraverser::makeArraySizeId(const glslang::TArraySizes& arraySizes, int dim, bool allowZero)
 {
     // First, see if this is sized with a node, meaning a specialization constant:
     glslang::TIntermTyped* specNode = arraySizes.getDimNode(dim);
@@ -6071,11 +5107,7 @@ spv::Id TGlslangToSpvTraverser::makeArraySizeId(const glslang::TArraySizes& arra
     if (!allowZero)
         assert(size > 0);
 
-    if (boolType) {
-        return builder.makeBoolConstant(size);
-    } else {
-        return builder.makeUintConstant(size);
-    }
+    return builder.makeUintConstant(size);
 }
 
 // Wrap the builder's accessChainLoad to:
@@ -6090,14 +5122,14 @@ spv::Id TGlslangToSpvTraverser::accessChainLoad(const glslang::TType& type)
     spv::Builder::AccessChain::CoherentFlags coherentFlags = builder.getAccessChain().coherentFlags;
     coherentFlags |= TranslateCoherent(type);
 
-    spv::MemoryAccessMask accessMask = spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) & ~spv::MemoryAccessMask::MakePointerAvailableKHR);
+    spv::MemoryAccessMask accessMask = spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) & ~spv::MemoryAccessMakePointerAvailableKHRMask);
     // If the value being loaded is HelperInvocation, SPIR-V 1.6 is being generated (so that
     // SPV_EXT_demote_to_helper_invocation is in core) and the memory model is in use, add
     // the Volatile MemoryAccess semantic.
     if (type.getQualifier().builtIn == glslang::EbvHelperInvocation &&
         glslangIntermediate->usingVulkanMemoryModel() &&
         glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6) {
-        accessMask = spv::MemoryAccessMask(accessMask | spv::MemoryAccessMask::Volatile);
+        accessMask = spv::MemoryAccessMask(accessMask | spv::MemoryAccessVolatileMask);
     }
 
     unsigned int alignment = builder.getAccessChain().alignment;
@@ -6136,9 +5168,9 @@ void TGlslangToSpvTraverser::accessChainStore(const glslang::TType& type, spv::I
                 // keep these outside arguments, for determinant order-of-evaluation
                 spv::Id one = builder.makeUintConstant(1);
                 spv::Id zero = builder.makeUintConstant(0);
-                rvalue = builder.createTriOp(spv::Op::OpSelect, nominalTypeId, rvalue, one, zero);
+                rvalue = builder.createTriOp(spv::OpSelect, nominalTypeId, rvalue, one, zero);
             } else if (builder.getTypeId(rvalue) != boolType)
-                rvalue = builder.createBinOp(spv::Op::OpINotEqual, boolType, rvalue, builder.makeUintConstant(0));
+                rvalue = builder.createBinOp(spv::OpINotEqual, boolType, rvalue, builder.makeUintConstant(0));
         } else if (builder.isVectorType(nominalTypeId)) {
             // Conversion for bvec
             int vecSize = builder.getNumTypeComponents(nominalTypeId);
@@ -6147,9 +5179,9 @@ void TGlslangToSpvTraverser::accessChainStore(const glslang::TType& type, spv::I
                 // keep these outside arguments, for determinant order-of-evaluation
                 spv::Id one = makeSmearedConstant(builder.makeUintConstant(1), vecSize);
                 spv::Id zero = makeSmearedConstant(builder.makeUintConstant(0), vecSize);
-                rvalue = builder.createTriOp(spv::Op::OpSelect, nominalTypeId, rvalue, one, zero);
+                rvalue = builder.createTriOp(spv::OpSelect, nominalTypeId, rvalue, one, zero);
             } else if (builder.getTypeId(rvalue) != bvecType)
-                rvalue = builder.createBinOp(spv::Op::OpINotEqual, bvecType, rvalue,
+                rvalue = builder.createBinOp(spv::OpINotEqual, bvecType, rvalue,
                                              makeSmearedConstant(builder.makeUintConstant(0), vecSize));
         }
     }
@@ -6162,7 +5194,7 @@ void TGlslangToSpvTraverser::accessChainStore(const glslang::TType& type, spv::I
 
     builder.accessChainStore(rvalue, TranslateNonUniformDecoration(builder.getAccessChain().coherentFlags),
                              spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) &
-                                ~spv::MemoryAccessMask::MakePointerVisibleKHR),
+                                ~spv::MemoryAccessMakePointerVisibleKHRMask),
                              TranslateMemoryScope(coherentFlags), alignment);
 }
 
@@ -6203,10 +5235,10 @@ void TGlslangToSpvTraverser::multiTypeStore(const glslang::TType& type, spv::Id
         // However, bool in uniform space is changed to int, so
         // OpCopyLogical does not work for that.
         // TODO: It would be more robust to do a full recursive verification of the types satisfying SPIR-V rules.
-        bool rBool = builder.containsType(builder.getTypeId(rValue), spv::Op::OpTypeBool, 0);
-        bool lBool = builder.containsType(lType, spv::Op::OpTypeBool, 0);
+        bool rBool = builder.containsType(builder.getTypeId(rValue), spv::OpTypeBool, 0);
+        bool lBool = builder.containsType(lType, spv::OpTypeBool, 0);
         if (lBool == rBool) {
-            spv::Id logicalCopy = builder.createUnaryOp(spv::Op::OpCopyLogical, lType, rValue);
+            spv::Id logicalCopy = builder.createUnaryOp(spv::OpCopyLogical, lType, rValue);
             accessChainStore(type, logicalCopy);
             return;
         }
@@ -6370,16 +5402,13 @@ void TGlslangToSpvTraverser::updateMemberOffset(const glslang::TType& structType
             memberAlignment = componentAlignment;
 
         // Don't add unnecessary padding after this member
-        // (undo std140 bumping size to a mutliple of vec4)
-        if (explicitLayout == glslang::ElpStd140) {
-            if (memberType.isMatrix()) {
-                if (matrixLayout == glslang::ElmRowMajor)
-                    memberSize -= componentSize * (4 - memberType.getMatrixCols());
-                else
-                    memberSize -= componentSize * (4 - memberType.getMatrixRows());
-            } else if (memberType.isArray())
-                memberSize -= componentSize * (4 - memberType.getVectorSize());
-        }
+        if (memberType.isMatrix()) {
+            if (matrixLayout == glslang::ElmRowMajor)
+                memberSize -= componentSize * (4 - memberType.getMatrixCols());
+            else
+                memberSize -= componentSize * (4 - memberType.getMatrixRows());
+        } else if (memberType.isArray())
+            memberSize -= componentSize * (4 - memberType.getVectorSize());
     }
 
     // Bump up to member alignment
@@ -6474,11 +5503,11 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
                 !writableParam(type.getQualifier().storage)) {
                 // TranslateMemoryDecoration added Restrict decoration already.
                 if (!type.getQualifier().isRestrict()) {
-                    decorations.push_back(spv::Decoration::Aliased);
+                    decorations.push_back(spv::DecorationAliased);
                 }
             } else {
-                decorations.push_back(type.getQualifier().isRestrict() ? spv::Decoration::RestrictPointerEXT :
-                                                                         spv::Decoration::AliasedPointerEXT);
+                decorations.push_back(type.getQualifier().isRestrict() ? spv::DecorationRestrictPointerEXT :
+                                                                         spv::DecorationAliasedPointerEXT);
             }
         }
     };
@@ -6487,16 +5516,12 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
         glslang::TIntermAggregate* glslFunction = glslFunctions[f]->getAsAggregate();
         if (! glslFunction || glslFunction->getOp() != glslang::EOpFunction)
             continue;
-
-        builder.setDebugSourceLocation(glslFunction->getLoc().line, glslFunction->getLoc().getFilename());
-
         if (isShaderEntryPoint(glslFunction)) {
-            // For HLSL, the entry function is actually a compiler generated function to resolve the difference of
-            // entry function signature between HLSL and SPIR-V. So we don't emit debug information for that.
             if (glslangIntermediate->getSource() != glslang::EShSourceHlsl) {
-                builder.setupFunctionDebugInfo(shaderEntry, glslangIntermediate->getEntryPointMangledName().c_str(),
-                                               std::vector<spv::Id>(), // main function has no param
-                                               std::vector<char const*>());
+                builder.setupDebugFunctionEntry(shaderEntry, glslangIntermediate->getEntryPointMangledName().c_str(),
+                                                glslFunction->getLoc().line,
+                                                std::vector<spv::Id>(), // main function has no param
+                                                std::vector<char const*>());
             }
             continue;
         }
@@ -6533,7 +5558,7 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
             if (originalParam(paramType.getQualifier().storage, paramType, implicitThis && p == 0))
                 typeId = builder.makePointer(TranslateStorageClass(paramType), typeId);
             else if (writableParam(paramType.getQualifier().storage))
-                typeId = builder.makePointer(spv::StorageClass::Function, typeId);
+                typeId = builder.makePointer(spv::StorageClassFunction, typeId);
             else
                 rValueParameters.insert(parameters[p]->getAsSymbolNode()->getId());
             getParamDecorations(paramDecorations[p], paramType, glslangIntermediate->usingVulkanMemoryModel());
@@ -6549,7 +5574,8 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
             TranslatePrecisionDecoration(glslFunction->getType()), convertGlslangToSpvType(glslFunction->getType()),
             glslFunction->getName().c_str(), convertGlslangLinkageToSpv(glslFunction->getLinkType()), paramTypes,
             paramDecorations, &functionBlock);
-        builder.setupFunctionDebugInfo(function, glslFunction->getName().c_str(), paramTypes, paramNames);
+        builder.setupDebugFunctionEntry(function, glslFunction->getName().c_str(), glslFunction->getLoc().line,
+                                        paramTypes, paramNames);
         if (implicitThis)
             function->setImplicitThis();
 
@@ -6564,11 +5590,11 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
 
             const glslang::TType& paramType = parameters[p]->getAsTyped()->getType();
             if (paramType.contains8BitInt())
-                builder.addCapability(spv::Capability::Int8);
+                builder.addCapability(spv::CapabilityInt8);
             if (paramType.contains16BitInt())
-                builder.addCapability(spv::Capability::Int16);
+                builder.addCapability(spv::CapabilityInt16);
             if (paramType.contains16BitFloat())
-                builder.addCapability(spv::Capability::Float16);
+                builder.addCapability(spv::CapabilityFloat16);
         }
     }
 }
@@ -6613,7 +5639,6 @@ void TGlslangToSpvTraverser::collectRayTracingLinkerObjects()
                     break;
 
                 case glslang::EvqHitObjectAttrNV:
-                case glslang::EvqHitObjectAttrEXT:
                     set = 2;
                     break;
 
@@ -6636,6 +5661,16 @@ void TGlslangToSpvTraverser::visitFunctions(const glslang::TIntermSequence& glsl
     }
 }
 
+void TGlslangToSpvTraverser::handleFunctionEntry(const glslang::TIntermAggregate* node)
+{
+    // SPIR-V functions should already be in the functionMap from the prepass
+    // that called makeFunctions().
+    currentFunction = functionMap[node->getName().c_str()];
+    spv::Block* functionBlock = currentFunction->getEntryBlock();
+    builder.setBuildPoint(functionBlock);
+    builder.enterFunction(currentFunction);
+}
+
 void TGlslangToSpvTraverser::translateArguments(const glslang::TIntermAggregate& node, std::vector<spv::Id>& arguments,
     spv::Builder::AccessChain::CoherentFlags &lvalueCoherentFlags)
 {
@@ -6751,15 +5786,9 @@ void TGlslangToSpvTraverser::translateArguments(const glslang::TIntermAggregate&
                 lvalue = true;
             break;
         case glslang::EOpRayQueryGetIntersectionTriangleVertexPositionsEXT:
-        case glslang::EOpRayQueryGetIntersectionLSSPositionsNV:
-        case glslang::EOpRayQueryGetIntersectionLSSRadiiNV:
             if (i == 2)
                 lvalue = true;
             break;
-        case glslang::EOpConstructSaturated:
-            if (i == 0)
-                lvalue = true;
-            break;
         default:
             break;
         }
@@ -6770,16 +5799,8 @@ void TGlslangToSpvTraverser::translateArguments(const glslang::TIntermAggregate&
             lvalueCoherentFlags = builder.getAccessChain().coherentFlags;
             builder.addDecoration(lvalue_id, TranslateNonUniformDecoration(lvalueCoherentFlags));
             lvalueCoherentFlags |= TranslateCoherent(glslangArguments[i]->getAsTyped()->getType());
-        } else {
-            if (i > 0 &&
-                glslangArguments[i]->getAsSymbolNode() && glslangArguments[i-1]->getAsSymbolNode() &&
-                glslangArguments[i]->getAsSymbolNode()->getId() == glslangArguments[i-1]->getAsSymbolNode()->getId()) {
-                // Reuse the id if possible
-                arguments.push_back(arguments[i-1]);
-            } else {
-                arguments.push_back(accessChainLoad(glslangArguments[i]->getAsTyped()->getType()));
-            }
-        }
+        } else
+            arguments.push_back(accessChainLoad(glslangArguments[i]->getAsTyped()->getType()));
     }
 }
 
@@ -6810,11 +5831,11 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
     const auto signExtensionMask = [&]() {
         if (builder.getSpvVersion() >= spv::Spv_1_4) {
             if (sampler.type == glslang::EbtUint)
-                return spv::ImageOperandsMask::ZeroExtend;
+                return spv::ImageOperandsZeroExtendMask;
             else if (sampler.type == glslang::EbtInt)
-                return spv::ImageOperandsMask::SignExtend;
+                return spv::ImageOperandsSignExtendMask;
         }
-        return spv::ImageOperandsMask::MaskNone;
+        return spv::ImageOperandsMaskNone;
     };
 
     spv::Builder::AccessChain::CoherentFlags lvalueCoherentFlags;
@@ -6836,9 +5857,9 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
 
     if (builder.isSampledImage(params.sampler) &&
         ((cracked.query && node->getOp() != glslang::EOpTextureQueryLod) || cracked.fragMask || cracked.fetch)) {
-        params.sampler = builder.createUnaryOp(spv::Op::OpImage, builder.getImageType(params.sampler), params.sampler);
+        params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
         if (imageType.getQualifier().isNonUniform()) {
-            builder.addDecoration(params.sampler, spv::Decoration::NonUniformEXT);
+            builder.addDecoration(params.sampler, spv::DecorationNonUniformEXT);
         }
     }
     // Check for queries
@@ -6848,19 +5869,19 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         case glslang::EOpTextureQuerySize:
             if (arguments.size() > 1) {
                 params.lod = arguments[1];
-                return builder.createTextureQueryCall(spv::Op::OpImageQuerySizeLod, params, isUnsignedResult);
+                return builder.createTextureQueryCall(spv::OpImageQuerySizeLod, params, isUnsignedResult);
             } else
-                return builder.createTextureQueryCall(spv::Op::OpImageQuerySize, params, isUnsignedResult);
+                return builder.createTextureQueryCall(spv::OpImageQuerySize, params, isUnsignedResult);
         case glslang::EOpImageQuerySamples:
         case glslang::EOpTextureQuerySamples:
-            return builder.createTextureQueryCall(spv::Op::OpImageQuerySamples, params, isUnsignedResult);
+            return builder.createTextureQueryCall(spv::OpImageQuerySamples, params, isUnsignedResult);
         case glslang::EOpTextureQueryLod:
             params.coords = arguments[1];
-            return builder.createTextureQueryCall(spv::Op::OpImageQueryLod, params, isUnsignedResult);
+            return builder.createTextureQueryCall(spv::OpImageQueryLod, params, isUnsignedResult);
         case glslang::EOpTextureQueryLevels:
-            return builder.createTextureQueryCall(spv::Op::OpImageQueryLevels, params, isUnsignedResult);
+            return builder.createTextureQueryCall(spv::OpImageQueryLevels, params, isUnsignedResult);
         case glslang::EOpSparseTexelsResident:
-            return builder.createUnaryOp(spv::Op::OpImageSparseTexelsResident, builder.makeBoolType(), arguments[0]);
+            return builder.createUnaryOp(spv::OpImageSparseTexelsResident, builder.makeBoolType(), arguments[0]);
         default:
             assert(0);
             break;
@@ -6903,19 +5924,19 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
             spv::IdImmediate coord = { true,
                 builder.makeCompositeConstant(builder.makeVectorType(builder.makeIntType(32), 2), comps) };
             operands.push_back(coord);
-            spv::IdImmediate imageOperands = { false, spv::ImageOperandsMask::MaskNone };
-            imageOperands.word = imageOperands.word | (unsigned)signExtensionMask();
+            spv::IdImmediate imageOperands = { false, spv::ImageOperandsMaskNone };
+            imageOperands.word = imageOperands.word | signExtensionMask();
             if (sampler.isMultiSample()) {
-                imageOperands.word = imageOperands.word | (unsigned)spv::ImageOperandsMask::Sample;
+                imageOperands.word = imageOperands.word | spv::ImageOperandsSampleMask;
             }
-            if (imageOperands.word != (unsigned)spv::ImageOperandsMask::MaskNone) {
+            if (imageOperands.word != spv::ImageOperandsMaskNone) {
                 operands.push_back(imageOperands);
                 if (sampler.isMultiSample()) {
                     spv::IdImmediate imageOperand = { true, *(opIt++) };
                     operands.push_back(imageOperand);
                 }
             }
-            spv::Id result = builder.createOp(spv::Op::OpImageRead, resultType(), operands);
+            spv::Id result = builder.createOp(spv::OpImageRead, resultType(), operands);
             builder.setPrecision(result, precision);
             return result;
         }
@@ -6925,7 +5946,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
                 spv::IdImmediate sample = { true, *opIt };
                 operands.push_back(sample);
             }
-            spv::Id result = builder.createOp(spv::Op::OpColorAttachmentReadEXT, resultType(), operands);
+            spv::Id result = builder.createOp(spv::OpColorAttachmentReadEXT, resultType(), operands);
             builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
             builder.setPrecision(result, precision);
             return result;
@@ -6934,40 +5955,40 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         spv::IdImmediate coord = { true, *(opIt++) };
         operands.push_back(coord);
         if (node->getOp() == glslang::EOpImageLoad || node->getOp() == glslang::EOpImageLoadLod) {
-            spv::ImageOperandsMask mask = spv::ImageOperandsMask::MaskNone;
+            spv::ImageOperandsMask mask = spv::ImageOperandsMaskNone;
             if (sampler.isMultiSample()) {
-                mask = mask | spv::ImageOperandsMask::Sample;
+                mask = mask | spv::ImageOperandsSampleMask;
             }
             if (cracked.lod) {
                 builder.addExtension(spv::E_SPV_AMD_shader_image_load_store_lod);
-                builder.addCapability(spv::Capability::ImageReadWriteLodAMD);
-                mask = mask | spv::ImageOperandsMask::Lod;
+                builder.addCapability(spv::CapabilityImageReadWriteLodAMD);
+                mask = mask | spv::ImageOperandsLodMask;
             }
             mask = mask | TranslateImageOperands(TranslateCoherent(imageType));
-            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMask::MakeTexelAvailableKHR);
+            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMakeTexelAvailableKHRMask);
             mask = mask | signExtensionMask();
-            if (mask != spv::ImageOperandsMask::MaskNone) {
+            if (mask != spv::ImageOperandsMaskNone) {
                 spv::IdImmediate imageOperands = { false, (unsigned int)mask };
                 operands.push_back(imageOperands);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Sample)) {
+            if (mask & spv::ImageOperandsSampleMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Lod)) {
+            if (mask & spv::ImageOperandsLodMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::MakeTexelVisibleKHR)) {
+            if (mask & spv::ImageOperandsMakeTexelVisibleKHRMask) {
                 spv::IdImmediate imageOperand = { true,
                                     builder.makeUintConstant(TranslateMemoryScope(TranslateCoherent(imageType))) };
                 operands.push_back(imageOperand);
             }
 
-            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormat::Unknown)
-                builder.addCapability(spv::Capability::StorageImageReadWithoutFormat);
+            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormatUnknown)
+                builder.addCapability(spv::CapabilityStorageImageReadWithoutFormat);
 
-            std::vector<spv::Id> result(1, builder.createOp(spv::Op::OpImageRead, resultType(), operands));
+            std::vector<spv::Id> result(1, builder.createOp(spv::OpImageRead, resultType(), operands));
             builder.setPrecision(result[0], precision);
 
             // If needed, add a conversion constructor to the proper size.
@@ -6986,72 +6007,72 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
                 operands.push_back(texel);
             }
 
-            spv::ImageOperandsMask mask = spv::ImageOperandsMask::MaskNone;
+            spv::ImageOperandsMask mask = spv::ImageOperandsMaskNone;
             if (sampler.isMultiSample()) {
-                mask = mask | spv::ImageOperandsMask::Sample;
+                mask = mask | spv::ImageOperandsSampleMask;
             }
             if (cracked.lod) {
                 builder.addExtension(spv::E_SPV_AMD_shader_image_load_store_lod);
-                builder.addCapability(spv::Capability::ImageReadWriteLodAMD);
-                mask = mask | spv::ImageOperandsMask::Lod;
+                builder.addCapability(spv::CapabilityImageReadWriteLodAMD);
+                mask = mask | spv::ImageOperandsLodMask;
             }
             mask = mask | TranslateImageOperands(TranslateCoherent(imageType));
-            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMask::MakeTexelVisibleKHR);
+            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMakeTexelVisibleKHRMask);
             mask = mask | signExtensionMask();
-            if (mask != spv::ImageOperandsMask::MaskNone) {
+            if (mask != spv::ImageOperandsMaskNone) {
                 spv::IdImmediate imageOperands = { false, (unsigned int)mask };
                 operands.push_back(imageOperands);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Sample)) {
+            if (mask & spv::ImageOperandsSampleMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Lod)) {
+            if (mask & spv::ImageOperandsLodMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::MakeTexelAvailableKHR)) {
+            if (mask & spv::ImageOperandsMakeTexelAvailableKHRMask) {
                 spv::IdImmediate imageOperand = { true,
                     builder.makeUintConstant(TranslateMemoryScope(TranslateCoherent(imageType))) };
                 operands.push_back(imageOperand);
             }
 
-            builder.createNoResultOp(spv::Op::OpImageWrite, operands);
-            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormat::Unknown)
-                builder.addCapability(spv::Capability::StorageImageWriteWithoutFormat);
+            builder.createNoResultOp(spv::OpImageWrite, operands);
+            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormatUnknown)
+                builder.addCapability(spv::CapabilityStorageImageWriteWithoutFormat);
             return spv::NoResult;
         } else if (node->getOp() == glslang::EOpSparseImageLoad ||
                    node->getOp() == glslang::EOpSparseImageLoadLod) {
-            builder.addCapability(spv::Capability::SparseResidency);
-            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormat::Unknown)
-                builder.addCapability(spv::Capability::StorageImageReadWithoutFormat);
+            builder.addCapability(spv::CapabilitySparseResidency);
+            if (builder.getImageTypeFormat(builder.getImageType(operands.front().word)) == spv::ImageFormatUnknown)
+                builder.addCapability(spv::CapabilityStorageImageReadWithoutFormat);
 
-            spv::ImageOperandsMask mask = spv::ImageOperandsMask::MaskNone;
+            spv::ImageOperandsMask mask = spv::ImageOperandsMaskNone;
             if (sampler.isMultiSample()) {
-                mask = mask | spv::ImageOperandsMask::Sample;
+                mask = mask | spv::ImageOperandsSampleMask;
             }
             if (cracked.lod) {
                 builder.addExtension(spv::E_SPV_AMD_shader_image_load_store_lod);
-                builder.addCapability(spv::Capability::ImageReadWriteLodAMD);
+                builder.addCapability(spv::CapabilityImageReadWriteLodAMD);
 
-                mask = mask | spv::ImageOperandsMask::Lod;
+                mask = mask | spv::ImageOperandsLodMask;
             }
             mask = mask | TranslateImageOperands(TranslateCoherent(imageType));
-            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMask::MakeTexelAvailableKHR);
+            mask = (spv::ImageOperandsMask)(mask & ~spv::ImageOperandsMakeTexelAvailableKHRMask);
             mask = mask | signExtensionMask();
-            if (mask != spv::ImageOperandsMask::MaskNone) {
+            if (mask != spv::ImageOperandsMaskNone) {
                 spv::IdImmediate imageOperands = { false, (unsigned int)mask };
                 operands.push_back(imageOperands);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Sample)) {
+            if (mask & spv::ImageOperandsSampleMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::Lod)) {
+            if (mask & spv::ImageOperandsLodMask) {
                 spv::IdImmediate imageOperand = { true, *opIt++ };
                 operands.push_back(imageOperand);
             }
-            if (anySet(mask, spv::ImageOperandsMask::MakeTexelVisibleKHR)) {
+            if (mask & spv::ImageOperandsMakeTexelVisibleKHRMask) {
                 spv::IdImmediate imageOperand = { true, builder.makeUintConstant(TranslateMemoryScope(
                     TranslateCoherent(imageType))) };
                 operands.push_back(imageOperand);
@@ -7063,7 +6084,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
             spv::Id typeId1 = builder.getDerefTypeId(texelOut);
             spv::Id resultTypeId = builder.makeStructResultType(typeId0, typeId1);
 
-            spv::Id resultId = builder.createOp(spv::Op::OpImageSparseRead, resultTypeId, operands);
+            spv::Id resultId = builder.createOp(spv::OpImageSparseRead, resultTypeId, operands);
 
             // Decode the return type
             builder.createStore(builder.createCompositeExtract(resultId, typeId1, 1), texelOut);
@@ -7082,14 +6103,14 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
             // imageAtomicStore has a void return type so base the pointer type on
             // the type of the value operand.
             if (node->getOp() == glslang::EOpImageAtomicStore) {
-                resultTypeId = builder.makePointer(spv::StorageClass::Image, builder.getTypeId(*opIt));
+                resultTypeId = builder.makePointer(spv::StorageClassImage, builder.getTypeId(*opIt));
                 typeProxy = node->getAsAggregate()->getSequence()[0]->getAsTyped()->getType().getSampler().type;
             } else {
-                resultTypeId = builder.makePointer(spv::StorageClass::Image, resultType());
+                resultTypeId = builder.makePointer(spv::StorageClassImage, resultType());
             }
-            spv::Id pointer = builder.createOp(spv::Op::OpImageTexelPointer, resultTypeId, operands);
+            spv::Id pointer = builder.createOp(spv::OpImageTexelPointer, resultTypeId, operands);
             if (imageType.getQualifier().nonUniform) {
-                builder.addDecoration(pointer, spv::Decoration::NonUniformEXT);
+                builder.addDecoration(pointer, spv::DecorationNonUniformEXT);
             }
 
             std::vector<spv::Id> operands;
@@ -7125,14 +6146,14 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         for (; opIt != arguments.end(); ++opIt)
             operands.push_back(*opIt);
 
-        spv::Op fragMaskOp = spv::Op::OpNop;
+        spv::Op fragMaskOp = spv::OpNop;
         if (node->getOp() == glslang::EOpFragmentMaskFetch)
-            fragMaskOp = spv::Op::OpFragmentMaskFetchAMD;
+            fragMaskOp = spv::OpFragmentMaskFetchAMD;
         else if (node->getOp() == glslang::EOpFragmentFetch)
-            fragMaskOp = spv::Op::OpFragmentFetchAMD;
+            fragMaskOp = spv::OpFragmentFetchAMD;
 
         builder.addExtension(spv::E_SPV_AMD_shader_fragment_mask);
-        builder.addCapability(spv::Capability::FragmentMaskAMD);
+        builder.addCapability(spv::CapabilityFragmentMaskAMD);
         return builder.createOp(fragMaskOp, resultType(), operands);
     }
 
@@ -7173,7 +6194,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         if (bias || cracked.lod ||
             sourceExtensions.find(glslang::E_GL_AMD_texture_gather_bias_lod) != sourceExtensions.end()) {
             builder.addExtension(spv::E_SPV_AMD_texture_gather_bias_lod);
-            builder.addCapability(spv::Capability::ImageGatherBiasLodAMD);
+            builder.addCapability(spv::CapabilityImageGatherBiasLodAMD);
         }
     }
 
@@ -7272,7 +6293,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
 
     if (imageFootprint) {
         builder.addExtension(spv::E_SPV_NV_shader_image_footprint);
-        builder.addCapability(spv::Capability::ImageFootprintNV);
+        builder.addCapability(spv::CapabilityImageFootprintNV);
 
 
         //resultStructType(OpenGL type) contains 5 elements:
@@ -7306,7 +6327,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         for (int i = 0; i < 5; i++) {
             members.push_back(builder.getContainedTypeId(resultStructType, i));
         }
-        spv::Id resType = builder.makeStructType(members, {}, "ResType");
+        spv::Id resType = builder.makeStructType(members, "ResType");
 
         //call ImageFootprintNV
         spv::Id res = builder.createTextureCall(precision, resType, sparse, cracked.fetch, cracked.proj,
@@ -7361,10 +6382,6 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
         params.volatil = true;
     }
 
-    if (imageType.getQualifier().nontemporal) {
-        params.nontemporal = true;
-    }
-
     std::vector<spv::Id> result( 1,
         builder.createTextureCall(precision, resultType(), sparse, cracked.fetch, cracked.proj, cracked.gather,
                                   noImplicitLod, params, signExtensionMask())
@@ -7414,9 +6431,6 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
         }
     }
 
-    // Reset source location to the function call location after argument evaluation
-    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
-
     // 2. Allocate space for anything needing a copy, and if it's "in" or "inout"
     // copy the original into that space.
     //
@@ -7432,7 +6446,7 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
             ++lValueCount;
         } else if (writableParam(qualifiers[a])) {
             // need space to hold the copy
-            arg = builder.createVariable(function->getParamPrecision(a), spv::StorageClass::Function,
+            arg = builder.createVariable(function->getParamPrecision(a), spv::StorageClassFunction,
                 builder.getContainedTypeId(function->getParamType(a)), "param");
             if (qualifiers[a] == glslang::EvqIn || qualifiers[a] == glslang::EvqInOut) {
                 // need to copy the input into output space
@@ -7448,7 +6462,7 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
             if (function->getParamType(a) != builder.getTypeId(rValues[rValueCount]) ||
                 TranslatePrecisionDecoration(*argTypes[a]) != function->getParamPrecision(a))
             {
-                spv::Id argCopy = builder.createVariable(function->getParamPrecision(a), spv::StorageClass::Function, function->getParamType(a), "arg");
+                spv::Id argCopy = builder.createVariable(function->getParamPrecision(a), spv::StorageClassFunction, function->getParamType(a), "arg");
                 builder.clearAccessChain();
                 builder.setAccessChainLValue(argCopy);
                 multiTypeStore(*argTypes[a], rValues[rValueCount]);
@@ -7493,7 +6507,7 @@ spv::Id TGlslangToSpvTraverser::createBinaryOperation(glslang::TOperator op, OpD
     bool isFloat = isTypeFloat(typeProxy);
     bool isBool = typeProxy == glslang::EbtBool;
 
-    spv::Op binOp = spv::Op::OpNop;
+    spv::Op binOp = spv::OpNop;
     bool needMatchingVectors = true;  // for non-matrix ops, would a scalar need to smear to match a vector?
     bool comparison = false;
 
@@ -7501,145 +6515,137 @@ spv::Id TGlslangToSpvTraverser::createBinaryOperation(glslang::TOperator op, OpD
     case glslang::EOpAdd:
     case glslang::EOpAddAssign:
         if (isFloat)
-            binOp = spv::Op::OpFAdd;
+            binOp = spv::OpFAdd;
         else
-            binOp = spv::Op::OpIAdd;
+            binOp = spv::OpIAdd;
         break;
     case glslang::EOpSub:
     case glslang::EOpSubAssign:
         if (isFloat)
-            binOp = spv::Op::OpFSub;
+            binOp = spv::OpFSub;
         else
-            binOp = spv::Op::OpISub;
+            binOp = spv::OpISub;
         break;
     case glslang::EOpMul:
     case glslang::EOpMulAssign:
         if (isFloat)
-            binOp = spv::Op::OpFMul;
+            binOp = spv::OpFMul;
         else
-            binOp = spv::Op::OpIMul;
+            binOp = spv::OpIMul;
         break;
     case glslang::EOpVectorTimesScalar:
     case glslang::EOpVectorTimesScalarAssign:
-        if (isFloat && (builder.isVector(left) || builder.isVector(right) || builder.isCooperativeVector(left) || builder.isCooperativeVector(right))) {
-            if (builder.isVector(right) || builder.isCooperativeVector(right))
+        if (isFloat && (builder.isVector(left) || builder.isVector(right))) {
+            if (builder.isVector(right))
                 std::swap(left, right);
             assert(builder.isScalar(right));
             needMatchingVectors = false;
-            binOp = spv::Op::OpVectorTimesScalar;
-        } else if (isFloat) {
-            binOp = spv::Op::OpFMul;
-        } else if (builder.isCooperativeVector(left) || builder.isCooperativeVector(right)) {
-            if (builder.isCooperativeVector(right))
-                std::swap(left, right);
-            assert(builder.isScalar(right));
-            // Construct a cooperative vector from the scalar
-            right = builder.createCompositeConstruct(builder.getTypeId(left), { right });
-            binOp = spv::Op::OpIMul;
-        } else {
-            binOp = spv::Op::OpIMul;
-        }
+            binOp = spv::OpVectorTimesScalar;
+        } else if (isFloat)
+            binOp = spv::OpFMul;
+          else
+            binOp = spv::OpIMul;
         break;
     case glslang::EOpVectorTimesMatrix:
     case glslang::EOpVectorTimesMatrixAssign:
-        binOp = spv::Op::OpVectorTimesMatrix;
+        binOp = spv::OpVectorTimesMatrix;
         break;
     case glslang::EOpMatrixTimesVector:
-        binOp = spv::Op::OpMatrixTimesVector;
+        binOp = spv::OpMatrixTimesVector;
         break;
     case glslang::EOpMatrixTimesScalar:
     case glslang::EOpMatrixTimesScalarAssign:
-        binOp = spv::Op::OpMatrixTimesScalar;
+        binOp = spv::OpMatrixTimesScalar;
         break;
     case glslang::EOpMatrixTimesMatrix:
     case glslang::EOpMatrixTimesMatrixAssign:
-        binOp = spv::Op::OpMatrixTimesMatrix;
+        binOp = spv::OpMatrixTimesMatrix;
         break;
     case glslang::EOpOuterProduct:
-        binOp = spv::Op::OpOuterProduct;
+        binOp = spv::OpOuterProduct;
         needMatchingVectors = false;
         break;
 
     case glslang::EOpDiv:
     case glslang::EOpDivAssign:
         if (isFloat)
-            binOp = spv::Op::OpFDiv;
+            binOp = spv::OpFDiv;
         else if (isUnsigned)
-            binOp = spv::Op::OpUDiv;
+            binOp = spv::OpUDiv;
         else
-            binOp = spv::Op::OpSDiv;
+            binOp = spv::OpSDiv;
         break;
     case glslang::EOpMod:
     case glslang::EOpModAssign:
         if (isFloat)
-            binOp = spv::Op::OpFMod;
+            binOp = spv::OpFMod;
         else if (isUnsigned)
-            binOp = spv::Op::OpUMod;
+            binOp = spv::OpUMod;
         else
-            binOp = spv::Op::OpSMod;
+            binOp = spv::OpSMod;
         break;
     case glslang::EOpRightShift:
     case glslang::EOpRightShiftAssign:
         if (isUnsigned)
-            binOp = spv::Op::OpShiftRightLogical;
+            binOp = spv::OpShiftRightLogical;
         else
-            binOp = spv::Op::OpShiftRightArithmetic;
+            binOp = spv::OpShiftRightArithmetic;
         break;
     case glslang::EOpLeftShift:
     case glslang::EOpLeftShiftAssign:
-        binOp = spv::Op::OpShiftLeftLogical;
+        binOp = spv::OpShiftLeftLogical;
         break;
     case glslang::EOpAnd:
     case glslang::EOpAndAssign:
-        binOp = spv::Op::OpBitwiseAnd;
+        binOp = spv::OpBitwiseAnd;
         break;
     case glslang::EOpLogicalAnd:
         needMatchingVectors = false;
-        binOp = spv::Op::OpLogicalAnd;
+        binOp = spv::OpLogicalAnd;
         break;
     case glslang::EOpInclusiveOr:
     case glslang::EOpInclusiveOrAssign:
-        binOp = spv::Op::OpBitwiseOr;
+        binOp = spv::OpBitwiseOr;
         break;
     case glslang::EOpLogicalOr:
         needMatchingVectors = false;
-        binOp = spv::Op::OpLogicalOr;
+        binOp = spv::OpLogicalOr;
         break;
     case glslang::EOpExclusiveOr:
     case glslang::EOpExclusiveOrAssign:
-        binOp = spv::Op::OpBitwiseXor;
+        binOp = spv::OpBitwiseXor;
         break;
     case glslang::EOpLogicalXor:
         needMatchingVectors = false;
-        binOp = spv::Op::OpLogicalNotEqual;
+        binOp = spv::OpLogicalNotEqual;
         break;
 
     case glslang::EOpAbsDifference:
-        binOp = isUnsigned ? spv::Op::OpAbsUSubINTEL : spv::Op::OpAbsISubINTEL;
+        binOp = isUnsigned ? spv::OpAbsUSubINTEL : spv::OpAbsISubINTEL;
         break;
 
     case glslang::EOpAddSaturate:
-        binOp = isUnsigned ? spv::Op::OpUAddSatINTEL : spv::Op::OpIAddSatINTEL;
+        binOp = isUnsigned ? spv::OpUAddSatINTEL : spv::OpIAddSatINTEL;
         break;
 
     case glslang::EOpSubSaturate:
-        binOp = isUnsigned ? spv::Op::OpUSubSatINTEL : spv::Op::OpISubSatINTEL;
+        binOp = isUnsigned ? spv::OpUSubSatINTEL : spv::OpISubSatINTEL;
         break;
 
     case glslang::EOpAverage:
-        binOp = isUnsigned ? spv::Op::OpUAverageINTEL : spv::Op::OpIAverageINTEL;
+        binOp = isUnsigned ? spv::OpUAverageINTEL : spv::OpIAverageINTEL;
         break;
 
     case glslang::EOpAverageRounded:
-        binOp = isUnsigned ? spv::Op::OpUAverageRoundedINTEL : spv::Op::OpIAverageRoundedINTEL;
+        binOp = isUnsigned ? spv::OpUAverageRoundedINTEL : spv::OpIAverageRoundedINTEL;
         break;
 
     case glslang::EOpMul32x16:
-        binOp = isUnsigned ? spv::Op::OpUMul32x16INTEL : spv::Op::OpIMul32x16INTEL;
+        binOp = isUnsigned ? spv::OpUMul32x16INTEL : spv::OpIMul32x16INTEL;
         break;
 
     case glslang::EOpExpectEXT:
-        binOp = spv::Op::OpExpectKHR;
+        binOp = spv::OpExpectKHR;
         break;
 
     case glslang::EOpLessThan:
@@ -7657,7 +6663,7 @@ spv::Id TGlslangToSpvTraverser::createBinaryOperation(glslang::TOperator op, OpD
     }
 
     // handle mapped binary operations (should be non-comparison)
-    if (binOp != spv::Op::OpNop) {
+    if (binOp != spv::OpNop) {
         assert(comparison == false);
         if (builder.isMatrix(left) || builder.isMatrix(right) ||
             builder.isCooperativeMatrix(left) || builder.isCooperativeMatrix(right))
@@ -7688,59 +6694,59 @@ spv::Id TGlslangToSpvTraverser::createBinaryOperation(glslang::TOperator op, OpD
     switch (op) {
     case glslang::EOpLessThan:
         if (isFloat)
-            binOp = spv::Op::OpFOrdLessThan;
+            binOp = spv::OpFOrdLessThan;
         else if (isUnsigned)
-            binOp = spv::Op::OpULessThan;
+            binOp = spv::OpULessThan;
         else
-            binOp = spv::Op::OpSLessThan;
+            binOp = spv::OpSLessThan;
         break;
     case glslang::EOpGreaterThan:
         if (isFloat)
-            binOp = spv::Op::OpFOrdGreaterThan;
+            binOp = spv::OpFOrdGreaterThan;
         else if (isUnsigned)
-            binOp = spv::Op::OpUGreaterThan;
+            binOp = spv::OpUGreaterThan;
         else
-            binOp = spv::Op::OpSGreaterThan;
+            binOp = spv::OpSGreaterThan;
         break;
     case glslang::EOpLessThanEqual:
         if (isFloat)
-            binOp = spv::Op::OpFOrdLessThanEqual;
+            binOp = spv::OpFOrdLessThanEqual;
         else if (isUnsigned)
-            binOp = spv::Op::OpULessThanEqual;
+            binOp = spv::OpULessThanEqual;
         else
-            binOp = spv::Op::OpSLessThanEqual;
+            binOp = spv::OpSLessThanEqual;
         break;
     case glslang::EOpGreaterThanEqual:
         if (isFloat)
-            binOp = spv::Op::OpFOrdGreaterThanEqual;
+            binOp = spv::OpFOrdGreaterThanEqual;
         else if (isUnsigned)
-            binOp = spv::Op::OpUGreaterThanEqual;
+            binOp = spv::OpUGreaterThanEqual;
         else
-            binOp = spv::Op::OpSGreaterThanEqual;
+            binOp = spv::OpSGreaterThanEqual;
         break;
     case glslang::EOpEqual:
     case glslang::EOpVectorEqual:
         if (isFloat)
-            binOp = spv::Op::OpFOrdEqual;
+            binOp = spv::OpFOrdEqual;
         else if (isBool)
-            binOp = spv::Op::OpLogicalEqual;
+            binOp = spv::OpLogicalEqual;
         else
-            binOp = spv::Op::OpIEqual;
+            binOp = spv::OpIEqual;
         break;
     case glslang::EOpNotEqual:
     case glslang::EOpVectorNotEqual:
         if (isFloat)
-            binOp = spv::Op::OpFUnordNotEqual;
+            binOp = spv::OpFUnordNotEqual;
         else if (isBool)
-            binOp = spv::Op::OpLogicalNotEqual;
+            binOp = spv::OpLogicalNotEqual;
         else
-            binOp = spv::Op::OpINotEqual;
+            binOp = spv::OpINotEqual;
         break;
     default:
         break;
     }
 
-    if (binOp != spv::Op::OpNop) {
+    if (binOp != spv::OpNop) {
         spv::Id result = builder.createBinOp(binOp, typeId, left, right);
         decorations.addNoContraction(builder, result);
         decorations.addNonUniform(builder, result);
@@ -7771,29 +6777,29 @@ spv::Id TGlslangToSpvTraverser::createBinaryMatrixOperation(spv::Op op, OpDecora
 
     // First, handle first-class matrix operations (* and matrix/scalar)
     switch (op) {
-    case spv::Op::OpFDiv:
+    case spv::OpFDiv:
         if (builder.isMatrix(left) && builder.isScalar(right)) {
             // turn matrix / scalar into a multiply...
             spv::Id resultType = builder.getTypeId(right);
-            right = builder.createBinOp(spv::Op::OpFDiv, resultType, builder.makeFpConstant(resultType, 1.0), right);
-            op = spv::Op::OpMatrixTimesScalar;
+            right = builder.createBinOp(spv::OpFDiv, resultType, builder.makeFpConstant(resultType, 1.0), right);
+            op = spv::OpMatrixTimesScalar;
         } else
             firstClass = false;
         break;
-    case spv::Op::OpMatrixTimesScalar:
+    case spv::OpMatrixTimesScalar:
         if (builder.isMatrix(right) || builder.isCooperativeMatrix(right))
             std::swap(left, right);
         assert(builder.isScalar(right));
         break;
-    case spv::Op::OpVectorTimesMatrix:
+    case spv::OpVectorTimesMatrix:
         assert(builder.isVector(left));
         assert(builder.isMatrix(right));
         break;
-    case spv::Op::OpMatrixTimesVector:
+    case spv::OpMatrixTimesVector:
         assert(builder.isMatrix(left));
         assert(builder.isVector(right));
         break;
-    case spv::Op::OpMatrixTimesMatrix:
+    case spv::OpMatrixTimesMatrix:
         assert(builder.isMatrix(left));
         assert(builder.isMatrix(right));
         break;
@@ -7820,11 +6826,11 @@ spv::Id TGlslangToSpvTraverser::createBinaryMatrixOperation(spv::Op op, OpDecora
     //   - do vector operations
     //   - make a matrix out the vector results
     switch (op) {
-    case spv::Op::OpFAdd:
-    case spv::Op::OpFSub:
-    case spv::Op::OpFDiv:
-    case spv::Op::OpFMod:
-    case spv::Op::OpFMul:
+    case spv::OpFAdd:
+    case spv::OpFSub:
+    case spv::OpFDiv:
+    case spv::OpFMod:
+    case spv::OpFMul:
     {
         // one time set up...
         bool  leftMat = builder.isMatrix(left);
@@ -7867,7 +6873,7 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
     spv::Id operand, glslang::TBasicType typeProxy, const spv::Builder::AccessChain::CoherentFlags &lvalueCoherentFlags,
     const glslang::TType &opType)
 {
-    spv::Op unaryOp = spv::Op::OpNop;
+    spv::Op unaryOp = spv::OpNop;
     int extBuiltins = -1;
     int libCall = -1;
     bool isUnsigned = isTypeUnsignedInt(typeProxy);
@@ -7876,19 +6882,19 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
     switch (op) {
     case glslang::EOpNegative:
         if (isFloat) {
-            unaryOp = spv::Op::OpFNegate;
+            unaryOp = spv::OpFNegate;
             if (builder.isMatrixType(typeId))
                 return createUnaryMatrixOperation(unaryOp, decorations, typeId, operand, typeProxy);
         } else
-            unaryOp = spv::Op::OpSNegate;
+            unaryOp = spv::OpSNegate;
         break;
 
     case glslang::EOpLogicalNot:
     case glslang::EOpVectorLogicalNot:
-        unaryOp = spv::Op::OpLogicalNot;
+        unaryOp = spv::OpLogicalNot;
         break;
     case glslang::EOpBitwiseNot:
-        unaryOp = spv::Op::OpNot;
+        unaryOp = spv::OpNot;
         break;
 
     case glslang::EOpDeterminant:
@@ -7898,7 +6904,7 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
         libCall = spv::GLSLstd450MatrixInverse;
         break;
     case glslang::EOpTranspose:
-        unaryOp = spv::Op::OpTranspose;
+        unaryOp = spv::OpTranspose;
         break;
 
     case glslang::EOpRadians:
@@ -7991,13 +6997,13 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
         break;
 
     case glslang::EOpIsNan:
-        unaryOp = spv::Op::OpIsNan;
+        unaryOp = spv::OpIsNan;
         break;
     case glslang::EOpIsInf:
-        unaryOp = spv::Op::OpIsInf;
+        unaryOp = spv::OpIsInf;
         break;
     case glslang::EOpIsFinite:
-        unaryOp = spv::Op::OpIsFinite;
+        unaryOp = spv::OpIsFinite;
         break;
 
     case glslang::EOpFloatBitsToInt:
@@ -8012,7 +7018,7 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
     case glslang::EOpFloat16BitsToUint16:
     case glslang::EOpInt16BitsToFloat16:
     case glslang::EOpUint16BitsToFloat16:
-        unaryOp = spv::Op::OpBitcast;
+        unaryOp = spv::OpBitcast;
         break;
 
     case glslang::EOpPackSnorm2x16:
@@ -8072,24 +7078,24 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
     case glslang::EOpUnpackUint4x16:
     case glslang::EOpPackFloat2x16:
     case glslang::EOpUnpackFloat2x16:
-        unaryOp = spv::Op::OpBitcast;
+        unaryOp = spv::OpBitcast;
         break;
 
     case glslang::EOpDPdx:
-        unaryOp = spv::Op::OpDPdx;
+        unaryOp = spv::OpDPdx;
         break;
     case glslang::EOpDPdy:
-        unaryOp = spv::Op::OpDPdy;
+        unaryOp = spv::OpDPdy;
         break;
     case glslang::EOpFwidth:
-        unaryOp = spv::Op::OpFwidth;
+        unaryOp = spv::OpFwidth;
         break;
 
     case glslang::EOpAny:
-        unaryOp = spv::Op::OpAny;
+        unaryOp = spv::OpAny;
         break;
     case glslang::EOpAll:
-        unaryOp = spv::Op::OpAll;
+        unaryOp = spv::OpAll;
         break;
 
     case glslang::EOpAbs:
@@ -8106,40 +7112,40 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
         break;
 
     case glslang::EOpDPdxFine:
-        unaryOp = spv::Op::OpDPdxFine;
+        unaryOp = spv::OpDPdxFine;
         break;
     case glslang::EOpDPdyFine:
-        unaryOp = spv::Op::OpDPdyFine;
+        unaryOp = spv::OpDPdyFine;
         break;
     case glslang::EOpFwidthFine:
-        unaryOp = spv::Op::OpFwidthFine;
+        unaryOp = spv::OpFwidthFine;
         break;
     case glslang::EOpDPdxCoarse:
-        unaryOp = spv::Op::OpDPdxCoarse;
+        unaryOp = spv::OpDPdxCoarse;
         break;
     case glslang::EOpDPdyCoarse:
-        unaryOp = spv::Op::OpDPdyCoarse;
+        unaryOp = spv::OpDPdyCoarse;
         break;
     case glslang::EOpFwidthCoarse:
-        unaryOp = spv::Op::OpFwidthCoarse;
+        unaryOp = spv::OpFwidthCoarse;
         break;
     case glslang::EOpRayQueryProceed:
-        unaryOp = spv::Op::OpRayQueryProceedKHR;
+        unaryOp = spv::OpRayQueryProceedKHR;
         break;
     case glslang::EOpRayQueryGetRayTMin:
-        unaryOp = spv::Op::OpRayQueryGetRayTMinKHR;
+        unaryOp = spv::OpRayQueryGetRayTMinKHR;
         break;
     case glslang::EOpRayQueryGetRayFlags:
-        unaryOp = spv::Op::OpRayQueryGetRayFlagsKHR;
+        unaryOp = spv::OpRayQueryGetRayFlagsKHR;
         break;
     case glslang::EOpRayQueryGetWorldRayOrigin:
-        unaryOp = spv::Op::OpRayQueryGetWorldRayOriginKHR;
+        unaryOp = spv::OpRayQueryGetWorldRayOriginKHR;
         break;
     case glslang::EOpRayQueryGetWorldRayDirection:
-        unaryOp = spv::Op::OpRayQueryGetWorldRayDirectionKHR;
+        unaryOp = spv::OpRayQueryGetWorldRayDirectionKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionCandidateAABBOpaque:
-        unaryOp = spv::Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR;
+        unaryOp = spv::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR;
         break;
     case glslang::EOpInterpolateAtCentroid:
         if (typeProxy == glslang::EbtFloat16)
@@ -8157,10 +7163,10 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
     }
 
     case glslang::EOpBitFieldReverse:
-        unaryOp = spv::Op::OpBitReverse;
+        unaryOp = spv::OpBitReverse;
         break;
     case glslang::EOpBitCount:
-        unaryOp = spv::Op::OpBitCount;
+        unaryOp = spv::OpBitCount;
         break;
     case glslang::EOpFindLSB:
         libCall = spv::GLSLstd450FindILsb;
@@ -8173,15 +7179,15 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
         break;
 
     case glslang::EOpCountLeadingZeros:
-        builder.addCapability(spv::Capability::IntegerFunctions2INTEL);
+        builder.addCapability(spv::CapabilityIntegerFunctions2INTEL);
         builder.addExtension("SPV_INTEL_shader_integer_functions2");
-        unaryOp = spv::Op::OpUCountLeadingZerosINTEL;
+        unaryOp = spv::OpUCountLeadingZerosINTEL;
         break;
 
     case glslang::EOpCountTrailingZeros:
-        builder.addCapability(spv::Capability::IntegerFunctions2INTEL);
+        builder.addCapability(spv::CapabilityIntegerFunctions2INTEL);
         builder.addExtension("SPV_INTEL_shader_integer_functions2");
-        unaryOp = spv::Op::OpUCountTrailingZerosINTEL;
+        unaryOp = spv::OpUCountTrailingZerosINTEL;
         break;
 
     case glslang::EOpBallot:
@@ -8268,231 +7274,116 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
         libCall = spv::CubeFaceCoordAMD;
         break;
     case glslang::EOpSubgroupPartition:
-        unaryOp = spv::Op::OpGroupNonUniformPartitionNV;
+        unaryOp = spv::OpGroupNonUniformPartitionNV;
         break;
     case glslang::EOpConstructReference:
-        unaryOp = spv::Op::OpBitcast;
+        unaryOp = spv::OpBitcast;
         break;
 
     case glslang::EOpConvUint64ToAccStruct:
     case glslang::EOpConvUvec2ToAccStruct:
-        unaryOp = spv::Op::OpConvertUToAccelerationStructureKHR;
+        unaryOp = spv::OpConvertUToAccelerationStructureKHR;
         break;
 
     case glslang::EOpHitObjectIsEmptyNV:
-        unaryOp = spv::Op::OpHitObjectIsEmptyNV;
-        break;
-
-    case glslang::EOpHitObjectIsEmptyEXT:
-        unaryOp = spv::Op::OpHitObjectIsEmptyEXT;
+        unaryOp = spv::OpHitObjectIsEmptyNV;
         break;
 
     case glslang::EOpHitObjectIsMissNV:
-        unaryOp = spv::Op::OpHitObjectIsMissNV;
-        break;
-
-    case glslang::EOpHitObjectIsMissEXT:
-        unaryOp = spv::Op::OpHitObjectIsMissEXT;
+        unaryOp = spv::OpHitObjectIsMissNV;
         break;
 
     case glslang::EOpHitObjectIsHitNV:
-        unaryOp = spv::Op::OpHitObjectIsHitNV;
-        break;
-
-    case glslang::EOpHitObjectIsHitEXT:
-        unaryOp = spv::Op::OpHitObjectIsHitEXT;
+        unaryOp = spv::OpHitObjectIsHitNV;
         break;
 
     case glslang::EOpHitObjectGetObjectRayOriginNV:
-        unaryOp = spv::Op::OpHitObjectGetObjectRayOriginNV;
-        break;
-
-    case glslang::EOpHitObjectGetObjectRayOriginEXT:
-        unaryOp = spv::Op::OpHitObjectGetObjectRayOriginEXT;
+        unaryOp = spv::OpHitObjectGetObjectRayOriginNV;
         break;
 
     case glslang::EOpHitObjectGetObjectRayDirectionNV:
-        unaryOp = spv::Op::OpHitObjectGetObjectRayDirectionNV;
-        break;
-
-    case glslang::EOpHitObjectGetObjectRayDirectionEXT:
-        unaryOp = spv::Op::OpHitObjectGetObjectRayDirectionEXT;
+        unaryOp = spv::OpHitObjectGetObjectRayDirectionNV;
         break;
 
     case glslang::EOpHitObjectGetWorldRayOriginNV:
-        unaryOp = spv::Op::OpHitObjectGetWorldRayOriginNV;
-        break;
-
-    case glslang::EOpHitObjectGetWorldRayOriginEXT:
-        unaryOp = spv::Op::OpHitObjectGetWorldRayOriginEXT;
+        unaryOp = spv::OpHitObjectGetWorldRayOriginNV;
         break;
 
     case glslang::EOpHitObjectGetWorldRayDirectionNV:
-        unaryOp = spv::Op::OpHitObjectGetWorldRayDirectionNV;
-        break;
-
-    case glslang::EOpHitObjectGetWorldRayDirectionEXT:
-        unaryOp = spv::Op::OpHitObjectGetWorldRayDirectionEXT;
+        unaryOp = spv::OpHitObjectGetWorldRayDirectionNV;
         break;
 
     case glslang::EOpHitObjectGetObjectToWorldNV:
-        unaryOp = spv::Op::OpHitObjectGetObjectToWorldNV;
-        break;
-
-    case glslang::EOpHitObjectGetObjectToWorldEXT:
-        unaryOp = spv::Op::OpHitObjectGetObjectToWorldEXT;
+        unaryOp = spv::OpHitObjectGetObjectToWorldNV;
         break;
 
     case glslang::EOpHitObjectGetWorldToObjectNV:
-        unaryOp = spv::Op::OpHitObjectGetWorldToObjectNV;
-        break;
-
-    case glslang::EOpHitObjectGetWorldToObjectEXT:
-        unaryOp = spv::Op::OpHitObjectGetWorldToObjectEXT;
+        unaryOp = spv::OpHitObjectGetWorldToObjectNV;
         break;
 
     case glslang::EOpHitObjectGetRayTMinNV:
-        unaryOp = spv::Op::OpHitObjectGetRayTMinNV;
-        break;
-
-    case glslang::EOpHitObjectGetRayTMinEXT:
-        unaryOp = spv::Op::OpHitObjectGetRayTMinEXT;
+        unaryOp = spv::OpHitObjectGetRayTMinNV;
         break;
 
     case glslang::EOpHitObjectGetRayTMaxNV:
-        unaryOp = spv::Op::OpHitObjectGetRayTMaxNV;
-        break;
-
-    case glslang::EOpHitObjectGetRayTMaxEXT:
-        unaryOp = spv::Op::OpHitObjectGetRayTMaxEXT;
-        break;
-
-    case glslang::EOpHitObjectGetRayFlagsEXT:
-        unaryOp = spv::Op::OpHitObjectGetRayFlagsEXT;
+        unaryOp = spv::OpHitObjectGetRayTMaxNV;
         break;
 
     case glslang::EOpHitObjectGetPrimitiveIndexNV:
-        unaryOp = spv::Op::OpHitObjectGetPrimitiveIndexNV;
-        break;
-
-    case glslang::EOpHitObjectGetPrimitiveIndexEXT:
-        unaryOp = spv::Op::OpHitObjectGetPrimitiveIndexEXT;
+        unaryOp = spv::OpHitObjectGetPrimitiveIndexNV;
         break;
 
     case glslang::EOpHitObjectGetInstanceIdNV:
-        unaryOp = spv::Op::OpHitObjectGetInstanceIdNV;
-        break;
-
-    case glslang::EOpHitObjectGetInstanceIdEXT:
-        unaryOp = spv::Op::OpHitObjectGetInstanceIdEXT;
+        unaryOp = spv::OpHitObjectGetInstanceIdNV;
         break;
 
     case glslang::EOpHitObjectGetInstanceCustomIndexNV:
-        unaryOp = spv::Op::OpHitObjectGetInstanceCustomIndexNV;
-        break;
-
-    case glslang::EOpHitObjectGetInstanceCustomIndexEXT:
-        unaryOp = spv::Op::OpHitObjectGetInstanceCustomIndexEXT;
+        unaryOp = spv::OpHitObjectGetInstanceCustomIndexNV;
         break;
 
     case glslang::EOpHitObjectGetGeometryIndexNV:
-        unaryOp = spv::Op::OpHitObjectGetGeometryIndexNV;
-        break;
-
-    case glslang::EOpHitObjectGetGeometryIndexEXT:
-        unaryOp = spv::Op::OpHitObjectGetGeometryIndexEXT;
+        unaryOp = spv::OpHitObjectGetGeometryIndexNV;
         break;
 
     case glslang::EOpHitObjectGetHitKindNV:
-        unaryOp = spv::Op::OpHitObjectGetHitKindNV;
-        break;
-
-    case glslang::EOpHitObjectGetHitKindEXT:
-        unaryOp = spv::Op::OpHitObjectGetHitKindEXT;
+        unaryOp = spv::OpHitObjectGetHitKindNV;
         break;
 
     case glslang::EOpHitObjectGetCurrentTimeNV:
-        unaryOp = spv::Op::OpHitObjectGetCurrentTimeNV;
-        break;
-
-    case glslang::EOpHitObjectGetCurrentTimeEXT:
-        unaryOp = spv::Op::OpHitObjectGetCurrentTimeEXT;
+        unaryOp = spv::OpHitObjectGetCurrentTimeNV;
         break;
 
     case glslang::EOpHitObjectGetShaderBindingTableRecordIndexNV:
-        unaryOp = spv::Op::OpHitObjectGetShaderBindingTableRecordIndexNV;
-        break;
-
-    case glslang::EOpHitObjectGetShaderBindingTableRecordIndexEXT:
-        unaryOp = spv::Op::OpHitObjectGetShaderBindingTableRecordIndexEXT;
+        unaryOp = spv::OpHitObjectGetShaderBindingTableRecordIndexNV;
         break;
 
     case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
-        unaryOp = spv::Op::OpHitObjectGetShaderRecordBufferHandleNV;
-        break;
-
-    case glslang::EOpHitObjectGetClusterIdNV:
-        unaryOp = spv::Op::OpHitObjectGetClusterIdNV;
-        builder.addExtension(spv::E_SPV_NV_cluster_acceleration_structure);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingClusterAccelerationStructureNV);
-        break;
-
-    case glslang::EOpHitObjectGetSpherePositionNV:
-        unaryOp = spv::Op::OpHitObjectGetSpherePositionNV;
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        break;
-
-    case glslang::EOpHitObjectGetSphereRadiusNV:
-        unaryOp = spv::Op::OpHitObjectGetSphereRadiusNV;
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        break;
-
-    case glslang::EOpHitObjectIsSphereHitNV:
-        unaryOp = spv::Op::OpHitObjectIsSphereHitNV;
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingSpheresGeometryNV);
-        break;
-
-    case glslang::EOpHitObjectIsLSSHitNV:
-        unaryOp = spv::Op::OpHitObjectIsLSSHitNV;
-        builder.addExtension(spv::E_SPV_NV_linear_swept_spheres);
-        builder.addCapability(spv::Capability::ShaderInvocationReorderNV);
-        builder.addCapability(spv::Capability::RayTracingLinearSweptSpheresGeometryNV);
-        break;
-
-    case glslang::EOpHitObjectGetShaderRecordBufferHandleEXT:
-        unaryOp = spv::Op::OpHitObjectGetShaderRecordBufferHandleEXT;
+        unaryOp = spv::OpHitObjectGetShaderRecordBufferHandleNV;
         break;
 
     case glslang::EOpFetchMicroTriangleVertexPositionNV:
-        unaryOp = spv::Op::OpFetchMicroTriangleVertexPositionNV;
+        unaryOp = spv::OpFetchMicroTriangleVertexPositionNV;
         break;
 
     case glslang::EOpFetchMicroTriangleVertexBarycentricNV:
-        unaryOp = spv::Op::OpFetchMicroTriangleVertexBarycentricNV;
+        unaryOp = spv::OpFetchMicroTriangleVertexBarycentricNV;
         break;
 
     case glslang::EOpCopyObject:
-        unaryOp = spv::Op::OpCopyObject;
+        unaryOp = spv::OpCopyObject;
         break;
 
     case glslang::EOpDepthAttachmentReadEXT:
         builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
-        builder.addCapability(spv::Capability::TileImageDepthReadAccessEXT);
-        unaryOp = spv::Op::OpDepthAttachmentReadEXT;
+        builder.addCapability(spv::CapabilityTileImageDepthReadAccessEXT);
+        unaryOp = spv::OpDepthAttachmentReadEXT;
         decorations.precision = spv::NoPrecision;
         break;
     case glslang::EOpStencilAttachmentReadEXT:
         builder.addExtension(spv::E_SPV_EXT_shader_tile_image);
-        builder.addCapability(spv::Capability::TileImageStencilReadAccessEXT);
-        unaryOp = spv::Op::OpStencilAttachmentReadEXT;
-        decorations.precision = spv::Decoration::RelaxedPrecision;
+        builder.addCapability(spv::CapabilityTileImageStencilReadAccessEXT);
+        unaryOp = spv::OpStencilAttachmentReadEXT;
+        decorations.precision = spv::DecorationRelaxedPrecision;
         break;
 
     default:
@@ -8553,30 +7444,79 @@ spv::Id TGlslangToSpvTraverser::createUnaryMatrixOperation(spv::Op op, OpDecorat
 // for the signedness conversion.
 // destType is the final type that will be converted to, but this function
 // may only be doing part of that conversion.
-spv::Id TGlslangToSpvTraverser::createIntWidthConversion(spv::Id operand, int vectorSize, spv::Id destType,
-                                                         glslang::TBasicType resultBasicType, glslang::TBasicType operandBasicType)
+spv::Id TGlslangToSpvTraverser::createIntWidthConversion(glslang::TOperator op, spv::Id operand, int vectorSize, spv::Id destType)
 {
     // Get the result type width, based on the type to convert to.
-    int width = GetNumBits(resultBasicType);
+    int width = 32;
+    switch(op) {
+    case glslang::EOpConvInt16ToUint8:
+    case glslang::EOpConvIntToUint8:
+    case glslang::EOpConvInt64ToUint8:
+    case glslang::EOpConvUint16ToInt8:
+    case glslang::EOpConvUintToInt8:
+    case glslang::EOpConvUint64ToInt8:
+        width = 8;
+        break;
+    case glslang::EOpConvInt8ToUint16:
+    case glslang::EOpConvIntToUint16:
+    case glslang::EOpConvInt64ToUint16:
+    case glslang::EOpConvUint8ToInt16:
+    case glslang::EOpConvUintToInt16:
+    case glslang::EOpConvUint64ToInt16:
+        width = 16;
+        break;
+    case glslang::EOpConvInt8ToUint:
+    case glslang::EOpConvInt16ToUint:
+    case glslang::EOpConvInt64ToUint:
+    case glslang::EOpConvUint8ToInt:
+    case glslang::EOpConvUint16ToInt:
+    case glslang::EOpConvUint64ToInt:
+        width = 32;
+        break;
+    case glslang::EOpConvInt8ToUint64:
+    case glslang::EOpConvInt16ToUint64:
+    case glslang::EOpConvIntToUint64:
+    case glslang::EOpConvUint8ToInt64:
+    case glslang::EOpConvUint16ToInt64:
+    case glslang::EOpConvUintToInt64:
+        width = 64;
+        break;
+
+    default:
+        assert(false && "Default missing");
+        break;
+    }
 
     // Get the conversion operation and result type,
     // based on the target width, but the source type.
     spv::Id type = spv::NoType;
-    spv::Op convOp = spv::Op::OpNop;
-    if (isTypeSignedInt(operandBasicType)) {
-        convOp = spv::Op::OpSConvert;
+    spv::Op convOp = spv::OpNop;
+    switch(op) {
+    case glslang::EOpConvInt8ToUint16:
+    case glslang::EOpConvInt8ToUint:
+    case glslang::EOpConvInt8ToUint64:
+    case glslang::EOpConvInt16ToUint8:
+    case glslang::EOpConvInt16ToUint:
+    case glslang::EOpConvInt16ToUint64:
+    case glslang::EOpConvIntToUint8:
+    case glslang::EOpConvIntToUint16:
+    case glslang::EOpConvIntToUint64:
+    case glslang::EOpConvInt64ToUint8:
+    case glslang::EOpConvInt64ToUint16:
+    case glslang::EOpConvInt64ToUint:
+        convOp = spv::OpSConvert;
         type = builder.makeIntType(width);
-    } else {
-        convOp = spv::Op::OpUConvert;
+        break;
+    default:
+        convOp = spv::OpUConvert;
         type = builder.makeUintType(width);
+        break;
     }
 
-    if (builder.getOpCode(destType) == spv::Op::OpTypeCooperativeVectorNV) {
-        type = builder.makeCooperativeVectorTypeNV(type, builder.getCooperativeVectorNumComponents(destType));
-    } else if (vectorSize > 0)
+    if (vectorSize > 0)
         type = builder.makeVectorType(type, vectorSize);
-    else if (builder.getOpCode(destType) == spv::Op::OpTypeCooperativeMatrixKHR ||
-             builder.getOpCode(destType) == spv::Op::OpTypeCooperativeMatrixNV) {
+    else if (builder.getOpCode(destType) == spv::OpTypeCooperativeMatrixKHR ||
+             builder.getOpCode(destType) == spv::OpTypeCooperativeMatrixNV) {
 
         type = builder.makeCooperativeMatrixTypeWithSameShape(type, destType);
     }
@@ -8585,139 +7525,332 @@ spv::Id TGlslangToSpvTraverser::createIntWidthConversion(spv::Id operand, int ve
 }
 
 spv::Id TGlslangToSpvTraverser::createConversion(glslang::TOperator op, OpDecorations& decorations, spv::Id destType,
-                                                 spv::Id operand, glslang::TBasicType resultBasicType, glslang::TBasicType operandBasicType)
+                                                 spv::Id operand, glslang::TBasicType typeProxy)
 {
-    spv::Op convOp = spv::Op::OpNop;
+    spv::Op convOp = spv::OpNop;
     spv::Id zero = 0;
     spv::Id one = 0;
 
     int vectorSize = builder.isVectorType(destType) ? builder.getNumTypeComponents(destType) : 0;
 
-    if (IsOpNumericConv(op) || op == glslang::EOpConstructSaturated) {
-        if (isTypeSignedInt(operandBasicType) && isTypeFloat(resultBasicType)) {
-            convOp = spv::Op::OpConvertSToF;
-        }
-        if (isTypeUnsignedInt(operandBasicType) && isTypeFloat(resultBasicType)) {
-            convOp = spv::Op::OpConvertUToF;
-        }
-        if (isTypeFloat(operandBasicType) && isTypeSignedInt(resultBasicType)) {
-            convOp = spv::Op::OpConvertFToS;
-        }
-        if (isTypeFloat(operandBasicType) && isTypeUnsignedInt(resultBasicType)) {
-            convOp = spv::Op::OpConvertFToU;
-        }
-        if (isTypeSignedInt(operandBasicType) && isTypeSignedInt(resultBasicType)) {
-            convOp = spv::Op::OpSConvert;
-        }
-        if (isTypeUnsignedInt(operandBasicType) && isTypeUnsignedInt(resultBasicType)) {
-            convOp = spv::Op::OpUConvert;
-        }
-        if (isTypeFloat(operandBasicType) && isTypeFloat(resultBasicType)) {
-            convOp = spv::Op::OpFConvert;
-            if (builder.isMatrixType(destType))
-                return createUnaryMatrixOperation(convOp, decorations, destType, operand, operandBasicType);
-        }
-        if (isTypeInt(operandBasicType) && isTypeInt(resultBasicType) &&
-            isTypeUnsignedInt(operandBasicType) != isTypeUnsignedInt(resultBasicType)) {
+    switch (op) {
+    case glslang::EOpConvIntToBool:
+    case glslang::EOpConvUintToBool:
+        zero = builder.makeUintConstant(0);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpINotEqual, destType, operand, zero);
+    case glslang::EOpConvFloatToBool:
+        zero = builder.makeFloatConstant(0.0F);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpFUnordNotEqual, destType, operand, zero);
+    case glslang::EOpConvBoolToFloat:
+        convOp = spv::OpSelect;
+        zero = builder.makeFloatConstant(0.0F);
+        one  = builder.makeFloatConstant(1.0F);
+        break;
 
-            if (GetNumBits(operandBasicType) != GetNumBits(resultBasicType)) {
-                // OpSConvert/OpUConvert + OpBitCast
-                operand = createIntWidthConversion(operand, vectorSize, destType, resultBasicType, operandBasicType);
-            }
-
-            if (builder.isInSpecConstCodeGenMode()) {
-                uint32_t bits = GetNumBits(resultBasicType);
-                spv::Id zeroType = builder.makeUintType(bits);
-                if (bits == 64) {
-                    zero = builder.makeInt64Constant(zeroType, 0, false);
-                } else {
-                    zero = builder.makeIntConstant(zeroType, 0, false);
-                }
-                zero = makeSmearedConstant(zero, vectorSize);
-                // Use OpIAdd, instead of OpBitcast to do the conversion when
-                // generating for OpSpecConstantOp instruction.
-                return builder.createBinOp(spv::Op::OpIAdd, destType, operand, zero);
-            }
-            // For normal run-time conversion instruction, use OpBitcast.
-            convOp = spv::Op::OpBitcast;
+    case glslang::EOpConvBoolToInt:
+    case glslang::EOpConvBoolToInt64:
+        if (op == glslang::EOpConvBoolToInt64) {
+            zero = builder.makeInt64Constant(0);
+            one = builder.makeInt64Constant(1);
+        } else {
+            zero = builder.makeIntConstant(0);
+            one = builder.makeIntConstant(1);
         }
-        if (resultBasicType == glslang::EbtBool) {
-            uint32_t bits = GetNumBits(operandBasicType);
-            if (isTypeInt(operandBasicType)) {
-                spv::Id zeroType = builder.makeUintType(bits);
-                if (bits == 64) {
-                    zero = builder.makeInt64Constant(zeroType, 0, false);
-                } else {
-                    zero = builder.makeIntConstant(zeroType, 0, false);
-                }
-                zero = makeSmearedConstant(zero, vectorSize);
-                return builder.createBinOp(spv::Op::OpINotEqual, destType, operand, zero);
+
+        convOp = spv::OpSelect;
+        break;
+
+    case glslang::EOpConvBoolToUint:
+    case glslang::EOpConvBoolToUint64:
+        if (op == glslang::EOpConvBoolToUint64) {
+            zero = builder.makeUint64Constant(0);
+            one = builder.makeUint64Constant(1);
+        } else {
+            zero = builder.makeUintConstant(0);
+            one = builder.makeUintConstant(1);
+        }
+
+        convOp = spv::OpSelect;
+        break;
+
+    case glslang::EOpConvInt8ToFloat16:
+    case glslang::EOpConvInt8ToFloat:
+    case glslang::EOpConvInt8ToDouble:
+    case glslang::EOpConvInt16ToFloat16:
+    case glslang::EOpConvInt16ToFloat:
+    case glslang::EOpConvInt16ToDouble:
+    case glslang::EOpConvIntToFloat16:
+    case glslang::EOpConvIntToFloat:
+    case glslang::EOpConvIntToDouble:
+    case glslang::EOpConvInt64ToFloat:
+    case glslang::EOpConvInt64ToDouble:
+    case glslang::EOpConvInt64ToFloat16:
+        convOp = spv::OpConvertSToF;
+        break;
+
+    case glslang::EOpConvUint8ToFloat16:
+    case glslang::EOpConvUint8ToFloat:
+    case glslang::EOpConvUint8ToDouble:
+    case glslang::EOpConvUint16ToFloat16:
+    case glslang::EOpConvUint16ToFloat:
+    case glslang::EOpConvUint16ToDouble:
+    case glslang::EOpConvUintToFloat16:
+    case glslang::EOpConvUintToFloat:
+    case glslang::EOpConvUintToDouble:
+    case glslang::EOpConvUint64ToFloat:
+    case glslang::EOpConvUint64ToDouble:
+    case glslang::EOpConvUint64ToFloat16:
+        convOp = spv::OpConvertUToF;
+        break;
+
+    case glslang::EOpConvFloat16ToInt8:
+    case glslang::EOpConvFloatToInt8:
+    case glslang::EOpConvDoubleToInt8:
+    case glslang::EOpConvFloat16ToInt16:
+    case glslang::EOpConvFloatToInt16:
+    case glslang::EOpConvDoubleToInt16:
+    case glslang::EOpConvFloat16ToInt:
+    case glslang::EOpConvFloatToInt:
+    case glslang::EOpConvDoubleToInt:
+    case glslang::EOpConvFloat16ToInt64:
+    case glslang::EOpConvFloatToInt64:
+    case glslang::EOpConvDoubleToInt64:
+        convOp = spv::OpConvertFToS;
+        break;
+
+    case glslang::EOpConvUint8ToInt8:
+    case glslang::EOpConvInt8ToUint8:
+    case glslang::EOpConvUint16ToInt16:
+    case glslang::EOpConvInt16ToUint16:
+    case glslang::EOpConvUintToInt:
+    case glslang::EOpConvIntToUint:
+    case glslang::EOpConvUint64ToInt64:
+    case glslang::EOpConvInt64ToUint64:
+        if (builder.isInSpecConstCodeGenMode()) {
+            // Build zero scalar or vector for OpIAdd.
+            if(op == glslang::EOpConvUint8ToInt8 || op == glslang::EOpConvInt8ToUint8) {
+                zero = builder.makeUint8Constant(0);
+            } else if (op == glslang::EOpConvUint16ToInt16 || op == glslang::EOpConvInt16ToUint16) {
+                zero = builder.makeUint16Constant(0);
+            } else if (op == glslang::EOpConvUint64ToInt64 || op == glslang::EOpConvInt64ToUint64) {
+                zero = builder.makeUint64Constant(0);
             } else {
-                assert(isTypeFloat(operandBasicType));
-                if (bits == 64) {
-                    zero = builder.makeDoubleConstant(0.0);
-                } else if (bits == 32) {
-                    zero = builder.makeFloatConstant(0.0);
-                } else {
-                    assert(bits == 16);
-                    zero = builder.makeFloat16Constant(0.0);
-                }
-                zero = makeSmearedConstant(zero, vectorSize);
-                return builder.createBinOp(spv::Op::OpFUnordNotEqual, destType, operand, zero);
+                zero = builder.makeUintConstant(0);
             }
+            zero = makeSmearedConstant(zero, vectorSize);
+            // Use OpIAdd, instead of OpBitcast to do the conversion when
+            // generating for OpSpecConstantOp instruction.
+            return builder.createBinOp(spv::OpIAdd, destType, operand, zero);
         }
-        if (operandBasicType == glslang::EbtBool) {
-            uint32_t bits = GetNumBits(resultBasicType);
-            convOp = spv::Op::OpSelect;
-            if (isTypeInt(resultBasicType)) {
-                spv::Id zeroType = isTypeSignedInt(resultBasicType) ? builder.makeIntType(bits) : builder.makeUintType(bits);
-                if (bits == 64) {
-                    zero = builder.makeInt64Constant(zeroType, 0, false);
-                    one = builder.makeInt64Constant(zeroType, 1, false);
-                } else {
-                    zero = builder.makeIntConstant(zeroType, 0, false);
-                    one = builder.makeIntConstant(zeroType, 1, false);
-                }
-            } else {
-                assert(isTypeFloat(resultBasicType));
-                if (bits == 64) {
-                    zero = builder.makeDoubleConstant(0.0);
-                    one = builder.makeDoubleConstant(1.0);
-                } else if (bits == 32) {
-                    zero = builder.makeFloatConstant(0.0);
-                    one = builder.makeFloatConstant(1.0);
-                } else {
-                    assert(bits == 16);
-                    zero = builder.makeFloat16Constant(0.0);
-                    one = builder.makeFloat16Constant(1.0);
-                }
+        // For normal run-time conversion instruction, use OpBitcast.
+        convOp = spv::OpBitcast;
+        break;
+
+    case glslang::EOpConvFloat16ToUint8:
+    case glslang::EOpConvFloatToUint8:
+    case glslang::EOpConvDoubleToUint8:
+    case glslang::EOpConvFloat16ToUint16:
+    case glslang::EOpConvFloatToUint16:
+    case glslang::EOpConvDoubleToUint16:
+    case glslang::EOpConvFloat16ToUint:
+    case glslang::EOpConvFloatToUint:
+    case glslang::EOpConvDoubleToUint:
+    case glslang::EOpConvFloatToUint64:
+    case glslang::EOpConvDoubleToUint64:
+    case glslang::EOpConvFloat16ToUint64:
+        convOp = spv::OpConvertFToU;
+        break;
+
+    case glslang::EOpConvInt8ToBool:
+    case glslang::EOpConvUint8ToBool:
+        zero = builder.makeUint8Constant(0);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpINotEqual, destType, operand, zero);
+    case glslang::EOpConvInt16ToBool:
+    case glslang::EOpConvUint16ToBool:
+        zero = builder.makeUint16Constant(0);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpINotEqual, destType, operand, zero);
+    case glslang::EOpConvInt64ToBool:
+    case glslang::EOpConvUint64ToBool:
+        zero = builder.makeUint64Constant(0);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpINotEqual, destType, operand, zero);
+    case glslang::EOpConvDoubleToBool:
+        zero = builder.makeDoubleConstant(0.0);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpFUnordNotEqual, destType, operand, zero);
+    case glslang::EOpConvFloat16ToBool:
+        zero = builder.makeFloat16Constant(0.0F);
+        zero = makeSmearedConstant(zero, vectorSize);
+        return builder.createBinOp(spv::OpFUnordNotEqual, destType, operand, zero);
+    case glslang::EOpConvBoolToDouble:
+        convOp = spv::OpSelect;
+        zero = builder.makeDoubleConstant(0.0);
+        one  = builder.makeDoubleConstant(1.0);
+        break;
+    case glslang::EOpConvBoolToFloat16:
+        convOp = spv::OpSelect;
+        zero = builder.makeFloat16Constant(0.0F);
+        one = builder.makeFloat16Constant(1.0F);
+        break;
+    case glslang::EOpConvBoolToInt8:
+        zero = builder.makeInt8Constant(0);
+        one  = builder.makeInt8Constant(1);
+        convOp = spv::OpSelect;
+        break;
+    case glslang::EOpConvBoolToUint8:
+        zero = builder.makeUint8Constant(0);
+        one  = builder.makeUint8Constant(1);
+        convOp = spv::OpSelect;
+        break;
+    case glslang::EOpConvBoolToInt16:
+        zero = builder.makeInt16Constant(0);
+        one  = builder.makeInt16Constant(1);
+        convOp = spv::OpSelect;
+        break;
+    case glslang::EOpConvBoolToUint16:
+        zero = builder.makeUint16Constant(0);
+        one  = builder.makeUint16Constant(1);
+        convOp = spv::OpSelect;
+        break;
+    case glslang::EOpConvDoubleToFloat:
+    case glslang::EOpConvFloatToDouble:
+    case glslang::EOpConvDoubleToFloat16:
+    case glslang::EOpConvFloat16ToDouble:
+    case glslang::EOpConvFloatToFloat16:
+    case glslang::EOpConvFloat16ToFloat:
+        convOp = spv::OpFConvert;
+        if (builder.isMatrixType(destType))
+            return createUnaryMatrixOperation(convOp, decorations, destType, operand, typeProxy);
+        break;
+
+    case glslang::EOpConvInt8ToInt16:
+    case glslang::EOpConvInt8ToInt:
+    case glslang::EOpConvInt8ToInt64:
+    case glslang::EOpConvInt16ToInt8:
+    case glslang::EOpConvInt16ToInt:
+    case glslang::EOpConvInt16ToInt64:
+    case glslang::EOpConvIntToInt8:
+    case glslang::EOpConvIntToInt16:
+    case glslang::EOpConvIntToInt64:
+    case glslang::EOpConvInt64ToInt8:
+    case glslang::EOpConvInt64ToInt16:
+    case glslang::EOpConvInt64ToInt:
+        convOp = spv::OpSConvert;
+        break;
+
+    case glslang::EOpConvUint8ToUint16:
+    case glslang::EOpConvUint8ToUint:
+    case glslang::EOpConvUint8ToUint64:
+    case glslang::EOpConvUint16ToUint8:
+    case glslang::EOpConvUint16ToUint:
+    case glslang::EOpConvUint16ToUint64:
+    case glslang::EOpConvUintToUint8:
+    case glslang::EOpConvUintToUint16:
+    case glslang::EOpConvUintToUint64:
+    case glslang::EOpConvUint64ToUint8:
+    case glslang::EOpConvUint64ToUint16:
+    case glslang::EOpConvUint64ToUint:
+        convOp = spv::OpUConvert;
+        break;
+
+    case glslang::EOpConvInt8ToUint16:
+    case glslang::EOpConvInt8ToUint:
+    case glslang::EOpConvInt8ToUint64:
+    case glslang::EOpConvInt16ToUint8:
+    case glslang::EOpConvInt16ToUint:
+    case glslang::EOpConvInt16ToUint64:
+    case glslang::EOpConvIntToUint8:
+    case glslang::EOpConvIntToUint16:
+    case glslang::EOpConvIntToUint64:
+    case glslang::EOpConvInt64ToUint8:
+    case glslang::EOpConvInt64ToUint16:
+    case glslang::EOpConvInt64ToUint:
+    case glslang::EOpConvUint8ToInt16:
+    case glslang::EOpConvUint8ToInt:
+    case glslang::EOpConvUint8ToInt64:
+    case glslang::EOpConvUint16ToInt8:
+    case glslang::EOpConvUint16ToInt:
+    case glslang::EOpConvUint16ToInt64:
+    case glslang::EOpConvUintToInt8:
+    case glslang::EOpConvUintToInt16:
+    case glslang::EOpConvUintToInt64:
+    case glslang::EOpConvUint64ToInt8:
+    case glslang::EOpConvUint64ToInt16:
+    case glslang::EOpConvUint64ToInt:
+        // OpSConvert/OpUConvert + OpBitCast
+        operand = createIntWidthConversion(op, operand, vectorSize, destType);
+
+        if (builder.isInSpecConstCodeGenMode()) {
+            // Build zero scalar or vector for OpIAdd.
+            switch(op) {
+            case glslang::EOpConvInt16ToUint8:
+            case glslang::EOpConvIntToUint8:
+            case glslang::EOpConvInt64ToUint8:
+            case glslang::EOpConvUint16ToInt8:
+            case glslang::EOpConvUintToInt8:
+            case glslang::EOpConvUint64ToInt8:
+                zero = builder.makeUint8Constant(0);
+                break;
+            case glslang::EOpConvInt8ToUint16:
+            case glslang::EOpConvIntToUint16:
+            case glslang::EOpConvInt64ToUint16:
+            case glslang::EOpConvUint8ToInt16:
+            case glslang::EOpConvUintToInt16:
+            case glslang::EOpConvUint64ToInt16:
+                zero = builder.makeUint16Constant(0);
+                break;
+            case glslang::EOpConvInt8ToUint:
+            case glslang::EOpConvInt16ToUint:
+            case glslang::EOpConvInt64ToUint:
+            case glslang::EOpConvUint8ToInt:
+            case glslang::EOpConvUint16ToInt:
+            case glslang::EOpConvUint64ToInt:
+                zero = builder.makeUintConstant(0);
+                break;
+            case glslang::EOpConvInt8ToUint64:
+            case glslang::EOpConvInt16ToUint64:
+            case glslang::EOpConvIntToUint64:
+            case glslang::EOpConvUint8ToInt64:
+            case glslang::EOpConvUint16ToInt64:
+            case glslang::EOpConvUintToInt64:
+                zero = builder.makeUint64Constant(0);
+                break;
+            default:
+                assert(false && "Default missing");
+                break;
             }
+            zero = makeSmearedConstant(zero, vectorSize);
+            // Use OpIAdd, instead of OpBitcast to do the conversion when
+            // generating for OpSpecConstantOp instruction.
+            return builder.createBinOp(spv::OpIAdd, destType, operand, zero);
         }
-    }
+        // For normal run-time conversion instruction, use OpBitcast.
+        convOp = spv::OpBitcast;
+        break;
+    case glslang::EOpConvUint64ToPtr:
+        convOp = spv::OpConvertUToPtr;
+        break;
+    case glslang::EOpConvPtrToUint64:
+        convOp = spv::OpConvertPtrToU;
+        break;
+    case glslang::EOpConvPtrToUvec2:
+    case glslang::EOpConvUvec2ToPtr:
+        convOp = spv::OpBitcast;
+        break;
 
-    if (convOp == spv::Op::OpNop) {
-        switch (op) {
-        case glslang::EOpConvUint64ToPtr:
-            convOp = spv::Op::OpConvertUToPtr;
-            break;
-        case glslang::EOpConvPtrToUint64:
-            convOp = spv::Op::OpConvertPtrToU;
-            break;
-        case glslang::EOpConvPtrToUvec2:
-        case glslang::EOpConvUvec2ToPtr:
-            convOp = spv::Op::OpBitcast;
-            break;
-
-        default:
-            break;
-        }
+    default:
+        break;
     }
 
     spv::Id result = 0;
-    if (convOp == spv::Op::OpNop)
+    if (convOp == spv::OpNop)
         return result;
 
-    if (convOp == spv::Op::OpSelect) {
+    if (convOp == spv::OpSelect) {
         zero = makeSmearedConstant(zero, vectorSize);
         one  = makeSmearedConstant(one, vectorSize);
         result = builder.createTriOp(convOp, destType, operand, one, zero);
@@ -8746,98 +7879,98 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     spv::Id typeId, std::vector<spv::Id>& operands, glslang::TBasicType typeProxy,
     const spv::Builder::AccessChain::CoherentFlags &lvalueCoherentFlags, const glslang::TType &opType)
 {
-    spv::Op opCode = spv::Op::OpNop;
+    spv::Op opCode = spv::OpNop;
 
     switch (op) {
     case glslang::EOpAtomicAdd:
     case glslang::EOpImageAtomicAdd:
     case glslang::EOpAtomicCounterAdd:
-        opCode = spv::Op::OpAtomicIAdd;
+        opCode = spv::OpAtomicIAdd;
         if (typeProxy == glslang::EbtFloat16 || typeProxy == glslang::EbtFloat || typeProxy == glslang::EbtDouble) {
-            opCode = spv::Op::OpAtomicFAddEXT;
+            opCode = spv::OpAtomicFAddEXT;
             if (typeProxy == glslang::EbtFloat16 &&
                 (opType.getVectorSize() == 2 || opType.getVectorSize() == 4)) {
                 builder.addExtension(spv::E_SPV_NV_shader_atomic_fp16_vector);
-                builder.addCapability(spv::Capability::AtomicFloat16VectorNV);
+                builder.addCapability(spv::CapabilityAtomicFloat16VectorNV);
             } else {
                 builder.addExtension(spv::E_SPV_EXT_shader_atomic_float_add);
                 if (typeProxy == glslang::EbtFloat16) {
                     builder.addExtension(spv::E_SPV_EXT_shader_atomic_float16_add);
-                    builder.addCapability(spv::Capability::AtomicFloat16AddEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat16AddEXT);
                 } else if (typeProxy == glslang::EbtFloat) {
-                    builder.addCapability(spv::Capability::AtomicFloat32AddEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat32AddEXT);
                 } else {
-                    builder.addCapability(spv::Capability::AtomicFloat64AddEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat64AddEXT);
                 }
             }
         }
         break;
     case glslang::EOpAtomicSubtract:
     case glslang::EOpAtomicCounterSubtract:
-        opCode = spv::Op::OpAtomicISub;
+        opCode = spv::OpAtomicISub;
         break;
     case glslang::EOpAtomicMin:
     case glslang::EOpImageAtomicMin:
     case glslang::EOpAtomicCounterMin:
         if (typeProxy == glslang::EbtFloat16 || typeProxy == glslang::EbtFloat || typeProxy == glslang::EbtDouble) {
-            opCode = spv::Op::OpAtomicFMinEXT;
+            opCode = spv::OpAtomicFMinEXT;
             if (typeProxy == glslang::EbtFloat16 &&
                 (opType.getVectorSize() == 2 || opType.getVectorSize() == 4)) {
                 builder.addExtension(spv::E_SPV_NV_shader_atomic_fp16_vector);
-                builder.addCapability(spv::Capability::AtomicFloat16VectorNV);
+                builder.addCapability(spv::CapabilityAtomicFloat16VectorNV);
             } else {
                 builder.addExtension(spv::E_SPV_EXT_shader_atomic_float_min_max);
                 if (typeProxy == glslang::EbtFloat16)
-                    builder.addCapability(spv::Capability::AtomicFloat16MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat16MinMaxEXT);
                 else if (typeProxy == glslang::EbtFloat)
-                    builder.addCapability(spv::Capability::AtomicFloat32MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat32MinMaxEXT);
                 else
-                    builder.addCapability(spv::Capability::AtomicFloat64MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat64MinMaxEXT);
             }
         } else if (typeProxy == glslang::EbtUint || typeProxy == glslang::EbtUint64) {
-            opCode = spv::Op::OpAtomicUMin;
+            opCode = spv::OpAtomicUMin;
         } else {
-            opCode = spv::Op::OpAtomicSMin;
+            opCode = spv::OpAtomicSMin;
         }
         break;
     case glslang::EOpAtomicMax:
     case glslang::EOpImageAtomicMax:
     case glslang::EOpAtomicCounterMax:
         if (typeProxy == glslang::EbtFloat16 || typeProxy == glslang::EbtFloat || typeProxy == glslang::EbtDouble) {
-            opCode = spv::Op::OpAtomicFMaxEXT;
+            opCode = spv::OpAtomicFMaxEXT;
             if (typeProxy == glslang::EbtFloat16 &&
                 (opType.getVectorSize() == 2 || opType.getVectorSize() == 4)) {
                 builder.addExtension(spv::E_SPV_NV_shader_atomic_fp16_vector);
-                builder.addCapability(spv::Capability::AtomicFloat16VectorNV);
+                builder.addCapability(spv::CapabilityAtomicFloat16VectorNV);
             } else {
                 builder.addExtension(spv::E_SPV_EXT_shader_atomic_float_min_max);
                 if (typeProxy == glslang::EbtFloat16)
-                    builder.addCapability(spv::Capability::AtomicFloat16MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat16MinMaxEXT);
                 else if (typeProxy == glslang::EbtFloat)
-                    builder.addCapability(spv::Capability::AtomicFloat32MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat32MinMaxEXT);
                 else
-                    builder.addCapability(spv::Capability::AtomicFloat64MinMaxEXT);
+                    builder.addCapability(spv::CapabilityAtomicFloat64MinMaxEXT);
             }
         } else if (typeProxy == glslang::EbtUint || typeProxy == glslang::EbtUint64) {
-            opCode = spv::Op::OpAtomicUMax;
+            opCode = spv::OpAtomicUMax;
         } else {
-            opCode = spv::Op::OpAtomicSMax;
+            opCode = spv::OpAtomicSMax;
         }
         break;
     case glslang::EOpAtomicAnd:
     case glslang::EOpImageAtomicAnd:
     case glslang::EOpAtomicCounterAnd:
-        opCode = spv::Op::OpAtomicAnd;
+        opCode = spv::OpAtomicAnd;
         break;
     case glslang::EOpAtomicOr:
     case glslang::EOpImageAtomicOr:
     case glslang::EOpAtomicCounterOr:
-        opCode = spv::Op::OpAtomicOr;
+        opCode = spv::OpAtomicOr;
         break;
     case glslang::EOpAtomicXor:
     case glslang::EOpImageAtomicXor:
     case glslang::EOpAtomicCounterXor:
-        opCode = spv::Op::OpAtomicXor;
+        opCode = spv::OpAtomicXor;
         break;
     case glslang::EOpAtomicExchange:
     case glslang::EOpImageAtomicExchange:
@@ -8845,30 +7978,30 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
         if ((typeProxy == glslang::EbtFloat16) && 
             (opType.getVectorSize() == 2 || opType.getVectorSize() == 4)) {
                 builder.addExtension(spv::E_SPV_NV_shader_atomic_fp16_vector);
-                builder.addCapability(spv::Capability::AtomicFloat16VectorNV);
+                builder.addCapability(spv::CapabilityAtomicFloat16VectorNV);
         }
 
-        opCode = spv::Op::OpAtomicExchange;
+        opCode = spv::OpAtomicExchange;
         break;
     case glslang::EOpAtomicCompSwap:
     case glslang::EOpImageAtomicCompSwap:
     case glslang::EOpAtomicCounterCompSwap:
-        opCode = spv::Op::OpAtomicCompareExchange;
+        opCode = spv::OpAtomicCompareExchange;
         break;
     case glslang::EOpAtomicCounterIncrement:
-        opCode = spv::Op::OpAtomicIIncrement;
+        opCode = spv::OpAtomicIIncrement;
         break;
     case glslang::EOpAtomicCounterDecrement:
-        opCode = spv::Op::OpAtomicIDecrement;
+        opCode = spv::OpAtomicIDecrement;
         break;
     case glslang::EOpAtomicCounter:
     case glslang::EOpImageAtomicLoad:
     case glslang::EOpAtomicLoad:
-        opCode = spv::Op::OpAtomicLoad;
+        opCode = spv::OpAtomicLoad;
         break;
     case glslang::EOpAtomicStore:
     case glslang::EOpImageAtomicStore:
-        opCode = spv::Op::OpAtomicStore;
+        opCode = spv::OpAtomicStore;
         break;
     default:
         assert(0);
@@ -8876,7 +8009,7 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     }
 
     if (typeProxy == glslang::EbtInt64 || typeProxy == glslang::EbtUint64)
-        builder.addCapability(spv::Capability::Int64Atomics);
+        builder.addCapability(spv::CapabilityInt64Atomics);
 
     // Sort out the operands
     //  - mapping from glslang -> SPV
@@ -8888,21 +8021,21 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     // scope defaults to Device in the old model, QueueFamilyKHR in the new model
     spv::Id scopeId;
     if (glslangIntermediate->usingVulkanMemoryModel()) {
-        scopeId = builder.makeUintConstant(spv::Scope::QueueFamilyKHR);
+        scopeId = builder.makeUintConstant(spv::ScopeQueueFamilyKHR);
     } else {
-        scopeId = builder.makeUintConstant(spv::Scope::Device);
+        scopeId = builder.makeUintConstant(spv::ScopeDevice);
     }
     // semantics default to relaxed
     spv::Id semanticsId = builder.makeUintConstant(lvalueCoherentFlags.isVolatile() &&
         glslangIntermediate->usingVulkanMemoryModel() ?
-                                                    spv::MemorySemanticsMask::Volatile :
-                                                    spv::MemorySemanticsMask::MaskNone);
+                                                    spv::MemorySemanticsVolatileMask :
+                                                    spv::MemorySemanticsMaskNone);
     spv::Id semanticsId2 = semanticsId;
 
     pointerId = operands[0];
-    if (opCode == spv::Op::OpAtomicIIncrement || opCode == spv::Op::OpAtomicIDecrement) {
+    if (opCode == spv::OpAtomicIIncrement || opCode == spv::OpAtomicIDecrement) {
         // no additional operands
-    } else if (opCode == spv::Op::OpAtomicCompareExchange) {
+    } else if (opCode == spv::OpAtomicCompareExchange) {
         compareId = operands[1];
         valueId = operands[2];
         if (operands.size() > 3) {
@@ -8912,7 +8045,7 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
             semanticsId2 = builder.makeUintConstant(
                 builder.getConstantScalar(operands[6]) | builder.getConstantScalar(operands[7]));
         }
-    } else if (opCode == spv::Op::OpAtomicLoad) {
+    } else if (opCode == spv::OpAtomicLoad) {
         if (operands.size() > 1) {
             scopeId = operands[1];
             semanticsId = builder.makeUintConstant(
@@ -8929,21 +8062,20 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     }
 
     // Check for capabilities
-    auto const semanticsImmediate = (spv::MemorySemanticsMask)(builder.getConstantScalar(semanticsId) | builder.getConstantScalar(semanticsId2));
-    if (anySet(semanticsImmediate, spv::MemorySemanticsMask::MakeAvailableKHR |
-                                   spv::MemorySemanticsMask::MakeVisibleKHR |
-                                   spv::MemorySemanticsMask::OutputMemoryKHR |
-                                   spv::MemorySemanticsMask::Volatile)) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+    unsigned semanticsImmediate = builder.getConstantScalar(semanticsId) | builder.getConstantScalar(semanticsId2);
+    if (semanticsImmediate & (spv::MemorySemanticsMakeAvailableKHRMask |
+                              spv::MemorySemanticsMakeVisibleKHRMask |
+                              spv::MemorySemanticsOutputMemoryKHRMask |
+                              spv::MemorySemanticsVolatileMask)) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
     }
 
-    auto const scope = (spv::Scope)builder.getConstantScalar(scopeId);
-    if (scope == spv::Scope::QueueFamily) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+    if (builder.getConstantScalar(scopeId) == spv::ScopeQueueFamily) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
     }
 
-    if (glslangIntermediate->usingVulkanMemoryModel() && scope == spv::Scope::Device) {
-        builder.addCapability(spv::Capability::VulkanMemoryModelDeviceScopeKHR);
+    if (glslangIntermediate->usingVulkanMemoryModel() && builder.getConstantScalar(scopeId) == spv::ScopeDevice) {
+        builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
     }
 
     std::vector<spv::Id> spvAtomicOperands;  // hold the spv operands
@@ -8951,15 +8083,15 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     spvAtomicOperands.push_back(pointerId);
     spvAtomicOperands.push_back(scopeId);
     spvAtomicOperands.push_back(semanticsId);
-    if (opCode == spv::Op::OpAtomicCompareExchange) {
+    if (opCode == spv::OpAtomicCompareExchange) {
         spvAtomicOperands.push_back(semanticsId2);
         spvAtomicOperands.push_back(valueId);
         spvAtomicOperands.push_back(compareId);
-    } else if (opCode != spv::Op::OpAtomicLoad && opCode != spv::Op::OpAtomicIIncrement && opCode != spv::Op::OpAtomicIDecrement) {
+    } else if (opCode != spv::OpAtomicLoad && opCode != spv::OpAtomicIIncrement && opCode != spv::OpAtomicIDecrement) {
         spvAtomicOperands.push_back(valueId);
     }
 
-    if (opCode == spv::Op::OpAtomicStore) {
+    if (opCode == spv::OpAtomicStore) {
         builder.createNoResultOp(opCode, spvAtomicOperands);
         return 0;
     } else {
@@ -8968,7 +8100,7 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
         // GLSL and HLSL atomic-counter decrement return post-decrement value,
         // while SPIR-V returns pre-decrement value. Translate between these semantics.
         if (op == glslang::EOpAtomicCounterDecrement)
-            resultId = builder.createBinOp(spv::Op::OpISub, typeId, resultId, builder.makeIntConstant(1));
+            resultId = builder.createBinOp(spv::OpISub, typeId, resultId, builder.makeIntConstant(1));
 
         return resultId;
     }
@@ -8981,21 +8113,21 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
     bool isUnsigned = isTypeUnsignedInt(typeProxy);
     bool isFloat = isTypeFloat(typeProxy);
 
-    spv::Op opCode = spv::Op::OpNop;
+    spv::Op opCode = spv::OpNop;
     std::vector<spv::IdImmediate> spvGroupOperands;
-    spv::GroupOperation groupOperation = spv::GroupOperation::Max;
+    spv::GroupOperation groupOperation = spv::GroupOperationMax;
 
     if (op == glslang::EOpBallot || op == glslang::EOpReadFirstInvocation ||
         op == glslang::EOpReadInvocation) {
         builder.addExtension(spv::E_SPV_KHR_shader_ballot);
-        builder.addCapability(spv::Capability::SubgroupBallotKHR);
+        builder.addCapability(spv::CapabilitySubgroupBallotKHR);
     } else if (op == glslang::EOpAnyInvocation ||
         op == glslang::EOpAllInvocations ||
         op == glslang::EOpAllInvocationsEqual) {
         builder.addExtension(spv::E_SPV_KHR_subgroup_vote);
-        builder.addCapability(spv::Capability::SubgroupVoteKHR);
+        builder.addCapability(spv::CapabilitySubgroupVoteKHR);
     } else {
-        builder.addCapability(spv::Capability::Groups);
+        builder.addCapability(spv::CapabilityGroups);
         if (op == glslang::EOpMinInvocationsNonUniform ||
             op == glslang::EOpMaxInvocationsNonUniform ||
             op == glslang::EOpAddInvocationsNonUniform ||
@@ -9014,7 +8146,7 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
         case glslang::EOpMinInvocationsNonUniform:
         case glslang::EOpMaxInvocationsNonUniform:
         case glslang::EOpAddInvocationsNonUniform:
-            groupOperation = spv::GroupOperation::Reduce;
+            groupOperation = spv::GroupOperationReduce;
             break;
         case glslang::EOpMinInvocationsInclusiveScan:
         case glslang::EOpMaxInvocationsInclusiveScan:
@@ -9022,7 +8154,7 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
         case glslang::EOpMinInvocationsInclusiveScanNonUniform:
         case glslang::EOpMaxInvocationsInclusiveScanNonUniform:
         case glslang::EOpAddInvocationsInclusiveScanNonUniform:
-            groupOperation = spv::GroupOperation::InclusiveScan;
+            groupOperation = spv::GroupOperationInclusiveScan;
             break;
         case glslang::EOpMinInvocationsExclusiveScan:
         case glslang::EOpMaxInvocationsExclusiveScan:
@@ -9030,14 +8162,14 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
         case glslang::EOpMinInvocationsExclusiveScanNonUniform:
         case glslang::EOpMaxInvocationsExclusiveScanNonUniform:
         case glslang::EOpAddInvocationsExclusiveScanNonUniform:
-            groupOperation = spv::GroupOperation::ExclusiveScan;
+            groupOperation = spv::GroupOperationExclusiveScan;
             break;
         default:
             break;
         }
-        spv::IdImmediate scope = { true, builder.makeUintConstant(spv::Scope::Subgroup) };
+        spv::IdImmediate scope = { true, builder.makeUintConstant(spv::ScopeSubgroup) };
         spvGroupOperands.push_back(scope);
-        if (groupOperation != spv::GroupOperation::Max) {
+        if (groupOperation != spv::GroupOperationMax) {
             spv::IdImmediate groupOp = { false, (unsigned)groupOperation };
             spvGroupOperands.push_back(groupOp);
         }
@@ -9050,21 +8182,21 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
 
     switch (op) {
     case glslang::EOpAnyInvocation:
-        opCode = spv::Op::OpSubgroupAnyKHR;
+        opCode = spv::OpSubgroupAnyKHR;
         break;
     case glslang::EOpAllInvocations:
-        opCode = spv::Op::OpSubgroupAllKHR;
+        opCode = spv::OpSubgroupAllKHR;
         break;
     case glslang::EOpAllInvocationsEqual:
-        opCode = spv::Op::OpSubgroupAllEqualKHR;
+        opCode = spv::OpSubgroupAllEqualKHR;
         break;
     case glslang::EOpReadInvocation:
-        opCode = spv::Op::OpSubgroupReadInvocationKHR;
+        opCode = spv::OpSubgroupReadInvocationKHR;
         if (builder.isVectorType(typeId))
             return CreateInvocationsVectorOperation(opCode, groupOperation, typeId, operands);
         break;
     case glslang::EOpReadFirstInvocation:
-        opCode = spv::Op::OpSubgroupFirstInvocationKHR;
+        opCode = spv::OpSubgroupFirstInvocationKHR;
         if (builder.isVectorType(typeId))
             return CreateInvocationsVectorOperation(opCode, groupOperation, typeId, operands);
         break;
@@ -9078,14 +8210,14 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
         //
         spv::Id uintType  = builder.makeUintType(32);
         spv::Id uvec4Type = builder.makeVectorType(uintType, 4);
-        spv::Id result = builder.createOp(spv::Op::OpSubgroupBallotKHR, uvec4Type, spvGroupOperands);
+        spv::Id result = builder.createOp(spv::OpSubgroupBallotKHR, uvec4Type, spvGroupOperands);
 
         std::vector<spv::Id> components;
         components.push_back(builder.createCompositeExtract(result, uintType, 0));
         components.push_back(builder.createCompositeExtract(result, uintType, 1));
 
         spv::Id uvec2Type = builder.makeVectorType(uintType, 2);
-        return builder.createUnaryOp(spv::Op::OpBitcast, typeId,
+        return builder.createUnaryOp(spv::OpBitcast, typeId,
                                      builder.createCompositeConstruct(uvec2Type, components));
     }
 
@@ -9102,29 +8234,29 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
             op == glslang::EOpMinInvocationsInclusiveScan ||
             op == glslang::EOpMinInvocationsExclusiveScan) {
             if (isFloat)
-                opCode = spv::Op::OpGroupFMin;
+                opCode = spv::OpGroupFMin;
             else {
                 if (isUnsigned)
-                    opCode = spv::Op::OpGroupUMin;
+                    opCode = spv::OpGroupUMin;
                 else
-                    opCode = spv::Op::OpGroupSMin;
+                    opCode = spv::OpGroupSMin;
             }
         } else if (op == glslang::EOpMaxInvocations ||
                    op == glslang::EOpMaxInvocationsInclusiveScan ||
                    op == glslang::EOpMaxInvocationsExclusiveScan) {
             if (isFloat)
-                opCode = spv::Op::OpGroupFMax;
+                opCode = spv::OpGroupFMax;
             else {
                 if (isUnsigned)
-                    opCode = spv::Op::OpGroupUMax;
+                    opCode = spv::OpGroupUMax;
                 else
-                    opCode = spv::Op::OpGroupSMax;
+                    opCode = spv::OpGroupSMax;
             }
         } else {
             if (isFloat)
-                opCode = spv::Op::OpGroupFAdd;
+                opCode = spv::OpGroupFAdd;
             else
-                opCode = spv::Op::OpGroupIAdd;
+                opCode = spv::OpGroupIAdd;
         }
 
         if (builder.isVectorType(typeId))
@@ -9144,31 +8276,31 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
             op == glslang::EOpMinInvocationsInclusiveScanNonUniform ||
             op == glslang::EOpMinInvocationsExclusiveScanNonUniform) {
             if (isFloat)
-                opCode = spv::Op::OpGroupFMinNonUniformAMD;
+                opCode = spv::OpGroupFMinNonUniformAMD;
             else {
                 if (isUnsigned)
-                    opCode = spv::Op::OpGroupUMinNonUniformAMD;
+                    opCode = spv::OpGroupUMinNonUniformAMD;
                 else
-                    opCode = spv::Op::OpGroupSMinNonUniformAMD;
+                    opCode = spv::OpGroupSMinNonUniformAMD;
             }
         }
         else if (op == glslang::EOpMaxInvocationsNonUniform ||
                  op == glslang::EOpMaxInvocationsInclusiveScanNonUniform ||
                  op == glslang::EOpMaxInvocationsExclusiveScanNonUniform) {
             if (isFloat)
-                opCode = spv::Op::OpGroupFMaxNonUniformAMD;
+                opCode = spv::OpGroupFMaxNonUniformAMD;
             else {
                 if (isUnsigned)
-                    opCode = spv::Op::OpGroupUMaxNonUniformAMD;
+                    opCode = spv::OpGroupUMaxNonUniformAMD;
                 else
-                    opCode = spv::Op::OpGroupSMaxNonUniformAMD;
+                    opCode = spv::OpGroupSMaxNonUniformAMD;
             }
         }
         else {
             if (isFloat)
-                opCode = spv::Op::OpGroupFAddNonUniformAMD;
+                opCode = spv::OpGroupFAddNonUniformAMD;
             else
-                opCode = spv::Op::OpGroupIAddNonUniformAMD;
+                opCode = spv::OpGroupIAddNonUniformAMD;
         }
 
         if (builder.isVectorType(typeId))
@@ -9180,7 +8312,7 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
         return spv::NoResult;
     }
 
-    assert(opCode != spv::Op::OpNop);
+    assert(opCode != spv::OpNop);
     return builder.createOp(opCode, typeId, spvGroupOperands);
 }
 
@@ -9188,15 +8320,15 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
 spv::Id TGlslangToSpvTraverser::CreateInvocationsVectorOperation(spv::Op op, spv::GroupOperation groupOperation,
     spv::Id typeId, std::vector<spv::Id>& operands)
 {
-    assert(op == spv::Op::OpGroupFMin || op == spv::Op::OpGroupUMin || op == spv::Op::OpGroupSMin ||
-           op == spv::Op::OpGroupFMax || op == spv::Op::OpGroupUMax || op == spv::Op::OpGroupSMax ||
-           op == spv::Op::OpGroupFAdd || op == spv::Op::OpGroupIAdd || op == spv::Op::OpGroupBroadcast ||
-           op == spv::Op::OpSubgroupReadInvocationKHR || op == spv::Op::OpSubgroupFirstInvocationKHR ||
-           op == spv::Op::OpGroupFMinNonUniformAMD || op == spv::Op::OpGroupUMinNonUniformAMD ||
-           op == spv::Op::OpGroupSMinNonUniformAMD ||
-           op == spv::Op::OpGroupFMaxNonUniformAMD || op == spv::Op::OpGroupUMaxNonUniformAMD ||
-           op == spv::Op::OpGroupSMaxNonUniformAMD ||
-           op == spv::Op::OpGroupFAddNonUniformAMD || op == spv::Op::OpGroupIAddNonUniformAMD);
+    assert(op == spv::OpGroupFMin || op == spv::OpGroupUMin || op == spv::OpGroupSMin ||
+           op == spv::OpGroupFMax || op == spv::OpGroupUMax || op == spv::OpGroupSMax ||
+           op == spv::OpGroupFAdd || op == spv::OpGroupIAdd || op == spv::OpGroupBroadcast ||
+           op == spv::OpSubgroupReadInvocationKHR || op == spv::OpSubgroupFirstInvocationKHR ||
+           op == spv::OpGroupFMinNonUniformAMD || op == spv::OpGroupUMinNonUniformAMD ||
+           op == spv::OpGroupSMinNonUniformAMD ||
+           op == spv::OpGroupFMaxNonUniformAMD || op == spv::OpGroupUMaxNonUniformAMD ||
+           op == spv::OpGroupSMaxNonUniformAMD ||
+           op == spv::OpGroupFAddNonUniformAMD || op == spv::OpGroupIAddNonUniformAMD);
 
     // Handle group invocation operations scalar by scalar.
     // The result type is the same type as the original type.
@@ -9216,20 +8348,20 @@ spv::Id TGlslangToSpvTraverser::CreateInvocationsVectorOperation(spv::Op op, spv
         indexes.push_back(comp);
         spv::IdImmediate scalar = { true, builder.createCompositeExtract(operands[0], scalarType, indexes) };
         std::vector<spv::IdImmediate> spvGroupOperands;
-        if (op == spv::Op::OpSubgroupReadInvocationKHR) {
+        if (op == spv::OpSubgroupReadInvocationKHR) {
             spvGroupOperands.push_back(scalar);
             spv::IdImmediate operand = { true, operands[1] };
             spvGroupOperands.push_back(operand);
-        } else if (op == spv::Op::OpSubgroupFirstInvocationKHR) {
+        } else if (op == spv::OpSubgroupFirstInvocationKHR) {
             spvGroupOperands.push_back(scalar);
-        } else if (op == spv::Op::OpGroupBroadcast) {
-            spv::IdImmediate scope = { true, builder.makeUintConstant(spv::Scope::Subgroup) };
+        } else if (op == spv::OpGroupBroadcast) {
+            spv::IdImmediate scope = { true, builder.makeUintConstant(spv::ScopeSubgroup) };
             spvGroupOperands.push_back(scope);
             spvGroupOperands.push_back(scalar);
             spv::IdImmediate operand = { true, operands[1] };
             spvGroupOperands.push_back(operand);
         } else {
-            spv::IdImmediate scope = { true, builder.makeUintConstant(spv::Scope::Subgroup) };
+            spv::IdImmediate scope = { true, builder.makeUintConstant(spv::ScopeSubgroup) };
             spvGroupOperands.push_back(scope);
             spv::IdImmediate groupOp = { false, (unsigned)groupOperation };
             spvGroupOperands.push_back(groupOp);
@@ -9250,18 +8382,18 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     // Add the required capabilities.
     switch (op) {
     case glslang::EOpSubgroupElect:
-        builder.addCapability(spv::Capability::GroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
         break;
     case glslang::EOpSubgroupQuadAll:
     case glslang::EOpSubgroupQuadAny:
         builder.addExtension(spv::E_SPV_KHR_quad_control);
-        builder.addCapability(spv::Capability::QuadControlKHR);
+        builder.addCapability(spv::CapabilityQuadControlKHR);
         [[fallthrough]];
     case glslang::EOpSubgroupAll:
     case glslang::EOpSubgroupAny:
     case glslang::EOpSubgroupAllEqual:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformVote);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformVote);
         break;
     case glslang::EOpSubgroupBroadcast:
     case glslang::EOpSubgroupBroadcastFirst:
@@ -9273,23 +8405,23 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupBallotExclusiveBitCount:
     case glslang::EOpSubgroupBallotFindLSB:
     case glslang::EOpSubgroupBallotFindMSB:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformBallot);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformBallot);
         break;
     case glslang::EOpSubgroupRotate:
     case glslang::EOpSubgroupClusteredRotate:
         builder.addExtension(spv::E_SPV_KHR_subgroup_rotate);
-        builder.addCapability(spv::Capability::GroupNonUniformRotateKHR);
+        builder.addCapability(spv::CapabilityGroupNonUniformRotateKHR);
         break;
     case glslang::EOpSubgroupShuffle:
     case glslang::EOpSubgroupShuffleXor:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformShuffle);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformShuffle);
         break;
     case glslang::EOpSubgroupShuffleUp:
     case glslang::EOpSubgroupShuffleDown:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformShuffleRelative);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformShuffleRelative);
         break;
     case glslang::EOpSubgroupAdd:
     case glslang::EOpSubgroupMul:
@@ -9312,8 +8444,8 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupExclusiveAnd:
     case glslang::EOpSubgroupExclusiveOr:
     case glslang::EOpSubgroupExclusiveXor:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformArithmetic);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformArithmetic);
         break;
     case glslang::EOpSubgroupClusteredAdd:
     case glslang::EOpSubgroupClusteredMul:
@@ -9322,15 +8454,15 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupClusteredAnd:
     case glslang::EOpSubgroupClusteredOr:
     case glslang::EOpSubgroupClusteredXor:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformClustered);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformClustered);
         break;
     case glslang::EOpSubgroupQuadBroadcast:
     case glslang::EOpSubgroupQuadSwapHorizontal:
     case glslang::EOpSubgroupQuadSwapVertical:
     case glslang::EOpSubgroupQuadSwapDiagonal:
-        builder.addCapability(spv::Capability::GroupNonUniform);
-        builder.addCapability(spv::Capability::GroupNonUniformQuad);
+        builder.addCapability(spv::CapabilityGroupNonUniform);
+        builder.addCapability(spv::CapabilityGroupNonUniformQuad);
         break;
     case glslang::EOpSubgroupPartitionedAdd:
     case glslang::EOpSubgroupPartitionedMul:
@@ -9354,7 +8486,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedExclusiveOr:
     case glslang::EOpSubgroupPartitionedExclusiveXor:
         builder.addExtension(spv::E_SPV_NV_shader_subgroup_partitioned);
-        builder.addCapability(spv::Capability::GroupNonUniformPartitionedNV);
+        builder.addCapability(spv::CapabilityGroupNonUniformPartitionedNV);
         break;
     default: assert(0 && "Unhandled subgroup operation!");
     }
@@ -9364,32 +8496,32 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     const bool isFloat = isTypeFloat(typeProxy);
     const bool isBool = typeProxy == glslang::EbtBool;
 
-    spv::Op opCode = spv::Op::OpNop;
+    spv::Op opCode = spv::OpNop;
 
     // Figure out which opcode to use.
     switch (op) {
-    case glslang::EOpSubgroupElect:                   opCode = spv::Op::OpGroupNonUniformElect; break;
-    case glslang::EOpSubgroupQuadAll:                 opCode = spv::Op::OpGroupNonUniformQuadAllKHR; break;
-    case glslang::EOpSubgroupAll:                     opCode = spv::Op::OpGroupNonUniformAll; break;
-    case glslang::EOpSubgroupQuadAny:                 opCode = spv::Op::OpGroupNonUniformQuadAnyKHR; break;
-    case glslang::EOpSubgroupAny:                     opCode = spv::Op::OpGroupNonUniformAny; break;
-    case glslang::EOpSubgroupAllEqual:                opCode = spv::Op::OpGroupNonUniformAllEqual; break;
-    case glslang::EOpSubgroupBroadcast:               opCode = spv::Op::OpGroupNonUniformBroadcast; break;
-    case glslang::EOpSubgroupBroadcastFirst:          opCode = spv::Op::OpGroupNonUniformBroadcastFirst; break;
-    case glslang::EOpSubgroupBallot:                  opCode = spv::Op::OpGroupNonUniformBallot; break;
-    case glslang::EOpSubgroupInverseBallot:           opCode = spv::Op::OpGroupNonUniformInverseBallot; break;
-    case glslang::EOpSubgroupBallotBitExtract:        opCode = spv::Op::OpGroupNonUniformBallotBitExtract; break;
+    case glslang::EOpSubgroupElect:                   opCode = spv::OpGroupNonUniformElect; break;
+    case glslang::EOpSubgroupQuadAll:                 opCode = spv::OpGroupNonUniformQuadAllKHR; break;
+    case glslang::EOpSubgroupAll:                     opCode = spv::OpGroupNonUniformAll; break;
+    case glslang::EOpSubgroupQuadAny:                 opCode = spv::OpGroupNonUniformQuadAnyKHR; break;
+    case glslang::EOpSubgroupAny:                     opCode = spv::OpGroupNonUniformAny; break;
+    case glslang::EOpSubgroupAllEqual:                opCode = spv::OpGroupNonUniformAllEqual; break;
+    case glslang::EOpSubgroupBroadcast:               opCode = spv::OpGroupNonUniformBroadcast; break;
+    case glslang::EOpSubgroupBroadcastFirst:          opCode = spv::OpGroupNonUniformBroadcastFirst; break;
+    case glslang::EOpSubgroupBallot:                  opCode = spv::OpGroupNonUniformBallot; break;
+    case glslang::EOpSubgroupInverseBallot:           opCode = spv::OpGroupNonUniformInverseBallot; break;
+    case glslang::EOpSubgroupBallotBitExtract:        opCode = spv::OpGroupNonUniformBallotBitExtract; break;
     case glslang::EOpSubgroupBallotBitCount:
     case glslang::EOpSubgroupBallotInclusiveBitCount:
-    case glslang::EOpSubgroupBallotExclusiveBitCount: opCode = spv::Op::OpGroupNonUniformBallotBitCount; break;
-    case glslang::EOpSubgroupBallotFindLSB:           opCode = spv::Op::OpGroupNonUniformBallotFindLSB; break;
-    case glslang::EOpSubgroupBallotFindMSB:           opCode = spv::Op::OpGroupNonUniformBallotFindMSB; break;
-    case glslang::EOpSubgroupShuffle:                 opCode = spv::Op::OpGroupNonUniformShuffle; break;
-    case glslang::EOpSubgroupShuffleXor:              opCode = spv::Op::OpGroupNonUniformShuffleXor; break;
-    case glslang::EOpSubgroupShuffleUp:               opCode = spv::Op::OpGroupNonUniformShuffleUp; break;
-    case glslang::EOpSubgroupShuffleDown:             opCode = spv::Op::OpGroupNonUniformShuffleDown; break;
+    case glslang::EOpSubgroupBallotExclusiveBitCount: opCode = spv::OpGroupNonUniformBallotBitCount; break;
+    case glslang::EOpSubgroupBallotFindLSB:           opCode = spv::OpGroupNonUniformBallotFindLSB; break;
+    case glslang::EOpSubgroupBallotFindMSB:           opCode = spv::OpGroupNonUniformBallotFindMSB; break;
+    case glslang::EOpSubgroupShuffle:                 opCode = spv::OpGroupNonUniformShuffle; break;
+    case glslang::EOpSubgroupShuffleXor:              opCode = spv::OpGroupNonUniformShuffleXor; break;
+    case glslang::EOpSubgroupShuffleUp:               opCode = spv::OpGroupNonUniformShuffleUp; break;
+    case glslang::EOpSubgroupShuffleDown:             opCode = spv::OpGroupNonUniformShuffleDown; break;
     case glslang::EOpSubgroupRotate:
-    case glslang::EOpSubgroupClusteredRotate:         opCode = spv::Op::OpGroupNonUniformRotateKHR; break;
+    case glslang::EOpSubgroupClusteredRotate:         opCode = spv::OpGroupNonUniformRotateKHR; break;
     case glslang::EOpSubgroupAdd:
     case glslang::EOpSubgroupInclusiveAdd:
     case glslang::EOpSubgroupExclusiveAdd:
@@ -9398,9 +8530,9 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveAdd:
     case glslang::EOpSubgroupPartitionedExclusiveAdd:
         if (isFloat) {
-            opCode = spv::Op::OpGroupNonUniformFAdd;
+            opCode = spv::OpGroupNonUniformFAdd;
         } else {
-            opCode = spv::Op::OpGroupNonUniformIAdd;
+            opCode = spv::OpGroupNonUniformIAdd;
         }
         break;
     case glslang::EOpSubgroupMul:
@@ -9411,9 +8543,9 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveMul:
     case glslang::EOpSubgroupPartitionedExclusiveMul:
         if (isFloat) {
-            opCode = spv::Op::OpGroupNonUniformFMul;
+            opCode = spv::OpGroupNonUniformFMul;
         } else {
-            opCode = spv::Op::OpGroupNonUniformIMul;
+            opCode = spv::OpGroupNonUniformIMul;
         }
         break;
     case glslang::EOpSubgroupMin:
@@ -9424,11 +8556,11 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveMin:
     case glslang::EOpSubgroupPartitionedExclusiveMin:
         if (isFloat) {
-            opCode = spv::Op::OpGroupNonUniformFMin;
+            opCode = spv::OpGroupNonUniformFMin;
         } else if (isUnsigned) {
-            opCode = spv::Op::OpGroupNonUniformUMin;
+            opCode = spv::OpGroupNonUniformUMin;
         } else {
-            opCode = spv::Op::OpGroupNonUniformSMin;
+            opCode = spv::OpGroupNonUniformSMin;
         }
         break;
     case glslang::EOpSubgroupMax:
@@ -9439,11 +8571,11 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveMax:
     case glslang::EOpSubgroupPartitionedExclusiveMax:
         if (isFloat) {
-            opCode = spv::Op::OpGroupNonUniformFMax;
+            opCode = spv::OpGroupNonUniformFMax;
         } else if (isUnsigned) {
-            opCode = spv::Op::OpGroupNonUniformUMax;
+            opCode = spv::OpGroupNonUniformUMax;
         } else {
-            opCode = spv::Op::OpGroupNonUniformSMax;
+            opCode = spv::OpGroupNonUniformSMax;
         }
         break;
     case glslang::EOpSubgroupAnd:
@@ -9454,9 +8586,9 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveAnd:
     case glslang::EOpSubgroupPartitionedExclusiveAnd:
         if (isBool) {
-            opCode = spv::Op::OpGroupNonUniformLogicalAnd;
+            opCode = spv::OpGroupNonUniformLogicalAnd;
         } else {
-            opCode = spv::Op::OpGroupNonUniformBitwiseAnd;
+            opCode = spv::OpGroupNonUniformBitwiseAnd;
         }
         break;
     case glslang::EOpSubgroupOr:
@@ -9467,9 +8599,9 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveOr:
     case glslang::EOpSubgroupPartitionedExclusiveOr:
         if (isBool) {
-            opCode = spv::Op::OpGroupNonUniformLogicalOr;
+            opCode = spv::OpGroupNonUniformLogicalOr;
         } else {
-            opCode = spv::Op::OpGroupNonUniformBitwiseOr;
+            opCode = spv::OpGroupNonUniformBitwiseOr;
         }
         break;
     case glslang::EOpSubgroupXor:
@@ -9480,20 +8612,20 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveXor:
     case glslang::EOpSubgroupPartitionedExclusiveXor:
         if (isBool) {
-            opCode = spv::Op::OpGroupNonUniformLogicalXor;
+            opCode = spv::OpGroupNonUniformLogicalXor;
         } else {
-            opCode = spv::Op::OpGroupNonUniformBitwiseXor;
+            opCode = spv::OpGroupNonUniformBitwiseXor;
         }
         break;
-    case glslang::EOpSubgroupQuadBroadcast:      opCode = spv::Op::OpGroupNonUniformQuadBroadcast; break;
+    case glslang::EOpSubgroupQuadBroadcast:      opCode = spv::OpGroupNonUniformQuadBroadcast; break;
     case glslang::EOpSubgroupQuadSwapHorizontal:
     case glslang::EOpSubgroupQuadSwapVertical:
-    case glslang::EOpSubgroupQuadSwapDiagonal:   opCode = spv::Op::OpGroupNonUniformQuadSwap; break;
+    case glslang::EOpSubgroupQuadSwapDiagonal:   opCode = spv::OpGroupNonUniformQuadSwap; break;
     default: assert(0 && "Unhandled subgroup operation!");
     }
 
     // get the right Group Operation
-    spv::GroupOperation groupOperation = spv::GroupOperation::Max;
+    spv::GroupOperation groupOperation = spv::GroupOperationMax;
     switch (op) {
     default:
         break;
@@ -9505,7 +8637,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupAnd:
     case glslang::EOpSubgroupOr:
     case glslang::EOpSubgroupXor:
-        groupOperation = spv::GroupOperation::Reduce;
+        groupOperation = spv::GroupOperationReduce;
         break;
     case glslang::EOpSubgroupBallotInclusiveBitCount:
     case glslang::EOpSubgroupInclusiveAdd:
@@ -9515,7 +8647,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupInclusiveAnd:
     case glslang::EOpSubgroupInclusiveOr:
     case glslang::EOpSubgroupInclusiveXor:
-        groupOperation = spv::GroupOperation::InclusiveScan;
+        groupOperation = spv::GroupOperationInclusiveScan;
         break;
     case glslang::EOpSubgroupBallotExclusiveBitCount:
     case glslang::EOpSubgroupExclusiveAdd:
@@ -9525,7 +8657,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupExclusiveAnd:
     case glslang::EOpSubgroupExclusiveOr:
     case glslang::EOpSubgroupExclusiveXor:
-        groupOperation = spv::GroupOperation::ExclusiveScan;
+        groupOperation = spv::GroupOperationExclusiveScan;
         break;
     case glslang::EOpSubgroupClusteredAdd:
     case glslang::EOpSubgroupClusteredMul:
@@ -9534,7 +8666,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupClusteredAnd:
     case glslang::EOpSubgroupClusteredOr:
     case glslang::EOpSubgroupClusteredXor:
-        groupOperation = spv::GroupOperation::ClusteredReduce;
+        groupOperation = spv::GroupOperationClusteredReduce;
         break;
     case glslang::EOpSubgroupPartitionedAdd:
     case glslang::EOpSubgroupPartitionedMul:
@@ -9543,7 +8675,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedAnd:
     case glslang::EOpSubgroupPartitionedOr:
     case glslang::EOpSubgroupPartitionedXor:
-        groupOperation = spv::GroupOperation::PartitionedReduceNV;
+        groupOperation = spv::GroupOperationPartitionedReduceNV;
         break;
     case glslang::EOpSubgroupPartitionedInclusiveAdd:
     case glslang::EOpSubgroupPartitionedInclusiveMul:
@@ -9552,7 +8684,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedInclusiveAnd:
     case glslang::EOpSubgroupPartitionedInclusiveOr:
     case glslang::EOpSubgroupPartitionedInclusiveXor:
-        groupOperation = spv::GroupOperation::PartitionedInclusiveScanNV;
+        groupOperation = spv::GroupOperationPartitionedInclusiveScanNV;
         break;
     case glslang::EOpSubgroupPartitionedExclusiveAdd:
     case glslang::EOpSubgroupPartitionedExclusiveMul:
@@ -9561,7 +8693,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     case glslang::EOpSubgroupPartitionedExclusiveAnd:
     case glslang::EOpSubgroupPartitionedExclusiveOr:
     case glslang::EOpSubgroupPartitionedExclusiveXor:
-        groupOperation = spv::GroupOperation::PartitionedExclusiveScanNV;
+        groupOperation = spv::GroupOperationPartitionedExclusiveScanNV;
         break;
     }
 
@@ -9569,14 +8701,14 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
     std::vector<spv::IdImmediate> spvGroupOperands;
 
     // Every operation begins with the Execution Scope operand.
-    spv::IdImmediate executionScope = { true, builder.makeUintConstant(spv::Scope::Subgroup) };
+    spv::IdImmediate executionScope = { true, builder.makeUintConstant(spv::ScopeSubgroup) };
     // All other ops need the execution scope. Quad Control Ops don't need scope, it's always Quad.
-    if (opCode != spv::Op::OpGroupNonUniformQuadAllKHR && opCode != spv::Op::OpGroupNonUniformQuadAnyKHR) {
+    if (opCode != spv::OpGroupNonUniformQuadAllKHR && opCode != spv::OpGroupNonUniformQuadAnyKHR) {
         spvGroupOperands.push_back(executionScope);
     }
 
     // Next, for all operations that use a Group Operation, push that as an operand.
-    if (groupOperation != spv::GroupOperation::Max) {
+    if (groupOperation != spv::GroupOperationMax) {
         spv::IdImmediate groupOperand = { false, (unsigned)groupOperation };
         spvGroupOperands.push_back(groupOperand);
     }
@@ -9609,7 +8741,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
     bool isUnsigned = isTypeUnsignedInt(typeProxy);
     bool isFloat = isTypeFloat(typeProxy);
 
-    spv::Op opCode = spv::Op::OpNop;
+    spv::Op opCode = spv::OpNop;
     int extBuiltins = -1;
     int libCall = -1;
     size_t consumedOperands = operands.size();
@@ -9632,13 +8764,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         builder.promoteScalar(precision, operands.front(), operands.back());
         break;
     case glslang::EOpModf:
-        {
-            libCall = spv::GLSLstd450ModfStruct;
-            assert(builder.isFloatType(builder.getScalarTypeId(typeId0)));
-            // The returned struct has two members of the same type as the first argument
-            typeId = builder.makeStructResultType(typeId0, typeId0);
-            consumedOperands = 1;
-        }
+        libCall = spv::GLSLstd450Modf;
         break;
     case glslang::EOpMax:
         if (isFloat)
@@ -9653,53 +8779,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         libCall = spv::GLSLstd450Pow;
         break;
     case glslang::EOpDot:
-    case glslang::EOpDotPackedEXT:
-    case glslang::EOpDotAccSatEXT:
-    case glslang::EOpDotPackedAccSatEXT:
-        {
-            if (builder.isFloatType(builder.getScalarTypeId(typeId0)) ||
-                // HLSL supports dot(int,int) which is just a multiply
-                glslangIntermediate->getSource() == glslang::EShSourceHlsl) {
-                if (typeProxy == glslang::EbtBFloat16) {
-                    builder.addExtension(spv::E_SPV_KHR_bfloat16);
-                    builder.addCapability(spv::Capability::BFloat16DotProductKHR);
-                }
-                opCode = spv::Op::OpDot;
-            } else {
-                builder.addExtension(spv::E_SPV_KHR_integer_dot_product);
-                builder.addCapability(spv::Capability::DotProductKHR);
-                const unsigned int vectorSize = builder.getNumComponents(operands[0]);
-                if (op == glslang::EOpDotPackedEXT || op == glslang::EOpDotPackedAccSatEXT) {
-                    builder.addCapability(spv::Capability::DotProductInput4x8BitPackedKHR);
-                } else if (vectorSize == 4 && builder.getScalarTypeWidth(typeId0) == 8) {
-                    builder.addCapability(spv::Capability::DotProductInput4x8BitKHR);
-                } else {
-                    builder.addCapability(spv::Capability::DotProductInputAllKHR);
-                }
-                const bool type0isSigned = builder.isIntType(builder.getScalarTypeId(typeId0));
-                const bool type1isSigned = builder.isIntType(builder.getScalarTypeId(typeId1));
-                const bool accSat = (op == glslang::EOpDotAccSatEXT || op == glslang::EOpDotPackedAccSatEXT);
-                if (!type0isSigned && !type1isSigned) {
-                    opCode = accSat ? spv::Op::OpUDotAccSatKHR : spv::Op::OpUDotKHR;
-                } else if (type0isSigned && type1isSigned) {
-                    opCode = accSat ? spv::Op::OpSDotAccSatKHR : spv::Op::OpSDotKHR;
-                } else {
-                    opCode = accSat ? spv::Op::OpSUDotAccSatKHR : spv::Op::OpSUDotKHR;
-                    // the spir-v opcode assumes the operands to be "signed, unsigned" in that order, so swap if needed
-                    if (type1isSigned) {
-                        std::swap(operands[0], operands[1]);
-                    }
-                }
-                std::vector<spv::IdImmediate> operands2;
-                for (auto &o : operands) {
-                    operands2.push_back({true, o});
-                }
-                if (op == glslang::EOpDotPackedEXT || op == glslang::EOpDotPackedAccSatEXT) {
-                    operands2.push_back({false, 0});
-                }
-                return builder.createOp(opCode, typeId, operands2);
-            }
-        }
+        opCode = spv::OpDot;
         break;
     case glslang::EOpAtan:
         libCall = spv::GLSLstd450Atan2;
@@ -9720,7 +8800,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
             assert(isFloat);
             libCall = spv::GLSLstd450FMix;
         } else {
-            opCode = spv::Op::OpSelect;
+            opCode = spv::OpSelect;
             std::swap(operands.front(), operands.back());
         }
         builder.promoteScalar(precision, operands.front(), operands.back());
@@ -9755,20 +8835,20 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
             // This is for the extended controlBarrier function, with four operands.
             // The unextended barrier() goes through createNoArgOperation.
             assert(operands.size() == 4);
-            auto const executionScope = (spv::Scope)builder.getConstantScalar(operands[0]);
-            auto const memoryScope = (spv::Scope)builder.getConstantScalar(operands[1]);
-            auto const semantics = (spv::MemorySemanticsMask)(builder.getConstantScalar(operands[2]) | builder.getConstantScalar(operands[3]));
-            builder.createControlBarrier(executionScope, memoryScope,
-                semantics);
-            if (anySet(semantics, spv::MemorySemanticsMask::MakeAvailableKHR |
-                                  spv::MemorySemanticsMask::MakeVisibleKHR |
-                                  spv::MemorySemanticsMask::OutputMemoryKHR |
-                                  spv::MemorySemanticsMask::Volatile)) {
-                builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+            unsigned int executionScope = builder.getConstantScalar(operands[0]);
+            unsigned int memoryScope = builder.getConstantScalar(operands[1]);
+            unsigned int semantics = builder.getConstantScalar(operands[2]) | builder.getConstantScalar(operands[3]);
+            builder.createControlBarrier((spv::Scope)executionScope, (spv::Scope)memoryScope,
+                (spv::MemorySemanticsMask)semantics);
+            if (semantics & (spv::MemorySemanticsMakeAvailableKHRMask |
+                             spv::MemorySemanticsMakeVisibleKHRMask |
+                             spv::MemorySemanticsOutputMemoryKHRMask |
+                             spv::MemorySemanticsVolatileMask)) {
+                builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
             }
-            if (glslangIntermediate->usingVulkanMemoryModel() && (executionScope == spv::Scope::Device ||
-                memoryScope == spv::Scope::Device)) {
-                builder.addCapability(spv::Capability::VulkanMemoryModelDeviceScopeKHR);
+            if (glslangIntermediate->usingVulkanMemoryModel() && (executionScope == spv::ScopeDevice ||
+                memoryScope == spv::ScopeDevice)) {
+                builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
             }
             return 0;
         }
@@ -9778,17 +8858,17 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
             // This is for the extended memoryBarrier function, with three operands.
             // The unextended memoryBarrier() goes through createNoArgOperation.
             assert(operands.size() == 3);
-            auto const memoryScope = (spv::Scope)builder.getConstantScalar(operands[0]);
-            auto const semantics = (spv::MemorySemanticsMask)(builder.getConstantScalar(operands[1]) | builder.getConstantScalar(operands[2]));
-            builder.createMemoryBarrier(memoryScope, semantics);
-            if (anySet(semantics, spv::MemorySemanticsMask::MakeAvailableKHR |
-                                  spv::MemorySemanticsMask::MakeVisibleKHR |
-                                  spv::MemorySemanticsMask::OutputMemoryKHR |
-                                  spv::MemorySemanticsMask::Volatile)) {
-                builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+            unsigned int memoryScope = builder.getConstantScalar(operands[0]);
+            unsigned int semantics = builder.getConstantScalar(operands[1]) | builder.getConstantScalar(operands[2]);
+            builder.createMemoryBarrier((spv::Scope)memoryScope, (spv::MemorySemanticsMask)semantics);
+            if (semantics & (spv::MemorySemanticsMakeAvailableKHRMask |
+                             spv::MemorySemanticsMakeVisibleKHRMask |
+                             spv::MemorySemanticsOutputMemoryKHRMask |
+                             spv::MemorySemanticsVolatileMask)) {
+                builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
             }
-            if (glslangIntermediate->usingVulkanMemoryModel() && memoryScope == spv::Scope::Device) {
-                builder.addCapability(spv::Capability::VulkanMemoryModelDeviceScopeKHR);
+            if (glslangIntermediate->usingVulkanMemoryModel() && memoryScope == spv::ScopeDevice) {
+                builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
             }
             return 0;
         }
@@ -9805,33 +8885,33 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         libCall = spv::GLSLstd450InterpolateAtOffset;
         break;
     case glslang::EOpAddCarry:
-        opCode = spv::Op::OpIAddCarry;
+        opCode = spv::OpIAddCarry;
         typeId = builder.makeStructResultType(typeId0, typeId0);
         consumedOperands = 2;
         break;
     case glslang::EOpSubBorrow:
-        opCode = spv::Op::OpISubBorrow;
+        opCode = spv::OpISubBorrow;
         typeId = builder.makeStructResultType(typeId0, typeId0);
         consumedOperands = 2;
         break;
     case glslang::EOpUMulExtended:
-        opCode = spv::Op::OpUMulExtended;
+        opCode = spv::OpUMulExtended;
         typeId = builder.makeStructResultType(typeId0, typeId0);
         consumedOperands = 2;
         break;
     case glslang::EOpIMulExtended:
-        opCode = spv::Op::OpSMulExtended;
+        opCode = spv::OpSMulExtended;
         typeId = builder.makeStructResultType(typeId0, typeId0);
         consumedOperands = 2;
         break;
     case glslang::EOpBitfieldExtract:
         if (isUnsigned)
-            opCode = spv::Op::OpBitFieldUExtract;
+            opCode = spv::OpBitFieldUExtract;
         else
-            opCode = spv::Op::OpBitFieldSExtract;
+            opCode = spv::OpBitFieldSExtract;
         break;
     case glslang::EOpBitfieldInsert:
-        opCode = spv::Op::OpBitFieldInsert;
+        opCode = spv::OpBitFieldInsert;
         break;
 
     case glslang::EOpFma:
@@ -9957,514 +9037,301 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
 
     case glslang::EOpReportIntersection:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpReportIntersectionKHR;
+        opCode = spv::OpReportIntersectionKHR;
         break;
     case glslang::EOpTraceNV:
-        builder.createNoResultOp(spv::Op::OpTraceNV, operands);
+        builder.createNoResultOp(spv::OpTraceNV, operands);
         return 0;
     case glslang::EOpTraceRayMotionNV:
         builder.addExtension(spv::E_SPV_NV_ray_tracing_motion_blur);
-        builder.addCapability(spv::Capability::RayTracingMotionBlurNV);
-        builder.createNoResultOp(spv::Op::OpTraceRayMotionNV, operands);
+        builder.addCapability(spv::CapabilityRayTracingMotionBlurNV);
+        builder.createNoResultOp(spv::OpTraceRayMotionNV, operands);
         return 0;
     case glslang::EOpTraceKHR:
-        builder.createNoResultOp(spv::Op::OpTraceRayKHR, operands);
+        builder.createNoResultOp(spv::OpTraceRayKHR, operands);
         return 0;
     case glslang::EOpExecuteCallableNV:
-        builder.createNoResultOp(spv::Op::OpExecuteCallableNV, operands);
+        builder.createNoResultOp(spv::OpExecuteCallableNV, operands);
         return 0;
     case glslang::EOpExecuteCallableKHR:
-        builder.createNoResultOp(spv::Op::OpExecuteCallableKHR, operands);
+        builder.createNoResultOp(spv::OpExecuteCallableKHR, operands);
         return 0;
 
     case glslang::EOpRayQueryInitialize:
-        builder.createNoResultOp(spv::Op::OpRayQueryInitializeKHR, operands);
+        builder.createNoResultOp(spv::OpRayQueryInitializeKHR, operands);
         return 0;
     case glslang::EOpRayQueryTerminate:
-        builder.createNoResultOp(spv::Op::OpRayQueryTerminateKHR, operands);
+        builder.createNoResultOp(spv::OpRayQueryTerminateKHR, operands);
         return 0;
     case glslang::EOpRayQueryGenerateIntersection:
-        builder.createNoResultOp(spv::Op::OpRayQueryGenerateIntersectionKHR, operands);
+        builder.createNoResultOp(spv::OpRayQueryGenerateIntersectionKHR, operands);
         return 0;
     case glslang::EOpRayQueryConfirmIntersection:
-        builder.createNoResultOp(spv::Op::OpRayQueryConfirmIntersectionKHR, operands);
+        builder.createNoResultOp(spv::OpRayQueryConfirmIntersectionKHR, operands);
         return 0;
     case glslang::EOpRayQueryProceed:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpRayQueryProceedKHR;
+        opCode = spv::OpRayQueryProceedKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionType:
         typeId = builder.makeUintType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionTypeKHR;
+        opCode = spv::OpRayQueryGetIntersectionTypeKHR;
         break;
     case glslang::EOpRayQueryGetRayTMin:
         typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpRayQueryGetRayTMinKHR;
+        opCode = spv::OpRayQueryGetRayTMinKHR;
         break;
     case glslang::EOpRayQueryGetRayFlags:
         typeId = builder.makeIntType(32);
-        opCode = spv::Op::OpRayQueryGetRayFlagsKHR;
+        opCode = spv::OpRayQueryGetRayFlagsKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionT:
         typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionTKHR;
+        opCode = spv::OpRayQueryGetIntersectionTKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionInstanceCustomIndex:
         typeId = builder.makeIntType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR;
+        opCode = spv::OpRayQueryGetIntersectionInstanceCustomIndexKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionInstanceId:
         typeId = builder.makeIntType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionInstanceIdKHR;
+        opCode = spv::OpRayQueryGetIntersectionInstanceIdKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffset:
         typeId = builder.makeUintType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR;
+        opCode = spv::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionGeometryIndex:
         typeId = builder.makeIntType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionGeometryIndexKHR;
+        opCode = spv::OpRayQueryGetIntersectionGeometryIndexKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionPrimitiveIndex:
         typeId = builder.makeIntType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionPrimitiveIndexKHR;
+        opCode = spv::OpRayQueryGetIntersectionPrimitiveIndexKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionBarycentrics:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 2);
-        opCode = spv::Op::OpRayQueryGetIntersectionBarycentricsKHR;
+        opCode = spv::OpRayQueryGetIntersectionBarycentricsKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionFrontFace:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpRayQueryGetIntersectionFrontFaceKHR;
+        opCode = spv::OpRayQueryGetIntersectionFrontFaceKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionCandidateAABBOpaque:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR;
+        opCode = spv::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionObjectRayDirection:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpRayQueryGetIntersectionObjectRayDirectionKHR;
+        opCode = spv::OpRayQueryGetIntersectionObjectRayDirectionKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionObjectRayOrigin:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpRayQueryGetIntersectionObjectRayOriginKHR;
+        opCode = spv::OpRayQueryGetIntersectionObjectRayOriginKHR;
         break;
     case glslang::EOpRayQueryGetWorldRayDirection:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpRayQueryGetWorldRayDirectionKHR;
+        opCode = spv::OpRayQueryGetWorldRayDirectionKHR;
         break;
     case glslang::EOpRayQueryGetWorldRayOrigin:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpRayQueryGetWorldRayOriginKHR;
+        opCode = spv::OpRayQueryGetWorldRayOriginKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionObjectToWorld:
         typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpRayQueryGetIntersectionObjectToWorldKHR;
-        break;
-    case glslang::EOpRayQueryGetIntersectionClusterIdNV:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpRayQueryGetClusterIdNV;
+        opCode = spv::OpRayQueryGetIntersectionObjectToWorldKHR;
         break;
     case glslang::EOpRayQueryGetIntersectionWorldToObject:
         typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpRayQueryGetIntersectionWorldToObjectKHR;
-        break;
-    case glslang::EOpRayQueryGetIntersectionSpherePositionNV:
-        typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpRayQueryGetIntersectionSpherePositionNV;
-        break;
-    case glslang::EOpRayQueryGetIntersectionSphereRadiusNV:
-        typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionSphereRadiusNV;
-        break;
-    case glslang::EOpRayQueryGetIntersectionLSSHitValueNV:
-        typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpRayQueryGetIntersectionLSSHitValueNV;
-        break;
-    case glslang::EOpRayQueryIsSphereHitNV:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpRayQueryIsSphereHitNV;
-        break;
-    case glslang::EOpRayQueryIsLSSHitNV:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpRayQueryIsLSSHitNV;
+        opCode = spv::OpRayQueryGetIntersectionWorldToObjectKHR;
         break;
     case glslang::EOpWritePackedPrimitiveIndices4x8NV:
-        builder.createNoResultOp(spv::Op::OpWritePackedPrimitiveIndices4x8NV, operands);
+        builder.createNoResultOp(spv::OpWritePackedPrimitiveIndices4x8NV, operands);
         return 0;
     case glslang::EOpEmitMeshTasksEXT:
         if (taskPayloadID)
             operands.push_back(taskPayloadID);
         // As per SPV_EXT_mesh_shader make it a terminating instruction in the current block
-        builder.makeStatementTerminator(spv::Op::OpEmitMeshTasksEXT, operands, "post-OpEmitMeshTasksEXT");
+        builder.makeStatementTerminator(spv::OpEmitMeshTasksEXT, operands, "post-OpEmitMeshTasksEXT");
         return 0;
     case glslang::EOpSetMeshOutputsEXT:
-        builder.createNoResultOp(spv::Op::OpSetMeshOutputsEXT, operands);
+        builder.createNoResultOp(spv::OpSetMeshOutputsEXT, operands);
         return 0;
     case glslang::EOpCooperativeMatrixMulAddNV:
-        opCode = spv::Op::OpCooperativeMatrixMulAddNV;
+        opCode = spv::OpCooperativeMatrixMulAddNV;
         break;
     case glslang::EOpHitObjectTraceRayNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectTraceRayNV, operands);
-        return 0;
-    case glslang::EOpHitObjectTraceRayEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectTraceRayEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectTraceRayNV, operands);
         return 0;
     case glslang::EOpHitObjectTraceRayMotionNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectTraceRayMotionNV, operands);
-        return 0;
-    case glslang::EOpHitObjectTraceRayMotionEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectTraceRayMotionEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectTraceRayMotionNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordHitNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordHitNV, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordHitNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordHitMotionNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordHitMotionNV, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordHitMotionNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordHitWithIndexNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordHitWithIndexNV, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordHitWithIndexNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordHitWithIndexMotionNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordHitWithIndexMotionNV, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordHitWithIndexMotionNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordMissNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordMissNV, operands);
-        return 0;
-    case glslang::EOpHitObjectRecordMissEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordMissEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordMissNV, operands);
         return 0;
     case glslang::EOpHitObjectRecordMissMotionNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordMissMotionNV, operands);
-        return 0;
-    case glslang::EOpHitObjectRecordMissMotionEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordMissMotionEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectRecordMissMotionNV, operands);
         return 0;
     case glslang::EOpHitObjectExecuteShaderNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectExecuteShaderNV, operands);
-        return 0;
-    case glslang::EOpHitObjectExecuteShaderEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectExecuteShaderEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectExecuteShaderNV, operands);
         return 0;
     case glslang::EOpHitObjectIsEmptyNV:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsEmptyNV;
-        break;
-    case glslang::EOpHitObjectIsEmptyEXT:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsEmptyEXT;
+        opCode = spv::OpHitObjectIsEmptyNV;
         break;
     case glslang::EOpHitObjectIsMissNV:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsMissNV;
-        break;
-    case glslang::EOpHitObjectIsMissEXT:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsMissEXT;
+        opCode = spv::OpHitObjectIsMissNV;
         break;
     case glslang::EOpHitObjectIsHitNV:
         typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsHitNV;
-        break;
-    case glslang::EOpHitObjectIsSphereHitNV:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsSphereHitNV;
-        break;
-    case glslang::EOpHitObjectIsLSSHitNV:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsLSSHitNV;
-        break;
-    case glslang::EOpHitObjectIsHitEXT:
-        typeId = builder.makeBoolType();
-        opCode = spv::Op::OpHitObjectIsHitEXT;
+        opCode = spv::OpHitObjectIsHitNV;
         break;
     case glslang::EOpHitObjectGetRayTMinNV:
         typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetRayTMinNV;
-        break;
-    case glslang::EOpHitObjectGetRayTMinEXT:
-        typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetRayTMinEXT;
+        opCode = spv::OpHitObjectGetRayTMinNV;
         break;
     case glslang::EOpHitObjectGetRayTMaxNV:
         typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetRayTMaxNV;
-        break;
-    case glslang::EOpHitObjectGetRayTMaxEXT:
-        typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetRayTMaxEXT;
-        break;
-    case glslang::EOpHitObjectGetRayFlagsEXT:
-        typeId = builder.makeIntegerType(32, 0);
-        opCode = spv::Op::OpHitObjectGetRayFlagsEXT;
+        opCode = spv::OpHitObjectGetRayTMaxNV;
         break;
     case glslang::EOpHitObjectGetObjectRayOriginNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetObjectRayOriginNV;
-        break;
-    case glslang::EOpHitObjectGetObjectRayOriginEXT:
-        typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetObjectRayOriginEXT;
+        opCode = spv::OpHitObjectGetObjectRayOriginNV;
         break;
     case glslang::EOpHitObjectGetObjectRayDirectionNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetObjectRayDirectionNV;
-        break;
-    case glslang::EOpHitObjectGetObjectRayDirectionEXT:
-        typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetObjectRayDirectionEXT;
+        opCode = spv::OpHitObjectGetObjectRayDirectionNV;
         break;
     case glslang::EOpHitObjectGetWorldRayOriginNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetWorldRayOriginNV;
-        break;
-    case glslang::EOpHitObjectGetWorldRayOriginEXT:
-        typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetWorldRayOriginEXT;
+        opCode = spv::OpHitObjectGetWorldRayOriginNV;
         break;
     case glslang::EOpHitObjectGetWorldRayDirectionNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetWorldRayDirectionNV;
-        break;
-    case glslang::EOpHitObjectGetWorldRayDirectionEXT:
-        typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpHitObjectGetWorldRayDirectionEXT;
+        opCode = spv::OpHitObjectGetWorldRayDirectionNV;
         break;
     case glslang::EOpHitObjectGetWorldToObjectNV:
         typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpHitObjectGetWorldToObjectNV;
-        break;
-    case glslang::EOpHitObjectGetWorldToObjectEXT:
-        typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpHitObjectGetWorldToObjectEXT;
+        opCode = spv::OpHitObjectGetWorldToObjectNV;
         break;
     case glslang::EOpHitObjectGetObjectToWorldNV:
         typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpHitObjectGetObjectToWorldNV;
-        break;
-    case glslang::EOpHitObjectGetObjectToWorldEXT:
-        typeId = builder.makeMatrixType(builder.makeFloatType(32), 4, 3);
-        opCode = spv::Op::OpHitObjectGetObjectToWorldEXT;
+        opCode = spv::OpHitObjectGetObjectToWorldNV;
         break;
     case glslang::EOpHitObjectGetInstanceCustomIndexNV:
         typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetInstanceCustomIndexNV;
-        break;
-    case glslang::EOpHitObjectGetInstanceCustomIndexEXT:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetInstanceCustomIndexEXT;
+        opCode = spv::OpHitObjectGetInstanceCustomIndexNV;
         break;
     case glslang::EOpHitObjectGetInstanceIdNV:
         typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetInstanceIdNV;
-        break;
-    case glslang::EOpHitObjectGetInstanceIdEXT:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetInstanceIdEXT;
+        opCode = spv::OpHitObjectGetInstanceIdNV;
         break;
     case glslang::EOpHitObjectGetGeometryIndexNV:
         typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetGeometryIndexNV;
-        break;
-    case glslang::EOpHitObjectGetGeometryIndexEXT:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetGeometryIndexEXT;
+        opCode = spv::OpHitObjectGetGeometryIndexNV;
         break;
     case glslang::EOpHitObjectGetPrimitiveIndexNV:
         typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetPrimitiveIndexNV;
-        break;
-    case glslang::EOpHitObjectGetPrimitiveIndexEXT:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetPrimitiveIndexEXT;
+        opCode = spv::OpHitObjectGetPrimitiveIndexNV;
         break;
     case glslang::EOpHitObjectGetHitKindNV:
         typeId = builder.makeIntegerType(32, 0);
-        opCode = spv::Op::OpHitObjectGetHitKindNV;
-        break;
-    case glslang::EOpHitObjectGetHitKindEXT:
-        typeId = builder.makeIntegerType(32, 0);
-        opCode = spv::Op::OpHitObjectGetHitKindEXT;
+        opCode = spv::OpHitObjectGetHitKindNV;
         break;
     case glslang::EOpHitObjectGetCurrentTimeNV:
         typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetCurrentTimeNV;
-        break;
-    case glslang::EOpHitObjectGetCurrentTimeEXT:
-        typeId = builder.makeFloatType(32);
-        opCode = spv::Op::OpHitObjectGetCurrentTimeEXT;
+        opCode = spv::OpHitObjectGetCurrentTimeNV;
         break;
     case glslang::EOpHitObjectGetShaderBindingTableRecordIndexNV:
         typeId = builder.makeIntegerType(32, 0);
-        opCode = spv::Op::OpHitObjectGetShaderBindingTableRecordIndexNV;
-        return 0;
-    case glslang::EOpHitObjectGetShaderBindingTableRecordIndexEXT:
-        typeId = builder.makeIntegerType(32, 0);
-        opCode = spv::Op::OpHitObjectGetShaderBindingTableRecordIndexEXT;
+        opCode = spv::OpHitObjectGetShaderBindingTableRecordIndexNV;
         return 0;
     case glslang::EOpHitObjectGetAttributesNV:
-        builder.createNoResultOp(spv::Op::OpHitObjectGetAttributesNV, operands);
-        return 0;
-    case glslang::EOpHitObjectGetAttributesEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectGetAttributesEXT, operands);
-        return 0;
-    case glslang::EOpHitObjectRecordFromQueryEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectRecordFromQueryEXT, operands);
+        builder.createNoResultOp(spv::OpHitObjectGetAttributesNV, operands);
         return 0;
     case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
         typeId = builder.makeVectorType(builder.makeUintType(32), 2);
-        opCode = spv::Op::OpHitObjectGetShaderRecordBufferHandleNV;
+        opCode = spv::OpHitObjectGetShaderRecordBufferHandleNV;
         break;
-    case glslang::EOpHitObjectGetClusterIdNV:
-        typeId = builder.makeIntegerType(32, 1);
-        opCode = spv::Op::OpHitObjectGetClusterIdNV;
-        break;
-    case glslang::EOpHitObjectGetShaderRecordBufferHandleEXT:
-        typeId = builder.makeVectorType(builder.makeUintType(32), 2);
-        opCode = spv::Op::OpHitObjectGetShaderRecordBufferHandleEXT;
-        break;
-    case glslang::EOpHitObjectSetShaderBindingTableRecordIndexEXT:
-        builder.createNoResultOp(spv::Op::OpHitObjectSetShaderBindingTableRecordIndexEXT, operands);
-        return 0;
     case glslang::EOpReorderThreadNV: {
         if (operands.size() == 2) {
-            builder.createNoResultOp(spv::Op::OpReorderThreadWithHintNV, operands);
+            builder.createNoResultOp(spv::OpReorderThreadWithHintNV, operands);
         } else {
-            builder.createNoResultOp(spv::Op::OpReorderThreadWithHitObjectNV, operands);
-        }
-        return 0;
-    }
-    case glslang::EOpReorderThreadEXT: {
-        if (operands.size() == 2) {
-            builder.createNoResultOp(spv::Op::OpReorderThreadWithHintEXT, operands);
-        } else {
-            builder.createNoResultOp(spv::Op::OpReorderThreadWithHitObjectEXT, operands);
+            builder.createNoResultOp(spv::OpReorderThreadWithHitObjectNV, operands);
         }
         return 0;
+
     }
 
-    case glslang::EOpHitObjectReorderExecuteEXT: {
-        if (operands.size() == 2) {
-            builder.createNoResultOp(spv::Op::OpHitObjectReorderExecuteShaderEXT, operands);
-        } else {
-            // GLSL intrinsic is
-            // hitObjectReorderExecuteEXT(hitObjectEXT hitObject, uint hint, uint bits,int payload) while
-            // SPIRV is hitObject id , payload id, optional hint id, optional bits id hence reorder operands
-            builder.createNoResultOp(spv::Op::OpHitObjectReorderExecuteShaderEXT, {operands[0], operands[3], operands[1], operands[2]});
-        }
-        return 0;
-    }
-
-    case glslang::EOpHitObjectTraceReorderExecuteEXT: {
-        if (operands.size() == 12) {
-            builder.createNoResultOp(spv::Op::OpHitObjectTraceReorderExecuteEXT, operands);
-        } else {
-            std::vector<spv::Id> argOperands;
-            std::copy(operands.begin(), operands.begin() + 11, std::back_inserter(argOperands));
-            argOperands.push_back(operands[13]);
-            argOperands.push_back(operands[11]);
-            argOperands.push_back(operands[12]);
-            builder.createNoResultOp(spv::Op::OpHitObjectTraceReorderExecuteEXT, argOperands);
-        }
-        return 0;
-    }
-    case glslang::EOpHitObjectTraceMotionReorderExecuteEXT: {
-        if (operands.size() == 13) {
-            builder.createNoResultOp(spv::Op::OpHitObjectTraceMotionReorderExecuteEXT, operands);
-        } else {
-            std::vector<spv::Id> argOperands;
-            std::copy(operands.begin(), operands.begin() + 12, std::back_inserter(argOperands));
-            argOperands.push_back(operands[14]);
-            argOperands.push_back(operands[12]);
-            argOperands.push_back(operands[13]);
-            builder.createNoResultOp(spv::Op::OpHitObjectTraceMotionReorderExecuteEXT, argOperands);
-        }
-        return 0;
-    }
     case glslang::EOpImageSampleWeightedQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageSampleWeightedQCOM;
-        addImageProcessingQCOMDecoration(operands[2], spv::Decoration::WeightTextureQCOM);
+        opCode = spv::OpImageSampleWeightedQCOM;
+        addImageProcessingQCOMDecoration(operands[2], spv::DecorationWeightTextureQCOM);
         break;
     case glslang::EOpImageBoxFilterQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBoxFilterQCOM;
+        opCode = spv::OpImageBoxFilterQCOM;
         break;
     case glslang::EOpImageBlockMatchSADQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchSADQCOM;
-        addImageProcessingQCOMDecoration(operands[0], spv::Decoration::BlockMatchTextureQCOM);
-        addImageProcessingQCOMDecoration(operands[2], spv::Decoration::BlockMatchTextureQCOM);
+        opCode = spv::OpImageBlockMatchSADQCOM;
+        addImageProcessingQCOMDecoration(operands[0], spv::DecorationBlockMatchTextureQCOM);
+        addImageProcessingQCOMDecoration(operands[2], spv::DecorationBlockMatchTextureQCOM);
         break;
     case glslang::EOpImageBlockMatchSSDQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchSSDQCOM;
-        addImageProcessingQCOMDecoration(operands[0], spv::Decoration::BlockMatchTextureQCOM);
-        addImageProcessingQCOMDecoration(operands[2], spv::Decoration::BlockMatchTextureQCOM);
+        opCode = spv::OpImageBlockMatchSSDQCOM;
+        addImageProcessingQCOMDecoration(operands[0], spv::DecorationBlockMatchTextureQCOM);
+        addImageProcessingQCOMDecoration(operands[2], spv::DecorationBlockMatchTextureQCOM);
         break;
 
     case glslang::EOpFetchMicroTriangleVertexBarycentricNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 2);
-        opCode = spv::Op::OpFetchMicroTriangleVertexBarycentricNV;
+        opCode = spv::OpFetchMicroTriangleVertexBarycentricNV;
         break;
 
     case glslang::EOpFetchMicroTriangleVertexPositionNV:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 3);
-        opCode = spv::Op::OpFetchMicroTriangleVertexPositionNV;
+        opCode = spv::OpFetchMicroTriangleVertexPositionNV;
         break;
 
     case glslang::EOpImageBlockMatchWindowSSDQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchWindowSSDQCOM;
+        opCode = spv::OpImageBlockMatchWindowSSDQCOM;
         addImageProcessing2QCOMDecoration(operands[0], false);
         addImageProcessing2QCOMDecoration(operands[2], false);
         break;
     case glslang::EOpImageBlockMatchWindowSADQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchWindowSADQCOM;
+        opCode = spv::OpImageBlockMatchWindowSADQCOM;
         addImageProcessing2QCOMDecoration(operands[0], false);
         addImageProcessing2QCOMDecoration(operands[2], false);
         break;
     case glslang::EOpImageBlockMatchGatherSSDQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchGatherSSDQCOM;
+        opCode = spv::OpImageBlockMatchGatherSSDQCOM;
         addImageProcessing2QCOMDecoration(operands[0], true);
         addImageProcessing2QCOMDecoration(operands[2], true);
         break;
     case glslang::EOpImageBlockMatchGatherSADQCOM:
         typeId = builder.makeVectorType(builder.makeFloatType(32), 4);
-        opCode = spv::Op::OpImageBlockMatchGatherSADQCOM;
+        opCode = spv::OpImageBlockMatchGatherSADQCOM;
         addImageProcessing2QCOMDecoration(operands[0], true);
         addImageProcessing2QCOMDecoration(operands[2], true);
         break;
-    case glslang::EOpCreateTensorLayoutNV:
-        return builder.createOp(spv::Op::OpCreateTensorLayoutNV, typeId, std::vector<spv::Id>{});
-    case glslang::EOpCreateTensorViewNV:
-        return builder.createOp(spv::Op::OpCreateTensorViewNV, typeId, std::vector<spv::Id>{});
-    case glslang::EOpTensorLayoutSetBlockSizeNV:
-        opCode = spv::Op::OpTensorLayoutSetBlockSizeNV;
-        break;
-    case glslang::EOpTensorLayoutSetDimensionNV:
-        opCode = spv::Op::OpTensorLayoutSetDimensionNV;
-        break;
-    case glslang::EOpTensorLayoutSetStrideNV:
-        opCode = spv::Op::OpTensorLayoutSetStrideNV;
-        break;
-    case glslang::EOpTensorLayoutSliceNV:
-        opCode = spv::Op::OpTensorLayoutSliceNV;
-        break;
-    case glslang::EOpTensorLayoutSetClampValueNV:
-        opCode = spv::Op::OpTensorLayoutSetClampValueNV;
-        break;
-    case glslang::EOpTensorViewSetDimensionNV:
-        opCode = spv::Op::OpTensorViewSetDimensionNV;
-        break;
-    case glslang::EOpTensorViewSetStrideNV:
-        opCode = spv::Op::OpTensorViewSetStrideNV;
-        break;
-    case glslang::EOpTensorViewSetClipNV:
-        opCode = spv::Op::OpTensorViewSetClipNV;
-        break;
     default:
         return 0;
     }
@@ -10476,16 +9343,16 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         // We might need the remaining arguments, e.g. in the EOpFrexp case.
         std::vector<spv::Id> callArguments(operands.begin(), operands.begin() + consumedOperands);
         id = builder.createBuiltinCall(typeId, extBuiltins >= 0 ? extBuiltins : stdBuiltins, libCall, callArguments);
-    } else if (opCode == spv::Op::OpDot && !isFloat) {
+    } else if (opCode == spv::OpDot && !isFloat) {
         // int dot(int, int)
         // NOTE: never called for scalar/vector1, this is turned into simple mul before this can be reached
         const int componentCount = builder.getNumComponents(operands[0]);
-        spv::Id mulOp = builder.createBinOp(spv::Op::OpIMul, builder.getTypeId(operands[0]), operands[0], operands[1]);
+        spv::Id mulOp = builder.createBinOp(spv::OpIMul, builder.getTypeId(operands[0]), operands[0], operands[1]);
         builder.setPrecision(mulOp, precision);
         id = builder.createCompositeExtract(mulOp, typeId, 0);
         for (int i = 1; i < componentCount; ++i) {
             builder.setPrecision(id, precision);
-            id = builder.createBinOp(spv::Op::OpIAdd, typeId, id, builder.createCompositeExtract(mulOp, typeId, i));
+            id = builder.createBinOp(spv::OpIAdd, typeId, id, builder.createCompositeExtract(mulOp, typeId, i));
         }
     } else {
         switch (consumedOperands) {
@@ -10520,20 +9387,13 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
         builder.createStore(builder.createCompositeExtract(id, typeId0, 0), operands[3]);
         builder.createStore(builder.createCompositeExtract(id, typeId0, 1), operands[2]);
         break;
-    case glslang::EOpModf:
-        {
-            assert(operands.size() == 2);
-            builder.createStore(builder.createCompositeExtract(id, typeId0, 1), operands[1]);
-            id = builder.createCompositeExtract(id, typeId0, 0);
-        }
-        break;
     case glslang::EOpFrexp:
         {
             assert(operands.size() == 2);
             if (builder.isFloatType(builder.getScalarTypeId(typeId1))) {
                 // "exp" is floating-point type (from HLSL intrinsic)
                 spv::Id member1 = builder.createCompositeExtract(id, frexpIntType, 1);
-                member1 = builder.createUnaryOp(spv::Op::OpConvertSToF, typeId1, member1);
+                member1 = builder.createUnaryOp(spv::OpConvertSToF, typeId1, member1);
                 builder.createStore(member1, operands[1]);
             } else
                 // "exp" is integer type (from GLSL built-in function)
@@ -10553,99 +9413,99 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
 {
     // GLSL memory barriers use queuefamily scope in new model, device scope in old model
     spv::Scope memoryBarrierScope = glslangIntermediate->usingVulkanMemoryModel() ?
-        spv::Scope::QueueFamilyKHR : spv::Scope::Device;
+        spv::ScopeQueueFamilyKHR : spv::ScopeDevice;
 
     switch (op) {
     case glslang::EOpBarrier:
         if (glslangIntermediate->getStage() == EShLangTessControl) {
             if (glslangIntermediate->usingVulkanMemoryModel()) {
-                builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Workgroup,
-                                             spv::MemorySemanticsMask::OutputMemoryKHR |
-                                             spv::MemorySemanticsMask::AcquireRelease);
-                builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
+                builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeWorkgroup,
+                                             spv::MemorySemanticsOutputMemoryKHRMask |
+                                             spv::MemorySemanticsAcquireReleaseMask);
+                builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
             } else {
-                builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Invocation, spv::MemorySemanticsMask::MaskNone);
+                builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeInvocation, spv::MemorySemanticsMaskNone);
             }
         } else {
-            builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Workgroup,
-                                            spv::MemorySemanticsMask::WorkgroupMemory |
-                                            spv::MemorySemanticsMask::AcquireRelease);
+            builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeWorkgroup,
+                                            spv::MemorySemanticsWorkgroupMemoryMask |
+                                            spv::MemorySemanticsAcquireReleaseMask);
         }
         return 0;
     case glslang::EOpMemoryBarrier:
         builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsAllMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpMemoryBarrierBuffer:
-        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsMask::UniformMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsUniformMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpMemoryBarrierShared:
-        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsMask::WorkgroupMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsWorkgroupMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpGroupMemoryBarrier:
-        builder.createMemoryBarrier(spv::Scope::Workgroup, spv::MemorySemanticsAllMemory |
-                                                           spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeWorkgroup, spv::MemorySemanticsAllMemory |
+                                                         spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpMemoryBarrierAtomicCounter:
-        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsMask::AtomicCounterMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsAtomicCounterMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpMemoryBarrierImage:
-        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsMask::ImageMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsImageMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpAllMemoryBarrierWithGroupSync:
-        builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Device,
+        builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeDevice,
                                         spv::MemorySemanticsAllMemory |
-                                        spv::MemorySemanticsMask::AcquireRelease);
+                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpDeviceMemoryBarrier:
-        builder.createMemoryBarrier(spv::Scope::Device, spv::MemorySemanticsMask::UniformMemory |
-                                                        spv::MemorySemanticsMask::ImageMemory |
-                                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeDevice, spv::MemorySemanticsUniformMemoryMask |
+                                                      spv::MemorySemanticsImageMemoryMask |
+                                                      spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpDeviceMemoryBarrierWithGroupSync:
-        builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Device, spv::MemorySemanticsMask::UniformMemory |
-                                                                                spv::MemorySemanticsMask::ImageMemory |
-                                                                                spv::MemorySemanticsMask::AcquireRelease);
+        builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeDevice, spv::MemorySemanticsUniformMemoryMask |
+                                                                            spv::MemorySemanticsImageMemoryMask |
+                                                                            spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpWorkgroupMemoryBarrier:
-        builder.createMemoryBarrier(spv::Scope::Workgroup, spv::MemorySemanticsMask::WorkgroupMemory |
-                                                           spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeWorkgroup, spv::MemorySemanticsWorkgroupMemoryMask |
+                                                         spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpWorkgroupMemoryBarrierWithGroupSync:
-        builder.createControlBarrier(spv::Scope::Workgroup, spv::Scope::Workgroup,
-                                        spv::MemorySemanticsMask::WorkgroupMemory |
-                                        spv::MemorySemanticsMask::AcquireRelease);
+        builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeWorkgroup,
+                                        spv::MemorySemanticsWorkgroupMemoryMask |
+                                        spv::MemorySemanticsAcquireReleaseMask);
         return 0;
     case glslang::EOpSubgroupBarrier:
-        builder.createControlBarrier(spv::Scope::Subgroup, spv::Scope::Subgroup, spv::MemorySemanticsAllMemory |
-                                                                                 spv::MemorySemanticsMask::AcquireRelease);
+        builder.createControlBarrier(spv::ScopeSubgroup, spv::ScopeSubgroup, spv::MemorySemanticsAllMemory |
+                                                                             spv::MemorySemanticsAcquireReleaseMask);
         return spv::NoResult;
     case glslang::EOpSubgroupMemoryBarrier:
-        builder.createMemoryBarrier(spv::Scope::Subgroup, spv::MemorySemanticsAllMemory |
-                                                          spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsAllMemory |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return spv::NoResult;
     case glslang::EOpSubgroupMemoryBarrierBuffer:
-        builder.createMemoryBarrier(spv::Scope::Subgroup, spv::MemorySemanticsMask::UniformMemory |
-                                                          spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsUniformMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return spv::NoResult;
     case glslang::EOpSubgroupMemoryBarrierImage:
-        builder.createMemoryBarrier(spv::Scope::Subgroup, spv::MemorySemanticsMask::ImageMemory |
-                                                          spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsImageMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return spv::NoResult;
     case glslang::EOpSubgroupMemoryBarrierShared:
-        builder.createMemoryBarrier(spv::Scope::Subgroup, spv::MemorySemanticsMask::WorkgroupMemory |
-                                                          spv::MemorySemanticsMask::AcquireRelease);
+        builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsWorkgroupMemoryMask |
+                                                        spv::MemorySemanticsAcquireReleaseMask);
         return spv::NoResult;
 
     case glslang::EOpEmitVertex:
-        builder.createNoResultOp(spv::Op::OpEmitVertex);
+        builder.createNoResultOp(spv::OpEmitVertex);
         return 0;
     case glslang::EOpEndPrimitive:
-        builder.createNoResultOp(spv::Op::OpEndPrimitive);
+        builder.createNoResultOp(spv::OpEndPrimitive);
         return 0;
 
     case glslang::EOpSubgroupElect: {
@@ -10659,52 +9519,52 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
         return builder.setPrecision(id, precision);
     }
     case glslang::EOpIgnoreIntersectionNV:
-        builder.createNoResultOp(spv::Op::OpIgnoreIntersectionNV);
+        builder.createNoResultOp(spv::OpIgnoreIntersectionNV);
         return 0;
     case glslang::EOpTerminateRayNV:
-        builder.createNoResultOp(spv::Op::OpTerminateRayNV);
+        builder.createNoResultOp(spv::OpTerminateRayNV);
         return 0;
     case glslang::EOpRayQueryInitialize:
-        builder.createNoResultOp(spv::Op::OpRayQueryInitializeKHR);
+        builder.createNoResultOp(spv::OpRayQueryInitializeKHR);
         return 0;
     case glslang::EOpRayQueryTerminate:
-        builder.createNoResultOp(spv::Op::OpRayQueryTerminateKHR);
+        builder.createNoResultOp(spv::OpRayQueryTerminateKHR);
         return 0;
     case glslang::EOpRayQueryGenerateIntersection:
-        builder.createNoResultOp(spv::Op::OpRayQueryGenerateIntersectionKHR);
+        builder.createNoResultOp(spv::OpRayQueryGenerateIntersectionKHR);
         return 0;
     case glslang::EOpRayQueryConfirmIntersection:
-        builder.createNoResultOp(spv::Op::OpRayQueryConfirmIntersectionKHR);
+        builder.createNoResultOp(spv::OpRayQueryConfirmIntersectionKHR);
         return 0;
     case glslang::EOpBeginInvocationInterlock:
-        builder.createNoResultOp(spv::Op::OpBeginInvocationInterlockEXT);
+        builder.createNoResultOp(spv::OpBeginInvocationInterlockEXT);
         return 0;
     case glslang::EOpEndInvocationInterlock:
-        builder.createNoResultOp(spv::Op::OpEndInvocationInterlockEXT);
+        builder.createNoResultOp(spv::OpEndInvocationInterlockEXT);
         return 0;
 
     case glslang::EOpIsHelperInvocation:
     {
         std::vector<spv::Id> args; // Dummy arguments
         builder.addExtension(spv::E_SPV_EXT_demote_to_helper_invocation);
-        builder.addCapability(spv::Capability::DemoteToHelperInvocationEXT);
-        return builder.createOp(spv::Op::OpIsHelperInvocationEXT, typeId, args);
+        builder.addCapability(spv::CapabilityDemoteToHelperInvocationEXT);
+        return builder.createOp(spv::OpIsHelperInvocationEXT, typeId, args);
     }
 
     case glslang::EOpReadClockSubgroupKHR: {
         std::vector<spv::Id> args;
-        args.push_back(builder.makeUintConstant(spv::Scope::Subgroup));
+        args.push_back(builder.makeUintConstant(spv::ScopeSubgroup));
         builder.addExtension(spv::E_SPV_KHR_shader_clock);
-        builder.addCapability(spv::Capability::ShaderClockKHR);
-        return builder.createOp(spv::Op::OpReadClockKHR, typeId, args);
+        builder.addCapability(spv::CapabilityShaderClockKHR);
+        return builder.createOp(spv::OpReadClockKHR, typeId, args);
     }
 
     case glslang::EOpReadClockDeviceKHR: {
         std::vector<spv::Id> args;
-        args.push_back(builder.makeUintConstant(spv::Scope::Device));
+        args.push_back(builder.makeUintConstant(spv::ScopeDevice));
         builder.addExtension(spv::E_SPV_KHR_shader_clock);
-        builder.addCapability(spv::Capability::ShaderClockKHR);
-        return builder.createOp(spv::Op::OpReadClockKHR, typeId, args);
+        builder.addCapability(spv::CapabilityShaderClockKHR);
+        return builder.createOp(spv::OpReadClockKHR, typeId, args);
     }
     case glslang::EOpStencilAttachmentReadEXT:
     case glslang::EOpDepthAttachmentReadEXT:
@@ -10715,15 +9575,15 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
         spv::Op spv_op;
         if (op == glslang::EOpStencilAttachmentReadEXT)
         {
-            precision = spv::Decoration::RelaxedPrecision;
-            spv_op = spv::Op::OpStencilAttachmentReadEXT;
-            builder.addCapability(spv::Capability::TileImageStencilReadAccessEXT);
+            precision = spv::DecorationRelaxedPrecision;
+            spv_op = spv::OpStencilAttachmentReadEXT;
+            builder.addCapability(spv::CapabilityTileImageStencilReadAccessEXT);
         }
         else
         {
             precision = spv::NoPrecision;
-            spv_op = spv::Op::OpDepthAttachmentReadEXT;
-            builder.addCapability(spv::Capability::TileImageDepthReadAccessEXT);
+            spv_op = spv::OpDepthAttachmentReadEXT;
+            builder.addCapability(spv::CapabilityTileImageDepthReadAccessEXT);
         }
 
         std::vector<spv::Id> args; // Dummy args
@@ -10757,8 +9617,8 @@ spv::Id TGlslangToSpvTraverser::getSymbolId(const glslang::TIntermSymbol* symbol
     // and gl_WorldToObject3x4EXT. SPIR-V forbids having two OpVariables
     // with the same BuiltIn in the same storage class, so we must re-use one.
     const bool mayNeedToReuseBuiltIn =
-        builtIn == spv::BuiltIn::ObjectToWorldKHR ||
-        builtIn == spv::BuiltIn::WorldToObjectKHR;
+        builtIn == spv::BuiltInObjectToWorldKHR ||
+        builtIn == spv::BuiltInWorldToObjectKHR;
 
     if (mayNeedToReuseBuiltIn) {
         auto iter = builtInVariableIds.find(uint32_t(builtIn));
@@ -10771,10 +9631,6 @@ spv::Id TGlslangToSpvTraverser::getSymbolId(const glslang::TIntermSymbol* symbol
         }
     }
 
-    if (symbol->getBasicType() == glslang::EbtFunction) {
-        return 0;
-    }
-
     id = createSpvVariable(symbol, forcedType.first);
 
     if (mayNeedToReuseBuiltIn) {
@@ -10791,78 +9647,76 @@ spv::Id TGlslangToSpvTraverser::getSymbolId(const glslang::TIntermSymbol* symbol
         builder.addDecoration(id, TranslateAuxiliaryStorageDecoration(symbol->getType().getQualifier()));
         addMeshNVDecoration(id, /*member*/ -1, symbol->getType().getQualifier());
         if (symbol->getQualifier().hasComponent())
-            builder.addDecoration(id, spv::Decoration::Component, symbol->getQualifier().layoutComponent);
+            builder.addDecoration(id, spv::DecorationComponent, symbol->getQualifier().layoutComponent);
         if (symbol->getQualifier().hasIndex())
-            builder.addDecoration(id, spv::Decoration::Index, symbol->getQualifier().layoutIndex);
+            builder.addDecoration(id, spv::DecorationIndex, symbol->getQualifier().layoutIndex);
         if (symbol->getType().getQualifier().hasSpecConstantId())
-            builder.addDecoration(id, spv::Decoration::SpecId, symbol->getType().getQualifier().layoutSpecConstantId);
+            builder.addDecoration(id, spv::DecorationSpecId, symbol->getType().getQualifier().layoutSpecConstantId);
         // atomic counters use this:
         if (symbol->getQualifier().hasOffset())
-            builder.addDecoration(id, spv::Decoration::Offset, symbol->getQualifier().layoutOffset);
+            builder.addDecoration(id, spv::DecorationOffset, symbol->getQualifier().layoutOffset);
     }
 
     if (symbol->getQualifier().hasLocation()) {
         if (!(glslangIntermediate->isRayTracingStage() &&
               (glslangIntermediate->IsRequestedExtension(glslang::E_GL_EXT_ray_tracing) ||
-               glslangIntermediate->IsRequestedExtension(glslang::E_GL_NV_shader_invocation_reorder) ||
-               glslangIntermediate->IsRequestedExtension(glslang::E_GL_EXT_shader_invocation_reorder))
-              && (builder.getStorageClass(id) == spv::StorageClass::RayPayloadKHR ||
-                  builder.getStorageClass(id) == spv::StorageClass::IncomingRayPayloadKHR ||
-                  builder.getStorageClass(id) == spv::StorageClass::CallableDataKHR ||
-                  builder.getStorageClass(id) == spv::StorageClass::IncomingCallableDataKHR ||
-                  builder.getStorageClass(id) == spv::StorageClass::HitObjectAttributeEXT ||
-                  builder.getStorageClass(id) == spv::StorageClass::HitObjectAttributeNV))) {
+               glslangIntermediate->IsRequestedExtension(glslang::E_GL_NV_shader_invocation_reorder))
+              && (builder.getStorageClass(id) == spv::StorageClassRayPayloadKHR ||
+                  builder.getStorageClass(id) == spv::StorageClassIncomingRayPayloadKHR ||
+                  builder.getStorageClass(id) == spv::StorageClassCallableDataKHR ||
+                  builder.getStorageClass(id) == spv::StorageClassIncomingCallableDataKHR ||
+                  builder.getStorageClass(id) == spv::StorageClassHitObjectAttributeNV))) {
             // Location values are used to link TraceRayKHR/ExecuteCallableKHR/HitObjectGetAttributesNV
             // to corresponding variables but are not valid in SPIRV since they are supported only
             // for Input/Output Storage classes.
-            builder.addDecoration(id, spv::Decoration::Location, symbol->getQualifier().layoutLocation);
+            builder.addDecoration(id, spv::DecorationLocation, symbol->getQualifier().layoutLocation);
         }
     }
 
     builder.addDecoration(id, TranslateInvariantDecoration(symbol->getType().getQualifier()));
     if (symbol->getQualifier().hasStream() && glslangIntermediate->isMultiStream()) {
-        builder.addCapability(spv::Capability::GeometryStreams);
-        builder.addDecoration(id, spv::Decoration::Stream, symbol->getQualifier().layoutStream);
+        builder.addCapability(spv::CapabilityGeometryStreams);
+        builder.addDecoration(id, spv::DecorationStream, symbol->getQualifier().layoutStream);
     }
     if (symbol->getQualifier().hasSet())
-        builder.addDecoration(id, spv::Decoration::DescriptorSet, symbol->getQualifier().layoutSet);
+        builder.addDecoration(id, spv::DecorationDescriptorSet, symbol->getQualifier().layoutSet);
     else if (IsDescriptorResource(symbol->getType())) {
         // default to 0
-        builder.addDecoration(id, spv::Decoration::DescriptorSet, 0);
+        builder.addDecoration(id, spv::DecorationDescriptorSet, 0);
     }
     if (symbol->getQualifier().hasBinding())
-        builder.addDecoration(id, spv::Decoration::Binding, symbol->getQualifier().layoutBinding);
+        builder.addDecoration(id, spv::DecorationBinding, symbol->getQualifier().layoutBinding);
     else if (IsDescriptorResource(symbol->getType())) {
         // default to 0
-        builder.addDecoration(id, spv::Decoration::Binding, 0);
+        builder.addDecoration(id, spv::DecorationBinding, 0);
     }
     if (symbol->getQualifier().hasAttachment())
-        builder.addDecoration(id, spv::Decoration::InputAttachmentIndex, symbol->getQualifier().layoutAttachment);
+        builder.addDecoration(id, spv::DecorationInputAttachmentIndex, symbol->getQualifier().layoutAttachment);
     if (glslangIntermediate->getXfbMode()) {
-        builder.addCapability(spv::Capability::TransformFeedback);
+        builder.addCapability(spv::CapabilityTransformFeedback);
         if (symbol->getQualifier().hasXfbBuffer()) {
-            builder.addDecoration(id, spv::Decoration::XfbBuffer, symbol->getQualifier().layoutXfbBuffer);
+            builder.addDecoration(id, spv::DecorationXfbBuffer, symbol->getQualifier().layoutXfbBuffer);
             unsigned stride = glslangIntermediate->getXfbStride(symbol->getQualifier().layoutXfbBuffer);
             if (stride != glslang::TQualifier::layoutXfbStrideEnd)
-                builder.addDecoration(id, spv::Decoration::XfbStride, stride);
+                builder.addDecoration(id, spv::DecorationXfbStride, stride);
         }
         if (symbol->getQualifier().hasXfbOffset())
-            builder.addDecoration(id, spv::Decoration::Offset, symbol->getQualifier().layoutXfbOffset);
+            builder.addDecoration(id, spv::DecorationOffset, symbol->getQualifier().layoutXfbOffset);
     }
 
     // add built-in variable decoration
-    if (builtIn != spv::BuiltIn::Max) {
+    if (builtIn != spv::BuiltInMax) {
         // WorkgroupSize deprecated in spirv1.6
         if (glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_6 ||
-            builtIn != spv::BuiltIn::WorkgroupSize)
-            builder.addDecoration(id, spv::Decoration::BuiltIn, (int)builtIn);
+            builtIn != spv::BuiltInWorkgroupSize)
+            builder.addDecoration(id, spv::DecorationBuiltIn, (int)builtIn);
     }
 
     // Add volatile decoration to HelperInvocation for spirv1.6 and beyond
-    if (builtIn == spv::BuiltIn::HelperInvocation &&
+    if (builtIn == spv::BuiltInHelperInvocation &&
         !glslangIntermediate->usingVulkanMemoryModel() &&
         glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6) {
-        builder.addDecoration(id, spv::Decoration::Volatile);
+        builder.addDecoration(id, spv::DecorationVolatile);
     }
 
     // Subgroup builtins which have input storage class are volatile for ray tracing stages.
@@ -10874,60 +9728,60 @@ spv::Id TGlslangToSpvTraverser::getSymbolId(const glslang::TIntermSymbol* symbol
             builder.addDecoration(id, memory[i]);
     }
 
-    if (builtIn == spv::BuiltIn::SampleMask) {
+    if (builtIn == spv::BuiltInSampleMask) {
           spv::Decoration decoration;
           // GL_NV_sample_mask_override_coverage extension
           if (glslangIntermediate->getLayoutOverrideCoverage())
-              decoration = spv::Decoration::OverrideCoverageNV;
+              decoration = (spv::Decoration)spv::DecorationOverrideCoverageNV;
           else
-              decoration = spv::Decoration::Max;
+              decoration = (spv::Decoration)spv::DecorationMax;
         builder.addDecoration(id, decoration);
-        if (decoration != spv::Decoration::Max) {
-            builder.addCapability(spv::Capability::SampleMaskOverrideCoverageNV);
+        if (decoration != spv::DecorationMax) {
+            builder.addCapability(spv::CapabilitySampleMaskOverrideCoverageNV);
             builder.addExtension(spv::E_SPV_NV_sample_mask_override_coverage);
         }
     }
-    else if (builtIn == spv::BuiltIn::Layer) {
+    else if (builtIn == spv::BuiltInLayer) {
         // SPV_NV_viewport_array2 extension
         if (symbol->getQualifier().layoutViewportRelative) {
-            builder.addDecoration(id, spv::Decoration::ViewportRelativeNV);
-            builder.addCapability(spv::Capability::ShaderViewportMaskNV);
+            builder.addDecoration(id, (spv::Decoration)spv::DecorationViewportRelativeNV);
+            builder.addCapability(spv::CapabilityShaderViewportMaskNV);
             builder.addExtension(spv::E_SPV_NV_viewport_array2);
         }
         if (symbol->getQualifier().layoutSecondaryViewportRelativeOffset != -2048) {
-            builder.addDecoration(id, spv::Decoration::SecondaryViewportRelativeNV,
+            builder.addDecoration(id, (spv::Decoration)spv::DecorationSecondaryViewportRelativeNV,
                                   symbol->getQualifier().layoutSecondaryViewportRelativeOffset);
-            builder.addCapability(spv::Capability::ShaderStereoViewNV);
+            builder.addCapability(spv::CapabilityShaderStereoViewNV);
             builder.addExtension(spv::E_SPV_NV_stereo_view_rendering);
         }
     }
 
     if (symbol->getQualifier().layoutPassthrough) {
-        builder.addDecoration(id, spv::Decoration::PassthroughNV);
-        builder.addCapability(spv::Capability::GeometryShaderPassthroughNV);
+        builder.addDecoration(id, spv::DecorationPassthroughNV);
+        builder.addCapability(spv::CapabilityGeometryShaderPassthroughNV);
         builder.addExtension(spv::E_SPV_NV_geometry_shader_passthrough);
     }
     if (symbol->getQualifier().pervertexNV) {
-        builder.addDecoration(id, spv::Decoration::PerVertexNV);
-        builder.addCapability(spv::Capability::FragmentBarycentricNV);
+        builder.addDecoration(id, spv::DecorationPerVertexNV);
+        builder.addCapability(spv::CapabilityFragmentBarycentricNV);
         builder.addExtension(spv::E_SPV_NV_fragment_shader_barycentric);
     }
 
     if (symbol->getQualifier().pervertexEXT) {
-        builder.addDecoration(id, spv::Decoration::PerVertexKHR);
-        builder.addCapability(spv::Capability::FragmentBarycentricKHR);
+        builder.addDecoration(id, spv::DecorationPerVertexKHR);
+        builder.addCapability(spv::CapabilityFragmentBarycentricKHR);
         builder.addExtension(spv::E_SPV_KHR_fragment_shader_barycentric);
     }
 
     if (glslangIntermediate->getHlslFunctionality1() && symbol->getType().getQualifier().semanticName != nullptr) {
         builder.addExtension("SPV_GOOGLE_hlsl_functionality1");
-        builder.addDecoration(id, spv::Decoration::HlslSemanticGOOGLE,
+        builder.addDecoration(id, (spv::Decoration)spv::DecorationHlslSemanticGOOGLE,
                               symbol->getType().getQualifier().semanticName);
     }
 
     if (symbol->isReference()) {
         builder.addDecoration(id, symbol->getType().getQualifier().restrict ?
-            spv::Decoration::RestrictPointerEXT : spv::Decoration::AliasedPointerEXT);
+            spv::DecorationRestrictPointerEXT : spv::DecorationAliasedPointerEXT);
     }
 
     // Add SPIR-V decorations (GL_EXT_spirv_intrinsics)
@@ -10949,38 +9803,38 @@ void TGlslangToSpvTraverser::addMeshNVDecoration(spv::Id id, int member, const g
             // Mesh shader already adds this by default.
             if (glslangIntermediate->getStage() == EShLangFragment) {
                 if(isMeshShaderExt) {
-                    builder.addCapability(spv::Capability::MeshShadingEXT);
+                    builder.addCapability(spv::CapabilityMeshShadingEXT);
                     builder.addExtension(spv::E_SPV_EXT_mesh_shader);
                 } else {
-                    builder.addCapability(spv::Capability::MeshShadingNV);
+                    builder.addCapability(spv::CapabilityMeshShadingNV);
                     builder.addExtension(spv::E_SPV_NV_mesh_shader);
                 }
             }
-            builder.addMemberDecoration(id, (unsigned)member, spv::Decoration::PerPrimitiveNV);
+            builder.addMemberDecoration(id, (unsigned)member, spv::DecorationPerPrimitiveNV);
         }
         if (qualifier.perViewNV)
-            builder.addMemberDecoration(id, (unsigned)member, spv::Decoration::PerViewNV);
+            builder.addMemberDecoration(id, (unsigned)member, spv::DecorationPerViewNV);
         if (qualifier.perTaskNV)
-            builder.addMemberDecoration(id, (unsigned)member, spv::Decoration::PerTaskNV);
+            builder.addMemberDecoration(id, (unsigned)member, spv::DecorationPerTaskNV);
     } else {
         if (qualifier.perPrimitiveNV) {
             // Need to add capability/extension for fragment shader.
             // Mesh shader already adds this by default.
             if (glslangIntermediate->getStage() == EShLangFragment) {
                 if(isMeshShaderExt) {
-                    builder.addCapability(spv::Capability::MeshShadingEXT);
+                    builder.addCapability(spv::CapabilityMeshShadingEXT);
                     builder.addExtension(spv::E_SPV_EXT_mesh_shader);
                 } else {
-                    builder.addCapability(spv::Capability::MeshShadingNV);
+                    builder.addCapability(spv::CapabilityMeshShadingNV);
                     builder.addExtension(spv::E_SPV_NV_mesh_shader);
                 }
             }
-            builder.addDecoration(id, spv::Decoration::PerPrimitiveNV);
+            builder.addDecoration(id, spv::DecorationPerPrimitiveNV);
         }
         if (qualifier.perViewNV)
-            builder.addDecoration(id, spv::Decoration::PerViewNV);
+            builder.addDecoration(id, spv::DecorationPerViewNV);
         if (qualifier.perTaskNV)
-            builder.addDecoration(id, spv::Decoration::PerTaskNV);
+            builder.addDecoration(id, spv::DecorationPerTaskNV);
     }
 }
 
@@ -10997,12 +9851,12 @@ bool TGlslangToSpvTraverser::hasQCOMImageProceessingDecoration(spv::Id id, spv::
 void TGlslangToSpvTraverser::addImageProcessingQCOMDecoration(spv::Id id, spv::Decoration decor)
 {
   spv::Op opc = builder.getOpCode(id);
-  if (opc == spv::Op::OpSampledImage) {
+  if (opc == spv::OpSampledImage) {
     id  = builder.getIdOperand(id, 0);
     opc = builder.getOpCode(id);
   }
 
-  if (opc == spv::Op::OpLoad) {
+  if (opc == spv::OpLoad) {
     spv::Id texid = builder.getIdOperand(id, 0);
     if (!hasQCOMImageProceessingDecoration(texid, decor)) {//
       builder.addDecoration(texid, decor);
@@ -11014,13 +9868,13 @@ void TGlslangToSpvTraverser::addImageProcessingQCOMDecoration(spv::Id id, spv::D
 void TGlslangToSpvTraverser::addImageProcessing2QCOMDecoration(spv::Id id, bool isForGather)
 {
   if (isForGather) {
-    return addImageProcessingQCOMDecoration(id, spv::Decoration::BlockMatchTextureQCOM);
+    return addImageProcessingQCOMDecoration(id, spv::DecorationBlockMatchTextureQCOM);
   }
 
   auto addDecor =
     [this](spv::Id id, spv::Decoration decor) {
-      spv::Op tsopc = this->builder.getOpCode(id);
-      if (tsopc == spv::Op::OpLoad) {
+      spv::Id tsopc = this->builder.getOpCode(id);
+      if (tsopc == spv::OpLoad) {
         spv::Id tsid = this->builder.getIdOperand(id, 0);
         if (this->glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_4) {
           assert(iOSet.count(tsid) > 0);
@@ -11032,15 +9886,15 @@ void TGlslangToSpvTraverser::addImageProcessing2QCOMDecoration(spv::Id id, bool
       }
     };
 
-  spv::Op opc = builder.getOpCode(id);
-  bool isInterfaceObject = (opc != spv::Op::OpSampledImage);
+  spv::Id opc = builder.getOpCode(id);
+  bool isInterfaceObject = (opc != spv::OpSampledImage);
 
   if (!isInterfaceObject) {
-    addDecor(builder.getIdOperand(id, 0), spv::Decoration::BlockMatchTextureQCOM);
-    addDecor(builder.getIdOperand(id, 1), spv::Decoration::BlockMatchSamplerQCOM);
+    addDecor(builder.getIdOperand(id, 0), spv::DecorationBlockMatchTextureQCOM);
+    addDecor(builder.getIdOperand(id, 1), spv::DecorationBlockMatchSamplerQCOM);
   } else {
-    addDecor(id, spv::Decoration::BlockMatchTextureQCOM);
-    addDecor(id, spv::Decoration::BlockMatchSamplerQCOM);
+    addDecor(id, spv::DecorationBlockMatchTextureQCOM);
+    addDecor(id, spv::DecorationBlockMatchSamplerQCOM);
   }
 }
 
@@ -11072,15 +9926,15 @@ spv::Id TGlslangToSpvTraverser::createSpvConstant(const glslang::TIntermTyped& n
 
     // Extra capabilities may be needed.
     if (node.getType().contains8BitInt())
-        builder.addCapability(spv::Capability::Int8);
+        builder.addCapability(spv::CapabilityInt8);
     if (node.getType().contains16BitFloat())
-        builder.addCapability(spv::Capability::Float16);
+        builder.addCapability(spv::CapabilityFloat16);
     if (node.getType().contains16BitInt())
-        builder.addCapability(spv::Capability::Int16);
+        builder.addCapability(spv::CapabilityInt16);
     if (node.getType().contains64BitInt())
-        builder.addCapability(spv::Capability::Int64);
+        builder.addCapability(spv::CapabilityInt64);
     if (node.getType().containsDouble())
-        builder.addCapability(spv::Capability::Float64);
+        builder.addCapability(spv::CapabilityFloat64);
 
     // gl_WorkGroupSize is a special case until the front-end handles hierarchical specialization constants,
     // even then, it's specialization ids are handled by special case syntax in GLSL: layout(local_size_x = ...
@@ -11090,7 +9944,7 @@ spv::Id TGlslangToSpvTraverser::createSpvConstant(const glslang::TIntermTyped& n
             bool specConst = (glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet);
             dimConstId.push_back(builder.makeUintConstant(glslangIntermediate->getLocalSize(dim), specConst));
             if (specConst) {
-                builder.addDecoration(dimConstId.back(), spv::Decoration::SpecId,
+                builder.addDecoration(dimConstId.back(), spv::DecorationSpecId,
                                       glslangIntermediate->getLocalSizeSpecId(dim));
             }
         }
@@ -11111,7 +9965,7 @@ spv::Id TGlslangToSpvTraverser::createSpvConstant(const glslang::TIntermTyped& n
             int nextConst = 0;
             result = createSpvConstantFromConstUnionArray(sn->getType(), *const_union_array, nextConst, true);
         } else {
-            logger->missingFunctionality("Invalid initializer for spec constant.");
+            logger->missingFunctionality("Invalid initializer for spec onstant.");
             return spv::NoResult;
         }
         builder.addName(result, sn->getName().c_str());
@@ -11154,9 +10008,8 @@ spv::Id TGlslangToSpvTraverser::createSpvConstantFromConstUnionArray(const glsla
         glslang::TVector<glslang::TTypeLoc>::const_iterator iter;
         for (iter = glslangType.getStruct()->begin(); iter != glslangType.getStruct()->end(); ++iter)
             spvConsts.push_back(createSpvConstantFromConstUnionArray(*iter->type, consts, nextConst, false));
-    } else if (glslangType.getVectorSize() > 1 || glslangType.isCoopVecNV()) {
-        unsigned int numComponents = glslangType.isCoopVecNV() ? glslangType.getTypeParameters()->arraySizes->getDimSize(0) : glslangType.getVectorSize();
-        for (unsigned int i = 0; i < numComponents; ++i) {
+    } else if (glslangType.getVectorSize() > 1) {
+        for (unsigned int i = 0; i < (unsigned int)glslangType.getVectorSize(); ++i) {
             bool zero = nextConst >= consts.size();
             switch (glslangType.getBasicType()) {
             case glslang::EbtInt:
@@ -11172,19 +10025,19 @@ spv::Id TGlslangToSpvTraverser::createSpvConstantFromConstUnionArray(const glsla
                 spvConsts.push_back(builder.makeBoolConstant(zero ? false : consts[nextConst].getBConst()));
                 break;
             case glslang::EbtInt8:
-                builder.addCapability(spv::Capability::Int8);
+                builder.addCapability(spv::CapabilityInt8);
                 spvConsts.push_back(builder.makeInt8Constant(zero ? 0 : consts[nextConst].getI8Const()));
                 break;
             case glslang::EbtUint8:
-                builder.addCapability(spv::Capability::Int8);
+                builder.addCapability(spv::CapabilityInt8);
                 spvConsts.push_back(builder.makeUint8Constant(zero ? 0 : consts[nextConst].getU8Const()));
                 break;
             case glslang::EbtInt16:
-                builder.addCapability(spv::Capability::Int16);
+                builder.addCapability(spv::CapabilityInt16);
                 spvConsts.push_back(builder.makeInt16Constant(zero ? 0 : consts[nextConst].getI16Const()));
                 break;
             case glslang::EbtUint16:
-                builder.addCapability(spv::Capability::Int16);
+                builder.addCapability(spv::CapabilityInt16);
                 spvConsts.push_back(builder.makeUint16Constant(zero ? 0 : consts[nextConst].getU16Const()));
                 break;
             case glslang::EbtInt64:
@@ -11197,18 +10050,9 @@ spv::Id TGlslangToSpvTraverser::createSpvConstantFromConstUnionArray(const glsla
                 spvConsts.push_back(builder.makeDoubleConstant(zero ? 0.0 : consts[nextConst].getDConst()));
                 break;
             case glslang::EbtFloat16:
-                builder.addCapability(spv::Capability::Float16);
+                builder.addCapability(spv::CapabilityFloat16);
                 spvConsts.push_back(builder.makeFloat16Constant(zero ? 0.0F : (float)consts[nextConst].getDConst()));
                 break;
-            case glslang::EbtBFloat16:
-                spvConsts.push_back(builder.makeBFloat16Constant(zero ? 0.0F : (float)consts[nextConst].getDConst()));
-                break;
-            case glslang::EbtFloatE5M2:
-                spvConsts.push_back(builder.makeFloatE5M2Constant(zero ? 0.0F : (float)consts[nextConst].getDConst()));
-                break;
-            case glslang::EbtFloatE4M3:
-                spvConsts.push_back(builder.makeFloatE4M3Constant(zero ? 0.0F : (float)consts[nextConst].getDConst()));
-                break;
             default:
                 assert(0);
                 break;
@@ -11233,19 +10077,19 @@ spv::Id TGlslangToSpvTraverser::createSpvConstantFromConstUnionArray(const glsla
             scalar = builder.makeBoolConstant(zero ? false : consts[nextConst].getBConst(), specConstant);
             break;
         case glslang::EbtInt8:
-            builder.addCapability(spv::Capability::Int8);
+            builder.addCapability(spv::CapabilityInt8);
             scalar = builder.makeInt8Constant(zero ? 0 : consts[nextConst].getI8Const(), specConstant);
             break;
         case glslang::EbtUint8:
-            builder.addCapability(spv::Capability::Int8);
+            builder.addCapability(spv::CapabilityInt8);
             scalar = builder.makeUint8Constant(zero ? 0 : consts[nextConst].getU8Const(), specConstant);
             break;
         case glslang::EbtInt16:
-            builder.addCapability(spv::Capability::Int16);
+            builder.addCapability(spv::CapabilityInt16);
             scalar = builder.makeInt16Constant(zero ? 0 : consts[nextConst].getI16Const(), specConstant);
             break;
         case glslang::EbtUint16:
-            builder.addCapability(spv::Capability::Int16);
+            builder.addCapability(spv::CapabilityInt16);
             scalar = builder.makeUint16Constant(zero ? 0 : consts[nextConst].getU16Const(), specConstant);
             break;
         case glslang::EbtInt64:
@@ -11258,21 +10102,12 @@ spv::Id TGlslangToSpvTraverser::createSpvConstantFromConstUnionArray(const glsla
             scalar = builder.makeDoubleConstant(zero ? 0.0 : consts[nextConst].getDConst(), specConstant);
             break;
         case glslang::EbtFloat16:
-            builder.addCapability(spv::Capability::Float16);
+            builder.addCapability(spv::CapabilityFloat16);
             scalar = builder.makeFloat16Constant(zero ? 0.0F : (float)consts[nextConst].getDConst(), specConstant);
             break;
-        case glslang::EbtBFloat16:
-            scalar = builder.makeBFloat16Constant(zero ? 0.0F : (float)consts[nextConst].getDConst(), specConstant);
-            break;
-        case glslang::EbtFloatE5M2:
-            scalar = builder.makeFloatE5M2Constant(zero ? 0.0F : (float)consts[nextConst].getDConst(), specConstant);
-            break;
-        case glslang::EbtFloatE4M3:
-            scalar = builder.makeFloatE4M3Constant(zero ? 0.0F : (float)consts[nextConst].getDConst(), specConstant);
-            break;
         case glslang::EbtReference:
             scalar = builder.makeUint64Constant(zero ? 0 : consts[nextConst].getU64Const(), specConstant);
-            scalar = builder.createUnaryOp(spv::Op::OpBitcast, typeId, scalar);
+            scalar = builder.createUnaryOp(spv::OpBitcast, typeId, scalar);
             break;
         case glslang::EbtString:
             scalar = builder.getStringId(consts[nextConst].getSConst()->c_str());
@@ -11352,13 +10187,12 @@ bool TGlslangToSpvTraverser::isTrivial(const glslang::TIntermTyped* node)
         return false;
     }
 
-    if (IsOpNumericConv(node->getAsOperator()->getOp()) &&
-        node->getType().getBasicType() == glslang::EbtBool) {
-        return true;
-    }
-
     switch (node->getAsOperator()->getOp()) {
     case glslang::EOpLogicalNot:
+    case glslang::EOpConvIntToBool:
+    case glslang::EOpConvUintToBool:
+    case glslang::EOpConvFloatToBool:
+    case glslang::EOpConvDoubleToBool:
     case glslang::EOpEqual:
     case glslang::EOpNotEqual:
     case glslang::EOpLessThan:
@@ -11402,10 +10236,10 @@ spv::Id TGlslangToSpvTraverser::createShortCircuit(glslang::TOperator op, glslan
     // TODO: this runtime "not" for || could be avoided by adding functionality
     // to 'builder' to have an "else" without an "then"
     if (op == glslang::EOpLogicalOr)
-        leftId = builder.createUnaryOp(spv::Op::OpLogicalNot, boolTypeId, leftId);
+        leftId = builder.createUnaryOp(spv::OpLogicalNot, boolTypeId, leftId);
 
     // make an "if" based on the left value
-    spv::Builder::If ifBuilder(leftId, spv::SelectionControlMask::MaskNone, builder);
+    spv::Builder::If ifBuilder(leftId, spv::SelectionControlMaskNone, builder);
 
     // emit right operand as the "then" part of the "if"
     builder.clearAccessChain();
@@ -11420,7 +10254,7 @@ spv::Id TGlslangToSpvTraverser::createShortCircuit(glslang::TOperator op, glslan
     ifBuilder.makeEndIf();
 
     // phi together the two results
-    return builder.createOp(spv::Op::OpPhi, boolTypeId, phiOperands);
+    return builder.createOp(spv::OpPhi, boolTypeId, phiOperands);
 }
 
 // Return type Id of the imported set of extended instructions corresponds to the name.
@@ -11436,7 +10270,7 @@ spv::Id TGlslangToSpvTraverser::getExtBuiltins(const char* name)
     }
 }
 
-} // end anonymous namespace
+};  // end anonymous namespace
 
 namespace glslang {
 
@@ -11573,4 +10407,4 @@ void GlslangToSpv(const TIntermediate& intermediate, std::vector<unsigned int>&
     GetThreadPoolAllocator().pop();
 }
 
-} // end namespace glslang
+}; // end namespace glslang
diff --git a/engine/thirdparty/glslang/SPIRV/GlslangToSpv.h b/engine/thirdparty/glslang/SPIRV/GlslangToSpv.h
index 9fb4f3ff..1b9ef3c5 100644
--- a/engine/thirdparty/glslang/SPIRV/GlslangToSpv.h
+++ b/engine/thirdparty/glslang/SPIRV/GlslangToSpv.h
@@ -39,7 +39,6 @@
 #include <vector>
 
 #include "Logger.h"
-#include "glslang/Include/visibility.h"
 
 namespace glslang {
 class TIntermediate;
@@ -54,16 +53,15 @@ struct SpvOptions {
     bool emitNonSemanticShaderDebugInfo {false};
     bool emitNonSemanticShaderDebugSource{ false };
     bool compileOnly{false};
-    bool optimizerAllowExpandedIDBound{false};
 };
 
-GLSLANG_EXPORT void GetSpirvVersion(std::string&);
-GLSLANG_EXPORT int GetSpirvGeneratorVersion();
-GLSLANG_EXPORT void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
-                                 SpvOptions* options = nullptr);
-GLSLANG_EXPORT void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
-                                 spv::SpvBuildLogger* logger, SpvOptions* options = nullptr);
-GLSLANG_EXPORT bool OutputSpvBin(const std::vector<unsigned int>& spirv, const char* baseName);
-GLSLANG_EXPORT bool OutputSpvHex(const std::vector<unsigned int>& spirv, const char* baseName, const char* varName);
+void GetSpirvVersion(std::string&);
+int GetSpirvGeneratorVersion();
+void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
+                  SpvOptions* options = nullptr);
+void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
+                  spv::SpvBuildLogger* logger, SpvOptions* options = nullptr);
+bool OutputSpvBin(const std::vector<unsigned int>& spirv, const char* baseName);
+bool OutputSpvHex(const std::vector<unsigned int>& spirv, const char* baseName, const char* varName);
 
 }
diff --git a/engine/thirdparty/glslang/SPIRV/InReadableOrder.cpp b/engine/thirdparty/glslang/SPIRV/InReadableOrder.cpp
index 18e487d8..9d9410be 100644
--- a/engine/thirdparty/glslang/SPIRV/InReadableOrder.cpp
+++ b/engine/thirdparty/glslang/SPIRV/InReadableOrder.cpp
@@ -85,7 +85,7 @@ public:
             Id mergeId = mergeInst->getIdOperand(0);
             mergeBlock = block->getParent().getParent().getInstruction(mergeId)->getBlock();
             delayed_.insert(mergeBlock);
-            if (mergeInst->getOpCode() == spv::Op::OpLoopMerge) {
+            if (mergeInst->getOpCode() == spv::OpLoopMerge) {
                 Id continueId = mergeInst->getIdOperand(1);
                 continueBlock =
                     block->getParent().getParent().getInstruction(continueId)->getBlock();
diff --git a/engine/thirdparty/glslang/SPIRV/Logger.h b/engine/thirdparty/glslang/SPIRV/Logger.h
index c64a3b8a..2e4ddaf5 100644
--- a/engine/thirdparty/glslang/SPIRV/Logger.h
+++ b/engine/thirdparty/glslang/SPIRV/Logger.h
@@ -37,13 +37,12 @@
 
 #include <string>
 #include <vector>
-#include "glslang/Include/visibility.h"
 
 namespace spv {
 
 // A class for holding all SPIR-V build status messages, including
 // missing/TBD functionalities, warnings, and errors.
-class GLSLANG_EXPORT SpvBuildLogger {
+class SpvBuildLogger {
 public:
     SpvBuildLogger() {}
 
diff --git a/engine/thirdparty/glslang/SPIRV/SPVRemapper.cpp b/engine/thirdparty/glslang/SPIRV/SPVRemapper.cpp
new file mode 100644
index 00000000..f8f50a95
--- /dev/null
+++ b/engine/thirdparty/glslang/SPIRV/SPVRemapper.cpp
@@ -0,0 +1,1527 @@
+//
+// Copyright (C) 2015 LunarG, Inc.
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//    Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+//    Redistributions in binary form must reproduce the above
+//    copyright notice, this list of conditions and the following
+//    disclaimer in the documentation and/or other materials provided
+//    with the distribution.
+//
+//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+//    contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+
+#include "SPVRemapper.h"
+#include "doc.h"
+
+#include <algorithm>
+#include <cassert>
+#include "../glslang/Include/Common.h"
+
+namespace spv {
+
+    // By default, just abort on error.  Can be overridden via RegisterErrorHandler
+    spirvbin_t::errorfn_t spirvbin_t::errorHandler = [](const std::string&) { exit(5); };
+    // By default, eat log messages.  Can be overridden via RegisterLogHandler
+    spirvbin_t::logfn_t   spirvbin_t::logHandler   = [](const std::string&) { };
+
+    // This can be overridden to provide other message behavior if needed
+    void spirvbin_t::msg(int minVerbosity, int indent, const std::string& txt) const
+    {
+        if (verbose >= minVerbosity)
+            logHandler(std::string(indent, ' ') + txt);
+    }
+
+    // hash opcode, with special handling for OpExtInst
+    std::uint32_t spirvbin_t::asOpCodeHash(unsigned word)
+    {
+        const spv::Op opCode = asOpCode(word);
+
+        std::uint32_t offset = 0;
+
+        switch (opCode) {
+        case spv::OpExtInst:
+            offset += asId(word + 4); break;
+        default:
+            break;
+        }
+
+        return opCode * 19 + offset; // 19 = small prime
+    }
+
+    spirvbin_t::range_t spirvbin_t::literalRange(spv::Op opCode) const
+    {
+        static const int maxCount = 1<<30;
+
+        switch (opCode) {
+        case spv::OpTypeFloat:        // fall through...
+        case spv::OpTypePointer:      return range_t(2, 3);
+        case spv::OpTypeInt:          return range_t(2, 4);
+        // TODO: case spv::OpTypeImage:
+        // TODO: case spv::OpTypeSampledImage:
+        case spv::OpTypeSampler:      return range_t(3, 8);
+        case spv::OpTypeVector:       // fall through
+        case spv::OpTypeMatrix:       // ...
+        case spv::OpTypePipe:         return range_t(3, 4);
+        case spv::OpConstant:         return range_t(3, maxCount);
+        default:                      return range_t(0, 0);
+        }
+    }
+
+    spirvbin_t::range_t spirvbin_t::typeRange(spv::Op opCode) const
+    {
+        static const int maxCount = 1<<30;
+
+        if (isConstOp(opCode))
+            return range_t(1, 2);
+
+        switch (opCode) {
+        case spv::OpTypeVector:       // fall through
+        case spv::OpTypeMatrix:       // ...
+        case spv::OpTypeSampler:      // ...
+        case spv::OpTypeArray:        // ...
+        case spv::OpTypeRuntimeArray: // ...
+        case spv::OpTypePipe:         return range_t(2, 3);
+        case spv::OpTypeStruct:       // fall through
+        case spv::OpTypeFunction:     return range_t(2, maxCount);
+        case spv::OpTypePointer:      return range_t(3, 4);
+        default:                      return range_t(0, 0);
+        }
+    }
+
+    spirvbin_t::range_t spirvbin_t::constRange(spv::Op opCode) const
+    {
+        static const int maxCount = 1<<30;
+
+        switch (opCode) {
+        case spv::OpTypeArray:         // fall through...
+        case spv::OpTypeRuntimeArray:  return range_t(3, 4);
+        case spv::OpConstantComposite: return range_t(3, maxCount);
+        default:                       return range_t(0, 0);
+        }
+    }
+
+    // Return the size of a type in 32-bit words.  This currently only
+    // handles ints and floats, and is only invoked by queries which must be
+    // integer types.  If ever needed, it can be generalized.
+    unsigned spirvbin_t::typeSizeInWords(spv::Id id) const
+    {
+        const unsigned typeStart = idPos(id);
+        const spv::Op  opCode    = asOpCode(typeStart);
+
+        if (errorLatch)
+            return 0;
+
+        switch (opCode) {
+        case spv::OpTypeInt:   // fall through...
+        case spv::OpTypeFloat: return (spv[typeStart+2]+31)/32;
+        default:
+            return 0;
+        }
+    }
+
+    // Looks up the type of a given const or variable ID, and
+    // returns its size in 32-bit words.
+    unsigned spirvbin_t::idTypeSizeInWords(spv::Id id) const
+    {
+        const auto tid_it = idTypeSizeMap.find(id);
+        if (tid_it == idTypeSizeMap.end()) {
+            error("type size for ID not found");
+            return 0;
+        }
+
+        return tid_it->second;
+    }
+
+    // Is this an opcode we should remove when using --strip?
+    bool spirvbin_t::isStripOp(spv::Op opCode, unsigned start) const
+    {
+        switch (opCode) {
+        case spv::OpSource:
+        case spv::OpSourceExtension:
+        case spv::OpName:
+        case spv::OpMemberName:
+        case spv::OpLine :
+        {
+            const std::string name = literalString(start + 2);
+
+            std::vector<std::string>::const_iterator it;
+            for (it = stripWhiteList.begin(); it < stripWhiteList.end(); it++)
+            {
+                if (name.find(*it) != std::string::npos) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        default :
+            return false;
+        }
+    }
+
+    // Return true if this opcode is flow control
+    bool spirvbin_t::isFlowCtrl(spv::Op opCode) const
+    {
+        switch (opCode) {
+        case spv::OpBranchConditional:
+        case spv::OpBranch:
+        case spv::OpSwitch:
+        case spv::OpLoopMerge:
+        case spv::OpSelectionMerge:
+        case spv::OpLabel:
+        case spv::OpFunction:
+        case spv::OpFunctionEnd:    return true;
+        default:                    return false;
+        }
+    }
+
+    // Return true if this opcode defines a type
+    bool spirvbin_t::isTypeOp(spv::Op opCode) const
+    {
+        switch (opCode) {
+        case spv::OpTypeVoid:
+        case spv::OpTypeBool:
+        case spv::OpTypeInt:
+        case spv::OpTypeFloat:
+        case spv::OpTypeVector:
+        case spv::OpTypeMatrix:
+        case spv::OpTypeImage:
+        case spv::OpTypeSampler:
+        case spv::OpTypeArray:
+        case spv::OpTypeRuntimeArray:
+        case spv::OpTypeStruct:
+        case spv::OpTypeOpaque:
+        case spv::OpTypePointer:
+        case spv::OpTypeFunction:
+        case spv::OpTypeEvent:
+        case spv::OpTypeDeviceEvent:
+        case spv::OpTypeReserveId:
+        case spv::OpTypeQueue:
+        case spv::OpTypeSampledImage:
+        case spv::OpTypePipe:         return true;
+        default:                      return false;
+        }
+    }
+
+    // Return true if this opcode defines a constant
+    bool spirvbin_t::isConstOp(spv::Op opCode) const
+    {
+        switch (opCode) {
+        case spv::OpConstantSampler:
+            error("unimplemented constant type");
+            return true;
+
+        case spv::OpConstantNull:
+        case spv::OpConstantTrue:
+        case spv::OpConstantFalse:
+        case spv::OpConstantComposite:
+        case spv::OpConstant:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    const auto inst_fn_nop = [](spv::Op, unsigned) { return false; };
+    const auto op_fn_nop   = [](spv::Id&)          { };
+
+    // g++ doesn't like these defined in the class proper in an anonymous namespace.
+    // Dunno why.  Also MSVC doesn't like the constexpr keyword.  Also dunno why.
+    // Defining them externally seems to please both compilers, so, here they are.
+    const spv::Id spirvbin_t::unmapped    = spv::Id(-10000);
+    const spv::Id spirvbin_t::unused      = spv::Id(-10001);
+    const int     spirvbin_t::header_size = 5;
+
+    spv::Id spirvbin_t::nextUnusedId(spv::Id id)
+    {
+        while (isNewIdMapped(id))  // search for an unused ID
+            ++id;
+
+        return id;
+    }
+
+    spv::Id spirvbin_t::localId(spv::Id id, spv::Id newId)
+    {
+        //assert(id != spv::NoResult && newId != spv::NoResult);
+
+        if (id > bound()) {
+            error(std::string("ID out of range: ") + std::to_string(id));
+            return spirvbin_t::unused;
+        }
+
+        if (id >= idMapL.size())
+            idMapL.resize(id+1, unused);
+
+        if (newId != unmapped && newId != unused) {
+            if (isOldIdUnused(id)) {
+                error(std::string("ID unused in module: ") + std::to_string(id));
+                return spirvbin_t::unused;
+            }
+
+            if (!isOldIdUnmapped(id)) {
+                error(std::string("ID already mapped: ") + std::to_string(id) + " -> "
+                        + std::to_string(localId(id)));
+
+                return spirvbin_t::unused;
+            }
+
+            if (isNewIdMapped(newId)) {
+                error(std::string("ID already used in module: ") + std::to_string(newId));
+                return spirvbin_t::unused;
+            }
+
+            msg(4, 4, std::string("map: ") + std::to_string(id) + " -> " + std::to_string(newId));
+            setMapped(newId);
+            largestNewId = std::max(largestNewId, newId);
+        }
+
+        return idMapL[id] = newId;
+    }
+
+    // Parse a literal string from the SPIR binary and return it as an std::string
+    // Due to C++11 RValue references, this doesn't copy the result string.
+    std::string spirvbin_t::literalString(unsigned word) const
+    {
+        std::string literal;
+        const spirword_t * pos = spv.data() + word;
+
+        literal.reserve(16);
+
+        do {
+            spirword_t word = *pos;
+            for (int i = 0; i < 4; i++) {
+                char c = word & 0xff;
+                if (c == '\0')
+                    return literal;
+                literal += c;
+                word >>= 8;
+            }
+            pos++;
+        } while (true);
+    }
+
+    void spirvbin_t::applyMap()
+    {
+        msg(3, 2, std::string("Applying map: "));
+
+        // Map local IDs through the ID map
+        process(inst_fn_nop, // ignore instructions
+            [this](spv::Id& id) {
+                id = localId(id);
+
+                if (errorLatch)
+                    return;
+
+                assert(id != unused && id != unmapped);
+            }
+        );
+    }
+
+    // Find free IDs for anything we haven't mapped
+    void spirvbin_t::mapRemainder()
+    {
+        msg(3, 2, std::string("Remapping remainder: "));
+
+        spv::Id     unusedId  = 1;  // can't use 0: that's NoResult
+        spirword_t  maxBound  = 0;
+
+        for (spv::Id id = 0; id < idMapL.size(); ++id) {
+            if (isOldIdUnused(id))
+                continue;
+
+            // Find a new mapping for any used but unmapped IDs
+            if (isOldIdUnmapped(id)) {
+                localId(id, unusedId = nextUnusedId(unusedId));
+                if (errorLatch)
+                    return;
+            }
+
+            if (isOldIdUnmapped(id)) {
+                error(std::string("old ID not mapped: ") + std::to_string(id));
+                return;
+            }
+
+            // Track max bound
+            maxBound = std::max(maxBound, localId(id) + 1);
+
+            if (errorLatch)
+                return;
+        }
+
+        bound(maxBound); // reset header ID bound to as big as it now needs to be
+    }
+
+    // Mark debug instructions for stripping
+    void spirvbin_t::stripDebug()
+    {
+        // Strip instructions in the stripOp set: debug info.
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                // remember opcodes we want to strip later
+                if (isStripOp(opCode, start))
+                    stripInst(start);
+                return true;
+            },
+            op_fn_nop);
+    }
+
+    // Mark instructions that refer to now-removed IDs for stripping
+    void spirvbin_t::stripDeadRefs()
+    {
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                // strip opcodes pointing to removed data
+                switch (opCode) {
+                case spv::OpName:
+                case spv::OpMemberName:
+                case spv::OpDecorate:
+                case spv::OpMemberDecorate:
+                    if (idPosR.find(asId(start+1)) == idPosR.end())
+                        stripInst(start);
+                    break;
+                default:
+                    break; // leave it alone
+                }
+
+                return true;
+            },
+            op_fn_nop);
+
+        strip();
+    }
+
+    // Update local maps of ID, type, etc positions
+    void spirvbin_t::buildLocalMaps()
+    {
+        msg(2, 2, std::string("build local maps: "));
+
+        mapped.clear();
+        idMapL.clear();
+//      preserve nameMap, so we don't clear that.
+        fnPos.clear();
+        fnCalls.clear();
+        typeConstPos.clear();
+        idPosR.clear();
+        entryPoint = spv::NoResult;
+        largestNewId = 0;
+
+        idMapL.resize(bound(), unused);
+
+        int         fnStart = 0;
+        spv::Id     fnRes   = spv::NoResult;
+
+        // build local Id and name maps
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                unsigned word = start+1;
+                spv::Id  typeId = spv::NoResult;
+
+                if (spv::InstructionDesc[opCode].hasType())
+                    typeId = asId(word++);
+
+                // If there's a result ID, remember the size of its type
+                if (spv::InstructionDesc[opCode].hasResult()) {
+                    const spv::Id resultId = asId(word++);
+                    idPosR[resultId] = start;
+
+                    if (typeId != spv::NoResult) {
+                        const unsigned idTypeSize = typeSizeInWords(typeId);
+
+                        if (errorLatch)
+                            return false;
+
+                        if (idTypeSize != 0)
+                            idTypeSizeMap[resultId] = idTypeSize;
+                    }
+                }
+
+                if (opCode == spv::Op::OpName) {
+                    const spv::Id    target = asId(start+1);
+                    const std::string  name = literalString(start+2);
+                    nameMap[name] = target;
+
+                } else if (opCode == spv::Op::OpFunctionCall) {
+                    ++fnCalls[asId(start + 3)];
+                } else if (opCode == spv::Op::OpEntryPoint) {
+                    entryPoint = asId(start + 2);
+                } else if (opCode == spv::Op::OpFunction) {
+                    if (fnStart != 0) {
+                        error("nested function found");
+                        return false;
+                    }
+
+                    fnStart = start;
+                    fnRes   = asId(start + 2);
+                } else if (opCode == spv::Op::OpFunctionEnd) {
+                    assert(fnRes != spv::NoResult);
+                    if (fnStart == 0) {
+                        error("function end without function start");
+                        return false;
+                    }
+
+                    fnPos[fnRes] = range_t(fnStart, start + asWordCount(start));
+                    fnStart = 0;
+                } else if (isConstOp(opCode)) {
+                    if (errorLatch)
+                        return false;
+
+                    assert(asId(start + 2) != spv::NoResult);
+                    typeConstPos.insert(start);
+                } else if (isTypeOp(opCode)) {
+                    assert(asId(start + 1) != spv::NoResult);
+                    typeConstPos.insert(start);
+                }
+
+                return false;
+            },
+
+            [this](spv::Id& id) { localId(id, unmapped); }
+        );
+    }
+
+    // Validate the SPIR header
+    void spirvbin_t::validate() const
+    {
+        msg(2, 2, std::string("validating: "));
+
+        if (spv.size() < header_size) {
+            error("file too short: ");
+            return;
+        }
+
+        if (magic() != spv::MagicNumber) {
+            error("bad magic number");
+            return;
+        }
+
+        // field 1 = version
+        // field 2 = generator magic
+        // field 3 = result <id> bound
+
+        if (schemaNum() != 0) {
+            error("bad schema, must be 0");
+            return;
+        }
+    }
+
+    int spirvbin_t::processInstruction(unsigned word, instfn_t instFn, idfn_t idFn)
+    {
+        const auto     instructionStart = word;
+        const unsigned wordCount = asWordCount(instructionStart);
+        const int      nextInst  = word++ + wordCount;
+        spv::Op  opCode    = asOpCode(instructionStart);
+
+        if (nextInst > int(spv.size())) {
+            error("spir instruction terminated too early");
+            return -1;
+        }
+
+        // Base for computing number of operands; will be updated as more is learned
+        unsigned numOperands = wordCount - 1;
+
+        if (instFn(opCode, instructionStart))
+            return nextInst;
+
+        // Read type and result ID from instruction desc table
+        if (spv::InstructionDesc[opCode].hasType()) {
+            idFn(asId(word++));
+            --numOperands;
+        }
+
+        if (spv::InstructionDesc[opCode].hasResult()) {
+            idFn(asId(word++));
+            --numOperands;
+        }
+
+        // Extended instructions: currently, assume everything is an ID.
+        // TODO: add whatever data we need for exceptions to that
+        if (opCode == spv::OpExtInst) {
+
+            idFn(asId(word)); // Instruction set is an ID that also needs to be mapped
+
+            word        += 2; // instruction set, and instruction from set
+            numOperands -= 2;
+
+            for (unsigned op=0; op < numOperands; ++op)
+                idFn(asId(word++)); // ID
+
+            return nextInst;
+        }
+
+        // Circular buffer so we can look back at previous unmapped values during the mapping pass.
+        static const unsigned idBufferSize = 4;
+        spv::Id idBuffer[idBufferSize];
+        unsigned idBufferPos = 0;
+
+        // Store IDs from instruction in our map
+        for (int op = 0; numOperands > 0; ++op, --numOperands) {
+            // SpecConstantOp is special: it includes the operands of another opcode which is
+            // given as a literal in the 3rd word.  We will switch over to pretending that the
+            // opcode being processed is the literal opcode value of the SpecConstantOp.  See the
+            // SPIRV spec for details.  This way we will handle IDs and literals as appropriate for
+            // the embedded op.
+            if (opCode == spv::OpSpecConstantOp) {
+                if (op == 0) {
+                    opCode = asOpCode(word++);  // this is the opcode embedded in the SpecConstantOp.
+                    --numOperands;
+                }
+            }
+
+            switch (spv::InstructionDesc[opCode].operands.getClass(op)) {
+            case spv::OperandId:
+            case spv::OperandScope:
+            case spv::OperandMemorySemantics:
+                idBuffer[idBufferPos] = asId(word);
+                idBufferPos = (idBufferPos + 1) % idBufferSize;
+                idFn(asId(word++));
+                break;
+
+            case spv::OperandVariableIds:
+                for (unsigned i = 0; i < numOperands; ++i)
+                    idFn(asId(word++));
+                return nextInst;
+
+            case spv::OperandVariableLiterals:
+                // for clarity
+                // if (opCode == spv::OpDecorate && asDecoration(word - 1) == spv::DecorationBuiltIn) {
+                //     ++word;
+                //     --numOperands;
+                // }
+                // word += numOperands;
+                return nextInst;
+
+            case spv::OperandVariableLiteralId: {
+                if (opCode == OpSwitch) {
+                    // word-2 is the position of the selector ID.  OpSwitch Literals match its type.
+                    // In case the IDs are currently being remapped, we get the word[-2] ID from
+                    // the circular idBuffer.
+                    const unsigned literalSizePos = (idBufferPos+idBufferSize-2) % idBufferSize;
+                    const unsigned literalSize = idTypeSizeInWords(idBuffer[literalSizePos]);
+                    const unsigned numLiteralIdPairs = (nextInst-word) / (1+literalSize);
+
+                    if (errorLatch)
+                        return -1;
+
+                    for (unsigned arg=0; arg<numLiteralIdPairs; ++arg) {
+                        word += literalSize;  // literal
+                        idFn(asId(word++));   // label
+                    }
+                } else {
+                    assert(0); // currentely, only OpSwitch uses OperandVariableLiteralId
+                }
+
+                return nextInst;
+            }
+
+            case spv::OperandLiteralString: {
+                const int stringWordCount = literalStringWords(literalString(word));
+                word += stringWordCount;
+                numOperands -= (stringWordCount-1); // -1 because for() header post-decrements
+                break;
+            }
+
+            case spv::OperandVariableLiteralStrings:
+                return nextInst;
+
+            // Execution mode might have extra literal operands.  Skip them.
+            case spv::OperandExecutionMode:
+                return nextInst;
+
+            // Single word operands we simply ignore, as they hold no IDs
+            case spv::OperandLiteralNumber:
+            case spv::OperandSource:
+            case spv::OperandExecutionModel:
+            case spv::OperandAddressing:
+            case spv::OperandMemory:
+            case spv::OperandStorage:
+            case spv::OperandDimensionality:
+            case spv::OperandSamplerAddressingMode:
+            case spv::OperandSamplerFilterMode:
+            case spv::OperandSamplerImageFormat:
+            case spv::OperandImageChannelOrder:
+            case spv::OperandImageChannelDataType:
+            case spv::OperandImageOperands:
+            case spv::OperandFPFastMath:
+            case spv::OperandFPRoundingMode:
+            case spv::OperandLinkageType:
+            case spv::OperandAccessQualifier:
+            case spv::OperandFuncParamAttr:
+            case spv::OperandDecoration:
+            case spv::OperandBuiltIn:
+            case spv::OperandSelect:
+            case spv::OperandLoop:
+            case spv::OperandFunction:
+            case spv::OperandMemoryAccess:
+            case spv::OperandGroupOperation:
+            case spv::OperandKernelEnqueueFlags:
+            case spv::OperandKernelProfilingInfo:
+            case spv::OperandCapability:
+            case spv::OperandCooperativeMatrixOperands:
+                ++word;
+                break;
+
+            default:
+                assert(0 && "Unhandled Operand Class");
+                break;
+            }
+        }
+
+        return nextInst;
+    }
+
+    // Make a pass over all the instructions and process them given appropriate functions
+    spirvbin_t& spirvbin_t::process(instfn_t instFn, idfn_t idFn, unsigned begin, unsigned end)
+    {
+        // For efficiency, reserve name map space.  It can grow if needed.
+        nameMap.reserve(32);
+
+        // If begin or end == 0, use defaults
+        begin = (begin == 0 ? header_size          : begin);
+        end   = (end   == 0 ? unsigned(spv.size()) : end);
+
+        // basic parsing and InstructionDesc table borrowed from SpvDisassemble.cpp...
+        unsigned nextInst = unsigned(spv.size());
+
+        for (unsigned word = begin; word < end; word = nextInst) {
+            nextInst = processInstruction(word, instFn, idFn);
+
+            if (errorLatch)
+                return *this;
+        }
+
+        return *this;
+    }
+
+    // Apply global name mapping to a single module
+    void spirvbin_t::mapNames()
+    {
+        static const std::uint32_t softTypeIdLimit = 3011;  // small prime.  TODO: get from options
+        static const std::uint32_t firstMappedID   = 3019;  // offset into ID space
+
+        for (const auto& name : nameMap) {
+            std::uint32_t hashval = 1911;
+            for (const char c : name.first)
+                hashval = hashval * 1009 + c;
+
+            if (isOldIdUnmapped(name.second)) {
+                localId(name.second, nextUnusedId(hashval % softTypeIdLimit + firstMappedID));
+                if (errorLatch)
+                    return;
+            }
+        }
+    }
+
+    // Map fn contents to IDs of similar functions in other modules
+    void spirvbin_t::mapFnBodies()
+    {
+        static const std::uint32_t softTypeIdLimit = 19071;  // small prime.  TODO: get from options
+        static const std::uint32_t firstMappedID   =  6203;  // offset into ID space
+
+        // Initial approach: go through some high priority opcodes first and assign them
+        // hash values.
+
+        spv::Id               fnId       = spv::NoResult;
+        std::vector<unsigned> instPos;
+        instPos.reserve(unsigned(spv.size()) / 16); // initial estimate; can grow if needed.
+
+        // Build local table of instruction start positions
+        process(
+            [&](spv::Op, unsigned start) { instPos.push_back(start); return true; },
+            op_fn_nop);
+
+        if (errorLatch)
+            return;
+
+        // Window size for context-sensitive canonicalization values
+        // Empirical best size from a single data set.  TODO: Would be a good tunable.
+        // We essentially perform a little convolution around each instruction,
+        // to capture the flavor of nearby code, to hopefully match to similar
+        // code in other modules.
+        static const unsigned windowSize = 2;
+
+        for (unsigned entry = 0; entry < unsigned(instPos.size()); ++entry) {
+            const unsigned start  = instPos[entry];
+            const spv::Op  opCode = asOpCode(start);
+
+            if (opCode == spv::OpFunction)
+                fnId   = asId(start + 2);
+
+            if (opCode == spv::OpFunctionEnd)
+                fnId = spv::NoResult;
+
+            if (fnId != spv::NoResult) { // if inside a function
+                if (spv::InstructionDesc[opCode].hasResult()) {
+                    const unsigned word    = start + (spv::InstructionDesc[opCode].hasType() ? 2 : 1);
+                    const spv::Id  resId   = asId(word);
+                    std::uint32_t  hashval = fnId * 17; // small prime
+
+                    for (unsigned i = entry-1; i >= entry-windowSize; --i) {
+                        if (asOpCode(instPos[i]) == spv::OpFunction)
+                            break;
+                        hashval = hashval * 30103 + asOpCodeHash(instPos[i]); // 30103 = semiarbitrary prime
+                    }
+
+                    for (unsigned i = entry; i <= entry + windowSize; ++i) {
+                        if (asOpCode(instPos[i]) == spv::OpFunctionEnd)
+                            break;
+                        hashval = hashval * 30103 + asOpCodeHash(instPos[i]); // 30103 = semiarbitrary prime
+                    }
+
+                    if (isOldIdUnmapped(resId)) {
+                        localId(resId, nextUnusedId(hashval % softTypeIdLimit + firstMappedID));
+                        if (errorLatch)
+                            return;
+                    }
+
+                }
+            }
+        }
+
+        spv::Op          thisOpCode(spv::OpNop);
+        std::unordered_map<int, int> opCounter;
+        int              idCounter(0);
+        fnId = spv::NoResult;
+
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                switch (opCode) {
+                case spv::OpFunction:
+                    // Reset counters at each function
+                    idCounter = 0;
+                    opCounter.clear();
+                    fnId = asId(start + 2);
+                    break;
+
+                case spv::OpImageSampleImplicitLod:
+                case spv::OpImageSampleExplicitLod:
+                case spv::OpImageSampleDrefImplicitLod:
+                case spv::OpImageSampleDrefExplicitLod:
+                case spv::OpImageSampleProjImplicitLod:
+                case spv::OpImageSampleProjExplicitLod:
+                case spv::OpImageSampleProjDrefImplicitLod:
+                case spv::OpImageSampleProjDrefExplicitLod:
+                case spv::OpDot:
+                case spv::OpCompositeExtract:
+                case spv::OpCompositeInsert:
+                case spv::OpVectorShuffle:
+                case spv::OpLabel:
+                case spv::OpVariable:
+
+                case spv::OpAccessChain:
+                case spv::OpLoad:
+                case spv::OpStore:
+                case spv::OpCompositeConstruct:
+                case spv::OpFunctionCall:
+                    ++opCounter[opCode];
+                    idCounter = 0;
+                    thisOpCode = opCode;
+                    break;
+                default:
+                    thisOpCode = spv::OpNop;
+                }
+
+                return false;
+            },
+
+            [&](spv::Id& id) {
+                if (thisOpCode != spv::OpNop) {
+                    ++idCounter;
+                    const std::uint32_t hashval =
+                        // Explicitly cast operands to unsigned int to avoid integer
+                        // promotion to signed int followed by integer overflow,
+                        // which would result in undefined behavior.
+                        static_cast<unsigned int>(opCounter[thisOpCode])
+                        * thisOpCode
+                        * 50047
+                        + idCounter
+                        + static_cast<unsigned int>(fnId) * 117;
+
+                    if (isOldIdUnmapped(id))
+                        localId(id, nextUnusedId(hashval % softTypeIdLimit + firstMappedID));
+                }
+            });
+    }
+
+    // EXPERIMENTAL: forward IO and uniform load/stores into operands
+    // This produces invalid Schema-0 SPIRV
+    void spirvbin_t::forwardLoadStores()
+    {
+        idset_t fnLocalVars; // set of function local vars
+        idmap_t idMap;       // Map of load result IDs to what they load
+
+        // EXPERIMENTAL: Forward input and access chain loads into consumptions
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                // Add inputs and uniforms to the map
+                if ((opCode == spv::OpVariable && asWordCount(start) == 4) &&
+                    (spv[start+3] == spv::StorageClassUniform ||
+                    spv[start+3] == spv::StorageClassUniformConstant ||
+                    spv[start+3] == spv::StorageClassInput))
+                    fnLocalVars.insert(asId(start+2));
+
+                if (opCode == spv::OpAccessChain && fnLocalVars.count(asId(start+3)) > 0)
+                    fnLocalVars.insert(asId(start+2));
+
+                if (opCode == spv::OpLoad && fnLocalVars.count(asId(start+3)) > 0) {
+                    idMap[asId(start+2)] = asId(start+3);
+                    stripInst(start);
+                }
+
+                return false;
+            },
+
+            [&](spv::Id& id) { if (idMap.find(id) != idMap.end()) id = idMap[id]; }
+        );
+
+        if (errorLatch)
+            return;
+
+        // EXPERIMENTAL: Implicit output stores
+        fnLocalVars.clear();
+        idMap.clear();
+
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                // Add inputs and uniforms to the map
+                if ((opCode == spv::OpVariable && asWordCount(start) == 4) &&
+                    (spv[start+3] == spv::StorageClassOutput))
+                    fnLocalVars.insert(asId(start+2));
+
+                if (opCode == spv::OpStore && fnLocalVars.count(asId(start+1)) > 0) {
+                    idMap[asId(start+2)] = asId(start+1);
+                    stripInst(start);
+                }
+
+                return false;
+            },
+            op_fn_nop);
+
+        if (errorLatch)
+            return;
+
+        process(
+            inst_fn_nop,
+            [&](spv::Id& id) { if (idMap.find(id) != idMap.end()) id = idMap[id]; }
+        );
+
+        if (errorLatch)
+            return;
+
+        strip();          // strip out data we decided to eliminate
+    }
+
+    // optimize loads and stores
+    void spirvbin_t::optLoadStore()
+    {
+        idset_t    fnLocalVars;  // candidates for removal (only locals)
+        idmap_t    idMap;        // Map of load result IDs to what they load
+        blockmap_t blockMap;     // Map of IDs to blocks they first appear in
+        int        blockNum = 0; // block count, to avoid crossing flow control
+
+        // Find all the function local pointers stored at most once, and not via access chains
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                const int wordCount = asWordCount(start);
+
+                // Count blocks, so we can avoid crossing flow control
+                if (isFlowCtrl(opCode))
+                    ++blockNum;
+
+                // Add local variables to the map
+                if ((opCode == spv::OpVariable && spv[start+3] == spv::StorageClassFunction && asWordCount(start) == 4)) {
+                    fnLocalVars.insert(asId(start+2));
+                    return true;
+                }
+
+                // Ignore process vars referenced via access chain
+                if ((opCode == spv::OpAccessChain || opCode == spv::OpInBoundsAccessChain) && fnLocalVars.count(asId(start+3)) > 0) {
+                    fnLocalVars.erase(asId(start+3));
+                    idMap.erase(asId(start+3));
+                    return true;
+                }
+
+                if (opCode == spv::OpLoad && fnLocalVars.count(asId(start+3)) > 0) {
+                    const spv::Id varId = asId(start+3);
+
+                    // Avoid loads before stores
+                    if (idMap.find(varId) == idMap.end()) {
+                        fnLocalVars.erase(varId);
+                        idMap.erase(varId);
+                    }
+
+                    // don't do for volatile references
+                    if (wordCount > 4 && (spv[start+4] & spv::MemoryAccessVolatileMask)) {
+                        fnLocalVars.erase(varId);
+                        idMap.erase(varId);
+                    }
+
+                    // Handle flow control
+                    if (blockMap.find(varId) == blockMap.end()) {
+                        blockMap[varId] = blockNum;  // track block we found it in.
+                    } else if (blockMap[varId] != blockNum) {
+                        fnLocalVars.erase(varId);  // Ignore if crosses flow control
+                        idMap.erase(varId);
+                    }
+
+                    return true;
+                }
+
+                if (opCode == spv::OpStore && fnLocalVars.count(asId(start+1)) > 0) {
+                    const spv::Id varId = asId(start+1);
+
+                    if (idMap.find(varId) == idMap.end()) {
+                        idMap[varId] = asId(start+2);
+                    } else {
+                        // Remove if it has more than one store to the same pointer
+                        fnLocalVars.erase(varId);
+                        idMap.erase(varId);
+                    }
+
+                    // don't do for volatile references
+                    if (wordCount > 3 && (spv[start+3] & spv::MemoryAccessVolatileMask)) {
+                        fnLocalVars.erase(asId(start+3));
+                        idMap.erase(asId(start+3));
+                    }
+
+                    // Handle flow control
+                    if (blockMap.find(varId) == blockMap.end()) {
+                        blockMap[varId] = blockNum;  // track block we found it in.
+                    } else if (blockMap[varId] != blockNum) {
+                        fnLocalVars.erase(varId);  // Ignore if crosses flow control
+                        idMap.erase(varId);
+                    }
+
+                    return true;
+                }
+
+                return false;
+            },
+
+            // If local var id used anywhere else, don't eliminate
+            [&](spv::Id& id) {
+                if (fnLocalVars.count(id) > 0) {
+                    fnLocalVars.erase(id);
+                    idMap.erase(id);
+                }
+            }
+        );
+
+        if (errorLatch)
+            return;
+
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                if (opCode == spv::OpLoad && fnLocalVars.count(asId(start+3)) > 0)
+                    idMap[asId(start+2)] = idMap[asId(start+3)];
+                return false;
+            },
+            op_fn_nop);
+
+        if (errorLatch)
+            return;
+
+        // Chase replacements to their origins, in case there is a chain such as:
+        //   2 = store 1
+        //   3 = load 2
+        //   4 = store 3
+        //   5 = load 4
+        // We want to replace uses of 5 with 1.
+        for (const auto& idPair : idMap) {
+            spv::Id id = idPair.first;
+            while (idMap.find(id) != idMap.end())  // Chase to end of chain
+                id = idMap[id];
+
+            idMap[idPair.first] = id;              // replace with final result
+        }
+
+        // Remove the load/store/variables for the ones we've discovered
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                if ((opCode == spv::OpLoad  && fnLocalVars.count(asId(start+3)) > 0) ||
+                    (opCode == spv::OpStore && fnLocalVars.count(asId(start+1)) > 0) ||
+                    (opCode == spv::OpVariable && fnLocalVars.count(asId(start+2)) > 0)) {
+
+                    stripInst(start);
+                    return true;
+                }
+
+                return false;
+            },
+
+            [&](spv::Id& id) {
+                if (idMap.find(id) != idMap.end()) id = idMap[id];
+            }
+        );
+
+        if (errorLatch)
+            return;
+
+        strip();          // strip out data we decided to eliminate
+    }
+
+    // remove bodies of uncalled functions
+    void spirvbin_t::dceFuncs()
+    {
+        msg(3, 2, std::string("Removing Dead Functions: "));
+
+        // TODO: There are more efficient ways to do this.
+        bool changed = true;
+
+        while (changed) {
+            changed = false;
+
+            for (auto fn = fnPos.begin(); fn != fnPos.end(); ) {
+                if (fn->first == entryPoint) { // don't DCE away the entry point!
+                    ++fn;
+                    continue;
+                }
+
+                const auto call_it = fnCalls.find(fn->first);
+
+                if (call_it == fnCalls.end() || call_it->second == 0) {
+                    changed = true;
+                    stripRange.push_back(fn->second);
+
+                    // decrease counts of called functions
+                    process(
+                        [&](spv::Op opCode, unsigned start) {
+                            if (opCode == spv::Op::OpFunctionCall) {
+                                const auto call_it = fnCalls.find(asId(start + 3));
+                                if (call_it != fnCalls.end()) {
+                                    if (--call_it->second <= 0)
+                                        fnCalls.erase(call_it);
+                                }
+                            }
+
+                            return true;
+                        },
+                        op_fn_nop,
+                        fn->second.first,
+                        fn->second.second);
+
+                    if (errorLatch)
+                        return;
+
+                    fn = fnPos.erase(fn);
+                } else ++fn;
+            }
+        }
+    }
+
+    // remove unused function variables + decorations
+    void spirvbin_t::dceVars()
+    {
+        msg(3, 2, std::string("DCE Vars: "));
+
+        std::unordered_map<spv::Id, int> varUseCount;
+
+        // Count function variable use
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                if (opCode == spv::OpVariable) {
+                    ++varUseCount[asId(start+2)];
+                    return true;
+                } else if (opCode == spv::OpEntryPoint) {
+                    const int wordCount = asWordCount(start);
+                    for (int i = 4; i < wordCount; i++) {
+                        ++varUseCount[asId(start+i)];
+                    }
+                    return true;
+                } else
+                    return false;
+            },
+
+            [&](spv::Id& id) { if (varUseCount[id]) ++varUseCount[id]; }
+        );
+
+        if (errorLatch)
+            return;
+
+        // Remove single-use function variables + associated decorations and names
+        process(
+            [&](spv::Op opCode, unsigned start) {
+                spv::Id id = spv::NoResult;
+                if (opCode == spv::OpVariable)
+                    id = asId(start+2);
+                if (opCode == spv::OpDecorate || opCode == spv::OpName)
+                    id = asId(start+1);
+
+                if (id != spv::NoResult && varUseCount[id] == 1)
+                    stripInst(start);
+
+                return true;
+            },
+            op_fn_nop);
+    }
+
+    // remove unused types
+    void spirvbin_t::dceTypes()
+    {
+        std::vector<bool> isType(bound(), false);
+
+        // for speed, make O(1) way to get to type query (map is log(n))
+        for (const auto typeStart : typeConstPos)
+            isType[asTypeConstId(typeStart)] = true;
+
+        std::unordered_map<spv::Id, int> typeUseCount;
+
+        // This is not the most efficient algorithm, but this is an offline tool, and
+        // it's easy to write this way.  Can be improved opportunistically if needed.
+        bool changed = true;
+        while (changed) {
+            changed = false;
+            strip();
+            typeUseCount.clear();
+
+            // Count total type usage
+            process(inst_fn_nop,
+                    [&](spv::Id& id) { if (isType[id]) ++typeUseCount[id]; }
+                    );
+
+            if (errorLatch)
+                return;
+
+            // Remove single reference types
+            for (const auto typeStart : typeConstPos) {
+                const spv::Id typeId = asTypeConstId(typeStart);
+                if (typeUseCount[typeId] == 1) {
+                    changed = true;
+                    --typeUseCount[typeId];
+                    stripInst(typeStart);
+                }
+            }
+
+            if (errorLatch)
+                return;
+        }
+    }
+
+#ifdef NOTDEF
+    bool spirvbin_t::matchType(const spirvbin_t::globaltypes_t& globalTypes, spv::Id lt, spv::Id gt) const
+    {
+        // Find the local type id "lt" and global type id "gt"
+        const auto lt_it = typeConstPosR.find(lt);
+        if (lt_it == typeConstPosR.end())
+            return false;
+
+        const auto typeStart = lt_it->second;
+
+        // Search for entry in global table
+        const auto gtype = globalTypes.find(gt);
+        if (gtype == globalTypes.end())
+            return false;
+
+        const auto& gdata = gtype->second;
+
+        // local wordcount and opcode
+        const int     wordCount   = asWordCount(typeStart);
+        const spv::Op opCode      = asOpCode(typeStart);
+
+        // no type match if opcodes don't match, or operand count doesn't match
+        if (opCode != opOpCode(gdata[0]) || wordCount != opWordCount(gdata[0]))
+            return false;
+
+        const unsigned numOperands = wordCount - 2; // all types have a result
+
+        const auto cmpIdRange = [&](range_t range) {
+            for (int x=range.first; x<std::min(range.second, wordCount); ++x)
+                if (!matchType(globalTypes, asId(typeStart+x), gdata[x]))
+                    return false;
+            return true;
+        };
+
+        const auto cmpConst   = [&]() { return cmpIdRange(constRange(opCode)); };
+        const auto cmpSubType = [&]() { return cmpIdRange(typeRange(opCode));  };
+
+        // Compare literals in range [start,end)
+        const auto cmpLiteral = [&]() {
+            const auto range = literalRange(opCode);
+            return std::equal(spir.begin() + typeStart + range.first,
+                spir.begin() + typeStart + std::min(range.second, wordCount),
+                gdata.begin() + range.first);
+        };
+
+        assert(isTypeOp(opCode) || isConstOp(opCode));
+
+        switch (opCode) {
+        case spv::OpTypeOpaque:       // TODO: disable until we compare the literal strings.
+        case spv::OpTypeQueue:        return false;
+        case spv::OpTypeEvent:        // fall through...
+        case spv::OpTypeDeviceEvent:  // ...
+        case spv::OpTypeReserveId:    return false;
+            // for samplers, we don't handle the optional parameters yet
+        case spv::OpTypeSampler:      return cmpLiteral() && cmpConst() && cmpSubType() && wordCount == 8;
+        default:                      return cmpLiteral() && cmpConst() && cmpSubType();
+        }
+    }
+
+    // Look for an equivalent type in the globalTypes map
+    spv::Id spirvbin_t::findType(const spirvbin_t::globaltypes_t& globalTypes, spv::Id lt) const
+    {
+        // Try a recursive type match on each in turn, and return a match if we find one
+        for (const auto& gt : globalTypes)
+            if (matchType(globalTypes, lt, gt.first))
+                return gt.first;
+
+        return spv::NoType;
+    }
+#endif // NOTDEF
+
+    // Return start position in SPV of given Id.  error if not found.
+    unsigned spirvbin_t::idPos(spv::Id id) const
+    {
+        const auto tid_it = idPosR.find(id);
+        if (tid_it == idPosR.end()) {
+            error("ID not found");
+            return 0;
+        }
+
+        return tid_it->second;
+    }
+
+    // Hash types to canonical values.  This can return ID collisions (it's a bit
+    // inevitable): it's up to the caller to handle that gracefully.
+    std::uint32_t spirvbin_t::hashType(unsigned typeStart) const
+    {
+        const unsigned wordCount   = asWordCount(typeStart);
+        const spv::Op  opCode      = asOpCode(typeStart);
+
+        switch (opCode) {
+        case spv::OpTypeVoid:         return 0;
+        case spv::OpTypeBool:         return 1;
+        case spv::OpTypeInt:          return 3 + (spv[typeStart+3]);
+        case spv::OpTypeFloat:        return 5;
+        case spv::OpTypeVector:
+            return 6 + hashType(idPos(spv[typeStart+2])) * (spv[typeStart+3] - 1);
+        case spv::OpTypeMatrix:
+            return 30 + hashType(idPos(spv[typeStart+2])) * (spv[typeStart+3] - 1);
+        case spv::OpTypeImage:
+            return 120 + hashType(idPos(spv[typeStart+2])) +
+                spv[typeStart+3] +            // dimensionality
+                spv[typeStart+4] * 8 * 16 +   // depth
+                spv[typeStart+5] * 4 * 16 +   // arrayed
+                spv[typeStart+6] * 2 * 16 +   // multisampled
+                spv[typeStart+7] * 1 * 16;    // format
+        case spv::OpTypeSampler:
+            return 500;
+        case spv::OpTypeSampledImage:
+            return 502;
+        case spv::OpTypeArray:
+            return 501 + hashType(idPos(spv[typeStart+2])) * spv[typeStart+3];
+        case spv::OpTypeRuntimeArray:
+            return 5000  + hashType(idPos(spv[typeStart+2]));
+        case spv::OpTypeStruct:
+            {
+                std::uint32_t hash = 10000;
+                for (unsigned w=2; w < wordCount; ++w)
+                    hash += w * hashType(idPos(spv[typeStart+w]));
+                return hash;
+            }
+
+        case spv::OpTypeOpaque:         return 6000 + spv[typeStart+2];
+        case spv::OpTypePointer:        return 100000  + hashType(idPos(spv[typeStart+3]));
+        case spv::OpTypeFunction:
+            {
+                std::uint32_t hash = 200000;
+                for (unsigned w=2; w < wordCount; ++w)
+                    hash += w * hashType(idPos(spv[typeStart+w]));
+                return hash;
+            }
+
+        case spv::OpTypeEvent:           return 300000;
+        case spv::OpTypeDeviceEvent:     return 300001;
+        case spv::OpTypeReserveId:       return 300002;
+        case spv::OpTypeQueue:           return 300003;
+        case spv::OpTypePipe:            return 300004;
+        case spv::OpConstantTrue:        return 300007;
+        case spv::OpConstantFalse:       return 300008;
+        case spv::OpConstantComposite:
+            {
+                std::uint32_t hash = 300011 + hashType(idPos(spv[typeStart+1]));
+                for (unsigned w=3; w < wordCount; ++w)
+                    hash += w * hashType(idPos(spv[typeStart+w]));
+                return hash;
+            }
+        case spv::OpConstant:
+            {
+                std::uint32_t hash = 400011 + hashType(idPos(spv[typeStart+1]));
+                for (unsigned w=3; w < wordCount; ++w)
+                    hash += w * spv[typeStart+w];
+                return hash;
+            }
+        case spv::OpConstantNull:
+            {
+                std::uint32_t hash = 500009 + hashType(idPos(spv[typeStart+1]));
+                return hash;
+            }
+        case spv::OpConstantSampler:
+            {
+                std::uint32_t hash = 600011 + hashType(idPos(spv[typeStart+1]));
+                for (unsigned w=3; w < wordCount; ++w)
+                    hash += w * spv[typeStart+w];
+                return hash;
+            }
+
+        default:
+            error("unknown type opcode");
+            return 0;
+        }
+    }
+
+    void spirvbin_t::mapTypeConst()
+    {
+        globaltypes_t globalTypeMap;
+
+        msg(3, 2, std::string("Remapping Consts & Types: "));
+
+        static const std::uint32_t softTypeIdLimit = 3011; // small prime.  TODO: get from options
+        static const std::uint32_t firstMappedID   = 8;    // offset into ID space
+
+        for (auto& typeStart : typeConstPos) {
+            const spv::Id       resId     = asTypeConstId(typeStart);
+            const std::uint32_t hashval   = hashType(typeStart);
+
+            if (errorLatch)
+                return;
+
+            if (isOldIdUnmapped(resId)) {
+                localId(resId, nextUnusedId(hashval % softTypeIdLimit + firstMappedID));
+                if (errorLatch)
+                    return;
+            }
+        }
+    }
+
+    // Strip a single binary by removing ranges given in stripRange
+    void spirvbin_t::strip()
+    {
+        if (stripRange.empty()) // nothing to do
+            return;
+
+        // Sort strip ranges in order of traversal
+        std::sort(stripRange.begin(), stripRange.end());
+
+        // Allocate a new binary big enough to hold old binary
+        // We'll step this iterator through the strip ranges as we go through the binary
+        auto strip_it = stripRange.begin();
+
+        int strippedPos = 0;
+        for (unsigned word = 0; word < unsigned(spv.size()); ++word) {
+            while (strip_it != stripRange.end() && word >= strip_it->second)
+                ++strip_it;
+
+            if (strip_it == stripRange.end() || word < strip_it->first || word >= strip_it->second)
+                spv[strippedPos++] = spv[word];
+        }
+
+        spv.resize(strippedPos);
+        stripRange.clear();
+
+        buildLocalMaps();
+    }
+
+    // Strip a single binary by removing ranges given in stripRange
+    void spirvbin_t::remap(std::uint32_t opts)
+    {
+        options = opts;
+
+        // Set up opcode tables from SpvDoc
+        spv::Parameterize();
+
+        validate();       // validate header
+        buildLocalMaps(); // build ID maps
+
+        msg(3, 4, std::string("ID bound: ") + std::to_string(bound()));
+
+        if (options & STRIP)         stripDebug();
+        if (errorLatch) return;
+
+        strip();        // strip out data we decided to eliminate
+        if (errorLatch) return;
+
+        if (options & OPT_LOADSTORE) optLoadStore();
+        if (errorLatch) return;
+
+        if (options & OPT_FWD_LS)    forwardLoadStores();
+        if (errorLatch) return;
+
+        if (options & DCE_FUNCS)     dceFuncs();
+        if (errorLatch) return;
+
+        if (options & DCE_VARS)      dceVars();
+        if (errorLatch) return;
+
+        if (options & DCE_TYPES)     dceTypes();
+        if (errorLatch) return;
+
+        strip();         // strip out data we decided to eliminate
+        if (errorLatch) return;
+
+        stripDeadRefs(); // remove references to things we DCEed
+        if (errorLatch) return;
+
+        // after the last strip, we must clean any debug info referring to now-deleted data
+
+        if (options & MAP_TYPES)     mapTypeConst();
+        if (errorLatch) return;
+
+        if (options & MAP_NAMES)     mapNames();
+        if (errorLatch) return;
+
+        if (options & MAP_FUNCS)     mapFnBodies();
+        if (errorLatch) return;
+
+        if (options & MAP_ALL) {
+            mapRemainder(); // map any unmapped IDs
+            if (errorLatch) return;
+
+            applyMap();     // Now remap each shader to the new IDs we've come up with
+            if (errorLatch) return;
+        }
+    }
+
+    // remap from a memory image
+    void spirvbin_t::remap(std::vector<std::uint32_t>& in_spv, const std::vector<std::string>& whiteListStrings,
+                           std::uint32_t opts)
+    {
+        stripWhiteList = whiteListStrings;
+        spv.swap(in_spv);
+        remap(opts);
+        spv.swap(in_spv);
+    }
+
+    // remap from a memory image - legacy interface without white list
+    void spirvbin_t::remap(std::vector<std::uint32_t>& in_spv, std::uint32_t opts)
+    {
+      stripWhiteList.clear();
+      spv.swap(in_spv);
+      remap(opts);
+      spv.swap(in_spv);
+    }
+
+} // namespace SPV
+
diff --git a/engine/thirdparty/glslang/SPIRV/SPVRemapper.h b/engine/thirdparty/glslang/SPIRV/SPVRemapper.h
new file mode 100644
index 00000000..33efe331
--- /dev/null
+++ b/engine/thirdparty/glslang/SPIRV/SPVRemapper.h
@@ -0,0 +1,284 @@
+//
+// Copyright (C) 2015 LunarG, Inc.
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//    Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+//    Redistributions in binary form must reproduce the above
+//    copyright notice, this list of conditions and the following
+//    disclaimer in the documentation and/or other materials provided
+//    with the distribution.
+//
+//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+//    contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+
+#ifndef SPIRVREMAPPER_H
+#define SPIRVREMAPPER_H
+
+#include <string>
+#include <vector>
+#include <cstdlib>
+#include <exception>
+
+namespace spv {
+
+class spirvbin_base_t
+{
+public:
+   enum Options {
+      NONE          = 0,
+      STRIP         = (1<<0),
+      MAP_TYPES     = (1<<1),
+      MAP_NAMES     = (1<<2),
+      MAP_FUNCS     = (1<<3),
+      DCE_FUNCS     = (1<<4),
+      DCE_VARS      = (1<<5),
+      DCE_TYPES     = (1<<6),
+      OPT_LOADSTORE = (1<<7),
+      OPT_FWD_LS    = (1<<8), // EXPERIMENTAL: PRODUCES INVALID SCHEMA-0 SPIRV
+      MAP_ALL       = (MAP_TYPES | MAP_NAMES | MAP_FUNCS),
+      DCE_ALL       = (DCE_FUNCS | DCE_VARS | DCE_TYPES),
+      OPT_ALL       = (OPT_LOADSTORE),
+
+      ALL_BUT_STRIP = (MAP_ALL | DCE_ALL | OPT_ALL),
+      DO_EVERYTHING = (STRIP | ALL_BUT_STRIP)
+   };
+};
+
+} // namespace SPV
+
+#include <functional>
+#include <cstdint>
+#include <unordered_map>
+#include <unordered_set>
+#include <map>
+#include <set>
+#include <cassert>
+
+#include "spirv.hpp"
+
+namespace spv {
+const Id NoResult = 0;
+
+// class to hold SPIR-V binary data for remapping, DCE, and debug stripping
+class spirvbin_t : public spirvbin_base_t
+{
+public:
+   spirvbin_t(int verbose = 0) : entryPoint(spv::NoResult), largestNewId(0), verbose(verbose), errorLatch(false)
+   { }
+
+   virtual ~spirvbin_t() { }
+
+   // remap on an existing binary in memory
+   void remap(std::vector<std::uint32_t>& spv, const std::vector<std::string>& whiteListStrings,
+              std::uint32_t opts = DO_EVERYTHING);
+
+   // remap on an existing binary in memory - legacy interface without white list
+   void remap(std::vector<std::uint32_t>& spv, std::uint32_t opts = DO_EVERYTHING);
+
+   // Type for error/log handler functions
+   typedef std::function<void(const std::string&)> errorfn_t;
+   typedef std::function<void(const std::string&)> logfn_t;
+
+   // Register error/log handling functions (can be lambda fn / functor / etc)
+   static void registerErrorHandler(errorfn_t handler) { errorHandler = handler; }
+   static void registerLogHandler(logfn_t handler)     { logHandler   = handler; }
+
+protected:
+   // This can be overridden to provide other message behavior if needed
+   virtual void msg(int minVerbosity, int indent, const std::string& txt) const;
+
+private:
+   // Local to global, or global to local ID map
+   typedef std::unordered_map<spv::Id, spv::Id> idmap_t;
+   typedef std::unordered_set<spv::Id>          idset_t;
+   typedef std::unordered_map<spv::Id, int>     blockmap_t;
+
+   void remap(std::uint32_t opts = DO_EVERYTHING);
+
+   // Map of names to IDs
+   typedef std::unordered_map<std::string, spv::Id> namemap_t;
+
+   typedef std::uint32_t spirword_t;
+
+   typedef std::pair<unsigned, unsigned> range_t;
+   typedef std::function<void(spv::Id&)>                idfn_t;
+   typedef std::function<bool(spv::Op, unsigned start)> instfn_t;
+
+   // Special Values for ID map:
+   static const spv::Id unmapped;     // unchanged from default value
+   static const spv::Id unused;       // unused ID
+   static const int     header_size;  // SPIR header = 5 words
+
+   class id_iterator_t;
+
+   // For mapping type entries between different shaders
+   typedef std::vector<spirword_t>        typeentry_t;
+   typedef std::map<spv::Id, typeentry_t> globaltypes_t;
+
+   // A set that preserves position order, and a reverse map
+   typedef std::set<int>                    posmap_t;
+   typedef std::unordered_map<spv::Id, int> posmap_rev_t;
+
+   // Maps and ID to the size of its base type, if known.
+   typedef std::unordered_map<spv::Id, unsigned> typesize_map_t;
+
+   // handle error
+   void error(const std::string& txt) const { errorLatch = true; errorHandler(txt); }
+
+   bool     isConstOp(spv::Op opCode)      const;
+   bool     isTypeOp(spv::Op opCode)       const;
+   bool     isStripOp(spv::Op opCode)      const;
+   bool     isFlowCtrl(spv::Op opCode)     const;
+   range_t  literalRange(spv::Op opCode)   const;
+   range_t  typeRange(spv::Op opCode)      const;
+   range_t  constRange(spv::Op opCode)     const;
+   unsigned typeSizeInWords(spv::Id id)    const;
+   unsigned idTypeSizeInWords(spv::Id id)  const;
+
+   bool isStripOp(spv::Op opCode, unsigned start) const;
+
+   spv::Id&        asId(unsigned word)                { return spv[word]; }
+   const spv::Id&  asId(unsigned word)          const { return spv[word]; }
+   spv::Op         asOpCode(unsigned word)      const { return opOpCode(spv[word]); }
+   std::uint32_t   asOpCodeHash(unsigned word);
+   spv::Decoration asDecoration(unsigned word)  const { return spv::Decoration(spv[word]); }
+   unsigned        asWordCount(unsigned word)   const { return opWordCount(spv[word]); }
+   spv::Id         asTypeConstId(unsigned word) const { return asId(word + (isTypeOp(asOpCode(word)) ? 1 : 2)); }
+   unsigned        idPos(spv::Id id)            const;
+
+   static unsigned opWordCount(spirword_t data) { return data >> spv::WordCountShift; }
+   static spv::Op  opOpCode(spirword_t data)    { return spv::Op(data & spv::OpCodeMask); }
+
+   // Header access & set methods
+   spirword_t  magic()    const       { return spv[0]; } // return magic number
+   spirword_t  bound()    const       { return spv[3]; } // return Id bound from header
+   spirword_t  bound(spirword_t b)    { return spv[3] = b; }
+   spirword_t  genmagic() const       { return spv[2]; } // generator magic
+   spirword_t  genmagic(spirword_t m) { return spv[2] = m; }
+   spirword_t  schemaNum() const      { return spv[4]; } // schema number from header
+
+   // Mapping fns: get
+   spv::Id     localId(spv::Id id) const { return idMapL[id]; }
+
+   // Mapping fns: set
+   inline spv::Id   localId(spv::Id id, spv::Id newId);
+   void             countIds(spv::Id id);
+
+   // Return next unused new local ID.
+   // NOTE: boost::dynamic_bitset would be more efficient due to find_next(),
+   // which std::vector<bool> doens't have.
+   inline spv::Id   nextUnusedId(spv::Id id);
+
+   void buildLocalMaps();
+   std::string literalString(unsigned word) const; // Return literal as a std::string
+   int literalStringWords(const std::string& str) const { return (int(str.size())+4)/4; }
+
+   bool isNewIdMapped(spv::Id newId)   const { return isMapped(newId);            }
+   bool isOldIdUnmapped(spv::Id oldId) const { return localId(oldId) == unmapped; }
+   bool isOldIdUnused(spv::Id oldId)   const { return localId(oldId) == unused;   }
+   bool isOldIdMapped(spv::Id oldId)   const { return !isOldIdUnused(oldId) && !isOldIdUnmapped(oldId); }
+   bool isFunction(spv::Id oldId)      const { return fnPos.find(oldId) != fnPos.end(); }
+
+   // bool    matchType(const globaltypes_t& globalTypes, spv::Id lt, spv::Id gt) const;
+   // spv::Id findType(const globaltypes_t& globalTypes, spv::Id lt) const;
+   std::uint32_t hashType(unsigned typeStart) const;
+
+   spirvbin_t& process(instfn_t, idfn_t, unsigned begin = 0, unsigned end = 0);
+   int         processInstruction(unsigned word, instfn_t, idfn_t);
+
+   void        validate() const;
+   void        mapTypeConst();
+   void        mapFnBodies();
+   void        optLoadStore();
+   void        dceFuncs();
+   void        dceVars();
+   void        dceTypes();
+   void        mapNames();
+   void        foldIds();  // fold IDs to smallest space
+   void        forwardLoadStores(); // load store forwarding (EXPERIMENTAL)
+   void        offsetIds(); // create relative offset IDs
+
+   void        applyMap();            // remap per local name map
+   void        mapRemainder();        // map any IDs we haven't touched yet
+   void        stripDebug();          // strip all debug info
+   void        stripDeadRefs();       // strips debug info for now-dead references after DCE
+   void        strip();               // remove debug symbols
+
+   std::vector<spirword_t> spv;      // SPIR words
+
+   std::vector<std::string> stripWhiteList;
+
+   namemap_t               nameMap;  // ID names from OpName
+
+   // Since we want to also do binary ops, we can't use std::vector<bool>.  we could use
+   // boost::dynamic_bitset, but we're trying to avoid a boost dependency.
+   typedef std::uint64_t bits_t;
+   std::vector<bits_t> mapped; // which new IDs have been mapped
+   static const int mBits = sizeof(bits_t) * 4;
+
+   bool isMapped(spv::Id id) const  { return id < maxMappedId() && ((mapped[id/mBits] & (1LL<<(id%mBits))) != 0); }
+   void setMapped(spv::Id id) { resizeMapped(id); mapped[id/mBits] |= (1LL<<(id%mBits)); }
+   void resizeMapped(spv::Id id) { if (id >= maxMappedId()) mapped.resize(id/mBits+1, 0); }
+   size_t maxMappedId() const { return mapped.size() * mBits; }
+
+   // Add a strip range for a given instruction starting at 'start'
+   // Note: avoiding brace initializers to please older versions os MSVC.
+   void stripInst(unsigned start) { stripRange.push_back(range_t(start, start + asWordCount(start))); }
+
+   // Function start and end.  use unordered_map because we'll have
+   // many fewer functions than IDs.
+   std::unordered_map<spv::Id, range_t> fnPos;
+
+   // Which functions are called, anywhere in the module, with a call count
+   std::unordered_map<spv::Id, int> fnCalls;
+
+   posmap_t       typeConstPos;  // word positions that define types & consts (ordered)
+   posmap_rev_t   idPosR;        // reverse map from IDs to positions
+   typesize_map_t idTypeSizeMap; // maps each ID to its type size, if known.
+
+   std::vector<spv::Id>  idMapL;   // ID {M}ap from {L}ocal to {G}lobal IDs
+
+   spv::Id entryPoint;      // module entry point
+   spv::Id largestNewId;    // biggest new ID we have mapped anything to
+
+   // Sections of the binary to strip, given as [begin,end)
+   std::vector<range_t> stripRange;
+
+   // processing options:
+   std::uint32_t options;
+   int           verbose;     // verbosity level
+
+   // Error latch: this is set if the error handler is ever executed.  It would be better to
+   // use a try/catch block and throw, but that's not desired for certain environments, so
+   // this is the alternative.
+   mutable bool errorLatch;
+
+   static errorfn_t errorHandler;
+   static logfn_t   logHandler;
+};
+
+} // namespace SPV
+
+#endif // SPIRVREMAPPER_H
diff --git a/engine/thirdparty/glslang/SPIRV/SpvBuilder.cpp b/engine/thirdparty/glslang/SPIRV/SpvBuilder.cpp
index 0e4237fb..6613655a 100644
--- a/engine/thirdparty/glslang/SPIRV/SpvBuilder.cpp
+++ b/engine/thirdparty/glslang/SPIRV/SpvBuilder.cpp
@@ -46,7 +46,6 @@
 #include <algorithm>
 
 #include "SpvBuilder.h"
-#include "spvUtil.h"
 #include "hex_float.h"
 
 #ifndef _WIN32
@@ -57,10 +56,10 @@ namespace spv {
 
 Builder::Builder(unsigned int spvVersion, unsigned int magicNumber, SpvBuildLogger* buildLogger) :
     spvVersion(spvVersion),
-    sourceLang(SourceLanguage::Unknown),
+    sourceLang(SourceLanguageUnknown),
     sourceVersion(0),
-    addressModel(AddressingModel::Logical),
-    memoryModel(MemoryModel::GLSL450),
+    addressModel(AddressingModelLogical),
+    memoryModel(MemoryModelGLSL450),
     builderNumber(magicNumber),
     buildPoint(nullptr),
     uniqueId(0),
@@ -77,7 +76,7 @@ Builder::~Builder()
 
 Id Builder::import(const char* name)
 {
-    Instruction* import = new Instruction(getUniqueId(), NoType, Op::OpExtInstImport);
+    Instruction* import = new Instruction(getUniqueId(), NoType, OpExtInstImport);
     import->addStringOperand(name);
     module.mapInstruction(import);
 
@@ -89,17 +88,17 @@ Id Builder::import(const char* name)
 Id Builder::makeVoidType()
 {
     Instruction* type;
-    if (groupedTypes[enumCast(Op::OpTypeVoid)].size() == 0) {
+    if (groupedTypes[OpTypeVoid].size() == 0) {
         Id typeId = getUniqueId();
-        type = new Instruction(typeId, NoType, Op::OpTypeVoid);
-        groupedTypes[enumCast(Op::OpTypeVoid)].push_back(type);
+        type = new Instruction(typeId, NoType, OpTypeVoid);
+        groupedTypes[OpTypeVoid].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
         // Core OpTypeVoid used for debug void type
         if (emitNonSemanticShaderDebugInfo)
-            debugTypeIdLookup[typeId] = typeId;
+            debugId[typeId] = typeId;
     } else
-        type = groupedTypes[enumCast(Op::OpTypeVoid)].back();
+        type = groupedTypes[OpTypeVoid].back();
 
     return type->getResultId();
 }
@@ -107,39 +106,39 @@ Id Builder::makeVoidType()
 Id Builder::makeBoolType()
 {
     Instruction* type;
-    if (groupedTypes[enumCast(Op::OpTypeBool)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeBool);
-        groupedTypes[enumCast(Op::OpTypeBool)].push_back(type);
+    if (groupedTypes[OpTypeBool].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeBool);
+        groupedTypes[OpTypeBool].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
 
         if (emitNonSemanticShaderDebugInfo) {
             auto const debugResultId = makeBoolDebugType(32);
-            debugTypeIdLookup[type->getResultId()] = debugResultId;
+            debugId[type->getResultId()] = debugResultId;
         }
 
     } else
-        type = groupedTypes[enumCast(Op::OpTypeBool)].back();
+        type = groupedTypes[OpTypeBool].back();
 
 
     return type->getResultId();
 }
 
-Id Builder::makeSamplerType(const char* debugName)
+Id Builder::makeSamplerType()
 {
     Instruction* type;
-    if (groupedTypes[enumCast(Op::OpTypeSampler)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeSampler);
-        groupedTypes[enumCast(Op::OpTypeSampler)].push_back(type);
+    if (groupedTypes[OpTypeSampler].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeSampler);
+        groupedTypes[OpTypeSampler].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
     } else
-        type = groupedTypes[enumCast(Op::OpTypeSampler)].back();
+        type = groupedTypes[OpTypeSampler].back();
 
     if (emitNonSemanticShaderDebugInfo)
     {
-        auto const debugResultId = makeOpaqueDebugType(debugName);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        auto const debugResultId = makeCompositeDebugType({}, "type.sampler", NonSemanticShaderDebugInfo100Structure, true);
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -149,25 +148,25 @@ Id Builder::makePointer(StorageClass storageClass, Id pointee)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypePointer)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypePointer)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypePointer].size(); ++t) {
+        type = groupedTypes[OpTypePointer][t];
         if (type->getImmediateOperand(0) == (unsigned)storageClass &&
             type->getIdOperand(1) == pointee)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypePointer);
+    type = new Instruction(getUniqueId(), NoType, OpTypePointer);
     type->reserveOperands(2);
     type->addImmediateOperand(storageClass);
     type->addIdOperand(pointee);
-    groupedTypes[enumCast(Op::OpTypePointer)].push_back(type);
+    groupedTypes[OpTypePointer].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     if (emitNonSemanticShaderDebugInfo) {
         const Id debugResultId = makePointerDebugType(storageClass, pointee);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -178,15 +177,11 @@ Id Builder::makeForwardPointer(StorageClass storageClass)
     // Caching/uniquifying doesn't work here, because we don't know the
     // pointee type and there can be multiple forward pointers of the same
     // storage type. Somebody higher up in the stack must keep track.
-    Instruction* type = new Instruction(getUniqueId(), NoType, Op::OpTypeForwardPointer);
+    Instruction* type = new Instruction(getUniqueId(), NoType, OpTypeForwardPointer);
     type->addImmediateOperand(storageClass);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
-    if (emitNonSemanticShaderDebugInfo) {
-        const Id debugResultId = makeForwardPointerDebugType(storageClass);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
-    }
     return type->getResultId();
 }
 
@@ -194,30 +189,21 @@ Id Builder::makePointerFromForwardPointer(StorageClass storageClass, Id forwardP
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypePointer)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypePointer)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypePointer].size(); ++t) {
+        type = groupedTypes[OpTypePointer][t];
         if (type->getImmediateOperand(0) == (unsigned)storageClass &&
             type->getIdOperand(1) == pointee)
             return type->getResultId();
     }
 
-    type = new Instruction(forwardPointerType, NoType, Op::OpTypePointer);
+    type = new Instruction(forwardPointerType, NoType, OpTypePointer);
     type->reserveOperands(2);
     type->addImmediateOperand(storageClass);
     type->addIdOperand(pointee);
-    groupedTypes[enumCast(Op::OpTypePointer)].push_back(type);
+    groupedTypes[OpTypePointer].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
-    // If we are emitting nonsemantic debuginfo, we need to patch the debug pointer type
-    // that was emitted alongside the forward pointer, now that we have a pointee debug
-    // type for it to point to.
-    if (emitNonSemanticShaderDebugInfo) {
-        Instruction *debugForwardPointer = module.getInstruction(getDebugType(forwardPointerType));
-        assert(getDebugType(pointee));
-        debugForwardPointer->setIdOperand(2, getDebugType(pointee));
-    }
-
     return type->getResultId();
 }
 
@@ -225,19 +211,19 @@ Id Builder::makeIntegerType(int width, bool hasSign)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeInt)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeInt)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeInt].size(); ++t) {
+        type = groupedTypes[OpTypeInt][t];
         if (type->getImmediateOperand(0) == (unsigned)width &&
             type->getImmediateOperand(1) == (hasSign ? 1u : 0u))
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeInt);
+    type = new Instruction(getUniqueId(), NoType, OpTypeInt);
     type->reserveOperands(2);
     type->addImmediateOperand(width);
     type->addImmediateOperand(hasSign ? 1 : 0);
-    groupedTypes[enumCast(Op::OpTypeInt)].push_back(type);
+    groupedTypes[OpTypeInt].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
@@ -248,7 +234,7 @@ Id Builder::makeIntegerType(int width, bool hasSign)
         // these are currently handled by storage-type declarations and post processing
         break;
     case 64:
-        addCapability(Capability::Int64);
+        addCapability(CapabilityInt64);
         break;
     default:
         break;
@@ -257,7 +243,7 @@ Id Builder::makeIntegerType(int width, bool hasSign)
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeIntegerDebugType(width, hasSign);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -267,19 +253,16 @@ Id Builder::makeFloatType(int width)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeFloat)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeFloat)][t];
-        if (type->getNumOperands() != 1) {
-            continue;
-        }
+    for (int t = 0; t < (int)groupedTypes[OpTypeFloat].size(); ++t) {
+        type = groupedTypes[OpTypeFloat][t];
         if (type->getImmediateOperand(0) == (unsigned)width)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeFloat);
+    type = new Instruction(getUniqueId(), NoType, OpTypeFloat);
     type->addImmediateOperand(width);
-    groupedTypes[enumCast(Op::OpTypeFloat)].push_back(type);
+    groupedTypes[OpTypeFloat].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
@@ -289,7 +272,7 @@ Id Builder::makeFloatType(int width)
         // currently handled by storage-type declarations and post processing
         break;
     case 64:
-        addCapability(Capability::Float64);
+        addCapability(CapabilityFloat64);
         break;
     default:
         break;
@@ -298,148 +281,34 @@ Id Builder::makeFloatType(int width)
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeFloatDebugType(width);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
 }
 
-Id Builder::makeBFloat16Type()
-{
-    // try to find it
-    Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeFloat)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeFloat)][t];
-        if (type->getNumOperands() != 2) {
-            continue;
-        }
-        if (type->getImmediateOperand(0) == (unsigned)16 &&
-            type->getImmediateOperand(1) == FPEncoding::BFloat16KHR)
-            return type->getResultId();
-    }
-
-    // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeFloat);
-    type->addImmediateOperand(16);
-    type->addImmediateOperand(FPEncoding::BFloat16KHR);
-    groupedTypes[enumCast(Op::OpTypeFloat)].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    addExtension(spv::E_SPV_KHR_bfloat16);
-    addCapability(Capability::BFloat16TypeKHR);
-
-#if 0
-    // XXX not supported
-    if (emitNonSemanticShaderDebugInfo)
-    {
-        auto const debugResultId = makeFloatDebugType(width);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
-    }
-#endif
-
-    return type->getResultId();
-}
-
-Id Builder::makeFloatE5M2Type()
-{
-    // try to find it
-    Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeFloat)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeFloat)][t];
-        if (type->getNumOperands() != 2) {
-            continue;
-        }
-        if (type->getImmediateOperand(0) == (unsigned)8 &&
-            type->getImmediateOperand(1) == FPEncoding::Float8E5M2EXT)
-            return type->getResultId();
-    }
-
-    // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeFloat);
-    type->addImmediateOperand(8);
-    type->addImmediateOperand(FPEncoding::Float8E5M2EXT);
-    groupedTypes[enumCast(Op::OpTypeFloat)].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    addExtension(spv::E_SPV_EXT_float8);
-    addCapability(Capability::Float8EXT);
-
-#if 0
-    // XXX not supported
-    if (emitNonSemanticShaderDebugInfo)
-    {
-        auto const debugResultId = makeFloatDebugType(width);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
-    }
-#endif
-
-    return type->getResultId();
-}
-
-Id Builder::makeFloatE4M3Type()
-{
-    // try to find it
-    Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeFloat)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeFloat)][t];
-        if (type->getNumOperands() != 2) {
-            continue;
-        }
-        if (type->getImmediateOperand(0) == (unsigned)8 &&
-            type->getImmediateOperand(1) == FPEncoding::Float8E4M3EXT)
-            return type->getResultId();
-    }
-
-    // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeFloat);
-    type->addImmediateOperand(8);
-    type->addImmediateOperand(FPEncoding::Float8E4M3EXT);
-    groupedTypes[enumCast(Op::OpTypeFloat)].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    addExtension(spv::E_SPV_EXT_float8);
-    addCapability(Capability::Float8EXT);
-
-#if 0
-    // XXX not supported
-    if (emitNonSemanticShaderDebugInfo)
-    {
-        auto const debugResultId = makeFloatDebugType(width);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
-    }
-#endif
-
-    return type->getResultId();
-}
-
 // Make a struct without checking for duplication.
 // See makeStructResultType() for non-decorated structs
 // needed as the result of some instructions, which does
 // check for duplicates.
-// For compiler-generated structs, debug info is ignored.
-Id Builder::makeStructType(const std::vector<Id>& members, const std::vector<spv::StructMemberDebugInfo>& memberDebugInfo,
-                           const char* name, bool const compilerGenerated)
+Id Builder::makeStructType(const std::vector<Id>& members, const char* name, bool const compilerGenerated)
 {
     // Don't look for previous one, because in the general case,
     // structs can be duplicated except for decorations.
 
     // not found, make it
-    Instruction* type = new Instruction(getUniqueId(), NoType, Op::OpTypeStruct);
+    Instruction* type = new Instruction(getUniqueId(), NoType, OpTypeStruct);
     for (int op = 0; op < (int)members.size(); ++op)
         type->addIdOperand(members[op]);
-    groupedTypes[enumCast(Op::OpTypeStruct)].push_back(type);
+    groupedTypes[OpTypeStruct].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
     addName(type->getResultId(), name);
 
-    if (emitNonSemanticShaderDebugInfo && !compilerGenerated) {
-        assert(members.size() == memberDebugInfo.size());
-        auto const debugResultId =
-            makeCompositeDebugType(members, memberDebugInfo, name, NonSemanticShaderDebugInfo100Structure);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+    if (emitNonSemanticShaderDebugInfo && !compilerGenerated)
+    {
+        auto const debugResultId = makeCompositeDebugType(members, name, NonSemanticShaderDebugInfo100Structure);
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -451,8 +320,8 @@ Id Builder::makeStructResultType(Id type0, Id type1)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeStruct)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeStruct)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeStruct].size(); ++t) {
+        type = groupedTypes[OpTypeStruct][t];
         if (type->getNumOperands() != 2)
             continue;
         if (type->getIdOperand(0) != type0 ||
@@ -466,33 +335,33 @@ Id Builder::makeStructResultType(Id type0, Id type1)
     members.push_back(type0);
     members.push_back(type1);
 
-    return makeStructType(members, {}, "ResType");
+    return makeStructType(members, "ResType");
 }
 
 Id Builder::makeVectorType(Id component, int size)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeVector)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeVector)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeVector].size(); ++t) {
+        type = groupedTypes[OpTypeVector][t];
         if (type->getIdOperand(0) == component &&
             type->getImmediateOperand(1) == (unsigned)size)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeVector);
+    type = new Instruction(getUniqueId(), NoType, OpTypeVector);
     type->reserveOperands(2);
     type->addIdOperand(component);
     type->addImmediateOperand(size);
-    groupedTypes[enumCast(Op::OpTypeVector)].push_back(type);
+    groupedTypes[OpTypeVector].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeVectorDebugType(component, size);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -506,26 +375,26 @@ Id Builder::makeMatrixType(Id component, int cols, int rows)
 
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeMatrix)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeMatrix)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeMatrix].size(); ++t) {
+        type = groupedTypes[OpTypeMatrix][t];
         if (type->getIdOperand(0) == column &&
             type->getImmediateOperand(1) == (unsigned)cols)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeMatrix);
+    type = new Instruction(getUniqueId(), NoType, OpTypeMatrix);
     type->reserveOperands(2);
     type->addIdOperand(column);
     type->addImmediateOperand(cols);
-    groupedTypes[enumCast(Op::OpTypeMatrix)].push_back(type);
+    groupedTypes[OpTypeMatrix].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeMatrixDebugType(column, cols);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -535,8 +404,8 @@ Id Builder::makeCooperativeMatrixTypeKHR(Id component, Id scope, Id rows, Id col
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeCooperativeMatrixKHR)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeCooperativeMatrixKHR)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeCooperativeMatrixKHR].size(); ++t) {
+        type = groupedTypes[OpTypeCooperativeMatrixKHR][t];
         if (type->getIdOperand(0) == component &&
             type->getIdOperand(1) == scope &&
             type->getIdOperand(2) == rows &&
@@ -546,54 +415,17 @@ Id Builder::makeCooperativeMatrixTypeKHR(Id component, Id scope, Id rows, Id col
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeCooperativeMatrixKHR);
+    type = new Instruction(getUniqueId(), NoType, OpTypeCooperativeMatrixKHR);
     type->reserveOperands(5);
     type->addIdOperand(component);
     type->addIdOperand(scope);
     type->addIdOperand(rows);
     type->addIdOperand(cols);
     type->addIdOperand(use);
-    groupedTypes[enumCast(Op::OpTypeCooperativeMatrixKHR)].push_back(type);
+    groupedTypes[OpTypeCooperativeMatrixKHR].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
-    if (emitNonSemanticShaderDebugInfo)
-    {
-        // Find a name for one of the parameters. It can either come from debuginfo for another
-        // type, or an OpName from a constant.
-        auto const findName = [&](Id id) {
-            Id id2 = getDebugType(id);
-            for (auto &t : groupedDebugTypes[NonSemanticShaderDebugInfo100DebugTypeBasic]) {
-                if (t->getResultId() == id2) {
-                    for (auto &s : strings) {
-                        if (s->getResultId() == t->getIdOperand(2)) {
-                            return s->getNameString();
-                        }
-                    }
-                }
-            }
-            for (auto &t : names) {
-                if (t->getIdOperand(0) == id) {
-                    return t->getNameString();
-                }
-            }
-            return "unknown";
-        };
-        std::string debugName = "coopmat<";
-        debugName += std::string(findName(component)) + ", ";
-        if (isConstantScalar(scope)) {
-            debugName += std::string("gl_Scope") + std::string(spv::ScopeToString((spv::Scope)getConstantScalar(scope))) + ", ";
-        } else {
-            debugName += std::string(findName(scope)) + ", ";
-        }
-        debugName += std::string(findName(rows)) + ", ";
-        debugName += std::string(findName(cols)) + ">";
-        // There's no nonsemantic debug info instruction for cooperative matrix types,
-        // use opaque composite instead.
-        auto const debugResultId = makeOpaqueDebugType(debugName.c_str());
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
-    }
-
     return type->getResultId();
 }
 
@@ -601,21 +433,21 @@ Id Builder::makeCooperativeMatrixTypeNV(Id component, Id scope, Id rows, Id cols
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeCooperativeMatrixNV)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeCooperativeMatrixNV)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeCooperativeMatrixNV].size(); ++t) {
+        type = groupedTypes[OpTypeCooperativeMatrixNV][t];
         if (type->getIdOperand(0) == component && type->getIdOperand(1) == scope && type->getIdOperand(2) == rows &&
             type->getIdOperand(3) == cols)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeCooperativeMatrixNV);
+    type = new Instruction(getUniqueId(), NoType, OpTypeCooperativeMatrixNV);
     type->reserveOperands(4);
     type->addIdOperand(component);
     type->addIdOperand(scope);
     type->addIdOperand(rows);
     type->addIdOperand(cols);
-    groupedTypes[enumCast(Op::OpTypeCooperativeMatrixNV)].push_back(type);
+    groupedTypes[OpTypeCooperativeMatrixNV].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
@@ -625,62 +457,20 @@ Id Builder::makeCooperativeMatrixTypeNV(Id component, Id scope, Id rows, Id cols
 Id Builder::makeCooperativeMatrixTypeWithSameShape(Id component, Id otherType)
 {
     Instruction* instr = module.getInstruction(otherType);
-    if (instr->getOpCode() == Op::OpTypeCooperativeMatrixNV) {
+    if (instr->getOpCode() == OpTypeCooperativeMatrixNV) {
         return makeCooperativeMatrixTypeNV(component, instr->getIdOperand(1), instr->getIdOperand(2), instr->getIdOperand(3));
     } else {
-        assert(instr->getOpCode() == Op::OpTypeCooperativeMatrixKHR);
+        assert(instr->getOpCode() == OpTypeCooperativeMatrixKHR);
         return makeCooperativeMatrixTypeKHR(component, instr->getIdOperand(1), instr->getIdOperand(2), instr->getIdOperand(3), instr->getIdOperand(4));
     }
 }
 
-Id Builder::makeCooperativeVectorTypeNV(Id componentType, Id components)
-{
-    // try to find it
-    Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeCooperativeVectorNV)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeCooperativeVectorNV)][t];
-        if (type->getIdOperand(0) == componentType &&
-            type->getIdOperand(1) == components)
-            return type->getResultId();
-    }
-
-    // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeCooperativeVectorNV);
-    type->addIdOperand(componentType);
-    type->addIdOperand(components);
-    groupedTypes[enumCast(Op::OpTypeCooperativeVectorNV)].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    return type->getResultId();
-}
-
-Id Builder::makeTensorTypeARM(Id elementType, Id rank)
-{
-    // See if an OpTypeTensorARM with same element type and rank already exists.
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeTensorARM)].size(); ++t) {
-        const Instruction *type = groupedTypes[enumCast(Op::OpTypeTensorARM)][t];
-        if (type->getIdOperand(0) == elementType && type->getIdOperand(1) == rank)
-            return type->getResultId();
-    }
-
-    // Not found, make it.
-    std::unique_ptr<Instruction> type(new Instruction(getUniqueId(), NoType, Op::OpTypeTensorARM));
-    type->addIdOperand(elementType);
-    type->addIdOperand(rank);
-    groupedTypes[enumCast(Op::OpTypeTensorARM)].push_back(type.get());
-    module.mapInstruction(type.get());
-    Id resultID = type->getResultId();
-    constantsTypesGlobals.push_back(std::move(type));
-    return resultID;
-}
-
 Id Builder::makeGenericType(spv::Op opcode, std::vector<spv::IdImmediate>& operands)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(opcode)].size(); ++t) {
-        type = groupedTypes[enumCast(opcode)][t];
+    for (int t = 0; t < (int)groupedTypes[opcode].size(); ++t) {
+        type = groupedTypes[opcode][t];
         if (static_cast<size_t>(type->getNumOperands()) != operands.size())
             continue; // Number mismatch, find next
 
@@ -701,7 +491,7 @@ Id Builder::makeGenericType(spv::Op opcode, std::vector<spv::IdImmediate>& opera
         else
             type->addImmediateOperand(operands[op].word);
     }
-    groupedTypes[enumCast(opcode)].push_back(type);
+    groupedTypes[opcode].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
@@ -717,32 +507,27 @@ Id Builder::makeArrayType(Id element, Id sizeId, int stride)
     Instruction* type;
     if (stride == 0) {
         // try to find existing type
-        for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeArray)].size(); ++t) {
-            type = groupedTypes[enumCast(Op::OpTypeArray)][t];
+        for (int t = 0; t < (int)groupedTypes[OpTypeArray].size(); ++t) {
+            type = groupedTypes[OpTypeArray][t];
             if (type->getIdOperand(0) == element &&
-                type->getIdOperand(1) == sizeId &&
-                explicitlyLaidOut.find(type->getResultId()) == explicitlyLaidOut.end())
+                type->getIdOperand(1) == sizeId)
                 return type->getResultId();
         }
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeArray);
+    type = new Instruction(getUniqueId(), NoType, OpTypeArray);
     type->reserveOperands(2);
     type->addIdOperand(element);
     type->addIdOperand(sizeId);
-    groupedTypes[enumCast(Op::OpTypeArray)].push_back(type);
+    groupedTypes[OpTypeArray].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
-    if (stride != 0) {
-        explicitlyLaidOut.insert(type->getResultId());
-    }
-
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeArrayDebugType(element, sizeId);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -750,7 +535,7 @@ Id Builder::makeArrayType(Id element, Id sizeId, int stride)
 
 Id Builder::makeRuntimeArray(Id element)
 {
-    Instruction* type = new Instruction(getUniqueId(), NoType, Op::OpTypeRuntimeArray);
+    Instruction* type = new Instruction(getUniqueId(), NoType, OpTypeRuntimeArray);
     type->addIdOperand(element);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
@@ -758,7 +543,7 @@ Id Builder::makeRuntimeArray(Id element)
     if (emitNonSemanticShaderDebugInfo)
     {
         auto const debugResultId = makeArrayDebugType(element, makeUintConstant(0));
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -768,8 +553,8 @@ Id Builder::makeFunctionType(Id returnType, const std::vector<Id>& paramTypes)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeFunction)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeFunction)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeFunction].size(); ++t) {
+        type = groupedTypes[OpTypeFunction][t];
         if (type->getIdOperand(0) != returnType || (int)paramTypes.size() != type->getNumOperands() - 1)
             continue;
         bool mismatch = false;
@@ -785,12 +570,12 @@ Id Builder::makeFunctionType(Id returnType, const std::vector<Id>& paramTypes)
             // function type is created for the wrapper function. However, nonsemantic shader debug information is disabled
             // while creating the HLSL wrapper. Consequently, if we encounter another void(void) function, we need to create
             // the associated debug function type if it hasn't been created yet.
-            if(emitNonSemanticShaderDebugInfo && getDebugType(type->getResultId()) == NoType) {
-                assert(sourceLang == spv::SourceLanguage::HLSL);
-                assert(getTypeClass(returnType) == Op::OpTypeVoid && paramTypes.size() == 0);
+            if(emitNonSemanticShaderDebugInfo && debugId[type->getResultId()] == 0) {
+                assert(sourceLang == spv::SourceLanguageHLSL);
+                assert(getTypeClass(returnType) == OpTypeVoid && paramTypes.size() == 0);
 
-                Id id = makeDebugFunctionType(returnType, {});
-                debugTypeIdLookup[type->getResultId()] = id;
+                Id debugTypeId = makeDebugFunctionType(returnType, {});
+                debugId[type->getResultId()] = debugTypeId;
             }
             return type->getResultId();
         }
@@ -798,19 +583,19 @@ Id Builder::makeFunctionType(Id returnType, const std::vector<Id>& paramTypes)
 
     // not found, make it
     Id typeId = getUniqueId();
-    type = new Instruction(typeId, NoType, Op::OpTypeFunction);
+    type = new Instruction(typeId, NoType, OpTypeFunction);
     type->reserveOperands(paramTypes.size() + 1);
     type->addIdOperand(returnType);
     for (int p = 0; p < (int)paramTypes.size(); ++p)
         type->addIdOperand(paramTypes[p]);
-    groupedTypes[enumCast(Op::OpTypeFunction)].push_back(type);
+    groupedTypes[OpTypeFunction].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     // make debug type and map it
     if (emitNonSemanticShaderDebugInfo) {
         Id debugTypeId = makeDebugFunctionType(returnType, paramTypes);
-        debugTypeIdLookup[typeId] = debugTypeId;
+        debugId[typeId] = debugTypeId;
     }
 
     return type->getResultId();
@@ -818,21 +603,21 @@ Id Builder::makeFunctionType(Id returnType, const std::vector<Id>& paramTypes)
 
 Id Builder::makeDebugFunctionType(Id returnType, const std::vector<Id>& paramTypes)
 {
-    assert(getDebugType(returnType) != NoType);
+    assert(debugId[returnType] != 0);
 
     Id typeId = getUniqueId();
-    auto type = new Instruction(typeId, makeVoidType(), Op::OpExtInst);
+    auto type = new Instruction(typeId, makeVoidType(), OpExtInst);
     type->reserveOperands(paramTypes.size() + 4);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeFunction);
     type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsPublic));
-    type->addIdOperand(getDebugType(returnType));
+    type->addIdOperand(debugId[returnType]);
     for (auto const paramType : paramTypes) {
         if (isPointerType(paramType) || isArrayType(paramType)) {
-            type->addIdOperand(getDebugType(getContainedTypeId(paramType)));
+            type->addIdOperand(debugId[getContainedTypeId(paramType)]);
         }
         else {
-            type->addIdOperand(getDebugType(paramType));
+            type->addIdOperand(debugId[paramType]);
         }
     }
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
@@ -841,14 +626,14 @@ Id Builder::makeDebugFunctionType(Id returnType, const std::vector<Id>& paramTyp
 }
 
 Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, bool ms, unsigned sampled,
-    ImageFormat format, const char* debugName)
+    ImageFormat format)
 {
     assert(sampled == 1 || sampled == 2);
 
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeImage)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeImage)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeImage].size(); ++t) {
+        type = groupedTypes[OpTypeImage][t];
         if (type->getIdOperand(0) == sampledType &&
             type->getImmediateOperand(1) == (unsigned int)dim &&
             type->getImmediateOperand(2) == (  depth ? 1u : 0u) &&
@@ -860,7 +645,7 @@ Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, boo
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeImage);
+    type = new Instruction(getUniqueId(), NoType, OpTypeImage);
     type->reserveOperands(7);
     type->addIdOperand(sampledType);
     type->addImmediateOperand(   dim);
@@ -870,40 +655,40 @@ Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, boo
     type->addImmediateOperand(sampled);
     type->addImmediateOperand((unsigned int)format);
 
-    groupedTypes[enumCast(Op::OpTypeImage)].push_back(type);
+    groupedTypes[OpTypeImage].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     // deal with capabilities
     switch (dim) {
-    case Dim::Buffer:
+    case DimBuffer:
         if (sampled == 1)
-            addCapability(Capability::SampledBuffer);
+            addCapability(CapabilitySampledBuffer);
         else
-            addCapability(Capability::ImageBuffer);
+            addCapability(CapabilityImageBuffer);
         break;
-    case Dim::Dim1D:
+    case Dim1D:
         if (sampled == 1)
-            addCapability(Capability::Sampled1D);
+            addCapability(CapabilitySampled1D);
         else
-            addCapability(Capability::Image1D);
+            addCapability(CapabilityImage1D);
         break;
-    case Dim::Cube:
+    case DimCube:
         if (arrayed) {
             if (sampled == 1)
-                addCapability(Capability::SampledCubeArray);
+                addCapability(CapabilitySampledCubeArray);
             else
-                addCapability(Capability::ImageCubeArray);
+                addCapability(CapabilityImageCubeArray);
         }
         break;
-    case Dim::Rect:
+    case DimRect:
         if (sampled == 1)
-            addCapability(Capability::SampledRect);
+            addCapability(CapabilitySampledRect);
         else
-            addCapability(Capability::ImageRect);
+            addCapability(CapabilityImageRect);
         break;
-    case Dim::SubpassData:
-        addCapability(Capability::InputAttachment);
+    case DimSubpassData:
+        addCapability(CapabilityInputAttachment);
         break;
     default:
         break;
@@ -913,44 +698,54 @@ Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, boo
         if (sampled == 2) {
             // Images used with subpass data are not storage
             // images, so don't require the capability for them.
-            if (dim != Dim::SubpassData)
-                addCapability(Capability::StorageImageMultisample);
+            if (dim != Dim::DimSubpassData)
+                addCapability(CapabilityStorageImageMultisample);
             if (arrayed)
-                addCapability(Capability::ImageMSArray);
+                addCapability(CapabilityImageMSArray);
         }
     }
 
     if (emitNonSemanticShaderDebugInfo)
     {
-        auto const debugResultId = makeOpaqueDebugType(debugName);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        auto TypeName = [&dim]() -> char const* {
+            switch (dim) {
+                case Dim1D: return "type.1d.image";
+                case Dim2D: return "type.2d.image";
+                case Dim3D: return "type.3d.image";
+                case DimCube: return "type.cube.image";
+                default: return "type.image";
+            }
+        };
+
+        auto const debugResultId = makeCompositeDebugType({}, TypeName(), NonSemanticShaderDebugInfo100Class, true);
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
 }
 
-Id Builder::makeSampledImageType(Id imageType, const char* debugName)
+Id Builder::makeSampledImageType(Id imageType)
 {
     // try to find it
     Instruction* type;
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypeSampledImage)].size(); ++t) {
-        type = groupedTypes[enumCast(Op::OpTypeSampledImage)][t];
+    for (int t = 0; t < (int)groupedTypes[OpTypeSampledImage].size(); ++t) {
+        type = groupedTypes[OpTypeSampledImage][t];
         if (type->getIdOperand(0) == imageType)
             return type->getResultId();
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), NoType, Op::OpTypeSampledImage);
+    type = new Instruction(getUniqueId(), NoType, OpTypeSampledImage);
     type->addIdOperand(imageType);
 
-    groupedTypes[enumCast(Op::OpTypeSampledImage)].push_back(type);
+    groupedTypes[OpTypeSampledImage].push_back(type);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
 
     if (emitNonSemanticShaderDebugInfo)
     {
-        auto const debugResultId = makeOpaqueDebugType(debugName);
-        debugTypeIdLookup[type->getResultId()] = debugResultId;
+        auto const debugResultId = makeCompositeDebugType({}, "type.sampled.image", NonSemanticShaderDebugInfo100Class, true);
+        debugId[type->getResultId()] = debugResultId;
     }
 
     return type->getResultId();
@@ -961,7 +756,7 @@ Id Builder::makeDebugInfoNone()
     if (debugInfoNone != 0)
         return debugInfoNone;
 
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(2);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugInfoNone);
@@ -986,7 +781,7 @@ Id Builder::makeBoolDebugType(int const size)
             return type->getResultId();
     }
 
-    type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(6);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeBasic);
@@ -1024,7 +819,7 @@ Id Builder::makeIntegerDebugType(int const width, bool const hasSign)
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(6);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeBasic);
@@ -1064,7 +859,7 @@ Id Builder::makeFloatDebugType(int const width)
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(6);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeBasic);
@@ -1095,11 +890,11 @@ Id Builder::makeSequentialDebugType(Id const baseType, Id const componentCount,
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(4);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(sequenceType);
-    type->addIdOperand(getDebugType(baseType)); // base type
+    type->addIdOperand(debugId[baseType]); // base type
     type->addIdOperand(componentCount); // component count
 
     groupedDebugTypes[sequenceType].push_back(type);
@@ -1131,11 +926,11 @@ Id Builder::makeMatrixDebugType(Id const vectorType, int const vectorCount, bool
     }
 
     // not found, make it
-    type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(5);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeMatrix);
-    type->addIdOperand(getDebugType(vectorType)); // vector type id
+    type->addIdOperand(debugId[vectorType]); // vector type id
     type->addIdOperand(makeUintConstant(vectorCount)); // component count id
     type->addIdOperand(makeBoolConstant(columnMajor)); // column-major id
 
@@ -1146,22 +941,21 @@ Id Builder::makeMatrixDebugType(Id const vectorType, int const vectorCount, bool
     return type->getResultId();
 }
 
-Id Builder::makeMemberDebugType(Id const memberType, StructMemberDebugInfo const& debugTypeLoc)
+Id Builder::makeMemberDebugType(Id const memberType, DebugTypeLoc const& debugTypeLoc)
 {
-    assert(getDebugType(memberType) != NoType);
+    assert(debugId[memberType] != 0);
 
-    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(10);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeMember);
     type->addIdOperand(getStringId(debugTypeLoc.name)); // name id
-    type->addIdOperand(debugTypeLoc.debugTypeOverride != 0 ? debugTypeLoc.debugTypeOverride
-                                                           : getDebugType(memberType)); // type id
-    type->addIdOperand(makeDebugSource(currentFileId));                            // source id
-    type->addIdOperand(makeUintConstant(debugTypeLoc.line));   // line id TODO: currentLine is always zero
+    type->addIdOperand(debugId[memberType]); // type id
+    type->addIdOperand(makeDebugSource(currentFileId)); // source id
+    type->addIdOperand(makeUintConstant(debugTypeLoc.line)); // line id TODO: currentLine is always zero
     type->addIdOperand(makeUintConstant(debugTypeLoc.column)); // TODO: column id
-    type->addIdOperand(makeUintConstant(0));                   // TODO: offset id
-    type->addIdOperand(makeUintConstant(0));                   // TODO: size id
+    type->addIdOperand(makeUintConstant(0)); // TODO: offset id
+    type->addIdOperand(makeUintConstant(0)); // TODO: size id
     type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsPublic)); // flags id
 
     groupedDebugTypes[NonSemanticShaderDebugInfo100DebugTypeMember].push_back(type);
@@ -1171,20 +965,27 @@ Id Builder::makeMemberDebugType(Id const memberType, StructMemberDebugInfo const
     return type->getResultId();
 }
 
-Id Builder::makeCompositeDebugType(std::vector<Id> const& memberTypes, std::vector<StructMemberDebugInfo> const& memberDebugInfo,
-                                   char const* const name, NonSemanticShaderDebugInfo100DebugCompositeType const tag)
+// Note: To represent a source language opaque type, this instruction must have no Members operands, Size operand must be
+// DebugInfoNone, and Name must start with @ to avoid clashes with user defined names.
+Id Builder::makeCompositeDebugType(std::vector<Id> const& memberTypes, char const*const name,
+    NonSemanticShaderDebugInfo100DebugCompositeType const tag, bool const isOpaqueType)
 {
     // Create the debug member types.
     std::vector<Id> memberDebugTypes;
-    assert(memberTypes.size() == memberDebugInfo.size());
-    for (size_t i = 0; i < memberTypes.size(); i++) {
-        if (getDebugType(memberTypes[i]) != NoType) {
-            memberDebugTypes.emplace_back(makeMemberDebugType(memberTypes[i], memberDebugInfo[i]));
-        }
+    for(auto const memberType : memberTypes) {
+        assert(debugTypeLocs.find(memberType) != debugTypeLocs.end());
+
+        // There _should_ be debug types for all the member types but currently buffer references
+        // do not have member debug info generated.
+        if (debugId[memberType])
+            memberDebugTypes.emplace_back(makeMemberDebugType(memberType, debugTypeLocs[memberType]));
+
+        // TODO: Need to rethink this method of passing location information.
+        // debugTypeLocs.erase(memberType);
     }
 
     // Create The structure debug type.
-    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(memberDebugTypes.size() + 11);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeComposite);
@@ -1194,9 +995,16 @@ Id Builder::makeCompositeDebugType(std::vector<Id> const& memberTypes, std::vect
     type->addIdOperand(makeUintConstant(currentLine)); // line id TODO: currentLine always zero?
     type->addIdOperand(makeUintConstant(0)); // TODO: column id
     type->addIdOperand(makeDebugCompilationUnit()); // scope id
-    type->addIdOperand(getStringId(name)); // linkage name id
-    type->addIdOperand(makeUintConstant(0)); // TODO: size id
+    if(isOpaqueType == true) {
+        // Prepend '@' to opaque types.
+        type->addIdOperand(getStringId('@' + std::string(name))); // linkage name id
+        type->addIdOperand(makeDebugInfoNone()); // size id
+    } else {
+        type->addIdOperand(getStringId(name)); // linkage name id
+        type->addIdOperand(makeUintConstant(0)); // TODO: size id
+    }
     type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsPublic)); // flags id
+    assert(isOpaqueType == false || (isOpaqueType == true && memberDebugTypes.empty()));
     for(auto const memberDebugType : memberDebugTypes) {
         type->addIdOperand(memberDebugType);
     }
@@ -1208,37 +1016,9 @@ Id Builder::makeCompositeDebugType(std::vector<Id> const& memberTypes, std::vect
     return type->getResultId();
 }
 
-// The NonSemantic Shader Debug Info doesn't really have a dedicated opcode for opaque types. Instead, we use DebugTypeComposite.
-// To represent a source language opaque type, this instruction must have no Members operands, Size operand must be
-// DebugInfoNone, and Name must start with @ to avoid clashes with user defined names.
-Id Builder::makeOpaqueDebugType(char const* const name)
-{
-    // Create The structure debug type.
-    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
-    type->reserveOperands(11);
-    type->addIdOperand(nonSemanticShaderDebugInfo);
-    type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeComposite);
-    type->addIdOperand(getStringId(name)); // name id
-    type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100Structure)); // tag id
-    type->addIdOperand(makeDebugSource(currentFileId)); // source id
-    type->addIdOperand(makeUintConstant(currentLine)); // line id TODO: currentLine always zero?
-    type->addIdOperand(makeUintConstant(0)); // TODO: column id
-    type->addIdOperand(makeDebugCompilationUnit()); // scope id
-    // Prepend '@' to opaque types.
-    type->addIdOperand(getStringId('@' + std::string(name))); // linkage name id
-    type->addIdOperand(makeDebugInfoNone()); // size id
-    type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsPublic)); // flags id
-
-    groupedDebugTypes[NonSemanticShaderDebugInfo100DebugTypeComposite].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    return type->getResultId();
-}
-
 Id Builder::makePointerDebugType(StorageClass storageClass, Id const baseType)
 {
-    const Id debugBaseType = getDebugType(baseType);
+    const Id debugBaseType = debugId[baseType];
     if (!debugBaseType) {
         return makeDebugInfoNone();
     }
@@ -1250,7 +1030,7 @@ Id Builder::makePointerDebugType(StorageClass storageClass, Id const baseType)
         }
     }
 
-    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* type = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     type->reserveOperands(5);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypePointer);
@@ -1265,81 +1045,33 @@ Id Builder::makePointerDebugType(StorageClass storageClass, Id const baseType)
     return type->getResultId();
 }
 
-// Emit a OpExtInstWithForwardRefsKHR nonsemantic instruction for a pointer debug type
-// where we don't have the pointee yet. Since we don't have the pointee yet, it just
-// points to itself and we rely on patching it later.
-Id Builder::makeForwardPointerDebugType(StorageClass storageClass)
-{
-    const Id scID = makeUintConstant(storageClass);
-
-    this->addExtension(spv::E_SPV_KHR_relaxed_extended_instruction);
-
-    Instruction *type = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInstWithForwardRefsKHR);
-    type->addIdOperand(nonSemanticShaderDebugInfo);
-    type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypePointer);
-    type->addIdOperand(type->getResultId());
-    type->addIdOperand(scID);
-    type->addIdOperand(makeUintConstant(0));
-
-    groupedDebugTypes[NonSemanticShaderDebugInfo100DebugTypePointer].push_back(type);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-    module.mapInstruction(type);
-
-    return type->getResultId();
-}
-
 Id Builder::makeDebugSource(const Id fileName) {
     if (debugSourceId.find(fileName) != debugSourceId.end())
         return debugSourceId[fileName];
     spv::Id resultId = getUniqueId();
-    Instruction* sourceInst = new Instruction(resultId, makeVoidType(), Op::OpExtInst);
+    Instruction* sourceInst = new Instruction(resultId, makeVoidType(), OpExtInst);
     sourceInst->reserveOperands(3);
     sourceInst->addIdOperand(nonSemanticShaderDebugInfo);
     sourceInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugSource);
     sourceInst->addIdOperand(fileName);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(sourceInst));
-    module.mapInstruction(sourceInst);
     if (emitNonSemanticShaderDebugSource) {
-        const int maxWordCount = 0xFFFF;
-        const int opSourceWordCount = 4;
-        const int nonNullBytesPerInstruction = 4 * (maxWordCount - opSourceWordCount) - 1;
-        auto processDebugSource = [&](std::string source) {
-            if (source.size() > 0) {
-                int nextByte = 0;
-                while ((int)source.size() - nextByte > 0) {
-                    auto subString = source.substr(nextByte, nonNullBytesPerInstruction);
-                    auto sourceId = getStringId(subString);
-                    if (nextByte == 0) {
-                        // DebugSource
-                        sourceInst->addIdOperand(sourceId);
-                    } else {
-                        // DebugSourceContinued
-                        Instruction* sourceContinuedInst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
-                        sourceContinuedInst->reserveOperands(2);
-                        sourceContinuedInst->addIdOperand(nonSemanticShaderDebugInfo);
-                        sourceContinuedInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugSourceContinued);
-                        sourceContinuedInst->addIdOperand(sourceId);
-                        constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(sourceContinuedInst));
-                        module.mapInstruction(sourceContinuedInst);
-                    }
-                    nextByte += nonNullBytesPerInstruction;
-                }
-            } else {
-                auto sourceId = getStringId(source);
-                sourceInst->addIdOperand(sourceId);
-            }
-        };
+        spv::Id sourceId = 0;
         if (fileName == mainFileId) {
-            processDebugSource(sourceText);
+            sourceId = getStringId(sourceText);
         } else {
             auto incItr = includeFiles.find(fileName);
             if (incItr != includeFiles.end()) {
-                processDebugSource(*incItr->second);
-            } else {
-                // We omit the optional source text item if not available in glslang
+                sourceId = getStringId(*incItr->second);
             }
         }
+
+        // We omit the optional source text item if not available in glslang
+        if (sourceId != 0) {
+            sourceInst->addIdOperand(sourceId);
+        }
     }
+    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(sourceInst));
+    module.mapInstruction(sourceInst);
     debugSourceId[fileName] = resultId;
     return resultId;
 }
@@ -1348,7 +1080,7 @@ Id Builder::makeDebugCompilationUnit() {
     if (nonSemanticShaderCompilationUnitId != 0)
         return nonSemanticShaderCompilationUnitId;
     spv::Id resultId = getUniqueId();
-    Instruction* sourceInst = new Instruction(resultId, makeVoidType(), Op::OpExtInst);
+    Instruction* sourceInst = new Instruction(resultId, makeVoidType(), OpExtInst);
     sourceInst->reserveOperands(6);
     sourceInst->addIdOperand(nonSemanticShaderDebugInfo);
     sourceInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugCompilationUnit);
@@ -1372,7 +1104,7 @@ Id Builder::createDebugGlobalVariable(Id const type, char const*const name, Id c
 {
     assert(type != 0);
 
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(11);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugGlobalVariable);
@@ -1397,7 +1129,7 @@ Id Builder::createDebugLocalVariable(Id type, char const*const name, size_t cons
     assert(name != nullptr);
     assert(!currentDebugScopeId.empty());
 
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(9);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLocalVariable);
@@ -1409,7 +1141,7 @@ Id Builder::createDebugLocalVariable(Id type, char const*const name, size_t cons
     inst->addIdOperand(currentDebugScopeId.top()); // scope id
     inst->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsLocal)); // flags id
     if(argNumber != 0) {
-        inst->addIdOperand(makeUintConstant(static_cast<unsigned int>(argNumber)));
+        inst->addIdOperand(makeUintConstant(argNumber));
     }
 
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(inst));
@@ -1423,7 +1155,7 @@ Id Builder::makeDebugExpression()
     if (debugExpression != 0)
         return debugExpression;
 
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(2);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugExpression);
@@ -1438,7 +1170,7 @@ Id Builder::makeDebugExpression()
 
 Id Builder::makeDebugDeclare(Id const debugLocalVariable, Id const pointer)
 {
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(5);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugDeclare);
@@ -1452,7 +1184,7 @@ Id Builder::makeDebugDeclare(Id const debugLocalVariable, Id const pointer)
 
 Id Builder::makeDebugValue(Id const debugLocalVariable, Id const value)
 {
-    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), makeVoidType(), OpExtInst);
     inst->reserveOperands(5);
     inst->addIdOperand(nonSemanticShaderDebugInfo);
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugValue);
@@ -1467,17 +1199,17 @@ Id Builder::makeDebugValue(Id const debugLocalVariable, Id const value)
 Id Builder::makeAccelerationStructureType()
 {
     Instruction *type;
-    if (groupedTypes[enumCast(Op::OpTypeAccelerationStructureKHR)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeAccelerationStructureKHR);
-        groupedTypes[enumCast(Op::OpTypeAccelerationStructureKHR)].push_back(type);
+    if (groupedTypes[OpTypeAccelerationStructureKHR].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeAccelerationStructureKHR);
+        groupedTypes[OpTypeAccelerationStructureKHR].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
         if (emitNonSemanticShaderDebugInfo) {
-            spv::Id debugType = makeOpaqueDebugType("accelerationStructure");
-            debugTypeIdLookup[type->getResultId()] = debugType;
+            spv::Id debugType = makeCompositeDebugType({}, "accelerationStructure", NonSemanticShaderDebugInfo100Structure, true);
+            debugId[type->getResultId()] = debugType;
         }
     } else {
-        type = groupedTypes[enumCast(Op::OpTypeAccelerationStructureKHR)].back();
+        type = groupedTypes[OpTypeAccelerationStructureKHR].back();
     }
 
     return type->getResultId();
@@ -1486,50 +1218,32 @@ Id Builder::makeAccelerationStructureType()
 Id Builder::makeRayQueryType()
 {
     Instruction *type;
-    if (groupedTypes[enumCast(Op::OpTypeRayQueryKHR)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeRayQueryKHR);
-        groupedTypes[enumCast(Op::OpTypeRayQueryKHR)].push_back(type);
+    if (groupedTypes[OpTypeRayQueryKHR].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeRayQueryKHR);
+        groupedTypes[OpTypeRayQueryKHR].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
         if (emitNonSemanticShaderDebugInfo) {
-            spv::Id debugType = makeOpaqueDebugType("rayQuery");
-            debugTypeIdLookup[type->getResultId()] = debugType;
+            spv::Id debugType = makeCompositeDebugType({}, "rayQuery", NonSemanticShaderDebugInfo100Structure, true);
+            debugId[type->getResultId()] = debugType;
         }
     } else {
-        type = groupedTypes[enumCast(Op::OpTypeRayQueryKHR)].back();
+        type = groupedTypes[OpTypeRayQueryKHR].back();
     }
 
     return type->getResultId();
 }
 
-Id Builder::makeHitObjectEXTType()
-{
-    Instruction *type;
-    if (groupedTypes[enumCast(Op::OpTypeHitObjectEXT)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeHitObjectEXT);
-        groupedTypes[enumCast(Op::OpTypeHitObjectEXT)].push_back(type);
-        constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
-        module.mapInstruction(type);
-    } else {
-        type = groupedTypes[enumCast(Op::OpTypeHitObjectEXT)].back();
-    }
-
-    return type->getResultId();
-}
 Id Builder::makeHitObjectNVType()
 {
     Instruction *type;
-    if (groupedTypes[enumCast(Op::OpTypeHitObjectNV)].size() == 0) {
-        type = new Instruction(getUniqueId(), NoType, Op::OpTypeHitObjectNV);
-        groupedTypes[enumCast(Op::OpTypeHitObjectNV)].push_back(type);
+    if (groupedTypes[OpTypeHitObjectNV].size() == 0) {
+        type = new Instruction(getUniqueId(), NoType, OpTypeHitObjectNV);
+        groupedTypes[OpTypeHitObjectNV].push_back(type);
         constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
         module.mapInstruction(type);
-        if (emitNonSemanticShaderDebugInfo) {
-            spv::Id debugType = makeOpaqueDebugType("hitObjectNV");
-            debugTypeIdLookup[type->getResultId()] = debugType;
-        }
     } else {
-        type = groupedTypes[enumCast(Op::OpTypeHitObjectNV)].back();
+        type = groupedTypes[OpTypeHitObjectNV].back();
     }
 
     return type->getResultId();
@@ -1550,42 +1264,41 @@ Op Builder::getMostBasicTypeClass(Id typeId) const
     Op typeClass = instr->getOpCode();
     switch (typeClass)
     {
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeArray:
-    case Op::OpTypeRuntimeArray:
+    case OpTypeVector:
+    case OpTypeMatrix:
+    case OpTypeArray:
+    case OpTypeRuntimeArray:
         return getMostBasicTypeClass(instr->getIdOperand(0));
-    case Op::OpTypePointer:
+    case OpTypePointer:
         return getMostBasicTypeClass(instr->getIdOperand(1));
     default:
         return typeClass;
     }
 }
 
-unsigned int Builder::getNumTypeConstituents(Id typeId) const
+int Builder::getNumTypeConstituents(Id typeId) const
 {
     Instruction* instr = module.getInstruction(typeId);
 
     switch (instr->getOpCode())
     {
-    case Op::OpTypeBool:
-    case Op::OpTypeInt:
-    case Op::OpTypeFloat:
-    case Op::OpTypePointer:
+    case OpTypeBool:
+    case OpTypeInt:
+    case OpTypeFloat:
+    case OpTypePointer:
         return 1;
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
+    case OpTypeVector:
+    case OpTypeMatrix:
         return instr->getImmediateOperand(1);
-    case Op::OpTypeCooperativeVectorNV:
-    case Op::OpTypeArray:
+    case OpTypeArray:
     {
         Id lengthId = instr->getIdOperand(1);
         return module.getInstruction(lengthId)->getImmediateOperand(0);
     }
-    case Op::OpTypeStruct:
+    case OpTypeStruct:
         return instr->getNumOperands();
-    case Op::OpTypeCooperativeMatrixKHR:
-    case Op::OpTypeCooperativeMatrixNV:
+    case OpTypeCooperativeMatrixKHR:
+    case OpTypeCooperativeMatrixNV:
         // has only one constituent when used with OpCompositeConstruct.
         return 1;
     default:
@@ -1604,18 +1317,17 @@ Id Builder::getScalarTypeId(Id typeId) const
     Op typeClass = instr->getOpCode();
     switch (typeClass)
     {
-    case Op::OpTypeVoid:
-    case Op::OpTypeBool:
-    case Op::OpTypeInt:
-    case Op::OpTypeFloat:
-    case Op::OpTypeStruct:
+    case OpTypeVoid:
+    case OpTypeBool:
+    case OpTypeInt:
+    case OpTypeFloat:
+    case OpTypeStruct:
         return instr->getResultId();
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeArray:
-    case Op::OpTypeRuntimeArray:
-    case Op::OpTypePointer:
-    case Op::OpTypeCooperativeVectorNV:
+    case OpTypeVector:
+    case OpTypeMatrix:
+    case OpTypeArray:
+    case OpTypeRuntimeArray:
+    case OpTypePointer:
         return getScalarTypeId(getContainedTypeId(typeId));
     default:
         assert(0);
@@ -1631,17 +1343,16 @@ Id Builder::getContainedTypeId(Id typeId, int member) const
     Op typeClass = instr->getOpCode();
     switch (typeClass)
     {
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeArray:
-    case Op::OpTypeRuntimeArray:
-    case Op::OpTypeCooperativeMatrixKHR:
-    case Op::OpTypeCooperativeMatrixNV:
-    case Op::OpTypeCooperativeVectorNV:
+    case OpTypeVector:
+    case OpTypeMatrix:
+    case OpTypeArray:
+    case OpTypeRuntimeArray:
+    case OpTypeCooperativeMatrixKHR:
+    case OpTypeCooperativeMatrixNV:
         return instr->getIdOperand(0);
-    case Op::OpTypePointer:
+    case OpTypePointer:
         return instr->getIdOperand(1);
-    case Op::OpTypeStruct:
+    case OpTypeStruct:
         return instr->getIdOperand(member);
     default:
         assert(0);
@@ -1685,21 +1396,21 @@ bool Builder::containsType(Id typeId, spv::Op typeOp, unsigned int width) const
     Op typeClass = instr.getOpCode();
     switch (typeClass)
     {
-    case Op::OpTypeInt:
-    case Op::OpTypeFloat:
+    case OpTypeInt:
+    case OpTypeFloat:
         return typeClass == typeOp && instr.getImmediateOperand(0) == width;
-    case Op::OpTypeStruct:
+    case OpTypeStruct:
         for (int m = 0; m < instr.getNumOperands(); ++m) {
             if (containsType(instr.getIdOperand(m), typeOp, width))
                 return true;
         }
         return false;
-    case Op::OpTypePointer:
+    case OpTypePointer:
         return false;
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeArray:
-    case Op::OpTypeRuntimeArray:
+    case OpTypeVector:
+    case OpTypeMatrix:
+    case OpTypeArray:
+    case OpTypeRuntimeArray:
         return containsType(getContainedTypeId(typeId), typeOp, width);
     default:
         return typeClass == typeOp;
@@ -1715,11 +1426,11 @@ bool Builder::containsPhysicalStorageBufferOrArray(Id typeId) const
     Op typeClass = instr.getOpCode();
     switch (typeClass)
     {
-    case Op::OpTypePointer:
-        return getTypeStorageClass(typeId) == StorageClass::PhysicalStorageBufferEXT;
-    case Op::OpTypeArray:
+    case OpTypePointer:
+        return getTypeStorageClass(typeId) == StorageClassPhysicalStorageBufferEXT;
+    case OpTypeArray:
         return containsPhysicalStorageBufferOrArray(getContainedTypeId(typeId));
-    case Op::OpTypeStruct:
+    case OpTypeStruct:
         for (int m = 0; m < instr.getNumOperands(); ++m) {
             if (containsPhysicalStorageBufferOrArray(instr.getIdOperand(m)))
                 return true;
@@ -1734,17 +1445,32 @@ bool Builder::containsPhysicalStorageBufferOrArray(Id typeId) const
 // can be reused rather than duplicated.  (Required by the specification).
 Id Builder::findScalarConstant(Op typeClass, Op opcode, Id typeId, unsigned value)
 {
-    ScalarConstantKey key{ enumCast(typeClass), enumCast(opcode), typeId, value, 0 };
-    auto it = groupedScalarConstantResultIDs.find(key);
-    return (it != groupedScalarConstantResultIDs.end()) ? it->second : 0;
+    Instruction* constant;
+    for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) {
+        constant = groupedConstants[typeClass][i];
+        if (constant->getOpCode() == opcode &&
+            constant->getTypeId() == typeId &&
+            constant->getImmediateOperand(0) == value)
+            return constant->getResultId();
+    }
+
+    return 0;
 }
 
 // Version of findScalarConstant (see above) for scalars that take two operands (e.g. a 'double' or 'int64').
 Id Builder::findScalarConstant(Op typeClass, Op opcode, Id typeId, unsigned v1, unsigned v2)
 {
-    ScalarConstantKey key{ enumCast(typeClass), enumCast(opcode), typeId, v1, v2 };
-    auto it = groupedScalarConstantResultIDs.find(key);
-    return (it != groupedScalarConstantResultIDs.end()) ? it->second : 0;
+    Instruction* constant;
+    for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) {
+        constant = groupedConstants[typeClass][i];
+        if (constant->getOpCode() == opcode &&
+            constant->getTypeId() == typeId &&
+            constant->getImmediateOperand(0) == v1 &&
+            constant->getImmediateOperand(1) == v2)
+            return constant->getResultId();
+    }
+
+    return 0;
 }
 
 // Return true if consuming 'opcode' means consuming a constant.
@@ -1753,20 +1479,18 @@ Id Builder::findScalarConstant(Op typeClass, Op opcode, Id typeId, unsigned v1,
 bool Builder::isConstantOpCode(Op opcode) const
 {
     switch (opcode) {
-    case Op::OpUndef:
-    case Op::OpConstantTrue:
-    case Op::OpConstantFalse:
-    case Op::OpConstant:
-    case Op::OpConstantComposite:
-    case Op::OpConstantCompositeReplicateEXT:
-    case Op::OpConstantSampler:
-    case Op::OpConstantNull:
-    case Op::OpSpecConstantTrue:
-    case Op::OpSpecConstantFalse:
-    case Op::OpSpecConstant:
-    case Op::OpSpecConstantComposite:
-    case Op::OpSpecConstantCompositeReplicateEXT:
-    case Op::OpSpecConstantOp:
+    case OpUndef:
+    case OpConstantTrue:
+    case OpConstantFalse:
+    case OpConstant:
+    case OpConstantComposite:
+    case OpConstantSampler:
+    case OpConstantNull:
+    case OpSpecConstantTrue:
+    case OpSpecConstantFalse:
+    case OpSpecConstant:
+    case OpSpecConstantComposite:
+    case OpSpecConstantOp:
         return true;
     default:
         return false;
@@ -1777,12 +1501,11 @@ bool Builder::isConstantOpCode(Op opcode) const
 bool Builder::isSpecConstantOpCode(Op opcode) const
 {
     switch (opcode) {
-    case Op::OpSpecConstantTrue:
-    case Op::OpSpecConstantFalse:
-    case Op::OpSpecConstant:
-    case Op::OpSpecConstantComposite:
-    case Op::OpSpecConstantOp:
-    case Op::OpSpecConstantCompositeReplicateEXT:
+    case OpSpecConstantTrue:
+    case OpSpecConstantFalse:
+    case OpSpecConstant:
+    case OpSpecConstantComposite:
+    case OpSpecConstantOp:
         return true;
     default:
         return false;
@@ -1805,7 +1528,7 @@ Id Builder::makeNullConstant(Id typeId)
         return existing;
 
     // Make it
-    Instruction* c = new Instruction(getUniqueId(), typeId, Op::OpConstantNull);
+    Instruction* c = new Instruction(getUniqueId(), typeId, OpConstantNull);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
     nullConstants.push_back(c);
     module.mapInstruction(c);
@@ -1816,12 +1539,19 @@ Id Builder::makeNullConstant(Id typeId)
 Id Builder::makeBoolConstant(bool b, bool specConstant)
 {
     Id typeId = makeBoolType();
-    Op opcode = specConstant ? (b ? Op::OpSpecConstantTrue : Op::OpSpecConstantFalse) : (b ? Op::OpConstantTrue : Op::OpConstantFalse);
+    Instruction* constant;
+    Op opcode = specConstant ? (b ? OpSpecConstantTrue : OpSpecConstantFalse) : (b ? OpConstantTrue : OpConstantFalse);
 
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
-    if (!specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeBool, opcode, typeId, 0);
+    if (! specConstant) {
+        Id existing = 0;
+        for (int i = 0; i < (int)groupedConstants[OpTypeBool].size(); ++i) {
+            constant = groupedConstants[OpTypeBool][i];
+            if (constant->getTypeId() == typeId && constant->getOpCode() == opcode)
+                existing = constant->getResultId();
+        }
+
         if (existing)
             return existing;
     }
@@ -1829,24 +1559,20 @@ Id Builder::makeBoolConstant(bool b, bool specConstant)
     // Make it
     Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeBool].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{enumCast(Op::OpTypeBool), enumCast(opcode), typeId, 0, 0};
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeIntConstant(Id typeId, unsigned value, bool specConstant)
 {
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
+    Op opcode = specConstant ? OpSpecConstant : OpConstant;
 
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
     if (! specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeInt, opcode, typeId, value);
+        Id existing = findScalarConstant(OpTypeInt, opcode, typeId, value);
         if (existing)
             return existing;
     }
@@ -1854,19 +1580,15 @@ Id Builder::makeIntConstant(Id typeId, unsigned value, bool specConstant)
     Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
     c->addImmediateOperand(value);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeInt].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeInt), enumCast(opcode), typeId, value, 0 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeInt64Constant(Id typeId, unsigned long long value, bool specConstant)
 {
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
+    Op opcode = specConstant ? OpSpecConstant : OpConstant;
 
     unsigned op1 = value & 0xFFFFFFFF;
     unsigned op2 = value >> 32;
@@ -1874,7 +1596,7 @@ Id Builder::makeInt64Constant(Id typeId, unsigned long long value, bool specCons
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
     if (! specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeInt, opcode, typeId, op1, op2);
+        Id existing = findScalarConstant(OpTypeInt, opcode, typeId, op1, op2);
         if (existing)
             return existing;
     }
@@ -1884,19 +1606,15 @@ Id Builder::makeInt64Constant(Id typeId, unsigned long long value, bool specCons
     c->addImmediateOperand(op1);
     c->addImmediateOperand(op2);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeInt].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeInt), enumCast(opcode), typeId, op1, op2 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeFloatConstant(float f, bool specConstant)
 {
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
+    Op opcode = specConstant ? OpSpecConstant : OpConstant;
     Id typeId = makeFloatType(32);
     union { float fl; unsigned int ui; } u;
     u.fl = f;
@@ -1905,7 +1623,7 @@ Id Builder::makeFloatConstant(float f, bool specConstant)
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
     if (! specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, value);
+        Id existing = findScalarConstant(OpTypeFloat, opcode, typeId, value);
         if (existing)
             return existing;
     }
@@ -1913,19 +1631,15 @@ Id Builder::makeFloatConstant(float f, bool specConstant)
     Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
     c->addImmediateOperand(value);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeFloat].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, value, 0 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeDoubleConstant(double d, bool specConstant)
 {
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
+    Op opcode = specConstant ? OpSpecConstant : OpConstant;
     Id typeId = makeFloatType(64);
     union { double db; unsigned long long ull; } u;
     u.db = d;
@@ -1936,7 +1650,7 @@ Id Builder::makeDoubleConstant(double d, bool specConstant)
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
     if (! specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, op1, op2);
+        Id existing = findScalarConstant(OpTypeFloat, opcode, typeId, op1, op2);
         if (existing)
             return existing;
     }
@@ -1946,19 +1660,15 @@ Id Builder::makeDoubleConstant(double d, bool specConstant)
     c->addImmediateOperand(op1);
     c->addImmediateOperand(op2);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeFloat].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, op1, op2 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeFloat16Constant(float f16, bool specConstant)
 {
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
+    Op opcode = specConstant ? OpSpecConstant : OpConstant;
     Id typeId = makeFloatType(16);
 
     spvutils::HexFloat<spvutils::FloatProxy<float>> fVal(f16);
@@ -1970,7 +1680,7 @@ Id Builder::makeFloat16Constant(float f16, bool specConstant)
     // See if we already made it. Applies only to regular constants, because specialization constants
     // must remain distinct for the purpose of applying a SpecId decoration.
     if (!specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, value);
+        Id existing = findScalarConstant(OpTypeFloat, opcode, typeId, value);
         if (existing)
             return existing;
     }
@@ -1978,113 +1688,10 @@ Id Builder::makeFloat16Constant(float f16, bool specConstant)
     Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
     c->addImmediateOperand(value);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+    groupedConstants[OpTypeFloat].push_back(c);
     module.mapInstruction(c);
 
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, value, 0 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
-}
-
-Id Builder::makeBFloat16Constant(float bf16, bool specConstant)
-{
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
-    Id typeId = makeBFloat16Type();
-
-    union {
-        float f;
-        uint32_t u;
-    } un;
-    un.f = bf16;
-
-    // take high 16b of fp32 value. This is effectively round-to-zero, other than certain NaNs.
-    unsigned value = un.u >> 16;
-
-    // See if we already made it. Applies only to regular constants, because specialization constants
-    // must remain distinct for the purpose of applying a SpecId decoration.
-    if (!specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, value);
-        if (existing)
-            return existing;
-    }
-
-    Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
-    c->addImmediateOperand(value);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
-    module.mapInstruction(c);
-
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{ enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, value, 0 };
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
-}
-
-Id Builder::makeFloatE5M2Constant(float fe5m2, bool specConstant)
-{
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
-    Id typeId = makeFloatE5M2Type();
-
-    spvutils::HexFloat<spvutils::FloatProxy<float>> fVal(fe5m2);
-    spvutils::HexFloat<spvutils::FloatProxy<spvutils::FloatE5M2>> fe5m2Val(0);
-    fVal.castTo(fe5m2Val, spvutils::kRoundToZero);
-
-    unsigned value = fe5m2Val.value().getAsFloat().get_value();
-
-    // See if we already made it. Applies only to regular constants, because specialization constants
-    // must remain distinct for the purpose of applying a SpecId decoration.
-    if (!specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, value);
-        if (existing)
-            return existing;
-    }
-
-    Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
-    c->addImmediateOperand(value);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
-    module.mapInstruction(c);
-
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, value, 0};
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
-}
-
-Id Builder::makeFloatE4M3Constant(float fe4m3, bool specConstant)
-{
-    Op opcode = specConstant ? Op::OpSpecConstant : Op::OpConstant;
-    Id typeId = makeFloatE4M3Type();
-
-    spvutils::HexFloat<spvutils::FloatProxy<float>> fVal(fe4m3);
-    spvutils::HexFloat<spvutils::FloatProxy<spvutils::FloatE4M3>> fe4m3Val(0);
-    fVal.castTo(fe4m3Val, spvutils::kRoundToZero);
-
-    unsigned value = fe4m3Val.value().getAsFloat().get_value();
-
-    // See if we already made it. Applies only to regular constants, because specialization constants
-    // must remain distinct for the purpose of applying a SpecId decoration.
-    if (!specConstant) {
-        Id existing = findScalarConstant(Op::OpTypeFloat, opcode, typeId, value);
-        if (existing)
-            return existing;
-    }
-
-    Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
-    c->addImmediateOperand(value);
-    constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
-    module.mapInstruction(c);
-
-    Id resultId = c->getResultId();
-    if (!specConstant) {
-        ScalarConstantKey key{enumCast(Op::OpTypeFloat), enumCast(opcode), typeId, value, 0};
-        groupedScalarConstantResultIDs[key] = resultId;
-    }
-    return resultId;
+    return c->getResultId();
 }
 
 Id Builder::makeFpConstant(Id type, double d, bool specConstant)
@@ -2121,23 +1728,16 @@ Id Builder::importNonSemanticShaderDebugInfoInstructions()
     return nonSemanticShaderDebugInfo;
 }
 
-Id Builder::findCompositeConstant(Op typeClass, Op opcode, Id typeId, const std::vector<Id>& comps, size_t numMembers)
+Id Builder::findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>& comps)
 {
     Instruction* constant = nullptr;
     bool found = false;
-    for (int i = 0; i < (int)groupedCompositeConstants[enumCast(typeClass)].size(); ++i) {
-        constant = groupedCompositeConstants[enumCast(typeClass)][i];
+    for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) {
+        constant = groupedConstants[typeClass][i];
 
         if (constant->getTypeId() != typeId)
             continue;
 
-        if (constant->getOpCode() != opcode) {
-            continue;
-        }
-
-        if (constant->getNumOperands() != (int)numMembers)
-            continue;
-
         // same contents?
         bool mismatch = false;
         for (int op = 0; op < constant->getNumOperands(); ++op) {
@@ -2182,41 +1782,23 @@ Id Builder::findStructConstant(Id typeId, const std::vector<Id>& comps)
 // Comments in header
 Id Builder::makeCompositeConstant(Id typeId, const std::vector<Id>& members, bool specConstant)
 {
+    Op opcode = specConstant ? OpSpecConstantComposite : OpConstantComposite;
     assert(typeId);
     Op typeClass = getTypeClass(typeId);
 
-    bool replicate = false;
-    size_t numMembers = members.size();
-    if (useReplicatedComposites || typeClass == Op::OpTypeCooperativeVectorNV) {
-        // use replicate if all members are the same
-        replicate = numMembers > 0 &&
-            std::equal(members.begin() + 1, members.end(), members.begin());
-
-        if (replicate) {
-            numMembers = 1;
-            addCapability(spv::Capability::ReplicatedCompositesEXT);
-            addExtension(spv::E_SPV_EXT_replicated_composites);
-        }
-    }
-
-    Op opcode = replicate ?
-        (specConstant ? Op::OpSpecConstantCompositeReplicateEXT : Op::OpConstantCompositeReplicateEXT) :
-        (specConstant ? Op::OpSpecConstantComposite : Op::OpConstantComposite);
-
     switch (typeClass) {
-    case Op::OpTypeVector:
-    case Op::OpTypeArray:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeCooperativeMatrixKHR:
-    case Op::OpTypeCooperativeMatrixNV:
-    case Op::OpTypeCooperativeVectorNV:
+    case OpTypeVector:
+    case OpTypeArray:
+    case OpTypeMatrix:
+    case OpTypeCooperativeMatrixKHR:
+    case OpTypeCooperativeMatrixNV:
         if (! specConstant) {
-            Id existing = findCompositeConstant(typeClass, opcode, typeId, members, numMembers);
+            Id existing = findCompositeConstant(typeClass, typeId, members);
             if (existing)
                 return existing;
         }
         break;
-    case Op::OpTypeStruct:
+    case OpTypeStruct:
         if (! specConstant) {
             Id existing = findStructConstant(typeId, members);
             if (existing)
@@ -2230,13 +1812,13 @@ Id Builder::makeCompositeConstant(Id typeId, const std::vector<Id>& members, boo
 
     Instruction* c = new Instruction(getUniqueId(), typeId, opcode);
     c->reserveOperands(members.size());
-    for (size_t op = 0; op < numMembers; ++op)
+    for (int op = 0; op < (int)members.size(); ++op)
         c->addIdOperand(members[op]);
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
-    if (typeClass == Op::OpTypeStruct)
+    if (typeClass == OpTypeStruct)
         groupedStructConstants[typeId].push_back(c);
     else
-        groupedCompositeConstants[enumCast(typeClass)].push_back(c);
+        groupedConstants[typeClass].push_back(c);
     module.mapInstruction(c);
 
     return c->getResultId();
@@ -2244,7 +1826,7 @@ Id Builder::makeCompositeConstant(Id typeId, const std::vector<Id>& members, boo
 
 Instruction* Builder::addEntryPoint(ExecutionModel model, Function* function, const char* name)
 {
-    Instruction* entryPoint = new Instruction(Op::OpEntryPoint);
+    Instruction* entryPoint = new Instruction(OpEntryPoint);
     entryPoint->reserveOperands(3);
     entryPoint->addImmediateOperand(model);
     entryPoint->addIdOperand(function->getId());
@@ -2262,7 +1844,7 @@ void Builder::addExecutionMode(Function* entryPoint, ExecutionMode mode, int val
     if (!entryPoint)
         return;
 
-    Instruction* instr = new Instruction(Op::OpExecutionMode);
+    Instruction* instr = new Instruction(OpExecutionMode);
     instr->reserveOperands(3);
     instr->addIdOperand(entryPoint->getId());
     instr->addImmediateOperand(mode);
@@ -2282,7 +1864,7 @@ void Builder::addExecutionMode(Function* entryPoint, ExecutionMode mode, const s
     if (!entryPoint)
         return;
 
-    Instruction* instr = new Instruction(Op::OpExecutionMode);
+    Instruction* instr = new Instruction(OpExecutionMode);
     instr->reserveOperands(literals.size() + 2);
     instr->addIdOperand(entryPoint->getId());
     instr->addImmediateOperand(mode);
@@ -2298,7 +1880,7 @@ void Builder::addExecutionModeId(Function* entryPoint, ExecutionMode mode, const
     if (!entryPoint)
         return;
 
-    Instruction* instr = new Instruction(Op::OpExecutionModeId);
+    Instruction* instr = new Instruction(OpExecutionModeId);
     instr->reserveOperands(operandIds.size() + 2);
     instr->addIdOperand(entryPoint->getId());
     instr->addImmediateOperand(mode);
@@ -2310,7 +1892,7 @@ void Builder::addExecutionModeId(Function* entryPoint, ExecutionMode mode, const
 
 void Builder::addName(Id id, const char* string)
 {
-    Instruction* name = new Instruction(Op::OpName);
+    Instruction* name = new Instruction(OpName);
     name->reserveOperands(2);
     name->addIdOperand(id);
     name->addStringOperand(string);
@@ -2320,7 +1902,7 @@ void Builder::addName(Id id, const char* string)
 
 void Builder::addMemberName(Id id, int memberNumber, const char* string)
 {
-    Instruction* name = new Instruction(Op::OpMemberName);
+    Instruction* name = new Instruction(OpMemberName);
     name->reserveOperands(3);
     name->addIdOperand(id);
     name->addImmediateOperand(memberNumber);
@@ -2331,94 +1913,94 @@ void Builder::addMemberName(Id id, int memberNumber, const char* string)
 
 void Builder::addDecoration(Id id, Decoration decoration, int num)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorate);
+    Instruction* dec = new Instruction(OpDecorate);
     dec->reserveOperands(2);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
     if (num >= 0)
         dec->addImmediateOperand(num);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const char* s)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorateString);
+    Instruction* dec = new Instruction(OpDecorateString);
     dec->reserveOperands(3);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
     dec->addStringOperand(s);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const std::vector<unsigned>& literals)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorate);
+    Instruction* dec = new Instruction(OpDecorate);
     dec->reserveOperands(literals.size() + 2);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
     for (auto literal : literals)
         dec->addImmediateOperand(literal);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const std::vector<const char*>& strings)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorateString);
+    Instruction* dec = new Instruction(OpDecorateString);
     dec->reserveOperands(strings.size() + 2);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
     for (auto string : strings)
         dec->addStringOperand(string);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addLinkageDecoration(Id id, const char* name, spv::LinkageType linkType) {
-    Instruction* dec = new Instruction(Op::OpDecorate);
+    Instruction* dec = new Instruction(OpDecorate);
     dec->reserveOperands(4);
     dec->addIdOperand(id);
-    dec->addImmediateOperand(spv::Decoration::LinkageAttributes);
+    dec->addImmediateOperand(spv::DecorationLinkageAttributes);
     dec->addStringOperand(name);
     dec->addImmediateOperand(linkType);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecorationId(Id id, Decoration decoration, Id idDecoration)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorateId);
+    Instruction* dec = new Instruction(OpDecorateId);
     dec->reserveOperands(3);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
     dec->addIdOperand(idDecoration);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecorationId(Id id, Decoration decoration, const std::vector<Id>& operandIds)
 {
-    if(decoration == spv::Decoration::Max)
+    if(decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpDecorateId);
+    Instruction* dec = new Instruction(OpDecorateId);
     dec->reserveOperands(operandIds.size() + 2);
     dec->addIdOperand(id);
     dec->addImmediateOperand(decoration);
@@ -2426,15 +2008,15 @@ void Builder::addDecorationId(Id id, Decoration decoration, const std::vector<Id
     for (auto operandId : operandIds)
         dec->addIdOperand(operandId);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, int num)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpMemberDecorate);
+    Instruction* dec = new Instruction(OpMemberDecorate);
     dec->reserveOperands(3);
     dec->addIdOperand(id);
     dec->addImmediateOperand(member);
@@ -2442,30 +2024,30 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     if (num >= 0)
         dec->addImmediateOperand(num);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const char *s)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpMemberDecorateStringGOOGLE);
+    Instruction* dec = new Instruction(OpMemberDecorateStringGOOGLE);
     dec->reserveOperands(4);
     dec->addIdOperand(id);
     dec->addImmediateOperand(member);
     dec->addImmediateOperand(decoration);
     dec->addStringOperand(s);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const std::vector<unsigned>& literals)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpMemberDecorate);
+    Instruction* dec = new Instruction(OpMemberDecorate);
     dec->reserveOperands(literals.size() + 3);
     dec->addIdOperand(id);
     dec->addImmediateOperand(member);
@@ -2473,15 +2055,15 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     for (auto literal : literals)
         dec->addImmediateOperand(literal);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const std::vector<const char*>& strings)
 {
-    if (decoration == spv::Decoration::Max)
+    if (decoration == spv::DecorationMax)
         return;
 
-    Instruction* dec = new Instruction(Op::OpMemberDecorateString);
+    Instruction* dec = new Instruction(OpMemberDecorateString);
     dec->reserveOperands(strings.size() + 3);
     dec->addIdOperand(id);
     dec->addImmediateOperand(member);
@@ -2489,20 +2071,14 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     for (auto string : strings)
         dec->addStringOperand(string);
 
-    decorations.insert(std::unique_ptr<Instruction>(dec));
+    decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
-    // Phis must appear first in their block, don't insert line tracking instructions
-    // in front of them, just add the OpPhi and return.
-    if (inst->getOpCode() == Op::OpPhi) {
-        buildPoint->addInstruction(std::move(inst));
-        return;
-    }
     // Optionally insert OpDebugScope
     if (emitNonSemanticShaderDebugInfo && dirtyScopeTracker) {
         if (buildPoint->updateDebugScope(currentDebugScopeId.top())) {
-            auto scopeInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), Op::OpExtInst);
+            auto scopeInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), OpExtInst);
             scopeInst->reserveOperands(3);
             scopeInst->addIdOperand(nonSemanticShaderDebugInfo);
             scopeInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugScope);
@@ -2517,7 +2093,7 @@ void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
     if (trackDebugInfo && dirtyLineTracker) {
         if (buildPoint->updateDebugSourceLocation(currentLine, 0, currentFileId)) {
             if (emitSpirvDebugInfo) {
-                auto lineInst = std::make_unique<Instruction>(Op::OpLine);
+                auto lineInst = std::make_unique<Instruction>(OpLine);
                 lineInst->reserveOperands(3);
                 lineInst->addIdOperand(currentFileId);
                 lineInst->addImmediateOperand(currentLine);
@@ -2525,7 +2101,7 @@ void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
                 buildPoint->addInstruction(std::move(lineInst));
             }
             if (emitNonSemanticShaderDebugInfo) {
-                auto lineInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), Op::OpExtInst);
+                auto lineInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), OpExtInst);
                 lineInst->reserveOperands(7);
                 lineInst->addIdOperand(nonSemanticShaderDebugInfo);
                 lineInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLine);
@@ -2544,10 +2120,6 @@ void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
     buildPoint->addInstruction(std::move(inst));
 }
 
-void Builder::addInstructionNoDebugInfo(std::unique_ptr<Instruction> inst) {
-    buildPoint->addInstruction(std::move(inst));
-}
-
 // Comments in header
 Function* Builder::makeEntryPoint(const char* entryPoint)
 {
@@ -2556,12 +2128,12 @@ Function* Builder::makeEntryPoint(const char* entryPoint)
     auto const returnType = makeVoidType();
 
     restoreNonSemanticShaderDebugInfo = emitNonSemanticShaderDebugInfo;
-    if(sourceLang == spv::SourceLanguage::HLSL) {
+    if(sourceLang == spv::SourceLanguageHLSL) {
         emitNonSemanticShaderDebugInfo = false;
     }
 
     Block* entry = nullptr;
-    entryPointFunction = makeFunctionEntry(NoPrecision, returnType, entryPoint, LinkageType::Max, {}, {}, &entry);
+    entryPointFunction = makeFunctionEntry(NoPrecision, returnType, entryPoint, LinkageTypeMax, {}, {}, &entry);
 
     emitNonSemanticShaderDebugInfo = restoreNonSemanticShaderDebugInfo;
 
@@ -2608,23 +2180,24 @@ Function* Builder::makeFunctionEntry(Decoration precision, Id returnType, const
     return function;
 }
 
-void Builder::setupFunctionDebugInfo(Function* function, const char* name, const std::vector<Id>& paramTypes,
-                                     const std::vector<char const*>& paramNames)
+void Builder::setupDebugFunctionEntry(Function* function, const char* name, int line, const std::vector<Id>& paramTypes,
+                                      const std::vector<char const*>& paramNames)
 {
 
     if (!emitNonSemanticShaderDebugInfo)
         return;
 
+    currentLine = line;
     Id nameId = getStringId(unmangleFunctionName(name));
     Id funcTypeId = function->getFuncTypeId();
-    assert(getDebugType(funcTypeId) != NoType);
+    assert(debugId[funcTypeId] != 0);
     Id funcId = function->getId();
 
     assert(funcId != 0);
 
     // Make the debug function instruction
     Id debugFuncId = makeDebugFunction(function, nameId, funcTypeId);
-    debugFuncIdLookup[funcId] = debugFuncId;
+    debugId[funcId] = debugFuncId;
     currentDebugScopeId.push(debugFuncId);
 
     // DebugScope and DebugLine for parameter DebugDeclares
@@ -2643,8 +2216,9 @@ void Builder::setupFunctionDebugInfo(Function* function, const char* name, const
             }
 
             auto const& paramName = paramNames[p];
-            auto const debugLocalVariableId = createDebugLocalVariable(getDebugType(paramTypeId), paramName, p + 1);
+            auto const debugLocalVariableId = createDebugLocalVariable(debugId[paramTypeId], paramName, p + 1);
             auto const paramId = static_cast<Id>(firstParamId + p);
+            debugId[paramId] = debugLocalVariableId;
 
             if (passByRef) {
                 makeDebugDeclare(debugLocalVariableId, paramId);
@@ -2664,38 +2238,38 @@ Id Builder::makeDebugFunction([[maybe_unused]] Function* function, Id nameId, Id
     assert(function != nullptr);
     assert(nameId != 0);
     assert(funcTypeId != 0);
-    assert(getDebugType(funcTypeId) != NoType);
+    assert(debugId[funcTypeId] != 0);
 
     Id funcId = getUniqueId();
-    auto type = new Instruction(funcId, makeVoidType(), Op::OpExtInst);
+    auto type = new Instruction(funcId, makeVoidType(), OpExtInst);
     type->reserveOperands(11);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugFunction);
     type->addIdOperand(nameId);
-    type->addIdOperand(getDebugType(funcTypeId));
+    type->addIdOperand(debugId[funcTypeId]);
     type->addIdOperand(makeDebugSource(currentFileId)); // TODO: This points to file of definition instead of declaration
     type->addIdOperand(makeUintConstant(currentLine)); // TODO: This points to line of definition instead of declaration
     type->addIdOperand(makeUintConstant(0)); // column
     type->addIdOperand(makeDebugCompilationUnit()); // scope
     type->addIdOperand(nameId); // linkage name
     type->addIdOperand(makeUintConstant(NonSemanticShaderDebugInfo100FlagIsPublic));
-    type->addIdOperand(makeUintConstant(currentLine));
+    type->addIdOperand(makeUintConstant(currentLine)); 
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
     module.mapInstruction(type);
     return funcId;
 }
 
-Id Builder::makeDebugLexicalBlock(uint32_t line, uint32_t column) {
+Id Builder::makeDebugLexicalBlock(uint32_t line) {
     assert(!currentDebugScopeId.empty());
 
     Id lexId = getUniqueId();
-    auto lex = new Instruction(lexId, makeVoidType(), Op::OpExtInst);
+    auto lex = new Instruction(lexId, makeVoidType(), OpExtInst);
     lex->reserveOperands(6);
     lex->addIdOperand(nonSemanticShaderDebugInfo);
     lex->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLexicalBlock);
     lex->addIdOperand(makeDebugSource(currentFileId));
     lex->addIdOperand(makeUintConstant(line));
-    lex->addIdOperand(makeUintConstant(column)); // column
+    lex->addIdOperand(makeUintConstant(0)); // column
     lex->addIdOperand(currentDebugScopeId.top()); // scope
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(lex));
     module.mapInstruction(lex);
@@ -2717,25 +2291,21 @@ std::string Builder::unmangleFunctionName(std::string const& name) const
 void Builder::makeReturn(bool implicit, Id retVal)
 {
     if (retVal) {
-        Instruction* inst = new Instruction(NoResult, NoType, Op::OpReturnValue);
+        Instruction* inst = new Instruction(NoResult, NoType, OpReturnValue);
         inst->addIdOperand(retVal);
         addInstruction(std::unique_ptr<Instruction>(inst));
     } else
-        addInstruction(std::unique_ptr<Instruction>(new Instruction(NoResult, NoType, Op::OpReturn)));
+        addInstruction(std::unique_ptr<Instruction>(new Instruction(NoResult, NoType, OpReturn)));
 
     if (! implicit)
         createAndSetNoPredecessorBlock("post-return");
 }
 
 // Comments in header
-void Builder::enterLexicalBlock(uint32_t line, uint32_t column)
+void Builder::enterLexicalBlock(uint32_t line)
 {
-    if (!emitNonSemanticShaderDebugInfo) {
-        return;
-    }
-
     // Generate new lexical scope debug instruction
-    Id lexId = makeDebugLexicalBlock(line, column);
+    Id lexId = makeDebugLexicalBlock(line);
     currentDebugScopeId.push(lexId);
     dirtyScopeTracker = true;
 }
@@ -2743,10 +2313,6 @@ void Builder::enterLexicalBlock(uint32_t line, uint32_t column)
 // Comments in header
 void Builder::leaveLexicalBlock()
 {
-    if (!emitNonSemanticShaderDebugInfo) {
-        return;
-    }
-
     // Pop current scope from stack and clear current scope
     currentDebugScopeId.pop();
     dirtyScopeTracker = true;
@@ -2755,34 +2321,31 @@ void Builder::leaveLexicalBlock()
 // Comments in header
 void Builder::enterFunction(Function const* function)
 {
-    currentFunction = function;
-
     // Save and disable debugInfo for HLSL entry point function. It is a wrapper
     // function with no user code in it.
     restoreNonSemanticShaderDebugInfo = emitNonSemanticShaderDebugInfo;
-    if (sourceLang == spv::SourceLanguage::HLSL && function == entryPointFunction) {
+    if (sourceLang == spv::SourceLanguageHLSL && function == entryPointFunction) {
         emitNonSemanticShaderDebugInfo = false;
     }
 
     if (emitNonSemanticShaderDebugInfo) {
         // Initialize scope state
         Id funcId = function->getFuncId();
-        Id debugFuncId = getDebugFunction(funcId);
-        currentDebugScopeId.push(debugFuncId);
+        currentDebugScopeId.push(debugId[funcId]);
         // Create DebugFunctionDefinition
         spv::Id resultId = getUniqueId();
-        Instruction* defInst = new Instruction(resultId, makeVoidType(), Op::OpExtInst);
+        Instruction* defInst = new Instruction(resultId, makeVoidType(), OpExtInst);
         defInst->reserveOperands(4);
         defInst->addIdOperand(nonSemanticShaderDebugInfo);
         defInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugFunctionDefinition);
-        defInst->addIdOperand(debugFuncId);
+        defInst->addIdOperand(debugId[funcId]);
         defInst->addIdOperand(funcId);
         addInstruction(std::unique_ptr<Instruction>(defInst));
     }
 
-    if (auto linkType = function->getLinkType(); linkType != LinkageType::Max) {
+    if (auto linkType = function->getLinkType(); linkType != LinkageTypeMax) {
         Id funcId = function->getFuncId();
-        addCapability(Capability::Linkage);
+        addCapability(CapabilityLinkage);
         addLinkageDecoration(funcId, function->getExportName(), linkType);
     }
 }
@@ -2808,9 +2371,6 @@ void Builder::leaveFunction()
         currentDebugScopeId.pop();
 
     emitNonSemanticShaderDebugInfo = restoreNonSemanticShaderDebugInfo;
-
-    // Clear current function record
-    currentFunction = nullptr;
 }
 
 // Comments in header
@@ -2830,51 +2390,41 @@ void Builder::makeStatementTerminator(spv::Op opcode, const std::vector<Id>& ope
     createAndSetNoPredecessorBlock(name);
 }
 
-void Builder::createConstVariable(Id type, const char* name, Id constant, bool isGlobal)
-{
-    if (emitNonSemanticShaderDebugInfo) {
-        Id debugType = getDebugType(type);
-        if (isGlobal) {
-            createDebugGlobalVariable(debugType, name, constant);
-        }
-        else {
-            auto debugLocal = createDebugLocalVariable(debugType, name);
-            makeDebugValue(debugLocal, constant);
-        }
-    }
-}
-
 // Comments in header
 Id Builder::createVariable(Decoration precision, StorageClass storageClass, Id type, const char* name, Id initializer,
     bool const compilerGenerated)
 {
     Id pointerType = makePointer(storageClass, type);
-    Instruction* inst = new Instruction(getUniqueId(), pointerType, Op::OpVariable);
+    Instruction* inst = new Instruction(getUniqueId(), pointerType, OpVariable);
     inst->addImmediateOperand(storageClass);
     if (initializer != NoResult)
         inst->addIdOperand(initializer);
 
-    if (storageClass == StorageClass::Function) {
+    switch (storageClass) {
+    case StorageClassFunction:
         // Validation rules require the declaration in the entry block
         buildPoint->getParent().addLocalVariable(std::unique_ptr<Instruction>(inst));
-    }
-    else {
-        constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(inst));
-        module.mapInstruction(inst);
-    }
 
-    if (emitNonSemanticShaderDebugInfo && !compilerGenerated)
-    {
-        // For debug info, we prefer respecting how the variable is declared in source code.
-        // We may emulate some local variables as global variable with private storage in SPIR-V, but we still want to
-        // treat them as local variables in debug info.
-        if (storageClass == StorageClass::Function || (currentFunction && storageClass == StorageClass::Private)) {
-            auto const debugLocalVariableId = createDebugLocalVariable(getDebugType(type), name);
+        if (emitNonSemanticShaderDebugInfo && !compilerGenerated)
+        {
+            auto const debugLocalVariableId = createDebugLocalVariable(debugId[type], name);
+            debugId[inst->getResultId()] = debugLocalVariableId;
+
             makeDebugDeclare(debugLocalVariableId, inst->getResultId());
         }
-        else {
-            createDebugGlobalVariable(getDebugType(type), name, inst->getResultId());
+
+        break;
+
+    default:
+        constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(inst));
+        module.mapInstruction(inst);
+
+        if (emitNonSemanticShaderDebugInfo)
+        {
+            auto const debugResultId = createDebugGlobalVariable(debugId[type], name, inst->getResultId());
+            debugId[inst->getResultId()] = debugResultId;
         }
+        break;
     }
 
     if (name)
@@ -2887,7 +2437,7 @@ Id Builder::createVariable(Decoration precision, StorageClass storageClass, Id t
 // Comments in header
 Id Builder::createUndefined(Id type)
 {
-  Instruction* inst = new Instruction(getUniqueId(), type, Op::OpUndef);
+  Instruction* inst = new Instruction(getUniqueId(), type, OpUndef);
   addInstruction(std::unique_ptr<Instruction>(inst));
   return inst->getResultId();
 }
@@ -2897,16 +2447,16 @@ spv::MemoryAccessMask Builder::sanitizeMemoryAccessForStorageClass(spv::MemoryAc
     const
 {
     switch (sc) {
-    case spv::StorageClass::Uniform:
-    case spv::StorageClass::Workgroup:
-    case spv::StorageClass::StorageBuffer:
-    case spv::StorageClass::PhysicalStorageBufferEXT:
+    case spv::StorageClassUniform:
+    case spv::StorageClassWorkgroup:
+    case spv::StorageClassStorageBuffer:
+    case spv::StorageClassPhysicalStorageBufferEXT:
         break;
     default:
         memoryAccess = spv::MemoryAccessMask(memoryAccess &
-                        ~(spv::MemoryAccessMask::MakePointerAvailableKHR |
-                          spv::MemoryAccessMask::MakePointerVisibleKHR |
-                          spv::MemoryAccessMask::NonPrivatePointerKHR));
+                        ~(spv::MemoryAccessMakePointerAvailableKHRMask |
+                          spv::MemoryAccessMakePointerVisibleKHRMask |
+                          spv::MemoryAccessNonPrivatePointerKHRMask));
         break;
     }
     return memoryAccess;
@@ -2916,19 +2466,19 @@ spv::MemoryAccessMask Builder::sanitizeMemoryAccessForStorageClass(spv::MemoryAc
 void Builder::createStore(Id rValue, Id lValue, spv::MemoryAccessMask memoryAccess, spv::Scope scope,
     unsigned int alignment)
 {
-    Instruction* store = new Instruction(Op::OpStore);
+    Instruction* store = new Instruction(OpStore);
     store->reserveOperands(2);
     store->addIdOperand(lValue);
     store->addIdOperand(rValue);
 
     memoryAccess = sanitizeMemoryAccessForStorageClass(memoryAccess, getStorageClass(lValue));
 
-    if (memoryAccess != MemoryAccessMask::MaskNone) {
+    if (memoryAccess != MemoryAccessMaskNone) {
         store->addImmediateOperand(memoryAccess);
-        if (anySet(memoryAccess, spv::MemoryAccessMask::Aligned)) {
+        if (memoryAccess & spv::MemoryAccessAlignedMask) {
             store->addImmediateOperand(alignment);
         }
-        if (anySet(memoryAccess, spv::MemoryAccessMask::MakePointerAvailableKHR)) {
+        if (memoryAccess & spv::MemoryAccessMakePointerAvailableKHRMask) {
             store->addIdOperand(makeUintConstant(scope));
         }
     }
@@ -2940,17 +2490,17 @@ void Builder::createStore(Id rValue, Id lValue, spv::MemoryAccessMask memoryAcce
 Id Builder::createLoad(Id lValue, spv::Decoration precision, spv::MemoryAccessMask memoryAccess,
     spv::Scope scope, unsigned int alignment)
 {
-    Instruction* load = new Instruction(getUniqueId(), getDerefTypeId(lValue), Op::OpLoad);
+    Instruction* load = new Instruction(getUniqueId(), getDerefTypeId(lValue), OpLoad);
     load->addIdOperand(lValue);
 
     memoryAccess = sanitizeMemoryAccessForStorageClass(memoryAccess, getStorageClass(lValue));
 
-    if (memoryAccess != MemoryAccessMask::MaskNone) {
+    if (memoryAccess != MemoryAccessMaskNone) {
         load->addImmediateOperand(memoryAccess);
-        if (anySet(memoryAccess, spv::MemoryAccessMask::Aligned)) {
+        if (memoryAccess & spv::MemoryAccessAlignedMask) {
             load->addImmediateOperand(alignment);
         }
-        if (anySet(memoryAccess, spv::MemoryAccessMask::MakePointerVisibleKHR)) {
+        if (memoryAccess & spv::MemoryAccessMakePointerVisibleKHRMask) {
             load->addIdOperand(makeUintConstant(scope));
         }
     }
@@ -2969,7 +2519,7 @@ Id Builder::createAccessChain(StorageClass storageClass, Id base, const std::vec
     typeId = makePointer(storageClass, typeId);
 
     // Make the instruction
-    Instruction* chain = new Instruction(getUniqueId(), typeId, Op::OpAccessChain);
+    Instruction* chain = new Instruction(getUniqueId(), typeId, OpAccessChain);
     chain->reserveOperands(offsets.size() + 1);
     chain->addIdOperand(base);
     for (int i = 0; i < (int)offsets.size(); ++i)
@@ -2979,10 +2529,10 @@ Id Builder::createAccessChain(StorageClass storageClass, Id base, const std::vec
     return chain->getResultId();
 }
 
-Id Builder::createArrayLength(Id base, unsigned int member, unsigned int bits)
+Id Builder::createArrayLength(Id base, unsigned int member)
 {
-    spv::Id intType = makeUintType(bits);
-    Instruction* length = new Instruction(getUniqueId(), intType, Op::OpArrayLength);
+    spv::Id intType = makeUintType(32);
+    Instruction* length = new Instruction(getUniqueId(), intType, OpArrayLength);
     length->reserveOperands(2);
     length->addIdOperand(base);
     length->addImmediateOperand(member);
@@ -2998,10 +2548,10 @@ Id Builder::createCooperativeMatrixLengthKHR(Id type)
     // Generate code for spec constants if in spec constant operation
     // generation mode.
     if (generatingOpCodeForSpecConst) {
-        return createSpecConstantOp(Op::OpCooperativeMatrixLengthKHR, intType, std::vector<Id>(1, type), std::vector<Id>());
+        return createSpecConstantOp(OpCooperativeMatrixLengthKHR, intType, std::vector<Id>(1, type), std::vector<Id>());
     }
 
-    Instruction* length = new Instruction(getUniqueId(), intType, Op::OpCooperativeMatrixLengthKHR);
+    Instruction* length = new Instruction(getUniqueId(), intType, OpCooperativeMatrixLengthKHR);
     length->addIdOperand(type);
     addInstruction(std::unique_ptr<Instruction>(length));
 
@@ -3015,10 +2565,10 @@ Id Builder::createCooperativeMatrixLengthNV(Id type)
     // Generate code for spec constants if in spec constant operation
     // generation mode.
     if (generatingOpCodeForSpecConst) {
-        return createSpecConstantOp(Op::OpCooperativeMatrixLengthNV, intType, std::vector<Id>(1, type), std::vector<Id>());
+        return createSpecConstantOp(OpCooperativeMatrixLengthNV, intType, std::vector<Id>(1, type), std::vector<Id>());
     }
 
-    Instruction* length = new Instruction(getUniqueId(), intType, Op::OpCooperativeMatrixLengthNV);
+    Instruction* length = new Instruction(getUniqueId(), intType, OpCooperativeMatrixLengthNV);
     length->addIdOperand(type);
     addInstruction(std::unique_ptr<Instruction>(length));
 
@@ -3030,10 +2580,10 @@ Id Builder::createCompositeExtract(Id composite, Id typeId, unsigned index)
     // Generate code for spec constants if in spec constant operation
     // generation mode.
     if (generatingOpCodeForSpecConst) {
-        return createSpecConstantOp(Op::OpCompositeExtract, typeId, std::vector<Id>(1, composite),
+        return createSpecConstantOp(OpCompositeExtract, typeId, std::vector<Id>(1, composite),
             std::vector<Id>(1, index));
     }
-    Instruction* extract = new Instruction(getUniqueId(), typeId, Op::OpCompositeExtract);
+    Instruction* extract = new Instruction(getUniqueId(), typeId, OpCompositeExtract);
     extract->reserveOperands(2);
     extract->addIdOperand(composite);
     extract->addImmediateOperand(index);
@@ -3047,9 +2597,9 @@ Id Builder::createCompositeExtract(Id composite, Id typeId, const std::vector<un
     // Generate code for spec constants if in spec constant operation
     // generation mode.
     if (generatingOpCodeForSpecConst) {
-        return createSpecConstantOp(Op::OpCompositeExtract, typeId, std::vector<Id>(1, composite), indexes);
+        return createSpecConstantOp(OpCompositeExtract, typeId, std::vector<Id>(1, composite), indexes);
     }
-    Instruction* extract = new Instruction(getUniqueId(), typeId, Op::OpCompositeExtract);
+    Instruction* extract = new Instruction(getUniqueId(), typeId, OpCompositeExtract);
     extract->reserveOperands(indexes.size() + 1);
     extract->addIdOperand(composite);
     for (int i = 0; i < (int)indexes.size(); ++i)
@@ -3061,7 +2611,7 @@ Id Builder::createCompositeExtract(Id composite, Id typeId, const std::vector<un
 
 Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, unsigned index)
 {
-    Instruction* insert = new Instruction(getUniqueId(), typeId, Op::OpCompositeInsert);
+    Instruction* insert = new Instruction(getUniqueId(), typeId, OpCompositeInsert);
     insert->reserveOperands(3);
     insert->addIdOperand(object);
     insert->addIdOperand(composite);
@@ -3073,7 +2623,7 @@ Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, unsigned i
 
 Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, const std::vector<unsigned>& indexes)
 {
-    Instruction* insert = new Instruction(getUniqueId(), typeId, Op::OpCompositeInsert);
+    Instruction* insert = new Instruction(getUniqueId(), typeId, OpCompositeInsert);
     insert->reserveOperands(indexes.size() + 2);
     insert->addIdOperand(object);
     insert->addIdOperand(composite);
@@ -3086,7 +2636,7 @@ Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, const std:
 
 Id Builder::createVectorExtractDynamic(Id vector, Id typeId, Id componentIndex)
 {
-    Instruction* extract = new Instruction(getUniqueId(), typeId, Op::OpVectorExtractDynamic);
+    Instruction* extract = new Instruction(getUniqueId(), typeId, OpVectorExtractDynamic);
     extract->reserveOperands(2);
     extract->addIdOperand(vector);
     extract->addIdOperand(componentIndex);
@@ -3097,7 +2647,7 @@ Id Builder::createVectorExtractDynamic(Id vector, Id typeId, Id componentIndex)
 
 Id Builder::createVectorInsertDynamic(Id vector, Id typeId, Id component, Id componentIndex)
 {
-    Instruction* insert = new Instruction(getUniqueId(), typeId, Op::OpVectorInsertDynamic);
+    Instruction* insert = new Instruction(getUniqueId(), typeId, OpVectorInsertDynamic);
     insert->reserveOperands(3);
     insert->addIdOperand(vector);
     insert->addIdOperand(component);
@@ -3149,7 +2699,7 @@ void Builder::createNoResultOp(Op opCode, const std::vector<IdImmediate>& operan
 
 void Builder::createControlBarrier(Scope execution, Scope memory, MemorySemanticsMask semantics)
 {
-    Instruction* op = new Instruction(Op::OpControlBarrier);
+    Instruction* op = new Instruction(OpControlBarrier);
     op->reserveOperands(3);
     op->addIdOperand(makeUintConstant(execution));
     op->addIdOperand(makeUintConstant(memory));
@@ -3157,12 +2707,12 @@ void Builder::createControlBarrier(Scope execution, Scope memory, MemorySemantic
     addInstruction(std::unique_ptr<Instruction>(op));
 }
 
-void Builder::createMemoryBarrier(Scope executionScope, MemorySemanticsMask memorySemantics)
+void Builder::createMemoryBarrier(unsigned executionScope, unsigned memorySemantics)
 {
-    Instruction* op = new Instruction(Op::OpMemoryBarrier);
+    Instruction* op = new Instruction(OpMemoryBarrier);
     op->reserveOperands(2);
-    op->addIdOperand(makeUintConstant((unsigned)executionScope));
-    op->addIdOperand(makeUintConstant((unsigned)memorySemantics));
+    op->addIdOperand(makeUintConstant(executionScope));
+    op->addIdOperand(makeUintConstant(memorySemantics));
     addInstruction(std::unique_ptr<Instruction>(op));
 }
 
@@ -3250,7 +2800,7 @@ Id Builder::createOp(Op opCode, Id typeId, const std::vector<IdImmediate>& opera
 Id Builder::createSpecConstantOp(Op opCode, Id typeId, const std::vector<Id>& operands,
     const std::vector<unsigned>& literals)
 {
-    Instruction* op = new Instruction(getUniqueId(), typeId, Op::OpSpecConstantOp);
+    Instruction* op = new Instruction(getUniqueId(), typeId, OpSpecConstantOp);
     op->reserveOperands(operands.size() + literals.size() + 1);
     op->addImmediateOperand((unsigned) opCode);
     for (auto it = operands.cbegin(); it != operands.cend(); ++it)
@@ -3261,19 +2811,19 @@ Id Builder::createSpecConstantOp(Op opCode, Id typeId, const std::vector<Id>& op
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(op));
 
     // OpSpecConstantOp's using 8 or 16 bit types require the associated capability
-    if (containsType(typeId, Op::OpTypeInt, 8))
-        addCapability(Capability::Int8);
-    if (containsType(typeId, Op::OpTypeInt, 16))
-        addCapability(Capability::Int16);
-    if (containsType(typeId, Op::OpTypeFloat, 16))
-        addCapability(Capability::Float16);
+    if (containsType(typeId, OpTypeInt, 8))
+        addCapability(CapabilityInt8);
+    if (containsType(typeId, OpTypeInt, 16))
+        addCapability(CapabilityInt16);
+    if (containsType(typeId, OpTypeFloat, 16))
+        addCapability(CapabilityFloat16);
 
     return op->getResultId();
 }
 
 Id Builder::createFunctionCall(spv::Function* function, const std::vector<spv::Id>& args)
 {
-    Instruction* op = new Instruction(getUniqueId(), function->getReturnType(), Op::OpFunctionCall);
+    Instruction* op = new Instruction(getUniqueId(), function->getReturnType(), OpFunctionCall);
     op->reserveOperands(args.size() + 1);
     op->addIdOperand(function->getId());
     for (int a = 0; a < (int)args.size(); ++a)
@@ -3292,9 +2842,9 @@ Id Builder::createRvalueSwizzle(Decoration precision, Id typeId, Id source, cons
     if (generatingOpCodeForSpecConst) {
         std::vector<Id> operands(2);
         operands[0] = operands[1] = source;
-        return setPrecision(createSpecConstantOp(Op::OpVectorShuffle, typeId, operands, channels), precision);
+        return setPrecision(createSpecConstantOp(OpVectorShuffle, typeId, operands, channels), precision);
     }
-    Instruction* swizzle = new Instruction(getUniqueId(), typeId, Op::OpVectorShuffle);
+    Instruction* swizzle = new Instruction(getUniqueId(), typeId, OpVectorShuffle);
     assert(isVector(source));
     swizzle->reserveOperands(channels.size() + 2);
     swizzle->addIdOperand(source);
@@ -3312,13 +2862,13 @@ Id Builder::createLvalueSwizzle(Id typeId, Id target, Id source, const std::vect
     if (channels.size() == 1 && getNumComponents(source) == 1)
         return createCompositeInsert(source, target, typeId, channels.front());
 
-    Instruction* swizzle = new Instruction(getUniqueId(), typeId, Op::OpVectorShuffle);
+    Instruction* swizzle = new Instruction(getUniqueId(), typeId, OpVectorShuffle);
 
     assert(isVector(target));
     swizzle->reserveOperands(2);
     swizzle->addIdOperand(target);
 
-    assert(getNumComponents(source) == channels.size());
+    assert(getNumComponents(source) == (int)channels.size());
     assert(isVector(source));
     swizzle->addIdOperand(source);
 
@@ -3361,7 +2911,7 @@ Id Builder::smearScalar(Decoration precision, Id scalar, Id vectorType)
     assert(getTypeId(scalar) == getScalarTypeId(vectorType));
 
     int numComponents = getNumTypeComponents(vectorType);
-    if (numComponents == 1 && !isCooperativeVectorType(vectorType))
+    if (numComponents == 1)
         return scalar;
 
     Instruction* smear = nullptr;
@@ -3378,17 +2928,7 @@ Id Builder::smearScalar(Decoration precision, Id scalar, Id vectorType)
         auto result_id = makeCompositeConstant(vectorType, members, isSpecConstant(scalar));
         smear = module.getInstruction(result_id);
     } else {
-        bool replicate = (useReplicatedComposites || isCooperativeVectorType(vectorType)) && (numComponents > 0);
-
-        if (replicate) {
-            numComponents = 1;
-            addCapability(spv::Capability::ReplicatedCompositesEXT);
-            addExtension(spv::E_SPV_EXT_replicated_composites);
-        }
-
-        Op opcode = replicate ? Op::OpCompositeConstructReplicateEXT : Op::OpCompositeConstruct;
-
-        smear = new Instruction(getUniqueId(), vectorType, opcode);
+        smear = new Instruction(getUniqueId(), vectorType, OpCompositeConstruct);
         smear->reserveOperands(numComponents);
         for (int c = 0; c < numComponents; ++c)
             smear->addIdOperand(scalar);
@@ -3401,7 +2941,7 @@ Id Builder::smearScalar(Decoration precision, Id scalar, Id vectorType)
 // Comments in header
 Id Builder::createBuiltinCall(Id resultType, Id builtins, int entryPoint, const std::vector<Id>& args)
 {
-    Instruction* inst = new Instruction(getUniqueId(), resultType, Op::OpExtInst);
+    Instruction* inst = new Instruction(getUniqueId(), resultType, OpExtInst);
     inst->reserveOperands(args.size() + 2);
     inst->addIdOperand(builtins);
     inst->addImmediateOperand(entryPoint);
@@ -3440,139 +2980,132 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
     // Set up the optional arguments
     //
     size_t optArgNum = texArgs.size(); // the position of the mask for the optional arguments, if any.
-    ImageOperandsMask mask = ImageOperandsMask::MaskNone; // the mask operand
+    ImageOperandsMask mask = ImageOperandsMaskNone; // the mask operand
     if (parameters.bias) {
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::Bias);
+        mask = (ImageOperandsMask)(mask | ImageOperandsBiasMask);
         texArgs.push_back(parameters.bias);
     }
     if (parameters.lod) {
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::Lod);
+        mask = (ImageOperandsMask)(mask | ImageOperandsLodMask);
         texArgs.push_back(parameters.lod);
         explicitLod = true;
     } else if (parameters.gradX) {
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::Grad);
+        mask = (ImageOperandsMask)(mask | ImageOperandsGradMask);
         texArgs.push_back(parameters.gradX);
         texArgs.push_back(parameters.gradY);
         explicitLod = true;
     } else if (noImplicitLod && ! fetch && ! gather) {
         // have to explicitly use lod of 0 if not allowed to have them be implicit, and
         // we would otherwise be about to issue an implicit instruction
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::Lod);
+        mask = (ImageOperandsMask)(mask | ImageOperandsLodMask);
         texArgs.push_back(makeFloatConstant(0.0));
         explicitLod = true;
     }
     if (parameters.offset) {
         if (isConstant(parameters.offset))
-            mask = (ImageOperandsMask)(mask | ImageOperandsMask::ConstOffset);
+            mask = (ImageOperandsMask)(mask | ImageOperandsConstOffsetMask);
         else {
-            addCapability(Capability::ImageGatherExtended);
-            mask = (ImageOperandsMask)(mask | ImageOperandsMask::Offset);
+            addCapability(CapabilityImageGatherExtended);
+            mask = (ImageOperandsMask)(mask | ImageOperandsOffsetMask);
         }
         texArgs.push_back(parameters.offset);
     }
     if (parameters.offsets) {
-        if (!isConstant(parameters.offsets) && sourceLang == spv::SourceLanguage::GLSL) {
-            mask = (ImageOperandsMask)(mask | ImageOperandsMask::Offsets);
-        } else {
-            addCapability(Capability::ImageGatherExtended);
-            mask = (ImageOperandsMask)(mask | ImageOperandsMask::ConstOffsets);
-        }
+        addCapability(CapabilityImageGatherExtended);
+        mask = (ImageOperandsMask)(mask | ImageOperandsConstOffsetsMask);
         texArgs.push_back(parameters.offsets);
     }
     if (parameters.sample) {
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::Sample);
+        mask = (ImageOperandsMask)(mask | ImageOperandsSampleMask);
         texArgs.push_back(parameters.sample);
     }
     if (parameters.lodClamp) {
         // capability if this bit is used
-        addCapability(Capability::MinLod);
+        addCapability(CapabilityMinLod);
 
-        mask = (ImageOperandsMask)(mask | ImageOperandsMask::MinLod);
+        mask = (ImageOperandsMask)(mask | ImageOperandsMinLodMask);
         texArgs.push_back(parameters.lodClamp);
     }
     if (parameters.nonprivate) {
-        mask = mask | ImageOperandsMask::NonPrivateTexelKHR;
+        mask = mask | ImageOperandsNonPrivateTexelKHRMask;
     }
     if (parameters.volatil) {
-        mask = mask | ImageOperandsMask::VolatileTexelKHR;
-    }
-    if (parameters.nontemporal) {
-        mask = mask | ImageOperandsMask::Nontemporal;
+        mask = mask | ImageOperandsVolatileTexelKHRMask;
     }
     mask = mask | signExtensionMask;
     // insert the operand for the mask, if any bits were set.
-    if (mask != ImageOperandsMask::MaskNone)
-        texArgs.insert(texArgs.begin() + optArgNum, (Id)mask);
+    if (mask != ImageOperandsMaskNone)
+        texArgs.insert(texArgs.begin() + optArgNum, mask);
 
     //
     // Set up the instruction
     //
-    Op opCode = Op::OpNop;  // All paths below need to set this
+    Op opCode = OpNop;  // All paths below need to set this
     if (fetch) {
         if (sparse)
-            opCode = Op::OpImageSparseFetch;
+            opCode = OpImageSparseFetch;
         else
-            opCode = Op::OpImageFetch;
+            opCode = OpImageFetch;
     } else if (parameters.granularity && parameters.coarse) {
-        opCode = Op::OpImageSampleFootprintNV;
+        opCode = OpImageSampleFootprintNV;
     } else if (gather) {
         if (parameters.Dref)
             if (sparse)
-                opCode = Op::OpImageSparseDrefGather;
+                opCode = OpImageSparseDrefGather;
             else
-                opCode = Op::OpImageDrefGather;
+                opCode = OpImageDrefGather;
         else
             if (sparse)
-                opCode = Op::OpImageSparseGather;
+                opCode = OpImageSparseGather;
             else
-                opCode = Op::OpImageGather;
+                opCode = OpImageGather;
     } else if (explicitLod) {
         if (parameters.Dref) {
             if (proj)
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleProjDrefExplicitLod;
+                    opCode = OpImageSparseSampleProjDrefExplicitLod;
                 else
-                    opCode = Op::OpImageSampleProjDrefExplicitLod;
+                    opCode = OpImageSampleProjDrefExplicitLod;
             else
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleDrefExplicitLod;
+                    opCode = OpImageSparseSampleDrefExplicitLod;
                 else
-                    opCode = Op::OpImageSampleDrefExplicitLod;
+                    opCode = OpImageSampleDrefExplicitLod;
         } else {
             if (proj)
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleProjExplicitLod;
+                    opCode = OpImageSparseSampleProjExplicitLod;
                 else
-                    opCode = Op::OpImageSampleProjExplicitLod;
+                    opCode = OpImageSampleProjExplicitLod;
             else
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleExplicitLod;
+                    opCode = OpImageSparseSampleExplicitLod;
                 else
-                    opCode = Op::OpImageSampleExplicitLod;
+                    opCode = OpImageSampleExplicitLod;
         }
     } else {
         if (parameters.Dref) {
             if (proj)
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleProjDrefImplicitLod;
+                    opCode = OpImageSparseSampleProjDrefImplicitLod;
                 else
-                    opCode = Op::OpImageSampleProjDrefImplicitLod;
+                    opCode = OpImageSampleProjDrefImplicitLod;
             else
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleDrefImplicitLod;
+                    opCode = OpImageSparseSampleDrefImplicitLod;
                 else
-                    opCode = Op::OpImageSampleDrefImplicitLod;
+                    opCode = OpImageSampleDrefImplicitLod;
         } else {
             if (proj)
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleProjImplicitLod;
+                    opCode = OpImageSparseSampleProjImplicitLod;
                 else
-                    opCode = Op::OpImageSampleProjImplicitLod;
+                    opCode = OpImageSampleProjImplicitLod;
             else
                 if (sparse)
-                    opCode = Op::OpImageSparseSampleImplicitLod;
+                    opCode = OpImageSparseSampleImplicitLod;
                 else
-                    opCode = Op::OpImageSampleImplicitLod;
+                    opCode = OpImageSampleImplicitLod;
         }
     }
 
@@ -3582,10 +3115,10 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
     Id smearedType = resultType;
     if (! isScalarType(resultType)) {
         switch (opCode) {
-        case Op::OpImageSampleDrefImplicitLod:
-        case Op::OpImageSampleDrefExplicitLod:
-        case Op::OpImageSampleProjDrefImplicitLod:
-        case Op::OpImageSampleProjDrefExplicitLod:
+        case OpImageSampleDrefImplicitLod:
+        case OpImageSampleDrefExplicitLod:
+        case OpImageSampleProjDrefImplicitLod:
+        case OpImageSampleProjDrefExplicitLod:
             resultType = getScalarTypeId(resultType);
             break;
         default:
@@ -3618,7 +3151,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
 
     if (sparse) {
         // set capability
-        addCapability(Capability::SparseResidency);
+        addCapability(CapabilitySparseResidency);
 
         // Decode the return type that was a special structure
         createStore(createCompositeExtract(resultId, typeId1, 1), parameters.texelOut);
@@ -3640,22 +3173,22 @@ Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameter
     // Figure out the result type
     Id resultType = 0;
     switch (opCode) {
-    case Op::OpImageQuerySize:
-    case Op::OpImageQuerySizeLod:
+    case OpImageQuerySize:
+    case OpImageQuerySizeLod:
     {
         int numComponents = 0;
         switch (getTypeDimensionality(getImageType(parameters.sampler))) {
-        case Dim::Dim1D:
-        case Dim::Buffer:
+        case Dim1D:
+        case DimBuffer:
             numComponents = 1;
             break;
-        case Dim::Dim2D:
-        case Dim::Cube:
-        case Dim::Rect:
-        case Dim::SubpassData:
+        case Dim2D:
+        case DimCube:
+        case DimRect:
+        case DimSubpassData:
             numComponents = 2;
             break;
-        case Dim::Dim3D:
+        case Dim3D:
             numComponents = 3;
             break;
 
@@ -3674,11 +3207,11 @@ Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameter
 
         break;
     }
-    case Op::OpImageQueryLod:
+    case OpImageQueryLod:
         resultType = makeVectorType(getScalarTypeId(getTypeId(parameters.coords)), 2);
         break;
-    case Op::OpImageQueryLevels:
-    case Op::OpImageQuerySamples:
+    case OpImageQueryLevels:
+    case OpImageQuerySamples:
         resultType = isUnsignedResult ? makeUintType(32) : makeIntType(32);
         break;
     default:
@@ -3693,7 +3226,7 @@ Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameter
     if (parameters.lod)
         query->addIdOperand(parameters.lod);
     addInstruction(std::unique_ptr<Instruction>(query));
-    addCapability(Capability::ImageQuery);
+    addCapability(CapabilityImageQuery);
 
     return query->getResultId();
 }
@@ -3717,15 +3250,15 @@ Id Builder::createCompositeCompare(Decoration precision, Id value1, Id value2, b
         // to figure out what it is.
         Op op;
         switch (getMostBasicTypeClass(valueType)) {
-        case Op::OpTypeFloat:
-            op = equal ? Op::OpFOrdEqual : Op::OpFUnordNotEqual;
+        case OpTypeFloat:
+            op = equal ? OpFOrdEqual : OpFUnordNotEqual;
             break;
-        case Op::OpTypeInt:
+        case OpTypeInt:
         default:
-            op = equal ? Op::OpIEqual : Op::OpINotEqual;
+            op = equal ? OpIEqual : OpINotEqual;
             break;
-        case Op::OpTypeBool:
-            op = equal ? Op::OpLogicalEqual : Op::OpLogicalNotEqual;
+        case OpTypeBool:
+            op = equal ? OpLogicalEqual : OpLogicalNotEqual;
             precision = NoPrecision;
             break;
         }
@@ -3738,7 +3271,7 @@ Id Builder::createCompositeCompare(Decoration precision, Id value1, Id value2, b
             resultId = createBinOp(op, makeVectorType(boolType, numConstituents), value1, value2);
             setPrecision(resultId, precision);
             // reduce vector compares...
-            resultId = createUnaryOp(equal ? Op::OpAll : Op::OpAny, boolType, resultId);
+            resultId = createUnaryOp(equal ? OpAll : OpAny, boolType, resultId);
         }
 
         return setPrecision(resultId, precision);
@@ -3761,7 +3294,7 @@ Id Builder::createCompositeCompare(Decoration precision, Id value1, Id value2, b
         if (constituent == 0)
             resultId = subResultId;
         else
-            resultId = setPrecision(createBinOp(equal ? Op::OpLogicalAnd : Op::OpLogicalOr, boolType, resultId, subResultId),
+            resultId = setPrecision(createBinOp(equal ? OpLogicalAnd : OpLogicalOr, boolType, resultId, subResultId),
                                     precision);
     }
 
@@ -3772,8 +3305,7 @@ Id Builder::createCompositeCompare(Decoration precision, Id value1, Id value2, b
 Id Builder::createCompositeConstruct(Id typeId, const std::vector<Id>& constituents)
 {
     assert(isAggregateType(typeId) || (getNumTypeConstituents(typeId) > 1 &&
-           getNumTypeConstituents(typeId) == constituents.size()) ||
-           (isCooperativeVectorType(typeId) && constituents.size() == 1));
+           getNumTypeConstituents(typeId) == (int)constituents.size()));
 
     if (generatingOpCodeForSpecConst) {
         // Sometime, even in spec-constant-op mode, the constant composite to be
@@ -3789,66 +3321,15 @@ Id Builder::createCompositeConstruct(Id typeId, const std::vector<Id>& constitue
                                                  [&](spv::Id id) { return isSpecConstant(id); }));
     }
 
-    bool replicate = false;
-    size_t numConstituents = constituents.size();
-
-    if (useReplicatedComposites || isCooperativeVectorType(typeId)) {
-        replicate = numConstituents > 0 &&
-            std::equal(constituents.begin() + 1, constituents.end(), constituents.begin());
-    }
-
-    if (replicate) {
-        numConstituents = 1;
-        addCapability(spv::Capability::ReplicatedCompositesEXT);
-        addExtension(spv::E_SPV_EXT_replicated_composites);
-    }
-
-    Op opcode = replicate ? Op::OpCompositeConstructReplicateEXT : Op::OpCompositeConstruct;
-
-    Instruction* op = new Instruction(getUniqueId(), typeId, opcode);
+    Instruction* op = new Instruction(getUniqueId(), typeId, OpCompositeConstruct);
     op->reserveOperands(constituents.size());
-    for (size_t c = 0; c < numConstituents; ++c)
+    for (int c = 0; c < (int)constituents.size(); ++c)
         op->addIdOperand(constituents[c]);
     addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
 
-// coopmat conversion
-Id Builder::createCooperativeMatrixConversion(Id typeId, Id source)
-{
-    Instruction* op = new Instruction(getUniqueId(), typeId, Op::OpCooperativeMatrixConvertNV);
-    op->addIdOperand(source);
-    addInstruction(std::unique_ptr<Instruction>(op));
-
-    return op->getResultId();
-}
-
-// coopmat reduce
-Id Builder::createCooperativeMatrixReduce(Op opcode, Id typeId, Id source, unsigned int mask, Id func)
-{
-    Instruction* op = new Instruction(getUniqueId(), typeId, opcode);
-    op->addIdOperand(source);
-    op->addImmediateOperand(mask);
-    op->addIdOperand(func);
-    addInstruction(std::unique_ptr<Instruction>(op));
-
-    return op->getResultId();
-}
-
-// coopmat per-element operation
-Id Builder::createCooperativeMatrixPerElementOp(Id typeId, const std::vector<Id>& operands)
-{
-    Instruction* op = new Instruction(getUniqueId(), typeId, spv::Op::OpCooperativeMatrixPerElementOpNV);
-    // skip operand[0], which is where the result is stored
-    for (uint32_t i = 1; i < operands.size(); ++i) {
-        op->addIdOperand(operands[i]);
-    }
-    addInstruction(std::unique_ptr<Instruction>(op));
-
-    return op->getResultId();
-}
-
 // Vector or scalar constructor
 Id Builder::createConstructor(Decoration precision, const std::vector<Id>& sources, Id resultTypeId)
 {
@@ -3858,15 +3339,9 @@ Id Builder::createConstructor(Decoration precision, const std::vector<Id>& sourc
 
     // Special case: when calling a vector constructor with a single scalar
     // argument, smear the scalar
-    if (sources.size() == 1 && isScalar(sources[0]) && (numTargetComponents > 1 || isCooperativeVectorType(resultTypeId)))
+    if (sources.size() == 1 && isScalar(sources[0]) && numTargetComponents > 1)
         return smearScalar(precision, sources[0], resultTypeId);
 
-    // Special case: 2 vectors of equal size
-    if (sources.size() == 1 && isVector(sources[0]) && numTargetComponents == getNumComponents(sources[0])) {
-        assert(resultTypeId == getTypeId(sources[0]));
-        return sources[0];
-    }
-
     // accumulate the arguments for OpCompositeConstruct
     std::vector<Id> constituents;
     Id scalarTypeId = getScalarTypeId(resultTypeId);
@@ -3901,8 +3376,8 @@ Id Builder::createConstructor(Decoration precision, const std::vector<Id>& sourc
         if (sourcesToUse + targetComponent > numTargetComponents)
             sourcesToUse = numTargetComponents - targetComponent;
 
-        unsigned int col = 0;
-        unsigned int row = 0;
+        int col = 0;
+        int row = 0;
         for (unsigned int s = 0; s < sourcesToUse; ++s) {
             if (row >= getNumRows(sourceArg)) {
                 row = 0;
@@ -3922,7 +3397,7 @@ Id Builder::createConstructor(Decoration precision, const std::vector<Id>& sourc
 
         if (isScalar(sources[i]) || isPointer(sources[i]))
             latchResult(sources[i]);
-        else if (isVector(sources[i]) || isCooperativeVector(sources[i]))
+        else if (isVector(sources[i]))
             accumulateVectorConstituents(sources[i]);
         else if (isMatrix(sources[i]))
             accumulateMatrixConstituents(sources[i]);
@@ -3947,8 +3422,8 @@ Id Builder::createConstructor(Decoration precision, const std::vector<Id>& sourc
 Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>& sources, Id resultTypeId)
 {
     Id componentTypeId = getScalarTypeId(resultTypeId);
-    unsigned int numCols = getTypeNumColumns(resultTypeId);
-    unsigned int numRows = getTypeNumRows(resultTypeId);
+    int numCols = getTypeNumColumns(resultTypeId);
+    int numRows = getTypeNumRows(resultTypeId);
 
     Instruction* instr = module.getInstruction(componentTypeId);
     const unsigned bitCount = instr->getImmediateOperand(0);
@@ -3963,11 +3438,11 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
         Id sourceColumnTypeId = getContainedTypeId(getTypeId(matrix));
 
         std::vector<unsigned> channels;
-        for (unsigned int row = 0; row < numRows; ++row)
+        for (int row = 0; row < numRows; ++row)
             channels.push_back(row);
 
         std::vector<Id> matrixColumns;
-        for (unsigned int col = 0; col < numCols; ++col) {
+        for (int col = 0; col < numCols; ++col) {
             std::vector<unsigned> indexes;
             indexes.push_back(col);
             Id colv = createCompositeExtract(matrix, sourceColumnTypeId, indexes);
@@ -3983,13 +3458,6 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
         return setPrecision(createCompositeConstruct(resultTypeId, matrixColumns), precision);
     }
 
-    // Detect a matrix being constructed from a repeated vector of the correct size.
-    // Create the composite directly from it.
-    if (sources.size() == numCols && isVector(sources[0]) && getNumComponents(sources[0]) == numRows &&
-        std::equal(sources.begin() + 1, sources.end(), sources.begin())) {
-        return setPrecision(createCompositeConstruct(resultTypeId, sources), precision);
-    }
-
     // Otherwise, will use a two step process
     // 1. make a compile-time 2D array of values
     // 2. construct a matrix from that array
@@ -4017,12 +3485,12 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
     } else if (isMatrix(sources[0])) {
         // constructing from another matrix; copy over the parts that exist in both the argument and constructee
         Id matrix = sources[0];
-        unsigned int minCols = std::min(numCols, getNumColumns(matrix));
-        unsigned int minRows = std::min(numRows, getNumRows(matrix));
-        for (unsigned int col = 0; col < minCols; ++col) {
+        int minCols = std::min(numCols, getNumColumns(matrix));
+        int minRows = std::min(numRows, getNumRows(matrix));
+        for (int col = 0; col < minCols; ++col) {
             std::vector<unsigned> indexes;
             indexes.push_back(col);
-            for (unsigned int row = 0; row < minRows; ++row) {
+            for (int row = 0; row < minRows; ++row) {
                 indexes.push_back(row);
                 ids[col][row] = createCompositeExtract(matrix, componentTypeId, indexes);
                 indexes.pop_back();
@@ -4031,12 +3499,12 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
         }
     } else {
         // fill in the matrix in column-major order with whatever argument components are available
-        unsigned int row = 0;
-        unsigned int col = 0;
+        int row = 0;
+        int col = 0;
 
-        for (unsigned int arg = 0; arg < sources.size() && col < numCols; ++arg) {
+        for (int arg = 0; arg < (int)sources.size() && col < numCols; ++arg) {
             Id argComp = sources[arg];
-            for (unsigned int comp = 0; comp < getNumComponents(sources[arg]); ++comp) {
+            for (int comp = 0; comp < getNumComponents(sources[arg]); ++comp) {
                 if (getNumComponents(sources[arg]) > 1) {
                     argComp = createCompositeExtract(sources[arg], componentTypeId, comp);
                     setPrecision(argComp, precision);
@@ -4060,9 +3528,9 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
     // make the column vectors
     Id columnTypeId = getContainedTypeId(resultTypeId);
     std::vector<Id> matrixColumns;
-    for (unsigned int col = 0; col < numCols; ++col) {
+    for (int col = 0; col < numCols; ++col) {
         std::vector<Id> vectorComponents;
-        for (unsigned int row = 0; row < numRows; ++row)
+        for (int row = 0; row < numRows; ++row)
             vectorComponents.push_back(ids[col][row]);
         Id column = createCompositeConstruct(columnTypeId, vectorComponents);
         setPrecision(column, precision);
@@ -4074,7 +3542,7 @@ Id Builder::createMatrixConstructor(Decoration precision, const std::vector<Id>&
 }
 
 // Comments in header
-Builder::If::If(Id cond, SelectionControlMask ctrl, Builder& gb) :
+Builder::If::If(Id cond, unsigned int ctrl, Builder& gb) :
     builder(gb),
     condition(cond),
     control(ctrl),
@@ -4091,7 +3559,6 @@ Builder::If::If(Id cond, SelectionControlMask ctrl, Builder& gb) :
     // Save the current block, so that we can add in the flow control split when
     // makeEndIf is called.
     headerBlock = builder.getBuildPoint();
-    builder.createSelectionMerge(mergeBlock, control);
 
     function->addBlock(thenBlock);
     builder.setBuildPoint(thenBlock);
@@ -4101,7 +3568,7 @@ Builder::If::If(Id cond, SelectionControlMask ctrl, Builder& gb) :
 void Builder::If::makeBeginElse()
 {
     // Close out the "then" by having it jump to the mergeBlock
-    builder.createBranch(true, mergeBlock);
+    builder.createBranch(mergeBlock);
 
     // Make the first else block and add it to the function
     elseBlock = new Block(builder.getUniqueId(), *function);
@@ -4115,10 +3582,11 @@ void Builder::If::makeBeginElse()
 void Builder::If::makeEndIf()
 {
     // jump to the merge block
-    builder.createBranch(true, mergeBlock);
+    builder.createBranch(mergeBlock);
 
     // Go back to the headerBlock and make the flow control split
     builder.setBuildPoint(headerBlock);
+    builder.createSelectionMerge(mergeBlock, control);
     if (elseBlock)
         builder.createConditionalBranch(condition, thenBlock, elseBlock);
     else
@@ -4130,7 +3598,7 @@ void Builder::If::makeEndIf()
 }
 
 // Comments in header
-void Builder::makeSwitch(Id selector, SelectionControlMask control, int numSegments, const std::vector<int>& caseValues,
+void Builder::makeSwitch(Id selector, unsigned int control, int numSegments, const std::vector<int>& caseValues,
                          const std::vector<int>& valueIndexToSegment, int defaultSegment,
                          std::vector<Block*>& segmentBlocks)
 {
@@ -4146,7 +3614,7 @@ void Builder::makeSwitch(Id selector, SelectionControlMask control, int numSegme
     createSelectionMerge(mergeBlock, control);
 
     // make the switch instruction
-    Instruction* switchInst = new Instruction(NoResult, NoType, Op::OpSwitch);
+    Instruction* switchInst = new Instruction(NoResult, NoType, OpSwitch);
     switchInst->reserveOperands((caseValues.size() * 2) + 2);
     switchInst->addIdOperand(selector);
     auto defaultOrMerge = (defaultSegment >= 0) ? segmentBlocks[defaultSegment] : mergeBlock;
@@ -4164,10 +3632,10 @@ void Builder::makeSwitch(Id selector, SelectionControlMask control, int numSegme
 }
 
 // Comments in header
-void Builder::addSwitchBreak(bool implicit)
+void Builder::addSwitchBreak()
 {
     // branch to the top of the merge block stack
-    createBranch(implicit, switchMerges.top());
+    createBranch(switchMerges.top());
     createAndSetNoPredecessorBlock("post-switch-break");
 }
 
@@ -4178,7 +3646,7 @@ void Builder::nextSwitchSegment(std::vector<Block*>& segmentBlock, int nextSegme
     if (lastSegment >= 0) {
         // Close out previous segment by jumping, if necessary, to next segment
         if (! buildPoint->isTerminated())
-            createBranch(true, segmentBlock[nextSegment]);
+            createBranch(segmentBlock[nextSegment]);
     }
     Block* block = segmentBlock[nextSegment];
     block->getParent().addBlock(block);
@@ -4190,7 +3658,7 @@ void Builder::endSwitch(std::vector<Block*>& /*segmentBlock*/)
 {
     // Close out previous segment by jumping, if necessary, to next segment
     if (! buildPoint->isTerminated())
-        addSwitchBreak(true);
+        addSwitchBreak();
 
     switchMerges.top()->getParent().addBlock(switchMerges.top());
     setBuildPoint(switchMerges.top());
@@ -4223,14 +3691,14 @@ Builder::LoopBlocks& Builder::makeNewLoop()
 
 void Builder::createLoopContinue()
 {
-    createBranch(false, &loops.top().continue_target);
+    createBranch(&loops.top().continue_target);
     // Set up a block for dead code.
     createAndSetNoPredecessorBlock("post-loop-continue");
 }
 
 void Builder::createLoopExit()
 {
-    createBranch(false, &loops.top().merge);
+    createBranch(&loops.top().merge);
     // Set up a block for dead code.
     createAndSetNoPredecessorBlock("post-loop-break");
 }
@@ -4289,7 +3757,7 @@ void Builder::accessChainStore(Id rvalue, Decoration nonUniform, spv::MemoryAcce
 
     // If a swizzle exists and is not full and is not dynamic, then the swizzle will be broken into individual stores.
     if (accessChain.swizzle.size() > 0 &&
-        getNumTypeComponents(getResultingAccessChainType()) != accessChain.swizzle.size() &&
+        getNumTypeComponents(getResultingAccessChainType()) != (int)accessChain.swizzle.size() &&
         accessChain.component == NoResult) {
         for (unsigned int i = 0; i < accessChain.swizzle.size(); ++i) {
             accessChain.indexChain.push_back(makeUintConstant(accessChain.swizzle[i]));
@@ -4308,8 +3776,8 @@ void Builder::accessChainStore(Id rvalue, Decoration nonUniform, spv::MemoryAcce
 
             // take LSB of alignment
             alignment = alignment & ~(alignment & (alignment-1));
-            if (getStorageClass(base) == StorageClass::PhysicalStorageBufferEXT) {
-                memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessMask::Aligned);
+            if (getStorageClass(base) == StorageClassPhysicalStorageBufferEXT) {
+                memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessAlignedMask);
             }
 
             createStore(source, base, memoryAccess, scope, alignment);
@@ -4333,8 +3801,8 @@ void Builder::accessChainStore(Id rvalue, Decoration nonUniform, spv::MemoryAcce
 
         // take LSB of alignment
         alignment = alignment & ~(alignment & (alignment-1));
-        if (getStorageClass(base) == StorageClass::PhysicalStorageBufferEXT) {
-            memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessMask::Aligned);
+        if (getStorageClass(base) == StorageClassPhysicalStorageBufferEXT) {
+            memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessAlignedMask);
         }
 
         createStore(source, base, memoryAccess, scope, alignment);
@@ -4369,20 +3837,17 @@ Id Builder::accessChainLoad(Decoration precision, Decoration l_nonUniform,
             if (constant) {
                 id = createCompositeExtract(accessChain.base, swizzleBase, indexes);
                 setPrecision(id, precision);
-            } else if (isCooperativeVector(accessChain.base)) {
-                assert(accessChain.indexChain.size() == 1);
-                id = createVectorExtractDynamic(accessChain.base, resultType, accessChain.indexChain[0]);
             } else {
                 Id lValue = NoResult;
                 if (spvVersion >= Spv_1_4 && isValidInitializer(accessChain.base)) {
                     // make a new function variable for this r-value, using an initializer,
                     // and mark it as NonWritable so that downstream it can be detected as a lookup
                     // table
-                    lValue = createVariable(NoPrecision, StorageClass::Function, getTypeId(accessChain.base),
+                    lValue = createVariable(NoPrecision, StorageClassFunction, getTypeId(accessChain.base),
                         "indexable", accessChain.base);
-                    addDecoration(lValue, Decoration::NonWritable);
+                    addDecoration(lValue, DecorationNonWritable);
                 } else {
-                    lValue = createVariable(NoPrecision, StorageClass::Function, getTypeId(accessChain.base),
+                    lValue = createVariable(NoPrecision, StorageClassFunction, getTypeId(accessChain.base),
                         "indexable");
                     // store into it
                     createStore(accessChain.base, lValue);
@@ -4401,8 +3866,8 @@ Id Builder::accessChainLoad(Decoration precision, Decoration l_nonUniform,
 
         // take LSB of alignment
         alignment = alignment & ~(alignment & (alignment-1));
-        if (getStorageClass(accessChain.base) == StorageClass::PhysicalStorageBufferEXT) {
-            memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessMask::Aligned);
+        if (getStorageClass(accessChain.base) == StorageClassPhysicalStorageBufferEXT) {
+            memoryAccess = (spv::MemoryAccessMask)(memoryAccess | spv::MemoryAccessAlignedMask);
         }
 
         // load through the access chain
@@ -4498,19 +3963,19 @@ void Builder::dump(std::vector<unsigned int>& out) const
 
     // Capabilities
     for (auto it = capabilities.cbegin(); it != capabilities.cend(); ++it) {
-        Instruction capInst(0, 0, Op::OpCapability);
+        Instruction capInst(0, 0, OpCapability);
         capInst.addImmediateOperand(*it);
         capInst.dump(out);
     }
 
     for (auto it = extensions.cbegin(); it != extensions.cend(); ++it) {
-        Instruction extInst(0, 0, Op::OpExtension);
+        Instruction extInst(0, 0, OpExtension);
         extInst.addStringOperand(it->c_str());
         extInst.dump(out);
     }
 
     dumpInstructions(out, imports);
-    Instruction memInst(0, 0, Op::OpMemoryModel);
+    Instruction memInst(0, 0, OpMemoryModel);
     memInst.addImmediateOperand(addressModel);
     memInst.addImmediateOperand(memoryModel);
     memInst.dump(out);
@@ -4523,7 +3988,7 @@ void Builder::dump(std::vector<unsigned int>& out) const
     dumpInstructions(out, strings);
     dumpSourceInstructions(out);
     for (int e = 0; e < (int)sourceExtensions.size(); ++e) {
-        Instruction sourceExtInst(0, 0, Op::OpSourceExtension);
+        Instruction sourceExtInst(0, 0, OpSourceExtension);
         sourceExtInst.addStringOperand(sourceExtensions[e]);
         sourceExtInst.dump(out);
     }
@@ -4612,7 +4077,7 @@ void Builder::simplifyAccessChainSwizzle()
 {
     // If the swizzle has fewer components than the vector, it is subsetting, and must stay
     // to preserve that fact.
-    if (getNumTypeComponents(accessChain.preSwizzleBaseType) > accessChain.swizzle.size())
+    if (getNumTypeComponents(accessChain.preSwizzleBaseType) > (int)accessChain.swizzle.size())
         return;
 
     // if components are out of order, it is a swizzle
@@ -4675,32 +4140,27 @@ void Builder::createAndSetNoPredecessorBlock(const char* /*name*/)
 }
 
 // Comments in header
-void Builder::createBranch(bool implicit, Block* block)
+void Builder::createBranch(Block* block)
 {
-    Instruction* branch = new Instruction(Op::OpBranch);
+    Instruction* branch = new Instruction(OpBranch);
     branch->addIdOperand(block->getId());
-    if (implicit) {
-        addInstructionNoDebugInfo(std::unique_ptr<Instruction>(branch));
-    }
-    else {
-        addInstruction(std::unique_ptr<Instruction>(branch));
-    }
+    addInstruction(std::unique_ptr<Instruction>(branch));
     block->addPredecessor(buildPoint);
 }
 
-void Builder::createSelectionMerge(Block* mergeBlock, SelectionControlMask control)
+void Builder::createSelectionMerge(Block* mergeBlock, unsigned int control)
 {
-    Instruction* merge = new Instruction(Op::OpSelectionMerge);
+    Instruction* merge = new Instruction(OpSelectionMerge);
     merge->reserveOperands(2);
     merge->addIdOperand(mergeBlock->getId());
     merge->addImmediateOperand(control);
     addInstruction(std::unique_ptr<Instruction>(merge));
 }
 
-void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, LoopControlMask control,
+void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control,
                               const std::vector<unsigned int>& operands)
 {
-    Instruction* merge = new Instruction(Op::OpLoopMerge);
+    Instruction* merge = new Instruction(OpLoopMerge);
     merge->reserveOperands(operands.size() + 3);
     merge->addIdOperand(mergeBlock->getId());
     merge->addIdOperand(continueBlock->getId());
@@ -4712,15 +4172,12 @@ void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, LoopContr
 
 void Builder::createConditionalBranch(Id condition, Block* thenBlock, Block* elseBlock)
 {
-    Instruction* branch = new Instruction(Op::OpBranchConditional);
+    Instruction* branch = new Instruction(OpBranchConditional);
     branch->reserveOperands(3);
     branch->addIdOperand(condition);
     branch->addIdOperand(thenBlock->getId());
     branch->addIdOperand(elseBlock->getId());
-
-    // A conditional branch is always attached to a condition expression
-    addInstructionNoDebugInfo(std::unique_ptr<Instruction>(branch));
-
+    addInstruction(std::unique_ptr<Instruction>(branch));
     thenBlock->addPredecessor(buildPoint);
     elseBlock->addPredecessor(buildPoint);
 }
@@ -4735,9 +4192,9 @@ void Builder::dumpSourceInstructions(const spv::Id fileId, const std::string& te
     const int opSourceWordCount = 4;
     const int nonNullBytesPerInstruction = 4 * (maxWordCount - opSourceWordCount) - 1;
 
-    if (sourceLang != SourceLanguage::Unknown) {
+    if (sourceLang != SourceLanguageUnknown) {
         // OpSource Language Version File Source
-        Instruction sourceInst(NoResult, NoType, Op::OpSource);
+        Instruction sourceInst(NoResult, NoType, OpSource);
         sourceInst.reserveOperands(3);
         sourceInst.addImmediateOperand(sourceLang);
         sourceInst.addImmediateOperand(sourceVersion);
@@ -4756,7 +4213,7 @@ void Builder::dumpSourceInstructions(const spv::Id fileId, const std::string& te
                         sourceInst.dump(out);
                     } else {
                         // OpSourcContinued
-                        Instruction sourceContinuedInst(Op::OpSourceContinued);
+                        Instruction sourceContinuedInst(OpSourceContinued);
                         sourceContinuedInst.addStringOperand(subString.c_str());
                         sourceContinuedInst.dump(out);
                     }
@@ -4778,56 +4235,21 @@ void Builder::dumpSourceInstructions(std::vector<unsigned int>& out) const
         dumpSourceInstructions(iItr->first, *iItr->second, out);
 }
 
-template <class Range> void Builder::dumpInstructions(std::vector<unsigned int>& out, const Range& instructions) const
+void Builder::dumpInstructions(std::vector<unsigned int>& out,
+    const std::vector<std::unique_ptr<Instruction> >& instructions) const
 {
-    for (const auto& inst : instructions) {
-        inst->dump(out);
+    for (int i = 0; i < (int)instructions.size(); ++i) {
+        instructions[i]->dump(out);
     }
 }
 
 void Builder::dumpModuleProcesses(std::vector<unsigned int>& out) const
 {
     for (int i = 0; i < (int)moduleProcesses.size(); ++i) {
-        Instruction moduleProcessed(Op::OpModuleProcessed);
+        Instruction moduleProcessed(OpModuleProcessed);
         moduleProcessed.addStringOperand(moduleProcesses[i]);
         moduleProcessed.dump(out);
     }
 }
 
-bool Builder::DecorationInstructionLessThan::operator()(const std::unique_ptr<Instruction>& lhs,
-                                                        const std::unique_ptr<Instruction>& rhs) const
-{
-    // Order by the id to which the decoration applies first. This is more intuitive.
-    assert(lhs->isIdOperand(0) && rhs->isIdOperand(0));
-    if (lhs->getIdOperand(0) != rhs->getIdOperand(0)) {
-        return lhs->getIdOperand(0) < rhs->getIdOperand(0);
-    }
-
-    if (lhs->getOpCode() != rhs->getOpCode())
-        return lhs->getOpCode() < rhs->getOpCode();
-
-    // Now compare the operands.
-    int minSize = std::min(lhs->getNumOperands(), rhs->getNumOperands());
-    for (int i = 1; i < minSize; ++i) {
-        if (lhs->isIdOperand(i) != rhs->isIdOperand(i)) {
-            return lhs->isIdOperand(i) < rhs->isIdOperand(i);
-        }
-
-        if (lhs->isIdOperand(i)) {
-            if (lhs->getIdOperand(i) != rhs->getIdOperand(i)) {
-                return lhs->getIdOperand(i) < rhs->getIdOperand(i);
-            }
-        } else {
-            if (lhs->getImmediateOperand(i) != rhs->getImmediateOperand(i)) {
-                return lhs->getImmediateOperand(i) < rhs->getImmediateOperand(i);
-            }
-        }
-    }
-
-    if (lhs->getNumOperands() != rhs->getNumOperands())
-        return lhs->getNumOperands() < rhs->getNumOperands();
-
-    // In this case they are equal.
-    return false;
-}
 } // end spv namespace
diff --git a/engine/thirdparty/glslang/SPIRV/SpvBuilder.h b/engine/thirdparty/glslang/SPIRV/SpvBuilder.h
index 70c1defb..1499592c 100644
--- a/engine/thirdparty/glslang/SPIRV/SpvBuilder.h
+++ b/engine/thirdparty/glslang/SPIRV/SpvBuilder.h
@@ -48,14 +48,10 @@
 #define SpvBuilder_H
 
 #include "Logger.h"
-#define SPV_ENABLE_UTILITY_CODE
-#include "spirv.hpp11"
+#include "spirv.hpp"
 #include "spvIR.h"
-#include "spvUtil.h"
-
 namespace spv {
     #include "GLSL.ext.KHR.h"
-    #include "GLSL.ext.EXT.h"
     #include "NonSemanticShaderDebugInfo100.h"
 }
 
@@ -67,7 +63,6 @@ namespace spv {
 #include <sstream>
 #include <stack>
 #include <unordered_map>
-#include <unordered_set>
 #include <map>
 
 namespace spv {
@@ -79,17 +74,8 @@ typedef enum {
     Spv_1_3 = (1 << 16) | (3 << 8),
     Spv_1_4 = (1 << 16) | (4 << 8),
     Spv_1_5 = (1 << 16) | (5 << 8),
-    Spv_1_6 = (1 << 16) | (6 << 8),
 } SpvVersion;
 
-struct StructMemberDebugInfo {
-    std::string name {};
-    int line {0};
-    int column {0};
-    // Set if the caller knows a better debug type than what is associated with the functional SPIR-V type.
-    spv::Id debugTypeOverride {0};
-};
-
 class Builder {
 public:
     Builder(unsigned int spvVersion, unsigned int userNumber, SpvBuildLogger* logger);
@@ -110,7 +96,7 @@ public:
         if (sItr != stringIds.end())
             return sItr->second;
         spv::Id strId = getUniqueId();
-        Instruction* fileString = new Instruction(strId, NoType, Op::OpString);
+        Instruction* fileString = new Instruction(strId, NoType, OpString);
         const char* file_c_str = str.c_str();
         fileString->addStringOperand(file_c_str);
         strings.push_back(std::unique_ptr<Instruction>(fileString));
@@ -122,7 +108,7 @@ public:
     spv::Id getMainFileId() const { return mainFileId; }
 
     // Initialize the main source file name
-    void setDebugMainSourceFile(const std::string& file)
+    void setDebugSourceFile(const std::string& file)
     {
         if (trackDebugInfo) {
             dirtyLineTracker = true;
@@ -138,7 +124,7 @@ public:
         if (trackDebugInfo) {
             dirtyLineTracker = true;
             if (line != 0) {
-                // TODO: This is special handling of some AST nodes having (untracked) line 0.
+                // TODO: This is special handling of some AST nodes having (untracked) line 0. 
                 //       But they should have a valid line number.
                 currentLine = line;
                 if (filename) {
@@ -206,24 +192,6 @@ public:
         return id;
     }
 
-    // Maps the given OpType Id to a Non-Semantic DebugType Id.
-    Id getDebugType(Id type) {
-        if (auto it = debugTypeIdLookup.find(type); it != debugTypeIdLookup.end()) {
-            return it->second;
-        }
-        
-        return NoType;
-    }
-
-    // Maps the given OpFunction Id to a Non-Semantic DebugFunction Id.
-    Id getDebugFunction(Id func) {
-        if (auto it = debugFuncIdLookup.find(func); it != debugFuncIdLookup.end()) {
-            return it->second;
-        }
-        
-        return NoResult;
-    }
-
     // For creating new types (will return old type if the requested one was already made).
     Id makeVoidType();
     Id makeBoolType();
@@ -234,28 +202,28 @@ public:
     Id makeIntType(int width) { return makeIntegerType(width, true); }
     Id makeUintType(int width) { return makeIntegerType(width, false); }
     Id makeFloatType(int width);
-    Id makeBFloat16Type();
-    Id makeFloatE5M2Type();
-    Id makeFloatE4M3Type();
-    Id makeStructType(const std::vector<Id>& members, const std::vector<spv::StructMemberDebugInfo>& memberDebugInfo,
-                      const char* name, bool const compilerGenerated = true);
+    Id makeStructType(const std::vector<Id>& members, const char* name, bool const compilerGenerated = true);
     Id makeStructResultType(Id type0, Id type1);
     Id makeVectorType(Id component, int size);
     Id makeMatrixType(Id component, int cols, int rows);
     Id makeArrayType(Id element, Id sizeId, int stride);  // 0 stride means no stride decoration
     Id makeRuntimeArray(Id element);
     Id makeFunctionType(Id returnType, const std::vector<Id>& paramTypes);
-    Id makeImageType(Id sampledType, Dim, bool depth, bool arrayed, bool ms, unsigned sampled, ImageFormat format, const char* debugNames);
-    Id makeSamplerType(const char* debugName);
-    Id makeSampledImageType(Id imageType, const char* debugName);
+    Id makeImageType(Id sampledType, Dim, bool depth, bool arrayed, bool ms, unsigned sampled, ImageFormat format);
+    Id makeSamplerType();
+    Id makeSampledImageType(Id imageType);
     Id makeCooperativeMatrixTypeKHR(Id component, Id scope, Id rows, Id cols, Id use);
     Id makeCooperativeMatrixTypeNV(Id component, Id scope, Id rows, Id cols);
     Id makeCooperativeMatrixTypeWithSameShape(Id component, Id otherType);
-    Id makeCooperativeVectorTypeNV(Id componentType, Id components);
-    Id makeTensorTypeARM(Id elementType, Id rank);
     Id makeGenericType(spv::Op opcode, std::vector<spv::IdImmediate>& operands);
 
     // SPIR-V NonSemantic Shader DebugInfo Instructions
+    struct DebugTypeLoc {
+        std::string name {};
+        int line {0};
+        int column {0};
+    };
+    std::unordered_map<Id, DebugTypeLoc> debugTypeLocs;
     Id makeDebugInfoNone();
     Id makeBoolDebugType(int const size);
     Id makeIntegerDebugType(int const width, bool const hasSign);
@@ -264,12 +232,10 @@ public:
     Id makeArrayDebugType(Id const baseType, Id const componentCount);
     Id makeVectorDebugType(Id const baseType, int const componentCount);
     Id makeMatrixDebugType(Id const vectorType, int const vectorCount, bool columnMajor = true);
-    Id makeMemberDebugType(Id const memberType, StructMemberDebugInfo const& debugTypeLoc);
-    Id makeCompositeDebugType(std::vector<Id> const& memberTypes, std::vector<StructMemberDebugInfo> const& memberDebugInfo,
-                              char const* const name, NonSemanticShaderDebugInfo100DebugCompositeType const tag);
-    Id makeOpaqueDebugType(char const* const name);
+    Id makeMemberDebugType(Id const memberType, DebugTypeLoc const& debugTypeLoc);
+    Id makeCompositeDebugType(std::vector<Id> const& memberTypes, char const*const name,
+        NonSemanticShaderDebugInfo100DebugCompositeType const tag, bool const isOpaqueType = false);
     Id makePointerDebugType(StorageClass storageClass, Id const baseType);
-    Id makeForwardPointerDebugType(StorageClass storageClass);
     Id makeDebugSource(const Id fileName);
     Id makeDebugCompilationUnit();
     Id createDebugGlobalVariable(Id const type, char const*const name, Id const variable);
@@ -279,14 +245,11 @@ public:
     Id makeDebugValue(Id const debugLocalVariable, Id const value);
     Id makeDebugFunctionType(Id returnType, const std::vector<Id>& paramTypes);
     Id makeDebugFunction(Function* function, Id nameId, Id funcTypeId);
-    Id makeDebugLexicalBlock(uint32_t line, uint32_t column);
+    Id makeDebugLexicalBlock(uint32_t line);
     std::string unmangleFunctionName(std::string const& name) const;
-
-    // Initialize non-semantic debug information for a function, including those of:
-    // - The function definition
-    // - The function parameters
-    void setupFunctionDebugInfo(Function* function, const char* name, const std::vector<Id>& paramTypes,
-                                const std::vector<char const*>& paramNames);
+    void setupDebugFunctionEntry(Function* function, const char* name, int line, 
+                                 const std::vector<Id>& paramTypes,
+                                 const std::vector<char const*>& paramNames);
 
     // accelerationStructureNV type
     Id makeAccelerationStructureType();
@@ -294,8 +257,6 @@ public:
     Id makeRayQueryType();
     // hitObjectNV type
     Id makeHitObjectNVType();
-    // hitObjectEXT type
-    Id makeHitObjectEXTType();
 
     // For querying about types.
     Id getTypeId(Id resultId) const { return module.getTypeId(resultId); }
@@ -303,9 +264,9 @@ public:
     Op getOpCode(Id id) const { return module.getInstruction(id)->getOpCode(); }
     Op getTypeClass(Id typeId) const { return getOpCode(typeId); }
     Op getMostBasicTypeClass(Id typeId) const;
-    unsigned int getNumComponents(Id resultId) const { return getNumTypeComponents(getTypeId(resultId)); }
-    unsigned int getNumTypeConstituents(Id typeId) const;
-    unsigned int getNumTypeComponents(Id typeId) const { return getNumTypeConstituents(typeId); }
+    int getNumComponents(Id resultId) const { return getNumTypeComponents(getTypeId(resultId)); }
+    int getNumTypeConstituents(Id typeId) const;
+    int getNumTypeComponents(Id typeId) const { return getNumTypeConstituents(typeId); }
     Id getScalarTypeId(Id typeId) const;
     Id getContainedTypeId(Id typeId) const;
     Id getContainedTypeId(Id typeId, int) const;
@@ -314,60 +275,54 @@ public:
         { return (ImageFormat)module.getInstruction(typeId)->getImmediateOperand(6); }
     Id getResultingAccessChainType() const;
     Id getIdOperand(Id resultId, int idx) { return module.getInstruction(resultId)->getIdOperand(idx); }
-    Id getCooperativeVectorNumComponents(Id typeId) const { return module.getInstruction(typeId)->getIdOperand(1); }
 
     bool isPointer(Id resultId)      const { return isPointerType(getTypeId(resultId)); }
     bool isScalar(Id resultId)       const { return isScalarType(getTypeId(resultId)); }
     bool isVector(Id resultId)       const { return isVectorType(getTypeId(resultId)); }
     bool isMatrix(Id resultId)       const { return isMatrixType(getTypeId(resultId)); }
     bool isCooperativeMatrix(Id resultId)const { return isCooperativeMatrixType(getTypeId(resultId)); }
-    bool isCooperativeVector(Id resultId)const { return isCooperativeVectorType(getTypeId(resultId)); }
     bool isAggregate(Id resultId)    const { return isAggregateType(getTypeId(resultId)); }
     bool isSampledImage(Id resultId) const { return isSampledImageType(getTypeId(resultId)); }
-    bool isTensorView(Id resultId)const { return isTensorViewType(getTypeId(resultId)); }
 
     bool isBoolType(Id typeId)
-        { return groupedTypes[enumCast(Op::OpTypeBool)].size() > 0 && typeId == groupedTypes[enumCast(Op::OpTypeBool)].back()->getResultId(); }
+        { return groupedTypes[OpTypeBool].size() > 0 && typeId == groupedTypes[OpTypeBool].back()->getResultId(); }
     bool isIntType(Id typeId)          const
-        { return getTypeClass(typeId) == Op::OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) != 0; }
+        { return getTypeClass(typeId) == OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) != 0; }
     bool isUintType(Id typeId)         const
-        { return getTypeClass(typeId) == Op::OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) == 0; }
-    bool isFloatType(Id typeId)        const { return getTypeClass(typeId) == Op::OpTypeFloat; }
-    bool isPointerType(Id typeId)      const { return getTypeClass(typeId) == Op::OpTypePointer; }
+        { return getTypeClass(typeId) == OpTypeInt && module.getInstruction(typeId)->getImmediateOperand(1) == 0; }
+    bool isFloatType(Id typeId)        const { return getTypeClass(typeId) == OpTypeFloat; }
+    bool isPointerType(Id typeId)      const { return getTypeClass(typeId) == OpTypePointer; }
     bool isScalarType(Id typeId)       const
-        { return getTypeClass(typeId) == Op::OpTypeFloat || getTypeClass(typeId) == Op::OpTypeInt ||
-          getTypeClass(typeId) == Op::OpTypeBool; }
-    bool isVectorType(Id typeId)       const { return getTypeClass(typeId) == Op::OpTypeVector; }
-    bool isMatrixType(Id typeId)       const { return getTypeClass(typeId) == Op::OpTypeMatrix; }
-    bool isStructType(Id typeId)       const { return getTypeClass(typeId) == Op::OpTypeStruct; }
-    bool isArrayType(Id typeId)        const { return getTypeClass(typeId) == Op::OpTypeArray; }
+        { return getTypeClass(typeId) == OpTypeFloat || getTypeClass(typeId) == OpTypeInt ||
+          getTypeClass(typeId) == OpTypeBool; }
+    bool isVectorType(Id typeId)       const { return getTypeClass(typeId) == OpTypeVector; }
+    bool isMatrixType(Id typeId)       const { return getTypeClass(typeId) == OpTypeMatrix; }
+    bool isStructType(Id typeId)       const { return getTypeClass(typeId) == OpTypeStruct; }
+    bool isArrayType(Id typeId)        const { return getTypeClass(typeId) == OpTypeArray; }
     bool isCooperativeMatrixType(Id typeId)const
     {
-        return getTypeClass(typeId) == Op::OpTypeCooperativeMatrixKHR || getTypeClass(typeId) == Op::OpTypeCooperativeMatrixNV;
+        return getTypeClass(typeId) == OpTypeCooperativeMatrixKHR || getTypeClass(typeId) == OpTypeCooperativeMatrixNV;
     }
-    bool isTensorViewType(Id typeId) const { return getTypeClass(typeId) == Op::OpTypeTensorViewNV; }
-    bool isCooperativeVectorType(Id typeId) const { return getTypeClass(typeId) == Op::OpTypeCooperativeVectorNV; }
-    bool isTensorTypeARM(Id typeId)    const { return getTypeClass(typeId) == Op::OpTypeTensorARM; }
     bool isAggregateType(Id typeId)    const
         { return isArrayType(typeId) || isStructType(typeId) || isCooperativeMatrixType(typeId); }
-    bool isImageType(Id typeId)        const { return getTypeClass(typeId) == Op::OpTypeImage; }
-    bool isSamplerType(Id typeId)      const { return getTypeClass(typeId) == Op::OpTypeSampler; }
-    bool isSampledImageType(Id typeId) const { return getTypeClass(typeId) == Op::OpTypeSampledImage; }
+    bool isImageType(Id typeId)        const { return getTypeClass(typeId) == OpTypeImage; }
+    bool isSamplerType(Id typeId)      const { return getTypeClass(typeId) == OpTypeSampler; }
+    bool isSampledImageType(Id typeId) const { return getTypeClass(typeId) == OpTypeSampledImage; }
     bool containsType(Id typeId, Op typeOp, unsigned int width) const;
     bool containsPhysicalStorageBufferOrArray(Id typeId) const;
 
     bool isConstantOpCode(Op opcode) const;
     bool isSpecConstantOpCode(Op opcode) const;
     bool isConstant(Id resultId) const { return isConstantOpCode(getOpCode(resultId)); }
-    bool isConstantScalar(Id resultId) const { return getOpCode(resultId) == Op::OpConstant; }
+    bool isConstantScalar(Id resultId) const { return getOpCode(resultId) == OpConstant; }
     bool isSpecConstant(Id resultId) const { return isSpecConstantOpCode(getOpCode(resultId)); }
     unsigned int getConstantScalar(Id resultId) const
         { return module.getInstruction(resultId)->getImmediateOperand(0); }
     StorageClass getStorageClass(Id resultId) const { return getTypeStorageClass(getTypeId(resultId)); }
 
-    bool isVariableOpCode(Op opcode) const { return opcode == Op::OpVariable; }
+    bool isVariableOpCode(Op opcode) const { return opcode == OpVariable; }
     bool isVariable(Id resultId) const { return isVariableOpCode(getOpCode(resultId)); }
-    bool isGlobalStorage(Id resultId) const { return getStorageClass(resultId) != StorageClass::Function; }
+    bool isGlobalStorage(Id resultId) const { return getStorageClass(resultId) != StorageClassFunction; }
     bool isGlobalVariable(Id resultId) const { return isVariable(resultId) && isGlobalStorage(resultId); }
     // See if a resultId is valid for use as an initializer.
     bool isValidInitializer(Id resultId) const { return isConstant(resultId) || isGlobalVariable(resultId); }
@@ -375,22 +330,22 @@ public:
     int getScalarTypeWidth(Id typeId) const
     {
         Id scalarTypeId = getScalarTypeId(typeId);
-        assert(getTypeClass(scalarTypeId) == Op::OpTypeInt || getTypeClass(scalarTypeId) == Op::OpTypeFloat);
+        assert(getTypeClass(scalarTypeId) == OpTypeInt || getTypeClass(scalarTypeId) == OpTypeFloat);
         return module.getInstruction(scalarTypeId)->getImmediateOperand(0);
     }
 
-    unsigned int getTypeNumColumns(Id typeId) const
+    int getTypeNumColumns(Id typeId) const
     {
         assert(isMatrixType(typeId));
         return getNumTypeConstituents(typeId);
     }
-    unsigned int getNumColumns(Id resultId) const { return getTypeNumColumns(getTypeId(resultId)); }
-    unsigned int getTypeNumRows(Id typeId) const
+    int getNumColumns(Id resultId) const { return getTypeNumColumns(getTypeId(resultId)); }
+    int getTypeNumRows(Id typeId) const
     {
         assert(isMatrixType(typeId));
         return getNumTypeComponents(getContainedTypeId(typeId));
     }
-    unsigned int getNumRows(Id resultId) const { return getTypeNumRows(getTypeId(resultId)); }
+    int getNumRows(Id resultId) const { return getTypeNumRows(getTypeId(resultId)); }
 
     Dim getTypeDimensionality(Id typeId) const
     {
@@ -412,8 +367,6 @@ public:
     // For making new constants (will return old constant if the requested one was already made).
     Id makeNullConstant(Id typeId);
     Id makeBoolConstant(bool b, bool specConstant = false);
-    Id makeIntConstant(Id typeId, unsigned value, bool specConstant);
-    Id makeInt64Constant(Id typeId, unsigned long long value, bool specConstant);
     Id makeInt8Constant(int i, bool specConstant = false)
         { return makeIntConstant(makeIntType(8),  (unsigned)i, specConstant); }
     Id makeUint8Constant(unsigned u, bool specConstant = false)
@@ -426,14 +379,6 @@ public:
         { return makeIntConstant(makeIntType(32),  (unsigned)i, specConstant); }
     Id makeUintConstant(unsigned u, bool specConstant = false)
         { return makeIntConstant(makeUintType(32),           u, specConstant); }
-    Id makeUintConstant(Scope u, bool specConstant = false)
-        { return makeUintConstant((unsigned)u, specConstant); }
-    Id makeUintConstant(StorageClass u, bool specConstant = false)
-        { return makeUintConstant((unsigned)u, specConstant); }
-    Id makeUintConstant(MemorySemanticsMask u, bool specConstant = false)
-        { return makeUintConstant((unsigned)u, specConstant); }
-    Id makeUintConstant(SourceLanguage u, bool specConstant = false)
-        { return makeUintConstant((unsigned)u, specConstant); }
     Id makeInt64Constant(long long i, bool specConstant = false)
         { return makeInt64Constant(makeIntType(64),  (unsigned long long)i, specConstant); }
     Id makeUint64Constant(unsigned long long u, bool specConstant = false)
@@ -441,9 +386,6 @@ public:
     Id makeFloatConstant(float f, bool specConstant = false);
     Id makeDoubleConstant(double d, bool specConstant = false);
     Id makeFloat16Constant(float f16, bool specConstant = false);
-    Id makeBFloat16Constant(float bf16, bool specConstant = false);
-    Id makeFloatE5M2Constant(float fe5m2, bool specConstant = false);
-    Id makeFloatE4M3Constant(float fe4m3, bool specConstant = false);
     Id makeFpConstant(Id type, double d, bool specConstant = false);
 
     Id importNonSemanticShaderDebugInfoInstructions();
@@ -474,7 +416,8 @@ public:
     // Also reset current last DebugScope and current source line to unknown
     void setBuildPoint(Block* bp) {
         buildPoint = bp;
-        dirtyLineTracker = true;
+        // TODO: Technically, change of build point should set line tracker dirty. But we'll have bad line info for
+        //       branch instructions. Commenting this for now because at least this matches the old behavior.
         dirtyScopeTracker = true;
     }
     Block* getBuildPoint() const { return buildPoint; }
@@ -483,11 +426,6 @@ public:
     // Optionally, additional debug info instructions may also be prepended.
     void addInstruction(std::unique_ptr<Instruction> inst);
 
-    // Append an instruction to the end of the current build point without prepending any debug instructions.
-    // This is useful for insertion of some debug info instructions themselves or some control flow instructions
-    // that are attached to its predecessor instruction.
-    void addInstructionNoDebugInfo(std::unique_ptr<Instruction> inst);
-
     // Make the entry-point function. The returned pointer is only valid
     // for the lifetime of this builder.
     Function* makeEntryPoint(const char*);
@@ -504,7 +442,7 @@ public:
     void makeReturn(bool implicit, Id retVal = 0);
 
     // Initialize state and generate instructions for new lexical scope
-    void enterLexicalBlock(uint32_t line, uint32_t column);
+    void enterLexicalBlock(uint32_t line);
 
     // Set state and generate instructions to exit current lexical scope
     void leaveLexicalBlock();
@@ -523,10 +461,6 @@ public:
     // such as OpEmitMeshTasksEXT
     void makeStatementTerminator(spv::Op opcode, const std::vector<Id>& operands, const char* name);
 
-    // Create a global/local constant. Because OpConstant is automatically emitted by getting the constant
-    // ids, this function only handles debug info.
-    void createConstVariable(Id type, const char* name, Id constant, bool isGlobal);
-
     // Create a global or function local or IO variable.
     Id createVariable(Decoration precision, StorageClass storageClass, Id type, const char* name = nullptr,
         Id initializer = NoResult, bool const compilerGenerated = true);
@@ -535,19 +469,19 @@ public:
     Id createUndefined(Id type);
 
     // Store into an Id and return the l-value
-    void createStore(Id rValue, Id lValue, spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMask::MaskNone,
-        spv::Scope scope = spv::Scope::Max, unsigned int alignment = 0);
+    void createStore(Id rValue, Id lValue, spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone,
+        spv::Scope scope = spv::ScopeMax, unsigned int alignment = 0);
 
     // Load from an Id and return it
     Id createLoad(Id lValue, spv::Decoration precision,
-        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMask::MaskNone,
-        spv::Scope scope = spv::Scope::Max, unsigned int alignment = 0);
+        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone,
+        spv::Scope scope = spv::ScopeMax, unsigned int alignment = 0);
 
     // Create an OpAccessChain instruction
     Id createAccessChain(StorageClass, Id base, const std::vector<Id>& offsets);
 
     // Create an OpArrayLength instruction
-    Id createArrayLength(Id base, unsigned int member, unsigned int bits);
+    Id createArrayLength(Id base, unsigned int member);
 
     // Create an OpCooperativeMatrixLengthKHR instruction
     Id createCooperativeMatrixLengthKHR(Id type);
@@ -568,7 +502,7 @@ public:
     void createNoResultOp(Op, const std::vector<Id>& operands);
     void createNoResultOp(Op, const std::vector<IdImmediate>& operands);
     void createControlBarrier(Scope execution, Scope memory, MemorySemanticsMask);
-    void createMemoryBarrier(Scope executionScope, MemorySemanticsMask memorySemantics);
+    void createMemoryBarrier(unsigned executionScope, unsigned memorySemantics);
     Id createUnaryOp(Op, Id typeId, Id operand);
     Id createBinOp(Op, Id typeId, Id operand1, Id operand2);
     Id createTriOp(Op, Id typeId, Id operand1, Id operand2, Id operand3);
@@ -639,7 +573,6 @@ public:
         Id coarse;
         bool nonprivate;
         bool volatil;
-        bool nontemporal;
     };
 
     // Select the correct texture operation based on all inputs, and emit the correct instruction
@@ -667,15 +600,10 @@ public:
     // matrix constructor
     Id createMatrixConstructor(Decoration precision, const std::vector<Id>& sources, Id constructee);
 
-    // coopmat conversion
-    Id createCooperativeMatrixConversion(Id typeId, Id source);
-    Id createCooperativeMatrixReduce(Op opcode, Id typeId, Id source, unsigned int mask, Id func);
-    Id createCooperativeMatrixPerElementOp(Id typeId, const std::vector<Id>& operands);
-
     // Helper to use for building nested control flow with if-then-else.
     class If {
     public:
-        If(Id condition, SelectionControlMask ctrl, Builder& builder);
+        If(Id condition, unsigned int ctrl, Builder& builder);
         ~If() {}
 
         void makeBeginElse();
@@ -687,7 +615,7 @@ public:
 
         Builder& builder;
         Id condition;
-        SelectionControlMask control;
+        unsigned int control;
         Function* function;
         Block* headerBlock;
         Block* thenBlock;
@@ -707,11 +635,11 @@ public:
     // Returns the right set of basic blocks to start each code segment with, so that the caller's
     // recursion stack can hold the memory for it.
     //
-    void makeSwitch(Id condition, SelectionControlMask control, int numSegments, const std::vector<int>& caseValues,
+    void makeSwitch(Id condition, unsigned int control, int numSegments, const std::vector<int>& caseValues,
                     const std::vector<int>& valueToSegment, int defaultSegment, std::vector<Block*>& segmentBB);
 
     // Add a branch to the innermost switch's merge block.
-    void addSwitchBreak(bool implicit);
+    void addSwitchBreak();
 
     // Move to the next code segment, passing in the return argument in makeSwitch()
     void nextSwitchSegment(std::vector<Block*>& segmentBB, int segment);
@@ -808,7 +736,6 @@ public:
             unsigned shadercallcoherent : 1;
             unsigned nonprivate : 1;
             unsigned volatil : 1;
-            unsigned nontemporal : 1;
             unsigned isImage : 1;
             unsigned nonUniform : 1;
 
@@ -821,7 +748,6 @@ public:
                 shadercallcoherent = 0;
                 nonprivate = 0;
                 volatil = 0;
-                nontemporal = 0;
                 isImage = 0;
                 nonUniform = 0;
             }
@@ -835,7 +761,6 @@ public:
                 shadercallcoherent |= other.shadercallcoherent;
                 nonprivate |= other.nonprivate;
                 volatil |= other.volatil;
-                nontemporal = other.nontemporal;
                 isImage |= other.isImage;
                 nonUniform |= other.nonUniform;
                 return *this;
@@ -898,12 +823,12 @@ public:
 
     // use accessChain and swizzle to store value
     void accessChainStore(Id rvalue, Decoration nonUniform,
-        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMask::MaskNone,
-        spv::Scope scope = spv::Scope::Max, unsigned int alignment = 0);
+        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone,
+        spv::Scope scope = spv::ScopeMax, unsigned int alignment = 0);
 
     // use accessChain and swizzle to load an r-value
     Id accessChainLoad(Decoration precision, Decoration l_nonUniform, Decoration r_nonUniform, Id ResultType,
-        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMask::MaskNone, spv::Scope scope = spv::Scope::Max,
+        spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone, spv::Scope scope = spv::ScopeMax,
             unsigned int alignment = 0);
 
     // Return whether or not the access chain can be represented in SPIR-V
@@ -931,16 +856,12 @@ public:
     void postProcess(Instruction&);
     // Hook to visit each non-32-bit sized float/int operation in a block.
     void postProcessType(const Instruction&, spv::Id typeId);
-    // move OpSampledImage instructions to be next to their users.
-    void postProcessSamplers();
 
     void dump(std::vector<unsigned int>&) const;
 
-    // Add a branch to the target block.
-    // If set implicit, the branch instruction shouldn't have debug source location.
-    void createBranch(bool implicit, Block* block);
+    void createBranch(Block* block);
     void createConditionalBranch(Id condition, Block* thenBlock, Block* elseBlock);
-    void createLoopMerge(Block* mergeBlock, Block* continueBlock, LoopControlMask control,
+    void createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control,
         const std::vector<unsigned int>& operands);
 
     // Sets to generate opcode for specialization constants.
@@ -950,32 +871,25 @@ public:
     // Check if the builder is generating code for spec constants.
     bool isInSpecConstCodeGenMode() { return generatingOpCodeForSpecConst; }
 
-    void setUseReplicatedComposites(bool use) { useReplicatedComposites = use; }
-
-private:
-    // Helper to get size of a scalar (in bytes)
-    unsigned int postProcessGetLargestScalarSize(const Instruction& type);
-
-protected:
+ protected:
+    Id makeIntConstant(Id typeId, unsigned value, bool specConstant);
+    Id makeInt64Constant(Id typeId, unsigned long long value, bool specConstant);
     Id findScalarConstant(Op typeClass, Op opcode, Id typeId, unsigned value);
     Id findScalarConstant(Op typeClass, Op opcode, Id typeId, unsigned v1, unsigned v2);
-    Id findCompositeConstant(Op typeClass, Op opcode, Id typeId, const std::vector<Id>& comps, size_t numMembers);
+    Id findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>& comps);
     Id findStructConstant(Id typeId, const std::vector<Id>& comps);
     Id collapseAccessChain();
     void remapDynamicSwizzle();
     void transferAccessChainSwizzle(bool dynamic);
     void simplifyAccessChainSwizzle();
     void createAndSetNoPredecessorBlock(const char*);
-    void createSelectionMerge(Block* mergeBlock, SelectionControlMask control);
+    void createSelectionMerge(Block* mergeBlock, unsigned int control);
     void dumpSourceInstructions(std::vector<unsigned int>&) const;
     void dumpSourceInstructions(const spv::Id fileId, const std::string& text, std::vector<unsigned int>&) const;
-    template <class Range> void dumpInstructions(std::vector<unsigned int>& out, const Range& instructions) const;
+    void dumpInstructions(std::vector<unsigned int>&, const std::vector<std::unique_ptr<Instruction> >&) const;
     void dumpModuleProcesses(std::vector<unsigned int>&) const;
     spv::MemoryAccessMask sanitizeMemoryAccessForStorageClass(spv::MemoryAccessMask memoryAccess, StorageClass sc)
         const;
-    struct DecorationInstructionLessThan {
-        bool operator()(const std::unique_ptr<Instruction>& lhs, const std::unique_ptr<Instruction>& rhs) const;
-    };
 
     unsigned int spvVersion;     // the version of SPIR-V to emit in the header
     SourceLanguage sourceLang;
@@ -1022,10 +936,7 @@ protected:
     Block* buildPoint;
     Id uniqueId;
     Function* entryPointFunction;
-    // This tracks the current function being built, or nullptr if not in a function.
-    Function const* currentFunction { nullptr };
     bool generatingOpCodeForSpecConst;
-    bool useReplicatedComposites { false };
     AccessChain accessChain;
 
     // special blocks of instructions for output
@@ -1034,65 +945,15 @@ protected:
     std::vector<std::unique_ptr<Instruction> > entryPoints;
     std::vector<std::unique_ptr<Instruction> > executionModes;
     std::vector<std::unique_ptr<Instruction> > names;
-    std::set<std::unique_ptr<Instruction>, DecorationInstructionLessThan> decorations;
+    std::vector<std::unique_ptr<Instruction> > decorations;
     std::vector<std::unique_ptr<Instruction> > constantsTypesGlobals;
     std::vector<std::unique_ptr<Instruction> > externals;
     std::vector<std::unique_ptr<Function> > functions;
 
     // not output, internally used for quick & dirty canonical (unique) creation
 
-    // Key for scalar constants (handles both 32-bit and 64-bit)
-    struct ScalarConstantKey {
-        unsigned int typeClass;  // OpTypeInt, OpTypeFloat, OpTypeBool
-        unsigned int opcode;     // OpConstant, OpSpecConstant, OpConstantTrue, etc.
-        Id typeId;               // The specific type
-        unsigned value1;         // First operand (or only operand)
-        unsigned value2;         // Second operand (0 for single-operand constants)
-
-        bool operator==(const ScalarConstantKey& other) const {
-            return typeClass == other.typeClass &&
-                   opcode == other.opcode &&
-                   typeId == other.typeId &&
-                   value1 == other.value1 &&
-                   value2 == other.value2;
-        }
-    };
-
-    struct ScalarConstantKeyHash {
-        // 64/32 bit mix function from MurmurHash3
-        inline std::size_t hash_mix(std::size_t h) const {
-            if constexpr (sizeof(std::size_t) == 8) {
-                h ^= h >> 33;
-                h *= UINT64_C(0xff51afd7ed558ccd);
-                h ^= h >> 33;
-                h *= UINT64_C(0xc4ceb9fe1a85ec53);
-                h ^= h >> 33;
-                return h;
-            } else {
-                h ^= h >> 16;
-                h *= UINT32_C(0x85ebca6b);
-                h ^= h >> 13;
-                h *= UINT32_C(0xc2b2ae35);
-                h ^= h >> 16;
-                return h;
-            }
-        }
-
-        // Hash combine from boost
-        inline std::size_t hash_combine(std::size_t seed, std::size_t v) const {
-            return hash_mix(seed + 0x9e3779b9 + v);
-        }
-        
-        std::size_t operator()(const ScalarConstantKey& k) const {
-            size_t hash1 = hash_combine(std::hash<unsigned>{}(k.typeClass), std::hash<unsigned>{}(k.opcode));
-            size_t hash2 = hash_combine(std::hash<Id>{}(k.value1), std::hash<unsigned>{}(k.value2));
-            size_t hash3 = hash_combine(hash1, hash2);
-            return hash_combine(hash3, std::hash<unsigned>{}(k.typeId));
-        }
-    };
-
     // map type opcodes to constant inst.
-    std::unordered_map<unsigned int, std::vector<Instruction*>> groupedCompositeConstants;
+    std::unordered_map<unsigned int, std::vector<Instruction*>> groupedConstants;
     // map struct-id to constant instructions
     std::unordered_map<unsigned int, std::vector<Instruction*>> groupedStructConstants;
     // map type opcodes to type instructions
@@ -1101,12 +962,6 @@ protected:
     std::unordered_map<unsigned int, std::vector<Instruction*>> groupedDebugTypes;
     // list of OpConstantNull instructions
     std::vector<Instruction*> nullConstants;
-    // map scalar constants to result IDs
-    std::unordered_map<ScalarConstantKey, Id, ScalarConstantKeyHash> groupedScalarConstantResultIDs;
-
-    // Track which types have explicit layouts, to avoid reusing in storage classes without layout.
-    // Currently only tracks array types.
-    std::unordered_set<unsigned int> explicitlyLaidOut;
 
     // stack of switches
     std::stack<Block*> switchMerges;
@@ -1120,11 +975,8 @@ protected:
     // map from include file name ids to their contents
     std::map<spv::Id, const std::string*> includeFiles;
 
-    // maps from OpTypeXXX id to DebugTypeXXX id
-    std::unordered_map<spv::Id, spv::Id> debugTypeIdLookup;
-
-    // maps from OpFunction id to DebugFunction id
-    std::unordered_map<spv::Id, spv::Id> debugFuncIdLookup;
+    // map from core id to debug id
+    std::map <spv::Id, spv::Id> debugId;
 
     // map from file name string id to DebugSource id
     std::unordered_map<spv::Id, spv::Id> debugSourceId;
@@ -1133,6 +985,6 @@ protected:
     SpvBuildLogger* logger;
 };  // end Builder class
 
-} // end spv namespace
+};  // end spv namespace
 
 #endif // SpvBuilder_H
diff --git a/engine/thirdparty/glslang/SPIRV/SpvPostProcess.cpp b/engine/thirdparty/glslang/SPIRV/SpvPostProcess.cpp
index 068e33e8..ebc69124 100644
--- a/engine/thirdparty/glslang/SPIRV/SpvPostProcess.cpp
+++ b/engine/thirdparty/glslang/SPIRV/SpvPostProcess.cpp
@@ -43,10 +43,8 @@
 #include <unordered_set>
 #include <algorithm>
 
-#include "SPIRV/spvIR.h"
 #include "SpvBuilder.h"
-#include "spirv.hpp11"
-#include "spvUtil.h"
+#include "spirv.hpp"
 
 namespace spv {
     #include "GLSL.std.450.h"
@@ -66,213 +64,182 @@ namespace spv {
 void Builder::postProcessType(const Instruction& inst, Id typeId)
 {
     // Characterize the type being questioned
-    Op basicTypeOp = getMostBasicTypeClass(typeId);
+    Id basicTypeOp = getMostBasicTypeClass(typeId);
     int width = 0;
-    if (basicTypeOp == Op::OpTypeFloat || basicTypeOp == Op::OpTypeInt)
+    if (basicTypeOp == OpTypeFloat || basicTypeOp == OpTypeInt)
         width = getScalarTypeWidth(typeId);
 
     // Do opcode-specific checks
     switch (inst.getOpCode()) {
-    case Op::OpLoad:
-    case Op::OpStore:
-        if (basicTypeOp == Op::OpTypeStruct) {
-            if (containsType(typeId, Op::OpTypeInt, 8))
-                addCapability(Capability::Int8);
-            if (containsType(typeId, Op::OpTypeInt, 16))
-                addCapability(Capability::Int16);
-            if (containsType(typeId, Op::OpTypeFloat, 16))
-                addCapability(Capability::Float16);
+    case OpLoad:
+    case OpStore:
+        if (basicTypeOp == OpTypeStruct) {
+            if (containsType(typeId, OpTypeInt, 8))
+                addCapability(CapabilityInt8);
+            if (containsType(typeId, OpTypeInt, 16))
+                addCapability(CapabilityInt16);
+            if (containsType(typeId, OpTypeFloat, 16))
+                addCapability(CapabilityFloat16);
         } else {
             StorageClass storageClass = getStorageClass(inst.getIdOperand(0));
             if (width == 8) {
                 switch (storageClass) {
-                case StorageClass::PhysicalStorageBufferEXT:
-                case StorageClass::Uniform:
-                case StorageClass::StorageBuffer:
-                case StorageClass::PushConstant:
+                case StorageClassPhysicalStorageBufferEXT:
+                case StorageClassUniform:
+                case StorageClassStorageBuffer:
+                case StorageClassPushConstant:
                     break;
                 default:
-                    addCapability(Capability::Int8);
+                    addCapability(CapabilityInt8);
                     break;
                 }
             } else if (width == 16) {
                 switch (storageClass) {
-                case StorageClass::PhysicalStorageBufferEXT:
-                case StorageClass::Uniform:
-                case StorageClass::StorageBuffer:
-                case StorageClass::PushConstant:
-                case StorageClass::Input:
-                case StorageClass::Output:
+                case StorageClassPhysicalStorageBufferEXT:
+                case StorageClassUniform:
+                case StorageClassStorageBuffer:
+                case StorageClassPushConstant:
+                case StorageClassInput:
+                case StorageClassOutput:
                     break;
                 default:
-                    if (basicTypeOp == Op::OpTypeInt)
-                        addCapability(Capability::Int16);
-                    if (basicTypeOp == Op::OpTypeFloat)
-                        addCapability(Capability::Float16);
+                    if (basicTypeOp == OpTypeInt)
+                        addCapability(CapabilityInt16);
+                    if (basicTypeOp == OpTypeFloat)
+                        addCapability(CapabilityFloat16);
                     break;
                 }
             }
         }
         break;
-    case Op::OpCopyObject:
+    case OpCopyObject:
         break;
-    case Op::OpFConvert:
-    case Op::OpSConvert:
-    case Op::OpUConvert:
+    case OpFConvert:
+    case OpSConvert:
+    case OpUConvert:
         // Look for any 8/16-bit storage capabilities. If there are none, assume that
         // the convert instruction requires the Float16/Int8/16 capability.
-        if (containsType(typeId, Op::OpTypeFloat, 16) || containsType(typeId, Op::OpTypeInt, 16)) {
+        if (containsType(typeId, OpTypeFloat, 16) || containsType(typeId, OpTypeInt, 16)) {
             bool foundStorage = false;
             for (auto it = capabilities.begin(); it != capabilities.end(); ++it) {
                 spv::Capability cap = *it;
-                if (cap == spv::Capability::StorageInputOutput16 ||
-                    cap == spv::Capability::StoragePushConstant16 ||
-                    cap == spv::Capability::StorageUniformBufferBlock16 ||
-                    cap == spv::Capability::StorageUniform16) {
+                if (cap == spv::CapabilityStorageInputOutput16 ||
+                    cap == spv::CapabilityStoragePushConstant16 ||
+                    cap == spv::CapabilityStorageUniformBufferBlock16 ||
+                    cap == spv::CapabilityStorageUniform16) {
                     foundStorage = true;
                     break;
                 }
             }
             if (!foundStorage) {
-                if (containsType(typeId, Op::OpTypeFloat, 16))
-                    addCapability(Capability::Float16);
-                if (containsType(typeId, Op::OpTypeInt, 16))
-                    addCapability(Capability::Int16);
+                if (containsType(typeId, OpTypeFloat, 16))
+                    addCapability(CapabilityFloat16);
+                if (containsType(typeId, OpTypeInt, 16))
+                    addCapability(CapabilityInt16);
             }
         }
-        if (containsType(typeId, Op::OpTypeInt, 8)) {
+        if (containsType(typeId, OpTypeInt, 8)) {
             bool foundStorage = false;
             for (auto it = capabilities.begin(); it != capabilities.end(); ++it) {
                 spv::Capability cap = *it;
-                if (cap == spv::Capability::StoragePushConstant8 ||
-                    cap == spv::Capability::UniformAndStorageBuffer8BitAccess ||
-                    cap == spv::Capability::StorageBuffer8BitAccess) {
+                if (cap == spv::CapabilityStoragePushConstant8 ||
+                    cap == spv::CapabilityUniformAndStorageBuffer8BitAccess ||
+                    cap == spv::CapabilityStorageBuffer8BitAccess) {
                     foundStorage = true;
                     break;
                 }
             }
             if (!foundStorage) {
-                addCapability(Capability::Int8);
+                addCapability(CapabilityInt8);
             }
         }
         break;
-    case Op::OpExtInst:
+    case OpExtInst:
         switch (inst.getImmediateOperand(1)) {
         case GLSLstd450Frexp:
         case GLSLstd450FrexpStruct:
-            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, Op::OpTypeInt, 16))
+            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, OpTypeInt, 16))
                 addExtension(spv::E_SPV_AMD_gpu_shader_int16);
             break;
         case GLSLstd450InterpolateAtCentroid:
         case GLSLstd450InterpolateAtSample:
         case GLSLstd450InterpolateAtOffset:
-            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, Op::OpTypeFloat, 16))
+            if (getSpvVersion() < spv::Spv_1_3 && containsType(typeId, OpTypeFloat, 16))
                 addExtension(spv::E_SPV_AMD_gpu_shader_half_float);
             break;
         default:
             break;
         }
         break;
-    case Op::OpAccessChain:
-    case Op::OpPtrAccessChain:
+    case OpAccessChain:
+    case OpPtrAccessChain:
         if (isPointerType(typeId))
             break;
-        if (basicTypeOp == Op::OpTypeInt) {
+        if (basicTypeOp == OpTypeInt) {
             if (width == 16)
-                addCapability(Capability::Int16);
+                addCapability(CapabilityInt16);
             else if (width == 8)
-                addCapability(Capability::Int8);
+                addCapability(CapabilityInt8);
         }
         break;
     default:
-        if (basicTypeOp == Op::OpTypeInt) {
+        if (basicTypeOp == OpTypeInt) {
             if (width == 16)
-                addCapability(Capability::Int16);
+                addCapability(CapabilityInt16);
             else if (width == 8)
-                addCapability(Capability::Int8);
+                addCapability(CapabilityInt8);
             else if (width == 64)
-                addCapability(Capability::Int64);
-        } else if (basicTypeOp == Op::OpTypeFloat) {
+                addCapability(CapabilityInt64);
+        } else if (basicTypeOp == OpTypeFloat) {
             if (width == 16)
-                addCapability(Capability::Float16);
+                addCapability(CapabilityFloat16);
             else if (width == 64)
-                addCapability(Capability::Float64);
+                addCapability(CapabilityFloat64);
         }
         break;
     }
 }
 
-unsigned int Builder::postProcessGetLargestScalarSize(const Instruction& type)
-{
-    switch (type.getOpCode()) {
-    case Op::OpTypeBool:
-        return 1;
-    case Op::OpTypeInt:
-    case Op::OpTypeFloat:
-        return type.getImmediateOperand(0) / 8;
-    case Op::OpTypePointer:
-        return 8;
-    case Op::OpTypeVector:
-    case Op::OpTypeMatrix:
-    case Op::OpTypeArray:
-    case Op::OpTypeRuntimeArray: {
-        const Instruction* elem_type = module.getInstruction(type.getIdOperand(0));
-        return postProcessGetLargestScalarSize(*elem_type);
-    }
-    case Op::OpTypeStruct: {
-        unsigned int largest = 0;
-        for (int i = 0; i < type.getNumOperands(); ++i) {
-            const Instruction* elem_type = module.getInstruction(type.getIdOperand(i));
-            unsigned int elem_size = postProcessGetLargestScalarSize(*elem_type);
-            largest = std::max(largest, elem_size);
-        }
-        return largest;
-    }
-    default:
-        return 0;
-    }
-}
-
 // Called for each instruction that resides in a block.
 void Builder::postProcess(Instruction& inst)
 {
     // Add capabilities based simply on the opcode.
     switch (inst.getOpCode()) {
-    case Op::OpExtInst:
+    case OpExtInst:
         switch (inst.getImmediateOperand(1)) {
         case GLSLstd450InterpolateAtCentroid:
         case GLSLstd450InterpolateAtSample:
         case GLSLstd450InterpolateAtOffset:
-            addCapability(Capability::InterpolationFunction);
+            addCapability(CapabilityInterpolationFunction);
             break;
         default:
             break;
         }
         break;
-    case Op::OpDPdxFine:
-    case Op::OpDPdyFine:
-    case Op::OpFwidthFine:
-    case Op::OpDPdxCoarse:
-    case Op::OpDPdyCoarse:
-    case Op::OpFwidthCoarse:
-        addCapability(Capability::DerivativeControl);
+    case OpDPdxFine:
+    case OpDPdyFine:
+    case OpFwidthFine:
+    case OpDPdxCoarse:
+    case OpDPdyCoarse:
+    case OpFwidthCoarse:
+        addCapability(CapabilityDerivativeControl);
         break;
 
-    case Op::OpImageQueryLod:
-    case Op::OpImageQuerySize:
-    case Op::OpImageQuerySizeLod:
-    case Op::OpImageQuerySamples:
-    case Op::OpImageQueryLevels:
-        addCapability(Capability::ImageQuery);
+    case OpImageQueryLod:
+    case OpImageQuerySize:
+    case OpImageQuerySizeLod:
+    case OpImageQuerySamples:
+    case OpImageQueryLevels:
+        addCapability(CapabilityImageQuery);
         break;
 
-    case Op::OpGroupNonUniformPartitionNV:
+    case OpGroupNonUniformPartitionNV:
         addExtension(E_SPV_NV_shader_subgroup_partitioned);
-        addCapability(Capability::GroupNonUniformPartitionedNV);
+        addCapability(CapabilityGroupNonUniformPartitionedNV);
         break;
 
-    case Op::OpLoad:
-    case Op::OpStore:
+    case OpLoad:
+    case OpStore:
         {
             // For any load/store to a PhysicalStorageBufferEXT, walk the accesschain
             // index list to compute the misalignment. The pre-existing alignment value
@@ -280,13 +247,13 @@ void Builder::postProcess(Instruction& inst)
             // the reference type and any scalar component selection in the accesschain,
             // and this function computes the rest from the SPIR-V Offset decorations.
             Instruction *accessChain = module.getInstruction(inst.getIdOperand(0));
-            if (accessChain->getOpCode() == Op::OpAccessChain) {
-                const Instruction* base = module.getInstruction(accessChain->getIdOperand(0));
+            if (accessChain->getOpCode() == OpAccessChain) {
+                Instruction *base = module.getInstruction(accessChain->getIdOperand(0));
                 // Get the type of the base of the access chain. It must be a pointer type.
                 Id typeId = base->getTypeId();
                 Instruction *type = module.getInstruction(typeId);
-                assert(type->getOpCode() == Op::OpTypePointer);
-                if (type->getImmediateOperand(0) != StorageClass::PhysicalStorageBuffer) {
+                assert(type->getOpCode() == OpTypePointer);
+                if (type->getImmediateOperand(0) != StorageClassPhysicalStorageBufferEXT) {
                     break;
                 }
                 // Get the pointee type.
@@ -297,37 +264,31 @@ void Builder::postProcess(Instruction& inst)
                 // Offset/ArrayStride/MatrixStride decorations, and bitwise OR them all
                 // together.
                 int alignment = 0;
-                bool first_struct_elem = false;
                 for (int i = 1; i < accessChain->getNumOperands(); ++i) {
                     Instruction *idx = module.getInstruction(accessChain->getIdOperand(i));
-                    if (type->getOpCode() == Op::OpTypeStruct) {
-                        assert(idx->getOpCode() == Op::OpConstant);
+                    if (type->getOpCode() == OpTypeStruct) {
+                        assert(idx->getOpCode() == OpConstant);
                         unsigned int c = idx->getImmediateOperand(0);
 
                         const auto function = [&](const std::unique_ptr<Instruction>& decoration) {
-                            if (decoration.get()->getOpCode() == Op::OpMemberDecorate &&
+                            if (decoration.get()->getOpCode() == OpMemberDecorate &&
                                 decoration.get()->getIdOperand(0) == typeId &&
                                 decoration.get()->getImmediateOperand(1) == c &&
-                                (decoration.get()->getImmediateOperand(2) == Decoration::Offset ||
-                                 decoration.get()->getImmediateOperand(2) == Decoration::MatrixStride)) {
-                                unsigned int opernad_value = decoration.get()->getImmediateOperand(3);
-                                alignment |= opernad_value;
-                                if (opernad_value == 0 &&
-                                    decoration.get()->getImmediateOperand(2) == Decoration::Offset) {
-                                    first_struct_elem = true;
-                                }
+                                (decoration.get()->getImmediateOperand(2) == DecorationOffset ||
+                                 decoration.get()->getImmediateOperand(2) == DecorationMatrixStride)) {
+                                alignment |= decoration.get()->getImmediateOperand(3);
                             }
                         };
                         std::for_each(decorations.begin(), decorations.end(), function);
                         // get the next member type
                         typeId = type->getIdOperand(c);
                         type = module.getInstruction(typeId);
-                    } else if (type->getOpCode() == Op::OpTypeArray ||
-                               type->getOpCode() == Op::OpTypeRuntimeArray) {
+                    } else if (type->getOpCode() == OpTypeArray ||
+                               type->getOpCode() == OpTypeRuntimeArray) {
                         const auto function = [&](const std::unique_ptr<Instruction>& decoration) {
-                            if (decoration.get()->getOpCode() == Op::OpDecorate &&
+                            if (decoration.get()->getOpCode() == OpDecorate &&
                                 decoration.get()->getIdOperand(0) == typeId &&
-                                decoration.get()->getImmediateOperand(1) == Decoration::ArrayStride) {
+                                decoration.get()->getImmediateOperand(1) == DecorationArrayStride) {
                                 alignment |= decoration.get()->getImmediateOperand(2);
                             }
                         };
@@ -341,51 +302,18 @@ void Builder::postProcess(Instruction& inst)
                     }
                 }
                 assert(inst.getNumOperands() >= 3);
-                const bool is_store = inst.getOpCode() == Op::OpStore;
-                auto const memoryAccess = (MemoryAccessMask)inst.getImmediateOperand(is_store ? 2 : 1);
-                assert(anySet(memoryAccess, MemoryAccessMask::Aligned));
+                unsigned int memoryAccess = inst.getImmediateOperand((inst.getOpCode() == OpStore) ? 2 : 1);
+                assert(memoryAccess & MemoryAccessAlignedMask);
                 static_cast<void>(memoryAccess);
-
                 // Compute the index of the alignment operand.
                 int alignmentIdx = 2;
-                if (is_store)
+                if (inst.getOpCode() == OpStore)
                     alignmentIdx++;
                 // Merge new and old (mis)alignment
                 alignment |= inst.getImmediateOperand(alignmentIdx);
-
-                if (!is_store) {
-                    Instruction* inst_type = module.getInstruction(inst.getTypeId());
-                    if (inst_type->getOpCode() == Op::OpTypePointer &&
-                        inst_type->getImmediateOperand(0) == StorageClass::PhysicalStorageBuffer) {
-                        // This means we are loading a pointer which means need to ensure it is at least 8-byte aligned
-                        // See https://github.com/KhronosGroup/glslang/issues/4084
-                        // In case the alignment is currently 4, need to ensure it is 8 before grabbing the LSB
-                        alignment |= 8;
-                        alignment &= 8;
-                    }
-                }
-
                 // Pick the LSB
                 alignment = alignment & ~(alignment & (alignment-1));
-
-                // The edge case we find is when copying a struct to another struct, we never find the alignment anywhere,
-                // so in this case, fallback to doing a full size lookup on the type
-                if (alignment == 0 && first_struct_elem) {
-                    // Quick get the struct type back
-                    const Instruction* pointer_type = module.getInstruction(base->getTypeId());
-                    const Instruction* struct_type = module.getInstruction(pointer_type->getIdOperand(1));
-                    assert(struct_type->getOpCode() == Op::OpTypeStruct);
-
-                    const Instruction* elem_type = module.getInstruction(struct_type->getIdOperand(0));
-                    unsigned int largest_scalar = postProcessGetLargestScalarSize(*elem_type);
-                    if (largest_scalar != 0) {
-                        alignment = largest_scalar;
-                    } else {
-                        alignment = 16; // fallback if can't determine a godo alignment
-                    }
-                }
                 // update the Aligned operand
-                assert(alignment != 0);
                 inst.setImmediateOperand(alignmentIdx, alignment);
             }
             break;
@@ -459,14 +387,12 @@ void Builder::postProcessCFG()
     }
 
     // Remove unneeded decorations, for unreachable instructions
-    for (auto decorationIter = decorations.begin(); decorationIter != decorations.end();) {
-        Id decorationId = (*decorationIter)->getIdOperand(0);
-        if (unreachableDefinitions.count(decorationId) != 0) {
-            decorationIter = decorations.erase(decorationIter);
-        } else {
-            ++decorationIter;
-        }
-    }
+    decorations.erase(std::remove_if(decorations.begin(), decorations.end(),
+        [&unreachableDefinitions](std::unique_ptr<Instruction>& I) -> bool {
+            Id decoration_id = I.get()->getIdOperand(0);
+            return unreachableDefinitions.count(decoration_id) != 0;
+        }),
+        decorations.end());
 }
 
 // comment in header
@@ -476,17 +402,17 @@ void Builder::postProcessFeatures() {
     // Look for any 8/16 bit type in physical storage buffer class, and set the
     // appropriate capability. This happens in createSpvVariable for other storage
     // classes, but there isn't always a variable for physical storage buffer.
-    for (int t = 0; t < (int)groupedTypes[enumCast(Op::OpTypePointer)].size(); ++t) {
-        Instruction* type = groupedTypes[enumCast(Op::OpTypePointer)][t];
-        if (type->getImmediateOperand(0) == (unsigned)StorageClass::PhysicalStorageBufferEXT) {
-            if (containsType(type->getIdOperand(1), Op::OpTypeInt, 8)) {
+    for (int t = 0; t < (int)groupedTypes[OpTypePointer].size(); ++t) {
+        Instruction* type = groupedTypes[OpTypePointer][t];
+        if (type->getImmediateOperand(0) == (unsigned)StorageClassPhysicalStorageBufferEXT) {
+            if (containsType(type->getIdOperand(1), OpTypeInt, 8)) {
                 addIncorporatedExtension(spv::E_SPV_KHR_8bit_storage, spv::Spv_1_5);
-                addCapability(spv::Capability::StorageBuffer8BitAccess);
+                addCapability(spv::CapabilityStorageBuffer8BitAccess);
             }
-            if (containsType(type->getIdOperand(1), Op::OpTypeInt, 16) ||
-                containsType(type->getIdOperand(1), Op::OpTypeFloat, 16)) {
+            if (containsType(type->getIdOperand(1), OpTypeInt, 16) ||
+                containsType(type->getIdOperand(1), OpTypeFloat, 16)) {
                 addIncorporatedExtension(spv::E_SPV_KHR_16bit_storage, spv::Spv_1_3);
-                addCapability(spv::Capability::StorageBuffer16BitAccess);
+                addCapability(spv::CapabilityStorageBuffer16BitAccess);
             }
         }
     }
@@ -509,15 +435,15 @@ void Builder::postProcessFeatures() {
                     bool foundDecoration = false;
                     const auto function = [&](const std::unique_ptr<Instruction>& decoration) {
                         if (decoration.get()->getIdOperand(0) == resultId &&
-                            decoration.get()->getOpCode() == Op::OpDecorate &&
-                            (decoration.get()->getImmediateOperand(1) == spv::Decoration::AliasedPointerEXT ||
-                             decoration.get()->getImmediateOperand(1) == spv::Decoration::RestrictPointerEXT)) {
+                            decoration.get()->getOpCode() == OpDecorate &&
+                            (decoration.get()->getImmediateOperand(1) == spv::DecorationAliasedPointerEXT ||
+                             decoration.get()->getImmediateOperand(1) == spv::DecorationRestrictPointerEXT)) {
                             foundDecoration = true;
                         }
                     };
                     std::for_each(decorations.begin(), decorations.end(), function);
                     if (!foundDecoration) {
-                        addDecoration(resultId, spv::Decoration::AliasedPointerEXT);
+                        addDecoration(resultId, spv::DecorationAliasedPointerEXT);
                     }
                 }
             }
@@ -526,13 +452,13 @@ void Builder::postProcessFeatures() {
 
     // If any Vulkan memory model-specific functionality is used, update the
     // OpMemoryModel to match.
-    if (capabilities.find(spv::Capability::VulkanMemoryModelKHR) != capabilities.end()) {
-        memoryModel = spv::MemoryModel::VulkanKHR;
+    if (capabilities.find(spv::CapabilityVulkanMemoryModelKHR) != capabilities.end()) {
+        memoryModel = spv::MemoryModelVulkanKHR;
         addIncorporatedExtension(spv::E_SPV_KHR_vulkan_memory_model, spv::Spv_1_5);
     }
 
     // Add Aliased decoration if there's more than one Workgroup Block variable.
-    if (capabilities.find(spv::Capability::WorkgroupMemoryExplicitLayoutKHR) != capabilities.end()) {
+    if (capabilities.find(spv::CapabilityWorkgroupMemoryExplicitLayoutKHR) != capabilities.end()) {
         assert(entryPoints.size() == 1);
         auto &ep = entryPoints[0];
 
@@ -543,72 +469,20 @@ void Builder::postProcessFeatures() {
 
             const Id id = ep->getIdOperand(i);
             const Instruction *instr = module.getInstruction(id);
-            if (instr->getOpCode() != spv::Op::OpVariable)
+            if (instr->getOpCode() != spv::OpVariable)
                 continue;
 
-            if (instr->getImmediateOperand(0) == spv::StorageClass::Workgroup)
+            if (instr->getImmediateOperand(0) == spv::StorageClassWorkgroup)
                 workgroup_variables.push_back(id);
         }
 
         if (workgroup_variables.size() > 1) {
             for (size_t i = 0; i < workgroup_variables.size(); i++)
-                addDecoration(workgroup_variables[i], spv::Decoration::Aliased);
+                addDecoration(workgroup_variables[i], spv::DecorationAliased);
         }
     }
 }
 
-// SPIR-V requires that any instruction consuming the result of an OpSampledImage
-// be in the same block as the OpSampledImage instruction. This pass goes finds
-// uses of OpSampledImage where that is not the case and duplicates the
-// OpSampledImage to be immediately before the instruction that consumes it.
-// The old OpSampledImage is left in place, potentially with no users.
-void Builder::postProcessSamplers()
-{
-    // first, find all OpSampledImage instructions and store them in a map.
-    std::map<Id, Instruction*> sampledImageInstrs;
-    for (auto f: module.getFunctions()) {
-	for (auto b: f->getBlocks()) {
-	    for (auto &i: b->getInstructions()) {
-        if (i->getOpCode() == spv::Op::OpSampledImage) {
-		    sampledImageInstrs[i->getResultId()] = i.get();
-		}
-	    }
-	}
-    }
-    // next find all uses of the given ids and rewrite them if needed.
-    for (auto f: module.getFunctions()) {
-	for (auto b: f->getBlocks()) {
-            auto &instrs = b->getInstructions();
-            for (size_t idx = 0; idx < instrs.size(); idx++) {
-                Instruction *i = instrs[idx].get();
-                for (int opnum = 0; opnum < i->getNumOperands(); opnum++) {
-                    // Is this operand of the current instruction the result of an OpSampledImage?
-                    if (i->isIdOperand(opnum) &&
-                        sampledImageInstrs.count(i->getIdOperand(opnum)))
-                    {
-                        Instruction *opSampImg = sampledImageInstrs[i->getIdOperand(opnum)];
-                        if (i->getBlock() != opSampImg->getBlock()) {
-                            Instruction *newInstr = new Instruction(getUniqueId(),
-                                                                    opSampImg->getTypeId(),
-                                                                    spv::Op::OpSampledImage);
-                            newInstr->addIdOperand(opSampImg->getIdOperand(0));
-                            newInstr->addIdOperand(opSampImg->getIdOperand(1));
-                            newInstr->setBlock(b);
-
-                            // rewrite the user of the OpSampledImage to use the new instruction.
-                            i->setIdOperand(opnum, newInstr->getResultId());
-                            // insert the new OpSampledImage right before the current instruction.
-                            instrs.insert(instrs.begin() + idx,
-                                    std::unique_ptr<Instruction>(newInstr));
-                            idx++;
-                        }
-                    }
-                }
-            }
-	}
-    }
-}
-
 // comment in header
 void Builder::postProcess(bool compileOnly)
 {
@@ -617,7 +491,6 @@ void Builder::postProcess(bool compileOnly)
         postProcessCFG();
 
     postProcessFeatures();
-    postProcessSamplers();
 }
 
-} // end spv namespace
+}; // end spv namespace
diff --git a/engine/thirdparty/glslang/SPIRV/SpvTools.cpp b/engine/thirdparty/glslang/SPIRV/SpvTools.cpp
index d1b411f2..ff04f4f9 100644
--- a/engine/thirdparty/glslang/SPIRV/SpvTools.cpp
+++ b/engine/thirdparty/glslang/SPIRV/SpvTools.cpp
@@ -44,7 +44,6 @@
 
 #include "SpvTools.h"
 #include "spirv-tools/optimizer.hpp"
-#include "glslang/MachineIndependent/localintermediate.h"
 
 namespace glslang {
 
@@ -71,8 +70,6 @@ spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLog
         return spv_target_env::SPV_ENV_VULKAN_1_2;
     case glslang::EShTargetVulkan_1_3:
         return spv_target_env::SPV_ENV_VULKAN_1_3;
-    case glslang::EShTargetVulkan_1_4:
-        return spv_target_env::SPV_ENV_VULKAN_1_4;
     default:
         break;
     }
@@ -84,11 +81,6 @@ spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLog
     return spv_target_env::SPV_ENV_UNIVERSAL_1_0;
 }
 
-spv_target_env MapToSpirvToolsEnv(const glslang::TIntermediate& intermediate, spv::SpvBuildLogger* logger)
-{
-    return MapToSpirvToolsEnv(intermediate.getSpv(), logger);
-}
-
 // Callback passed to spvtools::Optimizer::SetMessageConsumer
 void OptimizerMesssageConsumer(spv_message_level_t level, const char *source,
         const spv_position_t &position, const char *message)
@@ -165,7 +157,6 @@ void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<
     spvValidatorOptionsSetBeforeHlslLegalization(options, prelegalization);
     spvValidatorOptionsSetScalarBlockLayout(options, intermediate.usingScalarBlockLayout());
     spvValidatorOptionsSetWorkgroupScalarBlockLayout(options, intermediate.usingScalarBlockLayout());
-    spvValidatorOptionsSetAllowOffsetTextureOperand(options, intermediate.usingTextureOffsetNonConst());
     spvValidateWithOptions(context, options, &binary, &diagnostic);
 
     // report
@@ -227,20 +218,9 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector
     optimizer.RegisterPass(spvtools::CreateCFGCleanupPass());
 
     spvtools::OptimizerOptions spvOptOptions;
-    if (options->optimizerAllowExpandedIDBound)
-        spvOptOptions.set_max_id_bound(0x3FFFFFFF);
     optimizer.SetTargetEnv(MapToSpirvToolsEnv(intermediate.getSpv(), logger));
     spvOptOptions.set_run_validator(false); // The validator may run as a separate step later on
     optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
-
-    if (options->optimizerAllowExpandedIDBound) {
-        if (spirv.size() > 3 && spirv[3] > kDefaultMaxIdBound) {
-            spvtools::Optimizer optimizer2(target_env);
-            optimizer2.SetMessageConsumer(OptimizerMesssageConsumer);
-            optimizer2.RegisterPass(spvtools::CreateCompactIdsPass());
-            optimizer2.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
-        }
-    }
 }
 
 bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
@@ -312,6 +292,6 @@ void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
     optimizer.Run(spirv.data(), spirv.size(), &spirv, spvOptOptions);
 }
 
-} // end namespace glslang
+}; // end namespace glslang
 
 #endif
diff --git a/engine/thirdparty/glslang/SPIRV/SpvTools.h b/engine/thirdparty/glslang/SPIRV/SpvTools.h
index 45585723..eabde466 100644
--- a/engine/thirdparty/glslang/SPIRV/SpvTools.h
+++ b/engine/thirdparty/glslang/SPIRV/SpvTools.h
@@ -44,12 +44,10 @@
 #if ENABLE_OPT
 #include <vector>
 #include <ostream>
-#include <unordered_set>
 #include "spirv-tools/libspirv.h"
 #endif
 
-#include "glslang/MachineIndependent/Versions.h"
-#include "glslang/Include/visibility.h"
+#include "glslang/MachineIndependent/localintermediate.h"
 #include "GlslangToSpv.h"
 #include "Logger.h"
 
@@ -57,50 +55,45 @@ namespace glslang {
 
 #if ENABLE_OPT
 
-class TIntermediate;
-
 // Translate glslang's view of target versioning to what SPIRV-Tools uses.
-GLSLANG_EXPORT spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLogger* logger);
-GLSLANG_EXPORT spv_target_env MapToSpirvToolsEnv(const glslang::TIntermediate& intermediate, spv::SpvBuildLogger* logger);
+spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLogger* logger);
 
 // Use the SPIRV-Tools disassembler to print SPIR-V using a SPV_ENV_UNIVERSAL_1_3 environment.
-GLSLANG_EXPORT void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv);
+void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv);
 
 // Use the SPIRV-Tools disassembler to print SPIR-V with a provided SPIR-V environment.
-GLSLANG_EXPORT void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv,
-                                          spv_target_env requested_context);
+void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv,
+                           spv_target_env requested_context);
 
 // Apply the SPIRV-Tools validator to generated SPIR-V.
-GLSLANG_EXPORT void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
-                                       spv::SpvBuildLogger*, bool prelegalization);
+void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
+                        spv::SpvBuildLogger*, bool prelegalization);
 
 // Apply the SPIRV-Tools optimizer to generated SPIR-V.  HLSL SPIR-V is legalized in the process.
-GLSLANG_EXPORT void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
-                                        spv::SpvBuildLogger*, const SpvOptions*);
+void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
+                         spv::SpvBuildLogger*, const SpvOptions*);
 
 // Apply the SPIRV-Tools EliminateDeadInputComponents pass to generated SPIR-V. Put result in |spirv|.
-GLSLANG_EXPORT void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv,
-                                                           spv::SpvBuildLogger*);
+void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv,
+                                            spv::SpvBuildLogger*);
 
 // Apply the SPIRV-Tools AnalyzeDeadOutputStores pass to generated SPIR-V. Put result in |live_locs|.
 // Return true if the result is valid.
-GLSLANG_EXPORT bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
-                                                      std::unordered_set<uint32_t>* live_locs,
-                                                      std::unordered_set<uint32_t>* live_builtins,
-                                                      spv::SpvBuildLogger*);
+bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
+                                       std::unordered_set<uint32_t>* live_locs,
+                                       std::unordered_set<uint32_t>* live_builtins, spv::SpvBuildLogger*);
 
 // Apply the SPIRV-Tools EliminateDeadOutputStores and AggressiveDeadCodeElimination passes to generated SPIR-V using
 // |live_locs|. Put result in |spirv|.
-GLSLANG_EXPORT void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
-                                                        std::unordered_set<uint32_t>* live_locs,
-                                                        std::unordered_set<uint32_t>* live_builtins,
-                                                        spv::SpvBuildLogger*);
+void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
+                                         std::unordered_set<uint32_t>* live_locs,
+                                         std::unordered_set<uint32_t>* live_builtins, spv::SpvBuildLogger*);
 
 // Apply the SPIRV-Tools optimizer to strip debug info from SPIR-V.  This is implicitly done by
 // SpirvToolsTransform if spvOptions->stripDebugInfo is set, but can be called separately if
 // optimization is disabled.
-GLSLANG_EXPORT void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
-                                             std::vector<unsigned int>& spirv, spv::SpvBuildLogger*);
+void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
+        std::vector<unsigned int>& spirv, spv::SpvBuildLogger*);
 
 #endif
 
diff --git a/engine/thirdparty/glslang/SPIRV/disassemble.cpp b/engine/thirdparty/glslang/SPIRV/disassemble.cpp
index 9b85ff28..ab77610c 100644
--- a/engine/thirdparty/glslang/SPIRV/disassemble.cpp
+++ b/engine/thirdparty/glslang/SPIRV/disassemble.cpp
@@ -36,7 +36,6 @@
 // Disassembler for SPIR-V.
 //
 
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
@@ -48,7 +47,6 @@
 
 #include "disassemble.h"
 #include "doc.h"
-#include "spvUtil.h"
 
 namespace spv {
     extern "C" {
@@ -61,7 +59,7 @@ namespace spv {
         #include "GLSL.ext.QCOM.h"
     }
 }
-static const char* GlslStd450DebugNames[spv::GLSLstd450Count];
+const char* GlslStd450DebugNames[spv::GLSLstd450Count];
 
 namespace spv {
 
@@ -98,7 +96,7 @@ public:
 protected:
     SpirvStream(const SpirvStream&);
     SpirvStream& operator=(const SpirvStream&);
-    Op getOpCode(int id) const { return idInstruction[id] ? (Op)(stream[idInstruction[id]] & OpCodeMask) : Op::OpNop; }
+    Op getOpCode(int id) const { return idInstruction[id] ? (Op)(stream[idInstruction[id]] & OpCodeMask) : OpNop; }
 
     // Output methods
     void outputIndent();
@@ -188,14 +186,14 @@ void SpirvStream::processInstructions()
 
         // Type <id>
         Id typeId = 0;
-        if (InstructionDesc[enumCast(opCode)].hasType()) {
+        if (InstructionDesc[opCode].hasType()) {
             typeId = stream[word++];
             --numOperands;
         }
 
         // Result <id>
         Id resultId = 0;
-        if (InstructionDesc[enumCast(opCode)].hasResult()) {
+        if (InstructionDesc[opCode].hasResult()) {
             resultId = stream[word++];
             --numOperands;
 
@@ -340,38 +338,26 @@ int SpirvStream::disassembleString()
     return decoderes.first;
 }
 
-static uint32_t popcount(uint32_t mask)
-{
-    uint32_t count = 0;
-    while (mask) {
-        if (mask & 1) {
-            count++;
-        }
-        mask >>= 1;
-    }
-    return count;
-}
-
 void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode, int numOperands)
 {
     // Process the opcode
 
-    out << (OpcodeString((int)opCode) + 2);  // leave out the "Op"
+    out << (OpcodeString(opCode) + 2);  // leave out the "Op"
 
-    if (opCode == Op::OpLoopMerge || opCode == Op::OpSelectionMerge)
+    if (opCode == OpLoopMerge || opCode == OpSelectionMerge)
         nextNestedControl = stream[word];
-    else if (opCode == Op::OpBranchConditional || opCode == Op::OpSwitch) {
+    else if (opCode == OpBranchConditional || opCode == OpSwitch) {
         if (nextNestedControl) {
             nestedControl.push(nextNestedControl);
             nextNestedControl = 0;
         }
-    } else if (opCode == Op::OpExtInstImport) {
+    } else if (opCode == OpExtInstImport) {
         idDescriptor[resultId] = decodeString().second;
     }
     else {
         if (resultId != 0 && idDescriptor[resultId].size() == 0) {
             switch (opCode) {
-            case Op::OpTypeInt:
+            case OpTypeInt:
                 switch (stream[word]) {
                 case 8:  idDescriptor[resultId] = "int8_t"; break;
                 case 16: idDescriptor[resultId] = "int16_t"; break;
@@ -380,49 +366,26 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
                 case 64: idDescriptor[resultId] = "int64_t"; break;
                 }
                 break;
-            case Op::OpTypeFloat:
+            case OpTypeFloat:
                 switch (stream[word]) {
-                case 8:
-                case 16:
-                    if (numOperands > 1) {
-                        switch (stream[word+1]) {
-                        default:
-                            assert(0); [[fallthrough]];
-                        case (int)spv::FPEncoding::BFloat16KHR:
-                            idDescriptor[resultId] = "bfloat16_t";
-                            break;
-                        case (int)spv::FPEncoding::Float8E4M3EXT:
-                            idDescriptor[resultId] = "floate4m3_t";
-                            break;
-                        case (int)spv::FPEncoding::Float8E5M2EXT:
-                            idDescriptor[resultId] = "floate5m2_t";
-                            break;
-                        }
-                    } else {
-                        idDescriptor[resultId] = "float16_t";
-                    }
-                    break;
+                case 16: idDescriptor[resultId] = "float16_t"; break;
                 default: assert(0); [[fallthrough]];
                 case 32: idDescriptor[resultId] = "float"; break;
                 case 64: idDescriptor[resultId] = "float64_t"; break;
                 }
                 break;
-            case Op::OpTypeBool:
+            case OpTypeBool:
                 idDescriptor[resultId] = "bool";
                 break;
-            case Op::OpTypeStruct:
+            case OpTypeStruct:
                 idDescriptor[resultId] = "struct";
                 break;
-            case Op::OpTypePointer:
+            case OpTypePointer:
                 idDescriptor[resultId] = "ptr";
                 break;
-            case Op::OpTypeVector:
+            case OpTypeVector:
                 if (idDescriptor[stream[word]].size() > 0) {
-                    if (idDescriptor[stream[word]].substr(0,2) == "bf") {
-                        idDescriptor[resultId].append(idDescriptor[stream[word]].begin(), idDescriptor[stream[word]].begin() + 2);
-                    } else {
-                        idDescriptor[resultId].append(idDescriptor[stream[word]].begin(), idDescriptor[stream[word]].begin() + 1);
-                    }
+                    idDescriptor[resultId].append(idDescriptor[stream[word]].begin(), idDescriptor[stream[word]].begin() + 1);
                     if (strstr(idDescriptor[stream[word]].c_str(), "8")) {
                         idDescriptor[resultId].append("8");
                     }
@@ -454,10 +417,10 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
     // swapped in mid-traversal.
 
     // Handle images specially, so can put out helpful strings.
-    if (opCode == Op::OpTypeImage) {
+    if (opCode == OpTypeImage) {
         out << " ";
         disassembleIds(1);
-        out << " " << DimensionString((int)(Dim)stream[word++]);
+        out << " " << DimensionString((Dim)stream[word++]);
         out << (stream[word++] != 0 ? " depth" : "");
         out << (stream[word++] != 0 ? " array" : "");
         out << (stream[word++] != 0 ? " multi-sampled" : "");
@@ -466,7 +429,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
         case 1: out << " sampled";    break;
         case 2: out << " nonsampled"; break;
         }
-        out << " format:" << ImageFormatString((int)(ImageFormat)stream[word++]);
+        out << " format:" << ImageFormatString((ImageFormat)stream[word++]);
 
         if (numOperands == 8) {
             out << " " << AccessQualifierString(stream[word++]);
@@ -475,9 +438,9 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
     }
 
     // Handle all the parameterized operands
-    for (int op = 0; op < InstructionDesc[enumCast(opCode)].operands.getNum() && numOperands > 0; ++op) {
+    for (int op = 0; op < InstructionDesc[opCode].operands.getNum() && numOperands > 0; ++op) {
         out << " ";
-        OperandClass operandClass = InstructionDesc[enumCast(opCode)].operands.getClass(op);
+        OperandClass operandClass = InstructionDesc[opCode].operands.getClass(op);
         switch (operandClass) {
         case OperandId:
         case OperandScope:
@@ -485,7 +448,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
             disassembleIds(1);
             --numOperands;
             // Get names for printing "(XXX)" for readability, *after* this id
-            if (opCode == Op::OpName)
+            if (opCode == OpName)
                 idDescriptor[stream[word - 1]] = decodeString().second;
             break;
         case OperandVariableIds:
@@ -498,8 +461,8 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
             return;
         case OperandOptionalLiteral:
         case OperandVariableLiterals:
-            if ((opCode == Op::OpDecorate && stream[word - 1] == Decoration::BuiltIn) ||
-                (opCode == Op::OpMemberDecorate && stream[word - 1] == Decoration::BuiltIn)) {
+            if ((opCode == OpDecorate && stream[word - 1] == DecorationBuiltIn) ||
+                (opCode == OpMemberDecorate && stream[word - 1] == DecorationBuiltIn)) {
                 out << BuiltInString(stream[word++]);
                 --numOperands;
                 ++op;
@@ -535,7 +498,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
         case OperandLiteralNumber:
             disassembleImmediates(1);
             --numOperands;
-            if (opCode == Op::OpExtInst) {
+            if (opCode == OpExtInst) {
                 ExtInstSet extInstSet = GLSL450Inst;
                 const char* name = idDescriptor[stream[word - 2]].c_str();
                 if (strcmp("OpenCL.std", name) == 0) {
@@ -589,41 +552,18 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
                 numOperands -= disassembleString();
             return;
         case OperandMemoryAccess:
-            {
-                outputMask(OperandMemoryAccess, stream[word++]);
-                --numOperands;
-                // Put a space after "None" if there are any remaining operands
-                if (numOperands && stream[word-1] == 0) {
+            outputMask(OperandMemoryAccess, stream[word++]);
+            --numOperands;
+            // Aligned is the only memory access operand that uses an immediate
+            // value, and it is also the first operand that uses a value at all.
+            if (stream[word-1] & MemoryAccessAlignedMask) {
+                disassembleImmediates(1);
+                numOperands--;
+                if (numOperands)
                     out << " ";
-                }
-                uint32_t mask = stream[word-1];
-                // Aligned is the only memory access operand that uses an immediate
-                // value, and it is also the first operand that uses a value at all.
-                if (mask & (uint32_t)MemoryAccessMask::Aligned) {
-                    disassembleImmediates(1);
-                    numOperands--;
-                    if (numOperands)
-                        out << " ";
-                }
-
-                uint32_t bitCount = popcount(mask & (uint32_t)(MemoryAccessMask::MakePointerAvailable | MemoryAccessMask::MakePointerVisible));
-                disassembleIds(bitCount);
-                numOperands -= bitCount;
             }
-            break;
-        case OperandTensorAddressingOperands:
-            {
-                outputMask(OperandTensorAddressingOperands, stream[word++]);
-                --numOperands;
-                // Put a space after "None" if there are any remaining operands
-                if (numOperands && stream[word-1] == 0) {
-                    out << " ";
-                }
-                uint32_t bitCount = popcount(stream[word-1]);
-                disassembleIds(bitCount);
-                numOperands -= bitCount;
-            }
-            break;
+            disassembleIds(numOperands);
+            return;
         default:
             assert(operandClass >= OperandSource && operandClass < OperandOpcode);
 
@@ -781,41 +721,41 @@ static const char* GLSLextNVGetDebugNames(const char* name, unsigned entrypoint)
         strcmp(name, spv::E_SPV_NV_shader_image_footprint) == 0) {
         switch (entrypoint) {
         // NV builtins
-        case (unsigned)BuiltIn::ViewportMaskNV:                 return "ViewportMaskNV";
-        case (unsigned)BuiltIn::SecondaryPositionNV:            return "SecondaryPositionNV";
-        case (unsigned)BuiltIn::SecondaryViewportMaskNV:        return "SecondaryViewportMaskNV";
-        case (unsigned)BuiltIn::PositionPerViewNV:              return "PositionPerViewNV";
-        case (unsigned)BuiltIn::ViewportMaskPerViewNV:          return "ViewportMaskPerViewNV";
-        case (unsigned)BuiltIn::BaryCoordNV:                    return "BaryCoordNV";
-        case (unsigned)BuiltIn::BaryCoordNoPerspNV:             return "BaryCoordNoPerspNV";
-        case (unsigned)BuiltIn::TaskCountNV:                    return "TaskCountNV";
-        case (unsigned)BuiltIn::PrimitiveCountNV:               return "PrimitiveCountNV";
-        case (unsigned)BuiltIn::PrimitiveIndicesNV:             return "PrimitiveIndicesNV";
-        case (unsigned)BuiltIn::ClipDistancePerViewNV:          return "ClipDistancePerViewNV";
-        case (unsigned)BuiltIn::CullDistancePerViewNV:          return "CullDistancePerViewNV";
-        case (unsigned)BuiltIn::LayerPerViewNV:                 return "LayerPerViewNV";
-        case (unsigned)BuiltIn::MeshViewCountNV:                return "MeshViewCountNV";
-        case (unsigned)BuiltIn::MeshViewIndicesNV:              return "MeshViewIndicesNV";
+        case BuiltInViewportMaskNV:                 return "ViewportMaskNV";
+        case BuiltInSecondaryPositionNV:            return "SecondaryPositionNV";
+        case BuiltInSecondaryViewportMaskNV:        return "SecondaryViewportMaskNV";
+        case BuiltInPositionPerViewNV:              return "PositionPerViewNV";
+        case BuiltInViewportMaskPerViewNV:          return "ViewportMaskPerViewNV";
+        case BuiltInBaryCoordNV:                    return "BaryCoordNV";
+        case BuiltInBaryCoordNoPerspNV:             return "BaryCoordNoPerspNV";
+        case BuiltInTaskCountNV:                    return "TaskCountNV";
+        case BuiltInPrimitiveCountNV:               return "PrimitiveCountNV";
+        case BuiltInPrimitiveIndicesNV:             return "PrimitiveIndicesNV";
+        case BuiltInClipDistancePerViewNV:          return "ClipDistancePerViewNV";
+        case BuiltInCullDistancePerViewNV:          return "CullDistancePerViewNV";
+        case BuiltInLayerPerViewNV:                 return "LayerPerViewNV";
+        case BuiltInMeshViewCountNV:                return "MeshViewCountNV";
+        case BuiltInMeshViewIndicesNV:              return "MeshViewIndicesNV";
 
         // NV Capabilities
-        case (unsigned)Capability::GeometryShaderPassthroughNV: return "GeometryShaderPassthroughNV";
-        case (unsigned)Capability::ShaderViewportMaskNV:        return "ShaderViewportMaskNV";
-        case (unsigned)Capability::ShaderStereoViewNV:          return "ShaderStereoViewNV";
-        case (unsigned)Capability::PerViewAttributesNV:         return "PerViewAttributesNV";
-        case (unsigned)Capability::FragmentBarycentricNV:       return "FragmentBarycentricNV";
-        case (unsigned)Capability::MeshShadingNV:               return "MeshShadingNV";
-        case (unsigned)Capability::ImageFootprintNV:            return "ImageFootprintNV";
-        case (unsigned)Capability::SampleMaskOverrideCoverageNV:return "SampleMaskOverrideCoverageNV";
+        case CapabilityGeometryShaderPassthroughNV: return "GeometryShaderPassthroughNV";
+        case CapabilityShaderViewportMaskNV:        return "ShaderViewportMaskNV";
+        case CapabilityShaderStereoViewNV:          return "ShaderStereoViewNV";
+        case CapabilityPerViewAttributesNV:         return "PerViewAttributesNV";
+        case CapabilityFragmentBarycentricNV:       return "FragmentBarycentricNV";
+        case CapabilityMeshShadingNV:               return "MeshShadingNV";
+        case CapabilityImageFootprintNV:            return "ImageFootprintNV";
+        case CapabilitySampleMaskOverrideCoverageNV:return "SampleMaskOverrideCoverageNV";
 
         // NV Decorations
-        case (unsigned)Decoration::OverrideCoverageNV:          return "OverrideCoverageNV";
-        case (unsigned)Decoration::PassthroughNV:               return "PassthroughNV";
-        case (unsigned)Decoration::ViewportRelativeNV:          return "ViewportRelativeNV";
-        case (unsigned)Decoration::SecondaryViewportRelativeNV: return "SecondaryViewportRelativeNV";
-        case (unsigned)Decoration::PerVertexNV:                 return "PerVertexNV";
-        case (unsigned)Decoration::PerPrimitiveNV:              return "PerPrimitiveNV";
-        case (unsigned)Decoration::PerViewNV:                   return "PerViewNV";
-        case (unsigned)Decoration::PerTaskNV:                   return "PerTaskNV";
+        case DecorationOverrideCoverageNV:          return "OverrideCoverageNV";
+        case DecorationPassthroughNV:               return "PassthroughNV";
+        case DecorationViewportRelativeNV:          return "ViewportRelativeNV";
+        case DecorationSecondaryViewportRelativeNV: return "SecondaryViewportRelativeNV";
+        case DecorationPerVertexNV:                 return "PerVertexNV";
+        case DecorationPerPrimitiveNV:              return "PerPrimitiveNV";
+        case DecorationPerViewNV:                   return "PerViewNV";
+        case DecorationPerTaskNV:                   return "PerTaskNV";
 
         default:                                    return "Bad";
         }
@@ -885,4 +825,4 @@ void Disassemble(std::ostream& out, const std::vector<unsigned int>& stream)
     SpirvStream.processInstructions();
 }
 
-} // end namespace spv
+}; // end namespace spv
diff --git a/engine/thirdparty/glslang/SPIRV/disassemble.h b/engine/thirdparty/glslang/SPIRV/disassemble.h
index 3bded14f..b6a46357 100644
--- a/engine/thirdparty/glslang/SPIRV/disassemble.h
+++ b/engine/thirdparty/glslang/SPIRV/disassemble.h
@@ -43,12 +43,10 @@
 #include <iostream>
 #include <vector>
 
-#include "glslang/Include/visibility.h"
-
 namespace spv {
 
     // disassemble with glslang custom disassembler
-    GLSLANG_EXPORT void Disassemble(std::ostream& out, const std::vector<unsigned int>&);
+    void Disassemble(std::ostream& out, const std::vector<unsigned int>&);
 
 }  // end namespace spv
 
diff --git a/engine/thirdparty/glslang/SPIRV/doc.cpp b/engine/thirdparty/glslang/SPIRV/doc.cpp
index dcc9b4e1..ea4915fe 100644
--- a/engine/thirdparty/glslang/SPIRV/doc.cpp
+++ b/engine/thirdparty/glslang/SPIRV/doc.cpp
@@ -1,6 +1,6 @@
 //
 // Copyright (C) 2014-2015 LunarG, Inc.
-// Copyright (C) 2022-2025 Arm Limited.
+// Copyright (C) 2022-2024 Arm Limited.
 // Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
 //
 // All rights reserved.
@@ -42,7 +42,6 @@
 //
 
 #include "doc.h"
-#include "spvUtil.h"
 
 #include <cstdio>
 #include <cstring>
@@ -100,19 +99,19 @@ const char* ExecutionModelString(int model)
     case 4:  return "Fragment";
     case 5:  return "GLCompute";
     case 6:  return "Kernel";
-    case (int)ExecutionModel::TaskNV: return "TaskNV";
-    case (int)ExecutionModel::MeshNV: return "MeshNV";
-    case (int)ExecutionModel::TaskEXT: return "TaskEXT";
-    case (int)ExecutionModel::MeshEXT: return "MeshEXT";
+    case ExecutionModelTaskNV: return "TaskNV";
+    case ExecutionModelMeshNV: return "MeshNV";
+    case ExecutionModelTaskEXT: return "TaskEXT";
+    case ExecutionModelMeshEXT: return "MeshEXT";
 
     default: return "Bad";
 
-    case (int)ExecutionModel::RayGenerationKHR: return "RayGenerationKHR";
-    case (int)ExecutionModel::IntersectionKHR:  return "IntersectionKHR";
-    case (int)ExecutionModel::AnyHitKHR:        return "AnyHitKHR";
-    case (int)ExecutionModel::ClosestHitKHR:    return "ClosestHitKHR";
-    case (int)ExecutionModel::MissKHR:          return "MissKHR";
-    case (int)ExecutionModel::CallableKHR:      return "CallableKHR";
+    case ExecutionModelRayGenerationKHR: return "RayGenerationKHR";
+    case ExecutionModelIntersectionKHR:  return "IntersectionKHR";
+    case ExecutionModelAnyHitKHR:        return "AnyHitKHR";
+    case ExecutionModelClosestHitKHR:    return "ClosestHitKHR";
+    case ExecutionModelMissKHR:          return "MissKHR";
+    case ExecutionModelCallableKHR:      return "CallableKHR";
     }
 }
 
@@ -123,7 +122,7 @@ const char* AddressingString(int addr)
     case 1:  return "Physical32";
     case 2:  return "Physical64";
 
-    case (int)AddressingModel::PhysicalStorageBuffer64EXT: return "PhysicalStorageBuffer64EXT";
+    case AddressingModelPhysicalStorageBuffer64EXT: return "PhysicalStorageBuffer64EXT";
 
     default: return "Bad";
     }
@@ -132,10 +131,10 @@ const char* AddressingString(int addr)
 const char* MemoryString(int mem)
 {
     switch (mem) {
-    case (int)MemoryModel::Simple:     return "Simple";
-    case (int)MemoryModel::GLSL450:    return "GLSL450";
-    case (int)MemoryModel::OpenCL:     return "OpenCL";
-    case (int)MemoryModel::VulkanKHR:  return "VulkanKHR";
+    case MemoryModelSimple:     return "Simple";
+    case MemoryModelGLSL450:    return "GLSL450";
+    case MemoryModelOpenCL:     return "OpenCL";
+    case MemoryModelVulkanKHR:  return "VulkanKHR";
 
     default: return "Bad";
     }
@@ -180,58 +179,52 @@ const char* ExecutionModeString(int mode)
     case 31: return "ContractionOff";
     case 32: return "Bad";
 
-    case (int)ExecutionMode::Initializer:                   return "Initializer";
-    case (int)ExecutionMode::Finalizer:                     return "Finalizer";
-    case (int)ExecutionMode::SubgroupSize:                  return "SubgroupSize";
-    case (int)ExecutionMode::SubgroupsPerWorkgroup:         return "SubgroupsPerWorkgroup";
-    case (int)ExecutionMode::SubgroupsPerWorkgroupId:       return "SubgroupsPerWorkgroupId";
-    case (int)ExecutionMode::LocalSizeId:                   return "LocalSizeId";
-    case (int)ExecutionMode::LocalSizeHintId:               return "LocalSizeHintId";
+    case ExecutionModeInitializer:                   return "Initializer";
+    case ExecutionModeFinalizer:                     return "Finalizer";
+    case ExecutionModeSubgroupSize:                  return "SubgroupSize";
+    case ExecutionModeSubgroupsPerWorkgroup:         return "SubgroupsPerWorkgroup";
+    case ExecutionModeSubgroupsPerWorkgroupId:       return "SubgroupsPerWorkgroupId";
+    case ExecutionModeLocalSizeId:                   return "LocalSizeId";
+    case ExecutionModeLocalSizeHintId:               return "LocalSizeHintId";
 
-    case (int)ExecutionMode::PostDepthCoverage:             return "PostDepthCoverage";
-    case (int)ExecutionMode::DenormPreserve:                return "DenormPreserve";
-    case (int)ExecutionMode::DenormFlushToZero:             return "DenormFlushToZero";
-    case (int)ExecutionMode::SignedZeroInfNanPreserve:      return "SignedZeroInfNanPreserve";
-    case (int)ExecutionMode::RoundingModeRTE:               return "RoundingModeRTE";
-    case (int)ExecutionMode::RoundingModeRTZ:               return "RoundingModeRTZ";
+    case ExecutionModePostDepthCoverage:             return "PostDepthCoverage";
+    case ExecutionModeDenormPreserve:                return "DenormPreserve";
+    case ExecutionModeDenormFlushToZero:             return "DenormFlushToZero";
+    case ExecutionModeSignedZeroInfNanPreserve:      return "SignedZeroInfNanPreserve";
+    case ExecutionModeRoundingModeRTE:               return "RoundingModeRTE";
+    case ExecutionModeRoundingModeRTZ:               return "RoundingModeRTZ";
+    case ExecutionModeEarlyAndLateFragmentTestsAMD:  return "EarlyAndLateFragmentTestsAMD";
+    case ExecutionModeStencilRefUnchangedFrontAMD:   return "StencilRefUnchangedFrontAMD";
+    case ExecutionModeStencilRefLessFrontAMD:        return "StencilRefLessFrontAMD";
+    case ExecutionModeStencilRefGreaterBackAMD:      return "StencilRefGreaterBackAMD";
+    case ExecutionModeStencilRefReplacingEXT:        return "StencilRefReplacingEXT";
+    case ExecutionModeSubgroupUniformControlFlowKHR: return "SubgroupUniformControlFlow";
+    case ExecutionModeMaximallyReconvergesKHR:       return "MaximallyReconverges";
 
-    case (int)ExecutionMode::NonCoherentTileAttachmentReadQCOM: return "NonCoherentTileAttachmentReadQCOM";
-    case (int)ExecutionMode::TileShadingRateQCOM:               return "TileShadingRateQCOM";
+    case ExecutionModeOutputLinesNV:                 return "OutputLinesNV";
+    case ExecutionModeOutputPrimitivesNV:            return "OutputPrimitivesNV";
+    case ExecutionModeOutputTrianglesNV:             return "OutputTrianglesNV";
+    case ExecutionModeDerivativeGroupQuadsNV:        return "DerivativeGroupQuadsNV";
+    case ExecutionModeDerivativeGroupLinearNV:       return "DerivativeGroupLinearNV";
 
-    case (int)ExecutionMode::EarlyAndLateFragmentTestsAMD:  return "EarlyAndLateFragmentTestsAMD";
-    case (int)ExecutionMode::StencilRefUnchangedFrontAMD:   return "StencilRefUnchangedFrontAMD";
-    case (int)ExecutionMode::StencilRefLessFrontAMD:        return "StencilRefLessFrontAMD";
-    case (int)ExecutionMode::StencilRefGreaterBackAMD:      return "StencilRefGreaterBackAMD";
-    case (int)ExecutionMode::StencilRefReplacingEXT:        return "StencilRefReplacingEXT";
-    case (int)ExecutionMode::SubgroupUniformControlFlowKHR: return "SubgroupUniformControlFlow";
-    case (int)ExecutionMode::MaximallyReconvergesKHR:       return "MaximallyReconverges";
+    case ExecutionModePixelInterlockOrderedEXT:         return "PixelInterlockOrderedEXT";
+    case ExecutionModePixelInterlockUnorderedEXT:       return "PixelInterlockUnorderedEXT";
+    case ExecutionModeSampleInterlockOrderedEXT:        return "SampleInterlockOrderedEXT";
+    case ExecutionModeSampleInterlockUnorderedEXT:      return "SampleInterlockUnorderedEXT";
+    case ExecutionModeShadingRateInterlockOrderedEXT:   return "ShadingRateInterlockOrderedEXT";
+    case ExecutionModeShadingRateInterlockUnorderedEXT: return "ShadingRateInterlockUnorderedEXT";
 
-    case (int)ExecutionMode::OutputLinesNV:                 return "OutputLinesNV";
-    case (int)ExecutionMode::OutputPrimitivesNV:            return "OutputPrimitivesNV";
-    case (int)ExecutionMode::OutputTrianglesNV:             return "OutputTrianglesNV";
-    case (int)ExecutionMode::DerivativeGroupQuadsNV:        return "DerivativeGroupQuadsNV";
-    case (int)ExecutionMode::DerivativeGroupLinearNV:       return "DerivativeGroupLinearNV";
+    case ExecutionModeMaxWorkgroupSizeINTEL:    return "MaxWorkgroupSizeINTEL";
+    case ExecutionModeMaxWorkDimINTEL:          return "MaxWorkDimINTEL";
+    case ExecutionModeNoGlobalOffsetINTEL:      return "NoGlobalOffsetINTEL";
+    case ExecutionModeNumSIMDWorkitemsINTEL:    return "NumSIMDWorkitemsINTEL";
 
-    case (int)ExecutionMode::PixelInterlockOrderedEXT:         return "PixelInterlockOrderedEXT";
-    case (int)ExecutionMode::PixelInterlockUnorderedEXT:       return "PixelInterlockUnorderedEXT";
-    case (int)ExecutionMode::SampleInterlockOrderedEXT:        return "SampleInterlockOrderedEXT";
-    case (int)ExecutionMode::SampleInterlockUnorderedEXT:      return "SampleInterlockUnorderedEXT";
-    case (int)ExecutionMode::ShadingRateInterlockOrderedEXT:   return "ShadingRateInterlockOrderedEXT";
-    case (int)ExecutionMode::ShadingRateInterlockUnorderedEXT: return "ShadingRateInterlockUnorderedEXT";
+    case ExecutionModeRequireFullQuadsKHR:      return "RequireFullQuadsKHR";
+    case ExecutionModeQuadDerivativesKHR:       return "QuadDerivativesKHR";
 
-    case (int)ExecutionMode::MaxWorkgroupSizeINTEL:    return "MaxWorkgroupSizeINTEL";
-    case (int)ExecutionMode::MaxWorkDimINTEL:          return "MaxWorkDimINTEL";
-    case (int)ExecutionMode::NoGlobalOffsetINTEL:      return "NoGlobalOffsetINTEL";
-    case (int)ExecutionMode::NumSIMDWorkitemsINTEL:    return "NumSIMDWorkitemsINTEL";
-
-    case (int)ExecutionMode::RequireFullQuadsKHR:      return "RequireFullQuadsKHR";
-    case (int)ExecutionMode::QuadDerivativesKHR:       return "QuadDerivativesKHR";
-
-    case (int)ExecutionMode::NonCoherentColorAttachmentReadEXT:        return "NonCoherentColorAttachmentReadEXT";
-    case (int)ExecutionMode::NonCoherentDepthAttachmentReadEXT:        return "NonCoherentDepthAttachmentReadEXT";
-    case (int)ExecutionMode::NonCoherentStencilAttachmentReadEXT:      return "NonCoherentStencilAttachmentReadEXT";
-
-    case (int)ExecutionMode::Shader64BitIndexingEXT:                   return "Shader64BitIndexingEXT";
+    case ExecutionModeNonCoherentColorAttachmentReadEXT:        return "NonCoherentColorAttachmentReadEXT";
+    case ExecutionModeNonCoherentDepthAttachmentReadEXT:        return "NonCoherentDepthAttachmentReadEXT";
+    case ExecutionModeNonCoherentStencilAttachmentReadEXT:      return "NonCoherentStencilAttachmentReadEXT";
 
     case ExecutionModeCeiling:
     default: return "Bad";
@@ -255,19 +248,17 @@ const char* StorageClassString(int StorageClass)
     case 11: return "Image";
     case 12: return "StorageBuffer";
 
-    case (int)StorageClass::TileAttachmentQCOM:       return "TileAttachmentQCOM";
-    case (int)StorageClass::RayPayloadKHR:            return "RayPayloadKHR";
-    case (int)StorageClass::HitAttributeKHR:          return "HitAttributeKHR";
-    case (int)StorageClass::IncomingRayPayloadKHR:    return "IncomingRayPayloadKHR";
-    case (int)StorageClass::ShaderRecordBufferKHR:    return "ShaderRecordBufferKHR";
-    case (int)StorageClass::CallableDataKHR:          return "CallableDataKHR";
-    case (int)StorageClass::IncomingCallableDataKHR:  return "IncomingCallableDataKHR";
+    case StorageClassRayPayloadKHR:            return "RayPayloadKHR";
+    case StorageClassHitAttributeKHR:          return "HitAttributeKHR";
+    case StorageClassIncomingRayPayloadKHR:    return "IncomingRayPayloadKHR";
+    case StorageClassShaderRecordBufferKHR:    return "ShaderRecordBufferKHR";
+    case StorageClassCallableDataKHR:          return "CallableDataKHR";
+    case StorageClassIncomingCallableDataKHR:  return "IncomingCallableDataKHR";
 
-    case (int)StorageClass::PhysicalStorageBufferEXT: return "PhysicalStorageBufferEXT";
-    case (int)StorageClass::TaskPayloadWorkgroupEXT:  return "TaskPayloadWorkgroupEXT";
-    case (int)StorageClass::HitObjectAttributeNV:     return "HitObjectAttributeNV";
-    case (int)StorageClass::TileImageEXT:             return "TileImageEXT";
-    case (int)StorageClass::HitObjectAttributeEXT:    return "HitObjectAttributeEXT";
+    case StorageClassPhysicalStorageBufferEXT: return "PhysicalStorageBufferEXT";
+    case StorageClassTaskPayloadWorkgroupEXT:  return "TaskPayloadWorkgroupEXT";
+    case StorageClassHitObjectAttributeNV:     return "HitObjectAttributeNV";
+    case StorageClassTileImageEXT:             return "TileImageEXT";
     default: return "Bad";
     }
 }
@@ -326,30 +317,27 @@ const char* DecorationString(int decoration)
     case DecorationCeiling:
     default:  return "Bad";
 
-    case (int)Decoration::WeightTextureQCOM:           return "DecorationWeightTextureQCOM";
-    case (int)Decoration::BlockMatchTextureQCOM:       return "DecorationBlockMatchTextureQCOM";
-    case (int)Decoration::BlockMatchSamplerQCOM:       return "DecorationBlockMatchSamplerQCOM";
-    case (int)Decoration::ExplicitInterpAMD:           return "ExplicitInterpAMD";
-    case (int)Decoration::OverrideCoverageNV:          return "OverrideCoverageNV";
-    case (int)Decoration::PassthroughNV:               return "PassthroughNV";
-    case (int)Decoration::ViewportRelativeNV:          return "ViewportRelativeNV";
-    case (int)Decoration::SecondaryViewportRelativeNV: return "SecondaryViewportRelativeNV";
-    case (int)Decoration::PerPrimitiveNV:              return "PerPrimitiveNV";
-    case (int)Decoration::PerViewNV:                   return "PerViewNV";
-    case (int)Decoration::PerTaskNV:                   return "PerTaskNV";
+    case DecorationWeightTextureQCOM:           return "DecorationWeightTextureQCOM";
+    case DecorationBlockMatchTextureQCOM:       return "DecorationBlockMatchTextureQCOM";
+    case DecorationBlockMatchSamplerQCOM:       return "DecorationBlockMatchSamplerQCOM";
+    case DecorationExplicitInterpAMD:           return "ExplicitInterpAMD";
+    case DecorationOverrideCoverageNV:          return "OverrideCoverageNV";
+    case DecorationPassthroughNV:               return "PassthroughNV";
+    case DecorationViewportRelativeNV:          return "ViewportRelativeNV";
+    case DecorationSecondaryViewportRelativeNV: return "SecondaryViewportRelativeNV";
+    case DecorationPerPrimitiveNV:              return "PerPrimitiveNV";
+    case DecorationPerViewNV:                   return "PerViewNV";
+    case DecorationPerTaskNV:                   return "PerTaskNV";
 
-    case (int)Decoration::PerVertexKHR:                return "PerVertexKHR";
+    case DecorationPerVertexKHR:                return "PerVertexKHR";
 
-    case (int)Decoration::NonUniformEXT:           return "DecorationNonUniformEXT";
-    case (int)Decoration::HlslCounterBufferGOOGLE: return "DecorationHlslCounterBufferGOOGLE";
-    case (int)Decoration::HlslSemanticGOOGLE:      return "DecorationHlslSemanticGOOGLE";
-    case (int)Decoration::RestrictPointerEXT:      return "DecorationRestrictPointerEXT";
-    case (int)Decoration::AliasedPointerEXT:       return "DecorationAliasedPointerEXT";
+    case DecorationNonUniformEXT:           return "DecorationNonUniformEXT";
+    case DecorationHlslCounterBufferGOOGLE: return "DecorationHlslCounterBufferGOOGLE";
+    case DecorationHlslSemanticGOOGLE:      return "DecorationHlslSemanticGOOGLE";
+    case DecorationRestrictPointerEXT:      return "DecorationRestrictPointerEXT";
+    case DecorationAliasedPointerEXT:       return "DecorationAliasedPointerEXT";
 
-    case (int)Decoration::HitObjectShaderRecordBufferNV:  return "DecorationHitObjectShaderRecordBufferNV";
-    case (int)Decoration::HitObjectShaderRecordBufferEXT:  return "DecorationHitObjectShaderRecordBufferEXT";
-
-    case (int)Decoration::SaturatedToLargestFloat8NormalConversionEXT: return "DecorationSaturatedToLargestFloat8NormalConversionEXT";
+    case DecorationHitObjectShaderRecordBufferNV:  return "DecorationHitObjectShaderRecordBufferNV";
     }
 }
 
@@ -415,10 +403,6 @@ const char* BuiltInString(int builtIn)
     case 4444: return "ShadingRateKHR";
     case 5014: return "FragStencilRefEXT";
 
-    case (int)BuiltIn::TileOffsetQCOM:     return "TileOffsetQCOM";
-    case (int)BuiltIn::TileDimensionQCOM:  return "TileDimensionQCOM";
-    case (int)BuiltIn::TileApronSizeQCOM:  return "TileApronSizeQCOM";
-
     case 4992: return "BaryCoordNoPerspAMD";
     case 4993: return "BaryCoordNoPerspCentroidAMD";
     case 4994: return "BaryCoordNoPerspSampleAMD";
@@ -426,71 +410,64 @@ const char* BuiltInString(int builtIn)
     case 4996: return "BaryCoordSmoothCentroidAMD";
     case 4997: return "BaryCoordSmoothSampleAMD";
     case 4998: return "BaryCoordPullModelAMD";
-    case (int)BuiltIn::LaunchIdKHR:                 return "LaunchIdKHR";
-    case (int)BuiltIn::LaunchSizeKHR:               return "LaunchSizeKHR";
-    case (int)BuiltIn::WorldRayOriginKHR:           return "WorldRayOriginKHR";
-    case (int)BuiltIn::WorldRayDirectionKHR:        return "WorldRayDirectionKHR";
-    case (int)BuiltIn::ObjectRayOriginKHR:          return "ObjectRayOriginKHR";
-    case (int)BuiltIn::ObjectRayDirectionKHR:       return "ObjectRayDirectionKHR";
-    case (int)BuiltIn::RayTminKHR:                  return "RayTminKHR";
-    case (int)BuiltIn::RayTmaxKHR:                  return "RayTmaxKHR";
-    case (int)BuiltIn::CullMaskKHR:                 return "CullMaskKHR";
-    case (int)BuiltIn::HitTriangleVertexPositionsKHR: return "HitTriangleVertexPositionsKHR";
-    case (int)BuiltIn::HitMicroTriangleVertexPositionsNV: return "HitMicroTriangleVertexPositionsNV";
-    case (int)BuiltIn::HitMicroTriangleVertexBarycentricsNV: return "HitMicroTriangleVertexBarycentricsNV";
-    case (int)BuiltIn::HitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
-    case (int)BuiltIn::HitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
-    case (int)BuiltIn::HitIsSphereNV:               return "HitIsSphereNV";
-    case (int)BuiltIn::HitIsLSSNV:                  return "HitIsLSSNV";
-    case (int)BuiltIn::HitSpherePositionNV:         return "HitSpherePositionNV";
-    case (int)BuiltIn::HitSphereRadiusNV:           return "HitSphereRadiusNV";
-    case (int)BuiltIn::HitLSSPositionsNV:           return "HitLSSPositionsNV";
-    case (int)BuiltIn::HitLSSRadiiNV:               return "HitLLSSRadiiNV";
-    case (int)BuiltIn::InstanceCustomIndexKHR:      return "InstanceCustomIndexKHR";
-    case (int)BuiltIn::RayGeometryIndexKHR:         return "RayGeometryIndexKHR";
-    case (int)BuiltIn::ObjectToWorldKHR:            return "ObjectToWorldKHR";
-    case (int)BuiltIn::WorldToObjectKHR:            return "WorldToObjectKHR";
-    case (int)BuiltIn::HitTNV:                      return "HitTNV";
-    case (int)BuiltIn::HitKindKHR:                  return "HitKindKHR";
-    case (int)BuiltIn::IncomingRayFlagsKHR:         return "IncomingRayFlagsKHR";
-    case (int)BuiltIn::ViewportMaskNV:              return "ViewportMaskNV";
-    case (int)BuiltIn::SecondaryPositionNV:         return "SecondaryPositionNV";
-    case (int)BuiltIn::SecondaryViewportMaskNV:     return "SecondaryViewportMaskNV";
-    case (int)BuiltIn::PositionPerViewNV:           return "PositionPerViewNV";
-    case (int)BuiltIn::ViewportMaskPerViewNV:       return "ViewportMaskPerViewNV";
-//    case (int)BuiltIn::FragmentSizeNV:             return "FragmentSizeNV";        // superseded by BuiltInFragSizeEXT
-//    case (int)BuiltIn::InvocationsPerPixelNV:      return "InvocationsPerPixelNV"; // superseded by BuiltInFragInvocationCountEXT
-    case (int)BuiltIn::BaryCoordKHR:                return "BaryCoordKHR";
-    case (int)BuiltIn::BaryCoordNoPerspKHR:         return "BaryCoordNoPerspKHR";
-    case (int)BuiltIn::ClusterIDNV:                 return "ClusterIDNV";
+    case BuiltInLaunchIdKHR:                 return "LaunchIdKHR";
+    case BuiltInLaunchSizeKHR:               return "LaunchSizeKHR";
+    case BuiltInWorldRayOriginKHR:           return "WorldRayOriginKHR";
+    case BuiltInWorldRayDirectionKHR:        return "WorldRayDirectionKHR";
+    case BuiltInObjectRayOriginKHR:          return "ObjectRayOriginKHR";
+    case BuiltInObjectRayDirectionKHR:       return "ObjectRayDirectionKHR";
+    case BuiltInRayTminKHR:                  return "RayTminKHR";
+    case BuiltInRayTmaxKHR:                  return "RayTmaxKHR";
+    case BuiltInCullMaskKHR:                 return "CullMaskKHR";
+    case BuiltInHitTriangleVertexPositionsKHR: return "HitTriangleVertexPositionsKHR";
+    case BuiltInHitMicroTriangleVertexPositionsNV: return "HitMicroTriangleVertexPositionsNV";
+    case BuiltInHitMicroTriangleVertexBarycentricsNV: return "HitMicroTriangleVertexBarycentricsNV";
+    case BuiltInHitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
+    case BuiltInHitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
+    case BuiltInInstanceCustomIndexKHR:      return "InstanceCustomIndexKHR";
+    case BuiltInRayGeometryIndexKHR:         return "RayGeometryIndexKHR";
+    case BuiltInObjectToWorldKHR:            return "ObjectToWorldKHR";
+    case BuiltInWorldToObjectKHR:            return "WorldToObjectKHR";
+    case BuiltInHitTNV:                      return "HitTNV";
+    case BuiltInHitKindKHR:                  return "HitKindKHR";
+    case BuiltInIncomingRayFlagsKHR:         return "IncomingRayFlagsKHR";
+    case BuiltInViewportMaskNV:              return "ViewportMaskNV";
+    case BuiltInSecondaryPositionNV:         return "SecondaryPositionNV";
+    case BuiltInSecondaryViewportMaskNV:     return "SecondaryViewportMaskNV";
+    case BuiltInPositionPerViewNV:           return "PositionPerViewNV";
+    case BuiltInViewportMaskPerViewNV:       return "ViewportMaskPerViewNV";
+//    case BuiltInFragmentSizeNV:             return "FragmentSizeNV";        // superseded by BuiltInFragSizeEXT
+//    case BuiltInInvocationsPerPixelNV:      return "InvocationsPerPixelNV"; // superseded by BuiltInFragInvocationCountEXT
+    case BuiltInBaryCoordKHR:                return "BaryCoordKHR";
+    case BuiltInBaryCoordNoPerspKHR:         return "BaryCoordNoPerspKHR";
 
-    case (int)BuiltIn::FragSizeEXT:                 return "FragSizeEXT";
-    case (int)BuiltIn::FragInvocationCountEXT:      return "FragInvocationCountEXT";
+    case BuiltInFragSizeEXT:                 return "FragSizeEXT";
+    case BuiltInFragInvocationCountEXT:      return "FragInvocationCountEXT";
 
     case 5264: return "FullyCoveredEXT";
 
-    case (int)BuiltIn::TaskCountNV:           return "TaskCountNV";
-    case (int)BuiltIn::PrimitiveCountNV:      return "PrimitiveCountNV";
-    case (int)BuiltIn::PrimitiveIndicesNV:    return "PrimitiveIndicesNV";
-    case (int)BuiltIn::ClipDistancePerViewNV: return "ClipDistancePerViewNV";
-    case (int)BuiltIn::CullDistancePerViewNV: return "CullDistancePerViewNV";
-    case (int)BuiltIn::LayerPerViewNV:        return "LayerPerViewNV";
-    case (int)BuiltIn::MeshViewCountNV:       return "MeshViewCountNV";
-    case (int)BuiltIn::MeshViewIndicesNV:     return "MeshViewIndicesNV";
-    case (int)BuiltIn::WarpsPerSMNV:           return "WarpsPerSMNV";
-    case (int)BuiltIn::SMCountNV:              return "SMCountNV";
-    case (int)BuiltIn::WarpIDNV:               return "WarpIDNV";
-    case (int)BuiltIn::SMIDNV:                 return "SMIDNV";
-    case (int)BuiltIn::CurrentRayTimeNV:       return "CurrentRayTimeNV";
-    case (int)BuiltIn::PrimitivePointIndicesEXT:        return "PrimitivePointIndicesEXT";
-    case (int)BuiltIn::PrimitiveLineIndicesEXT:         return "PrimitiveLineIndicesEXT";
-    case (int)BuiltIn::PrimitiveTriangleIndicesEXT:     return "PrimitiveTriangleIndicesEXT";
-    case (int)BuiltIn::CullPrimitiveEXT:                return "CullPrimitiveEXT";
-    case (int)BuiltIn::CoreCountARM:           return "CoreCountARM";
-    case (int)BuiltIn::CoreIDARM:              return "CoreIDARM";
-    case (int)BuiltIn::CoreMaxIDARM:           return "CoreMaxIDARM";
-    case (int)BuiltIn::WarpIDARM:              return "WarpIDARM";
-    case (int)BuiltIn::WarpMaxIDARM:           return "BuiltInWarpMaxIDARM";
+    case BuiltInTaskCountNV:           return "TaskCountNV";
+    case BuiltInPrimitiveCountNV:      return "PrimitiveCountNV";
+    case BuiltInPrimitiveIndicesNV:    return "PrimitiveIndicesNV";
+    case BuiltInClipDistancePerViewNV: return "ClipDistancePerViewNV";
+    case BuiltInCullDistancePerViewNV: return "CullDistancePerViewNV";
+    case BuiltInLayerPerViewNV:        return "LayerPerViewNV";
+    case BuiltInMeshViewCountNV:       return "MeshViewCountNV";
+    case BuiltInMeshViewIndicesNV:     return "MeshViewIndicesNV";
+    case BuiltInWarpsPerSMNV:           return "WarpsPerSMNV";
+    case BuiltInSMCountNV:              return "SMCountNV";
+    case BuiltInWarpIDNV:               return "WarpIDNV";
+    case BuiltInSMIDNV:                 return "SMIDNV";
+    case BuiltInCurrentRayTimeNV:       return "CurrentRayTimeNV";
+    case BuiltInPrimitivePointIndicesEXT:        return "PrimitivePointIndicesEXT";
+    case BuiltInPrimitiveLineIndicesEXT:         return "PrimitiveLineIndicesEXT";
+    case BuiltInPrimitiveTriangleIndicesEXT:     return "PrimitiveTriangleIndicesEXT";
+    case BuiltInCullPrimitiveEXT:                return "CullPrimitiveEXT";
+    case BuiltInCoreCountARM:           return "CoreCountARM";
+    case BuiltInCoreIDARM:              return "CoreIDARM";
+    case BuiltInCoreMaxIDARM:           return "CoreMaxIDARM";
+    case BuiltInWarpIDARM:              return "WarpIDARM";
+    case BuiltInWarpMaxIDARM:           return "BuiltInWarpMaxIDARM";
 
     default: return "Bad";
     }
@@ -506,7 +483,7 @@ const char* DimensionString(int dim)
     case 4:  return "Rect";
     case 5:  return "Buffer";
     case 6:  return "SubpassData";
-    case (int)Dim::TileImageDataEXT:  return "TileImageDataEXT";
+    case DimTileImageDataEXT:  return "TileImageDataEXT";
 
     default: return "Bad";
     }
@@ -653,27 +630,25 @@ const char* ImageChannelDataTypeString(int type)
     }
 }
 
-const int ImageOperandsCeiling = 17;
+const int ImageOperandsCeiling = 14;
 
 const char* ImageOperandsString(int format)
 {
     switch (format) {
-    case (int)ImageOperandsShift::Bias:                    return "Bias";
-    case (int)ImageOperandsShift::Lod:                     return "Lod";
-    case (int)ImageOperandsShift::Grad:                    return "Grad";
-    case (int)ImageOperandsShift::ConstOffset:             return "ConstOffset";
-    case (int)ImageOperandsShift::Offset:                  return "Offset";
-    case (int)ImageOperandsShift::ConstOffsets:            return "ConstOffsets";
-    case (int)ImageOperandsShift::Sample:                  return "Sample";
-    case (int)ImageOperandsShift::MinLod:                  return "MinLod";
-    case (int)ImageOperandsShift::MakeTexelAvailableKHR:   return "MakeTexelAvailableKHR";
-    case (int)ImageOperandsShift::MakeTexelVisibleKHR:     return "MakeTexelVisibleKHR";
-    case (int)ImageOperandsShift::NonPrivateTexelKHR:      return "NonPrivateTexelKHR";
-    case (int)ImageOperandsShift::VolatileTexelKHR:        return "VolatileTexelKHR";
-    case (int)ImageOperandsShift::SignExtend:              return "SignExtend";
-    case (int)ImageOperandsShift::ZeroExtend:              return "ZeroExtend";
-    case (int)ImageOperandsShift::Nontemporal:             return "Nontemporal";
-    case (int)ImageOperandsShift::Offsets:                 return "Offsets";
+    case ImageOperandsBiasShift:                    return "Bias";
+    case ImageOperandsLodShift:                     return "Lod";
+    case ImageOperandsGradShift:                    return "Grad";
+    case ImageOperandsConstOffsetShift:             return "ConstOffset";
+    case ImageOperandsOffsetShift:                  return "Offset";
+    case ImageOperandsConstOffsetsShift:            return "ConstOffsets";
+    case ImageOperandsSampleShift:                  return "Sample";
+    case ImageOperandsMinLodShift:                  return "MinLod";
+    case ImageOperandsMakeTexelAvailableKHRShift:   return "MakeTexelAvailableKHR";
+    case ImageOperandsMakeTexelVisibleKHRShift:     return "MakeTexelVisibleKHR";
+    case ImageOperandsNonPrivateTexelKHRShift:      return "NonPrivateTexelKHR";
+    case ImageOperandsVolatileTexelKHRShift:        return "VolatileTexelKHR";
+    case ImageOperandsSignExtendShift:              return "SignExtend";
+    case ImageOperandsZeroExtendShift:              return "ZeroExtend";
 
     case ImageOperandsCeiling:
     default:
@@ -756,20 +731,20 @@ const char* SelectControlString(int cont)
     }
 }
 
-const int LoopControlCeiling = (int)LoopControlShift::PartialCount + 1;
+const int LoopControlCeiling = LoopControlPartialCountShift + 1;
 
 const char* LoopControlString(int cont)
 {
     switch (cont) {
-    case (int)LoopControlShift::Unroll:             return "Unroll";
-    case (int)LoopControlShift::DontUnroll:         return "DontUnroll";
-    case (int)LoopControlShift::DependencyInfinite: return "DependencyInfinite";
-    case (int)LoopControlShift::DependencyLength:   return "DependencyLength";
-    case (int)LoopControlShift::MinIterations:      return "MinIterations";
-    case (int)LoopControlShift::MaxIterations:      return "MaxIterations";
-    case (int)LoopControlShift::IterationMultiple:  return "IterationMultiple";
-    case (int)LoopControlShift::PeelCount:          return "PeelCount";
-    case (int)LoopControlShift::PartialCount:       return "PartialCount";
+    case LoopControlUnrollShift:             return "Unroll";
+    case LoopControlDontUnrollShift:         return "DontUnroll";
+    case LoopControlDependencyInfiniteShift: return "DependencyInfinite";
+    case LoopControlDependencyLengthShift:   return "DependencyLength";
+    case LoopControlMinIterationsShift:      return "MinIterations";
+    case LoopControlMaxIterationsShift:      return "MaxIterations";
+    case LoopControlIterationMultipleShift:  return "IterationMultiple";
+    case LoopControlPeelCountShift:          return "PeelCount";
+    case LoopControlPartialCountShift:       return "PartialCount";
 
     case LoopControlCeiling:
     default: return "Bad";
@@ -817,12 +792,12 @@ const int MemoryAccessCeiling = 6;
 const char* MemoryAccessString(int mem)
 {
     switch (mem) {
-    case (int)MemoryAccessShift::Volatile:                 return "Volatile";
-    case (int)MemoryAccessShift::Aligned:                  return "Aligned";
-    case (int)MemoryAccessShift::Nontemporal:              return "Nontemporal";
-    case (int)MemoryAccessShift::MakePointerAvailableKHR:  return "MakePointerAvailableKHR";
-    case (int)MemoryAccessShift::MakePointerVisibleKHR:    return "MakePointerVisibleKHR";
-    case (int)MemoryAccessShift::NonPrivatePointerKHR:     return "NonPrivatePointerKHR";
+    case MemoryAccessVolatileShift:                 return "Volatile";
+    case MemoryAccessAlignedShift:                  return "Aligned";
+    case MemoryAccessNontemporalShift:              return "Nontemporal";
+    case MemoryAccessMakePointerAvailableKHRShift:  return "MakePointerAvailableKHR";
+    case MemoryAccessMakePointerVisibleKHRShift:    return "MakePointerVisibleKHR";
+    case MemoryAccessNonPrivatePointerKHRShift:     return "NonPrivatePointerKHR";
 
     default: return "Bad";
     }
@@ -833,23 +808,11 @@ const int CooperativeMatrixOperandsCeiling = 6;
 const char* CooperativeMatrixOperandsString(int op)
 {
     switch (op) {
-    case (int)CooperativeMatrixOperandsShift::MatrixASignedComponentsKHR:  return "ASignedComponentsKHR";
-    case (int)CooperativeMatrixOperandsShift::MatrixBSignedComponentsKHR:  return "BSignedComponentsKHR";
-    case (int)CooperativeMatrixOperandsShift::MatrixCSignedComponentsKHR:  return "CSignedComponentsKHR";
-    case (int)CooperativeMatrixOperandsShift::MatrixResultSignedComponentsKHR:  return "ResultSignedComponentsKHR";
-    case (int)CooperativeMatrixOperandsShift::SaturatingAccumulationKHR:   return "SaturatingAccumulationKHR";
-
-    default: return "Bad";
-    }
-}
-
-const int TensorAddressingOperandsCeiling = 3;
-
-const char* TensorAddressingOperandsString(int op)
-{
-    switch (op) {
-    case (int)TensorAddressingOperandsShift::TensorView:  return "TensorView";
-    case (int)TensorAddressingOperandsShift::DecodeFunc:  return "DecodeFunc";
+    case CooperativeMatrixOperandsMatrixASignedComponentsKHRShift:  return "ASignedComponentsKHR";
+    case CooperativeMatrixOperandsMatrixBSignedComponentsKHRShift:  return "BSignedComponentsKHR";
+    case CooperativeMatrixOperandsMatrixCSignedComponentsKHRShift:  return "CSignedComponentsKHR";
+    case CooperativeMatrixOperandsMatrixResultSignedComponentsKHRShift:  return "ResultSignedComponentsKHR";
+    case CooperativeMatrixOperandsSaturatingAccumulationKHRShift:   return "SaturatingAccumulationKHR";
 
     default: return "Bad";
     }
@@ -873,13 +836,13 @@ const char* GroupOperationString(int gop)
 
     switch (gop)
     {
-    case (int)GroupOperation::Reduce:  return "Reduce";
-    case (int)GroupOperation::InclusiveScan:  return "InclusiveScan";
-    case (int)GroupOperation::ExclusiveScan:  return "ExclusiveScan";
-    case (int)GroupOperation::ClusteredReduce:  return "ClusteredReduce";
-    case (int)GroupOperation::PartitionedReduceNV:  return "PartitionedReduceNV";
-    case (int)GroupOperation::PartitionedInclusiveScanNV:  return "PartitionedInclusiveScanNV";
-    case (int)GroupOperation::PartitionedExclusiveScanNV:  return "PartitionedExclusiveScanNV";
+    case GroupOperationReduce:  return "Reduce";
+    case GroupOperationInclusiveScan:  return "InclusiveScan";
+    case GroupOperationExclusiveScan:  return "ExclusiveScan";
+    case GroupOperationClusteredReduce:  return "ClusteredReduce";
+    case GroupOperationPartitionedReduceNV:  return "PartitionedReduceNV";
+    case GroupOperationPartitionedInclusiveScanNV:  return "PartitionedInclusiveScanNV";
+    case GroupOperationPartitionedExclusiveScanNV:  return "PartitionedExclusiveScanNV";
 
     default: return "Bad";
     }
@@ -978,169 +941,130 @@ const char* CapabilityString(int info)
     case 67: return "GroupNonUniformClustered";
     case 68: return "GroupNonUniformQuad";
 
-    case (int)Capability::SubgroupBallotKHR: return "SubgroupBallotKHR";
-    case (int)Capability::DrawParameters:    return "DrawParameters";
-    case (int)Capability::SubgroupVoteKHR:   return "SubgroupVoteKHR";
-    case (int)Capability::GroupNonUniformRotateKHR: return "GroupNonUniformRotateKHR";
+    case CapabilitySubgroupBallotKHR: return "SubgroupBallotKHR";
+    case CapabilityDrawParameters:    return "DrawParameters";
+    case CapabilitySubgroupVoteKHR:   return "SubgroupVoteKHR";
+    case CapabilityGroupNonUniformRotateKHR: return "CapabilityGroupNonUniformRotateKHR";
 
-    case (int)Capability::StorageUniformBufferBlock16: return "StorageUniformBufferBlock16";
-    case (int)Capability::StorageUniform16:            return "StorageUniform16";
-    case (int)Capability::StoragePushConstant16:       return "StoragePushConstant16";
-    case (int)Capability::StorageInputOutput16:        return "StorageInputOutput16";
+    case CapabilityStorageUniformBufferBlock16: return "StorageUniformBufferBlock16";
+    case CapabilityStorageUniform16:            return "StorageUniform16";
+    case CapabilityStoragePushConstant16:       return "StoragePushConstant16";
+    case CapabilityStorageInputOutput16:        return "StorageInputOutput16";
 
-    case (int)Capability::StorageBuffer8BitAccess:             return "StorageBuffer8BitAccess";
-    case (int)Capability::UniformAndStorageBuffer8BitAccess:   return "UniformAndStorageBuffer8BitAccess";
-    case (int)Capability::StoragePushConstant8:                return "StoragePushConstant8";
+    case CapabilityStorageBuffer8BitAccess:             return "StorageBuffer8BitAccess";
+    case CapabilityUniformAndStorageBuffer8BitAccess:   return "UniformAndStorageBuffer8BitAccess";
+    case CapabilityStoragePushConstant8:                return "StoragePushConstant8";
 
-    case (int)Capability::DeviceGroup: return "DeviceGroup";
-    case (int)Capability::MultiView:   return "MultiView";
+    case CapabilityDeviceGroup: return "DeviceGroup";
+    case CapabilityMultiView:   return "MultiView";
 
-    case (int)Capability::DenormPreserve:           return "DenormPreserve";
-    case (int)Capability::DenormFlushToZero:        return "DenormFlushToZero";
-    case (int)Capability::SignedZeroInfNanPreserve: return "SignedZeroInfNanPreserve";
-    case (int)Capability::RoundingModeRTE:          return "RoundingModeRTE";
-    case (int)Capability::RoundingModeRTZ:          return "RoundingModeRTZ";
+    case CapabilityDenormPreserve:           return "DenormPreserve";
+    case CapabilityDenormFlushToZero:        return "DenormFlushToZero";
+    case CapabilitySignedZeroInfNanPreserve: return "SignedZeroInfNanPreserve";
+    case CapabilityRoundingModeRTE:          return "RoundingModeRTE";
+    case CapabilityRoundingModeRTZ:          return "RoundingModeRTZ";
 
-    case (int)Capability::StencilExportEXT: return "StencilExportEXT";
+    case CapabilityStencilExportEXT: return "StencilExportEXT";
 
-    case (int)Capability::Float16ImageAMD:       return "Float16ImageAMD";
-    case (int)Capability::ImageGatherBiasLodAMD: return "ImageGatherBiasLodAMD";
-    case (int)Capability::FragmentMaskAMD:       return "FragmentMaskAMD";
-    case (int)Capability::ImageReadWriteLodAMD:  return "ImageReadWriteLodAMD";
+    case CapabilityFloat16ImageAMD:       return "Float16ImageAMD";
+    case CapabilityImageGatherBiasLodAMD: return "ImageGatherBiasLodAMD";
+    case CapabilityFragmentMaskAMD:       return "FragmentMaskAMD";
+    case CapabilityImageReadWriteLodAMD:  return "ImageReadWriteLodAMD";
 
-    case (int)Capability::AtomicStorageOps:             return "AtomicStorageOps";
+    case CapabilityAtomicStorageOps:             return "AtomicStorageOps";
 
-    case (int)Capability::SampleMaskPostDepthCoverage:  return "SampleMaskPostDepthCoverage";
-    case (int)Capability::GeometryShaderPassthroughNV:     return "GeometryShaderPassthroughNV";
-    case (int)Capability::ShaderViewportIndexLayerNV:      return "ShaderViewportIndexLayerNV";
-    case (int)Capability::ShaderViewportMaskNV:            return "ShaderViewportMaskNV";
-    case (int)Capability::ShaderStereoViewNV:              return "ShaderStereoViewNV";
-    case (int)Capability::PerViewAttributesNV:             return "PerViewAttributesNV";
-    case (int)Capability::GroupNonUniformPartitionedNV:    return "GroupNonUniformPartitionedNV";
-    case (int)Capability::RayTracingNV:                    return "RayTracingNV";
-    case (int)Capability::RayTracingMotionBlurNV:          return "RayTracingMotionBlurNV";
-    case (int)Capability::RayTracingKHR:                   return "RayTracingKHR";
-    case (int)Capability::RayCullMaskKHR:                  return "RayCullMaskKHR";
-    case (int)Capability::RayQueryKHR:                     return "RayQueryKHR";
-    case (int)Capability::RayTracingProvisionalKHR:        return "RayTracingProvisionalKHR";
-    case (int)Capability::RayTraversalPrimitiveCullingKHR: return "RayTraversalPrimitiveCullingKHR";
-    case (int)Capability::RayTracingPositionFetchKHR:      return "RayTracingPositionFetchKHR";
-    case (int)Capability::DisplacementMicromapNV:           return "DisplacementMicromapNV";
-    case (int)Capability::RayTracingOpacityMicromapEXT:    return "RayTracingOpacityMicromapEXT";
-    case (int)Capability::RayTracingDisplacementMicromapNV: return "RayTracingDisplacementMicromapNV";
-    case (int)Capability::RayQueryPositionFetchKHR:        return "RayQueryPositionFetchKHR";
-    case (int)Capability::ComputeDerivativeGroupQuadsNV:   return "ComputeDerivativeGroupQuadsNV";
-    case (int)Capability::ComputeDerivativeGroupLinearNV:  return "ComputeDerivativeGroupLinearNV";
-    case (int)Capability::FragmentBarycentricKHR:          return "FragmentBarycentricKHR";
-    case (int)Capability::MeshShadingNV:                   return "MeshShadingNV";
-    case (int)Capability::ImageFootprintNV:                return "ImageFootprintNV";
-    case (int)Capability::MeshShadingEXT:                  return "MeshShadingEXT";
-//    case (int)Capability::ShadingRateNV:                   return "ShadingRateNV";  // superseded by FragmentDensityEXT
-    case (int)Capability::SampleMaskOverrideCoverageNV:    return "SampleMaskOverrideCoverageNV";
-    case (int)Capability::FragmentDensityEXT:              return "FragmentDensityEXT";
+    case CapabilitySampleMaskPostDepthCoverage:  return "SampleMaskPostDepthCoverage";
+    case CapabilityGeometryShaderPassthroughNV:     return "GeometryShaderPassthroughNV";
+    case CapabilityShaderViewportIndexLayerNV:      return "ShaderViewportIndexLayerNV";
+    case CapabilityShaderViewportMaskNV:            return "ShaderViewportMaskNV";
+    case CapabilityShaderStereoViewNV:              return "ShaderStereoViewNV";
+    case CapabilityPerViewAttributesNV:             return "PerViewAttributesNV";
+    case CapabilityGroupNonUniformPartitionedNV:    return "GroupNonUniformPartitionedNV";
+    case CapabilityRayTracingNV:                    return "RayTracingNV";
+    case CapabilityRayTracingMotionBlurNV:          return "RayTracingMotionBlurNV";
+    case CapabilityRayTracingKHR:                   return "RayTracingKHR";
+    case CapabilityRayCullMaskKHR:                  return "RayCullMaskKHR";
+    case CapabilityRayQueryKHR:                     return "RayQueryKHR";
+    case CapabilityRayTracingProvisionalKHR:        return "RayTracingProvisionalKHR";
+    case CapabilityRayTraversalPrimitiveCullingKHR: return "RayTraversalPrimitiveCullingKHR";
+    case CapabilityRayTracingPositionFetchKHR:      return "RayTracingPositionFetchKHR";
+    case CapabilityDisplacementMicromapNV:           return "DisplacementMicromapNV";
+    case CapabilityRayTracingDisplacementMicromapNV: return "CapabilityRayTracingDisplacementMicromapNV";
+    case CapabilityRayQueryPositionFetchKHR:        return "RayQueryPositionFetchKHR";
+    case CapabilityComputeDerivativeGroupQuadsNV:   return "ComputeDerivativeGroupQuadsNV";
+    case CapabilityComputeDerivativeGroupLinearNV:  return "ComputeDerivativeGroupLinearNV";
+    case CapabilityFragmentBarycentricKHR:          return "FragmentBarycentricKHR";
+    case CapabilityMeshShadingNV:                   return "MeshShadingNV";
+    case CapabilityImageFootprintNV:                return "ImageFootprintNV";
+    case CapabilityMeshShadingEXT:                  return "MeshShadingEXT";
+//    case CapabilityShadingRateNV:                   return "ShadingRateNV";  // superseded by FragmentDensityEXT
+    case CapabilitySampleMaskOverrideCoverageNV:    return "SampleMaskOverrideCoverageNV";
+    case CapabilityFragmentDensityEXT:              return "FragmentDensityEXT";
 
-    case (int)Capability::FragmentFullyCoveredEXT: return "FragmentFullyCoveredEXT";
+    case CapabilityFragmentFullyCoveredEXT: return "FragmentFullyCoveredEXT";
 
-    case (int)Capability::ShaderNonUniformEXT:                          return "ShaderNonUniformEXT";
-    case (int)Capability::RuntimeDescriptorArrayEXT:                    return "RuntimeDescriptorArrayEXT";
-    case (int)Capability::InputAttachmentArrayDynamicIndexingEXT:       return "InputAttachmentArrayDynamicIndexingEXT";
-    case (int)Capability::UniformTexelBufferArrayDynamicIndexingEXT:    return "UniformTexelBufferArrayDynamicIndexingEXT";
-    case (int)Capability::StorageTexelBufferArrayDynamicIndexingEXT:    return "StorageTexelBufferArrayDynamicIndexingEXT";
-    case (int)Capability::UniformBufferArrayNonUniformIndexingEXT:      return "UniformBufferArrayNonUniformIndexingEXT";
-    case (int)Capability::SampledImageArrayNonUniformIndexingEXT:       return "SampledImageArrayNonUniformIndexingEXT";
-    case (int)Capability::StorageBufferArrayNonUniformIndexingEXT:      return "StorageBufferArrayNonUniformIndexingEXT";
-    case (int)Capability::StorageImageArrayNonUniformIndexingEXT:       return "StorageImageArrayNonUniformIndexingEXT";
-    case (int)Capability::InputAttachmentArrayNonUniformIndexingEXT:    return "InputAttachmentArrayNonUniformIndexingEXT";
-    case (int)Capability::UniformTexelBufferArrayNonUniformIndexingEXT: return "UniformTexelBufferArrayNonUniformIndexingEXT";
-    case (int)Capability::StorageTexelBufferArrayNonUniformIndexingEXT: return "StorageTexelBufferArrayNonUniformIndexingEXT";
+    case CapabilityShaderNonUniformEXT:                          return "ShaderNonUniformEXT";
+    case CapabilityRuntimeDescriptorArrayEXT:                    return "RuntimeDescriptorArrayEXT";
+    case CapabilityInputAttachmentArrayDynamicIndexingEXT:       return "InputAttachmentArrayDynamicIndexingEXT";
+    case CapabilityUniformTexelBufferArrayDynamicIndexingEXT:    return "UniformTexelBufferArrayDynamicIndexingEXT";
+    case CapabilityStorageTexelBufferArrayDynamicIndexingEXT:    return "StorageTexelBufferArrayDynamicIndexingEXT";
+    case CapabilityUniformBufferArrayNonUniformIndexingEXT:      return "UniformBufferArrayNonUniformIndexingEXT";
+    case CapabilitySampledImageArrayNonUniformIndexingEXT:       return "SampledImageArrayNonUniformIndexingEXT";
+    case CapabilityStorageBufferArrayNonUniformIndexingEXT:      return "StorageBufferArrayNonUniformIndexingEXT";
+    case CapabilityStorageImageArrayNonUniformIndexingEXT:       return "StorageImageArrayNonUniformIndexingEXT";
+    case CapabilityInputAttachmentArrayNonUniformIndexingEXT:    return "InputAttachmentArrayNonUniformIndexingEXT";
+    case CapabilityUniformTexelBufferArrayNonUniformIndexingEXT: return "UniformTexelBufferArrayNonUniformIndexingEXT";
+    case CapabilityStorageTexelBufferArrayNonUniformIndexingEXT: return "StorageTexelBufferArrayNonUniformIndexingEXT";
 
-    case (int)Capability::VulkanMemoryModelKHR:                return "VulkanMemoryModelKHR";
-    case (int)Capability::VulkanMemoryModelDeviceScopeKHR:     return "VulkanMemoryModelDeviceScopeKHR";
+    case CapabilityVulkanMemoryModelKHR:                return "VulkanMemoryModelKHR";
+    case CapabilityVulkanMemoryModelDeviceScopeKHR:     return "VulkanMemoryModelDeviceScopeKHR";
 
-    case (int)Capability::PhysicalStorageBufferAddressesEXT:   return "PhysicalStorageBufferAddressesEXT";
+    case CapabilityPhysicalStorageBufferAddressesEXT:   return "PhysicalStorageBufferAddressesEXT";
 
-    case (int)Capability::VariablePointers:                    return "VariablePointers";
+    case CapabilityVariablePointers:                    return "VariablePointers";
 
-    case (int)Capability::CooperativeMatrixNV:     return "CooperativeMatrixNV";
-    case (int)Capability::CooperativeMatrixKHR:    return "CooperativeMatrixKHR";
-    case (int)Capability::CooperativeMatrixReductionsNV:           return "CooperativeMatrixReductionsNV";
-    case (int)Capability::CooperativeMatrixConversionsNV:          return "CooperativeMatrixConversionsNV";
-    case (int)Capability::CooperativeMatrixPerElementOperationsNV: return "CooperativeMatrixPerElementOperationsNV";
-    case (int)Capability::CooperativeMatrixTensorAddressingNV:     return "CooperativeMatrixTensorAddressingNV";
-    case (int)Capability::CooperativeMatrixBlockLoadsNV:           return "CooperativeMatrixBlockLoadsNV";
-    case (int)Capability::TensorAddressingNV:                      return "TensorAddressingNV";
+    case CapabilityCooperativeMatrixNV:     return "CooperativeMatrixNV";
+    case CapabilityCooperativeMatrixKHR:    return "CooperativeMatrixKHR";
+    case CapabilityShaderSMBuiltinsNV:      return "ShaderSMBuiltinsNV";
 
-    case (int)Capability::ShaderSMBuiltinsNV:      return "ShaderSMBuiltinsNV";
+    case CapabilityFragmentShaderSampleInterlockEXT:        return "CapabilityFragmentShaderSampleInterlockEXT";
+    case CapabilityFragmentShaderPixelInterlockEXT:         return "CapabilityFragmentShaderPixelInterlockEXT";
+    case CapabilityFragmentShaderShadingRateInterlockEXT:   return "CapabilityFragmentShaderShadingRateInterlockEXT";
 
-    case (int)Capability::CooperativeVectorNV:                     return "CooperativeVectorNV";
-    case (int)Capability::CooperativeVectorTrainingNV:             return "CooperativeVectorTrainingNV";
+    case CapabilityTileImageColorReadAccessEXT:           return "TileImageColorReadAccessEXT";
+    case CapabilityTileImageDepthReadAccessEXT:           return "TileImageDepthReadAccessEXT";
+    case CapabilityTileImageStencilReadAccessEXT:         return "TileImageStencilReadAccessEXT";
 
-    case (int)Capability::FragmentShaderSampleInterlockEXT:        return "FragmentShaderSampleInterlockEXT";
-    case (int)Capability::FragmentShaderPixelInterlockEXT:         return "FragmentShaderPixelInterlockEXT";
-    case (int)Capability::FragmentShaderShadingRateInterlockEXT:   return "FragmentShaderShadingRateInterlockEXT";
+    case CapabilityFragmentShadingRateKHR:                  return "FragmentShadingRateKHR";
 
-    case (int)Capability::TileImageColorReadAccessEXT:           return "TileImageColorReadAccessEXT";
-    case (int)Capability::TileImageDepthReadAccessEXT:           return "TileImageDepthReadAccessEXT";
-    case (int)Capability::TileImageStencilReadAccessEXT:         return "TileImageStencilReadAccessEXT";
+    case CapabilityDemoteToHelperInvocationEXT:             return "DemoteToHelperInvocationEXT";
+    case CapabilityAtomicFloat16VectorNV:                   return "AtomicFloat16VectorNV";
+    case CapabilityShaderClockKHR:                          return "ShaderClockKHR";
+    case CapabilityQuadControlKHR:                          return "QuadControlKHR";
+    case CapabilityInt64ImageEXT:                           return "Int64ImageEXT";
 
-    case (int)Capability::CooperativeMatrixLayoutsARM:             return "CooperativeMatrixLayoutsARM";
-    case (int)Capability::TensorsARM:                              return "TensorsARM";
+    case CapabilityIntegerFunctions2INTEL:              return "CapabilityIntegerFunctions2INTEL";
 
-    case (int)Capability::FragmentShadingRateKHR:                  return "FragmentShadingRateKHR";
+    case CapabilityExpectAssumeKHR:                         return "ExpectAssumeKHR";
 
-    case (int)Capability::DemoteToHelperInvocationEXT:             return "DemoteToHelperInvocationEXT";
-    case (int)Capability::AtomicFloat16VectorNV:                   return "AtomicFloat16VectorNV";
-    case (int)Capability::ShaderClockKHR:                          return "ShaderClockKHR";
-    case (int)Capability::QuadControlKHR:                          return "QuadControlKHR";
-    case (int)Capability::Int64ImageEXT:                           return "Int64ImageEXT";
+    case CapabilityAtomicFloat16AddEXT:                     return "AtomicFloat16AddEXT";
+    case CapabilityAtomicFloat32AddEXT:                     return "AtomicFloat32AddEXT";
+    case CapabilityAtomicFloat64AddEXT:                     return "AtomicFloat64AddEXT";
+    case CapabilityAtomicFloat16MinMaxEXT:                  return "AtomicFloat16MinMaxEXT";
+    case CapabilityAtomicFloat32MinMaxEXT:                  return "AtomicFloat32MinMaxEXT";
+    case CapabilityAtomicFloat64MinMaxEXT:                  return "AtomicFloat64MinMaxEXT";
 
-    case (int)Capability::IntegerFunctions2INTEL:              return "IntegerFunctions2INTEL";
+    case CapabilityWorkgroupMemoryExplicitLayoutKHR:            return "CapabilityWorkgroupMemoryExplicitLayoutKHR";
+    case CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR:  return "CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR";
+    case CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR: return "CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR";
+    case CapabilityCoreBuiltinsARM:                             return "CoreBuiltinsARM";
 
-    case (int)Capability::ExpectAssumeKHR:                         return "ExpectAssumeKHR";
+    case CapabilityShaderInvocationReorderNV:                return "ShaderInvocationReorderNV";
 
-    case (int)Capability::AtomicFloat16AddEXT:                     return "AtomicFloat16AddEXT";
-    case (int)Capability::AtomicFloat32AddEXT:                     return "AtomicFloat32AddEXT";
-    case (int)Capability::AtomicFloat64AddEXT:                     return "AtomicFloat64AddEXT";
-    case (int)Capability::AtomicFloat16MinMaxEXT:                  return "AtomicFloat16MinMaxEXT";
-    case (int)Capability::AtomicFloat32MinMaxEXT:                  return "AtomicFloat32MinMaxEXT";
-    case (int)Capability::AtomicFloat64MinMaxEXT:                  return "AtomicFloat64MinMaxEXT";
-
-    case (int)Capability::WorkgroupMemoryExplicitLayoutKHR:            return "WorkgroupMemoryExplicitLayoutKHR";
-    case (int)Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR:  return "WorkgroupMemoryExplicitLayout8BitAccessKHR";
-    case (int)Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR: return "WorkgroupMemoryExplicitLayout16BitAccessKHR";
-    case (int)Capability::CoreBuiltinsARM:                             return "CoreBuiltinsARM";
-
-    case (int)Capability::ShaderInvocationReorderNV:                return "ShaderInvocationReorderNV";
-    case (int)Capability::ShaderInvocationReorderEXT:               return "ShaderInvocationReorderEXT";
-
-    case (int)Capability::TextureSampleWeightedQCOM:           return "TextureSampleWeightedQCOM";
-    case (int)Capability::TextureBoxFilterQCOM:                return "TextureBoxFilterQCOM";
-    case (int)Capability::TextureBlockMatchQCOM:               return "TextureBlockMatchQCOM";
-    case (int)Capability::TileShadingQCOM:                     return "TileShadingQCOM";
-    case (int)Capability::TextureBlockMatch2QCOM:              return "TextureBlockMatch2QCOM";
-
-    case (int)Capability::CooperativeMatrixConversionQCOM:     return "CooperativeMatrixConversionQCOM";
-
-    case (int)Capability::ReplicatedCompositesEXT:             return "ReplicatedCompositesEXT";
-
-    case (int)Capability::DotProductKHR:                       return "DotProductKHR";
-    case (int)Capability::DotProductInputAllKHR:               return "DotProductInputAllKHR";
-    case (int)Capability::DotProductInput4x8BitKHR:            return "DotProductInput4x8BitKHR";
-    case (int)Capability::DotProductInput4x8BitPackedKHR:      return "DotProductInput4x8BitPackedKHR";
-
-    case (int)Capability::RayTracingClusterAccelerationStructureNV:   return "RayTracingClusterAccelerationStructureNV";
-
-    case (int)Capability::RayTracingSpheresGeometryNV:             return "RayTracingSpheresGeometryNV";
-    case (int)Capability::RayTracingLinearSweptSpheresGeometryNV:  return "RayTracingLinearSweptSpheresGeometryNV";
-
-    case (int)Capability::BFloat16TypeKHR:                     return "BFloat16TypeKHR";
-    case (int)Capability::BFloat16DotProductKHR:               return "BFloat16DotProductKHR";
-    case (int)Capability::BFloat16CooperativeMatrixKHR:        return "BFloat16CooperativeMatrixKHR";
-
-    case (int)Capability::Float8EXT:                           return "Float8EXT";
-    case (int)Capability::Float8CooperativeMatrixEXT:          return "Float8CooperativeMatrixEXT";
-
-    case (int)Capability::Shader64BitIndexingEXT:              return "CapabilityShader64BitIndexingEXT";
+    case CapabilityTextureSampleWeightedQCOM:           return "TextureSampleWeightedQCOM";
+    case CapabilityTextureBoxFilterQCOM:                return "TextureBoxFilterQCOM";
+    case CapabilityTextureBlockMatchQCOM:               return "TextureBlockMatchQCOM";
+    case CapabilityTextureBlockMatch2QCOM:              return "TextureBlockMatch2QCOM";
 
     default: return "Bad";
     }
@@ -1234,7 +1158,7 @@ const char* OpcodeString(int op)
     case 82:  return "OpCompositeInsert";
     case 83:  return "OpCopyObject";
     case 84:  return "OpTranspose";
-    case (int)Op::OpCopyLogical: return "OpCopyLogical";
+    case OpCopyLogical: return "OpCopyLogical";
     case 85:  return "Bad";
     case 86:  return "OpSampledImage";
     case 87:  return "OpImageSampleImplicitLod";
@@ -1472,9 +1396,9 @@ const char* OpcodeString(int op)
     case 319: return "OpAtomicFlagClear";
     case 320: return "OpImageSparseRead";
 
-    case (int)Op::OpModuleProcessed: return "OpModuleProcessed";
-    case (int)Op::OpExecutionModeId: return "OpExecutionModeId";
-    case (int)Op::OpDecorateId:      return "OpDecorateId";
+    case OpModuleProcessed: return "OpModuleProcessed";
+    case OpExecutionModeId: return "OpExecutionModeId";
+    case OpDecorateId:      return "OpDecorateId";
 
     case 333: return "OpGroupNonUniformElect";
     case 334: return "OpGroupNonUniformAll";
@@ -1511,7 +1435,7 @@ const char* OpcodeString(int op)
     case 365: return "OpGroupNonUniformQuadBroadcast";
     case 366: return "OpGroupNonUniformQuadSwap";
 
-    case (int)Op::OpTerminateInvocation: return "OpTerminateInvocation";
+    case OpTerminateInvocation: return "OpTerminateInvocation";
 
     case 4421: return "OpSubgroupBallotKHR";
     case 4422: return "OpSubgroupFirstInvocationKHR";
@@ -1519,17 +1443,16 @@ const char* OpcodeString(int op)
     case 4429: return "OpSubgroupAnyKHR";
     case 4430: return "OpSubgroupAllEqualKHR";
     case 4432: return "OpSubgroupReadInvocationKHR";
-    case 4433: return "OpExtInstWithForwardRefsKHR";
 
-    case (int)Op::OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
-    case (int)Op::OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
+    case OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
+    case OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
 
-    case (int)Op::OpAtomicFAddEXT: return "OpAtomicFAddEXT";
-    case (int)Op::OpAtomicFMinEXT: return "OpAtomicFMinEXT";
-    case (int)Op::OpAtomicFMaxEXT: return "OpAtomicFMaxEXT";
+    case OpAtomicFAddEXT: return "OpAtomicFAddEXT";
+    case OpAtomicFMinEXT: return "OpAtomicFMinEXT";
+    case OpAtomicFMaxEXT: return "OpAtomicFMaxEXT";
 
-    case (int)Op::OpAssumeTrueKHR: return "OpAssumeTrueKHR";
-    case (int)Op::OpExpectKHR: return "OpExpectKHR";
+    case OpAssumeTrueKHR: return "OpAssumeTrueKHR";
+    case OpExpectKHR: return "OpExpectKHR";
 
     case 5000: return "OpGroupIAddNonUniformAMD";
     case 5001: return "OpGroupFAddNonUniformAMD";
@@ -1543,224 +1466,123 @@ const char* OpcodeString(int op)
     case 5011: return "OpFragmentMaskFetchAMD";
     case 5012: return "OpFragmentFetchAMD";
 
-    case (int)Op::OpReadClockKHR:               return "OpReadClockKHR";
+    case OpReadClockKHR:               return "OpReadClockKHR";
 
-    case (int)Op::OpDecorateStringGOOGLE:       return "OpDecorateStringGOOGLE";
-    case (int)Op::OpMemberDecorateStringGOOGLE: return "OpMemberDecorateStringGOOGLE";
+    case OpDecorateStringGOOGLE:       return "OpDecorateStringGOOGLE";
+    case OpMemberDecorateStringGOOGLE: return "OpMemberDecorateStringGOOGLE";
 
-    case (int)Op::OpReportIntersectionKHR:             return "OpReportIntersectionKHR";
-    case (int)Op::OpIgnoreIntersectionNV:              return "OpIgnoreIntersectionNV";
-    case (int)Op::OpIgnoreIntersectionKHR:             return "OpIgnoreIntersectionKHR";
-    case (int)Op::OpTerminateRayNV:                    return "OpTerminateRayNV";
-    case (int)Op::OpTerminateRayKHR:                   return "OpTerminateRayKHR";
-    case (int)Op::OpTraceNV:                           return "OpTraceNV";
-    case (int)Op::OpTraceRayMotionNV:                  return "OpTraceRayMotionNV";
-    case (int)Op::OpTraceRayKHR:                       return "OpTraceRayKHR";
-    case (int)Op::OpTypeAccelerationStructureKHR:      return "OpTypeAccelerationStructureKHR";
-    case (int)Op::OpExecuteCallableNV:                 return "OpExecuteCallableNV";
-    case (int)Op::OpExecuteCallableKHR:                return "OpExecuteCallableKHR";
-    case (int)Op::OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";
+    case OpReportIntersectionKHR:             return "OpReportIntersectionKHR";
+    case OpIgnoreIntersectionNV:              return "OpIgnoreIntersectionNV";
+    case OpIgnoreIntersectionKHR:             return "OpIgnoreIntersectionKHR";
+    case OpTerminateRayNV:                    return "OpTerminateRayNV";
+    case OpTerminateRayKHR:                   return "OpTerminateRayKHR";
+    case OpTraceNV:                           return "OpTraceNV";
+    case OpTraceRayMotionNV:                  return "OpTraceRayMotionNV";
+    case OpTraceRayKHR:                       return "OpTraceRayKHR";
+    case OpTypeAccelerationStructureKHR:      return "OpTypeAccelerationStructureKHR";
+    case OpExecuteCallableNV:                 return "OpExecuteCallableNV";
+    case OpExecuteCallableKHR:                return "OpExecuteCallableKHR";
+    case OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";
 
-    case (int)Op::OpGroupNonUniformPartitionNV:       return "OpGroupNonUniformPartitionNV";
-    case (int)Op::OpImageSampleFootprintNV:           return "OpImageSampleFootprintNV";
-    case (int)Op::OpWritePackedPrimitiveIndices4x8NV: return "OpWritePackedPrimitiveIndices4x8NV";
-    case (int)Op::OpEmitMeshTasksEXT:                 return "OpEmitMeshTasksEXT";
-    case (int)Op::OpSetMeshOutputsEXT:                return "OpSetMeshOutputsEXT";
+    case OpGroupNonUniformPartitionNV:       return "OpGroupNonUniformPartitionNV";
+    case OpImageSampleFootprintNV:           return "OpImageSampleFootprintNV";
+    case OpWritePackedPrimitiveIndices4x8NV: return "OpWritePackedPrimitiveIndices4x8NV";
+    case OpEmitMeshTasksEXT:                 return "OpEmitMeshTasksEXT";
+    case OpSetMeshOutputsEXT:                return "OpSetMeshOutputsEXT";
 
-    case (int)Op::OpGroupNonUniformRotateKHR:         return "OpGroupNonUniformRotateKHR";
+    case OpGroupNonUniformRotateKHR:         return "OpGroupNonUniformRotateKHR";
 
-    case (int)Op::OpTypeRayQueryKHR:                                                   return "OpTypeRayQueryKHR";
-    case (int)Op::OpRayQueryInitializeKHR:                                             return "OpRayQueryInitializeKHR";
-    case (int)Op::OpRayQueryTerminateKHR:                                              return "OpRayQueryTerminateKHR";
-    case (int)Op::OpRayQueryGenerateIntersectionKHR:                                   return "OpRayQueryGenerateIntersectionKHR";
-    case (int)Op::OpRayQueryConfirmIntersectionKHR:                                    return "OpRayQueryConfirmIntersectionKHR";
-    case (int)Op::OpRayQueryProceedKHR:                                                return "OpRayQueryProceedKHR";
-    case (int)Op::OpRayQueryGetIntersectionTypeKHR:                                    return "OpRayQueryGetIntersectionTypeKHR";
-    case (int)Op::OpRayQueryGetRayTMinKHR:                                             return "OpRayQueryGetRayTMinKHR";
-    case (int)Op::OpRayQueryGetRayFlagsKHR:                                            return "OpRayQueryGetRayFlagsKHR";
-    case (int)Op::OpRayQueryGetIntersectionTKHR:                                       return "OpRayQueryGetIntersectionTKHR";
-    case (int)Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR:                     return "OpRayQueryGetIntersectionInstanceCustomIndexKHR";
-    case (int)Op::OpRayQueryGetIntersectionInstanceIdKHR:                              return "OpRayQueryGetIntersectionInstanceIdKHR";
-    case (int)Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR:  return "OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR";
-    case (int)Op::OpRayQueryGetIntersectionGeometryIndexKHR:                           return "OpRayQueryGetIntersectionGeometryIndexKHR";
-    case (int)Op::OpRayQueryGetIntersectionPrimitiveIndexKHR:                          return "OpRayQueryGetIntersectionPrimitiveIndexKHR";
-    case (int)Op::OpRayQueryGetIntersectionBarycentricsKHR:                            return "OpRayQueryGetIntersectionBarycentricsKHR";
-    case (int)Op::OpRayQueryGetIntersectionFrontFaceKHR:                               return "OpRayQueryGetIntersectionFrontFaceKHR";
-    case (int)Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR:                     return "OpRayQueryGetIntersectionCandidateAABBOpaqueKHR";
-    case (int)Op::OpRayQueryGetIntersectionObjectRayDirectionKHR:                      return "OpRayQueryGetIntersectionObjectRayDirectionKHR";
-    case (int)Op::OpRayQueryGetIntersectionObjectRayOriginKHR:                         return "OpRayQueryGetIntersectionObjectRayOriginKHR";
-    case (int)Op::OpRayQueryGetWorldRayDirectionKHR:                                   return "OpRayQueryGetWorldRayDirectionKHR";
-    case (int)Op::OpRayQueryGetWorldRayOriginKHR:                                      return "OpRayQueryGetWorldRayOriginKHR";
-    case (int)Op::OpRayQueryGetIntersectionObjectToWorldKHR:                           return "OpRayQueryGetIntersectionObjectToWorldKHR";
-    case (int)Op::OpRayQueryGetIntersectionWorldToObjectKHR:                           return "OpRayQueryGetIntersectionWorldToObjectKHR";
-    case (int)Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR:                 return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
-    case (int)Op::OpRayQueryGetClusterIdNV:                                            return "OpRayQueryGetIntersectionClusterIdNV";
+    case OpTypeRayQueryKHR:                                                   return "OpTypeRayQueryKHR";
+    case OpRayQueryInitializeKHR:                                             return "OpRayQueryInitializeKHR";
+    case OpRayQueryTerminateKHR:                                              return "OpRayQueryTerminateKHR";
+    case OpRayQueryGenerateIntersectionKHR:                                   return "OpRayQueryGenerateIntersectionKHR";
+    case OpRayQueryConfirmIntersectionKHR:                                    return "OpRayQueryConfirmIntersectionKHR";
+    case OpRayQueryProceedKHR:                                                return "OpRayQueryProceedKHR";
+    case OpRayQueryGetIntersectionTypeKHR:                                    return "OpRayQueryGetIntersectionTypeKHR";
+    case OpRayQueryGetRayTMinKHR:                                             return "OpRayQueryGetRayTMinKHR";
+    case OpRayQueryGetRayFlagsKHR:                                            return "OpRayQueryGetRayFlagsKHR";
+    case OpRayQueryGetIntersectionTKHR:                                       return "OpRayQueryGetIntersectionTKHR";
+    case OpRayQueryGetIntersectionInstanceCustomIndexKHR:                     return "OpRayQueryGetIntersectionInstanceCustomIndexKHR";
+    case OpRayQueryGetIntersectionInstanceIdKHR:                              return "OpRayQueryGetIntersectionInstanceIdKHR";
+    case OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR:  return "OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR";
+    case OpRayQueryGetIntersectionGeometryIndexKHR:                           return "OpRayQueryGetIntersectionGeometryIndexKHR";
+    case OpRayQueryGetIntersectionPrimitiveIndexKHR:                          return "OpRayQueryGetIntersectionPrimitiveIndexKHR";
+    case OpRayQueryGetIntersectionBarycentricsKHR:                            return "OpRayQueryGetIntersectionBarycentricsKHR";
+    case OpRayQueryGetIntersectionFrontFaceKHR:                               return "OpRayQueryGetIntersectionFrontFaceKHR";
+    case OpRayQueryGetIntersectionCandidateAABBOpaqueKHR:                     return "OpRayQueryGetIntersectionCandidateAABBOpaqueKHR";
+    case OpRayQueryGetIntersectionObjectRayDirectionKHR:                      return "OpRayQueryGetIntersectionObjectRayDirectionKHR";
+    case OpRayQueryGetIntersectionObjectRayOriginKHR:                         return "OpRayQueryGetIntersectionObjectRayOriginKHR";
+    case OpRayQueryGetWorldRayDirectionKHR:                                   return "OpRayQueryGetWorldRayDirectionKHR";
+    case OpRayQueryGetWorldRayOriginKHR:                                      return "OpRayQueryGetWorldRayOriginKHR";
+    case OpRayQueryGetIntersectionObjectToWorldKHR:                           return "OpRayQueryGetIntersectionObjectToWorldKHR";
+    case OpRayQueryGetIntersectionWorldToObjectKHR:                           return "OpRayQueryGetIntersectionWorldToObjectKHR";
+    case OpRayQueryGetIntersectionTriangleVertexPositionsKHR:                 return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
 
-    case (int)Op::OpRayQueryGetIntersectionSpherePositionNV:                           return "OpRayQueryGetIntersectionSpherePositionNV";
-    case (int)Op::OpRayQueryGetIntersectionSphereRadiusNV:                             return "OpRayQueryGetIntersectionSphereRadiusNV";
-    case (int)Op::OpRayQueryGetIntersectionLSSHitValueNV:                              return "OpRayQueryGetIntersectionLSSHitValueNV";
-    case (int)Op::OpRayQueryGetIntersectionLSSPositionsNV:                             return "OpRayQueryGetIntersectionLSSPositionsNV";
-    case (int)Op::OpRayQueryGetIntersectionLSSRadiiNV:                                 return "OpRayQueryGetIntersectionLSSRadiiNV";
-    case (int)Op::OpRayQueryIsSphereHitNV:                                             return "OpRayQueryIsSphereHitNV";
-    case (int)Op::OpRayQueryIsLSSHitNV:                                                return "OpRayQueryIsLSSHitNV";
+    case OpTypeCooperativeMatrixNV:         return "OpTypeCooperativeMatrixNV";
+    case OpCooperativeMatrixLoadNV:         return "OpCooperativeMatrixLoadNV";
+    case OpCooperativeMatrixStoreNV:        return "OpCooperativeMatrixStoreNV";
+    case OpCooperativeMatrixMulAddNV:       return "OpCooperativeMatrixMulAddNV";
+    case OpCooperativeMatrixLengthNV:       return "OpCooperativeMatrixLengthNV";
+    case OpTypeCooperativeMatrixKHR:        return "OpTypeCooperativeMatrixKHR";
+    case OpCooperativeMatrixLoadKHR:        return "OpCooperativeMatrixLoadKHR";
+    case OpCooperativeMatrixStoreKHR:       return "OpCooperativeMatrixStoreKHR";
+    case OpCooperativeMatrixMulAddKHR:      return "OpCooperativeMatrixMulAddKHR";
+    case OpCooperativeMatrixLengthKHR:      return "OpCooperativeMatrixLengthKHR";
+    case OpDemoteToHelperInvocationEXT:     return "OpDemoteToHelperInvocationEXT";
+    case OpIsHelperInvocationEXT:           return "OpIsHelperInvocationEXT";
 
-    case (int)Op::OpTypeCooperativeMatrixNV:         return "OpTypeCooperativeMatrixNV";
-    case (int)Op::OpCooperativeMatrixLoadNV:         return "OpCooperativeMatrixLoadNV";
-    case (int)Op::OpCooperativeMatrixStoreNV:        return "OpCooperativeMatrixStoreNV";
-    case (int)Op::OpCooperativeMatrixMulAddNV:       return "OpCooperativeMatrixMulAddNV";
-    case (int)Op::OpCooperativeMatrixLengthNV:       return "OpCooperativeMatrixLengthNV";
-    case (int)Op::OpTypeCooperativeMatrixKHR:        return "OpTypeCooperativeMatrixKHR";
-    case (int)Op::OpCooperativeMatrixLoadKHR:        return "OpCooperativeMatrixLoadKHR";
-    case (int)Op::OpCooperativeMatrixStoreKHR:       return "OpCooperativeMatrixStoreKHR";
-    case (int)Op::OpCooperativeMatrixMulAddKHR:      return "OpCooperativeMatrixMulAddKHR";
-    case (int)Op::OpCooperativeMatrixLengthKHR:      return "OpCooperativeMatrixLengthKHR";
-    case (int)Op::OpDemoteToHelperInvocationEXT:     return "OpDemoteToHelperInvocationEXT";
-    case (int)Op::OpIsHelperInvocationEXT:           return "OpIsHelperInvocationEXT";
+    case OpBeginInvocationInterlockEXT:     return "OpBeginInvocationInterlockEXT";
+    case OpEndInvocationInterlockEXT:       return "OpEndInvocationInterlockEXT";
 
-    case (int)Op::OpCooperativeMatrixConvertNV:      return "OpCooperativeMatrixConvertNV";
-    case (int)Op::OpCooperativeMatrixTransposeNV:    return "OpCooperativeMatrixTransposeNV";
-    case (int)Op::OpCooperativeMatrixReduceNV:       return "OpCooperativeMatrixReduceNV";
-    case (int)Op::OpCooperativeMatrixLoadTensorNV:   return "OpCooperativeMatrixLoadTensorNV";
-    case (int)Op::OpCooperativeMatrixStoreTensorNV:  return "OpCooperativeMatrixStoreTensorNV";
-    case (int)Op::OpCooperativeMatrixPerElementOpNV: return "OpCooperativeMatrixPerElementOpNV";
-    case (int)Op::OpTypeTensorLayoutNV:              return "OpTypeTensorLayoutNV";
-    case (int)Op::OpTypeTensorViewNV:                return "OpTypeTensorViewNV";
-    case (int)Op::OpCreateTensorLayoutNV:            return "OpCreateTensorLayoutNV";
-    case (int)Op::OpTensorLayoutSetBlockSizeNV:      return "OpTensorLayoutSetBlockSizeNV";
-    case (int)Op::OpTensorLayoutSetDimensionNV:      return "OpTensorLayoutSetDimensionNV";
-    case (int)Op::OpTensorLayoutSetStrideNV:         return "OpTensorLayoutSetStrideNV";
-    case (int)Op::OpTensorLayoutSliceNV:             return "OpTensorLayoutSliceNV";
-    case (int)Op::OpTensorLayoutSetClampValueNV:     return "OpTensorLayoutSetClampValueNV";
-    case (int)Op::OpCreateTensorViewNV:              return "OpCreateTensorViewNV";
-    case (int)Op::OpTensorViewSetDimensionNV:        return "OpTensorViewSetDimensionNV";
-    case (int)Op::OpTensorViewSetStrideNV:           return "OpTensorViewSetStrideNV";
-    case (int)Op::OpTensorViewSetClipNV:             return "OpTensorViewSetClipNV";
+    case OpTypeHitObjectNV:                     return "OpTypeHitObjectNV";
+    case OpHitObjectTraceRayNV:                 return "OpHitObjectTraceRayNV";
+    case OpHitObjectTraceRayMotionNV:           return "OpHitObjectTraceRayMotionNV";
+    case OpHitObjectRecordHitNV:                return "OpHitObjectRecordHitNV";
+    case OpHitObjectRecordHitMotionNV:          return "OpHitObjectRecordHitMotionNV";
+    case OpHitObjectRecordHitWithIndexNV:       return "OpHitObjectRecordHitWithIndexNV";
+    case OpHitObjectRecordHitWithIndexMotionNV: return "OpHitObjectRecordHitWithIndexMotionNV";
+    case OpHitObjectRecordMissNV:               return "OpHitObjectRecordMissNV";
+    case OpHitObjectRecordMissMotionNV:         return "OpHitObjectRecordMissMotionNV";
+    case OpHitObjectRecordEmptyNV:              return "OpHitObjectRecordEmptyNV";
+    case OpHitObjectExecuteShaderNV:            return "OpHitObjectExecuteShaderNV";
+    case OpReorderThreadWithHintNV:             return "OpReorderThreadWithHintNV";
+    case OpReorderThreadWithHitObjectNV:        return "OpReorderThreadWithHitObjectNV";
+    case OpHitObjectGetCurrentTimeNV:           return "OpHitObjectGetCurrentTimeNV";
+    case OpHitObjectGetAttributesNV:            return "OpHitObjectGetAttributesNV";
+    case OpHitObjectGetHitKindNV:               return "OpHitObjectGetFrontFaceNV";
+    case OpHitObjectGetPrimitiveIndexNV:        return "OpHitObjectGetPrimitiveIndexNV";
+    case OpHitObjectGetGeometryIndexNV:         return "OpHitObjectGetGeometryIndexNV";
+    case OpHitObjectGetInstanceIdNV:            return "OpHitObjectGetInstanceIdNV";
+    case OpHitObjectGetInstanceCustomIndexNV:   return "OpHitObjectGetInstanceCustomIndexNV";
+    case OpHitObjectGetObjectRayDirectionNV:    return "OpHitObjectGetObjectRayDirectionNV";
+    case OpHitObjectGetObjectRayOriginNV:       return "OpHitObjectGetObjectRayOriginNV";
+    case OpHitObjectGetWorldRayDirectionNV:     return "OpHitObjectGetWorldRayDirectionNV";
+    case OpHitObjectGetWorldRayOriginNV:        return "OpHitObjectGetWorldRayOriginNV";
+    case OpHitObjectGetWorldToObjectNV:         return "OpHitObjectGetWorldToObjectNV";
+    case OpHitObjectGetObjectToWorldNV:         return "OpHitObjectGetObjectToWorldNV";
+    case OpHitObjectGetRayTMaxNV:               return "OpHitObjectGetRayTMaxNV";
+    case OpHitObjectGetRayTMinNV:               return "OpHitObjectGetRayTMinNV";
+    case OpHitObjectIsEmptyNV:                  return "OpHitObjectIsEmptyNV";
+    case OpHitObjectIsHitNV:                    return "OpHitObjectIsHitNV";
+    case OpHitObjectIsMissNV:                   return "OpHitObjectIsMissNV";
+    case OpHitObjectGetShaderBindingTableRecordIndexNV: return "OpHitObjectGetShaderBindingTableRecordIndexNV";
+    case OpHitObjectGetShaderRecordBufferHandleNV:   return "OpHitObjectGetShaderRecordBufferHandleNV";
 
-    case (int)Op::OpTypeTensorARM:                   return "OpTypeTensorARM";
-    case (int)Op::OpTensorReadARM:                   return "OpTensorReadARM";
-    case (int)Op::OpTensorWriteARM:                  return "OpTensorWriteARM";
-    case (int)Op::OpTensorQuerySizeARM:              return "OpTensorQuerySizeARM";
+    case OpFetchMicroTriangleVertexBarycentricNV:       return "OpFetchMicroTriangleVertexBarycentricNV";
+    case OpFetchMicroTriangleVertexPositionNV:    return "OpFetchMicroTriangleVertexPositionNV";
 
-    case (int)Op::OpTypeCooperativeVectorNV:         return "OpTypeCooperativeVectorNV";
-    case (int)Op::OpCooperativeVectorMatrixMulNV:    return "OpCooperativeVectorMatrixMulNV";
-    case (int)Op::OpCooperativeVectorMatrixMulAddNV: return "OpCooperativeVectorMatrixMulAddNV";
-    case (int)Op::OpCooperativeVectorLoadNV:         return "OpCooperativeVectorLoadNV";
-    case (int)Op::OpCooperativeVectorStoreNV:        return "OpCooperativeVectorStoreNV";
-    case (int)Op::OpCooperativeVectorOuterProductAccumulateNV:   return "OpCooperativeVectorOuterProductAccumulateNV";
-    case (int)Op::OpCooperativeVectorReduceSumAccumulateNV:      return "OpCooperativeVectorReduceSumAccumulateNV";
+    case OpColorAttachmentReadEXT:          return "OpColorAttachmentReadEXT";
+    case OpDepthAttachmentReadEXT:          return "OpDepthAttachmentReadEXT";
+    case OpStencilAttachmentReadEXT:        return "OpStencilAttachmentReadEXT";
 
-    case (int)Op::OpBeginInvocationInterlockEXT:     return "OpBeginInvocationInterlockEXT";
-    case (int)Op::OpEndInvocationInterlockEXT:       return "OpEndInvocationInterlockEXT";
-
-    case (int)Op::OpTypeHitObjectNV:                     return "OpTypeHitObjectNV";
-    case (int)Op::OpHitObjectTraceRayNV:                 return "OpHitObjectTraceRayNV";
-    case (int)Op::OpHitObjectTraceRayMotionNV:           return "OpHitObjectTraceRayMotionNV";
-    case (int)Op::OpHitObjectRecordHitNV:                return "OpHitObjectRecordHitNV";
-    case (int)Op::OpHitObjectRecordHitMotionNV:          return "OpHitObjectRecordHitMotionNV";
-    case (int)Op::OpHitObjectRecordHitWithIndexNV:       return "OpHitObjectRecordHitWithIndexNV";
-    case (int)Op::OpHitObjectRecordHitWithIndexMotionNV: return "OpHitObjectRecordHitWithIndexMotionNV";
-    case (int)Op::OpHitObjectRecordMissNV:               return "OpHitObjectRecordMissNV";
-    case (int)Op::OpHitObjectRecordMissMotionNV:         return "OpHitObjectRecordMissMotionNV";
-    case (int)Op::OpHitObjectRecordEmptyNV:              return "OpHitObjectRecordEmptyNV";
-    case (int)Op::OpHitObjectExecuteShaderNV:            return "OpHitObjectExecuteShaderNV";
-    case (int)Op::OpReorderThreadWithHintNV:             return "OpReorderThreadWithHintNV";
-    case (int)Op::OpReorderThreadWithHitObjectNV:        return "OpReorderThreadWithHitObjectNV";
-    case (int)Op::OpHitObjectGetCurrentTimeNV:           return "OpHitObjectGetCurrentTimeNV";
-    case (int)Op::OpHitObjectGetAttributesNV:            return "OpHitObjectGetAttributesNV";
-    case (int)Op::OpHitObjectGetHitKindNV:               return "OpHitObjectGetFrontFaceNV";
-    case (int)Op::OpHitObjectGetPrimitiveIndexNV:        return "OpHitObjectGetPrimitiveIndexNV";
-    case (int)Op::OpHitObjectGetGeometryIndexNV:         return "OpHitObjectGetGeometryIndexNV";
-    case (int)Op::OpHitObjectGetInstanceIdNV:            return "OpHitObjectGetInstanceIdNV";
-    case (int)Op::OpHitObjectGetInstanceCustomIndexNV:   return "OpHitObjectGetInstanceCustomIndexNV";
-    case (int)Op::OpHitObjectGetObjectRayDirectionNV:    return "OpHitObjectGetObjectRayDirectionNV";
-    case (int)Op::OpHitObjectGetObjectRayOriginNV:       return "OpHitObjectGetObjectRayOriginNV";
-    case (int)Op::OpHitObjectGetWorldRayDirectionNV:     return "OpHitObjectGetWorldRayDirectionNV";
-    case (int)Op::OpHitObjectGetWorldRayOriginNV:        return "OpHitObjectGetWorldRayOriginNV";
-    case (int)Op::OpHitObjectGetWorldToObjectNV:         return "OpHitObjectGetWorldToObjectNV";
-    case (int)Op::OpHitObjectGetObjectToWorldNV:         return "OpHitObjectGetObjectToWorldNV";
-    case (int)Op::OpHitObjectGetRayTMaxNV:               return "OpHitObjectGetRayTMaxNV";
-    case (int)Op::OpHitObjectGetRayTMinNV:               return "OpHitObjectGetRayTMinNV";
-    case (int)Op::OpHitObjectIsEmptyNV:                  return "OpHitObjectIsEmptyNV";
-    case (int)Op::OpHitObjectIsHitNV:                    return "OpHitObjectIsHitNV";
-    case (int)Op::OpHitObjectIsMissNV:                   return "OpHitObjectIsMissNV";
-    case (int)Op::OpHitObjectGetShaderBindingTableRecordIndexNV: return "OpHitObjectGetShaderBindingTableRecordIndexNV";
-    case (int)Op::OpHitObjectGetShaderRecordBufferHandleNV:   return "OpHitObjectGetShaderRecordBufferHandleNV";
-    case (int)Op::OpHitObjectGetClusterIdNV:             return "OpHitObjectGetClusterIdNV";
-    case (int)Op::OpHitObjectGetSpherePositionNV:        return "OpHitObjectGetSpherePositionNV";
-    case (int)Op::OpHitObjectGetSphereRadiusNV:          return "OpHitObjectGetSphereRadiusNV";
-    case (int)Op::OpHitObjectGetLSSPositionsNV:          return "OpHitObjectGetLSSPositionsNV";
-    case (int)Op::OpHitObjectGetLSSRadiiNV:              return "OpHitObjectGetLSSRadiiNV";
-    case (int)Op::OpHitObjectIsSphereHitNV:              return "OpHitObjectIsSphereHitNV";
-    case (int)Op::OpHitObjectIsLSSHitNV:                 return "OpHitObjectIsLSSHitNV";
-
-    case (int)Op::OpFetchMicroTriangleVertexBarycentricNV:       return "OpFetchMicroTriangleVertexBarycentricNV";
-    case (int)Op::OpFetchMicroTriangleVertexPositionNV:    return "OpFetchMicroTriangleVertexPositionNV";
-
-    case (int)Op::OpColorAttachmentReadEXT:          return "OpColorAttachmentReadEXT";
-    case (int)Op::OpDepthAttachmentReadEXT:          return "OpDepthAttachmentReadEXT";
-    case (int)Op::OpStencilAttachmentReadEXT:        return "OpStencilAttachmentReadEXT";
-
-    case (int)Op::OpImageSampleWeightedQCOM:         return "OpImageSampleWeightedQCOM";
-    case (int)Op::OpImageBoxFilterQCOM:              return "OpImageBoxFilterQCOM";
-    case (int)Op::OpImageBlockMatchSADQCOM:          return "OpImageBlockMatchSADQCOM";
-    case (int)Op::OpImageBlockMatchSSDQCOM:          return "OpImageBlockMatchSSDQCOM";
-    case (int)Op::OpImageBlockMatchWindowSSDQCOM:    return "OpImageBlockMatchWindowSSDQCOM";
-    case (int)Op::OpImageBlockMatchWindowSADQCOM:    return "OpImageBlockMatchWindowSADQCOM";
-    case (int)Op::OpImageBlockMatchGatherSSDQCOM:    return "OpImageBlockMatchGatherSSDQCOM";
-    case (int)Op::OpImageBlockMatchGatherSADQCOM:    return "OpImageBlockMatchGatherSADQCOM";
-
-    case (int)Op::OpBitCastArrayQCOM:                return "OpBitCastArrayQCOM";
-    case (int)Op::OpCompositeConstructCoopMatQCOM:   return "OpCompositeConstructCoopMatQCOM";
-    case (int)Op::OpCompositeExtractCoopMatQCOM:     return "OpCompositeExtractCoopMatQCOM";
-    case (int)Op::OpExtractSubArrayQCOM:             return "OpExtractSubArrayQCOM";
-
-    case (int)Op::OpConstantCompositeReplicateEXT: return "OpConstantCompositeReplicateEXT";
-    case (int)Op::OpSpecConstantCompositeReplicateEXT: return "OpSpecConstantCompositeReplicateEXT";
-    case (int)Op::OpCompositeConstructReplicateEXT: return "OpCompositeConstructReplicateEXT";
-
-    case (int)Op::OpSDotKHR: return "OpSDotKHR";
-    case (int)Op::OpUDotKHR: return "OpUDotKHR";
-    case (int)Op::OpSUDotKHR: return "OpSUDotKHR";
-    case (int)Op::OpSDotAccSatKHR: return "OpSDotAccSatKHR";
-    case (int)Op::OpUDotAccSatKHR: return "OpUDotAccSatKHR";
-    case (int)Op::OpSUDotAccSatKHR: return "OpSUDotAccSatKHR";
-
-    case (int)Op::OpTypeHitObjectEXT:                     return "OpTypeHitObjectEXT";
-    case (int)Op::OpHitObjectTraceRayEXT:                 return "OpHitObjectTraceRayEXT";
-    case (int)Op::OpHitObjectTraceRayMotionEXT:           return "OpHitObjectTraceRayMotionEXT";
-    case (int)Op::OpHitObjectRecordMissEXT:               return "OpHitObjectRecordMissEXT";
-    case (int)Op::OpHitObjectRecordMissMotionEXT:         return "OpHitObjectRecordMissMotionEXT";
-    case (int)Op::OpHitObjectRecordEmptyEXT:              return "OpHitObjectRecordEmptyEXT";
-    case (int)Op::OpHitObjectExecuteShaderEXT:            return "OpHitObjectExecuteShaderEXT";
-    case (int)Op::OpReorderThreadWithHintEXT:             return "OpReorderThreadWithHintEXT";
-    case (int)Op::OpReorderThreadWithHitObjectEXT:        return "OpReorderThreadWithHitObjectEXT";
-    case (int)Op::OpHitObjectGetCurrentTimeEXT:           return "OpHitObjectGetCurrentTimeEXT";
-    case (int)Op::OpHitObjectGetAttributesEXT:            return "OpHitObjectGetAttributesEXT";
-    case (int)Op::OpHitObjectGetHitKindEXT:               return "OpHitObjectGetHitKindEXT";
-    case (int)Op::OpHitObjectGetPrimitiveIndexEXT:        return "OpHitObjectGetPrimitiveIndexEXT";
-    case (int)Op::OpHitObjectGetGeometryIndexEXT:         return "OpHitObjectGetGeometryIndexEXT";
-    case (int)Op::OpHitObjectGetInstanceIdEXT:            return "OpHitObjectGetInstanceIdEXT";
-    case (int)Op::OpHitObjectGetInstanceCustomIndexEXT:   return "OpHitObjectGetInstanceCustomIndexEXT";
-    case (int)Op::OpHitObjectGetObjectRayDirectionEXT:    return "OpHitObjectGetObjectRayDirectionEXT";
-    case (int)Op::OpHitObjectGetObjectRayOriginEXT:       return "OpHitObjectGetObjectRayOriginEXT";
-    case (int)Op::OpHitObjectGetWorldRayDirectionEXT:     return "OpHitObjectGetWorldRayDirectionEXT";
-    case (int)Op::OpHitObjectGetWorldRayOriginEXT:        return "OpHitObjectGetWorldRayOriginEXT";
-    case (int)Op::OpHitObjectGetWorldToObjectEXT:         return "OpHitObjectGetWorldToObjectEXT";
-    case (int)Op::OpHitObjectGetObjectToWorldEXT:         return "OpHitObjectGetObjectToWorldEXT";
-    case (int)Op::OpHitObjectGetRayTMaxEXT:               return "OpHitObjectGetRayTMaxEXT";
-    case (int)Op::OpHitObjectGetRayTMinEXT:               return "OpHitObjectGetRayTMinEXT";
-    case (int)Op::OpHitObjectGetRayFlagsEXT:              return "OpHitObjectGetRayFlagsEXT";
-    case (int)Op::OpHitObjectIsEmptyEXT:                  return "OpHitObjectIsEmptyEXT";
-    case (int)Op::OpHitObjectIsHitEXT:                    return "OpHitObjectIsHitEXT";
-    case (int)Op::OpHitObjectIsMissEXT:                   return "OpHitObjectIsMissEXT";
-    case (int)Op::OpHitObjectGetShaderBindingTableRecordIndexEXT: return "OpHitObjectGetShaderBindingTableRecordIndexEXT";
-    case (int)Op::OpHitObjectGetShaderRecordBufferHandleEXT:   return "OpHitObjectGetShaderRecordBufferHandleEXT";
-    case (int)Op::OpHitObjectSetShaderBindingTableRecordIndexEXT: return "OpHitObjectSetShaderBindingTableRecordIndexEXT";
-    case (int)Op::OpHitObjectReorderExecuteShaderEXT:     return "OpHitObjectReorderExecuteEXT";
-    case (int)Op::OpHitObjectTraceReorderExecuteEXT:      return "OpHitObjectTraceReorderExecuteEXT";
-    case (int)Op::OpHitObjectTraceMotionReorderExecuteEXT: return "OpHitObjectTraceMotionReorderExecuteEXT";
-    case (int)Op::OpHitObjectRecordFromQueryEXT:          return "OpHitObjectRecordFromQueryEXT";
-    case (int)Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT: return "OpHitObjectGetIntersectionTriangleVertexPositionsEXT";
+    case OpImageSampleWeightedQCOM:         return "OpImageSampleWeightedQCOM";
+    case OpImageBoxFilterQCOM:              return "OpImageBoxFilterQCOM";
+    case OpImageBlockMatchSADQCOM:          return "OpImageBlockMatchSADQCOM";
+    case OpImageBlockMatchSSDQCOM:          return "OpImageBlockMatchSSDQCOM";
+    case OpImageBlockMatchWindowSSDQCOM:    return "OpImageBlockMatchWindowSSDQCOM";
+    case OpImageBlockMatchWindowSADQCOM:    return "OpImageBlockMatchWindowSADQCOM";
+    case OpImageBlockMatchGatherSSDQCOM:    return "OpImageBlockMatchGatherSSDQCOM";
+    case OpImageBlockMatchGatherSADQCOM:    return "OpImageBlockMatchGatherSADQCOM";
 
     default:
         return "Bad";
@@ -1782,7 +1604,6 @@ EnumParameters SelectionControlParams[SelectControlCeiling];
 EnumParameters FunctionControlParams[FunctionControlCeiling];
 EnumParameters MemoryAccessParams[MemoryAccessCeiling];
 EnumParameters CooperativeMatrixOperandsParams[CooperativeMatrixOperandsCeiling];
-EnumParameters TensorAddressingOperandsParams[TensorAddressingOperandsCeiling];
 
 // Set up all the parameterizing descriptions of the opcodes, operands, etc.
 void Parameterize()
@@ -1794,141 +1615,129 @@ void Parameterize()
         // Exceptions to having a result <id> and a resulting type <id>.
         // (Everything is initialized to have both).
 
-        InstructionDesc[enumCast(Op::OpNop)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSource)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSourceContinued)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSourceExtension)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpExtension)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpExtInstImport)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpCapability)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpMemoryModel)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEntryPoint)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpExecutionMode)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpExecutionModeId)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeVoid)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeBool)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeInt)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeFloat)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeVector)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeMatrix)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeImage)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeSampler)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeSampledImage)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeArray)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeRuntimeArray)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeStruct)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeOpaque)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypePointer)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeForwardPointer)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeFunction)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeEvent)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeDeviceEvent)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeReserveId)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeQueue)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypePipe)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpFunctionEnd)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpStore)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpImageWrite)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpDecorationGroup)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpDecorate)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpDecorateId)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpDecorateStringGOOGLE)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpMemberDecorate)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpMemberDecorateStringGOOGLE)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpGroupDecorate)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpGroupMemberDecorate)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpName)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpMemberName)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpString)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpLine)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpNoLine)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCopyMemory)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCopyMemorySized)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEmitVertex)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEndPrimitive)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEmitStreamVertex)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEndStreamPrimitive)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpControlBarrier)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpMemoryBarrier)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpAtomicStore)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpLoopMerge)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSelectionMerge)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpLabel)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpBranch)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpBranchConditional)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSwitch)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpKill)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTerminateInvocation)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpReturn)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpReturnValue)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpUnreachable)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpLifetimeStart)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpLifetimeStop)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCommitReadPipe)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCommitWritePipe)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCaptureEventProfilingInfo)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpSetUserEventStatus)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpRetainEvent)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpReleaseEvent)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpGroupWaitEvents)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpAtomicFlagClear)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpModuleProcessed)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixNV)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpBeginInvocationInterlockEXT)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpEndInvocationInterlockEXT)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpAssumeTrueKHR)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeTensorLayoutNV)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeTensorViewNV)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpTypeCooperativeVectorNV)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].setResultAndType(false, false);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorReduceSumAccumulateNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpTypeTensorARM)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTensorReadARM)].setResultAndType(true, true);
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].setResultAndType(false, false);
-
+        InstructionDesc[OpNop].setResultAndType(false, false);
+        InstructionDesc[OpSource].setResultAndType(false, false);
+        InstructionDesc[OpSourceContinued].setResultAndType(false, false);
+        InstructionDesc[OpSourceExtension].setResultAndType(false, false);
+        InstructionDesc[OpExtension].setResultAndType(false, false);
+        InstructionDesc[OpExtInstImport].setResultAndType(true, false);
+        InstructionDesc[OpCapability].setResultAndType(false, false);
+        InstructionDesc[OpMemoryModel].setResultAndType(false, false);
+        InstructionDesc[OpEntryPoint].setResultAndType(false, false);
+        InstructionDesc[OpExecutionMode].setResultAndType(false, false);
+        InstructionDesc[OpExecutionModeId].setResultAndType(false, false);
+        InstructionDesc[OpTypeVoid].setResultAndType(true, false);
+        InstructionDesc[OpTypeBool].setResultAndType(true, false);
+        InstructionDesc[OpTypeInt].setResultAndType(true, false);
+        InstructionDesc[OpTypeFloat].setResultAndType(true, false);
+        InstructionDesc[OpTypeVector].setResultAndType(true, false);
+        InstructionDesc[OpTypeMatrix].setResultAndType(true, false);
+        InstructionDesc[OpTypeImage].setResultAndType(true, false);
+        InstructionDesc[OpTypeSampler].setResultAndType(true, false);
+        InstructionDesc[OpTypeSampledImage].setResultAndType(true, false);
+        InstructionDesc[OpTypeArray].setResultAndType(true, false);
+        InstructionDesc[OpTypeRuntimeArray].setResultAndType(true, false);
+        InstructionDesc[OpTypeStruct].setResultAndType(true, false);
+        InstructionDesc[OpTypeOpaque].setResultAndType(true, false);
+        InstructionDesc[OpTypePointer].setResultAndType(true, false);
+        InstructionDesc[OpTypeForwardPointer].setResultAndType(false, false);
+        InstructionDesc[OpTypeFunction].setResultAndType(true, false);
+        InstructionDesc[OpTypeEvent].setResultAndType(true, false);
+        InstructionDesc[OpTypeDeviceEvent].setResultAndType(true, false);
+        InstructionDesc[OpTypeReserveId].setResultAndType(true, false);
+        InstructionDesc[OpTypeQueue].setResultAndType(true, false);
+        InstructionDesc[OpTypePipe].setResultAndType(true, false);
+        InstructionDesc[OpFunctionEnd].setResultAndType(false, false);
+        InstructionDesc[OpStore].setResultAndType(false, false);
+        InstructionDesc[OpImageWrite].setResultAndType(false, false);
+        InstructionDesc[OpDecorationGroup].setResultAndType(true, false);
+        InstructionDesc[OpDecorate].setResultAndType(false, false);
+        InstructionDesc[OpDecorateId].setResultAndType(false, false);
+        InstructionDesc[OpDecorateStringGOOGLE].setResultAndType(false, false);
+        InstructionDesc[OpMemberDecorate].setResultAndType(false, false);
+        InstructionDesc[OpMemberDecorateStringGOOGLE].setResultAndType(false, false);
+        InstructionDesc[OpGroupDecorate].setResultAndType(false, false);
+        InstructionDesc[OpGroupMemberDecorate].setResultAndType(false, false);
+        InstructionDesc[OpName].setResultAndType(false, false);
+        InstructionDesc[OpMemberName].setResultAndType(false, false);
+        InstructionDesc[OpString].setResultAndType(true, false);
+        InstructionDesc[OpLine].setResultAndType(false, false);
+        InstructionDesc[OpNoLine].setResultAndType(false, false);
+        InstructionDesc[OpCopyMemory].setResultAndType(false, false);
+        InstructionDesc[OpCopyMemorySized].setResultAndType(false, false);
+        InstructionDesc[OpEmitVertex].setResultAndType(false, false);
+        InstructionDesc[OpEndPrimitive].setResultAndType(false, false);
+        InstructionDesc[OpEmitStreamVertex].setResultAndType(false, false);
+        InstructionDesc[OpEndStreamPrimitive].setResultAndType(false, false);
+        InstructionDesc[OpControlBarrier].setResultAndType(false, false);
+        InstructionDesc[OpMemoryBarrier].setResultAndType(false, false);
+        InstructionDesc[OpAtomicStore].setResultAndType(false, false);
+        InstructionDesc[OpLoopMerge].setResultAndType(false, false);
+        InstructionDesc[OpSelectionMerge].setResultAndType(false, false);
+        InstructionDesc[OpLabel].setResultAndType(true, false);
+        InstructionDesc[OpBranch].setResultAndType(false, false);
+        InstructionDesc[OpBranchConditional].setResultAndType(false, false);
+        InstructionDesc[OpSwitch].setResultAndType(false, false);
+        InstructionDesc[OpKill].setResultAndType(false, false);
+        InstructionDesc[OpTerminateInvocation].setResultAndType(false, false);
+        InstructionDesc[OpReturn].setResultAndType(false, false);
+        InstructionDesc[OpReturnValue].setResultAndType(false, false);
+        InstructionDesc[OpUnreachable].setResultAndType(false, false);
+        InstructionDesc[OpLifetimeStart].setResultAndType(false, false);
+        InstructionDesc[OpLifetimeStop].setResultAndType(false, false);
+        InstructionDesc[OpCommitReadPipe].setResultAndType(false, false);
+        InstructionDesc[OpCommitWritePipe].setResultAndType(false, false);
+        InstructionDesc[OpGroupCommitWritePipe].setResultAndType(false, false);
+        InstructionDesc[OpGroupCommitReadPipe].setResultAndType(false, false);
+        InstructionDesc[OpCaptureEventProfilingInfo].setResultAndType(false, false);
+        InstructionDesc[OpSetUserEventStatus].setResultAndType(false, false);
+        InstructionDesc[OpRetainEvent].setResultAndType(false, false);
+        InstructionDesc[OpReleaseEvent].setResultAndType(false, false);
+        InstructionDesc[OpGroupWaitEvents].setResultAndType(false, false);
+        InstructionDesc[OpAtomicFlagClear].setResultAndType(false, false);
+        InstructionDesc[OpModuleProcessed].setResultAndType(false, false);
+        InstructionDesc[OpTypeCooperativeMatrixNV].setResultAndType(true, false);
+        InstructionDesc[OpCooperativeMatrixStoreNV].setResultAndType(false, false);
+        InstructionDesc[OpTypeCooperativeMatrixKHR].setResultAndType(true, false);
+        InstructionDesc[OpCooperativeMatrixStoreKHR].setResultAndType(false, false);
+        InstructionDesc[OpBeginInvocationInterlockEXT].setResultAndType(false, false);
+        InstructionDesc[OpEndInvocationInterlockEXT].setResultAndType(false, false);
+        InstructionDesc[OpAssumeTrueKHR].setResultAndType(false, false);
         // Specific additional context-dependent operands
 
-        ExecutionModeOperands[enumCast(ExecutionMode::Invocations)].push(OperandLiteralNumber, "'Number of <<Invocation,invocations>>'");
+        ExecutionModeOperands[ExecutionModeInvocations].push(OperandLiteralNumber, "'Number of <<Invocation,invocations>>'");
 
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSize)].push(OperandLiteralNumber, "'x size'");
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSize)].push(OperandLiteralNumber, "'y size'");
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSize)].push(OperandLiteralNumber, "'z size'");
+        ExecutionModeOperands[ExecutionModeLocalSize].push(OperandLiteralNumber, "'x size'");
+        ExecutionModeOperands[ExecutionModeLocalSize].push(OperandLiteralNumber, "'y size'");
+        ExecutionModeOperands[ExecutionModeLocalSize].push(OperandLiteralNumber, "'z size'");
 
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSizeHint)].push(OperandLiteralNumber, "'x size'");
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSizeHint)].push(OperandLiteralNumber, "'y size'");
-        ExecutionModeOperands[enumCast(ExecutionMode::LocalSizeHint)].push(OperandLiteralNumber, "'z size'");
+        ExecutionModeOperands[ExecutionModeLocalSizeHint].push(OperandLiteralNumber, "'x size'");
+        ExecutionModeOperands[ExecutionModeLocalSizeHint].push(OperandLiteralNumber, "'y size'");
+        ExecutionModeOperands[ExecutionModeLocalSizeHint].push(OperandLiteralNumber, "'z size'");
 
-        ExecutionModeOperands[enumCast(ExecutionMode::OutputVertices)].push(OperandLiteralNumber, "'Vertex count'");
-        ExecutionModeOperands[enumCast(ExecutionMode::VecTypeHint)].push(OperandLiteralNumber, "'Vector type'");
+        ExecutionModeOperands[ExecutionModeOutputVertices].push(OperandLiteralNumber, "'Vertex count'");
+        ExecutionModeOperands[ExecutionModeVecTypeHint].push(OperandLiteralNumber, "'Vector type'");
 
-        DecorationOperands[enumCast(Decoration::Stream)].push(OperandLiteralNumber, "'Stream Number'");
-        DecorationOperands[enumCast(Decoration::Location)].push(OperandLiteralNumber, "'Location'");
-        DecorationOperands[enumCast(Decoration::Component)].push(OperandLiteralNumber, "'Component'");
-        DecorationOperands[enumCast(Decoration::Index)].push(OperandLiteralNumber, "'Index'");
-        DecorationOperands[enumCast(Decoration::Binding)].push(OperandLiteralNumber, "'Binding Point'");
-        DecorationOperands[enumCast(Decoration::DescriptorSet)].push(OperandLiteralNumber, "'Descriptor Set'");
-        DecorationOperands[enumCast(Decoration::Offset)].push(OperandLiteralNumber, "'Byte Offset'");
-        DecorationOperands[enumCast(Decoration::XfbBuffer)].push(OperandLiteralNumber, "'XFB Buffer Number'");
-        DecorationOperands[enumCast(Decoration::XfbStride)].push(OperandLiteralNumber, "'XFB Stride'");
-        DecorationOperands[enumCast(Decoration::ArrayStride)].push(OperandLiteralNumber, "'Array Stride'");
-        DecorationOperands[enumCast(Decoration::MatrixStride)].push(OperandLiteralNumber, "'Matrix Stride'");
-        DecorationOperands[enumCast(Decoration::BuiltIn)].push(OperandLiteralNumber, "See <<BuiltIn,*BuiltIn*>>");
-        DecorationOperands[enumCast(Decoration::FPRoundingMode)].push(OperandFPRoundingMode, "'Floating-Point Rounding Mode'");
-        DecorationOperands[enumCast(Decoration::FPFastMathMode)].push(OperandFPFastMath, "'Fast-Math Mode'");
-        DecorationOperands[enumCast(Decoration::LinkageAttributes)].push(OperandLiteralString, "'Name'");
-        DecorationOperands[enumCast(Decoration::LinkageAttributes)].push(OperandLinkageType, "'Linkage Type'");
-        DecorationOperands[enumCast(Decoration::FuncParamAttr)].push(OperandFuncParamAttr, "'Function Parameter Attribute'");
-        DecorationOperands[enumCast(Decoration::SpecId)].push(OperandLiteralNumber, "'Specialization Constant ID'");
-        DecorationOperands[enumCast(Decoration::InputAttachmentIndex)].push(OperandLiteralNumber, "'Attachment Index'");
-        DecorationOperands[enumCast(Decoration::Alignment)].push(OperandLiteralNumber, "'Alignment'");
+        DecorationOperands[DecorationStream].push(OperandLiteralNumber, "'Stream Number'");
+        DecorationOperands[DecorationLocation].push(OperandLiteralNumber, "'Location'");
+        DecorationOperands[DecorationComponent].push(OperandLiteralNumber, "'Component'");
+        DecorationOperands[DecorationIndex].push(OperandLiteralNumber, "'Index'");
+        DecorationOperands[DecorationBinding].push(OperandLiteralNumber, "'Binding Point'");
+        DecorationOperands[DecorationDescriptorSet].push(OperandLiteralNumber, "'Descriptor Set'");
+        DecorationOperands[DecorationOffset].push(OperandLiteralNumber, "'Byte Offset'");
+        DecorationOperands[DecorationXfbBuffer].push(OperandLiteralNumber, "'XFB Buffer Number'");
+        DecorationOperands[DecorationXfbStride].push(OperandLiteralNumber, "'XFB Stride'");
+        DecorationOperands[DecorationArrayStride].push(OperandLiteralNumber, "'Array Stride'");
+        DecorationOperands[DecorationMatrixStride].push(OperandLiteralNumber, "'Matrix Stride'");
+        DecorationOperands[DecorationBuiltIn].push(OperandLiteralNumber, "See <<BuiltIn,*BuiltIn*>>");
+        DecorationOperands[DecorationFPRoundingMode].push(OperandFPRoundingMode, "'Floating-Point Rounding Mode'");
+        DecorationOperands[DecorationFPFastMathMode].push(OperandFPFastMath, "'Fast-Math Mode'");
+        DecorationOperands[DecorationLinkageAttributes].push(OperandLiteralString, "'Name'");
+        DecorationOperands[DecorationLinkageAttributes].push(OperandLinkageType, "'Linkage Type'");
+        DecorationOperands[DecorationFuncParamAttr].push(OperandFuncParamAttr, "'Function Parameter Attribute'");
+        DecorationOperands[DecorationSpecId].push(OperandLiteralNumber, "'Specialization Constant ID'");
+        DecorationOperands[DecorationInputAttachmentIndex].push(OperandLiteralNumber, "'Attachment Index'");
+        DecorationOperands[DecorationAlignment].push(OperandLiteralNumber, "'Alignment'");
 
         OperandClassParams[OperandSource].set(0, SourceString, nullptr);
         OperandClassParams[OperandExecutionModel].set(0, ExecutionModelString, nullptr);
@@ -1963,2126 +1772,1706 @@ void Parameterize()
         OperandClassParams[OperandKernelProfilingInfo].set(0, KernelProfilingInfoString, nullptr, true);
         OperandClassParams[OperandCapability].set(0, CapabilityString, nullptr);
         OperandClassParams[OperandCooperativeMatrixOperands].set(CooperativeMatrixOperandsCeiling, CooperativeMatrixOperandsString, CooperativeMatrixOperandsParams, true);
-        OperandClassParams[OperandTensorAddressingOperands].set(TensorAddressingOperandsCeiling, TensorAddressingOperandsString, TensorAddressingOperandsParams, true);
         OperandClassParams[OperandOpcode].set(OpCodeMask + 1, OpcodeString, nullptr);
 
         // set name of operator, an initial set of <id> style operands, and the description
 
-        InstructionDesc[enumCast(Op::OpSource)].operands.push(OperandSource, "");
-        InstructionDesc[enumCast(Op::OpSource)].operands.push(OperandLiteralNumber, "'Version'");
-        InstructionDesc[enumCast(Op::OpSource)].operands.push(OperandId, "'File'", true);
-        InstructionDesc[enumCast(Op::OpSource)].operands.push(OperandLiteralString, "'Source'", true);
+        InstructionDesc[OpSource].operands.push(OperandSource, "");
+        InstructionDesc[OpSource].operands.push(OperandLiteralNumber, "'Version'");
+        InstructionDesc[OpSource].operands.push(OperandId, "'File'", true);
+        InstructionDesc[OpSource].operands.push(OperandLiteralString, "'Source'", true);
 
-        InstructionDesc[enumCast(Op::OpSourceContinued)].operands.push(OperandLiteralString, "'Continued Source'");
+        InstructionDesc[OpSourceContinued].operands.push(OperandLiteralString, "'Continued Source'");
 
-        InstructionDesc[enumCast(Op::OpSourceExtension)].operands.push(OperandLiteralString, "'Extension'");
+        InstructionDesc[OpSourceExtension].operands.push(OperandLiteralString, "'Extension'");
 
-        InstructionDesc[enumCast(Op::OpName)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpName)].operands.push(OperandLiteralString, "'Name'");
+        InstructionDesc[OpName].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpName].operands.push(OperandLiteralString, "'Name'");
 
-        InstructionDesc[enumCast(Op::OpMemberName)].operands.push(OperandId, "'Type'");
-        InstructionDesc[enumCast(Op::OpMemberName)].operands.push(OperandLiteralNumber, "'Member'");
-        InstructionDesc[enumCast(Op::OpMemberName)].operands.push(OperandLiteralString, "'Name'");
+        InstructionDesc[OpMemberName].operands.push(OperandId, "'Type'");
+        InstructionDesc[OpMemberName].operands.push(OperandLiteralNumber, "'Member'");
+        InstructionDesc[OpMemberName].operands.push(OperandLiteralString, "'Name'");
 
-        InstructionDesc[enumCast(Op::OpString)].operands.push(OperandLiteralString, "'String'");
+        InstructionDesc[OpString].operands.push(OperandLiteralString, "'String'");
 
-        InstructionDesc[enumCast(Op::OpLine)].operands.push(OperandId, "'File'");
-        InstructionDesc[enumCast(Op::OpLine)].operands.push(OperandLiteralNumber, "'Line'");
-        InstructionDesc[enumCast(Op::OpLine)].operands.push(OperandLiteralNumber, "'Column'");
+        InstructionDesc[OpLine].operands.push(OperandId, "'File'");
+        InstructionDesc[OpLine].operands.push(OperandLiteralNumber, "'Line'");
+        InstructionDesc[OpLine].operands.push(OperandLiteralNumber, "'Column'");
 
-        InstructionDesc[enumCast(Op::OpExtension)].operands.push(OperandLiteralString, "'Name'");
+        InstructionDesc[OpExtension].operands.push(OperandLiteralString, "'Name'");
 
-        InstructionDesc[enumCast(Op::OpExtInstImport)].operands.push(OperandLiteralString, "'Name'");
+        InstructionDesc[OpExtInstImport].operands.push(OperandLiteralString, "'Name'");
 
-        InstructionDesc[enumCast(Op::OpCapability)].operands.push(OperandCapability, "'Capability'");
+        InstructionDesc[OpCapability].operands.push(OperandCapability, "'Capability'");
 
-        InstructionDesc[enumCast(Op::OpMemoryModel)].operands.push(OperandAddressing, "");
-        InstructionDesc[enumCast(Op::OpMemoryModel)].operands.push(OperandMemory, "");
+        InstructionDesc[OpMemoryModel].operands.push(OperandAddressing, "");
+        InstructionDesc[OpMemoryModel].operands.push(OperandMemory, "");
 
-        InstructionDesc[enumCast(Op::OpEntryPoint)].operands.push(OperandExecutionModel, "");
-        InstructionDesc[enumCast(Op::OpEntryPoint)].operands.push(OperandId, "'Entry Point'");
-        InstructionDesc[enumCast(Op::OpEntryPoint)].operands.push(OperandLiteralString, "'Name'");
-        InstructionDesc[enumCast(Op::OpEntryPoint)].operands.push(OperandVariableIds, "'Interface'");
+        InstructionDesc[OpEntryPoint].operands.push(OperandExecutionModel, "");
+        InstructionDesc[OpEntryPoint].operands.push(OperandId, "'Entry Point'");
+        InstructionDesc[OpEntryPoint].operands.push(OperandLiteralString, "'Name'");
+        InstructionDesc[OpEntryPoint].operands.push(OperandVariableIds, "'Interface'");
 
-        InstructionDesc[enumCast(Op::OpExecutionMode)].operands.push(OperandId, "'Entry Point'");
-        InstructionDesc[enumCast(Op::OpExecutionMode)].operands.push(OperandExecutionMode, "'Mode'");
-        InstructionDesc[enumCast(Op::OpExecutionMode)].operands.push(OperandOptionalLiteral, "See <<Execution_Mode,Execution Mode>>");
+        InstructionDesc[OpExecutionMode].operands.push(OperandId, "'Entry Point'");
+        InstructionDesc[OpExecutionMode].operands.push(OperandExecutionMode, "'Mode'");
+        InstructionDesc[OpExecutionMode].operands.push(OperandOptionalLiteral, "See <<Execution_Mode,Execution Mode>>");
 
-        InstructionDesc[enumCast(Op::OpExecutionModeId)].operands.push(OperandId, "'Entry Point'");
-        InstructionDesc[enumCast(Op::OpExecutionModeId)].operands.push(OperandExecutionMode, "'Mode'");
-        InstructionDesc[enumCast(Op::OpExecutionModeId)].operands.push(OperandVariableIds, "See <<Execution_Mode,Execution Mode>>");
+        InstructionDesc[OpExecutionModeId].operands.push(OperandId, "'Entry Point'");
+        InstructionDesc[OpExecutionModeId].operands.push(OperandExecutionMode, "'Mode'");
+        InstructionDesc[OpExecutionModeId].operands.push(OperandVariableIds, "See <<Execution_Mode,Execution Mode>>");
 
-        InstructionDesc[enumCast(Op::OpTypeInt)].operands.push(OperandLiteralNumber, "'Width'");
-        InstructionDesc[enumCast(Op::OpTypeInt)].operands.push(OperandLiteralNumber, "'Signedness'");
+        InstructionDesc[OpTypeInt].operands.push(OperandLiteralNumber, "'Width'");
+        InstructionDesc[OpTypeInt].operands.push(OperandLiteralNumber, "'Signedness'");
 
-        InstructionDesc[enumCast(Op::OpTypeFloat)].operands.push(OperandLiteralNumber, "'Width'");
-        InstructionDesc[enumCast(Op::OpTypeFloat)].operands.push(OperandOptionalLiteral, "'FP Encoding'");
+        InstructionDesc[OpTypeFloat].operands.push(OperandLiteralNumber, "'Width'");
 
-        InstructionDesc[enumCast(Op::OpTypeVector)].operands.push(OperandId, "'Component Type'");
-        InstructionDesc[enumCast(Op::OpTypeVector)].operands.push(OperandLiteralNumber, "'Component Count'");
+        InstructionDesc[OpTypeVector].operands.push(OperandId, "'Component Type'");
+        InstructionDesc[OpTypeVector].operands.push(OperandLiteralNumber, "'Component Count'");
 
-        InstructionDesc[enumCast(Op::OpTypeMatrix)].operands.push(OperandId, "'Column Type'");
-        InstructionDesc[enumCast(Op::OpTypeMatrix)].operands.push(OperandLiteralNumber, "'Column Count'");
+        InstructionDesc[OpTypeMatrix].operands.push(OperandId, "'Column Type'");
+        InstructionDesc[OpTypeMatrix].operands.push(OperandLiteralNumber, "'Column Count'");
 
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandId, "'Sampled Type'");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandDimensionality, "");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandLiteralNumber, "'Depth'");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandLiteralNumber, "'Arrayed'");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandLiteralNumber, "'MS'");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandLiteralNumber, "'Sampled'");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandSamplerImageFormat, "");
-        InstructionDesc[enumCast(Op::OpTypeImage)].operands.push(OperandAccessQualifier, "", true);
+        InstructionDesc[OpTypeImage].operands.push(OperandId, "'Sampled Type'");
+        InstructionDesc[OpTypeImage].operands.push(OperandDimensionality, "");
+        InstructionDesc[OpTypeImage].operands.push(OperandLiteralNumber, "'Depth'");
+        InstructionDesc[OpTypeImage].operands.push(OperandLiteralNumber, "'Arrayed'");
+        InstructionDesc[OpTypeImage].operands.push(OperandLiteralNumber, "'MS'");
+        InstructionDesc[OpTypeImage].operands.push(OperandLiteralNumber, "'Sampled'");
+        InstructionDesc[OpTypeImage].operands.push(OperandSamplerImageFormat, "");
+        InstructionDesc[OpTypeImage].operands.push(OperandAccessQualifier, "", true);
 
-        InstructionDesc[enumCast(Op::OpTypeSampledImage)].operands.push(OperandId, "'Image Type'");
+        InstructionDesc[OpTypeSampledImage].operands.push(OperandId, "'Image Type'");
 
-        InstructionDesc[enumCast(Op::OpTypeArray)].operands.push(OperandId, "'Element Type'");
-        InstructionDesc[enumCast(Op::OpTypeArray)].operands.push(OperandId, "'Length'");
+        InstructionDesc[OpTypeArray].operands.push(OperandId, "'Element Type'");
+        InstructionDesc[OpTypeArray].operands.push(OperandId, "'Length'");
 
-        InstructionDesc[enumCast(Op::OpTypeRuntimeArray)].operands.push(OperandId, "'Element Type'");
+        InstructionDesc[OpTypeRuntimeArray].operands.push(OperandId, "'Element Type'");
 
-        InstructionDesc[enumCast(Op::OpTypeStruct)].operands.push(OperandVariableIds, "'Member 0 type', +\n'member 1 type', +\n...");
+        InstructionDesc[OpTypeStruct].operands.push(OperandVariableIds, "'Member 0 type', +\n'member 1 type', +\n...");
 
-        InstructionDesc[enumCast(Op::OpTypeOpaque)].operands.push(OperandLiteralString, "The name of the opaque type.");
+        InstructionDesc[OpTypeOpaque].operands.push(OperandLiteralString, "The name of the opaque type.");
 
-        InstructionDesc[enumCast(Op::OpTypePointer)].operands.push(OperandStorage, "");
-        InstructionDesc[enumCast(Op::OpTypePointer)].operands.push(OperandId, "'Type'");
+        InstructionDesc[OpTypePointer].operands.push(OperandStorage, "");
+        InstructionDesc[OpTypePointer].operands.push(OperandId, "'Type'");
 
-        InstructionDesc[enumCast(Op::OpTypeForwardPointer)].operands.push(OperandId, "'Pointer Type'");
-        InstructionDesc[enumCast(Op::OpTypeForwardPointer)].operands.push(OperandStorage, "");
+        InstructionDesc[OpTypeForwardPointer].operands.push(OperandId, "'Pointer Type'");
+        InstructionDesc[OpTypeForwardPointer].operands.push(OperandStorage, "");
 
-        InstructionDesc[enumCast(Op::OpTypePipe)].operands.push(OperandAccessQualifier, "'Qualifier'");
+        InstructionDesc[OpTypePipe].operands.push(OperandAccessQualifier, "'Qualifier'");
 
-        InstructionDesc[enumCast(Op::OpTypeFunction)].operands.push(OperandId, "'Return Type'");
-        InstructionDesc[enumCast(Op::OpTypeFunction)].operands.push(OperandVariableIds, "'Parameter 0 Type', +\n'Parameter 1 Type', +\n...");
+        InstructionDesc[OpTypeFunction].operands.push(OperandId, "'Return Type'");
+        InstructionDesc[OpTypeFunction].operands.push(OperandVariableIds, "'Parameter 0 Type', +\n'Parameter 1 Type', +\n...");
 
-        InstructionDesc[enumCast(Op::OpConstant)].operands.push(OperandVariableLiterals, "'Value'");
+        InstructionDesc[OpConstant].operands.push(OperandVariableLiterals, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpConstantComposite)].operands.push(OperandVariableIds, "'Constituents'");
+        InstructionDesc[OpConstantComposite].operands.push(OperandVariableIds, "'Constituents'");
 
-        InstructionDesc[enumCast(Op::OpConstantSampler)].operands.push(OperandSamplerAddressingMode, "");
-        InstructionDesc[enumCast(Op::OpConstantSampler)].operands.push(OperandLiteralNumber, "'Param'");
-        InstructionDesc[enumCast(Op::OpConstantSampler)].operands.push(OperandSamplerFilterMode, "");
+        InstructionDesc[OpConstantSampler].operands.push(OperandSamplerAddressingMode, "");
+        InstructionDesc[OpConstantSampler].operands.push(OperandLiteralNumber, "'Param'");
+        InstructionDesc[OpConstantSampler].operands.push(OperandSamplerFilterMode, "");
 
-        InstructionDesc[enumCast(Op::OpSpecConstant)].operands.push(OperandVariableLiterals, "'Value'");
+        InstructionDesc[OpSpecConstant].operands.push(OperandVariableLiterals, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpSpecConstantComposite)].operands.push(OperandVariableIds, "'Constituents'");
+        InstructionDesc[OpSpecConstantComposite].operands.push(OperandVariableIds, "'Constituents'");
 
-        InstructionDesc[enumCast(Op::OpSpecConstantOp)].operands.push(OperandLiteralNumber, "'Opcode'");
-        InstructionDesc[enumCast(Op::OpSpecConstantOp)].operands.push(OperandVariableIds, "'Operands'");
+        InstructionDesc[OpSpecConstantOp].operands.push(OperandLiteralNumber, "'Opcode'");
+        InstructionDesc[OpSpecConstantOp].operands.push(OperandVariableIds, "'Operands'");
 
-        InstructionDesc[enumCast(Op::OpVariable)].operands.push(OperandStorage, "");
-        InstructionDesc[enumCast(Op::OpVariable)].operands.push(OperandId, "'Initializer'", true);
+        InstructionDesc[OpVariable].operands.push(OperandStorage, "");
+        InstructionDesc[OpVariable].operands.push(OperandId, "'Initializer'", true);
 
-        InstructionDesc[enumCast(Op::OpFunction)].operands.push(OperandFunction, "");
-        InstructionDesc[enumCast(Op::OpFunction)].operands.push(OperandId, "'Function Type'");
+        InstructionDesc[OpFunction].operands.push(OperandFunction, "");
+        InstructionDesc[OpFunction].operands.push(OperandId, "'Function Type'");
 
-        InstructionDesc[enumCast(Op::OpFunctionCall)].operands.push(OperandId, "'Function'");
-        InstructionDesc[enumCast(Op::OpFunctionCall)].operands.push(OperandVariableIds, "'Argument 0', +\n'Argument 1', +\n...");
+        InstructionDesc[OpFunctionCall].operands.push(OperandId, "'Function'");
+        InstructionDesc[OpFunctionCall].operands.push(OperandVariableIds, "'Argument 0', +\n'Argument 1', +\n...");
 
-        InstructionDesc[enumCast(Op::OpExtInst)].operands.push(OperandId, "'Set'");
-        InstructionDesc[enumCast(Op::OpExtInst)].operands.push(OperandLiteralNumber, "'Instruction'");
-        InstructionDesc[enumCast(Op::OpExtInst)].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
+        InstructionDesc[OpExtInst].operands.push(OperandId, "'Set'");
+        InstructionDesc[OpExtInst].operands.push(OperandLiteralNumber, "'Instruction'");
+        InstructionDesc[OpExtInst].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
 
-        InstructionDesc[enumCast(Op::OpExtInstWithForwardRefsKHR)].operands.push(OperandId, "'Set'");
-        InstructionDesc[enumCast(Op::OpExtInstWithForwardRefsKHR)].operands.push(OperandLiteralNumber, "'Instruction'");
-        InstructionDesc[enumCast(Op::OpExtInstWithForwardRefsKHR)].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
+        InstructionDesc[OpLoad].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpLoad].operands.push(OperandMemoryAccess, "", true);
+        InstructionDesc[OpLoad].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpLoad].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpLoad)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpLoad)].operands.push(OperandMemoryAccess, "", true);
-        InstructionDesc[enumCast(Op::OpLoad)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpLoad)].operands.push(OperandId, "", true);
+        InstructionDesc[OpStore].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpStore].operands.push(OperandId, "'Object'");
+        InstructionDesc[OpStore].operands.push(OperandMemoryAccess, "", true);
+        InstructionDesc[OpStore].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpStore].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpStore)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpStore)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpStore)].operands.push(OperandMemoryAccess, "", true);
-        InstructionDesc[enumCast(Op::OpStore)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpStore)].operands.push(OperandId, "", true);
+        InstructionDesc[OpPhi].operands.push(OperandVariableIds, "'Variable, Parent, ...'");
 
-        InstructionDesc[enumCast(Op::OpPhi)].operands.push(OperandVariableIds, "'Variable, Parent, ...'");
+        InstructionDesc[OpDecorate].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpDecorate].operands.push(OperandDecoration, "");
+        InstructionDesc[OpDecorate].operands.push(OperandVariableLiterals, "See <<Decoration,'Decoration'>>.");
 
-        InstructionDesc[enumCast(Op::OpDecorate)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpDecorate)].operands.push(OperandDecoration, "");
-        InstructionDesc[enumCast(Op::OpDecorate)].operands.push(OperandVariableLiterals, "See <<Decoration,'Decoration'>>.");
+        InstructionDesc[OpDecorateId].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpDecorateId].operands.push(OperandDecoration, "");
+        InstructionDesc[OpDecorateId].operands.push(OperandVariableIds, "See <<Decoration,'Decoration'>>.");
 
-        InstructionDesc[enumCast(Op::OpDecorateId)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpDecorateId)].operands.push(OperandDecoration, "");
-        InstructionDesc[enumCast(Op::OpDecorateId)].operands.push(OperandVariableIds, "See <<Decoration,'Decoration'>>.");
+        InstructionDesc[OpDecorateStringGOOGLE].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpDecorateStringGOOGLE].operands.push(OperandDecoration, "");
+        InstructionDesc[OpDecorateStringGOOGLE].operands.push(OperandVariableLiteralStrings, "'Literal Strings'");
 
-        InstructionDesc[enumCast(Op::OpDecorateStringGOOGLE)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpDecorateStringGOOGLE)].operands.push(OperandDecoration, "");
-        InstructionDesc[enumCast(Op::OpDecorateStringGOOGLE)].operands.push(OperandVariableLiteralStrings, "'Literal Strings'");
+        InstructionDesc[OpMemberDecorate].operands.push(OperandId, "'Structure Type'");
+        InstructionDesc[OpMemberDecorate].operands.push(OperandLiteralNumber, "'Member'");
+        InstructionDesc[OpMemberDecorate].operands.push(OperandDecoration, "");
+        InstructionDesc[OpMemberDecorate].operands.push(OperandVariableLiterals, "See <<Decoration,'Decoration'>>.");
 
-        InstructionDesc[enumCast(Op::OpMemberDecorate)].operands.push(OperandId, "'Structure Type'");
-        InstructionDesc[enumCast(Op::OpMemberDecorate)].operands.push(OperandLiteralNumber, "'Member'");
-        InstructionDesc[enumCast(Op::OpMemberDecorate)].operands.push(OperandDecoration, "");
-        InstructionDesc[enumCast(Op::OpMemberDecorate)].operands.push(OperandVariableLiterals, "See <<Decoration,'Decoration'>>.");
+        InstructionDesc[OpMemberDecorateStringGOOGLE].operands.push(OperandId, "'Structure Type'");
+        InstructionDesc[OpMemberDecorateStringGOOGLE].operands.push(OperandLiteralNumber, "'Member'");
+        InstructionDesc[OpMemberDecorateStringGOOGLE].operands.push(OperandDecoration, "");
+        InstructionDesc[OpMemberDecorateStringGOOGLE].operands.push(OperandVariableLiteralStrings, "'Literal Strings'");
 
-        InstructionDesc[enumCast(Op::OpMemberDecorateStringGOOGLE)].operands.push(OperandId, "'Structure Type'");
-        InstructionDesc[enumCast(Op::OpMemberDecorateStringGOOGLE)].operands.push(OperandLiteralNumber, "'Member'");
-        InstructionDesc[enumCast(Op::OpMemberDecorateStringGOOGLE)].operands.push(OperandDecoration, "");
-        InstructionDesc[enumCast(Op::OpMemberDecorateStringGOOGLE)].operands.push(OperandVariableLiteralStrings, "'Literal Strings'");
+        InstructionDesc[OpGroupDecorate].operands.push(OperandId, "'Decoration Group'");
+        InstructionDesc[OpGroupDecorate].operands.push(OperandVariableIds, "'Targets'");
 
-        InstructionDesc[enumCast(Op::OpGroupDecorate)].operands.push(OperandId, "'Decoration Group'");
-        InstructionDesc[enumCast(Op::OpGroupDecorate)].operands.push(OperandVariableIds, "'Targets'");
+        InstructionDesc[OpGroupMemberDecorate].operands.push(OperandId, "'Decoration Group'");
+        InstructionDesc[OpGroupMemberDecorate].operands.push(OperandVariableIdLiteral, "'Targets'");
 
-        InstructionDesc[enumCast(Op::OpGroupMemberDecorate)].operands.push(OperandId, "'Decoration Group'");
-        InstructionDesc[enumCast(Op::OpGroupMemberDecorate)].operands.push(OperandVariableIdLiteral, "'Targets'");
+        InstructionDesc[OpVectorExtractDynamic].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpVectorExtractDynamic].operands.push(OperandId, "'Index'");
 
-        InstructionDesc[enumCast(Op::OpVectorExtractDynamic)].operands.push(OperandId, "'Vector'");
-        InstructionDesc[enumCast(Op::OpVectorExtractDynamic)].operands.push(OperandId, "'Index'");
+        InstructionDesc[OpVectorInsertDynamic].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpVectorInsertDynamic].operands.push(OperandId, "'Component'");
+        InstructionDesc[OpVectorInsertDynamic].operands.push(OperandId, "'Index'");
 
-        InstructionDesc[enumCast(Op::OpVectorInsertDynamic)].operands.push(OperandId, "'Vector'");
-        InstructionDesc[enumCast(Op::OpVectorInsertDynamic)].operands.push(OperandId, "'Component'");
-        InstructionDesc[enumCast(Op::OpVectorInsertDynamic)].operands.push(OperandId, "'Index'");
+        InstructionDesc[OpVectorShuffle].operands.push(OperandId, "'Vector 1'");
+        InstructionDesc[OpVectorShuffle].operands.push(OperandId, "'Vector 2'");
+        InstructionDesc[OpVectorShuffle].operands.push(OperandVariableLiterals, "'Components'");
 
-        InstructionDesc[enumCast(Op::OpVectorShuffle)].operands.push(OperandId, "'Vector 1'");
-        InstructionDesc[enumCast(Op::OpVectorShuffle)].operands.push(OperandId, "'Vector 2'");
-        InstructionDesc[enumCast(Op::OpVectorShuffle)].operands.push(OperandVariableLiterals, "'Components'");
+        InstructionDesc[OpCompositeConstruct].operands.push(OperandVariableIds, "'Constituents'");
 
-        InstructionDesc[enumCast(Op::OpCompositeConstruct)].operands.push(OperandVariableIds, "'Constituents'");
+        InstructionDesc[OpCompositeExtract].operands.push(OperandId, "'Composite'");
+        InstructionDesc[OpCompositeExtract].operands.push(OperandVariableLiterals, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpCompositeExtract)].operands.push(OperandId, "'Composite'");
-        InstructionDesc[enumCast(Op::OpCompositeExtract)].operands.push(OperandVariableLiterals, "'Indexes'");
+        InstructionDesc[OpCompositeInsert].operands.push(OperandId, "'Object'");
+        InstructionDesc[OpCompositeInsert].operands.push(OperandId, "'Composite'");
+        InstructionDesc[OpCompositeInsert].operands.push(OperandVariableLiterals, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpCompositeInsert)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCompositeInsert)].operands.push(OperandId, "'Composite'");
-        InstructionDesc[enumCast(Op::OpCompositeInsert)].operands.push(OperandVariableLiterals, "'Indexes'");
+        InstructionDesc[OpCopyObject].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpCopyObject)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpCopyMemory].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpCopyMemory].operands.push(OperandId, "'Source'");
+        InstructionDesc[OpCopyMemory].operands.push(OperandMemoryAccess, "", true);
 
-        InstructionDesc[enumCast(Op::OpCopyMemory)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpCopyMemory)].operands.push(OperandId, "'Source'");
-        InstructionDesc[enumCast(Op::OpCopyMemory)].operands.push(OperandMemoryAccess, "", true);
-
-        InstructionDesc[enumCast(Op::OpCopyMemorySized)].operands.push(OperandId, "'Target'");
-        InstructionDesc[enumCast(Op::OpCopyMemorySized)].operands.push(OperandId, "'Source'");
-        InstructionDesc[enumCast(Op::OpCopyMemorySized)].operands.push(OperandId, "'Size'");
-        InstructionDesc[enumCast(Op::OpCopyMemorySized)].operands.push(OperandMemoryAccess, "", true);
-
-        InstructionDesc[enumCast(Op::OpSampledImage)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpSampledImage)].operands.push(OperandId, "'Sampler'");
-
-        InstructionDesc[enumCast(Op::OpImage)].operands.push(OperandId, "'Sampled Image'");
-
-        InstructionDesc[enumCast(Op::OpImageRead)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageRead)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageRead)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageRead)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageWrite)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageWrite)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageWrite)].operands.push(OperandId, "'Texel'");
-        InstructionDesc[enumCast(Op::OpImageWrite)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageWrite)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleImplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleExplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleDrefImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefImplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleDrefImplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleDrefExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefExplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSampleDrefExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleDrefExplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleProjImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleProjImplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleProjExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleProjExplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefImplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefImplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefExplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleProjDrefExplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageFetch)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageFetch)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageFetch)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageFetch)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageGather)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageGather)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageGather)].operands.push(OperandId, "'Component'");
-        InstructionDesc[enumCast(Op::OpImageGather)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageGather)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageDrefGather)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageDrefGather)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageDrefGather)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageDrefGather)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageDrefGather)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSparseSampleImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleImplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSparseSampleExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleExplicitLod)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefImplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefImplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpCopyMemorySized].operands.push(OperandId, "'Target'");
+        InstructionDesc[OpCopyMemorySized].operands.push(OperandId, "'Source'");
+        InstructionDesc[OpCopyMemorySized].operands.push(OperandId, "'Size'");
+        InstructionDesc[OpCopyMemorySized].operands.push(OperandMemoryAccess, "", true);
+
+        InstructionDesc[OpSampledImage].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpSampledImage].operands.push(OperandId, "'Sampler'");
+
+        InstructionDesc[OpImage].operands.push(OperandId, "'Sampled Image'");
+
+        InstructionDesc[OpImageRead].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageRead].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageRead].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageRead].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageWrite].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageWrite].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageWrite].operands.push(OperandId, "'Texel'");
+        InstructionDesc[OpImageWrite].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageWrite].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleImplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleExplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleDrefImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleDrefImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleDrefImplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSampleDrefImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleDrefImplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleDrefExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleDrefExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleDrefExplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSampleDrefExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleDrefExplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleProjImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleProjImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleProjImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleProjImplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleProjExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleProjExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleProjExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleProjExplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleProjDrefImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleProjDrefImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleProjDrefImplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSampleProjDrefImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleProjDrefImplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSampleProjDrefExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleProjDrefExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleProjDrefExplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSampleProjDrefExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleProjDrefExplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageFetch].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageFetch].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageFetch].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageFetch].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageGather].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageGather].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageGather].operands.push(OperandId, "'Component'");
+        InstructionDesc[OpImageGather].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageGather].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageDrefGather].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageDrefGather].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageDrefGather].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageDrefGather].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageDrefGather].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSparseSampleImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleImplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSparseSampleExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleExplicitLod].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpImageSparseSampleDrefImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleDrefImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleDrefImplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSparseSampleDrefImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleDrefImplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefExplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleDrefExplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseSampleDrefExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleDrefExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleDrefExplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSparseSampleDrefExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleDrefExplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjImplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseSampleProjImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleProjImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleProjImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleProjImplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjExplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseSampleProjExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleProjExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleProjExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleProjExplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefImplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefImplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefImplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefImplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefImplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseSampleProjDrefImplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleProjDrefImplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleProjDrefImplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSparseSampleProjDrefImplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleProjDrefImplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefExplicitLod)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefExplicitLod)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefExplicitLod)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefExplicitLod)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseSampleProjDrefExplicitLod)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseSampleProjDrefExplicitLod].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseSampleProjDrefExplicitLod].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseSampleProjDrefExplicitLod].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSparseSampleProjDrefExplicitLod].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseSampleProjDrefExplicitLod].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseFetch)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseFetch)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseFetch)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseFetch)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseFetch].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageSparseFetch].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseFetch].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseFetch].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseGather)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseGather)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseGather)].operands.push(OperandId, "'Component'");
-        InstructionDesc[enumCast(Op::OpImageSparseGather)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseGather)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseGather].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseGather].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseGather].operands.push(OperandId, "'Component'");
+        InstructionDesc[OpImageSparseGather].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseGather].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseDrefGather)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseDrefGather)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseDrefGather)].operands.push(OperandId, "'D~ref~'");
-        InstructionDesc[enumCast(Op::OpImageSparseDrefGather)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseDrefGather)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseDrefGather].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSparseDrefGather].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseDrefGather].operands.push(OperandId, "'D~ref~'");
+        InstructionDesc[OpImageSparseDrefGather].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseDrefGather].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseRead)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageSparseRead)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSparseRead)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSparseRead)].operands.push(OperandVariableIds, "", true);
+        InstructionDesc[OpImageSparseRead].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageSparseRead].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSparseRead].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSparseRead].operands.push(OperandVariableIds, "", true);
 
-        InstructionDesc[enumCast(Op::OpImageSparseTexelsResident)].operands.push(OperandId, "'Resident Code'");
+        InstructionDesc[OpImageSparseTexelsResident].operands.push(OperandId, "'Resident Code'");
 
-        InstructionDesc[enumCast(Op::OpImageQuerySizeLod)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageQuerySizeLod)].operands.push(OperandId, "'Level of Detail'");
+        InstructionDesc[OpImageQuerySizeLod].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQuerySizeLod].operands.push(OperandId, "'Level of Detail'");
 
-        InstructionDesc[enumCast(Op::OpImageQuerySize)].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQuerySize].operands.push(OperandId, "'Image'");
 
-        InstructionDesc[enumCast(Op::OpImageQueryLod)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageQueryLod)].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageQueryLod].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQueryLod].operands.push(OperandId, "'Coordinate'");
 
-        InstructionDesc[enumCast(Op::OpImageQueryLevels)].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQueryLevels].operands.push(OperandId, "'Image'");
 
-        InstructionDesc[enumCast(Op::OpImageQuerySamples)].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQuerySamples].operands.push(OperandId, "'Image'");
 
-        InstructionDesc[enumCast(Op::OpImageQueryFormat)].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQueryFormat].operands.push(OperandId, "'Image'");
 
-        InstructionDesc[enumCast(Op::OpImageQueryOrder)].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageQueryOrder].operands.push(OperandId, "'Image'");
 
-        InstructionDesc[enumCast(Op::OpAccessChain)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpAccessChain)].operands.push(OperandVariableIds, "'Indexes'");
+        InstructionDesc[OpAccessChain].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpAccessChain].operands.push(OperandVariableIds, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpInBoundsAccessChain)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpInBoundsAccessChain)].operands.push(OperandVariableIds, "'Indexes'");
+        InstructionDesc[OpInBoundsAccessChain].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpInBoundsAccessChain].operands.push(OperandVariableIds, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpPtrAccessChain)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpPtrAccessChain)].operands.push(OperandId, "'Element'");
-        InstructionDesc[enumCast(Op::OpPtrAccessChain)].operands.push(OperandVariableIds, "'Indexes'");
+        InstructionDesc[OpPtrAccessChain].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpPtrAccessChain].operands.push(OperandId, "'Element'");
+        InstructionDesc[OpPtrAccessChain].operands.push(OperandVariableIds, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpInBoundsPtrAccessChain)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpInBoundsPtrAccessChain)].operands.push(OperandId, "'Element'");
-        InstructionDesc[enumCast(Op::OpInBoundsPtrAccessChain)].operands.push(OperandVariableIds, "'Indexes'");
+        InstructionDesc[OpInBoundsPtrAccessChain].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpInBoundsPtrAccessChain].operands.push(OperandId, "'Element'");
+        InstructionDesc[OpInBoundsPtrAccessChain].operands.push(OperandVariableIds, "'Indexes'");
 
-        InstructionDesc[enumCast(Op::OpSNegate)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpSNegate].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpFNegate)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpFNegate].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpNot)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpNot].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpAny)].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpAny].operands.push(OperandId, "'Vector'");
 
-        InstructionDesc[enumCast(Op::OpAll)].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpAll].operands.push(OperandId, "'Vector'");
 
-        InstructionDesc[enumCast(Op::OpConvertFToU)].operands.push(OperandId, "'Float Value'");
+        InstructionDesc[OpConvertFToU].operands.push(OperandId, "'Float Value'");
 
-        InstructionDesc[enumCast(Op::OpConvertFToS)].operands.push(OperandId, "'Float Value'");
+        InstructionDesc[OpConvertFToS].operands.push(OperandId, "'Float Value'");
 
-        InstructionDesc[enumCast(Op::OpConvertSToF)].operands.push(OperandId, "'Signed Value'");
+        InstructionDesc[OpConvertSToF].operands.push(OperandId, "'Signed Value'");
 
-        InstructionDesc[enumCast(Op::OpConvertUToF)].operands.push(OperandId, "'Unsigned Value'");
+        InstructionDesc[OpConvertUToF].operands.push(OperandId, "'Unsigned Value'");
 
-        InstructionDesc[enumCast(Op::OpUConvert)].operands.push(OperandId, "'Unsigned Value'");
+        InstructionDesc[OpUConvert].operands.push(OperandId, "'Unsigned Value'");
 
-        InstructionDesc[enumCast(Op::OpSConvert)].operands.push(OperandId, "'Signed Value'");
+        InstructionDesc[OpSConvert].operands.push(OperandId, "'Signed Value'");
 
-        InstructionDesc[enumCast(Op::OpFConvert)].operands.push(OperandId, "'Float Value'");
+        InstructionDesc[OpFConvert].operands.push(OperandId, "'Float Value'");
 
-        InstructionDesc[enumCast(Op::OpSatConvertSToU)].operands.push(OperandId, "'Signed Value'");
+        InstructionDesc[OpSatConvertSToU].operands.push(OperandId, "'Signed Value'");
 
-        InstructionDesc[enumCast(Op::OpSatConvertUToS)].operands.push(OperandId, "'Unsigned Value'");
+        InstructionDesc[OpSatConvertUToS].operands.push(OperandId, "'Unsigned Value'");
 
-        InstructionDesc[enumCast(Op::OpConvertPtrToU)].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpConvertPtrToU].operands.push(OperandId, "'Pointer'");
 
-        InstructionDesc[enumCast(Op::OpConvertUToPtr)].operands.push(OperandId, "'Integer Value'");
+        InstructionDesc[OpConvertUToPtr].operands.push(OperandId, "'Integer Value'");
 
-        InstructionDesc[enumCast(Op::OpPtrCastToGeneric)].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpPtrCastToGeneric].operands.push(OperandId, "'Pointer'");
 
-        InstructionDesc[enumCast(Op::OpGenericCastToPtr)].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpGenericCastToPtr].operands.push(OperandId, "'Pointer'");
 
-        InstructionDesc[enumCast(Op::OpGenericCastToPtrExplicit)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpGenericCastToPtrExplicit)].operands.push(OperandStorage, "'Storage'");
+        InstructionDesc[OpGenericCastToPtrExplicit].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpGenericCastToPtrExplicit].operands.push(OperandStorage, "'Storage'");
 
-        InstructionDesc[enumCast(Op::OpGenericPtrMemSemantics)].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpGenericPtrMemSemantics].operands.push(OperandId, "'Pointer'");
 
-        InstructionDesc[enumCast(Op::OpBitcast)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpBitcast].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpQuantizeToF16)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpQuantizeToF16].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpTranspose)].operands.push(OperandId, "'Matrix'");
+        InstructionDesc[OpTranspose].operands.push(OperandId, "'Matrix'");
 
-        InstructionDesc[enumCast(Op::OpCopyLogical)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpCopyLogical].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpIsNan)].operands.push(OperandId, "'x'");
+        InstructionDesc[OpIsNan].operands.push(OperandId, "'x'");
 
-        InstructionDesc[enumCast(Op::OpIsInf)].operands.push(OperandId, "'x'");
+        InstructionDesc[OpIsInf].operands.push(OperandId, "'x'");
 
-        InstructionDesc[enumCast(Op::OpIsFinite)].operands.push(OperandId, "'x'");
+        InstructionDesc[OpIsFinite].operands.push(OperandId, "'x'");
 
-        InstructionDesc[enumCast(Op::OpIsNormal)].operands.push(OperandId, "'x'");
+        InstructionDesc[OpIsNormal].operands.push(OperandId, "'x'");
 
-        InstructionDesc[enumCast(Op::OpSignBitSet)].operands.push(OperandId, "'x'");
+        InstructionDesc[OpSignBitSet].operands.push(OperandId, "'x'");
 
-        InstructionDesc[enumCast(Op::OpLessOrGreater)].operands.push(OperandId, "'x'");
-        InstructionDesc[enumCast(Op::OpLessOrGreater)].operands.push(OperandId, "'y'");
+        InstructionDesc[OpLessOrGreater].operands.push(OperandId, "'x'");
+        InstructionDesc[OpLessOrGreater].operands.push(OperandId, "'y'");
 
-        InstructionDesc[enumCast(Op::OpOrdered)].operands.push(OperandId, "'x'");
-        InstructionDesc[enumCast(Op::OpOrdered)].operands.push(OperandId, "'y'");
+        InstructionDesc[OpOrdered].operands.push(OperandId, "'x'");
+        InstructionDesc[OpOrdered].operands.push(OperandId, "'y'");
 
-        InstructionDesc[enumCast(Op::OpUnordered)].operands.push(OperandId, "'x'");
-        InstructionDesc[enumCast(Op::OpUnordered)].operands.push(OperandId, "'y'");
+        InstructionDesc[OpUnordered].operands.push(OperandId, "'x'");
+        InstructionDesc[OpUnordered].operands.push(OperandId, "'y'");
 
-        InstructionDesc[enumCast(Op::OpArrayLength)].operands.push(OperandId, "'Structure'");
-        InstructionDesc[enumCast(Op::OpArrayLength)].operands.push(OperandLiteralNumber, "'Array member'");
+        InstructionDesc[OpArrayLength].operands.push(OperandId, "'Structure'");
+        InstructionDesc[OpArrayLength].operands.push(OperandLiteralNumber, "'Array member'");
 
-        InstructionDesc[enumCast(Op::OpIAdd)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpIAdd)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpIAdd].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpIAdd].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFAdd)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFAdd)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFAdd].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFAdd].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpISub)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpISub)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpISub].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpISub].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFSub)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFSub)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFSub].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFSub].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpIMul)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpIMul)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpIMul].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpIMul].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFMul)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFMul)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFMul].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFMul].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpUDiv)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpUDiv)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpUDiv].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpUDiv].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSDiv)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSDiv)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSDiv].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSDiv].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFDiv)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFDiv)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFDiv].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFDiv].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpUMod)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpUMod)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpUMod].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpUMod].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSRem)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSRem)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSRem].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSRem].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSMod)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSMod)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSMod].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSMod].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFRem)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFRem)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFRem].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFRem].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFMod)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFMod)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFMod].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFMod].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpVectorTimesScalar)].operands.push(OperandId, "'Vector'");
-        InstructionDesc[enumCast(Op::OpVectorTimesScalar)].operands.push(OperandId, "'Scalar'");
+        InstructionDesc[OpVectorTimesScalar].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpVectorTimesScalar].operands.push(OperandId, "'Scalar'");
 
-        InstructionDesc[enumCast(Op::OpMatrixTimesScalar)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpMatrixTimesScalar)].operands.push(OperandId, "'Scalar'");
+        InstructionDesc[OpMatrixTimesScalar].operands.push(OperandId, "'Matrix'");
+        InstructionDesc[OpMatrixTimesScalar].operands.push(OperandId, "'Scalar'");
 
-        InstructionDesc[enumCast(Op::OpVectorTimesMatrix)].operands.push(OperandId, "'Vector'");
-        InstructionDesc[enumCast(Op::OpVectorTimesMatrix)].operands.push(OperandId, "'Matrix'");
+        InstructionDesc[OpVectorTimesMatrix].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpVectorTimesMatrix].operands.push(OperandId, "'Matrix'");
 
-        InstructionDesc[enumCast(Op::OpMatrixTimesVector)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpMatrixTimesVector)].operands.push(OperandId, "'Vector'");
+        InstructionDesc[OpMatrixTimesVector].operands.push(OperandId, "'Matrix'");
+        InstructionDesc[OpMatrixTimesVector].operands.push(OperandId, "'Vector'");
 
-        InstructionDesc[enumCast(Op::OpMatrixTimesMatrix)].operands.push(OperandId, "'LeftMatrix'");
-        InstructionDesc[enumCast(Op::OpMatrixTimesMatrix)].operands.push(OperandId, "'RightMatrix'");
+        InstructionDesc[OpMatrixTimesMatrix].operands.push(OperandId, "'LeftMatrix'");
+        InstructionDesc[OpMatrixTimesMatrix].operands.push(OperandId, "'RightMatrix'");
 
-        InstructionDesc[enumCast(Op::OpOuterProduct)].operands.push(OperandId, "'Vector 1'");
-        InstructionDesc[enumCast(Op::OpOuterProduct)].operands.push(OperandId, "'Vector 2'");
+        InstructionDesc[OpOuterProduct].operands.push(OperandId, "'Vector 1'");
+        InstructionDesc[OpOuterProduct].operands.push(OperandId, "'Vector 2'");
 
-        InstructionDesc[enumCast(Op::OpDot)].operands.push(OperandId, "'Vector 1'");
-        InstructionDesc[enumCast(Op::OpDot)].operands.push(OperandId, "'Vector 2'");
+        InstructionDesc[OpDot].operands.push(OperandId, "'Vector 1'");
+        InstructionDesc[OpDot].operands.push(OperandId, "'Vector 2'");
 
-        InstructionDesc[enumCast(Op::OpIAddCarry)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpIAddCarry)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpIAddCarry].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpIAddCarry].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpISubBorrow)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpISubBorrow)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpISubBorrow].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpISubBorrow].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpUMulExtended)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpUMulExtended)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpUMulExtended].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpUMulExtended].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSMulExtended)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSMulExtended)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSMulExtended].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSMulExtended].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpShiftRightLogical)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpShiftRightLogical)].operands.push(OperandId, "'Shift'");
+        InstructionDesc[OpShiftRightLogical].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpShiftRightLogical].operands.push(OperandId, "'Shift'");
 
-        InstructionDesc[enumCast(Op::OpShiftRightArithmetic)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpShiftRightArithmetic)].operands.push(OperandId, "'Shift'");
+        InstructionDesc[OpShiftRightArithmetic].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpShiftRightArithmetic].operands.push(OperandId, "'Shift'");
 
-        InstructionDesc[enumCast(Op::OpShiftLeftLogical)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpShiftLeftLogical)].operands.push(OperandId, "'Shift'");
+        InstructionDesc[OpShiftLeftLogical].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpShiftLeftLogical].operands.push(OperandId, "'Shift'");
 
-        InstructionDesc[enumCast(Op::OpLogicalOr)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpLogicalOr)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpLogicalOr].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpLogicalOr].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpLogicalAnd)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpLogicalAnd)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpLogicalAnd].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpLogicalAnd].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpLogicalEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpLogicalEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpLogicalEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpLogicalEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpLogicalNotEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpLogicalNotEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpLogicalNotEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpLogicalNotEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpLogicalNot)].operands.push(OperandId, "'Operand'");
+        InstructionDesc[OpLogicalNot].operands.push(OperandId, "'Operand'");
 
-        InstructionDesc[enumCast(Op::OpBitwiseOr)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpBitwiseOr)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpBitwiseOr].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpBitwiseOr].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpBitwiseXor)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpBitwiseXor)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpBitwiseXor].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpBitwiseXor].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpBitwiseAnd)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpBitwiseAnd)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpBitwiseAnd].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpBitwiseAnd].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpBitFieldInsert)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpBitFieldInsert)].operands.push(OperandId, "'Insert'");
-        InstructionDesc[enumCast(Op::OpBitFieldInsert)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpBitFieldInsert)].operands.push(OperandId, "'Count'");
+        InstructionDesc[OpBitFieldInsert].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpBitFieldInsert].operands.push(OperandId, "'Insert'");
+        InstructionDesc[OpBitFieldInsert].operands.push(OperandId, "'Offset'");
+        InstructionDesc[OpBitFieldInsert].operands.push(OperandId, "'Count'");
 
-        InstructionDesc[enumCast(Op::OpBitFieldSExtract)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpBitFieldSExtract)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpBitFieldSExtract)].operands.push(OperandId, "'Count'");
+        InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Offset'");
+        InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Count'");
 
-        InstructionDesc[enumCast(Op::OpBitFieldUExtract)].operands.push(OperandId, "'Base'");
-        InstructionDesc[enumCast(Op::OpBitFieldUExtract)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpBitFieldUExtract)].operands.push(OperandId, "'Count'");
+        InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Offset'");
+        InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Count'");
 
-        InstructionDesc[enumCast(Op::OpBitReverse)].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpBitReverse].operands.push(OperandId, "'Base'");
 
-        InstructionDesc[enumCast(Op::OpBitCount)].operands.push(OperandId, "'Base'");
+        InstructionDesc[OpBitCount].operands.push(OperandId, "'Base'");
 
-        InstructionDesc[enumCast(Op::OpSelect)].operands.push(OperandId, "'Condition'");
-        InstructionDesc[enumCast(Op::OpSelect)].operands.push(OperandId, "'Object 1'");
-        InstructionDesc[enumCast(Op::OpSelect)].operands.push(OperandId, "'Object 2'");
+        InstructionDesc[OpSelect].operands.push(OperandId, "'Condition'");
+        InstructionDesc[OpSelect].operands.push(OperandId, "'Object 1'");
+        InstructionDesc[OpSelect].operands.push(OperandId, "'Object 2'");
 
-        InstructionDesc[enumCast(Op::OpIEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpIEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpIEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpIEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpINotEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpINotEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpINotEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpINotEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdNotEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdNotEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdNotEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdNotEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordNotEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordNotEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordNotEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordNotEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpULessThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpULessThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpULessThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpULessThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSLessThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSLessThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSLessThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSLessThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdLessThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdLessThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdLessThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdLessThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordLessThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordLessThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordLessThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordLessThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpUGreaterThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpUGreaterThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpUGreaterThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpUGreaterThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSGreaterThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSGreaterThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSGreaterThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSGreaterThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdGreaterThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdGreaterThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdGreaterThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdGreaterThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordGreaterThan)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordGreaterThan)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordGreaterThan].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordGreaterThan].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpULessThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpULessThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpULessThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpULessThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSLessThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSLessThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSLessThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSLessThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdLessThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdLessThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdLessThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdLessThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordLessThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordLessThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordLessThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordLessThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpUGreaterThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpUGreaterThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpUGreaterThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpUGreaterThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpSGreaterThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpSGreaterThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpSGreaterThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpSGreaterThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFOrdGreaterThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFOrdGreaterThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFOrdGreaterThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFOrdGreaterThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpFUnordGreaterThanEqual)].operands.push(OperandId, "'Operand 1'");
-        InstructionDesc[enumCast(Op::OpFUnordGreaterThanEqual)].operands.push(OperandId, "'Operand 2'");
+        InstructionDesc[OpFUnordGreaterThanEqual].operands.push(OperandId, "'Operand 1'");
+        InstructionDesc[OpFUnordGreaterThanEqual].operands.push(OperandId, "'Operand 2'");
 
-        InstructionDesc[enumCast(Op::OpDPdx)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdx].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpDPdy)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdy].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpFwidth)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpFwidth].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpDPdxFine)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdxFine].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpDPdyFine)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdyFine].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpFwidthFine)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpFwidthFine].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpDPdxCoarse)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdxCoarse].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpDPdyCoarse)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpDPdyCoarse].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpFwidthCoarse)].operands.push(OperandId, "'P'");
+        InstructionDesc[OpFwidthCoarse].operands.push(OperandId, "'P'");
 
-        InstructionDesc[enumCast(Op::OpEmitStreamVertex)].operands.push(OperandId, "'Stream'");
+        InstructionDesc[OpEmitStreamVertex].operands.push(OperandId, "'Stream'");
 
-        InstructionDesc[enumCast(Op::OpEndStreamPrimitive)].operands.push(OperandId, "'Stream'");
+        InstructionDesc[OpEndStreamPrimitive].operands.push(OperandId, "'Stream'");
 
-        InstructionDesc[enumCast(Op::OpControlBarrier)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpControlBarrier)].operands.push(OperandScope, "'Memory'");
-        InstructionDesc[enumCast(Op::OpControlBarrier)].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpControlBarrier].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpControlBarrier].operands.push(OperandScope, "'Memory'");
+        InstructionDesc[OpControlBarrier].operands.push(OperandMemorySemantics, "'Semantics'");
 
-        InstructionDesc[enumCast(Op::OpMemoryBarrier)].operands.push(OperandScope, "'Memory'");
-        InstructionDesc[enumCast(Op::OpMemoryBarrier)].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpMemoryBarrier].operands.push(OperandScope, "'Memory'");
+        InstructionDesc[OpMemoryBarrier].operands.push(OperandMemorySemantics, "'Semantics'");
 
-        InstructionDesc[enumCast(Op::OpImageTexelPointer)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpImageTexelPointer)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageTexelPointer)].operands.push(OperandId, "'Sample'");
+        InstructionDesc[OpImageTexelPointer].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpImageTexelPointer].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageTexelPointer].operands.push(OperandId, "'Sample'");
 
-        InstructionDesc[enumCast(Op::OpAtomicLoad)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicLoad)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicLoad)].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicLoad].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicLoad].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicLoad].operands.push(OperandMemorySemantics, "'Semantics'");
 
-        InstructionDesc[enumCast(Op::OpAtomicStore)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicStore)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicStore)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicStore)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicStore].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicStore].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicStore].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicStore].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicExchange)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicExchange)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicExchange)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicExchange)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicExchange].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicExchange].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicExchange].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicExchange].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandMemorySemantics, "'Equal'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandMemorySemantics, "'Unequal'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchange)].operands.push(OperandId, "'Comparator'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandMemorySemantics, "'Equal'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandMemorySemantics, "'Unequal'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicCompareExchange].operands.push(OperandId, "'Comparator'");
 
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandMemorySemantics, "'Equal'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandMemorySemantics, "'Unequal'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpAtomicCompareExchangeWeak)].operands.push(OperandId, "'Comparator'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandMemorySemantics, "'Equal'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandMemorySemantics, "'Unequal'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicCompareExchangeWeak].operands.push(OperandId, "'Comparator'");
 
-        InstructionDesc[enumCast(Op::OpAtomicIIncrement)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicIIncrement)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicIIncrement)].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicIIncrement].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicIIncrement].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicIIncrement].operands.push(OperandMemorySemantics, "'Semantics'");
 
-        InstructionDesc[enumCast(Op::OpAtomicIDecrement)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicIDecrement)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicIDecrement)].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicIDecrement].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicIDecrement].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicIDecrement].operands.push(OperandMemorySemantics, "'Semantics'");
 
-        InstructionDesc[enumCast(Op::OpAtomicIAdd)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicIAdd)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicIAdd)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicIAdd)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicIAdd].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicIAdd].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicIAdd].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicIAdd].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicFAddEXT)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicFAddEXT)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicFAddEXT)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicFAddEXT)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicFAddEXT].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicFAddEXT].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicFAddEXT].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicFAddEXT].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAssumeTrueKHR)].operands.push(OperandId, "'Condition'");
+        InstructionDesc[OpAssumeTrueKHR].operands.push(OperandId, "'Condition'");
 
-        InstructionDesc[enumCast(Op::OpExpectKHR)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpExpectKHR)].operands.push(OperandId, "'ExpectedValue'");
+        InstructionDesc[OpExpectKHR].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpExpectKHR].operands.push(OperandId, "'ExpectedValue'");
 
-        InstructionDesc[enumCast(Op::OpAtomicISub)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicISub)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicISub)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicISub)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicISub].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicISub].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicISub].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicISub].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicUMin)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicUMin)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicUMin)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicUMin)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicUMin].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicUMin].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicUMin].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicUMin].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicUMax)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicUMax)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicUMax)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicUMax)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicUMax].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicUMax].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicUMax].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicUMax].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicSMin)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicSMin)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicSMin)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicSMin)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicSMin].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicSMin].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicSMin].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicSMin].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicSMax)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicSMax)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicSMax)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicSMax)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicSMax].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicSMax].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicSMax].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicSMax].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicFMinEXT)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicFMinEXT)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicFMinEXT)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicFMinEXT)].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpAtomicFMinEXT].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicFMinEXT].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicFMinEXT].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicFMinEXT].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpAtomicFMaxEXT)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicFMaxEXT)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicFMaxEXT)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicFMaxEXT)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpAtomicAnd)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicAnd)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicAnd)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicAnd)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpAtomicOr)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicOr)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicOr)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicOr)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpAtomicXor)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicXor)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicXor)].operands.push(OperandMemorySemantics, "'Semantics'");
-        InstructionDesc[enumCast(Op::OpAtomicXor)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpAtomicFlagTestAndSet)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicFlagTestAndSet)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicFlagTestAndSet)].operands.push(OperandMemorySemantics, "'Semantics'");
-
-        InstructionDesc[enumCast(Op::OpAtomicFlagClear)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpAtomicFlagClear)].operands.push(OperandScope, "'Scope'");
-        InstructionDesc[enumCast(Op::OpAtomicFlagClear)].operands.push(OperandMemorySemantics, "'Semantics'");
-
-        InstructionDesc[enumCast(Op::OpLoopMerge)].operands.push(OperandId, "'Merge Block'");
-        InstructionDesc[enumCast(Op::OpLoopMerge)].operands.push(OperandId, "'Continue Target'");
-        InstructionDesc[enumCast(Op::OpLoopMerge)].operands.push(OperandLoop, "");
-        InstructionDesc[enumCast(Op::OpLoopMerge)].operands.push(OperandOptionalLiteral, "");
-
-        InstructionDesc[enumCast(Op::OpSelectionMerge)].operands.push(OperandId, "'Merge Block'");
-        InstructionDesc[enumCast(Op::OpSelectionMerge)].operands.push(OperandSelect, "");
-
-        InstructionDesc[enumCast(Op::OpBranch)].operands.push(OperandId, "'Target Label'");
-
-        InstructionDesc[enumCast(Op::OpBranchConditional)].operands.push(OperandId, "'Condition'");
-        InstructionDesc[enumCast(Op::OpBranchConditional)].operands.push(OperandId, "'True Label'");
-        InstructionDesc[enumCast(Op::OpBranchConditional)].operands.push(OperandId, "'False Label'");
-        InstructionDesc[enumCast(Op::OpBranchConditional)].operands.push(OperandVariableLiterals, "'Branch weights'");
-
-        InstructionDesc[enumCast(Op::OpSwitch)].operands.push(OperandId, "'Selector'");
-        InstructionDesc[enumCast(Op::OpSwitch)].operands.push(OperandId, "'Default'");
-        InstructionDesc[enumCast(Op::OpSwitch)].operands.push(OperandVariableLiteralId, "'Target'");
-
-
-        InstructionDesc[enumCast(Op::OpReturnValue)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpLifetimeStart)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpLifetimeStart)].operands.push(OperandLiteralNumber, "'Size'");
-
-        InstructionDesc[enumCast(Op::OpLifetimeStop)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpLifetimeStop)].operands.push(OperandLiteralNumber, "'Size'");
-
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandId, "'Destination'");
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandId, "'Source'");
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandId, "'Num Elements'");
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandId, "'Stride'");
-        InstructionDesc[enumCast(Op::OpGroupAsyncCopy)].operands.push(OperandId, "'Event'");
-
-        InstructionDesc[enumCast(Op::OpGroupWaitEvents)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupWaitEvents)].operands.push(OperandId, "'Num Events'");
-        InstructionDesc[enumCast(Op::OpGroupWaitEvents)].operands.push(OperandId, "'Events List'");
-
-        InstructionDesc[enumCast(Op::OpGroupAll)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupAll)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpGroupAny)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupAny)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpGroupBroadcast)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupBroadcast)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpGroupBroadcast)].operands.push(OperandId, "'LocalId'");
-
-        InstructionDesc[enumCast(Op::OpGroupIAdd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupIAdd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupIAdd)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupFAdd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFAdd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFAdd)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupUMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupUMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupUMin)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupSMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupSMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupSMin)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupFMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFMin)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupUMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupUMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupUMax)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupSMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupSMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupSMax)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupFMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFMax)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpReadPipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpReadPipe)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpReadPipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpReadPipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpWritePipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpWritePipe)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpWritePipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpWritePipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Index'");
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpReservedReadPipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Index'");
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpReservedWritePipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpReserveReadPipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpReserveReadPipePackets)].operands.push(OperandId, "'Num Packets'");
-        InstructionDesc[enumCast(Op::OpReserveReadPipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpReserveReadPipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpReserveWritePipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpReserveWritePipePackets)].operands.push(OperandId, "'Num Packets'");
-        InstructionDesc[enumCast(Op::OpReserveWritePipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpReserveWritePipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpCommitReadPipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpCommitReadPipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpCommitReadPipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpCommitReadPipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpCommitWritePipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpCommitWritePipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpCommitWritePipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpCommitWritePipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpIsValidReserveId)].operands.push(OperandId, "'Reserve Id'");
-
-        InstructionDesc[enumCast(Op::OpGetNumPipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGetNumPipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGetNumPipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpGetMaxPipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGetMaxPipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGetMaxPipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpGroupReserveReadPipePackets)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupReserveReadPipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGroupReserveReadPipePackets)].operands.push(OperandId, "'Num Packets'");
-        InstructionDesc[enumCast(Op::OpGroupReserveReadPipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGroupReserveReadPipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpGroupReserveWritePipePackets)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupReserveWritePipePackets)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGroupReserveWritePipePackets)].operands.push(OperandId, "'Num Packets'");
-        InstructionDesc[enumCast(Op::OpGroupReserveWritePipePackets)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGroupReserveWritePipePackets)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGroupCommitReadPipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].operands.push(OperandId, "'Pipe'");
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].operands.push(OperandId, "'Reserve Id'");
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].operands.push(OperandId, "'Packet Size'");
-        InstructionDesc[enumCast(Op::OpGroupCommitWritePipe)].operands.push(OperandId, "'Packet Alignment'");
-
-        InstructionDesc[enumCast(Op::OpBuildNDRange)].operands.push(OperandId, "'GlobalWorkSize'");
-        InstructionDesc[enumCast(Op::OpBuildNDRange)].operands.push(OperandId, "'LocalWorkSize'");
-        InstructionDesc[enumCast(Op::OpBuildNDRange)].operands.push(OperandId, "'GlobalWorkOffset'");
-
-        InstructionDesc[enumCast(Op::OpCaptureEventProfilingInfo)].operands.push(OperandId, "'Event'");
-        InstructionDesc[enumCast(Op::OpCaptureEventProfilingInfo)].operands.push(OperandId, "'Profiling Info'");
-        InstructionDesc[enumCast(Op::OpCaptureEventProfilingInfo)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpSetUserEventStatus)].operands.push(OperandId, "'Event'");
-        InstructionDesc[enumCast(Op::OpSetUserEventStatus)].operands.push(OperandId, "'Status'");
-
-        InstructionDesc[enumCast(Op::OpIsValidEvent)].operands.push(OperandId, "'Event'");
-
-        InstructionDesc[enumCast(Op::OpRetainEvent)].operands.push(OperandId, "'Event'");
-
-        InstructionDesc[enumCast(Op::OpReleaseEvent)].operands.push(OperandId, "'Event'");
-
-        InstructionDesc[enumCast(Op::OpGetKernelWorkGroupSize)].operands.push(OperandId, "'Invoke'");
-        InstructionDesc[enumCast(Op::OpGetKernelWorkGroupSize)].operands.push(OperandId, "'Param'");
-        InstructionDesc[enumCast(Op::OpGetKernelWorkGroupSize)].operands.push(OperandId, "'Param Size'");
-        InstructionDesc[enumCast(Op::OpGetKernelWorkGroupSize)].operands.push(OperandId, "'Param Align'");
-
-        InstructionDesc[enumCast(Op::OpGetKernelPreferredWorkGroupSizeMultiple)].operands.push(OperandId, "'Invoke'");
-        InstructionDesc[enumCast(Op::OpGetKernelPreferredWorkGroupSizeMultiple)].operands.push(OperandId, "'Param'");
-        InstructionDesc[enumCast(Op::OpGetKernelPreferredWorkGroupSizeMultiple)].operands.push(OperandId, "'Param Size'");
-        InstructionDesc[enumCast(Op::OpGetKernelPreferredWorkGroupSizeMultiple)].operands.push(OperandId, "'Param Align'");
-
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeSubGroupCount)].operands.push(OperandId, "'ND Range'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeSubGroupCount)].operands.push(OperandId, "'Invoke'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeSubGroupCount)].operands.push(OperandId, "'Param'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeSubGroupCount)].operands.push(OperandId, "'Param Size'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeSubGroupCount)].operands.push(OperandId, "'Param Align'");
-
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeMaxSubGroupSize)].operands.push(OperandId, "'ND Range'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeMaxSubGroupSize)].operands.push(OperandId, "'Invoke'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeMaxSubGroupSize)].operands.push(OperandId, "'Param'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeMaxSubGroupSize)].operands.push(OperandId, "'Param Size'");
-        InstructionDesc[enumCast(Op::OpGetKernelNDrangeMaxSubGroupSize)].operands.push(OperandId, "'Param Align'");
-
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Queue'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Flags'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'ND Range'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Num Events'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Wait Events'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Ret Event'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Invoke'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Param'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Param Size'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandId, "'Param Align'");
-        InstructionDesc[enumCast(Op::OpEnqueueKernel)].operands.push(OperandVariableIds, "'Local Size'");
-
-        InstructionDesc[enumCast(Op::OpEnqueueMarker)].operands.push(OperandId, "'Queue'");
-        InstructionDesc[enumCast(Op::OpEnqueueMarker)].operands.push(OperandId, "'Num Events'");
-        InstructionDesc[enumCast(Op::OpEnqueueMarker)].operands.push(OperandId, "'Wait Events'");
-        InstructionDesc[enumCast(Op::OpEnqueueMarker)].operands.push(OperandId, "'Ret Event'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformElect)].operands.push(OperandScope, "'Execution'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAll)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAll)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAny)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAny)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAllEqual)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformAllEqual)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBroadcast)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBroadcast)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBroadcast)].operands.push(OperandId, "ID");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBroadcastFirst)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBroadcastFirst)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallot)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallot)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformInverseBallot)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformInverseBallot)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitExtract)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitExtract)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitExtract)].operands.push(OperandId, "Bit");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitCount)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitCount)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotBitCount)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotFindLSB)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotFindLSB)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotFindMSB)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBallotFindMSB)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffle)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffle)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffle)].operands.push(OperandId, "'Id'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleXor)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleXor)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleXor)].operands.push(OperandId, "Mask");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleUp)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleUp)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleUp)].operands.push(OperandId, "Offset");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleDown)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleDown)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformShuffleDown)].operands.push(OperandId, "Offset");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIAdd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIAdd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIAdd)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIAdd)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFAdd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFAdd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFAdd)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFAdd)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIMul)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIMul)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIMul)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformIMul)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMul)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMul)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMul)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMul)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMin)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMin)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMin)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMin)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMin)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMin)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMin)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMin)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpAtomicFMaxEXT].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicFMaxEXT].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicFMaxEXT].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicFMaxEXT].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpAtomicAnd].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicAnd].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicAnd].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicAnd].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpAtomicOr].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicOr].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicOr].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicOr].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpAtomicXor].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicXor].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicXor].operands.push(OperandMemorySemantics, "'Semantics'");
+        InstructionDesc[OpAtomicXor].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpAtomicFlagTestAndSet].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicFlagTestAndSet].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicFlagTestAndSet].operands.push(OperandMemorySemantics, "'Semantics'");
+
+        InstructionDesc[OpAtomicFlagClear].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpAtomicFlagClear].operands.push(OperandScope, "'Scope'");
+        InstructionDesc[OpAtomicFlagClear].operands.push(OperandMemorySemantics, "'Semantics'");
+
+        InstructionDesc[OpLoopMerge].operands.push(OperandId, "'Merge Block'");
+        InstructionDesc[OpLoopMerge].operands.push(OperandId, "'Continue Target'");
+        InstructionDesc[OpLoopMerge].operands.push(OperandLoop, "");
+        InstructionDesc[OpLoopMerge].operands.push(OperandOptionalLiteral, "");
+
+        InstructionDesc[OpSelectionMerge].operands.push(OperandId, "'Merge Block'");
+        InstructionDesc[OpSelectionMerge].operands.push(OperandSelect, "");
+
+        InstructionDesc[OpBranch].operands.push(OperandId, "'Target Label'");
+
+        InstructionDesc[OpBranchConditional].operands.push(OperandId, "'Condition'");
+        InstructionDesc[OpBranchConditional].operands.push(OperandId, "'True Label'");
+        InstructionDesc[OpBranchConditional].operands.push(OperandId, "'False Label'");
+        InstructionDesc[OpBranchConditional].operands.push(OperandVariableLiterals, "'Branch weights'");
+
+        InstructionDesc[OpSwitch].operands.push(OperandId, "'Selector'");
+        InstructionDesc[OpSwitch].operands.push(OperandId, "'Default'");
+        InstructionDesc[OpSwitch].operands.push(OperandVariableLiteralId, "'Target'");
+
+
+        InstructionDesc[OpReturnValue].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpLifetimeStart].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpLifetimeStart].operands.push(OperandLiteralNumber, "'Size'");
+
+        InstructionDesc[OpLifetimeStop].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpLifetimeStop].operands.push(OperandLiteralNumber, "'Size'");
+
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandId, "'Destination'");
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandId, "'Source'");
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandId, "'Num Elements'");
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandId, "'Stride'");
+        InstructionDesc[OpGroupAsyncCopy].operands.push(OperandId, "'Event'");
+
+        InstructionDesc[OpGroupWaitEvents].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupWaitEvents].operands.push(OperandId, "'Num Events'");
+        InstructionDesc[OpGroupWaitEvents].operands.push(OperandId, "'Events List'");
+
+        InstructionDesc[OpGroupAll].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupAll].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpGroupAny].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupAny].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpGroupBroadcast].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupBroadcast].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpGroupBroadcast].operands.push(OperandId, "'LocalId'");
+
+        InstructionDesc[OpGroupIAdd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupIAdd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupIAdd].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupFAdd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFAdd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFAdd].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupUMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupUMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupUMin].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupSMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupSMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupSMin].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupFMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFMin].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupUMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupUMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupUMax].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupSMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupSMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupSMax].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupFMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFMax].operands.push(OperandId, "X");
+
+        InstructionDesc[OpReadPipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpReadPipe].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpReadPipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpReadPipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpWritePipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpWritePipe].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpWritePipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpWritePipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Index'");
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpReservedReadPipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Index'");
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpReservedWritePipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpReserveReadPipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpReserveReadPipePackets].operands.push(OperandId, "'Num Packets'");
+        InstructionDesc[OpReserveReadPipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpReserveReadPipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpReserveWritePipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpReserveWritePipePackets].operands.push(OperandId, "'Num Packets'");
+        InstructionDesc[OpReserveWritePipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpReserveWritePipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpCommitReadPipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpCommitReadPipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpCommitReadPipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpCommitReadPipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpCommitWritePipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpCommitWritePipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpCommitWritePipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpCommitWritePipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpIsValidReserveId].operands.push(OperandId, "'Reserve Id'");
+
+        InstructionDesc[OpGetNumPipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGetNumPipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGetNumPipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpGetMaxPipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGetMaxPipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGetMaxPipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpGroupReserveReadPipePackets].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupReserveReadPipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGroupReserveReadPipePackets].operands.push(OperandId, "'Num Packets'");
+        InstructionDesc[OpGroupReserveReadPipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGroupReserveReadPipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpGroupReserveWritePipePackets].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupReserveWritePipePackets].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGroupReserveWritePipePackets].operands.push(OperandId, "'Num Packets'");
+        InstructionDesc[OpGroupReserveWritePipePackets].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGroupReserveWritePipePackets].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpGroupCommitReadPipe].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupCommitReadPipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGroupCommitReadPipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpGroupCommitReadPipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGroupCommitReadPipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpGroupCommitWritePipe].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupCommitWritePipe].operands.push(OperandId, "'Pipe'");
+        InstructionDesc[OpGroupCommitWritePipe].operands.push(OperandId, "'Reserve Id'");
+        InstructionDesc[OpGroupCommitWritePipe].operands.push(OperandId, "'Packet Size'");
+        InstructionDesc[OpGroupCommitWritePipe].operands.push(OperandId, "'Packet Alignment'");
+
+        InstructionDesc[OpBuildNDRange].operands.push(OperandId, "'GlobalWorkSize'");
+        InstructionDesc[OpBuildNDRange].operands.push(OperandId, "'LocalWorkSize'");
+        InstructionDesc[OpBuildNDRange].operands.push(OperandId, "'GlobalWorkOffset'");
+
+        InstructionDesc[OpCaptureEventProfilingInfo].operands.push(OperandId, "'Event'");
+        InstructionDesc[OpCaptureEventProfilingInfo].operands.push(OperandId, "'Profiling Info'");
+        InstructionDesc[OpCaptureEventProfilingInfo].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpSetUserEventStatus].operands.push(OperandId, "'Event'");
+        InstructionDesc[OpSetUserEventStatus].operands.push(OperandId, "'Status'");
+
+        InstructionDesc[OpIsValidEvent].operands.push(OperandId, "'Event'");
+
+        InstructionDesc[OpRetainEvent].operands.push(OperandId, "'Event'");
+
+        InstructionDesc[OpReleaseEvent].operands.push(OperandId, "'Event'");
+
+        InstructionDesc[OpGetKernelWorkGroupSize].operands.push(OperandId, "'Invoke'");
+        InstructionDesc[OpGetKernelWorkGroupSize].operands.push(OperandId, "'Param'");
+        InstructionDesc[OpGetKernelWorkGroupSize].operands.push(OperandId, "'Param Size'");
+        InstructionDesc[OpGetKernelWorkGroupSize].operands.push(OperandId, "'Param Align'");
+
+        InstructionDesc[OpGetKernelPreferredWorkGroupSizeMultiple].operands.push(OperandId, "'Invoke'");
+        InstructionDesc[OpGetKernelPreferredWorkGroupSizeMultiple].operands.push(OperandId, "'Param'");
+        InstructionDesc[OpGetKernelPreferredWorkGroupSizeMultiple].operands.push(OperandId, "'Param Size'");
+        InstructionDesc[OpGetKernelPreferredWorkGroupSizeMultiple].operands.push(OperandId, "'Param Align'");
+
+        InstructionDesc[OpGetKernelNDrangeSubGroupCount].operands.push(OperandId, "'ND Range'");
+        InstructionDesc[OpGetKernelNDrangeSubGroupCount].operands.push(OperandId, "'Invoke'");
+        InstructionDesc[OpGetKernelNDrangeSubGroupCount].operands.push(OperandId, "'Param'");
+        InstructionDesc[OpGetKernelNDrangeSubGroupCount].operands.push(OperandId, "'Param Size'");
+        InstructionDesc[OpGetKernelNDrangeSubGroupCount].operands.push(OperandId, "'Param Align'");
+
+        InstructionDesc[OpGetKernelNDrangeMaxSubGroupSize].operands.push(OperandId, "'ND Range'");
+        InstructionDesc[OpGetKernelNDrangeMaxSubGroupSize].operands.push(OperandId, "'Invoke'");
+        InstructionDesc[OpGetKernelNDrangeMaxSubGroupSize].operands.push(OperandId, "'Param'");
+        InstructionDesc[OpGetKernelNDrangeMaxSubGroupSize].operands.push(OperandId, "'Param Size'");
+        InstructionDesc[OpGetKernelNDrangeMaxSubGroupSize].operands.push(OperandId, "'Param Align'");
+
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Queue'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Flags'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'ND Range'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Num Events'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Wait Events'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Ret Event'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Invoke'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Param'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Param Size'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandId, "'Param Align'");
+        InstructionDesc[OpEnqueueKernel].operands.push(OperandVariableIds, "'Local Size'");
+
+        InstructionDesc[OpEnqueueMarker].operands.push(OperandId, "'Queue'");
+        InstructionDesc[OpEnqueueMarker].operands.push(OperandId, "'Num Events'");
+        InstructionDesc[OpEnqueueMarker].operands.push(OperandId, "'Wait Events'");
+        InstructionDesc[OpEnqueueMarker].operands.push(OperandId, "'Ret Event'");
+
+        InstructionDesc[OpGroupNonUniformElect].operands.push(OperandScope, "'Execution'");
+
+        InstructionDesc[OpGroupNonUniformAll].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformAll].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformAny].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformAny].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformAllEqual].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformAllEqual].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformBroadcast].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBroadcast].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformBroadcast].operands.push(OperandId, "ID");
+
+        InstructionDesc[OpGroupNonUniformBroadcastFirst].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBroadcastFirst].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformBallot].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBallot].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformInverseBallot].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformInverseBallot].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformBallotBitExtract].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBallotBitExtract].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformBallotBitExtract].operands.push(OperandId, "Bit");
+
+        InstructionDesc[OpGroupNonUniformBallotBitCount].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBallotBitCount].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformBallotBitCount].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformBallotFindLSB].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBallotFindLSB].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformBallotFindMSB].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBallotFindMSB].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformShuffle].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformShuffle].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformShuffle].operands.push(OperandId, "'Id'");
+
+        InstructionDesc[OpGroupNonUniformShuffleXor].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformShuffleXor].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformShuffleXor].operands.push(OperandId, "Mask");
+
+        InstructionDesc[OpGroupNonUniformShuffleUp].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformShuffleUp].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformShuffleUp].operands.push(OperandId, "Offset");
+
+        InstructionDesc[OpGroupNonUniformShuffleDown].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformShuffleDown].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformShuffleDown].operands.push(OperandId, "Offset");
+
+        InstructionDesc[OpGroupNonUniformIAdd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformIAdd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformIAdd].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformIAdd].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformFAdd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformFAdd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformFAdd].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformFAdd].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformIMul].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformIMul].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformIMul].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformIMul].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformFMul].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformFMul].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformFMul].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformFMul].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformSMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformSMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformSMin].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformSMin].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformUMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformUMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformUMin].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformUMin].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformFMin].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformFMin].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformFMin].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformFMin].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMax)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformSMax)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpGroupNonUniformSMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformSMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformSMax].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformSMax].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMax)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformUMax)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpGroupNonUniformUMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformUMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformUMax].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformUMax].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMax)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMax)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMax)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformFMax)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpGroupNonUniformFMax].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformFMax].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformFMax].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformFMax].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseAnd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseAnd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseAnd)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseAnd)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpGroupNonUniformBitwiseAnd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBitwiseAnd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformBitwiseAnd].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformBitwiseAnd].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseOr)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseOr)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseOr)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseOr)].operands.push(OperandId, "'ClusterSize'", true);
+        InstructionDesc[OpGroupNonUniformBitwiseOr].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBitwiseOr].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformBitwiseOr].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformBitwiseOr].operands.push(OperandId, "'ClusterSize'", true);
 
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseXor)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseXor)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseXor)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformBitwiseXor)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalAnd)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalAnd)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalAnd)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalAnd)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalOr)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalOr)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalOr)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalOr)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalXor)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalXor)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalXor)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformLogicalXor)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadBroadcast)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadBroadcast)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadBroadcast)].operands.push(OperandId, "'Id'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadSwap)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadSwap)].operands.push(OperandId, "X");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadSwap)].operands.push(OperandId, "'Direction'");
-
-        InstructionDesc[enumCast(Op::OpSubgroupBallotKHR)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpSubgroupFirstInvocationKHR)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpSubgroupAnyKHR)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpSubgroupAnyKHR)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpSubgroupAllKHR)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpSubgroupAllKHR)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpSubgroupAllEqualKHR)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpSubgroupAllEqualKHR)].operands.push(OperandId, "'Predicate'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformRotateKHR)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformRotateKHR)].operands.push(OperandId, "'X'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformRotateKHR)].operands.push(OperandId, "'Delta'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformRotateKHR)].operands.push(OperandId, "'ClusterSize'", true);
-
-        InstructionDesc[enumCast(Op::OpSubgroupReadInvocationKHR)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpSubgroupReadInvocationKHR)].operands.push(OperandId, "'Index'");
-
-        InstructionDesc[enumCast(Op::OpModuleProcessed)].operands.push(OperandLiteralString, "'process'");
-
-        InstructionDesc[enumCast(Op::OpGroupIAddNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupIAddNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupIAddNonUniformAMD)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupFAddNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFAddNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFAddNonUniformAMD)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupUMinNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupUMinNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupUMinNonUniformAMD)].operands.push(OperandId, "'X'");
-
-        InstructionDesc[enumCast(Op::OpGroupSMinNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupSMinNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupSMinNonUniformAMD)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupFMinNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFMinNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFMinNonUniformAMD)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupUMaxNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupUMaxNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupUMaxNonUniformAMD)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupSMaxNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupSMaxNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupSMaxNonUniformAMD)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupFMaxNonUniformAMD)].operands.push(OperandScope, "'Execution'");
-        InstructionDesc[enumCast(Op::OpGroupFMaxNonUniformAMD)].operands.push(OperandGroupOperation, "'Operation'");
-        InstructionDesc[enumCast(Op::OpGroupFMaxNonUniformAMD)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpFragmentMaskFetchAMD)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpFragmentMaskFetchAMD)].operands.push(OperandId, "'Coordinate'");
-
-        InstructionDesc[enumCast(Op::OpFragmentFetchAMD)].operands.push(OperandId, "'Image'");
-        InstructionDesc[enumCast(Op::OpFragmentFetchAMD)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpFragmentFetchAMD)].operands.push(OperandId, "'Fragment Index'");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformPartitionNV)].operands.push(OperandId, "X");
-
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadAllKHR)].operands.push(OperandId, "'Predicate'");
-        InstructionDesc[enumCast(Op::OpGroupNonUniformQuadAnyKHR)].operands.push(OperandId, "'Predicate'");
-        InstructionDesc[enumCast(Op::OpTypeAccelerationStructureKHR)].setResultAndType(true, false);
-
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Ray Flags'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Cull Mask'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Ray Origin'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Ray Direction'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpTraceNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Ray Flags'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Cull Mask'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Ray Origin'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Ray Direction'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Time'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpTraceRayMotionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Ray Flags'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Cull Mask'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Ray Origin'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Ray Direction'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpTraceRayKHR)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpReportIntersectionKHR)].operands.push(OperandId, "'Hit Parameter'");
-        InstructionDesc[enumCast(Op::OpReportIntersectionKHR)].operands.push(OperandId, "'Hit Kind'");
-
-        InstructionDesc[enumCast(Op::OpIgnoreIntersectionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpIgnoreIntersectionKHR)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpTerminateRayNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpTerminateRayKHR)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpExecuteCallableNV)].operands.push(OperandId, "SBT Record Index");
-        InstructionDesc[enumCast(Op::OpExecuteCallableNV)].operands.push(OperandId, "CallableData ID");
-        InstructionDesc[enumCast(Op::OpExecuteCallableNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpExecuteCallableKHR)].operands.push(OperandId, "SBT Record Index");
-        InstructionDesc[enumCast(Op::OpExecuteCallableKHR)].operands.push(OperandId, "CallableData");
-        InstructionDesc[enumCast(Op::OpExecuteCallableKHR)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpConvertUToAccelerationStructureKHR)].operands.push(OperandId, "Value");
-        InstructionDesc[enumCast(Op::OpConvertUToAccelerationStructureKHR)].setResultAndType(true, true);
+        InstructionDesc[OpGroupNonUniformBitwiseXor].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformBitwiseXor].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformBitwiseXor].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformBitwiseXor].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformLogicalAnd].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformLogicalAnd].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformLogicalAnd].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformLogicalAnd].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformLogicalOr].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformLogicalOr].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformLogicalOr].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformLogicalOr].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformLogicalXor].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformLogicalXor].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupNonUniformLogicalXor].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformLogicalXor].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpGroupNonUniformQuadBroadcast].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformQuadBroadcast].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformQuadBroadcast].operands.push(OperandId, "'Id'");
+
+        InstructionDesc[OpGroupNonUniformQuadSwap].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformQuadSwap].operands.push(OperandId, "X");
+        InstructionDesc[OpGroupNonUniformQuadSwap].operands.push(OperandId, "'Direction'");
+
+        InstructionDesc[OpSubgroupBallotKHR].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpSubgroupFirstInvocationKHR].operands.push(OperandId, "'Value'");
+
+        InstructionDesc[OpSubgroupAnyKHR].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpSubgroupAnyKHR].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpSubgroupAllKHR].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpSubgroupAllKHR].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpSubgroupAllEqualKHR].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpSubgroupAllEqualKHR].operands.push(OperandId, "'Predicate'");
+
+        InstructionDesc[OpGroupNonUniformRotateKHR].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupNonUniformRotateKHR].operands.push(OperandId, "'X'");
+        InstructionDesc[OpGroupNonUniformRotateKHR].operands.push(OperandId, "'Delta'");
+        InstructionDesc[OpGroupNonUniformRotateKHR].operands.push(OperandId, "'ClusterSize'", true);
+
+        InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Value'");
+        InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Index'");
+
+        InstructionDesc[OpModuleProcessed].operands.push(OperandLiteralString, "'process'");
+
+        InstructionDesc[OpGroupIAddNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupIAddNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupIAddNonUniformAMD].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupFAddNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFAddNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFAddNonUniformAMD].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupUMinNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupUMinNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupUMinNonUniformAMD].operands.push(OperandId, "'X'");
+
+        InstructionDesc[OpGroupSMinNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupSMinNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupSMinNonUniformAMD].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupFMinNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFMinNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFMinNonUniformAMD].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupUMaxNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupUMaxNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupUMaxNonUniformAMD].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupSMaxNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupSMaxNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupSMaxNonUniformAMD].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupFMaxNonUniformAMD].operands.push(OperandScope, "'Execution'");
+        InstructionDesc[OpGroupFMaxNonUniformAMD].operands.push(OperandGroupOperation, "'Operation'");
+        InstructionDesc[OpGroupFMaxNonUniformAMD].operands.push(OperandId, "X");
+
+        InstructionDesc[OpFragmentMaskFetchAMD].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpFragmentMaskFetchAMD].operands.push(OperandId, "'Coordinate'");
+
+        InstructionDesc[OpFragmentFetchAMD].operands.push(OperandId, "'Image'");
+        InstructionDesc[OpFragmentFetchAMD].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpFragmentFetchAMD].operands.push(OperandId, "'Fragment Index'");
+
+        InstructionDesc[OpGroupNonUniformPartitionNV].operands.push(OperandId, "X");
+
+        InstructionDesc[OpGroupNonUniformQuadAllKHR].operands.push(OperandId, "'Predicate'");
+        InstructionDesc[OpGroupNonUniformQuadAnyKHR].operands.push(OperandId, "'Predicate'");
+        InstructionDesc[OpTypeAccelerationStructureKHR].setResultAndType(true, false);
+
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Flags'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Cull Mask'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Miss Index'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Origin'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Direction'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpTraceNV].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpTraceNV].setResultAndType(false, false);
+
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Ray Flags'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Cull Mask'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Miss Index'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Ray Origin'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Ray Direction'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Time'");
+        InstructionDesc[OpTraceRayMotionNV].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpTraceRayMotionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Ray Flags'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Cull Mask'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Miss Index'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Ray Origin'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Ray Direction'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpTraceRayKHR].setResultAndType(false, false);
+
+        InstructionDesc[OpReportIntersectionKHR].operands.push(OperandId, "'Hit Parameter'");
+        InstructionDesc[OpReportIntersectionKHR].operands.push(OperandId, "'Hit Kind'");
+
+        InstructionDesc[OpIgnoreIntersectionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpIgnoreIntersectionKHR].setResultAndType(false, false);
+
+        InstructionDesc[OpTerminateRayNV].setResultAndType(false, false);
+
+        InstructionDesc[OpTerminateRayKHR].setResultAndType(false, false);
+
+        InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "SBT Record Index");
+        InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "CallableData ID");
+        InstructionDesc[OpExecuteCallableNV].setResultAndType(false, false);
+
+        InstructionDesc[OpExecuteCallableKHR].operands.push(OperandId, "SBT Record Index");
+        InstructionDesc[OpExecuteCallableKHR].operands.push(OperandId, "CallableData");
+        InstructionDesc[OpExecuteCallableKHR].setResultAndType(false, false);
+
+        InstructionDesc[OpConvertUToAccelerationStructureKHR].operands.push(OperandId, "Value");
+        InstructionDesc[OpConvertUToAccelerationStructureKHR].setResultAndType(true, true);
 
         // Ray Query
-        InstructionDesc[enumCast(Op::OpTypeAccelerationStructureKHR)].setResultAndType(true, false);
-        InstructionDesc[enumCast(Op::OpTypeRayQueryKHR)].setResultAndType(true, false);
+        InstructionDesc[OpTypeAccelerationStructureKHR].setResultAndType(true, false);
+        InstructionDesc[OpTypeRayQueryKHR].setResultAndType(true, false);
 
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'AccelerationS'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'CullMask'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'Tmin'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].operands.push(OperandId, "'Tmax'");
-        InstructionDesc[enumCast(Op::OpRayQueryInitializeKHR)].setResultAndType(false, false);
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'AccelerationS'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'RayFlags'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'CullMask'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'Tmin'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'Tmax'");
+        InstructionDesc[OpRayQueryInitializeKHR].setResultAndType(false, false);
 
-        InstructionDesc[enumCast(Op::OpRayQueryTerminateKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryTerminateKHR)].setResultAndType(false, false);
+        InstructionDesc[OpRayQueryTerminateKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryTerminateKHR].setResultAndType(false, false);
+
+        InstructionDesc[OpRayQueryGenerateIntersectionKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGenerateIntersectionKHR].operands.push(OperandId, "'THit'");
+        InstructionDesc[OpRayQueryGenerateIntersectionKHR].setResultAndType(false, false);
 
-        InstructionDesc[enumCast(Op::OpRayQueryGenerateIntersectionKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGenerateIntersectionKHR)].operands.push(OperandId, "'THit'");
-        InstructionDesc[enumCast(Op::OpRayQueryGenerateIntersectionKHR)].setResultAndType(false, false);
+        InstructionDesc[OpRayQueryConfirmIntersectionKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryConfirmIntersectionKHR].setResultAndType(false, false);
 
-        InstructionDesc[enumCast(Op::OpRayQueryConfirmIntersectionKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryConfirmIntersectionKHR)].setResultAndType(false, false);
+        InstructionDesc[OpRayQueryProceedKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryProceedKHR].setResultAndType(true, true);
 
-        InstructionDesc[enumCast(Op::OpRayQueryProceedKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryProceedKHR)].setResultAndType(true, true);
+        InstructionDesc[OpRayQueryGetIntersectionTypeKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionTypeKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionTypeKHR].setResultAndType(true, true);
 
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTypeKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTypeKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTypeKHR)].setResultAndType(true, true);
+        InstructionDesc[OpRayQueryGetRayTMinKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetRayTMinKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetRayFlagsKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetRayFlagsKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionTKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionTKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionTKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionInstanceCustomIndexKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceCustomIndexKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceCustomIndexKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionInstanceIdKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceIdKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceIdKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionGeometryIndexKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionGeometryIndexKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionGeometryIndexKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionPrimitiveIndexKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionPrimitiveIndexKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionPrimitiveIndexKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionBarycentricsKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionBarycentricsKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionBarycentricsKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionFrontFaceKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionFrontFaceKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionFrontFaceKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionCandidateAABBOpaqueKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionCandidateAABBOpaqueKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayDirectionKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayDirectionKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayDirectionKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayOriginKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayOriginKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectRayOriginKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetWorldRayDirectionKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetWorldRayDirectionKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetWorldRayOriginKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetWorldRayOriginKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionObjectToWorldKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectToWorldKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionObjectToWorldKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionWorldToObjectKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionWorldToObjectKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionWorldToObjectKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpRayQueryGetIntersectionTriangleVertexPositionsKHR].operands.push(OperandId, "'RayQuery'");
+        InstructionDesc[OpRayQueryGetIntersectionTriangleVertexPositionsKHR].operands.push(OperandId, "'Committed'");
+        InstructionDesc[OpRayQueryGetIntersectionTriangleVertexPositionsKHR].setResultAndType(true, true);
+
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Sampled Image'");
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Coordinate'");
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Granularity'");
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Coarse'");
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandVariableIds, "", true);
+
+        InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Index Offset'");
+        InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Packed Indices'");
 
-        InstructionDesc[enumCast(Op::OpRayQueryGetRayTMinKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetRayTMinKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetRayFlagsKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetRayFlagsKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceIdKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceIdKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceIdKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionGeometryIndexKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionGeometryIndexKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionGeometryIndexKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionPrimitiveIndexKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionPrimitiveIndexKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionPrimitiveIndexKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionBarycentricsKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionBarycentricsKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionBarycentricsKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionFrontFaceKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionFrontFaceKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionFrontFaceKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayDirectionKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayDirectionKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayDirectionKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayOriginKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayOriginKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectRayOriginKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetWorldRayDirectionKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetWorldRayDirectionKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetWorldRayOriginKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetWorldRayOriginKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectToWorldKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectToWorldKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionObjectToWorldKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionWorldToObjectKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionWorldToObjectKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionWorldToObjectKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetClusterIdNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetClusterIdNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetClusterIdNV)].setResultAndType(true, true);
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSpherePositionNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSpherePositionNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSpherePositionNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSphereRadiusNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSphereRadiusNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionSphereRadiusNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSHitValueNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSHitValueNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSHitValueNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSPositionsNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSPositionsNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSPositionsNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSRadiiNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSRadiiNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryGetIntersectionLSSRadiiNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryIsSphereHitNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryIsSphereHitNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryIsSphereHitNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpRayQueryIsLSSHitNV)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpRayQueryIsLSSHitNV)].operands.push(OperandId, "'Committed'");
-        InstructionDesc[enumCast(Op::OpRayQueryIsLSSHitNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandId, "'Sampled Image'");
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandId, "'Granularity'");
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandId, "'Coarse'");
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleFootprintNV)].operands.push(OperandVariableIds, "", true);
-
-        InstructionDesc[enumCast(Op::OpWritePackedPrimitiveIndices4x8NV)].operands.push(OperandId, "'Index Offset'");
-        InstructionDesc[enumCast(Op::OpWritePackedPrimitiveIndices4x8NV)].operands.push(OperandId, "'Packed Indices'");
-
-        InstructionDesc[enumCast(Op::OpEmitMeshTasksEXT)].operands.push(OperandId, "'groupCountX'");
-        InstructionDesc[enumCast(Op::OpEmitMeshTasksEXT)].operands.push(OperandId, "'groupCountY'");
-        InstructionDesc[enumCast(Op::OpEmitMeshTasksEXT)].operands.push(OperandId, "'groupCountZ'");
-        InstructionDesc[enumCast(Op::OpEmitMeshTasksEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpEmitMeshTasksEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpSetMeshOutputsEXT)].operands.push(OperandId, "'vertexCount'");
-        InstructionDesc[enumCast(Op::OpSetMeshOutputsEXT)].operands.push(OperandId, "'primitiveCount'");
-        InstructionDesc[enumCast(Op::OpSetMeshOutputsEXT)].setResultAndType(false, false);
-
-
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixNV)].operands.push(OperandId, "'Component Type'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixNV)].operands.push(OperandId, "'Scope'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixNV)].operands.push(OperandId, "'Rows'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixNV)].operands.push(OperandId, "'Columns'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandId, "'Stride'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandId, "'Column Major'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadNV)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandId, "'Stride'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandId, "'Column Major'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreNV)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddNV)].operands.push(OperandId, "'A'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddNV)].operands.push(OperandId, "'B'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddNV)].operands.push(OperandId, "'C'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLengthNV)].operands.push(OperandId, "'Type'");
-
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].operands.push(OperandId, "'Component Type'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].operands.push(OperandId, "'Scope'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].operands.push(OperandId, "'Rows'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].operands.push(OperandId, "'Columns'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeMatrixKHR)].operands.push(OperandId, "'Use'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandId, "'Memory Layout'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandId, "'Stride'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadKHR)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandId, "'Memory Layout'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandId, "'Stride'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreKHR)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddKHR)].operands.push(OperandId, "'A'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddKHR)].operands.push(OperandId, "'B'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddKHR)].operands.push(OperandId, "'C'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixMulAddKHR)].operands.push(OperandCooperativeMatrixOperands, "'Cooperative Matrix Operands'", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLengthKHR)].operands.push(OperandId, "'Type'");
-
-        InstructionDesc[enumCast(Op::OpTypeCooperativeVectorNV)].operands.push(OperandId, "'Component Type'");
-        InstructionDesc[enumCast(Op::OpTypeCooperativeVectorNV)].operands.push(OperandId, "'Components'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'Input'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'InputInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'MatrixOffset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'MatrixInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'M'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'K'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'MemoryLayout'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'Transpose'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandId, "'MatrixStride'", true);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulNV)].operands.push(OperandCooperativeMatrixOperands, "'Cooperative Matrix Operands'", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'Input'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'InputInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'MatrixOffset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'MatrixInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'Bias'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'BiasOffset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'BiasInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'M'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'K'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'MemoryLayout'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'Transpose'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandId, "'MatrixStride'", true);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorMatrixMulAddNV)].operands.push(OperandCooperativeMatrixOperands, "'Cooperative Matrix Operands'", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorLoadNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorLoadNV)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorLoadNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorLoadNV)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorLoadNV)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandLiteralNumber, "", true);
-        InstructionDesc[enumCast(Op::OpCooperativeVectorStoreNV)].operands.push(OperandId, "", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'A'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'B'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'MemoryLayout'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'MatrixInterpretation'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorOuterProductAccumulateNV)].operands.push(OperandId, "'MatrixStride'", true);
-
-        InstructionDesc[enumCast(Op::OpCooperativeVectorReduceSumAccumulateNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorReduceSumAccumulateNV)].operands.push(OperandId, "'Offset'");
-        InstructionDesc[enumCast(Op::OpCooperativeVectorReduceSumAccumulateNV)].operands.push(OperandId, "'V'");
-
-        InstructionDesc[enumCast(Op::OpDemoteToHelperInvocationEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpReadClockKHR)].operands.push(OperandScope, "'Scope'");
-
-        InstructionDesc[enumCast(Op::OpTypeHitObjectNV)].setResultAndType(true, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintNV)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintNV)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectNV)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectNV)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetCurrentTimeNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetCurrentTimeNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetHitKindNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetHitKindNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetPrimitiveIndexNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetPrimitiveIndexNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetGeometryIndexNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetGeometryIndexNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceIdNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceIdNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceCustomIndexNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceCustomIndexNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayDirectionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayDirectionNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayOriginNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayOriginNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayDirectionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayDirectionNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayOriginNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayOriginNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldToObjectNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldToObjectNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectToWorldNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectToWorldNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMaxNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMaxNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMinNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMinNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderBindingTableRecordIndexNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderBindingTableRecordIndexNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsEmptyNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsEmptyNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsHitNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsHitNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsMissNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsMissNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesNV)].operands.push(OperandId, "'HitObjectAttribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderNV)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'InstanceId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'PrimitiveId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'GeometryIndex'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'HitKind'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].operands.push(OperandId, "'HitObject Attribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'InstanceId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'PrimitiveId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'GeometryIndex'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'HitKind'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'Current Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].operands.push(OperandId, "'HitObject Attribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitMotionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'InstanceId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'PrimitiveId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'GeometryIndex'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'HitKind'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'SBT Record Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].operands.push(OperandId, "'HitObject Attribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'InstanceId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'PrimitiveId'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'GeometryIndex'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'HitKind'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'SBT Record Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'Current Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].operands.push(OperandId, "'HitObject Attribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordHitWithIndexMotionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'SBT Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'SBT Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].operands.push(OperandId, "'Current Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordEmptyNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordEmptyNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionNV)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetClusterIdNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetClusterIdNV)].setResultAndType(true, true);
-        InstructionDesc[enumCast(Op::OpHitObjectGetSpherePositionNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetSpherePositionNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetSphereRadiusNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetSphereRadiusNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetLSSPositionsNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetLSSPositionsNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetLSSRadiiNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetLSSRadiiNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsSphereHitNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsSphereHitNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsLSSHitNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsLSSHitNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].operands.push(OperandId, "'Instance ID'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].operands.push(OperandId, "'Geometry Index'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].operands.push(OperandId, "'Primitive Index'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].operands.push(OperandId, "'Barycentrics'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexBarycentricNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].operands.push(OperandId, "'Instance ID'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].operands.push(OperandId, "'Geometry Index'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].operands.push(OperandId, "'Primitive Index'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].operands.push(OperandId, "'Barycentrics'");
-        InstructionDesc[enumCast(Op::OpFetchMicroTriangleVertexPositionNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpColorAttachmentReadEXT)].operands.push(OperandId, "'Attachment'");
-        InstructionDesc[enumCast(Op::OpColorAttachmentReadEXT)].operands.push(OperandId, "'Sample'", true);
-        InstructionDesc[enumCast(Op::OpStencilAttachmentReadEXT)].operands.push(OperandId, "'Sample'", true);
-        InstructionDesc[enumCast(Op::OpDepthAttachmentReadEXT)].operands.push(OperandId, "'Sample'", true);
-
-        InstructionDesc[enumCast(Op::OpImageSampleWeightedQCOM)].operands.push(OperandId, "'source texture'");
-        InstructionDesc[enumCast(Op::OpImageSampleWeightedQCOM)].operands.push(OperandId, "'texture coordinates'");
-        InstructionDesc[enumCast(Op::OpImageSampleWeightedQCOM)].operands.push(OperandId, "'weights texture'");
-        InstructionDesc[enumCast(Op::OpImageSampleWeightedQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageSampleWeightedQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBoxFilterQCOM)].operands.push(OperandId, "'source texture'");
-        InstructionDesc[enumCast(Op::OpImageBoxFilterQCOM)].operands.push(OperandId, "'texture coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBoxFilterQCOM)].operands.push(OperandId, "'box size'");
-        InstructionDesc[enumCast(Op::OpImageBoxFilterQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBoxFilterQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSADQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchSSDQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSSDQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchWindowSADQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSSDQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandId, "'target texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandId, "'target coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandId, "'reference texture'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandId, "'reference coordinates'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandId, "'block size'");
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].operands.push(OperandImageOperands, "", true);
-        InstructionDesc[enumCast(Op::OpImageBlockMatchGatherSADQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpBitCastArrayQCOM)].operands.push(OperandId, "'source array'");
-        InstructionDesc[enumCast(Op::OpBitCastArrayQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpCompositeConstructCoopMatQCOM)].operands.push(OperandId, "'source array'");
-        InstructionDesc[enumCast(Op::OpCompositeConstructCoopMatQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpCompositeExtractCoopMatQCOM)].operands.push(OperandId, "'source cooperative matrix'");
-        InstructionDesc[enumCast(Op::OpCompositeExtractCoopMatQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpExtractSubArrayQCOM)].operands.push(OperandId, "'source array'");
-        InstructionDesc[enumCast(Op::OpExtractSubArrayQCOM)].operands.push(OperandId, "'start index'");
-        InstructionDesc[enumCast(Op::OpExtractSubArrayQCOM)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpConstantCompositeReplicateEXT)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpSpecConstantCompositeReplicateEXT)].operands.push(OperandId, "'Value'");
-        InstructionDesc[enumCast(Op::OpCompositeConstructReplicateEXT)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixConvertNV)].operands.push(OperandId, "'Value'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixTransposeNV)].operands.push(OperandId, "'Matrix'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixReduceNV)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixReduceNV)].operands.push(OperandLiteralNumber, "'ReduceMask'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixReduceNV)].operands.push(OperandId, "'CombineFunc'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixPerElementOpNV)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixPerElementOpNV)].operands.push(OperandId, "'Operation'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixPerElementOpNV)].operands.push(OperandVariableIds, "'Operands'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadTensorNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadTensorNV)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadTensorNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadTensorNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixLoadTensorNV)].operands.push(OperandTensorAddressingOperands, "'Tensor Addressing Operands'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].operands.push(OperandId, "'Pointer'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].operands.push(OperandMemoryAccess, "'Memory Access'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixStoreTensorNV)].operands.push(OperandTensorAddressingOperands, "'Tensor Addressing Operands'");
-
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixReduceNV)].operands.push(OperandId, "'Matrix'");
-        InstructionDesc[enumCast(Op::OpCooperativeMatrixReduceNV)].operands.push(OperandLiteralNumber, "'ReduceMask'");
-
-        InstructionDesc[enumCast(Op::OpTypeTensorLayoutNV)].operands.push(OperandId, "'Dim'");
-        InstructionDesc[enumCast(Op::OpTypeTensorLayoutNV)].operands.push(OperandId, "'ClampMode'");
-
-        InstructionDesc[enumCast(Op::OpTypeTensorViewNV)].operands.push(OperandId, "'Dim'");
-        InstructionDesc[enumCast(Op::OpTypeTensorViewNV)].operands.push(OperandId, "'HasDimensions'");
-        InstructionDesc[enumCast(Op::OpTypeTensorViewNV)].operands.push(OperandVariableIds, "'p'");
-
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetBlockSizeNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetBlockSizeNV)].operands.push(OperandVariableIds, "'BlockSize'");
-
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetDimensionNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetDimensionNV)].operands.push(OperandVariableIds, "'Dim'");
-
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetStrideNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetStrideNV)].operands.push(OperandVariableIds, "'Stride'");
+        InstructionDesc[OpEmitMeshTasksEXT].operands.push(OperandId, "'groupCountX'");
+        InstructionDesc[OpEmitMeshTasksEXT].operands.push(OperandId, "'groupCountY'");
+        InstructionDesc[OpEmitMeshTasksEXT].operands.push(OperandId, "'groupCountZ'");
+        InstructionDesc[OpEmitMeshTasksEXT].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpEmitMeshTasksEXT].setResultAndType(false, false);
 
-        InstructionDesc[enumCast(Op::OpTensorLayoutSliceNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpTensorLayoutSliceNV)].operands.push(OperandVariableIds, "'Operands'");
+        InstructionDesc[OpSetMeshOutputsEXT].operands.push(OperandId, "'vertexCount'");
+        InstructionDesc[OpSetMeshOutputsEXT].operands.push(OperandId, "'primitiveCount'");
+        InstructionDesc[OpSetMeshOutputsEXT].setResultAndType(false, false);
 
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetClampValueNV)].operands.push(OperandId, "'TensorLayout'");
-        InstructionDesc[enumCast(Op::OpTensorLayoutSetClampValueNV)].operands.push(OperandId, "'Value'");
 
-        InstructionDesc[enumCast(Op::OpTensorViewSetDimensionNV)].operands.push(OperandId, "'TensorView'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetDimensionNV)].operands.push(OperandVariableIds, "'Dim'");
+        InstructionDesc[OpTypeCooperativeMatrixNV].operands.push(OperandId, "'Component Type'");
+        InstructionDesc[OpTypeCooperativeMatrixNV].operands.push(OperandId, "'Scope'");
+        InstructionDesc[OpTypeCooperativeMatrixNV].operands.push(OperandId, "'Rows'");
+        InstructionDesc[OpTypeCooperativeMatrixNV].operands.push(OperandId, "'Columns'");
 
-        InstructionDesc[enumCast(Op::OpTensorViewSetStrideNV)].operands.push(OperandId, "'TensorView'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetStrideNV)].operands.push(OperandVariableIds, "'Stride'");
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandId, "'Stride'");
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandId, "'Column Major'");
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandMemoryAccess, "'Memory Access'");
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpCooperativeMatrixLoadNV].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpTensorViewSetClipNV)].operands.push(OperandId, "'TensorView'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetClipNV)].operands.push(OperandId, "'ClipRowOffset'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetClipNV)].operands.push(OperandId, "'ClipRowSpan'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetClipNV)].operands.push(OperandId, "'ClipColOffset'");
-        InstructionDesc[enumCast(Op::OpTensorViewSetClipNV)].operands.push(OperandId, "'ClipColSpan'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandId, "'Object'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandId, "'Stride'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandId, "'Column Major'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandMemoryAccess, "'Memory Access'");
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpCooperativeMatrixStoreNV].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpSDotKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpSDotKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpSDotKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
+        InstructionDesc[OpCooperativeMatrixMulAddNV].operands.push(OperandId, "'A'");
+        InstructionDesc[OpCooperativeMatrixMulAddNV].operands.push(OperandId, "'B'");
+        InstructionDesc[OpCooperativeMatrixMulAddNV].operands.push(OperandId, "'C'");
 
-        InstructionDesc[enumCast(Op::OpUDotKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpUDotKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpUDotKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
+        InstructionDesc[OpCooperativeMatrixLengthNV].operands.push(OperandId, "'Type'");
 
-        InstructionDesc[enumCast(Op::OpSUDotKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpSUDotKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpSUDotKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
+        InstructionDesc[OpTypeCooperativeMatrixKHR].operands.push(OperandId, "'Component Type'");
+        InstructionDesc[OpTypeCooperativeMatrixKHR].operands.push(OperandId, "'Scope'");
+        InstructionDesc[OpTypeCooperativeMatrixKHR].operands.push(OperandId, "'Rows'");
+        InstructionDesc[OpTypeCooperativeMatrixKHR].operands.push(OperandId, "'Columns'");
+        InstructionDesc[OpTypeCooperativeMatrixKHR].operands.push(OperandId, "'Use'");
 
-        InstructionDesc[enumCast(Op::OpSDotAccSatKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpSDotAccSatKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpSDotAccSatKHR)].operands.push(OperandId, "'Accumulator'");
-        InstructionDesc[enumCast(Op::OpSDotAccSatKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandId, "'Memory Layout'");
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandId, "'Stride'");
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandMemoryAccess, "'Memory Access'");
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpCooperativeMatrixLoadKHR].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpUDotAccSatKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpUDotAccSatKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpUDotAccSatKHR)].operands.push(OperandId, "'Accumulator'");
-        InstructionDesc[enumCast(Op::OpUDotAccSatKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandId, "'Pointer'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandId, "'Object'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandId, "'Memory Layout'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandId, "'Stride'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandMemoryAccess, "'Memory Access'");
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandLiteralNumber, "", true);
+        InstructionDesc[OpCooperativeMatrixStoreKHR].operands.push(OperandId, "", true);
 
-        InstructionDesc[enumCast(Op::OpSUDotAccSatKHR)].operands.push(OperandId, "'Vector1'");
-        InstructionDesc[enumCast(Op::OpSUDotAccSatKHR)].operands.push(OperandId, "'Vector2'");
-        InstructionDesc[enumCast(Op::OpSUDotAccSatKHR)].operands.push(OperandId, "'Accumulator'");
-        InstructionDesc[enumCast(Op::OpSUDotAccSatKHR)].operands.push(OperandLiteralNumber, "'PackedVectorFormat'");
-
-        InstructionDesc[enumCast(Op::OpTypeTensorARM)].operands.push(OperandId, "'Element Type'");
-        InstructionDesc[enumCast(Op::OpTypeTensorARM)].operands.push(OperandId, "'Rank'");
-
-        InstructionDesc[enumCast(Op::OpTensorReadARM)].operands.push(OperandId, "'Tensor'");
-        InstructionDesc[enumCast(Op::OpTensorReadARM)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpTensorReadARM)].operands.push(OperandLiteralNumber, "'Tensor Operand'", true);
-        InstructionDesc[enumCast(Op::OpTensorReadARM)].operands.push(OperandVariableIds, "'Tensor Operands'");
-
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].operands.push(OperandId, "'Tensor'");
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].operands.push(OperandId, "'Coordinate'");
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].operands.push(OperandId, "'Object'");
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].operands.push(OperandLiteralNumber, "'Tensor Operand'", true);
-        InstructionDesc[enumCast(Op::OpTensorWriteARM)].operands.push(OperandVariableIds, "'Tensor Operands'");
-
-        InstructionDesc[enumCast(Op::OpTensorQuerySizeARM)].operands.push(OperandId, "'Tensor'");
-        InstructionDesc[enumCast(Op::OpTensorQuerySizeARM)].operands.push(OperandId, "'Dimension'", true);
-
-        InstructionDesc[enumCast(Op::OpTypeHitObjectEXT)].setResultAndType(true, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleNV)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleNV)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderRecordBufferHandleEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintEXT)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintEXT)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHintEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectEXT)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectEXT)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpReorderThreadWithHitObjectEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetCurrentTimeEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetCurrentTimeEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetHitKindEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetHitKindEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetPrimitiveIndexEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetPrimitiveIndexEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetGeometryIndexEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetGeometryIndexEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceIdEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceIdEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceCustomIndexEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetInstanceCustomIndexEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayDirectionEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayDirectionEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayOriginEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectRayOriginEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayDirectionEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayDirectionEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayOriginEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldRayOriginEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldToObjectEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetWorldToObjectEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectToWorldEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetObjectToWorldEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMaxEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMaxEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMinEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayTMinEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayFlagsEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetRayFlagsEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderBindingTableRecordIndexEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetShaderBindingTableRecordIndexEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsEmptyEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsEmptyEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsHitEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsHitEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectIsMissEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectIsMissEXT)].setResultAndType(true, true);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesEXT)].operands.push(OperandId, "'HitObjectAttribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetAttributesEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectExecuteShaderEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'SBT Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'SBT Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].operands.push(OperandId, "'Current Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordMissMotionEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordEmptyEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordEmptyEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceRayMotionEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectSetShaderBindingTableRecordIndexEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectSetShaderBindingTableRecordIndexEXT)].operands.push(OperandId, "'SBT Record Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectSetShaderBindingTableRecordIndexEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectReorderExecuteShaderEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectReorderExecuteShaderEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectReorderExecuteShaderEXT)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpHitObjectReorderExecuteShaderEXT)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpHitObjectReorderExecuteShaderEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceReorderExecuteEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Acceleration Structure'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'RayFlags'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Cullmask'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'SBT Record Offset'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'SBT Record Stride'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Miss Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Origin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'TMin'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Direction'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'TMax'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Time'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Payload'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Hint'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].operands.push(OperandId, "'Bits'");
-        InstructionDesc[enumCast(Op::OpHitObjectTraceMotionReorderExecuteEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectRecordFromQueryEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordFromQueryEXT)].operands.push(OperandId, "'RayQuery'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordFromQueryEXT)].operands.push(OperandId, "'SBT Record Index'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordFromQueryEXT)].operands.push(OperandId, "'HitObjectAttribute'");
-        InstructionDesc[enumCast(Op::OpHitObjectRecordFromQueryEXT)].setResultAndType(false, false);
-
-        InstructionDesc[enumCast(Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT)].operands.push(OperandId, "'HitObject'");
-        InstructionDesc[enumCast(Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT)].setResultAndType(true, true);
+        InstructionDesc[OpCooperativeMatrixMulAddKHR].operands.push(OperandId, "'A'");
+        InstructionDesc[OpCooperativeMatrixMulAddKHR].operands.push(OperandId, "'B'");
+        InstructionDesc[OpCooperativeMatrixMulAddKHR].operands.push(OperandId, "'C'");
+        InstructionDesc[OpCooperativeMatrixMulAddKHR].operands.push(OperandCooperativeMatrixOperands, "'Cooperative Matrix Operands'", true);
 
+        InstructionDesc[OpCooperativeMatrixLengthKHR].operands.push(OperandId, "'Type'");
+
+        InstructionDesc[OpDemoteToHelperInvocationEXT].setResultAndType(false, false);
+
+        InstructionDesc[OpReadClockKHR].operands.push(OperandScope, "'Scope'");
+
+        InstructionDesc[OpTypeHitObjectNV].setResultAndType(true, false);
+
+        InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].setResultAndType(true, true);
+
+        InstructionDesc[OpReorderThreadWithHintNV].operands.push(OperandId, "'Hint'");
+        InstructionDesc[OpReorderThreadWithHintNV].operands.push(OperandId, "'Bits'");
+        InstructionDesc[OpReorderThreadWithHintNV].setResultAndType(false, false);
+
+        InstructionDesc[OpReorderThreadWithHitObjectNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpReorderThreadWithHitObjectNV].operands.push(OperandId, "'Hint'");
+        InstructionDesc[OpReorderThreadWithHitObjectNV].operands.push(OperandId, "'Bits'");
+        InstructionDesc[OpReorderThreadWithHitObjectNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectGetCurrentTimeNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetCurrentTimeNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetHitKindNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetHitKindNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetPrimitiveIndexNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetPrimitiveIndexNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetGeometryIndexNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetGeometryIndexNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetInstanceIdNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetInstanceIdNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetInstanceCustomIndexNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetInstanceCustomIndexNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetObjectRayDirectionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetObjectRayDirectionNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetObjectRayOriginNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetObjectRayOriginNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetWorldRayDirectionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetWorldRayDirectionNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetWorldRayOriginNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetWorldRayOriginNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetWorldToObjectNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetWorldToObjectNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetObjectToWorldNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetObjectToWorldNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetRayTMaxNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetRayTMaxNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetRayTMinNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetRayTMinNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetShaderBindingTableRecordIndexNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetShaderBindingTableRecordIndexNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectIsEmptyNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectIsEmptyNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectIsHitNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectIsHitNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectIsMissNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectIsMissNV].setResultAndType(true, true);
+
+        InstructionDesc[OpHitObjectGetAttributesNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectGetAttributesNV].operands.push(OperandId, "'HitObjectAttribute'");
+        InstructionDesc[OpHitObjectGetAttributesNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpHitObjectExecuteShaderNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'InstanceId'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'PrimitiveId'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'GeometryIndex'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'HitKind'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'HitObject Attribute'");
+        InstructionDesc[OpHitObjectRecordHitNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'InstanceId'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'PrimitiveId'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'GeometryIndex'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'HitKind'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'Current Time'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].operands.push(OperandId, "'HitObject Attribute'");
+        InstructionDesc[OpHitObjectRecordHitMotionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'InstanceId'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'PrimitiveId'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'GeometryIndex'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'HitKind'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'SBT Record Index'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].operands.push(OperandId, "'HitObject Attribute'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'InstanceId'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'PrimitiveId'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'GeometryIndex'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'HitKind'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'SBT Record Index'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'Current Time'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].operands.push(OperandId, "'HitObject Attribute'");
+        InstructionDesc[OpHitObjectRecordHitWithIndexMotionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'SBT Index'");
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordMissNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordMissNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'SBT Index'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].operands.push(OperandId, "'Current Time'");
+        InstructionDesc[OpHitObjectRecordMissMotionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectRecordEmptyNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectRecordEmptyNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'RayFlags'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Cullmask'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Miss Index'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectTraceRayNV].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpHitObjectTraceRayNV].setResultAndType(false, false);
+
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'HitObject'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'RayFlags'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Cullmask'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'SBT Record Offset'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'SBT Record Stride'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Miss Index'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Origin'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'TMin'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Direction'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'TMax'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Time'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].operands.push(OperandId, "'Payload'");
+        InstructionDesc[OpHitObjectTraceRayMotionNV].setResultAndType(false, false);
+
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].operands.push(OperandId, "'Instance ID'");
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].operands.push(OperandId, "'Geometry Index'");
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].operands.push(OperandId, "'Primitive Index'");
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].operands.push(OperandId, "'Barycentrics'");
+        InstructionDesc[OpFetchMicroTriangleVertexBarycentricNV].setResultAndType(true, true);
+
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].operands.push(OperandId, "'Acceleration Structure'");
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].operands.push(OperandId, "'Instance ID'");
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].operands.push(OperandId, "'Geometry Index'");
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].operands.push(OperandId, "'Primitive Index'");
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].operands.push(OperandId, "'Barycentrics'");
+        InstructionDesc[OpFetchMicroTriangleVertexPositionNV].setResultAndType(true, true);
+
+        InstructionDesc[OpColorAttachmentReadEXT].operands.push(OperandId, "'Attachment'");
+        InstructionDesc[OpColorAttachmentReadEXT].operands.push(OperandId, "'Sample'", true);
+        InstructionDesc[OpStencilAttachmentReadEXT].operands.push(OperandId, "'Sample'", true);
+        InstructionDesc[OpDepthAttachmentReadEXT].operands.push(OperandId, "'Sample'", true);
+
+        InstructionDesc[OpImageSampleWeightedQCOM].operands.push(OperandId, "'source texture'");
+        InstructionDesc[OpImageSampleWeightedQCOM].operands.push(OperandId, "'texture coordinates'");
+        InstructionDesc[OpImageSampleWeightedQCOM].operands.push(OperandId, "'weights texture'");
+        InstructionDesc[OpImageSampleWeightedQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageSampleWeightedQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBoxFilterQCOM].operands.push(OperandId, "'source texture'");
+        InstructionDesc[OpImageBoxFilterQCOM].operands.push(OperandId, "'texture coordinates'");
+        InstructionDesc[OpImageBoxFilterQCOM].operands.push(OperandId, "'box size'");
+        InstructionDesc[OpImageBoxFilterQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBoxFilterQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchSADQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchSADQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchSSDQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchSSDQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchWindowSSDQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchWindowSADQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchGatherSSDQCOM].setResultAndType(true, true);
+
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandId, "'target texture'");
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandId, "'target coordinates'");
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandId, "'reference texture'");
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandId, "'reference coordinates'");
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandId, "'block size'");
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].operands.push(OperandImageOperands, "", true);
+        InstructionDesc[OpImageBlockMatchGatherSADQCOM].setResultAndType(true, true);
     });
 }
 
-} // end spv namespace
+}; // end spv namespace
diff --git a/engine/thirdparty/glslang/SPIRV/doc.h b/engine/thirdparty/glslang/SPIRV/doc.h
index c818308e..52152991 100644
--- a/engine/thirdparty/glslang/SPIRV/doc.h
+++ b/engine/thirdparty/glslang/SPIRV/doc.h
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "spirv.hpp11"
+#include "spirv.hpp"
 
 #include <vector>
 
@@ -157,7 +157,6 @@ enum OperandClass {
     OperandKernelProfilingInfo,
     OperandCapability,
     OperandCooperativeMatrixOperands,
-    OperandTensorAddressingOperands,
 
     OperandOpcode,
 
diff --git a/engine/thirdparty/glslang/SPIRV/hex_float.h b/engine/thirdparty/glslang/SPIRV/hex_float.h
index c2259e3f..785e8af1 100644
--- a/engine/thirdparty/glslang/SPIRV/hex_float.h
+++ b/engine/thirdparty/glslang/SPIRV/hex_float.h
@@ -50,52 +50,6 @@ class Float16 {
   uint16_t val;
 };
 
-class FloatE5M2 {
- public:
-  FloatE5M2(uint8_t v) : val(v) {}
-  FloatE5M2() {}
-  static bool isNan(const FloatE5M2& val) {
-    return ((val.val & 0x7C) == 0x7C) && ((val.val & 0x3) != 0);
-  }
-  // Returns true if the given value is any kind of infinity.
-  static bool isInfinity(const FloatE5M2& val) {
-    return ((val.val & 0x7C) == 0x7C) && ((val.val & 0x3) == 0);
-  }
-  FloatE5M2(const FloatE5M2& other) { val = other.val; }
-  uint8_t get_value() const { return val; }
-
-  // Returns the maximum normal value.
-  static FloatE5M2 max() { return FloatE5M2(0x7B); }
-  // Returns the lowest normal value.
-  static FloatE5M2 lowest() { return FloatE5M2(0xFB); }
-
- private:
-  uint8_t val;
-};
-
-class FloatE4M3 {
- public:
-  FloatE4M3(uint8_t v) : val(v) {}
-  FloatE4M3() {}
-  static bool isNan(const FloatE4M3& val) {
-    return (val.val & 0x7F) == 0x7F;
-  }
-  // Returns true if the given value is any kind of infinity.
-  static bool isInfinity(const FloatE4M3&) {
-    return false;
-  }
-  FloatE4M3(const FloatE4M3& other) { val = other.val; }
-  uint8_t get_value() const { return val; }
-
-  // Returns the maximum normal value.
-  static FloatE4M3 max() { return FloatE4M3(0x7E); }
-  // Returns the lowest normal value.
-  static FloatE4M3 lowest() { return FloatE4M3(0xFE); }
-
- private:
-  uint8_t val;
-};
-
 // To specialize this type, you must override uint_type to define
 // an unsigned integer that can fit your floating point type.
 // You must also add a isNan function that returns true if
@@ -141,30 +95,6 @@ struct FloatProxyTraits<Float16> {
   static Float16 lowest() { return Float16::lowest(); }
 };
 
-template <>
-struct FloatProxyTraits<FloatE5M2> {
-  typedef uint8_t uint_type;
-  static bool isNan(FloatE5M2 f) { return FloatE5M2::isNan(f); }
-  // Returns true if the given value is any kind of infinity.
-  static bool isInfinity(FloatE5M2 f) { return FloatE5M2::isInfinity(f); }
-  // Returns the maximum normal value.
-  static FloatE5M2 max() { return FloatE5M2::max(); }
-  // Returns the lowest normal value.
-  static FloatE5M2 lowest() { return FloatE5M2::lowest(); }
-};
-
-template <>
-struct FloatProxyTraits<FloatE4M3> {
-  typedef uint8_t uint_type;
-  static bool isNan(FloatE4M3 f) { return FloatE4M3::isNan(f); }
-  // Returns true if the given value is any kind of infinity.
-  static bool isInfinity(FloatE4M3 f) { return FloatE4M3::isInfinity(f); }
-  // Returns the maximum normal value.
-  static FloatE4M3 max() { return FloatE4M3::max(); }
-  // Returns the lowest normal value.
-  static FloatE4M3 lowest() { return FloatE4M3::lowest(); }
-};
-
 // Since copying a floating point number (especially if it is NaN)
 // does not guarantee that bits are preserved, this class lets us
 // store the type and use it as a float when necessary.
@@ -252,7 +182,6 @@ struct HexFloatTraits {
   // The bias of the exponent. (How much we need to subtract from the stored
   // value to get the correct value.)
   static const uint32_t exponent_bias = 0;
-  static bool supportsInfinity() { return true; }
 };
 
 // Traits for IEEE float.
@@ -267,7 +196,6 @@ struct HexFloatTraits<FloatProxy<float>> {
   static const uint_type num_exponent_bits = 8;
   static const uint_type num_fraction_bits = 23;
   static const uint_type exponent_bias = 127;
-  static bool supportsInfinity() { return true; }
 };
 
 // Traits for IEEE double.
@@ -282,7 +210,6 @@ struct HexFloatTraits<FloatProxy<double>> {
   static const uint_type num_exponent_bits = 11;
   static const uint_type num_fraction_bits = 52;
   static const uint_type exponent_bias = 1023;
-  static bool supportsInfinity() { return true; }
 };
 
 // Traits for IEEE half.
@@ -297,33 +224,6 @@ struct HexFloatTraits<FloatProxy<Float16>> {
   static const uint_type num_exponent_bits = 5;
   static const uint_type num_fraction_bits = 10;
   static const uint_type exponent_bias = 15;
-  static bool supportsInfinity() { return true; }
-};
-
-template <>
-struct HexFloatTraits<FloatProxy<FloatE5M2>> {
-  typedef uint8_t uint_type;
-  typedef int8_t int_type;
-  typedef uint8_t underlying_type;
-  typedef uint8_t native_type;
-  static const uint_type num_used_bits = 8;
-  static const uint_type num_exponent_bits = 5;
-  static const uint_type num_fraction_bits = 2;
-  static const uint_type exponent_bias = 15;
-  static bool supportsInfinity() { return true; }
-};
-
-template <>
-struct HexFloatTraits<FloatProxy<FloatE4M3>> {
-  typedef uint8_t uint_type;
-  typedef int8_t int_type;
-  typedef uint8_t underlying_type;
-  typedef uint8_t native_type;
-  static const uint_type num_used_bits = 8;
-  static const uint_type num_exponent_bits = 4;
-  static const uint_type num_fraction_bits = 3;
-  static const uint_type exponent_bias = 7;
-  static bool supportsInfinity() { return false; }
 };
 
 enum round_direction {
@@ -343,7 +243,6 @@ class HexFloat {
   typedef typename Traits::int_type int_type;
   typedef typename Traits::underlying_type underlying_type;
   typedef typename Traits::native_type native_type;
-  using Traits_T = Traits;
 
   explicit HexFloat(T f) : value_(f) {}
 
@@ -685,22 +584,14 @@ class HexFloat {
         (getBits() & exponent_mask) == exponent_mask && significand != 0;
     bool is_inf =
         !is_nan &&
-        (((exponent + carried) > static_cast<int_type>(other_T::exponent_bias) && other_T::Traits_T::supportsInfinity()) ||
-         ((exponent + carried) > static_cast<int_type>(other_T::exponent_bias + 1) && !other_T::Traits_T::supportsInfinity()) ||
+        ((exponent + carried) > static_cast<int_type>(other_T::exponent_bias) ||
          (significand == 0 && (getBits() & exponent_mask) == exponent_mask));
 
     // If we are Nan or Inf we should pass that through.
     if (is_inf) {
-      if (other_T::Traits_T::supportsInfinity()) {
-        // encode as +/-inf
-        other.set_value(BitwiseCast<typename other_T::underlying_type>(
-            static_cast<typename other_T::uint_type>(
-                (negate ? other_T::sign_mask : 0) | other_T::exponent_mask)));
-      } else {
-        // encode as +/-nan
-        other.set_value(BitwiseCast<typename other_T::underlying_type>(
-            static_cast<typename other_T::uint_type>(negate ? ~0 : ~other_T::sign_mask)));
-      }
+      other.set_value(BitwiseCast<typename other_T::underlying_type>(
+          static_cast<typename other_T::uint_type>(
+              (negate ? other_T::sign_mask : 0) | other_T::exponent_mask)));
       return;
     }
     if (is_nan) {
diff --git a/engine/thirdparty/glslang/SPIRV/spvIR.h b/engine/thirdparty/glslang/SPIRV/spvIR.h
index f1039cfd..4c353cfa 100644
--- a/engine/thirdparty/glslang/SPIRV/spvIR.h
+++ b/engine/thirdparty/glslang/SPIRV/spvIR.h
@@ -47,7 +47,7 @@
 #ifndef spvIR_H
 #define spvIR_H
 
-#include "spirv.hpp11"
+#include "spirv.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -67,7 +67,7 @@ class Module;
 const Id NoResult = 0;
 const Id NoType = 0;
 
-const Decoration NoPrecision = Decoration::Max;
+const Decoration NoPrecision = DecorationMax;
 
 #ifdef __GNUC__
 #   define POTENTIALLY_UNUSED __attribute__((unused))
@@ -77,19 +77,15 @@ const Decoration NoPrecision = Decoration::Max;
 
 POTENTIALLY_UNUSED
 const MemorySemanticsMask MemorySemanticsAllMemory =
-                (MemorySemanticsMask)(MemorySemanticsMask::UniformMemory |
-                                      MemorySemanticsMask::WorkgroupMemory |
-                                      MemorySemanticsMask::AtomicCounterMemory | 
-                                      MemorySemanticsMask::ImageMemory);
+                (MemorySemanticsMask)(MemorySemanticsUniformMemoryMask |
+                                      MemorySemanticsWorkgroupMemoryMask |
+                                      MemorySemanticsAtomicCounterMemoryMask |
+                                      MemorySemanticsImageMemoryMask);
 
 struct IdImmediate {
     bool isId;      // true if word is an Id, false if word is an immediate
     unsigned word;
     IdImmediate(bool i, unsigned w) : isId(i), word(w) {}
-    IdImmediate(bool i, spv::MemoryAccessMask w) : isId(i), word((unsigned)w) {}
-    IdImmediate(bool i, spv::TensorAddressingOperandsMask w) : isId(i), word((unsigned)w) {}
-    IdImmediate(bool i, spv::ImageOperandsMask w) : isId(i), word((unsigned)w) {}
-    IdImmediate(bool i, spv::CooperativeMatrixOperandsMask w) : isId(i), word((unsigned)w) {}
 };
 
 //
@@ -111,79 +107,10 @@ public:
         operands.push_back(id);
         idOperand.push_back(true);
     }
-    // This method is potentially dangerous as it can break assumptions
-    // about SSA and lack of forward references.
-    void setIdOperand(unsigned idx, Id id) {
-        assert(id);
-        assert(idOperand[idx]);
-        operands[idx] = id;
-    }
-
     void addImmediateOperand(unsigned int immediate) {
         operands.push_back(immediate);
         idOperand.push_back(false);
     }
-
-    void addImmediateOperand(spv::StorageClass immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::ExecutionMode immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::ExecutionModel immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::Decoration immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::LinkageType immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::MemoryAccessMask immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::Capability immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::AddressingModel immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::MemoryModel immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::FPEncoding immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::SourceLanguage immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::Dim immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::FunctionControlMask immediate){
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::SelectionControlMask immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
-    void addImmediateOperand(spv::LoopControlMask immediate) {
-        addImmediateOperand((unsigned)immediate);
-    }
-
     void setImmediateOperand(unsigned idx, unsigned int immediate) {
         assert(!idOperand[idx]);
         operands[idx] = immediate;
@@ -193,7 +120,7 @@ public:
     {
         unsigned int word = 0;
         unsigned int shiftAmount = 0;
-        unsigned char c;
+        char c;
 
         do {
             c = *(str++);
@@ -243,7 +170,7 @@ public:
         wordCount += (unsigned int)operands.size();
 
         // Write out the beginning of the instruction
-        out.push_back(((wordCount) << WordCountShift) | (unsigned)opCode);
+        out.push_back(((wordCount) << WordCountShift) | opCode);
         if (typeId)
             out.push_back(typeId);
         if (resultId)
@@ -254,15 +181,6 @@ public:
             out.push_back(operands[op]);
     }
 
-    const char *getNameString() const {
-        if (opCode == Op::OpString) {
-            return (const char *)&operands[0];
-        } else {
-            assert(opCode == Op::OpName);
-            return (const char *)&operands[1];
-        }
-    }
-
 protected:
     Instruction(const Instruction&);
     Id resultId;
@@ -320,7 +238,7 @@ public:
     void addLocalVariable(std::unique_ptr<Instruction> inst) { localVariables.push_back(std::move(inst)); }
     const std::vector<Block*>& getPredecessors() const { return predecessors; }
     const std::vector<Block*>& getSuccessors() const { return successors; }
-    std::vector<std::unique_ptr<Instruction> >& getInstructions() {
+    const std::vector<std::unique_ptr<Instruction> >& getInstructions() const {
         return instructions;
     }
     const std::vector<std::unique_ptr<Instruction> >& getLocalVariables() const { return localVariables; }
@@ -331,8 +249,8 @@ public:
         if (instructions.size() < 2) return nullptr;
         const Instruction* nextToLast = (instructions.cend() - 2)->get();
         switch (nextToLast->getOpCode()) {
-            case Op::OpSelectionMerge:
-            case Op::OpLoopMerge:
+            case OpSelectionMerge:
+            case OpLoopMerge:
                 return nextToLast;
             default:
                 return nullptr;
@@ -349,7 +267,7 @@ public:
         assert(instructions.size() > 0);
         instructions.resize(1);
         successors.clear();
-        addInstruction(std::unique_ptr<Instruction>(new Instruction(Op::OpUnreachable)));
+        addInstruction(std::unique_ptr<Instruction>(new Instruction(OpUnreachable)));
     }
     // Change this block into a canonical dead continue target branching to the
     // given header ID.  Delete instructions as necessary.  A canonical dead continue
@@ -363,7 +281,7 @@ public:
         successors.clear();
         // Add OpBranch back to the header.
         assert(header != nullptr);
-        Instruction* branch = new Instruction(Op::OpBranch);
+        Instruction* branch = new Instruction(OpBranch);
         branch->addIdOperand(header->getId());
         addInstruction(std::unique_ptr<Instruction>(branch));
         successors.push_back(header);
@@ -372,14 +290,14 @@ public:
     bool isTerminated() const
     {
         switch (instructions.back()->getOpCode()) {
-        case Op::OpBranch:
-        case Op::OpBranchConditional:
-        case Op::OpSwitch:
-        case Op::OpKill:
-        case Op::OpTerminateInvocation:
-        case Op::OpReturn:
-        case Op::OpReturnValue:
-        case Op::OpUnreachable:
+        case OpBranch:
+        case OpBranchConditional:
+        case OpSwitch:
+        case OpKill:
+        case OpTerminateInvocation:
+        case OpReturn:
+        case OpReturnValue:
+        case OpUnreachable:
             return true;
         default:
             return false;
@@ -476,14 +394,14 @@ public:
     Id getFuncTypeId() const { return functionInstruction.getIdOperand(1); }
     void setReturnPrecision(Decoration precision)
     {
-        if (precision == Decoration::RelaxedPrecision)
+        if (precision == DecorationRelaxedPrecision)
             reducedPrecisionReturn = true;
     }
     Decoration getReturnPrecision() const
-        { return reducedPrecisionReturn ? Decoration::RelaxedPrecision : NoPrecision; }
+        { return reducedPrecisionReturn ? DecorationRelaxedPrecision : NoPrecision; }
 
     void setDebugLineInfo(Id fileName, int line, int column) {
-        lineInstruction = std::unique_ptr<Instruction>{new Instruction(Op::OpLine)};
+        lineInstruction = std::unique_ptr<Instruction>{new Instruction(OpLine)};
         lineInstruction->reserveOperands(3);
         lineInstruction->addIdOperand(fileName);
         lineInstruction->addImmediateOperand(line);
@@ -496,13 +414,13 @@ public:
 
     void addParamPrecision(unsigned param, Decoration precision)
     {
-        if (precision == Decoration::RelaxedPrecision)
+        if (precision == DecorationRelaxedPrecision)
             reducedPrecisionParams.insert(param);
     }
     Decoration getParamPrecision(unsigned param) const
     {
         return reducedPrecisionParams.find(param) != reducedPrecisionParams.end() ?
-            Decoration::RelaxedPrecision : NoPrecision;
+            DecorationRelaxedPrecision : NoPrecision;
     }
 
     void dump(std::vector<unsigned int>& out) const
@@ -521,7 +439,7 @@ public:
 
         // Blocks
         inReadableOrder(blocks[0], [&out](const Block* b, ReachReason, Block*) { b->dump(out); });
-        Instruction end(0, 0, Op::OpFunctionEnd);
+        Instruction end(0, 0, OpFunctionEnd);
         end.dump(out);
     }
 
@@ -574,7 +492,7 @@ public:
     }
     StorageClass getStorageClass(Id typeId) const
     {
-        assert(idToInstruction[typeId]->getOpCode() == spv::Op::OpTypePointer);
+        assert(idToInstruction[typeId]->getOpCode() == spv::OpTypePointer);
         return (StorageClass)idToInstruction[typeId]->getImmediateOperand(0);
     }
 
@@ -603,13 +521,13 @@ protected:
 // - all the OpFunctionParameter instructions
 __inline Function::Function(Id id, Id resultType, Id functionType, Id firstParamId, LinkageType linkage, const std::string& name, Module& parent)
     : parent(parent), lineInstruction(nullptr),
-      functionInstruction(id, resultType, Op::OpFunction), implicitThis(false),
+      functionInstruction(id, resultType, OpFunction), implicitThis(false),
       reducedPrecisionReturn(false),
       linkType(linkage)
 {
     // OpFunction
     functionInstruction.reserveOperands(2);
-    functionInstruction.addImmediateOperand(FunctionControlMask::MaskNone);
+    functionInstruction.addImmediateOperand(FunctionControlMaskNone);
     functionInstruction.addIdOperand(functionType);
     parent.mapInstruction(&functionInstruction);
     parent.addFunction(this);
@@ -618,13 +536,13 @@ __inline Function::Function(Id id, Id resultType, Id functionType, Id firstParam
     Instruction* typeInst = parent.getInstruction(functionType);
     int numParams = typeInst->getNumOperands() - 1;
     for (int p = 0; p < numParams; ++p) {
-        Instruction* param = new Instruction(firstParamId + p, typeInst->getIdOperand(p + 1), Op::OpFunctionParameter);
+        Instruction* param = new Instruction(firstParamId + p, typeInst->getIdOperand(p + 1), OpFunctionParameter);
         parent.mapInstruction(param);
         parameterInstructions.push_back(param);
     }
 
     // If importing/exporting, save the function name (without the mangled parameters) for the linkage decoration
-    if (linkType != LinkageType::Max) {
+    if (linkType != LinkageTypeMax) {
         exportName = name.substr(0, name.find_first_of('('));
     }
 }
@@ -638,7 +556,7 @@ __inline void Function::addLocalVariable(std::unique_ptr<Instruction> inst)
 
 __inline Block::Block(Id id, Function& parent) : parent(parent), unreachable(false)
 {
-    instructions.push_back(std::unique_ptr<Instruction>(new Instruction(id, NoType, Op::OpLabel)));
+    instructions.push_back(std::unique_ptr<Instruction>(new Instruction(id, NoType, OpLabel)));
     instructions.back()->setBlock(this);
     parent.getParent().mapInstruction(instructions.back().get());
 }
diff --git a/engine/thirdparty/glslang/SPIRV/spvUtil.h b/engine/thirdparty/glslang/SPIRV/spvUtil.h
deleted file mode 100644
index d772a30d..00000000
--- a/engine/thirdparty/glslang/SPIRV/spvUtil.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (C) 2025 Jan Kelemen
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-#pragma once
-#ifndef spvUtil_H
-#define spvUtil_H
-
-#include <cstdint>
-#include <type_traits>
-
-#include "spirv.hpp11"
-
-namespace spv {
-__inline uint32_t operator&(uint32_t value, spv::MemoryAccessMask mask) { return value & (unsigned)mask; }
-
-__inline bool operator==(uint32_t word, spv::FPEncoding encoding) { return word == (unsigned)encoding; }
-__inline bool operator!=(uint32_t word, spv::FPEncoding encoding) { return !(word == encoding); }
-
-__inline bool operator==(uint32_t word, spv::Decoration decoration) { return word == (unsigned)decoration; }
-__inline bool operator!=(uint32_t word, spv::Decoration decoration) { return !(word == decoration); }
-
-__inline bool operator==(uint32_t word, spv::Op op) { return word == (unsigned)op; }
-__inline bool operator!=(uint32_t word, spv::Op op) { return !(word == op); }
-
-__inline bool operator==(uint32_t word, spv::StorageClass storage) { return word == (unsigned)storage; }
-__inline bool operator!=(uint32_t word, spv::StorageClass storage) { return !(word == storage); }
-
-__inline bool anySet(spv::MemoryAccessMask value, spv::MemoryAccessMask mask)
-{
-    return (value & mask) != spv::MemoryAccessMask::MaskNone;
-}
-
-__inline bool anySet(spv::ImageOperandsMask value, spv::ImageOperandsMask mask)
-{
-    return (value & mask) != spv::ImageOperandsMask::MaskNone;
-}
-
-__inline bool anySet(spv::MemorySemanticsMask value, spv::MemorySemanticsMask mask)
-{
-    return (value & mask) != spv::MemorySemanticsMask::MaskNone;
-}
-
-__inline void addMask(uint32_t& word, spv::TensorAddressingOperandsMask mask) { word |= (unsigned)mask; }
-
-__inline void addMask(spv::CooperativeMatrixOperandsMask& word, spv::CooperativeMatrixOperandsMask mask)
-{
-    word = word | mask;
-}
-
-template<typename Enum, typename To = std::underlying_type_t<Enum>>
-__inline To enumCast(Enum value)
-{
-    return static_cast<To>(value);
-}
-}
-
-#endif // spvUtil_H
diff --git a/engine/thirdparty/glslang/glslang/Include/BaseTypes.h b/engine/thirdparty/glslang/glslang/Include/BaseTypes.h
index 3678afe8..64bffa89 100644
--- a/engine/thirdparty/glslang/glslang/Include/BaseTypes.h
+++ b/engine/thirdparty/glslang/glslang/Include/BaseTypes.h
@@ -49,9 +49,6 @@ enum TBasicType {
     EbtFloat,
     EbtDouble,
     EbtFloat16,
-    EbtBFloat16,
-    EbtFloatE5M2,
-    EbtFloatE4M3,
     EbtInt8,
     EbtUint8,
     EbtInt16,
@@ -69,13 +66,7 @@ enum TBasicType {
     EbtReference,
     EbtRayQuery,
     EbtHitObjectNV,
-    EbtHitObjectEXT,
     EbtCoopmat,
-    EbtFunction,
-    EbtTensorLayoutNV,
-    EbtTensorViewNV,
-    EbtCoopvecNV,
-    EbtTensorARM,
     // SPIR-V type defined by spirv_type
     EbtSpirvType,
 
@@ -112,7 +103,6 @@ enum TStorageQualifier {
     EvqCallableData,
     EvqCallableDataIn,
     EvqHitObjectAttrNV,
-    EvqHitObjectAttrEXT,
 
     EvqtaskPayloadSharedEXT,
 
@@ -278,6 +268,7 @@ enum TBuiltInVariable {
     EbvRayTmin,
     EbvRayTmax,
     EbvCullMask,
+    EbvHitT,
     EbvHitKind,
     EbvObjectToWorld,
     EbvObjectToWorld3x4,
@@ -285,7 +276,6 @@ enum TBuiltInVariable {
     EbvWorldToObject3x4,
     EbvIncomingRayFlags,
     EbvCurrentRayTimeNV,
-    EbvClusterIDNV,
     // barycentrics
     EbvBaryCoordNV,
     EbvBaryCoordNoPerspNV,
@@ -306,13 +296,6 @@ enum TBuiltInVariable {
     EbvHitKindFrontFacingMicroTriangleNV,
     EbvHitKindBackFacingMicroTriangleNV,
 
-    EbvHitIsSphereNV,
-    EbvHitIsLSSNV,
-    EbvHitSpherePositionNV,
-    EbvHitSphereRadiusNV,
-    EbvHitLSSPositionsNV,
-    EbvHitLSSRadiiNV,
-
     //GL_EXT_mesh_shader
     EbvPrimitivePointIndicesEXT,
     EbvPrimitiveLineIndicesEXT,
@@ -349,11 +332,6 @@ enum TBuiltInVariable {
 
     EbvPositionFetch,
 
-    // SPV_QCOM_tile_shading
-    EbvTileOffsetQCOM,
-    EbvTileDimensionQCOM,
-    EbvTileApronSizeQCOM,
-
     EbvLast
 };
 
@@ -400,8 +378,7 @@ __inline const char* GetStorageQualifierString(TStorageQualifier q)
     case EvqCallableData:   return "callableDataNV";   break;
     case EvqCallableDataIn: return "callableDataInNV"; break;
     case EvqtaskPayloadSharedEXT: return "taskPayloadSharedEXT"; break;
-    case EvqHitObjectAttrNV: return "hitObjectAttributeNV"; break;
-    case EvqHitObjectAttrEXT:return "hitObjectAttributeEXT"; break;
+    case EvqHitObjectAttrNV:return "hitObjectAttributeNV"; break;
     default:                return "unknown qualifier";
     }
 }
@@ -518,12 +495,12 @@ __inline const char* GetBuiltInVariableString(TBuiltInVariable v)
     case EbvObjectRayDirection:         return "ObjectRayDirectionNV";
     case EbvRayTmin:                    return "ObjectRayTminNV";
     case EbvRayTmax:                    return "ObjectRayTmaxNV";
+    case EbvHitT:                       return "HitTNV";
     case EbvHitKind:                    return "HitKindNV";
     case EbvIncomingRayFlags:           return "IncomingRayFlagsNV";
     case EbvObjectToWorld:              return "ObjectToWorldNV";
     case EbvWorldToObject:              return "WorldToObjectNV";
     case EbvCurrentRayTimeNV:           return "CurrentRayTimeNV";
-    case EbvClusterIDNV:                return "ClusterIDNV";
 
     case EbvBaryCoordEXT:
     case EbvBaryCoordNV:                return "BaryCoordKHR";
@@ -555,13 +532,6 @@ __inline const char* GetBuiltInVariableString(TBuiltInVariable v)
     case EbvHitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
     case EbvHitKindBackFacingMicroTriangleNV:  return "HitKindBackFacingMicroTriangleNV";
 
-    case EbvHitIsSphereNV:              return "HitIsSphereNV";
-    case EbvHitIsLSSNV:                 return "HitIsLSSNV";
-    case EbvHitSpherePositionNV:        return "HitSpherePositionNV";
-    case EbvHitSphereRadiusNV:          return "HitSphereRadiusNV";
-    case EbvHitLSSPositionsNV:          return "HitSpherePositionsNV";
-    case EbvHitLSSRadiiNV:              return "HitLSSRadiiNV";
-
     default:                      return "unknown built-in variable";
     }
 }
@@ -614,42 +584,12 @@ __inline bool isTypeFloat(TBasicType type)
     case EbtFloat:
     case EbtDouble:
     case EbtFloat16:
-    case EbtBFloat16:
-    case EbtFloatE5M2:
-    case EbtFloatE4M3:
         return true;
     default:
         return false;
     }
 }
 
-__inline uint32_t GetNumBits(TBasicType type)
-{
-    switch (type) {
-    case EbtInt8:
-    case EbtUint8:
-    case EbtFloatE5M2:
-    case EbtFloatE4M3:
-        return 8;
-    case EbtBFloat16:
-    case EbtFloat16:
-    case EbtInt16:
-    case EbtUint16:
-        return 16;
-    case EbtInt:
-    case EbtUint:
-    case EbtFloat:
-        return 32;
-    case EbtDouble:
-    case EbtInt64:
-    case EbtUint64:
-        return 64;
-    default:
-        assert(false);
-        return 0;
-    }
-}
-
 __inline int getTypeRank(TBasicType type)
 {
     int res = -1;
diff --git a/engine/thirdparty/glslang/glslang/Include/Common.h b/engine/thirdparty/glslang/glslang/Include/Common.h
index 0c142605..d1bd13b5 100644
--- a/engine/thirdparty/glslang/glslang/Include/Common.h
+++ b/engine/thirdparty/glslang/glslang/Include/Common.h
@@ -94,11 +94,6 @@ std::string to_string(const T& val) {
     #pragma warning(disable : 4201) // nameless union
 #endif
 
-// Allow compilation to WASI which does not support threads yet.
-#ifdef __wasi__ 
-#define DISABLE_THREAD_SUPPORT
-#endif
-
 #include "PoolAlloc.h"
 
 //
diff --git a/engine/thirdparty/glslang/glslang/Include/ConstantUnion.h b/engine/thirdparty/glslang/glslang/Include/ConstantUnion.h
index bf6b8a88..da4737b6 100644
--- a/engine/thirdparty/glslang/glslang/Include/ConstantUnion.h
+++ b/engine/thirdparty/glslang/glslang/Include/ConstantUnion.h
@@ -899,17 +899,6 @@ public:
         unionArray = new TConstUnionVector(size, val);
     }
 
-    TConstUnionArray* clone() const
-    {
-        TConstUnionArray *copy = new TConstUnionArray(size());
-        if (unionArray) {
-            for (const auto i : *unionArray) {
-                copy->unionArray->push_back(i);
-            }
-        }
-        return copy;
-    }
-
     int size() const { return unionArray ? (int)unionArray->size() : 0; }
     TConstUnion& operator[](size_t index) { return (*unionArray)[index]; }
     const TConstUnion& operator[](size_t index) const { return (*unionArray)[index]; }
diff --git a/engine/thirdparty/glslang/glslang/Include/InfoSink.h b/engine/thirdparty/glslang/glslang/Include/InfoSink.h
index dec05e65..137ede85 100644
--- a/engine/thirdparty/glslang/glslang/Include/InfoSink.h
+++ b/engine/thirdparty/glslang/glslang/Include/InfoSink.h
@@ -95,14 +95,10 @@ public:
         default:                   append("UNKNOWN ERROR: ");   break;
         }
     }
-    void location(const TSourceLoc& loc, bool absolute = false, bool displayColumn = false) {
+    void location(const TSourceLoc& loc, bool absolute = false) {
         const int maxSize = 24;
         char locText[maxSize];
-        if (displayColumn) {
-            snprintf(locText, maxSize, ":%d:%d", loc.line, loc.column);
-        } else {
-            snprintf(locText, maxSize, ":%d", loc.line);
-        }
+        snprintf(locText, maxSize, ":%d", loc.line);
 
         if(loc.getFilename() == nullptr && shaderFileName != nullptr && absolute) {
             //append(std::filesystem::absolute(shaderFileName).string());
@@ -123,11 +119,9 @@ public:
         append(s);
         append("\n");
     }
-    void message(TPrefixType message, const char* s, const TSourceLoc& loc, bool absolute = false,
-                 bool displayColumn = false)
-    {
+    void message(TPrefixType message, const char* s, const TSourceLoc& loc) {
         prefix(message);
-        location(loc, absolute, displayColumn);
+        location(loc);
         append(s);
         append("\n");
     }
diff --git a/engine/thirdparty/glslang/glslang/Include/PoolAlloc.h b/engine/thirdparty/glslang/glslang/Include/PoolAlloc.h
index 6b6dfd64..e84ac52c 100644
--- a/engine/thirdparty/glslang/glslang/Include/PoolAlloc.h
+++ b/engine/thirdparty/glslang/glslang/Include/PoolAlloc.h
@@ -61,8 +61,6 @@
 // class as the allocator (second) template argument.
 //
 
-#include "visibility.h"
-
 #include <cstddef>
 #include <cstring>
 #include <vector>
@@ -181,7 +179,6 @@ public:
     // Call allocate() to actually acquire memory.  Returns nullptr if no memory
     // available, otherwise a properly aligned pointer to 'numBytes' of memory.
     //
-    GLSLANG_EXPORT_FOR_TESTS
     void* allocate(size_t numBytes);
 
     //
@@ -258,7 +255,6 @@ private:
 // different times.  But a simple use is to have a global pop
 // with everyone using the same global allocator.
 //
-GLSLANG_EXPORT_FOR_TESTS
 extern TPoolAllocator& GetThreadPoolAllocator();
 void SetThreadPoolAllocator(TPoolAllocator* poolAllocator);
 
@@ -292,7 +288,7 @@ public:
 
     template<class Other>
         pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
-    
+
     pointer allocate(size_type n) {
         return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
     pointer allocate(size_type n, const void*) {
diff --git a/engine/thirdparty/glslang/glslang/Include/Types.h b/engine/thirdparty/glslang/glslang/Include/Types.h
index d3124ac8..23262285 100644
--- a/engine/thirdparty/glslang/glslang/Include/Types.h
+++ b/engine/thirdparty/glslang/glslang/Include/Types.h
@@ -85,7 +85,6 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
     bool      image : 1;  // image, combined should be false
     bool   combined : 1;  // true means texture is combined with a sampler, false means texture with no sampler
     bool    sampler : 1;  // true means a pure sampler, other fields should be clear()
-    bool   tileQCOM : 1;  // is tile shading attachment 
 
     unsigned int vectorSize : 3;  // vector return type size.
     // Some languages support structures as sample results.  Storing the whole structure in the
@@ -128,15 +127,6 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
     bool isShadow()      const { return shadow; }
     bool isArrayed()     const { return arrayed; }
 
-    bool isTileAttachmentQCOM() const { return tileQCOM; }
-
-    // For combined sampler, returns the underlying texture. Otherwise, returns identity.
-    TSampler removeCombined() const {
-        TSampler result = *this;
-        result.combined = false;
-        return result;
-    }
-
     void clear()
     {
         type = EbtVoid;
@@ -149,7 +139,6 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
         sampler = false;
         external = false;
         yuv = false;
-        tileQCOM = false;
 
 #ifdef ENABLE_HLSL
         clearReturnStruct();
@@ -231,8 +220,7 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
             isCombined() == right.isCombined() &&
          isPureSampler() == right.isPureSampler() &&
             isExternal() == right.isExternal() &&
-                 isYuv() == right.isYuv() &&
-  isTileAttachmentQCOM() == right.isTileAttachmentQCOM()
+                 isYuv() == right.isYuv()
 #ifdef ENABLE_HLSL
       && getVectorSize() == right.getVectorSize() &&
   getStructReturnIndex() == right.getStructReturnIndex()
@@ -245,9 +233,9 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
         return ! operator==(right);
     }
 
-    std::string getString() const
+    TString getString() const
     {
-        std::string s;
+        TString s;
 
         if (isPureSampler()) {
             s.append("sampler");
@@ -258,9 +246,6 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
         case EbtInt:    s.append("i");   break;
         case EbtUint:   s.append("u");   break;
         case EbtFloat16: s.append("f16"); break;
-        case EbtBFloat16: s.append("bf16"); break;
-        case EbtFloatE5M2: s.append("fe5m2"); break;
-        case EbtFloatE4M3: s.append("fe4m3"); break;
         case EbtInt8:   s.append("i8");  break;
         case EbtUint16: s.append("u8");  break;
         case EbtInt16:  s.append("i16"); break;
@@ -274,8 +259,6 @@ struct TSampler {   // misnomer now; includes images, textures without sampler,
                 s.append("attachmentEXT");
             else if (isSubpass())
                 s.append("subpass");
-            else if (isTileAttachmentQCOM())
-                s.append("attachmentQCOM");
             else
                 s.append("image");
         } else if (isCombined()) {
@@ -324,6 +307,21 @@ typedef TVector<TTypeLoc> TTypeList;
 
 typedef TVector<TString*> TIdentifierList;
 
+//
+// Following are a series of helper enums for managing layouts and qualifiers,
+// used for TPublicType, TType, others.
+//
+
+enum TLayoutPacking {
+    ElpNone,
+    ElpShared,      // default, but different than saying nothing
+    ElpStd140,
+    ElpStd430,
+    ElpPacked,
+    ElpScalar,
+    ElpCount        // If expanding, see bitfield width below
+};
+
 enum TLayoutMatrix {
     ElmNone,
     ElmRowMajor,
@@ -569,7 +567,6 @@ public:
         shadercallcoherent = false;
         nonprivate = false;
         volatil      = false;
-        nontemporal = false;
         restrict     = false;
         readonly     = false;
         writeonly    = false;
@@ -607,7 +604,6 @@ public:
     bool writeonly    : 1;
     bool coherent     : 1;
     bool volatil      : 1;
-    bool nontemporal  : 1;
     bool devicecoherent : 1;
     bool queuefamilycoherent : 1;
     bool workgroupcoherent : 1;
@@ -622,15 +618,14 @@ public:
     bool isRestrict() const { return restrict; }
     bool isCoherent() const { return coherent; }
     bool isVolatile() const { return volatil; }
-    bool isNonTemporal() const { return nontemporal; }
     bool isSample() const { return sample; }
     bool isMemory() const
     {
-        return shadercallcoherent || subgroupcoherent || workgroupcoherent || queuefamilycoherent || devicecoherent || coherent || volatil || nontemporal || restrict || readonly || writeonly || nonprivate;
+        return shadercallcoherent || subgroupcoherent || workgroupcoherent || queuefamilycoherent || devicecoherent || coherent || volatil || restrict || readonly || writeonly || nonprivate;
     }
     bool isMemoryQualifierImageAndSSBOOnly() const
     {
-        return shadercallcoherent || subgroupcoherent || workgroupcoherent || queuefamilycoherent || devicecoherent || coherent || volatil || nontemporal || restrict || readonly || writeonly;
+        return shadercallcoherent || subgroupcoherent || workgroupcoherent || queuefamilycoherent || devicecoherent || coherent || volatil || restrict || readonly || writeonly;
     }
     bool bufferReferenceNeedsVulkanMemoryModel() const
     {
@@ -825,9 +820,6 @@ public:
     bool isHitObjectAttrNV() const {
         return storage == EvqHitObjectAttrNV;
     }
-    bool isHitObjectAttrEXT() const {
-        return storage == EvqHitObjectAttrEXT;
-    }
 
     // True if this type of IO is supposed to be arrayed with extra level for per-vertex data
     bool isArrayedIo(EShLanguage language) const
@@ -864,14 +856,11 @@ public:
         layoutFullQuads = false;
         layoutQuadDeriv = false;
         layoutHitObjectShaderRecordNV = false;
-        layoutHitObjectShaderRecordEXT = false;
         layoutBindlessSampler = false;
         layoutBindlessImage = false;
         layoutBufferReferenceAlign = layoutBufferReferenceAlignEnd;
         layoutFormat = ElfNone;
 
-        layoutTileAttachmentQCOM = false;
-
         clearInterstageLayout();
 
         layoutSpecConstantId = layoutSpecConstantIdEnd;
@@ -965,7 +954,6 @@ public:
     bool layoutFullQuads;
     bool layoutQuadDeriv;
     bool layoutHitObjectShaderRecordNV;
-    bool layoutHitObjectShaderRecordEXT;
 
     // GL_EXT_spirv_intrinsics
     int spirvStorageClass;
@@ -974,8 +962,6 @@ public:
     bool layoutBindlessSampler;
     bool layoutBindlessImage;
 
-    bool layoutTileAttachmentQCOM;
-
     bool hasUniformLayout() const
     {
         return hasMatrix() ||
@@ -1077,7 +1063,6 @@ public:
     bool isFullQuads() const { return layoutFullQuads; }
     bool isQuadDeriv() const { return layoutQuadDeriv; }
     bool hasHitObjectShaderRecordNV() const { return layoutHitObjectShaderRecordNV; }
-    bool hasHitObjectShaderRecordEXT() const { return layoutHitObjectShaderRecordEXT; }
     bool hasBufferReference() const { return layoutBufferReference; }
     bool hasBufferReferenceAlign() const
     {
@@ -1095,10 +1080,6 @@ public:
     {
         return layoutBindlessImage;
     }
-    bool isTileAttachmentQCOM() const
-    {
-        return layoutTileAttachmentQCOM;
-    }
 
     // GL_EXT_spirv_intrinsics
     bool hasSpirvDecorate() const { return spirvDecorate != nullptr; }
@@ -1312,7 +1293,7 @@ public:
     }
 };
 
-// Qualifiers that don't need to be kept per object.  They have shader scope, not object scope.
+// Qualifiers that don't need to be keep per object.  They have shader scope, not object scope.
 // So, they will not be part of TType, TQualifier, etc.
 struct TShaderQualifiers {
     TLayoutGeometry geometry; // geometry/tessellation shader in/out primitives
@@ -1342,9 +1323,6 @@ struct TShaderQualifiers {
     bool layoutDerivativeGroupLinear;   // true if layout derivative_group_linearNV set
     int primitives;                     // mesh shader "max_primitives"DerivativeGroupLinear;   // true if layout derivative_group_linearNV set
     bool layoutPrimitiveCulling;        // true if layout primitive_culling set
-    bool layoutNonCoherentTileAttachmentReadQCOM; // fragment shaders -- per object
-    int  layoutTileShadingRateQCOM[3];  // compute shader
-    bool layoutTileShadingRateQCOMNotDefault[3];  // compute shader
     TLayoutDepth getDepth() const { return layoutDepth; }
     TLayoutStencil getStencil() const { return layoutStencil; }
 
@@ -1381,13 +1359,6 @@ struct TShaderQualifiers {
         layoutDerivativeGroupQuads  = false;
         layoutDerivativeGroupLinear = false;
         layoutPrimitiveCulling      = false;
-        layoutNonCoherentTileAttachmentReadQCOM = false;
-        layoutTileShadingRateQCOM[0] = 0;
-        layoutTileShadingRateQCOM[1] = 0;
-        layoutTileShadingRateQCOM[2] = 0;
-        layoutTileShadingRateQCOMNotDefault[0] = false;
-        layoutTileShadingRateQCOMNotDefault[1] = false;
-        layoutTileShadingRateQCOMNotDefault[2] = false;
         primitives                  = TQualifier::layoutNotSet;
         interlockOrdering = EioNone;
     }
@@ -1457,15 +1428,6 @@ struct TShaderQualifiers {
             interlockOrdering = src.interlockOrdering;
         if (src.layoutPrimitiveCulling)
             layoutPrimitiveCulling = src.layoutPrimitiveCulling;
-        if (src.layoutNonCoherentTileAttachmentReadQCOM)
-            layoutNonCoherentTileAttachmentReadQCOM = src.layoutNonCoherentTileAttachmentReadQCOM;
-        for (int i = 0; i < 3; ++i) {
-            if (src.layoutTileShadingRateQCOM[i] > 1)
-                layoutTileShadingRateQCOM[i] = src.layoutTileShadingRateQCOM[i];
-        }
-        for (int i = 0; i < 3; ++i) {
-            layoutTileShadingRateQCOMNotDefault[i] = src.layoutTileShadingRateQCOMNotDefault[i] || layoutTileShadingRateQCOMNotDefault[i];
-        }
     }
 };
 
@@ -1513,9 +1475,6 @@ public:
     uint32_t matrixRows  : 4;
     bool coopmatNV  : 1;
     bool coopmatKHR : 1;
-    bool coopvecNV  : 1;
-    bool tileAttachmentQCOM: 1;
-    uint32_t tensorRankARM : 4;
     TArraySizes* arraySizes;
     const TType* userDef;
     TSourceLoc loc;
@@ -1526,12 +1485,6 @@ public:
     bool isCoopmat() const { return coopmatNV || coopmatKHR; }
     bool isCoopmatNV() const { return coopmatNV; }
     bool isCoopmatKHR() const { return coopmatKHR; }
-    bool isCoopvecNV() const { return coopvecNV; }
-    bool isTensorARM() const { return tensorRankARM; }
-    bool hasTypeParameter() const { return isCoopmat() || isCoopvecNV() || isTensorARM(); }
-
-    bool isTensorLayoutNV() const { return basicType == EbtTensorLayoutNV; }
-    bool isTensorViewNV() const { return basicType == EbtTensorViewNV; }
 
     void initType(const TSourceLoc& l)
     {
@@ -1545,9 +1498,6 @@ public:
         typeParameters = nullptr;
         coopmatNV = false;
         coopmatKHR = false;
-        coopvecNV = false;
-        tileAttachmentQCOM = false;
-        tensorRankARM = 0;
         spirvType = nullptr;
     }
 
@@ -1607,8 +1557,8 @@ public:
     // for "empty" type (no args) or simple scalar/vector/matrix
     explicit TType(TBasicType t = EbtVoid, TStorageQualifier q = EvqTemporary, int vs = 1, int mc = 0, int mr = 0,
                    bool isVector = false) :
-                            basicType(t), vectorSize(static_cast<uint32_t>(vs) & 0b1111), matrixCols(static_cast<uint32_t>(mc) & 0b1111), matrixRows(static_cast<uint32_t>(mr) & 0b1111), vector1(isVector && vs == 1), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(false),
-                            tileAttachmentQCOM(false), tensorRankARM(0), arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
+                            basicType(t), vectorSize(static_cast<uint32_t>(vs) & 0b1111), matrixCols(static_cast<uint32_t>(mc) & 0b1111), matrixRows(static_cast<uint32_t>(mr) & 0b1111), vector1(isVector && vs == 1), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
+                            arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
                             spirvType(nullptr)
                             {
                                 assert(vs >= 0);
@@ -1623,8 +1573,8 @@ public:
     // for explicit precision qualifier
     TType(TBasicType t, TStorageQualifier q, TPrecisionQualifier p, int vs = 1, int mc = 0, int mr = 0,
           bool isVector = false) :
-                            basicType(t), vectorSize(static_cast<uint32_t>(vs) & 0b1111), matrixCols(static_cast<uint32_t>(mc) & 0b1111), matrixRows(static_cast<uint32_t>(mr) & 0b1111), vector1(isVector && vs == 1), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(false),
-                            tileAttachmentQCOM(false), tensorRankARM(0), arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
+                            basicType(t), vectorSize(static_cast<uint32_t>(vs) & 0b1111), matrixCols(static_cast<uint32_t>(mc) & 0b1111), matrixRows(static_cast<uint32_t>(mr) & 0b1111), vector1(isVector && vs == 1), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
+                            arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
                             spirvType(nullptr)
                             {
                                 assert(vs >= 0);
@@ -1641,8 +1591,8 @@ public:
     // for turning a TPublicType into a TType, using a shallow copy
     explicit TType(const TPublicType& p) :
                             basicType(p.basicType),
-                            vectorSize(p.vectorSize), matrixCols(p.matrixCols), matrixRows(p.matrixRows), vector1(false), coopmatNV(p.coopmatNV), coopmatKHR(p.coopmatKHR), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(p.coopvecNV),
-                            tileAttachmentQCOM(p.tileAttachmentQCOM), tensorRankARM(p.tensorRankARM), arraySizes(p.arraySizes), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(p.typeParameters),
+                            vectorSize(p.vectorSize), matrixCols(p.matrixCols), matrixRows(p.matrixRows), vector1(false), coopmatNV(p.coopmatNV), coopmatKHR(p.coopmatKHR), coopmatKHRuse(0), coopmatKHRUseValid(false),
+                            arraySizes(p.arraySizes), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(p.typeParameters),
                             spirvType(p.spirvType)
                             {
                                 if (basicType == EbtSampler)
@@ -1690,22 +1640,14 @@ public:
                                         assert(dimSize >= 0);
                                         coopmatKHRuse = static_cast<uint32_t>(dimSize) & 0b111;
                                         coopmatKHRUseValid = true;
-                                    }
-                                }
-                                if (p.isCoopvecNV() && p.typeParameters) {
-                                    basicType = p.typeParameters->basicType;
-                                }
-                                if (p.isTensorARM() && p.typeParameters) {
-                                    basicType = p.typeParameters->basicType;
-                                    if (p.typeParameters->arraySizes->getNumDims() > 0) {
-                                        tensorRankARM = static_cast<uint32_t>(p.typeParameters->arraySizes->getDimSize(0)) & 0b1111;
+                                        p.typeParameters->arraySizes->removeLastSize();
                                     }
                                 }
                             }
     // for construction of sampler types
     TType(const TSampler& sampler, TStorageQualifier q = EvqUniform, TArraySizes* as = nullptr) :
-        basicType(EbtSampler), vectorSize(1u), matrixCols(0u), matrixRows(0u), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(false),
-        tileAttachmentQCOM(false), tensorRankARM(0), arraySizes(as), structure(nullptr), fieldName(nullptr), typeName(nullptr),
+        basicType(EbtSampler), vectorSize(1u), matrixCols(0u), matrixRows(0u), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
+        arraySizes(as), structure(nullptr), fieldName(nullptr), typeName(nullptr),
         sampler(sampler), typeParameters(nullptr), spirvType(nullptr)
     {
         qualifier.clear();
@@ -1747,23 +1689,19 @@ public:
                                         // dereference from vector to scalar
                                         vectorSize = 1;
                                         vector1 = false;
-                                    } else if (isCoopMat() || isCoopVecNV()) {
+                                    } else if (isCoopMat()) {
                                         coopmatNV = false;
                                         coopmatKHR = false;
                                         coopmatKHRuse = 0;
                                         coopmatKHRUseValid = false;
-                                        coopvecNV = false;
-                                        typeParameters = nullptr;
-                                    } else if (isTileAttachmentQCOM()) {
-                                        tileAttachmentQCOM = false;
                                         typeParameters = nullptr;
                                     }
                                 }
                             }
     // for making structures, ...
     TType(TTypeList* userDef, const TString& n) :
-                            basicType(EbtStruct), vectorSize(1), matrixCols(0), matrixRows(0), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(false),
-                            tileAttachmentQCOM(false), tensorRankARM(0), arraySizes(nullptr), structure(userDef), fieldName(nullptr), typeParameters(nullptr),
+                            basicType(EbtStruct), vectorSize(1), matrixCols(0), matrixRows(0), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
+                            arraySizes(nullptr), structure(userDef), fieldName(nullptr), typeParameters(nullptr),
                             spirvType(nullptr)
                             {
                                 sampler.clear();
@@ -1772,8 +1710,8 @@ public:
                             }
     // For interface blocks
     TType(TTypeList* userDef, const TString& n, const TQualifier& q) :
-                            basicType(EbtBlock), vectorSize(1), matrixCols(0), matrixRows(0), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false), coopvecNV(false),
-                            tileAttachmentQCOM(false), tensorRankARM(0), qualifier(q), arraySizes(nullptr), structure(userDef), fieldName(nullptr), typeParameters(nullptr),
+                            basicType(EbtBlock), vectorSize(1), matrixCols(0), matrixRows(0), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
+                            qualifier(q), arraySizes(nullptr), structure(userDef), fieldName(nullptr), typeParameters(nullptr),
                             spirvType(nullptr)
                             {
                                 sampler.clear();
@@ -1782,7 +1720,7 @@ public:
     // for block reference (first parameter must be EbtReference)
     explicit TType(TBasicType t, const TType &p, const TString& n) :
                             basicType(t), vectorSize(1), matrixCols(0), matrixRows(0), vector1(false), coopmatNV(false), coopmatKHR(false), coopmatKHRuse(0), coopmatKHRUseValid(false),
-                            tileAttachmentQCOM(false), tensorRankARM(0), arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
+                            arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr), typeParameters(nullptr),
                             spirvType(nullptr)
                             {
                                 assert(t == EbtReference);
@@ -1820,9 +1758,6 @@ public:
         coopmatKHR = copyOf.isCoopMatKHR();
         coopmatKHRuse = copyOf.coopmatKHRuse;
         coopmatKHRUseValid = copyOf.coopmatKHRUseValid;
-        coopvecNV = copyOf.isCoopVecNV();
-        tileAttachmentQCOM = copyOf.tileAttachmentQCOM;
-        tensorRankARM = copyOf.tensorRankARM;
     }
 
     // Make complete copy of the whole type graph rooted at 'copyOf'.
@@ -1862,7 +1797,6 @@ public:
         return *typeName;
     }
 
-    virtual bool hasFieldName() const { return (fieldName != nullptr); }
     virtual const TString& getFieldName() const
     {
         assert(fieldName);
@@ -1907,7 +1841,7 @@ public:
     virtual const TTypeParameters* getTypeParameters() const { return typeParameters; }
     virtual       TTypeParameters* getTypeParameters()       { return typeParameters; }
 
-    virtual bool isScalar() const { return ! isVector() && ! isMatrix() && ! isStruct() && ! isArray() && ! isCoopVecNV(); }
+    virtual bool isScalar() const { return ! isVector() && ! isMatrix() && ! isStruct() && ! isArray(); }
     virtual bool isScalarOrVec1() const { return isScalar() || vector1; }
     virtual bool isScalarOrVector() const { return !isMatrix() && !isStruct() && !isArray(); }
     virtual bool isVector() const { return vectorSize > 1u || vector1; }
@@ -1921,8 +1855,7 @@ public:
     virtual void updateImplicitArraySize(int size) { assert(isArray()); arraySizes->updateImplicitSize(size); }
     virtual void setImplicitlySized(bool isImplicitSized) { arraySizes->setImplicitlySized(isImplicitSized); }
     virtual bool isStruct() const { return basicType == EbtStruct || basicType == EbtBlock; }
-    virtual bool isFloatingDomain() const { return basicType == EbtFloat || basicType == EbtDouble || basicType == EbtFloat16 ||
-                                                   basicType == EbtBFloat16 || basicType == EbtFloatE5M2 || basicType == EbtFloatE4M3; }
+    virtual bool isFloatingDomain() const { return basicType == EbtFloat || basicType == EbtDouble || basicType == EbtFloat16; }
     virtual bool isIntegerDomain() const
     {
         switch (basicType) {
@@ -1943,9 +1876,7 @@ public:
     }
     virtual bool isOpaque() const { return basicType == EbtSampler
             || basicType == EbtAtomicUint || basicType == EbtAccStruct || basicType == EbtRayQuery
-            || basicType == EbtHitObjectNV || basicType == EbtHitObjectEXT || isTileAttachmentQCOM()
-            || isTensorARM();
-    }
+            || basicType == EbtHitObjectNV; }
     virtual bool isBuiltIn() const { return getQualifier().builtIn != EbvNone; }
 
     virtual bool isAttachmentEXT() const { return basicType == EbtSampler && getSampler().isAttachmentEXT(); }
@@ -1961,18 +1892,10 @@ public:
     bool isCoopMat() const { return coopmatNV || coopmatKHR; }
     bool isCoopMatNV() const { return coopmatNV; }
     bool isCoopMatKHR() const { return coopmatKHR; }
-    bool isCoopVecNV() const { return coopvecNV; }
-    bool isTileAttachmentQCOM() const { return tileAttachmentQCOM; }
-    bool isTensorARM() const { return tensorRankARM; }
-    bool hasTypeParameter() const { return isCoopMat() || isCoopVecNV() || isTensorARM(); }
-    int getTensorRankARM() const { return static_cast<int>(tensorRankARM); }
     bool isReference() const { return getBasicType() == EbtReference; }
     bool isSpirvType() const { return getBasicType() == EbtSpirvType; }
     int getCoopMatKHRuse() const { return static_cast<int>(coopmatKHRuse); }
 
-    bool isTensorLayoutNV() const { return getBasicType() == EbtTensorLayoutNV; }
-    bool isTensorViewNV() const { return getBasicType() == EbtTensorViewNV; }
-
     // return true if this type contains any subtype which satisfies the given predicate.
     template <typename P>
     bool contains(P predicate) const
@@ -2027,20 +1950,12 @@ public:
 
     virtual bool containsNonOpaque() const
     {
-        if (isTensorARM()) {
-            // Tensors have a numerical basicType even though it is Opaque
-            return false;
-        }
-
         const auto nonOpaque = [](const TType* t) {
             switch (t->basicType) {
             case EbtVoid:
             case EbtFloat:
             case EbtDouble:
             case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
             case EbtInt8:
             case EbtUint8:
             case EbtInt16:
@@ -2073,14 +1988,6 @@ public:
     {
         return containsBasicType(EbtFloat16);
     }
-    bool containsBFloat16() const
-    {
-        return containsBasicType(EbtBFloat16);
-    }
-    bool contains8BitFloat() const
-    {
-        return containsBasicType(EbtFloatE5M2) || containsBasicType(EbtFloatE4M3);
-    }
     bool contains64BitInt() const
     {
         return containsBasicType(EbtInt64) || containsBasicType(EbtUint64);
@@ -2097,10 +2004,6 @@ public:
     {
         return contains([](const TType* t) { return t->coopmatNV || t->coopmatKHR; } );
     }
-    bool containsCoopVec() const
-    {
-        return contains([](const TType* t) { return t->coopvecNV; } );
-    }
     bool containsReference() const
     {
         return containsBasicType(EbtReference);
@@ -2202,9 +2105,6 @@ public:
         case EbtVoid:              return "void";
         case EbtDouble:            return "double";
         case EbtFloat16:           return "float16_t";
-        case EbtBFloat16:          return "bfloat16_t";
-        case EbtFloatE5M2:         return "floate5m2_t";
-        case EbtFloatE4M3:         return "floate4m3_t";
         case EbtInt8:              return "int8_t";
         case EbtUint8:             return "uint8_t";
         case EbtInt16:             return "int16_t";
@@ -2221,10 +2121,6 @@ public:
         case EbtString:            return "string";
         case EbtSpirvType:         return "spirv_type";
         case EbtCoopmat:           return "coopmat";
-        case EbtTensorLayoutNV:    return "tensorLayoutNV";
-        case EbtTensorViewNV:      return "tensorViewNV";
-        case EbtCoopvecNV:         return "coopvecNV";
-        case EbtTensorARM:         return "tensorARM";
         default:                   return "unknown type";
         }
     }
@@ -2330,7 +2226,7 @@ public:
                 appendStr(" layoutSecondaryViewportRelativeOffset=");
                 appendInt(qualifier.layoutSecondaryViewportRelativeOffset);
               }
-
+              
               if (qualifier.layoutShaderRecord)
                 appendStr(" shaderRecordNV");
               if (qualifier.layoutFullQuads)
@@ -2339,8 +2235,6 @@ public:
                 appendStr(" quad_derivatives");
               if (qualifier.layoutHitObjectShaderRecordNV)
                 appendStr(" hitobjectshaderrecordnv");
-              if (qualifier.layoutHitObjectShaderRecordEXT)
-                appendStr(" hitobjectshaderrecordext");
 
               if (qualifier.layoutBindlessSampler)
                   appendStr(" layoutBindlessSampler");
@@ -2395,8 +2289,6 @@ public:
             appendStr(" nonprivate");
           if (qualifier.volatil)
             appendStr(" volatile");
-          if (qualifier.nontemporal)
-            appendStr(" nontemporal");
           if (qualifier.restrict)
             appendStr(" restrict");
           if (qualifier.readonly)
@@ -2539,18 +2431,6 @@ public:
                 appendStr(" ");
                 appendStr("coopmat");
               }
-              if (isTensorLayoutNV()) {
-                appendStr(" ");
-                appendStr("tensorLayoutNV");
-              }
-              if (isTensorViewNV()) {
-                appendStr(" ");
-                appendStr("tensorViewNV");
-              }
-              if (isCoopVecNV()) {
-                appendStr(" ");
-                appendStr("coopvecNV");
-              }
 
               appendStr("<");
               for (int i = 0; i < (int)typeParameters->arraySizes->getNumDims(); ++i) {
@@ -2558,6 +2438,10 @@ public:
                 if (i != (int)typeParameters->arraySizes->getNumDims() - 1)
                   appendStr(", ");
               }
+              if (coopmatKHRUseValid) {
+                  appendStr(", ");
+                  appendInt(coopmatKHRuse);
+              }
               appendStr(">");
             }
             if (getPrecision && qualifier.precision != EpqNone) {
@@ -2610,7 +2494,7 @@ public:
     TString getBasicTypeString() const
     {
         if (basicType == EbtSampler)
-            return TString{sampler.getString()};
+            return sampler.getString();
         else
             return getBasicString();
     }
@@ -2632,9 +2516,7 @@ public:
     {
         uint32_t components = 0;
 
-        if (isCoopVecNV()) {
-            components = typeParameters->arraySizes->getDimSize(0);
-        } else if (getBasicType() == EbtStruct || getBasicType() == EbtBlock) {
+        if (getBasicType() == EbtStruct || getBasicType() == EbtBlock) {
             for (TTypeList::const_iterator tl = getStruct()->begin(); tl != getStruct()->end(); tl++)
                 components += ((*tl).type)->computeNumComponents();
         } else if (matrixCols)
@@ -2838,8 +2720,6 @@ public:
                   vector1 == right.vector1    &&
               isCoopMatNV() == right.isCoopMatNV() &&
               isCoopMatKHR() == right.isCoopMatKHR() &&
-              isCoopVecNV() == right.isCoopVecNV() &&
-               isTensorARM() == right.isTensorARM() &&
                sameStructType(right, lpidx, rpidx) &&
                sameReferenceType(right);
     }
@@ -2861,18 +2741,6 @@ public:
         return false;
     }
 
-    // See if a cooperative vector type parameter with unspecified parameters is
-    // an OK function parameter
-    bool coopVecParameterOK(const TType& right) const
-    {
-        if (isCoopVecNV() && right.isCoopVecNV()) {
-            return ((getBasicType() == right.getBasicType()) || (getBasicType() == EbtCoopvecNV) ||
-                    (right.getBasicType() == EbtCoopvecNV)) &&
-                   typeParameters == nullptr && right.typeParameters != nullptr;
-        }
-        return false;
-    }
-
     bool sameCoopMatBaseType(const TType &right) const {
         bool rv = false;
 
@@ -2887,8 +2755,8 @@ public:
             else
                 rv = false;
         } else if (isCoopMatKHR() && right.isCoopMatKHR()) {
-            if (isFloatingDomain())
-                rv = right.isFloatingDomain() || right.getBasicType() == EbtCoopmat;
+            if (getBasicType() == EbtFloat || getBasicType() == EbtFloat16)
+                rv = right.getBasicType() == EbtFloat || right.getBasicType() == EbtFloat16 || right.getBasicType() == EbtCoopmat;
             else if (getBasicType() == EbtUint || getBasicType() == EbtUint8 || getBasicType() == EbtUint16)
                 rv = right.getBasicType() == EbtUint || right.getBasicType() == EbtUint8 || right.getBasicType() == EbtUint16 || right.getBasicType() == EbtCoopmat;
             else if (getBasicType() == EbtInt || getBasicType() == EbtInt8 || getBasicType() == EbtInt16)
@@ -2899,69 +2767,24 @@ public:
         return rv;
     }
 
-    bool tensorParameterOK(const TType& right) const
-    {
-        if (isTensorLayoutNV()) {
-            return right.isTensorLayoutNV() && right.typeParameters == nullptr && typeParameters != nullptr;
-        }
-        if (isTensorViewNV()) {
-            return right.isTensorViewNV() && right.typeParameters == nullptr && typeParameters != nullptr;
-        }
-        if (isTensorARM()) {
-            return right.isTensorARM() && right.typeParameters == nullptr && typeParameters != nullptr;
-        }
-
-        return false;
-    }
-
-    bool sameTensorBaseTypeARM(const TType &right) const {
-        return (typeParameters == nullptr || right.typeParameters == nullptr ||
-                (tensorRankARM == right.tensorRankARM && getBasicType() == right.getBasicType()));
-    }
-
-    bool sameCoopVecBaseType(const TType &right) const {
-        bool rv = false;
-
-        if (isCoopVecNV() && right.isCoopVecNV()) {
-            if (getBasicType() == EbtFloat || getBasicType() == EbtFloat16)
-                rv = right.getBasicType() == EbtFloat || right.getBasicType() == EbtFloat16 || right.getBasicType() == EbtCoopvecNV;
-            else if (getBasicType() == EbtUint || getBasicType() == EbtUint8 || getBasicType() == EbtUint16)
-                rv = right.getBasicType() == EbtUint || right.getBasicType() == EbtUint8 || right.getBasicType() == EbtUint16 || right.getBasicType() == EbtCoopvecNV;
-            else if (getBasicType() == EbtInt || getBasicType() == EbtInt8 || getBasicType() == EbtInt16)
-                rv = right.getBasicType() == EbtInt || right.getBasicType() == EbtInt8 || right.getBasicType() == EbtInt16 || right.getBasicType() == EbtCoopvecNV;
-            else
-                rv = false;
-        }
-        return rv;
-    }
-
     bool sameCoopMatUse(const TType &right) const {
         return coopmatKHRuse == right.coopmatKHRuse;
     }
 
-    bool sameCoopMatShape(const TType &right) const
-    {
-        if (!isCoopMat() || !right.isCoopMat() || isCoopMatKHR() != right.isCoopMatKHR())
-            return false;
-
-        // Skip bit width type parameter (first array size) for coopmatNV
-        int firstArrayDimToCompare = isCoopMatNV() ? 1 : 0;
-        int lastArrayDimToCompare = typeParameters->arraySizes->getNumDims() - (isCoopMatKHR() ? 1 : 0);
-        for (int i = firstArrayDimToCompare; i < lastArrayDimToCompare; ++i) {
-            if (typeParameters->arraySizes->getDimSize(i) != right.typeParameters->arraySizes->getDimSize(i))
-                return false;
-        }
-        return true;
-    }
-
     bool sameCoopMatShapeAndUse(const TType &right) const
     {
-        if (!sameCoopMatShape(right))
+        if (!isCoopMat() || !right.isCoopMat() || isCoopMatKHR() != right.isCoopMatKHR())
             return false;
 
         if (coopmatKHRuse != right.coopmatKHRuse)
             return false;
 
+        // Skip bit width type parameter (first array size) for coopmatNV
+        int firstArrayDimToCompare = isCoopMatNV() ? 1 : 0;
+        for (int i = firstArrayDimToCompare; i < typeParameters->arraySizes->getNumDims(); ++i) {
+            if (typeParameters->arraySizes->getDimSize(i) != right.typeParameters->arraySizes->getDimSize(i))
+                return false;
+        }
         return true;
     }
 
@@ -3019,9 +2842,7 @@ protected:
             typeParameters = new TTypeParameters;
             typeParameters->arraySizes = new TArraySizes;
             *typeParameters->arraySizes = *copyOf.typeParameters->arraySizes;
-            if (copyOf.typeParameters->spirvType) {
-                *typeParameters->spirvType = *copyOf.typeParameters->spirvType;
-            }
+            *typeParameters->spirvType = *copyOf.typeParameters->spirvType;
             typeParameters->basicType = copyOf.basicType;
         }
 
@@ -3064,9 +2885,6 @@ protected:
     bool coopmatKHR      : 1;
     uint32_t coopmatKHRuse    : 3;  // Accepts one of three values: 0, 1, 2 (gl_MatrixUseA, gl_MatrixUseB, gl_MatrixUseAccumulator)
     bool coopmatKHRUseValid   : 1;  // True if coopmatKHRuse has been set
-    bool coopvecNV       : 1;
-    bool tileAttachmentQCOM : 1;
-    uint32_t tensorRankARM       : 4;  // 0 means not a tensor; non-zero indicates the tensor rank.
     TQualifier qualifier;
 
     TArraySizes* arraySizes;    // nullptr unless an array; can be shared across types
diff --git a/engine/thirdparty/glslang/glslang/Include/arrays.h b/engine/thirdparty/glslang/glslang/Include/arrays.h
index 261af683..91e19083 100644
--- a/engine/thirdparty/glslang/glslang/Include/arrays.h
+++ b/engine/thirdparty/glslang/glslang/Include/arrays.h
@@ -66,7 +66,6 @@ struct TArraySize {
 
         return SameSpecializationConstants(node, rhs.node);
     }
-    bool operator!=(const TArraySize& rhs) const { return !(*this == rhs); }
 };
 
 //
@@ -199,12 +198,6 @@ struct TSmallArrayVector {
     }
     bool operator!=(const TSmallArrayVector& rhs) const { return ! operator==(rhs); }
 
-    const TArraySize& operator[](int index) const
-    {
-        assert(sizes && index < (int)sizes->size());
-        return (*sizes)[index];
-    }
-
 protected:
     TSmallArrayVector(const TSmallArrayVector&);
 
@@ -343,10 +336,6 @@ struct TArraySizes {
 
         return true;
     }
-    const TArraySize& getArraySize(int index) const
-    {
-        return sizes[index];
-    }
 
     void setVariablyIndexed() { variablyIndexed = true; }
     bool isVariablyIndexed() const { return variablyIndexed; }
diff --git a/engine/thirdparty/glslang/glslang/Include/intermediate.h b/engine/thirdparty/glslang/glslang/Include/intermediate.h
index 9e520dee..bcce91d3 100644
--- a/engine/thirdparty/glslang/glslang/Include/intermediate.h
+++ b/engine/thirdparty/glslang/glslang/Include/intermediate.h
@@ -87,9 +87,189 @@ enum TOperator {
 
     EOpDeclare,        // Used by debugging to force declaration of variable in correct scope
 
-    // Operator used to represent all conversions between int, float, and bool.
-    // The specific types are inferred from TBasicType.
-    EOpConvNumeric,
+    // (u)int* -> bool
+    EOpConvInt8ToBool,
+    EOpConvUint8ToBool,
+    EOpConvInt16ToBool,
+    EOpConvUint16ToBool,
+    EOpConvIntToBool,
+    EOpConvUintToBool,
+    EOpConvInt64ToBool,
+    EOpConvUint64ToBool,
+
+    // float* -> bool
+    EOpConvFloat16ToBool,
+    EOpConvFloatToBool,
+    EOpConvDoubleToBool,
+
+    // bool -> (u)int*
+    EOpConvBoolToInt8,
+    EOpConvBoolToUint8,
+    EOpConvBoolToInt16,
+    EOpConvBoolToUint16,
+    EOpConvBoolToInt,
+    EOpConvBoolToUint,
+    EOpConvBoolToInt64,
+    EOpConvBoolToUint64,
+
+    // bool -> float*
+    EOpConvBoolToFloat16,
+    EOpConvBoolToFloat,
+    EOpConvBoolToDouble,
+
+    // int8_t -> (u)int*
+    EOpConvInt8ToInt16,
+    EOpConvInt8ToInt,
+    EOpConvInt8ToInt64,
+    EOpConvInt8ToUint8,
+    EOpConvInt8ToUint16,
+    EOpConvInt8ToUint,
+    EOpConvInt8ToUint64,
+
+    // uint8_t -> (u)int*
+    EOpConvUint8ToInt8,
+    EOpConvUint8ToInt16,
+    EOpConvUint8ToInt,
+    EOpConvUint8ToInt64,
+    EOpConvUint8ToUint16,
+    EOpConvUint8ToUint,
+    EOpConvUint8ToUint64,
+
+    // int8_t -> float*
+    EOpConvInt8ToFloat16,
+    EOpConvInt8ToFloat,
+    EOpConvInt8ToDouble,
+
+    // uint8_t -> float*
+    EOpConvUint8ToFloat16,
+    EOpConvUint8ToFloat,
+    EOpConvUint8ToDouble,
+
+    // int16_t -> (u)int*
+    EOpConvInt16ToInt8,
+    EOpConvInt16ToInt,
+    EOpConvInt16ToInt64,
+    EOpConvInt16ToUint8,
+    EOpConvInt16ToUint16,
+    EOpConvInt16ToUint,
+    EOpConvInt16ToUint64,
+
+    // uint16_t -> (u)int*
+    EOpConvUint16ToInt8,
+    EOpConvUint16ToInt16,
+    EOpConvUint16ToInt,
+    EOpConvUint16ToInt64,
+    EOpConvUint16ToUint8,
+    EOpConvUint16ToUint,
+    EOpConvUint16ToUint64,
+
+    // int16_t -> float*
+    EOpConvInt16ToFloat16,
+    EOpConvInt16ToFloat,
+    EOpConvInt16ToDouble,
+
+    // uint16_t -> float*
+    EOpConvUint16ToFloat16,
+    EOpConvUint16ToFloat,
+    EOpConvUint16ToDouble,
+
+    // int32_t -> (u)int*
+    EOpConvIntToInt8,
+    EOpConvIntToInt16,
+    EOpConvIntToInt64,
+    EOpConvIntToUint8,
+    EOpConvIntToUint16,
+    EOpConvIntToUint,
+    EOpConvIntToUint64,
+
+    // uint32_t -> (u)int*
+    EOpConvUintToInt8,
+    EOpConvUintToInt16,
+    EOpConvUintToInt,
+    EOpConvUintToInt64,
+    EOpConvUintToUint8,
+    EOpConvUintToUint16,
+    EOpConvUintToUint64,
+
+    // int32_t -> float*
+    EOpConvIntToFloat16,
+    EOpConvIntToFloat,
+    EOpConvIntToDouble,
+
+    // uint32_t -> float*
+    EOpConvUintToFloat16,
+    EOpConvUintToFloat,
+    EOpConvUintToDouble,
+
+    // int64_t -> (u)int*
+    EOpConvInt64ToInt8,
+    EOpConvInt64ToInt16,
+    EOpConvInt64ToInt,
+    EOpConvInt64ToUint8,
+    EOpConvInt64ToUint16,
+    EOpConvInt64ToUint,
+    EOpConvInt64ToUint64,
+
+    // uint64_t -> (u)int*
+    EOpConvUint64ToInt8,
+    EOpConvUint64ToInt16,
+    EOpConvUint64ToInt,
+    EOpConvUint64ToInt64,
+    EOpConvUint64ToUint8,
+    EOpConvUint64ToUint16,
+    EOpConvUint64ToUint,
+
+    // int64_t -> float*
+    EOpConvInt64ToFloat16,
+    EOpConvInt64ToFloat,
+    EOpConvInt64ToDouble,
+
+    // uint64_t -> float*
+    EOpConvUint64ToFloat16,
+    EOpConvUint64ToFloat,
+    EOpConvUint64ToDouble,
+
+    // float16_t -> (u)int*
+    EOpConvFloat16ToInt8,
+    EOpConvFloat16ToInt16,
+    EOpConvFloat16ToInt,
+    EOpConvFloat16ToInt64,
+    EOpConvFloat16ToUint8,
+    EOpConvFloat16ToUint16,
+    EOpConvFloat16ToUint,
+    EOpConvFloat16ToUint64,
+
+    // float16_t -> float*
+    EOpConvFloat16ToFloat,
+    EOpConvFloat16ToDouble,
+
+    // float -> (u)int*
+    EOpConvFloatToInt8,
+    EOpConvFloatToInt16,
+    EOpConvFloatToInt,
+    EOpConvFloatToInt64,
+    EOpConvFloatToUint8,
+    EOpConvFloatToUint16,
+    EOpConvFloatToUint,
+    EOpConvFloatToUint64,
+
+    // float -> float*
+    EOpConvFloatToFloat16,
+    EOpConvFloatToDouble,
+
+    // float64 _t-> (u)int*
+    EOpConvDoubleToInt8,
+    EOpConvDoubleToInt16,
+    EOpConvDoubleToInt,
+    EOpConvDoubleToInt64,
+    EOpConvDoubleToUint8,
+    EOpConvDoubleToUint16,
+    EOpConvDoubleToUint,
+    EOpConvDoubleToUint64,
+
+    // float64_t -> float*
+    EOpConvDoubleToFloat16,
+    EOpConvDoubleToFloat,
 
     // uint64_t <-> pointer
     EOpConvUint64ToPtr,
@@ -387,11 +567,6 @@ enum TOperator {
     EOpSubgroupPartitionedExclusiveXor,
 
     EOpSubgroupGuardStop,
-    
-    // Integer dot product
-    EOpDotPackedEXT,
-    EOpDotAccSatEXT,
-    EOpDotPackedAccSatEXT,
 
     EOpMinInvocations,
     EOpMaxInvocations,
@@ -453,35 +628,7 @@ enum TOperator {
     EOpCooperativeMatrixMulAdd,
     EOpCooperativeMatrixLoadNV,
     EOpCooperativeMatrixStoreNV,
-    EOpCooperativeMatrixLoadTensorNV,
-    EOpCooperativeMatrixStoreTensorNV,
     EOpCooperativeMatrixMulAddNV,
-    EOpCooperativeMatrixReduceNV,
-    EOpCooperativeMatrixPerElementOpNV,
-    EOpCooperativeMatrixTransposeNV,
-
-    EOpCreateTensorLayoutNV,
-    EOpTensorLayoutSetBlockSizeNV,
-    EOpTensorLayoutSetDimensionNV,
-    EOpTensorLayoutSetStrideNV,
-    EOpTensorLayoutSliceNV,
-    EOpTensorLayoutSetClampValueNV,
-
-    EOpCreateTensorViewNV,
-    EOpTensorViewSetDimensionNV,
-    EOpTensorViewSetStrideNV,
-    EOpTensorViewSetClipNV,
-
-    EOpCooperativeVectorMatMulNV,
-    EOpCooperativeVectorMatMulAddNV,
-    EOpCooperativeVectorLoadNV,
-    EOpCooperativeVectorStoreNV,
-    EOpCooperativeVectorOuterProductAccumulateNV,
-    EOpCooperativeVectorReduceSumAccumulateNV,
-
-    EOpTensorReadARM,
-    EOpTensorWriteARM,
-    EOpTensorSizeARM,
 
     EOpBeginInvocationInterlock, // Fragment only
     EOpEndInvocationInterlock, // Fragment only
@@ -615,27 +762,13 @@ enum TOperator {
     EOpConstructF16Mat4x2,
     EOpConstructF16Mat4x3,
     EOpConstructF16Mat4x4,
-    EOpConstructBFloat16,
-    EOpConstructBF16Vec2,
-    EOpConstructBF16Vec3,
-    EOpConstructBF16Vec4,
-    EOpConstructFloatE5M2,
-    EOpConstructFloatE5M2Vec2,
-    EOpConstructFloatE5M2Vec3,
-    EOpConstructFloatE5M2Vec4,
-    EOpConstructFloatE4M3,
-    EOpConstructFloatE4M3Vec2,
-    EOpConstructFloatE4M3Vec3,
-    EOpConstructFloatE4M3Vec4,
     EOpConstructStruct,
     EOpConstructTextureSampler,
     EOpConstructNonuniform,     // expected to be transformed away, not present in final AST
     EOpConstructReference,
     EOpConstructCooperativeMatrixNV,
     EOpConstructCooperativeMatrixKHR,
-    EOpConstructCooperativeVectorNV,
     EOpConstructAccStruct,
-    EOpConstructSaturated,
     EOpConstructGuardEnd,
 
     //
@@ -875,44 +1008,6 @@ enum TOperator {
     EOpFetchMicroTriangleVertexPositionNV,
     EOpFetchMicroTriangleVertexBarycentricNV,
 
-    // 
-    // GL_EXT_shader_invocation_reorder
-    //
-
-    EOpHitObjectTraceRayEXT,
-    EOpHitObjectTraceRayMotionEXT,
-    EOpHitObjectRecordMissEXT,
-    EOpHitObjectRecordMissMotionEXT,
-    EOpHitObjectRecordEmptyEXT,
-    EOpHitObjectExecuteShaderEXT,
-    EOpHitObjectIsEmptyEXT,
-    EOpHitObjectIsMissEXT,
-    EOpHitObjectIsHitEXT,
-    EOpHitObjectGetRayTMinEXT,
-    EOpHitObjectGetRayTMaxEXT,
-    EOpHitObjectGetRayFlagsEXT,
-    EOpHitObjectGetObjectRayOriginEXT,
-    EOpHitObjectGetObjectRayDirectionEXT,
-    EOpHitObjectGetWorldRayOriginEXT,
-    EOpHitObjectGetWorldRayDirectionEXT,
-    EOpHitObjectGetWorldToObjectEXT,
-    EOpHitObjectGetObjectToWorldEXT,
-    EOpHitObjectGetInstanceCustomIndexEXT,
-    EOpHitObjectGetInstanceIdEXT,
-    EOpHitObjectGetGeometryIndexEXT,
-    EOpHitObjectGetPrimitiveIndexEXT,
-    EOpHitObjectGetHitKindEXT,
-    EOpHitObjectGetShaderBindingTableRecordIndexEXT,
-    EOpHitObjectSetShaderBindingTableRecordIndexEXT,
-    EOpHitObjectGetShaderRecordBufferHandleEXT,
-    EOpHitObjectGetAttributesEXT,
-    EOpHitObjectGetCurrentTimeEXT,
-    EOpReorderThreadEXT,
-    EOpHitObjectReorderExecuteEXT,
-    EOpHitObjectTraceReorderExecuteEXT,
-    EOpHitObjectTraceMotionReorderExecuteEXT,
-    EOpHitObjectRecordFromQueryEXT,
-    EOpHitObjectGetIntersectionTriangleVertexPositionsEXT,
     // HLSL operations
     //
 
@@ -1022,44 +1117,14 @@ enum TOperator {
     EOpImageBlockMatchWindowSADQCOM,
     EOpImageBlockMatchGatherSSDQCOM,
     EOpImageBlockMatchGatherSADQCOM,
-
-    // Cooperative Matrix Conversion
-    EOpBitCastArrayQCOM,
-    EOpExtractSubArrayQCOM,
-    EOpCompositeConstructCoopMatQCOM,
-    EOpCompositeExtractCoopMatQCOM,
-
-    // GL_NV_cluster_acceleration_structure
-    EOpRayQueryGetIntersectionClusterIdNV,
-    EOpHitObjectGetClusterIdNV,
-
-    // GL_NV_linear_swept_spheres
-    EOpRayQueryGetIntersectionSpherePositionNV,
-    EOpRayQueryGetIntersectionSphereRadiusNV,
-    EOpRayQueryGetIntersectionLSSHitValueNV,
-    EOpRayQueryGetIntersectionLSSPositionsNV,
-    EOpRayQueryGetIntersectionLSSRadiiNV,
-    EOpRayQueryIsSphereHitNV,
-    EOpRayQueryIsLSSHitNV,
-    EOpHitObjectGetSpherePositionNV,
-    EOpHitObjectGetSphereRadiusNV,
-    EOpHitObjectGetLSSPositionsNV,
-    EOpHitObjectGetLSSRadiiNV,
-    EOpHitObjectIsSphereHitNV,
-    EOpHitObjectIsLSSHitNV,
 };
 
-inline bool IsOpNumericConv(const TOperator op) {
-    return op == EOpConvNumeric;
-}
-
 enum TLinkType {
     ELinkNone,
     ELinkExport,
 };
 
 class TIntermTraverser;
-class TIntermVariableDecl;
 class TIntermOperator;
 class TIntermAggregate;
 class TIntermUnary;
@@ -1088,7 +1153,6 @@ public:
     virtual const glslang::TSourceLoc& getLoc() const { return loc; }
     virtual void setLoc(const glslang::TSourceLoc& l) { loc = l; }
     virtual void traverse(glslang::TIntermTraverser*) = 0;
-    virtual       glslang::TIntermVariableDecl*  getAsVariableDecl()        { return nullptr; }
     virtual       glslang::TIntermTyped*         getAsTyped()               { return nullptr; }
     virtual       glslang::TIntermOperator*      getAsOperator()            { return nullptr; }
     virtual       glslang::TIntermConstantUnion* getAsConstantUnion()       { return nullptr; }
@@ -1102,7 +1166,6 @@ public:
     virtual       glslang::TIntermBranch*        getAsBranchNode()          { return nullptr; }
     virtual       glslang::TIntermLoop*          getAsLoopNode()            { return nullptr; }
 
-    virtual const glslang::TIntermVariableDecl*  getAsVariableDecl()  const { return nullptr; }
     virtual const glslang::TIntermTyped*         getAsTyped()         const { return nullptr; }
     virtual const glslang::TIntermOperator*      getAsOperator()      const { return nullptr; }
     virtual const glslang::TIntermConstantUnion* getAsConstantUnion() const { return nullptr; }
@@ -1133,37 +1196,6 @@ struct TIntermNodePair {
     TIntermNode* node2;
 };
 
-//
-// Represent declaration of a variable.
-//
-class TIntermVariableDecl : public TIntermNode {
-public:
-    TIntermVariableDecl(TIntermSymbol* declSymbol, TIntermNode* initNode) : declSymbol(declSymbol), initNode(initNode)
-    {
-    }
-    TIntermVariableDecl(const TIntermVariableDecl&) = delete;
-    TIntermVariableDecl& operator=(const TIntermVariableDecl&) = delete;
-
-    void traverse(glslang::TIntermTraverser* traverser) override;
-
-    TIntermVariableDecl* getAsVariableDecl() override { return this; }
-    const TIntermVariableDecl* getAsVariableDecl() const override { return this; }
-
-    TIntermSymbol* getDeclSymbol() { return declSymbol; }
-    const TIntermSymbol* getDeclSymbol() const { return declSymbol; }
-
-    TIntermNode* getInitNode() { return initNode; }
-    const TIntermNode* getInitNode() const { return initNode; }
-
-private:
-    // This symbol represents the declared variable at its declaration point.
-    // It's not traversed by default. To traverse it, the visitor needs to have includeDeclSymbol enabled.
-    TIntermSymbol* declSymbol = nullptr;
-
-    // The initializer
-    TIntermNode* initNode = nullptr;
-};
-
 //
 // Intermediate class for nodes that have a type.
 //
@@ -1186,7 +1218,6 @@ public:
     virtual int getVectorSize() const { return type.getVectorSize(); }
     virtual int getMatrixCols() const { return type.getMatrixCols(); }
     virtual int getMatrixRows() const { return type.getMatrixRows(); }
-    virtual int getTensorRankARM() const { return type.getTensorRankARM(); }
     virtual bool isMatrix() const { return type.isMatrix(); }
     virtual bool isArray()  const { return type.isArray(); }
     virtual bool isVector() const { return type.isVector(); }
@@ -1208,7 +1239,7 @@ protected:
 //
 class TIntermLoop : public TIntermNode {
 public:
-    TIntermLoop(TIntermNode* aBody, TIntermNode* aTest, TIntermTyped* aTerminal, bool testFirst) :
+    TIntermLoop(TIntermNode* aBody, TIntermTyped* aTest, TIntermTyped* aTerminal, bool testFirst) :
         body(aBody),
         test(aTest),
         terminal(aTerminal),
@@ -1227,20 +1258,10 @@ public:
     virtual const TIntermLoop* getAsLoopNode() const { return this; }
     virtual void traverse(TIntermTraverser*);
     TIntermNode*  getBody() const { return body; }
-    TIntermNode*  getTest() const { return test; }
+    TIntermTyped* getTest() const { return test; }
     TIntermTyped* getTerminal() const { return terminal; }
     bool testFirst() const { return first; }
 
-    // Because the test node can be a declaration in a while loop, this function unwraps it to get the actual expression.
-    TIntermTyped* getTestExpr() const {
-        if (auto decl = test->getAsVariableDecl()) {
-            return decl->getInitNode()->getAsTyped();
-        }
-        else {
-            return test->getAsTyped();
-        }
-    }
-
     void setUnroll()     { unroll = true; }
     void setDontUnroll() {
         dontUnroll = true;
@@ -1274,7 +1295,7 @@ public:
 
 protected:
     TIntermNode* body;       // code to loop over
-    TIntermNode* test;       // exit condition associated with loop, could be 0 for 'for' loops
+    TIntermTyped* test;      // exit condition associated with loop, could be 0 for 'for' loops
     TIntermTyped* terminal;  // exists for for-loops
     bool first;              // true for while and for, not for do-while
     bool unroll;             // true if unroll requested
@@ -1335,19 +1356,11 @@ public:
     // if symbol is initialized as symbol(sym), the memory comes from the pool allocator of sym. If sym comes from
     // per process threadPoolAllocator, then it causes increased memory usage per compile
     // it is essential to use "symbol = sym" to assign to symbol
-    TIntermSymbol(long long i, const TString& n, EShLanguage s, const TType& t, const TString* mn = nullptr)
-        : TIntermTyped(t), id(i), flattenSubset(-1), stage(s), constSubtree(nullptr) { 
-        name = n;
-        if (mn) {
-            mangledName = *mn;
-        } else {
-            mangledName = n;
-        }
-    }
+    TIntermSymbol(long long i, const TString& n, const TType& t)
+        : TIntermTyped(t), id(i), flattenSubset(-1), constSubtree(nullptr) { name = n; }
     virtual long long getId() const { return id; }
     virtual void changeId(long long i) { id = i; }
     virtual const TString& getName() const { return name; }
-    virtual const TString& getMangledName() const { return mangledName; }
     virtual void traverse(TIntermTraverser*);
     virtual       TIntermSymbol* getAsSymbolNode()       { return this; }
     virtual const TIntermSymbol* getAsSymbolNode() const { return this; }
@@ -1363,14 +1376,11 @@ public:
     // This is meant for cases where a node has already been constructed, and
     // later on, it becomes necessary to switch to a different symbol.
     virtual void switchId(long long newId) { id = newId; }
-    EShLanguage getStage() const { return stage; }
 
 protected:
     long long id;                // the unique id of the symbol this node represents
     int flattenSubset;           // how deeply the flattened object rooted at id has been dereferenced
     TString name;                // the name of the symbol this node represents
-    EShLanguage stage;
-    TString mangledName;         // mangled function name, or a copy of name if not a function
     TConstUnionArray constArray; // if the symbol is a front-end compile-time constant, this is its value
     TIntermTyped* constSubtree;
 };
@@ -1684,12 +1694,8 @@ typedef TVector<TStorageQualifier> TQualifierList;
 //
 class TIntermAggregate : public TIntermOperator {
 public:
-    TIntermAggregate() : TIntermOperator(EOpNull), userDefined(false), pragmaTable(nullptr) { 
-        endLoc.init();
-    }
-    TIntermAggregate(TOperator o) : TIntermOperator(o), pragmaTable(nullptr) {
-        endLoc.init();
-    }
+    TIntermAggregate() : TIntermOperator(EOpNull), userDefined(false), pragmaTable(nullptr) { }
+    TIntermAggregate(TOperator o) : TIntermOperator(o), pragmaTable(nullptr) { }
     ~TIntermAggregate() { delete pragmaTable; }
     virtual       TIntermAggregate* getAsAggregate()       { return this; }
     virtual const TIntermAggregate* getAsAggregate() const { return this; }
@@ -1713,9 +1719,6 @@ public:
     void setSpirvInstruction(const TSpirvInstruction& inst) { spirvInst = inst; }
     const TSpirvInstruction& getSpirvInstruction() const { return spirvInst; }
 
-    void setEndLoc(TSourceLoc loc) { endLoc = loc; }
-    TSourceLoc getEndLoc() const { return endLoc; }
-
     void setLinkType(TLinkType l) { linkType = l; }
     TLinkType getLinkType() const { return linkType; }
 protected:
@@ -1730,10 +1733,6 @@ protected:
     TPragmaTable* pragmaTable;
     TSpirvInstruction spirvInst;
     TLinkType linkType = ELinkNone;
-
-    // Marking the end source location of the aggregate.
-    // This is currently only set for a compound statement or a function body, pointing to '}'.
-    TSourceLoc endLoc;
 };
 
 //
@@ -1835,26 +1834,24 @@ enum TVisit
 class TIntermTraverser {
 public:
     POOL_ALLOCATOR_NEW_DELETE(glslang::GetThreadPoolAllocator())
-    TIntermTraverser(bool preVisit = true, bool inVisit = false, bool postVisit = false, bool rightToLeft = false, bool includeDeclSymbol = false) :
+    TIntermTraverser(bool preVisit = true, bool inVisit = false, bool postVisit = false, bool rightToLeft = false) :
             preVisit(preVisit),
             inVisit(inVisit),
             postVisit(postVisit),
             rightToLeft(rightToLeft),
-            includeDeclSymbol(includeDeclSymbol),
             depth(0),
             maxDepth(0) { }
     virtual ~TIntermTraverser() { }
 
-    virtual void visitSymbol(TIntermSymbol*)                     { }
-    virtual void visitConstantUnion(TIntermConstantUnion*)       { }
-    virtual bool visitBinary(TVisit, TIntermBinary*)             { return true; }
-    virtual bool visitUnary(TVisit, TIntermUnary*)               { return true; }
-    virtual bool visitSelection(TVisit, TIntermSelection*)       { return true; }
-    virtual bool visitAggregate(TVisit, TIntermAggregate*)       { return true; }
-    virtual bool visitLoop(TVisit, TIntermLoop*)                 { return true; }
-    virtual bool visitBranch(TVisit, TIntermBranch*)             { return true; }
-    virtual bool visitSwitch(TVisit, TIntermSwitch*)             { return true; }
-    virtual bool visitVariableDecl(TVisit, TIntermVariableDecl*) { return true; }
+    virtual void visitSymbol(TIntermSymbol*)               { }
+    virtual void visitConstantUnion(TIntermConstantUnion*) { }
+    virtual bool visitBinary(TVisit, TIntermBinary*)       { return true; }
+    virtual bool visitUnary(TVisit, TIntermUnary*)         { return true; }
+    virtual bool visitSelection(TVisit, TIntermSelection*) { return true; }
+    virtual bool visitAggregate(TVisit, TIntermAggregate*) { return true; }
+    virtual bool visitLoop(TVisit, TIntermLoop*)           { return true; }
+    virtual bool visitBranch(TVisit, TIntermBranch*)       { return true; }
+    virtual bool visitSwitch(TVisit, TIntermSwitch*)       { return true; }
 
     int getMaxDepth() const { return maxDepth; }
 
@@ -1881,11 +1878,6 @@ public:
     const bool postVisit;
     const bool rightToLeft;
 
-    // Whether to traverse declaration symbols in the traversal.
-    // By default, declaration symbols are not visited in the traversal to avoid 
-    // visiting them in SPIR-V generation where they are not needed.
-    const bool includeDeclSymbol;
-
 protected:
     TIntermTraverser& operator=(TIntermTraverser&);
 
diff --git a/engine/thirdparty/glslang/glslang/Include/visibility.h b/engine/thirdparty/glslang/glslang/Include/visibility.h
deleted file mode 100644
index dd32351f..00000000
--- a/engine/thirdparty/glslang/glslang/Include/visibility.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (C) 2023 LunarG, Inc.
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-#ifdef GLSLANG_IS_SHARED_LIBRARY
-    #ifdef _WIN32
-        #ifdef GLSLANG_EXPORTING
-            #define GLSLANG_EXPORT __declspec(dllexport)
-        #else
-            #define GLSLANG_EXPORT __declspec(dllimport)
-        #endif
-    #elif __GNUC__ >= 4
-        #define GLSLANG_EXPORT __attribute__((visibility("default")))
-    #endif
-#endif // GLSLANG_IS_SHARED_LIBRARY
-
-#ifndef GLSLANG_EXPORT
-#define GLSLANG_EXPORT
-#endif
-
-// Symbols marked with this macro are only meant for public use by the test suite
-// and do not appear in publicly installed headers. They are not considered to be
-// part of the glslang library ABI.
-#ifdef GLSLANG_TEST_BUILD
-    #define GLSLANG_EXPORT_FOR_TESTS GLSLANG_EXPORT
-#else
-    #define GLSLANG_EXPORT_FOR_TESTS
-#endif
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Constant.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/Constant.cpp
index d6528b73..ac7fc8cd 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Constant.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Constant.cpp
@@ -151,9 +151,6 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
             case EbtDouble:
             case EbtFloat:
             case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
                 if (rightUnionArray[i].getDConst() != 0.0)
                     newConstArray[i].setDConst(leftUnionArray[i].getDConst() / rightUnionArray[i].getDConst());
                 else if (leftUnionArray[i].getDConst() > 0.0)
@@ -493,180 +490,11 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
 
     // Process component-wise operations
     for (int i = 0; i < objectSize; i++) {
-        // First read the value and convert to i64/u64/f64/bool, then convert
-        // to the destination type (still 64b), then convert down to the
-        // destination size.
-        if (IsOpNumericConv(op)) {
-            enum ConvType { CONV_FLOAT, CONV_INT, CONV_UINT, CONV_BOOL };
-            ConvType srcType = CONV_UINT, dstType = CONV_UINT;
-            double valf = 0.0;
-            uint64_t valu = 0;
-            int64_t vali = 0;
-            bool valb = false;
-            switch (getType().getBasicType()) {
-            case EbtDouble:
-            case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-            case EbtFloat:
-                valf = unionArray[i].getDConst();
-                srcType = CONV_FLOAT;
-                break;
-            case EbtInt8:
-                vali = unionArray[i].getI8Const();
-                srcType = CONV_INT;
-                break;
-            case EbtInt16:
-                vali = unionArray[i].getI16Const();
-                srcType = CONV_INT;
-                break;
-            case EbtInt:
-                vali = unionArray[i].getIConst();
-                srcType = CONV_INT;
-                break;
-            case EbtInt64:
-                vali = unionArray[i].getI64Const();
-                srcType = CONV_INT;
-                break;
-            case EbtUint8:
-                valu = unionArray[i].getU8Const();
-                srcType = CONV_UINT;
-                break;
-            case EbtUint16:
-                valu = unionArray[i].getU16Const();
-                srcType = CONV_UINT;
-                break;
-            case EbtUint:
-                valu = unionArray[i].getUConst();
-                srcType = CONV_UINT;
-                break;
-            case EbtUint64:
-                valu = unionArray[i].getU64Const();
-                srcType = CONV_UINT;
-                break;
-            case EbtBool:
-                valb = unionArray[i].getBConst();
-                srcType = CONV_BOOL;
-                break;
-            default:
-                assert(0);
-                break;
-            }
-
-            switch (returnType.getBasicType()) {
-            case EbtDouble:
-            case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-            case EbtFloat:
-                dstType = CONV_FLOAT;
-                break;
-            case EbtInt8:
-            case EbtInt16:
-            case EbtInt:
-            case EbtInt64:
-                dstType = CONV_INT;
-                break;
-            case EbtUint8:
-            case EbtUint16:
-            case EbtUint:
-            case EbtUint64:
-                dstType = CONV_UINT;
-                break;
-            case EbtBool:
-                dstType = CONV_BOOL;
-                break;
-            default:
-                assert(0);
-                break;
-            }
-            if (dstType == CONV_BOOL) {
-                switch (srcType) {
-                case CONV_FLOAT:
-                    valb = (valf != 0.0); break;
-                case CONV_INT:
-                    valb = (vali != 0.0); break;
-                case CONV_UINT:
-                    valb = (valu != 0.0); break;
-                default:
-                    break;
-                }
-            } else if (dstType == CONV_FLOAT) {
-                switch (srcType) {
-                case CONV_BOOL:
-                    valf = (double)valb; break;
-                case CONV_INT:
-                    valf = (double)vali; break;
-                case CONV_UINT:
-                    valf = (double)valu; break;
-                default:
-                    break;
-                }
-            } else if (dstType == CONV_INT) {
-                switch (srcType) {
-                case CONV_BOOL:
-                    vali = (int64_t)valb; break;
-                case CONV_FLOAT:
-                    vali = (int64_t)valf; break;
-                case CONV_UINT:
-                    vali = (int64_t)valu; break;
-                default:
-                    break;
-                }
-            } else if (dstType == CONV_UINT) {
-                switch (srcType) {
-                case CONV_BOOL:
-                    valu = (uint64_t)valb; break;
-                case CONV_FLOAT:
-                    valu = (uint64_t)valf; break;
-                case CONV_INT:
-                    valu = (uint64_t)vali; break;
-                default:
-                    break;
-                }
-            }
-            switch (returnType.getBasicType()) {
-            case EbtDouble:
-            case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-            case EbtFloat:
-                newConstArray[i].setDConst(valf); break;
-            case EbtInt8:
-                newConstArray[i].setI8Const(static_cast<int8_t>(vali)); break;
-            case EbtInt16:
-                newConstArray[i].setI16Const(static_cast<int16_t>(vali)); break;
-            case EbtInt:
-                newConstArray[i].setIConst(static_cast<int32_t>(vali)); break;
-            case EbtInt64:
-                newConstArray[i].setI64Const(vali); break;
-            case EbtUint8:
-                newConstArray[i].setU8Const(static_cast<uint8_t>(valu)); break;
-            case EbtUint16:
-                newConstArray[i].setU16Const(static_cast<uint16_t>(valu)); break;
-            case EbtUint:
-                newConstArray[i].setUConst(static_cast<uint32_t>(valu)); break;
-            case EbtUint64:
-                newConstArray[i].setU64Const(valu); break;
-            case EbtBool:
-                newConstArray[i].setBConst(valb); break;
-            default:
-                assert(0);
-                break;
-            }
-            continue;
-        }
         switch (op) {
         case EOpNegative:
             switch (getType().getBasicType()) {
             case EbtDouble:
             case EbtFloat16:
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
             case EbtFloat: newConstArray[i].setDConst(-unionArray[i].getDConst()); break;
             // Note: avoid UBSAN error regarding negating 0x80000000
             case EbtInt:   newConstArray[i].setIConst(
@@ -679,11 +507,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
             case EbtUint8: newConstArray[i].setU8Const(static_cast<unsigned int>(-static_cast<signed int>(unionArray[i].getU8Const())));  break;
             case EbtInt16: newConstArray[i].setI16Const(-unionArray[i].getI16Const()); break;
             case EbtUint16:newConstArray[i].setU16Const(static_cast<unsigned int>(-static_cast<signed int>(unionArray[i].getU16Const())));  break;
-            case EbtInt64: {
-                int64_t i64val = unionArray[i].getI64Const();
-                newConstArray[i].setI64Const(i64val == INT64_MIN ? INT64_MIN : -i64val);
-                break;
-            }
+            case EbtInt64: newConstArray[i].setI64Const(-unionArray[i].getI64Const()); break;
             case EbtUint64: newConstArray[i].setU64Const(static_cast<unsigned long long>(-static_cast<long long>(unionArray[i].getU64Const())));  break;
             default:
                 return nullptr;
@@ -813,6 +637,277 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
             break;
         }
 
+        case EOpConvIntToBool:
+            newConstArray[i].setBConst(unionArray[i].getIConst() != 0); break;
+        case EOpConvUintToBool:
+            newConstArray[i].setBConst(unionArray[i].getUConst() != 0); break;
+        case EOpConvBoolToInt:
+            newConstArray[i].setIConst(unionArray[i].getBConst()); break;
+        case EOpConvBoolToUint:
+            newConstArray[i].setUConst(unionArray[i].getBConst()); break;
+        case EOpConvIntToUint:
+            newConstArray[i].setUConst(unionArray[i].getIConst()); break;
+        case EOpConvUintToInt:
+            newConstArray[i].setIConst(unionArray[i].getUConst()); break;
+
+        case EOpConvFloatToBool:
+        case EOpConvDoubleToBool:
+            newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break;
+
+        case EOpConvBoolToFloat:
+        case EOpConvBoolToDouble:
+            newConstArray[i].setDConst(unionArray[i].getBConst()); break;
+
+        case EOpConvIntToFloat:
+        case EOpConvIntToDouble:
+            newConstArray[i].setDConst(unionArray[i].getIConst()); break;
+
+        case EOpConvUintToFloat:
+        case EOpConvUintToDouble:
+            newConstArray[i].setDConst(unionArray[i].getUConst()); break;
+
+        case EOpConvDoubleToFloat:
+        case EOpConvFloatToDouble:
+            newConstArray[i].setDConst(unionArray[i].getDConst()); break;
+
+        case EOpConvFloatToUint:
+        case EOpConvDoubleToUint:
+            newConstArray[i].setUConst(static_cast<unsigned int>(unionArray[i].getDConst())); break;
+
+        case EOpConvFloatToInt:
+        case EOpConvDoubleToInt:
+            newConstArray[i].setIConst(static_cast<int>(unionArray[i].getDConst())); break;
+
+        case EOpConvInt8ToBool:
+            newConstArray[i].setBConst(unionArray[i].getI8Const() != 0); break;
+        case EOpConvUint8ToBool:
+            newConstArray[i].setBConst(unionArray[i].getU8Const() != 0); break;
+        case EOpConvInt16ToBool:
+            newConstArray[i].setBConst(unionArray[i].getI16Const() != 0); break;
+        case EOpConvUint16ToBool:
+            newConstArray[i].setBConst(unionArray[i].getU16Const() != 0); break;
+        case EOpConvInt64ToBool:
+            newConstArray[i].setBConst(unionArray[i].getI64Const() != 0); break;
+        case EOpConvUint64ToBool:
+            newConstArray[i].setBConst(unionArray[i].getU64Const() != 0); break;
+        case EOpConvFloat16ToBool:
+            newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break;
+
+        case EOpConvBoolToInt8:
+            newConstArray[i].setI8Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToUint8:
+            newConstArray[i].setU8Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToInt16:
+            newConstArray[i].setI16Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToUint16:
+            newConstArray[i].setU16Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getBConst()); break;
+        case EOpConvBoolToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getBConst()); break;
+
+        case EOpConvInt8ToInt16:
+            newConstArray[i].setI16Const(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToInt:
+            newConstArray[i].setIConst(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToUint8:
+            newConstArray[i].setU8Const(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToUint16:
+            newConstArray[i].setU16Const(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToUint:
+            newConstArray[i].setUConst(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getI8Const()); break;
+        case EOpConvUint8ToInt8:
+            newConstArray[i].setI8Const(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToInt16:
+            newConstArray[i].setI16Const(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToInt:
+            newConstArray[i].setIConst(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToUint16:
+            newConstArray[i].setU16Const(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToUint:
+            newConstArray[i].setUConst(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getU8Const()); break;
+        case EOpConvInt8ToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToFloat:
+            newConstArray[i].setDConst(unionArray[i].getI8Const()); break;
+        case EOpConvInt8ToDouble:
+            newConstArray[i].setDConst(unionArray[i].getI8Const()); break;
+        case EOpConvUint8ToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToFloat:
+            newConstArray[i].setDConst(unionArray[i].getU8Const()); break;
+        case EOpConvUint8ToDouble:
+            newConstArray[i].setDConst(unionArray[i].getU8Const()); break;
+
+        case EOpConvInt16ToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getI16Const())); break;
+        case EOpConvInt16ToInt:
+            newConstArray[i].setIConst(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getI16Const())); break;
+        case EOpConvInt16ToUint16:
+            newConstArray[i].setU16Const(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToUint:
+            newConstArray[i].setUConst(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getI16Const()); break;
+        case EOpConvUint16ToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getU16Const())); break;
+        case EOpConvUint16ToInt16:
+            newConstArray[i].setI16Const(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToInt:
+            newConstArray[i].setIConst(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getU16Const())); break;
+
+        case EOpConvUint16ToUint:
+            newConstArray[i].setUConst(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getU16Const()); break;
+        case EOpConvInt16ToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToFloat:
+            newConstArray[i].setDConst(unionArray[i].getI16Const()); break;
+        case EOpConvInt16ToDouble:
+            newConstArray[i].setDConst(unionArray[i].getI16Const()); break;
+        case EOpConvUint16ToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToFloat:
+            newConstArray[i].setDConst(unionArray[i].getU16Const()); break;
+        case EOpConvUint16ToDouble:
+            newConstArray[i].setDConst(unionArray[i].getU16Const()); break;
+
+        case EOpConvIntToInt8:
+            newConstArray[i].setI8Const((signed char)unionArray[i].getIConst()); break;
+        case EOpConvIntToInt16:
+            newConstArray[i].setI16Const((signed short)unionArray[i].getIConst()); break;
+        case EOpConvIntToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getIConst()); break;
+        case EOpConvIntToUint8:
+            newConstArray[i].setU8Const((unsigned char)unionArray[i].getIConst()); break;
+        case EOpConvIntToUint16:
+            newConstArray[i].setU16Const((unsigned char)unionArray[i].getIConst()); break;
+        case EOpConvIntToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getIConst()); break;
+
+        case EOpConvUintToInt8:
+            newConstArray[i].setI8Const((signed char)unionArray[i].getUConst()); break;
+        case EOpConvUintToInt16:
+            newConstArray[i].setI16Const((signed short)unionArray[i].getUConst()); break;
+        case EOpConvUintToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getUConst()); break;
+        case EOpConvUintToUint8:
+            newConstArray[i].setU8Const((unsigned char)unionArray[i].getUConst()); break;
+        case EOpConvUintToUint16:
+            newConstArray[i].setU16Const((unsigned short)unionArray[i].getUConst()); break;
+        case EOpConvUintToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getUConst()); break;
+        case EOpConvIntToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getIConst()); break;
+        case EOpConvUintToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getUConst()); break;
+        case EOpConvInt64ToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToInt16:
+            newConstArray[i].setI16Const(static_cast<signed short>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToInt:
+            newConstArray[i].setIConst(static_cast<int>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToUint16:
+            newConstArray[i].setU16Const(static_cast<unsigned short>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToUint:
+            newConstArray[i].setUConst(static_cast<unsigned int>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToUint64:
+            newConstArray[i].setU64Const(unionArray[i].getI64Const()); break;
+        case EOpConvUint64ToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToInt16:
+            newConstArray[i].setI16Const(static_cast<signed short>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToInt:
+            newConstArray[i].setIConst(static_cast<int>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToInt64:
+            newConstArray[i].setI64Const(unionArray[i].getU64Const()); break;
+        case EOpConvUint64ToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToUint16:
+            newConstArray[i].setU16Const(static_cast<unsigned short>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToUint:
+            newConstArray[i].setUConst(static_cast<unsigned int>(unionArray[i].getU64Const())); break;
+        case EOpConvInt64ToFloat16:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToFloat:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getI64Const())); break;
+        case EOpConvInt64ToDouble:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getI64Const())); break;
+        case EOpConvUint64ToFloat16:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToFloat:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getU64Const())); break;
+        case EOpConvUint64ToDouble:
+            newConstArray[i].setDConst(static_cast<double>(unionArray[i].getU64Const())); break;
+        case EOpConvFloat16ToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToInt16:
+            newConstArray[i].setI16Const(static_cast<signed short>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToInt:
+            newConstArray[i].setIConst(static_cast<int>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToInt64:
+            newConstArray[i].setI64Const(static_cast<long long>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToUint16:
+            newConstArray[i].setU16Const(static_cast<unsigned short>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToUint:
+            newConstArray[i].setUConst(static_cast<unsigned int>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToUint64:
+            newConstArray[i].setU64Const(static_cast<unsigned long long>(unionArray[i].getDConst())); break;
+        case EOpConvFloat16ToFloat:
+            newConstArray[i].setDConst(unionArray[i].getDConst()); break;
+        case EOpConvFloat16ToDouble:
+            newConstArray[i].setDConst(unionArray[i].getDConst()); break;
+        case EOpConvFloatToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToInt16:
+            newConstArray[i].setI16Const(static_cast<signed short>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToInt64:
+            newConstArray[i].setI64Const(static_cast<long long>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToUint16:
+            newConstArray[i].setU16Const(static_cast<unsigned short>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToUint64:
+            newConstArray[i].setU64Const(static_cast<unsigned long long>(unionArray[i].getDConst())); break;
+        case EOpConvFloatToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getDConst()); break;
+        case EOpConvDoubleToInt8:
+            newConstArray[i].setI8Const(static_cast<signed char>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToInt16:
+            newConstArray[i].setI16Const(static_cast<signed short>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToInt64:
+            newConstArray[i].setI64Const(static_cast<long long>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToUint8:
+            newConstArray[i].setU8Const(static_cast<unsigned char>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToUint16:
+            newConstArray[i].setU16Const(static_cast<unsigned short>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToUint64:
+            newConstArray[i].setU64Const(static_cast<unsigned long long>(unionArray[i].getDConst())); break;
+        case EOpConvDoubleToFloat16:
+            newConstArray[i].setDConst(unionArray[i].getDConst()); break;
         case EOpConvPtrToUint64:
         case EOpConvUint64ToPtr:
         case EOpConstructReference:
@@ -914,12 +1009,6 @@ TIntermTyped* TIntermediate::fold(TIntermAggregate* aggrNode)
         objectSize = std::max(children[0]->getAsTyped()->getType().getVectorSize(),
                               children[2]->getAsTyped()->getType().getVectorSize());
         break;
-    case EOpMul:
-        {
-        TIntermConstantUnion* left = children[0]->getAsConstantUnion();
-        TIntermConstantUnion* right = children[1]->getAsConstantUnion();
-        return left->fold(EOpMul, right);
-        }
     default:
         return aggrNode;
     }
@@ -959,9 +1048,6 @@ TIntermTyped* TIntermediate::fold(TIntermAggregate* aggrNode)
             case EOpMin:
                 switch(children[0]->getAsTyped()->getBasicType()) {
                 case EbtFloat16:
-                case EbtBFloat16:
-                case EbtFloatE5M2:
-                case EbtFloatE4M3:
                 case EbtFloat:
                 case EbtDouble:
                     newConstArray[comp].setDConst(std::min(childConstUnions[0][arg0comp].getDConst(), childConstUnions[1][arg1comp].getDConst()));
@@ -996,9 +1082,6 @@ TIntermTyped* TIntermediate::fold(TIntermAggregate* aggrNode)
             case EOpMax:
                 switch(children[0]->getAsTyped()->getBasicType()) {
                 case EbtFloat16:
-                case EbtBFloat16:
-                case EbtFloatE5M2:
-                case EbtFloatE4M3:
                 case EbtFloat:
                 case EbtDouble:
                     newConstArray[comp].setDConst(std::max(childConstUnions[0][arg0comp].getDConst(), childConstUnions[1][arg1comp].getDConst()));
@@ -1033,9 +1116,6 @@ TIntermTyped* TIntermediate::fold(TIntermAggregate* aggrNode)
             case EOpClamp:
                 switch(children[0]->getAsTyped()->getBasicType()) {
                 case EbtFloat16:
-                case EbtBFloat16:
-                case EbtFloatE5M2:
-                case EbtFloatE4M3:
                 case EbtFloat:
                 case EbtDouble:
                     newConstArray[comp].setDConst(std::min(std::max(childConstUnions[0][arg0comp].getDConst(), childConstUnions[1][arg1comp].getDConst()),
@@ -1143,9 +1223,6 @@ TIntermTyped* TIntermediate::fold(TIntermAggregate* aggrNode)
             break;
         }
         case EOpDot:
-            if (!children[0]->getAsTyped()->isFloatingDomain()) {
-                return aggrNode;
-            }
             newConstArray[0].setDConst(childConstUnions[0].dot(childConstUnions[1]));
             break;
         case EOpCross:
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Initialize.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/Initialize.cpp
index 34bc5299..8e742eab 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Initialize.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Initialize.cpp
@@ -52,7 +52,6 @@
 //
 
 #include <array>
-#include <sstream>
 #include "Initialize.h"
 #include "span.h"
 
@@ -118,12 +117,12 @@ enum ArgClass {
     ClassFIO    = 1 << 9,  // first argument is inout
     ClassRS     = 1 << 10, // the return is held scalar as the arguments cycle
     ClassNS     = 1 << 11, // no scalar prototype
-    ClassCVN    = 1 << 12, // first argument is 'coherent volatile nontemporal'
+    ClassCV     = 1 << 12, // first argument is 'coherent volatile'
     ClassFO     = 1 << 13, // first argument is output
     ClassV3     = 1 << 14, // vec3 only
 };
 // Mixtures of the above, to help the function tables
-const ArgClass ClassV1FIOCVN = (ArgClass)(ClassV1 | ClassFIO | ClassCVN);
+const ArgClass ClassV1FIOCV = (ArgClass)(ClassV1 | ClassFIO | ClassCV);
 const ArgClass ClassBNS     = (ArgClass)(ClassB  | ClassNS);
 const ArgClass ClassRSNS    = (ArgClass)(ClassRS | ClassNS);
 
@@ -246,14 +245,14 @@ const std::array BaseFunctions = {
     BuiltInFunction{ EOpGreaterThanEqual, "greaterThanEqual", 2,   TypeU,     ClassBNS,     {Es300Desktop130Version} },
     BuiltInFunction{ EOpVectorEqual,      "equal",            2,   TypeU,     ClassBNS,     {Es300Desktop130Version} },
     BuiltInFunction{ EOpVectorNotEqual,   "notEqual",         2,   TypeU,     ClassBNS,     {Es300Desktop130Version} },
-    BuiltInFunction{ EOpAtomicAdd,        "atomicAdd",        2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicMin,        "atomicMin",        2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicMax,        "atomicMax",        2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicAnd,        "atomicAnd",        2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicOr,         "atomicOr",         2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicXor,        "atomicXor",        2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicExchange,   "atomicExchange",   2,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
-    BuiltInFunction{ EOpAtomicCompSwap,   "atomicCompSwap",   3,   TypeIU,    ClassV1FIOCVN, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicAdd,        "atomicAdd",        2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicMin,        "atomicMin",        2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicMax,        "atomicMax",        2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicAnd,        "atomicAnd",        2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicOr,         "atomicOr",         2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicXor,        "atomicXor",        2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicExchange,   "atomicExchange",   2,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
+    BuiltInFunction{ EOpAtomicCompSwap,   "atomicCompSwap",   3,   TypeIU,    ClassV1FIOCV, {Es310Desktop400Version} },
     BuiltInFunction{ EOpMix,              "mix",              3,   TypeB,     ClassRegular, {Es310Desktop450Version} },
     BuiltInFunction{ EOpMix,              "mix",              3,   TypeIU,    ClassLB,      {Es310Desktop450Version} },
 };
@@ -369,8 +368,8 @@ void AddTabledBuiltin(TString& decls, const BuiltInFunction& function)
                 if (arg == function.numArguments - 1 && (function.classes & ClassLO))
                     decls.append("out ");
                 if (arg == 0) {
-                    if (function.classes & ClassCVN)
-                        decls.append("coherent volatile nontemporal ");
+                    if (function.classes & ClassCV)
+                        decls.append("coherent volatile ");
                     if (function.classes & ClassFIO)
                         decls.append("inout ");
                     if (function.classes & ClassFO)
@@ -1353,130 +1352,130 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
     if ((profile == EEsProfile && version >= 310) ||
         (profile != EEsProfile && version >= 430)) {
         commonBuiltins.append(
-            "uint atomicAdd(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicAdd(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicAdd(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicAdd(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicMin(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicMin(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicMin(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicMin(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicMax(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicMax(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicMax(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicMax(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicAnd(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicAnd(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicAnd(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicAnd(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicOr (coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicOr (coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicOr (coherent volatile inout uint, uint, int, int, int);"
+            " int atomicOr (coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicXor(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicXor(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicXor(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicXor(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicExchange(coherent volatile nontemporal inout uint, uint, int, int, int);"
-            " int atomicExchange(coherent volatile nontemporal inout  int,  int, int, int, int);"
+            "uint atomicExchange(coherent volatile inout uint, uint, int, int, int);"
+            " int atomicExchange(coherent volatile inout  int,  int, int, int, int);"
 
-            "uint atomicCompSwap(coherent volatile nontemporal inout uint, uint, uint, int, int, int, int, int);"
-            " int atomicCompSwap(coherent volatile nontemporal inout  int,  int,  int, int, int, int, int, int);"
+            "uint atomicCompSwap(coherent volatile inout uint, uint, uint, int, int, int, int, int);"
+            " int atomicCompSwap(coherent volatile inout  int,  int,  int, int, int, int, int, int);"
 
-            "uint atomicLoad(coherent volatile nontemporal in uint, int, int, int);"
-            " int atomicLoad(coherent volatile nontemporal in  int, int, int, int);"
+            "uint atomicLoad(coherent volatile in uint, int, int, int);"
+            " int atomicLoad(coherent volatile in  int, int, int, int);"
 
-            "void atomicStore(coherent volatile nontemporal out uint, uint, int, int, int);"
-            "void atomicStore(coherent volatile nontemporal out  int,  int, int, int, int);"
+            "void atomicStore(coherent volatile out uint, uint, int, int, int);"
+            "void atomicStore(coherent volatile out  int,  int, int, int, int);"
 
             "\n");
     }
 
     if (profile != EEsProfile && version >= 440) {
         commonBuiltins.append(
-            "uint64_t atomicMin(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicMin(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicMin(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicMin(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
-            "float16_t atomicMin(coherent volatile nontemporal inout float16_t, float16_t);"
-            "float16_t atomicMin(coherent volatile nontemporal inout float16_t, float16_t, int, int, int);"
-            "   float atomicMin(coherent volatile nontemporal inout float, float);"
-            "   float atomicMin(coherent volatile nontemporal inout float, float, int, int, int);"
-            "  double atomicMin(coherent volatile nontemporal inout double, double);"
-            "  double atomicMin(coherent volatile nontemporal inout double, double, int, int, int);"
+            "uint64_t atomicMin(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicMin(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicMin(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicMin(coherent volatile inout  int64_t,  int64_t, int, int, int);"
+            "float16_t atomicMin(coherent volatile inout float16_t, float16_t);"
+            "float16_t atomicMin(coherent volatile inout float16_t, float16_t, int, int, int);"
+            "   float atomicMin(coherent volatile inout float, float);"
+            "   float atomicMin(coherent volatile inout float, float, int, int, int);"
+            "  double atomicMin(coherent volatile inout double, double);"
+            "  double atomicMin(coherent volatile inout double, double, int, int, int);"
 
-            "uint64_t atomicMax(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicMax(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicMax(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicMax(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
-            "float16_t atomicMax(coherent volatile nontemporal inout float16_t, float16_t);"
-            "float16_t atomicMax(coherent volatile nontemporal inout float16_t, float16_t, int, int, int);"
-            "   float atomicMax(coherent volatile nontemporal inout float, float);"
-            "   float atomicMax(coherent volatile nontemporal inout float, float, int, int, int);"
-            "  double atomicMax(coherent volatile nontemporal inout double, double);"
-            "  double atomicMax(coherent volatile nontemporal inout double, double, int, int, int);"
+            "uint64_t atomicMax(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicMax(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicMax(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicMax(coherent volatile inout  int64_t,  int64_t, int, int, int);"
+            "float16_t atomicMax(coherent volatile inout float16_t, float16_t);"
+            "float16_t atomicMax(coherent volatile inout float16_t, float16_t, int, int, int);"
+            "   float atomicMax(coherent volatile inout float, float);"
+            "   float atomicMax(coherent volatile inout float, float, int, int, int);"
+            "  double atomicMax(coherent volatile inout double, double);"
+            "  double atomicMax(coherent volatile inout double, double, int, int, int);"
 
-            "uint64_t atomicAnd(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicAnd(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicAnd(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicAnd(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
+            "uint64_t atomicAnd(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicAnd(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicAnd(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicAnd(coherent volatile inout  int64_t,  int64_t, int, int, int);"
 
-            "uint64_t atomicOr (coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicOr (coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicOr (coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicOr (coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
+            "uint64_t atomicOr (coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicOr (coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicOr (coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicOr (coherent volatile inout  int64_t,  int64_t, int, int, int);"
 
-            "uint64_t atomicXor(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicXor(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicXor(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicXor(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
+            "uint64_t atomicXor(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicXor(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicXor(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicXor(coherent volatile inout  int64_t,  int64_t, int, int, int);"
 
-            "uint64_t atomicAdd(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicAdd(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicAdd(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicAdd(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
-            "float16_t atomicAdd(coherent volatile nontemporal inout float16_t, float16_t);"
-            "float16_t atomicAdd(coherent volatile nontemporal inout float16_t, float16_t, int, int, int);"
-            "   float atomicAdd(coherent volatile nontemporal inout float, float);"
-            "   float atomicAdd(coherent volatile nontemporal inout float, float, int, int, int);"
-            "  double atomicAdd(coherent volatile nontemporal inout double, double);"
-            "  double atomicAdd(coherent volatile nontemporal inout double, double, int, int, int);"
+            "uint64_t atomicAdd(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicAdd(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicAdd(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicAdd(coherent volatile inout  int64_t,  int64_t, int, int, int);"
+            "float16_t atomicAdd(coherent volatile inout float16_t, float16_t);"
+            "float16_t atomicAdd(coherent volatile inout float16_t, float16_t, int, int, int);"
+            "   float atomicAdd(coherent volatile inout float, float);"
+            "   float atomicAdd(coherent volatile inout float, float, int, int, int);"
+            "  double atomicAdd(coherent volatile inout double, double);"
+            "  double atomicAdd(coherent volatile inout double, double, int, int, int);"
 
-            "uint64_t atomicExchange(coherent volatile nontemporal inout uint64_t, uint64_t);"
-            " int64_t atomicExchange(coherent volatile nontemporal inout  int64_t,  int64_t);"
-            "uint64_t atomicExchange(coherent volatile nontemporal inout uint64_t, uint64_t, int, int, int);"
-            " int64_t atomicExchange(coherent volatile nontemporal inout  int64_t,  int64_t, int, int, int);"
-            "float16_t atomicExchange(coherent volatile nontemporal inout float16_t, float16_t);"
-            "float16_t atomicExchange(coherent volatile nontemporal inout float16_t, float16_t, int, int, int);"
-            "   float atomicExchange(coherent volatile nontemporal inout float, float);"
-            "   float atomicExchange(coherent volatile nontemporal inout float, float, int, int, int);"
-            "  double atomicExchange(coherent volatile nontemporal inout double, double);"
-            "  double atomicExchange(coherent volatile nontemporal inout double, double, int, int, int);"
+            "uint64_t atomicExchange(coherent volatile inout uint64_t, uint64_t);"
+            " int64_t atomicExchange(coherent volatile inout  int64_t,  int64_t);"
+            "uint64_t atomicExchange(coherent volatile inout uint64_t, uint64_t, int, int, int);"
+            " int64_t atomicExchange(coherent volatile inout  int64_t,  int64_t, int, int, int);"
+            "float16_t atomicExchange(coherent volatile inout float16_t, float16_t);"
+            "float16_t atomicExchange(coherent volatile inout float16_t, float16_t, int, int, int);"
+            "   float atomicExchange(coherent volatile inout float, float);"
+            "   float atomicExchange(coherent volatile inout float, float, int, int, int);"
+            "  double atomicExchange(coherent volatile inout double, double);"
+            "  double atomicExchange(coherent volatile inout double, double, int, int, int);"
 
-            "uint64_t atomicCompSwap(coherent volatile nontemporal inout uint64_t, uint64_t, uint64_t);"
-            " int64_t atomicCompSwap(coherent volatile nontemporal inout  int64_t,  int64_t,  int64_t);"
-            "uint64_t atomicCompSwap(coherent volatile nontemporal inout uint64_t, uint64_t, uint64_t, int, int, int, int, int);"
-            " int64_t atomicCompSwap(coherent volatile nontemporal inout  int64_t,  int64_t,  int64_t, int, int, int, int, int);"
+            "uint64_t atomicCompSwap(coherent volatile inout uint64_t, uint64_t, uint64_t);"
+            " int64_t atomicCompSwap(coherent volatile inout  int64_t,  int64_t,  int64_t);"
+            "uint64_t atomicCompSwap(coherent volatile inout uint64_t, uint64_t, uint64_t, int, int, int, int, int);"
+            " int64_t atomicCompSwap(coherent volatile inout  int64_t,  int64_t,  int64_t, int, int, int, int, int);"
 
-            "uint64_t atomicLoad(coherent volatile nontemporal in uint64_t, int, int, int);"
-            " int64_t atomicLoad(coherent volatile nontemporal in  int64_t, int, int, int);"
-            "float16_t atomicLoad(coherent volatile nontemporal in float16_t, int, int, int);"
-            "   float atomicLoad(coherent volatile nontemporal in float, int, int, int);"
-            "  double atomicLoad(coherent volatile nontemporal in double, int, int, int);"
+            "uint64_t atomicLoad(coherent volatile in uint64_t, int, int, int);"
+            " int64_t atomicLoad(coherent volatile in  int64_t, int, int, int);"
+            "float16_t atomicLoad(coherent volatile in float16_t, int, int, int);"
+            "   float atomicLoad(coherent volatile in float, int, int, int);"
+            "  double atomicLoad(coherent volatile in double, int, int, int);"
 
-            "void atomicStore(coherent volatile nontemporal out uint64_t, uint64_t, int, int, int);"
-            "void atomicStore(coherent volatile nontemporal out  int64_t,  int64_t, int, int, int);"
-            "void atomicStore(coherent volatile nontemporal out float16_t, float16_t, int, int, int);"
-            "void atomicStore(coherent volatile nontemporal out float, float, int, int, int);"
-            "void atomicStore(coherent volatile nontemporal out double, double, int, int, int);"
+            "void atomicStore(coherent volatile out uint64_t, uint64_t, int, int, int);"
+            "void atomicStore(coherent volatile out  int64_t,  int64_t, int, int, int);"
+            "void atomicStore(coherent volatile out float16_t, float16_t, int, int, int);"
+            "void atomicStore(coherent volatile out float, float, int, int, int);"
+            "void atomicStore(coherent volatile out double, double, int, int, int);"
             "\n");
     }
 
     // NV_shader_atomic_fp16_vector
     if (profile != EEsProfile && version >= 430) {
         commonBuiltins.append(
-            "f16vec2 atomicAdd(coherent volatile nontemporal inout f16vec2, f16vec2);"
-            "f16vec4 atomicAdd(coherent volatile nontemporal inout f16vec4, f16vec4);"
-            "f16vec2 atomicMin(coherent volatile nontemporal inout f16vec2, f16vec2);"
-            "f16vec4 atomicMin(coherent volatile nontemporal inout f16vec4, f16vec4);"
-            "f16vec2 atomicMax(coherent volatile nontemporal inout f16vec2, f16vec2);"
-            "f16vec4 atomicMax(coherent volatile nontemporal inout f16vec4, f16vec4);"
-            "f16vec2 atomicExchange(coherent volatile nontemporal inout f16vec2, f16vec2);"
-            "f16vec4 atomicExchange(coherent volatile nontemporal inout f16vec4, f16vec4);"
+            "f16vec2 atomicAdd(coherent volatile inout f16vec2, f16vec2);"
+            "f16vec4 atomicAdd(coherent volatile inout f16vec4, f16vec4);"
+            "f16vec2 atomicMin(coherent volatile inout f16vec2, f16vec2);"
+            "f16vec4 atomicMin(coherent volatile inout f16vec4, f16vec4);"
+            "f16vec2 atomicMax(coherent volatile inout f16vec2, f16vec2);"
+            "f16vec4 atomicMax(coherent volatile inout f16vec4, f16vec4);"
+            "f16vec2 atomicExchange(coherent volatile inout f16vec2, f16vec2);"
+            "f16vec4 atomicExchange(coherent volatile inout f16vec4, f16vec4);"
             "\n");
     }
 
@@ -1506,7 +1505,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
     }
 
-    if ((profile != EEsProfile && version >= 150) || // GL_NV_gpu_shader5
+    if ((profile != EEsProfile && version >= 400) ||
         (profile == EEsProfile && version >= 310)) {    // GL_OES_gpu_shader5
 
         commonBuiltins.append(
@@ -1536,7 +1535,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
     }
 
     if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 150)) { // GL_NV_gpu_shader5
+        (profile != EEsProfile && version >= 400)) {
         commonBuiltins.append(
             "float frexp(highp float, out highp int);"
             "vec2  frexp(highp vec2,  out highp ivec2);"
@@ -1865,29 +1864,29 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
     else if (spvVersion.vulkanRelaxed) {
         //
         // Atomic counter functions act as aliases to normal atomic functions.
-        // replace definitions to take 'volatile coherent nontemporal uint' instead of 'atomic_uint'
+        // replace definitions to take 'volatile coherent uint' instead of 'atomic_uint'
         // and map to equivalent non-counter atomic op
         //
         if ((profile != EEsProfile && version >= 300) ||
             (profile == EEsProfile && version >= 310)) {
             commonBuiltins.append(
-                "uint atomicCounterIncrement(volatile coherent nontemporal uint);"
-                "uint atomicCounterDecrement(volatile coherent nontemporal uint);"
-                "uint atomicCounter(volatile coherent nontemporal uint);"
+                "uint atomicCounterIncrement(volatile coherent uint);"
+                "uint atomicCounterDecrement(volatile coherent uint);"
+                "uint atomicCounter(volatile coherent uint);"
 
                 "\n");
         }
         if (profile != EEsProfile && version >= 460) {
             commonBuiltins.append(
-                "uint atomicCounterAdd(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterSubtract(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterMin(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterMax(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterAnd(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterOr(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterXor(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterExchange(volatile coherent nontemporal uint, uint);"
-                "uint atomicCounterCompSwap(volatile coherent nontemporal uint, uint, uint);"
+                "uint atomicCounterAdd(volatile coherent uint, uint);"
+                "uint atomicCounterSubtract(volatile coherent uint, uint);"
+                "uint atomicCounterMin(volatile coherent uint, uint);"
+                "uint atomicCounterMax(volatile coherent uint, uint);"
+                "uint atomicCounterAnd(volatile coherent uint, uint);"
+                "uint atomicCounterOr(volatile coherent uint, uint);"
+                "uint atomicCounterXor(volatile coherent uint, uint);"
+                "uint atomicCounterExchange(volatile coherent uint, uint);"
+                "uint atomicCounterCompSwap(volatile coherent uint, uint, uint);"
 
                 "\n");
         }
@@ -1895,7 +1894,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
 
     // Bitfield
     if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 150)) { // ARB_gpu_shader5/NV_gpu_shader5
+        (profile != EEsProfile && version >= 400)) {
         commonBuiltins.append(
             "  int bitfieldExtract(  int, int, int);"
             "ivec2 bitfieldExtract(ivec2, int, int);"
@@ -1920,7 +1919,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
     }
 
-    if (profile != EEsProfile && version >= 150) { //GL_ARB_gpu_shader5/GL_NV_gpu_shader5
+    if (profile != EEsProfile && version >= 400) {
         commonBuiltins.append(
             "  int findLSB(  int);"
             "ivec2 findLSB(ivec2);"
@@ -1948,7 +1947,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
     }
 
-    if (profile != EEsProfile && version >= 150) { //GL_ARB_gpu_shader5/GL_NV_gpu_shader5
+    if (profile != EEsProfile && version >= 400) {
         commonBuiltins.append(
             "  int bitCount(  int);"
             "ivec2 bitCount(ivec2);"
@@ -1969,146 +1968,12 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "ivec2 findMSB(highp uvec2);"
             "ivec3 findMSB(highp uvec3);"
             "ivec4 findMSB(highp uvec4);"
-            "\n");
-    }
-
-    if (profile != EEsProfile && version >= 150 && version < 450) { //GL_NV_gpu_shader5
-        commonBuiltins.append(
-            "int64_t  packInt2x32(ivec2);"
-            "uint64_t packUint2x32(uvec2);"
-            "ivec2    unpackInt2x32(int64_t);"
-            "uvec2    unpackUint2x32(uint64_t);"
-
-            "uint     packFloat2x16(f16vec2);"
-            "f16vec2  unpackFloat2x16(uint);"
-
-            "int64_t doubleBitsToInt64(double);"
-            "i64vec2 doubleBitsToInt64(dvec2);"
-            "i64vec3 doubleBitsToInt64(dvec3);"
-            "i64vec4 doubleBitsToInt64(dvec4);"
-
-            "uint64_t doubleBitsToUint64(double);"
-            "u64vec2  doubleBitsToUint64(dvec2);"
-            "u64vec3  doubleBitsToUint64(dvec3);"
-            "u64vec4  doubleBitsToUint64(dvec4);"
-
-            "double int64BitsToDouble(int64_t);"
-            "dvec2  int64BitsToDouble(i64vec2);"
-            "dvec3  int64BitsToDouble(i64vec3);"
-            "dvec4  int64BitsToDouble(i64vec4);"
-
-            "double uint64BitsToDouble(uint64_t);"
-            "dvec2  uint64BitsToDouble(u64vec2);"
-            "dvec3  uint64BitsToDouble(u64vec3);"
-            "dvec4  uint64BitsToDouble(u64vec4);"
-            // Modifications to Vector Relational Functions
-            // Introduction of explicitly sized types
-            "bvec2 lessThan(i64vec2, i64vec2);"
-            "bvec3 lessThan(i64vec3, i64vec3);"
-            "bvec4 lessThan(i64vec4, i64vec4);"
-            "bvec2 lessThan(u64vec2, u64vec2);"
-            "bvec3 lessThan(u64vec3, u64vec3);"
-            "bvec4 lessThan(u64vec4, u64vec4);"
-
-            "bvec2 lessThanEqual(i64vec2, i64vec2);"
-            "bvec3 lessThanEqual(i64vec3, i64vec3);"
-            "bvec4 lessThanEqual(i64vec4, i64vec4);"
-            "bvec2 lessThanEqual(u64vec2, u64vec2);"
-            "bvec3 lessThanEqual(u64vec3, u64vec3);"
-            "bvec4 lessThanEqual(u64vec4, u64vec4);"
-
-            "bvec2 greaterThan(i64vec2, i64vec2);"
-            "bvec3 greaterThan(i64vec3, i64vec3);"
-            "bvec4 greaterThan(i64vec4, i64vec4);"
-            "bvec2 greaterThan(u64vec2, u64vec2);"
-            "bvec3 greaterThan(u64vec3, u64vec3);"
-            "bvec4 greaterThan(u64vec4, u64vec4);"
-
-            "bvec2 greaterThanEqual(i64vec2, i64vec2);"
-            "bvec3 greaterThanEqual(i64vec3, i64vec3);"
-            "bvec4 greaterThanEqual(i64vec4, i64vec4);"
-            "bvec2 greaterThanEqual(u64vec2, u64vec2);"
-            "bvec3 greaterThanEqual(u64vec3, u64vec3);"
-            "bvec4 greaterThanEqual(u64vec4, u64vec4);"
-
-            "bvec2 equal(i64vec2, i64vec2);"
-            "bvec3 equal(i64vec3, i64vec3);"
-            "bvec4 equal(i64vec4, i64vec4);"
-            "bvec2 equal(u64vec2, u64vec2);"
-            "bvec3 equal(u64vec3, u64vec3);"
-            "bvec4 equal(u64vec4, u64vec4);"
-
-            "bvec2 notEqual(i64vec2, i64vec2);"
-            "bvec3 notEqual(i64vec3, i64vec3);"
-            "bvec4 notEqual(i64vec4, i64vec4);"
-            "bvec2 notEqual(u64vec2, u64vec2);"
-            "bvec3 notEqual(u64vec3, u64vec3);"
-            "bvec4 notEqual(u64vec4, u64vec4);"
-
-            "bvec2 lessThan(f16vec2, f16vec2);"
-            "bvec3 lessThan(f16vec3, f16vec3);"
-            "bvec4 lessThan(f16vec4, f16vec4);"
-
-            "bvec2 lessThanEqual(f16vec2, f16vec2);"
-            "bvec3 lessThanEqual(f16vec3, f16vec3);"
-            "bvec4 lessThanEqual(f16vec4, f16vec4);"
-
-            "bvec2 greaterThan(f16vec2, f16vec2);"
-            "bvec3 greaterThan(f16vec3, f16vec3);"
-            "bvec4 greaterThan(f16vec4, f16vec4);"
-
-            "bvec2 greaterThanEqual(f16vec2, f16vec2);"
-            "bvec3 greaterThanEqual(f16vec3, f16vec3);"
-            "bvec4 greaterThanEqual(f16vec4, f16vec4);"
-
-            "bvec2 equal(f16vec2, f16vec2);"
-            "bvec3 equal(f16vec3, f16vec3);"
-            "bvec4 equal(f16vec4, f16vec4);"
-
-            "bvec2 notEqual(f16vec2, f16vec2);"
-            "bvec3 notEqual(f16vec3, f16vec3);"
-            "bvec4 notEqual(f16vec4, f16vec4);"
-
-            // Dependency on GL_ARB_gpu_shader_fp64
-            "bvec2 lessThan(dvec2, dvec2);"
-            "bvec3 lessThan(dvec3, dvec3);"
-            "bvec4 lessThan(dvec4, dvec4);"
-
-            "bvec2 lessThanEqual(dvec2, dvec2);"
-            "bvec3 lessThanEqual(dvec3, dvec3);"
-            "bvec4 lessThanEqual(dvec4, dvec4);"
-
-            "bvec2 greaterThan(dvec2, dvec2);"
-            "bvec3 greaterThan(dvec3, dvec3);"
-            "bvec4 greaterThan(dvec4, dvec4);"
-
-            "bvec2 greaterThanEqual(dvec2, dvec2);"
-            "bvec3 greaterThanEqual(dvec3, dvec3);"
-            "bvec4 greaterThanEqual(dvec4, dvec4);"
-
-            "bvec2 equal(dvec2, dvec2);"
-            "bvec3 equal(dvec3, dvec3);"
-            "bvec4 equal(dvec4, dvec4);"
-
-            "bvec2 notEqual(dvec2, dvec2);"
-            "bvec3 notEqual(dvec3, dvec3);"
-            "bvec4 notEqual(dvec4, dvec4);"
-
-            "\n");
-    }
-
-
-    if (profile != EEsProfile && version >= 150) {
-        commonBuiltins.append(
-            "bool anyThreadNV(bool);"
-            "bool allThreadsNV(bool);"
-            "bool allThreadsEqualNV(bool);"
 
             "\n");
     }
 
     if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 150)) { // NV_gpu_shader5
+        (profile != EEsProfile && version >= 400)) {
         commonBuiltins.append(
             " uint uaddCarry(highp  uint, highp  uint, out lowp  uint carry);"
             "uvec2 uaddCarry(highp uvec2, highp uvec2, out lowp uvec2 carry);"
@@ -2216,143 +2081,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
     }
 
-    // GL_EXT_integer_dot_product
-    if ((profile == EEsProfile && version >= 300) ||
-        (profile != EEsProfile && version >= 450)) {
-        commonBuiltins.append(
-
-            "uint dotEXT(uvec2 a, uvec2 b);"
-            "int dotEXT(ivec2 a, ivec2 b);"
-            "int dotEXT(ivec2 a, uvec2 b);"
-            "int dotEXT(uvec2 a, ivec2 b);"
-
-            "uint dotEXT(uvec3 a, uvec3 b);"
-            "int dotEXT(ivec3 a, ivec3 b);"
-            "int dotEXT(ivec3 a, uvec3 b);"
-            "int dotEXT(uvec3 a, ivec3 b);"
-
-            "uint dotEXT(uvec4 a, uvec4 b);"
-            "int dotEXT(ivec4 a, ivec4 b);"
-            "int dotEXT(ivec4 a, uvec4 b);"
-            "int dotEXT(uvec4 a, ivec4 b);"
-
-            "uint dotPacked4x8EXT(uint a, uint b);"
-            "int dotPacked4x8EXT(int a, uint b);"
-            "int dotPacked4x8EXT(uint a, int b);"
-            "int dotPacked4x8EXT(int a, int b);"
-
-            "uint dotEXT(u8vec2 a, u8vec2 b);"
-            "int dotEXT(i8vec2 a, u8vec2 b);"
-            "int dotEXT(u8vec2 a, i8vec2 b);"
-            "int dotEXT(i8vec2 a, i8vec2 b);"
-
-            "uint dotEXT(u8vec3 a, u8vec3 b);"
-            "int dotEXT(i8vec3 a, u8vec3 b);"
-            "int dotEXT(u8vec3 a, i8vec3 b);"
-            "int dotEXT(i8vec3 a, i8vec3 b);"
-
-            "uint dotEXT(u8vec4 a, u8vec4 b);"
-            "int dotEXT(i8vec4 a, u8vec4 b);"
-            "int dotEXT(u8vec4 a, i8vec4 b);"
-            "int dotEXT(i8vec4 a, i8vec4 b);"
-
-            "uint dotEXT(u16vec2 a, u16vec2 b);"
-            "int dotEXT(i16vec2 a, u16vec2 b);"
-            "int dotEXT(u16vec2 a, i16vec2 b);"
-            "int dotEXT(i16vec2 a, i16vec2 b);"
-
-            "uint dotEXT(u16vec3 a, u16vec3 b);"
-            "int dotEXT(i16vec3 a, u16vec3 b);"
-            "int dotEXT(u16vec3 a, i16vec3 b);"
-            "int dotEXT(i16vec3 a, i16vec3 b);"
-
-            "uint dotEXT(u16vec4 a, u16vec4 b);"
-            "int dotEXT(i16vec4 a, u16vec4 b);"
-            "int dotEXT(u16vec4 a, i16vec4 b);"
-            "int dotEXT(i16vec4 a, i16vec4 b);"
-
-            "uint64_t dotEXT(u64vec2 a, u64vec2 b);"
-            "int64_t dotEXT(i64vec2 a, u64vec2 b);"
-            "int64_t dotEXT(u64vec2 a, i64vec2 b);"
-            "int64_t dotEXT(i64vec2 a, i64vec2 b);"
-
-            "uint64_t dotEXT(u64vec3 a, u64vec3 b);"
-            "int64_t dotEXT(i64vec3 a, u64vec3 b);"
-            "int64_t dotEXT(u64vec3 a, i64vec3 b);"
-            "int64_t dotEXT(i64vec3 a, i64vec3 b);"
-
-            "uint64_t dotEXT(u64vec4 a, u64vec4 b);"
-            "int64_t dotEXT(i64vec4 a, u64vec4 b);"
-            "int64_t dotEXT(u64vec4 a, i64vec4 b);"
-            "int64_t dotEXT(i64vec4 a, i64vec4 b);"
-
-            "uint dotAccSatEXT(uvec2 a, uvec2 b, uint c);"
-            "int dotAccSatEXT(ivec2 a, uvec2 b, int c);"
-            "int dotAccSatEXT(uvec2 a, ivec2 b, int c);"
-            "int dotAccSatEXT(ivec2 a, ivec2 b, int c);"
-
-            "uint dotAccSatEXT(uvec3 a, uvec3 b, uint c);"
-            "int dotAccSatEXT(ivec3 a, uvec3 b, int c);"
-            "int dotAccSatEXT(uvec3 a, ivec3 b, int c);"
-            "int dotAccSatEXT(ivec3 a, ivec3 b, int c);"
-
-            "uint dotAccSatEXT(uvec4 a, uvec4 b, uint c);"
-            "int dotAccSatEXT(ivec4 a, uvec4 b, int c);"
-            "int dotAccSatEXT(uvec4 a, ivec4 b, int c);"
-            "int dotAccSatEXT(ivec4 a, ivec4 b, int c);"
-
-            "uint dotPacked4x8AccSatEXT(uint a, uint b, uint c);"
-            "int dotPacked4x8AccSatEXT(int a, uint b, int c);"
-            "int dotPacked4x8AccSatEXT(uint a, int b, int c);"
-            "int dotPacked4x8AccSatEXT(int a, int b, int c);"
-
-            "uint dotAccSatEXT(u8vec2 a, u8vec2 b, uint c);"
-            "int dotAccSatEXT(i8vec2 a, u8vec2 b, int c);"
-            "int dotAccSatEXT(u8vec2 a, i8vec2 b, int c);"
-            "int dotAccSatEXT(i8vec2 a, i8vec2 b, int c);"
-
-            "uint dotAccSatEXT(u8vec3 a, u8vec3 b, uint c);"
-            "int dotAccSatEXT(i8vec3 a, u8vec3 b, int c);"
-            "int dotAccSatEXT(u8vec3 a, i8vec3 b, int c);"
-            "int dotAccSatEXT(i8vec3 a, i8vec3 b, int c);"
-
-            "uint dotAccSatEXT(u8vec4 a, u8vec4 b, uint c);"
-            "int dotAccSatEXT(i8vec4 a, u8vec4 b, int c);"
-            "int dotAccSatEXT(u8vec4 a, i8vec4 b, int c);"
-            "int dotAccSatEXT(i8vec4 a, i8vec4 b, int c);"
-
-            "uint dotAccSatEXT(u16vec2 a, u16vec2 b, uint c);"
-            "int dotAccSatEXT(i16vec2 a, u16vec2 b, int c);"
-            "int dotAccSatEXT(u16vec2 a, i16vec2 b, int c);"
-            "int dotAccSatEXT(i16vec2 a, i16vec2 b, int c);"
-
-            "uint dotAccSatEXT(u16vec3 a, u16vec3 b, uint c);"
-            "int dotAccSatEXT(i16vec3 a, u16vec3 b, int c);"
-            "int dotAccSatEXT(u16vec3 a, i16vec3 b, int c);"
-            "int dotAccSatEXT(i16vec3 a, i16vec3 b, int c);"
-
-            "uint dotAccSatEXT(u16vec4 a, u16vec4 b, uint c);"
-            "int dotAccSatEXT(i16vec4 a, u16vec4 b, int c);"
-            "int dotAccSatEXT(u16vec4 a, i16vec4 b, int c);"
-            "int dotAccSatEXT(i16vec4 a, i16vec4 b, int c);"
-
-            "uint64_t dotAccSatEXT(u64vec2 a, u64vec2 b, uint64_t c);"
-            "int64_t dotAccSatEXT(i64vec2 a, u64vec2 b, int64_t c);"
-            "int64_t dotAccSatEXT(u64vec2 a, i64vec2 b, int64_t c);"
-            "int64_t dotAccSatEXT(i64vec2 a, i64vec2 b, int64_t c);"
-
-            "uint64_t dotAccSatEXT(u64vec3 a, u64vec3 b, uint64_t c);"
-            "int64_t dotAccSatEXT(i64vec3 a, u64vec3 b, int64_t c);"
-            "int64_t dotAccSatEXT(u64vec3 a, i64vec3 b, int64_t c);"
-            "int64_t dotAccSatEXT(i64vec3 a, i64vec3 b, int64_t c);"
-
-            "uint64_t dotAccSatEXT(u64vec4 a, u64vec4 b, uint64_t c);"
-            "int64_t dotAccSatEXT(i64vec4 a, u64vec4 b, int64_t c);"
-            "int64_t dotAccSatEXT(u64vec4 a, i64vec4 b, int64_t c);"
-            "int64_t dotAccSatEXT(i64vec4 a, i64vec4 b, int64_t c);"
-            "\n");
-    }
-
     // GL_KHR_shader_subgroup
     if ((profile == EEsProfile && version >= 310) ||
         (profile != EEsProfile && version >= 140)) {
@@ -4000,72 +3728,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "bvec3 notEqual(f16vec3, f16vec3);"
             "bvec4 notEqual(f16vec4, f16vec4);"
 
-            "bfloat16_t dot(bfloat16_t, bfloat16_t);"
-            "bfloat16_t dot(bf16vec2,   bf16vec2);"
-            "bfloat16_t dot(bf16vec3,   bf16vec3);"
-            "bfloat16_t dot(bf16vec4,   bf16vec4);"
-
-            "int16_t  bfloat16BitsToIntEXT(bfloat16_t value);"
-            "i16vec2  bfloat16BitsToIntEXT(bf16vec2 value);"
-            "i16vec3  bfloat16BitsToIntEXT(bf16vec3 value);"
-            "i16vec4  bfloat16BitsToIntEXT(bf16vec4 value);"
-
-            "uint16_t bfloat16BitsToUintEXT(bfloat16_t value);"
-            "u16vec2  bfloat16BitsToUintEXT(bf16vec2 value);"
-            "u16vec3  bfloat16BitsToUintEXT(bf16vec3 value);"
-            "u16vec4  bfloat16BitsToUintEXT(bf16vec4 value);"
-
-            "bfloat16_t intBitsToBFloat16EXT(int16_t value);"
-            "bf16vec2   intBitsToBFloat16EXT(i16vec2 value);"
-            "bf16vec3   intBitsToBFloat16EXT(i16vec3 value);"
-            "bf16vec4   intBitsToBFloat16EXT(i16vec4 value);"
-
-            "bfloat16_t uintBitsToBFloat16EXT(uint16_t value);"
-            "bf16vec2   uintBitsToBFloat16EXT(u16vec2 value);"
-            "bf16vec3   uintBitsToBFloat16EXT(u16vec3 value);"
-            "bf16vec4   uintBitsToBFloat16EXT(u16vec4 value);"
-
-            "int8_t  floate5m2BitsToIntEXT(floate5m2_t value);"
-            "i8vec2  floate5m2BitsToIntEXT(fe5m2vec2 value);"
-            "i8vec3  floate5m2BitsToIntEXT(fe5m2vec3 value);"
-            "i8vec4  floate5m2BitsToIntEXT(fe5m2vec4 value);"
-
-            "uint8_t floate5m2BitsToUintEXT(floate5m2_t value);"
-            "u8vec2  floate5m2BitsToUintEXT(fe5m2vec2 value);"
-            "u8vec3  floate5m2BitsToUintEXT(fe5m2vec3 value);"
-            "u8vec4  floate5m2BitsToUintEXT(fe5m2vec4 value);"
-
-            "floate5m2_t intBitsToFloate5m2EXT(int8_t value);"
-            "fe5m2vec2   intBitsToFloate5m2EXT(i8vec2 value);"
-            "fe5m2vec3   intBitsToFloate5m2EXT(i8vec3 value);"
-            "fe5m2vec4   intBitsToFloate5m2EXT(i8vec4 value);"
-
-            "floate5m2_t uintBitsToFloate5m2EXT(uint8_t value);"
-            "fe5m2vec2   uintBitsToFloate5m2EXT(u8vec2 value);"
-            "fe5m2vec3   uintBitsToFloate5m2EXT(u8vec3 value);"
-            "fe5m2vec4   uintBitsToFloate5m2EXT(u8vec4 value);"
-
-            "int8_t  floate4m3BitsToIntEXT(floate4m3_t value);"
-            "i8vec2  floate4m3BitsToIntEXT(fe4m3vec2 value);"
-            "i8vec3  floate4m3BitsToIntEXT(fe4m3vec3 value);"
-            "i8vec4  floate4m3BitsToIntEXT(fe4m3vec4 value);"
-
-            "uint8_t floate4m3BitsToUintEXT(floate4m3_t value);"
-            "u8vec2  floate4m3BitsToUintEXT(fe4m3vec2 value);"
-            "u8vec3  floate4m3BitsToUintEXT(fe4m3vec3 value);"
-            "u8vec4  floate4m3BitsToUintEXT(fe4m3vec4 value);"
-
-            "floate4m3_t intBitsToFloate4m3EXT(int8_t value);"
-            "fe4m3vec2   intBitsToFloate4m3EXT(i8vec2 value);"
-            "fe4m3vec3   intBitsToFloate4m3EXT(i8vec3 value);"
-            "fe4m3vec4   intBitsToFloate4m3EXT(i8vec4 value);"
-
-            "floate4m3_t uintBitsToFloate4m3EXT(uint8_t value);"
-            "fe4m3vec2   uintBitsToFloate4m3EXT(u8vec2 value);"
-            "fe4m3vec3   uintBitsToFloate4m3EXT(u8vec3 value);"
-            "fe4m3vec4   uintBitsToFloate4m3EXT(u8vec4 value);"
-
-            "void saturatedConvertEXT();"
             "\n");
     }
 
@@ -4660,7 +4322,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
         // Prototypes for built-in functions seen by geometry shaders only.
         //
         //============================================================================
-        if (profile != EEsProfile && version >= 150) {
+
+        if (profile != EEsProfile && (version >= 400 || version == 150)) {
             stageBuiltins[EShLangGeometry].append(
                 "void EmitStreamVertex(int);"
                 "void EndStreamPrimitive(int);"
@@ -4734,122 +4397,159 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
         // adding it introduces undesirable tempArgs on the stack. What we want
         // is more like "buf" thought of as a pointer value being an in parameter.
         stageBuiltins[EShLangCompute].append(
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal float16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal float[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent float16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent float[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out fcoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal float16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal float[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal float64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(fcoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent float16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent float[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent float64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(fcoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
             "fcoopmatNV coopMatMulAddNV(fcoopmatNV A, fcoopmatNV B, fcoopmatNV C);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal int8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal int16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal int[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal int64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal ivec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal ivec4[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out icoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent int8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent int16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent int[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent int64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent ivec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent ivec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out icoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal int8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal int16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal int[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal int64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal ivec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal ivec4[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent int8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent int16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent int[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent int64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent ivec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent ivec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatLoadNV(out ucoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal int8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal int16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal int[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal int64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal ivec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal ivec4[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(icoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent int8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent int16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent int[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent int64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent ivec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent ivec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(icoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal int8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal int16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal int[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal int64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal ivec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal ivec4[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uint[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uvec2[] buf, uint element, uint stride, bool colMajor);\n"
-            "void coopMatStoreNV(ucoopmatNV m, volatile coherent nontemporal uvec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent int8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent int16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent int[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent int64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent ivec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent ivec4[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uint8_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uint16_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uint[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uint64_t[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uvec2[] buf, uint element, uint stride, bool colMajor);\n"
+            "void coopMatStoreNV(ucoopmatNV m, volatile coherent uvec4[] buf, uint element, uint stride, bool colMajor);\n"
 
             "icoopmatNV coopMatMulAddNV(icoopmatNV A, icoopmatNV B, icoopmatNV C);\n"
             "ucoopmatNV coopMatMulAddNV(ucoopmatNV A, ucoopmatNV B, ucoopmatNV C);\n"
             );
 
-        std::stringstream cooperativeMatrixFuncs;
+        std::string cooperativeMatrixFuncs =
+            "void coopMatLoad(out coopmat m, volatile coherent int8_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent int16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent int32_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent int64_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent uint8_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent uint16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent uint32_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent uint64_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent float16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent float[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent float64_t[] buf, uint element, uint stride, int matrixLayout);\n"
 
-        {
-            static const char *allTypes[] =
-            {
-                "float", "vec2", "vec4",
-                "float16_t", "f16vec2", "f16vec4",
-                "bfloat16_t", "bf16vec2", "bf16vec4",
-                "floate5m2_t", "fe5m2vec2", "fe5m2vec4",
-                "floate4m3_t", "fe4m3vec2", "fe4m3vec4",
-                "double", "dvec2", "dvec4",
-                "int8_t", "i8vec2", "i8vec4",
-                "int16_t", "i16vec2", "i16vec4",
-                "int", "ivec2", "ivec4",
-                "int64_t", "i64vec2", "i64vec4",
-                "uint8_t", "u8vec2", "u8vec4",
-                "uint16_t", "u16vec2", "u16vec4",
-                "uint", "uvec2", "uvec4",
-                "uint64_t", "u64vec2", "u64vec4",
-            };
-            for (auto elemTy : {"uint", "uint64_t"}) {
-                for (auto t : allTypes) {
-                    cooperativeMatrixFuncs << "void coopMatLoad(out coopmat m, volatile coherent nontemporal " << t << "[] buf, " << elemTy << " element, uint stride, int matrixLayout);\n";
-                    cooperativeMatrixFuncs << "void coopMatStore(coopmat m, volatile coherent nontemporal " << t << "[] buf, " << elemTy << " element, uint stride, int matrixLayout);\n";
-                }
-                // Just use uint8_t for buffer type, we have special matching rules to allow any conversion
-                cooperativeMatrixFuncs << "void coopMatLoadTensorNV(inout coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t);\n";
-                cooperativeMatrixFuncs << "void coopMatLoadTensorNV(inout coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t, tensorViewNV v);\n";
-                cooperativeMatrixFuncs << "void coopMatLoadTensorNV(inout coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t, __function f);\n";
-                cooperativeMatrixFuncs << "void coopMatLoadTensorNV(inout coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t, tensorViewNV v, __function f);\n";
-                cooperativeMatrixFuncs << "void coopMatStoreTensorNV(coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t);\n";
-                cooperativeMatrixFuncs << "void coopMatStoreTensorNV(coopmat m, volatile coherent nontemporal uint8_t[] buf, " << elemTy << " element, tensorLayoutNV t, tensorViewNV v);\n";
-            }
-        }
+            "void coopMatLoad(out coopmat m, volatile coherent i8vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u8vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+
+            "void coopMatLoad(out coopmat m, volatile coherent i8vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent i64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u8vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent u64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatLoad(out coopmat m, volatile coherent f64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+
+            "void coopMatStore(coopmat m, volatile coherent int8_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent int16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent int32_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent int64_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent uint8_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent uint16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent uint32_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent uint64_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent float16_t[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent float[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent float64_t[] buf, uint element, uint stride, int matrixLayout);\n"
+
+            "void coopMatStore(coopmat m, volatile coherent i8vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u8vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f16vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f32vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f64vec2[] buf, uint element, uint stride, int matrixLayout);\n"
+
+            "void coopMatStore(coopmat m, volatile coherent i8vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent i64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u8vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent u64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f16vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f32vec4[] buf, uint element, uint stride, int matrixLayout);\n"
+            "void coopMatStore(coopmat m, volatile coherent f64vec4[] buf, uint element, uint stride, int matrixLayout);\n"
 
-        cooperativeMatrixFuncs <<
             "coopmat coopMatMulAdd(coopmat A, coopmat B, coopmat C);\n"
             "coopmat coopMatMulAdd(coopmat A, coopmat B, coopmat C, int matrixOperands);\n";
 
-        commonBuiltins.append(cooperativeMatrixFuncs.str().c_str());
+        commonBuiltins.append(cooperativeMatrixFuncs.c_str());
 
         commonBuiltins.append(
             "const int gl_MatrixUseA = 0;\n"
@@ -4858,296 +4558,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "const int gl_MatrixOperandsSaturatingAccumulation = 0x10;\n"
             "const int gl_CooperativeMatrixLayoutRowMajor = 0;\n"
             "const int gl_CooperativeMatrixLayoutColumnMajor = 1;\n"
-            "const int gl_CooperativeMatrixLayoutRowBlockedInterleavedARM = 4202;\n"
-            "const int gl_CooperativeMatrixLayoutColumnBlockedInterleavedARM = 4203;\n"
-            "\n"
-            );
-
-        commonBuiltins.append(
-            "void coopMatTransposeNV(out coopmat, coopmat);"
-            "void coopMatReduceNV(out coopmat, coopmat, int, __function);"
-            "void coopMatPerElementNV();"
-        );
-
-        commonBuiltins.append(
-            "const int gl_CooperativeMatrixReduceRowNV = 0x1;\n"
-            "const int gl_CooperativeMatrixReduceColumnNV = 0x2;\n"
-            "const int gl_CooperativeMatrixReduceRowAndColumnNV = 0x3;\n"
-            "const int gl_CooperativeMatrixReduce2x2NV = 0x4;\n"
-            "\n"
-            );
-
-        commonBuiltins.append(
-            "const int gl_CooperativeMatrixClampModeUndefinedNV = 0x0;\n"
-            "const int gl_CooperativeMatrixClampModeConstantNV = 0x1;\n"
-            "const int gl_CooperativeMatrixClampModeClampToEdgeNV = 0x2;\n"
-            "const int gl_CooperativeMatrixClampModeRepeatNV = 0x3;\n"
-            "const int gl_CooperativeMatrixClampModeMirrorRepeatNV = 0x4;\n"
-            "\n"
-            );
-
-        {
-          std::stringstream coopMatConvFuncs;
-
-          const std::string eltTypes[] = {"uint32_t", "uint", "int32_t", "int", "float32_t", "float", "float16_t"};
-
-          for (auto srcEltTy : eltTypes) {
-            for (auto dstEltTy : eltTypes) {
-              coopMatConvFuncs << "void bitcastQCOM(" << srcEltTy.c_str() << " SrcArr[], " << dstEltTy.c_str()
-                << " DstArr[]);\n";
-            }
-          }
-          coopMatConvFuncs << "\n";
-
-          for (auto eltTy : {"float32_t", "float16_t", "int8_t", "uint8_t", "uint32_t", "uint", "int32_t", "int"}) {
-            coopMatConvFuncs << "void vectorToCoopmatQCOM(" << eltTy << " SrcVec[], coopmat CM);\n";
-            coopMatConvFuncs << "void coopmatToVectorQCOM(coopmat CM, " << eltTy << " Dstvec[]);\n";
-          }
-
-          for (auto eltTy : {"uint32_t", "uint", "int32_t", "int", "float32_t", "float", "float16_t"}) {
-            coopMatConvFuncs << "void extractSubArrayQCOM(" << eltTy << " arr[], uint index, " << eltTy << " subarr[]);\n";
-          }
-
-          commonBuiltins.append(coopMatConvFuncs.str().c_str());
-        }
-
-        commonBuiltins.append(
-            "tensorLayoutNV createTensorLayoutNV(uint Dim);\n"
-            "tensorLayoutNV createTensorLayoutNV(uint Dim, uint Mode);\n"
-
-            "tensorLayoutNV setTensorLayoutBlockSizeNV(tensorLayoutNV t, uint blockSize0);\n"
-            "tensorLayoutNV setTensorLayoutBlockSizeNV(tensorLayoutNV t, uint blockSize0, uint blockSize1);\n"
-            "tensorLayoutNV setTensorLayoutBlockSizeNV(tensorLayoutNV t, uint blockSize0, uint blockSize1, uint blockSize2);\n"
-            "tensorLayoutNV setTensorLayoutBlockSizeNV(tensorLayoutNV t, uint blockSize0, uint blockSize1, uint blockSize2, uint blockSize3);\n"
-            "tensorLayoutNV setTensorLayoutBlockSizeNV(tensorLayoutNV t, uint blockSize0, uint blockSize1, uint blockSize2, uint blockSize3, uint blockSize4);\n"
-
-            "tensorLayoutNV setTensorLayoutDimensionNV(tensorLayoutNV t, uint dim0);\n"
-            "tensorLayoutNV setTensorLayoutDimensionNV(tensorLayoutNV t, uint dim0, uint dim1);\n"
-            "tensorLayoutNV setTensorLayoutDimensionNV(tensorLayoutNV t, uint dim0, uint dim1, uint dim2);\n"
-            "tensorLayoutNV setTensorLayoutDimensionNV(tensorLayoutNV t, uint dim0, uint dim1, uint dim2, uint dim3);\n"
-            "tensorLayoutNV setTensorLayoutDimensionNV(tensorLayoutNV t, uint dim0, uint dim1, uint dim2, uint dim3, uint dim4);\n"
-
-            "tensorLayoutNV setTensorLayoutStrideNV(tensorLayoutNV t, uint stride0);\n"
-            "tensorLayoutNV setTensorLayoutStrideNV(tensorLayoutNV t, uint stride0, uint stride1);\n"
-            "tensorLayoutNV setTensorLayoutStrideNV(tensorLayoutNV t, uint stride0, uint stride1, uint stride2);\n"
-            "tensorLayoutNV setTensorLayoutStrideNV(tensorLayoutNV t, uint stride0, uint stride1, uint stride2, uint stride3);\n"
-            "tensorLayoutNV setTensorLayoutStrideNV(tensorLayoutNV t, uint stride0, uint stride1, uint stride2, uint stride3, uint stride4);\n"
-
-            "tensorLayoutNV sliceTensorLayoutNV(tensorLayoutNV t, uint offset0, uint span0);\n"
-            "tensorLayoutNV sliceTensorLayoutNV(tensorLayoutNV t, uint offset0, uint span0, uint offset1, uint span1);\n"
-            "tensorLayoutNV sliceTensorLayoutNV(tensorLayoutNV t, uint offset0, uint span0, uint offset1, uint span1, uint offset2, uint span2);\n"
-            "tensorLayoutNV sliceTensorLayoutNV(tensorLayoutNV t, uint offset0, uint span0, uint offset1, uint span1, uint offset2, uint span2, uint offset3, uint span3);\n"
-            "tensorLayoutNV sliceTensorLayoutNV(tensorLayoutNV t, uint offset0, uint span0, uint offset1, uint span1, uint offset2, uint span2, uint offset3, uint span3, uint offset4, uint span4);\n"
-
-            "tensorLayoutNV setTensorLayoutClampValueNV(tensorLayoutNV t, uint value);\n"
-
-            "tensorViewNV createTensorViewNV(uint Dim);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions, uint p0);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions, uint p0, uint p1);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions, uint p0, uint p1, uint p2);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions, uint p0, uint p1, uint p2, uint p3);\n"
-            "tensorViewNV createTensorViewNV(uint Dim, bool HasDimensions, uint p0, uint p1, uint p2, uint p3, uint p4);\n"
-
-            "tensorViewNV setTensorViewDimensionsNV(tensorViewNV v, uint dim0);\n"
-            "tensorViewNV setTensorViewDimensionsNV(tensorViewNV v, uint dim0, uint dim1);\n"
-            "tensorViewNV setTensorViewDimensionsNV(tensorViewNV v, uint dim0, uint dim1, uint dim2);\n"
-            "tensorViewNV setTensorViewDimensionsNV(tensorViewNV v, uint dim0, uint dim1, uint dim2, uint dim3);\n"
-            "tensorViewNV setTensorViewDimensionsNV(tensorViewNV v, uint dim0, uint dim1, uint dim2, uint dim3, uint dim4);\n"
-
-            "tensorViewNV setTensorViewStrideNV(tensorViewNV v, uint stride0);\n"
-            "tensorViewNV setTensorViewStrideNV(tensorViewNV v, uint stride0, uint stride1);\n"
-            "tensorViewNV setTensorViewStrideNV(tensorViewNV v, uint stride0, uint stride1, uint stride2);\n"
-            "tensorViewNV setTensorViewStrideNV(tensorViewNV v, uint stride0, uint stride1, uint stride2, uint stride3);\n"
-            "tensorViewNV setTensorViewStrideNV(tensorViewNV v, uint stride0, uint stride1, uint stride2, uint stride3, uint stride4);\n"
-
-            "tensorViewNV setTensorViewClipNV(tensorViewNV v, uint clipRowOffset, uint clipRowSpan, uint clipColOffset, uint clipColSpan);\n"
-            "\n"
-        );
-
-        // GL_ARM_tensors builtins.
-        static const char *tensorDataTypesARM[] = {
-            "bool",
-            "int8_t", "int16_t", "int32_t", "int64_t",
-            "uint8_t", "uint16_t", "uint32_t", "uint64_t",
-            "float16_t", "float32_t", "float64_t",
-        };
-        std::ostringstream ostream;
-        for (auto t : tensorDataTypesARM) {
-            // Scalar
-            ostream << "void tensorReadARM(readonly tensorARM t, uint coords[], out "
-                    << t << " data, uint tensorOperands = 0U, ...);\n";
-            ostream << "void tensorWriteARM(writeonly tensorARM t, uint coords[], "
-                    << t << " data, uint tensorOperands = 0U, ...);\n";
-            // Array
-            ostream << "void tensorReadARM(readonly tensorARM t, uint coords[], "
-                    << t << " data[], uint tensorOperands = 0U, ...);\n";
-            ostream << "void tensorWriteARM(writeonly tensorARM t, uint coords[], "
-                    << t << " data[], uint tensorOperands = 0U, ...);\n";
-        }
-        ostream << "uint tensorSizeARM(readonly writeonly tensorARM t, uint dim);\n";
-        commonBuiltins.append(ostream.str());
-    }
-
-    if (profile != EEsProfile && version >= 450) {
-        const char *basicTypes[] = {
-            "int8_t",
-            "int16_t",
-            "int32_t",
-            "int64_t",
-            "uint8_t",
-            "uint16_t",
-            "uint32_t",
-            "uint64_t",
-            "float16_t",
-            "float32_t",
-            "float64_t",
-        };
-        std::string coopVecOffsetTypes[] = {
-            "uint",
-            "uint64_t",
-        };
-        for (auto offsetTy : coopVecOffsetTypes) {
-            for (uint32_t i = 0; i < sizeof(basicTypes)/sizeof(basicTypes[0]); ++i) {
-                std::string func = std::string("void coopVecMatMulNV(out coopvecNV result, ") +
-                                   std::string("coopvecNV v, ") +
-                                   std::string("int inputInterpretation, ") +
-                                   std::string(basicTypes[i]) + std::string("[] matrix, ") +
-                                   offsetTy + std::string(" matrixOffset, ") +
-                                   std::string("int matrixInterpretation, ") +
-                                   std::string("uint M, ") +
-                                   std::string("uint K, ") +
-                                   std::string("int matrixLayout, ") +
-                                   std::string("bool transpose, ") +
-                                   std::string("uint matrixStride);\n");
-                commonBuiltins.append(func.c_str());
-
-                for (uint32_t j = 0; j < sizeof(basicTypes)/sizeof(basicTypes[0]); ++j) {
-                    func = std::string("void coopVecMatMulAddNV(out coopvecNV result, ") +
-                           std::string("coopvecNV v, ") +
-                           std::string("int inputInterpretation, ") +
-                           std::string(basicTypes[i]) + std::string("[] matrix, ") +
-                           offsetTy + std::string(" matrixOffset, ") +
-                           std::string("int matrixInterpretation, ") +
-                           std::string(basicTypes[j]) + std::string("[] bias, ") +
-                           offsetTy + std::string(" biasOffset, ") +
-                           std::string("int biasInterpretation, ") +
-                           std::string("uint M, ") +
-                           std::string("uint K, ") +
-                           std::string("int matrixLayout, ") +
-                           std::string("bool transpose, ") +
-                           std::string("uint matrixStride);\n");
-                    commonBuiltins.append(func.c_str());
-                }
-
-                func = std::string("void coopVecOuterProductAccumulateNV(coopvecNV v1, coopvecNV v2, ") +
-                       std::string(basicTypes[i]) +
-                       std::string("[] buf, ") + offsetTy + std::string(" offset, uint stride, int matrixLayout, int matrixInterpretation);\n");
-                commonBuiltins.append(func.c_str());
-            
-                func = std::string("void coopVecReduceSumAccumulateNV(coopvecNV v, ") +
-                       std::string(basicTypes[i]) +
-                       std::string("[] buf, ") + offsetTy + std::string(" offset);\n");
-                commonBuiltins.append(func.c_str());
-            }
-        }
-        std::string cooperativeVectorFuncs =
-            "coopvecNV fma(coopvecNV, coopvecNV, coopvecNV);\n"
-            "coopvecNV min(coopvecNV, coopvecNV);\n"
-            "coopvecNV max(coopvecNV, coopvecNV);\n"
-            "coopvecNV step(coopvecNV, coopvecNV);\n"
-            "coopvecNV exp(coopvecNV);\n"            
-            "coopvecNV log(coopvecNV);\n"            
-            "coopvecNV tanh(coopvecNV);\n"            
-            "coopvecNV atan(coopvecNV);\n"            
-            "coopvecNV clamp(coopvecNV, coopvecNV, coopvecNV);\n"
-            "\n"
-            ;
-
-        commonBuiltins.append(cooperativeVectorFuncs.c_str());
-
-        const char *scalarAndVectorTypes[] = {
-            "int8_t",
-            "int16_t",
-            "int32_t",
-            "int64_t",
-            "uint8_t",
-            "uint16_t",
-            "uint32_t",
-            "uint64_t",
-            "float16_t",
-            "float32_t",
-            "float64_t",
-            "i8vec2",
-            "i16vec2",
-            "i32vec2",
-            "i64vec2",
-            "u8vec2",
-            "u16vec2",
-            "u32vec2",
-            "u64vec2",
-            "f16vec2",
-            "f32vec2",
-            "f64vec2",
-            "i8vec3",
-            "i16vec3",
-            "i32vec3",
-            "i64vec3",
-            "u8vec3",
-            "u16vec3",
-            "u32vec3",
-            "u64vec3",
-            "f16vec3",
-            "f32vec3",
-            "f64vec3",
-            "i8vec4",
-            "i16vec4",
-            "i32vec4",
-            "i64vec4",
-            "u8vec4",
-            "u16vec4",
-            "u32vec4",
-            "u64vec4",
-            "f16vec4",
-            "f32vec4",
-            "f64vec4",
-        };
-
-        for (auto offsetTy : coopVecOffsetTypes) {
-            for (uint32_t i = 0; i < sizeof(scalarAndVectorTypes)/sizeof(scalarAndVectorTypes[0]); ++i) {
-                std::string load = std::string("void coopVecLoadNV(out coopvecNV v, volatile coherent ") +
-                                   std::string(scalarAndVectorTypes[i]) + std::string("[] buf, ") + offsetTy + std::string(" offset);");
-                std::string store = std::string("void coopVecStoreNV(coopvecNV v, volatile coherent ") +
-                                   std::string(scalarAndVectorTypes[i]) + std::string("[] buf, ") + offsetTy + std::string(" offset);");
-                commonBuiltins.append(load.c_str());
-                commonBuiltins.append(store.c_str());
-            }
-        }
-
-        commonBuiltins.append(
-            "const int gl_CooperativeVectorMatrixLayoutRowMajorNV = 0;\n"
-            "const int gl_CooperativeVectorMatrixLayoutColumnMajorNV = 1;\n"
-            "const int gl_CooperativeVectorMatrixLayoutInferencingOptimalNV = 2;\n"
-            "const int gl_CooperativeVectorMatrixLayoutTrainingOptimalNV = 3;\n"
-            "\n"
-            );
-
-        commonBuiltins.append(
-            "const int gl_ComponentTypeFloat16NV                = 0;\n"
-            "const int gl_ComponentTypeFloat32NV                = 1;\n"
-            "const int gl_ComponentTypeFloat64NV                = 2;\n"
-            "const int gl_ComponentTypeSignedInt8NV             = 3;\n"
-            "const int gl_ComponentTypeSignedInt16NV            = 4;\n"
-            "const int gl_ComponentTypeSignedInt32NV            = 5;\n"
-            "const int gl_ComponentTypeSignedInt64NV            = 6;\n"
-            "const int gl_ComponentTypeUnsignedInt8NV           = 7;\n"
-            "const int gl_ComponentTypeUnsignedInt16NV          = 8;\n"
-            "const int gl_ComponentTypeUnsignedInt32NV          = 9;\n"
-            "const int gl_ComponentTypeUnsignedInt64NV          = 10;\n"
-            "const int gl_ComponentTypeSignedInt8PackedNV       = 1000491000;\n"
-            "const int gl_ComponentTypeUnsignedInt8PackedNV     = 1000491001;\n"
-            "const int gl_ComponentTypeFloatE4M3NV              = 1000491002;\n"
-            "const int gl_ComponentTypeFloatE5M2NV              = 1000491003;\n"
             "\n"
             );
     }
@@ -5220,7 +4630,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
 
     // GL_OES_shader_multisample_interpolation
     if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 150)) { // NV_gpu_shader5
+        (profile != EEsProfile && version >= 400)) {
         stageBuiltins[EShLangFragment].append(
             "float interpolateAtCentroid(float);"
             "vec2  interpolateAtCentroid(vec2);"
@@ -5349,14 +4759,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "mat4x3 rayQueryGetIntersectionObjectToWorldEXT(rayQueryEXT, bool);"
             "mat4x3 rayQueryGetIntersectionWorldToObjectEXT(rayQueryEXT, bool);"
             "void rayQueryGetIntersectionTriangleVertexPositionsEXT(rayQueryEXT, bool, out vec3[3]);"
-            "int rayQueryGetIntersectionClusterIdNV(rayQueryEXT, bool);"
-            "vec3 rayQueryGetIntersectionSpherePositionNV(rayQueryEXT, bool);"
-            "float rayQueryGetIntersectionSphereRadiusNV(rayQueryEXT, bool);"
-            "float rayQueryGetIntersectionLSSHitValueNV(rayQueryEXT, bool);"
-            "void rayQueryGetIntersectionLSSPositionsNV(rayQueryEXT, bool, out vec3[2]);"
-            "void rayQueryGetIntersectionLSSRadiiNV(rayQueryEXT, bool, out float[2]);"
-            "bool rayQueryIsSphereHitNV(rayQueryEXT, bool);"
-            "bool rayQueryIsLSSHitNV(rayQueryEXT, bool);"
             "\n");
 
         stageBuiltins[EShLangRayGen].append(
@@ -5395,57 +4797,11 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "float hitObjectGetCurrentTimeNV(hitObjectNV);"
             "uint hitObjectGetShaderBindingTableRecordIndexNV(hitObjectNV);"
             "uvec2 hitObjectGetShaderRecordBufferHandleNV(hitObjectNV);"
-            "int hitObjectGetClusterIdNV(hitObjectNV);"
             "void reorderThreadNV(uint, uint);"
             "void reorderThreadNV(hitObjectNV);"
             "void reorderThreadNV(hitObjectNV, uint, uint);"
             "vec3 fetchMicroTriangleVertexPositionNV(accelerationStructureEXT, int, int, int, ivec2);"
             "vec2 fetchMicroTriangleVertexBarycentricNV(accelerationStructureEXT, int, int, int, ivec2);"
-            "vec3 hitObjectGetSpherePositionNV(hitObjectNV);"
-            "float hitObjectGetSphereRadiusNV(hitObjectNV);"
-            "void hitObjectGetLSSPositionsNV(hitObjectNV, out vec3[2]);"
-            "void hitObjectGetLSSRadiiNV(hitObjectNV, out float[2]);"
-            "bool hitObjectIsSphereHitNV(hitObjectNV);"
-            "bool hitObjectIsLSSHitNV(hitObjectNV);"
-            "void hitObjectTraceRayEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
-            "void hitObjectTraceRayMotionEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,float,int);"
-            "void hitObjectRecordMissEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float);"
-            "void hitObjectRecordMissMotionEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float,float);"
-            "void hitObjectRecordEmptyEXT(hitObjectEXT);"
-            "void hitObjectExecuteShaderEXT(hitObjectEXT,int);"
-            "bool hitObjectIsEmptyEXT(hitObjectEXT);"
-            "bool hitObjectIsMissEXT(hitObjectEXT);"
-            "bool hitObjectIsHitEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMinEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMaxEXT(hitObjectEXT);"
-            "uint hitObjectGetRayFlagsEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayDirectionEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayDirectionEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetWorldToObjectEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetObjectToWorldEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceCustomIndexEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceIdEXT(hitObjectEXT);"
-            "int hitObjectGetGeometryIndexEXT(hitObjectEXT);"
-            "int hitObjectGetPrimitiveIndexEXT(hitObjectEXT);"
-            "uint hitObjectGetHitKindEXT(hitObjectEXT);"
-            "void hitObjectGetAttributesEXT(hitObjectEXT,int);"
-            "float hitObjectGetCurrentTimeEXT(hitObjectEXT);"
-            "uint hitObjectGetShaderBindingTableRecordIndexEXT(hitObjectEXT);"
-            "uvec2 hitObjectGetShaderRecordBufferHandleEXT(hitObjectEXT);"
-            "void hitObjectSetShaderBindingTableRecordIndexEXT(hitObjectEXT, uint);"
-            "void hitObjectReorderExecuteEXT(hitObjectEXT,int);"
-            "void hitObjectReorderExecuteEXT(hitObjectEXT,uint,uint,int);"
-            "void hitObjectTraceReorderExecuteEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
-            "void hitObjectTraceReorderExecuteEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,uint,uint,int);"
-            "void hitObjectTraceMotionReorderExecuteEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,float,int);"
-            "void hitObjectTraceMotionReorderExecuteEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,float,uint,uint,int);"
-            "void hitObjectRecordFromQueryEXT(hitObjectEXT, rayQueryEXT, uint, int);"
-            "void hitObjectGetIntersectionTriangleVertexPositionsEXT(hitObjectEXT, out vec3[3]);"
-            "void reorderThreadEXT(uint, uint);"
-            "void reorderThreadEXT(hitObjectEXT);"
-            "void reorderThreadEXT(hitObjectEXT, uint, uint);"
             "\n");
         stageBuiltins[EShLangIntersect].append(
             "bool reportIntersectionNV(float, uint);"
@@ -5491,43 +4847,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "float hitObjectGetCurrentTimeNV(hitObjectNV);"
             "uint hitObjectGetShaderBindingTableRecordIndexNV(hitObjectNV);"
             "uvec2 hitObjectGetShaderRecordBufferHandleNV(hitObjectNV);"
-            "int hitObjectGetClusterIdNV(hitObjectNV);"
-            "vec3 hitObjectGetSpherePositionNV(hitObjectNV);"
-            "float hitObjectGetSphereRadiusNV(hitObjectNV);"
-            "void hitObjectGetLSSPositionsNV(hitObjectNV, out vec3[2]);"
-            "void hitObjectGetLSSRadiiNV(hitObjectNV, out float[2]);"
-            "bool hitObjectIsSphereHitNV(hitObjectNV);"
-            "bool hitObjectIsLSSHitNV(hitObjectNV);"
-            "void hitObjectTraceRayEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
-            "void hitObjectTraceRayMotionEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,float,int);"
-            "void hitObjectRecordMissEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float);"
-            "void hitObjectRecordMissMotionEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float,float);"
-            "void hitObjectRecordEmptyEXT(hitObjectEXT);"
-            "void hitObjectExecuteShaderEXT(hitObjectEXT,int);"
-            "bool hitObjectIsEmptyEXT(hitObjectEXT);"
-            "bool hitObjectIsMissEXT(hitObjectEXT);"
-            "bool hitObjectIsHitEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMinEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMaxEXT(hitObjectEXT);"
-            "uint hitObjectGetRayFlagsEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayDirectionEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayDirectionEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetWorldToObjectEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetObjectToWorldEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceCustomIndexEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceIdEXT(hitObjectEXT);"
-            "int hitObjectGetGeometryIndexEXT(hitObjectEXT);"
-            "int hitObjectGetPrimitiveIndexEXT(hitObjectEXT);"
-            "uint hitObjectGetHitKindEXT(hitObjectEXT);"
-            "void hitObjectGetAttributesEXT(hitObjectEXT,int);"
-            "float hitObjectGetCurrentTimeEXT(hitObjectEXT);"
-            "uint hitObjectGetShaderBindingTableRecordIndexEXT(hitObjectEXT);"
-            "uvec2 hitObjectGetShaderRecordBufferHandleEXT(hitObjectEXT);"
-            "void hitObjectSetShaderBindingTableRecordIndexEXT(hitObjectEXT, uint);"
-            "void hitObjectRecordFromQueryEXT(hitObjectEXT, rayQueryEXT,uint, int);"
-            "void hitObjectGetIntersectionTriangleVertexPositionsEXT(hitObjectEXT, out vec3[3]);"
             "\n");
         stageBuiltins[EShLangMiss].append(
             "void traceNV(accelerationStructureNV,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
@@ -5565,43 +4884,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "float hitObjectGetCurrentTimeNV(hitObjectNV);"
             "uint hitObjectGetShaderBindingTableRecordIndexNV(hitObjectNV);"
             "uvec2 hitObjectGetShaderRecordBufferHandleNV(hitObjectNV);"
-            "int hitObjectGetClusterIdNV(hitObjectNV);"
-            "vec3 hitObjectGetSpherePositionNV(hitObjectNV);"
-            "float hitObjectGetSphereRadiusNV(hitObjectNV);"
-            "void hitObjectGetLSSPositionsNV(hitObjectNV, out vec3[2]);"
-            "void hitObjectGetLSSRadiiNV(hitObjectNV, out float[2]);"
-            "bool hitObjectIsSphereHitNV(hitObjectNV);"
-            "bool hitObjectIsLSSHitNV(hitObjectNV);"
-            "void hitObjectTraceRayEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
-            "void hitObjectTraceRayMotionEXT(hitObjectEXT,accelerationStructureEXT,uint,uint,uint,uint,uint,vec3,float,vec3,float,float,int);"
-            "void hitObjectRecordMissEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float);"
-            "void hitObjectRecordMissMotionEXT(hitObjectEXT,uint,uint,vec3,float,vec3,float,float);"
-            "void hitObjectRecordEmptyEXT(hitObjectEXT);"
-            "void hitObjectExecuteShaderEXT(hitObjectEXT,int);"
-            "bool hitObjectIsEmptyEXT(hitObjectEXT);"
-            "bool hitObjectIsMissEXT(hitObjectEXT);"
-            "bool hitObjectIsHitEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMinEXT(hitObjectEXT);"
-            "float hitObjectGetRayTMaxEXT(hitObjectEXT);"
-            "uint hitObjectGetRayFlagsEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetWorldRayDirectionEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayOriginEXT(hitObjectEXT);"
-            "vec3 hitObjectGetObjectRayDirectionEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetWorldToObjectEXT(hitObjectEXT);"
-            "mat4x3 hitObjectGetObjectToWorldEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceCustomIndexEXT(hitObjectEXT);"
-            "int hitObjectGetInstanceIdEXT(hitObjectEXT);"
-            "int hitObjectGetGeometryIndexEXT(hitObjectEXT);"
-            "int hitObjectGetPrimitiveIndexEXT(hitObjectEXT);"
-            "uint hitObjectGetHitKindEXT(hitObjectEXT);"
-            "void hitObjectGetAttributesEXT(hitObjectEXT,int);"
-            "float hitObjectGetCurrentTimeEXT(hitObjectEXT);"
-            "uint hitObjectGetShaderBindingTableRecordIndexEXT(hitObjectEXT);"
-            "uvec2 hitObjectGetShaderRecordBufferHandleEXT(hitObjectEXT);"
-            "void hitObjectSetShaderBindingTableRecordIndexEXT(hitObjectEXT, uint);"
-            "void hitObjectRecordFromQueryEXT(hitObjectEXT, rayQueryEXT, uint, int);"
-            "void hitObjectGetIntersectionTriangleVertexPositionsEXT(hitObjectEXT, out vec3[3]);"
             "\n");
         stageBuiltins[EShLangCallable].append(
             "void executeCallableNV(uint, int);"
@@ -5831,16 +5113,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
     }
 
-    // GL_QCOM_tile_shading
-    if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 460)) {
-        stageBuiltins[EShLangCompute].append(
-            "in highp uvec2 gl_TileOffsetQCOM;"     // GL_QCOM_tile_shading
-            "in highp uvec3 gl_TileDimensionQCOM;"  // GL_QCOM_tile_shading
-            "in highp uvec2 gl_TileApronSizeQCOM;"  // GL_QCOM_tile_shading
-            "\n");
-    }
-
     //============================================================================
     //
     // Define the interface to the mesh/task shader.
@@ -6231,7 +5503,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "out vec4 gl_ClipVertex;"
             );
 
-        if (version >= 150)
+        if (version >= 400)
             stageBuiltins[EShLangGeometry].append(
             "in int gl_InvocationID;"
             );
@@ -6546,7 +5818,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             }
         }
 
-        if (version >= 150)
+        if (version >= 400)
             stageBuiltins[EShLangFragment].append(
                 "flat in  int  gl_SampleMaskIn[];"
             );
@@ -6681,16 +5953,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "flat in highp uint gl_ViewID_OVR;"     // GL_OVR_multiview, GL_OVR_multiview2
             "\n");
     }
-    
-    // GL_QCOM_tile_shading
-    if ((profile == EEsProfile && version >= 310) ||
-        (profile != EEsProfile && version >= 460)) {
-        stageBuiltins[EShLangFragment].append(
-            "flat in highp uvec2 gl_TileOffsetQCOM;"     // GL_QCOM_tile_shading
-            "flat in highp uvec3 gl_TileDimensionQCOM;"  // GL_QCOM_tile_shading
-            "flat in highp uvec2 gl_TileApronSizeQCOM;"  // GL_QCOM_tile_shading
-            "\n");
-    }
 
     // GL_ARB_shader_ballot
     if (profile != EEsProfile && version >= 450) {
@@ -6850,14 +6112,12 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "const uint gl_RayFlagsCullNoOpaqueNV = 128U;"
             "const uint gl_RayFlagsCullNoOpaqueEXT = 128U;"
             "const uint gl_RayFlagsSkipTrianglesEXT = 256U;"
-            "const uint gl_RayFlagsSkipBuiltinPrimitivesNV = 256U;"
             "const uint gl_RayFlagsSkipAABBEXT = 512U;"
             "const uint gl_RayFlagsForceOpacityMicromap2StateEXT = 1024U;"
             "const uint gl_HitKindFrontFacingTriangleEXT = 254U;"
             "const uint gl_HitKindBackFacingTriangleEXT = 255U;"
             "in    uint gl_HitKindFrontFacingMicroTriangleNV;"
             "in    uint gl_HitKindBackFacingMicroTriangleNV;"
-            "const int  gl_ClusterIDNoneNV = -1;"
             "\n";
 
         const char *constRayQueryIntersection =
@@ -6948,13 +6208,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "in    vec3   gl_HitTriangleVertexPositionsEXT[3];"
             "in    vec3   gl_HitMicroTriangleVertexPositionsNV[3];"
             "in    vec2   gl_HitMicroTriangleVertexBarycentricsNV[3];"
-            "in    int    gl_ClusterIDNV;"
-            "in    bool   gl_HitIsSphereNV;"
-            "in    bool   gl_HitIsLSSNV;"
-            "in    vec3   gl_HitSpherePositionNV;"
-            "in    float  gl_HitSphereRadiusNV;"
-            "in    vec3   gl_HitLSSPositionsNV[2];"
-            "in    float  gl_HitLSSRadiiNV[2];"
             "\n";
 
         const char *missDecls =
@@ -7074,7 +6327,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
                                                                           false,
                                                                           ms      ? true : false);
 
-                        TString typeName = TString{sampler.getString()};
+                        TString typeName = sampler.getString();
 
                         addQueryFunctions(sampler, typeName, version, profile);
                         addImageFunctions(sampler, typeName, version, profile);
@@ -7177,7 +6430,7 @@ void TBuiltIns::add2ndGenerationSamplingImaging(int version, EProfile profile, c
                                                                              ms      ? true : false);
                             }
 
-                            TString typeName = TString{sampler.getString()};
+                            TString typeName = sampler.getString();
 
                             if (dim == EsdSubpass) {
                                 addSubpassSampling(sampler, typeName, version, profile);
@@ -7201,7 +6454,7 @@ void TBuiltIns::add2ndGenerationSamplingImaging(int version, EProfile profile, c
                                     // texture types.
                                     sampler.setTexture(sampler.type, sampler.dim, sampler.arrayed, sampler.shadow,
                                                        sampler.ms);
-                                    TString textureTypeName = TString{sampler.getString()};
+                                    TString textureTypeName = sampler.getString();
                                     addSamplingFunctions(sampler, textureTypeName, version, profile);
                                     addQueryFunctions(sampler, textureTypeName, version, profile);
                                 }
@@ -7247,7 +6500,7 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, const TString& typeName, int
         commonBuiltins.append(postfixes[sizeDims]);
     }
     if (sampler.isImage())
-        commonBuiltins.append(" imageSize(readonly writeonly volatile coherent nontemporal ");
+        commonBuiltins.append(" imageSize(readonly writeonly volatile coherent ");
     else
         commonBuiltins.append(" textureSize(");
     commonBuiltins.append(typeName);
@@ -7265,7 +6518,7 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, const TString& typeName, int
     if (profile != EEsProfile && version >= 430 && sampler.isMultiSample()) {
         commonBuiltins.append("int ");
         if (sampler.isImage())
-            commonBuiltins.append("imageSamples(readonly writeonly volatile coherent nontemporal ");
+            commonBuiltins.append("imageSamples(readonly writeonly volatile coherent ");
         else
             commonBuiltins.append("textureSamples(");
         commonBuiltins.append(typeName);
@@ -7353,18 +6606,18 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
     if (profile == EEsProfile)
         commonBuiltins.append("highp ");
     commonBuiltins.append(prefixes[sampler.type]);
-    commonBuiltins.append("vec4 imageLoad(readonly volatile coherent nontemporal ");
+    commonBuiltins.append("vec4 imageLoad(readonly volatile coherent ");
     commonBuiltins.append(imageParams);
     commonBuiltins.append(");\n");
 
-    commonBuiltins.append("void imageStore(writeonly volatile coherent nontemporal ");
+    commonBuiltins.append("void imageStore(writeonly volatile coherent ");
     commonBuiltins.append(imageParams);
     commonBuiltins.append(", ");
     commonBuiltins.append(prefixes[sampler.type]);
     commonBuiltins.append("vec4);\n");
 
     if (! sampler.is1D() && ! sampler.isBuffer() && profile != EEsProfile && version >= 450) {
-        commonBuiltins.append("int sparseImageLoadARB(readonly volatile coherent nontemporal ");
+        commonBuiltins.append("int sparseImageLoadARB(readonly volatile coherent ");
         commonBuiltins.append(imageParams);
         commonBuiltins.append(", out ");
         commonBuiltins.append(prefixes[sampler.type]);
@@ -7388,13 +6641,13 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
             const int numBuiltins = 7;
 
             static const char* atomicFunc[numBuiltins] = {
-                " imageAtomicAdd(volatile coherent nontemporal ",
-                " imageAtomicMin(volatile coherent nontemporal ",
-                " imageAtomicMax(volatile coherent nontemporal ",
-                " imageAtomicAnd(volatile coherent nontemporal ",
-                " imageAtomicOr(volatile coherent nontemporal ",
-                " imageAtomicXor(volatile coherent nontemporal ",
-                " imageAtomicExchange(volatile coherent nontemporal "
+                " imageAtomicAdd(volatile coherent ",
+                " imageAtomicMin(volatile coherent ",
+                " imageAtomicMax(volatile coherent ",
+                " imageAtomicAnd(volatile coherent ",
+                " imageAtomicOr(volatile coherent ",
+                " imageAtomicXor(volatile coherent ",
+                " imageAtomicExchange(volatile coherent "
             };
 
             // Loop twice to add prototypes with/without scope/semantics
@@ -7412,7 +6665,7 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
                 }
 
                 commonBuiltins.append(dataType);
-                commonBuiltins.append(" imageAtomicCompSwap(volatile coherent nontemporal ");
+                commonBuiltins.append(" imageAtomicCompSwap(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", ");
                 commonBuiltins.append(dataType);
@@ -7425,11 +6678,11 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
             }
 
             commonBuiltins.append(dataType);
-            commonBuiltins.append(" imageAtomicLoad(volatile coherent nontemporal ");
+            commonBuiltins.append(" imageAtomicLoad(volatile coherent ");
             commonBuiltins.append(imageParams);
             commonBuiltins.append(", int, int, int);\n");
 
-            commonBuiltins.append("void imageAtomicStore(volatile coherent nontemporal ");
+            commonBuiltins.append("void imageAtomicStore(volatile coherent ");
             commonBuiltins.append(imageParams);
             commonBuiltins.append(", ");
             commonBuiltins.append(dataType);
@@ -7440,7 +6693,7 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
             // GL_ARB_ES3_1_compatibility
             // TODO: spec issue: are there restrictions on the kind of layout() that can be used?  what about dropping memory qualifiers?
             if (profile == EEsProfile && version >= 310) {
-                commonBuiltins.append("float imageAtomicExchange(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicExchange(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float);\n");
             }
@@ -7449,10 +6702,10 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
             if (profile != EEsProfile && version >= 430) {
                 const int numFp16Builtins = 4;
                 const char* atomicFp16Func[numFp16Builtins] = {
-                    " imageAtomicAdd(volatile coherent nontemporal ",
-                    " imageAtomicMin(volatile coherent nontemporal ",
-                    " imageAtomicMax(volatile coherent nontemporal ",
-                    " imageAtomicExchange(volatile coherent nontemporal "
+                    " imageAtomicAdd(volatile coherent ",
+                    " imageAtomicMin(volatile coherent ",
+                    " imageAtomicMax(volatile coherent ",
+                    " imageAtomicExchange(volatile coherent "
                 };
                 const int numFp16DataTypes = 2;
                 const char* atomicFp16DataTypes[numFp16DataTypes] = {
@@ -7473,47 +6726,47 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
             }
 
             if (profile != EEsProfile && version >= 450) {
-                commonBuiltins.append("float imageAtomicAdd(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicAdd(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float);\n");
 
-                commonBuiltins.append("float imageAtomicAdd(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicAdd(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float");
                 commonBuiltins.append(", int, int, int);\n");
 
-                commonBuiltins.append("float imageAtomicExchange(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicExchange(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float);\n");
 
-                commonBuiltins.append("float imageAtomicExchange(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicExchange(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float");
                 commonBuiltins.append(", int, int, int);\n");
 
-                commonBuiltins.append("float imageAtomicLoad(readonly volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicLoad(readonly volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", int, int, int);\n");
 
-                commonBuiltins.append("void imageAtomicStore(writeonly volatile coherent nontemporal ");
+                commonBuiltins.append("void imageAtomicStore(writeonly volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float");
                 commonBuiltins.append(", int, int, int);\n");
 
-                commonBuiltins.append("float imageAtomicMin(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicMin(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float);\n");
 
-                commonBuiltins.append("float imageAtomicMin(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicMin(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float");
                 commonBuiltins.append(", int, int, int);\n");
 
-                commonBuiltins.append("float imageAtomicMax(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicMax(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float);\n");
 
-                commonBuiltins.append("float imageAtomicMax(volatile coherent nontemporal ");
+                commonBuiltins.append("float imageAtomicMax(volatile coherent ");
                 commonBuiltins.append(imageParams);
                 commonBuiltins.append(", float");
                 commonBuiltins.append(", int, int, int);\n");
@@ -7537,18 +6790,18 @@ void TBuiltIns::addImageFunctions(TSampler sampler, const TString& typeName, int
     imageLodParams.append(", int");
 
     commonBuiltins.append(prefixes[sampler.type]);
-    commonBuiltins.append("vec4 imageLoadLodAMD(readonly volatile coherent nontemporal ");
+    commonBuiltins.append("vec4 imageLoadLodAMD(readonly volatile coherent ");
     commonBuiltins.append(imageLodParams);
     commonBuiltins.append(");\n");
 
-    commonBuiltins.append("void imageStoreLodAMD(writeonly volatile coherent nontemporal ");
+    commonBuiltins.append("void imageStoreLodAMD(writeonly volatile coherent ");
     commonBuiltins.append(imageLodParams);
     commonBuiltins.append(", ");
     commonBuiltins.append(prefixes[sampler.type]);
     commonBuiltins.append("vec4);\n");
 
     if (! sampler.is1D()) {
-        commonBuiltins.append("int sparseImageLoadLodAMD(readonly volatile coherent nontemporal ");
+        commonBuiltins.append("int sparseImageLoadLodAMD(readonly volatile coherent ");
         commonBuiltins.append(imageLodParams);
         commonBuiltins.append(", out ");
         commonBuiltins.append(prefixes[sampler.type]);
@@ -8485,12 +7738,6 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
         snprintf(builtInConstant, maxSize, "const int gl_MaxComputeTextureImageUnits = %d;", resources.maxComputeTextureImageUnits);
         s.append(builtInConstant);
 
-        // GL_ARM_tensors operands.
-        snprintf(builtInConstant, maxSize, "const uint gl_TensorOperandsNonTemporalARM = 0x1U;");
-        s.append(builtInConstant);
-        snprintf(builtInConstant, maxSize, "const uint gl_TensorOperandsOutOfBoundsValueARM = 0x2U;");
-        s.append(builtInConstant);
-
         s.append("\n");
     }
 
@@ -8760,11 +8007,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
                 symbolTable.setFunctionExtensions("allInvocationsARB",      1, &E_GL_ARB_shader_group_vote);
                 symbolTable.setFunctionExtensions("allInvocationsEqualARB", 1, &E_GL_ARB_shader_group_vote);
             }
-            if (version >= 150) {
-                symbolTable.setFunctionExtensions("anyThreadNV",       1, &E_GL_NV_gpu_shader5);
-                symbolTable.setFunctionExtensions("allThreadsNV",      1, &E_GL_NV_gpu_shader5);
-                symbolTable.setFunctionExtensions("allThreadsEqualNV", 1, &E_GL_NV_gpu_shader5);
-            }
         }
 
 
@@ -8853,11 +8095,8 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
                 if (version == 310)
                     symbolTable.setFunctionExtensions("textureGatherOffsets", Num_AEP_gpu_shader5, AEP_gpu_shader5);
             }
-            if (version == 310) {
+            if (version == 310)
                 symbolTable.setFunctionExtensions("fma", Num_AEP_gpu_shader5, AEP_gpu_shader5);
-            } else if (profile != EEsProfile && version >= 150) {
-                symbolTable.setFunctionExtensions("fma", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            }
         }
 
         if (profile == EEsProfile && version < 320) {
@@ -8946,9 +8185,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
         symbolTable.setVariableExtensions("gl_PositionPerViewNV",       1, &E_GL_NVX_multiview_per_view_attributes);
         symbolTable.setVariableExtensions("gl_ViewportMaskPerViewNV",   1, &E_GL_NVX_multiview_per_view_attributes);
 
-        if (profile != EEsProfile && language == EShLangGeometry && version < 400) {
-            symbolTable.setVariableExtensions("gl_InvocationID", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-        }
         BuiltInVariable("gl_ViewportMask",              EbvViewportMaskNV,          symbolTable);
         BuiltInVariable("gl_SecondaryPositionNV",       EbvSecondaryPositionNV,     symbolTable);
         BuiltInVariable("gl_SecondaryViewportMaskNV",   EbvSecondaryViewportMaskNV, symbolTable);
@@ -9047,11 +8283,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
                 BuiltInVariable("gl_SubGroupSizeARB", EbvSubGroupSize, symbolTable);
         }
 
-        // GL_ARB_gpu_shader5/GL_NV_gpu_shader5
-        if (profile != EEsProfile && version < 400 && language == EShLangGeometry) {
-            symbolTable.setFunctionExtensions("EmitStreamVertex", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("EndStreamPrimitive", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-        }
         // GL_KHR_shader_subgroup
         if ((profile == EEsProfile && version >= 310) ||
             (profile != EEsProfile && version >= 140)) {
@@ -9095,18 +8326,18 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             BuiltInVariable("gl_WarpMaxIDARM", EbvWarpMaxIDARM, symbolTable);
         }
 
-        if (language == EShLangGeometry || language == EShLangVertex) {
-            if ((profile == EEsProfile && version >= 310) ||
-                (profile != EEsProfile && version >= 450)) {
-                symbolTable.setVariableExtensions("gl_PrimitiveShadingRateEXT", 1, &E_GL_EXT_fragment_shading_rate);
-                BuiltInVariable("gl_PrimitiveShadingRateEXT", EbvPrimitiveShadingRateKHR, symbolTable);
+		if (language == EShLangGeometry || language == EShLangVertex) {
+			if ((profile == EEsProfile && version >= 310) ||
+				(profile != EEsProfile && version >= 450)) {
+				symbolTable.setVariableExtensions("gl_PrimitiveShadingRateEXT", 1, &E_GL_EXT_fragment_shading_rate);
+				BuiltInVariable("gl_PrimitiveShadingRateEXT", EbvPrimitiveShadingRateKHR, symbolTable);
 
-                symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
-                symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
-                symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
-                symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
-            }
-        }
+				symbolTable.setVariableExtensions("gl_ShadingRateFlag2VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+				symbolTable.setVariableExtensions("gl_ShadingRateFlag4VerticalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+				symbolTable.setVariableExtensions("gl_ShadingRateFlag2HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+				symbolTable.setVariableExtensions("gl_ShadingRateFlag4HorizontalPixelsEXT", 1, &E_GL_EXT_fragment_shading_rate);
+			}
+		}
         break;
 
     case EShLangFragment:
@@ -9165,14 +8396,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setFunctionExtensions("rayQueryGetWorldRayOriginEXT",                                     1, &E_GL_EXT_ray_query);
             symbolTable.setFunctionExtensions("rayQueryGetWorldRayDirectionEXT",                                  1, &E_GL_EXT_ray_query);
             symbolTable.setFunctionExtensions("rayQueryGetIntersectionTriangleVertexPositionsEXT",                1, &E_GL_EXT_ray_tracing_position_fetch);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionClusterIdNV",                               1, &E_GL_NV_cluster_acceleration_structure);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionSpherePositionNV",                          1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionSphereRadiusNV",                            1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionLSSHitValueNV",                             1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionLSSPositionsNV",                            1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryGetIntersectionLSSRadiiNV",                                1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryIsSphereHitNV",                                            1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("rayQueryIsLSSHitNV",                                               1, &E_GL_NV_linear_swept_spheres);
             symbolTable.setVariableExtensions("gl_RayFlagsSkipAABBEXT",                         1, &E_GL_EXT_ray_flags_primitive_culling);
             symbolTable.setVariableExtensions("gl_RayFlagsSkipTrianglesEXT",                    1, &E_GL_EXT_ray_flags_primitive_culling);
             symbolTable.setVariableExtensions("gl_RayFlagsForceOpacityMicromap2StateEXT",                  1, &E_GL_EXT_opacity_micromap);
@@ -9185,9 +8408,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             BuiltInVariable("gl_SampleMask",         EbvSampleMask,     symbolTable);
 
             if (profile != EEsProfile && version < 400) {
-                BuiltInVariable("gl_SampleMaskIn",    EbvSampleMask,     symbolTable);
-                symbolTable.setVariableExtensions("gl_SampleMaskIn", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-
                 BuiltInVariable("gl_NumSamples",     EbvSampleMask,     symbolTable);
 
                 symbolTable.setVariableExtensions("gl_SampleMask",     1, &E_GL_ARB_sample_shading);
@@ -9293,37 +8513,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setFunctionExtensions("atomicCounter"         , 1, &E_GL_ARB_shader_atomic_counters);
         }
 
-        // E_GL_ARB_gpu_shader5/E_GL_NV_gpu_shader5 
-        if (profile != EEsProfile && version < 400) {
-            symbolTable.setFunctionExtensions("bitfieldExtract", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("bitfieldInsert", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("bitfieldReverse", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("bitCount", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("findLSB", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("findMSB", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("uaddCarry", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("usubBorrow", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("umulExtended", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("imulExtended", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("interpolateAtCentroid", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("interpolateAtSample", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-            symbolTable.setFunctionExtensions("interpolateAtOffset", Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5);
-        }
-
-        // E_GL_NV_gpu_shader5
-        if (profile != EEsProfile && version < 450) {
-            symbolTable.setFunctionExtensions("packInt2x32",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("packUint2x32",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("unpackInt2x32",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("unpackUint2x32",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("packFloat2x16",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("unpackFloat2x16",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("doubleBitsToInt64",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("doubleBitsToUint64",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("int64BitsToDouble",     1, &E_GL_NV_gpu_shader5);
-            symbolTable.setFunctionExtensions("uint64BitsToDouble",     1, &E_GL_NV_gpu_shader5);
-        }
-
         // E_GL_ARB_shader_atomic_counter_ops
         if (profile != EEsProfile && version == 450) {
             symbolTable.setFunctionExtensions("atomicCounterAddARB"     , 1, &E_GL_ARB_shader_atomic_counter_ops);
@@ -9468,15 +8657,11 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
         }
 
         if (profile != EEsProfile && version < 330 ) {
-            const int numBitEncodingExts = 3;
-            const char* bitEncodingExts[numBitEncodingExts] = { E_GL_ARB_shader_bit_encoding,
-                                                                E_GL_ARB_gpu_shader5,
-                                                                E_GL_NV_gpu_shader5};
-            symbolTable.setFunctionExtensions("floatBitsToInt", numBitEncodingExts, bitEncodingExts);
-            symbolTable.setFunctionExtensions("floatBitsToUint", numBitEncodingExts, bitEncodingExts);
-            symbolTable.setFunctionExtensions("intBitsToFloat", numBitEncodingExts, bitEncodingExts);
-            symbolTable.setFunctionExtensions("uintBitsToFloat", numBitEncodingExts, bitEncodingExts);
-
+            const char* bitsConvertExt[2] = {E_GL_ARB_shader_bit_encoding, E_GL_ARB_gpu_shader5};
+            symbolTable.setFunctionExtensions("floatBitsToInt", 2, bitsConvertExt);
+            symbolTable.setFunctionExtensions("floatBitsToUint", 2, bitsConvertExt);
+            symbolTable.setFunctionExtensions("intBitsToFloat", 2, bitsConvertExt);
+            symbolTable.setFunctionExtensions("uintBitsToFloat", 2, bitsConvertExt);
         }
 
         if (profile != EEsProfile && version < 430 ) {
@@ -9497,16 +8682,12 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
 
         // GL_ARB_shading_language_packing
         if (profile != EEsProfile && version < 400 ) {
-            const int numPackingExts = 3;
-            const char* packingExts[numPackingExts] = { E_GL_ARB_shading_language_packing,
-                                                                E_GL_ARB_gpu_shader5,
-                                                                E_GL_NV_gpu_shader5};
-            symbolTable.setFunctionExtensions("packUnorm2x16", numPackingExts, packingExts);
-            symbolTable.setFunctionExtensions("unpackUnorm2x16", numPackingExts, packingExts);
-            symbolTable.setFunctionExtensions("packSnorm4x8", numPackingExts, packingExts);
-            symbolTable.setFunctionExtensions("packUnorm4x8", numPackingExts, packingExts);
-            symbolTable.setFunctionExtensions("unpackSnorm4x8", numPackingExts, packingExts);
-            symbolTable.setFunctionExtensions("unpackUnorm4x8", numPackingExts, packingExts);
+            symbolTable.setFunctionExtensions("packUnorm2x16", 1, &E_GL_ARB_shading_language_packing);
+            symbolTable.setFunctionExtensions("unpackUnorm2x16", 1, &E_GL_ARB_shading_language_packing);
+            symbolTable.setFunctionExtensions("packSnorm4x8", 1, &E_GL_ARB_shading_language_packing);
+            symbolTable.setFunctionExtensions("packUnorm4x8", 1, &E_GL_ARB_shading_language_packing);
+            symbolTable.setFunctionExtensions("unpackSnorm4x8", 1, &E_GL_ARB_shading_language_packing);
+            symbolTable.setFunctionExtensions("unpackUnorm4x8", 1, &E_GL_ARB_shading_language_packing);
         }
         if (profile != EEsProfile && version < 420 ) {
             symbolTable.setFunctionExtensions("packSnorm2x16", 1, &E_GL_ARB_shading_language_packing);
@@ -9744,17 +8925,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setFunctionExtensions("textureBlockMatchGatherSSDQCOM", 1, &E_GL_QCOM_image_processing2);
             symbolTable.setFunctionExtensions("textureBlockMatchGatherSADQCOM", 1, &E_GL_QCOM_image_processing2);
         }
-
-        if ((profile == EEsProfile && version >= 310) ||
-            (profile != EEsProfile && version >= 460)) {
-            BuiltInVariable("gl_TileOffsetQCOM",    EbvTileOffsetQCOM,      symbolTable);
-            BuiltInVariable("gl_TileDimensionQCOM", EbvTileDimensionQCOM,   symbolTable);
-            BuiltInVariable("gl_TileApronSizeQCOM", EbvTileApronSizeQCOM,   symbolTable);
-
-            symbolTable.setVariableExtensions("gl_TileOffsetQCOM",        1, &E_GL_QCOM_tile_shading);
-            symbolTable.setVariableExtensions("gl_TileDimensionQCOM",     1, &E_GL_QCOM_tile_shading);
-            symbolTable.setVariableExtensions("gl_TileApronSizeQCOM",     1, &E_GL_QCOM_tile_shading);
-        }
         break;
 
     case EShLangCompute:
@@ -9891,78 +9061,9 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
         }
 
         {
-            auto coopMatKHRCallback = [](const char *name) -> std::vector<const char *> {
-                std::vector<const char *> ret;
-                if (strstr(name, "u64") != nullptr) {
-                    ret.push_back(E_GL_EXT_shader_64bit_indexing);
-                } else {
-                    ret.push_back(E_GL_KHR_cooperative_matrix);
-                }
-                return ret;
-            };
-            auto coopMat2NVCallback = [](const char *name) -> std::vector<const char *> {
-                std::vector<const char *> ret;
-                if (strstr(name, "u64") != nullptr) {
-                    ret.push_back(E_GL_EXT_shader_64bit_indexing);
-                } else {
-                    ret.push_back(E_GL_NV_cooperative_matrix2);
-                }
-                return ret;
-            };
-
-            symbolTable.setFunctionExtensionsCallback("coopMatLoad",   coopMatKHRCallback);
-            symbolTable.setFunctionExtensionsCallback("coopMatStore",  coopMatKHRCallback);
+            symbolTable.setFunctionExtensions("coopMatLoad",   1, &E_GL_KHR_cooperative_matrix);
+            symbolTable.setFunctionExtensions("coopMatStore",  1, &E_GL_KHR_cooperative_matrix);
             symbolTable.setFunctionExtensions("coopMatMulAdd", 1, &E_GL_KHR_cooperative_matrix);
-
-            symbolTable.setFunctionExtensionsCallback("coopMatLoadTensorNV",   coopMat2NVCallback);
-            symbolTable.setFunctionExtensionsCallback("coopMatStoreTensorNV",   coopMat2NVCallback);
-
-            symbolTable.setFunctionExtensions("coopMatReduceNV",   1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("coopMatPerElementNV",  1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("coopMatTransposeNV",   1, &E_GL_NV_cooperative_matrix2);
-            
-            symbolTable.setFunctionExtensions("createTensorLayoutNV",           1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorLayoutBlockSizeNV",     1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorLayoutDimensionNV",     1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorLayoutStrideNV",        1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("sliceTensorLayoutNV",            1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorLayoutClampValueNV",    1, &E_GL_NV_cooperative_matrix2);
-
-            symbolTable.setFunctionExtensions("createTensorViewNV",             1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorViewDimensionsNV",      1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorViewStrideNV",          1, &E_GL_NV_cooperative_matrix2);
-            symbolTable.setFunctionExtensions("setTensorViewClipNV",            1, &E_GL_NV_cooperative_matrix2);
-        }
-
-        {
-            symbolTable.setFunctionExtensions("tensorReadARM",   1, &E_GL_ARM_tensors);
-            symbolTable.setFunctionExtensions("tensorWriteARM",  1, &E_GL_ARM_tensors);
-            symbolTable.setFunctionExtensions("tensorSizeARM",   1, &E_GL_ARM_tensors);
-        }
-        {
-            auto coopVecCallback = [](const char *name) -> std::vector<const char *> {
-                std::vector<const char *> ret;
-                // This looks for u64 as the last parameter (the offset)
-                if (strstr(name, "u641;") != nullptr) {
-                    ret.push_back(E_GL_EXT_shader_64bit_indexing);
-                } else {
-                    ret.push_back(E_GL_NV_cooperative_vector);
-                }
-                return ret;
-            };
-            symbolTable.setFunctionExtensionsCallback("coopVecMatMulNV", coopVecCallback);
-            symbolTable.setFunctionExtensionsCallback("coopVecMatMulAddNV", coopVecCallback);
-            symbolTable.setFunctionExtensionsCallback("coopVecLoadNV", coopVecCallback);
-            symbolTable.setFunctionExtensionsCallback("coopVecStoreNV", coopVecCallback);
-            symbolTable.setFunctionExtensionsCallback("coopVecOuterProductAccumulateNV", coopVecCallback);
-            symbolTable.setFunctionExtensionsCallback("coopVecReduceSumAccumulateNV", coopVecCallback);
-        }
-
-        {
-          symbolTable.setFunctionExtensions("bitcastQCOM", 1, &E_GL_QCOM_cooperative_matrix_conversion);
-          symbolTable.setFunctionExtensions("extractSubArrayQCOM", 1, &E_GL_QCOM_cooperative_matrix_conversion);
-          symbolTable.setFunctionExtensions("vectorToCoopmatQCOM", 1, &E_GL_QCOM_cooperative_matrix_conversion);
-          symbolTable.setFunctionExtensions("coopmatToVectorQCOM", 1, &E_GL_QCOM_cooperative_matrix_conversion);
         }
 
         if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 320)) {
@@ -9989,47 +9090,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setFunctionExtensions("fetchMicroTriangleVertexPositionNV", 1, &E_GL_NV_displacement_micromap);
             symbolTable.setFunctionExtensions("fetchMicroTriangleVertexBarycentricNV", 1, &E_GL_NV_displacement_micromap);
         }
-
-        // GL_EXT_integer_dot_product
-        if ((profile == EEsProfile && version >= 300) ||
-            (profile != EEsProfile && version >= 450)) {
-            symbolTable.setFunctionExtensions("dotEXT", 1, &E_GL_EXT_integer_dot_product);
-            symbolTable.setFunctionExtensions("dotPacked4x8EXT", 1, &E_GL_EXT_integer_dot_product);
-            symbolTable.setFunctionExtensions("dotAccSatEXT", 1, &E_GL_EXT_integer_dot_product);
-            symbolTable.setFunctionExtensions("dotPacked4x8AccSatEXT", 1, &E_GL_EXT_integer_dot_product);
-        }
-
-        {
-            symbolTable.setFunctionExtensions("bfloat16BitsToIntEXT", 1, &E_GL_EXT_bfloat16);
-            symbolTable.setFunctionExtensions("bfloat16BitsToUintEXT", 1, &E_GL_EXT_bfloat16);
-            symbolTable.setFunctionExtensions("intBitsToBFloat16EXT", 1, &E_GL_EXT_bfloat16);
-            symbolTable.setFunctionExtensions("uintBitsToBFloat16EXT", 1, &E_GL_EXT_bfloat16);
-
-            symbolTable.setFunctionExtensions("floate5m2BitsToIntEXT", 1, &E_GL_EXT_float_e5m2);
-            symbolTable.setFunctionExtensions("floate5m2BitsToUintEXT", 1, &E_GL_EXT_float_e5m2);
-            symbolTable.setFunctionExtensions("intBitsToFloate5m2EXT", 1, &E_GL_EXT_float_e5m2);
-            symbolTable.setFunctionExtensions("uintBitsToFloate5m2EXT", 1, &E_GL_EXT_float_e5m2);
-
-            symbolTable.setFunctionExtensions("floate4m3BitsToIntEXT", 1, &E_GL_EXT_float_e4m3);
-            symbolTable.setFunctionExtensions("floate4m3BitsToUintEXT", 1, &E_GL_EXT_float_e4m3);
-            symbolTable.setFunctionExtensions("intBitsToFloate4m3EXT", 1, &E_GL_EXT_float_e4m3);
-            symbolTable.setFunctionExtensions("uintBitsToFloate4m3EXT", 1, &E_GL_EXT_float_e4m3);
-
-            const char *float8exts[] = {E_GL_EXT_float_e5m2, E_GL_EXT_float_e4m3};
-            symbolTable.setFunctionExtensions("saturatedConvertEXT", 2, float8exts);
-        }
-
-        // E_SPV_QCOM_tile_shading
-        if ((profile == EEsProfile && version >= 310) ||
-            (profile != EEsProfile && version >= 460)) {
-            BuiltInVariable("gl_TileOffsetQCOM",        EbvTileOffsetQCOM,      symbolTable);
-            BuiltInVariable("gl_TileDimensionQCOM",     EbvTileDimensionQCOM,   symbolTable);
-            BuiltInVariable("gl_TileApronSizeQCOM",     EbvTileApronSizeQCOM,   symbolTable);
-
-            symbolTable.setVariableExtensions("gl_TileOffsetQCOM",        1, &E_GL_QCOM_tile_shading);
-            symbolTable.setVariableExtensions("gl_TileDimensionQCOM",     1, &E_GL_QCOM_tile_shading);
-            symbolTable.setVariableExtensions("gl_TileApronSizeQCOM",     1, &E_GL_QCOM_tile_shading);
-        }
         break;
 
     case EShLangRayGen:
@@ -10078,13 +9138,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setVariableExtensions("gl_HitTriangleVertexPositionsEXT", 1, &E_GL_EXT_ray_tracing_position_fetch);
             symbolTable.setVariableExtensions("gl_HitMicroTriangleVertexPositionsNV", 1, &E_GL_NV_displacement_micromap);
             symbolTable.setVariableExtensions("gl_HitMicroTriangleVertexBarycentricsNV", 1, &E_GL_NV_displacement_micromap);
-            symbolTable.setVariableExtensions("gl_ClusterIDNV", 1, &E_GL_NV_cluster_acceleration_structure);
-            symbolTable.setVariableExtensions("gl_HitKindSphereNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setVariableExtensions("gl_HitKindLSSNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setVariableExtensions("gl_HitSpherePositionNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setVariableExtensions("gl_HitSphereRadiusNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setVariableExtensions("gl_HitLSSPositionNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setVariableExtensions("gl_HitLSSRadiiNV", 1, &E_GL_NV_linear_swept_spheres);
 
             symbolTable.setVariableExtensions("gl_DeviceIndex", 1, &E_GL_EXT_device_group);
 
@@ -10129,50 +9182,9 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.setFunctionExtensions("hitObjectGetCurrentTimeNV", 1, &E_GL_NV_shader_invocation_reorder);
             symbolTable.setFunctionExtensions("hitObjectGetShaderBindingTableRecordIndexNV", 1, &E_GL_NV_shader_invocation_reorder);
             symbolTable.setFunctionExtensions("hitObjectGetShaderRecordBufferHandleNV", 1, &E_GL_NV_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetClusterIdNV", 1, &E_GL_NV_cluster_acceleration_structure);
             symbolTable.setFunctionExtensions("reorderThreadNV", 1, &E_GL_NV_shader_invocation_reorder);
             symbolTable.setFunctionExtensions("fetchMicroTriangleVertexPositionNV", 1, &E_GL_NV_displacement_micromap);
             symbolTable.setFunctionExtensions("fetchMicroTriangleVertexBarycentricNV", 1, &E_GL_NV_displacement_micromap);
-            symbolTable.setFunctionExtensions("hitObjectGetSpherePositionNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectGetSphereRadiusNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectGetLSSPositionsNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectGetLSSRadiiNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectIsSphereHitNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectIsLSSHitNV", 1, &E_GL_NV_linear_swept_spheres);
-            symbolTable.setFunctionExtensions("hitObjectTraceRayEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectTraceRayMotionEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectRecordMissEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectRecordMissMotionEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectRecordEmptyEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectExecuteShaderEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectIsEmptyEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectIsMissEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectIsHitEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetRayTMinEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetRayTMaxEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetRayFlagsEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetObjectRayOriginEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetObjectRayDirectionEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetWorldRayOriginEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetWorldRayDirectionEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetWorldToObjectEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetObjectToWorldEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetInstanceCustomIndexEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetInstanceIdEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetGeometryIndexEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetPrimitiveIndexEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetHitKindEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetAttributesEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetCurrentTimeEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetShaderBindingTableRecordIndexEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetShaderRecordBufferHandleEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectSetShaderBindingTableRecordIndexEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("reorderThreadEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectReorderExecuteEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectTraceReorderExecuteEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectTraceMotionReorderExecuteEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectRecordFromQueryEXT", 1, &E_GL_EXT_shader_invocation_reorder);
-            symbolTable.setFunctionExtensions("hitObjectGetIntersectionTriangleVertexPositionsEXT", 1, &E_GL_EXT_shader_invocation_reorder);
 
 
             BuiltInVariable("gl_LaunchIDNV",             EbvLaunchId,           symbolTable);
@@ -10197,6 +9209,8 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             BuiltInVariable("gl_RayTmaxNV",              EbvRayTmax,            symbolTable);
             BuiltInVariable("gl_RayTmaxEXT",             EbvRayTmax,            symbolTable);
             BuiltInVariable("gl_CullMaskEXT",            EbvCullMask,           symbolTable);
+            BuiltInVariable("gl_HitTNV",                 EbvHitT,               symbolTable);
+            BuiltInVariable("gl_HitTEXT",                EbvHitT,               symbolTable);
             BuiltInVariable("gl_HitKindNV",              EbvHitKind,            symbolTable);
             BuiltInVariable("gl_HitKindEXT",             EbvHitKind,            symbolTable);
             BuiltInVariable("gl_ObjectToWorldNV",        EbvObjectToWorld,      symbolTable);
@@ -10214,17 +9228,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             BuiltInVariable("gl_HitMicroTriangleVertexBarycentricsNV", EbvMicroTriangleBaryNV, symbolTable);
             BuiltInVariable("gl_HitKindFrontFacingMicroTriangleNV", EbvHitKindFrontFacingMicroTriangleNV, symbolTable);
             BuiltInVariable("gl_HitKindBackFacingMicroTriangleNV", EbvHitKindBackFacingMicroTriangleNV, symbolTable);
-            BuiltInVariable("gl_ClusterIDNV",            EbvClusterIDNV,         symbolTable);
-            BuiltInVariable("gl_HitIsSphereNV", EbvHitIsSphereNV, symbolTable);
-            BuiltInVariable("gl_HitIsLSSNV", EbvHitIsLSSNV, symbolTable);
-            BuiltInVariable("gl_HitSpherePositionNV", EbvHitSpherePositionNV, symbolTable);
-            BuiltInVariable("gl_HitSphereRadiusNV", EbvHitSphereRadiusNV, symbolTable);
-            BuiltInVariable("gl_HitLSSPositionsNV", EbvHitLSSPositionsNV, symbolTable);
-            BuiltInVariable("gl_HitLSSRadiiNV", EbvHitLSSRadiiNV, symbolTable);
-
-            // gl_HitT variables are aliases of their gl_RayTmax counterparts.
-            RetargetVariable("gl_HitTNV",                "gl_RayTmaxNV",        symbolTable);
-            RetargetVariable("gl_HitTEXT",               "gl_RayTmaxEXT",       symbolTable);
 
             // GL_ARB_shader_ballot
             symbolTable.setVariableExtensions("gl_SubGroupSizeARB",       1, &E_GL_ARB_shader_ballot);
@@ -10977,16 +9980,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
                 symbolTable.relateToOperator("allInvocations",              EOpAllInvocations);
                 symbolTable.relateToOperator("allInvocationsEqual",         EOpAllInvocationsEqual);
             }
-            // As per dependency between NV_gpu_shader5 and ARB_shader_group_vote
-            // anyInvocationARB = anyThreadNV
-            // allInvocationsARB = allThreadsNV
-            // allInvocationsEqualARB = allThreadsEqualNV
-            // Thus we reuse the Op's
-            if (version >= 150) {
-                symbolTable.relateToOperator("anyThreadNV",            EOpAnyInvocation);
-                symbolTable.relateToOperator("allThreadsNV",           EOpAllInvocations);
-                symbolTable.relateToOperator("allThreadsEqualNV",      EOpAllInvocationsEqual);
-            }
             symbolTable.relateToOperator("minInvocationsAMD",                           EOpMinInvocations);
             symbolTable.relateToOperator("maxInvocationsAMD",                           EOpMaxInvocations);
             symbolTable.relateToOperator("addInvocationsAMD",                           EOpAddInvocations);
@@ -11033,36 +10026,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.relateToOperator("fragmentFetchAMD",                    EOpFragmentFetch);
         }
 
-        // GL_EXT_integer_dot_product
-        if ((profile == EEsProfile && version >= 300) ||
-            (profile != EEsProfile && version >= 450)) {
-            symbolTable.relateToOperator("dotEXT", EOpDot);
-            symbolTable.relateToOperator("dotPacked4x8EXT", EOpDotPackedEXT);
-            symbolTable.relateToOperator("dotAccSatEXT", EOpDotAccSatEXT);
-            symbolTable.relateToOperator("dotPacked4x8AccSatEXT", EOpDotPackedAccSatEXT);
-        }
-
-        // GL_EXT_bfloat16
-        if ((profile == EEsProfile && version >= 320) ||
-            (profile != EEsProfile && version >= 450)) {
-            symbolTable.relateToOperator("bfloat16BitsToIntEXT",  EOpFloatBitsToInt);
-            symbolTable.relateToOperator("bfloat16BitsToUintEXT", EOpFloatBitsToUint);
-            symbolTable.relateToOperator("intBitsToBFloat16EXT",  EOpIntBitsToFloat);
-            symbolTable.relateToOperator("uintBitsToBFloat16EXT", EOpUintBitsToFloat);
-
-            symbolTable.relateToOperator("floate5m2BitsToIntEXT",  EOpFloatBitsToInt);
-            symbolTable.relateToOperator("floate5m2BitsToUintEXT", EOpFloatBitsToUint);
-            symbolTable.relateToOperator("intBitsToFloate5m2EXT",  EOpIntBitsToFloat);
-            symbolTable.relateToOperator("uintBitsToFloate5m2EXT", EOpUintBitsToFloat);
-
-            symbolTable.relateToOperator("floate4m3BitsToIntEXT",  EOpFloatBitsToInt);
-            symbolTable.relateToOperator("floate4m3BitsToUintEXT", EOpFloatBitsToUint);
-            symbolTable.relateToOperator("intBitsToFloate4m3EXT",  EOpIntBitsToFloat);
-            symbolTable.relateToOperator("uintBitsToFloate4m3EXT", EOpUintBitsToFloat);
-
-            symbolTable.relateToOperator("saturatedConvertEXT", EOpConstructSaturated);
-        }
-
         // GL_KHR_shader_subgroup
         if ((profile == EEsProfile && version >= 310) ||
             (profile != EEsProfile && version >= 140)) {
@@ -11182,13 +10145,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.relateToOperator("texture2DArrayLod", EOpTextureLod);
             symbolTable.relateToOperator("shadow1DArrayLod", EOpTextureLod);
         }
-
-        symbolTable.relateToOperator("coopVecMatMulNV",              EOpCooperativeVectorMatMulNV);
-        symbolTable.relateToOperator("coopVecMatMulAddNV",           EOpCooperativeVectorMatMulAddNV);
-        symbolTable.relateToOperator("coopVecLoadNV",                EOpCooperativeVectorLoadNV);
-        symbolTable.relateToOperator("coopVecStoreNV",               EOpCooperativeVectorStoreNV);
-        symbolTable.relateToOperator("coopVecOuterProductAccumulateNV", EOpCooperativeVectorOuterProductAccumulateNV);
-        symbolTable.relateToOperator("coopVecReduceSumAccumulateNV",    EOpCooperativeVectorReduceSumAccumulateNV);
     }
 
     switch(language) {
@@ -11241,14 +10197,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.relateToOperator("rayQueryGetIntersectionObjectToWorldEXT",                           EOpRayQueryGetIntersectionObjectToWorld);
             symbolTable.relateToOperator("rayQueryGetIntersectionWorldToObjectEXT",                           EOpRayQueryGetIntersectionWorldToObject);
             symbolTable.relateToOperator("rayQueryGetIntersectionTriangleVertexPositionsEXT",                 EOpRayQueryGetIntersectionTriangleVertexPositionsEXT);
-            symbolTable.relateToOperator("rayQueryGetIntersectionClusterIdNV",                                EOpRayQueryGetIntersectionClusterIdNV);
-            symbolTable.relateToOperator("rayQueryGetIntersectionSpherePositionNV",                           EOpRayQueryGetIntersectionSpherePositionNV);
-            symbolTable.relateToOperator("rayQueryGetIntersectionSphereRadiusNV",                             EOpRayQueryGetIntersectionSphereRadiusNV);
-            symbolTable.relateToOperator("rayQueryGetIntersectionLSSHitValueNV",                              EOpRayQueryGetIntersectionLSSHitValueNV);
-            symbolTable.relateToOperator("rayQueryGetIntersectionLSSPositionsNV",                             EOpRayQueryGetIntersectionLSSPositionsNV);
-            symbolTable.relateToOperator("rayQueryGetIntersectionLSSRadiiNV",                                 EOpRayQueryGetIntersectionLSSRadiiNV);
-            symbolTable.relateToOperator("rayQueryIsSphereHitNV",                                             EOpRayQueryIsSphereHitNV);
-            symbolTable.relateToOperator("rayQueryIsLSSHitNV",                                                EOpRayQueryIsLSSHitNV);
         }
 
         symbolTable.relateToOperator("interpolateAtCentroid", EOpInterpolateAtCentroid);
@@ -11289,34 +10237,6 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
         symbolTable.relateToOperator("coopMatStore",               EOpCooperativeMatrixStore);
         symbolTable.relateToOperator("coopMatMulAdd",              EOpCooperativeMatrixMulAdd);
 
-        symbolTable.relateToOperator("coopMatLoadTensorNV",        EOpCooperativeMatrixLoadTensorNV);
-        symbolTable.relateToOperator("coopMatStoreTensorNV",       EOpCooperativeMatrixStoreTensorNV);
-
-        symbolTable.relateToOperator("coopMatReduceNV",            EOpCooperativeMatrixReduceNV);
-        symbolTable.relateToOperator("coopMatPerElementNV",        EOpCooperativeMatrixPerElementOpNV);
-        symbolTable.relateToOperator("coopMatTransposeNV",         EOpCooperativeMatrixTransposeNV);
-
-        symbolTable.relateToOperator("createTensorLayoutNV",         EOpCreateTensorLayoutNV);
-        symbolTable.relateToOperator("setTensorLayoutBlockSizeNV",   EOpTensorLayoutSetBlockSizeNV);
-        symbolTable.relateToOperator("setTensorLayoutDimensionNV",   EOpTensorLayoutSetDimensionNV);
-        symbolTable.relateToOperator("setTensorLayoutStrideNV",      EOpTensorLayoutSetStrideNV);
-        symbolTable.relateToOperator("sliceTensorLayoutNV",          EOpTensorLayoutSliceNV);
-        symbolTable.relateToOperator("setTensorLayoutClampValueNV",  EOpTensorLayoutSetClampValueNV);
-
-        symbolTable.relateToOperator("createTensorViewNV",           EOpCreateTensorViewNV);
-        symbolTable.relateToOperator("setTensorViewDimensionsNV",    EOpTensorViewSetDimensionNV);
-        symbolTable.relateToOperator("setTensorViewStrideNV",        EOpTensorViewSetStrideNV);
-        symbolTable.relateToOperator("setTensorViewClipNV",          EOpTensorViewSetClipNV);
-
-        symbolTable.relateToOperator("tensorReadARM",                EOpTensorReadARM);
-        symbolTable.relateToOperator("tensorWriteARM",               EOpTensorWriteARM);
-        symbolTable.relateToOperator("tensorSizeARM",                EOpTensorSizeARM);
-
-        symbolTable.relateToOperator("bitcastQCOM", EOpBitCastArrayQCOM);
-        symbolTable.relateToOperator("extractSubArrayQCOM", EOpExtractSubArrayQCOM);
-        symbolTable.relateToOperator("vectorToCoopmatQCOM", EOpCompositeConstructCoopMatQCOM);
-        symbolTable.relateToOperator("coopmatToVectorQCOM", EOpCompositeExtractCoopMatQCOM);
-
         if (profile != EEsProfile && version >= 460) {
             symbolTable.relateToOperator("fetchMicroTriangleVertexPositionNV", EOpFetchMicroTriangleVertexPositionNV);
             symbolTable.relateToOperator("fetchMicroTriangleVertexBarycentricNV", EOpFetchMicroTriangleVertexBarycentricNV);
@@ -11368,48 +10288,7 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
             symbolTable.relateToOperator("hitObjectGetCurrentTimeNV", EOpHitObjectGetCurrentTimeNV);
             symbolTable.relateToOperator("hitObjectGetShaderBindingTableRecordIndexNV", EOpHitObjectGetShaderBindingTableRecordIndexNV);
             symbolTable.relateToOperator("hitObjectGetShaderRecordBufferHandleNV", EOpHitObjectGetShaderRecordBufferHandleNV);
-            symbolTable.relateToOperator("hitObjectGetClusterIdNV", EOpHitObjectGetClusterIdNV);
             symbolTable.relateToOperator("reorderThreadNV", EOpReorderThreadNV);
-            symbolTable.relateToOperator("hitObjectGetSpherePositionNV", EOpHitObjectGetSpherePositionNV);
-            symbolTable.relateToOperator("hitObjectGetSphereRadiusNV", EOpHitObjectGetSphereRadiusNV);
-            symbolTable.relateToOperator("hitObjectGetLSSPositionsNV", EOpHitObjectGetLSSPositionsNV);
-            symbolTable.relateToOperator("hitObjectGetLSSRadiiNV", EOpHitObjectGetLSSRadiiNV);
-            symbolTable.relateToOperator("hitObjectIsSphereHitNV", EOpHitObjectIsSphereHitNV);
-            symbolTable.relateToOperator("hitObjectIsLSSHitNV", EOpHitObjectIsLSSHitNV);
-            symbolTable.relateToOperator("hitObjectTraceRayEXT", EOpHitObjectTraceRayEXT);
-            symbolTable.relateToOperator("hitObjectTraceRayMotionEXT", EOpHitObjectTraceRayMotionEXT);
-            symbolTable.relateToOperator("hitObjectRecordMissEXT", EOpHitObjectRecordMissEXT);
-            symbolTable.relateToOperator("hitObjectRecordMissMotionEXT", EOpHitObjectRecordMissMotionEXT);
-            symbolTable.relateToOperator("hitObjectRecordEmptyEXT", EOpHitObjectRecordEmptyEXT);
-            symbolTable.relateToOperator("hitObjectExecuteShaderEXT", EOpHitObjectExecuteShaderEXT);
-            symbolTable.relateToOperator("hitObjectIsEmptyEXT", EOpHitObjectIsEmptyEXT);
-            symbolTable.relateToOperator("hitObjectIsMissEXT", EOpHitObjectIsMissEXT);
-            symbolTable.relateToOperator("hitObjectIsHitEXT", EOpHitObjectIsHitEXT);
-            symbolTable.relateToOperator("hitObjectGetRayTMinEXT", EOpHitObjectGetRayTMinEXT);
-            symbolTable.relateToOperator("hitObjectGetRayTMaxEXT", EOpHitObjectGetRayTMaxEXT);
-            symbolTable.relateToOperator("hitObjectGetRayFlagsEXT", EOpHitObjectGetRayFlagsEXT);
-            symbolTable.relateToOperator("hitObjectGetObjectRayOriginEXT", EOpHitObjectGetObjectRayOriginEXT);
-            symbolTable.relateToOperator("hitObjectGetObjectRayDirectionEXT", EOpHitObjectGetObjectRayDirectionEXT);
-            symbolTable.relateToOperator("hitObjectGetWorldRayOriginEXT", EOpHitObjectGetWorldRayOriginEXT);
-            symbolTable.relateToOperator("hitObjectGetWorldRayDirectionEXT", EOpHitObjectGetWorldRayDirectionEXT);
-            symbolTable.relateToOperator("hitObjectGetWorldToObjectEXT", EOpHitObjectGetWorldToObjectEXT);
-            symbolTable.relateToOperator("hitObjectGetObjectToWorldEXT", EOpHitObjectGetObjectToWorldEXT);
-            symbolTable.relateToOperator("hitObjectGetInstanceCustomIndexEXT", EOpHitObjectGetInstanceCustomIndexEXT);
-            symbolTable.relateToOperator("hitObjectGetInstanceIdEXT", EOpHitObjectGetInstanceIdEXT);
-            symbolTable.relateToOperator("hitObjectGetGeometryIndexEXT", EOpHitObjectGetGeometryIndexEXT);
-            symbolTable.relateToOperator("hitObjectGetPrimitiveIndexEXT", EOpHitObjectGetPrimitiveIndexEXT);
-            symbolTable.relateToOperator("hitObjectGetHitKindEXT", EOpHitObjectGetHitKindEXT);
-            symbolTable.relateToOperator("hitObjectGetAttributesEXT", EOpHitObjectGetAttributesEXT);
-            symbolTable.relateToOperator("hitObjectGetCurrentTimeEXT", EOpHitObjectGetCurrentTimeEXT);
-            symbolTable.relateToOperator("hitObjectGetShaderBindingTableRecordIndexEXT", EOpHitObjectGetShaderBindingTableRecordIndexEXT);
-            symbolTable.relateToOperator("hitObjectGetShaderRecordBufferHandleEXT", EOpHitObjectGetShaderRecordBufferHandleEXT);
-            symbolTable.relateToOperator("hitObjectSetShaderBindingTableRecordIndexEXT", EOpHitObjectSetShaderBindingTableRecordIndexEXT);
-            symbolTable.relateToOperator("reorderThreadEXT", EOpReorderThreadEXT);
-            symbolTable.relateToOperator("hitObjectReorderExecuteEXT", EOpHitObjectReorderExecuteEXT);
-            symbolTable.relateToOperator("hitObjectTraceReorderExecuteEXT", EOpHitObjectTraceReorderExecuteEXT);
-            symbolTable.relateToOperator("hitObjectTraceMotionReorderExecuteEXT", EOpHitObjectTraceMotionReorderExecuteEXT);
-            symbolTable.relateToOperator("hitObjectRecordFromQueryEXT", EOpHitObjectRecordFromQueryEXT);
-            symbolTable.relateToOperator("hitObjectGetIntersectionTriangleVertexPositionsEXT", EOpHitObjectGetIntersectionTriangleVertexPositionsEXT);
         }
         break;
     case EShLangIntersect:
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/IntermTraverse.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/IntermTraverse.cpp
index 447e8cb6..553b1b5f 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/IntermTraverse.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/IntermTraverse.cpp
@@ -306,35 +306,4 @@ void TIntermSwitch::traverse(TIntermTraverser* it)
         it->visitSwitch(EvPostVisit, this);
 }
 
-//
-// Traverse a variable declaration.
-//
-void TIntermVariableDecl::traverse(TIntermTraverser *it)
-{
-    bool visit = true;
-
-    if (it->preVisit)
-        visit = it->visitVariableDecl(EvPreVisit, this);
-
-    if (visit) {
-        it->incrementDepth(this);
-        if (it->rightToLeft) {
-            if (it->includeDeclSymbol)
-                declSymbol->traverse(it);
-            if (initNode)
-                initNode->traverse(it);
-        }
-        else {
-            if (initNode)
-                initNode->traverse(it);
-            if (it->includeDeclSymbol)
-                declSymbol->traverse(it);
-        }
-        it->decrementDepth();
-    }
-
-    if (visit && it->postVisit)
-        it->visitVariableDecl(EvPostVisit, this);
-}
-
 } // end namespace glslang
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Intermediate.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
index 90410f0c..63e176e3 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
@@ -46,7 +46,6 @@
 #include "propagateNoContraction.h"
 
 #include <cfloat>
-#include <limits>
 #include <utility>
 #include <tuple>
 
@@ -66,10 +65,10 @@ namespace glslang {
 // Returns the added node.
 //
 
-TIntermSymbol* TIntermediate::addSymbol(long long id, const TString& name, const TString& mangledName, const TType& type, const TConstUnionArray& constArray,
+TIntermSymbol* TIntermediate::addSymbol(long long id, const TString& name, const TType& type, const TConstUnionArray& constArray,
                                         TIntermTyped* constSubtree, const TSourceLoc& loc)
 {
-    TIntermSymbol* node = new TIntermSymbol(id, name, getStage(), type, &mangledName);
+    TIntermSymbol* node = new TIntermSymbol(id, name, type);
     node->setLoc(loc);
     node->setConstArray(constArray);
     node->setConstSubtree(constSubtree);
@@ -81,7 +80,6 @@ TIntermSymbol* TIntermediate::addSymbol(const TIntermSymbol& intermSymbol)
 {
     return addSymbol(intermSymbol.getId(),
                      intermSymbol.getName(),
-                     intermSymbol.getMangledName(),
                      intermSymbol.getType(),
                      intermSymbol.getConstArray(),
                      intermSymbol.getConstSubtree(),
@@ -98,14 +96,14 @@ TIntermSymbol* TIntermediate::addSymbol(const TVariable& variable)
 
 TIntermSymbol* TIntermediate::addSymbol(const TVariable& variable, const TSourceLoc& loc)
 {
-    return addSymbol(variable.getUniqueId(), variable.getName(), variable.getMangledName(), variable.getType(), variable.getConstArray(), variable.getConstSubtree(), loc);
+    return addSymbol(variable.getUniqueId(), variable.getName(), variable.getType(), variable.getConstArray(), variable.getConstSubtree(), loc);
 }
 
 TIntermSymbol* TIntermediate::addSymbol(const TType& type, const TSourceLoc& loc)
 {
     TConstUnionArray unionArray;  // just a null constant
 
-    return addSymbol(0, "", "", type, unionArray, nullptr, loc);
+    return addSymbol(0, "", type, unionArray, nullptr, loc);
 }
 
 //
@@ -118,8 +116,7 @@ TIntermSymbol* TIntermediate::addSymbol(const TType& type, const TSourceLoc& loc
 TIntermTyped* TIntermediate::addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, const TSourceLoc& loc)
 {
     // No operations work on blocks
-    if (left->getType().getBasicType() == EbtBlock || right->getType().getBasicType() == EbtBlock ||
-        left->getType().getBasicType() == EbtString || right->getType().getBasicType() == EbtString)
+    if (left->getType().getBasicType() == EbtBlock || right->getType().getBasicType() == EbtBlock)
         return nullptr;
 
     // Convert "reference +/- int" and "reference - reference" to integer math
@@ -166,8 +163,8 @@ TIntermTyped* TIntermediate::addBinaryMath(TOperator op, TIntermTyped* left, TIn
         left = addBuiltInFunctionCall(loc, EOpConvPtrToUint64, true, left, TType(EbtUint64));
         right = addBuiltInFunctionCall(loc, EOpConvPtrToUint64, true, right, TType(EbtUint64));
 
-        left = addBuiltInFunctionCall(loc, EOpConvNumeric, true, left, TType(EbtInt64));
-        right = addBuiltInFunctionCall(loc, EOpConvNumeric, true, right, TType(EbtInt64));
+        left = addBuiltInFunctionCall(loc, EOpConvUint64ToInt64, true, left, TType(EbtInt64));
+        right = addBuiltInFunctionCall(loc, EOpConvUint64ToInt64, true, right, TType(EbtInt64));
 
         left = addBinaryMath(EOpSub, left, right, loc);
 
@@ -400,9 +397,6 @@ TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child,
     case EOpConstructUint64: newType = EbtUint64; break;
     case EOpConstructDouble: newType = EbtDouble; break;
     case EOpConstructFloat16: newType = EbtFloat16; break;
-    case EOpConstructBFloat16: newType = EbtBFloat16; break;
-    case EOpConstructFloatE4M3: newType = EbtFloatE4M3; break;
-    case EOpConstructFloatE5M2: newType = EbtFloatE5M2; break;
     default: break; // some compilers want this
     }
 
@@ -432,10 +426,7 @@ TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child,
         case EOpConstructBool:
         case EOpConstructFloat:
         case EOpConstructDouble:
-        case EOpConstructFloat16:
-        case EOpConstructBFloat16:
-        case EOpConstructFloatE5M2:
-        case EOpConstructFloatE4M3: {
+        case EOpConstructFloat16: {
             TIntermUnary* unary_node = child->getAsUnaryNode();
             if (unary_node != nullptr)
                 unary_node->updatePrecision();
@@ -576,18 +567,222 @@ bool TIntermediate::isConversionAllowed(TOperator op, TIntermTyped* node) const
 
 bool TIntermediate::buildConvertOp(TBasicType dst, TBasicType src, TOperator& newOp) const
 {
-    // (bfloat16_t,fp8) <-> bool not supported
-    if (((src == EbtBFloat16 || src == EbtFloatE5M2 || src == EbtFloatE4M3) && dst == EbtBool) ||
-        ((dst == EbtBFloat16 || dst == EbtFloatE5M2 || dst == EbtFloatE4M3) && src == EbtBool)) {
+    switch (dst) {
+    case EbtDouble:
+        switch (src) {
+        case EbtUint:    newOp = EOpConvUintToDouble;    break;
+        case EbtBool:    newOp = EOpConvBoolToDouble;    break;
+        case EbtFloat:   newOp = EOpConvFloatToDouble;   break;
+        case EbtInt:     newOp = EOpConvIntToDouble;     break;
+        case EbtInt8:    newOp = EOpConvInt8ToDouble;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToDouble;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToDouble;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToDouble;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToDouble; break;
+        case EbtInt64:   newOp = EOpConvInt64ToDouble;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToDouble;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtFloat:
+        switch (src) {
+        case EbtInt:     newOp = EOpConvIntToFloat;     break;
+        case EbtUint:    newOp = EOpConvUintToFloat;    break;
+        case EbtBool:    newOp = EOpConvBoolToFloat;    break;
+        case EbtDouble:  newOp = EOpConvDoubleToFloat;  break;
+        case EbtInt8:    newOp = EOpConvInt8ToFloat;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToFloat;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToFloat;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToFloat;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToFloat; break;
+        case EbtInt64:   newOp = EOpConvInt64ToFloat;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToFloat;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtFloat16:
+        switch (src) {
+        case EbtInt8:   newOp = EOpConvInt8ToFloat16;   break;
+        case EbtUint8:  newOp = EOpConvUint8ToFloat16;  break;
+        case EbtInt16:  newOp = EOpConvInt16ToFloat16;  break;
+        case EbtUint16: newOp = EOpConvUint16ToFloat16; break;
+        case EbtInt:    newOp = EOpConvIntToFloat16;    break;
+        case EbtUint:   newOp = EOpConvUintToFloat16;   break;
+        case EbtBool:   newOp = EOpConvBoolToFloat16;   break;
+        case EbtFloat:  newOp = EOpConvFloatToFloat16;  break;
+        case EbtDouble: newOp = EOpConvDoubleToFloat16; break;
+        case EbtInt64:  newOp = EOpConvInt64ToFloat16;  break;
+        case EbtUint64: newOp = EOpConvUint64ToFloat16; break;
+        default:
+            return false;
+        }
+        break;
+    case EbtBool:
+        switch (src) {
+        case EbtInt:     newOp = EOpConvIntToBool;     break;
+        case EbtUint:    newOp = EOpConvUintToBool;    break;
+        case EbtFloat:   newOp = EOpConvFloatToBool;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToBool;  break;
+        case EbtInt8:    newOp = EOpConvInt8ToBool;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToBool;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToBool;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToBool;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToBool; break;
+        case EbtInt64:   newOp = EOpConvInt64ToBool;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToBool;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtInt8:
+        switch (src) {
+        case EbtUint8:   newOp = EOpConvUint8ToInt8;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToInt8;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToInt8;  break;
+        case EbtInt:     newOp = EOpConvIntToInt8;     break;
+        case EbtUint:    newOp = EOpConvUintToInt8;    break;
+        case EbtInt64:   newOp = EOpConvInt64ToInt8;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToInt8;  break;
+        case EbtBool:    newOp = EOpConvBoolToInt8;    break;
+        case EbtFloat:   newOp = EOpConvFloatToInt8;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToInt8;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToInt8; break;
+        default:
+            return false;
+        }
+        break;
+    case EbtUint8:
+        switch (src) {
+        case EbtInt8:    newOp = EOpConvInt8ToUint8;    break;
+        case EbtInt16:   newOp = EOpConvInt16ToUint8;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToUint8;  break;
+        case EbtInt:     newOp = EOpConvIntToUint8;     break;
+        case EbtUint:    newOp = EOpConvUintToUint8;    break;
+        case EbtInt64:   newOp = EOpConvInt64ToUint8;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToUint8;  break;
+        case EbtBool:    newOp = EOpConvBoolToUint8;    break;
+        case EbtFloat:   newOp = EOpConvFloatToUint8;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToUint8;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToUint8; break;
+        default:
+            return false;
+        }
+        break;
+
+    case EbtInt16:
+        switch (src) {
+        case EbtUint8:   newOp = EOpConvUint8ToInt16;   break;
+        case EbtInt8:    newOp = EOpConvInt8ToInt16;    break;
+        case EbtUint16:  newOp = EOpConvUint16ToInt16;  break;
+        case EbtInt:     newOp = EOpConvIntToInt16;     break;
+        case EbtUint:    newOp = EOpConvUintToInt16;    break;
+        case EbtInt64:   newOp = EOpConvInt64ToInt16;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToInt16;  break;
+        case EbtBool:    newOp = EOpConvBoolToInt16;    break;
+        case EbtFloat:   newOp = EOpConvFloatToInt16;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToInt16;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToInt16; break;
+        default:
+            return false;
+        }
+        break;
+    case EbtUint16:
+        switch (src) {
+        case EbtInt8:    newOp = EOpConvInt8ToUint16;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToUint16;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToUint16;   break;
+        case EbtInt:     newOp = EOpConvIntToUint16;     break;
+        case EbtUint:    newOp = EOpConvUintToUint16;    break;
+        case EbtInt64:   newOp = EOpConvInt64ToUint16;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToUint16;  break;
+        case EbtBool:    newOp = EOpConvBoolToUint16;    break;
+        case EbtFloat:   newOp = EOpConvFloatToUint16;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToUint16;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToUint16; break;
+        default:
+            return false;
+        }
+        break;
+
+    case EbtInt:
+        switch (src) {
+        case EbtUint:    newOp = EOpConvUintToInt;    break;
+        case EbtBool:    newOp = EOpConvBoolToInt;    break;
+        case EbtFloat:   newOp = EOpConvFloatToInt;   break;
+        case EbtInt8:    newOp = EOpConvInt8ToInt;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToInt;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToInt;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToInt;  break;
+        case EbtDouble:  newOp = EOpConvDoubleToInt;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToInt; break;
+        case EbtInt64:   newOp = EOpConvInt64ToInt;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToInt;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtUint:
+        switch (src) {
+        case EbtInt:     newOp = EOpConvIntToUint;     break;
+        case EbtBool:    newOp = EOpConvBoolToUint;    break;
+        case EbtFloat:   newOp = EOpConvFloatToUint;   break;
+        case EbtInt8:    newOp = EOpConvInt8ToUint;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToUint;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToUint;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToUint;  break;
+        case EbtDouble:  newOp = EOpConvDoubleToUint;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToUint; break;
+        case EbtInt64:   newOp = EOpConvInt64ToUint;   break;
+        case EbtUint64:  newOp = EOpConvUint64ToUint;  break;
+        // For bindless texture type conversion, add a dummy convert op, just
+        // to generate a new TIntermTyped
+        // uvec2(any sampler type)
+        // uvec2(any image type)
+        case EbtSampler: newOp = EOpConvIntToUint;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtInt64:
+        switch (src) {
+        case EbtInt8:    newOp = EOpConvInt8ToInt64;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToInt64;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToInt64;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToInt64;  break;
+        case EbtInt:     newOp = EOpConvIntToInt64;     break;
+        case EbtUint:    newOp = EOpConvUintToInt64;    break;
+        case EbtBool:    newOp = EOpConvBoolToInt64;    break;
+        case EbtFloat:   newOp = EOpConvFloatToInt64;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToInt64;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToInt64; break;
+        case EbtUint64:  newOp = EOpConvUint64ToInt64;  break;
+        default:
+            return false;
+        }
+        break;
+    case EbtUint64:
+        switch (src) {
+        case EbtInt8:    newOp = EOpConvInt8ToUint64;    break;
+        case EbtUint8:   newOp = EOpConvUint8ToUint64;   break;
+        case EbtInt16:   newOp = EOpConvInt16ToUint64;   break;
+        case EbtUint16:  newOp = EOpConvUint16ToUint64;  break;
+        case EbtInt:     newOp = EOpConvIntToUint64;     break;
+        case EbtUint:    newOp = EOpConvUintToUint64;    break;
+        case EbtBool:    newOp = EOpConvBoolToUint64;    break;
+        case EbtFloat:   newOp = EOpConvFloatToUint64;   break;
+        case EbtDouble:  newOp = EOpConvDoubleToUint64;  break;
+        case EbtFloat16: newOp = EOpConvFloat16ToUint64; break;
+        case EbtInt64:   newOp = EOpConvInt64ToUint64;   break;
+        default:
+            return false;
+        }
+        break;
+    default:
         return false;
     }
-
-    if ((isTypeInt(dst) || isTypeFloat(dst) || dst == EbtBool) &&
-        (isTypeInt(src) || isTypeFloat(src) || src == EbtBool)) {
-        newOp = EOpConvNumeric;
-        return true;
-    }
-    return false;
+    return true;
 }
 
 // This is 'mechanism' here, it does any conversion told.
@@ -609,15 +804,11 @@ TIntermTyped* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
                                 node->getBasicType() == EbtInt   || node->getBasicType() == EbtUint   ||
                                 node->getBasicType() == EbtInt64 || node->getBasicType() == EbtUint64);
 
-    bool convertToFloatTypes = (convertTo == EbtFloat16 || convertTo == EbtBFloat16 || convertTo == EbtFloat || convertTo == EbtDouble ||
-                                convertTo == EbtFloatE5M2 || convertTo == EbtFloatE4M3);
+    bool convertToFloatTypes = (convertTo == EbtFloat16 || convertTo == EbtFloat || convertTo == EbtDouble);
 
     bool convertFromFloatTypes = (node->getBasicType() == EbtFloat16 ||
-                                  node->getBasicType() == EbtBFloat16 ||
                                   node->getBasicType() == EbtFloat ||
-                                  node->getBasicType() == EbtDouble ||
-                                  node->getBasicType() == EbtFloatE5M2 ||
-                                  node->getBasicType() == EbtFloatE4M3);
+                                  node->getBasicType() == EbtDouble);
 
     if (((convertTo == EbtInt8 || convertTo == EbtUint8) && ! convertFromIntTypes) ||
         ((node->getBasicType() == EbtInt8 || node->getBasicType() == EbtUint8) && ! convertToIntTypes)) {
@@ -840,17 +1031,7 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     // Reject implicit conversions to cooperative matrix types
     if (node->getType().isCoopMat() &&
         op != EOpConstructCooperativeMatrixNV &&
-        op != EOpConstructCooperativeMatrixKHR &&
-        op != glslang::EOpCompositeConstructCoopMatQCOM)
-        return nullptr;
-
-    if (node->getType().isTensorLayoutNV() ||
-        node->getType().isTensorViewNV())
-        return nullptr;
-
-    // Reject implicit conversions to cooperative vector types
-    if (node->getType().isCoopVecNV() &&
-        op != EOpConstructCooperativeVectorNV)
+        op != EOpConstructCooperativeMatrixKHR)
         return nullptr;
 
     // Note: callers are responsible for other aspects of shape,
@@ -866,16 +1047,12 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     case EOpConstructUint:
     case EOpConstructDouble:
     case EOpConstructFloat16:
-    case EOpConstructBFloat16:
-    case EOpConstructFloatE5M2:
-    case EOpConstructFloatE4M3:
     case EOpConstructInt8:
     case EOpConstructUint8:
     case EOpConstructInt16:
     case EOpConstructUint16:
     case EOpConstructInt64:
     case EOpConstructUint64:
-    case EOpConstructSaturated:
         break;
 
     //
@@ -924,7 +1101,6 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     case EOpConstructStruct:
     case EOpConstructCooperativeMatrixNV:
     case EOpConstructCooperativeMatrixKHR:
-    case EOpConstructCooperativeVectorNV:
 
         if (type.isReference() || node->getType().isReference()) {
             // types must match to assign a reference
@@ -976,11 +1152,6 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     //    changing language sementics on the fly by asking what extensions are in use
     //  - at the time of this writing (14-Aug-2020), no test results are changed by this.
     switch (op) {
-    case EOpConstructBFloat16:
-    case EOpConstructFloatE5M2:
-    case EOpConstructFloatE4M3:
-        canPromoteConstant = true;
-        break;
     case EOpConstructFloat16:
         canPromoteConstant = numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types) ||
                              numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types_float16);
@@ -1283,9 +1454,6 @@ bool TIntermediate::isFPPromotion(TBasicType from, TBasicType to) const
     // floating-point promotions
     if (to == EbtDouble) {
         switch(from) {
-        case EbtBFloat16:
-        case EbtFloatE5M2:
-        case EbtFloatE4M3:
         case EbtFloat16:
         case EbtFloat:
             return true;
@@ -1378,7 +1546,7 @@ bool TIntermediate::isIntegralConversion(TBasicType from, TBasicType to) const
 
 bool TIntermediate::isFPConversion(TBasicType from, TBasicType to) const
 {
-    if (to == EbtFloat && (from == EbtFloat16 || from == EbtBFloat16 || from == EbtFloatE5M2 || from == EbtFloatE4M3)) {
+    if (to == EbtFloat && from == EbtFloat16) {
         return true;
     } else {
         return false;
@@ -1526,19 +1694,10 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtInt16:
             case EbtUint16:
                 return (version >= 400 || numericFeatures.contains(TNumericFeatures::gpu_shader_fp64)) &&
-                                         (numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) || 
-                                          numericFeatures.contains(TNumericFeatures::gpu_shader_int16));
+                                          numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             case EbtFloat16:
                 return (version >= 400 || numericFeatures.contains(TNumericFeatures::gpu_shader_fp64)) &&
-                                        (numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) || 
-                                        numericFeatures.contains(TNumericFeatures::gpu_shader_half_float));
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-                return true;
-            case EbtInt8:
-            case EbtUint8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                                          numericFeatures.contains(TNumericFeatures::gpu_shader_half_float);
             default:
                 return false;
            }
@@ -1551,37 +1710,22 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
                  return getSource() == EShSourceHlsl;
             case EbtInt16:
             case EbtUint16:
-                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-                       numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             case EbtFloat16:
                 return numericFeatures.contains(TNumericFeatures::gpu_shader_half_float) ||
-                    numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) ||
                     getSource() == EShSourceHlsl;
-            case EbtBFloat16:
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-                return true;
-            case EbtInt8:
-            case EbtUint8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
             default:
                  return false;
             }
         case EbtUint:
             switch (from) {
             case EbtInt:
-                return version >= 400 || getSource() == EShSourceHlsl || 
-						IsRequestedExtension(E_GL_ARB_gpu_shader5) ||
-						numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return version >= 400 || getSource() == EShSourceHlsl || IsRequestedExtension(E_GL_ARB_gpu_shader5);
             case EbtBool:
                 return getSource() == EShSourceHlsl;
             case EbtInt16:
             case EbtUint16:
-                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-                       numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
-            case EbtInt8:
-            case EbtUint8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             default:
                 return false;
             }
@@ -1590,10 +1734,7 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtBool:
                 return getSource() == EShSourceHlsl;
             case EbtInt16:
-                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-                       numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
-            case EbtInt8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             default:
                 return false;
             }
@@ -1605,11 +1746,7 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
                 return true;
             case EbtInt16:
             case EbtUint16:
-                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-                	numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
-            case EbtInt8:
-            case EbtUint8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             default:
                 return false;
             }
@@ -1617,11 +1754,8 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             switch (from) {
             case EbtInt:
                 return true;
-            case EbtInt8:
-                return numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
             case EbtInt16:
-                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-				       numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types);
+                return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
             default:
                 return false;
             }
@@ -1630,18 +1764,6 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
             case EbtInt16:
             case EbtUint16:
                 return numericFeatures.contains(TNumericFeatures::gpu_shader_int16);
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-                return true;
-            default:
-                break;
-            }
-            return false;
-        case EbtBFloat16:
-            switch (from) {
-            case EbtFloatE5M2:
-            case EbtFloatE4M3:
-                return true;
             default:
                 break;
             }
@@ -1800,10 +1922,6 @@ std::tuple<TBasicType, TBasicType> TIntermediate::getConversionDestinationType(T
                (type1 == EbtFloat16 && canImplicitlyPromote(type0, EbtFloat16, op)) ) {
         res0 = EbtFloat16;
         res1 = EbtFloat16;
-    } else if ((type0 == EbtBFloat16 && canImplicitlyPromote(type1, EbtBFloat16, op)) ||
-               (type1 == EbtBFloat16 && canImplicitlyPromote(type0, EbtBFloat16, op)) ) {
-        res0 = EbtBFloat16;
-        res1 = EbtBFloat16;
     } else if (isTypeInt(type0) && isTypeInt(type1) &&
                (canImplicitlyPromote(type0, type1, op) || canImplicitlyPromote(type1, type0, op))) {
         if ((isTypeSignedInt(type0) && isTypeSignedInt(type1)) ||
@@ -1859,9 +1977,6 @@ TOperator TIntermediate::mapTypeToConstructorOp(const TType& type) const
     if (type.isCoopMatKHR())
         return EOpConstructCooperativeMatrixKHR;
 
-    if (type.isCoopVecNV())
-        return EOpConstructCooperativeVectorNV;
-
     switch (type.getBasicType()) {
     case EbtStruct:
         op = EOpConstructStruct;
@@ -2100,33 +2215,6 @@ TOperator TIntermediate::mapTypeToConstructorOp(const TType& type) const
             }
         }
         break;
-    case EbtBFloat16:
-        switch (type.getVectorSize()) {
-        case 1: op = EOpConstructBFloat16;  break;
-        case 2: op = EOpConstructBF16Vec2;  break;
-        case 3: op = EOpConstructBF16Vec3;  break;
-        case 4: op = EOpConstructBF16Vec4;  break;
-        default: break; // some compilers want this
-        }
-        break;
-    case EbtFloatE5M2:
-        switch (type.getVectorSize()) {
-        case 1: op = EOpConstructFloatE5M2;  break;
-        case 2: op = EOpConstructFloatE5M2Vec2;  break;
-        case 3: op = EOpConstructFloatE5M2Vec3;  break;
-        case 4: op = EOpConstructFloatE5M2Vec4;  break;
-        default: break; // some compilers want this
-        }
-        break;
-    case EbtFloatE4M3:
-        switch (type.getVectorSize()) {
-        case 1: op = EOpConstructFloatE4M3;  break;
-        case 2: op = EOpConstructFloatE4M3Vec2;  break;
-        case 3: op = EOpConstructFloatE4M3Vec3;  break;
-        case 4: op = EOpConstructFloatE4M3Vec4;  break;
-        default: break; // some compilers want this
-        }
-        break;
     case EbtInt8:
         switch(type.getVectorSize()) {
         case 1: op = EOpConstructInt8;   break;
@@ -2383,8 +2471,7 @@ TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* true
     trueBlock = std::get<0>(children);
     falseBlock = std::get<1>(children);
 
-    if (trueBlock == nullptr || falseBlock == nullptr ||
-        trueBlock->getBasicType() == EbtString || falseBlock->getBasicType() == EbtString)
+    if (trueBlock == nullptr || falseBlock == nullptr)
         return nullptr;
 
     // Handle a vector condition as a mix
@@ -2537,7 +2624,7 @@ TIntermConstantUnion* TIntermediate::addConstantUnion(bool b, const TSourceLoc&
 
 TIntermConstantUnion* TIntermediate::addConstantUnion(double d, TBasicType baseType, const TSourceLoc& loc, bool literal) const
 {
-    assert(baseType == EbtFloat || baseType == EbtDouble || baseType == EbtFloat16 || baseType == EbtBFloat16 || baseType == EbtFloatE5M2 || baseType == EbtFloatE4M3);
+    assert(baseType == EbtFloat || baseType == EbtDouble || baseType == EbtFloat16);
 
     if (isEsProfile() && (baseType == EbtFloat || baseType == EbtFloat16)) {
         int exponent = 0;
@@ -2652,7 +2739,7 @@ const TIntermTyped* TIntermediate::traverseLValueBase(const TIntermTyped* node,
 //
 // Create while and do-while loop nodes.
 //
-TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermNode* test, TIntermTyped* terminal, bool testFirst,
+TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermTyped* test, TIntermTyped* terminal, bool testFirst,
     const TSourceLoc& loc)
 {
     TIntermLoop* node = new TIntermLoop(body, test, terminal, testFirst);
@@ -2664,7 +2751,7 @@ TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermNode* test, TInter
 //
 // Create a for-loop sequence.
 //
-TIntermAggregate* TIntermediate::addForLoop(TIntermNode* body, TIntermNode* initializer, TIntermNode* test,
+TIntermAggregate* TIntermediate::addForLoop(TIntermNode* body, TIntermNode* initializer, TIntermTyped* test,
     TIntermTyped* terminal, bool testFirst, const TSourceLoc& loc, TIntermLoop*& node)
 {
     node = new TIntermLoop(body, test, terminal, testFirst);
@@ -2875,16 +2962,17 @@ bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const
     // (However, some floating-point operations result in bool, like ">",
     // so are handled later.)
     if (node.getType().isFloatingDomain()) {
-        if (IsOpNumericConv(node.getOp()) &&
-            isTypeFloat(node.getType().getBasicType()) &&
-            isTypeFloat(node.getAsUnaryNode()->getOperand()->getAsTyped()->getType().getBasicType())) {
-            return true;
-        }
         switch (node.getOp()) {
         case EOpIndexDirect:
         case EOpIndexIndirect:
         case EOpIndexDirectStruct:
         case EOpVectorSwizzle:
+        case EOpConvFloatToDouble:
+        case EOpConvDoubleToFloat:
+        case EOpConvFloat16ToFloat:
+        case EOpConvFloatToFloat16:
+        case EOpConvFloat16ToDouble:
+        case EOpConvDoubleToFloat16:
             return true;
         default:
             return false;
@@ -2899,15 +2987,6 @@ bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const
 
     // So, for now, we can assume everything left is non-floating-point...
 
-    if (IsOpNumericConv(node.getOp())) {
-        TBasicType srcType = node.getAsUnaryNode()->getOperand()->getAsTyped()->getType().getBasicType();
-        TBasicType dstType = node.getType().getBasicType();
-        if ((isTypeInt(srcType) || srcType == EbtBool) &&
-            (isTypeInt(dstType) || dstType == EbtBool)) {
-            return true;
-        }
-    }
-
     // Now check for integer/bool-based operations
     switch (node.getOp()) {
 
@@ -2917,6 +2996,98 @@ bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const
     case EOpIndexDirectStruct:
     case EOpVectorSwizzle:
 
+    // (u)int* -> bool
+    case EOpConvInt8ToBool:
+    case EOpConvInt16ToBool:
+    case EOpConvIntToBool:
+    case EOpConvInt64ToBool:
+    case EOpConvUint8ToBool:
+    case EOpConvUint16ToBool:
+    case EOpConvUintToBool:
+    case EOpConvUint64ToBool:
+
+    // bool -> (u)int*
+    case EOpConvBoolToInt8:
+    case EOpConvBoolToInt16:
+    case EOpConvBoolToInt:
+    case EOpConvBoolToInt64:
+    case EOpConvBoolToUint8:
+    case EOpConvBoolToUint16:
+    case EOpConvBoolToUint:
+    case EOpConvBoolToUint64:
+
+    // int8_t -> (u)int*
+    case EOpConvInt8ToInt16:
+    case EOpConvInt8ToInt:
+    case EOpConvInt8ToInt64:
+    case EOpConvInt8ToUint8:
+    case EOpConvInt8ToUint16:
+    case EOpConvInt8ToUint:
+    case EOpConvInt8ToUint64:
+
+    // int16_t -> (u)int*
+    case EOpConvInt16ToInt8:
+    case EOpConvInt16ToInt:
+    case EOpConvInt16ToInt64:
+    case EOpConvInt16ToUint8:
+    case EOpConvInt16ToUint16:
+    case EOpConvInt16ToUint:
+    case EOpConvInt16ToUint64:
+
+    // int32_t -> (u)int*
+    case EOpConvIntToInt8:
+    case EOpConvIntToInt16:
+    case EOpConvIntToInt64:
+    case EOpConvIntToUint8:
+    case EOpConvIntToUint16:
+    case EOpConvIntToUint:
+    case EOpConvIntToUint64:
+
+    // int64_t -> (u)int*
+    case EOpConvInt64ToInt8:
+    case EOpConvInt64ToInt16:
+    case EOpConvInt64ToInt:
+    case EOpConvInt64ToUint8:
+    case EOpConvInt64ToUint16:
+    case EOpConvInt64ToUint:
+    case EOpConvInt64ToUint64:
+
+    // uint8_t -> (u)int*
+    case EOpConvUint8ToInt8:
+    case EOpConvUint8ToInt16:
+    case EOpConvUint8ToInt:
+    case EOpConvUint8ToInt64:
+    case EOpConvUint8ToUint16:
+    case EOpConvUint8ToUint:
+    case EOpConvUint8ToUint64:
+
+    // uint16_t -> (u)int*
+    case EOpConvUint16ToInt8:
+    case EOpConvUint16ToInt16:
+    case EOpConvUint16ToInt:
+    case EOpConvUint16ToInt64:
+    case EOpConvUint16ToUint8:
+    case EOpConvUint16ToUint:
+    case EOpConvUint16ToUint64:
+
+    // uint32_t -> (u)int*
+    case EOpConvUintToInt8:
+    case EOpConvUintToInt16:
+    case EOpConvUintToInt:
+    case EOpConvUintToInt64:
+    case EOpConvUintToUint8:
+    case EOpConvUintToUint16:
+    case EOpConvUintToUint64:
+
+    // uint64_t -> (u)int*
+    case EOpConvUint64ToInt8:
+    case EOpConvUint64ToInt16:
+    case EOpConvUint64ToInt:
+    case EOpConvUint64ToInt64:
+    case EOpConvUint64ToUint8:
+    case EOpConvUint64ToUint16:
+    case EOpConvUint64ToUint:
+
     // unary operations
     case EOpNegative:
     case EOpLogicalNot:
@@ -3419,43 +3590,6 @@ bool TIntermediate::promoteBinary(TIntermBinary& node)
         return false;
     }
 
-    if (left->getType().isCoopVecNV() || right->getType().isCoopVecNV()) {
-        // Operations on two cooperative vectors must have identical types
-        if (left->getType().isCoopVecNV() && right->getType().isCoopVecNV() &&
-            left->getType() != right->getType()) {
-            return false;
-        }
-        switch (op) {
-        case EOpMul:
-        case EOpMulAssign:
-            // Use VectorTimesScalar if either operand is not a vector. Otherwise use Mul.
-            if (!left->getType().isCoopVecNV() || !right->getType().isCoopVecNV()) {
-                node.setOp(op == EOpMulAssign ? EOpVectorTimesScalarAssign : EOpVectorTimesScalar);
-            }
-            // In case of scalar*vector, take the result type from the vector.
-            if (right->getType().isCoopVecNV()) {
-                node.setType(right->getType());
-            }
-            return true;
-        case EOpLeftShift:
-        case EOpLeftShiftAssign:
-        case EOpRightShift:
-        case EOpRightShiftAssign:
-        case EOpAdd:
-        case EOpSub:
-        case EOpDiv:
-        case EOpAssign:
-            // These require both to be cooperative vectors
-            if (!left->getType().isCoopVecNV() || !right->getType().isCoopVecNV()) {
-                return false;
-            }
-            return true;
-        default:
-            break;
-        }
-        return false;
-    }
-
     // Finish handling the case, for all ops, where both operands are scalars.
     if (left->isScalar() && right->isScalar())
         return true;
@@ -3791,9 +3925,6 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
 
 #define TO_ALL(Get)   \
         switch (promoteTo) { \
-        case EbtBFloat16: PROMOTE(setDConst, double, Get); break; \
-        case EbtFloatE5M2: PROMOTE(setDConst, double, Get); break; \
-        case EbtFloatE4M3: PROMOTE(setDConst, double, Get); break; \
         case EbtFloat16: PROMOTE(setDConst, double, Get); break; \
         case EbtFloat: PROMOTE(setDConst, double, Get); break; \
         case EbtDouble: PROMOTE(setDConst, double, Get); break; \
@@ -3815,9 +3946,6 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
         case EbtUint: TO_ALL(getUConst); break;
         case EbtBool: TO_ALL(getBConst); break;
         case EbtFloat16: TO_ALL(getDConst); break;
-        case EbtBFloat16: TO_ALL(getDConst); break;
-        case EbtFloatE5M2: TO_ALL(getDConst); break;
-        case EbtFloatE4M3: TO_ALL(getDConst); break;
         case EbtDouble: TO_ALL(getDConst); break;
         case EbtInt8: TO_ALL(getI8Const); break;
         case EbtInt16: TO_ALL(getI16Const); break;
@@ -3906,15 +4034,12 @@ void TIntermediate::performTextureUpgradeAndSamplerRemovalTransformation(TInterm
 const char* TIntermediate::getResourceName(TResourceType res)
 {
     switch (res) {
-    case EResSampler:         return "shift-sampler-binding";
-    case EResTexture:         return "shift-texture-binding";
-    case EResImage:           return "shift-image-binding";
-    case EResUbo:             return "shift-ubo-binding";
-    case EResSsbo:            return "shift-ssbo-binding";
-    case EResUav:             return "shift-uav-binding";
-    case EResCombinedSampler: return "shift-combined-sampler-binding";
-    case EResAs:              return "shift-as-binding";
-    case EResTensor:          return nullptr;
+    case EResSampler: return "shift-sampler-binding";
+    case EResTexture: return "shift-texture-binding";
+    case EResImage:   return "shift-image-binding";
+    case EResUbo:     return "shift-UBO-binding";
+    case EResSsbo:    return "shift-ssbo-binding";
+    case EResUav:     return "shift-uav-binding";
     default:
         assert(0); // internal error: should only be called with valid resource types.
         return nullptr;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/LiveTraverser.h b/engine/thirdparty/glslang/glslang/MachineIndependent/LiveTraverser.h
index 76ccfec1..9b39b598 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/LiveTraverser.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/LiveTraverser.h
@@ -59,8 +59,8 @@ namespace glslang {
 class TLiveTraverser : public TIntermTraverser {
 public:
     TLiveTraverser(const TIntermediate& i, bool traverseAll = false,
-                   bool preVisit = true, bool inVisit = false, bool postVisit = false, bool includeDeclSymbol = false) :
-        TIntermTraverser(preVisit, inVisit, postVisit, false, includeDeclSymbol),
+                   bool preVisit = true, bool inVisit = false, bool postVisit = false) :
+        TIntermTraverser(preVisit, inVisit, postVisit),
         intermediate(i), traverseAll(traverseAll)
     { }
 
@@ -132,47 +132,6 @@ protected:
             return true; // traverse the whole subtree
     }
 
-    // To prune semantically dead paths in switch statements with constant expressions.
-    virtual bool visitSwitch(TVisit /* visit */, TIntermSwitch* node)
-    {
-        if (traverseAll)
-            return true; // traverse all code
-
-        TIntermConstantUnion* constant = node->getCondition()->getAsConstantUnion();
-        if (constant) {
-            TConstUnion switchValue = constant->getConstArray()[0];
-            int liveBranch = -1;
-            const auto& body = node->getBody()->getSequence();
-            for (unsigned int i = 0; i < body.size(); ++i) {
-                if (body[i]->getAsBranchNode()) {
-                    if (body[i]->getAsBranchNode()->getFlowOp() == glslang::EOpCase) {
-                        TConstUnion caseValue =
-                            body[i]->getAsBranchNode()->getExpression()->getAsConstantUnion()->getConstArray()[0];
-                        if (switchValue == caseValue.getIConst()) {
-                            liveBranch = (int)i;
-                            break;
-                        }
-                    } else if (body[i]->getAsBranchNode()->getFlowOp() == glslang::EOpDefault) {
-                        liveBranch = (int)i;
-                    }
-                }
-            }
-            if (liveBranch != -1) {
-                for (int i = liveBranch; i < (int)body.size(); ++i) {
-                    if (body[i]->getAsAggregate()) {
-                        for (auto* inst : body[i]->getAsAggregate()->getSequence()) {
-                            if (inst->getAsBranchNode() && (inst->getAsBranchNode()->getFlowOp() == glslang::EOpBreak))
-                                return false; // found and traversed the live case(s)
-                            inst->traverse(this);
-                        }
-                    }
-                }
-            }
-            return false; // finished traversing all cases
-        } else
-            return true; // traverse the whole subtree
-    }
-
     // Track live functions as well as uniforms, so that we don't visit dead functions
     // and only visit each function once.
     void addFunctionCall(TIntermAggregate* call)
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
index 45ada17d..591dfc71 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
@@ -59,7 +59,7 @@ void TParseContextBase::outputMessage(const TSourceLoc& loc, const char* szReaso
     safe_vsprintf(szExtraInfo, maxSize, szExtraInfoFormat, args);
 
     infoSink.info.prefix(prefix);
-    infoSink.info.location(loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+    infoSink.info.location(loc, messages & EShMsgAbsolutePath);
     infoSink.info << "'" << szToken <<  "' : " << szReason << " " << szExtraInfo << "\n";
 
     if (prefix == EPrefixError) {
@@ -171,9 +171,6 @@ bool TParseContextBase::lValueErrorCheck(const TSourceLoc& loc, const char* op,
         case EbtHitObjectNV:
             message = "can't modify hitObjectNV";
             break;
-        case EbtHitObjectEXT:
-            message = "can't modify hitObjectEXT";
-            break;
         default:
             break;
         }
@@ -282,7 +279,7 @@ void TParseContextBase::trackLinkage(TSymbol& symbol)
 
 // Ensure index is in bounds, correct if necessary.
 // Give an error if not.
-void TParseContextBase::checkIndex(const TSourceLoc& loc, const TType& type, int64_t& index)
+void TParseContextBase::checkIndex(const TSourceLoc& loc, const TType& type, int& index)
 {
     const auto sizeIsSpecializationExpression = [&type]() {
         return type.containsSpecializationSize() &&
@@ -308,11 +305,6 @@ void TParseContextBase::checkIndex(const TSourceLoc& loc, const TType& type, int
             error(loc, "", "[", "matrix index out of range '%d'", index);
             index = type.getMatrixCols() - 1;
         }
-    } else if (type.isCoopVecNV()) {
-        if (index >= type.computeNumComponents()) {
-            error(loc, "", "[", "cooperative vector index out of range '%d'", index);
-            index = type.computeNumComponents() - 1;
-        }
     }
 }
 
@@ -427,7 +419,7 @@ const TFunction* TParseContextBase::selectFunction(
         // to even be a potential match, number of arguments must be >= the number of
         // fixed (non-default) parameters, and <= the total (including parameter with defaults).
         if (call.getParamCount() < candidate.getFixedParamCount() ||
-            (call.getParamCount() > candidate.getParamCount() && !candidate.isVariadic()))
+            call.getParamCount() > candidate.getParamCount())
             continue;
 
         // see if arguments are convertible
@@ -466,8 +458,7 @@ const TFunction* TParseContextBase::selectFunction(
     const auto betterParam = [&call, &better](const TFunction& can1, const TFunction& can2) -> bool {
         // is call -> can2 better than call -> can1 for any parameter
         bool hasBetterParam = false;
-        const int paramCount = std::min({call.getParamCount(), can1.getParamCount(), can2.getParamCount()});
-        for (int param = 0; param < paramCount; ++param) {
+        for (int param = 0; param < call.getParamCount(); ++param) {
             if (better(*call[param].type, *can1[param].type, *can2[param].type)) {
                 hasBetterParam = true;
                 break;
@@ -478,8 +469,7 @@ const TFunction* TParseContextBase::selectFunction(
 
     const auto equivalentParams = [&call, &better](const TFunction& can1, const TFunction& can2) -> bool {
         // is call -> can2 equivalent to call -> can1 for all the call parameters?
-        const int paramCount = std::min({call.getParamCount(), can1.getParamCount(), can2.getParamCount()});
-        for (int param = 0; param < paramCount; ++param) {
+        for (int param = 0; param < call.getParamCount(); ++param) {
             if (better(*call[param].type, *can1[param].type, *can2[param].type) ||
                 better(*call[param].type, *can2[param].type, *can1[param].type))
                 return false;
@@ -487,16 +477,6 @@ const TFunction* TParseContextBase::selectFunction(
         return true;
     };
 
-    const auto enabled = [this](const TFunction& candidate) -> bool {
-        bool enabled = candidate.getNumExtensions() == 0;
-        for (int i = 0; i < candidate.getNumExtensions(); ++i) {
-            TExtensionBehavior behavior = getExtensionBehavior(candidate.getExtensions()[i]);
-            if (behavior == EBhEnable || behavior == EBhRequire)
-                enabled = true;
-        }
-        return enabled;
-    };
-
     const TFunction* incumbent = viableCandidates.front();
     for (auto it = viableCandidates.begin() + 1; it != viableCandidates.end(); ++it) {
         const TFunction& candidate = *(*it);
@@ -512,7 +492,7 @@ const TFunction* TParseContextBase::selectFunction(
 
         // In the case of default parameters, it may have an identical initial set, which is
         // also ambiguous
-        if ((betterParam(*incumbent, candidate) || equivalentParams(*incumbent, candidate)) && enabled(candidate))
+        if (betterParam(*incumbent, candidate) || equivalentParams(*incumbent, candidate))
             tie = true;
     }
 
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.cpp
index 8f1a3817..cb19b2d4 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.cpp
@@ -4,7 +4,6 @@
 // Copyright (C) 2015-2018 Google, Inc.
 // Copyright (C) 2017, 2019 ARM Limited.
 // Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
-// Modifications Copyright (C) 2024 Ravi Prakash Singh.
 //
 // All rights reserved.
 //
@@ -42,10 +41,9 @@
 #include "Initialize.h"
 #include "Scan.h"
 
+#include "../OSDependent/osinclude.h"
 #include <algorithm>
-#include <sys/types.h>
 
-#include "Versions.h"
 #include "preprocessor/PpContext.h"
 
 extern int yyparse(glslang::TParseContext*);
@@ -401,18 +399,6 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
         if (spvVersion.spv < glslang::EShTargetSpv_1_3)
             error(loc, "requires SPIR-V 1.3", "#pragma use_variable_pointers", "");
         intermediate.setUseVariablePointers();
-    } else if (spvVersion.spv > 0 && tokens[0].compare("use_replicated_composites") == 0) {
-        if (tokens.size() != 1)
-            error(loc, "extra tokens", "#pragma", "");
-        intermediate.setReplicatedComposites();
-    } else if (spvVersion.spv > 0 && tokens[0].compare("promote_uint32_indices") == 0) {
-        if (tokens.size() != 1)
-            error(loc, "extra tokens", "#pragma", "");
-        intermediate.setPromoteUint32Indices();
-    } else if (spvVersion.spv > 0 && tokens[0].compare("shader_64bit_indexing") == 0) {
-        if (tokens.size() != 1)
-            error(loc, "extra tokens", "#pragma", "");
-        intermediate.setShader64BitIndexing();
     } else if (tokens[0].compare("once") == 0) {
         warn(loc, "not implemented", "#pragma once", "");
     } else if (tokens[0].compare("glslang_binary_double_output") == 0) {
@@ -506,7 +492,7 @@ TIntermTyped* TParseContext::handleVariable(const TSourceLoc& loc, TSymbol* symb
                 if ((variable->getMangledName() == "gl_PrimitiveTriangleIndicesEXT" && primitiveType != ElgTriangles) ||
                     (variable->getMangledName() == "gl_PrimitiveLineIndicesEXT" && primitiveType != ElgLines) ||
                     (variable->getMangledName() == "gl_PrimitivePointIndicesEXT" && primitiveType != ElgPoints)) {
-                    error(loc, "cannot be used (output primitive type mismatch)", string->c_str(), "");
+                    error(loc, "cannot be used (ouput primitive type mismatch)", string->c_str(), "");
                     variable = nullptr;
                 }
             }
@@ -516,18 +502,8 @@ TIntermTyped* TParseContext::handleVariable(const TSourceLoc& loc, TSymbol* symb
         }
 
         // Recovery, if it wasn't found or was not a variable.
-        if (! variable) {
-            bool builtIn = false;
-            TVector<const TFunction*> candidateList;
-            symbolTable.findFunctionNameList(*string + "(", candidateList, builtIn);
-
-            // If it's a function, pass the name/mangledName
-            if (!candidateList.empty() && !builtIn) {
-                variable = new TVariable(&candidateList[0]->getName(), &candidateList[0]->getMangledName(), TType(EbtFunction));
-            } else {
-                variable = new TVariable(string, TType(EbtVoid));
-            }
-        }
+        if (! variable)
+            variable = new TVariable(string, TType(EbtVoid));
 
         if (variable->getType().getQualifier().isFrontEndConstant())
             node = intermediate.addConstantUnion(variable->getConstArray(), variable->getType(), loc);
@@ -551,21 +527,15 @@ TIntermTyped* TParseContext::handleVariable(const TSourceLoc& loc, TSymbol* symb
 //
 TIntermTyped* TParseContext::handleBracketDereference(const TSourceLoc& loc, TIntermTyped* base, TIntermTyped* index)
 {
-    int64_t indexValue = 0;
-    if (index->getQualifier().isFrontEndConstant()) {
-        if (index->getType().contains64BitInt()) {
-            indexValue = index->getAsConstantUnion()->getConstArray()[0].getI64Const();
-        } else if (index->getType().getBasicType() == EbtUint) {
-            indexValue = index->getAsConstantUnion()->getConstArray()[0].getUConst();
-        } else {
-            indexValue = index->getAsConstantUnion()->getConstArray()[0].getIConst();
-        }
-    }
+    int indexValue = 0;
+    if (index->getQualifier().isFrontEndConstant())
+        indexValue = index->getAsConstantUnion()->getConstArray()[0].getIConst();
+
     // basic type checks...
     variableCheck(base);
 
     if (! base->isArray() && ! base->isMatrix() && ! base->isVector() && ! base->getType().isCoopMat() &&
-        ! base->isReference() && ! base->getType().isCoopVecNV()) {
+        ! base->isReference()) {
         if (base->getAsSymbolNode())
             error(loc, " left of '[' is not of type array, matrix, or vector ", base->getAsSymbolNode()->getName().c_str(), "");
         else
@@ -639,8 +609,7 @@ TIntermTyped* TParseContext::handleBracketDereference(const TSourceLoc& loc, TIn
                     TType& leftType = binaryNode->getLeft()->getWritableType();
                     TArraySizes& arraySizes = *leftType.getArraySizes();
                     assert(arraySizes.getNumDims() == 2);
-                    assert(indexValue < std::numeric_limits<int>::max());
-                    arraySizes.setDimSize(1, std::max(arraySizes.getDimSize(1), (int)indexValue + 1));
+                    arraySizes.setDimSize(1, std::max(arraySizes.getDimSize(1), indexValue + 1));
                 }
             }
         } else
@@ -661,13 +630,9 @@ TIntermTyped* TParseContext::handleBracketDereference(const TSourceLoc& loc, TIn
         if (base->getBasicType() == EbtBlock) {
             if (base->getQualifier().storage == EvqBuffer)
                 requireProfile(base->getLoc(), ~EEsProfile, "variable indexing buffer block array");
-            else if (base->getQualifier().storage == EvqUniform) {
+            else if (base->getQualifier().storage == EvqUniform)
                 profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5,
                                 "variable indexing uniform block array");
-                profileRequires(base->getLoc(), ECoreProfile, 400, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5,
-                                "variable indexing uniform block array");
-
-            }
             else {
                 // input/output blocks either don't exist or can't be variably indexed
             }
@@ -677,8 +642,7 @@ TIntermTyped* TParseContext::handleBracketDereference(const TSourceLoc& loc, TIn
             const char* explanation = "variable indexing sampler array";
             requireProfile(base->getLoc(), EEsProfile | ECoreProfile | ECompatibilityProfile, explanation);
             profileRequires(base->getLoc(), EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, explanation);
-            profileRequires(base->getLoc(), ECoreProfile | ECompatibilityProfile, 400, Num_AEP_core_gpu_shader5,
-                            AEP_core_gpu_shader5, explanation);
+            profileRequires(base->getLoc(), ECoreProfile | ECompatibilityProfile, 400, nullptr, explanation);
         }
 
         result = intermediate.addIndex(EOpIndexIndirect, base, index, loc);
@@ -927,9 +891,7 @@ TIntermTyped* TParseContext::handleBinaryMath(const TSourceLoc& loc, const char*
 
     if (((left->getType().contains16BitFloat() || right->getType().contains16BitFloat()) && !float16Arithmetic()) ||
         ((left->getType().contains16BitInt() || right->getType().contains16BitInt()) && !int16Arithmetic()) ||
-        ((left->getType().contains8BitInt() || right->getType().contains8BitInt()) && !int8Arithmetic()) ||
-        (left->getType().containsBFloat16() || right->getType().containsBFloat16()) ||
-        (left->getType().contains8BitFloat() || right->getType().contains8BitFloat())) {
+        ((left->getType().contains8BitInt() || right->getType().contains8BitInt()) && !int8Arithmetic())) {
         allowed = false;
     }
 
@@ -956,9 +918,7 @@ TIntermTyped* TParseContext::handleUnaryMath(const TSourceLoc& loc, const char*
     bool allowed = true;
     if ((childNode->getType().contains16BitFloat() && !float16Arithmetic()) ||
         (childNode->getType().contains16BitInt() && !int16Arithmetic()) ||
-        (childNode->getType().contains8BitInt() && !int8Arithmetic()) ||
-        (childNode->getType().containsBFloat16()) ||
-        (childNode->getType().contains8BitFloat())) {
+        (childNode->getType().contains8BitInt() && !int8Arithmetic())) {
         allowed = false;
     }
 
@@ -988,26 +948,21 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
     // Save away the name in the AST for now.  Processing is completed in
     // handleLengthMethod().
     //
-    if (field == "length" || field == "length64") {
+    if (field == "length") {
         if (base->isArray()) {
-            profileRequires(loc, ENoProfile, 120, E_GL_3DL_array_objects, (TString(".") + field).c_str());
-            profileRequires(loc, EEsProfile, 300, nullptr, (TString(".") + field).c_str());
+            profileRequires(loc, ENoProfile, 120, E_GL_3DL_array_objects, ".length");
+            profileRequires(loc, EEsProfile, 300, nullptr, ".length");
         } else if (base->isVector() || base->isMatrix()) {
             const char* feature = ".length() on vectors and matrices";
             requireProfile(loc, ~EEsProfile, feature);
             profileRequires(loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, feature);
-        } else if (!base->getType().isCoopMat() && !base->getType().isCoopVecNV()) {
+        } else if (!base->getType().isCoopMat()) {
             bool enhanced = intermediate.getEnhancedMsgs();
             error(loc, "does not operate on this type:", field.c_str(), base->getType().getCompleteString(enhanced).c_str());
             return base;
         }
 
-        if (field == "length") {
-            return intermediate.addMethod(base, TType(EbtInt), &field, loc);
-        } else {
-            requireExtensions(loc, 1, &E_GL_EXT_shader_64bit_indexing, "length64");
-            return intermediate.addMethod(base, TType(EbtInt64), &field, loc);
-        }
+        return intermediate.addMethod(base, TType(EbtInt), &field, loc);
     }
 
     // It's not .length() if we get to here.
@@ -1213,23 +1168,19 @@ TFunction* TParseContext::handleFunctionDeclarator(const TSourceLoc& loc, TFunct
     if (prevDec) {
         if (prevDec->isPrototyped() && prototype)
             profileRequires(loc, EEsProfile, 300, nullptr, "multiple prototypes for same function");
+        if (prevDec->getType() != function.getType())
+            error(loc, "overloaded functions must have the same return type", function.getName().c_str(), "");
         if (prevDec->getSpirvInstruction() != function.getSpirvInstruction()) {
             error(loc, "overloaded functions must have the same qualifiers", function.getName().c_str(),
                   "spirv_instruction");
         }
-        bool parameterTypesDiffer = false;
         for (int i = 0; i < prevDec->getParamCount(); ++i) {
             if ((*prevDec)[i].type->getQualifier().storage != function[i].type->getQualifier().storage)
                 error(loc, "overloaded functions must have the same parameter storage qualifiers for argument", function[i].type->getStorageQualifierString(), "%d", i+1);
 
             if ((*prevDec)[i].type->getQualifier().precision != function[i].type->getQualifier().precision)
                 error(loc, "overloaded functions must have the same parameter precision qualifiers for argument", function[i].type->getPrecisionQualifierString(), "%d", i+1);
-
-            if (*(*prevDec)[i].type != *function[i].type)
-                parameterTypesDiffer = true;
         }
-        if (!parameterTypesDiffer && prevDec->getType() != function.getType())
-            error(loc, "overloaded functions must have the same return type", function.getName().c_str(), "");
     }
 
     arrayObjectCheck(loc, function.getType(), "array in function return type");
@@ -1428,24 +1379,6 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
                     // At this early point there is a slight ambiguity between whether an aggregate 'arguments'
                     // is the single argument itself or its children are the arguments.  Only one argument
                     // means take 'arguments' itself as the one argument.
-                    if ((*fnCandidate)[i].defaultValue) {
-                        if (!aggregate) {
-                            // Only one argument was passed (rest are default arguments) so arguments isn't a TIntermAggregate.
-                            // But the function takes at least one more argument, so a TIntermAggregate is needed.
-                            aggregate = new TIntermAggregate;
-                            aggregate->getSequence().push_back(arguments);
-                            arguments = aggregate;
-                        }
-                        if (i >= static_cast<int>(aggregate->getSequence().size())) {
-                            // Append the default value if there are no more arguments left in the aggregate.
-                            TIntermConstantUnion *defaultValue = nullptr;
-                            if (const auto *constUnion = (*fnCandidate)[i].defaultValue->getAsConstantUnion()) {
-                                defaultValue = new TIntermConstantUnion(constUnion->getConstArray(), constUnion->getType());
-                            }
-                            assert(defaultValue && "unsupported default value construct");
-                            aggregate->getSequence().push_back(defaultValue);
-                        }
-                    }
                     TIntermNode* arg = fnCandidate->getParamCount() == 1 ? arguments : (aggregate ? aggregate->getSequence()[i] : arguments);
                     TQualifier& formalQualifier = (*fnCandidate)[i].type->getQualifier();
                     if (formalQualifier.isParamOutput()) {
@@ -1480,8 +1413,6 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
                             error(arguments->getLoc(), message, "readonly", "");
                         if (argQualifier.writeonly && ! formalQualifier.writeonly)
                             error(arguments->getLoc(), message, "writeonly", "");
-                        if (argQualifier.nontemporal && ! formalQualifier.nontemporal)
-                            error(arguments->getLoc(), message, "nontemporal", "");
                         // Don't check 'restrict', it is different than the rest:
                         // "...but only restrict can be taken away from a calling argument, by a formal parameter that
                         // lacks the restrict qualifier..."
@@ -1500,22 +1431,6 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
                     if (builtIn && arg->getAsTyped()->getType().contains8BitInt())
                         requireInt8Arithmetic(arguments->getLoc(), "built-in function", "(u)int8 types can only be in uniform block or buffer storage");
 
-                    // Check that coopVecOuterProductAccumulateNV vector component types match
-                    if (builtIn && fnCandidate->getBuiltInOp() == EOpCooperativeVectorOuterProductAccumulateNV &&
-                        i == 1 && arg->getAsTyped()->getType().getBasicType() != aggregate->getSequence()[0]->getAsTyped()->getType().getBasicType())
-                        error(arguments->getLoc(), "cooperative vector basic types must match", fnCandidate->getName().c_str(), "");
-
-                    // Check that coopVecLoadNV and coopVecStoreNV buffer parameter is in buffer or shared storage
-                    if (builtIn && (fnCandidate->getBuiltInOp() == EOpCooperativeVectorLoadNV ||
-                                    fnCandidate->getBuiltInOp() == EOpCooperativeVectorStoreNV) &&
-                        i == 1) {
-                        TStorageQualifier storage = arg->getAsTyped()->getType().getQualifier().storage;
-                        if (storage != EvqBuffer && storage != EvqShared) {
-                            error(arguments->getLoc(), "buffer argument must be in buffer or shared storage", 
-                                  fnCandidate->getName().c_str(), "");
-                        }
-                    }
-
                     // TODO 4.5 functionality:  A shader will fail to compile
                     // if the value passed to the memargument of an atomic memory function does not correspond to a buffer or
                     // shared variable. It is acceptable to pass an element of an array or a single component of a vector to the
@@ -1570,21 +1485,12 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
                 result = addOutputArgumentConversions(*fnCandidate, *result->getAsAggregate());
             }
 
-            handleCoopMat2FunctionCall(loc, fnCandidate, result, arguments);
-
-            handleVector2CoopMatConversionCall(loc, fnCandidate, result, arguments);
-
-            if (result->getAsTyped()->getType().isCoopVecNV() &&
+            if (result->getAsTyped()->getType().isCoopMat() &&
                !result->getAsTyped()->getType().isParameterized()) {
-                if (auto unaryNode = result->getAsUnaryNode())
-                    result->setType(unaryNode->getOperand()->getAsTyped()->getType());
-                else
-                    result->setType(result->getAsAggregate()->getSequence()[0]->getAsTyped()->getType());
-            }
+                assert(fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAdd ||
+                       fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAddNV);
 
-            if (fnCandidate->getBuiltInOp() == EOpConstructSaturated) {
-                // result type is taken from the first parameter
-                result->setType(result->getAsAggregate()->getSequence()[0]->getAsTyped()->getType());
+                result->setType(result->getAsAggregate()->getSequence()[2]->getAsTyped()->getType());
             }
         }
     }
@@ -1597,589 +1503,6 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
     return result;
 }
 
-void TParseContext::handleCoopMat2FunctionCall(const TSourceLoc& loc, const TFunction* fnCandidate, TIntermTyped* result, TIntermNode* arguments)
-{
-    if (arguments && arguments->getAsAggregate()) {
-        auto &sequence = arguments->getAsAggregate()->getSequence();
-        for (uint32_t i = 0; i < sequence.size(); ++i) {
-            auto param = sequence[i];
-            if (param->getAsTyped()->getBasicType() == EbtFunction) {
-                // Add the function to the callgraph
-                intermediate.addToCallGraph(infoSink, currentCaller, param->getAsSymbolNode()->getMangledName());
-
-                // error checking that all parameters are 'const in'
-                if (fnCandidate->getBuiltInOp() == EOpCooperativeMatrixLoadTensorNV ||
-                    fnCandidate->getBuiltInOp() == EOpCooperativeMatrixReduceNV ||
-                    fnCandidate->getBuiltInOp() == EOpCooperativeMatrixPerElementOpNV) {
-                    const TFunction* func = symbolTable.find(param->getAsSymbolNode()->getMangledName())->getAsFunction();
-                    for (int i = 0; i < func->getParamCount(); ++i) {
-                        const TParameter& arg = (*func)[i];
-                        const TQualifier& formalQualifier = arg.type->getQualifier();
-                        if (formalQualifier.storage != EvqConstReadOnly) {
-                            error(loc, "function parameters must all be qualified 'const in'", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                        }
-                    }
-                }
-
-                // error checking decodeFunc parameters are (reference, uint32_t[], uint32_t[])
-                if (fnCandidate->getBuiltInOp() == EOpCooperativeMatrixLoadTensorNV) {
-                    const TFunction* decodeFunc = symbolTable.find(param->getAsSymbolNode()->getMangledName())->getAsFunction();
-
-                    if (decodeFunc->getParamCount() != 3) {
-                        error(loc, "must have three parameters", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-
-                    if ((*decodeFunc)[0].type->getBasicType() != EbtReference) {
-                        error(loc, "first parameter must be buffer reference type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-                    if ((*decodeFunc)[1].type->getBasicType() != EbtUint || (*decodeFunc)[2].type->getBasicType() != EbtUint) {
-                        error(loc, "coordinate parameters must be uint32_t", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-                    if (!(*decodeFunc)[1].type->isArray() || !(*decodeFunc)[2].type->isArray()) {
-                        error(loc, "coordinate parameters must be uint32_t", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-                }
-
-                // error checking reduce function has matching parameters
-                if (fnCandidate->getBuiltInOp() == EOpCooperativeMatrixReduceNV) {
-                    const TFunction* combineOp = symbolTable.find(param->getAsSymbolNode()->getMangledName())->getAsFunction();
-
-                    if (combineOp->getParamCount() != 2) {
-                        error(loc, "must have two parameters", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-
-                    for (int i = 0; i < combineOp->getParamCount(); ++i) {
-                        const TParameter& arg = (*combineOp)[i];
-                        if (sequence[1]->getAsTyped()->getType().getBasicType() != arg.type->getBasicType()) {
-                            error(loc, "parameter types must match cooperative matrix component type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                        }
-                    }
-                    if (sequence[1]->getAsTyped()->getType().getBasicType() != combineOp->getType().getBasicType()) {
-                        error(loc, "return type must match cooperative matrix component type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    }
-                }
-
-                // error checking perelement op has correct parameters
-                if (fnCandidate->getBuiltInOp() == EOpCooperativeMatrixPerElementOpNV) {
-                    const TFunction* elemOp = symbolTable.find(param->getAsSymbolNode()->getMangledName())->getAsFunction();
-
-                    if (sequence[1]->getAsTyped()->getType() != sequence[0]->getAsTyped()->getType()) {
-                        error(loc, "cooperative matrix input and result types must match", "", "");
-                    }
-
-                    if (elemOp->getParamCount() < 3) {
-                        error(loc, "not enough parameters", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    } else if (elemOp->getParamCount() != (int)sequence.size()) {
-                        error(loc, "number of parameters must match call to coopMatPerElementNV", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                    } else {
-                        if ((*elemOp)[0].type->getBasicType() != EbtUint || (*elemOp)[1].type->getBasicType() != EbtUint) {
-                            error(loc, "row/column parameters must be uint32_t", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                        }
-
-                        const TParameter& matArg = (*elemOp)[2];
-                        if (sequence[1]->getAsTyped()->getType().getBasicType() != matArg.type->getBasicType()) {
-                            error(loc, "third parameter must match cooperative matrix component type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                        }
-
-                        for (int i = 3; i < elemOp->getParamCount(); ++i) {
-                            const TParameter& arg = (*elemOp)[i];
-                            if (sequence[i]->getAsTyped()->getType().getBasicType() != arg.type->getBasicType()) {
-                                error(loc, "parameter types must match or be cooperative matrix component type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                            }
-                        }
-                        if (sequence[1]->getAsTyped()->getType().getBasicType() != elemOp->getType().getBasicType()) {
-                            error(loc, "return type must match cooperative matrix component type", param->getAsSymbolNode()->getMangledName().c_str(), "");
-                        }
-                    }
-                }
-            }
-        }
-    }
-    if ((result->getAsTyped()->getType().isCoopMat() ||
-         result->getAsTyped()->getType().isTensorLayoutNV() ||
-         result->getAsTyped()->getType().isTensorViewNV()) &&
-       !result->getAsTyped()->getType().isParameterized()) {
-        assert(fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAdd ||
-               fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAddNV ||
-               fnCandidate->getBuiltInOp() == EOpCooperativeMatrixReduceNV ||
-               fnCandidate->getBuiltInOp() == EOpCooperativeMatrixPerElementOpNV ||
-               fnCandidate->getBuiltInOp() == EOpCooperativeMatrixTransposeNV ||
-               fnCandidate->getBuiltInOp() == EOpCreateTensorLayoutNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorLayoutSetDimensionNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorLayoutSetBlockSizeNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorLayoutSetStrideNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorLayoutSliceNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorLayoutSetClampValueNV ||
-               fnCandidate->getBuiltInOp() == EOpCreateTensorViewNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorViewSetDimensionNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorViewSetStrideNV ||
-               fnCandidate->getBuiltInOp() == EOpTensorViewSetClipNV);
-
-        if (fnCandidate->getBuiltInOp() == EOpCreateTensorLayoutNV) {
-
-            // Convert template parameters to arraySizes/typeParameters
-            TArraySizes *arraySizes = new TArraySizes;
-            for (uint32_t i = 0; i < 2; ++i) {
-                TIntermNode *param {};
-                if (arguments->getAsConstantUnion()) {
-                    if (i == 0) {
-                        param = arguments;
-                    }
-                } else {
-                    assert(arguments->getAsAggregate());
-                    auto &sequence = arguments->getAsAggregate()->getSequence();
-                    if (i < sequence.size()) {
-                        param = sequence[i];
-                    }
-                }
-                if (param) {
-                    if (param->getAsTyped()->getType().getQualifier().isSpecConstant()) {
-                        uint32_t value = param->getAsSymbolNode()->getConstArray()[0].getIConst();
-                        arraySizes->addInnerSize(value, param->getAsTyped());
-                    } else {
-                        uint32_t value = param->getAsConstantUnion()->getConstArray()[0].getIConst();
-                        arraySizes->addInnerSize(value);
-                    }
-                } else {
-                    // gl_CooperativeMatrixClampModeUndefined
-                    arraySizes->addInnerSize(0);
-                }
-            }
-            TTypeParameters typeParameters;
-            typeParameters.arraySizes = arraySizes;
-
-            TType resultType;
-            resultType.deepCopy(result->getAsTyped()->getType());
-
-            resultType.copyTypeParameters(typeParameters);
-            result->setType(resultType);
-        } else if (fnCandidate->getBuiltInOp() == EOpCreateTensorViewNV) {
-
-            // Convert template parameters to arraySizes/typeParameters
-            TArraySizes *arraySizes = new TArraySizes;
-            for (uint32_t i = 0; i < 7; ++i) {
-                TIntermNode *param {};
-                if (arguments->getAsConstantUnion()) {
-                    if (i == 0) {
-                        param = arguments;
-                    }
-                } else {
-                    assert(arguments->getAsAggregate());
-                    auto &sequence = arguments->getAsAggregate()->getSequence();
-                    if (i < sequence.size()) {
-                        param = sequence[i];
-                    }
-                }
-                if (param) {
-                    if (param->getAsTyped()->getType().getQualifier().isSpecConstant()) {
-                        uint32_t value = param->getAsSymbolNode()->getConstArray()[0].getIConst();
-                        arraySizes->addInnerSize(value, param->getAsTyped());
-                    } else {
-                        uint32_t value = param->getAsConstantUnion()->getConstArray()[0].getIConst();
-                        arraySizes->addInnerSize(value);
-                    }
-                } else {
-                    uint32_t value = 0;
-                    if (i >= 2) {
-                        // default permutation values are an increasing sequence
-                        value = i - 2;
-                    }
-                    arraySizes->addInnerSize(value);
-                }
-            }
-            TTypeParameters typeParameters;
-            typeParameters.arraySizes = arraySizes;
-
-            TType resultType;
-            resultType.deepCopy(result->getAsTyped()->getType());
-
-            resultType.copyTypeParameters(typeParameters);
-            result->setType(resultType);
-        } else if (fnCandidate->getBuiltInOp() == EOpCooperativeMatrixReduceNV ||
-                   fnCandidate->getBuiltInOp() == EOpCooperativeMatrixPerElementOpNV ||
-                   fnCandidate->getBuiltInOp() == EOpCooperativeMatrixTransposeNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorLayoutSetDimensionNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorLayoutSetBlockSizeNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorLayoutSetStrideNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorLayoutSliceNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorLayoutSetClampValueNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorViewSetDimensionNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorViewSetStrideNV ||
-                   fnCandidate->getBuiltInOp() == EOpTensorViewSetClipNV) {
-            // Set result type to match type of first parameter
-            result->setType(result->getAsAggregate()->getSequence()[0]->getAsTyped()->getType());
-        } else {
-            // The only remaining operation is MulAdd
-            assert(fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAdd ||
-                   fnCandidate->getBuiltInOp() == EOpCooperativeMatrixMulAddNV);
-
-            // Validate that the matrix sizes are compatible for multiplication and addition
-            const auto &sequence = arguments->getAsAggregate()->getSequence();
-
-            using ArrayDim = const TArraySize&;
-            auto getDim = [](const TIntermSequence& seq, int idx) -> std::tuple<ArrayDim, ArrayDim, int> {
-                const auto &type = seq[idx]->getAsTyped()->getType();
-                const auto *size = type.getTypeParameters()->arraySizes;
-
-                if (type.isCoopMatNV()) {
-                    // coopmatNV don't encode usage, so provide the correct usage by default
-                    return {size->getArraySize(2), size->getArraySize(3), idx};
-                } else {
-                    assert(type.isCoopMatKHR());
-                    return {size->getArraySize(1), size->getArraySize(2), size->getDimSize(3)};
-                }
-            };
-
-            // sizes look like: [scope, rows, cols, use]
-            auto [aRows, aCols, aUse] = getDim(sequence, 0);
-            auto [bRows, bCols, bUse] = getDim(sequence, 1);
-            auto [cRows, cCols, cUse] = getDim(sequence, 2);
-
-            auto toString = [](ArrayDim dim) -> std::string {
-                std::stringstream buf;
-                if (dim.node == nullptr) {
-                    buf << dim.size;
-                } else {
-                    buf << "spec_const";
-                }
-                return buf.str();
-            };
-
-            if (aCols != bRows) {
-                auto aRowsStr = toString(aRows);
-                auto aColsStr = toString(aCols);
-                auto bRowsStr = toString(bRows);
-                auto bColsStr = toString(bCols);
-                error(loc, "cannot multiply coop matrices with incompatible sizes",
-                      sequence[0]->getAsSymbolNode()->getMangledName().c_str(),
-                      "%s x %s with %s x %s",
-                      aRowsStr.c_str(),
-                      aColsStr.c_str(),
-                      bRowsStr.c_str(),
-                      bColsStr.c_str());
-            } else if (aRows != cRows || bCols != cCols) {
-                auto aRowsStr = toString(aRows);
-                auto bColsStr = toString(bCols);
-                auto cRowsStr = toString(cRows);
-                auto cColsStr = toString(cCols);
-                error(loc, "cannot add coop matrices with incompatible sizes",
-                      sequence[2]->getAsSymbolNode()->getMangledName().c_str(),
-                      "%s x %s with %s x %s",
-                      aRowsStr.c_str(),
-                      bColsStr.c_str(),
-                      cRowsStr.c_str(),
-                      cColsStr.c_str());
-            } else if (aUse != 0) {
-                error(loc, "coop matrix A in MulAdd operation has incompatible usage property,",
-                      sequence[0]->getAsSymbolNode()->getMangledName().c_str(),
-                      "found %d, but needed 0", aUse);
-            } else if (bUse != 1) {
-                error(loc, "coop matrix B in MulAdd operation has incompatible usage property,",
-                      sequence[1]->getAsSymbolNode()->getMangledName().c_str(),
-                      "found %d, but needed 1", bUse);
-            } else if (cUse != 2) {
-                error(loc, "coop matrix C in MulAdd operation has incompatible usage property,",
-                      sequence[2]->getAsSymbolNode()->getMangledName().c_str(),
-                      "found %d, but needed 2", cUse);
-            }
-
-            // Set result type to match type of C parameter
-            result->setType(result->getAsAggregate()->getSequence()[2]->getAsTyped()->getType());
-        }
-    }
-}
-
-
-static const uint32_t spv_Scope_Subgroup = 3;
-
-void TParseContext::handleVector2CoopMatConversionCall(const TSourceLoc& loc, const TFunction* fnCandidate,
-                                                       TIntermTyped*& result, TIntermNode* arguments)
-{
-  const uint32_t CM_MatrixUseA = 0;           // == gl_MatrixUseA
-  const uint32_t CM_MatrixUseB = 1;           // == gl_MatrixUseB
-  const uint32_t CM_MatrixUseAccumulator = 2; // == gl_MatrixUseAccumulator
-
-  TOperator builtinOp = fnCandidate->getBuiltInOp();
-
-  if (!(builtinOp == EOpBitCastArrayQCOM || builtinOp == EOpExtractSubArrayQCOM ||
-        builtinOp == EOpCompositeConstructCoopMatQCOM || builtinOp == EOpCompositeExtractCoopMatQCOM))
-    return;
-
-  TPublicType pubType{};
-  auto* oldResult = result;
-
-  if (builtinOp == EOpBitCastArrayQCOM) {
-    auto srcArr = arguments->getAsAggregate()->getSequence()[0]->getAsTyped();
-    auto& srcTy = srcArr->getType();
-    auto srcArrLen = srcTy.getArraySizes()->getDimSize(0);
-    auto srcLenAsNode = srcTy.getArraySizes()->getDimNode(0);
-
-    auto dstArr = arguments->getAsAggregate()->getSequence()[1]->getAsTyped();
-    auto& dstTy = dstArr->getType();
-    auto dstArrLen = dstTy.getArraySizes()->getDimSize(0);
-    auto dstLenAsNode = dstTy.getArraySizes()->getDimNode(0);
-
-    if (srcLenAsNode == nullptr && dstLenAsNode == nullptr) {
-      //do basic tests:
-      if ((srcArrLen * GetNumBits(srcTy.getBasicType())) != (dstArrLen * GetNumBits(dstTy.getBasicType())))
-        error(loc, "source and target arrays have different bit sizes", "", "");
-    }
-
-    pubType.basicType = dstTy.getBasicType();
-    pubType.vectorSize = 1u;
-    pubType.qualifier.precision = EpqNone;
-    pubType.coopmatNV = false;
-    pubType.coopmatKHR = false;
-    pubType.arraySizes = new TArraySizes;
-    pubType.arraySizes->addInnerSize(dstArrLen, dstLenAsNode);
-    pubType.typeParameters = nullptr;
-  }
-
-  if (builtinOp == EOpExtractSubArrayQCOM) {
-    auto dstArr = arguments->getAsAggregate()->getSequence()[2]->getAsTyped();
-    auto& dstTy = dstArr->getType();
-    auto dstArrLen = dstTy.getArraySizes()->getDimSize(0);
-    auto dstLenAsNode = dstTy.getArraySizes()->getDimNode(0);
-
-    if (dstLenAsNode == nullptr) {
-      if ((dstArrLen * GetNumBits(dstTy.getBasicType())) == 32)
-        error(loc, "the byte size of the target array must be 32", "", "");
-    }
-
-    pubType.basicType = dstTy.getBasicType();
-    pubType.vectorSize = 1u;
-    pubType.qualifier.precision = EpqNone;
-    pubType.coopmatNV = false;
-    pubType.coopmatKHR = false;
-    pubType.arraySizes = new TArraySizes;
-    pubType.arraySizes->addInnerSize(dstArrLen, dstLenAsNode);
-    pubType.typeParameters = nullptr;
-  }
-
-  if (builtinOp == EOpCompositeConstructCoopMatQCOM) {
-
-    auto& srcType = arguments->getAsAggregate()->getSequence()[0]->getAsTyped()->getType();
-    auto& dstType = arguments->getAsAggregate()->getSequence()[1]->getAsTyped()->getType();
-
-    glslang::TBasicType srcBasicType = srcType.getBasicType();
-    glslang::TBasicType dstBasicType = dstType.getBasicType();
-
-    if (srcBasicType != EbtUint && srcBasicType != dstBasicType)
-      error(loc, "source and destination element types are not compatible", "", "");
-
-    uint32_t scope = spv_Scope_Subgroup;
-    uint32_t coopMatKHRuse = !0u;
-    uint32_t coopMatNumRows = !0u, coopMatNumCols = !0u;
-    TIntermTyped *nodeNumRows = nullptr, *nodeNumCols = nullptr;
-    const TTypeParameters* dstTypeParameters = dstType.getTypeParameters();
-    if (dstTypeParameters->arraySizes == nullptr || dstTypeParameters->arraySizes->getNumDims() != 4) {
-      error(loc, "destination cooperative matrix has an unsupported type", "", "");
-    } else {
-      auto arraySizes = dstTypeParameters->arraySizes;
-      scope = arraySizes->getDimSize(0);
-      coopMatNumRows = arraySizes->getDimSize(1);
-      nodeNumRows = arraySizes->getDimNode(1);
-      coopMatNumCols = arraySizes->getDimSize(2);
-      nodeNumCols = arraySizes->getDimNode(2);
-      coopMatKHRuse = arraySizes->getDimSize(3);
-    }
-
-    if (scope != spv_Scope_Subgroup) {
-      scope = spv_Scope_Subgroup;
-      error(loc, "cooperative matrix has unsupported scope; gl_SubgroupScope is expected", "", "");
-    }
-
-    if (coopMatKHRuse > CM_MatrixUseAccumulator) {
-      coopMatKHRuse = CM_MatrixUseA;
-      error(loc, "cooperative matrix use must be one of gl_MatrixUseA, gl_MatrixUseB, gl_MatrixUseAccumulator",
-            "", "");
-    }
-
-    uint32_t dstBasicTypeSize = GetNumBits(dstBasicType) / 8;
-
-    unsigned numRows = coopMatNumRows;
-    TIntermTyped* specConstRows = nodeNumRows;
-    unsigned numCols = coopMatNumCols;
-    TIntermTyped* specConstCols = nodeNumCols;
-
-    // input array type
-    const TType& type = arguments->getAsAggregate()->getSequence()[0]->getAsTyped()->getType();
-    uint32_t arrayLen = type.getArraySizes()->getDimSize(0);
-    auto arrayDimNode = type.getArraySizes()->getDimNode(0);
-
-    if (coopMatKHRuse == CM_MatrixUseA || coopMatKHRuse == CM_MatrixUseAccumulator) {
-      // update numCols
-      if (arrayDimNode == nullptr && specConstCols == nullptr)
-        numCols = arrayLen * (sizeof(uint32_t) / dstBasicTypeSize);
-    } else if (coopMatKHRuse == CM_MatrixUseB) {
-      // update numRows
-      if (arrayDimNode == nullptr && specConstRows == nullptr) {
-        numRows = arrayLen * (sizeof(uint32_t) / dstBasicTypeSize);
-      }
-    }
-
-    // construct the type
-    TArraySizes* arraySizes = new TArraySizes;
-
-    // add Scope
-    arraySizes->addInnerSize(scope);
-
-    // add the row size
-    arraySizes->addInnerSize(numRows, specConstRows); // copy from source
-    // add the column size
-    arraySizes->addInnerSize(numCols, specConstCols); // copy from source
-    // add cooperative matrix use
-    arraySizes->addInnerSize(coopMatKHRuse);
-
-    pubType.basicType = dstBasicType;
-    pubType.vectorSize = 1u;
-    pubType.qualifier = srcType.getQualifier();
-    pubType.qualifier.precision = EpqNone;
-    pubType.coopmatNV = dstType.isCoopMatNV();
-    pubType.coopmatKHR = dstType.isCoopMatKHR();
-    pubType.arraySizes = nullptr;
-    pubType.typeParameters = const_cast<glslang::TTypeParameters*>(dstTypeParameters);
-  }
-
-  if (builtinOp == EOpCompositeExtractCoopMatQCOM) {
-    auto& srcType = arguments->getAsAggregate()->getSequence()[0]->getAsTyped()->getType();
-    auto& dstType = arguments->getAsAggregate()->getSequence()[1]->getAsTyped()->getType();
-
-    glslang::TBasicType srcBasicType = srcType.getBasicType();
-    glslang::TBasicType dstBasicType = dstType.getBasicType();
-
-    if (dstBasicType != EbtUint && srcBasicType != dstBasicType)
-      error(loc, "source and destination element types are not compatible", "", "");
-
-    uint32_t scope = spv_Scope_Subgroup;
-    unsigned coopMatKHRuse = !0u;
-    const TTypeParameters* srcTypeParameters = srcType.getTypeParameters();
-    if (srcTypeParameters->arraySizes == nullptr || srcTypeParameters->arraySizes->getNumDims() != 4) {
-      error(loc, "source cooperative matrix has an unsupported type", "", "");
-    } else {
-      auto arraySizes = srcTypeParameters->arraySizes;
-      scope = arraySizes->getDimSize(0);
-      coopMatKHRuse = arraySizes->getDimSize(3);
-    }
-
-    if (scope != spv_Scope_Subgroup) {
-      scope = spv_Scope_Subgroup;
-      error(loc, "cooperative matrix has unsupported scope; gl_SubgroupScope is expected", "", "");
-    }
-
-    if (coopMatKHRuse > CM_MatrixUseAccumulator) {
-      coopMatKHRuse = CM_MatrixUseA;
-      error(loc, "cooperative matrix use must be one of gl_MatrixUseA, gl_MatrixUseB, gl_MatrixUseAccumulator",
-            "", "");
-    }
-
-    auto dstArrLen = dstType.getArraySizes()->getDimSize(0);
-    auto dstLenAsNode = dstType.getArraySizes()->getDimNode(0);
-
-    if (dstLenAsNode == nullptr) {
-      bool ok = true;
-      switch (dstBasicType) {
-      case EbtUint:
-      case EbtInt:
-      case EbtFloat:
-        ok = (((coopMatKHRuse == CM_MatrixUseA || coopMatKHRuse == CM_MatrixUseB) && dstArrLen == 8) ||
-              (coopMatKHRuse ==
-               CM_MatrixUseAccumulator) /* && (dstArrLen == 64 || dstArrLen == 32 || dstArrLen == 16))*/);
-        break;
-      case EbtFloat16:
-        ok = (((coopMatKHRuse == CM_MatrixUseA || coopMatKHRuse == CM_MatrixUseB) && dstArrLen == 16) ||
-              (coopMatKHRuse ==
-               CM_MatrixUseAccumulator) /* && (dstArrLen == 64 || dstArrLen == 32 || dstArrLen == 16))*/);
-        break;
-      case EbtInt8:
-      case EbtUint8:
-        ok = (((coopMatKHRuse == CM_MatrixUseA || coopMatKHRuse == CM_MatrixUseB) && dstArrLen == 32) ||
-              (coopMatKHRuse ==
-               CM_MatrixUseAccumulator) /* && (dstArrLen == 64 || dstArrLen == 32 || dstArrLen == 16))*/);
-        break;
-      default:
-        error(loc, "unsupported element type", "", "");
-      }
-      if (!ok)
-        error(loc, "unsupported destination array length", "", "");
-    }
-
-    pubType.basicType = dstBasicType;
-    pubType.vectorSize = 1u;
-    pubType.qualifier.precision = EpqNone;
-    pubType.coopmatNV = false;
-    pubType.coopmatKHR = false;
-
-    pubType.arraySizes = new TArraySizes;
-
-    {
-      //int coopMatKHRuse = srcTypeParameters->arraySizes->getDimSize(3);
-      uint32_t index = !0u;
-      if (coopMatKHRuse == CM_MatrixUseA) {
-        index = 2;
-      } else if (coopMatKHRuse == CM_MatrixUseB) {
-        index = 1;
-      } else if (coopMatKHRuse == CM_MatrixUseAccumulator) {
-        index = 2;
-      } else {
-        error(loc, "source cooperative matrix has an unexpected cooperative matrix use", "", "");
-      }
-      int32_t numRowsOrCols = srcTypeParameters->arraySizes->getDimSize(index);
-      auto dimNode = srcTypeParameters->arraySizes->getDimNode(index);
-      if (dimNode != nullptr && dstLenAsNode == nullptr) {
-        numRowsOrCols = dstType.getArraySizes()->getDimSize(0);
-        dimNode = nullptr;
-      }
-      //int32_t dstArrLen = dstType.getArraySizes()->getDimSize(0);
-      pubType.arraySizes->addInnerSize(dstArrLen, dstLenAsNode);
-      if (dimNode == nullptr && dstLenAsNode == nullptr) {
-        const char* msg = nullptr;
-        if (coopMatKHRuse == CM_MatrixUseA && (numRowsOrCols != dstArrLen && dstArrLen != 8)) {
-          msg = "the source matrix's column is not compatible with the destination array";
-        } else if (coopMatKHRuse == CM_MatrixUseB && (numRowsOrCols != dstArrLen && dstArrLen != 8)) {
-          msg = "the source matrix's row is not compatible with the destination array";
-        } else if (coopMatKHRuse == CM_MatrixUseAccumulator &&
-                   (numRowsOrCols != dstArrLen &&
-                    (srcBasicType == EbtFloat16 && numRowsOrCols != 2 * dstArrLen))) {
-          msg = "the source matrix's column is not compatible with the destination array";
-        }
-        if (msg != nullptr)
-          error(loc, msg, "", "");
-      }
-    }
-
-    pubType.typeParameters = nullptr;
-  }
-
-  TType resultType(pubType);
-  if (pubType.typeParameters != nullptr)
-    resultType.copyTypeParameters(*pubType.typeParameters);
-  // need to make StorageQualifier temp
-  resultType.makeTemporary();
-  result->setType(resultType);
-
-  // the RHS of an assignment to be formed
-  auto rhs = result;
-
-  // the LHS of an assignment to be formed; pick the last argument
-  int lhsIdx = (builtinOp == EOpExtractSubArrayQCOM ? 2 : 1);
-  auto lhs = arguments->getAsAggregate()->getSequence()[lhsIdx]->getAsTyped();
-  // pop the last argument from the arguments sequence
-  arguments->getAsAggregate()->getSequence().pop_back();
-
-  // Create OpAssign
-  {
-    arrayObjectCheck(loc, lhs->getType(), "array assignment");
-    storage16BitAssignmentCheck(loc, lhs->getType(), "=");
-    lValueErrorCheck(loc, "assign", lhs);
-    rValueErrorCheck(loc, "assign", rhs);
-    result = addAssign(loc, EOpAssign, lhs, rhs);
-    if (result == nullptr)
-      result = oldResult;
-  }
-}
-
-
 TIntermTyped* TParseContext::handleBuiltInFunctionCall(TSourceLoc loc, TIntermNode* arguments,
                                                        const TFunction& function)
 {
@@ -2295,9 +1618,6 @@ void TParseContext::computeBuiltinPrecisions(TIntermTyped& node, const TFunction
             numArgs = 1;
             break;
         case EOpDebugPrintf:
-        case EOpCooperativeMatrixPerElementOpNV:
-        case EOpCooperativeMatrixReduceNV:
-        case EOpConstructSaturated:
             numArgs = 0;
             break;
         default:
@@ -2306,8 +1626,6 @@ void TParseContext::computeBuiltinPrecisions(TIntermTyped& node, const TFunction
         // find the maximum precision from the arguments and parameters
         for (unsigned int arg = 0; arg < numArgs; ++arg) {
             operationPrecision = std::max(operationPrecision, sequence[arg]->getAsTyped()->getQualifier().precision);
-        }
-        for (int arg = 0; arg < function.getParamCount(); ++arg) {
             operationPrecision = std::max(operationPrecision, function[arg].type->getQualifier().precision);
         }
         // compute the result precision
@@ -2460,7 +1778,7 @@ TIntermTyped* TParseContext::handleLengthMethod(const TSourceLoc& loc, TFunction
                         error(loc, "", function->getName().c_str(), "array must first be sized by a redeclaration or layout qualifier");
                     else if (isRuntimeLength(*intermNode->getAsTyped())) {
                         // Create a unary op and let the back end handle it
-                        return intermediate.addBuiltInFunctionCall(loc, EOpArrayLength, true, intermNode, function->getType());
+                        return intermediate.addBuiltInFunctionCall(loc, EOpArrayLength, true, intermNode, TType(EbtInt));
                     } else
                         error(loc, "", function->getName().c_str(), "array must be declared with a size before using this method");
                 }
@@ -2475,7 +1793,7 @@ TIntermTyped* TParseContext::handleLengthMethod(const TSourceLoc& loc, TFunction
             length = type.getMatrixCols();
         else if (type.isVector())
             length = type.getVectorSize();
-        else if (type.isCoopMat() || type.isCoopVecNV())
+        else if (type.isCoopMat())
             return intermediate.addBuiltInFunctionCall(loc, EOpArrayLength, true, intermNode, TType(EbtInt));
         else {
             // we should not get here, because earlier semantic checking should have prevented this path
@@ -2504,10 +1822,7 @@ void TParseContext::addInputArgumentConversions(const TFunction& function, TInte
         TIntermTyped* arg = function.getParamCount() == 1 ? arguments->getAsTyped() : (aggregate ? aggregate->getSequence()[i]->getAsTyped() : arguments->getAsTyped());
         if (*function[i].type != arg->getType()) {
             if (function[i].type->getQualifier().isParamInput() &&
-               !function[i].type->isCoopMat() && !function[i].type->isTensorARM() &&
-               // tensor layout/view type declarations don't do conversions, so we can't convert these parameters either
-               (function.getName() != "createTensorLayoutNV") &&
-               (function.getName() != "createTensorViewNV")) {
+               !function[i].type->isCoopMat()) {
                 // In-qualified arguments just need an extra node added above the argument to
                 // convert to the correct type.
                 arg = intermediate.addConversion(EOpFunctionCall, *function[i].type, arg);
@@ -2540,8 +1855,7 @@ TIntermTyped* TParseContext::addOutputArgumentConversions(const TFunction& funct
     // Will there be any output conversions?
     bool outputConversions = false;
     for (int i = 0; i < function.getParamCount(); ++i) {
-        if (*function[i].type != arguments[i]->getAsTyped()->getType() && function[i].type->getQualifier().isParamOutput() &&
-            !function[i].type->isCoopMat()) {
+        if (*function[i].type != arguments[i]->getAsTyped()->getType() && function[i].type->getQualifier().isParamOutput()) {
             outputConversions = true;
             break;
         }
@@ -2634,9 +1948,6 @@ void TParseContext::memorySemanticsCheck(const TSourceLoc& loc, const TFunction&
     const int gl_StorageSemanticsImage    = 0x800;
     const int gl_StorageSemanticsOutput   = 0x1000;
 
-    const int nonRelaxedMemoryOrder = gl_SemanticsAcquire |
-                                      gl_SemanticsRelease |
-                                      gl_SemanticsAcquireRelease;
 
     unsigned int semantics = 0, storageClassSemantics = 0;
     unsigned int semantics2 = 0, storageClassSemantics2 = 0;
@@ -2703,6 +2014,22 @@ void TParseContext::memorySemanticsCheck(const TSourceLoc& loc, const TFunction&
         break;
     }
 
+    if ((semantics & gl_SemanticsAcquire) &&
+        (callNode.getOp() == EOpAtomicStore || callNode.getOp() == EOpImageAtomicStore)) {
+        error(loc, "gl_SemanticsAcquire must not be used with (image) atomic store",
+              fnCandidate.getName().c_str(), "");
+    }
+    if ((semantics & gl_SemanticsRelease) &&
+        (callNode.getOp() == EOpAtomicLoad || callNode.getOp() == EOpImageAtomicLoad)) {
+        error(loc, "gl_SemanticsRelease must not be used with (image) atomic load",
+              fnCandidate.getName().c_str(), "");
+    }
+    if ((semantics & gl_SemanticsAcquireRelease) &&
+        (callNode.getOp() == EOpAtomicStore || callNode.getOp() == EOpImageAtomicStore ||
+         callNode.getOp() == EOpAtomicLoad  || callNode.getOp() == EOpImageAtomicLoad)) {
+        error(loc, "gl_SemanticsAcquireRelease must not be used with (image) atomic load/store",
+              fnCandidate.getName().c_str(), "");
+    }
     if (((semantics | semantics2) & ~(gl_SemanticsAcquire |
                                       gl_SemanticsRelease |
                                       gl_SemanticsAcquireRelease |
@@ -2711,7 +2038,6 @@ void TParseContext::memorySemanticsCheck(const TSourceLoc& loc, const TFunction&
                                       gl_SemanticsVolatile))) {
         error(loc, "Invalid semantics value", fnCandidate.getName().c_str(), "");
     }
-
     if (((storageClassSemantics | storageClassSemantics2) & ~(gl_StorageSemanticsBuffer |
                                                               gl_StorageSemanticsShared |
                                                               gl_StorageSemanticsImage |
@@ -2719,101 +2045,57 @@ void TParseContext::memorySemanticsCheck(const TSourceLoc& loc, const TFunction&
         error(loc, "Invalid storage class semantics value", fnCandidate.getName().c_str(), "");
     }
 
-    if (((semantics & nonRelaxedMemoryOrder) && !IsPow2(semantics & nonRelaxedMemoryOrder)) ||
-        ((semantics2 & nonRelaxedMemoryOrder) && !IsPow2(semantics2 & nonRelaxedMemoryOrder))) {
-        error(loc,
-              "Semantics must not include multiple of gl_SemanticsRelease, gl_SemanticsAcquire, or "
-              "gl_SemanticsAcquireRelease",
+    if (callNode.getOp() == EOpMemoryBarrier) {
+        if (!IsPow2(semantics & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
+            error(loc, "Semantics must include exactly one of gl_SemanticsRelease, gl_SemanticsAcquire, or "
+                       "gl_SemanticsAcquireRelease", fnCandidate.getName().c_str(), "");
+        }
+    } else {
+        if (semantics & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease)) {
+            if (!IsPow2(semantics & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
+                error(loc, "Semantics must not include multiple of gl_SemanticsRelease, gl_SemanticsAcquire, or "
+                           "gl_SemanticsAcquireRelease", fnCandidate.getName().c_str(), "");
+            }
+        }
+        if (semantics2 & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease)) {
+            if (!IsPow2(semantics2 & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
+                error(loc, "semUnequal must not include multiple of gl_SemanticsRelease, gl_SemanticsAcquire, or "
+                           "gl_SemanticsAcquireRelease", fnCandidate.getName().c_str(), "");
+            }
+        }
+    }
+    if (callNode.getOp() == EOpMemoryBarrier) {
+        if (storageClassSemantics == 0) {
+            error(loc, "Storage class semantics must not be zero", fnCandidate.getName().c_str(), "");
+        }
+    }
+    if (callNode.getOp() == EOpBarrier && semantics != 0 && storageClassSemantics == 0) {
+        error(loc, "Storage class semantics must not be zero", fnCandidate.getName().c_str(), "");
+    }
+    if ((callNode.getOp() == EOpAtomicCompSwap || callNode.getOp() == EOpImageAtomicCompSwap) &&
+        (semantics2 & (gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
+        error(loc, "semUnequal must not be gl_SemanticsRelease or gl_SemanticsAcquireRelease",
               fnCandidate.getName().c_str(), "");
     }
-
-    if (((semantics & nonRelaxedMemoryOrder) && !storageClassSemantics) ||
-        ((semantics2 & nonRelaxedMemoryOrder) && !storageClassSemantics2)) {
-        error(loc,
-              "Storage class semantics must not be zero when used with gl_SemanticsRelease, "
-              "gl_SemanticsAcquire, or gl_SemanticsAcquireRelease",
-              fnCandidate.getName().c_str(), "");
-    }
-
-    if ((storageClassSemantics && !(semantics & nonRelaxedMemoryOrder)) ||
-        (storageClassSemantics2 && !(semantics2 & nonRelaxedMemoryOrder))) {
-        error(loc,
-              "Semantics must be gl_SemanticsRelease, gl_SemanticsAcquire, or gl_SemanticsAcquireRelease when used "
-              "with non-zero storage class semantics",
-              fnCandidate.getName().c_str(), "");
-    }
-
-    if (((semantics & gl_SemanticsMakeAvailable) &&
-         !(semantics & (gl_SemanticsRelease | gl_SemanticsAcquireRelease))) ||
-        ((semantics2 & gl_SemanticsMakeAvailable) &&
-         !(semantics2 & (gl_SemanticsRelease | gl_SemanticsAcquireRelease)))) {
+    if ((semantics & gl_SemanticsMakeAvailable) &&
+        !(semantics & (gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
         error(loc, "gl_SemanticsMakeAvailable requires gl_SemanticsRelease or gl_SemanticsAcquireRelease",
               fnCandidate.getName().c_str(), "");
     }
-
-    if (((semantics & gl_SemanticsMakeVisible) && !(semantics & (gl_SemanticsAcquire | gl_SemanticsAcquireRelease))) ||
-        ((semantics2 & gl_SemanticsMakeVisible) &&
-         !(semantics2 & (gl_SemanticsAcquire | gl_SemanticsAcquireRelease)))) {
+    if ((semantics & gl_SemanticsMakeVisible) &&
+        !(semantics & (gl_SemanticsAcquire | gl_SemanticsAcquireRelease))) {
         error(loc, "gl_SemanticsMakeVisible requires gl_SemanticsAcquire or gl_SemanticsAcquireRelease",
               fnCandidate.getName().c_str(), "");
     }
-
-    if ((callNode.getOp() == EOpAtomicStore || callNode.getOp() == EOpImageAtomicStore) &&
-        (semantics & gl_SemanticsAcquire)) {
-        error(loc, "gl_SemanticsAcquire must not be used with (image) atomic store", fnCandidate.getName().c_str(), "");
-    }
-
-    if ((callNode.getOp() == EOpAtomicLoad || callNode.getOp() == EOpImageAtomicLoad) &&
-        (semantics & gl_SemanticsRelease)) {
-        error(loc, "gl_SemanticsRelease must not be used with (image) atomic load", fnCandidate.getName().c_str(), "");
-    }
-
-    if ((callNode.getOp() == EOpAtomicStore || callNode.getOp() == EOpImageAtomicStore ||
-         callNode.getOp() == EOpAtomicLoad || callNode.getOp() == EOpImageAtomicLoad) &&
-        (semantics & gl_SemanticsAcquireRelease)) {
-        error(loc, "gl_SemanticsAcquireRelease must not be used with (image) atomic load/store",
-              fnCandidate.getName().c_str(), "");
-    }
-
-    if (callNode.getOp() == EOpMemoryBarrier &&
-        !(semantics & (gl_SemanticsAcquire | gl_SemanticsRelease | gl_SemanticsAcquireRelease))) {
-        error(loc,
-              "Semantics must include exactly one of gl_SemanticsRelease, gl_SemanticsAcquire, or "
-              "gl_SemanticsAcquireRelease when used with memoryBarrier",
-              fnCandidate.getName().c_str(), "");
-    }
-
-    if ((callNode.getOp() == EOpMemoryBarrier || callNode.getOp() == EOpBarrier) &&
-        (semantics & gl_SemanticsVolatile)) {
+    if ((semantics & gl_SemanticsVolatile) &&
+        (callNode.getOp() == EOpMemoryBarrier || callNode.getOp() == EOpBarrier)) {
         error(loc, "gl_SemanticsVolatile must not be used with memoryBarrier or controlBarrier",
               fnCandidate.getName().c_str(), "");
     }
-
-    if (callNode.getOp() == EOpAtomicCompSwap || callNode.getOp() == EOpImageAtomicCompSwap) {
-        if (semantics2 & (gl_SemanticsRelease | gl_SemanticsAcquireRelease)) {
-            error(loc, "semUnequal must not be gl_SemanticsRelease or gl_SemanticsAcquireRelease",
-                  fnCandidate.getName().c_str(), "");
-        }
-        if ((semantics2 & gl_SemanticsAcquire) && !(semantics & (gl_SemanticsAcquire | gl_SemanticsAcquireRelease))) {
-            error(loc,
-                  "semUnequal must not be gl_SemanticsAcquire unless semEqual is gl_SemanticsAcquire "
-                  "or gl_SemanticsAcquireRelease",
-                  fnCandidate.getName().c_str(), "");
-        }
-        if ((semantics2 & gl_SemanticsMakeVisible) && !(semantics & gl_SemanticsMakeVisible)) {
-            error(loc,
-                  "semUnequal must not include gl_SemanticsMakeVisible unless semEqual also includes "
-                  "gl_SemanticsMakeVisible",
-                  fnCandidate.getName().c_str(), "");
-        }
-        if (storageClassSemantics2 & ~(storageClassSemantics)) {
-            error(loc, "semStorageUnequal must not include any option that is not present in semStorageEqual",
-                  fnCandidate.getName().c_str(), "");
-        }
-        if ((semantics ^ semantics2) & gl_SemanticsVolatile) {
-            error(loc, "semEqual and semUnequal must either both include gl_SemanticsVolatile or neither",
-                  fnCandidate.getName().c_str(), "");
-        }
+    if ((callNode.getOp() == EOpAtomicCompSwap || callNode.getOp() == EOpImageAtomicCompSwap) &&
+        ((semantics ^ semantics2) & gl_SemanticsVolatile)) {
+        error(loc, "semEqual and semUnequal must either both include gl_SemanticsVolatile or neither",
+              fnCandidate.getName().c_str(), "");
     }
 }
 
@@ -2843,19 +2125,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
 
     TString featureString;
     const char* feature = nullptr;
-
-    auto checkConstantArgWithLocation = [&](int argIndex, const char* argDescription,
-                                                       const char* errMsg, int ioRTLocationSet) {
-        //ioRTLocationSet refers to grouping of locations of RT input/outputs as defined in TIntermediate::usedIoRT
-        if (!(*argp)[argIndex]->getAsConstantUnion()) {
-            error(loc, "argument must be compile-time constant", argDescription, argIndex == 10 ? "a" : "");
-        } else if (ioRTLocationSet >= 0) {
-            unsigned int location = (*argp)[argIndex]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
-            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(ioRTLocationSet, location) < 0)
-                error(loc, "with layout(location =", errMsg, "%d)", location);
-        }
-    };
-
     switch (callNode.getOp()) {
     case EOpTextureGather:
     case EOpTextureGatherOffset:
@@ -2869,27 +2138,23 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
         feature = featureString.c_str();
         profileRequires(loc, EEsProfile, 310, nullptr, feature);
         int compArg = -1;  // track which argument, if any, is the constant component argument
-        const int numTexGatherExts = 3;
-        const char* texGatherExts[numTexGatherExts] = { E_GL_ARB_texture_gather,
-                                                        E_GL_ARB_gpu_shader5,
-                                                        E_GL_NV_gpu_shader5};
         switch (callNode.getOp()) {
         case EOpTextureGather:
             // More than two arguments needs gpu_shader5, and rectangular or shadow needs gpu_shader5,
             // otherwise, need GL_ARB_texture_gather.
             if (fnCandidate.getParamCount() > 2 || fnCandidate[0].type->getSampler().dim == EsdRect || fnCandidate[0].type->getSampler().shadow) {
-                profileRequires(loc, ~EEsProfile, 400, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, feature);
+                profileRequires(loc, ~EEsProfile, 400, E_GL_ARB_gpu_shader5, feature);
                 if (! fnCandidate[0].type->getSampler().shadow)
                     compArg = 2;
             } else
-                profileRequires(loc, ~EEsProfile, 400, numTexGatherExts, texGatherExts, feature);
+                profileRequires(loc, ~EEsProfile, 400, E_GL_ARB_texture_gather, feature);
             break;
         case EOpTextureGatherOffset:
             // GL_ARB_texture_gather is good enough for 2D non-shadow textures with no component argument
             if (fnCandidate[0].type->getSampler().dim == Esd2D && ! fnCandidate[0].type->getSampler().shadow && fnCandidate.getParamCount() == 3)
-                profileRequires(loc, ~EEsProfile, 400, numTexGatherExts, texGatherExts, feature);
+                profileRequires(loc, ~EEsProfile, 400, E_GL_ARB_texture_gather, feature);
             else
-                profileRequires(loc, ~EEsProfile, 400, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, feature);
+                profileRequires(loc, ~EEsProfile, 400, E_GL_ARB_gpu_shader5, feature);
             if (! (*argp)[fnCandidate[0].type->getSampler().shadow ? 3 : 2]->getAsConstantUnion())
                 profileRequires(loc, EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5,
                                 "non-constant offset argument");
@@ -2897,13 +2162,11 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
                 compArg = 3;
             break;
         case EOpTextureGatherOffsets:
-            profileRequires(loc, ~EEsProfile, 400, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, feature);
+            profileRequires(loc, ~EEsProfile, 400, E_GL_ARB_gpu_shader5, feature);
             if (! fnCandidate[0].type->getSampler().shadow)
                 compArg = 3;
             // check for constant offsets
-            if (! (*argp)[fnCandidate[0].type->getSampler().shadow ? 3 : 2]->getAsConstantUnion()
-                // NV_gpu_shader5 relaxes this limitation and allows for non-constant offsets
-                && !extensionTurnedOn(E_GL_NV_gpu_shader5))
+            if (! (*argp)[fnCandidate[0].type->getSampler().shadow ? 3 : 2]->getAsConstantUnion())
                 error(loc, "must be a compile-time constant:", feature, "offsets argument");
             break;
         default:
@@ -3042,34 +2305,18 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
     case EOpTextureProjLodOffset:
     case EOpTextureGradOffset:
     case EOpTextureProjGradOffset:
-    case EOpSparseTextureOffset:
-    case EOpSparseTextureFetchOffset:
-    case EOpSparseTextureLodOffset:
-    case EOpSparseTextureGradOffset:
     {
         // Handle texture-offset limits checking
         // Pick which argument has to hold constant offsets
         int arg = -1;
         switch (callNode.getOp()) {
-        case EOpSparseTextureOffset:
-        case EOpTextureOffset:
-        case EOpTextureProjOffset:
-            arg = 2;
-            break;
-        case EOpSparseTextureLodOffset:
-        case EOpTextureLodOffset:
-        case EOpTextureProjLodOffset:
-            arg = 3;
-            break;
-        case EOpSparseTextureGradOffset:
-        case EOpTextureGradOffset:
-        case EOpTextureProjGradOffset:
-            arg = 4;
-            break;
-        case EOpSparseTextureFetchOffset:
-        case EOpTextureFetchOffset:
-            arg = (arg0->getType().getSampler().isRect()) ? 2 : 3;
-            break;
+        case EOpTextureOffset:          arg = 2;  break;
+        case EOpTextureFetchOffset:     arg = (arg0->getType().getSampler().isRect()) ? 2 : 3; break;
+        case EOpTextureProjOffset:      arg = 2;  break;
+        case EOpTextureLodOffset:       arg = 3;  break;
+        case EOpTextureProjLodOffset:   arg = 3;  break;
+        case EOpTextureGradOffset:      arg = 4;  break;
+        case EOpTextureProjGradOffset:  arg = 4;  break;
         default:
             assert(0);
             break;
@@ -3081,17 +2328,8 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
                                     arg0->getType().getSampler().shadow;
             if (f16ShadowCompare)
                 ++arg;
-            // Allow non-constant offsets for certain texture ops
-            bool variableOffsetSupport = extensionTurnedOn(E_GL_NV_gpu_shader5) && 
-                (callNode.getOp() == EOpTextureOffset || 
-                 callNode.getOp() == EOpTextureFetchOffset ||
-                 callNode.getOp() == EOpTextureProjOffset || 
-                 callNode.getOp() == EOpTextureLodOffset ||
-                 callNode.getOp() == EOpTextureProjLodOffset);
-            if (! (*argp)[arg]->getAsTyped()->getQualifier().isConstant()) {
-				if (!extensionTurnedOn(E_GL_EXT_texture_offset_non_const) && !variableOffsetSupport)
-                    error(loc, "argument must be compile-time constant", "texel offset", "");
-            }
+            if (! (*argp)[arg]->getAsTyped()->getQualifier().isConstant())
+                error(loc, "argument must be compile-time constant", "texel offset", "");
             else if ((*argp)[arg]->getAsConstantUnion()) {
                 const TType& type = (*argp)[arg]->getAsTyped()->getType();
                 for (int c = 0; c < type.getVectorSize(); ++c) {
@@ -3102,13 +2340,11 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
                 }
             }
 
-            // This check does not apply to sparse because
-            // GL_ARB_sparse_texture2 always includes this function.
             if (callNode.getOp() == EOpTextureOffset) {
                 TSampler s = arg0->getType().getSampler();
                 if (s.is2D() && s.isArrayed() && s.isShadow()) {
                     if (
-                        ((*argp)[1]->getAsTyped()->getType().getBasicType() == EbtFloat) &&
+                        ((*argp)[1]->getAsTyped()->getType().getBasicType() == EbtFloat) && 
                         ((*argp)[1]->getAsTyped()->getType().getVectorSize() == 4) &&
                         (fnCandidate.getParamCount() == 4)) {
                         featureString = fnCandidate.getName() + " for sampler2DArrayShadow";
@@ -3124,9 +2360,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
                 }
             }
 
-            // This check does not apply to sparse because
-            // GL_ARB_sparse_texture2 does not define sparseTextureLodOffsetARB
-            // with a sampler2DArrayShadow.
             if (callNode.getOp() == EOpTextureLodOffset) {
                 TSampler s = arg0->getType().getSampler();
                 if (s.is2D() && s.isArrayed() && s.isShadow() &&
@@ -3145,46 +2378,108 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
         break;
     }
 
-
     case EOpTraceNV:
-        checkConstantArgWithLocation(10, "payload number", nullptr, -1);
+        if (!(*argp)[10]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "a");
         break;
     case EOpTraceRayMotionNV:
-        checkConstantArgWithLocation(11, "payload number", nullptr, -1);
+        if (!(*argp)[11]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "a");
         break;
     case EOpTraceKHR:
-        checkConstantArgWithLocation(10, "payload number", "no rayPayloadEXT/rayPayloadInEXT declared", 0);
+        if (!(*argp)[10]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "a");
+        else {
+            unsigned int location = (*argp)[10]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(0, location) < 0)
+                error(loc, "with layout(location =", "no rayPayloadEXT/rayPayloadInEXT declared", "%d)", location);
+        }
         break;
     case EOpExecuteCallableNV:
-        checkConstantArgWithLocation(1, "callable data number", nullptr, -1);
+        if (!(*argp)[1]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "callable data number", "");
         break;
     case EOpExecuteCallableKHR:
-        checkConstantArgWithLocation(1, "callable data number", "no callableDataEXT/callableDataInEXT declared", 1);
+        if (!(*argp)[1]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "callable data number", "");
+        else {
+            unsigned int location = (*argp)[1]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(1, location) < 0)
+                error(loc, "with layout(location =", "no callableDataEXT/callableDataInEXT declared", "%d)", location);
+        }
         break;
 
     case EOpHitObjectTraceRayNV:
-        checkConstantArgWithLocation(11, "payload number", "no rayPayloadEXT/rayPayloadInEXT declared", 0);
+        if (!(*argp)[11]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "");
+        else {
+            unsigned int location = (*argp)[11]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(0, location) < 0)
+                error(loc, "with layout(location =", "no rayPayloadEXT/rayPayloadInEXT declared", "%d)", location);
+        }
         break;
     case EOpHitObjectTraceRayMotionNV:
-        checkConstantArgWithLocation(12, "payload number", "no rayPayloadEXT/rayPayloadInEXT declared", 0);
+        if (!(*argp)[12]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "");
+        else {
+            unsigned int location = (*argp)[12]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(0, location) < 0)
+                error(loc, "with layout(location =", "no rayPayloadEXT/rayPayloadInEXT declared", "%d)", location);
+        }
         break;
     case EOpHitObjectExecuteShaderNV:
-        checkConstantArgWithLocation(1, "payload number", "no rayPayloadEXT/rayPayloadInEXT declared", 0);
+        if (!(*argp)[1]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "payload number", "");
+        else {
+            unsigned int location = (*argp)[1]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(0, location) < 0)
+                error(loc, "with layout(location =", "no rayPayloadEXT/rayPayloadInEXT declared", "%d)", location);
+        }
         break;
     case EOpHitObjectRecordHitNV:
-        checkConstantArgWithLocation(12, "hitobjectattribute number", "no hitObjectAttributeNV declared", 2);
+        if (!(*argp)[12]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "hitobjectattribute number", "");
+        else {
+            unsigned int location = (*argp)[12]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(2, location) < 0)
+                error(loc, "with layout(location =", "no hitObjectAttributeNV declared", "%d)", location);
+        }
         break;
     case EOpHitObjectRecordHitMotionNV:
-        checkConstantArgWithLocation(13, "hitobjectattribute number", "no hitObjectAttributeNV declared", 2);
+        if (!(*argp)[13]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "hitobjectattribute number", "");
+        else {
+            unsigned int location = (*argp)[13]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(2, location) < 0)
+                error(loc, "with layout(location =", "no hitObjectAttributeNV declared", "%d)", location);
+        }
         break;
     case EOpHitObjectRecordHitWithIndexNV:
-        checkConstantArgWithLocation(11, "hitobjectattribute number", "no hitObjectAttributeNV declared", 2);
+        if (!(*argp)[11]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "hitobjectattribute number", "");
+        else {
+            unsigned int location = (*argp)[11]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(2, location) < 0)
+                error(loc, "with layout(location =", "no hitObjectAttributeNV declared", "%d)", location);
+        }
         break;
     case EOpHitObjectRecordHitWithIndexMotionNV:
-        checkConstantArgWithLocation(12, "hitobjectattribute number", "no hitObjectAttributeNV declared", 2);
+        if (!(*argp)[12]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "hitobjectattribute number", "");
+        else {
+            unsigned int location = (*argp)[12]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(2, location) < 0)
+                error(loc, "with layout(location =", "no hitObjectAttributeNV declared", "%d)", location);
+        }
         break;
     case EOpHitObjectGetAttributesNV:
-        checkConstantArgWithLocation(1, "hitobjectattribute number", "no hitObjectAttributeNV declared", 2);
+        if (!(*argp)[1]->getAsConstantUnion())
+            error(loc, "argument must be compile-time constant", "hitobjectattribute number", "");
+        else {
+            unsigned int location = (*argp)[1]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+            if (!extensionTurnedOn(E_GL_EXT_spirv_intrinsics) && intermediate.checkLocationRT(2, location) < 0)
+                error(loc, "with layout(location =", "no hitObjectAttributeNV declared", "%d)", location);
+        }
         break;
 
     case EOpRayQueryGetIntersectionType:
@@ -3201,12 +2496,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
     case EOpRayQueryGetIntersectionObjectToWorld:
     case EOpRayQueryGetIntersectionWorldToObject:
     case EOpRayQueryGetIntersectionTriangleVertexPositionsEXT:
-    case EOpRayQueryGetIntersectionClusterIdNV:
-    case EOpRayQueryGetIntersectionSpherePositionNV:
-    case EOpRayQueryGetIntersectionSphereRadiusNV:
-    case EOpRayQueryGetIntersectionLSSHitValueNV:
-    case EOpRayQueryGetIntersectionLSSPositionsNV:
-    case EOpRayQueryGetIntersectionLSSRadiiNV:
         if (!(*argp)[1]->getAsConstantUnion())
             error(loc, "argument must be compile-time constant", "committed", "");
         break;
@@ -3239,7 +2528,7 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
                 error(loc, "only supported on image with format r64i", fnCandidate.getName().c_str(), "");
             else if (callNode.getType().getBasicType() == EbtUint64 && imageType.getQualifier().getFormat() != ElfR64ui)
                 error(loc, "only supported on image with format r64ui", fnCandidate.getName().c_str(), "");
-        } else if(callNode.getType().getBasicType() == EbtFloat16 &&
+        } else if(callNode.getType().getBasicType() == EbtFloat16 && 
                 ((callNode.getType().getVectorSize() == 2 && arg0->getType().getQualifier().getFormat() == ElfRg16f) ||
                   (callNode.getType().getVectorSize() == 4 && arg0->getType().getQualifier().getFormat() == ElfRgba16f))) {
             if (StartsWith(fnCandidate.getName(), "imageAtomicAdd") ||
@@ -3310,7 +2599,7 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
             requireExtensions(loc, 2, extensions, fnCandidate.getName().c_str());
         } else if ((callNode.getOp() == EOpAtomicAdd || callNode.getOp() == EOpAtomicExchange ||
                     callNode.getOp() == EOpAtomicMin || callNode.getOp() == EOpAtomicMax) &&
-                   arg0->getType().getBasicType() == EbtFloat16 &&
+                   arg0->getType().getBasicType() == EbtFloat16 && 
                    (arg0->getType().getVectorSize() == 2 || arg0->getType().getVectorSize() == 4 )) {
             requireExtensions(loc, 1, &E_GL_NV_shader_atomic_fp16_vector, fnCandidate.getName().c_str());
         } else if ((callNode.getOp() == EOpAtomicAdd || callNode.getOp() == EOpAtomicExchange) &&
@@ -3415,7 +2704,7 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
     case EOpEmitStreamVertex:
     case EOpEndStreamPrimitive:
         if (version == 150)
-            requireExtensions(loc, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, "if the verison is 150 , the EmitStreamVertex and EndStreamPrimitive only support at extension GL_ARB_gpu_shader5/GL_NV_gpu_shader5");
+            requireExtensions(loc, 1, &E_GL_ARB_gpu_shader5, "if the verison is 150 , the EmitStreamVertex and EndStreamPrimitive only support at extension GL_ARB_gpu_shader5");
         intermediate.setMultiStream();
         break;
 
@@ -3479,86 +2768,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
         }
 
         break;
-    case EOpLessThan:
-    case EOpLessThanEqual:
-    case EOpGreaterThan:
-    case EOpGreaterThanEqual:
-    case EOpEqual:
-    case EOpNotEqual:
-        if (profile != EEsProfile && version >= 150 && version < 450) {
-            if ((*argp)[1]->getAsTyped()->getBasicType() == EbtInt64 ||                 
-                (*argp)[1]->getAsTyped()->getBasicType() == EbtUint64)
-                requireExtensions(loc, 1, &E_GL_NV_gpu_shader5, fnCandidate.getName().c_str());
-        }
-    break;
-    case EOpFma:
-    case EOpFrexp:
-    case EOpLdexp:
-        if (profile != EEsProfile && version < 400) {
-            if ((*argp)[0]->getAsTyped()->getBasicType() == EbtFloat) {
-                requireExtensions(loc, Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, fnCandidate.getName().c_str());
-            }
-        }
-
-        break;
-    case EOpCooperativeVectorMatMulNV:
-    case EOpCooperativeVectorMatMulAddNV:
-        {
-            int inputInterpIdx = 2;
-            int matrixInterpIdx = 5;
-            int biasInterpIdx = 8;
-            int MIdx = callNode.getOp() == EOpCooperativeVectorMatMulAddNV ? 9 : 6;
-            int KIdx = callNode.getOp() == EOpCooperativeVectorMatMulAddNV ? 10 : 7;
-            int matrixLayoutIdx = callNode.getOp() == EOpCooperativeVectorMatMulAddNV ? 11 : 8;
-            int transposeIdx = callNode.getOp() == EOpCooperativeVectorMatMulAddNV ? 12 : 9;
-
-            if (!(*argp)[inputInterpIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "inputInterpretation", "");
-            if (!(*argp)[matrixInterpIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "matrixInterpretation", "");
-            if (callNode.getOp() == EOpCooperativeVectorMatMulAddNV) {
-                if (!(*argp)[biasInterpIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                    error(loc, "argument must be compile-time constant", "biasInterpretation", "");
-            }
-            if (!(*argp)[MIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "M", "");
-            if (!(*argp)[KIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "K", "");
-            if (!(*argp)[matrixLayoutIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "matrixLayout", "");
-            if (!(*argp)[transposeIdx]->getAsTyped()->getType().getQualifier().isConstant())
-                error(loc, "argument must be compile-time constant", "transpose", "");
-        }
-        break;
-    case EOpCooperativeVectorOuterProductAccumulateNV:
-        if (!(*argp)[5]->getAsTyped()->getType().getQualifier().isConstant())
-            error(loc, "argument must be compile-time constant", "matrixLayout", "");
-        if (!(*argp)[6]->getAsTyped()->getType().getQualifier().isConstant())
-            error(loc, "argument must be compile-time constant", "matrixInterpretation", "");
-        break;
-
-    case EOpCooperativeMatrixLoad:
-    case EOpCooperativeMatrixLoadNV:
-    case EOpCooperativeMatrixLoadTensorNV:
-    case EOpCooperativeMatrixStore:
-    case EOpCooperativeMatrixStoreNV:
-    case EOpCooperativeMatrixStoreTensorNV:
-    {
-        const TIntermTyped *arg1 = (*argp)[1]->getAsTyped();
-        const TIntermTyped* base = TIntermediate::traverseLValueBase(arg1, true, true);
-        const char* errMsg = "Only l-values corresponding to storage block or shared variables can be used with "
-                             "cooperative matrix load/store functions.";
-        if (base) {
-            const TType* refType = (base->getType().isReference()) ? base->getType().getReferentType() : nullptr;
-            const TQualifier& qualifier =
-                (refType != nullptr) ? refType->getQualifier() : base->getType().getQualifier();
-            if (qualifier.storage != EvqShared && qualifier.storage != EvqBuffer)
-                error(loc, errMsg, fnCandidate.getName().c_str(), "");
-        } else {
-            error(loc, errMsg, fnCandidate.getName().c_str(), "");
-        }
-    }
-    break;
 
     default:
         break;
@@ -3585,102 +2794,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
         break;
     }
 
-    case EOpConstructSaturated:
-    {
-        auto &sequence = callNode.getAsAggregate()->getSequence();
-        if (sequence.size() != 2) {
-            error(loc, "requires exactly two parameters", "", "");
-        }
-        auto &op0Type = sequence[0]->getAsTyped()->getType();
-        auto &op1Type = sequence[1]->getAsTyped()->getType();
-        if (op0Type.getBasicType() != EbtFloatE5M2 && op0Type.getBasicType() != EbtFloatE4M3) {
-            error(loc, "first parameter must have floate5m2 or floate4m3 basic type", "", "");
-        }
-        if (op1Type.getBasicType() == EbtFloatE5M2 || op1Type.getBasicType() == EbtFloatE4M3) {
-            error(loc, "second parameter must not have floate5m2 or floate4m3 basic type", "", "");
-        }
-
-        if (!(op0Type.isScalar() || op0Type.isVector() || op0Type.isCoopMatKHR())) {
-            error(loc, "first parameter must be scalar, vector, or cooperative matrix", "", "");
-        }
-        if (!(op1Type.isScalar() || op1Type.isVector() || op1Type.isCoopMatKHR())) {
-            error(loc, "second parameter must be scalar, vector, or cooperative matrix", "", "");
-        }
-        if (!(op0Type.sameElementShape(op1Type) || op0Type.sameCoopMatShape(op1Type))) {
-            error(loc, "types must match other than scalar type and coopmat Use", "", "");
-        }
-        break;
-    }
-    case EOpTensorReadARM:
-    case EOpTensorWriteARM:
-    {
-        const TType &tensorType = (*argp)[0]->getAsTyped()->getType();
-
-        // Check that coordinates argument length matches rank of tensor argument.
-        int tensorRank = tensorType.getTensorRankARM();
-        const TArraySizes *coordArgArrayTy = (*argp)[1]->getAsTyped()->getType().getArraySizes();
-        assert(coordArgArrayTy->getNumDims() == 1 && "expecting 1D coordinate array");
-        if (coordArgArrayTy->getDimSize(0) != tensorRank) {
-            error(loc, "number of coordinates does not match tensor rank", "coord", "");
-        }
-
-        // Check that tensor element type matches data argument.
-        TBasicType eltTy = tensorType.getBasicType();
-        TBasicType argTy = (*argp)[2]->getAsTyped()->getType().getBasicType();
-        if (eltTy != argTy) {
-            error(loc, "", "data", "data argument type (%s) does not match tensor element type (%s)",
-                  TType::getBasicString(argTy), TType::getBasicString(eltTy));
-        }
-
-        // Check optional tensor operands.
-        if (argp->size() > 3) {
-            const TIntermConstantUnion* opArg = (*argp)[3]->getAsConstantUnion();
-            if (!opArg) {
-                error(loc, "tensor operands argument must be a constant integral expression", "tensorOps", "");
-            }
-            const unsigned int ops = opArg ? opArg->getConstArray()[0].getUConst() : 0;
-            const int gl_TensorOperandsOutOfBoundsValueARM = 0x2;
-            if (ops & gl_TensorOperandsOutOfBoundsValueARM) {
-                // Out-of-bounds values can only be used with reads.
-                if (callNode.getOp() != EOpTensorReadARM) {
-                    error(loc, "out-of-bounds value is only valid with tensorReadARM", "tensorOps", "");
-                }
-                // Check that an out-of-bounds value is present.
-                if (argp->size() == 4) {
-                    error(loc, "expecting out-of-bounds value as next argument", "tensorOps", "");
-                } else {
-                    // Check constantness of out-of-bounds value.
-                    const TIntermConstantUnion* oobArg = (*argp)[4]->getAsConstantUnion();
-                    if (!oobArg) {
-                        error(loc, "argument following gl_TensorOperandsOutOfBoundsValueARM must be constant", "vararg",
-                              "");
-                    } else if (oobArg->getType().getBasicType() != tensorType.getBasicType()) {
-                        // The type of the OOB value does not match the tensor type.
-                        error(loc, "", "vararg",
-                            "out-of-bounds value type (%s) does not match tensor element type (%s)",
-                            TType::getBasicString(oobArg->getBasicType()), TType::getBasicString(eltTy));
-
-                    }
-                }
-            }
-        }
-        break;
-    }
-
-    case EOpTensorSizeARM:
-    {
-        unsigned int tensorRank = (*argp)[0]->getAsTyped()->getType().getTensorRankARM();
-        const TIntermConstantUnion *dimArg = (*argp)[1]->getAsConstantUnion();
-        if (dimArg) {
-            if (dimArg->getConstArray()[0].getUConst() >= tensorRank) {
-                error(loc, "dimension argument exceeds tensor rank", "dim", "");
-            }
-        } else {
-            error(loc, "dimension argument must be constant", "dim", "");
-        }
-        break;
-    }
-
     default:
         break;
     }
@@ -3766,7 +2879,7 @@ void TParseContext::nonOpBuiltInCheck(const TSourceLoc& loc, const TFunction& fn
                     compArg = 3;
                 // check for constant offsets
                 int offsetArg = fnCandidate[0].type->getSampler().shadow ? 3 : 2;
-                if (! callNode.getSequence()[offsetArg]->getAsConstantUnion() && !extensionTurnedOn(E_GL_NV_gpu_shader5))
+                if (! callNode.getSequence()[offsetArg]->getAsConstantUnion())
                     error(loc, "must be a compile-time constant:", feature, "offsets argument");
             } else if (fnCandidate.getName().compare("textureGather") == 0) {
                 // More than two arguments needs gpu_shader5, and rectangular or shadow needs gpu_shader5,
@@ -3809,10 +2922,8 @@ void TParseContext::nonOpBuiltInCheck(const TSourceLoc& loc, const TFunction& fn
                     arg = 4;
 
                 if (arg > 0) {
-                    if (! callNode.getSequence()[arg]->getAsConstantUnion()) {
-                        if (!extensionTurnedOn(E_GL_EXT_texture_offset_non_const))
-                            error(loc, "argument must be compile-time constant", "texel offset", "");
-                    }
+                    if (! callNode.getSequence()[arg]->getAsConstantUnion())
+                        error(loc, "argument must be compile-time constant", "texel offset", "");
                     else {
                         const TType& type = callNode.getSequence()[arg]->getAsTyped()->getType();
                         for (int c = 0; c < type.getVectorSize(); ++c) {
@@ -4155,21 +3266,6 @@ void TParseContext::integerCheck(const TIntermTyped* node, const char* token)
     error(node->getLoc(), "scalar integer expression required", token, "");
 }
 
-//
-// Both test, and if necessary spit out an error, to see if the node is really
-// supported as an array index.
-//
-void TParseContext::arrayIndexCheck(const TIntermTyped* node, const char* token)
-{
-    auto from_type = node->getBasicType();
-
-    if ((from_type == EbtInt64 || from_type == EbtUint64) &&
-        extensionTurnedOn(E_GL_EXT_shader_64bit_indexing))
-        return;
-
-    integerCheck(node, token);
-}
-
 //
 // Both test, and if necessary spit out an error, to see if we are currently
 // globally scoped.
@@ -4517,19 +3613,6 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
                 makeSpecConst = ! intArgument && !type.isArray();
                 break;
 
-            case EOpConstructCooperativeMatrixNV:
-            case EOpConstructCooperativeMatrixKHR:
-            case EOpConstructStruct:
-                {
-                    const char *specConstantCompositeExt[] = { E_GL_EXT_spec_constant_composites };
-                    if (checkExtensionsRequested(loc, 1, specConstantCompositeExt, "spec constant aggregate constructor")) {
-                        makeSpecConst = true;
-                    } else {
-                        makeSpecConst = false;
-                    }
-                }
-                break;
-
             default:
                 // anything else wasn't white-listed in the spec as a conversion
                 makeSpecConst = false;
@@ -4628,8 +3711,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
 
     TIntermTyped* typed = node->getAsTyped();
     if (type.isCoopMat() && typed->getType().isCoopMat() &&
-        ((extensionTurnedOn(E_GL_NV_cooperative_matrix2) && !type.sameCoopMatShape(typed->getType())) ||
-         (!extensionTurnedOn(E_GL_NV_cooperative_matrix2) && !type.sameCoopMatShapeAndUse(typed->getType())))) {
+        !type.sameCoopMatShapeAndUse(typed->getType())) {
         error(loc, "Cooperative matrix type parameters mismatch", constructorString.c_str(), "");
         return true;
     }
@@ -4711,16 +3793,10 @@ bool TParseContext::constructorTextureSamplerError(const TSourceLoc& loc, const
         error(loc, "sampler-constructor first argument must be a scalar *texture* type", token, "");
         return true;
     }
-
     // simulate the first argument's impact on the result type, so it can be compared with the encapsulated operator!=()
     TSampler texture = function.getType().getSampler();
     texture.setCombined(false);
     texture.shadow = false;
-    if (function[0].type->getSampler().isTileAttachmentQCOM()) {
-      //TSampler& texture = const_cast<TFunction&>(function).getWritableType().getSampler();
-      texture.image = true;
-      texture.tileQCOM = true;
-    }
     if (texture != function[0].type->getSampler()) {
         error(loc, "sampler-constructor first argument must be a *texture* type"
                    " matching the dimensionality and sampled type of the constructor", token, "");
@@ -4812,13 +3888,10 @@ void TParseContext::samplerCheck(const TSourceLoc& loc, const TType& type, const
             // if (! initializer)
             if (type.getSampler().isAttachmentEXT() && type.getQualifier().storage != EvqTileImageEXT)
                  error(loc, "can only be used in tileImageEXT variables or function parameters:", type.getBasicTypeString().c_str(), identifier.c_str());
-            else if (type.getQualifier().storage != EvqTileImageEXT)
+             else if (type.getQualifier().storage != EvqTileImageEXT)
                  error(loc, "sampler/image types can only be used in uniform variables or function parameters:", type.getBasicTypeString().c_str(), identifier.c_str());
         }
     }
-    else if (type.isTensorARM() && type.getQualifier().storage != EvqUniform) {
-        error(loc, "tensorARM types can only be used in uniform variables or function parameters:", "tensorARM", identifier.c_str());
-    }
 }
 
 void TParseContext::atomicUintCheck(const TSourceLoc& loc, const TType& type, const TString& identifier)
@@ -4845,29 +3918,6 @@ void TParseContext::accStructCheck(const TSourceLoc& loc, const TType& type, con
 
 }
 
-void TParseContext::hitObjectEXTCheck(const TSourceLoc & loc, const TType & type, const TString & identifier)
-{
-    if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtHitObjectEXT)) {
-        error(loc, "struct is not allowed to contain hitObjectEXT:", type.getTypeName().c_str(), identifier.c_str());
-    } else if (type.getBasicType() == EbtHitObjectEXT) {
-        TStorageQualifier qualifier = type.getQualifier().storage;
-        if (qualifier != EvqGlobal && qualifier != EvqTemporary) {
-            error(loc, "hitObjectEXT can only be declared in global or function scope with no storage qualifier:", "hitObjectEXT", identifier.c_str());
-        }
-    }
-}
-void TParseContext::hitObjectNVCheck(const TSourceLoc & loc, const TType & type, const TString & identifier)
-{
-    if (type.getBasicType() == EbtStruct && ( containsFieldWithBasicType(type, EbtHitObjectNV))) {
-        error(loc, "struct is not allowed to contain hitObjectNV:", type.getTypeName().c_str(), identifier.c_str());
-    } else if ((type.getBasicType() == EbtHitObjectNV)) {
-        TStorageQualifier qualifier = type.getQualifier().storage;
-        if (qualifier != EvqGlobal && qualifier != EvqTemporary) {
-            error(loc, "hitObjectNV can only be declared in global or function scope with no storage qualifier:", "hitObjectNV", identifier.c_str());
-        }
-    }
-}
-
 void TParseContext::transparentOpaqueCheck(const TSourceLoc& loc, const TType& type, const TString& identifier)
 {
     if (parsingBuiltins)
@@ -4897,10 +3947,6 @@ void TParseContext::memberQualifierCheck(glslang::TPublicType& publicType)
         error(publicType.loc, "not allowed on block or structure members", "nonuniformEXT", "");
         publicType.qualifier.nonUniform = false;
     }
-    if (publicType.qualifier.isPatch()) {
-        error(publicType.loc, "not allowed on block or structure members",
-              "patch", "");
-    }
 }
 
 //
@@ -4986,7 +4032,7 @@ void TParseContext::globalQualifierTypeCheck(const TSourceLoc& loc, const TQuali
     if (! symbolTable.atGlobalLevel())
         return;
 
-    if (!(publicType.userDef && publicType.userDef->isReference()) && !publicType.isTensorARM() && !parsingBuiltins) {
+    if (!(publicType.userDef && publicType.userDef->isReference()) && !parsingBuiltins) {
         if (qualifier.isMemoryQualifierImageAndSSBOOnly() && ! publicType.isImage() && publicType.qualifier.storage != EvqBuffer) {
             error(loc, "memory qualifiers cannot be used on this type", "", "");
         } else if (qualifier.isMemory() && (publicType.basicType != EbtSampler) && !publicType.qualifier.isUniformOrBuffer()) {
@@ -5012,6 +4058,11 @@ void TParseContext::globalQualifierTypeCheck(const TSourceLoc& loc, const TQuali
 
     // now, knowing it is a shader in/out, do all the in/out semantic checks
 
+    if (publicType.basicType == EbtBool && !parsingBuiltins) {
+        error(loc, "cannot be bool", GetStorageQualifierString(qualifier.storage), "");
+        return;
+    }
+
     if (isTypeInt(publicType.basicType) || publicType.basicType == EbtDouble) {
         profileRequires(loc, EEsProfile, 300, nullptr, "non-float shader input/output");
         profileRequires(loc, ~EEsProfile, 130, nullptr, "non-float shader input/output");
@@ -5036,12 +4087,6 @@ void TParseContext::globalQualifierTypeCheck(const TSourceLoc& loc, const TQuali
     if (qualifier.isPatch() && qualifier.isInterpolation())
         error(loc, "cannot use interpolation qualifiers with patch", "patch", "");
 
-    // Only "patch in" is supported via GL_NV_gpu_shader5
-    if (! symbolTable.atBuiltInLevel() && qualifier.isPatch() && 
-        (language == EShLangGeometry) && qualifier.storage != EvqVaryingIn &&
-        extensionTurnedOn(E_GL_NV_gpu_shader5))
-            error(loc, "only 'patch in' is supported in this stage:", "patch", "geometry");
-
     if (qualifier.isTaskPayload() && publicType.basicType == EbtBlock)
         error(loc, "taskPayloadSharedEXT variables should not be declared as interface blocks", "taskPayloadSharedEXT", "");
 
@@ -5059,11 +4104,8 @@ void TParseContext::globalQualifierTypeCheck(const TSourceLoc& loc, const TQuali
                 requireProfile(loc, ~EEsProfile, "vertex input arrays");
                 profileRequires(loc, ENoProfile, 150, nullptr, "vertex input arrays");
             }
-            if (publicType.basicType == EbtDouble) {
-            	const char* const float64_attrib[] = {E_GL_NV_gpu_shader5, E_GL_ARB_vertex_attrib_64bit};
-                const int Num_float64_attrib = sizeof(float64_attrib) / sizeof(float64_attrib[0]);        
-                profileRequires(loc, ~EEsProfile, 410, Num_float64_attrib, float64_attrib, "vertex-shader `double` type input");
-			}
+            if (publicType.basicType == EbtDouble)
+                profileRequires(loc, ~EEsProfile, 410, E_GL_ARB_vertex_attrib_64bit, "vertex-shader `double` type input");
             if (qualifier.isAuxiliary() || qualifier.isInterpolation() || qualifier.isMemory() || qualifier.invariant)
                 error(loc, "vertex input cannot be further qualified", "", "");
             break;
@@ -5231,7 +4273,6 @@ void TParseContext::mergeQualifiers(const TSourceLoc& loc, TQualifier& dst, cons
     MERGE_SINGLETON(shadercallcoherent);
     MERGE_SINGLETON(nonprivate);
     MERGE_SINGLETON(volatil);
-    MERGE_SINGLETON(nontemporal);
     MERGE_SINGLETON(restrict);
     MERGE_SINGLETON(readonly);
     MERGE_SINGLETON(writeonly);
@@ -5332,7 +4373,7 @@ TPrecisionQualifier TParseContext::getDefaultPrecision(TPublicType& publicType)
         return defaultPrecision[publicType.basicType];
 }
 
-void TParseContext::precisionQualifierCheck(const TSourceLoc& loc, TBasicType baseType, TQualifier& qualifier, bool hasTypeParameter)
+void TParseContext::precisionQualifierCheck(const TSourceLoc& loc, TBasicType baseType, TQualifier& qualifier, bool isCoopMat)
 {
     // Built-in symbols are allowed some ambiguous precisions, to be pinned down
     // later by context.
@@ -5342,7 +4383,7 @@ void TParseContext::precisionQualifierCheck(const TSourceLoc& loc, TBasicType ba
     if (baseType == EbtAtomicUint && qualifier.precision != EpqNone && qualifier.precision != EpqHigh)
         error(loc, "atomic counters can only be highp", "atomic_uint", "");
 
-    if (hasTypeParameter)
+    if (isCoopMat)
         return;
 
     if (baseType == EbtFloat || baseType == EbtUint || baseType == EbtInt || baseType == EbtSampler || baseType == EbtAtomicUint) {
@@ -5390,7 +4431,7 @@ bool TParseContext::containsFieldWithBasicType(const TType& type, TBasicType bas
 // Do size checking for an array type's size.
 //
 void TParseContext::arraySizeCheck(const TSourceLoc& loc, TIntermTyped* expr, TArraySize& sizePair,
-                                   const char* sizeType, const bool isTypeParameter)
+                                   const char* sizeType, const bool allowZero)
 {
     bool isConst = false;
     sizePair.node = nullptr;
@@ -5420,27 +4461,17 @@ void TParseContext::arraySizeCheck(const TSourceLoc& loc, TIntermTyped* expr, TA
 
     sizePair.size = size;
 
-    if (isTypeParameter) {
-        if (extensionTurnedOn(E_GL_NV_cooperative_matrix2)) {
-            if (! isConst || (expr->getBasicType() != EbtInt && expr->getBasicType() != EbtUint && expr->getBasicType() != EbtBool)) {
-                error(loc, sizeType, "", "must be a constant integer or boolean expression");
-                return;
-            }
-        } else {
-            if (! isConst || (expr->getBasicType() != EbtInt && expr->getBasicType() != EbtUint)) {
-                error(loc, sizeType, "", "must be a constant integer expression");
-                return;
-            }
-        }
+    if (! isConst || (expr->getBasicType() != EbtInt && expr->getBasicType() != EbtUint)) {
+        error(loc, sizeType, "", "must be a constant integer expression");
+        return;
+    }
+
+    if (allowZero) {
         if (size < 0) {
             error(loc, sizeType, "", "must be a non-negative integer");
             return;
         }
     } else {
-        if (! isConst || (expr->getBasicType() != EbtInt && expr->getBasicType() != EbtUint)) {
-            error(loc, sizeType, "", "must be a constant integer expression");
-            return;
-        }
         if (size <= 0) {
             error(loc, sizeType, "", "must be a positive integer");
             return;
@@ -5585,9 +4616,6 @@ void TParseContext::arraySizesCheck(const TSourceLoc& loc, const TQualifier& qua
     if (qualifier.storage == EvqBuffer && lastMember)
         return;
 
-    if (qualifier.storage == EvqUniform && lastMember && extensionTurnedOn(E_GL_EXT_uniform_buffer_unsized_array))
-        return;
-
     arraySizeRequiredCheck(loc, *arraySizes);
 }
 
@@ -5712,20 +4740,6 @@ void TParseContext::checkRuntimeSizable(const TSourceLoc& loc, const TIntermType
         }
     }
 
-    // Check for last member of a uniform block, which can be runtime sizeable
-    // when using GL_EXT_uniform_buffer_unsized_array
-    if (base.getType().getQualifier().storage == EvqUniform && extensionTurnedOn(E_GL_EXT_uniform_buffer_unsized_array)) {
-        const TIntermBinary* binary = base.getAsBinaryNode();
-        if (binary != nullptr &&
-            binary->getOp() == EOpIndexDirectStruct) {
-
-            const int index = binary->getRight()->getAsConstantUnion()->getConstArray()[0].getIConst();
-            const int memberCount = (int)binary->getLeft()->getType().getStruct()->size();
-            if (index == memberCount - 1)
-                return;
-        }
-    }
-
     // check for additional things allowed by GL_EXT_nonuniform_qualifier
     if (base.getBasicType() == EbtSampler || base.getBasicType() == EbtAccStruct || base.getBasicType() == EbtRayQuery ||
         base.getBasicType() == EbtHitObjectNV || (base.getBasicType() == EbtBlock && base.getType().getQualifier().isUniformOrBuffer()))
@@ -6243,7 +5257,6 @@ void TParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& quali
 {
     if (qualifier.isMemory()) {
         type.getQualifier().volatil   = qualifier.volatil;
-        type.getQualifier().nontemporal   = qualifier.nontemporal;
         type.getQualifier().coherent  = qualifier.coherent;
         type.getQualifier().devicecoherent  = qualifier.devicecoherent ;
         type.getQualifier().queuefamilycoherent  = qualifier.queuefamilycoherent;
@@ -6434,9 +5447,9 @@ void TParseContext::inductiveLoopCheck(const TSourceLoc& loc, TIntermNode* init,
     inductiveLoopIds.insert(loopIndex);
 
     // condition's form must be "loop-index relational-operator constant-expression"
-    bool badCond = ! loop->getTestExpr();
+    bool badCond = ! loop->getTest();
     if (! badCond) {
-        TIntermBinary* binaryCond = loop->getTestExpr()->getAsBinaryNode();
+        TIntermBinary* binaryCond = loop->getTest()->getAsBinaryNode();
         badCond = ! binaryCond;
         if (! badCond) {
             switch (binaryCond->getOp()) {
@@ -6535,9 +5548,6 @@ void TParseContext::finish()
     if (parsingBuiltins)
         return;
 
-    // Forward builtin alias to AST for later use
-    intermediate.setBuiltinAliasLookup(symbolTable.collectBuiltinAlias());
-
     // Check on array indexes for ES 2.0 (version 100) limitations.
     for (size_t i = 0; i < needsIndexLimitationChecking.size(); ++i)
         constantIndexExpressionCheck(needsIndexLimitationChecking[i]);
@@ -6839,10 +5849,8 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
         }
         for (TLayoutDepth depth = (TLayoutDepth)(EldNone + 1); depth < EldCount; depth = (TLayoutDepth)(depth+1)) {
             if (id == TQualifier::getLayoutDepthString(depth)) {
-                const char* feature = "depth layout qualifier";
-                requireProfile(loc, ECoreProfile | ECompatibilityProfile | EEsProfile, feature);
-                profileRequires(loc, ECoreProfile | ECompatibilityProfile, 420, E_GL_ARB_conservative_depth, feature);
-                profileRequires(loc, EEsProfile, 0, E_GL_EXT_conservative_depth, feature);
+                requireProfile(loc, ECoreProfile | ECompatibilityProfile, "depth layout qualifier");
+                profileRequires(loc, ECoreProfile | ECompatibilityProfile, 420, nullptr, "depth layout qualifier");
                 publicType.shaderQualifiers.layoutDepth = depth;
                 return;
             }
@@ -6896,16 +5904,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
             publicType.qualifier.layoutFullQuads = true;
             return;
         }
-        if (id == "non_coherent_attachment_readqcom") {
-            requireExtensions(loc, 1, &E_GL_QCOM_tile_shading, "tile shading QCOM");
-            publicType.shaderQualifiers.layoutNonCoherentTileAttachmentReadQCOM = true;
-            return;
-        }
-        if (id == "tile_attachmentqcom") {
-            requireExtensions(loc, 1, &E_GL_QCOM_tile_shading, "tile shading QCOM");
-            publicType.qualifier.layoutTileAttachmentQCOM = true;
-            return;
-        }
     }
     if (language == EShLangVertex ||
         language == EShLangTessControl ||
@@ -6932,10 +5930,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
                 requireExtensions(loc, 1, &E_GL_NV_shader_invocation_reorder, "hitobject shader record NV");
                 publicType.qualifier.layoutHitObjectShaderRecordNV = true;
                 return;
-            } else if (id == "hitobjectshaderrecordext") {
-                requireExtensions(loc, 1, &E_GL_EXT_shader_invocation_reorder, "hitobject shader record EXT");
-                publicType.qualifier.layoutHitObjectShaderRecordEXT = true;
-                return;
             }
 
         }
@@ -6951,11 +5945,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
                 return;
             }
         }
-        if (id == "tile_attachmentqcom") {
-            requireExtensions(loc, 1, &E_GL_QCOM_tile_shading, "tile shading QCOM");
-            publicType.qualifier.layoutTileAttachmentQCOM = true;
-            return;
-        }
     }
 
     if (id == "primitive_culling") {
@@ -7197,9 +6186,7 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
 
     case EShLangGeometry:
         if (id == "invocations") {
-            profileRequires(loc, ECompatibilityProfile | ECoreProfile, 400,
-                Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5, "invocations");
-
+            profileRequires(loc, ECompatibilityProfile | ECoreProfile, 400, nullptr, "invocations");
             if (value == 0)
                 error(loc, "must be at least 1", "invocations", "");
             else
@@ -7325,38 +6312,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
                 }
             }
         }
-        if (id.compare(0, 18, "shading_rate_xqcom") == 0 ||
-            id.compare(0, 18, "shading_rate_yqcom") == 0 ||
-            id.compare(0, 18, "shading_rate_zqcom") == 0) {
-            requireExtensions(loc, 1, &E_GL_QCOM_tile_shading, "tile shading QCOM");
-            if (nonLiteral)
-                error(loc, "needs a literal integer", "shading_rate_*QCOM", "");
-            if (id.size() == 18 && value == 0) {
-                error(loc, "must be at least 1", id.c_str(), "");
-                return;
-            }
-            if (id == "shading_rate_xqcom") {
-                publicType.shaderQualifiers.layoutTileShadingRateQCOM[0] = value;
-                publicType.shaderQualifiers.layoutTileShadingRateQCOMNotDefault[0] = true;
-                if (! IsPow2(value))
-                    error(loc, "must be a power of 2", id.c_str(), "");
-                return;
-            }
-            if (id == "shading_rate_yqcom") {
-                publicType.shaderQualifiers.layoutTileShadingRateQCOM[1] = value;
-                publicType.shaderQualifiers.layoutTileShadingRateQCOMNotDefault[1] = true;
-                if (! IsPow2(value))
-                    error(loc, "must be a power of 2", id.c_str(), "");
-                return;
-            }
-            if (id == "shading_rate_zqcom") {
-                publicType.shaderQualifiers.layoutTileShadingRateQCOM[2] = value;
-                publicType.shaderQualifiers.layoutTileShadingRateQCOMNotDefault[2] = true;
-                if (value <= 0)
-                    error(loc, "must be a positive value", id.c_str(), "");
-                return;
-            }
-        }
         break;
 
     default:
@@ -7450,9 +6405,6 @@ void TParseContext::mergeObjectLayoutQualifiers(TQualifier& dst, const TQualifie
             dst.pervertexEXT = true;
         if (src.layoutHitObjectShaderRecordNV)
             dst.layoutHitObjectShaderRecordNV = true;
-        dst.layoutTileAttachmentQCOM |= src.layoutTileAttachmentQCOM;
-        if (src.layoutHitObjectShaderRecordEXT)
-            dst.layoutHitObjectShaderRecordEXT = true;
     }
 }
 
@@ -7528,22 +6480,6 @@ void TParseContext::layoutObjectCheck(const TSourceLoc& loc, const TSymbol& symb
             break;
         }
     }
-
-    // Check that an in/out variable or block doesn't contain a boolean member
-    // Don't enforce if redeclaring a builtin, which are allowed to contain bool
-    if (!parsingBuiltins && type.containsBasicType(EbtBool) && !builtInName(symbol.getName())) {
-        switch(qualifier.storage) {
-        case EvqVaryingIn:
-        case EvqVaryingOut:
-        {
-            const char *reason = type.getBasicType() == EbtBool ? "cannot be bool" : "cannot contain bool";
-            error(loc, reason, GetStorageQualifierString(qualifier.storage), "");
-            break;
-        }
-        default:
-            break;
-        }
-    }
 }
 
 // "For some blocks declared as arrays, the location can only be applied at the block level:
@@ -7619,7 +6555,6 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
         case EvqCallableData:
         case EvqCallableDataIn:
         case EvqHitObjectAttrNV:
-        case EvqHitObjectAttrEXT:
         case EvqSpirvStorageClass:
             break;
         case EvqTileImageEXT:
@@ -7768,15 +6703,6 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
             error(loc, "Push constants blocks can't be an array", "push_constant", "");
     }
 
-    if (type.getBasicType() == EbtReference) {
-        if (qualifier.isPipeInput())
-            error(loc, "cannot contain any structs with buffer_reference.", "in",
-                  "If you want to interface shader stages with a buffer_reference cast to a uint64 or uvec2 instead.");
-        if (qualifier.isPipeOutput())
-            error(loc, "cannot contain any structs with buffer_reference.", "out",
-                  "If you want to interface shader stages with a buffer_reference cast to a uint64 or uvec2 instead.");
-    }
-
     if (qualifier.hasBufferReference() && type.getBasicType() != EbtBlock)
         error(loc, "can only be used with a block", "buffer_reference", "");
 
@@ -7786,8 +6712,7 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
     // input attachment
     if (type.isSubpass()) {
         if (extensionTurnedOn(E_GL_EXT_shader_tile_image))
-            error(loc, "cannot be used with GL_EXT_shader_tile_image enabled", type.getSampler().getString().c_str(),
-                  "");
+	    error(loc, "can not be used with GL_EXT_shader_tile_image enabled", type.getSampler().getString().c_str(), "");
         if (! qualifier.hasAttachment())
             error(loc, "requires an input_attachment_index layout qualifier", "subpass", "");
     } else {
@@ -7815,9 +6740,6 @@ void TParseContext::layoutTypeCheck(const TSourceLoc& loc, const TType& type)
         case EbtFloat:
         case EbtDouble:
         case EbtFloat16:
-        case EbtBFloat16:
-        case EbtFloatE5M2:
-        case EbtFloatE4M3:
             break;
         default:
             error(loc, "cannot be applied to this type", "constant_id", "");
@@ -7916,8 +6838,8 @@ void TParseContext::layoutQualifierCheck(const TSourceLoc& loc, const TQualifier
     }
 
     if (qualifier.hasBinding()) {
-        if (! qualifier.isUniformOrBuffer() && !qualifier.isTaskMemory() && !qualifier.isTileAttachmentQCOM())
-            error(loc, "requires uniform or buffer or tile image storage qualifier", "binding", "");
+        if (! qualifier.isUniformOrBuffer() && !qualifier.isTaskMemory())
+            error(loc, "requires uniform or buffer storage qualifier", "binding", "");
     }
     if (qualifier.hasStream()) {
         if (!qualifier.isPipeOutput())
@@ -8022,15 +6944,6 @@ void TParseContext::checkNoShaderLayouts(const TSourceLoc& loc, const TShaderQua
         error(loc, message, TQualifier::getInterlockOrderingString(shaderQualifiers.interlockOrdering), "");
     if (shaderQualifiers.layoutPrimitiveCulling)
         error(loc, "can only be applied as standalone", "primitive_culling", "");
-
-    if (shaderQualifiers.layoutNonCoherentTileAttachmentReadQCOM)
-        error(loc, message, "non_coherent_attachment_readQCOM", "");
-    if (shaderQualifiers.layoutTileShadingRateQCOM[0] >= 1)
-        error(loc, message, "shading_rate_xQCOM", "");
-    if (shaderQualifiers.layoutTileShadingRateQCOM[1] >= 1)
-        error(loc, message, "shading_rate_yQCOM", "");
-    if (shaderQualifiers.layoutTileShadingRateQCOM[2] >= 1)
-        error(loc, message, "shading_rate_zQCOM", "");
 }
 
 // Correct and/or advance an object's offset layout qualifier.
@@ -8094,20 +7007,6 @@ const TFunction* TParseContext::findFunction(const TSourceLoc& loc, const TFunct
             return symbol->getAsFunction();
     }
 
-    // coopMatPerElementNV is variadic. There is some function signature error
-    // checking in handleCoopMat2FunctionCall.
-    if (call.getName() == "coopMatPerElementNV") {
-        TSymbol* symbol = symbolTable.find("coopMatPerElementNV(", &builtIn);
-        if (symbol)
-            return symbol->getAsFunction();
-    }
-
-    if (call.getName() == "saturatedConvertEXT") {
-        TSymbol* symbol = symbolTable.find("saturatedConvertEXT(", &builtIn);
-        if (symbol)
-            return symbol->getAsFunction();
-    }
-
     bool explicitTypesEnabled = extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
                                 extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int8) ||
                                 extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int16) ||
@@ -8126,9 +7025,7 @@ const TFunction* TParseContext::findFunction(const TSourceLoc& loc, const TFunct
     else if (version < 120)
         function = findFunctionExact(loc, call, builtIn);
     else if (version < 400) {
-        bool needfindFunction400 = extensionTurnedOn(E_GL_ARB_gpu_shader_fp64)
-                                  || extensionTurnedOn(E_GL_ARB_gpu_shader5)
-                                  || extensionTurnedOn(E_GL_NV_gpu_shader5);
+        bool needfindFunction400 = extensionTurnedOn(E_GL_ARB_gpu_shader_fp64) || extensionTurnedOn(E_GL_ARB_gpu_shader5);
         function = needfindFunction400 ? findFunction400(loc, call, builtIn) : findFunction120(loc, call, builtIn);
     }
     else if (explicitTypesEnabled)
@@ -8275,26 +7172,15 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
     symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
 
     // can 'from' convert to 'to'?
-    const auto convertible = [this,builtIn](const TType& from, const TType& to, TOperator op, int param) -> bool {
+    const auto convertible = [this,builtIn](const TType& from, const TType& to, TOperator, int) -> bool {
         if (from == to)
             return true;
         if (from.coopMatParameterOK(to))
             return true;
-        if (from.tensorParameterOK(to))
-            return true;
-        if (from.getBasicType() == EbtFunction && to.getBasicType() == EbtFunction)
-            return true;
-        if (from.coopVecParameterOK(to))
-            return true;
         // Allow a sized array to be passed through an unsized array parameter, for coopMatLoad/Store functions
         if (builtIn && from.isArray() && to.isUnsizedArray()) {
             TType fromElementType(from, 0);
             TType toElementType(to, 0);
-            // Load/store tensor functions allow any element type for the pointer
-            if ((op == EOpCooperativeMatrixLoadTensorNV || op == EOpCooperativeMatrixStoreTensorNV) &&
-                param == 1) {
-                return true;
-            }
             if (fromElementType == toElementType)
                 return true;
         }
@@ -8302,45 +7188,19 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
             return false;
         if (from.isCoopMat() && to.isCoopMat())
             return from.sameCoopMatBaseType(to);
-        if (from.isCoopVecNV() && to.isCoopVecNV())
-            return from.sameCoopVecBaseType(to);
-        if (from.isTensorARM() && to.isTensorARM())
-            return from.sameTensorBaseTypeARM(to);
         return intermediate.canImplicitlyPromote(from.getBasicType(), to.getBasicType());
     };
 
     // Is 'to2' a better conversion than 'to1'?
     // Ties should not be considered as better.
     // Assumes 'convertible' already said true.
-    const auto better = [&](const TType& from, const TType& to1, const TType& to2) -> bool {
+    const auto better = [](const TType& from, const TType& to1, const TType& to2) -> bool {
         // 1. exact match
         if (from == to2)
             return from != to1;
         if (from == to1)
             return false;
-        if (extensionTurnedOn(E_GL_NV_gpu_shader5)) {
-            // This map refers to the conversion table mentioned under the 
-            // section "Modify Section 6.1, Function Definitions, p. 63" in NV_gpu_shader5 spec
-            const static std::map<int, std::vector<int>> conversionTable = {
-                {EbtInt8,   {EbtInt, EbtInt64}},
-                {EbtInt16,  {EbtInt, EbtInt64}},
-                {EbtInt,    {EbtInt64}},
-                {EbtUint8,  {EbtUint, EbtUint64}}, 
-                {EbtUint16, {EbtUint, EbtUint64}}, 
-                {EbtUint,   {EbtUint64}},
-            };
-            auto source = conversionTable.find(from.getBasicType());
-            if (source != conversionTable.end()) {
-                for (auto destination : source->second) {
-                    if (to2.getBasicType() == destination &&
-                        to1.getBasicType() != destination) // to2 is better then to1
-                        return true;
-                    else if (to1.getBasicType() == destination &&
-                             to2.getBasicType() != destination) // This means to1 is better then to2
-                        return false;
-                }
-            }
-        }
+
         // 2. float -> double is better
         if (from.getBasicType() == EbtFloat) {
             if (to2.getBasicType() == EbtDouble && to1.getBasicType() != EbtDouble)
@@ -8368,7 +7228,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
 // "To determine whether the conversion for a single argument in one match
 //  is better than that for another match, the conversion is assigned of the
 //  three ranks ordered from best to worst:
-//    1. Exact match: no conversion.
+//   1. Exact match: no conversion.
 //    2. Promotion: integral or floating-point promotion.
 //    3. Conversion: integral conversion, floating-point conversion,
 //       floating-integral conversion.
@@ -8388,26 +7248,15 @@ const TFunction* TParseContext::findFunctionExplicitTypes(const TSourceLoc& loc,
     symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
 
     // can 'from' convert to 'to'?
-    const auto convertible = [this,builtIn](const TType& from, const TType& to, TOperator op, int param) -> bool {
+    const auto convertible = [this,builtIn](const TType& from, const TType& to, TOperator, int) -> bool {
         if (from == to)
             return true;
         if (from.coopMatParameterOK(to))
             return true;
-        if (from.tensorParameterOK(to))
-            return true;
-        if (from.getBasicType() == EbtFunction && to.getBasicType() == EbtFunction)
-            return true;
-        if (from.coopVecParameterOK(to))
-            return true;
         // Allow a sized array to be passed through an unsized array parameter, for coopMatLoad/Store functions
         if (builtIn && from.isArray() && to.isUnsizedArray()) {
             TType fromElementType(from, 0);
             TType toElementType(to, 0);
-            // Load/store tensor functions allow any element type for the pointer
-            if ((op == EOpCooperativeMatrixLoadTensorNV || op == EOpCooperativeMatrixStoreTensorNV) &&
-                param == 1) {
-                return true;
-            }
             if (fromElementType == toElementType)
                 return true;
         }
@@ -8415,10 +7264,6 @@ const TFunction* TParseContext::findFunctionExplicitTypes(const TSourceLoc& loc,
             return false;
         if (from.isCoopMat() && to.isCoopMat())
             return from.sameCoopMatBaseType(to);
-        if (from.isCoopVecNV() && to.isCoopVecNV())
-            return from.sameCoopVecBaseType(to);
-        if (from.isTensorARM() && to.isTensorARM())
-            return from.sameTensorBaseTypeARM(to);
         return intermediate.canImplicitlyPromote(from.getBasicType(), to.getBasicType());
     };
 
@@ -8524,7 +7369,7 @@ TIntermTyped* TParseContext::vkRelaxedRemapFunctionCall(const TSourceLoc& loc, T
         }
     } else if (function->getName() == "atomicCounter") {
         // change atomicCounter into a direct read of the variable
-        if (arguments && arguments->getAsTyped()) {
+        if (arguments->getAsTyped()) {
             result = arguments->getAsTyped();
         }
     }
@@ -8554,7 +7399,7 @@ void TParseContext::declareTypeDefaults(const TSourceLoc& loc, const TPublicType
         warn(loc, "useless application of layout qualifier", "layout", "");
 }
 
-void TParseContext::typeParametersCheck(const TSourceLoc& loc, const TPublicType& publicType)
+void TParseContext::coopMatTypeParametersCheck(const TSourceLoc& loc, const TPublicType& publicType)
 {
     if (parsingBuiltins)
         return;
@@ -8566,9 +7411,6 @@ void TParseContext::typeParametersCheck(const TSourceLoc& loc, const TPublicType
         switch (publicType.typeParameters->basicType) {
         case EbtFloat:
         case EbtFloat16:
-        case EbtBFloat16:
-        case EbtFloatE5M2:
-        case EbtFloatE4M3:
         case EbtInt:
         case EbtInt8:
         case EbtInt16:
@@ -8591,58 +7433,6 @@ void TParseContext::typeParametersCheck(const TSourceLoc& loc, const TPublicType
             return;
         }
     }
-    if (publicType.isTensorLayoutNV()) {
-        if (publicType.typeParameters == nullptr) {
-            error(loc, "tensorLayout missing type parameters", "", "");
-            return;
-        }
-        if (publicType.typeParameters->arraySizes->getNumDims() > 2) {
-            error(loc, "tensorLayout incorrect number of type parameters", "", "");
-            return;
-        }
-        if (publicType.typeParameters && publicType.typeParameters->arraySizes->getNumDims() < 2) {
-            while (publicType.typeParameters->arraySizes->getNumDims() < 2) {
-                publicType.typeParameters->arraySizes->addInnerSize(0);
-            }
-        }
-    }
-    if (publicType.isTensorViewNV()) {
-        if (publicType.typeParameters == nullptr) {
-            error(loc, "tensorView missing type parameters", "", "");
-            return;
-        }
-        if (publicType.typeParameters->arraySizes->getNumDims() < 1 ||
-            publicType.typeParameters->arraySizes->getNumDims() > 7) {
-            error(loc, "tensorView incorrect number of type parameters", "", "");
-            return;
-        }
-        if (publicType.typeParameters && publicType.typeParameters->arraySizes->getNumDims() < 7) {
-            uint32_t numDims = publicType.typeParameters->arraySizes->getNumDims();
-            while (numDims < 7) {
-                uint32_t dim = (numDims == 1) ? 0 : (numDims - 2);
-                publicType.typeParameters->arraySizes->addInnerSize(dim);
-                numDims++;
-            }
-        }
-    }
-    if (publicType.isTensorARM()) {
-        if (publicType.typeParameters == nullptr) {
-            error(loc, "tensor type is missing type parameters", "", "");
-            return;
-        }
-        if (publicType.typeParameters->arraySizes == nullptr) {
-            error(loc, "tensor type is missing rank information", "", "");
-            return;
-        }
-        if (publicType.typeParameters->arraySizes->getNumDims() != 1) {
-            error(loc, "tensor type requires exactly 1 rank specifier", "", "");
-            return;
-        }
-        if (publicType.typeParameters->arraySizes->getDimSize(0) < 1) {
-            error(loc, "tensor rank must be greater than or equal to 1", "", "");
-            return;
-        }
-    }
 }
 
 bool TParseContext::vkRelaxedRemapUniformVariable(const TSourceLoc& loc, TString& identifier, const TPublicType& publicType,
@@ -8738,15 +7528,12 @@ static void ForEachOpaque(const TType& type, const TString& path, Function callb
                  ++flatIndex)
             {
                 TString subscriptPath = path;
-                if (path != "")
+                for (size_t dimIndex = 0; dimIndex < indices.size(); ++dimIndex)
                 {
-                    for (size_t dimIndex = 0; dimIndex < indices.size(); ++dimIndex)
-                    {
-                        int index = indices[dimIndex];
-                        subscriptPath.append("[");
-                        subscriptPath.append(String(index));
-                        subscriptPath.append("]");
-                    }
+                    int index = indices[dimIndex];
+                    subscriptPath.append("[");
+                    subscriptPath.append(String(index));
+                    subscriptPath.append("]");
                 }
 
                 recursion(type, subscriptPath, true, recursion);
@@ -8754,7 +7541,7 @@ static void ForEachOpaque(const TType& type, const TString& path, Function callb
                 for (size_t dimIndex = 0; dimIndex < indices.size(); ++dimIndex)
                 {
                     ++indices[dimIndex];
-                    if (indices[dimIndex] < type.getArraySizes()->getDimSize(static_cast<int>(dimIndex)))
+                    if (indices[dimIndex] < type.getArraySizes()->getDimSize(dimIndex))
                         break;
                     else
                         indices[dimIndex] = 0;
@@ -8768,11 +7555,8 @@ static void ForEachOpaque(const TType& type, const TString& path, Function callb
             for (const TTypeLoc& typeLoc : types)
             {
                 TString nextPath = path;
-                if (path != "")
-                {
-                    nextPath.append(".");
-                    nextPath.append(typeLoc.type->getFieldName());
-                }
+                nextPath.append(".");
+                nextPath.append(typeLoc.type->getFieldName());
 
                 recursion(*(typeLoc.type), nextPath, false, recursion);
             }
@@ -8830,13 +7614,9 @@ void TParseContext::vkRelaxedRemapFunctionParameter(TFunction* function, TParame
     if (!param.type->isStruct() || !param.type->containsOpaque())
         return;
 
-    TString fieldName = param.name
-        ? *param.name
-        : param.type->hasFieldName() ? param.type->getFieldName() : "";
-
-    ForEachOpaque(*param.type, fieldName,
+    ForEachOpaque(*param.type, (param.name ? *param.name : param.type->getFieldName()),
                   [function, param, newParams](const TType& type, const TString& path) {
-                      TString* memberName = path != "" ? NewPoolTString(path.c_str()) : nullptr;
+                      TString* memberName = NewPoolTString(path.c_str());
 
                       TType* memberType = new TType();
                       memberType->shallowCopy(type);
@@ -9017,7 +7797,7 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
     if (initializer) {
         if (type.getBasicType() == EbtRayQuery) {
             error(loc, "ray queries can only be initialized by using the rayQueryInitializeEXT intrinsic:", "=", identifier.c_str());
-        } else if ((type.getBasicType() == EbtHitObjectNV) || (type.getBasicType() == EbtHitObjectEXT)) {
+        } else if (type.getBasicType() == EbtHitObjectNV) {
             error(loc, "hit objects cannot be initialized using initializers", "=", identifier.c_str());
         }
 
@@ -9028,7 +7808,7 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
         intermediate.setUseStorageBuffer();
 
         if (!publicType.typeParameters || !publicType.typeParameters->arraySizes ||
-            publicType.typeParameters->arraySizes->getNumDims() != 4) {
+            publicType.typeParameters->arraySizes->getNumDims() != 3) {
             error(loc, "unexpected number type parameters", identifier.c_str(), "");
         }
         if (publicType.typeParameters) {
@@ -9042,9 +7822,10 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
         intermediate.setUseVulkanMemoryModel();
         intermediate.setUseStorageBuffer();
 
-        if (!publicType.typeParameters || !publicType.typeParameters->arraySizes || publicType.typeParameters->arraySizes->getNumDims() != 4) {
+        if (!publicType.typeParameters || publicType.typeParameters->arraySizes->getNumDims() != 4) {
             error(loc, "expected four type parameters", identifier.c_str(), "");
-        } else {
+        }
+        if (publicType.typeParameters) {
             if (isTypeFloat(publicType.basicType) &&
                 publicType.typeParameters->arraySizes->getDimSize(0) != 16 &&
                 publicType.typeParameters->arraySizes->getDimSize(0) != 32 &&
@@ -9058,46 +7839,6 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
                 error(loc, "expected 8, 16, or 32 bits for first type parameter", identifier.c_str(), "");
             }
         }
-    } else if (type.isTensorLayoutNV()) {
-        if (!publicType.typeParameters || publicType.typeParameters->arraySizes->getNumDims() > 2) {
-            error(loc, "expected 1-2 type parameters", identifier.c_str(), "");
-        }
-    } else if (type.isTensorViewNV()) {
-        if (!publicType.typeParameters || publicType.typeParameters->arraySizes->getNumDims() > 7) {
-            error(loc, "expected 1-7 type parameters", identifier.c_str(), "");
-        }
-    } else if (type.isCoopVecNV()) {
-        intermediate.setUseVulkanMemoryModel();
-        intermediate.setUseStorageBuffer();
-
-        if (!publicType.typeParameters || !publicType.typeParameters->arraySizes || publicType.typeParameters->arraySizes->getNumDims() != 1) {
-            error(loc, "expected two type parameters", identifier.c_str(), "");
-        } else if (publicType.typeParameters->arraySizes->getDimSize(0) <= 0) {
-            error(loc, "expected positive number of components", identifier.c_str(), "");
-        }
-    } else if (type.isTensorARM()) {
-        intermediate.setUseStorageBuffer();
-
-        if (!publicType.typeParameters || publicType.typeParameters->arraySizes->getNumDims() != 1) {
-            error(loc, "expected two type parameters", identifier.c_str(), "");
-        }
-        if (publicType.typeParameters) {
-            if (publicType.typeParameters->basicType != EbtBool &&
-                publicType.typeParameters->basicType != EbtInt8 &&
-                publicType.typeParameters->basicType != EbtInt16 &&
-                publicType.typeParameters->basicType != EbtInt &&
-                publicType.typeParameters->basicType != EbtInt64 &&
-                publicType.typeParameters->basicType != EbtUint8 &&
-                publicType.typeParameters->basicType != EbtUint16 &&
-                publicType.typeParameters->basicType != EbtUint &&
-                publicType.typeParameters->basicType != EbtUint64 &&
-                publicType.typeParameters->basicType != EbtFloat16 &&
-                publicType.typeParameters->basicType != EbtFloat &&
-                publicType.typeParameters->basicType != EbtDouble) {
-                error(loc, "expected bool, integer or floating point type parameter", identifier.c_str(), "");
-            }
-
-        }
     } else {
         if (publicType.typeParameters && publicType.typeParameters->arraySizes->getNumDims() != 0) {
             error(loc, "unexpected type parameters", identifier.c_str(), "");
@@ -9116,8 +7857,6 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
     transparentOpaqueCheck(loc, type, identifier);
     atomicUintCheck(loc, type, identifier);
     accStructCheck(loc, type, identifier);
-    hitObjectNVCheck(loc, type, identifier);
-    hitObjectEXTCheck(loc, type, identifier);
     checkAndResizeMeshViewDim(loc, type, /*isBlockMember*/ false);
     if (type.getQualifier().storage == EvqConst && type.containsReference()) {
         error(loc, "variables with reference type can't have qualifier 'const'", "qualifier", "");
@@ -9131,13 +7870,6 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
         if (type.contains8BitInt())
             requireInt8Arithmetic(loc, "qualifier", "(u)int8 types can only be in uniform block or buffer storage");
     }
-    if (type.getBasicType() == EbtBFloat16 &&
-        (type.getQualifier().storage == EvqVaryingIn || type.getQualifier().storage == EvqVaryingOut))
-        error(loc, "qualifier", "bfloat16 types not allowed as input/output", "");
-
-    if ((type.getBasicType() == EbtFloatE5M2 || type.getBasicType() == EbtFloatE4M3) &&
-        (type.getQualifier().storage == EvqVaryingIn || type.getQualifier().storage == EvqVaryingOut))
-        error(loc, "qualifier", "fp8 types not allowed as input/output", "");
 
     if (type.getQualifier().storage == EvqtaskPayloadSharedEXT)
         intermediate.addTaskPayloadEXTCount();
@@ -9222,22 +7954,7 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
     // fix up
     fixOffset(loc, *symbol);
 
-    // TODO: The decl AST is turned on based on debug info right now. We should expose it as an explicit option.
-    if (intermediate.getDebugInfo()) {
-        TVariable* variable = symbol->getAsVariable();
-        if (variable) {
-            auto decl = new TIntermVariableDecl(intermediate.addSymbol(*variable, loc), initNode);
-            decl->setLoc(loc);
-            return decl;
-        }
-        else {
-            // We ignore builtins redeclarations
-            return nullptr;
-        }
-    }
-    else {
-        return initNode;
-    }
+    return initNode;
 }
 
 // Pick up global defaults from the provide global defaults into dst.
@@ -9638,11 +8355,6 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode*
 
     int paramCount = 0;  // keeps track of the constructor parameter number being checked
 
-    // We don't know "top down" whether type is a specialization constant,
-    // but a const becomes a specialization constant if any of its children are.
-    bool hasSpecConst = false;
-    bool isConstConstructor = true;
-
     // for each parameter to the constructor call, check to see if the right type is passed or convert them
     // to the right type if possible (and allowed).
     // for structure constructors, just check if the right type is passed, no conversion is allowed.
@@ -9655,24 +8367,13 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode*
         else
             newNode = constructBuiltIn(type, op, (*p)->getAsTyped(), node->getLoc(), true);
 
-        if (newNode) {
+        if (newNode)
             *p = newNode;
-            if (!newNode->getType().getQualifier().isConstant())
-                isConstConstructor = false;
-            if (newNode->getType().getQualifier().isSpecConstant())
-                hasSpecConst = true;
-        } else
+        else
             return nullptr;
     }
 
-    TIntermTyped* ret_node = intermediate.setAggregateOperator(aggrNode, op, type, loc);
-
-    const char *specConstantCompositeExt[] = { E_GL_EXT_spec_constant_composites };
-    if (checkExtensionsRequested(loc, 1, specConstantCompositeExt, "spec constant aggregate constructor")) {
-        if (isConstConstructor && hasSpecConst) {
-            ret_node->getWritableType().getQualifier().makeSpecConstant();
-        }
-    }
+    TIntermTyped *ret_node = intermediate.setAggregateOperator(aggrNode, op, type, loc);
 
     TIntermAggregate *agg_node = ret_node->getAsAggregate();
     if (agg_node && (agg_node->isVector() || agg_node->isArray() || agg_node->isMatrix()))
@@ -9804,10 +8505,9 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
     case EOpConstructF16Mat4x4:
     case EOpConstructFloat16:
         basicOp = EOpConstructFloat16;
-        // 8/16-bit storage extensions don't support direct constructing composites of 8/16-bit types,
+        // 8/16-bit storage extensions don't support constructing composites of 8/16-bit types,
         // so construct a 32-bit type and convert
-        // and do not generate any conversion if it is an identity conversion, i.e. float16_t(<float16_t> var)
-        if (!intermediate.getArithemeticFloat16Enabled() && (node->getBasicType() != EbtFloat16)) {
+        if (!intermediate.getArithemeticFloat16Enabled()) {
             TType tempType(EbtFloat, EvqTemporary, type.getVectorSize());
             newNode = node;
             if (tempType != newNode->getType()) {
@@ -9823,36 +8523,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
         }
         break;
 
-    case EOpConstructBF16Vec2:
-    case EOpConstructBF16Vec3:
-    case EOpConstructBF16Vec4:
-    case EOpConstructBFloat16:
-        basicOp = EOpConstructBFloat16;
-        break;
-
-    case EOpConstructFloatE5M2Vec2:
-    case EOpConstructFloatE5M2Vec3:
-    case EOpConstructFloatE5M2Vec4:
-    case EOpConstructFloatE5M2:
-        basicOp = EOpConstructFloatE5M2;
-        break;
-
-    case EOpConstructFloatE4M3Vec2:
-    case EOpConstructFloatE4M3Vec3:
-    case EOpConstructFloatE4M3Vec4:
-    case EOpConstructFloatE4M3:
-        basicOp = EOpConstructFloatE4M3;
-        break;
-
     case EOpConstructI8Vec2:
     case EOpConstructI8Vec3:
     case EOpConstructI8Vec4:
     case EOpConstructInt8:
         basicOp = EOpConstructInt8;
-        // 8/16-bit storage extensions don't support direct constructing composites of 8/16-bit types,
+        // 8/16-bit storage extensions don't support constructing composites of 8/16-bit types,
         // so construct a 32-bit type and convert
-        // and do not generate any conversion if it is an identity conversion, i.e. int8_t(<int8_t> var)
-        if (!intermediate.getArithemeticInt8Enabled() && (node->getBasicType() != EbtInt8)) {
+        if (!intermediate.getArithemeticInt8Enabled()) {
             TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
             newNode = node;
             if (tempType != newNode->getType()) {
@@ -9873,10 +8551,9 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
     case EOpConstructU8Vec4:
     case EOpConstructUint8:
         basicOp = EOpConstructUint8;
-        // 8/16-bit storage extensions don't support direct constructing composites of 8/16-bit types,
+        // 8/16-bit storage extensions don't support constructing composites of 8/16-bit types,
         // so construct a 32-bit type and convert
-        // and do not generate any conversion if it is an identity conversion, i.e. uint8_t(<uint8_t> var)
-        if (!intermediate.getArithemeticInt8Enabled() && (node->getBasicType() != EbtUint8)) {
+        if (!intermediate.getArithemeticInt8Enabled()) {
             TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
             newNode = node;
             if (tempType != newNode->getType()) {
@@ -9897,10 +8574,9 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
     case EOpConstructI16Vec4:
     case EOpConstructInt16:
         basicOp = EOpConstructInt16;
-        // 8/16-bit storage extensions don't support direct constructing composites of 8/16-bit types,
+        // 8/16-bit storage extensions don't support constructing composites of 8/16-bit types,
         // so construct a 32-bit type and convert
-        // and do not generate any conversion if it is an identity conversion, i.e. int16_t(<int16_t> var)
-        if (!intermediate.getArithemeticInt16Enabled() && (node->getBasicType() != EbtInt16)) {
+        if (!intermediate.getArithemeticInt16Enabled()) {
             TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
             newNode = node;
             if (tempType != newNode->getType()) {
@@ -9921,10 +8597,9 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
     case EOpConstructU16Vec4:
     case EOpConstructUint16:
         basicOp = EOpConstructUint16;
-        // 8/16-bit storage extensions don't support direct constructing composites of 8/16-bit types,
+        // 8/16-bit storage extensions don't support constructing composites of 8/16-bit types,
         // so construct a 32-bit type and convert
-        // and do not generate any conversion if it is an identity conversion, i.e. uint16_t(<uint16_t> var)
-        if (!intermediate.getArithemeticInt16Enabled() && (node->getBasicType() != EbtUint16)) {
+        if (!intermediate.getArithemeticInt16Enabled()) {
             TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
             newNode = node;
             if (tempType != newNode->getType()) {
@@ -9985,27 +8660,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
             return nullptr;
         }
 
-    case EOpConstructCooperativeVectorNV:
-        if (!node->getType().isCoopVecNV()) {
-            if (type.getBasicType() != node->getType().getBasicType()) {
-                node = intermediate.addConversion(type.getBasicType(), node);
-                if (node == nullptr)
-                    return nullptr;
-            }
-        }
-        if (type.getBasicType() != node->getType().getBasicType()) {
-            intermediate.buildConvertOp(type.getBasicType(), node->getType().getBasicType(), op);
-            node = intermediate.addUnaryNode(op, node, node->getLoc(), type);
-            return node;
-        }
-        if (subset) {
-            return node;
-        }
-
-        node = intermediate.setAggregateOperator(node, op, type, node->getLoc());
-
-        return node;
-
     case EOpConstructCooperativeMatrixNV:
     case EOpConstructCooperativeMatrixKHR:
         if (node->getType() == type) {
@@ -10018,11 +8672,109 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     return nullptr;
             }
             node = intermediate.setAggregateOperator(node, op, type, node->getLoc());
-        } else if (type.sameCoopMatShape(node->getType()) && !type.sameCoopMatUse(node->getType()) &&
-                   type.getBasicType() == node->getType().getBasicType()) {
-            node = intermediate.setAggregateOperator(node, op, type, node->getLoc());
         } else {
-            TOperator op = EOpConvNumeric;
+            TOperator op = EOpNull;
+            switch (type.getBasicType()) {
+            default:
+                assert(0);
+                break;
+            case EbtInt:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToInt;    break;
+                    case EbtFloat16: op = EOpConvFloat16ToInt;  break;
+                    case EbtUint8:   op = EOpConvUint8ToInt;    break;
+                    case EbtInt8:    op = EOpConvInt8ToInt;     break;
+                    case EbtUint16:  op = EOpConvUint16ToInt;   break;
+                    case EbtInt16:   op = EOpConvInt16ToInt;    break;
+                    case EbtUint:    op = EOpConvUintToInt;     break;
+                    default: assert(0);
+                }
+                break;
+            case EbtUint:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToUint;    break;
+                    case EbtFloat16: op = EOpConvFloat16ToUint;  break;
+                    case EbtUint8:   op = EOpConvUint8ToUint;    break;
+                    case EbtInt8:    op = EOpConvInt8ToUint;     break;
+                    case EbtUint16:  op = EOpConvUint16ToUint;   break;
+                    case EbtInt16:   op = EOpConvInt16ToUint;    break;
+                    case EbtInt:     op = EOpConvIntToUint;      break;
+                    default: assert(0);
+                }
+                break;
+            case EbtInt16:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToInt16;    break;
+                    case EbtFloat16: op = EOpConvFloat16ToInt16;  break;
+                    case EbtUint8:   op = EOpConvUint8ToInt16;    break;
+                    case EbtInt8:    op = EOpConvInt8ToInt16;     break;
+                    case EbtUint16:  op = EOpConvUint16ToInt16;   break;
+                    case EbtInt:     op = EOpConvIntToInt16;      break;
+                    case EbtUint:    op = EOpConvUintToInt16;     break;
+                    default: assert(0);
+                }
+                break;
+            case EbtUint16:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToUint16;   break;
+                    case EbtFloat16: op = EOpConvFloat16ToUint16; break;
+                    case EbtUint8:   op = EOpConvUint8ToUint16;   break;
+                    case EbtInt8:    op = EOpConvInt8ToUint16;    break;
+                    case EbtInt16:   op = EOpConvInt16ToUint16;   break;
+                    case EbtInt:     op = EOpConvIntToUint16;     break;
+                    case EbtUint:    op = EOpConvUintToUint16;    break;
+                    default: assert(0);
+                }
+                break;
+            case EbtInt8:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToInt8;    break;
+                    case EbtFloat16: op = EOpConvFloat16ToInt8;  break;
+                    case EbtUint8:   op = EOpConvUint8ToInt8;    break;
+                    case EbtInt16:   op = EOpConvInt16ToInt8;    break;
+                    case EbtUint16:  op = EOpConvUint16ToInt8;   break;
+                    case EbtInt:     op = EOpConvIntToInt8;      break;
+                    case EbtUint:    op = EOpConvUintToInt8;     break;
+                    default: assert(0);
+                }
+                break;
+            case EbtUint8:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:   op = EOpConvFloatToUint8;   break;
+                    case EbtFloat16: op = EOpConvFloat16ToUint8; break;
+                    case EbtInt8:    op = EOpConvInt8ToUint8;    break;
+                    case EbtInt16:   op = EOpConvInt16ToUint8;   break;
+                    case EbtUint16:  op = EOpConvUint16ToUint8;  break;
+                    case EbtInt:     op = EOpConvIntToUint8;     break;
+                    case EbtUint:    op = EOpConvUintToUint8;    break;
+                    default: assert(0);
+                }
+                break;
+            case EbtFloat:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat16: op = EOpConvFloat16ToFloat;  break;
+                    case EbtInt8:    op = EOpConvInt8ToFloat;     break;
+                    case EbtUint8:   op = EOpConvUint8ToFloat;    break;
+                    case EbtInt16:   op = EOpConvInt16ToFloat;    break;
+                    case EbtUint16:  op = EOpConvUint16ToFloat;   break;
+                    case EbtInt:     op = EOpConvIntToFloat;      break;
+                    case EbtUint:    op = EOpConvUintToFloat;     break;
+                    default: assert(0);
+                }
+                break;
+            case EbtFloat16:
+                switch (node->getType().getBasicType()) {
+                    case EbtFloat:  op = EOpConvFloatToFloat16;  break;
+                    case EbtInt8:   op = EOpConvInt8ToFloat16;   break;
+                    case EbtUint8:  op = EOpConvUint8ToFloat16;  break;
+                    case EbtInt16:  op = EOpConvInt16ToFloat16;   break;
+                    case EbtUint16: op = EOpConvUint16ToFloat16;  break;
+                    case EbtInt:    op = EOpConvIntToFloat16;    break;
+                    case EbtUint:   op = EOpConvUintToFloat16;   break;
+                    default: assert(0);
+                }
+                break;
+            }
 
             node = intermediate.addUnaryNode(op, node, node->getLoc(), type);
             // If it's a (non-specialization) constant, it must be folded.
@@ -10069,34 +8821,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
     return intermediate.setAggregateOperator(newNode, op, type, loc);
 }
 
-void TParseContext::makeVariadic(TFunction *F, const TSourceLoc &loc) {
-    if (parsingBuiltins) {
-        F->setVariadic();
-    } else {
-        error(loc, "variadic argument specifier is only available for builtins", "...", "");
-    }
-}
-
-TParameter TParseContext::getParamWithDefault(const TPublicType& ty, TString* identifier, TIntermTyped* initializer,
-                                              const TSourceLoc& loc)
-{
-    if (!parsingBuiltins) {
-        error(loc, "default argument values are only available for builtins", "=", "");
-        initializer = nullptr;
-    }
-    if (ty.arraySizes) {
-        error(loc, "array arguments cannot be default-initialized", identifier->c_str(), "");
-        initializer = nullptr;
-    }
-    if (ty.basicType == EbtVoid) {
-        error(loc, "illegal use of type 'void'", identifier->c_str(), "");
-        initializer = nullptr;
-    }
-    reservedErrorCheck(loc, *identifier);
-    TParameter param = {identifier, new TType(ty), initializer};
-    return param;
-}
-
 // This function tests for the type of the parameters to the structure or array constructor. Raises
 // an error message if the expected type does not match the parameter passed to the constructor.
 //
@@ -10127,8 +8851,6 @@ void TParseContext::inheritMemoryQualifiers(const TQualifier& from, TQualifier&
         to.coherent = from.coherent;
     if (from.volatil)
         to.volatil = from.volatil;
-    if (from.nontemporal)
-        to.nontemporal = from.nontemporal;
     if (from.restrict)
         to.restrict = from.restrict;
 }
@@ -10158,9 +8880,9 @@ void TParseContext::updateBindlessQualifier(TType& memberType)
 }
 
 //
-// Do everything needed to add an interface block. Returns the declarator node if there's an instance declaration.
+// Do everything needed to add an interface block.
 //
-TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeList, const TString* instanceName,
+void TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeList, const TString* instanceName,
     TArraySizes* arraySizes)
 {
     if (spvVersion.vulkan > 0 && spvVersion.vulkanRelaxed)
@@ -10217,16 +8939,13 @@ TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeL
 
         if (memberType.containsCoopMat())
             error(memberLoc, "member of block cannot be or contain a cooperative matrix type", typeList[member].type->getFieldName().c_str(), "");
-
-        if (memberType.containsCoopVec())
-            error(memberLoc, "member of block cannot be or contain a cooperative vector type", typeList[member].type->getFieldName().c_str(), "");
     }
 
     // This might be a redeclaration of a built-in block.  If so, redeclareBuiltinBlock() will
     // do all the rest.
     if (! symbolTable.atBuiltInLevel() && builtInName(*blockName)) {
         redeclareBuiltinBlock(loc, typeList, *blockName, instanceName, arraySizes);
-        return nullptr;
+        return;
     }
 
     // Not a redeclaration of a built-in; check that all names are user names.
@@ -10392,7 +9111,7 @@ TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeL
             }
         }
         if (!instanceName) {
-            return nullptr;
+            return;
         }
     } else {
         //
@@ -10415,11 +9134,11 @@ TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeL
             if (existingName->getType().getBasicType() == EbtBlock) {
                 if (existingName->getType().getQualifier().storage == blockType.getQualifier().storage) {
                     error(loc, "Cannot reuse block name within the same interface:", blockName->c_str(), blockType.getStorageQualifierString());
-                    return nullptr;
+                    return;
                 }
             } else {
                 error(loc, "block name cannot redefine a non-block name", blockName->c_str(), "");
-                return nullptr;
+                return;
             }
         }
     }
@@ -10436,7 +9155,7 @@ TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeL
         else
             error(loc, "block instance name redefinition", variable.getName().c_str(), "");
 
-        return nullptr;
+        return;
     }
 
     // Check for general layout qualifier errors
@@ -10451,17 +9170,6 @@ TIntermNode* TParseContext::declareBlock(const TSourceLoc& loc, TTypeList& typeL
 
     // Save it in the AST for linker use.
     trackLinkage(variable);
-
-    TIntermAggregate* declNode = nullptr;
-    if (intermediate.getDebugInfo()) {
-        auto blockDeclNode = new TIntermVariableDecl(intermediate.addSymbol(variable, loc), nullptr);
-        blockDeclNode->setLoc(loc);
-
-        // We have to wrap the declaration with a sequence to fit the same processing logic with variables.
-        declNode = new TIntermAggregate(EOpSequence);
-        declNode->getSequence().push_back(blockDeclNode);
-    }
-    return declNode;
 }
 
 //
@@ -10550,10 +9258,6 @@ void TParseContext::blockStageIoCheck(const TSourceLoc& loc, const TQualifier& q
         profileRequires(loc, ~EEsProfile, 460, E_GL_NV_shader_invocation_reorder, "hitObjectAttributeNV block");
         requireStage(loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask | EShLangMissMask), "hitObjectAttributeNV block");
         break;
-    case EvqHitObjectAttrEXT:
-        profileRequires(loc, ~EEsProfile, 460, E_GL_EXT_shader_invocation_reorder, "hitObjectAttributeEXT block");
-        requireStage(loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask | EShLangMissMask), "hitObjectAttributeEXT block");
-        break;
     default:
         error(loc, "only uniform, buffer, in, or out blocks are supported", blockName->c_str(), "");
         break;
@@ -10850,15 +9554,6 @@ void TParseContext::addQualifierToExisting(const TSourceLoc& loc, TQualifier qua
     // type with an empty type list, which will be filled in later in
     // TParseContext::declareBlock.
     if (!symbol && qualifier.hasBufferReference()) {
-        // The layout qualifiers are ignored in forward declaration, give warning for the most probable to be seen
-        if (qualifier.hasBufferReferenceAlign()) {
-            warn(loc, "the buffer_reference_align layout is ignored when defined in forward declaration",
-                 identifier.c_str(), "");
-        }
-        if (qualifier.hasPacking()) {
-            warn(loc, "the packing layout (scalar, std430, etc) is ignored when defined in forward declaration",
-                 identifier.c_str(), "");
-        }
         TTypeList typeList;
         TType blockType(&typeList, identifier, qualifier);
         TType blockNameType(EbtReference, blockType, identifier);
@@ -11158,12 +9853,6 @@ void TParseContext::updateStandaloneQualifierDefaults(const TSourceLoc& loc, con
         else
             error(loc, "can only apply to 'in'", "non_coherent_stencil_attachment_readEXT", "");
     }
-    if (publicType.shaderQualifiers.layoutNonCoherentTileAttachmentReadQCOM) {
-        if (publicType.qualifier.storage == EvqVaryingIn)
-            intermediate.setNonCoherentTileAttachmentReadQCOM();
-        else
-            error(loc, "can only apply to 'in'", "non_coherent_attachment_readQCOM", "");
-    }
     if (publicType.shaderQualifiers.hasBlendEquation()) {
         if (publicType.qualifier.storage != EvqVaryingOut)
             error(loc, "can only apply to 'out'", "blend equation", "");
@@ -11184,8 +9873,8 @@ void TParseContext::updateStandaloneQualifierDefaults(const TSourceLoc& loc, con
 
     if (publicType.shaderQualifiers.layoutDerivativeGroupQuads) {
         if (publicType.qualifier.storage == EvqVaryingIn) {
-            if ((intermediate.getLocalSizeSpecId(0) == TQualifier::layoutNotSet && (intermediate.getLocalSize(0) & 1)) ||
-                (intermediate.getLocalSizeSpecId(1) == TQualifier::layoutNotSet && (intermediate.getLocalSize(1) & 1)))
+            if ((intermediate.getLocalSize(0) & 1) ||
+                (intermediate.getLocalSize(1) & 1))
                 error(loc, "requires local_size_x and local_size_y to be multiple of two", "derivative_group_quadsNV", "");
             else
                 intermediate.setLayoutDerivativeMode(LayoutDerivativeGroupQuads);
@@ -11195,10 +9884,7 @@ void TParseContext::updateStandaloneQualifierDefaults(const TSourceLoc& loc, con
     }
     if (publicType.shaderQualifiers.layoutDerivativeGroupLinear) {
         if (publicType.qualifier.storage == EvqVaryingIn) {
-            if (intermediate.getLocalSizeSpecId(0) == TQualifier::layoutNotSet &&
-                intermediate.getLocalSizeSpecId(1) == TQualifier::layoutNotSet &&
-                intermediate.getLocalSizeSpecId(2) == TQualifier::layoutNotSet &&
-                (intermediate.getLocalSize(0) *
+            if((intermediate.getLocalSize(0) *
                 intermediate.getLocalSize(1) *
                 intermediate.getLocalSize(2)) % 4 != 0)
                 error(loc, "requires total group size to be multiple of four", "derivative_group_linearNV", "");
@@ -11219,7 +9905,7 @@ void TParseContext::updateStandaloneQualifierDefaults(const TSourceLoc& loc, con
 
     if (publicType.shaderQualifiers.layoutPrimitiveCulling) {
         if (publicType.qualifier.storage != EvqTemporary)
-            error(loc, "layout qualifier cannot have storage qualifiers", "primitive_culling", "", "");
+            error(loc, "layout qualifier can not have storage qualifiers", "primitive_culling","", "");
         else {
             intermediate.setLayoutPrimitiveCulling();
         }
@@ -11227,16 +9913,6 @@ void TParseContext::updateStandaloneQualifierDefaults(const TSourceLoc& loc, con
         return;
     }
 
-    for (int i = 0; i < 3; ++i) {
-        if (publicType.shaderQualifiers.layoutTileShadingRateQCOMNotDefault[i]) {
-            if (publicType.qualifier.storage == EvqVaryingIn) {
-                if (! intermediate.setTileShadingRateQCOM(i, publicType.shaderQualifiers.layoutTileShadingRateQCOM[i]))
-                    error(loc, "cannot change previously set size", (i==0?"shading_rate_xQCOM":(i==1?"shading_rate_yQCOM":"shading_rate_zQCOM")), "");
-            } else
-                error(loc, "can only apply to 'in'", (i==0?"shading_rate_xQCOM":(i==1?"shading_rate_yQCOM":"shading_rate_zQCOM")), "");
-        }
-    }
-
     const TQualifier& qualifier = publicType.qualifier;
 
     if (qualifier.isAuxiliary() ||
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.h b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.h
index bf5cab2a..16902aef 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/ParseHelper.h
@@ -115,7 +115,7 @@ public:
 
     virtual void setLimits(const TBuiltInResource&) = 0;
 
-    void checkIndex(const TSourceLoc&, const TType&, int64_t& index);
+    void checkIndex(const TSourceLoc&, const TType&, int& index);
 
     EShLanguage getLanguage() const { return language; }
     void setScanContext(TScanContext* c) { scanContext = c; }
@@ -381,11 +381,10 @@ public:
     void rValueErrorCheck(const TSourceLoc&, const char* op, TIntermTyped*) override;
     void constantValueCheck(TIntermTyped* node, const char* token);
     void integerCheck(const TIntermTyped* node, const char* token);
-    void arrayIndexCheck(const TIntermTyped* node, const char* token);
     void globalCheck(const TSourceLoc&, const char* token);
     bool constructorError(const TSourceLoc&, TIntermNode*, TFunction&, TOperator, TType&);
     bool constructorTextureSamplerError(const TSourceLoc&, const TFunction&);
-    void arraySizeCheck(const TSourceLoc&, TIntermTyped* expr, TArraySize&, const char *sizeType, const bool isTypeParameter = false);
+    void arraySizeCheck(const TSourceLoc&, TIntermTyped* expr, TArraySize&, const char *sizeType, const bool allowZero = false);
     bool arrayQualifierError(const TSourceLoc&, const TQualifier&);
     bool arrayError(const TSourceLoc&, const TType&);
     void arraySizeRequiredCheck(const TSourceLoc&, const TArraySizes&);
@@ -398,8 +397,6 @@ public:
     void samplerCheck(const TSourceLoc&, const TType&, const TString& identifier, TIntermTyped* initializer);
     void atomicUintCheck(const TSourceLoc&, const TType&, const TString& identifier);
     void accStructCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
-    void hitObjectEXTCheck(const TSourceLoc& loc, const TType& type, const TString& identifier);
-    void hitObjectNVCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
     void transparentOpaqueCheck(const TSourceLoc&, const TType&, const TString& identifier);
     void memberQualifierCheck(glslang::TPublicType&);
     void globalQualifierFixCheck(const TSourceLoc&, TQualifier&, bool isMemberCheck = false, const TPublicType* publicType = nullptr);
@@ -409,7 +406,7 @@ public:
     void setDefaultPrecision(const TSourceLoc&, TPublicType&, TPrecisionQualifier);
     int computeSamplerTypeIndex(TSampler&);
     TPrecisionQualifier getDefaultPrecision(TPublicType&);
-    void precisionQualifierCheck(const TSourceLoc&, TBasicType, TQualifier&, bool hasTypeParameter);
+    void precisionQualifierCheck(const TSourceLoc&, TBasicType, TQualifier&, bool isCoopMat);
     void parameterTypeCheck(const TSourceLoc&, TStorageQualifier qualifier, const TType& type);
     bool containsFieldWithBasicType(const TType& type ,TBasicType basicType);
     TSymbol* redeclareBuiltinVariable(const TSourceLoc&, const TString&, const TQualifier&, const TShaderQualifiers&);
@@ -427,7 +424,7 @@ public:
     void inductiveLoopCheck(const TSourceLoc&, TIntermNode* init, TIntermLoop* loop);
     void arrayLimitCheck(const TSourceLoc&, const TString&, int size);
     void limitCheck(const TSourceLoc&, int value, const char* limit, const char* feature);
-    void typeParametersCheck(const TSourceLoc&, const TPublicType&);
+    void coopMatTypeParametersCheck(const TSourceLoc&, const TPublicType&);
 
     void inductiveLoopBodyCheck(TIntermNode*, long long loopIndexId, TSymbolTable&);
     void constantIndexExpressionCheck(TIntermNode*);
@@ -452,11 +449,8 @@ public:
     TIntermTyped* addConstructor(const TSourceLoc&, TIntermNode*, const TType&);
     TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&);
     TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset);
-    void makeVariadic(TFunction *F, const TSourceLoc &loc);
-    TParameter getParamWithDefault(const TPublicType& ty, TString* identifier, TIntermTyped* initializer,
-                                   const TSourceLoc& loc);
     void inheritMemoryQualifiers(const TQualifier& from, TQualifier& to);
-    TIntermNode* declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = nullptr, TArraySizes* arraySizes = nullptr);
+    void declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = nullptr, TArraySizes* arraySizes = nullptr);
     void blockStorageRemap(const TSourceLoc&, const TString*, TQualifier&);
     void blockStageIoCheck(const TSourceLoc&, const TQualifier&);
     void blockQualifierCheck(const TSourceLoc&, const TQualifier&, bool instanceName);
@@ -514,8 +508,6 @@ protected:
     TIntermNode* executeInitializer(const TSourceLoc&, TIntermTyped* initializer, TVariable* variable);
     TIntermTyped* convertInitializerList(const TSourceLoc&, const TType&, TIntermTyped* initializer);
     void finish() override;
-    void handleCoopMat2FunctionCall(const TSourceLoc& loc, const TFunction* fnCandidate, TIntermTyped* result, TIntermNode* arguments);
-    void handleVector2CoopMatConversionCall(const TSourceLoc& loc, const TFunction* fnCandidate, TIntermTyped* &result, TIntermNode* arguments);
 
     virtual const char* getGlobalUniformBlockName() const override;
     virtual void finalizeGlobalUniformBlockLayout(TVariable&) override;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/PoolAlloc.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/PoolAlloc.cpp
index 93a3b0d1..5d7173c9 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/PoolAlloc.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/PoolAlloc.cpp
@@ -35,21 +35,14 @@
 #include "../Include/Common.h"
 #include "../Include/PoolAlloc.h"
 
-// Mostly here for target that do not support threads such as WASI.
-#ifdef DISABLE_THREAD_SUPPORT
-#define THREAD_LOCAL 
-#else
-#define THREAD_LOCAL thread_local
-#endif
-
 namespace glslang {
 
 namespace {
-THREAD_LOCAL TPoolAllocator* threadPoolAllocator = nullptr;
+thread_local TPoolAllocator* threadPoolAllocator = nullptr;
 
 TPoolAllocator* GetDefaultThreadPoolAllocator()
 {
-    THREAD_LOCAL TPoolAllocator defaultAllocator;
+    thread_local TPoolAllocator defaultAllocator;
     return &defaultAllocator;
 }
 } // anonymous namespace
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/RemoveTree.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/RemoveTree.cpp
index 29baf1f1..1d33bfd2 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/RemoveTree.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/RemoveTree.cpp
@@ -43,7 +43,7 @@ namespace glslang {
 // Code to recursively delete the intermediate tree.
 //
 struct TRemoveTraverser : TIntermTraverser {
-    TRemoveTraverser() : TIntermTraverser(false, false, true, false, true) {}
+    TRemoveTraverser() : TIntermTraverser(false, false, true, false) {}
 
     virtual void visitSymbol(TIntermSymbol* node)
     {
@@ -103,12 +103,6 @@ struct TRemoveTraverser : TIntermTraverser {
 
         return true;
     }
-
-    virtual bool visitVariableDecl(TVisit /* visit */, TIntermVariableDecl* decl)
-    {
-        delete decl;
-        return true;
-    }
 };
 
 //
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Scan.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/Scan.cpp
index 8a08a3c8..44546596 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Scan.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Scan.cpp
@@ -322,508 +322,503 @@ struct str_hash
 };
 
 // A single global usable by all threads, by all versions, by all languages.
-const std::unordered_map<const char*, int, str_hash, str_eq> KeywordMap {
-    {"const",CONST},
-    {"uniform",UNIFORM},
-    {"tileImageEXT",TILEIMAGEEXT},
-    {"buffer",BUFFER},
-    {"in",IN},
-    {"out",OUT},
-    {"smooth",SMOOTH},
-    {"flat",FLAT},
-    {"centroid",CENTROID},
-    {"invariant",INVARIANT},
-    {"packed",PACKED},
-    {"resource",RESOURCE},
-    {"inout",INOUT},
-    {"struct",STRUCT},
-    {"break",BREAK},
-    {"continue",CONTINUE},
-    {"do",DO},
-    {"for",FOR},
-    {"while",WHILE},
-    {"switch",SWITCH},
-    {"case",CASE},
-    {"default",DEFAULT},
-    {"if",IF},
-    {"else",ELSE},
-    {"discard",DISCARD},
-    {"terminateInvocation",TERMINATE_INVOCATION},
-    {"terminateRayEXT",TERMINATE_RAY},
-    {"ignoreIntersectionEXT",IGNORE_INTERSECTION},
-    {"return",RETURN},
-    {"void",VOID},
-    {"bool",BOOL},
-    {"float",FLOAT},
-    {"int",INT},
-    {"bvec2",BVEC2},
-    {"bvec3",BVEC3},
-    {"bvec4",BVEC4},
-    {"vec2",VEC2},
-    {"vec3",VEC3},
-    {"vec4",VEC4},
-    {"ivec2",IVEC2},
-    {"ivec3",IVEC3},
-    {"ivec4",IVEC4},
-    {"mat2",MAT2},
-    {"mat3",MAT3},
-    {"mat4",MAT4},
-    {"true",BOOLCONSTANT},
-    {"false",BOOLCONSTANT},
-    {"layout",LAYOUT},
-    {"shared",SHARED},
-    {"highp",HIGH_PRECISION},
-    {"mediump",MEDIUM_PRECISION},
-    {"lowp",LOW_PRECISION},
-    {"superp",SUPERP},
-    {"precision",PRECISION},
-    {"mat2x2",MAT2X2},
-    {"mat2x3",MAT2X3},
-    {"mat2x4",MAT2X4},
-    {"mat3x2",MAT3X2},
-    {"mat3x3",MAT3X3},
-    {"mat3x4",MAT3X4},
-    {"mat4x2",MAT4X2},
-    {"mat4x3",MAT4X3},
-    {"mat4x4",MAT4X4},
-    {"uint",UINT},
-    {"uvec2",UVEC2},
-    {"uvec3",UVEC3},
-    {"uvec4",UVEC4},
-
-    {"nonuniformEXT",NONUNIFORM},
-    {"demote",DEMOTE},
-    {"attribute",ATTRIBUTE},
-    {"varying",VARYING},
-    {"noperspective",NOPERSPECTIVE},
-    {"coherent",COHERENT},
-    {"devicecoherent",DEVICECOHERENT},
-    {"queuefamilycoherent",QUEUEFAMILYCOHERENT},
-    {"workgroupcoherent",WORKGROUPCOHERENT},
-    {"subgroupcoherent",SUBGROUPCOHERENT},
-    {"shadercallcoherent",SHADERCALLCOHERENT},
-    {"nonprivate",NONPRIVATE},
-    {"restrict",RESTRICT},
-    {"readonly",READONLY},
-    {"writeonly",WRITEONLY},
-    {"atomic_uint",ATOMIC_UINT},
-    {"volatile",VOLATILE},
-    {"nontemporal",NONTEMPORAL},
-    {"patch",PATCH},
-    {"sample",SAMPLE},
-    {"subroutine",SUBROUTINE},
-    {"dmat2",DMAT2},
-    {"dmat3",DMAT3},
-    {"dmat4",DMAT4},
-    {"dmat2x2",DMAT2X2},
-    {"dmat2x3",DMAT2X3},
-    {"dmat2x4",DMAT2X4},
-    {"dmat3x2",DMAT3X2},
-    {"dmat3x3",DMAT3X3},
-    {"dmat3x4",DMAT3X4},
-    {"dmat4x2",DMAT4X2},
-    {"dmat4x3",DMAT4X3},
-    {"dmat4x4",DMAT4X4},
-    {"image1D",IMAGE1D},
-    {"iimage1D",IIMAGE1D},
-    {"uimage1D",UIMAGE1D},
-    {"image2D",IMAGE2D},
-    {"iimage2D",IIMAGE2D},
-    {"uimage2D",UIMAGE2D},
-    {"image3D",IMAGE3D},
-    {"iimage3D",IIMAGE3D},
-    {"uimage3D",UIMAGE3D},
-    {"image2DRect",IMAGE2DRECT},
-    {"iimage2DRect",IIMAGE2DRECT},
-    {"uimage2DRect",UIMAGE2DRECT},
-    {"imageCube",IMAGECUBE},
-    {"iimageCube",IIMAGECUBE},
-    {"uimageCube",UIMAGECUBE},
-    {"imageBuffer",IMAGEBUFFER},
-    {"iimageBuffer",IIMAGEBUFFER},
-    {"uimageBuffer",UIMAGEBUFFER},
-    {"image1DArray",IMAGE1DARRAY},
-    {"iimage1DArray",IIMAGE1DARRAY},
-    {"uimage1DArray",UIMAGE1DARRAY},
-    {"image2DArray",IMAGE2DARRAY},
-    {"iimage2DArray",IIMAGE2DARRAY},
-    {"uimage2DArray",UIMAGE2DARRAY},
-    {"imageCubeArray",IMAGECUBEARRAY},
-    {"iimageCubeArray",IIMAGECUBEARRAY},
-    {"uimageCubeArray",UIMAGECUBEARRAY},
-    {"image2DMS",IMAGE2DMS},
-    {"iimage2DMS",IIMAGE2DMS},
-    {"uimage2DMS",UIMAGE2DMS},
-    {"image2DMSArray",IMAGE2DMSARRAY},
-    {"iimage2DMSArray",IIMAGE2DMSARRAY},
-    {"uimage2DMSArray",UIMAGE2DMSARRAY},
-    {"i64image1D",I64IMAGE1D},
-    {"u64image1D",U64IMAGE1D},
-    {"i64image2D",I64IMAGE2D},
-    {"u64image2D",U64IMAGE2D},
-    {"i64image3D",I64IMAGE3D},
-    {"u64image3D",U64IMAGE3D},
-    {"i64image2DRect",I64IMAGE2DRECT},
-    {"u64image2DRect",U64IMAGE2DRECT},
-    {"i64imageCube",I64IMAGECUBE},
-    {"u64imageCube",U64IMAGECUBE},
-    {"i64imageBuffer",I64IMAGEBUFFER},
-    {"u64imageBuffer",U64IMAGEBUFFER},
-    {"i64image1DArray",I64IMAGE1DARRAY},
-    {"u64image1DArray",U64IMAGE1DARRAY},
-    {"i64image2DArray",I64IMAGE2DARRAY},
-    {"u64image2DArray",U64IMAGE2DARRAY},
-    {"i64imageCubeArray",I64IMAGECUBEARRAY},
-    {"u64imageCubeArray",U64IMAGECUBEARRAY},
-    {"i64image2DMS",I64IMAGE2DMS},
-    {"u64image2DMS",U64IMAGE2DMS},
-    {"i64image2DMSArray",I64IMAGE2DMSARRAY},
-    {"u64image2DMSArray",U64IMAGE2DMSARRAY},
-    {"double",DOUBLE},
-    {"dvec2",DVEC2},
-    {"dvec3",DVEC3},
-    {"dvec4",DVEC4},
-    {"int64_t",INT64_T},
-    {"uint64_t",UINT64_T},
-    {"i64vec2",I64VEC2},
-    {"i64vec3",I64VEC3},
-    {"i64vec4",I64VEC4},
-    {"u64vec2",U64VEC2},
-    {"u64vec3",U64VEC3},
-    {"u64vec4",U64VEC4},
-
-    // GL_EXT_shader_explicit_arithmetic_types
-    {"int8_t",INT8_T},
-    {"i8vec2",I8VEC2},
-    {"i8vec3",I8VEC3},
-    {"i8vec4",I8VEC4},
-    {"uint8_t",UINT8_T},
-    {"u8vec2",U8VEC2},
-    {"u8vec3",U8VEC3},
-    {"u8vec4",U8VEC4},
-
-    {"int16_t",INT16_T},
-    {"i16vec2",I16VEC2},
-    {"i16vec3",I16VEC3},
-    {"i16vec4",I16VEC4},
-    {"uint16_t",UINT16_T},
-    {"u16vec2",U16VEC2},
-    {"u16vec3",U16VEC3},
-    {"u16vec4",U16VEC4},
-
-    {"int32_t",INT32_T},
-    {"i32vec2",I32VEC2},
-    {"i32vec3",I32VEC3},
-    {"i32vec4",I32VEC4},
-    {"uint32_t",UINT32_T},
-    {"u32vec2",U32VEC2},
-    {"u32vec3",U32VEC3},
-    {"u32vec4",U32VEC4},
-
-    {"float16_t",FLOAT16_T},
-    {"f16vec2",F16VEC2},
-    {"f16vec3",F16VEC3},
-    {"f16vec4",F16VEC4},
-    {"f16mat2",F16MAT2},
-    {"f16mat3",F16MAT3},
-    {"f16mat4",F16MAT4},
-    {"f16mat2x2",F16MAT2X2},
-    {"f16mat2x3",F16MAT2X3},
-    {"f16mat2x4",F16MAT2X4},
-    {"f16mat3x2",F16MAT3X2},
-    {"f16mat3x3",F16MAT3X3},
-    {"f16mat3x4",F16MAT3X4},
-    {"f16mat4x2",F16MAT4X2},
-    {"f16mat4x3",F16MAT4X3},
-    {"f16mat4x4",F16MAT4X4},
-
-    {"bfloat16_t",BFLOAT16_T},
-    {"bf16vec2",BF16VEC2},
-    {"bf16vec3",BF16VEC3},
-    {"bf16vec4",BF16VEC4},
-
-    {"floate5m2_t",FLOATE5M2_T},
-    {"fe5m2vec2",FE5M2VEC2},
-    {"fe5m2vec3",FE5M2VEC3},
-    {"fe5m2vec4",FE5M2VEC4},
-
-    {"floate4m3_t",FLOATE4M3_T},
-    {"fe4m3vec2",FE4M3VEC2},
-    {"fe4m3vec3",FE4M3VEC3},
-    {"fe4m3vec4",FE4M3VEC4},
-
-    {"float32_t",FLOAT32_T},
-    {"f32vec2",F32VEC2},
-    {"f32vec3",F32VEC3},
-    {"f32vec4",F32VEC4},
-    {"f32mat2",F32MAT2},
-    {"f32mat3",F32MAT3},
-    {"f32mat4",F32MAT4},
-    {"f32mat2x2",F32MAT2X2},
-    {"f32mat2x3",F32MAT2X3},
-    {"f32mat2x4",F32MAT2X4},
-    {"f32mat3x2",F32MAT3X2},
-    {"f32mat3x3",F32MAT3X3},
-    {"f32mat3x4",F32MAT3X4},
-    {"f32mat4x2",F32MAT4X2},
-    {"f32mat4x3",F32MAT4X3},
-    {"f32mat4x4",F32MAT4X4},
-    {"float64_t",FLOAT64_T},
-    {"f64vec2",F64VEC2},
-    {"f64vec3",F64VEC3},
-    {"f64vec4",F64VEC4},
-    {"f64mat2",F64MAT2},
-    {"f64mat3",F64MAT3},
-    {"f64mat4",F64MAT4},
-    {"f64mat2x2",F64MAT2X2},
-    {"f64mat2x3",F64MAT2X3},
-    {"f64mat2x4",F64MAT2X4},
-    {"f64mat3x2",F64MAT3X2},
-    {"f64mat3x3",F64MAT3X3},
-    {"f64mat3x4",F64MAT3X4},
-    {"f64mat4x2",F64MAT4X2},
-    {"f64mat4x3",F64MAT4X3},
-    {"f64mat4x4",F64MAT4X4},
-
-    // GL_EXT_spirv_intrinsics
-    {"spirv_instruction",SPIRV_INSTRUCTION},
-    {"spirv_execution_mode",SPIRV_EXECUTION_MODE},
-    {"spirv_execution_mode_id",SPIRV_EXECUTION_MODE_ID},
-    {"spirv_decorate",SPIRV_DECORATE},
-    {"spirv_decorate_id",SPIRV_DECORATE_ID},
-    {"spirv_decorate_string",SPIRV_DECORATE_STRING},
-    {"spirv_type",SPIRV_TYPE},
-    {"spirv_storage_class",SPIRV_STORAGE_CLASS},
-    {"spirv_by_reference",SPIRV_BY_REFERENCE},
-    {"spirv_literal",SPIRV_LITERAL},
-
-    {"sampler2D",SAMPLER2D},
-    {"samplerCube",SAMPLERCUBE},
-    {"samplerCubeShadow",SAMPLERCUBESHADOW},
-    {"sampler2DArray",SAMPLER2DARRAY},
-    {"sampler2DArrayShadow",SAMPLER2DARRAYSHADOW},
-    {"isampler2D",ISAMPLER2D},
-    {"isampler3D",ISAMPLER3D},
-    {"isamplerCube",ISAMPLERCUBE},
-    {"isampler2DArray",ISAMPLER2DARRAY},
-    {"usampler2D",USAMPLER2D},
-    {"usampler3D",USAMPLER3D},
-    {"usamplerCube",USAMPLERCUBE},
-    {"usampler2DArray",USAMPLER2DARRAY},
-    {"sampler3D",SAMPLER3D},
-    {"sampler2DShadow",SAMPLER2DSHADOW},
-
-    {"texture2D",TEXTURE2D},
-    {"textureCube",TEXTURECUBE},
-    {"texture2DArray",TEXTURE2DARRAY},
-    {"itexture2D",ITEXTURE2D},
-    {"itexture3D",ITEXTURE3D},
-    {"itextureCube",ITEXTURECUBE},
-    {"itexture2DArray",ITEXTURE2DARRAY},
-    {"utexture2D",UTEXTURE2D},
-    {"utexture3D",UTEXTURE3D},
-    {"utextureCube",UTEXTURECUBE},
-    {"utexture2DArray",UTEXTURE2DARRAY},
-    {"texture3D",TEXTURE3D},
-
-    {"sampler",SAMPLER},
-    {"samplerShadow",SAMPLERSHADOW},
-
-    {"textureCubeArray",TEXTURECUBEARRAY},
-    {"itextureCubeArray",ITEXTURECUBEARRAY},
-    {"utextureCubeArray",UTEXTURECUBEARRAY},
-    {"samplerCubeArray",SAMPLERCUBEARRAY},
-    {"samplerCubeArrayShadow",SAMPLERCUBEARRAYSHADOW},
-    {"isamplerCubeArray",ISAMPLERCUBEARRAY},
-    {"usamplerCubeArray",USAMPLERCUBEARRAY},
-    {"sampler1DArrayShadow",SAMPLER1DARRAYSHADOW},
-    {"isampler1DArray",ISAMPLER1DARRAY},
-    {"usampler1D",USAMPLER1D},
-    {"isampler1D",ISAMPLER1D},
-    {"usampler1DArray",USAMPLER1DARRAY},
-    {"samplerBuffer",SAMPLERBUFFER},
-    {"isampler2DRect",ISAMPLER2DRECT},
-    {"usampler2DRect",USAMPLER2DRECT},
-    {"isamplerBuffer",ISAMPLERBUFFER},
-    {"usamplerBuffer",USAMPLERBUFFER},
-    {"sampler2DMS",SAMPLER2DMS},
-    {"isampler2DMS",ISAMPLER2DMS},
-    {"usampler2DMS",USAMPLER2DMS},
-    {"sampler2DMSArray",SAMPLER2DMSARRAY},
-    {"isampler2DMSArray",ISAMPLER2DMSARRAY},
-    {"usampler2DMSArray",USAMPLER2DMSARRAY},
-    {"sampler1D",SAMPLER1D},
-    {"sampler1DShadow",SAMPLER1DSHADOW},
-    {"sampler2DRect",SAMPLER2DRECT},
-    {"sampler2DRectShadow",SAMPLER2DRECTSHADOW},
-    {"sampler1DArray",SAMPLER1DARRAY},
-
-    {"samplerExternalOES",     SAMPLEREXTERNALOES}, // GL_OES_EGL_image_external
-    {"__samplerExternal2DY2YEXT", SAMPLEREXTERNAL2DY2YEXT}, // GL_EXT_YUV_target
-
-    {"itexture1DArray",ITEXTURE1DARRAY},
-    {"utexture1D",UTEXTURE1D},
-    {"itexture1D",ITEXTURE1D},
-    {"utexture1DArray",UTEXTURE1DARRAY},
-    {"textureBuffer",TEXTUREBUFFER},
-    {"itexture2DRect",ITEXTURE2DRECT},
-    {"utexture2DRect",UTEXTURE2DRECT},
-    {"itextureBuffer",ITEXTUREBUFFER},
-    {"utextureBuffer",UTEXTUREBUFFER},
-    {"texture2DMS",TEXTURE2DMS},
-    {"itexture2DMS",ITEXTURE2DMS},
-    {"utexture2DMS",UTEXTURE2DMS},
-    {"texture2DMSArray",TEXTURE2DMSARRAY},
-    {"itexture2DMSArray",ITEXTURE2DMSARRAY},
-    {"utexture2DMSArray",UTEXTURE2DMSARRAY},
-    {"texture1D",TEXTURE1D},
-    {"texture2DRect",TEXTURE2DRECT},
-    {"texture1DArray",TEXTURE1DARRAY},
-
-    {"attachmentEXT",ATTACHMENTEXT},
-    {"iattachmentEXT",IATTACHMENTEXT},
-    {"uattachmentEXT",UATTACHMENTEXT},
-
-    {"subpassInput",SUBPASSINPUT},
-    {"subpassInputMS",SUBPASSINPUTMS},
-    {"isubpassInput",ISUBPASSINPUT},
-    {"isubpassInputMS",ISUBPASSINPUTMS},
-    {"usubpassInput",USUBPASSINPUT},
-    {"usubpassInputMS",USUBPASSINPUTMS},
-
-    {"f16sampler1D",F16SAMPLER1D},
-    {"f16sampler2D",F16SAMPLER2D},
-    {"f16sampler3D",F16SAMPLER3D},
-    {"f16sampler2DRect",F16SAMPLER2DRECT},
-    {"f16samplerCube",F16SAMPLERCUBE},
-    {"f16sampler1DArray",F16SAMPLER1DARRAY},
-    {"f16sampler2DArray",F16SAMPLER2DARRAY},
-    {"f16samplerCubeArray",F16SAMPLERCUBEARRAY},
-    {"f16samplerBuffer",F16SAMPLERBUFFER},
-    {"f16sampler2DMS",F16SAMPLER2DMS},
-    {"f16sampler2DMSArray",F16SAMPLER2DMSARRAY},
-    {"f16sampler1DShadow",F16SAMPLER1DSHADOW},
-    {"f16sampler2DShadow",F16SAMPLER2DSHADOW},
-    {"f16sampler2DRectShadow",F16SAMPLER2DRECTSHADOW},
-    {"f16samplerCubeShadow",F16SAMPLERCUBESHADOW},
-    {"f16sampler1DArrayShadow",F16SAMPLER1DARRAYSHADOW},
-    {"f16sampler2DArrayShadow",F16SAMPLER2DARRAYSHADOW},
-    {"f16samplerCubeArrayShadow",F16SAMPLERCUBEARRAYSHADOW},
-
-    {"f16image1D",F16IMAGE1D},
-    {"f16image2D",F16IMAGE2D},
-    {"f16image3D",F16IMAGE3D},
-    {"f16image2DRect",F16IMAGE2DRECT},
-    {"f16imageCube",F16IMAGECUBE},
-    {"f16image1DArray",F16IMAGE1DARRAY},
-    {"f16image2DArray",F16IMAGE2DARRAY},
-    {"f16imageCubeArray",F16IMAGECUBEARRAY},
-    {"f16imageBuffer",F16IMAGEBUFFER},
-    {"f16image2DMS",F16IMAGE2DMS},
-    {"f16image2DMSArray",F16IMAGE2DMSARRAY},
-
-    {"f16texture1D",F16TEXTURE1D},
-    {"f16texture2D",F16TEXTURE2D},
-    {"f16texture3D",F16TEXTURE3D},
-    {"f16texture2DRect",F16TEXTURE2DRECT},
-    {"f16textureCube",F16TEXTURECUBE},
-    {"f16texture1DArray",F16TEXTURE1DARRAY},
-    {"f16texture2DArray",F16TEXTURE2DARRAY},
-    {"f16textureCubeArray",F16TEXTURECUBEARRAY},
-    {"f16textureBuffer",F16TEXTUREBUFFER},
-    {"f16texture2DMS",F16TEXTURE2DMS},
-    {"f16texture2DMSArray",F16TEXTURE2DMSARRAY},
-
-    {"f16subpassInput",F16SUBPASSINPUT},
-    {"f16subpassInputMS",F16SUBPASSINPUTMS},
-    {"__explicitInterpAMD",EXPLICITINTERPAMD},
-    {"pervertexNV",PERVERTEXNV},
-    {"pervertexEXT",PERVERTEXEXT},
-    {"precise",PRECISE},
-
-    {"rayPayloadNV",PAYLOADNV},
-    {"rayPayloadEXT",PAYLOADEXT},
-    {"rayPayloadInNV",PAYLOADINNV},
-    {"rayPayloadInEXT",PAYLOADINEXT},
-    {"hitAttributeNV",HITATTRNV},
-    {"hitAttributeEXT",HITATTREXT},
-    {"callableDataNV",CALLDATANV},
-    {"callableDataEXT",CALLDATAEXT},
-    {"callableDataInNV",CALLDATAINNV},
-    {"callableDataInEXT",CALLDATAINEXT},
-    {"accelerationStructureNV",ACCSTRUCTNV},
-    {"accelerationStructureEXT",ACCSTRUCTEXT},
-    {"rayQueryEXT",RAYQUERYEXT},
-    {"perprimitiveNV",PERPRIMITIVENV},
-    {"perviewNV",PERVIEWNV},
-    {"taskNV",PERTASKNV},
-    {"perprimitiveEXT",PERPRIMITIVEEXT},
-    {"taskPayloadSharedEXT",TASKPAYLOADWORKGROUPEXT},
-
-    {"fcoopmatNV",FCOOPMATNV},
-    {"icoopmatNV",ICOOPMATNV},
-    {"ucoopmatNV",UCOOPMATNV},
-
-    {"coopmat",COOPMAT},
-
-    {"hitObjectNV",HITOBJECTNV},
-    {"hitObjectAttributeNV",HITOBJECTATTRNV},
-
-    {"tensorARM",TENSORARM},
-
-    {"hitObjectEXT",HITOBJECTEXT},
-    {"hitObjectAttributeEXT",HITOBJECTATTREXT},
-
-    {"__function",FUNCTION},
-    {"tensorLayoutNV",TENSORLAYOUTNV},
-    {"tensorViewNV",TENSORVIEWNV},
-
-    {"coopvecNV",COOPVECNV},
-};
-const std::unordered_set<const char*, str_hash, str_eq> ReservedSet {
-    "common",
-    "partition",
-    "active",
-    "asm",
-    "class",
-    "union",
-    "enum",
-    "typedef",
-    "template",
-    "this",
-    "goto",
-    "inline",
-    "noinline",
-    "public",
-    "static",
-    "extern",
-    "external",
-    "interface",
-    "long",
-    "short",
-    "half",
-    "fixed",
-    "unsigned",
-    "input",
-    "output",
-    "hvec2",
-    "hvec3",
-    "hvec4",
-    "fvec2",
-    "fvec3",
-    "fvec4",
-    "sampler3DRect",
-    "filter",
-    "sizeof",
-    "cast",
-    "namespace",
-    "using",
-};
+// After a single process-level initialization, this is read only and thread safe
+std::unordered_map<const char*, int, str_hash, str_eq>* KeywordMap = nullptr;
+std::unordered_set<const char*, str_hash, str_eq>* ReservedSet = nullptr;
 
 }
 
 namespace glslang {
 
+void TScanContext::fillInKeywordMap()
+{
+    if (KeywordMap != nullptr) {
+        // this is really an error, as this should called only once per process
+        // but, the only risk is if two threads called simultaneously
+        return;
+    }
+    KeywordMap = new std::unordered_map<const char*, int, str_hash, str_eq>;
+
+    (*KeywordMap)["const"] =                   CONST;
+    (*KeywordMap)["uniform"] =                 UNIFORM;
+    (*KeywordMap)["tileImageEXT"] =            TILEIMAGEEXT;
+    (*KeywordMap)["buffer"] =                  BUFFER;
+    (*KeywordMap)["in"] =                      IN;
+    (*KeywordMap)["out"] =                     OUT;
+    (*KeywordMap)["smooth"] =                  SMOOTH;
+    (*KeywordMap)["flat"] =                    FLAT;
+    (*KeywordMap)["centroid"] =                CENTROID;
+    (*KeywordMap)["invariant"] =               INVARIANT;
+    (*KeywordMap)["packed"] =                  PACKED;
+    (*KeywordMap)["resource"] =                RESOURCE;
+    (*KeywordMap)["inout"] =                   INOUT;
+    (*KeywordMap)["struct"] =                  STRUCT;
+    (*KeywordMap)["break"] =                   BREAK;
+    (*KeywordMap)["continue"] =                CONTINUE;
+    (*KeywordMap)["do"] =                      DO;
+    (*KeywordMap)["for"] =                     FOR;
+    (*KeywordMap)["while"] =                   WHILE;
+    (*KeywordMap)["switch"] =                  SWITCH;
+    (*KeywordMap)["case"] =                    CASE;
+    (*KeywordMap)["default"] =                 DEFAULT;
+    (*KeywordMap)["if"] =                      IF;
+    (*KeywordMap)["else"] =                    ELSE;
+    (*KeywordMap)["discard"] =                 DISCARD;
+    (*KeywordMap)["terminateInvocation"] =     TERMINATE_INVOCATION;
+    (*KeywordMap)["terminateRayEXT"] =         TERMINATE_RAY;
+    (*KeywordMap)["ignoreIntersectionEXT"] =   IGNORE_INTERSECTION;
+    (*KeywordMap)["return"] =                  RETURN;
+    (*KeywordMap)["void"] =                    VOID;
+    (*KeywordMap)["bool"] =                    BOOL;
+    (*KeywordMap)["float"] =                   FLOAT;
+    (*KeywordMap)["int"] =                     INT;
+    (*KeywordMap)["bvec2"] =                   BVEC2;
+    (*KeywordMap)["bvec3"] =                   BVEC3;
+    (*KeywordMap)["bvec4"] =                   BVEC4;
+    (*KeywordMap)["vec2"] =                    VEC2;
+    (*KeywordMap)["vec3"] =                    VEC3;
+    (*KeywordMap)["vec4"] =                    VEC4;
+    (*KeywordMap)["ivec2"] =                   IVEC2;
+    (*KeywordMap)["ivec3"] =                   IVEC3;
+    (*KeywordMap)["ivec4"] =                   IVEC4;
+    (*KeywordMap)["mat2"] =                    MAT2;
+    (*KeywordMap)["mat3"] =                    MAT3;
+    (*KeywordMap)["mat4"] =                    MAT4;
+    (*KeywordMap)["true"] =                    BOOLCONSTANT;
+    (*KeywordMap)["false"] =                   BOOLCONSTANT;
+    (*KeywordMap)["layout"] =                  LAYOUT;
+    (*KeywordMap)["shared"] =                  SHARED;
+    (*KeywordMap)["highp"] =                   HIGH_PRECISION;
+    (*KeywordMap)["mediump"] =                 MEDIUM_PRECISION;
+    (*KeywordMap)["lowp"] =                    LOW_PRECISION;
+    (*KeywordMap)["superp"] =                  SUPERP;
+    (*KeywordMap)["precision"] =               PRECISION;
+    (*KeywordMap)["mat2x2"] =                  MAT2X2;
+    (*KeywordMap)["mat2x3"] =                  MAT2X3;
+    (*KeywordMap)["mat2x4"] =                  MAT2X4;
+    (*KeywordMap)["mat3x2"] =                  MAT3X2;
+    (*KeywordMap)["mat3x3"] =                  MAT3X3;
+    (*KeywordMap)["mat3x4"] =                  MAT3X4;
+    (*KeywordMap)["mat4x2"] =                  MAT4X2;
+    (*KeywordMap)["mat4x3"] =                  MAT4X3;
+    (*KeywordMap)["mat4x4"] =                  MAT4X4;
+    (*KeywordMap)["uint"] =                    UINT;
+    (*KeywordMap)["uvec2"] =                   UVEC2;
+    (*KeywordMap)["uvec3"] =                   UVEC3;
+    (*KeywordMap)["uvec4"] =                   UVEC4;
+
+    (*KeywordMap)["nonuniformEXT"] =           NONUNIFORM;
+    (*KeywordMap)["demote"] =                  DEMOTE;
+    (*KeywordMap)["attribute"] =               ATTRIBUTE;
+    (*KeywordMap)["varying"] =                 VARYING;
+    (*KeywordMap)["noperspective"] =           NOPERSPECTIVE;
+    (*KeywordMap)["coherent"] =                COHERENT;
+    (*KeywordMap)["devicecoherent"] =          DEVICECOHERENT;
+    (*KeywordMap)["queuefamilycoherent"] =     QUEUEFAMILYCOHERENT;
+    (*KeywordMap)["workgroupcoherent"] =       WORKGROUPCOHERENT;
+    (*KeywordMap)["subgroupcoherent"] =        SUBGROUPCOHERENT;
+    (*KeywordMap)["shadercallcoherent"] =      SHADERCALLCOHERENT;
+    (*KeywordMap)["nonprivate"] =              NONPRIVATE;
+    (*KeywordMap)["restrict"] =                RESTRICT;
+    (*KeywordMap)["readonly"] =                READONLY;
+    (*KeywordMap)["writeonly"] =               WRITEONLY;
+    (*KeywordMap)["atomic_uint"] =             ATOMIC_UINT;
+    (*KeywordMap)["volatile"] =                VOLATILE;
+    (*KeywordMap)["patch"] =                   PATCH;
+    (*KeywordMap)["sample"] =                  SAMPLE;
+    (*KeywordMap)["subroutine"] =              SUBROUTINE;
+    (*KeywordMap)["dmat2"] =                   DMAT2;
+    (*KeywordMap)["dmat3"] =                   DMAT3;
+    (*KeywordMap)["dmat4"] =                   DMAT4;
+    (*KeywordMap)["dmat2x2"] =                 DMAT2X2;
+    (*KeywordMap)["dmat2x3"] =                 DMAT2X3;
+    (*KeywordMap)["dmat2x4"] =                 DMAT2X4;
+    (*KeywordMap)["dmat3x2"] =                 DMAT3X2;
+    (*KeywordMap)["dmat3x3"] =                 DMAT3X3;
+    (*KeywordMap)["dmat3x4"] =                 DMAT3X4;
+    (*KeywordMap)["dmat4x2"] =                 DMAT4X2;
+    (*KeywordMap)["dmat4x3"] =                 DMAT4X3;
+    (*KeywordMap)["dmat4x4"] =                 DMAT4X4;
+    (*KeywordMap)["image1D"] =                 IMAGE1D;
+    (*KeywordMap)["iimage1D"] =                IIMAGE1D;
+    (*KeywordMap)["uimage1D"] =                UIMAGE1D;
+    (*KeywordMap)["image2D"] =                 IMAGE2D;
+    (*KeywordMap)["iimage2D"] =                IIMAGE2D;
+    (*KeywordMap)["uimage2D"] =                UIMAGE2D;
+    (*KeywordMap)["image3D"] =                 IMAGE3D;
+    (*KeywordMap)["iimage3D"] =                IIMAGE3D;
+    (*KeywordMap)["uimage3D"] =                UIMAGE3D;
+    (*KeywordMap)["image2DRect"] =             IMAGE2DRECT;
+    (*KeywordMap)["iimage2DRect"] =            IIMAGE2DRECT;
+    (*KeywordMap)["uimage2DRect"] =            UIMAGE2DRECT;
+    (*KeywordMap)["imageCube"] =               IMAGECUBE;
+    (*KeywordMap)["iimageCube"] =              IIMAGECUBE;
+    (*KeywordMap)["uimageCube"] =              UIMAGECUBE;
+    (*KeywordMap)["imageBuffer"] =             IMAGEBUFFER;
+    (*KeywordMap)["iimageBuffer"] =            IIMAGEBUFFER;
+    (*KeywordMap)["uimageBuffer"] =            UIMAGEBUFFER;
+    (*KeywordMap)["image1DArray"] =            IMAGE1DARRAY;
+    (*KeywordMap)["iimage1DArray"] =           IIMAGE1DARRAY;
+    (*KeywordMap)["uimage1DArray"] =           UIMAGE1DARRAY;
+    (*KeywordMap)["image2DArray"] =            IMAGE2DARRAY;
+    (*KeywordMap)["iimage2DArray"] =           IIMAGE2DARRAY;
+    (*KeywordMap)["uimage2DArray"] =           UIMAGE2DARRAY;
+    (*KeywordMap)["imageCubeArray"] =          IMAGECUBEARRAY;
+    (*KeywordMap)["iimageCubeArray"] =         IIMAGECUBEARRAY;
+    (*KeywordMap)["uimageCubeArray"] =         UIMAGECUBEARRAY;
+    (*KeywordMap)["image2DMS"] =               IMAGE2DMS;
+    (*KeywordMap)["iimage2DMS"] =              IIMAGE2DMS;
+    (*KeywordMap)["uimage2DMS"] =              UIMAGE2DMS;
+    (*KeywordMap)["image2DMSArray"] =          IMAGE2DMSARRAY;
+    (*KeywordMap)["iimage2DMSArray"] =         IIMAGE2DMSARRAY;
+    (*KeywordMap)["uimage2DMSArray"] =         UIMAGE2DMSARRAY;
+    (*KeywordMap)["i64image1D"] =              I64IMAGE1D;
+    (*KeywordMap)["u64image1D"] =              U64IMAGE1D;
+    (*KeywordMap)["i64image2D"] =              I64IMAGE2D;
+    (*KeywordMap)["u64image2D"] =              U64IMAGE2D;
+    (*KeywordMap)["i64image3D"] =              I64IMAGE3D;
+    (*KeywordMap)["u64image3D"] =              U64IMAGE3D;
+    (*KeywordMap)["i64image2DRect"] =          I64IMAGE2DRECT;
+    (*KeywordMap)["u64image2DRect"] =          U64IMAGE2DRECT;
+    (*KeywordMap)["i64imageCube"] =            I64IMAGECUBE;
+    (*KeywordMap)["u64imageCube"] =            U64IMAGECUBE;
+    (*KeywordMap)["i64imageBuffer"] =          I64IMAGEBUFFER;
+    (*KeywordMap)["u64imageBuffer"] =          U64IMAGEBUFFER;
+    (*KeywordMap)["i64image1DArray"] =         I64IMAGE1DARRAY;
+    (*KeywordMap)["u64image1DArray"] =         U64IMAGE1DARRAY;
+    (*KeywordMap)["i64image2DArray"] =         I64IMAGE2DARRAY;
+    (*KeywordMap)["u64image2DArray"] =         U64IMAGE2DARRAY;
+    (*KeywordMap)["i64imageCubeArray"] =       I64IMAGECUBEARRAY;
+    (*KeywordMap)["u64imageCubeArray"] =       U64IMAGECUBEARRAY;
+    (*KeywordMap)["i64image2DMS"] =            I64IMAGE2DMS;
+    (*KeywordMap)["u64image2DMS"] =            U64IMAGE2DMS;
+    (*KeywordMap)["i64image2DMSArray"] =       I64IMAGE2DMSARRAY;
+    (*KeywordMap)["u64image2DMSArray"] =       U64IMAGE2DMSARRAY;
+    (*KeywordMap)["double"] =                  DOUBLE;
+    (*KeywordMap)["dvec2"] =                   DVEC2;
+    (*KeywordMap)["dvec3"] =                   DVEC3;
+    (*KeywordMap)["dvec4"] =                   DVEC4;
+    (*KeywordMap)["int64_t"] =                 INT64_T;
+    (*KeywordMap)["uint64_t"] =                UINT64_T;
+    (*KeywordMap)["i64vec2"] =                 I64VEC2;
+    (*KeywordMap)["i64vec3"] =                 I64VEC3;
+    (*KeywordMap)["i64vec4"] =                 I64VEC4;
+    (*KeywordMap)["u64vec2"] =                 U64VEC2;
+    (*KeywordMap)["u64vec3"] =                 U64VEC3;
+    (*KeywordMap)["u64vec4"] =                 U64VEC4;
+
+    // GL_EXT_shader_explicit_arithmetic_types
+    (*KeywordMap)["int8_t"] =                  INT8_T;
+    (*KeywordMap)["i8vec2"] =                  I8VEC2;
+    (*KeywordMap)["i8vec3"] =                  I8VEC3;
+    (*KeywordMap)["i8vec4"] =                  I8VEC4;
+    (*KeywordMap)["uint8_t"] =                 UINT8_T;
+    (*KeywordMap)["u8vec2"] =                  U8VEC2;
+    (*KeywordMap)["u8vec3"] =                  U8VEC3;
+    (*KeywordMap)["u8vec4"] =                  U8VEC4;
+
+    (*KeywordMap)["int16_t"] =                 INT16_T;
+    (*KeywordMap)["i16vec2"] =                 I16VEC2;
+    (*KeywordMap)["i16vec3"] =                 I16VEC3;
+    (*KeywordMap)["i16vec4"] =                 I16VEC4;
+    (*KeywordMap)["uint16_t"] =                UINT16_T;
+    (*KeywordMap)["u16vec2"] =                 U16VEC2;
+    (*KeywordMap)["u16vec3"] =                 U16VEC3;
+    (*KeywordMap)["u16vec4"] =                 U16VEC4;
+
+    (*KeywordMap)["int32_t"] =                 INT32_T;
+    (*KeywordMap)["i32vec2"] =                 I32VEC2;
+    (*KeywordMap)["i32vec3"] =                 I32VEC3;
+    (*KeywordMap)["i32vec4"] =                 I32VEC4;
+    (*KeywordMap)["uint32_t"] =                UINT32_T;
+    (*KeywordMap)["u32vec2"] =                 U32VEC2;
+    (*KeywordMap)["u32vec3"] =                 U32VEC3;
+    (*KeywordMap)["u32vec4"] =                 U32VEC4;
+
+    (*KeywordMap)["float16_t"] =               FLOAT16_T;
+    (*KeywordMap)["f16vec2"] =                 F16VEC2;
+    (*KeywordMap)["f16vec3"] =                 F16VEC3;
+    (*KeywordMap)["f16vec4"] =                 F16VEC4;
+    (*KeywordMap)["f16mat2"] =                 F16MAT2;
+    (*KeywordMap)["f16mat3"] =                 F16MAT3;
+    (*KeywordMap)["f16mat4"] =                 F16MAT4;
+    (*KeywordMap)["f16mat2x2"] =               F16MAT2X2;
+    (*KeywordMap)["f16mat2x3"] =               F16MAT2X3;
+    (*KeywordMap)["f16mat2x4"] =               F16MAT2X4;
+    (*KeywordMap)["f16mat3x2"] =               F16MAT3X2;
+    (*KeywordMap)["f16mat3x3"] =               F16MAT3X3;
+    (*KeywordMap)["f16mat3x4"] =               F16MAT3X4;
+    (*KeywordMap)["f16mat4x2"] =               F16MAT4X2;
+    (*KeywordMap)["f16mat4x3"] =               F16MAT4X3;
+    (*KeywordMap)["f16mat4x4"] =               F16MAT4X4;
+
+    (*KeywordMap)["float32_t"] =               FLOAT32_T;
+    (*KeywordMap)["f32vec2"] =                 F32VEC2;
+    (*KeywordMap)["f32vec3"] =                 F32VEC3;
+    (*KeywordMap)["f32vec4"] =                 F32VEC4;
+    (*KeywordMap)["f32mat2"] =                 F32MAT2;
+    (*KeywordMap)["f32mat3"] =                 F32MAT3;
+    (*KeywordMap)["f32mat4"] =                 F32MAT4;
+    (*KeywordMap)["f32mat2x2"] =               F32MAT2X2;
+    (*KeywordMap)["f32mat2x3"] =               F32MAT2X3;
+    (*KeywordMap)["f32mat2x4"] =               F32MAT2X4;
+    (*KeywordMap)["f32mat3x2"] =               F32MAT3X2;
+    (*KeywordMap)["f32mat3x3"] =               F32MAT3X3;
+    (*KeywordMap)["f32mat3x4"] =               F32MAT3X4;
+    (*KeywordMap)["f32mat4x2"] =               F32MAT4X2;
+    (*KeywordMap)["f32mat4x3"] =               F32MAT4X3;
+    (*KeywordMap)["f32mat4x4"] =               F32MAT4X4;
+    (*KeywordMap)["float64_t"] =               FLOAT64_T;
+    (*KeywordMap)["f64vec2"] =                 F64VEC2;
+    (*KeywordMap)["f64vec3"] =                 F64VEC3;
+    (*KeywordMap)["f64vec4"] =                 F64VEC4;
+    (*KeywordMap)["f64mat2"] =                 F64MAT2;
+    (*KeywordMap)["f64mat3"] =                 F64MAT3;
+    (*KeywordMap)["f64mat4"] =                 F64MAT4;
+    (*KeywordMap)["f64mat2x2"] =               F64MAT2X2;
+    (*KeywordMap)["f64mat2x3"] =               F64MAT2X3;
+    (*KeywordMap)["f64mat2x4"] =               F64MAT2X4;
+    (*KeywordMap)["f64mat3x2"] =               F64MAT3X2;
+    (*KeywordMap)["f64mat3x3"] =               F64MAT3X3;
+    (*KeywordMap)["f64mat3x4"] =               F64MAT3X4;
+    (*KeywordMap)["f64mat4x2"] =               F64MAT4X2;
+    (*KeywordMap)["f64mat4x3"] =               F64MAT4X3;
+    (*KeywordMap)["f64mat4x4"] =               F64MAT4X4;
+
+    // GL_EXT_spirv_intrinsics
+    (*KeywordMap)["spirv_instruction"] =       SPIRV_INSTRUCTION;
+    (*KeywordMap)["spirv_execution_mode"] =    SPIRV_EXECUTION_MODE;
+    (*KeywordMap)["spirv_execution_mode_id"] = SPIRV_EXECUTION_MODE_ID;
+    (*KeywordMap)["spirv_decorate"] =          SPIRV_DECORATE;
+    (*KeywordMap)["spirv_decorate_id"] =       SPIRV_DECORATE_ID;
+    (*KeywordMap)["spirv_decorate_string"] =   SPIRV_DECORATE_STRING;
+    (*KeywordMap)["spirv_type"] =              SPIRV_TYPE;
+    (*KeywordMap)["spirv_storage_class"] =     SPIRV_STORAGE_CLASS;
+    (*KeywordMap)["spirv_by_reference"] =      SPIRV_BY_REFERENCE;
+    (*KeywordMap)["spirv_literal"] =           SPIRV_LITERAL;
+
+    (*KeywordMap)["sampler2D"] =               SAMPLER2D;
+    (*KeywordMap)["samplerCube"] =             SAMPLERCUBE;
+    (*KeywordMap)["samplerCubeShadow"] =       SAMPLERCUBESHADOW;
+    (*KeywordMap)["sampler2DArray"] =          SAMPLER2DARRAY;
+    (*KeywordMap)["sampler2DArrayShadow"] =    SAMPLER2DARRAYSHADOW;
+    (*KeywordMap)["isampler2D"] =              ISAMPLER2D;
+    (*KeywordMap)["isampler3D"] =              ISAMPLER3D;
+    (*KeywordMap)["isamplerCube"] =            ISAMPLERCUBE;
+    (*KeywordMap)["isampler2DArray"] =         ISAMPLER2DARRAY;
+    (*KeywordMap)["usampler2D"] =              USAMPLER2D;
+    (*KeywordMap)["usampler3D"] =              USAMPLER3D;
+    (*KeywordMap)["usamplerCube"] =            USAMPLERCUBE;
+    (*KeywordMap)["usampler2DArray"] =         USAMPLER2DARRAY;
+    (*KeywordMap)["sampler3D"] =               SAMPLER3D;
+    (*KeywordMap)["sampler2DShadow"] =         SAMPLER2DSHADOW;
+
+    (*KeywordMap)["texture2D"] =               TEXTURE2D;
+    (*KeywordMap)["textureCube"] =             TEXTURECUBE;
+    (*KeywordMap)["texture2DArray"] =          TEXTURE2DARRAY;
+    (*KeywordMap)["itexture2D"] =              ITEXTURE2D;
+    (*KeywordMap)["itexture3D"] =              ITEXTURE3D;
+    (*KeywordMap)["itextureCube"] =            ITEXTURECUBE;
+    (*KeywordMap)["itexture2DArray"] =         ITEXTURE2DARRAY;
+    (*KeywordMap)["utexture2D"] =              UTEXTURE2D;
+    (*KeywordMap)["utexture3D"] =              UTEXTURE3D;
+    (*KeywordMap)["utextureCube"] =            UTEXTURECUBE;
+    (*KeywordMap)["utexture2DArray"] =         UTEXTURE2DARRAY;
+    (*KeywordMap)["texture3D"] =               TEXTURE3D;
+
+    (*KeywordMap)["sampler"] =                 SAMPLER;
+    (*KeywordMap)["samplerShadow"] =           SAMPLERSHADOW;
+
+    (*KeywordMap)["textureCubeArray"] =        TEXTURECUBEARRAY;
+    (*KeywordMap)["itextureCubeArray"] =       ITEXTURECUBEARRAY;
+    (*KeywordMap)["utextureCubeArray"] =       UTEXTURECUBEARRAY;
+    (*KeywordMap)["samplerCubeArray"] =        SAMPLERCUBEARRAY;
+    (*KeywordMap)["samplerCubeArrayShadow"] =  SAMPLERCUBEARRAYSHADOW;
+    (*KeywordMap)["isamplerCubeArray"] =       ISAMPLERCUBEARRAY;
+    (*KeywordMap)["usamplerCubeArray"] =       USAMPLERCUBEARRAY;
+    (*KeywordMap)["sampler1DArrayShadow"] =    SAMPLER1DARRAYSHADOW;
+    (*KeywordMap)["isampler1DArray"] =         ISAMPLER1DARRAY;
+    (*KeywordMap)["usampler1D"] =              USAMPLER1D;
+    (*KeywordMap)["isampler1D"] =              ISAMPLER1D;
+    (*KeywordMap)["usampler1DArray"] =         USAMPLER1DARRAY;
+    (*KeywordMap)["samplerBuffer"] =           SAMPLERBUFFER;
+    (*KeywordMap)["isampler2DRect"] =          ISAMPLER2DRECT;
+    (*KeywordMap)["usampler2DRect"] =          USAMPLER2DRECT;
+    (*KeywordMap)["isamplerBuffer"] =          ISAMPLERBUFFER;
+    (*KeywordMap)["usamplerBuffer"] =          USAMPLERBUFFER;
+    (*KeywordMap)["sampler2DMS"] =             SAMPLER2DMS;
+    (*KeywordMap)["isampler2DMS"] =            ISAMPLER2DMS;
+    (*KeywordMap)["usampler2DMS"] =            USAMPLER2DMS;
+    (*KeywordMap)["sampler2DMSArray"] =        SAMPLER2DMSARRAY;
+    (*KeywordMap)["isampler2DMSArray"] =       ISAMPLER2DMSARRAY;
+    (*KeywordMap)["usampler2DMSArray"] =       USAMPLER2DMSARRAY;
+    (*KeywordMap)["sampler1D"] =               SAMPLER1D;
+    (*KeywordMap)["sampler1DShadow"] =         SAMPLER1DSHADOW;
+    (*KeywordMap)["sampler2DRect"] =           SAMPLER2DRECT;
+    (*KeywordMap)["sampler2DRectShadow"] =     SAMPLER2DRECTSHADOW;
+    (*KeywordMap)["sampler1DArray"] =          SAMPLER1DARRAY;
+
+    (*KeywordMap)["samplerExternalOES"] =      SAMPLEREXTERNALOES; // GL_OES_EGL_image_external
+
+    (*KeywordMap)["__samplerExternal2DY2YEXT"] = SAMPLEREXTERNAL2DY2YEXT; // GL_EXT_YUV_target
+
+    (*KeywordMap)["itexture1DArray"] =         ITEXTURE1DARRAY;
+    (*KeywordMap)["utexture1D"] =              UTEXTURE1D;
+    (*KeywordMap)["itexture1D"] =              ITEXTURE1D;
+    (*KeywordMap)["utexture1DArray"] =         UTEXTURE1DARRAY;
+    (*KeywordMap)["textureBuffer"] =           TEXTUREBUFFER;
+    (*KeywordMap)["itexture2DRect"] =          ITEXTURE2DRECT;
+    (*KeywordMap)["utexture2DRect"] =          UTEXTURE2DRECT;
+    (*KeywordMap)["itextureBuffer"] =          ITEXTUREBUFFER;
+    (*KeywordMap)["utextureBuffer"] =          UTEXTUREBUFFER;
+    (*KeywordMap)["texture2DMS"] =             TEXTURE2DMS;
+    (*KeywordMap)["itexture2DMS"] =            ITEXTURE2DMS;
+    (*KeywordMap)["utexture2DMS"] =            UTEXTURE2DMS;
+    (*KeywordMap)["texture2DMSArray"] =        TEXTURE2DMSARRAY;
+    (*KeywordMap)["itexture2DMSArray"] =       ITEXTURE2DMSARRAY;
+    (*KeywordMap)["utexture2DMSArray"] =       UTEXTURE2DMSARRAY;
+    (*KeywordMap)["texture1D"] =               TEXTURE1D;
+    (*KeywordMap)["texture2DRect"] =           TEXTURE2DRECT;
+    (*KeywordMap)["texture1DArray"] =          TEXTURE1DARRAY;
+
+    (*KeywordMap)["attachmentEXT"] =           ATTACHMENTEXT;
+    (*KeywordMap)["iattachmentEXT"] =          IATTACHMENTEXT;
+    (*KeywordMap)["uattachmentEXT"] =          UATTACHMENTEXT;
+
+    (*KeywordMap)["subpassInput"] =            SUBPASSINPUT;
+    (*KeywordMap)["subpassInputMS"] =          SUBPASSINPUTMS;
+    (*KeywordMap)["isubpassInput"] =           ISUBPASSINPUT;
+    (*KeywordMap)["isubpassInputMS"] =         ISUBPASSINPUTMS;
+    (*KeywordMap)["usubpassInput"] =           USUBPASSINPUT;
+    (*KeywordMap)["usubpassInputMS"] =         USUBPASSINPUTMS;
+
+    (*KeywordMap)["f16sampler1D"] =                 F16SAMPLER1D;
+    (*KeywordMap)["f16sampler2D"] =                 F16SAMPLER2D;
+    (*KeywordMap)["f16sampler3D"] =                 F16SAMPLER3D;
+    (*KeywordMap)["f16sampler2DRect"] =             F16SAMPLER2DRECT;
+    (*KeywordMap)["f16samplerCube"] =               F16SAMPLERCUBE;
+    (*KeywordMap)["f16sampler1DArray"] =            F16SAMPLER1DARRAY;
+    (*KeywordMap)["f16sampler2DArray"] =            F16SAMPLER2DARRAY;
+    (*KeywordMap)["f16samplerCubeArray"] =          F16SAMPLERCUBEARRAY;
+    (*KeywordMap)["f16samplerBuffer"] =             F16SAMPLERBUFFER;
+    (*KeywordMap)["f16sampler2DMS"] =               F16SAMPLER2DMS;
+    (*KeywordMap)["f16sampler2DMSArray"] =          F16SAMPLER2DMSARRAY;
+    (*KeywordMap)["f16sampler1DShadow"] =           F16SAMPLER1DSHADOW;
+    (*KeywordMap)["f16sampler2DShadow"] =           F16SAMPLER2DSHADOW;
+    (*KeywordMap)["f16sampler2DRectShadow"] =       F16SAMPLER2DRECTSHADOW;
+    (*KeywordMap)["f16samplerCubeShadow"] =         F16SAMPLERCUBESHADOW;
+    (*KeywordMap)["f16sampler1DArrayShadow"] =      F16SAMPLER1DARRAYSHADOW;
+    (*KeywordMap)["f16sampler2DArrayShadow"] =      F16SAMPLER2DARRAYSHADOW;
+    (*KeywordMap)["f16samplerCubeArrayShadow"] =    F16SAMPLERCUBEARRAYSHADOW;
+
+    (*KeywordMap)["f16image1D"] =                   F16IMAGE1D;
+    (*KeywordMap)["f16image2D"] =                   F16IMAGE2D;
+    (*KeywordMap)["f16image3D"] =                   F16IMAGE3D;
+    (*KeywordMap)["f16image2DRect"] =               F16IMAGE2DRECT;
+    (*KeywordMap)["f16imageCube"] =                 F16IMAGECUBE;
+    (*KeywordMap)["f16image1DArray"] =              F16IMAGE1DARRAY;
+    (*KeywordMap)["f16image2DArray"] =              F16IMAGE2DARRAY;
+    (*KeywordMap)["f16imageCubeArray"] =            F16IMAGECUBEARRAY;
+    (*KeywordMap)["f16imageBuffer"] =               F16IMAGEBUFFER;
+    (*KeywordMap)["f16image2DMS"] =                 F16IMAGE2DMS;
+    (*KeywordMap)["f16image2DMSArray"] =            F16IMAGE2DMSARRAY;
+
+    (*KeywordMap)["f16texture1D"] =                 F16TEXTURE1D;
+    (*KeywordMap)["f16texture2D"] =                 F16TEXTURE2D;
+    (*KeywordMap)["f16texture3D"] =                 F16TEXTURE3D;
+    (*KeywordMap)["f16texture2DRect"] =             F16TEXTURE2DRECT;
+    (*KeywordMap)["f16textureCube"] =               F16TEXTURECUBE;
+    (*KeywordMap)["f16texture1DArray"] =            F16TEXTURE1DARRAY;
+    (*KeywordMap)["f16texture2DArray"] =            F16TEXTURE2DARRAY;
+    (*KeywordMap)["f16textureCubeArray"] =          F16TEXTURECUBEARRAY;
+    (*KeywordMap)["f16textureBuffer"] =             F16TEXTUREBUFFER;
+    (*KeywordMap)["f16texture2DMS"] =               F16TEXTURE2DMS;
+    (*KeywordMap)["f16texture2DMSArray"] =          F16TEXTURE2DMSARRAY;
+
+    (*KeywordMap)["f16subpassInput"] =              F16SUBPASSINPUT;
+    (*KeywordMap)["f16subpassInputMS"] =            F16SUBPASSINPUTMS;
+    (*KeywordMap)["__explicitInterpAMD"] =     EXPLICITINTERPAMD;
+    (*KeywordMap)["pervertexNV"] =             PERVERTEXNV;
+    (*KeywordMap)["pervertexEXT"] =            PERVERTEXEXT;
+    (*KeywordMap)["precise"] =                 PRECISE;
+
+    (*KeywordMap)["rayPayloadNV"] =            PAYLOADNV;
+    (*KeywordMap)["rayPayloadEXT"] =           PAYLOADEXT;
+    (*KeywordMap)["rayPayloadInNV"] =          PAYLOADINNV;
+    (*KeywordMap)["rayPayloadInEXT"] =         PAYLOADINEXT;
+    (*KeywordMap)["hitAttributeNV"] =          HITATTRNV;
+    (*KeywordMap)["hitAttributeEXT"] =         HITATTREXT;
+    (*KeywordMap)["callableDataNV"] =          CALLDATANV;
+    (*KeywordMap)["callableDataEXT"] =         CALLDATAEXT;
+    (*KeywordMap)["callableDataInNV"] =        CALLDATAINNV;
+    (*KeywordMap)["callableDataInEXT"] =       CALLDATAINEXT;
+    (*KeywordMap)["accelerationStructureNV"] = ACCSTRUCTNV;
+    (*KeywordMap)["accelerationStructureEXT"]   = ACCSTRUCTEXT;
+    (*KeywordMap)["rayQueryEXT"] =              RAYQUERYEXT;
+    (*KeywordMap)["perprimitiveNV"] =          PERPRIMITIVENV;
+    (*KeywordMap)["perviewNV"] =               PERVIEWNV;
+    (*KeywordMap)["taskNV"] =                  PERTASKNV;
+    (*KeywordMap)["perprimitiveEXT"] =         PERPRIMITIVEEXT;
+    (*KeywordMap)["taskPayloadSharedEXT"] =    TASKPAYLOADWORKGROUPEXT;
+
+    (*KeywordMap)["fcoopmatNV"] =              FCOOPMATNV;
+    (*KeywordMap)["icoopmatNV"] =              ICOOPMATNV;
+    (*KeywordMap)["ucoopmatNV"] =              UCOOPMATNV;
+
+    (*KeywordMap)["coopmat"] =                 COOPMAT;
+
+    (*KeywordMap)["hitObjectNV"] =             HITOBJECTNV;
+    (*KeywordMap)["hitObjectAttributeNV"] =    HITOBJECTATTRNV;
+
+    ReservedSet = new std::unordered_set<const char*, str_hash, str_eq>;
+
+    ReservedSet->insert("common");
+    ReservedSet->insert("partition");
+    ReservedSet->insert("active");
+    ReservedSet->insert("asm");
+    ReservedSet->insert("class");
+    ReservedSet->insert("union");
+    ReservedSet->insert("enum");
+    ReservedSet->insert("typedef");
+    ReservedSet->insert("template");
+    ReservedSet->insert("this");
+    ReservedSet->insert("goto");
+    ReservedSet->insert("inline");
+    ReservedSet->insert("noinline");
+    ReservedSet->insert("public");
+    ReservedSet->insert("static");
+    ReservedSet->insert("extern");
+    ReservedSet->insert("external");
+    ReservedSet->insert("interface");
+    ReservedSet->insert("long");
+    ReservedSet->insert("short");
+    ReservedSet->insert("half");
+    ReservedSet->insert("fixed");
+    ReservedSet->insert("unsigned");
+    ReservedSet->insert("input");
+    ReservedSet->insert("output");
+    ReservedSet->insert("hvec2");
+    ReservedSet->insert("hvec3");
+    ReservedSet->insert("hvec4");
+    ReservedSet->insert("fvec2");
+    ReservedSet->insert("fvec3");
+    ReservedSet->insert("fvec4");
+    ReservedSet->insert("sampler3DRect");
+    ReservedSet->insert("filter");
+    ReservedSet->insert("sizeof");
+    ReservedSet->insert("cast");
+    ReservedSet->insert("namespace");
+    ReservedSet->insert("using");
+}
+
+void TScanContext::deleteKeywordMap()
+{
+    delete KeywordMap;
+    KeywordMap = nullptr;
+    delete ReservedSet;
+    ReservedSet = nullptr;
+}
+
 // Called by yylex to get the next token.
 // Returning 0 implies end of input.
 int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
@@ -839,22 +834,12 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
         loc = ppToken.loc;
         parserToken->sType.lex.loc = loc;
         switch (token) {
-        case ';':  afterType = false; afterBuffer = false; inDeclaratorList = false; afterDeclarator = false; angleBracketDepth = 0; squareBracketDepth = 0; parenDepth = 0; return SEMICOLON;
-        case ',':
-            // If we just processed a declarator (identifier after a type), this comma
-            // indicates that we're in a declarator list. Note that 'afterDeclarator' is
-            // only set when we are not inside a template parameter list, array expression,
-            // or function parameter list.
-            if (afterDeclarator) {
-                inDeclaratorList = true;
-            }
-            afterType = false;
-            afterDeclarator = false;
-            return COMMA;
+        case ';':  afterType = false; afterBuffer = false; return SEMICOLON;
+        case ',':  afterType = false;   return COMMA;
         case ':':                       return COLON;
-        case '=':  afterType = false; inDeclaratorList = false; afterDeclarator = false; return EQUAL;
-        case '(':  afterType = false; inDeclaratorList = false; afterDeclarator = false; parenDepth++; return LEFT_PAREN;
-        case ')':  afterType = false; inDeclaratorList = false; afterDeclarator = false; if (parenDepth > 0) parenDepth--; return RIGHT_PAREN;
+        case '=':  afterType = false;   return EQUAL;
+        case '(':  afterType = false;   return LEFT_PAREN;
+        case ')':  afterType = false;   return RIGHT_PAREN;
         case '.':  field = true;        return DOT;
         case '!':                       return BANG;
         case '-':                       return DASH;
@@ -863,16 +848,16 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
         case '*':                       return STAR;
         case '/':                       return SLASH;
         case '%':                       return PERCENT;
-        case '<':                       angleBracketDepth++; return LEFT_ANGLE;
-        case '>':                       if (angleBracketDepth > 0) angleBracketDepth--; return RIGHT_ANGLE;
+        case '<':                       return LEFT_ANGLE;
+        case '>':                       return RIGHT_ANGLE;
         case '|':                       return VERTICAL_BAR;
         case '^':                       return CARET;
         case '&':                       return AMPERSAND;
         case '?':                       return QUESTION;
-        case '[':                       squareBracketDepth++; return LEFT_BRACKET;
-        case ']':                       if (squareBracketDepth > 0) squareBracketDepth--; return RIGHT_BRACKET;
-        case '{':  afterStruct = false; afterBuffer = false; inDeclaratorList = false; afterDeclarator = false; angleBracketDepth = 0; squareBracketDepth = 0; parenDepth = 0; return LEFT_BRACE;
-        case '}':  inDeclaratorList = false; afterDeclarator = false; angleBracketDepth = 0; squareBracketDepth = 0; parenDepth = 0; return RIGHT_BRACE;
+        case '[':                       return LEFT_BRACKET;
+        case ']':                       return RIGHT_BRACKET;
+        case '{':  afterStruct = false; afterBuffer = false; return LEFT_BRACE;
+        case '}':                       return RIGHT_BRACE;
         case '\\':
             parseContext.error(loc, "illegal use of escape character", "\\", "");
             break;
@@ -939,11 +924,11 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
 
 int TScanContext::tokenizeIdentifier()
 {
-    if (ReservedSet.find(tokenText) != ReservedSet.end())
+    if (ReservedSet->find(tokenText) != ReservedSet->end())
         return reservedWord();
 
-    auto it = KeywordMap.find(tokenText);
-    if (it == KeywordMap.end()) {
+    auto it = KeywordMap->find(tokenText);
+    if (it == KeywordMap->end()) {
         // Should have an identifier of some sort
         return identifierOrType();
     }
@@ -1137,15 +1122,6 @@ int TScanContext::tokenizeIdentifier()
             (parseContext.version < 420 && ! parseContext.extensionTurnedOn(E_GL_ARB_shader_image_load_store))))
             reservedWord();
         return keyword;
-    case NONTEMPORAL:
-        if (parseContext.symbolTable.atBuiltInLevel())
-            return keyword;
-        if (parseContext.extensionTurnedOn(E_GL_EXT_nontemporal_keyword)) {
-            if (!parseContext.intermediate.usingVulkanMemoryModel())
-                parseContext.warn(loc, "Nontemporal without the Vulkan Memory Model is ignored", tokenText, "");
-            return keyword;
-        }
-        return identifierOrType();
     case PATCH:
         if (parseContext.symbolTable.atBuiltInLevel() ||
             (parseContext.isEsProfile() &&
@@ -1156,16 +1132,12 @@ int TScanContext::tokenizeIdentifier()
 
         return es30ReservedFromGLSL(400);
 
-    case SAMPLE: 
-    {
-        const int numLayoutExts = 3;
-        const char* layoutExts[numLayoutExts] = {E_GL_OES_shader_multisample_interpolation, E_GL_ARB_gpu_shader5,
-                                                 E_GL_NV_gpu_shader5};
+    case SAMPLE:
         if ((parseContext.isEsProfile() && parseContext.version >= 320) ||
-            parseContext.extensionsTurnedOn(numLayoutExts, layoutExts))
+            parseContext.extensionsTurnedOn(1, &E_GL_OES_shader_multisample_interpolation))
             return keyword;
         return es30ReservedFromGLSL(400);
-    }
+
     case SUBROUTINE:
         return es30ReservedFromGLSL(400);
 
@@ -1357,7 +1329,6 @@ int TScanContext::tokenizeIdentifier()
         if (parseContext.symbolTable.atBuiltInLevel() ||
             parseContext.extensionTurnedOn(E_GL_ARB_gpu_shader_int64) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int64))
             return keyword;
         return identifierOrType();
@@ -1374,7 +1345,6 @@ int TScanContext::tokenizeIdentifier()
         if (parseContext.symbolTable.atBuiltInLevel() ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_8bit_storage) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int8))
             return keyword;
         return identifierOrType();
@@ -1392,7 +1362,6 @@ int TScanContext::tokenizeIdentifier()
             parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_int16) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int16))
             return keyword;
         return identifierOrType();
@@ -1407,7 +1376,6 @@ int TScanContext::tokenizeIdentifier()
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int32))
             return keyword;
         return identifierOrType();
@@ -1415,13 +1383,6 @@ int TScanContext::tokenizeIdentifier()
     case F32VEC2:
     case F32VEC3:
     case F32VEC4:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
-            parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float32))
-            return keyword;
-        return identifierOrType();
     case F32MAT2:
     case F32MAT3:
     case F32MAT4:
@@ -1445,14 +1406,6 @@ int TScanContext::tokenizeIdentifier()
     case F64VEC2:
     case F64VEC3:
     case F64VEC4:
-    afterType = true;
-    if (parseContext.symbolTable.atBuiltInLevel() ||
-        parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-        (parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) && 
-         parseContext.extensionTurnedOn(E_GL_ARB_gpu_shader_fp64)) ||
-        parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float64))
-        return keyword;
-    return identifierOrType();
     case F64MAT2:
     case F64MAT3:
     case F64MAT4:
@@ -1481,7 +1434,6 @@ int TScanContext::tokenizeIdentifier()
             parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_half_float) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
-            parseContext.extensionTurnedOn(E_GL_NV_gpu_shader5) ||
             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float16))
             return keyword;
 
@@ -1508,39 +1460,6 @@ int TScanContext::tokenizeIdentifier()
 
         return identifierOrType();
 
-    case BFLOAT16_T:
-    case BF16VEC2:
-    case BF16VEC3:
-    case BF16VEC4:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_EXT_bfloat16))
-            return keyword;
-
-        return identifierOrType();
-
-    case FLOATE5M2_T:
-    case FE5M2VEC2:
-    case FE5M2VEC3:
-    case FE5M2VEC4:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_EXT_float_e5m2))
-            return keyword;
-
-        return identifierOrType();
-
-    case FLOATE4M3_T:
-    case FE4M3VEC2:
-    case FE4M3VEC3:
-    case FE4M3VEC4:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_EXT_float_e4m3))
-            return keyword;
-
-        return identifierOrType();
-
     case SAMPLERCUBEARRAY:
     case SAMPLERCUBEARRAYSHADOW:
     case ISAMPLERCUBEARRAY:
@@ -1549,9 +1468,7 @@ int TScanContext::tokenizeIdentifier()
         if ((parseContext.isEsProfile() && parseContext.version >= 320) ||
             parseContext.extensionsTurnedOn(Num_AEP_texture_cube_map_array, AEP_texture_cube_map_array))
             return keyword;
-        if (parseContext.isEsProfile() || (parseContext.version < 400 &&
-            ! parseContext.extensionTurnedOn(E_GL_ARB_texture_cube_map_array)
-            && ! parseContext.extensionsTurnedOn(Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5)))
+        if (parseContext.isEsProfile() || (parseContext.version < 400 && ! parseContext.extensionTurnedOn(E_GL_ARB_texture_cube_map_array)))
             reservedWord();
         return keyword;
 
@@ -1832,9 +1749,7 @@ int TScanContext::tokenizeIdentifier()
     case PRECISE:
         if ((parseContext.isEsProfile() &&
              (parseContext.version >= 320 || parseContext.extensionsTurnedOn(Num_AEP_gpu_shader5, AEP_gpu_shader5))) ||
-            (!parseContext.isEsProfile() &&
-             (parseContext.version >= 400 
-             || parseContext.extensionsTurnedOn(Num_AEP_core_gpu_shader5, AEP_core_gpu_shader5))))
+            (!parseContext.isEsProfile() && parseContext.version >= 400))
             return keyword;
         if (parseContext.isEsProfile() && parseContext.version == 310) {
             reservedWord();
@@ -1871,12 +1786,6 @@ int TScanContext::tokenizeIdentifier()
             parseContext.extensionTurnedOn(E_GL_NV_integer_cooperative_matrix))
             return keyword;
         return identifierOrType();
-    case TENSORARM:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_ARM_tensors))
-            return keyword;
-        return identifierOrType();
 
     case COOPMAT:
         afterType = true;
@@ -1885,13 +1794,6 @@ int TScanContext::tokenizeIdentifier()
             return keyword;
         return identifierOrType();
 
-    case COOPVECNV:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_NV_cooperative_vector))
-            return keyword;
-        return identifierOrType();
-
     case DEMOTE:
         if (parseContext.extensionTurnedOn(E_GL_EXT_demote_to_helper_invocation))
             return keyword;
@@ -1920,13 +1822,6 @@ int TScanContext::tokenizeIdentifier()
             return keyword;
         return identifierOrType();
 
-    case HITOBJECTEXT:
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            (!parseContext.isEsProfile() && parseContext.version >= 460
-                 && parseContext.extensionTurnedOn(E_GL_EXT_shader_invocation_reorder)))
-            return keyword;
-        return identifierOrType();
-
     case HITOBJECTATTRNV:
         if (parseContext.symbolTable.atBuiltInLevel() ||
             (!parseContext.isEsProfile() && parseContext.version >= 460
@@ -1934,22 +1829,6 @@ int TScanContext::tokenizeIdentifier()
             return keyword;
         return identifierOrType();
 
-    case HITOBJECTATTREXT:
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            (!parseContext.isEsProfile() && parseContext.version >= 460
-                 && parseContext.extensionTurnedOn(E_GL_EXT_shader_invocation_reorder)))
-            return keyword;
-        return identifierOrType();
-
-    case FUNCTION:
-    case TENSORLAYOUTNV:
-    case TENSORVIEWNV:
-        afterType = true;
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            parseContext.extensionTurnedOn(E_GL_NV_cooperative_matrix2))
-            return keyword;
-        return identifierOrType();
-
     default:
         parseContext.infoSink.info.message(EPrefixInternalError, "Unknown glslang keyword", loc);
         return 0;
@@ -1962,29 +1841,14 @@ int TScanContext::identifierOrType()
     if (field)
         return IDENTIFIER;
 
-    // If we see an identifier right after a type, this might be a declarator.
-    // But not in template parameters (inside angle brackets), array expressions (inside square brackets),
-    // or function parameters (inside parentheses)
-    if (afterType && angleBracketDepth == 0 && squareBracketDepth == 0 && parenDepth == 0) {
-        afterDeclarator = true;
-        afterType = false;
-        return IDENTIFIER;
-    }
-
     parserToken->sType.lex.symbol = parseContext.symbolTable.find(*parserToken->sType.lex.string);
     if ((afterType == false && afterStruct == false) && parserToken->sType.lex.symbol != nullptr) {
         if (const TVariable* variable = parserToken->sType.lex.symbol->getAsVariable()) {
             if (variable->isUserType() &&
                 // treat redeclaration of forward-declared buffer/uniform reference as an identifier
                 !(variable->getType().isReference() && afterBuffer)) {
-
-                // If we're in a declarator list (like "float a, B;"), treat struct names as IDENTIFIER
-                // to fix GitHub issue #3931
-                if (inDeclaratorList) {
-                    return IDENTIFIER;
-                }
-                
                 afterType = true;
+
                 return TYPE_NAME;
             }
         }
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/ScanContext.h b/engine/thirdparty/glslang/glslang/MachineIndependent/ScanContext.h
index ce2145eb..74b2b3c7 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/ScanContext.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/ScanContext.h
@@ -53,7 +53,7 @@ public:
     explicit TScanContext(TParseContextBase& pc) :
         parseContext(pc),
         afterType(false), afterStruct(false),
-        field(false), afterBuffer(false), inDeclaratorList(false), afterDeclarator(false), angleBracketDepth(0), squareBracketDepth(0), parenDepth(0) { }
+        field(false), afterBuffer(false) { }
     virtual ~TScanContext() { }
 
     static void fillInKeywordMap();
@@ -82,11 +82,6 @@ protected:
     bool afterStruct;         // true if we've recognized the STRUCT keyword, so can only be looking for an identifier
     bool field;               // true if we're on a field, right after a '.'
     bool afterBuffer;         // true if we've recognized the BUFFER keyword
-    bool inDeclaratorList;    // true if we detected we're in a declarator list like "float a, b;"
-    bool afterDeclarator;     // true if we just saw an identifier after a type (potential declarator)
-    int angleBracketDepth;    // track nesting level of < > to detect template parameters
-    int squareBracketDepth;   // track nesting level of [ ] to detect array expressions
-    int parenDepth;           // track nesting level of ( ) to detect function parameters
     TSourceLoc loc;
     TParserToken* parserToken;
     TPpToken* ppToken;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/ShaderLang.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/ShaderLang.cpp
index 62d72535..29d5d5f8 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/ShaderLang.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/ShaderLang.cpp
@@ -82,10 +82,7 @@ namespace { // anonymous namespace for file-local functions and symbols
 int NumberOfClients = 0;
 
 // global initialization lock
-#ifndef DISABLE_THREAD_SUPPORT
 std::mutex init_lock;
-#endif
-
 
 using namespace glslang;
 
@@ -297,21 +294,18 @@ int CommonIndex(EProfile profile, EShLanguage language)
 //
 // To initialize per-stage shared tables, with the common table already complete.
 //
-bool InitializeStageSymbolTable(TBuiltInParseables& builtInParseables, int version, EProfile profile, const SpvVersion& spvVersion,
+void InitializeStageSymbolTable(TBuiltInParseables& builtInParseables, int version, EProfile profile, const SpvVersion& spvVersion,
                                 EShLanguage language, EShSource source, TInfoSink& infoSink, TSymbolTable** commonTable,
                                 TSymbolTable** symbolTables)
 {
     (*symbolTables[language]).adoptLevels(*commonTable[CommonIndex(profile, language)]);
-    if (!InitializeSymbolTable(builtInParseables.getStageString(language), version, profile, spvVersion, language, source,
-                          infoSink, *symbolTables[language]))
-        return false;
+    InitializeSymbolTable(builtInParseables.getStageString(language), version, profile, spvVersion, language, source,
+                          infoSink, *symbolTables[language]);
     builtInParseables.identifyBuiltIns(version, profile, spvVersion, language, *symbolTables[language]);
     if (profile == EEsProfile && version >= 300)
         (*symbolTables[language]).setNoBuiltInRedeclarations();
     if (version == 110)
         (*symbolTables[language]).setSeparateNameSpaces();
-
-    return true;
 }
 
 //
@@ -320,7 +314,6 @@ bool InitializeStageSymbolTable(TBuiltInParseables& builtInParseables, int versi
 //
 bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable,  TSymbolTable** symbolTables, int version, EProfile profile, const SpvVersion& spvVersion, EShSource source)
 {
-    bool success = true;
     std::unique_ptr<TBuiltInParseables> builtInParseables(CreateBuiltInParseables(infoSink, source));
 
     if (builtInParseables == nullptr)
@@ -329,70 +322,70 @@ bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable,  TS
     builtInParseables->initialize(version, profile, spvVersion);
 
     // do the common tables
-    success &= InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, EShLangVertex, source,
+    InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, EShLangVertex, source,
                           infoSink, *commonTable[EPcGeneral]);
     if (profile == EEsProfile)
-        success &= InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, EShLangFragment, source,
+        InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, EShLangFragment, source,
                               infoSink, *commonTable[EPcFragment]);
 
     // do the per-stage tables
 
     // always have vertex and fragment
-    success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangVertex, source,
+    InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangVertex, source,
                                infoSink, commonTable, symbolTables);
-    success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangFragment, source,
+    InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangFragment, source,
                                infoSink, commonTable, symbolTables);
 
     // check for tessellation
     if ((profile != EEsProfile && version >= 150) ||
         (profile == EEsProfile && version >= 310)) {
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTessControl, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTessControl, source,
                                    infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTessEvaluation, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTessEvaluation, source,
                                    infoSink, commonTable, symbolTables);
     }
 
     // check for geometry
     if ((profile != EEsProfile && version >= 150) ||
         (profile == EEsProfile && version >= 310))
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangGeometry, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangGeometry, source,
                                    infoSink, commonTable, symbolTables);
 
     // check for compute
     if ((profile != EEsProfile && version >= 420) ||
         (profile == EEsProfile && version >= 310))
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangCompute, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangCompute, source,
                                    infoSink, commonTable, symbolTables);
 
     // check for ray tracing stages
     if (profile != EEsProfile && version >= 450) {
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangRayGen, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangRayGen, source,
             infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangIntersect, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangIntersect, source,
             infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangAnyHit, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangAnyHit, source,
             infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangClosestHit, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangClosestHit, source,
             infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangMiss, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangMiss, source,
             infoSink, commonTable, symbolTables);
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangCallable, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangCallable, source,
             infoSink, commonTable, symbolTables);
     }
 
     // check for mesh
     if ((profile != EEsProfile && version >= 450) ||
         (profile == EEsProfile && version >= 320))
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangMesh, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangMesh, source,
                                    infoSink, commonTable, symbolTables);
 
     // check for task
     if ((profile != EEsProfile && version >= 450) ||
         (profile == EEsProfile && version >= 320))
-        success &= InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTask, source,
+        InitializeStageSymbolTable(*builtInParseables, version, profile, spvVersion, EShLangTask, source,
                                    infoSink, commonTable, symbolTables);
 
-    return success;
+    return true;
 }
 
 bool AddContextSpecificSymbols(const TBuiltInResource* resources, TInfoSink& infoSink, TSymbolTable& symbolTable, int version,
@@ -404,8 +397,7 @@ bool AddContextSpecificSymbols(const TBuiltInResource* resources, TInfoSink& inf
         return false;
 
     builtInParseables->initialize(*resources, version, profile, spvVersion, language);
-    if (!InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, language, source, infoSink, symbolTable))
-        return false;
+    InitializeSymbolTable(builtInParseables->getCommonString(), version, profile, spvVersion, language, source, infoSink, symbolTable);
     builtInParseables->identifyBuiltIns(version, profile, spvVersion, language, symbolTable, *resources);
 
     return true;
@@ -423,24 +415,20 @@ bool AddContextSpecificSymbols(const TBuiltInResource* resources, TInfoSink& inf
 // This only gets done the first time any thread needs a particular symbol table
 // (lazy evaluation).
 //
-bool SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& spvVersion, EShSource source)
+void SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& spvVersion, EShSource source)
 {
     TInfoSink infoSink;
-    bool success;
 
     // Make sure only one thread tries to do this at a time
-#ifndef DISABLE_THREAD_SUPPORT
     const std::lock_guard<std::mutex> lock(init_lock);
-#endif
 
     // See if it's already been done for this version/profile combination
     int versionIndex = MapVersionToIndex(version);
     int spvVersionIndex = MapSpvVersionToIndex(spvVersion);
     int profileIndex = MapProfileToIndex(profile);
     int sourceIndex = MapSourceToIndex(source);
-    if (CommonSymbolTable[versionIndex][spvVersionIndex][profileIndex][sourceIndex][EPcGeneral]) {
-        return true;
-    }
+    if (CommonSymbolTable[versionIndex][spvVersionIndex][profileIndex][sourceIndex][EPcGeneral])
+        return;
 
     // Switch to a new pool
     TPoolAllocator& previousAllocator = GetThreadPoolAllocator();
@@ -456,10 +444,7 @@ bool SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& sp
         stageTables[stage] = new TSymbolTable;
 
     // Generate the local symbol tables using the new pool
-    if (!InitializeSymbolTables(infoSink, commonTable, stageTables, version, profile, spvVersion, source)) {
-        success = false;
-        goto cleanup;
-    }
+    InitializeSymbolTables(infoSink, commonTable, stageTables, version, profile, spvVersion, source);
 
     // Switch to the process-global pool
     SetThreadPoolAllocator(PerProcessGPA);
@@ -481,9 +466,7 @@ bool SetupBuiltinSymbolTable(int version, EProfile profile, const SpvVersion& sp
             SharedSymbolTables[versionIndex][spvVersionIndex][profileIndex][sourceIndex][stage]->readOnly();
         }
     }
-    success = true;
 
-cleanup:
     // Clean up the local tables before deleting the pool they used.
     for (int precClass = 0; precClass < EPcCount; ++precClass)
         delete commonTable[precClass];
@@ -492,8 +475,6 @@ cleanup:
 
     delete builtInPoolAllocator;
     SetThreadPoolAllocator(&previousAllocator);
-
-    return success;
 }
 
 // Function to Print all builtins
@@ -807,7 +788,7 @@ bool ProcessDeferred(
     // set version/profile to defaultVersion/defaultProfile regardless of the #version
     // directive in the source code
     bool forceDefaultVersionAndProfile,
-    int overrideVersion, // overrides version specified by #version or default version
+    int overrideVersion, // overrides version specified by #verison or default version
     bool forwardCompatible,     // give errors for use of deprecated features
     EShMessages messages,       // warnings/errors/AST; things to print out
     TIntermediate& intermediate, // returned tree, etc.
@@ -929,9 +910,7 @@ bool ProcessDeferred(
             intermediate.addSourceText(strings[numPre + s], lengths[numPre + s]);
         }
     }
-    if (!SetupBuiltinSymbolTable(version, profile, spvVersion, source)) {
-        return false;
-    }
+    SetupBuiltinSymbolTable(version, profile, spvVersion, source);
 
     TSymbolTable* cachedTable = SharedSymbolTables[MapVersionToIndex(version)]
                                                   [MapSpvVersionToIndex(spvVersion)]
@@ -1332,14 +1311,17 @@ bool CompileDeferred(
 //
 int ShInitialize()
 {
-#ifndef DISABLE_THREAD_SUPPORT
     const std::lock_guard<std::mutex> lock(init_lock);
-#endif
     ++NumberOfClients;
 
     if (PerProcessGPA == nullptr)
         PerProcessGPA = new TPoolAllocator();
 
+    glslang::TScanContext::fillInKeywordMap();
+#ifdef ENABLE_HLSL
+    glslang::HlslScanContext::fillInKeywordMap();
+#endif
+
     return 1;
 }
 
@@ -1389,9 +1371,7 @@ void ShDestruct(ShHandle handle)
 //
 int ShFinalize()
 {
-#ifndef DISABLE_THREAD_SUPPORT
     const std::lock_guard<std::mutex> lock(init_lock);
-#endif
     --NumberOfClients;
     assert(NumberOfClients >= 0);
     if (NumberOfClients > 0)
@@ -1428,6 +1408,11 @@ int ShFinalize()
         PerProcessGPA = nullptr;
     }
 
+    glslang::TScanContext::deleteKeywordMap();
+#ifdef ENABLE_HLSL
+    glslang::HlslScanContext::deleteKeywordMap();
+#endif
+
     return 1;
 }
 
@@ -1732,10 +1717,6 @@ public:
     virtual bool compile(TIntermNode*, int = 0, EProfile = ENoProfile) { return true; }
 };
 
-TIoMapper* GetGlslIoMapper() {
-    return static_cast<TIoMapper*>(new TGlslIoMapper());
-}
-
 TShader::TShader(EShLanguage s)
     : stage(s), lengths(nullptr), stringNames(nullptr), preamble(""), overrideVersion(0)
 {
@@ -1868,9 +1849,6 @@ void TShader::setGlobalUniformBinding(unsigned int binding) { intermediate->setG
 void TShader::setAtomicCounterBlockName(const char* name) { intermediate->setAtomicCounterBlockName(name); }
 void TShader::setAtomicCounterBlockSet(unsigned int set) { intermediate->setAtomicCounterBlockSet(set); }
 
-void TShader::addSourceText(const char* text, size_t len) { intermediate->addSourceText(text, len); }
-void TShader::setSourceFile(const char* file) { intermediate->setSourceFile(file); }
-
 #ifdef ENABLE_HLSL
 // See comment above TDefaultHlslIoMapper in iomapper.cpp:
 void TShader::setHlslIoMapping(bool hlslIoMap)          { intermediate->setHlslIoMapping(hlslIoMap); }
@@ -1979,14 +1957,6 @@ bool TProgram::link(EShMessages messages)
             error = true;
     }
 
-    if (messages & EShMsgAST) {
-        for (int s = 0; s < EShLangCount; ++s) {
-            if (intermediate[s] == nullptr)
-                continue;
-            intermediate[s]->output(*infoSink, true);
-        }
-    }
-
     return ! error;
 }
 
@@ -2052,6 +2022,9 @@ bool TProgram::linkStage(EShLanguage stage, EShMessages messages)
     }
     intermediate[stage]->finalCheck(*infoSink, (messages & EShMsgKeepUncalled) != 0);
 
+    if (messages & EShMsgAST)
+        intermediate[stage]->output(*infoSink, true);
+
     return intermediate[stage]->getNumErrors() == 0;
 }
 
@@ -2060,7 +2033,7 @@ bool TProgram::linkStage(EShLanguage stage, EShMessages messages)
 //
 // Return true if no errors.
 //
-bool TProgram::crossStageCheck(EShMessages messages) {
+bool TProgram::crossStageCheck(EShMessages) {
 
     // make temporary intermediates to hold the linkage symbols for each linking interface
     // while we do the checks
@@ -2075,27 +2048,9 @@ bool TProgram::crossStageCheck(EShMessages messages) {
             activeStages.push_back(intermediate[s]);
     }
 
-    class TFinalLinkTraverser : public TIntermTraverser {
-    public:
-        TFinalLinkTraverser() { }
-        virtual ~TFinalLinkTraverser() { }
-
-        virtual void visitSymbol(TIntermSymbol* symbol)
-        {
-            // Implicitly size arrays.
-            // If an unsized array is left as unsized, it effectively
-            // becomes run-time sized.
-            symbol->getWritableType().adoptImplicitArraySizes(false);
-        }
-    } finalLinkTraverser;
-
     // no extra linking if there is only one stage
-    if (! (activeStages.size() > 1)) {
-        if (activeStages.size() == 1 && activeStages[0]->getTreeRoot()) {
-            activeStages[0]->getTreeRoot()->traverse(&finalLinkTraverser);
-        }
+    if (! (activeStages.size() > 1))
         return true;
-    }
 
     // setup temporary tree to hold unfirom objects from different stages
     TIntermediate* firstIntermediate = activeStages.front();
@@ -2117,12 +2072,6 @@ bool TProgram::crossStageCheck(EShMessages messages) {
     }
     error |= uniforms.getNumErrors() != 0;
 
-    // update implicit array sizes across shader stages
-    for (unsigned int i = 0; i < activeStages.size(); ++i) {
-        activeStages[i]->mergeImplicitArraySizes(*infoSink, uniforms);
-        activeStages[i]->getTreeRoot()->traverse(&finalLinkTraverser);
-    }
-
     // copy final definition of global block back into each stage
     for (unsigned int i = 0; i < activeStages.size(); ++i) {
         // We only want to merge into already existing global uniform blocks.
@@ -2135,15 +2084,8 @@ bool TProgram::crossStageCheck(EShMessages messages) {
 
     // compare cross stage symbols for each stage boundary
     for (unsigned int i = 1; i < activeStages.size(); ++i) {
-        activeStages[i - 1]->checkStageIO(*infoSink, *activeStages[i], messages);
-        error |= (activeStages[i - 1]->getNumErrors() != 0 || activeStages[i]->getNumErrors() != 0);
-    }
-
-    // if requested, optimize cross stage IO
-    if (messages & EShMsgLinkTimeOptimization) {
-        for (unsigned int i = 1; i < activeStages.size(); ++i) {
-            activeStages[i - 1]->optimizeStageIO(*infoSink, *activeStages[i]);
-        }
+        activeStages[i - 1]->checkStageIO(*infoSink, *activeStages[i]);
+        error |= (activeStages[i - 1]->getNumErrors() != 0);
     }
 
     return !error;
@@ -2163,15 +2105,11 @@ const char* TProgram::getInfoDebugLog()
 // Reflection implementation.
 //
 
-unsigned int TObjectReflection::layoutLocation() const { return type->getQualifier().layoutLocation; }
-
 bool TProgram::buildReflection(int opts)
 {
     if (! linked || reflection != nullptr)
         return false;
 
-    SetThreadPoolAllocator(pool);
-
     int firstStage = EShLangVertex, lastStage = EShLangFragment;
 
     if (opts & EShReflectionIntermediateIO) {
@@ -2200,7 +2138,6 @@ bool TProgram::buildReflection(int opts)
 }
 
 unsigned TProgram::getLocalSize(int dim) const                        { return reflection->getLocalSize(dim); }
-unsigned TProgram::getTileShadingRateQCOM(int dim) const              { return reflection->getTileShadingRateQCOM(dim); }
 int TProgram::getReflectionIndex(const char* name) const              { return reflection->getIndex(name); }
 int TProgram::getReflectionPipeIOIndex(const char* name, const bool inOrOut) const
                                                                       { return reflection->getPipeIOIndex(name, inOrOut); }
@@ -2221,12 +2158,6 @@ int TProgram::getNumAtomicCounters() const                            { return r
 const TObjectReflection& TProgram::getAtomicCounter(int index) const  { return reflection->getAtomicCounter(index); }
 void TProgram::dumpReflection() { if (reflection != nullptr) reflection->dump(); }
 
-TIoMapResolver* TProgram::getGlslIoResolver(EShLanguage stage) {
-    auto *intermediate = getIntermediate(stage);
-    if (!intermediate)
-        return NULL;
-    return static_cast<TIoMapResolver*>(new TDefaultGlslIoResolver(*intermediate));
-}
 //
 // I/O mapping implementation.
 //
@@ -2234,9 +2165,6 @@ bool TProgram::mapIO(TIoMapResolver* pResolver, TIoMapper* pIoMapper)
 {
     if (! linked)
         return false;
-
-    SetThreadPoolAllocator(pool);
-
     TIoMapper* ioMapper = nullptr;
     TIoMapper defaultIOMapper;
     if (pIoMapper == nullptr)
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.cpp
index fd8a690f..3b56e414 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.cpp
@@ -55,16 +55,11 @@ namespace glslang {
 //
 void TType::buildMangledName(TString& mangledName) const
 {
-    if (isTensorARM())
-        mangledName += 'T';
-    else if (isMatrix())
+    if (isMatrix())
         mangledName += 'm';
     else if (isVector())
         mangledName += 'v';
 
-    if (isCoopVecNV())
-        mangledName += "coopvec";
-
     switch (basicType) {
     case EbtFloat:              mangledName += 'f';      break;
     case EbtInt:                mangledName += 'i';      break;
@@ -72,9 +67,6 @@ void TType::buildMangledName(TString& mangledName) const
     case EbtBool:               mangledName += 'b';      break;
     case EbtDouble:             mangledName += 'd';      break;
     case EbtFloat16:            mangledName += "f16";    break;
-    case EbtBFloat16:           mangledName += "bf16";   break;
-    case EbtFloatE5M2:          mangledName += "fe5m2";  break;
-    case EbtFloatE4M3:          mangledName += "fe4m3";  break;
     case EbtInt8:               mangledName += "i8";     break;
     case EbtUint8:              mangledName += "u8";     break;
     case EbtInt16:              mangledName += "i16";    break;
@@ -86,9 +78,6 @@ void TType::buildMangledName(TString& mangledName) const
     case EbtRayQuery:           mangledName += "rq";     break;
     case EbtSpirvType:          mangledName += "spv-t";  break;
     case EbtHitObjectNV:        mangledName += "ho";     break;
-    case EbtHitObjectEXT:       mangledName += "ho";     break;
-    case EbtTensorLayoutNV:     mangledName += "tl";     break;
-    case EbtTensorViewNV:       mangledName += "tv";     break;
     case EbtSampler:
         switch (sampler.type) {
         case EbtFloat16: mangledName += "f16"; break;
@@ -172,23 +161,6 @@ void TType::buildMangledName(TString& mangledName) const
         mangledName += static_cast<char>('0' + getMatrixRows());
     }
 
-    if (typeParameters) {
-        const int maxSize = 11;
-        char buf[maxSize];
-        for (int i = 0; i < typeParameters->arraySizes->getNumDims(); ++i) {
-            if (typeParameters->arraySizes->getDimNode(i)) {
-                if (typeParameters->arraySizes->getDimNode(i)->getAsSymbolNode())
-                    snprintf(buf, maxSize, "s%lld", typeParameters->arraySizes->getDimNode(i)->getAsSymbolNode()->getId());
-                else
-                    snprintf(buf, maxSize, "s%p", typeParameters->arraySizes->getDimNode(i));
-            } else
-                snprintf(buf, maxSize, "%d", typeParameters->arraySizes->getDimSize(i));
-            mangledName += '<';
-            mangledName += buf;
-            mangledName += '>';
-        }
-    }
-
     if (arraySizes) {
         const int maxSize = 11;
         char buf[maxSize];
@@ -197,7 +169,7 @@ void TType::buildMangledName(TString& mangledName) const
                 if (arraySizes->getDimNode(i)->getAsSymbolNode())
                     snprintf(buf, maxSize, "s%lld", arraySizes->getDimNode(i)->getAsSymbolNode()->getId());
                 else
-                    snprintf(buf, maxSize, "s%p", (void*)(arraySizes->getDimNode(i)));
+                    snprintf(buf, maxSize, "s%p", arraySizes->getDimNode(i));
             } else
                 snprintf(buf, maxSize, "%d", arraySizes->getDimSize(i));
             mangledName += '[';
@@ -347,24 +319,6 @@ void TSymbolTableLevel::setFunctionExtensions(const char* name, int num, const c
     }
 }
 
-// Call the callback function to determine the required extensions
-void TSymbolTableLevel::setFunctionExtensionsCallback(const char* name, std::function<std::vector<const char *>(const char *)> const &func)
-{
-    tLevel::const_iterator candidate = level.lower_bound(name);
-    while (candidate != level.end()) {
-        const TString& candidateName = (*candidate).first;
-        TString::size_type parenAt = candidateName.find_first_of('(');
-        if (parenAt != candidateName.npos && candidateName.compare(0, parenAt, name) == 0) {
-            TSymbol* symbol = candidate->second;
-
-            auto exts = func(candidateName.c_str());
-            symbol->setExtensions(exts.size(), exts.data());
-        } else
-            break;
-        ++candidate;
-    }
-}
-
 // Make a single function require an extension(s). i.e., this will only set the extensions for the symbol that matches 'name' exactly.
 // This is different from setFunctionExtensions, which uses std::map::lower_bound to effectively set all symbols that start with 'name'.
 // Should only be used for a version/profile that actually needs the extension(s).
@@ -390,7 +344,6 @@ void TSymbolTableLevel::readOnly()
 TSymbol::TSymbol(const TSymbol& copyOf)
 {
     name = NewPoolTString(copyOf.name->c_str());
-    mangledName = NewPoolTString(copyOf.mangledName->c_str());
     uniqueId = copyOf.uniqueId;
     writable = true;
 }
@@ -444,7 +397,6 @@ TFunction::TFunction(const TFunction& copyOf) : TSymbol(copyOf)
     defined = copyOf.defined;
     prototyped = copyOf.prototyped;
     implicitThis = copyOf.implicitThis;
-    variadic = copyOf.variadic;
     illegalImplicitThis = copyOf.illegalImplicitThis;
     defaultParamCount = copyOf.defaultParamCount;
     spirvInst = copyOf.spirvInst;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.h b/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.h
index 91619274..94c3929d 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/SymbolTable.h
@@ -69,9 +69,6 @@
 #include "../Include/intermediate.h"
 #include "../Include/InfoSink.h"
 
-#include <functional>
-#include <unordered_map>
-
 namespace glslang {
 
 //
@@ -87,8 +84,7 @@ typedef TVector<const char*> TExtensionList;
 class TSymbol {
 public:
     POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator())
-    explicit TSymbol(const TString *n, const TString *mn) :  name(n), mangledName(mn), uniqueId(0), extensions(nullptr), writable(true) { }
-    explicit TSymbol(const TString *n) : TSymbol(n, n) { }
+    explicit TSymbol(const TString *n) :  name(n), uniqueId(0), extensions(nullptr), writable(true) { }
     virtual TSymbol* clone() const = 0;
     virtual ~TSymbol() { }  // rely on all symbol owned memory coming from the pool
 
@@ -100,7 +96,7 @@ public:
         newName.append(*name);
         changeName(NewPoolTString(newName.c_str()));
     }
-    virtual const TString& getMangledName() const { return *mangledName; }
+    virtual const TString& getMangledName() const { return getName(); }
     virtual TFunction* getAsFunction() { return nullptr; }
     virtual const TFunction* getAsFunction() const { return nullptr; }
     virtual TVariable* getAsVariable() { return nullptr; }
@@ -132,7 +128,6 @@ protected:
     TSymbol& operator=(const TSymbol&);
 
     const TString *name;
-    const TString *mangledName;
     unsigned long long uniqueId;      // For cross-scope comparing during code generation
 
     // For tracking what extensions must be present
@@ -159,9 +154,7 @@ protected:
 class TVariable : public TSymbol {
 public:
     TVariable(const TString *name, const TType& t, bool uT = false )
-        : TVariable(name, name, t, uT) {}
-    TVariable(const TString *name, const TString *mangledName, const TType& t, bool uT = false )
-        : TSymbol(name, mangledName),
+        : TSymbol(name),
           userType(uT),
           constSubtree(nullptr),
           memberExtensions(nullptr),
@@ -235,13 +228,6 @@ struct TParameter {
             name = nullptr;
         type = param.type->clone();
         defaultValue = param.defaultValue;
-        if (defaultValue) {
-            // The defaultValue of a builtin is created in a TPoolAllocator that no longer exists
-            // when parsing the user program, so make a deep copy.
-            if (const auto *constUnion = defaultValue->getAsConstantUnion()) {
-                defaultValue = new TIntermConstantUnion(*constUnion->getConstArray().clone(), constUnion->getType());
-            }
-        }
         return *this;
     }
     TBuiltInVariable getDeclaredBuiltIn() const { return type->getQualifier().declaredBuiltIn; }
@@ -255,12 +241,12 @@ public:
     explicit TFunction(TOperator o) :
         TSymbol(nullptr),
         op(o),
-        defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), variadic(false), defaultParamCount(0) { }
+        defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), defaultParamCount(0) { }
     TFunction(const TString *name, const TType& retType, TOperator tOp = EOpNull) :
         TSymbol(name),
         mangledName(*name + '('),
         op(tOp),
-        defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), variadic(false), defaultParamCount(0),
+        defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), defaultParamCount(0),
         linkType(ELinkNone)
     {
         returnType.shallowCopy(retType);
@@ -278,7 +264,6 @@ public:
     virtual void addParameter(TParameter& p)
     {
         assert(writable);
-        assert(!variadic && "cannot add more parameters if function is marked variadic");
         parameters.push_back(p);
         p.type->appendMangledName(mangledName);
 
@@ -321,13 +306,6 @@ public:
     virtual bool hasImplicitThis() const { return implicitThis; }
     virtual void setIllegalImplicitThis() { assert(writable); illegalImplicitThis = true; }
     virtual bool hasIllegalImplicitThis() const { return illegalImplicitThis; }
-    virtual void setVariadic() {
-        assert(writable);
-        assert(!variadic && "function was already marked variadic");
-        variadic = true;
-        mangledName += 'z';
-    }
-    virtual bool isVariadic() const { return variadic; }
 
     // Return total number of parameters
     virtual int getParamCount() const { return static_cast<int>(parameters.size()); }
@@ -370,7 +348,6 @@ protected:
                                // even if it finds member variables in the symbol table.
                                // This is important for a static member function that has member variables in scope,
                                // but is not allowed to use them, or see hidden symbols instead.
-    bool variadic;
     int  defaultParamCount;
 
     TSpirvInstruction spirvInst; // SPIR-V instruction qualifiers
@@ -506,11 +483,6 @@ public:
         retargetedSymbols.push_back({from, to});
     }
 
-    void collectRetargetedSymbols(std::unordered_multimap<std::string, std::string> &out) const {
-        for (const auto &[fromName, toName] : retargetedSymbols)
-            out.insert({std::string{toName}, std::string{fromName}});
-    }
-
     TSymbol* find(const TString& name) const
     {
         tLevel::const_iterator it = level.find(name);
@@ -604,7 +576,6 @@ public:
 
     void relateToOperator(const char* name, TOperator op);
     void setFunctionExtensions(const char* name, int num, const char* const extensions[]);
-    void setFunctionExtensionsCallback(const char* name, std::function<std::vector<const char *>(const char *)> const &func);
     void setSingleFunctionExtensions(const char* name, int num, const char* const extensions[]);
     void dump(TInfoSink& infoSink, bool complete = false) const;
     TSymbolTableLevel* clone() const;
@@ -668,10 +639,9 @@ public:
     //
 protected:
     static const uint32_t LevelFlagBitOffset = 56;
-    static constexpr int builtinLevel = 2;
-    static constexpr int globalLevel = 3;
+    static const int globalLevel = 3;
     static bool isSharedLevel(int level)  { return level <= 1; }            // exclude all per-compile levels
-    static bool isBuiltInLevel(int level) { return level <= builtinLevel; } // exclude user globals
+    static bool isBuiltInLevel(int level) { return level <= 2; }            // exclude user globals
     static bool isGlobalLevel(int level)  { return level <= globalLevel; }  // include user globals
 public:
     bool isEmpty() { return table.size() == 0; }
@@ -836,13 +806,6 @@ public:
         table[level]->retargetSymbol(from, to);
     }
 
-    std::unordered_multimap<std::string, std::string> collectBuiltinAlias() {
-        std::unordered_multimap<std::string, std::string> allRetargets;
-        for (int level = 0; level <= std::min(currentLevel(), builtinLevel); ++level)
-            table[level]->collectRetargetedSymbols(allRetargets);
-
-        return allRetargets;
-    }
 
     // Find of a symbol that returns how many layers deep of nested
     // structures-with-member-functions ('this' scopes) deep the symbol was
@@ -915,12 +878,6 @@ public:
             table[level]->setFunctionExtensions(name, num, extensions);
     }
 
-    void setFunctionExtensionsCallback(const char* name, std::function<std::vector<const char *>(const char *)> const &func)
-    {
-        for (unsigned int level = 0; level < table.size(); ++level)
-            table[level]->setFunctionExtensionsCallback(name, func);
-    }
-
     void setSingleFunctionExtensions(const char* name, int num, const char* const extensions[])
     {
         for (unsigned int level = 0; level < table.size(); ++level)
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.cpp
index e8ce1509..44ba9e06 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.cpp
@@ -165,8 +165,7 @@ void TParseVersions::initializeExtensionBehavior()
 
     const extensionData exts[] = { {E_GL_EXT_ray_tracing, EShTargetSpv_1_4},
                                    {E_GL_NV_ray_tracing_motion_blur, EShTargetSpv_1_4},
-                                   {E_GL_EXT_mesh_shader, EShTargetSpv_1_4},
-                                   {E_GL_NV_cooperative_matrix2, EShTargetSpv_1_6}
+                                   {E_GL_EXT_mesh_shader, EShTargetSpv_1_4}
                                  };
 
     for (size_t ii = 0; ii < sizeof(exts) / sizeof(exts[0]); ii++) {
@@ -188,7 +187,7 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_3DL_array_objects]                = EBhDisable;
     extensionBehavior[E_GL_ARB_shading_language_420pack]     = EBhDisable;
     extensionBehavior[E_GL_ARB_texture_gather]               = EBhDisable;
-    extensionBehavior[E_GL_ARB_gpu_shader5]                  = EBhDisable;
+    extensionBehavior[E_GL_ARB_gpu_shader5]                  = EBhDisablePartial;
     extensionBehavior[E_GL_ARB_separate_shader_objects]      = EBhDisable;
     extensionBehavior[E_GL_ARB_compute_shader]               = EBhDisable;
     extensionBehavior[E_GL_ARB_tessellation_shader]          = EBhDisable;
@@ -225,11 +224,9 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_ARB_shading_language_packing]     = EBhDisable;
     extensionBehavior[E_GL_ARB_texture_query_lod]            = EBhDisable;
     extensionBehavior[E_GL_ARB_vertex_attrib_64bit]          = EBhDisable;
-    extensionBehavior[E_GL_NV_gpu_shader5]                   = EBhDisable;
     extensionBehavior[E_GL_ARB_draw_instanced]               = EBhDisable;
     extensionBehavior[E_GL_ARB_bindless_texture]             = EBhDisable;
     extensionBehavior[E_GL_ARB_fragment_coord_conventions]   = EBhDisable;
-    extensionBehavior[E_GL_ARB_conservative_depth]           = EBhDisable;
 
 
     extensionBehavior[E_GL_KHR_shader_subgroup_basic]            = EBhDisable;
@@ -268,10 +265,8 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_EXT_expect_assume]                           = EBhDisable;
 
     extensionBehavior[E_GL_EXT_control_flow_attributes2]                = EBhDisable;
-    extensionBehavior[E_GL_EXT_spec_constant_composites]                = EBhDisable;
 
     extensionBehavior[E_GL_KHR_cooperative_matrix]                      = EBhDisable;
-    extensionBehavior[E_GL_NV_cooperative_vector]                       = EBhDisable;
 
     // #line and #include
     extensionBehavior[E_GL_GOOGLE_cpp_style_line_directive]          = EBhDisable;
@@ -314,19 +309,13 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_NV_shader_invocation_reorder]             = EBhDisable;
     extensionBehavior[E_GL_NV_displacement_micromap]                 = EBhDisable;
     extensionBehavior[E_GL_NV_shader_atomic_fp16_vector]             = EBhDisable;
-    extensionBehavior[E_GL_NV_cooperative_matrix2]                   = EBhDisable;
-    extensionBehavior[E_GL_NV_cluster_acceleration_structure]        = EBhDisable;
-    extensionBehavior[E_GL_NV_linear_swept_spheres]                  = EBhDisable;
 
     // ARM
     extensionBehavior[E_GL_ARM_shader_core_builtins]                 = EBhDisable;
-    extensionBehavior[E_GL_ARM_tensors]                              = EBhDisable;
 
     // QCOM
     extensionBehavior[E_GL_QCOM_image_processing]                    = EBhDisable;
     extensionBehavior[E_GL_QCOM_image_processing2]                   = EBhDisable;
-    extensionBehavior[E_GL_QCOM_tile_shading]                        = EBhDisable;
-    extensionBehavior[E_GL_QCOM_cooperative_matrix_conversion]       = EBhDisable;
 
     // AEP
     extensionBehavior[E_GL_ANDROID_extension_pack_es31a]             = EBhDisable;
@@ -381,14 +370,6 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_EXT_texture_shadow_lod]          = EBhDisable;
     extensionBehavior[E_GL_EXT_draw_instanced]              = EBhDisable;
     extensionBehavior[E_GL_EXT_texture_array]               = EBhDisable;
-    extensionBehavior[E_GL_EXT_texture_offset_non_const]    = EBhDisable;
-    extensionBehavior[E_GL_EXT_nontemporal_keyword]         = EBhDisable;
-    extensionBehavior[E_GL_EXT_bfloat16]                    = EBhDisable;
-    extensionBehavior[E_GL_EXT_float_e4m3]                  = EBhDisable;
-    extensionBehavior[E_GL_EXT_float_e5m2]                  = EBhDisable;
-    extensionBehavior[E_GL_EXT_uniform_buffer_unsized_array] = EBhDisable;
-    extensionBehavior[E_GL_EXT_shader_64bit_indexing]       = EBhDisable;
-    extensionBehavior[E_GL_EXT_conservative_depth]          = EBhDisable;
 
     // OVR extensions
     extensionBehavior[E_GL_OVR_multiview]                = EBhDisable;
@@ -412,10 +393,6 @@ void TParseVersions::initializeExtensionBehavior()
     extensionBehavior[E_GL_EXT_shader_atomic_float]                    = EBhDisable;
     extensionBehavior[E_GL_EXT_shader_atomic_float2]                   = EBhDisable;
 
-    extensionBehavior[E_GL_EXT_integer_dot_product]                    = EBhDisable;
-
-    extensionBehavior[E_GL_EXT_shader_invocation_reorder]              = EBhDisable;
-
     // Record extensions not for spv.
     spvUnsupportedExt.push_back(E_GL_ARB_bindless_texture);
 }
@@ -437,7 +414,6 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_EXT_shader_texture_lod 1\n"
             "#define GL_EXT_shadow_samplers 1\n"
             "#define GL_EXT_fragment_shading_rate 1\n"
-            "#define GL_EXT_conservative_depth 1\n"
 
             // AEP
             "#define GL_ANDROID_extension_pack_es31a 1\n"
@@ -472,8 +448,6 @@ void TParseVersions::getPreamble(std::string& preamble)
 
             "#define GL_QCOM_image_processing 1\n"
             "#define GL_QCOM_image_processing2 1\n"
-            "#define GL_QCOM_tile_shading 1\n"
-            "#define GL_QCOM_cooperative_matrix_conversion 1\n"
             ;
 
             if (version >= 300) {
@@ -524,10 +498,8 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_ARB_shader_storage_buffer_object 1\n"
             "#define GL_ARB_texture_query_lod 1\n"
             "#define GL_ARB_vertex_attrib_64bit 1\n"
-            "#define GL_NV_gpu_shader5 1\n"
             "#define GL_ARB_draw_instanced 1\n"
             "#define GL_ARB_fragment_coord_conventions 1\n"
-            "#define GL_ARB_conservative_depth 1\n"
 
             "#define GL_EXT_shader_non_constant_global_initializers 1\n"
             "#define GL_EXT_shader_image_load_formatted 1\n"
@@ -547,7 +519,6 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_EXT_fragment_shading_rate 1\n"
             "#define GL_EXT_shared_memory_block 1\n"
             "#define GL_EXT_shader_integer_mix 1\n"
-            "#define GL_EXT_spec_constant_composites 1\n"
 
             // GL_KHR_shader_subgroup
             "#define GL_KHR_shader_subgroup_basic 1\n"
@@ -601,12 +572,9 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_NV_cooperative_matrix 1\n"
             "#define GL_NV_integer_cooperative_matrix 1\n"
             "#define GL_NV_shader_invocation_reorder 1\n"
-            "#define GL_NV_cooperative_matrix2 1\n"
 
             "#define GL_QCOM_image_processing 1\n"
             "#define GL_QCOM_image_processing2 1\n"
-            "#define GL_QCOM_tile_shading 1\n"
-            "#define GL_QCOM_cooperative_matrix_conversion 1\n"
 
             "#define GL_EXT_shader_explicit_arithmetic_types 1\n"
             "#define GL_EXT_shader_explicit_arithmetic_types_int8 1\n"
@@ -630,15 +598,6 @@ void TParseVersions::getPreamble(std::string& preamble)
             "#define GL_EXT_texture_array 1\n"
 
             "#define GL_EXT_control_flow_attributes2 1\n"
-
-            "#define GL_EXT_integer_dot_product 1\n"
-            "#define GL_EXT_bfloat16 1\n"
-            "#define GL_EXT_float_e5m2 1\n"
-            "#define GL_EXT_float_e4m3 1\n"
-            "#define GL_EXT_uniform_buffer_unsized_array 1\n"
-            "#define GL_EXT_shader_64bit_indexing 1\n"
-
-            "#define GL_EXT_shader_invocation_reorder 1\n"
             ;
 
         if (spvVersion.spv == 0) {
@@ -671,11 +630,6 @@ void TParseVersions::getPreamble(std::string& preamble)
             ;
     }
 
-    if ((!isEsProfile() && version >= 130) ||
-        (isEsProfile() && version >= 300)) {
-        preamble += "#define GL_EXT_texture_offset_non_const 1\n";
-    }
-
     if (version >= 300 /* both ES and non-ES */) {
         preamble +=
             "#define GL_OVR_multiview 1\n"
@@ -819,7 +773,7 @@ void TParseVersions::profileRequires(const TSourceLoc& loc, int profileMask, int
         for (int i = 0; i < numExtensions; ++i) {
             switch (getExtensionBehavior(extensions[i])) {
             case EBhWarn:
-                infoSink.info.message(EPrefixWarning, ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(), loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                infoSink.info.message(EPrefixWarning, ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(), loc);
                 [[fallthrough]];
             case EBhRequire:
             case EBhEnable:
@@ -857,8 +811,7 @@ void TParseVersions::checkDeprecated(const TSourceLoc& loc, int profileMask, int
                 error(loc, "deprecated, may be removed in future release", featureDesc, "");
             else if (! suppressWarnings())
                 infoSink.info.message(EPrefixWarning, (TString(featureDesc) + " deprecated in version " +
-                                                       String(depVersion) + "; may be removed in future release").c_str(), 
-                                                       loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                                                       String(depVersion) + "; may be removed in future release").c_str(), loc);
         }
     }
 }
@@ -895,14 +848,11 @@ bool TParseVersions::checkExtensionsRequested(const TSourceLoc& loc, int numExte
     for (int i = 0; i < numExtensions; ++i) {
         TExtensionBehavior behavior = getExtensionBehavior(extensions[i]);
         if (behavior == EBhDisable && relaxedErrors()) {
-            infoSink.info.message(EPrefixWarning, "The following extension must be enabled to use this feature:", loc,
-                                  messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+            infoSink.info.message(EPrefixWarning, "The following extension must be enabled to use this feature:", loc);
             behavior = EBhWarn;
         }
         if (behavior == EBhWarn) {
-            infoSink.info.message(EPrefixWarning,
-                                  ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(),
-                                  loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+            infoSink.info.message(EPrefixWarning, ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(), loc);
             warned = true;
         }
     }
@@ -1065,8 +1015,6 @@ void TParseVersions::updateExtensionBehavior(int line, const char* extension, co
         updateExtensionBehavior(line, "GL_EXT_buffer_reference", behaviorString);
     else if (strcmp(extension, "GL_NV_integer_cooperative_matrix") == 0)
         updateExtensionBehavior(line, "GL_NV_cooperative_matrix", behaviorString);
-    else if (strcmp(extension, "GL_NV_cooperative_matrix2") == 0)
-        updateExtensionBehavior(line, "GL_KHR_cooperative_matrix", behaviorString);
     // subgroup extended types to explicit types
     else if (strcmp(extension, "GL_EXT_shader_subgroup_extended_types_int8") == 0)
         updateExtensionBehavior(line, "GL_EXT_shader_explicit_arithmetic_types_int8", behaviorString);
@@ -1102,9 +1050,6 @@ void TParseVersions::updateExtensionBehavior(int line, const char* extension, co
         intermediate.updateNumericFeature(TNumericFeatures::gpu_shader_int16, on);
     else if (strcmp(extension, "GL_AMD_gpu_shader_half_float") == 0)
         intermediate.updateNumericFeature(TNumericFeatures::gpu_shader_half_float, on);
-    else if (strcmp(extension, "GL_NV_gpu_shader5") == 0) {
-        intermediate.updateNumericFeature(TNumericFeatures::nv_gpu_shader5_types, on);
-    }
 }
 
 void TParseVersions::updateExtensionBehavior(const char* extension, TExtensionBehavior behavior)
@@ -1232,7 +1177,6 @@ bool TParseVersions::float16Arithmetic()
     const char* const extensions[] = {
                                        E_GL_AMD_gpu_shader_half_float,
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_float16};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
@@ -1242,7 +1186,6 @@ bool TParseVersions::int16Arithmetic()
     const char* const extensions[] = {
                                        E_GL_AMD_gpu_shader_int16,
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_int16};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
@@ -1251,7 +1194,6 @@ bool TParseVersions::int8Arithmetic()
 {
     const char* const extensions[] = {
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_int8};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
@@ -1266,7 +1208,6 @@ void TParseVersions::requireFloat16Arithmetic(const TSourceLoc& loc, const char*
     const char* const extensions[] = {
                                        E_GL_AMD_gpu_shader_half_float,
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_float16};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
@@ -1281,7 +1222,6 @@ void TParseVersions::requireInt16Arithmetic(const TSourceLoc& loc, const char* o
     const char* const extensions[] = {
                                        E_GL_AMD_gpu_shader_int16,
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_int16};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
@@ -1295,7 +1235,6 @@ void TParseVersions::requireInt8Arithmetic(const TSourceLoc& loc, const char* op
 
     const char* const extensions[] = {
                                        E_GL_EXT_shader_explicit_arithmetic_types,
-                                       E_GL_NV_gpu_shader5,
                                        E_GL_EXT_shader_explicit_arithmetic_types_int8};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
@@ -1307,50 +1246,18 @@ void TParseVersions::float16ScalarVectorCheck(const TSourceLoc& loc, const char*
                                            E_GL_AMD_gpu_shader_half_float,
                                            E_GL_EXT_shader_16bit_storage,
                                            E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
                                            E_GL_EXT_shader_explicit_arithmetic_types_float16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
 
-void TParseVersions::bfloat16ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {
-                                           E_GL_EXT_bfloat16,
-                                         };
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
-void TParseVersions::floate5m2ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {
-                                           E_GL_EXT_float_e5m2,
-                                         };
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
-void TParseVersions::floate4m3ScalarVectorCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {
-                                           E_GL_EXT_float_e4m3,
-                                         };
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
 // Call for any operation needing GLSL float32 data-type support.
 void TParseVersions::explicitFloat32Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (!builtIn) {
-        const char* const extensions[] = {E_GL_EXT_shader_explicit_arithmetic_types,
-                                          E_GL_NV_gpu_shader5,
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
                                            E_GL_EXT_shader_explicit_arithmetic_types_float32};
-        requireExtensions(loc, sizeof(extensions) / sizeof(extensions[0]), extensions, op);
+        requireExtensions(loc, 2, extensions, op);
     }
 }
 
@@ -1358,15 +1265,11 @@ void TParseVersions::explicitFloat32Check(const TSourceLoc& loc, const char* op,
 void TParseVersions::explicitFloat64Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (!builtIn) {
-        const char* const extensions[] = {E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
                                            E_GL_EXT_shader_explicit_arithmetic_types_float64};
-        requireExtensions(loc, sizeof(extensions) / sizeof(extensions[0]), extensions, op);
+        requireExtensions(loc, 2, extensions, op);
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        if(extensionTurnedOn(E_GL_ARB_gpu_shader_fp64) && extensionTurnedOn(E_GL_NV_gpu_shader5))
-            profileRequires(loc, ECoreProfile | ECompatibilityProfile, 150, nullptr, op);
-        else
-            profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
+        profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
     }
 }
 
@@ -1409,7 +1312,6 @@ void TParseVersions::int16ScalarVectorCheck(const TSourceLoc& loc, const char* o
                                            E_GL_AMD_gpu_shader_int16,
                                            E_GL_EXT_shader_16bit_storage,
                                            E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
                                            E_GL_EXT_shader_explicit_arithmetic_types_int16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
@@ -1421,7 +1323,6 @@ void TParseVersions::int8ScalarVectorCheck(const TSourceLoc& loc, const char* op
     	const char* const extensions[] = {
                                            E_GL_EXT_shader_8bit_storage,
                                            E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
                                            E_GL_EXT_shader_explicit_arithmetic_types_int8};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
@@ -1431,10 +1332,9 @@ void TParseVersions::int8ScalarVectorCheck(const TSourceLoc& loc, const char* op
 void TParseVersions::explicitInt32Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (! builtIn) {
-        const char* const extensions[] = {E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
                                            E_GL_EXT_shader_explicit_arithmetic_types_int32};
-        requireExtensions(loc, sizeof(extensions) / sizeof(extensions[0]), extensions, op);
+        requireExtensions(loc, 2, extensions, op);
     }
 }
 
@@ -1442,15 +1342,11 @@ void TParseVersions::explicitInt32Check(const TSourceLoc& loc, const char* op, b
 void TParseVersions::int64Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (! builtIn) {
-        const char* const extensions[] = {E_GL_ARB_gpu_shader_int64,
+        const char* const extensions[3] = {E_GL_ARB_gpu_shader_int64,
                                            E_GL_EXT_shader_explicit_arithmetic_types,
-                                           E_GL_NV_gpu_shader5,
                                            E_GL_EXT_shader_explicit_arithmetic_types_int64};
-        requireExtensions(loc, sizeof(extensions) / sizeof(extensions[0]), extensions, op);
+        requireExtensions(loc, 3, extensions, op);
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
-        if (extensionTurnedOn(E_GL_NV_gpu_shader5))
-            profileRequires(loc, ECoreProfile | ECompatibilityProfile, 150, nullptr, op);
-        else
         profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
     }
 }
@@ -1479,46 +1375,6 @@ void TParseVersions::coopmatCheck(const TSourceLoc& loc, const char* op, bool bu
     }
 }
 
-void TParseVersions::coopmatConverisonCheckQCOM(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-  if (!builtIn) {
-    const char* const extensions[] = {E_GL_KHR_cooperative_matrix};
-    requireExtensions(loc, sizeof(extensions) / sizeof(extensions[0]), extensions, op);
-  }
-}
-
-void TParseVersions::tensorLayoutViewCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {E_GL_NV_cooperative_matrix2};
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
-void TParseVersions::coopvecCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {E_GL_NV_cooperative_vector};
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
-void TParseVersions::intattachmentCheck(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {E_GL_QCOM_tile_shading};
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
-void TParseVersions::tensorCheckARM(const TSourceLoc& loc, const char* op, bool builtIn)
-{
-    if (!builtIn) {
-        const char* const extensions[] = {E_GL_ARM_tensors};
-        requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
-    }
-}
-
 // Call for any operation removed because SPIR-V is in use.
 void TParseVersions::spvRemoved(const TSourceLoc& loc, const char* op)
 {
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.h b/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.h
index 48a7c5b6..cfaeb1ff 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/Versions.h
@@ -4,7 +4,6 @@
 // Copyright (C) 2017, 2022-2024 Arm Limited.
 // Copyright (C) 2015-2018 Google, Inc.
 // Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
-// Modifications Copyright (C) 2024 Valve Corporation.
 //
 // All rights reserved.
 //
@@ -165,7 +164,6 @@ const char* const E_GL_ARB_vertex_attrib_64bit          = "GL_ARB_vertex_attrib_
 const char* const E_GL_ARB_draw_instanced               = "GL_ARB_draw_instanced";
 const char* const E_GL_ARB_fragment_coord_conventions   = "GL_ARB_fragment_coord_conventions";
 const char* const E_GL_ARB_bindless_texture             = "GL_ARB_bindless_texture";
-const char* const E_GL_ARB_conservative_depth           = "GL_ARB_conservative_depth";
 
 const char* const E_GL_KHR_shader_subgroup_basic            = "GL_KHR_shader_subgroup_basic";
 const char* const E_GL_KHR_shader_subgroup_vote             = "GL_KHR_shader_subgroup_vote";
@@ -224,11 +222,6 @@ const char* const E_GL_EXT_texture_array                    = "GL_EXT_texture_ar
 const char* const E_GL_EXT_maximal_reconvergence            = "GL_EXT_maximal_reconvergence";
 const char* const E_GL_EXT_expect_assume                    = "GL_EXT_expect_assume";
 const char* const E_GL_EXT_control_flow_attributes2         = "GL_EXT_control_flow_attributes2";
-const char* const E_GL_EXT_spec_constant_composites         = "GL_EXT_spec_constant_composites";
-const char* const E_GL_EXT_texture_offset_non_const         = "GL_EXT_texture_offset_non_const";
-const char* const E_GL_EXT_nontemporal_keyword              = "GL_EXT_nontemporal_keyword";
-const char* const E_GL_EXT_uniform_buffer_unsized_array     = "GL_EXT_uniform_buffer_unsized_array";
-const char* const E_GL_EXT_conservative_depth               = "GL_EXT_conservative_depth";
 
 // Arrays of extensions for the above viewportEXTs duplications
 
@@ -288,15 +281,9 @@ const char* const E_GL_NV_shader_invocation_reorder             = "GL_NV_shader_
 const char* const E_GL_EXT_ray_tracing_position_fetch           = "GL_EXT_ray_tracing_position_fetch";
 const char* const E_GL_NV_displacement_micromap                 = "GL_NV_displacement_micromap";
 const char* const E_GL_NV_shader_atomic_fp16_vector             = "GL_NV_shader_atomic_fp16_vector";
-const char* const E_GL_NV_cooperative_matrix2                   = "GL_NV_cooperative_matrix2";
-const char* const E_GL_NV_cooperative_vector                    = "GL_NV_cooperative_vector";
-const char* const E_GL_NV_cluster_acceleration_structure        = "GL_NV_cluster_acceleration_structure";
-const char* const E_GL_NV_linear_swept_spheres                  = "GL_NV_linear_swept_spheres";
-const char* const E_GL_NV_gpu_shader5                           = "GL_NV_gpu_shader5";
 
 // ARM
 const char* const E_GL_ARM_shader_core_builtins                 = "GL_ARM_shader_core_builtins";
-const char* const E_GL_ARM_tensors                              = "GL_ARM_tensors";
 
 // Arrays of extensions for the above viewportEXTs duplications
 
@@ -306,8 +293,6 @@ const int Num_viewportEXTs = sizeof(viewportEXTs) / sizeof(viewportEXTs[0]);
 
 const char* const E_GL_QCOM_image_processing                    = "GL_QCOM_image_processing";
 const char* const E_GL_QCOM_image_processing2                   = "GL_QCOM_image_processing2";
-const char* const E_GL_QCOM_tile_shading                        = "GL_QCOM_tile_shading";
-const char* const E_GL_QCOM_cooperative_matrix_conversion       = "GL_QCOM_cooperative_matrix_conversion";
 
 // AEP
 const char* const E_GL_ANDROID_extension_pack_es31a             = "GL_ANDROID_extension_pack_es31a";
@@ -361,16 +346,6 @@ const char* const E_GL_EXT_shader_tile_image = "GL_EXT_shader_tile_image";
 
 const char* const E_GL_EXT_texture_shadow_lod = "GL_EXT_texture_shadow_lod";
 
-const char* const E_GL_EXT_integer_dot_product                    = "GL_EXT_integer_dot_product";
-
-const char* const E_GL_EXT_bfloat16 = "GL_EXT_bfloat16";
-const char* const E_GL_EXT_float_e5m2 = "GL_EXT_float_e5m2";
-const char* const E_GL_EXT_float_e4m3 = "GL_EXT_float_e4m3";
-
-const char* const E_GL_EXT_shader_64bit_indexing = "GL_EXT_shader_64bit_indexing";
-
-const char* const E_GL_EXT_shader_invocation_reorder = "GL_EXT_shader_invocation_reorder";
-
 // Arrays of extensions for the above AEP duplications
 
 const char* const AEP_geometry_shader[] = { E_GL_EXT_geometry_shader, E_GL_OES_geometry_shader };
@@ -382,9 +357,6 @@ const int Num_AEP_geometry_point_size = sizeof(AEP_geometry_point_size)/sizeof(A
 const char* const AEP_gpu_shader5[] = { E_GL_EXT_gpu_shader5, E_GL_OES_gpu_shader5 };
 const int Num_AEP_gpu_shader5 = sizeof(AEP_gpu_shader5)/sizeof(AEP_gpu_shader5[0]);
 
-const char* const AEP_core_gpu_shader5[] = { E_GL_ARB_gpu_shader5, E_GL_NV_gpu_shader5};
-const int Num_AEP_core_gpu_shader5 = sizeof(AEP_core_gpu_shader5)/sizeof(AEP_core_gpu_shader5[0]);
-
 const char* const AEP_primitive_bounding_box[] = { E_GL_EXT_primitive_bounding_box, E_GL_OES_primitive_bounding_box };
 const int Num_AEP_primitive_bounding_box = sizeof(AEP_primitive_bounding_box)/sizeof(AEP_primitive_bounding_box[0]);
 
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang.y b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang.y
index 9758048d..53c57677 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang.y
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang.y
@@ -146,7 +146,7 @@ extern int yylex(YYSTYPE*, TParseContext&);
 %token <lex> UTEXTURE2D UTEXTURE3D UTEXTURECUBE UTEXTURE2DARRAY
 
 %token <lex> ATTRIBUTE VARYING
-%token <lex> FLOATE5M2_T FLOATE4M3_T BFLOAT16_T FLOAT16_T FLOAT32_T DOUBLE FLOAT64_T
+%token <lex> FLOAT16_T FLOAT32_T DOUBLE FLOAT64_T
 %token <lex> INT64_T UINT64_T INT32_T UINT32_T INT16_T UINT16_T INT8_T UINT8_T
 %token <lex> I64VEC2 I64VEC3 I64VEC4
 %token <lex> U64VEC2 U64VEC3 U64VEC4
@@ -157,9 +157,6 @@ extern int yylex(YYSTYPE*, TParseContext&);
 %token <lex> I8VEC2  I8VEC3  I8VEC4
 %token <lex> U8VEC2  U8VEC3  U8VEC4
 %token <lex> DVEC2 DVEC3 DVEC4 DMAT2 DMAT3 DMAT4
-%token <lex> BF16VEC2 BF16VEC3 BF16VEC4
-%token <lex> FE5M2VEC2 FE5M2VEC3 FE5M2VEC4
-%token <lex> FE4M3VEC2 FE4M3VEC3 FE4M3VEC4
 %token <lex> F16VEC2 F16VEC3 F16VEC4 F16MAT2 F16MAT3 F16MAT4
 %token <lex> F32VEC2 F32VEC3 F32VEC4 F32MAT2 F32MAT3 F32MAT4
 %token <lex> F64VEC2 F64VEC3 F64VEC4 F64MAT2 F64MAT3 F64MAT4
@@ -181,10 +178,7 @@ extern int yylex(YYSTYPE*, TParseContext&);
 %token <lex> RAYQUERYEXT
 %token <lex> FCOOPMATNV ICOOPMATNV UCOOPMATNV
 %token <lex> COOPMAT
-%token <lex> COOPVECNV
-%token <lex> HITOBJECTNV HITOBJECTATTRNV HITOBJECTEXT HITOBJECTATTREXT
-%token <lex> TENSORLAYOUTNV TENSORVIEWNV
-%token <lex> TENSORARM
+%token <lex> HITOBJECTNV HITOBJECTATTRNV
 
 // combined image/sampler
 %token <lex> SAMPLERCUBEARRAY SAMPLERCUBEARRAYSHADOW
@@ -281,11 +275,11 @@ extern int yylex(YYSTYPE*, TParseContext&);
 
 %token <lex> DOUBLECONSTANT INT16CONSTANT UINT16CONSTANT FLOAT16CONSTANT INT32CONSTANT UINT32CONSTANT
 %token <lex> INT64CONSTANT UINT64CONSTANT
-%token <lex> SUBROUTINE DEMOTE FUNCTION
+%token <lex> SUBROUTINE DEMOTE
 %token <lex> PAYLOADNV PAYLOADINNV HITATTRNV CALLDATANV CALLDATAINNV 
 %token <lex> PAYLOADEXT PAYLOADINEXT HITATTREXT CALLDATAEXT CALLDATAINEXT
 %token <lex> PATCH SAMPLE NONUNIFORM
-%token <lex> COHERENT VOLATILE RESTRICT READONLY WRITEONLY NONTEMPORAL DEVICECOHERENT QUEUEFAMILYCOHERENT WORKGROUPCOHERENT
+%token <lex> COHERENT VOLATILE RESTRICT READONLY WRITEONLY DEVICECOHERENT QUEUEFAMILYCOHERENT WORKGROUPCOHERENT
 %token <lex> SUBGROUPCOHERENT NONPRIVATE SHADERCALLCOHERENT
 %token <lex> NOPERSPECTIVE EXPLICITINTERPAMD PERVERTEXEXT PERVERTEXNV PERPRIMITIVENV PERVIEWNV PERTASKNV PERPRIMITIVEEXT TASKPAYLOADWORKGROUPEXT
 %token <lex> PRECISE
@@ -298,8 +292,7 @@ extern int yylex(YYSTYPE*, TParseContext&);
 %type <interm.intermTypedNode> conditional_expression constant_expression
 %type <interm.intermTypedNode> logical_or_expression logical_xor_expression logical_and_expression
 %type <interm.intermTypedNode> shift_expression and_expression exclusive_or_expression inclusive_or_expression
-%type <interm.intermTypedNode> function_call initializer
-%type <interm.intermNode> condition conditionopt
+%type <interm.intermTypedNode> function_call initializer condition conditionopt
 
 %type <interm.intermNode> translation_unit function_definition
 %type <interm.intermNode> statement simple_statement
@@ -452,7 +445,7 @@ postfix_expression
 
 integer_expression
     : expression {
-        parseContext.arrayIndexCheck($1, "[]");
+        parseContext.integerCheck($1, "[]");
         $$ = $1;
     }
     ;
@@ -556,7 +549,7 @@ function_identifier
 
         TIntermMethod* method = $1->getAsMethodNode();
         if (method) {
-            $$.function = new TFunction(&method->getMethodName(), method->getType(), EOpArrayLength);
+            $$.function = new TFunction(&method->getMethodName(), TType(EbtInt), EOpArrayLength);
             $$.intermNode = method->getObject();
         } else {
             TIntermSymbol* symbol = $1->getAsSymbolNode();
@@ -913,22 +906,31 @@ declaration
         $$ = 0;
     }
     | block_structure SEMICOLON {
-        $$ = parseContext.declareBlock($1.loc, *$1.typeList);
+        parseContext.declareBlock($1.loc, *$1.typeList);
+        $$ = 0;
     }
     | block_structure IDENTIFIER SEMICOLON {
-        $$ = parseContext.declareBlock($1.loc, *$1.typeList, $2.string);
+        parseContext.declareBlock($1.loc, *$1.typeList, $2.string);
+        $$ = 0;
     }
     | block_structure IDENTIFIER array_specifier SEMICOLON {
-        $$ = parseContext.declareBlock($1.loc, *$1.typeList, $2.string, $3.arraySizes);
+        parseContext.declareBlock($1.loc, *$1.typeList, $2.string, $3.arraySizes);
+        $$ = 0;
     }
     | type_qualifier SEMICOLON {
         parseContext.globalQualifierFixCheck($1.loc, $1.qualifier);
         parseContext.updateStandaloneQualifierDefaults($1.loc, $1);
         $$ = 0;
     }
-    | type_qualifier identifier_list SEMICOLON {
+    | type_qualifier IDENTIFIER SEMICOLON {
         parseContext.checkNoShaderLayouts($1.loc, $1.shaderQualifiers);
-        parseContext.addQualifierToExisting($1.loc, $1.qualifier, *$2);
+        parseContext.addQualifierToExisting($1.loc, $1.qualifier, *$2.string);
+        $$ = 0;
+    }
+    | type_qualifier IDENTIFIER identifier_list SEMICOLON {
+        parseContext.checkNoShaderLayouts($1.loc, $1.shaderQualifiers);
+        $3->push_back($2.string);
+        parseContext.addQualifierToExisting($1.loc, $1.qualifier, *$3);
         $$ = 0;
     }
     ;
@@ -945,9 +947,9 @@ block_structure
     }
 
 identifier_list
-    : IDENTIFIER {
+    : COMMA IDENTIFIER {
         $$ = new TIdentifierList;
-        $$->push_back($1.string);
+        $$->push_back($2.string);
     }
     | identifier_list COMMA IDENTIFIER {
         $$ = $1;
@@ -1032,10 +1034,6 @@ function_header_with_parameters
                 parseContext.vkRelaxedRemapFunctionParameter($1, $3.param);
         }
     }
-    | function_header_with_parameters COMMA DOT DOT DOT {
-        $$ = $1;
-        parseContext.makeVariadic($1, $3.loc);
-    }
     ;
 
 function_header
@@ -1096,11 +1094,6 @@ parameter_declarator
         $$.loc = $2.loc;
         $$.param = param;
     }
-    | type_specifier IDENTIFIER EQUAL initializer {
-        TParameter param = parseContext.getParamWithDefault($1, $2.string, $4, $3.loc);
-        $$.loc = $2.loc;
-        $$.param = param;
-    }
     ;
 
 parameter_declaration
@@ -1111,7 +1104,7 @@ parameter_declaration
         $$ = $2;
         if ($1.qualifier.precision != EpqNone)
             $$.param.type->getQualifier().precision = $1.qualifier.precision;
-        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->isCoopMat());
 
         parseContext.checkNoShaderLayouts($1.loc, $1.shaderQualifiers);
         parseContext.parameterTypeCheck($2.loc, $1.qualifier.storage, *$$.param.type);
@@ -1123,7 +1116,7 @@ parameter_declaration
 
         parseContext.parameterTypeCheck($1.loc, EvqIn, *$1.param.type);
         parseContext.paramCheckFixStorage($1.loc, EvqTemporary, *$$.param.type);
-        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->isCoopMat());
     }
     //
     // Without name
@@ -1132,7 +1125,7 @@ parameter_declaration
         $$ = $2;
         if ($1.qualifier.precision != EpqNone)
             $$.param.type->getQualifier().precision = $1.qualifier.precision;
-        parseContext.precisionQualifierCheck($1.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck($1.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->isCoopMat());
 
         parseContext.checkNoShaderLayouts($1.loc, $1.shaderQualifiers);
         parseContext.parameterTypeCheck($2.loc, $1.qualifier.storage, *$$.param.type);
@@ -1143,7 +1136,7 @@ parameter_declaration
 
         parseContext.parameterTypeCheck($1.loc, EvqIn, *$1.param.type);
         parseContext.paramCheckFixStorage($1.loc, EvqTemporary, *$$.param.type);
-        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck($$.loc, $$.param.type->getBasicType(), $$.param.type->getQualifier(), $$.param.type->isCoopMat());
     }
     ;
 
@@ -1162,23 +1155,21 @@ init_declarator_list
     }
     | init_declarator_list COMMA IDENTIFIER {
         $$ = $1;
-        TIntermNode* declNode = parseContext.declareVariable($3.loc, *$3.string, $1.type);
-        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, declNode, $3.loc);
+        parseContext.declareVariable($3.loc, *$3.string, $1.type);
     }
     | init_declarator_list COMMA IDENTIFIER array_specifier {
         $$ = $1;
-        TIntermNode* declNode = parseContext.declareVariable($3.loc, *$3.string, $1.type, $4.arraySizes);
-        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, declNode, $3.loc);
+        parseContext.declareVariable($3.loc, *$3.string, $1.type, $4.arraySizes);
     }
     | init_declarator_list COMMA IDENTIFIER array_specifier EQUAL initializer {
         $$.type = $1.type;
-        TIntermNode* declNode = parseContext.declareVariable($3.loc, *$3.string, $1.type, $4.arraySizes, $6);
-        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, declNode, $5.loc);
+        TIntermNode* initNode = parseContext.declareVariable($3.loc, *$3.string, $1.type, $4.arraySizes, $6);
+        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, initNode, $5.loc);
     }
     | init_declarator_list COMMA IDENTIFIER EQUAL initializer {
         $$.type = $1.type;
-        TIntermNode* declNode = parseContext.declareVariable($3.loc, *$3.string, $1.type, 0, $5);
-        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, declNode, $4.loc);
+        TIntermNode* initNode = parseContext.declareVariable($3.loc, *$3.string, $1.type, 0, $5);
+        $$.intermNode = parseContext.intermediate.growAggregate($1.intermNode, initNode, $4.loc);
     }
     ;
 
@@ -1190,24 +1181,23 @@ single_declaration
     }
     | fully_specified_type IDENTIFIER {
         $$.type = $1;
-        TIntermNode* declNode = parseContext.declareVariable($2.loc, *$2.string, $1);
-        $$.intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, $2.loc);
-
+        $$.intermNode = 0;
+        parseContext.declareVariable($2.loc, *$2.string, $1);
     }
     | fully_specified_type IDENTIFIER array_specifier {
         $$.type = $1;
-        TIntermNode* declNode = parseContext.declareVariable($2.loc, *$2.string, $1, $3.arraySizes);
-        $$.intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, $2.loc);
+        $$.intermNode = 0;
+        parseContext.declareVariable($2.loc, *$2.string, $1, $3.arraySizes);
     }
     | fully_specified_type IDENTIFIER array_specifier EQUAL initializer {
         $$.type = $1;
-        TIntermNode* declNode = parseContext.declareVariable($2.loc, *$2.string, $1, $3.arraySizes, $5);
-        $$.intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, $2.loc);
+        TIntermNode* initNode = parseContext.declareVariable($2.loc, *$2.string, $1, $3.arraySizes, $5);
+        $$.intermNode = parseContext.intermediate.growAggregate(0, initNode, $4.loc);
     }
     | fully_specified_type IDENTIFIER EQUAL initializer {
         $$.type = $1;
-        TIntermNode* declNode = parseContext.declareVariable($2.loc, *$2.string, $1, 0, $4);
-        $$.intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, $2.loc);
+        TIntermNode* initNode = parseContext.declareVariable($2.loc, *$2.string, $1, 0, $4);
+        $$.intermNode = parseContext.intermediate.growAggregate(0, initNode, $3.loc);
     }
 
 // Grammar Note:  No 'enum', or 'typedef'.
@@ -1221,7 +1211,7 @@ fully_specified_type
             parseContext.profileRequires($1.loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
             parseContext.profileRequires($1.loc, EEsProfile, 300, 0, "arrayed type");
         }
-        parseContext.precisionQualifierCheck($$.loc, $$.basicType, $$.qualifier, $$.hasTypeParameter());
+        parseContext.precisionQualifierCheck($$.loc, $$.basicType, $$.qualifier, $$.isCoopmat());
     }
     | type_qualifier type_specifier  {
         parseContext.globalQualifierFixCheck($1.loc, $1.qualifier, false, &$2);
@@ -1238,7 +1228,7 @@ fully_specified_type
         parseContext.checkNoShaderLayouts($2.loc, $1.shaderQualifiers);
         $2.shaderQualifiers.merge($1.shaderQualifiers);
         parseContext.mergeQualifiers($2.loc, $2.qualifier, $1.qualifier, true);
-        parseContext.precisionQualifierCheck($2.loc, $2.basicType, $2.qualifier, $2.hasTypeParameter());
+        parseContext.precisionQualifierCheck($2.loc, $2.basicType, $2.qualifier, $2.isCoopmat());
 
         $$ = $2;
 
@@ -1538,22 +1528,14 @@ storage_qualifier
         $$.init($1.loc);
         $$.qualifier.storage = EvqHitAttr;
     }
-    | HITOBJECTATTRNV {
+	| HITOBJECTATTRNV {
         parseContext.globalCheck($1.loc, "hitAttributeNV");
         parseContext.requireStage($1.loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask
             | EShLangMissMask), "hitObjectAttributeNV");
         parseContext.profileRequires($1.loc, ECoreProfile, 460, E_GL_NV_shader_invocation_reorder, "hitObjectAttributeNV");
         $$.init($1.loc);
         $$.qualifier.storage = EvqHitObjectAttrNV;
-    }
-    | HITOBJECTATTREXT {
-        parseContext.globalCheck($1.loc, "hitAttributeEXT");
-        parseContext.requireStage($1.loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask
-            | EShLangMissMask), "hitObjectAttributeEXT");
-        parseContext.profileRequires($1.loc, ECoreProfile, 460, E_GL_EXT_shader_invocation_reorder, "hitObjectAttributeEXT");
-        $$.init($1.loc);
-        $$.qualifier.storage = EvqHitObjectAttrEXT;
-    }
+	}
     | HITATTREXT {
         parseContext.globalCheck($1.loc, "hitAttributeEXT");
         parseContext.requireStage($1.loc, (EShLanguageMask)(EShLangIntersectMask | EShLangClosestHitMask
@@ -1674,10 +1656,6 @@ storage_qualifier
         $$.init($1.loc);
         $$.qualifier.writeonly = true;
     }
-    | NONTEMPORAL {
-        $$.init($1.loc);
-        $$.qualifier.nontemporal  = true;
-    }
     | SUBROUTINE {
         parseContext.spvRemoved($1.loc, "subroutine");
         parseContext.globalCheck($1.loc, "subroutine");
@@ -1722,7 +1700,7 @@ type_specifier
         $$ = $1;
         $$.qualifier.precision = parseContext.getDefaultPrecision($$);
         $$.typeParameters = $2;
-        parseContext.typeParametersCheck($1.loc, $$);
+        parseContext.coopMatTypeParametersCheck($1.loc, $$);
 
     }
     | type_specifier_nonarray type_parameter_specifier_opt array_specifier {
@@ -1731,7 +1709,7 @@ type_specifier
         $$.qualifier.precision = parseContext.getDefaultPrecision($$);
         $$.typeParameters = $2;
         $$.arraySizes = $3.arraySizes;
-        parseContext.typeParametersCheck($1.loc, $$);
+        parseContext.coopMatTypeParametersCheck($1.loc, $$);
     }
     ;
 
@@ -1953,21 +1931,6 @@ type_specifier_nonarray
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
         $$.basicType = EbtDouble;
     }
-    | BFLOAT16_T {
-        parseContext.bfloat16ScalarVectorCheck($1.loc, "bfloat16_t", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtBFloat16;
-    }
-    | FLOATE5M2_T {
-        parseContext.floate5m2ScalarVectorCheck($1.loc, "floate5m2_t", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE5M2;
-    }
-    | FLOATE4M3_T {
-        parseContext.floate4m3ScalarVectorCheck($1.loc, "floate4m3_t", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE4M3;
-    }
     | FLOAT16_T {
         parseContext.float16ScalarVectorCheck($1.loc, "float16_t", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
@@ -2047,60 +2010,6 @@ type_specifier_nonarray
         $$.basicType = EbtDouble;
         $$.setVector(4);
     }
-    | BF16VEC2 {
-        parseContext.bfloat16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtBFloat16;
-        $$.setVector(2);
-    }
-    | BF16VEC3 {
-        parseContext.bfloat16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtBFloat16;
-        $$.setVector(3);
-    }
-    | BF16VEC4 {
-        parseContext.bfloat16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtBFloat16;
-        $$.setVector(4);
-    }
-    | FE5M2VEC2 {
-        parseContext.floate5m2ScalarVectorCheck($1.loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE5M2;
-        $$.setVector(2);
-    }
-    | FE5M2VEC3 {
-        parseContext.floate5m2ScalarVectorCheck($1.loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE5M2;
-        $$.setVector(3);
-    }
-    | FE5M2VEC4 {
-        parseContext.floate5m2ScalarVectorCheck($1.loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE5M2;
-        $$.setVector(4);
-    }
-    | FE4M3VEC2 {
-        parseContext.floate4m3ScalarVectorCheck($1.loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE4M3;
-        $$.setVector(2);
-    }
-    | FE4M3VEC3 {
-        parseContext.floate4m3ScalarVectorCheck($1.loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE4M3;
-        $$.setVector(3);
-    }
-    | FE4M3VEC4 {
-        parseContext.floate4m3ScalarVectorCheck($1.loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtFloatE4M3;
-        $$.setVector(4);
-    }
     | F16VEC2 {
         parseContext.float16ScalarVectorCheck($1.loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
@@ -3626,44 +3535,14 @@ type_specifier_nonarray
         $$.coopmatNV = false;
         $$.coopmatKHR = true;
     }
-    | TENSORLAYOUTNV {
-        parseContext.tensorLayoutViewCheck($1.loc, "tensorLayoutNV", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtTensorLayoutNV;
-    }
-    | TENSORVIEWNV {
-        parseContext.tensorLayoutViewCheck($1.loc, "tensorViewNV", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtTensorViewNV;
-    }
-    | FUNCTION {
-        $$.init($1.loc);
-        $$.basicType = EbtFunction;
-    }
-    | COOPVECNV {
-        parseContext.coopvecCheck($1.loc, "coopvecNV", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtCoopvecNV;
-        $$.coopvecNV = true;
-    }
-    | TENSORARM {
-        parseContext.tensorCheckARM($1.loc, "tensorARM", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.tensorRankARM = 1; // placeholder value
-        $$.basicType = EbtTensorARM;
-    }
     | spirv_type_specifier {
         parseContext.requireExtensions($1.loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V type specifier");
         $$ = $1;
     }
-    | HITOBJECTNV {
+	| HITOBJECTNV {
        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
        $$.basicType = EbtHitObjectNV;
-    }
-    | HITOBJECTEXT {
-       $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-       $$.basicType = EbtHitObjectEXT;
-    }
+	}
     | struct_specifier {
         $$ = $1;
         $$.qualifier.storage = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3757,7 +3636,7 @@ struct_declaration
         $$ = $2;
 
         parseContext.voidErrorCheck($1.loc, (*$2)[0].type->getFieldName(), $1.basicType);
-        parseContext.precisionQualifierCheck($1.loc, $1.basicType, $1.qualifier, $1.hasTypeParameter());
+        parseContext.precisionQualifierCheck($1.loc, $1.basicType, $1.qualifier, $1.isCoopmat());
 
         for (unsigned int i = 0; i < $$->size(); ++i) {
             TType type($1);
@@ -3781,7 +3660,7 @@ struct_declaration
         parseContext.memberQualifierCheck($1);
         parseContext.voidErrorCheck($2.loc, (*$3)[0].type->getFieldName(), $2.basicType);
         parseContext.mergeQualifiers($2.loc, $2.qualifier, $1.qualifier, true);
-        parseContext.precisionQualifierCheck($2.loc, $2.basicType, $2.qualifier, $2.hasTypeParameter());
+        parseContext.precisionQualifierCheck($2.loc, $2.basicType, $2.qualifier, $2.isCoopmat());
 
         for (unsigned int i = 0; i < $$->size(); ++i) {
             TType type($2);
@@ -3894,10 +3773,8 @@ compound_statement
         --parseContext.statementNestingLevel;
     }
       RIGHT_BRACE {
-        if ($3 && $3->getAsAggregate()) {
+        if ($3 && $3->getAsAggregate())
             $3->getAsAggregate()->setOperator(parseContext.intermediate.getDebugInfo() ? EOpScope : EOpSequence);
-            $3->getAsAggregate()->setEndLoc($5.loc);
-        }
         $$ = $3;
     }
     ;
@@ -3933,10 +3810,8 @@ compound_statement_no_new_scope
         $$ = 0;
     }
     | LEFT_BRACE statement_list RIGHT_BRACE {
-        if ($2 && $2->getAsAggregate()) {
+        if ($2 && $2->getAsAggregate())
             $2->getAsAggregate()->setOperator(EOpSequence);
-            $2->getAsAggregate()->setEndLoc($3.loc);
-        }
         $$ = $2;
     }
     ;
@@ -4003,7 +3878,11 @@ condition
         parseContext.boolCheck($2.loc, $1);
 
         TType type($1);
-        $$ = parseContext.declareVariable($2.loc, *$2.string, $1, 0, $4);
+        TIntermNode* initNode = parseContext.declareVariable($2.loc, *$2.string, $1, 0, $4);
+        if (initNode)
+            $$ = initNode->getAsTyped();
+        else
+            $$ = 0;
     }
     ;
 
@@ -4093,10 +3972,6 @@ iteration_statement_nonattributed
       condition RIGHT_PAREN statement_no_new_scope {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         $$ = parseContext.intermediate.addLoop($6, $4, 0, true, $1.loc);
-        if (parseContext.intermediate.getDebugInfo()) {
-            $$ = parseContext.intermediate.makeAggregate($$, $1.loc);
-            $$->getAsAggregate()->setOperator(EOpScope);
-        }
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
@@ -4114,10 +3989,6 @@ iteration_statement_nonattributed
         parseContext.boolCheck($8.loc, $6);
 
         $$ = parseContext.intermediate.addLoop($3, $6, 0, false, $4.loc);
-        if (parseContext.intermediate.getDebugInfo()) {
-            $$ = parseContext.intermediate.makeAggregate($$, $4.loc);
-            $$->getAsAggregate()->setOperator(EOpScope);
-        }
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
@@ -4136,7 +4007,7 @@ iteration_statement_nonattributed
         if (! parseContext.limits.nonInductiveForLoops)
             parseContext.inductiveLoopCheck($1.loc, $4, forLoop);
         $$ = parseContext.intermediate.growAggregate($$, forLoop, $1.loc);
-        $$->getAsAggregate()->setOperator(parseContext.intermediate.getDebugInfo() ? EOpScope : EOpSequence);
+        $$->getAsAggregate()->setOperator(EOpSequence);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp
index f0ec8c6a..5764d392 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp
@@ -184,560 +184,540 @@ enum yysymbol_kind_t
   YYSYMBOL_UTEXTURE2DARRAY = 60,           /* UTEXTURE2DARRAY  */
   YYSYMBOL_ATTRIBUTE = 61,                 /* ATTRIBUTE  */
   YYSYMBOL_VARYING = 62,                   /* VARYING  */
-  YYSYMBOL_FLOATE5M2_T = 63,               /* FLOATE5M2_T  */
-  YYSYMBOL_FLOATE4M3_T = 64,               /* FLOATE4M3_T  */
-  YYSYMBOL_BFLOAT16_T = 65,                /* BFLOAT16_T  */
-  YYSYMBOL_FLOAT16_T = 66,                 /* FLOAT16_T  */
-  YYSYMBOL_FLOAT32_T = 67,                 /* FLOAT32_T  */
-  YYSYMBOL_DOUBLE = 68,                    /* DOUBLE  */
-  YYSYMBOL_FLOAT64_T = 69,                 /* FLOAT64_T  */
-  YYSYMBOL_INT64_T = 70,                   /* INT64_T  */
-  YYSYMBOL_UINT64_T = 71,                  /* UINT64_T  */
-  YYSYMBOL_INT32_T = 72,                   /* INT32_T  */
-  YYSYMBOL_UINT32_T = 73,                  /* UINT32_T  */
-  YYSYMBOL_INT16_T = 74,                   /* INT16_T  */
-  YYSYMBOL_UINT16_T = 75,                  /* UINT16_T  */
-  YYSYMBOL_INT8_T = 76,                    /* INT8_T  */
-  YYSYMBOL_UINT8_T = 77,                   /* UINT8_T  */
-  YYSYMBOL_I64VEC2 = 78,                   /* I64VEC2  */
-  YYSYMBOL_I64VEC3 = 79,                   /* I64VEC3  */
-  YYSYMBOL_I64VEC4 = 80,                   /* I64VEC4  */
-  YYSYMBOL_U64VEC2 = 81,                   /* U64VEC2  */
-  YYSYMBOL_U64VEC3 = 82,                   /* U64VEC3  */
-  YYSYMBOL_U64VEC4 = 83,                   /* U64VEC4  */
-  YYSYMBOL_I32VEC2 = 84,                   /* I32VEC2  */
-  YYSYMBOL_I32VEC3 = 85,                   /* I32VEC3  */
-  YYSYMBOL_I32VEC4 = 86,                   /* I32VEC4  */
-  YYSYMBOL_U32VEC2 = 87,                   /* U32VEC2  */
-  YYSYMBOL_U32VEC3 = 88,                   /* U32VEC3  */
-  YYSYMBOL_U32VEC4 = 89,                   /* U32VEC4  */
-  YYSYMBOL_I16VEC2 = 90,                   /* I16VEC2  */
-  YYSYMBOL_I16VEC3 = 91,                   /* I16VEC3  */
-  YYSYMBOL_I16VEC4 = 92,                   /* I16VEC4  */
-  YYSYMBOL_U16VEC2 = 93,                   /* U16VEC2  */
-  YYSYMBOL_U16VEC3 = 94,                   /* U16VEC3  */
-  YYSYMBOL_U16VEC4 = 95,                   /* U16VEC4  */
-  YYSYMBOL_I8VEC2 = 96,                    /* I8VEC2  */
-  YYSYMBOL_I8VEC3 = 97,                    /* I8VEC3  */
-  YYSYMBOL_I8VEC4 = 98,                    /* I8VEC4  */
-  YYSYMBOL_U8VEC2 = 99,                    /* U8VEC2  */
-  YYSYMBOL_U8VEC3 = 100,                   /* U8VEC3  */
-  YYSYMBOL_U8VEC4 = 101,                   /* U8VEC4  */
-  YYSYMBOL_DVEC2 = 102,                    /* DVEC2  */
-  YYSYMBOL_DVEC3 = 103,                    /* DVEC3  */
-  YYSYMBOL_DVEC4 = 104,                    /* DVEC4  */
-  YYSYMBOL_DMAT2 = 105,                    /* DMAT2  */
-  YYSYMBOL_DMAT3 = 106,                    /* DMAT3  */
-  YYSYMBOL_DMAT4 = 107,                    /* DMAT4  */
-  YYSYMBOL_BF16VEC2 = 108,                 /* BF16VEC2  */
-  YYSYMBOL_BF16VEC3 = 109,                 /* BF16VEC3  */
-  YYSYMBOL_BF16VEC4 = 110,                 /* BF16VEC4  */
-  YYSYMBOL_FE5M2VEC2 = 111,                /* FE5M2VEC2  */
-  YYSYMBOL_FE5M2VEC3 = 112,                /* FE5M2VEC3  */
-  YYSYMBOL_FE5M2VEC4 = 113,                /* FE5M2VEC4  */
-  YYSYMBOL_FE4M3VEC2 = 114,                /* FE4M3VEC2  */
-  YYSYMBOL_FE4M3VEC3 = 115,                /* FE4M3VEC3  */
-  YYSYMBOL_FE4M3VEC4 = 116,                /* FE4M3VEC4  */
-  YYSYMBOL_F16VEC2 = 117,                  /* F16VEC2  */
-  YYSYMBOL_F16VEC3 = 118,                  /* F16VEC3  */
-  YYSYMBOL_F16VEC4 = 119,                  /* F16VEC4  */
-  YYSYMBOL_F16MAT2 = 120,                  /* F16MAT2  */
-  YYSYMBOL_F16MAT3 = 121,                  /* F16MAT3  */
-  YYSYMBOL_F16MAT4 = 122,                  /* F16MAT4  */
-  YYSYMBOL_F32VEC2 = 123,                  /* F32VEC2  */
-  YYSYMBOL_F32VEC3 = 124,                  /* F32VEC3  */
-  YYSYMBOL_F32VEC4 = 125,                  /* F32VEC4  */
-  YYSYMBOL_F32MAT2 = 126,                  /* F32MAT2  */
-  YYSYMBOL_F32MAT3 = 127,                  /* F32MAT3  */
-  YYSYMBOL_F32MAT4 = 128,                  /* F32MAT4  */
-  YYSYMBOL_F64VEC2 = 129,                  /* F64VEC2  */
-  YYSYMBOL_F64VEC3 = 130,                  /* F64VEC3  */
-  YYSYMBOL_F64VEC4 = 131,                  /* F64VEC4  */
-  YYSYMBOL_F64MAT2 = 132,                  /* F64MAT2  */
-  YYSYMBOL_F64MAT3 = 133,                  /* F64MAT3  */
-  YYSYMBOL_F64MAT4 = 134,                  /* F64MAT4  */
-  YYSYMBOL_DMAT2X2 = 135,                  /* DMAT2X2  */
-  YYSYMBOL_DMAT2X3 = 136,                  /* DMAT2X3  */
-  YYSYMBOL_DMAT2X4 = 137,                  /* DMAT2X4  */
-  YYSYMBOL_DMAT3X2 = 138,                  /* DMAT3X2  */
-  YYSYMBOL_DMAT3X3 = 139,                  /* DMAT3X3  */
-  YYSYMBOL_DMAT3X4 = 140,                  /* DMAT3X4  */
-  YYSYMBOL_DMAT4X2 = 141,                  /* DMAT4X2  */
-  YYSYMBOL_DMAT4X3 = 142,                  /* DMAT4X3  */
-  YYSYMBOL_DMAT4X4 = 143,                  /* DMAT4X4  */
-  YYSYMBOL_F16MAT2X2 = 144,                /* F16MAT2X2  */
-  YYSYMBOL_F16MAT2X3 = 145,                /* F16MAT2X3  */
-  YYSYMBOL_F16MAT2X4 = 146,                /* F16MAT2X4  */
-  YYSYMBOL_F16MAT3X2 = 147,                /* F16MAT3X2  */
-  YYSYMBOL_F16MAT3X3 = 148,                /* F16MAT3X3  */
-  YYSYMBOL_F16MAT3X4 = 149,                /* F16MAT3X4  */
-  YYSYMBOL_F16MAT4X2 = 150,                /* F16MAT4X2  */
-  YYSYMBOL_F16MAT4X3 = 151,                /* F16MAT4X3  */
-  YYSYMBOL_F16MAT4X4 = 152,                /* F16MAT4X4  */
-  YYSYMBOL_F32MAT2X2 = 153,                /* F32MAT2X2  */
-  YYSYMBOL_F32MAT2X3 = 154,                /* F32MAT2X3  */
-  YYSYMBOL_F32MAT2X4 = 155,                /* F32MAT2X4  */
-  YYSYMBOL_F32MAT3X2 = 156,                /* F32MAT3X2  */
-  YYSYMBOL_F32MAT3X3 = 157,                /* F32MAT3X3  */
-  YYSYMBOL_F32MAT3X4 = 158,                /* F32MAT3X4  */
-  YYSYMBOL_F32MAT4X2 = 159,                /* F32MAT4X2  */
-  YYSYMBOL_F32MAT4X3 = 160,                /* F32MAT4X3  */
-  YYSYMBOL_F32MAT4X4 = 161,                /* F32MAT4X4  */
-  YYSYMBOL_F64MAT2X2 = 162,                /* F64MAT2X2  */
-  YYSYMBOL_F64MAT2X3 = 163,                /* F64MAT2X3  */
-  YYSYMBOL_F64MAT2X4 = 164,                /* F64MAT2X4  */
-  YYSYMBOL_F64MAT3X2 = 165,                /* F64MAT3X2  */
-  YYSYMBOL_F64MAT3X3 = 166,                /* F64MAT3X3  */
-  YYSYMBOL_F64MAT3X4 = 167,                /* F64MAT3X4  */
-  YYSYMBOL_F64MAT4X2 = 168,                /* F64MAT4X2  */
-  YYSYMBOL_F64MAT4X3 = 169,                /* F64MAT4X3  */
-  YYSYMBOL_F64MAT4X4 = 170,                /* F64MAT4X4  */
-  YYSYMBOL_ATOMIC_UINT = 171,              /* ATOMIC_UINT  */
-  YYSYMBOL_ACCSTRUCTNV = 172,              /* ACCSTRUCTNV  */
-  YYSYMBOL_ACCSTRUCTEXT = 173,             /* ACCSTRUCTEXT  */
-  YYSYMBOL_RAYQUERYEXT = 174,              /* RAYQUERYEXT  */
-  YYSYMBOL_FCOOPMATNV = 175,               /* FCOOPMATNV  */
-  YYSYMBOL_ICOOPMATNV = 176,               /* ICOOPMATNV  */
-  YYSYMBOL_UCOOPMATNV = 177,               /* UCOOPMATNV  */
-  YYSYMBOL_COOPMAT = 178,                  /* COOPMAT  */
-  YYSYMBOL_COOPVECNV = 179,                /* COOPVECNV  */
-  YYSYMBOL_HITOBJECTNV = 180,              /* HITOBJECTNV  */
-  YYSYMBOL_HITOBJECTATTRNV = 181,          /* HITOBJECTATTRNV  */
-  YYSYMBOL_HITOBJECTEXT = 182,             /* HITOBJECTEXT  */
-  YYSYMBOL_HITOBJECTATTREXT = 183,         /* HITOBJECTATTREXT  */
-  YYSYMBOL_TENSORLAYOUTNV = 184,           /* TENSORLAYOUTNV  */
-  YYSYMBOL_TENSORVIEWNV = 185,             /* TENSORVIEWNV  */
-  YYSYMBOL_TENSORARM = 186,                /* TENSORARM  */
-  YYSYMBOL_SAMPLERCUBEARRAY = 187,         /* SAMPLERCUBEARRAY  */
-  YYSYMBOL_SAMPLERCUBEARRAYSHADOW = 188,   /* SAMPLERCUBEARRAYSHADOW  */
-  YYSYMBOL_ISAMPLERCUBEARRAY = 189,        /* ISAMPLERCUBEARRAY  */
-  YYSYMBOL_USAMPLERCUBEARRAY = 190,        /* USAMPLERCUBEARRAY  */
-  YYSYMBOL_SAMPLER1D = 191,                /* SAMPLER1D  */
-  YYSYMBOL_SAMPLER1DARRAY = 192,           /* SAMPLER1DARRAY  */
-  YYSYMBOL_SAMPLER1DARRAYSHADOW = 193,     /* SAMPLER1DARRAYSHADOW  */
-  YYSYMBOL_ISAMPLER1D = 194,               /* ISAMPLER1D  */
-  YYSYMBOL_SAMPLER1DSHADOW = 195,          /* SAMPLER1DSHADOW  */
-  YYSYMBOL_SAMPLER2DRECT = 196,            /* SAMPLER2DRECT  */
-  YYSYMBOL_SAMPLER2DRECTSHADOW = 197,      /* SAMPLER2DRECTSHADOW  */
-  YYSYMBOL_ISAMPLER2DRECT = 198,           /* ISAMPLER2DRECT  */
-  YYSYMBOL_USAMPLER2DRECT = 199,           /* USAMPLER2DRECT  */
-  YYSYMBOL_SAMPLERBUFFER = 200,            /* SAMPLERBUFFER  */
-  YYSYMBOL_ISAMPLERBUFFER = 201,           /* ISAMPLERBUFFER  */
-  YYSYMBOL_USAMPLERBUFFER = 202,           /* USAMPLERBUFFER  */
-  YYSYMBOL_SAMPLER2DMS = 203,              /* SAMPLER2DMS  */
-  YYSYMBOL_ISAMPLER2DMS = 204,             /* ISAMPLER2DMS  */
-  YYSYMBOL_USAMPLER2DMS = 205,             /* USAMPLER2DMS  */
-  YYSYMBOL_SAMPLER2DMSARRAY = 206,         /* SAMPLER2DMSARRAY  */
-  YYSYMBOL_ISAMPLER2DMSARRAY = 207,        /* ISAMPLER2DMSARRAY  */
-  YYSYMBOL_USAMPLER2DMSARRAY = 208,        /* USAMPLER2DMSARRAY  */
-  YYSYMBOL_SAMPLEREXTERNALOES = 209,       /* SAMPLEREXTERNALOES  */
-  YYSYMBOL_SAMPLEREXTERNAL2DY2YEXT = 210,  /* SAMPLEREXTERNAL2DY2YEXT  */
-  YYSYMBOL_ISAMPLER1DARRAY = 211,          /* ISAMPLER1DARRAY  */
-  YYSYMBOL_USAMPLER1D = 212,               /* USAMPLER1D  */
-  YYSYMBOL_USAMPLER1DARRAY = 213,          /* USAMPLER1DARRAY  */
-  YYSYMBOL_F16SAMPLER1D = 214,             /* F16SAMPLER1D  */
-  YYSYMBOL_F16SAMPLER2D = 215,             /* F16SAMPLER2D  */
-  YYSYMBOL_F16SAMPLER3D = 216,             /* F16SAMPLER3D  */
-  YYSYMBOL_F16SAMPLER2DRECT = 217,         /* F16SAMPLER2DRECT  */
-  YYSYMBOL_F16SAMPLERCUBE = 218,           /* F16SAMPLERCUBE  */
-  YYSYMBOL_F16SAMPLER1DARRAY = 219,        /* F16SAMPLER1DARRAY  */
-  YYSYMBOL_F16SAMPLER2DARRAY = 220,        /* F16SAMPLER2DARRAY  */
-  YYSYMBOL_F16SAMPLERCUBEARRAY = 221,      /* F16SAMPLERCUBEARRAY  */
-  YYSYMBOL_F16SAMPLERBUFFER = 222,         /* F16SAMPLERBUFFER  */
-  YYSYMBOL_F16SAMPLER2DMS = 223,           /* F16SAMPLER2DMS  */
-  YYSYMBOL_F16SAMPLER2DMSARRAY = 224,      /* F16SAMPLER2DMSARRAY  */
-  YYSYMBOL_F16SAMPLER1DSHADOW = 225,       /* F16SAMPLER1DSHADOW  */
-  YYSYMBOL_F16SAMPLER2DSHADOW = 226,       /* F16SAMPLER2DSHADOW  */
-  YYSYMBOL_F16SAMPLER1DARRAYSHADOW = 227,  /* F16SAMPLER1DARRAYSHADOW  */
-  YYSYMBOL_F16SAMPLER2DARRAYSHADOW = 228,  /* F16SAMPLER2DARRAYSHADOW  */
-  YYSYMBOL_F16SAMPLER2DRECTSHADOW = 229,   /* F16SAMPLER2DRECTSHADOW  */
-  YYSYMBOL_F16SAMPLERCUBESHADOW = 230,     /* F16SAMPLERCUBESHADOW  */
-  YYSYMBOL_F16SAMPLERCUBEARRAYSHADOW = 231, /* F16SAMPLERCUBEARRAYSHADOW  */
-  YYSYMBOL_IMAGE1D = 232,                  /* IMAGE1D  */
-  YYSYMBOL_IIMAGE1D = 233,                 /* IIMAGE1D  */
-  YYSYMBOL_UIMAGE1D = 234,                 /* UIMAGE1D  */
-  YYSYMBOL_IMAGE2D = 235,                  /* IMAGE2D  */
-  YYSYMBOL_IIMAGE2D = 236,                 /* IIMAGE2D  */
-  YYSYMBOL_UIMAGE2D = 237,                 /* UIMAGE2D  */
-  YYSYMBOL_IMAGE3D = 238,                  /* IMAGE3D  */
-  YYSYMBOL_IIMAGE3D = 239,                 /* IIMAGE3D  */
-  YYSYMBOL_UIMAGE3D = 240,                 /* UIMAGE3D  */
-  YYSYMBOL_IMAGE2DRECT = 241,              /* IMAGE2DRECT  */
-  YYSYMBOL_IIMAGE2DRECT = 242,             /* IIMAGE2DRECT  */
-  YYSYMBOL_UIMAGE2DRECT = 243,             /* UIMAGE2DRECT  */
-  YYSYMBOL_IMAGECUBE = 244,                /* IMAGECUBE  */
-  YYSYMBOL_IIMAGECUBE = 245,               /* IIMAGECUBE  */
-  YYSYMBOL_UIMAGECUBE = 246,               /* UIMAGECUBE  */
-  YYSYMBOL_IMAGEBUFFER = 247,              /* IMAGEBUFFER  */
-  YYSYMBOL_IIMAGEBUFFER = 248,             /* IIMAGEBUFFER  */
-  YYSYMBOL_UIMAGEBUFFER = 249,             /* UIMAGEBUFFER  */
-  YYSYMBOL_IMAGE1DARRAY = 250,             /* IMAGE1DARRAY  */
-  YYSYMBOL_IIMAGE1DARRAY = 251,            /* IIMAGE1DARRAY  */
-  YYSYMBOL_UIMAGE1DARRAY = 252,            /* UIMAGE1DARRAY  */
-  YYSYMBOL_IMAGE2DARRAY = 253,             /* IMAGE2DARRAY  */
-  YYSYMBOL_IIMAGE2DARRAY = 254,            /* IIMAGE2DARRAY  */
-  YYSYMBOL_UIMAGE2DARRAY = 255,            /* UIMAGE2DARRAY  */
-  YYSYMBOL_IMAGECUBEARRAY = 256,           /* IMAGECUBEARRAY  */
-  YYSYMBOL_IIMAGECUBEARRAY = 257,          /* IIMAGECUBEARRAY  */
-  YYSYMBOL_UIMAGECUBEARRAY = 258,          /* UIMAGECUBEARRAY  */
-  YYSYMBOL_IMAGE2DMS = 259,                /* IMAGE2DMS  */
-  YYSYMBOL_IIMAGE2DMS = 260,               /* IIMAGE2DMS  */
-  YYSYMBOL_UIMAGE2DMS = 261,               /* UIMAGE2DMS  */
-  YYSYMBOL_IMAGE2DMSARRAY = 262,           /* IMAGE2DMSARRAY  */
-  YYSYMBOL_IIMAGE2DMSARRAY = 263,          /* IIMAGE2DMSARRAY  */
-  YYSYMBOL_UIMAGE2DMSARRAY = 264,          /* UIMAGE2DMSARRAY  */
-  YYSYMBOL_F16IMAGE1D = 265,               /* F16IMAGE1D  */
-  YYSYMBOL_F16IMAGE2D = 266,               /* F16IMAGE2D  */
-  YYSYMBOL_F16IMAGE3D = 267,               /* F16IMAGE3D  */
-  YYSYMBOL_F16IMAGE2DRECT = 268,           /* F16IMAGE2DRECT  */
-  YYSYMBOL_F16IMAGECUBE = 269,             /* F16IMAGECUBE  */
-  YYSYMBOL_F16IMAGE1DARRAY = 270,          /* F16IMAGE1DARRAY  */
-  YYSYMBOL_F16IMAGE2DARRAY = 271,          /* F16IMAGE2DARRAY  */
-  YYSYMBOL_F16IMAGECUBEARRAY = 272,        /* F16IMAGECUBEARRAY  */
-  YYSYMBOL_F16IMAGEBUFFER = 273,           /* F16IMAGEBUFFER  */
-  YYSYMBOL_F16IMAGE2DMS = 274,             /* F16IMAGE2DMS  */
-  YYSYMBOL_F16IMAGE2DMSARRAY = 275,        /* F16IMAGE2DMSARRAY  */
-  YYSYMBOL_I64IMAGE1D = 276,               /* I64IMAGE1D  */
-  YYSYMBOL_U64IMAGE1D = 277,               /* U64IMAGE1D  */
-  YYSYMBOL_I64IMAGE2D = 278,               /* I64IMAGE2D  */
-  YYSYMBOL_U64IMAGE2D = 279,               /* U64IMAGE2D  */
-  YYSYMBOL_I64IMAGE3D = 280,               /* I64IMAGE3D  */
-  YYSYMBOL_U64IMAGE3D = 281,               /* U64IMAGE3D  */
-  YYSYMBOL_I64IMAGE2DRECT = 282,           /* I64IMAGE2DRECT  */
-  YYSYMBOL_U64IMAGE2DRECT = 283,           /* U64IMAGE2DRECT  */
-  YYSYMBOL_I64IMAGECUBE = 284,             /* I64IMAGECUBE  */
-  YYSYMBOL_U64IMAGECUBE = 285,             /* U64IMAGECUBE  */
-  YYSYMBOL_I64IMAGEBUFFER = 286,           /* I64IMAGEBUFFER  */
-  YYSYMBOL_U64IMAGEBUFFER = 287,           /* U64IMAGEBUFFER  */
-  YYSYMBOL_I64IMAGE1DARRAY = 288,          /* I64IMAGE1DARRAY  */
-  YYSYMBOL_U64IMAGE1DARRAY = 289,          /* U64IMAGE1DARRAY  */
-  YYSYMBOL_I64IMAGE2DARRAY = 290,          /* I64IMAGE2DARRAY  */
-  YYSYMBOL_U64IMAGE2DARRAY = 291,          /* U64IMAGE2DARRAY  */
-  YYSYMBOL_I64IMAGECUBEARRAY = 292,        /* I64IMAGECUBEARRAY  */
-  YYSYMBOL_U64IMAGECUBEARRAY = 293,        /* U64IMAGECUBEARRAY  */
-  YYSYMBOL_I64IMAGE2DMS = 294,             /* I64IMAGE2DMS  */
-  YYSYMBOL_U64IMAGE2DMS = 295,             /* U64IMAGE2DMS  */
-  YYSYMBOL_I64IMAGE2DMSARRAY = 296,        /* I64IMAGE2DMSARRAY  */
-  YYSYMBOL_U64IMAGE2DMSARRAY = 297,        /* U64IMAGE2DMSARRAY  */
-  YYSYMBOL_TEXTURECUBEARRAY = 298,         /* TEXTURECUBEARRAY  */
-  YYSYMBOL_ITEXTURECUBEARRAY = 299,        /* ITEXTURECUBEARRAY  */
-  YYSYMBOL_UTEXTURECUBEARRAY = 300,        /* UTEXTURECUBEARRAY  */
-  YYSYMBOL_TEXTURE1D = 301,                /* TEXTURE1D  */
-  YYSYMBOL_ITEXTURE1D = 302,               /* ITEXTURE1D  */
-  YYSYMBOL_UTEXTURE1D = 303,               /* UTEXTURE1D  */
-  YYSYMBOL_TEXTURE1DARRAY = 304,           /* TEXTURE1DARRAY  */
-  YYSYMBOL_ITEXTURE1DARRAY = 305,          /* ITEXTURE1DARRAY  */
-  YYSYMBOL_UTEXTURE1DARRAY = 306,          /* UTEXTURE1DARRAY  */
-  YYSYMBOL_TEXTURE2DRECT = 307,            /* TEXTURE2DRECT  */
-  YYSYMBOL_ITEXTURE2DRECT = 308,           /* ITEXTURE2DRECT  */
-  YYSYMBOL_UTEXTURE2DRECT = 309,           /* UTEXTURE2DRECT  */
-  YYSYMBOL_TEXTUREBUFFER = 310,            /* TEXTUREBUFFER  */
-  YYSYMBOL_ITEXTUREBUFFER = 311,           /* ITEXTUREBUFFER  */
-  YYSYMBOL_UTEXTUREBUFFER = 312,           /* UTEXTUREBUFFER  */
-  YYSYMBOL_TEXTURE2DMS = 313,              /* TEXTURE2DMS  */
-  YYSYMBOL_ITEXTURE2DMS = 314,             /* ITEXTURE2DMS  */
-  YYSYMBOL_UTEXTURE2DMS = 315,             /* UTEXTURE2DMS  */
-  YYSYMBOL_TEXTURE2DMSARRAY = 316,         /* TEXTURE2DMSARRAY  */
-  YYSYMBOL_ITEXTURE2DMSARRAY = 317,        /* ITEXTURE2DMSARRAY  */
-  YYSYMBOL_UTEXTURE2DMSARRAY = 318,        /* UTEXTURE2DMSARRAY  */
-  YYSYMBOL_F16TEXTURE1D = 319,             /* F16TEXTURE1D  */
-  YYSYMBOL_F16TEXTURE2D = 320,             /* F16TEXTURE2D  */
-  YYSYMBOL_F16TEXTURE3D = 321,             /* F16TEXTURE3D  */
-  YYSYMBOL_F16TEXTURE2DRECT = 322,         /* F16TEXTURE2DRECT  */
-  YYSYMBOL_F16TEXTURECUBE = 323,           /* F16TEXTURECUBE  */
-  YYSYMBOL_F16TEXTURE1DARRAY = 324,        /* F16TEXTURE1DARRAY  */
-  YYSYMBOL_F16TEXTURE2DARRAY = 325,        /* F16TEXTURE2DARRAY  */
-  YYSYMBOL_F16TEXTURECUBEARRAY = 326,      /* F16TEXTURECUBEARRAY  */
-  YYSYMBOL_F16TEXTUREBUFFER = 327,         /* F16TEXTUREBUFFER  */
-  YYSYMBOL_F16TEXTURE2DMS = 328,           /* F16TEXTURE2DMS  */
-  YYSYMBOL_F16TEXTURE2DMSARRAY = 329,      /* F16TEXTURE2DMSARRAY  */
-  YYSYMBOL_SUBPASSINPUT = 330,             /* SUBPASSINPUT  */
-  YYSYMBOL_SUBPASSINPUTMS = 331,           /* SUBPASSINPUTMS  */
-  YYSYMBOL_ISUBPASSINPUT = 332,            /* ISUBPASSINPUT  */
-  YYSYMBOL_ISUBPASSINPUTMS = 333,          /* ISUBPASSINPUTMS  */
-  YYSYMBOL_USUBPASSINPUT = 334,            /* USUBPASSINPUT  */
-  YYSYMBOL_USUBPASSINPUTMS = 335,          /* USUBPASSINPUTMS  */
-  YYSYMBOL_F16SUBPASSINPUT = 336,          /* F16SUBPASSINPUT  */
-  YYSYMBOL_F16SUBPASSINPUTMS = 337,        /* F16SUBPASSINPUTMS  */
-  YYSYMBOL_SPIRV_INSTRUCTION = 338,        /* SPIRV_INSTRUCTION  */
-  YYSYMBOL_SPIRV_EXECUTION_MODE = 339,     /* SPIRV_EXECUTION_MODE  */
-  YYSYMBOL_SPIRV_EXECUTION_MODE_ID = 340,  /* SPIRV_EXECUTION_MODE_ID  */
-  YYSYMBOL_SPIRV_DECORATE = 341,           /* SPIRV_DECORATE  */
-  YYSYMBOL_SPIRV_DECORATE_ID = 342,        /* SPIRV_DECORATE_ID  */
-  YYSYMBOL_SPIRV_DECORATE_STRING = 343,    /* SPIRV_DECORATE_STRING  */
-  YYSYMBOL_SPIRV_TYPE = 344,               /* SPIRV_TYPE  */
-  YYSYMBOL_SPIRV_STORAGE_CLASS = 345,      /* SPIRV_STORAGE_CLASS  */
-  YYSYMBOL_SPIRV_BY_REFERENCE = 346,       /* SPIRV_BY_REFERENCE  */
-  YYSYMBOL_SPIRV_LITERAL = 347,            /* SPIRV_LITERAL  */
-  YYSYMBOL_ATTACHMENTEXT = 348,            /* ATTACHMENTEXT  */
-  YYSYMBOL_IATTACHMENTEXT = 349,           /* IATTACHMENTEXT  */
-  YYSYMBOL_UATTACHMENTEXT = 350,           /* UATTACHMENTEXT  */
-  YYSYMBOL_LEFT_OP = 351,                  /* LEFT_OP  */
-  YYSYMBOL_RIGHT_OP = 352,                 /* RIGHT_OP  */
-  YYSYMBOL_INC_OP = 353,                   /* INC_OP  */
-  YYSYMBOL_DEC_OP = 354,                   /* DEC_OP  */
-  YYSYMBOL_LE_OP = 355,                    /* LE_OP  */
-  YYSYMBOL_GE_OP = 356,                    /* GE_OP  */
-  YYSYMBOL_EQ_OP = 357,                    /* EQ_OP  */
-  YYSYMBOL_NE_OP = 358,                    /* NE_OP  */
-  YYSYMBOL_AND_OP = 359,                   /* AND_OP  */
-  YYSYMBOL_OR_OP = 360,                    /* OR_OP  */
-  YYSYMBOL_XOR_OP = 361,                   /* XOR_OP  */
-  YYSYMBOL_MUL_ASSIGN = 362,               /* MUL_ASSIGN  */
-  YYSYMBOL_DIV_ASSIGN = 363,               /* DIV_ASSIGN  */
-  YYSYMBOL_ADD_ASSIGN = 364,               /* ADD_ASSIGN  */
-  YYSYMBOL_MOD_ASSIGN = 365,               /* MOD_ASSIGN  */
-  YYSYMBOL_LEFT_ASSIGN = 366,              /* LEFT_ASSIGN  */
-  YYSYMBOL_RIGHT_ASSIGN = 367,             /* RIGHT_ASSIGN  */
-  YYSYMBOL_AND_ASSIGN = 368,               /* AND_ASSIGN  */
-  YYSYMBOL_XOR_ASSIGN = 369,               /* XOR_ASSIGN  */
-  YYSYMBOL_OR_ASSIGN = 370,                /* OR_ASSIGN  */
-  YYSYMBOL_SUB_ASSIGN = 371,               /* SUB_ASSIGN  */
-  YYSYMBOL_STRING_LITERAL = 372,           /* STRING_LITERAL  */
-  YYSYMBOL_LEFT_PAREN = 373,               /* LEFT_PAREN  */
-  YYSYMBOL_RIGHT_PAREN = 374,              /* RIGHT_PAREN  */
-  YYSYMBOL_LEFT_BRACKET = 375,             /* LEFT_BRACKET  */
-  YYSYMBOL_RIGHT_BRACKET = 376,            /* RIGHT_BRACKET  */
-  YYSYMBOL_LEFT_BRACE = 377,               /* LEFT_BRACE  */
-  YYSYMBOL_RIGHT_BRACE = 378,              /* RIGHT_BRACE  */
-  YYSYMBOL_DOT = 379,                      /* DOT  */
-  YYSYMBOL_COMMA = 380,                    /* COMMA  */
-  YYSYMBOL_COLON = 381,                    /* COLON  */
-  YYSYMBOL_EQUAL = 382,                    /* EQUAL  */
-  YYSYMBOL_SEMICOLON = 383,                /* SEMICOLON  */
-  YYSYMBOL_BANG = 384,                     /* BANG  */
-  YYSYMBOL_DASH = 385,                     /* DASH  */
-  YYSYMBOL_TILDE = 386,                    /* TILDE  */
-  YYSYMBOL_PLUS = 387,                     /* PLUS  */
-  YYSYMBOL_STAR = 388,                     /* STAR  */
-  YYSYMBOL_SLASH = 389,                    /* SLASH  */
-  YYSYMBOL_PERCENT = 390,                  /* PERCENT  */
-  YYSYMBOL_LEFT_ANGLE = 391,               /* LEFT_ANGLE  */
-  YYSYMBOL_RIGHT_ANGLE = 392,              /* RIGHT_ANGLE  */
-  YYSYMBOL_VERTICAL_BAR = 393,             /* VERTICAL_BAR  */
-  YYSYMBOL_CARET = 394,                    /* CARET  */
-  YYSYMBOL_AMPERSAND = 395,                /* AMPERSAND  */
-  YYSYMBOL_QUESTION = 396,                 /* QUESTION  */
-  YYSYMBOL_INVARIANT = 397,                /* INVARIANT  */
-  YYSYMBOL_HIGH_PRECISION = 398,           /* HIGH_PRECISION  */
-  YYSYMBOL_MEDIUM_PRECISION = 399,         /* MEDIUM_PRECISION  */
-  YYSYMBOL_LOW_PRECISION = 400,            /* LOW_PRECISION  */
-  YYSYMBOL_PRECISION = 401,                /* PRECISION  */
-  YYSYMBOL_PACKED = 402,                   /* PACKED  */
-  YYSYMBOL_RESOURCE = 403,                 /* RESOURCE  */
-  YYSYMBOL_SUPERP = 404,                   /* SUPERP  */
-  YYSYMBOL_FLOATCONSTANT = 405,            /* FLOATCONSTANT  */
-  YYSYMBOL_INTCONSTANT = 406,              /* INTCONSTANT  */
-  YYSYMBOL_UINTCONSTANT = 407,             /* UINTCONSTANT  */
-  YYSYMBOL_BOOLCONSTANT = 408,             /* BOOLCONSTANT  */
-  YYSYMBOL_IDENTIFIER = 409,               /* IDENTIFIER  */
-  YYSYMBOL_TYPE_NAME = 410,                /* TYPE_NAME  */
-  YYSYMBOL_CENTROID = 411,                 /* CENTROID  */
-  YYSYMBOL_IN = 412,                       /* IN  */
-  YYSYMBOL_OUT = 413,                      /* OUT  */
-  YYSYMBOL_INOUT = 414,                    /* INOUT  */
-  YYSYMBOL_STRUCT = 415,                   /* STRUCT  */
-  YYSYMBOL_VOID = 416,                     /* VOID  */
-  YYSYMBOL_WHILE = 417,                    /* WHILE  */
-  YYSYMBOL_BREAK = 418,                    /* BREAK  */
-  YYSYMBOL_CONTINUE = 419,                 /* CONTINUE  */
-  YYSYMBOL_DO = 420,                       /* DO  */
-  YYSYMBOL_ELSE = 421,                     /* ELSE  */
-  YYSYMBOL_FOR = 422,                      /* FOR  */
-  YYSYMBOL_IF = 423,                       /* IF  */
-  YYSYMBOL_DISCARD = 424,                  /* DISCARD  */
-  YYSYMBOL_RETURN = 425,                   /* RETURN  */
-  YYSYMBOL_SWITCH = 426,                   /* SWITCH  */
-  YYSYMBOL_CASE = 427,                     /* CASE  */
-  YYSYMBOL_DEFAULT = 428,                  /* DEFAULT  */
-  YYSYMBOL_TERMINATE_INVOCATION = 429,     /* TERMINATE_INVOCATION  */
-  YYSYMBOL_TERMINATE_RAY = 430,            /* TERMINATE_RAY  */
-  YYSYMBOL_IGNORE_INTERSECTION = 431,      /* IGNORE_INTERSECTION  */
-  YYSYMBOL_UNIFORM = 432,                  /* UNIFORM  */
-  YYSYMBOL_SHARED = 433,                   /* SHARED  */
-  YYSYMBOL_BUFFER = 434,                   /* BUFFER  */
-  YYSYMBOL_TILEIMAGEEXT = 435,             /* TILEIMAGEEXT  */
-  YYSYMBOL_FLAT = 436,                     /* FLAT  */
-  YYSYMBOL_SMOOTH = 437,                   /* SMOOTH  */
-  YYSYMBOL_LAYOUT = 438,                   /* LAYOUT  */
-  YYSYMBOL_DOUBLECONSTANT = 439,           /* DOUBLECONSTANT  */
-  YYSYMBOL_INT16CONSTANT = 440,            /* INT16CONSTANT  */
-  YYSYMBOL_UINT16CONSTANT = 441,           /* UINT16CONSTANT  */
-  YYSYMBOL_FLOAT16CONSTANT = 442,          /* FLOAT16CONSTANT  */
-  YYSYMBOL_INT32CONSTANT = 443,            /* INT32CONSTANT  */
-  YYSYMBOL_UINT32CONSTANT = 444,           /* UINT32CONSTANT  */
-  YYSYMBOL_INT64CONSTANT = 445,            /* INT64CONSTANT  */
-  YYSYMBOL_UINT64CONSTANT = 446,           /* UINT64CONSTANT  */
-  YYSYMBOL_SUBROUTINE = 447,               /* SUBROUTINE  */
-  YYSYMBOL_DEMOTE = 448,                   /* DEMOTE  */
-  YYSYMBOL_FUNCTION = 449,                 /* FUNCTION  */
-  YYSYMBOL_PAYLOADNV = 450,                /* PAYLOADNV  */
-  YYSYMBOL_PAYLOADINNV = 451,              /* PAYLOADINNV  */
-  YYSYMBOL_HITATTRNV = 452,                /* HITATTRNV  */
-  YYSYMBOL_CALLDATANV = 453,               /* CALLDATANV  */
-  YYSYMBOL_CALLDATAINNV = 454,             /* CALLDATAINNV  */
-  YYSYMBOL_PAYLOADEXT = 455,               /* PAYLOADEXT  */
-  YYSYMBOL_PAYLOADINEXT = 456,             /* PAYLOADINEXT  */
-  YYSYMBOL_HITATTREXT = 457,               /* HITATTREXT  */
-  YYSYMBOL_CALLDATAEXT = 458,              /* CALLDATAEXT  */
-  YYSYMBOL_CALLDATAINEXT = 459,            /* CALLDATAINEXT  */
-  YYSYMBOL_PATCH = 460,                    /* PATCH  */
-  YYSYMBOL_SAMPLE = 461,                   /* SAMPLE  */
-  YYSYMBOL_NONUNIFORM = 462,               /* NONUNIFORM  */
-  YYSYMBOL_COHERENT = 463,                 /* COHERENT  */
-  YYSYMBOL_VOLATILE = 464,                 /* VOLATILE  */
-  YYSYMBOL_RESTRICT = 465,                 /* RESTRICT  */
-  YYSYMBOL_READONLY = 466,                 /* READONLY  */
-  YYSYMBOL_WRITEONLY = 467,                /* WRITEONLY  */
-  YYSYMBOL_NONTEMPORAL = 468,              /* NONTEMPORAL  */
-  YYSYMBOL_DEVICECOHERENT = 469,           /* DEVICECOHERENT  */
-  YYSYMBOL_QUEUEFAMILYCOHERENT = 470,      /* QUEUEFAMILYCOHERENT  */
-  YYSYMBOL_WORKGROUPCOHERENT = 471,        /* WORKGROUPCOHERENT  */
-  YYSYMBOL_SUBGROUPCOHERENT = 472,         /* SUBGROUPCOHERENT  */
-  YYSYMBOL_NONPRIVATE = 473,               /* NONPRIVATE  */
-  YYSYMBOL_SHADERCALLCOHERENT = 474,       /* SHADERCALLCOHERENT  */
-  YYSYMBOL_NOPERSPECTIVE = 475,            /* NOPERSPECTIVE  */
-  YYSYMBOL_EXPLICITINTERPAMD = 476,        /* EXPLICITINTERPAMD  */
-  YYSYMBOL_PERVERTEXEXT = 477,             /* PERVERTEXEXT  */
-  YYSYMBOL_PERVERTEXNV = 478,              /* PERVERTEXNV  */
-  YYSYMBOL_PERPRIMITIVENV = 479,           /* PERPRIMITIVENV  */
-  YYSYMBOL_PERVIEWNV = 480,                /* PERVIEWNV  */
-  YYSYMBOL_PERTASKNV = 481,                /* PERTASKNV  */
-  YYSYMBOL_PERPRIMITIVEEXT = 482,          /* PERPRIMITIVEEXT  */
-  YYSYMBOL_TASKPAYLOADWORKGROUPEXT = 483,  /* TASKPAYLOADWORKGROUPEXT  */
-  YYSYMBOL_PRECISE = 484,                  /* PRECISE  */
-  YYSYMBOL_YYACCEPT = 485,                 /* $accept  */
-  YYSYMBOL_variable_identifier = 486,      /* variable_identifier  */
-  YYSYMBOL_primary_expression = 487,       /* primary_expression  */
-  YYSYMBOL_postfix_expression = 488,       /* postfix_expression  */
-  YYSYMBOL_integer_expression = 489,       /* integer_expression  */
-  YYSYMBOL_function_call = 490,            /* function_call  */
-  YYSYMBOL_function_call_or_method = 491,  /* function_call_or_method  */
-  YYSYMBOL_function_call_generic = 492,    /* function_call_generic  */
-  YYSYMBOL_function_call_header_no_parameters = 493, /* function_call_header_no_parameters  */
-  YYSYMBOL_function_call_header_with_parameters = 494, /* function_call_header_with_parameters  */
-  YYSYMBOL_function_call_header = 495,     /* function_call_header  */
-  YYSYMBOL_function_identifier = 496,      /* function_identifier  */
-  YYSYMBOL_unary_expression = 497,         /* unary_expression  */
-  YYSYMBOL_unary_operator = 498,           /* unary_operator  */
-  YYSYMBOL_multiplicative_expression = 499, /* multiplicative_expression  */
-  YYSYMBOL_additive_expression = 500,      /* additive_expression  */
-  YYSYMBOL_shift_expression = 501,         /* shift_expression  */
-  YYSYMBOL_relational_expression = 502,    /* relational_expression  */
-  YYSYMBOL_equality_expression = 503,      /* equality_expression  */
-  YYSYMBOL_and_expression = 504,           /* and_expression  */
-  YYSYMBOL_exclusive_or_expression = 505,  /* exclusive_or_expression  */
-  YYSYMBOL_inclusive_or_expression = 506,  /* inclusive_or_expression  */
-  YYSYMBOL_logical_and_expression = 507,   /* logical_and_expression  */
-  YYSYMBOL_logical_xor_expression = 508,   /* logical_xor_expression  */
-  YYSYMBOL_logical_or_expression = 509,    /* logical_or_expression  */
-  YYSYMBOL_conditional_expression = 510,   /* conditional_expression  */
-  YYSYMBOL_511_1 = 511,                    /* $@1  */
-  YYSYMBOL_assignment_expression = 512,    /* assignment_expression  */
-  YYSYMBOL_assignment_operator = 513,      /* assignment_operator  */
-  YYSYMBOL_expression = 514,               /* expression  */
-  YYSYMBOL_constant_expression = 515,      /* constant_expression  */
-  YYSYMBOL_declaration = 516,              /* declaration  */
-  YYSYMBOL_block_structure = 517,          /* block_structure  */
-  YYSYMBOL_518_2 = 518,                    /* $@2  */
-  YYSYMBOL_identifier_list = 519,          /* identifier_list  */
-  YYSYMBOL_function_prototype = 520,       /* function_prototype  */
-  YYSYMBOL_function_declarator = 521,      /* function_declarator  */
-  YYSYMBOL_function_header_with_parameters = 522, /* function_header_with_parameters  */
-  YYSYMBOL_function_header = 523,          /* function_header  */
-  YYSYMBOL_parameter_declarator = 524,     /* parameter_declarator  */
-  YYSYMBOL_parameter_declaration = 525,    /* parameter_declaration  */
-  YYSYMBOL_parameter_type_specifier = 526, /* parameter_type_specifier  */
-  YYSYMBOL_init_declarator_list = 527,     /* init_declarator_list  */
-  YYSYMBOL_single_declaration = 528,       /* single_declaration  */
-  YYSYMBOL_fully_specified_type = 529,     /* fully_specified_type  */
-  YYSYMBOL_invariant_qualifier = 530,      /* invariant_qualifier  */
-  YYSYMBOL_interpolation_qualifier = 531,  /* interpolation_qualifier  */
-  YYSYMBOL_layout_qualifier = 532,         /* layout_qualifier  */
-  YYSYMBOL_layout_qualifier_id_list = 533, /* layout_qualifier_id_list  */
-  YYSYMBOL_layout_qualifier_id = 534,      /* layout_qualifier_id  */
-  YYSYMBOL_precise_qualifier = 535,        /* precise_qualifier  */
-  YYSYMBOL_type_qualifier = 536,           /* type_qualifier  */
-  YYSYMBOL_single_type_qualifier = 537,    /* single_type_qualifier  */
-  YYSYMBOL_storage_qualifier = 538,        /* storage_qualifier  */
-  YYSYMBOL_non_uniform_qualifier = 539,    /* non_uniform_qualifier  */
-  YYSYMBOL_type_name_list = 540,           /* type_name_list  */
-  YYSYMBOL_type_specifier = 541,           /* type_specifier  */
-  YYSYMBOL_array_specifier = 542,          /* array_specifier  */
-  YYSYMBOL_type_parameter_specifier_opt = 543, /* type_parameter_specifier_opt  */
-  YYSYMBOL_type_parameter_specifier = 544, /* type_parameter_specifier  */
-  YYSYMBOL_type_parameter_specifier_list = 545, /* type_parameter_specifier_list  */
-  YYSYMBOL_type_specifier_nonarray = 546,  /* type_specifier_nonarray  */
-  YYSYMBOL_precision_qualifier = 547,      /* precision_qualifier  */
-  YYSYMBOL_struct_specifier = 548,         /* struct_specifier  */
-  YYSYMBOL_549_3 = 549,                    /* $@3  */
-  YYSYMBOL_550_4 = 550,                    /* $@4  */
-  YYSYMBOL_struct_declaration_list = 551,  /* struct_declaration_list  */
-  YYSYMBOL_struct_declaration = 552,       /* struct_declaration  */
-  YYSYMBOL_struct_declarator_list = 553,   /* struct_declarator_list  */
-  YYSYMBOL_struct_declarator = 554,        /* struct_declarator  */
-  YYSYMBOL_initializer = 555,              /* initializer  */
-  YYSYMBOL_initializer_list = 556,         /* initializer_list  */
-  YYSYMBOL_declaration_statement = 557,    /* declaration_statement  */
-  YYSYMBOL_statement = 558,                /* statement  */
-  YYSYMBOL_simple_statement = 559,         /* simple_statement  */
-  YYSYMBOL_demote_statement = 560,         /* demote_statement  */
-  YYSYMBOL_compound_statement = 561,       /* compound_statement  */
-  YYSYMBOL_562_5 = 562,                    /* $@5  */
-  YYSYMBOL_563_6 = 563,                    /* $@6  */
-  YYSYMBOL_statement_no_new_scope = 564,   /* statement_no_new_scope  */
-  YYSYMBOL_statement_scoped = 565,         /* statement_scoped  */
-  YYSYMBOL_566_7 = 566,                    /* $@7  */
-  YYSYMBOL_567_8 = 567,                    /* $@8  */
-  YYSYMBOL_compound_statement_no_new_scope = 568, /* compound_statement_no_new_scope  */
-  YYSYMBOL_statement_list = 569,           /* statement_list  */
-  YYSYMBOL_expression_statement = 570,     /* expression_statement  */
-  YYSYMBOL_selection_statement = 571,      /* selection_statement  */
-  YYSYMBOL_selection_statement_nonattributed = 572, /* selection_statement_nonattributed  */
-  YYSYMBOL_selection_rest_statement = 573, /* selection_rest_statement  */
-  YYSYMBOL_condition = 574,                /* condition  */
-  YYSYMBOL_switch_statement = 575,         /* switch_statement  */
-  YYSYMBOL_switch_statement_nonattributed = 576, /* switch_statement_nonattributed  */
-  YYSYMBOL_577_9 = 577,                    /* $@9  */
-  YYSYMBOL_switch_statement_list = 578,    /* switch_statement_list  */
-  YYSYMBOL_case_label = 579,               /* case_label  */
-  YYSYMBOL_iteration_statement = 580,      /* iteration_statement  */
-  YYSYMBOL_iteration_statement_nonattributed = 581, /* iteration_statement_nonattributed  */
-  YYSYMBOL_582_10 = 582,                   /* $@10  */
-  YYSYMBOL_583_11 = 583,                   /* $@11  */
-  YYSYMBOL_584_12 = 584,                   /* $@12  */
-  YYSYMBOL_for_init_statement = 585,       /* for_init_statement  */
-  YYSYMBOL_conditionopt = 586,             /* conditionopt  */
-  YYSYMBOL_for_rest_statement = 587,       /* for_rest_statement  */
-  YYSYMBOL_jump_statement = 588,           /* jump_statement  */
-  YYSYMBOL_translation_unit = 589,         /* translation_unit  */
-  YYSYMBOL_external_declaration = 590,     /* external_declaration  */
-  YYSYMBOL_function_definition = 591,      /* function_definition  */
-  YYSYMBOL_592_13 = 592,                   /* $@13  */
-  YYSYMBOL_attribute = 593,                /* attribute  */
-  YYSYMBOL_attribute_list = 594,           /* attribute_list  */
-  YYSYMBOL_single_attribute = 595,         /* single_attribute  */
-  YYSYMBOL_spirv_requirements_list = 596,  /* spirv_requirements_list  */
-  YYSYMBOL_spirv_requirements_parameter = 597, /* spirv_requirements_parameter  */
-  YYSYMBOL_spirv_extension_list = 598,     /* spirv_extension_list  */
-  YYSYMBOL_spirv_capability_list = 599,    /* spirv_capability_list  */
-  YYSYMBOL_spirv_execution_mode_qualifier = 600, /* spirv_execution_mode_qualifier  */
-  YYSYMBOL_spirv_execution_mode_parameter_list = 601, /* spirv_execution_mode_parameter_list  */
-  YYSYMBOL_spirv_execution_mode_parameter = 602, /* spirv_execution_mode_parameter  */
-  YYSYMBOL_spirv_execution_mode_id_parameter_list = 603, /* spirv_execution_mode_id_parameter_list  */
-  YYSYMBOL_spirv_storage_class_qualifier = 604, /* spirv_storage_class_qualifier  */
-  YYSYMBOL_spirv_decorate_qualifier = 605, /* spirv_decorate_qualifier  */
-  YYSYMBOL_spirv_decorate_parameter_list = 606, /* spirv_decorate_parameter_list  */
-  YYSYMBOL_spirv_decorate_parameter = 607, /* spirv_decorate_parameter  */
-  YYSYMBOL_spirv_decorate_id_parameter_list = 608, /* spirv_decorate_id_parameter_list  */
-  YYSYMBOL_spirv_decorate_id_parameter = 609, /* spirv_decorate_id_parameter  */
-  YYSYMBOL_spirv_decorate_string_parameter_list = 610, /* spirv_decorate_string_parameter_list  */
-  YYSYMBOL_spirv_type_specifier = 611,     /* spirv_type_specifier  */
-  YYSYMBOL_spirv_type_parameter_list = 612, /* spirv_type_parameter_list  */
-  YYSYMBOL_spirv_type_parameter = 613,     /* spirv_type_parameter  */
-  YYSYMBOL_spirv_instruction_qualifier = 614, /* spirv_instruction_qualifier  */
-  YYSYMBOL_spirv_instruction_qualifier_list = 615, /* spirv_instruction_qualifier_list  */
-  YYSYMBOL_spirv_instruction_qualifier_id = 616 /* spirv_instruction_qualifier_id  */
+  YYSYMBOL_FLOAT16_T = 63,                 /* FLOAT16_T  */
+  YYSYMBOL_FLOAT32_T = 64,                 /* FLOAT32_T  */
+  YYSYMBOL_DOUBLE = 65,                    /* DOUBLE  */
+  YYSYMBOL_FLOAT64_T = 66,                 /* FLOAT64_T  */
+  YYSYMBOL_INT64_T = 67,                   /* INT64_T  */
+  YYSYMBOL_UINT64_T = 68,                  /* UINT64_T  */
+  YYSYMBOL_INT32_T = 69,                   /* INT32_T  */
+  YYSYMBOL_UINT32_T = 70,                  /* UINT32_T  */
+  YYSYMBOL_INT16_T = 71,                   /* INT16_T  */
+  YYSYMBOL_UINT16_T = 72,                  /* UINT16_T  */
+  YYSYMBOL_INT8_T = 73,                    /* INT8_T  */
+  YYSYMBOL_UINT8_T = 74,                   /* UINT8_T  */
+  YYSYMBOL_I64VEC2 = 75,                   /* I64VEC2  */
+  YYSYMBOL_I64VEC3 = 76,                   /* I64VEC3  */
+  YYSYMBOL_I64VEC4 = 77,                   /* I64VEC4  */
+  YYSYMBOL_U64VEC2 = 78,                   /* U64VEC2  */
+  YYSYMBOL_U64VEC3 = 79,                   /* U64VEC3  */
+  YYSYMBOL_U64VEC4 = 80,                   /* U64VEC4  */
+  YYSYMBOL_I32VEC2 = 81,                   /* I32VEC2  */
+  YYSYMBOL_I32VEC3 = 82,                   /* I32VEC3  */
+  YYSYMBOL_I32VEC4 = 83,                   /* I32VEC4  */
+  YYSYMBOL_U32VEC2 = 84,                   /* U32VEC2  */
+  YYSYMBOL_U32VEC3 = 85,                   /* U32VEC3  */
+  YYSYMBOL_U32VEC4 = 86,                   /* U32VEC4  */
+  YYSYMBOL_I16VEC2 = 87,                   /* I16VEC2  */
+  YYSYMBOL_I16VEC3 = 88,                   /* I16VEC3  */
+  YYSYMBOL_I16VEC4 = 89,                   /* I16VEC4  */
+  YYSYMBOL_U16VEC2 = 90,                   /* U16VEC2  */
+  YYSYMBOL_U16VEC3 = 91,                   /* U16VEC3  */
+  YYSYMBOL_U16VEC4 = 92,                   /* U16VEC4  */
+  YYSYMBOL_I8VEC2 = 93,                    /* I8VEC2  */
+  YYSYMBOL_I8VEC3 = 94,                    /* I8VEC3  */
+  YYSYMBOL_I8VEC4 = 95,                    /* I8VEC4  */
+  YYSYMBOL_U8VEC2 = 96,                    /* U8VEC2  */
+  YYSYMBOL_U8VEC3 = 97,                    /* U8VEC3  */
+  YYSYMBOL_U8VEC4 = 98,                    /* U8VEC4  */
+  YYSYMBOL_DVEC2 = 99,                     /* DVEC2  */
+  YYSYMBOL_DVEC3 = 100,                    /* DVEC3  */
+  YYSYMBOL_DVEC4 = 101,                    /* DVEC4  */
+  YYSYMBOL_DMAT2 = 102,                    /* DMAT2  */
+  YYSYMBOL_DMAT3 = 103,                    /* DMAT3  */
+  YYSYMBOL_DMAT4 = 104,                    /* DMAT4  */
+  YYSYMBOL_F16VEC2 = 105,                  /* F16VEC2  */
+  YYSYMBOL_F16VEC3 = 106,                  /* F16VEC3  */
+  YYSYMBOL_F16VEC4 = 107,                  /* F16VEC4  */
+  YYSYMBOL_F16MAT2 = 108,                  /* F16MAT2  */
+  YYSYMBOL_F16MAT3 = 109,                  /* F16MAT3  */
+  YYSYMBOL_F16MAT4 = 110,                  /* F16MAT4  */
+  YYSYMBOL_F32VEC2 = 111,                  /* F32VEC2  */
+  YYSYMBOL_F32VEC3 = 112,                  /* F32VEC3  */
+  YYSYMBOL_F32VEC4 = 113,                  /* F32VEC4  */
+  YYSYMBOL_F32MAT2 = 114,                  /* F32MAT2  */
+  YYSYMBOL_F32MAT3 = 115,                  /* F32MAT3  */
+  YYSYMBOL_F32MAT4 = 116,                  /* F32MAT4  */
+  YYSYMBOL_F64VEC2 = 117,                  /* F64VEC2  */
+  YYSYMBOL_F64VEC3 = 118,                  /* F64VEC3  */
+  YYSYMBOL_F64VEC4 = 119,                  /* F64VEC4  */
+  YYSYMBOL_F64MAT2 = 120,                  /* F64MAT2  */
+  YYSYMBOL_F64MAT3 = 121,                  /* F64MAT3  */
+  YYSYMBOL_F64MAT4 = 122,                  /* F64MAT4  */
+  YYSYMBOL_DMAT2X2 = 123,                  /* DMAT2X2  */
+  YYSYMBOL_DMAT2X3 = 124,                  /* DMAT2X3  */
+  YYSYMBOL_DMAT2X4 = 125,                  /* DMAT2X4  */
+  YYSYMBOL_DMAT3X2 = 126,                  /* DMAT3X2  */
+  YYSYMBOL_DMAT3X3 = 127,                  /* DMAT3X3  */
+  YYSYMBOL_DMAT3X4 = 128,                  /* DMAT3X4  */
+  YYSYMBOL_DMAT4X2 = 129,                  /* DMAT4X2  */
+  YYSYMBOL_DMAT4X3 = 130,                  /* DMAT4X3  */
+  YYSYMBOL_DMAT4X4 = 131,                  /* DMAT4X4  */
+  YYSYMBOL_F16MAT2X2 = 132,                /* F16MAT2X2  */
+  YYSYMBOL_F16MAT2X3 = 133,                /* F16MAT2X3  */
+  YYSYMBOL_F16MAT2X4 = 134,                /* F16MAT2X4  */
+  YYSYMBOL_F16MAT3X2 = 135,                /* F16MAT3X2  */
+  YYSYMBOL_F16MAT3X3 = 136,                /* F16MAT3X3  */
+  YYSYMBOL_F16MAT3X4 = 137,                /* F16MAT3X4  */
+  YYSYMBOL_F16MAT4X2 = 138,                /* F16MAT4X2  */
+  YYSYMBOL_F16MAT4X3 = 139,                /* F16MAT4X3  */
+  YYSYMBOL_F16MAT4X4 = 140,                /* F16MAT4X4  */
+  YYSYMBOL_F32MAT2X2 = 141,                /* F32MAT2X2  */
+  YYSYMBOL_F32MAT2X3 = 142,                /* F32MAT2X3  */
+  YYSYMBOL_F32MAT2X4 = 143,                /* F32MAT2X4  */
+  YYSYMBOL_F32MAT3X2 = 144,                /* F32MAT3X2  */
+  YYSYMBOL_F32MAT3X3 = 145,                /* F32MAT3X3  */
+  YYSYMBOL_F32MAT3X4 = 146,                /* F32MAT3X4  */
+  YYSYMBOL_F32MAT4X2 = 147,                /* F32MAT4X2  */
+  YYSYMBOL_F32MAT4X3 = 148,                /* F32MAT4X3  */
+  YYSYMBOL_F32MAT4X4 = 149,                /* F32MAT4X4  */
+  YYSYMBOL_F64MAT2X2 = 150,                /* F64MAT2X2  */
+  YYSYMBOL_F64MAT2X3 = 151,                /* F64MAT2X3  */
+  YYSYMBOL_F64MAT2X4 = 152,                /* F64MAT2X4  */
+  YYSYMBOL_F64MAT3X2 = 153,                /* F64MAT3X2  */
+  YYSYMBOL_F64MAT3X3 = 154,                /* F64MAT3X3  */
+  YYSYMBOL_F64MAT3X4 = 155,                /* F64MAT3X4  */
+  YYSYMBOL_F64MAT4X2 = 156,                /* F64MAT4X2  */
+  YYSYMBOL_F64MAT4X3 = 157,                /* F64MAT4X3  */
+  YYSYMBOL_F64MAT4X4 = 158,                /* F64MAT4X4  */
+  YYSYMBOL_ATOMIC_UINT = 159,              /* ATOMIC_UINT  */
+  YYSYMBOL_ACCSTRUCTNV = 160,              /* ACCSTRUCTNV  */
+  YYSYMBOL_ACCSTRUCTEXT = 161,             /* ACCSTRUCTEXT  */
+  YYSYMBOL_RAYQUERYEXT = 162,              /* RAYQUERYEXT  */
+  YYSYMBOL_FCOOPMATNV = 163,               /* FCOOPMATNV  */
+  YYSYMBOL_ICOOPMATNV = 164,               /* ICOOPMATNV  */
+  YYSYMBOL_UCOOPMATNV = 165,               /* UCOOPMATNV  */
+  YYSYMBOL_COOPMAT = 166,                  /* COOPMAT  */
+  YYSYMBOL_HITOBJECTNV = 167,              /* HITOBJECTNV  */
+  YYSYMBOL_HITOBJECTATTRNV = 168,          /* HITOBJECTATTRNV  */
+  YYSYMBOL_SAMPLERCUBEARRAY = 169,         /* SAMPLERCUBEARRAY  */
+  YYSYMBOL_SAMPLERCUBEARRAYSHADOW = 170,   /* SAMPLERCUBEARRAYSHADOW  */
+  YYSYMBOL_ISAMPLERCUBEARRAY = 171,        /* ISAMPLERCUBEARRAY  */
+  YYSYMBOL_USAMPLERCUBEARRAY = 172,        /* USAMPLERCUBEARRAY  */
+  YYSYMBOL_SAMPLER1D = 173,                /* SAMPLER1D  */
+  YYSYMBOL_SAMPLER1DARRAY = 174,           /* SAMPLER1DARRAY  */
+  YYSYMBOL_SAMPLER1DARRAYSHADOW = 175,     /* SAMPLER1DARRAYSHADOW  */
+  YYSYMBOL_ISAMPLER1D = 176,               /* ISAMPLER1D  */
+  YYSYMBOL_SAMPLER1DSHADOW = 177,          /* SAMPLER1DSHADOW  */
+  YYSYMBOL_SAMPLER2DRECT = 178,            /* SAMPLER2DRECT  */
+  YYSYMBOL_SAMPLER2DRECTSHADOW = 179,      /* SAMPLER2DRECTSHADOW  */
+  YYSYMBOL_ISAMPLER2DRECT = 180,           /* ISAMPLER2DRECT  */
+  YYSYMBOL_USAMPLER2DRECT = 181,           /* USAMPLER2DRECT  */
+  YYSYMBOL_SAMPLERBUFFER = 182,            /* SAMPLERBUFFER  */
+  YYSYMBOL_ISAMPLERBUFFER = 183,           /* ISAMPLERBUFFER  */
+  YYSYMBOL_USAMPLERBUFFER = 184,           /* USAMPLERBUFFER  */
+  YYSYMBOL_SAMPLER2DMS = 185,              /* SAMPLER2DMS  */
+  YYSYMBOL_ISAMPLER2DMS = 186,             /* ISAMPLER2DMS  */
+  YYSYMBOL_USAMPLER2DMS = 187,             /* USAMPLER2DMS  */
+  YYSYMBOL_SAMPLER2DMSARRAY = 188,         /* SAMPLER2DMSARRAY  */
+  YYSYMBOL_ISAMPLER2DMSARRAY = 189,        /* ISAMPLER2DMSARRAY  */
+  YYSYMBOL_USAMPLER2DMSARRAY = 190,        /* USAMPLER2DMSARRAY  */
+  YYSYMBOL_SAMPLEREXTERNALOES = 191,       /* SAMPLEREXTERNALOES  */
+  YYSYMBOL_SAMPLEREXTERNAL2DY2YEXT = 192,  /* SAMPLEREXTERNAL2DY2YEXT  */
+  YYSYMBOL_ISAMPLER1DARRAY = 193,          /* ISAMPLER1DARRAY  */
+  YYSYMBOL_USAMPLER1D = 194,               /* USAMPLER1D  */
+  YYSYMBOL_USAMPLER1DARRAY = 195,          /* USAMPLER1DARRAY  */
+  YYSYMBOL_F16SAMPLER1D = 196,             /* F16SAMPLER1D  */
+  YYSYMBOL_F16SAMPLER2D = 197,             /* F16SAMPLER2D  */
+  YYSYMBOL_F16SAMPLER3D = 198,             /* F16SAMPLER3D  */
+  YYSYMBOL_F16SAMPLER2DRECT = 199,         /* F16SAMPLER2DRECT  */
+  YYSYMBOL_F16SAMPLERCUBE = 200,           /* F16SAMPLERCUBE  */
+  YYSYMBOL_F16SAMPLER1DARRAY = 201,        /* F16SAMPLER1DARRAY  */
+  YYSYMBOL_F16SAMPLER2DARRAY = 202,        /* F16SAMPLER2DARRAY  */
+  YYSYMBOL_F16SAMPLERCUBEARRAY = 203,      /* F16SAMPLERCUBEARRAY  */
+  YYSYMBOL_F16SAMPLERBUFFER = 204,         /* F16SAMPLERBUFFER  */
+  YYSYMBOL_F16SAMPLER2DMS = 205,           /* F16SAMPLER2DMS  */
+  YYSYMBOL_F16SAMPLER2DMSARRAY = 206,      /* F16SAMPLER2DMSARRAY  */
+  YYSYMBOL_F16SAMPLER1DSHADOW = 207,       /* F16SAMPLER1DSHADOW  */
+  YYSYMBOL_F16SAMPLER2DSHADOW = 208,       /* F16SAMPLER2DSHADOW  */
+  YYSYMBOL_F16SAMPLER1DARRAYSHADOW = 209,  /* F16SAMPLER1DARRAYSHADOW  */
+  YYSYMBOL_F16SAMPLER2DARRAYSHADOW = 210,  /* F16SAMPLER2DARRAYSHADOW  */
+  YYSYMBOL_F16SAMPLER2DRECTSHADOW = 211,   /* F16SAMPLER2DRECTSHADOW  */
+  YYSYMBOL_F16SAMPLERCUBESHADOW = 212,     /* F16SAMPLERCUBESHADOW  */
+  YYSYMBOL_F16SAMPLERCUBEARRAYSHADOW = 213, /* F16SAMPLERCUBEARRAYSHADOW  */
+  YYSYMBOL_IMAGE1D = 214,                  /* IMAGE1D  */
+  YYSYMBOL_IIMAGE1D = 215,                 /* IIMAGE1D  */
+  YYSYMBOL_UIMAGE1D = 216,                 /* UIMAGE1D  */
+  YYSYMBOL_IMAGE2D = 217,                  /* IMAGE2D  */
+  YYSYMBOL_IIMAGE2D = 218,                 /* IIMAGE2D  */
+  YYSYMBOL_UIMAGE2D = 219,                 /* UIMAGE2D  */
+  YYSYMBOL_IMAGE3D = 220,                  /* IMAGE3D  */
+  YYSYMBOL_IIMAGE3D = 221,                 /* IIMAGE3D  */
+  YYSYMBOL_UIMAGE3D = 222,                 /* UIMAGE3D  */
+  YYSYMBOL_IMAGE2DRECT = 223,              /* IMAGE2DRECT  */
+  YYSYMBOL_IIMAGE2DRECT = 224,             /* IIMAGE2DRECT  */
+  YYSYMBOL_UIMAGE2DRECT = 225,             /* UIMAGE2DRECT  */
+  YYSYMBOL_IMAGECUBE = 226,                /* IMAGECUBE  */
+  YYSYMBOL_IIMAGECUBE = 227,               /* IIMAGECUBE  */
+  YYSYMBOL_UIMAGECUBE = 228,               /* UIMAGECUBE  */
+  YYSYMBOL_IMAGEBUFFER = 229,              /* IMAGEBUFFER  */
+  YYSYMBOL_IIMAGEBUFFER = 230,             /* IIMAGEBUFFER  */
+  YYSYMBOL_UIMAGEBUFFER = 231,             /* UIMAGEBUFFER  */
+  YYSYMBOL_IMAGE1DARRAY = 232,             /* IMAGE1DARRAY  */
+  YYSYMBOL_IIMAGE1DARRAY = 233,            /* IIMAGE1DARRAY  */
+  YYSYMBOL_UIMAGE1DARRAY = 234,            /* UIMAGE1DARRAY  */
+  YYSYMBOL_IMAGE2DARRAY = 235,             /* IMAGE2DARRAY  */
+  YYSYMBOL_IIMAGE2DARRAY = 236,            /* IIMAGE2DARRAY  */
+  YYSYMBOL_UIMAGE2DARRAY = 237,            /* UIMAGE2DARRAY  */
+  YYSYMBOL_IMAGECUBEARRAY = 238,           /* IMAGECUBEARRAY  */
+  YYSYMBOL_IIMAGECUBEARRAY = 239,          /* IIMAGECUBEARRAY  */
+  YYSYMBOL_UIMAGECUBEARRAY = 240,          /* UIMAGECUBEARRAY  */
+  YYSYMBOL_IMAGE2DMS = 241,                /* IMAGE2DMS  */
+  YYSYMBOL_IIMAGE2DMS = 242,               /* IIMAGE2DMS  */
+  YYSYMBOL_UIMAGE2DMS = 243,               /* UIMAGE2DMS  */
+  YYSYMBOL_IMAGE2DMSARRAY = 244,           /* IMAGE2DMSARRAY  */
+  YYSYMBOL_IIMAGE2DMSARRAY = 245,          /* IIMAGE2DMSARRAY  */
+  YYSYMBOL_UIMAGE2DMSARRAY = 246,          /* UIMAGE2DMSARRAY  */
+  YYSYMBOL_F16IMAGE1D = 247,               /* F16IMAGE1D  */
+  YYSYMBOL_F16IMAGE2D = 248,               /* F16IMAGE2D  */
+  YYSYMBOL_F16IMAGE3D = 249,               /* F16IMAGE3D  */
+  YYSYMBOL_F16IMAGE2DRECT = 250,           /* F16IMAGE2DRECT  */
+  YYSYMBOL_F16IMAGECUBE = 251,             /* F16IMAGECUBE  */
+  YYSYMBOL_F16IMAGE1DARRAY = 252,          /* F16IMAGE1DARRAY  */
+  YYSYMBOL_F16IMAGE2DARRAY = 253,          /* F16IMAGE2DARRAY  */
+  YYSYMBOL_F16IMAGECUBEARRAY = 254,        /* F16IMAGECUBEARRAY  */
+  YYSYMBOL_F16IMAGEBUFFER = 255,           /* F16IMAGEBUFFER  */
+  YYSYMBOL_F16IMAGE2DMS = 256,             /* F16IMAGE2DMS  */
+  YYSYMBOL_F16IMAGE2DMSARRAY = 257,        /* F16IMAGE2DMSARRAY  */
+  YYSYMBOL_I64IMAGE1D = 258,               /* I64IMAGE1D  */
+  YYSYMBOL_U64IMAGE1D = 259,               /* U64IMAGE1D  */
+  YYSYMBOL_I64IMAGE2D = 260,               /* I64IMAGE2D  */
+  YYSYMBOL_U64IMAGE2D = 261,               /* U64IMAGE2D  */
+  YYSYMBOL_I64IMAGE3D = 262,               /* I64IMAGE3D  */
+  YYSYMBOL_U64IMAGE3D = 263,               /* U64IMAGE3D  */
+  YYSYMBOL_I64IMAGE2DRECT = 264,           /* I64IMAGE2DRECT  */
+  YYSYMBOL_U64IMAGE2DRECT = 265,           /* U64IMAGE2DRECT  */
+  YYSYMBOL_I64IMAGECUBE = 266,             /* I64IMAGECUBE  */
+  YYSYMBOL_U64IMAGECUBE = 267,             /* U64IMAGECUBE  */
+  YYSYMBOL_I64IMAGEBUFFER = 268,           /* I64IMAGEBUFFER  */
+  YYSYMBOL_U64IMAGEBUFFER = 269,           /* U64IMAGEBUFFER  */
+  YYSYMBOL_I64IMAGE1DARRAY = 270,          /* I64IMAGE1DARRAY  */
+  YYSYMBOL_U64IMAGE1DARRAY = 271,          /* U64IMAGE1DARRAY  */
+  YYSYMBOL_I64IMAGE2DARRAY = 272,          /* I64IMAGE2DARRAY  */
+  YYSYMBOL_U64IMAGE2DARRAY = 273,          /* U64IMAGE2DARRAY  */
+  YYSYMBOL_I64IMAGECUBEARRAY = 274,        /* I64IMAGECUBEARRAY  */
+  YYSYMBOL_U64IMAGECUBEARRAY = 275,        /* U64IMAGECUBEARRAY  */
+  YYSYMBOL_I64IMAGE2DMS = 276,             /* I64IMAGE2DMS  */
+  YYSYMBOL_U64IMAGE2DMS = 277,             /* U64IMAGE2DMS  */
+  YYSYMBOL_I64IMAGE2DMSARRAY = 278,        /* I64IMAGE2DMSARRAY  */
+  YYSYMBOL_U64IMAGE2DMSARRAY = 279,        /* U64IMAGE2DMSARRAY  */
+  YYSYMBOL_TEXTURECUBEARRAY = 280,         /* TEXTURECUBEARRAY  */
+  YYSYMBOL_ITEXTURECUBEARRAY = 281,        /* ITEXTURECUBEARRAY  */
+  YYSYMBOL_UTEXTURECUBEARRAY = 282,        /* UTEXTURECUBEARRAY  */
+  YYSYMBOL_TEXTURE1D = 283,                /* TEXTURE1D  */
+  YYSYMBOL_ITEXTURE1D = 284,               /* ITEXTURE1D  */
+  YYSYMBOL_UTEXTURE1D = 285,               /* UTEXTURE1D  */
+  YYSYMBOL_TEXTURE1DARRAY = 286,           /* TEXTURE1DARRAY  */
+  YYSYMBOL_ITEXTURE1DARRAY = 287,          /* ITEXTURE1DARRAY  */
+  YYSYMBOL_UTEXTURE1DARRAY = 288,          /* UTEXTURE1DARRAY  */
+  YYSYMBOL_TEXTURE2DRECT = 289,            /* TEXTURE2DRECT  */
+  YYSYMBOL_ITEXTURE2DRECT = 290,           /* ITEXTURE2DRECT  */
+  YYSYMBOL_UTEXTURE2DRECT = 291,           /* UTEXTURE2DRECT  */
+  YYSYMBOL_TEXTUREBUFFER = 292,            /* TEXTUREBUFFER  */
+  YYSYMBOL_ITEXTUREBUFFER = 293,           /* ITEXTUREBUFFER  */
+  YYSYMBOL_UTEXTUREBUFFER = 294,           /* UTEXTUREBUFFER  */
+  YYSYMBOL_TEXTURE2DMS = 295,              /* TEXTURE2DMS  */
+  YYSYMBOL_ITEXTURE2DMS = 296,             /* ITEXTURE2DMS  */
+  YYSYMBOL_UTEXTURE2DMS = 297,             /* UTEXTURE2DMS  */
+  YYSYMBOL_TEXTURE2DMSARRAY = 298,         /* TEXTURE2DMSARRAY  */
+  YYSYMBOL_ITEXTURE2DMSARRAY = 299,        /* ITEXTURE2DMSARRAY  */
+  YYSYMBOL_UTEXTURE2DMSARRAY = 300,        /* UTEXTURE2DMSARRAY  */
+  YYSYMBOL_F16TEXTURE1D = 301,             /* F16TEXTURE1D  */
+  YYSYMBOL_F16TEXTURE2D = 302,             /* F16TEXTURE2D  */
+  YYSYMBOL_F16TEXTURE3D = 303,             /* F16TEXTURE3D  */
+  YYSYMBOL_F16TEXTURE2DRECT = 304,         /* F16TEXTURE2DRECT  */
+  YYSYMBOL_F16TEXTURECUBE = 305,           /* F16TEXTURECUBE  */
+  YYSYMBOL_F16TEXTURE1DARRAY = 306,        /* F16TEXTURE1DARRAY  */
+  YYSYMBOL_F16TEXTURE2DARRAY = 307,        /* F16TEXTURE2DARRAY  */
+  YYSYMBOL_F16TEXTURECUBEARRAY = 308,      /* F16TEXTURECUBEARRAY  */
+  YYSYMBOL_F16TEXTUREBUFFER = 309,         /* F16TEXTUREBUFFER  */
+  YYSYMBOL_F16TEXTURE2DMS = 310,           /* F16TEXTURE2DMS  */
+  YYSYMBOL_F16TEXTURE2DMSARRAY = 311,      /* F16TEXTURE2DMSARRAY  */
+  YYSYMBOL_SUBPASSINPUT = 312,             /* SUBPASSINPUT  */
+  YYSYMBOL_SUBPASSINPUTMS = 313,           /* SUBPASSINPUTMS  */
+  YYSYMBOL_ISUBPASSINPUT = 314,            /* ISUBPASSINPUT  */
+  YYSYMBOL_ISUBPASSINPUTMS = 315,          /* ISUBPASSINPUTMS  */
+  YYSYMBOL_USUBPASSINPUT = 316,            /* USUBPASSINPUT  */
+  YYSYMBOL_USUBPASSINPUTMS = 317,          /* USUBPASSINPUTMS  */
+  YYSYMBOL_F16SUBPASSINPUT = 318,          /* F16SUBPASSINPUT  */
+  YYSYMBOL_F16SUBPASSINPUTMS = 319,        /* F16SUBPASSINPUTMS  */
+  YYSYMBOL_SPIRV_INSTRUCTION = 320,        /* SPIRV_INSTRUCTION  */
+  YYSYMBOL_SPIRV_EXECUTION_MODE = 321,     /* SPIRV_EXECUTION_MODE  */
+  YYSYMBOL_SPIRV_EXECUTION_MODE_ID = 322,  /* SPIRV_EXECUTION_MODE_ID  */
+  YYSYMBOL_SPIRV_DECORATE = 323,           /* SPIRV_DECORATE  */
+  YYSYMBOL_SPIRV_DECORATE_ID = 324,        /* SPIRV_DECORATE_ID  */
+  YYSYMBOL_SPIRV_DECORATE_STRING = 325,    /* SPIRV_DECORATE_STRING  */
+  YYSYMBOL_SPIRV_TYPE = 326,               /* SPIRV_TYPE  */
+  YYSYMBOL_SPIRV_STORAGE_CLASS = 327,      /* SPIRV_STORAGE_CLASS  */
+  YYSYMBOL_SPIRV_BY_REFERENCE = 328,       /* SPIRV_BY_REFERENCE  */
+  YYSYMBOL_SPIRV_LITERAL = 329,            /* SPIRV_LITERAL  */
+  YYSYMBOL_ATTACHMENTEXT = 330,            /* ATTACHMENTEXT  */
+  YYSYMBOL_IATTACHMENTEXT = 331,           /* IATTACHMENTEXT  */
+  YYSYMBOL_UATTACHMENTEXT = 332,           /* UATTACHMENTEXT  */
+  YYSYMBOL_LEFT_OP = 333,                  /* LEFT_OP  */
+  YYSYMBOL_RIGHT_OP = 334,                 /* RIGHT_OP  */
+  YYSYMBOL_INC_OP = 335,                   /* INC_OP  */
+  YYSYMBOL_DEC_OP = 336,                   /* DEC_OP  */
+  YYSYMBOL_LE_OP = 337,                    /* LE_OP  */
+  YYSYMBOL_GE_OP = 338,                    /* GE_OP  */
+  YYSYMBOL_EQ_OP = 339,                    /* EQ_OP  */
+  YYSYMBOL_NE_OP = 340,                    /* NE_OP  */
+  YYSYMBOL_AND_OP = 341,                   /* AND_OP  */
+  YYSYMBOL_OR_OP = 342,                    /* OR_OP  */
+  YYSYMBOL_XOR_OP = 343,                   /* XOR_OP  */
+  YYSYMBOL_MUL_ASSIGN = 344,               /* MUL_ASSIGN  */
+  YYSYMBOL_DIV_ASSIGN = 345,               /* DIV_ASSIGN  */
+  YYSYMBOL_ADD_ASSIGN = 346,               /* ADD_ASSIGN  */
+  YYSYMBOL_MOD_ASSIGN = 347,               /* MOD_ASSIGN  */
+  YYSYMBOL_LEFT_ASSIGN = 348,              /* LEFT_ASSIGN  */
+  YYSYMBOL_RIGHT_ASSIGN = 349,             /* RIGHT_ASSIGN  */
+  YYSYMBOL_AND_ASSIGN = 350,               /* AND_ASSIGN  */
+  YYSYMBOL_XOR_ASSIGN = 351,               /* XOR_ASSIGN  */
+  YYSYMBOL_OR_ASSIGN = 352,                /* OR_ASSIGN  */
+  YYSYMBOL_SUB_ASSIGN = 353,               /* SUB_ASSIGN  */
+  YYSYMBOL_STRING_LITERAL = 354,           /* STRING_LITERAL  */
+  YYSYMBOL_LEFT_PAREN = 355,               /* LEFT_PAREN  */
+  YYSYMBOL_RIGHT_PAREN = 356,              /* RIGHT_PAREN  */
+  YYSYMBOL_LEFT_BRACKET = 357,             /* LEFT_BRACKET  */
+  YYSYMBOL_RIGHT_BRACKET = 358,            /* RIGHT_BRACKET  */
+  YYSYMBOL_LEFT_BRACE = 359,               /* LEFT_BRACE  */
+  YYSYMBOL_RIGHT_BRACE = 360,              /* RIGHT_BRACE  */
+  YYSYMBOL_DOT = 361,                      /* DOT  */
+  YYSYMBOL_COMMA = 362,                    /* COMMA  */
+  YYSYMBOL_COLON = 363,                    /* COLON  */
+  YYSYMBOL_EQUAL = 364,                    /* EQUAL  */
+  YYSYMBOL_SEMICOLON = 365,                /* SEMICOLON  */
+  YYSYMBOL_BANG = 366,                     /* BANG  */
+  YYSYMBOL_DASH = 367,                     /* DASH  */
+  YYSYMBOL_TILDE = 368,                    /* TILDE  */
+  YYSYMBOL_PLUS = 369,                     /* PLUS  */
+  YYSYMBOL_STAR = 370,                     /* STAR  */
+  YYSYMBOL_SLASH = 371,                    /* SLASH  */
+  YYSYMBOL_PERCENT = 372,                  /* PERCENT  */
+  YYSYMBOL_LEFT_ANGLE = 373,               /* LEFT_ANGLE  */
+  YYSYMBOL_RIGHT_ANGLE = 374,              /* RIGHT_ANGLE  */
+  YYSYMBOL_VERTICAL_BAR = 375,             /* VERTICAL_BAR  */
+  YYSYMBOL_CARET = 376,                    /* CARET  */
+  YYSYMBOL_AMPERSAND = 377,                /* AMPERSAND  */
+  YYSYMBOL_QUESTION = 378,                 /* QUESTION  */
+  YYSYMBOL_INVARIANT = 379,                /* INVARIANT  */
+  YYSYMBOL_HIGH_PRECISION = 380,           /* HIGH_PRECISION  */
+  YYSYMBOL_MEDIUM_PRECISION = 381,         /* MEDIUM_PRECISION  */
+  YYSYMBOL_LOW_PRECISION = 382,            /* LOW_PRECISION  */
+  YYSYMBOL_PRECISION = 383,                /* PRECISION  */
+  YYSYMBOL_PACKED = 384,                   /* PACKED  */
+  YYSYMBOL_RESOURCE = 385,                 /* RESOURCE  */
+  YYSYMBOL_SUPERP = 386,                   /* SUPERP  */
+  YYSYMBOL_FLOATCONSTANT = 387,            /* FLOATCONSTANT  */
+  YYSYMBOL_INTCONSTANT = 388,              /* INTCONSTANT  */
+  YYSYMBOL_UINTCONSTANT = 389,             /* UINTCONSTANT  */
+  YYSYMBOL_BOOLCONSTANT = 390,             /* BOOLCONSTANT  */
+  YYSYMBOL_IDENTIFIER = 391,               /* IDENTIFIER  */
+  YYSYMBOL_TYPE_NAME = 392,                /* TYPE_NAME  */
+  YYSYMBOL_CENTROID = 393,                 /* CENTROID  */
+  YYSYMBOL_IN = 394,                       /* IN  */
+  YYSYMBOL_OUT = 395,                      /* OUT  */
+  YYSYMBOL_INOUT = 396,                    /* INOUT  */
+  YYSYMBOL_STRUCT = 397,                   /* STRUCT  */
+  YYSYMBOL_VOID = 398,                     /* VOID  */
+  YYSYMBOL_WHILE = 399,                    /* WHILE  */
+  YYSYMBOL_BREAK = 400,                    /* BREAK  */
+  YYSYMBOL_CONTINUE = 401,                 /* CONTINUE  */
+  YYSYMBOL_DO = 402,                       /* DO  */
+  YYSYMBOL_ELSE = 403,                     /* ELSE  */
+  YYSYMBOL_FOR = 404,                      /* FOR  */
+  YYSYMBOL_IF = 405,                       /* IF  */
+  YYSYMBOL_DISCARD = 406,                  /* DISCARD  */
+  YYSYMBOL_RETURN = 407,                   /* RETURN  */
+  YYSYMBOL_SWITCH = 408,                   /* SWITCH  */
+  YYSYMBOL_CASE = 409,                     /* CASE  */
+  YYSYMBOL_DEFAULT = 410,                  /* DEFAULT  */
+  YYSYMBOL_TERMINATE_INVOCATION = 411,     /* TERMINATE_INVOCATION  */
+  YYSYMBOL_TERMINATE_RAY = 412,            /* TERMINATE_RAY  */
+  YYSYMBOL_IGNORE_INTERSECTION = 413,      /* IGNORE_INTERSECTION  */
+  YYSYMBOL_UNIFORM = 414,                  /* UNIFORM  */
+  YYSYMBOL_SHARED = 415,                   /* SHARED  */
+  YYSYMBOL_BUFFER = 416,                   /* BUFFER  */
+  YYSYMBOL_TILEIMAGEEXT = 417,             /* TILEIMAGEEXT  */
+  YYSYMBOL_FLAT = 418,                     /* FLAT  */
+  YYSYMBOL_SMOOTH = 419,                   /* SMOOTH  */
+  YYSYMBOL_LAYOUT = 420,                   /* LAYOUT  */
+  YYSYMBOL_DOUBLECONSTANT = 421,           /* DOUBLECONSTANT  */
+  YYSYMBOL_INT16CONSTANT = 422,            /* INT16CONSTANT  */
+  YYSYMBOL_UINT16CONSTANT = 423,           /* UINT16CONSTANT  */
+  YYSYMBOL_FLOAT16CONSTANT = 424,          /* FLOAT16CONSTANT  */
+  YYSYMBOL_INT32CONSTANT = 425,            /* INT32CONSTANT  */
+  YYSYMBOL_UINT32CONSTANT = 426,           /* UINT32CONSTANT  */
+  YYSYMBOL_INT64CONSTANT = 427,            /* INT64CONSTANT  */
+  YYSYMBOL_UINT64CONSTANT = 428,           /* UINT64CONSTANT  */
+  YYSYMBOL_SUBROUTINE = 429,               /* SUBROUTINE  */
+  YYSYMBOL_DEMOTE = 430,                   /* DEMOTE  */
+  YYSYMBOL_PAYLOADNV = 431,                /* PAYLOADNV  */
+  YYSYMBOL_PAYLOADINNV = 432,              /* PAYLOADINNV  */
+  YYSYMBOL_HITATTRNV = 433,                /* HITATTRNV  */
+  YYSYMBOL_CALLDATANV = 434,               /* CALLDATANV  */
+  YYSYMBOL_CALLDATAINNV = 435,             /* CALLDATAINNV  */
+  YYSYMBOL_PAYLOADEXT = 436,               /* PAYLOADEXT  */
+  YYSYMBOL_PAYLOADINEXT = 437,             /* PAYLOADINEXT  */
+  YYSYMBOL_HITATTREXT = 438,               /* HITATTREXT  */
+  YYSYMBOL_CALLDATAEXT = 439,              /* CALLDATAEXT  */
+  YYSYMBOL_CALLDATAINEXT = 440,            /* CALLDATAINEXT  */
+  YYSYMBOL_PATCH = 441,                    /* PATCH  */
+  YYSYMBOL_SAMPLE = 442,                   /* SAMPLE  */
+  YYSYMBOL_NONUNIFORM = 443,               /* NONUNIFORM  */
+  YYSYMBOL_COHERENT = 444,                 /* COHERENT  */
+  YYSYMBOL_VOLATILE = 445,                 /* VOLATILE  */
+  YYSYMBOL_RESTRICT = 446,                 /* RESTRICT  */
+  YYSYMBOL_READONLY = 447,                 /* READONLY  */
+  YYSYMBOL_WRITEONLY = 448,                /* WRITEONLY  */
+  YYSYMBOL_DEVICECOHERENT = 449,           /* DEVICECOHERENT  */
+  YYSYMBOL_QUEUEFAMILYCOHERENT = 450,      /* QUEUEFAMILYCOHERENT  */
+  YYSYMBOL_WORKGROUPCOHERENT = 451,        /* WORKGROUPCOHERENT  */
+  YYSYMBOL_SUBGROUPCOHERENT = 452,         /* SUBGROUPCOHERENT  */
+  YYSYMBOL_NONPRIVATE = 453,               /* NONPRIVATE  */
+  YYSYMBOL_SHADERCALLCOHERENT = 454,       /* SHADERCALLCOHERENT  */
+  YYSYMBOL_NOPERSPECTIVE = 455,            /* NOPERSPECTIVE  */
+  YYSYMBOL_EXPLICITINTERPAMD = 456,        /* EXPLICITINTERPAMD  */
+  YYSYMBOL_PERVERTEXEXT = 457,             /* PERVERTEXEXT  */
+  YYSYMBOL_PERVERTEXNV = 458,              /* PERVERTEXNV  */
+  YYSYMBOL_PERPRIMITIVENV = 459,           /* PERPRIMITIVENV  */
+  YYSYMBOL_PERVIEWNV = 460,                /* PERVIEWNV  */
+  YYSYMBOL_PERTASKNV = 461,                /* PERTASKNV  */
+  YYSYMBOL_PERPRIMITIVEEXT = 462,          /* PERPRIMITIVEEXT  */
+  YYSYMBOL_TASKPAYLOADWORKGROUPEXT = 463,  /* TASKPAYLOADWORKGROUPEXT  */
+  YYSYMBOL_PRECISE = 464,                  /* PRECISE  */
+  YYSYMBOL_YYACCEPT = 465,                 /* $accept  */
+  YYSYMBOL_variable_identifier = 466,      /* variable_identifier  */
+  YYSYMBOL_primary_expression = 467,       /* primary_expression  */
+  YYSYMBOL_postfix_expression = 468,       /* postfix_expression  */
+  YYSYMBOL_integer_expression = 469,       /* integer_expression  */
+  YYSYMBOL_function_call = 470,            /* function_call  */
+  YYSYMBOL_function_call_or_method = 471,  /* function_call_or_method  */
+  YYSYMBOL_function_call_generic = 472,    /* function_call_generic  */
+  YYSYMBOL_function_call_header_no_parameters = 473, /* function_call_header_no_parameters  */
+  YYSYMBOL_function_call_header_with_parameters = 474, /* function_call_header_with_parameters  */
+  YYSYMBOL_function_call_header = 475,     /* function_call_header  */
+  YYSYMBOL_function_identifier = 476,      /* function_identifier  */
+  YYSYMBOL_unary_expression = 477,         /* unary_expression  */
+  YYSYMBOL_unary_operator = 478,           /* unary_operator  */
+  YYSYMBOL_multiplicative_expression = 479, /* multiplicative_expression  */
+  YYSYMBOL_additive_expression = 480,      /* additive_expression  */
+  YYSYMBOL_shift_expression = 481,         /* shift_expression  */
+  YYSYMBOL_relational_expression = 482,    /* relational_expression  */
+  YYSYMBOL_equality_expression = 483,      /* equality_expression  */
+  YYSYMBOL_and_expression = 484,           /* and_expression  */
+  YYSYMBOL_exclusive_or_expression = 485,  /* exclusive_or_expression  */
+  YYSYMBOL_inclusive_or_expression = 486,  /* inclusive_or_expression  */
+  YYSYMBOL_logical_and_expression = 487,   /* logical_and_expression  */
+  YYSYMBOL_logical_xor_expression = 488,   /* logical_xor_expression  */
+  YYSYMBOL_logical_or_expression = 489,    /* logical_or_expression  */
+  YYSYMBOL_conditional_expression = 490,   /* conditional_expression  */
+  YYSYMBOL_491_1 = 491,                    /* $@1  */
+  YYSYMBOL_assignment_expression = 492,    /* assignment_expression  */
+  YYSYMBOL_assignment_operator = 493,      /* assignment_operator  */
+  YYSYMBOL_expression = 494,               /* expression  */
+  YYSYMBOL_constant_expression = 495,      /* constant_expression  */
+  YYSYMBOL_declaration = 496,              /* declaration  */
+  YYSYMBOL_block_structure = 497,          /* block_structure  */
+  YYSYMBOL_498_2 = 498,                    /* $@2  */
+  YYSYMBOL_identifier_list = 499,          /* identifier_list  */
+  YYSYMBOL_function_prototype = 500,       /* function_prototype  */
+  YYSYMBOL_function_declarator = 501,      /* function_declarator  */
+  YYSYMBOL_function_header_with_parameters = 502, /* function_header_with_parameters  */
+  YYSYMBOL_function_header = 503,          /* function_header  */
+  YYSYMBOL_parameter_declarator = 504,     /* parameter_declarator  */
+  YYSYMBOL_parameter_declaration = 505,    /* parameter_declaration  */
+  YYSYMBOL_parameter_type_specifier = 506, /* parameter_type_specifier  */
+  YYSYMBOL_init_declarator_list = 507,     /* init_declarator_list  */
+  YYSYMBOL_single_declaration = 508,       /* single_declaration  */
+  YYSYMBOL_fully_specified_type = 509,     /* fully_specified_type  */
+  YYSYMBOL_invariant_qualifier = 510,      /* invariant_qualifier  */
+  YYSYMBOL_interpolation_qualifier = 511,  /* interpolation_qualifier  */
+  YYSYMBOL_layout_qualifier = 512,         /* layout_qualifier  */
+  YYSYMBOL_layout_qualifier_id_list = 513, /* layout_qualifier_id_list  */
+  YYSYMBOL_layout_qualifier_id = 514,      /* layout_qualifier_id  */
+  YYSYMBOL_precise_qualifier = 515,        /* precise_qualifier  */
+  YYSYMBOL_type_qualifier = 516,           /* type_qualifier  */
+  YYSYMBOL_single_type_qualifier = 517,    /* single_type_qualifier  */
+  YYSYMBOL_storage_qualifier = 518,        /* storage_qualifier  */
+  YYSYMBOL_non_uniform_qualifier = 519,    /* non_uniform_qualifier  */
+  YYSYMBOL_type_name_list = 520,           /* type_name_list  */
+  YYSYMBOL_type_specifier = 521,           /* type_specifier  */
+  YYSYMBOL_array_specifier = 522,          /* array_specifier  */
+  YYSYMBOL_type_parameter_specifier_opt = 523, /* type_parameter_specifier_opt  */
+  YYSYMBOL_type_parameter_specifier = 524, /* type_parameter_specifier  */
+  YYSYMBOL_type_parameter_specifier_list = 525, /* type_parameter_specifier_list  */
+  YYSYMBOL_type_specifier_nonarray = 526,  /* type_specifier_nonarray  */
+  YYSYMBOL_precision_qualifier = 527,      /* precision_qualifier  */
+  YYSYMBOL_struct_specifier = 528,         /* struct_specifier  */
+  YYSYMBOL_529_3 = 529,                    /* $@3  */
+  YYSYMBOL_530_4 = 530,                    /* $@4  */
+  YYSYMBOL_struct_declaration_list = 531,  /* struct_declaration_list  */
+  YYSYMBOL_struct_declaration = 532,       /* struct_declaration  */
+  YYSYMBOL_struct_declarator_list = 533,   /* struct_declarator_list  */
+  YYSYMBOL_struct_declarator = 534,        /* struct_declarator  */
+  YYSYMBOL_initializer = 535,              /* initializer  */
+  YYSYMBOL_initializer_list = 536,         /* initializer_list  */
+  YYSYMBOL_declaration_statement = 537,    /* declaration_statement  */
+  YYSYMBOL_statement = 538,                /* statement  */
+  YYSYMBOL_simple_statement = 539,         /* simple_statement  */
+  YYSYMBOL_demote_statement = 540,         /* demote_statement  */
+  YYSYMBOL_compound_statement = 541,       /* compound_statement  */
+  YYSYMBOL_542_5 = 542,                    /* $@5  */
+  YYSYMBOL_543_6 = 543,                    /* $@6  */
+  YYSYMBOL_statement_no_new_scope = 544,   /* statement_no_new_scope  */
+  YYSYMBOL_statement_scoped = 545,         /* statement_scoped  */
+  YYSYMBOL_546_7 = 546,                    /* $@7  */
+  YYSYMBOL_547_8 = 547,                    /* $@8  */
+  YYSYMBOL_compound_statement_no_new_scope = 548, /* compound_statement_no_new_scope  */
+  YYSYMBOL_statement_list = 549,           /* statement_list  */
+  YYSYMBOL_expression_statement = 550,     /* expression_statement  */
+  YYSYMBOL_selection_statement = 551,      /* selection_statement  */
+  YYSYMBOL_selection_statement_nonattributed = 552, /* selection_statement_nonattributed  */
+  YYSYMBOL_selection_rest_statement = 553, /* selection_rest_statement  */
+  YYSYMBOL_condition = 554,                /* condition  */
+  YYSYMBOL_switch_statement = 555,         /* switch_statement  */
+  YYSYMBOL_switch_statement_nonattributed = 556, /* switch_statement_nonattributed  */
+  YYSYMBOL_557_9 = 557,                    /* $@9  */
+  YYSYMBOL_switch_statement_list = 558,    /* switch_statement_list  */
+  YYSYMBOL_case_label = 559,               /* case_label  */
+  YYSYMBOL_iteration_statement = 560,      /* iteration_statement  */
+  YYSYMBOL_iteration_statement_nonattributed = 561, /* iteration_statement_nonattributed  */
+  YYSYMBOL_562_10 = 562,                   /* $@10  */
+  YYSYMBOL_563_11 = 563,                   /* $@11  */
+  YYSYMBOL_564_12 = 564,                   /* $@12  */
+  YYSYMBOL_for_init_statement = 565,       /* for_init_statement  */
+  YYSYMBOL_conditionopt = 566,             /* conditionopt  */
+  YYSYMBOL_for_rest_statement = 567,       /* for_rest_statement  */
+  YYSYMBOL_jump_statement = 568,           /* jump_statement  */
+  YYSYMBOL_translation_unit = 569,         /* translation_unit  */
+  YYSYMBOL_external_declaration = 570,     /* external_declaration  */
+  YYSYMBOL_function_definition = 571,      /* function_definition  */
+  YYSYMBOL_572_13 = 572,                   /* $@13  */
+  YYSYMBOL_attribute = 573,                /* attribute  */
+  YYSYMBOL_attribute_list = 574,           /* attribute_list  */
+  YYSYMBOL_single_attribute = 575,         /* single_attribute  */
+  YYSYMBOL_spirv_requirements_list = 576,  /* spirv_requirements_list  */
+  YYSYMBOL_spirv_requirements_parameter = 577, /* spirv_requirements_parameter  */
+  YYSYMBOL_spirv_extension_list = 578,     /* spirv_extension_list  */
+  YYSYMBOL_spirv_capability_list = 579,    /* spirv_capability_list  */
+  YYSYMBOL_spirv_execution_mode_qualifier = 580, /* spirv_execution_mode_qualifier  */
+  YYSYMBOL_spirv_execution_mode_parameter_list = 581, /* spirv_execution_mode_parameter_list  */
+  YYSYMBOL_spirv_execution_mode_parameter = 582, /* spirv_execution_mode_parameter  */
+  YYSYMBOL_spirv_execution_mode_id_parameter_list = 583, /* spirv_execution_mode_id_parameter_list  */
+  YYSYMBOL_spirv_storage_class_qualifier = 584, /* spirv_storage_class_qualifier  */
+  YYSYMBOL_spirv_decorate_qualifier = 585, /* spirv_decorate_qualifier  */
+  YYSYMBOL_spirv_decorate_parameter_list = 586, /* spirv_decorate_parameter_list  */
+  YYSYMBOL_spirv_decorate_parameter = 587, /* spirv_decorate_parameter  */
+  YYSYMBOL_spirv_decorate_id_parameter_list = 588, /* spirv_decorate_id_parameter_list  */
+  YYSYMBOL_spirv_decorate_id_parameter = 589, /* spirv_decorate_id_parameter  */
+  YYSYMBOL_spirv_decorate_string_parameter_list = 590, /* spirv_decorate_string_parameter_list  */
+  YYSYMBOL_spirv_type_specifier = 591,     /* spirv_type_specifier  */
+  YYSYMBOL_spirv_type_parameter_list = 592, /* spirv_type_parameter_list  */
+  YYSYMBOL_spirv_type_parameter = 593,     /* spirv_type_parameter  */
+  YYSYMBOL_spirv_instruction_qualifier = 594, /* spirv_instruction_qualifier  */
+  YYSYMBOL_spirv_instruction_qualifier_list = 595, /* spirv_instruction_qualifier_list  */
+  YYSYMBOL_spirv_instruction_qualifier_id = 596 /* spirv_instruction_qualifier_id  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
@@ -752,7 +732,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 extern int yylex(YYSTYPE*, TParseContext&);
 
 
-#line 756 "MachineIndependent/glslang_tab.cpp"
+#line 736 "MachineIndependent/glslang_tab.cpp"
 
 
 #ifdef short
@@ -1074,21 +1054,21 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  473
+#define YYFINAL  452
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   13744
+#define YYLAST   12701
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  485
+#define YYNTOKENS  465
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  132
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  721
+#define YYNRULES  700
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  968
+#define YYNSTATES  946
 
 /* YYMAXUTOK -- Last valid token kind.  */
-#define YYMAXUTOK   739
+#define YYMAXUTOK   719
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1173,88 +1153,84 @@ static const yytype_int16 yytranslate[] =
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
      445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479,   480,   481,   482,   483,   484
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   362,   362,   368,   371,   376,   379,   382,   386,   389,
-     392,   396,   400,   404,   408,   412,   416,   422,   429,   432,
-     435,   438,   441,   446,   454,   461,   468,   474,   478,   485,
-     488,   494,   512,   537,   545,   550,   577,   585,   591,   595,
-     599,   619,   620,   621,   622,   628,   629,   634,   639,   648,
-     649,   654,   662,   663,   669,   678,   679,   684,   689,   694,
-     702,   703,   712,   724,   725,   734,   735,   744,   745,   754,
-     755,   763,   764,   772,   773,   781,   782,   782,   800,   801,
-     817,   821,   825,   829,   834,   838,   842,   846,   850,   854,
-     858,   865,   868,   879,   886,   891,   898,   903,   908,   915,
-     918,   921,   924,   929,   937,   937,   948,   952,   959,   964,
-     972,   980,   992,   995,  1002,  1015,  1035,  1042,  1065,  1080,
-    1099,  1110,  1121,  1131,  1141,  1151,  1160,  1163,  1168,  1173,
-    1178,  1186,  1191,  1197,  1202,  1207,  1216,  1226,  1253,  1262,
-    1269,  1276,  1283,  1290,  1298,  1306,  1316,  1326,  1333,  1343,
-    1349,  1352,  1359,  1363,  1367,  1375,  1384,  1387,  1398,  1401,
-    1404,  1408,  1412,  1416,  1420,  1423,  1428,  1432,  1437,  1445,
-    1449,  1454,  1460,  1466,  1473,  1478,  1483,  1491,  1496,  1508,
-    1522,  1528,  1533,  1541,  1549,  1557,  1565,  1573,  1581,  1589,
-    1597,  1605,  1613,  1620,  1627,  1631,  1636,  1641,  1646,  1651,
-    1656,  1661,  1665,  1669,  1673,  1677,  1681,  1687,  1693,  1703,
-    1710,  1713,  1721,  1728,  1739,  1744,  1752,  1756,  1766,  1769,
-    1775,  1781,  1787,  1795,  1805,  1809,  1813,  1817,  1822,  1826,
-    1831,  1836,  1841,  1846,  1851,  1856,  1861,  1866,  1871,  1877,
-    1883,  1889,  1894,  1899,  1904,  1909,  1914,  1919,  1924,  1929,
-    1934,  1939,  1944,  1949,  1956,  1961,  1966,  1971,  1976,  1981,
-    1986,  1991,  1996,  2001,  2006,  2011,  2016,  2021,  2026,  2034,
-    2042,  2050,  2056,  2062,  2068,  2074,  2080,  2086,  2092,  2098,
-    2104,  2110,  2116,  2122,  2128,  2134,  2140,  2146,  2152,  2158,
-    2164,  2170,  2176,  2182,  2188,  2194,  2200,  2206,  2212,  2218,
-    2224,  2230,  2236,  2242,  2248,  2254,  2260,  2266,  2272,  2278,
-    2284,  2290,  2296,  2302,  2310,  2318,  2326,  2334,  2342,  2350,
-    2358,  2366,  2374,  2382,  2390,  2398,  2404,  2410,  2416,  2422,
-    2428,  2434,  2440,  2446,  2452,  2458,  2464,  2470,  2476,  2482,
-    2488,  2494,  2500,  2506,  2512,  2518,  2524,  2530,  2536,  2542,
-    2548,  2554,  2560,  2566,  2572,  2578,  2584,  2590,  2596,  2602,
-    2608,  2614,  2618,  2622,  2626,  2631,  2636,  2641,  2646,  2651,
-    2656,  2661,  2666,  2671,  2676,  2681,  2686,  2691,  2696,  2702,
-    2708,  2714,  2720,  2726,  2732,  2738,  2744,  2750,  2756,  2762,
-    2768,  2774,  2779,  2784,  2789,  2794,  2799,  2804,  2809,  2814,
-    2819,  2824,  2829,  2834,  2839,  2844,  2849,  2854,  2859,  2864,
-    2869,  2874,  2879,  2884,  2889,  2894,  2899,  2904,  2909,  2914,
-    2919,  2924,  2929,  2934,  2939,  2945,  2951,  2956,  2961,  2966,
-    2972,  2977,  2982,  2987,  2993,  2998,  3003,  3008,  3014,  3019,
-    3024,  3029,  3035,  3041,  3047,  3053,  3058,  3064,  3070,  3076,
-    3081,  3086,  3091,  3096,  3101,  3107,  3112,  3117,  3122,  3128,
-    3133,  3138,  3143,  3149,  3154,  3159,  3164,  3170,  3175,  3180,
-    3185,  3191,  3196,  3201,  3206,  3212,  3217,  3222,  3227,  3233,
-    3238,  3243,  3248,  3254,  3259,  3264,  3269,  3275,  3280,  3285,
-    3290,  3296,  3301,  3306,  3311,  3317,  3322,  3327,  3332,  3338,
-    3343,  3348,  3353,  3359,  3364,  3369,  3374,  3380,  3385,  3390,
-    3395,  3401,  3406,  3411,  3416,  3421,  3426,  3431,  3436,  3441,
-    3446,  3451,  3456,  3461,  3466,  3471,  3476,  3481,  3486,  3491,
-    3496,  3501,  3506,  3511,  3516,  3521,  3527,  3533,  3539,  3545,
-    3551,  3557,  3563,  3570,  3577,  3583,  3589,  3595,  3601,  3608,
-    3615,  3622,  3629,  3634,  3639,  3643,  3649,  3655,  3659,  3663,
-    3667,  3672,  3688,  3693,  3698,  3706,  3706,  3723,  3723,  3733,
-    3736,  3749,  3771,  3798,  3802,  3808,  3813,  3824,  3827,  3833,
-    3839,  3848,  3851,  3857,  3861,  3862,  3868,  3869,  3870,  3871,
-    3872,  3873,  3874,  3875,  3879,  3887,  3888,  3892,  3888,  3906,
-    3907,  3911,  3911,  3918,  3918,  3932,  3935,  3945,  3953,  3964,
-    3965,  3969,  3972,  3979,  3986,  3990,  3998,  4002,  4011,  4014,
-    4021,  4021,  4041,  4044,  4050,  4062,  4074,  4077,  4085,  4085,
-    4104,  4104,  4126,  4126,  4147,  4150,  4156,  4159,  4165,  4169,
-    4176,  4181,  4186,  4193,  4196,  4200,  4204,  4208,  4217,  4221,
-    4230,  4233,  4236,  4244,  4244,  4286,  4291,  4294,  4299,  4302,
-    4307,  4310,  4315,  4318,  4323,  4326,  4331,  4334,  4339,  4343,
-    4348,  4352,  4357,  4361,  4368,  4371,  4376,  4379,  4382,  4385,
-    4388,  4393,  4402,  4413,  4418,  4426,  4430,  4435,  4439,  4444,
-    4448,  4453,  4457,  4464,  4467,  4472,  4475,  4478,  4481,  4486,
-    4489,  4494,  4500,  4503,  4506,  4509,  4514,  4518,  4523,  4527,
-    4532,  4536,  4543,  4546,  4551,  4554,  4559,  4562,  4568,  4571,
-    4576,  4579
+       0,   355,   355,   361,   364,   369,   372,   375,   379,   382,
+     385,   389,   393,   397,   401,   405,   409,   415,   422,   425,
+     428,   431,   434,   439,   447,   454,   461,   467,   471,   478,
+     481,   487,   505,   530,   538,   543,   570,   578,   584,   588,
+     592,   612,   613,   614,   615,   621,   622,   627,   632,   641,
+     642,   647,   655,   656,   662,   671,   672,   677,   682,   687,
+     695,   696,   705,   717,   718,   727,   728,   737,   738,   747,
+     748,   756,   757,   765,   766,   774,   775,   775,   793,   794,
+     810,   814,   818,   822,   827,   831,   835,   839,   843,   847,
+     851,   858,   861,   872,   879,   884,   891,   896,   901,   908,
+     912,   916,   920,   925,   930,   939,   939,   950,   954,   961,
+     966,   974,   982,   994,   997,  1004,  1017,  1040,  1063,  1078,
+    1103,  1114,  1124,  1134,  1144,  1153,  1156,  1160,  1164,  1169,
+    1177,  1182,  1187,  1192,  1197,  1206,  1216,  1243,  1252,  1259,
+    1266,  1273,  1280,  1288,  1296,  1306,  1316,  1323,  1333,  1339,
+    1342,  1349,  1353,  1357,  1365,  1374,  1377,  1388,  1391,  1394,
+    1398,  1402,  1406,  1410,  1413,  1418,  1422,  1427,  1435,  1439,
+    1444,  1450,  1456,  1463,  1468,  1473,  1481,  1486,  1498,  1512,
+    1518,  1523,  1531,  1539,  1547,  1555,  1563,  1571,  1579,  1587,
+    1595,  1602,  1609,  1613,  1618,  1623,  1628,  1633,  1638,  1643,
+    1647,  1651,  1655,  1659,  1665,  1671,  1681,  1688,  1691,  1699,
+    1706,  1717,  1722,  1730,  1734,  1744,  1747,  1753,  1759,  1765,
+    1773,  1783,  1787,  1791,  1795,  1800,  1804,  1809,  1814,  1819,
+    1824,  1829,  1834,  1839,  1844,  1849,  1855,  1861,  1867,  1872,
+    1877,  1882,  1887,  1892,  1897,  1902,  1907,  1912,  1917,  1922,
+    1927,  1934,  1939,  1944,  1949,  1954,  1959,  1964,  1969,  1974,
+    1979,  1984,  1989,  1997,  2005,  2013,  2019,  2025,  2031,  2037,
+    2043,  2049,  2055,  2061,  2067,  2073,  2079,  2085,  2091,  2097,
+    2103,  2109,  2115,  2121,  2127,  2133,  2139,  2145,  2151,  2157,
+    2163,  2169,  2175,  2181,  2187,  2193,  2199,  2205,  2211,  2219,
+    2227,  2235,  2243,  2251,  2259,  2267,  2275,  2283,  2291,  2299,
+    2307,  2313,  2319,  2325,  2331,  2337,  2343,  2349,  2355,  2361,
+    2367,  2373,  2379,  2385,  2391,  2397,  2403,  2409,  2415,  2421,
+    2427,  2433,  2439,  2445,  2451,  2457,  2463,  2469,  2475,  2481,
+    2487,  2493,  2499,  2505,  2511,  2517,  2523,  2527,  2531,  2535,
+    2540,  2545,  2550,  2555,  2560,  2565,  2570,  2575,  2580,  2585,
+    2590,  2595,  2600,  2605,  2611,  2617,  2623,  2629,  2635,  2641,
+    2647,  2653,  2659,  2665,  2671,  2677,  2683,  2688,  2693,  2698,
+    2703,  2708,  2713,  2718,  2723,  2728,  2733,  2738,  2743,  2748,
+    2753,  2758,  2763,  2768,  2773,  2778,  2783,  2788,  2793,  2798,
+    2803,  2808,  2813,  2818,  2823,  2828,  2833,  2838,  2843,  2848,
+    2854,  2860,  2865,  2870,  2875,  2881,  2886,  2891,  2896,  2902,
+    2907,  2912,  2917,  2923,  2928,  2933,  2938,  2944,  2950,  2956,
+    2962,  2967,  2973,  2979,  2985,  2990,  2995,  3000,  3005,  3010,
+    3016,  3021,  3026,  3031,  3037,  3042,  3047,  3052,  3058,  3063,
+    3068,  3073,  3079,  3084,  3089,  3094,  3100,  3105,  3110,  3115,
+    3121,  3126,  3131,  3136,  3142,  3147,  3152,  3157,  3163,  3168,
+    3173,  3178,  3184,  3189,  3194,  3199,  3205,  3210,  3215,  3220,
+    3226,  3231,  3236,  3241,  3247,  3252,  3257,  3262,  3268,  3273,
+    3278,  3283,  3289,  3294,  3299,  3304,  3310,  3315,  3320,  3325,
+    3330,  3335,  3340,  3345,  3350,  3355,  3360,  3365,  3370,  3375,
+    3380,  3385,  3390,  3395,  3400,  3405,  3410,  3415,  3420,  3425,
+    3430,  3436,  3442,  3448,  3454,  3460,  3466,  3472,  3479,  3486,
+    3492,  3498,  3504,  3510,  3517,  3524,  3531,  3538,  3542,  3546,
+    3551,  3567,  3572,  3577,  3585,  3585,  3602,  3602,  3612,  3615,
+    3628,  3650,  3677,  3681,  3687,  3692,  3703,  3706,  3712,  3718,
+    3727,  3730,  3736,  3740,  3741,  3747,  3748,  3749,  3750,  3751,
+    3752,  3753,  3754,  3758,  3766,  3767,  3771,  3767,  3783,  3784,
+    3788,  3788,  3795,  3795,  3809,  3812,  3820,  3828,  3839,  3840,
+    3844,  3847,  3854,  3861,  3865,  3873,  3877,  3890,  3893,  3900,
+    3900,  3920,  3923,  3929,  3941,  3953,  3956,  3964,  3964,  3979,
+    3979,  3997,  3997,  4018,  4021,  4027,  4030,  4036,  4040,  4047,
+    4052,  4057,  4064,  4067,  4071,  4075,  4079,  4088,  4092,  4101,
+    4104,  4107,  4115,  4115,  4157,  4162,  4165,  4170,  4173,  4178,
+    4181,  4186,  4189,  4194,  4197,  4202,  4205,  4210,  4214,  4219,
+    4223,  4228,  4232,  4239,  4242,  4247,  4250,  4253,  4256,  4259,
+    4264,  4273,  4284,  4289,  4297,  4301,  4306,  4310,  4315,  4319,
+    4324,  4328,  4335,  4338,  4343,  4346,  4349,  4352,  4357,  4360,
+    4365,  4371,  4374,  4377,  4380,  4385,  4389,  4394,  4398,  4403,
+    4407,  4414,  4417,  4422,  4425,  4430,  4433,  4439,  4442,  4447,
+    4450
 };
 #endif
 
@@ -1281,38 +1257,35 @@ static const char *const yytname[] =
   "USAMPLER2DARRAY", "SAMPLER", "SAMPLERSHADOW", "TEXTURE2D", "TEXTURE3D",
   "TEXTURECUBE", "TEXTURE2DARRAY", "ITEXTURE2D", "ITEXTURE3D",
   "ITEXTURECUBE", "ITEXTURE2DARRAY", "UTEXTURE2D", "UTEXTURE3D",
-  "UTEXTURECUBE", "UTEXTURE2DARRAY", "ATTRIBUTE", "VARYING", "FLOATE5M2_T",
-  "FLOATE4M3_T", "BFLOAT16_T", "FLOAT16_T", "FLOAT32_T", "DOUBLE",
-  "FLOAT64_T", "INT64_T", "UINT64_T", "INT32_T", "UINT32_T", "INT16_T",
-  "UINT16_T", "INT8_T", "UINT8_T", "I64VEC2", "I64VEC3", "I64VEC4",
-  "U64VEC2", "U64VEC3", "U64VEC4", "I32VEC2", "I32VEC3", "I32VEC4",
-  "U32VEC2", "U32VEC3", "U32VEC4", "I16VEC2", "I16VEC3", "I16VEC4",
-  "U16VEC2", "U16VEC3", "U16VEC4", "I8VEC2", "I8VEC3", "I8VEC4", "U8VEC2",
-  "U8VEC3", "U8VEC4", "DVEC2", "DVEC3", "DVEC4", "DMAT2", "DMAT3", "DMAT4",
-  "BF16VEC2", "BF16VEC3", "BF16VEC4", "FE5M2VEC2", "FE5M2VEC3",
-  "FE5M2VEC4", "FE4M3VEC2", "FE4M3VEC3", "FE4M3VEC4", "F16VEC2", "F16VEC3",
-  "F16VEC4", "F16MAT2", "F16MAT3", "F16MAT4", "F32VEC2", "F32VEC3",
-  "F32VEC4", "F32MAT2", "F32MAT3", "F32MAT4", "F64VEC2", "F64VEC3",
-  "F64VEC4", "F64MAT2", "F64MAT3", "F64MAT4", "DMAT2X2", "DMAT2X3",
-  "DMAT2X4", "DMAT3X2", "DMAT3X3", "DMAT3X4", "DMAT4X2", "DMAT4X3",
-  "DMAT4X4", "F16MAT2X2", "F16MAT2X3", "F16MAT2X4", "F16MAT3X2",
-  "F16MAT3X3", "F16MAT3X4", "F16MAT4X2", "F16MAT4X3", "F16MAT4X4",
-  "F32MAT2X2", "F32MAT2X3", "F32MAT2X4", "F32MAT3X2", "F32MAT3X3",
-  "F32MAT3X4", "F32MAT4X2", "F32MAT4X3", "F32MAT4X4", "F64MAT2X2",
-  "F64MAT2X3", "F64MAT2X4", "F64MAT3X2", "F64MAT3X3", "F64MAT3X4",
-  "F64MAT4X2", "F64MAT4X3", "F64MAT4X4", "ATOMIC_UINT", "ACCSTRUCTNV",
-  "ACCSTRUCTEXT", "RAYQUERYEXT", "FCOOPMATNV", "ICOOPMATNV", "UCOOPMATNV",
-  "COOPMAT", "COOPVECNV", "HITOBJECTNV", "HITOBJECTATTRNV", "HITOBJECTEXT",
-  "HITOBJECTATTREXT", "TENSORLAYOUTNV", "TENSORVIEWNV", "TENSORARM",
-  "SAMPLERCUBEARRAY", "SAMPLERCUBEARRAYSHADOW", "ISAMPLERCUBEARRAY",
-  "USAMPLERCUBEARRAY", "SAMPLER1D", "SAMPLER1DARRAY",
-  "SAMPLER1DARRAYSHADOW", "ISAMPLER1D", "SAMPLER1DSHADOW", "SAMPLER2DRECT",
-  "SAMPLER2DRECTSHADOW", "ISAMPLER2DRECT", "USAMPLER2DRECT",
-  "SAMPLERBUFFER", "ISAMPLERBUFFER", "USAMPLERBUFFER", "SAMPLER2DMS",
-  "ISAMPLER2DMS", "USAMPLER2DMS", "SAMPLER2DMSARRAY", "ISAMPLER2DMSARRAY",
-  "USAMPLER2DMSARRAY", "SAMPLEREXTERNALOES", "SAMPLEREXTERNAL2DY2YEXT",
-  "ISAMPLER1DARRAY", "USAMPLER1D", "USAMPLER1DARRAY", "F16SAMPLER1D",
-  "F16SAMPLER2D", "F16SAMPLER3D", "F16SAMPLER2DRECT", "F16SAMPLERCUBE",
+  "UTEXTURECUBE", "UTEXTURE2DARRAY", "ATTRIBUTE", "VARYING", "FLOAT16_T",
+  "FLOAT32_T", "DOUBLE", "FLOAT64_T", "INT64_T", "UINT64_T", "INT32_T",
+  "UINT32_T", "INT16_T", "UINT16_T", "INT8_T", "UINT8_T", "I64VEC2",
+  "I64VEC3", "I64VEC4", "U64VEC2", "U64VEC3", "U64VEC4", "I32VEC2",
+  "I32VEC3", "I32VEC4", "U32VEC2", "U32VEC3", "U32VEC4", "I16VEC2",
+  "I16VEC3", "I16VEC4", "U16VEC2", "U16VEC3", "U16VEC4", "I8VEC2",
+  "I8VEC3", "I8VEC4", "U8VEC2", "U8VEC3", "U8VEC4", "DVEC2", "DVEC3",
+  "DVEC4", "DMAT2", "DMAT3", "DMAT4", "F16VEC2", "F16VEC3", "F16VEC4",
+  "F16MAT2", "F16MAT3", "F16MAT4", "F32VEC2", "F32VEC3", "F32VEC4",
+  "F32MAT2", "F32MAT3", "F32MAT4", "F64VEC2", "F64VEC3", "F64VEC4",
+  "F64MAT2", "F64MAT3", "F64MAT4", "DMAT2X2", "DMAT2X3", "DMAT2X4",
+  "DMAT3X2", "DMAT3X3", "DMAT3X4", "DMAT4X2", "DMAT4X3", "DMAT4X4",
+  "F16MAT2X2", "F16MAT2X3", "F16MAT2X4", "F16MAT3X2", "F16MAT3X3",
+  "F16MAT3X4", "F16MAT4X2", "F16MAT4X3", "F16MAT4X4", "F32MAT2X2",
+  "F32MAT2X3", "F32MAT2X4", "F32MAT3X2", "F32MAT3X3", "F32MAT3X4",
+  "F32MAT4X2", "F32MAT4X3", "F32MAT4X4", "F64MAT2X2", "F64MAT2X3",
+  "F64MAT2X4", "F64MAT3X2", "F64MAT3X3", "F64MAT3X4", "F64MAT4X2",
+  "F64MAT4X3", "F64MAT4X4", "ATOMIC_UINT", "ACCSTRUCTNV", "ACCSTRUCTEXT",
+  "RAYQUERYEXT", "FCOOPMATNV", "ICOOPMATNV", "UCOOPMATNV", "COOPMAT",
+  "HITOBJECTNV", "HITOBJECTATTRNV", "SAMPLERCUBEARRAY",
+  "SAMPLERCUBEARRAYSHADOW", "ISAMPLERCUBEARRAY", "USAMPLERCUBEARRAY",
+  "SAMPLER1D", "SAMPLER1DARRAY", "SAMPLER1DARRAYSHADOW", "ISAMPLER1D",
+  "SAMPLER1DSHADOW", "SAMPLER2DRECT", "SAMPLER2DRECTSHADOW",
+  "ISAMPLER2DRECT", "USAMPLER2DRECT", "SAMPLERBUFFER", "ISAMPLERBUFFER",
+  "USAMPLERBUFFER", "SAMPLER2DMS", "ISAMPLER2DMS", "USAMPLER2DMS",
+  "SAMPLER2DMSARRAY", "ISAMPLER2DMSARRAY", "USAMPLER2DMSARRAY",
+  "SAMPLEREXTERNALOES", "SAMPLEREXTERNAL2DY2YEXT", "ISAMPLER1DARRAY",
+  "USAMPLER1D", "USAMPLER1DARRAY", "F16SAMPLER1D", "F16SAMPLER2D",
+  "F16SAMPLER3D", "F16SAMPLER2DRECT", "F16SAMPLERCUBE",
   "F16SAMPLER1DARRAY", "F16SAMPLER2DARRAY", "F16SAMPLERCUBEARRAY",
   "F16SAMPLERBUFFER", "F16SAMPLER2DMS", "F16SAMPLER2DMSARRAY",
   "F16SAMPLER1DSHADOW", "F16SAMPLER2DSHADOW", "F16SAMPLER1DARRAYSHADOW",
@@ -1367,16 +1340,15 @@ static const char *const yytname[] =
   "TILEIMAGEEXT", "FLAT", "SMOOTH", "LAYOUT", "DOUBLECONSTANT",
   "INT16CONSTANT", "UINT16CONSTANT", "FLOAT16CONSTANT", "INT32CONSTANT",
   "UINT32CONSTANT", "INT64CONSTANT", "UINT64CONSTANT", "SUBROUTINE",
-  "DEMOTE", "FUNCTION", "PAYLOADNV", "PAYLOADINNV", "HITATTRNV",
-  "CALLDATANV", "CALLDATAINNV", "PAYLOADEXT", "PAYLOADINEXT", "HITATTREXT",
+  "DEMOTE", "PAYLOADNV", "PAYLOADINNV", "HITATTRNV", "CALLDATANV",
+  "CALLDATAINNV", "PAYLOADEXT", "PAYLOADINEXT", "HITATTREXT",
   "CALLDATAEXT", "CALLDATAINEXT", "PATCH", "SAMPLE", "NONUNIFORM",
   "COHERENT", "VOLATILE", "RESTRICT", "READONLY", "WRITEONLY",
-  "NONTEMPORAL", "DEVICECOHERENT", "QUEUEFAMILYCOHERENT",
-  "WORKGROUPCOHERENT", "SUBGROUPCOHERENT", "NONPRIVATE",
-  "SHADERCALLCOHERENT", "NOPERSPECTIVE", "EXPLICITINTERPAMD",
-  "PERVERTEXEXT", "PERVERTEXNV", "PERPRIMITIVENV", "PERVIEWNV",
-  "PERTASKNV", "PERPRIMITIVEEXT", "TASKPAYLOADWORKGROUPEXT", "PRECISE",
-  "$accept", "variable_identifier", "primary_expression",
+  "DEVICECOHERENT", "QUEUEFAMILYCOHERENT", "WORKGROUPCOHERENT",
+  "SUBGROUPCOHERENT", "NONPRIVATE", "SHADERCALLCOHERENT", "NOPERSPECTIVE",
+  "EXPLICITINTERPAMD", "PERVERTEXEXT", "PERVERTEXNV", "PERPRIMITIVENV",
+  "PERVIEWNV", "PERTASKNV", "PERPRIMITIVEEXT", "TASKPAYLOADWORKGROUPEXT",
+  "PRECISE", "$accept", "variable_identifier", "primary_expression",
   "postfix_expression", "integer_expression", "function_call",
   "function_call_or_method", "function_call_generic",
   "function_call_header_no_parameters",
@@ -1435,12 +1407,12 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 }
 #endif
 
-#define YYPACT_NINF (-894)
+#define YYPACT_NINF (-872)
 
 #define yypact_value_is_default(Yyn) \
   ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF (-716)
+#define YYTABLE_NINF (-695)
 
 #define yytable_value_is_error(Yyn) \
   0
@@ -1449,103 +1421,101 @@ yysymbol_name (yysymbol_kind_t yysymbol)
    STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    4827,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -305,  -284,  -273,  -250,
-    -220,  -203,  -187,  -131,  -894,  -894,  -894,  -894,  -894,  -227,
-    -894,  -894,  -894,  -894,  -894,   -59,  -894,  -894,  -894,  -894,
-    -894,  -328,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -102,
-    -100,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -342,  -217,
-    -319,  -177,  8683,  -225,  -894,  -153,  -894,  -894,  -894,  -894,
-    5791,  -894,  -894,  -894,  -894,  -106,  -894,  -894,   971,  -894,
-    -894,  8683,   -92,  -894,  -894,  -894,  6273,  -128,  -219,  -156,
-    -155,  -127,  -123,  -128,  -119,   -75, 13295,  -894,   -68,  -369,
-     -64,  -894,  -330,  -894,   -41,   -22,  6755,  -894,  -894,  -894,
-    8683,   -55,   -54,  -894,  -285,  -894,   -21,  -140,  -894,  -894,
-   11918,   -18,  -894,  -894,  -894,   -16,   -50,  8683,  -894,   -23,
-     -20,   -19,  -894,  -318,  -894,  -259,   -17,   -14,   -13,   -12,
-    -231,   -11,   -10,    -9,    -8,    -7,    -5,  -230,     6,    -4,
-       8,  -322,  -894,    -1,  8683,  -894,    -3,  -894,  -228,  -894,
-    -894,  -212, 10082,  -894,  -323,  1453,  -894,  -894,   -15,  -894,
-    -894,  -894,  -281,  -256,  -894, 10541,  -255,  -894,   -46,  -894,
-   11918, 11918,  -894, 11918,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -316,  -894,  -894,  -894,    10,  -209, 12377,
-      12,  -894, 11918,  -894,    13,  -294,     3,   -22,    14,  -894,
-    -341,  -128,  -894,    -6,  -894,  -329,    15,  -117, 11918,  -110,
-    -894,  -139,  -109,  -148,  -108,    16,  -104,  -128,  -894, 12836,
-    -894,  -103, 11918,    17,   -75,  -894,  8683,    -2,  7237,  -894,
-    8683, 11918,  -894,  -369,  -894,     1,  -894,  -894,  -126,  -251,
-    -234,  -320,  -130,     7,    11,    21,    30,    31,  -321,    18,
-    -894, 11000,  -894,    19,  -894,  -894,    22,    23,    25,  -894,
-      27,    28,    32, 11459,    43, 11918,    37,    36,    39,    40,
-      41,  -257,  -894,  -894,  -136,  -894,  -217,    53,    13,  -894,
-    -894,  -894,  -894,  -894,  1935,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  5309,    48, 10541,     3, 10541,  -243,
-    9164,  -894,  -894, 10541,  8683,  -894,  -894,  -894,  -207,  -894,
-    -894, 11918,    26,  -894,  -894, 11918,    68,  -894,  -894,  -894,
-   11918,  -894,  -894,  -894,  -326,  -894,  -894,  -200,    61,  -894,
-    -894,  -894,  -894,  -894,  -894,  -199,  -894,  -196,  -894,  -894,
-    -195,    24,  -894,  -894,  -894,  -894,  -192,  -894,  -175,  -894,
-    -894,  -894,  -894,  -894,  -174,  -894,    64,  -894,  -173,    67,
-    -170,    61,  -894,  -289,  -166,  -894,    74,    76,  -894,  -894,
-      -2,   -18,   -73,  -894,  -894,  -894,  7719,  -894,  -894,  -894,
-   11918, 11918, 11918, 11918, 11918, 11918, 11918, 11918, 11918, 11918,
-   11918, 11918, 11918, 11918, 11918, 11918, 11918, 11918, 11918,  -894,
-    -894,  -894,    20,  -894,  2417,  -894,  -894,  -894,  2417,  -894,
-   11918,  -894,  -894,   -72, 11918,   -38,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894, 11918, 11918,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894, 10541,  -894,  -894,  -132,  -894,  8201,  -894,
-      77,    72,  -894,  -894,  -894,  -894,  -894,  -277,  -235,  -894,
-    -324,  -894,  -329,  -894,  -329,  -894, 11918, 11918,  -894,  -139,
-    -894,  -139,  -894,  -148,  -148,  -894,    82,    16,  -894, 12836,
-    -894, 11918,  -894,  -894,   -45,     3,    -2,  -894,  -894,  -894,
-    -894,  -894,  -126,  -126,  -251,  -251,  -234,  -234,  -234,  -234,
-    -320,  -320,  -130,     7,    11,    21,    30,    31, 11918,  -894,
-    2417,  4345,   -26,  3863,  -163,  -894,  -162,  -894,  -894,  -894,
-    -894,  -894,  9623,  -894,  -894,  -894,    83,  -894,    52,  -894,
-    -161,  -894,  -159,  -894,  -158,  -894,  -154,  -894,  -151,  -150,
-    -894,  -894,  -894,   -33,    81,    72,    54,    87,    89,  -894,
-    -894,  4345,    90,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894, 11918,  -894,    84,  2899, 11918,  -894,
-      85,    97,    55,    96,  3381,  -894,    98,  -894, 10541,  -894,
-    -894,  -894,  -149, 11918,  2899,    90,  -894,  -894,  2417,  -894,
-      91,    72,  -894,  -894,  2417,    86,  -894,  -894
+    4648,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -305,  -301,
+    -289,  -276,  -246,  -238,  -227,  -182,  -872,  -872,  -872,  -872,
+    -872,  -168,  -872,  -872,  -872,  -872,  -872,   -55,  -872,  -872,
+    -872,  -872,  -872,  -319,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -135,  -120,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -327,  -114,
+     -81,  -124,  7882,  -313,  -872,  -101,  -872,  -872,  -872,  -872,
+    5572,  -872,  -872,  -872,  -872,   -94,  -872,  -872,   952,  -872,
+    -872,  7882,   -73,  -872,  -872,  -872,  6034,   -78,  -252,  -250,
+    -216,  -197,  -136,   -78,  -127,   -49, 12303,  -872,   -13,  -346,
+     -39,  -872,  -309,  -872,   -10,    -9,  7882,  -872,  -872,  -872,
+    7882,   -38,   -37,  -872,  -267,  -872,  -236,  -872,  -872, 10983,
+      -2,  -872,  -872,  -872,     3,   -35,  7882,  -872,    -8,    -6,
+      -1,  -872,  -256,  -872,  -255,    -4,     4,     7,     8,  -237,
+      10,    11,    13,    14,    15,    18,  -232,     9,    19,    27,
+    -188,  -872,    -3,  7882,  -872,    20,  -872,  -229,  -872,  -872,
+    -219,  9223,  -872,  -272,  1414,  -872,  -872,  -872,  -872,  -872,
+      -2,  -277,  -872,  9663,  -265,  -872,   -23,  -872,  -112, 10983,
+   10983,  -872, 10983,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -253,  -872,  -872,  -872,    29,  -204, 11423,    28,
+    -872, 10983,  -872,    31,  -321,    17,    -9,    32,  -872,  -325,
+     -78,  -872,     5,  -872,  -330,    33,  -125, 10983,  -123,  -872,
+    -130,  -119,  -146,  -118,    34,  -103,   -78,  -872, 11863,  -872,
+     -74, 10983,    36,   -49,  -872,  7882,    24,  6496,  -872,  7882,
+   10983,  -872,  -346,  -872,    30,  -872,  -872,   -33,  -133,  -105,
+    -303,   -11,   -14,    21,    23,    48,    52,  -316,    41,  -872,
+   10103,  -872,    42,  -872,  -872,    46,    38,    40,  -872,    64,
+      67,    60, 10543,    74, 10983,    68,    65,    69,    70,    73,
+    -167,  -872,  -872,   -47,  -872,  -114,    77,    31,  -872,  -872,
+    -872,  -872,  -872,  1876,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  5110,    17,  9663,  -261,  8343,  -872,  -872,
+    9663,  7882,  -872,    50,  -872,  -872,  -872,  -203,  -872,  -872,
+   10983,    51,  -872,  -872, 10983,    87,  -872,  -872,  -872, 10983,
+    -872,  -872,  -872,  -312,  -872,  -872,  -200,    80,  -872,  -872,
+    -872,  -872,  -872,  -872,  -199,  -872,  -196,  -872,  -872,  -195,
+      71,  -872,  -872,  -872,  -872,  -169,  -872,  -164,  -872,  -872,
+    -872,  -872,  -872,  -161,  -872,    83,  -872,  -160,    84,  -153,
+      80,  -872,  -278,  -152,  -872,    91,    94,  -872,  -872,    24,
+      -2,   -43,  -872,  -872,  -872,  6958,  -872,  -872,  -872, 10983,
+   10983, 10983, 10983, 10983, 10983, 10983, 10983, 10983, 10983, 10983,
+   10983, 10983, 10983, 10983, 10983, 10983, 10983, 10983,  -872,  -872,
+    -872,    93,  -872,  2338,  -872,  -872,  -872,  2338,  -872, 10983,
+    -872,  -872,   -42, 10983,   -32,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872, 10983, 10983,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    9663,  -872,  -872,   -76,  -872,  7420,  -872,  -872,    96,    95,
+    -872,  -872,  -872,  -872,  -872,  -132,  -131,  -872,  -311,  -872,
+    -330,  -872,  -330,  -872, 10983, 10983,  -872,  -130,  -872,  -130,
+    -872,  -146,  -146,  -872,   101,    34,  -872, 11863,  -872, 10983,
+    -872,  -872,   -41,    17,    24,  -872,  -872,  -872,  -872,  -872,
+     -33,   -33,  -133,  -133,  -105,  -105,  -105,  -105,  -303,  -303,
+     -11,   -14,    21,    23,    48,    52, 10983,  -872,  2338,  4186,
+      59,  3724,  -151,  -872,  -150,  -872,  -872,  -872,  -872,  -872,
+    8783,  -872,  -872,  -872,   105,  -872,    72,  -872,  -149,  -872,
+    -148,  -872,  -141,  -872,  -140,  -872,  -139,  -138,  -872,  -872,
+    -872,   -28,   102,    95,    75,   107,   106,  -872,  -872,  4186,
+     108,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872, 10983,  -872,   100,  2800, 10983,  -872,   104,   109,
+      76,   112,  3262,  -872,   113,  -872,  9663,  -872,  -872,  -872,
+    -137, 10983,  2800,   108,  -872,  -872,  2338,  -872,   110,    95,
+    -872,  -872,  2338,   114,  -872,  -872
 };
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1553,141 +1523,139 @@ static const yytype_int16 yypact[] =
    means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
-       0,   169,   228,   226,   227,   225,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   229,   230,   231,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     366,   367,   368,   369,   370,   371,   372,   392,   393,   394,
-     395,   396,   397,   398,   407,   420,   421,   408,   409,   411,
-     410,   412,   413,   414,   415,   416,   417,   418,   419,   178,
-     179,   255,   256,   254,   257,   258,   253,   259,   266,   267,
-     264,   265,   262,   263,   260,   261,   298,   299,   300,   310,
-     311,   312,   295,   296,   297,   307,   308,   309,   292,   293,
-     294,   304,   305,   306,   289,   290,   291,   301,   302,   303,
-     268,   269,   270,   313,   314,   315,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   325,   326,
-     327,   283,   284,   285,   337,   338,   339,   286,   287,   288,
-     349,   350,   351,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   328,   329,   330,   331,   332,   333,   334,   335,
-     336,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     352,   353,   354,   355,   356,   357,   358,   359,   360,   364,
-     361,   362,   363,   548,   549,   550,   551,   555,   558,   183,
-     559,   184,   552,   553,   556,   376,   377,   400,   403,   365,
-     374,   375,   391,   373,   422,   423,   426,   427,   428,   430,
-     431,   432,   434,   435,   436,   438,   439,   535,   536,   399,
-     401,   402,   378,   379,   380,   424,   381,   385,   386,   389,
-     429,   433,   437,   382,   383,   387,   388,   425,   384,   390,
-     469,   471,   472,   473,   475,   476,   477,   479,   480,   481,
-     483,   484,   485,   487,   488,   489,   491,   492,   493,   495,
-     496,   497,   499,   500,   501,   503,   504,   505,   507,   508,
-     509,   511,   512,   470,   474,   478,   482,   486,   494,   498,
-     502,   490,   506,   510,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   404,   405,   406,   440,
-     449,   451,   445,   450,   452,   453,   455,   456,   457,   459,
-     460,   461,   463,   464,   465,   467,   468,   441,   442,   443,
-     454,   444,   446,   447,   448,   458,   462,   466,   540,   541,
-     544,   545,   546,   547,   542,   543,     0,     0,     0,     0,
-       0,     0,     0,     0,   167,   168,   537,   538,   539,     0,
-     652,   138,   562,   563,   564,     0,   561,   173,   171,   172,
-     170,     0,   224,   174,   176,   177,   175,   140,   139,     0,
-     206,   554,   186,   188,   182,   190,   192,   187,   189,   185,
-     191,   193,   180,   181,   209,   194,   201,   202,   203,   204,
-     205,   195,   196,   197,   198,   199,   200,   141,   142,   144,
-     143,   145,   147,   148,   146,   208,   155,   651,     0,   653,
-       0,   113,   112,     0,   126,   131,   162,   161,   159,   163,
-       0,   156,   158,   164,   136,   219,   160,   560,     0,   648,
-     650,     0,     0,   165,   166,   557,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   567,     0,     0,
-       0,    99,     0,    94,     0,   108,     0,   122,   114,   124,
-       0,   125,     0,    97,   132,   102,   106,     0,   157,   137,
-       0,   212,   218,     1,   649,     0,     0,     0,    96,     0,
-       0,     0,   660,     0,   718,     0,     0,     0,     0,     0,
+       0,   168,   225,   223,   224,   222,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   226,   227,   228,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     351,   352,   353,   354,   355,   356,   357,   377,   378,   379,
+     380,   381,   382,   383,   392,   405,   406,   393,   394,   396,
+     395,   397,   398,   399,   400,   401,   402,   403,   404,   177,
+     178,   251,   252,   250,   253,   260,   261,   258,   259,   256,
+     257,   254,   255,   283,   284,   285,   295,   296,   297,   280,
+     281,   282,   292,   293,   294,   277,   278,   279,   289,   290,
+     291,   274,   275,   276,   286,   287,   288,   262,   263,   264,
+     298,   299,   300,   265,   266,   267,   310,   311,   312,   268,
+     269,   270,   322,   323,   324,   271,   272,   273,   334,   335,
+     336,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   325,
+     326,   327,   328,   329,   330,   331,   332,   333,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,   349,   346,   347,
+     348,   533,   534,   535,   536,   538,   182,   361,   362,   385,
+     388,   350,   359,   360,   376,   358,   407,   408,   411,   412,
+     413,   415,   416,   417,   419,   420,   421,   423,   424,   520,
+     521,   384,   386,   387,   363,   364,   365,   409,   366,   370,
+     371,   374,   414,   418,   422,   367,   368,   372,   373,   410,
+     369,   375,   454,   456,   457,   458,   460,   461,   462,   464,
+     465,   466,   468,   469,   470,   472,   473,   474,   476,   477,
+     478,   480,   481,   482,   484,   485,   486,   488,   489,   490,
+     492,   493,   494,   496,   497,   455,   459,   463,   467,   471,
+     479,   483,   487,   475,   491,   495,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
+     512,   513,   514,   515,   516,   517,   518,   519,   389,   390,
+     391,   425,   434,   436,   430,   435,   437,   438,   440,   441,
+     442,   444,   445,   446,   448,   449,   450,   452,   453,   426,
+     427,   428,   439,   429,   431,   432,   433,   443,   447,   451,
+     525,   526,   529,   530,   531,   532,   527,   528,     0,     0,
+       0,     0,     0,     0,     0,     0,   166,   167,   522,   523,
+     524,     0,   631,   137,   541,   542,   543,     0,   540,   172,
+     170,   171,   169,     0,   221,   173,   175,   176,   174,   139,
+     138,     0,   203,   184,   186,   181,   188,   190,   185,   187,
+     183,   189,   191,   179,   180,   206,   192,   199,   200,   201,
+     202,   193,   194,   195,   196,   197,   198,   140,   141,   143,
+     142,   144,   146,   147,   145,   205,   154,   630,     0,   632,
+       0,   114,   113,     0,   125,   130,   161,   160,   158,   162,
+       0,   155,   157,   163,   135,   216,   159,   539,     0,   627,
+     629,     0,     0,   164,   165,   537,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   546,     0,     0,
+       0,    99,     0,    94,     0,   109,     0,   121,   115,   123,
+       0,   124,     0,    97,   131,   102,     0,   156,   136,     0,
+     209,   215,     1,   628,     0,     0,     0,    96,     0,     0,
+       0,   639,     0,   697,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   637,
+       0,   635,     0,     0,   544,   151,   153,     0,   149,   207,
+       0,     0,   100,     0,     0,   633,   110,   116,   120,   122,
+     118,   126,   117,     0,   132,   105,     0,   103,     0,     0,
+       0,     9,     0,    43,    42,    44,    41,     5,     6,     7,
+       8,     2,    16,    14,    15,    17,    10,    11,    12,    13,
+       3,    18,    37,    20,    25,    26,     0,     0,    30,     0,
+     219,     0,    36,   218,     0,   210,   111,     0,    95,     0,
+       0,   695,     0,   647,     0,     0,     0,     0,     0,   664,
+       0,     0,     0,     0,     0,     0,     0,   689,     0,   662,
+       0,     0,     0,     0,    98,     0,     0,     0,   548,     0,
+       0,   148,     0,   204,     0,   211,    45,    49,    52,    55,
+      60,    63,    65,    67,    69,    71,    73,    75,     0,    34,
+       0,   101,   575,   584,   588,     0,     0,     0,   609,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     658,     0,   656,     0,     0,   565,   152,   154,     0,   150,
-     210,     0,     0,   100,     0,     0,   654,   109,     0,   115,
-     121,   123,   118,   127,   117,     0,   133,   104,     0,   103,
-       0,     0,     9,     0,    43,    42,    44,    41,     5,     6,
-       7,     8,     2,    16,    14,    15,    17,    10,    11,    12,
-      13,     3,    18,    37,    20,    25,    26,     0,     0,    30,
-       0,   222,     0,    36,   221,     0,   213,   110,     0,    95,
-       0,     0,   716,     0,   668,     0,     0,     0,     0,     0,
-     685,     0,     0,     0,     0,     0,     0,     0,   710,     0,
-     683,     0,     0,     0,     0,    98,     0,     0,     0,   569,
-       0,     0,   149,     0,   207,     0,   214,    45,    49,    52,
-      55,    60,    63,    65,    67,    69,    71,    73,    75,     0,
-      34,     0,   101,   596,   605,   609,     0,     0,     0,   630,
+      45,    78,    91,     0,   562,     0,   163,   135,   565,   586,
+     564,   572,   563,     0,   566,   567,   590,   568,   597,   569,
+     570,   605,   571,     0,   119,     0,   127,     0,   556,   134,
+       0,     0,   107,     0,   104,    38,    39,     0,    22,    23,
+       0,     0,    28,    27,     0,   221,    31,    33,    40,     0,
+     217,   112,   699,     0,   700,   640,     0,     0,   698,   659,
+     655,   656,   657,   658,     0,   653,     0,    93,   660,     0,
+       0,   674,   675,   676,   677,     0,   672,     0,   681,   682,
+     683,   684,   680,     0,   678,     0,   685,     0,     0,     0,
+       2,   693,   216,     0,   691,     0,     0,   634,   636,     0,
+     554,     0,   552,   547,   549,     0,   152,   150,   208,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    45,    78,    91,     0,   583,     0,   164,   136,   586,
-     607,   585,   593,   584,     0,   587,   588,   611,   589,   618,
-     590,   591,   626,   592,     0,     0,     0,   119,     0,   128,
-       0,   577,   135,     0,     0,   107,    38,    39,     0,    22,
-      23,     0,     0,    28,    27,     0,   224,    31,    33,    40,
-       0,   220,   111,   720,     0,   721,   661,     0,     0,   719,
-     680,   676,   677,   678,   679,     0,   674,     0,    93,   681,
-       0,     0,   695,   696,   697,   698,     0,   693,     0,   702,
-     703,   704,   705,   701,     0,   699,     0,   706,     0,     0,
-       0,     2,   714,   219,     0,   712,     0,     0,   655,   657,
-       0,   575,     0,   573,   568,   570,     0,   153,   151,   211,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    76,
-     215,   216,     0,   595,     0,   628,   641,   640,     0,   632,
-       0,   644,   642,     0,     0,     0,   625,   645,   646,   647,
-     594,    81,    82,    84,    83,    86,    87,    88,    89,    90,
-      85,    80,     0,     0,   610,   606,   608,   612,   619,   627,
-     116,   120,   130,     0,   580,   581,     0,   134,     0,     4,
-       0,    24,    21,    32,   223,   664,   666,     0,     0,   717,
-       0,   670,     0,   669,     0,   672,     0,     0,   687,     0,
-     686,     0,   689,     0,     0,   691,     0,     0,   711,     0,
-     708,     0,   684,   659,     0,   576,     0,   571,   566,    46,
-      47,    48,    51,    50,    53,    54,    58,    59,    56,    57,
-      61,    62,    64,    66,    68,    70,    72,    74,     0,   217,
-     597,     0,     0,     0,     0,   643,     0,   624,    79,    92,
-     129,   578,     0,   105,    19,   662,     0,   663,     0,   675,
-       0,   682,     0,   694,     0,   700,     0,   707,     0,     0,
-     713,   572,   574,     0,     0,   616,     0,     0,     0,   635,
-     634,   637,   603,   620,   579,   582,   665,   667,   671,   673,
-     688,   690,   692,   709,     0,   598,     0,     0,     0,   636,
-       0,     0,   615,     0,     0,   613,     0,    77,     0,   600,
-     629,   599,     0,   638,     0,   603,   602,   604,   622,   617,
-       0,   639,   633,   614,   623,     0,   631,   621
+       0,     0,     0,     0,     0,     0,     0,     0,    76,   212,
+     213,     0,   574,     0,   607,   620,   619,     0,   611,     0,
+     623,   621,     0,     0,     0,   604,   624,   625,   626,   573,
+      81,    82,    84,    83,    86,    87,    88,    89,    90,    85,
+      80,     0,     0,   589,   585,   587,   591,   598,   606,   129,
+       0,   559,   560,     0,   133,     0,   108,     4,     0,    24,
+      21,    32,   220,   643,   645,     0,     0,   696,     0,   649,
+       0,   648,     0,   651,     0,     0,   666,     0,   665,     0,
+     668,     0,     0,   670,     0,     0,   690,     0,   687,     0,
+     663,   638,     0,   555,     0,   550,   545,    46,    47,    48,
+      51,    50,    53,    54,    58,    59,    56,    57,    61,    62,
+      64,    66,    68,    70,    72,    74,     0,   214,   576,     0,
+       0,     0,     0,   622,     0,   603,    79,    92,   128,   557,
+       0,   106,    19,   641,     0,   642,     0,   654,     0,   661,
+       0,   673,     0,   679,     0,   686,     0,     0,   692,   551,
+     553,     0,     0,   595,     0,     0,     0,   614,   613,   616,
+     582,   599,   558,   561,   644,   646,   650,   652,   667,   669,
+     671,   688,     0,   577,     0,     0,     0,   615,     0,     0,
+     594,     0,     0,   592,     0,    77,     0,   579,   608,   578,
+       0,   617,     0,   582,   581,   583,   601,   596,     0,   618,
+     612,   593,   602,     0,   610,   600
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -894,  -569,  -894,  -894,  -894,  -894,  -894,  -894,  -894,  -894,
-    -894,  -894,  -438,  -894,  -521,  -406,  -522,  -410,  -283,  -286,
-    -282,  -287,  -280,  -279,  -894,  -505,  -894,  -509,  -894,  -504,
-    -559,     4,  -894,  -894,  -894,     5,  -419,  -894,  -894,    33,
-      29,    34,  -894,  -894,  -430,  -894,  -894,  -894,  -894,  -122,
-    -894,  -409,  -394,  -894,     9,  -894,     0,  -453,  -894,  -894,
-    -894,  -579,   127,  -894,  -894,  -894,  -570,  -577,  -252,  -372,
-    -653,  -894,  -393,  -631,  -893,  -894,  -451,  -894,  -894,  -459,
-    -458,  -894,  -894,    42,  -749,  -385,  -894,  -165,  -894,  -421,
-    -894,  -157,  -894,  -894,  -894,  -894,  -147,  -894,  -894,  -894,
-    -894,  -894,  -894,  -894,  -894,    73,  -894,  -894,     2,  -894,
-     -91,  -246,  -449,  -894,  -894,  -894,  -332,  -327,  -331,  -894,
-    -894,  -333,  -325,  -335,  -317,  -337,  -894,  -338,  -315,  -894,
-    -415,  -565
+    -872,  -544,  -872,  -872,  -872,  -872,  -872,  -872,  -872,  -872,
+    -872,  -872,  -436,  -872,  -392,  -391,  -490,  -390,  -269,  -266,
+    -268,  -264,  -262,  -260,  -872,  -482,  -872,  -499,  -872,  -492,
+    -534,     6,  -872,  -872,  -872,     1,  -403,  -872,  -872,    45,
+      44,    49,  -872,  -872,  -406,  -872,  -872,  -872,  -872,  -104,
+    -872,  -389,  -375,  -872,    12,  -872,     0,  -433,  -872,  -872,
+    -872,  -553,   145,  -872,  -872,  -872,  -560,  -556,  -233,  -344,
+    -614,  -872,  -373,  -626,  -871,  -872,  -430,  -872,  -872,  -440,
+    -437,  -872,  -872,    63,  -737,  -363,  -872,  -144,  -872,  -399,
+    -872,  -142,  -872,  -872,  -872,  -872,  -134,  -872,  -872,  -872,
+    -872,  -872,  -872,  -872,  -872,    97,  -872,  -872,     2,  -872,
+     -71,  -308,  -416,  -872,  -872,  -872,  -304,  -307,  -302,  -872,
+    -872,  -315,  -310,  -306,  -300,  -314,  -872,  -299,  -317,  -872,
+    -395,  -538
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-       0,   551,   552,   553,   820,   554,   555,   556,   557,   558,
-     559,   560,   641,   562,   608,   609,   610,   611,   612,   613,
-     614,   615,   616,   617,   618,   642,   878,   643,   802,   644,
-     732,   645,   408,   674,   467,   646,   410,   411,   412,   457,
-     458,   459,   413,   414,   415,   416,   417,   418,   508,   509,
-     419,   420,   421,   422,   563,   511,   620,   514,   471,   472,
-     565,   425,   426,   427,   600,   504,   598,   599,   742,   743,
-     672,   816,   649,   650,   651,   652,   653,   774,   914,   950,
-     942,   943,   944,   951,   654,   655,   656,   657,   945,   917,
-     658,   659,   946,   965,   660,   661,   662,   881,   778,   883,
-     921,   940,   941,   663,   428,   429,   430,   454,   664,   501,
-     502,   481,   482,   827,   828,   432,   705,   706,   710,   433,
-     434,   716,   717,   724,   725,   728,   435,   734,   735,   436,
-     483,   484
+       0,   530,   531,   532,   798,   533,   534,   535,   536,   537,
+     538,   539,   620,   541,   587,   588,   589,   590,   591,   592,
+     593,   594,   595,   596,   597,   621,   856,   622,   781,   623,
+     711,   624,   388,   651,   508,   625,   390,   391,   392,   437,
+     438,   439,   393,   394,   395,   396,   397,   398,   487,   488,
+     399,   400,   401,   402,   542,   490,   599,   493,   450,   451,
+     544,   405,   406,   407,   579,   483,   577,   578,   721,   722,
+     649,   793,   628,   629,   630,   631,   632,   753,   892,   928,
+     920,   921,   922,   929,   633,   634,   635,   636,   923,   895,
+     637,   638,   924,   943,   639,   640,   641,   859,   757,   861,
+     899,   918,   919,   642,   408,   409,   410,   434,   643,   480,
+     481,   460,   461,   805,   806,   412,   684,   685,   689,   413,
+     414,   695,   696,   703,   704,   707,   415,   713,   714,   416,
+     462,   463
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1695,929 +1663,154 @@ static const yytype_int16 yydefgoto[] =
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-     424,   476,   431,   460,   407,   409,   476,   619,   699,   423,
-     733,   526,   475,   811,   723,   812,   671,   815,   566,   709,
-     817,   745,   477,   806,   699,   880,   468,   477,   497,   678,
-     746,   693,   561,   737,   694,   757,   758,   679,   680,   768,
-     506,   451,   747,   700,   949,   512,   825,   460,   693,   447,
-     687,   957,   621,   513,   593,   455,   572,   -35,   594,   681,
-     622,   949,   573,   682,   507,   695,   468,   452,   437,   667,
-     669,   759,   760,   708,   607,   769,   701,   702,   703,   704,
-     826,   448,   695,   468,   708,  -715,   690,   708,   524,   438,
-     512,  -715,   676,   677,   512,   596,   708,   525,   691,   895,
-     439,   666,   470,   896,   818,   791,   792,   793,   794,   795,
-     796,   797,   798,   799,   800,   574,   772,   755,   756,   512,
-     621,   575,   696,   440,   689,   801,   668,   673,   696,   783,
-     696,   785,   621,   696,   753,   696,   754,   696,   696,   813,
-     607,   897,   696,   580,   588,   898,   602,   882,   445,   581,
-     589,   607,   603,   441,   607,   462,   697,   671,   463,   671,
-     890,   671,   604,   607,   671,   684,   453,   819,   605,   745,
-     442,   685,   730,   803,   829,   831,   823,   821,   833,   835,
-     573,   832,   838,   607,   834,   836,   443,   485,   839,   596,
-     486,   596,   487,   489,   491,   493,   495,   496,   499,   840,
-     842,   845,   468,   456,   848,   841,   843,   846,   850,   964,
-     849,   922,   923,   928,   851,   929,   930,   803,   803,   832,
-     931,   836,   839,   932,   933,   960,   843,   761,   762,   846,
-     851,   803,   862,   863,   476,   866,   867,   868,   869,   925,
-     528,   745,   444,   529,   803,   475,   891,   804,   892,   806,
-     488,   490,   824,   486,   486,   477,   464,   719,   720,   721,
-     722,   542,   750,   751,   752,   596,   712,   713,   714,   715,
-     733,   449,   733,   450,   723,   723,   884,   901,   709,   492,
-     886,   480,   486,   494,   699,   470,   486,   498,   855,   707,
-     486,   478,   486,   888,   889,   959,   711,   718,   726,   486,
-     486,   486,   729,   736,   671,   486,   486,   856,   803,   505,
-     857,   885,   859,   860,   861,   607,   607,   607,   607,   607,
-     607,   607,   607,   607,   607,   607,   607,   607,   607,   607,
-     607,   708,   708,   806,   500,   856,   515,   596,   911,   352,
-     353,   354,   803,   887,   708,   510,   708,   803,   934,   864,
-     865,   870,   871,   349,   522,   523,   527,   512,   567,   568,
-     569,   571,   570,   675,   665,   576,   577,   578,   579,   582,
-     583,   584,   585,   586,   913,   587,   591,   915,   621,   601,
-     590,   592,   595,   671,   683,   688,   -34,   524,   727,   766,
-     694,   918,   767,   738,   770,   775,   879,   773,   607,   607,
-     779,   780,   763,   698,   837,   764,   776,   741,   777,   596,
-     749,   607,   461,   607,   765,   781,   784,   915,   786,   787,
-     469,   423,   788,   789,   790,   947,   -36,   810,   424,   423,
-     431,   424,   407,   409,   952,   822,   424,   423,   431,   671,
-     423,   479,   -29,   830,   844,   423,   503,   847,   852,   961,
-     853,   916,   803,   894,   907,   926,   461,   517,   927,   935,
-     461,   937,   938,   936,   967,   423,   948,  -601,   953,   423,
-     564,   954,   477,   623,   966,   958,   955,   469,   873,   875,
-     872,   748,   446,   874,   912,   519,   423,   876,   854,   877,
-     919,   916,   956,   520,   521,   962,   516,   963,   920,   807,
-     939,   474,   900,   739,   597,   899,   902,   808,   904,   906,
-     908,   909,   477,   423,   903,   648,     0,   809,     0,     0,
-       0,     0,     0,     0,   647,     0,   905,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   910,     0,     0,     0,
+     404,   389,   411,   440,   648,   455,   387,   785,   454,   598,
+     455,   504,   403,   540,   678,   712,   858,   545,   702,   725,
+     657,   724,   456,   688,   679,   447,   747,   456,   476,   672,
+     678,   789,   673,   792,   736,   737,   794,   716,   431,   666,
+     427,   669,   803,   672,   927,   485,   726,   440,   491,   442,
+     417,   935,   443,   670,   418,   586,   492,   680,   681,   682,
+     683,   927,   748,   674,   432,   447,   419,   644,   646,   486,
+     738,   739,   428,   655,   656,   687,   804,   674,  -694,   420,
+     491,   447,   658,   659,  -694,   600,   687,   645,   502,   687,
+     491,   795,   600,   601,   575,   449,   600,   503,   687,   650,
+     551,   553,   -35,   790,   660,   668,   552,   554,   661,   421,
+     466,   468,   470,   472,   474,   475,   478,   422,   751,   559,
+     762,   586,   764,   505,   567,   560,   506,   581,   423,   507,
+     568,   860,   586,   582,   675,   586,   464,   583,   467,   465,
+     675,   465,   675,   584,   586,   675,   648,   675,   648,   675,
+     675,   648,   663,   797,   675,   676,   807,   809,   664,   782,
+     811,   813,   552,   810,   586,   801,   812,   814,   799,   724,
+     572,   709,   469,   424,   573,   465,   868,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   816,   575,   425,
+     575,   471,   818,   817,   465,   820,   823,   780,   819,   942,
+     447,   821,   824,   826,   828,   900,   901,   906,   907,   827,
+     829,   782,   782,   810,   814,   908,   909,   910,   911,   938,
+     429,   817,   821,   824,   829,   782,   873,   875,   734,   735,
+     874,   876,   785,   802,   732,   430,   733,   455,   436,   724,
+     454,   698,   699,   700,   701,   521,   844,   845,   846,   847,
+     653,   433,   473,   654,   456,   465,   903,   691,   692,   693,
+     694,   477,   575,   686,   465,   690,   465,   862,   465,   697,
+     705,   864,   465,   465,   712,   435,   712,   702,   702,   449,
+     879,   688,   866,   867,   869,   708,   870,   833,   465,   678,
+     444,   648,   457,   837,   838,   839,   586,   586,   586,   586,
+     586,   586,   586,   586,   586,   586,   586,   586,   586,   586,
+     586,   586,   937,   459,   715,   782,   785,   465,   783,   834,
+     782,   834,   835,   863,   889,   334,   335,   336,   740,   741,
+     782,   865,   687,   687,   782,   912,   575,   729,   730,   731,
+     840,   841,   479,   842,   843,   687,   484,   687,   331,   494,
+     848,   849,   489,   500,   501,   491,   547,   548,   549,   546,
+     555,   550,   574,   742,   891,   569,   556,   893,   652,   557,
+     558,   648,   561,   562,   600,   563,   564,   565,   586,   586,
+     566,   570,   571,   667,   580,   662,   -34,   502,   706,   745,
+     673,   586,   441,   586,   717,   746,   677,   743,   744,   749,
+     448,   754,   752,   755,   403,   756,   575,   893,   404,   389,
+     411,   404,   403,   925,   387,   720,   404,   458,   411,   758,
+     403,   728,   759,   403,   930,   760,   482,   648,   403,   763,
+     766,   765,   -36,   815,   767,   768,   441,   496,   769,   939,
+     441,   796,   800,   -29,   808,   822,   825,   830,   403,   543,
+     831,   857,   403,   894,   872,   885,   448,   782,   896,   904,
+     905,   916,   913,   915,   926,   932,   914,  -580,   403,   931,
+     456,   602,   936,   850,   945,   944,   852,   851,   727,   933,
+     497,   853,   426,   576,   854,   498,   832,   855,   897,   499,
+     890,   934,   940,   894,   627,   403,   941,   495,   898,   786,
+     917,   787,   718,   877,   882,   453,   626,   881,   878,   788,
+     456,   886,   888,   880,     0,     0,   884,     0,     0,     0,
+       0,   883,     0,     0,     0,     0,     0,     0,   887,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   671,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   692,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   740,     0,   597,     0,
-     597,     0,     0,     0,     0,   423,     0,   423,     0,   423,
+       0,     0,     0,     0,     0,   719,     0,   576,     0,   576,
+       0,     0,     0,     0,     0,     0,     0,   403,     0,   403,
+       0,   403,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   648,     0,     0,     0,     0,     0,
-       0,     0,     0,   647,   424,     0,     0,     0,     0,     0,
-       0,     0,     0,   423,   597,     0,     0,     0,     0,     0,
-       0,     0,     0,   423,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   627,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   404,     0,   626,     0,     0,     0,     0,
+       0,   576,     0,     0,     0,   403,     0,     0,     0,     0,
+       0,     0,     0,   403,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   597,     0,     0,     0,
-       0,     0,     0,     0,     0,   423,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   576,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   403,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   648,     0,     0,     0,   648,     0,
-       0,     0,     0,   647,     0,     0,     0,   647,     0,     0,
+       0,     0,     0,   627,     0,     0,     0,   627,     0,     0,
+       0,     0,     0,     0,     0,   626,     0,     0,     0,   626,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   597,     0,
-       0,     0,     0,     0,     0,     0,     0,   423,     0,     0,
+       0,     0,     0,     0,     0,   576,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   403,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   627,   627,
+       0,   627,     0,   411,     0,     0,     0,     0,     0,     0,
+     626,   626,     0,   626,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     648,   648,     0,   648,     0,   431,     0,     0,     0,   647,
-     647,     0,   647,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   627,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   626,     0,     0,     0,   627,     0,     0,     0,     0,
+       0,     0,   627,     0,     0,     0,     0,   626,     0,     0,
+       0,     0,   627,     0,   626,     0,   627,     0,     0,     0,
+       0,     0,   627,     0,   626,     0,     0,     0,   626,     0,
+       0,     0,   452,     0,   626,     1,     2,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   648,     0,     0,     0,     0,     0,     0,     0,     0,
-     647,     0,     0,     0,     0,     0,     0,   648,     0,     0,
-       0,     0,     0,     0,   648,     0,   647,     0,     0,     0,
-       0,     0,     0,   647,   648,     0,     0,     0,   648,     0,
-       0,     0,     0,   647,   648,     0,     0,   647,     0,     0,
-       0,   473,     0,   647,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   331,
+       0,     0,     0,     0,     0,     0,     0,   332,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   349,     0,     0,     0,
-       0,     0,     0,     0,   350,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   351,   352,
-     353,   354,   355,     0,     0,     0,     0,     0,     0,     0,
-       0,   356,   357,   358,   359,   360,   361,   362,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-       0,     0,     0,     0,     0,     0,     0,     0,   370,     0,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,     0,     0,   530,   531,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   532,   533,     0,   349,     0,
-     623,   624,     0,     0,     0,     0,   625,   534,   535,   536,
-     537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     351,   352,   353,   354,   355,     0,     0,     0,   538,   539,
-     540,   541,   542,   356,   357,   358,   359,   360,   361,   362,
-     626,   627,   628,   629,     0,   630,   631,   632,   633,   634,
-     635,   636,   637,   638,   639,   363,   364,   365,   366,   367,
-     368,   369,   543,   544,   545,   546,   547,   548,   549,   550,
-     370,   640,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,     1,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,     0,     0,   530,   531,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   532,   533,     0,
-     349,     0,   623,   805,     0,     0,     0,     0,   625,   534,
-     535,   536,   537,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   351,   352,   353,   354,   355,     0,     0,     0,
-     538,   539,   540,   541,   542,   356,   357,   358,   359,   360,
-     361,   362,   626,   627,   628,   629,     0,   630,   631,   632,
-     633,   634,   635,   636,   637,   638,   639,   363,   364,   365,
-     366,   367,   368,   369,   543,   544,   545,   546,   547,   548,
-     549,   550,   370,   640,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,     0,     0,
-     530,   531,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   532,
-     533,     0,   349,     0,   623,     0,     0,     0,     0,     0,
-     625,   534,   535,   536,   537,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   351,   352,   353,   354,   355,     0,
-       0,     0,   538,   539,   540,   541,   542,   356,   357,   358,
-     359,   360,   361,   362,   626,   627,   628,   629,     0,   630,
-     631,   632,   633,   634,   635,   636,   637,   638,   639,   363,
-     364,   365,   366,   367,   368,   369,   543,   544,   545,   546,
-     547,   548,   549,   550,   370,   640,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,     1,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-       0,     0,   530,   531,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   532,   533,     0,   349,     0,   515,     0,     0,     0,
-       0,     0,   625,   534,   535,   536,   537,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   351,   352,   353,   354,
-     355,     0,     0,     0,   538,   539,   540,   541,   542,   356,
-     357,   358,   359,   360,   361,   362,   626,   627,   628,   629,
-       0,   630,   631,   632,   633,   634,   635,   636,   637,   638,
-     639,   363,   364,   365,   366,   367,   368,   369,   543,   544,
-     545,   546,   547,   548,   549,   550,   370,   640,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,     0,     0,   530,   531,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   532,   533,     0,   349,     0,     0,     0,
-       0,     0,     0,     0,   625,   534,   535,   536,   537,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   351,   352,
-     353,   354,   355,     0,     0,     0,   538,   539,   540,   541,
-     542,   356,   357,   358,   359,   360,   361,   362,   626,   627,
-     628,   629,     0,   630,   631,   632,   633,   634,   635,   636,
-     637,   638,   639,   363,   364,   365,   366,   367,   368,   369,
-     543,   544,   545,   546,   547,   548,   549,   550,   370,   640,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,     0,     0,   530,   531,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   532,   533,     0,   349,     0,
-       0,     0,     0,     0,     0,     0,   625,   534,   535,   536,
-     537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     351,   352,   353,   354,   355,     0,     0,     0,   538,   539,
-     540,   541,   542,   356,   357,   358,   359,   360,   361,   362,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,   543,   544,   545,   546,   547,   548,   549,   550,
-     370,     0,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,     1,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,     0,     0,     0,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,     0,     0,   530,   531,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   532,   533,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   534,
-     535,   536,   537,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   351,   352,   353,   354,     0,     0,     0,     0,
-     538,   539,   540,   541,   542,   356,   357,   358,   359,   360,
-     361,   362,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,   543,   544,   545,   546,   547,   548,
-     549,   550,   370,     0,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   349,     0,     0,     0,     0,     0,     0,     0,
-     350,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   351,   352,   353,   354,   355,     0,
-       0,     0,     0,     0,     0,     0,     0,   356,   357,   358,
-     359,   360,   361,   362,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   363,
-     364,   365,   366,   367,   368,   369,     0,     0,     0,     0,
-       0,     0,     0,     0,   370,     0,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,     1,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,     0,     0,     0,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   351,   352,   353,   354,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   356,
-     357,   358,   359,   360,   361,   362,   626,     0,     0,   629,
-       0,   630,   631,     0,     0,   634,     0,     0,     0,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,     0,     0,
-       0,     0,     0,     0,     0,     0,   370,     0,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,     0,
-       0,     0,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   465,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   351,   352,
-     353,   354,     0,     0,     0,     0,     0,     0,     0,     0,
-     466,   356,   357,   358,   359,   360,   361,   362,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-       0,     0,     0,     0,     0,     0,     0,     0,   370,     0,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,     0,     0,     0,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   349,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     351,   352,   353,   354,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   356,   357,   358,   359,   360,   361,   362,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,     0,     0,     0,     0,     0,     0,     0,     0,
-     370,     0,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,     1,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,     0,     0,     0,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   518,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   351,   352,   353,   354,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   356,   357,   358,   359,   360,
-     361,   362,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   363,   364,   365,
-     366,   367,   368,   369,     0,     0,     0,     0,     0,     0,
-       0,     0,   370,     0,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,     0,     0,     0,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   744,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   351,   352,   353,   354,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   356,   357,   358,
-     359,   360,   361,   362,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   363,
-     364,   365,   366,   367,   368,   369,     0,     0,     0,     0,
-       0,     0,     0,     0,   370,     0,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,     1,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,     0,     0,     0,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   858,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   351,   352,   353,   354,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   356,
-     357,   358,   359,   360,   361,   362,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   363,   364,   365,   366,   367,   368,   369,     0,     0,
-       0,     0,     0,     0,     0,     0,   370,     0,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,     0,
-       0,     0,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   893,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   351,   352,
-     353,   354,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   356,   357,   358,   359,   360,   361,   362,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   363,   364,   365,   366,   367,   368,   369,
-       0,     0,     0,     0,     0,     0,     0,     0,   370,     0,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,     0,     0,     0,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     351,   352,   353,   354,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   356,   357,   358,   359,   360,   361,   362,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   363,   364,   365,   366,   367,
-     368,   369,     0,     0,     0,     0,     0,     0,     0,     0,
-     370,     0,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,     2,     3,
+       0,   333,   334,   335,   336,   337,     0,     0,     0,     0,
+       0,     0,     0,     0,   338,   339,   340,   341,   342,   343,
+     344,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   345,   346,   347,   348,
+     349,   350,   351,     0,     0,     0,     0,     0,     0,     0,
+       0,   352,     0,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,     1,     2,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,     0,     0,    61,    62,    63,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
@@ -2629,7 +1822,7 @@ static const yytype_int16 yytable[] =
      144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
      154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,     0,   180,     0,   182,   183,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
      184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
      194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
      204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
@@ -2644,20 +1837,667 @@ static const yytype_int16 yytable[] =
      294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
      304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
      314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
-     334,   335,     0,     0,     0,     0,     0,     0,   342,     0,
-       0,     0,   346,   347,   348,     0,     0,   530,   531,     0,
+     324,   325,   326,   327,   328,   329,   330,     0,     0,   509,
+     510,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   511,   512,
+       0,   331,     0,   602,   603,     0,     0,     0,     0,   604,
+     513,   514,   515,   516,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   333,   334,   335,   336,   337,     0,     0,
+       0,   517,   518,   519,   520,   521,   338,   339,   340,   341,
+     342,   343,   344,   605,   606,   607,   608,     0,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   618,   345,   346,
+     347,   348,   349,   350,   351,   522,   523,   524,   525,   526,
+     527,   528,   529,   352,   619,   353,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,     1,
+       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,     0,
+       0,   509,   510,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   532,   533,     0,     0,
-       0,   670,   814,     0,     0,     0,     0,     0,   534,   535,
-     536,   537,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   538,
-     539,   540,   541,   542,   356,     0,     0,     0,     0,   361,
-     362,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     511,   512,     0,   331,     0,   602,   784,     0,     0,     0,
+       0,   604,   513,   514,   515,   516,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   333,   334,   335,   336,   337,
+       0,     0,     0,   517,   518,   519,   520,   521,   338,   339,
+     340,   341,   342,   343,   344,   605,   606,   607,   608,     0,
+     609,   610,   611,   612,   613,   614,   615,   616,   617,   618,
+     345,   346,   347,   348,   349,   350,   351,   522,   523,   524,
+     525,   526,   527,   528,   529,   352,   619,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,     0,     0,   509,   510,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   543,   544,   545,   546,   547,   548,   549,
-     550,     0,     0,   371,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   384,     2,     3,     4,
+       0,     0,   511,   512,     0,   331,     0,   602,     0,     0,
+       0,     0,     0,   604,   513,   514,   515,   516,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   333,   334,   335,
+     336,   337,     0,     0,     0,   517,   518,   519,   520,   521,
+     338,   339,   340,   341,   342,   343,   344,   605,   606,   607,
+     608,     0,   609,   610,   611,   612,   613,   614,   615,   616,
+     617,   618,   345,   346,   347,   348,   349,   350,   351,   522,
+     523,   524,   525,   526,   527,   528,   529,   352,   619,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,     1,     2,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,     0,     0,   509,   510,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   511,   512,     0,   331,     0,   494,
+       0,     0,     0,     0,     0,   604,   513,   514,   515,   516,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   333,
+     334,   335,   336,   337,     0,     0,     0,   517,   518,   519,
+     520,   521,   338,   339,   340,   341,   342,   343,   344,   605,
+     606,   607,   608,     0,   609,   610,   611,   612,   613,   614,
+     615,   616,   617,   618,   345,   346,   347,   348,   349,   350,
+     351,   522,   523,   524,   525,   526,   527,   528,   529,   352,
+     619,   353,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,     1,     2,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,     0,     0,   509,   510,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   511,   512,     0,   331,
+       0,     0,     0,     0,     0,     0,     0,   604,   513,   514,
+     515,   516,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   333,   334,   335,   336,   337,     0,     0,     0,   517,
+     518,   519,   520,   521,   338,   339,   340,   341,   342,   343,
+     344,   605,   606,   607,   608,     0,   609,   610,   611,   612,
+     613,   614,   615,   616,   617,   618,   345,   346,   347,   348,
+     349,   350,   351,   522,   523,   524,   525,   526,   527,   528,
+     529,   352,   619,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,     1,     2,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,     0,     0,   509,
+     510,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   511,   512,
+       0,   331,     0,     0,     0,     0,     0,     0,     0,   604,
+     513,   514,   515,   516,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   333,   334,   335,   336,   337,     0,     0,
+       0,   517,   518,   519,   520,   521,   338,   339,   340,   341,
+     342,   343,   344,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   345,   346,
+     347,   348,   349,   350,   351,   522,   523,   524,   525,   526,
+     527,   528,   529,   352,     0,   353,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,     1,
+       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,     0,     0,     0,   321,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,     0,
+       0,   509,   510,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     511,   512,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   513,   514,   515,   516,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   333,   334,   335,   336,     0,
+       0,     0,     0,   517,   518,   519,   520,   521,   338,   339,
+     340,   341,   342,   343,   344,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     345,   346,   347,   348,   349,   350,   351,   522,   523,   524,
+     525,   526,   527,   528,   529,   352,     0,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   331,     0,     0,     0,     0,
+       0,     0,     0,   332,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   333,   334,   335,
+     336,   337,     0,     0,     0,     0,     0,     0,     0,     0,
+     338,   339,   340,   341,   342,   343,   344,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   345,   346,   347,   348,   349,   350,   351,     0,
+       0,     0,     0,     0,     0,     0,     0,   352,     0,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,     1,     2,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+       0,     0,     0,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   333,
+     334,   335,   336,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   338,   339,   340,   341,   342,   343,   344,   605,
+       0,     0,   608,     0,   609,   610,     0,     0,   613,     0,
+       0,     0,     0,     0,   345,   346,   347,   348,   349,   350,
+     351,     0,     0,     0,     0,     0,     0,     0,     0,   352,
+       0,   353,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,     1,     2,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,     0,     0,     0,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   445,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   333,   334,   335,   336,     0,     0,     0,     0,     0,
+       0,     0,     0,   446,   338,   339,   340,   341,   342,   343,
+     344,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   345,   346,   347,   348,
+     349,   350,   351,     0,     0,     0,     0,     0,     0,     0,
+       0,   352,     0,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,     1,     2,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,     0,     0,     0,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   331,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   333,   334,   335,   336,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   338,   339,   340,   341,
+     342,   343,   344,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   345,   346,
+     347,   348,   349,   350,   351,     0,     0,     0,     0,     0,
+       0,     0,     0,   352,     0,   353,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,     1,
+       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,     0,     0,     0,   321,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   723,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   333,   334,   335,   336,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   338,   339,
+     340,   341,   342,   343,   344,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     345,   346,   347,   348,   349,   350,   351,     0,     0,     0,
+       0,     0,     0,     0,     0,   352,     0,   353,   354,   355,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
+     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
+     386,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,     0,     0,
+       0,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   836,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   333,   334,   335,
+     336,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     338,   339,   340,   341,   342,   343,   344,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   345,   346,   347,   348,   349,   350,   351,     0,
+       0,     0,     0,     0,     0,     0,     0,   352,     0,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,     1,     2,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+       0,     0,     0,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     871,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   333,
+     334,   335,   336,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   338,   339,   340,   341,   342,   343,   344,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   345,   346,   347,   348,   349,   350,
+     351,     0,     0,     0,     0,     0,     0,     0,     0,   352,
+       0,   353,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,     1,     2,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,     0,     0,     0,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   333,   334,   335,   336,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   338,   339,   340,   341,   342,   343,
+     344,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   345,   346,   347,   348,
+     349,   350,   351,     0,     0,     0,     0,     0,     0,     0,
+       0,   352,     0,   353,   354,   355,   356,   357,   358,   359,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+     380,   381,   382,   383,   384,   385,   386,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
@@ -2674,8 +2514,8 @@ static const yytype_int16 yytable[] =
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,     0,   180,     0,   182,   183,   184,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
      185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
      195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
      205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
@@ -2689,119 +2529,517 @@ static const yytype_int16 yytable[] =
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,     0,     0,     0,     0,     0,     0,   342,     0,     0,
-       0,   346,   347,   348,     0,     0,   530,   531,     0,     0,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   532,   533,     0,     0,     0,
-     670,   924,     0,     0,     0,     0,     0,   534,   535,   536,
-     537,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   538,   539,
-     540,   541,   542,   356,     0,     0,     0,     0,   361,   362,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,   647,   791,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,   647,   902,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,   585,     0,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,   647,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,   750,     0,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   761,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   521,   338,     0,     0,     0,     0,
+     343,   665,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,   509,   510,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   511,   512,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     517,   518,   519,   520,   710,   338,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   522,   523,   524,   525,   526,   527,
+     528,   529,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   365,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,     0,     0,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   324,
+       0,     0,     0,   328,   329,   330,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   543,   544,   545,   546,   547,   548,   549,   550,
-       0,     0,   371,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   384,     2,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,     0,     0,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,     0,   180,     0,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
-       0,     0,     0,     0,     0,     0,   342,     0,     0,     0,
-     346,   347,   348,     0,     0,   530,   531,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   532,   533,     0,     0,   606,     0,
-       0,     0,     0,     0,     0,     0,   534,   535,   536,   537,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   538,   539,   540,
-     541,   542,   356,     0,     0,     0,     0,   361,   362,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   543,   544,   545,   546,   547,   548,   549,   550,     0,
-       0,   371,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   384,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,     0,     0,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,     0,   180,     0,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,     0,
-       0,     0,     0,     0,     0,   342,     0,     0,     0,   346,
-     347,   348,     0,     0,   530,   531,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   532,   533,     0,     0,     0,   670,     0,
-       0,     0,     0,     0,     0,   534,   535,   536,   537,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   538,   539,   540,   541,
-     542,   356,     0,     0,     0,     0,   361,   362,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     543,   544,   545,   546,   547,   548,   549,   550,     0,     0,
-     371,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   384,     2,     3,     4,     5,     6,     7,
+       0,     0,     0,     0,     0,   338,     0,     0,     0,     0,
+     343,   344
+};
+
+static const yytype_int16 yycheck[] =
+{
+       0,     0,     0,   392,   503,   411,     0,   633,   411,   491,
+     416,   444,     0,   449,   552,   568,   753,   450,   562,   579,
+     512,   577,   411,   557,   354,   400,   342,   416,   423,   354,
+     568,   645,   357,   647,   337,   338,   650,   571,   365,   538,
+     359,   362,   354,   354,   915,   391,   580,   436,   357,   362,
+     355,   922,   365,   374,   355,   491,   365,   387,   388,   389,
+     390,   932,   378,   388,   391,   440,   355,   500,   501,   415,
+     373,   374,   391,   509,   510,   557,   388,   388,   356,   355,
+     357,   456,   335,   336,   362,   357,   568,   364,   355,   571,
+     357,   651,   357,   365,   483,   373,   357,   364,   580,   364,
+     356,   356,   355,   364,   357,   541,   362,   362,   361,   355,
+     418,   419,   420,   421,   422,   423,   424,   355,   600,   356,
+     612,   557,   614,   359,   356,   362,   362,   356,   355,   365,
+     362,   757,   568,   362,   550,   571,   388,   356,   388,   391,
+     556,   391,   558,   362,   580,   561,   645,   563,   647,   565,
+     566,   650,   356,   356,   570,   550,   356,   356,   362,   362,
+     356,   356,   362,   362,   600,   664,   362,   362,   660,   725,
+     358,   566,   388,   355,   362,   391,   790,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,   356,   577,   357,
+     579,   388,   356,   362,   391,   356,   356,   364,   362,   936,
+     575,   362,   362,   356,   356,   356,   356,   356,   356,   362,
+     362,   362,   362,   362,   362,   356,   356,   356,   356,   356,
+     355,   362,   362,   362,   362,   362,   358,   358,   333,   334,
+     362,   362,   858,   669,   367,   355,   369,   643,   362,   795,
+     643,   387,   388,   389,   390,   391,   736,   737,   738,   739,
+     362,   365,   388,   365,   643,   391,   870,   387,   388,   389,
+     390,   388,   651,   388,   391,   388,   391,   759,   391,   388,
+     388,   763,   391,   391,   827,   356,   829,   821,   822,   373,
+     814,   815,   781,   782,   360,   388,   362,   720,   391,   827,
+     391,   790,   365,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,   744,   745,
+     746,   747,   926,   391,   388,   362,   942,   391,   365,   362,
+     362,   362,   365,   365,   365,   380,   381,   382,   339,   340,
+     362,   363,   814,   815,   362,   363,   725,   370,   371,   372,
+     732,   733,   391,   734,   735,   827,   359,   829,   357,   359,
+     740,   741,   391,   391,   391,   357,   391,   365,   364,   356,
+     364,   362,   365,   377,   856,   356,   362,   859,   391,   362,
+     362,   870,   362,   362,   357,   362,   362,   362,   814,   815,
+     362,   362,   355,   355,   364,   356,   355,   355,   354,   341,
+     357,   827,   392,   829,   358,   343,   391,   376,   375,   358,
+     400,   355,   360,   365,   392,   365,   795,   899,   408,   408,
+     408,   411,   400,   912,   408,   391,   416,   416,   416,   355,
+     408,   391,   355,   411,   916,   365,   426,   926,   416,   355,
+     365,   363,   355,   362,   365,   365,   436,   435,   365,   931,
+     440,   391,   391,   356,   364,   362,   362,   356,   436,   449,
+     356,   358,   440,   859,   358,   354,   456,   362,   399,   354,
+     388,   355,   360,   356,   364,   356,   391,   359,   456,   365,
+     859,   359,   359,   742,   360,   365,   744,   743,   582,   403,
+     436,   745,   337,   483,   746,   440,   719,   747,   861,   440,
+     834,   921,   932,   899,   494,   483,   933,   434,   861,   643,
+     899,   643,   573,   810,   819,   408,   494,   817,   812,   643,
+     899,   825,   829,   815,    -1,    -1,   822,    -1,    -1,    -1,
+      -1,   821,    -1,    -1,    -1,    -1,    -1,    -1,   827,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   546,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   575,    -1,   577,    -1,   579,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   575,    -1,   577,
+      -1,   579,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   633,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   643,    -1,   633,    -1,    -1,    -1,    -1,
+      -1,   651,    -1,    -1,    -1,   643,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   651,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   725,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   725,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   753,    -1,    -1,    -1,   757,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   753,    -1,    -1,    -1,   757,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   795,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   795,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   858,   859,
+      -1,   861,    -1,   861,    -1,    -1,    -1,    -1,    -1,    -1,
+     858,   859,    -1,   861,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   899,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   899,    -1,    -1,    -1,   915,    -1,    -1,    -1,    -1,
+      -1,    -1,   922,    -1,    -1,    -1,    -1,   915,    -1,    -1,
+      -1,    -1,   932,    -1,   922,    -1,   936,    -1,    -1,    -1,
+      -1,    -1,   942,    -1,   932,    -1,    -1,    -1,   936,    -1,
+      -1,    -1,     0,    -1,   942,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
       48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,     0,     0,    61,    62,    63,    64,    65,    66,    67,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
       88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
@@ -2813,7 +3051,7 @@ static const yytype_int16 yytable[] =
      148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
      158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
      168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,     0,   180,     0,   182,   183,   184,   185,   186,   187,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
      188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
      198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
      208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
@@ -2828,163 +3066,118 @@ static const yytype_int16 yytable[] =
      298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
      308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,     0,     0,
-       0,     0,     0,     0,   342,     0,     0,     0,   346,   347,
-     348,     0,     0,   530,   531,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   532,   533,     0,     0,   771,     0,     0,     0,
-       0,     0,     0,     0,   534,   535,   536,   537,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   538,   539,   540,   541,   542,
-     356,     0,     0,     0,     0,   361,   362,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   543,
-     544,   545,   546,   547,   548,   549,   550,     0,     0,   371,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   384,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-       0,     0,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-       0,   180,     0,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,     0,     0,     0,
-       0,     0,     0,   342,     0,     0,     0,   346,   347,   348,
-       0,     0,   530,   531,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   532,   533,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   782,   534,   535,   536,   537,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   538,   539,   540,   541,   542,   356,
-       0,     0,     0,     0,   361,   362,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   543,   544,
-     545,   546,   547,   548,   549,   550,     0,     0,   371,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   384,     2,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,     0,
-       0,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,     0,
-     180,     0,   182,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,   335,     0,     0,     0,     0,
-       0,     0,   342,     0,     0,     0,   346,   347,   348,     0,
-       0,   530,   531,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     532,   533,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   534,   535,   536,   537,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   538,   539,   540,   541,   542,   356,     0,
-       0,     0,     0,   361,   362,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   543,   544,   545,
-     546,   547,   548,   549,   550,     0,     0,   371,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     384,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,     0,     0,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,     0,   180,
-       0,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,     0,     0,     0,     0,     0,
-       0,   342,     0,     0,     0,   346,   347,   348,     0,     0,
-     530,   531,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   532,
-     533,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   534,   535,   536,   537,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   538,   539,   540,   541,   542,   356,     0,     0,
-       0,     0,   361,   686,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   543,   544,   545,   546,
-     547,   548,   549,   550,     0,     0,   371,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   384,
-       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+     328,   329,   330,   331,   332,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   357,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   365,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   379,   380,   381,   382,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   392,   393,   394,   395,   396,   397,
+     398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   414,   415,   416,   417,
+     418,   419,   420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   429,    -1,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
+     458,   459,   460,   461,   462,   463,   464,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,    -1,    -1,   335,
+     336,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,
+      -1,   357,    -1,   359,   360,    -1,    -1,    -1,    -1,   365,
+     366,   367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   379,   380,   381,   382,   383,    -1,    -1,
+      -1,   387,   388,   389,   390,   391,   392,   393,   394,   395,
+     396,   397,   398,   399,   400,   401,   402,    -1,   404,   405,
+     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,   453,   454,   455,
+     456,   457,   458,   459,   460,   461,   462,   463,   464,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,    -1,
+      -1,   335,   336,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     354,   355,    -1,   357,    -1,   359,   360,    -1,    -1,    -1,
+      -1,   365,   366,   367,   368,   369,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   379,   380,   381,   382,   383,
+      -1,    -1,    -1,   387,   388,   389,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,    -1,
+     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
+     464,     3,     4,     5,     6,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,     0,     0,    61,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
@@ -2996,7 +3189,7 @@ static const yytype_int16 yytable[] =
      142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
      152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,     0,   180,     0,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
      182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
      192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
      202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
@@ -3012,991 +3205,118 @@ static const yytype_int16 yytable[] =
      302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
      312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
      322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     332,   333,   334,   335,     0,     0,     0,     0,     0,     0,
-     342,     0,     0,     0,   346,   347,   348,     0,     0,   530,
-     531,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   532,   533,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     534,   535,   536,   537,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   538,   539,   540,   541,   731,   356,     0,     0,     0,
-       0,   361,   362,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   543,   544,   545,   546,   547,
-     548,   549,   550,     0,     0,   371,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   384,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,     0,     0,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,     0,   180,     0,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,     0,     0,     0,     0,     0,     0,   342,
-       0,     0,     0,   346,   347,   348,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   356,     0,     0,     0,     0,
-     361,   362,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   371
-};
-
-static const yytype_int16 yycheck[] =
-{
-       0,   431,     0,   412,     0,     0,   436,   512,   573,     0,
-     589,   464,   431,   666,   583,   668,   525,   670,   471,   578,
-     673,   598,   431,   654,   589,   774,   420,   436,   443,   533,
-     600,   372,   470,   592,   375,   355,   356,   353,   354,   360,
-     409,   383,   601,   372,   937,   375,   372,   456,   372,   377,
-     559,   944,   375,   383,   376,   374,   374,   373,   380,   375,
-     383,   954,   380,   379,   433,   406,   460,   409,   373,   522,
-     523,   391,   392,   578,   512,   396,   405,   406,   407,   408,
-     406,   409,   406,   477,   589,   374,   380,   592,   373,   373,
-     375,   380,   530,   531,   375,   504,   601,   382,   392,   376,
-     373,   382,   391,   380,   674,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   374,   621,   351,   352,   375,
-     375,   380,   571,   373,   562,   382,   382,   382,   577,   633,
-     579,   635,   375,   582,   385,   584,   387,   586,   587,   382,
-     578,   376,   591,   374,   374,   380,   374,   778,   375,   380,
-     380,   589,   380,   373,   592,   380,   571,   666,   383,   668,
-     813,   670,   374,   601,   673,   374,   383,   374,   380,   746,
-     373,   380,   587,   380,   374,   374,   685,   681,   374,   374,
-     380,   380,   374,   621,   380,   380,   373,   406,   380,   598,
-     409,   600,   438,   439,   440,   441,   442,   443,   444,   374,
-     374,   374,   596,   380,   374,   380,   380,   380,   374,   958,
-     380,   374,   374,   374,   380,   374,   374,   380,   380,   380,
-     374,   380,   380,   374,   374,   374,   380,   357,   358,   380,
-     380,   380,   753,   754,   664,   757,   758,   759,   760,   892,
-     380,   818,   373,   383,   380,   664,   378,   383,   380,   880,
-     406,   406,   690,   409,   409,   664,   409,   405,   406,   407,
-     408,   409,   388,   389,   390,   674,   405,   406,   407,   408,
-     849,   373,   851,   373,   843,   844,   780,   836,   837,   406,
-     784,   409,   409,   406,   849,   391,   409,   406,   741,   406,
-     409,   383,   409,   802,   803,   948,   406,   406,   406,   409,
-     409,   409,   406,   406,   813,   409,   409,   380,   380,   377,
-     383,   383,   750,   751,   752,   753,   754,   755,   756,   757,
-     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
-     768,   836,   837,   964,   409,   380,   377,   746,   383,   398,
-     399,   400,   380,   381,   849,   409,   851,   380,   381,   755,
-     756,   761,   762,   375,   409,   409,   377,   375,   374,   409,
-     383,   380,   382,   409,   379,   382,   380,   380,   380,   380,
-     380,   380,   380,   380,   878,   380,   380,   881,   375,   382,
-     374,   373,   383,   892,   374,   373,   373,   373,   372,   359,
-     375,   417,   361,   376,   376,   373,   376,   378,   836,   837,
-     373,   373,   395,   409,   380,   394,   383,   409,   383,   818,
-     409,   849,   412,   851,   393,   383,   373,   921,   381,   383,
-     420,   412,   383,   383,   383,   934,   373,   379,   428,   420,
-     428,   431,   428,   428,   938,   409,   436,   428,   436,   948,
-     431,   436,   374,   382,   380,   436,   446,   380,   374,   953,
-     374,   881,   380,   376,   372,   372,   456,   455,   406,   378,
-     460,   374,   373,   409,   378,   456,   382,   377,   383,   460,
-     470,   374,   881,   377,   383,   377,   421,   477,   764,   766,
-     763,   603,   355,   765,   856,   456,   477,   767,   740,   768,
-     883,   921,   943,   460,   460,   954,   454,   955,   883,   664,
-     921,   428,   834,   594,   504,   832,   837,   664,   841,   844,
-     847,   849,   921,   504,   839,   515,    -1,   664,    -1,    -1,
-      -1,    -1,    -1,    -1,   515,    -1,   843,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   851,    -1,    -1,    -1,
+     332,    -1,    -1,   335,   336,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   354,   355,    -1,   357,    -1,   359,    -1,    -1,
+      -1,    -1,    -1,   365,   366,   367,   368,   369,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,   380,   381,
+     382,   383,    -1,    -1,    -1,   387,   388,   389,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,    -1,   404,   405,   406,   407,   408,   409,   410,   411,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,    -1,    -1,   335,   336,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   567,
+      -1,    -1,    -1,    -1,   354,   355,    -1,   357,    -1,   359,
+      -1,    -1,    -1,    -1,    -1,   365,   366,   367,   368,   369,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,
+     380,   381,   382,   383,    -1,    -1,    -1,   387,   388,   389,
+     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
+     400,   401,   402,    -1,   404,   405,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,    -1,    -1,   335,   336,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   596,    -1,   598,    -1,
-     600,    -1,    -1,    -1,    -1,   596,    -1,   598,    -1,   600,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   654,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   654,   664,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   664,   674,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   674,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   746,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   746,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   774,    -1,    -1,    -1,   778,    -1,
-      -1,    -1,    -1,   774,    -1,    -1,    -1,   778,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   818,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   818,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     880,   881,    -1,   883,    -1,   883,    -1,    -1,    -1,   880,
-     881,    -1,   883,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   921,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     921,    -1,    -1,    -1,    -1,    -1,    -1,   937,    -1,    -1,
-      -1,    -1,    -1,    -1,   944,    -1,   937,    -1,    -1,    -1,
-      -1,    -1,    -1,   944,   954,    -1,    -1,    -1,   958,    -1,
-      -1,    -1,    -1,   954,   964,    -1,    -1,   958,    -1,    -1,
-      -1,     0,    -1,   964,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   375,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   397,   398,
-     399,   400,   401,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   410,   411,   412,   413,   414,   415,   416,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   432,   433,   434,   435,   436,   437,   438,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-     479,   480,   481,   482,   483,   484,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,    -1,    -1,   353,   354,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   372,   373,    -1,   375,    -1,
-     377,   378,    -1,    -1,    -1,    -1,   383,   384,   385,   386,
-     387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     397,   398,   399,   400,   401,    -1,    -1,    -1,   405,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
-     417,   418,   419,   420,    -1,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
-     447,   448,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,    -1,    -1,   353,   354,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,   373,    -1,
-     375,    -1,   377,   378,    -1,    -1,    -1,    -1,   383,   384,
-     385,   386,   387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   397,   398,   399,   400,   401,    -1,    -1,    -1,
-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,   417,   418,   419,   420,    -1,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,    -1,    -1,
-     353,   354,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,
-     373,    -1,   375,    -1,   377,    -1,    -1,    -1,    -1,    -1,
-     383,   384,   385,   386,   387,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   397,   398,   399,   400,   401,    -1,
-      -1,    -1,   405,   406,   407,   408,   409,   410,   411,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,    -1,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-      -1,    -1,   353,   354,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   372,   373,    -1,   375,    -1,   377,    -1,    -1,    -1,
-      -1,    -1,   383,   384,   385,   386,   387,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   397,   398,   399,   400,
-     401,    -1,    -1,    -1,   405,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-      -1,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,    -1,    -1,   353,   354,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   372,   373,    -1,   375,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   383,   384,   385,   386,   387,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   397,   398,
-     399,   400,   401,    -1,    -1,    -1,   405,   406,   407,   408,
-     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
-     419,   420,    -1,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-     439,   440,   441,   442,   443,   444,   445,   446,   447,   448,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-     479,   480,   481,   482,   483,   484,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,    -1,    -1,   353,   354,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   372,   373,    -1,   375,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   383,   384,   385,   386,
-     387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     397,   398,   399,   400,   401,    -1,    -1,    -1,   405,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
-     447,    -1,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,    -1,    -1,    -1,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,    -1,    -1,   353,   354,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,   373,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   384,
-     385,   386,   387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   397,   398,   399,   400,    -1,    -1,    -1,    -1,
-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,    -1,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   375,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   397,   398,   399,   400,   401,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   410,   411,   412,
-     413,   414,   415,   416,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   432,
-     433,   434,   435,   436,   437,   438,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   447,    -1,   449,   450,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,    -1,    -1,    -1,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   397,   398,   399,   400,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   410,
-     411,   412,   413,   414,   415,   416,   417,    -1,    -1,   420,
-      -1,   422,   423,    -1,    -1,   426,    -1,    -1,    -1,    -1,
-      -1,   432,   433,   434,   435,   436,   437,   438,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,    -1,
-      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   397,   398,
-     399,   400,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     409,   410,   411,   412,   413,   414,   415,   416,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   432,   433,   434,   435,   436,   437,   438,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-     479,   480,   481,   482,   483,   484,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,    -1,    -1,    -1,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   375,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     397,   398,   399,   400,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   410,   411,   412,   413,   414,   415,   416,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   432,   433,   434,   435,   436,
-     437,   438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     447,    -1,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,    -1,    -1,    -1,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   379,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   397,   398,   399,   400,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   410,   411,   412,   413,   414,
-     415,   416,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   432,   433,   434,
-     435,   436,   437,   438,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   447,    -1,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,    -1,    -1,    -1,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   378,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   397,   398,   399,   400,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   410,   411,   412,
-     413,   414,   415,   416,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   432,
-     433,   434,   435,   436,   437,   438,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   447,    -1,   449,   450,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,    -1,    -1,    -1,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   378,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   397,   398,   399,   400,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   410,
-     411,   412,   413,   414,   415,   416,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   432,   433,   434,   435,   436,   437,   438,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
-     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
-     481,   482,   483,   484,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,    -1,
-      -1,    -1,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   378,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   397,   398,
-     399,   400,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   410,   411,   412,   413,   414,   415,   416,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   432,   433,   434,   435,   436,   437,   438,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-     479,   480,   481,   482,   483,   484,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,    -1,    -1,    -1,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     397,   398,   399,   400,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   410,   411,   412,   413,   414,   415,   416,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   432,   433,   434,   435,   436,
-     437,   438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     447,    -1,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,     4,     5,
+      -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,   357,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   365,   366,   367,
+     368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   379,   380,   381,   382,   383,    -1,    -1,    -1,   387,
+     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,    -1,   404,   405,   406,   407,
+     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
+     458,   459,   460,   461,   462,   463,   464,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
       36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
       46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    -1,    -1,    63,    64,    65,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
       66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
@@ -4008,7 +3328,7 @@ static const yytype_int16 yycheck[] =
      146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
      156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
      166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,    -1,   182,    -1,   184,   185,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
      186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
      196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
      206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
@@ -4023,20 +3343,436 @@ static const yytype_int16 yycheck[] =
      296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
      306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
-     336,   337,    -1,    -1,    -1,    -1,    -1,    -1,   344,    -1,
-      -1,    -1,   348,   349,   350,    -1,    -1,   353,   354,    -1,
+     326,   327,   328,   329,   330,   331,   332,    -1,    -1,   335,
+     336,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,
+      -1,   357,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   365,
+     366,   367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   379,   380,   381,   382,   383,    -1,    -1,
+      -1,   387,   388,   389,   390,   391,   392,   393,   394,   395,
+     396,   397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,    -1,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,   453,   454,   455,
+     456,   457,   458,   459,   460,   461,   462,   463,   464,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,    -1,    -1,    -1,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,    -1,
+      -1,   335,   336,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   372,   373,    -1,    -1,
-      -1,   377,   378,    -1,    -1,    -1,    -1,    -1,   384,   385,
-     386,   387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   405,
-     406,   407,   408,   409,   410,    -1,    -1,    -1,    -1,   415,
-     416,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     354,   355,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   366,   367,   368,   369,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   379,   380,   381,   382,    -1,
+      -1,    -1,    -1,   387,   388,   389,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   439,   440,   441,   442,   443,   444,   445,
-     446,    -1,    -1,   449,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   462,     4,     5,     6,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,    -1,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
+     464,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
+     332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   357,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   365,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,   380,   381,
+     382,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     392,   393,   394,   395,   396,   397,   398,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   414,   415,   416,   417,   418,   419,   420,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   429,    -1,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+      -1,    -1,    -1,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,
+     380,   381,   382,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   392,   393,   394,   395,   396,   397,   398,   399,
+      -1,    -1,   402,    -1,   404,   405,    -1,    -1,   408,    -1,
+      -1,    -1,    -1,    -1,   414,   415,   416,   417,   418,   419,
+     420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   429,
+      -1,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,    -1,    -1,    -1,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   365,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   379,   380,   381,   382,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   391,   392,   393,   394,   395,   396,   397,
+     398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   414,   415,   416,   417,
+     418,   419,   420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   429,    -1,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
+     458,   459,   460,   461,   462,   463,   464,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,    -1,    -1,    -1,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   357,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   379,   380,   381,   382,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   392,   393,   394,   395,
+     396,   397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,   415,
+     416,   417,   418,   419,   420,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   429,    -1,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,   451,   452,   453,   454,   455,
+     456,   457,   458,   459,   460,   461,   462,   463,   464,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,    -1,    -1,    -1,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   360,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   379,   380,   381,   382,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   392,   393,
+     394,   395,   396,   397,   398,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     414,   415,   416,   417,   418,   419,   420,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   429,    -1,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
+     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
+     464,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
+     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,    -1,    -1,
+      -1,   323,   324,   325,   326,   327,   328,   329,   330,   331,
+     332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   360,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,   380,   381,
+     382,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     392,   393,   394,   395,   396,   397,   398,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   414,   415,   416,   417,   418,   419,   420,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   429,    -1,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+      -1,    -1,    -1,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     360,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   379,
+     380,   381,   382,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   392,   393,   394,   395,   396,   397,   398,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   414,   415,   416,   417,   418,   419,
+     420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   429,
+      -1,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,    -1,    -1,    -1,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   379,   380,   381,   382,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   392,   393,   394,   395,   396,   397,
+     398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   414,   415,   416,   417,
+     418,   419,   420,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   429,    -1,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
+     458,   459,   460,   461,   462,   463,   464,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
@@ -4053,8 +3789,8 @@ static const yytype_int16 yycheck[] =
      137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
      147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
      157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,    -1,   182,    -1,   184,   185,   186,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
      187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
      197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
      207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
@@ -4068,387 +3804,411 @@ static const yytype_int16 yycheck[] =
      287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
      297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
      307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,    -1,    -1,    -1,    -1,    -1,    -1,   344,    -1,    -1,
-      -1,   348,   349,   350,    -1,    -1,   353,   354,    -1,    -1,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   372,   373,    -1,    -1,    -1,
-     377,   378,    -1,    -1,    -1,    -1,    -1,   384,   385,   386,
-     387,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   405,   406,
-     407,   408,   409,   410,    -1,    -1,    -1,    -1,   415,   416,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,   359,   360,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   439,   440,   441,   442,   443,   444,   445,   446,
-      -1,    -1,   449,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   462,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    -1,    -1,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,    -1,   182,    -1,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-      -1,    -1,    -1,    -1,    -1,    -1,   344,    -1,    -1,    -1,
-     348,   349,   350,    -1,    -1,   353,   354,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   372,   373,    -1,    -1,   376,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   384,   385,   386,   387,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,   359,   360,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   405,   406,   407,
-     408,   409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   439,   440,   441,   442,   443,   444,   445,   446,    -1,
-      -1,   449,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   462,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    -1,    -1,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,    -1,   182,    -1,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,    -1,
-      -1,    -1,    -1,    -1,    -1,   344,    -1,    -1,    -1,   348,
-     349,   350,    -1,    -1,   353,   354,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,   358,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   372,   373,    -1,    -1,    -1,   377,    -1,
-      -1,    -1,    -1,    -1,    -1,   384,   385,   386,   387,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,   359,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     439,   440,   441,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   462,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    -1,    -1,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,    -1,   182,    -1,   184,   185,   186,   187,   188,   189,
-     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,   335,   336,   337,    -1,    -1,
-      -1,    -1,    -1,    -1,   344,    -1,    -1,    -1,   348,   349,
-     350,    -1,    -1,   353,   354,    -1,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   372,   373,    -1,    -1,   376,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   384,   385,   386,   387,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   405,   406,   407,   408,   409,
-     410,    -1,    -1,    -1,    -1,   415,   416,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,   358,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   439,
-     440,   441,   442,   443,   444,   445,   446,    -1,    -1,   449,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   462,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      -1,    -1,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-      -1,   182,    -1,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,    -1,    -1,    -1,
-      -1,    -1,    -1,   344,    -1,    -1,    -1,   348,   349,   350,
-      -1,    -1,   353,   354,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   372,   373,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   383,   384,   385,   386,   387,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   365,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   405,   406,   407,   408,   409,   410,
-      -1,    -1,    -1,    -1,   415,   416,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   439,   440,
-     441,   442,   443,   444,   445,   446,    -1,    -1,   449,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   462,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    -1,
-      -1,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,    -1,
-     182,    -1,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
-     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     332,   333,   334,   335,   336,   337,    -1,    -1,    -1,    -1,
-      -1,    -1,   344,    -1,    -1,    -1,   348,   349,   350,    -1,
-      -1,   353,   354,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     372,   373,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   384,   385,   386,   387,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   405,   406,   407,   408,   409,   410,    -1,
-      -1,    -1,    -1,   415,   416,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   439,   440,   441,
-     442,   443,   444,   445,   446,    -1,    -1,   449,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     462,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    -1,    -1,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,    -1,   182,
-      -1,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,    -1,    -1,    -1,    -1,    -1,
-      -1,   344,    -1,    -1,    -1,   348,   349,   350,    -1,    -1,
-     353,   354,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,
-     373,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   384,   385,   386,   387,    -1,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   405,   406,   407,   408,   409,   410,    -1,    -1,
-      -1,    -1,   415,   416,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,   335,   336,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   439,   440,   441,   442,
-     443,   444,   445,   446,    -1,    -1,   449,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   462,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    -1,    -1,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,    -1,   182,    -1,
-     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
-     334,   335,   336,   337,    -1,    -1,    -1,    -1,    -1,    -1,
-     344,    -1,    -1,    -1,   348,   349,   350,    -1,    -1,   353,
-     354,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   372,   373,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   354,   355,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   366,
+     367,   368,   369,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     384,   385,   386,   387,    -1,    -1,    -1,    -1,    -1,    -1,
+     387,   388,   389,   390,   391,   392,    -1,    -1,    -1,    -1,
+     397,   398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   405,   406,   407,   408,   409,   410,    -1,    -1,    -1,
-      -1,   415,   416,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   439,   440,   441,   442,   443,
-     444,   445,   446,    -1,    -1,   449,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   462,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,    -1,   182,    -1,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,    -1,    -1,    -1,    -1,    -1,    -1,   344,
-      -1,    -1,    -1,   348,   349,   350,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   421,   422,   423,   424,   425,   426,
+     427,   428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   443,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,    -1,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
+     317,   318,   319,    -1,    -1,    -1,    -1,    -1,    -1,   326,
+      -1,    -1,    -1,   330,   331,   332,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   410,    -1,    -1,    -1,    -1,
-     415,   416,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   449
+      -1,    -1,    -1,    -1,    -1,   392,    -1,    -1,    -1,    -1,
+     397,   398
 };
 
 /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
@@ -4488,148 +4248,144 @@ static const yytype_int16 yystos[] =
      302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
      312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
      322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   375,
-     383,   397,   398,   399,   400,   401,   410,   411,   412,   413,
-     414,   415,   416,   432,   433,   434,   435,   436,   437,   438,
-     447,   449,   450,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,   479,   480,   481,   482,   483,   484,   516,   517,   520,
-     521,   522,   523,   527,   528,   529,   530,   531,   532,   535,
-     536,   537,   538,   539,   541,   546,   547,   548,   589,   590,
-     591,   593,   600,   604,   605,   611,   614,   373,   373,   373,
-     373,   373,   373,   373,   373,   375,   547,   377,   409,   373,
-     373,   383,   409,   383,   592,   374,   380,   524,   525,   526,
-     536,   541,   380,   383,   409,   383,   409,   519,   537,   541,
-     391,   543,   544,     0,   590,   521,   529,   536,   383,   520,
-     409,   596,   597,   615,   616,   406,   409,   596,   406,   596,
-     406,   596,   406,   596,   406,   596,   596,   615,   406,   596,
-     409,   594,   595,   541,   550,   377,   409,   433,   533,   534,
-     409,   540,   375,   383,   542,   377,   568,   593,   379,   525,
-     524,   526,   409,   409,   373,   382,   542,   377,   380,   383,
-     353,   354,   372,   373,   384,   385,   386,   387,   405,   406,
-     407,   408,   409,   439,   440,   441,   442,   443,   444,   445,
-     446,   486,   487,   488,   490,   491,   492,   493,   494,   495,
-     496,   497,   498,   539,   541,   545,   542,   374,   409,   383,
-     382,   380,   374,   380,   374,   380,   382,   380,   380,   380,
-     374,   380,   380,   380,   380,   380,   380,   380,   374,   380,
-     374,   380,   373,   376,   380,   383,   536,   541,   551,   552,
-     549,   382,   374,   380,   374,   380,   376,   497,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
-     541,   375,   383,   377,   378,   383,   417,   418,   419,   420,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     448,   497,   510,   512,   514,   516,   520,   539,   541,   557,
-     558,   559,   560,   561,   569,   570,   571,   572,   575,   576,
-     579,   580,   581,   588,   593,   379,   382,   542,   382,   542,
-     377,   512,   555,   382,   518,   409,   497,   497,   514,   353,
-     354,   375,   379,   374,   374,   380,   416,   512,   373,   497,
-     380,   392,   593,   372,   375,   406,   597,   615,   409,   616,
-     372,   405,   406,   407,   408,   601,   602,   406,   510,   515,
-     603,   406,   405,   406,   407,   408,   606,   607,   406,   405,
-     406,   407,   408,   486,   608,   609,   406,   372,   610,   406,
-     615,   409,   515,   546,   612,   613,   406,   515,   376,   595,
-     541,   409,   553,   554,   378,   552,   551,   515,   534,   409,
-     388,   389,   390,   385,   387,   351,   352,   355,   356,   391,
-     392,   357,   358,   395,   394,   393,   359,   361,   360,   396,
-     376,   376,   510,   378,   562,   373,   383,   383,   583,   373,
-     373,   383,   383,   514,   373,   514,   381,   383,   383,   383,
-     383,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   382,   513,   380,   383,   378,   558,   572,   576,   581,
-     379,   555,   555,   382,   378,   555,   556,   555,   551,   374,
-     489,   514,   409,   512,   497,   372,   406,   598,   599,   374,
-     382,   374,   380,   374,   380,   374,   380,   380,   374,   380,
-     374,   380,   374,   380,   380,   374,   380,   380,   374,   380,
-     374,   380,   374,   374,   553,   542,   380,   383,   378,   497,
-     497,   497,   499,   499,   500,   500,   501,   501,   501,   501,
-     502,   502,   503,   504,   505,   506,   507,   508,   511,   376,
-     569,   582,   558,   584,   514,   383,   514,   381,   512,   512,
-     555,   378,   380,   378,   376,   376,   380,   376,   380,   602,
-     601,   515,   603,   607,   606,   609,   608,   372,   610,   612,
-     613,   383,   554,   514,   563,   514,   529,   574,   417,   557,
-     570,   585,   374,   374,   378,   555,   372,   406,   374,   374,
-     374,   374,   374,   374,   381,   378,   409,   374,   373,   574,
-     586,   587,   565,   566,   567,   573,   577,   512,   382,   559,
-     564,   568,   514,   383,   374,   421,   561,   559,   377,   555,
-     374,   514,   564,   565,   569,   578,   383,   378
+     332,   357,   365,   379,   380,   381,   382,   383,   392,   393,
+     394,   395,   396,   397,   398,   414,   415,   416,   417,   418,
+     419,   420,   429,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
+     458,   459,   460,   461,   462,   463,   464,   496,   497,   500,
+     501,   502,   503,   507,   508,   509,   510,   511,   512,   515,
+     516,   517,   518,   519,   521,   526,   527,   528,   569,   570,
+     571,   573,   580,   584,   585,   591,   594,   355,   355,   355,
+     355,   355,   355,   355,   355,   357,   527,   359,   391,   355,
+     355,   365,   391,   365,   572,   356,   362,   504,   505,   506,
+     516,   521,   362,   365,   391,   365,   391,   517,   521,   373,
+     523,   524,     0,   570,   501,   509,   516,   365,   500,   391,
+     576,   577,   595,   596,   388,   391,   576,   388,   576,   388,
+     576,   388,   576,   388,   576,   576,   595,   388,   576,   391,
+     574,   575,   521,   530,   359,   391,   415,   513,   514,   391,
+     520,   357,   365,   522,   359,   548,   573,   505,   504,   506,
+     391,   391,   355,   364,   522,   359,   362,   365,   499,   335,
+     336,   354,   355,   366,   367,   368,   369,   387,   388,   389,
+     390,   391,   421,   422,   423,   424,   425,   426,   427,   428,
+     466,   467,   468,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,   519,   521,   525,   522,   356,   391,   365,   364,
+     362,   356,   362,   356,   362,   364,   362,   362,   362,   356,
+     362,   362,   362,   362,   362,   362,   362,   356,   362,   356,
+     362,   355,   358,   362,   365,   516,   521,   531,   532,   529,
+     364,   356,   362,   356,   362,   358,   477,   479,   480,   481,
+     482,   483,   484,   485,   486,   487,   488,   489,   490,   521,
+     357,   365,   359,   360,   365,   399,   400,   401,   402,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   430,
+     477,   490,   492,   494,   496,   500,   519,   521,   537,   538,
+     539,   540,   541,   549,   550,   551,   552,   555,   556,   559,
+     560,   561,   568,   573,   522,   364,   522,   359,   492,   535,
+     364,   498,   391,   362,   365,   477,   477,   494,   335,   336,
+     357,   361,   356,   356,   362,   398,   492,   355,   477,   362,
+     374,   573,   354,   357,   388,   577,   595,   391,   596,   354,
+     387,   388,   389,   390,   581,   582,   388,   490,   495,   583,
+     388,   387,   388,   389,   390,   586,   587,   388,   387,   388,
+     389,   390,   466,   588,   589,   388,   354,   590,   388,   595,
+     391,   495,   526,   592,   593,   388,   495,   358,   575,   521,
+     391,   533,   534,   360,   532,   531,   495,   514,   391,   370,
+     371,   372,   367,   369,   333,   334,   337,   338,   373,   374,
+     339,   340,   377,   376,   375,   341,   343,   342,   378,   358,
+     358,   490,   360,   542,   355,   365,   365,   563,   355,   355,
+     365,   365,   494,   355,   494,   363,   365,   365,   365,   365,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+     364,   493,   362,   365,   360,   538,   552,   556,   561,   535,
+     364,   360,   535,   536,   535,   531,   391,   356,   469,   494,
+     391,   492,   477,   354,   388,   578,   579,   356,   364,   356,
+     362,   356,   362,   356,   362,   362,   356,   362,   356,   362,
+     356,   362,   362,   356,   362,   362,   356,   362,   356,   362,
+     356,   356,   533,   522,   362,   365,   360,   477,   477,   477,
+     479,   479,   480,   480,   481,   481,   481,   481,   482,   482,
+     483,   484,   485,   486,   487,   488,   491,   358,   549,   562,
+     538,   564,   494,   365,   494,   363,   492,   492,   535,   360,
+     362,   360,   358,   358,   362,   358,   362,   582,   581,   495,
+     583,   587,   586,   589,   588,   354,   590,   592,   593,   365,
+     534,   494,   543,   494,   509,   554,   399,   537,   550,   565,
+     356,   356,   360,   535,   354,   388,   356,   356,   356,   356,
+     356,   356,   363,   360,   391,   356,   355,   554,   566,   567,
+     545,   546,   547,   553,   557,   492,   364,   539,   544,   548,
+     494,   365,   356,   403,   541,   539,   359,   535,   356,   494,
+     544,   545,   549,   558,   365,   360
 };
 
 /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_int16 yyr1[] =
 {
-       0,   485,   486,   487,   487,   487,   487,   487,   487,   487,
-     487,   487,   487,   487,   487,   487,   487,   487,   488,   488,
-     488,   488,   488,   488,   489,   490,   491,   492,   492,   493,
-     493,   494,   494,   495,   496,   496,   496,   497,   497,   497,
-     497,   498,   498,   498,   498,   499,   499,   499,   499,   500,
-     500,   500,   501,   501,   501,   502,   502,   502,   502,   502,
-     503,   503,   503,   504,   504,   505,   505,   506,   506,   507,
-     507,   508,   508,   509,   509,   510,   511,   510,   512,   512,
-     513,   513,   513,   513,   513,   513,   513,   513,   513,   513,
-     513,   514,   514,   515,   516,   516,   516,   516,   516,   516,
-     516,   516,   516,   516,   518,   517,   519,   519,   520,   520,
-     520,   520,   521,   521,   522,   522,   522,   523,   524,   524,
-     524,   525,   525,   525,   525,   526,   527,   527,   527,   527,
-     527,   528,   528,   528,   528,   528,   529,   529,   530,   531,
-     531,   531,   531,   531,   531,   531,   531,   531,   531,   532,
-     533,   533,   534,   534,   534,   535,   536,   536,   537,   537,
-     537,   537,   537,   537,   537,   537,   537,   537,   537,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   539,
-     540,   540,   541,   541,   542,   542,   542,   542,   543,   543,
-     544,   545,   545,   545,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   547,   547,   547,   549,   548,   550,   548,   551,
-     551,   552,   552,   553,   553,   554,   554,   555,   555,   555,
-     555,   556,   556,   557,   558,   558,   559,   559,   559,   559,
-     559,   559,   559,   559,   560,   561,   562,   563,   561,   564,
-     564,   566,   565,   567,   565,   568,   568,   569,   569,   570,
-     570,   571,   571,   572,   573,   573,   574,   574,   575,   575,
-     577,   576,   578,   578,   579,   579,   580,   580,   582,   581,
-     583,   581,   584,   581,   585,   585,   586,   586,   587,   587,
-     588,   588,   588,   588,   588,   588,   588,   588,   589,   589,
-     590,   590,   590,   592,   591,   593,   594,   594,   595,   595,
-     596,   596,   597,   597,   598,   598,   599,   599,   600,   600,
-     600,   600,   600,   600,   601,   601,   602,   602,   602,   602,
-     602,   603,   603,   604,   604,   605,   605,   605,   605,   605,
-     605,   605,   605,   606,   606,   607,   607,   607,   607,   608,
-     608,   609,   609,   609,   609,   609,   610,   610,   611,   611,
-     611,   611,   612,   612,   613,   613,   614,   614,   615,   615,
-     616,   616
+       0,   465,   466,   467,   467,   467,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   468,   468,
+     468,   468,   468,   468,   469,   470,   471,   472,   472,   473,
+     473,   474,   474,   475,   476,   476,   476,   477,   477,   477,
+     477,   478,   478,   478,   478,   479,   479,   479,   479,   480,
+     480,   480,   481,   481,   481,   482,   482,   482,   482,   482,
+     483,   483,   483,   484,   484,   485,   485,   486,   486,   487,
+     487,   488,   488,   489,   489,   490,   491,   490,   492,   492,
+     493,   493,   493,   493,   493,   493,   493,   493,   493,   493,
+     493,   494,   494,   495,   496,   496,   496,   496,   496,   496,
+     496,   496,   496,   496,   496,   498,   497,   499,   499,   500,
+     500,   500,   500,   501,   501,   502,   502,   503,   504,   504,
+     505,   505,   505,   505,   506,   507,   507,   507,   507,   507,
+     508,   508,   508,   508,   508,   509,   509,   510,   511,   511,
+     511,   511,   511,   511,   511,   511,   511,   511,   512,   513,
+     513,   514,   514,   514,   515,   516,   516,   517,   517,   517,
+     517,   517,   517,   517,   517,   517,   517,   517,   518,   518,
+     518,   518,   518,   518,   518,   518,   518,   518,   518,   518,
+     518,   518,   518,   518,   518,   518,   518,   518,   518,   518,
+     518,   518,   518,   518,   518,   518,   518,   518,   518,   518,
+     518,   518,   518,   518,   518,   518,   519,   520,   520,   521,
+     521,   522,   522,   522,   522,   523,   523,   524,   525,   525,
+     525,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   526,   526,   526,   526,   526,   526,   526,   526,   526,
+     526,   527,   527,   527,   529,   528,   530,   528,   531,   531,
+     532,   532,   533,   533,   534,   534,   535,   535,   535,   535,
+     536,   536,   537,   538,   538,   539,   539,   539,   539,   539,
+     539,   539,   539,   540,   541,   542,   543,   541,   544,   544,
+     546,   545,   547,   545,   548,   548,   549,   549,   550,   550,
+     551,   551,   552,   553,   553,   554,   554,   555,   555,   557,
+     556,   558,   558,   559,   559,   560,   560,   562,   561,   563,
+     561,   564,   561,   565,   565,   566,   566,   567,   567,   568,
+     568,   568,   568,   568,   568,   568,   568,   569,   569,   570,
+     570,   570,   572,   571,   573,   574,   574,   575,   575,   576,
+     576,   577,   577,   578,   578,   579,   579,   580,   580,   580,
+     580,   580,   580,   581,   581,   582,   582,   582,   582,   582,
+     583,   583,   584,   584,   585,   585,   585,   585,   585,   585,
+     585,   585,   586,   586,   587,   587,   587,   587,   588,   588,
+     589,   589,   589,   589,   589,   590,   590,   591,   591,   591,
+     591,   592,   592,   593,   593,   594,   594,   595,   595,   596,
+     596
 };
 
 /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
@@ -4645,19 +4401,19 @@ static const yytype_int8 yyr2[] =
        3,     1,     3,     1,     3,     1,     0,     6,     1,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     3,     1,     2,     3,     2,     2,     4,     2,
-       3,     4,     2,     3,     0,     6,     1,     3,     2,     3,
-       3,     4,     1,     1,     2,     3,     5,     3,     2,     3,
-       4,     2,     1,     2,     1,     1,     1,     3,     4,     6,
-       5,     1,     2,     3,     5,     4,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
-       1,     3,     1,     3,     1,     1,     1,     2,     1,     1,
+       3,     4,     2,     3,     4,     0,     6,     2,     3,     2,
+       3,     3,     4,     1,     1,     2,     3,     3,     2,     3,
+       2,     1,     2,     1,     1,     1,     3,     4,     6,     5,
+       1,     2,     3,     5,     4,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     4,     1,
+       3,     1,     3,     1,     1,     1,     2,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     4,     1,     1,
-       1,     3,     2,     3,     2,     3,     3,     4,     1,     0,
-       3,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     4,     1,     1,     1,     3,     2,
+       3,     2,     3,     3,     4,     1,     0,     3,     1,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -4689,25 +4445,23 @@ static const yytype_int8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     6,     0,     5,     1,
-       2,     3,     4,     1,     3,     1,     2,     1,     3,     4,
-       2,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     0,     0,     5,     1,
-       1,     0,     2,     0,     2,     2,     3,     1,     2,     1,
-       2,     1,     2,     5,     3,     1,     1,     4,     1,     2,
-       0,     8,     0,     1,     3,     2,     1,     2,     0,     6,
-       0,     8,     0,     7,     1,     1,     1,     0,     2,     3,
-       2,     2,     2,     3,     2,     2,     2,     2,     1,     2,
-       1,     1,     1,     0,     3,     5,     1,     3,     1,     4,
-       1,     3,     5,     5,     1,     3,     1,     3,     4,     6,
-       6,     8,     6,     8,     1,     3,     1,     1,     1,     1,
-       1,     1,     3,     4,     6,     4,     6,     6,     8,     6,
+       1,     1,     1,     1,     0,     6,     0,     5,     1,     2,
+       3,     4,     1,     3,     1,     2,     1,     3,     4,     2,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     2,     0,     0,     5,     1,     1,
+       0,     2,     0,     2,     2,     3,     1,     2,     1,     2,
+       1,     2,     5,     3,     1,     1,     4,     1,     2,     0,
+       8,     0,     1,     3,     2,     1,     2,     0,     6,     0,
+       8,     0,     7,     1,     1,     1,     0,     2,     3,     2,
+       2,     2,     3,     2,     2,     2,     2,     1,     2,     1,
+       1,     1,     0,     3,     5,     1,     3,     1,     4,     1,
+       3,     5,     5,     1,     3,     1,     3,     4,     6,     6,
        8,     6,     8,     1,     3,     1,     1,     1,     1,     1,
-       3,     1,     1,     1,     1,     1,     1,     3,     6,     8,
-       4,     6,     1,     3,     1,     1,     4,     6,     1,     3,
-       3,     3
+       1,     3,     4,     6,     4,     6,     6,     8,     6,     8,
+       6,     8,     1,     3,     1,     1,     1,     1,     1,     3,
+       1,     1,     1,     1,     1,     1,     3,     6,     8,     4,
+       6,     1,     3,     1,     1,     4,     6,     1,     3,     3,
+       3
 };
 
 
@@ -5449,260 +5203,260 @@ yyreduce:
   switch (yyn)
     {
   case 2: /* variable_identifier: IDENTIFIER  */
-#line 362 "MachineIndependent/glslang.y"
+#line 355 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.intermTypedNode) = parseContext.handleVariable((yyvsp[0].lex).loc, (yyvsp[0].lex).symbol, (yyvsp[0].lex).string);
     }
-#line 5457 "MachineIndependent/glslang_tab.cpp"
+#line 5211 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 3: /* primary_expression: variable_identifier  */
-#line 368 "MachineIndependent/glslang.y"
+#line 361 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 5465 "MachineIndependent/glslang_tab.cpp"
+#line 5219 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 4: /* primary_expression: LEFT_PAREN expression RIGHT_PAREN  */
-#line 371 "MachineIndependent/glslang.y"
+#line 364 "MachineIndependent/glslang.y"
                                         {
         (yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
         if ((yyval.interm.intermTypedNode)->getAsConstantUnion())
             (yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
     }
-#line 5475 "MachineIndependent/glslang_tab.cpp"
+#line 5229 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 5: /* primary_expression: FLOATCONSTANT  */
-#line 376 "MachineIndependent/glslang.y"
+#line 369 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
     }
-#line 5483 "MachineIndependent/glslang_tab.cpp"
+#line 5237 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 6: /* primary_expression: INTCONSTANT  */
-#line 379 "MachineIndependent/glslang.y"
+#line 372 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 5491 "MachineIndependent/glslang_tab.cpp"
+#line 5245 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 7: /* primary_expression: UINTCONSTANT  */
-#line 382 "MachineIndependent/glslang.y"
+#line 375 "MachineIndependent/glslang.y"
                    {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 5500 "MachineIndependent/glslang_tab.cpp"
+#line 5254 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 8: /* primary_expression: BOOLCONSTANT  */
-#line 386 "MachineIndependent/glslang.y"
+#line 379 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
     }
-#line 5508 "MachineIndependent/glslang_tab.cpp"
+#line 5262 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 9: /* primary_expression: STRING_LITERAL  */
-#line 389 "MachineIndependent/glslang.y"
+#line 382 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true);
     }
-#line 5516 "MachineIndependent/glslang_tab.cpp"
+#line 5270 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 10: /* primary_expression: INT32CONSTANT  */
-#line 392 "MachineIndependent/glslang.y"
+#line 385 "MachineIndependent/glslang.y"
                     {
         parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 5525 "MachineIndependent/glslang_tab.cpp"
+#line 5279 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 11: /* primary_expression: UINT32CONSTANT  */
-#line 396 "MachineIndependent/glslang.y"
+#line 389 "MachineIndependent/glslang.y"
                      {
         parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 5534 "MachineIndependent/glslang_tab.cpp"
+#line 5288 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 12: /* primary_expression: INT64CONSTANT  */
-#line 400 "MachineIndependent/glslang.y"
+#line 393 "MachineIndependent/glslang.y"
                     {
         parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i64, (yyvsp[0].lex).loc, true);
     }
-#line 5543 "MachineIndependent/glslang_tab.cpp"
+#line 5297 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 13: /* primary_expression: UINT64CONSTANT  */
-#line 404 "MachineIndependent/glslang.y"
+#line 397 "MachineIndependent/glslang.y"
                      {
         parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u64, (yyvsp[0].lex).loc, true);
     }
-#line 5552 "MachineIndependent/glslang_tab.cpp"
+#line 5306 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 14: /* primary_expression: INT16CONSTANT  */
-#line 408 "MachineIndependent/glslang.y"
+#line 401 "MachineIndependent/glslang.y"
                     {
         parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit integer literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((short)(yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 5561 "MachineIndependent/glslang_tab.cpp"
+#line 5315 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 15: /* primary_expression: UINT16CONSTANT  */
-#line 412 "MachineIndependent/glslang.y"
+#line 405 "MachineIndependent/glslang.y"
                      {
         parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit unsigned integer literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((unsigned short)(yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 5570 "MachineIndependent/glslang_tab.cpp"
+#line 5324 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 16: /* primary_expression: DOUBLECONSTANT  */
-#line 416 "MachineIndependent/glslang.y"
+#line 409 "MachineIndependent/glslang.y"
                      {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double literal");
         if (! parseContext.symbolTable.atBuiltInLevel())
             parseContext.doubleCheck((yyvsp[0].lex).loc, "double literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtDouble, (yyvsp[0].lex).loc, true);
     }
-#line 5581 "MachineIndependent/glslang_tab.cpp"
+#line 5335 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 17: /* primary_expression: FLOAT16CONSTANT  */
-#line 422 "MachineIndependent/glslang.y"
+#line 415 "MachineIndependent/glslang.y"
                       {
         parseContext.float16Check((yyvsp[0].lex).loc, "half float literal");
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat16, (yyvsp[0].lex).loc, true);
     }
-#line 5590 "MachineIndependent/glslang_tab.cpp"
+#line 5344 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 18: /* postfix_expression: primary_expression  */
-#line 429 "MachineIndependent/glslang.y"
+#line 422 "MachineIndependent/glslang.y"
                          {
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 5598 "MachineIndependent/glslang_tab.cpp"
+#line 5352 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 19: /* postfix_expression: postfix_expression LEFT_BRACKET integer_expression RIGHT_BRACKET  */
-#line 432 "MachineIndependent/glslang.y"
+#line 425 "MachineIndependent/glslang.y"
                                                                        {
         (yyval.interm.intermTypedNode) = parseContext.handleBracketDereference((yyvsp[-2].lex).loc, (yyvsp[-3].interm.intermTypedNode), (yyvsp[-1].interm.intermTypedNode));
     }
-#line 5606 "MachineIndependent/glslang_tab.cpp"
+#line 5360 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 20: /* postfix_expression: function_call  */
-#line 435 "MachineIndependent/glslang.y"
+#line 428 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 5614 "MachineIndependent/glslang_tab.cpp"
+#line 5368 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 21: /* postfix_expression: postfix_expression DOT IDENTIFIER  */
-#line 438 "MachineIndependent/glslang.y"
+#line 431 "MachineIndependent/glslang.y"
                                         {
         (yyval.interm.intermTypedNode) = parseContext.handleDotDereference((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode), *(yyvsp[0].lex).string);
     }
-#line 5622 "MachineIndependent/glslang_tab.cpp"
+#line 5376 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 22: /* postfix_expression: postfix_expression INC_OP  */
-#line 441 "MachineIndependent/glslang.y"
+#line 434 "MachineIndependent/glslang.y"
                                 {
         parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
         parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "++", (yyvsp[-1].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "++", EOpPostIncrement, (yyvsp[-1].interm.intermTypedNode));
     }
-#line 5632 "MachineIndependent/glslang_tab.cpp"
+#line 5386 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 23: /* postfix_expression: postfix_expression DEC_OP  */
-#line 446 "MachineIndependent/glslang.y"
+#line 439 "MachineIndependent/glslang.y"
                                 {
         parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
         parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "--", (yyvsp[-1].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "--", EOpPostDecrement, (yyvsp[-1].interm.intermTypedNode));
     }
-#line 5642 "MachineIndependent/glslang_tab.cpp"
+#line 5396 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 24: /* integer_expression: expression  */
-#line 454 "MachineIndependent/glslang.y"
+#line 447 "MachineIndependent/glslang.y"
                  {
-        parseContext.arrayIndexCheck((yyvsp[0].interm.intermTypedNode), "[]");
+        parseContext.integerCheck((yyvsp[0].interm.intermTypedNode), "[]");
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 5651 "MachineIndependent/glslang_tab.cpp"
+#line 5405 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 25: /* function_call: function_call_or_method  */
-#line 461 "MachineIndependent/glslang.y"
+#line 454 "MachineIndependent/glslang.y"
                               {
         (yyval.interm.intermTypedNode) = parseContext.handleFunctionCall((yyvsp[0].interm).loc, (yyvsp[0].interm).function, (yyvsp[0].interm).intermNode);
         delete (yyvsp[0].interm).function;
     }
-#line 5660 "MachineIndependent/glslang_tab.cpp"
+#line 5414 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 26: /* function_call_or_method: function_call_generic  */
-#line 468 "MachineIndependent/glslang.y"
+#line 461 "MachineIndependent/glslang.y"
                             {
         (yyval.interm) = (yyvsp[0].interm);
     }
-#line 5668 "MachineIndependent/glslang_tab.cpp"
+#line 5422 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 27: /* function_call_generic: function_call_header_with_parameters RIGHT_PAREN  */
-#line 474 "MachineIndependent/glslang.y"
+#line 467 "MachineIndependent/glslang.y"
                                                        {
         (yyval.interm) = (yyvsp[-1].interm);
         (yyval.interm).loc = (yyvsp[0].lex).loc;
     }
-#line 5677 "MachineIndependent/glslang_tab.cpp"
+#line 5431 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 28: /* function_call_generic: function_call_header_no_parameters RIGHT_PAREN  */
-#line 478 "MachineIndependent/glslang.y"
+#line 471 "MachineIndependent/glslang.y"
                                                      {
         (yyval.interm) = (yyvsp[-1].interm);
         (yyval.interm).loc = (yyvsp[0].lex).loc;
     }
-#line 5686 "MachineIndependent/glslang_tab.cpp"
+#line 5440 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 29: /* function_call_header_no_parameters: function_call_header VOID  */
-#line 485 "MachineIndependent/glslang.y"
+#line 478 "MachineIndependent/glslang.y"
                                 {
         (yyval.interm) = (yyvsp[-1].interm);
     }
-#line 5694 "MachineIndependent/glslang_tab.cpp"
+#line 5448 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 30: /* function_call_header_no_parameters: function_call_header  */
-#line 488 "MachineIndependent/glslang.y"
+#line 481 "MachineIndependent/glslang.y"
                            {
         (yyval.interm) = (yyvsp[0].interm);
     }
-#line 5702 "MachineIndependent/glslang_tab.cpp"
+#line 5456 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 31: /* function_call_header_with_parameters: function_call_header assignment_expression  */
-#line 494 "MachineIndependent/glslang.y"
+#line 487 "MachineIndependent/glslang.y"
                                                  {
         if (parseContext.spvVersion.vulkan > 0
             && parseContext.spvVersion.vulkanRelaxed
@@ -5721,11 +5475,11 @@ yyreduce:
             (yyval.interm).intermNode = (yyvsp[0].interm.intermTypedNode);
         }
     }
-#line 5725 "MachineIndependent/glslang_tab.cpp"
+#line 5479 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 32: /* function_call_header_with_parameters: function_call_header_with_parameters COMMA assignment_expression  */
-#line 512 "MachineIndependent/glslang.y"
+#line 505 "MachineIndependent/glslang.y"
                                                                        {
         if (parseContext.spvVersion.vulkan > 0
             && parseContext.spvVersion.vulkanRelaxed
@@ -5748,29 +5502,29 @@ yyreduce:
             (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-2].interm).intermNode, (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
         }
     }
-#line 5752 "MachineIndependent/glslang_tab.cpp"
+#line 5506 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 33: /* function_call_header: function_identifier LEFT_PAREN  */
-#line 537 "MachineIndependent/glslang.y"
+#line 530 "MachineIndependent/glslang.y"
                                      {
         (yyval.interm) = (yyvsp[-1].interm);
     }
-#line 5760 "MachineIndependent/glslang_tab.cpp"
+#line 5514 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 34: /* function_identifier: type_specifier  */
-#line 545 "MachineIndependent/glslang.y"
+#line 538 "MachineIndependent/glslang.y"
                      {
         // Constructor
         (yyval.interm).intermNode = 0;
         (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
     }
-#line 5770 "MachineIndependent/glslang_tab.cpp"
+#line 5524 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 35: /* function_identifier: postfix_expression  */
-#line 550 "MachineIndependent/glslang.y"
+#line 543 "MachineIndependent/glslang.y"
                          {
         //
         // Should be a method or subroutine call, but we haven't recognized the arguments yet.
@@ -5780,7 +5534,7 @@ yyreduce:
 
         TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode();
         if (method) {
-            (yyval.interm).function = new TFunction(&method->getMethodName(), method->getType(), EOpArrayLength);
+            (yyval.interm).function = new TFunction(&method->getMethodName(), TType(EbtInt), EOpArrayLength);
             (yyval.interm).intermNode = method->getObject();
         } else {
             TIntermSymbol* symbol = (yyvsp[0].interm.intermTypedNode)->getAsSymbolNode();
@@ -5798,50 +5552,50 @@ yyreduce:
             (yyval.interm).function = new TFunction(empty, TType(EbtVoid), EOpNull);
         }
     }
-#line 5802 "MachineIndependent/glslang_tab.cpp"
+#line 5556 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 36: /* function_identifier: non_uniform_qualifier  */
-#line 577 "MachineIndependent/glslang.y"
+#line 570 "MachineIndependent/glslang.y"
                             {
         // Constructor
         (yyval.interm).intermNode = 0;
         (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
     }
-#line 5812 "MachineIndependent/glslang_tab.cpp"
+#line 5566 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 37: /* unary_expression: postfix_expression  */
-#line 585 "MachineIndependent/glslang.y"
+#line 578 "MachineIndependent/glslang.y"
                          {
         parseContext.variableCheck((yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         if (TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode())
             parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "incomplete method syntax", method->getMethodName().c_str(), "");
     }
-#line 5823 "MachineIndependent/glslang_tab.cpp"
+#line 5577 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 38: /* unary_expression: INC_OP unary_expression  */
-#line 591 "MachineIndependent/glslang.y"
+#line 584 "MachineIndependent/glslang.y"
                               {
         parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "++", (yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "++", EOpPreIncrement, (yyvsp[0].interm.intermTypedNode));
     }
-#line 5832 "MachineIndependent/glslang_tab.cpp"
+#line 5586 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 39: /* unary_expression: DEC_OP unary_expression  */
-#line 595 "MachineIndependent/glslang.y"
+#line 588 "MachineIndependent/glslang.y"
                               {
         parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "--", (yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "--", EOpPreDecrement, (yyvsp[0].interm.intermTypedNode));
     }
-#line 5841 "MachineIndependent/glslang_tab.cpp"
+#line 5595 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 40: /* unary_expression: unary_operator unary_expression  */
-#line 599 "MachineIndependent/glslang.y"
+#line 592 "MachineIndependent/glslang.y"
                                       {
         if ((yyvsp[-1].interm).op != EOpNull) {
             char errorOp[2] = {0, 0};
@@ -5858,179 +5612,179 @@ yyreduce:
                 (yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
         }
     }
-#line 5862 "MachineIndependent/glslang_tab.cpp"
+#line 5616 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 41: /* unary_operator: PLUS  */
-#line 619 "MachineIndependent/glslang.y"
+#line 612 "MachineIndependent/glslang.y"
             { (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNull; }
-#line 5868 "MachineIndependent/glslang_tab.cpp"
+#line 5622 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 42: /* unary_operator: DASH  */
-#line 620 "MachineIndependent/glslang.y"
+#line 613 "MachineIndependent/glslang.y"
             { (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNegative; }
-#line 5874 "MachineIndependent/glslang_tab.cpp"
+#line 5628 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 43: /* unary_operator: BANG  */
-#line 621 "MachineIndependent/glslang.y"
+#line 614 "MachineIndependent/glslang.y"
             { (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLogicalNot; }
-#line 5880 "MachineIndependent/glslang_tab.cpp"
+#line 5634 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 44: /* unary_operator: TILDE  */
-#line 622 "MachineIndependent/glslang.y"
+#line 615 "MachineIndependent/glslang.y"
             { (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpBitwiseNot;
               parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise not"); }
-#line 5887 "MachineIndependent/glslang_tab.cpp"
+#line 5641 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 45: /* multiplicative_expression: unary_expression  */
-#line 628 "MachineIndependent/glslang.y"
+#line 621 "MachineIndependent/glslang.y"
                        { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5893 "MachineIndependent/glslang_tab.cpp"
+#line 5647 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 46: /* multiplicative_expression: multiplicative_expression STAR unary_expression  */
-#line 629 "MachineIndependent/glslang.y"
+#line 622 "MachineIndependent/glslang.y"
                                                       {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "*", EOpMul, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5903 "MachineIndependent/glslang_tab.cpp"
+#line 5657 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 47: /* multiplicative_expression: multiplicative_expression SLASH unary_expression  */
-#line 634 "MachineIndependent/glslang.y"
+#line 627 "MachineIndependent/glslang.y"
                                                        {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "/", EOpDiv, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5913 "MachineIndependent/glslang_tab.cpp"
+#line 5667 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 48: /* multiplicative_expression: multiplicative_expression PERCENT unary_expression  */
-#line 639 "MachineIndependent/glslang.y"
+#line 632 "MachineIndependent/glslang.y"
                                                          {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "%");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "%", EOpMod, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5924 "MachineIndependent/glslang_tab.cpp"
+#line 5678 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 49: /* additive_expression: multiplicative_expression  */
-#line 648 "MachineIndependent/glslang.y"
+#line 641 "MachineIndependent/glslang.y"
                                 { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5930 "MachineIndependent/glslang_tab.cpp"
+#line 5684 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 50: /* additive_expression: additive_expression PLUS multiplicative_expression  */
-#line 649 "MachineIndependent/glslang.y"
+#line 642 "MachineIndependent/glslang.y"
                                                          {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "+", EOpAdd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5940 "MachineIndependent/glslang_tab.cpp"
+#line 5694 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 51: /* additive_expression: additive_expression DASH multiplicative_expression  */
-#line 654 "MachineIndependent/glslang.y"
+#line 647 "MachineIndependent/glslang.y"
                                                          {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "-", EOpSub, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5950 "MachineIndependent/glslang_tab.cpp"
+#line 5704 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 52: /* shift_expression: additive_expression  */
-#line 662 "MachineIndependent/glslang.y"
+#line 655 "MachineIndependent/glslang.y"
                           { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5956 "MachineIndependent/glslang_tab.cpp"
+#line 5710 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 53: /* shift_expression: shift_expression LEFT_OP additive_expression  */
-#line 663 "MachineIndependent/glslang.y"
+#line 656 "MachineIndependent/glslang.y"
                                                    {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift left");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<<", EOpLeftShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5967 "MachineIndependent/glslang_tab.cpp"
+#line 5721 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 54: /* shift_expression: shift_expression RIGHT_OP additive_expression  */
-#line 669 "MachineIndependent/glslang.y"
+#line 662 "MachineIndependent/glslang.y"
                                                     {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift right");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">>", EOpRightShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 5978 "MachineIndependent/glslang_tab.cpp"
+#line 5732 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 55: /* relational_expression: shift_expression  */
-#line 678 "MachineIndependent/glslang.y"
+#line 671 "MachineIndependent/glslang.y"
                        { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5984 "MachineIndependent/glslang_tab.cpp"
+#line 5738 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 56: /* relational_expression: relational_expression LEFT_ANGLE shift_expression  */
-#line 679 "MachineIndependent/glslang.y"
+#line 672 "MachineIndependent/glslang.y"
                                                         {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<", EOpLessThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 5994 "MachineIndependent/glslang_tab.cpp"
+#line 5748 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 57: /* relational_expression: relational_expression RIGHT_ANGLE shift_expression  */
-#line 684 "MachineIndependent/glslang.y"
+#line 677 "MachineIndependent/glslang.y"
                                                           {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">", EOpGreaterThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6004 "MachineIndependent/glslang_tab.cpp"
+#line 5758 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 58: /* relational_expression: relational_expression LE_OP shift_expression  */
-#line 689 "MachineIndependent/glslang.y"
+#line 682 "MachineIndependent/glslang.y"
                                                     {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<=", EOpLessThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6014 "MachineIndependent/glslang_tab.cpp"
+#line 5768 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 59: /* relational_expression: relational_expression GE_OP shift_expression  */
-#line 694 "MachineIndependent/glslang.y"
+#line 687 "MachineIndependent/glslang.y"
                                                     {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">=", EOpGreaterThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6024 "MachineIndependent/glslang_tab.cpp"
+#line 5778 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 60: /* equality_expression: relational_expression  */
-#line 702 "MachineIndependent/glslang.y"
+#line 695 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6030 "MachineIndependent/glslang_tab.cpp"
+#line 5784 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 61: /* equality_expression: equality_expression EQ_OP relational_expression  */
-#line 703 "MachineIndependent/glslang.y"
+#line 696 "MachineIndependent/glslang.y"
                                                        {
         parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
         parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
@@ -6040,11 +5794,11 @@ yyreduce:
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6044 "MachineIndependent/glslang_tab.cpp"
+#line 5798 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 62: /* equality_expression: equality_expression NE_OP relational_expression  */
-#line 712 "MachineIndependent/glslang.y"
+#line 705 "MachineIndependent/glslang.y"
                                                       {
         parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
         parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
@@ -6054,124 +5808,124 @@ yyreduce:
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6058 "MachineIndependent/glslang_tab.cpp"
+#line 5812 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 63: /* and_expression: equality_expression  */
-#line 724 "MachineIndependent/glslang.y"
+#line 717 "MachineIndependent/glslang.y"
                           { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6064 "MachineIndependent/glslang_tab.cpp"
+#line 5818 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 64: /* and_expression: and_expression AMPERSAND equality_expression  */
-#line 725 "MachineIndependent/glslang.y"
+#line 718 "MachineIndependent/glslang.y"
                                                    {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise and");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&", EOpAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 6075 "MachineIndependent/glslang_tab.cpp"
+#line 5829 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 65: /* exclusive_or_expression: and_expression  */
-#line 734 "MachineIndependent/glslang.y"
+#line 727 "MachineIndependent/glslang.y"
                      { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6081 "MachineIndependent/glslang_tab.cpp"
+#line 5835 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 66: /* exclusive_or_expression: exclusive_or_expression CARET and_expression  */
-#line 735 "MachineIndependent/glslang.y"
+#line 728 "MachineIndependent/glslang.y"
                                                    {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise exclusive or");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^", EOpExclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 6092 "MachineIndependent/glslang_tab.cpp"
+#line 5846 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 67: /* inclusive_or_expression: exclusive_or_expression  */
-#line 744 "MachineIndependent/glslang.y"
+#line 737 "MachineIndependent/glslang.y"
                               { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6098 "MachineIndependent/glslang_tab.cpp"
+#line 5852 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 68: /* inclusive_or_expression: inclusive_or_expression VERTICAL_BAR exclusive_or_expression  */
-#line 745 "MachineIndependent/glslang.y"
+#line 738 "MachineIndependent/glslang.y"
                                                                    {
         parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise inclusive or");
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "|", EOpInclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 6109 "MachineIndependent/glslang_tab.cpp"
+#line 5863 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 69: /* logical_and_expression: inclusive_or_expression  */
-#line 754 "MachineIndependent/glslang.y"
+#line 747 "MachineIndependent/glslang.y"
                               { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6115 "MachineIndependent/glslang_tab.cpp"
+#line 5869 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 70: /* logical_and_expression: logical_and_expression AND_OP inclusive_or_expression  */
-#line 755 "MachineIndependent/glslang.y"
+#line 748 "MachineIndependent/glslang.y"
                                                             {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&&", EOpLogicalAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6125 "MachineIndependent/glslang_tab.cpp"
+#line 5879 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 71: /* logical_xor_expression: logical_and_expression  */
-#line 763 "MachineIndependent/glslang.y"
+#line 756 "MachineIndependent/glslang.y"
                              { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6131 "MachineIndependent/glslang_tab.cpp"
+#line 5885 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 72: /* logical_xor_expression: logical_xor_expression XOR_OP logical_and_expression  */
-#line 764 "MachineIndependent/glslang.y"
+#line 757 "MachineIndependent/glslang.y"
                                                             {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^^", EOpLogicalXor, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6141 "MachineIndependent/glslang_tab.cpp"
+#line 5895 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 73: /* logical_or_expression: logical_xor_expression  */
-#line 772 "MachineIndependent/glslang.y"
+#line 765 "MachineIndependent/glslang.y"
                              { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6147 "MachineIndependent/glslang_tab.cpp"
+#line 5901 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 74: /* logical_or_expression: logical_or_expression OR_OP logical_xor_expression  */
-#line 773 "MachineIndependent/glslang.y"
+#line 766 "MachineIndependent/glslang.y"
                                                           {
         (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "||", EOpLogicalOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
         if ((yyval.interm.intermTypedNode) == 0)
             (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
     }
-#line 6157 "MachineIndependent/glslang_tab.cpp"
+#line 5911 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 75: /* conditional_expression: logical_or_expression  */
-#line 781 "MachineIndependent/glslang.y"
+#line 774 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6163 "MachineIndependent/glslang_tab.cpp"
+#line 5917 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 76: /* $@1: %empty  */
-#line 782 "MachineIndependent/glslang.y"
+#line 775 "MachineIndependent/glslang.y"
                                      {
         ++parseContext.controlFlowNestingLevel;
     }
-#line 6171 "MachineIndependent/glslang_tab.cpp"
+#line 5925 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 77: /* conditional_expression: logical_or_expression QUESTION $@1 expression COLON assignment_expression  */
-#line 785 "MachineIndependent/glslang.y"
+#line 778 "MachineIndependent/glslang.y"
                                              {
         --parseContext.controlFlowNestingLevel;
         parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-5].interm.intermTypedNode));
@@ -6184,17 +5938,17 @@ yyreduce:
             (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         }
     }
-#line 6188 "MachineIndependent/glslang_tab.cpp"
+#line 5942 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 78: /* assignment_expression: conditional_expression  */
-#line 800 "MachineIndependent/glslang.y"
+#line 793 "MachineIndependent/glslang.y"
                              { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 6194 "MachineIndependent/glslang_tab.cpp"
+#line 5948 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 79: /* assignment_expression: unary_expression assignment_operator assignment_expression  */
-#line 801 "MachineIndependent/glslang.y"
+#line 794 "MachineIndependent/glslang.y"
                                                                  {
         parseContext.arrayObjectCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array assignment");
         parseContext.opaqueCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "=");
@@ -6208,119 +5962,119 @@ yyreduce:
             (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
         }
     }
-#line 6212 "MachineIndependent/glslang_tab.cpp"
+#line 5966 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 80: /* assignment_operator: EQUAL  */
-#line 817 "MachineIndependent/glslang.y"
+#line 810 "MachineIndependent/glslang.y"
             {
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpAssign;
     }
-#line 6221 "MachineIndependent/glslang_tab.cpp"
+#line 5975 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 81: /* assignment_operator: MUL_ASSIGN  */
-#line 821 "MachineIndependent/glslang.y"
+#line 814 "MachineIndependent/glslang.y"
                  {
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpMulAssign;
     }
-#line 6230 "MachineIndependent/glslang_tab.cpp"
+#line 5984 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 82: /* assignment_operator: DIV_ASSIGN  */
-#line 825 "MachineIndependent/glslang.y"
+#line 818 "MachineIndependent/glslang.y"
                  {
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpDivAssign;
     }
-#line 6239 "MachineIndependent/glslang_tab.cpp"
+#line 5993 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 83: /* assignment_operator: MOD_ASSIGN  */
-#line 829 "MachineIndependent/glslang.y"
+#line 822 "MachineIndependent/glslang.y"
                  {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "%=");
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpModAssign;
     }
-#line 6249 "MachineIndependent/glslang_tab.cpp"
+#line 6003 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 84: /* assignment_operator: ADD_ASSIGN  */
-#line 834 "MachineIndependent/glslang.y"
+#line 827 "MachineIndependent/glslang.y"
                  {
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpAddAssign;
     }
-#line 6258 "MachineIndependent/glslang_tab.cpp"
+#line 6012 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 85: /* assignment_operator: SUB_ASSIGN  */
-#line 838 "MachineIndependent/glslang.y"
+#line 831 "MachineIndependent/glslang.y"
                  {
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).op = EOpSubAssign;
     }
-#line 6267 "MachineIndependent/glslang_tab.cpp"
+#line 6021 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 86: /* assignment_operator: LEFT_ASSIGN  */
-#line 842 "MachineIndependent/glslang.y"
+#line 835 "MachineIndependent/glslang.y"
                   {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift left assign");
         (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLeftShiftAssign;
     }
-#line 6276 "MachineIndependent/glslang_tab.cpp"
+#line 6030 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 87: /* assignment_operator: RIGHT_ASSIGN  */
-#line 846 "MachineIndependent/glslang.y"
+#line 839 "MachineIndependent/glslang.y"
                    {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift right assign");
         (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpRightShiftAssign;
     }
-#line 6285 "MachineIndependent/glslang_tab.cpp"
+#line 6039 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 88: /* assignment_operator: AND_ASSIGN  */
-#line 850 "MachineIndependent/glslang.y"
+#line 843 "MachineIndependent/glslang.y"
                  {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-and assign");
         (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpAndAssign;
     }
-#line 6294 "MachineIndependent/glslang_tab.cpp"
+#line 6048 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 89: /* assignment_operator: XOR_ASSIGN  */
-#line 854 "MachineIndependent/glslang.y"
+#line 847 "MachineIndependent/glslang.y"
                  {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-xor assign");
         (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpExclusiveOrAssign;
     }
-#line 6303 "MachineIndependent/glslang_tab.cpp"
+#line 6057 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 90: /* assignment_operator: OR_ASSIGN  */
-#line 858 "MachineIndependent/glslang.y"
+#line 851 "MachineIndependent/glslang.y"
                 {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-or assign");
         (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpInclusiveOrAssign;
     }
-#line 6312 "MachineIndependent/glslang_tab.cpp"
+#line 6066 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 91: /* expression: assignment_expression  */
-#line 865 "MachineIndependent/glslang.y"
+#line 858 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 6320 "MachineIndependent/glslang_tab.cpp"
+#line 6074 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 92: /* expression: expression COMMA assignment_expression  */
-#line 868 "MachineIndependent/glslang.y"
+#line 861 "MachineIndependent/glslang.y"
                                              {
         parseContext.samplerConstructorLocationCheck((yyvsp[-1].lex).loc, ",", (yyvsp[0].interm.intermTypedNode));
         (yyval.interm.intermTypedNode) = parseContext.intermediate.addComma((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
@@ -6329,30 +6083,30 @@ yyreduce:
             (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         }
     }
-#line 6333 "MachineIndependent/glslang_tab.cpp"
+#line 6087 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 93: /* constant_expression: conditional_expression  */
-#line 879 "MachineIndependent/glslang.y"
+#line 872 "MachineIndependent/glslang.y"
                              {
         parseContext.constantValueCheck((yyvsp[0].interm.intermTypedNode), "");
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 6342 "MachineIndependent/glslang_tab.cpp"
+#line 6096 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 94: /* declaration: function_prototype SEMICOLON  */
-#line 886 "MachineIndependent/glslang.y"
+#line 879 "MachineIndependent/glslang.y"
                                    {
         parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
         (yyval.interm.intermNode) = 0;
         // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
     }
-#line 6352 "MachineIndependent/glslang_tab.cpp"
+#line 6106 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 95: /* declaration: spirv_instruction_qualifier function_prototype SEMICOLON  */
-#line 891 "MachineIndependent/glslang.y"
+#line 884 "MachineIndependent/glslang.y"
                                                                {
         parseContext.requireExtensions((yyvsp[-1].interm).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V instruction qualifier");
         (yyvsp[-1].interm).function->setSpirvInstruction(*(yyvsp[-2].interm.spirvInst)); // Attach SPIR-V intruction qualifier
@@ -6360,31 +6114,31 @@ yyreduce:
         (yyval.interm.intermNode) = 0;
         // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
     }
-#line 6364 "MachineIndependent/glslang_tab.cpp"
+#line 6118 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 96: /* declaration: spirv_execution_mode_qualifier SEMICOLON  */
-#line 898 "MachineIndependent/glslang.y"
+#line 891 "MachineIndependent/glslang.y"
                                                {
         parseContext.globalCheck((yyvsp[0].lex).loc, "SPIR-V execution mode qualifier");
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V execution mode qualifier");
         (yyval.interm.intermNode) = 0;
     }
-#line 6374 "MachineIndependent/glslang_tab.cpp"
+#line 6128 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 97: /* declaration: init_declarator_list SEMICOLON  */
-#line 903 "MachineIndependent/glslang.y"
+#line 896 "MachineIndependent/glslang.y"
                                      {
         if ((yyvsp[-1].interm).intermNode && (yyvsp[-1].interm).intermNode->getAsAggregate())
             (yyvsp[-1].interm).intermNode->getAsAggregate()->setOperator(EOpSequence);
         (yyval.interm.intermNode) = (yyvsp[-1].interm).intermNode;
     }
-#line 6384 "MachineIndependent/glslang_tab.cpp"
+#line 6138 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 98: /* declaration: PRECISION precision_qualifier type_specifier SEMICOLON  */
-#line 908 "MachineIndependent/glslang.y"
+#line 901 "MachineIndependent/glslang.y"
                                                              {
         parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, 0, "precision statement");
         // lazy setting of the previous scope's defaults, has effect only the first time it is called in a particular scope
@@ -6392,61 +6146,75 @@ yyreduce:
         parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision);
         (yyval.interm.intermNode) = 0;
     }
-#line 6396 "MachineIndependent/glslang_tab.cpp"
+#line 6150 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 99: /* declaration: block_structure SEMICOLON  */
-#line 915 "MachineIndependent/glslang.y"
+#line 908 "MachineIndependent/glslang.y"
                                 {
-        (yyval.interm.intermNode) = parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
+        parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
+        (yyval.interm.intermNode) = 0;
     }
-#line 6404 "MachineIndependent/glslang_tab.cpp"
+#line 6159 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 100: /* declaration: block_structure IDENTIFIER SEMICOLON  */
-#line 918 "MachineIndependent/glslang.y"
+#line 912 "MachineIndependent/glslang.y"
                                            {
-        (yyval.interm.intermNode) = parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
+        parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
+        (yyval.interm.intermNode) = 0;
     }
-#line 6412 "MachineIndependent/glslang_tab.cpp"
+#line 6168 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 101: /* declaration: block_structure IDENTIFIER array_specifier SEMICOLON  */
-#line 921 "MachineIndependent/glslang.y"
+#line 916 "MachineIndependent/glslang.y"
                                                            {
-        (yyval.interm.intermNode) = parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
+        parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
+        (yyval.interm.intermNode) = 0;
     }
-#line 6420 "MachineIndependent/glslang_tab.cpp"
+#line 6177 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 102: /* declaration: type_qualifier SEMICOLON  */
-#line 924 "MachineIndependent/glslang.y"
+#line 920 "MachineIndependent/glslang.y"
                                {
         parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
         parseContext.updateStandaloneQualifierDefaults((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type));
         (yyval.interm.intermNode) = 0;
     }
-#line 6430 "MachineIndependent/glslang_tab.cpp"
+#line 6187 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 103: /* declaration: type_qualifier identifier_list SEMICOLON  */
-#line 929 "MachineIndependent/glslang.y"
-                                               {
+  case 103: /* declaration: type_qualifier IDENTIFIER SEMICOLON  */
+#line 925 "MachineIndependent/glslang.y"
+                                          {
         parseContext.checkNoShaderLayouts((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).shaderQualifiers);
-        parseContext.addQualifierToExisting((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, *(yyvsp[-1].interm.identifierList));
+        parseContext.addQualifierToExisting((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, *(yyvsp[-1].lex).string);
         (yyval.interm.intermNode) = 0;
     }
-#line 6440 "MachineIndependent/glslang_tab.cpp"
+#line 6197 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 104: /* $@2: %empty  */
-#line 937 "MachineIndependent/glslang.y"
+  case 104: /* declaration: type_qualifier IDENTIFIER identifier_list SEMICOLON  */
+#line 930 "MachineIndependent/glslang.y"
+                                                          {
+        parseContext.checkNoShaderLayouts((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).shaderQualifiers);
+        (yyvsp[-1].interm.identifierList)->push_back((yyvsp[-2].lex).string);
+        parseContext.addQualifierToExisting((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).qualifier, *(yyvsp[-1].interm.identifierList));
+        (yyval.interm.intermNode) = 0;
+    }
+#line 6208 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 105: /* $@2: %empty  */
+#line 939 "MachineIndependent/glslang.y"
                                            { parseContext.nestedBlockCheck((yyvsp[-2].interm.type).loc); }
-#line 6446 "MachineIndependent/glslang_tab.cpp"
+#line 6214 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 105: /* block_structure: type_qualifier IDENTIFIER LEFT_BRACE $@2 struct_declaration_list RIGHT_BRACE  */
-#line 937 "MachineIndependent/glslang.y"
+  case 106: /* block_structure: type_qualifier IDENTIFIER LEFT_BRACE $@2 struct_declaration_list RIGHT_BRACE  */
+#line 939 "MachineIndependent/glslang.y"
                                                                                                                           {
         --parseContext.blockNestingLevel;
         parseContext.blockName = (yyvsp[-4].lex).string;
@@ -6456,39 +6224,39 @@ yyreduce:
         (yyval.interm).loc = (yyvsp[-5].interm.type).loc;
         (yyval.interm).typeList = (yyvsp[-1].interm.typeList);
     }
-#line 6460 "MachineIndependent/glslang_tab.cpp"
+#line 6228 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 106: /* identifier_list: IDENTIFIER  */
-#line 948 "MachineIndependent/glslang.y"
-                 {
+  case 107: /* identifier_list: COMMA IDENTIFIER  */
+#line 950 "MachineIndependent/glslang.y"
+                       {
         (yyval.interm.identifierList) = new TIdentifierList;
         (yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
     }
-#line 6469 "MachineIndependent/glslang_tab.cpp"
+#line 6237 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 107: /* identifier_list: identifier_list COMMA IDENTIFIER  */
-#line 952 "MachineIndependent/glslang.y"
+  case 108: /* identifier_list: identifier_list COMMA IDENTIFIER  */
+#line 954 "MachineIndependent/glslang.y"
                                        {
         (yyval.interm.identifierList) = (yyvsp[-2].interm.identifierList);
         (yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
     }
-#line 6478 "MachineIndependent/glslang_tab.cpp"
+#line 6246 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 108: /* function_prototype: function_declarator RIGHT_PAREN  */
-#line 959 "MachineIndependent/glslang.y"
+  case 109: /* function_prototype: function_declarator RIGHT_PAREN  */
+#line 961 "MachineIndependent/glslang.y"
                                        {
         (yyval.interm).function = (yyvsp[-1].interm.function);
         if (parseContext.compileOnly) (yyval.interm).function->setExport();
         (yyval.interm).loc = (yyvsp[0].lex).loc;
     }
-#line 6488 "MachineIndependent/glslang_tab.cpp"
+#line 6256 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 109: /* function_prototype: function_declarator RIGHT_PAREN attribute  */
-#line 964 "MachineIndependent/glslang.y"
+  case 110: /* function_prototype: function_declarator RIGHT_PAREN attribute  */
+#line 966 "MachineIndependent/glslang.y"
                                                 {
         (yyval.interm).function = (yyvsp[-2].interm.function);
         if (parseContext.compileOnly) (yyval.interm).function->setExport();
@@ -6497,11 +6265,11 @@ yyreduce:
         parseContext.requireExtensions((yyvsp[-1].lex).loc, 2, extensions, "attribute");
         parseContext.handleFunctionAttributes((yyvsp[-1].lex).loc, *(yyvsp[0].interm.attributes));
     }
-#line 6501 "MachineIndependent/glslang_tab.cpp"
+#line 6269 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 110: /* function_prototype: attribute function_declarator RIGHT_PAREN  */
-#line 972 "MachineIndependent/glslang.y"
+  case 111: /* function_prototype: attribute function_declarator RIGHT_PAREN  */
+#line 974 "MachineIndependent/glslang.y"
                                                 {
         (yyval.interm).function = (yyvsp[-1].interm.function);
         if (parseContext.compileOnly) (yyval.interm).function->setExport();
@@ -6510,11 +6278,11 @@ yyreduce:
         parseContext.requireExtensions((yyvsp[0].lex).loc, 2, extensions, "attribute");
         parseContext.handleFunctionAttributes((yyvsp[0].lex).loc, *(yyvsp[-2].interm.attributes));
     }
-#line 6514 "MachineIndependent/glslang_tab.cpp"
+#line 6282 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 111: /* function_prototype: attribute function_declarator RIGHT_PAREN attribute  */
-#line 980 "MachineIndependent/glslang.y"
+  case 112: /* function_prototype: attribute function_declarator RIGHT_PAREN attribute  */
+#line 982 "MachineIndependent/glslang.y"
                                                           {
         (yyval.interm).function = (yyvsp[-2].interm.function);
         if (parseContext.compileOnly) (yyval.interm).function->setExport();
@@ -6524,27 +6292,27 @@ yyreduce:
         parseContext.handleFunctionAttributes((yyvsp[-1].lex).loc, *(yyvsp[-3].interm.attributes));
         parseContext.handleFunctionAttributes((yyvsp[-1].lex).loc, *(yyvsp[0].interm.attributes));
     }
-#line 6528 "MachineIndependent/glslang_tab.cpp"
+#line 6296 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 112: /* function_declarator: function_header  */
-#line 992 "MachineIndependent/glslang.y"
+  case 113: /* function_declarator: function_header  */
+#line 994 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.function) = (yyvsp[0].interm.function);
     }
-#line 6536 "MachineIndependent/glslang_tab.cpp"
+#line 6304 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 113: /* function_declarator: function_header_with_parameters  */
-#line 995 "MachineIndependent/glslang.y"
+  case 114: /* function_declarator: function_header_with_parameters  */
+#line 997 "MachineIndependent/glslang.y"
                                       {
         (yyval.interm.function) = (yyvsp[0].interm.function);
     }
-#line 6544 "MachineIndependent/glslang_tab.cpp"
+#line 6312 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 114: /* function_header_with_parameters: function_header parameter_declaration  */
-#line 1002 "MachineIndependent/glslang.y"
+  case 115: /* function_header_with_parameters: function_header parameter_declaration  */
+#line 1004 "MachineIndependent/glslang.y"
                                             {
         // Add the parameter
         (yyval.interm.function) = (yyvsp[-1].interm.function);
@@ -6558,11 +6326,11 @@ yyreduce:
         else
             delete (yyvsp[0].interm).param.type;
     }
-#line 6562 "MachineIndependent/glslang_tab.cpp"
+#line 6330 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 115: /* function_header_with_parameters: function_header_with_parameters COMMA parameter_declaration  */
-#line 1015 "MachineIndependent/glslang.y"
+  case 116: /* function_header_with_parameters: function_header_with_parameters COMMA parameter_declaration  */
+#line 1017 "MachineIndependent/glslang.y"
                                                                   {
         //
         // Only first parameter of one-parameter functions can be void
@@ -6583,20 +6351,11 @@ yyreduce:
                 parseContext.vkRelaxedRemapFunctionParameter((yyvsp[-2].interm.function), (yyvsp[0].interm).param);
         }
     }
-#line 6587 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 116: /* function_header_with_parameters: function_header_with_parameters COMMA DOT DOT DOT  */
-#line 1035 "MachineIndependent/glslang.y"
-                                                        {
-        (yyval.interm.function) = (yyvsp[-4].interm.function);
-        parseContext.makeVariadic((yyvsp[-4].interm.function), (yyvsp[-2].lex).loc);
-    }
-#line 6596 "MachineIndependent/glslang_tab.cpp"
+#line 6355 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 117: /* function_header: fully_specified_type IDENTIFIER LEFT_PAREN  */
-#line 1042 "MachineIndependent/glslang.y"
+#line 1040 "MachineIndependent/glslang.y"
                                                  {
         if ((yyvsp[-2].interm.type).qualifier.storage != EvqGlobal && (yyvsp[-2].interm.type).qualifier.storage != EvqTemporary) {
             parseContext.error((yyvsp[-1].lex).loc, "no qualifiers allowed for function return",
@@ -6616,11 +6375,11 @@ yyreduce:
         function = new TFunction((yyvsp[-1].lex).string, type);
         (yyval.interm.function) = function;
     }
-#line 6620 "MachineIndependent/glslang_tab.cpp"
+#line 6379 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 118: /* parameter_declarator: type_specifier IDENTIFIER  */
-#line 1065 "MachineIndependent/glslang.y"
+#line 1063 "MachineIndependent/glslang.y"
                                 {
         if ((yyvsp[-1].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -6636,11 +6395,11 @@ yyreduce:
         (yyval.interm).loc = (yyvsp[0].lex).loc;
         (yyval.interm).param = param;
     }
-#line 6640 "MachineIndependent/glslang_tab.cpp"
+#line 6399 "MachineIndependent/glslang_tab.cpp"
     break;
 
   case 119: /* parameter_declarator: type_specifier IDENTIFIER array_specifier  */
-#line 1080 "MachineIndependent/glslang.y"
+#line 1078 "MachineIndependent/glslang.y"
                                                 {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -6660,186 +6419,173 @@ yyreduce:
         (yyval.interm).loc = (yyvsp[-1].lex).loc;
         (yyval.interm).param = param;
     }
-#line 6664 "MachineIndependent/glslang_tab.cpp"
+#line 6423 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 120: /* parameter_declarator: type_specifier IDENTIFIER EQUAL initializer  */
-#line 1099 "MachineIndependent/glslang.y"
-                                                  {
-        TParameter param = parseContext.getParamWithDefault((yyvsp[-3].interm.type), (yyvsp[-2].lex).string, (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
-        (yyval.interm).loc = (yyvsp[-2].lex).loc;
-        (yyval.interm).param = param;
-    }
-#line 6674 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 121: /* parameter_declaration: type_qualifier parameter_declarator  */
-#line 1110 "MachineIndependent/glslang.y"
+  case 120: /* parameter_declaration: type_qualifier parameter_declarator  */
+#line 1103 "MachineIndependent/glslang.y"
                                           {
         (yyval.interm) = (yyvsp[0].interm);
         if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
             (yyval.interm).param.type->getQualifier().precision = (yyvsp[-1].interm.type).qualifier.precision;
-        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->isCoopMat());
 
         parseContext.checkNoShaderLayouts((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).shaderQualifiers);
         parseContext.parameterTypeCheck((yyvsp[0].interm).loc, (yyvsp[-1].interm.type).qualifier.storage, *(yyval.interm).param.type);
         parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
 
     }
-#line 6690 "MachineIndependent/glslang_tab.cpp"
+#line 6439 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 122: /* parameter_declaration: parameter_declarator  */
-#line 1121 "MachineIndependent/glslang.y"
+  case 121: /* parameter_declaration: parameter_declarator  */
+#line 1114 "MachineIndependent/glslang.y"
                            {
         (yyval.interm) = (yyvsp[0].interm);
 
         parseContext.parameterTypeCheck((yyvsp[0].interm).loc, EvqIn, *(yyvsp[0].interm).param.type);
         parseContext.paramCheckFixStorage((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
-        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->isCoopMat());
     }
-#line 6702 "MachineIndependent/glslang_tab.cpp"
+#line 6451 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 123: /* parameter_declaration: type_qualifier parameter_type_specifier  */
-#line 1131 "MachineIndependent/glslang.y"
+  case 122: /* parameter_declaration: type_qualifier parameter_type_specifier  */
+#line 1124 "MachineIndependent/glslang.y"
                                               {
         (yyval.interm) = (yyvsp[0].interm);
         if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
             (yyval.interm).param.type->getQualifier().precision = (yyvsp[-1].interm.type).qualifier.precision;
-        parseContext.precisionQualifierCheck((yyvsp[-1].interm.type).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyvsp[-1].interm.type).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->isCoopMat());
 
         parseContext.checkNoShaderLayouts((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).shaderQualifiers);
         parseContext.parameterTypeCheck((yyvsp[0].interm).loc, (yyvsp[-1].interm.type).qualifier.storage, *(yyval.interm).param.type);
         parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
     }
-#line 6717 "MachineIndependent/glslang_tab.cpp"
+#line 6466 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 124: /* parameter_declaration: parameter_type_specifier  */
-#line 1141 "MachineIndependent/glslang.y"
+  case 123: /* parameter_declaration: parameter_type_specifier  */
+#line 1134 "MachineIndependent/glslang.y"
                                {
         (yyval.interm) = (yyvsp[0].interm);
 
         parseContext.parameterTypeCheck((yyvsp[0].interm).loc, EvqIn, *(yyvsp[0].interm).param.type);
         parseContext.paramCheckFixStorage((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
-        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier(), (yyval.interm).param.type->isCoopMat());
     }
-#line 6729 "MachineIndependent/glslang_tab.cpp"
+#line 6478 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 125: /* parameter_type_specifier: type_specifier  */
-#line 1151 "MachineIndependent/glslang.y"
+  case 124: /* parameter_type_specifier: type_specifier  */
+#line 1144 "MachineIndependent/glslang.y"
                      {
         TParameter param = { 0, new TType((yyvsp[0].interm.type)), {} };
         (yyval.interm).param = param;
         if ((yyvsp[0].interm.type).arraySizes)
             parseContext.arraySizeRequiredCheck((yyvsp[0].interm.type).loc, *(yyvsp[0].interm.type).arraySizes);
     }
-#line 6740 "MachineIndependent/glslang_tab.cpp"
+#line 6489 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 126: /* init_declarator_list: single_declaration  */
-#line 1160 "MachineIndependent/glslang.y"
+  case 125: /* init_declarator_list: single_declaration  */
+#line 1153 "MachineIndependent/glslang.y"
                          {
         (yyval.interm) = (yyvsp[0].interm);
     }
-#line 6748 "MachineIndependent/glslang_tab.cpp"
+#line 6497 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 127: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER  */
-#line 1163 "MachineIndependent/glslang.y"
+  case 126: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER  */
+#line 1156 "MachineIndependent/glslang.y"
                                             {
         (yyval.interm) = (yyvsp[-2].interm);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-2].interm).type);
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-2].interm).intermNode, declNode, (yyvsp[0].lex).loc);
+        parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-2].interm).type);
     }
-#line 6758 "MachineIndependent/glslang_tab.cpp"
+#line 6506 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 128: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier  */
-#line 1168 "MachineIndependent/glslang.y"
+  case 127: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier  */
+#line 1160 "MachineIndependent/glslang.y"
                                                             {
         (yyval.interm) = (yyvsp[-3].interm);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-3].interm).type, (yyvsp[0].interm).arraySizes);
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-3].interm).intermNode, declNode, (yyvsp[-1].lex).loc);
+        parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-3].interm).type, (yyvsp[0].interm).arraySizes);
     }
-#line 6768 "MachineIndependent/glslang_tab.cpp"
+#line 6515 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 129: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier EQUAL initializer  */
-#line 1173 "MachineIndependent/glslang.y"
+  case 128: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier EQUAL initializer  */
+#line 1164 "MachineIndependent/glslang.y"
                                                                               {
         (yyval.interm).type = (yyvsp[-5].interm).type;
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-5].interm).type, (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-5].interm).intermNode, declNode, (yyvsp[-1].lex).loc);
+        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-5].interm).type, (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
+        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-5].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
     }
-#line 6778 "MachineIndependent/glslang_tab.cpp"
+#line 6525 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 130: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER EQUAL initializer  */
-#line 1178 "MachineIndependent/glslang.y"
+  case 129: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER EQUAL initializer  */
+#line 1169 "MachineIndependent/glslang.y"
                                                               {
         (yyval.interm).type = (yyvsp[-4].interm).type;
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, 0, (yyvsp[0].interm.intermTypedNode));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, declNode, (yyvsp[-1].lex).loc);
+        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, 0, (yyvsp[0].interm.intermTypedNode));
+        (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
     }
-#line 6788 "MachineIndependent/glslang_tab.cpp"
+#line 6535 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 131: /* single_declaration: fully_specified_type  */
-#line 1186 "MachineIndependent/glslang.y"
+  case 130: /* single_declaration: fully_specified_type  */
+#line 1177 "MachineIndependent/glslang.y"
                            {
         (yyval.interm).type = (yyvsp[0].interm.type);
         (yyval.interm).intermNode = 0;
         parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type);
     }
-#line 6798 "MachineIndependent/glslang_tab.cpp"
+#line 6545 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 132: /* single_declaration: fully_specified_type IDENTIFIER  */
-#line 1191 "MachineIndependent/glslang.y"
+  case 131: /* single_declaration: fully_specified_type IDENTIFIER  */
+#line 1182 "MachineIndependent/glslang.y"
                                       {
         (yyval.interm).type = (yyvsp[-1].interm.type);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, (yyvsp[0].lex).loc);
-
+        (yyval.interm).intermNode = 0;
+        parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
     }
-#line 6809 "MachineIndependent/glslang_tab.cpp"
+#line 6555 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 133: /* single_declaration: fully_specified_type IDENTIFIER array_specifier  */
-#line 1197 "MachineIndependent/glslang.y"
+  case 132: /* single_declaration: fully_specified_type IDENTIFIER array_specifier  */
+#line 1187 "MachineIndependent/glslang.y"
                                                       {
         (yyval.interm).type = (yyvsp[-2].interm.type);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, (yyvsp[-1].lex).loc);
+        (yyval.interm).intermNode = 0;
+        parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
     }
-#line 6819 "MachineIndependent/glslang_tab.cpp"
+#line 6565 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 134: /* single_declaration: fully_specified_type IDENTIFIER array_specifier EQUAL initializer  */
-#line 1202 "MachineIndependent/glslang.y"
+  case 133: /* single_declaration: fully_specified_type IDENTIFIER array_specifier EQUAL initializer  */
+#line 1192 "MachineIndependent/glslang.y"
                                                                         {
         (yyval.interm).type = (yyvsp[-4].interm.type);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-4].interm.type), (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, (yyvsp[-3].lex).loc);
+        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-4].interm.type), (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
+        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
     }
-#line 6829 "MachineIndependent/glslang_tab.cpp"
+#line 6575 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 135: /* single_declaration: fully_specified_type IDENTIFIER EQUAL initializer  */
-#line 1207 "MachineIndependent/glslang.y"
+  case 134: /* single_declaration: fully_specified_type IDENTIFIER EQUAL initializer  */
+#line 1197 "MachineIndependent/glslang.y"
                                                         {
         (yyval.interm).type = (yyvsp[-3].interm.type);
-        TIntermNode* declNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
-        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, declNode, (yyvsp[-2].lex).loc);
+        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
+        (yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
     }
-#line 6839 "MachineIndependent/glslang_tab.cpp"
+#line 6585 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 136: /* fully_specified_type: type_specifier  */
-#line 1216 "MachineIndependent/glslang.y"
+  case 135: /* fully_specified_type: type_specifier  */
+#line 1206 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type) = (yyvsp[0].interm.type);
 
@@ -6848,13 +6594,13 @@ yyreduce:
             parseContext.profileRequires((yyvsp[0].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
             parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, 0, "arrayed type");
         }
-        parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier, (yyval.interm.type).hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier, (yyval.interm.type).isCoopmat());
     }
-#line 6854 "MachineIndependent/glslang_tab.cpp"
+#line 6600 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 137: /* fully_specified_type: type_qualifier type_specifier  */
-#line 1226 "MachineIndependent/glslang.y"
+  case 136: /* fully_specified_type: type_qualifier type_specifier  */
+#line 1216 "MachineIndependent/glslang.y"
                                      {
         parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, false, &(yyvsp[0].interm.type));
         parseContext.globalQualifierTypeCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, (yyvsp[0].interm.type));
@@ -6870,7 +6616,7 @@ yyreduce:
         parseContext.checkNoShaderLayouts((yyvsp[0].interm.type).loc, (yyvsp[-1].interm.type).shaderQualifiers);
         (yyvsp[0].interm.type).shaderQualifiers.merge((yyvsp[-1].interm.type).shaderQualifiers);
         parseContext.mergeQualifiers((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier, (yyvsp[-1].interm.type).qualifier, true);
-        parseContext.precisionQualifierCheck((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).basicType, (yyvsp[0].interm.type).qualifier, (yyvsp[0].interm.type).hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).basicType, (yyvsp[0].interm.type).qualifier, (yyvsp[0].interm.type).isCoopmat());
 
         (yyval.interm.type) = (yyvsp[0].interm.type);
 
@@ -6879,22 +6625,22 @@ yyreduce:
              (parseContext.language == EShLangFragment && (yyval.interm.type).qualifier.storage == EvqVaryingIn)))
             (yyval.interm.type).qualifier.smooth = true;
     }
-#line 6883 "MachineIndependent/glslang_tab.cpp"
+#line 6629 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 138: /* invariant_qualifier: INVARIANT  */
-#line 1253 "MachineIndependent/glslang.y"
+  case 137: /* invariant_qualifier: INVARIANT  */
+#line 1243 "MachineIndependent/glslang.y"
                 {
         parseContext.globalCheck((yyvsp[0].lex).loc, "invariant");
         parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, 0, "invariant");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.invariant = true;
     }
-#line 6894 "MachineIndependent/glslang_tab.cpp"
+#line 6640 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 139: /* interpolation_qualifier: SMOOTH  */
-#line 1262 "MachineIndependent/glslang.y"
+  case 138: /* interpolation_qualifier: SMOOTH  */
+#line 1252 "MachineIndependent/glslang.y"
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "smooth");
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "smooth");
@@ -6902,11 +6648,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.smooth = true;
     }
-#line 6906 "MachineIndependent/glslang_tab.cpp"
+#line 6652 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 140: /* interpolation_qualifier: FLAT  */
-#line 1269 "MachineIndependent/glslang.y"
+  case 139: /* interpolation_qualifier: FLAT  */
+#line 1259 "MachineIndependent/glslang.y"
            {
         parseContext.globalCheck((yyvsp[0].lex).loc, "flat");
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "flat");
@@ -6914,11 +6660,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.flat = true;
     }
-#line 6918 "MachineIndependent/glslang_tab.cpp"
+#line 6664 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 141: /* interpolation_qualifier: NOPERSPECTIVE  */
-#line 1276 "MachineIndependent/glslang.y"
+  case 140: /* interpolation_qualifier: NOPERSPECTIVE  */
+#line 1266 "MachineIndependent/glslang.y"
                     {
         parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective");
         parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 0, E_GL_NV_shader_noperspective_interpolation, "noperspective");
@@ -6926,11 +6672,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.nopersp = true;
     }
-#line 6930 "MachineIndependent/glslang_tab.cpp"
+#line 6676 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 142: /* interpolation_qualifier: EXPLICITINTERPAMD  */
-#line 1283 "MachineIndependent/glslang.y"
+  case 141: /* interpolation_qualifier: EXPLICITINTERPAMD  */
+#line 1273 "MachineIndependent/glslang.y"
                         {
         parseContext.globalCheck((yyvsp[0].lex).loc, "__explicitInterpAMD");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 450, E_GL_AMD_shader_explicit_vertex_parameter, "explicit interpolation");
@@ -6938,11 +6684,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.explicitInterp = true;
     }
-#line 6942 "MachineIndependent/glslang_tab.cpp"
+#line 6688 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 143: /* interpolation_qualifier: PERVERTEXNV  */
-#line 1290 "MachineIndependent/glslang.y"
+  case 142: /* interpolation_qualifier: PERVERTEXNV  */
+#line 1280 "MachineIndependent/glslang.y"
                   {
         parseContext.globalCheck((yyvsp[0].lex).loc, "pervertexNV");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 0, E_GL_NV_fragment_shader_barycentric, "fragment shader barycentric");
@@ -6951,11 +6697,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.pervertexNV = true;
     }
-#line 6955 "MachineIndependent/glslang_tab.cpp"
+#line 6701 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 144: /* interpolation_qualifier: PERVERTEXEXT  */
-#line 1298 "MachineIndependent/glslang.y"
+  case 143: /* interpolation_qualifier: PERVERTEXEXT  */
+#line 1288 "MachineIndependent/glslang.y"
                    {
         parseContext.globalCheck((yyvsp[0].lex).loc, "pervertexEXT");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 0, E_GL_EXT_fragment_shader_barycentric, "fragment shader barycentric");
@@ -6964,11 +6710,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.pervertexEXT = true;
     }
-#line 6968 "MachineIndependent/glslang_tab.cpp"
+#line 6714 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 145: /* interpolation_qualifier: PERPRIMITIVENV  */
-#line 1306 "MachineIndependent/glslang.y"
+  case 144: /* interpolation_qualifier: PERPRIMITIVENV  */
+#line 1296 "MachineIndependent/glslang.y"
                      {
         // No need for profile version or extension check. Shader stage already checks both.
         parseContext.globalCheck((yyvsp[0].lex).loc, "perprimitiveNV");
@@ -6979,11 +6725,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.perPrimitiveNV = true;
     }
-#line 6983 "MachineIndependent/glslang_tab.cpp"
+#line 6729 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 146: /* interpolation_qualifier: PERPRIMITIVEEXT  */
-#line 1316 "MachineIndependent/glslang.y"
+  case 145: /* interpolation_qualifier: PERPRIMITIVEEXT  */
+#line 1306 "MachineIndependent/glslang.y"
                       {
         // No need for profile version or extension check. Shader stage already checks both.
         parseContext.globalCheck((yyvsp[0].lex).loc, "perprimitiveEXT");
@@ -6994,11 +6740,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.perPrimitiveNV = true;
     }
-#line 6998 "MachineIndependent/glslang_tab.cpp"
+#line 6744 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 147: /* interpolation_qualifier: PERVIEWNV  */
-#line 1326 "MachineIndependent/glslang.y"
+  case 146: /* interpolation_qualifier: PERVIEWNV  */
+#line 1316 "MachineIndependent/glslang.y"
                 {
         // No need for profile version or extension check. Shader stage already checks both.
         parseContext.globalCheck((yyvsp[0].lex).loc, "perviewNV");
@@ -7006,11 +6752,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.perViewNV = true;
     }
-#line 7010 "MachineIndependent/glslang_tab.cpp"
+#line 6756 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 148: /* interpolation_qualifier: PERTASKNV  */
-#line 1333 "MachineIndependent/glslang.y"
+  case 147: /* interpolation_qualifier: PERTASKNV  */
+#line 1323 "MachineIndependent/glslang.y"
                 {
         // No need for profile version or extension check. Shader stage already checks both.
         parseContext.globalCheck((yyvsp[0].lex).loc, "taskNV");
@@ -7018,84 +6764,84 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.perTaskNV = true;
     }
-#line 7022 "MachineIndependent/glslang_tab.cpp"
+#line 6768 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 149: /* layout_qualifier: LAYOUT LEFT_PAREN layout_qualifier_id_list RIGHT_PAREN  */
-#line 1343 "MachineIndependent/glslang.y"
+  case 148: /* layout_qualifier: LAYOUT LEFT_PAREN layout_qualifier_id_list RIGHT_PAREN  */
+#line 1333 "MachineIndependent/glslang.y"
                                                              {
         (yyval.interm.type) = (yyvsp[-1].interm.type);
     }
-#line 7030 "MachineIndependent/glslang_tab.cpp"
+#line 6776 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 150: /* layout_qualifier_id_list: layout_qualifier_id  */
-#line 1349 "MachineIndependent/glslang.y"
+  case 149: /* layout_qualifier_id_list: layout_qualifier_id  */
+#line 1339 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7038 "MachineIndependent/glslang_tab.cpp"
+#line 6784 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 151: /* layout_qualifier_id_list: layout_qualifier_id_list COMMA layout_qualifier_id  */
-#line 1352 "MachineIndependent/glslang.y"
+  case 150: /* layout_qualifier_id_list: layout_qualifier_id_list COMMA layout_qualifier_id  */
+#line 1342 "MachineIndependent/glslang.y"
                                                          {
         (yyval.interm.type) = (yyvsp[-2].interm.type);
         (yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
         parseContext.mergeObjectLayoutQualifiers((yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
     }
-#line 7048 "MachineIndependent/glslang_tab.cpp"
+#line 6794 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 152: /* layout_qualifier_id: IDENTIFIER  */
-#line 1359 "MachineIndependent/glslang.y"
+  case 151: /* layout_qualifier_id: IDENTIFIER  */
+#line 1349 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), *(yyvsp[0].lex).string);
     }
-#line 7057 "MachineIndependent/glslang_tab.cpp"
+#line 6803 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 153: /* layout_qualifier_id: IDENTIFIER EQUAL constant_expression  */
-#line 1363 "MachineIndependent/glslang.y"
+  case 152: /* layout_qualifier_id: IDENTIFIER EQUAL constant_expression  */
+#line 1353 "MachineIndependent/glslang.y"
                                            {
         (yyval.interm.type).init((yyvsp[-2].lex).loc);
         parseContext.setLayoutQualifier((yyvsp[-2].lex).loc, (yyval.interm.type), *(yyvsp[-2].lex).string, (yyvsp[0].interm.intermTypedNode));
     }
-#line 7066 "MachineIndependent/glslang_tab.cpp"
+#line 6812 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 154: /* layout_qualifier_id: SHARED  */
-#line 1367 "MachineIndependent/glslang.y"
+  case 153: /* layout_qualifier_id: SHARED  */
+#line 1357 "MachineIndependent/glslang.y"
              { // because "shared" is both an identifier and a keyword
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         TString strShared("shared");
         parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), strShared);
     }
-#line 7076 "MachineIndependent/glslang_tab.cpp"
+#line 6822 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 155: /* precise_qualifier: PRECISE  */
-#line 1375 "MachineIndependent/glslang.y"
+  case 154: /* precise_qualifier: PRECISE  */
+#line 1365 "MachineIndependent/glslang.y"
               {
         parseContext.profileRequires((yyval.interm.type).loc, ECoreProfile | ECompatibilityProfile, 400, E_GL_ARB_gpu_shader5, "precise");
         parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, "precise");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.noContraction = true;
     }
-#line 7087 "MachineIndependent/glslang_tab.cpp"
+#line 6833 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 156: /* type_qualifier: single_type_qualifier  */
-#line 1384 "MachineIndependent/glslang.y"
+  case 155: /* type_qualifier: single_type_qualifier  */
+#line 1374 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7095 "MachineIndependent/glslang_tab.cpp"
+#line 6841 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 157: /* type_qualifier: type_qualifier single_type_qualifier  */
-#line 1387 "MachineIndependent/glslang.y"
+  case 156: /* type_qualifier: type_qualifier single_type_qualifier  */
+#line 1377 "MachineIndependent/glslang.y"
                                            {
         (yyval.interm.type) = (yyvsp[-1].interm.type);
         if ((yyval.interm.type).basicType == EbtVoid)
@@ -7104,151 +6850,151 @@ yyreduce:
         (yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
         parseContext.mergeQualifiers((yyval.interm.type).loc, (yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
     }
-#line 7108 "MachineIndependent/glslang_tab.cpp"
+#line 6854 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 158: /* single_type_qualifier: storage_qualifier  */
-#line 1398 "MachineIndependent/glslang.y"
+  case 157: /* single_type_qualifier: storage_qualifier  */
+#line 1388 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7116 "MachineIndependent/glslang_tab.cpp"
+#line 6862 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 159: /* single_type_qualifier: layout_qualifier  */
-#line 1401 "MachineIndependent/glslang.y"
+  case 158: /* single_type_qualifier: layout_qualifier  */
+#line 1391 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7124 "MachineIndependent/glslang_tab.cpp"
+#line 6870 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 160: /* single_type_qualifier: precision_qualifier  */
-#line 1404 "MachineIndependent/glslang.y"
+  case 159: /* single_type_qualifier: precision_qualifier  */
+#line 1394 "MachineIndependent/glslang.y"
                           {
         parseContext.checkPrecisionQualifier((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier.precision);
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7133 "MachineIndependent/glslang_tab.cpp"
+#line 6879 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 161: /* single_type_qualifier: interpolation_qualifier  */
-#line 1408 "MachineIndependent/glslang.y"
+  case 160: /* single_type_qualifier: interpolation_qualifier  */
+#line 1398 "MachineIndependent/glslang.y"
                               {
         // allow inheritance of storage qualifier from block declaration
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7142 "MachineIndependent/glslang_tab.cpp"
+#line 6888 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 162: /* single_type_qualifier: invariant_qualifier  */
-#line 1412 "MachineIndependent/glslang.y"
+  case 161: /* single_type_qualifier: invariant_qualifier  */
+#line 1402 "MachineIndependent/glslang.y"
                           {
         // allow inheritance of storage qualifier from block declaration
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7151 "MachineIndependent/glslang_tab.cpp"
+#line 6897 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 163: /* single_type_qualifier: precise_qualifier  */
-#line 1416 "MachineIndependent/glslang.y"
+  case 162: /* single_type_qualifier: precise_qualifier  */
+#line 1406 "MachineIndependent/glslang.y"
                         {
         // allow inheritance of storage qualifier from block declaration
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7160 "MachineIndependent/glslang_tab.cpp"
+#line 6906 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 164: /* single_type_qualifier: non_uniform_qualifier  */
-#line 1420 "MachineIndependent/glslang.y"
+  case 163: /* single_type_qualifier: non_uniform_qualifier  */
+#line 1410 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7168 "MachineIndependent/glslang_tab.cpp"
+#line 6914 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 165: /* single_type_qualifier: spirv_storage_class_qualifier  */
-#line 1423 "MachineIndependent/glslang.y"
+  case 164: /* single_type_qualifier: spirv_storage_class_qualifier  */
+#line 1413 "MachineIndependent/glslang.y"
                                     {
         parseContext.globalCheck((yyvsp[0].interm.type).loc, "spirv_storage_class");
         parseContext.requireExtensions((yyvsp[0].interm.type).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V storage class qualifier");
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7178 "MachineIndependent/glslang_tab.cpp"
+#line 6924 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 166: /* single_type_qualifier: spirv_decorate_qualifier  */
-#line 1428 "MachineIndependent/glslang.y"
+  case 165: /* single_type_qualifier: spirv_decorate_qualifier  */
+#line 1418 "MachineIndependent/glslang.y"
                                {
         parseContext.requireExtensions((yyvsp[0].interm.type).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V decorate qualifier");
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 7187 "MachineIndependent/glslang_tab.cpp"
+#line 6933 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 167: /* single_type_qualifier: SPIRV_BY_REFERENCE  */
-#line 1432 "MachineIndependent/glslang.y"
+  case 166: /* single_type_qualifier: SPIRV_BY_REFERENCE  */
+#line 1422 "MachineIndependent/glslang.y"
                          {
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_spirv_intrinsics, "spirv_by_reference");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.setSpirvByReference();
     }
-#line 7197 "MachineIndependent/glslang_tab.cpp"
+#line 6943 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 168: /* single_type_qualifier: SPIRV_LITERAL  */
-#line 1437 "MachineIndependent/glslang.y"
+  case 167: /* single_type_qualifier: SPIRV_LITERAL  */
+#line 1427 "MachineIndependent/glslang.y"
                     {
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_spirv_intrinsics, "spirv_by_literal");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.setSpirvLiteral();
     }
-#line 7207 "MachineIndependent/glslang_tab.cpp"
+#line 6953 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 169: /* storage_qualifier: CONST  */
-#line 1445 "MachineIndependent/glslang.y"
+  case 168: /* storage_qualifier: CONST  */
+#line 1435 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqConst;  // will later turn into EvqConstReadOnly, if the initializer is not constant
     }
-#line 7216 "MachineIndependent/glslang_tab.cpp"
+#line 6962 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 170: /* storage_qualifier: INOUT  */
-#line 1449 "MachineIndependent/glslang.y"
+  case 169: /* storage_qualifier: INOUT  */
+#line 1439 "MachineIndependent/glslang.y"
             {
         parseContext.globalCheck((yyvsp[0].lex).loc, "inout");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqInOut;
     }
-#line 7226 "MachineIndependent/glslang_tab.cpp"
+#line 6972 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 171: /* storage_qualifier: IN  */
-#line 1454 "MachineIndependent/glslang.y"
+  case 170: /* storage_qualifier: IN  */
+#line 1444 "MachineIndependent/glslang.y"
          {
         parseContext.globalCheck((yyvsp[0].lex).loc, "in");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         // whether this is a parameter "in" or a pipeline "in" will get sorted out a bit later
         (yyval.interm.type).qualifier.storage = EvqIn;
     }
-#line 7237 "MachineIndependent/glslang_tab.cpp"
+#line 6983 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 172: /* storage_qualifier: OUT  */
-#line 1460 "MachineIndependent/glslang.y"
+  case 171: /* storage_qualifier: OUT  */
+#line 1450 "MachineIndependent/glslang.y"
           {
         parseContext.globalCheck((yyvsp[0].lex).loc, "out");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         // whether this is a parameter "out" or a pipeline "out" will get sorted out a bit later
         (yyval.interm.type).qualifier.storage = EvqOut;
     }
-#line 7248 "MachineIndependent/glslang_tab.cpp"
+#line 6994 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 173: /* storage_qualifier: CENTROID  */
-#line 1466 "MachineIndependent/glslang.y"
+  case 172: /* storage_qualifier: CENTROID  */
+#line 1456 "MachineIndependent/glslang.y"
                {
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, 0, "centroid");
         parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "centroid");
@@ -7256,31 +7002,31 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.centroid = true;
     }
-#line 7260 "MachineIndependent/glslang_tab.cpp"
+#line 7006 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 174: /* storage_qualifier: UNIFORM  */
-#line 1473 "MachineIndependent/glslang.y"
+  case 173: /* storage_qualifier: UNIFORM  */
+#line 1463 "MachineIndependent/glslang.y"
               {
         parseContext.globalCheck((yyvsp[0].lex).loc, "uniform");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqUniform;
     }
-#line 7270 "MachineIndependent/glslang_tab.cpp"
+#line 7016 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 175: /* storage_qualifier: TILEIMAGEEXT  */
-#line 1478 "MachineIndependent/glslang.y"
+  case 174: /* storage_qualifier: TILEIMAGEEXT  */
+#line 1468 "MachineIndependent/glslang.y"
                    {
         parseContext.globalCheck((yyvsp[0].lex).loc, "tileImageEXT");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqTileImageEXT;
     }
-#line 7280 "MachineIndependent/glslang_tab.cpp"
+#line 7026 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 176: /* storage_qualifier: SHARED  */
-#line 1483 "MachineIndependent/glslang.y"
+  case 175: /* storage_qualifier: SHARED  */
+#line 1473 "MachineIndependent/glslang.y"
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "shared");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared");
@@ -7289,21 +7035,21 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqShared;
     }
-#line 7293 "MachineIndependent/glslang_tab.cpp"
+#line 7039 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 177: /* storage_qualifier: BUFFER  */
-#line 1491 "MachineIndependent/glslang.y"
+  case 176: /* storage_qualifier: BUFFER  */
+#line 1481 "MachineIndependent/glslang.y"
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "buffer");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqBuffer;
     }
-#line 7303 "MachineIndependent/glslang_tab.cpp"
+#line 7049 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 178: /* storage_qualifier: ATTRIBUTE  */
-#line 1496 "MachineIndependent/glslang.y"
+  case 177: /* storage_qualifier: ATTRIBUTE  */
+#line 1486 "MachineIndependent/glslang.y"
                 {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangVertex, "attribute");
         parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "attribute");
@@ -7316,11 +7062,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqVaryingIn;
     }
-#line 7320 "MachineIndependent/glslang_tab.cpp"
+#line 7066 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 179: /* storage_qualifier: VARYING  */
-#line 1508 "MachineIndependent/glslang.y"
+  case 178: /* storage_qualifier: VARYING  */
+#line 1498 "MachineIndependent/glslang.y"
               {
         parseContext.checkDeprecated((yyvsp[0].lex).loc, ENoProfile, 130, "varying");
         parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "varying");
@@ -7335,32 +7081,32 @@ yyreduce:
         else
             (yyval.interm.type).qualifier.storage = EvqVaryingIn;
     }
-#line 7339 "MachineIndependent/glslang_tab.cpp"
+#line 7085 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 180: /* storage_qualifier: PATCH  */
-#line 1522 "MachineIndependent/glslang.y"
+  case 179: /* storage_qualifier: PATCH  */
+#line 1512 "MachineIndependent/glslang.y"
             {
         parseContext.globalCheck((yyvsp[0].lex).loc, "patch");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangTessControlMask | EShLangTessEvaluationMask), "patch");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.patch = true;
     }
-#line 7350 "MachineIndependent/glslang_tab.cpp"
+#line 7096 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 181: /* storage_qualifier: SAMPLE  */
-#line 1528 "MachineIndependent/glslang.y"
+  case 180: /* storage_qualifier: SAMPLE  */
+#line 1518 "MachineIndependent/glslang.y"
              {
         parseContext.globalCheck((yyvsp[0].lex).loc, "sample");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.sample = true;
     }
-#line 7360 "MachineIndependent/glslang_tab.cpp"
+#line 7106 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 182: /* storage_qualifier: HITATTRNV  */
-#line 1533 "MachineIndependent/glslang.y"
+  case 181: /* storage_qualifier: HITATTRNV  */
+#line 1523 "MachineIndependent/glslang.y"
                 {
         parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangIntersectMask | EShLangClosestHitMask
@@ -7369,37 +7115,24 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqHitAttr;
     }
-#line 7373 "MachineIndependent/glslang_tab.cpp"
+#line 7119 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 183: /* storage_qualifier: HITOBJECTATTRNV  */
-#line 1541 "MachineIndependent/glslang.y"
-                      {
+  case 182: /* storage_qualifier: HITOBJECTATTRNV  */
+#line 1531 "MachineIndependent/glslang.y"
+                          {
         parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask
             | EShLangMissMask), "hitObjectAttributeNV");
         parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 460, E_GL_NV_shader_invocation_reorder, "hitObjectAttributeNV");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqHitObjectAttrNV;
-    }
-#line 7386 "MachineIndependent/glslang_tab.cpp"
+	}
+#line 7132 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 184: /* storage_qualifier: HITOBJECTATTREXT  */
-#line 1549 "MachineIndependent/glslang.y"
-                       {
-        parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeEXT");
-        parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask
-            | EShLangMissMask), "hitObjectAttributeEXT");
-        parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 460, E_GL_EXT_shader_invocation_reorder, "hitObjectAttributeEXT");
-        (yyval.interm.type).init((yyvsp[0].lex).loc);
-        (yyval.interm.type).qualifier.storage = EvqHitObjectAttrEXT;
-    }
-#line 7399 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 185: /* storage_qualifier: HITATTREXT  */
-#line 1557 "MachineIndependent/glslang.y"
+  case 183: /* storage_qualifier: HITATTREXT  */
+#line 1539 "MachineIndependent/glslang.y"
                  {
         parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeEXT");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangIntersectMask | EShLangClosestHitMask
@@ -7408,11 +7141,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqHitAttr;
     }
-#line 7412 "MachineIndependent/glslang_tab.cpp"
+#line 7145 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 186: /* storage_qualifier: PAYLOADNV  */
-#line 1565 "MachineIndependent/glslang.y"
+  case 184: /* storage_qualifier: PAYLOADNV  */
+#line 1547 "MachineIndependent/glslang.y"
                 {
         parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask |
@@ -7421,11 +7154,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqPayload;
     }
-#line 7425 "MachineIndependent/glslang_tab.cpp"
+#line 7158 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 187: /* storage_qualifier: PAYLOADEXT  */
-#line 1573 "MachineIndependent/glslang.y"
+  case 185: /* storage_qualifier: PAYLOADEXT  */
+#line 1555 "MachineIndependent/glslang.y"
                  {
         parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadEXT");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask |
@@ -7434,11 +7167,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqPayload;
     }
-#line 7438 "MachineIndependent/glslang_tab.cpp"
+#line 7171 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 188: /* storage_qualifier: PAYLOADINNV  */
-#line 1581 "MachineIndependent/glslang.y"
+  case 186: /* storage_qualifier: PAYLOADINNV  */
+#line 1563 "MachineIndependent/glslang.y"
                   {
         parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadInNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangClosestHitMask |
@@ -7447,11 +7180,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqPayloadIn;
     }
-#line 7451 "MachineIndependent/glslang_tab.cpp"
+#line 7184 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 189: /* storage_qualifier: PAYLOADINEXT  */
-#line 1589 "MachineIndependent/glslang.y"
+  case 187: /* storage_qualifier: PAYLOADINEXT  */
+#line 1571 "MachineIndependent/glslang.y"
                    {
         parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadInEXT");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangClosestHitMask |
@@ -7460,11 +7193,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqPayloadIn;
     }
-#line 7464 "MachineIndependent/glslang_tab.cpp"
+#line 7197 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 190: /* storage_qualifier: CALLDATANV  */
-#line 1597 "MachineIndependent/glslang.y"
+  case 188: /* storage_qualifier: CALLDATANV  */
+#line 1579 "MachineIndependent/glslang.y"
                  {
         parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask |
@@ -7473,11 +7206,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqCallableData;
     }
-#line 7477 "MachineIndependent/glslang_tab.cpp"
+#line 7210 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 191: /* storage_qualifier: CALLDATAEXT  */
-#line 1605 "MachineIndependent/glslang.y"
+  case 189: /* storage_qualifier: CALLDATAEXT  */
+#line 1587 "MachineIndependent/glslang.y"
                   {
         parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataEXT");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask |
@@ -7486,11 +7219,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqCallableData;
     }
-#line 7490 "MachineIndependent/glslang_tab.cpp"
+#line 7223 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 192: /* storage_qualifier: CALLDATAINNV  */
-#line 1613 "MachineIndependent/glslang.y"
+  case 190: /* storage_qualifier: CALLDATAINNV  */
+#line 1595 "MachineIndependent/glslang.y"
                    {
         parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataInNV");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangCallableMask), "callableDataInNV");
@@ -7498,11 +7231,11 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqCallableDataIn;
     }
-#line 7502 "MachineIndependent/glslang_tab.cpp"
+#line 7235 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 193: /* storage_qualifier: CALLDATAINEXT  */
-#line 1620 "MachineIndependent/glslang.y"
+  case 191: /* storage_qualifier: CALLDATAINEXT  */
+#line 1602 "MachineIndependent/glslang.y"
                     {
         parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataInEXT");
         parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangCallableMask), "callableDataInEXT");
@@ -7510,147 +7243,138 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqCallableDataIn;
     }
-#line 7514 "MachineIndependent/glslang_tab.cpp"
+#line 7247 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 194: /* storage_qualifier: COHERENT  */
-#line 1627 "MachineIndependent/glslang.y"
+  case 192: /* storage_qualifier: COHERENT  */
+#line 1609 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.coherent = true;
     }
-#line 7523 "MachineIndependent/glslang_tab.cpp"
+#line 7256 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 195: /* storage_qualifier: DEVICECOHERENT  */
-#line 1631 "MachineIndependent/glslang.y"
+  case 193: /* storage_qualifier: DEVICECOHERENT  */
+#line 1613 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "devicecoherent");
         (yyval.interm.type).qualifier.devicecoherent = true;
     }
-#line 7533 "MachineIndependent/glslang_tab.cpp"
+#line 7266 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 196: /* storage_qualifier: QUEUEFAMILYCOHERENT  */
-#line 1636 "MachineIndependent/glslang.y"
+  case 194: /* storage_qualifier: QUEUEFAMILYCOHERENT  */
+#line 1618 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "queuefamilycoherent");
         (yyval.interm.type).qualifier.queuefamilycoherent = true;
     }
-#line 7543 "MachineIndependent/glslang_tab.cpp"
+#line 7276 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 197: /* storage_qualifier: WORKGROUPCOHERENT  */
-#line 1641 "MachineIndependent/glslang.y"
+  case 195: /* storage_qualifier: WORKGROUPCOHERENT  */
+#line 1623 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "workgroupcoherent");
         (yyval.interm.type).qualifier.workgroupcoherent = true;
     }
-#line 7553 "MachineIndependent/glslang_tab.cpp"
+#line 7286 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 198: /* storage_qualifier: SUBGROUPCOHERENT  */
-#line 1646 "MachineIndependent/glslang.y"
+  case 196: /* storage_qualifier: SUBGROUPCOHERENT  */
+#line 1628 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "subgroupcoherent");
         (yyval.interm.type).qualifier.subgroupcoherent = true;
     }
-#line 7563 "MachineIndependent/glslang_tab.cpp"
+#line 7296 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 199: /* storage_qualifier: NONPRIVATE  */
-#line 1651 "MachineIndependent/glslang.y"
+  case 197: /* storage_qualifier: NONPRIVATE  */
+#line 1633 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "nonprivate");
         (yyval.interm.type).qualifier.nonprivate = true;
     }
-#line 7573 "MachineIndependent/glslang_tab.cpp"
+#line 7306 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 200: /* storage_qualifier: SHADERCALLCOHERENT  */
-#line 1656 "MachineIndependent/glslang.y"
+  case 198: /* storage_qualifier: SHADERCALLCOHERENT  */
+#line 1638 "MachineIndependent/glslang.y"
                          {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_ray_tracing, "shadercallcoherent");
         (yyval.interm.type).qualifier.shadercallcoherent = true;
     }
-#line 7583 "MachineIndependent/glslang_tab.cpp"
+#line 7316 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 201: /* storage_qualifier: VOLATILE  */
-#line 1661 "MachineIndependent/glslang.y"
+  case 199: /* storage_qualifier: VOLATILE  */
+#line 1643 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.volatil = true;
     }
-#line 7592 "MachineIndependent/glslang_tab.cpp"
+#line 7325 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 202: /* storage_qualifier: RESTRICT  */
-#line 1665 "MachineIndependent/glslang.y"
+  case 200: /* storage_qualifier: RESTRICT  */
+#line 1647 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.restrict = true;
     }
-#line 7601 "MachineIndependent/glslang_tab.cpp"
+#line 7334 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 203: /* storage_qualifier: READONLY  */
-#line 1669 "MachineIndependent/glslang.y"
+  case 201: /* storage_qualifier: READONLY  */
+#line 1651 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.readonly = true;
     }
-#line 7610 "MachineIndependent/glslang_tab.cpp"
+#line 7343 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 204: /* storage_qualifier: WRITEONLY  */
-#line 1673 "MachineIndependent/glslang.y"
+  case 202: /* storage_qualifier: WRITEONLY  */
+#line 1655 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.writeonly = true;
     }
-#line 7619 "MachineIndependent/glslang_tab.cpp"
+#line 7352 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 205: /* storage_qualifier: NONTEMPORAL  */
-#line 1677 "MachineIndependent/glslang.y"
-                  {
-        (yyval.interm.type).init((yyvsp[0].lex).loc);
-        (yyval.interm.type).qualifier.nontemporal  = true;
-    }
-#line 7628 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 206: /* storage_qualifier: SUBROUTINE  */
-#line 1681 "MachineIndependent/glslang.y"
+  case 203: /* storage_qualifier: SUBROUTINE  */
+#line 1659 "MachineIndependent/glslang.y"
                  {
         parseContext.spvRemoved((yyvsp[0].lex).loc, "subroutine");
         parseContext.globalCheck((yyvsp[0].lex).loc, "subroutine");
         parseContext.unimplemented((yyvsp[0].lex).loc, "subroutine");
         (yyval.interm.type).init((yyvsp[0].lex).loc);
     }
-#line 7639 "MachineIndependent/glslang_tab.cpp"
+#line 7363 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 207: /* storage_qualifier: SUBROUTINE LEFT_PAREN type_name_list RIGHT_PAREN  */
-#line 1687 "MachineIndependent/glslang.y"
+  case 204: /* storage_qualifier: SUBROUTINE LEFT_PAREN type_name_list RIGHT_PAREN  */
+#line 1665 "MachineIndependent/glslang.y"
                                                        {
         parseContext.spvRemoved((yyvsp[-3].lex).loc, "subroutine");
         parseContext.globalCheck((yyvsp[-3].lex).loc, "subroutine");
         parseContext.unimplemented((yyvsp[-3].lex).loc, "subroutine");
         (yyval.interm.type).init((yyvsp[-3].lex).loc);
     }
-#line 7650 "MachineIndependent/glslang_tab.cpp"
+#line 7374 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 208: /* storage_qualifier: TASKPAYLOADWORKGROUPEXT  */
-#line 1693 "MachineIndependent/glslang.y"
+  case 205: /* storage_qualifier: TASKPAYLOADWORKGROUPEXT  */
+#line 1671 "MachineIndependent/glslang.y"
                               {
         // No need for profile version or extension check. Shader stage already checks both.
         parseContext.globalCheck((yyvsp[0].lex).loc, "taskPayloadSharedEXT");
@@ -7658,73 +7382,73 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqtaskPayloadSharedEXT;
     }
-#line 7662 "MachineIndependent/glslang_tab.cpp"
+#line 7386 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 209: /* non_uniform_qualifier: NONUNIFORM  */
-#line 1703 "MachineIndependent/glslang.y"
+  case 206: /* non_uniform_qualifier: NONUNIFORM  */
+#line 1681 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc);
         (yyval.interm.type).qualifier.nonUniform = true;
     }
-#line 7671 "MachineIndependent/glslang_tab.cpp"
+#line 7395 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 210: /* type_name_list: IDENTIFIER  */
-#line 1710 "MachineIndependent/glslang.y"
+  case 207: /* type_name_list: IDENTIFIER  */
+#line 1688 "MachineIndependent/glslang.y"
                  {
         // TODO
     }
-#line 7679 "MachineIndependent/glslang_tab.cpp"
+#line 7403 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 211: /* type_name_list: type_name_list COMMA IDENTIFIER  */
-#line 1713 "MachineIndependent/glslang.y"
+  case 208: /* type_name_list: type_name_list COMMA IDENTIFIER  */
+#line 1691 "MachineIndependent/glslang.y"
                                       {
         // TODO: 4.0 semantics: subroutines
         // 1) make sure each identifier is a type declared earlier with SUBROUTINE
         // 2) save all of the identifiers for future comparison with the declared function
     }
-#line 7689 "MachineIndependent/glslang_tab.cpp"
+#line 7413 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 212: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt  */
-#line 1721 "MachineIndependent/glslang.y"
+  case 209: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt  */
+#line 1699 "MachineIndependent/glslang.y"
                                                            {
         (yyval.interm.type) = (yyvsp[-1].interm.type);
         (yyval.interm.type).qualifier.precision = parseContext.getDefaultPrecision((yyval.interm.type));
         (yyval.interm.type).typeParameters = (yyvsp[0].interm.typeParameters);
-        parseContext.typeParametersCheck((yyvsp[-1].interm.type).loc, (yyval.interm.type));
+        parseContext.coopMatTypeParametersCheck((yyvsp[-1].interm.type).loc, (yyval.interm.type));
 
     }
-#line 7701 "MachineIndependent/glslang_tab.cpp"
+#line 7425 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 213: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt array_specifier  */
-#line 1728 "MachineIndependent/glslang.y"
+  case 210: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt array_specifier  */
+#line 1706 "MachineIndependent/glslang.y"
                                                                            {
         parseContext.arrayOfArrayVersionCheck((yyvsp[0].interm).loc, (yyvsp[0].interm).arraySizes);
         (yyval.interm.type) = (yyvsp[-2].interm.type);
         (yyval.interm.type).qualifier.precision = parseContext.getDefaultPrecision((yyval.interm.type));
         (yyval.interm.type).typeParameters = (yyvsp[-1].interm.typeParameters);
         (yyval.interm.type).arraySizes = (yyvsp[0].interm).arraySizes;
-        parseContext.typeParametersCheck((yyvsp[-2].interm.type).loc, (yyval.interm.type));
+        parseContext.coopMatTypeParametersCheck((yyvsp[-2].interm.type).loc, (yyval.interm.type));
     }
-#line 7714 "MachineIndependent/glslang_tab.cpp"
+#line 7438 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 214: /* array_specifier: LEFT_BRACKET RIGHT_BRACKET  */
-#line 1739 "MachineIndependent/glslang.y"
+  case 211: /* array_specifier: LEFT_BRACKET RIGHT_BRACKET  */
+#line 1717 "MachineIndependent/glslang.y"
                                  {
         (yyval.interm).loc = (yyvsp[-1].lex).loc;
         (yyval.interm).arraySizes = new TArraySizes;
         (yyval.interm).arraySizes->addInnerSize();
     }
-#line 7724 "MachineIndependent/glslang_tab.cpp"
+#line 7448 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 215: /* array_specifier: LEFT_BRACKET conditional_expression RIGHT_BRACKET  */
-#line 1744 "MachineIndependent/glslang.y"
+  case 212: /* array_specifier: LEFT_BRACKET conditional_expression RIGHT_BRACKET  */
+#line 1722 "MachineIndependent/glslang.y"
                                                         {
         (yyval.interm).loc = (yyvsp[-2].lex).loc;
         (yyval.interm).arraySizes = new TArraySizes;
@@ -7733,20 +7457,20 @@ yyreduce:
         parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size, "array size");
         (yyval.interm).arraySizes->addInnerSize(size);
     }
-#line 7737 "MachineIndependent/glslang_tab.cpp"
+#line 7461 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 216: /* array_specifier: array_specifier LEFT_BRACKET RIGHT_BRACKET  */
-#line 1752 "MachineIndependent/glslang.y"
+  case 213: /* array_specifier: array_specifier LEFT_BRACKET RIGHT_BRACKET  */
+#line 1730 "MachineIndependent/glslang.y"
                                                  {
         (yyval.interm) = (yyvsp[-2].interm);
         (yyval.interm).arraySizes->addInnerSize();
     }
-#line 7746 "MachineIndependent/glslang_tab.cpp"
+#line 7470 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 217: /* array_specifier: array_specifier LEFT_BRACKET conditional_expression RIGHT_BRACKET  */
-#line 1756 "MachineIndependent/glslang.y"
+  case 214: /* array_specifier: array_specifier LEFT_BRACKET conditional_expression RIGHT_BRACKET  */
+#line 1734 "MachineIndependent/glslang.y"
                                                                         {
         (yyval.interm) = (yyvsp[-3].interm);
 
@@ -7754,46 +7478,46 @@ yyreduce:
         parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size, "array size");
         (yyval.interm).arraySizes->addInnerSize(size);
     }
-#line 7758 "MachineIndependent/glslang_tab.cpp"
+#line 7482 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 218: /* type_parameter_specifier_opt: type_parameter_specifier  */
-#line 1766 "MachineIndependent/glslang.y"
+  case 215: /* type_parameter_specifier_opt: type_parameter_specifier  */
+#line 1744 "MachineIndependent/glslang.y"
                                {
         (yyval.interm.typeParameters) = (yyvsp[0].interm.typeParameters);
     }
-#line 7766 "MachineIndependent/glslang_tab.cpp"
+#line 7490 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 219: /* type_parameter_specifier_opt: %empty  */
-#line 1769 "MachineIndependent/glslang.y"
+  case 216: /* type_parameter_specifier_opt: %empty  */
+#line 1747 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.typeParameters) = 0;
     }
-#line 7774 "MachineIndependent/glslang_tab.cpp"
+#line 7498 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 220: /* type_parameter_specifier: LEFT_ANGLE type_parameter_specifier_list RIGHT_ANGLE  */
-#line 1775 "MachineIndependent/glslang.y"
+  case 217: /* type_parameter_specifier: LEFT_ANGLE type_parameter_specifier_list RIGHT_ANGLE  */
+#line 1753 "MachineIndependent/glslang.y"
                                                            {
         (yyval.interm.typeParameters) = (yyvsp[-1].interm.typeParameters);
     }
-#line 7782 "MachineIndependent/glslang_tab.cpp"
+#line 7506 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 221: /* type_parameter_specifier_list: type_specifier  */
-#line 1781 "MachineIndependent/glslang.y"
+  case 218: /* type_parameter_specifier_list: type_specifier  */
+#line 1759 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.typeParameters) = new TTypeParameters;
         (yyval.interm.typeParameters)->arraySizes = new TArraySizes;
         (yyval.interm.typeParameters)->spirvType = (yyvsp[0].interm.type).spirvType;
         (yyval.interm.typeParameters)->basicType = (yyvsp[0].interm.type).basicType;
     }
-#line 7793 "MachineIndependent/glslang_tab.cpp"
+#line 7517 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 222: /* type_parameter_specifier_list: unary_expression  */
-#line 1787 "MachineIndependent/glslang.y"
+  case 219: /* type_parameter_specifier_list: unary_expression  */
+#line 1765 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.typeParameters) = new TTypeParameters;
         (yyval.interm.typeParameters)->arraySizes = new TArraySizes;
@@ -7802,11 +7526,11 @@ yyreduce:
         parseContext.arraySizeCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode), size, "type parameter", true);
         (yyval.interm.typeParameters)->arraySizes->addInnerSize(size);
     }
-#line 7806 "MachineIndependent/glslang_tab.cpp"
+#line 7530 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 223: /* type_parameter_specifier_list: type_parameter_specifier_list COMMA unary_expression  */
-#line 1795 "MachineIndependent/glslang.y"
+  case 220: /* type_parameter_specifier_list: type_parameter_specifier_list COMMA unary_expression  */
+#line 1773 "MachineIndependent/glslang.y"
                                                            {
         (yyval.interm.typeParameters) = (yyvsp[-2].interm.typeParameters);
 
@@ -7814,300 +7538,300 @@ yyreduce:
         parseContext.arraySizeCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode), size, "type parameter", true);
         (yyval.interm.typeParameters)->arraySizes->addInnerSize(size);
     }
-#line 7818 "MachineIndependent/glslang_tab.cpp"
+#line 7542 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 224: /* type_specifier_nonarray: VOID  */
-#line 1805 "MachineIndependent/glslang.y"
+  case 221: /* type_specifier_nonarray: VOID  */
+#line 1783 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtVoid;
     }
-#line 7827 "MachineIndependent/glslang_tab.cpp"
+#line 7551 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 225: /* type_specifier_nonarray: FLOAT  */
-#line 1809 "MachineIndependent/glslang.y"
+  case 222: /* type_specifier_nonarray: FLOAT  */
+#line 1787 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
     }
-#line 7836 "MachineIndependent/glslang_tab.cpp"
+#line 7560 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 226: /* type_specifier_nonarray: INT  */
-#line 1813 "MachineIndependent/glslang.y"
+  case 223: /* type_specifier_nonarray: INT  */
+#line 1791 "MachineIndependent/glslang.y"
           {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt;
     }
-#line 7845 "MachineIndependent/glslang_tab.cpp"
+#line 7569 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 227: /* type_specifier_nonarray: UINT  */
-#line 1817 "MachineIndependent/glslang.y"
+  case 224: /* type_specifier_nonarray: UINT  */
+#line 1795 "MachineIndependent/glslang.y"
            {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint;
     }
-#line 7855 "MachineIndependent/glslang_tab.cpp"
+#line 7579 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 228: /* type_specifier_nonarray: BOOL  */
-#line 1822 "MachineIndependent/glslang.y"
+  case 225: /* type_specifier_nonarray: BOOL  */
+#line 1800 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtBool;
     }
-#line 7864 "MachineIndependent/glslang_tab.cpp"
+#line 7588 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 229: /* type_specifier_nonarray: VEC2  */
-#line 1826 "MachineIndependent/glslang.y"
+  case 226: /* type_specifier_nonarray: VEC2  */
+#line 1804 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(2);
     }
-#line 7874 "MachineIndependent/glslang_tab.cpp"
+#line 7598 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 230: /* type_specifier_nonarray: VEC3  */
-#line 1831 "MachineIndependent/glslang.y"
+  case 227: /* type_specifier_nonarray: VEC3  */
+#line 1809 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(3);
     }
-#line 7884 "MachineIndependent/glslang_tab.cpp"
+#line 7608 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 231: /* type_specifier_nonarray: VEC4  */
-#line 1836 "MachineIndependent/glslang.y"
+  case 228: /* type_specifier_nonarray: VEC4  */
+#line 1814 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(4);
     }
-#line 7894 "MachineIndependent/glslang_tab.cpp"
+#line 7618 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 232: /* type_specifier_nonarray: BVEC2  */
-#line 1841 "MachineIndependent/glslang.y"
+  case 229: /* type_specifier_nonarray: BVEC2  */
+#line 1819 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtBool;
         (yyval.interm.type).setVector(2);
     }
-#line 7904 "MachineIndependent/glslang_tab.cpp"
+#line 7628 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 233: /* type_specifier_nonarray: BVEC3  */
-#line 1846 "MachineIndependent/glslang.y"
+  case 230: /* type_specifier_nonarray: BVEC3  */
+#line 1824 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtBool;
         (yyval.interm.type).setVector(3);
     }
-#line 7914 "MachineIndependent/glslang_tab.cpp"
+#line 7638 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 234: /* type_specifier_nonarray: BVEC4  */
-#line 1851 "MachineIndependent/glslang.y"
+  case 231: /* type_specifier_nonarray: BVEC4  */
+#line 1829 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtBool;
         (yyval.interm.type).setVector(4);
     }
-#line 7924 "MachineIndependent/glslang_tab.cpp"
+#line 7648 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 235: /* type_specifier_nonarray: IVEC2  */
-#line 1856 "MachineIndependent/glslang.y"
+  case 232: /* type_specifier_nonarray: IVEC2  */
+#line 1834 "MachineIndependent/glslang.y"
             {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt;
         (yyval.interm.type).setVector(2);
     }
-#line 7934 "MachineIndependent/glslang_tab.cpp"
+#line 7658 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 236: /* type_specifier_nonarray: IVEC3  */
+  case 233: /* type_specifier_nonarray: IVEC3  */
+#line 1839 "MachineIndependent/glslang.y"
+            {
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt;
+        (yyval.interm.type).setVector(3);
+    }
+#line 7668 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 234: /* type_specifier_nonarray: IVEC4  */
+#line 1844 "MachineIndependent/glslang.y"
+            {
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt;
+        (yyval.interm.type).setVector(4);
+    }
+#line 7678 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 235: /* type_specifier_nonarray: UVEC2  */
+#line 1849 "MachineIndependent/glslang.y"
+            {
+        parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint;
+        (yyval.interm.type).setVector(2);
+    }
+#line 7689 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 236: /* type_specifier_nonarray: UVEC3  */
+#line 1855 "MachineIndependent/glslang.y"
+            {
+        parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint;
+        (yyval.interm.type).setVector(3);
+    }
+#line 7700 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 237: /* type_specifier_nonarray: UVEC4  */
 #line 1861 "MachineIndependent/glslang.y"
             {
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt;
-        (yyval.interm.type).setVector(3);
-    }
-#line 7944 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 237: /* type_specifier_nonarray: IVEC4  */
-#line 1866 "MachineIndependent/glslang.y"
-            {
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt;
-        (yyval.interm.type).setVector(4);
-    }
-#line 7954 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 238: /* type_specifier_nonarray: UVEC2  */
-#line 1871 "MachineIndependent/glslang.y"
-            {
-        parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint;
-        (yyval.interm.type).setVector(2);
-    }
-#line 7965 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 239: /* type_specifier_nonarray: UVEC3  */
-#line 1877 "MachineIndependent/glslang.y"
-            {
-        parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint;
-        (yyval.interm.type).setVector(3);
-    }
-#line 7976 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 240: /* type_specifier_nonarray: UVEC4  */
-#line 1883 "MachineIndependent/glslang.y"
-            {
         parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint;
         (yyval.interm.type).setVector(4);
     }
-#line 7987 "MachineIndependent/glslang_tab.cpp"
+#line 7711 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 241: /* type_specifier_nonarray: MAT2  */
-#line 1889 "MachineIndependent/glslang.y"
+  case 238: /* type_specifier_nonarray: MAT2  */
+#line 1867 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(2, 2);
     }
-#line 7997 "MachineIndependent/glslang_tab.cpp"
+#line 7721 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 242: /* type_specifier_nonarray: MAT3  */
-#line 1894 "MachineIndependent/glslang.y"
+  case 239: /* type_specifier_nonarray: MAT3  */
+#line 1872 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(3, 3);
     }
-#line 8007 "MachineIndependent/glslang_tab.cpp"
+#line 7731 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 243: /* type_specifier_nonarray: MAT4  */
-#line 1899 "MachineIndependent/glslang.y"
+  case 240: /* type_specifier_nonarray: MAT4  */
+#line 1877 "MachineIndependent/glslang.y"
            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(4, 4);
     }
-#line 8017 "MachineIndependent/glslang_tab.cpp"
+#line 7741 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 244: /* type_specifier_nonarray: MAT2X2  */
-#line 1904 "MachineIndependent/glslang.y"
+  case 241: /* type_specifier_nonarray: MAT2X2  */
+#line 1882 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(2, 2);
     }
-#line 8027 "MachineIndependent/glslang_tab.cpp"
+#line 7751 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 245: /* type_specifier_nonarray: MAT2X3  */
-#line 1909 "MachineIndependent/glslang.y"
+  case 242: /* type_specifier_nonarray: MAT2X3  */
+#line 1887 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(2, 3);
     }
-#line 8037 "MachineIndependent/glslang_tab.cpp"
+#line 7761 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 246: /* type_specifier_nonarray: MAT2X4  */
-#line 1914 "MachineIndependent/glslang.y"
+  case 243: /* type_specifier_nonarray: MAT2X4  */
+#line 1892 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(2, 4);
     }
-#line 8047 "MachineIndependent/glslang_tab.cpp"
+#line 7771 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 247: /* type_specifier_nonarray: MAT3X2  */
-#line 1919 "MachineIndependent/glslang.y"
+  case 244: /* type_specifier_nonarray: MAT3X2  */
+#line 1897 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(3, 2);
     }
-#line 8057 "MachineIndependent/glslang_tab.cpp"
+#line 7781 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 248: /* type_specifier_nonarray: MAT3X3  */
-#line 1924 "MachineIndependent/glslang.y"
+  case 245: /* type_specifier_nonarray: MAT3X3  */
+#line 1902 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(3, 3);
     }
-#line 8067 "MachineIndependent/glslang_tab.cpp"
+#line 7791 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 249: /* type_specifier_nonarray: MAT3X4  */
-#line 1929 "MachineIndependent/glslang.y"
+  case 246: /* type_specifier_nonarray: MAT3X4  */
+#line 1907 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(3, 4);
     }
-#line 8077 "MachineIndependent/glslang_tab.cpp"
+#line 7801 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 250: /* type_specifier_nonarray: MAT4X2  */
-#line 1934 "MachineIndependent/glslang.y"
+  case 247: /* type_specifier_nonarray: MAT4X2  */
+#line 1912 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(4, 2);
     }
-#line 8087 "MachineIndependent/glslang_tab.cpp"
+#line 7811 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 251: /* type_specifier_nonarray: MAT4X3  */
-#line 1939 "MachineIndependent/glslang.y"
+  case 248: /* type_specifier_nonarray: MAT4X3  */
+#line 1917 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(4, 3);
     }
-#line 8097 "MachineIndependent/glslang_tab.cpp"
+#line 7821 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 252: /* type_specifier_nonarray: MAT4X4  */
-#line 1944 "MachineIndependent/glslang.y"
+  case 249: /* type_specifier_nonarray: MAT4X4  */
+#line 1922 "MachineIndependent/glslang.y"
              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setMatrix(4, 4);
     }
-#line 8107 "MachineIndependent/glslang_tab.cpp"
+#line 7831 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 253: /* type_specifier_nonarray: DOUBLE  */
-#line 1949 "MachineIndependent/glslang.y"
+  case 250: /* type_specifier_nonarray: DOUBLE  */
+#line 1927 "MachineIndependent/glslang.y"
              {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double");
         if (! parseContext.symbolTable.atBuiltInLevel())
@@ -8115,151 +7839,121 @@ yyreduce:
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
     }
-#line 8119 "MachineIndependent/glslang_tab.cpp"
+#line 7843 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 254: /* type_specifier_nonarray: BFLOAT16_T  */
-#line 1956 "MachineIndependent/glslang.y"
-                 {
-        parseContext.bfloat16ScalarVectorCheck((yyvsp[0].lex).loc, "bfloat16_t", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtBFloat16;
-    }
-#line 8129 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 255: /* type_specifier_nonarray: FLOATE5M2_T  */
-#line 1961 "MachineIndependent/glslang.y"
-                  {
-        parseContext.floate5m2ScalarVectorCheck((yyvsp[0].lex).loc, "floate5m2_t", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE5M2;
-    }
-#line 8139 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 256: /* type_specifier_nonarray: FLOATE4M3_T  */
-#line 1966 "MachineIndependent/glslang.y"
-                  {
-        parseContext.floate4m3ScalarVectorCheck((yyvsp[0].lex).loc, "floate4m3_t", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE4M3;
-    }
-#line 8149 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 257: /* type_specifier_nonarray: FLOAT16_T  */
-#line 1971 "MachineIndependent/glslang.y"
+  case 251: /* type_specifier_nonarray: FLOAT16_T  */
+#line 1934 "MachineIndependent/glslang.y"
                 {
         parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "float16_t", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat16;
     }
-#line 8159 "MachineIndependent/glslang_tab.cpp"
+#line 7853 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 258: /* type_specifier_nonarray: FLOAT32_T  */
-#line 1976 "MachineIndependent/glslang.y"
+  case 252: /* type_specifier_nonarray: FLOAT32_T  */
+#line 1939 "MachineIndependent/glslang.y"
                 {
         parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
     }
-#line 8169 "MachineIndependent/glslang_tab.cpp"
+#line 7863 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 259: /* type_specifier_nonarray: FLOAT64_T  */
-#line 1981 "MachineIndependent/glslang.y"
+  case 253: /* type_specifier_nonarray: FLOAT64_T  */
+#line 1944 "MachineIndependent/glslang.y"
                 {
         parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
     }
-#line 8179 "MachineIndependent/glslang_tab.cpp"
+#line 7873 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 260: /* type_specifier_nonarray: INT8_T  */
-#line 1986 "MachineIndependent/glslang.y"
+  case 254: /* type_specifier_nonarray: INT8_T  */
+#line 1949 "MachineIndependent/glslang.y"
              {
         parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt8;
     }
-#line 8189 "MachineIndependent/glslang_tab.cpp"
+#line 7883 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 261: /* type_specifier_nonarray: UINT8_T  */
-#line 1991 "MachineIndependent/glslang.y"
+  case 255: /* type_specifier_nonarray: UINT8_T  */
+#line 1954 "MachineIndependent/glslang.y"
               {
         parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint8;
     }
-#line 8199 "MachineIndependent/glslang_tab.cpp"
+#line 7893 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 262: /* type_specifier_nonarray: INT16_T  */
-#line 1996 "MachineIndependent/glslang.y"
+  case 256: /* type_specifier_nonarray: INT16_T  */
+#line 1959 "MachineIndependent/glslang.y"
               {
         parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt16;
     }
-#line 8209 "MachineIndependent/glslang_tab.cpp"
+#line 7903 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 263: /* type_specifier_nonarray: UINT16_T  */
-#line 2001 "MachineIndependent/glslang.y"
+  case 257: /* type_specifier_nonarray: UINT16_T  */
+#line 1964 "MachineIndependent/glslang.y"
                {
         parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint16;
     }
-#line 8219 "MachineIndependent/glslang_tab.cpp"
+#line 7913 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 264: /* type_specifier_nonarray: INT32_T  */
-#line 2006 "MachineIndependent/glslang.y"
+  case 258: /* type_specifier_nonarray: INT32_T  */
+#line 1969 "MachineIndependent/glslang.y"
               {
         parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt;
     }
-#line 8229 "MachineIndependent/glslang_tab.cpp"
+#line 7923 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 265: /* type_specifier_nonarray: UINT32_T  */
-#line 2011 "MachineIndependent/glslang.y"
+  case 259: /* type_specifier_nonarray: UINT32_T  */
+#line 1974 "MachineIndependent/glslang.y"
                {
         parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint;
     }
-#line 8239 "MachineIndependent/glslang_tab.cpp"
+#line 7933 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 266: /* type_specifier_nonarray: INT64_T  */
-#line 2016 "MachineIndependent/glslang.y"
+  case 260: /* type_specifier_nonarray: INT64_T  */
+#line 1979 "MachineIndependent/glslang.y"
               {
         parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtInt64;
     }
-#line 8249 "MachineIndependent/glslang_tab.cpp"
+#line 7943 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 267: /* type_specifier_nonarray: UINT64_T  */
-#line 2021 "MachineIndependent/glslang.y"
+  case 261: /* type_specifier_nonarray: UINT64_T  */
+#line 1984 "MachineIndependent/glslang.y"
                {
         parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtUint64;
     }
-#line 8259 "MachineIndependent/glslang_tab.cpp"
+#line 7953 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 268: /* type_specifier_nonarray: DVEC2  */
-#line 2026 "MachineIndependent/glslang.y"
+  case 262: /* type_specifier_nonarray: DVEC2  */
+#line 1989 "MachineIndependent/glslang.y"
             {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
         if (! parseContext.symbolTable.atBuiltInLevel())
@@ -8268,11 +7962,11 @@ yyreduce:
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setVector(2);
     }
-#line 8272 "MachineIndependent/glslang_tab.cpp"
+#line 7966 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 269: /* type_specifier_nonarray: DVEC3  */
-#line 2034 "MachineIndependent/glslang.y"
+  case 263: /* type_specifier_nonarray: DVEC3  */
+#line 1997 "MachineIndependent/glslang.y"
             {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
         if (! parseContext.symbolTable.atBuiltInLevel())
@@ -8281,11 +7975,11 @@ yyreduce:
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setVector(3);
     }
-#line 8285 "MachineIndependent/glslang_tab.cpp"
+#line 7979 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 270: /* type_specifier_nonarray: DVEC4  */
-#line 2042 "MachineIndependent/glslang.y"
+  case 264: /* type_specifier_nonarray: DVEC4  */
+#line 2005 "MachineIndependent/glslang.y"
             {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
         if (! parseContext.symbolTable.atBuiltInLevel())
@@ -8294,2879 +7988,2780 @@ yyreduce:
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setVector(4);
     }
-#line 8298 "MachineIndependent/glslang_tab.cpp"
+#line 7992 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 271: /* type_specifier_nonarray: BF16VEC2  */
-#line 2050 "MachineIndependent/glslang.y"
-               {
-        parseContext.bfloat16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtBFloat16;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8309 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 272: /* type_specifier_nonarray: BF16VEC3  */
-#line 2056 "MachineIndependent/glslang.y"
-               {
-        parseContext.bfloat16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtBFloat16;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8320 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 273: /* type_specifier_nonarray: BF16VEC4  */
-#line 2062 "MachineIndependent/glslang.y"
-               {
-        parseContext.bfloat16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtBFloat16;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8331 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 274: /* type_specifier_nonarray: FE5M2VEC2  */
-#line 2068 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate5m2ScalarVectorCheck((yyvsp[0].lex).loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE5M2;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8342 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 275: /* type_specifier_nonarray: FE5M2VEC3  */
-#line 2074 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate5m2ScalarVectorCheck((yyvsp[0].lex).loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE5M2;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8353 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 276: /* type_specifier_nonarray: FE5M2VEC4  */
-#line 2080 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate5m2ScalarVectorCheck((yyvsp[0].lex).loc, "fe5m2 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE5M2;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8364 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 277: /* type_specifier_nonarray: FE4M3VEC2  */
-#line 2086 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate4m3ScalarVectorCheck((yyvsp[0].lex).loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE4M3;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8375 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 278: /* type_specifier_nonarray: FE4M3VEC3  */
-#line 2092 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate4m3ScalarVectorCheck((yyvsp[0].lex).loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE4M3;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8386 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 279: /* type_specifier_nonarray: FE4M3VEC4  */
-#line 2098 "MachineIndependent/glslang.y"
-                {
-        parseContext.floate4m3ScalarVectorCheck((yyvsp[0].lex).loc, "fe4m3 vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloatE4M3;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8397 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 280: /* type_specifier_nonarray: F16VEC2  */
-#line 2104 "MachineIndependent/glslang.y"
+  case 265: /* type_specifier_nonarray: F16VEC2  */
+#line 2013 "MachineIndependent/glslang.y"
               {
         parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat16;
         (yyval.interm.type).setVector(2);
     }
-#line 8408 "MachineIndependent/glslang_tab.cpp"
+#line 8003 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 281: /* type_specifier_nonarray: F16VEC3  */
-#line 2110 "MachineIndependent/glslang.y"
+  case 266: /* type_specifier_nonarray: F16VEC3  */
+#line 2019 "MachineIndependent/glslang.y"
               {
         parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat16;
         (yyval.interm.type).setVector(3);
     }
-#line 8419 "MachineIndependent/glslang_tab.cpp"
+#line 8014 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 282: /* type_specifier_nonarray: F16VEC4  */
-#line 2116 "MachineIndependent/glslang.y"
+  case 267: /* type_specifier_nonarray: F16VEC4  */
+#line 2025 "MachineIndependent/glslang.y"
               {
         parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat16;
         (yyval.interm.type).setVector(4);
     }
-#line 8430 "MachineIndependent/glslang_tab.cpp"
+#line 8025 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 283: /* type_specifier_nonarray: F32VEC2  */
-#line 2122 "MachineIndependent/glslang.y"
+  case 268: /* type_specifier_nonarray: F32VEC2  */
+#line 2031 "MachineIndependent/glslang.y"
               {
         parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(2);
     }
-#line 8441 "MachineIndependent/glslang_tab.cpp"
+#line 8036 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 284: /* type_specifier_nonarray: F32VEC3  */
-#line 2128 "MachineIndependent/glslang.y"
+  case 269: /* type_specifier_nonarray: F32VEC3  */
+#line 2037 "MachineIndependent/glslang.y"
               {
         parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(3);
     }
-#line 8452 "MachineIndependent/glslang_tab.cpp"
+#line 8047 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 285: /* type_specifier_nonarray: F32VEC4  */
-#line 2134 "MachineIndependent/glslang.y"
+  case 270: /* type_specifier_nonarray: F32VEC4  */
+#line 2043 "MachineIndependent/glslang.y"
               {
         parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtFloat;
         (yyval.interm.type).setVector(4);
     }
-#line 8463 "MachineIndependent/glslang_tab.cpp"
+#line 8058 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 286: /* type_specifier_nonarray: F64VEC2  */
-#line 2140 "MachineIndependent/glslang.y"
+  case 271: /* type_specifier_nonarray: F64VEC2  */
+#line 2049 "MachineIndependent/glslang.y"
               {
         parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setVector(2);
     }
-#line 8474 "MachineIndependent/glslang_tab.cpp"
+#line 8069 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 287: /* type_specifier_nonarray: F64VEC3  */
-#line 2146 "MachineIndependent/glslang.y"
+  case 272: /* type_specifier_nonarray: F64VEC3  */
+#line 2055 "MachineIndependent/glslang.y"
               {
         parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setVector(3);
     }
+#line 8080 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 273: /* type_specifier_nonarray: F64VEC4  */
+#line 2061 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8091 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 274: /* type_specifier_nonarray: I8VEC2  */
+#line 2067 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt8;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8102 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 275: /* type_specifier_nonarray: I8VEC3  */
+#line 2073 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt8;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8113 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 276: /* type_specifier_nonarray: I8VEC4  */
+#line 2079 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt8;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8124 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 277: /* type_specifier_nonarray: I16VEC2  */
+#line 2085 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt16;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8135 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 278: /* type_specifier_nonarray: I16VEC3  */
+#line 2091 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt16;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8146 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 279: /* type_specifier_nonarray: I16VEC4  */
+#line 2097 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt16;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8157 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 280: /* type_specifier_nonarray: I32VEC2  */
+#line 2103 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8168 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 281: /* type_specifier_nonarray: I32VEC3  */
+#line 2109 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8179 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 282: /* type_specifier_nonarray: I32VEC4  */
+#line 2115 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8190 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 283: /* type_specifier_nonarray: I64VEC2  */
+#line 2121 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt64;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8201 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 284: /* type_specifier_nonarray: I64VEC3  */
+#line 2127 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt64;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8212 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 285: /* type_specifier_nonarray: I64VEC4  */
+#line 2133 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtInt64;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8223 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 286: /* type_specifier_nonarray: U8VEC2  */
+#line 2139 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint8;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8234 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 287: /* type_specifier_nonarray: U8VEC3  */
+#line 2145 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint8;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8245 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 288: /* type_specifier_nonarray: U8VEC4  */
+#line 2151 "MachineIndependent/glslang.y"
+             {
+        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint8;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8256 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 289: /* type_specifier_nonarray: U16VEC2  */
+#line 2157 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint16;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8267 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 290: /* type_specifier_nonarray: U16VEC3  */
+#line 2163 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint16;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8278 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 291: /* type_specifier_nonarray: U16VEC4  */
+#line 2169 "MachineIndependent/glslang.y"
+              {
+        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint16;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8289 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 292: /* type_specifier_nonarray: U32VEC2  */
+#line 2175 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8300 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 293: /* type_specifier_nonarray: U32VEC3  */
+#line 2181 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8311 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 294: /* type_specifier_nonarray: U32VEC4  */
+#line 2187 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8322 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 295: /* type_specifier_nonarray: U64VEC2  */
+#line 2193 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint64;
+        (yyval.interm.type).setVector(2);
+    }
+#line 8333 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 296: /* type_specifier_nonarray: U64VEC3  */
+#line 2199 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint64;
+        (yyval.interm.type).setVector(3);
+    }
+#line 8344 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 297: /* type_specifier_nonarray: U64VEC4  */
+#line 2205 "MachineIndependent/glslang.y"
+              {
+        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtUint64;
+        (yyval.interm.type).setVector(4);
+    }
+#line 8355 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 298: /* type_specifier_nonarray: DMAT2  */
+#line 2211 "MachineIndependent/glslang.y"
+            {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8368 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 299: /* type_specifier_nonarray: DMAT3  */
+#line 2219 "MachineIndependent/glslang.y"
+            {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8381 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 300: /* type_specifier_nonarray: DMAT4  */
+#line 2227 "MachineIndependent/glslang.y"
+            {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8394 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 301: /* type_specifier_nonarray: DMAT2X2  */
+#line 2235 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8407 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 302: /* type_specifier_nonarray: DMAT2X3  */
+#line 2243 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 3);
+    }
+#line 8420 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 303: /* type_specifier_nonarray: DMAT2X4  */
+#line 2251 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 4);
+    }
+#line 8433 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 304: /* type_specifier_nonarray: DMAT3X2  */
+#line 2259 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 2);
+    }
+#line 8446 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 305: /* type_specifier_nonarray: DMAT3X3  */
+#line 2267 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8459 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 306: /* type_specifier_nonarray: DMAT3X4  */
+#line 2275 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 4);
+    }
+#line 8472 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 307: /* type_specifier_nonarray: DMAT4X2  */
+#line 2283 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(4, 2);
+    }
 #line 8485 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 288: /* type_specifier_nonarray: F64VEC4  */
-#line 2152 "MachineIndependent/glslang.y"
+  case 308: /* type_specifier_nonarray: DMAT4X3  */
+#line 2291 "MachineIndependent/glslang.y"
               {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8496 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 289: /* type_specifier_nonarray: I8VEC2  */
-#line 2158 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt8;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8507 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 290: /* type_specifier_nonarray: I8VEC3  */
-#line 2164 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt8;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8518 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 291: /* type_specifier_nonarray: I8VEC4  */
-#line 2170 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt8;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8529 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 292: /* type_specifier_nonarray: I16VEC2  */
-#line 2176 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt16;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8540 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 293: /* type_specifier_nonarray: I16VEC3  */
-#line 2182 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt16;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8551 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 294: /* type_specifier_nonarray: I16VEC4  */
-#line 2188 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt16;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8562 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 295: /* type_specifier_nonarray: I32VEC2  */
-#line 2194 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8573 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 296: /* type_specifier_nonarray: I32VEC3  */
-#line 2200 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8584 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 297: /* type_specifier_nonarray: I32VEC4  */
-#line 2206 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8595 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 298: /* type_specifier_nonarray: I64VEC2  */
-#line 2212 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt64;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8606 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 299: /* type_specifier_nonarray: I64VEC3  */
-#line 2218 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt64;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8617 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 300: /* type_specifier_nonarray: I64VEC4  */
-#line 2224 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtInt64;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8628 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 301: /* type_specifier_nonarray: U8VEC2  */
-#line 2230 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint8;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8639 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 302: /* type_specifier_nonarray: U8VEC3  */
-#line 2236 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint8;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8650 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 303: /* type_specifier_nonarray: U8VEC4  */
-#line 2242 "MachineIndependent/glslang.y"
-             {
-        parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint8;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8661 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 304: /* type_specifier_nonarray: U16VEC2  */
-#line 2248 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint16;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8672 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 305: /* type_specifier_nonarray: U16VEC3  */
-#line 2254 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint16;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8683 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 306: /* type_specifier_nonarray: U16VEC4  */
-#line 2260 "MachineIndependent/glslang.y"
-              {
-        parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint16;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8694 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 307: /* type_specifier_nonarray: U32VEC2  */
-#line 2266 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8705 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 308: /* type_specifier_nonarray: U32VEC3  */
-#line 2272 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8716 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 309: /* type_specifier_nonarray: U32VEC4  */
-#line 2278 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8727 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 310: /* type_specifier_nonarray: U64VEC2  */
-#line 2284 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint64;
-        (yyval.interm.type).setVector(2);
-    }
-#line 8738 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 311: /* type_specifier_nonarray: U64VEC3  */
-#line 2290 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint64;
-        (yyval.interm.type).setVector(3);
-    }
-#line 8749 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 312: /* type_specifier_nonarray: U64VEC4  */
-#line 2296 "MachineIndependent/glslang.y"
-              {
-        parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtUint64;
-        (yyval.interm.type).setVector(4);
-    }
-#line 8760 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 313: /* type_specifier_nonarray: DMAT2  */
-#line 2302 "MachineIndependent/glslang.y"
-            {
         parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
         if (! parseContext.symbolTable.atBuiltInLevel())
             parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(4, 3);
+    }
+#line 8498 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 309: /* type_specifier_nonarray: DMAT4X4  */
+#line 2299 "MachineIndependent/glslang.y"
+              {
+        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
+        if (! parseContext.symbolTable.atBuiltInLevel())
+            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8511 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 310: /* type_specifier_nonarray: F16MAT2  */
+#line 2307 "MachineIndependent/glslang.y"
+              {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8522 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 311: /* type_specifier_nonarray: F16MAT3  */
+#line 2313 "MachineIndependent/glslang.y"
+              {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8533 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 312: /* type_specifier_nonarray: F16MAT4  */
+#line 2319 "MachineIndependent/glslang.y"
+              {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8544 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 313: /* type_specifier_nonarray: F16MAT2X2  */
+#line 2325 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8555 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 314: /* type_specifier_nonarray: F16MAT2X3  */
+#line 2331 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(2, 3);
+    }
+#line 8566 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 315: /* type_specifier_nonarray: F16MAT2X4  */
+#line 2337 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(2, 4);
+    }
+#line 8577 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 316: /* type_specifier_nonarray: F16MAT3X2  */
+#line 2343 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(3, 2);
+    }
+#line 8588 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 317: /* type_specifier_nonarray: F16MAT3X3  */
+#line 2349 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8599 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 318: /* type_specifier_nonarray: F16MAT3X4  */
+#line 2355 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(3, 4);
+    }
+#line 8610 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 319: /* type_specifier_nonarray: F16MAT4X2  */
+#line 2361 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(4, 2);
+    }
+#line 8621 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 320: /* type_specifier_nonarray: F16MAT4X3  */
+#line 2367 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(4, 3);
+    }
+#line 8632 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 321: /* type_specifier_nonarray: F16MAT4X4  */
+#line 2373 "MachineIndependent/glslang.y"
+                {
+        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat16;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8643 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 322: /* type_specifier_nonarray: F32MAT2  */
+#line 2379 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8654 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 323: /* type_specifier_nonarray: F32MAT3  */
+#line 2385 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8665 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 324: /* type_specifier_nonarray: F32MAT4  */
+#line 2391 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8676 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 325: /* type_specifier_nonarray: F32MAT2X2  */
+#line 2397 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8687 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 326: /* type_specifier_nonarray: F32MAT2X3  */
+#line 2403 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(2, 3);
+    }
+#line 8698 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 327: /* type_specifier_nonarray: F32MAT2X4  */
+#line 2409 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(2, 4);
+    }
+#line 8709 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 328: /* type_specifier_nonarray: F32MAT3X2  */
+#line 2415 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(3, 2);
+    }
+#line 8720 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 329: /* type_specifier_nonarray: F32MAT3X3  */
+#line 2421 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8731 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 330: /* type_specifier_nonarray: F32MAT3X4  */
+#line 2427 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(3, 4);
+    }
+#line 8742 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 331: /* type_specifier_nonarray: F32MAT4X2  */
+#line 2433 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(4, 2);
+    }
+#line 8753 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 332: /* type_specifier_nonarray: F32MAT4X3  */
+#line 2439 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(4, 3);
+    }
+#line 8764 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 333: /* type_specifier_nonarray: F32MAT4X4  */
+#line 2445 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtFloat;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8775 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 334: /* type_specifier_nonarray: F64MAT2  */
+#line 2451 "MachineIndependent/glslang.y"
+              {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(2, 2);
     }
-#line 8773 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 314: /* type_specifier_nonarray: DMAT3  */
-#line 2310 "MachineIndependent/glslang.y"
-            {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
 #line 8786 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 315: /* type_specifier_nonarray: DMAT4  */
-#line 2318 "MachineIndependent/glslang.y"
-            {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 8799 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 316: /* type_specifier_nonarray: DMAT2X2  */
-#line 2326 "MachineIndependent/glslang.y"
+  case 335: /* type_specifier_nonarray: F64MAT3  */
+#line 2457 "MachineIndependent/glslang.y"
               {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 8812 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 317: /* type_specifier_nonarray: DMAT2X3  */
-#line 2334 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 3);
-    }
-#line 8825 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 318: /* type_specifier_nonarray: DMAT2X4  */
-#line 2342 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 4);
-    }
-#line 8838 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 319: /* type_specifier_nonarray: DMAT3X2  */
-#line 2350 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 2);
-    }
-#line 8851 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 320: /* type_specifier_nonarray: DMAT3X3  */
-#line 2358 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(3, 3);
     }
-#line 8864 "MachineIndependent/glslang_tab.cpp"
+#line 8797 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 321: /* type_specifier_nonarray: DMAT3X4  */
-#line 2366 "MachineIndependent/glslang.y"
+  case 336: /* type_specifier_nonarray: F64MAT4  */
+#line 2463 "MachineIndependent/glslang.y"
               {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(4, 4);
+    }
+#line 8808 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 337: /* type_specifier_nonarray: F64MAT2X2  */
+#line 2469 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 2);
+    }
+#line 8819 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 338: /* type_specifier_nonarray: F64MAT2X3  */
+#line 2475 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 3);
+    }
+#line 8830 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 339: /* type_specifier_nonarray: F64MAT2X4  */
+#line 2481 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(2, 4);
+    }
+#line 8841 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 340: /* type_specifier_nonarray: F64MAT3X2  */
+#line 2487 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 2);
+    }
+#line 8852 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 341: /* type_specifier_nonarray: F64MAT3X3  */
+#line 2493 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
+        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+        (yyval.interm.type).basicType = EbtDouble;
+        (yyval.interm.type).setMatrix(3, 3);
+    }
+#line 8863 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 342: /* type_specifier_nonarray: F64MAT3X4  */
+#line 2499 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(3, 4);
     }
-#line 8877 "MachineIndependent/glslang_tab.cpp"
+#line 8874 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 322: /* type_specifier_nonarray: DMAT4X2  */
-#line 2374 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+  case 343: /* type_specifier_nonarray: F64MAT4X2  */
+#line 2505 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(4, 2);
     }
-#line 8890 "MachineIndependent/glslang_tab.cpp"
+#line 8885 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 323: /* type_specifier_nonarray: DMAT4X3  */
-#line 2382 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+  case 344: /* type_specifier_nonarray: F64MAT4X3  */
+#line 2511 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(4, 3);
     }
-#line 8903 "MachineIndependent/glslang_tab.cpp"
+#line 8896 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 324: /* type_specifier_nonarray: DMAT4X4  */
-#line 2390 "MachineIndependent/glslang.y"
-              {
-        parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
-        if (! parseContext.symbolTable.atBuiltInLevel())
-            parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
+  case 345: /* type_specifier_nonarray: F64MAT4X4  */
+#line 2517 "MachineIndependent/glslang.y"
+                {
+        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtDouble;
         (yyval.interm.type).setMatrix(4, 4);
     }
+#line 8907 "MachineIndependent/glslang_tab.cpp"
+    break;
+
+  case 346: /* type_specifier_nonarray: ACCSTRUCTNV  */
+#line 2523 "MachineIndependent/glslang.y"
+                  {
+       (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
+       (yyval.interm.type).basicType = EbtAccStruct;
+    }
 #line 8916 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 325: /* type_specifier_nonarray: F16MAT2  */
-#line 2398 "MachineIndependent/glslang.y"
-              {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 8927 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 326: /* type_specifier_nonarray: F16MAT3  */
-#line 2404 "MachineIndependent/glslang.y"
-              {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 8938 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 327: /* type_specifier_nonarray: F16MAT4  */
-#line 2410 "MachineIndependent/glslang.y"
-              {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 8949 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 328: /* type_specifier_nonarray: F16MAT2X2  */
-#line 2416 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 8960 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 329: /* type_specifier_nonarray: F16MAT2X3  */
-#line 2422 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(2, 3);
-    }
-#line 8971 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 330: /* type_specifier_nonarray: F16MAT2X4  */
-#line 2428 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(2, 4);
-    }
-#line 8982 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 331: /* type_specifier_nonarray: F16MAT3X2  */
-#line 2434 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(3, 2);
-    }
-#line 8993 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 332: /* type_specifier_nonarray: F16MAT3X3  */
-#line 2440 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 9004 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 333: /* type_specifier_nonarray: F16MAT3X4  */
-#line 2446 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(3, 4);
-    }
-#line 9015 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 334: /* type_specifier_nonarray: F16MAT4X2  */
-#line 2452 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(4, 2);
-    }
-#line 9026 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 335: /* type_specifier_nonarray: F16MAT4X3  */
-#line 2458 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(4, 3);
-    }
-#line 9037 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 336: /* type_specifier_nonarray: F16MAT4X4  */
-#line 2464 "MachineIndependent/glslang.y"
-                {
-        parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat16;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 9048 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 337: /* type_specifier_nonarray: F32MAT2  */
-#line 2470 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 9059 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 338: /* type_specifier_nonarray: F32MAT3  */
-#line 2476 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 9070 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 339: /* type_specifier_nonarray: F32MAT4  */
-#line 2482 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 9081 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 340: /* type_specifier_nonarray: F32MAT2X2  */
-#line 2488 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 9092 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 341: /* type_specifier_nonarray: F32MAT2X3  */
-#line 2494 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(2, 3);
-    }
-#line 9103 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 342: /* type_specifier_nonarray: F32MAT2X4  */
-#line 2500 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(2, 4);
-    }
-#line 9114 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 343: /* type_specifier_nonarray: F32MAT3X2  */
-#line 2506 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(3, 2);
-    }
-#line 9125 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 344: /* type_specifier_nonarray: F32MAT3X3  */
-#line 2512 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 9136 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 345: /* type_specifier_nonarray: F32MAT3X4  */
-#line 2518 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(3, 4);
-    }
-#line 9147 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 346: /* type_specifier_nonarray: F32MAT4X2  */
-#line 2524 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(4, 2);
-    }
-#line 9158 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 347: /* type_specifier_nonarray: F32MAT4X3  */
-#line 2530 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(4, 3);
-    }
-#line 9169 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 348: /* type_specifier_nonarray: F32MAT4X4  */
-#line 2536 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtFloat;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 9180 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 349: /* type_specifier_nonarray: F64MAT2  */
-#line 2542 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 9191 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 350: /* type_specifier_nonarray: F64MAT3  */
-#line 2548 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 9202 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 351: /* type_specifier_nonarray: F64MAT4  */
-#line 2554 "MachineIndependent/glslang.y"
-              {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 9213 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 352: /* type_specifier_nonarray: F64MAT2X2  */
-#line 2560 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 2);
-    }
-#line 9224 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 353: /* type_specifier_nonarray: F64MAT2X3  */
-#line 2566 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 3);
-    }
-#line 9235 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 354: /* type_specifier_nonarray: F64MAT2X4  */
-#line 2572 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(2, 4);
-    }
-#line 9246 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 355: /* type_specifier_nonarray: F64MAT3X2  */
-#line 2578 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 2);
-    }
-#line 9257 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 356: /* type_specifier_nonarray: F64MAT3X3  */
-#line 2584 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 3);
-    }
-#line 9268 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 357: /* type_specifier_nonarray: F64MAT3X4  */
-#line 2590 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(3, 4);
-    }
-#line 9279 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 358: /* type_specifier_nonarray: F64MAT4X2  */
-#line 2596 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(4, 2);
-    }
-#line 9290 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 359: /* type_specifier_nonarray: F64MAT4X3  */
-#line 2602 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(4, 3);
-    }
-#line 9301 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 360: /* type_specifier_nonarray: F64MAT4X4  */
-#line 2608 "MachineIndependent/glslang.y"
-                {
-        parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtDouble;
-        (yyval.interm.type).setMatrix(4, 4);
-    }
-#line 9312 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 361: /* type_specifier_nonarray: ACCSTRUCTNV  */
-#line 2614 "MachineIndependent/glslang.y"
-                  {
-       (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-       (yyval.interm.type).basicType = EbtAccStruct;
-    }
-#line 9321 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 362: /* type_specifier_nonarray: ACCSTRUCTEXT  */
-#line 2618 "MachineIndependent/glslang.y"
+  case 347: /* type_specifier_nonarray: ACCSTRUCTEXT  */
+#line 2527 "MachineIndependent/glslang.y"
                    {
        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
        (yyval.interm.type).basicType = EbtAccStruct;
     }
-#line 9330 "MachineIndependent/glslang_tab.cpp"
+#line 8925 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 363: /* type_specifier_nonarray: RAYQUERYEXT  */
-#line 2622 "MachineIndependent/glslang.y"
+  case 348: /* type_specifier_nonarray: RAYQUERYEXT  */
+#line 2531 "MachineIndependent/glslang.y"
                   {
        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
        (yyval.interm.type).basicType = EbtRayQuery;
     }
-#line 9339 "MachineIndependent/glslang_tab.cpp"
+#line 8934 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 364: /* type_specifier_nonarray: ATOMIC_UINT  */
-#line 2626 "MachineIndependent/glslang.y"
+  case 349: /* type_specifier_nonarray: ATOMIC_UINT  */
+#line 2535 "MachineIndependent/glslang.y"
                   {
         parseContext.vulkanRemoved((yyvsp[0].lex).loc, "atomic counter types");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtAtomicUint;
     }
-#line 9349 "MachineIndependent/glslang_tab.cpp"
+#line 8944 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 365: /* type_specifier_nonarray: SAMPLER1D  */
-#line 2631 "MachineIndependent/glslang.y"
+  case 350: /* type_specifier_nonarray: SAMPLER1D  */
+#line 2540 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd1D);
     }
-#line 9359 "MachineIndependent/glslang_tab.cpp"
+#line 8954 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 366: /* type_specifier_nonarray: SAMPLER2D  */
-#line 2636 "MachineIndependent/glslang.y"
+  case 351: /* type_specifier_nonarray: SAMPLER2D  */
+#line 2545 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D);
     }
-#line 9369 "MachineIndependent/glslang_tab.cpp"
+#line 8964 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 367: /* type_specifier_nonarray: SAMPLER3D  */
-#line 2641 "MachineIndependent/glslang.y"
+  case 352: /* type_specifier_nonarray: SAMPLER3D  */
+#line 2550 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd3D);
     }
-#line 9379 "MachineIndependent/glslang_tab.cpp"
+#line 8974 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 368: /* type_specifier_nonarray: SAMPLERCUBE  */
-#line 2646 "MachineIndependent/glslang.y"
+  case 353: /* type_specifier_nonarray: SAMPLERCUBE  */
+#line 2555 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdCube);
     }
-#line 9389 "MachineIndependent/glslang_tab.cpp"
+#line 8984 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 369: /* type_specifier_nonarray: SAMPLER2DSHADOW  */
-#line 2651 "MachineIndependent/glslang.y"
+  case 354: /* type_specifier_nonarray: SAMPLER2DSHADOW  */
+#line 2560 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, true);
     }
-#line 9399 "MachineIndependent/glslang_tab.cpp"
+#line 8994 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 370: /* type_specifier_nonarray: SAMPLERCUBESHADOW  */
-#line 2656 "MachineIndependent/glslang.y"
+  case 355: /* type_specifier_nonarray: SAMPLERCUBESHADOW  */
+#line 2565 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdCube, false, true);
     }
-#line 9409 "MachineIndependent/glslang_tab.cpp"
+#line 9004 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 371: /* type_specifier_nonarray: SAMPLER2DARRAY  */
-#line 2661 "MachineIndependent/glslang.y"
+  case 356: /* type_specifier_nonarray: SAMPLER2DARRAY  */
+#line 2570 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D, true);
     }
-#line 9419 "MachineIndependent/glslang_tab.cpp"
+#line 9014 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 372: /* type_specifier_nonarray: SAMPLER2DARRAYSHADOW  */
-#line 2666 "MachineIndependent/glslang.y"
+  case 357: /* type_specifier_nonarray: SAMPLER2DARRAYSHADOW  */
+#line 2575 "MachineIndependent/glslang.y"
                            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, true);
     }
-#line 9429 "MachineIndependent/glslang_tab.cpp"
+#line 9024 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 373: /* type_specifier_nonarray: SAMPLER1DSHADOW  */
-#line 2671 "MachineIndependent/glslang.y"
+  case 358: /* type_specifier_nonarray: SAMPLER1DSHADOW  */
+#line 2580 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd1D, false, true);
     }
-#line 9439 "MachineIndependent/glslang_tab.cpp"
+#line 9034 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 374: /* type_specifier_nonarray: SAMPLER1DARRAY  */
-#line 2676 "MachineIndependent/glslang.y"
+  case 359: /* type_specifier_nonarray: SAMPLER1DARRAY  */
+#line 2585 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd1D, true);
     }
-#line 9449 "MachineIndependent/glslang_tab.cpp"
+#line 9044 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 375: /* type_specifier_nonarray: SAMPLER1DARRAYSHADOW  */
-#line 2681 "MachineIndependent/glslang.y"
+  case 360: /* type_specifier_nonarray: SAMPLER1DARRAYSHADOW  */
+#line 2590 "MachineIndependent/glslang.y"
                            {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd1D, true, true);
     }
-#line 9459 "MachineIndependent/glslang_tab.cpp"
+#line 9054 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 376: /* type_specifier_nonarray: SAMPLERCUBEARRAY  */
-#line 2686 "MachineIndependent/glslang.y"
+  case 361: /* type_specifier_nonarray: SAMPLERCUBEARRAY  */
+#line 2595 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdCube, true);
     }
-#line 9469 "MachineIndependent/glslang_tab.cpp"
+#line 9064 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 377: /* type_specifier_nonarray: SAMPLERCUBEARRAYSHADOW  */
-#line 2691 "MachineIndependent/glslang.y"
+  case 362: /* type_specifier_nonarray: SAMPLERCUBEARRAYSHADOW  */
+#line 2600 "MachineIndependent/glslang.y"
                              {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdCube, true, true);
     }
-#line 9479 "MachineIndependent/glslang_tab.cpp"
+#line 9074 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 378: /* type_specifier_nonarray: F16SAMPLER1D  */
-#line 2696 "MachineIndependent/glslang.y"
+  case 363: /* type_specifier_nonarray: F16SAMPLER1D  */
+#line 2605 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd1D);
     }
-#line 9490 "MachineIndependent/glslang_tab.cpp"
+#line 9085 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 379: /* type_specifier_nonarray: F16SAMPLER2D  */
-#line 2702 "MachineIndependent/glslang.y"
+  case 364: /* type_specifier_nonarray: F16SAMPLER2D  */
+#line 2611 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D);
     }
-#line 9501 "MachineIndependent/glslang_tab.cpp"
+#line 9096 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 380: /* type_specifier_nonarray: F16SAMPLER3D  */
-#line 2708 "MachineIndependent/glslang.y"
+  case 365: /* type_specifier_nonarray: F16SAMPLER3D  */
+#line 2617 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd3D);
     }
-#line 9512 "MachineIndependent/glslang_tab.cpp"
+#line 9107 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 381: /* type_specifier_nonarray: F16SAMPLERCUBE  */
-#line 2714 "MachineIndependent/glslang.y"
+  case 366: /* type_specifier_nonarray: F16SAMPLERCUBE  */
+#line 2623 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdCube);
     }
-#line 9523 "MachineIndependent/glslang_tab.cpp"
+#line 9118 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 382: /* type_specifier_nonarray: F16SAMPLER1DSHADOW  */
-#line 2720 "MachineIndependent/glslang.y"
+  case 367: /* type_specifier_nonarray: F16SAMPLER1DSHADOW  */
+#line 2629 "MachineIndependent/glslang.y"
                          {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd1D, false, true);
     }
-#line 9534 "MachineIndependent/glslang_tab.cpp"
+#line 9129 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 383: /* type_specifier_nonarray: F16SAMPLER2DSHADOW  */
-#line 2726 "MachineIndependent/glslang.y"
+  case 368: /* type_specifier_nonarray: F16SAMPLER2DSHADOW  */
+#line 2635 "MachineIndependent/glslang.y"
                          {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D, false, true);
     }
-#line 9545 "MachineIndependent/glslang_tab.cpp"
+#line 9140 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 384: /* type_specifier_nonarray: F16SAMPLERCUBESHADOW  */
-#line 2732 "MachineIndependent/glslang.y"
+  case 369: /* type_specifier_nonarray: F16SAMPLERCUBESHADOW  */
+#line 2641 "MachineIndependent/glslang.y"
                            {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdCube, false, true);
     }
-#line 9556 "MachineIndependent/glslang_tab.cpp"
+#line 9151 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 385: /* type_specifier_nonarray: F16SAMPLER1DARRAY  */
-#line 2738 "MachineIndependent/glslang.y"
+  case 370: /* type_specifier_nonarray: F16SAMPLER1DARRAY  */
+#line 2647 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd1D, true);
     }
-#line 9567 "MachineIndependent/glslang_tab.cpp"
+#line 9162 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 386: /* type_specifier_nonarray: F16SAMPLER2DARRAY  */
-#line 2744 "MachineIndependent/glslang.y"
+  case 371: /* type_specifier_nonarray: F16SAMPLER2DARRAY  */
+#line 2653 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true);
     }
-#line 9578 "MachineIndependent/glslang_tab.cpp"
+#line 9173 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 387: /* type_specifier_nonarray: F16SAMPLER1DARRAYSHADOW  */
-#line 2750 "MachineIndependent/glslang.y"
+  case 372: /* type_specifier_nonarray: F16SAMPLER1DARRAYSHADOW  */
+#line 2659 "MachineIndependent/glslang.y"
                               {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd1D, true, true);
     }
-#line 9589 "MachineIndependent/glslang_tab.cpp"
+#line 9184 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 388: /* type_specifier_nonarray: F16SAMPLER2DARRAYSHADOW  */
-#line 2756 "MachineIndependent/glslang.y"
+  case 373: /* type_specifier_nonarray: F16SAMPLER2DARRAYSHADOW  */
+#line 2665 "MachineIndependent/glslang.y"
                               {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true, true);
     }
-#line 9600 "MachineIndependent/glslang_tab.cpp"
+#line 9195 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 389: /* type_specifier_nonarray: F16SAMPLERCUBEARRAY  */
-#line 2762 "MachineIndependent/glslang.y"
+  case 374: /* type_specifier_nonarray: F16SAMPLERCUBEARRAY  */
+#line 2671 "MachineIndependent/glslang.y"
                           {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdCube, true);
     }
-#line 9611 "MachineIndependent/glslang_tab.cpp"
+#line 9206 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 390: /* type_specifier_nonarray: F16SAMPLERCUBEARRAYSHADOW  */
-#line 2768 "MachineIndependent/glslang.y"
+  case 375: /* type_specifier_nonarray: F16SAMPLERCUBEARRAYSHADOW  */
+#line 2677 "MachineIndependent/glslang.y"
                                 {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdCube, true, true);
     }
-#line 9622 "MachineIndependent/glslang_tab.cpp"
+#line 9217 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 391: /* type_specifier_nonarray: ISAMPLER1D  */
-#line 2774 "MachineIndependent/glslang.y"
+  case 376: /* type_specifier_nonarray: ISAMPLER1D  */
+#line 2683 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd1D);
     }
-#line 9632 "MachineIndependent/glslang_tab.cpp"
+#line 9227 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 392: /* type_specifier_nonarray: ISAMPLER2D  */
-#line 2779 "MachineIndependent/glslang.y"
+  case 377: /* type_specifier_nonarray: ISAMPLER2D  */
+#line 2688 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd2D);
     }
-#line 9642 "MachineIndependent/glslang_tab.cpp"
+#line 9237 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 393: /* type_specifier_nonarray: ISAMPLER3D  */
-#line 2784 "MachineIndependent/glslang.y"
+  case 378: /* type_specifier_nonarray: ISAMPLER3D  */
+#line 2693 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd3D);
     }
-#line 9652 "MachineIndependent/glslang_tab.cpp"
+#line 9247 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 394: /* type_specifier_nonarray: ISAMPLERCUBE  */
-#line 2789 "MachineIndependent/glslang.y"
+  case 379: /* type_specifier_nonarray: ISAMPLERCUBE  */
+#line 2698 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, EsdCube);
     }
-#line 9662 "MachineIndependent/glslang_tab.cpp"
+#line 9257 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 395: /* type_specifier_nonarray: ISAMPLER2DARRAY  */
-#line 2794 "MachineIndependent/glslang.y"
+  case 380: /* type_specifier_nonarray: ISAMPLER2DARRAY  */
+#line 2703 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd2D, true);
     }
-#line 9672 "MachineIndependent/glslang_tab.cpp"
+#line 9267 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 396: /* type_specifier_nonarray: USAMPLER2D  */
-#line 2799 "MachineIndependent/glslang.y"
+  case 381: /* type_specifier_nonarray: USAMPLER2D  */
+#line 2708 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd2D);
     }
-#line 9682 "MachineIndependent/glslang_tab.cpp"
+#line 9277 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 397: /* type_specifier_nonarray: USAMPLER3D  */
-#line 2804 "MachineIndependent/glslang.y"
+  case 382: /* type_specifier_nonarray: USAMPLER3D  */
+#line 2713 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd3D);
     }
-#line 9692 "MachineIndependent/glslang_tab.cpp"
+#line 9287 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 398: /* type_specifier_nonarray: USAMPLERCUBE  */
-#line 2809 "MachineIndependent/glslang.y"
+  case 383: /* type_specifier_nonarray: USAMPLERCUBE  */
+#line 2718 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, EsdCube);
     }
-#line 9702 "MachineIndependent/glslang_tab.cpp"
+#line 9297 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 399: /* type_specifier_nonarray: ISAMPLER1DARRAY  */
-#line 2814 "MachineIndependent/glslang.y"
+  case 384: /* type_specifier_nonarray: ISAMPLER1DARRAY  */
+#line 2723 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd1D, true);
     }
-#line 9712 "MachineIndependent/glslang_tab.cpp"
+#line 9307 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 400: /* type_specifier_nonarray: ISAMPLERCUBEARRAY  */
-#line 2819 "MachineIndependent/glslang.y"
+  case 385: /* type_specifier_nonarray: ISAMPLERCUBEARRAY  */
+#line 2728 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, EsdCube, true);
     }
-#line 9722 "MachineIndependent/glslang_tab.cpp"
+#line 9317 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 401: /* type_specifier_nonarray: USAMPLER1D  */
-#line 2824 "MachineIndependent/glslang.y"
+  case 386: /* type_specifier_nonarray: USAMPLER1D  */
+#line 2733 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd1D);
     }
-#line 9732 "MachineIndependent/glslang_tab.cpp"
+#line 9327 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 402: /* type_specifier_nonarray: USAMPLER1DARRAY  */
-#line 2829 "MachineIndependent/glslang.y"
+  case 387: /* type_specifier_nonarray: USAMPLER1DARRAY  */
+#line 2738 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd1D, true);
     }
-#line 9742 "MachineIndependent/glslang_tab.cpp"
+#line 9337 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 403: /* type_specifier_nonarray: USAMPLERCUBEARRAY  */
-#line 2834 "MachineIndependent/glslang.y"
+  case 388: /* type_specifier_nonarray: USAMPLERCUBEARRAY  */
+#line 2743 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, EsdCube, true);
     }
-#line 9752 "MachineIndependent/glslang_tab.cpp"
+#line 9347 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 404: /* type_specifier_nonarray: TEXTURECUBEARRAY  */
-#line 2839 "MachineIndependent/glslang.y"
+  case 389: /* type_specifier_nonarray: TEXTURECUBEARRAY  */
+#line 2748 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube, true);
     }
-#line 9762 "MachineIndependent/glslang_tab.cpp"
+#line 9357 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 405: /* type_specifier_nonarray: ITEXTURECUBEARRAY  */
-#line 2844 "MachineIndependent/glslang.y"
+  case 390: /* type_specifier_nonarray: ITEXTURECUBEARRAY  */
+#line 2753 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, EsdCube, true);
     }
-#line 9772 "MachineIndependent/glslang_tab.cpp"
+#line 9367 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 406: /* type_specifier_nonarray: UTEXTURECUBEARRAY  */
-#line 2849 "MachineIndependent/glslang.y"
+  case 391: /* type_specifier_nonarray: UTEXTURECUBEARRAY  */
+#line 2758 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, EsdCube, true);
     }
-#line 9782 "MachineIndependent/glslang_tab.cpp"
+#line 9377 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 407: /* type_specifier_nonarray: USAMPLER2DARRAY  */
-#line 2854 "MachineIndependent/glslang.y"
+  case 392: /* type_specifier_nonarray: USAMPLER2DARRAY  */
+#line 2763 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd2D, true);
     }
-#line 9792 "MachineIndependent/glslang_tab.cpp"
+#line 9387 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 408: /* type_specifier_nonarray: TEXTURE2D  */
-#line 2859 "MachineIndependent/glslang.y"
+  case 393: /* type_specifier_nonarray: TEXTURE2D  */
+#line 2768 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D);
     }
-#line 9802 "MachineIndependent/glslang_tab.cpp"
+#line 9397 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 409: /* type_specifier_nonarray: TEXTURE3D  */
-#line 2864 "MachineIndependent/glslang.y"
+  case 394: /* type_specifier_nonarray: TEXTURE3D  */
+#line 2773 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd3D);
     }
-#line 9812 "MachineIndependent/glslang_tab.cpp"
+#line 9407 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 410: /* type_specifier_nonarray: TEXTURE2DARRAY  */
-#line 2869 "MachineIndependent/glslang.y"
+  case 395: /* type_specifier_nonarray: TEXTURE2DARRAY  */
+#line 2778 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true);
     }
-#line 9822 "MachineIndependent/glslang_tab.cpp"
+#line 9417 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 411: /* type_specifier_nonarray: TEXTURECUBE  */
-#line 2874 "MachineIndependent/glslang.y"
+  case 396: /* type_specifier_nonarray: TEXTURECUBE  */
+#line 2783 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube);
     }
-#line 9832 "MachineIndependent/glslang_tab.cpp"
+#line 9427 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 412: /* type_specifier_nonarray: ITEXTURE2D  */
-#line 2879 "MachineIndependent/glslang.y"
+  case 397: /* type_specifier_nonarray: ITEXTURE2D  */
+#line 2788 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd2D);
     }
-#line 9842 "MachineIndependent/glslang_tab.cpp"
+#line 9437 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 413: /* type_specifier_nonarray: ITEXTURE3D  */
-#line 2884 "MachineIndependent/glslang.y"
+  case 398: /* type_specifier_nonarray: ITEXTURE3D  */
+#line 2793 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd3D);
     }
-#line 9852 "MachineIndependent/glslang_tab.cpp"
+#line 9447 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 414: /* type_specifier_nonarray: ITEXTURECUBE  */
-#line 2889 "MachineIndependent/glslang.y"
+  case 399: /* type_specifier_nonarray: ITEXTURECUBE  */
+#line 2798 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, EsdCube);
     }
-#line 9862 "MachineIndependent/glslang_tab.cpp"
+#line 9457 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 415: /* type_specifier_nonarray: ITEXTURE2DARRAY  */
-#line 2894 "MachineIndependent/glslang.y"
+  case 400: /* type_specifier_nonarray: ITEXTURE2DARRAY  */
+#line 2803 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true);
     }
-#line 9872 "MachineIndependent/glslang_tab.cpp"
+#line 9467 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 416: /* type_specifier_nonarray: UTEXTURE2D  */
-#line 2899 "MachineIndependent/glslang.y"
+  case 401: /* type_specifier_nonarray: UTEXTURE2D  */
+#line 2808 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd2D);
     }
-#line 9882 "MachineIndependent/glslang_tab.cpp"
+#line 9477 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 417: /* type_specifier_nonarray: UTEXTURE3D  */
-#line 2904 "MachineIndependent/glslang.y"
+  case 402: /* type_specifier_nonarray: UTEXTURE3D  */
+#line 2813 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd3D);
     }
-#line 9892 "MachineIndependent/glslang_tab.cpp"
+#line 9487 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 418: /* type_specifier_nonarray: UTEXTURECUBE  */
-#line 2909 "MachineIndependent/glslang.y"
+  case 403: /* type_specifier_nonarray: UTEXTURECUBE  */
+#line 2818 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, EsdCube);
     }
-#line 9902 "MachineIndependent/glslang_tab.cpp"
+#line 9497 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 419: /* type_specifier_nonarray: UTEXTURE2DARRAY  */
-#line 2914 "MachineIndependent/glslang.y"
+  case 404: /* type_specifier_nonarray: UTEXTURE2DARRAY  */
+#line 2823 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true);
     }
-#line 9912 "MachineIndependent/glslang_tab.cpp"
+#line 9507 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 420: /* type_specifier_nonarray: SAMPLER  */
-#line 2919 "MachineIndependent/glslang.y"
+  case 405: /* type_specifier_nonarray: SAMPLER  */
+#line 2828 "MachineIndependent/glslang.y"
               {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setPureSampler(false);
     }
-#line 9922 "MachineIndependent/glslang_tab.cpp"
+#line 9517 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 421: /* type_specifier_nonarray: SAMPLERSHADOW  */
-#line 2924 "MachineIndependent/glslang.y"
+  case 406: /* type_specifier_nonarray: SAMPLERSHADOW  */
+#line 2833 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setPureSampler(true);
     }
-#line 9932 "MachineIndependent/glslang_tab.cpp"
+#line 9527 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 422: /* type_specifier_nonarray: SAMPLER2DRECT  */
-#line 2929 "MachineIndependent/glslang.y"
+  case 407: /* type_specifier_nonarray: SAMPLER2DRECT  */
+#line 2838 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdRect);
     }
-#line 9942 "MachineIndependent/glslang_tab.cpp"
+#line 9537 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 423: /* type_specifier_nonarray: SAMPLER2DRECTSHADOW  */
-#line 2934 "MachineIndependent/glslang.y"
+  case 408: /* type_specifier_nonarray: SAMPLER2DRECTSHADOW  */
+#line 2843 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdRect, false, true);
     }
-#line 9952 "MachineIndependent/glslang_tab.cpp"
+#line 9547 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 424: /* type_specifier_nonarray: F16SAMPLER2DRECT  */
-#line 2939 "MachineIndependent/glslang.y"
+  case 409: /* type_specifier_nonarray: F16SAMPLER2DRECT  */
+#line 2848 "MachineIndependent/glslang.y"
                        {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdRect);
     }
-#line 9963 "MachineIndependent/glslang_tab.cpp"
+#line 9558 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 425: /* type_specifier_nonarray: F16SAMPLER2DRECTSHADOW  */
-#line 2945 "MachineIndependent/glslang.y"
+  case 410: /* type_specifier_nonarray: F16SAMPLER2DRECTSHADOW  */
+#line 2854 "MachineIndependent/glslang.y"
                              {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdRect, false, true);
     }
-#line 9974 "MachineIndependent/glslang_tab.cpp"
+#line 9569 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 426: /* type_specifier_nonarray: ISAMPLER2DRECT  */
-#line 2951 "MachineIndependent/glslang.y"
+  case 411: /* type_specifier_nonarray: ISAMPLER2DRECT  */
+#line 2860 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, EsdRect);
     }
-#line 9984 "MachineIndependent/glslang_tab.cpp"
+#line 9579 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 427: /* type_specifier_nonarray: USAMPLER2DRECT  */
-#line 2956 "MachineIndependent/glslang.y"
+  case 412: /* type_specifier_nonarray: USAMPLER2DRECT  */
+#line 2865 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, EsdRect);
     }
-#line 9994 "MachineIndependent/glslang_tab.cpp"
+#line 9589 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 428: /* type_specifier_nonarray: SAMPLERBUFFER  */
-#line 2961 "MachineIndependent/glslang.y"
+  case 413: /* type_specifier_nonarray: SAMPLERBUFFER  */
+#line 2870 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, EsdBuffer);
     }
-#line 10004 "MachineIndependent/glslang_tab.cpp"
+#line 9599 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 429: /* type_specifier_nonarray: F16SAMPLERBUFFER  */
-#line 2966 "MachineIndependent/glslang.y"
+  case 414: /* type_specifier_nonarray: F16SAMPLERBUFFER  */
+#line 2875 "MachineIndependent/glslang.y"
                        {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, EsdBuffer);
     }
-#line 10015 "MachineIndependent/glslang_tab.cpp"
+#line 9610 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 430: /* type_specifier_nonarray: ISAMPLERBUFFER  */
-#line 2972 "MachineIndependent/glslang.y"
+  case 415: /* type_specifier_nonarray: ISAMPLERBUFFER  */
+#line 2881 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, EsdBuffer);
     }
-#line 10025 "MachineIndependent/glslang_tab.cpp"
+#line 9620 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 431: /* type_specifier_nonarray: USAMPLERBUFFER  */
-#line 2977 "MachineIndependent/glslang.y"
+  case 416: /* type_specifier_nonarray: USAMPLERBUFFER  */
+#line 2886 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, EsdBuffer);
     }
-#line 10035 "MachineIndependent/glslang_tab.cpp"
+#line 9630 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 432: /* type_specifier_nonarray: SAMPLER2DMS  */
-#line 2982 "MachineIndependent/glslang.y"
+  case 417: /* type_specifier_nonarray: SAMPLER2DMS  */
+#line 2891 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, false, true);
     }
-#line 10045 "MachineIndependent/glslang_tab.cpp"
+#line 9640 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 433: /* type_specifier_nonarray: F16SAMPLER2DMS  */
-#line 2987 "MachineIndependent/glslang.y"
+  case 418: /* type_specifier_nonarray: F16SAMPLER2DMS  */
+#line 2896 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D, false, false, true);
     }
-#line 10056 "MachineIndependent/glslang_tab.cpp"
+#line 9651 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 434: /* type_specifier_nonarray: ISAMPLER2DMS  */
-#line 2993 "MachineIndependent/glslang.y"
+  case 419: /* type_specifier_nonarray: ISAMPLER2DMS  */
+#line 2902 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd2D, false, false, true);
     }
-#line 10066 "MachineIndependent/glslang_tab.cpp"
+#line 9661 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 435: /* type_specifier_nonarray: USAMPLER2DMS  */
-#line 2998 "MachineIndependent/glslang.y"
+  case 420: /* type_specifier_nonarray: USAMPLER2DMS  */
+#line 2907 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd2D, false, false, true);
     }
-#line 10076 "MachineIndependent/glslang_tab.cpp"
+#line 9671 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 436: /* type_specifier_nonarray: SAMPLER2DMSARRAY  */
-#line 3003 "MachineIndependent/glslang.y"
+  case 421: /* type_specifier_nonarray: SAMPLER2DMSARRAY  */
+#line 2912 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, false, true);
     }
-#line 10086 "MachineIndependent/glslang_tab.cpp"
+#line 9681 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 437: /* type_specifier_nonarray: F16SAMPLER2DMSARRAY  */
-#line 3008 "MachineIndependent/glslang.y"
+  case 422: /* type_specifier_nonarray: F16SAMPLER2DMSARRAY  */
+#line 2917 "MachineIndependent/glslang.y"
                           {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true, false, true);
     }
-#line 10097 "MachineIndependent/glslang_tab.cpp"
+#line 9692 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 438: /* type_specifier_nonarray: ISAMPLER2DMSARRAY  */
-#line 3014 "MachineIndependent/glslang.y"
+  case 423: /* type_specifier_nonarray: ISAMPLER2DMSARRAY  */
+#line 2923 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtInt, Esd2D, true, false, true);
     }
-#line 10107 "MachineIndependent/glslang_tab.cpp"
+#line 9702 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 439: /* type_specifier_nonarray: USAMPLER2DMSARRAY  */
-#line 3019 "MachineIndependent/glslang.y"
+  case 424: /* type_specifier_nonarray: USAMPLER2DMSARRAY  */
+#line 2928 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtUint, Esd2D, true, false, true);
     }
-#line 10117 "MachineIndependent/glslang_tab.cpp"
+#line 9712 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 440: /* type_specifier_nonarray: TEXTURE1D  */
-#line 3024 "MachineIndependent/glslang.y"
+  case 425: /* type_specifier_nonarray: TEXTURE1D  */
+#line 2933 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D);
     }
-#line 10127 "MachineIndependent/glslang_tab.cpp"
+#line 9722 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 441: /* type_specifier_nonarray: F16TEXTURE1D  */
-#line 3029 "MachineIndependent/glslang.y"
+  case 426: /* type_specifier_nonarray: F16TEXTURE1D  */
+#line 2938 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd1D);
     }
-#line 10138 "MachineIndependent/glslang_tab.cpp"
+#line 9733 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 442: /* type_specifier_nonarray: F16TEXTURE2D  */
-#line 3035 "MachineIndependent/glslang.y"
+  case 427: /* type_specifier_nonarray: F16TEXTURE2D  */
+#line 2944 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D);
     }
-#line 10149 "MachineIndependent/glslang_tab.cpp"
+#line 9744 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 443: /* type_specifier_nonarray: F16TEXTURE3D  */
-#line 3041 "MachineIndependent/glslang.y"
+  case 428: /* type_specifier_nonarray: F16TEXTURE3D  */
+#line 2950 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd3D);
     }
-#line 10160 "MachineIndependent/glslang_tab.cpp"
+#line 9755 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 444: /* type_specifier_nonarray: F16TEXTURECUBE  */
-#line 3047 "MachineIndependent/glslang.y"
+  case 429: /* type_specifier_nonarray: F16TEXTURECUBE  */
+#line 2956 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, EsdCube);
     }
-#line 10171 "MachineIndependent/glslang_tab.cpp"
+#line 9766 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 445: /* type_specifier_nonarray: TEXTURE1DARRAY  */
-#line 3053 "MachineIndependent/glslang.y"
+  case 430: /* type_specifier_nonarray: TEXTURE1DARRAY  */
+#line 2962 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D, true);
     }
-#line 10181 "MachineIndependent/glslang_tab.cpp"
+#line 9776 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 446: /* type_specifier_nonarray: F16TEXTURE1DARRAY  */
-#line 3058 "MachineIndependent/glslang.y"
+  case 431: /* type_specifier_nonarray: F16TEXTURE1DARRAY  */
+#line 2967 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd1D, true);
     }
-#line 10192 "MachineIndependent/glslang_tab.cpp"
+#line 9787 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 447: /* type_specifier_nonarray: F16TEXTURE2DARRAY  */
-#line 3064 "MachineIndependent/glslang.y"
+  case 432: /* type_specifier_nonarray: F16TEXTURE2DARRAY  */
+#line 2973 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, true);
     }
-#line 10203 "MachineIndependent/glslang_tab.cpp"
+#line 9798 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 448: /* type_specifier_nonarray: F16TEXTURECUBEARRAY  */
-#line 3070 "MachineIndependent/glslang.y"
+  case 433: /* type_specifier_nonarray: F16TEXTURECUBEARRAY  */
+#line 2979 "MachineIndependent/glslang.y"
                           {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, EsdCube, true);
     }
-#line 10214 "MachineIndependent/glslang_tab.cpp"
+#line 9809 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 449: /* type_specifier_nonarray: ITEXTURE1D  */
-#line 3076 "MachineIndependent/glslang.y"
+  case 434: /* type_specifier_nonarray: ITEXTURE1D  */
+#line 2985 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd1D);
     }
-#line 10224 "MachineIndependent/glslang_tab.cpp"
+#line 9819 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 450: /* type_specifier_nonarray: ITEXTURE1DARRAY  */
-#line 3081 "MachineIndependent/glslang.y"
+  case 435: /* type_specifier_nonarray: ITEXTURE1DARRAY  */
+#line 2990 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd1D, true);
     }
-#line 10234 "MachineIndependent/glslang_tab.cpp"
+#line 9829 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 451: /* type_specifier_nonarray: UTEXTURE1D  */
-#line 3086 "MachineIndependent/glslang.y"
+  case 436: /* type_specifier_nonarray: UTEXTURE1D  */
+#line 2995 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd1D);
     }
-#line 10244 "MachineIndependent/glslang_tab.cpp"
+#line 9839 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 452: /* type_specifier_nonarray: UTEXTURE1DARRAY  */
-#line 3091 "MachineIndependent/glslang.y"
+  case 437: /* type_specifier_nonarray: UTEXTURE1DARRAY  */
+#line 3000 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd1D, true);
     }
-#line 10254 "MachineIndependent/glslang_tab.cpp"
+#line 9849 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 453: /* type_specifier_nonarray: TEXTURE2DRECT  */
-#line 3096 "MachineIndependent/glslang.y"
+  case 438: /* type_specifier_nonarray: TEXTURE2DRECT  */
+#line 3005 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, EsdRect);
     }
-#line 10264 "MachineIndependent/glslang_tab.cpp"
+#line 9859 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 454: /* type_specifier_nonarray: F16TEXTURE2DRECT  */
-#line 3101 "MachineIndependent/glslang.y"
+  case 439: /* type_specifier_nonarray: F16TEXTURE2DRECT  */
+#line 3010 "MachineIndependent/glslang.y"
                        {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, EsdRect);
     }
-#line 10275 "MachineIndependent/glslang_tab.cpp"
+#line 9870 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 455: /* type_specifier_nonarray: ITEXTURE2DRECT  */
-#line 3107 "MachineIndependent/glslang.y"
+  case 440: /* type_specifier_nonarray: ITEXTURE2DRECT  */
+#line 3016 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, EsdRect);
     }
-#line 10285 "MachineIndependent/glslang_tab.cpp"
+#line 9880 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 456: /* type_specifier_nonarray: UTEXTURE2DRECT  */
-#line 3112 "MachineIndependent/glslang.y"
+  case 441: /* type_specifier_nonarray: UTEXTURE2DRECT  */
+#line 3021 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, EsdRect);
     }
-#line 10295 "MachineIndependent/glslang_tab.cpp"
+#line 9890 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 457: /* type_specifier_nonarray: TEXTUREBUFFER  */
-#line 3117 "MachineIndependent/glslang.y"
+  case 442: /* type_specifier_nonarray: TEXTUREBUFFER  */
+#line 3026 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, EsdBuffer);
     }
-#line 10305 "MachineIndependent/glslang_tab.cpp"
+#line 9900 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 458: /* type_specifier_nonarray: F16TEXTUREBUFFER  */
-#line 3122 "MachineIndependent/glslang.y"
+  case 443: /* type_specifier_nonarray: F16TEXTUREBUFFER  */
+#line 3031 "MachineIndependent/glslang.y"
                        {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, EsdBuffer);
     }
-#line 10316 "MachineIndependent/glslang_tab.cpp"
+#line 9911 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 459: /* type_specifier_nonarray: ITEXTUREBUFFER  */
-#line 3128 "MachineIndependent/glslang.y"
+  case 444: /* type_specifier_nonarray: ITEXTUREBUFFER  */
+#line 3037 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, EsdBuffer);
     }
-#line 10326 "MachineIndependent/glslang_tab.cpp"
+#line 9921 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 460: /* type_specifier_nonarray: UTEXTUREBUFFER  */
-#line 3133 "MachineIndependent/glslang.y"
+  case 445: /* type_specifier_nonarray: UTEXTUREBUFFER  */
+#line 3042 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, EsdBuffer);
     }
-#line 10336 "MachineIndependent/glslang_tab.cpp"
+#line 9931 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 461: /* type_specifier_nonarray: TEXTURE2DMS  */
-#line 3138 "MachineIndependent/glslang.y"
+  case 446: /* type_specifier_nonarray: TEXTURE2DMS  */
+#line 3047 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, false, false, true);
     }
-#line 10346 "MachineIndependent/glslang_tab.cpp"
+#line 9941 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 462: /* type_specifier_nonarray: F16TEXTURE2DMS  */
-#line 3143 "MachineIndependent/glslang.y"
+  case 447: /* type_specifier_nonarray: F16TEXTURE2DMS  */
+#line 3052 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, false, false, true);
     }
-#line 10357 "MachineIndependent/glslang_tab.cpp"
+#line 9952 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 463: /* type_specifier_nonarray: ITEXTURE2DMS  */
-#line 3149 "MachineIndependent/glslang.y"
+  case 448: /* type_specifier_nonarray: ITEXTURE2DMS  */
+#line 3058 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, false, false, true);
     }
-#line 10367 "MachineIndependent/glslang_tab.cpp"
+#line 9962 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 464: /* type_specifier_nonarray: UTEXTURE2DMS  */
-#line 3154 "MachineIndependent/glslang.y"
+  case 449: /* type_specifier_nonarray: UTEXTURE2DMS  */
+#line 3063 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, false, false, true);
     }
-#line 10377 "MachineIndependent/glslang_tab.cpp"
+#line 9972 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 465: /* type_specifier_nonarray: TEXTURE2DMSARRAY  */
-#line 3159 "MachineIndependent/glslang.y"
+  case 450: /* type_specifier_nonarray: TEXTURE2DMSARRAY  */
+#line 3068 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true, false, true);
     }
-#line 10387 "MachineIndependent/glslang_tab.cpp"
+#line 9982 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 466: /* type_specifier_nonarray: F16TEXTURE2DMSARRAY  */
-#line 3164 "MachineIndependent/glslang.y"
+  case 451: /* type_specifier_nonarray: F16TEXTURE2DMSARRAY  */
+#line 3073 "MachineIndependent/glslang.y"
                           {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, true, false, true);
     }
-#line 10398 "MachineIndependent/glslang_tab.cpp"
+#line 9993 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 467: /* type_specifier_nonarray: ITEXTURE2DMSARRAY  */
-#line 3170 "MachineIndependent/glslang.y"
+  case 452: /* type_specifier_nonarray: ITEXTURE2DMSARRAY  */
+#line 3079 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true, false, true);
     }
-#line 10408 "MachineIndependent/glslang_tab.cpp"
+#line 10003 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 468: /* type_specifier_nonarray: UTEXTURE2DMSARRAY  */
-#line 3175 "MachineIndependent/glslang.y"
+  case 453: /* type_specifier_nonarray: UTEXTURE2DMSARRAY  */
+#line 3084 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true, false, true);
     }
-#line 10418 "MachineIndependent/glslang_tab.cpp"
+#line 10013 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 469: /* type_specifier_nonarray: IMAGE1D  */
-#line 3180 "MachineIndependent/glslang.y"
+  case 454: /* type_specifier_nonarray: IMAGE1D  */
+#line 3089 "MachineIndependent/glslang.y"
               {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd1D);
     }
-#line 10428 "MachineIndependent/glslang_tab.cpp"
+#line 10023 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 470: /* type_specifier_nonarray: F16IMAGE1D  */
-#line 3185 "MachineIndependent/glslang.y"
+  case 455: /* type_specifier_nonarray: F16IMAGE1D  */
+#line 3094 "MachineIndependent/glslang.y"
                  {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd1D);
     }
-#line 10439 "MachineIndependent/glslang_tab.cpp"
+#line 10034 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 471: /* type_specifier_nonarray: IIMAGE1D  */
-#line 3191 "MachineIndependent/glslang.y"
+  case 456: /* type_specifier_nonarray: IIMAGE1D  */
+#line 3100 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd1D);
     }
-#line 10449 "MachineIndependent/glslang_tab.cpp"
+#line 10044 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 472: /* type_specifier_nonarray: UIMAGE1D  */
-#line 3196 "MachineIndependent/glslang.y"
+  case 457: /* type_specifier_nonarray: UIMAGE1D  */
+#line 3105 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd1D);
     }
-#line 10459 "MachineIndependent/glslang_tab.cpp"
+#line 10054 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 473: /* type_specifier_nonarray: IMAGE2D  */
-#line 3201 "MachineIndependent/glslang.y"
+  case 458: /* type_specifier_nonarray: IMAGE2D  */
+#line 3110 "MachineIndependent/glslang.y"
               {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd2D);
     }
-#line 10469 "MachineIndependent/glslang_tab.cpp"
+#line 10064 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 474: /* type_specifier_nonarray: F16IMAGE2D  */
-#line 3206 "MachineIndependent/glslang.y"
+  case 459: /* type_specifier_nonarray: F16IMAGE2D  */
+#line 3115 "MachineIndependent/glslang.y"
                  {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D);
     }
-#line 10480 "MachineIndependent/glslang_tab.cpp"
+#line 10075 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 475: /* type_specifier_nonarray: IIMAGE2D  */
-#line 3212 "MachineIndependent/glslang.y"
+  case 460: /* type_specifier_nonarray: IIMAGE2D  */
+#line 3121 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd2D);
     }
-#line 10490 "MachineIndependent/glslang_tab.cpp"
+#line 10085 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 476: /* type_specifier_nonarray: UIMAGE2D  */
-#line 3217 "MachineIndependent/glslang.y"
+  case 461: /* type_specifier_nonarray: UIMAGE2D  */
+#line 3126 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd2D);
     }
-#line 10500 "MachineIndependent/glslang_tab.cpp"
+#line 10095 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 477: /* type_specifier_nonarray: IMAGE3D  */
-#line 3222 "MachineIndependent/glslang.y"
+  case 462: /* type_specifier_nonarray: IMAGE3D  */
+#line 3131 "MachineIndependent/glslang.y"
               {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd3D);
     }
-#line 10510 "MachineIndependent/glslang_tab.cpp"
+#line 10105 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 478: /* type_specifier_nonarray: F16IMAGE3D  */
-#line 3227 "MachineIndependent/glslang.y"
+  case 463: /* type_specifier_nonarray: F16IMAGE3D  */
+#line 3136 "MachineIndependent/glslang.y"
                  {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd3D);
     }
-#line 10521 "MachineIndependent/glslang_tab.cpp"
+#line 10116 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 479: /* type_specifier_nonarray: IIMAGE3D  */
-#line 3233 "MachineIndependent/glslang.y"
+  case 464: /* type_specifier_nonarray: IIMAGE3D  */
+#line 3142 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd3D);
     }
-#line 10531 "MachineIndependent/glslang_tab.cpp"
+#line 10126 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 480: /* type_specifier_nonarray: UIMAGE3D  */
-#line 3238 "MachineIndependent/glslang.y"
+  case 465: /* type_specifier_nonarray: UIMAGE3D  */
+#line 3147 "MachineIndependent/glslang.y"
                {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd3D);
     }
-#line 10541 "MachineIndependent/glslang_tab.cpp"
+#line 10136 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 481: /* type_specifier_nonarray: IMAGE2DRECT  */
-#line 3243 "MachineIndependent/glslang.y"
+  case 466: /* type_specifier_nonarray: IMAGE2DRECT  */
+#line 3152 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, EsdRect);
     }
-#line 10551 "MachineIndependent/glslang_tab.cpp"
+#line 10146 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 482: /* type_specifier_nonarray: F16IMAGE2DRECT  */
-#line 3248 "MachineIndependent/glslang.y"
+  case 467: /* type_specifier_nonarray: F16IMAGE2DRECT  */
+#line 3157 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, EsdRect);
     }
-#line 10562 "MachineIndependent/glslang_tab.cpp"
+#line 10157 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 483: /* type_specifier_nonarray: IIMAGE2DRECT  */
-#line 3254 "MachineIndependent/glslang.y"
+  case 468: /* type_specifier_nonarray: IIMAGE2DRECT  */
+#line 3163 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, EsdRect);
     }
-#line 10572 "MachineIndependent/glslang_tab.cpp"
+#line 10167 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 484: /* type_specifier_nonarray: UIMAGE2DRECT  */
-#line 3259 "MachineIndependent/glslang.y"
+  case 469: /* type_specifier_nonarray: UIMAGE2DRECT  */
+#line 3168 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, EsdRect);
     }
-#line 10582 "MachineIndependent/glslang_tab.cpp"
+#line 10177 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 485: /* type_specifier_nonarray: IMAGECUBE  */
-#line 3264 "MachineIndependent/glslang.y"
+  case 470: /* type_specifier_nonarray: IMAGECUBE  */
+#line 3173 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, EsdCube);
     }
-#line 10592 "MachineIndependent/glslang_tab.cpp"
+#line 10187 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 486: /* type_specifier_nonarray: F16IMAGECUBE  */
-#line 3269 "MachineIndependent/glslang.y"
+  case 471: /* type_specifier_nonarray: F16IMAGECUBE  */
+#line 3178 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, EsdCube);
     }
-#line 10603 "MachineIndependent/glslang_tab.cpp"
+#line 10198 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 487: /* type_specifier_nonarray: IIMAGECUBE  */
-#line 3275 "MachineIndependent/glslang.y"
+  case 472: /* type_specifier_nonarray: IIMAGECUBE  */
+#line 3184 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, EsdCube);
     }
-#line 10613 "MachineIndependent/glslang_tab.cpp"
+#line 10208 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 488: /* type_specifier_nonarray: UIMAGECUBE  */
-#line 3280 "MachineIndependent/glslang.y"
+  case 473: /* type_specifier_nonarray: UIMAGECUBE  */
+#line 3189 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, EsdCube);
     }
-#line 10623 "MachineIndependent/glslang_tab.cpp"
+#line 10218 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 489: /* type_specifier_nonarray: IMAGEBUFFER  */
-#line 3285 "MachineIndependent/glslang.y"
+  case 474: /* type_specifier_nonarray: IMAGEBUFFER  */
+#line 3194 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, EsdBuffer);
     }
-#line 10633 "MachineIndependent/glslang_tab.cpp"
+#line 10228 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 490: /* type_specifier_nonarray: F16IMAGEBUFFER  */
-#line 3290 "MachineIndependent/glslang.y"
+  case 475: /* type_specifier_nonarray: F16IMAGEBUFFER  */
+#line 3199 "MachineIndependent/glslang.y"
                      {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, EsdBuffer);
     }
-#line 10644 "MachineIndependent/glslang_tab.cpp"
+#line 10239 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 491: /* type_specifier_nonarray: IIMAGEBUFFER  */
-#line 3296 "MachineIndependent/glslang.y"
+  case 476: /* type_specifier_nonarray: IIMAGEBUFFER  */
+#line 3205 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, EsdBuffer);
     }
-#line 10654 "MachineIndependent/glslang_tab.cpp"
+#line 10249 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 492: /* type_specifier_nonarray: UIMAGEBUFFER  */
-#line 3301 "MachineIndependent/glslang.y"
+  case 477: /* type_specifier_nonarray: UIMAGEBUFFER  */
+#line 3210 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, EsdBuffer);
     }
-#line 10664 "MachineIndependent/glslang_tab.cpp"
+#line 10259 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 493: /* type_specifier_nonarray: IMAGE1DARRAY  */
-#line 3306 "MachineIndependent/glslang.y"
+  case 478: /* type_specifier_nonarray: IMAGE1DARRAY  */
+#line 3215 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd1D, true);
     }
-#line 10674 "MachineIndependent/glslang_tab.cpp"
+#line 10269 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 494: /* type_specifier_nonarray: F16IMAGE1DARRAY  */
-#line 3311 "MachineIndependent/glslang.y"
+  case 479: /* type_specifier_nonarray: F16IMAGE1DARRAY  */
+#line 3220 "MachineIndependent/glslang.y"
                       {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd1D, true);
     }
-#line 10685 "MachineIndependent/glslang_tab.cpp"
+#line 10280 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 495: /* type_specifier_nonarray: IIMAGE1DARRAY  */
-#line 3317 "MachineIndependent/glslang.y"
+  case 480: /* type_specifier_nonarray: IIMAGE1DARRAY  */
+#line 3226 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd1D, true);
     }
-#line 10695 "MachineIndependent/glslang_tab.cpp"
+#line 10290 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 496: /* type_specifier_nonarray: UIMAGE1DARRAY  */
-#line 3322 "MachineIndependent/glslang.y"
+  case 481: /* type_specifier_nonarray: UIMAGE1DARRAY  */
+#line 3231 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd1D, true);
     }
-#line 10705 "MachineIndependent/glslang_tab.cpp"
+#line 10300 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 497: /* type_specifier_nonarray: IMAGE2DARRAY  */
-#line 3327 "MachineIndependent/glslang.y"
+  case 482: /* type_specifier_nonarray: IMAGE2DARRAY  */
+#line 3236 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true);
     }
-#line 10715 "MachineIndependent/glslang_tab.cpp"
+#line 10310 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 498: /* type_specifier_nonarray: F16IMAGE2DARRAY  */
-#line 3332 "MachineIndependent/glslang.y"
+  case 483: /* type_specifier_nonarray: F16IMAGE2DARRAY  */
+#line 3241 "MachineIndependent/glslang.y"
                       {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, true);
     }
-#line 10726 "MachineIndependent/glslang_tab.cpp"
+#line 10321 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 499: /* type_specifier_nonarray: IIMAGE2DARRAY  */
-#line 3338 "MachineIndependent/glslang.y"
+  case 484: /* type_specifier_nonarray: IIMAGE2DARRAY  */
+#line 3247 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true);
     }
-#line 10736 "MachineIndependent/glslang_tab.cpp"
+#line 10331 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 500: /* type_specifier_nonarray: UIMAGE2DARRAY  */
-#line 3343 "MachineIndependent/glslang.y"
+  case 485: /* type_specifier_nonarray: UIMAGE2DARRAY  */
+#line 3252 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true);
     }
-#line 10746 "MachineIndependent/glslang_tab.cpp"
+#line 10341 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 501: /* type_specifier_nonarray: IMAGECUBEARRAY  */
-#line 3348 "MachineIndependent/glslang.y"
+  case 486: /* type_specifier_nonarray: IMAGECUBEARRAY  */
+#line 3257 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, EsdCube, true);
     }
-#line 10756 "MachineIndependent/glslang_tab.cpp"
+#line 10351 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 502: /* type_specifier_nonarray: F16IMAGECUBEARRAY  */
-#line 3353 "MachineIndependent/glslang.y"
+  case 487: /* type_specifier_nonarray: F16IMAGECUBEARRAY  */
+#line 3262 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, EsdCube, true);
     }
-#line 10767 "MachineIndependent/glslang_tab.cpp"
+#line 10362 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 503: /* type_specifier_nonarray: IIMAGECUBEARRAY  */
-#line 3359 "MachineIndependent/glslang.y"
+  case 488: /* type_specifier_nonarray: IIMAGECUBEARRAY  */
+#line 3268 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, EsdCube, true);
     }
-#line 10777 "MachineIndependent/glslang_tab.cpp"
+#line 10372 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 504: /* type_specifier_nonarray: UIMAGECUBEARRAY  */
-#line 3364 "MachineIndependent/glslang.y"
+  case 489: /* type_specifier_nonarray: UIMAGECUBEARRAY  */
+#line 3273 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, EsdCube, true);
     }
-#line 10787 "MachineIndependent/glslang_tab.cpp"
+#line 10382 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 505: /* type_specifier_nonarray: IMAGE2DMS  */
-#line 3369 "MachineIndependent/glslang.y"
+  case 490: /* type_specifier_nonarray: IMAGE2DMS  */
+#line 3278 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, false, false, true);
     }
-#line 10797 "MachineIndependent/glslang_tab.cpp"
+#line 10392 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 506: /* type_specifier_nonarray: F16IMAGE2DMS  */
-#line 3374 "MachineIndependent/glslang.y"
+  case 491: /* type_specifier_nonarray: F16IMAGE2DMS  */
+#line 3283 "MachineIndependent/glslang.y"
                    {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, false, false, true);
     }
-#line 10808 "MachineIndependent/glslang_tab.cpp"
+#line 10403 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 507: /* type_specifier_nonarray: IIMAGE2DMS  */
-#line 3380 "MachineIndependent/glslang.y"
+  case 492: /* type_specifier_nonarray: IIMAGE2DMS  */
+#line 3289 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd2D, false, false, true);
     }
-#line 10818 "MachineIndependent/glslang_tab.cpp"
+#line 10413 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 508: /* type_specifier_nonarray: UIMAGE2DMS  */
-#line 3385 "MachineIndependent/glslang.y"
+  case 493: /* type_specifier_nonarray: UIMAGE2DMS  */
+#line 3294 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd2D, false, false, true);
     }
-#line 10828 "MachineIndependent/glslang_tab.cpp"
+#line 10423 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 509: /* type_specifier_nonarray: IMAGE2DMSARRAY  */
-#line 3390 "MachineIndependent/glslang.y"
+  case 494: /* type_specifier_nonarray: IMAGE2DMSARRAY  */
+#line 3299 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true, false, true);
     }
-#line 10838 "MachineIndependent/glslang_tab.cpp"
+#line 10433 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 510: /* type_specifier_nonarray: F16IMAGE2DMSARRAY  */
-#line 3395 "MachineIndependent/glslang.y"
+  case 495: /* type_specifier_nonarray: F16IMAGE2DMSARRAY  */
+#line 3304 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, true, false, true);
     }
-#line 10849 "MachineIndependent/glslang_tab.cpp"
+#line 10444 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 511: /* type_specifier_nonarray: IIMAGE2DMSARRAY  */
-#line 3401 "MachineIndependent/glslang.y"
+  case 496: /* type_specifier_nonarray: IIMAGE2DMSARRAY  */
+#line 3310 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true, false, true);
     }
-#line 10859 "MachineIndependent/glslang_tab.cpp"
+#line 10454 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 512: /* type_specifier_nonarray: UIMAGE2DMSARRAY  */
-#line 3406 "MachineIndependent/glslang.y"
+  case 497: /* type_specifier_nonarray: UIMAGE2DMSARRAY  */
+#line 3315 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true, false, true);
     }
-#line 10869 "MachineIndependent/glslang_tab.cpp"
+#line 10464 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 513: /* type_specifier_nonarray: I64IMAGE1D  */
-#line 3411 "MachineIndependent/glslang.y"
+  case 498: /* type_specifier_nonarray: I64IMAGE1D  */
+#line 3320 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd1D);
     }
-#line 10879 "MachineIndependent/glslang_tab.cpp"
+#line 10474 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 514: /* type_specifier_nonarray: U64IMAGE1D  */
-#line 3416 "MachineIndependent/glslang.y"
+  case 499: /* type_specifier_nonarray: U64IMAGE1D  */
+#line 3325 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd1D);
     }
-#line 10889 "MachineIndependent/glslang_tab.cpp"
+#line 10484 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 515: /* type_specifier_nonarray: I64IMAGE2D  */
-#line 3421 "MachineIndependent/glslang.y"
+  case 500: /* type_specifier_nonarray: I64IMAGE2D  */
+#line 3330 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd2D);
     }
-#line 10899 "MachineIndependent/glslang_tab.cpp"
+#line 10494 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 516: /* type_specifier_nonarray: U64IMAGE2D  */
-#line 3426 "MachineIndependent/glslang.y"
+  case 501: /* type_specifier_nonarray: U64IMAGE2D  */
+#line 3335 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd2D);
     }
-#line 10909 "MachineIndependent/glslang_tab.cpp"
+#line 10504 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 517: /* type_specifier_nonarray: I64IMAGE3D  */
-#line 3431 "MachineIndependent/glslang.y"
+  case 502: /* type_specifier_nonarray: I64IMAGE3D  */
+#line 3340 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd3D);
     }
-#line 10919 "MachineIndependent/glslang_tab.cpp"
+#line 10514 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 518: /* type_specifier_nonarray: U64IMAGE3D  */
-#line 3436 "MachineIndependent/glslang.y"
+  case 503: /* type_specifier_nonarray: U64IMAGE3D  */
+#line 3345 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd3D);
     }
-#line 10929 "MachineIndependent/glslang_tab.cpp"
+#line 10524 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 519: /* type_specifier_nonarray: I64IMAGE2DRECT  */
-#line 3441 "MachineIndependent/glslang.y"
+  case 504: /* type_specifier_nonarray: I64IMAGE2DRECT  */
+#line 3350 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, EsdRect);
     }
-#line 10939 "MachineIndependent/glslang_tab.cpp"
+#line 10534 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 520: /* type_specifier_nonarray: U64IMAGE2DRECT  */
-#line 3446 "MachineIndependent/glslang.y"
+  case 505: /* type_specifier_nonarray: U64IMAGE2DRECT  */
+#line 3355 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, EsdRect);
     }
-#line 10949 "MachineIndependent/glslang_tab.cpp"
+#line 10544 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 521: /* type_specifier_nonarray: I64IMAGECUBE  */
-#line 3451 "MachineIndependent/glslang.y"
+  case 506: /* type_specifier_nonarray: I64IMAGECUBE  */
+#line 3360 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, EsdCube);
     }
-#line 10959 "MachineIndependent/glslang_tab.cpp"
+#line 10554 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 522: /* type_specifier_nonarray: U64IMAGECUBE  */
-#line 3456 "MachineIndependent/glslang.y"
+  case 507: /* type_specifier_nonarray: U64IMAGECUBE  */
+#line 3365 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, EsdCube);
     }
-#line 10969 "MachineIndependent/glslang_tab.cpp"
+#line 10564 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 523: /* type_specifier_nonarray: I64IMAGEBUFFER  */
-#line 3461 "MachineIndependent/glslang.y"
+  case 508: /* type_specifier_nonarray: I64IMAGEBUFFER  */
+#line 3370 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, EsdBuffer);
     }
-#line 10979 "MachineIndependent/glslang_tab.cpp"
+#line 10574 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 524: /* type_specifier_nonarray: U64IMAGEBUFFER  */
-#line 3466 "MachineIndependent/glslang.y"
+  case 509: /* type_specifier_nonarray: U64IMAGEBUFFER  */
+#line 3375 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, EsdBuffer);
     }
-#line 10989 "MachineIndependent/glslang_tab.cpp"
+#line 10584 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 525: /* type_specifier_nonarray: I64IMAGE1DARRAY  */
-#line 3471 "MachineIndependent/glslang.y"
+  case 510: /* type_specifier_nonarray: I64IMAGE1DARRAY  */
+#line 3380 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd1D, true);
     }
-#line 10999 "MachineIndependent/glslang_tab.cpp"
+#line 10594 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 526: /* type_specifier_nonarray: U64IMAGE1DARRAY  */
-#line 3476 "MachineIndependent/glslang.y"
+  case 511: /* type_specifier_nonarray: U64IMAGE1DARRAY  */
+#line 3385 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd1D, true);
     }
-#line 11009 "MachineIndependent/glslang_tab.cpp"
+#line 10604 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 527: /* type_specifier_nonarray: I64IMAGE2DARRAY  */
-#line 3481 "MachineIndependent/glslang.y"
+  case 512: /* type_specifier_nonarray: I64IMAGE2DARRAY  */
+#line 3390 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, true);
     }
-#line 11019 "MachineIndependent/glslang_tab.cpp"
+#line 10614 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 528: /* type_specifier_nonarray: U64IMAGE2DARRAY  */
-#line 3486 "MachineIndependent/glslang.y"
+  case 513: /* type_specifier_nonarray: U64IMAGE2DARRAY  */
+#line 3395 "MachineIndependent/glslang.y"
                       {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, true);
     }
-#line 11029 "MachineIndependent/glslang_tab.cpp"
+#line 10624 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 529: /* type_specifier_nonarray: I64IMAGECUBEARRAY  */
-#line 3491 "MachineIndependent/glslang.y"
+  case 514: /* type_specifier_nonarray: I64IMAGECUBEARRAY  */
+#line 3400 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, EsdCube, true);
     }
-#line 11039 "MachineIndependent/glslang_tab.cpp"
+#line 10634 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 530: /* type_specifier_nonarray: U64IMAGECUBEARRAY  */
-#line 3496 "MachineIndependent/glslang.y"
+  case 515: /* type_specifier_nonarray: U64IMAGECUBEARRAY  */
+#line 3405 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, EsdCube, true);
     }
-#line 11049 "MachineIndependent/glslang_tab.cpp"
+#line 10644 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 531: /* type_specifier_nonarray: I64IMAGE2DMS  */
-#line 3501 "MachineIndependent/glslang.y"
+  case 516: /* type_specifier_nonarray: I64IMAGE2DMS  */
+#line 3410 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, false, false, true);
     }
-#line 11059 "MachineIndependent/glslang_tab.cpp"
+#line 10654 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 532: /* type_specifier_nonarray: U64IMAGE2DMS  */
-#line 3506 "MachineIndependent/glslang.y"
+  case 517: /* type_specifier_nonarray: U64IMAGE2DMS  */
+#line 3415 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, false, false, true);
     }
-#line 11069 "MachineIndependent/glslang_tab.cpp"
+#line 10664 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 533: /* type_specifier_nonarray: I64IMAGE2DMSARRAY  */
-#line 3511 "MachineIndependent/glslang.y"
+  case 518: /* type_specifier_nonarray: I64IMAGE2DMSARRAY  */
+#line 3420 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, true, false, true);
     }
-#line 11079 "MachineIndependent/glslang_tab.cpp"
+#line 10674 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 534: /* type_specifier_nonarray: U64IMAGE2DMSARRAY  */
-#line 3516 "MachineIndependent/glslang.y"
+  case 519: /* type_specifier_nonarray: U64IMAGE2DMSARRAY  */
+#line 3425 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, true, false, true);
     }
-#line 11089 "MachineIndependent/glslang_tab.cpp"
+#line 10684 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 535: /* type_specifier_nonarray: SAMPLEREXTERNALOES  */
-#line 3521 "MachineIndependent/glslang.y"
+  case 520: /* type_specifier_nonarray: SAMPLEREXTERNALOES  */
+#line 3430 "MachineIndependent/glslang.y"
                          {  // GL_OES_EGL_image_external
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D);
         (yyval.interm.type).sampler.external = true;
     }
-#line 11100 "MachineIndependent/glslang_tab.cpp"
+#line 10695 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 536: /* type_specifier_nonarray: SAMPLEREXTERNAL2DY2YEXT  */
-#line 3527 "MachineIndependent/glslang.y"
+  case 521: /* type_specifier_nonarray: SAMPLEREXTERNAL2DY2YEXT  */
+#line 3436 "MachineIndependent/glslang.y"
                               { // GL_EXT_YUV_target
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.set(EbtFloat, Esd2D);
         (yyval.interm.type).sampler.yuv = true;
     }
-#line 11111 "MachineIndependent/glslang_tab.cpp"
+#line 10706 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 537: /* type_specifier_nonarray: ATTACHMENTEXT  */
-#line 3533 "MachineIndependent/glslang.y"
+  case 522: /* type_specifier_nonarray: ATTACHMENTEXT  */
+#line 3442 "MachineIndependent/glslang.y"
                     {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "attachmentEXT input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setAttachmentEXT(EbtFloat);
     }
-#line 11122 "MachineIndependent/glslang_tab.cpp"
+#line 10717 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 538: /* type_specifier_nonarray: IATTACHMENTEXT  */
-#line 3539 "MachineIndependent/glslang.y"
+  case 523: /* type_specifier_nonarray: IATTACHMENTEXT  */
+#line 3448 "MachineIndependent/glslang.y"
                      {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "attachmentEXT input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setAttachmentEXT(EbtInt);
     }
-#line 11133 "MachineIndependent/glslang_tab.cpp"
+#line 10728 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 539: /* type_specifier_nonarray: UATTACHMENTEXT  */
-#line 3545 "MachineIndependent/glslang.y"
+  case 524: /* type_specifier_nonarray: UATTACHMENTEXT  */
+#line 3454 "MachineIndependent/glslang.y"
                      {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "attachmentEXT input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setAttachmentEXT(EbtUint);
     }
-#line 11144 "MachineIndependent/glslang_tab.cpp"
+#line 10739 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 540: /* type_specifier_nonarray: SUBPASSINPUT  */
-#line 3551 "MachineIndependent/glslang.y"
+  case 525: /* type_specifier_nonarray: SUBPASSINPUT  */
+#line 3460 "MachineIndependent/glslang.y"
                    {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtFloat);
     }
-#line 11155 "MachineIndependent/glslang_tab.cpp"
+#line 10750 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 541: /* type_specifier_nonarray: SUBPASSINPUTMS  */
-#line 3557 "MachineIndependent/glslang.y"
+  case 526: /* type_specifier_nonarray: SUBPASSINPUTMS  */
+#line 3466 "MachineIndependent/glslang.y"
                      {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtFloat, true);
     }
-#line 11166 "MachineIndependent/glslang_tab.cpp"
+#line 10761 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 542: /* type_specifier_nonarray: F16SUBPASSINPUT  */
-#line 3563 "MachineIndependent/glslang.y"
+  case 527: /* type_specifier_nonarray: F16SUBPASSINPUT  */
+#line 3472 "MachineIndependent/glslang.y"
                       {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float subpass input", parseContext.symbolTable.atBuiltInLevel());
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
@@ -11174,11 +10769,11 @@ yyreduce:
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtFloat16);
     }
-#line 11178 "MachineIndependent/glslang_tab.cpp"
+#line 10773 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 543: /* type_specifier_nonarray: F16SUBPASSINPUTMS  */
-#line 3570 "MachineIndependent/glslang.y"
+  case 528: /* type_specifier_nonarray: F16SUBPASSINPUTMS  */
+#line 3479 "MachineIndependent/glslang.y"
                         {
         parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float subpass input", parseContext.symbolTable.atBuiltInLevel());
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
@@ -11186,55 +10781,55 @@ yyreduce:
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtFloat16, true);
     }
-#line 11190 "MachineIndependent/glslang_tab.cpp"
+#line 10785 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 544: /* type_specifier_nonarray: ISUBPASSINPUT  */
-#line 3577 "MachineIndependent/glslang.y"
+  case 529: /* type_specifier_nonarray: ISUBPASSINPUT  */
+#line 3486 "MachineIndependent/glslang.y"
                     {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtInt);
     }
-#line 11201 "MachineIndependent/glslang_tab.cpp"
+#line 10796 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 545: /* type_specifier_nonarray: ISUBPASSINPUTMS  */
-#line 3583 "MachineIndependent/glslang.y"
+  case 530: /* type_specifier_nonarray: ISUBPASSINPUTMS  */
+#line 3492 "MachineIndependent/glslang.y"
                       {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtInt, true);
     }
-#line 11212 "MachineIndependent/glslang_tab.cpp"
+#line 10807 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 546: /* type_specifier_nonarray: USUBPASSINPUT  */
-#line 3589 "MachineIndependent/glslang.y"
+  case 531: /* type_specifier_nonarray: USUBPASSINPUT  */
+#line 3498 "MachineIndependent/glslang.y"
                     {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtUint);
     }
-#line 11223 "MachineIndependent/glslang_tab.cpp"
+#line 10818 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 547: /* type_specifier_nonarray: USUBPASSINPUTMS  */
-#line 3595 "MachineIndependent/glslang.y"
+  case 532: /* type_specifier_nonarray: USUBPASSINPUTMS  */
+#line 3504 "MachineIndependent/glslang.y"
                       {
         parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).basicType = EbtSampler;
         (yyval.interm.type).sampler.setSubpass(EbtUint, true);
     }
-#line 11234 "MachineIndependent/glslang_tab.cpp"
+#line 10829 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 548: /* type_specifier_nonarray: FCOOPMATNV  */
-#line 3601 "MachineIndependent/glslang.y"
+  case 533: /* type_specifier_nonarray: FCOOPMATNV  */
+#line 3510 "MachineIndependent/glslang.y"
                  {
         parseContext.fcoopmatCheckNV((yyvsp[0].lex).loc, "fcoopmatNV", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
@@ -11242,11 +10837,11 @@ yyreduce:
         (yyval.interm.type).coopmatNV = true;
         (yyval.interm.type).coopmatKHR = false;
     }
-#line 11246 "MachineIndependent/glslang_tab.cpp"
+#line 10841 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 549: /* type_specifier_nonarray: ICOOPMATNV  */
-#line 3608 "MachineIndependent/glslang.y"
+  case 534: /* type_specifier_nonarray: ICOOPMATNV  */
+#line 3517 "MachineIndependent/glslang.y"
                  {
         parseContext.intcoopmatCheckNV((yyvsp[0].lex).loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
@@ -11254,11 +10849,11 @@ yyreduce:
         (yyval.interm.type).coopmatNV = true;
         (yyval.interm.type).coopmatKHR = false;
     }
-#line 11258 "MachineIndependent/glslang_tab.cpp"
+#line 10853 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 550: /* type_specifier_nonarray: UCOOPMATNV  */
-#line 3615 "MachineIndependent/glslang.y"
+  case 535: /* type_specifier_nonarray: UCOOPMATNV  */
+#line 3524 "MachineIndependent/glslang.y"
                  {
         parseContext.intcoopmatCheckNV((yyvsp[0].lex).loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
@@ -11266,11 +10861,11 @@ yyreduce:
         (yyval.interm.type).coopmatNV = true;
         (yyval.interm.type).coopmatKHR = false;
     }
-#line 11270 "MachineIndependent/glslang_tab.cpp"
+#line 10865 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 551: /* type_specifier_nonarray: COOPMAT  */
-#line 3622 "MachineIndependent/glslang.y"
+  case 536: /* type_specifier_nonarray: COOPMAT  */
+#line 3531 "MachineIndependent/glslang.y"
               {
         parseContext.coopmatCheck((yyvsp[0].lex).loc, "coopmat", parseContext.symbolTable.atBuiltInLevel());
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
@@ -11278,99 +10873,39 @@ yyreduce:
         (yyval.interm.type).coopmatNV = false;
         (yyval.interm.type).coopmatKHR = true;
     }
-#line 11282 "MachineIndependent/glslang_tab.cpp"
+#line 10877 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 552: /* type_specifier_nonarray: TENSORLAYOUTNV  */
-#line 3629 "MachineIndependent/glslang.y"
-                     {
-        parseContext.tensorLayoutViewCheck((yyvsp[0].lex).loc, "tensorLayoutNV", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtTensorLayoutNV;
-    }
-#line 11292 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 553: /* type_specifier_nonarray: TENSORVIEWNV  */
-#line 3634 "MachineIndependent/glslang.y"
-                   {
-        parseContext.tensorLayoutViewCheck((yyvsp[0].lex).loc, "tensorViewNV", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtTensorViewNV;
-    }
-#line 11302 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 554: /* type_specifier_nonarray: FUNCTION  */
-#line 3639 "MachineIndependent/glslang.y"
-               {
-        (yyval.interm.type).init((yyvsp[0].lex).loc);
-        (yyval.interm.type).basicType = EbtFunction;
-    }
-#line 11311 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 555: /* type_specifier_nonarray: COOPVECNV  */
-#line 3643 "MachineIndependent/glslang.y"
-                {
-        parseContext.coopvecCheck((yyvsp[0].lex).loc, "coopvecNV", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).basicType = EbtCoopvecNV;
-        (yyval.interm.type).coopvecNV = true;
-    }
-#line 11322 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 556: /* type_specifier_nonarray: TENSORARM  */
-#line 3649 "MachineIndependent/glslang.y"
-                {
-        parseContext.tensorCheckARM((yyvsp[0].lex).loc, "tensorARM", parseContext.symbolTable.atBuiltInLevel());
-        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-        (yyval.interm.type).tensorRankARM = 1; // placeholder value
-        (yyval.interm.type).basicType = EbtTensorARM;
-    }
-#line 11333 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 557: /* type_specifier_nonarray: spirv_type_specifier  */
-#line 3655 "MachineIndependent/glslang.y"
+  case 537: /* type_specifier_nonarray: spirv_type_specifier  */
+#line 3538 "MachineIndependent/glslang.y"
                            {
         parseContext.requireExtensions((yyvsp[0].interm.type).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V type specifier");
         (yyval.interm.type) = (yyvsp[0].interm.type);
     }
-#line 11342 "MachineIndependent/glslang_tab.cpp"
+#line 10886 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 558: /* type_specifier_nonarray: HITOBJECTNV  */
-#line 3659 "MachineIndependent/glslang.y"
-                  {
+  case 538: /* type_specifier_nonarray: HITOBJECTNV  */
+#line 3542 "MachineIndependent/glslang.y"
+                      {
        (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
        (yyval.interm.type).basicType = EbtHitObjectNV;
-    }
-#line 11351 "MachineIndependent/glslang_tab.cpp"
+	}
+#line 10895 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 559: /* type_specifier_nonarray: HITOBJECTEXT  */
-#line 3663 "MachineIndependent/glslang.y"
-                   {
-       (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
-       (yyval.interm.type).basicType = EbtHitObjectEXT;
-    }
-#line 11360 "MachineIndependent/glslang_tab.cpp"
-    break;
-
-  case 560: /* type_specifier_nonarray: struct_specifier  */
-#line 3667 "MachineIndependent/glslang.y"
+  case 539: /* type_specifier_nonarray: struct_specifier  */
+#line 3546 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.type) = (yyvsp[0].interm.type);
         (yyval.interm.type).qualifier.storage = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         parseContext.structTypeCheck((yyval.interm.type).loc, (yyval.interm.type));
     }
-#line 11370 "MachineIndependent/glslang_tab.cpp"
+#line 10905 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 561: /* type_specifier_nonarray: TYPE_NAME  */
-#line 3672 "MachineIndependent/glslang.y"
+  case 540: /* type_specifier_nonarray: TYPE_NAME  */
+#line 3551 "MachineIndependent/glslang.y"
                 {
         //
         // This is for user defined type names.  The lexical phase looked up the
@@ -11384,47 +10919,47 @@ yyreduce:
         } else
             parseContext.error((yyvsp[0].lex).loc, "expected type name", (yyvsp[0].lex).string->c_str(), "");
     }
-#line 11388 "MachineIndependent/glslang_tab.cpp"
+#line 10923 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 562: /* precision_qualifier: HIGH_PRECISION  */
-#line 3688 "MachineIndependent/glslang.y"
+  case 541: /* precision_qualifier: HIGH_PRECISION  */
+#line 3567 "MachineIndependent/glslang.y"
                      {
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "highp precision qualifier");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqHigh);
     }
-#line 11398 "MachineIndependent/glslang_tab.cpp"
+#line 10933 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 563: /* precision_qualifier: MEDIUM_PRECISION  */
-#line 3693 "MachineIndependent/glslang.y"
+  case 542: /* precision_qualifier: MEDIUM_PRECISION  */
+#line 3572 "MachineIndependent/glslang.y"
                        {
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "mediump precision qualifier");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqMedium);
     }
-#line 11408 "MachineIndependent/glslang_tab.cpp"
+#line 10943 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 564: /* precision_qualifier: LOW_PRECISION  */
-#line 3698 "MachineIndependent/glslang.y"
+  case 543: /* precision_qualifier: LOW_PRECISION  */
+#line 3577 "MachineIndependent/glslang.y"
                     {
         parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "lowp precision qualifier");
         (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
         parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqLow);
     }
-#line 11418 "MachineIndependent/glslang_tab.cpp"
+#line 10953 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 565: /* $@3: %empty  */
-#line 3706 "MachineIndependent/glslang.y"
+  case 544: /* $@3: %empty  */
+#line 3585 "MachineIndependent/glslang.y"
                                    { parseContext.nestedStructCheck((yyvsp[-2].lex).loc); }
-#line 11424 "MachineIndependent/glslang_tab.cpp"
+#line 10959 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 566: /* struct_specifier: STRUCT IDENTIFIER LEFT_BRACE $@3 struct_declaration_list RIGHT_BRACE  */
-#line 3706 "MachineIndependent/glslang.y"
+  case 545: /* struct_specifier: STRUCT IDENTIFIER LEFT_BRACE $@3 struct_declaration_list RIGHT_BRACE  */
+#line 3585 "MachineIndependent/glslang.y"
                                                                                                                    {
 
         TType* structure = new TType((yyvsp[-1].interm.typeList), *(yyvsp[-4].lex).string);
@@ -11442,17 +10977,17 @@ yyreduce:
         (yyval.interm.type).userDef = structure;
         --parseContext.structNestingLevel;
     }
-#line 11446 "MachineIndependent/glslang_tab.cpp"
+#line 10981 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 567: /* $@4: %empty  */
-#line 3723 "MachineIndependent/glslang.y"
+  case 546: /* $@4: %empty  */
+#line 3602 "MachineIndependent/glslang.y"
                         { parseContext.nestedStructCheck((yyvsp[-1].lex).loc); }
-#line 11452 "MachineIndependent/glslang_tab.cpp"
+#line 10987 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 568: /* struct_specifier: STRUCT LEFT_BRACE $@4 struct_declaration_list RIGHT_BRACE  */
-#line 3723 "MachineIndependent/glslang.y"
+  case 547: /* struct_specifier: STRUCT LEFT_BRACE $@4 struct_declaration_list RIGHT_BRACE  */
+#line 3602 "MachineIndependent/glslang.y"
                                                                                                         {
         TType* structure = new TType((yyvsp[-1].interm.typeList), TString(""));
         (yyval.interm.type).init((yyvsp[-4].lex).loc);
@@ -11460,19 +10995,19 @@ yyreduce:
         (yyval.interm.type).userDef = structure;
         --parseContext.structNestingLevel;
     }
-#line 11464 "MachineIndependent/glslang_tab.cpp"
+#line 10999 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 569: /* struct_declaration_list: struct_declaration  */
-#line 3733 "MachineIndependent/glslang.y"
+  case 548: /* struct_declaration_list: struct_declaration  */
+#line 3612 "MachineIndependent/glslang.y"
                          {
         (yyval.interm.typeList) = (yyvsp[0].interm.typeList);
     }
-#line 11472 "MachineIndependent/glslang_tab.cpp"
+#line 11007 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 570: /* struct_declaration_list: struct_declaration_list struct_declaration  */
-#line 3736 "MachineIndependent/glslang.y"
+  case 549: /* struct_declaration_list: struct_declaration_list struct_declaration  */
+#line 3615 "MachineIndependent/glslang.y"
                                                  {
         (yyval.interm.typeList) = (yyvsp[-1].interm.typeList);
         for (unsigned int i = 0; i < (yyvsp[0].interm.typeList)->size(); ++i) {
@@ -11483,11 +11018,11 @@ yyreduce:
             (yyval.interm.typeList)->push_back((*(yyvsp[0].interm.typeList))[i]);
         }
     }
-#line 11487 "MachineIndependent/glslang_tab.cpp"
+#line 11022 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 571: /* struct_declaration: type_specifier struct_declarator_list SEMICOLON  */
-#line 3749 "MachineIndependent/glslang.y"
+  case 550: /* struct_declaration: type_specifier struct_declarator_list SEMICOLON  */
+#line 3628 "MachineIndependent/glslang.y"
                                                       {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -11499,7 +11034,7 @@ yyreduce:
         (yyval.interm.typeList) = (yyvsp[-1].interm.typeList);
 
         parseContext.voidErrorCheck((yyvsp[-2].interm.type).loc, (*(yyvsp[-1].interm.typeList))[0].type->getFieldName(), (yyvsp[-2].interm.type).basicType);
-        parseContext.precisionQualifierCheck((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).basicType, (yyvsp[-2].interm.type).qualifier, (yyvsp[-2].interm.type).hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).basicType, (yyvsp[-2].interm.type).qualifier, (yyvsp[-2].interm.type).isCoopmat());
 
         for (unsigned int i = 0; i < (yyval.interm.typeList)->size(); ++i) {
             TType type((yyvsp[-2].interm.type));
@@ -11510,11 +11045,11 @@ yyreduce:
             (*(yyval.interm.typeList))[i].type->shallowCopy(type);
         }
     }
-#line 11514 "MachineIndependent/glslang_tab.cpp"
+#line 11049 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 572: /* struct_declaration: type_qualifier type_specifier struct_declarator_list SEMICOLON  */
-#line 3771 "MachineIndependent/glslang.y"
+  case 551: /* struct_declaration: type_qualifier type_specifier struct_declarator_list SEMICOLON  */
+#line 3650 "MachineIndependent/glslang.y"
                                                                      {
         if ((yyvsp[-2].interm.type).arraySizes) {
             parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -11528,7 +11063,7 @@ yyreduce:
         parseContext.memberQualifierCheck((yyvsp[-3].interm.type));
         parseContext.voidErrorCheck((yyvsp[-2].interm.type).loc, (*(yyvsp[-1].interm.typeList))[0].type->getFieldName(), (yyvsp[-2].interm.type).basicType);
         parseContext.mergeQualifiers((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, (yyvsp[-3].interm.type).qualifier, true);
-        parseContext.precisionQualifierCheck((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).basicType, (yyvsp[-2].interm.type).qualifier, (yyvsp[-2].interm.type).hasTypeParameter());
+        parseContext.precisionQualifierCheck((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).basicType, (yyvsp[-2].interm.type).qualifier, (yyvsp[-2].interm.type).isCoopmat());
 
         for (unsigned int i = 0; i < (yyval.interm.typeList)->size(); ++i) {
             TType type((yyvsp[-2].interm.type));
@@ -11539,38 +11074,38 @@ yyreduce:
             (*(yyval.interm.typeList))[i].type->shallowCopy(type);
         }
     }
-#line 11543 "MachineIndependent/glslang_tab.cpp"
+#line 11078 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 573: /* struct_declarator_list: struct_declarator  */
-#line 3798 "MachineIndependent/glslang.y"
+  case 552: /* struct_declarator_list: struct_declarator  */
+#line 3677 "MachineIndependent/glslang.y"
                         {
         (yyval.interm.typeList) = new TTypeList;
         (yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
     }
-#line 11552 "MachineIndependent/glslang_tab.cpp"
+#line 11087 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 574: /* struct_declarator_list: struct_declarator_list COMMA struct_declarator  */
-#line 3802 "MachineIndependent/glslang.y"
+  case 553: /* struct_declarator_list: struct_declarator_list COMMA struct_declarator  */
+#line 3681 "MachineIndependent/glslang.y"
                                                      {
         (yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
     }
-#line 11560 "MachineIndependent/glslang_tab.cpp"
+#line 11095 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 575: /* struct_declarator: IDENTIFIER  */
-#line 3808 "MachineIndependent/glslang.y"
+  case 554: /* struct_declarator: IDENTIFIER  */
+#line 3687 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.typeLine).type = new TType(EbtVoid);
         (yyval.interm.typeLine).loc = (yyvsp[0].lex).loc;
         (yyval.interm.typeLine).type->setFieldName(*(yyvsp[0].lex).string);
     }
-#line 11570 "MachineIndependent/glslang_tab.cpp"
+#line 11105 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 576: /* struct_declarator: IDENTIFIER array_specifier  */
-#line 3813 "MachineIndependent/glslang.y"
+  case 555: /* struct_declarator: IDENTIFIER array_specifier  */
+#line 3692 "MachineIndependent/glslang.y"
                                  {
         parseContext.arrayOfArrayVersionCheck((yyvsp[-1].lex).loc, (yyvsp[0].interm).arraySizes);
 
@@ -11579,250 +11114,246 @@ yyreduce:
         (yyval.interm.typeLine).type->setFieldName(*(yyvsp[-1].lex).string);
         (yyval.interm.typeLine).type->transferArraySizes((yyvsp[0].interm).arraySizes);
     }
-#line 11583 "MachineIndependent/glslang_tab.cpp"
+#line 11118 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 577: /* initializer: assignment_expression  */
-#line 3824 "MachineIndependent/glslang.y"
+  case 556: /* initializer: assignment_expression  */
+#line 3703 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 11591 "MachineIndependent/glslang_tab.cpp"
+#line 11126 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 578: /* initializer: LEFT_BRACE initializer_list RIGHT_BRACE  */
-#line 3827 "MachineIndependent/glslang.y"
+  case 557: /* initializer: LEFT_BRACE initializer_list RIGHT_BRACE  */
+#line 3706 "MachineIndependent/glslang.y"
                                               {
         const char* initFeature = "{ } style initializers";
         parseContext.requireProfile((yyvsp[-2].lex).loc, ~EEsProfile, initFeature);
         parseContext.profileRequires((yyvsp[-2].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
         (yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
     }
-#line 11602 "MachineIndependent/glslang_tab.cpp"
+#line 11137 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 579: /* initializer: LEFT_BRACE initializer_list COMMA RIGHT_BRACE  */
-#line 3833 "MachineIndependent/glslang.y"
+  case 558: /* initializer: LEFT_BRACE initializer_list COMMA RIGHT_BRACE  */
+#line 3712 "MachineIndependent/glslang.y"
                                                     {
         const char* initFeature = "{ } style initializers";
         parseContext.requireProfile((yyvsp[-3].lex).loc, ~EEsProfile, initFeature);
         parseContext.profileRequires((yyvsp[-3].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
         (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
     }
-#line 11613 "MachineIndependent/glslang_tab.cpp"
+#line 11148 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 580: /* initializer: LEFT_BRACE RIGHT_BRACE  */
-#line 3839 "MachineIndependent/glslang.y"
+  case 559: /* initializer: LEFT_BRACE RIGHT_BRACE  */
+#line 3718 "MachineIndependent/glslang.y"
                              {
         const char* initFeature = "empty { } initializer";
         parseContext.profileRequires((yyvsp[-1].lex).loc, EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
         parseContext.profileRequires((yyvsp[-1].lex).loc, ~EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
         (yyval.interm.intermTypedNode) = parseContext.intermediate.makeAggregate((yyvsp[-1].lex).loc);
     }
-#line 11624 "MachineIndependent/glslang_tab.cpp"
+#line 11159 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 581: /* initializer_list: initializer  */
-#line 3848 "MachineIndependent/glslang.y"
+  case 560: /* initializer_list: initializer  */
+#line 3727 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(0, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
     }
-#line 11632 "MachineIndependent/glslang_tab.cpp"
+#line 11167 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 582: /* initializer_list: initializer_list COMMA initializer  */
-#line 3851 "MachineIndependent/glslang.y"
+  case 561: /* initializer_list: initializer_list COMMA initializer  */
+#line 3730 "MachineIndependent/glslang.y"
                                          {
         (yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
     }
-#line 11640 "MachineIndependent/glslang_tab.cpp"
+#line 11175 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 583: /* declaration_statement: declaration  */
-#line 3857 "MachineIndependent/glslang.y"
+  case 562: /* declaration_statement: declaration  */
+#line 3736 "MachineIndependent/glslang.y"
                   { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11646 "MachineIndependent/glslang_tab.cpp"
+#line 11181 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 584: /* statement: compound_statement  */
-#line 3861 "MachineIndependent/glslang.y"
+  case 563: /* statement: compound_statement  */
+#line 3740 "MachineIndependent/glslang.y"
                           { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11652 "MachineIndependent/glslang_tab.cpp"
+#line 11187 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 585: /* statement: simple_statement  */
-#line 3862 "MachineIndependent/glslang.y"
+  case 564: /* statement: simple_statement  */
+#line 3741 "MachineIndependent/glslang.y"
                           { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11658 "MachineIndependent/glslang_tab.cpp"
+#line 11193 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 586: /* simple_statement: declaration_statement  */
-#line 3868 "MachineIndependent/glslang.y"
+  case 565: /* simple_statement: declaration_statement  */
+#line 3747 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11664 "MachineIndependent/glslang_tab.cpp"
+#line 11199 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 587: /* simple_statement: expression_statement  */
-#line 3869 "MachineIndependent/glslang.y"
+  case 566: /* simple_statement: expression_statement  */
+#line 3748 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11670 "MachineIndependent/glslang_tab.cpp"
+#line 11205 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 588: /* simple_statement: selection_statement  */
-#line 3870 "MachineIndependent/glslang.y"
+  case 567: /* simple_statement: selection_statement  */
+#line 3749 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11676 "MachineIndependent/glslang_tab.cpp"
+#line 11211 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 589: /* simple_statement: switch_statement  */
-#line 3871 "MachineIndependent/glslang.y"
+  case 568: /* simple_statement: switch_statement  */
+#line 3750 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11682 "MachineIndependent/glslang_tab.cpp"
+#line 11217 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 590: /* simple_statement: case_label  */
-#line 3872 "MachineIndependent/glslang.y"
+  case 569: /* simple_statement: case_label  */
+#line 3751 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11688 "MachineIndependent/glslang_tab.cpp"
+#line 11223 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 591: /* simple_statement: iteration_statement  */
-#line 3873 "MachineIndependent/glslang.y"
+  case 570: /* simple_statement: iteration_statement  */
+#line 3752 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11694 "MachineIndependent/glslang_tab.cpp"
+#line 11229 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 592: /* simple_statement: jump_statement  */
-#line 3874 "MachineIndependent/glslang.y"
+  case 571: /* simple_statement: jump_statement  */
+#line 3753 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11700 "MachineIndependent/glslang_tab.cpp"
+#line 11235 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 593: /* simple_statement: demote_statement  */
-#line 3875 "MachineIndependent/glslang.y"
+  case 572: /* simple_statement: demote_statement  */
+#line 3754 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11706 "MachineIndependent/glslang_tab.cpp"
+#line 11241 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 594: /* demote_statement: DEMOTE SEMICOLON  */
-#line 3879 "MachineIndependent/glslang.y"
+  case 573: /* demote_statement: DEMOTE SEMICOLON  */
+#line 3758 "MachineIndependent/glslang.y"
                        {
         parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "demote");
         parseContext.requireExtensions((yyvsp[-1].lex).loc, 1, &E_GL_EXT_demote_to_helper_invocation, "demote");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpDemote, (yyvsp[-1].lex).loc);
     }
-#line 11716 "MachineIndependent/glslang_tab.cpp"
+#line 11251 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 595: /* compound_statement: LEFT_BRACE RIGHT_BRACE  */
-#line 3887 "MachineIndependent/glslang.y"
+  case 574: /* compound_statement: LEFT_BRACE RIGHT_BRACE  */
+#line 3766 "MachineIndependent/glslang.y"
                              { (yyval.interm.intermNode) = 0; }
-#line 11722 "MachineIndependent/glslang_tab.cpp"
+#line 11257 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 596: /* $@5: %empty  */
-#line 3888 "MachineIndependent/glslang.y"
+  case 575: /* $@5: %empty  */
+#line 3767 "MachineIndependent/glslang.y"
                  {
         parseContext.symbolTable.push();
         ++parseContext.statementNestingLevel;
     }
-#line 11731 "MachineIndependent/glslang_tab.cpp"
+#line 11266 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 597: /* $@6: %empty  */
-#line 3892 "MachineIndependent/glslang.y"
+  case 576: /* $@6: %empty  */
+#line 3771 "MachineIndependent/glslang.y"
                      {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         --parseContext.statementNestingLevel;
     }
-#line 11740 "MachineIndependent/glslang_tab.cpp"
+#line 11275 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 598: /* compound_statement: LEFT_BRACE $@5 statement_list $@6 RIGHT_BRACE  */
-#line 3896 "MachineIndependent/glslang.y"
+  case 577: /* compound_statement: LEFT_BRACE $@5 statement_list $@6 RIGHT_BRACE  */
+#line 3775 "MachineIndependent/glslang.y"
                   {
-        if ((yyvsp[-2].interm.intermNode) && (yyvsp[-2].interm.intermNode)->getAsAggregate()) {
+        if ((yyvsp[-2].interm.intermNode) && (yyvsp[-2].interm.intermNode)->getAsAggregate())
             (yyvsp[-2].interm.intermNode)->getAsAggregate()->setOperator(parseContext.intermediate.getDebugInfo() ? EOpScope : EOpSequence);
-            (yyvsp[-2].interm.intermNode)->getAsAggregate()->setEndLoc((yyvsp[0].lex).loc);
-        }
         (yyval.interm.intermNode) = (yyvsp[-2].interm.intermNode);
     }
-#line 11752 "MachineIndependent/glslang_tab.cpp"
+#line 11285 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 599: /* statement_no_new_scope: compound_statement_no_new_scope  */
-#line 3906 "MachineIndependent/glslang.y"
+  case 578: /* statement_no_new_scope: compound_statement_no_new_scope  */
+#line 3783 "MachineIndependent/glslang.y"
                                       { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11758 "MachineIndependent/glslang_tab.cpp"
+#line 11291 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 600: /* statement_no_new_scope: simple_statement  */
-#line 3907 "MachineIndependent/glslang.y"
+  case 579: /* statement_no_new_scope: simple_statement  */
+#line 3784 "MachineIndependent/glslang.y"
                                       { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 11764 "MachineIndependent/glslang_tab.cpp"
+#line 11297 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 601: /* $@7: %empty  */
-#line 3911 "MachineIndependent/glslang.y"
+  case 580: /* $@7: %empty  */
+#line 3788 "MachineIndependent/glslang.y"
       {
         ++parseContext.controlFlowNestingLevel;
     }
-#line 11772 "MachineIndependent/glslang_tab.cpp"
+#line 11305 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 602: /* statement_scoped: $@7 compound_statement  */
-#line 3914 "MachineIndependent/glslang.y"
+  case 581: /* statement_scoped: $@7 compound_statement  */
+#line 3791 "MachineIndependent/glslang.y"
                           {
         --parseContext.controlFlowNestingLevel;
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11781 "MachineIndependent/glslang_tab.cpp"
+#line 11314 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 603: /* $@8: %empty  */
-#line 3918 "MachineIndependent/glslang.y"
+  case 582: /* $@8: %empty  */
+#line 3795 "MachineIndependent/glslang.y"
       {
         parseContext.symbolTable.push();
         ++parseContext.statementNestingLevel;
         ++parseContext.controlFlowNestingLevel;
     }
-#line 11791 "MachineIndependent/glslang_tab.cpp"
+#line 11324 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 604: /* statement_scoped: $@8 simple_statement  */
-#line 3923 "MachineIndependent/glslang.y"
+  case 583: /* statement_scoped: $@8 simple_statement  */
+#line 3800 "MachineIndependent/glslang.y"
                        {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11802 "MachineIndependent/glslang_tab.cpp"
+#line 11335 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 605: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE  */
-#line 3932 "MachineIndependent/glslang.y"
+  case 584: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE  */
+#line 3809 "MachineIndependent/glslang.y"
                              {
         (yyval.interm.intermNode) = 0;
     }
-#line 11810 "MachineIndependent/glslang_tab.cpp"
+#line 11343 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 606: /* compound_statement_no_new_scope: LEFT_BRACE statement_list RIGHT_BRACE  */
-#line 3935 "MachineIndependent/glslang.y"
+  case 585: /* compound_statement_no_new_scope: LEFT_BRACE statement_list RIGHT_BRACE  */
+#line 3812 "MachineIndependent/glslang.y"
                                             {
-        if ((yyvsp[-1].interm.intermNode) && (yyvsp[-1].interm.intermNode)->getAsAggregate()) {
+        if ((yyvsp[-1].interm.intermNode) && (yyvsp[-1].interm.intermNode)->getAsAggregate())
             (yyvsp[-1].interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
-            (yyvsp[-1].interm.intermNode)->getAsAggregate()->setEndLoc((yyvsp[0].lex).loc);
-        }
         (yyval.interm.intermNode) = (yyvsp[-1].interm.intermNode);
     }
-#line 11822 "MachineIndependent/glslang_tab.cpp"
+#line 11353 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 607: /* statement_list: statement  */
-#line 3945 "MachineIndependent/glslang.y"
+  case 586: /* statement_list: statement  */
+#line 3820 "MachineIndependent/glslang.y"
                 {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
         if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
@@ -11831,11 +11362,11 @@ yyreduce:
             (yyval.interm.intermNode) = 0;  // start a fresh subsequence for what's after this case
         }
     }
-#line 11835 "MachineIndependent/glslang_tab.cpp"
+#line 11366 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 608: /* statement_list: statement_list statement  */
-#line 3953 "MachineIndependent/glslang.y"
+  case 587: /* statement_list: statement_list statement  */
+#line 3828 "MachineIndependent/glslang.y"
                                {
         if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
                                             (yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
@@ -11844,106 +11375,110 @@ yyreduce:
         } else
             (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
     }
-#line 11848 "MachineIndependent/glslang_tab.cpp"
+#line 11379 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 609: /* expression_statement: SEMICOLON  */
-#line 3964 "MachineIndependent/glslang.y"
+  case 588: /* expression_statement: SEMICOLON  */
+#line 3839 "MachineIndependent/glslang.y"
                  { (yyval.interm.intermNode) = 0; }
-#line 11854 "MachineIndependent/glslang_tab.cpp"
+#line 11385 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 610: /* expression_statement: expression SEMICOLON  */
-#line 3965 "MachineIndependent/glslang.y"
+  case 589: /* expression_statement: expression SEMICOLON  */
+#line 3840 "MachineIndependent/glslang.y"
                             { (yyval.interm.intermNode) = static_cast<TIntermNode*>((yyvsp[-1].interm.intermTypedNode)); }
-#line 11860 "MachineIndependent/glslang_tab.cpp"
+#line 11391 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 611: /* selection_statement: selection_statement_nonattributed  */
-#line 3969 "MachineIndependent/glslang.y"
+  case 590: /* selection_statement: selection_statement_nonattributed  */
+#line 3844 "MachineIndependent/glslang.y"
                                         {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11868 "MachineIndependent/glslang_tab.cpp"
+#line 11399 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 612: /* selection_statement: attribute selection_statement_nonattributed  */
-#line 3972 "MachineIndependent/glslang.y"
+  case 591: /* selection_statement: attribute selection_statement_nonattributed  */
+#line 3847 "MachineIndependent/glslang.y"
                                                   {
         parseContext.requireExtensions((yyvsp[0].interm.intermNode)->getLoc(), 1, &E_GL_EXT_control_flow_attributes, "attribute");
         parseContext.handleSelectionAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11878 "MachineIndependent/glslang_tab.cpp"
+#line 11409 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 613: /* selection_statement_nonattributed: IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement  */
-#line 3979 "MachineIndependent/glslang.y"
+  case 592: /* selection_statement_nonattributed: IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement  */
+#line 3854 "MachineIndependent/glslang.y"
                                                                     {
         parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-2].interm.intermTypedNode));
         (yyval.interm.intermNode) = parseContext.intermediate.addSelection((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.nodePair), (yyvsp[-4].lex).loc);
     }
-#line 11887 "MachineIndependent/glslang_tab.cpp"
+#line 11418 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 614: /* selection_rest_statement: statement_scoped ELSE statement_scoped  */
-#line 3986 "MachineIndependent/glslang.y"
+  case 593: /* selection_rest_statement: statement_scoped ELSE statement_scoped  */
+#line 3861 "MachineIndependent/glslang.y"
                                              {
         (yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
         (yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermNode);
     }
-#line 11896 "MachineIndependent/glslang_tab.cpp"
+#line 11427 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 615: /* selection_rest_statement: statement_scoped  */
-#line 3990 "MachineIndependent/glslang.y"
+  case 594: /* selection_rest_statement: statement_scoped  */
+#line 3865 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
         (yyval.interm.nodePair).node2 = 0;
     }
-#line 11905 "MachineIndependent/glslang_tab.cpp"
+#line 11436 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 616: /* condition: expression  */
-#line 3998 "MachineIndependent/glslang.y"
+  case 595: /* condition: expression  */
+#line 3873 "MachineIndependent/glslang.y"
                  {
-        (yyval.interm.intermNode) = (yyvsp[0].interm.intermTypedNode);
+        (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
         parseContext.boolCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode));
     }
-#line 11914 "MachineIndependent/glslang_tab.cpp"
+#line 11445 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 617: /* condition: fully_specified_type IDENTIFIER EQUAL initializer  */
-#line 4002 "MachineIndependent/glslang.y"
+  case 596: /* condition: fully_specified_type IDENTIFIER EQUAL initializer  */
+#line 3877 "MachineIndependent/glslang.y"
                                                         {
         parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type));
 
         TType type((yyvsp[-3].interm.type));
-        (yyval.interm.intermNode) = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
+        TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
+        if (initNode)
+            (yyval.interm.intermTypedNode) = initNode->getAsTyped();
+        else
+            (yyval.interm.intermTypedNode) = 0;
     }
-#line 11925 "MachineIndependent/glslang_tab.cpp"
+#line 11460 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 618: /* switch_statement: switch_statement_nonattributed  */
-#line 4011 "MachineIndependent/glslang.y"
+  case 597: /* switch_statement: switch_statement_nonattributed  */
+#line 3890 "MachineIndependent/glslang.y"
                                      {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11933 "MachineIndependent/glslang_tab.cpp"
+#line 11468 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 619: /* switch_statement: attribute switch_statement_nonattributed  */
-#line 4014 "MachineIndependent/glslang.y"
+  case 598: /* switch_statement: attribute switch_statement_nonattributed  */
+#line 3893 "MachineIndependent/glslang.y"
                                                {
         parseContext.requireExtensions((yyvsp[0].interm.intermNode)->getLoc(), 1, &E_GL_EXT_control_flow_attributes, "attribute");
         parseContext.handleSwitchAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11943 "MachineIndependent/glslang_tab.cpp"
+#line 11478 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 620: /* $@9: %empty  */
-#line 4021 "MachineIndependent/glslang.y"
+  case 599: /* $@9: %empty  */
+#line 3900 "MachineIndependent/glslang.y"
                                                {
         // start new switch sequence on the switch stack
         ++parseContext.controlFlowNestingLevel;
@@ -11952,11 +11487,11 @@ yyreduce:
         parseContext.switchLevel.push_back(parseContext.statementNestingLevel);
         parseContext.symbolTable.push();
     }
-#line 11956 "MachineIndependent/glslang_tab.cpp"
+#line 11491 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 621: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE  */
-#line 4029 "MachineIndependent/glslang.y"
+  case 600: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE  */
+#line 3908 "MachineIndependent/glslang.y"
                                                  {
         (yyval.interm.intermNode) = parseContext.addSwitch((yyvsp[-7].lex).loc, (yyvsp[-5].interm.intermTypedNode), (yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : 0);
         delete parseContext.switchSequenceStack.back();
@@ -11966,27 +11501,27 @@ yyreduce:
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
     }
-#line 11970 "MachineIndependent/glslang_tab.cpp"
+#line 11505 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 622: /* switch_statement_list: %empty  */
-#line 4041 "MachineIndependent/glslang.y"
+  case 601: /* switch_statement_list: %empty  */
+#line 3920 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermNode) = 0;
     }
-#line 11978 "MachineIndependent/glslang_tab.cpp"
+#line 11513 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 623: /* switch_statement_list: statement_list  */
-#line 4044 "MachineIndependent/glslang.y"
+  case 602: /* switch_statement_list: statement_list  */
+#line 3923 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 11986 "MachineIndependent/glslang_tab.cpp"
+#line 11521 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 624: /* case_label: CASE expression COLON  */
-#line 4050 "MachineIndependent/glslang.y"
+  case 603: /* case_label: CASE expression COLON  */
+#line 3929 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.intermNode) = 0;
         if (parseContext.switchLevel.size() == 0)
@@ -11999,11 +11534,11 @@ yyreduce:
             (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpCase, (yyvsp[-1].interm.intermTypedNode), (yyvsp[-2].lex).loc);
         }
     }
-#line 12003 "MachineIndependent/glslang_tab.cpp"
+#line 11538 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 625: /* case_label: DEFAULT COLON  */
-#line 4062 "MachineIndependent/glslang.y"
+  case 604: /* case_label: DEFAULT COLON  */
+#line 3941 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermNode) = 0;
         if (parseContext.switchLevel.size() == 0)
@@ -12013,30 +11548,30 @@ yyreduce:
         else
             (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpDefault, (yyvsp[-1].lex).loc);
     }
-#line 12017 "MachineIndependent/glslang_tab.cpp"
+#line 11552 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 626: /* iteration_statement: iteration_statement_nonattributed  */
-#line 4074 "MachineIndependent/glslang.y"
+  case 605: /* iteration_statement: iteration_statement_nonattributed  */
+#line 3953 "MachineIndependent/glslang.y"
                                         {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12025 "MachineIndependent/glslang_tab.cpp"
+#line 11560 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 627: /* iteration_statement: attribute iteration_statement_nonattributed  */
-#line 4077 "MachineIndependent/glslang.y"
+  case 606: /* iteration_statement: attribute iteration_statement_nonattributed  */
+#line 3956 "MachineIndependent/glslang.y"
                                                   {
         const char * extensions[2] = { E_GL_EXT_control_flow_attributes, E_GL_EXT_control_flow_attributes2 };
         parseContext.requireExtensions((yyvsp[0].interm.intermNode)->getLoc(), 2, extensions, "attribute");
         parseContext.handleLoopAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12036 "MachineIndependent/glslang_tab.cpp"
+#line 11571 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 628: /* $@10: %empty  */
-#line 4085 "MachineIndependent/glslang.y"
+  case 607: /* $@10: %empty  */
+#line 3964 "MachineIndependent/glslang.y"
                        {
         if (! parseContext.limits.whileLoops)
             parseContext.error((yyvsp[-1].lex).loc, "while loops not available", "limitation", "");
@@ -12045,38 +11580,34 @@ yyreduce:
         ++parseContext.statementNestingLevel;
         ++parseContext.controlFlowNestingLevel;
     }
-#line 12049 "MachineIndependent/glslang_tab.cpp"
+#line 11584 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 629: /* iteration_statement_nonattributed: WHILE LEFT_PAREN $@10 condition RIGHT_PAREN statement_no_new_scope  */
-#line 4093 "MachineIndependent/glslang.y"
+  case 608: /* iteration_statement_nonattributed: WHILE LEFT_PAREN $@10 condition RIGHT_PAREN statement_no_new_scope  */
+#line 3972 "MachineIndependent/glslang.y"
                                                    {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
-        (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermNode), 0, true, (yyvsp[-5].lex).loc);
-        if (parseContext.intermediate.getDebugInfo()) {
-            (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyval.interm.intermNode), (yyvsp[-5].lex).loc);
-            (yyval.interm.intermNode)->getAsAggregate()->setOperator(EOpScope);
-        }
+        (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, true, (yyvsp[-5].lex).loc);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
     }
-#line 12065 "MachineIndependent/glslang_tab.cpp"
+#line 11596 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 630: /* $@11: %empty  */
-#line 4104 "MachineIndependent/glslang.y"
+  case 609: /* $@11: %empty  */
+#line 3979 "MachineIndependent/glslang.y"
          {
         parseContext.symbolTable.push();
         ++parseContext.loopNestingLevel;
         ++parseContext.statementNestingLevel;
         ++parseContext.controlFlowNestingLevel;
     }
-#line 12076 "MachineIndependent/glslang_tab.cpp"
+#line 11607 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 631: /* iteration_statement_nonattributed: DO $@11 statement WHILE LEFT_PAREN expression RIGHT_PAREN SEMICOLON  */
-#line 4110 "MachineIndependent/glslang.y"
+  case 610: /* iteration_statement_nonattributed: DO $@11 statement WHILE LEFT_PAREN expression RIGHT_PAREN SEMICOLON  */
+#line 3985 "MachineIndependent/glslang.y"
                                                                   {
         if (! parseContext.limits.whileLoops)
             parseContext.error((yyvsp[-7].lex).loc, "do-while loops not available", "limitation", "");
@@ -12084,31 +11615,27 @@ yyreduce:
         parseContext.boolCheck((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode));
 
         (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[-5].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, false, (yyvsp[-4].lex).loc);
-        if (parseContext.intermediate.getDebugInfo()) {
-            (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyval.interm.intermNode), (yyvsp[-4].lex).loc);
-            (yyval.interm.intermNode)->getAsAggregate()->setOperator(EOpScope);
-        }
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
     }
-#line 12097 "MachineIndependent/glslang_tab.cpp"
+#line 11624 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 632: /* $@12: %empty  */
-#line 4126 "MachineIndependent/glslang.y"
+  case 611: /* $@12: %empty  */
+#line 3997 "MachineIndependent/glslang.y"
                      {
         parseContext.symbolTable.push();
         ++parseContext.loopNestingLevel;
         ++parseContext.statementNestingLevel;
         ++parseContext.controlFlowNestingLevel;
     }
-#line 12108 "MachineIndependent/glslang_tab.cpp"
+#line 11635 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 633: /* iteration_statement_nonattributed: FOR LEFT_PAREN $@12 for_init_statement for_rest_statement RIGHT_PAREN statement_no_new_scope  */
-#line 4132 "MachineIndependent/glslang.y"
+  case 612: /* iteration_statement_nonattributed: FOR LEFT_PAREN $@12 for_init_statement for_rest_statement RIGHT_PAREN statement_no_new_scope  */
+#line 4003 "MachineIndependent/glslang.y"
                                                                                {
         parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[-3].interm.intermNode), (yyvsp[-5].lex).loc);
@@ -12116,86 +11643,86 @@ yyreduce:
         if (! parseContext.limits.nonInductiveForLoops)
             parseContext.inductiveLoopCheck((yyvsp[-6].lex).loc, (yyvsp[-3].interm.intermNode), forLoop);
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyval.interm.intermNode), forLoop, (yyvsp[-6].lex).loc);
-        (yyval.interm.intermNode)->getAsAggregate()->setOperator(parseContext.intermediate.getDebugInfo() ? EOpScope : EOpSequence);
+        (yyval.interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
         --parseContext.loopNestingLevel;
         --parseContext.statementNestingLevel;
         --parseContext.controlFlowNestingLevel;
     }
-#line 12125 "MachineIndependent/glslang_tab.cpp"
+#line 11652 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 634: /* for_init_statement: expression_statement  */
-#line 4147 "MachineIndependent/glslang.y"
+  case 613: /* for_init_statement: expression_statement  */
+#line 4018 "MachineIndependent/glslang.y"
                            {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12133 "MachineIndependent/glslang_tab.cpp"
+#line 11660 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 635: /* for_init_statement: declaration_statement  */
-#line 4150 "MachineIndependent/glslang.y"
+  case 614: /* for_init_statement: declaration_statement  */
+#line 4021 "MachineIndependent/glslang.y"
                             {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12141 "MachineIndependent/glslang_tab.cpp"
+#line 11668 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 636: /* conditionopt: condition  */
-#line 4156 "MachineIndependent/glslang.y"
+  case 615: /* conditionopt: condition  */
+#line 4027 "MachineIndependent/glslang.y"
                 {
-        (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+        (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
     }
-#line 12149 "MachineIndependent/glslang_tab.cpp"
+#line 11676 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 637: /* conditionopt: %empty  */
-#line 4159 "MachineIndependent/glslang.y"
+  case 616: /* conditionopt: %empty  */
+#line 4030 "MachineIndependent/glslang.y"
                         {
-        (yyval.interm.intermNode) = 0;
+        (yyval.interm.intermTypedNode) = 0;
     }
-#line 12157 "MachineIndependent/glslang_tab.cpp"
+#line 11684 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 638: /* for_rest_statement: conditionopt SEMICOLON  */
-#line 4165 "MachineIndependent/glslang.y"
+  case 617: /* for_rest_statement: conditionopt SEMICOLON  */
+#line 4036 "MachineIndependent/glslang.y"
                              {
-        (yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermNode);
+        (yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
         (yyval.interm.nodePair).node2 = 0;
     }
-#line 12166 "MachineIndependent/glslang_tab.cpp"
+#line 11693 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 639: /* for_rest_statement: conditionopt SEMICOLON expression  */
-#line 4169 "MachineIndependent/glslang.y"
+  case 618: /* for_rest_statement: conditionopt SEMICOLON expression  */
+#line 4040 "MachineIndependent/glslang.y"
                                          {
-        (yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
+        (yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermTypedNode);
         (yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermTypedNode);
     }
-#line 12175 "MachineIndependent/glslang_tab.cpp"
+#line 11702 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 640: /* jump_statement: CONTINUE SEMICOLON  */
-#line 4176 "MachineIndependent/glslang.y"
+  case 619: /* jump_statement: CONTINUE SEMICOLON  */
+#line 4047 "MachineIndependent/glslang.y"
                          {
         if (parseContext.loopNestingLevel <= 0)
             parseContext.error((yyvsp[-1].lex).loc, "continue statement only allowed in loops", "", "");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpContinue, (yyvsp[-1].lex).loc);
     }
-#line 12185 "MachineIndependent/glslang_tab.cpp"
+#line 11712 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 641: /* jump_statement: BREAK SEMICOLON  */
-#line 4181 "MachineIndependent/glslang.y"
+  case 620: /* jump_statement: BREAK SEMICOLON  */
+#line 4052 "MachineIndependent/glslang.y"
                       {
         if (parseContext.loopNestingLevel + parseContext.switchSequenceStack.size() <= 0)
             parseContext.error((yyvsp[-1].lex).loc, "break statement only allowed in switch and loops", "", "");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpBreak, (yyvsp[-1].lex).loc);
     }
-#line 12195 "MachineIndependent/glslang_tab.cpp"
+#line 11722 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 642: /* jump_statement: RETURN SEMICOLON  */
-#line 4186 "MachineIndependent/glslang.y"
+  case 621: /* jump_statement: RETURN SEMICOLON  */
+#line 4057 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-1].lex).loc);
         if (parseContext.currentFunctionType->getBasicType() != EbtVoid)
@@ -12203,101 +11730,101 @@ yyreduce:
         if (parseContext.inMain)
             parseContext.postEntryPointReturn = true;
     }
-#line 12207 "MachineIndependent/glslang_tab.cpp"
+#line 11734 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 643: /* jump_statement: RETURN expression SEMICOLON  */
-#line 4193 "MachineIndependent/glslang.y"
+  case 622: /* jump_statement: RETURN expression SEMICOLON  */
+#line 4064 "MachineIndependent/glslang.y"
                                   {
         (yyval.interm.intermNode) = parseContext.handleReturnValue((yyvsp[-2].lex).loc, (yyvsp[-1].interm.intermTypedNode));
     }
-#line 12215 "MachineIndependent/glslang_tab.cpp"
+#line 11742 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 644: /* jump_statement: DISCARD SEMICOLON  */
-#line 4196 "MachineIndependent/glslang.y"
+  case 623: /* jump_statement: DISCARD SEMICOLON  */
+#line 4067 "MachineIndependent/glslang.y"
                         {
         parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "discard");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpKill, (yyvsp[-1].lex).loc);
     }
-#line 12224 "MachineIndependent/glslang_tab.cpp"
+#line 11751 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 645: /* jump_statement: TERMINATE_INVOCATION SEMICOLON  */
-#line 4200 "MachineIndependent/glslang.y"
+  case 624: /* jump_statement: TERMINATE_INVOCATION SEMICOLON  */
+#line 4071 "MachineIndependent/glslang.y"
                                      {
         parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "terminateInvocation");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpTerminateInvocation, (yyvsp[-1].lex).loc);
     }
-#line 12233 "MachineIndependent/glslang_tab.cpp"
+#line 11760 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 646: /* jump_statement: TERMINATE_RAY SEMICOLON  */
-#line 4204 "MachineIndependent/glslang.y"
+  case 625: /* jump_statement: TERMINATE_RAY SEMICOLON  */
+#line 4075 "MachineIndependent/glslang.y"
                               {
         parseContext.requireStage((yyvsp[-1].lex).loc, EShLangAnyHit, "terminateRayEXT");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpTerminateRayKHR, (yyvsp[-1].lex).loc);
     }
-#line 12242 "MachineIndependent/glslang_tab.cpp"
+#line 11769 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 647: /* jump_statement: IGNORE_INTERSECTION SEMICOLON  */
-#line 4208 "MachineIndependent/glslang.y"
+  case 626: /* jump_statement: IGNORE_INTERSECTION SEMICOLON  */
+#line 4079 "MachineIndependent/glslang.y"
                                     {
         parseContext.requireStage((yyvsp[-1].lex).loc, EShLangAnyHit, "ignoreIntersectionEXT");
         (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpIgnoreIntersectionKHR, (yyvsp[-1].lex).loc);
     }
-#line 12251 "MachineIndependent/glslang_tab.cpp"
+#line 11778 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 648: /* translation_unit: external_declaration  */
-#line 4217 "MachineIndependent/glslang.y"
+  case 627: /* translation_unit: external_declaration  */
+#line 4088 "MachineIndependent/glslang.y"
                            {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
         parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
     }
-#line 12260 "MachineIndependent/glslang_tab.cpp"
+#line 11787 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 649: /* translation_unit: translation_unit external_declaration  */
-#line 4221 "MachineIndependent/glslang.y"
+  case 628: /* translation_unit: translation_unit external_declaration  */
+#line 4092 "MachineIndependent/glslang.y"
                                             {
         if ((yyvsp[0].interm.intermNode) != nullptr) {
             (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
             parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
         }
     }
-#line 12271 "MachineIndependent/glslang_tab.cpp"
+#line 11798 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 650: /* external_declaration: function_definition  */
-#line 4230 "MachineIndependent/glslang.y"
+  case 629: /* external_declaration: function_definition  */
+#line 4101 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12279 "MachineIndependent/glslang_tab.cpp"
+#line 11806 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 651: /* external_declaration: declaration  */
-#line 4233 "MachineIndependent/glslang.y"
+  case 630: /* external_declaration: declaration  */
+#line 4104 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
     }
-#line 12287 "MachineIndependent/glslang_tab.cpp"
+#line 11814 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 652: /* external_declaration: SEMICOLON  */
-#line 4236 "MachineIndependent/glslang.y"
+  case 631: /* external_declaration: SEMICOLON  */
+#line 4107 "MachineIndependent/glslang.y"
                 {
         parseContext.requireProfile((yyvsp[0].lex).loc, ~EEsProfile, "extraneous semicolon");
         parseContext.profileRequires((yyvsp[0].lex).loc, ~EEsProfile, 460, nullptr, "extraneous semicolon");
         (yyval.interm.intermNode) = nullptr;
     }
-#line 12297 "MachineIndependent/glslang_tab.cpp"
+#line 11824 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 653: /* $@13: %empty  */
-#line 4244 "MachineIndependent/glslang.y"
+  case 632: /* $@13: %empty  */
+#line 4115 "MachineIndependent/glslang.y"
                          {
         (yyvsp[0].interm).function = parseContext.handleFunctionDeclarator((yyvsp[0].interm).loc, *(yyvsp[0].interm).function, false /* not prototype */);
         (yyvsp[0].interm).intermNode = parseContext.handleFunctionDefinition((yyvsp[0].interm).loc, *(yyvsp[0].interm).function);
@@ -12310,11 +11837,11 @@ yyreduce:
             ++parseContext.statementNestingLevel;
         }
     }
-#line 12314 "MachineIndependent/glslang_tab.cpp"
+#line 11841 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 654: /* function_definition: function_prototype $@13 compound_statement_no_new_scope  */
-#line 4256 "MachineIndependent/glslang.y"
+  case 633: /* function_definition: function_prototype $@13 compound_statement_no_new_scope  */
+#line 4127 "MachineIndependent/glslang.y"
                                     {
         //   May be best done as post process phase on intermediate code
         if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue)
@@ -12342,228 +11869,228 @@ yyreduce:
             --parseContext.statementNestingLevel;
         }
     }
-#line 12346 "MachineIndependent/glslang_tab.cpp"
+#line 11873 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 655: /* attribute: LEFT_BRACKET LEFT_BRACKET attribute_list RIGHT_BRACKET RIGHT_BRACKET  */
-#line 4286 "MachineIndependent/glslang.y"
+  case 634: /* attribute: LEFT_BRACKET LEFT_BRACKET attribute_list RIGHT_BRACKET RIGHT_BRACKET  */
+#line 4157 "MachineIndependent/glslang.y"
                                                                            {
         (yyval.interm.attributes) = (yyvsp[-2].interm.attributes);
     }
-#line 12354 "MachineIndependent/glslang_tab.cpp"
+#line 11881 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 656: /* attribute_list: single_attribute  */
-#line 4291 "MachineIndependent/glslang.y"
+  case 635: /* attribute_list: single_attribute  */
+#line 4162 "MachineIndependent/glslang.y"
                        {
         (yyval.interm.attributes) = (yyvsp[0].interm.attributes);
     }
-#line 12362 "MachineIndependent/glslang_tab.cpp"
+#line 11889 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 657: /* attribute_list: attribute_list COMMA single_attribute  */
-#line 4294 "MachineIndependent/glslang.y"
+  case 636: /* attribute_list: attribute_list COMMA single_attribute  */
+#line 4165 "MachineIndependent/glslang.y"
                                             {
         (yyval.interm.attributes) = parseContext.mergeAttributes((yyvsp[-2].interm.attributes), (yyvsp[0].interm.attributes));
     }
-#line 12370 "MachineIndependent/glslang_tab.cpp"
+#line 11897 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 658: /* single_attribute: IDENTIFIER  */
-#line 4299 "MachineIndependent/glslang.y"
+  case 637: /* single_attribute: IDENTIFIER  */
+#line 4170 "MachineIndependent/glslang.y"
                  {
         (yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[0].lex).string);
     }
-#line 12378 "MachineIndependent/glslang_tab.cpp"
+#line 11905 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 659: /* single_attribute: IDENTIFIER LEFT_PAREN constant_expression RIGHT_PAREN  */
-#line 4302 "MachineIndependent/glslang.y"
+  case 638: /* single_attribute: IDENTIFIER LEFT_PAREN constant_expression RIGHT_PAREN  */
+#line 4173 "MachineIndependent/glslang.y"
                                                             {
         (yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[-3].lex).string, (yyvsp[-1].interm.intermTypedNode));
     }
-#line 12386 "MachineIndependent/glslang_tab.cpp"
+#line 11913 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 660: /* spirv_requirements_list: spirv_requirements_parameter  */
-#line 4307 "MachineIndependent/glslang.y"
+  case 639: /* spirv_requirements_list: spirv_requirements_parameter  */
+#line 4178 "MachineIndependent/glslang.y"
                                    {
         (yyval.interm.spirvReq) = (yyvsp[0].interm.spirvReq);
     }
-#line 12394 "MachineIndependent/glslang_tab.cpp"
+#line 11921 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 661: /* spirv_requirements_list: spirv_requirements_list COMMA spirv_requirements_parameter  */
-#line 4310 "MachineIndependent/glslang.y"
+  case 640: /* spirv_requirements_list: spirv_requirements_list COMMA spirv_requirements_parameter  */
+#line 4181 "MachineIndependent/glslang.y"
                                                                  {
         (yyval.interm.spirvReq) = parseContext.mergeSpirvRequirements((yyvsp[-1].lex).loc, (yyvsp[-2].interm.spirvReq), (yyvsp[0].interm.spirvReq));
     }
-#line 12402 "MachineIndependent/glslang_tab.cpp"
+#line 11929 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 662: /* spirv_requirements_parameter: IDENTIFIER EQUAL LEFT_BRACKET spirv_extension_list RIGHT_BRACKET  */
-#line 4315 "MachineIndependent/glslang.y"
+  case 641: /* spirv_requirements_parameter: IDENTIFIER EQUAL LEFT_BRACKET spirv_extension_list RIGHT_BRACKET  */
+#line 4186 "MachineIndependent/glslang.y"
                                                                        {
         (yyval.interm.spirvReq) = parseContext.makeSpirvRequirement((yyvsp[-3].lex).loc, *(yyvsp[-4].lex).string, (yyvsp[-1].interm.intermNode)->getAsAggregate(), nullptr);
     }
-#line 12410 "MachineIndependent/glslang_tab.cpp"
+#line 11937 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 663: /* spirv_requirements_parameter: IDENTIFIER EQUAL LEFT_BRACKET spirv_capability_list RIGHT_BRACKET  */
-#line 4318 "MachineIndependent/glslang.y"
+  case 642: /* spirv_requirements_parameter: IDENTIFIER EQUAL LEFT_BRACKET spirv_capability_list RIGHT_BRACKET  */
+#line 4189 "MachineIndependent/glslang.y"
                                                                         {
         (yyval.interm.spirvReq) = parseContext.makeSpirvRequirement((yyvsp[-3].lex).loc, *(yyvsp[-4].lex).string, nullptr, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12418 "MachineIndependent/glslang_tab.cpp"
+#line 11945 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 664: /* spirv_extension_list: STRING_LITERAL  */
-#line 4323 "MachineIndependent/glslang.y"
+  case 643: /* spirv_extension_list: STRING_LITERAL  */
+#line 4194 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate(parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true));
     }
-#line 12426 "MachineIndependent/glslang_tab.cpp"
+#line 11953 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 665: /* spirv_extension_list: spirv_extension_list COMMA STRING_LITERAL  */
-#line 4326 "MachineIndependent/glslang.y"
+  case 644: /* spirv_extension_list: spirv_extension_list COMMA STRING_LITERAL  */
+#line 4197 "MachineIndependent/glslang.y"
                                                 {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true));
     }
-#line 12434 "MachineIndependent/glslang_tab.cpp"
+#line 11961 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 666: /* spirv_capability_list: INTCONSTANT  */
-#line 4331 "MachineIndependent/glslang.y"
+  case 645: /* spirv_capability_list: INTCONSTANT  */
+#line 4202 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate(parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true));
     }
-#line 12442 "MachineIndependent/glslang_tab.cpp"
+#line 11969 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 667: /* spirv_capability_list: spirv_capability_list COMMA INTCONSTANT  */
-#line 4334 "MachineIndependent/glslang.y"
+  case 646: /* spirv_capability_list: spirv_capability_list COMMA INTCONSTANT  */
+#line 4205 "MachineIndependent/glslang.y"
                                               {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true));
     }
-#line 12450 "MachineIndependent/glslang_tab.cpp"
+#line 11977 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 668: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
-#line 4339 "MachineIndependent/glslang.y"
+  case 647: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
+#line 4210 "MachineIndependent/glslang.y"
                                                               {
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
         (yyval.interm.intermNode) = 0;
     }
-#line 12459 "MachineIndependent/glslang_tab.cpp"
+#line 11986 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 669: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
-#line 4343 "MachineIndependent/glslang.y"
+  case 648: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
+#line 4214 "MachineIndependent/glslang.y"
                                                                                             {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
         (yyval.interm.intermNode) = 0;
     }
-#line 12469 "MachineIndependent/glslang_tab.cpp"
+#line 11996 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 670: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN INTCONSTANT COMMA spirv_execution_mode_parameter_list RIGHT_PAREN  */
-#line 4348 "MachineIndependent/glslang.y"
+  case 649: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN INTCONSTANT COMMA spirv_execution_mode_parameter_list RIGHT_PAREN  */
+#line 4219 "MachineIndependent/glslang.y"
                                                                                                         {
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
         (yyval.interm.intermNode) = 0;
     }
-#line 12478 "MachineIndependent/glslang_tab.cpp"
+#line 12005 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 671: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_execution_mode_parameter_list RIGHT_PAREN  */
-#line 4352 "MachineIndependent/glslang.y"
+  case 650: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_execution_mode_parameter_list RIGHT_PAREN  */
+#line 4223 "MachineIndependent/glslang.y"
                                                                                                                                       {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
         (yyval.interm.intermNode) = 0;
     }
-#line 12488 "MachineIndependent/glslang_tab.cpp"
+#line 12015 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 672: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE_ID LEFT_PAREN INTCONSTANT COMMA spirv_execution_mode_id_parameter_list RIGHT_PAREN  */
-#line 4357 "MachineIndependent/glslang.y"
+  case 651: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE_ID LEFT_PAREN INTCONSTANT COMMA spirv_execution_mode_id_parameter_list RIGHT_PAREN  */
+#line 4228 "MachineIndependent/glslang.y"
                                                                                                               {
         parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
         (yyval.interm.intermNode) = 0;
     }
-#line 12497 "MachineIndependent/glslang_tab.cpp"
+#line 12024 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 673: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE_ID LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_execution_mode_id_parameter_list RIGHT_PAREN  */
-#line 4361 "MachineIndependent/glslang.y"
+  case 652: /* spirv_execution_mode_qualifier: SPIRV_EXECUTION_MODE_ID LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_execution_mode_id_parameter_list RIGHT_PAREN  */
+#line 4232 "MachineIndependent/glslang.y"
                                                                                                                                             {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
         (yyval.interm.intermNode) = 0;
     }
-#line 12507 "MachineIndependent/glslang_tab.cpp"
+#line 12034 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 674: /* spirv_execution_mode_parameter_list: spirv_execution_mode_parameter  */
-#line 4368 "MachineIndependent/glslang.y"
+  case 653: /* spirv_execution_mode_parameter_list: spirv_execution_mode_parameter  */
+#line 4239 "MachineIndependent/glslang.y"
                                      {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
     }
-#line 12515 "MachineIndependent/glslang_tab.cpp"
+#line 12042 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 675: /* spirv_execution_mode_parameter_list: spirv_execution_mode_parameter_list COMMA spirv_execution_mode_parameter  */
-#line 4371 "MachineIndependent/glslang.y"
+  case 654: /* spirv_execution_mode_parameter_list: spirv_execution_mode_parameter_list COMMA spirv_execution_mode_parameter  */
+#line 4242 "MachineIndependent/glslang.y"
                                                                                {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), (yyvsp[0].interm.intermNode));
     }
-#line 12523 "MachineIndependent/glslang_tab.cpp"
+#line 12050 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 676: /* spirv_execution_mode_parameter: FLOATCONSTANT  */
-#line 4376 "MachineIndependent/glslang.y"
+  case 655: /* spirv_execution_mode_parameter: FLOATCONSTANT  */
+#line 4247 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
     }
-#line 12531 "MachineIndependent/glslang_tab.cpp"
+#line 12058 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 677: /* spirv_execution_mode_parameter: INTCONSTANT  */
-#line 4379 "MachineIndependent/glslang.y"
+  case 656: /* spirv_execution_mode_parameter: INTCONSTANT  */
+#line 4250 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 12539 "MachineIndependent/glslang_tab.cpp"
+#line 12066 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 678: /* spirv_execution_mode_parameter: UINTCONSTANT  */
-#line 4382 "MachineIndependent/glslang.y"
+  case 657: /* spirv_execution_mode_parameter: UINTCONSTANT  */
+#line 4253 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 12547 "MachineIndependent/glslang_tab.cpp"
+#line 12074 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 679: /* spirv_execution_mode_parameter: BOOLCONSTANT  */
-#line 4385 "MachineIndependent/glslang.y"
+  case 658: /* spirv_execution_mode_parameter: BOOLCONSTANT  */
+#line 4256 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
     }
-#line 12555 "MachineIndependent/glslang_tab.cpp"
+#line 12082 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 680: /* spirv_execution_mode_parameter: STRING_LITERAL  */
-#line 4388 "MachineIndependent/glslang.y"
+  case 659: /* spirv_execution_mode_parameter: STRING_LITERAL  */
+#line 4259 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true);
     }
-#line 12563 "MachineIndependent/glslang_tab.cpp"
+#line 12090 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 681: /* spirv_execution_mode_id_parameter_list: constant_expression  */
-#line 4393 "MachineIndependent/glslang.y"
+  case 660: /* spirv_execution_mode_id_parameter_list: constant_expression  */
+#line 4264 "MachineIndependent/glslang.y"
                           {
         if ((yyvsp[0].interm.intermTypedNode)->getBasicType() != EbtFloat &&
             (yyvsp[0].interm.intermTypedNode)->getBasicType() != EbtInt &&
@@ -12573,11 +12100,11 @@ yyreduce:
             parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "this type not allowed", (yyvsp[0].interm.intermTypedNode)->getType().getBasicString(), "");
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermTypedNode));
     }
-#line 12577 "MachineIndependent/glslang_tab.cpp"
+#line 12104 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 682: /* spirv_execution_mode_id_parameter_list: spirv_execution_mode_id_parameter_list COMMA constant_expression  */
-#line 4402 "MachineIndependent/glslang.y"
+  case 661: /* spirv_execution_mode_id_parameter_list: spirv_execution_mode_id_parameter_list COMMA constant_expression  */
+#line 4273 "MachineIndependent/glslang.y"
                                                                        {
         if ((yyvsp[0].interm.intermTypedNode)->getBasicType() != EbtFloat &&
             (yyvsp[0].interm.intermTypedNode)->getBasicType() != EbtInt &&
@@ -12587,351 +12114,351 @@ yyreduce:
             parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "this type not allowed", (yyvsp[0].interm.intermTypedNode)->getType().getBasicString(), "");
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), (yyvsp[0].interm.intermTypedNode));
     }
-#line 12591 "MachineIndependent/glslang_tab.cpp"
+#line 12118 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 683: /* spirv_storage_class_qualifier: SPIRV_STORAGE_CLASS LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
-#line 4413 "MachineIndependent/glslang.y"
+  case 662: /* spirv_storage_class_qualifier: SPIRV_STORAGE_CLASS LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
+#line 4284 "MachineIndependent/glslang.y"
                                                              {
         (yyval.interm.type).init((yyvsp[-3].lex).loc);
         (yyval.interm.type).qualifier.storage = EvqSpirvStorageClass;
         (yyval.interm.type).qualifier.spirvStorageClass = (yyvsp[-1].lex).i;
     }
-#line 12601 "MachineIndependent/glslang_tab.cpp"
+#line 12128 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 684: /* spirv_storage_class_qualifier: SPIRV_STORAGE_CLASS LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
-#line 4418 "MachineIndependent/glslang.y"
+  case 663: /* spirv_storage_class_qualifier: SPIRV_STORAGE_CLASS LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
+#line 4289 "MachineIndependent/glslang.y"
                                                                                            {
         (yyval.interm.type).init((yyvsp[-5].lex).loc);
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         (yyval.interm.type).qualifier.storage = EvqSpirvStorageClass;
         (yyval.interm.type).qualifier.spirvStorageClass = (yyvsp[-1].lex).i;
     }
-#line 12612 "MachineIndependent/glslang_tab.cpp"
+#line 12139 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 685: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
-#line 4426 "MachineIndependent/glslang.y"
+  case 664: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN INTCONSTANT RIGHT_PAREN  */
+#line 4297 "MachineIndependent/glslang.y"
                                                        {
         (yyval.interm.type).init((yyvsp[-3].lex).loc);
         (yyval.interm.type).qualifier.setSpirvDecorate((yyvsp[-1].lex).i);
     }
-#line 12621 "MachineIndependent/glslang_tab.cpp"
+#line 12148 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 686: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
-#line 4430 "MachineIndependent/glslang.y"
+  case 665: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT RIGHT_PAREN  */
+#line 4301 "MachineIndependent/glslang.y"
                                                                                      {
         (yyval.interm.type).init((yyvsp[-5].lex).loc);
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         (yyval.interm.type).qualifier.setSpirvDecorate((yyvsp[-1].lex).i);
     }
-#line 12631 "MachineIndependent/glslang_tab.cpp"
+#line 12158 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 687: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN INTCONSTANT COMMA spirv_decorate_parameter_list RIGHT_PAREN  */
-#line 4435 "MachineIndependent/glslang.y"
+  case 666: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN INTCONSTANT COMMA spirv_decorate_parameter_list RIGHT_PAREN  */
+#line 4306 "MachineIndependent/glslang.y"
                                                                                             {
         (yyval.interm.type).init((yyvsp[-5].lex).loc);
         (yyval.interm.type).qualifier.setSpirvDecorate((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12640 "MachineIndependent/glslang_tab.cpp"
+#line 12167 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 688: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_parameter_list RIGHT_PAREN  */
-#line 4439 "MachineIndependent/glslang.y"
+  case 667: /* spirv_decorate_qualifier: SPIRV_DECORATE LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_parameter_list RIGHT_PAREN  */
+#line 4310 "MachineIndependent/glslang.y"
                                                                                                                           {
         (yyval.interm.type).init((yyvsp[-7].lex).loc);
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         (yyval.interm.type).qualifier.setSpirvDecorate((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12650 "MachineIndependent/glslang_tab.cpp"
+#line 12177 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 689: /* spirv_decorate_qualifier: SPIRV_DECORATE_ID LEFT_PAREN INTCONSTANT COMMA spirv_decorate_id_parameter_list RIGHT_PAREN  */
-#line 4444 "MachineIndependent/glslang.y"
+  case 668: /* spirv_decorate_qualifier: SPIRV_DECORATE_ID LEFT_PAREN INTCONSTANT COMMA spirv_decorate_id_parameter_list RIGHT_PAREN  */
+#line 4315 "MachineIndependent/glslang.y"
                                                                                                   {
         (yyval.interm.type).init((yyvsp[-5].lex).loc);
         (yyval.interm.type).qualifier.setSpirvDecorateId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12659 "MachineIndependent/glslang_tab.cpp"
+#line 12186 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 690: /* spirv_decorate_qualifier: SPIRV_DECORATE_ID LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_id_parameter_list RIGHT_PAREN  */
-#line 4448 "MachineIndependent/glslang.y"
+  case 669: /* spirv_decorate_qualifier: SPIRV_DECORATE_ID LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_id_parameter_list RIGHT_PAREN  */
+#line 4319 "MachineIndependent/glslang.y"
                                                                                                                                 {
         (yyval.interm.type).init((yyvsp[-7].lex).loc);
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         (yyval.interm.type).qualifier.setSpirvDecorateId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12669 "MachineIndependent/glslang_tab.cpp"
+#line 12196 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 691: /* spirv_decorate_qualifier: SPIRV_DECORATE_STRING LEFT_PAREN INTCONSTANT COMMA spirv_decorate_string_parameter_list RIGHT_PAREN  */
-#line 4453 "MachineIndependent/glslang.y"
+  case 670: /* spirv_decorate_qualifier: SPIRV_DECORATE_STRING LEFT_PAREN INTCONSTANT COMMA spirv_decorate_string_parameter_list RIGHT_PAREN  */
+#line 4324 "MachineIndependent/glslang.y"
                                                                                                           {
         (yyval.interm.type).init((yyvsp[-5].lex).loc);
         (yyval.interm.type).qualifier.setSpirvDecorateString((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12678 "MachineIndependent/glslang_tab.cpp"
+#line 12205 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 692: /* spirv_decorate_qualifier: SPIRV_DECORATE_STRING LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_string_parameter_list RIGHT_PAREN  */
-#line 4457 "MachineIndependent/glslang.y"
+  case 671: /* spirv_decorate_qualifier: SPIRV_DECORATE_STRING LEFT_PAREN spirv_requirements_list COMMA INTCONSTANT COMMA spirv_decorate_string_parameter_list RIGHT_PAREN  */
+#line 4328 "MachineIndependent/glslang.y"
                                                                                                                                         {
         (yyval.interm.type).init((yyvsp[-7].lex).loc);
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         (yyval.interm.type).qualifier.setSpirvDecorateString((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
     }
-#line 12688 "MachineIndependent/glslang_tab.cpp"
+#line 12215 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 693: /* spirv_decorate_parameter_list: spirv_decorate_parameter  */
-#line 4464 "MachineIndependent/glslang.y"
+  case 672: /* spirv_decorate_parameter_list: spirv_decorate_parameter  */
+#line 4335 "MachineIndependent/glslang.y"
                                {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
     }
-#line 12696 "MachineIndependent/glslang_tab.cpp"
+#line 12223 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 694: /* spirv_decorate_parameter_list: spirv_decorate_parameter_list COMMA spirv_decorate_parameter  */
-#line 4467 "MachineIndependent/glslang.y"
+  case 673: /* spirv_decorate_parameter_list: spirv_decorate_parameter_list COMMA spirv_decorate_parameter  */
+#line 4338 "MachineIndependent/glslang.y"
                                                                    {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), (yyvsp[0].interm.intermNode));
     }
-#line 12704 "MachineIndependent/glslang_tab.cpp"
+#line 12231 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 695: /* spirv_decorate_parameter: FLOATCONSTANT  */
-#line 4472 "MachineIndependent/glslang.y"
+  case 674: /* spirv_decorate_parameter: FLOATCONSTANT  */
+#line 4343 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
     }
-#line 12712 "MachineIndependent/glslang_tab.cpp"
+#line 12239 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 696: /* spirv_decorate_parameter: INTCONSTANT  */
-#line 4475 "MachineIndependent/glslang.y"
+  case 675: /* spirv_decorate_parameter: INTCONSTANT  */
+#line 4346 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 12720 "MachineIndependent/glslang_tab.cpp"
+#line 12247 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 697: /* spirv_decorate_parameter: UINTCONSTANT  */
-#line 4478 "MachineIndependent/glslang.y"
+  case 676: /* spirv_decorate_parameter: UINTCONSTANT  */
+#line 4349 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 12728 "MachineIndependent/glslang_tab.cpp"
+#line 12255 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 698: /* spirv_decorate_parameter: BOOLCONSTANT  */
-#line 4481 "MachineIndependent/glslang.y"
+  case 677: /* spirv_decorate_parameter: BOOLCONSTANT  */
+#line 4352 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
     }
-#line 12736 "MachineIndependent/glslang_tab.cpp"
+#line 12263 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 699: /* spirv_decorate_id_parameter_list: spirv_decorate_id_parameter  */
-#line 4486 "MachineIndependent/glslang.y"
+  case 678: /* spirv_decorate_id_parameter_list: spirv_decorate_id_parameter  */
+#line 4357 "MachineIndependent/glslang.y"
                                   {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
     }
-#line 12744 "MachineIndependent/glslang_tab.cpp"
+#line 12271 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 700: /* spirv_decorate_id_parameter_list: spirv_decorate_id_parameter_list COMMA spirv_decorate_id_parameter  */
-#line 4489 "MachineIndependent/glslang.y"
+  case 679: /* spirv_decorate_id_parameter_list: spirv_decorate_id_parameter_list COMMA spirv_decorate_id_parameter  */
+#line 4360 "MachineIndependent/glslang.y"
                                                                          {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), (yyvsp[0].interm.intermNode));
     }
-#line 12752 "MachineIndependent/glslang_tab.cpp"
+#line 12279 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 701: /* spirv_decorate_id_parameter: variable_identifier  */
-#line 4494 "MachineIndependent/glslang.y"
+  case 680: /* spirv_decorate_id_parameter: variable_identifier  */
+#line 4365 "MachineIndependent/glslang.y"
                           {
         if ((yyvsp[0].interm.intermTypedNode)->getAsConstantUnion() || (yyvsp[0].interm.intermTypedNode)->getAsSymbolNode())
             (yyval.interm.intermNode) = (yyvsp[0].interm.intermTypedNode);
         else
             parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "only allow constants or variables which are not elements of a composite", "", "");
     }
-#line 12763 "MachineIndependent/glslang_tab.cpp"
+#line 12290 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 702: /* spirv_decorate_id_parameter: FLOATCONSTANT  */
-#line 4500 "MachineIndependent/glslang.y"
+  case 681: /* spirv_decorate_id_parameter: FLOATCONSTANT  */
+#line 4371 "MachineIndependent/glslang.y"
                     {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
     }
-#line 12771 "MachineIndependent/glslang_tab.cpp"
+#line 12298 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 703: /* spirv_decorate_id_parameter: INTCONSTANT  */
-#line 4503 "MachineIndependent/glslang.y"
+  case 682: /* spirv_decorate_id_parameter: INTCONSTANT  */
+#line 4374 "MachineIndependent/glslang.y"
                   {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
     }
-#line 12779 "MachineIndependent/glslang_tab.cpp"
+#line 12306 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 704: /* spirv_decorate_id_parameter: UINTCONSTANT  */
-#line 4506 "MachineIndependent/glslang.y"
+  case 683: /* spirv_decorate_id_parameter: UINTCONSTANT  */
+#line 4377 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
     }
-#line 12787 "MachineIndependent/glslang_tab.cpp"
+#line 12314 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 705: /* spirv_decorate_id_parameter: BOOLCONSTANT  */
-#line 4509 "MachineIndependent/glslang.y"
+  case 684: /* spirv_decorate_id_parameter: BOOLCONSTANT  */
+#line 4380 "MachineIndependent/glslang.y"
                    {
         (yyval.interm.intermNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
     }
-#line 12795 "MachineIndependent/glslang_tab.cpp"
+#line 12322 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 706: /* spirv_decorate_string_parameter_list: STRING_LITERAL  */
-#line 4514 "MachineIndependent/glslang.y"
+  case 685: /* spirv_decorate_string_parameter_list: STRING_LITERAL  */
+#line 4385 "MachineIndependent/glslang.y"
                      {
         (yyval.interm.intermNode) = parseContext.intermediate.makeAggregate(
             parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true));
     }
-#line 12804 "MachineIndependent/glslang_tab.cpp"
+#line 12331 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 707: /* spirv_decorate_string_parameter_list: spirv_decorate_string_parameter_list COMMA STRING_LITERAL  */
-#line 4518 "MachineIndependent/glslang.y"
+  case 686: /* spirv_decorate_string_parameter_list: spirv_decorate_string_parameter_list COMMA STRING_LITERAL  */
+#line 4389 "MachineIndependent/glslang.y"
                                                                 {
         (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermNode), parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true));
     }
-#line 12812 "MachineIndependent/glslang_tab.cpp"
+#line 12339 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 708: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_instruction_qualifier_list COMMA spirv_type_parameter_list RIGHT_PAREN  */
-#line 4523 "MachineIndependent/glslang.y"
+  case 687: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_instruction_qualifier_list COMMA spirv_type_parameter_list RIGHT_PAREN  */
+#line 4394 "MachineIndependent/glslang.y"
                                                                                                          {
         (yyval.interm.type).init((yyvsp[-5].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).setSpirvType(*(yyvsp[-3].interm.spirvInst), (yyvsp[-1].interm.spirvTypeParams));
     }
-#line 12821 "MachineIndependent/glslang_tab.cpp"
+#line 12348 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 709: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list COMMA spirv_type_parameter_list RIGHT_PAREN  */
-#line 4527 "MachineIndependent/glslang.y"
+  case 688: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list COMMA spirv_type_parameter_list RIGHT_PAREN  */
+#line 4398 "MachineIndependent/glslang.y"
                                                                                                                                        {
         (yyval.interm.type).init((yyvsp[-7].lex).loc, parseContext.symbolTable.atGlobalLevel());
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
         (yyval.interm.type).setSpirvType(*(yyvsp[-3].interm.spirvInst), (yyvsp[-1].interm.spirvTypeParams));
     }
-#line 12831 "MachineIndependent/glslang_tab.cpp"
+#line 12358 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 710: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_instruction_qualifier_list RIGHT_PAREN  */
-#line 4532 "MachineIndependent/glslang.y"
+  case 689: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_instruction_qualifier_list RIGHT_PAREN  */
+#line 4403 "MachineIndependent/glslang.y"
                                                                          {
         (yyval.interm.type).init((yyvsp[-3].lex).loc, parseContext.symbolTable.atGlobalLevel());
         (yyval.interm.type).setSpirvType(*(yyvsp[-1].interm.spirvInst));
     }
-#line 12840 "MachineIndependent/glslang_tab.cpp"
+#line 12367 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 711: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list RIGHT_PAREN  */
-#line 4536 "MachineIndependent/glslang.y"
+  case 690: /* spirv_type_specifier: SPIRV_TYPE LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list RIGHT_PAREN  */
+#line 4407 "MachineIndependent/glslang.y"
                                                                                                        {
         (yyval.interm.type).init((yyvsp[-5].lex).loc, parseContext.symbolTable.atGlobalLevel());
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         (yyval.interm.type).setSpirvType(*(yyvsp[-1].interm.spirvInst));
     }
-#line 12850 "MachineIndependent/glslang_tab.cpp"
+#line 12377 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 712: /* spirv_type_parameter_list: spirv_type_parameter  */
-#line 4543 "MachineIndependent/glslang.y"
+  case 691: /* spirv_type_parameter_list: spirv_type_parameter  */
+#line 4414 "MachineIndependent/glslang.y"
                            {
         (yyval.interm.spirvTypeParams) = (yyvsp[0].interm.spirvTypeParams);
     }
-#line 12858 "MachineIndependent/glslang_tab.cpp"
+#line 12385 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 713: /* spirv_type_parameter_list: spirv_type_parameter_list COMMA spirv_type_parameter  */
-#line 4546 "MachineIndependent/glslang.y"
+  case 692: /* spirv_type_parameter_list: spirv_type_parameter_list COMMA spirv_type_parameter  */
+#line 4417 "MachineIndependent/glslang.y"
                                                            {
         (yyval.interm.spirvTypeParams) = parseContext.mergeSpirvTypeParameters((yyvsp[-2].interm.spirvTypeParams), (yyvsp[0].interm.spirvTypeParams));
     }
-#line 12866 "MachineIndependent/glslang_tab.cpp"
+#line 12393 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 714: /* spirv_type_parameter: constant_expression  */
-#line 4551 "MachineIndependent/glslang.y"
+  case 693: /* spirv_type_parameter: constant_expression  */
+#line 4422 "MachineIndependent/glslang.y"
                           {
         (yyval.interm.spirvTypeParams) = parseContext.makeSpirvTypeParameters((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode)->getAsConstantUnion());
     }
-#line 12874 "MachineIndependent/glslang_tab.cpp"
+#line 12401 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 715: /* spirv_type_parameter: type_specifier_nonarray  */
-#line 4554 "MachineIndependent/glslang.y"
+  case 694: /* spirv_type_parameter: type_specifier_nonarray  */
+#line 4425 "MachineIndependent/glslang.y"
                               {
         (yyval.interm.spirvTypeParams) = parseContext.makeSpirvTypeParameters((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
     }
-#line 12882 "MachineIndependent/glslang_tab.cpp"
+#line 12409 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 716: /* spirv_instruction_qualifier: SPIRV_INSTRUCTION LEFT_PAREN spirv_instruction_qualifier_list RIGHT_PAREN  */
-#line 4559 "MachineIndependent/glslang.y"
+  case 695: /* spirv_instruction_qualifier: SPIRV_INSTRUCTION LEFT_PAREN spirv_instruction_qualifier_list RIGHT_PAREN  */
+#line 4430 "MachineIndependent/glslang.y"
                                                                                 {
         (yyval.interm.spirvInst) = (yyvsp[-1].interm.spirvInst);
     }
-#line 12890 "MachineIndependent/glslang_tab.cpp"
+#line 12417 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 717: /* spirv_instruction_qualifier: SPIRV_INSTRUCTION LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list RIGHT_PAREN  */
-#line 4562 "MachineIndependent/glslang.y"
+  case 696: /* spirv_instruction_qualifier: SPIRV_INSTRUCTION LEFT_PAREN spirv_requirements_list COMMA spirv_instruction_qualifier_list RIGHT_PAREN  */
+#line 4433 "MachineIndependent/glslang.y"
                                                                                                               {
         parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
         (yyval.interm.spirvInst) = (yyvsp[-1].interm.spirvInst);
     }
-#line 12899 "MachineIndependent/glslang_tab.cpp"
+#line 12426 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 718: /* spirv_instruction_qualifier_list: spirv_instruction_qualifier_id  */
-#line 4568 "MachineIndependent/glslang.y"
+  case 697: /* spirv_instruction_qualifier_list: spirv_instruction_qualifier_id  */
+#line 4439 "MachineIndependent/glslang.y"
                                      {
         (yyval.interm.spirvInst) = (yyvsp[0].interm.spirvInst);
     }
-#line 12907 "MachineIndependent/glslang_tab.cpp"
+#line 12434 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 719: /* spirv_instruction_qualifier_list: spirv_instruction_qualifier_list COMMA spirv_instruction_qualifier_id  */
-#line 4571 "MachineIndependent/glslang.y"
+  case 698: /* spirv_instruction_qualifier_list: spirv_instruction_qualifier_list COMMA spirv_instruction_qualifier_id  */
+#line 4442 "MachineIndependent/glslang.y"
                                                                             {
         (yyval.interm.spirvInst) = parseContext.mergeSpirvInstruction((yyvsp[-1].lex).loc, (yyvsp[-2].interm.spirvInst), (yyvsp[0].interm.spirvInst));
     }
-#line 12915 "MachineIndependent/glslang_tab.cpp"
+#line 12442 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 720: /* spirv_instruction_qualifier_id: IDENTIFIER EQUAL STRING_LITERAL  */
-#line 4576 "MachineIndependent/glslang.y"
+  case 699: /* spirv_instruction_qualifier_id: IDENTIFIER EQUAL STRING_LITERAL  */
+#line 4447 "MachineIndependent/glslang.y"
                                       {
         (yyval.interm.spirvInst) = parseContext.makeSpirvInstruction((yyvsp[-1].lex).loc, *(yyvsp[-2].lex).string, *(yyvsp[0].lex).string);
     }
-#line 12923 "MachineIndependent/glslang_tab.cpp"
+#line 12450 "MachineIndependent/glslang_tab.cpp"
     break;
 
-  case 721: /* spirv_instruction_qualifier_id: IDENTIFIER EQUAL INTCONSTANT  */
-#line 4579 "MachineIndependent/glslang.y"
+  case 700: /* spirv_instruction_qualifier_id: IDENTIFIER EQUAL INTCONSTANT  */
+#line 4450 "MachineIndependent/glslang.y"
                                    {
         (yyval.interm.spirvInst) = parseContext.makeSpirvInstruction((yyvsp[-1].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[0].lex).i);
     }
-#line 12931 "MachineIndependent/glslang_tab.cpp"
+#line 12458 "MachineIndependent/glslang_tab.cpp"
     break;
 
 
-#line 12935 "MachineIndependent/glslang_tab.cpp"
+#line 12462 "MachineIndependent/glslang_tab.cpp"
 
       default: break;
     }
@@ -13155,5 +12682,5 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 4583 "MachineIndependent/glslang.y"
+#line 4454 "MachineIndependent/glslang.y"
 
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp.h b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp.h
index f90f704d..d6484924 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/glslang_tab.cpp.h
@@ -114,428 +114,408 @@ extern int yydebug;
     UTEXTURE2DARRAY = 315,         /* UTEXTURE2DARRAY  */
     ATTRIBUTE = 316,               /* ATTRIBUTE  */
     VARYING = 317,                 /* VARYING  */
-    FLOATE5M2_T = 318,             /* FLOATE5M2_T  */
-    FLOATE4M3_T = 319,             /* FLOATE4M3_T  */
-    BFLOAT16_T = 320,              /* BFLOAT16_T  */
-    FLOAT16_T = 321,               /* FLOAT16_T  */
-    FLOAT32_T = 322,               /* FLOAT32_T  */
-    DOUBLE = 323,                  /* DOUBLE  */
-    FLOAT64_T = 324,               /* FLOAT64_T  */
-    INT64_T = 325,                 /* INT64_T  */
-    UINT64_T = 326,                /* UINT64_T  */
-    INT32_T = 327,                 /* INT32_T  */
-    UINT32_T = 328,                /* UINT32_T  */
-    INT16_T = 329,                 /* INT16_T  */
-    UINT16_T = 330,                /* UINT16_T  */
-    INT8_T = 331,                  /* INT8_T  */
-    UINT8_T = 332,                 /* UINT8_T  */
-    I64VEC2 = 333,                 /* I64VEC2  */
-    I64VEC3 = 334,                 /* I64VEC3  */
-    I64VEC4 = 335,                 /* I64VEC4  */
-    U64VEC2 = 336,                 /* U64VEC2  */
-    U64VEC3 = 337,                 /* U64VEC3  */
-    U64VEC4 = 338,                 /* U64VEC4  */
-    I32VEC2 = 339,                 /* I32VEC2  */
-    I32VEC3 = 340,                 /* I32VEC3  */
-    I32VEC4 = 341,                 /* I32VEC4  */
-    U32VEC2 = 342,                 /* U32VEC2  */
-    U32VEC3 = 343,                 /* U32VEC3  */
-    U32VEC4 = 344,                 /* U32VEC4  */
-    I16VEC2 = 345,                 /* I16VEC2  */
-    I16VEC3 = 346,                 /* I16VEC3  */
-    I16VEC4 = 347,                 /* I16VEC4  */
-    U16VEC2 = 348,                 /* U16VEC2  */
-    U16VEC3 = 349,                 /* U16VEC3  */
-    U16VEC4 = 350,                 /* U16VEC4  */
-    I8VEC2 = 351,                  /* I8VEC2  */
-    I8VEC3 = 352,                  /* I8VEC3  */
-    I8VEC4 = 353,                  /* I8VEC4  */
-    U8VEC2 = 354,                  /* U8VEC2  */
-    U8VEC3 = 355,                  /* U8VEC3  */
-    U8VEC4 = 356,                  /* U8VEC4  */
-    DVEC2 = 357,                   /* DVEC2  */
-    DVEC3 = 358,                   /* DVEC3  */
-    DVEC4 = 359,                   /* DVEC4  */
-    DMAT2 = 360,                   /* DMAT2  */
-    DMAT3 = 361,                   /* DMAT3  */
-    DMAT4 = 362,                   /* DMAT4  */
-    BF16VEC2 = 363,                /* BF16VEC2  */
-    BF16VEC3 = 364,                /* BF16VEC3  */
-    BF16VEC4 = 365,                /* BF16VEC4  */
-    FE5M2VEC2 = 366,               /* FE5M2VEC2  */
-    FE5M2VEC3 = 367,               /* FE5M2VEC3  */
-    FE5M2VEC4 = 368,               /* FE5M2VEC4  */
-    FE4M3VEC2 = 369,               /* FE4M3VEC2  */
-    FE4M3VEC3 = 370,               /* FE4M3VEC3  */
-    FE4M3VEC4 = 371,               /* FE4M3VEC4  */
-    F16VEC2 = 372,                 /* F16VEC2  */
-    F16VEC3 = 373,                 /* F16VEC3  */
-    F16VEC4 = 374,                 /* F16VEC4  */
-    F16MAT2 = 375,                 /* F16MAT2  */
-    F16MAT3 = 376,                 /* F16MAT3  */
-    F16MAT4 = 377,                 /* F16MAT4  */
-    F32VEC2 = 378,                 /* F32VEC2  */
-    F32VEC3 = 379,                 /* F32VEC3  */
-    F32VEC4 = 380,                 /* F32VEC4  */
-    F32MAT2 = 381,                 /* F32MAT2  */
-    F32MAT3 = 382,                 /* F32MAT3  */
-    F32MAT4 = 383,                 /* F32MAT4  */
-    F64VEC2 = 384,                 /* F64VEC2  */
-    F64VEC3 = 385,                 /* F64VEC3  */
-    F64VEC4 = 386,                 /* F64VEC4  */
-    F64MAT2 = 387,                 /* F64MAT2  */
-    F64MAT3 = 388,                 /* F64MAT3  */
-    F64MAT4 = 389,                 /* F64MAT4  */
-    DMAT2X2 = 390,                 /* DMAT2X2  */
-    DMAT2X3 = 391,                 /* DMAT2X3  */
-    DMAT2X4 = 392,                 /* DMAT2X4  */
-    DMAT3X2 = 393,                 /* DMAT3X2  */
-    DMAT3X3 = 394,                 /* DMAT3X3  */
-    DMAT3X4 = 395,                 /* DMAT3X4  */
-    DMAT4X2 = 396,                 /* DMAT4X2  */
-    DMAT4X3 = 397,                 /* DMAT4X3  */
-    DMAT4X4 = 398,                 /* DMAT4X4  */
-    F16MAT2X2 = 399,               /* F16MAT2X2  */
-    F16MAT2X3 = 400,               /* F16MAT2X3  */
-    F16MAT2X4 = 401,               /* F16MAT2X4  */
-    F16MAT3X2 = 402,               /* F16MAT3X2  */
-    F16MAT3X3 = 403,               /* F16MAT3X3  */
-    F16MAT3X4 = 404,               /* F16MAT3X4  */
-    F16MAT4X2 = 405,               /* F16MAT4X2  */
-    F16MAT4X3 = 406,               /* F16MAT4X3  */
-    F16MAT4X4 = 407,               /* F16MAT4X4  */
-    F32MAT2X2 = 408,               /* F32MAT2X2  */
-    F32MAT2X3 = 409,               /* F32MAT2X3  */
-    F32MAT2X4 = 410,               /* F32MAT2X4  */
-    F32MAT3X2 = 411,               /* F32MAT3X2  */
-    F32MAT3X3 = 412,               /* F32MAT3X3  */
-    F32MAT3X4 = 413,               /* F32MAT3X4  */
-    F32MAT4X2 = 414,               /* F32MAT4X2  */
-    F32MAT4X3 = 415,               /* F32MAT4X3  */
-    F32MAT4X4 = 416,               /* F32MAT4X4  */
-    F64MAT2X2 = 417,               /* F64MAT2X2  */
-    F64MAT2X3 = 418,               /* F64MAT2X3  */
-    F64MAT2X4 = 419,               /* F64MAT2X4  */
-    F64MAT3X2 = 420,               /* F64MAT3X2  */
-    F64MAT3X3 = 421,               /* F64MAT3X3  */
-    F64MAT3X4 = 422,               /* F64MAT3X4  */
-    F64MAT4X2 = 423,               /* F64MAT4X2  */
-    F64MAT4X3 = 424,               /* F64MAT4X3  */
-    F64MAT4X4 = 425,               /* F64MAT4X4  */
-    ATOMIC_UINT = 426,             /* ATOMIC_UINT  */
-    ACCSTRUCTNV = 427,             /* ACCSTRUCTNV  */
-    ACCSTRUCTEXT = 428,            /* ACCSTRUCTEXT  */
-    RAYQUERYEXT = 429,             /* RAYQUERYEXT  */
-    FCOOPMATNV = 430,              /* FCOOPMATNV  */
-    ICOOPMATNV = 431,              /* ICOOPMATNV  */
-    UCOOPMATNV = 432,              /* UCOOPMATNV  */
-    COOPMAT = 433,                 /* COOPMAT  */
-    COOPVECNV = 434,               /* COOPVECNV  */
-    HITOBJECTNV = 435,             /* HITOBJECTNV  */
-    HITOBJECTATTRNV = 436,         /* HITOBJECTATTRNV  */
-    HITOBJECTEXT = 437,            /* HITOBJECTEXT  */
-    HITOBJECTATTREXT = 438,        /* HITOBJECTATTREXT  */
-    TENSORLAYOUTNV = 439,          /* TENSORLAYOUTNV  */
-    TENSORVIEWNV = 440,            /* TENSORVIEWNV  */
-    TENSORARM = 441,               /* TENSORARM  */
-    SAMPLERCUBEARRAY = 442,        /* SAMPLERCUBEARRAY  */
-    SAMPLERCUBEARRAYSHADOW = 443,  /* SAMPLERCUBEARRAYSHADOW  */
-    ISAMPLERCUBEARRAY = 444,       /* ISAMPLERCUBEARRAY  */
-    USAMPLERCUBEARRAY = 445,       /* USAMPLERCUBEARRAY  */
-    SAMPLER1D = 446,               /* SAMPLER1D  */
-    SAMPLER1DARRAY = 447,          /* SAMPLER1DARRAY  */
-    SAMPLER1DARRAYSHADOW = 448,    /* SAMPLER1DARRAYSHADOW  */
-    ISAMPLER1D = 449,              /* ISAMPLER1D  */
-    SAMPLER1DSHADOW = 450,         /* SAMPLER1DSHADOW  */
-    SAMPLER2DRECT = 451,           /* SAMPLER2DRECT  */
-    SAMPLER2DRECTSHADOW = 452,     /* SAMPLER2DRECTSHADOW  */
-    ISAMPLER2DRECT = 453,          /* ISAMPLER2DRECT  */
-    USAMPLER2DRECT = 454,          /* USAMPLER2DRECT  */
-    SAMPLERBUFFER = 455,           /* SAMPLERBUFFER  */
-    ISAMPLERBUFFER = 456,          /* ISAMPLERBUFFER  */
-    USAMPLERBUFFER = 457,          /* USAMPLERBUFFER  */
-    SAMPLER2DMS = 458,             /* SAMPLER2DMS  */
-    ISAMPLER2DMS = 459,            /* ISAMPLER2DMS  */
-    USAMPLER2DMS = 460,            /* USAMPLER2DMS  */
-    SAMPLER2DMSARRAY = 461,        /* SAMPLER2DMSARRAY  */
-    ISAMPLER2DMSARRAY = 462,       /* ISAMPLER2DMSARRAY  */
-    USAMPLER2DMSARRAY = 463,       /* USAMPLER2DMSARRAY  */
-    SAMPLEREXTERNALOES = 464,      /* SAMPLEREXTERNALOES  */
-    SAMPLEREXTERNAL2DY2YEXT = 465, /* SAMPLEREXTERNAL2DY2YEXT  */
-    ISAMPLER1DARRAY = 466,         /* ISAMPLER1DARRAY  */
-    USAMPLER1D = 467,              /* USAMPLER1D  */
-    USAMPLER1DARRAY = 468,         /* USAMPLER1DARRAY  */
-    F16SAMPLER1D = 469,            /* F16SAMPLER1D  */
-    F16SAMPLER2D = 470,            /* F16SAMPLER2D  */
-    F16SAMPLER3D = 471,            /* F16SAMPLER3D  */
-    F16SAMPLER2DRECT = 472,        /* F16SAMPLER2DRECT  */
-    F16SAMPLERCUBE = 473,          /* F16SAMPLERCUBE  */
-    F16SAMPLER1DARRAY = 474,       /* F16SAMPLER1DARRAY  */
-    F16SAMPLER2DARRAY = 475,       /* F16SAMPLER2DARRAY  */
-    F16SAMPLERCUBEARRAY = 476,     /* F16SAMPLERCUBEARRAY  */
-    F16SAMPLERBUFFER = 477,        /* F16SAMPLERBUFFER  */
-    F16SAMPLER2DMS = 478,          /* F16SAMPLER2DMS  */
-    F16SAMPLER2DMSARRAY = 479,     /* F16SAMPLER2DMSARRAY  */
-    F16SAMPLER1DSHADOW = 480,      /* F16SAMPLER1DSHADOW  */
-    F16SAMPLER2DSHADOW = 481,      /* F16SAMPLER2DSHADOW  */
-    F16SAMPLER1DARRAYSHADOW = 482, /* F16SAMPLER1DARRAYSHADOW  */
-    F16SAMPLER2DARRAYSHADOW = 483, /* F16SAMPLER2DARRAYSHADOW  */
-    F16SAMPLER2DRECTSHADOW = 484,  /* F16SAMPLER2DRECTSHADOW  */
-    F16SAMPLERCUBESHADOW = 485,    /* F16SAMPLERCUBESHADOW  */
-    F16SAMPLERCUBEARRAYSHADOW = 486, /* F16SAMPLERCUBEARRAYSHADOW  */
-    IMAGE1D = 487,                 /* IMAGE1D  */
-    IIMAGE1D = 488,                /* IIMAGE1D  */
-    UIMAGE1D = 489,                /* UIMAGE1D  */
-    IMAGE2D = 490,                 /* IMAGE2D  */
-    IIMAGE2D = 491,                /* IIMAGE2D  */
-    UIMAGE2D = 492,                /* UIMAGE2D  */
-    IMAGE3D = 493,                 /* IMAGE3D  */
-    IIMAGE3D = 494,                /* IIMAGE3D  */
-    UIMAGE3D = 495,                /* UIMAGE3D  */
-    IMAGE2DRECT = 496,             /* IMAGE2DRECT  */
-    IIMAGE2DRECT = 497,            /* IIMAGE2DRECT  */
-    UIMAGE2DRECT = 498,            /* UIMAGE2DRECT  */
-    IMAGECUBE = 499,               /* IMAGECUBE  */
-    IIMAGECUBE = 500,              /* IIMAGECUBE  */
-    UIMAGECUBE = 501,              /* UIMAGECUBE  */
-    IMAGEBUFFER = 502,             /* IMAGEBUFFER  */
-    IIMAGEBUFFER = 503,            /* IIMAGEBUFFER  */
-    UIMAGEBUFFER = 504,            /* UIMAGEBUFFER  */
-    IMAGE1DARRAY = 505,            /* IMAGE1DARRAY  */
-    IIMAGE1DARRAY = 506,           /* IIMAGE1DARRAY  */
-    UIMAGE1DARRAY = 507,           /* UIMAGE1DARRAY  */
-    IMAGE2DARRAY = 508,            /* IMAGE2DARRAY  */
-    IIMAGE2DARRAY = 509,           /* IIMAGE2DARRAY  */
-    UIMAGE2DARRAY = 510,           /* UIMAGE2DARRAY  */
-    IMAGECUBEARRAY = 511,          /* IMAGECUBEARRAY  */
-    IIMAGECUBEARRAY = 512,         /* IIMAGECUBEARRAY  */
-    UIMAGECUBEARRAY = 513,         /* UIMAGECUBEARRAY  */
-    IMAGE2DMS = 514,               /* IMAGE2DMS  */
-    IIMAGE2DMS = 515,              /* IIMAGE2DMS  */
-    UIMAGE2DMS = 516,              /* UIMAGE2DMS  */
-    IMAGE2DMSARRAY = 517,          /* IMAGE2DMSARRAY  */
-    IIMAGE2DMSARRAY = 518,         /* IIMAGE2DMSARRAY  */
-    UIMAGE2DMSARRAY = 519,         /* UIMAGE2DMSARRAY  */
-    F16IMAGE1D = 520,              /* F16IMAGE1D  */
-    F16IMAGE2D = 521,              /* F16IMAGE2D  */
-    F16IMAGE3D = 522,              /* F16IMAGE3D  */
-    F16IMAGE2DRECT = 523,          /* F16IMAGE2DRECT  */
-    F16IMAGECUBE = 524,            /* F16IMAGECUBE  */
-    F16IMAGE1DARRAY = 525,         /* F16IMAGE1DARRAY  */
-    F16IMAGE2DARRAY = 526,         /* F16IMAGE2DARRAY  */
-    F16IMAGECUBEARRAY = 527,       /* F16IMAGECUBEARRAY  */
-    F16IMAGEBUFFER = 528,          /* F16IMAGEBUFFER  */
-    F16IMAGE2DMS = 529,            /* F16IMAGE2DMS  */
-    F16IMAGE2DMSARRAY = 530,       /* F16IMAGE2DMSARRAY  */
-    I64IMAGE1D = 531,              /* I64IMAGE1D  */
-    U64IMAGE1D = 532,              /* U64IMAGE1D  */
-    I64IMAGE2D = 533,              /* I64IMAGE2D  */
-    U64IMAGE2D = 534,              /* U64IMAGE2D  */
-    I64IMAGE3D = 535,              /* I64IMAGE3D  */
-    U64IMAGE3D = 536,              /* U64IMAGE3D  */
-    I64IMAGE2DRECT = 537,          /* I64IMAGE2DRECT  */
-    U64IMAGE2DRECT = 538,          /* U64IMAGE2DRECT  */
-    I64IMAGECUBE = 539,            /* I64IMAGECUBE  */
-    U64IMAGECUBE = 540,            /* U64IMAGECUBE  */
-    I64IMAGEBUFFER = 541,          /* I64IMAGEBUFFER  */
-    U64IMAGEBUFFER = 542,          /* U64IMAGEBUFFER  */
-    I64IMAGE1DARRAY = 543,         /* I64IMAGE1DARRAY  */
-    U64IMAGE1DARRAY = 544,         /* U64IMAGE1DARRAY  */
-    I64IMAGE2DARRAY = 545,         /* I64IMAGE2DARRAY  */
-    U64IMAGE2DARRAY = 546,         /* U64IMAGE2DARRAY  */
-    I64IMAGECUBEARRAY = 547,       /* I64IMAGECUBEARRAY  */
-    U64IMAGECUBEARRAY = 548,       /* U64IMAGECUBEARRAY  */
-    I64IMAGE2DMS = 549,            /* I64IMAGE2DMS  */
-    U64IMAGE2DMS = 550,            /* U64IMAGE2DMS  */
-    I64IMAGE2DMSARRAY = 551,       /* I64IMAGE2DMSARRAY  */
-    U64IMAGE2DMSARRAY = 552,       /* U64IMAGE2DMSARRAY  */
-    TEXTURECUBEARRAY = 553,        /* TEXTURECUBEARRAY  */
-    ITEXTURECUBEARRAY = 554,       /* ITEXTURECUBEARRAY  */
-    UTEXTURECUBEARRAY = 555,       /* UTEXTURECUBEARRAY  */
-    TEXTURE1D = 556,               /* TEXTURE1D  */
-    ITEXTURE1D = 557,              /* ITEXTURE1D  */
-    UTEXTURE1D = 558,              /* UTEXTURE1D  */
-    TEXTURE1DARRAY = 559,          /* TEXTURE1DARRAY  */
-    ITEXTURE1DARRAY = 560,         /* ITEXTURE1DARRAY  */
-    UTEXTURE1DARRAY = 561,         /* UTEXTURE1DARRAY  */
-    TEXTURE2DRECT = 562,           /* TEXTURE2DRECT  */
-    ITEXTURE2DRECT = 563,          /* ITEXTURE2DRECT  */
-    UTEXTURE2DRECT = 564,          /* UTEXTURE2DRECT  */
-    TEXTUREBUFFER = 565,           /* TEXTUREBUFFER  */
-    ITEXTUREBUFFER = 566,          /* ITEXTUREBUFFER  */
-    UTEXTUREBUFFER = 567,          /* UTEXTUREBUFFER  */
-    TEXTURE2DMS = 568,             /* TEXTURE2DMS  */
-    ITEXTURE2DMS = 569,            /* ITEXTURE2DMS  */
-    UTEXTURE2DMS = 570,            /* UTEXTURE2DMS  */
-    TEXTURE2DMSARRAY = 571,        /* TEXTURE2DMSARRAY  */
-    ITEXTURE2DMSARRAY = 572,       /* ITEXTURE2DMSARRAY  */
-    UTEXTURE2DMSARRAY = 573,       /* UTEXTURE2DMSARRAY  */
-    F16TEXTURE1D = 574,            /* F16TEXTURE1D  */
-    F16TEXTURE2D = 575,            /* F16TEXTURE2D  */
-    F16TEXTURE3D = 576,            /* F16TEXTURE3D  */
-    F16TEXTURE2DRECT = 577,        /* F16TEXTURE2DRECT  */
-    F16TEXTURECUBE = 578,          /* F16TEXTURECUBE  */
-    F16TEXTURE1DARRAY = 579,       /* F16TEXTURE1DARRAY  */
-    F16TEXTURE2DARRAY = 580,       /* F16TEXTURE2DARRAY  */
-    F16TEXTURECUBEARRAY = 581,     /* F16TEXTURECUBEARRAY  */
-    F16TEXTUREBUFFER = 582,        /* F16TEXTUREBUFFER  */
-    F16TEXTURE2DMS = 583,          /* F16TEXTURE2DMS  */
-    F16TEXTURE2DMSARRAY = 584,     /* F16TEXTURE2DMSARRAY  */
-    SUBPASSINPUT = 585,            /* SUBPASSINPUT  */
-    SUBPASSINPUTMS = 586,          /* SUBPASSINPUTMS  */
-    ISUBPASSINPUT = 587,           /* ISUBPASSINPUT  */
-    ISUBPASSINPUTMS = 588,         /* ISUBPASSINPUTMS  */
-    USUBPASSINPUT = 589,           /* USUBPASSINPUT  */
-    USUBPASSINPUTMS = 590,         /* USUBPASSINPUTMS  */
-    F16SUBPASSINPUT = 591,         /* F16SUBPASSINPUT  */
-    F16SUBPASSINPUTMS = 592,       /* F16SUBPASSINPUTMS  */
-    SPIRV_INSTRUCTION = 593,       /* SPIRV_INSTRUCTION  */
-    SPIRV_EXECUTION_MODE = 594,    /* SPIRV_EXECUTION_MODE  */
-    SPIRV_EXECUTION_MODE_ID = 595, /* SPIRV_EXECUTION_MODE_ID  */
-    SPIRV_DECORATE = 596,          /* SPIRV_DECORATE  */
-    SPIRV_DECORATE_ID = 597,       /* SPIRV_DECORATE_ID  */
-    SPIRV_DECORATE_STRING = 598,   /* SPIRV_DECORATE_STRING  */
-    SPIRV_TYPE = 599,              /* SPIRV_TYPE  */
-    SPIRV_STORAGE_CLASS = 600,     /* SPIRV_STORAGE_CLASS  */
-    SPIRV_BY_REFERENCE = 601,      /* SPIRV_BY_REFERENCE  */
-    SPIRV_LITERAL = 602,           /* SPIRV_LITERAL  */
-    ATTACHMENTEXT = 603,           /* ATTACHMENTEXT  */
-    IATTACHMENTEXT = 604,          /* IATTACHMENTEXT  */
-    UATTACHMENTEXT = 605,          /* UATTACHMENTEXT  */
-    LEFT_OP = 606,                 /* LEFT_OP  */
-    RIGHT_OP = 607,                /* RIGHT_OP  */
-    INC_OP = 608,                  /* INC_OP  */
-    DEC_OP = 609,                  /* DEC_OP  */
-    LE_OP = 610,                   /* LE_OP  */
-    GE_OP = 611,                   /* GE_OP  */
-    EQ_OP = 612,                   /* EQ_OP  */
-    NE_OP = 613,                   /* NE_OP  */
-    AND_OP = 614,                  /* AND_OP  */
-    OR_OP = 615,                   /* OR_OP  */
-    XOR_OP = 616,                  /* XOR_OP  */
-    MUL_ASSIGN = 617,              /* MUL_ASSIGN  */
-    DIV_ASSIGN = 618,              /* DIV_ASSIGN  */
-    ADD_ASSIGN = 619,              /* ADD_ASSIGN  */
-    MOD_ASSIGN = 620,              /* MOD_ASSIGN  */
-    LEFT_ASSIGN = 621,             /* LEFT_ASSIGN  */
-    RIGHT_ASSIGN = 622,            /* RIGHT_ASSIGN  */
-    AND_ASSIGN = 623,              /* AND_ASSIGN  */
-    XOR_ASSIGN = 624,              /* XOR_ASSIGN  */
-    OR_ASSIGN = 625,               /* OR_ASSIGN  */
-    SUB_ASSIGN = 626,              /* SUB_ASSIGN  */
-    STRING_LITERAL = 627,          /* STRING_LITERAL  */
-    LEFT_PAREN = 628,              /* LEFT_PAREN  */
-    RIGHT_PAREN = 629,             /* RIGHT_PAREN  */
-    LEFT_BRACKET = 630,            /* LEFT_BRACKET  */
-    RIGHT_BRACKET = 631,           /* RIGHT_BRACKET  */
-    LEFT_BRACE = 632,              /* LEFT_BRACE  */
-    RIGHT_BRACE = 633,             /* RIGHT_BRACE  */
-    DOT = 634,                     /* DOT  */
-    COMMA = 635,                   /* COMMA  */
-    COLON = 636,                   /* COLON  */
-    EQUAL = 637,                   /* EQUAL  */
-    SEMICOLON = 638,               /* SEMICOLON  */
-    BANG = 639,                    /* BANG  */
-    DASH = 640,                    /* DASH  */
-    TILDE = 641,                   /* TILDE  */
-    PLUS = 642,                    /* PLUS  */
-    STAR = 643,                    /* STAR  */
-    SLASH = 644,                   /* SLASH  */
-    PERCENT = 645,                 /* PERCENT  */
-    LEFT_ANGLE = 646,              /* LEFT_ANGLE  */
-    RIGHT_ANGLE = 647,             /* RIGHT_ANGLE  */
-    VERTICAL_BAR = 648,            /* VERTICAL_BAR  */
-    CARET = 649,                   /* CARET  */
-    AMPERSAND = 650,               /* AMPERSAND  */
-    QUESTION = 651,                /* QUESTION  */
-    INVARIANT = 652,               /* INVARIANT  */
-    HIGH_PRECISION = 653,          /* HIGH_PRECISION  */
-    MEDIUM_PRECISION = 654,        /* MEDIUM_PRECISION  */
-    LOW_PRECISION = 655,           /* LOW_PRECISION  */
-    PRECISION = 656,               /* PRECISION  */
-    PACKED = 657,                  /* PACKED  */
-    RESOURCE = 658,                /* RESOURCE  */
-    SUPERP = 659,                  /* SUPERP  */
-    FLOATCONSTANT = 660,           /* FLOATCONSTANT  */
-    INTCONSTANT = 661,             /* INTCONSTANT  */
-    UINTCONSTANT = 662,            /* UINTCONSTANT  */
-    BOOLCONSTANT = 663,            /* BOOLCONSTANT  */
-    IDENTIFIER = 664,              /* IDENTIFIER  */
-    TYPE_NAME = 665,               /* TYPE_NAME  */
-    CENTROID = 666,                /* CENTROID  */
-    IN = 667,                      /* IN  */
-    OUT = 668,                     /* OUT  */
-    INOUT = 669,                   /* INOUT  */
-    STRUCT = 670,                  /* STRUCT  */
-    VOID = 671,                    /* VOID  */
-    WHILE = 672,                   /* WHILE  */
-    BREAK = 673,                   /* BREAK  */
-    CONTINUE = 674,                /* CONTINUE  */
-    DO = 675,                      /* DO  */
-    ELSE = 676,                    /* ELSE  */
-    FOR = 677,                     /* FOR  */
-    IF = 678,                      /* IF  */
-    DISCARD = 679,                 /* DISCARD  */
-    RETURN = 680,                  /* RETURN  */
-    SWITCH = 681,                  /* SWITCH  */
-    CASE = 682,                    /* CASE  */
-    DEFAULT = 683,                 /* DEFAULT  */
-    TERMINATE_INVOCATION = 684,    /* TERMINATE_INVOCATION  */
-    TERMINATE_RAY = 685,           /* TERMINATE_RAY  */
-    IGNORE_INTERSECTION = 686,     /* IGNORE_INTERSECTION  */
-    UNIFORM = 687,                 /* UNIFORM  */
-    SHARED = 688,                  /* SHARED  */
-    BUFFER = 689,                  /* BUFFER  */
-    TILEIMAGEEXT = 690,            /* TILEIMAGEEXT  */
-    FLAT = 691,                    /* FLAT  */
-    SMOOTH = 692,                  /* SMOOTH  */
-    LAYOUT = 693,                  /* LAYOUT  */
-    DOUBLECONSTANT = 694,          /* DOUBLECONSTANT  */
-    INT16CONSTANT = 695,           /* INT16CONSTANT  */
-    UINT16CONSTANT = 696,          /* UINT16CONSTANT  */
-    FLOAT16CONSTANT = 697,         /* FLOAT16CONSTANT  */
-    INT32CONSTANT = 698,           /* INT32CONSTANT  */
-    UINT32CONSTANT = 699,          /* UINT32CONSTANT  */
-    INT64CONSTANT = 700,           /* INT64CONSTANT  */
-    UINT64CONSTANT = 701,          /* UINT64CONSTANT  */
-    SUBROUTINE = 702,              /* SUBROUTINE  */
-    DEMOTE = 703,                  /* DEMOTE  */
-    FUNCTION = 704,                /* FUNCTION  */
-    PAYLOADNV = 705,               /* PAYLOADNV  */
-    PAYLOADINNV = 706,             /* PAYLOADINNV  */
-    HITATTRNV = 707,               /* HITATTRNV  */
-    CALLDATANV = 708,              /* CALLDATANV  */
-    CALLDATAINNV = 709,            /* CALLDATAINNV  */
-    PAYLOADEXT = 710,              /* PAYLOADEXT  */
-    PAYLOADINEXT = 711,            /* PAYLOADINEXT  */
-    HITATTREXT = 712,              /* HITATTREXT  */
-    CALLDATAEXT = 713,             /* CALLDATAEXT  */
-    CALLDATAINEXT = 714,           /* CALLDATAINEXT  */
-    PATCH = 715,                   /* PATCH  */
-    SAMPLE = 716,                  /* SAMPLE  */
-    NONUNIFORM = 717,              /* NONUNIFORM  */
-    COHERENT = 718,                /* COHERENT  */
-    VOLATILE = 719,                /* VOLATILE  */
-    RESTRICT = 720,                /* RESTRICT  */
-    READONLY = 721,                /* READONLY  */
-    WRITEONLY = 722,               /* WRITEONLY  */
-    NONTEMPORAL = 723,             /* NONTEMPORAL  */
-    DEVICECOHERENT = 724,          /* DEVICECOHERENT  */
-    QUEUEFAMILYCOHERENT = 725,     /* QUEUEFAMILYCOHERENT  */
-    WORKGROUPCOHERENT = 726,       /* WORKGROUPCOHERENT  */
-    SUBGROUPCOHERENT = 727,        /* SUBGROUPCOHERENT  */
-    NONPRIVATE = 728,              /* NONPRIVATE  */
-    SHADERCALLCOHERENT = 729,      /* SHADERCALLCOHERENT  */
-    NOPERSPECTIVE = 730,           /* NOPERSPECTIVE  */
-    EXPLICITINTERPAMD = 731,       /* EXPLICITINTERPAMD  */
-    PERVERTEXEXT = 732,            /* PERVERTEXEXT  */
-    PERVERTEXNV = 733,             /* PERVERTEXNV  */
-    PERPRIMITIVENV = 734,          /* PERPRIMITIVENV  */
-    PERVIEWNV = 735,               /* PERVIEWNV  */
-    PERTASKNV = 736,               /* PERTASKNV  */
-    PERPRIMITIVEEXT = 737,         /* PERPRIMITIVEEXT  */
-    TASKPAYLOADWORKGROUPEXT = 738, /* TASKPAYLOADWORKGROUPEXT  */
-    PRECISE = 739                  /* PRECISE  */
+    FLOAT16_T = 318,               /* FLOAT16_T  */
+    FLOAT32_T = 319,               /* FLOAT32_T  */
+    DOUBLE = 320,                  /* DOUBLE  */
+    FLOAT64_T = 321,               /* FLOAT64_T  */
+    INT64_T = 322,                 /* INT64_T  */
+    UINT64_T = 323,                /* UINT64_T  */
+    INT32_T = 324,                 /* INT32_T  */
+    UINT32_T = 325,                /* UINT32_T  */
+    INT16_T = 326,                 /* INT16_T  */
+    UINT16_T = 327,                /* UINT16_T  */
+    INT8_T = 328,                  /* INT8_T  */
+    UINT8_T = 329,                 /* UINT8_T  */
+    I64VEC2 = 330,                 /* I64VEC2  */
+    I64VEC3 = 331,                 /* I64VEC3  */
+    I64VEC4 = 332,                 /* I64VEC4  */
+    U64VEC2 = 333,                 /* U64VEC2  */
+    U64VEC3 = 334,                 /* U64VEC3  */
+    U64VEC4 = 335,                 /* U64VEC4  */
+    I32VEC2 = 336,                 /* I32VEC2  */
+    I32VEC3 = 337,                 /* I32VEC3  */
+    I32VEC4 = 338,                 /* I32VEC4  */
+    U32VEC2 = 339,                 /* U32VEC2  */
+    U32VEC3 = 340,                 /* U32VEC3  */
+    U32VEC4 = 341,                 /* U32VEC4  */
+    I16VEC2 = 342,                 /* I16VEC2  */
+    I16VEC3 = 343,                 /* I16VEC3  */
+    I16VEC4 = 344,                 /* I16VEC4  */
+    U16VEC2 = 345,                 /* U16VEC2  */
+    U16VEC3 = 346,                 /* U16VEC3  */
+    U16VEC4 = 347,                 /* U16VEC4  */
+    I8VEC2 = 348,                  /* I8VEC2  */
+    I8VEC3 = 349,                  /* I8VEC3  */
+    I8VEC4 = 350,                  /* I8VEC4  */
+    U8VEC2 = 351,                  /* U8VEC2  */
+    U8VEC3 = 352,                  /* U8VEC3  */
+    U8VEC4 = 353,                  /* U8VEC4  */
+    DVEC2 = 354,                   /* DVEC2  */
+    DVEC3 = 355,                   /* DVEC3  */
+    DVEC4 = 356,                   /* DVEC4  */
+    DMAT2 = 357,                   /* DMAT2  */
+    DMAT3 = 358,                   /* DMAT3  */
+    DMAT4 = 359,                   /* DMAT4  */
+    F16VEC2 = 360,                 /* F16VEC2  */
+    F16VEC3 = 361,                 /* F16VEC3  */
+    F16VEC4 = 362,                 /* F16VEC4  */
+    F16MAT2 = 363,                 /* F16MAT2  */
+    F16MAT3 = 364,                 /* F16MAT3  */
+    F16MAT4 = 365,                 /* F16MAT4  */
+    F32VEC2 = 366,                 /* F32VEC2  */
+    F32VEC3 = 367,                 /* F32VEC3  */
+    F32VEC4 = 368,                 /* F32VEC4  */
+    F32MAT2 = 369,                 /* F32MAT2  */
+    F32MAT3 = 370,                 /* F32MAT3  */
+    F32MAT4 = 371,                 /* F32MAT4  */
+    F64VEC2 = 372,                 /* F64VEC2  */
+    F64VEC3 = 373,                 /* F64VEC3  */
+    F64VEC4 = 374,                 /* F64VEC4  */
+    F64MAT2 = 375,                 /* F64MAT2  */
+    F64MAT3 = 376,                 /* F64MAT3  */
+    F64MAT4 = 377,                 /* F64MAT4  */
+    DMAT2X2 = 378,                 /* DMAT2X2  */
+    DMAT2X3 = 379,                 /* DMAT2X3  */
+    DMAT2X4 = 380,                 /* DMAT2X4  */
+    DMAT3X2 = 381,                 /* DMAT3X2  */
+    DMAT3X3 = 382,                 /* DMAT3X3  */
+    DMAT3X4 = 383,                 /* DMAT3X4  */
+    DMAT4X2 = 384,                 /* DMAT4X2  */
+    DMAT4X3 = 385,                 /* DMAT4X3  */
+    DMAT4X4 = 386,                 /* DMAT4X4  */
+    F16MAT2X2 = 387,               /* F16MAT2X2  */
+    F16MAT2X3 = 388,               /* F16MAT2X3  */
+    F16MAT2X4 = 389,               /* F16MAT2X4  */
+    F16MAT3X2 = 390,               /* F16MAT3X2  */
+    F16MAT3X3 = 391,               /* F16MAT3X3  */
+    F16MAT3X4 = 392,               /* F16MAT3X4  */
+    F16MAT4X2 = 393,               /* F16MAT4X2  */
+    F16MAT4X3 = 394,               /* F16MAT4X3  */
+    F16MAT4X4 = 395,               /* F16MAT4X4  */
+    F32MAT2X2 = 396,               /* F32MAT2X2  */
+    F32MAT2X3 = 397,               /* F32MAT2X3  */
+    F32MAT2X4 = 398,               /* F32MAT2X4  */
+    F32MAT3X2 = 399,               /* F32MAT3X2  */
+    F32MAT3X3 = 400,               /* F32MAT3X3  */
+    F32MAT3X4 = 401,               /* F32MAT3X4  */
+    F32MAT4X2 = 402,               /* F32MAT4X2  */
+    F32MAT4X3 = 403,               /* F32MAT4X3  */
+    F32MAT4X4 = 404,               /* F32MAT4X4  */
+    F64MAT2X2 = 405,               /* F64MAT2X2  */
+    F64MAT2X3 = 406,               /* F64MAT2X3  */
+    F64MAT2X4 = 407,               /* F64MAT2X4  */
+    F64MAT3X2 = 408,               /* F64MAT3X2  */
+    F64MAT3X3 = 409,               /* F64MAT3X3  */
+    F64MAT3X4 = 410,               /* F64MAT3X4  */
+    F64MAT4X2 = 411,               /* F64MAT4X2  */
+    F64MAT4X3 = 412,               /* F64MAT4X3  */
+    F64MAT4X4 = 413,               /* F64MAT4X4  */
+    ATOMIC_UINT = 414,             /* ATOMIC_UINT  */
+    ACCSTRUCTNV = 415,             /* ACCSTRUCTNV  */
+    ACCSTRUCTEXT = 416,            /* ACCSTRUCTEXT  */
+    RAYQUERYEXT = 417,             /* RAYQUERYEXT  */
+    FCOOPMATNV = 418,              /* FCOOPMATNV  */
+    ICOOPMATNV = 419,              /* ICOOPMATNV  */
+    UCOOPMATNV = 420,              /* UCOOPMATNV  */
+    COOPMAT = 421,                 /* COOPMAT  */
+    HITOBJECTNV = 422,             /* HITOBJECTNV  */
+    HITOBJECTATTRNV = 423,         /* HITOBJECTATTRNV  */
+    SAMPLERCUBEARRAY = 424,        /* SAMPLERCUBEARRAY  */
+    SAMPLERCUBEARRAYSHADOW = 425,  /* SAMPLERCUBEARRAYSHADOW  */
+    ISAMPLERCUBEARRAY = 426,       /* ISAMPLERCUBEARRAY  */
+    USAMPLERCUBEARRAY = 427,       /* USAMPLERCUBEARRAY  */
+    SAMPLER1D = 428,               /* SAMPLER1D  */
+    SAMPLER1DARRAY = 429,          /* SAMPLER1DARRAY  */
+    SAMPLER1DARRAYSHADOW = 430,    /* SAMPLER1DARRAYSHADOW  */
+    ISAMPLER1D = 431,              /* ISAMPLER1D  */
+    SAMPLER1DSHADOW = 432,         /* SAMPLER1DSHADOW  */
+    SAMPLER2DRECT = 433,           /* SAMPLER2DRECT  */
+    SAMPLER2DRECTSHADOW = 434,     /* SAMPLER2DRECTSHADOW  */
+    ISAMPLER2DRECT = 435,          /* ISAMPLER2DRECT  */
+    USAMPLER2DRECT = 436,          /* USAMPLER2DRECT  */
+    SAMPLERBUFFER = 437,           /* SAMPLERBUFFER  */
+    ISAMPLERBUFFER = 438,          /* ISAMPLERBUFFER  */
+    USAMPLERBUFFER = 439,          /* USAMPLERBUFFER  */
+    SAMPLER2DMS = 440,             /* SAMPLER2DMS  */
+    ISAMPLER2DMS = 441,            /* ISAMPLER2DMS  */
+    USAMPLER2DMS = 442,            /* USAMPLER2DMS  */
+    SAMPLER2DMSARRAY = 443,        /* SAMPLER2DMSARRAY  */
+    ISAMPLER2DMSARRAY = 444,       /* ISAMPLER2DMSARRAY  */
+    USAMPLER2DMSARRAY = 445,       /* USAMPLER2DMSARRAY  */
+    SAMPLEREXTERNALOES = 446,      /* SAMPLEREXTERNALOES  */
+    SAMPLEREXTERNAL2DY2YEXT = 447, /* SAMPLEREXTERNAL2DY2YEXT  */
+    ISAMPLER1DARRAY = 448,         /* ISAMPLER1DARRAY  */
+    USAMPLER1D = 449,              /* USAMPLER1D  */
+    USAMPLER1DARRAY = 450,         /* USAMPLER1DARRAY  */
+    F16SAMPLER1D = 451,            /* F16SAMPLER1D  */
+    F16SAMPLER2D = 452,            /* F16SAMPLER2D  */
+    F16SAMPLER3D = 453,            /* F16SAMPLER3D  */
+    F16SAMPLER2DRECT = 454,        /* F16SAMPLER2DRECT  */
+    F16SAMPLERCUBE = 455,          /* F16SAMPLERCUBE  */
+    F16SAMPLER1DARRAY = 456,       /* F16SAMPLER1DARRAY  */
+    F16SAMPLER2DARRAY = 457,       /* F16SAMPLER2DARRAY  */
+    F16SAMPLERCUBEARRAY = 458,     /* F16SAMPLERCUBEARRAY  */
+    F16SAMPLERBUFFER = 459,        /* F16SAMPLERBUFFER  */
+    F16SAMPLER2DMS = 460,          /* F16SAMPLER2DMS  */
+    F16SAMPLER2DMSARRAY = 461,     /* F16SAMPLER2DMSARRAY  */
+    F16SAMPLER1DSHADOW = 462,      /* F16SAMPLER1DSHADOW  */
+    F16SAMPLER2DSHADOW = 463,      /* F16SAMPLER2DSHADOW  */
+    F16SAMPLER1DARRAYSHADOW = 464, /* F16SAMPLER1DARRAYSHADOW  */
+    F16SAMPLER2DARRAYSHADOW = 465, /* F16SAMPLER2DARRAYSHADOW  */
+    F16SAMPLER2DRECTSHADOW = 466,  /* F16SAMPLER2DRECTSHADOW  */
+    F16SAMPLERCUBESHADOW = 467,    /* F16SAMPLERCUBESHADOW  */
+    F16SAMPLERCUBEARRAYSHADOW = 468, /* F16SAMPLERCUBEARRAYSHADOW  */
+    IMAGE1D = 469,                 /* IMAGE1D  */
+    IIMAGE1D = 470,                /* IIMAGE1D  */
+    UIMAGE1D = 471,                /* UIMAGE1D  */
+    IMAGE2D = 472,                 /* IMAGE2D  */
+    IIMAGE2D = 473,                /* IIMAGE2D  */
+    UIMAGE2D = 474,                /* UIMAGE2D  */
+    IMAGE3D = 475,                 /* IMAGE3D  */
+    IIMAGE3D = 476,                /* IIMAGE3D  */
+    UIMAGE3D = 477,                /* UIMAGE3D  */
+    IMAGE2DRECT = 478,             /* IMAGE2DRECT  */
+    IIMAGE2DRECT = 479,            /* IIMAGE2DRECT  */
+    UIMAGE2DRECT = 480,            /* UIMAGE2DRECT  */
+    IMAGECUBE = 481,               /* IMAGECUBE  */
+    IIMAGECUBE = 482,              /* IIMAGECUBE  */
+    UIMAGECUBE = 483,              /* UIMAGECUBE  */
+    IMAGEBUFFER = 484,             /* IMAGEBUFFER  */
+    IIMAGEBUFFER = 485,            /* IIMAGEBUFFER  */
+    UIMAGEBUFFER = 486,            /* UIMAGEBUFFER  */
+    IMAGE1DARRAY = 487,            /* IMAGE1DARRAY  */
+    IIMAGE1DARRAY = 488,           /* IIMAGE1DARRAY  */
+    UIMAGE1DARRAY = 489,           /* UIMAGE1DARRAY  */
+    IMAGE2DARRAY = 490,            /* IMAGE2DARRAY  */
+    IIMAGE2DARRAY = 491,           /* IIMAGE2DARRAY  */
+    UIMAGE2DARRAY = 492,           /* UIMAGE2DARRAY  */
+    IMAGECUBEARRAY = 493,          /* IMAGECUBEARRAY  */
+    IIMAGECUBEARRAY = 494,         /* IIMAGECUBEARRAY  */
+    UIMAGECUBEARRAY = 495,         /* UIMAGECUBEARRAY  */
+    IMAGE2DMS = 496,               /* IMAGE2DMS  */
+    IIMAGE2DMS = 497,              /* IIMAGE2DMS  */
+    UIMAGE2DMS = 498,              /* UIMAGE2DMS  */
+    IMAGE2DMSARRAY = 499,          /* IMAGE2DMSARRAY  */
+    IIMAGE2DMSARRAY = 500,         /* IIMAGE2DMSARRAY  */
+    UIMAGE2DMSARRAY = 501,         /* UIMAGE2DMSARRAY  */
+    F16IMAGE1D = 502,              /* F16IMAGE1D  */
+    F16IMAGE2D = 503,              /* F16IMAGE2D  */
+    F16IMAGE3D = 504,              /* F16IMAGE3D  */
+    F16IMAGE2DRECT = 505,          /* F16IMAGE2DRECT  */
+    F16IMAGECUBE = 506,            /* F16IMAGECUBE  */
+    F16IMAGE1DARRAY = 507,         /* F16IMAGE1DARRAY  */
+    F16IMAGE2DARRAY = 508,         /* F16IMAGE2DARRAY  */
+    F16IMAGECUBEARRAY = 509,       /* F16IMAGECUBEARRAY  */
+    F16IMAGEBUFFER = 510,          /* F16IMAGEBUFFER  */
+    F16IMAGE2DMS = 511,            /* F16IMAGE2DMS  */
+    F16IMAGE2DMSARRAY = 512,       /* F16IMAGE2DMSARRAY  */
+    I64IMAGE1D = 513,              /* I64IMAGE1D  */
+    U64IMAGE1D = 514,              /* U64IMAGE1D  */
+    I64IMAGE2D = 515,              /* I64IMAGE2D  */
+    U64IMAGE2D = 516,              /* U64IMAGE2D  */
+    I64IMAGE3D = 517,              /* I64IMAGE3D  */
+    U64IMAGE3D = 518,              /* U64IMAGE3D  */
+    I64IMAGE2DRECT = 519,          /* I64IMAGE2DRECT  */
+    U64IMAGE2DRECT = 520,          /* U64IMAGE2DRECT  */
+    I64IMAGECUBE = 521,            /* I64IMAGECUBE  */
+    U64IMAGECUBE = 522,            /* U64IMAGECUBE  */
+    I64IMAGEBUFFER = 523,          /* I64IMAGEBUFFER  */
+    U64IMAGEBUFFER = 524,          /* U64IMAGEBUFFER  */
+    I64IMAGE1DARRAY = 525,         /* I64IMAGE1DARRAY  */
+    U64IMAGE1DARRAY = 526,         /* U64IMAGE1DARRAY  */
+    I64IMAGE2DARRAY = 527,         /* I64IMAGE2DARRAY  */
+    U64IMAGE2DARRAY = 528,         /* U64IMAGE2DARRAY  */
+    I64IMAGECUBEARRAY = 529,       /* I64IMAGECUBEARRAY  */
+    U64IMAGECUBEARRAY = 530,       /* U64IMAGECUBEARRAY  */
+    I64IMAGE2DMS = 531,            /* I64IMAGE2DMS  */
+    U64IMAGE2DMS = 532,            /* U64IMAGE2DMS  */
+    I64IMAGE2DMSARRAY = 533,       /* I64IMAGE2DMSARRAY  */
+    U64IMAGE2DMSARRAY = 534,       /* U64IMAGE2DMSARRAY  */
+    TEXTURECUBEARRAY = 535,        /* TEXTURECUBEARRAY  */
+    ITEXTURECUBEARRAY = 536,       /* ITEXTURECUBEARRAY  */
+    UTEXTURECUBEARRAY = 537,       /* UTEXTURECUBEARRAY  */
+    TEXTURE1D = 538,               /* TEXTURE1D  */
+    ITEXTURE1D = 539,              /* ITEXTURE1D  */
+    UTEXTURE1D = 540,              /* UTEXTURE1D  */
+    TEXTURE1DARRAY = 541,          /* TEXTURE1DARRAY  */
+    ITEXTURE1DARRAY = 542,         /* ITEXTURE1DARRAY  */
+    UTEXTURE1DARRAY = 543,         /* UTEXTURE1DARRAY  */
+    TEXTURE2DRECT = 544,           /* TEXTURE2DRECT  */
+    ITEXTURE2DRECT = 545,          /* ITEXTURE2DRECT  */
+    UTEXTURE2DRECT = 546,          /* UTEXTURE2DRECT  */
+    TEXTUREBUFFER = 547,           /* TEXTUREBUFFER  */
+    ITEXTUREBUFFER = 548,          /* ITEXTUREBUFFER  */
+    UTEXTUREBUFFER = 549,          /* UTEXTUREBUFFER  */
+    TEXTURE2DMS = 550,             /* TEXTURE2DMS  */
+    ITEXTURE2DMS = 551,            /* ITEXTURE2DMS  */
+    UTEXTURE2DMS = 552,            /* UTEXTURE2DMS  */
+    TEXTURE2DMSARRAY = 553,        /* TEXTURE2DMSARRAY  */
+    ITEXTURE2DMSARRAY = 554,       /* ITEXTURE2DMSARRAY  */
+    UTEXTURE2DMSARRAY = 555,       /* UTEXTURE2DMSARRAY  */
+    F16TEXTURE1D = 556,            /* F16TEXTURE1D  */
+    F16TEXTURE2D = 557,            /* F16TEXTURE2D  */
+    F16TEXTURE3D = 558,            /* F16TEXTURE3D  */
+    F16TEXTURE2DRECT = 559,        /* F16TEXTURE2DRECT  */
+    F16TEXTURECUBE = 560,          /* F16TEXTURECUBE  */
+    F16TEXTURE1DARRAY = 561,       /* F16TEXTURE1DARRAY  */
+    F16TEXTURE2DARRAY = 562,       /* F16TEXTURE2DARRAY  */
+    F16TEXTURECUBEARRAY = 563,     /* F16TEXTURECUBEARRAY  */
+    F16TEXTUREBUFFER = 564,        /* F16TEXTUREBUFFER  */
+    F16TEXTURE2DMS = 565,          /* F16TEXTURE2DMS  */
+    F16TEXTURE2DMSARRAY = 566,     /* F16TEXTURE2DMSARRAY  */
+    SUBPASSINPUT = 567,            /* SUBPASSINPUT  */
+    SUBPASSINPUTMS = 568,          /* SUBPASSINPUTMS  */
+    ISUBPASSINPUT = 569,           /* ISUBPASSINPUT  */
+    ISUBPASSINPUTMS = 570,         /* ISUBPASSINPUTMS  */
+    USUBPASSINPUT = 571,           /* USUBPASSINPUT  */
+    USUBPASSINPUTMS = 572,         /* USUBPASSINPUTMS  */
+    F16SUBPASSINPUT = 573,         /* F16SUBPASSINPUT  */
+    F16SUBPASSINPUTMS = 574,       /* F16SUBPASSINPUTMS  */
+    SPIRV_INSTRUCTION = 575,       /* SPIRV_INSTRUCTION  */
+    SPIRV_EXECUTION_MODE = 576,    /* SPIRV_EXECUTION_MODE  */
+    SPIRV_EXECUTION_MODE_ID = 577, /* SPIRV_EXECUTION_MODE_ID  */
+    SPIRV_DECORATE = 578,          /* SPIRV_DECORATE  */
+    SPIRV_DECORATE_ID = 579,       /* SPIRV_DECORATE_ID  */
+    SPIRV_DECORATE_STRING = 580,   /* SPIRV_DECORATE_STRING  */
+    SPIRV_TYPE = 581,              /* SPIRV_TYPE  */
+    SPIRV_STORAGE_CLASS = 582,     /* SPIRV_STORAGE_CLASS  */
+    SPIRV_BY_REFERENCE = 583,      /* SPIRV_BY_REFERENCE  */
+    SPIRV_LITERAL = 584,           /* SPIRV_LITERAL  */
+    ATTACHMENTEXT = 585,           /* ATTACHMENTEXT  */
+    IATTACHMENTEXT = 586,          /* IATTACHMENTEXT  */
+    UATTACHMENTEXT = 587,          /* UATTACHMENTEXT  */
+    LEFT_OP = 588,                 /* LEFT_OP  */
+    RIGHT_OP = 589,                /* RIGHT_OP  */
+    INC_OP = 590,                  /* INC_OP  */
+    DEC_OP = 591,                  /* DEC_OP  */
+    LE_OP = 592,                   /* LE_OP  */
+    GE_OP = 593,                   /* GE_OP  */
+    EQ_OP = 594,                   /* EQ_OP  */
+    NE_OP = 595,                   /* NE_OP  */
+    AND_OP = 596,                  /* AND_OP  */
+    OR_OP = 597,                   /* OR_OP  */
+    XOR_OP = 598,                  /* XOR_OP  */
+    MUL_ASSIGN = 599,              /* MUL_ASSIGN  */
+    DIV_ASSIGN = 600,              /* DIV_ASSIGN  */
+    ADD_ASSIGN = 601,              /* ADD_ASSIGN  */
+    MOD_ASSIGN = 602,              /* MOD_ASSIGN  */
+    LEFT_ASSIGN = 603,             /* LEFT_ASSIGN  */
+    RIGHT_ASSIGN = 604,            /* RIGHT_ASSIGN  */
+    AND_ASSIGN = 605,              /* AND_ASSIGN  */
+    XOR_ASSIGN = 606,              /* XOR_ASSIGN  */
+    OR_ASSIGN = 607,               /* OR_ASSIGN  */
+    SUB_ASSIGN = 608,              /* SUB_ASSIGN  */
+    STRING_LITERAL = 609,          /* STRING_LITERAL  */
+    LEFT_PAREN = 610,              /* LEFT_PAREN  */
+    RIGHT_PAREN = 611,             /* RIGHT_PAREN  */
+    LEFT_BRACKET = 612,            /* LEFT_BRACKET  */
+    RIGHT_BRACKET = 613,           /* RIGHT_BRACKET  */
+    LEFT_BRACE = 614,              /* LEFT_BRACE  */
+    RIGHT_BRACE = 615,             /* RIGHT_BRACE  */
+    DOT = 616,                     /* DOT  */
+    COMMA = 617,                   /* COMMA  */
+    COLON = 618,                   /* COLON  */
+    EQUAL = 619,                   /* EQUAL  */
+    SEMICOLON = 620,               /* SEMICOLON  */
+    BANG = 621,                    /* BANG  */
+    DASH = 622,                    /* DASH  */
+    TILDE = 623,                   /* TILDE  */
+    PLUS = 624,                    /* PLUS  */
+    STAR = 625,                    /* STAR  */
+    SLASH = 626,                   /* SLASH  */
+    PERCENT = 627,                 /* PERCENT  */
+    LEFT_ANGLE = 628,              /* LEFT_ANGLE  */
+    RIGHT_ANGLE = 629,             /* RIGHT_ANGLE  */
+    VERTICAL_BAR = 630,            /* VERTICAL_BAR  */
+    CARET = 631,                   /* CARET  */
+    AMPERSAND = 632,               /* AMPERSAND  */
+    QUESTION = 633,                /* QUESTION  */
+    INVARIANT = 634,               /* INVARIANT  */
+    HIGH_PRECISION = 635,          /* HIGH_PRECISION  */
+    MEDIUM_PRECISION = 636,        /* MEDIUM_PRECISION  */
+    LOW_PRECISION = 637,           /* LOW_PRECISION  */
+    PRECISION = 638,               /* PRECISION  */
+    PACKED = 639,                  /* PACKED  */
+    RESOURCE = 640,                /* RESOURCE  */
+    SUPERP = 641,                  /* SUPERP  */
+    FLOATCONSTANT = 642,           /* FLOATCONSTANT  */
+    INTCONSTANT = 643,             /* INTCONSTANT  */
+    UINTCONSTANT = 644,            /* UINTCONSTANT  */
+    BOOLCONSTANT = 645,            /* BOOLCONSTANT  */
+    IDENTIFIER = 646,              /* IDENTIFIER  */
+    TYPE_NAME = 647,               /* TYPE_NAME  */
+    CENTROID = 648,                /* CENTROID  */
+    IN = 649,                      /* IN  */
+    OUT = 650,                     /* OUT  */
+    INOUT = 651,                   /* INOUT  */
+    STRUCT = 652,                  /* STRUCT  */
+    VOID = 653,                    /* VOID  */
+    WHILE = 654,                   /* WHILE  */
+    BREAK = 655,                   /* BREAK  */
+    CONTINUE = 656,                /* CONTINUE  */
+    DO = 657,                      /* DO  */
+    ELSE = 658,                    /* ELSE  */
+    FOR = 659,                     /* FOR  */
+    IF = 660,                      /* IF  */
+    DISCARD = 661,                 /* DISCARD  */
+    RETURN = 662,                  /* RETURN  */
+    SWITCH = 663,                  /* SWITCH  */
+    CASE = 664,                    /* CASE  */
+    DEFAULT = 665,                 /* DEFAULT  */
+    TERMINATE_INVOCATION = 666,    /* TERMINATE_INVOCATION  */
+    TERMINATE_RAY = 667,           /* TERMINATE_RAY  */
+    IGNORE_INTERSECTION = 668,     /* IGNORE_INTERSECTION  */
+    UNIFORM = 669,                 /* UNIFORM  */
+    SHARED = 670,                  /* SHARED  */
+    BUFFER = 671,                  /* BUFFER  */
+    TILEIMAGEEXT = 672,            /* TILEIMAGEEXT  */
+    FLAT = 673,                    /* FLAT  */
+    SMOOTH = 674,                  /* SMOOTH  */
+    LAYOUT = 675,                  /* LAYOUT  */
+    DOUBLECONSTANT = 676,          /* DOUBLECONSTANT  */
+    INT16CONSTANT = 677,           /* INT16CONSTANT  */
+    UINT16CONSTANT = 678,          /* UINT16CONSTANT  */
+    FLOAT16CONSTANT = 679,         /* FLOAT16CONSTANT  */
+    INT32CONSTANT = 680,           /* INT32CONSTANT  */
+    UINT32CONSTANT = 681,          /* UINT32CONSTANT  */
+    INT64CONSTANT = 682,           /* INT64CONSTANT  */
+    UINT64CONSTANT = 683,          /* UINT64CONSTANT  */
+    SUBROUTINE = 684,              /* SUBROUTINE  */
+    DEMOTE = 685,                  /* DEMOTE  */
+    PAYLOADNV = 686,               /* PAYLOADNV  */
+    PAYLOADINNV = 687,             /* PAYLOADINNV  */
+    HITATTRNV = 688,               /* HITATTRNV  */
+    CALLDATANV = 689,              /* CALLDATANV  */
+    CALLDATAINNV = 690,            /* CALLDATAINNV  */
+    PAYLOADEXT = 691,              /* PAYLOADEXT  */
+    PAYLOADINEXT = 692,            /* PAYLOADINEXT  */
+    HITATTREXT = 693,              /* HITATTREXT  */
+    CALLDATAEXT = 694,             /* CALLDATAEXT  */
+    CALLDATAINEXT = 695,           /* CALLDATAINEXT  */
+    PATCH = 696,                   /* PATCH  */
+    SAMPLE = 697,                  /* SAMPLE  */
+    NONUNIFORM = 698,              /* NONUNIFORM  */
+    COHERENT = 699,                /* COHERENT  */
+    VOLATILE = 700,                /* VOLATILE  */
+    RESTRICT = 701,                /* RESTRICT  */
+    READONLY = 702,                /* READONLY  */
+    WRITEONLY = 703,               /* WRITEONLY  */
+    DEVICECOHERENT = 704,          /* DEVICECOHERENT  */
+    QUEUEFAMILYCOHERENT = 705,     /* QUEUEFAMILYCOHERENT  */
+    WORKGROUPCOHERENT = 706,       /* WORKGROUPCOHERENT  */
+    SUBGROUPCOHERENT = 707,        /* SUBGROUPCOHERENT  */
+    NONPRIVATE = 708,              /* NONPRIVATE  */
+    SHADERCALLCOHERENT = 709,      /* SHADERCALLCOHERENT  */
+    NOPERSPECTIVE = 710,           /* NOPERSPECTIVE  */
+    EXPLICITINTERPAMD = 711,       /* EXPLICITINTERPAMD  */
+    PERVERTEXEXT = 712,            /* PERVERTEXEXT  */
+    PERVERTEXNV = 713,             /* PERVERTEXNV  */
+    PERPRIMITIVENV = 714,          /* PERPRIMITIVENV  */
+    PERVIEWNV = 715,               /* PERVIEWNV  */
+    PERTASKNV = 716,               /* PERTASKNV  */
+    PERPRIMITIVEEXT = 717,         /* PERPRIMITIVEEXT  */
+    TASKPAYLOADWORKGROUPEXT = 718, /* TASKPAYLOADWORKGROUPEXT  */
+    PRECISE = 719                  /* PRECISE  */
   };
   typedef enum yytokentype yytoken_kind_t;
 #endif
@@ -583,7 +563,7 @@ union YYSTYPE
         glslang::TTypeParameters* typeParameters;
     } interm;
 
-#line 587 "MachineIndependent/glslang_tab.cpp.h"
+#line 567 "MachineIndependent/glslang_tab.cpp.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/intermOut.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/intermOut.cpp
index 572652d9..f0621bd9 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/intermOut.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/intermOut.cpp
@@ -81,7 +81,6 @@ public:
     virtual bool visitLoop(TVisit, TIntermLoop* node);
     virtual bool visitBranch(TVisit, TIntermBranch* node);
     virtual bool visitSwitch(TVisit, TIntermSwitch* node);
-    virtual bool visitVariableDecl(TVisit, TIntermVariableDecl* node);
 
     TInfoSink& infoSink;
 protected:
@@ -205,13 +204,6 @@ bool TOutputTraverser::visitUnary(TVisit /* visit */, TIntermUnary* node)
 
     OutputTreeText(out, node, depth);
 
-    if (IsOpNumericConv(node->getAsOperator()->getOp())) {
-        out.debug << "Convert " << TType::getBasicString(node->getOperand()->getType().getBasicType()) << " to " << TType::getBasicString(node->getType().getBasicType());
-        out.debug << " (" << node->getCompleteString() << ")";
-        out.debug << "\n";
-        return true;
-    }
-
     switch (node->getOp()) {
     case EOpNegative:       out.debug << "Negate value";         break;
     case EOpVectorLogicalNot:
@@ -224,6 +216,192 @@ bool TOutputTraverser::visitUnary(TVisit /* visit */, TIntermUnary* node)
     case EOpPreDecrement:   out.debug << "Pre-Decrement";        break;
     case EOpCopyObject:     out.debug << "copy object";          break;
 
+    // * -> bool
+    case EOpConvInt8ToBool:    out.debug << "Convert int8_t to bool";  break;
+    case EOpConvUint8ToBool:   out.debug << "Convert uint8_t to bool"; break;
+    case EOpConvInt16ToBool:   out.debug << "Convert int16_t to bool"; break;
+    case EOpConvUint16ToBool:  out.debug << "Convert uint16_t to bool";break;
+    case EOpConvIntToBool:     out.debug << "Convert int to bool";     break;
+    case EOpConvUintToBool:    out.debug << "Convert uint to bool";    break;
+    case EOpConvInt64ToBool:   out.debug << "Convert int64 to bool";   break;
+    case EOpConvUint64ToBool:  out.debug << "Convert uint64 to bool";  break;
+    case EOpConvFloat16ToBool: out.debug << "Convert float16_t to bool";   break;
+    case EOpConvFloatToBool:   out.debug << "Convert float to bool";   break;
+    case EOpConvDoubleToBool:  out.debug << "Convert double to bool";  break;
+
+    // bool -> *
+    case EOpConvBoolToInt8:    out.debug << "Convert bool to int8_t";  break;
+    case EOpConvBoolToUint8:   out.debug << "Convert bool to uint8_t"; break;
+    case EOpConvBoolToInt16:   out.debug << "Convert bool to in16t_t"; break;
+    case EOpConvBoolToUint16:  out.debug << "Convert bool to uint16_t";break;
+    case EOpConvBoolToInt:     out.debug << "Convert bool to int"  ;   break;
+    case EOpConvBoolToUint:    out.debug << "Convert bool to uint";    break;
+    case EOpConvBoolToInt64:   out.debug << "Convert bool to int64"; break;
+    case EOpConvBoolToUint64:  out.debug << "Convert bool to uint64";break;
+    case EOpConvBoolToFloat16: out.debug << "Convert bool to float16_t";   break;
+    case EOpConvBoolToFloat:   out.debug << "Convert bool to float";   break;
+    case EOpConvBoolToDouble:  out.debug << "Convert bool to double";   break;
+
+    // int8_t -> (u)int*
+    case EOpConvInt8ToInt16:   out.debug << "Convert int8_t to int16_t";break;
+    case EOpConvInt8ToInt:     out.debug << "Convert int8_t to int";    break;
+    case EOpConvInt8ToInt64:   out.debug << "Convert int8_t to int64";   break;
+    case EOpConvInt8ToUint8:   out.debug << "Convert int8_t to uint8_t";break;
+    case EOpConvInt8ToUint16:  out.debug << "Convert int8_t to uint16_t";break;
+    case EOpConvInt8ToUint:    out.debug << "Convert int8_t to uint";    break;
+    case EOpConvInt8ToUint64:  out.debug << "Convert int8_t to uint64";   break;
+
+    // uint8_t -> (u)int*
+    case EOpConvUint8ToInt8:    out.debug << "Convert uint8_t to int8_t";break;
+    case EOpConvUint8ToInt16:   out.debug << "Convert uint8_t to int16_t";break;
+    case EOpConvUint8ToInt:     out.debug << "Convert uint8_t to int";    break;
+    case EOpConvUint8ToInt64:   out.debug << "Convert uint8_t to int64";   break;
+    case EOpConvUint8ToUint16:  out.debug << "Convert uint8_t to uint16_t";break;
+    case EOpConvUint8ToUint:    out.debug << "Convert uint8_t to uint";    break;
+    case EOpConvUint8ToUint64:  out.debug << "Convert uint8_t to uint64";   break;
+
+    // int8_t -> float*
+    case EOpConvInt8ToFloat16:  out.debug << "Convert int8_t to float16_t";break;
+    case EOpConvInt8ToFloat:    out.debug << "Convert int8_t to float";    break;
+    case EOpConvInt8ToDouble:   out.debug << "Convert int8_t to double";   break;
+
+    // uint8_t -> float*
+    case EOpConvUint8ToFloat16: out.debug << "Convert uint8_t to float16_t";break;
+    case EOpConvUint8ToFloat:   out.debug << "Convert uint8_t to float";    break;
+    case EOpConvUint8ToDouble:  out.debug << "Convert uint8_t to double";   break;
+
+    // int16_t -> (u)int*
+    case EOpConvInt16ToInt8:    out.debug << "Convert int16_t to int8_t";break;
+    case EOpConvInt16ToInt:     out.debug << "Convert int16_t to int";    break;
+    case EOpConvInt16ToInt64:   out.debug << "Convert int16_t to int64";   break;
+    case EOpConvInt16ToUint8:   out.debug << "Convert int16_t to uint8_t";break;
+    case EOpConvInt16ToUint16:  out.debug << "Convert int16_t to uint16_t";break;
+    case EOpConvInt16ToUint:    out.debug << "Convert int16_t to uint";    break;
+    case EOpConvInt16ToUint64:  out.debug << "Convert int16_t to uint64";   break;
+
+    // int16_t -> float*
+    case EOpConvInt16ToFloat16:  out.debug << "Convert int16_t to float16_t";break;
+    case EOpConvInt16ToFloat:    out.debug << "Convert int16_t to float";    break;
+    case EOpConvInt16ToDouble:   out.debug << "Convert int16_t to double";   break;
+
+    // uint16_t -> (u)int*
+    case EOpConvUint16ToInt8:    out.debug << "Convert uint16_t to int8_t";break;
+    case EOpConvUint16ToInt16:   out.debug << "Convert uint16_t to int16_t";break;
+    case EOpConvUint16ToInt:     out.debug << "Convert uint16_t to int";    break;
+    case EOpConvUint16ToInt64:   out.debug << "Convert uint16_t to int64";   break;
+    case EOpConvUint16ToUint8:   out.debug << "Convert uint16_t to uint8_t";break;
+    case EOpConvUint16ToUint:    out.debug << "Convert uint16_t to uint";    break;
+    case EOpConvUint16ToUint64:  out.debug << "Convert uint16_t to uint64";   break;
+
+    // uint16_t -> float*
+    case EOpConvUint16ToFloat16: out.debug << "Convert uint16_t to float16_t";break;
+    case EOpConvUint16ToFloat:   out.debug << "Convert uint16_t to float";    break;
+    case EOpConvUint16ToDouble:  out.debug << "Convert uint16_t to double";   break;
+
+    // int32_t -> (u)int*
+    case EOpConvIntToInt8:    out.debug << "Convert int to int8_t";break;
+    case EOpConvIntToInt16:   out.debug << "Convert int to int16_t";break;
+    case EOpConvIntToInt64:   out.debug << "Convert int to int64";   break;
+    case EOpConvIntToUint8:   out.debug << "Convert int to uint8_t";break;
+    case EOpConvIntToUint16:  out.debug << "Convert int to uint16_t";break;
+    case EOpConvIntToUint:    out.debug << "Convert int to uint";    break;
+    case EOpConvIntToUint64:  out.debug << "Convert int to uint64";   break;
+
+    // int32_t -> float*
+    case EOpConvIntToFloat16:  out.debug << "Convert int to float16_t";break;
+    case EOpConvIntToFloat:    out.debug << "Convert int to float";    break;
+    case EOpConvIntToDouble:   out.debug << "Convert int to double";   break;
+
+    // uint32_t -> (u)int*
+    case EOpConvUintToInt8:    out.debug << "Convert uint to int8_t";break;
+    case EOpConvUintToInt16:   out.debug << "Convert uint to int16_t";break;
+    case EOpConvUintToInt:     out.debug << "Convert uint to int";break;
+    case EOpConvUintToInt64:   out.debug << "Convert uint to int64";   break;
+    case EOpConvUintToUint8:   out.debug << "Convert uint to uint8_t";break;
+    case EOpConvUintToUint16:  out.debug << "Convert uint to uint16_t";break;
+    case EOpConvUintToUint64:  out.debug << "Convert uint to uint64";   break;
+
+    // uint32_t -> float*
+    case EOpConvUintToFloat16: out.debug << "Convert uint to float16_t";break;
+    case EOpConvUintToFloat:   out.debug << "Convert uint to float";    break;
+    case EOpConvUintToDouble:  out.debug << "Convert uint to double";   break;
+
+    // int64 -> (u)int*
+    case EOpConvInt64ToInt8:    out.debug << "Convert int64 to int8_t";  break;
+    case EOpConvInt64ToInt16:   out.debug << "Convert int64 to int16_t"; break;
+    case EOpConvInt64ToInt:     out.debug << "Convert int64 to int";   break;
+    case EOpConvInt64ToUint8:   out.debug << "Convert int64 to uint8_t";break;
+    case EOpConvInt64ToUint16:  out.debug << "Convert int64 to uint16_t";break;
+    case EOpConvInt64ToUint:    out.debug << "Convert int64 to uint";    break;
+    case EOpConvInt64ToUint64:  out.debug << "Convert int64 to uint64";   break;
+
+     // int64 -> float*
+    case EOpConvInt64ToFloat16:  out.debug << "Convert int64 to float16_t";break;
+    case EOpConvInt64ToFloat:    out.debug << "Convert int64 to float";    break;
+    case EOpConvInt64ToDouble:   out.debug << "Convert int64 to double";   break;
+
+    // uint64 -> (u)int*
+    case EOpConvUint64ToInt8:    out.debug << "Convert uint64 to int8_t";break;
+    case EOpConvUint64ToInt16:   out.debug << "Convert uint64 to int16_t";break;
+    case EOpConvUint64ToInt:     out.debug << "Convert uint64 to int";    break;
+    case EOpConvUint64ToInt64:   out.debug << "Convert uint64 to int64";   break;
+    case EOpConvUint64ToUint8:   out.debug << "Convert uint64 to uint8_t";break;
+    case EOpConvUint64ToUint16:  out.debug << "Convert uint64 to uint16";    break;
+    case EOpConvUint64ToUint:    out.debug << "Convert uint64 to uint";   break;
+
+    // uint64 -> float*
+    case EOpConvUint64ToFloat16: out.debug << "Convert uint64 to float16_t";break;
+    case EOpConvUint64ToFloat:   out.debug << "Convert uint64 to float";    break;
+    case EOpConvUint64ToDouble:  out.debug << "Convert uint64 to double";   break;
+
+    // float16_t -> int*
+    case EOpConvFloat16ToInt8:  out.debug << "Convert float16_t to int8_t"; break;
+    case EOpConvFloat16ToInt16: out.debug << "Convert float16_t to int16_t"; break;
+    case EOpConvFloat16ToInt:   out.debug << "Convert float16_t to int"; break;
+    case EOpConvFloat16ToInt64: out.debug << "Convert float16_t to int64"; break;
+
+    // float16_t -> uint*
+    case EOpConvFloat16ToUint8:  out.debug << "Convert float16_t to uint8_t"; break;
+    case EOpConvFloat16ToUint16: out.debug << "Convert float16_t to uint16_t"; break;
+    case EOpConvFloat16ToUint:   out.debug << "Convert float16_t to uint"; break;
+    case EOpConvFloat16ToUint64: out.debug << "Convert float16_t to uint64"; break;
+
+    // float16_t -> float*
+    case EOpConvFloat16ToFloat:  out.debug << "Convert float16_t to float"; break;
+    case EOpConvFloat16ToDouble: out.debug << "Convert float16_t to double"; break;
+
+    // float32 -> float*
+    case EOpConvFloatToFloat16: out.debug << "Convert float to float16_t"; break;
+    case EOpConvFloatToDouble:  out.debug << "Convert float to double"; break;
+
+    // float32_t -> int*
+    case EOpConvFloatToInt8:  out.debug << "Convert float to int8_t"; break;
+    case EOpConvFloatToInt16: out.debug << "Convert float to int16_t"; break;
+    case EOpConvFloatToInt:   out.debug << "Convert float to int"; break;
+    case EOpConvFloatToInt64: out.debug << "Convert float to int64"; break;
+
+    // float32_t -> uint*
+    case EOpConvFloatToUint8:  out.debug << "Convert float to uint8_t"; break;
+    case EOpConvFloatToUint16: out.debug << "Convert float to uint16_t"; break;
+    case EOpConvFloatToUint:   out.debug << "Convert float to uint"; break;
+    case EOpConvFloatToUint64: out.debug << "Convert float to uint64"; break;
+
+    // double -> float*
+    case EOpConvDoubleToFloat16: out.debug << "Convert double to float16_t"; break;
+    case EOpConvDoubleToFloat:   out.debug << "Convert double to float"; break;
+
+    // double -> int*
+    case EOpConvDoubleToInt8:  out.debug << "Convert double to int8_t"; break;
+    case EOpConvDoubleToInt16: out.debug << "Convert double to int16_t"; break;
+    case EOpConvDoubleToInt:   out.debug << "Convert double to int"; break;
+    case EOpConvDoubleToInt64: out.debug << "Convert double to int64"; break;
+
+    // float32_t -> uint*
+    case EOpConvDoubleToUint8:  out.debug << "Convert double to uint8_t"; break;
+    case EOpConvDoubleToUint16: out.debug << "Convert double to uint16_t"; break;
+    case EOpConvDoubleToUint:   out.debug << "Convert double to uint"; break;
+    case EOpConvDoubleToUint64: out.debug << "Convert double to uint64"; break;
+
     case EOpConvUint64ToPtr:  out.debug << "Convert uint64_t to pointer";   break;
     case EOpConvPtrToUint64:  out.debug << "Convert pointer to uint64_t";   break;
 
@@ -495,17 +673,6 @@ bool TOutputTraverser::visitUnary(TVisit /* visit */, TIntermUnary* node)
 
     case EOpSpirvInst: out.debug << "spirv_instruction"; break;
 
-    case EOpCreateTensorLayoutNV:           out.debug << "createTensorLayoutNV"; break;
-    case EOpTensorLayoutSetBlockSizeNV:     out.debug << "setTensorLayoutBlockSizeNV"; break;
-    case EOpTensorLayoutSetDimensionNV:     out.debug << "setTensorLayoutDimensionNV"; break;
-    case EOpTensorLayoutSetStrideNV:        out.debug << "setTensorLayoutStrideNV"; break;
-    case EOpTensorLayoutSliceNV:            out.debug << "sliceTensorLayoutNV"; break;
-    case EOpTensorLayoutSetClampValueNV:    out.debug << "setTensorLayoutClampValueNV"; break;
-    case EOpCreateTensorViewNV:             out.debug << "createTensorViewNV"; break;
-    case EOpTensorViewSetDimensionNV:       out.debug << "setTensorViewDimensionsNV"; break;
-    case EOpTensorViewSetStrideNV:          out.debug << "setTensorViewStrideNV"; break;
-    case EOpTensorViewSetClipNV:            out.debug << "setTensorViewClipNV"; break;
-
     default: out.debug.message(EPrefixError, "Bad unary op");
     }
 
@@ -626,18 +793,6 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
     case EOpConstructBMat4x2: out.debug << "Construct bmat4x2"; break;
     case EOpConstructBMat4x3: out.debug << "Construct bmat4x3"; break;
     case EOpConstructBMat4x4: out.debug << "Construct bmat4";   break;
-    case EOpConstructBFloat16:  out.debug << "Construct bfloat16_t"; break;
-    case EOpConstructBF16Vec2:  out.debug << "Construct bf16vec2";   break;
-    case EOpConstructBF16Vec3:  out.debug << "Construct bf16vec3";   break;
-    case EOpConstructBF16Vec4:  out.debug << "Construct bf16vec4";   break;
-    case EOpConstructFloatE5M2:  out.debug << "Construct floate5m2_t"; break;
-    case EOpConstructFloatE5M2Vec2:  out.debug << "Construct fe5m2vec2";   break;
-    case EOpConstructFloatE5M2Vec3:  out.debug << "Construct fe5m2vec3";   break;
-    case EOpConstructFloatE5M2Vec4:  out.debug << "Construct fe5m2vec4";   break;
-    case EOpConstructFloatE4M3:  out.debug << "Construct floate4m3_t"; break;
-    case EOpConstructFloatE4M3Vec2:  out.debug << "Construct fe4m3vec2";   break;
-    case EOpConstructFloatE4M3Vec3:  out.debug << "Construct fe4m3vec3";   break;
-    case EOpConstructFloatE4M3Vec4:  out.debug << "Construct fe4m3vec4";   break;
     case EOpConstructFloat16:   out.debug << "Construct float16_t"; break;
     case EOpConstructF16Vec2:   out.debug << "Construct f16vec2";   break;
     case EOpConstructF16Vec3:   out.debug << "Construct f16vec3";   break;
@@ -656,14 +811,8 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
     case EOpConstructReference:  out.debug << "Construct reference";  break;
     case EOpConstructCooperativeMatrixNV:  out.debug << "Construct cooperative matrix NV";  break;
     case EOpConstructCooperativeMatrixKHR:  out.debug << "Construct cooperative matrix KHR";  break;
-    case EOpConstructCooperativeVectorNV:  out.debug << "Construct cooperative vector NV";  break;
     case EOpConstructAccStruct: out.debug << "Construct acceleration structure"; break;
 
-    case EOpBitCastArrayQCOM:              out.debug << "Bitcast To Array QCOM"; break;
-    case EOpExtractSubArrayQCOM:           out.debug << "Extract Subarray QCOM"; break;
-    case EOpCompositeConstructCoopMatQCOM:   out.debug << "Construct Cooperative Matrix QCOM"; break;
-    case EOpCompositeExtractCoopMatQCOM:     out.debug << "Extract Cooperative Matrix QCOM"; break;
-
     case EOpLessThan:         out.debug << "Compare Less Than";             break;
     case EOpGreaterThan:      out.debug << "Compare Greater Than";          break;
     case EOpLessThanEqual:    out.debug << "Compare Less Than or Equal";    break;
@@ -686,9 +835,6 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
 
     case EOpDistance:      out.debug << "distance";                break;
     case EOpDot:           out.debug << "dot-product";             break;
-    case EOpDotPackedEXT:  out.debug << "dot-product-packed";break;
-    case EOpDotAccSatEXT:  out.debug << "dot-product-accumulate-saturate";break;
-    case EOpDotPackedAccSatEXT:  out.debug << "dot-product-packed-accumulate-saturate";break;
     case EOpCross:         out.debug << "cross-product";           break;
     case EOpFaceForward:   out.debug << "face-forward";            break;
     case EOpReflect:       out.debug << "reflect";                 break;
@@ -961,37 +1107,13 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
     case EOpRayQueryGetIntersectionObjectToWorld:                          out.debug << "rayQueryGetIntersectionObjectToWorldEXT"; break;
     case EOpRayQueryGetIntersectionWorldToObject:                          out.debug << "rayQueryGetIntersectionWorldToObjectEXT"; break;
     case EOpRayQueryGetIntersectionTriangleVertexPositionsEXT:             out.debug << "rayQueryGetIntersectionTriangleVertexPositionsEXT"; break;
-    case EOpRayQueryGetIntersectionClusterIdNV:                            out.debug << "rayQueryGetIntersectionClusterIdNV"; break;
-    case EOpRayQueryGetIntersectionSpherePositionNV:                       out.debug << "rayQueryGetIntersectionSpherePositionNV"; break;
-    case EOpRayQueryGetIntersectionSphereRadiusNV:                         out.debug << "rayQueryGetIntersectionSphereRadiusNV"; break;
-    case EOpRayQueryGetIntersectionLSSHitValueNV:                          out.debug << "rayQueryGetIntersectionLSSHitValueNV"; break;
-    case EOpRayQueryGetIntersectionLSSPositionsNV:                         out.debug << "rayQueryGetIntersectionLSSPositionsNV"; break;
-    case EOpRayQueryGetIntersectionLSSRadiiNV:                             out.debug << "rayQueryGetIntersectionLSSRadiiNV"; break;
-    case EOpRayQueryIsSphereHitNV:                                         out.debug << "rayQueryIsSphereHitNV"; break;
-    case EOpRayQueryIsLSSHitNV:                                            out.debug << "rayQueryIsLSSHitNV"; break;
 
     case EOpCooperativeMatrixLoad:  out.debug << "Load cooperative matrix KHR"; break;
     case EOpCooperativeMatrixStore:  out.debug << "Store cooperative matrix KHR"; break;
     case EOpCooperativeMatrixMulAdd: out.debug << "MulAdd cooperative matrices KHR"; break;
     case EOpCooperativeMatrixLoadNV:  out.debug << "Load cooperative matrix NV"; break;
     case EOpCooperativeMatrixStoreNV:  out.debug << "Store cooperative matrix NV"; break;
-    case EOpCooperativeMatrixLoadTensorNV:  out.debug << "Load cooperative matrix tensor NV"; break;
-    case EOpCooperativeMatrixStoreTensorNV:  out.debug << "Store cooperative matrix tensor NV"; break;
     case EOpCooperativeMatrixMulAddNV: out.debug << "MulAdd cooperative matrices NV"; break;
-    case EOpCooperativeMatrixReduceNV: out.debug << "Reduce cooperative matrices"; break;
-    case EOpCooperativeMatrixPerElementOpNV: out.debug << "cooperative matrix per element op"; break;
-    case EOpCooperativeMatrixTransposeNV: out.debug << "Transpose cooperative matrix"; break;
-
-    case EOpCooperativeVectorMatMulNV: out.debug << "Cooperative vector matrix multiply NV"; break;
-    case EOpCooperativeVectorMatMulAddNV: out.debug << "Cooperative vector matrix multiply add NV"; break;
-    case EOpCooperativeVectorLoadNV:  out.debug << "Load cooperative vector NV"; break;
-    case EOpCooperativeVectorStoreNV:  out.debug << "Store cooperative vector NV"; break;
-    case EOpCooperativeVectorOuterProductAccumulateNV: out.debug << "Cooperative vector outer product accumulate NV"; break;
-    case EOpCooperativeVectorReduceSumAccumulateNV: out.debug << "Cooperative vector reduce sum accumulate NV"; break;
-
-    case EOpTensorReadARM:   out.debug << "Read from tensor";  break;
-    case EOpTensorWriteARM:  out.debug << "Write to tensor";  break;
-    case EOpTensorSizeARM:   out.debug << "Get tensor size";  break;
 
     case EOpIsHelperInvocation: out.debug << "IsHelperInvocation"; break;
     case EOpDebugPrintf:  out.debug << "Debug printf";  break;
@@ -1026,32 +1148,14 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
     case EOpHitObjectGetCurrentTimeNV: out.debug << "HitObjectGetCurrentTimeNV"; break;
     case EOpHitObjectGetShaderBindingTableRecordIndexNV: out.debug << "HitObjectGetShaderBindingTableRecordIndexNV"; break;
     case EOpHitObjectGetShaderRecordBufferHandleNV: out.debug << "HitObjectReadShaderRecordBufferHandleNV"; break;
-    case EOpHitObjectGetClusterIdNV: out.debug << "HitObjectGetClusterIdNV"; break;
     case EOpReorderThreadNV: out.debug << "ReorderThreadNV"; break;
     case EOpFetchMicroTriangleVertexPositionNV: out.debug << "MicroTriangleVertexPositionNV"; break;
     case EOpFetchMicroTriangleVertexBarycentricNV: out.debug << "MicroTriangleVertexBarycentricNV"; break;
-    case EOpHitObjectGetSpherePositionNV: out.debug << "HitObjectGetSpherePositionNV"; break;
-    case EOpHitObjectGetSphereRadiusNV:   out.debug << "HitObjectGetSphereRadiusNV"; break;
-    case EOpHitObjectGetLSSPositionsNV:   out.debug << "HitObjectGetLSSPositionsNV"; break;
-    case EOpHitObjectGetLSSRadiiNV:       out.debug << "HitObjectGetLSSRadiiNV"; break;
-    case EOpHitObjectIsSphereHitNV:       out.debug << "HitObjectIsSphereHitNV"; break;
-    case EOpHitObjectIsLSSHitNV:          out.debug << "HitObjectIsLSSHitNV"; break;
 
     case EOpSpirvInst: out.debug << "spirv_instruction"; break;
     case EOpStencilAttachmentReadEXT: out.debug << "stencilAttachmentReadEXT"; break;
     case EOpDepthAttachmentReadEXT: out.debug << "depthAttachmentReadEXT"; break;
 
-    case EOpCreateTensorLayoutNV:           out.debug << "createTensorLayout"; break;
-    case EOpTensorLayoutSetBlockSizeNV:     out.debug << "setBlockSize"; break;
-    case EOpTensorLayoutSetDimensionNV:     out.debug << "setDimension"; break;
-    case EOpTensorLayoutSetStrideNV:        out.debug << "setStride"; break;
-    case EOpTensorLayoutSliceNV:            out.debug << "slice"; break;
-    case EOpTensorLayoutSetClampValueNV:    out.debug << "setClampValue"; break;
-    case EOpCreateTensorViewNV:             out.debug << "createTensorView"; break;
-    case EOpTensorViewSetDimensionNV:       out.debug << "setTensorViewDimensions"; break;
-    case EOpTensorViewSetStrideNV:          out.debug << "setTensorViewStride"; break;
-    case EOpTensorViewSetClipNV:            out.debug << "clipTensorView"; break;
-
     default: out.debug.message(EPrefixError, "Bad aggregation op");
     }
 
@@ -1181,9 +1285,6 @@ static void OutputConstantUnion(TInfoSink& out, const TIntermTyped* node, const
         case EbtFloat:
         case EbtDouble:
         case EbtFloat16:
-        case EbtBFloat16:
-        case EbtFloatE5M2:
-        case EbtFloatE4M3:
             OutputDouble(out, constUnion[i].getDConst(), extra);
             out.debug << "\n";
             break;
@@ -1400,16 +1501,6 @@ bool TOutputTraverser::visitSwitch(TVisit /* visit */, TIntermSwitch* node)
     return false;
 }
 
-bool TOutputTraverser::visitVariableDecl(TVisit /* visit */, TIntermVariableDecl* node)
-{
-    TInfoSink& out = infoSink;
-
-    OutputTreeText(out, node, depth);
-
-    out.debug << "VarDecl: " << node->getDeclSymbol()->getName() << '\n';
-    return true;
-}
-
 //
 // This function is the one to call externally to start the traversal.
 // Individual functions can be initialized to 0 to skip processing of that
@@ -1477,8 +1568,6 @@ void TIntermediate::output(TInfoSink& infoSink, bool tree)
             infoSink.debug << "using non_coherent_depth_attachment_readEXT\n";
         if (nonCoherentStencilAttachmentReadEXT)
             infoSink.debug << "using non_coherent_stencil_attachment_readEXT\n";
-        if (nonCoherentTileAttachmentReadQCOM)
-            infoSink.debug << "using non_coherent_attachment_readQCOM\n";
         if (depthLayout != EldNone)
             infoSink.debug << "using " << TQualifier::getLayoutDepthString(depthLayout) << "\n";
         if (blendEquations != 0) {
@@ -1513,13 +1602,6 @@ void TIntermediate::output(TInfoSink& infoSink, bool tree)
                     localSizeSpecId[2] << ")\n";
             }
         }
-        if (nonCoherentTileAttachmentReadQCOM)
-            infoSink.debug << "using non_coherent_attachment_readQCOM\n";
-        if (isTileShadingRateQCOMSet()) {
-            infoSink.debug << "shading_rateQCOM = (" << tileShadingRateQCOM[0] << ", "
-                                                     << tileShadingRateQCOM[1] << ", "
-                                                     << tileShadingRateQCOM[2] << ")\n";
-        }
         break;
 
     default:
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.cpp
index 00acd83a..5e94a9e8 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.cpp
@@ -39,7 +39,6 @@
 
 #include "gl_types.h"
 #include "iomapper.h"
-#include "LiveTraverser.h"
 #include "SymbolTable.h"
 
 //
@@ -61,112 +60,10 @@
 
 namespace glslang {
 
-struct TVarEntryInfo {
-    long long id;
-    TIntermSymbol* symbol;
-    bool live;
-    TLayoutPacking upgradedToPushConstantPacking; // ElpNone means it hasn't been upgraded
-    int newBinding;
-    int newSet;
-    int newLocation;
-    int newComponent;
-    int newIndex;
-    EShLanguage stage;
-
-    void clearNewAssignments() {
-        upgradedToPushConstantPacking = ElpNone;
-        newBinding = -1;
-        newSet = -1;
-        newLocation = -1;
-        newComponent = -1;
-        newIndex = -1;
-    }
-
-    struct TOrderById {
-        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) { return l.id < r.id; }
-    };
-
-    struct TOrderByPriority {
-        // ordering:
-        // 1) has both binding and set
-        // 2) has binding but no set
-        // 3) has no binding but set
-        // 4) has no binding and no set
-        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) {
-            const TQualifier& lq = l.symbol->getQualifier();
-            const TQualifier& rq = r.symbol->getQualifier();
-
-            // simple rules:
-            // has binding gives 2 points
-            // has set gives 1 point
-            // who has the most points is more important.
-            int lPoints = (lq.hasBinding() ? 2 : 0) + (lq.hasSet() ? 1 : 0);
-            int rPoints = (rq.hasBinding() ? 2 : 0) + (rq.hasSet() ? 1 : 0);
-
-            if (lPoints == rPoints)
-                return l.id < r.id;
-            return lPoints > rPoints;
-        }
-    };
-
-    struct TOrderByPriorityAndLive {
-        // ordering:
-        // 1) do live variables first
-        // 2) has both binding and set
-        // 3) has binding but no set
-        // 4) has no binding but set
-        // 5) has no binding and no set
-        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) {
-
-            const TQualifier& lq = l.symbol->getQualifier();
-            const TQualifier& rq = r.symbol->getQualifier();
-
-            // simple rules:
-            // has binding gives 2 points
-            // has set gives 1 point
-            // who has the most points is more important.
-            int lPoints = (lq.hasBinding() ? 2 : 0) + (lq.hasSet() ? 1 : 0);
-            int rPoints = (rq.hasBinding() ? 2 : 0) + (rq.hasSet() ? 1 : 0);
-
-            if (l.live != r.live)
-                return l.live > r.live;
-
-            if (lPoints != rPoints)
-                return lPoints > rPoints;
-
-            return l.id < r.id;
-        }
-    };
-};
-
-// override function "operator=", if a vector<const _Kty, _Ty> being sort,
-// when use vc++, the sort function will call :
-// pair& operator=(const pair<_Other1, _Other2>& _Right)
-// {
-//     first = _Right.first;
-//     second = _Right.second;
-//     return (*this);
-// }
-// that will make a const type handing on left.
-// override this function can avoid a compiler error.
-// In the future, if the vc++ compiler can handle such a situation,
-// this part of the code will be removed.
-struct TVarLivePair : std::pair<const TString, TVarEntryInfo> {
-    TVarLivePair(const std::pair<const TString, TVarEntryInfo>& _Right) : pair(_Right.first, _Right.second) {}
-    TVarLivePair& operator=(const TVarLivePair& _Right) {
-        const_cast<TString&>(first) = _Right.first;
-        second = _Right.second;
-        return (*this);
-    }
-    TVarLivePair(const TVarLivePair& src) : pair(src) { }
-};
-typedef std::vector<TVarLivePair> TVarLiveVector;
-
-
 class TVarGatherTraverser : public TLiveTraverser {
 public:
     TVarGatherTraverser(const TIntermediate& i, bool traverseDeadCode, TVarLiveMap& inList, TVarLiveMap& outList, TVarLiveMap& uniformList)
-      : TLiveTraverser(i, traverseDeadCode, true, true, false, false)
+      : TLiveTraverser(i, traverseDeadCode, true, true, false)
       , inputList(inList)
       , outputList(outList)
       , uniformList(uniformList)
@@ -209,7 +106,7 @@ class TVarSetTraverser : public TLiveTraverser
 {
 public:
     TVarSetTraverser(const TIntermediate& i, const TVarLiveMap& inList, const TVarLiveMap& outList, const TVarLiveMap& uniformList)
-      : TLiveTraverser(i, true, true, true, false, true)
+      : TLiveTraverser(i, true, true, true, false)
       , inputList(inList)
       , outputList(outList)
       , uniformList(uniformList)
@@ -246,11 +143,8 @@ public:
             base->getWritableType().getQualifier().layoutComponent = at->second.newComponent;
         if (at->second.newIndex != -1)
             base->getWritableType().getQualifier().layoutIndex = at->second.newIndex;
-        if (at->second.upgradedToPushConstantPacking != ElpNone) {
+        if (at->second.upgradedToPushConstant)
             base->getWritableType().getQualifier().layoutPushConstant = true;
-            base->getWritableType().getQualifier().setBlockStorage(EbsPushConstant);
-            base->getWritableType().getQualifier().layoutPacking = at->second.upgradedToPushConstantPacking;
-        }
     }
 
   private:
@@ -282,7 +176,7 @@ struct TNotifyInOutAdaptor
 {
     EShLanguage stage;
     TIoMapResolver& resolver;
-    inline TNotifyInOutAdaptor(EShLanguage s, TIoMapResolver& r)
+    inline TNotifyInOutAdaptor(EShLanguage s, TIoMapResolver& r) 
       : stage(s)
       , resolver(r)
     {
@@ -1019,7 +913,6 @@ uint32_t TDefaultIoResolverBase::computeTypeLocationSize(const TType& type, EShL
 
 //TDefaultGlslIoResolver
 TResourceType TDefaultGlslIoResolver::getResourceType(const glslang::TType& type) {
-    assert(isValidGlslType(type));
     if (isImageType(type)) {
         return EResImage;
     }
@@ -1035,15 +928,6 @@ TResourceType TDefaultGlslIoResolver::getResourceType(const glslang::TType& type
     if (isUboType(type)) {
         return EResUbo;
     }
-    if (isCombinedSamplerType(type)) {
-        return EResCombinedSampler;
-    }
-    if (isAsType(type)) {
-        return EResAs;
-    }
-    if (isTensorType(type)) {
-        return EResTensor;
-    }
     return EResCount;
 }
 
@@ -1393,7 +1277,6 @@ struct TDefaultIoResolver : public TDefaultIoResolverBase {
     bool validateBinding(EShLanguage /*stage*/, TVarEntryInfo& /*ent*/) override { return true; }
 
     TResourceType getResourceType(const glslang::TType& type) override {
-        assert(isValidGlslType(type));
         if (isImageType(type)) {
             return EResImage;
         }
@@ -1409,15 +1292,6 @@ struct TDefaultIoResolver : public TDefaultIoResolverBase {
         if (isUboType(type)) {
             return EResUbo;
         }
-        if (isCombinedSamplerType(type)) {
-            return EResCombinedSampler;
-        }
-        if (isAsType(type)) {
-            return EResAs;
-        }
-        if (isTensorType(type)) {
-            return EResTensor;
-        }
         return EResCount;
     }
 
@@ -1503,11 +1377,6 @@ struct TDefaultHlslIoResolver : public TDefaultIoResolverBase {
         if (isUboType(type)) {
             return EResUbo;
         }
-        // no support for combined samplers in HLSL
-        if (isAsType(type)) {
-            return EResAs;
-        }
-        // no support for tensors in HLSL
         return EResCount;
     }
 
@@ -1628,36 +1497,6 @@ bool TIoMapper::addStage(EShLanguage stage, TIntermediate& intermediate, TInfoSi
     return !hadError;
 }
 
-TGlslIoMapper::TGlslIoMapper() {
-    memset(inVarMaps,     0, sizeof(TVarLiveMap*)   * EShLangCount);
-    memset(outVarMaps,    0, sizeof(TVarLiveMap*)   * EShLangCount);
-    memset(uniformVarMap, 0, sizeof(TVarLiveMap*)   * EShLangCount);
-    memset(intermediates, 0, sizeof(TIntermediate*) * EShLangCount);
-    profile = ENoProfile;
-    version = 0;
-    autoPushConstantMaxSize = 128;
-    autoPushConstantBlockPacking = ElpStd430;
-}
-
-TGlslIoMapper::~TGlslIoMapper() {
-    for (size_t stage = 0; stage < EShLangCount; stage++) {
-        if (inVarMaps[stage] != nullptr) {
-            delete inVarMaps[stage];
-            inVarMaps[stage] = nullptr;
-        }
-        if (outVarMaps[stage] != nullptr) {
-            delete outVarMaps[stage];
-            outVarMaps[stage] = nullptr;
-        }
-        if (uniformVarMap[stage] != nullptr) {
-            delete uniformVarMap[stage];
-            uniformVarMap[stage] = nullptr;
-        }
-        if (intermediates[stage] != nullptr)
-            intermediates[stage] = nullptr;
-    }
-}
-
 // Map I/O variables to provided offsets, and make bindings for
 // unbound but live variables.
 //
@@ -1838,8 +1677,7 @@ bool TGlslIoMapper::doMap(TIoMapResolver* resolver, TInfoSink& infoSink) {
                 std::for_each(uniformVector.begin(), uniformVector.end(),
                                        [this](TVarLivePair& p) {
                 if (p.first == autoPushConstantBlockName) {
-                        p.second.upgradedToPushConstantPacking = autoPushConstantBlockPacking;
-                        p.second.newSet = TQualifier::layoutSetEnd;
+                        p.second.upgradedToPushConstant = true;
                     }
                 });
             }
@@ -1852,8 +1690,8 @@ bool TGlslIoMapper::doMap(TIoMapResolver* resolver, TInfoSink& infoSink) {
                 std::for_each(uniformVector.begin(), uniformVector.end(), [pUniformVarMap, stage](TVarLivePair p) {
                     auto at = pUniformVarMap[stage]->find(p.second.symbol->getAccessName());
                     if (at != pUniformVarMap[stage]->end() && at->second.id == p.second.id){
-                        if (p.second.upgradedToPushConstantPacking != ElpNone) {
-                            at->second.upgradedToPushConstantPacking = p.second.upgradedToPushConstantPacking;
+                        if (p.second.upgradedToPushConstant) {
+                            at->second.upgradedToPushConstant = true;
                         } else {
                             int resolvedBinding = at->second.newBinding;
                             at->second = p.second;
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.h b/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.h
index de0a0d7d..35babbce 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/iomapper.h
@@ -37,6 +37,7 @@
 #define _IOMAPPER_INCLUDED
 
 #include <cstdint>
+#include "LiveTraverser.h"
 #include <unordered_map>
 #include <unordered_set>
 //
@@ -48,7 +49,84 @@ class TInfoSink;
 namespace glslang {
 
 class TIntermediate;
-struct TVarEntryInfo;
+struct TVarEntryInfo {
+    long long id;
+    TIntermSymbol* symbol;
+    bool live;
+    bool upgradedToPushConstant;
+    int newBinding;
+    int newSet;
+    int newLocation;
+    int newComponent;
+    int newIndex;
+    EShLanguage stage;
+
+    void clearNewAssignments() {
+        upgradedToPushConstant = false;
+        newBinding = -1;
+        newSet = -1;
+        newLocation = -1;
+        newComponent = -1;
+        newIndex = -1;
+    }
+
+    struct TOrderById {
+        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) { return l.id < r.id; }
+    };
+
+    struct TOrderByPriority {
+        // ordering:
+        // 1) has both binding and set
+        // 2) has binding but no set
+        // 3) has no binding but set
+        // 4) has no binding and no set
+        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) {
+            const TQualifier& lq = l.symbol->getQualifier();
+            const TQualifier& rq = r.symbol->getQualifier();
+
+            // simple rules:
+            // has binding gives 2 points
+            // has set gives 1 point
+            // who has the most points is more important.
+            int lPoints = (lq.hasBinding() ? 2 : 0) + (lq.hasSet() ? 1 : 0);
+            int rPoints = (rq.hasBinding() ? 2 : 0) + (rq.hasSet() ? 1 : 0);
+
+            if (lPoints == rPoints)
+                return l.id < r.id;
+            return lPoints > rPoints;
+        }
+    };
+
+    struct TOrderByPriorityAndLive {
+        // ordering:
+        // 1) do live variables first
+        // 2) has both binding and set
+        // 3) has binding but no set
+        // 4) has no binding but set
+        // 5) has no binding and no set
+        inline bool operator()(const TVarEntryInfo& l, const TVarEntryInfo& r) {
+
+            const TQualifier& lq = l.symbol->getQualifier();
+            const TQualifier& rq = r.symbol->getQualifier();
+
+            // simple rules:
+            // has binding gives 2 points
+            // has set gives 1 point
+            // who has the most points is more important.
+            int lPoints = (lq.hasBinding() ? 2 : 0) + (lq.hasSet() ? 1 : 0);
+            int rPoints = (rq.hasBinding() ? 2 : 0) + (rq.hasSet() ? 1 : 0);
+
+            if (l.live != r.live)
+                return l.live > r.live;
+
+            if (lPoints != rPoints)
+                return lPoints > rPoints;
+
+            return l.id < r.id;
+        }
+    };
+};
+
 // Base class for shared TIoMapResolver services, used by several derivations.
 struct TDefaultIoResolverBase : public glslang::TIoMapResolver {
 public:
@@ -120,12 +198,12 @@ protected:
     }
 
     static bool isTextureType(const glslang::TType& type) {
-        return (type.getBasicType() == glslang::EbtSampler && !type.getSampler().isCombined() &&
+        return (type.getBasicType() == glslang::EbtSampler &&
                 (type.getSampler().isTexture() || type.getSampler().isSubpass()));
     }
 
     static bool isUboType(const glslang::TType& type) {
-        return type.getQualifier().storage == EvqUniform && type.isStruct();
+        return type.getQualifier().storage == EvqUniform;
     }
 
     static bool isImageType(const glslang::TType& type) {
@@ -136,24 +214,6 @@ protected:
         return type.getQualifier().storage == EvqBuffer;
     }
 
-    static bool isCombinedSamplerType(const glslang::TType& type) {
-        return type.getBasicType() == glslang::EbtSampler && type.getSampler().isCombined();
-    }
-
-    static bool isAsType(const glslang::TType& type) {
-        return type.getBasicType() == glslang::EbtAccStruct;
-    }
-
-    static bool isTensorType(const glslang::TType& type) {
-        return type.isTensorARM();
-    }
-
-    static bool isValidGlslType(const glslang::TType& type) {
-        // at most one must be true
-        return (isSamplerType(type) + isTextureType(type) + isUboType(type) + isImageType(type) +
-            isSsboType(type) + isCombinedSamplerType(type) + isAsType(type) + isTensorType(type)) <= 1;
-    }
-
     // Return true if this is a SRV (shader resource view) type:
     static bool isSrvType(const glslang::TType& type) {
         return isTextureType(type) || type.getQualifier().storage == EvqBuffer;
@@ -207,22 +267,82 @@ protected:
 
 typedef std::map<TString, TVarEntryInfo> TVarLiveMap;
 
+// override function "operator=", if a vector<const _Kty, _Ty> being sort,
+// when use vc++, the sort function will call :
+// pair& operator=(const pair<_Other1, _Other2>& _Right)
+// {
+//     first = _Right.first;
+//     second = _Right.second;
+//     return (*this);
+// }
+// that will make a const type handing on left.
+// override this function can avoid a compiler error.
+// In the future, if the vc++ compiler can handle such a situation,
+// this part of the code will be removed.
+struct TVarLivePair : std::pair<const TString, TVarEntryInfo> {
+    TVarLivePair(const std::pair<const TString, TVarEntryInfo>& _Right) : pair(_Right.first, _Right.second) {}
+    TVarLivePair& operator=(const TVarLivePair& _Right) {
+        const_cast<TString&>(first) = _Right.first;
+        second = _Right.second;
+        return (*this);
+    }
+    TVarLivePair(const TVarLivePair& src) : pair(src) { }
+};
+typedef std::vector<TVarLivePair> TVarLiveVector;
+
+// I/O mapper
+class TIoMapper {
+public:
+    TIoMapper() {}
+    virtual ~TIoMapper() {}
+    // grow the reflection stage by stage
+    bool virtual addStage(EShLanguage, TIntermediate&, TInfoSink&, TIoMapResolver*);
+    bool virtual doMap(TIoMapResolver*, TInfoSink&) { return true; }
+};
+
 // I/O mapper for GLSL
 class TGlslIoMapper : public TIoMapper {
 public:
-    TGlslIoMapper();
-    virtual ~TGlslIoMapper();
+    TGlslIoMapper() {
+        memset(inVarMaps,     0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
+        memset(outVarMaps,    0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
+        memset(uniformVarMap, 0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
+        memset(intermediates, 0, sizeof(TIntermediate*) * (EShLangCount + 1));
+        profile = ENoProfile;
+        version = 0;
+        autoPushConstantMaxSize = 128;
+        autoPushConstantBlockPacking = ElpStd430;
+    }
+    virtual ~TGlslIoMapper() {
+        for (size_t stage = 0; stage < EShLangCount; stage++) {
+            if (inVarMaps[stage] != nullptr) {
+                delete inVarMaps[stage];
+                inVarMaps[stage] = nullptr;
+            }
+            if (outVarMaps[stage] != nullptr) {
+                delete outVarMaps[stage];
+                outVarMaps[stage] = nullptr;
+            }
+            if (uniformVarMap[stage] != nullptr) {
+                delete uniformVarMap[stage];
+                uniformVarMap[stage] = nullptr;
+            }
+            if (intermediates[stage] != nullptr)
+                intermediates[stage] = nullptr;
+        }
+    }
     // If set, the uniform block with the given name will be changed to be backed by
     // push_constant if it's size is <= maxSize
-    bool setAutoPushConstantBlock(const char* name, unsigned int maxSize, TLayoutPacking packing) override {
+    void setAutoPushConstantBlock(const char* name, unsigned int maxSize, TLayoutPacking packing) {
         autoPushConstantBlockName = name;
         autoPushConstantMaxSize = maxSize;
         autoPushConstantBlockPacking = packing;
-        return true;
     }
     // grow the reflection stage by stage
     bool addStage(EShLanguage, TIntermediate&, TInfoSink&, TIoMapResolver*) override;
     bool doMap(TIoMapResolver*, TInfoSink&) override;
+    TVarLiveMap *inVarMaps[EShLangCount], *outVarMaps[EShLangCount],
+                *uniformVarMap[EShLangCount];
     TIntermediate* intermediates[EShLangCount];
     bool hadError = false;
     EProfile profile;
@@ -232,8 +352,6 @@ private:
     TString autoPushConstantBlockName;
     unsigned int autoPushConstantMaxSize;
     TLayoutPacking autoPushConstantBlockPacking;
-    TVarLiveMap *inVarMaps[EShLangCount], *outVarMaps[EShLangCount],
-                *uniformVarMap[EShLangCount];
 };
 
 } // end namespace glslang
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/linkValidate.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/linkValidate.cpp
index f4983c7a..62e24426 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/linkValidate.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/linkValidate.cpp
@@ -46,46 +46,34 @@
 // even if no merging was done (i.e., the stage was only one compilation unit).
 //
 
-#include "glslang/Public/ShaderLang.h"
 #include "localintermediate.h"
 #include "../Include/InfoSink.h"
 #include "SymbolTable.h"
-#include "LiveTraverser.h"
 
 namespace glslang {
 
 //
 // Link-time error emitter.
 //
-void TIntermediate::error(TInfoSink& infoSink, const TSourceLoc* loc, EShMessages messages, const char* message,
-                          EShLanguage unitStage)
+void TIntermediate::error(TInfoSink& infoSink, const char* message, EShLanguage unitStage)
 {
     infoSink.info.prefix(EPrefixError);
-    if (loc)
-        infoSink.info.location(*loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
-    if (unitStage == EShLangCount)
-        infoSink.info << "Linking " << StageName(language) << " stage: " << message << "\n";
-    else if (language == EShLangCount)
-        infoSink.info << "Linking " << StageName(unitStage) << " stage: " << message << "\n";
+    if (unitStage < EShLangCount)
+        infoSink.info << "Linking " << StageName(getStage()) << " and " << StageName(unitStage) << " stages: " << message << "\n";
     else
-        infoSink.info << "Linking " << StageName(language) << " and " << StageName(unitStage) << " stages: " << message << "\n";
+        infoSink.info << "Linking " << StageName(language) << " stage: " << message << "\n";
 
     ++numErrors;
 }
 
 // Link-time warning.
-void TIntermediate::warn(TInfoSink& infoSink, const TSourceLoc* loc, EShMessages messages, const char* message,
-                         EShLanguage unitStage)
+void TIntermediate::warn(TInfoSink& infoSink, const char* message, EShLanguage unitStage)
 {
     infoSink.info.prefix(EPrefixWarning);
-    if (loc)
-        infoSink.info.location(*loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
-    if (unitStage == EShLangCount)
-        infoSink.info << "Linking " << StageName(language) << " stage: " << message << "\n";
-    else if (language == EShLangCount)
-        infoSink.info << "Linking " << StageName(unitStage) << " stage: " << message << "\n";
-    else
+    if (unitStage < EShLangCount)
         infoSink.info << "Linking " << StageName(language) << " and " << StageName(unitStage) << " stages: " << message << "\n";
+    else
+        infoSink.info << "Linking " << StageName(language) << " stage: " << message << "\n";
 }
 
 // TODO: 4.4 offset/align:  "Two blocks linked together in the same program with the same block
@@ -125,67 +113,10 @@ void TIntermediate::mergeUniformObjects(TInfoSink& infoSink, TIntermediate& unit
     mergeLinkerObjects(infoSink, linkerObjects, unitLinkerObjects, unit.getStage());
 }
 
-static inline bool isSameInterface(TIntermSymbol* symbol, TIntermSymbol* unitSymbol) {
-    EShLanguage stage = symbol->getStage();
-    EShLanguage unitStage = unitSymbol->getStage();
-    return // 1) same stage and same shader interface
-        (stage == unitStage && symbol->getType().getShaderInterface() == unitSymbol->getType().getShaderInterface()) ||
-        // 2) accross stages and both are uniform or buffer
-        (symbol->getQualifier().storage == EvqUniform  && unitSymbol->getQualifier().storage == EvqUniform) ||
-        (symbol->getQualifier().storage == EvqBuffer   && unitSymbol->getQualifier().storage == EvqBuffer) ||
-        // 3) in/out matched across stage boundary
-        (stage < unitStage && symbol->getQualifier().storage == EvqVaryingOut  && unitSymbol->getQualifier().storage == EvqVaryingIn) ||
-        (unitStage < stage && symbol->getQualifier().storage == EvqVaryingIn && unitSymbol->getQualifier().storage == EvqVaryingOut);
-}
-
-static bool isSameSymbol(TIntermSymbol* symbol1, TIntermSymbol* symbol2) {
-    // If they are both blocks in the same shader interface,
-    // match by the block-name, not the identifier name.
-    if (symbol1->getType().getBasicType() == EbtBlock && symbol2->getType().getBasicType() == EbtBlock) {
-        if (isSameInterface(symbol1, symbol2)) {
-            return symbol1->getType().getTypeName() == symbol2->getType().getTypeName();
-        }
-    } else if (symbol1->getName() == symbol2->getName())
-        return true;
-    return false;
-}
-
-//
-// merge implicit array sizes for uniform/buffer objects
-//
-void TIntermediate::mergeImplicitArraySizes(TInfoSink&, TIntermediate& unit) {
-    if (unit.treeRoot == nullptr || treeRoot == nullptr)
-        return;
-
-    // Get the linker-object lists
-    TIntermSequence& linkerObjects = findLinkerObjects()->getSequence();
-    TIntermSequence unitLinkerObjects = unit.findLinkerObjects()->getSequence();
-
-    // filter unitLinkerObjects to only contain uniforms
-    auto end = std::remove_if(unitLinkerObjects.begin(), unitLinkerObjects.end(),
-        [](TIntermNode* node) {return node->getAsSymbolNode()->getQualifier().storage != EvqUniform &&
-                                      node->getAsSymbolNode()->getQualifier().storage != EvqBuffer; });
-    unitLinkerObjects.resize(end - unitLinkerObjects.begin());
-
-    std::size_t initialNumLinkerObjects = linkerObjects.size();
-    for (unsigned int unitLinkObj = 0; unitLinkObj < unitLinkerObjects.size(); ++unitLinkObj) {
-        for (std::size_t linkObj = 0; linkObj < initialNumLinkerObjects; ++linkObj) {
-            TIntermSymbol* symbol = linkerObjects[linkObj]->getAsSymbolNode();
-            TIntermSymbol* unitSymbol = unitLinkerObjects[unitLinkObj]->getAsSymbolNode();
-            assert(symbol && unitSymbol);
-
-            if (isSameSymbol(symbol, unitSymbol)) {
-                // Update implicit array sizes
-                mergeImplicitArraySizes(symbol->getWritableType(), unitSymbol->getType());
-            }
-        }
-    }
-}
-
 //
 // do error checking on the shader boundary in / out vars
 //
-void TIntermediate::checkStageIO(TInfoSink& infoSink, TIntermediate& unit, EShMessages messages) {
+void TIntermediate::checkStageIO(TInfoSink& infoSink, TIntermediate& unit) {
     if (unit.treeRoot == nullptr || treeRoot == nullptr)
         return;
 
@@ -206,272 +137,7 @@ void TIntermediate::checkStageIO(TInfoSink& infoSink, TIntermediate& unit, EShMe
     // do matching and error checking
     mergeLinkerObjects(infoSink, linkerObjects, unitLinkerObjects, unit.getStage());
 
-    if ((messages & EShMsgValidateCrossStageIO) == 0)
-        return;
-
-    // The OpenGL Shading Language, Version 4.60.8 (https://registry.khronos.org/OpenGL/specs/gl/GLSLangSpec.4.60.pdf)
-    // 4.3.4 Input Variables
-    // Only the input variables that are statically read need to be written by the previous stage; it is
-    // allowed to have superfluous declarations of input variables. This is shown in the following table.
-    // +------------------------------------------------------------------------------------------------+
-    // | Treatment of Mismatched Input        | Consuming Shader (input variables)                      |
-    // | Variables                            |---------------------------------------------------------|
-    // |                                      | No          | Declared but no | Declared and Static Use |
-    // |                                      | Declaration | Static Use      |                         |
-    // |--------------------------------------+-------------+-----------------+-------------------------|
-    // | Generating Shader  | No Declaration  | Allowed     | Allowed         | Link-Time Error         |
-    // | (output variables) |-----------------+-------------+-----------------+-------------------------|
-    // |                    | Declared but no | Allowed     | Allowed         | Allowed (values are     |
-    // |                    | Static Use      |             |                 | undefined)              |
-    // |                    |-----------------+-------------+-----------------+-------------------------|
-    // |                    | Declared and    | Allowed     | Allowed         | Allowed (values are     |
-    // |                    | Static Use      |             |                 | potentially undefined)  |
-    // +------------------------------------------------------------------------------------------------+
-    // Consumption errors are based on static use only. Compilation may generate a warning, but not an
-    // error, for any dynamic use the compiler can deduce that might cause consumption of undefined values.
-
-    // TODO: implement support for geometry passthrough
-    if (getGeoPassthroughEXT()) {
-        unit.warn(infoSink, "GL_NV_geometry_shader_passthrough is enabled, skipping cross-stage IO validation",
-                  getStage());
-        return;
-    }
-
-    class TIOTraverser : public TLiveTraverser {
-    public:
-        TIOTraverser(TIntermediate& i, bool all, TIntermSequence& sequence, TStorageQualifier storage)
-            : TLiveTraverser(i, all, true, false, false), sequence(sequence), storage(storage)
-        {
-        }
-
-        virtual void visitSymbol(TIntermSymbol* symbol)
-        {
-            if (symbol->getQualifier().storage == storage)
-                sequence.push_back(symbol);
-        }
-
-    private:
-        TIntermSequence& sequence;
-        TStorageQualifier storage;
-    };
-
-    // live symbols only
-    TIntermSequence unitLiveInputs;
-
-    TIOTraverser unitTraverser(unit, false, unitLiveInputs, EvqVaryingIn);
-    unitTraverser.pushFunction(unit.getEntryPointMangledName().c_str());
-    while (! unitTraverser.destinations.empty()) {
-        TIntermNode* destination = unitTraverser.destinations.back();
-        unitTraverser.destinations.pop_back();
-        destination->traverse(&unitTraverser);
-    }
-
-    // all symbols
-    TIntermSequence allOutputs;
-
-    TIOTraverser traverser(*this, true, allOutputs, EvqVaryingOut);
-    getTreeRoot()->traverse(&traverser);
-
-    std::unordered_set<int> outputLocations;
-    for (auto& output : allOutputs) {
-        if (output->getAsSymbolNode()->getBasicType() == EbtBlock) {
-            int lastLocation = -1;
-            if (output->getAsSymbolNode()->getQualifier().hasLocation())
-                lastLocation = output->getAsSymbolNode()->getQualifier().layoutLocation;
-            const TTypeList* members = output->getAsSymbolNode()->getType().getStruct();
-            for (auto& member : *members) {
-                int location = lastLocation;
-                if (member.type->getQualifier().hasLocation())
-                    location = member.type->getQualifier().layoutLocation;
-                if (location != -1) {
-                    int locationSize = TIntermediate::computeTypeLocationSize(*member.type, getStage());
-                    for (int i = 0; i < locationSize; ++i)
-                        outputLocations.insert(location + i);
-                    lastLocation = location + locationSize;
-                }
-            }
-        } else {
-            int locationSize = TIntermediate::computeTypeLocationSize(output->getAsSymbolNode()->getType(), getStage());
-            for (int i = 0; i < locationSize; ++i)
-                outputLocations.insert(output->getAsSymbolNode()->getQualifier().layoutLocation + i);
-        }
-    }
-
-    // remove unitStage inputs with matching outputs in the current stage
-    auto liveEnd = std::remove_if(
-        unitLiveInputs.begin(), unitLiveInputs.end(), [this, &allOutputs, &outputLocations](TIntermNode* input) {
-            // ignore built-ins
-            if (input->getAsSymbolNode()->getAccessName().compare(0, 3, "gl_") == 0)
-                return true;
-            // try to match by location
-            if (input->getAsSymbolNode()->getQualifier().hasLocation() &&
-                outputLocations.find(input->getAsSymbolNode()->getQualifier().layoutLocation) != outputLocations.end())
-                return true;
-            if (input->getAsSymbolNode()->getBasicType() == EbtBlock) {
-                int lastLocation = -1;
-                if (input->getAsSymbolNode()->getQualifier().hasLocation())
-                    lastLocation = input->getAsSymbolNode()->getQualifier().layoutLocation;
-                const TTypeList* members = input->getAsSymbolNode()->getType().getStruct();
-                for (auto& member : *members) {
-                    int location = lastLocation;
-                    if (member.type->getQualifier().hasLocation())
-                        location = member.type->getQualifier().layoutLocation;
-                    if (location != -1) {
-                        int locationSize = TIntermediate::computeTypeLocationSize(*member.type, getStage());
-                        for (int i = 0; i < locationSize; ++i)
-                            if (outputLocations.find(location + i) != outputLocations.end())
-                                return true;
-                        lastLocation = location + locationSize;
-                    }
-                }
-            }
-            // otherwise, try to match by name
-            return std::any_of(allOutputs.begin(), allOutputs.end(), [input](TIntermNode* output) {
-                return output->getAsSymbolNode()->getAccessName() == input->getAsSymbolNode()->getAccessName();
-            });
-        });
-    unitLiveInputs.resize(liveEnd - unitLiveInputs.begin());
-
-    // check remaining loose unitStage inputs for a matching output block member
-    liveEnd = std::remove_if(unitLiveInputs.begin(), unitLiveInputs.end(), [&allOutputs](TIntermNode* input) {
-        return std::any_of(allOutputs.begin(), allOutputs.end(), [input](TIntermNode* output) {
-            if (output->getAsSymbolNode()->getBasicType() != EbtBlock)
-                return false;
-            const TTypeList* members = output->getAsSymbolNode()->getType().getStruct();
-            return std::any_of(members->begin(), members->end(), [input](TTypeLoc type) {
-                return type.type->getFieldName() == input->getAsSymbolNode()->getName();
-            });
-        });
-    });
-    unitLiveInputs.resize(liveEnd - unitLiveInputs.begin());
-
-    // finally, check remaining unitStage block inputs for a matching loose output
-    liveEnd = std::remove_if(
-        unitLiveInputs.begin(), unitLiveInputs.end(), [&allOutputs](TIntermNode* input) {
-            if (input->getAsSymbolNode()->getBasicType() != EbtBlock)
-                return false;
-            // liveness isn't tracked per member so finding any one live member is the best we can do
-            const TTypeList* members = input->getAsSymbolNode()->getType().getStruct();
-            return std::any_of(members->begin(), members->end(), [allOutputs](TTypeLoc type) {
-                return std::any_of(allOutputs.begin(), allOutputs.end(), [&type](TIntermNode* output) {
-                    return type.type->getFieldName() == output->getAsSymbolNode()->getName();
-                });
-            });
-        });
-    unitLiveInputs.resize(liveEnd - unitLiveInputs.begin());
-
-    // any remaining unitStage inputs have no matching output
-    std::for_each(unitLiveInputs.begin(), unitLiveInputs.end(), [&](TIntermNode* input) {
-        unit.error(infoSink, &input->getLoc(), messages,
-                   "Preceding stage has no matching declaration for statically used input:", getStage());
-        infoSink.info << "    "
-                      << input->getAsSymbolNode()->getType().getCompleteString(
-                             true, true, false, true, input->getAsSymbolNode()->getAccessName())
-                      << "\n";
-    });
-
-    // TODO: warn about statically read inputs with outputs declared but not written to
-}
-
-void TIntermediate::optimizeStageIO(TInfoSink&, TIntermediate& unit)
-{
-    // don't do any input/output demotion on compute, raytracing, or task/mesh stages
-    // TODO: support task/mesh
-    if (getStage() > EShLangFragment || unit.getStage() > EShLangFragment) {
-        return;
-    }
-
-    class TIOTraverser : public TLiveTraverser {
-    public:
-        TIOTraverser(TIntermediate& i, bool all, TIntermSequence& sequence, TStorageQualifier storage)
-            : TLiveTraverser(i, all, true, false, false), sequence(sequence), storage(storage)
-        {
-        }
-
-        virtual void visitSymbol(TIntermSymbol* symbol)
-        {
-            if (symbol->getQualifier().storage == storage) {
-                sequence.push_back(symbol);
-            }
-        }
-
-    private:
-        TIntermSequence& sequence;
-        TStorageQualifier storage;
-    };
-
-    // live symbols only
-    TIntermSequence unitLiveInputs;
-
-    TIOTraverser unitTraverser(unit, false, unitLiveInputs, EvqVaryingIn);
-    unitTraverser.pushFunction(unit.getEntryPointMangledName().c_str());
-    while (! unitTraverser.destinations.empty()) {
-        TIntermNode* destination = unitTraverser.destinations.back();
-        unitTraverser.destinations.pop_back();
-        destination->traverse(&unitTraverser);
-    }
-
-    TIntermSequence allOutputs;
-    TIntermSequence unitAllInputs;
-
-    TIOTraverser allTraverser(*this, true, allOutputs, EvqVaryingOut);
-    getTreeRoot()->traverse(&allTraverser);
-
-    TIOTraverser unitAllTraverser(unit, true, unitAllInputs, EvqVaryingIn);
-    unit.getTreeRoot()->traverse(&unitAllTraverser);
-
-    // find outputs not consumed by the next stage
-    std::for_each(allOutputs.begin(), allOutputs.end(), [&unitLiveInputs, &unitAllInputs](TIntermNode* output) {
-        // don't do anything to builtins
-        if (output->getAsSymbolNode()->getAccessName().compare(0, 3, "gl_") == 0)
-            return;
-
-        // don't demote block outputs (for now)
-        if (output->getAsSymbolNode()->getBasicType() == EbtBlock)
-            return;
-
-        // check if the (loose) output has a matching loose input
-        auto isMatchingInput = [output](TIntermNode* input) {
-            return output->getAsSymbolNode()->getAccessName() == input->getAsSymbolNode()->getAccessName();
-        };
-
-        // check if the (loose) output has a matching block member input
-        auto isMatchingInputBlockMember = [output](TIntermNode* input) {
-            // ignore loose inputs
-            if (input->getAsSymbolNode()->getBasicType() != EbtBlock)
-                return false;
-
-            // don't demote loose outputs with matching input block members
-            auto isMatchingBlockMember = [output](TTypeLoc type) {
-                return type.type->getFieldName() == output->getAsSymbolNode()->getName();
-            };
-            const TTypeList* members = input->getAsSymbolNode()->getType().getStruct();
-            return std::any_of(members->begin(), members->end(), isMatchingBlockMember);
-        };
-
-        // determine if the input/output pair should be demoted
-        // do the faster (and more likely) loose-loose check first
-        if (std::none_of(unitLiveInputs.begin(), unitLiveInputs.end(), isMatchingInput) && 
-            std::none_of(unitAllInputs.begin(), unitAllInputs.end(), isMatchingInputBlockMember)) {
-            // demote any input matching the output
-            auto demoteMatchingInputs = [output](TIntermNode* input) {
-                if (output->getAsSymbolNode()->getAccessName() == input->getAsSymbolNode()->getAccessName()) {
-                    // demote input to a plain variable
-                    TIntermSymbol* symbol = input->getAsSymbolNode();
-                    symbol->getQualifier().storage = EvqGlobal;
-                    symbol->getQualifier().clearInterstage();
-                    symbol->getQualifier().clearLayout();
-                }
-            };
-
-            // demote all matching outputs to a plain variable
-            TIntermSymbol* symbol = output->getAsSymbolNode();
-            symbol->getQualifier().storage = EvqGlobal;
-            symbol->getQualifier().clearInterstage();
-            symbol->getQualifier().clearLayout();
-            std::for_each(unitAllInputs.begin(), unitAllInputs.end(), demoteMatchingInputs);
-        }
-    });
+    // TODO: final check; make sure that any statically used `in` have matching `out` written to
 }
 
 void TIntermediate::mergeCallGraphs(TInfoSink& infoSink, TIntermediate& unit)
@@ -535,9 +201,6 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
             error(infoSink, "number of invocations must match between compilation units");
     }
 
-    // The GLSL specification requires that at least one compilation unit
-    // must declare the vertices layout, but not all units need to do so.
-    // However, all declarations must match.
     if (vertices == TQualifier::layoutNotSet)
         vertices = unit.vertices;
     else if (unit.vertices != TQualifier::layoutNotSet && vertices != unit.vertices) {
@@ -548,30 +211,20 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
         else
             assert(0);
     }
-
-    // The mesh shader extension requires that at least one compilation unit
-    // must declare the max_primitives layout, but not all units need to do so.
-    // However, all declarations must match.
     if (primitives == TQualifier::layoutNotSet)
         primitives = unit.primitives;
-    else if (unit.primitives != TQualifier::layoutNotSet && primitives != unit.primitives) {
+    else if (primitives != unit.primitives) {
         if (language == EShLangMesh)
             error(infoSink, "Contradictory layout max_primitives values");
         else
             assert(0);
     }
 
-    // The GLSL specification requires that at least one compilation unit
-    // must declare the input primitive layout, but not all units need to do so.
-    // However, all declarations must match.
     if (inputPrimitive == ElgNone)
         inputPrimitive = unit.inputPrimitive;
     else if (unit.inputPrimitive != ElgNone && inputPrimitive != unit.inputPrimitive)
         error(infoSink, "Contradictory input layout primitives");
 
-    // The GLSL specification requires that at least one compilation unit
-    // must declare the output primitive layout, but not all units need to do so.
-    // However, all declarations must match.
     if (outputPrimitive == ElgNone)
         outputPrimitive = unit.outputPrimitive;
     else if (unit.outputPrimitive != ElgNone && outputPrimitive != unit.outputPrimitive)
@@ -580,27 +233,19 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
     if (originUpperLeft != unit.originUpperLeft || pixelCenterInteger != unit.pixelCenterInteger)
         error(infoSink, "gl_FragCoord redeclarations must match across shaders");
 
-    // The GLSL specification requires that at least one compilation unit
-    // must declare the vertex spacing layout, but not all units need to do so.
-    // However, all declarations must match.
     if (vertexSpacing == EvsNone)
         vertexSpacing = unit.vertexSpacing;
-    else if (unit.vertexSpacing != EvsNone && vertexSpacing != unit.vertexSpacing)
+    else if (vertexSpacing != unit.vertexSpacing)
         error(infoSink, "Contradictory input vertex spacing");
 
-    // The GLSL specification requires that at least one compilation unit
-    // must declare the triangle ordering layout, but not all units need to do so.
-    // However, all declarations must match.
     if (vertexOrder == EvoNone)
         vertexOrder = unit.vertexOrder;
-    else if (unit.vertexOrder != EvoNone && vertexOrder != unit.vertexOrder)
+    else if (vertexOrder != unit.vertexOrder)
         error(infoSink, "Contradictory triangle ordering");
 
     MERGE_TRUE(pointMode);
 
     for (int i = 0; i < 3; ++i) {
-        // The GLSL specification requires that all workgroup size declarations must match
-        // but not all units have to declare the layout.
         if (unit.localSizeNotDefault[i]) {
             if (!localSizeNotDefault[i]) {
                 localSize[i] = unit.localSize[i];
@@ -610,11 +255,9 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
                 error(infoSink, "Contradictory local size");
         }
 
-        // The GLSL specification requires that all workgroup size specialization
-        // ids declarations must match, but not all units have to declare the layout.
         if (localSizeSpecId[i] == TQualifier::layoutNotSet)
             localSizeSpecId[i] = unit.localSizeSpecId[i];
-        else if (unit.localSizeSpecId[i] != TQualifier::layoutNotSet && localSizeSpecId[i] != unit.localSizeSpecId[i])
+        else if (localSizeSpecId[i] != unit.localSizeSpecId[i])
             error(infoSink, "Contradictory local size specialization ids");
     }
 
@@ -623,13 +266,10 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
     MERGE_TRUE(nonCoherentColorAttachmentReadEXT);
     MERGE_TRUE(nonCoherentDepthAttachmentReadEXT);
     MERGE_TRUE(nonCoherentStencilAttachmentReadEXT);
-    MERGE_TRUE(nonCoherentTileAttachmentReadQCOM);
 
-    // The GLSL specification requires that all depth layout redeclarations must match,
-    // but not all units have to declare the layout.
     if (depthLayout == EldNone)
         depthLayout = unit.depthLayout;
-    else if (unit.depthLayout != EldNone && depthLayout != unit.depthLayout)
+    else if (depthLayout != unit.depthLayout)
         error(infoSink, "Contradictory depth layouts");
 
     MERGE_TRUE(depthReplacing);
@@ -640,11 +280,9 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
     MERGE_TRUE(xfbMode);
 
     for (size_t b = 0; b < xfbBuffers.size(); ++b) {
-        // The GLSL specification requires that all xfb_stride declarations for
-        // the same buffer must match, but not all units have to declare the layout.
         if (xfbBuffers[b].stride == TQualifier::layoutXfbStrideEnd)
             xfbBuffers[b].stride = unit.xfbBuffers[b].stride;
-        else if (unit.xfbBuffers[b].stride != TQualifier::layoutXfbStrideEnd && xfbBuffers[b].stride != unit.xfbBuffers[b].stride)
+        else if (xfbBuffers[b].stride != unit.xfbBuffers[b].stride)
             error(infoSink, "Contradictory xfb_stride");
         xfbBuffers[b].implicitStride = std::max(xfbBuffers[b].implicitStride, unit.xfbBuffers[b].implicitStride);
         if (unit.xfbBuffers[b].contains64BitType)
@@ -873,6 +511,17 @@ void TIntermediate::mergeBodies(TInfoSink& infoSink, TIntermSequence& globals, c
     globals.insert(globals.end() - 1, unitGlobals.begin(), unitGlobals.end() - 1);
 }
 
+static inline bool isSameInterface(TIntermSymbol* symbol, EShLanguage stage, TIntermSymbol* unitSymbol, EShLanguage unitStage) {
+    return // 1) same stage and same shader interface
+        (stage == unitStage && symbol->getType().getShaderInterface() == unitSymbol->getType().getShaderInterface()) ||
+        // 2) accross stages and both are uniform or buffer
+        (symbol->getQualifier().storage == EvqUniform  && unitSymbol->getQualifier().storage == EvqUniform) ||
+        (symbol->getQualifier().storage == EvqBuffer   && unitSymbol->getQualifier().storage == EvqBuffer) ||
+        // 3) in/out matched across stage boundary
+        (stage < unitStage && symbol->getQualifier().storage == EvqVaryingOut  && unitSymbol->getQualifier().storage == EvqVaryingIn) ||
+        (unitStage < stage && symbol->getQualifier().storage == EvqVaryingIn && unitSymbol->getQualifier().storage == EvqVaryingOut);
+}
+
 //
 // Global Unfiform block stores any default uniforms (i.e. uniforms without a block)
 // If two linked stages declare the same member, they are meant to be the same uniform
@@ -962,10 +611,10 @@ void TIntermediate::mergeBlockDefinitions(TInfoSink& infoSink, TIntermSymbol* bl
                 // don't need as many checks as when merging symbols, since
                 // initializers and most qualifiers are stripped when the member is moved into the block
                 if ((*memberType) != (*unitMemberType)) {
-                    error(infoSink, "Types must match:", unitBlock->getStage());
+                    error(infoSink, "Types must match:");
                     infoSink.info << "    " << memberType->getFieldName() << ": ";
-                    infoSink.info << "\"" << memberType->getCompleteString() << "\" in stage " << StageName(block->getStage()) << " versus ";
-                    infoSink.info << "\"" << unitMemberType->getCompleteString() << "\" in stage " << StageName(unitBlock->getStage()) << "\n";
+                    infoSink.info << "\"" << memberType->getCompleteString() << "\" versus ";
+                    infoSink.info << "\"" << unitMemberType->getCompleteString() << "\"\n";
                 }
 
                 memberIndexUpdates[i] = j;
@@ -1064,7 +713,18 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
             TIntermSymbol* unitSymbol = unitLinkerObjects[unitLinkObj]->getAsSymbolNode();
             assert(symbol && unitSymbol);
 
-            if (isSameSymbol(symbol, unitSymbol)) {
+            bool isSameSymbol = false;
+            // If they are both blocks in the same shader interface,
+            // match by the block-name, not the identifier name.
+            if (symbol->getType().getBasicType() == EbtBlock && unitSymbol->getType().getBasicType() == EbtBlock) {
+                if (isSameInterface(symbol, getStage(), unitSymbol, unitStage)) {
+                    isSameSymbol = symbol->getType().getTypeName() == unitSymbol->getType().getTypeName();
+                }
+            }
+            else if (symbol->getName() == unitSymbol->getName())
+                isSameSymbol = true;
+
+            if (isSameSymbol) {
                 // filter out copy
                 merge = false;
 
@@ -1090,39 +750,18 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
                 }
                 else if (symbol->getWritableType().isImplicitlySizedArray() && unitSymbol->getType().isSizedArray()) {
                     if (symbol->getWritableType().getImplicitArraySize() > unitSymbol->getType().getOuterArraySize())
-                        error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.", unitStage);
+                        error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.");
                 }
                 else if (unitSymbol->getType().isImplicitlySizedArray() && symbol->getWritableType().isSizedArray()) {
                     if (unitSymbol->getType().getImplicitArraySize() > symbol->getWritableType().getOuterArraySize())
-                        error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.", unitStage);
-                }
-
-                if (symbol->getType().isStruct() && unitSymbol->getType().isStruct() &&
-                    symbol->getType().getStruct()->size() == unitSymbol->getType().getStruct()->size()) {
-                    for (int i = 0; i < (int)symbol->getType().getStruct()->size(); ++i) {
-                        auto& type = (*symbol->getWritableType().getStruct())[i];
-                        auto& unitType = (*unitSymbol->getWritableType().getStruct())[i];
-
-                        if (type.type->isImplicitlySizedArray() && unitType.type->isImplicitlySizedArray()) {
-                            if (unitType.type->getImplicitArraySize() > type.type->getImplicitArraySize())
-                                type.type->updateImplicitArraySize(unitType.type->getImplicitArraySize());
-                        }
-                        else if (type.type->isImplicitlySizedArray() && unitType.type->isSizedArray()) {
-                            if (type.type->getImplicitArraySize() > unitType.type->getOuterArraySize())
-                                error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.", unitStage);
-                        }
-                        else if (type.type->isSizedArray() && unitType.type->isImplicitlySizedArray()) {
-                            if (type.type->getOuterArraySize() < unitType.type->getImplicitArraySize())
-                                error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.", unitStage);
-                        }
-                    }
+                        error(infoSink, "Implicit size of unsized array doesn't match same symbol among multiple shaders.");
                 }
 
                 // Update implicit array sizes
                 mergeImplicitArraySizes(symbol->getWritableType(), unitSymbol->getType());
 
                 // Check for consistent types/qualification/initializers etc.
-                mergeErrorCheck(infoSink, *symbol, *unitSymbol);
+                mergeErrorCheck(infoSink, *symbol, *unitSymbol, unitStage);
             }
             // If different symbols, verify they arn't push_constant since there can only be one per stage
             else if (symbol->getQualifier().isPushConstant() && unitSymbol->getQualifier().isPushConstant() && getStage() == unitStage)
@@ -1164,7 +803,7 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
                         }
                     };
 
-                    if (isSameInterface(symbol, unitSymbol)) {
+                    if (isSameInterface(symbol, getStage(), unitSymbol, unitStage)) {
                         checkName(symbol->getName());
 
                         // check members of other anonymous blocks
@@ -1208,11 +847,9 @@ void TIntermediate::mergeImplicitArraySizes(TType& type, const TType& unitType)
 //
 // This function only does one of intra- or cross-stage matching per call.
 //
-void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& symbol, const TIntermSymbol& unitSymbol)
+void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& symbol, const TIntermSymbol& unitSymbol, EShLanguage unitStage)
 {
-    EShLanguage stage = symbol.getStage();
-    EShLanguage unitStage = unitSymbol.getStage();
-    bool crossStage = stage != unitStage;
+    bool crossStage = getStage() != unitStage;
     bool writeTypeComparison = false;
     bool errorReported = false;
     bool printQualifiers = false;
@@ -1224,10 +861,10 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
         // but, we make an exception if one is an implicit array and the other is sized
         // or if the array sizes differ because of the extra array dimension on some in/out boundaries
         bool arraysMatch = false;
-        if (isIoResizeArray(symbol.getType(), stage) || isIoResizeArray(unitSymbol.getType(), unitStage)) {
+        if (isIoResizeArray(symbol.getType(), getStage()) || isIoResizeArray(unitSymbol.getType(), unitStage)) {
             // if the arrays have an extra dimension because of the stage.
             // compare dimensions while ignoring the outer dimension
-            unsigned int firstDim = isIoResizeArray(symbol.getType(), stage) ? 1 : 0;
+            unsigned int firstDim = isIoResizeArray(symbol.getType(), getStage()) ? 1 : 0;
             unsigned int numDim = symbol.getArraySizes()
                 ? symbol.getArraySizes()->getNumDims() : 0;
             unsigned int unitFirstDim = isIoResizeArray(unitSymbol.getType(), unitStage) ? 1 : 0;
@@ -1256,7 +893,7 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
             if (lpidx >= 0 && rpidx >= 0) {
                 error(infoSink, "Member names and types must match:", unitStage);
                 infoSink.info << "    Block: " << symbol.getType().getTypeName() << "\n";
-                infoSink.info << "        " << StageName(stage) << " stage: \""
+                infoSink.info << "        " << StageName(getStage()) << " stage: \""
                               << (*symbol.getType().getStruct())[lpidx].type->getCompleteString(true, false, false, true,
                                       (*symbol.getType().getStruct())[lpidx].type->getFieldName()) << "\"\n";
                 infoSink.info << "        " << StageName(unitStage) << " stage: \""
@@ -1264,20 +901,20 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
                                       (*unitSymbol.getType().getStruct())[rpidx].type->getFieldName()) << "\"\n";
                 errorReported = true;
             } else if (lpidx >= 0 && rpidx == -1) {
-                  TString errmsg = StageName(stage);
+                  TString errmsg = StageName(getStage());
                   errmsg.append(" block member has no corresponding member in ").append(StageName(unitStage)).append(" block:");
                   error(infoSink, errmsg.c_str(), unitStage);
-                  infoSink.info << "    " << StageName(stage) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: "
+                  infoSink.info << "    " << StageName(getStage()) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: "
                     << (*symbol.getType().getStruct())[lpidx].type->getFieldName() << "\n";
                   infoSink.info << "    " << StageName(unitStage) << " stage: Block: " << unitSymbol.getType().getTypeName() << ", Member: n/a \n";
                   errorReported = true;
             } else if (lpidx == -1 && rpidx >= 0) {
                   TString errmsg = StageName(unitStage);
-                  errmsg.append(" block member has no corresponding member in ").append(StageName(stage)).append(" block:");
+                  errmsg.append(" block member has no corresponding member in ").append(StageName(getStage())).append(" block:");
                   error(infoSink, errmsg.c_str(), unitStage);
                   infoSink.info << "    " << StageName(unitStage) << " stage: Block: " << unitSymbol.getType().getTypeName() << ", Member: "
                     << (*unitSymbol.getType().getStruct())[rpidx].type->getFieldName() << "\n";
-                  infoSink.info << "    " << StageName(stage) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: n/a \n";
+                  infoSink.info << "    " << StageName(getStage()) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: n/a \n";
                   errorReported = true;
             } else {
                   error(infoSink, "Types must match:", unitStage);
@@ -1334,7 +971,7 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
                 layoutQualifierError = true;
             }
             if (layoutQualifierError) {
-                infoSink.info << "    " << StageName(stage) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: "
+                infoSink.info << "    " << StageName(getStage()) << " stage: Block: " << symbol.getType().getTypeName() << ", Member: "
                               << (*symbol.getType().getStruct())[li].type->getFieldName() << " \""
                               << (*symbol.getType().getStruct())[li].type->getCompleteString(true, true, false, false) << "\"\n";
                 infoSink.info << "    " << StageName(unitStage) << " stage: Block: " << unitSymbol.getType().getTypeName() << ", Member: "
@@ -1446,10 +1083,6 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
         error(infoSink, "Memory volatil qualifier must match:", unitStage);
         memoryQualifierError = true;
     }
-    if (symbol.getQualifier().nontemporal != unitSymbol.getQualifier().nontemporal) {
-        error(infoSink, "Memory nontemporal qualifier must match:", unitStage);
-        memoryQualifierError = true;
-    }
     if (symbol.getQualifier().restrict != unitSymbol.getQualifier().restrict) {
         error(infoSink, "Memory restrict qualifier must match:", unitStage);
         memoryQualifierError = true;
@@ -1519,24 +1152,24 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
         if (symbol.getType().getBasicType() == EbtBlock && unitSymbol.getType().getBasicType() == EbtBlock &&
             symbol.getType().getStruct() && unitSymbol.getType().getStruct()) {
           if (printType) {
-            infoSink.info << "    " << StageName(stage) << " stage: \"" << symbol.getType().getCompleteString(true, printQualifiers, printPrecision,
+            infoSink.info << "    " << StageName(getStage()) << " stage: \"" << symbol.getType().getCompleteString(true, printQualifiers, printPrecision,
                                                     printType, symbol.getName(), symbol.getType().getTypeName()) << "\"\n";
             infoSink.info << "    " << StageName(unitStage) << " stage: \"" << unitSymbol.getType().getCompleteString(true, printQualifiers, printPrecision,
                                                     printType, unitSymbol.getName(), unitSymbol.getType().getTypeName()) << "\"\n";
           } else {
-            infoSink.info << "    " << StageName(stage) << " stage: Block: " << symbol.getType().getTypeName() << " Instance: " << symbol.getName()
+            infoSink.info << "    " << StageName(getStage()) << " stage: Block: " << symbol.getType().getTypeName() << " Instance: " << symbol.getName()
               << ": \"" << symbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType) << "\"\n";
             infoSink.info << "    " << StageName(unitStage) << " stage: Block: " << unitSymbol.getType().getTypeName() << " Instance: " << unitSymbol.getName()
               << ": \"" << unitSymbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType) << "\"\n";
           }
         } else {
           if (printType) {
-            infoSink.info << "    " << StageName(stage) << " stage: \""
+            infoSink.info << "    " << StageName(getStage()) << " stage: \""
               << symbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType, symbol.getName()) << "\"\n";
             infoSink.info << "    " << StageName(unitStage) << " stage: \""
               << unitSymbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType, unitSymbol.getName()) << "\"\n";
           } else {
-            infoSink.info << "    " << StageName(stage) << " stage: " << symbol.getName() << " \""
+            infoSink.info << "    " << StageName(getStage()) << " stage: " << symbol.getName() << " \""
               << symbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType) << "\"\n";
             infoSink.info << "    " << StageName(unitStage) << " stage: " << unitSymbol.getName() << " \""
               << unitSymbol.getType().getCompleteString(true, printQualifiers, printPrecision, printType) << "\"\n";
@@ -1568,8 +1201,7 @@ void TIntermediate::sharedBlockCheck(TInfoSink& infoSink)
 // Do final link-time error checking of a complete (merged) intermediate representation.
 // (Much error checking was done during merging).
 //
-// Also, lock in defaults of things not set.
-// Defer adopting implicit array sizes to later, after all stages are merged.
+// Also, lock in defaults of things not set, including array sizes.
 //
 void TIntermediate::finalCheck(TInfoSink& infoSink, bool keepUncalled)
 {
@@ -1730,6 +1362,23 @@ void TIntermediate::finalCheck(TInfoSink& infoSink, bool keepUncalled)
         error(infoSink, "Unknown Stage.");
         break;
     }
+
+    // Process the tree for any node-specific work.
+    class TFinalLinkTraverser : public TIntermTraverser {
+    public:
+        TFinalLinkTraverser() { }
+        virtual ~TFinalLinkTraverser() { }
+
+        virtual void visitSymbol(TIntermSymbol* symbol)
+        {
+            // Implicitly size arrays.
+            // If an unsized array is left as unsized, it effectively
+            // becomes run-time sized.
+            symbol->getWritableType().adoptImplicitArraySizes(false);
+        }
+    } finalLinkTraverser;
+
+    treeRoot->traverse(&finalLinkTraverser);
 }
 
 //
@@ -1986,8 +1635,6 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
         set = 1;
     else if (qualifier.isHitObjectAttrNV())
         set = 2;
-    else if (qualifier.isHitObjectAttrEXT())
-        set = 2;
     else
         return -1;
 
@@ -2026,7 +1673,7 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
     // For raytracing IO (payloads and callabledata) each declaration occupies a single
     // slot irrespective of type.
     int collision = -1; // no collision
-    if (qualifier.isAnyPayload() || qualifier.isAnyCallable() || qualifier.isHitObjectAttrNV() || qualifier.isHitObjectAttrEXT()) {
+    if (qualifier.isAnyPayload() || qualifier.isAnyCallable() || qualifier.isHitObjectAttrNV()) {
         TRange range(qualifier.layoutLocation, qualifier.layoutLocation);
         collision = checkLocationRT(set, qualifier.layoutLocation);
         if (collision < 0)
@@ -2042,7 +1689,7 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
         // First range:
         TRange locationRange(qualifier.layoutLocation, qualifier.layoutLocation);
         TRange componentRange(0, 3);
-        TIoRange range(locationRange, componentRange, type.getBasicType(), 0, qualifier.centroid, qualifier.smooth, qualifier.flat, qualifier.sample, qualifier.patch);
+        TIoRange range(locationRange, componentRange, type.getBasicType(), 0, qualifier.centroid, qualifier.smooth, qualifier.flat);
 
         // check for collisions
         collision = checkLocationRange(set, range, type, typeCollision);
@@ -2052,7 +1699,7 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
             // Second range:
             TRange locationRange2(qualifier.layoutLocation + 1, qualifier.layoutLocation + 1);
             TRange componentRange2(0, 1);
-            TIoRange range2(locationRange2, componentRange2, type.getBasicType(), 0, qualifier.centroid, qualifier.smooth, qualifier.flat, qualifier.sample, qualifier.patch);
+            TIoRange range2(locationRange2, componentRange2, type.getBasicType(), 0, qualifier.centroid, qualifier.smooth, qualifier.flat);
 
             // check for collisions
             collision = checkLocationRange(set, range2, type, typeCollision);
@@ -2078,7 +1725,7 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
     TBasicType basicTy = type.getBasicType();
     if (basicTy == EbtSampler && type.getSampler().isAttachmentEXT())
         basicTy = type.getSampler().type;
-    TIoRange range(locationRange, componentRange, basicTy, qualifier.hasIndex() ? qualifier.getIndex() : 0, qualifier.centroid, qualifier.smooth, qualifier.flat, qualifier.sample, qualifier.patch);
+    TIoRange range(locationRange, componentRange, basicTy, qualifier.hasIndex() ? qualifier.getIndex() : 0, qualifier.centroid, qualifier.smooth, qualifier.flat);
 
     // check for collisions, except for vertex inputs on desktop targeting OpenGL
     if (! (!isEsProfile() && language == EShLangVertex && qualifier.isPipeInput()) || spvVersion.vulkan > 0)
@@ -2090,24 +1737,6 @@ int TIntermediate::addUsedLocation(const TQualifier& qualifier, const TType& typ
     return collision;
 }
 
-// Check that two types can be stored in different components in the same location.
-// They must be the same type, except signed/unsigned integers are considered compatible.
-static bool checkCompatibleTypes(TBasicType t1, TBasicType t2) {
-    if (t1 != t2) {
-        if ((t1 == EbtInt8 && t2 == EbtUint8) ||
-            (t2 == EbtInt8 && t1 == EbtUint8) ||
-            (t1 == EbtInt16 && t2 == EbtUint16) ||
-            (t2 == EbtInt16 && t1 == EbtUint16)||
-            (t1 == EbtInt && t2 == EbtUint) ||
-            (t2 == EbtInt && t1 == EbtUint)||
-            (t1 == EbtInt64 && t2 == EbtUint64) ||
-            (t2 == EbtInt64 && t1 == EbtUint64)) {
-            return true;
-        }
-    }
-    return t1 == t2;
-}
-
 // Compare a new (the passed in) 'range' against the existing set, and see
 // if there are any collisions.
 //
@@ -2120,12 +1749,10 @@ int TIntermediate::checkLocationRange(int set, const TIoRange& range, const TTyp
             // there is a collision; pick one
             return std::max(range.location.start, usedIo[set][r].location.start);
         } else if (range.location.overlap(usedIo[set][r].location) &&
-                   (!checkCompatibleTypes(type.getBasicType(), usedIo[set][r].basicType) ||
+                   (type.getBasicType() != usedIo[set][r].basicType ||
                     type.getQualifier().centroid != usedIo[set][r].centroid ||
                     type.getQualifier().smooth != usedIo[set][r].smooth ||
-                    type.getQualifier().flat != usedIo[set][r].flat ||
-                    type.getQualifier().sample != usedIo[set][r].sample ||
-                    type.getQualifier().patch != usedIo[set][r].patch)) {
+                    type.getQualifier().flat != usedIo[set][r].flat)) {
             // aliased-type mismatch
             typeCollision = true;
             return std::max(range.location.start, usedIo[set][r].location.start);
@@ -2414,9 +2041,6 @@ int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size)
     case EbtUint64:
     case EbtDouble:  size = 8; return 8;
     case EbtFloat16: size = 2; return 2;
-    case EbtBFloat16: size = 2; return 2;
-    case EbtFloatE5M2:
-    case EbtFloatE4M3:
     case EbtInt8:
     case EbtUint8:   size = 1; return 1;
     case EbtInt16:
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/localintermediate.h b/engine/thirdparty/glslang/glslang/MachineIndependent/localintermediate.h
index ce57ce4c..5e971478 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/localintermediate.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/localintermediate.h
@@ -48,7 +48,6 @@
 #include <functional>
 #include <set>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 class TInfoSink;
@@ -100,8 +99,7 @@ private:
 // A "call" is a pair: <caller, callee>.
 // There can be duplicates. General assumption is the list is small.
 struct TCall {
-    TCall(const TString& pCaller, const TString& pCallee)
-        : caller(pCaller), callee(pCallee), visited(false), currentPath(false), errorGiven(false) { }
+    TCall(const TString& pCaller, const TString& pCallee) : caller(pCaller), callee(pCallee) { }
     TString caller;
     TString callee;
     bool visited;
@@ -125,8 +123,8 @@ struct TRange {
 // within the same location range, component range, and index value.  Locations don't alias unless
 // all other dimensions of their range overlap.
 struct TIoRange {
-    TIoRange(TRange location, TRange component, TBasicType basicType, int index, bool centroid, bool smooth, bool flat, bool sample, bool patch)
-        : location(location), component(component), basicType(basicType), index(index), centroid(centroid), smooth(smooth), flat(flat), sample(sample), patch(patch)
+    TIoRange(TRange location, TRange component, TBasicType basicType, int index, bool centroid, bool smooth, bool flat)
+        : location(location), component(component), basicType(basicType), index(index), centroid(centroid), smooth(smooth), flat(flat)
     {
     }
     bool overlap(const TIoRange& rhs) const
@@ -140,8 +138,6 @@ struct TIoRange {
     bool centroid;
     bool smooth;
     bool flat;
-    bool sample;
-    bool patch;
 };
 
 // An offset range is a 2-D rectangle; the set of (binding, offset) pairs all lying
@@ -269,7 +265,6 @@ public:
         gpu_shader_fp64                           = 1 << 9,
         gpu_shader_int16                          = 1 << 10,
         gpu_shader_half_float                     = 1 << 11,
-        nv_gpu_shader5_types                      = 1 << 12,
     } feature;
     void insert(feature f) { features |= f; }
     void erase(feature f) { features &= ~f; }
@@ -344,7 +339,6 @@ public:
         numTaskNVBlocks(0),
         layoutPrimitiveCulling(false),
         numTaskEXTPayloads(0),
-        nonCoherentTileAttachmentReadQCOM(false),
         autoMapBindings(false),
         autoMapLocations(false),
         flattenUniformArrays(false),
@@ -373,12 +367,6 @@ public:
         localSizeSpecId[1] = TQualifier::layoutNotSet;
         localSizeSpecId[2] = TQualifier::layoutNotSet;
         xfbBuffers.resize(TQualifier::layoutXfbBufferEnd);
-        tileShadingRateQCOM[0] = 0;
-        tileShadingRateQCOM[1] = 0;
-        tileShadingRateQCOM[2] = 0;
-        tileShadingRateQCOMNotDefault[0] = false;
-        tileShadingRateQCOMNotDefault[1] = false;
-        tileShadingRateQCOMNotDefault[2] = false;
         shiftBinding.fill(0);
     }
 
@@ -448,9 +436,6 @@ public:
         case EShTargetVulkan_1_3:
             processes.addProcess("target-env vulkan1.3");
             break;
-        case EShTargetVulkan_1_4:
-            processes.addProcess("target-env vulkan1.4");
-            break;
         default:
             processes.addProcess("target-env vulkanUnknown");
             break;
@@ -575,8 +560,8 @@ public:
     TIntermConstantUnion* addConstantUnion(const TString*, const TSourceLoc&, bool literal = false) const;
     TIntermTyped* promoteConstantUnion(TBasicType, TIntermConstantUnion*) const;
     bool parseConstTree(TIntermNode*, TConstUnionArray, TOperator, const TType&, bool singleConstantParam = false);
-    TIntermLoop* addLoop(TIntermNode*, TIntermNode*, TIntermTyped*, bool testFirst, const TSourceLoc&);
-    TIntermAggregate* addForLoop(TIntermNode*, TIntermNode*, TIntermNode*, TIntermTyped*, bool testFirst,
+    TIntermLoop* addLoop(TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst, const TSourceLoc&);
+    TIntermAggregate* addForLoop(TIntermNode*, TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst,
         const TSourceLoc&, TIntermLoop*&);
     TIntermBranch* addBranch(TOperator, const TSourceLoc&);
     TIntermBranch* addBranch(TOperator, TIntermTyped*, const TSourceLoc&);
@@ -659,21 +644,6 @@ public:
 
     bool isEsProfile() const { return profile == EEsProfile; }
 
-    bool setTileShadingRateQCOM(int dim, int size)
-    {
-        if (tileShadingRateQCOMNotDefault[dim])
-            return size == tileShadingRateQCOM[dim];
-        tileShadingRateQCOMNotDefault[dim] = true;
-        tileShadingRateQCOM[dim] = size;
-        return true;
-    }
-    unsigned int getTileShadingRateQCOM(int dim) const { return tileShadingRateQCOM[dim]; }
-    bool isTileShadingRateQCOMSet() const
-    {
-        // Return true if any component has been set (i.e. any component is not default).
-        return tileShadingRateQCOMNotDefault[0] || tileShadingRateQCOMNotDefault[1] || tileShadingRateQCOMNotDefault[2];
-    }
-
     void setShiftBinding(TResourceType res, unsigned int shift)
     {
         shiftBinding[res] = shift;
@@ -759,21 +729,6 @@ public:
         usePhysicalStorageBuffer = true;
     }
     bool usingPhysicalStorageBuffer() const { return usePhysicalStorageBuffer; }
-    void setReplicatedComposites()
-    {
-        useReplicatedComposites = true;
-    }
-    bool usingReplicatedComposites() const { return useReplicatedComposites; }
-    void setPromoteUint32Indices()
-    {
-        promoteUint32Indices = true;
-    }
-    bool usingPromoteUint32Indices() const { return promoteUint32Indices; }
-    void setShader64BitIndexing()
-    {
-        shader64BitIndexing = true;
-    }
-    bool usingShader64BitIndexing() const { return shader64BitIndexing; }
     void setUseVariablePointers()
     {
         useVariablePointers = true;
@@ -929,8 +884,6 @@ public:
     bool getNonCoherentDepthAttachmentReadEXT() const { return nonCoherentDepthAttachmentReadEXT; }
     void setNonCoherentStencilAttachmentReadEXT() { nonCoherentStencilAttachmentReadEXT = true; }
     bool getNonCoherentStencilAttachmentReadEXT() const { return nonCoherentStencilAttachmentReadEXT; }
-    void setNonCoherentTileAttachmentReadQCOM() { nonCoherentTileAttachmentReadQCOM = true; }
-    bool getNonCoherentTileAttachmentReadQCOM() const { return nonCoherentTileAttachmentReadQCOM; }
     void setPostDepthCoverage() { postDepthCoverage = true; }
     bool getPostDepthCoverage() const { return postDepthCoverage; }
     void setEarlyFragmentTests() { earlyFragmentTests = true; }
@@ -1071,11 +1024,11 @@ public:
 #endif
 
     bool usingScalarBlockLayout() const {
-        return IsRequestedExtension(E_GL_EXT_scalar_block_layout);
-    }
-
-    bool usingTextureOffsetNonConst() const {
-        return IsRequestedExtension(E_GL_EXT_texture_offset_non_const);
+        for (auto extIt = requestedExtensions.begin(); extIt != requestedExtensions.end(); ++extIt) {
+            if (*extIt == E_GL_EXT_scalar_block_layout)
+                return true;
+        }
+        return false;
     }
 
     bool IsRequestedExtension(const char* extension) const
@@ -1089,9 +1042,7 @@ public:
 
     void mergeGlobalUniformBlocks(TInfoSink& infoSink, TIntermediate& unit, bool mergeExistingOnly);
     void mergeUniformObjects(TInfoSink& infoSink, TIntermediate& unit);
-    void mergeImplicitArraySizes(TInfoSink& infoSink, TIntermediate& unit);
-    void checkStageIO(TInfoSink&, TIntermediate&, EShMessages);
-    void optimizeStageIO(TInfoSink&, TIntermediate&);
+    void checkStageIO(TInfoSink&, TIntermediate&);
 
     bool buildConvertOp(TBasicType dst, TBasicType src, TOperator& convertOp) const;
     TIntermTyped* createConversion(TBasicType convertTo, TIntermTyped* node) const;
@@ -1104,7 +1055,6 @@ public:
     int checkLocationRT(int set, int location);
     int addUsedOffsets(int binding, int offset, int numOffsets);
     bool addUsedConstantId(int id);
-    GLSLANG_EXPORT_FOR_TESTS
     static int computeTypeLocationSize(const TType&, EShLanguage);
     static int computeTypeUniformLocationSize(const TType&);
 
@@ -1143,42 +1093,26 @@ public:
     // Certain explicit conversions are allowed conditionally
     bool getArithemeticInt8Enabled() const {
         return numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types) ||
-               numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) ||
                numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types_int8);
     }
     bool getArithemeticInt16Enabled() const {
         return numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types) ||
                numericFeatures.contains(TNumericFeatures::gpu_shader_int16) ||
-               numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) ||
                numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types_int16);
     }
 
     bool getArithemeticFloat16Enabled() const {
         return numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types) ||
                numericFeatures.contains(TNumericFeatures::gpu_shader_half_float) ||
-               numericFeatures.contains(TNumericFeatures::nv_gpu_shader5_types) ||
                numericFeatures.contains(TNumericFeatures::shader_explicit_arithmetic_types_float16);
     }
     void updateNumericFeature(TNumericFeatures::feature f, bool on)
         { on ? numericFeatures.insert(f) : numericFeatures.erase(f); }
 
-    void setBuiltinAliasLookup(std::unordered_multimap<std::string, std::string> symbolMap) {
-        builtinAliasLookup = std::move(symbolMap);
-    }
-    const std::unordered_multimap<std::string, std::string>& getBuiltinAliasLookup() const {
-        return builtinAliasLookup;
-    }
-
 protected:
-    TIntermSymbol* addSymbol(long long Id, const TString&, const TString&, const TType&, const TConstUnionArray&, TIntermTyped* subtree, const TSourceLoc&);
-    void error(TInfoSink& infoSink, const TSourceLoc* loc, EShMessages messages, const char*, EShLanguage unitStage = EShLangCount);
-    void error(TInfoSink& infoSink, const char* message, EShLanguage unitStage = EShLangCount) {
-        error(infoSink, nullptr, EShMsgDefault, message, unitStage);
-    }
-    void warn(TInfoSink& infoSink, const TSourceLoc* loc, EShMessages, const char*, EShLanguage unitStage = EShLangCount);
-    void warn(TInfoSink& infoSink, const char* message, EShLanguage unitStage = EShLangCount) {
-        warn(infoSink, nullptr, EShMsgDefault, message, unitStage);
-    }
+    TIntermSymbol* addSymbol(long long Id, const TString&, const TType&, const TConstUnionArray&, TIntermTyped* subtree, const TSourceLoc&);
+    void error(TInfoSink& infoSink, const char*, EShLanguage unitStage = EShLangCount);
+    void warn(TInfoSink& infoSink, const char*, EShLanguage unitStage = EShLangCount);
     void mergeCallGraphs(TInfoSink&, TIntermediate&);
     void mergeModes(TInfoSink&, TIntermediate&);
     void mergeTrees(TInfoSink&, TIntermediate&);
@@ -1188,7 +1122,7 @@ protected:
     void mergeLinkerObjects(TInfoSink&, TIntermSequence& linkerObjects, const TIntermSequence& unitLinkerObjects, EShLanguage);
     void mergeBlockDefinitions(TInfoSink&, TIntermSymbol* block, TIntermSymbol* unitBlock, TIntermediate* unitRoot);
     void mergeImplicitArraySizes(TType&, const TType&);
-    void mergeErrorCheck(TInfoSink&, const TIntermSymbol&, const TIntermSymbol&);
+    void mergeErrorCheck(TInfoSink&, const TIntermSymbol&, const TIntermSymbol&, EShLanguage);
     void checkCallGraphCycles(TInfoSink&);
     void checkCallGraphBodies(TInfoSink&, bool keepUncalled);
     void inOutLocationCheck(TInfoSink&);
@@ -1284,10 +1218,6 @@ protected:
     bool layoutPrimitiveCulling;
     int numTaskEXTPayloads;
 
-    bool nonCoherentTileAttachmentReadQCOM;
-    int  tileShadingRateQCOM[3];
-    bool tileShadingRateQCOMNotDefault[3];
-
     // Base shift values
     std::array<unsigned int, EResCount> shiftBinding;
 
@@ -1312,9 +1242,6 @@ protected:
     bool subgroupUniformControlFlow;
     bool maximallyReconverges;
     bool usePhysicalStorageBuffer;
-    bool useReplicatedComposites { false };
-    bool promoteUint32Indices { false };
-    bool shader64BitIndexing { false };
 
     TSpirvRequirement* spirvRequirement;
     TSpirvExecutionMode* spirvExecutionMode;
@@ -1343,9 +1270,6 @@ protected:
     // Included text. First string is a name, second is the included text
     std::map<std::string, std::string> includeText;
 
-    // Maps from canonical symbol name to alias symbol names
-    std::unordered_multimap<std::string, std::string> builtinAliasLookup;
-
     // for OpModuleProcessed, or equivalent
     TProcesses processes;
 
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/parseVersions.h b/engine/thirdparty/glslang/glslang/MachineIndependent/parseVersions.h
index 81f5f59b..5c77e42c 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/parseVersions.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/parseVersions.h
@@ -103,9 +103,6 @@ public:
     virtual void doubleCheck(const TSourceLoc&, const char* op);
     virtual void float16Check(const TSourceLoc&, const char* op, bool builtIn = false);
     virtual void float16ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void bfloat16ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void floate5m2ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void floate4m3ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
     virtual bool float16Arithmetic();
     virtual void requireFloat16Arithmetic(const TSourceLoc& loc, const char* op, const char* featureDesc);
     virtual void int16ScalarVectorCheck(const TSourceLoc&, const char* op, bool builtIn = false);
@@ -124,11 +121,6 @@ public:
     virtual void fcoopmatCheckNV(const TSourceLoc&, const char* op, bool builtIn = false);
     virtual void intcoopmatCheckNV(const TSourceLoc&, const char *op, bool builtIn = false);
     virtual void coopmatCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void coopmatConverisonCheckQCOM(const TSourceLoc& loc, const char* op, bool builtIn = false);
-    virtual void tensorLayoutViewCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void coopvecCheck(const TSourceLoc&, const char* op, bool builtIn = false);
-    virtual void intattachmentCheck(const TSourceLoc&, const char *op, bool builtIn = false);
-    virtual void tensorCheckARM(const TSourceLoc&, const char *op, bool builtIn = false);
     bool relaxedErrors()    const { return (messages & EShMsgRelaxedErrors) != 0; }
     bool suppressWarnings() const { return (messages & EShMsgSuppressWarnings) != 0; }
     bool isForwardCompatible() const { return forwardCompatible; }
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
index 90270367..5f18c4e9 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -153,57 +153,12 @@ int TPpContext::CPPdefine(TPpToken* ppToken)
         return token;
     }
 
-    int pendingPoundSymbols = 0;
-    TPpToken savePound;
     // record the definition of the macro
     while (token != '\n' && token != EndOfInput) {
-        if (token == '#') {
-            pendingPoundSymbols++;
-            if (pendingPoundSymbols == 0) {
-                savePound = *ppToken;
-            }
-        } else if (pendingPoundSymbols == 0) {
-            mac.body.putToken(token, ppToken);
-        } else if (pendingPoundSymbols == 1) {
-            // A single #: stringify
-            parseContext.requireProfile(ppToken->loc, ~EEsProfile, "stringify (#)");
-            parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, nullptr, "stringify (#)");
-            bool isArg = false;
-            if (token == PpAtomIdentifier) {
-                for (int i = (int)mac.args.size() - 1; i >= 0; i--) {
-                    if (strcmp(atomStrings.getString(mac.args[i]), ppToken->name) == 0) {
-                        isArg = true;
-                        break;
-                    }
-                }
-            }
-            if (!isArg) {
-                parseContext.ppError(ppToken->loc, "'#' is not followed by a macro parameter.", "#", "");
-                return token;
-            }
-            mac.body.putToken(tStringifyLevelInput::PUSH, ppToken);
-            mac.body.putToken(token, ppToken);
-            mac.body.putToken(tStringifyLevelInput::POP, ppToken);
-            pendingPoundSymbols = 0;
-        } else if (pendingPoundSymbols % 2 == 0) {
-            // Any number of pastes '##' in a row: idempotent, just becomes one paste
-            parseContext.requireProfile(ppToken->loc, ~EEsProfile, "token pasting (##)");
-            parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, nullptr, "token pasting (##)");
-            for (int i = 0; i < pendingPoundSymbols / 2; i++) {
-                mac.body.putToken(PpAtomPaste, &savePound);
-            }
-            mac.body.putToken(token, ppToken);
-            pendingPoundSymbols = 0;
-        } else {
-            // An odd number of '#' i.e., mix of paste and stringify: does not give valid preprocessing token
-            parseContext.ppError(ppToken->loc, "Illegal sequence of paste (##) and stringify (#).", "#", "");
-            return token;
-        }
-
+        mac.body.putToken(token, ppToken);
         token = scanToken(ppToken);
-    }
-    if (pendingPoundSymbols != 0) {
-        parseContext.ppError(ppToken->loc, "Macro ended with incomplete '#' paste/stringify operators", "#", "");
+        if (token != '\n' && ppToken->space)
+            mac.body.putToken(' ', ppToken);
     }
 
     // check for duplicate definition
@@ -286,7 +241,6 @@ int TPpContext::CPPundef(TPpToken* ppToken)
 */
 int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
 {
-    inElseSkip = true;
     int depth = 0;
     int token = scanToken(ppToken);
 
@@ -343,7 +297,7 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
                     elseSeen[elsetracker] = false;
                     --elsetracker;
                 }
-                inElseSkip = false;
+
                 return CPPif(ppToken);
             }
         } else if (nextAtom == PpAtomElse) {
@@ -357,8 +311,7 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
                 parseContext.ppError(ppToken->loc, "#elif after #else", "#elif", "");
         }
     }
-    
-    inElseSkip = false;
+
     return token;
 }
 
@@ -421,7 +374,7 @@ namespace {
     int op_div(int a, int b) { return a == INT_MIN && b == -1 ? 0 : a / b; }
     int op_mod(int a, int b) { return a == INT_MIN && b == -1 ? 0 : a % b; }
     int op_pos(int a) { return a; }
-    int op_neg(int a) { return a == INT_MIN ? INT_MIN : -a; }
+    int op_neg(int a) { return -a; }
     int op_cmpl(int a) { return ~a; }
     int op_not(int a) { return !a; }
 
@@ -1164,7 +1117,7 @@ int TPpContext::tMacroInput::scan(TPpToken* ppToken)
     }
 
     // see if are preceding a ##
-    if (mac->body.peekTokenizedPasting(false)) {
+    if (mac->body.peekUntokenizedPasting()) {
         prepaste = true;
         pasting = true;
     }
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp
index f27204bc..70f51197 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp
@@ -88,8 +88,7 @@ TPpContext::TPpContext(TParseContextBase& pc, const std::string& rootFileName, T
     preamble(nullptr), strings(nullptr), previous_token('\n'), parseContext(pc), includer(inclr), inComment(false),
     rootFileName(rootFileName),
     currentSourceFile(rootFileName),
-    disableEscapeSequences(false),
-    inElseSkip(false)
+    disableEscapeSequences(false)
 {
     ifdepth = 0;
     for (elsetracker = 0; elsetracker < maxIfNesting; elsetracker++)
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.h b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.h
index 582d119f..1ec30491 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpContext.h
@@ -311,6 +311,7 @@ public:
         int getToken(TParseContextBase&, TPpToken*);
         bool atEnd() { return currentPos >= stream.size(); }
         bool peekTokenizedPasting(bool lastTokenPastes);
+        bool peekUntokenizedPasting();
         void reset() { currentPos = 0; }
 
     protected:
@@ -370,8 +371,24 @@ protected:
                 break;
             popInput();
         }
-        if (!inputStack.empty() && inputStack.back()->isStringInput() && !inElseSkip) {
+        if (!inputStack.empty() && inputStack.back()->isStringInput()) {
             if (token == '\n') {
+                bool seenNumSign = false;
+                for (int i = 0; i < (int)lastLineTokens.size() - 1;) {
+                    int curPos = i;
+                    int curToken = lastLineTokens[i++];
+                    if (curToken == '#' && lastLineTokens[i] == '#') {
+                        curToken = PpAtomPaste;
+                        i++;
+                    }
+                    if (curToken == '#') {
+                        if (seenNumSign) {
+                            parseContext.ppError(lastLineTokenLocs[curPos], "(#) can be preceded in its line only by spaces or horizontal tabs", "#", "");
+                        } else {
+                            seenNumSign = true;
+                        }
+                    }
+                }
                 lastLineTokens.clear();
                 lastLineTokenLocs.clear();
             } else {
@@ -441,38 +458,6 @@ protected:
         static const int marker = -3;
     };
 
-    class tStringifyLevelInput : public tInput {
-        int what;
-        tStringifyLevelInput(TPpContext* pp) : tInput(pp) { }
-    public:
-        static tStringifyLevelInput popMarker(TPpContext* pp)
-        {
-            tStringifyLevelInput sl(pp);
-            sl.what = POP;
-            return sl;
-        }
-
-        static tStringifyLevelInput pushMarker(TPpContext* pp)
-        {
-            tStringifyLevelInput sl(pp);
-            sl.what = PUSH;
-            return sl;
-        }
-
-        int scan(TPpToken*) override
-        {
-            if (done)
-                return EndOfInput;
-            done = true;
-
-            return what;
-        }
-        virtual int getch() override { assert(0); return EndOfInput; }
-        virtual void ungetch() override { assert(0); }
-        static const int PUSH = -4;
-        static const int POP = -5;
-    };
-
     class tZeroInput : public tInput {
     public:
         tZeroInput(TPpContext* pp) : tInput(pp) { }
@@ -747,9 +732,6 @@ protected:
 
     std::istringstream strtodStream;
     bool disableEscapeSequences;
-    // True if we're skipping a section enclosed by #if/#ifdef/#elif/#else which was evaluated to
-    // be inactive, e.g. #if 0
-    bool inElseSkip;
 };
 
 } // end namespace glslang
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp
index a2522956..49dafa59 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp
@@ -97,6 +97,7 @@ namespace glslang {
 /////////////////////////////////// Floating point constants: /////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
+// 
 // Scan a single- or double-precision floating point constant.
 // Assumes that the scanner has seen at least one digit,
 // followed by either a decimal '.' or the letter 'e', or a
@@ -469,7 +470,6 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
     static const char* const Int64_Extensions[] = {
         E_GL_ARB_gpu_shader_int64,
         E_GL_EXT_shader_explicit_arithmetic_types,
-        E_GL_NV_gpu_shader5,
         E_GL_EXT_shader_explicit_arithmetic_types_int64 };
     static const int Num_Int64_Extensions = sizeof(Int64_Extensions) / sizeof(Int64_Extensions[0]);
 
@@ -1225,9 +1225,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
 //
 int TPpContext::tokenize(TPpToken& ppToken)
 {
-    int stringifyDepth = 0;
-    TPpToken stringifiedToken; // Tokens are appended to this as they come in
-    for (;;) {
+    for(;;) {
         int token = scanToken(&ppToken);
 
         // Handle token-pasting logic
@@ -1255,20 +1253,6 @@ int TPpContext::tokenize(TPpToken& ppToken)
         if (token == '\n')
             continue;
 
-        if (token == tStringifyLevelInput::PUSH) {
-            stringifyDepth++;
-            continue;
-        }
-        if (token == tStringifyLevelInput::POP) {
-            assert(stringifyDepth > 0);
-            stringifyDepth--;
-            if (stringifyDepth == 0) {
-                snprintf(ppToken.name, sizeof(ppToken.name), "%s", stringifiedToken.name);
-                return PpAtomConstString;
-            }
-            continue;
-        }
-
         // expand macros
         if (token == PpAtomIdentifier) {
             switch (MacroExpand(&ppToken, false, true)) {
@@ -1282,21 +1266,7 @@ int TPpContext::tokenize(TPpToken& ppToken)
             }
         }
 
-        bool needStringSupport = ifdepth == 0 && (token == PpAtomConstString || stringifyDepth > 0);
-        if (needStringSupport && parseContext.intermediate.getSource() != EShSourceHlsl) {
-            // HLSL allows string literals.
-            // GLSL allows string literals with GL_EXT_debug_printf.
-            const char* const string_literal_EXTs[] = { E_GL_EXT_debug_printf, E_GL_EXT_spirv_intrinsics };
-            parseContext.requireExtensions(ppToken.loc, 2, string_literal_EXTs, "string literal");
-            if (!parseContext.extensionTurnedOn(E_GL_EXT_debug_printf) &&
-                !parseContext.extensionTurnedOn(E_GL_EXT_spirv_intrinsics)) {
-                continue;
-            }
-        }
-
         switch (token) {
-        case PpAtomConstString:
-            break;
         case PpAtomIdentifier:
         case PpAtomConstInt:
         case PpAtomConstUint:
@@ -1310,6 +1280,17 @@ int TPpContext::tokenize(TPpToken& ppToken)
             if (ppToken.name[0] == '\0')
                 continue;
             break;
+        case PpAtomConstString:
+            // HLSL allows string literals.
+            // GLSL allows string literals with GL_EXT_debug_printf.
+            if (ifdepth == 0 && parseContext.intermediate.getSource() != EShSourceHlsl) {
+              const char* const string_literal_EXTs[] = { E_GL_EXT_debug_printf, E_GL_EXT_spirv_intrinsics };
+              parseContext.requireExtensions(ppToken.loc, 2, string_literal_EXTs, "string literal");
+              if (!parseContext.extensionTurnedOn(E_GL_EXT_debug_printf) &&
+                  !parseContext.extensionTurnedOn(E_GL_EXT_spirv_intrinsics))
+                  continue;
+            }
+            break;
         case '\'':
             parseContext.ppError(ppToken.loc, "character literals not supported", "\'", "");
             continue;
@@ -1317,17 +1298,6 @@ int TPpContext::tokenize(TPpToken& ppToken)
             snprintf(ppToken.name, sizeof(ppToken.name), "%s", atomStrings.getString(token));
             break;
         }
-        if (stringifyDepth > 0) {
-            size_t existingLen = strlen(stringifiedToken.name);
-            char* dst = stringifiedToken.name + existingLen;
-            // stringify_depth would determine how many layers of \\\"\\\" are needed, if we wanted to.
-            if (ppToken.space) {
-                snprintf(dst, sizeof(stringifiedToken.name) - existingLen - 1, " %s", ppToken.name);
-            } else {
-                snprintf(dst, sizeof(stringifiedToken.name) - existingLen, "%s", ppToken.name);
-            }
-            continue;
-        }
 
         return token;
     }
@@ -1358,7 +1328,6 @@ int TPpContext::tokenPaste(int token, TPpToken& ppToken)
 
         // This covers end of macro expansion
         if (endOfReplacementList()) {
-            // this should be unreachable, incomplete #/## sequences are caught at macro parsing time.
             parseContext.ppError(ppToken.loc, "unexpected location; end of replacement list", "##", "");
             break;
         }
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
index 472df78f..e6ee64cf 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
@@ -105,7 +105,7 @@ void TPpContext::TokenStream::putToken(int atom, TPpToken* ppToken)
 }
 
 // Read the next token from a macro token stream.
-int TPpContext::TokenStream::getToken(TParseContextBase& parseContext, TPpToken* ppToken)
+int TPpContext::TokenStream::getToken(TParseContextBase& parseContext, TPpToken *ppToken)
 {
     if (atEnd())
         return EndOfInput;
@@ -113,6 +113,16 @@ int TPpContext::TokenStream::getToken(TParseContextBase& parseContext, TPpToken*
     int atom = stream[currentPos++].get(*ppToken);
     ppToken->loc = parseContext.getCurrentLoc();
 
+    // Check for ##, unless the current # is the last character
+    if (atom == '#') {
+        if (peekToken('#')) {
+            parseContext.requireProfile(ppToken->loc, ~EEsProfile, "token pasting (##)");
+            parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, nullptr, "token pasting (##)");
+            currentPos++;
+            atom = PpAtomPaste;
+        }
+    }
+
     return atom;
 }
 
@@ -136,10 +146,8 @@ bool TPpContext::TokenStream::peekTokenizedPasting(bool lastTokenPastes)
 
     // 2. last token and we've been told after this there will be a ##
 
-    if (! lastTokenPastes) {
-        currentPos = savePos;
+    if (! lastTokenPastes)
         return false;
-    }
     // Getting here means the last token will be pasted, after this
 
     // Are we at the last non-whitespace token?
@@ -159,6 +167,29 @@ bool TPpContext::TokenStream::peekTokenizedPasting(bool lastTokenPastes)
     return !moreTokens;
 }
 
+// See if the next non-white-space tokens are two consecutive #
+bool TPpContext::TokenStream::peekUntokenizedPasting()
+{
+    // don't return early, have to restore this
+    size_t savePos = currentPos;
+
+    // skip white-space
+    while (peekToken(' '))
+        ++currentPos;
+
+    // check for ##
+    bool pasting = false;
+    if (peekToken('#')) {
+        ++currentPos;
+        if (peekToken('#'))
+            pasting = true;
+    }
+
+    currentPos = savePos;
+
+    return pasting;
+}
+
 void TPpContext::pushTokenStreamInput(TokenStream& ts, bool prepasting, bool expanded)
 {
     pushInput(new tTokenInput(this, &ts, prepasting, expanded));
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.cpp
index 600541f6..7b5cd03f 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.cpp
@@ -174,9 +174,6 @@ bool isArithmeticOperation(glslang::TOperator op)
     case glslang::EOpMatrixTimesMatrix:
 
     case glslang::EOpDot:
-    case glslang::EOpDotPackedEXT:
-    case glslang::EOpDotAccSatEXT:
-    case glslang::EOpDotPackedAccSatEXT:
 
     case glslang::EOpPostIncrement:
     case glslang::EOpPostDecrement:
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.h b/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.h
index d849be83..8521ad7d 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/propagateNoContraction.h
@@ -52,5 +52,4 @@ namespace glslang {
 // 'noContraction' means the object is 'precise'; and for arithmetic operation
 // nodes, it means the operation should not be contracted.
 void PropagateNoContraction(const glslang::TIntermediate& intermediate);
-
-} // end namespace glslang
+};
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.cpp b/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.cpp
index 3afbe3d8..7e316092 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.cpp
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.cpp
@@ -1138,10 +1138,8 @@ void TReflection::buildAttributeReflection(EShLanguage stage, const TIntermediat
 {
     if (stage == EShLangCompute) {
         // Remember thread dimensions
-        for (int dim=0; dim<3; ++dim) {
+        for (int dim=0; dim<3; ++dim)
             localSize[dim] = intermediate.getLocalSize(dim);
-            tileShadingRateQCOM[dim] = intermediate.getTileShadingRateQCOM(dim);
-        }
     }
 }
 
@@ -1272,8 +1270,9 @@ void TReflection::dump()
         indexToPipeOutput[i].dump();
     printf("\n");
 
-    static const char* axis[] = { "X", "Y", "Z" };
     if (getLocalSize(0) > 1) {
+        static const char* axis[] = { "X", "Y", "Z" };
+
         for (int dim=0; dim<3; ++dim)
             if (getLocalSize(dim) > 1)
                 printf("Local size %s: %u\n", axis[dim], getLocalSize(dim));
@@ -1281,12 +1280,6 @@ void TReflection::dump()
         printf("\n");
     }
 
-    if (getTileShadingRateQCOM(0) > 1 || getTileShadingRateQCOM(1) > 1) {
-        for (int dim=0; dim<3; ++dim)
-            printf("Tile shading rate QCOM %s: %u\n", axis[dim], getTileShadingRateQCOM(dim));
-        printf("\n");
-    }
-
     // printf("Live names\n");
     // for (TNameToIndex::const_iterator it = nameToIndex.begin(); it != nameToIndex.end(); ++it)
     //    printf("%s: %d\n", it->first.c_str(), it->second);
diff --git a/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.h b/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.h
index dccb9917..221d93f8 100644
--- a/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.h
+++ b/engine/thirdparty/glslang/glslang/MachineIndependent/reflection.h
@@ -37,8 +37,8 @@
 #define _REFLECTION_INCLUDED
 
 #include "../Public/ShaderLang.h"
-#include "../Include/BaseTypes.h"
-#include "../Include/visibility.h"
+#include "../Include/Types.h"
+
 #include <list>
 #include <set>
 
@@ -58,16 +58,13 @@ public:
     TReflection(EShReflectionOptions opts, EShLanguage first, EShLanguage last)
         : options(opts), firstStage(first), lastStage(last), badReflection(TObjectReflection::badReflection())
     { 
-        for (int dim=0; dim<3; ++dim) {
+        for (int dim=0; dim<3; ++dim)
             localSize[dim] = 0;
-            tileShadingRateQCOM[dim] = 0;
-        }
     }
 
     virtual ~TReflection() {}
 
     // grow the reflection stage by stage
-    GLSLANG_EXPORT_FOR_TESTS
     bool addStage(EShLanguage, const TIntermediate&);
 
     // for mapping a uniform index to a uniform object's description
@@ -170,9 +167,6 @@ public:
     // Thread local size
     unsigned getLocalSize(int dim) const { return dim <= 2 ? localSize[dim] : 0; }
 
-    // Tile shading rate QCOM
-    unsigned getTileShadingRateQCOM(int dim) const { return dim <= 2 ? tileShadingRateQCOM[dim] : 0; }
-
     void dump();
 
 protected:
@@ -218,7 +212,6 @@ protected:
     TIndices atomicCounterUniformIndices;
 
     unsigned int localSize[3];
-    unsigned int tileShadingRateQCOM[3];
 };
 
 } // end namespace glslang
diff --git a/engine/thirdparty/glslang/glslang/OSDependent/osinclude.h b/engine/thirdparty/glslang/glslang/OSDependent/osinclude.h
index da1c4f69..0d677e4a 100644
--- a/engine/thirdparty/glslang/glslang/OSDependent/osinclude.h
+++ b/engine/thirdparty/glslang/glslang/OSDependent/osinclude.h
@@ -35,10 +35,9 @@
 #ifndef __OSINCLUDE_H
 #define __OSINCLUDE_H
 
-#include "../Include/visibility.h"
 namespace glslang {
 
-GLSLANG_EXPORT void OS_DumpMemoryCounters();
+void OS_DumpMemoryCounters();
 
 } // end namespace glslang
 
diff --git a/engine/thirdparty/glslang/glslang/Public/ResourceLimits.h b/engine/thirdparty/glslang/glslang/Public/ResourceLimits.h
index 8245e12d..f70be817 100644
--- a/engine/thirdparty/glslang/glslang/Public/ResourceLimits.h
+++ b/engine/thirdparty/glslang/glslang/Public/ResourceLimits.h
@@ -38,21 +38,20 @@
 #include <string>
 
 #include "../Include/ResourceLimits.h"
-#include "../Include/visibility.h"
 
 // Return pointer to user-writable Resource to pass through API in
 // future-proof way.
-GLSLANG_EXPORT extern TBuiltInResource* GetResources();
+extern TBuiltInResource* GetResources();
 
 // These are the default resources for TBuiltInResources, used for both
 //  - parsing this string for the case where the user didn't supply one,
 //  - dumping out a template for user construction of a config file.
-GLSLANG_EXPORT extern const TBuiltInResource* GetDefaultResources();
+extern const TBuiltInResource* GetDefaultResources();
 
 // Returns the DefaultTBuiltInResource as a human-readable string.
-GLSLANG_EXPORT std::string GetDefaultTBuiltInResourceString();
+std::string GetDefaultTBuiltInResourceString();
 
 // Decodes the resource limits from |config| to |resources|.
-GLSLANG_EXPORT void DecodeResourceLimits(TBuiltInResource* resources, char* config);
+void DecodeResourceLimits(TBuiltInResource* resources, char* config);
 
 #endif  // _STAND_ALONE_RESOURCE_LIMITS_INCLUDED_
diff --git a/engine/thirdparty/glslang/glslang/Public/ShaderLang.h b/engine/thirdparty/glslang/glslang/Public/ShaderLang.h
index 8ca4ed9c..046fd917 100644
--- a/engine/thirdparty/glslang/glslang/Public/ShaderLang.h
+++ b/engine/thirdparty/glslang/glslang/Public/ShaderLang.h
@@ -38,7 +38,6 @@
 #define _COMPILER_INTERFACE_INCLUDED_
 
 #include "../Include/ResourceLimits.h"
-#include "../Include/visibility.h"
 #include "../MachineIndependent/Versions.h"
 
 #include <cstring>
@@ -50,6 +49,22 @@
     #define C_DECL
 #endif
 
+#ifdef GLSLANG_IS_SHARED_LIBRARY
+    #ifdef _WIN32
+        #ifdef GLSLANG_EXPORTING
+            #define GLSLANG_EXPORT __declspec(dllexport)
+        #else
+            #define GLSLANG_EXPORT __declspec(dllimport)
+        #endif
+    #elif __GNUC__ >= 4
+        #define GLSLANG_EXPORT __attribute__((visibility("default")))
+    #endif
+#endif // GLSLANG_IS_SHARED_LIBRARY
+
+#ifndef GLSLANG_EXPORT
+#define GLSLANG_EXPORT
+#endif
+
 //
 // This is the platform independent interface between an OGL driver
 // and the shading language compiler/linker.
@@ -156,9 +171,8 @@ typedef enum {
     EShTargetVulkan_1_1 = (1 << 22) | (1 << 12),      // Vulkan 1.1
     EShTargetVulkan_1_2 = (1 << 22) | (2 << 12),      // Vulkan 1.2
     EShTargetVulkan_1_3 = (1 << 22) | (3 << 12),      // Vulkan 1.3
-    EShTargetVulkan_1_4 = (1 << 22) | (4 << 12),      // Vulkan 1.4
     EShTargetOpenGL_450 = 450,                        // OpenGL
-    LAST_ELEMENT_MARKER(EShTargetClientVersionCount = 6),
+    LAST_ELEMENT_MARKER(EShTargetClientVersionCount = 5),
 } EShTargetClientVersion;
 
 typedef EShTargetClientVersion EshTargetClientVersion;
@@ -174,21 +188,6 @@ typedef enum {
     LAST_ELEMENT_MARKER(EShTargetLanguageVersionCount = 7),
 } EShTargetLanguageVersion;
 
-//
-// Following are a series of helper enums for managing layouts and qualifiers,
-// used for TPublicType, TType, others.
-//
-
-enum TLayoutPacking {
-    ElpNone,
-    ElpShared, // default, but different than saying nothing
-    ElpStd140,
-    ElpStd430,
-    ElpPacked,
-    ElpScalar,
-    ElpCount // If expanding, see bitfield width below
-};
-
 struct TInputLanguage {
     EShSource languageFamily; // redundant information with other input, this one overrides when not EShSourceNone
     EShLanguage stage;        // redundant information with other input, this one overrides when not EShSourceNone
@@ -271,9 +270,6 @@ enum EShMessages : unsigned {
     EShMsgBuiltinSymbolTable   = (1 << 14), // print the builtin symbol table
     EShMsgEnhanced             = (1 << 15), // enhanced message readability
     EShMsgAbsolutePath         = (1 << 16), // Output Absolute path for messages
-    EShMsgDisplayErrorColumn   = (1 << 17), // Display error message column aswell as line
-    EShMsgLinkTimeOptimization = (1 << 18), // perform cross-stage optimizations during linking
-    EShMsgValidateCrossStageIO = (1 << 19), // validate shader inputs have matching outputs in previous stage
     LAST_ELEMENT_MARKER(EShMsgCount),
 };
 
@@ -418,7 +414,6 @@ GLSLANG_EXPORT int GetKhronosToolId();
 class TIntermediate;
 class TProgram;
 class TPoolAllocator;
-class TIoMapResolver;
 
 // Call this exactly once per process before using anything else
 GLSLANG_EXPORT bool InitializeProcess();
@@ -434,9 +429,6 @@ enum TResourceType {
     EResUbo,
     EResSsbo,
     EResUav,
-    EResCombinedSampler,
-    EResAs,
-    EResTensor,
     EResCount
 };
 
@@ -466,59 +458,56 @@ enum TBlockStorageClass
 //
 // N.B.: Destruct a linked program *before* destructing the shaders linked into it.
 //
-class GLSLANG_EXPORT TShader {
+class TShader {
 public:
-    explicit TShader(EShLanguage);
-    virtual ~TShader();
-    void setStrings(const char* const* s, int n);
-    void setStringsWithLengths(
+    GLSLANG_EXPORT explicit TShader(EShLanguage);
+    GLSLANG_EXPORT virtual ~TShader();
+    GLSLANG_EXPORT void setStrings(const char* const* s, int n);
+    GLSLANG_EXPORT void setStringsWithLengths(
         const char* const* s, const int* l, int n);
-    void setStringsWithLengthsAndNames(
+    GLSLANG_EXPORT void setStringsWithLengthsAndNames(
         const char* const* s, const int* l, const char* const* names, int n);
     void setPreamble(const char* s) { preamble = s; }
-    void setEntryPoint(const char* entryPoint);
-    void setSourceEntryPoint(const char* sourceEntryPointName);
-    void addProcesses(const std::vector<std::string>&);
-    void setUniqueId(unsigned long long id);
-    void setOverrideVersion(int version);
-    void setDebugInfo(bool debugInfo);
+    GLSLANG_EXPORT void setEntryPoint(const char* entryPoint);
+    GLSLANG_EXPORT void setSourceEntryPoint(const char* sourceEntryPointName);
+    GLSLANG_EXPORT void addProcesses(const std::vector<std::string>&);
+    GLSLANG_EXPORT void setUniqueId(unsigned long long id);
+    GLSLANG_EXPORT void setOverrideVersion(int version);
+    GLSLANG_EXPORT void setDebugInfo(bool debugInfo);
 
     // IO resolver binding data: see comments in ShaderLang.cpp
-    void setShiftBinding(TResourceType res, unsigned int base);
-    void setShiftSamplerBinding(unsigned int base);  // DEPRECATED: use setShiftBinding
-    void setShiftTextureBinding(unsigned int base);  // DEPRECATED: use setShiftBinding
-    void setShiftImageBinding(unsigned int base);    // DEPRECATED: use setShiftBinding
-    void setShiftUboBinding(unsigned int base);      // DEPRECATED: use setShiftBinding
-    void setShiftUavBinding(unsigned int base);      // DEPRECATED: use setShiftBinding
-    void setShiftCbufferBinding(unsigned int base);  // synonym for setShiftUboBinding
-    void setShiftSsboBinding(unsigned int base);     // DEPRECATED: use setShiftBinding
-    void setShiftBindingForSet(TResourceType res, unsigned int base, unsigned int set);
-    void setResourceSetBinding(const std::vector<std::string>& base);
-    void setAutoMapBindings(bool map);
-    void setAutoMapLocations(bool map);
-    void addUniformLocationOverride(const char* name, int loc);
-    void setUniformLocationBase(int base);
-    void setInvertY(bool invert);
-    void setDxPositionW(bool dxPosW);
-    void setEnhancedMsgs();
+    GLSLANG_EXPORT void setShiftBinding(TResourceType res, unsigned int base);
+    GLSLANG_EXPORT void setShiftSamplerBinding(unsigned int base);  // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftTextureBinding(unsigned int base);  // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftImageBinding(unsigned int base);    // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftUboBinding(unsigned int base);      // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftUavBinding(unsigned int base);      // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftCbufferBinding(unsigned int base);  // synonym for setShiftUboBinding
+    GLSLANG_EXPORT void setShiftSsboBinding(unsigned int base);     // DEPRECATED: use setShiftBinding
+    GLSLANG_EXPORT void setShiftBindingForSet(TResourceType res, unsigned int base, unsigned int set);
+    GLSLANG_EXPORT void setResourceSetBinding(const std::vector<std::string>& base);
+    GLSLANG_EXPORT void setAutoMapBindings(bool map);
+    GLSLANG_EXPORT void setAutoMapLocations(bool map);
+    GLSLANG_EXPORT void addUniformLocationOverride(const char* name, int loc);
+    GLSLANG_EXPORT void setUniformLocationBase(int base);
+    GLSLANG_EXPORT void setInvertY(bool invert);
+    GLSLANG_EXPORT void setDxPositionW(bool dxPosW);
+    GLSLANG_EXPORT void setEnhancedMsgs();
 #ifdef ENABLE_HLSL
-    void setHlslIoMapping(bool hlslIoMap);
-    void setFlattenUniformArrays(bool flatten);
+    GLSLANG_EXPORT void setHlslIoMapping(bool hlslIoMap);
+    GLSLANG_EXPORT void setFlattenUniformArrays(bool flatten);
 #endif
-    void setNoStorageFormat(bool useUnknownFormat);
-    void setNanMinMaxClamp(bool nanMinMaxClamp);
-    void setTextureSamplerTransformMode(EShTextureSamplerTransformMode mode);
-    void addBlockStorageOverride(const char* nameStr, glslang::TBlockStorageClass backing);
+    GLSLANG_EXPORT void setNoStorageFormat(bool useUnknownFormat);
+    GLSLANG_EXPORT void setNanMinMaxClamp(bool nanMinMaxClamp);
+    GLSLANG_EXPORT void setTextureSamplerTransformMode(EShTextureSamplerTransformMode mode);
+    GLSLANG_EXPORT void addBlockStorageOverride(const char* nameStr, glslang::TBlockStorageClass backing);
 
-    void setGlobalUniformBlockName(const char* name);
-    void setAtomicCounterBlockName(const char* name);
-    void setGlobalUniformSet(unsigned int set);
-    void setGlobalUniformBinding(unsigned int binding);
-    void setAtomicCounterBlockSet(unsigned int set);
-    void setAtomicCounterBlockBinding(unsigned int binding);
-
-    void addSourceText(const char* text, size_t len);
-    void setSourceFile(const char* file);
+    GLSLANG_EXPORT void setGlobalUniformBlockName(const char* name);
+    GLSLANG_EXPORT void setAtomicCounterBlockName(const char* name);
+    GLSLANG_EXPORT void setGlobalUniformSet(unsigned int set);
+    GLSLANG_EXPORT void setGlobalUniformBinding(unsigned int binding);
+    GLSLANG_EXPORT void setAtomicCounterBlockSet(unsigned int set);
+    GLSLANG_EXPORT void setAtomicCounterBlockBinding(unsigned int binding);
 
     // For setting up the environment (cleared to nothingness in the constructor).
     // These must be called so that parsing is done for the right source language and
@@ -667,7 +656,7 @@ public:
         virtual void releaseInclude(IncludeResult*) override { }
     };
 
-    bool parse(
+    GLSLANG_EXPORT bool parse(
         const TBuiltInResource*, int defaultVersion, EProfile defaultProfile,
         bool forceDefaultVersionAndProfile, bool forwardCompatible,
         EShMessages, Includer&);
@@ -693,14 +682,14 @@ public:
 
     // NOTE: Doing just preprocessing to obtain a correct preprocessed shader string
     // is not an officially supported or fully working path.
-    bool preprocess(
+    GLSLANG_EXPORT bool preprocess(
         const TBuiltInResource* builtInResources, int defaultVersion,
         EProfile defaultProfile, bool forceDefaultVersionAndProfile,
         bool forwardCompatible, EShMessages message, std::string* outputString,
         Includer& includer);
 
-    const char* getInfoLog();
-    const char* getInfoDebugLog();
+    GLSLANG_EXPORT const char* getInfoLog();
+    GLSLANG_EXPORT const char* getInfoDebugLog();
     EShLanguage getStage() const { return stage; }
     TIntermediate* getIntermediate() const { return intermediate; }
 
@@ -747,17 +736,15 @@ private:
 //
 
 // Data needed for just a single object at the granularity exchanged by the reflection API
-class GLSLANG_EXPORT TObjectReflection {
+class TObjectReflection {
 public:
-    TObjectReflection(const std::string& pName, const TType& pType, int pOffset, int pGLDefineType, int pSize, int pIndex);
+    GLSLANG_EXPORT TObjectReflection(const std::string& pName, const TType& pType, int pOffset, int pGLDefineType, int pSize, int pIndex);
 
     const TType* getType() const { return type; }
-    int getBinding() const;
-    void dump() const;
+    GLSLANG_EXPORT int getBinding() const;
+    GLSLANG_EXPORT void dump() const;
     static TObjectReflection badReflection() { return TObjectReflection(); }
 
-    unsigned int layoutLocation() const;
-
     std::string name;
     int offset;
     int glDefineType;
@@ -807,7 +794,8 @@ struct TVarEntryInfo;
 //
 // NOTE: that still limit checks are applied to bindings and sets
 // and may result in an error.
-class GLSLANG_EXPORT TIoMapResolver {
+class TIoMapResolver
+{
 public:
     virtual ~TIoMapResolver() {}
 
@@ -859,61 +847,46 @@ public:
     virtual void addStage(EShLanguage stage, TIntermediate& stageIntermediate) = 0;
 };
 
-// I/O mapper
-class TIoMapper {
-public:
-    TIoMapper() {}
-    virtual ~TIoMapper() {}
-    // grow the reflection stage by stage
-    bool virtual addStage(EShLanguage, TIntermediate&, TInfoSink&, TIoMapResolver*);
-    bool virtual doMap(TIoMapResolver*, TInfoSink&) { return true; }
-    bool virtual setAutoPushConstantBlock(const char*, unsigned int, TLayoutPacking) { return false; }
-};
-
-// Get the default GLSL IO mapper
-GLSLANG_EXPORT TIoMapper* GetGlslIoMapper();
-
 // Make one TProgram per set of shaders that will get linked together.  Add all
 // the shaders that are to be linked together.  After calling shader.parse()
 // for all shaders, call link().
 //
 // N.B.: Destruct a linked program *before* destructing the shaders linked into it.
 //
-class GLSLANG_EXPORT TProgram {
+class TProgram {
 public:
-    TProgram();
-    virtual ~TProgram();
+    GLSLANG_EXPORT TProgram();
+    GLSLANG_EXPORT virtual ~TProgram();
     void addShader(TShader* shader) { stages[shader->stage].push_back(shader); }
     std::list<TShader*>& getShaders(EShLanguage stage) { return stages[stage]; }
     // Link Validation interface
-    bool link(EShMessages);
-    const char* getInfoLog();
-    const char* getInfoDebugLog();
+    GLSLANG_EXPORT bool link(EShMessages);
+    GLSLANG_EXPORT const char* getInfoLog();
+    GLSLANG_EXPORT const char* getInfoDebugLog();
 
     TIntermediate* getIntermediate(EShLanguage stage) const { return intermediate[stage]; }
 
     // Reflection Interface
 
     // call first, to do liveness analysis, index mapping, etc.; returns false on failure
-    bool buildReflection(int opts = EShReflectionDefault);
-    unsigned getLocalSize(int dim) const;                  // return dim'th local size
-    unsigned getTileShadingRateQCOM(int dim) const;        // return dim'th tile shading rate QCOM
-    int getReflectionIndex(const char *name) const;
-    int getReflectionPipeIOIndex(const char* name, const bool inOrOut) const;
-    int getNumUniformVariables() const;
-    const TObjectReflection& getUniform(int index) const;
-    int getNumUniformBlocks() const;
-    const TObjectReflection& getUniformBlock(int index) const;
-    int getNumPipeInputs() const;
-    const TObjectReflection& getPipeInput(int index) const;
-    int getNumPipeOutputs() const;
-    const TObjectReflection& getPipeOutput(int index) const;
-    int getNumBufferVariables() const;
-    const TObjectReflection& getBufferVariable(int index) const;
-    int getNumBufferBlocks() const;
-    const TObjectReflection& getBufferBlock(int index) const;
-    int getNumAtomicCounters() const;
-    const TObjectReflection& getAtomicCounter(int index) const;
+    GLSLANG_EXPORT bool buildReflection(int opts = EShReflectionDefault);
+    GLSLANG_EXPORT unsigned getLocalSize(int dim) const;                  // return dim'th local size
+    GLSLANG_EXPORT int getReflectionIndex(const char *name) const;
+    GLSLANG_EXPORT int getReflectionPipeIOIndex(const char* name, const bool inOrOut) const;
+    GLSLANG_EXPORT int getNumUniformVariables() const;
+    GLSLANG_EXPORT const TObjectReflection& getUniform(int index) const;
+    GLSLANG_EXPORT int getNumUniformBlocks() const;
+    GLSLANG_EXPORT const TObjectReflection& getUniformBlock(int index) const;
+    GLSLANG_EXPORT int getNumPipeInputs() const;
+    GLSLANG_EXPORT const TObjectReflection& getPipeInput(int index) const;
+    GLSLANG_EXPORT int getNumPipeOutputs() const;
+    GLSLANG_EXPORT const TObjectReflection& getPipeOutput(int index) const;
+    GLSLANG_EXPORT int getNumBufferVariables() const;
+    GLSLANG_EXPORT const TObjectReflection& getBufferVariable(int index) const;
+    GLSLANG_EXPORT int getNumBufferBlocks() const;
+    GLSLANG_EXPORT const TObjectReflection& getBufferBlock(int index) const;
+    GLSLANG_EXPORT int getNumAtomicCounters() const;
+    GLSLANG_EXPORT const TObjectReflection& getAtomicCounter(int index) const;
 
     // Legacy Reflection Interface - expressed in terms of above interface
 
@@ -980,19 +953,15 @@ public:
     // returns a TType*
     const TType *getAttributeTType(int index) const    { return getPipeInput(index).getType(); }
 
-    void dumpReflection();
-
-    // Get the IO resolver to use for mapIO
-    TIoMapResolver* getGlslIoResolver(EShLanguage stage);
-
+    GLSLANG_EXPORT void dumpReflection();
     // I/O mapping: apply base offsets and map live unbound variables
     // If resolver is not provided it uses the previous approach
     // and respects auto assignment and offsets.
-    bool mapIO(TIoMapResolver* pResolver = nullptr, TIoMapper* pIoMapper = nullptr);
+    GLSLANG_EXPORT bool mapIO(TIoMapResolver* pResolver = nullptr, TIoMapper* pIoMapper = nullptr);
 
 protected:
-    bool linkStage(EShLanguage, EShMessages);
-    bool crossStageCheck(EShMessages);
+    GLSLANG_EXPORT bool linkStage(EShLanguage, EShMessages);
+    GLSLANG_EXPORT bool crossStageCheck(EShMessages);
 
     TPoolAllocator* pool;
     std::list<TShader*> stages[EShLangCount];
diff --git a/engine/thirdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp b/engine/thirdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
index 79a1b3a6..0e9d1b54 100644
--- a/engine/thirdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
+++ b/engine/thirdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
@@ -39,9 +39,9 @@
 
 #include "glslang/Public/ResourceLimits.h"
 
-static TBuiltInResource Resources;
+TBuiltInResource Resources;
 
-static const TBuiltInResource DefaultTBuiltInResource = {
+const TBuiltInResource DefaultTBuiltInResource = {
     /* .MaxLights = */ 32,
     /* .MaxClipPlanes = */ 6,
     /* .MaxTextureUnits = */ 32,
diff --git a/engine/thirdparty/glslang/glslang/build_info.h b/engine/thirdparty/glslang/glslang/build_info.h
index 7816b66d..c9d5a917 100644
--- a/engine/thirdparty/glslang/glslang/build_info.h
+++ b/engine/thirdparty/glslang/glslang/build_info.h
@@ -34,8 +34,8 @@
 #ifndef GLSLANG_BUILD_INFO
 #define GLSLANG_BUILD_INFO
 
-#define GLSLANG_VERSION_MAJOR 16
-#define GLSLANG_VERSION_MINOR 1
+#define GLSLANG_VERSION_MAJOR 14
+#define GLSLANG_VERSION_MINOR 2
 #define GLSLANG_VERSION_PATCH 0
 #define GLSLANG_VERSION_FLAVOR ""
 
diff --git a/engine/thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch b/engine/thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch
index 48aea941..3f4fa9fb 100644
--- a/engine/thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch
+++ b/engine/thirdparty/glslang/patches/0001-apple-disable-absolute-paths.patch
@@ -1,5 +1,5 @@
 diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h
-index 262933941d..dec05e651c 100644
+index 23f495dcb7..137ede8510 100644
 --- a/thirdparty/glslang/glslang/Include/InfoSink.h
 +++ b/thirdparty/glslang/glslang/Include/InfoSink.h
 @@ -36,7 +36,7 @@
@@ -11,8 +11,8 @@ index 262933941d..dec05e651c 100644
  #include <cmath>
  
  namespace glslang {
-@@ -105,14 +105,14 @@ public:
-         }
+@@ -101,14 +101,14 @@ public:
+         snprintf(locText, maxSize, ":%d", loc.line);
  
          if(loc.getFilename() == nullptr && shaderFileName != nullptr && absolute) {
 -            append(std::filesystem::absolute(shaderFileName).string());
diff --git a/engine/thirdparty/glslang/patches/0002-apple-m1-msaa-fix.patch b/engine/thirdparty/glslang/patches/0002-apple-m1-msaa-fix.patch
deleted file mode 100644
index 1ed43baf..00000000
--- a/engine/thirdparty/glslang/patches/0002-apple-m1-msaa-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/thirdparty/glslang/SPIRV/GlslangToSpv.cpp b/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
-index 1a5c40c53a..d4af42f70b 100644
---- a/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
-+++ b/thirdparty/glslang/SPIRV/GlslangToSpv.cpp
-@@ -5181,6 +5181,11 @@ spv::Id TGlslangToSpvTraverser::createSpvVariable(const glslang::TIntermSymbol*
-     glslang::TQualifier typeQualifier = node->getType().getQualifier();
-     TranslateMemoryDecoration(typeQualifier, topLevelDecorations, glslangIntermediate->usingVulkanMemoryModel());
-     for (auto deco : topLevelDecorations) {
-+#ifdef __APPLE__
-+        if (deco != spv::Decoration::Restrict &&
-+            deco != spv::Decoration::RestrictPointer &&
-+            deco != spv::Decoration::RestrictPointerEXT)
-+#endif
-         builder.addDecoration(var, deco);
-     }
-     return var;
diff --git a/engine/thirdparty/glslang/patches/0002-gcc15-include-fix.patch b/engine/thirdparty/glslang/patches/0002-gcc15-include-fix.patch
new file mode 100644
index 00000000..69ccf8e3
--- /dev/null
+++ b/engine/thirdparty/glslang/patches/0002-gcc15-include-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/thirdparty/glslang/SPIRV/SpvBuilder.h b/thirdparty/glslang/SPIRV/SpvBuilder.h
+index a65a98e337..1499592c4f 100644
+--- a/thirdparty/glslang/SPIRV/SpvBuilder.h
++++ b/thirdparty/glslang/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
diff --git a/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh b/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
index e8c73ffa..6f575934 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
@@ -1613,7 +1613,7 @@ struct ClipBox
                const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION));
     case 2: return_trace (u.format2.subset (c, instancer));
     default:return_trace (c->default_return_value ());
@@ -1622,7 +1622,7 @@ struct ClipBox
 
   void closurev1 (hb_colrv1_closure_context_t* c) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 2: u.format2.closurev1 (c); return;
     default:return;
     }
@@ -1631,9 +1631,9 @@ struct ClipBox
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
@@ -1644,7 +1644,7 @@ struct ClipBox
                     const ItemVarStoreInstancer &instancer) const
   {
     ClipBoxData clip_box;
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
       u.format1.get_clip_box (clip_box, instancer);
       break;
@@ -1664,7 +1664,7 @@ struct ClipBox
 
   protected:
   union {
-  struct { HBUINT8 v; }	format;         /* Format identifier */
+  HBUINT8		format;         /* Format identifier */
   ClipBoxFormat1	format1;
   ClipBoxFormat2	format2;
   } u;
@@ -1814,7 +1814,10 @@ struct ClipList
   {
     auto *rec = clips.as_array ().bsearch (gid);
     if (rec)
-      return rec->get_extents (extents, this, instancer);
+    {
+      rec->get_extents (extents, this, instancer);
+      return true;
+    }
     return false;
   }
 
@@ -1841,9 +1844,9 @@ struct Paint
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.paintformat1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.paintformat2, std::forward<Ts> (ds)...));
     case 3: return_trace (c->dispatch (u.paintformat3, std::forward<Ts> (ds)...));
@@ -1882,7 +1885,7 @@ struct Paint
 
   protected:
   union {
-  struct { HBUINT8 v; }				format;
+  HBUINT8					format;
   PaintColrLayers				paintformat1;
   NoVariable<PaintSolid>			paintformat2;
   Variable<PaintSolid>				paintformat3;
diff --git a/engine/thirdparty/harfbuzz/src/OT/Color/svg/svg.hh b/engine/thirdparty/harfbuzz/src/OT/Color/svg/svg.hh
index d6fb7183..d6aca4a6 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Color/svg/svg.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Color/svg/svg.hh
@@ -27,12 +27,7 @@
 
 #include "../../../hb-open-type.hh"
 #include "../../../hb-blob.hh"
-#include "../../../hb-limits.hh"
-#include "../../../hb-map.hh"
 #include "../../../hb-paint.hh"
-#include "../../../hb-zlib.hh"
-#include <ctype.h>
-#include <string.h>
 
 /*
  * SVG -- SVG (Scalable Vector Graphics)
@@ -44,62 +39,12 @@
 
 namespace OT {
 
-static inline hb_blob_t *
-hb_ot_svg_reference_normalized_blob (hb_blob_t *image,
-                                     const char **svg,
-                                     unsigned *len)
-{
-  hb_blob_t *blob = hb_blob_reference (image);
-  unsigned data_len = 0;
-  const char *data = hb_blob_get_data (blob, &data_len);
-
-  if (!data || !data_len)
-    goto fail;
-
-  if (hb_blob_is_gzip (data, data_len))
-  {
-    uint32_t expected_size = 0;
-    if (hb_gzip_get_uncompressed_size (data, data_len, &expected_size) &&
-        unlikely ((size_t) expected_size > (size_t) HB_SVG_MAX_DOCUMENT_SIZE))
-      goto fail;
-
-    hb_blob_t *uncompressed = hb_blob_decompress_gzip (blob,
-                                                       HB_SVG_MAX_DOCUMENT_SIZE);
-    if (!uncompressed)
-      goto fail;
-
-    hb_blob_destroy (blob);
-    blob = uncompressed;
-    data = hb_blob_get_data (blob, &data_len);
-    if (!data || !data_len)
-      goto fail;
-  }
-
-  if (unlikely ((size_t) data_len > (size_t) HB_SVG_MAX_DOCUMENT_SIZE))
-    goto fail;
-
-  if (svg) *svg = data;
-  if (len) *len = data_len;
-  return blob;
-
-fail:
-  hb_blob_destroy (blob);
-  if (svg) *svg = nullptr;
-  if (len) *len = 0;
-  return nullptr;
-}
 
 struct SVGDocumentIndexEntry
 {
   int cmp (hb_codepoint_t g) const
   { return g < startGlyphID ? -1 : g > endGlyphID ? 1 : 0; }
 
-  hb_codepoint_t get_start_glyph () const
-  { return startGlyphID; }
-
-  hb_codepoint_t get_end_glyph () const
-  { return endGlyphID; }
-
   hb_blob_t *reference_blob (hb_blob_t *svg_blob, unsigned int index_offset) const
   {
     return hb_blob_create_sub_blob (svg_blob,
@@ -133,50 +78,13 @@ struct SVG
 {
   static constexpr hb_tag_t tableTag = HB_OT_TAG_SVG;
 
-  struct svg_id_span_t
-  {
-    const char *p;
-    unsigned len;
-
-    bool operator == (const svg_id_span_t &o) const
-    {
-      return len == o.len && !memcmp (p, o.p, len);
-    }
-
-    uint32_t hash () const
-    {
-      uint32_t h = hb_hash (len);
-      for (unsigned i = 0; i < len; i++)
-        h = h * 33u + (unsigned char) p[i];
-      return h;
-    }
-  };
-
-  struct svg_defs_entry_t
-  {
-    svg_id_span_t id;
-    unsigned start;
-    unsigned end;
-  };
-
-  struct svg_doc_cache_t
-  {
-    hb_blob_t *blob = nullptr;
-    const char *svg = nullptr;
-    unsigned len = 0;
-    hb_vector_t<svg_defs_entry_t> defs_entries;
-    hb_codepoint_t start_glyph = HB_CODEPOINT_INVALID;
-    hb_codepoint_t end_glyph = HB_CODEPOINT_INVALID;
-    hb_vector_t<hb_pair_t<uint32_t, uint32_t>> glyph_spans;
-    hb_hashmap_t<svg_id_span_t, hb_pair_t<uint32_t, uint32_t>> id_spans;
-  };
-
   bool has_data () const { return svgDocEntries; }
 
   struct accelerator_t
   {
-    accelerator_t (hb_face_t *face);
-    ~accelerator_t ();
+    accelerator_t (hb_face_t *face)
+    { table = hb_sanitize_context_t ().reference_table<SVG> (face); }
+    ~accelerator_t () { table.destroy (); }
 
     hb_blob_t *reference_blob_for_glyph (hb_codepoint_t glyph_id) const
     {
@@ -184,52 +92,8 @@ struct SVG
 							       table->svgDocEntries);
     }
 
-    unsigned get_document_count () const
-    { return table->get_document_count (); }
-
-    bool get_glyph_document_index (hb_codepoint_t glyph_id, unsigned *index) const
-    { return table->get_glyph_document_index (glyph_id, index); }
-
-    bool get_document_glyph_range (unsigned index,
-                                   hb_codepoint_t *start_glyph,
-                                   hb_codepoint_t *end_glyph) const
-    { return table->get_document_glyph_range (index, start_glyph, end_glyph); }
-
     bool has_data () const { return table->has_data (); }
 
-    const svg_doc_cache_t *
-    get_or_create_doc_cache (hb_blob_t *image,
-                             const char *svg,
-                             unsigned len,
-                             unsigned doc_index,
-                             hb_codepoint_t start_glyph,
-                             hb_codepoint_t end_glyph) const;
-
-    const char *
-    doc_cache_get_svg (const svg_doc_cache_t *doc,
-                       unsigned *len) const;
-
-    const hb_vector_t<svg_defs_entry_t> *
-    doc_cache_get_defs_entries (const svg_doc_cache_t *doc) const;
-
-    bool
-    doc_cache_get_glyph_span (const svg_doc_cache_t *doc,
-                              hb_codepoint_t glyph,
-                              unsigned *start,
-                              unsigned *end) const;
-
-    bool
-    doc_cache_find_id_span (const svg_doc_cache_t *doc,
-                            svg_id_span_t id,
-                            unsigned *start,
-                            unsigned *end) const;
-
-    bool
-    doc_cache_find_id_cstr (const svg_doc_cache_t *doc,
-                            const char *id,
-                            unsigned *start,
-                            unsigned *end) const;
-
     bool paint_glyph (hb_font_t *font HB_UNUSED, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const
     {
       if (!has_data ())
@@ -253,56 +117,14 @@ struct SVG
     }
 
     private:
-    svg_doc_cache_t *
-    make_doc_cache (hb_blob_t *image,
-                    const char *svg,
-                    unsigned len,
-                    hb_codepoint_t start_glyph,
-                    hb_codepoint_t end_glyph) const;
-
-    static void destroy_doc_cache (svg_doc_cache_t *doc);
-
     hb_blob_ptr_t<SVG> table;
-    mutable hb_vector_t<hb_atomic_t<svg_doc_cache_t *>> doc_caches;
     public:
-    DEFINE_SIZE_STATIC (sizeof (hb_blob_ptr_t<SVG>) +
-                        sizeof (hb_vector_t<hb_atomic_t<svg_doc_cache_t *>>));
+    DEFINE_SIZE_STATIC (sizeof (hb_blob_ptr_t<SVG>));
   };
 
   const SVGDocumentIndexEntry &get_glyph_entry (hb_codepoint_t glyph_id) const
   { return (this+svgDocEntries).bsearch (glyph_id); }
 
-  unsigned get_document_count () const
-  {
-    if (!has_data ())
-      return 0;
-    return (this + svgDocEntries).len;
-  }
-
-  bool get_glyph_document_index (hb_codepoint_t glyph_id, unsigned *index) const
-  {
-    if (!has_data ())
-      return false;
-    return (this + svgDocEntries).bfind (glyph_id, index);
-  }
-
-  bool get_document_glyph_range (unsigned index,
-                                 hb_codepoint_t *start_glyph,
-                                 hb_codepoint_t *end_glyph) const
-  {
-    if (!has_data ())
-      return false;
-
-    const auto &entries = this + svgDocEntries;
-    if (index >= entries.len)
-      return false;
-
-    const auto &entry = entries.arrayZ[index];
-    if (start_glyph) *start_glyph = entry.get_start_glyph ();
-    if (end_glyph) *end_glyph = entry.get_end_glyph ();
-    return true;
-  }
-
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -321,506 +143,6 @@ struct SVG
   DEFINE_SIZE_STATIC (10);
 };
 
-namespace _hb_svg_cache_impl {
-
-struct glyph_entry_t
-{
-  hb_codepoint_t glyph;
-  uint32_t start;
-  uint32_t end;
-};
-
-struct id_entry_t
-{
-  SVG::svg_id_span_t id;
-  uint32_t start;
-  uint32_t end;
-};
-
-struct open_elem_t
-{
-  unsigned start;
-  SVG::svg_id_span_t id;
-  bool in_defs_content;
-  bool is_defs;
-};
-
-static const unsigned MAX_DEPTH = 128;
-
-static inline int
-find_substr (const char *s,
-             unsigned n,
-             unsigned from,
-             const char *needle,
-             unsigned needle_len)
-{
-  if (!needle_len || from >= n || needle_len > n)
-    return -1;
-  for (unsigned i = from; i + needle_len <= n; i++)
-    if (s[i] == needle[0] && !memcmp (s + i, needle, needle_len))
-      return (int) i;
-  return -1;
-}
-
-static inline bool
-parse_id_in_start_tag (const char *svg,
-                       unsigned tag_start,
-                       unsigned tag_end,
-                       SVG::svg_id_span_t *id)
-{
-  unsigned p = tag_start;
-  while (p + 4 <= tag_end)
-  {
-    if (!memcmp (svg + p, "id=\"", 4))
-    {
-      unsigned b = p + 4;
-      unsigned e = b;
-      while (e < tag_end && svg[e] != '"') e++;
-      if (e <= tag_end && e > b)
-      {
-        *id = {svg + b, e - b};
-        return true;
-      }
-    }
-    if (!memcmp (svg + p, "id='", 4))
-    {
-      unsigned b = p + 4;
-      unsigned e = b;
-      while (e < tag_end && svg[e] != '\'') e++;
-      if (e <= tag_end && e > b)
-      {
-        *id = {svg + b, e - b};
-        return true;
-      }
-    }
-    p++;
-  }
-  return false;
-}
-
-static inline bool
-parse_glyph_id_span (const SVG::svg_id_span_t &id,
-                     hb_codepoint_t *glyph)
-{
-  if (id.len <= 5 || memcmp (id.p, "glyph", 5))
-    return false;
-
-  hb_codepoint_t gid = 0;
-  for (unsigned i = 5; i < id.len; i++)
-  {
-    unsigned char c = (unsigned char) id.p[i];
-    if (c < '0' || c > '9')
-      return false;
-    hb_codepoint_t digit = (hb_codepoint_t) (c - '0');
-    if (unlikely (gid > HB_CODEPOINT_INVALID / 10 ||
-                  (gid == HB_CODEPOINT_INVALID / 10 &&
-                   digit > HB_CODEPOINT_INVALID % 10)))
-      return false;
-    gid = (hb_codepoint_t) (gid * 10 + digit);
-  }
-
-  *glyph = gid;
-  return true;
-}
-
-static inline bool
-parse_cache_entries_linear (const char *svg,
-                            unsigned len,
-                            hb_vector_t<SVG::svg_defs_entry_t> *defs_entries,
-                            hb_vector_t<glyph_entry_t> *glyph_spans,
-                            hb_vector_t<id_entry_t> *id_entries)
-{
-  open_elem_t stack[MAX_DEPTH];
-  unsigned depth = 0;
-  defs_entries->alloc (256);
-  id_entries->alloc (256);
-
-  unsigned defs_depth = 0;
-  unsigned i = 0;
-  while (i < len)
-  {
-    if (svg[i] != '<')
-    {
-      i++;
-      continue;
-    }
-
-    if (i + 4 <= len && !memcmp (svg + i, "<!--", 4))
-    {
-      int cend = find_substr (svg, len, i + 4, "-->", 3);
-      if (cend < 0) return false;
-      i = (unsigned) cend + 3;
-      continue;
-    }
-    if (i + 9 <= len && !memcmp (svg + i, "<![CDATA[", 9))
-    {
-      int cend = find_substr (svg, len, i + 9, "]]>", 3);
-      if (cend < 0) return false;
-      i = (unsigned) cend + 3;
-      continue;
-    }
-
-    bool closing = (i + 1 < len && svg[i + 1] == '/');
-    bool special = (i + 1 < len && (svg[i + 1] == '!' || svg[i + 1] == '?'));
-
-    unsigned gt = i + 1;
-    char quote = 0;
-    while (gt < len)
-    {
-      char c = svg[gt];
-      if (quote)
-      {
-        if (c == quote) quote = 0;
-      }
-      else
-      {
-        if (c == '"' || c == '\'')
-          quote = c;
-        else if (c == '>')
-          break;
-      }
-      gt++;
-    }
-    if (gt >= len)
-      return false;
-
-    if (special)
-    {
-      i = gt + 1;
-      continue;
-    }
-
-    unsigned p = i + (closing ? 2 : 1);
-    while (p < gt && isspace ((unsigned char) svg[p])) p++;
-    const char *name = svg + p;
-    unsigned name_len = 0;
-    while (p + name_len < gt)
-    {
-      unsigned char c = (unsigned char) name[name_len];
-      if (!(isalnum (c) || c == '_' || c == '-' || c == ':'))
-        break;
-      name_len++;
-    }
-    bool is_defs = (name_len == 4 && !memcmp (name, "defs", 4));
-
-    if (closing)
-    {
-      if (!depth)
-      {
-        i = gt + 1;
-        continue;
-      }
-
-      open_elem_t e = stack[--depth];
-      unsigned end = gt + 1;
-
-      if (e.id.len)
-      {
-        auto *id_slot = id_entries->push ();
-        if (unlikely (!id_slot))
-          return false;
-        *id_slot = {e.id, (uint32_t) e.start, (uint32_t) end};
-
-        if (e.in_defs_content)
-        {
-          auto *slot = defs_entries->push ();
-          if (unlikely (!slot))
-            return false;
-          slot->id = e.id;
-          slot->start = e.start;
-          slot->end = end;
-        }
-
-        hb_codepoint_t gid;
-        if (parse_glyph_id_span (e.id, &gid))
-        {
-          auto *span = glyph_spans->push ();
-          if (unlikely (!span))
-            return false;
-          span->glyph = gid;
-          span->start = (uint32_t) e.start;
-          span->end = (uint32_t) end;
-        }
-      }
-
-      if (e.is_defs && defs_depth)
-        defs_depth--;
-
-      i = end;
-      continue;
-    }
-
-    SVG::svg_id_span_t id = {nullptr, 0};
-    parse_id_in_start_tag (svg, i, gt, &id);
-
-    unsigned r = gt;
-    while (r > i && isspace ((unsigned char) svg[r - 1])) r--;
-    bool self_closing = (r > i && svg[r - 1] == '/');
-
-    open_elem_t e = {i, id, defs_depth > 0, is_defs};
-
-    if (self_closing)
-    {
-      unsigned end = gt + 1;
-      if (e.id.len)
-      {
-        auto *id_slot = id_entries->push ();
-        if (unlikely (!id_slot))
-          return false;
-        *id_slot = {e.id, (uint32_t) e.start, (uint32_t) end};
-
-        if (e.in_defs_content)
-        {
-          auto *slot = defs_entries->push ();
-          if (unlikely (!slot))
-            return false;
-          slot->id = e.id;
-          slot->start = e.start;
-          slot->end = end;
-        }
-
-        hb_codepoint_t gid;
-        if (parse_glyph_id_span (e.id, &gid))
-        {
-          auto *span = glyph_spans->push ();
-          if (unlikely (!span))
-            return false;
-          span->glyph = gid;
-          span->start = (uint32_t) e.start;
-          span->end = (uint32_t) end;
-        }
-      }
-    }
-    else
-    {
-      if (unlikely (depth >= MAX_DEPTH))
-        return false;
-      stack[depth++] = e;
-      if (is_defs)
-        defs_depth++;
-    }
-
-    i = gt + 1;
-  }
-
-  return true;
-}
-
-} /* namespace _hb_svg_cache_impl */
-
-inline
-SVG::accelerator_t::accelerator_t (hb_face_t *face)
-{
-  table = hb_sanitize_context_t ().reference_table<SVG> (face);
-  doc_caches.init ();
-  unsigned doc_count = table->get_document_count ();
-  if (doc_count && unlikely (!doc_caches.resize (doc_count)))
-    doc_caches.resize (0);
-  for (unsigned i = 0; i < doc_caches.length; i++)
-    doc_caches.arrayZ[i].set_relaxed (nullptr);
-}
-
-inline
-SVG::accelerator_t::~accelerator_t ()
-{
-  for (unsigned i = 0; i < doc_caches.length; i++)
-    destroy_doc_cache (doc_caches.arrayZ[i].get_relaxed ());
-  doc_caches.fini ();
-  table.destroy ();
-}
-
-inline void
-SVG::accelerator_t::destroy_doc_cache (svg_doc_cache_t *doc)
-{
-  if (!doc)
-    return;
-  doc->glyph_spans.fini ();
-  doc->defs_entries.fini ();
-  doc->id_spans.fini ();
-  hb_blob_destroy (doc->blob);
-  hb_free (doc);
-}
-
-inline SVG::svg_doc_cache_t *
-SVG::accelerator_t::make_doc_cache (hb_blob_t *image,
-                                    const char *svg,
-                                    unsigned len,
-                                    hb_codepoint_t start_glyph,
-                                    hb_codepoint_t end_glyph) const
-{
-  static const uint32_t INVALID_SPAN = 0xFFFFFFFFu;
-
-  auto *doc = (svg_doc_cache_t *) hb_malloc (sizeof (svg_doc_cache_t));
-  if (!doc)
-    return nullptr;
-
-  doc->blob = nullptr;
-  doc->svg = nullptr;
-  doc->len = 0;
-  doc->defs_entries.init ();
-  doc->start_glyph = HB_CODEPOINT_INVALID;
-  doc->end_glyph = HB_CODEPOINT_INVALID;
-  doc->glyph_spans.init ();
-  doc->id_spans.init ();
-
-  doc->blob = hb_blob_reference (image);
-  doc->svg = svg;
-  doc->len = len;
-  doc->start_glyph = start_glyph;
-  doc->end_glyph = end_glyph;
-
-  if (unlikely (start_glyph == HB_CODEPOINT_INVALID || end_glyph < start_glyph))
-  {
-    destroy_doc_cache (doc);
-    return nullptr;
-  }
-
-  unsigned glyph_count = end_glyph - start_glyph + 1;
-  if (!doc->glyph_spans.resize ((int) glyph_count))
-  {
-    destroy_doc_cache (doc);
-    return nullptr;
-  }
-  for (unsigned i = 0; i < glyph_count; i++)
-    doc->glyph_spans.arrayZ[i] = hb_pair_t<uint32_t, uint32_t> (INVALID_SPAN, INVALID_SPAN);
-
-  hb_vector_t<_hb_svg_cache_impl::glyph_entry_t> glyph_spans;
-  glyph_spans.init ();
-  hb_vector_t<_hb_svg_cache_impl::id_entry_t> id_entries;
-  id_entries.init ();
-  if (!_hb_svg_cache_impl::parse_cache_entries_linear (svg, len,
-                                                       &doc->defs_entries,
-                                                       &glyph_spans,
-                                                       &id_entries))
-  {
-    id_entries.fini ();
-    glyph_spans.fini ();
-    destroy_doc_cache (doc);
-    return nullptr;
-  }
-
-  for (unsigned i = 0; i < glyph_spans.length; i++)
-  {
-    const auto &span = glyph_spans.arrayZ[i];
-    if (unlikely (span.glyph < start_glyph || span.glyph > end_glyph))
-      continue;
-    doc->glyph_spans.arrayZ[span.glyph - start_glyph] = hb_pair_t<uint32_t, uint32_t> (span.start, span.end);
-  }
-
-  for (unsigned i = 0; i < id_entries.length; i++)
-  {
-    const auto &e = id_entries.arrayZ[i];
-    hb_pair_t<uint32_t, uint32_t> *out = nullptr;
-    if (doc->id_spans.has (e.id, &out))
-      continue;
-    if (unlikely (!doc->id_spans.set (e.id, hb_pair_t<uint32_t, uint32_t> (e.start, e.end))))
-    {
-      id_entries.fini ();
-      glyph_spans.fini ();
-      destroy_doc_cache (doc);
-      return nullptr;
-    }
-  }
-
-  id_entries.fini ();
-  glyph_spans.fini ();
-  return doc;
-}
-
-inline const SVG::svg_doc_cache_t *
-SVG::accelerator_t::get_or_create_doc_cache (hb_blob_t *image,
-                                              const char *svg,
-                                              unsigned len,
-                                              unsigned doc_index,
-                                              hb_codepoint_t start_glyph,
-                                              hb_codepoint_t end_glyph) const
-{
-  if (doc_index >= doc_caches.length)
-    return nullptr;
-
-  auto &slot = doc_caches.arrayZ[doc_index];
-  auto *doc = slot.get_acquire ();
-  if (doc)
-    return doc;
-
-  auto *fresh = make_doc_cache (image, svg, len, start_glyph, end_glyph);
-  if (!fresh)
-    return nullptr;
-
-  auto *expected = (svg_doc_cache_t *) nullptr;
-  if (slot.cmpexch (expected, fresh))
-    return fresh;
-
-  destroy_doc_cache (fresh);
-  return expected;
-}
-
-inline const char *
-SVG::accelerator_t::doc_cache_get_svg (const svg_doc_cache_t *doc,
-                                       unsigned *len) const
-{
-  if (!doc)
-  {
-    if (len) *len = 0;
-    return nullptr;
-  }
-  if (len) *len = doc->len;
-  return doc->svg;
-}
-
-inline const hb_vector_t<SVG::svg_defs_entry_t> *
-SVG::accelerator_t::doc_cache_get_defs_entries (const svg_doc_cache_t *doc) const
-{
-  return doc ? &doc->defs_entries : nullptr;
-}
-
-inline bool
-SVG::accelerator_t::doc_cache_get_glyph_span (const svg_doc_cache_t *doc,
-                                              hb_codepoint_t glyph,
-                                              unsigned *start,
-                                              unsigned *end) const
-{
-  static const uint32_t INVALID_SPAN = 0xFFFFFFFFu;
-  if (!doc || doc->start_glyph == HB_CODEPOINT_INVALID ||
-      glyph < doc->start_glyph || glyph > doc->end_glyph)
-    return false;
-
-  const auto &span = doc->glyph_spans.arrayZ[glyph - doc->start_glyph];
-  if (span.first == INVALID_SPAN)
-    return false;
-
-  if (start) *start = span.first;
-  if (end) *end = span.second;
-  return true;
-}
-
-inline bool
-SVG::accelerator_t::doc_cache_find_id_span (const svg_doc_cache_t *doc,
-                                            svg_id_span_t id,
-                                            unsigned *start,
-                                            unsigned *end) const
-{
-  if (!doc || !id.p || !id.len)
-    return false;
-  hb_pair_t<uint32_t, uint32_t> *span = nullptr;
-  if (!doc->id_spans.has (id, &span))
-    return false;
-  if (start) *start = span->first;
-  if (end) *end = span->second;
-  return true;
-}
-
-inline bool
-SVG::accelerator_t::doc_cache_find_id_cstr (const svg_doc_cache_t *doc,
-                                            const char *id,
-                                            unsigned *start,
-                                            unsigned *end) const
-{
-  if (!id) return false;
-  svg_id_span_t key = {id, (unsigned) strlen (id)};
-  return doc_cache_find_id_span (doc, key, start, end);
-}
-
 struct SVG_accelerator_t : SVG::accelerator_t {
   SVG_accelerator_t (hb_face_t *face) : SVG::accelerator_t (face) {}
 };
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
index 93ca1b2f..edf09db2 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
@@ -46,7 +46,7 @@ struct Coverage
 
   protected:
   union {
-  struct { HBUINT16 v; }        format;         /* Format identifier */
+  HBUINT16                      format;         /* Format identifier */
   CoverageFormat1_3<SmallTypes> format1;
   CoverageFormat2_4<SmallTypes> format2;
 #ifndef HB_NO_BEYOND_64K
@@ -55,7 +55,7 @@ struct Coverage
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 
 #ifndef HB_OPTIMIZE_SIZE
   HB_ALWAYS_INLINE
@@ -63,9 +63,9 @@ struct Coverage
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
@@ -86,7 +86,7 @@ struct Coverage
   unsigned int get (hb_codepoint_t k) const { return get_coverage (k); }
   unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return u.format1.get_coverage (glyph_id);
     case 2: return u.format2.get_coverage (glyph_id);
 #ifndef HB_NO_BEYOND_64K
@@ -111,24 +111,9 @@ struct Coverage
     return coverage;
   }
 
-  unsigned int get_coverage_binary (hb_codepoint_t glyph_id,
-				    hb_ot_layout_binary_cache_t *cache) const
-  {
-    unsigned coverage;
-    if (cache && cache->get (glyph_id, &coverage)) return coverage < cache->MAX_VALUE ? coverage : NOT_COVERED;
-    coverage = get_coverage (glyph_id);
-    if (cache) {
-      if (coverage == NOT_COVERED)
-	cache->set_unchecked (glyph_id, cache->MAX_VALUE);
-      else
-	cache->set_unchecked (glyph_id, 0);
-    }
-    return coverage;
-  }
-
   unsigned get_population () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return u.format1.get_population ();
     case 2: return u.format2.get_population ();
 #ifndef HB_NO_BEYOND_64K
@@ -160,11 +145,11 @@ struct Coverage
       last = g;
       if (g > max) max = g;
     }
-    u.format.v = !unsorted && count <= num_ranges * 3 ? 1 : 2;
+    u.format = !unsorted && count <= num_ranges * 3 ? 1 : 2;
 
 #ifndef HB_NO_BEYOND_64K
     if (max > 0xFFFFu)
-      u.format.v += 2;
+      u.format += 2;
     if (unlikely (max > 0xFFFFFFu))
 #else
     if (unlikely (max > 0xFFFFu))
@@ -174,7 +159,7 @@ struct Coverage
       return_trace (false);
     }
 
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return_trace (u.format1.serialize (c, glyphs));
     case 2: return_trace (u.format2.serialize (c, glyphs));
@@ -205,7 +190,7 @@ struct Coverage
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return u.format1.intersects (glyphs);
     case 2: return u.format2.intersects (glyphs);
@@ -218,7 +203,7 @@ struct Coverage
   }
   bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return u.format1.intersects_coverage (glyphs, index);
     case 2: return u.format2.intersects_coverage (glyphs, index);
@@ -232,7 +217,7 @@ struct Coverage
 
   unsigned cost () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.cost ();
     case 2: hb_barrier (); return u.format2.cost ();
 #ifndef HB_NO_BEYOND_64K
@@ -248,7 +233,7 @@ struct Coverage
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return u.format1.collect_coverage (glyphs);
     case 2: return u.format2.collect_coverage (glyphs);
@@ -264,7 +249,7 @@ struct Coverage
 	    hb_requires (hb_is_sink_of (IterableOut, hb_codepoint_t))>
   void intersect_set (const hb_set_t &glyphs, IterableOut&& intersect_glyphs) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return u.format1.intersect_set (glyphs, intersect_glyphs);
     case 2: return u.format2.intersect_set (glyphs, intersect_glyphs);
@@ -282,7 +267,7 @@ struct Coverage
     iter_t (const Coverage &c_ = Null (Coverage))
     {
       hb_memset (this, 0, sizeof (*this));
-      format = c_.u.format.v;
+      format = c_.u.format;
       switch (format)
       {
       case 1: u.format1.init (c_.u.format1); return;
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GDEF/GDEF.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GDEF/GDEF.hh
index d0b8c1bd..ed397b75 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GDEF/GDEF.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GDEF/GDEF.hh
@@ -252,7 +252,7 @@ struct CaretValue
 				 hb_codepoint_t glyph_id,
 				 const ItemVariationStore &var_store) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return u.format1.get_caret_value (font, direction);
     case 2: return u.format2.get_caret_value (font, direction, glyph_id);
     case 3: return u.format3.get_caret_value (font, direction, var_store);
@@ -263,9 +263,9 @@ struct CaretValue
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -275,7 +275,7 @@ struct CaretValue
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
     case 2:
       return;
@@ -289,9 +289,9 @@ struct CaretValue
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
     case 3: return_trace (u.format3.sanitize (c));
@@ -301,13 +301,13 @@ struct CaretValue
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   CaretValueFormat1	format1;
   CaretValueFormat2	format2;
   CaretValueFormat3	format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 struct LigGlyph
@@ -519,7 +519,7 @@ struct MarkGlyphSets
 {
   bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return u.format1.covers (set_index, glyph_id);
     default:return false;
     }
@@ -528,7 +528,7 @@ struct MarkGlyphSets
   template <typename set_t>
   void collect_coverage (hb_vector_t<set_t> &sets) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: u.format1.collect_coverage (sets); return;
     default:return;
     }
@@ -537,7 +537,7 @@ struct MarkGlyphSets
   void collect_used_mark_sets (const hb_set_t& glyph_set,
                                hb_set_t& used_mark_sets /* OUT */) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return;
     default:return;
     }
@@ -546,7 +546,7 @@ struct MarkGlyphSets
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (u.format1.subset (c));
     default:return_trace (false);
     }
@@ -555,9 +555,9 @@ struct MarkGlyphSets
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     default:return_trace (true);
     }
@@ -565,11 +565,11 @@ struct MarkGlyphSets
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   MarkGlyphSetsFormat1	format1;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 
@@ -1002,34 +1002,20 @@ struct GDEF
 
     }
 
-    HB_ALWAYS_INLINE
     bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const
     {
       return
 #ifndef HB_NO_GDEF_CACHE
-	     // We can access arrayZ directly because of sanitize_lookup_props() guarantee.
-	     mark_glyph_sets.arrayZ[set_index].may_have (glyph_id) &&
-#endif
+	     mark_glyph_sets[set_index].may_have (glyph_id)
+#else
 	     table->mark_set_covers (set_index, glyph_id)
-      ;
-    }
-
-    unsigned sanitize_lookup_props (unsigned lookup_props) const
-    {
-#ifndef HB_NO_GDEF_CACHE
-      if (lookup_props & LookupFlag::UseMarkFilteringSet &&
-	  (lookup_props >> 16) >= mark_glyph_sets.length)
-      {
-        // Invalid mark filtering set index; unset the flag.
-	lookup_props &= ~LookupFlag::UseMarkFilteringSet;
-      }
 #endif
-      return lookup_props;
+      ;
     }
 
     hb_blob_ptr_t<GDEF> table;
 #ifndef HB_NO_GDEF_CACHE
-    hb_vector_t<hb_set_digest_t> mark_glyph_sets;
+    hb_vector_t<hb_bit_set_t> mark_glyph_sets;
     mutable hb_cache_t<21, 3> glyph_props_cache;
     static_assert (sizeof (glyph_props_cache) == 512, "");
 #endif
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/Anchor.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/Anchor.hh
index 1938803f..7802e397 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/Anchor.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/Anchor.hh
@@ -13,20 +13,20 @@ struct Anchor
 {
   protected:
   union {
-  struct { HBUINT16 v; } format;        /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   AnchorFormat1         format1;
   AnchorFormat2         format2;
   AnchorFormat3         format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
     case 3: return_trace (u.format3.sanitize (c));
@@ -38,7 +38,7 @@ struct Anchor
                    float *x, float *y) const
   {
     *x = *y = 0;
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: u.format1.get_anchor (c, glyph_id, x, y); return;
     case 2: u.format2.get_anchor (c, glyph_id, x, y); return;
     case 3: u.format3.get_anchor (c, glyph_id, x, y); return;
@@ -49,7 +49,7 @@ struct Anchor
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: return_trace (bool (reinterpret_cast<Anchor *> (u.format1.copy (c->serializer))));
     case 2:
       if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
@@ -66,7 +66,7 @@ struct Anchor
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: case 2:
       return;
     case 3:
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePos.hh
index 38a29dd9..0105a9b8 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePos.hh
@@ -11,7 +11,7 @@ struct CursivePos
 {
   protected:
   union {
-  struct { HBUINT16 v; } format;        /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   CursivePosFormat1     format1;
   } u;
 
@@ -19,9 +19,9 @@ struct CursivePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
index 4d6d3405..ea66374c 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
@@ -50,7 +50,7 @@ struct EntryExitRecord
   DEFINE_SIZE_STATIC (4);
 };
 
-static inline void
+static void
 reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent)
 {
   int chain = pos[i].attach_chain(), type = pos[i].attach_type();
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkBasePos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkBasePos.hh
index 32476663..cd2fc7cc 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkBasePos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkBasePos.hh
@@ -11,7 +11,7 @@ struct MarkBasePos
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   MarkBasePosFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   MarkBasePosFormat1_2<MediumTypes>	format2;
@@ -22,9 +22,9 @@ struct MarkBasePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkLigPos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkLigPos.hh
index 5c686f57..739c3254 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkLigPos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkLigPos.hh
@@ -11,7 +11,7 @@ struct MarkLigPos
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   MarkLigPosFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   MarkLigPosFormat1_2<MediumTypes>	format2;
@@ -22,9 +22,9 @@ struct MarkLigPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkMarkPos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkMarkPos.hh
index dbd8419c..cddd2a3d 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkMarkPos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/MarkMarkPos.hh
@@ -11,7 +11,7 @@ struct MarkMarkPos
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   MarkMarkPosFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   MarkMarkPosFormat1_2<MediumTypes>	format2;
@@ -22,9 +22,9 @@ struct MarkMarkPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPos.hh
index 1b3b7009..c13d4f48 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPos.hh
@@ -12,7 +12,7 @@ struct PairPos
 {
   protected:
   union {
-  struct { HBUINT16 v; }	format;         /* Format identifier */
+  HBUINT16			format;         /* Format identifier */
   PairPosFormat1_3<SmallTypes>	format1;
   PairPosFormat2_4<SmallTypes>	format2;
 #ifndef HB_NO_BEYOND_64K
@@ -25,9 +25,9 @@ struct PairPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePos.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePos.hh
index 30fc1aac..a0243a21 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePos.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePos.hh
@@ -12,7 +12,7 @@ struct SinglePos
 {
   protected:
   union {
-  struct { HBUINT16 v; } format;        /* Format identifier */
+  HBUINT16              format;         /* Format identifier */
   SinglePosFormat1      format1;
   SinglePosFormat2      format2;
   } u;
@@ -41,7 +41,7 @@ struct SinglePos
                   const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
                   unsigned newFormat)
   {
-    if (unlikely (!c->extend_min (u.format.v))) return;
+    if (unlikely (!c->extend_min (u.format))) return;
     unsigned format = 2;
     ValueFormat new_format;
     new_format = newFormat;
@@ -49,8 +49,8 @@ struct SinglePos
     if (glyph_val_iter_pairs)
       format = get_format (glyph_val_iter_pairs);
 
-    u.format.v = format;
-    switch (u.format.v) {
+    u.format = format;
+    switch (u.format) {
     case 1: u.format1.serialize (c,
                                  src,
                                  glyph_val_iter_pairs,
@@ -70,9 +70,9 @@ struct SinglePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
index 4792a497..e9fe3923 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
@@ -100,7 +100,7 @@ struct SinglePosFormat1 : ValueBase
     if (likely (index == NOT_COVERED)) return false;
 
     /* This is ugly... */
-    hb_buffer_t buffer {};
+    hb_buffer_t buffer;
     buffer.props.direction = direction;
     OT::hb_ot_apply_context_t c (1, font, &buffer, table_blob);
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
index dc92f6a5..2fb71058 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
@@ -104,7 +104,7 @@ struct SinglePosFormat2 : ValueBase
     if (unlikely (index >= valueCount)) return false;
 
     /* This is ugly... */
-    hb_buffer_t buffer {};
+    hb_buffer_t buffer;
     buffer.props.direction = direction;
     OT::hb_ot_apply_context_t c (1, font, &buffer, table_blob);
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh
index 08b1dbbe..04a052a7 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh
@@ -12,7 +12,7 @@ struct AlternateSubst
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   AlternateSubstFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   AlternateSubstFormat1_2<MediumTypes>	format2;
@@ -23,9 +23,9 @@ struct AlternateSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -42,10 +42,10 @@ struct AlternateSubst
                   hb_array_t<const HBGlyphID16> alternate_glyphs_list)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format))) return_trace (false);
     unsigned int format = 1;
-    u.format.v = format;
-    switch (u.format.v) {
+    u.format = format;
+    switch (u.format) {
     case 1: return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list));
     default:return_trace (false);
     }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh
index e3987947..9d933f16 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh
@@ -105,7 +105,7 @@ struct LigatureSet
      *
      * This is replicated in ChainRuleSet and RuleSet. */
 
-    auto &skippy_iter = c->iter_context;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh
index 406d91ec..18f6e355 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh
@@ -12,7 +12,7 @@ struct LigatureSubst
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   LigatureSubstFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   LigatureSubstFormat1_2<MediumTypes>	format2;
@@ -23,9 +23,9 @@ struct LigatureSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -45,10 +45,10 @@ struct LigatureSubst
                   hb_array_t<const HBGlyphID16> component_list /* Starting from second for each ligature */)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format))) return_trace (false);
     unsigned int format = 1;
-    u.format.v = format;
-    switch (u.format.v) {
+    u.format = format;
+    switch (u.format) {
     case 1: return_trace (u.format1.serialize (c,
                                                first_glyphs,
                                                ligature_per_first_glyph_count_list,
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
index 909ddca2..a84cde1c 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
@@ -107,10 +107,10 @@ struct LigatureSubstFormat1_2
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     external_cache_t *cache = (external_cache_t *) external_cache;
     const hb_set_digest_t *seconds = cache ? &cache->seconds : nullptr;
-    unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
 #else
     const hb_set_digest_t *seconds = nullptr;
-    unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh
index 2ff59ad9..742c8587 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh
@@ -12,7 +12,7 @@ struct MultipleSubst
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   MultipleSubstFormat1_2<SmallTypes>	format1;
 #ifndef HB_NO_BEYOND_64K
   MultipleSubstFormat1_2<MediumTypes>	format2;
@@ -24,9 +24,9 @@ struct MultipleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -41,10 +41,10 @@ struct MultipleSubst
 		  Iterator it)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format))) return_trace (false);
     unsigned int format = 1;
-    u.format.v = format;
-    switch (u.format.v) {
+    u.format = format;
+    switch (u.format) {
     case 1: return_trace (u.format1.serialize (c, it));
     default:return_trace (false);
     }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
index e33148d7..5ad463fe 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
@@ -12,7 +12,7 @@ struct ReverseChainSingleSubst
 {
   protected:
   union {
-  struct { HBUINT16 v; }                format;         /* Format identifier */
+  HBUINT16                              format;         /* Format identifier */
   ReverseChainSingleSubstFormat1        format1;
   } u;
 
@@ -20,9 +20,9 @@ struct ReverseChainSingleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh
index 7ffe3a68..181c9e52 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh
@@ -13,7 +13,7 @@ struct SingleSubst
 {
   protected:
   union {
-  struct { HBUINT16 v; }		format;         /* Format identifier */
+  HBUINT16				format;         /* Format identifier */
   SingleSubstFormat1_3<SmallTypes>	format1;
   SingleSubstFormat2_4<SmallTypes>	format2;
 #ifndef HB_NO_BEYOND_64K
@@ -27,9 +27,9 @@ struct SingleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
@@ -47,7 +47,7 @@ struct SingleSubst
                   Iterator glyphs)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format))) return_trace (false);
     unsigned format = 2;
     unsigned delta = 0;
     if (glyphs)
@@ -71,8 +71,8 @@ struct SingleSubst
       if (!hb_all (++(+glyphs), delta, get_delta)) format += 1;
     }
 
-    u.format.v = format;
-    switch (u.format.v) {
+    u.format = format;
+    switch (u.format) {
     case 1: return_trace (u.format1.serialize (c,
                                                + glyphs
                                                | hb_map_retains_sorting (hb_first),
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
index 5cf9eb36..6e412e5f 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
@@ -29,11 +29,8 @@
 #ifndef OT_LAYOUT_TYPES_HH
 #define OT_LAYOUT_TYPES_HH
 
-using hb_ot_layout_mapping_cache_t = hb_cache_t<16, 8, 8>;
-static_assert (sizeof (hb_ot_layout_mapping_cache_t) == 512, "");
-
-using hb_ot_layout_binary_cache_t = hb_cache_t<14, 1, 8>;
-static_assert (sizeof (hb_ot_layout_binary_cache_t) == 256, "");
+using hb_ot_layout_mapping_cache_t = hb_cache_t<15, 8, 7>;
+static_assert (sizeof (hb_ot_layout_mapping_cache_t) == 256, "");
 
 namespace OT {
 namespace Layout {
diff --git a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
index 7524686d..1a22f1d8 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
+++ b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
@@ -228,28 +228,28 @@ VarComponent::get_path_at (const hb_varc_context_t &c,
 
 #define PROCESS_TRANSFORM_COMPONENTS \
 	HB_STMT_START { \
-	PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_X, translateX); \
-	PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_Y, translateY); \
-	PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_ROTATION, rotation); \
-	PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_X, scaleX); \
-	PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_Y, scaleY); \
-	PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_X, skewX); \
-	PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_Y, skewY); \
-	PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_X, tCenterX); \
-	PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_Y, tCenterY); \
+	PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TRANSLATE_X, translateX); \
+	PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TRANSLATE_Y, translateY); \
+	PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_ROTATION, rotation); \
+	PROCESS_TRANSFORM_COMPONENT (F6DOT10, 1.0f, HAVE_SCALE_X, scaleX); \
+	PROCESS_TRANSFORM_COMPONENT (F6DOT10, 1.0f, HAVE_SCALE_Y, scaleY); \
+	PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_SKEW_X, skewX); \
+	PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_SKEW_Y, skewY); \
+	PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TCENTER_X, tCenterX); \
+	PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TCENTER_Y, tCenterY); \
 	} HB_STMT_END
 
   hb_transform_decomposed_t<> transform;
 
   // Read transform components
-#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
 	if (flags & (unsigned) flags_t::flag) \
 	{ \
 	  static_assert (type::static_size == HBINT16::static_size, ""); \
 	  if (unlikely (unsigned (end - record) < HBINT16::static_size)) \
 	    return hb_ubytes_t (); \
 	  hb_barrier (); \
-	  transform.name = * (const HBINT16 *) record; \
+	  transform.name = mult * * (const HBINT16 *) record; \
 	  record += HBINT16::static_size; \
 	}
   PROCESS_TRANSFORM_COMPONENTS;
@@ -270,8 +270,9 @@ VarComponent::get_path_at (const hb_varc_context_t &c,
   {
     // Only use coord_setter if there's actually any axis overrides.
     coord_setter_t coord_setter (axisIndices ? component_coords : hb_array<int> ());
-    for (unsigned i = 0; i < axisIndices.length; i++)
-      coord_setter[axisIndices[i]] = roundf (axisValues[i]);
+    // Go backwards, to reduce coord_setter vector reallocations.
+    for (unsigned i = axisIndices.length; i; i--)
+      coord_setter[axisIndices[i - 1]] = axisValues[i - 1];
     if (axisIndices)
       component_coords = coord_setter.get_coords ();
 
@@ -280,35 +281,39 @@ VarComponent::get_path_at (const hb_varc_context_t &c,
     {
       float transformValues[9];
       unsigned numTransformValues = 0;
-#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
 	  if (flags & (unsigned) flags_t::flag) \
-	    transformValues[numTransformValues++] = transform.name;
+	    transformValues[numTransformValues++] = transform.name / mult;
       PROCESS_TRANSFORM_COMPONENTS;
 #undef PROCESS_TRANSFORM_COMPONENT
       varStore.get_delta (transformVarIdx, coords, hb_array (transformValues, numTransformValues), cache);
       numTransformValues = 0;
-#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
 	  if (flags & (unsigned) flags_t::flag) \
-	    transform.name = transformValues[numTransformValues++];
+	    transform.name = transformValues[numTransformValues++] * mult;
       PROCESS_TRANSFORM_COMPONENTS;
 #undef PROCESS_TRANSFORM_COMPONENT
     }
 
     // Divide them by their divisors
-#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \
-	  if (shift && (flags & (unsigned) flags_t::flag)) \
-	     transform.name *= 1.f / (1 << shift);
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
+	  if (flags & (unsigned) flags_t::flag) \
+	  { \
+	    HBINT16 int_v; \
+	    int_v = roundf (transform.name); \
+	    type typed_v = * (const type *) &int_v; \
+	    float float_v = (float) typed_v; \
+	    transform.name = float_v; \
+	  }
     PROCESS_TRANSFORM_COMPONENTS;
 #undef PROCESS_TRANSFORM_COMPONENT
 
     if (!(flags & (unsigned) flags_t::HAVE_SCALE_Y))
       transform.scaleY = transform.scaleX;
 
-    transform.rotation *= HB_PI;
-    transform.skewX *= HB_PI;
-    transform.skewY *= HB_PI;
-
     total_transform.transform (transform.to_transform ());
+    total_transform.scale (c.font->x_mult ? 1.f / c.font->x_multf : 0.f,
+			   c.font->y_mult ? 1.f / c.font->y_multf : 0.f);
 
     bool same_coords = component_coords.length == coords.length &&
 		       component_coords.arrayZ == coords.arrayZ;
@@ -343,18 +348,14 @@ VARC::get_path_at (const hb_varc_context_t &c,
   {
     if (c.draw_session)
     {
-      hb_transform_t<> leaf_transform = transform;
-      leaf_transform.x0 *= c.font->x_multf;
-      leaf_transform.y0 *= c.font->y_multf;
-
       // Build a transforming pen to apply the transform.
       hb_draw_funcs_t *transformer_funcs = hb_transforming_pen_get_funcs ();
-      hb_transforming_pen_context_t context {leaf_transform,
+      hb_transforming_pen_context_t context {transform,
 					     c.draw_session->funcs,
 					     c.draw_session->draw_data,
 					     &c.draw_session->st};
       hb_draw_session_t transformer_session {transformer_funcs, &context};
-      hb_draw_session_t &shape_draw_session = leaf_transform.is_identity () ? *c.draw_session : transformer_session;
+      hb_draw_session_t &shape_draw_session = transform.is_identity () ? *c.draw_session : transformer_session;
 
       if (c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch)) return true;
 #ifndef HB_NO_CFF
@@ -374,10 +375,7 @@ VARC::get_path_at (const hb_varc_context_t &c,
 	return false;
 
       hb_extents_t<> comp_extents (glyph_extents);
-      hb_transform_t<> leaf_transform = transform;
-      leaf_transform.x0 *= c.font->x_multf;
-      leaf_transform.y0 *= c.font->y_multf;
-      leaf_transform.transform_extents (comp_extents);
+      transform.transform_extents (comp_extents);
       c.extents->union_ (comp_extents);
     }
     return true;
@@ -401,6 +399,8 @@ VARC::get_path_at (const hb_varc_context_t &c,
 				  parent_cache :
 				  (this+varStore).create_cache (&static_cache);
 
+  transform.scale (c.font->x_multf, c.font->y_multf);
+
   VarCompositeGlyph::get_path_at (c,
 				  glyph,
 				  coords, transform,
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
index 83d3eaed..a3ec885e 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
@@ -384,24 +384,20 @@ struct Glyph
     {
 #ifndef HB_NO_BEYOND_64K
       if (glyf_accelerator.GVAR->has_data ())
-      {
-	if (!glyf_accelerator.GVAR->apply_deltas_to_points (gid,
-							    coords,
-							    points.as_array ().sub_array (old_length),
-							    scratch,
-							    gvar_cache,
-							    phantom_only && type == SIMPLE))
-	  return false;
-      }
+	glyf_accelerator.GVAR->apply_deltas_to_points (gid,
+						       coords,
+						       points.as_array ().sub_array (old_length),
+						       scratch,
+						       gvar_cache,
+						       phantom_only && type == SIMPLE);
       else
 #endif
-      if (!glyf_accelerator.gvar->apply_deltas_to_points (gid,
-							  coords,
-							  points.as_array ().sub_array (old_length),
-							  scratch,
-							  gvar_cache,
-							  phantom_only && type == SIMPLE))
-        return false;
+	glyf_accelerator.gvar->apply_deltas_to_points (gid,
+						       coords,
+						       points.as_array ().sub_array (old_length),
+						       scratch,
+						       gvar_cache,
+						       phantom_only && type == SIMPLE);
     }
 #endif
 
diff --git a/engine/thirdparty/harfbuzz/src/graph/classdef-graph.hh b/engine/thirdparty/harfbuzz/src/graph/classdef-graph.hh
index d1f38b9d..d6c174e8 100644
--- a/engine/thirdparty/harfbuzz/src/graph/classdef-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/classdef-graph.hh
@@ -117,7 +117,7 @@ struct ClassDef : public OT::ClassDef
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::ClassDef::min_size) return false;
     hb_barrier ();
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return ((ClassDefFormat1*)this)->sanitize (vertex);
     case 2: return ((ClassDefFormat2*)this)->sanitize (vertex);
diff --git a/engine/thirdparty/harfbuzz/src/graph/coverage-graph.hh b/engine/thirdparty/harfbuzz/src/graph/coverage-graph.hh
index 46c70352..3b034c9d 100644
--- a/engine/thirdparty/harfbuzz/src/graph/coverage-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/coverage-graph.hh
@@ -161,7 +161,7 @@ struct Coverage : public OT::Layout::Common::Coverage
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::Layout::Common::Coverage::min_size) return false;
     hb_barrier ();
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: return graph::sanitize ((const OT::Layout::Common::CoverageFormat1_3<OT::Layout::SmallTypes>*) this, vertex);
     case 2: return graph::sanitize ((const OT::Layout::Common::CoverageFormat2_4<OT::Layout::SmallTypes>*) this, vertex);
diff --git a/engine/thirdparty/harfbuzz/src/graph/graph.hh b/engine/thirdparty/harfbuzz/src/graph/graph.hh
index af8b3125..68f47b48 100644
--- a/engine/thirdparty/harfbuzz/src/graph/graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/graph.hh
@@ -1097,6 +1097,24 @@ struct graph_t
     return clone_idx;
   }
 
+  /*
+   * Creates a copy of child and re-assigns the link from
+   * parent to the clone. The copy is a shallow copy, objects
+   * linked from child are not duplicated.
+   *
+   * Returns the index of the newly created duplicate.
+   *
+   * If the child_idx only has incoming edges from parent_idx, this
+   * will do nothing and return the original child_idx.
+   */
+  unsigned duplicate_if_shared (unsigned parent_idx, unsigned child_idx)
+  {
+    unsigned new_idx = duplicate (parent_idx, child_idx);
+    if (new_idx == (unsigned) -1) return child_idx;
+    return new_idx;
+  }
+
+
   /*
    * Creates a copy of child and re-assigns the link from
    * parent to the clone. The copy is a shallow copy, objects
@@ -1240,34 +1258,6 @@ struct graph_t
     return clone_idx;
   }
 
-  /*
-   * Creates a new child node and remap the old child to it.
-   *
-   * Returns the index of the newly created child.
-   *
-   */
-  unsigned remap_child (unsigned parent_idx, unsigned old_child_idx)
-  {
-    unsigned new_child_idx = duplicate (old_child_idx);
-    if (new_child_idx == (unsigned) -1) return -1;
-
-    auto& parent = vertices_[parent_idx];
-    for (auto& l : parent.obj.real_links)
-    {
-      if (l.objidx != old_child_idx)
-        continue;
-      reassign_link (l, parent_idx, new_child_idx, false);
-    }
-
-    for (auto& l : parent.obj.virtual_links)
-    {
-      if (l.objidx != old_child_idx)
-        continue;
-      reassign_link (l, parent_idx, new_child_idx, true);
-    }
-    return new_child_idx;
-  }
-
   /*
    * Raises the sorting priority of all children.
    */
diff --git a/engine/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh b/engine/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh
index 8969d007..b25d538f 100644
--- a/engine/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/gsubgpos-context.hh
@@ -41,7 +41,6 @@ struct gsubgpos_graph_context_t
   unsigned lookup_list_index;
   hb_hashmap_t<unsigned, graph::Lookup*> lookups;
   hb_hashmap_t<unsigned, unsigned> subtable_to_extension;
-  hb_hashmap_t<unsigned, hb_vector_t<unsigned>> split_subtables;
 
   HB_INTERNAL gsubgpos_graph_context_t (hb_tag_t table_tag_,
                                         graph_t& graph_);
diff --git a/engine/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh b/engine/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh
index ea6bcd23..50dc03e3 100644
--- a/engine/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/gsubgpos-graph.hh
@@ -138,8 +138,10 @@ struct Lookup : public OT::Lookup
     for (unsigned i = 0; i < subTable.len; i++)
     {
       unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]);
+      unsigned parent_index = this_index;
       if (is_ext) {
         unsigned ext_subtable_index = subtable_index;
+        parent_index = ext_subtable_index;
         ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>* extension =
             (ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>*)
             c.graph.object (ext_subtable_index).head;
@@ -152,43 +154,33 @@ struct Lookup : public OT::Lookup
           continue;
       }
 
-      hb_vector_t<unsigned>* split_result;
-      if (c.split_subtables.has (subtable_index, &split_result))
-      {
-        if (split_result->length == 0)
-          continue;
-        all_new_subtables.push (hb_pair(i, *split_result));
-      }
-      else
-      {
-        hb_vector_t<unsigned> new_sub_tables;
+      hb_vector_t<unsigned> new_sub_tables;
 
-        if (c.table_tag == HB_OT_TAG_GPOS) {
-          switch (type)
-          {
-          case 2:
-            new_sub_tables = split_subtable<PairPos> (c, subtable_index); break;
-          case 4:
-            new_sub_tables = split_subtable<MarkBasePos> (c, subtable_index); break;
-          default:
-            break;
-          }
-        } else if (c.table_tag == HB_OT_TAG_GSUB) {
-          switch (type)
-          {
-          case 4:
-            new_sub_tables = split_subtable<graph::LigatureSubst> (c, subtable_index); break;
-          default:
-            break;
-          }
+      if (c.table_tag == HB_OT_TAG_GPOS) {
+        switch (type)
+        {
+        case 2:
+          new_sub_tables = split_subtable<PairPos> (c, parent_index, subtable_index); break;
+        case 4:
+          new_sub_tables = split_subtable<MarkBasePos> (c, parent_index, subtable_index); break;
+        default:
+          break;
+        }
+      } else if (c.table_tag == HB_OT_TAG_GSUB) {
+        switch (type)
+        {
+        case 4:
+          new_sub_tables = split_subtable<graph::LigatureSubst> (c, parent_index, subtable_index); break;
+        default:
+          break;
         }
-
-        if (new_sub_tables.in_error ()) return false;
-
-        c.split_subtables.set (subtable_index, new_sub_tables);
-        if (new_sub_tables)
-          all_new_subtables.push (hb_pair (i, std::move (new_sub_tables)));
       }
+
+      if (new_sub_tables.in_error ()) return false;
+      if (!new_sub_tables) continue;
+      hb_pair_t<unsigned, hb_vector_t<unsigned>>* entry = all_new_subtables.push ();
+      entry->first = i;
+      entry->second = std::move (new_sub_tables);
     }
 
     if (all_new_subtables) {
@@ -200,19 +192,20 @@ struct Lookup : public OT::Lookup
 
   template<typename T>
   hb_vector_t<unsigned> split_subtable (gsubgpos_graph_context_t& c,
+                                        unsigned parent_idx,
                                         unsigned objidx)
   {
     T* sub_table = (T*) c.graph.object (objidx).head;
     if (!sub_table || !sub_table->sanitize (c.graph.vertices_[objidx]))
       return hb_vector_t<unsigned> ();
 
-    return sub_table->split_subtables (c, objidx);
+    return sub_table->split_subtables (c, parent_idx, objidx);
   }
 
   bool add_sub_tables (gsubgpos_graph_context_t& c,
                        unsigned this_index,
                        unsigned type,
-                       const hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
+                       hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
   {
     bool is_ext = is_extension (c.table_tag);
     auto* v = &c.graph.vertices_[this_index];
@@ -279,15 +272,17 @@ struct Lookup : public OT::Lookup
 
   void fix_existing_subtable_links (gsubgpos_graph_context_t& c,
                                     unsigned this_index,
-                                    const hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
+                                    hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
   {
     auto& v = c.graph.vertices_[this_index];
+    Lookup* lookup = (Lookup*) v.obj.head;
+
     unsigned shift = 0;
     for (const auto& p : subtable_ids)
     {
       unsigned insert_index = p.first + shift;
       unsigned pos_offset = p.second.length * OT::Offset16::static_size;
-      unsigned insert_offset = Lookup::min_size + insert_index * OT::Offset16::static_size;
+      unsigned insert_offset = (char*) &lookup->subTable[insert_index] - (char*) lookup;
       shift += p.second.length;
 
       for (auto& l : v.obj.all_links_writer ())
@@ -331,7 +326,7 @@ struct Lookup : public OT::Lookup
     unsigned* existing_ext_index = nullptr;
     if (c.subtable_to_extension.has(subtable_index, &existing_ext_index)) {
       ext_index = *existing_ext_index;
-    } else {
+    } else {    
       ext_index = create_extension_subtable(c, subtable_index, type);
       c.subtable_to_extension.set(subtable_index, ext_index);
     }
diff --git a/engine/thirdparty/harfbuzz/src/graph/ligature-graph.hh b/engine/thirdparty/harfbuzz/src/graph/ligature-graph.hh
index 84227127..fd170bd9 100644
--- a/engine/thirdparty/harfbuzz/src/graph/ligature-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/ligature-graph.hh
@@ -67,13 +67,14 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    auto split_points = compute_split_points(c, this_index);
+    auto split_points = compute_split_points(c, parent_index, this_index);
     split_context_t split_context {
       c,
       this,
-      this_index,
+      c.graph.duplicate_if_shared (parent_index, this_index),
       total_number_ligas(c, this_index),
       liga_counts(c, this_index),
     };
@@ -122,6 +123,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1
   }
 
   hb_vector_t<unsigned> compute_split_points(gsubgpos_graph_context_t& c,
+                                             unsigned parent_index,
                                              unsigned this_index) const
   {
     // For ligature subst coverage is always packed last, and as a result is where an overflow
@@ -439,36 +441,26 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1
     }
 
     // Adjust liga set array
-    auto& this_vertex = c.graph.vertices_[this_index];
-    this_vertex.obj.tail -= (ligatureSet.len - new_liga_set_count) * SmallTypes::size;
+    c.graph.vertices_[this_index].obj.tail -= (ligatureSet.len - new_liga_set_count) * SmallTypes::size;
     ligatureSet.len = new_liga_set_count;
 
     // Coverage matches the number of liga sets so rebuild as needed
-    unsigned coverage_idx = c.graph.index_for_offset (this_index, &this->coverage);
-    if (coverage_idx == (unsigned) -1) return false;
-
-    auto& coverage_v = c.graph.vertices_[coverage_idx];
-    unsigned coverage_size = coverage_v.table_size ();
-    Coverage* coverage_table = (Coverage*) coverage_v.obj.head;
-
-    if (coverage_v.is_shared ())
-    {
-      coverage_idx = c.graph.remap_child (this_index, coverage_idx);
-      if (coverage_idx == (unsigned) -1) return false;
-    }
+    auto coverage = c.graph.as_mutable_table<Coverage> (this_index, &this->coverage);
+    if (!coverage) return false;
 
     for (unsigned i : retained_indices.iter())
-      add_virtual_link(c, i, coverage_idx);
+      add_virtual_link(c, i, coverage.index);
 
+    unsigned coverage_size = coverage.vertex->table_size ();
     auto new_coverage =
-        + hb_zip (coverage_table->iter (), hb_range ())
+        + hb_zip (coverage.table->iter (), hb_range ())
         | hb_filter ([&] (hb_pair_t<unsigned, unsigned> p) {
           return p.second < new_liga_set_count;
         })
         | hb_map_retains_sorting (hb_first)
         ;
 
-    return Coverage::make_coverage (c, new_coverage, coverage_idx, coverage_size);
+    return Coverage::make_coverage (c, new_coverage, coverage.index, coverage_size);
   }
 };
 
@@ -476,11 +468,12 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst
 {
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
-      return ((LigatureSubstFormat1*)(&u.format1))->split_subtables (c, this_index);
+      return ((LigatureSubstFormat1*)(&u.format1))->split_subtables (c, parent_index, this_index);
 #ifndef HB_NO_BEYOND_64K
     case 2: HB_FALLTHROUGH;
       // Don't split 24bit Ligature Subs
@@ -493,10 +486,10 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst
   bool sanitize (graph_t::vertex_t& vertex) const
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    if (vertex_len < u.format.v.get_size ()) return false;
+    if (vertex_len < u.format.get_size ()) return false;
     hb_barrier ();
 
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
       return ((LigatureSubstFormat1*)(&u.format1))->sanitize (vertex);
 #ifndef HB_NO_BEYOND_64K
diff --git a/engine/thirdparty/harfbuzz/src/graph/markbasepos-graph.hh b/engine/thirdparty/harfbuzz/src/graph/markbasepos-graph.hh
index 6d1a3d4a..fb416612 100644
--- a/engine/thirdparty/harfbuzz/src/graph/markbasepos-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/markbasepos-graph.hh
@@ -212,6 +212,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
     hb_set_t visited;
@@ -264,7 +265,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
     split_context_t split_context {
       c,
       this,
-      this_index,
+      c.graph.duplicate_if_shared (parent_index, this_index),
       std::move (class_to_info),
       c.graph.vertices_[mark_array_id].position_to_index_map (),
     };
@@ -477,11 +478,12 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
 struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos
 {
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
-      return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, this_index);
+      return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, parent_index, this_index);
 #ifndef HB_NO_BEYOND_64K
     case 2: HB_FALLTHROUGH;
       // Don't split 24bit MarkBasePos's.
@@ -494,10 +496,10 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos
   bool sanitize (graph_t::vertex_t& vertex) const
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    if (vertex_len < u.format.v.get_size ()) return false;
+    if (vertex_len < u.format.get_size ()) return false;
     hb_barrier ();
 
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
       return ((MarkBasePosFormat1*)(&u.format1))->sanitize (vertex);
 #ifndef HB_NO_BEYOND_64K
diff --git a/engine/thirdparty/harfbuzz/src/graph/pairpos-graph.hh b/engine/thirdparty/harfbuzz/src/graph/pairpos-graph.hh
index 85950b63..46da2740 100644
--- a/engine/thirdparty/harfbuzz/src/graph/pairpos-graph.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/pairpos-graph.hh
@@ -49,6 +49,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallType
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
     hb_set_t visited;
@@ -83,7 +84,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallType
     split_context_t split_context {
       c,
       this,
-      this_index,
+      c.graph.duplicate_if_shared (parent_index, this_index),
     };
 
     return actuate_subtable_split<split_context_t> (split_context, split_points);
@@ -206,6 +207,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
     const unsigned base_size = OT::Layout::GPOS_impl::PairPosFormat2_4<SmallTypes>::min_size;
@@ -289,7 +291,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
     split_context_t split_context {
       c,
       this,
-      this_index,
+      c.graph.duplicate_if_shared (parent_index, this_index),
       class1_record_size,
       total_value_len,
       value_1_len,
@@ -605,13 +607,14 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
 struct PairPos : public OT::Layout::GPOS_impl::PairPos
 {
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
+                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
-      return ((PairPosFormat1*)(&u.format1))->split_subtables (c, this_index);
+      return ((PairPosFormat1*)(&u.format1))->split_subtables (c, parent_index, this_index);
     case 2:
-      return ((PairPosFormat2*)(&u.format2))->split_subtables (c, this_index);
+      return ((PairPosFormat2*)(&u.format2))->split_subtables (c, parent_index, this_index);
 #ifndef HB_NO_BEYOND_64K
     case 3: HB_FALLTHROUGH;
     case 4: HB_FALLTHROUGH;
@@ -625,10 +628,10 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos
   bool sanitize (graph_t::vertex_t& vertex) const
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    if (vertex_len < u.format.v.get_size ()) return false;
+    if (vertex_len < u.format.get_size ()) return false;
     hb_barrier ();
 
-    switch (u.format.v) {
+    switch (u.format) {
     case 1:
       return ((PairPosFormat1*)(&u.format1))->sanitize (vertex);
     case 2:
diff --git a/engine/thirdparty/harfbuzz/src/graph/split-helpers.hh b/engine/thirdparty/harfbuzz/src/graph/split-helpers.hh
index f1f86e33..61fd7c2d 100644
--- a/engine/thirdparty/harfbuzz/src/graph/split-helpers.hh
+++ b/engine/thirdparty/harfbuzz/src/graph/split-helpers.hh
@@ -49,7 +49,7 @@ hb_vector_t<unsigned> actuate_subtable_split (Context& split_context,
     if (id == (unsigned) -1)
     {
       new_objects.reset ();
-      new_objects.ensure_error ();
+      new_objects.allocated = -1; // mark error
       return new_objects;
     }
     new_objects.push (id);
@@ -58,7 +58,7 @@ hb_vector_t<unsigned> actuate_subtable_split (Context& split_context,
   if (!split_context.shrink (split_points[0]))
   {
     new_objects.reset ();
-    new_objects.ensure_error ();
+    new_objects.allocated = -1; // mark error
   }
 
   return new_objects;
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
index b63e7916..98aa2b0d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
@@ -692,7 +692,7 @@ struct Lookup
 {
   const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return u.format0.get_value (glyph_id, num_glyphs);
     case 2: hb_barrier (); return u.format2.get_value (glyph_id);
     case 4: hb_barrier (); return u.format4.get_value (glyph_id);
@@ -704,7 +704,7 @@ struct Lookup
 
   const typename T::type get_value_or_null (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
       /* Format 10 cannot return a pointer. */
       case 10: hb_barrier (); return u.format10.get_value_or_null (glyph_id);
       default:
@@ -716,7 +716,7 @@ struct Lookup
   template <typename set_t>
   void collect_glyphs (set_t &glyphs, unsigned int num_glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); u.format0.collect_glyphs (glyphs, num_glyphs); return;
     case 2: hb_barrier (); u.format2.collect_glyphs (glyphs); return;
     case 4: hb_barrier (); u.format4.collect_glyphs (glyphs); return;
@@ -729,7 +729,7 @@ struct Lookup
   template <typename set_t, typename filter_t>
   void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); u.format0.collect_glyphs_filtered (glyphs, num_glyphs, filter); return;
     case 2: hb_barrier (); u.format2.collect_glyphs_filtered (glyphs, filter); return;
     case 4: hb_barrier (); u.format4.collect_glyphs_filtered (glyphs, filter); return;
@@ -751,9 +751,9 @@ struct Lookup
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
@@ -766,9 +766,9 @@ struct Lookup
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c, base));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c, base));
     case 4: hb_barrier (); return_trace (u.format4.sanitize (c, base));
@@ -781,7 +781,7 @@ struct Lookup
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   LookupFormat0<T>	format0;
   LookupFormat2<T>	format2;
   LookupFormat4<T>	format4;
@@ -790,7 +790,7 @@ struct Lookup
   LookupFormat10<T>	format10;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2);
 
@@ -1216,24 +1216,11 @@ struct StateTableDriver
     int state = StateTableT::STATE_START_OF_TEXT;
     // If there's only one range, we already checked the flag.
     auto *last_range = ac->range_flags && (ac->range_flags->length > 1) ? &(*ac->range_flags)[0] : nullptr;
-    const bool start_state_safe_to_break_eot =
-      !c->table->is_actionable (machine.get_entry (StateTableT::STATE_START_OF_TEXT, CLASS_END_OF_TEXT));
     for (buffer->idx = 0; buffer->successful;)
     {
-      unsigned int klass = likely (buffer->idx < buffer->len) ?
-			   machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
-			   (unsigned) CLASS_END_OF_TEXT;
-    resume:
-      DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
-      const EntryT &entry = machine.get_entry (state, klass);
-      const int next_state = machine.new_state (entry.newState);
-
-      bool is_not_epsilon_transition = !(entry.flags & Flags::DontAdvance);
-      bool is_not_actionable = !c->table->is_actionable (entry);
-
-      if (unlikely (last_range))
+      /* This block is copied in NoncontextualSubtable::apply. Keep in sync. */
+      if (last_range)
       {
-	/* This block is copied in NoncontextualSubtable::apply. Keep in sync. */
 	auto *range = last_range;
 	if (buffer->idx < buffer->len)
 	{
@@ -1248,7 +1235,7 @@ struct StateTableDriver
 	}
 	if (!(range->flags & ac->subtable_flags))
 	{
-	  if (buffer->idx == buffer->len)
+	  if (buffer->idx == buffer->len || unlikely (!buffer->successful))
 	    break;
 
 	  state = StateTableT::STATE_START_OF_TEXT;
@@ -1256,42 +1243,13 @@ struct StateTableDriver
 	  continue;
 	}
       }
-      else
-      {
-	// Fast path for when transitioning from start-state to start-state with
-	// no action and advancing. Do so as long as the class remains the same.
-	// This is common with runs of non-actionable glyphs.
 
-	bool is_null_transition = state == StateTableT::STATE_START_OF_TEXT &&
-				  next_state == StateTableT::STATE_START_OF_TEXT &&
-				  start_state_safe_to_break_eot &&
-				  is_not_actionable &&
-				  is_not_epsilon_transition &&
-				  !last_range;
-
-	if (is_null_transition)
-	{
-	  unsigned old_klass = klass;
-	  do
-	  {
-	    c->transition (buffer, this, entry);
-
-	    if (buffer->idx == buffer->len || !buffer->successful)
-	      break;
-
-	    (void) buffer->next_glyph ();
-
-	    klass = likely (buffer->idx < buffer->len) ?
-		     machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
-		     (unsigned) CLASS_END_OF_TEXT;
-	  } while (klass == old_klass);
-
-	  if (buffer->idx == buffer->len || !buffer->successful)
-	    break;
-
-	  goto resume;
-	}
-      }
+      unsigned int klass = likely (buffer->idx < buffer->len) ?
+			   machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
+			   (unsigned) CLASS_END_OF_TEXT;
+      DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
+      const EntryT &entry = machine.get_entry (state, klass);
+      const int next_state = machine.new_state (entry.newState);
 
       /* Conditions under which it's guaranteed safe-to-break before current glyph:
        *
@@ -1358,10 +1316,10 @@ struct StateTableDriver
       state = next_state;
       DEBUG_MSG (APPLY, nullptr, "s%d", state);
 
-      if (buffer->idx == buffer->len)
+      if (buffer->idx == buffer->len || unlikely (!buffer->successful))
 	break;
 
-      if (is_not_epsilon_transition || buffer->max_ops-- <= 0)
+      if (!(entry.flags & Flags::DontAdvance) || buffer->max_ops-- <= 0)
 	(void) buffer->next_glyph ();
     }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
index c25833cf..7310f861 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
@@ -487,7 +487,7 @@ struct LigatureSubtable
       if (entry.flags & LigatureEntryT::SetComponent)
       {
 	/* Never mark same index twice, in case DontAdvance was used... */
-	if (unlikely (match_length && match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] == buffer->out_len))
+	if (match_length && match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] == buffer->out_len)
 	  match_length--;
 
 	match_positions[match_length++ % ARRAY_LENGTH (match_positions)] = buffer->out_len;
@@ -640,7 +640,7 @@ struct NoncontextualSubtable
     for (unsigned int i = 0; i < count; i++)
     {
       /* This block copied from StateTableDriver::drive. Keep in sync. */
-      if (unlikely (last_range))
+      if (last_range)
       {
 	auto *range = last_range;
 	{
diff --git a/engine/thirdparty/harfbuzz/src/hb-algs.hh b/engine/thirdparty/harfbuzz/src/hb-algs.hh
index b28a587d..91d98b9a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-algs.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-algs.hh
@@ -89,16 +89,7 @@ static inline constexpr uint32_t hb_uint32_swap (uint32_t v)
 { return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16); }
 
 template <typename Type>
-struct __attribute__((packed)) hb_packed_t
-{
-  hb_packed_t () = default;
-  constexpr hb_packed_t (Type V) : v (V) {}
-  operator Type () const { return v; }
-  hb_packed_t & operator = (Type V) { v = V; return *this; }
-
-  private:
-  Type v;
-};
+struct __attribute__((packed)) hb_packed_t { Type v; };
 
 #ifndef HB_FAST_NUM_ACCESS
 
@@ -107,8 +98,7 @@ struct __attribute__((packed)) hb_packed_t
     (__BYTE_ORDER == __BIG_ENDIAN || \
      (__BYTE_ORDER == __LITTLE_ENDIAN && \
       hb_has_builtin(__builtin_bswap16) && \
-      hb_has_builtin(__builtin_bswap32) && \
-      hb_has_builtin(__builtin_bswap64)))
+      hb_has_builtin(__builtin_bswap32)))
 #define HB_FAST_NUM_ACCESS 1
 #else
 #define HB_FAST_NUM_ACCESS 0
@@ -143,9 +133,9 @@ struct HBInt<BE, Type, 2>
 #if HB_FAST_NUM_ACCESS
   {
     if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
-      *((hb_packed_t<uint16_t> *) v) = V;
+      ((hb_packed_t<uint16_t> *) v)->v = V;
     else
-      *((hb_packed_t<uint16_t> *) v) = __builtin_bswap16 (V);
+      ((hb_packed_t<uint16_t> *) v)->v = __builtin_bswap16 (V);
   }
 #else
     : v {BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V      ) & 0xFF),
@@ -156,9 +146,9 @@ struct HBInt<BE, Type, 2>
   {
 #if HB_FAST_NUM_ACCESS
     return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
-      (uint16_t) *((const hb_packed_t<uint16_t> *) v)
+      ((const hb_packed_t<uint16_t> *) v)->v
     :
-      __builtin_bswap16 ((uint16_t) *((const hb_packed_t<uint16_t> *) v))
+      __builtin_bswap16 (((const hb_packed_t<uint16_t> *) v)->v)
     ;
 #else
     return (BE ? (v[0] <<  8) : (v[0]      ))
@@ -195,9 +185,9 @@ struct HBInt<BE, Type, 4>
 #if HB_FAST_NUM_ACCESS
   {
     if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
-      *((hb_packed_t<uint32_t> *) v) = V;
+      ((hb_packed_t<uint32_t> *) v)->v = V;
     else
-      *((hb_packed_t<uint32_t> *) v) = __builtin_bswap32 (V);
+      ((hb_packed_t<uint32_t> *) v)->v = __builtin_bswap32 (V);
   }
 #else
     : v {BE ? uint8_t ((V >> 24) & 0xFF) : uint8_t ((V      ) & 0xFF),
@@ -209,9 +199,9 @@ struct HBInt<BE, Type, 4>
   constexpr operator Type () const {
 #if HB_FAST_NUM_ACCESS
     return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
-      (uint32_t) *((const hb_packed_t<uint32_t> *) v)
+      ((const hb_packed_t<uint32_t> *) v)->v
     :
-      __builtin_bswap32 ((uint32_t) *((const hb_packed_t<uint32_t> *) v))
+      __builtin_bswap32 (((const hb_packed_t<uint32_t> *) v)->v)
     ;
 #else
     return (BE ? (v[0] << 24) : (v[0]      ))
@@ -232,14 +222,6 @@ struct HBInt<BE, Type, 8>
   HBInt () = default;
 
   HBInt (Type V)
-#if HB_FAST_NUM_ACCESS
-  {
-    if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
-      *((hb_packed_t<uint64_t> *) v) = V;
-    else
-      *((hb_packed_t<uint64_t> *) v) = __builtin_bswap64 (V);
-  }
-#else
     : v {BE ? uint8_t ((V >> 56) & 0xFF) : uint8_t ((V      ) & 0xFF),
 	 BE ? uint8_t ((V >> 48) & 0xFF) : uint8_t ((V >>  8) & 0xFF),
 	 BE ? uint8_t ((V >> 40) & 0xFF) : uint8_t ((V >> 16) & 0xFF),
@@ -248,16 +230,8 @@ struct HBInt<BE, Type, 8>
 	 BE ? uint8_t ((V >> 16) & 0xFF) : uint8_t ((V >> 40) & 0xFF),
 	 BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V >> 48) & 0xFF),
 	 BE ? uint8_t ((V      ) & 0xFF) : uint8_t ((V >> 56) & 0xFF)} {}
-#endif
 
   constexpr operator Type () const {
-#if HB_FAST_NUM_ACCESS
-    return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
-      (uint64_t) *((const hb_packed_t<uint64_t> *) v)
-    :
-      __builtin_bswap64 ((uint64_t) *((const hb_packed_t<uint64_t> *) v))
-    ;
-#else
     return (BE ? (uint64_t (v[0]) << 56) : (uint64_t (v[0])      ))
 	 + (BE ? (uint64_t (v[1]) << 48) : (uint64_t (v[1]) <<  8))
 	 + (BE ? (uint64_t (v[2]) << 40) : (uint64_t (v[2]) << 16))
@@ -266,7 +240,6 @@ struct HBInt<BE, Type, 8>
 	 + (BE ? (uint64_t (v[5]) << 16) : (uint64_t (v[5]) << 40))
 	 + (BE ? (uint64_t (v[6]) <<  8) : (uint64_t (v[6]) << 48))
 	 + (BE ? (uint64_t (v[7])      ) : (uint64_t (v[7]) << 56));
-#endif
   }
   private: uint8_t v[8];
 };
@@ -285,12 +258,12 @@ struct HBFloat
   {
 #if HB_FAST_NUM_ACCESS
     {
-	      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
-	      {
-	        *((hb_packed_t<Type> *) v) = V;
-	        return;
-	      }
-	    }
+      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+      {
+        ((hb_packed_t<Type> *) v)->v = V;
+        return;
+      }
+    }
 #endif
 
     union {
@@ -298,7 +271,7 @@ struct HBFloat
       hb_packed_t<IntType> i;
     } u = {{V}};
 
-    const HBInt<BE, IntType> I = (IntType) u.i;
+    const HBInt<BE, IntType> I = u.i.v;
     for (unsigned i = 0; i < Bytes; i++)
       v[i] = I.v[i];
   }
@@ -306,10 +279,10 @@ struct HBFloat
   /* c++14 constexpr */ operator Type () const
   {
 #if HB_FAST_NUM_ACCESS
-	    {
-	      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
-		return (Type) *((const hb_packed_t<Type> *) v);
-	    }
+    {
+      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+	return ((const hb_packed_t<Type> *) v)->v;
+    }
 #endif
 
     HBInt<BE, IntType> I;
@@ -321,7 +294,7 @@ struct HBFloat
       hb_packed_t<Type> f;
     } u = {{I}};
 
-    return (Type) u.f;
+    return u.f.v;
   }
   private: uint8_t v[Bytes];
 };
@@ -1200,21 +1173,6 @@ hb_unsigned_mul_overflows (unsigned int count, unsigned int size, unsigned *resu
   return (size > 0) && (count >= ((unsigned int) -1) / size);
 }
 
-static inline bool
-hb_unsigned_add_overflows (unsigned int a, unsigned int b, unsigned *result = nullptr)
-{
-#if hb_has_builtin(__builtin_add_overflow)
-  unsigned stack_result;
-  if (!result)
-    result = &stack_result;
-  return __builtin_add_overflow (a, b, result);
-#endif
-
-  if (result)
-    *result = a + b;
-  return b > (unsigned int) -1 - a;
-}
-
 
 /*
  * Sort and search.
@@ -1688,13 +1646,6 @@ double solve_itp (func_t f,
 		  double min_y, double max_y,
 		  double &ya, double &yb, double &y)
 {
-  // Guard against degenerate interval
-  if (b - a <= 0.0)
-  {
-    y = ya;
-    return a;
-  }
-
   unsigned n1_2 = (unsigned) (hb_max (ceil (log2 ((b - a) / epsilon)) - 1.0, 0.0));
   const unsigned n0 = 1; // Hardwired
   const double k1 = 0.2 / (b - a); // Hardwired.
@@ -1705,8 +1656,7 @@ double solve_itp (func_t f,
   {
     double x1_2 = 0.5 * (a + b);
     double r = scaled_epsilon - 0.5 * (b - a);
-    // Guard against yb == ya to prevent division by zero
-    double xf = (yb != ya) ? (yb * a - ya * b) / (yb - ya) : x1_2;
+    double xf = (yb * a - ya * b) / (yb - ya);
     double sigma = x1_2 - xf;
     double b_a = b - a;
     // This has k2 = 2 hardwired for efficiency.
diff --git a/engine/thirdparty/harfbuzz/src/hb-array.hh b/engine/thirdparty/harfbuzz/src/hb-array.hh
index b0fbe1b6..6e458ffd 100644
--- a/engine/thirdparty/harfbuzz/src/hb-array.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-array.hh
@@ -291,13 +291,6 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
 	&& (unsigned int) (arrayZ + length - (const char *) p) >= size;
   }
 
-  template <unsigned P = sizeof (Type),
-	    hb_enable_if (P == 1)>
-  bool check_end (const void *p) const
-  {
-    return (uintptr_t) (((const char *) p) - arrayZ) <= length;
-  }
-
   /* Only call if you allocated the underlying array using hb_malloc() or similar. */
   void fini ()
   { hb_free ((void *) arrayZ); arrayZ = nullptr; length = 0; }
diff --git a/engine/thirdparty/harfbuzz/src/hb-atomic.hh b/engine/thirdparty/harfbuzz/src/hb-atomic.hh
index 5ea99e39..08e8a70b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-atomic.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-atomic.hh
@@ -169,6 +169,11 @@ struct hb_atomic_t
 
   int operator++ (int) { return inc (); }
   int operator-- (int) { return dec (); }
+  long operator|= (long v_)
+  {
+    set_relaxed (get_relaxed () | v_);
+    return *this;
+  }
 
   friend void swap (hb_atomic_t &a, hb_atomic_t &b) noexcept
   {
@@ -193,9 +198,6 @@ struct hb_atomic_t<T *>
   T *get_acquire () const { return v.load (std::memory_order_acquire); }
   bool cmpexch (T *old, T *new_) { return v.compare_exchange_weak (old, new_, std::memory_order_acq_rel, std::memory_order_relaxed); }
 
-  hb_atomic_t &operator= (const hb_atomic_t& o) { set_relaxed (o.get_relaxed ()); return *this; }
-  hb_atomic_t &operator= (hb_atomic_t&& o){ set_relaxed (o.get_relaxed ()); o.set_relaxed ({}); return *this; }
-
   operator bool () const { return get_acquire () != nullptr; }
   T *operator->() const { return get_acquire (); }
   template <typename C>
@@ -234,6 +236,7 @@ struct hb_atomic_t
 
   int operator ++ (int) { return inc (); }
   int operator -- (int) { return dec (); }
+  long operator |= (long v_) { set_relaxed (get_relaxed () | v_); return *this; }
 
   T v = 0;
 };
diff --git a/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh b/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
index 48b2e218..c2443168 100644
--- a/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
@@ -173,14 +173,7 @@ struct hb_bit_set_invertible_t
   bool is_subset (const hb_bit_set_invertible_t &larger_set) const
   {
     if (unlikely (inverted != larger_set.inverted))
-    {
-      if (inverted)
-	return hb_all (iter (), larger_set.s);
-      else
-        // larger set is inverted so larger_set.s is the set of things that are not present
-        // in larger_set, therefore if s has any of those it can't be a subset.
-	return !s.intersects (larger_set.s);
-    }
+      return hb_all (hb_iter (s) | hb_map (larger_set.s));
     else
       return unlikely (inverted) ? larger_set.s.is_subset (s) : s.is_subset (larger_set.s);
   }
diff --git a/engine/thirdparty/harfbuzz/src/hb-bit-set.hh b/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
index 05725048..db21477d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
@@ -438,31 +438,23 @@ struct hb_bit_set_t
       return false;
 
     uint32_t spi = 0;
-    uint32_t lpi = 0;
-    while (spi < page_map.length && lpi < larger_set.page_map.length)
+    for (uint32_t lpi = 0; spi < page_map.length && lpi < larger_set.page_map.length; lpi++)
     {
       uint32_t spm = page_map.arrayZ[spi].major;
       uint32_t lpm = larger_set.page_map.arrayZ[lpi].major;
       auto sp = page_at (spi);
 
-      if (spm < lpm) {
-        if (!sp.is_empty ())
-          return false;
-        spi++;
-        continue;
-      }
+      if (spm < lpm && !sp.is_empty ())
+        return false;
 
-      if (lpm < spm) {
-        lpi++;
+      if (lpm < spm)
         continue;
-      }
 
       auto lp = larger_set.page_at (lpi);
       if (!sp.is_subset (lp))
         return false;
 
       spi++;
-      lpi++;
     }
 
     while (spi < page_map.length)
diff --git a/engine/thirdparty/harfbuzz/src/hb-blob.hh b/engine/thirdparty/harfbuzz/src/hb-blob.hh
index 7d28c161..b1b3b94d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-blob.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-blob.hh
@@ -50,20 +50,6 @@ struct hb_blob_t
     }
   }
 
-  void replace_buffer (const char       *new_data,
-		       unsigned          new_length,
-		       hb_memory_mode_t  new_mode,
-		       void             *new_user_data,
-		       hb_destroy_func_t new_destroy)
-  {
-    destroy_user_data ();
-    data = new_data;
-    length = new_length;
-    mode = new_mode;
-    user_data = new_user_data;
-    destroy = new_destroy;
-  }
-
   HB_INTERNAL bool try_make_writable ();
   HB_INTERNAL bool try_make_writable_inplace ();
   HB_INTERNAL bool try_make_writable_inplace_unix ();
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
index 75a1a112..e57b6163 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
@@ -32,7 +32,7 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-json.hh"
+#line 33 "hb-buffer-deserialize-json.hh"
 static const unsigned char _deserialize_json_trans_keys[] = {
 	0u, 0u, 9u, 34u, 97u, 121u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 
 	9u, 125u, 9u, 125u, 9u, 93u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 
@@ -597,12 +597,12 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
   
-#line 601 "hb-buffer-deserialize-json.hh"
+#line 594 "hb-buffer-deserialize-json.hh"
 	{
 	cs = deserialize_json_start;
 	}
 
-#line 606 "hb-buffer-deserialize-json.hh"
+#line 597 "hb-buffer-deserialize-json.hh"
 	{
 	int _slen;
 	int _trans;
@@ -712,7 +712,7 @@ _resume:
 #line 56 "hb-buffer-deserialize-json.rl"
 	{ if (unlikely (!buffer->ensure_unicode ())) return false; }
 	break;
-#line 716 "hb-buffer-deserialize-json.hh"
+#line 689 "hb-buffer-deserialize-json.hh"
 	}
 
 _again:
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh
index 8c0353b3..8fc54b36 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh
@@ -32,7 +32,7 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-text-glyphs.hh"
+#line 33 "hb-buffer-deserialize-text-glyphs.hh"
 static const unsigned char _deserialize_text_glyphs_trans_keys[] = {
 	0u, 0u, 35u, 124u, 48u, 57u, 60u, 124u, 45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u, 
 	48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 62u, 62u, 
@@ -389,12 +389,12 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
   
-#line 393 "hb-buffer-deserialize-text-glyphs.hh"
+#line 386 "hb-buffer-deserialize-text-glyphs.hh"
 	{
 	cs = deserialize_text_glyphs_start;
 	}
 
-#line 398 "hb-buffer-deserialize-text-glyphs.hh"
+#line 389 "hb-buffer-deserialize-text-glyphs.hh"
 	{
 	int _slen;
 	int _trans;
@@ -552,7 +552,7 @@ _resume:
 	  return false;
 }
 	break;
-#line 556 "hb-buffer-deserialize-text-glyphs.hh"
+#line 523 "hb-buffer-deserialize-text-glyphs.hh"
 	}
 
 _again:
@@ -573,7 +573,7 @@ _again:
 	*end_ptr = p;
 }
 	break;
-#line 577 "hb-buffer-deserialize-text-glyphs.hh"
+#line 542 "hb-buffer-deserialize-text-glyphs.hh"
 	}
 	}
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh
index 26ec0b42..0bb00c4c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh
@@ -32,7 +32,7 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-text-unicode.hh"
+#line 33 "hb-buffer-deserialize-text-unicode.hh"
 static const unsigned char _deserialize_text_unicode_trans_keys[] = {
 	0u, 0u, 43u, 102u, 48u, 102u, 48u, 124u, 48u, 57u, 62u, 124u, 48u, 124u, 60u, 117u, 
 	85u, 117u, 85u, 117u, 0
@@ -150,12 +150,12 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
   hb_glyph_info_t info = {0};
   const hb_glyph_position_t pos = {0};
   
-#line 154 "hb-buffer-deserialize-text-unicode.hh"
+#line 147 "hb-buffer-deserialize-text-unicode.hh"
 	{
 	cs = deserialize_text_unicode_start;
 	}
 
-#line 159 "hb-buffer-deserialize-text-unicode.hh"
+#line 150 "hb-buffer-deserialize-text-unicode.hh"
 	{
 	int _slen;
 	int _trans;
@@ -215,7 +215,7 @@ _resume:
 	hb_memset (&info, 0, sizeof (info));
 }
 	break;
-#line 219 "hb-buffer-deserialize-text-unicode.hh"
+#line 203 "hb-buffer-deserialize-text-unicode.hh"
 	}
 
 _again:
@@ -238,7 +238,7 @@ _again:
 	*end_ptr = p;
 }
 	break;
-#line 242 "hb-buffer-deserialize-text-unicode.hh"
+#line 224 "hb-buffer-deserialize-text-unicode.hh"
 	}
 	}
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer-serialize.cc b/engine/thirdparty/harfbuzz/src/hb-buffer-serialize.cc
index 923524d7..09f0c30e 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer-serialize.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer-serialize.cc
@@ -114,17 +114,6 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
 
   *buf_consumed = 0;
   hb_position_t x = 0, y = 0;
-
-  /* Calculate the advance of the previous glyphs */
-  if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
-  {
-    for (unsigned int i = 0; i < start; i++)
-    {
-      x += pos[i].x_advance;
-      y += pos[i].y_advance;
-    }
-  }
-
   for (unsigned int i = start; i < end; i++)
   {
     char b[1024];
@@ -162,7 +151,7 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
       p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"cl\":%u", info[i].cluster));
     }
 
-    if (pos && !(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
+    if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
     {
       p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d",
 		   x+pos[i].x_offset, y+pos[i].y_offset));
@@ -283,17 +272,6 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
 
   *buf_consumed = 0;
   hb_position_t x = 0, y = 0;
-
-  /* Calculate the advance of the previous glyphs */
-  if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES))
-  {
-    for (unsigned int i = 0; i < start; i++)
-    {
-      x += pos[i].x_advance;
-      y += pos[i].y_advance;
-    }
-  }
-
   for (unsigned int i = start; i < end; i++)
   {
     char b[1024];
@@ -319,7 +297,7 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
       p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "=%u", info[i].cluster));
     }
 
-    if (pos && !(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
+    if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS))
     {
       if (x+pos[i].x_offset || y+pos[i].y_offset)
         p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", x+pos[i].x_offset, y+pos[i].y_offset));
@@ -439,9 +417,9 @@ _hb_buffer_serialize_unicode_text (hb_buffer_t *buffer,
  * A human-readable, plain text format.
  * The serialized glyphs will look something like:
  *
- * |[<!-- language="plain" -->
+ * ```
  * [uni0651=0@518,0+0|uni0628=0+1897]
- * ]|
+ * ```
  *
  * - The serialized glyphs are delimited with `[` and `]`.
  * - Glyphs are separated with `|`
@@ -457,10 +435,10 @@ _hb_buffer_serialize_unicode_text (hb_buffer_t *buffer,
  * A machine-readable, structured format.
  * The serialized glyphs will look something like:
  *
- * |[<!-- language="plain" -->
+ * ```
  * [{"g":"uni0651","cl":0,"dx":518,"dy":0,"ax":0,"ay":0},
- *  {"g":"uni0628","cl":0,"dx":0,"dy":0,"ax":1897,"ay":0}]
- * ]|
+ * {"g":"uni0628","cl":0,"dx":0,"dy":0,"ax":1897,"ay":0}]
+ * ```
  *
  * Each glyph is a JSON object, with the following properties:
  * - `g`: the glyph name or glyph index if
@@ -552,9 +530,9 @@ hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
  * A human-readable, plain text format.
  * The serialized codepoints will look something like:
  *
- * |[<!-- language="plain" -->
+ * ```
  *  <U+0651=0|U+0628=1>
- * ]|
+ * ```
  *
  * - Glyphs are separated with `|`
  * - Unicode codepoints are expressed as zero-padded four (or more)
@@ -572,9 +550,9 @@ hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
  *
  * For example:
  *
- * |[<!-- language="plain" -->
+ * ```
  * [{u:1617,cl:0},{u:1576,cl:1}]
- * ]|
+ * ```
  *
  * Return value:
  * The number of serialized items.
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer.cc b/engine/thirdparty/harfbuzz/src/hb-buffer.cc
index 3da6577b..00c004e8 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer.cc
@@ -547,6 +547,12 @@ void
 hb_buffer_t::merge_clusters_impl (unsigned int start,
 				  unsigned int end)
 {
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
+  {
+    unsafe_to_break (start, end);
+    return;
+  }
+
   max_ops -= end - start;
   if (unlikely (max_ops < 0))
     successful = false;
@@ -575,9 +581,15 @@ hb_buffer_t::merge_clusters_impl (unsigned int start,
     set_cluster (info[i], cluster);
 }
 void
-hb_buffer_t::merge_out_clusters_impl (unsigned int start,
-				      unsigned int end)
+hb_buffer_t::merge_out_clusters (unsigned int start,
+				 unsigned int end)
 {
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
+    return;
+
+  if (unlikely (end - start < 2))
+    return;
+
   max_ops -= end - start;
   if (unlikely (max_ops < 0))
     successful = false;
@@ -960,9 +972,6 @@ void
 hb_buffer_set_content_type (hb_buffer_t              *buffer,
 			    hb_buffer_content_type_t  content_type)
 {
-  if (unlikely (hb_object_is_immutable (buffer)))
-    return;
-
   buffer->content_type = content_type;
 }
 
@@ -2281,22 +2290,6 @@ hb_buffer_diff (hb_buffer_t *buffer,
  * Debugging.
  */
 
-void
-hb_buffer_t::changed ()
-{
-#ifdef HB_NO_BUFFER_MESSAGE
-  return;
-#else
-  if (!message_depth)
-    return;
-
-  if (changed_func)
-    changed_func (this, changed_data);
-  else
-    update_digest ();
-#endif
-}
-
 #ifndef HB_NO_BUFFER_MESSAGE
 /**
  * hb_buffer_set_message_func:
@@ -2314,8 +2307,7 @@ hb_buffer_set_message_func (hb_buffer_t *buffer,
 			    hb_buffer_message_func_t func,
 			    void *user_data, hb_destroy_func_t destroy)
 {
-  if (unlikely (hb_object_is_immutable (buffer)) ||
-      unlikely (buffer->message_depth))
+  if (unlikely (hb_object_is_immutable (buffer)))
   {
     if (destroy)
       destroy (user_data);
@@ -2335,23 +2327,6 @@ hb_buffer_set_message_func (hb_buffer_t *buffer,
     buffer->message_destroy = nullptr;
   }
 }
-/**
- * hb_buffer_changed:
- * @buffer: An #hb_buffer_t
- *
- * Called by a message callback after modifying buffer glyph indices,
- * to update internal caches.
- *
- * If not called from inside a message callback, does nothing.
- *
- * Since: 13.0.0
- **/
-void
-hb_buffer_changed (hb_buffer_t *buffer)
-{
-  buffer->changed ();
-}
-
 bool
 hb_buffer_t::message_impl (hb_font_t *font, const char *fmt, va_list ap)
 {
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer.h b/engine/thirdparty/harfbuzz/src/hb-buffer.h
index f534f9a3..705b767b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer.h
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer.h
@@ -495,7 +495,7 @@ typedef enum {
 		  (1u << HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES))))
 
 /**
- * HB_BUFFER_CLUSTER_LEVEL_IS_CHARACTERS:
+ * HB_BUFFER_CLUSTER_LEVEL_IS_CHARACTERS
  * @level: #hb_buffer_cluster_level_t to test
  *
  * Tests whether a cluster level does not group cluster values by graphemes.
@@ -505,7 +505,7 @@ typedef enum {
  */
 #define HB_BUFFER_CLUSTER_LEVEL_IS_CHARACTERS(level) \
 	((bool) ((1u << (unsigned) (level)) & \
-		 ((1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS) | \
+		 ((1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARCATERS) | \
 		  (1u << HB_BUFFER_CLUSTER_LEVEL_CHARACTERS))))
 
 HB_EXTERN void
@@ -672,12 +672,7 @@ hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
  * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS: serialize glyph extents.
  * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS: serialize glyph flags. Since: 1.5.0
  * @HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES: do not serialize glyph advances,
- *  glyph offsets will reflect absolute glyph positions. Since: 1.8.0.
- *  Note: when this flag is used with a partial range of the buffer (i.e.
- *  @start is not 0), calculating the absolute positions has a cost
- *  proportional to @start. If the buffer is serialized in many small
- *  chunks, this can lead to quadratic behavior. It is recommended to
- *  use a larger @buf_size to minimize this cost.
+ *  glyph offsets will reflect absolute glyph positions. Since: 1.8.0
  * @HB_BUFFER_SERIALIZE_FLAG_DEFINED: All currently defined flags. Since: 4.4.0
  *
  * Flags that control what glyph information are serialized in hb_buffer_serialize_glyphs().
@@ -870,9 +865,6 @@ hb_buffer_set_message_func (hb_buffer_t *buffer,
 			    hb_buffer_message_func_t func,
 			    void *user_data, hb_destroy_func_t destroy);
 
-HB_EXTERN void
-hb_buffer_changed (hb_buffer_t *buffer);
-
 
 HB_END_DECLS
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer.hh b/engine/thirdparty/harfbuzz/src/hb-buffer.hh
index 770beeee..52fac524 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer.hh
@@ -130,13 +130,9 @@ struct hb_buffer_t
    */
 
 #ifndef HB_NO_BUFFER_MESSAGE
-  typedef void (*changed_func_t) (hb_buffer_t *buffer, void *user_data);
-
   hb_buffer_message_func_t message_func;
   void *message_data;
   hb_destroy_func_t message_destroy;
-  changed_func_t changed_func;
-  void *changed_data;
   unsigned message_depth; /* How deeply are we inside a message callback? */
 #else
   static constexpr unsigned message_depth = 0u;
@@ -402,42 +398,10 @@ struct hb_buffer_t
   {
     if (end - start < 2)
       return;
-    if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
-    {
-      unsafe_to_break (start, end);
-      return;
-    }
-    merge_clusters_impl (start, end);
-  }
-  void merge_grapheme_clusters (unsigned int start, unsigned int end)
-  {
-    if (end - start < 2)
-      return;
-    if (!HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES (cluster_level))
-    {
-      unsafe_to_break (start, end);
-      return;
-    }
     merge_clusters_impl (start, end);
   }
   HB_INTERNAL void merge_clusters_impl (unsigned int start, unsigned int end);
-  void merge_out_clusters (unsigned int start, unsigned int end)
-  {
-    if (end - start < 2)
-      return;
-    if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
-      return;
-    merge_out_clusters_impl (start, end);
-  }
-  void merge_out_grapheme_clusters (unsigned int start, unsigned int end)
-  {
-    if (end - start < 2)
-      return;
-    if (!HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES (cluster_level))
-      return;
-    merge_out_clusters_impl (start, end);
-  }
-  HB_INTERNAL void merge_out_clusters_impl (unsigned int start, unsigned int end);
+  HB_INTERNAL void merge_out_clusters (unsigned int start, unsigned int end);
   /* Merge clusters for deleting current glyph, and skip it. */
   HB_INTERNAL void delete_glyph ();
   HB_INTERNAL void delete_glyphs_inplace (bool (*filter) (const hb_glyph_info_t *info));
@@ -641,7 +605,6 @@ struct hb_buffer_t
 #endif
   }
   HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
-  HB_INTERNAL void changed ();
 
   static void
   set_cluster (hb_glyph_info_t &inf, unsigned int cluster, unsigned int mask = 0)
diff --git a/engine/thirdparty/harfbuzz/src/hb-cache.hh b/engine/thirdparty/harfbuzz/src/hb-cache.hh
index 7600f134..cb89e1f4 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cache.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-cache.hh
@@ -64,16 +64,12 @@ template <unsigned int key_bits=16,
 struct hb_cache_t
 {
   using item_t = typename std::conditional<thread_safe,
-					   typename std::conditional<key_bits + value_bits - cache_bits <= 8,
-								     hb_atomic_t<unsigned char>,
-								     typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-											       hb_atomic_t<unsigned short>,
-											       hb_atomic_t<unsigned int>>::type>::type,
-					   typename std::conditional<key_bits + value_bits - cache_bits <= 8,
-								     unsigned char,
-								     typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-											       unsigned short,
-											       unsigned int>::type>::type
+					   typename std::conditional<key_bits + value_bits - cache_bits <= 16,
+								     hb_atomic_t<unsigned short>,
+								     hb_atomic_t<unsigned int>>::type,
+					   typename std::conditional<key_bits + value_bits - cache_bits <= 16,
+								     unsigned short,
+								     unsigned int>::type
 					  >::type;
 
   static_assert ((key_bits >= cache_bits), "");
diff --git a/engine/thirdparty/harfbuzz/src/hb-cairo.cc b/engine/thirdparty/harfbuzz/src/hb-cairo.cc
index 23ebd6bf..76aebaab 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cairo.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-cairo.cc
@@ -602,10 +602,10 @@ hb_cairo_render_glyph (cairo_scaled_font_t  *scaled_font,
 
   hb_position_t x_scale, y_scale;
   hb_font_get_scale (font, &x_scale, &y_scale);
-
   cairo_scale (cr,
 	       +1. / (x_scale ? x_scale : 1),
 	       -1. / (y_scale ? y_scale : 1));
+
   if (hb_font_draw_glyph_or_fail (font, glyph, hb_cairo_draw_get_funcs (), cr))
     cairo_fill (cr);
 
@@ -882,6 +882,7 @@ hb_cairo_font_face_get_scale_factor (cairo_font_face_t *font_face)
 					&hb_cairo_scale_factor_user_data_key);
 }
 
+
 /**
  * hb_cairo_glyphs_from_buffer:
  * @buffer: a #hb_buffer_t containing glyphs
diff --git a/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh b/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
index df90fb99..b0491385 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
@@ -344,25 +344,25 @@ struct cff_stack_t
 {
   ELEM& operator [] (unsigned int i)
   {
-    if (unlikely (i >= length))
+    if (unlikely (i >= count))
     {
       set_error ();
       return Crap (ELEM);
     }
-    return arrayZ[i];
+    return elements[i];
   }
 
   void push (const ELEM &v)
   {
-    if (likely (length < LIMIT))
-      arrayZ[length++] = v;
+    if (likely (count < LIMIT))
+      elements[count++] = v;
     else
       set_error ();
   }
   ELEM &push ()
   {
-    if (likely (length < LIMIT))
-      return arrayZ[length++];
+    if (likely (count < LIMIT))
+      return elements[count++];
     else
     {
       set_error ();
@@ -372,8 +372,8 @@ struct cff_stack_t
 
   ELEM& pop ()
   {
-    if (likely (length > 0))
-      return arrayZ[--length];
+    if (likely (count > 0))
+      return elements[--count];
     else
     {
       set_error ();
@@ -382,44 +382,45 @@ struct cff_stack_t
   }
   void pop (unsigned int n)
   {
-    if (likely (length >= n))
-      length -= n;
+    if (likely (count >= n))
+      count -= n;
     else
       set_error ();
   }
 
   const ELEM& peek ()
   {
-    if (unlikely (length == 0))
+    if (unlikely (count == 0))
     {
       set_error ();
       return Null (ELEM);
     }
-    return arrayZ[length - 1];
+    return elements[count - 1];
   }
 
   void unpop ()
   {
-    if (likely (length < LIMIT))
-      length++;
+    if (likely (count < LIMIT))
+      count++;
     else
       set_error ();
   }
 
-  void clear () { length = 0; }
+  void clear () { count = 0; }
 
   bool in_error () const { return (error); }
   void set_error ()      { error = true; }
 
-  unsigned int get_count () const { return length; }
-  bool is_empty () const          { return !length; }
+  unsigned int get_count () const { return count; }
+  bool is_empty () const          { return !count; }
 
   hb_array_t<const ELEM> sub_array (unsigned start, unsigned length) const
-  { return hb_array_t<const ELEM> (arrayZ).sub_array (start, length); }
+  { return hb_array_t<const ELEM> (elements).sub_array (start, length); }
 
+  private:
   bool error = false;
-  unsigned int length = 0;
-  ELEM arrayZ[LIMIT];
+  unsigned int count = 0;
+  ELEM elements[LIMIT];
 };
 
 /* argument stack */
diff --git a/engine/thirdparty/harfbuzz/src/hb-cff-specializer.hh b/engine/thirdparty/harfbuzz/src/hb-cff-specializer.hh
deleted file mode 100644
index 5b4dce5d..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-cff-specializer.hh
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * CFF CharString Specializer
- *
- * Optimizes CharString bytecode by using specialized operators
- * (hlineto, vlineto, hhcurveto, etc.) to save bytes and respects
- * CFF1 stack limit (48 values).
- *
- * Based on fontTools.cffLib.specializer
- */
-
-#ifndef HB_CFF_SPECIALIZER_HH
-#define HB_CFF_SPECIALIZER_HH
-
-#include "hb.hh"
-#include "hb-cff-interp-cs-common.hh"
-
-namespace CFF {
-
-/* CharString command representation - forward declared in hb-subset-cff-common.hh */
-
-/* Check if a value is effectively zero */
-static inline bool
-is_zero (const number_t &n)
-{
-  return n.to_int () == 0;
-}
-
-/* Generalize CharString commands to canonical form
- *
- * Converts all operators to their general forms and breaks down
- * multi-segment operators into single segments. This ensures we
- * start from a clean baseline before specialization.
- *
- * Based on fontTools.cffLib.specializer.generalizeCommands
- */
-static void
-generalize_commands (hb_vector_t<cs_command_t> &commands)
-{
-  hb_vector_t<cs_command_t> result;
-  result.alloc (commands.length * 2);  /* Estimate: might expand */
-
-  for (unsigned i = 0; i < commands.length; i++)
-  {
-    auto &cmd = commands[i];
-
-    switch (cmd.op)
-    {
-      case OpCode_hmoveto:
-      case OpCode_vmoveto:
-      {
-        /* Convert to rmoveto with explicit dx,dy */
-        cs_command_t gen (OpCode_rmoveto);
-        gen.args.alloc (2);
-
-        if (cmd.op == OpCode_hmoveto && cmd.args.length >= 1)
-        {
-          gen.args.push (cmd.args[0]);  /* dx */
-          number_t zero; zero.set_int (0);
-          gen.args.push (zero);          /* dy = 0 */
-        }
-        else if (cmd.op == OpCode_vmoveto && cmd.args.length >= 1)
-        {
-          number_t zero; zero.set_int (0);
-          gen.args.push (zero);          /* dx = 0 */
-          gen.args.push (cmd.args[0]);  /* dy */
-        }
-        result.push (gen);
-        break;
-      }
-
-      case OpCode_hlineto:
-      case OpCode_vlineto:
-      {
-        /* Convert h/v lineto to rlineto, breaking into single segments
-         * hlineto alternates: dx1 (→ dx1,0) dy1 (→ 0,dy1) dx2 (→ dx2,0) ...
-         * vlineto alternates: dy1 (→ 0,dy1) dx1 (→ dx1,0) dy2 (→ 0,dy2) ... */
-        bool is_h = (cmd.op == OpCode_hlineto);
-        number_t zero; zero.set_int (0);
-
-        for (unsigned j = 0; j < cmd.args.length; j++)
-        {
-          cs_command_t seg (OpCode_rlineto);
-          seg.args.alloc (2);
-
-          bool is_horizontal = is_h ? (j % 2 == 0) : (j % 2 == 1);
-          if (is_horizontal)
-          {
-            seg.args.push (cmd.args[j]);  /* dx */
-            seg.args.push (zero);          /* dy = 0 */
-          }
-          else
-          {
-            seg.args.push (zero);          /* dx = 0 */
-            seg.args.push (cmd.args[j]);  /* dy */
-          }
-          result.push (seg);
-        }
-        break;
-      }
-
-      case OpCode_rlineto:
-      {
-        /* Break into single segments (dx,dy pairs) */
-        for (unsigned j = 0; j + 1 < cmd.args.length; j += 2)
-        {
-          cs_command_t seg (OpCode_rlineto);
-          seg.args.alloc (2);
-          seg.args.push (cmd.args[j]);
-          seg.args.push (cmd.args[j + 1]);
-          result.push (seg);
-        }
-        break;
-      }
-
-      case OpCode_rrcurveto:
-      {
-        /* Break into single segments (6 args each) */
-        for (unsigned j = 0; j + 5 < cmd.args.length; j += 6)
-        {
-          cs_command_t seg (OpCode_rrcurveto);
-          seg.args.alloc (6);
-          for (unsigned k = 0; k < 6; k++)
-            seg.args.push (cmd.args[j + k]);
-          result.push (seg);
-        }
-        break;
-      }
-
-      default:
-        /* Keep other operators as-is */
-        result.push (cmd);
-        break;
-    }
-  }
-
-  /* Replace commands with generalized result */
-  commands.resize (0);
-  for (unsigned i = 0; i < result.length; i++)
-    commands.push (result[i]);
-}
-
-/* Specialize CharString commands to optimize bytecode size
- *
- * Follows fontTools approach:
- * 0. Generalize: Break down to canonical single-segment form
- * 1. Specialize: Convert rmoveto/rlineto to h/v variants when dx or dy is zero
- * 2. Combine: Merge adjacent compatible operators
- * 3. Enforce: Respect maxstack limit (default 48 for CFF1)
- *
- * This ensures we never exceed stack depth while optimizing bytecode.
- */
-static void
-specialize_commands (hb_vector_t<cs_command_t> &commands,
-                     unsigned maxstack = 48)
-{
-  if (commands.length == 0) return;
-
-  /* Pass 0: Generalize to canonical form (fontTools does this first) */
-  generalize_commands (commands);
-
-  /* Pass 1: Specialize rmoveto/rlineto into h/v variants */
-  for (unsigned i = 0; i < commands.length; i++)
-  {
-    auto &cmd = commands[i];
-
-    if ((cmd.op == OpCode_rmoveto || cmd.op == OpCode_rlineto) &&
-        cmd.args.length == 2)
-    {
-      bool dx_zero = is_zero (cmd.args[0]);
-      bool dy_zero = is_zero (cmd.args[1]);
-
-      if (dx_zero && !dy_zero)
-      {
-        /* Vertical movement (dx=0): keep only dy */
-        cmd.op = (cmd.op == OpCode_rmoveto) ? OpCode_vmoveto : OpCode_vlineto;
-        /* Shift dy to position 0 */
-        cmd.args[0] = cmd.args[1];
-        cmd.args.resize (1);
-      }
-      else if (!dx_zero && dy_zero)
-      {
-        /* Horizontal movement (dy=0): keep only dx */
-        cmd.op = (cmd.op == OpCode_rmoveto) ? OpCode_hmoveto : OpCode_hlineto;
-        cmd.args.resize (1);  /* Keep only dx */
-      }
-      /* else: both zero or both non-zero, keep as rmoveto/rlineto */
-    }
-  }
-
-  /* Pass 2: Combine adjacent hlineto/vlineto operators
-   * hlineto can take multiple args alternating with vlineto
-   * This saves operator bytes */
-  for (int i = (int)commands.length - 1; i > 0; i--)
-  {
-    auto &cmd = commands[i];
-    auto &prev = commands[i-1];
-
-    /* Combine adjacent hlineto + vlineto or vlineto + hlineto */
-    if ((prev.op == OpCode_hlineto && cmd.op == OpCode_vlineto) ||
-        (prev.op == OpCode_vlineto && cmd.op == OpCode_hlineto))
-    {
-      /* Check stack depth */
-      unsigned combined_args = prev.args.length + cmd.args.length;
-      if (combined_args < maxstack)
-      {
-        /* Merge into first command, keep its operator */
-        for (unsigned j = 0; j < cmd.args.length; j++)
-          prev.args.push (cmd.args[j]);
-        commands.remove_ordered (i);
-        i++;  /* Adjust for removed element */
-      }
-    }
-  }
-
-  /* Pass 3: Combine adjacent identical operators */
-  for (int i = (int)commands.length - 1; i > 0; i--)
-  {
-    auto &cmd = commands[i];
-    auto &prev = commands[i-1];
-
-    /* Combine same operators (e.g., rlineto + rlineto) */
-    if (prev.op == cmd.op &&
-        (cmd.op == OpCode_rlineto || cmd.op == OpCode_hlineto ||
-         cmd.op == OpCode_vlineto || cmd.op == OpCode_rrcurveto))
-    {
-      /* Check stack depth */
-      unsigned combined_args = prev.args.length + cmd.args.length;
-      if (combined_args < maxstack)
-      {
-        /* Merge args */
-        for (unsigned j = 0; j < cmd.args.length; j++)
-          prev.args.push (cmd.args[j]);
-        commands.remove_ordered (i);
-        i++;  /* Adjust for removed element */
-      }
-    }
-  }
-}
-
-/* Encode commands back to binary CharString */
-static bool
-encode_commands (const hb_vector_t<cs_command_t> &commands,
-                 str_buff_t &output)
-{
-  for (const auto &cmd : commands)
-  {
-    str_encoder_t encoder (output);
-
-    /* Encode arguments */
-    for (const auto &arg : cmd.args)
-      encoder.encode_num_cs (arg);
-
-    /* Encode operator */
-    if (cmd.op != OpCode_Invalid)
-      encoder.encode_op (cmd.op);
-
-    /* hintmask/cntrmask are followed by raw mask bytes. */
-    if (cmd.op == OpCode_hintmask || cmd.op == OpCode_cntrmask)
-    {
-      for (const auto &byte : cmd.mask_bytes)
-        encoder.encode_byte (byte);
-    }
-
-    if (encoder.in_error ())
-      return false;
-  }
-
-  return true;
-}
-
-} /* namespace CFF */
-
-#endif /* HB_CFF_SPECIALIZER_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-cff-width-optimizer.hh b/engine/thirdparty/harfbuzz/src/hb-cff-width-optimizer.hh
deleted file mode 100644
index e105dae4..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-cff-width-optimizer.hh
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * CFF Width Optimizer
- *
- * Determines optimal defaultWidthX and nominalWidthX values
- * to minimize CharString byte cost.
- *
- * Based on fontTools.cffLib.width
- */
-
-#ifndef HB_CFF_WIDTH_OPTIMIZER_HH
-#define HB_CFF_WIDTH_OPTIMIZER_HH
-
-#include "hb.hh"
-
-namespace CFF {
-
-/* Calculate byte cost for encoding a width delta */
-static inline unsigned
-width_delta_cost (int delta)
-{
-  delta = abs (delta);
-  if (delta <= 107) return 1;
-  if (delta <= 1131) return 2;
-  return 5;
-}
-
-/* Cumulative sum forward */
-static void
-cumsum_forward (const hb_hashmap_t<unsigned, unsigned> &freq,
-                unsigned min_w, unsigned max_w,
-                hb_vector_t<unsigned> &cumsum)
-{
-  cumsum.resize (max_w - min_w + 1);
-  unsigned v = 0;
-  for (unsigned x = min_w; x <= max_w; x++)
-  {
-    v += freq.get (x);
-    cumsum[x - min_w] = v;
-  }
-}
-
-/* Cumulative max forward */
-static void
-cummax_forward (const hb_hashmap_t<unsigned, unsigned> &freq,
-                unsigned min_w, unsigned max_w,
-                hb_vector_t<unsigned> &cummax)
-{
-  cummax.resize (max_w - min_w + 1);
-  unsigned v = 0;
-  for (unsigned x = min_w; x <= max_w; x++)
-  {
-    v = hb_max (v, freq.get (x));
-    cummax[x - min_w] = v;
-  }
-}
-
-/* Cumulative sum backward */
-static void
-cumsum_backward (const hb_hashmap_t<unsigned, unsigned> &freq,
-                 unsigned min_w, unsigned max_w,
-                 hb_vector_t<unsigned> &cumsum)
-{
-  cumsum.resize (max_w - min_w + 1);
-  unsigned v = 0;
-  for (int x = (int) max_w; x >= (int) min_w; x--)
-  {
-    v += freq.get ((unsigned) x);
-    cumsum[x - min_w] = v;
-  }
-}
-
-/* Cumulative max backward */
-static void
-cummax_backward (const hb_hashmap_t<unsigned, unsigned> &freq,
-                 unsigned min_w, unsigned max_w,
-                 hb_vector_t<unsigned> &cummax)
-{
-  cummax.resize (max_w - min_w + 1);
-  unsigned v = 0;
-  for (int x = (int) max_w; x >= (int) min_w; x--)
-  {
-    v = hb_max (v, freq.get ((unsigned) x));
-    cummax[x - min_w] = v;
-  }
-}
-
-/* Helper to safely get cumulative value with bounds checking */
-static inline unsigned
-safe_get (const hb_vector_t<unsigned> &vec, int x, unsigned min_w, unsigned max_w)
-{
-  if (x < (int) min_w || x > (int) max_w) return 0;
-  return vec[x - min_w];
-}
-
-/* Optimize defaultWidthX and nominalWidthX from a list of widths
- * O(UPEM+numGlyphs) algorithm from fontTools.cffLib.width */
-static void
-optimize_widths (const hb_vector_t<unsigned> &width_list,
-                 unsigned &default_width,
-                 unsigned &nominal_width)
-{
-  if (width_list.length == 0)
-  {
-    default_width = nominal_width = 0;
-    return;
-  }
-
-  /* Build frequency map */
-  hb_hashmap_t<unsigned, unsigned> widths;
-  unsigned min_w = width_list[0];
-  unsigned max_w = width_list[0];
-
-  for (unsigned w : width_list)
-  {
-    widths.set (w, widths.get (w) + 1);
-    min_w = hb_min (min_w, w);
-    max_w = hb_max (max_w, w);
-  }
-
-  /* Cumulative sum/max forward/backward */
-  hb_vector_t<unsigned> cumFrqU, cumMaxU, cumFrqD, cumMaxD;
-  cumsum_forward (widths, min_w, max_w, cumFrqU);
-  cummax_forward (widths, min_w, max_w, cumMaxU);
-  cumsum_backward (widths, min_w, max_w, cumFrqD);
-  cummax_backward (widths, min_w, max_w, cumMaxD);
-
-  /* Cost per nominal choice, without default consideration */
-  auto nomnCost = [&] (unsigned x) -> unsigned {
-    return safe_get (cumFrqU, x, min_w, max_w) +
-           safe_get (cumFrqU, x - 108, min_w, max_w) +
-           safe_get (cumFrqU, x - 1132, min_w, max_w) * 3 +
-           safe_get (cumFrqD, x, min_w, max_w) +
-           safe_get (cumFrqD, x + 108, min_w, max_w) +
-           safe_get (cumFrqD, x + 1132, min_w, max_w) * 3 -
-           widths.get (x);
-  };
-
-  /* Cost-saving per nominal choice, by best default choice */
-  auto dfltCost = [&] (unsigned x) -> unsigned {
-    unsigned u = hb_max (hb_max (safe_get (cumMaxU, x, min_w, max_w),
-                                  safe_get (cumMaxU, x - 108, min_w, max_w) * 2),
-                         safe_get (cumMaxU, x - 1132, min_w, max_w) * 5);
-    unsigned d = hb_max (hb_max (safe_get (cumMaxD, x, min_w, max_w),
-                                  safe_get (cumMaxD, x + 108, min_w, max_w) * 2),
-                         safe_get (cumMaxD, x + 1132, min_w, max_w) * 5);
-    return hb_max (u, d);
-  };
-
-  /* Find best nominal */
-  unsigned best_nominal = min_w;
-  unsigned best_cost = nomnCost (min_w) - dfltCost (min_w);
-
-  for (unsigned x = min_w + 1; x <= max_w; x++)
-  {
-    unsigned cost = nomnCost (x) - dfltCost (x);
-    if (cost < best_cost)
-    {
-      best_cost = cost;
-      best_nominal = x;
-    }
-  }
-
-  /* Work back the best default */
-  unsigned best_default = best_nominal;
-  unsigned best_default_cost = (unsigned) -1;
-
-  /* Check candidates around best_nominal */
-  int candidates[] = {
-    (int) best_nominal,
-    (int) best_nominal - 108,
-    (int) best_nominal - 1132,
-    (int) best_nominal + 108,
-    (int) best_nominal + 1132
-  };
-
-  for (int candidate : candidates)
-  {
-    if (candidate < (int) min_w || candidate > (int) max_w)
-      continue;
-
-    /* Compute actual cost with this default */
-    unsigned cost = 0;
-    for (auto kv : widths.iter ())
-    {
-      unsigned w = kv.first;
-      unsigned freq = kv.second;
-
-      if (w == (unsigned) candidate)
-        continue;
-
-      cost += freq * width_delta_cost ((int) w - (int) best_nominal);
-    }
-
-    if (cost < best_default_cost)
-    {
-      best_default_cost = cost;
-      best_default = (unsigned) candidate;
-    }
-  }
-
-  default_width = best_default;
-  nominal_width = best_nominal;
-}
-
-} /* namespace CFF */
-
-#endif /* HB_CFF_WIDTH_OPTIMIZER_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-cff2-interp-cs.hh b/engine/thirdparty/harfbuzz/src/hb-cff2-interp-cs.hh
index c44b0247..27a0c8cf 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cff2-interp-cs.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-cff2-interp-cs.hh
@@ -291,7 +291,7 @@ struct cff2_cs_opset_t : cs_opset_t<ELEM, OPSET, cff2_cs_interp_env_t<ELEM>, PAR
     for (unsigned int i = 0; i < n; i++)
     {
       const hb_array_t<const ELEM> blends = env.argStack.sub_array (start + n + (i * k), k);
-      process_arg_blend (env, env.argStack.arrayZ[start + i], blends, n, i);
+      process_arg_blend (env, env.argStack[start + i], blends, n, i);
     }
 
     /* pop off blend values leaving default values now adorned with blend values */
diff --git a/engine/thirdparty/harfbuzz/src/hb-common.cc b/engine/thirdparty/harfbuzz/src/hb-common.cc
index fe357e13..44e99f80 100644
--- a/engine/thirdparty/harfbuzz/src/hb-common.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-common.cc
@@ -40,6 +40,43 @@
  **/
 
 
+/* hb_options_t */
+
+hb_atomic_t<unsigned> _hb_options;
+
+void
+_hb_options_init ()
+{
+  hb_options_union_t u;
+  u.i = 0;
+  u.opts.initialized = true;
+
+  const char *c = getenv ("HB_OPTIONS");
+  if (c)
+  {
+    while (*c)
+    {
+      const char *p = strchr (c, ':');
+      if (!p)
+	p = c + strlen (c);
+
+#define OPTION(name, symbol) \
+	if (0 == strncmp (c, name, p - c) && strlen (name) == static_cast<size_t>(p - c)) do { u.opts.symbol = true; } while (0)
+
+      OPTION ("uniscribe-bug-compatible", uniscribe_bug_compatible);
+
+#undef OPTION
+
+      c = *p ? p + 1 : p;
+    }
+
+  }
+
+  /* This is idempotent and threadsafe. */
+  _hb_options = u.i;
+}
+
+
 /* hb_tag_t */
 
 /**
diff --git a/engine/thirdparty/harfbuzz/src/hb-config.hh b/engine/thirdparty/harfbuzz/src/hb-config.hh
index b508c4e7..5825f5f7 100644
--- a/engine/thirdparty/harfbuzz/src/hb-config.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-config.hh
@@ -43,7 +43,6 @@
 #ifdef HB_TINY
 #define HB_LEAN
 #define HB_MINI
-#define HB_NO_SVG
 #define HB_OPTIMIZE_SIZE
 #define HB_OPTIMIZE_SIZE_MORE
 #define HB_MINIMIZE_MEMORY_USAGE
@@ -146,6 +145,10 @@
 #define HB_NO_PAINT
 #endif
 
+#ifdef HB_NO_GETENV
+#define HB_NO_UNISCRIBE_BUG_COMPATIBLE
+#endif
+
 #ifdef HB_NO_LEGACY
 #define HB_NO_CMAP_LEGACY_SUBTABLES
 #define HB_NO_FALLBACK_SHAPE
diff --git a/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc b/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
index 89bf090b..ebd0bc13 100644
--- a/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
@@ -199,7 +199,7 @@ _hb_coretext_shape (hb_shape_plan_t    *shape_plan,
     hb_glyph_info_t *info = buffer->info;
     for (unsigned int i = 1; i < count; i++)
       if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (unicode->general_category (info[i].codepoint)))
-	buffer->merge_grapheme_clusters (i - 1, i + 1);
+	buffer->merge_clusters (i - 1, i + 1);
   }
 
   hb_vector_t<range_record_t> range_records;
diff --git a/engine/thirdparty/harfbuzz/src/hb-cplusplus.hh b/engine/thirdparty/harfbuzz/src/hb-cplusplus.hh
index 14944eee..b6b5c8f7 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cplusplus.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-cplusplus.hh
@@ -138,55 +138,51 @@ struct vtable_t
   static constexpr auto get_user_data = _get_user_data;
 };
 
-#define HB_DEFINE_VTABLE(name, empty) \
+#define HB_DEFINE_VTABLE(name) \
 	template<> \
 	struct vtable<hb_##name##_t> \
 	     : vtable_t<hb_##name##_t, \
-			empty, \
+			&hb_##name##_get_empty, \
 			&hb_##name##_reference, \
 			&hb_##name##_destroy, \
 			&hb_##name##_set_user_data, \
 			&hb_##name##_get_user_data> {}
 
-HB_DEFINE_VTABLE (buffer, &hb_buffer_get_empty);
-HB_DEFINE_VTABLE (blob, &hb_blob_get_empty);
-HB_DEFINE_VTABLE (face, &hb_face_get_empty);
-HB_DEFINE_VTABLE (font, &hb_font_get_empty);
-HB_DEFINE_VTABLE (font_funcs, &hb_font_funcs_get_empty);
-HB_DEFINE_VTABLE (map, &hb_map_get_empty);
-HB_DEFINE_VTABLE (set, &hb_set_get_empty);
-HB_DEFINE_VTABLE (shape_plan, &hb_shape_plan_get_empty);
-HB_DEFINE_VTABLE (unicode_funcs, &hb_unicode_funcs_get_empty);
-HB_DEFINE_VTABLE (draw_funcs, &hb_draw_funcs_get_empty);
-HB_DEFINE_VTABLE (paint_funcs, &hb_paint_funcs_get_empty);
+HB_DEFINE_VTABLE (buffer);
+HB_DEFINE_VTABLE (blob);
+HB_DEFINE_VTABLE (face);
+HB_DEFINE_VTABLE (font);
+HB_DEFINE_VTABLE (font_funcs);
+HB_DEFINE_VTABLE (map);
+HB_DEFINE_VTABLE (set);
+HB_DEFINE_VTABLE (shape_plan);
+HB_DEFINE_VTABLE (unicode_funcs);
+HB_DEFINE_VTABLE (draw_funcs);
+HB_DEFINE_VTABLE (paint_funcs);
+
+#undef HB_DEFINE_VTABLE
 
 
 #ifdef HB_SUBSET_H
 
-HB_DEFINE_VTABLE (subset_input, nullptr);
-HB_DEFINE_VTABLE (subset_plan, nullptr);
-
-#endif
+#define HB_DEFINE_VTABLE(name) \
+	template<> \
+	struct vtable<hb_##name##_t> \
+	     : vtable_t<hb_##name##_t, \
+			nullptr, \
+			&hb_##name##_reference, \
+			&hb_##name##_destroy, \
+			&hb_##name##_set_user_data, \
+			&hb_##name##_get_user_data> {}
 
 
-#ifdef HB_RASTER_H
-
-HB_DEFINE_VTABLE (raster_image, nullptr);
-HB_DEFINE_VTABLE (raster_draw, nullptr);
-HB_DEFINE_VTABLE (raster_paint, nullptr);
-
-#endif
-
-
-#ifdef HB_VECTOR_H
-
-HB_DEFINE_VTABLE (vector_draw, nullptr);
-HB_DEFINE_VTABLE (vector_paint, nullptr);
-
-#endif
+HB_DEFINE_VTABLE (subset_input);
+HB_DEFINE_VTABLE (subset_plan);
 
 #undef HB_DEFINE_VTABLE
 
+#endif
+
 
 } // namespace hb
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-debug.hh b/engine/thirdparty/harfbuzz/src/hb-debug.hh
index dd7343cd..c07b7b29 100644
--- a/engine/thirdparty/harfbuzz/src/hb-debug.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-debug.hh
@@ -37,6 +37,48 @@
 #endif
 
 
+/*
+ * Global runtime options.
+ */
+
+struct hb_options_t
+{
+  bool unused : 1; /* In-case sign bit is here. */
+  bool initialized : 1;
+  bool uniscribe_bug_compatible : 1;
+};
+
+union hb_options_union_t {
+  unsigned i;
+  hb_options_t opts;
+};
+static_assert ((sizeof (hb_atomic_t<unsigned>) >= sizeof (hb_options_union_t)), "");
+
+HB_INTERNAL void
+_hb_options_init ();
+
+extern HB_INTERNAL hb_atomic_t<unsigned> _hb_options;
+
+static inline hb_options_t
+hb_options ()
+{
+#ifdef HB_NO_GETENV
+  return hb_options_t ();
+#endif
+  /* Make a local copy, so we can access bitfield threadsafely. */
+  hb_options_union_t u;
+  u.i = _hb_options;
+
+  if (unlikely (!u.i))
+  {
+    _hb_options_init ();
+    u.i = _hb_options;
+  }
+
+  return u.opts;
+}
+
+
 /*
  * Debug output (needs enabling at compile time.)
  */
diff --git a/engine/thirdparty/harfbuzz/src/hb-directwrite.cc b/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
index d9410497..6e2bd914 100644
--- a/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
@@ -452,7 +452,6 @@ hb_directwrite_font_get_dw_font_face (hb_font_t *font)
   return (IDWriteFontFace *) (const void *) font->data.directwrite;
 }
 
-#ifndef HB_DISABLE_DEPRECATED
 
 /**
 * hb_directwrite_font_get_dw_font:
@@ -472,5 +471,3 @@ hb_directwrite_font_get_dw_font (hb_font_t *font)
 }
 
 #endif
-
-#endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-font.hh b/engine/thirdparty/harfbuzz/src/hb-font.hh
index 8d7bb270..b53134fa 100644
--- a/engine/thirdparty/harfbuzz/src/hb-font.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-font.hh
@@ -719,13 +719,7 @@ struct hb_font_t
     // Slant before embolden; produces nicer results.
 
     if (slanted)
-    {
-      hb_position_t xo = 0, yo = 0;
-      get_glyph_h_origin (glyph, &xo, &yo, false);
-      outline.translate (-xo, -yo);
       outline.slant (slant_xy);
-      outline.translate (xo, yo);
-    }
 
     if (embolden)
     {
diff --git a/engine/thirdparty/harfbuzz/src/hb-kbts.cc b/engine/thirdparty/harfbuzz/src/hb-kbts.cc
index 4fc2c48d..0159256b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-kbts.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-kbts.cc
@@ -24,140 +24,22 @@
 
 #include "hb.hh"
 
-#ifdef HAVE_KBTS
+#if HAVE_KBTS
 
 #include "hb-shaper-impl.hh"
 
 #define KB_TEXT_SHAPE_IMPLEMENTATION
 #define KB_TEXT_SHAPE_STATIC
 #define KB_TEXT_SHAPE_NO_CRT
-#define KBTS_MALLOC(a, b) hb_malloc(b)
-#define KBTS_FREE(a, b) hb_free(b)
-#define KBTS_MEMCPY hb_memcpy
 #define KBTS_MEMSET hb_memset
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
 #pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wextra-semi-stmt"
+#pragma GCC diagnostic ignored "-Wsign-compare"
 #include "kb_text_shape.h"
 #pragma GCC diagnostic pop
 
-static hb_user_data_key_t hb_kbts_shape_plan_data_key = {0};
-
-struct hb_kbts_shape_plan_data_t
-{
-  kbts_shape_config *config = nullptr;
-  mutable hb_atomic_t<kbts_shape_scratchpad *> scratchpad;
-};
-
-static void
-hb_kbts_shape_plan_data_destroy (void *data)
-{
-  auto *plan_data = (hb_kbts_shape_plan_data_t *) data;
-  if (!plan_data)
-    return;
-
-  auto *scratchpad = plan_data->scratchpad.get_acquire ();
-  if (scratchpad && plan_data->scratchpad.cmpexch (scratchpad, nullptr))
-    kbts_DestroyShapeScratchpad (scratchpad);
-
-  if (plan_data->config)
-    kbts_DestroyShapeConfig (plan_data->config);
-
-  hb_free (plan_data);
-}
-
-static void
-hb_kbts_plan_props_to_script_language (const hb_segment_properties_t &props,
-				       kbts_script *kb_script,
-				       kbts_language *kb_language)
-{
-  hb_tag_t scripts[HB_OT_MAX_TAGS_PER_SCRIPT];
-  hb_tag_t language;
-  unsigned int script_count = ARRAY_LENGTH (scripts);
-  unsigned int language_count = 1;
-
-  *kb_script = KBTS_SCRIPT_DONT_KNOW;
-  *kb_language = KBTS_LANGUAGE_DEFAULT;
-
-  hb_ot_tags_from_script_and_language (props.script, props.language,
-				       &script_count, scripts,
-				       &language_count, &language);
-
-  for (unsigned int i = 0; i < script_count && scripts[i] != HB_TAG_NONE; ++i)
-  {
-    *kb_script = kbts_ScriptTagToScript (hb_uint32_swap (scripts[i]));
-    if (*kb_script != KBTS_SCRIPT_DONT_KNOW)
-      break;
-  }
-
-  if (language_count)
-    *kb_language = (kbts_language) hb_uint32_swap (language);
-}
-
-static hb_kbts_shape_plan_data_t *
-hb_kbts_get_shape_plan_data (hb_shape_plan_t *shape_plan,
-			     kbts_font *kb_font)
-{
-retry:
-  auto *plan_data = (hb_kbts_shape_plan_data_t *)
-    hb_shape_plan_get_user_data (shape_plan, &hb_kbts_shape_plan_data_key);
-  if (plan_data)
-    return plan_data;
-
-  kbts_script kb_script;
-  kbts_language kb_language;
-  hb_kbts_plan_props_to_script_language (shape_plan->key.props, &kb_script, &kb_language);
-
-  kbts_shape_config *config = kbts_CreateShapeConfig (kb_font, kb_script, kb_language, nullptr, nullptr);
-  if (unlikely (!config))
-    return nullptr;
-
-  plan_data = (hb_kbts_shape_plan_data_t *) hb_calloc (1, sizeof (*plan_data));
-  if (unlikely (!plan_data))
-  {
-    kbts_DestroyShapeConfig (config);
-    return nullptr;
-  }
-
-  plan_data->config = config;
-  plan_data->scratchpad.init (nullptr);
-
-  if (!hb_shape_plan_set_user_data (shape_plan,
-				    &hb_kbts_shape_plan_data_key,
-				    plan_data,
-				    hb_kbts_shape_plan_data_destroy,
-				    false))
-  {
-    hb_kbts_shape_plan_data_destroy (plan_data);
-    goto retry;
-  }
-
-  return plan_data;
-}
-
-static kbts_shape_scratchpad *
-hb_kbts_acquire_shape_scratchpad (hb_kbts_shape_plan_data_t *plan_data)
-{
-  auto *scratchpad = plan_data->scratchpad.get_acquire ();
-  if (!scratchpad || unlikely (!plan_data->scratchpad.cmpexch (scratchpad, nullptr)))
-    scratchpad = kbts_CreateShapeScratchpad (plan_data->config, nullptr, nullptr);
-
-  return scratchpad;
-}
-
-static void
-hb_kbts_release_shape_scratchpad (hb_kbts_shape_plan_data_t *plan_data,
-				  kbts_shape_scratchpad *scratchpad)
-{
-  if (!scratchpad)
-    return;
-
-  if (!plan_data->scratchpad.cmpexch (nullptr, scratchpad))
-    kbts_DestroyShapeScratchpad (scratchpad);
-}
-
 
 hb_kbts_face_data_t *
 _hb_kbts_shaper_face_data_create (hb_face_t *face)
@@ -173,21 +55,40 @@ _hb_kbts_shaper_face_data_create (hb_face_t *face)
     return nullptr;
   }
 
-  kbts_font *kb_font = (kbts_font *) hb_calloc (1, sizeof (kbts_font));
-  if (unlikely (!kb_font))
-  {
-    hb_blob_destroy (blob);
-    return nullptr;
-  }
+  void *data = hb_malloc (blob_length);
+  if (likely (data))
+    hb_memcpy (data, blob_data, blob_length);
 
-  *kb_font = kbts_FontFromMemory((void *)blob_data, blob_length, face->index, nullptr, nullptr);
   hb_blob_destroy (blob);
   blob = nullptr;
 
-  if (unlikely (!kbts_FontIsValid (kb_font)))
+  if (unlikely (!data))
   {
-    DEBUG_MSG (KBTS, face, "Failed create font from data");
-    kbts_FreeFont (kb_font);
+    DEBUG_MSG (KBTS, face, "Failed to allocate memory for font data");
+    return nullptr;
+  }
+
+  kbts_font *kb_font = (kbts_font *) hb_calloc (1, sizeof (kbts_font));
+  if (unlikely (!kb_font))
+  {
+    hb_free (data);
+    return nullptr;
+  }
+
+  size_t memory_size;
+  {
+    unsigned scratch_size = kbts_ReadFontHeader (kb_font, data, blob_length);
+    void *scratch = hb_malloc (scratch_size);
+    memory_size = kbts_ReadFontData (kb_font, scratch, scratch_size);
+    hb_free (scratch);
+  }
+
+  void *memory = hb_malloc (memory_size);
+  if (unlikely (!kbts_PostReadFontInitialize (kb_font, memory, memory_size)))
+  {
+    DEBUG_MSG (KBTS, face, "kbts_PostReadFontInitialize failed");
+    hb_free (memory);
+    hb_free (data);
     hb_free (kb_font);
     return nullptr;
   }
@@ -202,7 +103,8 @@ _hb_kbts_shaper_face_data_destroy (hb_kbts_face_data_t *data)
 
   assert (kbts_FontIsValid (font));
 
-  kbts_FreeFont (font);
+  hb_free (font->FileBase);
+  hb_free (font->GlyphLookupMatrix);
   hb_free (font);
 }
 
@@ -242,84 +144,116 @@ _hb_kbts_shape (hb_shape_plan_t    *shape_plan,
       return false;
   }
 
-  kbts_glyph_storage kb_glyph_storage;
-  if (unlikely (!kbts_InitializeGlyphStorage (&kb_glyph_storage, nullptr, nullptr)))
-    return false;
-
-  hb_kbts_shape_plan_data_t *plan_data = hb_kbts_get_shape_plan_data (shape_plan, kb_font);
-  if (unlikely (!plan_data))
+  kbts_script kb_script = KBTS_SCRIPT_DONT_KNOW;
+  kbts_language kb_language = KBTS_LANGUAGE_DEFAULT;
   {
-    kbts_FreeAllGlyphs (&kb_glyph_storage);
-    return false;
+    hb_tag_t scripts[HB_OT_MAX_TAGS_PER_SCRIPT];
+    hb_tag_t language;
+    unsigned int script_count = ARRAY_LENGTH (scripts);
+    unsigned int language_count = 1;
+
+    hb_ot_tags_from_script_and_language (buffer->props.script, buffer->props.language,
+					 &script_count, scripts,
+					 &language_count, &language);
+
+    for (unsigned int i = 0; i < script_count && scripts[i] != HB_TAG_NONE; ++i)
+    {
+      kb_script = kbts_ScriptTagToScript (hb_uint32_swap (scripts[i]));
+      if (kb_script != KBTS_SCRIPT_DONT_KNOW)
+        break;
+    }
+
+    if (language_count)
+      kb_language = (kbts_language) hb_uint32_swap (language);
   }
 
-  kbts_shape_config *kb_shape_config = nullptr;
-  kbts_shape_scratchpad *kb_shape_scratchpad = nullptr;
-  uint32_t glyph_count = 0;
-  kbts_glyph *kb_glyph = nullptr;
-  kbts_glyph_iterator kb_output;
-  hb_glyph_info_t *info;
-  hb_glyph_position_t *pos;
-  hb_bool_t res = false;
-
-  kb_shape_config = plan_data->config;
-  kb_shape_scratchpad = hb_kbts_acquire_shape_scratchpad (plan_data);
-  if (unlikely (!kb_shape_scratchpad))
-    goto done;
+  hb_vector_t<kbts_glyph> kb_glyphs;
+  if (unlikely (!kb_glyphs.resize_full (buffer->len, false, true)))
+    return false;
 
   for (size_t i = 0; i < buffer->len; ++i)
+    kb_glyphs.arrayZ[i] = kbts_CodepointToGlyph (kb_font, buffer->info[i].codepoint);
+
+  if (num_features)
   {
-    kbts_glyph_config *kb_config = nullptr;
-    if (num_features)
+    for (unsigned int i = 0; i < num_features; ++i)
     {
-      hb_vector_t<kbts_feature_override> kb_features;
-      for (unsigned int j = 0; j < num_features; ++j)
+      hb_feature_t feature = features[i];
+      for (unsigned int j = 0; j < buffer->len; ++j)
       {
-        if (hb_in_range<size_t> (i, features[j].start, features[j].end))
-	  kb_features.push<kbts_feature_override>({ hb_uint32_swap (features[j].tag), (int)features[j].value });
+	kbts_glyph *kb_glyph = &kb_glyphs.arrayZ[j];
+	if (hb_in_range (j, feature.start, feature.end))
+	{
+	  if (!kb_glyph->Config)
+	    kb_glyph->Config = (kbts_glyph_config *) hb_calloc (1, sizeof (kbts_glyph_config));
+	  kbts_glyph_config *config = kb_glyph->Config;
+	  while (!kbts_GlyphConfigOverrideFeatureFromTag (config, hb_uint32_swap (feature.tag),
+	                                                  feature.value > 1, feature.value))
+	  {
+	    config->FeatureOverrides = (kbts_feature_override *) hb_realloc (config->FeatureOverrides,
+									     config->RequiredFeatureOverrideCapacity);
+	    config->FeatureOverrideCapacity += 1;
+	  }
+	}
       }
-      if (kb_features)
-        kb_config = kbts_CreateGlyphConfig (kb_shape_config, kb_features.arrayZ, kb_features.length, nullptr, nullptr);
     }
-    kbts_PushGlyph (&kb_glyph_storage, kb_font, buffer->info[i].codepoint, kb_config, buffer->info[i].cluster);
   }
 
-  res = kbts_ShapeDirect (kb_shape_scratchpad, &kb_glyph_storage, kb_direction, &kb_output) == KBTS_SHAPE_ERROR_NONE;
-  if (unlikely (!res))
-    goto done;
-
-  for (auto it = kb_output; kbts_GlyphIteratorNext (&it, &kb_glyph); )
-    glyph_count += 1;
+  kbts_shape_state *kb_shape_state;
+  {
+    size_t kb_shape_state_size = kbts_SizeOfShapeState (kb_font);
+    void *kb_shape_state_buffer = hb_malloc (kb_shape_state_size);
+    if (unlikely (!kb_shape_state_buffer))
+    {
+      DEBUG_MSG (KBTS, face, "Failed to allocate memory for shape state");
+      return false;
+    }
+    kb_shape_state = kbts_PlaceShapeState (kb_shape_state_buffer, kb_shape_state_size);
+  }
+  kbts_shape_config kb_shape_config = kbts_ShapeConfig (kb_font, kb_script, kb_language);
+  uint32_t glyph_count = buffer->len;
+  uint32_t glyph_capacity = kb_glyphs.length;
+  while (kbts_Shape (kb_shape_state, &kb_shape_config, KBTS_DIRECTION_LTR, kb_direction,
+		     kb_glyphs.arrayZ, &glyph_count, glyph_capacity))
+  {
+    glyph_capacity = kb_shape_state->RequiredGlyphCapacity;
+    /* kb increases capacity by a fixed number only. We increase it by 50% to
+     * avoid O(n^2) behavior in case of expanding text.
+     *
+     * https://github.com/JimmyLefevre/kb/issues/32
+     */
+    glyph_capacity += glyph_capacity / 2;
+    if (unlikely (!kb_glyphs.resize_full (glyph_capacity, false, true)))
+      return false;
+  }
 
   hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS);
   hb_buffer_set_length (buffer, glyph_count);
 
+  hb_glyph_info_t *info = buffer->info;
+  hb_glyph_position_t *pos = buffer->pos;
+
   buffer->clear_positions ();
-
-  info = buffer->info;
-  pos = buffer->pos;
-
-  for (auto it = kb_output; kbts_GlyphIteratorNext (&it, &kb_glyph); info++, pos++)
+  for (size_t i = 0; i < glyph_count; ++i)
   {
-    info->codepoint = kb_glyph->Id;
-    info->cluster = kb_glyph->UserIdOrCodepointIndex;
-    pos->x_advance = font->em_scalef_x (kb_glyph->AdvanceX);
-    pos->y_advance = font->em_scalef_y (kb_glyph->AdvanceY);
-    pos->x_offset = font->em_scalef_x (kb_glyph->OffsetX);
-    pos->y_offset = font->em_scalef_y (kb_glyph->OffsetY);
+    kbts_glyph kb_glyph = kb_glyphs.arrayZ[i];
+    info[i].codepoint = kb_glyph.Id;
+    info[i].cluster = 0; // FIXME
+    pos[i].x_advance = font->em_scalef_x (kb_glyph.AdvanceX);
+    pos[i].y_advance = font->em_scalef_y (kb_glyph.AdvanceY);
+    pos[i].x_offset = font->em_scalef_x (kb_glyph.OffsetX);
+    pos[i].y_offset = font->em_scalef_y (kb_glyph.OffsetY);
+
+    if (kb_glyph.Config)
+      hb_free (kb_glyph.Config->FeatureOverrides);
   }
 
-done:
-  if (likely (kb_shape_scratchpad))
-    hb_kbts_release_shape_scratchpad (plan_data, kb_shape_scratchpad);
-  while (kbts_GlyphIteratorNext (&kb_output, &kb_glyph))
-    kbts_DestroyGlyphConfig (kb_glyph->Config);
-  kbts_FreeAllGlyphs (&kb_glyph_storage);
+  hb_free (kb_shape_state);
 
   buffer->clear_glyph_flags ();
   buffer->unsafe_to_break ();
 
-  return res;
+  return true;
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/engine/thirdparty/harfbuzz/src/hb-limits.hh b/engine/thirdparty/harfbuzz/src/hb-limits.hh
index c115f9a8..857e1837 100644
--- a/engine/thirdparty/harfbuzz/src/hb-limits.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-limits.hh
@@ -108,17 +108,5 @@
 #define HB_MAX_COMPOSITE_OPERATIONS_PER_GLYPH 64
 #endif
 
-#ifndef HB_SVG_MAX_PATH_SEGMENTS
-#define HB_SVG_MAX_PATH_SEGMENTS 262144
-#endif
-
-#ifndef HB_SVG_MAX_DOCUMENT_SIZE
-#define HB_SVG_MAX_DOCUMENT_SIZE ((size_t) 16 << 20)
-#endif
-
-#ifndef HB_RASTER_MAX_BUFFER_SIZE
-#define HB_RASTER_MAX_BUFFER_SIZE ((size_t) 1 << 24)
-#endif
-
 
 #endif /* HB_LIMITS_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-map.hh b/engine/thirdparty/harfbuzz/src/hb-map.hh
index fefdbb19..1520a9b3 100644
--- a/engine/thirdparty/harfbuzz/src/hb-map.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-map.hh
@@ -492,16 +492,16 @@ struct hb_hashmap_t
   hb_hashmap_t& operator << (const hb_pair_t<K, V>& v)
   { set (v.first, v.second); return *this; }
   template <typename V2 = V,
-	    hb_enable_if (!hb_is_trivially_copyable (V2))>
+	    hb_enable_if (!std::is_trivially_copyable<V2>::value)>
   hb_hashmap_t& operator << (const hb_pair_t<K, V&&>& v)
   { set (v.first, std::move (v.second)); return *this; }
   template <typename K2 = K,
-	    hb_enable_if (!hb_is_trivially_copyable (K2))>
+	    hb_enable_if (!std::is_trivially_copyable<K2>::value)>
   hb_hashmap_t& operator << (const hb_pair_t<K&&, V>& v)
   { set (std::move (v.first), v.second); return *this; }
   template <typename K2 = K, typename V2 = V,
-	    hb_enable_if (!hb_is_trivially_copyable (K2) &&
-			  !hb_is_trivially_copyable (V2))>
+	    hb_enable_if (!std::is_trivially_copyable<K2>::value &&
+			  !std::is_trivially_copyable<V2>::value)>
   hb_hashmap_t& operator << (const hb_pair_t<K&&, V&&>& v)
   { set (std::move (v.first), std::move (v.second)); return *this; }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-number-parser.hh b/engine/thirdparty/harfbuzz/src/hb-number-parser.hh
index 1a9dbba6..ec68c3a7 100644
--- a/engine/thirdparty/harfbuzz/src/hb-number-parser.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-number-parser.hh
@@ -31,7 +31,7 @@
 #include "hb.hh"
 
 
-#line 35 "hb-number-parser.hh"
+#line 32 "hb-number-parser.hh"
 static const unsigned char _double_parser_trans_keys[] = {
 	0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u, 
 	46u, 101u, 0
@@ -135,12 +135,12 @@ strtod_rl (const char *p, const char **end_ptr /* IN/OUT */)
 
   int cs;
   
-#line 139 "hb-number-parser.hh"
+#line 132 "hb-number-parser.hh"
 	{
 	cs = double_parser_start;
 	}
 
-#line 144 "hb-number-parser.hh"
+#line 135 "hb-number-parser.hh"
 	{
 	int _slen;
 	int _trans;
@@ -198,7 +198,7 @@ _resume:
 	  exp_overflow = true;
 }
 	break;
-#line 202 "hb-number-parser.hh"
+#line 187 "hb-number-parser.hh"
 	}
 
 _again:
diff --git a/engine/thirdparty/harfbuzz/src/hb-object.hh b/engine/thirdparty/harfbuzz/src/hb-object.hh
index 3fb38797..7b34d671 100644
--- a/engine/thirdparty/harfbuzz/src/hb-object.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-object.hh
@@ -272,8 +272,6 @@ static inline void hb_object_make_immutable (const Type *obj)
   obj->header.writable = false;
 }
 template <typename Type>
-static inline void hb_object_fini (Type *obj);
-template <typename Type>
 static inline Type *hb_object_reference (Type *obj)
 {
   hb_object_trace (obj, HB_FUNC);
@@ -284,7 +282,7 @@ static inline Type *hb_object_reference (Type *obj)
   return obj;
 }
 template <typename Type>
-static inline bool hb_object_should_destroy (Type *obj)
+static inline bool hb_object_destroy (Type *obj)
 {
   hb_object_trace (obj, HB_FUNC);
   if (unlikely (!obj || obj->header.is_inert ()))
@@ -292,25 +290,12 @@ static inline bool hb_object_should_destroy (Type *obj)
   assert (hb_object_is_valid (obj));
   if (obj->header.ref_count.dec () != 1)
     return false;
-  return true;
-}
 
-template <typename Type>
-static inline void hb_object_actually_destroy (Type *obj)
-{
   hb_object_fini (obj);
 
   if (!std::is_trivially_destructible<Type>::value)
     obj->~Type ();
-}
 
-template <typename Type>
-static inline bool hb_object_destroy (Type *obj)
-{
-  if (!hb_object_should_destroy (obj))
-    return false;
-
-  hb_object_actually_destroy (obj);
   return true;
 }
 template <typename Type>
diff --git a/engine/thirdparty/harfbuzz/src/hb-open-file.hh b/engine/thirdparty/harfbuzz/src/hb-open-file.hh
index 6a53a7eb..6c98226f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-open-file.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-open-file.hh
@@ -465,11 +465,11 @@ struct OpenTypeFontFile
     Typ1Tag		= HB_TAG ('t','y','p','1')  /* Obsolete Apple Type1 font in SFNT container */
   };
 
-  hb_tag_t get_tag () const { return u.tag.v; }
+  hb_tag_t get_tag () const { return u.tag; }
 
   unsigned int get_face_count () const
   {
-    switch (u.tag.v) {
+    switch (u.tag) {
     case CFFTag:	/* All the non-collection tags */
     case TrueTag:
     case Typ1Tag:
@@ -483,7 +483,7 @@ struct OpenTypeFontFile
   {
     if (base_offset)
       *base_offset = 0;
-    switch (u.tag.v) {
+    switch (u.tag) {
     /* Note: for non-collection SFNT data we ignore index.  This is because
      * Apple dfont container is a container of SFNT's.  So each SFNT is a
      * non-TTC, but the index is more than zero. */
@@ -512,9 +512,9 @@ struct OpenTypeFontFile
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.tag.v.sanitize (c))) return_trace (false);
+    if (unlikely (!u.tag.sanitize (c))) return_trace (false);
     hb_barrier ();
-    switch (u.tag.v) {
+    switch (u.tag) {
     case CFFTag:	/* All the non-collection tags */
     case TrueTag:
     case Typ1Tag:
@@ -527,13 +527,13 @@ struct OpenTypeFontFile
 
   protected:
   union {
-  struct { Tag v; }	tag;		/* 4-byte identifier. */
+  Tag			tag;		/* 4-byte identifier. */
   OpenTypeFontFace	fontFace;
   TTCHeader		ttcHeader;
   ResourceForkHeader	rfHeader;
   } u;
   public:
-  DEFINE_SIZE_UNION (4, tag.v);
+  DEFINE_SIZE_UNION (4, tag);
 };
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-open-type.hh b/engine/thirdparty/harfbuzz/src/hb-open-type.hh
index 44508e7e..ed8e0b4e 100644
--- a/engine/thirdparty/harfbuzz/src/hb-open-type.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-open-type.hh
@@ -62,7 +62,7 @@ struct NumType
   typedef Type type;
   /* For reason we define cast out operator for signed/unsigned, instead of Type, see:
    * https://github.com/harfbuzz/harfbuzz/pull/2875/commits/09836013995cab2b9f07577a179ad7b024130467 */
-  typedef typename std::conditional<std::is_integral<Type>::value && sizeof (Type) <= sizeof(int),
+  typedef typename std::conditional<std::is_integral<Type>::value,
 				     typename std::conditional<std::is_signed<Type>::value, signed, unsigned>::type,
 				     Type>::type WideType;
 
@@ -118,8 +118,6 @@ typedef NumType<true, uint16_t> HBUINT16;	/* 16-bit big-endian unsigned integer.
 typedef NumType<true, int16_t>  HBINT16;	/* 16-bit big-endian signed integer. */
 typedef NumType<true, uint32_t> HBUINT32;	/* 32-bit big-endian unsigned integer. */
 typedef NumType<true, int32_t>  HBINT32;	/* 32-bit big-endian signed integer. */
-typedef NumType<true, uint64_t> HBUINT64;	/* 64-bit big-endian unsigned integer. */
-typedef NumType<true, int64_t>  HBINT64;	/* 64-bit big-endian signed integer. */
 /* Note: we cannot defined a signed HBINT24 because there's no corresponding C type.
  * Works for unsigned, but not signed, since we rely on compiler for sign-extension. */
 typedef NumType<true, uint32_t, 3> HBUINT24;	/* 24-bit big-endian unsigned integer. */
@@ -128,8 +126,6 @@ typedef NumType<false, uint16_t> HBUINT16LE;	/* 16-bit little-endian unsigned in
 typedef NumType<false, int16_t>  HBINT16LE;	/* 16-bit little-endian signed integer. */
 typedef NumType<false, uint32_t> HBUINT32LE;	/* 32-bit little-endian unsigned integer. */
 typedef NumType<false, int32_t>  HBINT32LE;	/* 32-bit little-endian signed integer. */
-typedef NumType<false, uint64_t> HBUINT64LE;	/* 64-bit little-endian unsigned integer. */
-typedef NumType<false, int64_t>  HBINT64LE;	/* 64-bit little-endian signed integer. */
 
 typedef NumType<true,  float>  HBFLOAT32BE;	/* 32-bit little-endian floating point number. */
 typedef NumType<true,  double> HBFLOAT64BE;	/* 64-bit little-endian floating point number. */
@@ -526,9 +522,16 @@ struct OffsetTo : Offset<OffsetType, has_null>
     return_trace (sanitize_shallow (c, base) &&
 		  hb_barrier () &&
 		  (this->is_null () ||
-		   c->dispatch (StructAtOffset<Type> (base, *this), std::forward<Ts> (ds)...)));
+		   c->dispatch (StructAtOffset<Type> (base, *this), std::forward<Ts> (ds)...) ||
+		   neuter (c)));
   }
 
+  /* Set the offset to Null */
+  bool neuter (hb_sanitize_context_t *c) const
+  {
+    if (!has_null) return false;
+    return c->try_set (this, 0);
+  }
   DEFINE_SIZE_STATIC (sizeof (OffsetType));
 };
 /* Partial specializations. */
@@ -1275,22 +1278,11 @@ struct CFFIndex
     if (unlikely (!serialize_header (c, +it, data_size, min_off_size))) return_trace (false);
     unsigned char *ret = c->allocate_size<unsigned char> (data_size, false);
     if (unlikely (!ret)) return_trace (false);
-    unsigned remaining = data_size;
     for (const auto &_ : +it)
     {
       unsigned len = _.length;
-
       if (!len)
 	continue;
-
-      if (unlikely (len > remaining)) {
-        // We have more bytes to write then the computed data size, so the size calculation
-        // must have encountered overflow.
-        return_trace (c->check_success (false, HB_SERIALIZE_ERROR_INT_OVERFLOW));
-      }
-
-      remaining -= len;
-
       if (len <= 1)
       {
 	*ret++ = *_.arrayZ;
@@ -1726,9 +1718,6 @@ struct TupleValues
   }
 
   template <typename T>
-#ifndef HB_OPTIMIZE_SIZE
-  HB_ALWAYS_INLINE
-#endif
   static bool decompile (const HBUINT8 *&p /* IN/OUT */,
 			 hb_vector_t<T> &values /* IN/OUT */,
 			 const HBUINT8 *end,
@@ -1757,8 +1746,8 @@ struct TupleValues
 
       if ((control & VALUES_SIZE_MASK) == VALUES_ARE_ZEROS)
       {
-	hb_memset (&values.arrayZ[i], 0, (stop - i) * sizeof (T));
-	i = stop;
+        for (; i < stop; i++)
+          values.arrayZ[i] = 0;
       }
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_WORDS)
       {
@@ -1817,7 +1806,7 @@ struct TupleValues
   {
     iter_t (const unsigned char *p_, unsigned len_)
 	    : p (p_), endp (p_ + len_)
-    { if (likely (ensure_run ())) read_value (); }
+    { if (ensure_run ()) read_value (); }
 
     private:
     const unsigned char *p;
@@ -1826,14 +1815,10 @@ struct TupleValues
     signed run_count = 0;
     unsigned width = 0;
 
-    HB_ALWAYS_INLINE
     bool ensure_run ()
     {
       if (likely (run_count > 0)) return true;
-      return _ensure_run ();
-    }
-    bool _ensure_run ()
-    {
+
       if (unlikely (p >= endp))
       {
         run_count = 0;
@@ -1923,15 +1908,10 @@ struct TupleValues
     signed run_count = 0;
     unsigned width = 0;
 
-    HB_ALWAYS_INLINE
     bool ensure_run ()
     {
-      if (likely (run_count > 0)) return true;
-      return _ensure_run ();
-    }
+      if (run_count > 0) return true;
 
-    bool _ensure_run ()
-    {
       if (unlikely (p >= end))
       {
         run_count = 0;
@@ -1959,7 +1939,6 @@ struct TupleValues
       return true;
     }
 
-    public:
     void skip (unsigned n)
     {
       while (n)
@@ -1973,7 +1952,6 @@ struct TupleValues
       }
     }
 
-    private:
     template <bool scaled>
     void _add_to (hb_array_t<float> out, float scale = 1.0f)
     {
@@ -2048,11 +2026,16 @@ struct TupleValues
     public:
     void add_to (hb_array_t<float> out, float scale = 1.0f)
     {
+      unsigned n = out.length;
+
+      if (scale == 0.0f)
+      {
+        skip (n);
+	return;
+      }
+
 #ifndef HB_OPTIMIZE_SIZE
-      // The following branch is supposed to speed things up by avoiding
-      // the multiplication in _add_to<> if scale is 1.0f.
-      // But in practice it seems to bloat the code and slow things down.
-      if (false && scale == 1.0f)
+      if (scale == 1.0f)
         _add_to<false> (out);
       else
 #endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
index 6765c557..294b2b60 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
@@ -237,6 +237,8 @@ struct CmapSubtableFormat0
 
 struct CmapSubtableFormat4
 {
+
+
   template<typename Iterator,
       typename Writer,
 	   hb_requires (hb_is_iterator (Iterator))>
@@ -519,10 +521,9 @@ struct CmapSubtableFormat4
   struct accelerator_t
   {
     accelerator_t () {}
-    accelerator_t (const CmapSubtableFormat4 *subtable) = delete;
+    accelerator_t (const CmapSubtableFormat4 *subtable) { init (subtable); }
 
-    void init (const CmapSubtableFormat4 *subtable,
-	       unsigned int              subtable_data_size)
+    void init (const CmapSubtableFormat4 *subtable)
     {
       segCount = subtable->segCountX2 / 2;
       endCount = subtable->values.arrayZ;
@@ -530,11 +531,7 @@ struct CmapSubtableFormat4
       idDelta = startCount + segCount;
       idRangeOffset = idDelta + segCount;
       glyphIdArray = idRangeOffset + segCount;
-
-      unsigned int values_offset = 16 + 8 * segCount;
-      glyphIdArrayLength = subtable_data_size > values_offset
-			   ? (subtable_data_size - values_offset) / 2
-			   : 0;
+      glyphIdArrayLength = (subtable->length - 16 - 8 * segCount) / 2;
     }
 
     bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
@@ -674,36 +671,23 @@ struct CmapSubtableFormat4
     unsigned int glyphIdArrayLength;
   };
 
-  bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph,
-		  unsigned int subtable_data_size) const
+  bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
   {
-    accelerator_t accel;
-    accel.init (this, subtable_data_size);
+    accelerator_t accel (this);
     return accel.get_glyph_func (&accel, codepoint, glyph);
   }
-  bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
-  { return false; }
-
-  void collect_unicodes (hb_set_t *out, unsigned int subtable_data_size) const
+  void collect_unicodes (hb_set_t *out) const
   {
-    accelerator_t accel;
-    accel.init (this, subtable_data_size);
+    accelerator_t accel (this);
     accel.collect_unicodes (out);
   }
-  void collect_unicodes (hb_set_t *out) const
-  { collect_unicodes (out, length); }
 
   void collect_mapping (hb_set_t *unicodes, /* OUT */
-			hb_map_t *mapping, /* OUT */
-			unsigned int subtable_data_size) const
+			hb_map_t *mapping /* OUT */) const
   {
-    accelerator_t accel;
-    accel.init (this, subtable_data_size);
+    accelerator_t accel (this);
     accel.collect_mapping (unicodes, mapping);
   }
-  void collect_mapping (hb_set_t *unicodes, /* OUT */
-			hb_map_t *mapping /* OUT */) const
-  { collect_mapping (unicodes, mapping, length); }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -712,9 +696,23 @@ struct CmapSubtableFormat4
       return_trace (false);
     hb_barrier ();
 
-    return_trace (c->check_range (values, 2 + 4 * segCountX2));
+    if (unlikely (!c->check_range (this, length)))
+    {
+      /* Some broken fonts have too long of a "length" value.
+       * If that is the case, just change the value to truncate
+       * the subtable at the end of the blob. */
+      uint16_t new_length = (uint16_t) hb_min ((uintptr_t) 65535,
+					       (uintptr_t) (c->end -
+							    (char *) this));
+      if (!c->try_set (&length, new_length))
+	return_trace (false);
+    }
+
+    return_trace (16 + 4 * (unsigned int) segCountX2 <= length);
   }
 
+
+
   protected:
   HBUINT16	format;		/* Format number is set to 4. */
   HBUINT16	length;		/* This is the length in bytes of the
@@ -1496,14 +1494,11 @@ struct CmapSubtable
   /* Note: We intentionally do NOT implement subtable formats 2 and 8. */
 
   bool get_glyph (hb_codepoint_t codepoint,
-		  hb_codepoint_t *glyph,
-		  unsigned int subtable_data_size = 0) const
+		  hb_codepoint_t *glyph) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case  0: hb_barrier (); return u.format0 .get_glyph (codepoint, glyph);
-    case  4: hb_barrier (); return subtable_data_size
-				      ? u.format4.get_glyph (codepoint, glyph, subtable_data_size)
-				      : false;
+    case  4: hb_barrier (); return u.format4 .get_glyph (codepoint, glyph);
     case  6: hb_barrier (); return u.format6 .get_glyph (codepoint, glyph);
     case 10: hb_barrier (); return u.format10.get_glyph (codepoint, glyph);
     case 12: hb_barrier (); return u.format12.get_glyph (codepoint, glyph);
@@ -1512,17 +1507,11 @@ struct CmapSubtable
     default: return false;
     }
   }
-  void collect_unicodes (hb_set_t *out,
-			 unsigned int num_glyphs = UINT_MAX,
-			 unsigned int subtable_data_size = 0) const
+  void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case  0: hb_barrier (); u.format0 .collect_unicodes (out); return;
-    case  4: hb_barrier (); if (subtable_data_size)
-			      u.format4.collect_unicodes (out, subtable_data_size);
-			    else
-			      u.format4.collect_unicodes (out);
-			    return;
+    case  4: hb_barrier (); u.format4 .collect_unicodes (out); return;
     case  6: hb_barrier (); u.format6 .collect_unicodes (out); return;
     case 10: hb_barrier (); u.format10.collect_unicodes (out); return;
     case 12: hb_barrier (); u.format12.collect_unicodes (out, num_glyphs); return;
@@ -1534,16 +1523,11 @@ struct CmapSubtable
 
   void collect_mapping (hb_set_t *unicodes, /* OUT */
 			hb_map_t *mapping, /* OUT */
-			unsigned num_glyphs = UINT_MAX,
-			unsigned int subtable_data_size = 0) const
+			unsigned num_glyphs = UINT_MAX) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case  0: hb_barrier (); u.format0 .collect_mapping (unicodes, mapping); return;
-    case  4: hb_barrier (); if (subtable_data_size)
-			      u.format4.collect_mapping (unicodes, mapping, subtable_data_size);
-			    else
-			      u.format4.collect_mapping (unicodes, mapping);
-			    return;
+    case  4: hb_barrier (); u.format4 .collect_mapping (unicodes, mapping); return;
     case  6: hb_barrier (); u.format6 .collect_mapping (unicodes, mapping); return;
     case 10: hb_barrier (); u.format10.collect_mapping (unicodes, mapping); return;
     case 12: hb_barrier (); u.format12.collect_mapping (unicodes, mapping, num_glyphs); return;
@@ -1555,7 +1539,7 @@ struct CmapSubtable
 
   unsigned get_language () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case  0: hb_barrier (); return u.format0 .get_language ();
     case  4: hb_barrier (); return u.format4 .get_language ();
     case  6: hb_barrier (); return u.format6 .get_language ();
@@ -1586,9 +1570,9 @@ struct CmapSubtable
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case  0: hb_barrier (); return_trace (u.format0 .sanitize (c));
     case  4: hb_barrier (); return_trace (u.format4 .sanitize (c));
     case  6: hb_barrier (); return_trace (u.format6 .sanitize (c));
@@ -1602,7 +1586,7 @@ struct CmapSubtable
 
   public:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   CmapSubtableFormat0	format0;
   CmapSubtableFormat4	format4;
   CmapSubtableFormat6	format6;
@@ -1612,7 +1596,7 @@ struct CmapSubtable
   CmapSubtableFormat14	format14;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 
@@ -1658,7 +1642,7 @@ struct EncodingRecord
       CmapSubtable *cmapsubtable = c->push<CmapSubtable> ();
       unsigned origin_length = c->length ();
       cmapsubtable->serialize (c, it, format, plan, &(base+subtable));
-      if (c->length () > origin_length && !c->in_error()) *objidx = c->pop_pack ();
+      if (c->length () - origin_length > 0 && !c->in_error()) *objidx = c->pop_pack ();
       else c->pop_discard ();
     }
 
@@ -1687,7 +1671,6 @@ struct SubtableUnicodesCache {
  private:
   hb_blob_ptr_t<cmap> base_blob;
   const char* base;
-  unsigned int table_length;
   hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> cached_unicodes;
 
  public:
@@ -1696,10 +1679,6 @@ struct SubtableUnicodesCache {
   {
     SubtableUnicodesCache* cache =
         (SubtableUnicodesCache*) hb_malloc (sizeof(SubtableUnicodesCache));
-
-    if (unlikely (!cache))
-      return nullptr;
-
     new (cache) SubtableUnicodesCache (source_table);
     return cache;
   }
@@ -1712,18 +1691,15 @@ struct SubtableUnicodesCache {
     hb_free (cache);
   }
 
-  SubtableUnicodesCache(const void* cmap_base,
-			unsigned int table_length_ = 0)
+  SubtableUnicodesCache(const void* cmap_base)
       : base_blob(),
         base ((const char*) cmap_base),
-        table_length (table_length_),
         cached_unicodes ()
   {}
 
   SubtableUnicodesCache(hb_blob_ptr_t<cmap> base_blob_)
       : base_blob(base_blob_),
         base ((const char *) base_blob.get()),
-        table_length (base_blob.get_length ()),
         cached_unicodes ()
   {}
 
@@ -1754,10 +1730,7 @@ struct SubtableUnicodesCache {
       if (unlikely (s->in_error ()))
 	return hb_set_get_empty ();
 
-      unsigned int subtable_data_size = record->subtable < table_length
-					? table_length - (unsigned int) record->subtable
-					: 0;
-      (base+record->subtable).collect_unicodes (s, UINT_MAX, subtable_data_size);
+      (base+record->subtable).collect_unicodes (s);
 
       if (unlikely (!cached_unicodes.set ((unsigned) ((const char *) record - base), hb::unique_ptr<hb_set_t> {s})))
         return hb_set_get_empty ();
@@ -1769,7 +1742,7 @@ struct SubtableUnicodesCache {
 
 };
 
-static inline uint16_t
+static inline uint_fast16_t
 _hb_symbol_pua_map (unsigned codepoint)
 {
   if (codepoint <= 0x00FFu)
@@ -1799,10 +1772,6 @@ struct cmap
     ;
 
     SubtableUnicodesCache* cache = SubtableUnicodesCache::create(source_table);
-
-    if (unlikely (!cache))
-      return nullptr;
-
     for (const EncodingRecord& _ : it)
       cache->set_for(&_); // populate the cache for this encoding record.
 
@@ -1816,8 +1785,7 @@ struct cmap
 		  EncodingRecIter encodingrec_iter,
 		  const void *base,
 		  hb_subset_plan_t *plan,
-	                  bool drop_format_4 = false,
-			  unsigned int source_table_length = 0)
+                  bool drop_format_4 = false)
   {
     if (unlikely (!c->extend_min ((*this))))  return false;
     this->version = 0;
@@ -1825,7 +1793,7 @@ struct cmap
     unsigned format4objidx = 0, format12objidx = 0, format14objidx = 0;
     auto snap = c->snapshot ();
 
-    SubtableUnicodesCache local_unicodes_cache (base, source_table_length);
+    SubtableUnicodesCache local_unicodes_cache (base);
     const SubtableUnicodesCache* unicodes_cache = &local_unicodes_cache;
 
     if (plan->accelerator &&
@@ -1838,7 +1806,7 @@ struct cmap
       if (c->in_error ())
         return false;
 
-      unsigned format = (base+_.subtable).u.format.v;
+      unsigned format = (base+_.subtable).u.format;
       if (format != 4 && format != 12 && format != 14) continue;
 
       const hb_set_t* unicodes_set = unicodes_cache->set_for (&_, local_unicodes_cache);
@@ -1854,8 +1822,7 @@ struct cmap
                             encodingrec_iter,
                             base,
                             plan,
-                            true,
-			    source_table_length);
+                            true);
         }
       }
 
@@ -1872,11 +1839,9 @@ struct cmap
       }
       else if (format == 14) c->copy (_, it, 14u, base, plan, &format14objidx);
     }
-        unsigned length = c->length ();
-        unsigned available = length > cmap::min_size ? length - cmap::min_size : 0;
-        c->check_assign(this->encodingRecord.len,
-                        available / EncodingRecord::static_size,
-                        HB_SERIALIZE_ERROR_INT_OVERFLOW);
+    c->check_assign(this->encodingRecord.len,
+                    (c->length () - cmap::min_size)/EncodingRecord::static_size,
+                    HB_SERIALIZE_ERROR_INT_OVERFLOW);
 
     // Fail if format 4 was dropped and there is no cmap12.
     return !drop_format_4 || format12objidx;
@@ -1943,7 +1908,7 @@ struct cmap
     + hb_iter (encodingRecord)
     | hb_map (&EncodingRecord::subtable)
     | hb_map (hb_add (this))
-    | hb_filter ([&] (const CmapSubtable& _) { return _.u.format.v == 14; })
+    | hb_filter ([&] (const CmapSubtable& _) { return _.u.format == 14; })
     | hb_apply ([=] (const CmapSubtable& _) { _.u.format14.closure_glyphs (unicodes, glyphset); })
     ;
   }
@@ -1968,7 +1933,7 @@ struct cmap
 
     for (const EncodingRecord& _ : encodingrec_iter)
     {
-      unsigned format = (this + _.subtable).u.format.v;
+      unsigned format = (this + _.subtable).u.format;
       if (format == 12) has_format12 = true;
 
       const EncodingRecord *table = std::addressof (_);
@@ -1991,9 +1956,7 @@ struct cmap
                                          it,
                                          encodingrec_iter,
                                          this,
-                                         c->plan,
-					 false,
-					 c->source_blob->length));
+                                         c->plan));
   }
 
   const CmapSubtable *find_best_subtable (bool *symbol = nullptr,
@@ -2058,7 +2021,7 @@ struct cmap
       this->subtable_uvs = &Null (CmapSubtableFormat14);
       {
 	const CmapSubtable *st = table->find_subtable (0, 5);
-	if (st && st->u.format.v == 14)
+	if (st && st->u.format == 14)
 	  subtable_uvs = &st->u.format14;
       }
 
@@ -2072,65 +2035,37 @@ struct cmap
 
       this->get_glyph_data = subtable;
 #ifndef HB_NO_CMAP_LEGACY_SUBTABLES
-      bool is_format4 = subtable->u.format.v == 4;
-      auto set_format4_getter = [this] (bool (*func) (const void *,
-						      hb_codepoint_t,
-						      hb_codepoint_t *))
-      {
-	this->format4_accel.init (&this->subtable->u.format4,
-				  get_subtable_data_size (this->subtable));
-	this->get_glyph_data = &this->format4_accel;
-	this->get_glyph_funcZ = func;
-      };
       if (unlikely (symbol))
       {
 	switch ((unsigned) face->table.OS2->get_font_page ()) {
 	case OS2::font_page_t::FONT_PAGE_NONE:
-	  if (is_format4)
-	    set_format4_getter (get_glyph_from_symbol<CmapSubtableFormat4::accelerator_t, _hb_symbol_pua_map>);
-	  else
-	    this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_symbol_pua_map>;
+	  this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_symbol_pua_map>;
 	  break;
 #ifndef HB_NO_OT_SHAPER_ARABIC_FALLBACK
 	case OS2::font_page_t::FONT_PAGE_SIMP_ARABIC:
-	  if (is_format4)
-	    set_format4_getter (get_glyph_from_symbol<CmapSubtableFormat4::accelerator_t, _hb_arabic_pua_simp_map>);
-	  else
-	    this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_arabic_pua_simp_map>;
+	  this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_arabic_pua_simp_map>;
 	  break;
 	case OS2::font_page_t::FONT_PAGE_TRAD_ARABIC:
-	  if (is_format4)
-	    set_format4_getter (get_glyph_from_symbol<CmapSubtableFormat4::accelerator_t, _hb_arabic_pua_trad_map>);
-	  else
-	    this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_arabic_pua_trad_map>;
+	  this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_arabic_pua_trad_map>;
 	  break;
 #endif
 	default:
-	  if (is_format4)
-	    set_format4_getter (get_glyph_from<CmapSubtableFormat4::accelerator_t>);
-	  else
-	    this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
+	  this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
 	  break;
 	}
       }
       else if (unlikely (macroman))
       {
-	if (is_format4)
-	  set_format4_getter (get_glyph_from_macroman<CmapSubtableFormat4::accelerator_t>);
-	else
-	  this->get_glyph_funcZ = get_glyph_from_macroman<CmapSubtable>;
+	this->get_glyph_funcZ = get_glyph_from_macroman<CmapSubtable>;
       }
       else if (unlikely (mac))
       {
-	if (is_format4)
-	  set_format4_getter (get_glyph_from_ascii<CmapSubtableFormat4::accelerator_t>);
-	else
-	  this->get_glyph_funcZ = get_glyph_from_ascii<CmapSubtable>;
+	this->get_glyph_funcZ = get_glyph_from_ascii<CmapSubtable>;
       }
       else
 #endif
       {
-	switch (subtable->u.format.v) {
+	switch (subtable->u.format) {
 	  /* Accelerate format 4 and format 12. */
 	  default:
 	    this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
@@ -2140,8 +2075,7 @@ struct cmap
 	    break;
 	  case  4:
 	  {
-	    this->format4_accel.init (&subtable->u.format4,
-				      get_subtable_data_size (subtable));
+	    this->format4_accel.init (&subtable->u.format4);
 	    this->get_glyph_data = &this->format4_accel;
 	    this->get_glyph_funcZ = this->format4_accel.get_glyph_func;
 	    break;
@@ -2222,10 +2156,10 @@ struct cmap
     }
 
     void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const
-    { subtable->collect_unicodes (out, num_glyphs, get_subtable_data_size (subtable)); }
+    { subtable->collect_unicodes (out, num_glyphs); }
     void collect_mapping (hb_set_t *unicodes, hb_map_t *mapping,
 			  unsigned num_glyphs = UINT_MAX) const
-    { subtable->collect_mapping (unicodes, mapping, num_glyphs, get_subtable_data_size (subtable)); }
+    { subtable->collect_mapping (unicodes, mapping, num_glyphs); }
     void collect_variation_selectors (hb_set_t *out) const
     { subtable_uvs->collect_variation_selectors (out); }
     void collect_variation_unicodes (hb_codepoint_t variation_selector,
@@ -2236,7 +2170,7 @@ struct cmap
     typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
 					      hb_codepoint_t codepoint,
 					      hb_codepoint_t *glyph);
-    typedef uint16_t (*hb_pua_remap_func_t) (unsigned);
+    typedef uint_fast16_t (*hb_pua_remap_func_t) (unsigned);
 
     template <typename Type>
     HB_INTERNAL static bool get_glyph_from (const void *obj,
@@ -2284,21 +2218,6 @@ struct cmap
       return c && typed_obj->get_glyph (c, glyph);
     }
 
-    unsigned int get_subtable_data_size (const CmapSubtable *subtable) const
-    {
-      unsigned int table_length = this->table.get_length ();
-      uintptr_t table_start = (uintptr_t) (const void *) this->table.get ();
-      uintptr_t subtable_addr = (uintptr_t) (const void *) subtable;
-      if (unlikely (subtable_addr < table_start))
-	return 0;
-
-      uintptr_t subtable_offset = subtable_addr - table_start;
-      if (unlikely (subtable_offset >= table_length))
-	return 0;
-
-      return table_length - (unsigned int) subtable_offset;
-    }
-
     private:
     hb_nonnull_ptr_t<const CmapSubtable> subtable;
     hb_nonnull_ptr_t<const CmapSubtableFormat14> subtable_uvs;
@@ -2353,7 +2272,7 @@ struct cmap
         (_.platformID == 0 && _.encodingID == 4) ||
         (_.platformID == 3 && _.encodingID == 1) ||
         (_.platformID == 3 && _.encodingID == 10) ||
-        (cmap + _.subtable).u.format.v == 14;
+        (cmap + _.subtable).u.format == 14;
   }
 
   protected:
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-color.cc b/engine/thirdparty/harfbuzz/src/hb-ot-color.cc
index 34cdedb6..1436fe56 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-color.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-color.cc
@@ -35,9 +35,7 @@
 #include "OT/Color/COLR/COLR.hh"
 #include "OT/Color/CPAL/CPAL.hh"
 #include "OT/Color/sbix/sbix.hh"
-#ifndef HB_NO_SVG
 #include "OT/Color/svg/svg.hh"
-#endif
 
 
 /**
@@ -276,7 +274,6 @@ hb_ot_color_glyph_get_layers (hb_face_t           *face,
  * SVG
  */
 
-#ifndef HB_NO_SVG
 /**
  * hb_ot_color_has_svg:
  * @face: #hb_face_t to work upon.
@@ -293,70 +290,6 @@ hb_ot_color_has_svg (hb_face_t *face)
   return face->table.SVG->has_data ();
 }
 
-/**
- * hb_ot_color_get_svg_document_count:
- * @face: #hb_face_t to work upon.
- *
- * Gets the number of SVG documents in the face `SVG` table.
- *
- * Return value: number of SVG documents in the face.
- *
- * Since: 12.1.0
- */
-unsigned int
-hb_ot_color_get_svg_document_count (hb_face_t *face)
-{
-  return face->table.SVG->get_document_count ();
-}
-
-/**
- * hb_ot_color_glyph_get_svg_document_index:
- * @face: #hb_face_t to work upon.
- * @glyph: glyph ID to query.
- * @svg_document_index: (out) (nullable): output SVG document index.
- *
- * Gets the `SVG`-table document index associated with a glyph.
- *
- * Return value: `true` if @glyph maps to an SVG document, `false` otherwise.
- *
- * Since: 12.1.0
- */
-hb_bool_t
-hb_ot_color_glyph_get_svg_document_index (hb_face_t      *face,
-                                          hb_codepoint_t  glyph,
-                                          unsigned int   *svg_document_index)
-{
-  unsigned doc_index = 0;
-  hb_bool_t ret = face->table.SVG->get_glyph_document_index (glyph, &doc_index);
-  if (ret && svg_document_index)
-    *svg_document_index = doc_index;
-  return ret;
-}
-
-/**
- * hb_ot_color_get_svg_document_glyph_range:
- * @face: #hb_face_t to work upon.
- * @svg_document_index: SVG document index.
- * @start_glyph_id: (out) (nullable): output start glyph ID.
- * @end_glyph_id: (out) (nullable): output end glyph ID.
- *
- * Gets the glyph range covered by an `SVG`-table document index.
- *
- * Return value: `true` if @svg_document_index is valid, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_ot_color_get_svg_document_glyph_range (hb_face_t      *face,
-                                          unsigned int    svg_document_index,
-                                          hb_codepoint_t *start_glyph_id,
-                                          hb_codepoint_t *end_glyph_id)
-{
-  return face->table.SVG->get_document_glyph_range (svg_document_index,
-                                                    start_glyph_id,
-                                                    end_glyph_id);
-}
-
 /**
  * hb_ot_color_glyph_reference_svg:
  * @face: #hb_face_t to work upon
@@ -375,7 +308,6 @@ hb_ot_color_glyph_reference_svg (hb_face_t *face, hb_codepoint_t glyph)
 {
   return face->table.SVG->reference_blob_for_glyph (glyph);
 }
-#endif
 
 
 /*
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-color.h b/engine/thirdparty/harfbuzz/src/hb-ot-color.h
index eae339f8..22ee497e 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-color.h
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-color.h
@@ -136,20 +136,6 @@ hb_ot_color_glyph_has_paint (hb_face_t      *face,
 HB_EXTERN hb_bool_t
 hb_ot_color_has_svg (hb_face_t *face);
 
-HB_EXTERN unsigned int
-hb_ot_color_get_svg_document_count (hb_face_t *face);
-
-HB_EXTERN hb_bool_t
-hb_ot_color_glyph_get_svg_document_index (hb_face_t      *face,
-                                          hb_codepoint_t  glyph,
-                                          unsigned int   *svg_document_index /* OUT */);
-
-HB_EXTERN hb_bool_t
-hb_ot_color_get_svg_document_glyph_range (hb_face_t      *face,
-                                          unsigned int    svg_document_index,
-                                          hb_codepoint_t *start_glyph_id, /* OUT */
-                                          hb_codepoint_t *end_glyph_id /* OUT */);
-
 HB_EXTERN hb_blob_t *
 hb_ot_color_glyph_reference_svg (hb_face_t *face, hb_codepoint_t glyph);
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh b/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
index 9047b288..afc8aa47 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
@@ -140,10 +140,8 @@ HB_OT_ACCELERATOR (OT, COLR)
 HB_OT_CORE_TABLE (OT, CPAL)
 HB_OT_ACCELERATOR (OT, CBDT)
 HB_OT_ACCELERATOR (OT, sbix)
-#ifndef HB_NO_SVG
 HB_OT_ACCELERATOR (OT, SVG)
 #endif
-#endif
 
 /* OpenType math. */
 #ifndef HB_NO_MATH
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-font.cc b/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
index bc43f5f0..76c4bf28 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
@@ -937,9 +937,7 @@ hb_ot_paint_glyph_or_fail (hb_font_t *font,
 {
 #ifndef HB_NO_COLOR
   if (font->face->table.COLR->paint_glyph (font, glyph, paint_funcs, paint_data, palette, foreground)) return true;
-#ifndef HB_NO_SVG
   if (font->face->table.SVG->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
-#endif
 #ifndef HB_NO_OT_FONT_BITMAP
   if (font->face->table.CBDT->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
   if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
index 229c6d2f..d951e005 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
@@ -306,8 +306,8 @@ struct kern
 {
   static constexpr hb_tag_t tableTag = HB_OT_TAG_kern;
 
-  bool     has_data () const { return u.version32.v; }
-  unsigned get_type () const { return u.major.v; }
+  bool     has_data () const { return u.version32; }
+  unsigned get_type () const { return u.major; }
 
   bool has_state_machine () const
   {
@@ -363,7 +363,7 @@ struct kern
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.version32.v.sanitize (c)) return_trace (false);
+    if (!u.version32.sanitize (c)) return_trace (false);
     hb_barrier ();
     return_trace (dispatch (c));
   }
@@ -406,15 +406,15 @@ struct kern
 
   protected:
   union {
-  struct { HBUINT32 v; }	version32;
-  struct { HBUINT16 v; }	major;
+  HBUINT32		version32;
+  HBUINT16		major;
   KernOT		ot;
 #ifndef HB_NO_AAT_SHAPE
   KernAAT		aat;
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (4, version32.v);
+  DEFINE_SIZE_UNION (4, version32);
 };
 
 struct kern_accelerator_t : kern::accelerator_t {
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
index 2470e7e2..b0d4412f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
@@ -165,13 +165,13 @@ struct BaseCoordFormat3
 
 struct BaseCoord
 {
-  bool has_data () const { return u.format.v; }
+  bool has_data () const { return u.format; }
 
   hb_position_t get_coord (hb_font_t            *font,
 			   const ItemVariationStore &var_store,
 			   hb_direction_t        direction) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.get_coord (font, direction);
     case 2: hb_barrier (); return u.format2.get_coord (font, direction);
     case 3: hb_barrier (); return u.format3.get_coord (font, var_store, direction);
@@ -181,7 +181,7 @@ struct BaseCoord
 
   void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 3: hb_barrier (); u.format3.collect_variation_indices (varidx_set); return;
     default:return;
     }
@@ -190,9 +190,9 @@ struct BaseCoord
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -203,9 +203,9 @@ struct BaseCoord
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.format.v.sanitize (c))) return_trace (false);
+    if (unlikely (!u.format.sanitize (c))) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
@@ -215,13 +215,13 @@ struct BaseCoord
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;
+  HBUINT16		format;
   BaseCoordFormat1	format1;
   BaseCoordFormat2	format2;
   BaseCoordFormat3	format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 struct FeatMinMaxRecord
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
index a9c03db3..b4ae21ba 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
@@ -828,9 +828,46 @@ struct Feature
 		 const Record_sanitize_closure_t *closure = nullptr) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) &&
-		  featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE) &&
-		  lookupIndex.sanitize (c));
+    if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
+      return_trace (false);
+    hb_barrier ();
+
+    /* Some earlier versions of Adobe tools calculated the offset of the
+     * FeatureParams subtable from the beginning of the FeatureList table!
+     *
+     * If sanitizing "failed" for the FeatureParams subtable, try it with the
+     * alternative location.  We would know sanitize "failed" if old value
+     * of the offset was non-zero, but it's zeroed now.
+     *
+     * Only do this for the 'size' feature, since at the time of the faulty
+     * Adobe tools, only the 'size' feature had FeatureParams defined.
+     */
+
+    if (likely (featureParams.is_null ()))
+      return_trace (true);
+
+    unsigned int orig_offset = featureParams;
+    if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)))
+      return_trace (false);
+    hb_barrier ();
+
+    if (featureParams == 0 && closure &&
+	closure->tag == HB_TAG ('s','i','z','e') &&
+	closure->list_base && closure->list_base < this)
+    {
+      unsigned int new_offset_int = orig_offset -
+				    (((char *) this) - ((char *) closure->list_base));
+
+      Offset16To<FeatureParams> new_offset;
+      /* Check that it would not overflow. */
+      new_offset = new_offset_int;
+      if (new_offset == new_offset_int &&
+	  c->try_set (&featureParams, new_offset_int) &&
+	  !featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))
+	return_trace (false);
+    }
+
+    return_trace (true);
   }
 
   Offset16To<FeatureParams>
@@ -1396,7 +1433,7 @@ struct Lookup
     if (unlikely (!get_subtables<TSubTable> ().sanitize (c, this, get_type ())))
       return_trace (false);
 
-    if (unlikely (get_type () == TSubTable::Extension))
+    if (unlikely (get_type () == TSubTable::Extension && !c->get_edit_count ()))
     {
       hb_barrier ();
 
@@ -1404,6 +1441,11 @@ struct Lookup
        * have the same type, which shall not be the Extension type
        * itself (but we already checked for that).
        * This is specially important if one has a reverse type!
+       *
+       * We only do this if sanitizer edit_count is zero.  Otherwise,
+       * some of the subtables might have become insane after they
+       * were sanity-checked by the edits of subsequent subtables.
+       * https://bugs.chromium.org/p/chromium/issues/detail?id=960331
        */
       unsigned int type = get_subtable<TSubTable> (0).u.extension.get_type ();
       for (unsigned int i = 1; i < subtables; i++)
@@ -2033,7 +2075,7 @@ struct ClassDef
   unsigned int get (hb_codepoint_t k) const { return get_class (k); }
   unsigned int get_class (hb_codepoint_t glyph_id) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.get_class (glyph_id);
     case 2: hb_barrier (); return u.format2.get_class (glyph_id);
 #ifndef HB_NO_BEYOND_64K
@@ -2055,7 +2097,7 @@ struct ClassDef
 
   unsigned get_population () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.get_population ();
     case 2: hb_barrier (); return u.format2.get_population ();
 #ifndef HB_NO_BEYOND_64K
@@ -2108,7 +2150,7 @@ struct ClassDef
 
 #ifndef HB_NO_BEYOND_64K
     if (glyph_max > 0xFFFFu)
-      u.format.v += 2;
+      u.format += 2;
     if (unlikely (glyph_max > 0xFFFFFFu))
 #else
     if (unlikely (glyph_max > 0xFFFFu))
@@ -2118,9 +2160,9 @@ struct ClassDef
       return_trace (false);
     }
 
-    u.format.v = format;
+    u.format = format;
 
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return_trace (u.format1.serialize (c, it));
     case 2: hb_barrier (); return_trace (u.format2.serialize (c, it));
@@ -2139,7 +2181,7 @@ struct ClassDef
                const Coverage* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
     case 2: hb_barrier (); return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
 #ifndef HB_NO_BEYOND_64K
@@ -2153,9 +2195,9 @@ struct ClassDef
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
 #ifndef HB_NO_BEYOND_64K
@@ -2168,7 +2210,7 @@ struct ClassDef
 
   unsigned cost () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.cost ();
     case 2: hb_barrier (); return u.format2.cost ();
 #ifndef HB_NO_BEYOND_64K
@@ -2184,7 +2226,7 @@ struct ClassDef
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.collect_coverage (glyphs);
     case 2: hb_barrier (); return u.format2.collect_coverage (glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2200,7 +2242,7 @@ struct ClassDef
   template <typename set_t>
   bool collect_class (set_t *glyphs, unsigned int klass) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.collect_class (glyphs, klass);
     case 2: hb_barrier (); return u.format2.collect_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
@@ -2213,7 +2255,7 @@ struct ClassDef
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.intersects (glyphs);
     case 2: hb_barrier (); return u.format2.intersects (glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2225,7 +2267,7 @@ struct ClassDef
   }
   bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.intersects_class (glyphs, klass);
     case 2: hb_barrier (); return u.format2.intersects_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
@@ -2238,7 +2280,7 @@ struct ClassDef
 
   void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
     case 2: hb_barrier (); return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2251,7 +2293,7 @@ struct ClassDef
 
   void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.intersected_classes (glyphs, intersect_classes);
     case 2: hb_barrier (); return u.format2.intersected_classes (glyphs, intersect_classes);
 #ifndef HB_NO_BEYOND_64K
@@ -2265,7 +2307,7 @@ struct ClassDef
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16			format;		/* Format identifier */
   ClassDefFormat1_3<SmallTypes>	format1;
   ClassDefFormat2_4<SmallTypes>	format2;
 #ifndef HB_NO_BEYOND_64K
@@ -2274,7 +2316,7 @@ struct ClassDef
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 template<typename Iterator>
@@ -2543,13 +2585,13 @@ struct SparseVarRegionAxis
 struct hb_scalar_cache_t
 {
   private:
-  static constexpr unsigned STATIC_LENGTH = 128;
+  static constexpr unsigned STATIC_LENGTH = 16;
   static constexpr int INVALID = INT_MIN;
   static constexpr float MULTIPLIER = 1 << ((sizeof (int) * 8) - 2);
   static constexpr float DIVISOR = 1.f / MULTIPLIER;
 
   public:
-  hb_scalar_cache_t () {}
+  hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); }
 
   hb_scalar_cache_t (const hb_scalar_cache_t&) = delete;
   hb_scalar_cache_t (hb_scalar_cache_t&&) = delete;
@@ -2561,9 +2603,8 @@ struct hb_scalar_cache_t
   {
     if (!count) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t);
 
-    if (scratch_cache && count <= STATIC_LENGTH)
+    if (scratch_cache && count <= scratch_cache->length)
     {
-      scratch_cache->length = count;
       scratch_cache->clear ();
       return scratch_cache;
     }
@@ -2587,17 +2628,7 @@ struct hb_scalar_cache_t
   void clear ()
   {
     auto *values = &static_values[0];
-    unsigned i = 0;
-#ifndef HB_OPTIMIZE_SIZE
-    for (; i + 3 < length; i += 4)
-    {
-      values[i + 0] = INVALID;
-      values[i + 1] = INVALID;
-      values[i + 2] = INVALID;
-      values[i + 3] = INVALID;
-    }
-#endif
-    for (; i < length; i++)
+    for (unsigned i = 0; i < length; i++)
       values[i] = INVALID;
   }
 
@@ -2611,17 +2642,12 @@ struct hb_scalar_cache_t
     }
     auto *values = &static_values[0];
     auto *cached_value = &values[i];
-    // Super hot. Most common path is that we have a cached value of 0.
-    int v = *cached_value;
-    if (likely (!v))
+    if (*cached_value != INVALID)
     {
-      *value = 0.f;
+      *value = *cached_value ? *cached_value * DIVISOR : 0.f;
       return true;
     }
-    if (v == INVALID)
-      return false;
-    *value = v * DIVISOR;
-    return true;
+    return false;
   }
 
   HB_ALWAYS_INLINE
@@ -2971,9 +2997,7 @@ struct VarData
     }
 
     if (unlikely (!c->extend_min (this))) return_trace (false);
-    if (unlikely (!c->check_assign (itemCount, row_count,
-                                    HB_SERIALIZE_ERROR_INT_OVERFLOW)))
-      return_trace (false);
+    itemCount = row_count;
 
     int min_threshold = has_long ? -65536 : -128;
     int max_threshold = has_long ? +65535 : +127;
@@ -3259,24 +3283,12 @@ struct MultiVarData
 
     auto values_iter = deltaSets.fetcher (inner);
     unsigned regionCount = regionIndices.len;
-    unsigned skip = 0;
     for (unsigned regionIndex = 0; regionIndex < regionCount; regionIndex++)
     {
       float scalar = regions.evaluate (regionIndices.arrayZ[regionIndex],
 				       coords, coord_count,
 				       cache);
-      // We skip lazily. Helps with the tail end.
-      if (scalar == 0.0f)
-        skip += out.length;
-      else
-      {
-        if (skip)
-	{
-	  values_iter.skip (skip);
-	  skip = 0;
-	}
-	values_iter.add_to (out, scalar);
-      }
+      values_iter.add_to (out, scalar);
     }
   }
 
@@ -3751,8 +3763,8 @@ struct DeltaSetIndexMap
   {
     TRACE_SERIALIZE (this);
     unsigned length = plan.get_output_map ().length;
-    u.format.v = length <= 0xFFFF ? 0 : 1;
-    switch (u.format.v) {
+    u.format = length <= 0xFFFF ? 0 : 1;
+    switch (u.format) {
     case 0: hb_barrier (); return_trace (u.format0.serialize (c, plan));
     case 1: hb_barrier (); return_trace (u.format1.serialize (c, plan));
     default:return_trace (false);
@@ -3761,7 +3773,7 @@ struct DeltaSetIndexMap
 
   uint32_t map (unsigned v) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return (u.format0.map (v));
     case 1: hb_barrier (); return (u.format1.map (v));
     default:return v;
@@ -3770,7 +3782,7 @@ struct DeltaSetIndexMap
 
   unsigned get_map_count () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return u.format0.get_map_count ();
     case 1: hb_barrier (); return u.format1.get_map_count ();
     default:return 0;
@@ -3779,7 +3791,7 @@ struct DeltaSetIndexMap
 
   unsigned get_width () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return u.format0.get_width ();
     case 1: hb_barrier (); return u.format1.get_width ();
     default:return 0;
@@ -3788,7 +3800,7 @@ struct DeltaSetIndexMap
 
   unsigned get_inner_bit_count () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return u.format0.get_inner_bit_count ();
     case 1: hb_barrier (); return u.format1.get_inner_bit_count ();
     default:return 0;
@@ -3798,9 +3810,9 @@ struct DeltaSetIndexMap
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     default:return_trace (true);
@@ -3810,7 +3822,7 @@ struct DeltaSetIndexMap
   DeltaSetIndexMap* copy (hb_serialize_context_t *c) const
   {
     TRACE_SERIALIZE (this);
-    switch (u.format.v) {
+    switch (u.format) {
     case 0: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c)));
     case 1: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c)));
     default:return_trace (nullptr);
@@ -3819,12 +3831,12 @@ struct DeltaSetIndexMap
 
   protected:
   union {
-  struct { HBUINT8 v; }             format;         /* Format identifier */
+  HBUINT8                            format;         /* Format identifier */
   DeltaSetIndexMapFormat01<HBUINT16> format0;
   DeltaSetIndexMapFormat01<HBUINT32> format1;
   } u;
   public:
-  DEFINE_SIZE_UNION (1, format.v);
+  DEFINE_SIZE_UNION (1, format);
 };
 
 
@@ -4056,7 +4068,7 @@ struct ConditionValue
   bool evaluate (const int *coords, unsigned int coord_len,
 		 Instancer *instancer) const
   {
-    float value = defaultValue;
+    signed value = defaultValue;
     value += (*instancer)[varIdx];
     return value > 0;
   }
@@ -4227,7 +4239,7 @@ struct Condition
   bool evaluate (const int *coords, unsigned int coord_len,
 		 Instancer *instancer) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.evaluate (coords, coord_len, instancer);
     case 2: hb_barrier (); return u.format2.evaluate (coords, coord_len, instancer);
     case 3: hb_barrier (); return u.format3.evaluate (coords, coord_len, instancer);
@@ -4240,7 +4252,7 @@ struct Condition
   Cond_with_Var_flag_t keep_with_variations (hb_collect_feature_substitutes_with_var_context_t *c,
                                              hb_map_t *condition_map /* OUT */) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.keep_with_variations (c, condition_map);
     // TODO(subset)
     default: c->apply = false; return KEEP_COND_WITH_VAR;
@@ -4250,9 +4262,9 @@ struct Condition
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -4265,9 +4277,9 @@ struct Condition
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.v.sanitize (c)) return_trace (false);
+    if (!u.format.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
@@ -4279,7 +4291,7 @@ struct Condition
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   ConditionAxisRange	format1;
   ConditionValue	format2;
   ConditionAnd		format3;
@@ -4287,7 +4299,7 @@ struct Condition
   ConditionNegate	format5;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 template <typename Instancer>
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
index 1f24376e..3f4737b3 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
@@ -582,12 +582,11 @@ struct skipping_iterator_t
 #endif
   bool next (unsigned *unsafe_to = nullptr)
   {
-    auto *info = c->buffer->info;
     const signed stop = (signed) end - 1;
     while ((signed) idx < stop)
     {
       idx++;
-      switch (match (info[idx]))
+      switch (match (c->buffer->info[idx]))
       {
 	case MATCH:
 	{
@@ -613,12 +612,11 @@ struct skipping_iterator_t
 #endif
   bool prev (unsigned *unsafe_from = nullptr)
   {
-    auto *out_info = c->buffer->out_info;
     const unsigned stop = 0;
     while (idx > stop)
     {
       idx--;
-      switch (match (out_info[idx]))
+      switch (match (c->buffer->out_info[idx]))
       {
 	case MATCH:
 	{
@@ -743,10 +741,6 @@ struct hb_ot_apply_context_t :
 
   hb_vector_t<uint32_t> match_positions;
   uint32_t stack_match_positions[8];
-#ifndef HB_NO_BUFFER_MESSAGE
-  hb_buffer_t::changed_func_t orig_changed_func = nullptr;
-  void *orig_changed_data = nullptr;
-#endif
 
   hb_ot_apply_context_t (unsigned int table_index_,
 			 hb_font_t *font_,
@@ -777,30 +771,6 @@ struct hb_ot_apply_context_t :
   {
     init_iters ();
     match_positions.set_storage (stack_match_positions);
-
-#ifndef HB_NO_BUFFER_MESSAGE
-    if (buffer->messaging ())
-    {
-      assert (buffer->changed_func == nullptr ||
-	      buffer->changed_func == buffer_changed_trampoline);
-      orig_changed_func = buffer->changed_func;
-      orig_changed_data = buffer->changed_data;
-      buffer->changed_func = buffer_changed_trampoline;
-      buffer->changed_data = this;
-    }
-#endif
-  }
-  ~hb_ot_apply_context_t ()
-  {
-#ifndef HB_NO_BUFFER_MESSAGE
-    if (buffer->messaging ())
-    {
-      assert (buffer->changed_func == buffer_changed_trampoline);
-      assert (buffer->changed_data == this);
-      buffer->changed_func = orig_changed_func;
-      buffer->changed_data = orig_changed_data;
-    }
-#endif
   }
 
   void init_iters ()
@@ -816,11 +786,7 @@ struct hb_ot_apply_context_t :
   void set_random (bool random_) { random = random_; }
   void set_recurse_func (recurse_func_t func) { recurse_func = func; }
   void set_lookup_index (unsigned int lookup_index_) { lookup_index = lookup_index_; }
-  void set_lookup_props (unsigned int lookup_props_)
-  {
-    lookup_props = gdef_accel.sanitize_lookup_props (lookup_props_);
-    init_iters ();
-  }
+  void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; init_iters (); }
 
   uint32_t random_number ()
   {
@@ -829,18 +795,6 @@ struct hb_ot_apply_context_t :
     return buffer->random_state;
   }
 
-  static void buffer_changed_trampoline (hb_buffer_t *buffer HB_UNUSED, void *user_data)
-  {
-    ((hb_ot_apply_context_t *) user_data)->buffer_changed ();
-  }
-  void buffer_changed ()
-  {
-    buffer->update_digest ();
-    if (likely (has_glyph_classes))
-      for (unsigned i = 0; i < buffer->len; i++)
-	_set_glyph_class_props (buffer->info[i]);
-  }
-
   HB_ALWAYS_INLINE
   HB_HOT
   bool match_properties_mark (const hb_glyph_info_t *info,
@@ -877,7 +831,7 @@ struct hb_ot_apply_context_t :
     if (glyph_props & match_props & LookupFlag::IgnoreFlags)
       return false;
 
-    if (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK)
+    if (unlikely (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK))
       return match_properties_mark (info, glyph_props, match_props);
 
     return true;
@@ -910,7 +864,8 @@ struct hb_ot_apply_context_t :
       props |= HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED;
     if (likely (has_glyph_classes))
     {
-      _set_glyph_class_props (buffer->cur(), props, glyph_index);
+      props &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE;
+      _hb_glyph_info_set_glyph_props (&buffer->cur(), props | gdef_accel.get_glyph_props (glyph_index));
     }
     else if (class_guess)
     {
@@ -920,19 +875,6 @@ struct hb_ot_apply_context_t :
     else
       _hb_glyph_info_set_glyph_props (&buffer->cur(), props);
   }
-  void _set_glyph_class_props (hb_glyph_info_t &info,
-			       unsigned int props,
-			       hb_codepoint_t glyph_index)
-  {
-    props &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE;
-    _hb_glyph_info_set_glyph_props (&info, props | gdef_accel.get_glyph_props (glyph_index));
-  }
-  void _set_glyph_class_props (hb_glyph_info_t &info)
-  {
-    _set_glyph_class_props (info,
-			    _hb_glyph_info_get_glyph_props (&info),
-			    info.codepoint);
-  }
 
   void replace_glyph (hb_codepoint_t glyph_index)
   {
@@ -1370,19 +1312,10 @@ static bool match_input (hb_ot_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  hb_buffer_t *buffer = c->buffer;
-
-  if (count == 1)
-  {
-    *end_position = buffer->idx + 1;
-    c->match_positions[0] = buffer->idx;
-    if (p_total_component_count)
-      *p_total_component_count = _hb_glyph_info_get_lig_num_comps (&buffer->cur());
-    return_trace (true);
-  }
-
   if (unlikely (count > HB_MAX_CONTEXT_LENGTH)) return_trace (false);
 
+  hb_buffer_t *buffer = c->buffer;
+
   auto &skippy_iter = c->iter_input;
   skippy_iter.reset (buffer->idx);
   skippy_iter.set_match_func (match_func, match_data);
@@ -1627,12 +1560,6 @@ static bool match_backtrack (hb_ot_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  if (!count)
-  {
-    *match_start = c->buffer->backtrack_len ();
-    return_trace (true);
-  }
-
   auto &skippy_iter = c->iter_context;
   skippy_iter.reset_back (c->buffer->backtrack_len ());
   skippy_iter.set_match_func (match_func, match_data);
@@ -1666,12 +1593,6 @@ static bool match_lookahead (hb_ot_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  if (!count)
-  {
-    *end_index = start_index;
-    return_trace (true);
-  }
-
   auto &skippy_iter = c->iter_context;
   assert (start_index >= 1);
   skippy_iter.reset (start_index - 1);
@@ -2052,12 +1973,13 @@ static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
 }
 
 template <typename HBUINT>
-static inline bool context_apply_lookup (hb_ot_apply_context_t *c,
-					 unsigned int inputCount, /* Including the first glyph (not matched) */
-					 const HBUINT input[], /* Array of input values--start with second glyph */
-					 unsigned int lookupCount,
-					 const LookupRecord lookupRecord[],
-					 const ContextApplyLookupContext &lookup_context)
+HB_ALWAYS_INLINE
+static bool context_apply_lookup (hb_ot_apply_context_t *c,
+				  unsigned int inputCount, /* Including the first glyph (not matched) */
+				  const HBUINT input[], /* Array of input values--start with second glyph */
+				  unsigned int lookupCount,
+				  const LookupRecord lookupRecord[],
+				  const ContextApplyLookupContext &lookup_context)
 {
   if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
 
@@ -2324,29 +2246,24 @@ struct RuleSet
      *
      * Replicated from LigatureSet::apply(). */
 
-    /* We use the iter_context instead of iter_input, to avoid skipping
-     * default-ignorables and such.
-     *
-     * Related: https://github.com/harfbuzz/harfbuzz/issues/4813
-     */
-    auto &skippy_iter = c->iter_context;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
-    unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0;
+    unsigned unsafe_to = (unsigned) -1, unsafe_to1 = 0, unsafe_to2 = 0;
     hb_glyph_info_t *first = nullptr, *second = nullptr;
     bool matched = skippy_iter.next ();
     if (likely (matched))
     {
+      first = &c->buffer->info[skippy_iter.idx];
+      unsafe_to = skippy_iter.idx + 1;
+
       if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
       {
 	/* Can't use the fast path if eg. the next char is a default-ignorable
 	 * or other skippable. */
         goto slow;
       }
-
-      first = &c->buffer->info[skippy_iter.idx];
-      unsafe_to1 = skippy_iter.idx + 1;
     }
     else
     {
@@ -2362,15 +2279,8 @@ struct RuleSet
       ;
     }
     matched = skippy_iter.next ();
-    if (likely (matched))
+    if (likely (matched && !skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])))
     {
-      if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
-      {
-	/* Can't use the fast path if eg. the next char is a default-ignorable
-	 * or other skippable. */
-        goto slow;
-      }
-
       second = &c->buffer->info[skippy_iter.idx];
       unsafe_to2 = skippy_iter.idx + 1;
     }
@@ -2407,15 +2317,6 @@ struct RuleSet
       {
 	if (unsafe_to == (unsigned) -1)
 	  unsafe_to = unsafe_to1;
-
-	// Skip ahead to next possible first glyph match.
-	for (; i + 1 < num_rules; i++)
-	{
-	  const auto &r2 = this+rule.arrayZ[i + 1];
-	  const auto &input2 = r2.inputZ;
-	  if (r2.inputCount <= 1 || input2.arrayZ[0] != input.arrayZ[0])
-	    break;
-	}
       }
     }
     if (likely (unsafe_to != (unsigned) -1))
@@ -2765,30 +2666,12 @@ struct ContextFormat2_5
     return context_cache_func (c, op);
   }
 
-  struct external_cache_t
-  {
-    hb_ot_layout_binary_cache_t coverage;
-  };
-  void *external_cache_create () const
-  {
-    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
-    if (likely (cache))
-    {
-      cache->coverage.clear ();
-    }
-    return cache;
-  }
-  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, true, external_cache); }
-  bool apply (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, false, external_cache); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached, void *external_cache) const
+  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache HB_UNUSED) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
-#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    external_cache_t *cache = (external_cache_t *) external_cache;
-    unsigned int index = (this+coverage).get_coverage_binary (c->buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
-#else
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-#endif
     if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &class_def = this+classDef;
@@ -3043,9 +2926,9 @@ struct Context
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -3059,7 +2942,7 @@ struct Context
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16			format;		/* Format identifier */
   ContextFormat1_4<SmallTypes>	format1;
   ContextFormat2_5<SmallTypes>	format2;
   ContextFormat3		format3;
@@ -3193,16 +3076,17 @@ static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c
 }
 
 template <typename HBUINT>
-static inline bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
-					       unsigned int backtrackCount,
-					       const HBUINT backtrack[],
-					       unsigned int inputCount, /* Including the first glyph (not matched) */
-					       const HBUINT input[], /* Array of input values--start with second glyph */
-					       unsigned int lookaheadCount,
-					       const HBUINT lookahead[],
-					       unsigned int lookupCount,
-					       const LookupRecord lookupRecord[],
-					       const ChainContextApplyLookupContext &lookup_context)
+HB_ALWAYS_INLINE
+static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
+					unsigned int backtrackCount,
+					const HBUINT backtrack[],
+					unsigned int inputCount, /* Including the first glyph (not matched) */
+					const HBUINT input[], /* Array of input values--start with second glyph */
+					unsigned int lookaheadCount,
+					const HBUINT lookahead[],
+					unsigned int lookupCount,
+					const LookupRecord lookupRecord[],
+					const ChainContextApplyLookupContext &lookup_context)
 {
   if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
 
@@ -3520,29 +3404,33 @@ struct ChainRuleSet
      *
      * Replicated from LigatureSet::apply(). */
 
-    /* We use the iter_context instead of iter_input, to avoid skipping
-     * default-ignorables and such.
+    /* If the input skippy has non-auto joiners behavior (as in Indic shapers),
+     * skip this fast path, as we don't distinguish between input & lookahead
+     * matching in the fast path.
      *
-     * Related: https://github.com/harfbuzz/harfbuzz/issues/4813
+     * https://github.com/harfbuzz/harfbuzz/issues/4813
      */
-    auto &skippy_iter = c->iter_context;
+    if (!c->auto_zwnj || !c->auto_zwj)
+      goto slow;
+
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
-    unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0;
+    unsigned unsafe_to = (unsigned) -1, unsafe_to1 = 0, unsafe_to2 = 0;
     hb_glyph_info_t *first = nullptr, *second = nullptr;
     bool matched = skippy_iter.next ();
     if (likely (matched))
     {
+      first = &c->buffer->info[skippy_iter.idx];
+      unsafe_to1 = skippy_iter.idx + 1;
+
       if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
       {
 	/* Can't use the fast path if eg. the next char is a default-ignorable
 	 * or other skippable. */
         goto slow;
       }
-
-      first = &c->buffer->info[skippy_iter.idx];
-      unsafe_to1 = skippy_iter.idx + 1;
     }
     else
     {
@@ -3563,15 +3451,8 @@ struct ChainRuleSet
       ;
     }
     matched = skippy_iter.next ();
-    if (likely (matched))
+    if (likely (matched && !skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])))
     {
-      if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
-      {
-	/* Can't use the fast path if eg. the next char is a default-ignorable
-	 * or other skippable. */
-        goto slow;
-      }
-
       second = &c->buffer->info[skippy_iter.idx];
       unsafe_to2 = skippy_iter.idx + 1;
     }
@@ -3618,18 +3499,6 @@ struct ChainRuleSet
       {
 	if (unsafe_to == (unsigned) -1)
 	  unsafe_to = unsafe_to1;
-
-	if (lenP1 > 1)
-	{
-	  // Skip ahead to next possible first glyph match.
-	  for (; i + 1 < num_rules; i++)
-	  {
-	    const auto &r2 = this+rule.arrayZ[i + 1];
-	    const auto &input2 = StructAfter<decltype (r2.inputX)> (r2.backtrack);
-	    if (input2.lenP1 <= 1 || input2.arrayZ[0] != input.arrayZ[0])
-	      break;
-	  }
-	}
       }
     }
     if (likely (unsafe_to != (unsigned) -1))
@@ -4005,30 +3874,12 @@ struct ChainContextFormat2_5
     return context_cache_func (c, op);
   }
 
-  struct external_cache_t
-  {
-    hb_ot_layout_binary_cache_t coverage;
-  };
-  void *external_cache_create () const
-  {
-    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
-    if (likely (cache))
-    {
-      cache->coverage.clear ();
-    }
-    return cache;
-  }
-  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, true, external_cache); }
-  bool apply (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, false, external_cache); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached, void *external_cache) const
+  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache HB_UNUSED) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
-#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    external_cache_t *cache = (external_cache_t *) external_cache;
-    unsigned int index = (this+coverage).get_coverage_binary (c->buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
-#else
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-#endif
     if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &backtrack_class_def = this+backtrackClassDef;
@@ -4376,9 +4227,9 @@ struct ChainContext
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -4392,7 +4243,7 @@ struct ChainContext
 
   protected:
   union {
-  struct { HBUINT16 v; }		format;	/* Format identifier */
+  HBUINT16				format;	/* Format identifier */
   ChainContextFormat1_4<SmallTypes>	format1;
   ChainContextFormat2_5<SmallTypes>	format2;
   ChainContextFormat3			format3;
@@ -4467,7 +4318,7 @@ struct Extension
 {
   unsigned int get_type () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.get_type ();
     default:return 0;
     }
@@ -4475,7 +4326,7 @@ struct Extension
   template <typename X>
   const X& get_subtable () const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.template get_subtable<typename T::SubTable> ();
     default:return Null (typename T::SubTable);
     }
@@ -4487,7 +4338,7 @@ struct Extension
   template <typename ...Ts>
   typename hb_subset_context_t::return_t dispatch (hb_subset_context_t *c, Ts&&... ds) const
   {
-    switch (u.format.v) {
+    switch (u.format) {
     case 1: hb_barrier (); return u.format1.subset (c);
     default: return c->default_return_value ();
     }
@@ -4496,9 +4347,9 @@ struct Extension
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
@@ -4506,7 +4357,7 @@ struct Extension
 
   protected:
   union {
-  struct { HBUINT16 v; }	format;		/* Format identifier */
+  HBUINT16		format;		/* Format identifier */
   ExtensionFormat1<T>	format1;
   } u;
 };
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
index 7b3b854d..e8d43180 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
@@ -580,8 +580,12 @@ hb_form_clusters (hb_buffer_t *buffer)
   if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_CONTINUATIONS))
     return;
 
-  foreach_grapheme (buffer, start, end)
-    buffer->merge_grapheme_clusters (start, end);
+  if (HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES (buffer->cluster_level))
+    foreach_grapheme (buffer, start, end)
+      buffer->merge_clusters (start, end);
+  else
+    foreach_grapheme (buffer, start, end)
+      buffer->unsafe_to_break (start, end);
 }
 
 static void
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-pua.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-pua.hh
index 7464e5d8..ba86772f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-pua.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-pua.hh
@@ -9,43 +9,41 @@
 #ifndef HB_OT_SHAPER_ARABIC_PUA_HH
 #define HB_OT_SHAPER_ARABIC_PUA_HH
 
-#include "hb.hh"
-
-#include <stdint.h>
-
-static const uint8_t _hb_arabic_pua_u8[453]=
+static const uint8_t
+_hb_arabic_u8[464] =
 {
-    0,  0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  3,  0,
-    4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  0,
+   84, 86, 85, 85, 85, 85, 85,213, 16, 34, 34, 34, 34, 34, 35, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 36, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 82, 16,  0,  0,  0,  0,  1,  2,  3,  4,
+    0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  7,
+    0,  0,  8,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21,  0,  0,  0, 22,  0, 23,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 16, 34, 34, 34, 35, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 66, 16, 50, 68, 68, 68, 68, 68, 68,
+   68, 68, 68, 68,101, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+   71, 68, 68, 68, 68, 68, 68, 68,152,186, 76, 77, 68,254, 16, 50,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  0,  0,  5,  6,
+    0,  0,  0,  0,  0,  0,  7,  8,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0, 10,  0,
+    0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  1,  2,  3,  4,  0,  0,  0,  5,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  6,  0,  7,  0,  0,  8,  0,  0,  0,  9,  0,  0,
-   10,  0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,  0,  0,  0,
-   22,  0, 23,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,
-   25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 33,
-    0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  0,
-    0,  0,  0,  0,  0,  0,  0, 33, 67,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,101,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,152,
-  186, 12, 13,  0,254,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  3,  4,
-    5,  0,  0,  6,  7,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,
-    0,  0,  0, 11,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,
-    0,  0, 13,  0,  0,  0,  0,  0, 14,  0,  0, 15, 16, 17, 18, 19,
-   20, 21, 22, 23,  1, 24, 25, 26, 27, 28,  1,  1, 29, 30, 31, 32,
-   33,  0,  0,  0,  0,  0,  0,  0, 34,  0,  0,  0, 35,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 36, 37, 38,  0,  0,  0,  0,  0,  0,
-    0, 39,  0,  0, 40, 41, 42,  0, 43, 44,  0,  0, 45, 46,  0, 47,
-   48, 49,  0,  0,  0,  0, 50,  0,  0, 51, 52,  0, 53, 54, 55, 56,
-   57, 58,  0,  0,  0,  0,  0, 59, 60, 61, 62, 63, 64,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 65,  0,  0, 66,  0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-   79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
-   95, 96, 97, 98, 99,
+    0,  0,  0, 13,  0,  0, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 23, 23, 29, 30, 31, 32, 33,  0,  0,  0,  0,
+    0,  0,  0, 34,  0,  0,  0, 35,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 36, 37, 38,  0,  0,  0,  0,  0,  0,  0, 39,  0,  0, 40,
+   41, 42,  0, 43, 44,  0,  0, 45, 46,  0, 47, 48, 49,  0,  0,  0,
+    0, 50,  0,  0, 51, 52,  0, 53, 54, 55, 56, 57, 58,  0,  0,  0,
+    0,  0, 59, 60, 61, 62, 63, 64,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0, 66,
+    0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+   84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
 };
-static const uint16_t _hb_arabic_pua_u16[717]=
+static const uint16_t
+_hb_arabic_u16[720] =
 {
       0,    0,    0,    0,    0,    0,    0,    0,61728,61729,61730,    0,    0,61733,    0,    0,
   61736,61737,61738,61739,61790,61741,61742,61743,61872,61873,61874,61875,61876,61877,61878,61879,
@@ -67,46 +65,52 @@ static const uint16_t _hb_arabic_pua_u16[717]=
   61808,61813,61813,61811,61812,61816,61816,61814,61815,61818,61818,61817,61817,61820,61820,61819,
   61819,61822,61822,61821,61821,61921,61921,61823,61823,61860,61859,61857,61858,61861,61861,61868,
   61867,61864,61863,61862,61862,61888,61889,61886,61887,61890,61891,61885,61884,    0,    0,    0,
-      0,61952,61952,61952,61952,61984,61985,61986,    0,    0,61989,    0,    0,61992,61993,61994,
-  61995,62046,61997,61998,61999,    0,    0,62010,62011,    0,62013,    0,62015,    0,    0,    0,
-  62043,    0,62045,    0,    0,    0,    0,    0,61987,    0,    0,    0,61988,    0,    0,    0,
-  61990,    0,    0,    0,61991,61996,    0,    0,    0,    0,    0,    0,62011,    0,    0,    0,
-  62015,    0,62165,62021,62019,62170,62023,62169,62017,62028,62161,62032,62036,62040,62048,62052,
-  62053,62055,62057,62059,62064,62068,62072,62078,62114,62115,62122,62126,61952,62047,62130,62134,
-  62138,62142,62146,62150,62154,62155,62164,62160,62183,62184,62187,62180,62181,62186,62185,62182,
-  61952,61952,61952,61952,    0,62000,62001,62002,62003,62004,62005,62006,62007,62008,62009,    0,
-  62046,62046,    0,    0,    0,61964,61965,61966,61967,62012,62014,    0,    0,61954,    0,61981,
-      0,    0,    0,61955,    0,61982,    0,61956,    0,    0,    0,62111,    0,    0,    0,    0,
-  61970,61971,61972,61957,    0,61980,    0,    0,    0,    0,    0,61958,    0,61983,    0,    0,
-      0,    0,    0,62191,    0,62188,62189,62192,    0,    0,    0,61973,    0,    0,62098,    0,
-      0,61974,    0,    0,62099,    0,    0,62101,    0,    0,61975,    0,    0,62100,    0,    0,
-      0,62080,62081,62082,62102,    0,62083,62084,62085,62103,    0,    0,    0,62106,    0,62107,
-      0,62108,    0,    0,    0,61976,    0,    0,    0,    0,62086,62087,62088,62109,61978,62089,
-  62090,62091,62110,62093,62094,    0,62104,    0,    0,    0,    0,62095,62096,62097,62105,    0,
-      0,61977,    0,    0,    0,    0,    0,62075,62077,61968,    0,    0,    0,    0,62021,62022,
-  62019,62020,62170,62171,62023,62024,62169,62168,62166,62167,62017,62018,62028,62027,62025,62026,
-  62161,62162,62032,62031,62029,62030,62036,62035,62033,62034,62040,62039,62037,62038,62048,62044,
-  62041,62042,62052,62051,62049,62050,62053,62054,62055,62056,62057,62058,62059,62060,62064,62063,
-  62061,62062,62068,62067,62065,62066,62072,62071,62069,62070,62078,62076,62073,62074,62114,62113,
-  62079,62193,62118,62117,62115,62116,62122,62121,62119,62120,62126,62125,62123,62124,62130,62129,
-  62127,62128,62134,62133,62131,62132,62138,62137,62135,62136,62142,62141,62139,62140,62146,62145,
-  62143,62144,62150,62149,62147,62148,62154,62153,62151,62152,62155,62156,62164,62163,62160,62159,
-  62157,62158,62176,62177,62174,62175,62178,62179,62172,62173,    0,    0,    0,
+      0,    0,    0,    0,61984,61985,61986,    0,    0,61989,    0,    0,61992,61993,61994,61995,
+  62046,61997,61998,61999,    0,    0,62010,62011,    0,62013,    0,62015,    0,    0,    0,62043,
+      0,62045,    0,    0,    0,    0,    0,61987,    0,    0,    0,61988,    0,    0,    0,61990,
+      0,    0,    0,61991,61996,    0,    0,    0,    0,    0,    0,62011,    0,    0,    0,62015,
+      0,62165,62021,62019,62170,62023,62169,62017,62028,62161,62032,62036,62040,62048,62052,62053,
+  62055,62057,62059,62064,62068,62072,62078,62114,62115,62122,62126,61952,61952,61952,61952,61952,
+  62047,62130,62134,62138,62142,62146,62150,62154,62155,62164,62160,62183,62184,62187,62180,62181,
+  62186,62185,62182,61952,61952,61952,61952,    0,62000,62001,62002,62003,62004,62005,62006,62007,
+  62008,62009,    0,62046,62046,    0,    0,    0,61964,61965,61966,61967,62012,62014,    0,    0,
+  61954,    0,61981,    0,    0,    0,61955,    0,61982,    0,61956,    0,    0,    0,62111,    0,
+      0,    0,    0,61970,61971,61972,61957,    0,61980,    0,    0,    0,    0,    0,61958,    0,
+  61983,    0,    0,    0,    0,    0,62191,    0,62188,62189,62192,    0,    0,    0,61973,    0,
+      0,62098,    0,    0,61974,    0,    0,62099,    0,    0,62101,    0,    0,61975,    0,    0,
+  62100,    0,    0,    0,62080,62081,62082,62102,    0,62083,62084,62085,62103,    0,    0,    0,
+  62106,    0,62107,    0,62108,    0,    0,    0,61976,    0,    0,    0,    0,62086,62087,62088,
+  62109,61978,62089,62090,62091,62110,62093,62094,    0,62104,    0,    0,    0,    0,62095,62096,
+  62097,62105,    0,    0,61977,    0,    0,    0,    0,    0,62075,62077,61968,    0,    0,    0,
+      0,62021,62022,62019,62020,62170,62171,62023,62024,62169,62168,62166,62167,62017,62018,62028,
+  62027,62025,62026,62161,62162,62032,62031,62029,62030,62036,62035,62033,62034,62040,62039,62037,
+  62038,62048,62044,62041,62042,62052,62051,62049,62050,62053,62054,62055,62056,62057,62058,62059,
+  62060,62064,62063,62061,62062,62068,62067,62065,62066,62072,62071,62069,62070,62078,62076,62073,
+  62074,62114,62113,62079,62193,62118,62117,62115,62116,62122,62121,62119,62120,62126,62125,62123,
+  62124,62130,62129,62127,62128,62134,62133,62131,62132,62138,62137,62135,62136,62142,62141,62139,
+  62140,62146,62145,62143,62144,62150,62149,62147,62148,62154,62153,62151,62152,62155,62156,62164,
+  62163,62160,62159,62157,62158,62176,62177,62174,62175,62178,62179,62172,62173,    0,    0,    0,
 };
 
-static inline uint8_t _hb_arabic_pua_b4 (const uint8_t* a, unsigned i)
+static inline unsigned
+_hb_arabic_b2 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1)<<2))&15;
+  return (a[i>>2]>>((i&3u)<<1))&3u;
 }
-static inline uint16_t _hb_arabic_pua_simp_map (unsigned u)
+static inline unsigned
+_hb_arabic_b4 (const uint8_t* a, unsigned i)
 {
-  /* packtab: [2^2,2^4,2^4,2^3] */
-  return u<65277u ? (uint16_t)(_hb_arabic_pua_u16[((_hb_arabic_pua_u8[31u+((_hb_arabic_pua_b4(_hb_arabic_pua_u8,((((13835058055282164225ULL>>((((((((u)>>3))>>4))>>4))<<1))&3))<<4)+((((((u)>>3))>>4))&15)))<<4)+((((u)>>3))&15)])<<3)+((u)&7)]) : 0;
+  return (a[i>>1]>>((i&1u)<<2))&15u;
 }
-static inline uint16_t _hb_arabic_pua_trad_map (unsigned u)
+static inline uint_fast16_t
+_hb_arabic_pua_simp_map (unsigned u)
 {
-  /* packtab: [2^4,2^4,2^4,2^2] */
-  return u<65277u ? (uint16_t)(_hb_arabic_pua_u16[317u+((_hb_arabic_pua_u8[197u+((_hb_arabic_pua_b4(_hb_arabic_pua_u8+159u,((_hb_arabic_pua_b4(_hb_arabic_pua_u8+127u,((((((u)>>2))>>4))>>4)))<<4)+((((((u)>>2))>>4))&15)))<<4)+((((u)>>2))&15)])<<2)+((u)&3)]) : 0;
+  return u<65277u?_hb_arabic_u16[((_hb_arabic_u8[40+(((_hb_arabic_b4(8+_hb_arabic_u8,((_hb_arabic_b2(_hb_arabic_u8,u>>3>>4>>4))<<4)+((u>>3>>4)&15u)))<<4)+((u>>3)&15u))])<<3)+((u)&7u)]:0;
+}
+static inline uint_fast16_t
+_hb_arabic_pua_trad_map (unsigned u)
+{
+  return u<65277u?_hb_arabic_u16[320+(((_hb_arabic_u8[208+(((_hb_arabic_b4(168+_hb_arabic_u8,((_hb_arabic_b4(136+_hb_arabic_u8,u>>2>>4>>4))<<4)+((u>>2>>4)&15u)))<<4)+((u>>2)&15u))])<<2)+((u)&3u))]:0;
 }
 
 #endif /* HB_OT_SHAPER_ARABIC_PUA_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-table.hh
index 39da24b8..09289d27 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-table.hh
@@ -16,77 +16,222 @@
 #ifndef HB_OT_SHAPER_ARABIC_TABLE_HH
 #define HB_OT_SHAPER_ARABIC_TABLE_HH
 
-#include "hb.hh"
 
-#include <stdint.h>
+#define A	JOINING_GROUP_ALAPH
+#define DR	JOINING_GROUP_DALATH_RISH
+#define C	JOINING_TYPE_C
+#define D	JOINING_TYPE_D
+#define L	JOINING_TYPE_L
+#define R	JOINING_TYPE_R
+#define T	JOINING_TYPE_T
+#define U	JOINING_TYPE_U
+#define X	JOINING_TYPE_X
 
-static const uint8_t _hb_arabic_joining_u8[737]=
+static const uint8_t joining_table[] =
 {
-    0, 16,  2,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 96,135,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,
-    0,  0,  0,  8, 16, 24, 32, 40, 48,  0, 56,  0, 64, 72, 80,  0,
-    0,  0,  0, 88, 96,104,  0,  0,  0,  0,  0,112,120,  0,  0,  0,
-    0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,  0,
-    0,144,  0,  0,  0,  0,  0,152,  0,  0,  0,  0,  0,  0,160,168,
-  176,184,192,  0,  0,200,208,  0,  0,  0,  0,  0,  0,  0,  0,216,
-  224,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0, 10, 11, 12,
-    1,  1, 13,  0,  0,  0, 14, 15,  1,  1,  2,  2,  4,  1,  1,  1,
-    1, 16, 17, 18,  3,  0, 19,  0, 20,  0, 21, 22, 23,  1, 24,  0,
-    0,  0, 25,  1, 26,  1, 27, 28,  4,  0, 29,  1,  1,  1, 30,  0,
-   31, 32,  5, 33, 34, 35, 36,  2,  2, 37, 38,  6,  0,  1, 39, 40,
-    5,  1,  7,  0,  0, 41,  0,  0,  0, 42, 43,  0,  0,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  7, 44,  1,  1,  1,  1, 45,  0,
-    0,  0, 46,  0,  0,  0, 47,  0,  0,  0,  0,  0,  0, 48,  6,  0,
-    0,  1,  1,  1,  1,  1,  1, 49,  0, 50, 51, 52, 53, 54, 55,  0,
-    0, 56, 57, 58,  0,  0, 59,  0,  0, 60,  1,  1,  1, 61,  0,  0,
-    0, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-    1, 64,  0, 65,  0,  0,  0, 66,  1, 67,  0,  0,  0,  0,  0, 68,
-   69, 70, 71,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    3,  0,  3,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,
-    1, 72, 73,  0,  0,  0,  0,  0,  0,119,119,119,119, 51, 51, 51,
-   51, 34, 34, 34, 34,119,119,  7,119, 34, 51, 51, 51, 35, 51, 51,
-   51,  0,119,119,119,115,119,119,119,  0,  0,  0,119,112,  7,119,
-  119,  3, 34, 34, 35, 35, 51, 51, 35, 34, 50, 51, 51, 50,115,119,
-  119,119,119,119, 51, 39, 34, 32, 34, 50, 35, 34, 34, 34, 34, 35,
-   35, 51, 34, 39,119,119,119,119, 34,119, 51,115, 55,119,119,119,
-  103,116, 51, 83, 37, 34, 51, 51, 50, 50, 53, 50, 83,119,119, 39,
-   51, 35, 34, 51, 51, 51, 35, 50, 51, 35, 35, 50, 51,119, 51, 51,
-   51, 51,115,119,119,119,115,119,119, 50, 51, 51, 34, 51, 51, 50,
-   34,114,119,119,119,  3, 51, 51, 32, 35,114,119,119, 34, 50, 51,
-    3, 48, 51, 51, 50, 51, 34,  2, 50, 35, 50, 51, 51,119,112,119,
-  119,119,119,119, 48,119,115,119,112,  0,  0, 96, 54,115,115,119,
-  119,119,119, 48,119,119,119,119,  7,119,119,119,  0, 51,  1,119,
-  119, 51, 51, 35, 32, 32,  2, 16, 34, 34, 50, 51, 19, 51, 51, 35,
-   51, 35,  0,114,119,119, 55, 51, 35, 35, 35, 34, 51, 35, 51, 50,
-   34, 35,119,119,119, 39, 34, 50,  3, 49, 51, 51, 51, 51, 50,119,
-  119,119, 50,115, 51, 51, 35, 51, 51, 51, 51,  3,119, 55, 51,114,
-  119, 51, 51, 34, 51, 51,119,119,119,  3, 51, 34,  2, 35, 50, 35,
-   51, 48, 34,  3,  0, 32, 19,119,119, 51, 51,119,119,119,103,119,
-  119,
-};
 
-static inline uint8_t _hb_arabic_joining_b4 (const uint8_t* a, unsigned i)
-{
-  return (a[i>>1]>>((i&1)<<2))&15;
-}
-static inline uint8_t _hb_arabic_joining_joining_type (unsigned u)
-{
-  /* packtab: [2^4,2^3,2^3,2^3] */
-  return u<125260u ? (uint8_t)(_hb_arabic_joining_b4(_hb_arabic_joining_u8+441u,((_hb_arabic_joining_u8[209u+_hb_arabic_joining_u8[123u+((_hb_arabic_joining_b4(_hb_arabic_joining_u8,((((((u)>>3))>>3))>>3)))<<3)+((((((u)>>3))>>3))&7)]+((((u)>>3))&7)])<<3)+((u)&7))) : 7;
-}
+#define joining_offset_0x0600u 0
+
+  /* Arabic */
+
+  /* 0600 */ U,U,U,U,U,U,X,X,U,X,X,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 0620 */ D,U,R,R,R,R,D,R,D,R,D,D,D,D,D,R,R,R,R,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 0640 */ C,D,D,D,D,D,D,D,R,D,D,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 0660 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,D,D,X,R,R,R,U,R,R,R,D,D,D,D,D,D,D,D,
+  /* 0680 */ D,D,D,D,D,D,D,D,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,D,D,D,D,D,D,
+  /* 06A0 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 06C0 */ R,D,D,R,R,R,R,R,R,R,R,R,D,R,D,R,D,D,R,R,X,R,X,X,X,X,X,X,X,U,X,X,
+  /* 06E0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,R,R,X,X,X,X,X,X,X,X,X,X,D,D,D,X,X,D,
+
+  /* Syriac */
+
+  /* 0700 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,T,A,X,D,D,D,DR,DR,R,R,R,D,D,D,D,R,D,
+  /* 0720 */ D,D,D,D,D,D,D,D,R,D,DR,D,R,D,D,DR,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 0740 */ X,X,X,X,X,X,X,X,X,X,X,X,X,R,D,D,
+
+  /* Arabic Supplement */
+
+  /* 0740 */                                 D,D,D,D,D,D,D,D,D,R,R,R,D,D,D,D,
+  /* 0760 */ D,D,D,D,D,D,D,D,D,D,D,R,R,D,D,D,D,R,D,R,R,D,D,D,R,R,D,D,D,D,D,D,
+
+  /* FILLER */
+
+  /* 0780 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 07A0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+
+  /* NKo */
+
+  /* 07C0 */ X,X,X,X,X,X,X,X,X,X,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 07E0 */ D,D,D,D,D,D,D,D,D,D,D,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,C,X,X,X,X,X,
+
+  /* FILLER */
+
+  /* 0800 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 0820 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+
+  /* Mandaic */
+
+  /* 0840 */ R,D,D,D,D,D,R,R,D,R,D,D,D,D,D,D,D,D,D,D,R,D,R,R,R,X,X,X,X,X,X,X,
+
+  /* Syriac Supplement */
+
+  /* 0860 */ D,U,D,D,D,D,U,R,D,R,R,X,X,X,X,X,
+
+  /* Arabic Extended-B */
+
+  /* 0860 */                                 R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,
+  /* 0880 */ R,R,R,C,C,C,D,U,U,D,D,D,D,D,R,D,U,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+
+  /* Arabic Extended-A */
+
+  /* 08A0 */ D,D,D,D,D,D,D,D,D,D,R,R,R,U,R,D,D,R,R,D,D,D,D,D,D,R,D,D,D,D,D,D,
+  /* 08C0 */ D,D,D,D,D,D,D,D,D,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 08E0 */ X,X,U,
+
+#define joining_offset_0x1806u 739
+
+  /* Mongolian */
+
+  /* 1800 */             U,D,X,X,C,X,X,X,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 1820 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 1840 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 1860 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,X,X,X,X,X,X,X,
+  /* 1880 */ U,U,U,U,U,T,T,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 18A0 */ D,D,D,D,D,D,D,D,D,X,D,
+
+#define joining_offset_0x200cu 904
+
+  /* General Punctuation */
+
+  /* 2000 */                         U,C,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 2020 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 2040 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 2060 */ X,X,X,X,X,X,U,U,U,U,
+
+#define joining_offset_0xa840u 998
+
+  /* Phags-pa */
+
+  /* A840 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* A860 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,L,U,
+
+#define joining_offset_0x10ac0u 1050
+
+  /* Manichaean */
+
+  /* 10AC0 */ D,D,D,D,D,R,U,R,U,R,R,U,U,L,R,R,R,R,R,D,D,D,D,L,D,D,D,D,D,R,D,D,
+  /* 10AE0 */ D,R,U,U,R,X,X,X,X,X,X,D,D,D,D,R,
+
+#define joining_offset_0x10b80u 1098
+
+  /* Psalter Pahlavi */
+
+  /* 10B80 */ D,R,D,R,R,R,D,D,D,R,D,D,R,D,R,R,D,R,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 10BA0 */ X,X,X,X,X,X,X,X,X,R,R,R,R,D,D,U,
+
+#define joining_offset_0x10d00u 1146
+
+  /* Hanifi Rohingya */
+
+  /* 10D00 */ L,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 10D20 */ D,D,R,D,
+
+#define joining_offset_0x10ec2u 1182
+
+  /* Arabic Extended-C */
+
+  /* 10EC0 */     R,D,D,X,D,D,
+
+#define joining_offset_0x10f30u 1188
+
+  /* Sogdian */
+
+  /* 10F20 */                                 D,D,D,R,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 10F40 */ D,D,D,D,D,U,X,X,X,X,X,X,X,X,X,X,X,D,D,D,R,X,X,X,X,X,X,X,X,X,X,X,
+  /* 10F60 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+
+  /* Old Uyghur */
+
+  /* 10F60 */                                 D,D,D,D,R,R,D,D,D,D,D,D,D,D,D,D,
+  /* 10F80 */ D,D,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 10FA0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+
+  /* Chorasmian */
+
+  /* 10FA0 */                                 D,U,D,D,R,R,R,U,D,R,R,D,D,R,D,D,
+  /* 10FC0 */ U,D,R,R,D,U,U,U,U,R,D,L,
+
+#define joining_offset_0x110bdu 1344
+
+  /* Kaithi */
+
+  /* 110A0 */                                                           U,X,X,
+  /* 110C0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,U,
+
+#define joining_offset_0x1e900u 1361
+
+  /* Adlam */
+
+  /* 1E900 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
+  /* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T,
+
+}; /* Table items: 1437; occupancy: 58% */
+
 
 static unsigned int
 joining_type (hb_codepoint_t u)
 {
-  return _hb_arabic_joining_joining_type (u);
+  switch (u >> 12)
+  {
+    case 0x0u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x0600u, 0x08E2u)) return joining_table[u - 0x0600u + joining_offset_0x0600u];
+      break;
+
+    case 0x1u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x1806u, 0x18AAu)) return joining_table[u - 0x1806u + joining_offset_0x1806u];
+      break;
+
+    case 0x2u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x200Cu, 0x2069u)) return joining_table[u - 0x200Cu + joining_offset_0x200cu];
+      break;
+
+    case 0xAu:
+      if (hb_in_range<hb_codepoint_t> (u, 0xA840u, 0xA873u)) return joining_table[u - 0xA840u + joining_offset_0xa840u];
+      break;
+
+    case 0x10u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x10AC0u, 0x10AEFu)) return joining_table[u - 0x10AC0u + joining_offset_0x10ac0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10B80u, 0x10BAFu)) return joining_table[u - 0x10B80u + joining_offset_0x10b80u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10D00u, 0x10D23u)) return joining_table[u - 0x10D00u + joining_offset_0x10d00u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10EC2u, 0x10EC7u)) return joining_table[u - 0x10EC2u + joining_offset_0x10ec2u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10F30u, 0x10FCBu)) return joining_table[u - 0x10F30u + joining_offset_0x10f30u];
+      break;
+
+    case 0x11u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x110BDu, 0x110CDu)) return joining_table[u - 0x110BDu + joining_offset_0x110bdu];
+      break;
+
+    case 0x1Eu:
+      if (hb_in_range<hb_codepoint_t> (u, 0x1E900u, 0x1E94Bu)) return joining_table[u - 0x1E900u + joining_offset_0x1e900u];
+      break;
+
+    default:
+      break;
+  }
+  return X;
 }
 
+#undef A
+#undef DR
+#undef C
+#undef D
+#undef L
+#undef R
+#undef T
+#undef U
+#undef X
+
 
 static const uint16_t shaping_table[][4] =
 {
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
index 2a05af14..c5104c94 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic.cc
@@ -77,8 +77,8 @@ enum hb_arabic_joining_type_t {
   JOINING_GROUP_DALATH_RISH	= 5,
   NUM_STATE_MACHINE_COLS	= 6,
 
-  JOINING_TYPE_T = 6,
-  JOINING_TYPE_X = 7  /* means: use general-category to choose between U or T. */
+  JOINING_TYPE_T = 7,
+  JOINING_TYPE_X = 8  /* means: use general-category to choose between U or T. */
 };
 
 #include "hb-ot-shaper-arabic-table.hh"
@@ -561,29 +561,20 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
       DEBUG_MSG (ARABIC, nullptr, "fixed tiles:     count=%d width=%" PRId32, n_fixed, w_fixed);
       DEBUG_MSG (ARABIC, nullptr, "repeating tiles: count=%d width=%" PRId32, n_repeating, w_repeating);
 
-      static constexpr unsigned STCH_MAX_GLYPHS = 256;
-
       /* Number of additional times to repeat each repeating tile. */
-      unsigned int n_copies = 0;
+      int n_copies = 0;
 
-      int64_t w_remaining_signed = (int64_t) w_total - w_fixed;
-      int64_t w_repeating_signed = w_repeating;
-      if (sign < 0)
-      {
-	w_remaining_signed = -w_remaining_signed;
-	w_repeating_signed = -w_repeating_signed;
-      }
-      hb_position_t w_remaining = (hb_position_t) (w_total - w_fixed);
-      if (w_remaining_signed > w_repeating_signed && w_repeating_signed > 0)
-	n_copies = w_remaining_signed / w_repeating_signed - 1;
+      hb_position_t w_remaining = w_total - w_fixed;
+      if (sign * w_remaining > sign * w_repeating && sign * w_repeating > 0)
+	n_copies = (sign * w_remaining) / (sign * w_repeating) - 1;
 
       /* See if we can improve the fit by adding an extra repeat and squeezing them together a bit. */
       hb_position_t extra_repeat_overlap = 0;
-      int64_t shortfall = w_remaining_signed - w_repeating_signed * (n_copies + 1);
+      hb_position_t shortfall = sign * w_remaining - sign * w_repeating * (n_copies + 1);
       if (shortfall > 0 && n_repeating > 0)
       {
 	++n_copies;
-	int64_t excess = (n_copies + 1) * w_repeating_signed - w_remaining_signed;
+	hb_position_t excess = (n_copies + 1) * sign * w_repeating - sign * w_remaining;
 	if (excess > 0)
 	{
 	  extra_repeat_overlap = excess / (n_copies * n_repeating);
@@ -591,22 +582,10 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
 	}
       }
 
-      unsigned int max_copies = 0;
-      if (n_repeating > 0)
-      {
-	unsigned int base_glyphs = n_fixed + n_repeating;
-	if (base_glyphs < STCH_MAX_GLYPHS)
-	  max_copies = (STCH_MAX_GLYPHS - base_glyphs) / n_repeating;
-      }
-      n_copies = hb_min (n_copies, max_copies);
-
       if (step == MEASURE)
       {
-	unsigned int added_glyphs = 0;
-	if (unlikely (hb_unsigned_mul_overflows (n_copies, n_repeating, &added_glyphs) ||
-		      hb_unsigned_add_overflows (extra_glyphs_needed, added_glyphs, &extra_glyphs_needed)))
-	  break;
-	DEBUG_MSG (ARABIC, nullptr, "will add extra %u copies of repeating tiles", n_copies);
+	extra_glyphs_needed += n_copies * n_repeating;
+	DEBUG_MSG (ARABIC, nullptr, "will add extra %d copies of repeating tiles", n_copies);
       }
       else
       {
@@ -650,9 +629,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
 
     if (step == MEASURE)
     {
-      unsigned int total_glyphs = 0;
-      if (unlikely (hb_unsigned_add_overflows (count, extra_glyphs_needed, &total_glyphs) ||
-		    !buffer->ensure (total_glyphs)))
+      if (unlikely (!buffer->ensure (count + extra_glyphs_needed)))
 	break;
     }
     else
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-hangul.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-hangul.cc
index ce87a915..792b658b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-hangul.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-hangul.cc
@@ -298,7 +298,7 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan HB_UNUSED,
 	  end = start + 2;
 	if (unlikely (!buffer->successful))
 	  break;
-	buffer->merge_out_grapheme_clusters (start, end);
+	buffer->merge_out_clusters (start, end);
 	continue;
       }
     }
@@ -371,7 +371,7 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan HB_UNUSED,
 	  if (i < end)
 	    info[i++].hangul_shaping_feature() = TJMO;
 
-	  buffer->merge_out_grapheme_clusters (start, end);
+	  buffer->merge_out_clusters (start, end);
 	  continue;
 	}
 	else if ((!tindex && buffer->idx + 1 < count && isT (buffer->cur(+1).codepoint)))
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
index 6ff65c30..92fb64ad 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
@@ -53,7 +53,7 @@ enum indic_syllable_type_t {
 };
 
 
-#line 57 "hb-ot-shaper-indic-machine.hh"
+#line 54 "hb-ot-shaper-indic-machine.hh"
 #define indic_syllable_machine_ex_A 9u
 #define indic_syllable_machine_ex_C 1u
 #define indic_syllable_machine_ex_CM 16u
@@ -77,7 +77,7 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_ZWNJ 5u
 
 
-#line 81 "hb-ot-shaper-indic-machine.hh"
+#line 76 "hb-ot-shaper-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
 	8u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 
 	8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 4u, 57u, 
@@ -1126,7 +1126,7 @@ find_syllables_indic (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 1130 "hb-ot-shaper-indic-machine.hh"
+#line 1119 "hb-ot-shaper-indic-machine.hh"
 	{
 	cs = indic_syllable_machine_start;
 	ts = 0;
@@ -1142,7 +1142,7 @@ find_syllables_indic (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 1146 "hb-ot-shaper-indic-machine.hh"
+#line 1131 "hb-ot-shaper-indic-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -1156,7 +1156,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 1160 "hb-ot-shaper-indic-machine.hh"
+#line 1143 "hb-ot-shaper-indic-machine.hh"
 	}
 
 	_keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -1268,7 +1268,7 @@ _eof_trans:
 #line 117 "hb-ot-shaper-indic-machine.rl"
 	{act = 7;}
 	break;
-#line 1272 "hb-ot-shaper-indic-machine.hh"
+#line 1232 "hb-ot-shaper-indic-machine.hh"
 	}
 
 _again:
@@ -1277,7 +1277,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 1281 "hb-ot-shaper-indic-machine.hh"
+#line 1239 "hb-ot-shaper-indic-machine.hh"
 	}
 
 	if ( ++p != pe )
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
index e84b73ea..bf27efee 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
@@ -130,112 +130,392 @@ static_assert (OT_VPst == M_Cat(VPst), "");
 #define _(S,M) INDIC_COMBINE_CATEGORIES (_OT_##S, _POS_##M)
 
 
-#include <stdint.h>
+static const uint16_t indic_table[] = {
 
-static const uint16_t _hb_indic_values[42]=
-{
-    _(A,SM),  _(As,X),   _(C,C),  _(CM,C),  _(CS,C),  _(DC,C),  _(GB,C),   _(H,B),
-     _(H,T),   _(H,X),   _(M,A),  _(M,AP),  _(M,AS),   _(M,B),  _(M,BS),  _(M,LM),
-    _(MH,X),  _(ML,X), _(MP,AP),  _(MR,X),  _(MW,X),  _(MY,X),   _(N,X),  _(PT,X),
-     _(R,C),  _(Rf,X),  _(Rt,X),  _(S,SM), _(SM,BS), _(SM,SM), _(SP,SM),   _(V,C),
-    _(VA,T),  _(VB,B),  _(VL,L),  _(VR,R),  _(VS,X),   _(X,X),  _(Xg,X),  _(Yg,X),
-   _(ZWJ,X),_(ZWNJ,X),
-};
-static const uint8_t _hb_indic_u8[1220]=
-{
-    1,  0, 50,  4,  5, 96,  0,  7,  8,  9,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,186,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,
-    0,  0,  0,  0,208,224,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
-    2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  4,  5,  6,  7,  8,  9,
-   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,  0,  0, 22, 23,
-   24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 26,  0,  0,
-    0, 27,  0,  0,  0,  0, 28, 29, 30,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 31,  0,  0,  0, 32,  0,  0,  0, 33,  0, 34,
-    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 36,  0,  0,  0,  0,  0,  0, 37,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 25,  2, 10,  0,  0,  0,  0, 26,  0,
-   27,  0,  0,  0, 28,  0,  0,  0,  0,  0, 29, 11, 30,  1,  1,  1,
-    4, 31, 32, 33, 34,  1,  6,  2, 35,  1, 12, 13,  7,  1,  1,  3,
-   36, 14, 15, 37, 16, 17,  6,  2, 38, 39, 18, 40,  7,  1,  1,  3,
-   41, 42, 43, 44, 45, 46, 19,  2, 47,  0, 18, 48, 49,  1,  1,  3,
-   20, 14, 50, 51,  0,  0, 21,  2,  0, 52, 53, 13,  7,  1,  1,  3,
-   20, 54, 15, 55, 56, 17,  6,  2, 57,  0, 58, 59, 60, 61, 62, 63,
-    4, 64, 65, 66, 16,  0, 19,  2,  0,  0, 67,  8,  9,  1,  1,  3,
-    4, 22, 68, 69, 70, 71, 23,  2,  0,  0, 12,  8,  9,  1,  1,  3,
-   72, 22, 73, 74, 75, 76, 23,  2, 77,  0, 78,  8,  9,  1,  1,  1,
-    4, 79, 80, 81, 82, 83, 21,  2,  0, 84, 85,  1,  1, 86, 87, 88,
-   89, 90,  2, 91, 92, 93, 94, 95, 96,  1, 97, 98,  2, 99,  0,  0,
-    0,  0,  1,  1,  1,100,101, 11,102,103,104,105,106,107,  2, 10,
-    0,  0,  0,  0,108,  5,  5,109,110,111,  0,112,113,  0,114,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,115,  0,116,  0,  0,  0,  0,  0,
-    0,  0,  0,117,  0,  0,  0,  0,  0,118,  0,  0,  0,  0,  5,  5,
-  119,120,  0,  0,  0,  0,121,  1,  2,122,  0,  0,  0,  0,  1,  1,
-  123,124, 24, 24,  0,  0,  0,  0,  0,  0,125,  0,  0,  0,  0,  0,
-    0,126,  0,  0,  2,  2,  2, 10,  0,  0,  0,  0,  2,  2,  2,  2,
-    4,  4,  4,  4, 10,  2,  2,  2, 26,  2,  2,  2,  8,  8,  8,  8,
-    6, 18,  0,  4, 20, 14, 24,  2,  6,  6, 20,  6, 20,  6, 24,  2,
-    4,  0,  0,  0,  6,  6,  6,  6, 66, 12, 14,  6,  6,  6, 20, 14,
-    2,  0, 36, 50, 52, 18, 38, 68,  0,  0,  0, 32,  0,  0,  2, 16,
-   56, 12, 14,  6,  0,  0,  0,  4, 44,  2, 16,  2,  6, 22,  0,  4,
-    2,  0, 36, 28,  6, 28,  0,  4, 30, 30, 30, 30,  0,  0, 42,  0,
-   34,  0,  0,  0,  0, 64,  0,  0,  0,  0,  0, 42, 12, 12,  6,  6,
-    6,  6, 24,  2,  2, 18, 36,112, 18, 18, 18, 18, 18, 18,114,116,
-  118,120,122, 18,  0,  6,  6,  6, 44, 10,  0,  2, 54, 32, 46, 10,
-   26,  0,  0,  0,  0,  0, 34, 70,  6, 20,  0, 14, 44,  2, 16, 10,
-    2,  0, 72, 50,124, 48,  0, 32, 48, 32, 46,  0,126,  0,  0,  0,
-   16,  2, 10, 10, 12,  2,128,  0,  6,  6,  6, 14,  6, 14, 24,  2,
-   22, 22, 52, 74, 76, 32, 46,  0, 16, 58, 58, 78,130, 12, 14,  6,
-    2,  0, 36,132,134, 32, 46,  0,  0,  0, 80,136, 16,  0,  0,  0,
-    0, 70, 14,  6,  6, 20,  0,  6, 20,  6, 24,  0, 16, 10, 10,  2,
-    0, 16, 10,  0,  2, 10,  0,  2,  2,  0,  0, 22, 76, 48,  0, 82,
-   54, 22, 84,  0, 12, 12,138,  6, 28, 60, 38, 28, 86, 28, 88,  0,
-    0,  0,140, 86,  2, 10, 16,  0, 26,  2, 16,  2, 28, 60, 38, 60,
-   38, 18, 88,  0,  0,  0, 74, 38,  0,  0, 16, 10,142,144,  0,  0,
-   12, 12,146,  6,  2,148,150, 22, 22, 22, 48, 82, 54, 22, 84,152,
-    0,  0,  2,154,  0,  0,  0, 14,  0,  2,  2,  2,  2,  2, 26,  2,
-    2,156,  2,  2, 90,  6,  6,  6,  6,158, 92, 94,160,162, 62, 58,
-  164,166,168,170,  4,  4,  0, 10,  2,  6,  6, 96, 98, 26,  2,172,
-  174,100,176,178,100,102,102,  2,104, 62,180,  2,  2,182,184,186,
-   12, 12, 12,188,  4, 12,190,  0,  2, 26,  2,  2,  2, 90,  6,  6,
-    6,  6,  0, 92, 62, 94, 98,192,194,196, 96,198,200,106,106,108,
-  108,202,  0,  0, 42,  0,204,  0,  8,206,  8,  8,208, 40,210, 40,
-   40,  2,212,214,  8, 34,  0,  0,  0,  0,216,  0,  4,  4,  4,  0,
-    0, 34,  0,  0,  0,  0,110,  0,  0, 64,110,  0,  0,  0,218,  0,
-    0, 42,  4, 34,  8, 40, 40, 40,  0,  0,  0,220,  2,  2,104, 16,
-    4,  2,  2, 10, 16,  2,  4, 34,  0,222, 78,  2, 56, 12,  0,  0,
-    0, 80, 72,  0, 37, 37,  2,  2,  6,  6, 31, 31,  0,  0,  2, 37,
-   29, 29, 37, 31, 37,  2, 12, 12, 31, 37, 11, 11, 31,  2, 24,  2,
-   14, 14, 36, 36, 37, 11,  6, 37, 22, 27, 12, 37, 27, 27, 37,  6,
-   24, 37, 11,  7, 11, 37, 11, 15, 11, 12, 15, 37, 37, 29,  0, 22,
-   14, 12, 32, 32, 30, 30,  6, 29, 37, 15, 29, 37, 22, 37, 37, 12,
-   12, 11, 22, 22, 37, 22, 15, 15, 11,  8, 14, 37, 14,  8,  2, 31,
-   35, 32, 32, 33, 35, 35, 33, 33, 35, 23, 23, 23,  2, 32, 26, 38,
-   38, 38, 30, 37, 12, 15, 12,  7, 15, 12, 37,  0,  0, 29, 29, 12,
-   18, 11, 37, 13, 37,  3, 37, 28, 11, 10, 10, 37, 10, 11, 29, 31,
-   37, 14, 37,  4,  4, 29,  6, 31,  2, 12, 12, 27, 25, 37,  2, 11,
-    2, 24, 31, 35, 33, 34,  0, 32, 29,  9,  1, 21, 19, 20, 16,  2,
-   21, 21, 17,  2, 23,  2,  2, 35, 32,  2, 20, 35, 34, 32, 32, 29,
-    2, 29, 29, 32, 32, 35, 35, 34, 34, 34, 38, 39, 39, 26,  9, 39,
-   27, 39,  0, 37,  0, 27, 27,  0,  0,  2,  2,  0, 41, 40,  5, 37,
-   31, 12,  2, 23,
-};
 
-static inline uint8_t _hb_indic_b4 (const uint8_t* a, unsigned i)
-{
-  return (a[i>>1]>>((i&1)<<2))&15;
-}
-static inline uint8_t _hb_indic_get_categories_index (unsigned u)
-{
-  /* packtab: [2^4,2^3,2^3,2^2,2^1] */
-  return u<71396u ? (uint8_t)(_hb_indic_u8[996u+_hb_indic_u8[488u+((_hb_indic_u8[186u+((_hb_indic_u8[70u+((_hb_indic_b4(_hb_indic_u8,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)])<<3)+((((((u)>>1))>>2))&7)])<<2)+((((u)>>1))&3)]+((u)&1)]) : 37;
-}
+#define indic_offset_0x0028u 0
+
+
+  /* Basic Latin */
+
+  /* 0028 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(GB,C),  _(X,X),  _(X,X),
+  /* 0030 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0038 */ _(GB,C), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x00b0u 24
+
+
+  /* Latin-1 Supplement */
+
+  /* 00B0 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00B8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00C0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00C8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00D0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(GB,C),
+
+#define indic_offset_0x0900u 64
+
+
+  /* Devanagari */
+
+  /* 0900 */_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 0908 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 0910 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0918 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0920 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0928 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0930 */  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0938 */  _(C,C),  _(C,C), _(M,AS), _(M,AS),  _(N,X), _(S,SM), _(M,AS), _(M,LM),
+  /* 0940 */ _(M,AS), _(M,AS), _(M,AS), _(M,AS), _(M,AS), _(M,AS), _(M,AS), _(M,AS),
+  /* 0948 */ _(M,AS), _(M,AS), _(M,AS), _(M,AS), _(M,AS),  _(H,B), _(M,LM), _(M,AS),
+  /* 0950 */  _(X,X), _(A,SM), _(A,SM),_(SM,SM),_(SM,SM), _(M,AS), _(M,AS), _(M,AS),
+  /* 0958 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0960 */  _(V,C),  _(V,C), _(M,AS), _(M,AS),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0968 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0970 */  _(X,X),  _(X,X),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 0978 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+
+  /* Bengali */
+
+  /* 0980 */ _(GB,C),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0988 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(X,X),  _(V,C),
+  /* 0990 */  _(V,C),  _(X,X),  _(X,X),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0998 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 09A0 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 09A8 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 09B0 */  _(R,C),  _(X,X),  _(C,C),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),
+  /* 09B8 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X), _(S,SM), _(M,AP), _(M,LM),
+  /* 09C0 */ _(M,AP), _(M,AS), _(M,AS), _(M,AS), _(M,AS),  _(X,X),  _(X,X), _(M,LM),
+  /* 09C8 */ _(M,LM),  _(X,X),  _(X,X), _(M,AP), _(M,AP),  _(H,B),  _(C,C),  _(X,X),
+  /* 09D0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,AP),
+  /* 09D8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),
+  /* 09E0 */  _(V,C),  _(V,C), _(M,AS), _(M,AS),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 09E8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 09F0 */  _(R,C),  _(C,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 09F8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(GB,C),  _(X,X),_(SM,SM),  _(X,X),
+
+  /* Gurmukhi */
+
+  /* 0A00 */  _(X,X),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0A08 */  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(V,C),
+  /* 0A10 */  _(V,C),  _(X,X),  _(X,X),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0A18 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0A20 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0A28 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0A30 */  _(R,C),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(X,X),
+  /* 0A38 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X),  _(X,X), _(M,AP), _(M,LM),
+  /* 0A40 */_(MP,AP), _(M,AP), _(M,AP),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,AP),
+  /* 0A48 */ _(M,AP),  _(X,X),  _(X,X), _(M,AP), _(M,AP),  _(H,B),  _(X,X),  _(X,X),
+  /* 0A50 */  _(X,X),  _(M,B),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0A58 */  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(X,X),
+  /* 0A60 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0A68 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0A70 */_(SM,SM),_(SM,SM),  _(C,C),  _(C,C),  _(X,X), _(CM,C),  _(X,X),  _(X,X),
+  /* 0A78 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+  /* Gujarati */
+
+  /* 0A80 */  _(X,X),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0A88 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(V,C),
+  /* 0A90 */  _(V,C),  _(V,C),  _(X,X),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0A98 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0AA0 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0AA8 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0AB0 */  _(R,C),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),
+  /* 0AB8 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X), _(S,SM), _(M,AP), _(M,LM),
+  /* 0AC0 */ _(M,AP), _(M,AP), _(M,AP), _(M,AP), _(M,AP), _(M,AS),  _(X,X), _(M,AS),
+  /* 0AC8 */ _(M,AS), _(M,AP),  _(X,X), _(M,AP), _(M,AP),  _(H,B),  _(X,X),  _(X,X),
+  /* 0AD0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0AD8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0AE0 */  _(V,C),  _(V,C), _(M,AP), _(M,AP),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0AE8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0AF0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0AF8 */  _(X,X),  _(C,C), _(A,SM),  _(N,X), _(A,SM),  _(N,X),  _(N,X),  _(N,X),
+
+  /* Oriya */
+
+  /* 0B00 */  _(X,X),_(SM,BS),_(SM,SM),_(SM,SM),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0B08 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(X,X),  _(V,C),
+  /* 0B10 */  _(V,C),  _(X,X),  _(X,X),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0B18 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0B20 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0B28 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0B30 */  _(R,C),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),
+  /* 0B38 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X), _(S,SM), _(M,AP),  _(M,A),
+  /* 0B40 */ _(M,AP), _(M,AS), _(M,AS), _(M,AS), _(M,AS),  _(X,X),  _(X,X), _(M,LM),
+  /* 0B48 */  _(M,A),  _(X,X),  _(X,X), _(M,AP), _(M,AP),  _(H,B),  _(X,X),  _(X,X),
+  /* 0B50 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(N,X),  _(M,A), _(M,AP),
+  /* 0B58 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),
+  /* 0B60 */  _(V,C),  _(V,C), _(M,AS), _(M,AS),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0B68 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0B70 */  _(X,X),  _(C,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0B78 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+  /* Tamil */
+
+  /* 0B80 */  _(X,X),  _(X,X),_(SM,SM),  _(X,X),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0B88 */  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(X,X),  _(X,X),  _(V,C),  _(V,C),
+  /* 0B90 */  _(V,C),  _(X,X),  _(V,C),  _(V,C),  _(V,C),  _(C,C),  _(X,X),  _(X,X),
+  /* 0B98 */  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(X,X),  _(C,C),  _(C,C),
+  /* 0BA0 */  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(X,X),
+  /* 0BA8 */  _(C,C),  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),
+  /* 0BB0 */  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0BB8 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,AP), _(M,AP),
+  /* 0BC0 */ _(M,AS), _(M,AP), _(M,AP),  _(X,X),  _(X,X),  _(X,X), _(M,LM), _(M,LM),
+  /* 0BC8 */ _(M,LM),  _(X,X), _(M,AP), _(M,AP), _(M,AP),  _(H,T),  _(X,X),  _(X,X),
+  /* 0BD0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,AP),
+  /* 0BD8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0BE0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0BE8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0BF0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0BF8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+  /* Telugu */
+
+  /* 0C00 */_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),  _(V,C),  _(V,C),  _(V,C),
+  /* 0C08 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(V,C),  _(V,C),
+  /* 0C10 */  _(V,C),  _(X,X),  _(V,C),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C18 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C20 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C28 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C30 */  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C38 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X), _(S,SM), _(M,BS), _(M,BS),
+  /* 0C40 */ _(M,BS), _(M,BS), _(M,BS), _(M,AS), _(M,AS),  _(X,X), _(M,BS), _(M,BS),
+  /* 0C48 */ _(M,BS),  _(X,X), _(M,BS), _(M,BS), _(M,BS),  _(H,T),  _(X,X),  _(X,X),
+  /* 0C50 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,BS), _(M,BS),  _(X,X),
+  /* 0C58 */  _(C,C),  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(C,C),  _(X,X),  _(X,X),
+  /* 0C60 */  _(V,C),  _(V,C), _(M,BS), _(M,BS),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0C68 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0C70 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0C78 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+  /* Kannada */
+
+  /* 0C80 */ _(GB,C),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(V,C),  _(V,C),  _(V,C),
+  /* 0C88 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(V,C),  _(V,C),
+  /* 0C90 */  _(V,C),  _(X,X),  _(V,C),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0C98 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0CA0 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0CA8 */  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0CB0 */  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(X,X),  _(C,C),  _(C,C),  _(C,C),
+  /* 0CB8 */  _(C,C),  _(C,C),  _(X,X),  _(X,X),  _(N,X), _(S,SM), _(M,BS), _(M,BS),
+  /* 0CC0 */ _(M,BS), _(M,BS), _(M,BS), _(M,AS), _(M,AS),  _(X,X), _(M,BS), _(M,AS),
+  /* 0CC8 */ _(M,AS),  _(X,X), _(M,AS), _(M,AS), _(M,BS),  _(H,T),  _(X,X),  _(X,X),
+  /* 0CD0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X), _(M,AS), _(M,AS),  _(X,X),
+  /* 0CD8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(X,X),
+  /* 0CE0 */  _(V,C),  _(V,C), _(M,BS), _(M,BS),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0CE8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0CF0 */  _(X,X), _(CS,C), _(CS,C),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0CF8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+  /* Malayalam */
+
+  /* 0D00 */_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM), _(GB,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 0D08 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(V,C),  _(V,C),
+  /* 0D10 */  _(V,C),  _(X,X),  _(V,C),  _(V,C),  _(V,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0D18 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0D20 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0D28 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0D30 */  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 0D38 */  _(C,C),  _(C,C),  _(C,C), _(M,AS), _(M,AS), _(S,SM), _(M,AP), _(M,AP),
+  /* 0D40 */ _(M,AP), _(M,AP), _(M,AP), _(M,AP), _(M,AP),  _(X,X), _(M,LM), _(M,LM),
+  /* 0D48 */ _(M,LM),  _(X,X), _(M,AP), _(M,AP), _(M,AP),  _(H,T), _(Rf,X),  _(X,X),
+  /* 0D50 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(C,C), _(M,AP),
+  /* 0D58 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(V,C),
+  /* 0D60 */  _(V,C),  _(V,C), _(M,AP), _(M,AP),  _(X,X),  _(X,X), _(GB,C), _(GB,C),
+  /* 0D68 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 0D70 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 0D78 */  _(X,X),  _(X,X),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+
+#define indic_offset_0x1000u 1216
+
+
+  /* Myanmar */
+
+  /* 1000 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(R,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1008 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1010 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1018 */  _(C,C),  _(C,C),  _(C,C),  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1020 */  _(C,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 1028 */  _(V,C),  _(V,C),  _(V,C), _(VR,R), _(VR,R), _(VA,T), _(VA,T), _(VB,B),
+  /* 1030 */ _(VB,B), _(VL,L), _(A,SM), _(VA,T), _(VA,T), _(VA,T), _(A,SM),  _(N,X),
+  /* 1038 */_(SM,SM),  _(H,X), _(As,X), _(MY,X), _(MR,X), _(MW,X), _(MH,X),  _(C,C),
+  /* 1040 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 1048 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),  _(X,X),  _(C,C),  _(X,X),
+  /* 1050 */  _(C,C),  _(C,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C), _(VR,R), _(VR,R),
+  /* 1058 */ _(VB,B), _(VB,B),  _(R,C),  _(C,C),  _(C,C),  _(C,C), _(MY,X), _(MY,X),
+  /* 1060 */ _(ML,X),  _(C,C), _(VR,R), _(PT,X), _(PT,X),  _(C,C),  _(C,C), _(VR,R),
+  /* 1068 */ _(VR,R), _(PT,X), _(PT,X), _(PT,X), _(PT,X), _(PT,X),  _(C,C),  _(C,C),
+  /* 1070 */  _(C,C), _(VA,T), _(VA,T), _(VA,T), _(VA,T),  _(C,C),  _(C,C),  _(C,C),
+  /* 1078 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1080 */  _(C,C),  _(C,C), _(MW,X), _(VR,R), _(VL,L), _(VA,T), _(VA,T),_(SM,SM),
+  /* 1088 */_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),_(SM,SM),  _(C,C),_(SM,SM),
+  /* 1090 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 1098 */ _(GB,C), _(GB,C),_(SM,SM),_(SM,SM),_(SM,SM), _(VA,T),  _(X,X),  _(X,X),
+
+#define indic_offset_0x1780u 1376
+
+
+  /* Khmer */
+
+  /* 1780 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1788 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1790 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 1798 */  _(C,C),  _(C,C),  _(R,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* 17A0 */  _(C,C),  _(C,C),  _(C,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 17A8 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(V,C),
+  /* 17B0 */  _(V,C),  _(V,C),  _(V,C),  _(V,C),  _(X,X),  _(X,X), _(VR,R), _(VA,T),
+  /* 17B8 */ _(VA,T), _(VA,T), _(VA,T), _(VB,B), _(VB,B), _(VB,B), _(VA,T), _(VR,R),
+  /* 17C0 */ _(VR,R), _(VL,L), _(VL,L), _(VL,L), _(VR,R), _(VR,R), _(Xg,X), _(Yg,X),
+  /* 17C8 */ _(Yg,X), _(Rt,X), _(Rt,X), _(Xg,X), _(Rt,X), _(Xg,X), _(Xg,X), _(Xg,X),
+  /* 17D0 */ _(Xg,X), _(Xg,X),  _(H,X), _(Yg,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 17D8 */  _(X,X), _(GB,C),  _(X,X),  _(X,X), _(S,SM), _(Yg,X),  _(X,X),  _(X,X),
+  /* 17E0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 17E8 */ _(GB,C), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x1cd0u 1488
+
+
+  /* Vedic Extensions */
+
+  /* 1CD0 */ _(A,SM), _(A,SM), _(A,SM),  _(X,X), _(A,SM), _(A,SM), _(A,SM), _(A,SM),
+  /* 1CD8 */ _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM),
+  /* 1CE0 */ _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM),
+  /* 1CE8 */ _(A,SM), _(S,SM), _(S,SM), _(S,SM), _(S,SM), _(A,SM), _(S,SM), _(S,SM),
+  /* 1CF0 */ _(S,SM), _(S,SM),  _(C,C),  _(C,C), _(A,SM),  _(C,C),  _(C,C), _(A,SM),
+  /* 1CF8 */ _(A,SM), _(A,SM), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x2008u 1536
+
+
+  /* General Punctuation */
+
+  /* 2008 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(ZWNJ,X),_(ZWJ,X),  _(X,X),  _(X,X),
+  /* 2010 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),  _(X,X),
+  /* 2018 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 2020 */  _(X,X),  _(X,X), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x2070u 1568
+
+
+  /* Superscripts and Subscripts */
+
+  /* 2070 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
+  /* 2078 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 2080 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x25f8u 1592
+
+
+  /* Geometric Shapes */
+
+  /* 25F8 */  _(X,X),  _(X,X),  _(X,X), _(GB,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),
+
+#define indic_offset_0xa8e0u 1600
+
+
+  /* Devanagari Extended */
+
+  /* A8E0 */ _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM),
+  /* A8E8 */ _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM), _(A,SM),
+  /* A8F0 */ _(A,SM), _(A,SM), _(S,SM), _(S,SM), _(S,SM), _(S,SM), _(S,SM), _(S,SM),
+  /* A8F8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(V,C), _(M,AS),
+
+#define indic_offset_0xa9e0u 1632
+
+
+  /* Myanmar Extended-B */
+
+  /* A9E0 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C), _(VA,T),  _(X,X),  _(C,C),
+  /* A9E8 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* A9F0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* A9F8 */ _(GB,C), _(GB,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(X,X),
+
+#define indic_offset_0xaa60u 1664
+
+
+  /* Myanmar Extended-A */
+
+  /* AA60 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* AA68 */  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),  _(C,C),
+  /* AA70 */  _(X,X),  _(C,C),  _(C,C),  _(C,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),
+  /* AA78 */  _(X,X),  _(X,X),  _(C,C), _(PT,X),  _(N,X),  _(N,X),  _(C,C),  _(C,C),
+
+#define indic_offset_0xfe00u 1696
+
+
+  /* Variation Selectors */
+
+  /* FE00 */ _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X),
+  /* FE08 */ _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X), _(VS,X),
+
+#define indic_offset_0x11300u 1712
+
+
+  /* Grantha */
+
+  /* 11300 */  _(X,X),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x11338u 1720
+
+  /* 11338 */  _(X,X),  _(X,X),  _(X,X),  _(N,X),  _(N,X),  _(X,X),  _(X,X),  _(X,X),
+
+#define indic_offset_0x116d0u 1728
+
+
+  /* Myanmar Extended-C */
+
+  /* 116D0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 116D8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 116E0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+}; /* Table items: 1752; occupancy: 71% */
 
 uint16_t
 hb_indic_get_categories (hb_codepoint_t u)
 {
-  return _hb_indic_values[_hb_indic_get_categories_index (u)];
+  switch (u >> 12)
+  {
+    case 0x0u:
+      if (unlikely (u == 0x00A0u)) return _(GB,C);
+      if (hb_in_range<hb_codepoint_t> (u, 0x0028u, 0x003Fu)) return indic_table[u - 0x0028u + indic_offset_0x0028u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x00B0u, 0x00D7u)) return indic_table[u - 0x00B0u + indic_offset_0x00b0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x0900u, 0x0D7Fu)) return indic_table[u - 0x0900u + indic_offset_0x0900u];
+      break;
+
+    case 0x1u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x1000u, 0x109Fu)) return indic_table[u - 0x1000u + indic_offset_0x1000u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x1780u, 0x17EFu)) return indic_table[u - 0x1780u + indic_offset_0x1780u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x1CD0u, 0x1CFFu)) return indic_table[u - 0x1CD0u + indic_offset_0x1cd0u];
+      break;
+
+    case 0x2u:
+      if (unlikely (u == 0x25CCu)) return _(DC,C);
+      if (hb_in_range<hb_codepoint_t> (u, 0x2008u, 0x2027u)) return indic_table[u - 0x2008u + indic_offset_0x2008u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x2070u, 0x2087u)) return indic_table[u - 0x2070u + indic_offset_0x2070u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x25F8u, 0x25FFu)) return indic_table[u - 0x25F8u + indic_offset_0x25f8u];
+      break;
+
+    case 0xAu:
+      if (hb_in_range<hb_codepoint_t> (u, 0xA8E0u, 0xA8FFu)) return indic_table[u - 0xA8E0u + indic_offset_0xa8e0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0xA9E0u, 0xA9FFu)) return indic_table[u - 0xA9E0u + indic_offset_0xa9e0u];
+      if (hb_in_range<hb_codepoint_t> (u, 0xAA60u, 0xAA7Fu)) return indic_table[u - 0xAA60u + indic_offset_0xaa60u];
+      break;
+
+    case 0xFu:
+      if (hb_in_range<hb_codepoint_t> (u, 0xFE00u, 0xFE0Fu)) return indic_table[u - 0xFE00u + indic_offset_0xfe00u];
+      break;
+
+    case 0x11u:
+      if (hb_in_range<hb_codepoint_t> (u, 0x11300u, 0x11307u)) return indic_table[u - 0x11300u + indic_offset_0x11300u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x11338u, 0x1133Fu)) return indic_table[u - 0x11338u + indic_offset_0x11338u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x116D0u, 0x116E7u)) return indic_table[u - 0x116D0u + indic_offset_0x116d0u];
+      break;
+
+    default:
+      break;
+  }
+  return _(X,X);
 }
 
 #undef _
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic.cc
index 8501629d..5f57a672 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic.cc
@@ -296,6 +296,11 @@ struct indic_shape_plan_t
   const indic_config_t *config;
 
   bool is_old_spec;
+#ifndef HB_NO_UNISCRIBE_BUG_COMPATIBLE
+  bool uniscribe_bug_compatible;
+#else
+  static constexpr bool uniscribe_bug_compatible = false;
+#endif
   mutable hb_atomic_t<hb_codepoint_t> virama_glyph;
 
   hb_indic_would_substitute_feature_t rphf;
@@ -322,6 +327,9 @@ data_create_indic (const hb_ot_shape_plan_t *plan)
     }
 
   indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.chosen_script[0] & 0x000000FFu) != '2');
+#ifndef HB_NO_UNISCRIBE_BUG_COMPATIBLE
+  indic_plan->uniscribe_bug_compatible = hb_options ().uniscribe_bug_compatible;
+#endif
   indic_plan->virama_glyph = -1;
 
   /* Use zero-context would_substitute() matching for new-spec of the main
@@ -935,7 +943,17 @@ initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan,
 				       unsigned int start, unsigned int end)
 {
   /* We treat placeholder/dotted-circle as if they are consonants, so we
-   * should just chain... */
+   * should just chain.  Only if not in compatibility mode that is... */
+
+  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
+  if (indic_plan->uniscribe_bug_compatible)
+  {
+    /* For dotted-circle, this is what Uniscribe does:
+     * If dotted-circle is the last glyph, it just does nothing.
+     * Ie. It doesn't form Reph. */
+    if (buffer->info[end - 1].indic_category() == I_Cat(DOTTEDCIRCLE))
+      return;
+  }
 
   initial_reordering_consonant_syllable (plan, face, buffer, start, end);
 }
@@ -1329,7 +1347,8 @@ final_reordering_syllable_indic (const hb_ot_shape_plan_t *plan,
        * Uniscribe doesn't do this.
        * TEST: U+0930,U+094D,U+0915,U+094B,U+094D
        */
-      if (unlikely (is_halant (info[new_reph_pos])))
+      if (!indic_plan->uniscribe_bug_compatible &&
+	  unlikely (is_halant (info[new_reph_pos])))
       {
 	for (unsigned int i = base + 1; i < new_reph_pos; i++)
 	  if (FLAG_UNSAFE (info[i].indic_category()) & (FLAG (I_Cat(M)) | FLAG (I_Cat(MPst))))
@@ -1432,6 +1451,27 @@ final_reordering_syllable_indic (const hb_ot_shape_plan_t *plan,
     else
       buffer->unsafe_to_break (start - 1, start + 1);
   }
+
+
+  /*
+   * Finish off the clusters and go home!
+   */
+  if (indic_plan->uniscribe_bug_compatible)
+  {
+    switch ((hb_tag_t) plan->props.script)
+    {
+      case HB_SCRIPT_TAMIL:
+	break;
+
+      default:
+	/* Uniscribe merges the entire syllable into a single cluster... Except for Tamil.
+	 * This means, half forms are submerged into the main consonant's cluster.
+	 * This is unnecessary, and makes cursor positioning harder, but that's what
+	 * Uniscribe does. */
+	buffer->merge_clusters (start, end);
+	break;
+    }
+  }
 }
 
 
@@ -1461,7 +1501,9 @@ preprocess_text_indic (const hb_ot_shape_plan_t *plan,
 		       hb_buffer_t              *buffer,
 		       hb_font_t                *font)
 {
-  _hb_preprocess_text_vowel_constraints (plan, buffer, font);
+  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
+  if (!indic_plan->uniscribe_bug_compatible)
+    _hb_preprocess_text_vowel_constraints (plan, buffer, font);
 }
 
 static bool
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer-machine.hh
index f1e7a91f..848ed231 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer-machine.hh
@@ -48,7 +48,7 @@ enum khmer_syllable_type_t {
 };
 
 
-#line 52 "hb-ot-shaper-khmer-machine.hh"
+#line 49 "hb-ot-shaper-khmer-machine.hh"
 #define khmer_syllable_machine_ex_C 1u
 #define khmer_syllable_machine_ex_DOTTEDCIRCLE 11u
 #define khmer_syllable_machine_ex_H 4u
@@ -66,7 +66,7 @@ enum khmer_syllable_type_t {
 #define khmer_syllable_machine_ex_ZWNJ 5u
 
 
-#line 70 "hb-ot-shaper-khmer-machine.hh"
+#line 65 "hb-ot-shaper-khmer-machine.hh"
 static const unsigned char _khmer_syllable_machine_trans_keys[] = {
 	5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 
 	5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u, 
@@ -294,7 +294,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 298 "hb-ot-shaper-khmer-machine.hh"
+#line 287 "hb-ot-shaper-khmer-machine.hh"
 	{
 	cs = khmer_syllable_machine_start;
 	ts = 0;
@@ -310,7 +310,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 314 "hb-ot-shaper-khmer-machine.hh"
+#line 299 "hb-ot-shaper-khmer-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -324,7 +324,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 328 "hb-ot-shaper-khmer-machine.hh"
+#line 311 "hb-ot-shaper-khmer-machine.hh"
 	}
 
 	_keys = _khmer_syllable_machine_trans_keys + (cs<<1);
@@ -394,7 +394,7 @@ _eof_trans:
 #line 98 "hb-ot-shaper-khmer-machine.rl"
 	{act = 3;}
 	break;
-#line 398 "hb-ot-shaper-khmer-machine.hh"
+#line 368 "hb-ot-shaper-khmer-machine.hh"
 	}
 
 _again:
@@ -403,7 +403,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 407 "hb-ot-shaper-khmer-machine.hh"
+#line 375 "hb-ot-shaper-khmer-machine.hh"
 	}
 
 	if ( ++p != pe )
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer.cc
index eb3b585e..019a2851 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-khmer.cc
@@ -141,6 +141,12 @@ override_features_khmer (hb_ot_shape_planner_t *plan)
    * typographical correctness.", hence in overrides... */
   map->enable_feature (HB_TAG('c','l','i','g'));
 
+  /* Uniscribe does not apply 'kern' in Khmer. */
+  if (hb_options ().uniscribe_bug_compatible)
+  {
+    map->disable_feature (HB_TAG('k','e','r','n'));
+  }
+
   map->disable_feature (HB_TAG('l','i','g','a'));
 }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
index 4b8da586..292bc9f3 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
@@ -50,7 +50,7 @@ enum myanmar_syllable_type_t {
 };
 
 
-#line 54 "hb-ot-shaper-myanmar-machine.hh"
+#line 51 "hb-ot-shaper-myanmar-machine.hh"
 #define myanmar_syllable_machine_ex_A 9u
 #define myanmar_syllable_machine_ex_As 32u
 #define myanmar_syllable_machine_ex_C 1u
@@ -78,7 +78,7 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_ZWNJ 5u
 
 
-#line 82 "hb-ot-shaper-myanmar-machine.hh"
+#line 77 "hb-ot-shaper-myanmar-machine.hh"
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
 	1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 
 	3u, 57u, 3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u, 
@@ -549,7 +549,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 553 "hb-ot-shaper-myanmar-machine.hh"
+#line 542 "hb-ot-shaper-myanmar-machine.hh"
 	{
 	cs = myanmar_syllable_machine_start;
 	ts = 0;
@@ -565,7 +565,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 569 "hb-ot-shaper-myanmar-machine.hh"
+#line 554 "hb-ot-shaper-myanmar-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -579,7 +579,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 583 "hb-ot-shaper-myanmar-machine.hh"
+#line 566 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 	_keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@@ -649,7 +649,7 @@ _eof_trans:
 #line 113 "hb-ot-shaper-myanmar-machine.rl"
 	{act = 3;}
 	break;
-#line 653 "hb-ot-shaper-myanmar-machine.hh"
+#line 623 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 _again:
@@ -658,7 +658,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 662 "hb-ot-shaper-myanmar-machine.hh"
+#line 630 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 	if ( ++p != pe )
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-thai.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-thai.cc
index 52566fe2..9487e1c5 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-thai.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-thai.cc
@@ -356,11 +356,13 @@ preprocess_text_thai (const hb_ot_shape_plan_t *plan,
 	       sizeof (buffer->out_info[0]) * (end - start - 2));
       buffer->out_info[start] = t;
     }
-
-    /* Since we decomposed, and NIKHAHIT is combining, merge clusters with the
-     * previous cluster. */
-    if (start)
-      buffer->merge_out_grapheme_clusters (start - 1, end);
+    else
+    {
+      /* Since we decomposed, and NIKHAHIT is combining, merge clusters with the
+       * previous cluster. */
+      if (start)
+	buffer->merge_out_clusters (start - 1, end);
+    }
   }
   buffer->sync ();
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
index 65b6adc3..5072e4d3 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
@@ -53,7 +53,7 @@ enum use_syllable_type_t {
 };
 
 
-#line 57 "hb-ot-shaper-use-machine.hh"
+#line 54 "hb-ot-shaper-use-machine.hh"
 #define use_syllable_machine_ex_B 1u
 #define use_syllable_machine_ex_CGJ 6u
 #define use_syllable_machine_ex_CMAbv 31u
@@ -100,7 +100,7 @@ enum use_syllable_type_t {
 #define use_syllable_machine_ex_ZWNJ 14u
 
 
-#line 104 "hb-ot-shaper-use-machine.hh"
+#line 99 "hb-ot-shaper-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
 	49u, 51u, 0u, 56u, 11u, 56u, 11u, 56u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u, 
 	14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u, 
@@ -929,7 +929,7 @@ find_syllables_use (hb_buffer_t *buffer)
   unsigned int act HB_UNUSED;
   int cs;
   
-#line 933 "hb-ot-shaper-use-machine.hh"
+#line 922 "hb-ot-shaper-use-machine.hh"
 	{
 	cs = use_syllable_machine_start;
 	ts = 0;
@@ -942,7 +942,7 @@ find_syllables_use (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 946 "hb-ot-shaper-use-machine.hh"
+#line 931 "hb-ot-shaper-use-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -956,7 +956,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 960 "hb-ot-shaper-use-machine.hh"
+#line 943 "hb-ot-shaper-use-machine.hh"
 	}
 
 	_keys = _use_syllable_machine_trans_keys + (cs<<1);
@@ -1078,7 +1078,7 @@ _eof_trans:
 #line 181 "hb-ot-shaper-use-machine.rl"
 	{act = 9;}
 	break;
-#line 1082 "hb-ot-shaper-use-machine.hh"
+#line 1039 "hb-ot-shaper-use-machine.hh"
 	}
 
 _again:
@@ -1087,7 +1087,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 1091 "hb-ot-shaper-use-machine.hh"
+#line 1046 "hb-ot-shaper-use-machine.hh"
 	}
 
 	if ( ++p != pe )
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
index dad4fc8a..aa16a649 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-table.hh
@@ -2,7 +2,7 @@
 /*
  * The following table is generated by running:
  *
- *   gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt ArabicShaping.txt DerivedCoreProperties.txt UnicodeData.txt Blocks.txt Scripts.txt IndicSyllabicCategory-Additional.txt IndicPositionalCategory-Additional.txt
+ *   ./gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt ArabicShaping.txt DerivedCoreProperties.txt UnicodeData.txt Blocks.txt Scripts.txt IndicSyllabicCategory-Additional.txt IndicPositionalCategory-Additional.txt
  *
  * on files with these headers:
  *
@@ -105,272 +105,272 @@
 
 static const uint8_t hb_use_u8[3343]=
 {
-     33,    3,    0,    0,    0,    4,    0,   80,  118,  128,    9,   10,   11,  192,  208,   14,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     15,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    4,    5,    0,    0,    0,    0,    6,    0,    0,    0,    0,    0,    7,    0,    0,
-      8,    9,    0,   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,    0,    0,   20,
-     21,   22,   23,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   24,
-     25,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,    0,   36,    0,    0,    0,
-      0,   37,   38,    0,    0,    0,    0,    0,    0,    0,    0,    0,   39,    0,    0,    0,
-     40,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   41,    0,   42,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,   43,   44,   45,   46,   47,   48,    0,   49,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   50,   51,    0,
-     52,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   53,   54,    0,    0,    0,
-      0,    0,    0,    0,    0,   55,   56,    0,   57,    0,    0,   58,   59,    0,   60,   61,
-     62,   63,   64,   65,   66,   67,   68,   69,   70,   71,   72,    0,   73,   74,   75,   76,
-      0,   77,    0,   78,   79,   80,   81,   82,    0,   83,   84,   85,   86,    0,   87,   88,
-      0,    1,    1,    1,    1,    1,    1,    1,    1,   89,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,   90,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,   91,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,   92,   93,    0,    0,    0,   94,    0,    0,    0,   95,
-     96,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    3,    3,    3,   97,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,   98,   99,    0,    0,    0,    0,    0,
-      0,    0,    0,  100,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,  101,    0,    0,  102,    0,    0,    0,  103,    0,  104,    0,    0,    0,
-      0,    0,    0,  105,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,  106,  107,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     15,    0,    1,    2,    2,    2,    2,    3,    2,    2,    2,    2,    2,    4,    2,    2,
+      5,    6,    2,    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,    2,    2,   17,
+     18,   19,   20,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   21,
+     22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,    2,   33,    2,    2,    2,
+      2,   34,   35,    2,    2,    2,    2,    2,    2,    2,    2,    2,   36,    2,    2,    2,
+     37,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   38,    2,   39,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    0,    0,    0,    0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    1,    1,
-      1,    3,    3,    3,    3,    3,    3,    3,    3,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    0,    0,    0,    4,    4,    4,    4,    4,    4,    4,
-      4,    2,    2,    2,    2,    5,    2,    2,    2,    2,    6,    0,    2,    2,    2,    2,
-      2,    5,    8,    2,    2,    2,    2,    2,    2,    0,    0,    0,    2,    2,    2,    2,
-      2,    5,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    5,
-      0,    2,    2,    2,    2,    5,    0,    0,    0,    2,    2,    2,    2,    2,    5,    0,
-      0,    2,    8,    2,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,   74,   75,
-      0,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,
-      2,    0,    2,    2,    2,    2,    2,    2,    2,   17,    6,   13,   29,   33,   29,   45,
-      0,   15,   11,   27,    7,   38,    7,   68,    0,    2,    2,    2,    2,    8,    2,    2,
-      2,   10,   10,   10,   10,   80,   10,   10,   10,    2,    2,    2,    2,    2,    2,    2,
-      5,    2,    2,    5,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
-      0,    2,    2,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    5,    2,
-      2,    2,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    0,    0,    0,    0,
-      0,    9,   41,    2,    2,    2,    2,    2,    2,    8,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,   23,    6,    6,    6,    6,    6,    6,    6,
-      6,    0,    0,    0,    0,    0,    0,   48,    0,   44,    0,    0,    0,    0,    0,   49,
-      0,    0,   76,    0,    0,    0,    0,    0,    0,    0,    0,    0,   48,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,  103,    2,    2,    2,    2,    2,   36,    9,
-      9,    9,    9,    0,    0,    0,    5,   31,    0,    2,    2,    2,    2,   50,   51,    0,
-      0,    9,   24,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   15,   32,
-     19,   17,    6,   18,    7,   15,   11,   67,   22,   31,   52,   25,    6,    2,    2,    2,
-      2,  104,   14,    8,    2,    2,    2,    5,    8,    5,    5,    0,    2,    2,    0,   32,
-     19,    0,    0,    0,   34,    0,    0,    2,    8,    2,    0,    0,    0,    0,    0,    5,
-    105,   31,   24,    8,    2,    2,    5,    0,    8,    5,    2,    8,    5,    2,    0,   35,
-     19,   17,   13,    0,   25,   38,   25,   68,    0,   53,    0,    0,    0,    8,    2,    5,
-      5,   54,   39,   77,    0,    0,    0,    0,    0,   31,   24,    8,    2,    2,    2,    2,
-      8,    5,    2,    8,    2,    2,    0,   32,   19,   17,    6,   18,   25,    7,   34,   67,
-      0,    0,    0,    0,    0,    8,   54,   54,   46,   31,   14,    8,    2,    2,    2,    5,
-      8,    5,    2,    8,    2,    2,    0,   32,   20,    0,    0,   25,    7,    0,    0,    2,
-      8,    8,    0,    0,    0,    0,    0,    0,    0,    0,   26,    8,    2,    2,    5,    0,
-      2,    5,    2,    2,    0,    8,    5,    5,    2,    0,    8,    5,    0,    2,    5,    0,
-      2,    2,    2,    2,    2,    2,    0,    0,   11,   15,   27,    0,   12,   33,   12,   45,
-      0,    0,    0,    0,   34,    0,    0,    0,    0,   24,   14,   55,    2,    2,    2,    5,
-      2,    2,    2,    2,    2,    2,    0,   32,    7,    0,    0,   25,   13,    2,    5,    0,
-      0,   36,   14,    8,    2,    2,    2,    5,    2,    2,    2,    8,    2,    2,    0,   32,
-     20,    0,    0,   34,   27,    0,    0,    0,    5,  106,   78,    0,    0,    0,    0,    0,
-      0,    9,   14,    2,    2,    2,    2,    5,    2,    2,    2,    2,    2,    2,   30,   40,
-     11,   17,    6,   13,   12,   33,   12,   45,  107,    0,    0,    0,   34,    0,    0,    0,
-      8,   31,   14,    8,    2,    2,    2,    2,    2,    2,    2,    2,    5,    0,    2,    2,
-      2,    2,    8,    2,    2,    2,    2,    8,    0,    2,    2,    2,    5,    0,  108,    0,
-     34,   11,    7,   13,   13,   19,   12,   12,   22,    0,   11,    0,    0,    0,    0,    0,
-      0,    2,    0,    2,    5,    0,    0,    0,    0,    0,    0,    0,    0,    6,    0,    0,
-      0,    2,    2,   69,   69,  109,    0,    0,   19,   56,   18,   21,    7,    7,    6,    6,
-     26,   18,    9,   13,    9,    2,    2,   79,   10,   10,   10,   10,   10,   10,   10,   10,
-     10,   10,   10,   10,   10,   10,   10,   81,    0,    0,    0,    0,  110,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   23,   20,   21,   57,    7,    7,  111,   82,  112,  113,
-     83,    2,    2,    2,    2,    2,   48,    0,   44,    2,    2,    2,   11,    6,    2,    2,
-    114,   83,   84,   41,   23,   84,   14,   14,    2,   30,    7,   40,    2,    2,    2,    2,
-      2,    2,  115,   58,  116,   14,   14,  117,   85,    2,    2,    2,    2,    2,   14,   20,
-      0,    2,   21,   59,    0,    0,    0,    0,    8,    2,   21,   27,    0,    0,    0,    0,
-      0,    2,   21,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    5,
-      2,    5,   21,    0,    0,    0,    0,    0,    0,    2,    2,    4,   20,    7,   21,    6,
-     12,   12,   12,   12,   24,   60,  118,  119,  120,  121,  122,    0,    0,    0,    0,  123,
-      0,    5,    0,    0,    8,    0,  124,    4,  125,   39,   39,  126,   86,    2,    2,    2,
-      2,    2,    2,    2,    2,   50,    5,    0,    0,    7,   59,   20,    7,  127,   10,    0,
-      0,   70,  128,   70,   70,  129,  130,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-      0,    2,    2,    2,    2,   14,    0,    0,    0,    2,    2,    2,   30,   71,   20,    0,
-      0,    2,    2,  131,  132,   42,  133,   10,   81,  134,   15,   20,    7,   21,   18,   59,
-     12,   12,   58,    9,    9,    9,   87,   26,   53,    9,   88,   41,    2,    2,    2,    2,
-      2,    2,    2,   89,    7,    6,    6,    7,   12,   12,    7,   61,    2,    2,    2,    5,
-      0,    0,    0,    0,    0,    0,  135,   62,   62,   62,   62,    0,    0,    0,    0,    0,
-      0,   88,   41,    2,    2,    2,    2,    2,    2,   79,   10,   21,   22,    7,  136,   10,
-      2,    2,    2,    2,   89,    7,   11,   20,   20,   42,  137,    0,    0,    0,    0,    0,
-      0,    2,    2,   10,   19,   12,   11,   90,   42,   42,   42,  138,  139,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    0,    8,    2,    9,   26,   16,   16,   16,    9,   16,
-     16,   24,   16,   16,   16,   52,    0,   53,    0,    0,    0,  140,   78,    9,   44,    0,
-      0,    0,    0,    0,    0,    0,  141,    0,    0,    0,    0,    0,    0,    0,   49,  142,
-      3,   39,   39,   44,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    3,
-     72,    0,    0,   91,    0,    0,    0,    0,    0,    0,   76,   91,    0,    0,    0,    0,
-      0,   26,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-      0,    0,    0,    0,   63,   63,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
-      8,    0,    0,    0,    0,    0,    0,    0,  143,    0,   63,   63,    0,    0,    0,    0,
-      0,    2,   40,    2,   61,    2,   36,    2,    2,    2,   23,   17,   15,    0,    0,   13,
-      0,   14,    2,    2,    2,    2,    2,    2,    2,    2,    2,  144,   11,   11,   11,   11,
-     11,   11,   11,   92,    0,    0,    0,    0,    0,    9,    9,    9,    9,    9,    9,    9,
-      9,    9,    2,    0,    0,    0,    0,    0,   30,    2,    2,    2,    7,    7,  145,   16,
-      0,    2,    2,    2,   47,    6,   21,    6,   90,   42,  146,    0,    0,    0,    0,    0,
-      0,    9,  147,    2,    2,    2,    2,    2,    2,    2,  148,   11,    7,    6,   12,  149,
-    150,   93,    0,    0,    0,    0,    0,    0,    0,    2,    2,   30,    8,    2,    2,    2,
-      2,    2,    2,    2,    2,   36,    7,   21,   71,   58,  151,   94,  152,    0,    0,    0,
-      0,    2,  153,    2,    2,    2,    2,  154,    0,    8,    2,   39,   44,    0,   85,   24,
-      2,   73,    6,   40,   47,   73,    2,    2,   95,   36,    5,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,  155,   18,   22,    0,    0,  156,   96,    0,    0,    0,
-      0,    2,   23,   20,   11,   59,   27,  157,    0,    0,    0,    0,    0,    0,    0,    0,
-     49,    3,    3,    3,    3,   72,    0,    0,    0,    2,    5,    2,    8,    2,    2,    2,
-      2,    2,    8,    2,    2,    2,    8,    5,    0,   47,    6,   25,   13,    0,    0,  158,
-    159,    2,    2,    8,    2,    8,    2,    2,    2,    2,    2,    2,    0,   51,   35,    0,
-     97,    2,    2,   50,   35,    0,    8,    2,    2,    0,    0,    0,    0,    8,    2,    2,
-      5,    2,    2,    9,   54,    0,    0,    0,    0,    2,    2,    2,    0,   25,    7,    7,
-      8,    2,    2,    2,    2,    2,   25,   38,    0,    2,    2,    2,   16,   16,   16,   16,
-     16,  160,    2,    5,    0,    0,    0,    0,    0,    2,   51,   51,    0,    0,    0,    0,
-      0,    5,    2,    2,    5,    2,    2,    2,    2,    8,    2,    5,    0,    8,    2,    0,
-      0,  161,  162,  163,    2,    2,    2,    2,    2,    2,    2,    2,    2,    7,    7,    6,
-      6,    6,    7,    7,   93,    0,    0,    0,    0,    0,   28,   28,   28,   28,   28,   28,
-     28,   28,   28,   28,    2,    2,    2,    2,    2,   40,   30,   40,    0,    0,    0,    0,
-    164,   19,   17,   18,   15,   67,   35,    0,    0,    0,   13,    0,    0,    0,    0,    0,
-      0,    9,   55,    2,    2,    2,    2,    2,    2,    2,    2,    2,   47,    6,    7,  165,
-      7,   18,  166,   98,    2,    2,    2,    2,    2,    0,    0,   23,  167,    0,    0,    0,
-      0,    2,   50,    0,    0,    0,    0,    0,    0,    2,   23,   22,    6,    6,    6,    7,
-      7,   61,   64,    0,    0,   69,   99,   13,  100,    2,    2,    2,    2,    2,    2,   11,
-     17,    7,    7,  168,   46,    0,    0,    0,   55,   47,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    5,    5,    2,    2,    8,    2,    2,    2,    2,    2,    2,    2,
-      8,    2,    2,    2,    2,    2,    2,    2,   36,   19,   17,   18,    7,  169,   13,    0,
-      0,    9,    9,    8,    2,    2,    2,    5,    8,    5,    2,    8,    2,    2,   56,   32,
-     11,   15,   11,   27,   29,   33,   29,   45,    0,    0,    0,    0,   34,    0,    0,    0,
-      2,    2,   11,    0,    9,    9,    9,   26,    0,    9,    9,   26,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    8,    0,    5,    2,    2,    2,    8,   20,   21,    6,
-      6,   13,   33,   29,   29,   22,  170,   14,  171,  101,   35,    0,    0,    0,    0,    0,
-      0,   31,   52,    0,    0,    0,    0,    0,    0,    2,    2,   23,   22,    6,    6,    6,
-      7,   11,   92,   24,   32,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,    0,
-    172,  173,    0,    0,    0,    0,    0,    0,    0,   19,   17,    6,    6,   57,   71,   22,
-    100,    9,  102,    5,    0,    0,    0,    0,    0,   22,    6,    6,    0,   12,   12,    9,
-     65,   35,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,    6,
-      0,   11,   17,    6,    6,   18,   15,   60,   65,   38,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   36,  174,   22,    6,    7,    7,  102,    5,    0,    0,
-      0,    2,    2,    2,    2,    2,    5,   77,   94,   11,    7,    6,   58,   18,    7,    0,
-      0,    2,    2,    2,    5,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   19,
-     17,    6,   18,    7,   87,   65,   35,    0,    0,    2,    2,    2,    5,    8,    0,    2,
-      2,    2,    2,    8,    5,    2,    2,    2,    2,   11,   11,   19,   29,   33,   31,  175,
-    101,  176,  177,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
-      2,   23,   22,    6,    6,    0,    7,   11,   14,   61,    0,   33,    0,    0,    0,    0,
-      0,   30,    6,    7,    7,    7,   73,    2,    2,    2,  178,   95,    9,   24,  179,   10,
-    180,    0,    0,   48,   97,    0,    0,    0,    0,   30,    6,    7,   15,   17,    6,    2,
-      2,    2,    2,   64,   64,   64,   43,   43,   43,   43,   43,   43,   24,  181,    0,    8,
-      0,   15,    6,   15,   15,    0,    0,    0,    0,    7,    6,    6,   13,    7,    7,    9,
-     65,    0,   10,   10,   10,   10,   10,   10,   10,   57,   18,   60,   26,    0,    0,    0,
-      0,    2,    2,    2,    5,    2,    8,    2,    2,   30,    7,    7,   13,    0,   38,    7,
-     25,    9,   99,  182,  183,    0,    0,    0,    0,    2,    2,    2,    8,    5,    2,    2,
-      2,    2,    2,    2,    2,    2,   11,   11,   27,    7,   34,   60,   82,    0,    0,    0,
-      0,    2,  184,   57,   27,    0,    0,    0,    0,    9,  185,    2,    2,    2,    2,    2,
-      2,    2,    2,   11,    7,    6,   13,    0,   12,   15,   96,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   98,    0,    0,   66,   66,   66,  186,  187,   66,    1,
-      1,  188,    1,    1,  189,   37,   37,   37,   37,   37,   37,   37,    0,    0,    0,    0,
-      0,    1,    1,    1,    1,    1,  190,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-      7,    7,    7,    7,    7,    7,  191,  192,  193,    9,    9,    9,   26,    0,    0,    0,
-      0,   14,   41,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   23,   27,
-      0,    2,    2,    2,    2,    2,    5,    0,   56,  194,    6,    6,    6,    6,    6,    6,
-      6,    6,    6,    6,    6,    0,    0,    0,   53,   16,   52,    0,    0,    0,    0,    0,
-      0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      8,    2,    2,    2,    2,    2,    0,   56,   35,    0,   49,    3,    3,    3,   72,    0,
-      0,    9,    9,    9,   55,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
-      2,    2,    2,    2,    2,    2,    2,    2,   26,    2,    2,    2,    2,    2,    2,    9,
-      9,    2,    2,    2,    2,    2,    2,    7,    7,    2,    2,    2,    2,    2,    2,    2,
-      6,    2,    2,   46,   46,   46,   86,    0,    0,    O,    O,    G,    G,    B,    B,   WJ,
-     WJ,  CGJ,  CGJ,    B,    O, VBlw, VBlw, VAbv, VAbv,    O,    B,VMAbv,VMAbv,  SUB,  SUB, VPst,
-   VPst, VPre, VPre, VBlw,    O,VMPst,VMPst, VAbv, VPst,VMBlw,VMBlw, VPst, VBlw, VBlw, VAbv, VPst,
-   VPre, VPst, VAbv, VAbv, VBlw, VPre, VPst,    B, VPst,VMAbv,VMPst,    O, VAbv,VMAbv,    O, VPst,
-      O,    N,    N,    O, VPre,    B, VAbv,    O,VMAbv,CMBlw,    B, VPre,    O,    O, VPst,CMBlw,
-      O,    B,VMAbv,   HM,   HM, VAbv,    O,   GB,   GB, VAbv,    B,VMPst,    B, FAbv, FAbv, FBlw,
-   FBlw,   GB,    O, VPre,    H,CMAbv,CMAbv,    B, VBlw,    O,   GB,    O,   WJ,    B,CMBlw,CMBlw,
-  CMBlw,VMBlw,    O,    O,VMBlw,VMAbv,CMAbv,VMAbv,    B,    O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw,
-   VPst, VPst,VMAbv,    H,    B,SMAbv,SMAbv,   SB,   SE,    R,    R,VMPst,    H,    J,    J, VPst,
-      H, VAbv,    H,    O,FMBlw, FPst, FPst, VAbv, VPre,   WJ,    O, VBlw,    B,    O,   SB,    O,
-     SE,FMPst,FMPst,    O, MBlw,   CS,VMPst,    B,  SUB,    O,  SUB,  SUB,    O,VMPst,   IS, MBlw,
-      B, VPst,VMPst,    B,VMPst,CMAbv,    B, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst, VBlw, FAbv,FMPst,
-      O,    H,VMAbv,    H,    O, MPre, MAbv, VBlw,VMAbv,   IS,    O,    O,   IS,CMAbv,    O,CMBlw,
-   VAbv, VPre,VMAbv,   IS,    R,    H,CMBlw,    O,  CGJ,   GB,VMAbv,FMAbv,    O,    O,   CS,    R,
-      O,  HVM,    O,    O,CMAbv,FMBlw,    O,VMAbv,VMBlw, VAbv, MPst, MPre, MBlw, MBlw, MBlw, MBlw,
-   VPst, VAbv,VMPst,VMPst,VMBlw,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,
-  FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,CMAbv, VAbv,  SUB,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw,    B,
-   MPre, MBlw,  SUB, MAbv,  SUB,   Sk, VPst,    O,SMAbv, VPst,   IS,   RK,   RK,VMPre,VMPre,FMAbv,
-  CMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,    O,    H, MPst, VPst, VAbv,VMBlw, FPst, VPst, FAbv,
-  VMPst,    B,CMAbv, VAbv, MBlw, MPst, MBlw, VBlw, MPst, MBlw,    O,    B, FAbv, FAbv, FPst,    B,
-   VPre,    O,VMPst,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,
-      B,    O,   HN, VPre, VBlw, VAbv,   IS, VPst,    B,VMAbv,    H, VAbv,CMBlw,VMPst,    O,VMAbv,
-  CMBlw,FMAbv,    B,   CS,   CS,VMPst, VAbv,VMAbv, VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,
-    SUB,  SUB,   GB,CMAbv,   IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,VMPst,    J,   SB,   SE,
-      J,   HR,    G,    G,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,   40,   41,   42,   43,   44,   45,    2,   46,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   47,   48,    2,
+     49,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   50,   51,    2,    2,    2,
+      2,    2,    2,    2,    2,   52,   53,    2,   54,    2,    2,   55,   56,    2,   57,   58,
+     59,   60,   61,   62,   63,   64,   65,   66,   67,   68,   69,    2,   70,   71,   72,   73,
+      2,   74,    2,   75,   76,   77,   78,   79,    2,   80,   81,   82,   83,    2,   84,   85,
+      2,   86,   86,   86,   86,   86,   86,   86,   86,   87,   86,   86,   86,   86,   86,   86,
+     86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+     86,   86,   86,   86,   86,   86,   86,   86,   88,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,   89,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   90,   91,    2,    2,    2,   92,    2,    2,    2,   93,
+     94,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   95,   95,   95,   96,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,   97,   98,    2,    2,    2,    2,    2,
+      2,    2,    2,   99,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,  100,    2,    2,  101,    2,    2,    2,  102,    2,  103,    2,    2,    2,
+      2,    2,    2,  104,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,  105,  105,  106,  107,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+    105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+    105,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      0,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    3,    4,
+      0,    5,    0,    0,    0,    0,    0,    6,    0,    0,    7,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      8,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   10,   11,
+     11,   11,   11,    0,    0,    0,    9,   12,    0,    2,    2,    2,    2,   13,   14,    0,
+      0,   11,   15,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   16,   17,
+     18,   19,   20,   21,   22,   16,   23,   24,   25,   12,   26,   27,   20,    2,    2,    2,
+      2,    2,   20,    0,    2,    2,    2,    2,    2,    0,    2,    2,    2,    2,    2,    2,
+      2,   28,   29,   30,    2,    2,    2,    9,   30,    9,   30,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    9,    2,    2,    2,    9,    9,    0,    2,    2,    0,   17,
+     18,   19,   20,   31,   32,   33,   32,   34,    0,    0,    0,    0,   35,    0,    0,    2,
+     30,    2,    0,    0,    0,    0,    0,    9,   36,   12,   15,   30,    2,    2,    9,    0,
+     30,    9,    2,   30,    9,    2,    0,   37,   18,   19,   31,    0,   27,   38,   27,   39,
+      0,   40,    0,    0,    0,   30,    2,    9,    9,    0,    0,    0,    2,    2,    2,    2,
+      2,   41,   42,   43,    0,    0,    0,    0,    0,   12,   15,   30,    2,    2,    2,    2,
+     30,    2,   30,    2,    2,    2,    2,    2,    2,    9,    2,   30,    2,    2,    0,   17,
+     18,   19,   20,   21,   27,   22,   35,   24,    0,    0,    0,    0,    0,   30,   41,   41,
+     44,   12,   29,   30,    2,    2,    2,    9,   30,    9,    2,   30,    2,    2,    0,   17,
+     45,    0,    0,   27,   22,    0,    0,    2,   30,   30,    0,    0,    0,    0,    0,    0,
+      0,    0,   46,   30,    2,    2,    9,    0,    2,    9,    2,    2,    0,   30,    9,    9,
+      2,    0,   30,    9,    0,    2,    9,    0,    2,    2,    2,    2,    2,    2,    0,    0,
+     23,   16,   47,    0,   48,   33,   48,   34,    0,    0,    0,    0,   35,    0,    0,    0,
+      0,   15,   29,   49,    2,    2,    2,    9,    2,    9,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    0,   17,   22,   16,   23,   47,   22,   38,   22,   39,
+      0,    0,    0,   27,   31,    2,    9,    0,    0,   10,   29,   30,    2,    2,    2,    9,
+      2,    2,    2,   30,    2,    2,    0,   17,   45,    0,    0,   35,   47,    0,    0,    0,
+      9,   50,   51,    0,    0,    0,    0,    0,    0,   11,   29,    2,    2,    2,    2,    9,
+      2,    2,    2,    2,    2,    2,   52,   53,   23,   19,   20,   31,   48,   33,   48,   34,
+     54,    0,    0,    0,   35,    0,    0,    0,   30,   12,   29,   30,    2,    2,    2,    2,
+      2,    2,    2,    2,    9,    0,    2,    2,    2,    2,   30,    2,    2,    2,    2,   30,
+      0,    2,    2,    2,    9,    0,   55,    0,   35,   23,   22,   31,   31,   18,   48,   48,
+     25,    0,   23,    0,    0,    0,    0,    0,    0,    2,    0,    2,    9,    0,    0,    0,
+      0,    0,    0,    0,    0,   20,    0,    0,    0,    2,    2,   56,   56,   57,    0,    0,
+     18,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,    2,    2,    9,
+      0,   58,   21,   59,   22,   22,   20,   20,   46,   21,   11,   31,   11,    2,    2,   60,
+     61,   61,   61,   61,   61,   62,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+     61,   61,   61,   61,   61,   61,   61,   63,    0,    0,    0,    0,   64,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   65,   45,   59,   66,   22,   22,   67,   68,   69,   70,
+     71,    2,    2,    2,    2,    2,    1,    0,    5,    2,    2,    2,   23,   20,    2,    2,
+     72,   71,   73,   74,   65,   73,   29,   29,    2,   52,   22,   53,    2,    2,    2,    2,
+      2,    2,   75,   76,   77,   29,   29,   78,   79,    2,    2,    2,    2,    2,   29,   45,
+      0,    2,   59,   80,    0,    0,    0,    0,   30,    2,   59,   47,    0,    0,    0,    0,
+      0,    2,   59,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    9,
+      2,    9,   59,    0,    0,    0,    0,    0,    0,    2,    2,   81,   45,   22,   59,   20,
+     48,   48,   48,   48,   15,   82,   83,   84,   85,   86,   87,    0,    0,    0,    0,   88,
+      0,    9,    0,    0,   30,    0,   89,   81,   90,    2,    2,    2,    2,    9,    0,    0,
+      0,   42,   42,   91,   92,    2,    2,    2,    2,    2,    2,    2,    2,   13,    9,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,    9,   22,   80,   45,   22,   93,   61,    0,
+      0,   94,   95,   94,   94,   96,   97,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+      0,    2,    2,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
+      0,    2,    2,    2,    2,   29,    0,    0,    0,    2,    2,    2,    2,    2,    9,    0,
+      0,    2,    2,    2,   52,   98,   45,    0,    0,    2,    2,   99,  100,  101,  102,   61,
+     63,  103,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  104,   46,
+     40,   11,  105,   74,    2,    2,    2,    2,    2,    2,    2,  106,   22,   20,   20,   22,
+     48,   48,   22,  107,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  108,  109,
+    109,  109,  109,    0,    0,    0,    0,    0,    0,  105,   74,    2,    2,    2,    2,    2,
+      2,   60,   61,   59,   25,   22,  110,   61,    2,    2,    2,    2,  106,   22,   23,   45,
+     45,  101,  111,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  112,
+    101,  101,  101,  113,  114,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
+      2,   11,   46,  115,  115,  115,   11,  115,  115,   15,  115,  115,  115,   26,    0,   40,
+      0,    0,    0,  116,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+      0,    0,    0,    0,    0,    0,    6,  118,  119,   42,   42,    5,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  119,  119,  120,  119,  119,  119,  119,  119,  119,  119,
+    119,    0,    0,  121,    0,    0,    0,    0,    0,    0,    7,  121,    0,    0,    0,    0,
+      0,   46,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
+      0,    0,    0,    0,  122,  122,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
+     30,    0,    0,    0,    0,    0,    0,    0,  123,    0,  122,  122,    0,    0,    0,    0,
+      0,    2,   53,    2,  107,    2,   10,    2,    2,    2,   65,   19,   16,    0,    0,   31,
+      0,    2,    2,    0,    0,    0,    0,    0,    0,   29,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,  124,   23,   23,   23,   23,   23,   23,   23,  125,    0,    0,    0,    0,
+      0,   11,   11,   11,   11,   11,   11,   11,   11,   11,    2,    0,    0,    0,    0,    0,
+     52,    2,    2,    2,   22,   22,  126,  115,    0,    2,    2,    2,  127,   20,   59,   20,
+    112,  101,  128,    0,    0,    0,    0,    0,    0,   11,  129,    2,    2,    2,    2,    2,
+      2,    2,  130,   23,   22,   20,   48,  131,  132,  133,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,   52,   30,    2,    2,    2,    2,    2,    2,    2,    2,   10,   22,   59,
+     98,   76,  134,  135,  136,    0,    0,    0,    0,    2,  137,    2,    2,    2,    2,  138,
+      0,   30,    2,   42,    5,    0,   79,   15,    2,  139,   20,   53,  127,  139,    2,    2,
+    140,   10,    9,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  141,   21,
+     25,    0,    0,  142,  143,    0,    0,    0,    0,    2,   65,   45,   23,   80,   47,  144,
+      0,   81,   81,   81,   81,   81,   81,   81,   81,    0,    0,    0,    0,    0,    0,    0,
+      6,  119,  119,  119,  119,  120,    0,    0,    0,    2,    2,    2,    2,    2,    9,    2,
+      2,    2,    9,    2,   30,    2,    2,    2,    2,    2,   30,    2,    2,    2,   30,    9,
+      0,  127,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
+      2,    2,    2,    2,    0,   14,   37,    0,  147,    2,    2,   13,   37,    0,   30,    2,
+      2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,
+      9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    0,   27,   22,   22,
+     30,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
+      0,    2,    2,    2,  115,  115,  115,  115,  115,  148,    2,    9,    0,    0,    0,    0,
+      0,    2,   14,   14,    0,    0,    0,    0,    0,    9,    2,    2,    9,    2,    2,    2,
+      2,   30,    2,    9,    0,   30,    2,    0,    0,  149,  150,  151,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,   22,   22,   20,   20,   20,   22,   22,  133,    0,    0,    0,
+      0,    0,  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,    2,    2,    2,    2,
+      2,   53,   52,   53,    0,    0,    0,    0,  153,   11,   74,    2,    2,    2,    2,    2,
+      2,   18,   19,   21,   16,   24,   37,    0,    0,    0,   31,    0,    0,    0,    0,    0,
+      0,   11,   49,    2,    2,    2,    2,    2,    2,    2,    2,    2,  127,   20,   22,  154,
+     22,   21,  155,  156,    2,    2,    2,    2,    2,    0,    0,   65,  157,    0,    0,    0,
+      0,    2,   13,    0,    0,    0,    0,    0,    0,    2,   65,   25,   20,   20,   20,   22,
+     22,  107,  158,    0,    0,   56,  159,   31,  160,   30,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   23,   19,   22,   22,  161,   44,    0,    0,    0,
+     49,  127,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    9,    9,    2,    2,
+     30,    2,    2,    2,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,
+     10,   18,   19,   21,   22,  162,   31,    0,    0,   11,   11,   30,    2,    2,    2,    9,
+     30,    9,    2,   30,    2,    2,   58,   17,   23,   16,   23,   47,   32,   33,   32,   34,
+      0,    0,    0,    0,   35,    0,    0,    0,    2,    2,   23,    0,   11,   11,   11,   46,
+      0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   30,    0,
+      9,    2,    2,    2,   30,   45,   59,   20,   20,   31,   33,   32,   32,   25,  163,   29,
+    164,  165,   37,    0,    0,    0,    0,    0,    0,   12,   26,    0,    0,    0,    0,    0,
+      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  125,   15,   17,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    0,    0,  166,  167,    0,    0,    0,    0,    0,    0,
+      0,   18,   19,   20,   20,   66,   98,   25,  160,   11,  168,    9,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
+    169,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
+      0,   23,   19,   20,   20,   21,   16,   82,  169,   38,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   10,  170,   25,   20,   22,   22,  168,    9,    0,    0,
+      0,    2,    2,    2,    2,    2,    9,   43,  135,   23,   22,   20,   76,   21,   22,    0,
+      0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
+     19,   20,   21,   22,  104,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
+      2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  171,
+    165,  172,  173,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
+      2,   65,   25,   20,   20,    0,   22,   23,   29,  107,    0,   33,    0,    0,    0,    0,
+      0,   52,   20,   22,   22,   22,  139,    2,    2,    2,  174,  140,   11,   15,  175,   61,
+    176,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
+      2,    2,    2,  158,  158,  158,  177,  177,  177,  177,  177,  177,   15,  178,    0,   30,
+      0,   16,   20,   16,   16,    0,    0,    0,    0,   22,   20,   20,   31,   22,   22,   11,
+    169,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
+      0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
+     27,   11,  159,  179,  180,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
+      2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
+      0,    2,  181,   66,   47,    0,    0,    0,    0,   11,  182,    2,    2,    2,    2,    2,
+      2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,  156,    0,    0,  183,  183,  183,  183,  183,  183,  183,
+    183,  184,  184,  184,  185,  186,  184,  183,  183,  187,  183,  183,  188,  189,  189,  189,
+    189,  189,  189,  189,    0,    0,    0,    0,    0,  183,  183,  183,  183,  183,  190,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  191,  192,
+    193,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   65,   47,    0,    2,    2,    2,    2,    2,    9,    0,
+     58,  194,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,    0,    0,    0,   40,  115,   26,    0,    0,    0,    0,    0,
+      0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  119,  119,  119,  120,    0,
+      0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
+      2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
+     11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,    2,    2,    2,    2,    2,
+     20,    2,    2,   44,   44,   44,   92,    0,    0,    O,    O,    O,   GB,    B,    B,    O,
+     SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,
+  VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst,
+   VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst,    H, VPre, VPst,VMBlw,    O,    O,
+   VAbv,   GB,VMAbv,VMPst,VMPst,    O,    B, VBlw,    O,    O, VPre, VPre,    O, VPre,    H,    O,
+   VPst,FMAbv,    O,CMBlw,    O, VAbv,    O, VAbv,    H,    O,VMBlw,VMAbv,CMAbv,   GB,   GB,    O,
+   MBlw,CMAbv,CMAbv, VPst, VAbv,VMAbv,    O, VPst,    O, VPre, VPre,VMAbv,    B,    O,   CS,   CS,
+  VMPst,    B, VAbv, VAbv,    B,    R,    O,  HVM,    O,    O,FMBlw,    O,CMAbv,    O,CMBlw, VAbv,
+   VBlw,    B,  SUB,  SUB,  SUB,    O,  SUB,  SUB,    O,FMBlw,    O,    B, VPst, VBlw, VPre,VMAbv,
+  VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,    B, MBlw, MBlw, VPst,VMPst,VMPst,    B, MBlw,
+   VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,
+  FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,
+  CMAbv,CMAbv,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B,
+   MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,
+      B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,
+  VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,
+      H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv,
+   MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,
+      B, VBlw,VMAbv,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
+     IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,   HN, VPre, VBlw, VAbv,
+     IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,
+      O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
+   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,
+     IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,
+      G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
 };
 static const uint16_t hb_use_u16[864]=
 {
-     0,   0,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8,   8,
-    16,  16,  16,  16,  16,  16,  16,  16,  24,  24,  24,  24,  24,  24,  24,  24,
-     0,   0, 272,  32,   0, 120,   0, 120,   0,   0, 280, 288,   0, 296,   0,   0,
-     0,   0,   0,   0, 304,   0,   0,   0,   0,   0,   0,   0, 128,   0,   0,   0,
-     0,   0,   0,   0, 136,  24, 312, 320,   0,   0,   0,   0,  24, 328,   0,   0,
-   336,  24,  24, 344, 352, 360,  56, 144, 368,  64,  48, 376, 152, 384,  56, 392,
-   400,  64,  48, 408, 416, 424,  72, 432, 440, 112,  48, 448, 456,   0,  56, 464,
-   472,  64,  48, 480, 152, 488,  56, 496, 504, 512, 520, 528, 536, 544,  72,   0,
-   552,  80,  48, 560, 160, 568,  56,   0, 576,  80,  48, 584, 160, 592,  56, 600,
-   608,  80,  24, 616, 624, 632,  56,   0, 640, 648,  24, 656, 664, 672,  72, 680,
-   688, 696,  24, 704, 168,  24,  88, 712, 720, 176, 728, 736, 744,   0,   0,   0,
-    24,  24, 752, 760, 768, 776, 784, 792, 800, 808,   0,   0,   0,   0,   0,   0,
-    24, 816,  24, 824,  24, 832, 840, 848,  24,  24,  24, 856, 864, 872,  32,   0,
-   880,   0,  24,  24,  24,  24,  24,  96, 888,  24, 896,   0,   0,   0,   0,   0,
-    24, 184, 904, 912,  72,  24, 920, 192,  24,  24, 200,  24, 928, 104,   0,   0,
-    24, 936,  24,  24,  24, 944, 952, 960,  32,  32,   0,   0,   0,   0,   0,   0,
-   968,  24,  24, 976, 984,  32, 992,1000,1008,  24,1016,  24,  24,  24,1024,1032,
-    24,  24,1040,1048,1056,   0,   0,   0,   0,   0,   0,   0,   0,1064,1072,1080,
-     0,   0,   0,   0,   0,   0,   0,1088,1096,1104,1112,   0,   0,   0,  16,1120,
-  1128,   0,   0,   0,   0,   0,   0,1136,   0,   0,   0,   0,1144,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1152,   0,   0,   0,   0,  24,  24,  24,1160,1168,
-     0,   0,1176,   0,   0,   0,   0,   0,1184,  24,1192,   0,  24,  24,  24, 208,
-  1200,  24,  24,1208,1216,  32,1224,1232,  24,  24,1240,  24,1248,1256,   0,   0,
-  1264,  24,  24,1272,1280,  32,1288, 184,  24,  24,1296,1304,1312,  32,  24,1320,
-    24,  24,  24,1328,1336,   0,1344,1352,   0,   0,   0,   0,  24,  24,1360,  32,
-    40,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1368,
-     0,   0,   0,   0,   0,   0,   0,1376,   0,   0,   0,   0,   0,   0,   0, 216,
-   216,1384, 112,1392,   0,   0,   0,   0,1400,1408,  24,1416,  96,   0,   0,   0,
-     0,   0,   0,   0, 168,  24,1424,   0,  24, 224,1432,   0,   0,   0,   0,   0,
-    24,  24,1440,  32, 136,  24,1448,  24, 232,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,1456, 224,   0,   0,   0,   0,   0,   0,   0,  24,1464,1472,   0,  24,
-  1480,   0,   0,1488,1496,   0,   0,   0,1504,  24,  24,1512,1520,1528,1536,1544,
-   240,  24,  24,1552,1560,   0,   0,   0,1568,  24,1576,1584,1592,  24,  24,1600,
-   240,  24,  24,1608,1616, 104, 248, 192,  24, 112,1624,1632,1640,   0,   0,   0,
-  1648,1656,  96,  24,  24,1664,1672,  32,1680,  64,  48,1688,1696,1704,1712,1720,
-  1728,  24,  24,1736,1744,1752,1760,   0,  24,  24,  24,1768,1776,1784,1792,   0,
-   248,  24,  24,1800,1808,  32,   0,   0,  24,  24, 256,1816,1824,1832,   0,   0,
-    24,  24,  24,1840,1848,  32,   0,   0,  24,  24,1856,1864,  32,  24, 208,   0,
-    24,1872,1880, 200,1888,   0,   0,   0,  24,  24,1896,1904,   0,   0,   0,   0,
-  1912,1920,  24,1928,1936,  32,   0,   0,   0,   0,1944,  24,  24,1952,1960,   0,
-  1968,  24,  24,1976,1984,1992,  24,  24,2000,2008,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,2016,   0,  48,  24, 256,2024, 128,  24,  88, 144,
-    24,2032, 176,2040,   0,   0,   0,   0,2048,  24,  24,2056,2064,  32,2072,  24,
-  2080,2088,  32,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  24,2096,
-  2104,  80,  24,2112,2120,2128,   0,   0,   8,   8,   8,2136,2144,2152,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,2160,  24,2168,2176,  32,   0,   0,   0,   0,
-     0,   0,   0,   0,  32,   0,   0,   0,  24,  24,  24,2184,   0,   0,   0,   0,
-     0,   0,   0,   0,2192,  24,2200,  32,  24,  24,  24,  24,2208,2216, 264, 264,
-  2224,2232,   0,   0,   0,   0,2240,   0,  24,  24,  24,  24,  24, 232,   0,2248,
-    24,  24,  24,  24,  24,  24, 104,  88,  96,2256,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,2264,  24,  24,  88,2272,2280,   0,   0,   0,
-     0,  24,2288,   0,  24,  24,2296,  32,   0,   0,   0,   0,   0,  24,2304,  32,
-     0,   0,   0,   0,   0,  24,2312, 104,  24,  24,  24,  24,2320,  32,   0,   0,
-    40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  16,
+    0,  0,  1,  2,  0,  3,  0,  3,  0,  0,  4,  5,  0,  6,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
+    0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  9, 10, 11, 12,
+    0,  0,  0,  0, 10, 13,  0,  0, 14, 10, 10, 15, 16, 17, 18, 19,
+   20, 21, 22, 23, 24, 25, 18, 26, 27, 21, 22, 28, 29, 30, 31, 32,
+   33, 34, 22, 35, 36,  0, 18, 37, 38, 21, 22, 39, 24, 40, 18, 41,
+   42, 43, 44, 45, 46, 47, 31,  0, 48, 49, 22, 50, 51, 52, 18,  0,
+   53, 49, 22, 54, 51, 55, 18, 56, 57, 49, 10, 58, 59, 60, 18,  0,
+   61, 62, 10, 63, 64, 65, 31, 66, 67, 68, 10, 69, 70, 10, 71, 72,
+   73, 74, 75, 76, 77,  0,  0,  0, 10, 10, 78, 79, 80, 81, 82, 83,
+   84, 85,  0,  0,  0,  0,  0,  0, 10, 86, 10, 87, 10, 88, 89, 90,
+   10, 10, 10, 91, 92, 93,  2,  0, 94,  0, 10, 10, 10, 10, 10, 95,
+   96, 10, 97,  0,  0,  0,  0,  0, 10, 98, 99,100, 31, 10,101,102,
+   10, 10,103, 10,104,105,  0,  0, 10,106, 10, 10, 10,107,108,109,
+    2,  2,  0,  0,  0,  0,  0,  0,110, 10, 10,111,112,  2,113,114,
+  115, 10,116, 10, 10, 10,117,118, 10, 10,119,120,121,  0,  0,  0,
+    0,  0,  0,  0,  0,122,123,124,  0,  0,  0,  0,  0,  0,  0,125,
+  126,127,128,  0,  0,  0,129,130,131,  0,  0,  0,  0,  0,  0,132,
+    0,  0,  0,  0,133,  0,  0,  0,  0,  0,  0,  0,  0,  0,134,  0,
+    0,  0,  0, 10, 10, 10,135,136,  0,  0,137,  0,  0,  0,  0,  0,
+  138, 10,139,  0, 10, 10, 10,140,141, 10, 10,142,143,  2,144,145,
+   10, 10,146, 10,147,148,  0,  0,149, 10, 10,150,151,  2,152, 98,
+   10, 10,153,154,155,  2, 10,156, 10, 10, 10,157,158,  0,159,160,
+    0,  0,  0,  0, 10, 10,161,  2,162,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,163,  0,  0,  0,  0,  0,  0,  0,164,
+    0,  0,  0,  0,  0,  0,  0,165,165,166, 34,167,  0,  0,  0,  0,
+  168,169, 10,170, 95,  0,  0,  0,  0,  0,  0,  0, 70, 10,171,  0,
+   10,172,173,  0,  0,  0,  0,  0, 10, 10,174,  2,  9, 10,175, 10,
+  176,  0,  0,  0,  0,  0,  0,  0, 10, 10,177,172,  0,  0,  0,  0,
+    0,  0,  0, 10,178,179,  0, 10,180,  0,  0,181,182,  0,  0,  0,
+  183, 10, 10,184,185,186,187,188,189, 10, 10,190,191,  0,  0,  0,
+  192, 10,193,194,195, 10, 10,196,189, 10, 10,197,198,105,199,102,
+   10, 34,200,201,202,  0,  0,  0,203,204, 95, 10, 10,205,206,  2,
+  207, 21, 22,208,209,210,211,212,213, 10, 10,214,215,216,217,  0,
+   10, 10, 10,218,219,220,221,  0,199, 10, 10,222,223,  2,  0,  0,
+   10, 10,224,225,226,227,  0,  0, 10, 10, 10,228,229,  2,  0,  0,
+   10, 10,230,231,  2, 10,140,  0, 10,232,233,103,234,  0,  0,  0,
+   10, 10,235,236,  0,  0,  0,  0,237,238, 10,239,240,  2,  0,  0,
+    0,  0,241, 10, 10,242,243,  0,244, 10, 10,245,246,247, 10, 10,
+  248,249,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,
+   22, 10,224,251,  8, 10, 71, 19, 10,252, 74,253,  0,  0,  0,  0,
+  254, 10, 10,255,256,  2,257, 10,258,259,  2,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 10,260,261, 49, 10,262,263,264,  0,  0,
+  265,265,265,265,265,265,265,265,265,265,265,266,267,268,265,265,
+  265,265,265,265,265,265,265,269, 10,270,271,  2,  0,  0,  0,  0,
+    0,  0,  0,  0,  2,  0,  0,  0, 10, 10, 10,272,  0,  0,  0,  0,
+    0,  0,  0,  0,273, 10,274,  2, 10, 10, 10, 10,275,276,277,277,
+  278,279,  0,  0,  0,  0,280,  0, 10, 10, 10, 10, 10, 10, 10, 10,
+   10, 10, 10, 10, 10,176,  0,281, 10, 10, 10, 10, 10, 10,105, 71,
+   95,282,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,283,
+   10, 10, 71,284,285,  0,  0,  0,  0, 10,286,  0, 10, 10,287,  2,
+    0,  0,  0,  0,  0, 10,288,  2,  0,  0,  0,  0,  0, 10,289,105,
+   10, 10, 10, 10,290,  2,  0,  0,129,129,129,129,129,129,129,129,
+  162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,129,
 };
 
 static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
@@ -379,8 +379,7 @@ static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
 }
 static inline uint8_t hb_use_get_category (unsigned u)
 {
-  /* packtab: [2^4,2^5,2^3,2^3,2^1] */
-  return u<921600u ? (uint8_t)(hb_use_u8[2953u+((hb_use_u8[625u+hb_use_u16[((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((u)>>1))>>3))>>3))>>5)))<<5)+((((((((u)>>1))>>3))>>3))&31)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O;
+  return u<921600 ? hb_use_u8[2953u+((hb_use_u8[625u+((hb_use_u16[((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((u)>>1))>>3))>>3))>>5)))<<5)+((((((((u)>>1))>>3))>>3))&31)])<<3)+((((((u)>>1))>>3))&7)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : O;
 }
 
 
@@ -390,269 +389,269 @@ static inline uint8_t hb_use_get_category (unsigned u)
 
 static const uint8_t hb_use_u8[3663]=
 {
-     33,    3,    0,    0,    0,    4,    0,   80,  118,  128,    9,   10,   11,  192,  208,   14,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     15,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    3,    0,    0,    4,    0,    0,    5,    6,    7,    8,    9,   10,   11,   12,    0,
-     13,   14,    0,    0,    0,    0,    0,    0,   15,   16,   17,   18,   19,   20,   21,    0,
-      0,   22,    0,    0,    0,    0,   23,    0,   24,    0,    0,    0,    0,    0,   25,   26,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,   27,   28,   29,   30,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   31,
-     32,    0,    0,    0,    0,    0,   33,    0,    0,    0,    0,   34,   35,    0,   36,   37,
-     38,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-     54,    1,    1,    1,    1,   55,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,   56,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,   57,    0,    0,    0,    0,    0,    0,    0,    0,   58,   59,    0,   60,    0,
-     61,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   62,   63,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   64,    0,    0,
-      0,    0,   65,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,   66,   67,    0,   68,   69,    0,    0,    0,   70,    0,    0,    0,    0,    0,
-      0,    2,   71,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    0,    0,    0,    0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    1,    1,
-      1,    2,    2,    2,    2,    2,    2,    2,    2,    0,   12,    7,    7,    0,   13,   14,
-      0,    0,    0,   15,    0,    0,    0,    0,    0,    0,    0,   16,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    8,   17,    0,    0,   18,    0,    0,    0,    0,
-      0,   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
-     34,   35,   36,   37,   38,   39,   40,   41,   42,   43,   44,   45,    9,   46,   47,   48,
-     49,   50,   51,   52,    9,   53,   54,   55,   56,   57,   58,   10,   59,   60,   61,   62,
-      0,    3,   63,   64,   65,   66,    0,    0,    0,   67,   68,   69,   70,    3,   71,   72,
-      6,   73,    3,    3,   74,   75,   76,    0,    0,   77,   78,   79,   80,    3,   81,   82,
-      0,   83,    3,   84,   85,   86,    0,    0,    0,   87,   88,   89,   90,   91,   92,    3,
-     93,    3,   94,   95,    0,    0,    0,   96,   97,    0,    0,    0,    0,    0,    0,    0,
-     98,   99,  100,    0,  101,  102,    0,    0,  103,    0,    0,    0,    0,    0,    0,  104,
-      0,    0,    0,    0,    0,    0,    0,    0,  105,    0,    5,    3,  106,    0,    0,    0,
-      0,    0,  107,    0,    0,    0,    0,    0,    0,  108,  109,    3,  110,  111,  112,  113,
-    114,    3,  115,  116,    0,  117,  118,  119,  120,    3,  121,  122,  123,    3,  124,  125,
-    126,    0,    0,    0,    0,    0,    0,    3,  127,  128,    0,    0,    0,    0,    0,    0,
-    129,    0,    0,    0,    0,    0,    0,    0,  130,    0,    0,    0,  131,  132,  133,    0,
-      0,  134,  135,  136,    0,    0,    0,   10,  137,    0,    0,    0,    0,  138,  139,    0,
-      0,    3,  140,    8,  141,  142,    0,    0,    0,    0,    0,    0,    0,    3,  143,    0,
-      0,    0,    5,  144,    5,  145,  146,  147,    0,  148,  149,  150,  151,   11,  152,  153,
-      0,  154,  155,  156,  157,   11,  158,  159,  160,  161,  162,  163,    0,  164,  165,  166,
-    167,  168,  169,  170,  171,  172,  173,  174,  175,    3,  176,  177,  178,  179,  180,  181,
-      0,    0,    0,    0,    0,    3,  182,  183,    0,    3,  184,  185,    0,    3,  186,  187,
-    188,  189,  190,  191,    0,    0,    0,    0,    0,    3,  192,    0,    0,    0,    0,    0,
-      0,  193,  194,  195,    0,    0,  196,  197,  198,  199,  200,  201,    3,  202,    0,    0,
-      0,    0,    0,    0,  203,    0,    0,    0,    0,  204,  205,  206,  207,  208,  209,    0,
-      0,  210,  211,  212,  213,  214,    6,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    215,  216,  217,  218,    0,    0,    0,    0,    0,    1,  219,  220,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,  221,  222,  223,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    6,    0,    3,  224,    0,    0,    0,    0,    0,
-      0,    0,    0,  225,  226,    0,    0,    0,    0,    3,    3,  227,  228,  229,    0,    0,
-    230,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,  231,
-    232,    3,    3,    3,  233,  234,    0,    0,    0,    0,    0,    0,  235,    0,    0,    0,
-      0,    3,  236,  237,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,  238,    3,
-    239,    0,    0,    0,    0,    0,    0,    5,  240,    0,    0,    0,    0,    0,    0,    5,
-    241,    3,    3,  242,    0,    0,    0,    0,    0,    4,    4,    4,    4,    4,    4,    4,
-    243,    0,    0,    0,    0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    1,    1,
-      1,    3,    3,    3,    3,    3,    3,    3,    3,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    0,    0,    0,    4,    4,    4,    4,    4,    4,    4,
-      4,    2,    2,    2,    2,    5,    2,    2,    2,    2,    6,    0,    2,    2,    2,    2,
-      2,    5,    8,    2,    2,    2,    2,    2,    2,    0,    0,    0,    2,    2,    2,    2,
-      2,    5,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    5,
-      0,    2,    2,    2,    2,    5,    0,    0,    0,    2,    2,    2,    2,    2,    5,    0,
-      0,    2,    8,    2,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,   74,   75,
-      0,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,
-      2,    0,    2,    2,    2,    2,    2,    2,    2,   17,    6,   13,   29,   33,   29,   45,
-      0,   15,   11,   27,    7,   38,    7,   68,    0,    2,    2,    2,    2,    8,    2,    2,
-      2,   10,   10,   10,   10,   80,   10,   10,   10,    2,    2,    2,    2,    2,    2,    2,
-      5,    2,    2,    5,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
-      0,    2,    2,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    5,    2,
-      2,    2,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    0,    0,    0,    0,
-      0,    9,   41,    2,    2,    2,    2,    2,    2,    8,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,   23,    6,    6,    6,    6,    6,    6,    6,
-      6,    0,    0,    0,    0,    0,    0,   48,    0,   44,    0,    0,    0,    0,    0,   49,
-      0,    0,   76,    0,    0,    0,    0,    0,    0,    0,    0,    0,   48,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,  103,    2,    2,    2,    2,    2,   36,    9,
-      9,    9,    9,    0,    0,    0,    5,   31,    0,    2,    2,    2,    2,   50,   51,    0,
-      0,    9,   24,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   15,   32,
-     19,   17,    6,   18,    7,   15,   11,   67,   22,   31,   52,   25,    6,    2,    2,    2,
-      2,  104,   14,    8,    2,    2,    2,    5,    8,    5,    5,    0,    2,    2,    0,   32,
-     19,    0,    0,    0,   34,    0,    0,    2,    8,    2,    0,    0,    0,    0,    0,    5,
-    105,   31,   24,    8,    2,    2,    5,    0,    8,    5,    2,    8,    5,    2,    0,   35,
-     19,   17,   13,    0,   25,   38,   25,   68,    0,   53,    0,    0,    0,    8,    2,    5,
-      5,   54,   39,   77,    0,    0,    0,    0,    0,   31,   24,    8,    2,    2,    2,    2,
-      8,    5,    2,    8,    2,    2,    0,   32,   19,   17,    6,   18,   25,    7,   34,   67,
-      0,    0,    0,    0,    0,    8,   54,   54,   46,   31,   14,    8,    2,    2,    2,    5,
-      8,    5,    2,    8,    2,    2,    0,   32,   20,    0,    0,   25,    7,    0,    0,    2,
-      8,    8,    0,    0,    0,    0,    0,    0,    0,    0,   26,    8,    2,    2,    5,    0,
-      2,    5,    2,    2,    0,    8,    5,    5,    2,    0,    8,    5,    0,    2,    5,    0,
-      2,    2,    2,    2,    2,    2,    0,    0,   11,   15,   27,    0,   12,   33,   12,   45,
-      0,    0,    0,    0,   34,    0,    0,    0,    0,   24,   14,   55,    2,    2,    2,    5,
-      2,    2,    2,    2,    2,    2,    0,   32,    7,    0,    0,   25,   13,    2,    5,    0,
-      0,   36,   14,    8,    2,    2,    2,    5,    2,    2,    2,    8,    2,    2,    0,   32,
-     20,    0,    0,   34,   27,    0,    0,    0,    5,  106,   78,    0,    0,    0,    0,    0,
-      0,    9,   14,    2,    2,    2,    2,    5,    2,    2,    2,    2,    2,    2,   30,   40,
-     11,   17,    6,   13,   12,   33,   12,   45,  107,    0,    0,    0,   34,    0,    0,    0,
-      8,   31,   14,    8,    2,    2,    2,    2,    2,    2,    2,    2,    5,    0,    2,    2,
-      2,    2,    8,    2,    2,    2,    2,    8,    0,    2,    2,    2,    5,    0,  108,    0,
-     34,   11,    7,   13,   13,   19,   12,   12,   22,    0,   11,    0,    0,    0,    0,    0,
-      0,    2,    0,    2,    5,    0,    0,    0,    0,    0,    0,    0,    0,    6,    0,    0,
-      0,    2,    2,   69,   69,  109,    0,    0,   19,   56,   18,   21,    7,    7,    6,    6,
-     26,   18,    9,   13,    9,    2,    2,   79,   10,   10,   10,   10,   10,   10,   10,   10,
-     10,   10,   10,   10,   10,   10,   10,   81,    0,    0,    0,    0,  110,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   23,   20,   21,   57,    7,    7,  111,   82,  112,  113,
-     83,    2,    2,    2,    2,    2,   48,    0,   44,    2,    2,    2,   11,    6,    2,    2,
-    114,   83,   84,   41,   23,   84,   14,   14,    2,   30,    7,   40,    2,    2,    2,    2,
-      2,    2,  115,   58,  116,   14,   14,  117,   85,    2,    2,    2,    2,    2,   14,   20,
-      0,    2,   21,   59,    0,    0,    0,    0,    8,    2,   21,   27,    0,    0,    0,    0,
-      0,    2,   21,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    5,
-      2,    5,   21,    0,    0,    0,    0,    0,    0,    2,    2,    4,   20,    7,   21,    6,
-     12,   12,   12,   12,   24,   60,  118,  119,  120,  121,  122,    0,    0,    0,    0,  123,
-      0,    5,    0,    0,    8,    0,  124,    4,  125,   39,   39,  126,   86,    2,    2,    2,
-      2,    2,    2,    2,    2,   50,    5,    0,    0,    7,   59,   20,    7,  127,   10,    0,
-      0,   70,  128,   70,   70,  129,  130,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-      0,    2,    2,    2,    2,   14,    0,    0,    0,    2,    2,    2,   30,   71,   20,    0,
-      0,    2,    2,  131,  132,   42,  133,   10,   81,  134,   15,   20,    7,   21,   18,   59,
-     12,   12,   58,    9,    9,    9,   87,   26,   53,    9,   88,   41,    2,    2,    2,    2,
-      2,    2,    2,   89,    7,    6,    6,    7,   12,   12,    7,   61,    2,    2,    2,    5,
-      0,    0,    0,    0,    0,    0,  135,   62,   62,   62,   62,    0,    0,    0,    0,    0,
-      0,   88,   41,    2,    2,    2,    2,    2,    2,   79,   10,   21,   22,    7,  136,   10,
-      2,    2,    2,    2,   89,    7,   11,   20,   20,   42,  137,    0,    0,    0,    0,    0,
-      0,    2,    2,   10,   19,   12,   11,   90,   42,   42,   42,  138,  139,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    0,    8,    2,    9,   26,   16,   16,   16,    9,   16,
-     16,   24,   16,   16,   16,   52,    0,   53,    0,    0,    0,  140,   78,    9,   44,    0,
-      0,    0,    0,    0,    0,    0,  141,    0,    0,    0,    0,    0,    0,    0,   49,  142,
-      3,   39,   39,   44,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    3,
-     72,    0,    0,   91,    0,    0,    0,    0,    0,    0,   76,   91,    0,    0,    0,    0,
-      0,   26,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-      0,    0,    0,    0,   63,   63,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
-      8,    0,    0,    0,    0,    0,    0,    0,  143,    0,   63,   63,    0,    0,    0,    0,
-      0,    2,   40,    2,   61,    2,   36,    2,    2,    2,   23,   17,   15,    0,    0,   13,
-      0,   14,    2,    2,    2,    2,    2,    2,    2,    2,    2,  144,   11,   11,   11,   11,
-     11,   11,   11,   92,    0,    0,    0,    0,    0,    9,    9,    9,    9,    9,    9,    9,
-      9,    9,    2,    0,    0,    0,    0,    0,   30,    2,    2,    2,    7,    7,  145,   16,
-      0,    2,    2,    2,   47,    6,   21,    6,   90,   42,  146,    0,    0,    0,    0,    0,
-      0,    9,  147,    2,    2,    2,    2,    2,    2,    2,  148,   11,    7,    6,   12,  149,
-    150,   93,    0,    0,    0,    0,    0,    0,    0,    2,    2,   30,    8,    2,    2,    2,
-      2,    2,    2,    2,    2,   36,    7,   21,   71,   58,  151,   94,  152,    0,    0,    0,
-      0,    2,  153,    2,    2,    2,    2,  154,    0,    8,    2,   39,   44,    0,   85,   24,
-      2,   73,    6,   40,   47,   73,    2,    2,   95,   36,    5,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,  155,   18,   22,    0,    0,  156,   96,    0,    0,    0,
-      0,    2,   23,   20,   11,   59,   27,  157,    0,    0,    0,    0,    0,    0,    0,    0,
-     49,    3,    3,    3,    3,   72,    0,    0,    0,    2,    5,    2,    8,    2,    2,    2,
-      2,    2,    8,    2,    2,    2,    8,    5,    0,   47,    6,   25,   13,    0,    0,  158,
-    159,    2,    2,    8,    2,    8,    2,    2,    2,    2,    2,    2,    0,   51,   35,    0,
-     97,    2,    2,   50,   35,    0,    8,    2,    2,    0,    0,    0,    0,    8,    2,    2,
-      5,    2,    2,    9,   54,    0,    0,    0,    0,    2,    2,    2,    0,   25,    7,    7,
-      8,    2,    2,    2,    2,    2,   25,   38,    0,    2,    2,    2,   16,   16,   16,   16,
-     16,  160,    2,    5,    0,    0,    0,    0,    0,    2,   51,   51,    0,    0,    0,    0,
-      0,    5,    2,    2,    5,    2,    2,    2,    2,    8,    2,    5,    0,    8,    2,    0,
-      0,  161,  162,  163,    2,    2,    2,    2,    2,    2,    2,    2,    2,    7,    7,    6,
-      6,    6,    7,    7,   93,    0,    0,    0,    0,    0,   28,   28,   28,   28,   28,   28,
-     28,   28,   28,   28,    2,    2,    2,    2,    2,   40,   30,   40,    0,    0,    0,    0,
-    164,   19,   17,   18,   15,   67,   35,    0,    0,    0,   13,    0,    0,    0,    0,    0,
-      0,    9,   55,    2,    2,    2,    2,    2,    2,    2,    2,    2,   47,    6,    7,  165,
-      7,   18,  166,   98,    2,    2,    2,    2,    2,    0,    0,   23,  167,    0,    0,    0,
-      0,    2,   50,    0,    0,    0,    0,    0,    0,    2,   23,   22,    6,    6,    6,    7,
-      7,   61,   64,    0,    0,   69,   99,   13,  100,    2,    2,    2,    2,    2,    2,   11,
-     17,    7,    7,  168,   46,    0,    0,    0,   55,   47,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    5,    5,    2,    2,    8,    2,    2,    2,    2,    2,    2,    2,
-      8,    2,    2,    2,    2,    2,    2,    2,   36,   19,   17,   18,    7,  169,   13,    0,
-      0,    9,    9,    8,    2,    2,    2,    5,    8,    5,    2,    8,    2,    2,   56,   32,
-     11,   15,   11,   27,   29,   33,   29,   45,    0,    0,    0,    0,   34,    0,    0,    0,
-      2,    2,   11,    0,    9,    9,    9,   26,    0,    9,    9,   26,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    8,    0,    5,    2,    2,    2,    8,   20,   21,    6,
-      6,   13,   33,   29,   29,   22,  170,   14,  171,  101,   35,    0,    0,    0,    0,    0,
-      0,   31,   52,    0,    0,    0,    0,    0,    0,    2,    2,   23,   22,    6,    6,    6,
-      7,   11,   92,   24,   32,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,    0,
-    172,  173,    0,    0,    0,    0,    0,    0,    0,   19,   17,    6,    6,   57,   71,   22,
-    100,    9,  102,    5,    0,    0,    0,    0,    0,   22,    6,    6,    0,   12,   12,    9,
-     65,   35,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,    6,
-      0,   11,   17,    6,    6,   18,   15,   60,   65,   38,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   36,  174,   22,    6,    7,    7,  102,    5,    0,    0,
-      0,    2,    2,    2,    2,    2,    5,   77,   94,   11,    7,    6,   58,   18,    7,    0,
-      0,    2,    2,    2,    5,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   19,
-     17,    6,   18,    7,   87,   65,   35,    0,    0,    2,    2,    2,    5,    8,    0,    2,
-      2,    2,    2,    8,    5,    2,    2,    2,    2,   11,   11,   19,   29,   33,   31,  175,
-    101,  176,  177,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
-      2,   23,   22,    6,    6,    0,    7,   11,   14,   61,    0,   33,    0,    0,    0,    0,
-      0,   30,    6,    7,    7,    7,   73,    2,    2,    2,  178,   95,    9,   24,  179,   10,
-    180,    0,    0,   48,   97,    0,    0,    0,    0,   30,    6,    7,   15,   17,    6,    2,
-      2,    2,    2,   64,   64,   64,   43,   43,   43,   43,   43,   43,   24,  181,    0,    8,
-      0,   15,    6,   15,   15,    0,    0,    0,    0,    7,    6,    6,   13,    7,    7,    9,
-     65,    0,   10,   10,   10,   10,   10,   10,   10,   57,   18,   60,   26,    0,    0,    0,
-      0,    2,    2,    2,    5,    2,    8,    2,    2,   30,    7,    7,   13,    0,   38,    7,
-     25,    9,   99,  182,  183,    0,    0,    0,    0,    2,    2,    2,    8,    5,    2,    2,
-      2,    2,    2,    2,    2,    2,   11,   11,   27,    7,   34,   60,   82,    0,    0,    0,
-      0,    2,  184,   57,   27,    0,    0,    0,    0,    9,  185,    2,    2,    2,    2,    2,
-      2,    2,    2,   11,    7,    6,   13,    0,   12,   15,   96,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   98,    0,    0,   66,   66,   66,  186,  187,   66,    1,
-      1,  188,    1,    1,  189,   37,   37,   37,   37,   37,   37,   37,    0,    0,    0,    0,
-      0,    1,    1,    1,    1,    1,  190,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-      7,    7,    7,    7,    7,    7,  191,  192,  193,    9,    9,    9,   26,    0,    0,    0,
-      0,   14,   41,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   23,   27,
-      0,    2,    2,    2,    2,    2,    5,    0,   56,  194,    6,    6,    6,    6,    6,    6,
-      6,    6,    6,    6,    6,    0,    0,    0,   53,   16,   52,    0,    0,    0,    0,    0,
-      0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      8,    2,    2,    2,    2,    2,    0,   56,   35,    0,   49,    3,    3,    3,   72,    0,
-      0,    9,    9,    9,   55,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
-      2,    2,    2,    2,    2,    2,    2,    2,   26,    2,    2,    2,    2,    2,    2,    9,
-      9,    2,    2,    2,    2,    2,    2,    7,    7,    2,    2,    2,    2,    2,    2,    2,
-      6,    2,    2,   46,   46,   46,   86,    0,    0,    O,    O,    G,    G,    B,    B,   WJ,
-     WJ,  CGJ,  CGJ,    B,    O, VBlw, VBlw, VAbv, VAbv,    O,    B,VMAbv,VMAbv,  SUB,  SUB, VPst,
-   VPst, VPre, VPre, VBlw,    O,VMPst,VMPst, VAbv, VPst,VMBlw,VMBlw, VPst, VBlw, VBlw, VAbv, VPst,
-   VPre, VPst, VAbv, VAbv, VBlw, VPre, VPst,    B, VPst,VMAbv,VMPst,    O, VAbv,VMAbv,    O, VPst,
-      O,    N,    N,    O, VPre,    B, VAbv,    O,VMAbv,CMBlw,    B, VPre,    O,    O, VPst,CMBlw,
-      O,    B,VMAbv,   HM,   HM, VAbv,    O,   GB,   GB, VAbv,    B,VMPst,    B, FAbv, FAbv, FBlw,
-   FBlw,   GB,    O, VPre,    H,CMAbv,CMAbv,    B, VBlw,    O,   GB,    O,   WJ,    B,CMBlw,CMBlw,
-  CMBlw,VMBlw,    O,    O,VMBlw,VMAbv,CMAbv,VMAbv,    B,    O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw,
-   VPst, VPst,VMAbv,    H,    B,SMAbv,SMAbv,   SB,   SE,    R,    R,VMPst,    H,    J,    J, VPst,
-      H, VAbv,    H,    O,FMBlw, FPst, FPst, VAbv, VPre,   WJ,    O, VBlw,    B,    O,   SB,    O,
-     SE,FMPst,FMPst,    O, MBlw,   CS,VMPst,    B,  SUB,    O,  SUB,  SUB,    O,VMPst,   IS, MBlw,
-      B, VPst,VMPst,    B,VMPst,CMAbv,    B, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst, VBlw, FAbv,FMPst,
-      O,    H,VMAbv,    H,    O, MPre, MAbv, VBlw,VMAbv,   IS,    O,    O,   IS,CMAbv,    O,CMBlw,
-   VAbv, VPre,VMAbv,   IS,    R,    H,CMBlw,    O,  CGJ,   GB,VMAbv,FMAbv,    O,    O,   CS,    R,
-      O,  HVM,    O,    O,CMAbv,FMBlw,    O,VMAbv,VMBlw, VAbv, MPst, MPre, MBlw, MBlw, MBlw, MBlw,
-   VPst, VAbv,VMPst,VMPst,VMBlw,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,
-  FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,CMAbv, VAbv,  SUB,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw,    B,
-   MPre, MBlw,  SUB, MAbv,  SUB,   Sk, VPst,    O,SMAbv, VPst,   IS,   RK,   RK,VMPre,VMPre,FMAbv,
-  CMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,    O,    H, MPst, VPst, VAbv,VMBlw, FPst, VPst, FAbv,
-  VMPst,    B,CMAbv, VAbv, MBlw, MPst, MBlw, VBlw, MPst, MBlw,    O,    B, FAbv, FAbv, FPst,    B,
-   VPre,    O,VMPst,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,
-      B,    O,   HN, VPre, VBlw, VAbv,   IS, VPst,    B,VMAbv,    H, VAbv,CMBlw,VMPst,    O,VMAbv,
-  CMBlw,FMAbv,    B,   CS,   CS,VMPst, VAbv,VMAbv, VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,
-    SUB,  SUB,   GB,CMAbv,   IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,VMPst,    J,   SB,   SE,
-      J,   HR,    G,    G,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
+     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+     15,    0,    1,    1,    2,    1,    1,    3,    4,    5,    6,    7,    8,    9,   10,    1,
+     11,   12,    1,    1,    1,    1,    1,    1,   13,   14,   15,   16,   17,   18,   19,    1,
+      1,   20,    1,    1,    1,    1,   21,    1,   22,    1,    1,    1,    1,    1,   23,   24,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,   25,   26,   27,   28,    1,    1,    1,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   29,
+     30,    1,    1,    1,    1,    1,   31,    1,    1,    1,    1,   32,   33,    1,   34,   35,
+     36,   37,   38,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+     52,   53,   53,   53,   53,   54,   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
+     53,   53,   53,   53,   55,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   56,    1,    1,    1,    1,    1,    1,    1,    1,   57,   58,    1,   59,    1,
+     60,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   61,   62,    1,    1,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   63,    1,    1,
+      1,    1,   64,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   65,   66,    1,   67,   68,    1,    1,    1,   69,    1,    1,    1,    1,    1,
+      1,   70,   71,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+     70,    0,    1,    2,    2,    0,    3,    4,    0,    0,    0,    0,    0,    0,    0,    0,
+      0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    6,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,    0,    7,    8,    0,    0,    9,    0,    0,    0,    0,
+      0,   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
+     25,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+     41,   42,   43,   44,   37,   45,   46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
+      0,   56,   57,   58,   59,   60,    0,    0,    0,   61,   62,   63,   64,   56,   65,   66,
+     67,   68,   56,   56,   69,   70,   71,    0,    0,   72,   73,   74,   75,   56,   76,   77,
+      0,   78,   56,   79,   80,   81,    0,    0,    0,   82,   83,   84,   85,   86,   87,   56,
+     88,   56,   89,   90,    0,    0,    0,   91,   92,    0,    0,    0,    0,    0,    0,    0,
+     93,   94,   95,    0,   96,   97,    0,    0,   98,    0,    0,    0,    0,    0,    0,   99,
+      0,    0,    0,    0,    0,    0,    0,    0,  100,    0,  101,   56,  102,    0,    0,    0,
+      0,    0,  103,    0,    0,    0,    0,    0,    0,  104,  105,   56,  106,  107,  108,  109,
+    110,   56,  111,  112,    0,  113,  114,  115,  116,   56,  117,  118,  119,   56,  120,  121,
+    122,    0,    0,    0,    0,    0,    0,   56,  123,  124,    0,    0,    0,    0,    0,    0,
+    125,    0,    0,    0,    0,    0,    0,    0,  126,    0,    0,    0,  127,  128,  129,    0,
+      0,  130,  131,  132,    0,    0,    0,   51,  133,    0,    0,    0,    0,  134,  135,    0,
+      0,   56,  136,    7,  137,  138,    0,    0,    0,    0,    0,    0,    0,   56,  139,    0,
+      0,    0,  101,  140,  101,  141,  142,  143,    0,  144,  145,  146,  147,  148,  149,  150,
+      0,  151,  152,  153,  154,  148,  155,  156,  157,  158,  159,  160,    0,  161,  162,  163,
+    164,  165,  166,  167,  168,  169,  170,  171,  172,   56,  173,  174,  175,  176,  177,  178,
+      0,    0,    0,    0,    0,   56,  179,  180,    0,   56,  181,  182,    0,   56,  183,  184,
+    185,  186,  187,  188,    0,    0,    0,    0,    0,   56,  189,    0,    0,    0,    0,    0,
+      0,  190,  191,  192,    0,    0,  193,  194,  195,  196,  197,  198,   56,  199,    0,    0,
+      0,    0,    0,    0,  200,    0,    0,    0,    0,  201,  202,  203,  204,  205,  206,    0,
+      0,  207,  208,  209,  210,  211,   67,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    212,  213,  214,  215,    0,    0,    0,    0,    0,  216,  216,  216,  216,  216,  216,  216,
+    216,  216,  217,  218,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
+    219,  220,  221,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   67,
+      0,   56,  222,    0,    0,    0,    0,    0,    0,    0,    0,  223,  224,    0,    0,    0,
+      0,   56,   56,  225,  226,  227,    0,    0,  228,   56,   56,   56,   56,   56,   56,   56,
+     56,   56,   56,   56,   56,   56,   56,  229,  230,   56,   56,   56,  231,  232,    0,    0,
+      0,    0,    0,    0,  233,    0,    0,    0,    0,   56,  234,  235,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,  101,  236,   56,  237,    0,    0,    0,    0,    0,    0,  101,
+    238,    0,    0,    0,    0,    0,    0,  101,  239,   56,   56,  240,    0,    0,    0,    0,
+      0,  241,  241,  241,  241,  241,  241,  241,  241,  242,  242,  242,  242,  242,  242,  242,
+    243,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      0,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    3,    4,
+      0,    5,    0,    0,    0,    0,    0,    6,    0,    0,    7,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      8,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   10,   11,
+     11,   11,   11,    0,    0,    0,    9,   12,    0,    2,    2,    2,    2,   13,   14,    0,
+      0,   11,   15,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   16,   17,
+     18,   19,   20,   21,   22,   16,   23,   24,   25,   12,   26,   27,   20,    2,    2,    2,
+      2,    2,   20,    0,    2,    2,    2,    2,    2,    0,    2,    2,    2,    2,    2,    2,
+      2,   28,   29,   30,    2,    2,    2,    9,   30,    9,   30,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    9,    2,    2,    2,    9,    9,    0,    2,    2,    0,   17,
+     18,   19,   20,   31,   32,   33,   32,   34,    0,    0,    0,    0,   35,    0,    0,    2,
+     30,    2,    0,    0,    0,    0,    0,    9,   36,   12,   15,   30,    2,    2,    9,    0,
+     30,    9,    2,   30,    9,    2,    0,   37,   18,   19,   31,    0,   27,   38,   27,   39,
+      0,   40,    0,    0,    0,   30,    2,    9,    9,    0,    0,    0,    2,    2,    2,    2,
+      2,   41,   42,   43,    0,    0,    0,    0,    0,   12,   15,   30,    2,    2,    2,    2,
+     30,    2,   30,    2,    2,    2,    2,    2,    2,    9,    2,   30,    2,    2,    0,   17,
+     18,   19,   20,   21,   27,   22,   35,   24,    0,    0,    0,    0,    0,   30,   41,   41,
+     44,   12,   29,   30,    2,    2,    2,    9,   30,    9,    2,   30,    2,    2,    0,   17,
+     45,    0,    0,   27,   22,    0,    0,    2,   30,   30,    0,    0,    0,    0,    0,    0,
+      0,    0,   46,   30,    2,    2,    9,    0,    2,    9,    2,    2,    0,   30,    9,    9,
+      2,    0,   30,    9,    0,    2,    9,    0,    2,    2,    2,    2,    2,    2,    0,    0,
+     23,   16,   47,    0,   48,   33,   48,   34,    0,    0,    0,    0,   35,    0,    0,    0,
+      0,   15,   29,   49,    2,    2,    2,    9,    2,    9,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    0,   17,   22,   16,   23,   47,   22,   38,   22,   39,
+      0,    0,    0,   27,   31,    2,    9,    0,    0,   10,   29,   30,    2,    2,    2,    9,
+      2,    2,    2,   30,    2,    2,    0,   17,   45,    0,    0,   35,   47,    0,    0,    0,
+      9,   50,   51,    0,    0,    0,    0,    0,    0,   11,   29,    2,    2,    2,    2,    9,
+      2,    2,    2,    2,    2,    2,   52,   53,   23,   19,   20,   31,   48,   33,   48,   34,
+     54,    0,    0,    0,   35,    0,    0,    0,   30,   12,   29,   30,    2,    2,    2,    2,
+      2,    2,    2,    2,    9,    0,    2,    2,    2,    2,   30,    2,    2,    2,    2,   30,
+      0,    2,    2,    2,    9,    0,   55,    0,   35,   23,   22,   31,   31,   18,   48,   48,
+     25,    0,   23,    0,    0,    0,    0,    0,    0,    2,    0,    2,    9,    0,    0,    0,
+      0,    0,    0,    0,    0,   20,    0,    0,    0,    2,    2,   56,   56,   57,    0,    0,
+     18,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,    2,    2,    9,
+      0,   58,   21,   59,   22,   22,   20,   20,   46,   21,   11,   31,   11,    2,    2,   60,
+     61,   61,   61,   61,   61,   62,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+     61,   61,   61,   61,   61,   61,   61,   63,    0,    0,    0,    0,   64,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   65,   45,   59,   66,   22,   22,   67,   68,   69,   70,
+     71,    2,    2,    2,    2,    2,    1,    0,    5,    2,    2,    2,   23,   20,    2,    2,
+     72,   71,   73,   74,   65,   73,   29,   29,    2,   52,   22,   53,    2,    2,    2,    2,
+      2,    2,   75,   76,   77,   29,   29,   78,   79,    2,    2,    2,    2,    2,   29,   45,
+      0,    2,   59,   80,    0,    0,    0,    0,   30,    2,   59,   47,    0,    0,    0,    0,
+      0,    2,   59,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    9,
+      2,    9,   59,    0,    0,    0,    0,    0,    0,    2,    2,   81,   45,   22,   59,   20,
+     48,   48,   48,   48,   15,   82,   83,   84,   85,   86,   87,    0,    0,    0,    0,   88,
+      0,    9,    0,    0,   30,    0,   89,   81,   90,    2,    2,    2,    2,    9,    0,    0,
+      0,   42,   42,   91,   92,    2,    2,    2,    2,    2,    2,    2,    2,   13,    9,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,    9,   22,   80,   45,   22,   93,   61,    0,
+      0,   94,   95,   94,   94,   96,   97,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+      0,    2,    2,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
+      0,    2,    2,    2,    2,   29,    0,    0,    0,    2,    2,    2,    2,    2,    9,    0,
+      0,    2,    2,    2,   52,   98,   45,    0,    0,    2,    2,   99,  100,  101,  102,   61,
+     63,  103,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  104,   46,
+     40,   11,  105,   74,    2,    2,    2,    2,    2,    2,    2,  106,   22,   20,   20,   22,
+     48,   48,   22,  107,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  108,  109,
+    109,  109,  109,    0,    0,    0,    0,    0,    0,  105,   74,    2,    2,    2,    2,    2,
+      2,   60,   61,   59,   25,   22,  110,   61,    2,    2,    2,    2,  106,   22,   23,   45,
+     45,  101,  111,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  112,
+    101,  101,  101,  113,  114,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
+      2,   11,   46,  115,  115,  115,   11,  115,  115,   15,  115,  115,  115,   26,    0,   40,
+      0,    0,    0,  116,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+      0,    0,    0,    0,    0,    0,    6,  118,  119,   42,   42,    5,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  119,  119,  120,  119,  119,  119,  119,  119,  119,  119,
+    119,    0,    0,  121,    0,    0,    0,    0,    0,    0,    7,  121,    0,    0,    0,    0,
+      0,   46,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
+      0,    0,    0,    0,  122,  122,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
+     30,    0,    0,    0,    0,    0,    0,    0,  123,    0,  122,  122,    0,    0,    0,    0,
+      0,    2,   53,    2,  107,    2,   10,    2,    2,    2,   65,   19,   16,    0,    0,   31,
+      0,    2,    2,    0,    0,    0,    0,    0,    0,   29,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,  124,   23,   23,   23,   23,   23,   23,   23,  125,    0,    0,    0,    0,
+      0,   11,   11,   11,   11,   11,   11,   11,   11,   11,    2,    0,    0,    0,    0,    0,
+     52,    2,    2,    2,   22,   22,  126,  115,    0,    2,    2,    2,  127,   20,   59,   20,
+    112,  101,  128,    0,    0,    0,    0,    0,    0,   11,  129,    2,    2,    2,    2,    2,
+      2,    2,  130,   23,   22,   20,   48,  131,  132,  133,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,   52,   30,    2,    2,    2,    2,    2,    2,    2,    2,   10,   22,   59,
+     98,   76,  134,  135,  136,    0,    0,    0,    0,    2,  137,    2,    2,    2,    2,  138,
+      0,   30,    2,   42,    5,    0,   79,   15,    2,  139,   20,   53,  127,  139,    2,    2,
+    140,   10,    9,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  141,   21,
+     25,    0,    0,  142,  143,    0,    0,    0,    0,    2,   65,   45,   23,   80,   47,  144,
+      0,   81,   81,   81,   81,   81,   81,   81,   81,    0,    0,    0,    0,    0,    0,    0,
+      6,  119,  119,  119,  119,  120,    0,    0,    0,    2,    2,    2,    2,    2,    9,    2,
+      2,    2,    9,    2,   30,    2,    2,    2,    2,    2,   30,    2,    2,    2,   30,    9,
+      0,  127,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
+      2,    2,    2,    2,    0,   14,   37,    0,  147,    2,    2,   13,   37,    0,   30,    2,
+      2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,
+      9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    0,   27,   22,   22,
+     30,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
+      0,    2,    2,    2,  115,  115,  115,  115,  115,  148,    2,    9,    0,    0,    0,    0,
+      0,    2,   14,   14,    0,    0,    0,    0,    0,    9,    2,    2,    9,    2,    2,    2,
+      2,   30,    2,    9,    0,   30,    2,    0,    0,  149,  150,  151,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,   22,   22,   20,   20,   20,   22,   22,  133,    0,    0,    0,
+      0,    0,  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,    2,    2,    2,    2,
+      2,   53,   52,   53,    0,    0,    0,    0,  153,   11,   74,    2,    2,    2,    2,    2,
+      2,   18,   19,   21,   16,   24,   37,    0,    0,    0,   31,    0,    0,    0,    0,    0,
+      0,   11,   49,    2,    2,    2,    2,    2,    2,    2,    2,    2,  127,   20,   22,  154,
+     22,   21,  155,  156,    2,    2,    2,    2,    2,    0,    0,   65,  157,    0,    0,    0,
+      0,    2,   13,    0,    0,    0,    0,    0,    0,    2,   65,   25,   20,   20,   20,   22,
+     22,  107,  158,    0,    0,   56,  159,   31,  160,   30,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   23,   19,   22,   22,  161,   44,    0,    0,    0,
+     49,  127,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    9,    9,    2,    2,
+     30,    2,    2,    2,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,
+     10,   18,   19,   21,   22,  162,   31,    0,    0,   11,   11,   30,    2,    2,    2,    9,
+     30,    9,    2,   30,    2,    2,   58,   17,   23,   16,   23,   47,   32,   33,   32,   34,
+      0,    0,    0,    0,   35,    0,    0,    0,    2,    2,   23,    0,   11,   11,   11,   46,
+      0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   30,    0,
+      9,    2,    2,    2,   30,   45,   59,   20,   20,   31,   33,   32,   32,   25,  163,   29,
+    164,  165,   37,    0,    0,    0,    0,    0,    0,   12,   26,    0,    0,    0,    0,    0,
+      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  125,   15,   17,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    0,    0,  166,  167,    0,    0,    0,    0,    0,    0,
+      0,   18,   19,   20,   20,   66,   98,   25,  160,   11,  168,    9,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
+    169,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
+      0,   23,   19,   20,   20,   21,   16,   82,  169,   38,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   10,  170,   25,   20,   22,   22,  168,    9,    0,    0,
+      0,    2,    2,    2,    2,    2,    9,   43,  135,   23,   22,   20,   76,   21,   22,    0,
+      0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
+     19,   20,   21,   22,  104,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
+      2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  171,
+    165,  172,  173,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
+      2,   65,   25,   20,   20,    0,   22,   23,   29,  107,    0,   33,    0,    0,    0,    0,
+      0,   52,   20,   22,   22,   22,  139,    2,    2,    2,  174,  140,   11,   15,  175,   61,
+    176,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
+      2,    2,    2,  158,  158,  158,  177,  177,  177,  177,  177,  177,   15,  178,    0,   30,
+      0,   16,   20,   16,   16,    0,    0,    0,    0,   22,   20,   20,   31,   22,   22,   11,
+    169,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
+      0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
+     27,   11,  159,  179,  180,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
+      2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
+      0,    2,  181,   66,   47,    0,    0,    0,    0,   11,  182,    2,    2,    2,    2,    2,
+      2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,  156,    0,    0,  183,  183,  183,  183,  183,  183,  183,
+    183,  184,  184,  184,  185,  186,  184,  183,  183,  187,  183,  183,  188,  189,  189,  189,
+    189,  189,  189,  189,    0,    0,    0,    0,    0,  183,  183,  183,  183,  183,  190,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  191,  192,
+    193,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   65,   47,    0,    2,    2,    2,    2,    2,    9,    0,
+     58,  194,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,    0,    0,    0,   40,  115,   26,    0,    0,    0,    0,    0,
+      0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  119,  119,  119,  120,    0,
+      0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
+      2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
+     11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,    2,    2,    2,    2,    2,
+     20,    2,    2,   44,   44,   44,   92,    0,    0,    O,    O,    O,   GB,    B,    B,    O,
+     SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,
+  VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst,
+   VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst,    H, VPre, VPst,VMBlw,    O,    O,
+   VAbv,   GB,VMAbv,VMPst,VMPst,    O,    B, VBlw,    O,    O, VPre, VPre,    O, VPre,    H,    O,
+   VPst,FMAbv,    O,CMBlw,    O, VAbv,    O, VAbv,    H,    O,VMBlw,VMAbv,CMAbv,   GB,   GB,    O,
+   MBlw,CMAbv,CMAbv, VPst, VAbv,VMAbv,    O, VPst,    O, VPre, VPre,VMAbv,    B,    O,   CS,   CS,
+  VMPst,    B, VAbv, VAbv,    B,    R,    O,  HVM,    O,    O,FMBlw,    O,CMAbv,    O,CMBlw, VAbv,
+   VBlw,    B,  SUB,  SUB,  SUB,    O,  SUB,  SUB,    O,FMBlw,    O,    B, VPst, VBlw, VPre,VMAbv,
+  VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,    B, MBlw, MBlw, VPst,VMPst,VMPst,    B, MBlw,
+   VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,
+  FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,
+  CMAbv,CMAbv,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B,
+   MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,
+      B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,
+  VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,
+      H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv,
+   MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,
+      B, VBlw,VMAbv,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
+     IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,   HN, VPre, VBlw, VAbv,
+     IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,
+      O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
+   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,
+     IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,
+      G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
 };
 static const uint16_t hb_use_u16[488]=
 {
-     0,   0,   8,   8,  16,  16,  24,  24,  40,  40,   0,  24,  32,   0,   0, 120,
-   136,  24,  56,   0, 168,  24, 240,  24, 272,  32, 280, 288,   0, 296, 304,   0,
-   128,   0, 312, 320,  24, 328, 336,  24,  24, 344, 352, 360,  56, 144, 368,  64,
-    48, 376, 152, 384,  56, 392, 400,  64,  48, 408, 416, 424,  72, 432, 440, 112,
-    48, 448, 456,   0,  56, 464, 472,  64,  48, 480, 152, 488,  56, 496, 504, 512,
-   520, 528, 536, 544,  72,   0, 552,  80,  48, 560, 160, 568, 576,  80,  48, 584,
-   160, 592,  56, 600, 608,  80,  24, 616, 624, 632, 640, 648,  24, 656, 664, 672,
-    72, 680, 688, 696,  24, 704,  88, 712, 720, 176, 728, 736, 744,   0, 752, 760,
-   768, 776, 784, 792, 800, 808,  24, 816,  24, 824,  24, 832, 840, 848,  24, 856,
-   864, 872, 880,   0,  24,  96, 888,  24, 896,   0,  24, 184, 904, 912,  72,  24,
-   920, 192, 200,  24, 928, 104,  24, 936,  24, 944, 952, 960,  32,  32, 968,  24,
-    24, 976, 984,  32, 992,1000,1008,  24,1016,  24,1024,1032,1040,1048,1056,   0,
-     0,1064,1072,1080,   0,1088,1096,1104,1112,   0,  16,1120,1128,   0,   0,1136,
-  1144,   0,1152,   0,1160,1168,1176,   0,1184,  24,1192,   0,  24, 208,1200,  24,
-    24,1208,1216,  32,1224,1232,1240,  24,1248,1256,1264,  24,  24,1272,1280,  32,
-  1288, 184,1296,1304,1312,  32,  24,1320,  24,1328,1336,   0,1344,1352,1360,  32,
-    40,   0,   0,1368,   0,1376,   0, 216, 216,1384, 112,1392,1400,1408,  24,1416,
-    96,   0,1424,   0,  24, 224,1432,   0,1440,  32,1448,  24, 232,   0,1456, 224,
-  1464,1472,1480,   0,   0,1488,1496,   0,1504,  24,  24,1512,1520,1528,1536,1544,
-    24,1552,1560,   0,1568,  24,1576,1584,1592,  24,  24,1600,  24,1608,1616, 104,
-   248, 192,  24, 112,1624,1632,1640,   0,1648,1656,  96,  24,  24,1664,1672,  32,
-  1680,  64,  48,1688,1696,1704,1712,1720,1728,  24,  24,1736,1744,1752,1760,   0,
-    24,1768,1776,1784,1792,   0, 248,  24,  24,1800,1808,  32, 256,1816,1824,1832,
-    24,1840,1848,  32,1856,1864,  32,  24, 208,   0,  24,1872,1880, 200,1888,   0,
-  1896,1904,1912,1920,  24,1928,1936,  32,1944,  24,  24,1952,1960,   0,1968,  24,
-    24,1976,1984,1992,2000,2008,2016,   0,  48,  24, 256,2024, 128,  24,  88, 144,
-    24,2032, 176,2040,2048,  24,  24,2056,2064,  32,2072,  24,2080,2088,  24,2096,
-  2104,  80,  24,2112,2120,2128,   8,2136,2144,2152,   8,2160,  24,2168,2176,  32,
-    24,2184,2192,  24,2200,  32,2208,2216, 264, 264,2224,2232,2240,   0,  24, 232,
-     0,2248, 104,  88,  96,2256,   0,2264,  88,2272,2280,   0,2288,   0,2296,  32,
-  2304,  32,2312, 104,2320,  32,  40,  16,
+    0,  0,  1,  2,  0,  3,  4,  5,  0,  6,  7,  0,  8,  0,  9, 10,
+   11, 12, 10, 13, 14, 10, 10, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 18, 26, 27, 21, 22, 28, 29, 30, 31, 32, 33, 34, 22, 35,
+   36,  0, 18, 37, 38, 21, 22, 39, 24, 40, 18, 41, 42, 43, 44, 45,
+   46, 47, 31,  0, 48, 49, 22, 50, 51, 52, 18,  0, 53, 49, 22, 54,
+   51, 55, 18, 56, 57, 49, 10, 58, 59, 60, 61, 62, 10, 63, 64, 65,
+   31, 66, 67, 68, 10, 69, 70, 10, 71, 72, 73, 74, 75, 76, 77,  0,
+   10, 10, 78, 79, 80, 81, 82, 83, 84, 85, 10, 86, 10, 87, 10, 88,
+   89, 90, 10, 91, 92, 93,  2,  0, 94,  0, 10, 95, 96, 10, 97,  0,
+   10, 98, 99,100, 31, 10,101,102,103, 10,104,105, 10,106, 10,107,
+  108,109,  2,  2,110, 10, 10,111,112,  2,113,114,115, 10,116, 10,
+  117,118,119,120,121,  0,  0,122,123,124,  0,125,126,127,128,  0,
+  129,130,131,  0,  0,132,133,  0,134,  0,  0, 10,135,136,137,  0,
+  138, 10,139,  0, 10,140,141, 10, 10,142,143,  2,144,145,146, 10,
+  147,148,149, 10, 10,150,151,  2,152, 98,153,154,155,  2, 10,156,
+   10,157,158,  0,159,160,161,  2,162,  0,  0,163,  0,164,  0,165,
+  165,166, 34,167,168,169, 10,170, 95,  0,171,  0, 10,172,173,  0,
+  174,  2,175, 10,176,  0,177,172,178,179,180,  0,  0,181,182,  0,
+  183, 10, 10,184,185,186,187,188,189, 10, 10,190,191,  0,192, 10,
+  193,194,195, 10, 10,196, 10,197,198,105,199,102, 10, 34,200,201,
+  202,  0,203,204, 95, 10, 10,205,206,  2,207, 21, 22,208,209,210,
+  211,212,213, 10, 10,214,215,216,217,  0, 10,218,219,220,221,  0,
+  199, 10, 10,222,223,  2,224,225,226,227, 10,228,229,  2,230,231,
+    2, 10,140,  0, 10,232,233,103,234,  0,235,236,237,238, 10,239,
+  240,  2,241, 10, 10,242,243,  0,244, 10, 10,245,246,247,248,249,
+  250,  0, 22, 10,224,251,  8, 10, 71, 19, 10,252, 74,253,254, 10,
+   10,255,256,  2,257, 10,258,259, 10,260,261, 49, 10,262,263,264,
+  265,265,265,266,267,268,265,269, 10,270,271,  2, 10,272,273, 10,
+  274,  2,275,276,277,277,278,279,280,  0, 10,176,  0,281,105, 71,
+   95,282,  0,283, 71,284,285,  0,286,  0,287,  2,288,  2,289,105,
+  290,  2,129,129,162,162,162,129,
 };
 
 static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
@@ -661,8 +660,7 @@ static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
 }
 static inline uint8_t hb_use_get_category (unsigned u)
 {
-  /* packtab: [2^4,2^4,2^3,2^1,2^3,2^1] */
-  return u<921600u ? (uint8_t)(hb_use_u8[3273u+((hb_use_u8[945u+hb_use_u16[((hb_use_u8[369u+((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((((u)>>1))>>3))>>1))>>3))>>4)))<<4)+((((((((((u)>>1))>>3))>>1))>>3))&15)])<<3)+((((((((u)>>1))>>3))>>1))&7)])<<1)+((((((u)>>1))>>3))&1)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O;
+  return u<921600 ? hb_use_u8[3273u+((hb_use_u8[945u+((hb_use_u16[((hb_use_u8[369u+((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((((u)>>1))>>3))>>1))>>3))>>4)))<<4)+((((((((((u)>>1))>>3))>>1))>>3))&15)])<<3)+((((((((u)>>1))>>3))>>1))&7)])<<1)+((((((u)>>1))>>3))&1)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : O;
 }
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
index eacaaf2b..079fee9b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
@@ -2,7 +2,7 @@
 /*
  * The following functions are generated by running:
  *
- *   gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt
+ *   ./gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt
  *
  * on files with these headers:
  *
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-stat-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-stat-table.hh
index ac24dffe..7a46be1f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-stat-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-stat-table.hh
@@ -352,7 +352,7 @@ struct AxisValue
 {
   float get_value (unsigned int axis_index) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return u.format1.get_value ();
     case 2: hb_barrier (); return u.format2.get_value ();
@@ -364,7 +364,7 @@ struct AxisValue
 
   unsigned int get_axis_index () const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return u.format1.get_axis_index ();
     case 2: hb_barrier (); return u.format2.get_axis_index ();
@@ -376,7 +376,7 @@ struct AxisValue
 
   hb_ot_name_id_t get_value_name_id () const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return u.format1.get_value_name_id ();
     case 2: hb_barrier (); return u.format2.get_value_name_id ();
@@ -389,9 +389,9 @@ struct AxisValue
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format.v);
-    switch (u.format.v) {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -403,7 +403,7 @@ struct AxisValue
   bool keep_axis_value (const hb_array_t<const StatAxisRecord> axis_records,
                         hb_hashmap_t<hb_tag_t, Triple> *user_axes_location) const
   {
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return u.format1.keep_axis_value (axis_records, user_axes_location);
     case 2: hb_barrier (); return u.format2.keep_axis_value (axis_records, user_axes_location);
@@ -420,7 +420,7 @@ struct AxisValue
       return_trace (false);
     hb_barrier ();
 
-    switch (u.format.v)
+    switch (u.format)
     {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
@@ -433,14 +433,14 @@ struct AxisValue
   protected:
   union
   {
-  struct { HBUINT16 v; }	format;
+  HBUINT16		format;
   AxisValueFormat1	format1;
   AxisValueFormat2	format2;
   AxisValueFormat3	format3;
   AxisValueFormat4	format4;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format.v);
+  DEFINE_SIZE_UNION (2, format);
 };
 
 struct AxisValueOffsetArray: UnsizedArrayOf<Offset16To<AxisValue>>
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
index 124599e7..29905984 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
@@ -2,7 +2,7 @@
 /*
  * The following table is generated by running:
  *
- *   gen-tag-table.py languagetags language-subtag-registry
+ *   ./gen-tag-table.py languagetags language-subtag-registry
  *
  * on files with these headers:
  *
@@ -221,201 +221,55 @@ static const LangTag ot_languages2[] = {
 };
 
 #ifndef HB_NO_LANGUAGE_LONG
-static const hb_tag_t ot_languages3_blocked[] = {
-  HB_TAG('a','b','a',' '),	/* Abé != Abaza */
-  HB_TAG('a','f','k',' '),	/* Nanubae != Afrikaans */
-  HB_TAG('a','g','w',' '),	/* Kahua != Agaw */
-  HB_TAG('a','r','i',' '),	/* Arikara != Aari */
-  HB_TAG('a','r','k',' '),	/* Arikapú != Rakhine */
-  HB_TAG('b','a','g',' '),	/* Tuki != Baghelkhandi */
-  HB_TAG('b','a','u',' '),	/* Bada (Nigeria) != Baulé */
-  HB_TAG('b','b','r',' '),	/* Girawa != Berber */
-  HB_TAG('b','c','h',' '),	/* Bariai != Bench */
-  HB_TAG('b','i','l',' '),	/* Bile != Bilen */
-  HB_TAG('b','k','f',' '),	/* Beeke != Blackfoot */
-  HB_TAG('b','l','i',' '),	/* Bolia != Baluchi */
-  HB_TAG('b','l','t',' '),	/* Tai Dam != Balti */
-  HB_TAG('b','m','b',' '),	/* Bembe != Bambara (Bamanankan) */
-  HB_TAG('b','m','l',' '),	/* Bomboli != Bamileke */
-  HB_TAG('b','r','i',' '),	/* Mokpwe != Braj Bhasha */
-  HB_TAG('b','r','m',' '),	/* Barambu != Burmese */
-  HB_TAG('b','s','h',' '),	/* Kati != Bashkir */
-  HB_TAG('b','t','i',' '),	/* Burate != Beti */
-  HB_TAG('c','h','g',' '),	/* Chagatai != Chaha Gurage */
-  HB_TAG('c','h','h',' '),	/* Chinook != Chattisgarhi */
-  HB_TAG('c','r','r',' '),	/* Carolina Algonquian != Carrier */
-  HB_TAG('c','r','t',' '),	/* Iyojwa'ja Chorote != Crimean Tatar */
-  HB_TAG('c','s','l',' '),	/* Chinese Sign Language != Church Slavonic */
-  HB_TAG('d','h','v',' '),	/* Dehu != Divehi (Dhivehi, Maldivian) (deprecated) */
-  HB_TAG('d','n','k',' '),	/* Dengka != Dinka */
-  HB_TAG('d','r','i',' '),	/* C'Lela != Dari */
-  HB_TAG('d','u','n',' '),	/* Dusun Deyah != Dungan */
-  HB_TAG('d','z','n',' '),	/* Dzando != Dzongkha */
-  HB_TAG('e','c','r',' '),	/* Eteocretan != Eastern Cree */
-  HB_TAG('e','u','q',' '),	/* Basque [collection] != Basque */
-  HB_TAG('f','a','r',' '),	/* Fataleka != Persian */
-  HB_TAG('f','o','s',' '),	/* Siraya != Faroese */
-  HB_TAG('g','a','d',' '),	/* Gaddang != Ga */
-  HB_TAG('g','a','e',' '),	/* Guarequena != Scottish Gaelic */
-  HB_TAG('g','a','l',' '),	/* Galolen != Galician */
-  HB_TAG('g','a','r',' '),	/* Galeya != Garshuni */
-  HB_TAG('g','a','w',' '),	/* Nobonob != Garhwali */
-  HB_TAG('g','m','z',' '),	/* Mgbolizhia != Gumuz */
-  HB_TAG('g','r','o',' '),	/* Groma != Garo */
-  HB_TAG('g','u','a',' '),	/* Shiki != Guarani */
-  HB_TAG('h','a','l',' '),	/* Halang != Halam (Falam Chin) */
-  HB_TAG('h','b','n',' '),	/* Heiban != Hammer-Banna */
-  HB_TAG('i','r','i',' '),	/* Rigwe != Irish */
-  HB_TAG('i','s','m',' '),	/* Masimasi != Inari Sami */
-  HB_TAG('j','a','n',' '),	/* Jandai != Japanese */
-  HB_TAG('j','i','i',' '),	/* Jiiddu != Yiddish */
-  HB_TAG('j','u','d',' '),	/* Worodougou != Ladino */
-  HB_TAG('j','u','l',' '),	/* Jirel != Jula */
-  HB_TAG('k','a','c',' '),	/* Kachin != Kachchi */
-  HB_TAG('k','e','b',' '),	/* Kélé != Kebena */
-  HB_TAG('k','g','e',' '),	/* Komering != Khutsuri Georgian */
-  HB_TAG('k','h','n',' '),	/* Khandesi != Khamti Shan (Microsoft fonts) */
-  HB_TAG('k','h','s',' '),	/* Kasua != Khanty-Shurishkar */
-  HB_TAG('k','h','v',' '),	/* Khvarshi != Khanty-Vakhi */
-  HB_TAG('k','i','s',' '),	/* Kis != Kisii */
-  HB_TAG('k','k','n',' '),	/* Kon Keu != Kokni */
-  HB_TAG('k','l','m',' '),	/* Migum != Kalmyk */
-  HB_TAG('k','m','n',' '),	/* Awtuw != Kumaoni */
-  HB_TAG('k','m','o',' '),	/* Kwoma != Komo */
-  HB_TAG('k','m','s',' '),	/* Kamasau != Komso */
-  HB_TAG('k','n','r',' '),	/* Kaningra != Kanuri */
-  HB_TAG('k','o','d',' '),	/* Kodi != Kodagu */
-  HB_TAG('k','o','h',' '),	/* Koyo != Korean Old Hangul */
-  HB_TAG('k','o','p',' '),	/* Waube != Komi-Permyak */
-  HB_TAG('k','o','z',' '),	/* Korak != Komi-Zyrian */
-  HB_TAG('k','p','l',' '),	/* Kpala != Kpelle */
-  HB_TAG('k','r','k',' '),	/* Kerek != Karakalpak */
-  HB_TAG('k','r','m',' '),	/* Krim (retired code) != Karaim */
-  HB_TAG('k','r','n',' '),	/* Sapo != Karen */
-  HB_TAG('k','s','i',' '),	/* Krisa != Khasi */
-  HB_TAG('k','s','m',' '),	/* Kumba != Kildin Sami */
-  HB_TAG('k','u','i',' '),	/* Kuikúro-Kalapálo != Kui */
-  HB_TAG('k','u','l',' '),	/* Kulere != Kulvi */
-  HB_TAG('k','u','y',' '),	/* Kuuku-Ya'u != Kuy */
-  HB_TAG('k','y','k',' '),	/* Kamayo != Koryak */
-  HB_TAG('l','a','h',' '),	/* Lahnda [macrolanguage] != Lahuli */
-  HB_TAG('l','a','k',' '),	/* Laka (Nigeria) (retired code) != Lak */
-  HB_TAG('l','a','m',' '),	/* Lamba != Lambani */
-  HB_TAG('l','a','z',' '),	/* Aribwatsa != Laz */
-  HB_TAG('l','d','k',' '),	/* Leelau != Ladakhi */
-  HB_TAG('l','m','a',' '),	/* East Limba != Low Mari */
-  HB_TAG('l','m','b',' '),	/* Merei != Limbu */
-  HB_TAG('l','m','w',' '),	/* Lake Miwok != Lomwe */
-  HB_TAG('l','s','b',' '),	/* Burundian Sign Language != Lower Sorbian */
-  HB_TAG('l','t','h',' '),	/* Thur != Lithuanian */
-  HB_TAG('l','v','i',' '),	/* Lavi != Latvian */
-  HB_TAG('m','a','j',' '),	/* Jalapa De Díaz Mazatec != Majang */
-  HB_TAG('m','a','p',' '),	/* Austronesian [collection] != Mapudungun */
-  HB_TAG('m','a','w',' '),	/* Mampruli != Marwari */
-  HB_TAG('m','b','n',' '),	/* Macaguán != Mbundu */
-  HB_TAG('m','c','h',' '),	/* Maquiritari != Manchu */
-  HB_TAG('m','c','r',' '),	/* Menya != Moose Cree */
-  HB_TAG('m','d','e',' '),	/* Maba (Chad) != Mende */
-  HB_TAG('m','i','z',' '),	/* Coatzospan Mixtec != Mizo */
-  HB_TAG('m','k','r',' '),	/* Malas != Makasar */
-  HB_TAG('m','l','e',' '),	/* Manambu != Male */
-  HB_TAG('m','l','n',' '),	/* Malango != Malinke */
-  HB_TAG('m','l','r',' '),	/* Vame != Malayalam Reformed */
-  HB_TAG('m','n','d',' '),	/* Mondé != Mandinka */
-  HB_TAG('m','n','g',' '),	/* Eastern Mnong != Mongolian */
-  HB_TAG('m','n','x',' '),	/* Manikion != Manx */
-  HB_TAG('m','o','k',' '),	/* Morori != Moksha */
-  HB_TAG('m','o','r',' '),	/* Moro != Moroccan */
-  HB_TAG('m','t','h',' '),	/* Munggui != Maithili */
-  HB_TAG('m','t','s',' '),	/* Yora != Maltese */
-  HB_TAG('m','u','n',' '),	/* Munda [collection] != Mundari */
-  HB_TAG('n','a','s',' '),	/* Naasioi != Naskapi */
-  HB_TAG('n','c','r',' '),	/* Ncane != N-Cree */
-  HB_TAG('n','d','b',' '),	/* Kenswei Nsei != Ndebele */
-  HB_TAG('n','d','g',' '),	/* Ndengereko != Ndonga */
-  HB_TAG('n','g','r',' '),	/* Engdewu != Nagari */
-  HB_TAG('n','i','s',' '),	/* Nimi != Nisi */
-  HB_TAG('n','k','o',' '),	/* Nkonya != N’Ko */
-  HB_TAG('n','s','m',' '),	/* Sumi Naga != Northern Sami */
-  HB_TAG('n','t','o',' '),	/* Ntomba != Esperanto */
-  HB_TAG('o','r','o',' '),	/* Orokolo != Oromo */
-  HB_TAG('p','a','a',' '),	/* Papuan [collection] != Palestinian Aramaic */
-  HB_TAG('p','a','l',' '),	/* Pahlavi != Pali */
-  HB_TAG('p','a','s',' '),	/* Papasena != Pashto */
-  HB_TAG('p','i','l',' '),	/* Yom != Filipino */
-  HB_TAG('p','l','k',' '),	/* Kohistani Shina != Polish */
-  HB_TAG('r','m','s',' '),	/* Romanian Sign Language != Romansh */
-  HB_TAG('s','a','d',' '),	/* Sandawe != Sadri */
-  HB_TAG('s','a','y',' '),	/* Saya != Sayisi */
-  HB_TAG('s','g','o',' '),	/* Songa (retired code) != Sango */
-  HB_TAG('s','i','b',' '),	/* Sebop != Sibe */
-  HB_TAG('s','i','g',' '),	/* Paasaal != Silte Gurage */
-  HB_TAG('s','k','s',' '),	/* Maia != Skolt Sami */
-  HB_TAG('s','k','y',' '),	/* Sikaiana != Slovak */
-  HB_TAG('s','l','a',' '),	/* Slavic [collection] != Slavey */
-  HB_TAG('s','m','l',' '),	/* Central Sama != Somali */
-  HB_TAG('s','n','h',' '),	/* Shinabo (retired code) != Sinhala (Sinhalese) */
-  HB_TAG('s','o','g',' '),	/* Sogdian != Sodo Gurage */
-  HB_TAG('s','r','b',' '),	/* Sora != Serbian */
-  HB_TAG('s','r','k',' '),	/* Serudung Murut != Saraiki */
-  HB_TAG('s','s','l',' '),	/* Western Sisaala != South Slavey */
-  HB_TAG('s','s','m',' '),	/* Semnam != Southern Sami */
-  HB_TAG('s','u','r',' '),	/* Mwaghavul != Suri */
-  HB_TAG('s','v','e',' '),	/* Serili != Swedish */
-  HB_TAG('s','w','k',' '),	/* Malawi Sena != Swahili */
-  HB_TAG('t','a','j',' '),	/* Eastern Tamang != Tajiki */
-  HB_TAG('t','g','n',' '),	/* Tandaganon != Tongan */
-  HB_TAG('t','g','r',' '),	/* Tareng != Tigre */
-  HB_TAG('t','g','y',' '),	/* Togoyo != Tigrinya */
-  HB_TAG('t','k','m',' '),	/* Takelma != Turkmen */
-  HB_TAG('t','m','n',' '),	/* Taman (Indonesia) != Temne */
-  HB_TAG('t','n','a',' '),	/* Tacana != Tswana */
-  HB_TAG('t','n','e',' '),	/* Tinoc Kallahan (retired code) != Tundra Enets */
-  HB_TAG('t','n','g',' '),	/* Tobanga != Tonga */
-  HB_TAG('t','r','k',' '),	/* Turkic [collection] != Turkish */
-  HB_TAG('t','s','g',' '),	/* Tausug != Tsonga */
-  HB_TAG('t','u','a',' '),	/* Wiarumus != Turoyo Aramaic */
-  HB_TAG('t','u','l',' '),	/* Tula != Tulu */
-  HB_TAG('t','u','v',' '),	/* Turkana != Tuvin */
-  HB_TAG('v','i','t',' '),	/* Viti != Vietnamese */
-  HB_TAG('w','a','g',' '),	/* Wa'ema != Wagdi */
-  HB_TAG('x','b','d',' '),	/* Bindal != Lü */
-  HB_TAG('y','a','k',' '),	/* Yakama != Sakha */
-  HB_TAG('y','b','a',' '),	/* Yala != Yoruba */
-  HB_TAG('y','i','m',' '),	/* Yimchungru Naga != Yi Modern */
-  HB_TAG('z','n','d',' '),	/* Zande [collection] != Zande */
-};
-
 static const LangTag ot_languages3[] = {
   {HB_TAG('a','a','e',' '),	HB_TAG('S','Q','I',' ')},	/* Arbëreshë Albanian -> Albanian */
   {HB_TAG('a','a','o',' '),	HB_TAG('A','R','A',' ')},	/* Algerian Saharan Arabic -> Arabic */
+/*{HB_TAG('a','a','q',' '),	HB_TAG('A','A','Q',' ')},*/	/* Eastern Abnaki -> Eastern Abenaki */
   {HB_TAG('a','a','t',' '),	HB_TAG('S','Q','I',' ')},	/* Arvanitika Albanian -> Albanian */
+  {HB_TAG('a','b','a',' '),	HB_TAG_NONE	       },	/* Abé != Abaza */
   {HB_TAG('a','b','h',' '),	HB_TAG('A','R','A',' ')},	/* Tajiki Arabic -> Arabic */
   {HB_TAG('a','b','q',' '),	HB_TAG('A','B','A',' ')},	/* Abaza */
   {HB_TAG('a','b','s',' '),	HB_TAG('C','P','P',' ')},	/* Ambonese Malay -> Creoles */
   {HB_TAG('a','b','v',' '),	HB_TAG('A','R','A',' ')},	/* Baharna Arabic -> Arabic */
+  {HB_TAG('a','c','f',' '),	HB_TAG('F','A','N',' ')},	/* Saint Lucian Creole French -> French Antillean */
+  {HB_TAG('a','c','f',' '),	HB_TAG('C','P','P',' ')},	/* Saint Lucian Creole French -> Creoles */
+/*{HB_TAG('a','c','h',' '),	HB_TAG('A','C','H',' ')},*/	/* Acoli -> Acholi */
   {HB_TAG('a','c','m',' '),	HB_TAG('A','R','A',' ')},	/* Mesopotamian Arabic -> Arabic */
   {HB_TAG('a','c','q',' '),	HB_TAG('A','R','A',' ')},	/* Ta'izzi-Adeni Arabic -> Arabic */
+  {HB_TAG('a','c','r',' '),	HB_TAG('A','C','R',' ')},	/* Achi */
+  {HB_TAG('a','c','r',' '),	HB_TAG('M','Y','N',' ')},	/* Achi -> Mayan */
   {HB_TAG('a','c','w',' '),	HB_TAG('A','R','A',' ')},	/* Hijazi Arabic -> Arabic */
   {HB_TAG('a','c','x',' '),	HB_TAG('A','R','A',' ')},	/* Omani Arabic -> Arabic */
+  {HB_TAG('a','c','y',' '),	HB_TAG('A','C','Y',' ')},	/* Cypriot Arabic */
+  {HB_TAG('a','c','y',' '),	HB_TAG('A','R','A',' ')},	/* Cypriot Arabic -> Arabic */
   {HB_TAG('a','d','a',' '),	HB_TAG('D','N','G',' ')},	/* Adangme -> Dangme */
   {HB_TAG('a','d','f',' '),	HB_TAG('A','R','A',' ')},	/* Dhofari Arabic -> Arabic */
   {HB_TAG('a','d','p',' '),	HB_TAG('D','Z','N',' ')},	/* Adap (retired code) -> Dzongkha */
+/*{HB_TAG('a','d','y',' '),	HB_TAG('A','D','Y',' ')},*/	/* Adyghe */
   {HB_TAG('a','e','b',' '),	HB_TAG('A','R','A',' ')},	/* Tunisian Arabic -> Arabic */
   {HB_TAG('a','e','c',' '),	HB_TAG('A','R','A',' ')},	/* Saidi Arabic -> Arabic */
   {HB_TAG('a','f','b',' '),	HB_TAG('A','R','A',' ')},	/* Gulf Arabic -> Arabic */
+  {HB_TAG('a','f','k',' '),	HB_TAG_NONE	       },	/* Nanubae != Afrikaans */
   {HB_TAG('a','f','s',' '),	HB_TAG('C','P','P',' ')},	/* Afro-Seminole Creole -> Creoles */
   {HB_TAG('a','g','u',' '),	HB_TAG('M','Y','N',' ')},	/* Aguacateco -> Mayan */
+  {HB_TAG('a','g','w',' '),	HB_TAG_NONE	       },	/* Kahua != Agaw */
   {HB_TAG('a','h','g',' '),	HB_TAG('A','G','W',' ')},	/* Qimant -> Agaw */
   {HB_TAG('a','h','t',' '),	HB_TAG('A','T','H',' ')},	/* Ahtena -> Athapaskan */
   {HB_TAG('a','i','g',' '),	HB_TAG('C','P','P',' ')},	/* Antigua and Barbuda Creole English -> Creoles */
+  {HB_TAG('a','i','i',' '),	HB_TAG('S','W','A',' ')},	/* Assyrian Neo-Aramaic -> Swadaya Aramaic */
+  {HB_TAG('a','i','i',' '),	HB_TAG('S','Y','R',' ')},	/* Assyrian Neo-Aramaic -> Syriac */
+/*{HB_TAG('a','i','o',' '),	HB_TAG('A','I','O',' ')},*/	/* Aiton */
   {HB_TAG('a','i','w',' '),	HB_TAG('A','R','I',' ')},	/* Aari */
   {HB_TAG('a','j','p',' '),	HB_TAG('A','R','A',' ')},	/* South Levantine Arabic (retired code) -> Arabic */
   {HB_TAG('a','j','t',' '),	HB_TAG('A','R','A',' ')},	/* Judeo-Tunisian Arabic (retired code) -> Arabic */
+  {HB_TAG('a','k','b',' '),	HB_TAG('A','K','B',' ')},	/* Batak Angkola */
+  {HB_TAG('a','k','b',' '),	HB_TAG('B','T','K',' ')},	/* Batak Angkola -> Batak */
   {HB_TAG('a','l','n',' '),	HB_TAG('S','Q','I',' ')},	/* Gheg Albanian -> Albanian */
   {HB_TAG('a','l','s',' '),	HB_TAG('S','Q','I',' ')},	/* Tosk Albanian -> Albanian */
+/*{HB_TAG('a','l','t',' '),	HB_TAG('A','L','T',' ')},*/	/* Southern Altai -> Altai */
   {HB_TAG('a','m','f',' '),	HB_TAG('H','B','N',' ')},	/* Hamer-Banna -> Hammer-Banna */
   {HB_TAG('a','m','w',' '),	HB_TAG('S','Y','R',' ')},	/* Western Neo-Aramaic -> Syriac */
+/*{HB_TAG('a','n','g',' '),	HB_TAG('A','N','G',' ')},*/	/* Old English (ca. 450-1100) -> Anglo-Saxon */
   {HB_TAG('a','o','a',' '),	HB_TAG('C','P','P',' ')},	/* Angolar -> Creoles */
   {HB_TAG('a','p','a',' '),	HB_TAG('A','T','H',' ')},	/* Apache [collection] -> Athapaskan */
   {HB_TAG('a','p','c',' '),	HB_TAG('A','R','A',' ')},	/* Levantine Arabic -> Arabic */
@@ -426,39 +280,61 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('a','p','m',' '),	HB_TAG('A','T','H',' ')},	/* Mescalero-Chiricahua Apache -> Athapaskan */
   {HB_TAG('a','p','w',' '),	HB_TAG('A','T','H',' ')},	/* Western Apache -> Athapaskan */
   {HB_TAG('a','r','b',' '),	HB_TAG('A','R','A',' ')},	/* Standard Arabic -> Arabic */
+  {HB_TAG('a','r','i',' '),	HB_TAG_NONE	       },	/* Arikara != Aari */
+  {HB_TAG('a','r','k',' '),	HB_TAG_NONE	       },	/* Arikapú != Rakhine */
   {HB_TAG('a','r','n',' '),	HB_TAG('M','A','P',' ')},	/* Mapudungun */
   {HB_TAG('a','r','q',' '),	HB_TAG('A','R','A',' ')},	/* Algerian Arabic -> Arabic */
   {HB_TAG('a','r','s',' '),	HB_TAG('A','R','A',' ')},	/* Najdi Arabic -> Arabic */
+  {HB_TAG('a','r','y',' '),	HB_TAG('M','O','R',' ')},	/* Moroccan Arabic -> Moroccan */
+  {HB_TAG('a','r','y',' '),	HB_TAG('A','R','A',' ')},	/* Moroccan Arabic -> Arabic */
   {HB_TAG('a','r','z',' '),	HB_TAG('A','R','A',' ')},	/* Egyptian Arabic -> Arabic */
+/*{HB_TAG('a','s','t',' '),	HB_TAG('A','S','T',' ')},*/	/* Asturian */
+/*{HB_TAG('a','t','h',' '),	HB_TAG('A','T','H',' ')},*/	/* Athapascan [collection] -> Athapaskan */
   {HB_TAG('a','t','j',' '),	HB_TAG('R','C','R',' ')},	/* Atikamekw -> R-Cree */
+/*{HB_TAG('a','t','s',' '),	HB_TAG('A','T','S',' ')},*/	/* Gros Ventre (Atsina) */
   {HB_TAG('a','t','v',' '),	HB_TAG('A','L','T',' ')},	/* Northern Altai -> Altai */
   {HB_TAG('a','u','j',' '),	HB_TAG('B','B','R',' ')},	/* Awjilah -> Berber */
   {HB_TAG('a','u','z',' '),	HB_TAG('A','R','A',' ')},	/* Uzbeki Arabic -> Arabic */
   {HB_TAG('a','v','l',' '),	HB_TAG('A','R','A',' ')},	/* Eastern Egyptian Bedawi Arabic -> Arabic */
+/*{HB_TAG('a','v','n',' '),	HB_TAG('A','V','N',' ')},*/	/* Avatime */
+/*{HB_TAG('a','w','a',' '),	HB_TAG('A','W','A',' ')},*/	/* Awadhi */
   {HB_TAG('a','y','c',' '),	HB_TAG('A','Y','M',' ')},	/* Southern Aymara -> Aymara */
   {HB_TAG('a','y','h',' '),	HB_TAG('A','R','A',' ')},	/* Hadrami Arabic -> Arabic */
   {HB_TAG('a','y','l',' '),	HB_TAG('A','R','A',' ')},	/* Libyan Arabic -> Arabic */
   {HB_TAG('a','y','n',' '),	HB_TAG('A','R','A',' ')},	/* Sanaani Arabic -> Arabic */
   {HB_TAG('a','y','p',' '),	HB_TAG('A','R','A',' ')},	/* North Mesopotamian Arabic -> Arabic */
   {HB_TAG('a','y','r',' '),	HB_TAG('A','Y','M',' ')},	/* Central Aymara -> Aymara */
+  {HB_TAG('a','z','b',' '),	HB_TAG('A','Z','B',' ')},	/* South Azerbaijani -> Torki */
+  {HB_TAG('a','z','b',' '),	HB_TAG('A','Z','E',' ')},	/* South Azerbaijani -> Azerbaijani */
   {HB_TAG('a','z','d',' '),	HB_TAG('N','A','H',' ')},	/* Eastern Durango Nahuatl -> Nahuatl */
   {HB_TAG('a','z','j',' '),	HB_TAG('A','Z','E',' ')},	/* North Azerbaijani -> Azerbaijani */
   {HB_TAG('a','z','n',' '),	HB_TAG('N','A','H',' ')},	/* Western Durango Nahuatl -> Nahuatl */
   {HB_TAG('a','z','z',' '),	HB_TAG('N','A','H',' ')},	/* Highland Puebla Nahuatl -> Nahuatl */
   {HB_TAG('b','a','d',' '),	HB_TAG('B','A','D','0')},	/* Banda [collection] */
+  {HB_TAG('b','a','g',' '),	HB_TAG_NONE	       },	/* Tuki != Baghelkhandi */
   {HB_TAG('b','a','h',' '),	HB_TAG('C','P','P',' ')},	/* Bahamas Creole English -> Creoles */
   {HB_TAG('b','a','i',' '),	HB_TAG('B','M','L',' ')},	/* Bamileke [collection] */
   {HB_TAG('b','a','l',' '),	HB_TAG('B','L','I',' ')},	/* Baluchi [macrolanguage] */
+/*{HB_TAG('b','a','n',' '),	HB_TAG('B','A','N',' ')},*/	/* Balinese */
+/*{HB_TAG('b','a','r',' '),	HB_TAG('B','A','R',' ')},*/	/* Bavarian */
+  {HB_TAG('b','a','u',' '),	HB_TAG_NONE	       },	/* Bada (Nigeria) != Baulé */
+  {HB_TAG('b','b','c',' '),	HB_TAG('B','B','C',' ')},	/* Batak Toba */
+  {HB_TAG('b','b','c',' '),	HB_TAG('B','T','K',' ')},	/* Batak Toba -> Batak */
   {HB_TAG('b','b','j',' '),	HB_TAG('B','M','L',' ')},	/* Ghomálá' -> Bamileke */
   {HB_TAG('b','b','p',' '),	HB_TAG('B','A','D','0')},	/* West Central Banda -> Banda */
+  {HB_TAG('b','b','r',' '),	HB_TAG_NONE	       },	/* Girawa != Berber */
   {HB_TAG('b','b','z',' '),	HB_TAG('A','R','A',' ')},	/* Babalia Creole Arabic (retired code) -> Arabic */
   {HB_TAG('b','c','c',' '),	HB_TAG('B','L','I',' ')},	/* Southern Balochi -> Baluchi */
+  {HB_TAG('b','c','h',' '),	HB_TAG_NONE	       },	/* Bariai != Bench */
   {HB_TAG('b','c','i',' '),	HB_TAG('B','A','U',' ')},	/* Baoulé -> Baulé */
   {HB_TAG('b','c','l',' '),	HB_TAG('B','I','K',' ')},	/* Central Bikol -> Bikol */
   {HB_TAG('b','c','q',' '),	HB_TAG('B','C','H',' ')},	/* Bench */
   {HB_TAG('b','c','r',' '),	HB_TAG('A','T','H',' ')},	/* Babine -> Athapaskan */
+/*{HB_TAG('b','d','c',' '),	HB_TAG('B','D','C',' ')},*/	/* Emberá-Baudó */
+/*{HB_TAG('b','d','y',' '),	HB_TAG('B','D','Y',' ')},*/	/* Bandjalang */
   {HB_TAG('b','e','a',' '),	HB_TAG('A','T','H',' ')},	/* Beaver -> Athapaskan */
   {HB_TAG('b','e','b',' '),	HB_TAG('B','T','I',' ')},	/* Bebele -> Beti */
+/*{HB_TAG('b','e','m',' '),	HB_TAG('B','E','M',' ')},*/	/* Bemba (Zambia) */
   {HB_TAG('b','e','r',' '),	HB_TAG('B','B','R',' ')},	/* Berber [collection] */
   {HB_TAG('b','e','w',' '),	HB_TAG('C','P','P',' ')},	/* Betawi -> Creoles */
   {HB_TAG('b','f','l',' '),	HB_TAG('B','A','D','0')},	/* Banda-Ndélé -> Banda */
@@ -466,35 +342,70 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('b','f','t',' '),	HB_TAG('B','L','T',' ')},	/* Balti */
   {HB_TAG('b','f','u',' '),	HB_TAG('L','A','H',' ')},	/* Gahri -> Lahuli */
   {HB_TAG('b','f','y',' '),	HB_TAG('B','A','G',' ')},	/* Bagheli -> Baghelkhandi */
+/*{HB_TAG('b','g','c',' '),	HB_TAG('B','G','C',' ')},*/	/* Haryanvi */
   {HB_TAG('b','g','n',' '),	HB_TAG('B','L','I',' ')},	/* Western Balochi -> Baluchi */
   {HB_TAG('b','g','p',' '),	HB_TAG('B','L','I',' ')},	/* Eastern Balochi -> Baluchi */
+  {HB_TAG('b','g','q',' '),	HB_TAG('B','G','Q',' ')},	/* Bagri */
+  {HB_TAG('b','g','q',' '),	HB_TAG('R','A','J',' ')},	/* Bagri -> Rajasthani */
   {HB_TAG('b','g','r',' '),	HB_TAG('Q','I','N',' ')},	/* Bawm Chin -> Chin */
   {HB_TAG('b','h','b',' '),	HB_TAG('B','H','I',' ')},	/* Bhili */
+/*{HB_TAG('b','h','i',' '),	HB_TAG('B','H','I',' ')},*/	/* Bhilali -> Bhili */
   {HB_TAG('b','h','k',' '),	HB_TAG('B','I','K',' ')},	/* Albay Bicolano (retired code) -> Bikol */
+/*{HB_TAG('b','h','o',' '),	HB_TAG('B','H','O',' ')},*/	/* Bhojpuri */
   {HB_TAG('b','h','r',' '),	HB_TAG('M','L','G',' ')},	/* Bara Malagasy -> Malagasy */
+/*{HB_TAG('b','i','k',' '),	HB_TAG('B','I','K',' ')},*/	/* Bikol [macrolanguage] */
+  {HB_TAG('b','i','l',' '),	HB_TAG_NONE	       },	/* Bile != Bilen */
   {HB_TAG('b','i','n',' '),	HB_TAG('E','D','O',' ')},	/* Edo */
   {HB_TAG('b','i','u',' '),	HB_TAG('Q','I','N',' ')},	/* Biete -> Chin */
+/*{HB_TAG('b','j','j',' '),	HB_TAG('B','J','J',' ')},*/	/* Kanauji */
   {HB_TAG('b','j','n',' '),	HB_TAG('M','L','Y',' ')},	/* Banjar -> Malay */
   {HB_TAG('b','j','o',' '),	HB_TAG('B','A','D','0')},	/* Mid-Southern Banda -> Banda */
   {HB_TAG('b','j','q',' '),	HB_TAG('M','L','G',' ')},	/* Southern Betsimisaraka Malagasy (retired code) -> Malagasy */
   {HB_TAG('b','j','s',' '),	HB_TAG('C','P','P',' ')},	/* Bajan -> Creoles */
   {HB_TAG('b','j','t',' '),	HB_TAG('B','L','N',' ')},	/* Balanta-Ganja -> Balante */
+  {HB_TAG('b','k','f',' '),	HB_TAG_NONE	       },	/* Beeke != Blackfoot */
   {HB_TAG('b','k','o',' '),	HB_TAG('B','M','L',' ')},	/* Kwa' -> Bamileke */
   {HB_TAG('b','l','a',' '),	HB_TAG('B','K','F',' ')},	/* Siksika -> Blackfoot */
   {HB_TAG('b','l','e',' '),	HB_TAG('B','L','N',' ')},	/* Balanta-Kentohe -> Balante */
   {HB_TAG('b','l','g',' '),	HB_TAG('I','B','A',' ')},	/* Balau (retired code) -> Iban */
+  {HB_TAG('b','l','i',' '),	HB_TAG_NONE	       },	/* Bolia != Baluchi */
+  {HB_TAG('b','l','k',' '),	HB_TAG('B','L','K',' ')},	/* Pa’o Karen */
+  {HB_TAG('b','l','k',' '),	HB_TAG('K','R','N',' ')},	/* Pa'o Karen -> Karen */
   {HB_TAG('b','l','n',' '),	HB_TAG('B','I','K',' ')},	/* Southern Catanduanes Bikol -> Bikol */
+  {HB_TAG('b','l','t',' '),	HB_TAG_NONE	       },	/* Tai Dam != Balti */
+  {HB_TAG('b','m','b',' '),	HB_TAG_NONE	       },	/* Bembe != Bambara (Bamanankan) */
+  {HB_TAG('b','m','l',' '),	HB_TAG_NONE	       },	/* Bomboli != Bamileke */
   {HB_TAG('b','m','m',' '),	HB_TAG('M','L','G',' ')},	/* Northern Betsimisaraka Malagasy -> Malagasy */
   {HB_TAG('b','p','d',' '),	HB_TAG('B','A','D','0')},	/* Banda-Banda -> Banda */
   {HB_TAG('b','p','l',' '),	HB_TAG('C','P','P',' ')},	/* Broome Pearling Lugger Pidgin -> Creoles */
   {HB_TAG('b','p','q',' '),	HB_TAG('C','P','P',' ')},	/* Banda Malay -> Creoles */
+/*{HB_TAG('b','p','y',' '),	HB_TAG('B','P','Y',' ')},*/	/* Bishnupriya -> Bishnupriya Manipuri */
   {HB_TAG('b','q','i',' '),	HB_TAG('L','R','C',' ')},	/* Bakhtiari -> Luri */
   {HB_TAG('b','q','k',' '),	HB_TAG('B','A','D','0')},	/* Banda-Mbrès -> Banda */
   {HB_TAG('b','r','a',' '),	HB_TAG('B','R','I',' ')},	/* Braj -> Braj Bhasha */
   {HB_TAG('b','r','c',' '),	HB_TAG('C','P','P',' ')},	/* Berbice Creole Dutch -> Creoles */
+/*{HB_TAG('b','r','h',' '),	HB_TAG('B','R','H',' ')},*/	/* Brahui */
+  {HB_TAG('b','r','i',' '),	HB_TAG_NONE	       },	/* Mokpwe != Braj Bhasha */
+  {HB_TAG('b','r','m',' '),	HB_TAG_NONE	       },	/* Barambu != Burmese */
+/*{HB_TAG('b','r','x',' '),	HB_TAG('B','R','X',' ')},*/	/* Bodo (India) */
+  {HB_TAG('b','s','h',' '),	HB_TAG_NONE	       },	/* Kati != Bashkir */
+/*{HB_TAG('b','s','k',' '),	HB_TAG('B','S','K',' ')},*/	/* Burushaski */
   {HB_TAG('b','t','b',' '),	HB_TAG('B','T','I',' ')},	/* Beti (Cameroon) (retired code) */
+  {HB_TAG('b','t','d',' '),	HB_TAG('B','T','D',' ')},	/* Batak Dairi (Pakpak) */
+  {HB_TAG('b','t','d',' '),	HB_TAG('B','T','K',' ')},	/* Batak Dairi -> Batak */
+  {HB_TAG('b','t','i',' '),	HB_TAG_NONE	       },	/* Burate != Beti */
   {HB_TAG('b','t','j',' '),	HB_TAG('M','L','Y',' ')},	/* Bacanese Malay -> Malay */
+/*{HB_TAG('b','t','k',' '),	HB_TAG('B','T','K',' ')},*/	/* Batak [collection] */
+  {HB_TAG('b','t','m',' '),	HB_TAG('B','T','M',' ')},	/* Batak Mandailing */
+  {HB_TAG('b','t','m',' '),	HB_TAG('B','T','K',' ')},	/* Batak Mandailing -> Batak */
   {HB_TAG('b','t','o',' '),	HB_TAG('B','I','K',' ')},	/* Rinconada Bikol -> Bikol */
+  {HB_TAG('b','t','s',' '),	HB_TAG('B','T','S',' ')},	/* Batak Simalungun */
+  {HB_TAG('b','t','s',' '),	HB_TAG('B','T','K',' ')},	/* Batak Simalungun -> Batak */
+  {HB_TAG('b','t','x',' '),	HB_TAG('B','T','X',' ')},	/* Batak Karo */
+  {HB_TAG('b','t','x',' '),	HB_TAG('B','T','K',' ')},	/* Batak Karo -> Batak */
+  {HB_TAG('b','t','z',' '),	HB_TAG('B','T','Z',' ')},	/* Batak Alas-Kluet */
+  {HB_TAG('b','t','z',' '),	HB_TAG('B','T','K',' ')},	/* Batak Alas-Kluet -> Batak */
+/*{HB_TAG('b','u','g',' '),	HB_TAG('B','U','G',' ')},*/	/* Buginese -> Bugis */
   {HB_TAG('b','u','m',' '),	HB_TAG('B','T','I',' ')},	/* Bulu (Cameroon) -> Beti */
   {HB_TAG('b','v','e',' '),	HB_TAG('M','L','Y',' ')},	/* Berau Malay -> Malay */
   {HB_TAG('b','v','u',' '),	HB_TAG('M','L','Y',' ')},	/* Bukit Malay -> Malay */
@@ -504,26 +415,52 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('b','x','p',' '),	HB_TAG('B','T','I',' ')},	/* Bebil -> Beti */
   {HB_TAG('b','x','r',' '),	HB_TAG('R','B','U',' ')},	/* Russia Buriat -> Russian Buriat */
   {HB_TAG('b','y','n',' '),	HB_TAG('B','I','L',' ')},	/* Bilin -> Bilen */
+  {HB_TAG('b','y','v',' '),	HB_TAG('B','Y','V',' ')},	/* Medumba */
+  {HB_TAG('b','y','v',' '),	HB_TAG('B','M','L',' ')},	/* Medumba -> Bamileke */
   {HB_TAG('b','z','c',' '),	HB_TAG('M','L','G',' ')},	/* Southern Betsimisaraka Malagasy -> Malagasy */
   {HB_TAG('b','z','j',' '),	HB_TAG('C','P','P',' ')},	/* Belize Kriol English -> Creoles */
   {HB_TAG('b','z','k',' '),	HB_TAG('C','P','P',' ')},	/* Nicaragua Creole English -> Creoles */
   {HB_TAG('c','a','a',' '),	HB_TAG('M','Y','N',' ')},	/* Chortí -> Mayan */
   {HB_TAG('c','a','c',' '),	HB_TAG('M','Y','N',' ')},	/* Chuj -> Mayan */
+  {HB_TAG('c','a','f',' '),	HB_TAG('C','R','R',' ')},	/* Southern Carrier -> Carrier */
+  {HB_TAG('c','a','f',' '),	HB_TAG('A','T','H',' ')},	/* Southern Carrier -> Athapaskan */
+  {HB_TAG('c','a','k',' '),	HB_TAG('C','A','K',' ')},	/* Kaqchikel */
+  {HB_TAG('c','a','k',' '),	HB_TAG('M','Y','N',' ')},	/* Kaqchikel -> Mayan */
+/*{HB_TAG('c','a','y',' '),	HB_TAG('C','A','Y',' ')},*/	/* Cayuga */
+/*{HB_TAG('c','b','g',' '),	HB_TAG('C','B','G',' ')},*/	/* Chimila */
+  {HB_TAG('c','b','k',' '),	HB_TAG('C','B','K',' ')},	/* Chavacano -> Zamboanga Chavacano */
+  {HB_TAG('c','b','k',' '),	HB_TAG('C','P','P',' ')},	/* Chavacano -> Creoles */
   {HB_TAG('c','b','l',' '),	HB_TAG('Q','I','N',' ')},	/* Bualkhaw Chin -> Chin */
   {HB_TAG('c','c','l',' '),	HB_TAG('C','P','P',' ')},	/* Cutchi-Swahili -> Creoles */
   {HB_TAG('c','c','m',' '),	HB_TAG('C','P','P',' ')},	/* Malaccan Creole Malay -> Creoles */
   {HB_TAG('c','c','o',' '),	HB_TAG('C','C','H','N')},	/* Comaltepec Chinantec -> Chinantec */
   {HB_TAG('c','c','q',' '),	HB_TAG('A','R','K',' ')},	/* Chaungtha (retired code) -> Rakhine */
   {HB_TAG('c','d','o',' '),	HB_TAG('Z','H','S',' ')},	/* Min Dong Chinese -> Chinese, Simplified */
+/*{HB_TAG('c','e','b',' '),	HB_TAG('C','E','B',' ')},*/	/* Cebuano */
   {HB_TAG('c','e','k',' '),	HB_TAG('Q','I','N',' ')},	/* Eastern Khumi Chin -> Chin */
   {HB_TAG('c','e','y',' '),	HB_TAG('Q','I','N',' ')},	/* Ekai Chin -> Chin */
+  {HB_TAG('c','f','m',' '),	HB_TAG('H','A','L',' ')},	/* Halam (Falam Chin) */
+  {HB_TAG('c','f','m',' '),	HB_TAG('Q','I','N',' ')},	/* Falam Chin -> Chin */
+/*{HB_TAG('c','g','g',' '),	HB_TAG('C','G','G',' ')},*/	/* Chiga */
   {HB_TAG('c','h','f',' '),	HB_TAG('M','Y','N',' ')},	/* Tabasco Chontal -> Mayan */
+  {HB_TAG('c','h','g',' '),	HB_TAG_NONE	       },	/* Chagatai != Chaha Gurage */
+  {HB_TAG('c','h','h',' '),	HB_TAG_NONE	       },	/* Chinook != Chattisgarhi */
   {HB_TAG('c','h','j',' '),	HB_TAG('C','C','H','N')},	/* Ojitlán Chinantec -> Chinantec */
   {HB_TAG('c','h','k',' '),	HB_TAG('C','H','K','0')},	/* Chuukese */
+  {HB_TAG('c','h','m',' '),	HB_TAG('H','M','A',' ')},	/* Mari (Russia) [macrolanguage] -> High Mari */
+  {HB_TAG('c','h','m',' '),	HB_TAG('L','M','A',' ')},	/* Mari (Russia) [macrolanguage] -> Low Mari */
   {HB_TAG('c','h','n',' '),	HB_TAG('C','P','P',' ')},	/* Chinook jargon -> Creoles */
+/*{HB_TAG('c','h','o',' '),	HB_TAG('C','H','O',' ')},*/	/* Choctaw */
+  {HB_TAG('c','h','p',' '),	HB_TAG('C','H','P',' ')},	/* Chipewyan */
+  {HB_TAG('c','h','p',' '),	HB_TAG('S','A','Y',' ')},	/* Chipewyan -> Sayisi */
+  {HB_TAG('c','h','p',' '),	HB_TAG('A','T','H',' ')},	/* Chipewyan -> Athapaskan */
   {HB_TAG('c','h','q',' '),	HB_TAG('C','C','H','N')},	/* Quiotepec Chinantec -> Chinantec */
+/*{HB_TAG('c','h','r',' '),	HB_TAG('C','H','R',' ')},*/	/* Cherokee */
+/*{HB_TAG('c','h','y',' '),	HB_TAG('C','H','Y',' ')},*/	/* Cheyenne */
   {HB_TAG('c','h','z',' '),	HB_TAG('C','C','H','N')},	/* Ozumacín Chinantec -> Chinantec */
   {HB_TAG('c','i','w',' '),	HB_TAG('O','J','B',' ')},	/* Chippewa -> Ojibway */
+/*{HB_TAG('c','j','a',' '),	HB_TAG('C','J','A',' ')},*/	/* Western Cham */
+/*{HB_TAG('c','j','m',' '),	HB_TAG('C','J','M',' ')},*/	/* Eastern Cham */
   {HB_TAG('c','j','y',' '),	HB_TAG('Z','H','S',' ')},	/* Jinyu Chinese -> Chinese, Simplified */
   {HB_TAG('c','k','a',' '),	HB_TAG('Q','I','N',' ')},	/* Khumi Awa Chin (retired code) -> Chin */
   {HB_TAG('c','k','b',' '),	HB_TAG('K','U','R',' ')},	/* Central Kurdish -> Kurdish */
@@ -537,6 +474,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('c','l','j',' '),	HB_TAG('Q','I','N',' ')},	/* Laitu Chin -> Chin */
   {HB_TAG('c','l','s',' '),	HB_TAG('S','A','N',' ')},	/* Classical Sanskrit -> Sanskrit */
   {HB_TAG('c','l','t',' '),	HB_TAG('Q','I','N',' ')},	/* Lautu Chin -> Chin */
+/*{HB_TAG('c','m','i',' '),	HB_TAG('C','M','I',' ')},*/	/* Emberá-Chamí */
   {HB_TAG('c','m','n',' '),	HB_TAG('Z','H','S',' ')},	/* Mandarin Chinese -> Chinese, Simplified */
   {HB_TAG('c','m','r',' '),	HB_TAG('Q','I','N',' ')},	/* Mro-Khimi Chin -> Chin */
   {HB_TAG('c','n','b',' '),	HB_TAG('Q','I','N',' ')},	/* Chinbon Chin -> Chin */
@@ -550,63 +488,120 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('c','n','w',' '),	HB_TAG('Q','I','N',' ')},	/* Ngawn Chin -> Chin */
   {HB_TAG('c','o','a',' '),	HB_TAG('M','L','Y',' ')},	/* Cocos Islands Malay -> Malay */
   {HB_TAG('c','o','b',' '),	HB_TAG('M','Y','N',' ')},	/* Chicomuceltec -> Mayan */
+/*{HB_TAG('c','o','o',' '),	HB_TAG('C','O','O',' ')},*/	/* Comox */
+/*{HB_TAG('c','o','p',' '),	HB_TAG('C','O','P',' ')},*/	/* Coptic */
   {HB_TAG('c','o','q',' '),	HB_TAG('A','T','H',' ')},	/* Coquille -> Athapaskan */
   {HB_TAG('c','p','a',' '),	HB_TAG('C','C','H','N')},	/* Palantla Chinantec -> Chinantec */
   {HB_TAG('c','p','e',' '),	HB_TAG('C','P','P',' ')},	/* English-based creoles and pidgins [collection] -> Creoles */
   {HB_TAG('c','p','f',' '),	HB_TAG('C','P','P',' ')},	/* French-based creoles and pidgins [collection] -> Creoles */
   {HB_TAG('c','p','i',' '),	HB_TAG('C','P','P',' ')},	/* Chinese Pidgin English -> Creoles */
+/*{HB_TAG('c','p','p',' '),	HB_TAG('C','P','P',' ')},*/	/* Portuguese-based creoles and pidgins [collection] -> Creoles */
   {HB_TAG('c','p','x',' '),	HB_TAG('Z','H','S',' ')},	/* Pu-Xian Chinese -> Chinese, Simplified */
   {HB_TAG('c','q','d',' '),	HB_TAG('H','M','N',' ')},	/* Chuanqiandian Cluster Miao -> Hmong */
+  {HB_TAG('c','q','u',' '),	HB_TAG('Q','U','H',' ')},	/* Chilean Quechua (retired code) -> Quechua (Bolivia) */
+  {HB_TAG('c','q','u',' '),	HB_TAG('Q','U','Z',' ')},	/* Chilean Quechua (retired code) -> Quechua */
   {HB_TAG('c','r','h',' '),	HB_TAG('C','R','T',' ')},	/* Crimean Tatar */
   {HB_TAG('c','r','i',' '),	HB_TAG('C','P','P',' ')},	/* Sãotomense -> Creoles */
+  {HB_TAG('c','r','j',' '),	HB_TAG('E','C','R',' ')},	/* Southern East Cree -> Eastern Cree */
+  {HB_TAG('c','r','j',' '),	HB_TAG('Y','C','R',' ')},	/* Southern East Cree -> Y-Cree */
+  {HB_TAG('c','r','j',' '),	HB_TAG('C','R','E',' ')},	/* Southern East Cree -> Cree */
+  {HB_TAG('c','r','k',' '),	HB_TAG('W','C','R',' ')},	/* Plains Cree -> West-Cree */
+  {HB_TAG('c','r','k',' '),	HB_TAG('Y','C','R',' ')},	/* Plains Cree -> Y-Cree */
+  {HB_TAG('c','r','k',' '),	HB_TAG('C','R','E',' ')},	/* Plains Cree -> Cree */
+  {HB_TAG('c','r','l',' '),	HB_TAG('E','C','R',' ')},	/* Northern East Cree -> Eastern Cree */
+  {HB_TAG('c','r','l',' '),	HB_TAG('Y','C','R',' ')},	/* Northern East Cree -> Y-Cree */
+  {HB_TAG('c','r','l',' '),	HB_TAG('C','R','E',' ')},	/* Northern East Cree -> Cree */
+  {HB_TAG('c','r','m',' '),	HB_TAG('M','C','R',' ')},	/* Moose Cree */
+  {HB_TAG('c','r','m',' '),	HB_TAG('L','C','R',' ')},	/* Moose Cree -> L-Cree */
+  {HB_TAG('c','r','m',' '),	HB_TAG('C','R','E',' ')},	/* Moose Cree -> Cree */
   {HB_TAG('c','r','p',' '),	HB_TAG('C','P','P',' ')},	/* Creoles and pidgins [collection] -> Creoles */
+  {HB_TAG('c','r','r',' '),	HB_TAG_NONE	       },	/* Carolina Algonquian != Carrier */
   {HB_TAG('c','r','s',' '),	HB_TAG('C','P','P',' ')},	/* Seselwa Creole French -> Creoles */
+  {HB_TAG('c','r','t',' '),	HB_TAG_NONE	       },	/* Iyojwa'ja Chorote != Crimean Tatar */
+  {HB_TAG('c','r','x',' '),	HB_TAG('C','R','R',' ')},	/* Carrier */
+  {HB_TAG('c','r','x',' '),	HB_TAG('A','T','H',' ')},	/* Carrier -> Athapaskan */
   {HB_TAG('c','s','a',' '),	HB_TAG('C','C','H','N')},	/* Chiltepec Chinantec -> Chinantec */
+/*{HB_TAG('c','s','b',' '),	HB_TAG('C','S','B',' ')},*/	/* Kashubian */
   {HB_TAG('c','s','h',' '),	HB_TAG('Q','I','N',' ')},	/* Asho Chin -> Chin */
   {HB_TAG('c','s','j',' '),	HB_TAG('Q','I','N',' ')},	/* Songlai Chin -> Chin */
+  {HB_TAG('c','s','l',' '),	HB_TAG_NONE	       },	/* Chinese Sign Language != Church Slavonic */
   {HB_TAG('c','s','o',' '),	HB_TAG('C','C','H','N')},	/* Sochiapam Chinantec -> Chinantec */
   {HB_TAG('c','s','p',' '),	HB_TAG('Z','H','S',' ')},	/* Southern Ping Chinese -> Chinese, Simplified */
   {HB_TAG('c','s','v',' '),	HB_TAG('Q','I','N',' ')},	/* Sumtu Chin -> Chin */
+  {HB_TAG('c','s','w',' '),	HB_TAG('N','C','R',' ')},	/* Swampy Cree -> N-Cree */
+  {HB_TAG('c','s','w',' '),	HB_TAG('N','H','C',' ')},	/* Swampy Cree -> Norway House Cree */
+  {HB_TAG('c','s','w',' '),	HB_TAG('C','R','E',' ')},	/* Swampy Cree -> Cree */
   {HB_TAG('c','s','y',' '),	HB_TAG('Q','I','N',' ')},	/* Siyin Chin -> Chin */
   {HB_TAG('c','t','c',' '),	HB_TAG('A','T','H',' ')},	/* Chetco -> Athapaskan */
   {HB_TAG('c','t','d',' '),	HB_TAG('Q','I','N',' ')},	/* Tedim Chin -> Chin */
   {HB_TAG('c','t','e',' '),	HB_TAG('C','C','H','N')},	/* Tepinapa Chinantec -> Chinantec */
+/*{HB_TAG('c','t','g',' '),	HB_TAG('C','T','G',' ')},*/	/* Chittagonian */
   {HB_TAG('c','t','h',' '),	HB_TAG('Q','I','N',' ')},	/* Thaiphum Chin -> Chin */
   {HB_TAG('c','t','l',' '),	HB_TAG('C','C','H','N')},	/* Tlacoatzintepec Chinantec -> Chinantec */
+/*{HB_TAG('c','t','o',' '),	HB_TAG('C','T','O',' ')},*/	/* Emberá-Catío */
   {HB_TAG('c','t','s',' '),	HB_TAG('B','I','K',' ')},	/* Northern Catanduanes Bikol -> Bikol */
+/*{HB_TAG('c','t','t',' '),	HB_TAG('C','T','T',' ')},*/	/* Wayanad Chetti */
   {HB_TAG('c','t','u',' '),	HB_TAG('M','Y','N',' ')},	/* Chol -> Mayan */
   {HB_TAG('c','u','c',' '),	HB_TAG('C','C','H','N')},	/* Usila Chinantec -> Chinantec */
+/*{HB_TAG('c','u','k',' '),	HB_TAG('C','U','K',' ')},*/	/* San Blas Kuna */
   {HB_TAG('c','v','n',' '),	HB_TAG('C','C','H','N')},	/* Valle Nacional Chinantec -> Chinantec */
+  {HB_TAG('c','w','d',' '),	HB_TAG('D','C','R',' ')},	/* Woods Cree */
+  {HB_TAG('c','w','d',' '),	HB_TAG('T','C','R',' ')},	/* Woods Cree -> TH-Cree */
+  {HB_TAG('c','w','d',' '),	HB_TAG('C','R','E',' ')},	/* Woods Cree -> Cree */
   {HB_TAG('c','z','h',' '),	HB_TAG('Z','H','S',' ')},	/* Huizhou Chinese -> Chinese, Simplified */
   {HB_TAG('c','z','o',' '),	HB_TAG('Z','H','S',' ')},	/* Min Zhong Chinese -> Chinese, Simplified */
   {HB_TAG('c','z','t',' '),	HB_TAG('Q','I','N',' ')},	/* Zotung Chin -> Chin */
+/*{HB_TAG('d','a','g',' '),	HB_TAG('D','A','G',' ')},*/	/* Dagbani */
   {HB_TAG('d','a','o',' '),	HB_TAG('Q','I','N',' ')},	/* Daai Chin -> Chin */
   {HB_TAG('d','a','p',' '),	HB_TAG('N','I','S',' ')},	/* Nisi (India) (retired code) */
+/*{HB_TAG('d','a','r',' '),	HB_TAG('D','A','R',' ')},*/	/* Dargwa */
+/*{HB_TAG('d','a','x',' '),	HB_TAG('D','A','X',' ')},*/	/* Dayi */
   {HB_TAG('d','c','r',' '),	HB_TAG('C','P','P',' ')},	/* Negerhollands -> Creoles */
+  {HB_TAG('d','e','n',' '),	HB_TAG('S','L','A',' ')},	/* Slave (Athapascan) [macrolanguage] -> Slavey */
+  {HB_TAG('d','e','n',' '),	HB_TAG('A','T','H',' ')},	/* Slave (Athapascan) [macrolanguage] -> Athapaskan */
   {HB_TAG('d','e','p',' '),	HB_TAG('C','P','P',' ')},	/* Pidgin Delaware -> Creoles */
+  {HB_TAG('d','g','o',' '),	HB_TAG('D','G','O',' ')},	/* Dogri (individual language) */
+  {HB_TAG('d','g','o',' '),	HB_TAG('D','G','R',' ')},	/* Dogri (macrolanguage) */
   {HB_TAG('d','g','r',' '),	HB_TAG('A','T','H',' ')},	/* Tlicho -> Athapaskan */
   {HB_TAG('d','h','d',' '),	HB_TAG('M','A','W',' ')},	/* Dhundari -> Marwari */
+/*{HB_TAG('d','h','g',' '),	HB_TAG('D','H','G',' ')},*/	/* Dhangu */
+  {HB_TAG('d','h','v',' '),	HB_TAG_NONE	       },	/* Dehu != Divehi (Dhivehi, Maldivian) (deprecated) */
   {HB_TAG('d','i','b',' '),	HB_TAG('D','N','K',' ')},	/* South Central Dinka -> Dinka */
   {HB_TAG('d','i','k',' '),	HB_TAG('D','N','K',' ')},	/* Southwestern Dinka -> Dinka */
   {HB_TAG('d','i','n',' '),	HB_TAG('D','N','K',' ')},	/* Dinka [macrolanguage] */
   {HB_TAG('d','i','p',' '),	HB_TAG('D','N','K',' ')},	/* Northeastern Dinka -> Dinka */
+  {HB_TAG('d','i','q',' '),	HB_TAG('D','I','Q',' ')},	/* Dimli */
+  {HB_TAG('d','i','q',' '),	HB_TAG('Z','Z','A',' ')},	/* Dimli -> Zazaki */
   {HB_TAG('d','i','w',' '),	HB_TAG('D','N','K',' ')},	/* Northwestern Dinka -> Dinka */
   {HB_TAG('d','j','e',' '),	HB_TAG('D','J','R',' ')},	/* Zarma */
   {HB_TAG('d','j','k',' '),	HB_TAG('C','P','P',' ')},	/* Eastern Maroon Creole -> Creoles */
   {HB_TAG('d','j','r',' '),	HB_TAG('D','J','R','0')},	/* Djambarrpuyngu */
   {HB_TAG('d','k','s',' '),	HB_TAG('D','N','K',' ')},	/* Southeastern Dinka -> Dinka */
   {HB_TAG('d','n','g',' '),	HB_TAG('D','U','N',' ')},	/* Dungan */
+/*{HB_TAG('d','n','j',' '),	HB_TAG('D','N','J',' ')},*/	/* Dan */
+  {HB_TAG('d','n','k',' '),	HB_TAG_NONE	       },	/* Dengka != Dinka */
   {HB_TAG('d','o','i',' '),	HB_TAG('D','G','R',' ')},	/* Dogri (macrolanguage) [macrolanguage] */
   {HB_TAG('d','r','h',' '),	HB_TAG('M','N','G',' ')},	/* Darkhat (retired code) -> Mongolian */
+  {HB_TAG('d','r','i',' '),	HB_TAG_NONE	       },	/* C'Lela != Dari */
+  {HB_TAG('d','r','w',' '),	HB_TAG('D','R','I',' ')},	/* Darwazi (retired code) -> Dari */
+  {HB_TAG('d','r','w',' '),	HB_TAG('F','A','R',' ')},	/* Darwazi (retired code) -> Persian */
   {HB_TAG('d','s','b',' '),	HB_TAG('L','S','B',' ')},	/* Lower Sorbian */
   {HB_TAG('d','t','y',' '),	HB_TAG('N','E','P',' ')},	/* Dotyali -> Nepali */
+/*{HB_TAG('d','u','j',' '),	HB_TAG('D','U','J',' ')},*/	/* Dhuwal (retired code) */
+  {HB_TAG('d','u','n',' '),	HB_TAG_NONE	       },	/* Dusun Deyah != Dungan */
   {HB_TAG('d','u','p',' '),	HB_TAG('M','L','Y',' ')},	/* Duano -> Malay */
   {HB_TAG('d','w','k',' '),	HB_TAG('K','U','I',' ')},	/* Dawik Kui -> Kui */
   {HB_TAG('d','w','u',' '),	HB_TAG('D','U','J',' ')},	/* Dhuwal */
   {HB_TAG('d','w','y',' '),	HB_TAG('D','U','J',' ')},	/* Dhuwaya -> Dhuwal */
   {HB_TAG('d','y','u',' '),	HB_TAG('J','U','L',' ')},	/* Dyula -> Jula */
+  {HB_TAG('d','z','n',' '),	HB_TAG_NONE	       },	/* Dzando != Dzongkha */
+  {HB_TAG('e','c','r',' '),	HB_TAG_NONE	       },	/* Eteocretan != Eastern Cree */
+/*{HB_TAG('e','f','i',' '),	HB_TAG('E','F','I',' ')},*/	/* Efik */
   {HB_TAG('e','k','k',' '),	HB_TAG('E','T','I',' ')},	/* Standard Estonian -> Estonian */
   {HB_TAG('e','k','y',' '),	HB_TAG('K','R','N',' ')},	/* Eastern Kayah -> Karen */
+  {HB_TAG('e','m','k',' '),	HB_TAG('E','M','K',' ')},	/* Eastern Maninkakan */
+  {HB_TAG('e','m','k',' '),	HB_TAG('M','N','K',' ')},	/* Eastern Maninkakan -> Maninka */
+/*{HB_TAG('e','m','p',' '),	HB_TAG('E','M','P',' ')},*/	/* Northern Emberá */
   {HB_TAG('e','m','y',' '),	HB_TAG('M','Y','N',' ')},	/* Epigraphic Mayan -> Mayan */
   {HB_TAG('e','n','b',' '),	HB_TAG('K','A','L',' ')},	/* Markweeta -> Kalenjin */
   {HB_TAG('e','n','f',' '),	HB_TAG('F','N','E',' ')},	/* Forest Enets */
@@ -614,27 +609,52 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('e','s','g',' '),	HB_TAG('G','O','N',' ')},	/* Aheri Gondi -> Gondi */
   {HB_TAG('e','s','i',' '),	HB_TAG('I','P','K',' ')},	/* North Alaskan Inupiatun -> Inupiat */
   {HB_TAG('e','s','k',' '),	HB_TAG('I','P','K',' ')},	/* Northwest Alaska Inupiatun -> Inupiat */
+/*{HB_TAG('e','s','u',' '),	HB_TAG('E','S','U',' ')},*/	/* Central Yupik */
   {HB_TAG('e','t','o',' '),	HB_TAG('B','T','I',' ')},	/* Eton (Cameroon) -> Beti */
+  {HB_TAG('e','u','q',' '),	HB_TAG_NONE	       },	/* Basque [collection] != Basque */
   {HB_TAG('e','v','e',' '),	HB_TAG('E','V','N',' ')},	/* Even */
   {HB_TAG('e','v','n',' '),	HB_TAG('E','V','K',' ')},	/* Evenki */
   {HB_TAG('e','w','o',' '),	HB_TAG('B','T','I',' ')},	/* Ewondo -> Beti */
   {HB_TAG('e','y','o',' '),	HB_TAG('K','A','L',' ')},	/* Keiyo -> Kalenjin */
   {HB_TAG('f','a','b',' '),	HB_TAG('C','P','P',' ')},	/* Fa d'Ambu -> Creoles */
+  {HB_TAG('f','a','n',' '),	HB_TAG('F','A','N','0')},	/* Fang (Equatorial Guinea) */
+  {HB_TAG('f','a','n',' '),	HB_TAG('B','T','I',' ')},	/* Fang (Equatorial Guinea) -> Beti */
+  {HB_TAG('f','a','r',' '),	HB_TAG_NONE	       },	/* Fataleka != Persian */
+  {HB_TAG('f','a','t',' '),	HB_TAG('F','A','T',' ')},	/* Fanti */
+  {HB_TAG('f','a','t',' '),	HB_TAG('A','K','A',' ')},	/* Fanti -> Akan */
   {HB_TAG('f','b','l',' '),	HB_TAG('B','I','K',' ')},	/* West Albay Bikol -> Bikol */
   {HB_TAG('f','f','m',' '),	HB_TAG('F','U','L',' ')},	/* Maasina Fulfulde -> Fulah */
   {HB_TAG('f','i','l',' '),	HB_TAG('P','I','L',' ')},	/* Filipino */
+  {HB_TAG('f','l','m',' '),	HB_TAG('H','A','L',' ')},	/* Halam (Falam Chin) (retired code) */
+  {HB_TAG('f','l','m',' '),	HB_TAG('Q','I','N',' ')},	/* Falam Chin (retired code) -> Chin */
+  {HB_TAG('f','m','p',' '),	HB_TAG('F','M','P',' ')},	/* Fe’fe’ */
+  {HB_TAG('f','m','p',' '),	HB_TAG('B','M','L',' ')},	/* Fe'fe' -> Bamileke */
   {HB_TAG('f','n','g',' '),	HB_TAG('C','P','P',' ')},	/* Fanagalo -> Creoles */
+/*{HB_TAG('f','o','n',' '),	HB_TAG('F','O','N',' ')},*/	/* Fon */
+  {HB_TAG('f','o','s',' '),	HB_TAG_NONE	       },	/* Siraya != Faroese */
   {HB_TAG('f','p','e',' '),	HB_TAG('C','P','P',' ')},	/* Fernando Po Creole English -> Creoles */
+/*{HB_TAG('f','r','c',' '),	HB_TAG('F','R','C',' ')},*/	/* Cajun French */
+/*{HB_TAG('f','r','p',' '),	HB_TAG('F','R','P',' ')},*/	/* Arpitan */
   {HB_TAG('f','u','b',' '),	HB_TAG('F','U','L',' ')},	/* Adamawa Fulfulde -> Fulah */
   {HB_TAG('f','u','c',' '),	HB_TAG('F','U','L',' ')},	/* Pulaar -> Fulah */
   {HB_TAG('f','u','e',' '),	HB_TAG('F','U','L',' ')},	/* Borgu Fulfulde -> Fulah */
+  {HB_TAG('f','u','f',' '),	HB_TAG('F','T','A',' ')},	/* Pular -> Futa */
+  {HB_TAG('f','u','f',' '),	HB_TAG('F','U','L',' ')},	/* Pular -> Fulah */
   {HB_TAG('f','u','h',' '),	HB_TAG('F','U','L',' ')},	/* Western Niger Fulfulde -> Fulah */
   {HB_TAG('f','u','i',' '),	HB_TAG('F','U','L',' ')},	/* Bagirmi Fulfulde -> Fulah */
   {HB_TAG('f','u','q',' '),	HB_TAG('F','U','L',' ')},	/* Central-Eastern Niger Fulfulde -> Fulah */
   {HB_TAG('f','u','r',' '),	HB_TAG('F','R','L',' ')},	/* Friulian */
+  {HB_TAG('f','u','v',' '),	HB_TAG('F','U','V',' ')},	/* Nigerian Fulfulde */
+  {HB_TAG('f','u','v',' '),	HB_TAG('F','U','L',' ')},	/* Nigerian Fulfulde -> Fulah */
   {HB_TAG('g','a','a',' '),	HB_TAG('G','A','D',' ')},	/* Ga */
   {HB_TAG('g','a','c',' '),	HB_TAG('C','P','P',' ')},	/* Mixed Great Andamanese -> Creoles */
+  {HB_TAG('g','a','d',' '),	HB_TAG_NONE	       },	/* Gaddang != Ga */
+  {HB_TAG('g','a','e',' '),	HB_TAG_NONE	       },	/* Guarequena != Scottish Gaelic */
+/*{HB_TAG('g','a','g',' '),	HB_TAG('G','A','G',' ')},*/	/* Gagauz */
+  {HB_TAG('g','a','l',' '),	HB_TAG_NONE	       },	/* Galolen != Galician */
   {HB_TAG('g','a','n',' '),	HB_TAG('Z','H','S',' ')},	/* Gan Chinese -> Chinese, Simplified */
+  {HB_TAG('g','a','r',' '),	HB_TAG_NONE	       },	/* Galeya != Garshuni */
+  {HB_TAG('g','a','w',' '),	HB_TAG_NONE	       },	/* Nobonob != Garhwali */
   {HB_TAG('g','a','x',' '),	HB_TAG('O','R','O',' ')},	/* Borana-Arsi-Guji Oromo -> Oromo */
   {HB_TAG('g','a','z',' '),	HB_TAG('O','R','O',' ')},	/* West Central Oromo -> Oromo */
   {HB_TAG('g','b','m',' '),	HB_TAG('G','A','W',' ')},	/* Garhwali */
@@ -643,46 +663,69 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('g','c','l',' '),	HB_TAG('C','P','P',' ')},	/* Grenadian Creole English -> Creoles */
   {HB_TAG('g','c','r',' '),	HB_TAG('C','P','P',' ')},	/* Guianese Creole French -> Creoles */
   {HB_TAG('g','d','a',' '),	HB_TAG('R','A','J',' ')},	/* Gade Lohar -> Rajasthani */
+/*{HB_TAG('g','e','z',' '),	HB_TAG('G','E','Z',' ')},*/	/* Geez */
   {HB_TAG('g','g','o',' '),	HB_TAG('G','O','N',' ')},	/* Southern Gondi (retired code) -> Gondi */
   {HB_TAG('g','h','a',' '),	HB_TAG('B','B','R',' ')},	/* Ghadamès -> Berber */
   {HB_TAG('g','h','c',' '),	HB_TAG('I','R','T',' ')},	/* Hiberno-Scottish Gaelic -> Irish Traditional */
   {HB_TAG('g','h','k',' '),	HB_TAG('K','R','N',' ')},	/* Geko Karen -> Karen */
   {HB_TAG('g','h','o',' '),	HB_TAG('B','B','R',' ')},	/* Ghomara -> Berber */
   {HB_TAG('g','i','b',' '),	HB_TAG('C','P','P',' ')},	/* Gibanawa -> Creoles */
+/*{HB_TAG('g','i','h',' '),	HB_TAG('G','I','H',' ')},*/	/* Githabul */
   {HB_TAG('g','i','l',' '),	HB_TAG('G','I','L','0')},	/* Kiribati (Gilbertese) */
   {HB_TAG('g','j','u',' '),	HB_TAG('R','A','J',' ')},	/* Gujari -> Rajasthani */
+  {HB_TAG('g','k','p',' '),	HB_TAG('G','K','P',' ')},	/* Guinea Kpelle -> Kpelle (Guinea) */
+  {HB_TAG('g','k','p',' '),	HB_TAG('K','P','L',' ')},	/* Guinea Kpelle -> Kpelle */
   {HB_TAG('g','l','d',' '),	HB_TAG('N','A','N',' ')},	/* Nanai */
+/*{HB_TAG('g','l','k',' '),	HB_TAG('G','L','K',' ')},*/	/* Gilaki */
+  {HB_TAG('g','m','z',' '),	HB_TAG_NONE	       },	/* Mgbolizhia != Gumuz */
   {HB_TAG('g','n','b',' '),	HB_TAG('Q','I','N',' ')},	/* Gangte -> Chin */
+/*{HB_TAG('g','n','n',' '),	HB_TAG('G','N','N',' ')},*/	/* Gumatj */
   {HB_TAG('g','n','o',' '),	HB_TAG('G','O','N',' ')},	/* Northern Gondi -> Gondi */
   {HB_TAG('g','n','w',' '),	HB_TAG('G','U','A',' ')},	/* Western Bolivian Guaraní -> Guarani */
+/*{HB_TAG('g','o','g',' '),	HB_TAG('G','O','G',' ')},*/	/* Gogo */
   {HB_TAG('g','o','m',' '),	HB_TAG('K','O','K',' ')},	/* Goan Konkani -> Konkani */
+/*{HB_TAG('g','o','n',' '),	HB_TAG('G','O','N',' ')},*/	/* Gondi [macrolanguage] */
   {HB_TAG('g','o','q',' '),	HB_TAG('C','P','P',' ')},	/* Gorap -> Creoles */
   {HB_TAG('g','o','x',' '),	HB_TAG('B','A','D','0')},	/* Gobu -> Banda */
   {HB_TAG('g','p','e',' '),	HB_TAG('C','P','P',' ')},	/* Ghanaian Pidgin English -> Creoles */
+  {HB_TAG('g','r','o',' '),	HB_TAG_NONE	       },	/* Groma != Garo */
   {HB_TAG('g','r','r',' '),	HB_TAG('B','B','R',' ')},	/* Taznatit -> Berber */
   {HB_TAG('g','r','t',' '),	HB_TAG('G','R','O',' ')},	/* Garo */
   {HB_TAG('g','r','u',' '),	HB_TAG('S','O','G',' ')},	/* Kistane -> Sodo Gurage */
   {HB_TAG('g','s','w',' '),	HB_TAG('A','L','S',' ')},	/* Alsatian */
+  {HB_TAG('g','u','a',' '),	HB_TAG_NONE	       },	/* Shiki != Guarani */
+/*{HB_TAG('g','u','c',' '),	HB_TAG('G','U','C',' ')},*/	/* Wayuu */
+/*{HB_TAG('g','u','f',' '),	HB_TAG('G','U','F',' ')},*/	/* Gupapuyngu */
   {HB_TAG('g','u','g',' '),	HB_TAG('G','U','A',' ')},	/* Paraguayan Guaraní -> Guarani */
   {HB_TAG('g','u','i',' '),	HB_TAG('G','U','A',' ')},	/* Eastern Bolivian Guaraní -> Guarani */
   {HB_TAG('g','u','k',' '),	HB_TAG('G','M','Z',' ')},	/* Gumuz */
   {HB_TAG('g','u','l',' '),	HB_TAG('C','P','P',' ')},	/* Sea Island Creole English -> Creoles */
   {HB_TAG('g','u','n',' '),	HB_TAG('G','U','A',' ')},	/* Mbyá Guaraní -> Guarani */
+/*{HB_TAG('g','u','z',' '),	HB_TAG('G','U','Z',' ')},*/	/* Gusii */
   {HB_TAG('g','w','i',' '),	HB_TAG('A','T','H',' ')},	/* Gwichʼin -> Athapaskan */
   {HB_TAG('g','y','n',' '),	HB_TAG('C','P','P',' ')},	/* Guyanese Creole English -> Creoles */
   {HB_TAG('h','a','a',' '),	HB_TAG('A','T','H',' ')},	/* Hän -> Athapaskan */
   {HB_TAG('h','a','e',' '),	HB_TAG('O','R','O',' ')},	/* Eastern Oromo -> Oromo */
   {HB_TAG('h','a','i',' '),	HB_TAG('H','A','I','0')},	/* Haida [macrolanguage] */
   {HB_TAG('h','a','k',' '),	HB_TAG('Z','H','S',' ')},	/* Hakka Chinese -> Chinese, Simplified */
+  {HB_TAG('h','a','l',' '),	HB_TAG_NONE	       },	/* Halang != Halam (Falam Chin) */
   {HB_TAG('h','a','r',' '),	HB_TAG('H','R','I',' ')},	/* Harari */
+/*{HB_TAG('h','a','w',' '),	HB_TAG('H','A','W',' ')},*/	/* Hawaiian */
   {HB_TAG('h','a','x',' '),	HB_TAG('H','A','I','0')},	/* Southern Haida -> Haida */
+/*{HB_TAG('h','a','y',' '),	HB_TAG('H','A','Y',' ')},*/	/* Haya */
+/*{HB_TAG('h','a','z',' '),	HB_TAG('H','A','Z',' ')},*/	/* Hazaragi */
+  {HB_TAG('h','b','n',' '),	HB_TAG_NONE	       },	/* Heiban != Hammer-Banna */
   {HB_TAG('h','c','a',' '),	HB_TAG('C','P','P',' ')},	/* Andaman Creole Hindi -> Creoles */
   {HB_TAG('h','d','n',' '),	HB_TAG('H','A','I','0')},	/* Northern Haida -> Haida */
   {HB_TAG('h','e','a',' '),	HB_TAG('H','M','N',' ')},	/* Northern Qiandong Miao -> Hmong */
+/*{HB_TAG('h','e','i',' '),	HB_TAG('H','E','I',' ')},*/	/* Heiltsuk */
+/*{HB_TAG('h','i','l',' '),	HB_TAG('H','I','L',' ')},*/	/* Hiligaynon */
   {HB_TAG('h','j','i',' '),	HB_TAG('M','L','Y',' ')},	/* Haji -> Malay */
   {HB_TAG('h','l','t',' '),	HB_TAG('Q','I','N',' ')},	/* Matu Chin -> Chin */
   {HB_TAG('h','m','a',' '),	HB_TAG('H','M','N',' ')},	/* Southern Mashan Hmong -> Hmong */
   {HB_TAG('h','m','c',' '),	HB_TAG('H','M','N',' ')},	/* Central Huishui Hmong -> Hmong */
+  {HB_TAG('h','m','d',' '),	HB_TAG('H','M','D',' ')},	/* Large Flowery Miao -> A-Hmao */
+  {HB_TAG('h','m','d',' '),	HB_TAG('H','M','N',' ')},	/* Large Flowery Miao -> Hmong */
   {HB_TAG('h','m','e',' '),	HB_TAG('H','M','N',' ')},	/* Eastern Huishui Hmong -> Hmong */
   {HB_TAG('h','m','g',' '),	HB_TAG('H','M','N',' ')},	/* Southwestern Guiyang Hmong -> Hmong */
   {HB_TAG('h','m','h',' '),	HB_TAG('H','M','N',' ')},	/* Southwestern Huishui Hmong -> Hmong */
@@ -690,27 +733,36 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('h','m','j',' '),	HB_TAG('H','M','N',' ')},	/* Ge -> Hmong */
   {HB_TAG('h','m','l',' '),	HB_TAG('H','M','N',' ')},	/* Luopohe Hmong -> Hmong */
   {HB_TAG('h','m','m',' '),	HB_TAG('H','M','N',' ')},	/* Central Mashan Hmong -> Hmong */
+/*{HB_TAG('h','m','n',' '),	HB_TAG('H','M','N',' ')},*/	/* Hmong [macrolanguage] */
   {HB_TAG('h','m','p',' '),	HB_TAG('H','M','N',' ')},	/* Northern Mashan Hmong -> Hmong */
   {HB_TAG('h','m','q',' '),	HB_TAG('H','M','N',' ')},	/* Eastern Qiandong Miao -> Hmong */
   {HB_TAG('h','m','r',' '),	HB_TAG('Q','I','N',' ')},	/* Hmar -> Chin */
   {HB_TAG('h','m','s',' '),	HB_TAG('H','M','N',' ')},	/* Southern Qiandong Miao -> Hmong */
   {HB_TAG('h','m','w',' '),	HB_TAG('H','M','N',' ')},	/* Western Mashan Hmong -> Hmong */
   {HB_TAG('h','m','y',' '),	HB_TAG('H','M','N',' ')},	/* Southern Guiyang Hmong -> Hmong */
+  {HB_TAG('h','m','z',' '),	HB_TAG('H','M','Z',' ')},	/* Hmong Shua -> Hmong Shuat */
+  {HB_TAG('h','m','z',' '),	HB_TAG('H','M','N',' ')},	/* Hmong Shua -> Hmong */
+/*{HB_TAG('h','n','d',' '),	HB_TAG('H','N','D',' ')},*/	/* Southern Hindko -> Hindko */
   {HB_TAG('h','n','e',' '),	HB_TAG('C','H','H',' ')},	/* Chhattisgarhi -> Chattisgarhi */
   {HB_TAG('h','n','j',' '),	HB_TAG('H','M','N',' ')},	/* Hmong Njua -> Hmong */
   {HB_TAG('h','n','m',' '),	HB_TAG('Z','H','S',' ')},	/* Hainanese -> Chinese, Simplified */
   {HB_TAG('h','n','o',' '),	HB_TAG('H','N','D',' ')},	/* Northern Hindko -> Hindko */
   {HB_TAG('h','o','c',' '),	HB_TAG('H','O',' ',' ')},	/* Ho */
   {HB_TAG('h','o','i',' '),	HB_TAG('A','T','H',' ')},	/* Holikachuk -> Athapaskan */
+  {HB_TAG('h','o','j',' '),	HB_TAG('H','A','R',' ')},	/* Hadothi -> Harauti */
+  {HB_TAG('h','o','j',' '),	HB_TAG('R','A','J',' ')},	/* Hadothi -> Rajasthani */
   {HB_TAG('h','r','a',' '),	HB_TAG('Q','I','N',' ')},	/* Hrangkhol -> Chin */
   {HB_TAG('h','r','m',' '),	HB_TAG('H','M','N',' ')},	/* Horned Miao -> Hmong */
   {HB_TAG('h','s','b',' '),	HB_TAG('U','S','B',' ')},	/* Upper Sorbian */
   {HB_TAG('h','s','n',' '),	HB_TAG('Z','H','S',' ')},	/* Xiang Chinese -> Chinese, Simplified */
   {HB_TAG('h','u','j',' '),	HB_TAG('H','M','N',' ')},	/* Northern Guiyang Hmong -> Hmong */
   {HB_TAG('h','u','p',' '),	HB_TAG('A','T','H',' ')},	/* Hupa -> Athapaskan */
+/*{HB_TAG('h','u','r',' '),	HB_TAG('H','U','R',' ')},*/	/* Halkomelem */
   {HB_TAG('h','u','s',' '),	HB_TAG('M','Y','N',' ')},	/* Huastec -> Mayan */
   {HB_TAG('h','w','c',' '),	HB_TAG('C','P','P',' ')},	/* Hawai'i Creole English -> Creoles */
   {HB_TAG('h','y','w',' '),	HB_TAG('H','Y','E',' ')},	/* Western Armenian -> Armenian */
+/*{HB_TAG('i','b','a',' '),	HB_TAG('I','B','A',' ')},*/	/* Iban */
+/*{HB_TAG('i','b','b',' '),	HB_TAG('I','B','B',' ')},*/	/* Ibibio */
   {HB_TAG('i','b','y',' '),	HB_TAG('I','J','O',' ')},	/* Ibani -> Ijo */
   {HB_TAG('i','c','r',' '),	HB_TAG('C','P','P',' ')},	/* Islander Creole English -> Creoles */
   {HB_TAG('i','d','a',' '),	HB_TAG('L','U','H',' ')},	/* Idakho-Isukha-Tiriki -> Luyia */
@@ -720,71 +772,156 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('i','j','c',' '),	HB_TAG('I','J','O',' ')},	/* Izon -> Ijo */
   {HB_TAG('i','j','e',' '),	HB_TAG('I','J','O',' ')},	/* Biseni -> Ijo */
   {HB_TAG('i','j','n',' '),	HB_TAG('I','J','O',' ')},	/* Kalabari -> Ijo */
+/*{HB_TAG('i','j','o',' '),	HB_TAG('I','J','O',' ')},*/	/* Ijo [collection] */
   {HB_TAG('i','j','s',' '),	HB_TAG('I','J','O',' ')},	/* Southeast Ijo -> Ijo */
+  {HB_TAG('i','k','e',' '),	HB_TAG('I','N','U',' ')},	/* Eastern Canadian Inuktitut -> Inuktitut */
+  {HB_TAG('i','k','e',' '),	HB_TAG('I','N','U','K')},	/* Eastern Canadian Inuktitut -> Nunavik Inuktitut */
   {HB_TAG('i','k','t',' '),	HB_TAG('I','N','U',' ')},	/* Inuinnaqtun -> Inuktitut */
+/*{HB_TAG('i','l','o',' '),	HB_TAG('I','L','O',' ')},*/	/* Iloko -> Ilokano */
   {HB_TAG('i','n','g',' '),	HB_TAG('A','T','H',' ')},	/* Degexit'an -> Athapaskan */
   {HB_TAG('i','n','h',' '),	HB_TAG('I','N','G',' ')},	/* Ingush */
+  {HB_TAG('i','r','i',' '),	HB_TAG_NONE	       },	/* Rigwe != Irish */
+/*{HB_TAG('i','r','u',' '),	HB_TAG('I','R','U',' ')},*/	/* Irula */
+  {HB_TAG('i','s','m',' '),	HB_TAG_NONE	       },	/* Masimasi != Inari Sami */
   {HB_TAG('i','t','z',' '),	HB_TAG('M','Y','N',' ')},	/* Itzá -> Mayan */
   {HB_TAG('i','x','l',' '),	HB_TAG('M','Y','N',' ')},	/* Ixil -> Mayan */
   {HB_TAG('j','a','c',' '),	HB_TAG('M','Y','N',' ')},	/* Popti' -> Mayan */
   {HB_TAG('j','a','k',' '),	HB_TAG('M','L','Y',' ')},	/* Jakun -> Malay */
+  {HB_TAG('j','a','m',' '),	HB_TAG('J','A','M',' ')},	/* Jamaican Creole English -> Jamaican Creole */
+  {HB_TAG('j','a','m',' '),	HB_TAG('C','P','P',' ')},	/* Jamaican Creole English -> Creoles */
+  {HB_TAG('j','a','n',' '),	HB_TAG_NONE	       },	/* Jandai != Japanese */
   {HB_TAG('j','a','x',' '),	HB_TAG('M','L','Y',' ')},	/* Jambi Malay -> Malay */
   {HB_TAG('j','b','e',' '),	HB_TAG('B','B','R',' ')},	/* Judeo-Berber -> Berber */
   {HB_TAG('j','b','n',' '),	HB_TAG('B','B','R',' ')},	/* Nafusi -> Berber */
+/*{HB_TAG('j','b','o',' '),	HB_TAG('J','B','O',' ')},*/	/* Lojban */
+/*{HB_TAG('j','c','t',' '),	HB_TAG('J','C','T',' ')},*/	/* Krymchak */
+/*{HB_TAG('j','d','t',' '),	HB_TAG('J','D','T',' ')},*/	/* Judeo-Tat */
   {HB_TAG('j','g','o',' '),	HB_TAG('B','M','L',' ')},	/* Ngomba -> Bamileke */
+  {HB_TAG('j','i','i',' '),	HB_TAG_NONE	       },	/* Jiiddu != Yiddish */
   {HB_TAG('j','k','m',' '),	HB_TAG('K','R','N',' ')},	/* Mobwa Karen -> Karen */
   {HB_TAG('j','k','p',' '),	HB_TAG('K','R','N',' ')},	/* Paku Karen -> Karen */
+  {HB_TAG('j','u','d',' '),	HB_TAG_NONE	       },	/* Worodougou != Ladino */
+  {HB_TAG('j','u','l',' '),	HB_TAG_NONE	       },	/* Jirel != Jula */
   {HB_TAG('j','v','d',' '),	HB_TAG('C','P','P',' ')},	/* Javindo -> Creoles */
   {HB_TAG('k','a','a',' '),	HB_TAG('K','R','K',' ')},	/* Karakalpak */
+  {HB_TAG('k','a','b',' '),	HB_TAG('K','A','B','0')},	/* Kabyle */
+  {HB_TAG('k','a','b',' '),	HB_TAG('B','B','R',' ')},	/* Kabyle -> Berber */
+  {HB_TAG('k','a','c',' '),	HB_TAG_NONE	       },	/* Kachin != Kachchi */
   {HB_TAG('k','a','m',' '),	HB_TAG('K','M','B',' ')},	/* Kamba (Kenya) */
   {HB_TAG('k','a','r',' '),	HB_TAG('K','R','N',' ')},	/* Karen [collection] */
+/*{HB_TAG('k','a','w',' '),	HB_TAG('K','A','W',' ')},*/	/* Kawi (Old Javanese) */
+/*{HB_TAG('k','b','c',' '),	HB_TAG('K','B','C',' ')},*/	/* Kadiwéu */
   {HB_TAG('k','b','d',' '),	HB_TAG('K','A','B',' ')},	/* Kabardian */
   {HB_TAG('k','b','y',' '),	HB_TAG('K','N','R',' ')},	/* Manga Kanuri -> Kanuri */
+  {HB_TAG('k','c','a',' '),	HB_TAG('K','H','K',' ')},	/* Khanty -> Khanty-Kazim */
+  {HB_TAG('k','c','a',' '),	HB_TAG('K','H','S',' ')},	/* Khanty -> Khanty-Shurishkar */
+  {HB_TAG('k','c','a',' '),	HB_TAG('K','H','V',' ')},	/* Khanty -> Khanty-Vakhi */
   {HB_TAG('k','c','n',' '),	HB_TAG('C','P','P',' ')},	/* Nubi -> Creoles */
+/*{HB_TAG('k','d','e',' '),	HB_TAG('K','D','E',' ')},*/	/* Makonde */
   {HB_TAG('k','d','r',' '),	HB_TAG('K','R','M',' ')},	/* Karaim */
   {HB_TAG('k','d','t',' '),	HB_TAG('K','U','Y',' ')},	/* Kuy */
+  {HB_TAG('k','e','a',' '),	HB_TAG('K','E','A',' ')},	/* Kabuverdianu (Crioulo) */
+  {HB_TAG('k','e','a',' '),	HB_TAG('C','P','P',' ')},	/* Kabuverdianu -> Creoles */
+  {HB_TAG('k','e','b',' '),	HB_TAG_NONE	       },	/* Kélé != Kebena */
+  {HB_TAG('k','e','k',' '),	HB_TAG('K','E','K',' ')},	/* Kekchi */
+  {HB_TAG('k','e','k',' '),	HB_TAG('M','Y','N',' ')},	/* Kekchí -> Mayan */
   {HB_TAG('k','e','x',' '),	HB_TAG('K','K','N',' ')},	/* Kukna -> Kokni */
   {HB_TAG('k','f','a',' '),	HB_TAG('K','O','D',' ')},	/* Kodava -> Kodagu */
   {HB_TAG('k','f','r',' '),	HB_TAG('K','A','C',' ')},	/* Kachhi -> Kachchi */
   {HB_TAG('k','f','x',' '),	HB_TAG('K','U','L',' ')},	/* Kullu Pahari -> Kulvi */
   {HB_TAG('k','f','y',' '),	HB_TAG('K','M','N',' ')},	/* Kumaoni */
+  {HB_TAG('k','g','e',' '),	HB_TAG_NONE	       },	/* Komering != Khutsuri Georgian */
+/*{HB_TAG('k','g','f',' '),	HB_TAG('K','G','F',' ')},*/	/* Kube */
   {HB_TAG('k','h','a',' '),	HB_TAG('K','S','I',' ')},	/* Khasi */
   {HB_TAG('k','h','b',' '),	HB_TAG('X','B','D',' ')},	/* Lü */
   {HB_TAG('k','h','k',' '),	HB_TAG('M','N','G',' ')},	/* Halh Mongolian -> Mongolian */
+  {HB_TAG('k','h','n',' '),	HB_TAG_NONE	       },	/* Khandesi != Khamti Shan (Microsoft fonts) */
+  {HB_TAG('k','h','s',' '),	HB_TAG_NONE	       },	/* Kasua != Khanty-Shurishkar */
+  {HB_TAG('k','h','t',' '),	HB_TAG('K','H','T',' ')},	/* Khamti -> Khamti Shan */
+  {HB_TAG('k','h','t',' '),	HB_TAG('K','H','N',' ')},	/* Khamti -> Khamti Shan (Microsoft fonts) */
+  {HB_TAG('k','h','v',' '),	HB_TAG_NONE	       },	/* Khvarshi != Khanty-Vakhi */
+/*{HB_TAG('k','h','w',' '),	HB_TAG('K','H','W',' ')},*/	/* Khowar */
+  {HB_TAG('k','i','s',' '),	HB_TAG_NONE	       },	/* Kis != Kisii */
+  {HB_TAG('k','i','u',' '),	HB_TAG('K','I','U',' ')},	/* Kirmanjki */
+  {HB_TAG('k','i','u',' '),	HB_TAG('Z','Z','A',' ')},	/* Kirmanjki -> Zazaki */
   {HB_TAG('k','j','b',' '),	HB_TAG('M','Y','N',' ')},	/* Q'anjob'al -> Mayan */
+/*{HB_TAG('k','j','d',' '),	HB_TAG('K','J','D',' ')},*/	/* Southern Kiwai */
   {HB_TAG('k','j','h',' '),	HB_TAG('K','H','A',' ')},	/* Khakas -> Khakass */
+/*{HB_TAG('k','j','j',' '),	HB_TAG('K','J','J',' ')},*/	/* Khinalugh -> Khinalug */
+  {HB_TAG('k','j','p',' '),	HB_TAG('K','J','P',' ')},	/* Pwo Eastern Karen -> Eastern Pwo Karen */
+  {HB_TAG('k','j','p',' '),	HB_TAG('K','R','N',' ')},	/* Pwo Eastern Karen -> Karen */
   {HB_TAG('k','j','t',' '),	HB_TAG('K','R','N',' ')},	/* Phrae Pwo Karen -> Karen */
+/*{HB_TAG('k','j','z',' '),	HB_TAG('K','J','Z',' ')},*/	/* Bumthangkha */
+  {HB_TAG('k','k','n',' '),	HB_TAG_NONE	       },	/* Kon Keu != Kokni */
   {HB_TAG('k','k','z',' '),	HB_TAG('A','T','H',' ')},	/* Kaska -> Athapaskan */
+  {HB_TAG('k','l','m',' '),	HB_TAG_NONE	       },	/* Migum != Kalmyk */
   {HB_TAG('k','l','n',' '),	HB_TAG('K','A','L',' ')},	/* Kalenjin [macrolanguage] */
   {HB_TAG('k','m','b',' '),	HB_TAG('M','B','N',' ')},	/* Kimbundu -> Mbundu */
+/*{HB_TAG('k','m','g',' '),	HB_TAG('K','M','G',' ')},*/	/* Kâte */
+  {HB_TAG('k','m','n',' '),	HB_TAG_NONE	       },	/* Awtuw != Kumaoni */
+  {HB_TAG('k','m','o',' '),	HB_TAG_NONE	       },	/* Kwoma != Komo */
   {HB_TAG('k','m','r',' '),	HB_TAG('K','U','R',' ')},	/* Northern Kurdish -> Kurdish */
+  {HB_TAG('k','m','s',' '),	HB_TAG_NONE	       },	/* Kamasau != Komso */
   {HB_TAG('k','m','v',' '),	HB_TAG('C','P','P',' ')},	/* Karipúna Creole French -> Creoles */
   {HB_TAG('k','m','w',' '),	HB_TAG('K','M','O',' ')},	/* Komo (Democratic Republic of Congo) */
+/*{HB_TAG('k','m','z',' '),	HB_TAG('K','M','Z',' ')},*/	/* Khorasani Turkish -> Khorasani Turkic */
   {HB_TAG('k','n','c',' '),	HB_TAG('K','N','R',' ')},	/* Central Kanuri -> Kanuri */
   {HB_TAG('k','n','g',' '),	HB_TAG('K','O','N','0')},	/* Koongo -> Kongo */
   {HB_TAG('k','n','j',' '),	HB_TAG('M','Y','N',' ')},	/* Western Kanjobal -> Mayan */
   {HB_TAG('k','n','n',' '),	HB_TAG('K','O','K',' ')},	/* Konkani */
+  {HB_TAG('k','n','r',' '),	HB_TAG_NONE	       },	/* Kaningra != Kanuri */
+  {HB_TAG('k','o','d',' '),	HB_TAG_NONE	       },	/* Kodi != Kodagu */
+  {HB_TAG('k','o','h',' '),	HB_TAG_NONE	       },	/* Koyo != Korean Old Hangul */
+  {HB_TAG('k','o','i',' '),	HB_TAG('K','O','P',' ')},	/* Komi-Permyak */
+  {HB_TAG('k','o','i',' '),	HB_TAG('K','O','M',' ')},	/* Komi-Permyak -> Komi */
+/*{HB_TAG('k','o','k',' '),	HB_TAG('K','O','K',' ')},*/	/* Konkani [macrolanguage] */
+  {HB_TAG('k','o','p',' '),	HB_TAG_NONE	       },	/* Waube != Komi-Permyak */
+/*{HB_TAG('k','o','s',' '),	HB_TAG('K','O','S',' ')},*/	/* Kosraean */
   {HB_TAG('k','o','y',' '),	HB_TAG('A','T','H',' ')},	/* Koyukon -> Athapaskan */
+  {HB_TAG('k','o','z',' '),	HB_TAG_NONE	       },	/* Korak != Komi-Zyrian */
   {HB_TAG('k','p','e',' '),	HB_TAG('K','P','L',' ')},	/* Kpelle [macrolanguage] */
+  {HB_TAG('k','p','l',' '),	HB_TAG_NONE	       },	/* Kpala != Kpelle */
   {HB_TAG('k','p','p',' '),	HB_TAG('K','R','N',' ')},	/* Paku Karen (retired code) -> Karen */
+  {HB_TAG('k','p','v',' '),	HB_TAG('K','O','Z',' ')},	/* Komi-Zyrian */
+  {HB_TAG('k','p','v',' '),	HB_TAG('K','O','M',' ')},	/* Komi-Zyrian -> Komi */
   {HB_TAG('k','p','y',' '),	HB_TAG('K','Y','K',' ')},	/* Koryak */
   {HB_TAG('k','q','s',' '),	HB_TAG('K','I','S',' ')},	/* Northern Kissi -> Kisii */
   {HB_TAG('k','q','y',' '),	HB_TAG('K','R','T',' ')},	/* Koorete */
+  {HB_TAG('k','r','c',' '),	HB_TAG('K','A','R',' ')},	/* Karachay-Balkar -> Karachay */
+  {HB_TAG('k','r','c',' '),	HB_TAG('B','A','L',' ')},	/* Karachay-Balkar -> Balkar */
+  {HB_TAG('k','r','i',' '),	HB_TAG('K','R','I',' ')},	/* Krio */
+  {HB_TAG('k','r','i',' '),	HB_TAG('C','P','P',' ')},	/* Krio -> Creoles */
+  {HB_TAG('k','r','k',' '),	HB_TAG_NONE	       },	/* Kerek != Karakalpak */
+/*{HB_TAG('k','r','l',' '),	HB_TAG('K','R','L',' ')},*/	/* Karelian */
+  {HB_TAG('k','r','m',' '),	HB_TAG_NONE	       },	/* Krim (retired code) != Karaim */
+  {HB_TAG('k','r','n',' '),	HB_TAG_NONE	       },	/* Sapo != Karen */
   {HB_TAG('k','r','t',' '),	HB_TAG('K','N','R',' ')},	/* Tumari Kanuri -> Kanuri */
   {HB_TAG('k','r','u',' '),	HB_TAG('K','U','U',' ')},	/* Kurukh */
   {HB_TAG('k','s','h',' '),	HB_TAG('K','S','H','0')},	/* Kölsch -> Ripuarian */
+  {HB_TAG('k','s','i',' '),	HB_TAG_NONE	       },	/* Krisa != Khasi */
+  {HB_TAG('k','s','m',' '),	HB_TAG_NONE	       },	/* Kumba != Kildin Sami */
   {HB_TAG('k','s','s',' '),	HB_TAG('K','I','S',' ')},	/* Southern Kisi -> Kisii */
+/*{HB_TAG('k','s','u',' '),	HB_TAG('K','S','U',' ')},*/	/* Khamyang */
+  {HB_TAG('k','s','w',' '),	HB_TAG('K','S','W',' ')},	/* S’gaw Karen */
+  {HB_TAG('k','s','w',' '),	HB_TAG('K','R','N',' ')},	/* S'gaw Karen -> Karen */
   {HB_TAG('k','t','b',' '),	HB_TAG('K','E','B',' ')},	/* Kambaata -> Kebena */
   {HB_TAG('k','t','u',' '),	HB_TAG('K','O','N',' ')},	/* Kituba (Democratic Republic of Congo) -> Kikongo */
   {HB_TAG('k','t','w',' '),	HB_TAG('A','T','H',' ')},	/* Kato -> Athapaskan */
+  {HB_TAG('k','u','i',' '),	HB_TAG_NONE	       },	/* Kuikúro-Kalapálo != Kui */
+  {HB_TAG('k','u','l',' '),	HB_TAG_NONE	       },	/* Kulere != Kulvi */
+/*{HB_TAG('k','u','m',' '),	HB_TAG('K','U','M',' ')},*/	/* Kumyk */
   {HB_TAG('k','u','u',' '),	HB_TAG('A','T','H',' ')},	/* Upper Kuskokwim -> Athapaskan */
   {HB_TAG('k','u','w',' '),	HB_TAG('B','A','D','0')},	/* Kpagua -> Banda */
+  {HB_TAG('k','u','y',' '),	HB_TAG_NONE	       },	/* Kuuku-Ya'u != Kuy */
   {HB_TAG('k','v','b',' '),	HB_TAG('M','L','Y',' ')},	/* Kubu -> Malay */
   {HB_TAG('k','v','l',' '),	HB_TAG('K','R','N',' ')},	/* Kayaw -> Karen */
+  {HB_TAG('k','v','q',' '),	HB_TAG('K','V','Q',' ')},	/* Geba Karen */
+  {HB_TAG('k','v','q',' '),	HB_TAG('K','R','N',' ')},	/* Geba Karen -> Karen */
   {HB_TAG('k','v','r',' '),	HB_TAG('M','L','Y',' ')},	/* Kerinci -> Malay */
   {HB_TAG('k','v','t',' '),	HB_TAG('K','R','N',' ')},	/* Lahta Karen -> Karen */
   {HB_TAG('k','v','u',' '),	HB_TAG('K','R','N',' ')},	/* Yinbaw Karen -> Karen */
   {HB_TAG('k','v','y',' '),	HB_TAG('K','R','N',' ')},	/* Yintale Karen -> Karen */
+/*{HB_TAG('k','w','k',' '),	HB_TAG('K','W','K',' ')},*/	/* Kwakʼwala */
   {HB_TAG('k','w','w',' '),	HB_TAG('C','P','P',' ')},	/* Kwinti -> Creoles */
   {HB_TAG('k','w','y',' '),	HB_TAG('K','O','N','0')},	/* San Salvador Kongo -> Kongo */
   {HB_TAG('k','x','c',' '),	HB_TAG('K','M','S',' ')},	/* Konso -> Komso */
@@ -793,98 +930,195 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','x','k',' '),	HB_TAG('K','R','N',' ')},	/* Zayein Karen -> Karen */
   {HB_TAG('k','x','l',' '),	HB_TAG('K','U','U',' ')},	/* Nepali Kurux (retired code) -> Kurukh */
   {HB_TAG('k','x','u',' '),	HB_TAG('K','U','I',' ')},	/* Kui (India) (retired code) */
+  {HB_TAG('k','y','k',' '),	HB_TAG_NONE	       },	/* Kamayo != Koryak */
+  {HB_TAG('k','y','u',' '),	HB_TAG('K','Y','U',' ')},	/* Western Kayah */
+  {HB_TAG('k','y','u',' '),	HB_TAG('K','R','N',' ')},	/* Western Kayah -> Karen */
   {HB_TAG('l','a','c',' '),	HB_TAG('M','Y','N',' ')},	/* Lacandon -> Mayan */
   {HB_TAG('l','a','d',' '),	HB_TAG('J','U','D',' ')},	/* Ladino */
+  {HB_TAG('l','a','h',' '),	HB_TAG_NONE	       },	/* Lahnda [macrolanguage] != Lahuli */
+  {HB_TAG('l','a','k',' '),	HB_TAG_NONE	       },	/* Laka (Nigeria) (retired code) != Lak */
+  {HB_TAG('l','a','m',' '),	HB_TAG_NONE	       },	/* Lamba != Lambani */
+  {HB_TAG('l','a','z',' '),	HB_TAG_NONE	       },	/* Aribwatsa != Laz */
   {HB_TAG('l','b','e',' '),	HB_TAG('L','A','K',' ')},	/* Lak */
   {HB_TAG('l','b','j',' '),	HB_TAG('L','D','K',' ')},	/* Ladakhi */
   {HB_TAG('l','b','l',' '),	HB_TAG('B','I','K',' ')},	/* Libon Bikol -> Bikol */
   {HB_TAG('l','c','e',' '),	HB_TAG('M','L','Y',' ')},	/* Loncong -> Malay */
   {HB_TAG('l','c','f',' '),	HB_TAG('M','L','Y',' ')},	/* Lubu -> Malay */
   {HB_TAG('l','d','i',' '),	HB_TAG('K','O','N','0')},	/* Laari -> Kongo */
+  {HB_TAG('l','d','k',' '),	HB_TAG_NONE	       },	/* Leelau != Ladakhi */
+/*{HB_TAG('l','e','f',' '),	HB_TAG('L','E','F',' ')},*/	/* Lelemi */
+/*{HB_TAG('l','e','z',' '),	HB_TAG('L','E','Z',' ')},*/	/* Lezghian -> Lezgi */
   {HB_TAG('l','i','f',' '),	HB_TAG('L','M','B',' ')},	/* Limbu */
+/*{HB_TAG('l','i','j',' '),	HB_TAG('L','I','J',' ')},*/	/* Ligurian */
   {HB_TAG('l','i','r',' '),	HB_TAG('C','P','P',' ')},	/* Liberian English -> Creoles */
+/*{HB_TAG('l','i','s',' '),	HB_TAG('L','I','S',' ')},*/	/* Lisu */
+/*{HB_TAG('l','i','v',' '),	HB_TAG('L','I','V',' ')},*/	/* Liv */
   {HB_TAG('l','i','w',' '),	HB_TAG('M','L','Y',' ')},	/* Col -> Malay */
   {HB_TAG('l','i','y',' '),	HB_TAG('B','A','D','0')},	/* Banda-Bambari -> Banda */
+/*{HB_TAG('l','j','p',' '),	HB_TAG('L','J','P',' ')},*/	/* Lampung Api -> Lampung */
   {HB_TAG('l','k','b',' '),	HB_TAG('L','U','H',' ')},	/* Kabras -> Luyia */
+/*{HB_TAG('l','k','i',' '),	HB_TAG('L','K','I',' ')},*/	/* Laki */
   {HB_TAG('l','k','o',' '),	HB_TAG('L','U','H',' ')},	/* Khayo -> Luyia */
   {HB_TAG('l','k','s',' '),	HB_TAG('L','U','H',' ')},	/* Kisa -> Luyia */
   {HB_TAG('l','l','d',' '),	HB_TAG('L','A','D',' ')},	/* Ladin */
+  {HB_TAG('l','m','a',' '),	HB_TAG_NONE	       },	/* East Limba != Low Mari */
+  {HB_TAG('l','m','b',' '),	HB_TAG_NONE	       },	/* Merei != Limbu */
   {HB_TAG('l','m','n',' '),	HB_TAG('L','A','M',' ')},	/* Lambadi -> Lambani */
+/*{HB_TAG('l','m','o',' '),	HB_TAG('L','M','O',' ')},*/	/* Lombard */
+  {HB_TAG('l','m','w',' '),	HB_TAG_NONE	       },	/* Lake Miwok != Lomwe */
   {HB_TAG('l','n','a',' '),	HB_TAG('B','A','D','0')},	/* Langbashe -> Banda */
   {HB_TAG('l','n','l',' '),	HB_TAG('B','A','D','0')},	/* South Central Banda -> Banda */
+/*{HB_TAG('l','o','m',' '),	HB_TAG('L','O','M',' ')},*/	/* Loma (Liberia) */
   {HB_TAG('l','o','u',' '),	HB_TAG('C','P','P',' ')},	/* Louisiana Creole -> Creoles */
+/*{HB_TAG('l','p','o',' '),	HB_TAG('L','P','O',' ')},*/	/* Lipo */
+/*{HB_TAG('l','r','c',' '),	HB_TAG('L','R','C',' ')},*/	/* Northern Luri -> Luri */
   {HB_TAG('l','r','i',' '),	HB_TAG('L','U','H',' ')},	/* Marachi -> Luyia */
   {HB_TAG('l','r','m',' '),	HB_TAG('L','U','H',' ')},	/* Marama -> Luyia */
   {HB_TAG('l','r','t',' '),	HB_TAG('C','P','P',' ')},	/* Larantuka Malay -> Creoles */
+  {HB_TAG('l','s','b',' '),	HB_TAG_NONE	       },	/* Burundian Sign Language != Lower Sorbian */
   {HB_TAG('l','s','m',' '),	HB_TAG('L','U','H',' ')},	/* Saamia -> Luyia */
   {HB_TAG('l','t','g',' '),	HB_TAG('L','V','I',' ')},	/* Latgalian -> Latvian */
+  {HB_TAG('l','t','h',' '),	HB_TAG_NONE	       },	/* Thur != Lithuanian */
   {HB_TAG('l','t','o',' '),	HB_TAG('L','U','H',' ')},	/* Tsotso -> Luyia */
   {HB_TAG('l','t','s',' '),	HB_TAG('L','U','H',' ')},	/* Tachoni -> Luyia */
+/*{HB_TAG('l','u','a',' '),	HB_TAG('L','U','A',' ')},*/	/* Luba-Lulua */
   {HB_TAG('l','u','h',' '),	HB_TAG('Z','H','S',' ')},	/* Leizhou Chinese -> Chinese, Simplified */
+/*{HB_TAG('l','u','o',' '),	HB_TAG('L','U','O',' ')},*/	/* Luo (Kenya and Tanzania) */
+  {HB_TAG('l','u','s',' '),	HB_TAG('M','I','Z',' ')},	/* Lushai -> Mizo */
+  {HB_TAG('l','u','s',' '),	HB_TAG('Q','I','N',' ')},	/* Lushai -> Chin */
+/*{HB_TAG('l','u','t',' '),	HB_TAG('L','U','T',' ')},*/	/* Lushootseed */
   {HB_TAG('l','u','y',' '),	HB_TAG('L','U','H',' ')},	/* Luyia [macrolanguage] */
   {HB_TAG('l','u','z',' '),	HB_TAG('L','R','C',' ')},	/* Southern Luri -> Luri */
+  {HB_TAG('l','v','i',' '),	HB_TAG_NONE	       },	/* Lavi != Latvian */
   {HB_TAG('l','v','s',' '),	HB_TAG('L','V','I',' ')},	/* Standard Latvian -> Latvian */
   {HB_TAG('l','w','g',' '),	HB_TAG('L','U','H',' ')},	/* Wanga -> Luyia */
   {HB_TAG('l','z','h',' '),	HB_TAG('Z','H','T',' ')},	/* Literary Chinese -> Chinese, Traditional */
   {HB_TAG('l','z','z',' '),	HB_TAG('L','A','Z',' ')},	/* Laz */
+/*{HB_TAG('m','a','d',' '),	HB_TAG('M','A','D',' ')},*/	/* Madurese -> Madura */
+/*{HB_TAG('m','a','g',' '),	HB_TAG('M','A','G',' ')},*/	/* Magahi */
   {HB_TAG('m','a','i',' '),	HB_TAG('M','T','H',' ')},	/* Maithili */
+  {HB_TAG('m','a','j',' '),	HB_TAG_NONE	       },	/* Jalapa De Díaz Mazatec != Majang */
   {HB_TAG('m','a','k',' '),	HB_TAG('M','K','R',' ')},	/* Makasar */
+  {HB_TAG('m','a','m',' '),	HB_TAG('M','A','M',' ')},	/* Mam */
+  {HB_TAG('m','a','m',' '),	HB_TAG('M','Y','N',' ')},	/* Mam -> Mayan */
   {HB_TAG('m','a','n',' '),	HB_TAG('M','N','K',' ')},	/* Mandingo [macrolanguage] -> Maninka */
+  {HB_TAG('m','a','p',' '),	HB_TAG_NONE	       },	/* Austronesian [collection] != Mapudungun */
+  {HB_TAG('m','a','w',' '),	HB_TAG_NONE	       },	/* Mampruli != Marwari */
+  {HB_TAG('m','a','x',' '),	HB_TAG('M','L','Y',' ')},	/* North Moluccan Malay -> Malay */
+  {HB_TAG('m','a','x',' '),	HB_TAG('C','P','P',' ')},	/* North Moluccan Malay -> Creoles */
   {HB_TAG('m','b','f',' '),	HB_TAG('C','P','P',' ')},	/* Baba Malay -> Creoles */
+  {HB_TAG('m','b','n',' '),	HB_TAG_NONE	       },	/* Macaguán != Mbundu */
+/*{HB_TAG('m','b','o',' '),	HB_TAG('M','B','O',' ')},*/	/* Mbo (Cameroon) */
+  {HB_TAG('m','c','h',' '),	HB_TAG_NONE	       },	/* Maquiritari != Manchu */
   {HB_TAG('m','c','m',' '),	HB_TAG('C','P','P',' ')},	/* Malaccan Creole Portuguese -> Creoles */
+  {HB_TAG('m','c','r',' '),	HB_TAG_NONE	       },	/* Menya != Moose Cree */
   {HB_TAG('m','c','t',' '),	HB_TAG('B','T','I',' ')},	/* Mengisa -> Beti */
+  {HB_TAG('m','d','e',' '),	HB_TAG_NONE	       },	/* Maba (Chad) != Mende */
   {HB_TAG('m','d','f',' '),	HB_TAG('M','O','K',' ')},	/* Moksha */
+/*{HB_TAG('m','d','r',' '),	HB_TAG('M','D','R',' ')},*/	/* Mandar */
   {HB_TAG('m','d','y',' '),	HB_TAG('M','L','E',' ')},	/* Male (Ethiopia) */
   {HB_TAG('m','e','n',' '),	HB_TAG('M','D','E',' ')},	/* Mende (Sierra Leone) */
   {HB_TAG('m','e','o',' '),	HB_TAG('M','L','Y',' ')},	/* Kedah Malay -> Malay */
+/*{HB_TAG('m','e','r',' '),	HB_TAG('M','E','R',' ')},*/	/* Meru */
+/*{HB_TAG('m','e','v',' '),	HB_TAG('M','E','V',' ')},*/	/* Mano */
+  {HB_TAG('m','f','a',' '),	HB_TAG('M','F','A',' ')},	/* Pattani Malay */
+  {HB_TAG('m','f','a',' '),	HB_TAG('M','L','Y',' ')},	/* Pattani Malay -> Malay */
   {HB_TAG('m','f','b',' '),	HB_TAG('M','L','Y',' ')},	/* Bangka -> Malay */
+  {HB_TAG('m','f','e',' '),	HB_TAG('M','F','E',' ')},	/* Morisyen */
+  {HB_TAG('m','f','e',' '),	HB_TAG('C','P','P',' ')},	/* Morisyen -> Creoles */
   {HB_TAG('m','f','p',' '),	HB_TAG('C','P','P',' ')},	/* Makassar Malay -> Creoles */
   {HB_TAG('m','g','a',' '),	HB_TAG('S','G','A',' ')},	/* Middle Irish (900-1200) -> Old Irish */
   {HB_TAG('m','h','c',' '),	HB_TAG('M','Y','N',' ')},	/* Mocho -> Mayan */
   {HB_TAG('m','h','r',' '),	HB_TAG('L','M','A',' ')},	/* Eastern Mari -> Low Mari */
   {HB_TAG('m','h','v',' '),	HB_TAG('A','R','K',' ')},	/* Arakanese (retired code) -> Rakhine */
+  {HB_TAG('m','i','n',' '),	HB_TAG('M','I','N',' ')},	/* Minangkabau */
+  {HB_TAG('m','i','n',' '),	HB_TAG('M','L','Y',' ')},	/* Minangkabau -> Malay */
+  {HB_TAG('m','i','z',' '),	HB_TAG_NONE	       },	/* Coatzospan Mixtec != Mizo */
   {HB_TAG('m','k','n',' '),	HB_TAG('C','P','P',' ')},	/* Kupang Malay -> Creoles */
+  {HB_TAG('m','k','r',' '),	HB_TAG_NONE	       },	/* Malas != Makasar */
   {HB_TAG('m','k','u',' '),	HB_TAG('M','N','K',' ')},	/* Konyanka Maninka -> Maninka */
+/*{HB_TAG('m','k','w',' '),	HB_TAG('M','K','W',' ')},*/	/* Kituba (Congo) */
+  {HB_TAG('m','l','e',' '),	HB_TAG_NONE	       },	/* Manambu != Male */
+  {HB_TAG('m','l','n',' '),	HB_TAG_NONE	       },	/* Malango != Malinke */
+  {HB_TAG('m','l','q',' '),	HB_TAG('M','L','N',' ')},	/* Western Maninkakan -> Malinke */
+  {HB_TAG('m','l','q',' '),	HB_TAG('M','N','K',' ')},	/* Western Maninkakan -> Maninka */
+  {HB_TAG('m','l','r',' '),	HB_TAG_NONE	       },	/* Vame != Malayalam Reformed */
   {HB_TAG('m','m','r',' '),	HB_TAG('H','M','N',' ')},	/* Western Xiangxi Miao -> Hmong */
   {HB_TAG('m','n','c',' '),	HB_TAG('M','C','H',' ')},	/* Manchu */
+  {HB_TAG('m','n','d',' '),	HB_TAG_NONE	       },	/* Mondé != Mandinka */
+  {HB_TAG('m','n','g',' '),	HB_TAG_NONE	       },	/* Eastern Mnong != Mongolian */
   {HB_TAG('m','n','h',' '),	HB_TAG('B','A','D','0')},	/* Mono (Democratic Republic of Congo) -> Banda */
+/*{HB_TAG('m','n','i',' '),	HB_TAG('M','N','I',' ')},*/	/* Manipuri */
+  {HB_TAG('m','n','k',' '),	HB_TAG('M','N','D',' ')},	/* Mandinka */
+  {HB_TAG('m','n','k',' '),	HB_TAG('M','N','K',' ')},	/* Mandinka -> Maninka */
   {HB_TAG('m','n','p',' '),	HB_TAG('Z','H','S',' ')},	/* Min Bei Chinese -> Chinese, Simplified */
   {HB_TAG('m','n','s',' '),	HB_TAG('M','A','N',' ')},	/* Mansi */
+  {HB_TAG('m','n','w',' '),	HB_TAG('M','O','N',' ')},	/* Mon */
+  {HB_TAG('m','n','w',' '),	HB_TAG('M','O','N','T')},	/* Mon -> Thailand Mon */
+  {HB_TAG('m','n','x',' '),	HB_TAG_NONE	       },	/* Manikion != Manx */
   {HB_TAG('m','o','d',' '),	HB_TAG('C','P','P',' ')},	/* Mobilian -> Creoles */
+/*{HB_TAG('m','o','h',' '),	HB_TAG('M','O','H',' ')},*/	/* Mohawk */
+  {HB_TAG('m','o','k',' '),	HB_TAG_NONE	       },	/* Morori != Moksha */
   {HB_TAG('m','o','p',' '),	HB_TAG('M','Y','N',' ')},	/* Mopán Maya -> Mayan */
+  {HB_TAG('m','o','r',' '),	HB_TAG_NONE	       },	/* Moro != Moroccan */
+/*{HB_TAG('m','o','s',' '),	HB_TAG('M','O','S',' ')},*/	/* Mossi */
   {HB_TAG('m','p','e',' '),	HB_TAG('M','A','J',' ')},	/* Majang */
   {HB_TAG('m','q','g',' '),	HB_TAG('M','L','Y',' ')},	/* Kota Bangun Kutai Malay -> Malay */
   {HB_TAG('m','r','h',' '),	HB_TAG('Q','I','N',' ')},	/* Mara Chin -> Chin */
   {HB_TAG('m','r','j',' '),	HB_TAG('H','M','A',' ')},	/* Western Mari -> High Mari */
   {HB_TAG('m','s','c',' '),	HB_TAG('M','N','K',' ')},	/* Sankaran Maninka -> Maninka */
   {HB_TAG('m','s','h',' '),	HB_TAG('M','L','G',' ')},	/* Masikoro Malagasy -> Malagasy */
+  {HB_TAG('m','s','i',' '),	HB_TAG('M','L','Y',' ')},	/* Sabah Malay -> Malay */
+  {HB_TAG('m','s','i',' '),	HB_TAG('C','P','P',' ')},	/* Sabah Malay -> Creoles */
+  {HB_TAG('m','t','h',' '),	HB_TAG_NONE	       },	/* Munggui != Maithili */
   {HB_TAG('m','t','r',' '),	HB_TAG('M','A','W',' ')},	/* Mewari -> Marwari */
+  {HB_TAG('m','t','s',' '),	HB_TAG_NONE	       },	/* Yora != Maltese */
   {HB_TAG('m','u','d',' '),	HB_TAG('C','P','P',' ')},	/* Mednyj Aleut -> Creoles */
   {HB_TAG('m','u','i',' '),	HB_TAG('M','L','Y',' ')},	/* Musi -> Malay */
+  {HB_TAG('m','u','n',' '),	HB_TAG_NONE	       },	/* Munda [collection] != Mundari */
   {HB_TAG('m','u','p',' '),	HB_TAG('R','A','J',' ')},	/* Malvi -> Rajasthani */
   {HB_TAG('m','u','q',' '),	HB_TAG('H','M','N',' ')},	/* Eastern Xiangxi Miao -> Hmong */
+/*{HB_TAG('m','u','s',' '),	HB_TAG('M','U','S',' ')},*/	/* Creek -> Muscogee */
   {HB_TAG('m','v','b',' '),	HB_TAG('A','T','H',' ')},	/* Mattole -> Athapaskan */
   {HB_TAG('m','v','e',' '),	HB_TAG('M','A','W',' ')},	/* Marwari (Pakistan) */
   {HB_TAG('m','v','f',' '),	HB_TAG('M','N','G',' ')},	/* Peripheral Mongolian -> Mongolian */
   {HB_TAG('m','w','k',' '),	HB_TAG('M','N','K',' ')},	/* Kita Maninkakan -> Maninka */
+/*{HB_TAG('m','w','l',' '),	HB_TAG('M','W','L',' ')},*/	/* Mirandese */
   {HB_TAG('m','w','q',' '),	HB_TAG('Q','I','N',' ')},	/* Mün Chin -> Chin */
   {HB_TAG('m','w','r',' '),	HB_TAG('M','A','W',' ')},	/* Marwari [macrolanguage] */
+  {HB_TAG('m','w','w',' '),	HB_TAG('M','W','W',' ')},	/* Hmong Daw */
+  {HB_TAG('m','w','w',' '),	HB_TAG('H','M','N',' ')},	/* Hmong Daw -> Hmong */
   {HB_TAG('m','y','m',' '),	HB_TAG('M','E','N',' ')},	/* Me’en */
+/*{HB_TAG('m','y','n',' '),	HB_TAG('M','Y','N',' ')},*/	/* Mayan [collection] */
   {HB_TAG('m','y','q',' '),	HB_TAG('M','N','K',' ')},	/* Forest Maninka (retired code) -> Maninka */
   {HB_TAG('m','y','v',' '),	HB_TAG('E','R','Z',' ')},	/* Erzya */
   {HB_TAG('m','z','b',' '),	HB_TAG('B','B','R',' ')},	/* Tumzabt -> Berber */
+/*{HB_TAG('m','z','n',' '),	HB_TAG('M','Z','N',' ')},*/	/* Mazanderani */
   {HB_TAG('m','z','s',' '),	HB_TAG('C','P','P',' ')},	/* Macanese -> Creoles */
+  {HB_TAG('n','a','g',' '),	HB_TAG('N','A','G',' ')},	/* Naga Pidgin -> Naga-Assamese */
+  {HB_TAG('n','a','g',' '),	HB_TAG('C','P','P',' ')},	/* Naga Pidgin -> Creoles */
+/*{HB_TAG('n','a','h',' '),	HB_TAG('N','A','H',' ')},*/	/* Nahuatl [collection] */
   {HB_TAG('n','a','n',' '),	HB_TAG('Z','H','S',' ')},	/* Min Nan Chinese -> Chinese, Simplified */
+/*{HB_TAG('n','a','p',' '),	HB_TAG('N','A','P',' ')},*/	/* Neapolitan */
+  {HB_TAG('n','a','s',' '),	HB_TAG_NONE	       },	/* Naasioi != Naskapi */
   {HB_TAG('n','a','z',' '),	HB_TAG('N','A','H',' ')},	/* Coatepec Nahuatl -> Nahuatl */
   {HB_TAG('n','c','h',' '),	HB_TAG('N','A','H',' ')},	/* Central Huasteca Nahuatl -> Nahuatl */
   {HB_TAG('n','c','i',' '),	HB_TAG('N','A','H',' ')},	/* Classical Nahuatl -> Nahuatl */
   {HB_TAG('n','c','j',' '),	HB_TAG('N','A','H',' ')},	/* Northern Puebla Nahuatl -> Nahuatl */
   {HB_TAG('n','c','l',' '),	HB_TAG('N','A','H',' ')},	/* Michoacán Nahuatl -> Nahuatl */
+  {HB_TAG('n','c','r',' '),	HB_TAG_NONE	       },	/* Ncane != N-Cree */
   {HB_TAG('n','c','x',' '),	HB_TAG('N','A','H',' ')},	/* Central Puebla Nahuatl -> Nahuatl */
+  {HB_TAG('n','d','b',' '),	HB_TAG_NONE	       },	/* Kenswei Nsei != Ndebele */
+/*{HB_TAG('n','d','c',' '),	HB_TAG('N','D','C',' ')},*/	/* Ndau */
+  {HB_TAG('n','d','g',' '),	HB_TAG_NONE	       },	/* Ndengereko != Ndonga */
+/*{HB_TAG('n','d','s',' '),	HB_TAG('N','D','S',' ')},*/	/* Low Saxon */
   {HB_TAG('n','e','f',' '),	HB_TAG('C','P','P',' ')},	/* Nefamese -> Creoles */
+/*{HB_TAG('n','e','w',' '),	HB_TAG('N','E','W',' ')},*/	/* Newari */
+/*{HB_TAG('n','g','a',' '),	HB_TAG('N','G','A',' ')},*/	/* Ngbaka */
   {HB_TAG('n','g','l',' '),	HB_TAG('L','M','W',' ')},	/* Lomwe */
   {HB_TAG('n','g','m',' '),	HB_TAG('C','P','P',' ')},	/* Ngatik Men's Creole -> Creoles */
   {HB_TAG('n','g','o',' '),	HB_TAG('S','X','T',' ')},	/* Ngoni (retired code) -> Sutu */
+  {HB_TAG('n','g','r',' '),	HB_TAG_NONE	       },	/* Engdewu != Nagari */
   {HB_TAG('n','g','u',' '),	HB_TAG('N','A','H',' ')},	/* Guerrero Nahuatl -> Nahuatl */
   {HB_TAG('n','h','c',' '),	HB_TAG('N','A','H',' ')},	/* Tabasco Nahuatl -> Nahuatl */
   {HB_TAG('n','h','d',' '),	HB_TAG('G','U','A',' ')},	/* Chiripá -> Guarani */
@@ -903,9 +1137,12 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','h','y',' '),	HB_TAG('N','A','H',' ')},	/* Northern Oaxaca Nahuatl -> Nahuatl */
   {HB_TAG('n','h','z',' '),	HB_TAG('N','A','H',' ')},	/* Santa María La Alta Nahuatl -> Nahuatl */
   {HB_TAG('n','i','q',' '),	HB_TAG('K','A','L',' ')},	/* Nandi -> Kalenjin */
+  {HB_TAG('n','i','s',' '),	HB_TAG_NONE	       },	/* Nimi != Nisi */
+/*{HB_TAG('n','i','u',' '),	HB_TAG('N','I','U',' ')},*/	/* Niuean */
   {HB_TAG('n','i','v',' '),	HB_TAG('G','I','L',' ')},	/* Gilyak */
   {HB_TAG('n','j','t',' '),	HB_TAG('C','P','P',' ')},	/* Ndyuka-Trio Pidgin -> Creoles */
   {HB_TAG('n','j','z',' '),	HB_TAG('N','I','S',' ')},	/* Nyishi -> Nisi */
+  {HB_TAG('n','k','o',' '),	HB_TAG_NONE	       },	/* Nkonya != N’Ko */
   {HB_TAG('n','k','x',' '),	HB_TAG('I','J','O',' ')},	/* Nkoroo -> Ijo */
   {HB_TAG('n','l','a',' '),	HB_TAG('B','M','L',' ')},	/* Ngombale -> Bamileke */
   {HB_TAG('n','l','e',' '),	HB_TAG('L','U','H',' ')},	/* East Nyala -> Luyia */
@@ -914,147 +1151,329 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','n','h',' '),	HB_TAG('B','M','L',' ')},	/* Ngiemboon -> Bamileke */
   {HB_TAG('n','n','z',' '),	HB_TAG('B','M','L',' ')},	/* Nda'nda' -> Bamileke */
   {HB_TAG('n','o','d',' '),	HB_TAG('N','T','A',' ')},	/* Northern Thai -> Northern Tai */
+/*{HB_TAG('n','o','e',' '),	HB_TAG('N','O','E',' ')},*/	/* Nimadi */
+/*{HB_TAG('n','o','g',' '),	HB_TAG('N','O','G',' ')},*/	/* Nogai */
+/*{HB_TAG('n','o','p',' '),	HB_TAG('N','O','P',' ')},*/	/* Numanggang */
+/*{HB_TAG('n','o','v',' '),	HB_TAG('N','O','V',' ')},*/	/* Novial */
   {HB_TAG('n','p','i',' '),	HB_TAG('N','E','P',' ')},	/* Nepali */
   {HB_TAG('n','p','l',' '),	HB_TAG('N','A','H',' ')},	/* Southeastern Puebla Nahuatl -> Nahuatl */
   {HB_TAG('n','q','o',' '),	HB_TAG('N','K','O',' ')},	/* N’Ko */
   {HB_TAG('n','s','k',' '),	HB_TAG('N','A','S',' ')},	/* Naskapi */
+  {HB_TAG('n','s','m',' '),	HB_TAG_NONE	       },	/* Sumi Naga != Northern Sami */
+/*{HB_TAG('n','s','o',' '),	HB_TAG('N','S','O',' ')},*/	/* Northern Sotho */
   {HB_TAG('n','s','u',' '),	HB_TAG('N','A','H',' ')},	/* Sierra Negra Nahuatl -> Nahuatl */
+  {HB_TAG('n','t','o',' '),	HB_TAG_NONE	       },	/* Ntomba != Esperanto */
   {HB_TAG('n','u','e',' '),	HB_TAG('B','A','D','0')},	/* Ngundu -> Banda */
+/*{HB_TAG('n','u','k',' '),	HB_TAG('N','U','K',' ')},*/	/* Nuu-chah-nulth */
   {HB_TAG('n','u','u',' '),	HB_TAG('B','A','D','0')},	/* Ngbundu -> Banda */
   {HB_TAG('n','u','z',' '),	HB_TAG('N','A','H',' ')},	/* Tlamacazapa Nahuatl -> Nahuatl */
   {HB_TAG('n','w','e',' '),	HB_TAG('B','M','L',' ')},	/* Ngwe -> Bamileke */
   {HB_TAG('n','y','d',' '),	HB_TAG('L','U','H',' ')},	/* Nyore -> Luyia */
+/*{HB_TAG('n','y','m',' '),	HB_TAG('N','Y','M',' ')},*/	/* Nyamwezi */
   {HB_TAG('n','y','n',' '),	HB_TAG('N','K','L',' ')},	/* Nyankole */
+/*{HB_TAG('n','z','a',' '),	HB_TAG('N','Z','A',' ')},*/	/* Tigon Mbembe -> Mbembe Tigon */
+/*{HB_TAG('o','j','b',' '),	HB_TAG('O','J','B',' ')},*/	/* Northwestern Ojibwa -> Ojibway */
   {HB_TAG('o','j','c',' '),	HB_TAG('O','J','B',' ')},	/* Central Ojibwa -> Ojibway */
   {HB_TAG('o','j','g',' '),	HB_TAG('O','J','B',' ')},	/* Eastern Ojibwa -> Ojibway */
+  {HB_TAG('o','j','s',' '),	HB_TAG('O','C','R',' ')},	/* Severn Ojibwa -> Oji-Cree */
+  {HB_TAG('o','j','s',' '),	HB_TAG('O','J','B',' ')},	/* Severn Ojibwa -> Ojibway */
   {HB_TAG('o','j','w',' '),	HB_TAG('O','J','B',' ')},	/* Western Ojibwa -> Ojibway */
   {HB_TAG('o','k','d',' '),	HB_TAG('I','J','O',' ')},	/* Okodia -> Ijo */
   {HB_TAG('o','k','i',' '),	HB_TAG('K','A','L',' ')},	/* Okiek -> Kalenjin */
   {HB_TAG('o','k','m',' '),	HB_TAG('K','O','H',' ')},	/* Middle Korean (10th-16th cent.) -> Korean Old Hangul */
   {HB_TAG('o','k','r',' '),	HB_TAG('I','J','O',' ')},	/* Kirike -> Ijo */
+/*{HB_TAG('o','n','e',' '),	HB_TAG('O','N','E',' ')},*/	/* Oneida */
+/*{HB_TAG('o','n','o',' '),	HB_TAG('O','N','O',' ')},*/	/* Onondaga */
   {HB_TAG('o','n','x',' '),	HB_TAG('C','P','P',' ')},	/* Onin Based Pidgin -> Creoles */
   {HB_TAG('o','o','r',' '),	HB_TAG('C','P','P',' ')},	/* Oorlams -> Creoles */
   {HB_TAG('o','r','c',' '),	HB_TAG('O','R','O',' ')},	/* Orma -> Oromo */
   {HB_TAG('o','r','n',' '),	HB_TAG('M','L','Y',' ')},	/* Orang Kanaq -> Malay */
+  {HB_TAG('o','r','o',' '),	HB_TAG_NONE	       },	/* Orokolo != Oromo */
   {HB_TAG('o','r','r',' '),	HB_TAG('I','J','O',' ')},	/* Oruma -> Ijo */
   {HB_TAG('o','r','s',' '),	HB_TAG('M','L','Y',' ')},	/* Orang Seletar -> Malay */
   {HB_TAG('o','r','y',' '),	HB_TAG('O','R','I',' ')},	/* Odia */
   {HB_TAG('o','t','w',' '),	HB_TAG('O','J','B',' ')},	/* Ottawa -> Ojibway */
   {HB_TAG('o','u','a',' '),	HB_TAG('B','B','R',' ')},	/* Tagargrent -> Berber */
+  {HB_TAG('p','a','a',' '),	HB_TAG_NONE	       },	/* Papuan [collection] != Palestinian Aramaic */
+/*{HB_TAG('p','a','g',' '),	HB_TAG('P','A','G',' ')},*/	/* Pangasinan */
+  {HB_TAG('p','a','l',' '),	HB_TAG_NONE	       },	/* Pahlavi != Pali */
+/*{HB_TAG('p','a','m',' '),	HB_TAG('P','A','M',' ')},*/	/* Pampanga -> Pampangan */
+  {HB_TAG('p','a','p',' '),	HB_TAG('P','A','P','0')},	/* Papiamento -> Papiamentu */
+  {HB_TAG('p','a','p',' '),	HB_TAG('C','P','P',' ')},	/* Papiamento -> Creoles */
+  {HB_TAG('p','a','s',' '),	HB_TAG_NONE	       },	/* Papasena != Pashto */
+/*{HB_TAG('p','a','u',' '),	HB_TAG('P','A','U',' ')},*/	/* Palauan */
   {HB_TAG('p','b','t',' '),	HB_TAG('P','A','S',' ')},	/* Southern Pashto -> Pashto */
   {HB_TAG('p','b','u',' '),	HB_TAG('P','A','S',' ')},	/* Northern Pashto -> Pashto */
+/*{HB_TAG('p','c','c',' '),	HB_TAG('P','C','C',' ')},*/	/* Bouyei */
+/*{HB_TAG('p','c','d',' '),	HB_TAG('P','C','D',' ')},*/	/* Picard */
   {HB_TAG('p','c','e',' '),	HB_TAG('P','L','G',' ')},	/* Ruching Palaung -> Palaung */
   {HB_TAG('p','c','k',' '),	HB_TAG('Q','I','N',' ')},	/* Paite Chin -> Chin */
   {HB_TAG('p','c','m',' '),	HB_TAG('C','P','P',' ')},	/* Nigerian Pidgin -> Creoles */
+/*{HB_TAG('p','d','c',' '),	HB_TAG('P','D','C',' ')},*/	/* Pennsylvania German */
   {HB_TAG('p','d','u',' '),	HB_TAG('K','R','N',' ')},	/* Kayan -> Karen */
   {HB_TAG('p','e','a',' '),	HB_TAG('C','P','P',' ')},	/* Peranakan Indonesian -> Creoles */
   {HB_TAG('p','e','l',' '),	HB_TAG('M','L','Y',' ')},	/* Pekal -> Malay */
   {HB_TAG('p','e','s',' '),	HB_TAG('F','A','R',' ')},	/* Iranian Persian -> Persian */
   {HB_TAG('p','e','y',' '),	HB_TAG('C','P','P',' ')},	/* Petjo -> Creoles */
+  {HB_TAG('p','g','a',' '),	HB_TAG('A','R','A',' ')},	/* Sudanese Creole Arabic -> Arabic */
+  {HB_TAG('p','g','a',' '),	HB_TAG('C','P','P',' ')},	/* Sudanese Creole Arabic -> Creoles */
+/*{HB_TAG('p','h','k',' '),	HB_TAG('P','H','K',' ')},*/	/* Phake */
+  {HB_TAG('p','i','h',' '),	HB_TAG('P','I','H',' ')},	/* Pitcairn-Norfolk -> Norfolk */
+  {HB_TAG('p','i','h',' '),	HB_TAG('C','P','P',' ')},	/* Pitcairn-Norfolk -> Creoles */
+  {HB_TAG('p','i','l',' '),	HB_TAG_NONE	       },	/* Yom != Filipino */
   {HB_TAG('p','i','s',' '),	HB_TAG('C','P','P',' ')},	/* Pijin -> Creoles */
   {HB_TAG('p','k','h',' '),	HB_TAG('Q','I','N',' ')},	/* Pankhu -> Chin */
   {HB_TAG('p','k','o',' '),	HB_TAG('K','A','L',' ')},	/* Pökoot -> Kalenjin */
   {HB_TAG('p','l','g',' '),	HB_TAG('P','L','G','0')},	/* Pilagá */
+  {HB_TAG('p','l','k',' '),	HB_TAG_NONE	       },	/* Kohistani Shina != Polish */
   {HB_TAG('p','l','l',' '),	HB_TAG('P','L','G',' ')},	/* Shwe Palaung -> Palaung */
   {HB_TAG('p','l','n',' '),	HB_TAG('C','P','P',' ')},	/* Palenquero -> Creoles */
   {HB_TAG('p','l','p',' '),	HB_TAG('P','A','P',' ')},	/* Palpa (retired code) */
   {HB_TAG('p','l','t',' '),	HB_TAG('M','L','G',' ')},	/* Plateau Malagasy -> Malagasy */
   {HB_TAG('p','m','l',' '),	HB_TAG('C','P','P',' ')},	/* Lingua Franca -> Creoles */
+/*{HB_TAG('p','m','s',' '),	HB_TAG('P','M','S',' ')},*/	/* Piemontese */
   {HB_TAG('p','m','y',' '),	HB_TAG('C','P','P',' ')},	/* Papuan Malay -> Creoles */
+/*{HB_TAG('p','n','b',' '),	HB_TAG('P','N','B',' ')},*/	/* Western Panjabi */
   {HB_TAG('p','o','c',' '),	HB_TAG('M','Y','N',' ')},	/* Poqomam -> Mayan */
+  {HB_TAG('p','o','h',' '),	HB_TAG('P','O','H',' ')},	/* Poqomchi' -> Pocomchi */
+  {HB_TAG('p','o','h',' '),	HB_TAG('M','Y','N',' ')},	/* Poqomchi' -> Mayan */
+/*{HB_TAG('p','o','n',' '),	HB_TAG('P','O','N',' ')},*/	/* Pohnpeian */
   {HB_TAG('p','o','v',' '),	HB_TAG('C','P','P',' ')},	/* Upper Guinea Crioulo -> Creoles */
   {HB_TAG('p','p','a',' '),	HB_TAG('B','A','G',' ')},	/* Pao (retired code) -> Baghelkhandi */
   {HB_TAG('p','r','e',' '),	HB_TAG('C','P','P',' ')},	/* Principense -> Creoles */
+/*{HB_TAG('p','r','o',' '),	HB_TAG('P','R','O',' ')},*/	/* Old Provençal (to 1500) -> Provençal / Old Provençal */
   {HB_TAG('p','r','p',' '),	HB_TAG('G','U','J',' ')},	/* Parsi (retired code) -> Gujarati */
+  {HB_TAG('p','r','s',' '),	HB_TAG('D','R','I',' ')},	/* Dari */
+  {HB_TAG('p','r','s',' '),	HB_TAG('F','A','R',' ')},	/* Dari -> Persian */
   {HB_TAG('p','s','e',' '),	HB_TAG('M','L','Y',' ')},	/* Central Malay -> Malay */
   {HB_TAG('p','s','t',' '),	HB_TAG('P','A','S',' ')},	/* Central Pashto -> Pashto */
   {HB_TAG('p','u','b',' '),	HB_TAG('Q','I','N',' ')},	/* Purum -> Chin */
   {HB_TAG('p','u','z',' '),	HB_TAG('Q','I','N',' ')},	/* Purum Naga (retired code) -> Chin */
+  {HB_TAG('p','w','o',' '),	HB_TAG('P','W','O',' ')},	/* Pwo Western Karen -> Western Pwo Karen */
+  {HB_TAG('p','w','o',' '),	HB_TAG('K','R','N',' ')},	/* Pwo Western Karen -> Karen */
   {HB_TAG('p','w','w',' '),	HB_TAG('K','R','N',' ')},	/* Pwo Northern Karen -> Karen */
+  {HB_TAG('q','u','b',' '),	HB_TAG('Q','W','H',' ')},	/* Huallaga Huánuco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','u','b',' '),	HB_TAG('Q','U','Z',' ')},	/* Huallaga Huánuco Quechua -> Quechua */
+  {HB_TAG('q','u','c',' '),	HB_TAG('Q','U','C',' ')},	/* K’iche’ */
+  {HB_TAG('q','u','c',' '),	HB_TAG('M','Y','N',' ')},	/* K'iche' -> Mayan */
+  {HB_TAG('q','u','d',' '),	HB_TAG('Q','V','I',' ')},	/* Calderón Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','u','d',' '),	HB_TAG('Q','U','Z',' ')},	/* Calderón Highland Quichua -> Quechua */
   {HB_TAG('q','u','f',' '),	HB_TAG('Q','U','Z',' ')},	/* Lambayeque Quechua -> Quechua */
+  {HB_TAG('q','u','g',' '),	HB_TAG('Q','V','I',' ')},	/* Chimborazo Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','u','g',' '),	HB_TAG('Q','U','Z',' ')},	/* Chimborazo Highland Quichua -> Quechua */
+  {HB_TAG('q','u','h',' '),	HB_TAG('Q','U','H',' ')},	/* South Bolivian Quechua -> Quechua (Bolivia) */
+  {HB_TAG('q','u','h',' '),	HB_TAG('Q','U','Z',' ')},	/* South Bolivian Quechua -> Quechua */
   {HB_TAG('q','u','k',' '),	HB_TAG('Q','U','Z',' ')},	/* Chachapoyas Quechua -> Quechua */
+  {HB_TAG('q','u','l',' '),	HB_TAG('Q','U','H',' ')},	/* North Bolivian Quechua -> Quechua (Bolivia) */
+  {HB_TAG('q','u','l',' '),	HB_TAG('Q','U','Z',' ')},	/* North Bolivian Quechua -> Quechua */
   {HB_TAG('q','u','m',' '),	HB_TAG('M','Y','N',' ')},	/* Sipacapense -> Mayan */
+  {HB_TAG('q','u','p',' '),	HB_TAG('Q','V','I',' ')},	/* Southern Pastaza Quechua -> Quechua (Ecuador) */
+  {HB_TAG('q','u','p',' '),	HB_TAG('Q','U','Z',' ')},	/* Southern Pastaza Quechua -> Quechua */
+  {HB_TAG('q','u','r',' '),	HB_TAG('Q','W','H',' ')},	/* Yanahuanca Pasco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','u','r',' '),	HB_TAG('Q','U','Z',' ')},	/* Yanahuanca Pasco Quechua -> Quechua */
+  {HB_TAG('q','u','s',' '),	HB_TAG('Q','U','H',' ')},	/* Santiago del Estero Quichua -> Quechua (Bolivia) */
+  {HB_TAG('q','u','s',' '),	HB_TAG('Q','U','Z',' ')},	/* Santiago del Estero Quichua -> Quechua */
   {HB_TAG('q','u','v',' '),	HB_TAG('M','Y','N',' ')},	/* Sacapulteco -> Mayan */
+  {HB_TAG('q','u','w',' '),	HB_TAG('Q','V','I',' ')},	/* Tena Lowland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','u','w',' '),	HB_TAG('Q','U','Z',' ')},	/* Tena Lowland Quichua -> Quechua */
+  {HB_TAG('q','u','x',' '),	HB_TAG('Q','W','H',' ')},	/* Yauyos Quechua -> Quechua (Peru) */
+  {HB_TAG('q','u','x',' '),	HB_TAG('Q','U','Z',' ')},	/* Yauyos Quechua -> Quechua */
   {HB_TAG('q','u','y',' '),	HB_TAG('Q','U','Z',' ')},	/* Ayacucho Quechua -> Quechua */
+/*{HB_TAG('q','u','z',' '),	HB_TAG('Q','U','Z',' ')},*/	/* Cusco Quechua -> Quechua */
+  {HB_TAG('q','v','a',' '),	HB_TAG('Q','W','H',' ')},	/* Ambo-Pasco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','a',' '),	HB_TAG('Q','U','Z',' ')},	/* Ambo-Pasco Quechua -> Quechua */
   {HB_TAG('q','v','c',' '),	HB_TAG('Q','U','Z',' ')},	/* Cajamarca Quechua -> Quechua */
   {HB_TAG('q','v','e',' '),	HB_TAG('Q','U','Z',' ')},	/* Eastern Apurímac Quechua -> Quechua */
+  {HB_TAG('q','v','h',' '),	HB_TAG('Q','W','H',' ')},	/* Huamalíes-Dos de Mayo Huánuco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','h',' '),	HB_TAG('Q','U','Z',' ')},	/* Huamalíes-Dos de Mayo Huánuco Quechua -> Quechua */
+  {HB_TAG('q','v','i',' '),	HB_TAG('Q','V','I',' ')},	/* Imbabura Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','v','i',' '),	HB_TAG('Q','U','Z',' ')},	/* Imbabura Highland Quichua -> Quechua */
+  {HB_TAG('q','v','j',' '),	HB_TAG('Q','V','I',' ')},	/* Loja Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','v','j',' '),	HB_TAG('Q','U','Z',' ')},	/* Loja Highland Quichua -> Quechua */
+  {HB_TAG('q','v','l',' '),	HB_TAG('Q','W','H',' ')},	/* Cajatambo North Lima Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','l',' '),	HB_TAG('Q','U','Z',' ')},	/* Cajatambo North Lima Quechua -> Quechua */
+  {HB_TAG('q','v','m',' '),	HB_TAG('Q','W','H',' ')},	/* Margos-Yarowilca-Lauricocha Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','m',' '),	HB_TAG('Q','U','Z',' ')},	/* Margos-Yarowilca-Lauricocha Quechua -> Quechua */
+  {HB_TAG('q','v','n',' '),	HB_TAG('Q','W','H',' ')},	/* North Junín Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','n',' '),	HB_TAG('Q','U','Z',' ')},	/* North Junín Quechua -> Quechua */
+  {HB_TAG('q','v','o',' '),	HB_TAG('Q','V','I',' ')},	/* Napo Lowland Quechua -> Quechua (Ecuador) */
+  {HB_TAG('q','v','o',' '),	HB_TAG('Q','U','Z',' ')},	/* Napo Lowland Quechua -> Quechua */
+  {HB_TAG('q','v','p',' '),	HB_TAG('Q','W','H',' ')},	/* Pacaraos Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','p',' '),	HB_TAG('Q','U','Z',' ')},	/* Pacaraos Quechua -> Quechua */
   {HB_TAG('q','v','s',' '),	HB_TAG('Q','U','Z',' ')},	/* San Martín Quechua -> Quechua */
+  {HB_TAG('q','v','w',' '),	HB_TAG('Q','W','H',' ')},	/* Huaylla Wanca Quechua -> Quechua (Peru) */
+  {HB_TAG('q','v','w',' '),	HB_TAG('Q','U','Z',' ')},	/* Huaylla Wanca Quechua -> Quechua */
+  {HB_TAG('q','v','z',' '),	HB_TAG('Q','V','I',' ')},	/* Northern Pastaza Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','v','z',' '),	HB_TAG('Q','U','Z',' ')},	/* Northern Pastaza Quichua -> Quechua */
+  {HB_TAG('q','w','a',' '),	HB_TAG('Q','W','H',' ')},	/* Corongo Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','w','a',' '),	HB_TAG('Q','U','Z',' ')},	/* Corongo Ancash Quechua -> Quechua */
   {HB_TAG('q','w','c',' '),	HB_TAG('Q','U','Z',' ')},	/* Classical Quechua -> Quechua */
+  {HB_TAG('q','w','h',' '),	HB_TAG('Q','W','H',' ')},	/* Huaylas Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','w','h',' '),	HB_TAG('Q','U','Z',' ')},	/* Huaylas Ancash Quechua -> Quechua */
+  {HB_TAG('q','w','s',' '),	HB_TAG('Q','W','H',' ')},	/* Sihuas Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','w','s',' '),	HB_TAG('Q','U','Z',' ')},	/* Sihuas Ancash Quechua -> Quechua */
   {HB_TAG('q','w','t',' '),	HB_TAG('A','T','H',' ')},	/* Kwalhioqua-Tlatskanai -> Athapaskan */
+  {HB_TAG('q','x','a',' '),	HB_TAG('Q','W','H',' ')},	/* Chiquián Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','a',' '),	HB_TAG('Q','U','Z',' ')},	/* Chiquián Ancash Quechua -> Quechua */
+  {HB_TAG('q','x','c',' '),	HB_TAG('Q','W','H',' ')},	/* Chincha Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','c',' '),	HB_TAG('Q','U','Z',' ')},	/* Chincha Quechua -> Quechua */
+  {HB_TAG('q','x','h',' '),	HB_TAG('Q','W','H',' ')},	/* Panao Huánuco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','h',' '),	HB_TAG('Q','U','Z',' ')},	/* Panao Huánuco Quechua -> Quechua */
+  {HB_TAG('q','x','l',' '),	HB_TAG('Q','V','I',' ')},	/* Salasaca Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','x','l',' '),	HB_TAG('Q','U','Z',' ')},	/* Salasaca Highland Quichua -> Quechua */
+  {HB_TAG('q','x','n',' '),	HB_TAG('Q','W','H',' ')},	/* Northern Conchucos Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','n',' '),	HB_TAG('Q','U','Z',' ')},	/* Northern Conchucos Ancash Quechua -> Quechua */
+  {HB_TAG('q','x','o',' '),	HB_TAG('Q','W','H',' ')},	/* Southern Conchucos Ancash Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','o',' '),	HB_TAG('Q','U','Z',' ')},	/* Southern Conchucos Ancash Quechua -> Quechua */
   {HB_TAG('q','x','p',' '),	HB_TAG('Q','U','Z',' ')},	/* Puno Quechua -> Quechua */
+  {HB_TAG('q','x','r',' '),	HB_TAG('Q','V','I',' ')},	/* Cañar Highland Quichua -> Quechua (Ecuador) */
+  {HB_TAG('q','x','r',' '),	HB_TAG('Q','U','Z',' ')},	/* Cañar Highland Quichua -> Quechua */
+  {HB_TAG('q','x','t',' '),	HB_TAG('Q','W','H',' ')},	/* Santa Ana de Tusi Pasco Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','t',' '),	HB_TAG('Q','U','Z',' ')},	/* Santa Ana de Tusi Pasco Quechua -> Quechua */
   {HB_TAG('q','x','u',' '),	HB_TAG('Q','U','Z',' ')},	/* Arequipa-La Unión Quechua -> Quechua */
+  {HB_TAG('q','x','w',' '),	HB_TAG('Q','W','H',' ')},	/* Jauja Wanca Quechua -> Quechua (Peru) */
+  {HB_TAG('q','x','w',' '),	HB_TAG('Q','U','Z',' ')},	/* Jauja Wanca Quechua -> Quechua */
   {HB_TAG('r','a','g',' '),	HB_TAG('L','U','H',' ')},	/* Logooli -> Luyia */
+/*{HB_TAG('r','a','j',' '),	HB_TAG('R','A','J',' ')},*/	/* Rajasthani [macrolanguage] */
   {HB_TAG('r','a','l',' '),	HB_TAG('Q','I','N',' ')},	/* Ralte -> Chin */
+/*{HB_TAG('r','a','r',' '),	HB_TAG('R','A','R',' ')},*/	/* Rarotongan */
   {HB_TAG('r','b','b',' '),	HB_TAG('P','L','G',' ')},	/* Rumai Palaung -> Palaung */
   {HB_TAG('r','b','l',' '),	HB_TAG('B','I','K',' ')},	/* Miraya Bikol -> Bikol */
   {HB_TAG('r','c','f',' '),	HB_TAG('C','P','P',' ')},	/* Réunion Creole French -> Creoles */
+/*{HB_TAG('r','e','j',' '),	HB_TAG('R','E','J',' ')},*/	/* Rejang */
+/*{HB_TAG('r','h','g',' '),	HB_TAG('R','H','G',' ')},*/	/* Rohingya */
+/*{HB_TAG('r','i','a',' '),	HB_TAG('R','I','A',' ')},*/	/* Riang (India) */
+  {HB_TAG('r','i','f',' '),	HB_TAG('R','I','F',' ')},	/* Tarifit */
+  {HB_TAG('r','i','f',' '),	HB_TAG('B','B','R',' ')},	/* Tarifit -> Berber */
+/*{HB_TAG('r','i','t',' '),	HB_TAG('R','I','T',' ')},*/	/* Ritharrngu -> Ritarungo */
   {HB_TAG('r','k','i',' '),	HB_TAG('A','R','K',' ')},	/* Rakhine */
+/*{HB_TAG('r','k','w',' '),	HB_TAG('R','K','W',' ')},*/	/* Arakwal */
   {HB_TAG('r','m','c',' '),	HB_TAG('R','O','Y',' ')},	/* Carpathian Romani -> Romany */
   {HB_TAG('r','m','f',' '),	HB_TAG('R','O','Y',' ')},	/* Kalo Finnish Romani -> Romany */
   {HB_TAG('r','m','l',' '),	HB_TAG('R','O','Y',' ')},	/* Baltic Romani -> Romany */
   {HB_TAG('r','m','n',' '),	HB_TAG('R','O','Y',' ')},	/* Balkan Romani -> Romany */
   {HB_TAG('r','m','o',' '),	HB_TAG('R','O','Y',' ')},	/* Sinte Romani -> Romany */
+  {HB_TAG('r','m','s',' '),	HB_TAG_NONE	       },	/* Romanian Sign Language != Romansh */
   {HB_TAG('r','m','w',' '),	HB_TAG('R','O','Y',' ')},	/* Welsh Romani -> Romany */
+  {HB_TAG('r','m','y',' '),	HB_TAG('R','M','Y',' ')},	/* Vlax Romani */
+  {HB_TAG('r','m','y',' '),	HB_TAG('R','O','Y',' ')},	/* Vlax Romani -> Romany */
   {HB_TAG('r','m','z',' '),	HB_TAG('A','R','K',' ')},	/* Marma -> Rakhine */
   {HB_TAG('r','o','m',' '),	HB_TAG('R','O','Y',' ')},	/* Romany [macrolanguage] */
   {HB_TAG('r','o','p',' '),	HB_TAG('C','P','P',' ')},	/* Kriol -> Creoles */
   {HB_TAG('r','t','c',' '),	HB_TAG('Q','I','N',' ')},	/* Rungtu Chin -> Chin */
+/*{HB_TAG('r','t','m',' '),	HB_TAG('R','T','M',' ')},*/	/* Rotuman */
   {HB_TAG('r','u','e',' '),	HB_TAG('R','S','Y',' ')},	/* Rusyn */
+/*{HB_TAG('r','u','p',' '),	HB_TAG('R','U','P',' ')},*/	/* Aromanian */
   {HB_TAG('r','w','r',' '),	HB_TAG('M','A','W',' ')},	/* Marwari (India) */
+  {HB_TAG('s','a','d',' '),	HB_TAG_NONE	       },	/* Sandawe != Sadri */
   {HB_TAG('s','a','h',' '),	HB_TAG('Y','A','K',' ')},	/* Yakut -> Sakha */
   {HB_TAG('s','a','m',' '),	HB_TAG('P','A','A',' ')},	/* Samaritan Aramaic -> Palestinian Aramaic */
+/*{HB_TAG('s','a','s',' '),	HB_TAG('S','A','S',' ')},*/	/* Sasak */
+/*{HB_TAG('s','a','t',' '),	HB_TAG('S','A','T',' ')},*/	/* Santali */
+  {HB_TAG('s','a','y',' '),	HB_TAG_NONE	       },	/* Saya != Sayisi */
   {HB_TAG('s','c','f',' '),	HB_TAG('C','P','P',' ')},	/* San Miguel Creole French -> Creoles */
   {HB_TAG('s','c','h',' '),	HB_TAG('Q','I','N',' ')},	/* Sakachep -> Chin */
   {HB_TAG('s','c','i',' '),	HB_TAG('C','P','P',' ')},	/* Sri Lankan Creole Malay -> Creoles */
   {HB_TAG('s','c','k',' '),	HB_TAG('S','A','D',' ')},	/* Sadri */
+/*{HB_TAG('s','c','n',' '),	HB_TAG('S','C','N',' ')},*/	/* Sicilian */
+/*{HB_TAG('s','c','o',' '),	HB_TAG('S','C','O',' ')},*/	/* Scots */
+  {HB_TAG('s','c','s',' '),	HB_TAG('S','C','S',' ')},	/* North Slavey */
+  {HB_TAG('s','c','s',' '),	HB_TAG('S','L','A',' ')},	/* North Slavey -> Slavey */
+  {HB_TAG('s','c','s',' '),	HB_TAG('A','T','H',' ')},	/* North Slavey -> Athapaskan */
   {HB_TAG('s','d','c',' '),	HB_TAG('S','R','D',' ')},	/* Sassarese Sardinian -> Sardinian */
   {HB_TAG('s','d','h',' '),	HB_TAG('K','U','R',' ')},	/* Southern Kurdish -> Kurdish */
   {HB_TAG('s','d','n',' '),	HB_TAG('S','R','D',' ')},	/* Gallurese Sardinian -> Sardinian */
   {HB_TAG('s','d','s',' '),	HB_TAG('B','B','R',' ')},	/* Sened -> Berber */
+/*{HB_TAG('s','e','e',' '),	HB_TAG('S','E','E',' ')},*/	/* Seneca */
   {HB_TAG('s','e','h',' '),	HB_TAG('S','N','A',' ')},	/* Sena */
   {HB_TAG('s','e','k',' '),	HB_TAG('A','T','H',' ')},	/* Sekani -> Athapaskan */
+/*{HB_TAG('s','e','l',' '),	HB_TAG('S','E','L',' ')},*/	/* Selkup */
   {HB_TAG('s','e','z',' '),	HB_TAG('Q','I','N',' ')},	/* Senthang Chin -> Chin */
+  {HB_TAG('s','f','m',' '),	HB_TAG('S','F','M',' ')},	/* Small Flowery Miao */
+  {HB_TAG('s','f','m',' '),	HB_TAG('H','M','N',' ')},	/* Small Flowery Miao -> Hmong */
+/*{HB_TAG('s','g','a',' '),	HB_TAG('S','G','A',' ')},*/	/* Old Irish (to 900) */
   {HB_TAG('s','g','c',' '),	HB_TAG('K','A','L',' ')},	/* Kipsigis -> Kalenjin */
+  {HB_TAG('s','g','o',' '),	HB_TAG_NONE	       },	/* Songa (retired code) != Sango */
+/*{HB_TAG('s','g','s',' '),	HB_TAG('S','G','S',' ')},*/	/* Samogitian */
   {HB_TAG('s','g','w',' '),	HB_TAG('C','H','G',' ')},	/* Sebat Bet Gurage -> Chaha Gurage */
+  {HB_TAG('s','h','i',' '),	HB_TAG('S','H','I',' ')},	/* Tachelhit */
+  {HB_TAG('s','h','i',' '),	HB_TAG('B','B','R',' ')},	/* Tachelhit -> Berber */
   {HB_TAG('s','h','l',' '),	HB_TAG('Q','I','N',' ')},	/* Shendu -> Chin */
+/*{HB_TAG('s','h','n',' '),	HB_TAG('S','H','N',' ')},*/	/* Shan */
   {HB_TAG('s','h','u',' '),	HB_TAG('A','R','A',' ')},	/* Chadian Arabic -> Arabic */
   {HB_TAG('s','h','y',' '),	HB_TAG('B','B','R',' ')},	/* Tachawit -> Berber */
+  {HB_TAG('s','i','b',' '),	HB_TAG_NONE	       },	/* Sebop != Sibe */
+/*{HB_TAG('s','i','d',' '),	HB_TAG('S','I','D',' ')},*/	/* Sidamo */
+  {HB_TAG('s','i','g',' '),	HB_TAG_NONE	       },	/* Paasaal != Silte Gurage */
   {HB_TAG('s','i','z',' '),	HB_TAG('B','B','R',' ')},	/* Siwi -> Berber */
+/*{HB_TAG('s','j','a',' '),	HB_TAG('S','J','A',' ')},*/	/* Epena */
   {HB_TAG('s','j','c',' '),	HB_TAG('Z','H','S',' ')},	/* Shaojiang Chinese -> Chinese, Simplified */
   {HB_TAG('s','j','d',' '),	HB_TAG('K','S','M',' ')},	/* Kildin Sami */
+/*{HB_TAG('s','j','e',' '),	HB_TAG('S','J','E',' ')},*/	/* Pite Sami */
   {HB_TAG('s','j','o',' '),	HB_TAG('S','I','B',' ')},	/* Xibe -> Sibe */
   {HB_TAG('s','j','s',' '),	HB_TAG('B','B','R',' ')},	/* Senhaja De Srair -> Berber */
+/*{HB_TAG('s','j','u',' '),	HB_TAG('S','J','U',' ')},*/	/* Ume Sami */
   {HB_TAG('s','k','g',' '),	HB_TAG('M','L','G',' ')},	/* Sakalava Malagasy -> Malagasy */
   {HB_TAG('s','k','r',' '),	HB_TAG('S','R','K',' ')},	/* Saraiki */
+  {HB_TAG('s','k','s',' '),	HB_TAG_NONE	       },	/* Maia != Skolt Sami */
   {HB_TAG('s','k','w',' '),	HB_TAG('C','P','P',' ')},	/* Skepi Creole Dutch -> Creoles */
+  {HB_TAG('s','k','y',' '),	HB_TAG_NONE	       },	/* Sikaiana != Slovak */
+  {HB_TAG('s','l','a',' '),	HB_TAG_NONE	       },	/* Slavic [collection] != Slavey */
   {HB_TAG('s','m','a',' '),	HB_TAG('S','S','M',' ')},	/* Southern Sami */
   {HB_TAG('s','m','d',' '),	HB_TAG('M','B','N',' ')},	/* Sama (retired code) -> Mbundu */
   {HB_TAG('s','m','j',' '),	HB_TAG('L','S','M',' ')},	/* Lule Sami */
+  {HB_TAG('s','m','l',' '),	HB_TAG_NONE	       },	/* Central Sama != Somali */
   {HB_TAG('s','m','n',' '),	HB_TAG('I','S','M',' ')},	/* Inari Sami */
   {HB_TAG('s','m','s',' '),	HB_TAG('S','K','S',' ')},	/* Skolt Sami */
   {HB_TAG('s','m','t',' '),	HB_TAG('Q','I','N',' ')},	/* Simte -> Chin */
   {HB_TAG('s','n','b',' '),	HB_TAG('I','B','A',' ')},	/* Sebuyau (retired code) -> Iban */
+  {HB_TAG('s','n','h',' '),	HB_TAG_NONE	       },	/* Shinabo (retired code) != Sinhala (Sinhalese) */
+/*{HB_TAG('s','n','k',' '),	HB_TAG('S','N','K',' ')},*/	/* Soninke */
+  {HB_TAG('s','o','g',' '),	HB_TAG_NONE	       },	/* Sogdian != Sodo Gurage */
+/*{HB_TAG('s','o','p',' '),	HB_TAG('S','O','P',' ')},*/	/* Songe */
   {HB_TAG('s','p','v',' '),	HB_TAG('O','R','I',' ')},	/* Sambalpuri -> Odia */
   {HB_TAG('s','p','y',' '),	HB_TAG('K','A','L',' ')},	/* Sabaot -> Kalenjin */
+  {HB_TAG('s','r','b',' '),	HB_TAG_NONE	       },	/* Sora != Serbian */
   {HB_TAG('s','r','c',' '),	HB_TAG('S','R','D',' ')},	/* Logudorese Sardinian -> Sardinian */
+  {HB_TAG('s','r','k',' '),	HB_TAG_NONE	       },	/* Serudung Murut != Saraiki */
   {HB_TAG('s','r','m',' '),	HB_TAG('C','P','P',' ')},	/* Saramaccan -> Creoles */
   {HB_TAG('s','r','n',' '),	HB_TAG('C','P','P',' ')},	/* Sranan Tongo -> Creoles */
   {HB_TAG('s','r','o',' '),	HB_TAG('S','R','D',' ')},	/* Campidanese Sardinian -> Sardinian */
+/*{HB_TAG('s','r','r',' '),	HB_TAG('S','R','R',' ')},*/	/* Serer */
   {HB_TAG('s','r','s',' '),	HB_TAG('A','T','H',' ')},	/* Sarsi -> Athapaskan */
   {HB_TAG('s','s','h',' '),	HB_TAG('A','R','A',' ')},	/* Shihhi Arabic -> Arabic */
+  {HB_TAG('s','s','l',' '),	HB_TAG_NONE	       },	/* Western Sisaala != South Slavey */
+  {HB_TAG('s','s','m',' '),	HB_TAG_NONE	       },	/* Semnam != Southern Sami */
   {HB_TAG('s','t','a',' '),	HB_TAG('C','P','P',' ')},	/* Settla -> Creoles */
+/*{HB_TAG('s','t','q',' '),	HB_TAG('S','T','Q',' ')},*/	/* Saterfriesisch -> Saterland Frisian */
+/*{HB_TAG('s','t','r',' '),	HB_TAG('S','T','R',' ')},*/	/* Straits Salish */
   {HB_TAG('s','t','v',' '),	HB_TAG('S','I','G',' ')},	/* Silt'e -> Silte Gurage */
+/*{HB_TAG('s','u','k',' '),	HB_TAG('S','U','K',' ')},*/	/* Sukuma */
   {HB_TAG('s','u','q',' '),	HB_TAG('S','U','R',' ')},	/* Suri */
+  {HB_TAG('s','u','r',' '),	HB_TAG_NONE	       },	/* Mwaghavul != Suri */
+/*{HB_TAG('s','v','a',' '),	HB_TAG('S','V','A',' ')},*/	/* Svan */
   {HB_TAG('s','v','c',' '),	HB_TAG('C','P','P',' ')},	/* Vincentian Creole English -> Creoles */
+  {HB_TAG('s','v','e',' '),	HB_TAG_NONE	       },	/* Serili != Swedish */
   {HB_TAG('s','w','b',' '),	HB_TAG('C','M','R',' ')},	/* Maore Comorian -> Comorian */
   {HB_TAG('s','w','c',' '),	HB_TAG('S','W','K',' ')},	/* Congo Swahili -> Swahili */
   {HB_TAG('s','w','h',' '),	HB_TAG('S','W','K',' ')},	/* Swahili */
+  {HB_TAG('s','w','k',' '),	HB_TAG_NONE	       },	/* Malawi Sena != Swahili */
   {HB_TAG('s','w','n',' '),	HB_TAG('B','B','R',' ')},	/* Sawknah -> Berber */
   {HB_TAG('s','w','v',' '),	HB_TAG('M','A','W',' ')},	/* Shekhawati -> Marwari */
+/*{HB_TAG('s','x','u',' '),	HB_TAG('S','X','U',' ')},*/	/* Upper Saxon */
   {HB_TAG('s','y','c',' '),	HB_TAG('S','Y','R',' ')},	/* Classical Syriac -> Syriac */
+/*{HB_TAG('s','y','l',' '),	HB_TAG('S','Y','L',' ')},*/	/* Sylheti */
+/*{HB_TAG('s','y','r',' '),	HB_TAG('S','Y','R',' ')},*/	/* Syriac [macrolanguage] */
+/*{HB_TAG('s','z','l',' '),	HB_TAG('S','Z','L',' ')},*/	/* Silesian */
   {HB_TAG('t','a','a',' '),	HB_TAG('A','T','H',' ')},	/* Lower Tanana -> Athapaskan */
+/*{HB_TAG('t','a','b',' '),	HB_TAG('T','A','B',' ')},*/	/* Tabassaran -> Tabasaran */
+  {HB_TAG('t','a','j',' '),	HB_TAG_NONE	       },	/* Eastern Tamang != Tajiki */
+  {HB_TAG('t','a','q',' '),	HB_TAG('T','A','Q',' ')},	/* Tamasheq */
+  {HB_TAG('t','a','q',' '),	HB_TAG('T','M','H',' ')},	/* Tamasheq -> Tamashek */
+  {HB_TAG('t','a','q',' '),	HB_TAG('B','B','R',' ')},	/* Tamasheq -> Berber */
   {HB_TAG('t','a','s',' '),	HB_TAG('C','P','P',' ')},	/* Tay Boi -> Creoles */
   {HB_TAG('t','a','u',' '),	HB_TAG('A','T','H',' ')},	/* Upper Tanana -> Athapaskan */
+/*{HB_TAG('t','b','v',' '),	HB_TAG('T','B','V',' ')},*/	/* Tobo */
   {HB_TAG('t','c','b',' '),	HB_TAG('A','T','H',' ')},	/* Tanacross -> Athapaskan */
   {HB_TAG('t','c','e',' '),	HB_TAG('A','T','H',' ')},	/* Southern Tutchone -> Athapaskan */
   {HB_TAG('t','c','h',' '),	HB_TAG('C','P','P',' ')},	/* Turks And Caicos Creole English -> Creoles */
@@ -1062,54 +1481,115 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','c','s',' '),	HB_TAG('C','P','P',' ')},	/* Torres Strait Creole -> Creoles */
   {HB_TAG('t','c','y',' '),	HB_TAG('T','U','L',' ')},	/* Tulu */
   {HB_TAG('t','c','z',' '),	HB_TAG('Q','I','N',' ')},	/* Thado Chin -> Chin */
+/*{HB_TAG('t','d','c',' '),	HB_TAG('T','D','C',' ')},*/	/* Emberá-Tadó */
+/*{HB_TAG('t','d','d',' '),	HB_TAG('T','D','D',' ')},*/	/* Tai Nüa -> Dehong Dai */
   {HB_TAG('t','d','x',' '),	HB_TAG('M','L','G',' ')},	/* Tandroy-Mahafaly Malagasy -> Malagasy */
   {HB_TAG('t','e','c',' '),	HB_TAG('K','A','L',' ')},	/* Terik -> Kalenjin */
   {HB_TAG('t','e','m',' '),	HB_TAG('T','M','N',' ')},	/* Timne -> Temne */
+/*{HB_TAG('t','e','t',' '),	HB_TAG('T','E','T',' ')},*/	/* Tetum */
   {HB_TAG('t','e','z',' '),	HB_TAG('B','B','R',' ')},	/* Tetserret -> Berber */
   {HB_TAG('t','f','n',' '),	HB_TAG('A','T','H',' ')},	/* Tanaina -> Athapaskan */
   {HB_TAG('t','g','h',' '),	HB_TAG('C','P','P',' ')},	/* Tobagonian Creole English -> Creoles */
   {HB_TAG('t','g','j',' '),	HB_TAG('N','I','S',' ')},	/* Tagin -> Nisi */
+  {HB_TAG('t','g','n',' '),	HB_TAG_NONE	       },	/* Tandaganon != Tongan */
+  {HB_TAG('t','g','r',' '),	HB_TAG_NONE	       },	/* Tareng != Tigre */
   {HB_TAG('t','g','x',' '),	HB_TAG('A','T','H',' ')},	/* Tagish -> Athapaskan */
+  {HB_TAG('t','g','y',' '),	HB_TAG_NONE	       },	/* Togoyo != Tigrinya */
+/*{HB_TAG('t','h','p',' '),	HB_TAG('T','H','P',' ')},*/	/* Thompson */
   {HB_TAG('t','h','t',' '),	HB_TAG('A','T','H',' ')},	/* Tahltan -> Athapaskan */
+  {HB_TAG('t','h','v',' '),	HB_TAG('T','H','V',' ')},	/* Tahaggart Tamahaq */
+  {HB_TAG('t','h','v',' '),	HB_TAG('T','M','H',' ')},	/* Tahaggart Tamahaq -> Tamashek */
+  {HB_TAG('t','h','v',' '),	HB_TAG('B','B','R',' ')},	/* Tahaggart Tamahaq -> Berber */
+  {HB_TAG('t','h','z',' '),	HB_TAG('T','H','Z',' ')},	/* Tayart Tamajeq */
+  {HB_TAG('t','h','z',' '),	HB_TAG('T','M','H',' ')},	/* Tayart Tamajeq -> Tamashek */
+  {HB_TAG('t','h','z',' '),	HB_TAG('B','B','R',' ')},	/* Tayart Tamajeq -> Berber */
   {HB_TAG('t','i','a',' '),	HB_TAG('B','B','R',' ')},	/* Tidikelt Tamazight -> Berber */
   {HB_TAG('t','i','g',' '),	HB_TAG('T','G','R',' ')},	/* Tigre */
+/*{HB_TAG('t','i','v',' '),	HB_TAG('T','I','V',' ')},*/	/* Tiv */
+/*{HB_TAG('t','j','l',' '),	HB_TAG('T','J','L',' ')},*/	/* Tai Laing */
   {HB_TAG('t','j','o',' '),	HB_TAG('B','B','R',' ')},	/* Temacine Tamazight -> Berber */
   {HB_TAG('t','k','g',' '),	HB_TAG('M','L','G',' ')},	/* Tesaka Malagasy -> Malagasy */
+  {HB_TAG('t','k','m',' '),	HB_TAG_NONE	       },	/* Takelma != Turkmen */
+/*{HB_TAG('t','l','i',' '),	HB_TAG('T','L','I',' ')},*/	/* Tlingit */
+/*{HB_TAG('t','l','y',' '),	HB_TAG('T','L','Y',' ')},*/	/* Talysh */
   {HB_TAG('t','m','g',' '),	HB_TAG('C','P','P',' ')},	/* Ternateño -> Creoles */
+  {HB_TAG('t','m','h',' '),	HB_TAG('T','M','H',' ')},	/* Tamashek [macrolanguage] */
+  {HB_TAG('t','m','h',' '),	HB_TAG('B','B','R',' ')},	/* Tamashek [macrolanguage] -> Berber */
+  {HB_TAG('t','m','n',' '),	HB_TAG_NONE	       },	/* Taman (Indonesia) != Temne */
   {HB_TAG('t','m','w',' '),	HB_TAG('M','L','Y',' ')},	/* Temuan -> Malay */
+  {HB_TAG('t','n','a',' '),	HB_TAG_NONE	       },	/* Tacana != Tswana */
+  {HB_TAG('t','n','e',' '),	HB_TAG_NONE	       },	/* Tinoc Kallahan (retired code) != Tundra Enets */
+  {HB_TAG('t','n','f',' '),	HB_TAG('D','R','I',' ')},	/* Tangshewi (retired code) -> Dari */
+  {HB_TAG('t','n','f',' '),	HB_TAG('F','A','R',' ')},	/* Tangshewi (retired code) -> Persian */
+  {HB_TAG('t','n','g',' '),	HB_TAG_NONE	       },	/* Tobanga != Tonga */
   {HB_TAG('t','o','d',' '),	HB_TAG('T','O','D','0')},	/* Toma */
   {HB_TAG('t','o','i',' '),	HB_TAG('T','N','G',' ')},	/* Tonga (Zambia) */
   {HB_TAG('t','o','j',' '),	HB_TAG('M','Y','N',' ')},	/* Tojolabal -> Mayan */
   {HB_TAG('t','o','l',' '),	HB_TAG('A','T','H',' ')},	/* Tolowa -> Athapaskan */
   {HB_TAG('t','o','r',' '),	HB_TAG('B','A','D','0')},	/* Togbo-Vara Banda -> Banda */
+  {HB_TAG('t','p','i',' '),	HB_TAG('T','P','I',' ')},	/* Tok Pisin */
+  {HB_TAG('t','p','i',' '),	HB_TAG('C','P','P',' ')},	/* Tok Pisin -> Creoles */
   {HB_TAG('t','r','f',' '),	HB_TAG('C','P','P',' ')},	/* Trinidadian Creole English -> Creoles */
+  {HB_TAG('t','r','k',' '),	HB_TAG_NONE	       },	/* Turkic [collection] != Turkish */
+  {HB_TAG('t','r','u',' '),	HB_TAG('T','U','A',' ')},	/* Turoyo -> Turoyo Aramaic */
+  {HB_TAG('t','r','u',' '),	HB_TAG('S','Y','R',' ')},	/* Turoyo -> Syriac */
+  {HB_TAG('t','s','g',' '),	HB_TAG_NONE	       },	/* Tausug != Tsonga */
+/*{HB_TAG('t','s','j',' '),	HB_TAG('T','S','J',' ')},*/	/* Tshangla */
   {HB_TAG('t','t','c',' '),	HB_TAG('M','Y','N',' ')},	/* Tektiteko -> Mayan */
   {HB_TAG('t','t','m',' '),	HB_TAG('A','T','H',' ')},	/* Northern Tutchone -> Athapaskan */
+  {HB_TAG('t','t','q',' '),	HB_TAG('T','T','Q',' ')},	/* Tawallammat Tamajaq */
+  {HB_TAG('t','t','q',' '),	HB_TAG('T','M','H',' ')},	/* Tawallammat Tamajaq -> Tamashek */
+  {HB_TAG('t','t','q',' '),	HB_TAG('B','B','R',' ')},	/* Tawallammat Tamajaq -> Berber */
+  {HB_TAG('t','u','a',' '),	HB_TAG_NONE	       },	/* Wiarumus != Turoyo Aramaic */
+  {HB_TAG('t','u','l',' '),	HB_TAG_NONE	       },	/* Tula != Tulu */
+/*{HB_TAG('t','u','m',' '),	HB_TAG('T','U','M',' ')},*/	/* Tumbuka */
+/*{HB_TAG('t','u','s',' '),	HB_TAG('T','U','S',' ')},*/	/* Tuscarora */
   {HB_TAG('t','u','u',' '),	HB_TAG('A','T','H',' ')},	/* Tututni -> Athapaskan */
+  {HB_TAG('t','u','v',' '),	HB_TAG_NONE	       },	/* Turkana != Tuvin */
   {HB_TAG('t','u','y',' '),	HB_TAG('K','A','L',' ')},	/* Tugen -> Kalenjin */
+/*{HB_TAG('t','v','l',' '),	HB_TAG('T','V','L',' ')},*/	/* Tuvalu */
   {HB_TAG('t','v','y',' '),	HB_TAG('C','P','P',' ')},	/* Timor Pidgin -> Creoles */
   {HB_TAG('t','x','c',' '),	HB_TAG('A','T','H',' ')},	/* Tsetsaut -> Athapaskan */
   {HB_TAG('t','x','y',' '),	HB_TAG('M','L','G',' ')},	/* Tanosy Malagasy -> Malagasy */
   {HB_TAG('t','y','v',' '),	HB_TAG('T','U','V',' ')},	/* Tuvinian -> Tuvin */
+/*{HB_TAG('t','y','z',' '),	HB_TAG('T','Y','Z',' ')},*/	/* Tày */
   {HB_TAG('t','z','h',' '),	HB_TAG('M','Y','N',' ')},	/* Tzeltal -> Mayan */
   {HB_TAG('t','z','j',' '),	HB_TAG('M','Y','N',' ')},	/* Tz'utujil -> Mayan */
+  {HB_TAG('t','z','m',' '),	HB_TAG('T','Z','M',' ')},	/* Central Atlas Tamazight -> Tamazight */
+  {HB_TAG('t','z','m',' '),	HB_TAG('B','B','R',' ')},	/* Central Atlas Tamazight -> Berber */
+  {HB_TAG('t','z','o',' '),	HB_TAG('T','Z','O',' ')},	/* Tzotzil */
+  {HB_TAG('t','z','o',' '),	HB_TAG('M','Y','N',' ')},	/* Tzotzil -> Mayan */
   {HB_TAG('u','b','l',' '),	HB_TAG('B','I','K',' ')},	/* Buhi'non Bikol -> Bikol */
+/*{HB_TAG('u','d','i',' '),	HB_TAG('U','D','I',' ')},*/	/* Udi */
+/*{HB_TAG('u','d','m',' '),	HB_TAG('U','D','M',' ')},*/	/* Udmurt */
   {HB_TAG('u','k','i',' '),	HB_TAG('K','U','I',' ')},	/* Kui (India) */
   {HB_TAG('u','l','n',' '),	HB_TAG('C','P','P',' ')},	/* Unserdeutsch -> Creoles */
+/*{HB_TAG('u','m','b',' '),	HB_TAG('U','M','B',' ')},*/	/* Umbundu */
   {HB_TAG('u','n','r',' '),	HB_TAG('M','U','N',' ')},	/* Mundari */
   {HB_TAG('u','r','k',' '),	HB_TAG('M','L','Y',' ')},	/* Urak Lawoi' -> Malay */
   {HB_TAG('u','s','p',' '),	HB_TAG('M','Y','N',' ')},	/* Uspanteco -> Mayan */
   {HB_TAG('u','z','n',' '),	HB_TAG('U','Z','B',' ')},	/* Northern Uzbek -> Uzbek */
   {HB_TAG('u','z','s',' '),	HB_TAG('U','Z','B',' ')},	/* Southern Uzbek -> Uzbek */
   {HB_TAG('v','a','p',' '),	HB_TAG('Q','I','N',' ')},	/* Vaiphei -> Chin */
+/*{HB_TAG('v','e','c',' '),	HB_TAG('V','E','C',' ')},*/	/* Venetian */
   {HB_TAG('v','i','c',' '),	HB_TAG('C','P','P',' ')},	/* Virgin Islands Creole English -> Creoles */
+  {HB_TAG('v','i','t',' '),	HB_TAG_NONE	       },	/* Viti != Vietnamese */
   {HB_TAG('v','k','k',' '),	HB_TAG('M','L','Y',' ')},	/* Kaur -> Malay */
   {HB_TAG('v','k','p',' '),	HB_TAG('C','P','P',' ')},	/* Korlai Creole Portuguese -> Creoles */
   {HB_TAG('v','k','t',' '),	HB_TAG('M','L','Y',' ')},	/* Tenggarong Kutai Malay -> Malay */
   {HB_TAG('v','l','s',' '),	HB_TAG('F','L','E',' ')},	/* Vlaams -> Dutch (Flemish) */
   {HB_TAG('v','m','w',' '),	HB_TAG('M','A','K',' ')},	/* Makhuwa */
+  {HB_TAG('v','r','o',' '),	HB_TAG('V','R','O',' ')},	/* Võro */
+  {HB_TAG('v','r','o',' '),	HB_TAG('E','T','I',' ')},	/* Võro -> Estonian */
   {HB_TAG('v','s','n',' '),	HB_TAG('S','A','N',' ')},	/* Vedic Sanskrit -> Sanskrit */
+  {HB_TAG('w','a','g',' '),	HB_TAG_NONE	       },	/* Wa'ema != Wagdi */
+/*{HB_TAG('w','a','r',' '),	HB_TAG('W','A','R',' ')},*/	/* Waray (Philippines) -> Waray-Waray */
+/*{HB_TAG('w','b','l',' '),	HB_TAG('W','B','L',' ')},*/	/* Wakhi */
   {HB_TAG('w','b','m',' '),	HB_TAG('W','A',' ',' ')},	/* Wa */
+  {HB_TAG('w','b','r',' '),	HB_TAG('W','A','G',' ')},	/* Wagdi */
+  {HB_TAG('w','b','r',' '),	HB_TAG('R','A','J',' ')},	/* Wagdi -> Rajasthani */
+/*{HB_TAG('w','c','i',' '),	HB_TAG('W','C','I',' ')},*/	/* Waci Gbe */
+/*{HB_TAG('w','d','t',' '),	HB_TAG('W','D','T',' ')},*/	/* Wendat */
   {HB_TAG('w','e','a',' '),	HB_TAG('K','R','N',' ')},	/* Wewaw -> Karen */
   {HB_TAG('w','e','s',' '),	HB_TAG('C','P','P',' ')},	/* Cameroon Pidgin -> Creoles */
   {HB_TAG('w','e','u',' '),	HB_TAG('Q','I','N',' ')},	/* Rawngtu Chin -> Chin */
@@ -1119,31 +1599,62 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('w','n','i',' '),	HB_TAG('C','M','R',' ')},	/* Ndzwani Comorian -> Comorian */
   {HB_TAG('w','r','y',' '),	HB_TAG('M','A','W',' ')},	/* Merwari -> Marwari */
   {HB_TAG('w','s','g',' '),	HB_TAG('G','O','N',' ')},	/* Adilabad Gondi -> Gondi */
+/*{HB_TAG('w','t','m',' '),	HB_TAG('W','T','M',' ')},*/	/* Mewati */
   {HB_TAG('w','u','u',' '),	HB_TAG('Z','H','S',' ')},	/* Wu Chinese -> Chinese, Simplified */
+  {HB_TAG('w','y','a',' '),	HB_TAG('W','D','T',' ')},	/* Wyandot (retired code) -> Wendat */
+  {HB_TAG('w','y','a',' '),	HB_TAG('W','Y','N',' ')},	/* Wyandot (retired code) */
+/*{HB_TAG('w','y','n',' '),	HB_TAG('W','Y','N',' ')},*/	/* Wyandot */
+  {HB_TAG('x','a','l',' '),	HB_TAG('K','L','M',' ')},	/* Kalmyk */
+  {HB_TAG('x','a','l',' '),	HB_TAG('T','O','D',' ')},	/* Kalmyk -> Todo */
   {HB_TAG('x','a','n',' '),	HB_TAG('S','E','K',' ')},	/* Xamtanga -> Sekota */
+  {HB_TAG('x','b','d',' '),	HB_TAG_NONE	       },	/* Bindal != Lü */
+/*{HB_TAG('x','j','b',' '),	HB_TAG('X','J','B',' ')},*/	/* Minjungbal -> Minjangbal */
+/*{HB_TAG('x','k','f',' '),	HB_TAG('X','K','F',' ')},*/	/* Khengkha */
   {HB_TAG('x','m','g',' '),	HB_TAG('B','M','L',' ')},	/* Mengaka -> Bamileke */
+  {HB_TAG('x','m','m',' '),	HB_TAG('M','L','Y',' ')},	/* Manado Malay -> Malay */
+  {HB_TAG('x','m','m',' '),	HB_TAG('C','P','P',' ')},	/* Manado Malay -> Creoles */
   {HB_TAG('x','m','v',' '),	HB_TAG('M','L','G',' ')},	/* Antankarana Malagasy -> Malagasy */
   {HB_TAG('x','m','w',' '),	HB_TAG('M','L','G',' ')},	/* Tsimihety Malagasy -> Malagasy */
   {HB_TAG('x','n','j',' '),	HB_TAG('S','X','T',' ')},	/* Ngoni (Tanzania) -> Sutu */
   {HB_TAG('x','n','q',' '),	HB_TAG('S','X','T',' ')},	/* Ngoni (Mozambique) -> Sutu */
   {HB_TAG('x','n','r',' '),	HB_TAG('D','G','R',' ')},	/* Kangri -> Dogri (macrolanguage) */
+/*{HB_TAG('x','o','g',' '),	HB_TAG('X','O','G',' ')},*/	/* Soga */
+  {HB_TAG('x','p','e',' '),	HB_TAG('X','P','E',' ')},	/* Liberia Kpelle -> Kpelle (Liberia) */
+  {HB_TAG('x','p','e',' '),	HB_TAG('K','P','L',' ')},	/* Liberia Kpelle -> Kpelle */
+  {HB_TAG('x','s','l',' '),	HB_TAG('S','S','L',' ')},	/* South Slavey */
+  {HB_TAG('x','s','l',' '),	HB_TAG('S','L','A',' ')},	/* South Slavey -> Slavey */
+  {HB_TAG('x','s','l',' '),	HB_TAG('A','T','H',' ')},	/* South Slavey -> Athapaskan */
   {HB_TAG('x','s','t',' '),	HB_TAG('S','I','G',' ')},	/* Silt'e (retired code) -> Silte Gurage */
+/*{HB_TAG('x','u','b',' '),	HB_TAG('X','U','B',' ')},*/	/* Betta Kurumba -> Bette Kuruma */
+/*{HB_TAG('x','u','j',' '),	HB_TAG('X','U','J',' ')},*/	/* Jennu Kurumba -> Jennu Kuruma */
   {HB_TAG('x','u','p',' '),	HB_TAG('A','T','H',' ')},	/* Upper Umpqua -> Athapaskan */
   {HB_TAG('x','w','o',' '),	HB_TAG('T','O','D',' ')},	/* Written Oirat -> Todo */
   {HB_TAG('y','a','j',' '),	HB_TAG('B','A','D','0')},	/* Banda-Yangere -> Banda */
+  {HB_TAG('y','a','k',' '),	HB_TAG_NONE	       },	/* Yakama != Sakha */
+/*{HB_TAG('y','a','o',' '),	HB_TAG('Y','A','O',' ')},*/	/* Yao */
+/*{HB_TAG('y','a','p',' '),	HB_TAG('Y','A','P',' ')},*/	/* Yapese */
+  {HB_TAG('y','b','a',' '),	HB_TAG_NONE	       },	/* Yala != Yoruba */
   {HB_TAG('y','b','b',' '),	HB_TAG('B','M','L',' ')},	/* Yemba -> Bamileke */
   {HB_TAG('y','b','d',' '),	HB_TAG('A','R','K',' ')},	/* Yangbye (retired code) -> Rakhine */
   {HB_TAG('y','c','r',' '),	HB_TAG('C','P','P',' ')},	/* Yilan Creole -> Creoles */
   {HB_TAG('y','d','d',' '),	HB_TAG('J','I','I',' ')},	/* Eastern Yiddish -> Yiddish */
+/*{HB_TAG('y','g','p',' '),	HB_TAG('Y','G','P',' ')},*/	/* Gepo */
   {HB_TAG('y','i','h',' '),	HB_TAG('J','I','I',' ')},	/* Western Yiddish -> Yiddish */
+  {HB_TAG('y','i','m',' '),	HB_TAG_NONE	       },	/* Yimchungru Naga != Yi Modern */
+/*{HB_TAG('y','n','a',' '),	HB_TAG('Y','N','A',' ')},*/	/* Aluo */
   {HB_TAG('y','o','s',' '),	HB_TAG('Q','I','N',' ')},	/* Yos (retired code) -> Chin */
   {HB_TAG('y','u','a',' '),	HB_TAG('M','Y','N',' ')},	/* Yucateco -> Mayan */
   {HB_TAG('y','u','e',' '),	HB_TAG('Z','H','H',' ')},	/* Yue Chinese -> Chinese, Traditional, Hong Kong SAR */
+/*{HB_TAG('y','u','f',' '),	HB_TAG('Y','U','F',' ')},*/	/* Havasupai-Walapai-Yavapai */
+/*{HB_TAG('y','w','q',' '),	HB_TAG('Y','W','Q',' ')},*/	/* Wuding-Luquan Yi */
   {HB_TAG('z','c','h',' '),	HB_TAG('Z','H','A',' ')},	/* Central Hongshuihe Zhuang -> Zhuang */
   {HB_TAG('z','d','j',' '),	HB_TAG('C','M','R',' ')},	/* Ngazidja Comorian -> Comorian */
+/*{HB_TAG('z','e','a',' '),	HB_TAG('Z','E','A',' ')},*/	/* Zeeuws -> Zealandic */
   {HB_TAG('z','e','h',' '),	HB_TAG('Z','H','A',' ')},	/* Eastern Hongshuihe Zhuang -> Zhuang */
   {HB_TAG('z','e','n',' '),	HB_TAG('B','B','R',' ')},	/* Zenaga -> Berber */
   {HB_TAG('z','g','b',' '),	HB_TAG('Z','H','A',' ')},	/* Guibei Zhuang -> Zhuang */
+  {HB_TAG('z','g','h',' '),	HB_TAG('Z','G','H',' ')},	/* Standard Moroccan Tamazight */
+  {HB_TAG('z','g','h',' '),	HB_TAG('B','B','R',' ')},	/* Standard Moroccan Tamazight -> Berber */
   {HB_TAG('z','g','m',' '),	HB_TAG('Z','H','A',' ')},	/* Minz Zhuang -> Zhuang */
   {HB_TAG('z','g','n',' '),	HB_TAG('Z','H','A',' ')},	/* Guibian Zhuang -> Zhuang */
   {HB_TAG('z','h','d',' '),	HB_TAG('Z','H','A',' ')},	/* Dai Zhuang -> Zhuang */
@@ -1155,6 +1666,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('z','l','q',' '),	HB_TAG('Z','H','A',' ')},	/* Liuqian Zhuang -> Zhuang */
   {HB_TAG('z','m','i',' '),	HB_TAG('M','L','Y',' ')},	/* Negeri Sembilan Malay -> Malay */
   {HB_TAG('z','m','z',' '),	HB_TAG('B','A','D','0')},	/* Mbandja -> Banda */
+  {HB_TAG('z','n','d',' '),	HB_TAG_NONE	       },	/* Zande [collection] != Zande */
   {HB_TAG('z','n','e',' '),	HB_TAG('Z','N','D',' ')},	/* Zande */
   {HB_TAG('z','o','m',' '),	HB_TAG('Q','I','N',' ')},	/* Zou -> Chin */
   {HB_TAG('z','q','e',' '),	HB_TAG('Z','H','A',' ')},	/* Qiubei Zhuang -> Zhuang */
@@ -1165,439 +1677,9 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('z','y','j',' '),	HB_TAG('Z','H','A',' ')},	/* Youjiang Zhuang -> Zhuang */
   {HB_TAG('z','y','n',' '),	HB_TAG('Z','H','A',' ')},	/* Yongnan Zhuang -> Zhuang */
   {HB_TAG('z','y','p',' '),	HB_TAG('Q','I','N',' ')},	/* Zyphe Chin -> Chin */
+/*{HB_TAG('z','z','a',' '),	HB_TAG('Z','Z','A',' ')},*/	/* Zazaki [macrolanguage] */
   {HB_TAG('z','z','j',' '),	HB_TAG('Z','H','A',' ')},	/* Zuojiang Zhuang -> Zhuang */
 };
-
-static const hb_tag_t ot_languages3_multi_values[] = {
-  HB_TAG('F','A','N',' '),	/* Saint Lucian Creole French -> French Antillean */
-  HB_TAG('C','P','P',' '),	/* Saint Lucian Creole French -> Creoles */
-  HB_TAG('A','C','R',' '),	/* Achi */
-  HB_TAG('M','Y','N',' '),	/* Achi -> Mayan */
-  HB_TAG('A','C','Y',' '),	/* Cypriot Arabic */
-  HB_TAG('A','R','A',' '),	/* Cypriot Arabic -> Arabic */
-  HB_TAG('S','W','A',' '),	/* Assyrian Neo-Aramaic -> Swadaya Aramaic */
-  HB_TAG('S','Y','R',' '),	/* Assyrian Neo-Aramaic -> Syriac */
-  HB_TAG('A','K','B',' '),	/* Batak Angkola */
-  HB_TAG('B','T','K',' '),	/* Batak Angkola -> Batak */
-  HB_TAG('M','O','R',' '),	/* Moroccan Arabic -> Moroccan */
-  HB_TAG('A','R','A',' '),	/* Moroccan Arabic -> Arabic */
-  HB_TAG('A','Z','B',' '),	/* South Azerbaijani -> Torki */
-  HB_TAG('A','Z','E',' '),	/* South Azerbaijani -> Azerbaijani */
-  HB_TAG('B','B','C',' '),	/* Batak Toba */
-  HB_TAG('B','T','K',' '),	/* Batak Toba -> Batak */
-  HB_TAG('B','G','Q',' '),	/* Bagri */
-  HB_TAG('R','A','J',' '),	/* Bagri -> Rajasthani */
-  HB_TAG('B','L','K',' '),	/* Pa’o Karen */
-  HB_TAG('K','R','N',' '),	/* Pa'o Karen -> Karen */
-  HB_TAG('B','T','D',' '),	/* Batak Dairi (Pakpak) */
-  HB_TAG('B','T','K',' '),	/* Batak Dairi -> Batak */
-  HB_TAG('B','T','M',' '),	/* Batak Mandailing */
-  HB_TAG('B','T','K',' '),	/* Batak Mandailing -> Batak */
-  HB_TAG('B','T','S',' '),	/* Batak Simalungun */
-  HB_TAG('B','T','K',' '),	/* Batak Simalungun -> Batak */
-  HB_TAG('B','T','X',' '),	/* Batak Karo */
-  HB_TAG('B','T','K',' '),	/* Batak Karo -> Batak */
-  HB_TAG('B','T','Z',' '),	/* Batak Alas-Kluet */
-  HB_TAG('B','T','K',' '),	/* Batak Alas-Kluet -> Batak */
-  HB_TAG('B','Y','V',' '),	/* Medumba */
-  HB_TAG('B','M','L',' '),	/* Medumba -> Bamileke */
-  HB_TAG('C','R','R',' '),	/* Southern Carrier -> Carrier */
-  HB_TAG('A','T','H',' '),	/* Southern Carrier -> Athapaskan */
-  HB_TAG('C','A','K',' '),	/* Kaqchikel */
-  HB_TAG('M','Y','N',' '),	/* Kaqchikel -> Mayan */
-  HB_TAG('C','B','K',' '),	/* Chavacano -> Zamboanga Chavacano */
-  HB_TAG('C','P','P',' '),	/* Chavacano -> Creoles */
-  HB_TAG('H','A','L',' '),	/* Halam (Falam Chin) */
-  HB_TAG('Q','I','N',' '),	/* Falam Chin -> Chin */
-  HB_TAG('H','M','A',' '),	/* Mari (Russia) [macrolanguage] -> High Mari */
-  HB_TAG('L','M','A',' '),	/* Mari (Russia) [macrolanguage] -> Low Mari */
-  HB_TAG('C','H','P',' '),	/* Chipewyan */
-  HB_TAG('S','A','Y',' '),	/* Chipewyan -> Sayisi */
-  HB_TAG('A','T','H',' '),	/* Chipewyan -> Athapaskan */
-  HB_TAG('Q','U','H',' '),	/* Chilean Quechua (retired code) -> Quechua (Bolivia) */
-  HB_TAG('Q','U','Z',' '),	/* Chilean Quechua (retired code) -> Quechua */
-  HB_TAG('E','C','R',' '),	/* Southern East Cree -> Eastern Cree */
-  HB_TAG('Y','C','R',' '),	/* Southern East Cree -> Y-Cree */
-  HB_TAG('C','R','E',' '),	/* Southern East Cree -> Cree */
-  HB_TAG('W','C','R',' '),	/* Plains Cree -> West-Cree */
-  HB_TAG('Y','C','R',' '),	/* Plains Cree -> Y-Cree */
-  HB_TAG('C','R','E',' '),	/* Plains Cree -> Cree */
-  HB_TAG('E','C','R',' '),	/* Northern East Cree -> Eastern Cree */
-  HB_TAG('Y','C','R',' '),	/* Northern East Cree -> Y-Cree */
-  HB_TAG('C','R','E',' '),	/* Northern East Cree -> Cree */
-  HB_TAG('M','C','R',' '),	/* Moose Cree */
-  HB_TAG('L','C','R',' '),	/* Moose Cree -> L-Cree */
-  HB_TAG('C','R','E',' '),	/* Moose Cree -> Cree */
-  HB_TAG('C','R','R',' '),	/* Carrier */
-  HB_TAG('A','T','H',' '),	/* Carrier -> Athapaskan */
-  HB_TAG('N','C','R',' '),	/* Swampy Cree -> N-Cree */
-  HB_TAG('N','H','C',' '),	/* Swampy Cree -> Norway House Cree */
-  HB_TAG('C','R','E',' '),	/* Swampy Cree -> Cree */
-  HB_TAG('D','C','R',' '),	/* Woods Cree */
-  HB_TAG('T','C','R',' '),	/* Woods Cree -> TH-Cree */
-  HB_TAG('C','R','E',' '),	/* Woods Cree -> Cree */
-  HB_TAG('S','L','A',' '),	/* Slave (Athapascan) [macrolanguage] -> Slavey */
-  HB_TAG('A','T','H',' '),	/* Slave (Athapascan) [macrolanguage] -> Athapaskan */
-  HB_TAG('D','G','O',' '),	/* Dogri (individual language) */
-  HB_TAG('D','G','R',' '),	/* Dogri (macrolanguage) */
-  HB_TAG('D','I','Q',' '),	/* Dimli */
-  HB_TAG('Z','Z','A',' '),	/* Dimli -> Zazaki */
-  HB_TAG('D','R','I',' '),	/* Darwazi (retired code) -> Dari */
-  HB_TAG('F','A','R',' '),	/* Darwazi (retired code) -> Persian */
-  HB_TAG('E','M','K',' '),	/* Eastern Maninkakan */
-  HB_TAG('M','N','K',' '),	/* Eastern Maninkakan -> Maninka */
-  HB_TAG('F','A','N','0'),	/* Fang (Equatorial Guinea) */
-  HB_TAG('B','T','I',' '),	/* Fang (Equatorial Guinea) -> Beti */
-  HB_TAG('F','A','T',' '),	/* Fanti */
-  HB_TAG('A','K','A',' '),	/* Fanti -> Akan */
-  HB_TAG('H','A','L',' '),	/* Halam (Falam Chin) (retired code) */
-  HB_TAG('Q','I','N',' '),	/* Falam Chin (retired code) -> Chin */
-  HB_TAG('F','M','P',' '),	/* Fe’fe’ */
-  HB_TAG('B','M','L',' '),	/* Fe'fe' -> Bamileke */
-  HB_TAG('F','T','A',' '),	/* Pular -> Futa */
-  HB_TAG('F','U','L',' '),	/* Pular -> Fulah */
-  HB_TAG('F','U','V',' '),	/* Nigerian Fulfulde */
-  HB_TAG('F','U','L',' '),	/* Nigerian Fulfulde -> Fulah */
-  HB_TAG('G','K','P',' '),	/* Guinea Kpelle -> Kpelle (Guinea) */
-  HB_TAG('K','P','L',' '),	/* Guinea Kpelle -> Kpelle */
-  HB_TAG('H','M','D',' '),	/* Large Flowery Miao -> A-Hmao */
-  HB_TAG('H','M','N',' '),	/* Large Flowery Miao -> Hmong */
-  HB_TAG('H','M','Z',' '),	/* Hmong Shua -> Hmong Shuat */
-  HB_TAG('H','M','N',' '),	/* Hmong Shua -> Hmong */
-  HB_TAG('H','A','R',' '),	/* Hadothi -> Harauti */
-  HB_TAG('R','A','J',' '),	/* Hadothi -> Rajasthani */
-  HB_TAG('I','N','U',' '),	/* Eastern Canadian Inuktitut -> Inuktitut */
-  HB_TAG('I','N','U','K'),	/* Eastern Canadian Inuktitut -> Nunavik Inuktitut */
-  HB_TAG('J','A','M',' '),	/* Jamaican Creole English -> Jamaican Creole */
-  HB_TAG('C','P','P',' '),	/* Jamaican Creole English -> Creoles */
-  HB_TAG('K','A','B','0'),	/* Kabyle */
-  HB_TAG('B','B','R',' '),	/* Kabyle -> Berber */
-  HB_TAG('K','H','K',' '),	/* Khanty -> Khanty-Kazim */
-  HB_TAG('K','H','S',' '),	/* Khanty -> Khanty-Shurishkar */
-  HB_TAG('K','H','V',' '),	/* Khanty -> Khanty-Vakhi */
-  HB_TAG('K','E','A',' '),	/* Kabuverdianu (Crioulo) */
-  HB_TAG('C','P','P',' '),	/* Kabuverdianu -> Creoles */
-  HB_TAG('K','E','K',' '),	/* Kekchi */
-  HB_TAG('M','Y','N',' '),	/* Kekchí -> Mayan */
-  HB_TAG('K','H','T',' '),	/* Khamti -> Khamti Shan */
-  HB_TAG('K','H','N',' '),	/* Khamti -> Khamti Shan (Microsoft fonts) */
-  HB_TAG('K','I','U',' '),	/* Kirmanjki */
-  HB_TAG('Z','Z','A',' '),	/* Kirmanjki -> Zazaki */
-  HB_TAG('K','J','P',' '),	/* Pwo Eastern Karen -> Eastern Pwo Karen */
-  HB_TAG('K','R','N',' '),	/* Pwo Eastern Karen -> Karen */
-  HB_TAG('K','O','P',' '),	/* Komi-Permyak */
-  HB_TAG('K','O','M',' '),	/* Komi-Permyak -> Komi */
-  HB_TAG('K','O','Z',' '),	/* Komi-Zyrian */
-  HB_TAG('K','O','M',' '),	/* Komi-Zyrian -> Komi */
-  HB_TAG('K','A','R',' '),	/* Karachay-Balkar -> Karachay */
-  HB_TAG('B','A','L',' '),	/* Karachay-Balkar -> Balkar */
-  HB_TAG('K','R','I',' '),	/* Krio */
-  HB_TAG('C','P','P',' '),	/* Krio -> Creoles */
-  HB_TAG('K','S','W',' '),	/* S’gaw Karen */
-  HB_TAG('K','R','N',' '),	/* S'gaw Karen -> Karen */
-  HB_TAG('K','V','Q',' '),	/* Geba Karen */
-  HB_TAG('K','R','N',' '),	/* Geba Karen -> Karen */
-  HB_TAG('K','Y','U',' '),	/* Western Kayah */
-  HB_TAG('K','R','N',' '),	/* Western Kayah -> Karen */
-  HB_TAG('M','I','Z',' '),	/* Lushai -> Mizo */
-  HB_TAG('Q','I','N',' '),	/* Lushai -> Chin */
-  HB_TAG('M','A','M',' '),	/* Mam */
-  HB_TAG('M','Y','N',' '),	/* Mam -> Mayan */
-  HB_TAG('M','L','Y',' '),	/* North Moluccan Malay -> Malay */
-  HB_TAG('C','P','P',' '),	/* North Moluccan Malay -> Creoles */
-  HB_TAG('M','F','A',' '),	/* Pattani Malay */
-  HB_TAG('M','L','Y',' '),	/* Pattani Malay -> Malay */
-  HB_TAG('M','F','E',' '),	/* Morisyen */
-  HB_TAG('C','P','P',' '),	/* Morisyen -> Creoles */
-  HB_TAG('M','I','N',' '),	/* Minangkabau */
-  HB_TAG('M','L','Y',' '),	/* Minangkabau -> Malay */
-  HB_TAG('M','L','N',' '),	/* Western Maninkakan -> Malinke */
-  HB_TAG('M','N','K',' '),	/* Western Maninkakan -> Maninka */
-  HB_TAG('M','N','D',' '),	/* Mandinka */
-  HB_TAG('M','N','K',' '),	/* Mandinka -> Maninka */
-  HB_TAG('M','O','N',' '),	/* Mon */
-  HB_TAG('M','O','N','T'),	/* Mon -> Thailand Mon */
-  HB_TAG('M','L','Y',' '),	/* Sabah Malay -> Malay */
-  HB_TAG('C','P','P',' '),	/* Sabah Malay -> Creoles */
-  HB_TAG('M','W','W',' '),	/* Hmong Daw */
-  HB_TAG('H','M','N',' '),	/* Hmong Daw -> Hmong */
-  HB_TAG('N','A','G',' '),	/* Naga Pidgin -> Naga-Assamese */
-  HB_TAG('C','P','P',' '),	/* Naga Pidgin -> Creoles */
-  HB_TAG('O','C','R',' '),	/* Severn Ojibwa -> Oji-Cree */
-  HB_TAG('O','J','B',' '),	/* Severn Ojibwa -> Ojibway */
-  HB_TAG('P','A','P','0'),	/* Papiamento -> Papiamentu */
-  HB_TAG('C','P','P',' '),	/* Papiamento -> Creoles */
-  HB_TAG('A','R','A',' '),	/* Sudanese Creole Arabic -> Arabic */
-  HB_TAG('C','P','P',' '),	/* Sudanese Creole Arabic -> Creoles */
-  HB_TAG('P','I','H',' '),	/* Pitcairn-Norfolk -> Norfolk */
-  HB_TAG('C','P','P',' '),	/* Pitcairn-Norfolk -> Creoles */
-  HB_TAG('P','O','H',' '),	/* Poqomchi' -> Pocomchi */
-  HB_TAG('M','Y','N',' '),	/* Poqomchi' -> Mayan */
-  HB_TAG('D','R','I',' '),	/* Dari */
-  HB_TAG('F','A','R',' '),	/* Dari -> Persian */
-  HB_TAG('P','W','O',' '),	/* Pwo Western Karen -> Western Pwo Karen */
-  HB_TAG('K','R','N',' '),	/* Pwo Western Karen -> Karen */
-  HB_TAG('Q','W','H',' '),	/* Huallaga Huánuco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Huallaga Huánuco Quechua -> Quechua */
-  HB_TAG('Q','U','C',' '),	/* K’iche’ */
-  HB_TAG('M','Y','N',' '),	/* K'iche' -> Mayan */
-  HB_TAG('Q','V','I',' '),	/* Calderón Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Calderón Highland Quichua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Chimborazo Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Chimborazo Highland Quichua -> Quechua */
-  HB_TAG('Q','U','H',' '),	/* South Bolivian Quechua -> Quechua (Bolivia) */
-  HB_TAG('Q','U','Z',' '),	/* South Bolivian Quechua -> Quechua */
-  HB_TAG('Q','U','H',' '),	/* North Bolivian Quechua -> Quechua (Bolivia) */
-  HB_TAG('Q','U','Z',' '),	/* North Bolivian Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Southern Pastaza Quechua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Southern Pastaza Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Yanahuanca Pasco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Yanahuanca Pasco Quechua -> Quechua */
-  HB_TAG('Q','U','H',' '),	/* Santiago del Estero Quichua -> Quechua (Bolivia) */
-  HB_TAG('Q','U','Z',' '),	/* Santiago del Estero Quichua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Tena Lowland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Tena Lowland Quichua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Yauyos Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Yauyos Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Ambo-Pasco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Ambo-Pasco Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Huamalíes-Dos de Mayo Huánuco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Huamalíes-Dos de Mayo Huánuco Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Imbabura Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Imbabura Highland Quichua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Loja Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Loja Highland Quichua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Cajatambo North Lima Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Cajatambo North Lima Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Margos-Yarowilca-Lauricocha Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Margos-Yarowilca-Lauricocha Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* North Junín Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* North Junín Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Napo Lowland Quechua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Napo Lowland Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Pacaraos Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Pacaraos Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Huaylla Wanca Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Huaylla Wanca Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Northern Pastaza Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Northern Pastaza Quichua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Corongo Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Corongo Ancash Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Huaylas Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Huaylas Ancash Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Sihuas Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Sihuas Ancash Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Chiquián Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Chiquián Ancash Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Chincha Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Chincha Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Panao Huánuco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Panao Huánuco Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Salasaca Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Salasaca Highland Quichua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Northern Conchucos Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Northern Conchucos Ancash Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Southern Conchucos Ancash Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Southern Conchucos Ancash Quechua -> Quechua */
-  HB_TAG('Q','V','I',' '),	/* Cañar Highland Quichua -> Quechua (Ecuador) */
-  HB_TAG('Q','U','Z',' '),	/* Cañar Highland Quichua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Santa Ana de Tusi Pasco Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Santa Ana de Tusi Pasco Quechua -> Quechua */
-  HB_TAG('Q','W','H',' '),	/* Jauja Wanca Quechua -> Quechua (Peru) */
-  HB_TAG('Q','U','Z',' '),	/* Jauja Wanca Quechua -> Quechua */
-  HB_TAG('R','I','F',' '),	/* Tarifit */
-  HB_TAG('B','B','R',' '),	/* Tarifit -> Berber */
-  HB_TAG('R','M','Y',' '),	/* Vlax Romani */
-  HB_TAG('R','O','Y',' '),	/* Vlax Romani -> Romany */
-  HB_TAG('S','C','S',' '),	/* North Slavey */
-  HB_TAG('S','L','A',' '),	/* North Slavey -> Slavey */
-  HB_TAG('A','T','H',' '),	/* North Slavey -> Athapaskan */
-  HB_TAG('S','F','M',' '),	/* Small Flowery Miao */
-  HB_TAG('H','M','N',' '),	/* Small Flowery Miao -> Hmong */
-  HB_TAG('S','H','I',' '),	/* Tachelhit */
-  HB_TAG('B','B','R',' '),	/* Tachelhit -> Berber */
-  HB_TAG('T','A','Q',' '),	/* Tamasheq */
-  HB_TAG('T','M','H',' '),	/* Tamasheq -> Tamashek */
-  HB_TAG('B','B','R',' '),	/* Tamasheq -> Berber */
-  HB_TAG('T','H','V',' '),	/* Tahaggart Tamahaq */
-  HB_TAG('T','M','H',' '),	/* Tahaggart Tamahaq -> Tamashek */
-  HB_TAG('B','B','R',' '),	/* Tahaggart Tamahaq -> Berber */
-  HB_TAG('T','H','Z',' '),	/* Tayart Tamajeq */
-  HB_TAG('T','M','H',' '),	/* Tayart Tamajeq -> Tamashek */
-  HB_TAG('B','B','R',' '),	/* Tayart Tamajeq -> Berber */
-  HB_TAG('T','M','H',' '),	/* Tamashek [macrolanguage] */
-  HB_TAG('B','B','R',' '),	/* Tamashek [macrolanguage] -> Berber */
-  HB_TAG('D','R','I',' '),	/* Tangshewi (retired code) -> Dari */
-  HB_TAG('F','A','R',' '),	/* Tangshewi (retired code) -> Persian */
-  HB_TAG('T','P','I',' '),	/* Tok Pisin */
-  HB_TAG('C','P','P',' '),	/* Tok Pisin -> Creoles */
-  HB_TAG('T','U','A',' '),	/* Turoyo -> Turoyo Aramaic */
-  HB_TAG('S','Y','R',' '),	/* Turoyo -> Syriac */
-  HB_TAG('T','T','Q',' '),	/* Tawallammat Tamajaq */
-  HB_TAG('T','M','H',' '),	/* Tawallammat Tamajaq -> Tamashek */
-  HB_TAG('B','B','R',' '),	/* Tawallammat Tamajaq -> Berber */
-  HB_TAG('T','Z','M',' '),	/* Central Atlas Tamazight -> Tamazight */
-  HB_TAG('B','B','R',' '),	/* Central Atlas Tamazight -> Berber */
-  HB_TAG('T','Z','O',' '),	/* Tzotzil */
-  HB_TAG('M','Y','N',' '),	/* Tzotzil -> Mayan */
-  HB_TAG('V','R','O',' '),	/* Võro */
-  HB_TAG('E','T','I',' '),	/* Võro -> Estonian */
-  HB_TAG('W','A','G',' '),	/* Wagdi */
-  HB_TAG('R','A','J',' '),	/* Wagdi -> Rajasthani */
-  HB_TAG('W','D','T',' '),	/* Wyandot (retired code) -> Wendat */
-  HB_TAG('W','Y','N',' '),	/* Wyandot (retired code) */
-  HB_TAG('K','L','M',' '),	/* Kalmyk */
-  HB_TAG('T','O','D',' '),	/* Kalmyk -> Todo */
-  HB_TAG('M','L','Y',' '),	/* Manado Malay -> Malay */
-  HB_TAG('C','P','P',' '),	/* Manado Malay -> Creoles */
-  HB_TAG('X','P','E',' '),	/* Liberia Kpelle -> Kpelle (Liberia) */
-  HB_TAG('K','P','L',' '),	/* Liberia Kpelle -> Kpelle */
-  HB_TAG('S','S','L',' '),	/* South Slavey */
-  HB_TAG('S','L','A',' '),	/* South Slavey -> Slavey */
-  HB_TAG('A','T','H',' '),	/* South Slavey -> Athapaskan */
-  HB_TAG('Z','G','H',' '),	/* Standard Moroccan Tamazight */
-  HB_TAG('B','B','R',' '),	/* Standard Moroccan Tamazight -> Berber */
-};
-
-static const LangTagRange ot_languages3_multi[] = {
-  {HB_TAG('a','c','f',' '),	0,	2},	/* Saint Lucian Creole French -> French Antillean */
-  {HB_TAG('a','c','r',' '),	2,	2},	/* Achi */
-  {HB_TAG('a','c','y',' '),	4,	2},	/* Cypriot Arabic */
-  {HB_TAG('a','i','i',' '),	6,	2},	/* Assyrian Neo-Aramaic -> Swadaya Aramaic */
-  {HB_TAG('a','k','b',' '),	8,	2},	/* Batak Angkola */
-  {HB_TAG('a','r','y',' '),	10,	2},	/* Moroccan Arabic -> Moroccan */
-  {HB_TAG('a','z','b',' '),	12,	2},	/* South Azerbaijani -> Torki */
-  {HB_TAG('b','b','c',' '),	14,	2},	/* Batak Toba */
-  {HB_TAG('b','g','q',' '),	16,	2},	/* Bagri */
-  {HB_TAG('b','l','k',' '),	18,	2},	/* Pa’o Karen */
-  {HB_TAG('b','t','d',' '),	20,	2},	/* Batak Dairi (Pakpak) */
-  {HB_TAG('b','t','m',' '),	22,	2},	/* Batak Mandailing */
-  {HB_TAG('b','t','s',' '),	24,	2},	/* Batak Simalungun */
-  {HB_TAG('b','t','x',' '),	26,	2},	/* Batak Karo */
-  {HB_TAG('b','t','z',' '),	28,	2},	/* Batak Alas-Kluet */
-  {HB_TAG('b','y','v',' '),	30,	2},	/* Medumba */
-  {HB_TAG('c','a','f',' '),	32,	2},	/* Southern Carrier -> Carrier */
-  {HB_TAG('c','a','k',' '),	34,	2},	/* Kaqchikel */
-  {HB_TAG('c','b','k',' '),	36,	2},	/* Chavacano -> Zamboanga Chavacano */
-  {HB_TAG('c','f','m',' '),	38,	2},	/* Halam (Falam Chin) */
-  {HB_TAG('c','h','m',' '),	40,	2},	/* Mari (Russia) [macrolanguage] -> High Mari */
-  {HB_TAG('c','h','p',' '),	42,	3},	/* Chipewyan */
-  {HB_TAG('c','q','u',' '),	45,	2},	/* Chilean Quechua (retired code) -> Quechua (Bolivia) */
-  {HB_TAG('c','r','j',' '),	47,	3},	/* Southern East Cree -> Eastern Cree */
-  {HB_TAG('c','r','k',' '),	50,	3},	/* Plains Cree -> West-Cree */
-  {HB_TAG('c','r','l',' '),	53,	3},	/* Northern East Cree -> Eastern Cree */
-  {HB_TAG('c','r','m',' '),	56,	3},	/* Moose Cree */
-  {HB_TAG('c','r','x',' '),	59,	2},	/* Carrier */
-  {HB_TAG('c','s','w',' '),	61,	3},	/* Swampy Cree -> N-Cree */
-  {HB_TAG('c','w','d',' '),	64,	3},	/* Woods Cree */
-  {HB_TAG('d','e','n',' '),	67,	2},	/* Slave (Athapascan) [macrolanguage] -> Slavey */
-  {HB_TAG('d','g','o',' '),	69,	2},	/* Dogri (individual language) */
-  {HB_TAG('d','i','q',' '),	71,	2},	/* Dimli */
-  {HB_TAG('d','r','w',' '),	73,	2},	/* Darwazi (retired code) -> Dari */
-  {HB_TAG('e','m','k',' '),	75,	2},	/* Eastern Maninkakan */
-  {HB_TAG('f','a','n',' '),	77,	2},	/* Fang (Equatorial Guinea) */
-  {HB_TAG('f','a','t',' '),	79,	2},	/* Fanti */
-  {HB_TAG('f','l','m',' '),	81,	2},	/* Halam (Falam Chin) (retired code) */
-  {HB_TAG('f','m','p',' '),	83,	2},	/* Fe’fe’ */
-  {HB_TAG('f','u','f',' '),	85,	2},	/* Pular -> Futa */
-  {HB_TAG('f','u','v',' '),	87,	2},	/* Nigerian Fulfulde */
-  {HB_TAG('g','k','p',' '),	89,	2},	/* Guinea Kpelle -> Kpelle (Guinea) */
-  {HB_TAG('h','m','d',' '),	91,	2},	/* Large Flowery Miao -> A-Hmao */
-  {HB_TAG('h','m','z',' '),	93,	2},	/* Hmong Shua -> Hmong Shuat */
-  {HB_TAG('h','o','j',' '),	95,	2},	/* Hadothi -> Harauti */
-  {HB_TAG('i','k','e',' '),	97,	2},	/* Eastern Canadian Inuktitut -> Inuktitut */
-  {HB_TAG('j','a','m',' '),	99,	2},	/* Jamaican Creole English -> Jamaican Creole */
-  {HB_TAG('k','a','b',' '),	101,	2},	/* Kabyle */
-  {HB_TAG('k','c','a',' '),	103,	3},	/* Khanty -> Khanty-Kazim */
-  {HB_TAG('k','e','a',' '),	106,	2},	/* Kabuverdianu (Crioulo) */
-  {HB_TAG('k','e','k',' '),	108,	2},	/* Kekchi */
-  {HB_TAG('k','h','t',' '),	110,	2},	/* Khamti -> Khamti Shan */
-  {HB_TAG('k','i','u',' '),	112,	2},	/* Kirmanjki */
-  {HB_TAG('k','j','p',' '),	114,	2},	/* Pwo Eastern Karen -> Eastern Pwo Karen */
-  {HB_TAG('k','o','i',' '),	116,	2},	/* Komi-Permyak */
-  {HB_TAG('k','p','v',' '),	118,	2},	/* Komi-Zyrian */
-  {HB_TAG('k','r','c',' '),	120,	2},	/* Karachay-Balkar -> Karachay */
-  {HB_TAG('k','r','i',' '),	122,	2},	/* Krio */
-  {HB_TAG('k','s','w',' '),	124,	2},	/* S’gaw Karen */
-  {HB_TAG('k','v','q',' '),	126,	2},	/* Geba Karen */
-  {HB_TAG('k','y','u',' '),	128,	2},	/* Western Kayah */
-  {HB_TAG('l','u','s',' '),	130,	2},	/* Lushai -> Mizo */
-  {HB_TAG('m','a','m',' '),	132,	2},	/* Mam */
-  {HB_TAG('m','a','x',' '),	134,	2},	/* North Moluccan Malay -> Malay */
-  {HB_TAG('m','f','a',' '),	136,	2},	/* Pattani Malay */
-  {HB_TAG('m','f','e',' '),	138,	2},	/* Morisyen */
-  {HB_TAG('m','i','n',' '),	140,	2},	/* Minangkabau */
-  {HB_TAG('m','l','q',' '),	142,	2},	/* Western Maninkakan -> Malinke */
-  {HB_TAG('m','n','k',' '),	144,	2},	/* Mandinka */
-  {HB_TAG('m','n','w',' '),	146,	2},	/* Mon */
-  {HB_TAG('m','s','i',' '),	148,	2},	/* Sabah Malay -> Malay */
-  {HB_TAG('m','w','w',' '),	150,	2},	/* Hmong Daw */
-  {HB_TAG('n','a','g',' '),	152,	2},	/* Naga Pidgin -> Naga-Assamese */
-  {HB_TAG('o','j','s',' '),	154,	2},	/* Severn Ojibwa -> Oji-Cree */
-  {HB_TAG('p','a','p',' '),	156,	2},	/* Papiamento -> Papiamentu */
-  {HB_TAG('p','g','a',' '),	158,	2},	/* Sudanese Creole Arabic -> Arabic */
-  {HB_TAG('p','i','h',' '),	160,	2},	/* Pitcairn-Norfolk -> Norfolk */
-  {HB_TAG('p','o','h',' '),	162,	2},	/* Poqomchi' -> Pocomchi */
-  {HB_TAG('p','r','s',' '),	164,	2},	/* Dari */
-  {HB_TAG('p','w','o',' '),	166,	2},	/* Pwo Western Karen -> Western Pwo Karen */
-  {HB_TAG('q','u','b',' '),	168,	2},	/* Huallaga Huánuco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','u','c',' '),	170,	2},	/* K’iche’ */
-  {HB_TAG('q','u','d',' '),	172,	2},	/* Calderón Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','u','g',' '),	174,	2},	/* Chimborazo Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','u','h',' '),	176,	2},	/* South Bolivian Quechua -> Quechua (Bolivia) */
-  {HB_TAG('q','u','l',' '),	178,	2},	/* North Bolivian Quechua -> Quechua (Bolivia) */
-  {HB_TAG('q','u','p',' '),	180,	2},	/* Southern Pastaza Quechua -> Quechua (Ecuador) */
-  {HB_TAG('q','u','r',' '),	182,	2},	/* Yanahuanca Pasco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','u','s',' '),	184,	2},	/* Santiago del Estero Quichua -> Quechua (Bolivia) */
-  {HB_TAG('q','u','w',' '),	186,	2},	/* Tena Lowland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','u','x',' '),	188,	2},	/* Yauyos Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','a',' '),	190,	2},	/* Ambo-Pasco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','h',' '),	192,	2},	/* Huamalíes-Dos de Mayo Huánuco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','i',' '),	194,	2},	/* Imbabura Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','v','j',' '),	196,	2},	/* Loja Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','v','l',' '),	198,	2},	/* Cajatambo North Lima Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','m',' '),	200,	2},	/* Margos-Yarowilca-Lauricocha Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','n',' '),	202,	2},	/* North Junín Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','o',' '),	204,	2},	/* Napo Lowland Quechua -> Quechua (Ecuador) */
-  {HB_TAG('q','v','p',' '),	206,	2},	/* Pacaraos Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','w',' '),	208,	2},	/* Huaylla Wanca Quechua -> Quechua (Peru) */
-  {HB_TAG('q','v','z',' '),	210,	2},	/* Northern Pastaza Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','w','a',' '),	212,	2},	/* Corongo Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','w','h',' '),	214,	2},	/* Huaylas Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','w','s',' '),	216,	2},	/* Sihuas Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','a',' '),	218,	2},	/* Chiquián Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','c',' '),	220,	2},	/* Chincha Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','h',' '),	222,	2},	/* Panao Huánuco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','l',' '),	224,	2},	/* Salasaca Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','x','n',' '),	226,	2},	/* Northern Conchucos Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','o',' '),	228,	2},	/* Southern Conchucos Ancash Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','r',' '),	230,	2},	/* Cañar Highland Quichua -> Quechua (Ecuador) */
-  {HB_TAG('q','x','t',' '),	232,	2},	/* Santa Ana de Tusi Pasco Quechua -> Quechua (Peru) */
-  {HB_TAG('q','x','w',' '),	234,	2},	/* Jauja Wanca Quechua -> Quechua (Peru) */
-  {HB_TAG('r','i','f',' '),	236,	2},	/* Tarifit */
-  {HB_TAG('r','m','y',' '),	238,	2},	/* Vlax Romani */
-  {HB_TAG('s','c','s',' '),	240,	3},	/* North Slavey */
-  {HB_TAG('s','f','m',' '),	243,	2},	/* Small Flowery Miao */
-  {HB_TAG('s','h','i',' '),	245,	2},	/* Tachelhit */
-  {HB_TAG('t','a','q',' '),	247,	3},	/* Tamasheq */
-  {HB_TAG('t','h','v',' '),	250,	3},	/* Tahaggart Tamahaq */
-  {HB_TAG('t','h','z',' '),	253,	3},	/* Tayart Tamajeq */
-  {HB_TAG('t','m','h',' '),	256,	2},	/* Tamashek [macrolanguage] */
-  {HB_TAG('t','n','f',' '),	258,	2},	/* Tangshewi (retired code) -> Dari */
-  {HB_TAG('t','p','i',' '),	260,	2},	/* Tok Pisin */
-  {HB_TAG('t','r','u',' '),	262,	2},	/* Turoyo -> Turoyo Aramaic */
-  {HB_TAG('t','t','q',' '),	264,	3},	/* Tawallammat Tamajaq */
-  {HB_TAG('t','z','m',' '),	267,	2},	/* Central Atlas Tamazight -> Tamazight */
-  {HB_TAG('t','z','o',' '),	269,	2},	/* Tzotzil */
-  {HB_TAG('v','r','o',' '),	271,	2},	/* Võro */
-  {HB_TAG('w','b','r',' '),	273,	2},	/* Wagdi */
-  {HB_TAG('w','y','a',' '),	275,	2},	/* Wyandot (retired code) -> Wendat */
-  {HB_TAG('x','a','l',' '),	277,	2},	/* Kalmyk */
-  {HB_TAG('x','m','m',' '),	279,	2},	/* Manado Malay -> Malay */
-  {HB_TAG('x','p','e',' '),	281,	2},	/* Liberia Kpelle -> Kpelle (Liberia) */
-  {HB_TAG('x','s','l',' '),	283,	3},	/* South Slavey */
-  {HB_TAG('z','g','h',' '),	286,	2},	/* Standard Moroccan Tamazight */
-};
 #endif
 
 /**
@@ -3123,7 +3205,7 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
   case HB_TAG('Z','H','T','M'):  /* Chinese, Traditional, Macao SAR */
     return hb_language_from_string ("zh-MO", -1);  /* Chinese [macrolanguage]; Macao */
   case HB_TAG('Z','Z','A',' '):  /* Zazaki */
-    return hb_language_from_string ("zza", -1);  /* Zaza [macrolanguage] */
+    return hb_language_from_string ("zza", -1);  /* Zazaki [macrolanguage] */
   default:
     return HB_LANGUAGE_INVALID;
   }
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-tag.cc b/engine/thirdparty/harfbuzz/src/hb-ot-tag.cc
index 900f37ab..b70db154 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-tag.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-tag.cc
@@ -234,29 +234,6 @@ lang_matches (const char *lang_str,
 	 (lang_str[spec_len] == '\0' || lang_str[spec_len] == '-');
 }
 
-static bool
-bfind_tag (const hb_tag_t *array,
-	   unsigned        len,
-	   hb_tag_t        key)
-{
-  unsigned min = 0;
-  unsigned max = len;
-
-  while (min < max)
-  {
-    unsigned mid = min + (max - min) / 2;
-    hb_tag_t val = array[mid];
-    if (key < val)
-      max = mid;
-    else if (key > val)
-      min = mid + 1;
-    else
-      return true;
-  }
-
-  return false;
-}
-
 struct LangTag
 {
   hb_tag_t language;
@@ -270,20 +247,6 @@ struct LangTag
   { return cmp (that->language); }
 };
 
-struct LangTagRange
-{
-  hb_tag_t language;
-  uint16_t offset;
-  uint8_t count;
-
-  int cmp (hb_tag_t a) const
-  {
-    return a < this->language ? -1 : a > this->language ? +1 : 0;
-  }
-  int cmp (const LangTagRange *that) const
-  { return cmp (that->language); }
-};
-
 #include "hb-ot-tag-table.hh"
 
 /* The corresponding languages IDs for the following IDs are unclear,
@@ -344,84 +307,46 @@ hb_ot_tags_from_language (const char   *lang_str,
 	lang_str = s + 1;
     }
 #endif
+    const LangTag *ot_languages = nullptr;
+    unsigned ot_languages_len = 0;
     const char *dash = strchr (lang_str, '-');
     unsigned first_len = dash ? dash - lang_str : limit - lang_str;
-    hb_tag_t lang_tag = hb_tag_from_string (lang_str, first_len);
-
     if (first_len == 2)
     {
-      static hb_atomic_t<unsigned> last_tag_idx_2 = 0; /* Poor man's cache. */
-      unsigned tag_idx = last_tag_idx_2;
-
-      if (likely (tag_idx < ARRAY_LENGTH (ot_languages2) &&
-		  ot_languages2[tag_idx].language == lang_tag) ||
-	  hb_sorted_array (ot_languages2).bfind (lang_tag, &tag_idx))
-      {
-	last_tag_idx_2 = tag_idx;
-	unsigned int i;
-	while (tag_idx != 0 &&
-	       ot_languages2[tag_idx].language == ot_languages2[tag_idx - 1].language)
-	  tag_idx--;
-	for (i = 0;
-	     i < *count &&
-	     tag_idx + i < ARRAY_LENGTH (ot_languages2) &&
-	     ot_languages2[tag_idx + i].tag != HB_TAG_NONE &&
-	     ot_languages2[tag_idx + i].language == ot_languages2[tag_idx].language;
-	     i++)
-	  tags[i] = ot_languages2[tag_idx + i].tag;
-	*count = i;
-	return;
-      }
+      ot_languages = ot_languages2;
+      ot_languages_len = ARRAY_LENGTH (ot_languages2);
     }
 #ifndef HB_NO_LANGUAGE_LONG
     else if (first_len == 3)
     {
-      static hb_atomic_t<unsigned> last_tag_idx_3 = 0; /* Poor man's cache. */
-      unsigned tag_idx = last_tag_idx_3;
-
-      if (likely (tag_idx < ARRAY_LENGTH (ot_languages3) &&
-		  ot_languages3[tag_idx].language == lang_tag) ||
-	  hb_sorted_array (ot_languages3).bfind (lang_tag, &tag_idx))
-      {
-	last_tag_idx_3 = tag_idx;
-	if (*count)
-	{
-	  tags[0] = ot_languages3[tag_idx].tag;
-	  *count = 1;
-	}
-	else
-	  *count = 0;
-	return;
-      }
-
-      static hb_atomic_t<unsigned> last_tag_idx_3_multi = 0; /* Poor man's cache. */
-      unsigned multi_tag_idx = last_tag_idx_3_multi;
-
-      if (likely (multi_tag_idx < ARRAY_LENGTH (ot_languages3_multi) &&
-		  ot_languages3_multi[multi_tag_idx].language == lang_tag) ||
-	  hb_sorted_array (ot_languages3_multi).bfind (lang_tag, &multi_tag_idx))
-      {
-	last_tag_idx_3_multi = multi_tag_idx;
-	const LangTagRange &range = ot_languages3_multi[multi_tag_idx];
-	unsigned int i;
-	for (i = 0; i < *count && i < range.count; i++)
-	  tags[i] = ot_languages3_multi_values[range.offset + i];
-	*count = i;
-	return;
-      }
-
-      if (bfind_tag (ot_languages3_blocked, ARRAY_LENGTH (ot_languages3_blocked), lang_tag))
-      {
-	*count = 0;
-	return;
-      }
-
-      /* Assume it's ISO-639-3 and upper-case and use it. */
-      tags[0] = lang_tag & ~0x20202000u;
-      *count = 1;
-      return;
+      ot_languages = ot_languages3;
+      ot_languages_len = ARRAY_LENGTH (ot_languages3);
     }
 #endif
+
+    hb_tag_t lang_tag = hb_tag_from_string (lang_str, first_len);
+
+    static hb_atomic_t<unsigned> last_tag_idx = 0; /* Poor man's cache. */
+    unsigned tag_idx = last_tag_idx;
+
+    if (likely (tag_idx < ot_languages_len && ot_languages[tag_idx].language == lang_tag) ||
+	hb_sorted_array (ot_languages, ot_languages_len).bfind (lang_tag, &tag_idx))
+    {
+      last_tag_idx = tag_idx;
+      unsigned int i;
+      while (tag_idx != 0 &&
+	     ot_languages[tag_idx].language == ot_languages[tag_idx - 1].language)
+	tag_idx--;
+      for (i = 0;
+	   i < *count &&
+	   tag_idx + i < ot_languages_len &&
+	   ot_languages[tag_idx + i].tag != HB_TAG_NONE &&
+	   ot_languages[tag_idx + i].language == ot_languages[tag_idx].language;
+	   i++)
+	tags[i] = ot_languages[tag_idx + i].tag;
+      *count = i;
+      return;
+    }
   }
 
 #ifndef HB_NO_LANGUAGE_LONG
@@ -600,13 +525,6 @@ hb_ot_tag_to_language (hb_tag_t tag)
       hb_tag_to_string (ot_languages3[i].language, buf);
       return hb_language_from_string (buf, 3);
     }
-  for (i = 0; i < ARRAY_LENGTH (ot_languages3_multi); i++)
-    for (unsigned int j = 0; j < ot_languages3_multi[i].count; j++)
-      if (ot_languages3_multi_values[ot_languages3_multi[i].offset + j] == tag)
-      {
-	hb_tag_to_string (ot_languages3_multi[i].language, buf);
-	return hb_language_from_string (buf, 3);
-      }
 #endif
 
   /* Return a custom language in the form of "x-hbot-AABBCCDD".
@@ -724,23 +642,6 @@ test_langs_sorted ()
       abort();
     }
   }
-  for (unsigned int i = 1; i < ARRAY_LENGTH (ot_languages3_multi); i++)
-  {
-    int c = ot_languages3_multi[i].cmp (&ot_languages3_multi[i - 1]);
-    if (c > 0)
-    {
-      fprintf (stderr, "ot_languages3_multi not sorted at index %u: %08x %d %08x\n",
-	       i, ot_languages3_multi[i-1].language, c, ot_languages3_multi[i].language);
-      abort();
-    }
-  }
-  for (unsigned int i = 1; i < ARRAY_LENGTH (ot_languages3_blocked); i++)
-    if (ot_languages3_blocked[i] < ot_languages3_blocked[i - 1])
-    {
-      fprintf (stderr, "ot_languages3_blocked not sorted at index %u: %08x < %08x\n",
-	       i, ot_languages3_blocked[i], ot_languages3_blocked[i - 1]);
-      abort();
-    }
 #endif
 }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-avar-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-avar-table.hh
index 98ce46e6..71aed2e8 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-avar-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-avar-table.hh
@@ -411,56 +411,6 @@ struct avar
 #endif
   }
 
-  bool has_v2_data () const { return version.major > 1; }
-
-  // axis normalization is done in 2.14 here
-  // TODO: deprecate this API once fonttools is updated to use 16.16 normalization
-  bool map_coords_2_14 (float *coords, unsigned int coords_length) const
-  {
-    hb_vector_t<int> coords_2_14;
-    if (!coords_2_14.resize (coords_length)) return false;
-    unsigned int count = hb_min (coords_length, axisCount);
-
-    const SegmentMaps *map = &firstAxisSegmentMaps;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      int v = roundf (map->map_float (coords[i]) * 16384.f);
-      coords_2_14[i] = v;
-      coords[i] = v / 16384.f;
-      map = &StructAfter<SegmentMaps> (*map);
-    }
-
-#ifndef HB_NO_AVAR2
-    if (version.major < 2)
-      return true;
-    hb_barrier ();
-
-    for (; count < axisCount; count++)
-      map = &StructAfter<SegmentMaps> (*map);
-
-    const auto &v2 = * (const avarV2Tail *) map;
-
-    const auto &varidx_map = this+v2.varIdxMap;
-    const auto &var_store = this+v2.varStore;
-    auto *var_store_cache = var_store.create_cache ();
-
-    for (unsigned i = 0; i < coords_length; i++)
-    {
-      int v = coords_2_14[i];
-      uint32_t varidx = varidx_map.map (i);
-      float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache);
-      v += roundf (delta);
-      v = hb_clamp (v, -(1<<16), +(1<<16));
-      coords[i] = v / 16384.f;
-    }
-
-    OT::ItemVariationStore::destroy_cache (var_store_cache);
-    return true;
-#else
-    return version.major < 2;
-#endif
-  }
-
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
index 74ce1b28..a8c8858e 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
@@ -40,22 +40,13 @@ using rebase_tent_result_scratch_t = hb_pair_t<rebase_tent_result_t, rebase_tent
 struct TupleVariationHeader
 {
   friend struct tuple_delta_t;
-  unsigned get_size (unsigned axis_count_times_2) const
-  {
-    // This function is super hot in mega-var-fonts with hundreds of masters.
-    unsigned ti = tupleIndex;
-    if (unlikely ((ti & (TupleIndex::EmbeddedPeakTuple | TupleIndex::IntermediateRegion))))
-    {
-      unsigned count = ((ti & TupleIndex::EmbeddedPeakTuple) != 0) + ((ti & TupleIndex::IntermediateRegion) != 0) * 2;
-      return min_size + count * axis_count_times_2;
-    }
-    return min_size;
-  }
+  unsigned get_size (unsigned axis_count) const
+  { return min_size + get_all_tuples (axis_count).get_size (); }
 
   unsigned get_data_size () const { return varDataSize; }
 
-  const TupleVariationHeader &get_next (unsigned axis_count_times_2) const
-  { return StructAtOffset<TupleVariationHeader> (this, get_size (axis_count_times_2)); }
+  const TupleVariationHeader &get_next (unsigned axis_count) const
+  { return StructAtOffset<TupleVariationHeader> (this, get_size (axis_count)); }
 
   bool unpack_axis_tuples (unsigned axis_count,
                            const hb_array_t<const F2DOT14> shared_tuples,
@@ -118,26 +109,23 @@ struct TupleVariationHeader
 
     const F2DOT14 *peak_tuple;
 
-    bool has_interm = tuple_index & TupleIndex::IntermediateRegion; // Inlined for performance
+    bool has_interm = tuple_index & TuppleIndex::IntermediateRegion; // Inlined for performance
+    if (unlikely (has_interm))
+      shared_tuple_scalar_cache = nullptr;
 
-    if (unlikely (tuple_index & TupleIndex::EmbeddedPeakTuple)) // Inlined for performance
+    if (unlikely (tuple_index & TuppleIndex::EmbeddedPeakTuple)) // Inlined for performance
     {
       peak_tuple = get_peak_tuple (coord_count);
       shared_tuple_scalar_cache = nullptr;
     }
     else
     {
-      unsigned int index = tuple_index & TupleIndex::TupleIndexMask; // Inlined for performance
+      unsigned int index = tuple_index & TuppleIndex::TupleIndexMask; // Inlined for performance
 
       float scalar;
       if (shared_tuple_scalar_cache &&
 	  shared_tuple_scalar_cache->get (index, &scalar))
-      {
-        if (has_interm && (scalar != 0 && scalar != 1.f))
-	  shared_tuple_scalar_cache = nullptr;
-	else
-	  return (double) scalar;
-      }
+	return (double) scalar;
 
       if (unlikely ((index + 1) * coord_count > shared_tuples.length))
         return 0.0;
@@ -155,27 +143,8 @@ struct TupleVariationHeader
     }
 
     double scalar = 1.0;
-#ifndef HB_OPTIMIZE_SIZE
-#if HB_FAST_NUM_ACCESS
-    bool skip = coord_count >= 16;
-#endif
-#endif
     for (unsigned int i = 0; i < coord_count; i++)
     {
-#ifndef HB_OPTIMIZE_SIZE
-#if HB_FAST_NUM_ACCESS
-      if (skip)
-      {
-	while (i + 4 <= coord_count && * (HBUINT64LE *) &peak_tuple[i] == 0)
-	  i += 4;
-	while (i < coord_count && peak_tuple[i].to_int () == 0)
-	  i += 1;
-	if (i >= coord_count)
-	  break;
-      }
-#endif
-#endif
-
       int peak = peak_tuple[i].to_int ();
       if (!peak) continue;
 
@@ -185,7 +154,6 @@ struct TupleVariationHeader
 
       if (has_interm)
       {
-	shared_tuple_scalar_cache = nullptr;
         int start = start_tuple[i].to_int ();
         int end = end_tuple[i].to_int ();
         if (unlikely (start > peak || peak > end ||
@@ -205,13 +173,13 @@ struct TupleVariationHeader
     return scalar;
   }
 
-  bool           has_peak () const { return tupleIndex & TupleIndex::EmbeddedPeakTuple; }
-  bool   has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; }
-  bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; }
-  unsigned      get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; }
+  bool           has_peak () const { return tupleIndex & TuppleIndex::EmbeddedPeakTuple; }
+  bool   has_intermediate () const { return tupleIndex & TuppleIndex::IntermediateRegion; }
+  bool has_private_points () const { return tupleIndex & TuppleIndex::PrivatePointNumbers; }
+  unsigned      get_index () const { return tupleIndex & TuppleIndex::TupleIndexMask; }
 
   protected:
-  struct TupleIndex : HBUINT16
+  struct TuppleIndex : HBUINT16
   {
     enum Flags {
       EmbeddedPeakTuple   = 0x8000u,
@@ -220,7 +188,7 @@ struct TupleVariationHeader
       TupleIndexMask      = 0x0FFFu
     };
 
-    TupleIndex& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; }
+    TuppleIndex& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; }
     DEFINE_SIZE_STATIC (2);
   };
 
@@ -237,7 +205,7 @@ struct TupleVariationHeader
 
   HBUINT16      varDataSize;    /* The size in bytes of the serialized
                                  * data for this tuple variation table. */
-  TupleIndex    tupleIndex;     /* A packed field. The high 4 bits are flags (see below).
+  TuppleIndex   tupleIndex;     /* A packed field. The high 4 bits are flags (see below).
                                    The low 12 bits are an index into a shared tuple
                                    records array. */
   /* UnsizedArrayOf<F2DOT14> peakTuple - optional */
@@ -320,13 +288,13 @@ struct tuple_delta_t
   void copy_from (const tuple_delta_t& o, hb_alloc_pool_t *pool = nullptr)
   {
     axis_tuples = o.axis_tuples;
-    indices.duplicate_vector_from_pool (pool, o.indices);
-    deltas_x.duplicate_vector_from_pool (pool, o.deltas_x);
-    deltas_y.duplicate_vector_from_pool (pool, o.deltas_y);
-    compiled_tuple_header.duplicate_vector_from_pool (pool, o.compiled_tuple_header);
-    compiled_deltas.duplicate_vector_from_pool (pool, o.compiled_deltas);
-    compiled_peak_coords.duplicate_vector_from_pool (pool, o.compiled_peak_coords);
-    compiled_interm_coords.duplicate_vector_from_pool (pool, o.compiled_interm_coords);
+    indices.allocate_from_pool (pool, o.indices);
+    deltas_x.allocate_from_pool (pool, o.deltas_x);
+    deltas_y.allocate_from_pool (pool, o.deltas_y);
+    compiled_tuple_header.allocate_from_pool (pool, o.compiled_tuple_header);
+    compiled_deltas.allocate_from_pool (pool, o.compiled_deltas);
+    compiled_peak_coords.allocate_from_pool (pool, o.compiled_peak_coords);
+    compiled_interm_coords.allocate_from_pool (pool, o.compiled_interm_coords);
   }
 
   void remove_axis (hb_tag_t axis_tag)
@@ -409,13 +377,6 @@ struct tuple_delta_t
       return;
     }
 
-    if (!axis_limit.is_point () &&
-        !(-1.0 <= axis_limit.minimum &&
-          axis_limit.minimum <= axis_limit.middle &&
-          axis_limit.middle <= axis_limit.maximum &&
-          axis_limit.maximum <= +1.0))
-      return;
-
     rebase_tent_result_t &solutions = scratch.first;
     rebase_tent (*tent, axis_limit, axis_triple_distances, solutions, scratch.second);
     for (unsigned i = 0; i < solutions.length; i++)
@@ -554,7 +515,7 @@ struct tuple_delta_t
 
     /* pointdata length = 0 implies "use shared points" */
     if (points_data_length)
-      flag |= TupleVariationHeader::TupleIndex::PrivatePointNumbers;
+      flag |= TupleVariationHeader::TuppleIndex::PrivatePointNumbers;
 
     unsigned serialized_data_size = points_data_length + compiled_deltas.length;
     TupleVariationHeader *o = reinterpret_cast<TupleVariationHeader *> (compiled_tuple_header.begin ());
@@ -570,7 +531,7 @@ struct tuple_delta_t
                                unsigned& flag) const
   {
     hb_memcpy (&peak_coords[0], &compiled_peak_coords[0], compiled_peak_coords.length * sizeof (compiled_peak_coords[0]));
-    flag |= TupleVariationHeader::TupleIndex::EmbeddedPeakTuple;
+    flag |= TupleVariationHeader::TuppleIndex::EmbeddedPeakTuple;
     return compiled_peak_coords.length;
   }
 
@@ -581,7 +542,7 @@ struct tuple_delta_t
     if (compiled_interm_coords)
     {
       hb_memcpy (&coords[0], &compiled_interm_coords[0], compiled_interm_coords.length * sizeof (compiled_interm_coords[0]));
-      flag |= TupleVariationHeader::TupleIndex::IntermediateRegion;
+      flag |= TupleVariationHeader::TuppleIndex::IntermediateRegion;
     }
     return compiled_interm_coords.length;
   }
@@ -934,15 +895,15 @@ struct TupleVariationData
     return_trace (c->check_struct (this));
   }
 
-  unsigned get_size (unsigned axis_count_times_2) const
+  unsigned get_size (unsigned axis_count) const
   {
     unsigned total_size = min_size;
     unsigned count = tupleVarCount.get_count ();
     const TupleVariationHeader *tuple_var_header = &(get_tuple_var_header());
     for (unsigned i = 0; i < count; i++)
     {
-      total_size += tuple_var_header->get_size (axis_count_times_2) + tuple_var_header->get_data_size ();
-      tuple_var_header = &tuple_var_header->get_next (axis_count_times_2);
+      total_size += tuple_var_header->get_size (axis_count) + tuple_var_header->get_data_size ();
+      tuple_var_header = &tuple_var_header->get_next (axis_count);
     }
 
     return total_size;
@@ -1437,7 +1398,6 @@ struct TupleVariationData
       var_data = var_data_bytes_.as<TupleVariationData> ();
       tuples_left = var_data->tupleVarCount.get_count ();
       axis_count = axis_count_;
-      axis_count_times_2 = axis_count_ * 2;
       current_tuple = &var_data->get_tuple_var_header ();
       data_offset = 0;
       table_base = table_base_;
@@ -1461,11 +1421,11 @@ struct TupleVariationData
 	return false;
 
       current_tuple_size = TupleVariationHeader::min_size;
-      if (unlikely (!var_data_bytes.check_end ((const char *) current_tuple + current_tuple_size)))
+      if (unlikely (!var_data_bytes.check_range (current_tuple, current_tuple_size)))
 	return false;
 
-      current_tuple_size = current_tuple->get_size (axis_count_times_2);
-      if (unlikely (!var_data_bytes.check_end ((const char *) current_tuple + current_tuple_size)))
+      current_tuple_size = current_tuple->get_size (axis_count);
+      if (unlikely (!var_data_bytes.check_range (current_tuple, current_tuple_size)))
 	return false;
 
       return true;
@@ -1488,7 +1448,6 @@ struct TupleVariationData
     signed tuples_left;
     const TupleVariationData *var_data;
     unsigned int axis_count;
-    unsigned int axis_count_times_2;
     unsigned int data_offset;
     unsigned int current_tuple_size;
     const void *table_base;
@@ -1564,7 +1523,6 @@ struct TupleVariationData
   }
 
   template <typename T>
-  HB_ALWAYS_INLINE
   static bool decompile_deltas (const HBUINT8 *&p /* IN/OUT */,
 				hb_vector_t<T> &deltas /* IN/OUT */,
 				const HBUINT8 *end,
@@ -1707,16 +1665,6 @@ struct item_variations_t
   const hb_map_t& get_varidx_map () const
   { return varidx_map; }
 
-  bool add_vardata_encoding_for_testing (hb_vector_t<const hb_vector_t<int>*> &&rows,
-                                         unsigned num_cols)
-  {
-    encodings.push (delta_row_encoding_t (std::move (rows), num_cols));
-    return !encodings.in_error ();
-  }
-
-  bool compile_varidx_map_for_testing (const hb_hashmap_t<unsigned, const hb_vector_t<int>*>& front_mapping)
-  { return compile_varidx_map (front_mapping); }
-
   bool instantiate (const ItemVariationStore& varStore,
                     const hb_subset_plan_t *plan,
                     bool optimize=true,
@@ -2063,46 +2011,27 @@ struct item_variations_t
   {
     /* full encoding_row -> new VarIdxes mapping */
     hb_hashmap_t<const hb_vector_t<int>*, unsigned> back_mapping;
-    hb_vector_t<delta_row_encoding_t> split_encodings;
 
-    for (unsigned i = 0; i < encodings.length; i++)
+    for (unsigned major = 0; major < encodings.length; major++)
     {
-      delta_row_encoding_t& encoding = encodings[i];
+      delta_row_encoding_t& encoding = encodings[major];
       /* just sanity check, this shouldn't happen */
       if (encoding.is_empty ())
         return false;
 
       unsigned num_rows = encoding.items.length;
-      unsigned num_cols = encoding.chars.length;
 
       /* sort rows, make result deterministic */
       encoding.items.qsort (_cmp_row);
 
-      for (unsigned start = 0; start < num_rows; start += 0xFFFFu)
+      /* compile old to new var_idxes mapping */
+      for (unsigned minor = 0; minor < num_rows; minor++)
       {
-        unsigned chunk_len = hb_min (num_rows - start, 0xFFFFu);
-        hb_vector_t<const hb_vector_t<int>*> rows;
-
-        if (!rows.alloc (chunk_len))
-          return false;
-
-        unsigned major = split_encodings.length;
-        for (unsigned minor = 0; minor < chunk_len; minor++)
-        {
-          const hb_vector_t<int> *row = encoding.items.arrayZ[start + minor];
-          rows.push (row);
-          if (!back_mapping.set (row, (major << 16) + minor))
-            return false;
-        }
-
-        split_encodings.push (delta_row_encoding_t (std::move (rows), num_cols));
+        unsigned new_varidx = (major << 16) + minor;
+        back_mapping.set (encoding.items.arrayZ[minor], new_varidx);
       }
     }
 
-    encodings = std::move (split_encodings);
-    if (encodings.in_error () || back_mapping.in_error ())
-      return false;
-
     for (auto _ : front_mapping.iter ())
     {
       unsigned old_varidx = _.first;
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
index 358a9553..7fb762f2 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
@@ -84,7 +84,7 @@ struct cvar
     if (!coords) return true;
     hb_vector_t<unsigned> shared_indices;
     TupleVariationData<>::tuple_iterator_t iterator;
-    unsigned var_data_length = tuple_var_data->get_size (axis_count * 2);
+    unsigned var_data_length = tuple_var_data->get_size (axis_count);
     hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast<const char*> (tuple_var_data), var_data_length);
     if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base,
                                                  shared_indices, &iterator))
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
index a4959dbc..8fea512a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
@@ -448,18 +448,10 @@ struct gvar_GVAR
     if (it->first == 0 && !(c->plan->flags & HB_SUBSET_FLAGS_NOTDEF_OUTLINE))
       it++;
     unsigned int subset_data_size = 0;
-    unsigned padding_size = 0;
     for (auto &_ : it)
     {
       hb_codepoint_t old_gid = _.second;
-      unsigned glyph_data_size = get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
-      if (glyph_data_size % 2)
-      {
-        glyph_data_size++;
-        padding_size++;
-      }
-
-      subset_data_size += glyph_data_size;
+      subset_data_size += get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
     }
 
     /* According to the spec: If the short format (Offset16) is used for offsets,
@@ -488,8 +480,6 @@ struct gvar_GVAR
 
     /* This ordering relative to the shared tuples array, which puts the glyphVariationData
        last in the table, is required when HB_SUBSET_FLAGS_IFTB_REQUIREMENTS is set */
-    if (long_offset)
-      subset_data_size -= padding_size;
     char *subset_data = c->serializer->allocate_size<char> (subset_data_size, false);
     if (!subset_data) return_trace (false);
     out->dataZ = subset_data - (char *) out;
@@ -528,16 +518,8 @@ struct gvar_GVAR
 							    old_gid);
 
       hb_memcpy (subset_data, var_data_bytes.arrayZ, var_data_bytes.length);
-      unsigned glyph_data_size = var_data_bytes.length;
-      subset_data += glyph_data_size;
-      glyph_offset += glyph_data_size;
-
-      if (!long_offset && (glyph_data_size % 2))
-      {
-        *subset_data = 0;
-        subset_data++;
-        glyph_offset++;
-      }
+      subset_data += var_data_bytes.length;
+      glyph_offset += var_data_bytes.length;
 
       if (long_offset)
 	((HBUINT32 *) subset_offsets)[gid] = glyph_offset;
@@ -634,83 +616,6 @@ struct gvar_GVAR
     static unsigned int next_index (unsigned int i, unsigned int start, unsigned int end)
     { return (i >= end) ? start : (i + 1); }
 
-#ifndef HB_OPTIMIZE_SIZE
-    template <bool is_x>
-#endif
-    static bool decompile_deltas_add_to_points (const HBUINT8 *&p /* IN/OUT */,
-						hb_array_t<contour_point_t> points,
-						float scalar,
-						const HBUINT8 *end,
-						unsigned start
-#ifdef HB_OPTIMIZE_SIZE
-						, bool is_x
-#endif
-						)
-    {
-      unsigned i = 0;
-      unsigned count = points.length;
-      while (i < count)
-      {
-	if (unlikely (p + 1 > end)) return false;
-	unsigned control = *p++;
-	unsigned run_count = (control & TupleValues::VALUE_RUN_COUNT_MASK) + 1;
-	unsigned stop = i + run_count;
-	if (unlikely (stop > count)) return false;
-
-	unsigned skip = i < start ? hb_min (start - i, run_count) : 0;
-	i += skip;
-
-	switch (control & TupleValues::VALUES_SIZE_MASK)
-	{
-	  case TupleValues::VALUES_ARE_ZEROS:
-	    i = stop;
-	    break;
-	  case TupleValues::VALUES_ARE_WORDS:
-	  {
-	    if (unlikely (p + run_count * HBINT16::static_size > end)) return false;
-	    p += skip * HBINT16::static_size;
-	    const auto *pp = (const HBINT16 *) p;
-	    for (; i < stop; i++)
-	    {
-	      float v = *pp++ * scalar;
-	      if (is_x) points.arrayZ[i].x += v;
-	      else points.arrayZ[i].y += v;
-	    }
-	    p = (const HBUINT8 *) pp;
-	  }
-	  break;
-	  case TupleValues::VALUES_ARE_LONGS:
-	  {
-	    if (unlikely (p + run_count * HBINT32::static_size > end)) return false;
-	    p += skip * HBINT32::static_size;
-	    const auto *pp = (const HBINT32 *) p;
-	    for (; i < stop; i++)
-	    {
-	      float v = *pp++ * scalar;
-	      if (is_x) points.arrayZ[i].x += v;
-	      else points.arrayZ[i].y += v;
-	    }
-	    p = (const HBUINT8 *) pp;
-	  }
-	  break;
-	  case TupleValues::VALUES_ARE_BYTES:
-	  {
-	    if (unlikely (p + run_count > end)) return false;
-	    p += skip * HBINT8::static_size;
-	    const auto *pp = (const HBINT8 *) p;
-	    for (; i < stop; i++)
-	    {
-	      float v = *pp++ * scalar;
-	      if (is_x) points.arrayZ[i].x += v;
-	      else points.arrayZ[i].y += v;
-	    }
-	    p = (const HBUINT8 *) pp;
-	  }
-	  break;
-	}
-      }
-      return true;
-    }
     public:
     bool apply_deltas_to_points (hb_codepoint_t glyph,
 				 hb_array_t<const int> coords,
@@ -733,9 +638,6 @@ struct gvar_GVAR
 						   shared_indices, &iterator))
 	return true; /* so isn't applied at all */
 
-      bool any_private_points = false;
-      bool private_points_checked = false;
-
       /* Save original points for inferred delta calculation */
       auto &orig_points_vec = scratch.orig_points;
       orig_points_vec.clear (); // Populated lazily
@@ -762,20 +664,6 @@ struct gvar_GVAR
 								 gvar_cache);
 
 	if (scalar == 0.f) continue;
-
-	if (!private_points_checked)
-	{
-	  auto scan = iterator;
-	  do
-	  {
-	    if (scan.current_tuple->has_private_points ())
-	    {
-	      any_private_points = true;
-	      break;
-	    }
-	  } while (scan.move_to_next ());
-	  private_points_checked = true;
-	}
 	const HBUINT8 *p = iterator.get_serialized_data ();
 	unsigned int length = iterator.current_tuple->get_data_size ();
 	if (unlikely (!iterator.var_data_bytes.check_range (p, length)))
@@ -800,19 +688,6 @@ struct gvar_GVAR
 	bool apply_to_all = (indices.length == 0);
 	unsigned num_deltas = apply_to_all ? points.length : indices.length;
 	unsigned start_deltas = (apply_to_all && phantom_only && num_deltas >= 4 ? num_deltas - 4 : 0);
-
-	if (apply_to_all && !any_private_points)
-	{
-#ifdef HB_OPTIMIZE_SIZE
-	  if (unlikely (!decompile_deltas_add_to_points (p, points, scalar, end, start_deltas, true))) return false;
-	  if (unlikely (!decompile_deltas_add_to_points (p, points, scalar, end, start_deltas, false))) return false;
-#else
-	  if (unlikely (!decompile_deltas_add_to_points<true> (p, points, scalar, end, start_deltas))) return false;
-	  if (unlikely (!decompile_deltas_add_to_points<false> (p, points, scalar, end, start_deltas))) return false;
-#endif
-	  continue;
-	}
-
 	if (unlikely (!x_deltas.resize_dirty  (num_deltas))) return false;
 	if (unlikely (!GlyphVariationData::decompile_deltas (p, x_deltas, end, false, start_deltas))) return false;
 	if (unlikely (!y_deltas.resize_dirty  (num_deltas))) return false;
@@ -831,6 +706,8 @@ struct gvar_GVAR
 	  {
 	    for (unsigned int i = phantom_only ? count - 4 : 0; i < count; i++)
 	      points.arrayZ[i].translate (deltas.arrayZ[i]);
+	    flush = false;
+
 	  }
 	  hb_memset (deltas.arrayZ + (phantom_only ? count - 4 : 0), 0,
 		     (phantom_only ? 4 : count) * sizeof (deltas[0]));
diff --git a/engine/thirdparty/harfbuzz/src/hb-outline.cc b/engine/thirdparty/harfbuzz/src/hb-outline.cc
index 75ee3041..d180e7c4 100644
--- a/engine/thirdparty/harfbuzz/src/hb-outline.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-outline.cc
@@ -84,15 +84,6 @@ void hb_outline_t::replay (hb_draw_funcs_t *pen, void *pen_data) const
   }
 }
 
-void hb_outline_t::translate (float dx, float dy)
-{
-  for (auto &p : points)
-  {
-    p.x += dx;
-    p.y += dy;
-  }
-}
-
 void hb_outline_t::slant (float slant_xy)
 {
   for (auto &p : points)
diff --git a/engine/thirdparty/harfbuzz/src/hb-outline.hh b/engine/thirdparty/harfbuzz/src/hb-outline.hh
index ed1057b8..060ad775 100644
--- a/engine/thirdparty/harfbuzz/src/hb-outline.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-outline.hh
@@ -69,7 +69,6 @@ struct hb_outline_t
 
   HB_INTERNAL void replay (hb_draw_funcs_t *pen, void *pen_data) const;
   HB_INTERNAL float control_area () const;
-  HB_INTERNAL void translate (float dx, float dy);
   HB_INTERNAL void slant (float slant_xy);
   HB_INTERNAL void embolden (float x_strength, float y_strength,
 			     float x_shift, float y_shift);
diff --git a/engine/thirdparty/harfbuzz/src/hb-paint.cc b/engine/thirdparty/harfbuzz/src/hb-paint.cc
index ffdd3c3a..5dd97d5b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-paint.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-paint.cc
@@ -742,14 +742,14 @@ hb_paint_pop_group (hb_paint_funcs_t *funcs, void *paint_data,
 
 /**
  * hb_paint_custom_palette_color:
- * @funcs: paint functions.
- * @paint_data: associated data passed by the caller.
- * @color_index: color index to fetch.
- * @color: (out): fetched color.
+ * @funcs: paint functions
+ * @paint_data: associated data passed by the caller
+ * @color_index: color index
+ * @color: (out): fetched color
  *
- * Gets the custom palette override color for @color_index.
+ * Gets the custom palette color for @color_index.
  *
- * Return value: `true` if a custom color is provided, `false` otherwise.
+ * Return value: `true` if found, `false` otherwise
  *
  * Since: 7.0.0
  */
diff --git a/engine/thirdparty/harfbuzz/src/hb-paint.h b/engine/thirdparty/harfbuzz/src/hb-paint.h
index 787118c4..37850772 100644
--- a/engine/thirdparty/harfbuzz/src/hb-paint.h
+++ b/engine/thirdparty/harfbuzz/src/hb-paint.h
@@ -684,24 +684,23 @@ typedef void (*hb_paint_pop_group_func_t) (hb_paint_funcs_t *funcs,
 
 /**
  * hb_paint_custom_palette_color_func_t:
- * @funcs: paint functions object.
- * @paint_data: data accompanying the paint functions in hb_font_paint_glyph().
- * @color_index: color index to fetch.
- * @color: (out): fetched color.
- * @user_data: user data pointer passed to hb_paint_funcs_set_custom_palette_color_func().
+ * @funcs: paint functions object
+ * @paint_data: The data accompanying the paint functions in hb_font_paint_glyph()
+ * @color_index: the color index
+ * @color: (out): fetched color
+ * @user_data: User data pointer passed to hb_paint_funcs_set_pop_group_func()
  *
- * A virtual method for #hb_paint_funcs_t to fetch a custom palette override
- * color for @color_index.
+ * A virtual method for the #hb_paint_funcs_t to fetch a color from the custom
+ * color palette.
  *
- * Custom palette colors override colors from the font's selected color palette.
- * It is not necessary to override all palette entries; return `false` for
- * entries that should be taken from the font palette.
+ * Custom palette colors override the colors from the fonts selected color
+ * palette. It is not necessary to override all palette entries; for entries
+ * that should be taken from the font palette, return `false`.
  *
- * This function might be called multiple times, but the custom palette is
- * expected to remain unchanged for the duration of one
- * hb_font_paint_glyph() call.
+ * This function might get called multiple times, but the custom palette is
+ * expected to remain unchanged for duration of a hb_font_paint_glyph() call.
  *
- * Return value: `true` if a custom color is provided, `false` otherwise.
+ * Return value: `true` if found, `false` otherwise
  *
  * Since: 7.0.0
  */
@@ -935,12 +934,12 @@ hb_paint_funcs_set_pop_group_func (hb_paint_funcs_t          *funcs,
 
 /**
  * hb_paint_funcs_set_custom_palette_color_func:
- * @funcs: a paint functions struct.
- * @func: (closure user_data) (destroy destroy) (scope notified): custom-palette-color callback.
- * @user_data: data to pass to @func.
- * @destroy: (nullable): function to call when @user_data is no longer needed.
+ * @funcs: A paint functions struct
+ * @func: (closure user_data) (destroy destroy) (scope notified): The custom-palette-color callback
+ * @user_data: Data to pass to @func
+ * @destroy: (nullable): Function to call when @user_data is no longer needed
  *
- * Sets the custom-palette-color callback on @funcs.
+ * Sets the custom-palette-color callback on the paint functions struct.
  *
  * Since: 7.0.0
  */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-draw.cc b/engine/thirdparty/harfbuzz/src/hb-raster-draw.cc
deleted file mode 100644
index ba11965a..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-draw.cc
+++ /dev/null
@@ -1,1386 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-raster-image.hh"
-#include "hb-geometry.hh"
-#include "hb-machinery.hh"
-
-#if defined(__aarch64__) || defined(_M_ARM64)
-#include <arm_neon.h>
-#define HB_RASTER_NEON 1
-#elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64)
-#include <emmintrin.h>
-#define HB_RASTER_SSE2 1
-#endif
-
-
-/* Fixed-point precision for sub-pixel coordinates.
-   8 bits = 24.8: 256 sub-pixel units per pixel. */
-#define HB_RASTER_PIXEL_BITS 8
-#define HB_RASTER_ONE_PIXEL  (1 << HB_RASTER_PIXEL_BITS)
-#define HB_RASTER_PIXEL_MASK (HB_RASTER_ONE_PIXEL - 1)
-/* Full-coverage alpha = 2 * ONE_PIXEL^2 */
-#define HB_RASTER_FULL_COVERAGE (2 * HB_RASTER_ONE_PIXEL * HB_RASTER_ONE_PIXEL)
-/* Flatness threshold for Bézier flattening: max deviation in pixels */
-#define HB_RASTER_FLAT_THRESH 0.25f
-
-
-/* Normalized edge: yH > yL always */
-struct hb_raster_edge_t
-{
-  int32_t xL, yL;   /* lower endpoint (fixed-point) */
-  int32_t xH, yH;   /* upper endpoint (fixed-point) */
-  int64_t slope;    /* dx/dy in 16.16 fixed point: ((int64_t)dx << 16) / dy */
-  int32_t wind;     /* +1 or -1 */
-};
-
-/* hb_raster_draw_t — outline rasterizer */
-struct hb_raster_draw_t
-{
-  hb_object_header_t header;
-
-  /* Configuration */
-  hb_transform_t<>    transform         = {1, 0, 0, 1, 0, 0};
-  float               x_scale_factor    = 1.f;
-  float               y_scale_factor    = 1.f;
-  hb_raster_extents_t fixed_extents     = {};
-  bool                has_extents = false;
-
-  /* Accumulated geometry */
-  hb_vector_t<hb_raster_edge_t> edges;
-
-  /* Scratch — reused across render() calls */
-  hb_vector_t<int32_t> row_area;
-  hb_vector_t<int16_t> row_cover;
-  hb_vector_t<hb_vector_t<unsigned>> edge_buckets;
-  hb_vector_t<unsigned> active_edges;
-
-  /* Recycled image for zero-malloc render */
-  hb_raster_image_t *recycled_image = nullptr;
-};
-
-static HB_ALWAYS_INLINE void
-hb_raster_draw_transform_point (const hb_raster_draw_t *draw,
-				float x, float y,
-				float &tx, float &ty)
-{
-  tx = x; ty = y;
-  draw->transform.transform_point (tx, ty);
-  tx /= draw->x_scale_factor;
-  ty /= draw->y_scale_factor;
-}
-
-
-/* hb_raster_draw_t */
-
-/**
- * hb_raster_draw_create_or_fail:
- *
- * Creates a new rasterizer object.
- *
- * Return value: (transfer full):
- * A newly allocated #hb_raster_draw_t with a reference count of 1. The
- * initial reference count should be released with hb_raster_draw_destroy()
- * when you are done using the #hb_raster_draw_t, or `NULL` on
- * allocation failure.
- *
- * Since: 13.0.0
- **/
-hb_raster_draw_t *
-hb_raster_draw_create_or_fail (void)
-{
-  hb_raster_draw_t *draw = hb_object_create<hb_raster_draw_t> ();
-  return draw;
-}
-
-/**
- * hb_raster_draw_reference: (skip)
- * @draw: a rasterizer
- *
- * Increases the reference count on @draw by one.
- *
- * This prevents @draw from being destroyed until a matching
- * call to hb_raster_draw_destroy() is made.
- *
- * Return value: (transfer full):
- * The referenced #hb_raster_draw_t.
- *
- * Since: 13.0.0
- **/
-hb_raster_draw_t *
-hb_raster_draw_reference (hb_raster_draw_t *draw)
-{
-  return hb_object_reference (draw);
-}
-
-/**
- * hb_raster_draw_destroy: (skip)
- * @draw: a rasterizer
- *
- * Decreases the reference count on @draw by one. When the
- * reference count reaches zero, the rasterizer is freed.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_destroy (hb_raster_draw_t *draw)
-{
-  if (!hb_object_should_destroy (draw))
-    return;
-
-  hb_raster_image_destroy (draw->recycled_image);
-  hb_object_actually_destroy (draw);
-  hb_free (draw);
-}
-
-/**
- * hb_raster_draw_set_user_data: (skip)
- * @draw: a rasterizer
- * @key: the user-data key
- * @data: a pointer to the user data
- * @destroy: (nullable): a callback to call when @data is not needed anymore
- * @replace: whether to replace an existing data with the same key
- *
- * Attaches a user-data key/data pair to the specified rasterizer.
- *
- * Return value: `true` if success, `false` otherwise
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_draw_set_user_data (hb_raster_draw_t   *draw,
-			      hb_user_data_key_t *key,
-			      void               *data,
-			      hb_destroy_func_t   destroy,
-			      hb_bool_t           replace)
-{
-  return hb_object_set_user_data (draw, key, data, destroy, replace);
-}
-
-/**
- * hb_raster_draw_get_user_data: (skip)
- * @draw: a rasterizer
- * @key: the user-data key
- *
- * Fetches the user-data associated with the specified key,
- * attached to the specified rasterizer.
- *
- * Return value: (transfer none):
- * A pointer to the user data
- *
- * Since: 13.0.0
- **/
-void *
-hb_raster_draw_get_user_data (hb_raster_draw_t   *draw,
-			      hb_user_data_key_t *key)
-{
-  return hb_object_get_user_data (draw, key);
-}
-
-/**
- * hb_raster_draw_set_transform:
- * @draw: a rasterizer
- * @xx: xx component of the transform matrix
- * @yx: yx component of the transform matrix
- * @xy: xy component of the transform matrix
- * @yy: yy component of the transform matrix
- * @dx: x translation
- * @dy: y translation
- *
- * Sets a 2×3 affine transform applied to all incoming draw
- * coordinates before rasterization.  The default is the identity.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_set_transform (hb_raster_draw_t *draw,
-			      float xx, float yx,
-			      float xy, float yy,
-			      float dx, float dy)
-{
-  draw->transform = {xx, yx, xy, yy, dx, dy};
-}
-
-/**
- * hb_raster_draw_set_scale_factor:
- * @draw: a rasterizer
- * @x_scale_factor: x-axis minification factor
- * @y_scale_factor: y-axis minification factor
- *
- * Sets post-transform minification factors applied during rasterization.
- * Factors larger than 1 shrink the output in pixels. The default is 1.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_set_scale_factor (hb_raster_draw_t *draw,
-				 float x_scale_factor,
-				 float y_scale_factor)
-{
-  draw->x_scale_factor = x_scale_factor > 0.f ? x_scale_factor : 1.f;
-  draw->y_scale_factor = y_scale_factor > 0.f ? y_scale_factor : 1.f;
-}
-
-/**
- * hb_raster_draw_get_scale_factor:
- * @draw: a rasterizer
- * @x_scale_factor: (out) (nullable): x-axis minification factor
- * @y_scale_factor: (out) (nullable): y-axis minification factor
- *
- * Fetches the current post-transform minification factors.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_get_scale_factor (hb_raster_draw_t *draw,
-				 float *x_scale_factor,
-				 float *y_scale_factor)
-{
-  if (x_scale_factor) *x_scale_factor = draw->x_scale_factor;
-  if (y_scale_factor) *y_scale_factor = draw->y_scale_factor;
-}
-
-/**
- * hb_raster_draw_get_transform:
- * @draw: a rasterizer
- * @xx: (out) (nullable): xx component of the transform matrix
- * @yx: (out) (nullable): yx component of the transform matrix
- * @xy: (out) (nullable): xy component of the transform matrix
- * @yy: (out) (nullable): yy component of the transform matrix
- * @dx: (out) (nullable): x translation
- * @dy: (out) (nullable): y translation
- *
- * Fetches the current affine transform of the rasterizer.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_get_transform (hb_raster_draw_t *draw,
-			      float *xx, float *yx,
-			      float *xy, float *yy,
-			      float *dx, float *dy)
-{
-  if (xx) *xx = draw->transform.xx;
-  if (yx) *yx = draw->transform.yx;
-  if (xy) *xy = draw->transform.xy;
-  if (yy) *yy = draw->transform.yy;
-  if (dx) *dx = draw->transform.x0;
-  if (dy) *dy = draw->transform.y0;
-}
-
-/**
- * hb_raster_draw_set_extents:
- * @draw: a rasterizer
- * @extents: the desired output extents
- *
- * Overrides the output image extents for the next render.  When set,
- * hb_raster_draw_render() uses the given extents instead of
- * auto-computing them from the accumulated geometry.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_set_extents (hb_raster_draw_t          *draw,
-			    const hb_raster_extents_t *extents)
-{
-  draw->fixed_extents     = *extents;
-  draw->has_extents = true;
-}
-
-/**
- * hb_raster_draw_get_extents:
- * @draw: a rasterizer
- * @extents: (out) (nullable): where to write current extents
- *
- * Gets currently configured output extents.
- *
- * Return value: `true` if extents are set, `false` otherwise.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_draw_get_extents (hb_raster_draw_t    *draw,
-			    hb_raster_extents_t *extents)
-{
-  if (!draw->has_extents)
-    return false;
-
-  if (extents)
-    *extents = draw->fixed_extents;
-  return true;
-}
-
-/**
- * hb_raster_draw_set_glyph_extents:
- * @draw: a rasterizer
- * @glyph_extents: glyph extents from hb_font_get_glyph_extents()
- *
- * Transforms @glyph_extents with the rasterizer's current transform and
- * sets the resulting pixel extents for the next render.
- *
- * This is equivalent to computing a transformed bounding box in pixel
- * space and calling hb_raster_draw_set_extents().
- *
- * Return value: `true` if transformed extents are non-empty and set;
- * `false` otherwise.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_draw_set_glyph_extents (hb_raster_draw_t         *draw,
-				  const hb_glyph_extents_t *glyph_extents)
-{
-  float x0 = (float) glyph_extents->x_bearing;
-  float y0 = (float) glyph_extents->y_bearing;
-  float x1 = (float) glyph_extents->x_bearing + glyph_extents->width;
-  float y1 = (float) glyph_extents->y_bearing + glyph_extents->height;
-
-  float xmin = hb_min (x0, x1);
-  float xmax = hb_max (x0, x1);
-  float ymin = hb_min (y0, y1);
-  float ymax = hb_max (y0, y1);
-
-  float px[4] = {xmin, xmin, xmax, xmax};
-  float py[4] = {ymin, ymax, ymin, ymax};
-
-  float tx, ty;
-  hb_raster_draw_transform_point (draw, px[0], py[0], tx, ty);
-  float tx_min = tx, tx_max = tx;
-  float ty_min = ty, ty_max = ty;
-
-  for (unsigned i = 1; i < 4; i++)
-  {
-    hb_raster_draw_transform_point (draw, px[i], py[i], tx, ty);
-    tx_min = hb_min (tx_min, tx);
-    tx_max = hb_max (tx_max, tx);
-    ty_min = hb_min (ty_min, ty);
-    ty_max = hb_max (ty_max, ty);
-  }
-
-  int ex0 = (int) floorf (tx_min);
-  int ey0 = (int) floorf (ty_min);
-  int ex1 = (int) ceilf  (tx_max);
-  int ey1 = (int) ceilf  (ty_max);
-
-  if (ex1 <= ex0 || ey1 <= ey0)
-  {
-    draw->fixed_extents = {};
-    draw->has_extents = false;
-    return false;
-  }
-
-  draw->fixed_extents = {
-    ex0, ey0,
-    (unsigned) (ex1 - ex0),
-    (unsigned) (ey1 - ey0),
-    0
-  };
-  draw->has_extents = true;
-  return true;
-}
-
-/**
- * hb_raster_draw_reset:
- * @draw: a rasterizer
- *
- * Resets the rasterizer to its initial state, clearing all accumulated
- * geometry, the transform, and fixed extents.  The object can then be
- * reused for a new glyph.
- *
- * Internal scratch buffers and recycled image cache are preserved for
- * reuse across subsequent renders.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_reset (hb_raster_draw_t *draw)
-{
-  draw->transform         = {1, 0, 0, 1, 0, 0};
-  draw->x_scale_factor    = 1.f;
-  draw->y_scale_factor    = 1.f;
-  draw->fixed_extents     = {};
-  draw->has_extents = false;
-  draw->edges.clear ();
-  draw->active_edges.clear ();
-}
-
-/**
- * hb_raster_draw_recycle_image:
- * @draw: a rasterizer
- * @image: a raster image to recycle
- *
- * Recycles @image for reuse by a subsequent hb_raster_draw_render()
- * call, avoiding per-render memory allocation.  The caller transfers
- * ownership of @image to @draw and must not use it afterwards.
- *
- * If @draw already holds a recycled image, the previously recycled
- * image is destroyed.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_recycle_image (hb_raster_draw_t  *draw,
-			      hb_raster_image_t *image)
-{
-  hb_raster_image_destroy (draw->recycled_image);
-  draw->recycled_image = image;
-}
-
-
-/*
- * Draw callbacks — flatten on the fly into hb_raster_edge_t
- */
-
-static inline void
-transform_point (const hb_raster_draw_t *draw,
-		 float  x,  float  y,
-		 float &tx, float &ty)
-{
-  hb_raster_draw_transform_point (draw, x, y, tx, ty);
-}
-
-static void
-emit_segment (hb_raster_draw_t *draw,
-	      float x0, float y0,
-	      float x1, float y1)
-{
-  int32_t X0 = (int32_t) roundf (x0 * HB_RASTER_ONE_PIXEL);
-  int32_t Y0 = (int32_t) roundf (y0 * HB_RASTER_ONE_PIXEL);
-  int32_t X1 = (int32_t) roundf (x1 * HB_RASTER_ONE_PIXEL);
-  int32_t Y1 = (int32_t) roundf (y1 * HB_RASTER_ONE_PIXEL);
-
-  if (Y0 == Y1) return; /* horizontal — skip */
-
-  hb_raster_edge_t e;
-  if (Y0 < Y1) {
-    e.xL = X0; e.yL = Y0; e.xH = X1; e.yH = Y1; e.wind = +1;
-  } else {
-    e.xL = X1; e.yL = Y1; e.xH = X0; e.yH = Y0; e.wind = -1;
-  }
-  e.slope = ((int64_t) (e.xH - e.xL) << 16) / (e.yH - e.yL);
-
-  draw->edges.push (e);
-}
-
-/* Quadratic Bézier flattener — iterative de Casteljau at t=0.5. */
-static inline void
-flatten_quadratic_recursive (hb_raster_draw_t *draw,
-			     float x0, float y0,
-			     float x1, float y1,
-			     float x2, float y2,
-			     int depth = 0)
-{
-  struct quad_node_t
-  {
-    float x0, y0, x1, y1, x2, y2;
-    int depth;
-  };
-
-  quad_node_t stack[16];
-  unsigned top = 0;
-
-  while (true)
-  {
-    bool is_flat;
-    if (false)
-    {
-      /* Old behavior: midpoint deviation from chord midpoint. */
-      float mx = x0 * 0.25f + x1 * 0.5f + x2 * 0.25f;
-      float my = y0 * 0.25f + y1 * 0.5f + y2 * 0.25f;
-      float chord_mx = (x0 + x2) * 0.5f;
-      float chord_my = (y0 + y2) * 0.5f;
-      float dx = mx - chord_mx;
-      float dy = my - chord_my;
-      static const float flat_thresh = HB_RASTER_FLAT_THRESH * HB_RASTER_FLAT_THRESH;
-      is_flat = (dx * dx + dy * dy) <= flat_thresh;
-    }
-    else
-    {
-      /* FreeType behavior: control-point deviation from chord center. */
-      const float flat_thresh = 0.25f;
-      float dx = x0 + x2 - 2.f * x1;
-      float dy = y0 + y2 - 2.f * y1;
-      if (dx < 0) dx = -dx;
-      if (dy < 0) dy = -dy;
-      is_flat = dx <= flat_thresh && dy <= flat_thresh;
-    }
-
-    if (depth >= 16 || is_flat)
-    {
-      emit_segment (draw, x0, y0, x2, y2);
-      if (!top) return;
-      const quad_node_t &n = stack[--top];
-      x0 = n.x0; y0 = n.y0;
-      x1 = n.x1; y1 = n.y1;
-      x2 = n.x2; y2 = n.y2;
-      depth = n.depth;
-      continue;
-    }
-
-    float x01 = (x0 + x1) * 0.5f, y01 = (y0 + y1) * 0.5f;
-    float x12 = (x1 + x2) * 0.5f, y12 = (y1 + y2) * 0.5f;
-    float xm  = (x01 + x12) * 0.5f, ym  = (y01 + y12) * 0.5f;
-
-    /* Depth is capped at 16, so stack capacity 16 is sufficient. */
-    stack[top++] = {xm, ym, x12, y12, x2, y2, depth + 1};
-    x2 = xm; y2 = ym;
-    x1 = x01; y1 = y01;
-    depth++;
-  }
-}
-
-/* Quadratic Bézier flattener using forward differencing.
-   The error (midpoint deviation) shrinks exactly 4× per de Casteljau
-   subdivision, so we compute the subdivision count upfront and iterate
-   with constant-cost additions instead of recursive branching. */
-static inline void
-flatten_quadratic_fd (hb_raster_draw_t *draw,
-		      float x0, float y0,
-		      float x1, float y1,
-		      float x2, float y2)
-{
-  /* Deviation of curve midpoint from chord midpoint (squared). */
-  float devx = (x0 - 2 * x1 + x2) * 0.25f;
-  float devy = (y0 - 2 * y1 + y2) * 0.25f;
-  float err2 = devx * devx + devy * devy;
-
-  static const float flat_thresh = HB_RASTER_FLAT_THRESH * HB_RASTER_FLAT_THRESH;
-
-  if (err2 <= flat_thresh)
-  {
-    emit_segment (draw, x0, y0, x2, y2);
-    return;
-  }
-
-  /* err² shrinks 16× per subdivision level.  Find n such that
-     err2 / 16^n <= flat_thresh, i.e. n = ceil(log₁₆(err2/flat_thresh)). */
-  unsigned n = 1;
-  {
-    float ratio = err2 / flat_thresh;
-    while (ratio > 16.f) { ratio *= (1.f / 16.f); n++; }
-    if (n > 16) n = 16;
-  }
-  unsigned N = 1u << n;   /* number of line segments */
-  float h = 1.f / N;
-
-  /* Quadratic: B(t) = a·t² + b·t + c
-     Forward differences with step h:
-       d²f = 2·a·h²   (constant)
-       df₀ = a·h² + b·h
-       f₀  = c = P₀                     */
-  float ax = x0 - 2 * x1 + x2;
-  float ay = y0 - 2 * y1 + y2;
-  float bx = 2 * (x1 - x0);
-  float by = 2 * (y1 - y0);
-
-  float d2fx = 2 * ax * h * h;
-  float d2fy = 2 * ay * h * h;
-  float dfx  = ax * h * h + bx * h;
-  float dfy  = ay * h * h + by * h;
-  float fx   = x0;
-  float fy   = y0;
-
-  for (unsigned i = 1; i < N; i++)
-  {
-    float nx = fx + dfx;
-    float ny = fy + dfy;
-    emit_segment (draw, fx, fy, nx, ny);
-    fx = nx;
-    fy = ny;
-    dfx += d2fx;
-    dfy += d2fy;
-  }
-  /* Last segment uses exact endpoint to avoid drift. */
-  emit_segment (draw, fx, fy, x2, y2);
-}
-
-static void
-flatten_quadratic (hb_raster_draw_t *draw,
-		   float x0, float y0,
-		   float x1, float y1,
-		   float x2, float y2)
-{
-  if (false)
-    flatten_quadratic_fd (draw, x0, y0, x1, y1, x2, y2);
-  else
-    flatten_quadratic_recursive (draw, x0, y0, x1, y1, x2, y2);
-}
-
-/* For cubic B(t), the max deviation from its chord on [0,1] is bounded by:
-     max||B(t)-L(t)|| <= max_t ||B''(t)|| / 8.
-   B''(t) is linear, so max norm is attained at t=0 or t=1:
-     B''(0)=6*(P0-2P1+P2), B''(1)=6*(P1-2P2+P3). */
-static inline float
-cubic_chord_error_bound2 (float x0, float y0,
-			  float x1, float y1,
-			  float x2, float y2,
-			  float x3, float y3)
-{
-  float d20x = x0 - 2 * x1 + x2;
-  float d20y = y0 - 2 * y1 + y2;
-  float d21x = x1 - 2 * x2 + x3;
-  float d21y = y1 - 2 * y2 + y3;
-  float m0 = d20x * d20x + d20y * d20y;
-  float m1 = d21x * d21x + d21y * d21y;
-  float m = m0 > m1 ? m0 : m1;
-  /* (max||B''||/8)^2 = (6/8)^2 * max||d2||^2 = (3/4)^2 * m. */
-  return m * (9.f / 16.f);
-}
-
-/* Cubic Bézier flattener — iterative de Casteljau at t=0.5. */
-static inline void
-flatten_cubic_recursive (hb_raster_draw_t *draw,
-			 float x0, float y0,
-			 float x1, float y1,
-			 float x2, float y2,
-			 float x3, float y3,
-			 int depth = 0)
-{
-  struct cubic_node_t
-  {
-    float x0, y0, x1, y1, x2, y2, x3, y3;
-    int depth;
-  };
-
-  cubic_node_t stack[16];
-  unsigned top = 0;
-
-  while (true)
-  {
-    bool is_flat;
-    if (false)
-    {
-      /* Old behavior: curvature/chord-error bound. */
-      float err2 = cubic_chord_error_bound2 (x0, y0, x1, y1, x2, y2, x3, y3);
-      static const float flat_thresh = HB_RASTER_FLAT_THRESH * HB_RASTER_FLAT_THRESH;
-      is_flat = err2 <= flat_thresh;
-    }
-    else
-    {
-      /* FreeType behavior: chord-trisection distance test. */
-      const float flat_thresh = 0.5f;
-
-      float d10x = 2.f * x0 - 3.f * x1 + x3;
-      float d10y = 2.f * y0 - 3.f * y1 + y3;
-      float d20x = x0 - 3.f * x2 + 2.f * x3;
-      float d20y = y0 - 3.f * y2 + 2.f * y3;
-
-      if (d10x < 0) d10x = -d10x;
-      if (d10y < 0) d10y = -d10y;
-      if (d20x < 0) d20x = -d20x;
-      if (d20y < 0) d20y = -d20y;
-
-      is_flat = d10x <= flat_thresh &&
-                d10y <= flat_thresh &&
-                d20x <= flat_thresh &&
-                d20y <= flat_thresh;
-    }
-
-    if (depth >= 16 || is_flat)
-    {
-      emit_segment (draw, x0, y0, x3, y3);
-      if (!top) return;
-      const cubic_node_t &n = stack[--top];
-      x0 = n.x0; y0 = n.y0;
-      x1 = n.x1; y1 = n.y1;
-      x2 = n.x2; y2 = n.y2;
-      x3 = n.x3; y3 = n.y3;
-      depth = n.depth;
-      continue;
-    }
-
-    float x01  = (x0 + x1) * 0.5f, y01  = (y0 + y1) * 0.5f;
-    float x12  = (x1 + x2) * 0.5f, y12  = (y1 + y2) * 0.5f;
-    float x23  = (x2 + x3) * 0.5f, y23  = (y2 + y3) * 0.5f;
-    float x012 = (x01 + x12) * 0.5f, y012 = (y01 + y12) * 0.5f;
-    float x123 = (x12 + x23) * 0.5f, y123 = (y12 + y23) * 0.5f;
-    float xm   = (x012 + x123) * 0.5f, ym   = (y012 + y123) * 0.5f;
-
-    /* Depth is capped at 16, so stack capacity 16 is sufficient. */
-    stack[top++] = {xm, ym, x123, y123, x23, y23, x3, y3, depth + 1};
-    x3 = xm; y3 = ym;
-    x2 = x012; y2 = y012;
-    x1 = x01; y1 = y01;
-    depth++;
-  }
-}
-
-/* Cubic Bézier flattener using forward differencing.
-   Use a curvature-based chord-error bound (max||B''||/8), then choose a
-   uniform subdivision count n such that the bound drops below threshold.
-   The cubic adds a constant third difference d³f = 6·a·h³. */
-static inline void
-flatten_cubic_fd (hb_raster_draw_t *draw,
-		  float x0, float y0,
-		  float x1, float y1,
-		  float x2, float y2,
-		  float x3, float y3)
-{
-  float err2 = cubic_chord_error_bound2 (x0, y0, x1, y1, x2, y2, x3, y3);
-
-  static const float flat_thresh = HB_RASTER_FLAT_THRESH * HB_RASTER_FLAT_THRESH;
-
-  if (err2 <= flat_thresh)
-  {
-    emit_segment (draw, x0, y0, x3, y3);
-    return;
-  }
-
-  /* The bound scales with h², so err² shrinks 16× per subdivision level. */
-  unsigned n = 1;
-  {
-    float ratio = err2 / flat_thresh;
-    while (ratio > 16.f) { ratio *= (1.f / 16.f); n++; }
-    if (n > 16) n = 16;
-  }
-  unsigned N = 1u << n;
-  float h = 1.f / N;
-
-  /* Cubic: B(t) = a·t³ + b·t² + c·t + d
-     a = -P₀ + 3P₁ - 3P₂ + P₃
-     b =  3P₀ - 6P₁ + 3P₂
-     c =  3(P₁ - P₀)
-     d =  P₀
-     Forward differences with step h:
-       d³f  = 6·a·h³              (constant)
-       d²f₀ = 6·a·h³ + 2·b·h²
-       d¹f₀ = a·h³ + b·h² + c·h
-       f₀   = d = P₀              */
-  float ax = -x0 + 3*x1 - 3*x2 + x3;
-  float ay = -y0 + 3*y1 - 3*y2 + y3;
-  float bx =  3*x0 - 6*x1 + 3*x2;
-  float by =  3*y0 - 6*y1 + 3*y2;
-  float cx =  3*(x1 - x0);
-  float cy =  3*(y1 - y0);
-
-  float h2 = h * h, h3 = h2 * h;
-  float d3fx = 6 * ax * h3;
-  float d3fy = 6 * ay * h3;
-  float d2fx = d3fx + 2 * bx * h2;
-  float d2fy = d3fy + 2 * by * h2;
-  float dfx  = ax * h3 + bx * h2 + cx * h;
-  float dfy  = ay * h3 + by * h2 + cy * h;
-  float fx   = x0;
-  float fy   = y0;
-
-  for (unsigned i = 1; i < N; i++)
-  {
-    float nx = fx + dfx;
-    float ny = fy + dfy;
-    emit_segment (draw, fx, fy, nx, ny);
-    fx = nx;  fy = ny;
-    dfx += d2fx;  dfy += d2fy;
-    d2fx += d3fx; d2fy += d3fy;
-  }
-  /* Last segment uses exact endpoint to avoid drift. */
-  emit_segment (draw, fx, fy, x3, y3);
-}
-
-static void
-flatten_cubic (hb_raster_draw_t *draw,
-	       float x0, float y0,
-	       float x1, float y1,
-	       float x2, float y2,
-	       float x3, float y3)
-{
-  if (false)
-    flatten_cubic_fd (draw, x0, y0, x1, y1, x2, y2, x3, y3);
-  else
-    flatten_cubic_recursive (draw, x0, y0, x1, y1, x2, y2, x3, y3);
-}
-
-
-/* Draw callback implementations */
-
-static void
-hb_raster_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-		   void *draw_data,
-		   hb_draw_state_t *st HB_UNUSED,
-		   float to_x HB_UNUSED, float to_y HB_UNUSED,
-		   void *user_data HB_UNUSED)
-{
-  /* no-op: state tracked by hb_draw_state_t */
-}
-
-static void
-hb_raster_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-		   void *draw_data,
-		   hb_draw_state_t *st,
-		   float to_x, float to_y,
-		   void *user_data HB_UNUSED)
-{
-  hb_raster_draw_t *draw = (hb_raster_draw_t *) draw_data;
-
-  float tx0, ty0, tx1, ty1;
-  transform_point (draw, st->current_x, st->current_y, tx0, ty0);
-  transform_point (draw, to_x,          to_y,           tx1, ty1);
-  emit_segment (draw, tx0, ty0, tx1, ty1);
-}
-
-static void
-hb_raster_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-			void *draw_data,
-			hb_draw_state_t *st,
-			float control_x, float control_y,
-			float to_x, float to_y,
-			void *user_data HB_UNUSED)
-{
-  hb_raster_draw_t *draw = (hb_raster_draw_t *) draw_data;
-
-  float tx0, ty0, tx1, ty1, tx2, ty2;
-  transform_point (draw, st->current_x, st->current_y, tx0, ty0);
-  transform_point (draw, control_x,     control_y,      tx1, ty1);
-  transform_point (draw, to_x,          to_y,           tx2, ty2);
-  flatten_quadratic (draw, tx0, ty0, tx1, ty1, tx2, ty2);
-}
-
-static void
-hb_raster_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-		    void *draw_data,
-		    hb_draw_state_t *st,
-		    float control1_x, float control1_y,
-		    float control2_x, float control2_y,
-		    float to_x, float to_y,
-		    void *user_data HB_UNUSED)
-{
-  hb_raster_draw_t *draw = (hb_raster_draw_t *) draw_data;
-
-  float tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3;
-  transform_point (draw, st->current_x, st->current_y, tx0, ty0);
-  transform_point (draw, control1_x,    control1_y,     tx1, ty1);
-  transform_point (draw, control2_x,    control2_y,     tx2, ty2);
-  transform_point (draw, to_x,          to_y,           tx3, ty3);
-  flatten_cubic (draw, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3);
-}
-
-static void
-hb_raster_close_path (hb_draw_funcs_t *dfuncs HB_UNUSED,
-		      void *draw_data HB_UNUSED,
-		      hb_draw_state_t *st HB_UNUSED,
-		      void *user_data HB_UNUSED)
-{
-  /* no-op: hb_draw_funcs_t already emits closing line_to before us */
-}
-
-
-/* Lazy-loader singleton for draw funcs */
-
-static inline void free_static_raster_draw_funcs ();
-
-static struct hb_raster_draw_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t<hb_raster_draw_funcs_lazy_loader_t>
-{
-  static hb_draw_funcs_t *create ()
-  {
-    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
-
-    hb_draw_funcs_set_move_to_func      (funcs, hb_raster_move_to,      nullptr, nullptr);
-    hb_draw_funcs_set_line_to_func      (funcs, hb_raster_line_to,      nullptr, nullptr);
-    hb_draw_funcs_set_quadratic_to_func (funcs, hb_raster_quadratic_to, nullptr, nullptr);
-    hb_draw_funcs_set_cubic_to_func     (funcs, hb_raster_cubic_to,     nullptr, nullptr);
-    hb_draw_funcs_set_close_path_func   (funcs, hb_raster_close_path,   nullptr, nullptr);
-
-    hb_draw_funcs_make_immutable (funcs);
-
-    hb_atexit (free_static_raster_draw_funcs);
-
-    return funcs;
-  }
-} static_raster_draw_funcs;
-
-static inline void
-free_static_raster_draw_funcs ()
-{
-  static_raster_draw_funcs.free_instance ();
-}
-
-/**
- * hb_raster_draw_get_funcs:
- *
- * Fetches the singleton #hb_draw_funcs_t that feeds outline data
- * into an #hb_raster_draw_t.  Pass the #hb_raster_draw_t as the
- * @draw_data argument when calling the draw functions.
- *
- * Return value: (transfer none):
- * The rasterizer draw functions
- *
- * Since: 13.0.0
- **/
-hb_draw_funcs_t *
-hb_raster_draw_get_funcs (void)
-{
-  return static_raster_draw_funcs.get_unconst ();
-}
-
-/**
- * hb_raster_draw_glyph:
- * @draw: a rasterizer
- * @font: font to draw from
- * @glyph: glyph ID to draw
- * @pen_x: glyph origin x in font coordinates (pre-transform)
- * @pen_y: glyph origin y in font coordinates (pre-transform)
- *
- * Convenience wrapper to draw one glyph at (@pen_x, @pen_y) using the
- * rasterizer's current transform. The pen coordinates are applied before
- * minification and are transformed by the current affine transform.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_draw_glyph (hb_raster_draw_t *draw,
-		      hb_font_t       *font,
-		      hb_codepoint_t   glyph,
-		      float            pen_x,
-		      float            pen_y)
-{
-  float xx = draw->transform.xx;
-  float yx = draw->transform.yx;
-  float xy = draw->transform.xy;
-  float yy = draw->transform.yy;
-  float dx = draw->transform.x0;
-  float dy = draw->transform.y0;
-
-  hb_raster_draw_set_transform (draw,
-				xx, yx, xy, yy,
-				dx + xx * pen_x + xy * pen_y,
-				dy + yx * pen_x + yy * pen_y);
-  hb_font_draw_glyph (font, glyph, hb_raster_draw_get_funcs (), draw);
-  hb_raster_draw_set_transform (draw, xx, yx, xy, yy, dx, dy);
-}
-
-
-/*
- * Analytic coverage rasterizer
- *
- * For each line-segment edge and each pixel row it crosses, we compute
- * exact area/cover contributions per pixel cell.  A left-to-right sweep
- * then converts accumulated (area, cover) into alpha values.
- *
- * Coordinates are fixed-point.
- *
- *   cover[x] = Σ dy · wind        — signed vertical extent per cell
- *   area[x]  = Σ (fx₀+fx₁)·dy·wind — twice the signed trapezoidal area
- *
- * Sweep:
- *   cover_accum += cover[x]
- *   α = min(|cover_accum·128 − area[x]|, 8192) · 255 / 8192
- */
-
-/* Add one edge piece's area/cover into a single cell. */
-static HB_ALWAYS_INLINE void
-cell_add (int32_t *area, int16_t *cover, unsigned width, int col,
-	  int32_t fx0, int32_t fy0, int32_t fx1, int32_t fy1, int32_t wind,
-	  unsigned &x_min, unsigned &x_max)
-{
-  if (unlikely ((unsigned) col >= width))
-  {
-    if (unlikely (col < 0))
-    {
-      /* Edge is to the left of the surface.  The winding contribution
-       * still carries into the visible region, so add the cover delta
-       * to column 0.  Area is not added since the edge doesn't cross
-       * column 0's cell. */
-      int32_t dy = fy1 - fy0;
-      cover[0] += (int16_t) (dy * wind);
-      x_min = hb_min (x_min, 0u);
-      x_max = hb_max (x_max, 0u);
-    }
-    return;
-  }
-  int32_t dy = fy1 - fy0;
-  area[col]  += (fx0 + fx1) * dy * wind;
-  cover[col] += (int16_t) (dy * wind);
-  x_min = hb_min (x_min, (unsigned) col);
-  x_max = hb_max (x_max, (unsigned) col);
-}
-
-/* Walk one edge through the pixel cells of a single pixel row,
-   accumulating area/cover.  py is the integer pixel-row index. */
-static HB_ALWAYS_INLINE void
-edge_sweep_row (int32_t                *area,
-		int16_t                *cover,
-		unsigned                width,
-		int                     x_org,
-		int32_t                 y_top,
-		const hb_raster_edge_t &edge,
-		unsigned               &x_min,
-		unsigned               &x_max)
-{
-  int32_t y_bot = y_top + HB_RASTER_ONE_PIXEL;
-
-  int32_t ey0 = hb_max (edge.yL, y_top);
-  int32_t ey1 = hb_min (edge.yH, y_bot);
-  if (ey0 >= ey1) return;
-
-  /* X at clipped endpoints (fixed-point) */
-  int32_t x0 = edge.xL + (int32_t) ((int64_t) (ey0 - edge.yL) * edge.slope >> 16);
-  int32_t x1 = edge.xL + (int32_t) ((int64_t) (ey1 - edge.yL) * edge.slope >> 16);
-
-  /* Fractional y within this pixel row [0, ONE_PIXEL] */
-  int32_t fy0 = ey0 - y_top;
-  int32_t fy1 = ey1 - y_top;
-
-  int32_t cx0 = x0 >> HB_RASTER_PIXEL_BITS;
-  int32_t fx0 = x0 & HB_RASTER_PIXEL_MASK;
-  int32_t cx1 = x1 >> HB_RASTER_PIXEL_BITS;
-  int32_t fx1 = x1 & HB_RASTER_PIXEL_MASK;
-  int32_t wind = edge.wind;
-
-  /* Fast path: both endpoints in the same pixel column. */
-  if (cx0 == cx1)
-  {
-    cell_add (area, cover, width, cx0 - x_org, fx0, fy0, fx1, fy1, wind, x_min, x_max);
-    return;
-  }
-
-  int32_t total_dx = x1 - x0;
-  int32_t total_dy = fy1 - fy0;
-
-  /* fy increment per pixel column (constant since x_b advances by ONE_PIXEL). */
-  int32_t delta_fy = (int32_t) ((int64_t) HB_RASTER_ONE_PIXEL * total_dy / total_dx);
-
-  if (total_dx > 0)
-  {
-    /* Left-to-right edge. */
-    int32_t x_b  = (cx0 + 1) << HB_RASTER_PIXEL_BITS;
-    int32_t fy_b = fy0 + (int32_t) ((int64_t) (x_b - x0) * total_dy / total_dx);
-    cell_add (area, cover, width, cx0 - x_org, fx0, fy0, HB_RASTER_ONE_PIXEL, fy_b, wind, x_min, x_max);
-
-    int32_t fy_prev = fy_b;
-    for (int32_t cx = cx0 + 1; cx < cx1; cx++)
-    {
-      fy_b = fy_prev + delta_fy;
-      cell_add (area, cover, width, cx - x_org, 0, fy_prev, HB_RASTER_ONE_PIXEL, fy_b, wind, x_min, x_max);
-      fy_prev = fy_b;
-    }
-
-    cell_add (area, cover, width, cx1 - x_org, 0, fy_prev, fx1, fy1, wind, x_min, x_max);
-  }
-  else
-  {
-    /* Right-to-left edge. */
-    int32_t x_b  = cx0 << HB_RASTER_PIXEL_BITS;
-    int32_t fy_b = fy0 + (int32_t) ((int64_t) (x_b - x0) * total_dy / total_dx);
-    cell_add (area, cover, width, cx0 - x_org, fx0, fy0, 0, fy_b, wind, x_min, x_max);
-
-    int32_t fy_prev = fy_b;
-    for (int32_t cx = cx0 - 1; cx > cx1; cx--)
-    {
-      fy_b = fy_prev - delta_fy;
-      cell_add (area, cover, width, cx - x_org, HB_RASTER_ONE_PIXEL, fy_prev, 0, fy_b, wind, x_min, x_max);
-      fy_prev = fy_b;
-    }
-
-    cell_add (area, cover, width, cx1 - x_org, HB_RASTER_ONE_PIXEL, fy_prev, fx1, fy1, wind, x_min, x_max);
-  }
-}
-
-/* Convert cover-delta + area to alpha bytes, then clear.
-   Returns final cover accumulator over [x_min, x_max]. */
-static int32_t
-sweep_row_to_alpha (uint8_t *__restrict row_buf,
-		    int32_t *__restrict area,
-		    int16_t *__restrict cover,
-		    unsigned x_min,
-		    unsigned x_max)
-{
-  const int32_t cover_scale = 2 * HB_RASTER_ONE_PIXEL;
-  int32_t cover_accum = 0;
-  unsigned x = x_min;
-
-#ifdef HB_RASTER_NEON
-  int32x4_t clamp_v = vdupq_n_s32 (HB_RASTER_FULL_COVERAGE);
-  int32x4_t bias_v  = vdupq_n_s32 (HB_RASTER_FULL_COVERAGE / 2);
-  int32x4_t zero32  = vdupq_n_s32 (0);
-  int16x8_t zero16  = vdupq_n_s16 (0);
-  for (; x + 7 <= x_max; x += 8)
-  {
-    int32_t ctmp[8];
-    for (unsigned i = 0; i < 8; i++)
-    {
-      cover_accum += cover[x + i];
-      ctmp[i] = cover_accum * cover_scale;
-    }
-
-    int32x4_t c0  = vld1q_s32 (ctmp + 0);
-    int32x4_t c1  = vld1q_s32 (ctmp + 4);
-    int32x4_t a0  = vld1q_s32 (area + x);
-    int32x4_t a1  = vld1q_s32 (area + x + 4);
-
-    int32x4_t v0 = vabsq_s32 (vsubq_s32 (c0, a0));
-    int32x4_t v1 = vabsq_s32 (vsubq_s32 (c1, a1));
-
-    v0 = vminq_s32 (v0, clamp_v);
-    v1 = vminq_s32 (v1, clamp_v);
-
-    int32x4_t r0 = vshrq_n_s32 (vmlaq_n_s32 (bias_v, v0, 255), 2 * HB_RASTER_PIXEL_BITS + 1);
-    int32x4_t r1 = vshrq_n_s32 (vmlaq_n_s32 (bias_v, v1, 255), 2 * HB_RASTER_PIXEL_BITS + 1);
-
-    int16x4_t h0 = vmovn_s32 (r0);
-    int16x4_t h1 = vmovn_s32 (r1);
-    int16x8_t h  = vcombine_s16 (h0, h1);
-    uint8x8_t b  = vqmovun_s16 (h);
-    vst1_u8 (row_buf + x, b);
-
-    vst1q_s32 (area + x,     zero32);
-    vst1q_s32 (area + x + 4, zero32);
-    vst1q_s16 (cover + x,    zero16);
-  }
-#elif defined(HB_RASTER_SSE2)
-  __m128i clamp_v = _mm_set1_epi32 (HB_RASTER_FULL_COVERAGE);
-  __m128i bias_v  = _mm_set1_epi32 (HB_RASTER_FULL_COVERAGE / 2);
-  __m128i zero_v  = _mm_setzero_si128 ();
-  for (; x + 7 <= x_max; x += 8)
-  {
-    int32_t ctmp[8];
-    for (unsigned i = 0; i < 8; i++)
-    {
-      cover_accum += cover[x + i];
-      ctmp[i] = cover_accum * cover_scale;
-    }
-
-    __m128i c0  = _mm_loadu_si128 ((__m128i *) (void *) (ctmp + 0));
-    __m128i c1  = _mm_loadu_si128 ((__m128i *) (void *) (ctmp + 4));
-    __m128i a0  = _mm_loadu_si128 ((__m128i *) (void *) (area + x));
-    __m128i a1  = _mm_loadu_si128 ((__m128i *) (void *) (area + x + 4));
-
-    __m128i v0 = _mm_sub_epi32 (c0, a0);
-    __m128i v1 = _mm_sub_epi32 (c1, a1);
-
-    __m128i s0 = _mm_srai_epi32 (v0, 31);
-    __m128i s1 = _mm_srai_epi32 (v1, 31);
-    v0 = _mm_sub_epi32 (_mm_xor_si128 (v0, s0), s0);
-    v1 = _mm_sub_epi32 (_mm_xor_si128 (v1, s1), s1);
-
-    __m128i lt0 = _mm_cmplt_epi32 (v0, clamp_v);
-    __m128i lt1 = _mm_cmplt_epi32 (v1, clamp_v);
-    v0 = _mm_or_si128 (_mm_and_si128 (lt0, v0), _mm_andnot_si128 (lt0, clamp_v));
-    v1 = _mm_or_si128 (_mm_and_si128 (lt1, v1), _mm_andnot_si128 (lt1, clamp_v));
-
-    __m128i r0 = _mm_srai_epi32 (_mm_add_epi32 (_mm_sub_epi32 (_mm_slli_epi32 (v0, 8), v0), bias_v), 2 * HB_RASTER_PIXEL_BITS + 1);
-    __m128i r1 = _mm_srai_epi32 (_mm_add_epi32 (_mm_sub_epi32 (_mm_slli_epi32 (v1, 8), v1), bias_v), 2 * HB_RASTER_PIXEL_BITS + 1);
-
-    __m128i h = _mm_packs_epi32 (r0, r1);
-    __m128i b = _mm_packus_epi16 (h, h);
-    _mm_storel_epi64 ((__m128i *) (void *) (row_buf + x), b);
-
-    _mm_storeu_si128 ((__m128i *) (void *) (area + x),     zero_v);
-    _mm_storeu_si128 ((__m128i *) (void *) (area + x + 4), zero_v);
-    _mm_storeu_si128 ((__m128i *) (void *) (cover + x),    zero_v);
-  }
-#endif
-
-  for (; x <= x_max; x++)
-  {
-    cover_accum += cover[x];
-    int32_t val   = cover_accum * cover_scale - area[x];
-    int32_t alpha = val < 0 ? -val : val;
-    if (alpha > HB_RASTER_FULL_COVERAGE) alpha = HB_RASTER_FULL_COVERAGE;
-    row_buf[x] = (uint8_t) (((unsigned) alpha * 255 + HB_RASTER_FULL_COVERAGE / 2) >> (2 * HB_RASTER_PIXEL_BITS + 1));
-    area[x]  = 0;
-    cover[x] = 0;
-  }
-
-  return cover_accum;
-}
-
-
-/**
- * hb_raster_draw_render:
- * @draw: a rasterizer
- *
- * Rasterizes the accumulated outline geometry into a new
- * #hb_raster_image_t.  After rendering, the accumulated edges are
- * cleared so the rasterizer can be reused. Output format is always
- * @HB_RASTER_FORMAT_A8.
- *
- * Return value: (transfer full):
- * A rendered #hb_raster_image_t. Returns `NULL` on allocation/configuration
- * failure. If no geometry was accumulated, returns an empty image.
- *
- * Since: 13.0.0
- **/
-hb_raster_image_t *
-hb_raster_draw_render (hb_raster_draw_t *draw)
-{
-  /* ── 1. Compute result extents ─────────────────────────────────── */
-  hb_raster_extents_t ext;
-
-  if (draw->has_extents)
-  {
-    ext = draw->fixed_extents;
-  }
-  else
-  {
-    /* Auto-size from edge bounding box */
-    if (draw->edges.length == 0)
-    {
-      /* No edges: produce 0×0 image */
-      ext = { 0, 0, 0, 0, 0 };
-    }
-    else
-    {
-      int32_t xmin = draw->edges.arrayZ[0].xL, xmax = draw->edges.arrayZ[0].xL;
-      int32_t ymin = draw->edges.arrayZ[0].yL, ymax = draw->edges.arrayZ[0].yH;
-
-      for (const auto &e : draw->edges)
-      {
-	xmin = hb_min (xmin, hb_min (e.xL, e.xH));
-	xmax = hb_max (xmax, hb_max (e.xL, e.xH));
-	ymin = hb_min (ymin, e.yL);
-	ymax = hb_max (ymax, e.yH);
-      }
-
-      /* Convert fixed-point → pixels (floor for min, ceil for max) */
-      int x0 = xmin >> HB_RASTER_PIXEL_BITS;
-      int y0 = ymin >> HB_RASTER_PIXEL_BITS;
-      int x1 = (xmax + HB_RASTER_PIXEL_MASK) >> HB_RASTER_PIXEL_BITS;
-      int y1 = (ymax + HB_RASTER_PIXEL_MASK) >> HB_RASTER_PIXEL_BITS;
-
-      ext.x_origin = x0;
-      ext.y_origin = y0;
-      ext.width    = (unsigned) hb_max (0, x1 - x0);
-      ext.height   = (unsigned) hb_max (0, y1 - y0);
-      ext.stride   = 0; /* filled below */
-    }
-  }
-
-  /* ── 2. Compute stride ─────────────────────────────────────────── */
-  if (ext.stride == 0)
-    ext.stride = (ext.width + 3u) & ~3u;
-
-  /* ── 3. Allocate or reuse image ─────────────────────────────────── */
-  hb_raster_image_t *image;
-  if (draw->recycled_image)
-  {
-    image = draw->recycled_image;
-    draw->recycled_image = nullptr;
-  }
-  else
-  {
-    image = hb_raster_image_create_or_fail ();
-    if (unlikely (!image)) goto fail;
-  }
-
-  if (unlikely (!image->configure (HB_RASTER_FORMAT_A8, ext)))
-  {
-    hb_raster_image_destroy (image);
-    image = nullptr;
-    goto fail;
-  }
-  image->clear ();
-
-  /* ── 4. Bucket edges by starting row and rasterize scanlines ──── */
-  if (draw->edges.length && ext.width && ext.height)
-  {
-    if (unlikely (!draw->row_area.resize_dirty (ext.width) ||
-		  !draw->row_cover.resize_dirty (ext.width)))
-      goto fail;
-    hb_memset (draw->row_area.arrayZ,  0, ext.width * sizeof (int32_t));
-    hb_memset (draw->row_cover.arrayZ, 0, ext.width * sizeof (int16_t));
-
-    /* Bucket edges by their starting pixel row.
-       Only grow the outer vector; clear inner vectors without freeing. */
-    unsigned old_buckets = draw->edge_buckets.length;
-    if (ext.height > old_buckets)
-    {
-      if (unlikely (!draw->edge_buckets.resize (ext.height)))
-	goto fail;
-    }
-    for (unsigned i = 0; i < hb_min (ext.height, old_buckets); i++)
-      draw->edge_buckets.arrayZ[i].clear ();
-    /* New buckets (if any) are already empty from resize's zero-init. */
-
-    for (unsigned i = 0; i < draw->edges.length; i++)
-    {
-      int row = (draw->edges.arrayZ[i].yL >> HB_RASTER_PIXEL_BITS) - ext.y_origin;
-      if (row < 0) row = 0;
-      if ((unsigned) row >= ext.height) continue;
-      draw->edge_buckets.arrayZ[row].push (i);
-    }
-
-    /* Scanline loop with active edge list. */
-    draw->active_edges.clear ();
-
-    for (unsigned row = 0; row < ext.height; row++)
-    {
-      int32_t y_top = (ext.y_origin + (int) row) << HB_RASTER_PIXEL_BITS;
-
-      /* Add new edges from this row's bucket. */
-      draw->active_edges.extend (draw->edge_buckets.arrayZ[row]);
-
-      /* Process active edges and compact live ones in one linear pass. */
-      unsigned x_min = ext.width, x_max = 0;
-      unsigned write = 0;
-      unsigned active_len = draw->active_edges.length;
-      for (unsigned j = 0; j < active_len; j++)
-      {
-	unsigned edge_idx = draw->active_edges.arrayZ[j];
-	const auto &e = draw->edges.arrayZ[edge_idx];
-	if (e.yH <= y_top)
-	  continue;
-
-	edge_sweep_row (draw->row_area.arrayZ, draw->row_cover.arrayZ,
-			ext.width, ext.x_origin, y_top, e, x_min, x_max);
-	draw->active_edges.arrayZ[write++] = edge_idx;
-      }
-      draw->active_edges.resize (write);
-
-      if (x_min <= x_max)
-      {
-	int32_t cover_accum = sweep_row_to_alpha (image->buffer.arrayZ + row * ext.stride,
-						   draw->row_area.arrayZ, draw->row_cover.arrayZ,
-						   x_min, x_max);
-
-	/* If cover doesn't cancel, memset the constant-alpha tail. */
-	if (cover_accum != 0)
-	{
-	  int32_t alpha = cover_accum * (2 * HB_RASTER_ONE_PIXEL);
-	  alpha = alpha < 0 ? -alpha : alpha;
-	  if (alpha > HB_RASTER_FULL_COVERAGE) alpha = HB_RASTER_FULL_COVERAGE;
-	  uint8_t byte = (uint8_t) (((unsigned) alpha * 255 + HB_RASTER_FULL_COVERAGE / 2) >> (2 * HB_RASTER_PIXEL_BITS + 1));
-
-	  uint8_t *row_buf = image->buffer.arrayZ + row * ext.stride;
-	  hb_memset (row_buf + x_max + 1, byte, ext.width - 1 - x_max);
-	}
-      }
-    }
-  }
-
-done:
-  /* ── 6. Reset one-shot state ────────────────────────────────────── */
-  draw->edges.clear ();
-  draw->has_extents = false;
-  draw->fixed_extents     = {};
-
-  return image;
-
-fail:
-  hb_raster_image_destroy (image);
-  image = nullptr;
-  goto done;
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-image.cc b/engine/thirdparty/harfbuzz/src/hb-raster-image.cc
deleted file mode 100644
index bfe78dea..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-image.cc
+++ /dev/null
@@ -1,967 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-raster-image.hh"
-
-#include <math.h>
-
-#ifdef HAVE_PNG
-#include <png.h>
-#endif
-
-#ifdef HAVE_PNG
-struct hb_raster_png_read_blob_t
-{
-  const uint8_t *data = nullptr;
-  size_t size = 0;
-  size_t offset = 0;
-};
-
-static void
-hb_raster_png_error (png_structp png,
-		     png_const_charp msg HB_UNUSED)
-{
-  png_longjmp (png, 1);
-}
-
-static void
-hb_raster_png_warning (png_structp png HB_UNUSED,
-		       png_const_charp msg HB_UNUSED)
-{}
-
-static void
-hb_raster_png_read_blob (png_structp png, png_bytep out, png_size_t length)
-{
-  hb_raster_png_read_blob_t *r = (hb_raster_png_read_blob_t *) png_get_io_ptr (png);
-
-  if (!r || !r->data || length > r->size - r->offset)
-    png_error (png, "read error");
-
-  hb_memcpy (out, r->data + r->offset, length);
-  r->offset += length;
-}
-
-struct hb_raster_png_write_blob_t
-{
-  hb_vector_t<char> data;
-};
-
-static void
-hb_raster_png_write_blob (png_structp png, png_bytep in, png_size_t length)
-{
-  hb_raster_png_write_blob_t *w = (hb_raster_png_write_blob_t *) png_get_io_ptr (png);
-  if (!w)
-    png_error (png, "write error");
-
-  unsigned old_length = w->data.length;
-  if (!w->data.resize_dirty ((int) (old_length + length)))
-    png_error (png, "write error");
-
-  hb_memcpy (w->data.arrayZ + old_length, in, length);
-}
-
-static void
-hb_raster_png_flush_blob (png_structp png HB_UNUSED)
-{}
-#endif
-
-
-/*
- * Image compositing
- */
-
-/* Unpack premultiplied pixel to float RGBA [0,1]. */
-static inline void
-unpack_to_float (uint32_t px, float &r, float &g, float &b, float &a)
-{
-  b = (px & 0xFF) / 255.f;
-  g = ((px >> 8) & 0xFF) / 255.f;
-  r = ((px >> 16) & 0xFF) / 255.f;
-  a = (px >> 24) / 255.f;
-}
-
-/* Pack float RGBA [0,1] premultiplied back to uint32_t. */
-static inline uint32_t
-pack_from_float (float r, float g, float b, float a)
-{
-  return hb_raster_pack_pixel ((uint8_t) (hb_clamp (b, 0.f, 1.f) * 255.f + 0.5f),
-			       (uint8_t) (hb_clamp (g, 0.f, 1.f) * 255.f + 0.5f),
-			       (uint8_t) (hb_clamp (r, 0.f, 1.f) * 255.f + 0.5f),
-			       (uint8_t) (hb_clamp (a, 0.f, 1.f) * 255.f + 0.5f));
-}
-
-/* Separable blend mode functions: operate on unpremultiplied [0,1] channels. */
-static inline float
-blend_multiply (float sc, float dc) { return sc * dc; }
-static inline float
-blend_screen (float sc, float dc) { return sc + dc - sc * dc; }
-static inline float
-blend_overlay (float sc, float dc)
-{ return dc <= 0.5f ? 2.f * sc * dc : 1.f - 2.f * (1.f - sc) * (1.f - dc); }
-static inline float
-blend_darken (float sc, float dc) { return hb_min (sc, dc); }
-static inline float
-blend_lighten (float sc, float dc) { return hb_max (sc, dc); }
-static inline float
-blend_color_dodge (float sc, float dc)
-{
-  if (dc <= 0.f) return 0.f;
-  if (sc >= 1.f) return 1.f;
-  return hb_min (1.f, dc / (1.f - sc));
-}
-static inline float
-blend_color_burn (float sc, float dc)
-{
-  if (dc >= 1.f) return 1.f;
-  if (sc <= 0.f) return 0.f;
-  return 1.f - hb_min (1.f, (1.f - dc) / sc);
-}
-static inline float
-blend_hard_light (float sc, float dc)
-{ return sc <= 0.5f ? 2.f * sc * dc : 1.f - 2.f * (1.f - sc) * (1.f - dc); }
-static inline float
-blend_soft_light (float sc, float dc)
-{
-  if (sc <= 0.5f)
-    return dc - (1.f - 2.f * sc) * dc * (1.f - dc);
-  float d = (dc <= 0.25f) ? ((16.f * dc - 12.f) * dc + 4.f) * dc
-			   : sqrtf (dc);
-  return dc + (2.f * sc - 1.f) * (d - dc);
-}
-static inline float
-blend_difference (float sc, float dc) { return fabsf (sc - dc); }
-static inline float
-blend_exclusion (float sc, float dc) { return sc + dc - 2.f * sc * dc; }
-
-/* Apply a separable blend mode per-pixel.
- * Both src and dst are premultiplied BGRA32. */
-static inline uint32_t
-apply_separable_blend (uint32_t src, uint32_t dst,
-		       float (*blend_fn)(float, float))
-{
-  float sr, sg, sb, sa;
-  float dr, dg, db, da;
-  unpack_to_float (src, sr, sg, sb, sa);
-  unpack_to_float (dst, dr, dg, db, da);
-
-  float usr = sa > 0.f ? sr / sa : 0.f;
-  float usg = sa > 0.f ? sg / sa : 0.f;
-  float usb = sa > 0.f ? sb / sa : 0.f;
-  float udr = da > 0.f ? dr / da : 0.f;
-  float udg = da > 0.f ? dg / da : 0.f;
-  float udb = da > 0.f ? db / da : 0.f;
-
-  float br = blend_fn (usr, udr);
-  float bg = blend_fn (usg, udg);
-  float bb = blend_fn (usb, udb);
-
-  float ra = sa + da - sa * da;
-  float rr = sa * da * br + sa * (1.f - da) * usr + (1.f - sa) * da * udr;
-  float rg = sa * da * bg + sa * (1.f - da) * usg + (1.f - sa) * da * udg;
-  float rb = sa * da * bb + sa * (1.f - da) * usb + (1.f - sa) * da * udb;
-
-  return pack_from_float (rr, rg, rb, ra);
-}
-
-/* HSL helpers */
-static inline float
-hsl_luminosity (float r, float g, float b)
-{ return 0.299f * r + 0.587f * g + 0.114f * b; }
-
-static inline float
-hsl_saturation (float r, float g, float b)
-{ return hb_max (hb_max (r, g), b) - hb_min (hb_min (r, g), b); }
-
-static inline void
-hsl_clip_color (float &r, float &g, float &b)
-{
-  float l = hsl_luminosity (r, g, b);
-  float mn = hb_min (hb_min (r, g), b);
-  float mx = hb_max (hb_max (r, g), b);
-  if (mn < 0.f)
-  {
-    float d = l - mn;
-    if (d > 0.f) { r = l + (r - l) * l / d; g = l + (g - l) * l / d; b = l + (b - l) * l / d; }
-  }
-  if (mx > 1.f)
-  {
-    float d = mx - l;
-    if (d > 0.f) { r = l + (r - l) * (1.f - l) / d; g = l + (g - l) * (1.f - l) / d; b = l + (b - l) * (1.f - l) / d; }
-  }
-}
-
-static inline void
-hsl_set_luminosity (float &r, float &g, float &b, float l)
-{
-  float d = l - hsl_luminosity (r, g, b);
-  r += d; g += d; b += d;
-  hsl_clip_color (r, g, b);
-}
-
-static inline void
-hsl_set_saturation_inner (float &mn, float &mid, float &mx, float s)
-{
-  if (mx > mn)
-  {
-    mid = (mid - mn) * s / (mx - mn);
-    mx = s;
-  }
-  else
-    mid = mx = 0.f;
-  mn = 0.f;
-}
-
-static inline void
-hsl_set_saturation (float &r, float &g, float &b, float s)
-{
-  if (r <= g)
-  {
-    if (g <= b)      hsl_set_saturation_inner (r, g, b, s);
-    else if (r <= b) hsl_set_saturation_inner (r, b, g, s);
-    else             hsl_set_saturation_inner (b, r, g, s);
-  }
-  else
-  {
-    if (r <= b)      hsl_set_saturation_inner (g, r, b, s);
-    else if (g <= b) hsl_set_saturation_inner (g, b, r, s);
-    else             hsl_set_saturation_inner (b, g, r, s);
-  }
-}
-
-static inline uint32_t
-apply_hsl_blend (uint32_t src, uint32_t dst,
-		 hb_paint_composite_mode_t mode)
-{
-  float sr, sg, sb, sa;
-  float dr, dg, db, da;
-  unpack_to_float (src, sr, sg, sb, sa);
-  unpack_to_float (dst, dr, dg, db, da);
-
-  float usr = sa > 0.f ? sr / sa : 0.f;
-  float usg = sa > 0.f ? sg / sa : 0.f;
-  float usb = sa > 0.f ? sb / sa : 0.f;
-  float udr = da > 0.f ? dr / da : 0.f;
-  float udg = da > 0.f ? dg / da : 0.f;
-  float udb = da > 0.f ? db / da : 0.f;
-
-  float br = udr, bg = udg, bb = udb;
-
-  if (mode == HB_PAINT_COMPOSITE_MODE_HSL_HUE)
-  {
-    br = usr; bg = usg; bb = usb;
-    hsl_set_saturation (br, bg, bb, hsl_saturation (udr, udg, udb));
-    hsl_set_luminosity (br, bg, bb, hsl_luminosity (udr, udg, udb));
-  }
-  else if (mode == HB_PAINT_COMPOSITE_MODE_HSL_SATURATION)
-  {
-    br = udr; bg = udg; bb = udb;
-    hsl_set_saturation (br, bg, bb, hsl_saturation (usr, usg, usb));
-    hsl_set_luminosity (br, bg, bb, hsl_luminosity (udr, udg, udb));
-  }
-  else if (mode == HB_PAINT_COMPOSITE_MODE_HSL_COLOR)
-  {
-    br = usr; bg = usg; bb = usb;
-    hsl_set_luminosity (br, bg, bb, hsl_luminosity (udr, udg, udb));
-  }
-  else /* HSL_LUMINOSITY */
-  {
-    br = udr; bg = udg; bb = udb;
-    hsl_set_luminosity (br, bg, bb, hsl_luminosity (usr, usg, usb));
-  }
-
-  float ra = sa + da - sa * da;
-  float rr = sa * da * br + sa * (1.f - da) * usr + (1.f - sa) * da * udr;
-  float rg = sa * da * bg + sa * (1.f - da) * usg + (1.f - sa) * da * udg;
-  float rb = sa * da * bb + sa * (1.f - da) * usb + (1.f - sa) * da * udb;
-
-  return pack_from_float (rr, rg, rb, ra);
-}
-
-/* Composite per-pixel with full blend mode support. */
-static inline uint32_t
-composite_pixel (uint32_t src, uint32_t dst,
-		 hb_paint_composite_mode_t mode)
-{
-  uint8_t sa = (uint8_t) (src >> 24);
-  uint8_t da = (uint8_t) (dst >> 24);
-
-  switch (mode)
-  {
-  case HB_PAINT_COMPOSITE_MODE_CLEAR:
-    return 0;
-  case HB_PAINT_COMPOSITE_MODE_SRC:
-    return src;
-  case HB_PAINT_COMPOSITE_MODE_DEST:
-    return dst;
-  case HB_PAINT_COMPOSITE_MODE_SRC_OVER:
-    return hb_raster_src_over (src, dst);
-  case HB_PAINT_COMPOSITE_MODE_DEST_OVER:
-    return hb_raster_src_over (dst, src);
-  case HB_PAINT_COMPOSITE_MODE_SRC_IN:
-    return hb_raster_alpha_mul (src, da);
-  case HB_PAINT_COMPOSITE_MODE_DEST_IN:
-    return hb_raster_alpha_mul (dst, sa);
-  case HB_PAINT_COMPOSITE_MODE_SRC_OUT:
-    return hb_raster_alpha_mul (src, 255 - da);
-  case HB_PAINT_COMPOSITE_MODE_DEST_OUT:
-    return hb_raster_alpha_mul (dst, 255 - sa);
-  case HB_PAINT_COMPOSITE_MODE_SRC_ATOP:
-  {
-    /* Fa=Da, Fb=1-Sa */
-    uint32_t a = hb_raster_alpha_mul (src, da);
-    uint32_t b = hb_raster_alpha_mul (dst, 255 - sa);
-    uint8_t rb = (uint8_t) hb_min (255u, (unsigned) (a & 0xFF) + (b & 0xFF));
-    uint8_t rg = (uint8_t) hb_min (255u, (unsigned) ((a >> 8) & 0xFF) + ((b >> 8) & 0xFF));
-    uint8_t rr = (uint8_t) hb_min (255u, (unsigned) ((a >> 16) & 0xFF) + ((b >> 16) & 0xFF));
-    uint8_t ra = (uint8_t) hb_min (255u, (unsigned) (a >> 24) + (b >> 24));
-    return hb_raster_pack_pixel (rb, rg, rr, ra);
-  }
-  case HB_PAINT_COMPOSITE_MODE_DEST_ATOP:
-  {
-    uint32_t a = hb_raster_alpha_mul (dst, sa);
-    uint32_t b = hb_raster_alpha_mul (src, 255 - da);
-    uint8_t rb = (uint8_t) hb_min (255u, (unsigned) (a & 0xFF) + (b & 0xFF));
-    uint8_t rg = (uint8_t) hb_min (255u, (unsigned) ((a >> 8) & 0xFF) + ((b >> 8) & 0xFF));
-    uint8_t rr = (uint8_t) hb_min (255u, (unsigned) ((a >> 16) & 0xFF) + ((b >> 16) & 0xFF));
-    uint8_t ra = (uint8_t) hb_min (255u, (unsigned) (a >> 24) + (b >> 24));
-    return hb_raster_pack_pixel (rb, rg, rr, ra);
-  }
-  case HB_PAINT_COMPOSITE_MODE_XOR:
-  {
-    uint32_t a = hb_raster_alpha_mul (src, 255 - da);
-    uint32_t b = hb_raster_alpha_mul (dst, 255 - sa);
-    uint8_t rb = (uint8_t) hb_min (255u, (unsigned) (a & 0xFF) + (b & 0xFF));
-    uint8_t rg = (uint8_t) hb_min (255u, (unsigned) ((a >> 8) & 0xFF) + ((b >> 8) & 0xFF));
-    uint8_t rr = (uint8_t) hb_min (255u, (unsigned) ((a >> 16) & 0xFF) + ((b >> 16) & 0xFF));
-    uint8_t ra = (uint8_t) hb_min (255u, (unsigned) (a >> 24) + (b >> 24));
-    return hb_raster_pack_pixel (rb, rg, rr, ra);
-  }
-  case HB_PAINT_COMPOSITE_MODE_PLUS:
-  {
-    uint8_t rb = (uint8_t) hb_min (255u, (unsigned) (src & 0xFF) + (dst & 0xFF));
-    uint8_t rg = (uint8_t) hb_min (255u, (unsigned) ((src >> 8) & 0xFF) + ((dst >> 8) & 0xFF));
-    uint8_t rr = (uint8_t) hb_min (255u, (unsigned) ((src >> 16) & 0xFF) + ((dst >> 16) & 0xFF));
-    uint8_t ra = (uint8_t) hb_min (255u, (unsigned) (src >> 24) + (dst >> 24));
-    return hb_raster_pack_pixel (rb, rg, rr, ra);
-  }
-
-  case HB_PAINT_COMPOSITE_MODE_MULTIPLY:  return apply_separable_blend (src, dst, blend_multiply);
-  case HB_PAINT_COMPOSITE_MODE_SCREEN:    return apply_separable_blend (src, dst, blend_screen);
-  case HB_PAINT_COMPOSITE_MODE_OVERLAY:   return apply_separable_blend (src, dst, blend_overlay);
-  case HB_PAINT_COMPOSITE_MODE_DARKEN:    return apply_separable_blend (src, dst, blend_darken);
-  case HB_PAINT_COMPOSITE_MODE_LIGHTEN:   return apply_separable_blend (src, dst, blend_lighten);
-  case HB_PAINT_COMPOSITE_MODE_COLOR_DODGE: return apply_separable_blend (src, dst, blend_color_dodge);
-  case HB_PAINT_COMPOSITE_MODE_COLOR_BURN:  return apply_separable_blend (src, dst, blend_color_burn);
-  case HB_PAINT_COMPOSITE_MODE_HARD_LIGHT:  return apply_separable_blend (src, dst, blend_hard_light);
-  case HB_PAINT_COMPOSITE_MODE_SOFT_LIGHT:  return apply_separable_blend (src, dst, blend_soft_light);
-  case HB_PAINT_COMPOSITE_MODE_DIFFERENCE:  return apply_separable_blend (src, dst, blend_difference);
-  case HB_PAINT_COMPOSITE_MODE_EXCLUSION:   return apply_separable_blend (src, dst, blend_exclusion);
-
-  case HB_PAINT_COMPOSITE_MODE_HSL_HUE:
-  case HB_PAINT_COMPOSITE_MODE_HSL_SATURATION:
-  case HB_PAINT_COMPOSITE_MODE_HSL_COLOR:
-  case HB_PAINT_COMPOSITE_MODE_HSL_LUMINOSITY:
-    return apply_hsl_blend (src, dst, mode);
-
-  default:
-    return hb_raster_src_over (src, dst);
-  }
-}
-
-/* hb_raster_image_t */
-
-unsigned
-hb_raster_image_t::bytes_per_pixel (hb_raster_format_t format)
-{
-  return format == HB_RASTER_FORMAT_BGRA32 ? 4u : 1u;
-}
-
-bool
-hb_raster_image_t::configure (hb_raster_format_t format,
-			      hb_raster_extents_t extents)
-{
-  if (format != HB_RASTER_FORMAT_A8 &&
-      format != HB_RASTER_FORMAT_BGRA32)
-    format = HB_RASTER_FORMAT_A8;
-
-  unsigned bpp = bytes_per_pixel (format);
-  if (extents.width > UINT_MAX / bpp)
-    return false;
-
-  unsigned min_stride = extents.width * bpp;
-  if (extents.stride == 0 || extents.stride < min_stride)
-    extents.stride = min_stride;
-
-  if (extents.height && extents.stride > (size_t) -1 / extents.height)
-    return false;
-
-  size_t buf_size = (size_t) extents.stride * extents.height;
-  if (buf_size > HB_RASTER_MAX_BUFFER_SIZE)
-    return false;
-  if (unlikely (!buffer.resize_dirty (buf_size)))
-    return false;
-
-  this->format = format;
-  this->extents = extents;
-  return true;
-}
-
-bool
-hb_raster_image_t::deserialize_from_png (hb_blob_t *blob)
-{
-#ifndef HAVE_PNG
-  return false;
-#else
-  if (!blob)
-    return false;
-
-  unsigned blob_len = 0;
-  const uint8_t *blob_data = (const uint8_t *) hb_blob_get_data (blob, &blob_len);
-  if (!blob_data || !blob_len)
-    return false;
-
-  png_structp png = png_create_read_struct (PNG_LIBPNG_VER_STRING, nullptr,
-					    hb_raster_png_error,
-					    hb_raster_png_warning);
-  if (!png)
-    return false;
-
-  png_infop info = png_create_info_struct (png);
-  if (!info)
-  {
-    png_destroy_read_struct (&png, nullptr, nullptr);
-    return false;
-  }
-
-  hb_raster_png_read_blob_t reader;
-  reader.data = blob_data;
-  reader.size = (size_t) blob_len;
-  reader.offset = 0;
-  hb_vector_t<uint8_t> rgba;
-  hb_vector_t<png_bytep> rows;
-  if (setjmp (png_jmpbuf (png)))
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    rgba.fini ();
-    rows.fini ();
-    return false;
-  }
-
-  png_set_read_fn (png, &reader, hb_raster_png_read_blob);
-  png_read_info (png, info);
-
-  png_uint_32 w = 0, h = 0;
-  int bit_depth = 0, color_type = 0;
-  int interlace_type = 0, compression_type = 0, filter_method = 0;
-  png_get_IHDR (png, info, &w, &h, &bit_depth, &color_type,
-		&interlace_type, &compression_type, &filter_method);
-
-  if (!w || !h || w > (png_uint_32) INT_MAX || h > (png_uint_32) INT_MAX)
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  bool has_trns = png_get_valid (png, info, PNG_INFO_tRNS);
-
-  if (bit_depth == 16)
-    png_set_strip_16 (png);
-  if (color_type == PNG_COLOR_TYPE_PALETTE)
-    png_set_palette_to_rgb (png);
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    png_set_expand_gray_1_2_4_to_8 (png);
-  if (has_trns)
-    png_set_tRNS_to_alpha (png);
-  if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-    png_set_gray_to_rgb (png);
-  if (!(color_type & PNG_COLOR_MASK_ALPHA) && !has_trns)
-    png_set_add_alpha (png, 0xff, PNG_FILLER_AFTER);
-  if (interlace_type != PNG_INTERLACE_NONE)
-    png_set_interlace_handling (png);
-
-  png_read_update_info (png, info);
-
-  if (png_get_bit_depth (png, info) != 8 || png_get_channels (png, info) != 4)
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  png_size_t rowbytes = png_get_rowbytes (png, info);
-  if (rowbytes < (png_size_t) w * 4u)
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  size_t rgba_size = (size_t) rowbytes * (size_t) h;
-  if (h && rgba_size / (size_t) h != (size_t) rowbytes)
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  if (!rgba.resize (rgba_size))
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  if (!rows.resize ((unsigned) h))
-  {
-    png_destroy_read_struct (&png, &info, nullptr);
-    return false;
-  }
-
-  for (unsigned y = 0; y < (unsigned) h; y++)
-    rows[y] = (png_bytep) (rgba.arrayZ + (size_t) y * (size_t) rowbytes);
-
-  png_read_image (png, rows.arrayZ);
-  png_read_end (png, nullptr);
-  png_destroy_read_struct (&png, &info, nullptr);
-
-  hb_raster_image_t decoded;
-  hb_raster_extents_t decoded_extents = {0, 0, (unsigned) w, (unsigned) h, 0};
-  if (!decoded.configure (HB_RASTER_FORMAT_BGRA32, decoded_extents))
-    return false;
-
-  for (unsigned y = 0; y < (unsigned) h; y++)
-  {
-    hb_packed_t<uint32_t> *dst = (hb_packed_t<uint32_t> *) (decoded.buffer.arrayZ + (size_t) ((unsigned) h - 1 - y) * decoded.extents.stride);
-    const uint8_t *src = rgba.arrayZ + (size_t) y * (size_t) rowbytes;
-    for (unsigned x = 0; x < (unsigned) w; x++)
-    {
-      uint8_t r = src[4 * x + 0];
-      uint8_t g = src[4 * x + 1];
-      uint8_t b = src[4 * x + 2];
-      uint8_t a = src[4 * x + 3];
-      dst[x] = hb_packed_t<uint32_t> ((uint32_t) hb_raster_div255 (b * a)
-				    | ((uint32_t) hb_raster_div255 (g * a) << 8)
-				    | ((uint32_t) hb_raster_div255 (r * a) << 16)
-				    | ((uint32_t) a << 24));
-    }
-  }
-
-  hb_swap (buffer, decoded.buffer);
-  hb_swap (this->extents, decoded.extents);
-  hb_swap (format, decoded.format);
-  return true;
-#endif
-}
-
-hb_blob_t *
-hb_raster_image_t::serialize_to_png_or_fail () const
-{
-#ifndef HAVE_PNG
-  return nullptr;
-#else
-  if (format != HB_RASTER_FORMAT_BGRA32 || !extents.width || !extents.height)
-    return nullptr;
-
-  png_structp png = png_create_write_struct (PNG_LIBPNG_VER_STRING, nullptr,
-					     hb_raster_png_error,
-					     hb_raster_png_warning);
-  if (!png)
-    return nullptr;
-
-  png_infop info = png_create_info_struct (png);
-  if (!info)
-  {
-    png_destroy_write_struct (&png, nullptr);
-    return nullptr;
-  }
-
-  hb_raster_png_write_blob_t writer;
-  hb_vector_t<uint8_t> rgba;
-  hb_vector_t<png_bytep> rows;
-  if (setjmp (png_jmpbuf (png)))
-  {
-    png_destroy_write_struct (&png, &info);
-    writer.data.fini ();
-    rgba.fini ();
-    rows.fini ();
-    return nullptr;
-  }
-
-  png_set_write_fn (png, &writer, hb_raster_png_write_blob, hb_raster_png_flush_blob);
-  png_set_IHDR (png, info,
-		extents.width, extents.height,
-		8, PNG_COLOR_TYPE_RGBA,
-		PNG_INTERLACE_NONE,
-		PNG_COMPRESSION_TYPE_DEFAULT,
-		PNG_FILTER_TYPE_DEFAULT);
-  png_write_info (png, info);
-
-  size_t rowbytes = (size_t) extents.width * 4u;
-  size_t rgba_size = rowbytes * (size_t) extents.height;
-  if (extents.height && rgba_size / (size_t) extents.height != rowbytes)
-  {
-    png_destroy_write_struct (&png, &info);
-    return nullptr;
-  }
-
-  if (!rgba.resize (rgba_size))
-  {
-    png_destroy_write_struct (&png, &info);
-    return nullptr;
-  }
-
-  if (!rows.resize (extents.height))
-  {
-    png_destroy_write_struct (&png, &info);
-    return nullptr;
-  }
-
-  for (unsigned y = 0; y < extents.height; y++)
-  {
-    uint8_t *dst = rgba.arrayZ + (size_t) y * rowbytes;
-    const uint8_t *src = buffer.arrayZ + (size_t) (extents.height - 1 - y) * extents.stride;
-
-    for (unsigned x = 0; x < extents.width; x++)
-    {
-      uint32_t px;
-      hb_memcpy (&px, src + x * 4, 4);
-      uint8_t b = (uint8_t) (px & 0xFF);
-      uint8_t g = (uint8_t) ((px >> 8) & 0xFF);
-      uint8_t r = (uint8_t) ((px >> 16) & 0xFF);
-      uint8_t a = (uint8_t) (px >> 24);
-
-      dst[4 * x + 3] = a;
-      if (a)
-      {
-	dst[4 * x + 0] = (uint8_t) hb_min (255u, ((unsigned) r * 255u + a / 2u) / a);
-	dst[4 * x + 1] = (uint8_t) hb_min (255u, ((unsigned) g * 255u + a / 2u) / a);
-	dst[4 * x + 2] = (uint8_t) hb_min (255u, ((unsigned) b * 255u + a / 2u) / a);
-      }
-      else
-	dst[4 * x + 0] = dst[4 * x + 1] = dst[4 * x + 2] = 0;
-    }
-
-    rows[y] = (png_bytep) dst;
-  }
-
-  png_write_image (png, rows.arrayZ);
-  png_write_end (png, info);
-  png_destroy_write_struct (&png, &info);
-
-  unsigned length = 0;
-  char *data = writer.data.steal (&length);
-  if (!data && length)
-    return nullptr;
-
-  hb_blob_t *blob = hb_blob_create_or_fail (data, length,
-					    HB_MEMORY_MODE_WRITABLE,
-					    data, hb_free);
-  if (!blob)
-    hb_free (data);
-  return blob;
-#endif
-}
-
-void
-hb_raster_image_t::clear ()
-{
-  size_t buf_size = (size_t) extents.stride * extents.height;
-  hb_memset (buffer.arrayZ, 0, buf_size);
-}
-
-const uint8_t *
-hb_raster_image_t::get_buffer () const
-{
-  return buffer.arrayZ;
-}
-
-void
-hb_raster_image_t::composite_from (const hb_raster_image_t *src,
-				   hb_paint_composite_mode_t mode)
-{
-  unsigned w = extents.width;
-  unsigned h = extents.height;
-  unsigned stride = extents.stride;
-
-  for (unsigned y = 0; y < h; y++)
-  {
-    hb_packed_t<uint32_t> *dp = (hb_packed_t<uint32_t> *) (buffer.arrayZ + y * stride);
-    const hb_packed_t<uint32_t> *sp = (const hb_packed_t<uint32_t> *) (src->buffer.arrayZ + y * stride);
-    for (unsigned x = 0; x < w; x++)
-      dp[x] = hb_packed_t<uint32_t> (composite_pixel ((uint32_t) sp[x], (uint32_t) dp[x], mode));
-  }
-}
-
-/* Composite src image onto dst image.
- * Both images must have the same extents and BGRA32 format. */
-void
-hb_raster_image_composite (hb_raster_image_t *dst,
-			   const hb_raster_image_t *src,
-			   hb_paint_composite_mode_t mode)
-{
-  dst->composite_from (src, mode);
-}
-
-/**
- * hb_raster_image_create_or_fail:
- *
- * Creates a new raster image object.
- *
- * Return value: (transfer full):
- * A newly allocated #hb_raster_image_t with a reference count of 1,
- * or `NULL` on allocation failure.
- *
- * The returned image can be released with hb_raster_image_destroy(), or
- * transferred for reuse with hb_raster_draw_recycle_image() or
- * hb_raster_paint_recycle_image().
- *
- * Since: 13.0.0
- **/
-hb_raster_image_t *
-hb_raster_image_create_or_fail (void)
-{
-  return hb_object_create<hb_raster_image_t> ();
-}
-
-/**
- * hb_raster_image_reference: (skip)
- * @image: a raster image
- *
- * Increases the reference count on @image by one.
- *
- * This prevents @image from being destroyed until a matching
- * call to hb_raster_image_destroy() is made.
- *
- * Return value: (transfer full):
- * The referenced #hb_raster_image_t.
- *
- * Since: 13.0.0
- **/
-hb_raster_image_t *
-hb_raster_image_reference (hb_raster_image_t *image)
-{
-  return hb_object_reference (image);
-}
-
-/**
- * hb_raster_image_destroy: (skip)
- * @image: a raster image
- *
- * Decreases the reference count on @image by one. When the
- * reference count reaches zero, the image and its pixel buffer
- * are freed.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_image_destroy (hb_raster_image_t *image)
-{
-  if (!hb_object_destroy (image)) return;
-  hb_free (image);
-}
-
-/**
- * hb_raster_image_set_user_data: (skip)
- * @image: a raster image
- * @key: the user-data key
- * @data: a pointer to the user data
- * @destroy: (nullable): a callback to call when @data is not needed anymore
- * @replace: whether to replace an existing data with the same key
- *
- * Attaches a user-data key/data pair to the specified raster image.
- *
- * Return value: `true` if success, `false` otherwise
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_image_set_user_data (hb_raster_image_t  *image,
-			       hb_user_data_key_t *key,
-			       void               *data,
-			       hb_destroy_func_t   destroy,
-			       hb_bool_t           replace)
-{
-  return hb_object_set_user_data (image, key, data, destroy, replace);
-}
-
-/**
- * hb_raster_image_get_user_data: (skip)
- * @image: a raster image
- * @key: the user-data key
- *
- * Fetches the user-data associated with the specified key,
- * attached to the specified raster image.
- *
- * Return value: (transfer none):
- * A pointer to the user data
- *
- * Since: 13.0.0
- **/
-void *
-hb_raster_image_get_user_data (hb_raster_image_t  *image,
-			       hb_user_data_key_t *key)
-{
-  return hb_object_get_user_data (image, key);
-}
-
-/**
- * hb_raster_image_configure:
- * @image: a raster image
- * @format: the pixel format
- * @extents: (nullable): desired image extents
- *
- * Configures @image format and extents together, resizing backing storage
- * at most once. This function does not clear pixel contents.
- *
- * Passing `NULL` for @extents clears extents and releases the backing
- * allocation.
- *
- * Return value: `true` if configuration succeeds, `false` on allocation
- * failure
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_image_configure (hb_raster_image_t         *image,
-			   hb_raster_format_t        format,
-			   const hb_raster_extents_t *extents)
-{
-  if (unlikely (!extents))
-  {
-    image->extents = {};
-    image->buffer.resize_exact (0);
-    return true;
-  }
-  return image->configure (format, *extents);
-}
-
-/**
- * hb_raster_image_clear:
- * @image: a raster image
- *
- * Clears @image pixels to zero while keeping current extents and format.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_image_clear (hb_raster_image_t *image)
-{
-  image->clear ();
-}
-
-/**
- * hb_raster_image_get_buffer:
- * @image: a raster image
- *
- * Fetches the raw pixel buffer of @image.  The buffer layout is
- * described by the extents obtained from hb_raster_image_get_extents()
- * and the format from hb_raster_image_get_format(). Rows are stored
- * bottom-to-top.
- *
- * Return value: (transfer none) (array):
- * The pixel buffer, or `NULL`
- *
- * Since: 13.0.0
- **/
-const uint8_t *
-hb_raster_image_get_buffer (hb_raster_image_t *image)
-{
-  return image->get_buffer ();
-}
-
-/**
- * hb_raster_image_get_extents:
- * @image: a raster image
- * @extents: (out) (nullable): the image extents
- *
- * Fetches the pixel-buffer extents of @image.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_image_get_extents (hb_raster_image_t   *image,
-			     hb_raster_extents_t *extents)
-{
-  if (extents)
-    *extents = image->extents;
-}
-
-/**
- * hb_raster_image_get_format:
- * @image: a raster image
- *
- * Fetches the pixel format of @image.
- *
- * Return value:
- * The #hb_raster_format_t of the image
- *
- * Since: 13.0.0
- **/
-hb_raster_format_t
-hb_raster_image_get_format (hb_raster_image_t *image)
-{
-  return image->format;
-}
-
-/**
- * hb_raster_image_deserialize_from_png_or_fail:
- * @image: a raster image
- * @png: PNG data
- *
- * Replaces @image contents by deserializing a PNG blob into a
- * #HB_RASTER_FORMAT_BGRA32 raster image.
- *
- * On success, @image extents are reset to pixel extents with origin
- * `(0, 0)`. Rows in the resulting image buffer are stored bottom-to-top.
- * On failure, @image is left unchanged.
- *
- * Return value: `true` if deserialization succeeded, `false` otherwise
- *
- * Since: 13.1.0
- **/
-hb_bool_t
-hb_raster_image_deserialize_from_png_or_fail (hb_raster_image_t *image,
-					      hb_blob_t         *png)
-{
-  return image->deserialize_from_png (png);
-}
-
-/**
- * hb_raster_image_serialize_to_png_or_fail:
- * @image: a raster image
- *
- * Serializes @image to a PNG blob.
- *
- * Currently only #HB_RASTER_FORMAT_BGRA32 images are supported.
- *
- * Return value: (transfer full):
- * A newly allocated PNG #hb_blob_t, or `NULL` on failure
- *
- * Since: 13.1.0
- **/
-hb_blob_t *
-hb_raster_image_serialize_to_png_or_fail (hb_raster_image_t *image)
-{
-  return image->serialize_to_png_or_fail ();
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-image.hh b/engine/thirdparty/harfbuzz/src/hb-raster-image.hh
deleted file mode 100644
index d2e81ba1..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-image.hh
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_IMAGE_HH
-#define HB_RASTER_IMAGE_HH
-
-#include "hb.hh"
-#include "hb-raster-utils.hh"
-#include "hb-raster.h"
-#include "hb-object.hh"
-#include "hb-vector.hh"
-
-
-/* hb_raster_image_t — pixel artifact */
-struct hb_raster_image_t
-{
-  hb_object_header_t  header;
-
-  hb_vector_t<uint8_t> buffer;
-  hb_raster_extents_t  extents     = {};
-  hb_raster_format_t   format      = HB_RASTER_FORMAT_A8;
-
-  HB_INTERNAL static unsigned bytes_per_pixel (hb_raster_format_t format);
-  HB_INTERNAL bool configure (hb_raster_format_t format, hb_raster_extents_t extents);
-  HB_INTERNAL bool deserialize_from_png (hb_blob_t *png);
-  HB_INTERNAL hb_blob_t *serialize_to_png_or_fail () const;
-  HB_INTERNAL void clear ();
-  HB_INTERNAL const uint8_t *get_buffer () const;
-  HB_INTERNAL void composite_from (const hb_raster_image_t *src,
-				   hb_paint_composite_mode_t mode);
-};
-
-/* Composite src image onto dst. */
-HB_INTERNAL void
-hb_raster_image_composite (hb_raster_image_t *dst,
-			   const hb_raster_image_t *src,
-			   hb_paint_composite_mode_t mode);
-
-
-#endif /* HB_RASTER_IMAGE_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-paint.cc b/engine/thirdparty/harfbuzz/src/hb-raster-paint.cc
deleted file mode 100644
index 84657cdd..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-paint.cc
+++ /dev/null
@@ -1,2253 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-raster-paint.hh"
-#include "hb-raster-svg.hh"
-#include "hb-machinery.hh"
-
-#include <math.h>
-
-
-/*
- * Pixel helpers (paint-specific)
- */
-
-/* Convert unpremultiplied hb_color_t (BGRA order) to premultiplied BGRA32 pixel. */
-static inline uint32_t
-color_to_premul_pixel (hb_color_t color)
-{
-  uint8_t a = hb_color_get_alpha (color);
-  uint8_t r = hb_raster_div255 (hb_color_get_red (color) * a);
-  uint8_t g = hb_raster_div255 (hb_color_get_green (color) * a);
-  uint8_t b = hb_raster_div255 (hb_color_get_blue (color) * a);
-  return (uint32_t) b | ((uint32_t) g << 8) | ((uint32_t) r << 16) | ((uint32_t) a << 24);
-}
-
-/* Bilinear sample from a premultiplied BGRA32 image. */
-static inline uint32_t
-hb_raster_sample_bilinear_premul (const hb_packed_t<uint32_t> *src,
-				  unsigned width,
-				  unsigned height,
-				  float x,
-				  float y)
-{
-  int x0 = (int) floorf (x);
-  int y0 = (int) floorf (y);
-  int x1 = x0 + 1;
-  int y1 = y0 + 1;
-  if (x1 >= (int) width) x1 = (int) width - 1;
-  if (y1 >= (int) height) y1 = (int) height - 1;
-
-  float tx = x - x0;
-  float ty = y - y0;
-  float omtx = 1.f - tx;
-  float omty = 1.f - ty;
-
-  uint32_t p00 = (uint32_t) src[(size_t) y0 * width + (size_t) x0];
-  uint32_t p10 = (uint32_t) src[(size_t) y0 * width + (size_t) x1];
-  uint32_t p01 = (uint32_t) src[(size_t) y1 * width + (size_t) x0];
-  uint32_t p11 = (uint32_t) src[(size_t) y1 * width + (size_t) x1];
-
-  float w00 = omtx * omty;
-  float w10 = tx * omty;
-  float w01 = omtx * ty;
-  float w11 = tx * ty;
-
-  float b = ((p00 >>  0) & 0xff) * w00 + ((p10 >>  0) & 0xff) * w10 +
-	    ((p01 >>  0) & 0xff) * w01 + ((p11 >>  0) & 0xff) * w11;
-  float g = ((p00 >>  8) & 0xff) * w00 + ((p10 >>  8) & 0xff) * w10 +
-	    ((p01 >>  8) & 0xff) * w01 + ((p11 >>  8) & 0xff) * w11;
-  float r = ((p00 >> 16) & 0xff) * w00 + ((p10 >> 16) & 0xff) * w10 +
-	    ((p01 >> 16) & 0xff) * w01 + ((p11 >> 16) & 0xff) * w11;
-  float a = ((p00 >> 24) & 0xff) * w00 + ((p10 >> 24) & 0xff) * w10 +
-	    ((p01 >> 24) & 0xff) * w01 + ((p11 >> 24) & 0xff) * w11;
-
-  return (uint32_t) (b + 0.5f)
-       | ((uint32_t) (g + 0.5f) << 8)
-       | ((uint32_t) (r + 0.5f) << 16)
-       | ((uint32_t) (a + 0.5f) << 24);
-}
-
-
-/*
- * Paint callbacks
- */
-
-/* Lazy initialization: set up root surface, initial clip and transform.
- * Called from every paint callback that needs state.
- * hb_font_paint_glyph() does NOT wrap with push/pop_transform,
- * so the first callback could be push_clip_glyph or paint_color. */
-static void
-ensure_initialized (hb_raster_paint_t *c)
-{
-  if (c->surface_stack.length) return;
-
-  /* Root surface */
-  hb_raster_image_t *root = c->acquire_surface ();
-  if (unlikely (!root)) return;
-  if (unlikely (!c->surface_stack.push_or_fail (root)))
-  {
-    c->release_surface (root);
-    return;
-  }
-
-  /* Initial transform */
-  if (unlikely (!c->transform_stack.push_or_fail (c->base_transform)))
-  {
-    c->release_surface (c->surface_stack.pop ());
-    return;
-  }
-
-  /* Initial clip: full coverage rectangle */
-  hb_raster_clip_t clip;
-  clip.init_full (c->fixed_extents.width, c->fixed_extents.height);
-  if (unlikely (!c->clip_stack.push_or_fail (std::move (clip))))
-  {
-    c->transform_stack.pop ();
-    c->release_surface (c->surface_stack.pop ());
-    return;
-  }
-}
-
-static void
-hb_raster_paint_push_transform (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				void *paint_data,
-				float xx, float yx,
-				float xy, float yy,
-				float dx, float dy,
-				void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-  if (unlikely (!c->transform_stack.length)) return;
-
-  hb_transform_t<> t = c->current_transform ();
-  t.multiply ({xx, yx, xy, yy, dx, dy});
-  (void) c->transform_stack.push (t);
-}
-
-static void
-hb_raster_paint_pop_transform (hb_paint_funcs_t *pfuncs HB_UNUSED,
-			       void *paint_data,
-			       void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-  c->transform_stack.pop ();
-}
-
-static hb_bool_t
-hb_raster_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
-			     void *paint_data HB_UNUSED,
-			     hb_codepoint_t glyph HB_UNUSED,
-			     hb_font_t *font HB_UNUSED,
-			     void *user_data HB_UNUSED)
-{
-  return false;
-}
-
-typedef void (*hb_raster_paint_clip_mask_emit_t) (hb_raster_draw_t *rdr, void *user_data);
-
-static void
-hb_raster_paint_push_empty_clip (hb_raster_paint_t *c, unsigned w, unsigned h)
-{
-  hb_raster_clip_t new_clip = c->acquire_clip (w, h);
-  new_clip.init_full (w, h);
-  new_clip.is_rect = true;
-  new_clip.rect_x0 = new_clip.rect_y0 = 0;
-  new_clip.rect_x1 = new_clip.rect_y1 = 0;
-  new_clip.min_x = new_clip.min_y = new_clip.max_x = new_clip.max_y = 0;
-  (void) c->clip_stack.push (std::move (new_clip));
-}
-
-static void
-hb_raster_paint_push_clip_from_emitter (hb_raster_paint_t *c,
-					hb_raster_paint_clip_mask_emit_t emit,
-					void *emit_data)
-{
-  ensure_initialized (c);
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  unsigned w = surf->extents.width;
-  unsigned h = surf->extents.height;
-
-  hb_raster_clip_t new_clip = c->acquire_clip (w, h);
-
-  hb_raster_draw_t *rdr = c->clip_rdr;
-  hb_transform_t<> t = c->current_effective_transform ();
-  hb_raster_draw_set_transform (rdr, t.xx, t.yx, t.xy, t.yy, t.x0, t.y0);
-  emit (rdr, emit_data);
-  hb_raster_image_t *mask_img = hb_raster_draw_render (rdr);
-
-  if (unlikely (!mask_img))
-  {
-    hb_raster_paint_push_empty_clip (c, w, h);
-    return;
-  }
-
-  /* Allocate alpha buffer and intersect with previous clip */
-  size_t clip_size = (size_t) new_clip.stride * h;
-  if (unlikely (clip_size > HB_RASTER_MAX_BUFFER_SIZE ||
-                !new_clip.alpha.resize ((unsigned) clip_size)))
-  {
-    hb_raster_draw_recycle_image (rdr, mask_img);
-    hb_raster_paint_push_empty_clip (c, w, h);
-    return;
-  }
-
-  const uint8_t *mask_buf = hb_raster_image_get_buffer (mask_img);
-  hb_raster_extents_t mask_ext;
-  hb_raster_image_get_extents (mask_img, &mask_ext);
-  const hb_raster_clip_t &old_clip = c->current_clip ();
-
-  /* Convert mask extents from surface coordinates to clip-buffer coordinates. */
-  int mask_x0 = mask_ext.x_origin - surf->extents.x_origin;
-  int mask_y0 = mask_ext.y_origin - surf->extents.y_origin;
-  int mask_x1 = mask_x0 + (int) mask_ext.width;
-  int mask_y1 = mask_y0 + (int) mask_ext.height;
-
-  int ix0_i = hb_max ((int) old_clip.min_x, hb_max (mask_x0, 0));
-  int iy0_i = hb_max ((int) old_clip.min_y, hb_max (mask_y0, 0));
-  int ix1_i = hb_min ((int) old_clip.max_x, hb_min (mask_x1, (int) w));
-  int iy1_i = hb_min ((int) old_clip.max_y, hb_min (mask_y1, (int) h));
-
-  if (ix0_i >= ix1_i || iy0_i >= iy1_i)
-  {
-    hb_raster_draw_recycle_image (rdr, mask_img);
-    hb_raster_paint_push_empty_clip (c, w, h);
-    return;
-  }
-
-  unsigned ix0 = (unsigned) ix0_i;
-  unsigned iy0 = (unsigned) iy0_i;
-  unsigned ix1 = (unsigned) ix1_i;
-  unsigned iy1 = (unsigned) iy1_i;
-
-  new_clip.min_x = w; new_clip.min_y = h;
-  new_clip.max_x = 0; new_clip.max_y = 0;
-
-  if (old_clip.is_rect)
-  {
-    for (unsigned y = iy0; y < iy1; y++)
-    {
-      const uint8_t *mask_row = mask_buf + (unsigned) ((int) y - mask_y0) * mask_ext.stride;
-      uint8_t *out_row = new_clip.alpha.arrayZ + y * new_clip.stride;
-      unsigned row_min = ix1;
-      unsigned row_max = ix0;
-      unsigned mx = (unsigned) ((int) ix0 - mask_x0);
-      for (unsigned x = ix0; x < ix1; x++)
-      {
-	uint8_t a = mask_row[mx++];
-	out_row[x] = a;
-	if (a && row_min == ix1)
-	{
-	  row_min = x;
-	  row_max = x + 1;
-	}
-	else if (a)
-	  row_max = x + 1;
-      }
-      if (row_min < row_max)
-      {
-	new_clip.min_x = hb_min (new_clip.min_x, row_min);
-	new_clip.min_y = hb_min (new_clip.min_y, y);
-	new_clip.max_x = hb_max (new_clip.max_x, row_max);
-	new_clip.max_y = hb_max (new_clip.max_y, y + 1);
-      }
-    }
-  }
-  else
-  {
-    for (unsigned y = iy0; y < iy1; y++)
-    {
-      const uint8_t *old_row = old_clip.alpha.arrayZ + y * old_clip.stride;
-      const uint8_t *mask_row = mask_buf + (unsigned) ((int) y - mask_y0) * mask_ext.stride;
-      uint8_t *out_row = new_clip.alpha.arrayZ + y * new_clip.stride;
-      unsigned row_min = ix1;
-      unsigned row_max = ix0;
-      for (unsigned x = ix0; x < ix1; x++)
-      {
-	unsigned mx = (unsigned) ((int) x - mask_x0);
-	uint8_t a = hb_raster_div255 (mask_row[mx] * old_row[x]);
-	out_row[x] = a;
-	if (a)
-	{
-	  row_min = hb_min (row_min, x);
-	  row_max = x + 1;
-	}
-      }
-      if (row_min < row_max)
-      {
-	new_clip.min_x = hb_min (new_clip.min_x, row_min);
-	new_clip.min_y = hb_min (new_clip.min_y, y);
-	new_clip.max_x = hb_max (new_clip.max_x, row_max);
-	new_clip.max_y = hb_max (new_clip.max_y, y + 1);
-      }
-    }
-  }
-
-  hb_raster_draw_recycle_image (rdr, mask_img);
-  if (unlikely (!c->clip_stack.push_or_fail (std::move (new_clip))))
-    hb_raster_paint_push_empty_clip (c, w, h);
-}
-
-struct hb_raster_paint_glyph_clip_data_t
-{
-  hb_codepoint_t glyph;
-  hb_font_t *font;
-};
-
-static void
-hb_raster_paint_emit_clip_glyph_mask (hb_raster_draw_t *rdr, void *user_data)
-{
-  hb_raster_paint_glyph_clip_data_t *data = (hb_raster_paint_glyph_clip_data_t *) user_data;
-  /* Let draw-render choose tight glyph extents; we map by mask origin below. */
-  hb_font_draw_glyph (data->font, data->glyph, hb_raster_draw_get_funcs (), rdr);
-}
-
-static void
-hb_raster_paint_push_clip_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				 void *paint_data,
-				 hb_codepoint_t glyph,
-				 hb_font_t *font,
-				 void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-  hb_raster_paint_glyph_clip_data_t data = {glyph, font};
-  hb_raster_paint_push_clip_from_emitter (c, hb_raster_paint_emit_clip_glyph_mask, &data);
-}
-
-/* Push clip from arbitrary path emitter (used by SVG rasterizer).
- * Identical to push_clip_glyph but calls user func instead of hb_font_draw_glyph. */
-struct hb_raster_paint_path_clip_data_t
-{
-  hb_raster_svg_path_func_t func;
-  void *user_data;
-};
-
-static void
-hb_raster_paint_emit_clip_path_mask (hb_raster_draw_t *rdr, void *user_data)
-{
-  hb_raster_paint_path_clip_data_t *data = (hb_raster_paint_path_clip_data_t *) user_data;
-  data->func (hb_raster_draw_get_funcs (), rdr, data->user_data);
-}
-
-void
-hb_raster_paint_push_clip_path (hb_raster_paint_t *c,
-				hb_raster_svg_path_func_t func,
-				void *user_data)
-{
-  hb_raster_paint_path_clip_data_t data = {func, user_data};
-  hb_raster_paint_push_clip_from_emitter (c, hb_raster_paint_emit_clip_path_mask, &data);
-}
-
-static void
-hb_raster_paint_push_clip_rectangle (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				     void *paint_data,
-				     float xmin, float ymin,
-				     float xmax, float ymax,
-				     void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  if (!c->surface_stack.length) return;
-
-  hb_transform_t<> t = c->current_effective_transform ();
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  unsigned w = surf->extents.width;
-  unsigned h = surf->extents.height;
-  bool is_axis_aligned = (t.xy == 0.f && t.yx == 0.f);
-
-  /* Transform the four corners to pixel space */
-  float cx[4], cy[4];
-  cx[0] = xmin; cy[0] = ymin;
-  cx[1] = xmax; cy[1] = ymin;
-  cx[2] = xmax; cy[2] = ymax;
-  cx[3] = xmin; cy[3] = ymax;
-  for (unsigned i = 0; i < 4; i++)
-    t.transform_point (cx[i], cy[i]);
-
-  /* Compute bounding box in pixel coords */
-  float fmin_x = cx[0], fmin_y = cy[0], fmax_x = cx[0], fmax_y = cy[0];
-  for (unsigned i = 1; i < 4; i++)
-  {
-    fmin_x = hb_min (fmin_x, cx[i]); fmin_y = hb_min (fmin_y, cy[i]);
-    fmax_x = hb_max (fmax_x, cx[i]); fmax_y = hb_max (fmax_y, cy[i]);
-  }
-
-  int px0 = (int) floorf (fmin_x) - surf->extents.x_origin;
-  int py0 = (int) floorf (fmin_y) - surf->extents.y_origin;
-  int px1 = (int) ceilf (fmax_x) - surf->extents.x_origin;
-  int py1 = (int) ceilf (fmax_y) - surf->extents.y_origin;
-
-  /* Clamp to surface bounds */
-  px0 = hb_max (px0, 0);
-  py0 = hb_max (py0, 0);
-  px1 = hb_min (px1, (int) w);
-  py1 = hb_min (py1, (int) h);
-
-  const hb_raster_clip_t &old_clip = c->current_clip ();
-
-  hb_raster_clip_t new_clip = c->acquire_clip (w, h);
-
-  if (is_axis_aligned && old_clip.is_rect)
-  {
-    /* Fast path: axis-aligned rect-on-rect intersection */
-    new_clip.is_rect = true;
-    new_clip.rect_x0 = hb_max (px0, old_clip.rect_x0);
-    new_clip.rect_y0 = hb_max (py0, old_clip.rect_y0);
-    new_clip.rect_x1 = hb_min (px1, old_clip.rect_x1);
-    new_clip.rect_y1 = hb_min (py1, old_clip.rect_y1);
-    new_clip.update_bounds_from_rect ();
-  }
-  else
-  {
-    /* General case: rasterize transformed quad as alpha mask */
-    new_clip.is_rect = false;
-    size_t clip_size = (size_t) new_clip.stride * h;
-    if (unlikely (clip_size > HB_RASTER_MAX_BUFFER_SIZE ||
-                  !new_clip.alpha.resize ((unsigned) clip_size)))
-    {
-      hb_raster_paint_push_empty_clip (c, w, h);
-      return;
-    }
-    hb_memset (new_clip.alpha.arrayZ, 0, (unsigned) clip_size);
-
-    /* Convert quad corners to pixel-relative coords */
-    float qx[4], qy[4];
-    int ox = surf->extents.x_origin;
-    int oy = surf->extents.y_origin;
-    for (unsigned i = 0; i < 4; i++)
-    {
-      qx[i] = cx[i] - ox;
-      qy[i] = cy[i] - oy;
-    }
-
-    /* For each pixel in the bounding box, test if inside the quad
-     * using cross-product edge tests (winding order). */
-    unsigned iy0 = (unsigned) hb_max (py0, (int) old_clip.min_y);
-    unsigned iy1 = (unsigned) hb_min (py1, (int) old_clip.max_y);
-    unsigned ix0 = (unsigned) hb_max (px0, (int) old_clip.min_x);
-    unsigned ix1 = (unsigned) hb_min (px1, (int) old_clip.max_x);
-    new_clip.min_x = w; new_clip.min_y = h;
-    new_clip.max_x = 0; new_clip.max_y = 0;
-
-    /* Precompute edge normals for point-in-quad test.
-     * Edge i goes from corner i to corner (i+1)%4.
-     * Normal = (dy, -dx); inside test: dot(normal, p-corner) >= 0 */
-	    float enx[4], eny[4], ed[4];
-	    for (unsigned i = 0; i < 4; i++)
-	    {
-	      unsigned j = (i + 1) & 3;
-	      float edx = qx[j] - qx[i], edy = qy[j] - qy[i];
-	      enx[i] = edy;       /* normal x */
-	      eny[i] = -edx;      /* normal y */
-	      ed[i] = enx[i] * qx[i] + eny[i] * qy[i]; /* distance threshold */
-	    }
-	    float area2 = 0.f;
-	    for (unsigned i = 0; i < 4; i++)
-	    {
-	      unsigned j = (i + 1) & 3;
-	      area2 += qx[i] * qy[j] - qx[j] * qy[i];
-	    }
-	    bool ccw = area2 >= 0.f;
-
-    if (old_clip.is_rect)
-    {
-      for (unsigned y = iy0; y < iy1; y++)
-	for (unsigned x = ix0; x < ix1; x++)
-	{
-	  float px_f = x + 0.5f, py_f = y + 0.5f;
-	  /* Test if pixel center is inside the quad */
-		  bool inside = true;
-		  for (unsigned i = 0; i < 4; i++)
-		  {
-		    float d = enx[i] * px_f + eny[i] * py_f;
-		    if (ccw ? d < ed[i] : d > ed[i])
-		    {
-		      inside = false;
-		      break;
-		    }
-		  }
-	  uint8_t a = inside ? 255 : 0;
-	  new_clip.alpha[y * new_clip.stride + x] = a;
-	  if (a)
-	  {
-	    new_clip.min_x = hb_min (new_clip.min_x, x);
-	    new_clip.min_y = hb_min (new_clip.min_y, y);
-	    new_clip.max_x = hb_max (new_clip.max_x, x + 1);
-	    new_clip.max_y = hb_max (new_clip.max_y, y + 1);
-	  }
-	}
-    }
-    else
-    {
-      for (unsigned y = iy0; y < iy1; y++)
-      {
-	const uint8_t *old_row = old_clip.alpha.arrayZ + y * old_clip.stride;
-	for (unsigned x = ix0; x < ix1; x++)
-	{
-	  float px_f = x + 0.5f, py_f = y + 0.5f;
-	  /* Test if pixel center is inside the quad */
-		  bool inside = true;
-		  for (unsigned i = 0; i < 4; i++)
-		  {
-		    float d = enx[i] * px_f + eny[i] * py_f;
-		    if (ccw ? d < ed[i] : d > ed[i])
-		    {
-		      inside = false;
-		      break;
-		    }
-		  }
-	  uint8_t a = inside ? old_row[x] : 0;
-	  new_clip.alpha[y * new_clip.stride + x] = a;
-	  if (a)
-	  {
-	    new_clip.min_x = hb_min (new_clip.min_x, x);
-	    new_clip.min_y = hb_min (new_clip.min_y, y);
-	    new_clip.max_x = hb_max (new_clip.max_x, x + 1);
-	    new_clip.max_y = hb_max (new_clip.max_y, y + 1);
-	  }
-	}
-      }
-    }
-  }
-
-  if (unlikely (!c->clip_stack.push_or_fail (std::move (new_clip))))
-    hb_raster_paint_push_empty_clip (c, surf->extents.width, surf->extents.height);
-}
-
-static void
-hb_raster_paint_pop_clip (hb_paint_funcs_t *pfuncs HB_UNUSED,
-			  void *paint_data,
-			  void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-  if (!c->clip_stack.length) return;
-  c->release_clip (c->clip_stack.pop ());
-}
-
-static void
-hb_raster_paint_push_group (hb_paint_funcs_t *pfuncs HB_UNUSED,
-			    void *paint_data,
-			    void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  hb_raster_image_t *new_surf = c->acquire_surface ();
-  if (unlikely (!new_surf)) return;
-  if (unlikely (!c->surface_stack.push_or_fail (new_surf)))
-    c->release_surface (new_surf);
-}
-
-static void
-hb_raster_paint_pop_group (hb_paint_funcs_t *pfuncs HB_UNUSED,
-			   void *paint_data,
-			   hb_paint_composite_mode_t mode,
-			   void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  if (c->surface_stack.length < 2) return;
-
-  hb_raster_image_t *src = c->surface_stack.pop ();
-  hb_raster_image_t *dst = c->current_surface ();
-
-  if (dst && src)
-    hb_raster_image_composite (dst, src, mode);
-
-  c->release_surface (src);
-}
-
-static void
-hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
-		       void *paint_data,
-		       hb_bool_t is_foreground,
-		       hb_color_t color,
-		       void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  if (is_foreground)
-  {
-    /* Use foreground color, modulating alpha */
-    color = HB_COLOR (hb_color_get_blue (c->foreground),
-		      hb_color_get_green (c->foreground),
-		      hb_color_get_red (c->foreground),
-		      hb_raster_div255 (hb_color_get_alpha (c->foreground) *
-			      hb_color_get_alpha (color)));
-  }
-
-  uint32_t premul = color_to_premul_pixel (color);
-  uint8_t premul_a = (uint8_t) (premul >> 24);
-  const hb_raster_clip_t &clip = c->current_clip ();
-
-  unsigned stride = surf->extents.stride;
-  if (clip.min_x >= clip.max_x || clip.min_y >= clip.max_y) return;
-  if (premul_a == 0) return;
-
-  if (likely (!clip.is_rect))
-  {
-    for (unsigned y = clip.min_y; y < clip.max_y; y++)
-    {
-      hb_packed_t<uint32_t> *__restrict row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + y * stride);
-      const uint8_t *__restrict clip_row = clip.alpha.arrayZ + y * clip.stride;
-      for (unsigned x = clip.min_x; x < clip.max_x; x++)
-      {
-	uint8_t clip_alpha = clip_row[x];
-	if (clip_alpha == 0) continue;
-	if (clip_alpha == 255)
-	{
-	  if (premul_a == 255)
-	    row[x] = hb_packed_t<uint32_t> (premul);
-	  else
-	    row[x] = hb_packed_t<uint32_t> (hb_raster_src_over (premul, (uint32_t) row[x]));
-	}
-	else
-	{
-	  uint32_t src = hb_raster_alpha_mul (premul, clip_alpha);
-	  row[x] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[x]));
-	}
-      }
-    }
-  }
-  else
-  {
-    for (unsigned y = clip.min_y; y < clip.max_y; y++)
-    {
-      hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + y * stride);
-      for (unsigned x = clip.min_x; x < clip.max_x; x++)
-	row[x] = hb_packed_t<uint32_t> (hb_raster_src_over (premul, (uint32_t) row[x]));
-    }
-  }
-}
-
-static hb_bool_t
-hb_raster_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED,
-		       void *paint_data,
-		       hb_blob_t *blob,
-		       unsigned width,
-		       unsigned height,
-		       hb_tag_t format,
-		       float slant HB_UNUSED,
-		       hb_glyph_extents_t *extents,
-		       void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  /* Handle SVG format */
-  if (format == HB_PAINT_IMAGE_FORMAT_SVG)
-    return hb_raster_svg_render (c, blob, c->svg_glyph, c->svg_font,
-				 c->svg_palette, c->foreground);
-
-  unsigned src_width = width;
-  unsigned src_height = height;
-  const hb_packed_t<uint32_t> *src_data = nullptr;
-  hb_raster_image_t decoded_png;
-
-  if (format == HB_PAINT_IMAGE_FORMAT_BGRA)
-  {
-    if (src_width == 0 || src_height == 0)
-      return false;
-    if (src_width > (unsigned) INT_MAX || src_height > (unsigned) INT_MAX)
-      return false;
-
-    unsigned data_len;
-    const uint8_t *data = (const uint8_t *) hb_blob_get_data (blob, &data_len);
-    size_t pixel_count = (size_t) src_width * (size_t) src_height;
-    if (src_width && pixel_count / src_width != src_height)
-      return false;
-    if (pixel_count > (size_t) -1 / 4u)
-      return false;
-    size_t required_size = pixel_count * 4u;
-    if (!data || (size_t) data_len < required_size)
-      return false;
-
-    src_data = (const hb_packed_t<uint32_t> *) data;
-  }
-  else if (format == HB_PAINT_IMAGE_FORMAT_PNG)
-  {
-#ifdef HAVE_PNG
-    if (!decoded_png.deserialize_from_png (blob))
-      return false;
-    src_width = decoded_png.extents.width;
-    src_height = decoded_png.extents.height;
-    src_data = (const hb_packed_t<uint32_t> *) decoded_png.buffer.arrayZ;
-#else
-    return false;
-#endif
-  }
-  else
-    return false;
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return false;
-  if (!extents) return false;
-
-  const hb_raster_clip_t &clip = c->current_clip ();
-  hb_transform_t<> t = c->current_effective_transform ();
-
-  /* Compute inverse transform for sampling */
-  float det = t.xx * t.yy - t.xy * t.yx;
-  if (fabsf (det) < 1e-10f) return false;
-  float inv_det = 1.f / det;
-  float inv_xx =  t.yy * inv_det;
-  float inv_xy = -t.xy * inv_det;
-  float inv_yx = -t.yx * inv_det;
-  float inv_yy =  t.xx * inv_det;
-  float inv_x0 = (t.xy * t.y0 - t.yy * t.x0) * inv_det;
-  float inv_y0 = (t.yx * t.x0 - t.xx * t.y0) * inv_det;
-
-  unsigned surf_stride = surf->extents.stride;
-  int ox = surf->extents.x_origin;
-  int oy = surf->extents.y_origin;
-
-  /* Image source rectangle in glyph space */
-  float img_x = extents->x_bearing;
-  float img_y = extents->y_bearing;
-  float img_sx = (float) extents->width / src_width;
-  float img_sy = (float) extents->height / src_height;
-  if (fabsf (img_sx) < 1e-10f || fabsf (img_sy) < 1e-10f)
-    return false;
-
-  if (clip.is_rect)
-  {
-    for (unsigned py = clip.min_y; py < clip.max_y; py++)
-    {
-      hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * surf_stride);
-      float gx = inv_xx * (float) ((int) clip.min_x + ox) + inv_xy * (float) ((int) py + oy) + inv_x0;
-      float gy = inv_yx * (float) ((int) clip.min_x + ox) + inv_yy * (float) ((int) py + oy) + inv_y0;
-      for (unsigned px = clip.min_x; px < clip.max_x; px++)
-      {
-	/* Map glyph space to image texel; bilinear reconstruction. */
-	float ix = (gx - img_x) / img_sx;
-	float iy = (float) (src_height - 1) - (gy - img_y) / img_sy;
-
-	if (ix < 0.f || iy < 0.f ||
-	    ix > (float) (src_width - 1) || iy > (float) (src_height - 1))
-	{
-	  gx += inv_xx;
-	  gy += inv_yx;
-	  continue;
-	}
-
-	uint32_t src_px = hb_raster_sample_bilinear_premul (src_data, src_width, src_height,
-							     ix, iy);
-	row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src_px, (uint32_t) row[px]));
-	gx += inv_xx;
-	gy += inv_yx;
-      }
-    }
-  }
-  else
-  {
-    for (unsigned py = clip.min_y; py < clip.max_y; py++)
-    {
-      hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * surf_stride);
-      const uint8_t *clip_row = clip.alpha.arrayZ + py * clip.stride;
-      float gx = inv_xx * (float) ((int) clip.min_x + ox) + inv_xy * (float) ((int) py + oy) + inv_x0;
-      float gy = inv_yx * (float) ((int) clip.min_x + ox) + inv_yy * (float) ((int) py + oy) + inv_y0;
-      for (unsigned px = clip.min_x; px < clip.max_x; px++)
-      {
-	uint8_t clip_alpha = clip_row[px];
-	if (clip_alpha == 0)
-	{
-	  gx += inv_xx;
-	  gy += inv_yx;
-	  continue;
-	}
-
-	/* Map glyph space to image texel; bilinear reconstruction. */
-	float ix = (gx - img_x) / img_sx;
-	float iy = (float) (src_height - 1) - (gy - img_y) / img_sy;
-
-	if (ix < 0.f || iy < 0.f ||
-	    ix > (float) (src_width - 1) || iy > (float) (src_height - 1))
-	{
-	  gx += inv_xx;
-	  gy += inv_yx;
-	  continue;
-	}
-
-	uint32_t src_px = hb_raster_sample_bilinear_premul (src_data, src_width, src_height,
-							     ix, iy);
-	src_px = hb_raster_alpha_mul (src_px, clip_alpha);
-	row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src_px, (uint32_t) row[px]));
-	gx += inv_xx;
-	gy += inv_yx;
-      }
-    }
-  }
-
-  return true;
-}
-
-
-/*
- * Gradient helpers
- */
-
-#define PREALLOCATED_COLOR_STOPS 16
-#define GRADIENT_LUT_SIZE 256
-#define GRADIENT_LUT_MIN_PIXELS (64u * 64u)
-
-static int
-cmp_color_stop (const void *p1, const void *p2)
-{
-  const hb_color_stop_t *c1 = (const hb_color_stop_t *) p1;
-  const hb_color_stop_t *c2 = (const hb_color_stop_t *) p2;
-  if (c1->offset < c2->offset) return -1;
-  if (c1->offset > c2->offset) return 1;
-  return 0;
-}
-
-static bool
-get_color_stops (hb_raster_paint_t *c,
-		 hb_color_line_t *color_line,
-		 unsigned *count,
-		 hb_color_stop_t **stops)
-{
-  unsigned len = hb_color_line_get_color_stops (color_line, 0, nullptr, nullptr);
-  if (len > *count)
-  {
-    if (unlikely (!c->scratch_color_stops.resize (len)))
-      return false;
-    *stops = c->scratch_color_stops.arrayZ;
-  }
-  hb_color_line_get_color_stops (color_line, 0, &len, *stops);
-  for (unsigned i = 0; i < len; i++)
-    if ((*stops)[i].is_foreground)
-      (*stops)[i].color = HB_COLOR (hb_color_get_blue (c->foreground),
-				    hb_color_get_green (c->foreground),
-				    hb_color_get_red (c->foreground),
-				    hb_raster_div255 (hb_color_get_alpha (c->foreground) *
-					    hb_color_get_alpha ((*stops)[i].color)));
-
-  *count = len;
-  return true;
-}
-
-static void
-normalize_color_line (hb_color_stop_t *stops,
-		      unsigned len,
-		      float *omin, float *omax)
-{
-  hb_qsort (stops, len, sizeof (hb_color_stop_t), cmp_color_stop);
-
-  float mn = stops[0].offset, mx = stops[0].offset;
-  for (unsigned i = 1; i < len; i++)
-  {
-    mn = hb_min (mn, stops[i].offset);
-    mx = hb_max (mx, stops[i].offset);
-  }
-  if (mn != mx)
-    for (unsigned i = 0; i < len; i++)
-      stops[i].offset = (stops[i].offset - mn) / (mx - mn);
-
-  *omin = mn;
-  *omax = mx;
-}
-
-/* Evaluate color at normalized position t, interpolating in premultiplied space. */
-static uint32_t
-evaluate_color_line (const hb_color_stop_t *stops, unsigned len, float t,
-		     hb_paint_extend_t extend)
-{
-  /* Apply extend mode */
-  if (extend == HB_PAINT_EXTEND_PAD)
-  {
-    t = hb_clamp (t, 0.f, 1.f);
-  }
-  else if (extend == HB_PAINT_EXTEND_REPEAT)
-  {
-    t = t - floorf (t);
-  }
-  else /* REFLECT */
-  {
-    if (t < 0) t = -t;
-    int period = (int) floorf (t);
-    float frac = t - (float) period;
-    t = (period & 1) ? 1.f - frac : frac;
-  }
-
-  /* Find bounding stops */
-  if (t <= stops[0].offset)
-    return color_to_premul_pixel (stops[0].color);
-  if (t >= stops[len - 1].offset)
-    return color_to_premul_pixel (stops[len - 1].color);
-
-  unsigned i;
-  for (i = 0; i < len - 1; i++)
-    if (t < stops[i + 1].offset)
-      break;
-
-  float range = stops[i + 1].offset - stops[i].offset;
-  float k = range > 0.f ? (t - stops[i].offset) / range : 0.f;
-
-  /* Interpolate in premultiplied [0,255] space */
-  hb_color_t c0 = stops[i].color;
-  hb_color_t c1 = stops[i + 1].color;
-
-  float a0 = hb_color_get_alpha (c0) / 255.f;
-  float r0 = hb_color_get_red   (c0) / 255.f * a0;
-  float g0 = hb_color_get_green (c0) / 255.f * a0;
-  float b0 = hb_color_get_blue  (c0) / 255.f * a0;
-
-  float a1 = hb_color_get_alpha (c1) / 255.f;
-  float r1 = hb_color_get_red   (c1) / 255.f * a1;
-  float g1 = hb_color_get_green (c1) / 255.f * a1;
-  float b1 = hb_color_get_blue  (c1) / 255.f * a1;
-
-  float a = a0 + k * (a1 - a0);
-  float r = r0 + k * (r1 - r0);
-  float g = g0 + k * (g1 - g0);
-  float b = b0 + k * (b1 - b0);
-
-  uint8_t pa = (uint8_t) (a * 255.f + 0.5f);
-  uint8_t pr = (uint8_t) (r * 255.f + 0.5f);
-  uint8_t pg = (uint8_t) (g * 255.f + 0.5f);
-  uint8_t pb = (uint8_t) (b * 255.f + 0.5f);
-
-  return (uint32_t) pb | ((uint32_t) pg << 8) | ((uint32_t) pr << 16) | ((uint32_t) pa << 24);
-}
-
-static HB_ALWAYS_INLINE float
-normalize_gradient_t (float t, hb_paint_extend_t extend)
-{
-  if (extend == HB_PAINT_EXTEND_PAD)
-    return hb_clamp (t, 0.f, 1.f);
-  if (extend == HB_PAINT_EXTEND_REPEAT)
-  {
-    t = t - floorf (t);
-    return t < 0.f ? t + 1.f : t;
-  }
-
-  /* REFLECT */
-  if (t < 0.f) t = -t;
-  int period = (int) floorf (t);
-  float frac = t - (float) period;
-  return (period & 1) ? 1.f - frac : frac;
-}
-
-static void
-build_gradient_lut (const hb_color_stop_t *stops,
-		    unsigned len,
-		    uint32_t *lut)
-{
-  for (unsigned i = 0; i < GRADIENT_LUT_SIZE; i++)
-  {
-    float t = (float) i / (GRADIENT_LUT_SIZE - 1);
-    lut[i] = evaluate_color_line (stops, len, t, HB_PAINT_EXTEND_PAD);
-  }
-}
-
-static HB_ALWAYS_INLINE uint32_t
-lookup_gradient_lut (const uint32_t *lut,
-		     float t,
-		     hb_paint_extend_t extend)
-{
-  float u = normalize_gradient_t (t, extend);
-  unsigned idx = (unsigned) (u * (GRADIENT_LUT_SIZE - 1) + 0.5f);
-  return lut[idx];
-}
-
-static void
-reduce_anchors (float x0, float y0,
-		float x1, float y1,
-		float x2, float y2,
-		float *xx0, float *yy0,
-		float *xx1, float *yy1)
-{
-  float q2x = x2 - x0, q2y = y2 - y0;
-  float q1x = x1 - x0, q1y = y1 - y0;
-  float s = q2x * q2x + q2y * q2y;
-  if (s < 0.000001f)
-  {
-    *xx0 = x0; *yy0 = y0;
-    *xx1 = x1; *yy1 = y1;
-    return;
-  }
-  float k = (q2x * q1x + q2y * q1y) / s;
-  *xx0 = x0;
-  *yy0 = y0;
-  *xx1 = x1 - k * q2x;
-  *yy1 = y1 - k * q2y;
-}
-
-
-/*
- * Gradient paint callbacks
- */
-
-static void
-hb_raster_paint_linear_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				 void *paint_data,
-				 hb_color_line_t *color_line,
-				 float x0, float y0,
-				 float x1, float y1,
-				 float x2, float y2,
-				 void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  unsigned len = PREALLOCATED_COLOR_STOPS;
-  hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
-  hb_color_stop_t *stops = stops_;
-
-  if (unlikely (!get_color_stops (c, color_line, &len, &stops)))
-    return;
-  float mn, mx;
-  normalize_color_line (stops, len, &mn, &mx);
-
-  hb_paint_extend_t extend = hb_color_line_get_extend (color_line);
-  const hb_raster_clip_t &clip = c->current_clip ();
-  unsigned clip_w = clip.max_x > clip.min_x ? clip.max_x - clip.min_x : 0;
-  unsigned clip_h = clip.max_y > clip.min_y ? clip.max_y - clip.min_y : 0;
-  bool use_lut = (uint64_t) clip_w * clip_h >= GRADIENT_LUT_MIN_PIXELS;
-  uint32_t lut[GRADIENT_LUT_SIZE];
-  if (use_lut)
-    build_gradient_lut (stops, len, lut);
-
-  /* Reduce 3-point anchor to 2-point gradient axis */
-  float lx0, ly0, lx1, ly1;
-  reduce_anchors (x0, y0, x1, y1, x2, y2, &lx0, &ly0, &lx1, &ly1);
-
-  /* Apply normalization to endpoints */
-  float gx0 = lx0 + mn * (lx1 - lx0);
-  float gy0 = ly0 + mn * (ly1 - ly0);
-  float gx1 = lx0 + mx * (lx1 - lx0);
-  float gy1 = ly0 + mx * (ly1 - ly0);
-
-  /* Inverse transform: pixel → glyph space */
-  hb_transform_t<> t = c->current_effective_transform ();
-  float det = t.xx * t.yy - t.xy * t.yx;
-  if (fabsf (det) < 1e-10f) goto done;
-
-  {
-    float inv_det = 1.f / det;
-    float inv_xx =  t.yy * inv_det;
-    float inv_xy = -t.xy * inv_det;
-    float inv_yx = -t.yx * inv_det;
-    float inv_yy =  t.xx * inv_det;
-    float inv_x0 = (t.xy * t.y0 - t.yy * t.x0) * inv_det;
-    float inv_y0 = (t.yx * t.x0 - t.xx * t.y0) * inv_det;
-
-    /* Gradient direction vector and denominator for projection */
-    float dx = gx1 - gx0, dy = gy1 - gy0;
-    float denom = dx * dx + dy * dy;
-    if (denom < 1e-10f) goto done;
-    float inv_denom = 1.f / denom;
-
-    unsigned stride = surf->extents.stride;
-    int ox = surf->extents.x_origin;
-    int oy = surf->extents.y_origin;
-
-    if (clip.is_rect)
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float proj_t = ((gx - gx0) * dx + (gy - gy0) * dy) * inv_denom;
-	    uint32_t src = lookup_gradient_lut (lut, proj_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float proj_t = ((gx - gx0) * dx + (gy - gy0) * dy) * inv_denom;
-	    uint32_t src = evaluate_color_line (stops, len, proj_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-    else
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	const uint8_t *clip_row = clip.alpha.arrayZ + py * clip.stride;
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float proj_t = ((gx - gx0) * dx + (gy - gy0) * dy) * inv_denom;
-	    uint32_t src = lookup_gradient_lut (lut, proj_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float proj_t = ((gx - gx0) * dx + (gy - gy0) * dy) * inv_denom;
-	    uint32_t src = evaluate_color_line (stops, len, proj_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-  }
-
-done:
-  (void) stops_;
-}
-
-static void
-hb_raster_paint_radial_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				 void *paint_data,
-				 hb_color_line_t *color_line,
-				 float x0, float y0, float r0,
-				 float x1, float y1, float r1,
-				 void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  unsigned len = PREALLOCATED_COLOR_STOPS;
-  hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
-  hb_color_stop_t *stops = stops_;
-
-  if (unlikely (!get_color_stops (c, color_line, &len, &stops)))
-    return;
-  float mn, mx;
-  normalize_color_line (stops, len, &mn, &mx);
-
-  hb_paint_extend_t extend = hb_color_line_get_extend (color_line);
-  const hb_raster_clip_t &clip = c->current_clip ();
-  unsigned clip_w = clip.max_x > clip.min_x ? clip.max_x - clip.min_x : 0;
-  unsigned clip_h = clip.max_y > clip.min_y ? clip.max_y - clip.min_y : 0;
-  bool use_lut = (uint64_t) clip_w * clip_h >= GRADIENT_LUT_MIN_PIXELS;
-  uint32_t lut[GRADIENT_LUT_SIZE];
-  if (use_lut)
-    build_gradient_lut (stops, len, lut);
-
-  /* Apply normalization to circle parameters */
-  float cx0 = x0 + mn * (x1 - x0);
-  float cy0 = y0 + mn * (y1 - y0);
-  float cr0 = r0 + mn * (r1 - r0);
-  float cx1 = x0 + mx * (x1 - x0);
-  float cy1 = y0 + mx * (y1 - y0);
-  float cr1 = r0 + mx * (r1 - r0);
-
-  /* Inverse transform */
-  hb_transform_t<> t = c->current_effective_transform ();
-  float det = t.xx * t.yy - t.xy * t.yx;
-  if (fabsf (det) < 1e-10f) goto done;
-
-  {
-    float inv_det = 1.f / det;
-    float inv_xx =  t.yy * inv_det;
-    float inv_xy = -t.xy * inv_det;
-    float inv_yx = -t.yx * inv_det;
-    float inv_yy =  t.xx * inv_det;
-    float inv_x0 = (t.xy * t.y0 - t.yy * t.x0) * inv_det;
-    float inv_y0 = (t.yx * t.x0 - t.xx * t.y0) * inv_det;
-
-    /* Precompute quadratic coefficients for radial gradient:
-     * |p - c0 - t*(c1-c0)|^2 = (r0 + t*(r1-r0))^2
-     *
-     * Expanding gives At^2 + Bt + C = 0 where:
-     *   cdx = c1.x - c0.x, cdy = c1.y - c0.y, dr = r1 - r0
-     *   A = cdx^2 + cdy^2 - dr^2
-     *   B = -2*(px-c0.x)*cdx - 2*(py-c0.y)*cdy - 2*r0*dr
-     *   C = (px-c0.x)^2 + (py-c0.y)^2 - r0^2
-     */
-    float cdx = cx1 - cx0, cdy = cy1 - cy0;
-    float dr = cr1 - cr0;
-    float A = cdx * cdx + cdy * cdy - dr * dr;
-
-    unsigned stride = surf->extents.stride;
-    int ox = surf->extents.x_origin;
-    int oy = surf->extents.y_origin;
-
-    if (clip.is_rect)
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float dpx = gx - cx0, dpy = gy - cy0;
-	    float B = -2.f * (dpx * cdx + dpy * cdy + cr0 * dr);
-	    float C = dpx * dpx + dpy * dpy - cr0 * cr0;
-
-	    float grad_t;
-	    if (fabsf (A) > 1e-10f)
-	    {
-	      float disc = B * B - 4.f * A * C;
-	      if (disc < 0.f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      float sq = sqrtf (disc);
-	      /* Pick the larger root (t closer to 1 = outer circle) */
-	      float t1 = (-B + sq) / (2.f * A);
-	      float t2 = (-B - sq) / (2.f * A);
-	      /* Choose the root that gives a positive radius */
-	      if (cr0 + t1 * dr >= 0.f)
-		grad_t = t1;
-	      else
-		grad_t = t2;
-	    }
-	    else
-	    {
-	      /* Linear case: Bt + C = 0 */
-	      if (fabsf (B) < 1e-10f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      grad_t = -C / B;
-	    }
-
-	    uint32_t src = lookup_gradient_lut (lut, grad_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float dpx = gx - cx0, dpy = gy - cy0;
-	    float B = -2.f * (dpx * cdx + dpy * cdy + cr0 * dr);
-	    float C = dpx * dpx + dpy * dpy - cr0 * cr0;
-
-	    float grad_t;
-	    if (fabsf (A) > 1e-10f)
-	    {
-	      float disc = B * B - 4.f * A * C;
-	      if (disc < 0.f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      float sq = sqrtf (disc);
-	      float t1 = (-B + sq) / (2.f * A);
-	      float t2 = (-B - sq) / (2.f * A);
-	      grad_t = (cr0 + t1 * dr >= 0.f) ? t1 : t2;
-	    }
-	    else
-	    {
-	      if (fabsf (B) < 1e-10f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      grad_t = -C / B;
-	    }
-
-	    uint32_t src = evaluate_color_line (stops, len, grad_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-    else
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	const uint8_t *clip_row = clip.alpha.arrayZ + py * clip.stride;
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float dpx = gx - cx0, dpy = gy - cy0;
-	    float B = -2.f * (dpx * cdx + dpy * cdy + cr0 * dr);
-	    float C = dpx * dpx + dpy * dpy - cr0 * cr0;
-
-	    float grad_t;
-	    if (fabsf (A) > 1e-10f)
-	    {
-	      float disc = B * B - 4.f * A * C;
-	      if (disc < 0.f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      float sq = sqrtf (disc);
-	      float t1 = (-B + sq) / (2.f * A);
-	      float t2 = (-B - sq) / (2.f * A);
-	      grad_t = (cr0 + t1 * dr >= 0.f) ? t1 : t2;
-	    }
-	    else
-	    {
-	      if (fabsf (B) < 1e-10f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      grad_t = -C / B;
-	    }
-
-	    uint32_t src = lookup_gradient_lut (lut, grad_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float dpx = gx - cx0, dpy = gy - cy0;
-	    float B = -2.f * (dpx * cdx + dpy * cdy + cr0 * dr);
-	    float C = dpx * dpx + dpy * dpy - cr0 * cr0;
-
-	    float grad_t;
-	    if (fabsf (A) > 1e-10f)
-	    {
-	      float disc = B * B - 4.f * A * C;
-	      if (disc < 0.f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      float sq = sqrtf (disc);
-	      float t1 = (-B + sq) / (2.f * A);
-	      float t2 = (-B - sq) / (2.f * A);
-	      grad_t = (cr0 + t1 * dr >= 0.f) ? t1 : t2;
-	    }
-	    else
-	    {
-	      if (fabsf (B) < 1e-10f)
-	      {
-		gx += inv_xx;
-		gy += inv_yx;
-		continue;
-	      }
-	      grad_t = -C / B;
-	    }
-
-	    uint32_t src = evaluate_color_line (stops, len, grad_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-  }
-
-done:
-  (void) stops_;
-}
-
-static void
-hb_raster_paint_sweep_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
-				void *paint_data,
-				hb_color_line_t *color_line,
-				float cx, float cy,
-				float start_angle,
-				float end_angle,
-				void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-
-  ensure_initialized (c);
-
-  hb_raster_image_t *surf = c->current_surface ();
-  if (unlikely (!surf)) return;
-
-  unsigned len = PREALLOCATED_COLOR_STOPS;
-  hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
-  hb_color_stop_t *stops = stops_;
-
-  if (unlikely (!get_color_stops (c, color_line, &len, &stops)))
-    return;
-  float mn, mx;
-  normalize_color_line (stops, len, &mn, &mx);
-
-  hb_paint_extend_t extend = hb_color_line_get_extend (color_line);
-  const hb_raster_clip_t &clip = c->current_clip ();
-  unsigned clip_w = clip.max_x > clip.min_x ? clip.max_x - clip.min_x : 0;
-  unsigned clip_h = clip.max_y > clip.min_y ? clip.max_y - clip.min_y : 0;
-  bool use_lut = (uint64_t) clip_w * clip_h >= GRADIENT_LUT_MIN_PIXELS;
-  uint32_t lut[GRADIENT_LUT_SIZE];
-  if (use_lut)
-    build_gradient_lut (stops, len, lut);
-
-  /* Apply normalization to angle range */
-  float a0 = start_angle + mn * (end_angle - start_angle);
-  float a1 = start_angle + mx * (end_angle - start_angle);
-  float angle_range = a1 - a0;
-
-  /* Inverse transform */
-  hb_transform_t<> t = c->current_effective_transform ();
-  float det = t.xx * t.yy - t.xy * t.yx;
-  if (fabsf (det) < 1e-10f || fabsf (angle_range) < 1e-10f) goto done;
-
-  {
-    float inv_det = 1.f / det;
-    float inv_xx =  t.yy * inv_det;
-    float inv_xy = -t.xy * inv_det;
-    float inv_yx = -t.yx * inv_det;
-    float inv_yy =  t.xx * inv_det;
-    float inv_x0 = (t.xy * t.y0 - t.yy * t.x0) * inv_det;
-    float inv_y0 = (t.yx * t.x0 - t.xx * t.y0) * inv_det;
-
-    float inv_angle_range = 1.f / angle_range;
-
-    unsigned stride = surf->extents.stride;
-    int ox = surf->extents.x_origin;
-    int oy = surf->extents.y_origin;
-
-    if (clip.is_rect)
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float angle = atan2f (gy - cy, gx - cx);
-	    if (angle < 0) angle += (float) HB_2_PI;
-	    float grad_t = (angle - a0) * inv_angle_range;
-	    uint32_t src = lookup_gradient_lut (lut, grad_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    float angle = atan2f (gy - cy, gx - cx);
-	    if (angle < 0) angle += (float) HB_2_PI;
-	    float grad_t = (angle - a0) * inv_angle_range;
-	    uint32_t src = evaluate_color_line (stops, len, grad_t, extend);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-    else
-    {
-      for (unsigned py = clip.min_y; py < clip.max_y; py++)
-      {
-	hb_packed_t<uint32_t> *row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + py * stride);
-	const uint8_t *clip_row = clip.alpha.arrayZ + py * clip.stride;
-	float gx = inv_xx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_xy * ((float) ((int) py + oy) + 0.5f) + inv_x0;
-	float gy = inv_yx * ((float) ((int) clip.min_x + ox) + 0.5f) + inv_yy * ((float) ((int) py + oy) + 0.5f) + inv_y0;
-	if (use_lut)
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float angle = atan2f (gy - cy, gx - cx);
-	    if (angle < 0) angle += (float) HB_2_PI;
-	    float grad_t = (angle - a0) * inv_angle_range;
-	    uint32_t src = lookup_gradient_lut (lut, grad_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-	else
-	{
-	  for (unsigned px = clip.min_x; px < clip.max_x; px++)
-	  {
-	    uint8_t clip_alpha = clip_row[px];
-	    if (clip_alpha == 0)
-	    {
-	      gx += inv_xx;
-	      gy += inv_yx;
-	      continue;
-	    }
-	    float angle = atan2f (gy - cy, gx - cx);
-	    if (angle < 0) angle += (float) HB_2_PI;
-	    float grad_t = (angle - a0) * inv_angle_range;
-	    uint32_t src = evaluate_color_line (stops, len, grad_t, extend);
-	    src = hb_raster_alpha_mul (src, clip_alpha);
-	    row[px] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[px]));
-	    gx += inv_xx;
-	    gy += inv_yx;
-	  }
-	}
-      }
-    }
-  }
-
-done:
-  (void) stops_;
-}
-
-static hb_bool_t
-hb_raster_paint_custom_palette_color (hb_paint_funcs_t *funcs HB_UNUSED,
-				      void *paint_data,
-				      unsigned int color_index,
-				      hb_color_t *color,
-				      void *user_data HB_UNUSED)
-{
-  hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
-  if (likely (c->custom_palette && hb_map_has (c->custom_palette, color_index)))
-  {
-    *color = hb_map_get (c->custom_palette, color_index);
-    return true;
-  }
-  return false;
-}
-
-
-/*
- * Lazy-loader singleton for paint funcs
- */
-
-static inline void free_static_raster_paint_funcs ();
-
-static struct hb_raster_paint_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t<hb_raster_paint_funcs_lazy_loader_t>
-{
-  static hb_paint_funcs_t *create ()
-  {
-    hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
-
-    hb_paint_funcs_set_push_transform_func (funcs, hb_raster_paint_push_transform, nullptr, nullptr);
-    hb_paint_funcs_set_pop_transform_func (funcs, hb_raster_paint_pop_transform, nullptr, nullptr);
-    hb_paint_funcs_set_color_glyph_func (funcs, hb_raster_paint_color_glyph, nullptr, nullptr);
-    hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_raster_paint_push_clip_glyph, nullptr, nullptr);
-    hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_raster_paint_push_clip_rectangle, nullptr, nullptr);
-    hb_paint_funcs_set_pop_clip_func (funcs, hb_raster_paint_pop_clip, nullptr, nullptr);
-    hb_paint_funcs_set_push_group_func (funcs, hb_raster_paint_push_group, nullptr, nullptr);
-    hb_paint_funcs_set_pop_group_func (funcs, hb_raster_paint_pop_group, nullptr, nullptr);
-    hb_paint_funcs_set_color_func (funcs, hb_raster_paint_color, nullptr, nullptr);
-    hb_paint_funcs_set_image_func (funcs, hb_raster_paint_image, nullptr, nullptr);
-    hb_paint_funcs_set_linear_gradient_func (funcs, hb_raster_paint_linear_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_radial_gradient_func (funcs, hb_raster_paint_radial_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_sweep_gradient_func (funcs, hb_raster_paint_sweep_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_custom_palette_color_func (funcs, hb_raster_paint_custom_palette_color, nullptr, nullptr);
-
-    hb_paint_funcs_make_immutable (funcs);
-
-    hb_atexit (free_static_raster_paint_funcs);
-
-    return funcs;
-  }
-} static_raster_paint_funcs;
-
-static inline void
-free_static_raster_paint_funcs ()
-{
-  static_raster_paint_funcs.free_instance ();
-}
-
-
-/*
- * Public API
- */
-
-/**
- * hb_raster_paint_create_or_fail:
- *
- * Creates a new color-glyph paint context.
- *
- * Return value: (transfer full):
- * A newly allocated #hb_raster_paint_t, or `NULL` on allocation failure.
- *
- * Since: 13.0.0
- **/
-hb_raster_paint_t *
-hb_raster_paint_create_or_fail (void)
-{
-  hb_raster_paint_t *paint = hb_object_create<hb_raster_paint_t> ();
-  if (unlikely (!paint))
-    return nullptr;
-
-  paint->clip_rdr = hb_raster_draw_create_or_fail ();
-  if (unlikely (!paint->clip_rdr))
-  {
-    hb_free (paint);
-    return nullptr;
-  }
-
-  return paint;
-}
-
-/**
- * hb_raster_paint_reference: (skip)
- * @paint: a paint context
- *
- * Increases the reference count on @paint by one.
- *
- * Return value: (transfer full):
- * The referenced #hb_raster_paint_t.
- *
- * Since: 13.0.0
- **/
-hb_raster_paint_t *
-hb_raster_paint_reference (hb_raster_paint_t *paint)
-{
-  return hb_object_reference (paint);
-}
-
-/**
- * hb_raster_paint_destroy: (skip)
- * @paint: a paint context
- *
- * Decreases the reference count on @paint by one. When the
- * reference count reaches zero, the paint context is freed.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_destroy (hb_raster_paint_t *paint)
-{
-  if (!hb_object_should_destroy (paint))
-    return;
-
-  hb_map_destroy (paint->custom_palette);
-  hb_raster_draw_destroy (paint->clip_rdr);
-  for (auto *s : paint->surface_stack)
-    hb_raster_image_destroy (s);
-  for (auto *s : paint->surface_cache)
-    hb_raster_image_destroy (s);
-  hb_object_actually_destroy (paint);
-  hb_free (paint);
-}
-
-/**
- * hb_raster_paint_set_user_data: (skip)
- * @paint: a paint context
- * @key: the user-data key
- * @data: a pointer to the user data
- * @destroy: (nullable): a callback to call when @data is not needed anymore
- * @replace: whether to replace an existing data with the same key
- *
- * Attaches a user-data key/data pair to the specified paint context.
- *
- * Return value: `true` if success, `false` otherwise
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_paint_set_user_data (hb_raster_paint_t  *paint,
-			       hb_user_data_key_t *key,
-			       void               *data,
-			       hb_destroy_func_t   destroy,
-			       hb_bool_t           replace)
-{
-  return hb_object_set_user_data (paint, key, data, destroy, replace);
-}
-
-/**
- * hb_raster_paint_get_user_data: (skip)
- * @paint: a paint context
- * @key: the user-data key
- *
- * Fetches the user-data associated with the specified key,
- * attached to the specified paint context.
- *
- * Return value: (transfer none):
- * A pointer to the user data
- *
- * Since: 13.0.0
- **/
-void *
-hb_raster_paint_get_user_data (hb_raster_paint_t  *paint,
-			       hb_user_data_key_t *key)
-{
-  return hb_object_get_user_data (paint, key);
-}
-
-/**
- * hb_raster_paint_set_transform:
- * @paint: a paint context
- * @xx: xx component of the transform matrix
- * @yx: yx component of the transform matrix
- * @xy: xy component of the transform matrix
- * @yy: yy component of the transform matrix
- * @dx: x translation
- * @dy: y translation
- *
- * Sets the base 2×3 affine transform that maps from glyph-space
- * coordinates to pixel-space coordinates.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_set_transform (hb_raster_paint_t *paint,
-			       float xx, float yx,
-			       float xy, float yy,
-			       float dx, float dy)
-{
-  paint->base_transform = {xx, yx, xy, yy, dx, dy};
-}
-
-/**
- * hb_raster_paint_get_transform:
- * @paint: a paint context
- * @xx: (out) (nullable): xx component of the transform matrix
- * @yx: (out) (nullable): yx component of the transform matrix
- * @xy: (out) (nullable): xy component of the transform matrix
- * @yy: (out) (nullable): yy component of the transform matrix
- * @dx: (out) (nullable): x translation
- * @dy: (out) (nullable): y translation
- *
- * Gets the current base 2x3 affine transform.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_get_transform (hb_raster_paint_t *paint,
-			       float *xx, float *yx,
-			       float *xy, float *yy,
-			       float *dx, float *dy)
-{
-  if (xx) *xx = paint->base_transform.xx;
-  if (yx) *yx = paint->base_transform.yx;
-  if (xy) *xy = paint->base_transform.xy;
-  if (yy) *yy = paint->base_transform.yy;
-  if (dx) *dx = paint->base_transform.x0;
-  if (dy) *dy = paint->base_transform.y0;
-}
-
-/**
- * hb_raster_paint_set_scale_factor:
- * @paint: a paint context
- * @x_scale_factor: x-axis minification factor
- * @y_scale_factor: y-axis minification factor
- *
- * Sets post-transform minification factors applied during painting.
- * Factors larger than 1 shrink the output in pixels. The default is 1.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_set_scale_factor (hb_raster_paint_t *paint,
-				  float x_scale_factor,
-				  float y_scale_factor)
-{
-  paint->x_scale_factor = x_scale_factor > 0.f ? x_scale_factor : 1.f;
-  paint->y_scale_factor = y_scale_factor > 0.f ? y_scale_factor : 1.f;
-}
-
-/**
- * hb_raster_paint_get_scale_factor:
- * @paint: a paint context
- * @x_scale_factor: (out) (nullable): x-axis minification factor
- * @y_scale_factor: (out) (nullable): y-axis minification factor
- *
- * Fetches the current post-transform minification factors.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_get_scale_factor (hb_raster_paint_t *paint,
-				  float *x_scale_factor,
-				  float *y_scale_factor)
-{
-  if (x_scale_factor) *x_scale_factor = paint->x_scale_factor;
-  if (y_scale_factor) *y_scale_factor = paint->y_scale_factor;
-}
-
-/**
- * hb_raster_paint_set_extents:
- * @paint: a paint context
- * @extents: the desired output extents
- *
- * Sets the output image extents (pixel rectangle).
- *
- * Call this before hb_font_paint_glyph() for each render.
- * A common pattern is:
- * |[<!-- language="plain" -->
- * hb_glyph_extents_t gext;
- * if (hb_font_get_glyph_extents (font, gid, &gext))
- *   hb_raster_paint_set_glyph_extents (paint, &gext);
- * ]|
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_set_extents (hb_raster_paint_t         *paint,
-			     const hb_raster_extents_t *extents)
-{
-  paint->fixed_extents = *extents;
-  paint->has_extents = true;
-  if (paint->fixed_extents.stride == 0)
-    paint->fixed_extents.stride = paint->fixed_extents.width * 4;
-}
-
-/**
- * hb_raster_paint_get_extents:
- * @paint: a paint context
- * @extents: (out) (nullable): where to write current extents
- *
- * Gets currently configured output extents.
- *
- * Return value: `true` if extents are set, `false` otherwise.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_paint_get_extents (hb_raster_paint_t   *paint,
-			     hb_raster_extents_t *extents)
-{
-  if (!paint->has_extents)
-    return false;
-
-  if (extents)
-    *extents = paint->fixed_extents;
-  return true;
-}
-
-/**
- * hb_raster_paint_set_glyph_extents:
- * @paint: a paint context
- * @glyph_extents: glyph extents from hb_font_get_glyph_extents()
- *
- * Transforms @glyph_extents with the paint context's base transform and
- * sets the resulting output image extents.
- *
- * This is equivalent to computing a transformed bounding box in pixel
- * space and calling hb_raster_paint_set_extents().
- *
- * Return value: `true` if transformed extents are non-empty and set;
- * `false` otherwise.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_paint_set_glyph_extents (hb_raster_paint_t        *paint,
-				   const hb_glyph_extents_t *glyph_extents)
-{
-  float x0 = (float) glyph_extents->x_bearing;
-  float y0 = (float) glyph_extents->y_bearing;
-  float x1 = (float) glyph_extents->x_bearing + glyph_extents->width;
-  float y1 = (float) glyph_extents->y_bearing + glyph_extents->height;
-
-  float xmin = hb_min (x0, x1);
-  float xmax = hb_max (x0, x1);
-  float ymin = hb_min (y0, y1);
-  float ymax = hb_max (y0, y1);
-
-  float px[4] = {xmin, xmin, xmax, xmax};
-  float py[4] = {ymin, ymax, ymin, ymax};
-
-  hb_transform_t<> t = paint->base_transform;
-  paint->apply_scale_factor (t);
-
-  float tx, ty;
-  t.transform_point (px[0], py[0]);
-  tx = px[0]; ty = py[0];
-  float tx_min = tx, tx_max = tx;
-  float ty_min = ty, ty_max = ty;
-
-  for (unsigned i = 1; i < 4; i++)
-  {
-    t.transform_point (px[i], py[i]);
-    tx_min = hb_min (tx_min, px[i]);
-    tx_max = hb_max (tx_max, px[i]);
-    ty_min = hb_min (ty_min, py[i]);
-    ty_max = hb_max (ty_max, py[i]);
-  }
-
-  int ex0 = (int) floorf (tx_min);
-  int ey0 = (int) floorf (ty_min);
-  int ex1 = (int) ceilf  (tx_max);
-  int ey1 = (int) ceilf  (ty_max);
-
-  if (ex1 <= ex0 || ey1 <= ey0)
-  {
-    paint->fixed_extents = {};
-    paint->has_extents = false;
-    return false;
-  }
-
-  paint->fixed_extents = {
-    ex0, ey0,
-    (unsigned) (ex1 - ex0),
-    (unsigned) (ey1 - ey0),
-    0
-  };
-  paint->has_extents = true;
-  if (paint->fixed_extents.stride == 0)
-    paint->fixed_extents.stride = paint->fixed_extents.width * 4;
-  return true;
-}
-
-/**
- * hb_raster_paint_set_foreground:
- * @paint: a paint context
- * @foreground: the foreground color
- *
- * Sets the foreground color used when paint callbacks request it
- * (e.g. `is_foreground` in color stops or solid fills).
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_set_foreground (hb_raster_paint_t *paint,
-				hb_color_t         foreground)
-{
-  paint->foreground = foreground;
-}
-
-/**
- * hb_raster_paint_clear_custom_palette_colors:
- * @paint: a paint context.
- *
- * Clears all custom palette color overrides previously set on @paint.
- *
- * After this call, palette lookups use the selected font palette without
- * custom override entries.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_clear_custom_palette_colors (hb_raster_paint_t *paint)
-{
-  if (paint->custom_palette)
-    hb_map_clear (paint->custom_palette);
-}
-
-/**
- * hb_raster_paint_set_custom_palette_color:
- * @paint: a paint context.
- * @color_index: color index to override.
- * @color: replacement color.
- *
- * Overrides one font palette color entry for subsequent paint operations.
- * Overrides are keyed by @color_index and persist on @paint until cleared
- * (or replaced for the same index).
- *
- * These overrides are consulted by paint operations that resolve CPAL
- * entries.
- *
- * Return value: `true` if the override was set; `false` on allocation failure.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_paint_set_custom_palette_color (hb_raster_paint_t *paint,
-					  unsigned int       color_index,
-					  hb_color_t         color)
-{
-  if (unlikely (!paint->custom_palette))
-  {
-    paint->custom_palette = hb_map_create ();
-    if (unlikely (!paint->custom_palette))
-      return false;
-  }
-  hb_map_set (paint->custom_palette, color_index, color);
-  return hb_map_allocation_successful (paint->custom_palette);
-}
-
-/**
- * hb_raster_paint_get_funcs:
- *
- * Fetches the singleton #hb_paint_funcs_t that renders color glyphs
- * into an #hb_raster_paint_t.  Pass the #hb_raster_paint_t as the
- * @paint_data argument when calling hb_font_paint_glyph().
- *
- * Return value: (transfer none):
- * The rasterizer paint functions
- *
- * Since: 13.0.0
- **/
-hb_paint_funcs_t *
-hb_raster_paint_get_funcs (void)
-{
-  return static_raster_paint_funcs.get_unconst ();
-}
-
-/**
- * hb_raster_paint_glyph:
- * @paint: a paint context
- * @font: font to paint from
- * @glyph: glyph ID to paint
- * @pen_x: glyph origin x in font coordinates (pre-transform)
- * @pen_y: glyph origin y in font coordinates (pre-transform)
- * @palette: palette index
- * @foreground: foreground color
- *
- * Convenience wrapper to paint one color glyph at (@pen_x, @pen_y) using
- * the paint context's current transform. The pen coordinates are applied
- * before minification and transformed by the current affine transform.
- *
- * Return value: `true` if painting succeeded, `false` otherwise.
- *
- * Since: 13.0.0
- **/
-hb_bool_t
-hb_raster_paint_glyph (hb_raster_paint_t *paint,
-		       hb_font_t        *font,
-		       hb_codepoint_t    glyph,
-		       float             pen_x,
-		       float             pen_y,
-		       unsigned           palette,
-		       hb_color_t         foreground)
-{
-  float xx = paint->base_transform.xx;
-  float yx = paint->base_transform.yx;
-  float xy = paint->base_transform.xy;
-  float yy = paint->base_transform.yy;
-  float dx = paint->base_transform.x0;
-  float dy = paint->base_transform.y0;
-
-  float tx = dx + xx * pen_x + xy * pen_y;
-  float ty = dy + yx * pen_x + yy * pen_y;
-
-  if (!paint->has_extents)
-  {
-    hb_glyph_extents_t ge;
-    if (hb_font_get_glyph_extents (font, glyph, &ge))
-    {
-      hb_raster_paint_set_transform (paint, xx, yx, xy, yy, tx, ty);
-      hb_raster_paint_set_glyph_extents (paint, &ge);
-    }
-  }
-
-  hb_raster_paint_set_transform (paint, xx, yx, xy, yy, tx, ty);
-  paint->svg_glyph = glyph;
-  paint->svg_font = font;
-  paint->svg_palette = palette;
-  hb_bool_t ret = hb_font_paint_glyph_or_fail (font, glyph,
-						hb_raster_paint_get_funcs (), paint,
-						palette, foreground);
-  paint->svg_glyph = 0;
-  paint->svg_font = nullptr;
-  paint->svg_palette = 0;
-  hb_raster_paint_set_transform (paint, xx, yx, xy, yy, dx, dy);
-  return ret;
-}
-
-/**
- * hb_raster_paint_render:
- * @paint: a paint context
- *
- * Extracts the rendered image after hb_font_paint_glyph() has
- * completed.  The paint context's surface stack is consumed and
- * the result returned as a new #hb_raster_image_t. Output format is
- * always @HB_RASTER_FORMAT_BGRA32.
- *
- * Call hb_font_paint_glyph() before calling this function.
- * hb_raster_paint_set_extents() or hb_raster_paint_set_glyph_extents()
- * must be called before painting; otherwise this function returns `NULL`.
- * Internal drawing state is cleared here so the same object can
- * be reused without client-side clearing.
- *
- * Return value: (transfer full):
- * A rendered #hb_raster_image_t. Returns `NULL` if extents were not set
- * or if allocation/configuration fails. If extents were set but nothing
- * was painted, returns an empty image.
- *
- * Since: 13.0.0
- **/
-hb_raster_image_t *
-hb_raster_paint_render (hb_raster_paint_t *paint)
-{
-  hb_raster_image_t *result = nullptr;
-
-  if (unlikely (!paint->has_extents))
-    goto fail;
-
-  if (paint->surface_stack.length)
-  {
-    result = paint->surface_stack[0];
-    /* Release any remaining group surfaces (shouldn't happen with
-     * well-formed paint calls, but be safe). */
-    for (unsigned i = 1; i < paint->surface_stack.length; i++)
-      paint->release_surface (paint->surface_stack[i]);
-    paint->surface_stack.clear ();
-  }
-  else
-  {
-    result = paint->acquire_surface ();
-    if (unlikely (!result))
-      goto fail;
-  }
-
-  /* Clean up stacks and reset auto-extents for next glyph. */
-  paint->transform_stack.clear ();
-  paint->release_all_clips ();
-  hb_raster_draw_reset (paint->clip_rdr);
-  paint->has_extents = false;
-  paint->fixed_extents = {};
-
-  return result;
-
-fail:
-  paint->transform_stack.clear ();
-  paint->release_all_clips ();
-  for (auto *s : paint->surface_stack)
-    paint->release_surface (s);
-  paint->surface_stack.clear ();
-  hb_raster_draw_reset (paint->clip_rdr);
-  paint->has_extents = false;
-  paint->fixed_extents = {};
-  return nullptr;
-}
-
-/**
- * hb_raster_paint_reset:
- * @paint: a paint context
- *
- * Resets the paint context to its initial state, clearing all
- * configuration while preserving internal image caches.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_reset (hb_raster_paint_t *paint)
-{
-  paint->base_transform = {1, 0, 0, 1, 0, 0};
-  paint->x_scale_factor = 1.f;
-  paint->y_scale_factor = 1.f;
-  paint->fixed_extents = {};
-  paint->has_extents = false;
-  paint->foreground = HB_COLOR (0, 0, 0, 255);
-  hb_raster_paint_clear_custom_palette_colors (paint);
-  paint->transform_stack.clear ();
-  paint->release_all_clips ();
-  for (auto *s : paint->surface_stack)
-    paint->release_surface (s);
-  paint->surface_stack.clear ();
-}
-
-/**
- * hb_raster_paint_recycle_image:
- * @paint: a paint context
- * @image: a raster image to recycle
- *
- * Recycles @image for reuse by subsequent render calls.
- * The caller transfers ownership of @image to @paint.
- *
- * Since: 13.0.0
- **/
-void
-hb_raster_paint_recycle_image (hb_raster_paint_t  *paint,
-			       hb_raster_image_t  *image)
-{
-  paint->release_surface (image);
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-paint.hh b/engine/thirdparty/harfbuzz/src/hb-raster-paint.hh
deleted file mode 100644
index 1d6bb18a..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-paint.hh
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_PAINT_HH
-#define HB_RASTER_PAINT_HH
-
-#include "hb.hh"
-
-#include "hb-raster-image.hh"
-#include "hb-geometry.hh"
-
-/* hb_raster_clip_t — alpha mask for clipping */
-struct hb_raster_clip_t
-{
-  hb_vector_t<uint8_t> alpha;	/* A8 mask, same extents as root surface */
-  unsigned width  = 0;
-  unsigned height = 0;
-  unsigned stride = 0;
-
-  /* Fast path: simple rectangle (no alpha buffer needed) */
-  bool is_rect = true;
-  int rect_x0 = 0, rect_y0 = 0;
-  int rect_x1 = 0, rect_y1 = 0;
-
-  /* Bounding box of non-zero alpha region (valid for both rect and mask) */
-  unsigned min_x = 0, min_y = 0;
-  unsigned max_x = 0, max_y = 0;
-
-  void init_full (unsigned w, unsigned h)
-  {
-    width = w;
-    height = h;
-    stride = (w + 3u) & ~3u;
-    is_rect = true;
-    rect_x0 = 0;
-    rect_y0 = 0;
-    rect_x1 = (int) w;
-    rect_y1 = (int) h;
-    min_x = 0;
-    min_y = 0;
-    max_x = w;
-    max_y = h;
-  }
-
-  void update_bounds_from_rect ()
-  {
-    min_x = (unsigned) hb_max (rect_x0, 0);
-    min_y = (unsigned) hb_max (rect_y0, 0);
-    max_x = (unsigned) hb_max (hb_min (rect_x1, (int) width), 0);
-    max_y = (unsigned) hb_max (hb_min (rect_y1, (int) height), 0);
-  }
-
-  uint8_t get_alpha (unsigned x, unsigned y) const
-  {
-    if (is_rect)
-      return ((int) x >= rect_x0 && (int) x < rect_x1 &&
-	      (int) y >= rect_y0 && (int) y < rect_y1) ? 255 : 0;
-    if (x >= width || y >= height) return 0;
-    return alpha[y * stride + x];
-  }
-};
-
-
-/* hb_raster_paint_t — color glyph paint context */
-struct hb_raster_paint_t
-{
-  hb_object_header_t header;
-
-  /* Configuration */
-  hb_transform_t<>    base_transform     = {1, 0, 0, 1, 0, 0};
-  float               x_scale_factor     = 1.f;
-  float               y_scale_factor     = 1.f;
-  hb_raster_extents_t fixed_extents      = {};
-  bool                has_extents  = false;
-  hb_color_t          foreground         = HB_COLOR (0, 0, 0, 255);
-  hb_map_t           *custom_palette     = nullptr;
-
-  /* SVG rendering state */
-  hb_codepoint_t      svg_glyph          = 0;
-  hb_font_t          *svg_font           = nullptr;
-  unsigned            svg_palette        = 0;
-
-  /* Stacks */
-  hb_vector_t<hb_transform_t<>>     transform_stack;
-  hb_vector_t<hb_raster_clip_t>     clip_stack;
-  hb_vector_t<hb_raster_clip_t>     clip_cache;
-  hb_vector_t<hb_raster_image_t *>  surface_stack;
-
-  /* Cached surface pool (freelist for reuse across push/pop group) */
-  hb_vector_t<hb_raster_image_t *>  surface_cache;
-  hb_vector_t<hb_color_stop_t>      scratch_color_stops;
-
-  /* Internal rasterizer for clip-to-glyph */
-  hb_raster_draw_t *clip_rdr = nullptr;
-
-  /* Helpers */
-
-  hb_raster_image_t *acquire_surface ()
-  {
-    hb_raster_image_t *img;
-    if (surface_cache.length)
-      img = surface_cache.pop ();
-    else
-    {
-      img = hb_raster_image_create_or_fail ();
-      if (unlikely (!img)) return nullptr;
-    }
-
-    if (unlikely (!img->configure (HB_RASTER_FORMAT_BGRA32, fixed_extents)))
-    {
-      hb_raster_image_destroy (img);
-      return nullptr;
-    }
-    img->clear ();
-    return img;
-  }
-
-  void release_surface (hb_raster_image_t *img)
-  {
-    if (!surface_cache.push_or_fail (img))
-      hb_raster_image_destroy (img);
-  }
-
-  hb_raster_clip_t acquire_clip (unsigned w, unsigned h)
-  {
-    hb_raster_clip_t clip;
-    if (clip_cache.length)
-      clip = clip_cache.pop ();
-    clip.width = w;
-    clip.height = h;
-    clip.stride = (w + 3u) & ~3u;
-    clip.is_rect = false;
-    return clip;
-  }
-
-  void release_clip (hb_raster_clip_t &&clip)
-  {
-    if (clip.alpha.arrayZ)
-      clip_cache.push (std::move (clip));
-  }
-
-  void release_all_clips ()
-  {
-    while (clip_stack.length)
-      release_clip (clip_stack.pop ());
-  }
-
-  hb_raster_image_t *current_surface ()
-  {
-    return surface_stack.length ? surface_stack.tail () : nullptr;
-  }
-
-  hb_raster_clip_t &current_clip ()
-  {
-    return clip_stack.tail ();
-  }
-
-  hb_transform_t<> &current_transform ()
-  {
-    return transform_stack.tail ();
-  }
-
-  void apply_scale_factor (hb_transform_t<> &t) const
-  {
-    t.xx /= x_scale_factor;
-    t.xy /= x_scale_factor;
-    t.x0 /= x_scale_factor;
-    t.yx /= y_scale_factor;
-    t.yy /= y_scale_factor;
-    t.y0 /= y_scale_factor;
-  }
-
-  hb_transform_t<> current_effective_transform ()
-  {
-    hb_transform_t<> t = current_transform ();
-    apply_scale_factor (t);
-    return t;
-  }
-};
-
-
-#endif /* HB_RASTER_PAINT_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.cc
deleted file mode 100644
index 760b9aea..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.cc
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-base.hh"
-#include "hb-raster-svg-parse.hh"
-
-void
-svg_parse_style_props (hb_svg_str_t style, hb_svg_style_props_t *out)
-{
-  if (style.is_null ()) return;
-  const char *p = style.data;
-  const char *end = style.data + style.len;
-  while (p < end)
-  {
-    while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == ';'))
-      p++;
-    if (p >= end) break;
-    const char *name_start = p;
-    while (p < end && *p != ':' && *p != ';')
-      p++;
-    const char *name_end = p;
-    while (name_end > name_start &&
-           (name_end[-1] == ' ' || name_end[-1] == '\t' || name_end[-1] == '\n' || name_end[-1] == '\r'))
-      name_end--;
-    if (p >= end || *p != ':')
-    {
-      while (p < end && *p != ';') p++;
-      continue;
-    }
-    p++; /* skip ':' */
-    const char *value_start = p;
-    while (p < end && *p != ';')
-      p++;
-    const char *value_end = p;
-    while (value_start < value_end &&
-           (*value_start == ' ' || *value_start == '\t' || *value_start == '\n' || *value_start == '\r'))
-      value_start++;
-    while (value_end > value_start &&
-           (value_end[-1] == ' ' || value_end[-1] == '\t' || value_end[-1] == '\n' || value_end[-1] == '\r'))
-      value_end--;
-
-    hb_svg_str_t prop_name = {name_start, (unsigned) (name_end - name_start)};
-    hb_svg_str_t prop_value = {value_start, (unsigned) (value_end - value_start)};
-    if (prop_name.len)
-    {
-      switch (hb_svg_ascii_lower (prop_name.data[0]))
-      {
-      case 'c':
-        if (prop_name.len == 9 && prop_name.eq_ascii_ci ("clip-path")) out->clip_path = prop_value;
-        else if (prop_name.len == 5 && prop_name.eq_ascii_ci ("color")) out->color = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("cx")) out->cx = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("cy")) out->cy = prop_value;
-        break;
-      case 'd':
-        if (prop_name.len == 7 && prop_name.eq_ascii_ci ("display")) out->display = prop_value;
-        else if (prop_name.len == 1 && prop_name.eq_ascii_ci ("d")) out->d = prop_value;
-        break;
-      case 'f':
-        if (prop_name.len == 4 && prop_name.eq_ascii_ci ("fill")) out->fill = prop_value;
-        else if (prop_name.len == 12 && prop_name.eq_ascii_ci ("fill-opacity")) out->fill_opacity = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("fx")) out->fx = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("fy")) out->fy = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("fr")) out->fr = prop_value;
-        break;
-      case 'g':
-        if ((prop_name.len == 13 && prop_name.eq_ascii_ci ("gradientunits")) ||
-            (prop_name.len == 14 && prop_name.eq_ascii_ci ("gradient-units"))) out->gradient_units = prop_value;
-        else if ((prop_name.len == 17 && prop_name.eq_ascii_ci ("gradienttransform")) ||
-                 (prop_name.len == 18 && prop_name.eq_ascii_ci ("gradient-transform"))) out->gradient_transform = prop_value;
-        break;
-      case 'h':
-        if (prop_name.len == 6 && prop_name.eq_ascii_ci ("height")) out->height = prop_value;
-        break;
-      case 'o':
-        if (prop_name.len == 7 && prop_name.eq_ascii_ci ("opacity")) out->opacity = prop_value;
-        else if (prop_name.len == 6 && prop_name.eq_ascii_ci ("offset")) out->offset = prop_value;
-        break;
-      case 'p':
-        if (prop_name.len == 6 && prop_name.eq_ascii_ci ("points")) out->points = prop_value;
-        break;
-      case 'r':
-        if (prop_name.len == 1 && prop_name.eq_ascii_ci ("r")) out->r = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("rx")) out->rx = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("ry")) out->ry = prop_value;
-        break;
-      case 's':
-        if (prop_name.len == 10 && prop_name.eq_ascii_ci ("stop-color")) out->stop_color = prop_value;
-        else if (prop_name.len == 12 && prop_name.eq_ascii_ci ("stop-opacity")) out->stop_opacity = prop_value;
-        else if ((prop_name.len == 12 && prop_name.eq_ascii_ci ("spreadmethod")) ||
-                 (prop_name.len == 13 && prop_name.eq_ascii_ci ("spread-method"))) out->spread_method = prop_value;
-        break;
-      case 't':
-        if (prop_name.len == 9 && prop_name.eq_ascii_ci ("transform")) out->transform = prop_value;
-        break;
-      case 'v':
-        if (prop_name.len == 10 && prop_name.eq_ascii_ci ("visibility")) out->visibility = prop_value;
-        break;
-      case 'w':
-        if (prop_name.len == 5 && prop_name.eq_ascii_ci ("width")) out->width = prop_value;
-        break;
-      case 'x':
-        if (prop_name.len == 1 && prop_name.eq_ascii_ci ("x")) out->x = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("x1")) out->x1 = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("x2")) out->x2 = prop_value;
-        break;
-      case 'y':
-        if (prop_name.len == 1 && prop_name.eq_ascii_ci ("y")) out->y = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("y1")) out->y1 = prop_value;
-        else if (prop_name.len == 2 && prop_name.eq_ascii_ci ("y2")) out->y2 = prop_value;
-        break;
-      default:
-        break;
-      }
-    }
-
-    if (p < end && *p == ';') p++;
-  }
-}
-
-float
-svg_parse_number_or_percent (hb_svg_str_t s, bool *is_percent)
-{
-  if (is_percent) *is_percent = false;
-  s = s.trim ();
-  if (!s.len) return 0.f;
-  if (s.data[s.len - 1] == '%')
-  {
-    if (is_percent) *is_percent = true;
-    hb_svg_str_t n = {s.data, s.len - 1};
-    return n.to_float () / 100.f;
-  }
-  return s.to_float ();
-}
-
-hb_svg_str_t
-hb_raster_svg_find_href_attr (const hb_svg_xml_parser_t &parser)
-{
-  hb_svg_str_t href = parser.find_attr ("href");
-  if (href.is_null ())
-    href = parser.find_attr ("xlink:href");
-  return href;
-}
-
-bool
-hb_raster_svg_parse_id_ref (hb_svg_str_t s,
-                            hb_svg_str_t *out_id,
-                            hb_svg_str_t *out_tail)
-{
-  if (out_id) *out_id = {};
-  if (out_tail) *out_tail = {};
-  s = s.trim ();
-
-  if (s.len && s.data[0] == '#')
-  {
-    hb_svg_str_t id = {s.data + 1, s.len - 1};
-    id = id.trim ();
-    if (!id.len)
-      return false;
-    if (out_id) *out_id = id;
-    return true;
-  }
-
-  if (!s.starts_with_ascii_ci ("url("))
-    return false;
-
-  const char *p = s.data + 4;
-  const char *end = s.data + s.len;
-  while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++;
-
-  const char *q = p;
-  char quote = 0;
-  while (q < end)
-  {
-    char c = *q;
-    if (quote)
-    {
-      if (c == quote) quote = 0;
-    }
-    else
-    {
-      if (c == '"' || c == '\'') quote = c;
-      else if (c == ')') break;
-    }
-    q++;
-  }
-  if (q >= end || *q != ')')
-    return false;
-
-  hb_svg_str_t id = {(const char *) p, (unsigned) (q - p)};
-  id = id.trim ();
-  if (id.len >= 2 &&
-      ((id.data[0] == '\'' && id.data[id.len - 1] == '\'') ||
-       (id.data[0] == '"' && id.data[id.len - 1] == '"')))
-  {
-    id.data++;
-    id.len -= 2;
-  }
-  id = id.trim ();
-  if (id.len && id.data[0] == '#')
-  {
-    id.data++;
-    id.len--;
-  }
-  id = id.trim ();
-  if (!id.len)
-    return false;
-
-  if (out_id) *out_id = id;
-  if (out_tail)
-  {
-    const char *tail = q + 1;
-    while (tail < end && (*tail == ' ' || *tail == '\t' || *tail == '\n' || *tail == '\r')) tail++;
-    *out_tail = {(const char *) tail, (unsigned) (end - tail)};
-  }
-  return true;
-}
-
-bool
-hb_raster_svg_parse_local_id_ref (hb_svg_str_t s,
-                                  hb_svg_str_t *out_id,
-                                  hb_svg_str_t *out_tail)
-{
-  if (out_id) *out_id = {};
-  if (out_tail) *out_tail = {};
-  s = s.trim ();
-
-  if (s.len && s.data[0] == '#')
-  {
-    hb_svg_str_t id = {s.data + 1, s.len - 1};
-    id = id.trim ();
-    if (!id.len)
-      return false;
-    if (out_id) *out_id = id;
-    return true;
-  }
-
-  if (!s.starts_with_ascii_ci ("url("))
-    return false;
-
-  hb_svg_str_t id;
-  if (!hb_raster_svg_parse_id_ref (s, &id, out_tail))
-    return false;
-
-  const char *p = s.data + 4;
-  const char *end = s.data + s.len;
-  while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++;
-  if (p < end && (*p == '\'' || *p == '"'))
-  {
-    p++;
-    while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++;
-    if (p >= end || *p != '#')
-      return false;
-  }
-  else if (p >= end || *p != '#')
-    return false;
-
-  if (out_id) *out_id = id;
-  return true;
-}
-
-bool
-hb_raster_svg_find_element_by_id (const char *doc_start,
-                                  unsigned doc_len,
-                                  const OT::SVG::accelerator_t *svg_accel,
-                                  const OT::SVG::svg_doc_cache_t *doc_cache,
-                                  hb_svg_str_t id,
-                                  const char **found)
-{
-  *found = nullptr;
-  if (!doc_start || !doc_len || !id.len)
-    return false;
-
-  if (doc_cache && svg_accel)
-  {
-    unsigned start = 0, end = 0;
-    OT::SVG::svg_id_span_t key = {id.data, id.len};
-    if (svg_accel->doc_cache_find_id_span (doc_cache, key, &start, &end))
-    {
-      if (start < doc_len && end <= doc_len && start < end)
-      {
-        *found = doc_start + start;
-        return true;
-      }
-    }
-  }
-
-  hb_svg_xml_parser_t search (doc_start, doc_len);
-  while (true)
-  {
-    hb_svg_token_type_t tok = search.next ();
-    if (tok == SVG_TOKEN_EOF) break;
-    if (tok != SVG_TOKEN_OPEN_TAG && tok != SVG_TOKEN_SELF_CLOSE_TAG) continue;
-    hb_svg_str_t attr_id = search.find_attr ("id");
-    if (attr_id.len == id.len && 0 == memcmp (attr_id.data, id.data, id.len))
-    {
-      *found = search.tag_start;
-      return true;
-    }
-  }
-  return false;
-}
-
-bool
-hb_raster_svg_parse_viewbox (hb_svg_str_t viewbox_str,
-                             float *x,
-                             float *y,
-                             float *w,
-                             float *h)
-{
-  if (!viewbox_str.len)
-    return false;
-  hb_svg_float_parser_t vb_fp (viewbox_str);
-  float vb_x = vb_fp.next_float ();
-  float vb_y = vb_fp.next_float ();
-  float vb_w = vb_fp.next_float ();
-  float vb_h = vb_fp.next_float ();
-  if (vb_w <= 0.f || vb_h <= 0.f)
-    return false;
-  if (x) *x = vb_x;
-  if (y) *y = vb_y;
-  if (w) *w = vb_w;
-  if (h) *h = vb_h;
-  return true;
-}
-
-static inline float
-svg_align_offset (hb_svg_str_t align,
-                  float leftover,
-                  char axis)
-{
-  if (leftover <= 0.f) return 0.f;
-  if ((axis == 'x' && align.starts_with_ascii_ci ("xMin")) ||
-      (axis == 'y' && (align.eq_ascii_ci ("xMinYMin") ||
-                       align.eq_ascii_ci ("xMidYMin") ||
-                       align.eq_ascii_ci ("xMaxYMin"))))
-    return 0.f;
-  if ((axis == 'x' && align.starts_with_ascii_ci ("xMax")) ||
-      (axis == 'y' && (align.eq_ascii_ci ("xMinYMax") ||
-                       align.eq_ascii_ci ("xMidYMax") ||
-                       align.eq_ascii_ci ("xMaxYMax"))))
-    return leftover;
-  return leftover * 0.5f;
-}
-
-bool
-hb_raster_svg_compute_viewbox_transform (float viewport_w,
-                                         float viewport_h,
-                                         float vb_x,
-                                         float vb_y,
-                                         float vb_w,
-                                         float vb_h,
-                                         hb_svg_str_t preserve_aspect_ratio,
-                                         hb_svg_transform_t *out)
-{
-  if (!(viewport_w > 0.f && viewport_h > 0.f && vb_w > 0.f && vb_h > 0.f))
-    return false;
-
-  hb_svg_str_t par = preserve_aspect_ratio.trim ();
-  if (par.starts_with_ascii_ci ("defer"))
-  {
-    const char *p = par.data + 5;
-    const char *end = par.data + par.len;
-    while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) p++;
-    par = hb_svg_str_t (p, (unsigned) (end - p));
-  }
-  if (!par.len)
-    par = hb_svg_str_t ("xMidYMid meet", 12);
-
-  bool is_none = false;
-  bool is_slice = false;
-  hb_svg_str_t align = par;
-  const char *p = par.data;
-  const char *end = par.data + par.len;
-  while (p < end && *p != ' ' && *p != '\t' && *p != '\n' && *p != '\r') p++;
-  align = hb_svg_str_t (par.data, (unsigned) (p - par.data)).trim ();
-
-  if (par.starts_with_ascii_ci ("none"))
-    is_none = true;
-  else if (align.starts_with_ascii_ci ("x"))
-  {
-    const char *mode = p;
-    while (mode < end && (*mode == ' ' || *mode == '\t' || *mode == '\n' || *mode == '\r')) mode++;
-    if (mode < end && hb_svg_str_t (mode, (unsigned) (end - mode)).starts_with_ascii_ci ("slice"))
-      is_slice = true;
-  }
-
-  hb_svg_transform_t t;
-  if (is_none)
-  {
-    t.xx = viewport_w / vb_w;
-    t.yy = viewport_h / vb_h;
-    t.dx = -vb_x * t.xx;
-    t.dy = -vb_y * t.yy;
-    *out = t;
-    return true;
-  }
-
-  float sx = viewport_w / vb_w;
-  float sy = viewport_h / vb_h;
-  float s = is_slice ? hb_max (sx, sy) : hb_min (sx, sy);
-  float scaled_w = vb_w * s;
-  float scaled_h = vb_h * s;
-  float leftover_x = viewport_w - scaled_w;
-  float leftover_y = viewport_h - scaled_h;
-
-  if (!align.starts_with_ascii_ci ("x"))
-    align = hb_svg_str_t ("xMidYMid", 8);
-
-  t.xx = s;
-  t.yy = s;
-  t.dx = svg_align_offset (align, leftover_x, 'x') - vb_x * s;
-  t.dy = svg_align_offset (align, leftover_y, 'y') - vb_y * s;
-  *out = t;
-  return true;
-}
-
-bool
-hb_raster_svg_compute_use_target_viewbox_transform (hb_svg_xml_parser_t &target_parser,
-                                                     float use_w,
-                                                     float use_h,
-                                                     hb_svg_transform_t *out)
-{
-  if (!(target_parser.tag_name.eq ("svg") || target_parser.tag_name.eq ("symbol")))
-    return false;
-
-  float viewport_w = use_w;
-  float viewport_h = use_h;
-  hb_svg_style_props_t target_style_props;
-  svg_parse_style_props (target_parser.find_attr ("style"), &target_style_props);
-  if (viewport_w <= 0.f)
-    viewport_w = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (target_parser, target_style_props.width, "width"));
-  if (viewport_h <= 0.f)
-    viewport_h = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (target_parser, target_style_props.height, "height"));
-
-  float vb_x = 0.f, vb_y = 0.f, vb_w = 0.f, vb_h = 0.f;
-  if (!hb_raster_svg_parse_viewbox (target_parser.find_attr ("viewBox"), &vb_x, &vb_y, &vb_w, &vb_h))
-    return false;
-
-  if (!(viewport_w > 0.f && viewport_h > 0.f))
-  {
-    viewport_w = vb_w;
-    viewport_h = vb_h;
-  }
-
-  return hb_raster_svg_compute_viewbox_transform (viewport_w, viewport_h, vb_x, vb_y, vb_w, vb_h,
-                                                   target_parser.find_attr ("preserveAspectRatio"),
-                                                   out);
-}
-
-void
-hb_raster_svg_parse_use_geometry (hb_svg_xml_parser_t &parser,
-                                  float *x,
-                                  float *y,
-                                  float *w,
-                                  float *h)
-{
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &style_props);
-
-  if (x) *x = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, style_props.x, "x"));
-  if (y) *y = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, style_props.y, "y"));
-  if (w) *w = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, style_props.width, "width"));
-  if (h) *h = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, style_props.height, "height"));
-}
-
-float
-hb_raster_svg_parse_non_percent_length (hb_svg_str_t s)
-{
-  bool is_percent = false;
-  float v = svg_parse_number_or_percent (s, &is_percent);
-  return is_percent ? 0.f : v;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.hh
deleted file mode 100644
index 9570f9cb..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-base.hh
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_BASE_HH
-#define HB_RASTER_SVG_BASE_HH
-
-#include "hb.hh"
-#include "OT/Color/svg/svg.hh"
-
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-
-static inline char
-hb_svg_ascii_lower (char c)
-{
-  if (c >= 'A' && c <= 'Z')
-    return c + ('a' - 'A');
-  return c;
-}
-
-struct hb_svg_str_t
-{
-  const char *data;
-  unsigned len;
-
-  hb_svg_str_t () : data (nullptr), len (0) {}
-  hb_svg_str_t (const char *d, unsigned l) : data (d), len (l) {}
-
-  bool is_null () const { return !data; }
-
-  bool eq (const char *s) const
-  {
-    unsigned slen = (unsigned) strlen (s);
-    return len == slen && memcmp (data, s, len) == 0;
-  }
-
-  bool starts_with (const char *prefix) const
-  {
-    unsigned plen = (unsigned) strlen (prefix);
-    return len >= plen && memcmp (data, prefix, plen) == 0;
-  }
-
-  bool eq_ascii_ci (const char *lit) const
-  {
-    unsigned n = (unsigned) strlen (lit);
-    if (len != n) return false;
-    for (unsigned i = 0; i < n; i++)
-      if (hb_svg_ascii_lower (data[i]) != hb_svg_ascii_lower (lit[i]))
-        return false;
-    return true;
-  }
-
-  bool starts_with_ascii_ci (const char *lit) const
-  {
-    unsigned n = (unsigned) strlen (lit);
-    if (len < n) return false;
-    for (unsigned i = 0; i < n; i++)
-      if (hb_svg_ascii_lower (data[i]) != hb_svg_ascii_lower (lit[i]))
-        return false;
-    return true;
-  }
-
-  float to_float () const
-  {
-    if (!data || !len) return 0.f;
-    char buf[64];
-    unsigned n = hb_min (len, (unsigned) sizeof (buf) - 1);
-    memcpy (buf, data, n);
-    buf[n] = '\0';
-    float v = strtof (buf, nullptr);
-    return std::isfinite (v) ? v : 0.f;
-  }
-
-  hb_svg_str_t trim_left () const
-  {
-    const char *p = data;
-    unsigned l = len;
-    while (l && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r'))
-    {
-      p++;
-      l--;
-    }
-    return {p, l};
-  }
-
-  hb_svg_str_t trim () const
-  {
-    hb_svg_str_t s = trim_left ();
-    while (s.len && (s.data[s.len - 1] == ' ' || s.data[s.len - 1] == '\t' ||
-                     s.data[s.len - 1] == '\n' || s.data[s.len - 1] == '\r'))
-      s.len--;
-    return s;
-  }
-};
-
-struct hb_svg_style_props_t
-{
-  hb_svg_str_t fill;
-  hb_svg_str_t fill_opacity;
-  hb_svg_str_t opacity;
-  hb_svg_str_t transform;
-  hb_svg_str_t clip_path;
-  hb_svg_str_t display;
-  hb_svg_str_t color;
-  hb_svg_str_t visibility;
-  hb_svg_str_t offset;
-  hb_svg_str_t stop_color;
-  hb_svg_str_t stop_opacity;
-  hb_svg_str_t spread_method;
-  hb_svg_str_t gradient_units;
-  hb_svg_str_t gradient_transform;
-  hb_svg_str_t x;
-  hb_svg_str_t y;
-  hb_svg_str_t width;
-  hb_svg_str_t height;
-  hb_svg_str_t cx;
-  hb_svg_str_t cy;
-  hb_svg_str_t r;
-  hb_svg_str_t fx;
-  hb_svg_str_t fy;
-  hb_svg_str_t fr;
-  hb_svg_str_t rx;
-  hb_svg_str_t ry;
-  hb_svg_str_t x1;
-  hb_svg_str_t y1;
-  hb_svg_str_t x2;
-  hb_svg_str_t y2;
-  hb_svg_str_t points;
-  hb_svg_str_t d;
-};
-
-struct hb_svg_xml_parser_t;
-struct hb_svg_transform_t;
-
-HB_INTERNAL void svg_parse_style_props (hb_svg_str_t style, hb_svg_style_props_t *out);
-HB_INTERNAL float svg_parse_number_or_percent (hb_svg_str_t s, bool *is_percent);
-HB_INTERNAL hb_svg_str_t hb_raster_svg_find_href_attr (const hb_svg_xml_parser_t &parser);
-HB_INTERNAL bool hb_raster_svg_parse_id_ref (hb_svg_str_t s,
-                                              hb_svg_str_t *out_id,
-                                              hb_svg_str_t *out_tail);
-HB_INTERNAL bool hb_raster_svg_parse_local_id_ref (hb_svg_str_t s,
-                                                    hb_svg_str_t *out_id,
-                                                    hb_svg_str_t *out_tail);
-HB_INTERNAL bool hb_raster_svg_find_element_by_id (const char *doc_start,
-                                                    unsigned doc_len,
-                                                    const OT::SVG::accelerator_t *svg_accel,
-                                                    const OT::SVG::svg_doc_cache_t *doc_cache,
-                                                    hb_svg_str_t id,
-                                                    const char **found);
-HB_INTERNAL bool hb_raster_svg_parse_viewbox (hb_svg_str_t viewbox_str,
-                                               float *x,
-                                               float *y,
-                                               float *w,
-                                               float *h);
-HB_INTERNAL bool hb_raster_svg_compute_viewbox_transform (float viewport_w,
-                                                           float viewport_h,
-                                                           float vb_x,
-                                                           float vb_y,
-                                                           float vb_w,
-                                                           float vb_h,
-                                                           hb_svg_str_t preserve_aspect_ratio,
-                                                           hb_svg_transform_t *out);
-HB_INTERNAL bool hb_raster_svg_compute_use_target_viewbox_transform (hb_svg_xml_parser_t &target_parser,
-                                                                      float use_w,
-                                                                      float use_h,
-                                                                      hb_svg_transform_t *out);
-HB_INTERNAL void hb_raster_svg_parse_use_geometry (hb_svg_xml_parser_t &parser,
-                                                    float *x,
-                                                    float *y,
-                                                    float *w,
-                                                    float *h);
-HB_INTERNAL float hb_raster_svg_parse_non_percent_length (hb_svg_str_t s);
-static inline float
-svg_parse_float_clamped01 (hb_svg_str_t s)
-{
-  return hb_clamp (s.to_float (), 0.f, 1.f);
-}
-
-static inline bool
-svg_str_is_inherit (hb_svg_str_t s)
-{
-  return s.trim ().eq_ascii_ci ("inherit");
-}
-
-static inline bool
-svg_str_is_none (hb_svg_str_t s)
-{
-  return s.trim ().eq_ascii_ci ("none");
-}
-
-static inline bool
-hb_raster_svg_tag_is_container (hb_svg_str_t tag)
-{
-  return tag.eq ("g") || tag.eq ("a") || tag.eq ("svg") || tag.eq ("symbol");
-}
-
-
-static inline bool
-hb_raster_svg_tag_is_container_or_use (hb_svg_str_t tag)
-{
-  return hb_raster_svg_tag_is_container (tag) || tag.eq ("use");
-}
-
-#endif /* HB_RASTER_SVG_BASE_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.cc
deleted file mode 100644
index 2bc39b63..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-bbox.hh"
-
-static void
-svg_bbox_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                  void *draw_data,
-                  hb_draw_state_t *st HB_UNUSED,
-                  float to_x, float to_y,
-                  void *user_data HB_UNUSED)
-{
-  ((hb_extents_t<> *) draw_data)->add_point (to_x, to_y);
-}
-
-static void
-svg_bbox_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                  void *draw_data,
-                  hb_draw_state_t *st HB_UNUSED,
-                  float to_x, float to_y,
-                  void *user_data HB_UNUSED)
-{
-  ((hb_extents_t<> *) draw_data)->add_point (to_x, to_y);
-}
-
-static void
-svg_bbox_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                       void *draw_data,
-                       hb_draw_state_t *st HB_UNUSED,
-                       float control_x, float control_y,
-                       float to_x, float to_y,
-                       void *user_data HB_UNUSED)
-{
-  hb_extents_t<> *ext = (hb_extents_t<> *) draw_data;
-  ext->add_point (control_x, control_y);
-  ext->add_point (to_x, to_y);
-}
-
-static void
-svg_bbox_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                   void *draw_data,
-                   hb_draw_state_t *st HB_UNUSED,
-                   float control1_x, float control1_y,
-                   float control2_x, float control2_y,
-                   float to_x, float to_y,
-                   void *user_data HB_UNUSED)
-{
-  hb_extents_t<> *ext = (hb_extents_t<> *) draw_data;
-  ext->add_point (control1_x, control1_y);
-  ext->add_point (control2_x, control2_y);
-  ext->add_point (to_x, to_y);
-}
-
-static hb_draw_funcs_t *
-svg_bbox_draw_funcs ()
-{
-  static hb_draw_funcs_t *funcs = nullptr;
-  if (unlikely (!funcs))
-  {
-    funcs = hb_draw_funcs_create ();
-    hb_draw_funcs_set_move_to_func (funcs, svg_bbox_move_to, nullptr, nullptr);
-    hb_draw_funcs_set_line_to_func (funcs, svg_bbox_line_to, nullptr, nullptr);
-    hb_draw_funcs_set_quadratic_to_func (funcs, svg_bbox_quadratic_to, nullptr, nullptr);
-    hb_draw_funcs_set_cubic_to_func (funcs, svg_bbox_cubic_to, nullptr, nullptr);
-    hb_draw_funcs_make_immutable (funcs);
-  }
-  return funcs;
-}
-
-bool
-hb_raster_svg_compute_shape_bbox (const hb_svg_shape_emit_data_t &shape,
-                        hb_extents_t<> *bbox)
-{
-  hb_extents_t<> ext;
-  hb_svg_shape_emit_data_t tmp = shape;
-  hb_raster_svg_shape_path_emit (svg_bbox_draw_funcs (), &ext, &tmp);
-  if (ext.is_empty ()) return false;
-  *bbox = ext;
-  return true;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.hh
deleted file mode 100644
index 46802e6d..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-bbox.hh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_BBOX_HH
-#define HB_RASTER_SVG_BBOX_HH
-
-#include "hb.hh"
-
-#include "hb-geometry.hh"
-#include "hb-raster-svg-parse.hh"
-
-HB_INTERNAL bool
-hb_raster_svg_compute_shape_bbox (const hb_svg_shape_emit_data_t &shape,
-                        hb_extents_t<> *bbox);
-
-#endif /* HB_RASTER_SVG_BBOX_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.cc
deleted file mode 100644
index 19714eab..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.cc
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-clip.hh"
-
-#include "hb-raster.h"
-#include "hb-raster-paint.hh"
-#include "hb-raster-svg.hh"
-#include "hb-raster-svg-base.hh"
-#include "hb-decycler.hh"
-
-#include <math.h>
-
-static inline bool
-svg_transform_is_identity (const hb_svg_transform_t &t)
-{
-  return t.xx == 1.f && t.yx == 0.f &&
-         t.xy == 0.f && t.yy == 1.f &&
-         t.dx == 0.f && t.dy == 0.f;
-}
-
-static bool
-svg_parse_element_transform (hb_svg_xml_parser_t &parser,
-                             hb_svg_transform_t *out)
-{
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &style_props);
-  hb_svg_str_t transform = svg_pick_attr_or_style (parser, style_props.transform, "transform");
-  if (!transform.len)
-    return false;
-  hb_raster_svg_parse_transform (transform, out);
-  return true;
-}
-
-struct hb_svg_clip_collect_context_t
-{
-  hb_svg_defs_t *defs;
-  hb_svg_clip_path_def_t *clip;
-  const char *doc_start;
-  unsigned doc_len;
-  const OT::SVG::accelerator_t *svg_accel;
-  const OT::SVG::svg_doc_cache_t *doc_cache;
-  hb_decycler_t *use_decycler;
-  bool *had_alloc_failure;
-};
-
-static inline void
-svg_clip_append_shape (hb_svg_clip_collect_context_t *ctx,
-                       const hb_svg_shape_emit_data_t &shape,
-                       const hb_svg_transform_t &transform)
-{
-  hb_svg_clip_shape_t clip_shape;
-  clip_shape.shape = shape;
-  if (!svg_transform_is_identity (transform))
-  {
-    clip_shape.has_transform = true;
-    clip_shape.transform = transform;
-  }
-  if (likely (ctx->defs->clip_shapes.push_or_fail (clip_shape)))
-    ctx->clip->shape_count++;
-  else if (ctx->had_alloc_failure)
-    *ctx->had_alloc_failure = true;
-}
-
-static inline bool
-svg_resolve_element_visibility (hb_svg_xml_parser_t &parser,
-                                bool parent_visible)
-{
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &style_props);
-  hb_svg_str_t display_str = svg_pick_attr_or_style (parser, style_props.display, "display");
-  hb_svg_str_t visibility_str = svg_pick_attr_or_style (parser, style_props.visibility, "visibility");
-  if (display_str.trim ().eq_ascii_ci ("none"))
-    return false;
-  hb_svg_str_t vis_trim = visibility_str.trim ();
-  if (!vis_trim.len || vis_trim.eq_ascii_ci ("inherit"))
-    return parent_visible;
-  if (vis_trim.eq_ascii_ci ("hidden") ||
-      vis_trim.eq_ascii_ci ("collapse"))
-    return false;
-  if (vis_trim.eq_ascii_ci ("visible"))
-    return true;
-  return parent_visible;
-}
-
-static void
-svg_clip_collect_ref_element (hb_svg_clip_collect_context_t *ctx,
-                              hb_svg_xml_parser_t &parser,
-                              const hb_svg_transform_t &base_transform,
-                              unsigned depth,
-                              bool suppress_viewbox_once = false,
-                              bool parent_visible = true,
-                              bool allow_symbol_once = false);
-
-static void
-svg_clip_collect_use_target (hb_svg_clip_collect_context_t *ctx,
-                             hb_svg_xml_parser_t &use_parser,
-                             const hb_svg_transform_t &base_transform,
-                             unsigned depth)
-{
-  const unsigned SVG_MAX_CLIP_USE_DEPTH = 64;
-  if (depth >= SVG_MAX_CLIP_USE_DEPTH)
-    return;
-
-  hb_svg_str_t href = hb_raster_svg_find_href_attr (use_parser);
-  hb_svg_str_t ref_id;
-  if (!hb_raster_svg_parse_local_id_ref (href, &ref_id, nullptr))
-    return;
-
-  const char *found = nullptr;
-  if (!hb_raster_svg_find_element_by_id (ctx->doc_start, ctx->doc_len,
-                                         ctx->svg_accel, ctx->doc_cache,
-                                         ref_id, &found))
-    return;
-
-  hb_decycler_node_t node (*ctx->use_decycler);
-  if (unlikely (!node.visit ((uintptr_t) found)))
-    return;
-
-  hb_svg_transform_t effective = base_transform;
-  float use_x = 0.f, use_y = 0.f, use_w = 0.f, use_h = 0.f;
-  hb_raster_svg_parse_use_geometry (use_parser, &use_x, &use_y, &use_w, &use_h);
-  if (use_x != 0.f || use_y != 0.f)
-  {
-    hb_svg_transform_t tr;
-    tr.dx = use_x;
-    tr.dy = use_y;
-    effective.multiply (tr);
-  }
-
-  unsigned remaining = ctx->doc_len - (unsigned) (found - ctx->doc_start);
-  hb_svg_xml_parser_t ref_parser (found, remaining);
-  hb_svg_token_type_t rt = ref_parser.next ();
-  if (rt != SVG_TOKEN_OPEN_TAG && rt != SVG_TOKEN_SELF_CLOSE_TAG)
-    return;
-
-  bool viewport_mapped = false;
-  hb_svg_transform_t vb_t;
-  if (hb_raster_svg_compute_use_target_viewbox_transform (ref_parser, use_w, use_h, &vb_t))
-  {
-    effective.multiply (vb_t);
-    viewport_mapped = true;
-  }
-
-  bool allow_symbol = ref_parser.tag_name.eq ("symbol");
-  svg_clip_collect_ref_element (ctx, ref_parser, effective, depth + 1,
-                                viewport_mapped, true, allow_symbol);
-}
-
-static void
-svg_clip_collect_ref_element (hb_svg_clip_collect_context_t *ctx,
-                              hb_svg_xml_parser_t &parser,
-                              const hb_svg_transform_t &base_transform,
-                              unsigned depth,
-                              bool suppress_viewbox_once,
-                              bool parent_visible,
-                              bool allow_symbol_once)
-{
-  const unsigned SVG_MAX_CLIP_REF_DEPTH = 64;
-  if (depth >= SVG_MAX_CLIP_REF_DEPTH)
-  {
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-
-  bool is_visible = svg_resolve_element_visibility (parser, parent_visible);
-  if (!is_visible)
-  {
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-
-  /* Definitions are not directly renderable clip geometry. */
-  if (parser.tag_name.eq ("defs"))
-  {
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-  if (parser.tag_name.eq ("symbol") && !allow_symbol_once)
-  {
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-  if (parser.tag_name.eq ("symbol"))
-    allow_symbol_once = false;
-
-  hb_svg_transform_t effective = base_transform;
-  hb_svg_style_props_t geom_style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &geom_style_props);
-  hb_svg_transform_t local_t;
-  if (svg_parse_element_transform (parser, &local_t))
-    effective.multiply (local_t);
-  if (parser.tag_name.eq ("svg"))
-  {
-    float svg_x = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.x, "x"));
-    float svg_y = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.y, "y"));
-    if (svg_x != 0.f || svg_y != 0.f)
-    {
-      hb_svg_transform_t tr;
-      tr.dx = svg_x;
-      tr.dy = svg_y;
-      effective.multiply (tr);
-    }
-
-    if (!suppress_viewbox_once)
-    {
-      float vb_x = 0.f, vb_y = 0.f, vb_w = 0.f, vb_h = 0.f;
-    if (hb_raster_svg_parse_viewbox (parser.find_attr ("viewBox"),
-                                     &vb_x, &vb_y, &vb_w, &vb_h))
-    {
-      float viewport_w = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.width, "width"));
-      float viewport_h = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.height, "height"));
-      if (!(viewport_w > 0.f && viewport_h > 0.f))
-      {
-        viewport_w = vb_w;
-          viewport_h = vb_h;
-        }
-        hb_svg_transform_t vb_t;
-        if (hb_raster_svg_compute_viewbox_transform (viewport_w, viewport_h,
-                                                     vb_x, vb_y, vb_w, vb_h,
-                                                     parser.find_attr ("preserveAspectRatio"),
-                                                     &vb_t))
-          effective.multiply (vb_t);
-      }
-      suppress_viewbox_once = false;
-    }
-  }
-
-  hb_svg_shape_emit_data_t shape;
-  if (hb_raster_svg_parse_shape_tag (parser, &shape))
-  {
-    svg_clip_append_shape (ctx, shape, effective);
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-
-  if (parser.tag_name.eq ("use"))
-  {
-    svg_clip_collect_use_target (ctx, parser, effective, depth + 1);
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-
-  bool is_container = hb_raster_svg_tag_is_container (parser.tag_name);
-  if (!is_container || parser.self_closing)
-  {
-    if (!parser.self_closing)
-      svg_skip_subtree (parser);
-    return;
-  }
-
-  int inner_depth = 1;
-  while (inner_depth > 0)
-  {
-    hb_svg_token_type_t tok = parser.next ();
-    if (tok == SVG_TOKEN_EOF) break;
-    if (tok == SVG_TOKEN_CLOSE_TAG)
-    {
-      inner_depth--;
-      continue;
-    }
-    if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-      svg_clip_collect_ref_element (ctx, parser, effective, depth + 1, false, is_visible, false);
-  }
-}
-
-void
-hb_raster_svg_process_clip_path_def (hb_svg_defs_t *defs,
-                           hb_svg_xml_parser_t &parser,
-                           hb_svg_token_type_t tok,
-                           const char *doc_start,
-                           unsigned doc_len,
-                           const OT::SVG::accelerator_t *svg_accel,
-                           const OT::SVG::svg_doc_cache_t *doc_cache)
-{
-  hb_svg_clip_path_def_t clip;
-  hb_svg_str_t id = parser.find_attr ("id");
-  hb_svg_str_t units = parser.find_attr ("clipPathUnits").trim ();
-  if (units.eq_ascii_ci ("objectBoundingBox"))
-    clip.units_user_space = false;
-  else if (units.eq_ascii_ci ("userSpaceOnUse"))
-    clip.units_user_space = true;
-  else
-    clip.units_user_space = true;
-
-  hb_svg_transform_t cp_t;
-  if (svg_parse_element_transform (parser, &cp_t))
-  {
-    clip.has_clip_transform = true;
-    clip.clip_transform = cp_t;
-  }
-
-  clip.first_shape = defs->clip_shapes.length;
-  clip.shape_count = 0;
-
-  if (tok == SVG_TOKEN_OPEN_TAG)
-  {
-    const unsigned SVG_MAX_CLIP_DEPTH = 64;
-    hb_svg_transform_t inherited[SVG_MAX_CLIP_DEPTH];
-    bool inherited_visibility[SVG_MAX_CLIP_DEPTH];
-    inherited[0] = hb_svg_transform_t ();
-    inherited[1] = hb_svg_transform_t ();
-    inherited_visibility[0] = true;
-    inherited_visibility[1] = true;
-    hb_decycler_t use_decycler;
-
-    int cdepth = 1;
-    bool had_alloc_failure = false;
-    hb_svg_clip_collect_context_t collect_ctx = {
-      defs, &clip,
-      doc_start, doc_len, svg_accel, doc_cache,
-      &use_decycler, &had_alloc_failure
-    };
-    while (cdepth > 0)
-    {
-      hb_svg_token_type_t ct = parser.next ();
-      if (ct == SVG_TOKEN_EOF) break;
-      if (ct == SVG_TOKEN_CLOSE_TAG) { cdepth--; continue; }
-      if (ct == SVG_TOKEN_OPEN_TAG || ct == SVG_TOKEN_SELF_CLOSE_TAG)
-      {
-        if (parser.tag_name.eq ("symbol"))
-        {
-          if (ct == SVG_TOKEN_OPEN_TAG)
-          {
-            int skip_depth = 1;
-            while (skip_depth > 0)
-            {
-              hb_svg_token_type_t st = parser.next ();
-              if (st == SVG_TOKEN_EOF) break;
-              if (st == SVG_TOKEN_CLOSE_TAG) skip_depth--;
-              else if (st == SVG_TOKEN_OPEN_TAG) skip_depth++;
-            }
-          }
-          continue;
-        }
-
-        if (parser.tag_name.eq ("defs"))
-        {
-          if (ct == SVG_TOKEN_OPEN_TAG)
-          {
-            int skip_depth = 1;
-            while (skip_depth > 0)
-            {
-              hb_svg_token_type_t st = parser.next ();
-              if (st == SVG_TOKEN_EOF) break;
-              if (st == SVG_TOKEN_CLOSE_TAG) skip_depth--;
-              else if (st == SVG_TOKEN_OPEN_TAG) skip_depth++;
-            }
-          }
-          continue;
-        }
-
-        bool parent_visible = (unsigned) cdepth < SVG_MAX_CLIP_DEPTH
-                            ? inherited_visibility[cdepth]
-                            : true;
-        bool is_visible = svg_resolve_element_visibility (parser, parent_visible);
-        bool is_hidden = !is_visible;
-        if (is_hidden)
-        {
-          if (ct == SVG_TOKEN_OPEN_TAG)
-          {
-            int skip_depth = 1;
-            while (skip_depth > 0)
-            {
-              hb_svg_token_type_t st = parser.next ();
-              if (st == SVG_TOKEN_EOF) break;
-              if (st == SVG_TOKEN_CLOSE_TAG) skip_depth--;
-              else if (st == SVG_TOKEN_OPEN_TAG) skip_depth++;
-            }
-          }
-          continue;
-        }
-
-        hb_svg_transform_t effective = (unsigned) cdepth < SVG_MAX_CLIP_DEPTH
-                                     ? inherited[cdepth]
-                                     : hb_svg_transform_t ();
-
-        hb_svg_transform_t local;
-        bool has_local_transform = svg_parse_element_transform (parser, &local);
-        if (has_local_transform)
-        {
-          effective.multiply (local);
-        }
-
-        if (parser.tag_name.eq ("use"))
-        {
-          svg_clip_collect_use_target (&collect_ctx, parser, effective, 0);
-        }
-        else
-        {
-          hb_svg_shape_emit_data_t shape;
-          if (hb_raster_svg_parse_shape_tag (parser, &shape))
-            svg_clip_append_shape (&collect_ctx, shape, effective);
-        }
-
-        if (ct == SVG_TOKEN_OPEN_TAG)
-        {
-          if ((unsigned) (cdepth + 1) < SVG_MAX_CLIP_DEPTH)
-          {
-            inherited[cdepth + 1] = effective;
-            inherited_visibility[cdepth + 1] = is_visible;
-          }
-          cdepth++;
-        }
-      }
-    }
-    if (had_alloc_failure)
-      id = {};
-  }
-
-  if (id.len)
-    (void) defs->add_clip_path (hb_bytes_t (id.data, id.len), clip);
-}
-
-struct hb_svg_clip_emit_data_t
-{
-  const hb_svg_defs_t *defs;
-  const hb_svg_clip_path_def_t *clip;
-  hb_transform_t<> base_transform;
-  hb_transform_t<> bbox_transform;
-  bool has_bbox_transform = false;
-};
-
-static inline hb_transform_t<>
-svg_to_hb_transform (const hb_svg_transform_t &t)
-{
-  return hb_transform_t<> (t.xx, t.yx, t.xy, t.yy, t.dx, t.dy);
-}
-
-static void
-svg_clip_path_emit (hb_draw_funcs_t *dfuncs,
-                    void *draw_data,
-                    void *user_data)
-{
-  hb_raster_draw_t *rdr = (hb_raster_draw_t *) draw_data;
-  hb_svg_clip_emit_data_t *ed = (hb_svg_clip_emit_data_t *) user_data;
-  const hb_svg_clip_path_def_t *clip = ed->clip;
-
-  for (unsigned i = 0; i < clip->shape_count; i++)
-  {
-    const hb_svg_clip_shape_t &s = ed->defs->clip_shapes[clip->first_shape + i];
-    hb_transform_t<> t = ed->base_transform;
-    if (ed->has_bbox_transform)
-      t.multiply (ed->bbox_transform);
-    if (clip->has_clip_transform)
-      t.multiply (svg_to_hb_transform (clip->clip_transform));
-    if (s.has_transform)
-      t.multiply (svg_to_hb_transform (s.transform));
-
-    hb_raster_draw_set_transform (rdr, t.xx, t.yx, t.xy, t.yy, t.x0, t.y0);
-
-    hb_svg_shape_emit_data_t shape = s.shape;
-    hb_raster_svg_shape_path_emit (dfuncs, draw_data, &shape);
-  }
-}
-
-bool
-hb_raster_svg_push_clip_path_ref (hb_raster_paint_t *paint,
-                        hb_svg_defs_t *defs,
-                        hb_svg_str_t clip_path_str,
-                        const hb_extents_t<> *object_bbox)
-{
-  if (clip_path_str.is_null ()) return false;
-  hb_svg_str_t trimmed = clip_path_str.trim ();
-  if (!trimmed.len || trimmed.eq_ascii_ci ("none")) return false;
-
-  hb_svg_str_t clip_id;
-  if (!hb_raster_svg_parse_local_id_ref (trimmed, &clip_id, nullptr))
-    return false;
-
-  const hb_svg_clip_path_def_t *clip = defs->find_clip_path (hb_bytes_t (clip_id.data, clip_id.len));
-  if (!clip) return false;
-
-  hb_svg_clip_emit_data_t ed;
-  ed.defs = defs;
-  ed.clip = clip;
-  ed.base_transform = paint->current_effective_transform ();
-
-  if (!clip->units_user_space)
-  {
-    if (!object_bbox || object_bbox->is_empty ())
-      return false;
-    float w = object_bbox->xmax - object_bbox->xmin;
-    float h = object_bbox->ymax - object_bbox->ymin;
-    if (!(std::isfinite (w) && std::isfinite (h)) || w <= 0.f || h <= 0.f)
-      return false;
-    ed.has_bbox_transform = true;
-    ed.bbox_transform = hb_transform_t<> (w, 0, 0, h, object_bbox->xmin, object_bbox->ymin);
-  }
-
-  hb_raster_paint_push_clip_path (paint, svg_clip_path_emit, &ed);
-  return true;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.hh
deleted file mode 100644
index 0b89cc8f..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-clip.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_CLIP_HH
-#define HB_RASTER_SVG_CLIP_HH
-
-#include "hb.hh"
-
-#include "OT/Color/svg/svg.hh"
-#include "hb-paint.hh"
-#include "hb-raster-svg-defs.hh"
-
-struct hb_raster_paint_t;
-
-HB_INTERNAL void
-hb_raster_svg_process_clip_path_def (hb_svg_defs_t *defs,
-                           hb_svg_xml_parser_t &parser,
-                           hb_svg_token_type_t tok,
-                           const char *doc_start,
-                           unsigned doc_len,
-                           const OT::SVG::accelerator_t *svg_accel,
-                           const OT::SVG::svg_doc_cache_t *doc_cache);
-
-HB_INTERNAL bool
-hb_raster_svg_push_clip_path_ref (hb_raster_paint_t *paint,
-                        hb_svg_defs_t *defs,
-                        hb_svg_str_t clip_path_str,
-                        const hb_extents_t<> *object_bbox);
-
-#endif /* HB_RASTER_SVG_CLIP_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.cc
deleted file mode 100644
index a13634dd..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.cc
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-color.hh"
-
-#include "hb-raster.h"
-#include "hb-raster-svg-base.hh"
-#include "hb-ot-color.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-struct hb_svg_named_color_t
-{
-  const char *name;
-  uint32_t rgb; /* 0xRRGGBB */
-};
-
-static const hb_svg_named_color_t svg_named_colors[] = {
-  {"aliceblue", 0xF0F8FF},
-  {"antiquewhite", 0xFAEBD7},
-  {"aqua", 0x00FFFF},
-  {"aquamarine", 0x7FFFD4},
-  {"azure", 0xF0FFFF},
-  {"beige", 0xF5F5DC},
-  {"bisque", 0xFFE4C4},
-  {"black", 0x000000},
-  {"blanchedalmond", 0xFFEBCD},
-  {"blue", 0x0000FF},
-  {"blueviolet", 0x8A2BE2},
-  {"brown", 0xA52A2A},
-  {"burlywood", 0xDEB887},
-  {"cadetblue", 0x5F9EA0},
-  {"chartreuse", 0x7FFF00},
-  {"chocolate", 0xD2691E},
-  {"coral", 0xFF7F50},
-  {"cornflowerblue", 0x6495ED},
-  {"cornsilk", 0xFFF8DC},
-  {"crimson", 0xDC143C},
-  {"cyan", 0x00FFFF},
-  {"darkblue", 0x00008B},
-  {"darkcyan", 0x008B8B},
-  {"darkgoldenrod", 0xB8860B},
-  {"darkgray", 0xA9A9A9},
-  {"darkgreen", 0x006400},
-  {"darkgrey", 0xA9A9A9},
-  {"darkkhaki", 0xBDB76B},
-  {"darkmagenta", 0x8B008B},
-  {"darkolivegreen", 0x556B2F},
-  {"darkorange", 0xFF8C00},
-  {"darkorchid", 0x9932CC},
-  {"darkred", 0x8B0000},
-  {"darksalmon", 0xE9967A},
-  {"darkseagreen", 0x8FBC8F},
-  {"darkslateblue", 0x483D8B},
-  {"darkslategray", 0x2F4F4F},
-  {"darkslategrey", 0x2F4F4F},
-  {"darkturquoise", 0x00CED1},
-  {"darkviolet", 0x9400D3},
-  {"deeppink", 0xFF1493},
-  {"deepskyblue", 0x00BFFF},
-  {"dimgray", 0x696969},
-  {"dimgrey", 0x696969},
-  {"dodgerblue", 0x1E90FF},
-  {"firebrick", 0xB22222},
-  {"floralwhite", 0xFFFAF0},
-  {"forestgreen", 0x228B22},
-  {"fuchsia", 0xFF00FF},
-  {"gainsboro", 0xDCDCDC},
-  {"ghostwhite", 0xF8F8FF},
-  {"gold", 0xFFD700},
-  {"goldenrod", 0xDAA520},
-  {"gray", 0x808080},
-  {"green", 0x008000},
-  {"greenyellow", 0xADFF2F},
-  {"grey", 0x808080},
-  {"honeydew", 0xF0FFF0},
-  {"hotpink", 0xFF69B4},
-  {"indianred", 0xCD5C5C},
-  {"indigo", 0x4B0082},
-  {"ivory", 0xFFFFF0},
-  {"khaki", 0xF0E68C},
-  {"lavender", 0xE6E6FA},
-  {"lavenderblush", 0xFFF0F5},
-  {"lawngreen", 0x7CFC00},
-  {"lemonchiffon", 0xFFFACD},
-  {"lightblue", 0xADD8E6},
-  {"lightcoral", 0xF08080},
-  {"lightcyan", 0xE0FFFF},
-  {"lightgoldenrodyellow", 0xFAFAD2},
-  {"lightgray", 0xD3D3D3},
-  {"lightgreen", 0x90EE90},
-  {"lightgrey", 0xD3D3D3},
-  {"lightpink", 0xFFB6C1},
-  {"lightsalmon", 0xFFA07A},
-  {"lightseagreen", 0x20B2AA},
-  {"lightskyblue", 0x87CEFA},
-  {"lightslategray", 0x778899},
-  {"lightslategrey", 0x778899},
-  {"lightsteelblue", 0xB0C4DE},
-  {"lightyellow", 0xFFFFE0},
-  {"lime", 0x00FF00},
-  {"limegreen", 0x32CD32},
-  {"linen", 0xFAF0E6},
-  {"magenta", 0xFF00FF},
-  {"maroon", 0x800000},
-  {"mediumaquamarine", 0x66CDAA},
-  {"mediumblue", 0x0000CD},
-  {"mediumorchid", 0xBA55D3},
-  {"mediumpurple", 0x9370DB},
-  {"mediumseagreen", 0x3CB371},
-  {"mediumslateblue", 0x7B68EE},
-  {"mediumspringgreen", 0x00FA9A},
-  {"mediumturquoise", 0x48D1CC},
-  {"mediumvioletred", 0xC71585},
-  {"midnightblue", 0x191970},
-  {"mintcream", 0xF5FFFA},
-  {"mistyrose", 0xFFE4E1},
-  {"moccasin", 0xFFE4B5},
-  {"navajowhite", 0xFFDEAD},
-  {"navy", 0x000080},
-  {"oldlace", 0xFDF5E6},
-  {"olive", 0x808000},
-  {"olivedrab", 0x6B8E23},
-  {"orange", 0xFFA500},
-  {"orangered", 0xFF4500},
-  {"orchid", 0xDA70D6},
-  {"palegoldenrod", 0xEEE8AA},
-  {"palegreen", 0x98FB98},
-  {"paleturquoise", 0xAFEEEE},
-  {"palevioletred", 0xDB7093},
-  {"papayawhip", 0xFFEFD5},
-  {"peachpuff", 0xFFDAB9},
-  {"peru", 0xCD853F},
-  {"pink", 0xFFC0CB},
-  {"plum", 0xDDA0DD},
-  {"powderblue", 0xB0E0E6},
-  {"purple", 0x800080},
-  {"rebeccapurple", 0x663399},
-  {"red", 0xFF0000},
-  {"rosybrown", 0xBC8F8F},
-  {"royalblue", 0x4169E1},
-  {"saddlebrown", 0x8B4513},
-  {"salmon", 0xFA8072},
-  {"sandybrown", 0xF4A460},
-  {"seagreen", 0x2E8B57},
-  {"seashell", 0xFFF5EE},
-  {"sienna", 0xA0522D},
-  {"silver", 0xC0C0C0},
-  {"skyblue", 0x87CEEB},
-  {"slateblue", 0x6A5ACD},
-  {"slategray", 0x708090},
-  {"slategrey", 0x708090},
-  {"snow", 0xFFFAFA},
-  {"springgreen", 0x00FF7F},
-  {"steelblue", 0x4682B4},
-  {"tan", 0xD2B48C},
-  {"teal", 0x008080},
-  {"thistle", 0xD8BFD8},
-  {"tomato", 0xFF6347},
-  {"turquoise", 0x40E0D0},
-  {"violet", 0xEE82EE},
-  {"wheat", 0xF5DEB3},
-  {"white", 0xFFFFFF},
-  {"whitesmoke", 0xF5F5F5},
-  {"yellow", 0xFFFF00},
-  {"yellowgreen", 0x9ACD32},
-};
-
-static int
-hexval (char c)
-{
-  if (c >= '0' && c <= '9') return c - '0';
-  if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-  if (c >= 'A' && c <= 'F') return c - 'A' + 10;
-  return -1;
-}
-
-/* Parse SVG color value; returns HB_COLOR with alpha = 255.
- * Sets *is_none if "none". */
-hb_color_t
-hb_raster_svg_parse_color (hb_svg_str_t s,
-		 hb_paint_funcs_t *pfuncs,
-		 void *paint_data,
-		 hb_color_t foreground,
-		 hb_face_t *face,
-		 unsigned palette,
-		 bool *is_none)
-{
-  *is_none = false;
-  s = s.trim ();
-  if (!s.len) { *is_none = true; return HB_COLOR (0, 0, 0, 0); }
-
-  if (s.eq_ascii_ci ("none") || s.eq_ascii_ci ("transparent"))
-  {
-    *is_none = true;
-    return HB_COLOR (0, 0, 0, 0);
-  }
-
-  if (s.eq_ascii_ci ("currentColor"))
-    return foreground;
-
-  /* var(--colorN) → CPAL palette color */
-  if (s.starts_with_ascii_ci ("var("))
-  {
-    const char *p = s.data + 4;
-    const char *e = s.data + s.len;
-    while (p < e && *p == ' ') p++;
-    if (p + 7 < e && p[0] == '-' && p[1] == '-' && p[2] == 'c' &&
-	p[3] == 'o' && p[4] == 'l' && p[5] == 'o' && p[6] == 'r')
-    {
-      p += 7;
-      unsigned color_index = 0;
-      while (p < e && *p >= '0' && *p <= '9')
-	color_index = color_index * 10 + (*p++ - '0');
-
-      hb_color_t palette_color;
-      if (hb_paint_custom_palette_color (pfuncs, paint_data, color_index, &palette_color))
-	return palette_color;
-
-      unsigned count = 1;
-      hb_ot_color_palette_get_colors (face, palette, color_index, &count, &palette_color);
-      if (count)
-	return palette_color;
-    }
-
-    /* Fallback value after comma: var(--colorN, fallback) */
-    p = s.data + 4;
-    while (p < e && *p != ',') p++;
-    if (p < e)
-    {
-      p++;
-      while (p < e && *p == ' ') p++;
-      const char *val_start = p;
-      /* Find closing paren */
-      while (e > val_start && *(e - 1) != ')') e--;
-      if (e > val_start) e--;
-      hb_svg_str_t fallback = {val_start, (unsigned) (e - val_start)};
-      return hb_raster_svg_parse_color (fallback, pfuncs, paint_data, foreground, face, palette, is_none);
-    }
-
-    return foreground;
-  }
-
-  /* #RGB or #RRGGBB */
-  if (s.data[0] == '#')
-  {
-    if (s.len == 4) /* #RGB */
-    {
-      int r = hexval (s.data[1]);
-      int g = hexval (s.data[2]);
-      int b = hexval (s.data[3]);
-      if (r < 0 || g < 0 || b < 0) return HB_COLOR (0, 0, 0, 255);
-      return HB_COLOR (b * 17, g * 17, r * 17, 255);
-    }
-    if (s.len == 7) /* #RRGGBB */
-    {
-      int r = hexval (s.data[1]) * 16 + hexval (s.data[2]);
-      int g = hexval (s.data[3]) * 16 + hexval (s.data[4]);
-      int b = hexval (s.data[5]) * 16 + hexval (s.data[6]);
-      return HB_COLOR (b, g, r, 255);
-    }
-    return HB_COLOR (0, 0, 0, 255);
-  }
-
-  /* rgb(r, g, b) or rgb(r%, g%, b%) */
-  if (s.starts_with ("rgb"))
-  {
-    const char *p = s.data + 3;
-    const char *e = s.data + s.len;
-    while (p < e && *p != '(') p++;
-    if (p < e) p++;
-
-    auto read_component = [&] () -> int {
-      while (p < e && (*p == ' ' || *p == ',')) p++;
-      char buf[32];
-      unsigned n = 0;
-      while (p < e && n < sizeof (buf) - 1 && ((*p >= '0' && *p <= '9') || *p == '.' || *p == '-'))
-	buf[n++] = *p++;
-      bool is_pct = (p < e && *p == '%');
-      if (is_pct) p++;
-      buf[n] = '\0';
-      float val = strtof (buf, nullptr);
-      if (is_pct) val = val * 255.f / 100.f;
-      return hb_clamp ((int) (val + 0.5f), 0, 255);
-    };
-
-    int r = read_component ();
-    int g = read_component ();
-    int b = read_component ();
-    return HB_COLOR (b, g, r, 255);
-  }
-
-  /* Named colors (case-insensitive comparison) */
-  {
-    char lower[32];
-    unsigned n = hb_min (s.len, (unsigned) sizeof (lower) - 1);
-    for (unsigned i = 0; i < n; i++)
-      lower[i] = (s.data[i] >= 'A' && s.data[i] <= 'Z') ? s.data[i] + 32 : s.data[i];
-    lower[n] = '\0';
-
-    for (unsigned i = 0; i < ARRAY_LENGTH (svg_named_colors); i++)
-      if (strcmp (lower, svg_named_colors[i].name) == 0)
-      {
-	uint32_t rgb = svg_named_colors[i].rgb;
-	return HB_COLOR (rgb & 0xFF, (rgb >> 8) & 0xFF, (rgb >> 16) & 0xFF, 255);
-      }
-  }
-
-  return HB_COLOR (0, 0, 0, 255);
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.hh
deleted file mode 100644
index 893072e1..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-color.hh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_COLOR_HH
-#define HB_RASTER_SVG_COLOR_HH
-
-#include "hb.hh"
-
-#include "hb-face.hh"
-#include "hb-raster-svg-base.hh"
-
-HB_INTERNAL hb_color_t
-hb_raster_svg_parse_color (hb_svg_str_t s,
-                 hb_paint_funcs_t *pfuncs,
-                 void *paint_data,
-                 hb_color_t foreground,
-                 hb_face_t *face,
-                 unsigned palette,
-                 bool *is_none);
-
-#endif /* HB_RASTER_SVG_COLOR_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-context.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-context.hh
deleted file mode 100644
index 5882cab1..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-context.hh
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_CONTEXT_HH
-#define HB_RASTER_SVG_CONTEXT_HH
-
-#include "hb.hh"
-
-#include "OT/Color/svg/svg.hh"
-#include "hb-decycler.hh"
-#include "hb-raster-paint.hh"
-#include "hb-raster-svg-base.hh"
-#include "hb-raster-svg-defs.hh"
-
-struct hb_svg_fill_context_t
-{
-  hb_raster_paint_t *paint;
-  hb_paint_funcs_t *pfuncs;
-  hb_font_t *font;
-  unsigned palette;
-  hb_svg_defs_t *defs;
-};
-
-struct hb_svg_use_context_t
-{
-  hb_raster_paint_t *paint;
-  hb_paint_funcs_t *pfuncs;
-
-  const char *doc_start;
-  unsigned doc_len;
-  const OT::SVG::accelerator_t *svg_accel;
-  const OT::SVG::svg_doc_cache_t *doc_cache;
-  hb_decycler_t *use_decycler;
-};
-
-struct hb_svg_render_context_t
-{
-  hb_raster_paint_t *paint;
-  hb_paint_funcs_t *pfuncs;
-  hb_font_t *font;
-  unsigned palette;
-  hb_color_t foreground;
-  hb_svg_defs_t defs;
-  int depth = 0;
-
-  const char *doc_start;
-  unsigned doc_len;
-  const OT::SVG::accelerator_t *svg_accel = nullptr;
-  const OT::SVG::svg_doc_cache_t *doc_cache = nullptr;
-  hb_decycler_t use_decycler;
-  bool suppress_viewbox_once = false;
-  bool allow_symbol_render_once = false;
-
-  void push_transform (float xx, float yx, float xy, float yy, float dx, float dy)
-  {
-    hb_paint_push_transform (pfuncs, paint, xx, yx, xy, yy, dx, dy);
-  }
-  void pop_transform ()
-  {
-    hb_paint_pop_transform (pfuncs, paint);
-  }
-  void push_group ()
-  {
-    hb_paint_push_group (pfuncs, paint);
-  }
-  void pop_group (hb_paint_composite_mode_t mode)
-  {
-    hb_paint_pop_group (pfuncs, paint, mode);
-  }
-  void paint_color (hb_color_t color)
-  {
-    hb_paint_color (pfuncs, paint, false, color);
-  }
-  void pop_clip ()
-  {
-    hb_paint_pop_clip (pfuncs, paint);
-  }
-};
-
-struct hb_svg_cascade_t
-{
-  hb_svg_str_t fill;
-  float fill_opacity = 1.f;
-  hb_svg_str_t clip_path;
-  hb_color_t color = HB_COLOR (0, 0, 0, 255);
-  bool visibility = true;
-  float opacity = 1.f;
-};
-
-#endif /* HB_RASTER_SVG_CONTEXT_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.cc
deleted file mode 100644
index 3b90b457..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-defs-scan.hh"
-
-#include "hb-raster-svg-clip.hh"
-#include "hb-raster-svg-gradient.hh"
-
-static inline bool
-hb_raster_svg_process_defs_child_tag (const hb_svg_defs_scan_context_t *ctx,
-                                      hb_svg_xml_parser_t &parser,
-                                      hb_svg_token_type_t tok)
-{
-  if (parser.tag_name.eq ("linearGradient"))
-  {
-    hb_raster_svg_process_gradient_def (ctx->defs, parser, tok, SVG_GRADIENT_LINEAR,
-                                        ctx->pfuncs, ctx->paint_data,
-                                        ctx->foreground, ctx->face,
-                                        ctx->palette);
-    return true;
-  }
-  if (parser.tag_name.eq ("radialGradient"))
-  {
-    hb_raster_svg_process_gradient_def (ctx->defs, parser, tok, SVG_GRADIENT_RADIAL,
-                                        ctx->pfuncs, ctx->paint_data,
-                                        ctx->foreground, ctx->face,
-                                        ctx->palette);
-    return true;
-  }
-  if (parser.tag_name.eq ("clipPath"))
-  {
-    hb_raster_svg_process_clip_path_def (ctx->defs, parser, tok,
-                                         ctx->doc_start, ctx->doc_len,
-                                         ctx->svg_accel, ctx->doc_cache);
-    return true;
-  }
-  return false;
-}
-
-void
-hb_raster_svg_process_defs_element (const hb_svg_defs_scan_context_t *ctx,
-                                    hb_svg_xml_parser_t &parser)
-{
-  int depth = 1;
-
-  while (depth > 0)
-  {
-    hb_svg_token_type_t tok = parser.next ();
-    if (tok == SVG_TOKEN_EOF) break;
-
-    if (tok == SVG_TOKEN_CLOSE_TAG)
-    {
-      depth--;
-      continue;
-    }
-
-    if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-    {
-      if (!hb_raster_svg_process_defs_child_tag (ctx, parser, tok) &&
-          tok == SVG_TOKEN_OPEN_TAG)
-        depth++;
-    }
-  }
-}
-
-void
-hb_raster_svg_collect_defs (const hb_svg_defs_scan_context_t *ctx,
-                            const char *data,
-                            unsigned data_len)
-{
-  hb_svg_xml_parser_t parser (data, data_len);
-  while (true)
-  {
-    hb_svg_token_type_t tok = parser.next ();
-    if (tok == SVG_TOKEN_EOF) break;
-    if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-      hb_raster_svg_process_defs_child_tag (ctx, parser, tok);
-  }
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.hh
deleted file mode 100644
index bddad1f7..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs-scan.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_DEFS_SCAN_HH
-#define HB_RASTER_SVG_DEFS_SCAN_HH
-
-#include "hb.hh"
-
-#include "OT/Color/svg/svg.hh"
-#include "hb-raster-svg-defs.hh"
-
-struct hb_svg_defs_scan_context_t
-{
-  hb_svg_defs_t *defs;
-  hb_paint_funcs_t *pfuncs;
-  void *paint_data;
-  hb_color_t foreground;
-  hb_face_t *face;
-  unsigned palette;
-  const char *doc_start;
-  unsigned doc_len;
-  const OT::SVG::accelerator_t *svg_accel;
-  const OT::SVG::svg_doc_cache_t *doc_cache;
-};
-
-HB_INTERNAL void
-hb_raster_svg_process_defs_element (const hb_svg_defs_scan_context_t *ctx,
-                                    hb_svg_xml_parser_t &parser);
-
-HB_INTERNAL void
-hb_raster_svg_collect_defs (const hb_svg_defs_scan_context_t *ctx,
-                            const char *data,
-                            unsigned data_len);
-
-#endif /* HB_RASTER_SVG_DEFS_SCAN_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.cc
deleted file mode 100644
index 03414416..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-defs.hh"
-
-#include <string.h>
-
-hb_svg_defs_t::~hb_svg_defs_t ()
-{
-  for (unsigned i = 0; i < owned_id_strings.length; i++)
-    hb_free (owned_id_strings.arrayZ[i]);
-}
-
-bool
-hb_svg_defs_t::add_id_mapping (hb_hashmap_t<hb_bytes_t, unsigned> *map,
-                               hb_bytes_t id,
-                               unsigned idx)
-{
-  if (!id.length)
-    return false;
-  if (map->has (id))
-    return true;
-
-  unsigned n = (unsigned) id.length;
-  char *owned = (char *) hb_malloc (n + 1);
-  if (unlikely (!owned))
-    return false;
-  hb_memcpy (owned, id.arrayZ, n);
-  owned[n] = '\0';
-  if (unlikely (!owned_id_strings.push_or_fail (owned)))
-  {
-    hb_free (owned);
-    return false;
-  }
-
-  hb_bytes_t owned_key = hb_bytes_t (owned, n);
-  if (unlikely (!map->set (owned_key, idx)))
-    return false;
-  return true;
-}
-
-bool
-hb_svg_defs_t::add_gradient (hb_bytes_t id, const hb_svg_gradient_t &grad)
-{
-  unsigned idx = gradients.length;
-  gradients.push (grad);
-  if (unlikely (gradients.in_error ()))
-    return false;
-
-  if (unlikely (!add_id_mapping (&gradient_by_id, id, idx)))
-  {
-    gradients.pop ();
-    return false;
-  }
-  return true;
-}
-
-const hb_svg_gradient_t *
-hb_svg_defs_t::find_gradient (hb_bytes_t id) const
-{
-  if (!id.length) return nullptr;
-  unsigned *idx = nullptr;
-  if (gradient_by_id.has (id, &idx))
-    return &gradients[*idx];
-  return nullptr;
-}
-
-bool
-hb_svg_defs_t::add_clip_path (hb_bytes_t id, const hb_svg_clip_path_def_t &clip)
-{
-  unsigned idx = clip_paths.length;
-  clip_paths.push (clip);
-  if (unlikely (clip_paths.in_error ()))
-    return false;
-
-  if (unlikely (!add_id_mapping (&clip_path_by_id, id, idx)))
-  {
-    clip_paths.pop ();
-    return false;
-  }
-  return true;
-}
-
-const hb_svg_clip_path_def_t *
-hb_svg_defs_t::find_clip_path (hb_bytes_t id) const
-{
-  if (!id.length) return nullptr;
-  unsigned *idx = nullptr;
-  if (clip_path_by_id.has (id, &idx))
-    return &clip_paths[*idx];
-  return nullptr;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.hh
deleted file mode 100644
index 525d6751..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-defs.hh
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_DEFS_HH
-#define HB_RASTER_SVG_DEFS_HH
-
-#include "hb.hh"
-
-#include "hb-map.hh"
-#include "hb-raster-svg-parse.hh"
-
-enum hb_svg_gradient_type_t
-{
-  SVG_GRADIENT_LINEAR,
-  SVG_GRADIENT_RADIAL
-};
-
-struct hb_svg_gradient_stop_t
-{
-  float offset;
-  hb_color_t color;
-  bool is_current_color = false;
-};
-
-struct hb_svg_gradient_t
-{
-  hb_svg_gradient_type_t type;
-
-  hb_paint_extend_t spread = HB_PAINT_EXTEND_PAD;
-  bool has_spread = false;
-  hb_svg_transform_t gradient_transform;
-  bool has_gradient_transform = false;
-  bool units_user_space = false;
-  bool has_units_user_space = false;
-
-  float x1 = 0, y1 = 0, x2 = 1, y2 = 0;
-  bool has_x1 = false, has_y1 = false, has_x2 = false, has_y2 = false;
-
-  float cx = 0.5f, cy = 0.5f, r = 0.5f;
-  float fx = -1.f, fy = -1.f, fr = 0.f;
-  bool has_cx = false, has_cy = false, has_r = false;
-  bool has_fx = false, has_fy = false, has_fr = false;
-
-  hb_vector_t<hb_svg_gradient_stop_t> stops;
-
-  hb_bytes_t href_id = {};
-};
-
-struct hb_svg_clip_path_def_t
-{
-  unsigned first_shape = 0;
-  unsigned shape_count = 0;
-  hb_svg_transform_t clip_transform;
-  bool has_clip_transform = false;
-  bool units_user_space = true;
-};
-
-struct hb_svg_clip_shape_t
-{
-  hb_svg_shape_emit_data_t shape;
-  hb_svg_transform_t transform;
-  bool has_transform = false;
-};
-
-struct hb_svg_defs_t
-{
-  hb_vector_t<hb_svg_gradient_t> gradients;
-  hb_vector_t<hb_svg_clip_shape_t> clip_shapes;
-  hb_vector_t<hb_svg_clip_path_def_t> clip_paths;
-  hb_hashmap_t<hb_bytes_t, unsigned> gradient_by_id;
-  hb_hashmap_t<hb_bytes_t, unsigned> clip_path_by_id;
-  hb_vector_t<char *> owned_id_strings;
-
-  HB_INTERNAL ~hb_svg_defs_t ();
-
-  HB_INTERNAL bool add_id_mapping (hb_hashmap_t<hb_bytes_t, unsigned> *map,
-                                   hb_bytes_t id,
-                                   unsigned idx);
-  HB_INTERNAL bool add_gradient (hb_bytes_t id, const hb_svg_gradient_t &grad);
-  HB_INTERNAL const hb_svg_gradient_t *find_gradient (hb_bytes_t id) const;
-  HB_INTERNAL bool add_clip_path (hb_bytes_t id, const hb_svg_clip_path_def_t &clip);
-  HB_INTERNAL const hb_svg_clip_path_def_t *find_clip_path (hb_bytes_t id) const;
-};
-
-#endif /* HB_RASTER_SVG_DEFS_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.cc
deleted file mode 100644
index 98991ec5..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.cc
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-fill.hh"
-
-#include "hb-raster-svg-base.hh"
-#include "hb-raster-svg-color.hh"
-#include "hb-decycler.hh"
-
-#include <math.h>
-
-struct hb_svg_color_line_data_t
-{
-  const hb_svg_gradient_t *grad;
-  hb_paint_extend_t extend;
-  float alpha_scale;
-  hb_color_t current_color;
-};
-
-static unsigned
-svg_color_line_get_stops (hb_color_line_t *color_line HB_UNUSED,
-                          void *color_line_data,
-                          unsigned int start,
-                          unsigned int *count,
-                          hb_color_stop_t *color_stops,
-                          void *user_data HB_UNUSED)
-{
-  hb_svg_color_line_data_t *cl = (hb_svg_color_line_data_t *) color_line_data;
-  const hb_svg_gradient_t *grad = cl->grad;
-  unsigned total = grad->stops.length;
-
-  if (count)
-  {
-    unsigned n = hb_min (*count, total > start ? total - start : 0u);
-    for (unsigned i = 0; i < n; i++)
-    {
-      const hb_svg_gradient_stop_t &stop = grad->stops[start + i];
-      color_stops[i].offset = stop.offset;
-      color_stops[i].is_foreground = false;
-      hb_color_t c = stop.is_current_color ? cl->current_color : stop.color;
-      if (stop.is_current_color)
-      {
-        uint8_t a = (uint8_t) hb_raster_div255 (hb_color_get_alpha (c) * hb_color_get_alpha (stop.color));
-        c = HB_COLOR (hb_color_get_blue (c),
-                      hb_color_get_green (c),
-                      hb_color_get_red (c),
-                      a);
-      }
-      if (cl->alpha_scale < 1.f)
-      {
-        uint8_t a = (uint8_t) hb_clamp ((int) (hb_color_get_alpha (c) * cl->alpha_scale + 0.5f), 0, 255);
-        c = HB_COLOR (hb_color_get_blue (c),
-                      hb_color_get_green (c),
-                      hb_color_get_red (c),
-                      a);
-      }
-      color_stops[i].color = c;
-    }
-    *count = n;
-  }
-  return total;
-}
-
-static hb_paint_extend_t
-svg_color_line_get_extend (hb_color_line_t *color_line HB_UNUSED,
-                           void *color_line_data,
-                           void *user_data HB_UNUSED)
-{
-  hb_svg_color_line_data_t *cl = (hb_svg_color_line_data_t *) color_line_data;
-  return cl->extend;
-}
-
-static bool
-svg_parse_paint_url_with_fallback (hb_svg_str_t s,
-                                   hb_svg_str_t *out_id,
-                                   hb_svg_str_t *fallback)
-{
-  if (out_id) *out_id = {};
-  hb_svg_str_t id;
-  if (!hb_raster_svg_parse_local_id_ref (s, &id, fallback))
-    return false;
-  if (!s.trim ().starts_with_ascii_ci ("url("))
-    return false;
-  if (out_id) *out_id = id;
-  return id.len > 0;
-}
-
-void
-hb_raster_svg_emit_fill (const hb_svg_fill_context_t *ctx,
-               hb_svg_str_t fill_str,
-               float fill_opacity,
-               const hb_extents_t<> *object_bbox,
-               hb_color_t current_color)
-{
-  bool is_none = false;
-
-  hb_svg_str_t url_id;
-  hb_svg_str_t fallback_paint;
-  bool has_url_paint = svg_parse_paint_url_with_fallback (fill_str, &url_id, &fallback_paint);
-
-  const hb_svg_gradient_t *grad = has_url_paint ? ctx->defs->find_gradient (hb_bytes_t (url_id.data, url_id.len)) : nullptr;
-  if (has_url_paint && !grad)
-  {
-    if (fallback_paint.len)
-      hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-    return;
-  }
-  if (grad)
-  {
-    const unsigned SVG_MAX_GRADIENT_REF_DEPTH = 1024;
-    hb_vector_t<const hb_svg_gradient_t *> chain;
-    hb_decycler_t decycler;
-    const hb_svg_gradient_t *cur = grad;
-    while (cur)
-    {
-      if (chain.length >= SVG_MAX_GRADIENT_REF_DEPTH)
-        break;
-
-      hb_decycler_node_t node (decycler);
-      if (unlikely (!node.visit ((uintptr_t) cur)))
-        break;
-
-      if (unlikely (!chain.push_or_fail (cur)))
-      {
-        if (fallback_paint.len)
-          hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-        return;
-      }
-
-      if (!cur->href_id.length) break;
-      const hb_svg_gradient_t *next = ctx->defs->find_gradient (cur->href_id);
-      if (!next) break;
-      cur = next;
-    }
-    if (!chain.length)
-    {
-      if (fallback_paint.len)
-        hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-      return;
-    }
-
-    if (!chain.length) {
-      if (fallback_paint.len)
-        hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-      return;
-    }
-    hb_svg_gradient_t effective = *chain.arrayZ[chain.length - 1];
-    for (int i = (int) chain.length - 2; i >= 0; i--)
-    {
-      const hb_svg_gradient_t *g = chain.arrayZ[i];
-      effective.type = g->type;
-      if (g->stops.length) effective.stops = g->stops;
-      if (g->has_spread) { effective.spread = g->spread; effective.has_spread = true; }
-      if (g->has_units_user_space)
-      {
-        effective.units_user_space = g->units_user_space;
-        effective.has_units_user_space = true;
-      }
-      if (g->has_gradient_transform)
-      {
-        effective.gradient_transform = g->gradient_transform;
-        effective.has_gradient_transform = true;
-      }
-      if (g->has_x1) { effective.x1 = g->x1; effective.has_x1 = true; }
-      if (g->has_y1) { effective.y1 = g->y1; effective.has_y1 = true; }
-      if (g->has_x2) { effective.x2 = g->x2; effective.has_x2 = true; }
-      if (g->has_y2) { effective.y2 = g->y2; effective.has_y2 = true; }
-      if (g->has_cx) { effective.cx = g->cx; effective.has_cx = true; }
-      if (g->has_cy) { effective.cy = g->cy; effective.has_cy = true; }
-      if (g->has_r)  { effective.r  = g->r;  effective.has_r  = true; }
-      if (g->has_fx) { effective.fx = g->fx; effective.has_fx = true; }
-      if (g->has_fy) { effective.fy = g->fy; effective.has_fy = true; }
-      if (g->has_fr) { effective.fr = g->fr; effective.has_fr = true; }
-    }
-    if (!effective.stops.length)
-    {
-      if (fallback_paint.len)
-        hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-      return;
-    }
-
-    hb_svg_color_line_data_t cl_data;
-    cl_data.grad = &effective;
-    cl_data.extend = effective.spread;
-    cl_data.alpha_scale = hb_clamp (fill_opacity, 0.f, 1.f);
-    cl_data.current_color = current_color;
-
-    hb_color_line_t cl = {
-      &cl_data,
-      svg_color_line_get_stops, nullptr,
-      svg_color_line_get_extend, nullptr
-    };
-
-    bool has_bbox_transform = !effective.units_user_space && object_bbox && !object_bbox->is_empty ();
-    if (has_bbox_transform)
-    {
-      float w = object_bbox->xmax - object_bbox->xmin;
-      float h = object_bbox->ymax - object_bbox->ymin;
-      if (std::isfinite (w) && std::isfinite (h) && w > 0.f && h > 0.f)
-        hb_paint_push_transform (ctx->pfuncs, ctx->paint, w, 0, 0, h, object_bbox->xmin, object_bbox->ymin);
-      else
-        has_bbox_transform = false;
-    }
-
-    if (effective.has_gradient_transform)
-      hb_paint_push_transform (ctx->pfuncs, ctx->paint,
-                               effective.gradient_transform.xx,
-                               effective.gradient_transform.yx,
-                               effective.gradient_transform.xy,
-                               effective.gradient_transform.yy,
-                               effective.gradient_transform.dx,
-                               effective.gradient_transform.dy);
-
-    if (effective.type == SVG_GRADIENT_LINEAR)
-    {
-      hb_paint_linear_gradient (ctx->pfuncs, ctx->paint, &cl,
-                                effective.x1, effective.y1,
-                                effective.x2, effective.y2,
-                                effective.x2 - (effective.y2 - effective.y1),
-                                effective.y2 + (effective.x2 - effective.x1));
-    }
-    else
-    {
-      if (!std::isfinite (effective.r) || effective.r < 0.f)
-      {
-        if (effective.has_gradient_transform)
-          hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-        if (has_bbox_transform)
-          hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-        if (fallback_paint.len)
-          hb_raster_svg_emit_fill (ctx, fallback_paint, fill_opacity, object_bbox, current_color);
-        return;
-      }
-
-      float fx = effective.has_fx ? effective.fx : effective.cx;
-      float fy = effective.has_fy ? effective.fy : effective.cy;
-      float fr = effective.has_fr ? effective.fr : 0.f;
-      if (!std::isfinite (fr) || fr < 0.f)
-        fr = 0.f;
-      fr = hb_min (fr, effective.r);
-
-      hb_paint_radial_gradient (ctx->pfuncs, ctx->paint, &cl,
-                                fx, fy, fr,
-                                effective.cx, effective.cy, effective.r);
-    }
-
-    if (effective.has_gradient_transform)
-      hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-    if (has_bbox_transform)
-      hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-
-    return;
-  }
-
-  hb_color_t color = hb_raster_svg_parse_color (fill_str,
-                                      ctx->pfuncs,
-                                      ctx->paint,
-                                      current_color,
-                                      hb_font_get_face (ctx->font),
-                                      ctx->palette,
-                                      &is_none);
-  if (is_none) return;
-
-  if (fill_opacity < 1.f)
-    color = HB_COLOR (hb_color_get_blue (color),
-                      hb_color_get_green (color),
-                      hb_color_get_red (color),
-                      (uint8_t) (hb_color_get_alpha (color) * fill_opacity + 0.5f));
-
-  hb_paint_color (ctx->pfuncs, ctx->paint, false, color);
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.hh
deleted file mode 100644
index ce4ceecd..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-fill.hh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_FILL_HH
-#define HB_RASTER_SVG_FILL_HH
-
-#include "hb.hh"
-
-#include "hb-raster-svg-context.hh"
-
-HB_INTERNAL void
-hb_raster_svg_emit_fill (const hb_svg_fill_context_t *ctx,
-               hb_svg_str_t fill_str,
-               float fill_opacity,
-               const hb_extents_t<> *object_bbox,
-               hb_color_t current_color);
-
-#endif /* HB_RASTER_SVG_FILL_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.cc
deleted file mode 100644
index cf9e51df..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-gradient.hh"
-
-#include "hb-raster-svg-base.hh"
-
-static bool
-svg_parse_gradient_stop (hb_svg_xml_parser_t &parser,
-                         hb_svg_gradient_t &grad,
-                         hb_paint_funcs_t *pfuncs,
-                         void *paint_data,
-                         hb_color_t foreground,
-                         hb_face_t *face,
-                         unsigned palette)
-{
-  const unsigned SVG_MAX_GRADIENT_STOPS = 1024;
-  if (grad.stops.length >= SVG_MAX_GRADIENT_STOPS)
-    return true;
-
-  hb_svg_attr_view_t attrs (parser);
-  hb_svg_str_t style = attrs.get ("style");
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (style, &style_props);
-  hb_svg_str_t offset_str = svg_pick_attr_or_style (parser, style_props.offset, "offset");
-  hb_svg_str_t color_str = svg_pick_attr_or_style (parser, style_props.stop_color, "stop-color");
-  hb_svg_str_t opacity_str = svg_pick_attr_or_style (parser, style_props.stop_opacity, "stop-opacity");
-  hb_svg_str_t display_str = svg_pick_attr_or_style (parser, style_props.display, "display");
-  hb_svg_str_t visibility_str = svg_pick_attr_or_style (parser, style_props.visibility, "visibility");
-
-  if (display_str.trim ().eq_ascii_ci ("none"))
-    return true;
-  hb_svg_str_t visibility_trim = visibility_str.trim ();
-  if (visibility_trim.eq_ascii_ci ("hidden") ||
-      visibility_trim.eq_ascii_ci ("collapse"))
-    return true;
-
-  float offset = 0;
-  if (offset_str.len)
-    offset = hb_clamp (svg_parse_number_or_percent (offset_str, nullptr), 0.f, 1.f);
-  if (grad.stops.length)
-    offset = hb_max (offset, grad.stops.arrayZ[grad.stops.length - 1].offset);
-
-  bool is_none = false;
-  hb_color_t color = HB_COLOR (0, 0, 0, 255);
-  bool is_current_color = false;
-  if (color_str.len && !svg_str_is_inherit (color_str))
-  {
-    is_current_color = color_str.trim ().eq_ascii_ci ("currentColor");
-    color = hb_raster_svg_parse_color (color_str, pfuncs, paint_data, foreground, face, palette, &is_none);
-  }
-
-  if (opacity_str.len && !svg_str_is_inherit (opacity_str))
-  {
-    float opacity = svg_parse_float_clamped01 (opacity_str);
-    color = HB_COLOR (hb_color_get_blue (color),
-                      hb_color_get_green (color),
-                      hb_color_get_red (color),
-                      (uint8_t) (hb_color_get_alpha (color) * opacity + 0.5f));
-  }
-
-  hb_svg_gradient_stop_t stop;
-  stop.offset = offset;
-  stop.color = color;
-  stop.is_current_color = is_current_color;
-  return grad.stops.push_or_fail (stop);
-}
-
-static void
-svg_parse_gradient_attrs (hb_svg_xml_parser_t &parser,
-                          hb_svg_gradient_t &grad)
-{
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &style_props);
-
-  hb_svg_str_t spread_str = svg_pick_attr_or_style (parser, style_props.spread_method, "spreadMethod").trim ();
-  if (spread_str.eq_ascii_ci ("reflect"))
-  {
-    grad.spread = HB_PAINT_EXTEND_REFLECT;
-    grad.has_spread = true;
-  }
-  else if (spread_str.eq_ascii_ci ("repeat"))
-  {
-    grad.spread = HB_PAINT_EXTEND_REPEAT;
-    grad.has_spread = true;
-  }
-  else if (spread_str.eq_ascii_ci ("pad"))
-  {
-    grad.spread = HB_PAINT_EXTEND_PAD;
-    grad.has_spread = true;
-  }
-
-  hb_svg_str_t units_str = svg_pick_attr_or_style (parser, style_props.gradient_units, "gradientUnits").trim ();
-  if (units_str.eq_ascii_ci ("userSpaceOnUse"))
-  {
-    grad.units_user_space = true;
-    grad.has_units_user_space = true;
-  }
-  else if (units_str.eq_ascii_ci ("objectBoundingBox"))
-  {
-    grad.units_user_space = false;
-    grad.has_units_user_space = true;
-  }
-
-  hb_svg_str_t transform_str = svg_pick_attr_or_style (parser, style_props.gradient_transform, "gradientTransform");
-  if (transform_str.len)
-  {
-    grad.has_gradient_transform = true;
-    hb_raster_svg_parse_transform (transform_str, &grad.gradient_transform);
-  }
-
-  hb_svg_str_t href = hb_raster_svg_find_href_attr (parser);
-  if (href.len)
-  {
-    hb_svg_str_t href_id;
-    if (hb_raster_svg_parse_local_id_ref (href, &href_id, nullptr))
-      grad.href_id = hb_bytes_t (href_id.data, href_id.len);
-  }
-}
-
-static void
-svg_parse_gradient_geometry_attrs (hb_svg_xml_parser_t &parser,
-                                   hb_svg_gradient_t &grad)
-{
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (parser.find_attr ("style"), &style_props);
-  if (grad.type == SVG_GRADIENT_LINEAR)
-  {
-    hb_svg_str_t x1_str = svg_pick_attr_or_style (parser, style_props.x1, "x1");
-    hb_svg_str_t y1_str = svg_pick_attr_or_style (parser, style_props.y1, "y1");
-    hb_svg_str_t x2_str = svg_pick_attr_or_style (parser, style_props.x2, "x2");
-    hb_svg_str_t y2_str = svg_pick_attr_or_style (parser, style_props.y2, "y2");
-    if (x1_str.len) { grad.x1 = svg_parse_number_or_percent (x1_str, nullptr); grad.has_x1 = true; }
-    if (y1_str.len) { grad.y1 = svg_parse_number_or_percent (y1_str, nullptr); grad.has_y1 = true; }
-    if (x2_str.len) { grad.x2 = svg_parse_number_or_percent (x2_str, nullptr); grad.has_x2 = true; }
-    if (y2_str.len) { grad.y2 = svg_parse_number_or_percent (y2_str, nullptr); grad.has_y2 = true; }
-
-    if (!grad.has_x2)
-      grad.x2 = 1.f;
-  }
-  else
-  {
-    hb_svg_str_t cx_str = svg_pick_attr_or_style (parser, style_props.cx, "cx");
-    hb_svg_str_t cy_str = svg_pick_attr_or_style (parser, style_props.cy, "cy");
-    hb_svg_str_t r_str = svg_pick_attr_or_style (parser, style_props.r, "r");
-    hb_svg_str_t fx_str = svg_pick_attr_or_style (parser, style_props.fx, "fx");
-    hb_svg_str_t fy_str = svg_pick_attr_or_style (parser, style_props.fy, "fy");
-    hb_svg_str_t fr_str = svg_pick_attr_or_style (parser, style_props.fr, "fr");
-
-    if (cx_str.len) { grad.cx = svg_parse_number_or_percent (cx_str, nullptr); grad.has_cx = true; }
-    if (cy_str.len) { grad.cy = svg_parse_number_or_percent (cy_str, nullptr); grad.has_cy = true; }
-    if (r_str.len) { grad.r = svg_parse_number_or_percent (r_str, nullptr); grad.has_r = true; }
-    if (fx_str.len) { grad.fx = svg_parse_number_or_percent (fx_str, nullptr); grad.has_fx = true; }
-    if (fy_str.len) { grad.fy = svg_parse_number_or_percent (fy_str, nullptr); grad.has_fy = true; }
-    if (fr_str.len) { grad.fr = svg_parse_number_or_percent (fr_str, nullptr); grad.has_fr = true; }
-  }
-}
-
-static void
-svg_parse_gradient_children (hb_svg_defs_t *defs,
-                             hb_svg_xml_parser_t &parser,
-                             hb_svg_gradient_t &grad,
-                             hb_svg_str_t *id,
-                             hb_paint_funcs_t *pfuncs,
-                             void *paint_data,
-                             hb_color_t foreground,
-                             hb_face_t *face,
-                             unsigned palette)
-{
-  int gdepth = 1;
-  bool had_alloc_failure = false;
-  while (gdepth > 0)
-  {
-    hb_svg_token_type_t gt = parser.next ();
-    if (gt == SVG_TOKEN_EOF) break;
-    if (gt == SVG_TOKEN_CLOSE_TAG) { gdepth--; continue; }
-    if ((gt == SVG_TOKEN_OPEN_TAG || gt == SVG_TOKEN_SELF_CLOSE_TAG) &&
-        parser.tag_name.eq ("stop"))
-      if (unlikely (!svg_parse_gradient_stop (parser, grad,
-                                              pfuncs, paint_data,
-                                              foreground, face,
-                                              palette)))
-        had_alloc_failure = true;
-    if (gt == SVG_TOKEN_OPEN_TAG && !parser.tag_name.eq ("stop"))
-      gdepth++;
-  }
-  if (had_alloc_failure || defs->gradients.in_error ())
-    *id = {};
-}
-
-void
-hb_raster_svg_process_gradient_def (hb_svg_defs_t *defs,
-                          hb_svg_xml_parser_t &parser,
-                          hb_svg_token_type_t tok,
-                          hb_svg_gradient_type_t type,
-                          hb_paint_funcs_t *pfuncs,
-                          void *paint_data,
-                          hb_color_t foreground,
-                          hb_face_t *face,
-                          unsigned palette)
-{
-  hb_svg_gradient_t grad;
-  grad.type = type;
-  svg_parse_gradient_geometry_attrs (parser, grad);
-  svg_parse_gradient_attrs (parser, grad);
-
-  hb_svg_str_t id = parser.find_attr ("id");
-  if (tok == SVG_TOKEN_OPEN_TAG)
-    svg_parse_gradient_children (defs, parser, grad, &id,
-                                 pfuncs, paint_data,
-                                 foreground, face,
-                                 palette);
-
-  if (id.len)
-    (void) defs->add_gradient (hb_bytes_t (id.data, id.len), grad);
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.hh
deleted file mode 100644
index 0b1e6fd0..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-gradient.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_GRADIENT_HH
-#define HB_RASTER_SVG_GRADIENT_HH
-
-#include "hb.hh"
-
-#include "hb-raster-svg-color.hh"
-#include "hb-raster-svg-defs.hh"
-
-HB_INTERNAL void
-hb_raster_svg_process_gradient_def (hb_svg_defs_t *defs,
-                          hb_svg_xml_parser_t &parser,
-                          hb_svg_token_type_t tok,
-                          hb_svg_gradient_type_t type,
-                          hb_paint_funcs_t *pfuncs,
-                          void *paint_data,
-                          hb_color_t foreground,
-                          hb_face_t *face,
-                          unsigned palette);
-
-#endif /* HB_RASTER_SVG_GRADIENT_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.cc
deleted file mode 100644
index 0bdb4710..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.cc
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-parse.hh"
-
-#include <math.h>
-bool
-hb_raster_svg_parse_transform (hb_svg_str_t s, hb_svg_transform_t *out)
-{
-  hb_svg_float_parser_t fp (s);
-
-  while (fp.p < fp.end)
-  {
-    fp.skip_ws_comma ();
-    if (fp.p >= fp.end) break;
-
-    const char *start = fp.p;
-    while (fp.p < fp.end && *fp.p != '(') fp.p++;
-    hb_svg_str_t func_name = {start, (unsigned) (fp.p - start)};
-
-    while (func_name.len && (func_name.data[func_name.len - 1] == ' ' ||
-                             func_name.data[func_name.len - 1] == '\t'))
-      func_name.len--;
-
-    if (fp.p >= fp.end) break;
-    fp.p++;
-
-    hb_svg_transform_t t;
-
-    if (func_name.eq_ascii_ci ("matrix"))
-    {
-      t.xx = fp.next_float ();
-      t.yx = fp.next_float ();
-      t.xy = fp.next_float ();
-      t.yy = fp.next_float ();
-      t.dx = fp.next_float ();
-      t.dy = fp.next_float ();
-    }
-    else if (func_name.eq_ascii_ci ("translate"))
-    {
-      t.dx = fp.next_float ();
-      fp.skip_ws_comma ();
-      if (fp.p < fp.end && *fp.p != ')')
-        t.dy = fp.next_float ();
-    }
-    else if (func_name.eq_ascii_ci ("scale"))
-    {
-      t.xx = fp.next_float ();
-      fp.skip_ws_comma ();
-      if (fp.p < fp.end && *fp.p != ')')
-        t.yy = fp.next_float ();
-      else
-        t.yy = t.xx;
-    }
-    else if (func_name.eq_ascii_ci ("rotate"))
-    {
-      float angle = fp.next_float () * (float) M_PI / 180.f;
-      float cs = cosf (angle), sn = sinf (angle);
-      fp.skip_ws_comma ();
-      if (fp.p < fp.end && *fp.p != ')')
-      {
-        float cx = fp.next_float ();
-        float cy = fp.next_float ();
-        t.xx = cs;  t.yx = sn;
-        t.xy = -sn; t.yy = cs;
-        t.dx = cx - cs * cx + sn * cy;
-        t.dy = cy - sn * cx - cs * cy;
-      }
-      else
-      {
-        t.xx = cs;  t.yx = sn;
-        t.xy = -sn; t.yy = cs;
-      }
-    }
-    else if (func_name.eq_ascii_ci ("skewX"))
-    {
-      float angle = fp.next_float () * (float) M_PI / 180.f;
-      t.xy = tanf (angle);
-    }
-    else if (func_name.eq_ascii_ci ("skewY"))
-    {
-      float angle = fp.next_float () * (float) M_PI / 180.f;
-      t.yx = tanf (angle);
-    }
-
-    while (fp.p < fp.end && *fp.p != ')') fp.p++;
-    if (fp.p < fp.end) fp.p++;
-
-    out->multiply (t);
-  }
-  return true;
-}
-
-static void
-svg_arc_to_cubics (hb_draw_funcs_t *dfuncs, void *draw_data, hb_draw_state_t *st,
-                   float cx, float cy,
-                   float rx, float ry,
-                   float phi, float theta1, float dtheta)
-{
-  int n_segs = (int) ceilf (fabsf (dtheta) / ((float) M_PI / 2.f));
-  if (n_segs < 1) n_segs = 1;
-  float seg_angle = dtheta / n_segs;
-
-  float cos_phi = cosf (phi);
-  float sin_phi = sinf (phi);
-
-  for (int i = 0; i < n_segs; i++)
-  {
-    float t1 = theta1 + i * seg_angle;
-    float t2 = t1 + seg_angle;
-    float alpha = sinf (seg_angle) *
-                  (sqrtf (4.f + 3.f * tanf (seg_angle / 2.f) * tanf (seg_angle / 2.f)) - 1.f) / 3.f;
-
-    float cos_t1 = cosf (t1), sin_t1 = sinf (t1);
-    float cos_t2 = cosf (t2), sin_t2 = sinf (t2);
-
-    float e1x = rx * cos_t1, e1y = ry * sin_t1;
-    float e2x = rx * cos_t2, e2y = ry * sin_t2;
-    float d1x = -rx * sin_t1, d1y = ry * cos_t1;
-    float d2x = -rx * sin_t2, d2y = ry * cos_t2;
-
-    float cp1x = e1x + alpha * d1x;
-    float cp1y = e1y + alpha * d1y;
-    float cp2x = e2x - alpha * d2x;
-    float cp2y = e2y - alpha * d2y;
-
-    float r_cp1x = cos_phi * cp1x - sin_phi * cp1y + cx;
-    float r_cp1y = sin_phi * cp1x + cos_phi * cp1y + cy;
-    float r_cp2x = cos_phi * cp2x - sin_phi * cp2y + cx;
-    float r_cp2y = sin_phi * cp2x + cos_phi * cp2y + cy;
-    float r_e2x  = cos_phi * e2x  - sin_phi * e2y  + cx;
-    float r_e2y  = sin_phi * e2x  + cos_phi * e2y  + cy;
-
-    hb_draw_cubic_to (dfuncs, draw_data, st,
-                      r_cp1x, r_cp1y,
-                      r_cp2x, r_cp2y,
-                      r_e2x, r_e2y);
-  }
-}
-
-static void
-svg_arc_endpoint_to_center (float x1, float y1, float x2, float y2,
-                            float rx, float ry, float phi_deg,
-                            bool large_arc, bool sweep,
-                            float *cx_out, float *cy_out,
-                            float *theta1_out, float *dtheta_out,
-                            float *rx_out, float *ry_out)
-{
-  float phi = phi_deg * (float) M_PI / 180.f;
-  float cos_phi = cosf (phi), sin_phi = sinf (phi);
-
-  float mx = (x1 - x2) / 2.f;
-  float my = (y1 - y2) / 2.f;
-  float x1p =  cos_phi * mx + sin_phi * my;
-  float y1p = -sin_phi * mx + cos_phi * my;
-
-  rx = fabsf (rx); ry = fabsf (ry);
-  if (rx < 1e-10f || ry < 1e-10f)
-  {
-    *cx_out = (x1 + x2) / 2.f;
-    *cy_out = (y1 + y2) / 2.f;
-    *theta1_out = 0;
-    *dtheta_out = 0;
-    *rx_out = rx; *ry_out = ry;
-    return;
-  }
-
-  float x1p2 = x1p * x1p, y1p2 = y1p * y1p;
-  float rx2 = rx * rx, ry2 = ry * ry;
-  float lambda = x1p2 / rx2 + y1p2 / ry2;
-  if (lambda > 1.f)
-  {
-    float sl = sqrtf (lambda);
-    rx *= sl; ry *= sl;
-    rx2 = rx * rx; ry2 = ry * ry;
-  }
-
-  float num = rx2 * ry2 - rx2 * y1p2 - ry2 * x1p2;
-  float den = rx2 * y1p2 + ry2 * x1p2;
-  float sq = (den > 0.f) ? sqrtf (hb_max (num / den, 0.f)) : 0.f;
-  if (large_arc == sweep) sq = -sq;
-
-  float cxp =  sq * rx * y1p / ry;
-  float cyp = -sq * ry * x1p / rx;
-
-  float cx = cos_phi * cxp - sin_phi * cyp + (x1 + x2) / 2.f;
-  float cy = sin_phi * cxp + cos_phi * cyp + (y1 + y2) / 2.f;
-
-  auto angle = [] (float ux, float uy, float vx, float vy) -> float {
-    float dot = ux * vx + uy * vy;
-    float len = sqrtf ((ux * ux + uy * uy) * (vx * vx + vy * vy));
-    if (!(len > 0.f) || !std::isfinite (len))
-      return 0.f;
-    float a = acosf (hb_clamp (dot / len, -1.f, 1.f));
-    if (ux * vy - uy * vx < 0.f) a = -a;
-    return a;
-  };
-
-  float theta1 = angle (1.f, 0.f, (x1p - cxp) / rx, (y1p - cyp) / ry);
-  float dtheta = angle ((x1p - cxp) / rx, (y1p - cyp) / ry,
-                        (-x1p - cxp) / rx, (-y1p - cyp) / ry);
-
-  if (!sweep && dtheta > 0.f) dtheta -= 2.f * (float) M_PI;
-  if (sweep && dtheta < 0.f)  dtheta += 2.f * (float) M_PI;
-
-  *cx_out = cx; *cy_out = cy;
-  *theta1_out = theta1; *dtheta_out = dtheta;
-  *rx_out = rx; *ry_out = ry;
-}
-
-void
-hb_raster_svg_parse_path_data (hb_svg_str_t d, hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  hb_svg_float_parser_t fp (d);
-
-  float cur_x = 0, cur_y = 0;
-  float start_x = 0, start_y = 0;
-  float last_cx = 0, last_cy = 0;
-  char last_cmd = 0;
-  char cmd = 0;
-  unsigned segments = 0;
-
-  while (fp.p < fp.end)
-  {
-    if (unlikely (segments++ >= HB_SVG_MAX_PATH_SEGMENTS))
-      break;
-    fp.skip_ws_comma ();
-    if (fp.p >= fp.end) break;
-
-    char c = *fp.p;
-    if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
-    {
-      cmd = c;
-      fp.p++;
-    }
-
-    switch (cmd)
-    {
-    case 'M': case 'm':
-    {
-      float x = fp.next_float ();
-      float y = fp.next_float ();
-      if (cmd == 'm') { x += cur_x; y += cur_y; }
-      hb_draw_move_to (dfuncs, draw_data, &st, x, y);
-      cur_x = start_x = x;
-      cur_y = start_y = y;
-      cmd = (cmd == 'M') ? 'L' : 'l';
-      last_cmd = 'M';
-      continue;
-    }
-    case 'L': case 'l':
-    {
-      float x = fp.next_float ();
-      float y = fp.next_float ();
-      if (cmd == 'l') { x += cur_x; y += cur_y; }
-      hb_draw_line_to (dfuncs, draw_data, &st, x, y);
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'H': case 'h':
-    {
-      float x = fp.next_float ();
-      if (cmd == 'h') x += cur_x;
-      hb_draw_line_to (dfuncs, draw_data, &st, x, cur_y);
-      cur_x = x;
-      break;
-    }
-    case 'V': case 'v':
-    {
-      float y = fp.next_float ();
-      if (cmd == 'v') y += cur_y;
-      hb_draw_line_to (dfuncs, draw_data, &st, cur_x, y);
-      cur_y = y;
-      break;
-    }
-    case 'C': case 'c':
-    {
-      float x1 = fp.next_float ();
-      float y1 = fp.next_float ();
-      float x2 = fp.next_float ();
-      float y2 = fp.next_float ();
-      float x  = fp.next_float ();
-      float y  = fp.next_float ();
-      if (cmd == 'c')
-      { x1 += cur_x; y1 += cur_y; x2 += cur_x; y2 += cur_y; x += cur_x; y += cur_y; }
-      hb_draw_cubic_to (dfuncs, draw_data, &st, x1, y1, x2, y2, x, y);
-      last_cx = x2; last_cy = y2;
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'S': case 's':
-    {
-      float cx1, cy1;
-      if (last_cmd == 'C' || last_cmd == 'c' || last_cmd == 'S' || last_cmd == 's')
-      { cx1 = 2 * cur_x - last_cx; cy1 = 2 * cur_y - last_cy; }
-      else
-      { cx1 = cur_x; cy1 = cur_y; }
-      float x2 = fp.next_float ();
-      float y2 = fp.next_float ();
-      float x  = fp.next_float ();
-      float y  = fp.next_float ();
-      if (cmd == 's')
-      { x2 += cur_x; y2 += cur_y; x += cur_x; y += cur_y; }
-      hb_draw_cubic_to (dfuncs, draw_data, &st, cx1, cy1, x2, y2, x, y);
-      last_cx = x2; last_cy = y2;
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'Q': case 'q':
-    {
-      float x1 = fp.next_float ();
-      float y1 = fp.next_float ();
-      float x  = fp.next_float ();
-      float y  = fp.next_float ();
-      if (cmd == 'q')
-      { x1 += cur_x; y1 += cur_y; x += cur_x; y += cur_y; }
-      hb_draw_quadratic_to (dfuncs, draw_data, &st, x1, y1, x, y);
-      last_cx = x1; last_cy = y1;
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'T': case 't':
-    {
-      float cx1, cy1;
-      if (last_cmd == 'Q' || last_cmd == 'q' || last_cmd == 'T' || last_cmd == 't')
-      { cx1 = 2 * cur_x - last_cx; cy1 = 2 * cur_y - last_cy; }
-      else
-      { cx1 = cur_x; cy1 = cur_y; }
-      float x = fp.next_float ();
-      float y = fp.next_float ();
-      if (cmd == 't') { x += cur_x; y += cur_y; }
-      hb_draw_quadratic_to (dfuncs, draw_data, &st, cx1, cy1, x, y);
-      last_cx = cx1; last_cy = cy1;
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'A': case 'a':
-    {
-      float rx = fp.next_float ();
-      float ry = fp.next_float ();
-      float x_rot = fp.next_float ();
-      bool large_arc = fp.next_flag ();
-      bool sweep = fp.next_flag ();
-      float x = fp.next_float ();
-      float y = fp.next_float ();
-      if (cmd == 'a') { x += cur_x; y += cur_y; }
-
-      if (fabsf (x - cur_x) < 1e-6f && fabsf (y - cur_y) < 1e-6f)
-      {
-        cur_x = x; cur_y = y;
-        break;
-      }
-
-      float cx, cy, theta1, dtheta, adj_rx, adj_ry;
-      svg_arc_endpoint_to_center (cur_x, cur_y, x, y,
-                                  rx, ry, x_rot,
-                                  large_arc, sweep,
-                                  &cx, &cy, &theta1, &dtheta,
-                                  &adj_rx, &adj_ry);
-
-      float phi = x_rot * (float) M_PI / 180.f;
-      svg_arc_to_cubics (dfuncs, draw_data, &st,
-                         cx, cy, adj_rx, adj_ry, phi, theta1, dtheta);
-      cur_x = x; cur_y = y;
-      break;
-    }
-    case 'Z': case 'z':
-      hb_draw_close_path (dfuncs, draw_data, &st);
-      cur_x = start_x;
-      cur_y = start_y;
-      break;
-
-    default:
-      fp.p++;
-      continue;
-    }
-
-    last_cmd = cmd;
-  }
-}
-
-static void
-svg_rect_to_path (float x, float y, float w, float h, float rx, float ry,
-                  hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  if (rx < 0.f || ry < 0.f)
-    return;
-
-  if (rx <= 0 && ry <= 0)
-  {
-    hb_draw_move_to (dfuncs, draw_data, &st, x, y);
-    hb_draw_line_to (dfuncs, draw_data, &st, x + w, y);
-    hb_draw_line_to (dfuncs, draw_data, &st, x + w, y + h);
-    hb_draw_line_to (dfuncs, draw_data, &st, x, y + h);
-    hb_draw_close_path (dfuncs, draw_data, &st);
-    return;
-  }
-
-  if (rx <= 0) rx = ry;
-  if (ry <= 0) ry = rx;
-  rx = hb_min (rx, w / 2);
-  ry = hb_min (ry, h / 2);
-
-  float kx = rx * 0.5522847498f;
-  float ky = ry * 0.5522847498f;
-
-  hb_draw_move_to (dfuncs, draw_data, &st, x + rx, y);
-  hb_draw_line_to (dfuncs, draw_data, &st, x + w - rx, y);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    x + w - rx + kx, y,
-                    x + w, y + ry - ky,
-                    x + w, y + ry);
-  hb_draw_line_to (dfuncs, draw_data, &st, x + w, y + h - ry);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    x + w, y + h - ry + ky,
-                    x + w - rx + kx, y + h,
-                    x + w - rx, y + h);
-  hb_draw_line_to (dfuncs, draw_data, &st, x + rx, y + h);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    x + rx - kx, y + h,
-                    x, y + h - ry + ky,
-                    x, y + h - ry);
-  hb_draw_line_to (dfuncs, draw_data, &st, x, y + ry);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    x, y + ry - ky,
-                    x + rx - kx, y,
-                    x + rx, y);
-  hb_draw_close_path (dfuncs, draw_data, &st);
-}
-
-static void
-svg_circle_to_path (float cx, float cy, float r,
-                    hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  float k = r * 0.5522847498f;
-
-  hb_draw_move_to (dfuncs, draw_data, &st, cx + r, cy);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx + r, cy + k,
-                    cx + k, cy + r,
-                    cx, cy + r);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx - k, cy + r,
-                    cx - r, cy + k,
-                    cx - r, cy);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx - r, cy - k,
-                    cx - k, cy - r,
-                    cx, cy - r);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx + k, cy - r,
-                    cx + r, cy - k,
-                    cx + r, cy);
-  hb_draw_close_path (dfuncs, draw_data, &st);
-}
-
-static void
-svg_ellipse_to_path (float cx, float cy, float rx, float ry,
-                     hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  float kx = rx * 0.5522847498f;
-  float ky = ry * 0.5522847498f;
-
-  hb_draw_move_to (dfuncs, draw_data, &st, cx + rx, cy);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx + rx, cy + ky,
-                    cx + kx, cy + ry,
-                    cx, cy + ry);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx - kx, cy + ry,
-                    cx - rx, cy + ky,
-                    cx - rx, cy);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx - rx, cy - ky,
-                    cx - kx, cy - ry,
-                    cx, cy - ry);
-  hb_draw_cubic_to (dfuncs, draw_data, &st,
-                    cx + kx, cy - ry,
-                    cx + rx, cy - ky,
-                    cx + rx, cy);
-  hb_draw_close_path (dfuncs, draw_data, &st);
-}
-
-static void
-svg_line_to_path (float x1, float y1, float x2, float y2,
-                  hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  hb_draw_move_to (dfuncs, draw_data, &st, x1, y1);
-  hb_draw_line_to (dfuncs, draw_data, &st, x2, y2);
-}
-
-static void
-svg_polygon_to_path (hb_svg_str_t points, bool close,
-                     hb_draw_funcs_t *dfuncs, void *draw_data)
-{
-  hb_draw_state_t st = HB_DRAW_STATE_DEFAULT;
-  hb_svg_float_parser_t fp (points);
-  bool first = true;
-  while (fp.has_more ())
-  {
-    float x = fp.next_float ();
-    float y = fp.next_float ();
-    if (first)
-    {
-      hb_draw_move_to (dfuncs, draw_data, &st, x, y);
-      first = false;
-    }
-    else
-      hb_draw_line_to (dfuncs, draw_data, &st, x, y);
-  }
-  if (close && !first)
-    hb_draw_close_path (dfuncs, draw_data, &st);
-}
-
-void
-hb_raster_svg_shape_path_emit (hb_draw_funcs_t *dfuncs, void *draw_data, void *user_data)
-{
-  hb_svg_shape_emit_data_t *shape = (hb_svg_shape_emit_data_t *) user_data;
-  switch (shape->type)
-  {
-  case hb_svg_shape_emit_data_t::SHAPE_PATH:
-    hb_raster_svg_parse_path_data (shape->str_data, dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_RECT:
-    svg_rect_to_path (shape->params[0], shape->params[1],
-                      shape->params[2], shape->params[3],
-                      shape->params[4], shape->params[5],
-                      dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_CIRCLE:
-    svg_circle_to_path (shape->params[0], shape->params[1], shape->params[2],
-                        dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_ELLIPSE:
-    svg_ellipse_to_path (shape->params[0], shape->params[1],
-                         shape->params[2], shape->params[3],
-                         dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_LINE:
-    svg_line_to_path (shape->params[0], shape->params[1],
-                      shape->params[2], shape->params[3],
-                      dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_POLYLINE:
-    svg_polygon_to_path (shape->str_data, false, dfuncs, draw_data);
-    break;
-  case hb_svg_shape_emit_data_t::SHAPE_POLYGON:
-    svg_polygon_to_path (shape->str_data, true, dfuncs, draw_data);
-    break;
-  }
-}
-
-bool
-hb_raster_svg_parse_shape_tag (hb_svg_xml_parser_t &parser,
-                     hb_svg_shape_emit_data_t *shape)
-{
-  hb_svg_attr_view_t attrs (parser);
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (attrs.get ("style"), &style_props);
-  hb_svg_str_t tag = parser.tag_name;
-  if (tag.eq ("path"))
-  {
-    hb_svg_str_t d = svg_pick_attr_or_style (parser, style_props.d, "d");
-    if (!d.len) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_PATH;
-    shape->str_data = d;
-    return true;
-  }
-  if (tag.eq ("rect"))
-  {
-    float w = svg_parse_float (svg_pick_attr_or_style (parser, style_props.width, "width"));
-    float h = svg_parse_float (svg_pick_attr_or_style (parser, style_props.height, "height"));
-    if (w <= 0 || h <= 0) return false;
-    float rx = svg_parse_float (svg_pick_attr_or_style (parser, style_props.rx, "rx"));
-    float ry = svg_parse_float (svg_pick_attr_or_style (parser, style_props.ry, "ry"));
-    if (rx < 0.f || ry < 0.f) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_RECT;
-    shape->params[0] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.x, "x"));
-    shape->params[1] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.y, "y"));
-    shape->params[2] = w;
-    shape->params[3] = h;
-    shape->params[4] = rx;
-    shape->params[5] = ry;
-    return true;
-  }
-  if (tag.eq ("circle"))
-  {
-    float r = svg_parse_float (svg_pick_attr_or_style (parser, style_props.r, "r"));
-    if (r <= 0) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_CIRCLE;
-    shape->params[0] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.cx, "cx"));
-    shape->params[1] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.cy, "cy"));
-    shape->params[2] = r;
-    return true;
-  }
-  if (tag.eq ("ellipse"))
-  {
-    float rx = svg_parse_float (svg_pick_attr_or_style (parser, style_props.rx, "rx"));
-    float ry = svg_parse_float (svg_pick_attr_or_style (parser, style_props.ry, "ry"));
-    if (rx <= 0 || ry <= 0) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_ELLIPSE;
-    shape->params[0] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.cx, "cx"));
-    shape->params[1] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.cy, "cy"));
-    shape->params[2] = rx;
-    shape->params[3] = ry;
-    return true;
-  }
-  if (tag.eq ("line"))
-  {
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_LINE;
-    shape->params[0] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.x1, "x1"));
-    shape->params[1] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.y1, "y1"));
-    shape->params[2] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.x2, "x2"));
-    shape->params[3] = svg_parse_float (svg_pick_attr_or_style (parser, style_props.y2, "y2"));
-    return true;
-  }
-  if (tag.eq ("polyline"))
-  {
-    hb_svg_str_t points = svg_pick_attr_or_style (parser, style_props.points, "points");
-    if (!points.len) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_POLYLINE;
-    shape->str_data = points;
-    return true;
-  }
-  if (tag.eq ("polygon"))
-  {
-    hb_svg_str_t points = svg_pick_attr_or_style (parser, style_props.points, "points");
-    if (!points.len) return false;
-    shape->type = hb_svg_shape_emit_data_t::SHAPE_POLYGON;
-    shape->str_data = points;
-    return true;
-  }
-  return false;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.hh
deleted file mode 100644
index 21c782c1..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-parse.hh
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_PARSE_HH
-#define HB_RASTER_SVG_PARSE_HH
-
-#include "hb.hh"
-
-#include "hb-raster-svg-base.hh"
-#include "hb-draw.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-enum hb_svg_token_type_t
-{
-  SVG_TOKEN_OPEN_TAG,
-  SVG_TOKEN_CLOSE_TAG,
-  SVG_TOKEN_SELF_CLOSE_TAG,
-  SVG_TOKEN_TEXT,
-  SVG_TOKEN_EOF
-};
-
-struct hb_svg_attr_t
-{
-  hb_svg_str_t name;
-  hb_svg_str_t value;
-};
-
-struct hb_svg_xml_parser_t
-{
-  enum { SVG_MAX_ATTRS_PER_TAG = 256 };
-
-  const char *p;
-  const char *end;
-  const char *tag_start = nullptr;
-
-  hb_svg_str_t tag_name;
-  hb_vector_t<hb_svg_attr_t> attrs;
-  bool self_closing;
-
-  hb_svg_xml_parser_t (const char *data, unsigned len)
-    : p (data), end (data + len), self_closing (false) {}
-
-  void skip_ws ()
-  {
-    while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r'))
-      p++;
-  }
-
-  hb_svg_str_t read_name ()
-  {
-    const char *start = p;
-    while (p < end && *p != ' ' && *p != '\t' && *p != '\n' && *p != '\r' &&
-           *p != '>' && *p != '/' && *p != '=')
-      p++;
-    return {start, (unsigned) (p - start)};
-  }
-
-  hb_svg_str_t read_attr_value ()
-  {
-    if (p >= end) return {};
-    char quote = *p;
-    if (quote != '"' && quote != '\'') return {};
-    p++;
-    const char *start = p;
-    while (p < end && *p != quote)
-      p++;
-    hb_svg_str_t val = {start, (unsigned) (p - start)};
-    if (p < end) p++; /* skip closing quote */
-    return val;
-  }
-
-  void parse_attrs ()
-  {
-    attrs.clear ();
-    while (p < end)
-    {
-      skip_ws ();
-      if (p >= end || *p == '>' || *p == '/') break;
-      hb_svg_str_t name = read_name ();
-      if (!name.len) { p++; continue; }
-      skip_ws ();
-      if (p < end && *p == '=')
-      {
-        p++;
-        skip_ws ();
-        hb_svg_str_t val = read_attr_value ();
-        if (attrs.length < SVG_MAX_ATTRS_PER_TAG)
-        {
-          hb_svg_attr_t attr = {name, val};
-          attrs.push (attr);
-        }
-      }
-      else
-      {
-        if (attrs.length < SVG_MAX_ATTRS_PER_TAG)
-        {
-          hb_svg_attr_t attr = {name, {}};
-          attrs.push (attr);
-        }
-      }
-    }
-  }
-
-  hb_svg_token_type_t next ()
-  {
-    while (p < end)
-    {
-      if (*p != '<')
-      {
-        while (p < end && *p != '<') p++;
-        continue;
-      }
-
-      tag_start = p;
-      p++; /* skip '<' */
-      if (p >= end) return SVG_TOKEN_EOF;
-
-      if (*p == '!')
-      {
-        if (p + 2 < end && p[1] == '-' && p[2] == '-')
-        {
-          p += 3;
-          while (p + 2 < end && !(p[0] == '-' && p[1] == '-' && p[2] == '>'))
-            p++;
-          if (p + 2 < end) p += 3;
-        }
-        else
-        {
-          while (p < end && *p != '>') p++;
-          if (p < end) p++;
-        }
-        continue;
-      }
-      if (*p == '?')
-      {
-        while (p + 1 < end && !(p[0] == '?' && p[1] == '>'))
-          p++;
-        if (p + 1 < end) p += 2;
-        continue;
-      }
-
-      if (*p == '/')
-      {
-        p++;
-        tag_name = read_name ();
-        while (p < end && *p != '>') p++;
-        if (p < end) p++;
-        attrs.clear ();
-        self_closing = false;
-        return SVG_TOKEN_CLOSE_TAG;
-      }
-
-      tag_name = read_name ();
-      parse_attrs ();
-
-      self_closing = false;
-      skip_ws ();
-      if (p < end && *p == '/')
-      {
-        self_closing = true;
-        p++;
-      }
-      if (p < end && *p == '>')
-        p++;
-
-      return self_closing ? SVG_TOKEN_SELF_CLOSE_TAG : SVG_TOKEN_OPEN_TAG;
-    }
-    return SVG_TOKEN_EOF;
-  }
-
-  hb_svg_str_t find_attr (const char *name) const
-  {
-    for (unsigned i = 0; i < attrs.length; i++)
-      if (attrs[i].name.eq (name))
-        return attrs[i].value;
-    return {};
-  }
-};
-
-static inline void
-svg_skip_subtree (hb_svg_xml_parser_t &parser)
-{
-  int depth = 1;
-  while (depth > 0)
-  {
-    hb_svg_token_type_t tok = parser.next ();
-    if (tok == SVG_TOKEN_EOF) break;
-    if (tok == SVG_TOKEN_CLOSE_TAG) depth--;
-    else if (tok == SVG_TOKEN_OPEN_TAG) depth++;
-  }
-}
-
-static inline hb_svg_str_t
-svg_pick_attr_or_style (const hb_svg_xml_parser_t &parser,
-                        hb_svg_str_t style_value,
-                        const char *attr_name)
-{
-  return style_value.is_null () ? parser.find_attr (attr_name) : style_value;
-}
-
-struct hb_svg_attr_view_t
-{
-  const hb_svg_xml_parser_t &parser;
-  enum { CACHE_SIZE = 16 };
-  struct entry_t
-  {
-    const char *name = nullptr;
-    hb_svg_str_t value;
-  };
-  entry_t cache[CACHE_SIZE];
-  unsigned cache_len = 0;
-
-  hb_svg_attr_view_t (const hb_svg_xml_parser_t &p) : parser (p) {}
-
-  hb_svg_str_t get (const char *name)
-  {
-    for (unsigned i = 0; i < cache_len; i++)
-      if (strcmp (cache[i].name, name) == 0)
-        return cache[i].value;
-
-    hb_svg_str_t value = parser.find_attr (name);
-    if (cache_len < CACHE_SIZE)
-    {
-      cache[cache_len].name = name;
-      cache[cache_len].value = value;
-      cache_len++;
-    }
-    return value;
-  }
-};
-
-struct hb_svg_transform_t
-{
-  float xx = 1, yx = 0, xy = 0, yy = 1, dx = 0, dy = 0;
-
-  void multiply (const hb_svg_transform_t &other)
-  {
-    float nxx = xx * other.xx + xy * other.yx;
-    float nyx = yx * other.xx + yy * other.yx;
-    float nxy = xx * other.xy + xy * other.yy;
-    float nyy = yx * other.xy + yy * other.yy;
-    float ndx = xx * other.dx + xy * other.dy + dx;
-    float ndy = yx * other.dx + yy * other.dy + dy;
-    xx = nxx; yx = nyx; xy = nxy; yy = nyy; dx = ndx; dy = ndy;
-  }
-};
-
-struct hb_svg_float_parser_t
-{
-  const char *p;
-  const char *end;
-
-  hb_svg_float_parser_t (hb_svg_str_t s) : p (s.data), end (s.data + s.len) {}
-
-  void skip_ws_comma ()
-  {
-    while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == ','))
-      p++;
-  }
-
-  bool has_more () const { return p < end; }
-
-  float next_float ()
-  {
-    skip_ws_comma ();
-    if (p >= end) return 0.f;
-    const char *start = p;
-    char buf[64];
-    unsigned n = 0;
-    bool has_digit = false;
-    if (p < end && (*p == '-' || *p == '+'))
-      buf[n++] = *p++;
-    while (p < end && n < sizeof (buf) - 1 && *p >= '0' && *p <= '9')
-    {
-      buf[n++] = *p++;
-      has_digit = true;
-    }
-    if (p < end && n < sizeof (buf) - 1 && *p == '.')
-    {
-      buf[n++] = *p++;
-      while (p < end && n < sizeof (buf) - 1 && *p >= '0' && *p <= '9')
-      {
-        buf[n++] = *p++;
-        has_digit = true;
-      }
-    }
-    if (p < end && n < sizeof (buf) - 1 && (*p == 'e' || *p == 'E'))
-    {
-      buf[n++] = *p++;
-      if (p < end && n < sizeof (buf) - 1 && (*p == '+' || *p == '-'))
-        buf[n++] = *p++;
-      bool has_exp_digit = false;
-      while (p < end && n < sizeof (buf) - 1 && *p >= '0' && *p <= '9')
-      {
-        buf[n++] = *p++;
-        has_exp_digit = true;
-      }
-      if (!has_exp_digit)
-      {
-        p = start;
-        has_digit = false;
-      }
-    }
-    if (!has_digit)
-    {
-      if (p < end) p++;
-      return 0.f;
-    }
-    buf[n] = '\0';
-    float v = strtof (buf, nullptr);
-    return std::isfinite (v) ? v : 0.f;
-  }
-
-  bool next_flag ()
-  {
-    skip_ws_comma ();
-    if (p >= end) return false;
-    bool v = *p != '0';
-    p++;
-    return v;
-  }
-};
-
-static inline float
-svg_parse_float (hb_svg_str_t s)
-{
-  return s.to_float ();
-}
-
-struct hb_svg_shape_emit_data_t
-{
-  enum { SHAPE_PATH, SHAPE_RECT, SHAPE_CIRCLE, SHAPE_ELLIPSE,
-         SHAPE_LINE, SHAPE_POLYLINE, SHAPE_POLYGON } type;
-  hb_svg_str_t str_data;
-  float params[6];
-};
-
-HB_INTERNAL bool hb_raster_svg_parse_transform (hb_svg_str_t s, hb_svg_transform_t *out);
-HB_INTERNAL void hb_raster_svg_parse_path_data (hb_svg_str_t d, hb_draw_funcs_t *dfuncs, void *draw_data);
-HB_INTERNAL void hb_raster_svg_shape_path_emit (hb_draw_funcs_t *dfuncs, void *draw_data, void *user_data);
-HB_INTERNAL bool hb_raster_svg_parse_shape_tag (hb_svg_xml_parser_t &parser, hb_svg_shape_emit_data_t *shape);
-
-#endif /* HB_RASTER_SVG_PARSE_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-render.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-render.cc
deleted file mode 100644
index d07ce040..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-render.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-face.hh"
-#include "hb-raster-svg.hh"
-#include "hb-raster-svg-base.hh"
-#include "hb-raster-svg-parse.hh"
-#include "hb-raster-svg-context.hh"
-#include "hb-raster-svg-defs-scan.hh"
-#include "hb-raster-svg-gradient.hh"
-#include "hb-raster-svg-clip.hh"
-#include "hb-raster-svg-bbox.hh"
-#include "hb-raster-svg-fill.hh"
-#include "hb-raster-svg-use.hh"
-#include "OT/Color/svg/svg.hh"
-
-#include <assert.h>
-#include <stdio.h>
-
-#ifndef HB_NO_RASTER_SVG
-
-#define SVG_MAX_DEPTH 32
-
-/*
- * 11. Element renderer — recursive SVG rendering
- */
-
-static void svg_render_element (hb_svg_render_context_t *ctx,
-				hb_svg_xml_parser_t &parser,
-				const struct hb_svg_cascade_t &inherited);
-
-/* Gradient def parsing lives in hb-raster-svg-gradient.* */
-
-/* Clip-path defs and push helpers live in hb-raster-svg-clip.* */
-
-/* Render a single shape element */
-static void
-svg_render_shape (hb_svg_render_context_t *ctx,
-		  hb_svg_shape_emit_data_t &shape,
-		  const hb_svg_cascade_t &state,
-		  hb_svg_str_t transform_str)
-{
-  bool has_transform = transform_str.len > 0;
-  bool has_opacity = state.opacity < 1.f;
-  bool has_clip_path = false;
-
-  if (has_opacity)
-    ctx->push_group ();
-
-  if (has_transform)
-  {
-    hb_svg_transform_t t;
-    hb_raster_svg_parse_transform (transform_str, &t);
-    ctx->push_transform (t.xx, t.yx, t.xy, t.yy, t.dx, t.dy);
-  }
-
-  hb_extents_t<> bbox;
-  bool has_bbox = hb_raster_svg_compute_shape_bbox (shape, &bbox);
-  has_clip_path = hb_raster_svg_push_clip_path_ref (ctx->paint, &ctx->defs, state.clip_path,
-					  has_bbox ? &bbox : nullptr);
-
-  /* Clip with shape path, then fill */
-  hb_raster_paint_push_clip_path (ctx->paint, hb_raster_svg_shape_path_emit, &shape);
-
-  /* Default fill is black */
-  if (state.fill.is_null ())
-  {
-    hb_color_t black = HB_COLOR (0, 0, 0, 255);
-    if (state.fill_opacity < 1.f)
-      black = HB_COLOR (0, 0, 0, (uint8_t) (255 * state.fill_opacity + 0.5f));
-    ctx->paint_color (black);
-  }
-  else
-  {
-    hb_svg_fill_context_t fill_ctx = {ctx->paint, ctx->pfuncs, ctx->font, ctx->palette, &ctx->defs};
-    hb_raster_svg_emit_fill (&fill_ctx, state.fill, state.fill_opacity, has_bbox ? &bbox : nullptr, state.color);
-  }
-
-  ctx->pop_clip ();
-  if (has_clip_path)
-    ctx->pop_clip ();
-
-  if (has_transform)
-    ctx->pop_transform ();
-
-  if (has_opacity)
-    ctx->pop_group (HB_PAINT_COMPOSITE_MODE_SRC_OVER);
-}
-
-static void
-svg_render_container_element (hb_svg_render_context_t *ctx,
-			      hb_svg_xml_parser_t &parser,
-			      hb_svg_str_t tag,
-			      bool self_closing,
-			      const hb_svg_cascade_t &state,
-			      hb_svg_str_t transform_str,
-			      hb_svg_str_t clip_path_str)
-{
-  bool has_transform = transform_str.len > 0;
-  bool has_opacity = state.opacity < 1.f;
-  bool has_clip = false;
-  bool has_viewbox = false;
-  bool has_viewbox_transform = false;
-  bool has_svg_translate = false;
-  float svg_x = 0.f, svg_y = 0.f;
-  float viewport_w = 0.f, viewport_h = 0.f;
-  hb_svg_transform_t viewbox_t;
-  float vb_x = 0, vb_y = 0, vb_w = 0, vb_h = 0;
-
-  if (tag.eq ("svg") || tag.eq ("symbol"))
-  {
-    hb_svg_style_props_t geom_style_props;
-    svg_parse_style_props (parser.find_attr ("style"), &geom_style_props);
-
-    if (tag.eq ("svg"))
-    {
-      svg_x = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.x, "x"));
-      svg_y = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.y, "y"));
-      has_svg_translate = (svg_x != 0.f || svg_y != 0.f);
-    }
-
-    hb_svg_str_t viewbox_str = parser.find_attr ("viewBox");
-    if (hb_raster_svg_parse_viewbox (viewbox_str, &vb_x, &vb_y, &vb_w, &vb_h))
-    {
-      has_viewbox = true;
-
-      if (tag.eq ("svg"))
-      {
-        viewport_w = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.width, "width"));
-        viewport_h = hb_raster_svg_parse_non_percent_length (svg_pick_attr_or_style (parser, geom_style_props.height, "height"));
-        if (!(viewport_w > 0.f && viewport_h > 0.f))
-        {
-          if (ctx->depth == 1)
-          {
-            unsigned upem = hb_font_get_face (ctx->font)->get_upem ();
-            viewport_w = (float) upem;
-            viewport_h = (float) upem;
-          }
-          else
-          {
-            viewport_w = vb_w;
-            viewport_h = vb_h;
-          }
-        }
-        has_viewbox_transform =
-          hb_raster_svg_compute_viewbox_transform (viewport_w, viewport_h,
-                                                   vb_x, vb_y, vb_w, vb_h,
-                                                   parser.find_attr ("preserveAspectRatio"),
-                                                   &viewbox_t);
-      }
-    }
-  }
-
-  if (ctx->suppress_viewbox_once)
-  {
-    has_viewbox = false;
-    has_viewbox_transform = false;
-    ctx->suppress_viewbox_once = false;
-  }
-
-  if (has_opacity)
-    ctx->push_group ();
-
-  if (has_transform)
-  {
-    hb_svg_transform_t t;
-    hb_raster_svg_parse_transform (transform_str, &t);
-    ctx->push_transform (t.xx, t.yx, t.xy, t.yy, t.dx, t.dy);
-  }
-
-  if (has_svg_translate)
-    ctx->push_transform (1, 0, 0, 1, svg_x, svg_y);
-
-  if (has_viewbox_transform)
-    ctx->push_transform (viewbox_t.xx, viewbox_t.yx, viewbox_t.xy, viewbox_t.yy,
-                         viewbox_t.dx, viewbox_t.dy);
-  else if (has_viewbox && vb_w > 0 && vb_h > 0)
-    ctx->push_transform (1, 0, 0, 1, -vb_x, -vb_y);
-
-  has_clip = hb_raster_svg_push_clip_path_ref (ctx->paint, &ctx->defs, clip_path_str, nullptr);
-
-  if (!self_closing)
-  {
-    int depth = 1;
-    while (depth > 0)
-    {
-      hb_svg_token_type_t tok = parser.next ();
-      if (tok == SVG_TOKEN_EOF) break;
-
-      if (tok == SVG_TOKEN_CLOSE_TAG)
-      {
-	depth--;
-	continue;
-      }
-
-      if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-      {
-	hb_svg_str_t child_tag = parser.tag_name;
-	if (parser.tag_name.eq ("defs"))
-	{
-	  if (tok != SVG_TOKEN_SELF_CLOSE_TAG)
-	  {
-	    hb_svg_defs_scan_context_t scan_ctx = {
-	      &ctx->defs, ctx->pfuncs, ctx->paint,
-	      ctx->foreground, hb_font_get_face (ctx->font),
-	      ctx->palette,
-	      ctx->doc_start, ctx->doc_len,
-	      ctx->svg_accel, ctx->doc_cache
-	    };
-	    hb_raster_svg_process_defs_element (&scan_ctx, parser);
-	  }
-	  continue;
-	}
-	svg_render_element (ctx, parser, state);
-	if (tok == SVG_TOKEN_OPEN_TAG &&
-	    !hb_raster_svg_tag_is_container_or_use (child_tag))
-	{
-	  /* Skip children of non-container elements we don't handle. */
-	  int skip_depth = 1;
-	  while (skip_depth > 0)
-	  {
-	    hb_svg_token_type_t st = parser.next ();
-	    if (st == SVG_TOKEN_EOF) break;
-	    if (st == SVG_TOKEN_CLOSE_TAG) skip_depth--;
-	    else if (st == SVG_TOKEN_OPEN_TAG) skip_depth++;
-	  }
-	}
-      }
-    }
-  }
-
-  if (has_viewbox_transform || (has_viewbox && vb_w > 0 && vb_h > 0))
-    ctx->pop_transform ();
-
-  if (has_svg_translate)
-    ctx->pop_transform ();
-
-  if (has_clip)
-    ctx->pop_clip ();
-
-  if (has_transform)
-    ctx->pop_transform ();
-
-  if (has_opacity)
-    ctx->pop_group (HB_PAINT_COMPOSITE_MODE_SRC_OVER);
-}
-
-static bool
-svg_render_primitive_shape_element (hb_svg_render_context_t *ctx,
-				    hb_svg_xml_parser_t &parser,
-				    const hb_svg_cascade_t &state,
-				    hb_svg_str_t transform_str)
-{
-  hb_svg_str_t tag = parser.tag_name;
-  if (!(tag.eq ("path") || tag.eq ("rect") || tag.eq ("circle") ||
-        tag.eq ("ellipse") || tag.eq ("line") || tag.eq ("polyline") ||
-        tag.eq ("polygon")))
-    return false;
-
-  hb_svg_shape_emit_data_t shape;
-  if (hb_raster_svg_parse_shape_tag (parser, &shape))
-    svg_render_shape (ctx, shape, state, transform_str);
-  return true;
-}
-
-static void
-svg_render_use_callback (void *render_user,
-			 hb_svg_xml_parser_t &parser,
-			 const void *state,
-			 bool viewport_mapped)
-{
-  hb_svg_render_context_t *ctx = (hb_svg_render_context_t *) render_user;
-  bool old_suppress = ctx->suppress_viewbox_once;
-  bool old_allow_symbol = ctx->allow_symbol_render_once;
-  if (viewport_mapped)
-    ctx->suppress_viewbox_once = true;
-  if (parser.tag_name.eq ("symbol"))
-    ctx->allow_symbol_render_once = true;
-  svg_render_element (ctx, parser, *(const hb_svg_cascade_t *) state);
-  ctx->suppress_viewbox_once = old_suppress;
-  ctx->allow_symbol_render_once = old_allow_symbol;
-}
-
-/* Render one element (may be a container or shape) */
-static void
-svg_render_element (hb_svg_render_context_t *ctx,
-		    hb_svg_xml_parser_t &parser,
-		    const hb_svg_cascade_t &inherited)
-{
-  if (ctx->depth >= SVG_MAX_DEPTH) return;
-
-  const HB_UNUSED unsigned transform_depth = ctx->paint->transform_stack.length;
-  const HB_UNUSED unsigned clip_depth = ctx->paint->clip_stack.length;
-  const HB_UNUSED unsigned surface_depth = ctx->paint->surface_stack.length;
-
-  ctx->depth++;
-
-  hb_svg_str_t tag = parser.tag_name;
-  bool self_closing = parser.self_closing;
-
-  /* Extract common attributes */
-  hb_svg_str_t style = parser.find_attr ("style");
-  hb_svg_style_props_t style_props;
-  svg_parse_style_props (style, &style_props);
-  hb_svg_str_t fill_attr = svg_pick_attr_or_style (parser, style_props.fill, "fill");
-  hb_svg_str_t fill_opacity_str = svg_pick_attr_or_style (parser, style_props.fill_opacity, "fill-opacity");
-  hb_svg_str_t opacity_str = svg_pick_attr_or_style (parser, style_props.opacity, "opacity");
-  hb_svg_str_t transform_str = svg_pick_attr_or_style (parser, style_props.transform, "transform");
-  hb_svg_str_t clip_path_attr = svg_pick_attr_or_style (parser, style_props.clip_path, "clip-path");
-  hb_svg_str_t display_str = svg_pick_attr_or_style (parser, style_props.display, "display");
-  hb_svg_str_t color_str = svg_pick_attr_or_style (parser, style_props.color, "color");
-  hb_svg_str_t visibility_str = svg_pick_attr_or_style (parser, style_props.visibility, "visibility");
-
-  hb_svg_cascade_t state = inherited;
-  state.fill = (fill_attr.is_null () || svg_str_is_inherit (fill_attr)) ? inherited.fill : fill_attr;
-  state.fill_opacity = (fill_opacity_str.len && !svg_str_is_inherit (fill_opacity_str))
-		       ? svg_parse_float_clamped01 (fill_opacity_str)
-		       : inherited.fill_opacity;
-  state.opacity = (opacity_str.len && !svg_str_is_inherit (opacity_str) && !svg_str_is_none (opacity_str))
-		  ? svg_parse_float_clamped01 (opacity_str)
-		  : (svg_str_is_inherit (opacity_str) ? inherited.opacity : 1.f);
-  state.clip_path = (clip_path_attr.is_null () || svg_str_is_inherit (clip_path_attr))
-		    ? inherited.clip_path
-		    : clip_path_attr;
-  if (svg_str_is_inherit (transform_str) || svg_str_is_none (transform_str))
-    transform_str = {};
-  state.color = inherited.color;
-  bool is_none = false;
-  if (color_str.len && !color_str.trim ().eq_ascii_ci ("inherit"))
-    state.color = hb_raster_svg_parse_color (color_str, ctx->pfuncs, ctx->paint,
-				   inherited.color, hb_font_get_face (ctx->font),
-				   ctx->palette, &is_none);
-  state.visibility = inherited.visibility;
-  hb_svg_str_t visibility_trim = visibility_str.trim ();
-  if (visibility_trim.len && !visibility_trim.eq_ascii_ci ("inherit"))
-    state.visibility = !(visibility_trim.eq_ascii_ci ("hidden") ||
-			 visibility_trim.eq_ascii_ci ("collapse"));
-
-  if (display_str.trim ().eq_ascii_ci ("none"))
-  {
-    if (!self_closing)
-      svg_skip_subtree (parser);
-    ctx->depth--;
-    assert (ctx->paint->transform_stack.length == transform_depth);
-    assert (ctx->paint->clip_stack.length == clip_depth);
-    assert (ctx->paint->surface_stack.length == surface_depth);
-    return;
-  }
-  if (!state.visibility)
-  {
-    if (!self_closing)
-      svg_skip_subtree (parser);
-    ctx->depth--;
-    assert (ctx->paint->transform_stack.length == transform_depth);
-    assert (ctx->paint->clip_stack.length == clip_depth);
-    assert (ctx->paint->surface_stack.length == surface_depth);
-    return;
-  }
-
-  if (tag.eq ("symbol") && !ctx->allow_symbol_render_once)
-  {
-    if (!self_closing)
-      svg_skip_subtree (parser);
-    ctx->depth--;
-    assert (ctx->paint->transform_stack.length == transform_depth);
-    assert (ctx->paint->clip_stack.length == clip_depth);
-    assert (ctx->paint->surface_stack.length == surface_depth);
-    return;
-  }
-  if (tag.eq ("symbol"))
-    ctx->allow_symbol_render_once = false;
-
-  if (hb_raster_svg_tag_is_container (tag))
-    svg_render_container_element (ctx, parser, tag, self_closing,
-				  state, transform_str, state.clip_path);
-  else if (svg_render_primitive_shape_element (ctx, parser, state, transform_str))
-    ;
-  else if (tag.eq ("use"))
-  {
-    hb_svg_use_context_t use_ctx = {ctx->paint, ctx->pfuncs,
-				    ctx->doc_start, ctx->doc_len,
-				    ctx->svg_accel, ctx->doc_cache,
-				    &ctx->use_decycler};
-    hb_raster_svg_render_use_element (&use_ctx, parser, &state, transform_str,
-			    svg_render_use_callback, ctx);
-  }
-
-  ctx->depth--;
-
-  assert (ctx->paint->transform_stack.length == transform_depth);
-  assert (ctx->paint->clip_stack.length == clip_depth);
-  assert (ctx->paint->surface_stack.length == surface_depth);
-}
-
-
-/*
- * 12. Entry point
- */
-
-hb_bool_t
-hb_raster_svg_render (hb_raster_paint_t *paint,
-		      hb_blob_t *blob,
-		      hb_codepoint_t glyph,
-		      hb_font_t *font,
-		      unsigned palette,
-		      hb_color_t foreground)
-{
-  bool ret = false;
-  hb_blob_t *render_blob = nullptr;
-  hb_face_t *face HB_UNUSED = hb_font_get_face (font);
-  const OT::SVG::svg_doc_cache_t *doc_cache = nullptr;
-#ifndef HB_NO_SVG
-  unsigned doc_index = 0;
-  hb_codepoint_t start_glyph = HB_CODEPOINT_INVALID;
-  hb_codepoint_t end_glyph = HB_CODEPOINT_INVALID;
-#endif
-  hb_paint_funcs_t *pfuncs = hb_raster_paint_get_funcs ();
-  hb_svg_render_context_t ctx;
-  hb_svg_cascade_t initial_state;
-  hb_svg_defs_scan_context_t scan_ctx;
-  bool found_glyph = false;
-#ifndef HB_NO_SVG
-  unsigned glyph_start = 0, glyph_end = 0;
-#endif
-
-  unsigned data_len = 0;
-  const char *data = nullptr;
-  render_blob = OT::hb_ot_svg_reference_normalized_blob (blob, &data, &data_len);
-  if (!render_blob || !data_len)
-    goto done;
-
-#ifndef HB_NO_SVG
-  if (face &&
-      hb_ot_color_glyph_get_svg_document_index (face, glyph, &doc_index) &&
-      hb_ot_color_get_svg_document_glyph_range (face, doc_index, &start_glyph, &end_glyph))
-    doc_cache = face->table.SVG->get_or_create_doc_cache (render_blob, data, data_len,
-                                                          doc_index, start_glyph, end_glyph);
-
-  if (doc_cache)
-    data = face->table.SVG->doc_cache_get_svg (doc_cache, &data_len);
-#endif
-
-  ctx.paint = paint;
-  ctx.pfuncs = pfuncs;
-  ctx.font = font;
-  ctx.palette = palette;
-  ctx.foreground = foreground;
-  ctx.doc_start = data;
-  ctx.doc_len = data_len;
-#ifndef HB_NO_SVG
-  ctx.svg_accel = face ? face->table.SVG.get () : nullptr;
-#endif
-  ctx.doc_cache = doc_cache;
-
-  initial_state.color = foreground;
-
-  scan_ctx = {
-    &ctx.defs, ctx.pfuncs, ctx.paint,
-    ctx.foreground, hb_font_get_face (ctx.font),
-    ctx.palette,
-    ctx.doc_start, ctx.doc_len,
-    ctx.svg_accel, ctx.doc_cache
-  };
-  hb_raster_svg_collect_defs (&scan_ctx, data, data_len);
-
-#ifndef HB_NO_SVG
-  if (doc_cache && face->table.SVG->doc_cache_get_glyph_span (doc_cache, glyph, &glyph_start, &glyph_end))
-  {
-    hb_svg_xml_parser_t parser (data + glyph_start, glyph_end - glyph_start);
-    hb_svg_token_type_t tok = parser.next ();
-    if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-    {
-      hb_paint_push_font_transform (ctx.pfuncs, ctx.paint, font);
-      ctx.push_transform (1, 0, 0, -1, 0, 0);
-	      svg_render_element (&ctx, parser, initial_state);
-      ctx.pop_transform ();
-      hb_paint_pop_transform (ctx.pfuncs, ctx.paint);
-      found_glyph = true;
-    }
-  }
-#endif
-  if (!found_glyph)
-  {
-    /* Fallback for malformed/uncached docs: linear scan by glyph id. */
-    char glyph_id_str[32];
-    int glyph_id_len = snprintf (glyph_id_str, sizeof (glyph_id_str), "glyph%u", glyph);
-    if (glyph_id_len <= 0 || (unsigned) glyph_id_len >= sizeof (glyph_id_str))
-      return false;
-    hb_svg_xml_parser_t parser (data, data_len);
-    while (true)
-    {
-      hb_svg_token_type_t tok = parser.next ();
-      if (tok == SVG_TOKEN_EOF) break;
-
-      if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-      {
-        hb_svg_str_t id = parser.find_attr ("id");
-        if (id.len)
-        {
-          if (id.len == (unsigned) glyph_id_len &&
-              0 == hb_memcmp (id.data, glyph_id_str, (unsigned) glyph_id_len))
-          {
-            hb_paint_push_font_transform (ctx.pfuncs, ctx.paint, font);
-            ctx.push_transform (1, 0, 0, -1, 0, 0);
-	            svg_render_element (&ctx, parser, initial_state);
-            ctx.pop_transform ();
-            hb_paint_pop_transform (ctx.pfuncs, ctx.paint);
-            found_glyph = true;
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  ret = found_glyph;
-
-done:
-  hb_blob_destroy (render_blob);
-  return ret;
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.cc b/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.cc
deleted file mode 100644
index b6496123..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_NO_RASTER_SVG
-
-#include "hb.hh"
-
-#include "hb-raster-svg-use.hh"
-
-#include "hb-raster-svg-base.hh"
-
-void
-hb_raster_svg_render_use_element (const hb_svg_use_context_t *ctx,
-                        hb_svg_xml_parser_t &parser,
-                        const void *state,
-                        hb_svg_str_t transform_str,
-                        hb_svg_use_render_cb_t render_cb,
-                        void *render_user)
-{
-  hb_svg_str_t href = hb_raster_svg_find_href_attr (parser);
-
-  hb_svg_str_t ref_id;
-  if (!hb_raster_svg_parse_local_id_ref (href, &ref_id, nullptr))
-    return;
-
-  float use_x = 0.f, use_y = 0.f, use_w = 0.f, use_h = 0.f;
-  hb_raster_svg_parse_use_geometry (parser, &use_x, &use_y, &use_w, &use_h);
-
-  bool has_translate = (use_x != 0.f || use_y != 0.f);
-  bool has_use_transform = transform_str.len > 0;
-
-  if (has_use_transform)
-  {
-    hb_svg_transform_t t;
-    hb_raster_svg_parse_transform (transform_str, &t);
-    hb_paint_push_transform (ctx->pfuncs, ctx->paint, t.xx, t.yx, t.xy, t.yy, t.dx, t.dy);
-  }
-
-  if (has_translate)
-    hb_paint_push_transform (ctx->pfuncs, ctx->paint, 1, 0, 0, 1, use_x, use_y);
-
-  const char *found = nullptr;
-  hb_raster_svg_find_element_by_id (ctx->doc_start, ctx->doc_len, ctx->svg_accel, ctx->doc_cache,
-                                    ref_id, &found);
-
-  if (found)
-  {
-    bool can_render = true;
-    hb_decycler_node_t node (*ctx->use_decycler);
-    if (unlikely (!node.visit ((uintptr_t) found)))
-      can_render = false;
-
-    if (can_render)
-    {
-      unsigned remaining = ctx->doc_start + ctx->doc_len - found;
-      hb_svg_xml_parser_t ref_parser (found, remaining);
-      hb_svg_token_type_t tok = ref_parser.next ();
-      if (tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG)
-      {
-        bool has_viewport_scale = false;
-        hb_svg_transform_t t;
-        if (hb_raster_svg_compute_use_target_viewbox_transform (ref_parser, use_w, use_h, &t))
-        {
-          hb_paint_push_transform (ctx->pfuncs, ctx->paint, t.xx, t.yx, t.xy, t.yy, t.dx, t.dy);
-          has_viewport_scale = true;
-        }
-        render_cb (render_user, ref_parser, state, has_viewport_scale);
-        if (has_viewport_scale)
-          hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-      }
-    }
-  }
-
-  if (has_translate)
-    hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-
-  if (has_use_transform)
-    hb_paint_pop_transform (ctx->pfuncs, ctx->paint);
-}
-
-#endif /* !HB_NO_RASTER_SVG */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.hh
deleted file mode 100644
index aa81f4a0..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg-use.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_USE_HH
-#define HB_RASTER_SVG_USE_HH
-
-#include "hb.hh"
-
-#include "hb-raster-svg-context.hh"
-#include "hb-raster-svg-parse.hh"
-
-typedef void (*hb_svg_use_render_cb_t) (void *render_user,
-                                        hb_svg_xml_parser_t &parser,
-                                        const void *state,
-                                        bool viewport_mapped);
-
-HB_INTERNAL void
-hb_raster_svg_render_use_element (const hb_svg_use_context_t *ctx,
-                        hb_svg_xml_parser_t &parser,
-                        const void *state,
-                        hb_svg_str_t transform_str,
-                        hb_svg_use_render_cb_t render_cb,
-                        void *render_user);
-
-#endif /* HB_RASTER_SVG_USE_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-svg.hh b/engine/thirdparty/harfbuzz/src/hb-raster-svg.hh
deleted file mode 100644
index 3b723f7c..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-svg.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_SVG_HH
-#define HB_RASTER_SVG_HH
-
-#include "hb.hh"
-
-struct hb_raster_paint_t;
-
-/* Callback type: emits SVG path draw commands to the given draw funcs */
-typedef void (*hb_raster_svg_path_func_t) (hb_draw_funcs_t *dfuncs,
-					   void *draw_data,
-					   void *user_data);
-
-/* Push clip from arbitrary path (reuses push_clip_glyph logic) */
-HB_INTERNAL void
-hb_raster_paint_push_clip_path (hb_raster_paint_t *c,
-				hb_raster_svg_path_func_t func,
-				void *user_data);
-
-/* Render SVG document for a specific glyph */
-#ifndef HB_NO_RASTER_SVG
-HB_INTERNAL hb_bool_t
-hb_raster_svg_render (hb_raster_paint_t *paint,
-		      hb_blob_t *blob,
-		      hb_codepoint_t glyph,
-		      hb_font_t *font,
-		      unsigned palette,
-		      hb_color_t foreground);
-#else
-static inline hb_bool_t
-hb_raster_svg_render (hb_raster_paint_t *paint HB_UNUSED,
-		      hb_blob_t *blob HB_UNUSED,
-		      hb_codepoint_t glyph HB_UNUSED,
-		      hb_font_t *font HB_UNUSED,
-		      unsigned palette HB_UNUSED,
-		      hb_color_t foreground HB_UNUSED)
-{
-  return false;
-}
-#endif
-
-
-#endif /* HB_RASTER_SVG_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster-utils.hh b/engine/thirdparty/harfbuzz/src/hb-raster-utils.hh
deleted file mode 100644
index 852aee84..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster-utils.hh
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_HH
-#define HB_RASTER_HH
-
-#include "hb.hh"
-
-/* Shared pixel helpers (used by paint and image compositing). */
-
-static HB_ALWAYS_INLINE uint8_t
-hb_raster_div255 (unsigned a)
-{
-  if (true)
-  {
-    // An approximation. Slightly faster.
-    // https://github.com/linebender/vello/blob/ab58009c8289e83689cd0effc4e34d1c6e8b51f5/sparse_strips/vello_cpu/src/util.rs#L10-L63
-    return (a + 255) >> 8;
-  }
-
-  return (uint8_t) ((a + 128 + ((a + 128) >> 8)) >> 8);
-}
-
-static HB_ALWAYS_INLINE uint32_t
-hb_raster_pack_pixel (uint8_t b, uint8_t g, uint8_t r, uint8_t a)
-{
-  return (uint32_t) b | ((uint32_t) g << 8) | ((uint32_t) r << 16) | ((uint32_t) a << 24);
-}
-
-/* SRC_OVER: premultiplied src over premultiplied dst. */
-static HB_ALWAYS_INLINE uint32_t
-hb_raster_src_over (uint32_t src, uint32_t dst)
-{
-  uint8_t sa = (uint8_t) (src >> 24);
-  if (sa == 255) return src;
-  if (sa == 0) return dst;
-  unsigned inv_sa = 255 - sa;
-  uint8_t rb = hb_raster_div255 ((dst & 0xFF) * inv_sa) + (uint8_t) (src & 0xFF);
-  uint8_t rg = hb_raster_div255 (((dst >> 8) & 0xFF) * inv_sa) + (uint8_t) ((src >> 8) & 0xFF);
-  uint8_t rr = hb_raster_div255 (((dst >> 16) & 0xFF) * inv_sa) + (uint8_t) ((src >> 16) & 0xFF);
-  uint8_t ra = hb_raster_div255 (((dst >> 24) & 0xFF) * inv_sa) + sa;
-  return (uint32_t) rb | ((uint32_t) rg << 8) | ((uint32_t) rr << 16) | ((uint32_t) ra << 24);
-}
-
-/* Scale a premultiplied pixel by an alpha [0,255]. */
-static HB_ALWAYS_INLINE uint32_t
-hb_raster_alpha_mul (uint32_t px, unsigned a)
-{
-  if (a == 255) return px;
-  if (a == 0) return 0;
-  uint8_t rb = hb_raster_div255 ((px & 0xFF) * a);
-  uint8_t rg = hb_raster_div255 (((px >> 8) & 0xFF) * a);
-  uint8_t rr = hb_raster_div255 (((px >> 16) & 0xFF) * a);
-  uint8_t ra = hb_raster_div255 (((px >> 24) & 0xFF) * a);
-  return (uint32_t) rb | ((uint32_t) rg << 8) | ((uint32_t) rr << 16) | ((uint32_t) ra << 24);
-}
-
-#endif /* HB_RASTER_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster.cc b/engine/thirdparty/harfbuzz/src/hb-raster.cc
deleted file mode 100644
index 97ba6e66..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-raster.h"
-
-/**
- * SECTION:hb-raster
- * @title: hb-raster
- * @short_description: Glyph rasterization
- * @include: hb-raster.h
- *
- * Functions for rasterizing glyph outlines into pixel buffers.
- *
- * #hb_raster_draw_t rasterizes outline geometry and always outputs
- * @HB_RASTER_FORMAT_A8. Typical flow:
- *
- * |[<!-- language="plain" -->
- * hb_raster_draw_t *draw = hb_raster_draw_create_or_fail ();
- * hb_raster_draw_set_scale_factor (draw, 64.f, 64.f);
- * hb_raster_draw_set_transform (draw, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f);
- * hb_raster_draw_set_glyph_extents (draw, &glyph_extents);
- * hb_raster_draw_glyph (draw, font, gid, pen_x, pen_y);
- * hb_raster_image_t *mask = hb_raster_draw_render (draw);
- * ]|
- *
- * #hb_raster_paint_t renders color paint graphs and always outputs
- * @HB_RASTER_FORMAT_BGRA32. Typical flow:
- *
- * |[<!-- language="plain" -->
- * hb_raster_paint_t *paint = hb_raster_paint_create_or_fail ();
- * hb_raster_paint_set_scale_factor (paint, 64.f, 64.f);
- * hb_raster_paint_set_transform (paint, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f);
- * hb_raster_paint_set_foreground (paint, foreground);
- * hb_glyph_extents_t glyph_extents;
- * hb_font_get_glyph_extents (font, gid, &glyph_extents);
- * hb_raster_paint_set_glyph_extents (paint, &glyph_extents);
- * hb_raster_paint_glyph (paint, font, gid, pen_x, pen_y, 0, foreground);
- * hb_raster_image_t *img = hb_raster_paint_render (paint);
- * ]|
- *
- * In both modes, set extents explicitly (or via glyph extents) before
- * rendering to avoid implicit allocations and to get deterministic bounds.
- **/
diff --git a/engine/thirdparty/harfbuzz/src/hb-raster.h b/engine/thirdparty/harfbuzz/src/hb-raster.h
deleted file mode 100644
index 296e171b..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-raster.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_RASTER_H
-#define HB_RASTER_H
-
-#include "hb.h"
-
-HB_BEGIN_DECLS
-
-/* Shared types */
-
-/**
- * hb_raster_format_t:
- * @HB_RASTER_FORMAT_A8: 8-bit alpha-only coverage
- * @HB_RASTER_FORMAT_BGRA32: 32-bit BGRA color
- *
- * Pixel format for raster images.
- *
- * Since: 13.0.0
- */
-typedef enum {
-  HB_RASTER_FORMAT_A8     = 0,
-  HB_RASTER_FORMAT_BGRA32 = 1,
-} hb_raster_format_t;
-
-/**
- * hb_raster_extents_t:
- * @x_origin: X coordinate of the left edge of the image in glyph space
- * @y_origin: Y coordinate of the bottom edge of the image in glyph space
- * @width: Width in pixels
- * @height: Height in pixels
- * @stride: Bytes per row; 0 means auto-calculate on input, filled on output
- *
- * Pixel-buffer extents for raster operations.
- *
- * Since: 13.0.0
- */
-typedef struct hb_raster_extents_t {
-  int      x_origin, y_origin;
-  unsigned int width, height;
-  unsigned int stride;
-} hb_raster_extents_t;
-
-
-/* hb_raster_image_t */
-
-/**
- * hb_raster_image_t:
- *
- * An opaque raster image object holding a pixel buffer produced by
- * hb_raster_draw_render().  Use hb_raster_image_get_buffer() and
- * hb_raster_image_get_extents() to access the pixels.
- *
- * Since: 13.0.0
- **/
-typedef struct hb_raster_image_t hb_raster_image_t;
-
-HB_EXTERN hb_raster_image_t *
-hb_raster_image_create_or_fail (void);
-
-HB_EXTERN hb_raster_image_t *
-hb_raster_image_reference (hb_raster_image_t *image);
-
-HB_EXTERN void
-hb_raster_image_destroy (hb_raster_image_t *image);
-
-HB_EXTERN hb_bool_t
-hb_raster_image_set_user_data (hb_raster_image_t  *image,
-			       hb_user_data_key_t *key,
-			       void               *data,
-			       hb_destroy_func_t   destroy,
-			       hb_bool_t           replace);
-
-HB_EXTERN void *
-hb_raster_image_get_user_data (hb_raster_image_t  *image,
-			       hb_user_data_key_t *key);
-
-HB_EXTERN hb_bool_t
-hb_raster_image_configure (hb_raster_image_t         *image,
-			   hb_raster_format_t        format,
-			   const hb_raster_extents_t *extents);
-
-HB_EXTERN void
-hb_raster_image_clear (hb_raster_image_t *image);
-
-HB_EXTERN const uint8_t *
-hb_raster_image_get_buffer (hb_raster_image_t *image);
-
-HB_EXTERN void
-hb_raster_image_get_extents (hb_raster_image_t   *image,
-			     hb_raster_extents_t *extents);
-
-HB_EXTERN hb_raster_format_t
-hb_raster_image_get_format (hb_raster_image_t *image);
-
-HB_EXTERN hb_bool_t
-hb_raster_image_deserialize_from_png_or_fail (hb_raster_image_t *image,
-					      hb_blob_t         *png);
-
-HB_EXTERN hb_blob_t *
-hb_raster_image_serialize_to_png_or_fail (hb_raster_image_t *image);
-
-
-/* hb_raster_draw_t */
-
-/**
- * hb_raster_draw_t:
- *
- * An opaque outline rasterizer object.  Accumulates glyph outlines
- * via #hb_draw_funcs_t callbacks obtained from hb_raster_draw_get_funcs(),
- * then produces an #hb_raster_image_t with hb_raster_draw_render().
- *
- * Since: 13.0.0
- **/
-typedef struct hb_raster_draw_t hb_raster_draw_t;
-
-HB_EXTERN hb_raster_draw_t *
-hb_raster_draw_create_or_fail (void);
-
-HB_EXTERN hb_raster_draw_t *
-hb_raster_draw_reference (hb_raster_draw_t *draw);
-
-HB_EXTERN void
-hb_raster_draw_destroy (hb_raster_draw_t *draw);
-
-HB_EXTERN hb_bool_t
-hb_raster_draw_set_user_data (hb_raster_draw_t   *draw,
-			      hb_user_data_key_t *key,
-			      void               *data,
-			      hb_destroy_func_t   destroy,
-			      hb_bool_t           replace);
-
-HB_EXTERN void *
-hb_raster_draw_get_user_data (hb_raster_draw_t   *draw,
-			      hb_user_data_key_t *key);
-
-HB_EXTERN void
-hb_raster_draw_set_transform (hb_raster_draw_t *draw,
-			      float xx, float yx,
-			      float xy, float yy,
-			      float dx, float dy);
-
-HB_EXTERN void
-hb_raster_draw_set_scale_factor (hb_raster_draw_t *draw,
-				 float x_scale_factor,
-				 float y_scale_factor);
-
-HB_EXTERN void
-hb_raster_draw_get_scale_factor (hb_raster_draw_t *draw,
-				 float *x_scale_factor,
-				 float *y_scale_factor);
-
-HB_EXTERN void
-hb_raster_draw_get_transform (hb_raster_draw_t *draw,
-			      float *xx, float *yx,
-			      float *xy, float *yy,
-			      float *dx, float *dy);
-
-HB_EXTERN void
-hb_raster_draw_set_extents (hb_raster_draw_t          *draw,
-			    const hb_raster_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_raster_draw_get_extents (hb_raster_draw_t    *draw,
-			    hb_raster_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_raster_draw_set_glyph_extents (hb_raster_draw_t          *draw,
-				  const hb_glyph_extents_t  *glyph_extents);
-
-HB_EXTERN hb_draw_funcs_t *
-hb_raster_draw_get_funcs (void);
-
-HB_EXTERN void
-hb_raster_draw_glyph (hb_raster_draw_t *draw,
-		      hb_font_t       *font,
-		      hb_codepoint_t   glyph,
-		      float            pen_x,
-		      float            pen_y);
-
-HB_EXTERN hb_raster_image_t *
-hb_raster_draw_render (hb_raster_draw_t *draw);
-
-HB_EXTERN void
-hb_raster_draw_reset (hb_raster_draw_t *draw);
-
-HB_EXTERN void
-hb_raster_draw_recycle_image (hb_raster_draw_t  *draw,
-			      hb_raster_image_t *image);
-
-
-
-/* hb_raster_paint_t */
-
-/**
- * hb_raster_paint_t:
- *
- * An opaque color-glyph paint context.  Implements #hb_paint_funcs_t
- * callbacks that render COLRv0/v1 color glyphs into a BGRA32
- * #hb_raster_image_t.
- *
- * Since: 13.0.0
- **/
-typedef struct hb_raster_paint_t hb_raster_paint_t;
-
-HB_EXTERN hb_raster_paint_t *
-hb_raster_paint_create_or_fail (void);
-
-HB_EXTERN hb_raster_paint_t *
-hb_raster_paint_reference (hb_raster_paint_t *paint);
-
-HB_EXTERN void
-hb_raster_paint_destroy (hb_raster_paint_t *paint);
-
-HB_EXTERN hb_bool_t
-hb_raster_paint_set_user_data (hb_raster_paint_t  *paint,
-			       hb_user_data_key_t *key,
-			       void               *data,
-			       hb_destroy_func_t   destroy,
-			       hb_bool_t           replace);
-
-HB_EXTERN void *
-hb_raster_paint_get_user_data (hb_raster_paint_t  *paint,
-			       hb_user_data_key_t *key);
-
-HB_EXTERN void
-hb_raster_paint_set_transform (hb_raster_paint_t *paint,
-			       float xx, float yx,
-			       float xy, float yy,
-			       float dx, float dy);
-
-HB_EXTERN void
-hb_raster_paint_get_transform (hb_raster_paint_t *paint,
-			       float *xx, float *yx,
-			       float *xy, float *yy,
-			       float *dx, float *dy);
-
-HB_EXTERN void
-hb_raster_paint_set_scale_factor (hb_raster_paint_t *paint,
-				  float x_scale_factor,
-				  float y_scale_factor);
-
-HB_EXTERN void
-hb_raster_paint_get_scale_factor (hb_raster_paint_t *paint,
-				  float *x_scale_factor,
-				  float *y_scale_factor);
-
-HB_EXTERN void
-hb_raster_paint_set_extents (hb_raster_paint_t         *paint,
-			     const hb_raster_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_raster_paint_get_extents (hb_raster_paint_t   *paint,
-			     hb_raster_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_raster_paint_set_glyph_extents (hb_raster_paint_t         *paint,
-				   const hb_glyph_extents_t  *glyph_extents);
-
-HB_EXTERN void
-hb_raster_paint_set_foreground (hb_raster_paint_t *paint,
-				hb_color_t         foreground);
-
-HB_EXTERN void
-hb_raster_paint_clear_custom_palette_colors (hb_raster_paint_t *paint);
-
-HB_EXTERN hb_bool_t
-hb_raster_paint_set_custom_palette_color (hb_raster_paint_t *paint,
-					  unsigned int       color_index,
-					  hb_color_t         color);
-
-HB_EXTERN hb_paint_funcs_t *
-hb_raster_paint_get_funcs (void);
-
-HB_EXTERN hb_bool_t
-hb_raster_paint_glyph (hb_raster_paint_t *paint,
-		       hb_font_t        *font,
-		       hb_codepoint_t    glyph,
-		       float             pen_x,
-		       float             pen_y,
-		       unsigned           palette,
-		       hb_color_t         foreground);
-
-HB_EXTERN hb_raster_image_t *
-hb_raster_paint_render (hb_raster_paint_t *paint);
-
-HB_EXTERN void
-hb_raster_paint_reset (hb_raster_paint_t *paint);
-
-HB_EXTERN void
-hb_raster_paint_recycle_image (hb_raster_paint_t  *paint,
-			       hb_raster_image_t  *image);
-
-
-HB_END_DECLS
-
-#endif /* HB_RASTER_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-sanitize.hh b/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
index 7c03d009..88a956b2 100644
--- a/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
@@ -64,6 +64,9 @@
  *
  *   - Cast blob content to T*, call sanitize() method of it,
  *   - If sanitize succeeded, return blob.
+ *   - Otherwise, if blob is not writable, try making it writable,
+ *     or copy if cannot be made writable in-place,
+ *   - Call sanitize() again.  Return blob if sanitize succeeded.
  *   - Return empty blob otherwise.
  *
  *
@@ -95,12 +98,6 @@
  * structure is so complicated that by checking all offsets at sanitize() time,
  * we make the code much simpler in other methods, as offsets and referenced
  * objects do not need to be validated at each use site.
- *
- * Note:
- * Sanitize was named so because it used to try to recover from errors by
- * modifying the data to make it valid.  This is no longer the case, as it
- * could make HarfBuzz hallucinate new rules if there was aliasing in the
- * data.  However, the name stuck.  See: https://behdad.github.io/harfbust/
  */
 
 /* This limits sanitizing time on really broken fonts. */
@@ -128,7 +125,7 @@ struct hb_sanitize_context_t :
 	length (0),
 	max_ops (0), max_subtables (0),
         recursion_depth (0),
-	writable (false),
+	writable (false), edit_count (0),
 	blob (nullptr),
 	num_glyphs (65536),
 	num_glyphs_set (false),
@@ -239,6 +236,7 @@ struct hb_sanitize_context_t :
       this->max_ops = hb_clamp (m,
 				(unsigned) HB_SANITIZE_MAX_OPS_MIN,
 				(unsigned) HB_SANITIZE_MAX_OPS_MAX);
+    this->edit_count = 0;
     this->debug_depth = 0;
     this->recursion_depth = 0;
 
@@ -251,8 +249,8 @@ struct hb_sanitize_context_t :
   void end_processing ()
   {
     DEBUG_MSG_LEVEL (SANITIZE, this->start, 0, -1,
-		     "end [%p..%p]",
-		     this->start, this->end);
+		     "end [%p..%p] %u edit requests",
+		     this->start, this->end, this->edit_count);
 
     hb_blob_destroy (this->blob);
     this->blob = nullptr;
@@ -260,6 +258,9 @@ struct hb_sanitize_context_t :
     this->length = 0;
   }
 
+  unsigned get_edit_count () { return edit_count; }
+
+
   bool check_ops(unsigned count)
   {
     /* Avoid underflow */
@@ -403,6 +404,35 @@ struct hb_sanitize_context_t :
       return likely (this->check_point ((const char *) obj + obj->min_size));
   }
 
+  bool may_edit (const void *base, unsigned int len)
+  {
+    if (this->edit_count >= HB_SANITIZE_MAX_EDITS)
+      return false;
+
+    const char *p = (const char *) base;
+    this->edit_count++;
+
+    DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0,
+       "may_edit(%u) [%p..%p] (%u bytes) in [%p..%p] -> %s",
+       this->edit_count,
+       p, p + len, len,
+       this->start, this->end,
+       this->writable ? "GRANTED" : "DENIED");
+
+    return this->writable;
+  }
+
+  template <typename Type, typename ValueType>
+  bool try_set (const Type *obj, const ValueType &v)
+  {
+    if (this->may_edit (obj, hb_static_size (Type)))
+    {
+      * const_cast<Type *> (obj) = v;
+      return true;
+    }
+    return false;
+  }
+
   template <typename Type>
   hb_blob_t *sanitize_blob (hb_blob_t *blob)
   {
@@ -410,6 +440,7 @@ struct hb_sanitize_context_t :
 
     init (blob);
 
+  retry:
     DEBUG_MSG_FUNC (SANITIZE, start, "start");
 
     start_processing ();
@@ -423,6 +454,38 @@ struct hb_sanitize_context_t :
     Type *t = reinterpret_cast<Type *> (const_cast<char *> (start));
 
     sane = t->sanitize (this);
+    if (sane)
+    {
+      if (edit_count)
+      {
+	DEBUG_MSG_FUNC (SANITIZE, start, "passed first round with %u edits; going for second round", edit_count);
+
+	/* sanitize again to ensure no toe-stepping */
+	edit_count = 0;
+	sane = t->sanitize (this);
+	if (edit_count) {
+	  DEBUG_MSG_FUNC (SANITIZE, start, "requested %u edits in second round; FAILING", edit_count);
+	  sane = false;
+	}
+      }
+    }
+    else
+    {
+      if (edit_count && !writable)
+      {
+        unsigned length;
+	start = hb_blob_get_data_writable (blob, &length);
+	end = start + length;
+
+	if (start)
+	{
+	  writable = true;
+	  /* ok, we made it writable by relocating.  try again */
+	  DEBUG_MSG_FUNC (SANITIZE, start, "retry");
+	  goto retry;
+	}
+      }
+    }
 
     end_processing ();
 
@@ -453,6 +516,7 @@ struct hb_sanitize_context_t :
   private:
   int recursion_depth;
   bool writable;
+  unsigned int edit_count;
   hb_blob_t *blob;
   unsigned int num_glyphs;
   bool  num_glyphs_set;
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.cc b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.cc
index 96e148af..5e4ea5fe 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.cc
@@ -68,6 +68,7 @@ hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
     /* use hb_set to determine the subset of font dicts */
     hb_set_t set;
     hb_codepoint_t prev_fd = CFF_UNDEF_CODE;
+    hb_pair_t<unsigned, hb_codepoint_t> last_range {0, 0};
     auto it = hb_iter (plan->new_to_old_gid_list);
     auto _ = *it;
     for (hb_codepoint_t gid = 0; gid < subset_num_glyphs; gid++)
@@ -83,8 +84,9 @@ hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
 	/* fonttools retains FDSelect & font dicts for missing glyphs. do the same */
 	old_glyph = gid;
       }
-      auto fd_range = src.get_fd_range (old_glyph);
-      unsigned fd = fd_range.first;
+      if (old_glyph >= last_range.second)
+	last_range = src.get_fd_range (old_glyph);
+      unsigned fd = last_range.first;
 
       if (fd != prev_fd)
       {
@@ -94,7 +96,7 @@ hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
 	fdselect_ranges.push (code_pair_t { fd, gid });
 
 	if (gid == old_glyph)
-	  gid = hb_min (_.first - 1, fd_range.second - 1);
+	  gid = hb_min (_.first - 1, last_range.second - 1);
       }
     }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
index 3140b9ca..75e5e662 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
@@ -321,31 +321,11 @@ struct cff_font_dict_op_serializer_t : op_serializer_t
   }
 };
 
-/* CharString command for specialization */
-struct cs_command_t
-{
-  hb_vector_t<number_t> args;
-  hb_vector_t<unsigned char> mask_bytes; /* For hintmask/cntrmask payload bytes. */
-  op_code_t op;
-
-  cs_command_t () : op (OpCode_Invalid) {}
-  cs_command_t (op_code_t op_) : op (op_) {}
-};
-
-typedef hb_vector_t<cs_command_t> *cs_command_vec_t;
-
 struct flatten_param_t
 {
-  flatten_param_t (str_buff_t &flatStr_,
-                   bool drop_hints_,
-                   const hb_subset_plan_t *plan_,
-                   cs_command_vec_t commands_ = nullptr)
-    : flatStr (flatStr_), drop_hints (drop_hints_), plan (plan_), commands (commands_) {}
-
   str_buff_t     &flatStr;
   bool	drop_hints;
   const hb_subset_plan_t *plan;
-  cs_command_vec_t commands; /* Optional: capture parsed commands for specialization */
 };
 
 template <typename ACC, typename ENV, typename OPSET, op_code_t endchar_op=OpCode_Invalid>
@@ -355,8 +335,7 @@ struct subr_flattener_t
 		    const hb_subset_plan_t *plan_)
 		   : acc (acc_), plan (plan_) {}
 
-  bool flatten (str_buff_vec_t &flat_charstrings,
-                hb_vector_t<hb_vector_t<cs_command_t>> *command_capture = nullptr)
+  bool flatten (str_buff_vec_t &flat_charstrings)
   {
     unsigned count = plan->num_output_glyphs ();
     if (!flat_charstrings.resize_exact (count))
@@ -382,8 +361,7 @@ struct subr_flattener_t
       flatten_param_t  param = {
         flat_charstrings.arrayZ[i],
         (bool) (plan->flags & HB_SUBSET_FLAGS_NO_HINTING),
-	plan,
-	command_capture ? &(*command_capture)[i] : nullptr
+	plan
       };
       if (unlikely (!interp.interpret (param)))
 	return false;
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.cc b/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.cc
deleted file mode 100644
index 6a65bf5d..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2026 Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-/*
- * CFF2 to CFF1 Converter
- *
- * The actual implementation is in hb-subset-cff2.cc where it has access
- * to the full cff2_subset_plan definition.
- *
- * This file just exists to keep the build system happy.
- */
-
-#include "hb.hh"
-
-#ifndef HB_NO_SUBSET_CFF
-
-#include "hb-subset-cff2-to-cff1.hh"
-
-#endif /* HB_NO_SUBSET_CFF */
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.hh b/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.hh
deleted file mode 100644
index 6022c006..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff2-to-cff1.hh
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright © 2026 Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-#ifndef HB_SUBSET_CFF2_TO_CFF1_HH
-#define HB_SUBSET_CFF2_TO_CFF1_HH
-
-#include "hb.hh"
-
-#ifndef HB_NO_SUBSET_CFF
-
-#include "hb-ot-cff1-table.hh"
-#include "hb-ot-cff2-table.hh"
-#include "hb-subset-cff-common.hh"
-
-namespace OT {
-  // Forward declarations - these are defined in hb-subset-cff2.cc
-  struct cff2_subset_plan;
-}
-
-namespace CFF {
-
-// Forward declaration
-struct cff2_top_dict_values_t;
-
-// Default font name for converted CFF1 fonts
-static constexpr const char CFF1_DEFAULT_FONT_NAME[] = "CFF1Font";
-
-/*
- * CFF2 to CFF1 Converter
- *
- * Converts an instantiated (pinned) CFF2 variable font to CFF1 format.
- * This is used when instantiating a variable font to a static instance.
- *
- * IMPLEMENTATION STATUS:
- * ✓ CFF1 structure (Header, Name INDEX, String INDEX, Top DICT INDEX)
- * ✓ ROS operator (makes font CID-keyed: "Adobe-Identity-0")
- * ✓ FDArray and FDSelect in Top DICT (required for CID fonts)
- * ✓ FDSelect3 format (compact range-based, 8 bytes for single-FD fonts)
- * ✓ CID Charset with identity mapping (format 2)
- * ✓ FontBBox from head table (xMin, yMin, xMax, yMax)
- * ✓ Width optimization (defaultWidthX/nominalWidthX with O(n) algorithm)
- * ✓ Width encoding in CharStrings (prepended if != defaultWidthX)
- * ✓ CharString specialization (h/v operators, combined when possible)
- * ✓ Stack depth control (generalize→specialize with maxstack=48)
- * ✓ CharStrings with endchar operators (CFF1 requires, CFF2 doesn't)
- * ✓ Private DICT instantiation (blend operators evaluated)
- * ✓ Desubroutinized path (CharStrings are flattened, no subroutines)
- * ✓ OTS validation passes
- * ✓ HarfBuzz rendering works
- *
- * FUTURE ENHANCEMENTS:
- * - Curve operator specialization (hhcurveto, vvcurveto, etc.)
- * - Peephole optimization (minor additional size savings)
- *
- * Key conversions:
- * - Version: 2 -> 1
- * - Add Name INDEX (required in CFF1)
- * - Wrap Top DICT in an INDEX (inline in CFF2, indexed in CFF1)
- * - Add String INDEX ("Adobe", "Identity" for ROS operator)
- * - Add ROS operator to Top DICT (makes it CID-keyed)
- * - Add FDSelect to Top DICT (required in CFF1 even with single FD)
- * - Add endchar to CharStrings (required in CFF1, optional in CFF2)
- */
-
-struct cff1_subset_plan_from_cff2_t
-{
-  // Inherits most data from cff2_subset_plan
-  const OT::cff2_subset_plan *cff2_plan;
-
-  // CFF1-specific additions
-  hb_vector_t<unsigned char> fontName;  // Single font name for Name INDEX
-
-  bool create (const OT::cff2_subset_plan &cff2_plan_)
-  {
-    cff2_plan = &cff2_plan_;
-
-    // Create a simple font name (CFF1 requires a Name INDEX)
-    fontName.resize (strlen (CFF1_DEFAULT_FONT_NAME));
-    if (fontName.in_error ()) return false;
-    memcpy (fontName.arrayZ, CFF1_DEFAULT_FONT_NAME, strlen (CFF1_DEFAULT_FONT_NAME));
-
-    return true;
-  }
-};
-
-/* CFF1 Top DICT operator serializer that adds ROS and removes CFF2-specific ops */
-struct cff1_from_cff2_top_dict_op_serializer_t : cff_top_dict_op_serializer_t<>
-{
-  bool serialize (hb_serialize_context_t *c,
-                  const op_str_t &opstr,
-                  const cff_sub_table_info_t &info) const
-  {
-    TRACE_SERIALIZE (this);
-
-    switch (opstr.op)
-    {
-      case OpCode_vstore:
-        // CFF2-only operator, skip it
-        return_trace (true);
-
-      case OpCode_CharStrings:
-        return_trace (FontDict::serialize_link4_op(c, opstr.op, info.char_strings_link, whence_t::Absolute));
-
-      case OpCode_FDArray:
-      case OpCode_FDSelect:
-        // These are explicitly serialized in the main function to ensure they're present
-        // even if CFF2 doesn't have them. Skip them here to avoid duplication.
-        return_trace (true);
-
-      default:
-        return_trace (copy_opstr (c, opstr));
-    }
-  }
-
-  // Serialize ROS operator to make this a CID-keyed font
-  bool serialize_ros (hb_serialize_context_t *c) const
-  {
-    TRACE_SERIALIZE (this);
-
-    // ROS = Registry-Ordering-Supplement
-    // We use "Adobe", "Identity", 0 for maximum compatibility
-
-    // Allocate space and encode directly
-    // Registry: SID for "Adobe" (custom string at index 0 = SID 391)
-    // Ordering: SID for "Identity" (custom string at index 1 = SID 392)
-    // Supplement: 0
-    // Note: CFF standard strings end at SID 390, custom strings start at 391
-
-    str_buff_t buff;
-    str_encoder_t encoder (buff);
-
-    encoder.encode_int (391);  // Registry SID ("Adobe" in our String INDEX)
-    encoder.encode_int (392);  // Ordering SID ("Identity" in our String INDEX)
-    encoder.encode_int (0);    // Supplement
-    encoder.encode_op (OpCode_ROS);
-
-    if (encoder.in_error ())
-      return_trace (false);
-
-    auto bytes = buff.as_bytes ();
-    return_trace (c->embed (bytes.arrayZ, bytes.length));
-  }
-};
-
-/* Main serialization function */
-HB_INTERNAL bool
-serialize_cff2_to_cff1 (hb_serialize_context_t *c,
-                        OT::cff2_subset_plan &plan,
-                        const cff2_top_dict_values_t &cff2_topDict,
-                        const OT::cff2::accelerator_subset_t &acc);
-
-} /* namespace CFF */
-
-#endif /* HB_NO_SUBSET_CFF */
-
-#endif /* HB_SUBSET_CFF2_TO_CFF1_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff2.cc b/engine/thirdparty/harfbuzz/src/hb-subset-cff2.cc
index 262eeb1a..eb5cb0c6 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff2.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-cff2.cc
@@ -34,7 +34,6 @@
 #include "hb-subset-plan.hh"
 #include "hb-subset-cff-common.hh"
 #include "hb-cff2-interp-cs.hh"
-#include "hb-subset-cff2-to-cff1.hh"
 
 using namespace CFF;
 
@@ -74,56 +73,6 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t<cff2_cs_opset_flatten_t, flatte
 {
   static void flush_args_and_op (op_code_t op, cff2_cs_interp_env_t<blend_arg_t> &env, flatten_param_t& param)
   {
-    /* Optionally capture command for specialization (before flushing, to preserve args) */
-    if (param.commands)
-    {
-      bool skip_command = false;
-
-      switch (op)
-      {
-	case OpCode_return:
-	case OpCode_endchar:
-	  skip_command = true;
-	  break;
-
-	case OpCode_hstem:
-	case OpCode_hstemhm:
-	case OpCode_vstem:
-	case OpCode_vstemhm:
-	case OpCode_hintmask:
-	case OpCode_cntrmask:
-	  if (param.drop_hints)
-	    skip_command = true;
-	  break;
-
-	default:
-	  break;
-      }
-
-      if (!skip_command)
-      {
-	cs_command_t cmd (op);
-	/* Capture resolved blend values */
-	for (unsigned int i = 0; i < env.argStack.get_count ();)
-	{
-	  const blend_arg_t &arg = env.argStack[i];
-	  if (arg.blending ())
-	  {
-	    /* For blend args, capture only the resolved default value */
-	    cmd.args.push (arg);
-	    /* Skip over the multiple blend values */
-	    i += arg.numValues;
-	  }
-	  else
-	  {
-	    cmd.args.push (arg);
-	    i++;
-	  }
-	}
-	param.commands->push (cmd);
-      }
-    }
-
     switch (op)
     {
       case OpCode_return:
@@ -218,22 +167,6 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t<cff2_cs_opset_flatten_t, flatte
   static void flush_hintmask (op_code_t op, cff2_cs_interp_env_t<blend_arg_t> &env, flatten_param_t& param)
   {
     SUPER::flush_hintmask (op, env, param);
-    /* Preserve hintmask payload in captured commands for specializer re-encoding. */
-    if (param.commands && !param.drop_hints && param.commands->length > 0)
-    {
-      auto &cmd = param.commands->tail ();
-      if (cmd.op == op)
-      {
-        cmd.mask_bytes.resize (env.hintmask_size);
-        if (unlikely (cmd.mask_bytes.in_error ()))
-        {
-          env.set_error ();
-          return;
-        }
-        for (unsigned int i = 0; i < env.hintmask_size; i++)
-          cmd.mask_bytes[i] = env.str_ref[i];
-      }
-    }
     if (!param.drop_hints)
     {
       str_encoder_t  encoder (param.flatStr);
@@ -503,15 +436,9 @@ struct cff2_subset_plan
 
     drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING;
     pinned = (bool) plan->normalized_coords;
-    normalized_coords = plan->normalized_coords;
-    head_maxp_info = plan->head_maxp_info;
-    hmtx_map = &plan->hmtx_map;
     desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE ||
 		     pinned; // For instancing we need this path
 
-    /* Enable command capture for CFF2→CFF1 conversion (for specialization) */
-    capture_commands = pinned;
-
  #ifdef HB_EXPERIMENTAL_API
     min_charstrings_off_size = (plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS) ? 4 : 0;
  #else
@@ -523,21 +450,8 @@ struct cff2_subset_plan
       /* Flatten global & local subrs */
       subr_flattener_t<const OT::cff2::accelerator_subset_t, cff2_cs_interp_env_t<blend_arg_t>, cff2_cs_opset_flatten_t>
 		    flattener(acc, plan);
-
-      /* Enable command capture if requested (for specialization) */
-      if (capture_commands)
-      {
-	if (!charstring_commands.resize_exact (num_glyphs))
-	  return false;
-
-	if (!flattener.flatten (subset_charstrings, &charstring_commands))
-	  return false;
-      }
-      else
-      {
-	if (!flattener.flatten (subset_charstrings))
-	  return false;
-      }
+      if (!flattener.flatten (subset_charstrings))
+	return false;
     }
     else
     {
@@ -604,483 +518,9 @@ struct cff2_subset_plan
   bool	    desubroutinize = false;
 
   unsigned  min_charstrings_off_size = 0;
-
-  hb_array_t<int> normalized_coords; // For instantiation
-  head_maxp_info_t head_maxp_info;  // For FontBBox
-  const hb_hashmap_t<hb_codepoint_t, hb_pair_t<unsigned, int>> *hmtx_map; // For widths
-
-  // Width optimization results (for CFF1 conversion)
-  unsigned default_width = 0;
-  unsigned nominal_width = 0;
-
-  // Command capture for specialization (CFF2→CFF1 conversion)
-  bool capture_commands = false;
-  hb_vector_t<hb_vector_t<cs_command_t>> charstring_commands;
 };
 } // namespace OT
 
-/*
- * CFF2 to CFF1 Converter Implementation
- */
-
-#include "hb-cff-width-optimizer.hh"
-#include "hb-cff-specializer.hh"
-
-/* Serialize charstrings using CFF1 format with widths */
-static bool
-_serialize_cff1_charstrings (hb_serialize_context_t *c,
-                             OT::cff2_subset_plan &plan,
-                             unsigned default_width,
-                             unsigned nominal_width)
-{
-  c->push ();
-
-  // CFF1 requires:
-  // 1. Width at the beginning (if != defaultWidthX)
-  // 2. endchar at the end
-  str_buff_vec_t cff1_charstrings;
-  if (unlikely (!cff1_charstrings.resize (plan.subset_charstrings.length)))
-  {
-    c->pop_discard ();
-    return false;
-  }
-
-  for (unsigned i = 0; i < plan.subset_charstrings.length; i++)
-  {
-    // Get width for this glyph from hmtx_map
-    unsigned width = 0;
-    if (plan.hmtx_map->has (i))
-      width = plan.hmtx_map->get (i).first;
-
-    // Encode width if different from default
-    str_encoder_t encoder (cff1_charstrings[i]);
-    if (width != default_width)
-    {
-      int delta = (int) width - (int) nominal_width;
-      encoder.encode_int (delta);
-    }
-
-    // Use specialized commands if available, otherwise use binary
-    if (plan.capture_commands && i < plan.charstring_commands.length &&
-        plan.charstring_commands[i].length > 0)
-    {
-      // Specialize and encode commands
-      auto &commands = plan.charstring_commands[i];
-      CFF::specialize_commands (commands, 48);  /* maxstack=48 for CFF1 */
-      if (unlikely (!CFF::encode_commands (commands, cff1_charstrings[i])))
-      {
-        c->pop_discard ();
-        return false;
-      }
-    }
-    else
-    {
-      // Use binary CharString
-      const str_buff_t &cs = plan.subset_charstrings[i];
-      for (unsigned j = 0; j < cs.length; j++)
-        cff1_charstrings[i].push (cs[j]);
-    }
-
-    // Check if it already ends with endchar (0x0e) or return (0x0b)
-    if (cff1_charstrings[i].length == 0 ||
-        (cff1_charstrings[i].tail () != 0x0e && cff1_charstrings[i].tail () != 0x0b))
-    {
-      // Append endchar operator
-      if (unlikely (!cff1_charstrings[i].push_or_fail (0x0e)))
-      {
-        c->pop_discard ();
-        return false;
-      }
-    }
-  }
-
-  unsigned data_size = 0;
-  unsigned total_size = CFF1CharStrings::total_size (cff1_charstrings, &data_size);
-  if (unlikely (!c->start_zerocopy (total_size)))
-  {
-    c->pop_discard ();
-    return false;
-  }
-
-  auto *cs = c->start_embed<CFF1CharStrings> ();
-  if (unlikely (!cs->serialize (c, cff1_charstrings)))
-  {
-    c->pop_discard ();
-    return false;
-  }
-
-  plan.info.char_strings_link = c->pop_pack (false);
-  return true;
-}
-
-/* Serialize CID Charset (format 2 range: gid 0-N -> cid 0-N) */
-static bool
-_serialize_cff1_charset (hb_serialize_context_t *c,
-                         unsigned int num_glyphs,
-                         objidx_t &charset_link)
-{
-  // For CID fonts, create a simple identity charset
-  // Format 2: one range covering all glyphs (except .notdef)
-  c->push ();
-
-  auto *charset = c->start_embed<Charset> ();
-  if (unlikely (!charset))
-  {
-    c->pop_discard ();
-    return false;
-  }
-
-  // Create a single range for CID 1 to num_glyphs-1
-  hb_vector_t<code_pair_t> ranges;
-  if (num_glyphs > 1)
-  {
-    code_pair_t range;
-    range.code = 1;  // first CID
-    range.glyph = num_glyphs - 2;  // nLeft (covers glyphs 1 to num_glyphs-1)
-    ranges.push (range);
-  }
-
-  if (unlikely (!charset->serialize (c, 2, num_glyphs, ranges)))
-  {
-    c->pop_discard ();
-    return false;
-  }
-
-  charset_link = c->pop_pack ();
-  return true;
-}
-
-/* CFF2 to CFF1 serialization */
-namespace CFF {
-
-bool
-serialize_cff2_to_cff1 (hb_serialize_context_t *c,
-                        OT::cff2_subset_plan &plan,
-                        const cff2_top_dict_values_t &cff2_topDict,
-                        const OT::cff2::accelerator_subset_t &acc)
-{
-  TRACE_SERIALIZE (this);
-
-  /*
-   * CFF1 Serialization Order (reverse, as HarfBuzz packs from end):
-   * 1. CharStrings
-   * 2. Private DICs & Local Subrs
-   * 3. FDArray
-   * 4. FDSelect
-   * 5. Charset
-   * 6. Global Subrs
-   * 7. String INDEX
-   * 8. Top DICT INDEX
-   * 9. Name INDEX
-   * 10. Header
-   */
-
-  // 0. Optimize width encoding (for all FDs)
-  {
-    // Collect widths from hmtx_map
-    hb_vector_t<unsigned> widths;
-    widths.alloc (plan.num_glyphs);
-
-    for (unsigned gid = 0; gid < plan.num_glyphs; gid++)
-    {
-      unsigned width = 0;
-      if (plan.hmtx_map->has (gid))
-        width = plan.hmtx_map->get (gid).first;
-      widths.push (width);
-    }
-
-    // Optimize defaultWidthX and nominalWidthX
-    CFF::optimize_widths (widths, plan.default_width, plan.nominal_width);
-  }
-
-  // 1. CharStrings (with widths prepended)
-  if (!_serialize_cff1_charstrings (c, plan, plan.default_width, plan.nominal_width))
-    return_trace (false);
-
-  // 2. Private DICs & Local Subrs (same as CFF2)
-  hb_vector_t<table_info_t> private_dict_infos;
-  if (unlikely (!private_dict_infos.resize (plan.subset_fdcount)))
-    return_trace (false);
-
-  for (int i = (int)acc.privateDicts.length; --i >= 0;)
-  {
-    if (plan.fdmap.has (i))
-    {
-      objidx_t subrs_link = 0;
-
-      if (plan.subset_localsubrs[i].length > 0)
-      {
-        auto *dest = c->push<CFF1Subrs> ();
-        if (likely (dest->serialize (c, plan.subset_localsubrs[i])))
-          subrs_link = c->pop_pack (false);
-        else
-        {
-          c->pop_discard ();
-          return_trace (false);
-        }
-      }
-
-      auto *pd = c->push<PrivateDict> ();
-      // Use the CFF2 Private DICT serializer which instantiates blends when pinned=true
-      cff2_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints, plan.pinned,
-                                                  acc.varStore, plan.normalized_coords);
-      if (likely (pd->serialize (c, acc.privateDicts[i], privSzr, subrs_link)))
-      {
-        // Add defaultWidthX and nominalWidthX for CFF1
-        str_buff_t width_ops;
-        str_encoder_t encoder (width_ops);
-        encoder.encode_int (plan.default_width);
-        encoder.encode_op (OpCode_defaultWidthX);
-        encoder.encode_int (plan.nominal_width);
-        encoder.encode_op (OpCode_nominalWidthX);
-
-        if (!encoder.in_error () && c->embed (width_ops.as_bytes ().arrayZ, width_ops.length))
-        {
-          unsigned fd = plan.fdmap[i];
-          private_dict_infos[fd].size = c->length ();
-          private_dict_infos[fd].link = c->pop_pack ();
-        }
-        else
-        {
-          c->pop_discard ();
-          return_trace (false);
-        }
-      }
-      else
-      {
-        c->pop_discard ();
-        return_trace (false);
-      }
-    }
-  }
-
-  // 3. FDArray - serialize CFF2 font dicts as CFF1
-  {
-    auto *fda = c->push<FDArray<HBUINT16>> ();
-    cff_font_dict_op_serializer_t fontSzr;
-    auto it =
-    + hb_zip (+ hb_iter (acc.fontDicts)
-              | hb_filter ([&] (const cff2_font_dict_values_t &_)
-                { return plan.fdmap.has (&_ - &acc.fontDicts[0]); }),
-              hb_iter (private_dict_infos))
-    ;
-    // Explicitly specify template parameters: DICTVAL, INFO
-    bool success = fda->serialize<cff2_font_dict_values_t, table_info_t> (c, it, fontSzr);
-    if (success)
-      plan.info.fd_array_link = c->pop_pack (false);
-    else
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-  }
-
-  // 4. FDSelect (required in CFF1 CID-keyed fonts)
-  // CFF1 requires FDSelect for all CID-keyed fonts, even with just one FD
-  // CFF2 makes it optional when there's only one FD
-  if (acc.fdSelect != &Null (CFF2FDSelect))
-  {
-    c->push ();
-    if (likely (hb_serialize_cff_fdselect (c, plan.num_glyphs,
-                                          *(const FDSelect *)acc.fdSelect,
-                                          plan.orig_fdcount,
-                                          plan.subset_fdselect_format,
-                                          plan.subset_fdselect_size,
-                                          plan.subset_fdselect_ranges)))
-      plan.info.fd_select.link = c->pop_pack ();
-    else
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-  }
-  else
-  {
-    // Create a range-based FDSelect3 mapping all glyphs to FD 0
-    // Format: format(1) + nRanges(2) + range(3) + sentinel(2) = 8 bytes
-    c->push ();
-
-    // Format byte
-    HBUINT8 format;
-    format = 3;
-    if (unlikely (!c->embed (format)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // nRanges
-    HBUINT16 nRanges;
-    nRanges = 1;
-    if (unlikely (!c->embed (nRanges)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Single range: {first: 0, fd: 0}
-    FDSelect3_Range range;
-    range.first = 0;
-    range.fd = 0;
-    if (unlikely (!c->embed (range)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Sentinel (number of glyphs)
-    HBUINT16 sentinel;
-    sentinel = plan.num_glyphs;
-    if (unlikely (!c->embed (sentinel)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    plan.info.fd_select.link = c->pop_pack ();
-  }
-
-  // 5. Charset (CID charset for identity mapping)
-  objidx_t charset_link;
-  if (!_serialize_cff1_charset (c, plan.num_glyphs, charset_link))
-    return_trace (false);
-
-  // 6. Global Subrs
-  {
-    auto *dest = c->push<CFF1Subrs> ();
-    if (likely (dest->serialize (c, plan.subset_globalsubrs)))
-      c->pop_pack (false);
-    else
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-  }
-
-  // 7. String INDEX - Add "Adobe" and "Identity" for ROS operator
-  {
-    const char *adobe_str = "Adobe";
-    const char *identity_str = "Identity";
-    unsigned adobe_len = 5;  // strlen("Adobe")
-    unsigned identity_len = 8;  // strlen("Identity")
-
-    // Build strings array
-    hb_vector_t<hb_ubytes_t> strings;
-    strings.alloc (2);
-    strings.push (hb_ubytes_t ((const unsigned char *) adobe_str, adobe_len));
-    strings.push (hb_ubytes_t ((const unsigned char *) identity_str, identity_len));
-
-    // Serialize as CFF INDEX
-    auto *dest = c->push<CFF1Index> ();
-    if (likely (dest->serialize (c, strings)))
-      c->pop_pack (false);
-    else
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-  }
-
-  // 8. CFF Header
-  OT::cff1 *cff = c->allocate_min<OT::cff1> ();
-  if (unlikely (!cff)) return_trace (false);
-
-  /* header */
-  cff->version.major = 0x01;
-  cff->version.minor = 0x00;
-  cff->nameIndex = cff->min_size;
-  cff->offSize = 4; /* unused? */
-
-  // 9. Name INDEX (single entry)
-  {
-    unsigned name_len = strlen (CFF1_DEFAULT_FONT_NAME);
-
-    CFF1Index *idx = c->start_embed<CFF1Index> ();
-    if (unlikely (!idx)) return_trace (false);
-
-    if (unlikely (!idx->serialize_header (c, hb_iter (&name_len, 1), name_len)))
-      return_trace (false);
-
-    if (unlikely (!c->embed (CFF1_DEFAULT_FONT_NAME, name_len)))
-      return_trace (false);
-  }
-
-  // 10. Top DICT INDEX
-  {
-    // Serialize the Top DICT data first
-    c->push<TopDict> ();
-    cff1_from_cff2_top_dict_op_serializer_t topSzr;
-
-    // Serialize ROS first
-    if (unlikely (!topSzr.serialize_ros (c)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Serialize FontBBox from head table
-    {
-      str_buff_t bbox_buff;
-      str_encoder_t encoder (bbox_buff);
-
-      encoder.encode_int (plan.head_maxp_info.xMin);
-      encoder.encode_int (plan.head_maxp_info.yMin);
-      encoder.encode_int (plan.head_maxp_info.xMax);
-      encoder.encode_int (plan.head_maxp_info.yMax);
-      encoder.encode_op (OpCode_FontBBox);
-
-      if (encoder.in_error () || !c->embed (bbox_buff.as_bytes ().arrayZ, bbox_buff.length))
-      {
-        c->pop_discard ();
-        return_trace (false);
-      }
-    }
-
-    // Serialize charset operator
-    if (charset_link && unlikely (!FontDict::serialize_link4_op (c, OpCode_charset, charset_link, whence_t::Absolute)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Serialize FDSelect operator (required for CID-keyed CFF1 fonts)
-    if (plan.info.fd_select.link && unlikely (!FontDict::serialize_link4_op (c, OpCode_FDSelect, plan.info.fd_select.link, whence_t::Absolute)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Serialize FDArray operator (required for CID-keyed CFF1 fonts)
-    if (plan.info.fd_array_link && unlikely (!FontDict::serialize_link4_op (c, OpCode_FDArray, plan.info.fd_array_link, whence_t::Absolute)))
-    {
-      c->pop_discard ();
-      return_trace (false);
-    }
-
-    // Serialize other operators from CFF2 TopDict
-    for (const auto &opstr : cff2_topDict.values)
-    {
-      if (unlikely (!topSzr.serialize (c, opstr, plan.info)))
-      {
-        c->pop_discard ();
-        return_trace (false);
-      }
-    }
-
-    unsigned top_size = c->length ();
-    c->pop_pack (false);
-
-    // Serialize INDEX header
-    auto *dest = c->start_embed<CFF1Index> ();
-    if (unlikely (!dest->serialize_header (c, hb_iter (&top_size, 1), top_size)))
-      return_trace (false);
-  }
-
-  return_trace (true);
-}
-
-} /* namespace CFF */
-
 static bool _serialize_cff2_charstrings (hb_serialize_context_t *c,
 			     cff2_subset_plan &plan,
 			     const OT::cff2::accelerator_subset_t  &acc)
@@ -1229,38 +669,6 @@ OT::cff2::accelerator_subset_t::subset (hb_subset_context_t *c) const
   cff2_subset_plan cff2_plan;
 
   if (unlikely (!cff2_plan.create (*this, c->plan))) return false;
-
-  // If instantiating (pinned) and downgrade flag is set, convert to CFF1
-  if (cff2_plan.pinned && (c->plan->flags & HB_SUBSET_FLAGS_DOWNGRADE_CFF2))
-  {
-    // Serialize CFF1 to the subsetter's serializer
-    // If we run out of room, returning true will cause subsetter to retry with larger buffer
-    bool result = CFF::serialize_cff2_to_cff1 (c->serializer, cff2_plan, topDict, *this);
-
-    if (c->serializer->ran_out_of_room ())
-      return true; // Subsetter will retry with larger buffer
-
-    if (result && !c->serializer->in_error ())
-    {
-      // Success - end serialization to resolve links
-      c->serializer->end_serialize ();
-
-      // Copy the serialized CFF1 data and add as CFF table
-      hb_blob_t *cff_blob = c->serializer->copy_blob ();
-      if (cff_blob)
-      {
-        c->plan->add_table (HB_TAG('C','F','F',' '), cff_blob);
-        hb_blob_destroy (cff_blob);
-
-        // Return false to signal CFF2 table is not needed
-        return false;
-      }
-    }
-
-    // Conversion failed - don't fall back, fail hard for debugging
-    return false;
-  }
-
   return serialize (c->serializer, cff2_plan,
 		    c->plan->normalized_coords.as_array ());
 }
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-instancer-solver.cc b/engine/thirdparty/harfbuzz/src/hb-subset-instancer-solver.cc
index 03c59dc8..11aefded 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-instancer-solver.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-instancer-solver.cc
@@ -407,19 +407,9 @@ rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distance
 	     rebase_tent_result_t &out,
 	     rebase_tent_result_t &scratch)
 {
-  if (unlikely (!(-1.0 <= axisLimit.minimum &&
-                  axisLimit.minimum <= axisLimit.middle &&
-                  axisLimit.middle <= axisLimit.maximum &&
-                  axisLimit.maximum <= +1.0) ||
-                !(-2.0 <= tent.minimum &&
-                  tent.minimum <= tent.middle &&
-                  tent.middle <= tent.maximum &&
-                  tent.maximum <= +2.0) ||
-                tent.middle == 0.0))
-  {
-    out.reset ();
-    return;
-  }
+  assert (-1.0 <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && axisLimit.maximum <= +1.0);
+  assert (-2.0 <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && tent.maximum <= +2.0);
+  assert (tent.middle != 0.0);
 
   rebase_tent_result_t &sols = scratch;
   _solve (tent, axisLimit, sols);
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-plan-var.cc b/engine/thirdparty/harfbuzz/src/hb-subset-plan-var.cc
index fe29127d..3fe3d633 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-plan-var.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-plan-var.cc
@@ -160,43 +160,36 @@
 
  #endif
 
-bool
+void
 normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
 {
   if (plan->user_axes_location.is_empty ())
-    return true;
+    return;
 
   hb_array_t<const OT::AxisRecord> axes = face->table.fvar->get_axes ();
-  if (!plan->check_success (plan->normalized_coords.resize (axes.length)))
-    return false;
+  plan->normalized_coords.resize (axes.length);
 
   bool has_avar = face->table.avar->has_data ();
-  hb_vector_t<float> normalized_mins;
-  hb_vector_t<float> normalized_defaults;
-  hb_vector_t<float> normalized_maxs;
+  const OT::SegmentMaps *seg_maps = nullptr;
+  unsigned avar_axis_count = 0;
   if (has_avar)
   {
-    if (!plan->check_success (normalized_mins.resize (axes.length)) ||
-        !plan->check_success (normalized_defaults.resize (axes.length)) ||
-        !plan->check_success (normalized_maxs.resize (axes.length)))
-      return false;
+    seg_maps = face->table.avar->get_segment_maps ();
+    avar_axis_count = face->table.avar->get_axis_count();
   }
 
   bool axis_not_pinned = false;
-  unsigned new_axis_idx = 0;
-  unsigned last_idx = 0;
-  for (const auto& _ : + hb_enumerate (axes))
+  unsigned old_axis_idx = 0, new_axis_idx = 0;
+  for (const auto& axis : axes)
   {
-    unsigned i = _.first;
-    const OT::AxisRecord &axis = _.second;
     hb_tag_t axis_tag = axis.get_axis_tag ();
-    plan->axes_old_index_tag_map.set (i, axis_tag);
+    plan->axes_old_index_tag_map.set (old_axis_idx, axis_tag);
 
     if (!plan->user_axes_location.has (axis_tag) ||
         !plan->user_axes_location.get (axis_tag).is_point ())
     {
       axis_not_pinned = true;
-      plan->axes_index_map.set (i, new_axis_idx);
+      plan->axes_index_map.set (old_axis_idx, new_axis_idx);
       plan->axis_tags.push (axis_tag);
       new_axis_idx++;
     }
@@ -223,66 +216,35 @@ normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
       normalized_default = roundf (normalized_default * 16384.f) / 16384.f;
       normalized_max = roundf (normalized_max * 16384.f) / 16384.f;
 
-      if (has_avar)
+      if (has_avar && old_axis_idx < avar_axis_count)
       {
-        normalized_mins[i] = normalized_min;
-        normalized_defaults[i] = normalized_default;
-        normalized_maxs[i] = normalized_max;
-        last_idx = i;
-      }
-      else
-      {
-        plan->axes_location.set (axis_tag, Triple ((double) normalized_min,
-                                                   (double) normalized_default,
-                                                   (double) normalized_max));
-        if (normalized_default == -0.f)
-          normalized_default = 0.f; // Normalize -0 to 0
-        if (normalized_default != 0.f)
-          plan->pinned_at_default = false;
+	normalized_min = seg_maps->map_float (normalized_min);
+	normalized_default = seg_maps->map_float (normalized_default);
+	normalized_max = seg_maps->map_float (normalized_max);
 
-        plan->normalized_coords[i] = roundf (normalized_default * 16384.f);
+	// Round to 2.14
+	normalized_min = roundf (normalized_min * 16384.f) / 16384.f;
+	normalized_default = roundf (normalized_default * 16384.f) / 16384.f;
+	normalized_max = roundf (normalized_max * 16384.f) / 16384.f;
       }
+      plan->axes_location.set (axis_tag, Triple ((double) normalized_min,
+                                                 (double) normalized_default,
+                                                 (double) normalized_max));
+
+      if (normalized_default == -0.f)
+        normalized_default = 0.f; // Normalize -0 to 0
+      if (normalized_default != 0.f)
+        plan->pinned_at_default = false;
+
+      plan->normalized_coords[old_axis_idx] = roundf (normalized_default * 16384.f);
     }
+
+    old_axis_idx++;
+
+    if (has_avar && old_axis_idx < avar_axis_count)
+      seg_maps = &StructAfter<OT::SegmentMaps> (*seg_maps);
   }
   plan->all_axes_pinned = !axis_not_pinned;
-
-  // TODO: use avar map_coords_16_16() when normalization is changed to 16.16
-  // in fonttools
-  if (has_avar)
-  {
-    const OT::avar* avar_table = face->table.avar;
-    if (avar_table->has_v2_data () && !plan->all_axes_pinned)
-    {
-      DEBUG_MSG (SUBSET, nullptr, "Partial-instancing avar2 table is not supported.");
-      return false;
-    }
-
-    unsigned coords_len = last_idx + 1;
-    if (!plan->check_success (avar_table->map_coords_2_14 (normalized_mins.arrayZ, coords_len)) ||
-        !plan->check_success (avar_table->map_coords_2_14 (normalized_defaults.arrayZ, coords_len)) ||
-        !plan->check_success (avar_table->map_coords_2_14 (normalized_maxs.arrayZ, coords_len)))
-      return false;
-
-    for (const auto& _ : + hb_enumerate (axes))
-    {
-      unsigned i = _.first;
-      hb_tag_t axis_tag = _.second.get_axis_tag ();
-      if (plan->user_axes_location.has (axis_tag))
-      {
-        plan->axes_location.set (axis_tag, Triple ((double) normalized_mins[i],
-                                                   (double) normalized_defaults[i],
-                                                   (double) normalized_maxs[i]));
-        float normalized_default = normalized_defaults[i];
-        if (normalized_default == -0.f)
-          normalized_default = 0.f; // Normalize -0 to 0
-        if (normalized_default != 0.f)
-          plan->pinned_at_default = false;
-
-        plan->normalized_coords[i] = roundf (normalized_default * 16384.f);
-      }
-    }
-  }
-  return true;
 }
 
 void
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc b/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
index 767c1bf2..c69f542b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
@@ -677,8 +677,7 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
     return;
 
 #ifndef HB_NO_VAR
-  if (!check_success (normalize_axes_location (face, this)))
-      return;
+  normalize_axes_location (face, this);
 #endif
 
   _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, this);
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh b/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
index 2a935b8f..30e8e639 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
@@ -333,7 +333,7 @@ generate_varstore_inner_maps (const hb_set_t& varidx_set,
                               unsigned subtable_count,
                               hb_vector_t<hb_inc_bimap_t> &inner_maps /* OUT */);
 
-HB_INTERNAL bool
+HB_INTERNAL void
 normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan);
 
 HB_INTERNAL void
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset.h b/engine/thirdparty/harfbuzz/src/hb-subset.h
index 2b9b2a22..bc55b6d0 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset.h
+++ b/engine/thirdparty/harfbuzz/src/hb-subset.h
@@ -84,9 +84,6 @@ typedef struct hb_subset_plan_t hb_subset_plan_t;
  * HB_SUBSET_FLAGS_RETAIN_GIDS then the number of glyphs in the font won't
  * be reduced as a result of subsetting. If necessary empty glyphs will be
  * included at the end of the font to keep the number of glyphs unchanged.
- * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font,
- * convert the output CFF2 table to CFF1. This enables compatibility with older
- * renderers that don't support CFF2. Since: REPLACEME
  *
  * List of boolean properties that can be configured on the subset input.
  *
@@ -110,7 +107,6 @@ typedef enum { /*< flags >*/
   HB_SUBSET_FLAGS_IFTB_REQUIREMENTS       =  0x00001000u,
   HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS  =  0x00002000u,
 #endif
-  HB_SUBSET_FLAGS_DOWNGRADE_CFF2          =  0x00004000u,
 } hb_subset_flags_t;
 
 /**
diff --git a/engine/thirdparty/harfbuzz/src/hb-ucd-table.hh b/engine/thirdparty/harfbuzz/src/hb-ucd-table.hh
index d2d23cf5..868428ab 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ucd-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ucd-table.hh
@@ -763,1712 +763,1716 @@ static const uint64_t _hb_ucd_dm2_u64_map[408]=
 
 #include <stdint.h>
 
-static const uint8_t _hb_ucd_u8[19845]=
+static const uint8_t _hb_ucd_u8[19868]=
 {
-    5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-   21, 22, 23, 24, 25, 26, 27, 28, 29, 30,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 31,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-   32,  2, 33, 34, 35, 36,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 37,  3,  3,  3,  3,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 38, 39, 40, 41,
-   42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-    2, 58, 59,  0,  0,  0,  0, 60,  2,  2, 61,  2,  2,  2,  2,  2,
-    2, 62,  2, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   64,  0,  0,  0,  2, 65, 66, 67,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 69, 70, 71,  0,  0,  0,  0, 72,  0,
-    0,  0,  0,  0,  0,  0, 73, 74, 75, 76, 77, 78,  4, 79,  0, 80,
-   81, 82, 83, 84, 85,  0, 86, 87, 88, 89,  4, 90, 91, 92,  0,  0,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 93,  2,  2,  2,  2,  2,  2,  2,  2, 94,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 95,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 96,  2, 97,  0,  0,  0,  0,  2, 98,  0,  0,
-    2,  2,  2,  2,  2,  2,  2,  2,  2, 99,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,100,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,102,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,
-    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,
-    4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,  6,  6,  6,  6,
-    8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,
-    5,  5,  5,  5,  5,  5,  5,  5,  7,  7,  7,  7,  7,  7,  7,  7,
-   11, 11, 11, 11, 11,  0,  0,  0, 10, 10, 10, 10, 10, 10, 10, 10,
-   13, 13, 13, 13, 13, 13, 13, 13, 16, 16, 16, 16, 16, 16, 16, 16,
-    1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1, 14,
-    1,  1,  1,  1, 14,  1,  1,  1, 18, 18, 18, 18, 18, 18, 18, 18,
-    1,  5,  0, 11, 11, 11, 11, 11,  1,  1,  1,  1,  1,  1, 14,  0,
-    1,  1,  1,  1, 14,  0,  0,  0,  6,  6,  6,  6,  7,  7,  7,  7,
-    1,  1,  1,  1,  1, 14,  0,  0,  1,  1,  1,  1,  1,  1,  0,  0,
-    1,  1,  1,  1,  1,  0,  0,  0,  1,  1,  1, 14,  0,  0,  0,  0,
-    1,  1,  1, 14,  1,  1,  1, 14,  3,  3,  3,  3,  3,  3,  0,  0,
-   28, 28, 28, 28, 28, 28, 28, 28, 11, 11, 11, 11, 11,  1,  1,  1,
-   14, 17,  1,  1,  1,  1,  1,  1, 14,  0,  0,  0,  0,  0,  0,  0,
-   14,  1,  1,  1,  1,  1,  1,  1,  3,  3,  3,  3,  3,  0,  0,  0,
-    3,  3,  3,  0,  0,  0,  0,  0,  3,  3,  3,  3,  3,  3, 29,  0,
-   11, 11, 11, 11, 11, 11, 11, 11,  7,  7,  7,  7,  7,  6,  6,  6,
-    0,  0,  0, 11, 11, 11, 11, 11, 17,  1,  1,  1,  1,  1,  1,  1,
-   11, 11, 11, 11, 11, 10, 10, 10,  1,  1,  1,  0,  0,  0,  0,  0,
-    5, 46,  1,  1,  1,  1,  1,  1,  6,  6,  6,  6, 41, 41, 41, 41,
-    3,  3,  0,  0,  0,  0,  0,  0, 11, 11, 11, 11, 11,  0,  0, 12,
-    1,  1,  0,  0,  0,  0,  0,  0, 29,  0,  0,  0,  0,  0,  0,  0,
-   49, 10, 10, 10, 10, 10, 10, 10,  7,  6,  6,  6,  6,  6,  6,  6,
-   44,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,
-    3,  3,  3,  3,  0,  0,  0,  0, 11, 11, 11, 11, 11, 12,  9, 77,
-   88,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,102,103,104,
-   89,  6,  6,  6,  6,  6,  6,  6, 22, 22, 22, 22, 22, 22, 22, 22,
-   26,  5,  5,  5,  5,  5,  5,  5,  1,  1,  1,  5,  5,  5,  5,  5,
-    5, 20,  1,  1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1,  1,  1,
-   11, 11, 11, 11, 11, 12, 12, 12,  1,  1,  1,  1, 14,  1,  1,  0,
-   14,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1, 14,  1,  1,  1,  1,
-   10, 10, 10, 10, 10, 10, 51,  0,115,  1,  1,  1,  1,  1,  1,  1,
-    5,  5,  5,  5,  5,  5,  5,  0,  1,  1,  1,  1, 13, 13, 13, 12,
-    6,  6,  6,  0,  7,  7,  7,  0, 30, 30, 30, 30, 30, 30, 30, 30,
-    3,  3,  3,  3,  3, 29,  0,  0,  3,  3,  3,  3,  3,  3,  3, 29,
-   10, 10, 10, 10, 10,  3,  3,  3, 75, 10, 10, 10, 10, 10, 10, 10,
-    3,  3,  3, 29,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0,  0,
-    7,  7,  7,  7,  7, 32,  7,  7,  0, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 51,  0,  0,  0,  1,  1,  1,  1,  1,  1, 86, 10,
-    1,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1, 15, 19,
-    1,  1,  1,  1,  1,  1,  1, 34,  1,  1,  1,  1,  1,  1,  1,  5,
-   15, 15, 15, 15, 15, 15, 15, 15,  1, 14,  0,  0,  0,  0,  0,  0,
-    5,  5,  5, 23,  0,  0,  0,  0, 10, 10,  0,  0,  0,  0,  0,  0,
-    6,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  6,
-    6,  6,  6,  6,  6,  6,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,
-    3,  3,  3,  3, 29,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-   87, 12,100, 12, 27,101, 76, 12,  6,  6,  6,  6,  6,105,106,135,
-   87, 30, 30, 66,107,136,137,108, 50, 10, 89, 12,138,139, 10, 78,
-    7,  7,  7, 59,  7,  7,  7,  8,  6,  6,  6, 60,  6,  6,  6,  6,
-    8,  8,  8,  8, 21, 21, 21, 21, 21, 21, 21, 21,  6,  8,  8,  8,
-    8,  8,  8,  8,  7, 21, 21,  6, 21,  8,  8,  7, 21,  7,  6,  7,
-    7, 21,  8,  7,  8,  6,  7, 21,  8,  8,  8,  7, 21,  6,  8,  7,
-   21,  7, 21, 21,  8, 67,  8,  6,  1,  1,109, 21,110,109, 21, 21,
-   21, 21, 21, 21, 21, 21,  6,  8, 21,110,  8,  7,  8,  8,  8,  8,
-    8,  8,  6,  6,  6,  7, 21,  8, 21, 21,  7,  8,  8,  8,  8,  8,
-    6,  6,  1,  6,  6,  6,  6,  6, 13, 22, 22, 13, 13, 13, 13, 13,
-   13, 22, 22, 22, 22, 22, 22, 22, 13, 13, 68, 22, 22, 22, 68, 68,
-    8,  8, 68,  8,  0, 69,  6, 88,  0,  0, 22,140,  7, 32, 32,  7,
-   21,  7,  7,  7,  7,  7,  7,  7,  7, 39,  7,  7,  7,  7,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 21,  6,  7,  8,  6,  8,  8,  8,  8,
-    6,  6,  8, 90, 21,  8, 21,  7,  8, 43,  5,  5, 79,  8,  8,  8,
-    7, 21, 21, 21, 21, 21, 21,  6, 39,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7, 32, 54, 12, 12, 12,  6,  6,  6,  6,111,141, 44, 70,
-    5,  5,  5,  5,  5,  5,  5,142, 71, 36,  5, 71,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 14,  0, 17,  1, 40, 33,  0,  0,  0,  0,  0,
-   18, 18, 18,  9, 77, 80, 12,  3,  5,  5,  5,  5,  5, 36,143, 12,
-   52,  1,  1,  1,  1, 24,  5,  5, 11, 11, 11, 11, 11, 12, 12,  1,
-   25,  1,  1,  1,  1,  1,  1,  1,  1,  1, 53,  5,  5,  5,144, 43,
-    5,  5, 81, 72, 55,  5,  5,  1, 11, 11, 11, 11, 11,  1, 56, 82,
-   12, 12, 12, 12, 12, 12, 12, 73, 24,  1,  1,  1,  1,  1,  1,  1,
-    5,  5,  5,  5,  5, 23, 17,  1, 25,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 24,  5,  5,  5,  5, 13, 66, 12, 61, 26, 30,
-    1,  1,  1,  5,  5, 72,  5,  5,  5,  5, 72,  5, 72,  5,  5,  0,
-   12, 12, 12, 12, 12, 12, 12, 33,  1,  1,  1,  1, 24,  5,  0, 33,
-    1,  1,  1,  1,145,  1,  1,  1, 18,  0,  0, 26,  5,  5,  5,  5,
-    1,  1,  1,  1, 45,  5,  5,  5,  5, 91,  5,  5,  5,  5,  5,  5,
-    1,  1,  1,  1,  1, 20, 25, 15, 19,  5,  5,  5, 20, 15, 19, 15,
-   24,  5,  5,  5,  1,  1,  1,  1,  1,  5, 12, 11, 11, 11, 11, 11,
-   62,  1,  1,  1,  1,  1,  1,  1, 24, 15, 17,  1,  1,  1, 14, 17,
-   14, 14,  0,  1,  1,  0, 25, 15, 19,  5, 23, 35, 37, 35, 19, 14,
-    0,  0,  0, 35,  0,  0,  1, 17,  1, 30, 10, 10, 10, 70, 40, 23,
-   26, 20, 17,  1,  1, 14,  0, 17, 14,  1, 17, 14,  1,  0, 23, 15,
-   19, 23,  0, 26, 23, 26,  5,  0, 26,  0,  0,  0, 17,  1, 14, 14,
-    5,  1, 24, 33,  0,  0,  0,  0, 26, 20, 17,  1,  1,  1,  1, 17,
-   14,  1, 17,  1,  1,  0, 25, 15, 19,  5,  5, 26, 20, 35, 19,  0,
-   80,  0,  0,  0, 17,  5,  5,  5, 26, 15, 17,  1,  1,  1, 14, 17,
-   14,  1, 17,  1,  1,  0, 25, 19, 19,  5, 23, 35, 37, 35, 19,  0,
-    0,  0, 26, 20,  0,  0,  1, 17, 82, 10, 10, 10,  0,  0,  0,  0,
-    0, 25, 17,  1,  1, 14,  0,  1, 14,  1,  1,  0, 17, 14, 14,  1,
-    0, 17, 14,  0,  1, 14,  0,  1,  1,  1,  1,  1,  1,  0,  0, 15,
-   20, 37,  0, 15, 37, 15, 19,  0, 14,  0,  0, 35,  0,  0,  0,  0,
-   10, 63,  3,  3, 70, 29,  0,  0, 20, 15, 25,  1,  1,  1, 14,  1,
-    1,  1,  1,  1,  1,  0, 25,  5, 20, 15, 37,  5, 23,  5,  5,  0,
-    0,  0, 26, 23,  1, 14,  1,  0,  0,  0,  0, 38, 10, 10, 10, 63,
-   24, 15, 53,  1,  1,  1, 14,  1,  1,  1, 17,  1,  1,  0, 25, 19,
-   15, 15, 37, 20, 37, 15,  5,  0,  0,  0, 35, 37,  0,  0,  1, 14,
-   17, 34,  0,  0,  0,  0,  0,  0,  5, 15,  1,  1,  1,  1, 14,  1,
-    1,  1,  1,  1,  1, 24, 25, 15, 19,  5, 23, 15, 37, 15, 19, 56,
-    0,  0,  1, 34, 10, 10, 10,112, 10, 10, 10, 10, 63,  1,  1,  1,
-   26, 15, 17,  1,  1,  1,  1,  1,  1,  1,  1, 14,  0,  1,  1,  1,
-    1, 17,  1,  1,  1,  1, 17,  0,  1,  1,  1, 14,  0, 23,  0, 35,
-   15,  5, 23, 23, 15, 15, 15, 15,  0, 15, 33,  0,  0,  0,  0,  0,
-   24,  1,  5,  5,  5, 23,  0,113,  1,  1,  1, 72,  5,  5,  5, 36,
-   11, 11, 11, 11, 11, 12,  0,  0, 17, 14, 14,  1,  1, 14,  1,  1,
-    1,  1, 17, 17,  1,  1,  1,  1, 24,  1,  5,  5,  5,  5, 25,  0,
-    1,  1, 14, 61,  5,  5,  5, 23, 11, 11, 11, 11, 11,  0,  1,  1,
-   56,  3, 12, 12, 12, 12, 12, 12, 12, 57, 57,  3,  5,  3,  3,  3,
-   10, 10, 43, 43, 43, 27, 27, 15,  1,  1,  1,  1, 17,  1,  1,  1,
-   26,  5,  5,  5,  5,  5,  5, 20,  5,  5, 36,  5,  1,  1, 24,  5,
-    5,  5,  5,  5, 26,  5,  5,  5,  5,  5,  5,  5,  5,  5, 23,  3,
-    3,  3,  3, 55,  3,  3, 29,  3, 12, 12, 57,  3, 66, 33,  0,  0,
-    1,  1,  1,  1,  1, 34, 19,  5, 20,  5,  5,  5, 19, 20, 19, 25,
-    1,  1,  1, 15,  5,  1,  1,  5, 25, 15, 46, 34, 15, 15, 15,  1,
-   24,  5, 25,  1,  1,  1,  1,  1,  1, 20, 19, 20, 15, 15, 19, 34,
-   11, 11, 11, 11, 11, 15, 19,  3,  7,  7,  7, 39,  0,  0, 39,  0,
-    6,  6,  6,  6,  6,111, 69,  6,  1,  1,  1, 14, 14,  1,  1,  0,
-   14,  1,  1,  0,  1,  1,  1, 14,  1,  1,  1,  1,  1, 14, 26,  5,
-   12, 12, 12, 12,114, 10, 10, 10,  7,  7,  7,  0,  6,  6,  6,  0,
-    1,  1,  1,  1,  1,  1, 56, 53,146,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,147,116,  0,  1,  1,  1,  1,  1, 40, 12, 16,
-  148,  1,  1,  1, 14,  0,  0,  0,  1,  5, 20,  0,  0,  0,  0, 17,
-    1,  5, 83, 33,  0,  0,  0,  0,  1,  5,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1, 14,  1, 14,  5,  0,  0,  0,  0,  0,  0,
-    1,  1,  5, 19,  5,  5,  5, 15, 15, 15, 15, 20, 19,  5,  5,  5,
-    5,  5, 12, 62, 12, 80, 24,  0, 10, 10, 10, 10, 10,  0,  0,  0,
-   12, 12, 12, 92, 12, 71,  5, 91,  1, 45,  1,  1,  1,  1,  1,  1,
-    1,  1, 24, 25,  1,  1,  1,  1,  1,  1,  1,  1, 24, 14,  0,  0,
-    5, 20, 15, 19, 20, 15,  0,  0, 15, 20, 15, 15, 19,  5,  0,  0,
-   29,  0, 12, 11, 11, 11, 11, 11,  1,  1, 14,  0,  0,  0,  0,  0,
-   11, 11, 11, 11, 11, 51,  0,  3,  1,  1,  1, 24, 20, 19,  0, 12,
-    1,  1, 34, 20,  5,  5,  5, 23, 20, 20, 19,  5,  5,  5, 20, 15,
-   15, 19,  5,  5,  5,  5, 23, 26, 12, 12, 12, 62, 12, 12, 12,  0,
-    5,  5,  5,  5,  5,  5,  5, 93,  5,  5,  5,  5,  5,  5,  0,  0,
-    5,  5, 46,  1,  1,  1,  1,  1,  1,  1, 20,  5,  5, 20, 20, 15,
-   15, 20, 46,  1,  1,  1, 14, 12, 57,  3,  3,  3,  3, 43,  5,  5,
-    5,  5,  3,  3,  3,  3, 66, 12, 34,  5,  5, 15,  5, 19,  5,  1,
-    1,  1,  1, 20,  5, 15, 19, 19,  5, 15,  0,  0,  0,  0, 12, 12,
-    1,  1, 15, 15, 15, 15,  5,  5,  5,  5, 15,  5,  0, 38, 12, 12,
-   11, 11, 11, 11, 11,  0, 17,  1,  6,  6,  6,  6, 21, 47,  0,  0,
-    7,  7,  7,  7,  7, 32, 39,  7, 12, 12, 12, 12,  0,  0,  0,  0,
-    5, 36,  5,  5,  5,  5,  5,  5, 20,  5,  5,  5, 25,  1, 24,  1,
-    1,  1, 25, 34,  5, 14,  0,  0,  6,  6,  6,  6,  6,  6, 13, 13,
-   13, 13, 13, 13, 13, 69,  6,  6,  6,  6,  6,  6, 69,  6,  6,  6,
-    6,  6,  6,  6,  6,117, 13, 13,  8,  8,  8,  6,  6,  6,  6,  8,
-    6,  6,  6,  6, 39, 39, 39, 39,  6,  6,  6,  6,  6,  6,  6,  0,
-    6,  6, 47,  6,  7,  7, 94,118, 22,  6, 47,  6,  7,  7, 94, 22,
-    6,  6,  0,  6,  7,  7,149, 22,  6,  6,  6,  6,  7,  7,150, 22,
-    0,  6, 47,  6,  7,  7, 94,151, 74, 74, 74, 74, 74,152, 18, 18,
-   84, 84, 84, 12, 58,119, 58,119, 12, 12, 12, 12,153, 18, 18,154,
-   12, 12, 12, 12,120,121, 12,122,123, 12, 64, 65, 12, 12, 12, 12,
-   12, 77,123, 12, 12, 12, 12,155, 18, 18,156, 18, 18, 18, 18, 18,
-  157,  0, 10, 10, 10,  9, 64,158, 10, 10, 10, 10, 10,  9, 64,116,
-   13, 13, 13, 13, 13, 13, 61,  0, 30,  0,  0,  0,  0,  0,  0,  0,
-    5,  5,  5,  5,  5,  5,159, 79, 93, 79, 93,  5,  5,  5,  5,  5,
-   23,  0,  0,  0,  0,  0,  0,  0,  3, 85,  3, 95,  3, 21,  7,  6,
-    7,  8, 95,  3, 90,  7,  7,  3,  3,  3, 85, 85, 85,  7,  7,160,
-    7,  7, 67,  1,124,  3,  6,  7,  9,  9, 90,  6,  6, 50,  3,125,
-   16,161,162, 16,126,  3,  0,  0,  9,  9, 48,  3,  3,  9,  3,  3,
-   48, 50,  3, 48,  3,  3,  3, 48,  3,  3,  3,  3,  3,  3,  3,  9,
-    3, 48, 48,  3,  3,  3,  3,  3,  3,  3,  9,  9,  9,  9,  9,  9,
-    3,  3,  3,  3, 27, 27,  3,  3,  9,  3,  3,  3,163,164,  3,  3,
-    3,  3,  3,  3,  3,  3, 48,  3,  3,  3,  3,  3,  3, 50,  9,  9,
-    9,  9,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  9,  9,
-    9,  3,  3,  3,  3,  3,  3,  3, 10, 10, 10, 10, 10, 10,  3,  3,
-    3,  3,  3,  3,  3, 10, 10, 10,  3,  3,  3, 50,  3,  3,  3,  3,
-   50,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  9,  9,  9,  9,
-    3,  3,  3,  3,  3,  3,  3, 50,  3,  3,  3,  3, 27, 27, 27, 27,
-   27, 27, 27, 10, 10, 10, 10, 10, 10, 10,  3,  3,  3,  3,  3,  3,
-    9,  9, 64,127,  9,  9,  9,  9,  9,  9,  9, 27, 27, 27, 27, 27,
-    9, 64, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,127,  9,  9,  9,
-    9,  9,  9,  9, 27, 27,  9,  9,  9,  9,  9,  9,  9,  9, 27,  9,
-    9,  9, 48, 50,  9,  9, 48,  3,  3,  3,  0,  3,  3,  3,  3,  3,
-    8,  7,  8, 21, 21, 21, 21,  7,  8,  8, 21,  6,  6,  6, 13,  7,
-    8,  8,125,  3,  3, 95, 21,165,  5,  8,  0,  0, 38, 12,114, 12,
-    6,  6,  6, 42,  0,  0, 42,  0,  1,  1,  1,  1,  0,  0,  0, 54,
-   33,  0,  0,  0,  0,  0,  0, 26, 12, 58, 58, 12,120,121, 58, 12,
-   12, 12, 12, 76, 12, 92, 58, 12, 58, 27, 27, 27, 27, 12, 12, 62,
-   12, 12, 12, 12, 12, 84, 12, 12, 92,166, 12, 12, 12, 12, 12, 12,
-    3, 12, 96, 31, 31, 31,167,  0,  3,  3,  3,  3,  3, 44,  3,  3,
-   87, 12,168,128, 27, 27, 27, 27, 27,  3, 27, 27, 27, 27,129,169,
-  170, 16, 16, 16, 16,  5,  5, 15,130, 13, 13,  3, 16,171, 40,  3,
-    1,  1,  1, 14, 26,172,131, 52,  1,  1,  1,  1,  1, 40, 13, 52,
-    0,  0, 17,  1,  1,  1,  1,  1,  3, 10, 10,  3,  3,  3,  3,  3,
-    3,  3,  3,  0,  0,  0,  0, 44,  3,  3,  3,  3, 10, 10, 10, 10,
-    1,  1, 45,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,132, 12,
-   11, 11, 11, 11, 11,  1,  0,  0,  8,  8,  8,  8,  8,  8,  8, 24,
-   79,173,  5,  5,  5,  5,  5, 62,  8,  8,  8,  8,  8,  8, 13,  5,
-    1,  1,  1, 16, 16, 16, 16, 16,  5, 12, 12, 12,  0,  0,  0,  0,
-   22, 22, 22,131, 13, 13, 13, 13, 22,  8,  8,  8,  8,  8,  8,  8,
-    6,  8,  8,  8,  8,  8,  8,  8, 69,  6,  6,  6, 21, 21, 21,  8,
-    8,  8,  8,  8, 68,174, 21, 67,  8,  8,  6,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  7,  7,  8,  7,  7,  8,  8,  8,  8,  8,  8,
-    8,  8,  7,  7, 21, 21,  8,  8,  8,  8,  8,  8,  8,  8, 32,  0,
-   54, 13,175, 67, 13, 67,  1,  1,  1, 25,  1, 25,  1, 24,  1,  1,
-    1, 34, 19, 20,  3,  3, 23,  0, 10, 10, 10,  3, 97,  0,  0,  0,
-    1,  1, 12, 12,  0,  0,  0,  0, 15,  1,  1,  1,  1,  1,  1,  1,
-    1,  1, 15, 15, 15, 15, 15, 15, 15, 15,  5,  0,  0,  0,  0, 12,
-    5,  1,  1,  1, 12, 53, 53, 24,  1,  1,  1,  5,  5,  5,  5, 12,
-    1,  1,  1, 24,  5,  5,  5,  5,  5, 15,  0,  0,  0,  0,  0, 38,
-    1, 24, 15,  5,  5, 15,  5, 15, 83, 12, 12, 12, 12, 12, 12, 54,
-    1,  1, 24, 52,  1,  1,  1,  1, 11, 11, 11, 11, 11,  1,  1, 14,
-    1,  1,  1,  1, 24,  5,  5, 20, 19, 20, 19, 23,  0,  0,  0,  0,
-    1, 24,  1,  1,  1,  1, 20,  0, 11, 11, 11, 11, 11,  0, 12, 12,
-   52,  1,  1, 56,  3, 34, 20,  1, 25,  5, 25, 24, 25,  1,  1,  5,
-   24, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 45, 12,
-    1,  1,  1,  1,  1, 34,  5, 15, 12, 45,176, 23,  0,  0,  0,  0,
-   17,  1,  1, 14, 17,  1,  1, 14, 17,  1,  1, 14,  0,  0,  0,  0,
-    6,  6,  6,  6,  6,118, 13, 13,  6,  6,  6,  6,117, 22,  0,  0,
-    1, 34, 19, 15, 20, 83, 19,  0,  1,  1,  1, 14,  0, 17,  1,  1,
-    6,  6,  6, 47,  0,  0,  0,  0,  0, 42,  6,  6,  0,  0, 17, 25,
-    1,  1,  1,  1,177,  1,  1,  1,  1,  1,  1, 14,  1,  1, 14, 14,
-    1, 17, 14,  1,  1,  1,  1,  1,  1, 22, 22, 22, 22, 22, 22, 22,
-   22,107,  3,  3,  3,  3,  3,  3,  3, 82,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1, 31,  3,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  3,  3,  3,  3,  1,  1,  1,  1,  1,  1, 97,  3,
-   12, 12, 12, 96, 65,  0,  0,  0, 76,178,179, 31, 31, 31, 31, 31,
-   31, 31, 65, 96, 65, 12,122,180, 12, 33, 12, 12,129, 31, 31, 65,
-   12,181,  9, 98, 80, 12,  0,  0,  1,  1, 14,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1, 14, 73, 38, 12,100, 12, 27,101, 76, 12,
-    6,  6,  6,  6,  6,105,106, 64, 65, 27, 12,  1,  1,  1,  1,  1,
-   52,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,
-    0,  1,  1,  1,  0,  1,  1,  1,  0,  1,  1,  1,  0,  1, 14,  0,
-   30,182, 70,183, 50,  9, 48, 29,  0,  0,  0,  0, 73, 18,  3,  0,
-    1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1,  1,  1, 14,  1, 17,
-   12, 33,  0, 49, 10, 10, 10, 10, 10, 10,  0, 44,  3,  3,  3,  3,
-   16, 16,126, 10, 63,  3,  3,  3,  3,  3,  3,  3,  3, 10,  3, 29,
-    3,  3,  3,  3,  3,  3, 43,  0,133, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10,  0,  0, 10, 10,  0,  0,  0,  0, 17,  1,
-  128,  1,  1,  1,  1, 99,  0,  0,  1,  1,  1,  5,  5, 23,  0,  0,
-    1,  1,  1,  1,  1,  1,  1, 38,  1,  1,  0,  0,  1,  1,  1,  1,
-  184, 16, 16,  0,  0,  0,  0,  0,  7,  7,  7,  7,  6,  6,  6,  6,
-    7,  7,  0,  0,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  0,
-    1,  1,  0,  0,  0,  0,  0, 38,  7, 32,  7, 42,  6,  6,  6,  6,
-    6, 42,  6,  6,  6,  6,  6,  6,  6, 42,  6,  6,  6, 42, 47,  0,
-   13, 13, 13, 54, 13, 13, 13, 13, 61, 13, 13, 13, 13, 61,  0,  0,
-    1,  1,  1,  0, 14,  1,  1,  1,  1,  1,  1, 17, 14,  0, 14, 17,
-    1,  1,  1, 38, 10, 10, 10, 10,  1,  1,  1, 56, 75, 10, 10, 10,
-    0,  0,  0, 49, 10, 10, 10, 10,  1, 14,  1,  0,  0, 49, 10, 10,
-    1,  1,  1, 10, 10, 10,  0, 38,  1,  1,  1,  1,  1,  0,  0, 38,
-    1,  1,  1,  1,  0,  0, 10,  1, 24,  5, 26, 23,  0,  0,  5,  5,
-    1,  1, 17,  1, 17,  1,  1,  1,  1,  1,  1,  0,  5, 23,  0, 26,
-   12, 12, 12, 12, 33,  0,  0,  0,  1,  1,  1,  1,  1,  1, 86, 78,
-    1,  1,  1,  1, 82,  1,  1,  1,  1,  1, 24, 23,  0, 49, 10, 10,
-   12, 12, 12, 33,  0,  0,  0,  0,  1,  1,  1,  0, 38, 12, 12, 12,
-    1,  1,  1,  0, 10, 10, 10, 10,  1, 14,  0,  0, 10, 10, 10, 10,
-    1,  0,  0,  0, 38, 12, 33,  0,  0,  0,  0,  0, 49, 10, 10, 10,
-    7, 32,  0,  0,  0,  0,  0,  0,  6, 47,  0,  0,  0, 10, 10, 10,
-    1,  1,  5,  5,  0,  0,  0,  0, 11, 11, 11, 11, 11,  1,  1, 52,
-    7,  7,  7,  0, 26,  5,  5,130,  6,  6,  6,  0,  0,  0,  0,  9,
-   10, 10, 10, 10, 10, 10, 10, 51,  1,  1,  1,  1,  1, 26,185,  0,
-    0,  1, 45,  1,  0,  0,  0,  0, 57,  3,  3,  3, 29,  0,  0,  0,
-    0,  0,  0,  0,  0,  5,  5,  5, 10, 10, 10,112,  0,  0,  0,  0,
-  133, 10, 78, 12, 12,  0,  0,  0,  1,  5,  5, 12, 12,  0,  0,  0,
-    1,  1, 86, 10, 10, 10,  0,  0, 19, 46,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  5,  5,  5,  5,  5,  5,  5, 36, 12, 12, 12,  0,
-   10, 10, 10, 11, 11, 11, 11, 11, 25, 24, 25,  0,  0,  0,  0, 26,
-   15, 19,  5, 20, 19, 36,186, 12, 12, 23,  0,  0,  0,  0, 73,  0,
-    5, 25,  1,  1,  1,  1,  1,  1,  1,  1,  1, 24,  5,  5, 19,  5,
-    5,  5, 23, 11, 11, 11, 11, 11, 12, 12, 34, 46,  0,  0,  0,  0,
-    1, 24, 12, 14,  0,  0,  0,  0,  1, 34, 15,  5,  5,  5,  5, 20,
-   46,  1, 40, 12, 71,  5, 36, 19, 11, 11, 11, 11, 11, 40, 40, 12,
-   10, 10, 51,  0,  0,  0,  0,  0,  5, 15, 20,  5, 12, 12, 12, 25,
-   24,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1, 14, 14,  1,  1, 17,
-    1,  1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1, 40,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1, 24, 15, 19,  5,  5,  5, 23,  0,  0,
-    5, 15, 17,  1,  1,  1, 14, 17, 14,  1, 17,  1,  1, 26, 25, 15,
-   20, 15, 37, 35, 37, 35, 15,  0, 14,  0,  0, 35,  0,  0, 17,  1,
-    1, 15,  0,  5,  5,  5, 23,  0,  5,  5, 23,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 17,  0, 14,  1,  1,  1, 17, 15, 19,  5,  5,
-   23, 37, 35, 35, 15, 37, 15, 20, 25, 25, 12, 38, 33,  0,  0,  0,
-   26, 23,  0,  0,  0,  0,  0,  0,  1,  1, 34, 15,  5,  5,  5,  5,
-   15,  5, 20, 25,  1, 40, 12, 12, 11, 11, 11, 11, 11, 12, 38, 25,
-   15, 19,  5,  5, 20, 20, 15, 19, 20,  5,  1, 53,  0,  0,  0,  0,
-   15,  5,  5,  0, 15, 15,  5, 19, 36, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12,  1,  1,  5,  0, 15, 19,  5,  5,  5, 20, 19, 19,
-   36, 12, 14,  0,  0,  0,  0,  0, 12, 12, 12, 12, 12, 12, 33,  0,
-    1,  1,  1,  1,  1, 24, 19, 15,  5,  5,  5, 19, 40,  0,  0,  0,
-   11, 11,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1, 14, 26, 19,
-   15,  5,  5, 19,  5,  5,  0,  0, 11, 11, 11, 11, 11, 10, 12, 57,
-    5,  5,  5,  5, 19, 36,  0,  0, 10, 51,  0,  0,  0,  0,  0, 17,
-    1,  1,  1, 14, 17,  0,  1,  1,  1,  1, 17, 14,  1,  1,  1,  1,
-   15, 15, 15, 35, 37, 26, 20, 25, 46, 19, 12, 33,  0,  0,  0,  0,
-    1,  1,  1,  1,  0,  1,  1,  1, 34, 15,  5,  5,  0,  5, 15, 15,
-   25, 53, 37,  0,  0,  0,  0,  0, 24,  5,  5,  5,  5, 25,  1,  1,
-    1, 24,  5,  5, 20, 24,  5, 36, 12, 12, 12, 71,  0,  0,  0,  0,
-   24,  5,  5, 20, 19,  5,  1,  1,  1,  1,  1,  1,  1,  5,  5,  5,
-    5,  5,  5, 20,  5, 12, 53, 12, 12, 33,  0,  0,  0,  0,  0,  0,
-   12, 12, 12, 12, 12,  0,  0,  0, 20,  5, 20, 20,  0,  0,  0,  0,
-   40,  0,  0,  0,  0,  0,  0,  0,  5,  5,  5, 23,  5,  5,  5, 19,
-   40, 12, 12,  0,  0,  0,  0,  0, 12,  1,  1,  1,  1,  1,  1,  1,
-    0,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 35,  5,  5,  5,
-   20,  5, 19, 23,  0,  0,  0,  0,  1,  1,  1, 14,  1, 17,  1,  1,
-   24,  5,  5, 23,  0, 23,  5, 26,  5,  5,  5, 24,  0,  0,  0,  0,
-    1,  1,  1, 17, 14,  1,  1,  1,  1,  1,  1,  1,  1, 15, 15, 37,
-    5, 35, 19, 19, 14,  0,  0,  0,  1,  1,  1,  1, 45,  1,  0,  0,
-    1, 24, 20, 83, 33,  0,  0,  0,  5, 34,  1,  1,  1,  1,  1,  1,
-    1,  1, 15,  5,  5, 23,  0, 15, 20, 36, 12, 12, 12, 12, 12, 12,
-   11, 11, 11, 11, 11, 23,  0,  0, 10, 10, 63,  3,  3,  3, 70, 30,
-   97,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,  0,  0,  0,  0, 38,
-   16, 16, 16, 16, 16, 16, 16, 99, 12, 12, 33,  0,  0,  0,  0,  0,
-   40, 33,  0,  0,  0,  0,  0,  0, 25,  1,  1, 24,  5,  5,  5,  5,
-    5,  5,  5,  0,  0,  0,  0,  0,  5,  5,  5,  5,  5, 15, 19,  5,
-    5,  5, 36,  0,  0,  0,  0,  0,  5,  5,  5, 36, 12, 12,  3,  3,
-   13, 13, 57,  0,  0,  0,  0,  0, 11, 11, 11, 11, 11, 49, 10, 10,
-   10, 17,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0, 17,  1,
-   13, 52,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 45,132, 12,
-   10, 10, 10, 78, 12, 33,  0,  0,  7,  7,  7,  7, 32, 42,  6,  6,
-    6,  6,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1, 14,  0, 26,
-   34, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0,  0, 26,
-    5, 81, 13, 13, 13, 13, 13, 13, 13, 62, 23,  0,  0,  0,  0,  0,
-   15, 13, 16, 99,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,
-   13, 13, 54, 13, 13, 13, 54, 61,  0, 14,  0,  0,  0,  0,  0,  0,
-    1, 14, 17,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  0, 43, 36, 18, 18,  0,  0,  0,  0,  0,  0,
-   11, 11, 11, 11, 11,  3, 29,  0,  3,  3,  0,  0,  0,  3,  3,  3,
-   98,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3, 29, 44,  3,  3,  3,
-    3,  3,134, 19,  5,  3,134, 15, 15,187, 18, 18, 18, 91,  5,  5,
-    5, 55, 43,  5,  5,  5,  3,  3,  3,  3,  3,  3,  3,  5,  5,  3,
-    3,  5, 55,  0,  0,  0,  0,  0,  6,  6, 47,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6, 32,  7,  0, 32, 39, 32, 39,  7, 32,  7,
-    7,  7,  7,  6,  6, 42, 42,  6,  6,  6, 42,  6,  6,  6,  6,  6,
-    6,  6,  7, 39,  7, 32, 39,  7,  7,  7, 32,  7,  7,  7, 32,  6,
-    6,  6,  6,  6,  7, 39,  7, 32,  7,  7, 32, 32,  0,  7,  7,  7,
-   32,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  7,  7,  7,  7,
-   59,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6, 60,  6,  6,
-    6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 59,  6,  6,
-    6,  6, 60,  6,  6,  6,  7,  7,  7,  7, 59,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 60,  6,  6,  6,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7, 59,  6,  6,  6,  6, 60,  6,  6,  6,
-    7,  7,  7,  7, 59,  6,  6,  6,  6, 60,  6,  6,  6,  8,  0, 11,
-    5,  5,  5, 55,  3, 43,  5,  5,  5,  5,  5,  5,  5,  5, 55,  3,
-    3,  3, 43,  3,  3,  3,  3,  3,  3,  3, 55, 66, 12, 12,  0,  0,
-    0,  0,  0,  0,  0, 26,  5,  5,  6,  6,  6,  6,  6,124,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 47,  0,  0, 42,  6,  6, 47,  0,  0,
-    5,  5,  5, 23,  5,  5,  5,  5,  5,  5,  5,  5, 23, 26,  5,  5,
-    5, 26, 23,  5,  5, 23,  0,  0, 13, 13, 13, 13, 13, 13, 13,  0,
-    0,  0,  0,  0,  0,  0,  0, 26,  5,  5,  5, 81, 13, 13, 13,  0,
-   11, 11, 11, 11, 11,  0,  0, 56,  1,  1,  1,  1,  1,  1,  1, 23,
-    1,  1,  1,  1,  1,  1,  5,  5, 11, 11, 11, 11, 11,  0,  0,113,
-    1,  1,  1,  1,  1, 45,  5,  5,188, 11, 11, 11, 11,189,  0, 38,
-    1, 24,  1, 25,  1,  1,  1,  5,  1,  1, 24,  0,  0,  0,  0, 45,
-    1,  1,  1, 14,  1,  1, 17, 14,  1,  1, 14, 49, 10, 10, 10, 10,
-    6,  6,  5,  5,  5, 81,  0,  0, 10, 10, 10, 10, 10, 10, 75, 10,
-  190, 10, 51,  0,  0,  0,  0,  0, 10, 10, 10, 10, 10, 10, 10, 75,
-   10, 10, 10, 10, 10, 10, 10,  0,  1,  1, 17,  1,  1,  1,  1,  1,
-   17, 14, 14, 17, 17,  1,  1,  1,  1, 14,  1,  1, 17, 17,  0,  0,
-    0, 14,  0, 17, 17, 17, 17,  1, 17, 14, 14, 17, 17, 17, 17, 17,
-   17, 14, 14, 17,  1, 14,  1,  1,  1, 14,  1,  1, 17,  1, 14, 14,
-    1,  1,  1,  1,  1, 17,  1,  1, 17,  1, 17,  1,  1, 17,  1,  1,
-    9,  0,  0,  0,  0,  0,  0,  0, 10, 10, 10, 10, 10, 10, 63,  3,
-    0,  0,  0,  3,  3,  3,  3,  3,  3, 29,  0,  0,  0,  0,  0,  0,
-    3,  3,  3,  3,  3,108, 22, 22,  3,  3,  3,  3, 29,  0,  3,  3,
-    9,  9,  9,  9, 98,  0,  0,  0,  3,  3,  3,  3,  3, 29,  0,  3,
-    3,  3,  3, 29, 29,  0, 44,  3,  3,  3,  3,  3,  3,  3, 29, 44,
-    3,  3,  3,  3,  3, 29,  0, 44,  3, 29,  3,  3,  3,  3,  3,  3,
-   11, 11, 11, 11, 11, 29,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  2,  2,  0,  2,  2,  7,  7,  3,  3, 26, 26,
-    4,  4, 12, 12,  5,  5,  9,  9,  9,  5, 25, 25, 15, 15, 13, 13,
-   21, 21,  6,  6,  7,  2, 10, 10, 14, 14,  2,  7,  1,  1, 10, 12,
-   12, 10,  5,  9, 24, 24, 12,  2,  7, 12, 12,  7,  2, 12, 22, 18,
-    0,  0, 26,  2, 23, 23, 18, 22,  9,  2, 21,  2,  7, 10,  2, 10,
-   12, 21, 10,  2,  2, 21,  2,  9,  7, 21,  8,  8,  2,  5, 26, 12,
-    2, 26,  7,  6, 10,  7,  5,  2, 25, 26,  2, 15, 26, 25, 15,  2,
-    6,  7, 21,  7,  2,  6, 12, 26,  7, 26, 21, 26, 20, 19,  9, 25,
-    5, 25,  6,  2, 21,  6, 15, 26, 25, 22, 18, 21, 26, 21,  5,  7,
-    6, 24,  6,  5, 26, 23, 21, 12,  6, 12,  2,  1, 29, 29, 26, 15,
-   21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12,  6, 26,  7, 10, 21,
-   17, 17,  9, 26,  7, 15, 29, 21, 21,  9, 24,  5, 25,  9,  1, 12,
-   17, 21, 11, 12,  8, 24, 26,  9, 21, 22, 23, 26, 25,  2, 14,  2,
-   23, 21, 21, 25,  9, 22, 21, 18, 24, 16,  5, 22, 25, 18, 24, 26,
-   26, 24,  9,  8,  8,  5,  5, 21, 15,  7,  2, 23, 21, 15, 17,  7,
-   18,  2,  5,  6,  5, 24, 22, 20, 21, 20, 19, 21, 21, 16, 16, 21,
-    7,  5,  5, 26, 14, 15, 18, 25,  7, 14, 17, 22, 17,  6, 24,  6,
-    6, 21, 12, 15, 26, 10, 25,  0,  7, 20, 25,  1, 24, 15,  7, 19,
-    9, 21, 17,  2, 17, 12,  1, 21, 12,  1, 24,  7, 29,  7,  7, 22,
-   14,  7,  2, 24,  9, 24, 24,  2, 29,  1, 27, 28,  1, 29, 21, 29,
-    1,  2, 15,  6, 18,  6, 12, 11, 26,  5, 14,  9,  5, 14, 26, 22,
-   18, 26,  5, 12, 22, 21, 18, 17, 26,  6, 18, 18, 26, 14, 14,  6,
-   12, 24, 11, 21, 24,  9,  6,  9,  6, 10,  7, 25, 17, 16, 16, 22,
-   16, 16, 25, 17, 25, 24, 23,  2, 21, 14, 12, 17, 21,  1, 10,  1,
-    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
-   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
-    0,  0,  0,  0,  0,  0, 41, 42, 43, 44, 45,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 11, 12, 13, 14,  0,  0,  0,  0,  0,  0,  0,  0, 15,
-    0,  0,  0,  0,  0,  0,  0, 16, 17, 18,  0, 19,  0, 20, 21,  0,
-    0, 22, 23, 24, 25, 26,  0,  0,  0,  0, 27, 28, 29, 30,  0, 31,
-    0, 32, 33,  0,  2, 34,  0,  0,  2,  1, 35,  0,  2,  1,  0,  0,
-    2,  1,  0,  0,  2,  1,  0,  0,  0,  1,  0,  0,  2, 36,  0,  0,
-    2,  1,  0,  0, 37,  1,  0,  0,  0, 38,  0,  0, 39, 40,  0,  0,
-   41, 42,  0, 43, 44,  0, 45, 46,  0, 47,  0,  0, 48,  0,  0, 49,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 50,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 51,  4,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,
-   53,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0, 55,  0,  0, 56,  0,
-   57, 58, 59,  0, 60,  5, 61,  0, 62,  0, 63,  0, 64,  0,  0,  0,
-    0, 65, 66,  0,  0,  0,  0,  0,  0, 67, 68,  0,  0,  0,  0,  0,
-    0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 71,  0,  0,  0,  3,  0,  0,  0, 72,  0, 73,  0,  0, 74,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 76,
-    0,  0, 77,  0,  0,  0,  0,  0,  0,  0,  0,  6, 78,  0,  0,  0,
-    0,  5, 79,  0, 80, 81,  0,  0,  7,  8,  0,  0,  0,  0,  0,  0,
-   82, 83, 84,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
-    0,  0,  0, 85,  0,  0,  0,  0,  0,  0,  0,  0, 86,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,  0,  0,  0,  0,  0,
-    0,  0, 88,  0,  0,  0, 89,  0,  0,  0,  0, 90, 91,  0,  0,  0,
-    0,  0, 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 93,  0, 94,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   95,  0, 96,  0,  0, 97,  0, 98,  0,  0,  0,  0,  0,  6, 99,  0,
-    9,  0,  0,100,101,  0,  7,  0,  0,102,  0,  0,103,  0,  0,  0,
-    0,  0,104,  0,105,  1,106,  0,  0,107,  0,  0,  0,108,  0,  0,
-    0,109,  0,  0,  0,  0,  0,  0,  3,110,  0,  0,  3,  0,  0,  0,
-  111,  0,  0,  0,112,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
-    0,  0,  0,  0,113,114,  0,  0,  0,  0,  8,  0,  4,115,  0,116,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-    0,  0,  0,  0,  0,117,  0,118,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,121,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122,  0,  0,  0,  0,123,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,124,125,126,  0,  0,  0,  0,127,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,  0,  0,130,
-    0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  131,  0,132,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,133,  0,  0,  0,  0,  0,  0,  0,134,  0,  0,  0,  0,  0,
-    0,  0,135,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,136,  0,  0,  0,137,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,
-    0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  3,  0,  0,  0,  3,
-    0,  0,  0,  0,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 15,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 31,  0,  0,  0,  0,  0,  1, 12,  0,  0,  1,  1,
-    1,  1,  1, 49, 50,  5, 51, 52, 53,  5,  5, 22, 32, 23,  1, 54,
-   24, 55, 16, 33, 56, 57, 58,  1,  1,  1,  0,  0,  0,  0,  6,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 59,  7, 60,  1, 34,  5,
-    7, 61, 62, 63, 64, 65, 66, 67,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  1,  1, 68,  0,  0,  0, 69, 70, 71, 35,  1, 25,  0,  0,
-    0,  0, 72,  0,  0,  0,  0,  0,  0,  0,  0,  8,  1, 26, 16, 26,
-   73, 27,  0,  0,  0,  0,  0,  0,  0,  0, 74,  0,  0,  0,  0,  0,
-    0,  0, 36, 25, 75, 37,  7, 37, 76,  0,  0,  0,  0,  0,  0,  0,
-    6,  1,  7,  0,  0, 17,  0,  0,  0,  0,  0,  8, 38,  1,  1, 13,
-   13, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39,  0,  0,  0,
-    0,  0,  0,  6, 18,  1,  0,  0,  8, 16,  5,  1,  1,  1, 77,  7,
-   36, 18, 78,  7, 35,  1,  0,  0,  0,  4, 79, 10,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 19,  0,  0,  0,  4,  0, 80,  0,  0,  0,  0,
-    0,  0,  0,  0,  2,  3,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 81,  0,  0,  0, 82,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 83,  0,  0,  0, 84,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0, 85, 86,  0,  0,  0,
-    0,  0, 87, 88, 89, 90, 91, 92,  0,  0,  0,  0,  0,  0,  0, 93,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 28,  0,  0,  0,
-    0, 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  0,  0,
-    0,  0,  0, 41,  0,  0,  0,  0,  0,  0, 14,  0,  0, 20,  0,  0,
-   94,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  0,  0,  0,
-    0,  0,  0,  6, 29,  0,  3,  0,  0,  0,  0, 13,  1, 96,  0,  0,
-    0,  0,  1, 18, 33, 97, 25, 23,  7,  1,  1,  1,  1, 27,  1,  7,
-   98,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,
-    6, 23,  1,  0,  0,  0,  0,  0, 30,  0,  0,  0,  0,  0,  0, 21,
-    0,  0, 30,  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,  0,
-    0,  0, 12, 32, 24,  5, 99, 22, 42, 17,  0, 10, 11,  0,  7,  1,
-    7,100,101,  1,  1,  1,  1,  1,  1,  1,  1,102,103,104,  0,  0,
-    0,  0,105,  1,106, 10, 20,107,108,  5, 10,  0,  0,  0,  0,  0,
-    0,  6, 11,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,
-  109,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,  0,  0,  0,
-    0,  6,  0,  1,  1, 11,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,
-    0,  0, 11,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  1,  1,
-    1,  1, 11,  0,  0,  0,  0,  0, 43, 40,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  0,  0,  0,  0,  0,  0,  0, 44,112, 10,  8, 20,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 14,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,113,  1, 16,  5, 24,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 17, 29,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  8, 12,  0,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,115,  2,  0,116,  0,  0,  0,  0,  0,  0,  0,  1,
-    0,  0,  0,  0,  0,  0,  0,  0, 13, 11,  0,  0,  0,  0,  0,  0,
-    6, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 45, 39,  0, 45,
-   16, 18, 29,  0,  0,  0, 46, 27,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  3,  0,  0,  2, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  3,  0,  0,  3,  0, 21,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 31,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 15,  9,  0,  8,  1, 10,  1, 10,  0,  0,  0,  0,
-    0, 30,  3,  0,  0,  0, 14, 21,  0,  0,  0,  0,  0, 19, 47,  0,
-    0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 47,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 28, 15,  0,  0,  0,  0,  0,  0,  0,  0,  2,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0, 21, 41,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0, 28,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,
-    0,  0, 22, 42,  0,  0,  0,  0,  0,  0,118,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,119,  0,120,121,122,123,  0, 43,  5, 48, 13,
-   34,  0,  0,  0,  0,  0,  0,  0,  8, 11,  0,  0,  0,  0,  8, 10,
-    0,  0,  0,  0,  0,  0,  1, 12,  1,  1,  1,  1, 26,  1, 38, 44,
-   12,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,
-    0, 19,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,
-    0,124,  0,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0,  0,  6, 19,
-    0,  8,  0, 20,  0,  0,  0,  0,  0,  0,  5, 48,  0,  0,  0,  1,
-  125,  0,  0,  0,  0,  0,230,230,230,230,  0,  0,  0,  9,  9,  0,
-    0,  0,  0,  9,  0,  0,220,220,220,220,  0,  0,  0,230,230,230,
-  220,230,  0,  0,230,230,  7,  0,  0,  0,230,  0,  0,  0,230,230,
-    0,  0,230,230,230,  0,  0,230,230,230,  0,  0,  9,  0,  0,  0,
-    0,  7,230,230,230,220,  0,220,  0,  0,230,220,220,220,  0,  0,
-  230,  0,  0,230,  0,  0,  0,  0,  7,  0,  1,  1,  1,  1,220,230,
-  230,230,220,220,230,230,220,230,230,220,230,  0,  0,230,230,220,
-    0,  0,  0,  9,  9,  0,220,  0,  0,  0,  0,  0,  9,  9,  0,  9,
-    7,  0,  1,220,220,220,220,220,220,230,230,230,220,220,230,220,
-  220,230,230,220,230,230,220,230,220,230,230,230,  0,230,  0,220,
-  220,220,220,220,  0,  0,  9,  9,  0,  0,  1,  0,  0,  0,  0,  0,
-    0,220,230,  0,230,230,  0,  0,220,220,  0,  0,230,220,  0,  0,
-    9,  7,220,220,220,  0,230,232,220,220,220,220,232,216,220,202,
-  202,220,220,220,220,202,202,220,220,220,230,240,230,220,230,220,
-  220,  0,232,220,220,230,233,234,234,233,234,234,233,230,  0,220,
-  230,230,230,230,222,220,230,222,228,230, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,
-    0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33,
-   34,230, 35,  0,  0,  0,230,  0,220,230,  0, 36,  0,  0,220,220,
-  230,220,220,230,230,  0,230,230,  0,220, 27, 28, 29,230,  0,230,
-  220,230,  0, 84, 91,  0,103,103,  9,  0,107,107,107,107,118,118,
-    9,  0,122,122,122,122,  0,220,  0,220,  0,216,  0,  0,  0,129,
-  130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,130,  0,
-  230,230,  9,  0,230,230,  0,  0,220,  0,  0,228,  0,  0,  0,222,
-  230,220,230,  0,  0,220,230,220,  0,220,230,230,230,234,230,  0,
-    1,  1,230,234,214,220,202,230,230,230,230,230,232,228,228,220,
-  218,230,233,220,230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,
-    1,230,220,230,  1,  1,  0,  0,218,228,232,222,224,224,  0,  8,
-    8,  0,220,  0,  0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,
-  220,  0,  0,230,220,  0,  0,  7,  9,  0,  6,  6,  0,  0,  0,  0,
-    1,  0,  0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,
-  216,  0,232,232,220,230,230,230,  7,  0,  1,  0,  0,  0,  0,  0,
-    0, 32,  0,  0,  0,  3,  0,  0,  0,  0,  4,101,  0,112,128,169,
-    0, 11, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,237,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  2,  1,  1,  0,  3,  0,  0,  0,  4,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  6,  7,  8,  9,  0,
-    0,  0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 20,  0,  0, 21, 22,  0,  0,  0,  0, 23, 24,
-   25, 26,  0, 27,  0, 28, 29, 30, 31, 32,  0,  0,  0,  0,  0,  0,
-    0, 33, 34, 35, 36,  0,  0,  0,  0,  0, 37,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38, 39,  0,  0,  0,  0,  2,  1, 40, 41,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 36,  0,  0,
-    8,  0,  0,  0,  0, 44,  0,  0, 52,  0,  0,  0, 56,  0,  0,  0,
-    0,  0,  0,  0, 16,  8,  0,  0,  0,  0,  0,  0, 24, 48,  0,  0,
-    0,  0,  0,  0, 28,  0,  0, 28,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,  0,  0,  0,
-   60, 64,  0, 68,  0, 72, 76, 80,  0,  0,  0,  0,  0,  8, 84, 88,
-    0, 92, 16,  8,  0,  0,  0,  4,  4, 16,  4,  4,  4,  4,  4,  4,
-    4, 24, 20,  0, 96,  0, 16,100,104,  0,  4,  4,108,  0,  0,  0,
-   40,112,  8, 16,  4,  4,  4,  4,  4,  8,116,120,124,128,  0,  0,
-    4,  0,  0,  0,  0,  0,  0,  0, 28,  0,  0,  0,  0,  0,  0,  0,
-    4,  4,  4,  8,  0,  0, 24, 20,132, 36,  0, 28,  0,136, 16,  4,
-    4,  4,  0,  0,  0,  0, 24, 12, 12,140,144, 12,148,  0,152,  8,
-    4,  4,  0,  0,156,  0,  8,  8,  0, 24, 20,  8,  4,  0,  0,  0,
-    8,  0,  0,160,  8,  8,  0,  0, 24, 20,  0,  8,  0,  8,  0,  8,
-    0,  0,  0,  0, 40, 12, 12, 12, 12, 12, 12, 12, 12, 12, 20, 16,
-    4,164, 12, 12, 12, 12, 12, 12, 12, 12, 12, 20,  0,168,172,176,
-    0,180,  0, 24, 20,  0,  0,  0,  0,  0,  0,  0,  0,184, 16,  8,
-   28,  8,  0,  0,  0,  8,  4,  4,  8,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 40, 12, 48,  0,  0,  4,  4,  8,  4,  4,  0,  0,  0,
-    0,  0,  0,  0, 40, 20,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 32,188,192,  0,  0,  0,  0,  0,  0,  0,  4,  5,
-    6,  7,  8,  9, 10,  1,  1, 11,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1, 12, 13,  2,  2,  2,  2, 14,  0,  0,  0,  0, 15, 16, 17,
-   18, 19, 20, 21, 22, 23, 24,  0,  0,  0, 25, 26,  3,  3,  3, 27,
-    0,  0,  0, 28, 29, 30,  0, 31, 32, 33, 34, 35, 36, 37,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1, 38,  1,  1, 39,  1, 40,  1,  1,  1, 41,  0, 42,  1,  1,
-   43,  1,  1,  1, 44,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 45,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3, 20,
-   21,  8,  8,  8, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
-   34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-   50,  2,  2, 51, 52, 53, 54,  9,  9,  9,  9,  9, 55, 56, 57, 58,
-   59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,  8,  8, 70, 71, 72,
-   73, 74, 75,  5,  5,  5,  5, 76,  5,  5,  5,  5,  5,  5,  5, 15,
-   15,  5,  5,  5,  5, 77,  5, 78, 79, 80, 81, 82, 83,  1, 84, 85,
-   86, 87, 88, 89, 90, 91,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 92,  1,  1,  1,  1,  6,
-    6,  6,  6,  6,  6,  6,  6,  6, 93, 16, 16, 94, 95, 96, 97, 98,
-   99,100,101,102,103,104,105,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,106,  0,
-    0,  1,  1,107,108,109, 13, 13, 13,110,111,112,113,114,115,116,
-  117,118,119,  0,120,121,122,123,124,125,126, 17, 17,127,128,129,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   28, 26, 29, 30, 31, 32, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 33, 34, 34, 34, 34,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+   26, 56, 57, 58, 58, 58, 58, 59, 26, 26, 60, 26, 26, 26, 26, 26,
+   26, 61, 26, 62, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   63, 58, 58, 58, 26, 64, 65, 66, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 67, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 68, 69, 70, 58, 58, 58, 58, 71, 58,
+   58, 58, 58, 58, 58, 58, 72, 73, 74, 75, 76, 77, 78, 79, 58, 80,
+   81, 82, 83, 84, 85, 58, 86, 87, 88, 89, 78, 90, 91, 92, 58, 58,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 93, 26, 26, 26, 26, 26, 26, 26, 26, 94, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 95, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 96, 26, 97, 58, 58, 58, 58, 26, 98, 58, 58,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 99, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26,100, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+  101, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,102,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,103,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
+    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
+   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
+   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
+   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
+   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
+   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
+   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 43, 44, 16, 10,
+   43, 43, 40, 45, 11, 46, 46, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 47, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 48, 34, 32, 34, 11,
+   32, 49, 42, 42, 50, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   47, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 46, 51,  2,  2,  2,
+   16, 16, 16, 16, 52, 53, 54, 55, 56, 42, 42, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 57, 58, 59, 42, 58, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 61,
+   36, 62, 63, 43, 43, 43, 43, 43, 64, 64, 64,  8,  9, 65,  2, 66,
+   42, 42, 42, 42, 42, 59, 67,  2, 68, 36, 36, 36, 36, 69, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 70, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 71, 42, 42, 42, 72, 49, 42, 42, 73, 74, 75, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 76, 77,  2,  2,  2,  2,  2,  2,  2, 78,
+   69, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 79, 61, 36,
+   36, 36, 36, 42, 42, 42, 42, 42, 70, 43, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42,
+   42, 42, 39, 21,  2, 80, 56, 20, 36, 36, 36, 42, 42, 74, 42, 42,
+   42, 42, 74, 42, 74, 42, 42, 43,  2,  2,  2,  2,  2,  2,  2, 63,
+   36, 36, 36, 36, 69, 42, 43, 63, 36, 36, 36, 36, 36, 60, 43, 43,
+   36, 36, 36, 36, 81, 36, 36, 36, 64, 43, 43, 56, 42, 42, 42, 42,
+   36, 36, 36, 36, 82, 42, 42, 42, 42, 83, 42, 42, 42, 42, 42, 42,
+   42, 84, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 84, 70, 85,
+   86, 42, 42, 42, 84, 85, 86, 85, 69, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 87, 36, 36, 36, 36, 36, 36, 36,
+   69, 85, 61, 36, 36, 36, 60, 61, 60, 61, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 36, 36, 36, 60, 60, 43, 36, 36, 43, 70, 85,
+   86, 42, 79, 88, 89, 88, 86, 60, 43, 43, 43, 88, 43, 43, 36, 61,
+   36, 42, 43,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 55, 62, 79,
+   56, 84, 61, 36, 36, 60, 43, 61, 60, 36, 61, 60, 36, 43, 79, 85,
+   86, 79, 43, 56, 79, 56, 42, 43, 56, 43, 43, 43, 61, 36, 60, 60,
+   43, 43, 43,  7,  7,  7,  7,  7, 42, 36, 69, 63, 43, 43, 43, 43,
+   56, 84, 61, 36, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36,
+   60, 36, 61, 36, 36, 43, 70, 85, 86, 42, 42, 56, 84, 88, 86, 43,
+   60, 43, 43, 43, 43, 43, 43, 43, 65, 43, 43, 43, 61, 42, 42, 42,
+   56, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 43, 70, 86,
+   86, 42, 79, 88, 89, 88, 86, 43, 43, 43, 56, 84, 43, 43, 36, 61,
+   77, 27, 27, 27, 43, 43, 43, 43, 43, 70, 61, 36, 36, 60, 43, 36,
+   60, 36, 36, 43, 61, 60, 60, 36, 43, 61, 60, 43, 36, 60, 43, 36,
+   36, 36, 36, 36, 36, 43, 43, 85, 84, 89, 43, 85, 89, 85, 86, 43,
+   60, 43, 43, 88, 43, 43, 43, 43, 27, 90, 66, 66, 55, 91, 43, 43,
+   84, 85, 70, 36, 36, 36, 60, 36, 60, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 43, 70, 42, 84, 85, 89, 42, 79, 42, 42, 43,
+   43, 43, 56, 79, 36, 60, 36, 43, 43, 43, 43, 92, 27, 27, 27, 90,
+   69, 85, 71, 36, 36, 36, 60, 36, 36, 36, 61, 36, 36, 43, 70, 86,
+   85, 85, 89, 84, 89, 85, 42, 43, 43, 43, 88, 89, 43, 43, 36, 60,
+   61, 93, 43, 43, 43, 43, 43, 43, 42, 85, 36, 36, 36, 36, 60, 36,
+   36, 36, 36, 36, 36, 69, 70, 85, 86, 42, 79, 85, 89, 85, 86, 76,
+   43, 43, 36, 93, 27, 27, 27, 94, 27, 27, 27, 27, 90, 36, 36, 36,
+   56, 85, 61, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 36, 36, 36,
+   36, 61, 36, 36, 36, 36, 61, 43, 36, 36, 36, 60, 43, 79, 43, 88,
+   85, 42, 79, 79, 85, 85, 85, 85, 43, 85, 63, 43, 43, 43, 43, 43,
+   61, 36, 36, 36, 36, 36, 36, 36, 69, 36, 42, 42, 42, 79, 43, 95,
+   36, 36, 36, 74, 42, 42, 42, 59,  7,  7,  7,  7,  7,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 61, 60, 60, 36, 36, 60, 36, 36,
+   36, 36, 61, 61, 36, 36, 36, 36, 69, 36, 42, 42, 42, 42, 70, 43,
+   36, 36, 60, 80, 42, 42, 42, 79,  7,  7,  7,  7,  7, 43, 36, 36,
+   76, 66,  2,  2,  2,  2,  2,  2,  2, 96, 96, 66, 42, 66, 66, 66,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 49, 49, 49,  4,  4, 85,
+   36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43,
+   56, 42, 42, 42, 42, 42, 42, 84, 42, 42, 59, 42, 36, 36, 69, 42,
+   42, 42, 42, 42, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 79, 66,
+   66, 66, 66, 75, 66, 66, 91, 66,  2,  2, 96, 66, 21, 63, 43, 43,
+   36, 36, 36, 36, 36, 93, 86, 42, 84, 42, 42, 42, 86, 84, 86, 70,
+    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 85, 42, 36, 36, 42,
+   70, 85, 97, 93, 85, 85, 85, 36, 69, 42, 70, 36, 36, 36, 36, 36,
+   36, 84, 86, 84, 85, 85, 86, 93,  7,  7,  7,  7,  7, 85, 86, 66,
+   11, 11, 11, 47, 43, 43, 47, 43, 16, 16, 16, 16, 16, 52, 44, 16,
+   36, 36, 36, 36, 60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43,
+   60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43, 36, 36, 36, 36,
+   36, 36, 36, 60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 56, 42,
+    2,  2,  2,  2, 98, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43,
+   66, 66, 66, 66, 66, 43, 43, 43, 11, 11, 11, 43, 16, 16, 16, 43,
+  100, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 71,
+  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,102,103, 43,
+   36, 36, 36, 36, 36, 62,  2,104,105, 36, 36, 36, 60, 43, 43, 43,
+   36, 42, 84, 43, 43, 43, 43, 61, 36, 42,106, 63, 43, 43, 43, 43,
+   36, 42, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 60, 36,
+   60, 42, 43, 43, 43, 43, 43, 43, 36, 36, 42, 86, 42, 42, 42, 85,
+   85, 85, 85, 84, 86, 42, 42, 42, 42, 42,  2, 87,  2, 65, 69, 43,
+    7,  7,  7,  7,  7, 43, 43, 43, 27, 27, 27, 27, 27, 43, 43, 43,
+    2,  2,  2,107,  2, 58, 42, 83, 36, 82, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 43, 43, 43, 36, 36, 69, 70, 36, 36, 36, 36,
+   36, 36, 36, 36, 69, 60, 43, 43, 36, 36, 36, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 60, 42, 84, 85, 86, 84, 85, 43, 43,
+   85, 84, 85, 85, 86, 42, 43, 43, 91, 43,  2,  7,  7,  7,  7,  7,
+   36, 36, 36, 36, 36, 36, 36, 43, 36, 36, 60, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 43, 43, 36, 36, 36, 36, 36, 43, 43, 43,
+    7,  7,  7,  7,  7, 99, 43, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+   36, 36, 36, 69, 84, 86, 43,  2, 36, 36, 93, 84, 42, 42, 42, 79,
+   84, 84, 86, 42, 42, 42, 84, 85, 85, 86, 42, 42, 42, 42, 79, 56,
+    2,  2,  2, 87,  2,  2,  2, 43, 42, 42, 42, 42, 42, 42, 42,108,
+   42, 42, 42, 42, 42, 42, 42, 43, 42, 42, 42, 42, 42, 42, 43, 43,
+   42, 42, 97, 36, 36, 36, 36, 36, 36, 36, 84, 42, 42, 84, 84, 85,
+   85, 84, 97, 36, 36, 36, 60,  2, 96, 66, 66, 66, 66, 49, 42, 42,
+   42, 42, 66, 66, 66, 66, 21,  2, 42, 97, 36, 36, 36, 36, 36, 36,
+   93, 42, 42, 85, 42, 86, 42, 36, 36, 36, 36, 84, 42, 85, 86, 86,
+   42, 85, 43, 43, 43, 43,  2,  2, 36, 36, 85, 85, 85, 85, 42, 42,
+   42, 42, 85, 42, 43, 92,  2,  2,  7,  7,  7,  7,  7, 43, 61, 36,
+   36, 36, 36, 36, 39, 39, 39,  2, 16, 16, 16, 16, 34,109, 43, 43,
+   11, 11, 11, 11, 11, 46, 47, 11,  2,  2,  2,  2, 43, 43, 43, 43,
+   42, 59, 42, 42, 42, 42, 42, 42, 84, 42, 42, 42, 70, 36, 69, 36,
+   36, 36, 70, 93, 42, 60, 43, 43, 16, 16, 16, 16, 16, 16, 39, 39,
+   39, 39, 39, 39, 39, 44, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16,
+   16, 16, 16, 16, 16,110, 39, 39, 32, 32, 32, 16, 16, 16, 16, 32,
+   16, 16, 16, 16, 11, 11, 11, 11, 16, 16, 16, 43, 11, 11, 11, 43,
+   16, 16, 16, 16, 47, 47, 47, 47, 16, 16, 16, 16, 16, 16, 16, 43,
+   16, 16, 16, 16,111,111,111,111, 16, 16,109, 16, 11, 11,112,113,
+   40, 16,109, 16, 11, 11,112, 40, 16, 16, 43, 16, 11, 11,114, 40,
+   16, 16, 16, 16, 11, 11,115, 40, 43, 16,109, 16, 11, 11,112,116,
+  117,117,117,117,117,118, 64, 64,119,119,119,  2,120,121,120,121,
+    2,  2,  2,  2,122, 64, 64,123,  2,  2,  2,  2,124,125,  2,126,
+  127,  2,128,129,  2,  2,  2,  2,  2,  9,127,  2,  2,  2,  2,130,
+   64, 64,131, 64, 64, 64, 64, 64,132, 43, 27, 27, 27,  8,128,133,
+   27, 27, 27, 27, 27,  8,128,103, 39, 39, 39, 39, 39, 39, 80, 43,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43, 43,
+   42, 42, 42, 42, 42, 42,134, 50,108, 50,108, 42, 42, 42, 42, 42,
+   79, 43, 43, 43, 43, 43, 43, 43, 66,135, 66,136, 66, 34, 11, 16,
+   11, 32,136, 66, 48, 11, 11, 66, 66, 66,135,135,135, 11, 11,137,
+   11, 11, 35, 36,138, 66, 16, 11,  8,  8, 48, 16, 16, 26, 66,139,
+   27, 27, 27, 27, 27, 27, 27, 27,104,104,104,104,104,104,104,104,
+  104,140,141,104,142, 66, 43, 43,  8,  8,143, 66, 66,  8, 66, 66,
+  143, 26, 66,143, 66, 66, 66,143, 66, 66, 66, 66, 66, 66, 66,  8,
+   66,143,143, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8, 66, 66, 66, 66,  4,  4, 66, 66,
+    8, 66, 66, 66,144,145, 66, 66, 66, 66, 66, 66, 66, 66,143, 66,
+   66, 66, 66, 66, 66, 26,  8,  8,  8,  8, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 66,  8,  8,  8, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 91, 43, 43, 27, 27, 27, 27, 27, 27, 66, 66,
+   66, 66, 66, 66, 66, 27, 27, 27, 66, 66, 66, 26, 66, 66, 66, 66,
+   26, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,
+   66, 66, 66, 66, 66, 66, 66, 26, 66, 66, 66, 66,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66,
+    8,  8,128,146,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,128,147,147,147,147,147,147,147,147,147,147,146,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,143, 26,  8,  8,143, 66, 66, 66, 43, 66, 66, 66, 66, 66,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 39, 11,
+   32, 32,139, 66, 66,136, 34,148, 42, 32, 43, 43, 92,  2, 98,  2,
+   16, 16, 16,149, 43, 43,149, 43, 36, 36, 36, 36, 43, 43, 43, 51,
+   63, 43, 43, 43, 43, 43, 43, 56, 36, 36, 36, 60, 43, 43, 43, 43,
+   36, 36, 36, 60, 36, 36, 36, 60,  2,120,120,  2,124,125,120,  2,
+    2,  2,  2,  6,  2,107,120,  2,120,  4,  4,  4,  4,  2,  2, 87,
+    2,  2,  2,  2,  2,119,  2,  2,107,150,  2,  2,  2,  2,  2,  2,
+   66,  2,151,147,147,147,152, 43, 66, 66, 66, 66, 66, 54, 66, 66,
+   66, 66, 43, 43, 43, 43, 43, 43, 66, 66, 66, 43, 43, 43, 43, 43,
+    1,  2,153,154,  4,  4,  4,  4,  4, 66,  4,  4,  4,  4,155,156,
+  157,104,104,104,104, 42, 42, 85,158, 39, 39, 66,104,159, 62, 66,
+   36, 36, 36, 60, 56,160,161, 68, 36, 36, 36, 36, 36, 62, 39, 68,
+   43, 43, 61, 36, 36, 36, 36, 36, 66, 27, 27, 66, 66, 66, 66, 66,
+   66, 66, 66, 43, 43, 43, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91,
+   27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27,
+  162, 27, 27, 27, 27, 27, 27, 27, 36, 36, 82, 36, 36, 36, 36, 36,
+   66, 66, 66, 91, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36,163,  2,
+    7,  7,  7,  7,  7, 36, 43, 43, 32, 32, 32, 32, 32, 32, 32, 69,
+   50,164, 42, 42, 42, 42, 42, 87, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36,104,104,104,104,104, 42,  2,  2,  2, 43, 43, 43, 43,
+   40, 40, 40,161, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,165, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 46, 43,
+   51, 39,166, 35, 39, 35, 36, 36, 36, 70, 36, 70, 36, 69, 36, 36,
+   36, 93, 86, 84, 66, 66, 79, 43, 27, 27, 27, 66,167, 43, 43, 43,
+   36, 36,  2,  2, 43, 43, 43, 43, 85, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 85, 85, 85, 85, 85, 85, 85, 42, 43, 43, 43, 43,  2,
+   42, 36, 36, 36,  2, 71, 71, 69, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 69, 42, 42, 42, 42, 42, 85, 43, 43, 43, 43, 43, 92,
+   36, 69, 85, 42, 42, 85, 42, 85,106,  2,  2,  2,  2,  2,  2, 51,
+    7,  7,  7,  7,  7, 43, 43,  2, 36, 36, 69, 68, 36, 36, 36, 36,
+    7,  7,  7,  7,  7, 36, 36, 60, 36, 36, 36, 36, 69, 42, 42, 84,
+   86, 84, 86, 79, 43, 43, 43, 43, 36, 69, 36, 36, 36, 36, 84, 43,
+    7,  7,  7,  7,  7, 43,  2,  2, 68, 36, 36, 76, 66, 93, 84, 36,
+   70, 42, 70, 69, 70, 36, 36, 42, 69, 60, 43, 43, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 61, 82,  2, 36, 36, 36, 36, 36, 93, 42, 85,
+    2, 82,168, 79, 43, 43, 43, 43, 61, 36, 36, 60, 61, 36, 36, 60,
+   61, 36, 36, 60, 43, 43, 43, 43, 16, 16, 16, 16, 16,113, 39, 39,
+   16, 16, 16, 16,110, 40, 43, 43, 36, 93, 86, 85, 84,106, 86, 43,
+   36, 36, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 43, 61, 36, 36,
+  169,169,169,169,169,169,169,169,170,170,170,170,170,170,170,170,
+   16, 16, 16,109, 43, 43, 43, 43, 43,149, 16, 16, 43, 43, 61, 70,
+   36, 36, 36, 36,171, 36, 36, 36, 36, 36, 36, 60, 36, 36, 60, 60,
+   36, 61, 60, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40,
+   40, 22, 66, 66, 66, 66, 66, 66, 66, 77, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,147, 66, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 66, 66, 66, 66, 36, 36, 36, 36, 36, 36,167, 66,
+    2,  2,  2,151,129, 43, 43, 43,  6,172,173,147,147,147,147,147,
+  147,147,129,151,129,  2,126,174,  2, 63,  2,  2,155,147,147,129,
+    2,175,  8,176, 65,  2, 43, 43, 36, 36, 60, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 60, 78, 92,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,128,129,  4,  2, 36, 36, 36, 36, 36,
+   68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 60, 43,
+   20,177, 55,178, 26,  8,143, 91, 43, 43, 43, 43, 78, 64, 66, 43,
+   36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 60, 36, 61,
+    2, 63, 43,179, 27, 27, 27, 27, 27, 27, 43, 54, 66, 66, 66, 66,
+  104,104,142, 27, 90, 66, 66, 66, 66, 66, 66, 66, 66, 27, 66, 91,
+   66, 66, 66, 66, 66, 66, 91, 43, 91, 43, 43, 43, 43, 43, 43, 43,
+   66, 66, 66, 66, 66, 66, 49, 43,180, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27, 27, 27, 27, 43, 43, 27, 27, 43, 43, 43, 43, 61, 36,
+  154, 36, 36, 36, 36,181, 43, 43, 36, 36, 36, 42, 42, 79, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 92, 36, 36, 43, 43, 36, 36, 36, 36,
+  182,104,104, 43, 43, 43, 43, 43, 11, 11, 11, 11, 16, 16, 16, 16,
+   11, 11, 43, 43, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 43, 43,
+   36, 36, 36, 36, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43, 43, 92,
+   11, 11, 11, 11, 11, 46, 11, 11, 11, 46, 11,149, 16, 16, 16, 16,
+   16,149, 16, 16, 16, 16, 16, 16, 16,149, 16, 16, 16,149,109, 43,
+   39, 39, 39, 51, 39, 39, 39, 39, 80, 39, 39, 39, 39, 80, 43, 43,
+   36, 36, 36, 43, 60, 36, 36, 36, 36, 36, 36, 61, 60, 43, 60, 61,
+   36, 36, 36, 92, 27, 27, 27, 27, 36, 36, 36, 76,162, 27, 27, 27,
+   43, 43, 43,179, 27, 27, 27, 27, 36, 60, 36, 43, 43,179, 27, 27,
+   36, 36, 36, 27, 27, 27, 43, 92, 36, 36, 36, 36, 36, 43, 43, 92,
+   36, 36, 36, 36, 43, 43, 27, 36, 43, 27, 27, 27, 27, 27, 27, 27,
+   69, 42, 56, 79, 43, 43, 42, 42, 36, 36, 61, 36, 61, 36, 36, 36,
+   36, 36, 36, 43, 42, 79, 43, 56, 27, 27, 27, 27, 99, 43, 43, 43,
+    2,  2,  2,  2, 63, 43, 43, 43, 36, 36, 36, 36, 36, 36,183, 30,
+   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 77, 36, 36, 36,
+   36, 36, 69, 79, 43,179, 27, 27,  2,  2,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 43, 92,  2,  2,  2, 36, 36, 36, 43, 27, 27, 27, 27,
+   36, 60, 43, 43, 27, 27, 27, 27, 36, 43, 43, 43, 92,  2, 63, 43,
+   43, 43, 43, 43,179, 27, 27, 27, 11, 46, 43, 43, 43, 43, 43, 43,
+   16,109, 43, 43, 43, 27, 27, 27, 36, 36, 42, 42, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 68, 11, 11, 11, 43, 56, 42, 42,158,
+   16, 16, 16, 43, 43, 43, 43,  8, 27, 27, 27, 27, 27, 27, 27, 99,
+   36, 36, 36, 36, 36, 56,184, 43, 36, 43, 43, 43, 43, 43, 43, 43,
+   43, 36, 82, 36, 43, 43, 43, 43, 96, 66, 66, 66, 91, 43, 43, 43,
+   43, 43, 43, 43, 43, 42, 42, 42, 27, 27, 27, 94, 43, 43, 43, 43,
+  180, 27, 30,  2,  2, 43, 43, 43, 36, 42, 42,  2,  2, 43, 43, 43,
+   36, 36,183, 27, 27, 27, 43, 43, 86, 97, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 42, 59,  2,  2,  2, 43,
+   27, 27, 27,  7,  7,  7,  7,  7, 70, 69, 70, 43, 43, 43, 43, 56,
+   85, 86, 42, 84, 86, 59,185,  2,  2, 79, 43, 43, 43, 43, 78, 43,
+   42, 70, 36, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42, 86, 42,
+   42, 42, 79,  7,  7,  7,  7,  7,  2,  2, 93, 97, 43, 43, 43, 43,
+   36, 69,  2, 60, 43, 43, 43, 43, 36, 93, 85, 42, 42, 42, 42, 84,
+   97, 36, 62,  2, 58, 42, 59, 86,  7,  7,  7,  7,  7, 62, 62,  2,
+  179, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 85, 86, 42, 85, 84, 42,  2,  2,  2, 70,
+   69, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 60, 36, 36, 61,
+   36, 36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 62, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 69, 85, 86, 42, 42, 42, 79, 43, 43,
+   42, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 56, 70, 85,
+   84, 85, 89, 88, 89, 88, 85, 43, 60, 43, 43, 88, 43, 43, 61, 36,
+   36, 85, 43, 42, 42, 42, 79, 43, 42, 42, 79, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 61, 43, 60, 36, 36, 36, 61, 85, 86, 42, 42,
+   79, 89, 88, 88, 85, 89, 85, 84, 70, 70,  2, 92, 63, 43, 43, 43,
+   56, 79, 43, 43, 43, 43, 43, 43, 36, 36, 93, 85, 42, 42, 42, 42,
+   85, 42, 84, 70, 36, 62,  2,  2,  7,  7,  7,  7,  7,  2, 92, 70,
+   85, 86, 42, 42, 84, 84, 85, 86, 84, 42, 36, 71, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 93, 85, 42, 42, 43, 85, 85, 42, 86,
+   59,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 43,
+   85, 86, 42, 42, 42, 84, 86, 86, 59,  2, 60, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2,  2, 63, 43, 36, 36, 36, 36, 36, 69, 86, 85,
+   42, 42, 42, 86, 62, 43, 43, 43,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 56, 86,
+   85, 42, 42, 86, 42, 42, 43, 43,  7,  7,  7,  7,  7, 27,  2, 96,
+   42, 42, 42, 42, 86, 59, 43, 43, 27, 99, 43, 43, 43, 43, 43, 61,
+   36, 36, 36, 60, 61, 43, 36, 36, 36, 36, 61, 60, 36, 36, 36, 36,
+   85, 85, 85, 88, 89, 56, 84, 70, 97, 86,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 36, 43, 36, 36, 36, 93, 85, 42, 42, 43, 42, 85, 85,
+   70, 71, 89, 43, 43, 43, 43, 43, 69, 42, 42, 42, 42, 70, 36, 36,
+   36, 69, 42, 42, 84, 69, 42, 59,  2,  2,  2, 58, 43, 43, 43, 43,
+   69, 42, 42, 84, 86, 42, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42,
+   42, 42, 42, 84, 42,  2, 71,  2,  2, 63, 43, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2, 43, 43, 43, 84, 42, 84, 84, 43, 43, 43, 43,
+   62, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 42, 42, 42, 86,
+   62,  2,  2, 43, 43, 43, 43, 43,  2, 36, 36, 36, 36, 36, 36, 36,
+   43, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 88, 42, 42, 42,
+   84, 42, 86, 79, 43, 43, 43, 43, 36, 36, 36, 60, 36, 61, 36, 36,
+   69, 42, 42, 79, 43, 79, 42, 56, 42, 42, 42, 69, 43, 43, 43, 43,
+   36, 36, 36, 61, 60, 36, 36, 36, 36, 36, 36, 36, 36, 85, 85, 89,
+   42, 88, 86, 86, 60, 43, 43, 43, 36, 36, 36, 36, 82, 36, 43, 43,
+   36, 69, 84,106, 63, 43, 43, 43, 42, 93, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 42, 42, 79, 43, 85, 84, 59,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 79, 43, 43, 27, 27, 90, 66, 66, 66, 55, 20,
+  167, 66, 66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 43, 43, 92,
+  104,104,104,104,104,104,104,181,  2,  2, 63, 43, 43, 43, 43, 43,
+   62, 63, 43, 43, 43, 43, 43, 43, 64, 64, 64, 64, 64, 64, 64, 64,
+   70, 36, 36, 69, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 85, 86, 42,
+   42, 42, 59, 43, 43, 43, 43, 43, 42, 42, 42, 59,  2,  2, 66, 66,
+   39, 39, 96, 43, 43, 43, 43, 43,  7,  7,  7,  7,  7,179, 27, 27,
+   27, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 61, 36,
+   39, 68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,163,  2,
+   27, 27, 27, 30,  2, 63, 43, 43, 11, 11, 11, 11, 46,149, 16, 16,
+   16, 16, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 43, 56,
+   93, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+   85, 85, 85, 85, 43, 43, 43, 56, 42, 73, 39, 39, 39, 39, 39, 39,
+   39, 87, 79, 43, 43, 43, 43, 43, 85, 39,104,181, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 61, 36, 60, 43, 43, 43, 43, 43, 43,
+   39, 39, 51, 39, 39, 39, 51, 80, 43, 60, 43, 43, 43, 43, 43, 43,
+   36, 60, 61, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 43, 49, 59, 64, 64, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 66, 91, 43, 66, 66, 43, 43, 43, 66, 66, 66,
+  176, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 43, 43, 43, 43,
+   66, 66, 66, 91, 54, 66, 66, 66, 66, 66,186, 86, 42, 66,186, 85,
+   85,187, 64, 64, 64, 83, 42, 42, 42, 75, 49, 42, 42, 42, 66, 66,
+   66, 66, 66, 66, 66, 42, 42, 66, 66, 42, 75, 43, 43, 43, 43, 43,
+   27, 27, 43, 43, 43, 43, 43, 43, 11, 11, 11, 11, 11, 16, 16, 16,
+   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
+   16, 16,109, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 46, 11, 43, 46, 47, 46, 47, 11, 46, 11,
+   11, 11, 11, 16, 16,149,149, 16, 16, 16,149, 16, 16, 16, 16, 16,
+   16, 16, 11, 47, 11, 46, 47, 11, 11, 11, 46, 11, 11, 11, 46, 16,
+   16, 16, 16, 16, 11, 47, 11, 46, 11, 11, 46, 46, 43, 11, 11, 11,
+   46, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
+   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 43, 11, 11, 11, 11,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 43,  7,
+   42, 42, 42, 75, 66, 49, 42, 42, 42, 42, 42, 42, 42, 42, 75, 66,
+   66, 66, 49, 66, 66, 66, 66, 66, 66, 66, 75, 21,  2,  2, 43, 43,
+   43, 43, 43, 43, 43, 56, 42, 42, 16, 16, 16, 16, 16,138, 16, 16,
+   16, 16, 16, 16, 16, 16, 16,109, 43, 43,149, 16, 16,109, 43, 43,
+   42, 42, 42, 79, 42, 42, 42, 42, 42, 42, 42, 42, 79, 56, 42, 42,
+   42, 56, 79, 42, 42, 79, 43, 43, 39, 39, 39, 39, 39, 39, 39, 43,
+   43, 43, 43, 43, 43, 43, 43, 56, 42, 42, 42, 73, 39, 39, 39, 43,
+    7,  7,  7,  7,  7, 43, 43, 76, 36, 36, 36, 36, 36, 36, 36, 79,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7, 43, 43, 95,
+   36, 36, 36, 36, 36, 82, 42, 42,188,  7,  7,  7,  7,189, 43, 92,
+   36, 69, 36, 70, 36, 36, 36, 42, 36, 36, 69, 43, 43, 43, 43, 82,
+   36, 36, 36, 60, 36, 36, 61, 60, 36, 36, 60,179, 27, 27, 27, 27,
+   16, 16, 42, 42, 42, 73, 43, 43, 27, 27, 27, 27, 27, 27,162, 27,
+  190, 27, 99, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 27, 27,162,
+   27, 27, 27, 27, 27, 27, 27, 43, 36, 36, 61, 36, 36, 36, 36, 36,
+   61, 60, 60, 61, 61, 36, 36, 36, 36, 60, 36, 36, 61, 61, 43, 43,
+   43, 60, 43, 61, 61, 61, 61, 36, 61, 60, 60, 61, 61, 61, 61, 61,
+   61, 60, 60, 61, 36, 60, 36, 36, 36, 60, 36, 36, 61, 36, 60, 60,
+   36, 36, 36, 36, 36, 61, 36, 36, 61, 36, 61, 36, 36, 61, 36, 36,
+    8, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 66, 43, 43,
+   54, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27, 27, 27, 90, 66,
+   66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 66, 66, 66, 66, 66,
+   66, 91, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 91, 43, 43, 43,
+   66, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 25, 40, 40,
+   66, 66, 66, 66, 91, 43, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43,
+    8,  8,  8,  8,176, 43, 43, 43, 66, 66, 66, 66, 66, 91, 43, 66,
+   66, 66, 66, 91, 91, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91, 54,
+   66, 66, 66, 66, 66, 91, 43, 54, 66, 91, 66, 66, 66, 66, 66, 66,
+    7,  7,  7,  7,  7, 91, 43, 43, 78, 43, 43, 43, 43, 43, 43, 43,
+  170,170,170,170,170,170,170, 43,170,170,170,170,170,170,170,  0,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  2,  2,  6,  5,  9, 21,  9,  2,  2,  9,
+   25,  9, 26, 12, 11, 11,  2,  6,  5, 21, 17,  2,  2, 26, 26, 23,
+    2, 12, 17, 12, 21, 12, 12, 21,  7,  2,  2,  7,  7, 21, 21,  2,
+    1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7,
+   12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,  2,  1, 12,  2,
+    6,  2, 24,  7,  7,  6,  1, 12, 12, 10, 10, 10, 10, 12, 21,  6,
+    2, 10, 10,  2, 15, 26, 26,  2,  2, 21,  7, 10, 15,  7,  2, 23,
+   21, 26, 10,  7, 21, 15, 15,  2, 17,  7, 29,  7,  7, 22, 18,  2,
+   14, 14, 14,  7, 10, 21, 17, 21, 11, 12,  5,  2,  5,  6,  8,  8,
+    8, 24,  5, 24,  2, 24,  9, 24, 24,  2, 29, 29, 29,  1, 17, 17,
+   20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21, 21, 16, 16, 21,
+   25, 22, 18, 21, 21, 29,  1,  2, 15,  6, 18,  6, 12, 11,  9, 26,
+   26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15, 25, 26,
+   26, 22, 18, 26, 18, 25, 18, 22,  5, 12,  2,  5, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 18, 18, 26, 14, 17,  6, 14,  6,
+   12, 24, 24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,
+    6, 10,  4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,
+   25,  2, 25, 24, 23,  2,  2, 15, 12, 15, 14,  2, 21, 14,  7, 15,
+   12, 17, 21,  1, 26, 10, 10,  1,  7, 13, 13,  2, 23, 15,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,
+    0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,
+    0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,
+    0,  0,  0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,
+   43, 44, 45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,
+    6,  7,  8,  0,  9,  0, 10, 11,  0,  0, 12, 13, 14, 15, 16,  0,
+    0,  0,  0, 17, 18, 19, 20,  0, 21,  0, 22, 23,  0, 24, 25,  0,
+    0, 24, 26, 27,  0, 24, 26,  0,  0, 24, 26,  0,  0, 24, 26,  0,
+    0,  0, 26,  0,  0, 24, 28,  0,  0, 24, 26,  0,  0, 29, 26,  0,
+    0,  0, 30,  0,  0, 31, 32,  0,  0, 33, 34,  0, 35, 36,  0, 37,
+   38,  0, 39,  0,  0, 40,  0,  0, 41,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 42,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,  0,  0,
+    0,  0, 45,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0, 47,  0,  0,
+    0,  0,  0,  0, 48,  0,  0, 49,  0, 50, 51, 52,  0, 53, 54, 55,
+    0, 56,  0, 57,  0, 58,  0,  0,  0,  0, 59, 60,  0,  0,  0,  0,
+    0,  0, 61, 62,  0,  0,  0,  0,  0,  0, 63, 64,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0, 66,
+    0,  0,  0, 67,  0, 68,  0,  0, 69,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 70, 71,  0,  0, 72,  0,  0,  0,  0,
+    0,  0,  0,  0, 73, 74,  0,  0,  0,  0, 54, 75,  0, 76, 77,  0,
+    0, 78, 79,  0,  0,  0,  0,  0,  0, 80, 81, 82,  0,  0,  0,  0,
+    0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0, 83,  0,  0,  0,
+    0,  0,  0,  0,  0, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 85,  0,  0,  0,  0,  0,  0,  0, 86,  0,  0,  0, 87,
+    0,  0,  0,  0, 88, 89,  0,  0,  0,  0,  0, 90,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 91,  0, 92,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  0, 94,  0,  0, 95,  0,
+   96,  0,  0,  0,  0,  0, 73, 97,  0, 98,  0,  0, 99,100,  0, 78,
+    0,  0,101,  0,  0,102,  0,  0,  0,  0,  0,103,  0,104, 26,105,
+    0,  0,106,  0,  0,  0,107,  0,  0,  0,108,  0,  0,  0,  0,  0,
+    0, 66,109,  0,  0, 66,  0,  0,  0,110,  0,  0,  0,111,  0,  0,
+    0,  0,  0,  0,  0, 98,  0,  0,  0,  0,  0,  0,  0,112,113,  0,
+    0,  0,  0, 79,  0, 44,114,  0,115,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,116,  0,
+  117,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,121,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,122,  0,  0,  0,  0,123,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,
+  125,126,  0,  0,  0,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,128,129,  0,  0,130,  0,  0,  0,  0,121,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,131,  0,132,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,133,  0,  0,  0,  0,
+    0,  0,  0,134,  0,  0,  0,  0,  0,  0,  0,135,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,  0,  0,  0,137,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
+    1,  2,  3,  4,  5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13,
+   14, 15, 16, 17, 18,  1,  1,  1,  0,  0,  0,  0, 19,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
+   25, 26, 27, 28, 29, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,  0,  0,  0,  0,
+   37,  0,  0,  0,  0,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
+    0,  0,  0,  0,  0,  0,  0,  0, 42,  0,  0,  0,  0,  0,  0,  0,
+   43, 36, 44, 45, 21, 45, 46,  0,  0,  0,  0,  0,  0,  0, 19,  1,
+   21,  0,  0, 47,  0,  0,  0,  0,  0, 38, 48,  1,  1, 49, 49, 50,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 51,  0,  0,  0,  0,  0,
+    0, 19, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
+   54, 21, 35,  1,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0, 56,
+   57, 58,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 59,  0,  0,  0, 56,  0, 60,  0,  0,  0,  0,  0,  0,
+    0,  0, 61, 62,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 64,  0,  0,  0, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 66,  0,  0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 68,  0,  0,  0,  0,  0,  0, 69, 70,  0,  0,  0,  0,  0,
+   71, 72, 73, 74, 75, 76,  0,  0,  0,  0,  0,  0,  0, 77,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  0,  0,  0,  0,
+    0, 80,  0,  0,  0,  0,  0,  0,  0, 62,  0,  0,  0,  0,  0,  0,
+   63,  0,  0, 81,  0,  0, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 83,  0,  0,  0,  0,  0,  0, 19, 84,  0, 62,  0,  0,  0,
+    0, 49,  1, 85,  0,  0,  0,  0,  1, 52, 15, 86, 36, 10, 21,  1,
+    1,  1,  1, 41,  1, 21, 87,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 55,  0,  0,  0, 62,  0,  0,  0,  0,  0,  0,  0,  0, 19, 10,
+    1,  0,  0,  0,  0,  0, 88,  0,  0,  0,  0,  0,  0, 89,  0,  0,
+   88,  0,  0,  0,  0,  0,  0,  0,  0, 78,  0,  0,  0,  0,  0,  0,
+   90,  9, 12,  4, 91,  8, 92, 47,  0, 58, 50,  0, 21,  1, 21, 93,
+   94,  1,  1,  1,  1,  1,  1,  1,  1, 95, 96, 97,  0,  0,  0,  0,
+   98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,  0,  0,  0, 19,
+   50,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 61,  1,  1,  1,  1,
+    1,  1,  1,  1,  0,  0,102,103,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,104,  0,  0,  0,  0, 19,  0,  1,  1, 50,  0,  0,  0,  0,
+    0,  0,  0, 38,  0,  0,  0,  0, 50,  0,  0,  0,  0, 63,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 62,  0,  0,  0,  0,  1,  1,  1,  1,
+   50,  0,  0,  0,  0,  0,105, 68,  0,  0,  0,  0,  0,  0,  0,  0,
+   61,  0,  0,  0,  0,  0,  0,  0, 78,  0,  0,  0, 62,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,106,107, 58, 38, 81,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,108,  1, 14,  4, 12,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 47, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 38, 90,  0,  0,  0,  0,109,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,110, 61,  0,111,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0, 49, 50,  0,  0,  0,  0,  0,  0, 19, 58,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112, 51,  0,112, 14, 52,
+   84,  0,  0,  0,113, 41,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   62,  0,  0, 61,  0,  0,  0,  0,  0,  0,114,  0, 90,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,114,  0,  0,  0,  0,115,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 55,  0, 38,  1, 58,
+    1, 58,  0,  0,  0,  0,  0, 88, 62,  0,  0,  0, 63, 89,  0,  0,
+    0,  0,  0, 59,116,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,116,  0,  0,  0,  0, 61,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 78,  0,  0,  0,
+    0,  0,  0,  0,  0, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 56,  0, 89, 80,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 61,  0,  0, 79,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 61,
+    0,  0,  0,  0,  0,  0,  0,  0,  8, 92,  0,  0,  0,  0,  0,  0,
+    1, 90,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,118,  0,119,120,121,122,  0,105,  4,123, 49, 23,  0,
+    0,  0,  0,  0,  0,  0, 38, 50,  0,  0,  0,  0, 38, 58,  0,  0,
+    0,  0,  0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,
+    0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 59,
+    0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,124,
+    0,  0,  0,  0,  0,  0,  0,113,  0,  0,  0,  0, 19, 59,  0, 38,
+    0, 81,  0,  0,  0,  0,  0,  0,  4,123,  0,  0,  0,  1,125,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,230,230,230,230,230,232,220,220,
+  220,220,232,216,220,220,220,220,220,202,202,220,220,220,220,202,
+  202,220,220,220,  1,  1,  1,  1,  1,220,220,220,220,230,230,230,
+  230,240,230,220,220,220,230,230,230,220,220,  0,230,230,230,220,
+  220,220,220,230,232,220,220,230,233,234,234,233,234,234,233,230,
+    0,  0,  0,230,  0,220,230,230,230,230,220,230,230,230,222,220,
+  230,230,220,220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17,
+   18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18,
+   30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,
+  230,220,220,230,220,230,230,220, 35,  0,  0,  0,  0,  0,230,230,
+  230,  0,  0,230,230,  0,220,230,230,220,  0,  0,  0, 36,  0,  0,
+  230,220,230,230,220,220,230,220,220,230,220,230,220,230,230,  0,
+    0,220,  0,  0,230,230,  0,230,  0,230,230,230,230,230,  0,  0,
+    0,220,220,220,230,220,220,220,230,230,  0,220, 27, 28, 29,230,
+    7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,
+    0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,  9,  0,  0,  0,
+    0,  0,  9,  0,103,103,  9,  0,107,107,107,107,118,118,  9,  0,
+  122,122,122,122,220,220,  0,  0,  0,220,  0,220,  0,216,  0,  0,
+    0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,
+  130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,  0,  0,  0,  7,
+    0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,  0,228,  0,  0,
+    0,222,230,220,220,  0,  0,  0,230,  0,  0,220,230,220,  0,220,
+  230,230,230,234,  0,  0,  9,  9,  0,  0,  7,  0,230,230,230,  0,
+  230,  0,  1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,
+  230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
+    1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,
+  232,222,224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,
+  220,  0,  0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,
+    0,230,220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,
+    0,  7,  9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,
+    0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,
+  220,220,220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 17,
+   17, 17, 17, 33, 17, 17, 17, 19, 17, 17, 17, 17, 20,101, 17,113,
+  129,169, 17, 27, 28, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,237,  0,  1,  2,  2,
+    0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  6,  7,  8,
+    9,  0,  0,  0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 20,  0,  0, 21, 22,  0,  0,  0,  0,
+   23, 24, 25, 26,  0, 27,  0, 28, 29, 30, 31, 32,  0,  0,  0,  0,
+    0,  0,  0, 33, 34, 35, 36,  0,  0,  0,  0,  0, 37,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 38, 39,  0,  0,  0,  0,  1,  2, 40, 41,
+    0,  1,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  5,  0,
+    0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  7,  1,  0,  0,  0,  0,
+    0,  0,  8,  9,  0,  0,  0,  0,  0,  0, 10,  0,  0, 10,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 10,
+    0,  0,  0,  0,  0,  0, 11, 12,  0, 13,  0, 14, 15, 16,  0,  0,
+    0,  0,  0,  1, 17, 18,  0, 19,  7,  1,  0,  0,  0, 20, 20,  7,
+   20, 20, 20, 20, 20, 20, 20,  8, 21,  0, 22,  0,  7, 23, 24,  0,
+   20, 20, 25,  0,  0,  0, 26, 27,  1,  7, 20, 20, 20, 20, 20,  1,
+   28, 29, 30, 31,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0, 10,  0,
+    0,  0,  0,  0,  0,  0, 20, 20, 20,  1,  0,  0,  8, 21, 32,  4,
+    0, 10,  0, 33,  7, 20, 20, 20,  0,  0,  0,  0,  8, 34, 34, 35,
+   36, 34, 37,  0, 38,  1, 20, 20,  0,  0, 39,  0,  1,  1,  0,  8,
+   21,  1, 20,  0,  0,  0,  1,  0,  0, 40,  1,  1,  0,  0,  8, 21,
+    0,  1,  0,  1,  0,  1,  0,  0,  0,  0, 26, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 21,  7, 20, 41, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 21,  0, 42, 43, 44,  0, 45,  0,  8, 21,  0,  0,  0,  0,  0,
+    0,  0,  0, 46,  7,  1, 10,  1,  0,  0,  0,  1, 20, 20,  1,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 34,  9,  0,  0, 20, 20,
+    1, 20, 20,  0,  0,  0,  0,  0,  0,  0, 26, 21,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3, 47, 48,  0,  0,  0,
+    0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 12, 13,
+   13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 13, 13, 13,
+   24, 25, 26, 26, 26, 27, 13, 13, 13, 28, 29, 30, 13, 31, 32, 33,
+   34, 35, 36, 37,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7, 38,  7,  7, 39,  7, 40,  7,  7,
+    7, 41, 13, 42,  7,  7, 43,  7,  7,  7, 44, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 45,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 37,
+   37, 37, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+   51, 52,  2,  2, 53, 54, 55, 56, 57, 58, 59, 59, 59, 59, 60, 59,
+   59, 59, 59, 59, 59, 59, 61, 61, 59, 59, 59, 59, 62, 59, 63, 64,
+   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 59, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 78, 69, 69, 69, 69, 79, 79, 79, 79, 79, 79, 79, 79, 79, 80,
+   81, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 94, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 69, 69, 96, 97, 98, 99, 99, 99,
+  100,101,102,103,104,105,106,107,108,109, 95,110,111,112,113,114,
+  115,116,117,117,118,119,120,121,122,123,124,125,126,127,128,129,
   130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
-  146,147,148,149,150,151,152,153,154,  0,155,156,157,158,  0,159,
-  160,161,162,163,164,165,166,167,168,169,170,  0,171,172,173,  7,
-    7,  7,  7,  7,  7,  7,174,175,  7,176,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,177,  4,
-    4,  4,  4,  4,  4,  4,  4,178,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,179, 11, 11, 11, 11,180,  0,  0,  0,  0,
-    0,181,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,
-   12, 12, 12,182,183,184,185,  0,  0,186,  0,187,188,189,190,  3,
-    3,  3,  3,  3,  3, 14, 14, 14,191,192,193,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,195,
-  196,197, 18, 18,198,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,199,200,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  5,201,  5,  5,  5,202,203,204,  5,
-  205,206,207,208,209,210,  0,211,212,213,  5,  5,214,  5,215, 10,
-   10, 10, 10, 10,216,  0,  0,  0,  0,  0,  0,  0,  0,217,  0,218,
-  219,220,  0,  0,221,  0,  0,  0,222,  0,223,  0,224,  0,225,226,
-  227,228,  0,  0,  0,  0,  0,229,230,231,  0,232,233,  0,  0,234,
-  235,  5,236,237,  0,  5,  5,  5,  5,  5,  5,  5,238,  5,239,240,
-  241,  5,  5,242,243,  5,244,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,245,  1,  1,246,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,247,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,248,  1,  1,  1,  1,249,  0,  0,  0,  1,
-    1,  1,  1,250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    1,  1,  1,  1,  1,251,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,252,  0,  0,  0,  0,  0,  0,  0,253,
-    0, 19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,
-    2,  2,  2,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 12,
-   12, 12, 12, 12, 12, 12, 12,  0,  0,  0,  0,  0,  0,  0,  0,136,
-  136,136,136,136,136,136,136, 80, 80, 80, 80, 80, 80, 80, 80, 19,
-   19, 19, 19, 19, 19, 19, 19,  3,  3,  3,  3,  3,  3,  3,  3, 63,
-   63, 63, 63, 63, 63, 63, 63, 39, 39, 39, 39, 39, 39, 39, 39, 28,
-   28, 28, 28, 28, 28, 28, 28, 79, 79, 79, 79, 79, 79, 79, 79,131,
-  131,131,131,131,131,131,131,  1,  1,  1,  1,  1,  1,  1,  1,127,
-  127,127,127,127,127,127,127,  6,  6,  6,  6,  6,  6,  6,  6,155,
-  155,155,155,155,155,155,155,139,139,139,139,139,139,139,139,  9,
-    9,  9,  9,  9,  9,  9,  9, 15, 15, 15, 15, 15, 15, 15, 15, 30,
-   30, 30, 30, 30, 30, 30, 30,110,110,110,110,110,110,110,110, 77,
-   77, 77, 77, 77, 77, 77, 77, 17, 17, 17, 17, 17, 17, 17, 17, 27,
-   27, 27, 27, 27, 27, 27, 27, 33, 33, 33, 33, 33, 33, 33, 33,113,
-  113,113,113,113,113,113,113, 49, 49, 49, 49, 49, 49, 49, 49, 25,
-   25, 25, 25, 25, 25, 25, 25, 29, 29, 29, 29, 29, 29, 29, 29,  7,
-    7,  7,  7,  7,  7,  7,  7, 32, 32, 32, 32, 32, 32, 32, 32,  8,
-    8,  8,  8,  8,  8,  8,  8, 99, 99, 99, 99, 99, 99, 99, 99, 31,
-   31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30,  2,105,
-  105,105,105,105,105,105,105, 55, 55, 55, 55, 55, 55, 55, 55, 62,
-   62, 62, 62, 62, 62, 62, 62, 56, 56, 56, 56, 56, 56, 56, 56, 91,
-   91, 91, 91, 91, 91, 91, 91,  0,  0,  0,  0,  2,  2,  2,  2,100,
-  100,100,100,100,100,100,100,119,119,119,119,119,119,119,119, 14,
-   14, 14, 14, 14, 14, 14, 14,130,130,130,130,130,130,130,130, 94,
-   94, 94, 94, 94, 94, 94, 94,157,157,157,157,157,157,157,157,137,
-  137,137,137,137,137,137,137,146,146,146,146,146,146,146,146, 20,
-   20, 20, 20, 20, 20, 20, 20, 35, 35, 35, 35, 35, 35, 35, 35,  0,
-    0,  0,  0,  0,  0,  2,  2, 84, 84, 84, 84, 84, 84, 84, 84, 40,
-   40, 40, 40, 40, 40, 40, 40, 97, 97, 97, 97, 97, 97, 97, 97,124,
-  124,124,124,124,124,124,124,123,123,123,123,123,123,123,123,125,
-  125,125,125,125,125,125,125,140,140,140,140,140,140,140,140,159,
-  159,159,159,159,159,159,159,132,132,132,132,132,132,132,132, 37,
-   37, 37, 37, 37, 37, 37, 37, 22, 22, 22, 22, 22, 22, 22, 22, 24,
-   24, 24, 24, 24, 24, 24, 24, 58, 58, 58, 58, 58, 58, 58, 58, 76,
-   76, 76, 76, 76, 76, 76, 76, 26, 26, 26, 26, 26, 26, 26, 26, 75,
-   75, 75, 75, 75, 75, 75, 75, 89, 89, 89, 89, 89, 89, 89, 89,114,
-  114,114,114,114,114,114,114,141,141,141,141,141,141,141,141,133,
-  133,133,133,133,133,133,133,163,163,163,163,163,163,163,163,  4,
-    4,  4,  4,  4,  4,  4,  4, 70, 70, 70, 70, 70, 70, 70, 70,  0,
-    0,  0,  0,  0,  0,  0,  2,  0,  0,  2,  2,  2,  2,  2,  2, 68,
-   68, 68, 68, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, 92, 87,
-   87, 87, 87, 87, 87, 87, 87,135,135,135,135,135,135,135,135, 85,
-   85, 85, 85, 85, 85, 85, 85, 96, 96, 96, 96, 96, 96, 96, 96,109,
-  109,109,109,109,109,109,109,102,102,102,102,102,102,102,102, 64,
-   64, 64, 64, 64, 64, 64, 64, 61, 61, 61, 61, 61, 61, 61, 61, 65,
-   65, 65, 65, 65, 65, 65, 65,  2,  0,  0,  0,  0,  0,  0,  0,108,
-  108,108,108,108,108,108,108,142,142,142,142,142,142,142,142,121,
-  121,121,121,121,121,121,121,166,166,166,166,166,166,166,166,167,
-  167,167,167,167,167,167,167,  0,  2,  2,  2,  2,  2,  2,  2,151,
-  151,151,151,151,151,151,151,152,152,152,152,152,152,152,152, 38,
-   38, 38, 38, 38, 38, 38, 38, 90, 90, 90, 90, 90, 90, 90, 90, 23,
-   23, 23, 23, 23, 23, 23, 23, 36, 36, 36, 36, 36, 36, 36, 36, 30,
-    2, 30, 30, 30, 30,  2,  2, 48, 48, 48, 48, 48, 48, 48, 48, 93,
-   93, 93, 93, 93, 93, 93, 93, 73, 73, 73, 73, 73, 73, 73, 73,  9,
-    9,  9,  9,  9,  9,  2,  2, 13, 13, 13, 13, 13, 13,  2,  2, 86,
-   86, 86, 86, 86, 86, 86, 86,  0,  0,  0,  0,  0,  2,  2,  2, 67,
-   67, 67, 67, 67, 67, 67, 67, 51, 51, 51, 51, 51, 51, 51, 51,104,
-  104,104,104,104,104,104,104,170,170,170,170,170,170,170,170, 78,
-   78, 78, 78, 78, 78, 78, 78,144,144,144,144,144,144,144,144,165,
-  165,165,165,165,165,165,165,171,171,171,171,171,171,171,171,126,
-  126,126,126,126,126,126,126,150,150,150,150,150,150,150,150,134,
-  134,134,134,134,134,134,134,138,138,138,138,138,138,138,138,175,
-  175,175,175,175,175,175,175, 18, 18, 18, 18, 18, 18, 18, 18,  0,
-    0,  0,  0,  0,  2,  0,  0, 60, 60, 60, 60, 60, 60, 60, 60, 69,
-   69, 69, 69, 69, 69, 69, 69,118,118,118,118,118,118,118,118, 59,
-   59, 59, 59, 59, 59, 59, 59,106,106,106,106,106,106,106,106,156,
-  156,156,156,156,156,156,156,147,147,147,147,147,147,147,147,148,
-  148,148,148,148,148,148,148,169,169,169,169,169,169,169,169,172,
-  172,172,172,172,172,172,172,164,164,164,164,164,164,164,164,168,
-  168,168,168,168,168,168,168,174,174,174,174,174,174,174,174,  0,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,  5,
-    5,  5,  5,  5,  5,  5,  5, 21, 21, 21, 21, 21, 21, 21, 21, 16,
-   16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, 12, 12,  2, 74,
-   74, 74, 74, 74, 74, 74, 74, 42, 42, 42, 42, 42, 42, 42, 42, 50,
-   50, 50, 50, 50, 50, 50, 50,161,161,161,161,161,161,161,161, 47,
-   47, 47, 47, 47, 47, 47, 47,120,120,120,120,120,120,120,120,116,
-  116,116,116,116,116,116,116, 98, 98, 98, 98, 98, 98, 98, 98, 57,
-   57, 57, 57, 57, 57, 57, 57, 88, 88, 88, 88, 88, 88, 88, 88,117,
-  117,117,117,117,117,117,117,112,112,112,112,112,112,112,112,101,
-  101,101,101,101,101,101,101,111,111,111,111,111,111,111,111,154,
-  154,154,154,154,154,154,154,143,143,143,143,143,143,143,143,115,
-  115,115,115,115,115,115,115,  0,  0, 19,  0,  0,  0,  0,  0, 95,
-   95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 11, 11, 11, 11, 11, 10,
-   10, 10, 10, 10, 10, 10, 10, 22, 22, 22,  2,  2,  2, 22, 22,  2,
-   25, 25, 25, 25, 25, 25, 25, 34, 34, 34, 34, 34, 34, 34, 34, 52,
-   52, 52, 52, 52, 52, 52, 52, 54, 54, 54, 54, 54, 54, 54, 54,  0,
-    0,  0,  2,  2,  2,  2,  2,  2, 30, 30, 30, 30, 30, 30,  2,  2,
-    2, 12, 12, 12, 12, 12, 12, 71, 71, 71, 71, 71, 71, 71, 71, 41,
-   41, 41, 41, 41, 41, 41, 41, 53, 53, 53, 53, 53, 53, 53, 53, 81,
-   81, 81, 81, 81, 81, 81, 81, 66, 66, 66, 66, 66, 66, 66, 66, 72,
-   72, 72, 72, 72, 72, 72, 72,173,173,173,173,173,173,173,173, 83,
-   83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, 82,158,
-  158,158,158,158,158,158,158,153,153,153,153,153,153,153,153,145,
-  145,145,145,145,145,145,145,103,103,103,103,103,103,103,103,160,
-  160,160,160,160,160,160,160,  2,  3,  3,  2,  3,  2,  2,  3,  3,
-    3,  3,  2,  3,  3,  3,  3, 19, 19, 19, 19, 19, 19, 19,  0,  2,
-    4,  4,  4,  4,  4,  4,  4,  3,  3,  3,  3,  3,  0,  3,  3,  5,
-    5,  5,  5,  5,  2,  2,  5, 11, 11, 11,  2,  2,  2,  2, 11, 10,
-   10, 10, 10, 10, 10,  2, 10, 21, 21, 21, 21, 21,  2,  2, 21, 22,
-    2, 22, 22, 22, 22,  2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23,
-    2, 23, 23, 23, 23, 23, 23, 16, 16, 16, 16, 16,  2, 16, 16, 16,
-    2, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 20,  2, 20, 20, 20,
-    2, 20, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, 36, 36,  2, 25,
-   25, 25, 25, 25,  2, 25, 25,  8,  8,  8,  8,  8,  8,  2,  8,  2,
-    2,  2,  2,  2,  8,  2,  2, 29, 29, 29, 29, 29, 29,  2,  2, 45,
-   45, 45, 45, 45, 45, 45, 45, 44, 44, 44, 44, 44, 44, 44, 44, 43,
-   43, 43, 43, 43, 43, 43, 43, 31, 31,  2,  2,  2,  2,  2,  2, 48,
-   48, 48, 48,  2,  2,  2,  2, 91, 91,  2,  2,  2,  2,  2,  2,  1,
-    1,  1,  1,  1,  1,  2,  2,  9,  9,  9,  9,  9,  2,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  2, 19, 19, 19, 19, 19,  2,  2,  2,  0,
-    0,  0,  0,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  2, 61,  0,
-   17, 17, 17, 17, 17, 17, 17, 12, 12, 12, 12,  2,  2,  2,  2, 13,
-   13,  2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19,  2,  0,
-    0,  0,  2,  0,  0,  0,  0, 49, 49, 49, 49, 49, 49,  2,  2,  0,
-    0,  0,  2,  2,  2,  2,  0,135,135,135,135,  2,  2,  2,  2,161,
-  161,161,  2,161,161,161,161,161,161,  2,161,161,161,161,161, 19,
-   19, 19,  2,  2,  2,  2,  2,128,128,128,128,128,128,128,128, 57,
-    2,  2,  2,  2,  2,  2,  2,112,112,112,112,112,112,112,  2,122,
-  122,122,122,122,122,122,122,130,130,130,  2,  2,  2,  2,  2,165,
-  165,165,165,165,165,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,149,
-  149,149,149,149,149,149,149, 94, 94, 94, 94, 94, 94,  2,  2,129,
-  129,129,129,129,129,129,129,107,107,107,107,107,  2,  2,107,107,
-  107,107,107,107,107,107,107,107,107,107,107,107,  2,  2,  2,171,
-  171,171,171,171,171,  2,171,123,123,123,123,123,123,  2,  2,102,
-  102,  2,  2,  2,  2,  2,  2,154,154,154,154,154,154,154,  2,  2,
-    2,150,150,150,150,150,150,169,169,  2,  2,  2,  2,  2,  2,138,
-  138,138,138,138,138,138,  2,103,103,103,103,103,103,  2,  2,119,
-  119,  2,119,119,119,119,119,  2,  2,  0,  0,  0,  0,  0,  0,  3,
-    3,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2, 19,
-    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,
-    0, 26, 26,  0,  0,  0,  0,  9,  9,  9,  9,  0,  9,  9,  9,  2,
-    2,  9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,
-    9,  9,  2,  9,  2,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,
-    9, 55, 55, 55, 55, 55, 55,  6,  6,  6,  6,  6,  1,  1,  6,  4,
-    4,  4,  4,  4,  4,  4,  2,  4,  4,  4,  2,  2,  4,  4,  4,  2,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,  2,  2, 14, 14,
-   14, 14, 14, 14,  2,  2,  2,  3,  3,  3,  3,  0,  3,  3,  3,  3,
-    3,  3,  0,  3,  3,  3,  0,  0,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  1,
-    3,  3,  3,  3,  3,  3,  3, 37, 37, 37, 37, 37, 37,  2, 37, 37,
-   37, 37,  2,  2, 37, 37, 37, 38, 38,  2,  2,  2,  2,  2,  2, 64,
-   64, 64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90,  2,  2, 90,
-   90, 90, 90, 90, 90, 90,  2, 95, 95, 95, 95,  2,  2, 95,  2, 37,
-   37, 37,  2,  2,  2,  2,  2,  3,  3,  2,  2,  2,  2,  2,  3,  3,
-    3,  0,  3,  3,  3,  3,  3,  7,  1,  1,  1,  1,  7,  7,  7,  7,
-    7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,  5,  5,  5,
-    2,  2,  5,  5,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,  5,  5,
-    2,  5,  2,  2,  2,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  5,
-    2,  2,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,  2,  5,  2,
-    2,  2,  2,  5,  5,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  2,  2, 11, 11, 11,  2, 11, 11, 11, 11,
-    2,  2, 11, 11, 11, 11, 11, 11,  2, 11, 11, 11, 11, 11, 11, 11,
-    2, 11, 11,  2, 11, 11,  2, 11, 11,  2,  2, 11,  2, 11, 11, 11,
-    2,  2, 11, 11, 11,  2,  2,  2, 11,  2,  2,  2,  2,  2,  2,  2,
-   11, 11, 11, 11,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11, 11, 11,
-   11, 11, 11, 11, 11, 11,  2,  2, 10, 10, 10,  2, 10, 10, 10, 10,
-   10,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,
-    2, 10, 10,  2, 10, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10, 10,
-   10,  2, 10, 10, 10,  2,  2, 10,  2,  2,  2,  2,  2,  2,  2, 10,
-   10, 10, 10,  2,  2, 10, 10, 10, 10,  2,  2,  2,  2,  2,  2,  2,
-   10, 10, 10, 10, 10, 10, 10,  2, 21, 21, 21,  2, 21, 21, 21, 21,
-    2,  2, 21, 21, 21, 21, 21, 21,  2, 21, 21, 21, 21, 21, 21, 21,
-    2, 21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21, 21, 21,
-    2,  2, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21,  2,
-    2,  2,  2, 21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
-    2, 22, 22,  2, 22, 22, 22,  2, 22, 22,  2, 22,  2, 22, 22,  2,
-    2,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2,  2, 22, 22, 22,
-    2,  2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22,
-   22, 22,  2,  2,  2,  2,  2, 23, 23,  2,  2, 23, 23, 23, 23, 23,
-    2, 23, 23, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 23,  2, 23,
-   23, 23,  2, 23, 23,  2,  2, 23, 23, 23, 23,  2,  2, 23, 23,  2,
-    2,  2,  2,  2,  2,  2, 23, 16, 16, 16, 16,  2, 16, 16, 16, 16,
-   16,  2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,
-    2,  2,  2,  2, 16, 16,  2,  2,  2,  2,  2, 16, 16, 16,  2, 16,
-   16, 16, 16,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,  2,  2,
-    2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20,  2,
-   36, 36, 36,  2, 36, 36, 36,  2,  2, 36, 36, 36, 36, 36, 36, 36,
-   36,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,
-    2, 36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,
-    2,  2,  2,  2,  2, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24,  2,  2,  2,  2,  0, 24,
-   24, 24, 24,  2,  2,  2,  2,  2, 18, 18,  2, 18,  2, 18, 18, 18,
-   18, 18,  2, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
-   18, 18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18,
-   18, 18, 18, 18, 18, 18,  2, 18, 18,  2,  2, 18, 18, 18, 18, 25,
-   25, 25, 25, 25,  2,  2,  2, 25, 25, 25, 25, 25,  0,  0,  0,  0,
-   25, 25,  2,  2,  2,  2,  2,  8,  8,  8,  0,  8,  8,  8,  8, 30,
-   30, 30,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30,  2,  2,  2, 30,
-   30,  2,  2,  2,  2,  2,  2, 34, 34, 34, 34, 34,  2,  2,  2, 35,
-   35, 35,  0,  0,  0, 35, 35, 35,  2,  2,  2,  2,  2,  2,  2, 45,
-   45, 45, 45, 45, 45,  2,  2,  2,  2,  2,  2,  2,  2,  2, 45, 44,
-   44, 44, 44, 44,  0,  0,  2, 43, 43, 43, 43,  2,  2,  2,  2, 46,
-   46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,  2, 46, 46, 46,
-    2, 46, 46,  2,  2,  2,  2, 31, 31, 31, 31, 31, 31,  2,  2, 32,
-   32,  0,  0, 32,  0, 32, 32, 32, 32,  2,  2,  2,  2,  2,  2, 32,
-    2,  2,  2,  2,  2,  2,  2, 32, 32, 32,  2,  2,  2,  2,  2, 28,
-   28, 28, 28, 28, 28,  2,  2, 48, 48, 48, 48, 48, 48, 48,  2, 48,
-    2,  2,  2, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52,  2,  2, 52,
-   52, 52, 52, 52,  2,  2,  2, 58, 58, 58, 58,  2,  2,  2,  2, 58,
-   58,  2,  2,  2,  2,  2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54,
-   54, 54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91,  2, 91,
-   91, 91, 91, 91,  2,  2, 91, 91, 91, 91, 91, 91, 91,  2,  2,  1,
-    1,  1,  1,  2,  2,  2,  2, 62, 62, 62, 62, 62,  2, 62, 62, 93,
-   93, 93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93,  2,
-    2,  2, 70, 70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70,  6,
-    6,  6,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,
-    1,  1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,
-    0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,
-    1,  0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,
-    9,  9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
-    9, 19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  2,
-    9,  2,  9,  2,  9,  2,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,
-    9,  9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  0,
-    0,  0,  0,  1,  1,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 19,  1,  2,  2,  2,  2,  2,  2,  2,  0,
-    0,  0,  0,  0,  0,  9,  0,  0,  0, 19, 19,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 19,  0, 19,  0,  0,  0,  2,  2,  2,  2, 55,
-   55, 55, 55,  2,  2,  2,  2,  2, 55, 55, 55, 55, 55, 55, 55, 61,
-    2,  2,  2,  2,  2,  2,  2, 13, 13,  2, 13, 13, 13, 13, 13, 13,
-   13, 13, 13,  2,  2,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0,
-   13, 13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13,
-   13, 13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15,  2,  2,  1,  1,  0,  0, 15, 15, 15, 17,
-   17, 17,  0,  0, 17, 17, 17,  2,  2,  2,  2,  2, 26, 26, 26,  2,
-   12, 12, 12, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  0, 12,
-   12, 12, 12, 12, 12, 12,  0, 17, 17, 17, 17, 17, 17, 17,  0, 39,
-   39, 39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2, 77,
-   77, 77, 77,  2,  2,  2,  2,  0,  0, 19, 19, 19, 19, 19, 19,  0,
-    0,  0, 19, 19, 19, 19, 19,  2, 19, 19, 19, 19, 19, 19, 19, 60,
-   60, 60, 60, 60,  2,  2,  2, 75, 75, 75, 75, 75, 75,  2,  2,  2,
-    2,  2,  2,  2,  2, 75, 75, 75, 75,  2,  2,  2,  2,  2,  2, 69,
-   69, 69, 69, 69, 69,  0, 69, 74, 74, 74, 74,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12,  2,  2,  2, 84,
-   84, 84, 84, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33,
-   33, 33, 33, 33, 33, 33,  2, 68, 68, 68, 68, 68, 68, 68,  2, 68,
-   68, 68, 68, 68, 68,  2,  2, 68, 68,  2,  2, 68, 68, 68, 68, 92,
-   92, 92,  2,  2,  2,  2,  2,  2,  2,  2, 92, 92, 92, 92, 92, 87,
-   87, 87, 87, 87, 87, 87,  2, 19, 19, 19,  0, 19, 19, 19, 19, 19,
-   19, 19, 19, 19,  9, 19, 19, 19, 19,  0,  0,  2,  2,  2,  2, 87,
-   87, 87, 87, 87, 87,  2,  2, 87, 87,  2,  2,  2,  2,  2,  2,  2,
-    2,  2, 12, 12, 12, 12, 12,  2,  2,  2,  4,  4,  4,  4,  4,  2,
-    2,  2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14,
-   14, 14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  3,
-    3,  3,  3,  3,  3,  0,  0,  1,  1,  1,  1,  1,  1,  6,  6,  3,
-    3,  3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  0,
-    0,  0,  0,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0,  2,
-    2, 12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49,
-   49, 49, 49,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49,
-   49, 49,  2, 49, 49,  2, 49, 49, 49, 49,  2,  2,  2,  2,  2,  0,
-    0,  0,  0,  2,  2,  2,  0,  9,  2,  2,  2,  2,  2,  2,  2,  0,
-    0,  0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71,  2,  2,  2, 67,
-    2,  2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42,
-   42, 42, 42,  2,  2,  2,  2,  2,  2,  2,  2,  2, 42, 42, 42, 41,
-   41, 41,  2,  2,  2,  2,  2,118,118,118,  2,  2,  2,  2,  2, 53,
-   53, 53, 53, 53, 53,  2, 53, 59, 59, 59, 59,  2,  2,  2,  2, 59,
-   59, 59, 59, 59, 59,  2,  2, 50, 50, 50, 50, 50, 50,  2,  2, 50,
-   50,  2,  2,  2,  2,  2,  2,104,104,104,104,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,104,161,161,161,  2,161,161,  2,161,161,
-  161,  2,161,161,  2,  2,  2,170,170,170,170,  2,  2,  2,  2,110,
-  110,110,110,110,110,110,  2,110,110,110,110,110,110,  2,  2, 19,
-   19, 19, 19, 19, 19,  2, 19, 19,  2, 19, 19, 19, 19, 19, 19, 47,
-   47, 47, 47, 47, 47,  2,  2, 47,  2, 47, 47, 47, 47, 47, 47, 47,
-   47, 47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81,
-   81, 81, 81, 81, 81,  2, 81,116,116,116,116,116,116,116,  2,  2,
-    2,  2,  2,  2,  2,  2,116,128,128,128,  2,128,128,  2,  2,  2,
-    2,  2,128,128,128,128,128, 66, 66, 66, 66,  2,  2,  2, 66, 72,
-   72,  2,  2,  2,  2,  2, 72,173,173,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 57,
-   57, 57, 57,  2, 57, 57,  2,  2,  2,  2,  2, 57, 57, 57, 57, 57,
-   57, 57, 57,  2, 57, 57, 57,  2, 57, 57, 57, 57, 57, 57, 57, 57,
-   57, 57, 57, 57, 57,  2,  2, 57, 57, 57,  2,  2,  2,  2, 57,  2,
-    2,  2,112,112,112,112,112, 78, 78, 78, 78, 78, 78,  2,  2,  2,
-   78, 78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83,  2,  2, 82,
-   82, 82,  2,  2,  2,  2,  2,122,122,  2,  2,  2,  2,  2,  2,  2,
-  122,122,122,122,  2,  2,  2,  2,122,122,122,122,122,122,122, 89,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,130,130,130,130,130,130,144,
-  144,  2,  2,  2,  2,  2,  2,  2,165,165,165,165,165,165,165,  2,
-    2,  2,  2,  2,  2,165,165,  3,  3,  3,  3,  3,  3,  3,  2,156,
-  156,  2,156,156,156,  2,  2,156,156,  2,  2,  2,  2,  2,  2,  3,
-    2,  2,  2,  2,  2,  2,  2,148,148,  2,  2,  2,  2,  2,  2,158,
-  158,  2,  2,  2,  2,  2,  2,153,153,153,153,  2,  2,  2,  2,149,
-  149,149,149,149,149,149,  2,  2,  2, 94, 94, 94, 94, 94, 94,  2,
-    2,  2,  2,  2,  2,  2, 94, 85, 85, 85,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2, 85,  2,  2,101,  2,  2,  2,  2,  2,  2,  2,101,
-  101,  2,  2,  2,  2,  2,  2, 96, 96, 96, 96, 96,  2, 96, 96,111,
-  111,111,111,111,111,111,  2,  2, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36,  2,  2,  2,108,108,  2,108,108,108,108,108,108,
-  108,  2,  2,  2,  2,  2,  2,129,129,129,129,129,129,129,  2,129,
-    2,129,129,129,129,  2,129,129,129,129,129,129,129,  2,129,129,
-  129,  2,  2,  2,  2,  2,  2,109,109,109,  2,  2,  2,  2,  2,109,
-  109,  2,  2,  2,  2,  2,  2,107,107,107,107,  2,107,107,107,107,
-    2,  2,107,107,107,107,107,107,  2,107,107,107,107,107,107,107,
-    2,107,107,  2,107,107,107,107,107,  2,  1,107,107,107,107,107,
-    2,  2,107,107,107,  2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,
-    2,  2,  2,  2,107,107,107,107,107,107,107,  2,  2,107,107,171,
-  171,  2,171,  2,  2,171,  2,171,  2,171,  2,  2,171,  2,171,171,
-  171,171,  2,171,171,171,171,171,  2,  2,  2,  2,  2,  2,  2,  2,
-  171,171,  2,  2,  2,  2,  2,137,137,137,137,  2,137,137,137,137,
-  137,  2,  2,  2,  2,  2,  2,124,124,  2,  2,  2,  2,  2,  2,114,
-  114,114,114,114,  2,  2,  2,114,114,  2,  2,  2,  2,  2,  2, 32,
-   32, 32, 32, 32,  2,  2,  2, 33, 33, 33, 33,  2,  2,  2,  2,126,
-  126,126,  2,  2,126,126,126,126,126,126,126,  2,  2,  2,  2,126,
-  126,126,126,126,126,126,  2,142,142,142,142,  2,  2,  2,  2,125,
-  125,125,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,125,  2,
-  154,  2,  2,154,154,154,154,154,154,154,154,  2,154,154,  2,154,
-  154,154,154,154,154,  2,154,154,  2,  2,154,154,154,154,154,154,
-  154,  2,  2,  2,  2,  2,  2,150,150,150,150,150,  2,  2,  2,140,
-  140,140,  2,  2,  2,  2,  2,121,  2,  2,  2,  2,  2,  2,  2,  7,
-    7,  2,  2,  2,  2,  2,  2,133,  2,133,133,133,133,133,133,133,
-  133,133,133,133,133,133,  2,133,133,133,133,133,133,  2,  2,133,
-  133,133,133,133,  2,  2,  2,  2,  2,134,134,134,134,134,134,  2,
-  134,134,134,134,134,134,134,134,134,134,134,134,134,134,  2,138,
-  138,  2,138,138,138,138,138,  2,  2,138,  2,138,138,  2,138,138,
-  138,  2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,
-    2,143,143,143,143,143,143,143,143,143,143,143,143,143,  2,143,
-  143,  2,143,143,143,143,143,143,  2,  2,  2,  2,  2,  2,  2,143,
-  143,  2,  2,  2,  2,  2,  2,175,175,175,175,  2,  2,  2,  2,175,
-  175,  2,  2,  2,  2,  2,  2,145,  2,  2,  2,  2,  2,  2,  2,163,
-    2,163,163,163,163,163,163,163,163,163,  2,  2,  2,163,163,163,
-  163,163,  2,  2,  2,  2,  2, 86,  2,  2,  2,  2,  2,  2,  2, 22,
-   22,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 22, 63,
-   63,  2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63,
-   63, 63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,
-  157,157,  2,  2,  2,  2,  2, 80, 80, 80, 80, 80, 80,  2,  2, 80,
-   80, 80,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,  2,166,
-  166,  2,  2,  2,  2,  2,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,
-  115,115,115,115,115,115,  2,115,115,  2,  2,  2,  2,115,115,159,
-  159,159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,119,
-  119,119,119,119,119,  2,  2,  2,  2,  2,  2,  2,119,119,119,167,
-  167,  2,  2,  2,  2,  2,  2,146,146,146,  2,  2,  2,  2,  2,172,
-    2,  2,172,172,172,172,172,172,172,172,172,  2,  2,  2,  2, 99,
-   99, 99,  2,  2,  2,  2, 99,  2,  2,  2,  2,  2,  2,  2, 99,136,
-  139, 13, 13,155,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13,  2,155,
-  155,155,155,155,155,  2,  2,  2,  2,  2,  2,  2,  2,  2,155,136,
-  136,136,136,136,136,136,  2,136,136,136,  2,  2,  2,  2,  2, 17,
-   17, 17, 17,  2, 17, 17, 17, 17, 17, 17, 17,  2, 17, 17,  2, 17,
-   15, 15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2,  2,
-    2, 15,  2,  2,  2,  2,  2, 15, 15, 15,  2,  2, 17,  2,  2,  2,
-    2,  2,  2, 17, 17, 17, 17,139,139,139,139,  2,  2,  2,  2,105,
-  105,105,  2,  2,  2,  2,  2,105,105,105,105,105,  2,  2,  2,105,
-    2,  2,  2,  2,  2,  2,  2,105,105,  2,  2,105,105,105,105,  1,
-    1,  1,  1,  1,  1,  1,  2,  0,  0,  0,  0,  0,  0,  0,  1,  1,
-    1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,
-    1,  1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  0,  0,  2,  2,  0,  2,  2,  0,  0,  2,  2,
-    0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  2,  0,  0,  0,  0,
-    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,
-    0,  0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,
-    0,  0,  0,  0,  2,  0,  2,  0,  2,  0,  0,  0,  0,  0,  0,131,
-  131,131,131,  2,  2,  2,  2,  2,  2,  2,131,131,131,131,131,  2,
-  131,131,131,131,131,131,131,  2,  2,  2,  2,  2, 19, 19, 19, 56,
-   56, 56, 56, 56, 56, 56,  2, 56,  2,  2, 56, 56, 56, 56, 56, 56,
-   56,  2, 56, 56,  2, 56, 56, 56, 56, 56,  2,  2,  2,  2,  2,  6,
-    6,  6,  6,  6,  6,  2,  2,  2,  2,  2,  2,  2,  2,  2,  6,151,
-  151,151,151,151,  2,  2,  2,151,151,151,151,151,151,  2,  2,151,
-  151,  2,  2,  2,  2,151,151,160,160,160,160,160,160,160,  2,152,
-  152,  2,  2,  2,  2,  2,152,164,164,  2,  2,  2,  2,  2,  2,168,
-  168,168,  2,  2,  2,  2,168,174,174,174,174,174,174,174,  2,174,
-  174,174,174,174,174,  2,  2,  2,  2,  2,  2,  2,  2,174,174, 30,
-   30, 30, 30,  2, 30, 30,  2,113,113,113,113,113,  2,  2,113,113,
-  113,113,113,113,113,113,  2,132,132,132,132,  2,  2,  2,  2,132,
-  132,  2,  2,  2,  2,132,132,  3,  3,  3,  3,  2,  3,  3,  3,  2,
-    3,  3,  3,  3,  3,  3,  3,  2,  3,  2,  3,  2,  2,  2,  2,  2,
-    2,  3,  2,  2,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  2,
-    3,  2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  3,  2,  3,  2,  2,
-    3,  3,  3,  2,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  0,  0, 15,  0,  0,  2,  2,  2,  2,  2,  0,
-    2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
-    2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  0, 13,
-    2,  2,  2,  2,  2,  2,  2, 13, 13, 13,  2,  2,  2,  2,  2,  2,
-    0,  2,  2,  2,  2,  2,  2,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    0,  0,  0,  0, 10,  0, 11, 12, 13,  0,  0,  0, 14,  0,  0, 15,
+   95,146,147,148,149, 95,150,151,152,153,154,155,156,157,158,159,
+  160,161, 95,162,163,164,165,165,165,165,165,165,165,166,167,165,
+  168, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,169,170,170,170,170,170,170,170,170,171,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,172,173,173,
+  173,173,174, 95, 95, 95, 95, 95,175, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95,176,176,176,176,177,178,179,180, 95, 95,
+  181, 95,182,183,184,185,186,186,186,186,186,186,186,186,186,186,
+  186,186,186,186,186,186,186,186,186,186,186,186,187,187,187,188,
+  189,190, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,191,192,193,194,195,195,196, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,197,198,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 59,199,
+   59, 59, 59,200,201,202, 59,203,204,205,206,207,208, 95,209,210,
+  211, 59, 59,212, 59,213,214,214,214,214,214,215, 95, 95, 95, 95,
+   95, 95, 95, 95,216, 95,217,218,219, 95, 95,220, 95, 95, 95,221,
+   95,222, 95,223, 95,224,225,226,227, 95, 95, 95, 95, 95,228,229,
+  230, 95,231,232, 95, 95,233,234, 59,235,236, 95, 59, 59, 59, 59,
+   59, 59, 59,237, 59,238,239,240, 59, 59,241,242, 59,243, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,244, 69, 69,245, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,246, 69, 69, 69, 69, 69, 69, 69, 69, 69,247, 69, 69,
+   69, 69,248, 95, 95, 95, 69, 69, 69, 69,249, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69,250, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,251, 95,
+   95, 95, 95, 95, 95, 95,252, 95,253,254,  0,  1,  2,  2,  0,  1,
+    2,  2,  2,  3,  4,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+   19,  0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0, 19, 19,
+   19, 19, 19, 19, 19,  0, 19,  0,  0,  0,  0,  0,  0,  0, 19, 19,
+   19, 19, 19,  0,  0,  0,  0,  0, 26, 26,  0,  0,  0,  0,  1,  1,
+    1,  1,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
+    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
+    9,  2,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    2,  9,  9,  9,  9,  9,  9,  9, 55, 55, 55, 55, 55, 55, 55, 55,
+   55, 55, 55, 55, 55, 55,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+    6,  6,  6,  1,  1,  6,  2,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  4,  4,
+    4,  2,  2,  4,  4,  4,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+   14, 14, 14, 14, 14, 14,  2,  2,  2,  2,  2,  2,  2,  2, 14, 14,
+   14,  2,  2,  2,  2, 14, 14, 14, 14, 14, 14,  2,  2,  2,  3,  3,
+    3,  3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  0,  0,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  1,  1,  1,  1,  1,  1,  1,
+    1,  1,  1,  1,  3,  3,  1,  3,  3,  3,  3,  3,  3,  3, 37, 37,
+   37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,  2, 37, 37, 37,
+   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+    2,  2,  2,  2,  2,  2, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+   64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+   90, 90, 90, 90,  2,  2, 90, 90, 90, 90, 90, 90, 90,  2, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95,  2,  2, 95,  2, 37, 37,
+   37,  2,  2,  2,  2,  2,  3,  3,  2,  2,  2,  2,  2,  3,  3,  3,
+    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
+    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
+    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
+    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
+    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
+    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
+    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
+   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
+   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
+    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
+    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
+   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
+    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
+   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
+    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
+    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
+    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
+   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
+    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
+   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
+    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
+    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
+   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
+   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
+    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
+   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
+    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
+    2,  2,  2, 23, 23,  2, 23, 23, 23,  2, 23, 23,  2,  2, 23, 23,
+   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
+    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
+    2,  2,  2, 16, 16,  2,  2,  2,  2,  2, 16, 16, 16,  2, 16, 16,
+   16, 16,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,  2, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,  2, 20, 20, 20,  2,
+   20, 20, 20, 20, 20, 20,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20,
+   20, 20,  2,  2, 20, 20,  2, 36, 36, 36,  2, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 36, 36,  2, 36, 36, 36, 36, 36, 36, 36,
+   36, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2, 36, 36, 36,
+   36, 36, 36,  2, 36,  2,  2,  2,  2,  2,  2,  2, 36, 36,  2,  2,
+   36, 36, 36,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24, 24, 24, 24, 24, 24, 24, 24, 24,  2,  2,  2,  2,  0, 24, 24,
+   24, 24,  2,  2,  2,  2,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
+   18,  2, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+   18, 18,  2, 18,  2, 18, 18, 18, 18, 18, 18, 18,  2,  2, 18, 18,
+   18, 18, 18,  2, 18,  2, 18, 18, 18, 18, 18, 18, 18,  2, 18, 18,
+    2,  2, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25,  2, 25,
+   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,  2,  2,  2, 25, 25,
+   25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25,  0,  0,  0,  0, 25,
+   25,  2,  2,  2,  2,  2, 33, 33, 33, 33, 33, 33, 33, 33,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  8,  2,  2,
+    2,  2,  2,  8,  2,  2,  8,  8,  8,  0,  8,  8,  8,  8, 12, 12,
+   12, 12, 12, 12, 12, 12, 30, 30, 30, 30, 30, 30, 30, 30, 30,  2,
+   30, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
+   30,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30,  2,  2,  2, 30, 30,
+    2,  2,  2,  2,  2,  2, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+   29, 29, 29, 29,  2,  2, 28, 28, 28, 28, 28, 28, 28, 28, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,
+    2,  2,  2,  2,  2,  2, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+   45, 45, 45, 45,  2,  2,  2,  2,  2,  2,  2,  2,  2, 45, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,  0,  0,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 43, 43,  2,  2,  2,  2, 46, 46,
+   46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,  2, 46, 46, 46,  2,
+   46, 46,  2,  2,  2,  2, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31,  2,  2, 31, 31,  2,  2,  2,  2,  2,  2, 32, 32,
+    0,  0, 32,  0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    2,  2,  2,  2,  2,  2, 32,  2,  2,  2,  2,  2,  2,  2, 32, 32,
+   32,  2,  2,  2,  2,  2, 28, 28, 28, 28, 28, 28,  2,  2, 48, 48,
+   48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,  2, 48, 48,
+   48, 48,  2,  2,  2,  2, 48,  2,  2,  2, 48, 48, 48, 48, 52, 52,
+   52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,  2,  2, 52, 52,
+   52, 52, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58,  2,  2,  2,  2, 58, 58,  2,  2,  2,  2,  2,  2, 58, 58,
+   58,  2,  2,  2, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+   54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+   91, 91, 91, 91, 91,  2, 91, 91, 91, 91, 91,  2,  2, 91, 91, 91,
+    2,  2,  2,  2,  2,  2, 91, 91, 91, 91, 91, 91,  2,  2,  1,  1,
+    1,  1,  1,  1,  2,  2,  1,  1,  1,  1,  2,  2,  2,  2, 62, 62,
+   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
+   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+   93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93, 70, 70,
+   70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 70, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73,  6,  6,
+    6,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,
+    1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
+    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
+    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,  9,
+   19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,
+    9,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,  2,  9,  9,  9,
+    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
+    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
+    0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  2, 19, 19,
+   19, 19, 19,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  1,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
+   19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0, 19,  0,
+    0,  0,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  2, 27, 27,
+   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0, 56, 56,
+   56, 56, 56, 56, 56, 56, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
+   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
+    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 13, 13,
+   13, 13, 13, 13,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
+   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
+    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
+    2,  2,  2,  2,  2,  0, 12, 12, 12, 12, 12, 12, 12,  0, 17, 17,
+   17, 17, 17, 17, 17,  0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2, 86, 86,
+   86, 86, 86, 86, 86, 86, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+   77, 77,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79,  0,  0,
+   19, 19, 19, 19, 19, 19,  0,  0,  0, 19, 19, 19, 19, 19,  2, 19,
+   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 65, 65, 65, 65, 75, 75,
+   75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,  2,  2,  2,  2,
+    2,  2,  2,  2, 75, 75, 75, 75,  2,  2,  2,  2,  2,  2, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,  0, 69, 74, 74,
+   74, 74, 74, 74, 74, 74, 74, 74, 74, 74,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12,  2,  2,  2, 84, 84,
+   84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,  2,  0, 84, 84,
+    2,  2,  2,  2, 84, 84, 33, 33, 33, 33, 33, 33, 33,  2, 68, 68,
+   68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,
+   68, 68, 68, 68,  2,  2, 68, 68,  2,  2, 68, 68, 68, 68, 92, 92,
+   92, 92, 92, 92, 92, 92, 92, 92, 92,  2,  2,  2,  2,  2,  2,  2,
+    2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+   87, 87, 87, 87, 87,  2,  2, 30, 30, 30, 30, 30, 30,  2, 19, 19,
+   19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9, 19, 19, 19, 19,
+    0,  0,  2,  2,  2,  2, 87, 87, 87, 87, 87, 87,  2,  2, 87, 87,
+    2,  2,  2,  2,  2,  2, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,
+    2, 12, 12, 12, 12, 12, 13, 13,  2,  2,  2,  2,  2,  2, 19, 19,
+   19, 19, 19, 19, 19,  2,  2,  2,  2,  4,  4,  4,  4,  4,  2,  2,
+    2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14, 14,
+   14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  3,  3,
+    3,  3,  3,  3,  0,  0,  1,  1,  1,  1,  1,  1,  6,  6,  0,  0,
+    0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  3,  3,
+    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
+   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
+   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
+    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
+    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
+    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
+  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
+   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
+    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
+  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
+  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
+  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
+    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,170,170,
+  170,170,170,170,170,170,170,170,170,170,  2,  2,  2,  2,110,110,
+  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
+  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
+   19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 47, 47,
+   47, 47, 47, 47,  2,  2, 47,  2, 47, 47, 47, 47, 47, 47, 47, 47,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,  2, 47, 47,  2,
+    2,  2, 47,  2,  2, 47, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+   81, 81, 81, 81,  2, 81,120,120,120,120,120,120,120,120,116,116,
+  116,116,116,116,116,116,116,116,116,116,116,116,116,  2,  2,  2,
+    2,  2,  2,  2,  2,116,128,128,128,128,128,128,128,128,128,128,
+  128,  2,128,128,  2,  2,  2,  2,  2,128,128,128,128,128, 66, 66,
+   66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
+   72, 72, 72, 72, 72, 72, 72, 72,  2,  2,  2,  2,  2, 72,173,173,
+  173,173,173,173,173,173,173,173,  2,  2,  2,  2,  2,  2, 98, 98,
+   98, 98, 98, 98, 98, 98, 97, 97, 97, 97, 97, 97, 97, 97,  2,  2,
+    2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 57, 57,
+   57, 57,  2, 57, 57,  2,  2,  2,  2,  2, 57, 57, 57, 57, 57, 57,
+   57, 57,  2, 57, 57, 57,  2, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,  2, 57, 57,
+   57,  2,  2,  2,  2, 57, 57,  2,  2,  2,  2,  2,  2,  2, 88, 88,
+   88, 88, 88, 88, 88, 88,117,117,117,117,117,117,117,117,112,112,
+  112,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
+    2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
+   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 78, 78, 78, 78, 83, 83,
+   83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,  2,  2, 82, 82,
+   82, 82, 82, 82, 82, 82, 82, 82, 82,  2,  2,  2,  2,  2,122,122,
+  122,122,122,122,122,122,122,122,  2,  2,  2,  2,  2,  2,  2,122,
+  122,122,122,  2,  2,  2,  2,122,122,122,122,122,122,122, 89, 89,
+   89, 89, 89, 89, 89, 89, 89,  2,  2,  2,  2,  2,  2,  2,130,130,
+  130,130,130,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,
+  130,130,130,130,130,130,144,144,144,144,144,144,144,144,144,144,
+    2,  2,  2,  2,  2,  2,165,165,165,165,165,165,165,165,165,165,
+  165,165,165,165,  2,  2,  2,165,165,165,165,165,165,165,  2,  2,
+    2,  2,  2,  2,165,165,  3,  3,  3,  3,  3,  3,  3,  2,156,156,
+  156,156,156,156,156,156,156,156,  2,156,156,156,  2,  2,156,156,
+    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  2,
+    2,  2,  2,  2,  2,  2,147,147,147,147,147,147,147,147,148,148,
+  148,148,148,148,148,148,148,148,  2,  2,  2,  2,  2,  2,158,158,
+  158,158,158,158,158,158,158,158,  2,  2,  2,  2,  2,  2,153,153,
+  153,153,153,153,153,153,153,153,153,153,  2,  2,  2,  2,149,149,
+  149,149,149,149,149,149,149,149,149,149,149,149,149,  2, 94, 94,
+   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  2,  2,  2,  2,
+   94, 94, 94, 94, 94, 94,  2,  2,  2,  2,  2,  2,  2, 94, 85, 85,
+   85, 85, 85, 85, 85, 85, 85, 85, 85,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 85,  2,  2,101,101,101,101,101,101,101,101,101,  2,
+    2,  2,  2,  2,  2,  2,101,101,  2,  2,  2,  2,  2,  2, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,  2, 96, 96,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,  2,100,100,
+  100,100,100,100,100,100,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36,  2,  2,  2,108,108,108,108,108,108,108,108,108,108,
+    2,108,108,108,108,108,108,108,  2,  2,  2,  2,  2,  2,129,129,
+  129,129,129,129,129,  2,129,  2,129,129,129,129,  2,129,129,129,
+  129,129,129,129,129,129,129,129,129,129,129,129,  2,129,129,129,
+    2,  2,  2,  2,  2,  2,109,109,109,109,109,109,109,109,109,109,
+  109,  2,  2,  2,  2,  2,109,109,  2,  2,  2,  2,  2,  2,107,107,
+  107,107,  2,107,107,107,107,107,107,107,107,  2,  2,107,107,  2,
+    2,107,107,107,107,107,107,107,107,107,107,107,107,107,107,  2,
+  107,107,107,107,107,107,107,  2,107,107,  2,107,107,107,107,107,
+    2,  1,107,107,107,107,107,  2,  2,107,107,107,  2,  2,107,  2,
+    2,  2,  2,  2,  2,107,  2,  2,  2,  2,  2,107,107,107,107,107,
+  107,107,  2,  2,107,107,107,107,107,107,107,  2,  2,  2,171,171,
+  171,171,171,171,171,171,171,171,  2,171,  2,  2,171,  2,171,171,
+  171,171,171,171,  2,171,171,  2,171,  2,  2,171,  2,171,171,171,
+  171,  2,171,171,171,171,171,  2,  2,  2,  2,  2,  2,  2,  2,171,
+  171,  2,  2,  2,  2,  2,137,137,137,137,137,137,137,137,137,137,
+  137,137,  2,137,137,137,137,137,  2,  2,  2,  2,  2,  2,124,124,
+  124,124,124,124,124,124,124,124,  2,  2,  2,  2,  2,  2,123,123,
+  123,123,123,123,123,123,123,123,123,123,123,123,  2,  2,114,114,
+  114,114,114,114,114,114,114,114,114,114,114,  2,  2,  2,114,114,
+    2,  2,  2,  2,  2,  2, 32, 32, 32, 32, 32,  2,  2,  2,102,102,
+  102,102,102,102,102,102,102,102,  2,  2,  2,  2,  2,  2, 33, 33,
+   33, 33,  2,  2,  2,  2,126,126,126,126,126,126,126,126,126,126,
+  126,  2,  2,126,126,126,126,126,126,126,  2,  2,  2,  2,126,126,
+  126,126,126,126,126,  2,142,142,142,142,142,142,142,142,142,142,
+  142,142,  2,  2,  2,  2,125,125,125,125,125,125,125,125,125,125,
+  125,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,125,154,154,
+  154,154,154,154,154,  2,  2,154,  2,  2,154,154,154,154,154,154,
+  154,154,  2,154,154,  2,154,154,154,154,154,154,154,154,154,154,
+  154,154,154,154,  2,154,154,  2,  2,154,154,154,154,154,154,154,
+    2,  2,  2,  2,  2,  2,150,150,150,150,150,150,150,150,  2,  2,
+  150,150,150,150,150,150,150,150,150,150,150,  2,  2,  2,141,141,
+  141,141,141,141,141,141,140,140,140,140,140,140,140,140,140,140,
+  140,  2,  2,  2,  2,  2,121,121,121,121,121,121,121,121,121,  2,
+    2,  2,  2,  2,  2,  2,  7,  7,  2,  2,  2,  2,  2,  2,169,169,
+  169,169,169,169,169,169,169,169,  2,  2,  2,  2,  2,  2,133,133,
+  133,133,133,133,133,133,133,  2,133,133,133,133,133,133,133,133,
+  133,133,133,133,133,  2,133,133,133,133,133,133,  2,  2,133,133,
+  133,133,133,  2,  2,  2,134,134,134,134,134,134,134,134,  2,  2,
+  134,134,134,134,134,134,  2,134,134,134,134,134,134,134,134,134,
+  134,134,134,134,134,  2,138,138,138,138,138,138,138,  2,138,138,
+    2,138,138,138,138,138,138,138,138,138,138,138,138,138,  2,  2,
+  138,  2,138,138,  2,138,138,138,  2,  2,  2,  2,  2,  2,143,143,
+  143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,143,143,
+  143,143,143,143,143,143,143,143,143,143,143,143,143,  2,143,143,
+    2,143,143,143,143,143,143,  2,  2,  2,  2,  2,  2,  2,143,143,
+    2,  2,  2,  2,  2,  2,175,175,175,175,175,175,175,175,175,175,
+  175,175,  2,  2,  2,  2,175,175,  2,  2,  2,  2,  2,  2,145,145,
+  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2,163,163,
+  163,163,163,163,163,163,163,  2,163,163,163,163,163,163,163,163,
+  163,  2,  2,  2,163,163,163,163,163,  2,  2,  2,  2,  2, 86,  2,
+    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
+   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
+  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
+   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,  2, 80, 80,
+   80,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
+  127,127,127,127,127,  2,166,166,166,166,166,166,166,166,166,166,
+    2,  2,  2,  2,  2,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,115,
+  115,115,115,115,115,115,115,115,115,115,115,115,115,  2,115,115,
+    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
+  159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,103,103,
+  103,103,103,103,103,103,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,119,119,
+    2,119,119,119,119,119,  2,  2,  2,  2,  2,119,119,119,167,167,
+  167,167,167,167,167,167,167,167,  2,  2,  2,  2,  2,  2,146,146,
+  146,146,146,146,146,146,146,146,146,  2,  2,  2,  2,  2,172,172,
+  172,172,172,172,172,172,172,  2,  2,172,172,172,172,172,172,172,
+  172,172,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+   99,  2,  2,  2,  2, 99,  2,  2,  2,  2,  2,  2,  2, 99,136,139,
+   13, 13,155,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13,  2,136,136,
+  136,136,136,136,136,136,155,155,155,155,155,155,155,155,155,155,
+  155,155,155,155,  2,  2,  2,  2,  2,  2,  2,  2,  2,155,136,136,
+  136,136,136,136,136,  2,136,136,136,  2,  2,  2,  2,  2, 17, 17,
+   17, 17,  2, 17, 17, 17, 17, 17, 17, 17,  2, 17, 17,  2, 17, 15,
+   15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2,  2,  2,
+   15,  2,  2,  2,  2,  2, 15, 15, 15,  2,  2, 17,  2,  2,  2,  2,
+    2,  2, 17, 17, 17, 17,139,139,139,139,139,139,139,139,139,139,
+  139,139,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
+  105,  2,  2,  2,  2,  2,105,105,105,105,105,  2,  2,  2,105,  2,
+    2,  2,  2,  2,  2,  2,105,105,  2,  2,105,105,105,105,  2,  2,
+    0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  2,  2,  2,  1,  1,
+    1,  1,  1,  1,  1,  2,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,
+    1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,
+    1,  1,  1,  1,  0,  0,  2,  2,  0,  2,  2,  0,  0,  2,  2,  0,
+    0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,
+    0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
+    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
+    0,  0,  0,  2,  0,  2,  0,  2,  0,  0,  0,  0,  0,  0,131,131,
+  131,131,131,131,131,131,131,131,131,131,  2,  2,  2,  2,  2,  2,
+    2,131,131,131,131,131,  2,131,131,131,131,131,131,131,  2,  2,
+    2,  2,  2, 19, 19, 19, 56, 56, 56, 56, 56, 56, 56,  2, 56,  2,
+    2, 56, 56, 56, 56, 56, 56, 56,  2, 56, 56,  2, 56, 56, 56, 56,
+   56,  2,  2,  2,  2,  2,  6,  6,  6,  6,  6,  6,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  6,151,151,151,151,151,151,151,151,151,151,
+  151,151,151,  2,  2,  2,151,151,151,151,151,151,  2,  2,151,151,
+    2,  2,  2,  2,151,151,160,160,160,160,160,160,160,160,160,160,
+  160,160,160,160,160,  2,152,152,152,152,152,152,152,152,152,152,
+    2,  2,  2,  2,  2,152,164,164,164,164,164,164,164,164,164,164,
+    2,  2,  2,  2,  2,  2,168,168,168,168,168,168,168,168,168,168,
+  168,  2,  2,  2,  2,168,174,174,174,174,174,174,174,174,174,174,
+  174,174,174,174,174,  2,174,174,174,174,174,174,  2,  2,  2,  2,
+    2,  2,  2,  2,174,174, 30, 30, 30, 30,  2, 30, 30,  2,113,113,
+  113,113,113,113,113,113,113,113,113,113,113,  2,  2,113,113,113,
+  113,113,113,113,113,  2,132,132,132,132,132,132,132,132,132,132,
+  132,132,  2,  2,  2,  2,132,132,  2,  2,  2,  2,132,132,  3,  3,
+    3,  3,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,  2,  3,  2,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,  2,  3,
+    2,  3,  2,  2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  3,  2,  3,
+    2,  3,  2,  3,  3,  3,  2,  3,  2,  3,  2,  3,  2,  3,  2,  3,
+    3,  3,  3,  2,  3,  2,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  2,  2,  2,  2,  2,  3,  3,  3,  2,  3,  3,  3,  3,  3,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0, 15,  0,
+    0,  2,  2,  2,  2,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  0,  0,  0,  0,  0,
+    0,  0,  0,  2,  2,  0, 13,  2,  2,  2,  2,  2,  2,  2, 13, 13,
+   13,  2,  2,  2,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11, 12, 13,
+    9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,  9,  9,  9,  9,
+   18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23,  9,
+    9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26, 27,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,
+    9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0, 31, 32,  0, 33,
+    0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,
+    0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,  0,  0,  0, 48,
+    0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0,
+   54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0,
+   56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,  0,  0, 66,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 68,  0, 69,
+   70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 72, 73, 74,
+   75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+   91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  0,
+    0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,108,  0,109,  0,
+  110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,  0,  0,116,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  118,119,120,121,  0,122,123,124,125,126,  0,127,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,130,131,
+  132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,
+  148,149,150,151,152,153,154,155,156,157,  0,  0,  0,158,159,160,
+  161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,162,  0,163,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,164,165,  0,  0,  0,  0,  0,  0,  0,166,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 16, 17,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0, 19,
-   20, 21,  0, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  167,  0,  0,  0,168,169,  0,  0,170,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,171,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,173,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 23,  0,  0,  0,  0,  0, 24,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,174,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,
+    0,  0,175,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,176,177,  0,  0,  0,  0,178,179,  0,  0,  0,180,181,182,183,
+  184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,208,209,210,211,212,213,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 26, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13,
-   14, 15, 16, 17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27,
-   28, 29, 30,  0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,
-    0, 36, 37, 38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 41, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,
-    0, 46, 47,  0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,
-    0, 53,  0,  0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,
-    0, 55,  0,  0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,
-    0,  0, 57,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64,
-   65,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
-   82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
-   98, 99,100,101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,
-    0,107,  0,  0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,
-    0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,117,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,
-  124,125,126,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,128,129,130,131,132,133,134,135,136,137,138,
-  139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,
-  155,156,157,  0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,162,  0,163,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,
-    0,  0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,
-    0,170,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  171,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,
-  178,179,  0,  0,  0,180,181,182,183,184,185,186,187,188,189,190,
-  191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-  207,208,209,210,211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
-static const uint16_t _hb_ucd_u16[10784]=
+static const uint16_t _hb_ucd_u16[10832]=
 {
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-   224, 224, 768, 424, 432, 440, 448, 776, 224, 224, 784, 792,  72, 800,  40, 808,
-    48,  48,  48, 816, 824,  48,  48, 832, 840, 848, 856, 864, 872, 880,  48, 888,
-    48,  48,  48, 896, 904,  40,  40,  40,  40, 912,  40,  96, 920, 928, 936, 456,
-    64,  64,  64,  64,  64,  64,  64, 944, 952, 960, 968,  40, 976, 984,  48, 992,
-    72,  72,  72,  40,  40,  40,  48,  48,1000,  48,  48,  48,1008,  48,  48,  48,
-    48,  48,  48,1016,  72,1024,  40,  40,1032, 464,  64,1040,1048,   8,1056,1064,
-  1072,1080,   8,   8,1088,  64,1096,1104,   8,   8,   8,   8,   8,1112,1120,1128,
-  1136,1144,   8,  64,1152,   8,   8,   8,   8,   8, 472,1160, 232,   8,1168,1176,
-     8,1184,1192,1200,   8,1208, 176,   8,1216,1224,   8,   8,1232,  64,1240,  64,
-   480,   8,   8,1248,1256,1264,1272,1280,1288, 240, 128,1296,1304,1312, 144,1320,
-  1328, 240, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 248, 144,1392,
-  1400, 240, 128,1408,1416,1424, 144,1432,1440,1448,1456,1464,1472,1480, 304,1488,
-  1496, 256, 128,1504,1512,1520, 144,1528,1536, 256, 128,1544,1552,1560, 144,1568,
-  1576, 256,   8,1584,1592,1600, 144,1608,1616,1624,   8,1632,1640,1648, 304,1656,
-   312,   8,   8,1664,1672,1680,   0,   0,1688,   8,1696,1704,1712,1720,   0,   0,
-  1728,1736, 320,1744,1752,   8, 152,1760,1768,1776,  64,1784,1792,1800,   0,   0,
-     8,   8,1808,1816, 496,1824,1832,1840,1848,1856,  72,  72,1864,  40,  40,1872,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8, 504,1880,   8,   8, 504,   8,   8,1888, 512, 520,   8,   8,
-     8, 512,   8,   8,   8,1896,1904, 528,   8, 264,  72,  72,  72,  72,  72,1912,
-   536,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,1920,   8,1928,1936,   8,   8,   8,   8,1944,1952,
-     8,1960,   8,1968,   8,1976,1984,1992,   8,   8,   8,2000,2008,2016,  80,2024,
-  2032,  80,   8,   8,2040,   8,   8, 160,2048,   8,2056,   8,   8,   8,   8, 328,
-     8, 120,2064,2072,2080,   8, 112,2088,   8,   8, 184,   8, 192,2096,  24,  24,
-     8,2104,   8,   8,   8,2112,2120,2128,  80,  80,2136,2144,  64, 544,2152,   0,
-  2160,   8,   8,2168,2176, 496,2184,2192, 336,   8,2200, 232,   8,   8,2208,2216,
-     8,   8,2224,2232,2240, 232,   8, 552,2248,  72,  72,2256,2264,2272,2280,2288,
-    40,  40,2296,  96,  96,  96,2304,2312,  40,2320,  96,  96,  64,  64,  64,  64,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,2328,  48,  48,  48,  48,  48,  48,
-   168, 560, 168, 168, 560,2336, 168,2344, 344, 344, 344,2352,2360,2368,2376,2384,
-  2392,2400,2408,2416,2424,2432,2440,2448,2456,2464, 568, 568,2472,2480,2488,2496,
-  2504,2512,2520,2528,2536,  88, 104, 104,2544,2552,2560,  24,2568,2576,  24,2584,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,
-  2592,  24,2600,  24,  24,  24,  24,2608,  24,2616,  56,2624,  24,2632,2640,  24,
-    24,  24, 264,   0, 576,   0,  88,  88,  88,2648,  24,  24,  24,  24,2656,  88,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,2664,2672,  24,  24,2680,
-    24,  24,  24,  24,  24,  24,2688,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,2696,2704,  88,2712,  24,  24,2720,  56,2728,  56,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    56,  56,  56,  56,  56,  56,  56,  56,2736,2744,  56,  56,  56,2752,  56,2760,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,
-    24,  24,  24,  56,2768,  24,  24,2776,  24,  24,  24,  24,  24,  24,  24,  24,
-    72,  72,  72,  40,  40,  40,2784,2792,  48,  48,  48,  48,  48,  48,2800,2808,
-    40,  40,2816,   8,   8,   8,2824,2832,   8, 200, 208, 208, 208, 208,  64,  64,
-  2840,2848,2856,2864,2872,2880,   0,   0,  24,2888,  24,  24,  24,  24,  24, 352,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 272,   0,  24,
-  2896,2904,2912,2920, 312,   8,   8,   8,   8,2928, 536,   8,   8,   8,   8,2936,
-  2944,   8,   8, 312,   8,   8,   8,   8, 120,2952,   8,   8,  24,  24,2960,   8,
-    24, 584, 592,  24,2968, 600,  24,  24, 592,  24,  24, 600,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,  24,  24,  24,  24,
-     8,2976,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8, 152,  24,  24,  24, 608,   8,   8, 552,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-  2984,   8,2992,   0,  48,  48,3000,3008,  48,3016,   8,   8,   8,   8,3024,3032,
-   456,3040,3048,3056,  48,  48,  48,3064,3072,3080,3088,3096,3104,3112,   0,3120,
-  3128,   8,3136,3144,   8,   8,   8,3152,3160,   8,   8,3168,3176,  80,  64,3184,
-   232,   8,3192,   8,3200,3208,   8, 152, 480,   8,   8,3216,3224, 360,3232,3240,
-     8,   8,3248,3256,3264,3272,   8,3280,   8,   8,   8,3288,3296,3304,3312,3320,
-  3328,3336, 208,  40,  40,3344,3352,  40,  40,  40,  40,  40,   8,   8,3360,  80,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 368,   8,3368,   8,   8, 184,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8, 112,   8,   8,   8,   8,   8,   8, 192,   0,   0,
-  3376,3384,3392,3400,3408,   8,   8,   8,   8,   8,   8,3416,3424,3432,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,3440,  24,   8,   8,   8,   8,3448,   8,   8,3456,   0,   0,3464,
-    64,3472,  64,3480,3488,3496,3504,3512,   8,   8,   8,   8,   8,   8,   8,3520,
-  3528, 424, 432, 440, 448,3536,3544,3552,   8,3560,   8, 120,3568,3576,3584,3592,
-  3600,   8, 520,3608, 112, 112,   0,   0,   8,   8,   8,   8,   8,   8,   8, 176,
-  3616,  88,  88,3624, 104, 104, 104,3632,3640, 280, 376,   0,   0,  24,  24,3648,
-     0,   0,   0,   0,   0,   0,   0,   0,   8, 152,   8,   8,   8, 248,3656,3664,
-     8,   8,3672,   8,3680,   8,   8,3688,   8,3696,   8,   8,3704,3712,   0,   0,
-    72,  72,3720,  40,  40,   8,   8,   8,   8, 112,  80,  72,  72,3728,  40,3736,
-     8,   8, 616,   8,   8,   8,3744, 624, 624,3752,3760,3768,   8,   8,   8, 368,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8, 200,   8, 328, 616,   0,3776,  96,  96,3784,   0,   0,   0,   0,
-  3792,   8,   8,3800,   8,3808,   8,3816,   8, 120,3824,   0,   0,   0,   8,3832,
-     8,3840,   8,3848,   8, 192,   0,   0,   8,   8,   8,3856,  88, 632,  88,  88,
-  3864,3872,   8,3880, 640,3888,   8,3896,   8, 648,   0,   0,3904,   8,3912,3920,
-     8,   8,   8,3928,   8,3936,   8,3944,   8,3952,3960,   0,   0,   0,   0,   0,
-     8,   8,   8,   8, 160,   0,   0,   0,  72,  72,  72,3968,  40,  40,  40,3976,
-     8,   8,3984,  80,3992,  72,4000,  40,4008,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,  88,4016,   8,   8,4024, 656,4032,4040,   0,4048,
-     8, 648,4056,   8, 472,4064,   0,   8,4072,   0,   0,   8,4080,   0,   8, 200,
-  4088,   8,   8,4096,4104, 632,4112,4120, 336,   8,   8,4128,4136,   8, 160,  80,
-  4144,   8,4152,4160,4168,   8,   8,4176, 336,   8,   8,4184,4192,4200, 384,4208,
-     8, 488, 664,4216,4224,   0,   0,   0,4232,4240,4248,   8,   8,4256,4264,  80,
-  4272, 240, 128,4280,4288,4296,4304,4312,4320,   8,   8,4328,4336,4344,4352,   0,
-     8,   8,   8,4360,4368,4376, 656,   0,   8,   8,   8,4384,4392,  80,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   8,   8, 672,4400,4408,4416,   0,   0,
-     8,   8,   8,4424,4432,  80,4440,   0,   8,   8,4448,4456,  80, 288,4464,   0,
-     8,4472,4480,4488, 200,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8, 664,4496,   0,   0,   0,   0,   0,   0,  72,  72,  40,  40, 320,4504,
-  4512,4520,   8,4528,4536,  80,   0,   0,   0,   0,4544,   8,   8,4552,4560,   0,
-  4568,   8,   8,4576,4584,4592,   8,   8,4600,4608,4616,   8,   8,   8,   8, 160,
-  4624,   0,   0,   0,   0,   0,4632,   0,   0,   0,   0,   0,   8,   8,4640,  80,
-   128,   8, 672,4648,4656, 320, 528,4664,   8,4672,4680,4688,   0,   0,   0,   0,
-  4696,   8,   8,4704,4712,  80,4720,   8,4728,4736,  80,   8,   8,4744,  80,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,4752,
-  4760, 256,   8,4768,4776,4784,   0,   0,   0,   0,   0, 248,  88,4792,4800,4808,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8, 192,   0,   0,   0,   0,   0,   0,
-   104, 104, 104, 104, 104, 104,4816,4824,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8, 368,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,4832,
-     8,   8,   8, 136,4840,4848,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 176,
-     8,   8,   8,   8, 200,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8, 680,4856,  80,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8, 160,   8, 120, 360,   8,   8,   8,   8, 120,  80,   8, 112,4864,
-     8,   8,   8,4872,4880,4888,4896,4904,   8,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,4912,   8,4920,  80,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,  72,  72,  40,  40,  88,4928,  72,4936,  40,4944,   0,   0,
-     8,   8,   8,   8,4952,4960, 688, 688,4968,4976,   0,   0,   0,   0,4984,4992,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 328,   0,5000,
-     8, 120,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8, 696,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,5008,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8, 696,5016,   0,5024,5032,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 184,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8,   8,   8,   8, 176, 152, 160,5040,5048,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5056,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5064,  24, 376,  24,5072,
-    64,  64, 544,  64, 704,  24,  24,  24,  24,  24,  24,  24, 352,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 272,
-    24,  24,5080,  24,  24,  24,5088,5096,5104,  24,5112,  24,  24,  24, 576,   0,
-    24,  24,  24,  24,5120,   0,   0,   0,   0,   0,   0,   0,  88, 712,  88, 712,
-    24,  24,  24,  24,  24, 608,  88, 640,   0,   0,   0,   0,   0,   0,   0,   0,
-    72, 296,  40, 720, 728,5128, 168,  72, 392,5136,5144,5152,5160,  72, 296,  40,
-  5168,5176,  40,5184,5192,5200, 736,  72, 744,  40,  72, 296,  40, 720, 728,  40,
-   168,  72, 392, 736,  72, 744,  40,  72, 296,  40,5208,  72,5216,5224,5232,5240,
-    40,5248,  72,5256,5264,5272,5280,  40,5288,  72,5296,  40,5304, 288, 288, 288,
-    64,  64,  64,5312,  64,  64,5320,5328,5336,5344, 464,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5352,5360,5368,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5376,5384,5392,  96,  96,  96,5400,   0,5408,   0,   0,   0,   0,   0,   0,   0,
-     8,   8, 152,5416,5424,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   8,5432,   0,   8,   8,5440,5448,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,5456,  80,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8, 680,5464,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8, 120,5472,5480,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,5488, 120,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,5496, 704,   0,   0,
-    72,  72, 392,  40,5504, 360,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0, 384,  88,  88,5512,5520,   0,   0,   0,   0,
-   384,  88,5528,5536,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5544,   8,5552,5560,5568,5576,5584,5592,5600, 184,5608, 184,   0,   0,   0,5616,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    24,  24, 216,  24,  24,  24,  24,  24,  24, 352, 584, 400, 400, 400,  24, 272,
-  5624,  24,  24,  24,  24,  24,  24,  24,  24,  24, 408,   0,   0,   0,5632,  24,
-  5640,  24,  24, 216, 752, 760, 272,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5648,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5656, 280, 280,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 264, 216, 376,
-   216,  24,  24,  24, 416, 264,  24,  24, 416,  24, 408, 216, 760,5664,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24, 416, 408, 280,5672,  24,  24,  24,5680,5688,5696, 752,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,5704,  24,  24,  24,  24,  24,5712,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   0,   0,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8, 112,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 112,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 248,   8,
-     8,   8,   8,   8,   8, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8, 176,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8, 192,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5720,   0, 136, 136, 136, 136, 136, 136,   0,   0,   0,   0,   0,   0,   0,   0,
-    64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,   0,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,5728,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,
-    40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,  72,
-    64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,
+     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
+    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
+    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
+     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
+    13,  13,  13,  42,   9,  43,  11,  11,  44,  45,  32,  46,  47,  48,  49,  50,
+    51,  52,  48,  48,  53,  32,  54,  55,  48,  48,  48,  48,  48,  56,  57,  58,
+    59,  60,  48,  32,  61,  48,  48,  48,  48,  48,  62,  63,  64,  48,  65,  66,
+    48,  67,  68,  69,  48,  70,  71,  48,  72,  73,  48,  48,  74,  32,  75,  32,
+    76,  48,  48,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+    90,  83,  84,  91,  92,  93,  94,  95,  96,  97,  84,  98,  99, 100,  88, 101,
+   102,  83,  84, 103, 104, 105,  88, 106, 107, 108, 109, 110, 111, 112,  94, 113,
+   114, 115,  84, 116, 117, 118,  88, 119, 120, 115,  84, 121, 122, 123,  88, 124,
+   125, 115,  48, 126, 127, 128,  88, 129, 130, 131,  48, 132, 133, 134,  94, 135,
+   136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
+   146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
+    48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,  80,
-    96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,
-   112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
-    88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,
-   128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-   192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
-   176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
-   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
-   104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-    24,  24,  24,  24,  24,  24,  24,  24,1104,  48,  48,1112,1104,  48,  48,1112,
-    24,  24,  24,  24,  24,1288,  24,1288,  48,  48,1512,  48,  48,  48,1512,  48,
-    48,  48,  48,  48,  48,  48,  48,2048,  24,  24,  24,  24,2056,2064,  24,  24,
-   104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,2072,2080,
-  2088,2096, 144, 144,2104, 144, 144, 144, 144, 144, 144, 144,2112, 296, 144, 144,
-   120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
-  2120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
-   120, 120, 120, 120, 120, 120,1520, 592, 592, 592,2128,1520, 592, 592, 592, 592,
-   592,2136,2144, 352, 352, 352, 352, 352, 352,   0, 352, 352, 352,2152,2160,   0,
-  1528,2168,  56,2176,  56,  56,  56,  56,2184,2192,2200,  56,  56,  56,2208,  56,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,1528,  56,  56,  56,  56,
-   496,2216, 496, 496, 496, 496, 496, 496, 496,2224,  56,  56,  56,  56,  56,  56,
-   784, 784, 784, 784, 784, 784,2232,   0, 688, 688, 688, 688, 688, 688, 688,2240,
-   792, 792, 792, 792, 792,2248, 792,2256,1296,1296,1296,2264, 496,2272,  56,  56,
-    56,  56,2280,  56,  56,  56,  56,  56,  56,  56,  56,  56,2288,  56,  56,  56,
-   240, 240, 240, 240, 240, 240, 240, 240, 240, 240,2296, 240,2304, 240, 240, 240,
-  2312,1536,2320,1120,1120,2328,2336,2344,1536,2352,2360,2368,2376,1120,1120,2384,
-  2392,1544,2400,1304,1304,2408,2416,2424,1544,2432,2440,2448,2456,1304,2464,   0,
-  2472,1552,2480,1312,1312,2488,2496,2504,1552,2512,2520,   0,2528,1312,2536,2544,
-  2552,1560,2560,1128,1128,2568,2576,2584,1560,2592,2600,2608,2616,1128,1128,   0,
-  2624,1320,1568,2632,2640,1320, 504,2648,1320,1568,2656,   0,2664, 504, 504,2672,
-   800,1576,1584, 800, 800,1584, 800,2680,1576,2688,2696,2704,2712, 800,2720, 800,
-  1136,1592,1600,1136,1136,1600,2728,2736,1592,2744,2752,2760,2768,1136,2776,   0,
-   400,1608,1616, 400, 400, 400, 400, 400,1608,1616,2784, 400,2792, 400, 400, 400,
-  2800, 808,1624,2808, 808, 808,2816,2824,1624,2832,2840, 808,2848, 808,2856,   0,
-  2864, 512, 512, 512, 512, 512, 512,2872, 512, 512, 512,2880,   0,   0,   0,   0,
-  2888,2896, 984, 984,2904, 984, 984,2912,2920,2928, 984,2936,   0,   0,   0,   0,
-   224, 224, 224, 224, 224, 224, 224, 224, 224,1328, 224, 224, 224,2944,1328, 224,
-   224, 224, 224,1328, 224, 224, 224,1632, 224,1632,2952,2960,   0,   0,   0,   0,
-   200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200,
-   200, 200, 200, 200, 256, 256, 256, 256,1640,1648, 256, 256, 256, 256, 256,2968,
-   160, 160, 160, 160, 160, 160, 160, 160, 160, 816, 280, 816, 160, 160, 160, 160,
-   160, 816, 160, 160, 160, 160, 816, 280, 816, 160, 280, 160, 160, 160, 160, 160,
-   160, 160, 816, 160, 160, 160, 160, 160, 160, 160, 160,2976, 160, 160, 160,2984,
-   160, 160, 160,2992, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,1656,1656,
-  1336,1336,1336,3000, 408, 408, 408, 408, 408, 408, 408, 408, 408,3008, 408,3016,
-  1664,1664,3024,3032,1672,1672,3040,   0,1680,1680,3048,   0,3056,3064,3072,   0,
-   272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,3080, 272,1688, 272,1688,
-  3088, 248, 248,3096, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,3104,
-   248, 248, 248, 248, 248,3112,  80,  80,  80,  80,  80,  80,  80,  80,3120,   0,
-   824, 824, 824,3128, 824,1696, 824,1696,3136, 824,1344,1344,1344,3144,3152,   0,
-   520, 520, 520, 520, 520,3160, 520, 520, 520,3168, 520,3176, 272, 272, 272, 272,
-  1352,1352,1352,3184, 320, 320, 320, 320, 320, 320, 320,3192, 320, 320, 320,3200,
-   320,1704, 320,1704, 320,3208, 104, 104, 104, 104, 104,1712, 104,3216,   0,   0,
-   304, 304, 304, 304, 304, 304, 304, 304, 304,3224, 304, 304, 304, 304, 304, 304,
-   528, 528, 528, 528, 528, 528, 528, 528, 832, 832, 832, 832, 832, 832,3232,3240,
-   600, 600, 600, 600, 600, 600, 600,3248, 600,3256, 840, 840, 840, 840, 840, 840,
-   120,3264, 256, 256, 256, 256, 256,3272, 528,   0,3280, 104,3288,3296,3304,3312,
-    48,  48,  48,  48,3320,3328,  48,  48,  48,  48,  48,3336,3344,3352,  48,3360,
-    48,  48,  48,  48,  48,  48,  48,3368, 104, 104, 104, 104, 104, 104, 104, 104,
-   144, 144, 848, 848, 144, 144, 144, 144, 848, 848, 144,3376, 144, 144, 144, 848,
-   144, 144, 144, 144, 144, 144,1720, 144,1720, 144,3384,3392, 144, 144,3400,1728,
-    24,3408,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 992,  24,3416,3424,
-    24, 608,  48,1736,  24,  24,  24,  24, 616,   0, 104, 104, 104, 104,3432,   0,
-    24,  24,  24,  24,3440,3448,1288,  24,  24,3456,  24,  24,  48,  48,  48,  48,
-    48,3464,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24, 616,   0,   0,  24,1360,   0,   0,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,1744,  24,
-   312, 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, 312,  48,  48,  48,  48,
-   296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,3472,3480,
-   256, 256, 256, 256,1640,1648, 696, 696, 696, 696, 696, 696, 696,1752,3488,1752,
-   160, 160, 280,   0, 280, 280, 280, 280, 280, 280, 280, 280, 120, 120, 120, 120,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 416,   0,   0,   0,   0,
-     8,   8,   8,3496,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,3504,   0,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 856,   0,   0,   0,  24,  24,
-  3512,  24,  24,  24,3520,3528,  24,3536,3544, 152, 152, 152, 152, 152, 152, 152,
-   152, 152,3552,3560,1760, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,3568,
-  3576, 536, 536, 536, 536, 536,3584,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-    16,1144,  24,  24, 536, 536, 536, 536,  24,  24,  24,  24, 416,3592, 184, 184,
-    16,  16,  16,1144,  24,  24,  24,  24,  24,  24,  24,  24,  16,  16,  16,3600,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 184, 184, 184, 184, 184,3608,
-   184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,  24,  24,  24,  24,  24,
-     8,   8,   8,   8,   8,   8,   8,   8,  24,  24,  24,  24,  24,  24,  24,  24,
-    72,3616,  72,  72,  72,  72,  72,  72,3624,   0, 864, 864, 864, 864, 864, 864,
-   176, 176, 176, 176, 176,3632,   0,   0, 120, 120, 120, 120, 120, 120, 120, 120,
-   120, 120, 120, 120,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,  88,   0,
-    24,  24,  24,  24,3640,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,3648,  48,  48,  48,  48,  48,  48,  48,  48,  48,1736,   0,   0,3656,  48,
-  1000,1000,1000,1000,1000,3664,  24, 616, 704, 704, 704, 704, 704, 704, 704,   0,
-   544, 544, 544, 544, 544, 544, 544, 544,3672,3680, 544,3688, 240, 240, 240, 240,
-  1008,1008,1008,1008,1008,3696,1152,1152,1152,1152,3704,3712,  16,  16,  16,3720,
-   424, 424, 424, 424, 424, 424, 424, 424, 424,3728, 424,3736, 200, 200, 200,3744,
-   624, 624, 624, 624, 624, 624,3752,   0, 624,3760, 624,3768, 200, 200, 200, 200,
-   632, 632, 632, 632, 632, 632, 632, 632,3776,   0,   0,3784, 640, 640,3792,   0,
-  1368,1368,1368,   0, 280, 280,  48,  48,  48,  48,  48,3800,3808,3816, 232, 232,
-   232, 232, 232, 232, 232, 232, 232, 232, 640, 640, 640, 640, 640,3824, 640,3832,
-    16,  16,  16,  16,1768,   0,  16,  16,1144,3840,  16,  16,  16,  16,  16,1768,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 856,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,1776,   0,   0,   0,   0,
-  1784,   0,3848,3856, 352, 352,3864,3872,3880, 352,  56,  56,  56,  56,  56,  56,
-    56,  56,  56,  56,  56,  56,  56,3888,  56,  56,  56,  56,  56,  56,  56,  56,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,   0,   0,   0,   0,  56,  56,
-   104, 104,  24, 616, 104,3896,  24,  24,  24,  24,1792,  24, 608, 328,3904,  56,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,3912,
-   712,  24,  24,  24,1104,  48,  48,1112,1104,  48,  48,1112,3920, 184,1760, 184,
-   184, 184, 184,3928,  16,  16,  16,1144,1376,1376,1376,3936, 608, 608,   0,3944,
-   216,3952, 216, 216,3960, 216, 216,3968, 216,1800, 216,1800,   0,   0,   0,   0,
-   216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,3976,
-  1808,  24,  24,  24,  24,  24,3984,  24, 144, 144, 144, 144, 144, 144, 144, 144,
-   144,1728,  24, 872,3992,   0,   0,   0,   0,   0,  24,  24,  24,  24,  24,4000,
-  1384,1384,1384,4008, 880, 880, 880, 880, 880, 880,4016,   0,4024,  24,  24, 328,
-  1160,1160,1160,1160,4032,4040,1392,1392,1392,4048,1016,1016,1016,1016,1016,4056,
-  1400,1400,1400,4064,1024,1024,1024,1024,4072,1024,4080,   0,   0,   0,   0,   0,
-   432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 888, 888, 888, 888, 888, 888,
-  1168,1168,1168,4088,1168,4096, 648, 648, 648, 648,1816, 648, 648, 648, 648,1816,
-  1032,1032,1032,1032,1032,   0, 896, 896, 896, 896, 896, 896,4104,4112,1176,1824,
-  1176,1824,4120,1176,1832,1176,1832,4128, 904, 904, 904, 904, 904, 904,4136,   0,
-   168, 168, 168, 168, 168, 168,4144,   0, 168, 168,4152,   0, 168,   0,   0,   0,
-  4160,  48,  48,  48,  48,  48,4168,1840,   0,   0,   0,   0,   0,   0,   0,   0,
-  4176,4184,1184,1184,1184,1184,4192,4200,1408,1408,4208,1408,1192,1192,1192,1192,
-  1200,1200,1200,4216,4224,1200,   0,   0,   0,   0,   0,   0,1848,1848,4232,4240,
-  1416,1416,1416,4248,1424,1424,1424,4256,1432,1432,1432,4264,   0,   0,   0,   0,
-  1208,1208,1208,1208, 440, 440, 440,4272, 440, 440,4280, 440, 440, 440, 440, 440,
-  4288,4296,4304,4312,1216,1216,4320,4328,1216,1856,1216,1856,1224,1224,1224,1224,
-  1232,1232,1232,1232,   0,   0,   0,   0,1240,1240,1240,1240,1864,4336,1864,   0,
-   912, 912, 912, 912, 912, 912,4344,4352,1440,1440,4360,1440,1448,1448,4368,1448,
-  1872,1872,4376,4384,   0,4392,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   552, 552, 552, 552, 552, 552, 552, 552, 552,4400,   0,   0,   0,   0,   0,   0,
-   360, 360, 360, 360, 360, 360,1880,   0, 360, 360, 360, 360, 360, 360,1880,4408,
-   920, 920, 920, 920, 920,   0, 920,4416, 928, 928, 928, 928,1888,4424, 928, 928,
-  1888,4432,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  56,  56,  56,4440,
-  1040,1040,1040,1040,1040,4448,4456,   0,1896,   0,  56,4464,   0,   0,   0,1896,
-  1048,1048,1048,1048,1048,   0,1056,1056,1056,1056,1056,4472,   0,   0,1456,1456,
-  1456,4480,   0,   0,   0,   0,1464,1464,1464,4488,   0,   0,1904,1904,4496,   0,
-   368, 368, 368, 368, 368, 368, 368, 368, 368,1912,4504, 368, 368, 368,1912,4512,
-   656, 656, 656, 656, 656, 656, 656, 656,4520,4528,1248,1248,1248,4536,1248,4544,
-   664, 664, 664, 664, 664, 664,4552, 664, 664,   0,1256,1256,1256,1256,4560,   0,
-   336, 336, 336, 336, 336, 336, 336, 336, 336, 336, 336, 336,4568, 808,4576,   0,
-   720, 720,4584, 720, 720, 720, 720, 720,4592,   0,   0,   0,   0,   0,   0,   0,
-  4600,4608,1920,4616,1920,4624, 672, 672, 672, 672, 672, 672, 672,4632, 672,4640,
-  4648,1928,4656,1936,1936,4664,4672,4680,1928,4688,4696,4704,4712,1944,1944,   0,
-   936,4720, 936, 936, 936, 936,1952, 936,4728,4736,1952,4744,4752,   0,   0,   0,
-   384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384,4760,4768,   0,   0,   0,
-   448, 448, 448, 448, 448, 448, 448, 448, 448,   0, 448,4776,   0,   0,   0,   0,
-   456, 456, 456, 456, 456, 456,1960, 456, 456, 456, 456,1960,   0,   0,   0,   0,
-   560, 560, 560, 560, 560, 560, 560, 560,4784,   0, 560,4792, 248,4800,   0,   0,
-   680, 680, 680, 680, 680, 680, 680,1968, 680,1968, 200, 200,4808,   0,   0,   0,
-   944, 944, 944,4816, 944,4824, 944, 944,4832,   0,   0,   0,   0,   0,   0,   0,
-   728, 728, 728, 728, 728, 728, 728,4840,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 464, 464, 464, 464, 464, 464, 464, 464, 464, 464,4848,4856,
-  1976,4864,4872,1264,1264,1264,4880,4888,1976,   0,1264,4896,   0,   0,   0,   0,
-     0,   0,   0,   0, 952,1984, 952, 952, 952, 952, 952,1984,4904,   0,   0,   0,
-   568, 568, 568, 568, 568, 568, 568, 568, 568,   0, 472, 472, 472, 472, 472, 472,
-   472, 472, 472, 472,4912,   0,  80,  80, 736, 736, 736, 736, 736, 736, 736,4920,
-   240,4928,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 336,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1064,1064,1064,1064,1992,   0,1064,1992,
-   576,4936, 576, 576, 576, 576,4944, 576,4952,   0, 576, 576, 576,4960, 960, 960,
-   960, 960,4968, 960, 960,4976,4984,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  2000,4992, 968, 968, 968, 968,2000,5000, 968,   0, 968,5008,5016,5024,1272,1272,
-  1272,5032,5040,5048,1272,5056, 976, 976, 976, 976, 976,5064, 976,5072,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1472,1472,1472,5080,
-   584, 584,5088, 584, 584, 584, 584,5096, 584, 584, 584,5104,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,5112,   0, 504, 504, 504, 504, 504, 504,5120,5128,
-    64,  64,  64,5136,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,5144,5152,   0,
-    64,  64,  64,  64,  64,  64,  64,  64,5160,   0,   0,   0,   0,   0,   0,   0,
-     0,   0, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376,5168,   0,
-    40,  40,  40,  40,  40,  40,  40,  40,  40,  40,5176,   0,  40,  40,  40,  40,
-    40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,  40,5184,
-   112, 112, 112, 112, 112, 112, 112, 112,5192,   0,   0,   0,   0,   0,   0,   0,
-   744, 744, 744, 744, 744, 744, 744,5200,   0,   0,   0,   0,   0,   0,   0,   0,
-    88,  88,  88,  88,  88,  88,  88,5208,1280,1280,1280,5216,1280,5224, 480, 480,
-   480, 480, 480, 480, 480, 480, 480,5232, 480,5240,1480,1480,1480,2008,2008,   0,
-   344, 344, 344, 344, 344, 344, 344, 344,5248,   0, 344,2016,2016, 344, 344,5256,
-   344, 344,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0, 752, 752, 752, 752, 752, 752, 752,5264,
-     0,   0,   0,   0,   0,   0,   0,   0, 392, 392, 392, 392, 392, 392, 392, 392,
-   392, 392, 392,5272,1072,1072,1072,5280,1072,1072,5288,   0,   0,   0,   0,   0,
-   264, 264, 264, 264, 264, 264, 264, 264, 264,5296, 264, 264, 264, 264, 264, 264,
-   264,5304, 264, 264,   0,   0,   0,   0,   0,   0,   0,   0,5312,   0,5320,   0,
-   128, 128, 128, 128, 128, 128, 128, 128, 128, 128,5328,   0,   0,   0,   0,5336,
-    32,  32,  32,5344,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,5352,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,5360,5368,
-  5376, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152,
-   152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152,
-   152, 152, 152, 152,5384,   0,5392,   0,   0,   0,5400,   0,5408,   0, 136, 136,
-   136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,5416,
-   288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288,5424, 288,5432,
-   288,5440, 288,5448, 328,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 872,
-    24,  24,  24,  24,  24,  24, 328,2024,  24,  24, 760,   0,  24,  24, 760,   0,
-   104, 104, 104, 104, 104,1712, 104, 104,5456,   0,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24, 328,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 416,   0,
-    24,  24,  24,  24, 608, 712,  24,  24,  24,  24,  24,  24,5464,5472,  24,5480,
-  5488,5496,  24,  24,  24,5504,  24,  24,  24,  24,  24,  24,  24,1360,   0,   0,
-   144, 144, 144, 144, 144, 144, 144, 144, 848,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,  24,  24, 328,   0,  24,  24, 328,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 608,   0,  24,  24,  24, 760,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 992,  24,  24,  24,  24,  24,
-    24,  24,  24, 992,5512,5520,  24,5528,5536,  24,  24,  24,  24,  24,  24,  24,
-  5544,5552, 992, 992,  24,  24,  24,5560,5568,2024,5576,  24,  24,  24,  24,  24,
-    24,  24,  24,  24, 416,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,1744,  24,  24,  24,  24,  24,  24,
-    96,5584,   0,5592,5600,  96,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    48,  48,  48,1784,5608,1840,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5616, 312, 312,5624,5632,5640, 120, 120, 120, 120, 120, 120, 120,5648,   0,   0,
-     0,5656,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   768, 768, 768, 768, 768,5664, 768,5672, 768,5680,   0,   0,   0,   0,   0,   0,
-     0,   0,1488,1488,1488,5688,   0,   0, 776, 776, 776, 776, 776, 776, 776,5696,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1080,1080,1080,1080,1080,5704,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1088,1088,1088,1088,1088,5712,
-     0,   0,   0,   0,   0,   0,   0,   0,1096,1096,1096,5720,1096,1096,5728,5736,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 280,5744, 160, 280,
-   208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
-   208, 208, 208, 208, 208, 208, 208, 208,5752, 208,5760,   0,   0,   0,   0,   0,
-   488, 488, 488, 488, 488, 488, 488, 488, 488,5768, 488,5776,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 712,  24,
-    24,  24,  24,  24,  24,  24, 872,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   712,  24,  24,  24,  24,  24,  24, 416,   0,   0,   0,   0,   0,   0,   0,   0,
-  5784,  56,  56,  56,1496,5792,1504,5800,5808,5816,1496,5824,1496,1504,1504,5832,
-    56,2032,  56,2040,5840,2032,  56,2040,   0,   0,   0,   0,   0,   0,5848,   0,
-    24,  24,  24,  24,  24, 328,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24, 328,   0,  24, 608, 712,  24, 712,  24, 712,  24,  24,  24, 416,   0,
-    24,  24,  24,  24,  24, 416,   0,   0,   0,   0,   0,   0,5856,  24,  24,  24,
-  5864,   0,  24,  24,  24,  24,  24, 328,  24, 760, 616,   0, 416,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5872,  24, 872,  24, 872,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 616,  24, 328, 760,   0,
-    24, 328,  24,  24,  24,  24,  24,  24,  24,   0,  24, 616,  24,  24,  24,  24,
-    24,   0,  24,  24,  24, 416,  24, 328, 616,   0,  24, 760,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,   0,  24, 416,  24, 872,
-    24,5880,  24,  24,  24,  24,  24,  24, 608,5888,  24,5896,  24,1808,  24, 760,
-    24,  24,1792,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,1360,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   0,   0,   0,   0,
-     8,   8,   8, 856,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8, 856,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,5904,   0,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 856,   0,   0,   0,   0,
-     8,   8,   8, 856,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,5912,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,1776,
-  5920,   0,   0,   0,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
+    48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
+    48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
+   178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
+    48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
+   194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
+    48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
+    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215,  32, 216, 217, 140,
+   218,  48,  48, 219, 220, 160, 221, 222, 223,  48, 224,  64,  48,  48, 225, 226,
+    48,  48, 227, 228, 229,  64,  48, 230, 231,   9,   9, 232, 233, 234, 235, 236,
+    11,  11, 237,  27,  27,  27, 238, 239,  11, 240,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 241,  13,  13,  13,  13,  13,  13,
+   242, 243, 242, 242, 243, 244, 242, 245, 246, 246, 246, 247, 248, 249, 250, 251,
+   252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 262, 263, 264, 265, 266,
+   267, 268, 269, 270, 271, 272, 273, 273, 274, 275, 276, 209, 277, 278, 209, 279,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   281, 209, 282, 209, 209, 209, 209, 283, 209, 284, 280, 285, 209, 286, 287, 209,
+   209, 209, 176, 140, 288, 140, 272, 272, 272, 289, 209, 209, 209, 209, 290, 272,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 291, 292, 209, 209, 293,
+   209, 209, 209, 209, 209, 209, 294, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 295, 296, 272, 297, 209, 209, 298, 280, 299, 280,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   280, 280, 280, 280, 280, 280, 280, 280, 300, 301, 280, 280, 280, 302, 280, 303,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   209, 209, 209, 280, 304, 209, 209, 305, 209, 209, 209, 209, 209, 209, 209, 209,
+     9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
+    11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
+   315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323, 140, 209,
+   324, 325, 326, 327, 136,  48,  48,  48,  48, 328, 178,  48,  48,  48,  48, 329,
+   330,  48,  48, 136,  48,  48,  48,  48, 200, 331,  48,  48, 209, 209, 332,  48,
+   209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
+    48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 230,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+   339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
+    31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
+   357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
+    64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
+    48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
+   383, 384, 314,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
+   392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
+    32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
+   411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
+   420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
+   422, 272, 272, 423, 273, 273, 273, 424, 425, 426, 427, 140, 140, 209, 209, 428,
+   140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
+    48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
+     9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
+    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
+   448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
+    48, 454,  48, 455,  48, 207, 140, 140,  48,  48,  48, 456, 272, 457, 272, 272,
+   458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
+    48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
+    48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 272, 479,  48,  48, 480, 481, 482, 483, 140, 484,
+    48, 464, 485,  48,  62, 486, 140,  48, 487, 140, 140,  48, 488, 140,  48, 313,
+   489,  48,  48, 490, 491, 457, 492, 493, 223,  48,  48, 494, 495,  48, 196, 192,
+   496,  48, 497, 498, 499,  48,  48, 500, 223,  48,  48, 501, 502, 503, 504, 505,
+    48,  97, 506, 507, 508, 140, 140, 140, 509, 510, 511,  48,  48, 512, 513, 192,
+   514,  83,  84, 515, 516, 517, 518, 519, 520,  48,  48, 521, 522, 523, 524, 140,
+    48,  48,  48, 525, 526, 527, 481, 140,  48,  48,  48, 528, 529, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 530, 531, 532, 533, 140, 140,
+    48,  48,  48, 534, 535, 192, 536, 140,  48,  48, 537, 538, 192, 539, 540, 140,
+    48, 541, 542, 543, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 506, 544, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 545,
+   546, 547,  48, 548, 549, 192, 140, 140, 140, 140, 550,  48,  48, 551, 552, 140,
+   553,  48,  48, 554, 555, 556,  48,  48, 557, 558, 559,  48,  48,  48,  48, 196,
+   560, 140, 140, 140, 140, 140, 561, 140, 140, 140, 140, 140,  48,  48, 562, 192,
+    84,  48, 530, 563, 564, 148, 175, 565,  48, 566, 567, 568, 140, 140, 140, 140,
+   569,  48,  48, 570, 571, 192, 572,  48, 573, 574, 192,  48,  48, 575, 192, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 576,
+   577, 115,  48, 578, 579, 580, 140, 140, 140, 140, 140, 100, 272, 581, 582, 583,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
+   273, 273, 273, 273, 273, 273, 584, 585,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 586,
+    48,  48,  48, 587, 588, 589,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
+    48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 590, 591, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 592,
+    48,  48,  48, 593, 594, 595, 596, 597,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 598,  48, 599, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 272, 600,   9, 601,  11, 602, 140, 140,
+    48,  48,  48,  48, 603, 604, 605, 605, 606, 607, 140, 140, 140, 140, 608, 609,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 610,
+    48, 200, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48,  48, 611,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 612,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48, 611, 613, 140, 614, 615,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 616, 617, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 618,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 619, 209, 427, 209, 620,
+    32,  32, 216,  32, 621, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
+   209, 209, 622, 209, 209, 209, 623, 624, 625, 209, 626, 209, 209, 209, 288, 140,
+   209, 209, 209, 209, 627, 140, 140, 140, 140, 140, 140, 140, 272, 628, 272, 628,
+   209, 209, 209, 209, 209, 338, 272, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 629,  11, 630, 631, 632, 242,   9, 633, 634, 635, 636, 637,   9, 629,  11,
+   638, 639,  11, 640, 641, 642, 643,   9, 644,  11,   9, 629,  11, 630, 631,  11,
+   242,   9, 633, 643,   9, 644,  11,   9, 629,  11, 645,   9, 646, 647, 648, 649,
+    11, 650,   9, 651, 652, 653, 654,  11, 655,   9, 656,  11, 657, 539, 539, 539,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+    32,  32,  32, 658,  32,  32, 659, 660, 661, 662,  45, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   663, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   666, 667, 668,  27,  27,  27, 669, 140, 670, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 671, 672, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 673, 140,  48,  48, 674, 675,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 676, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 590, 677,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 200, 678, 679,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 680, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 681, 621, 140, 140,
+     9,   9, 633,  11, 682, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 504, 272, 272, 683, 684, 140, 140, 140, 140,
+   504, 272, 685, 686, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   687,  48, 688, 689, 690, 691, 692, 693, 694, 206, 695, 206, 140, 140, 140, 696,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 697, 209, 209, 209, 209, 209, 209, 322, 333, 698, 698, 698, 209, 323,
+   699, 209, 209, 209, 209, 209, 209, 209, 209, 209, 700, 140, 140, 140, 701, 209,
+   702, 209, 209, 697, 703, 704, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 705,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 706, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 176, 697, 427,
+   697, 209, 209, 209, 707, 176, 209, 209, 707, 209, 700, 697, 704, 708, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 707, 700, 426, 709, 209, 209, 209, 710, 711, 712, 703,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 713, 209, 209, 209, 209, 209, 714,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
+    48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   715, 140, 587, 587, 587, 587, 587, 587, 140, 140, 140, 140, 140, 140, 140, 140,
+    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 716,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 717,
+     0,   0,   0,   0,   0,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3,
+     0,   0,   0,   0,   0,   4,   0,   4,   2,   2,   5,   2,   2,   2,   5,   2,
+     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2,   2,   2,   2,   2,   2,   2,   6,   0,   0,   0,   0,   7,   8,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,  10,  11,
+    12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,  16,  17,  14,  14,
+    18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18,  18,  18,  20,  21,  21,  21,  22,  20,  21,  21,  21,  21,
+    21,  23,  24,  25,  25,  25,  25,  25,  25,  26,  25,  25,  25,  27,  28,  26,
+    29,  30,  31,  32,  31,  31,  31,  31,  33,  34,  35,  31,  31,  31,  36,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  29,  31,  31,  31,  31,
+    37,  38,  37,  37,  37,  37,  37,  37,  37,  39,  31,  31,  31,  31,  31,  31,
+    40,  40,  40,  40,  40,  40,  41,  26,  42,  42,  42,  42,  42,  42,  42,  43,
+    44,  44,  44,  44,  44,  45,  44,  46,  47,  47,  47,  48,  37,  49,  31,  31,
+    31,  31,  50,  31,  31,  31,  31,  31,  31,  31,  31,  31,  51,  31,  31,  31,
+    52,  52,  52,  52,  52,  52,  52,  52,  52,  52,  53,  52,  54,  52,  52,  52,
+    55,  56,  57,  58,  58,  59,  60,  61,  56,  62,  63,  64,  65,  58,  58,  66,
+    67,  68,  69,  70,  70,  71,  72,  73,  68,  74,  75,  76,  77,  70,  78,  26,
+    79,  80,  81,  82,  82,  83,  84,  85,  80,  86,  87,  26,  88,  82,  89,  90,
+    91,  92,  93,  94,  94,  95,  96,  97,  92,  98,  99, 100, 101,  94,  94,  26,
+   102, 103, 104, 105, 106, 103, 107, 108, 103, 104, 109,  26, 110, 107, 107, 111,
+   112, 113, 114, 112, 112, 114, 112, 115, 113, 116, 117, 118, 119, 112, 120, 112,
+   121, 122, 123, 121, 121, 123, 124, 125, 122, 126, 127, 128, 129, 121, 130,  26,
+   131, 132, 133, 131, 131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131,
+   136, 137, 138, 139, 137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26,
+   146, 147, 147, 147, 147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26,
+   150, 151, 152, 152, 153, 152, 152, 154, 155, 156, 152, 157,  26,  26,  26,  26,
+   158, 158, 158, 158, 158, 158, 158, 158, 158, 159, 158, 158, 158, 160, 159, 158,
+   158, 158, 158, 159, 158, 158, 158, 161, 158, 161, 162, 163,  26,  26,  26,  26,
+   164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+   164, 164, 164, 164, 165, 165, 165, 165, 166, 167, 165, 165, 165, 165, 165, 168,
+   169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+   170, 170, 170, 170, 170, 170, 170, 170, 170, 171, 172, 171, 170, 170, 170, 170,
+   170, 171, 170, 170, 170, 170, 171, 172, 171, 170, 172, 170, 170, 170, 170, 170,
+   170, 170, 171, 170, 170, 170, 170, 170, 170, 170, 170, 173, 170, 170, 170, 174,
+   170, 170, 170, 175, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 177, 177,
+   178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+   179, 179, 179, 180, 181, 181, 181, 181, 181, 181, 181, 181, 181, 182, 181, 183,
+   184, 184, 185, 186, 187, 187, 188,  26, 189, 189, 190,  26, 191, 192, 193,  26,
+   194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 195, 194, 196, 194, 196,
+   197, 198, 198, 199, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 200,
+   198, 198, 198, 198, 198, 201, 178, 178, 178, 178, 178, 178, 178, 178, 202,  26,
+   203, 203, 203, 204, 203, 205, 203, 205, 206, 203, 207, 207, 207, 208, 209,  26,
+   210, 210, 210, 210, 210, 211, 210, 210, 210, 212, 210, 213, 194, 194, 194, 194,
+   214, 214, 214, 215, 216, 216, 216, 216, 216, 216, 216, 217, 216, 216, 216, 218,
+   216, 219, 216, 219, 216, 220,   9,   9,   9,   9,   9, 221,   9, 222,  26,  26,
+   223, 223, 223, 223, 223, 223, 223, 223, 223, 224, 223, 223, 223, 223, 223, 223,
+   225, 225, 225, 225, 225, 225, 225, 225, 226, 226, 226, 226, 226, 226, 227, 228,
+   229, 229, 229, 229, 229, 229, 229, 230, 229, 231, 232, 232, 232, 232, 232, 232,
+    18, 233, 165, 165, 165, 165, 165, 234, 225,  26, 235,   9, 236, 237, 238, 239,
+     2,   2,   2,   2, 240, 241,   2,   2,   2,   2,   2, 242, 243, 244,   2, 245,
+     2,   2,   2,   2,   2,   2,   2, 246,   9,   9,   9,   9,   9,   9,   9,   9,
+    14,  14, 247, 247,  14,  14,  14,  14, 247, 247,  14, 248,  14,  14,  14, 247,
+    14,  14,  14,  14,  14,  14, 249,  14, 249,  14, 250, 251,  14,  14, 252, 253,
+     0, 254,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0, 256, 257,
+     0, 258,   2, 259,   0,   0,   0,   0, 260,  26,   9,   9,   9,   9, 261,  26,
+     0,   0,   0,   0, 262, 263,   4,   0,   0, 264,   0,   0,   2,   2,   2,   2,
+     2, 265,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0, 260,  26,  26,   0, 266,  26,  26,   0,   0,   0,   0,
+   267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,
+   269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,   2,   2,   2,   2,
+    17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17, 270, 271,
+   165, 165, 165, 165, 166, 167, 272, 272, 272, 272, 272, 272, 272, 273, 274, 273,
+   170, 170, 172,  26, 172, 172, 172, 172, 172, 172, 172, 172,  18,  18,  18,  18,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,
+   276, 276, 276, 277, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 278,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279,  26,  26,  26,   0,   0,
+   280,   0,   0,   0, 281, 282,   0, 283, 284, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 286, 287, 288, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 290,
+   291, 292, 292, 292, 292, 292, 293, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+   169, 294,   0,   0, 292, 292, 292, 292,   0,   0,   0,   0, 275, 295, 289, 289,
+   169, 169, 169, 294,   0,   0,   0,   0,   0,   0,   0,   0, 169, 169, 169, 296,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 289, 289, 289, 289, 289, 297,
+   289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289,   0,   0,   0,   0,   0,
+   276, 276, 276, 276, 276, 276, 276, 276,   0,   0,   0,   0,   0,   0,   0,   0,
+   298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+   298, 299, 298, 298, 298, 298, 298, 298, 300,  26, 301, 301, 301, 301, 301, 301,
+   302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+   302, 302, 302, 302, 302, 303,  26,  26,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,  26,
+     0,   0,   0,   0, 305,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2, 306,   2,   2,   2,   2,   2,   2,   2,   2,   2, 259,  26,  26, 307,   2,
+   308, 308, 308, 308, 308, 309,   0, 260, 310, 310, 310, 310, 310, 310, 310,  26,
+   311, 311, 311, 311, 311, 311, 311, 311, 312, 313, 311, 314,  52,  52,  52,  52,
+   315, 315, 315, 315, 315, 316, 317, 317, 317, 317, 318, 319, 169, 169, 169, 320,
+   321, 321, 321, 321, 321, 321, 321, 321, 321, 322, 321, 323, 164, 164, 164, 324,
+   325, 325, 325, 325, 325, 325, 326,  26, 325, 327, 325, 328, 164, 164, 164, 164,
+   329, 329, 329, 329, 329, 329, 329, 329, 330,  26,  26, 331, 332, 332, 333,  26,
+   334, 334, 334,  26, 172, 172,   2,   2,   2,   2,   2, 335, 336, 337, 176, 176,
+   176, 176, 176, 176, 176, 176, 176, 176, 332, 332, 332, 332, 332, 338, 332, 339,
+   169, 169, 169, 169, 340,  26, 169, 169, 294, 341, 169, 169, 169, 169, 169, 340,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 342,  26,  26,  26,  26,
+   343,  26, 344, 345,  25,  25, 346, 347, 348,  25,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31, 349,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  26,  26,  26,  26,  31,  31,
+     9,   9,   0, 260,   9, 350,   0,   0,   0,   0, 351,   0, 258, 352, 353,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31, 354,
+   355,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 356, 289, 288, 289,
+   289, 289, 289, 357, 169, 169, 169, 294, 358, 358, 358, 359, 258, 258,  26, 360,
+   361, 362, 361, 361, 363, 361, 361, 364, 361, 365, 361, 365,  26,  26,  26,  26,
+   361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 366,
+   367,   0,   0,   0,   0,   0, 368,   0,  14,  14,  14,  14,  14,  14,  14,  14,
+    14, 253,   0, 369, 370,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 371,
+   372, 372, 372, 373, 374, 374, 374, 374, 374, 374, 375,  26, 376,   0,   0, 352,
+   377, 377, 377, 377, 378, 379, 380, 380, 380, 381, 382, 382, 382, 382, 382, 383,
+   384, 384, 384, 385, 386, 386, 386, 386, 387, 386, 388,  26,  26,  26,  26,  26,
+   389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 392, 391, 393, 394, 394, 394, 394, 395, 394, 394, 394, 394, 395,
+   396, 396, 396, 396, 396,  26, 397, 397, 397, 397, 397, 397, 398, 399, 400, 401,
+   400, 401, 402, 400, 403, 400, 403, 404, 405, 405, 405, 405, 405, 405, 406,  26,
+   407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407,
+   407, 407, 407, 407, 407, 407, 408,  26, 407, 407, 409,  26, 407,  26,  26,  26,
+   410,   2,   2,   2,   2,   2, 411, 412,  26,  26,  26,  26,  26,  26,  26,  26,
+   413, 414, 415, 415, 415, 415, 416, 417, 418, 418, 419, 418, 420, 420, 420, 420,
+   421, 421, 421, 422, 423, 421,  26,  26,  26,  26,  26,  26, 424, 424, 425, 426,
+   427, 427, 427, 428, 429, 429, 429, 430, 431, 431, 431, 432,  26,  26,  26,  26,
+   433, 433, 433, 433, 434, 434, 434, 435, 434, 434, 436, 434, 434, 434, 434, 434,
+   437, 438, 439, 440, 441, 441, 442, 443, 441, 444, 441, 444, 445, 445, 445, 445,
+   446, 446, 446, 446,  26,  26,  26,  26, 447, 447, 447, 447, 448, 449, 448,  26,
+   450, 450, 450, 450, 450, 450, 451, 452, 453, 453, 454, 453, 455, 455, 456, 455,
+   457, 457, 458, 459,  26, 460,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   461, 461, 461, 461, 461, 461, 461, 461, 461, 462,  26,  26,  26,  26,  26,  26,
+   463, 463, 463, 463, 463, 463, 464,  26, 463, 463, 463, 463, 463, 463, 464, 465,
+   466, 466, 466, 466, 466,  26, 466, 467, 468, 468, 468, 468, 469, 470, 468, 468,
+   469, 471,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31, 472,
+   473, 473, 473, 473, 473, 474, 475,  26, 476,  26,  31, 477,  26,  26,  26, 476,
+   478, 478, 478, 478, 478,  26, 479, 479, 479, 479, 479, 480,  26,  26, 481, 481,
+   481, 482,  26,  26,  26,  26, 483, 483, 483, 484,  26,  26, 485, 485, 486,  26,
+   487, 487, 487, 487, 487, 487, 487, 487, 487, 488, 489, 487, 487, 487, 488, 490,
+   491, 491, 491, 491, 491, 491, 491, 491, 492, 493, 494, 494, 494, 495, 494, 496,
+   497, 497, 497, 497, 497, 497, 498, 497, 497,  26, 499, 499, 499, 499, 500,  26,
+   501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 502, 137, 503,  26,
+   504, 504, 505, 504, 504, 504, 504, 504, 506,  26,  26,  26,  26,  26,  26,  26,
+   507, 508, 509, 510, 509, 511, 512, 512, 512, 512, 512, 512, 512, 513, 512, 514,
+   515, 516, 517, 518, 518, 519, 520, 521, 516, 522, 523, 524, 525, 526, 526,  26,
+   527, 528, 527, 527, 527, 527, 529, 527, 530, 531, 529, 532, 533,  26,  26,  26,
+   534, 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, 535, 536,  26,  26,  26,
+   537, 537, 537, 537, 537, 537, 537, 537, 537,  26, 537, 538,  26,  26,  26,  26,
+   539, 539, 539, 539, 539, 539, 540, 539, 539, 539, 539, 540,  26,  26,  26,  26,
+   541, 541, 541, 541, 541, 541, 541, 541, 542,  26, 541, 543, 198, 544,  26,  26,
+   545, 545, 545, 545, 545, 545, 545, 546, 545, 546, 164, 164, 547,  26,  26,  26,
+   548, 548, 548, 549, 548, 550, 548, 548, 551,  26,  26,  26,  26,  26,  26,  26,
+   552, 552, 552, 552, 552, 552, 552, 553,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26, 554, 554, 554, 554, 554, 554, 554, 554, 554, 554, 555, 556,
+   557, 558, 559, 560, 560, 560, 561, 562, 557,  26, 560, 563,  26,  26,  26,  26,
+    26,  26,  26,  26, 564, 565, 564, 564, 564, 564, 564, 565, 566,  26,  26,  26,
+   567, 567, 567, 567, 567, 567, 567, 567, 567,  26, 568, 568, 568, 568, 568, 568,
+   568, 568, 568, 568, 569,  26, 178, 178, 570, 570, 570, 570, 570, 570, 570, 571,
+    52, 572,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 501,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26, 573, 573, 573, 573, 574,  26, 573, 574,
+   575, 576, 575, 575, 575, 575, 577, 575, 578,  26, 575, 575, 575, 579, 580, 580,
+   580, 580, 581, 580, 580, 582, 583,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   584, 585, 586, 586, 586, 586, 584, 587, 586,  26, 586, 588, 589, 590, 591, 591,
+   591, 592, 593, 594, 591, 595, 596, 596, 596, 596, 596, 597, 596, 598,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 599, 599, 599, 600,
+   601, 601, 602, 601, 601, 601, 601, 603, 601, 601, 601, 604,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26, 605,  26, 107, 107, 107, 107, 107, 107, 606, 607,
+   608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608,
+   608, 608, 608, 609,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 610, 611,  26,
+   608, 608, 608, 608, 608, 608, 608, 608, 612,  26,  26,  26,  26,  26,  26,  26,
+    26,  26, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 614,  26,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 616,  26, 615, 615, 615, 615,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 617,
+   618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618,
+   618, 618, 618, 618, 618, 618, 618, 618, 619,  26,  26,  26,  26,  26,  26,  26,
+   620, 620, 620, 620, 620, 620, 620, 621,  26,  26,  26,  26,  26,  26,  26,  26,
+   304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,
+   304, 304, 304, 304, 304, 304, 304, 622, 623, 623, 623, 624, 623, 625, 626, 626,
+   626, 626, 626, 626, 626, 626, 626, 627, 626, 628, 629, 629, 629, 630, 630,  26,
+   631, 631, 631, 631, 631, 631, 631, 631, 632,  26, 631, 633, 633, 631, 631, 634,
+   631, 631,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26, 635, 635, 635, 635, 635, 635, 635, 636,
+    26,  26,  26,  26,  26,  26,  26,  26, 637, 637, 637, 637, 637, 637, 637, 637,
+   637, 637, 637, 638, 639, 639, 639, 640, 639, 639, 641,  26,  26,  26,  26,  26,
+   642, 642, 642, 642, 642, 642, 642, 642, 642, 643, 642, 642, 642, 642, 642, 642,
+   642, 644, 642, 642,  26,  26,  26,  26,  26,  26,  26,  26, 645,  26, 646,  26,
+   647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647,
+   648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648,
+   648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 649,  26,  26,  26,  26, 650,
+   647, 647, 647, 651,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 652,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 653, 654,
+   655, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 285, 285, 656,  26, 657,  26,  26,  26, 658,  26, 659,  26, 660, 660,
+   660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+   660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 661,
+   662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 663, 662, 664,
+   662, 665, 662, 666, 352,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 369,
+     0,   0,   0,   0,   0,   0, 352, 667,   0,   0, 668,  26,   0,   0, 668,  26,
+     9,   9,   9,   9,   9, 221,   9,   9, 669,  26,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 352,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,
+     0,   0,   0,   0, 258, 355,   0,   0,   0,   0,   0,   0, 670, 671,   0, 672,
+   673, 674,   0,   0,   0, 675,   0,   0,   0,   0,   0,   0,   0, 266,  26,  26,
+    14,  14,  14,  14,  14,  14,  14,  14, 247,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,   0,   0, 352,  26,   0,   0, 352,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 258,  26,   0,   0,   0, 668,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0,   0,   0,   0,   0,
+     0,   0,   0, 255, 676, 677,   0, 678, 679,   0,   0,   0,   0,   0,   0,   0,
+   680, 681, 255, 255,   0,   0,   0, 682, 683, 667, 684,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 275,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,   0,   0,   0,   0,   0,
+   685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685,
+   685, 686,  26, 687, 688, 685,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     2,   2,   2, 343, 689, 412,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   690, 269, 269, 691, 692, 693,  18,  18,  18,  18,  18,  18,  18, 694,  26,  26,
+    26, 695,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   696, 696, 696, 696, 696, 697, 696, 698, 696, 699,  26,  26,  26,  26,  26,  26,
+    26,  26, 700, 700, 700, 701,  26,  26, 702, 702, 702, 702, 702, 702, 702, 703,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 704, 704, 704, 704, 704, 705,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 706, 706, 706, 706, 706, 707,
+    26,  26,  26,  26,  26,  26,  26,  26, 708, 708, 708, 709, 708, 708, 710, 711,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 172, 712, 170, 172,
+   713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
+   713, 713, 713, 713, 713, 713, 713, 713, 714, 713, 715,  26,  26,  26,  26,  26,
+   716, 716, 716, 716, 716, 716, 716, 716, 716, 717, 716, 718,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 355,   0,
+     0,   0,   0,   0,   0,   0, 369,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   355,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26,  26,  26,
+   719,  31,  31,  31, 720, 721, 722, 723, 724, 725, 720, 726, 720, 722, 722, 727,
+    31, 728,  31, 729, 730, 728,  31, 729,  26,  26,  26,  26,  26,  26, 731,  26,
+     0,   0,   0,   0,   0, 352,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0, 352,  26,   0, 258, 355,   0, 355,   0, 355,   0,   0,   0, 275,  26,
+     0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26, 732,   0,   0,   0,
+   733,  26,   0,   0,   0,   0,   0, 352,   0, 668, 260,  26, 275,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 734,   0, 369,   0, 369,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 260,   0, 352, 668,  26,
+     0, 352,   0,   0,   0,   0,   0,   0,   0,  26,   0, 260,   0,   0,   0,   0,
+     0,  26,   0,   0,   0, 275,   0, 352, 260,  26,   0, 668,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  26,   0, 275,   0, 369,
+     0, 735,   0,   0,   0,   0,   0,   0, 258, 736,   0, 737,   0, 367,   0, 668,
+     0,   0, 351,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 266,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,  26,  26,  26,  26,
+   276, 276, 276, 279, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 279, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 738,  26, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279,  26,  26,  26,  26,
+   276, 276, 276, 279,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 739, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 342,
+   740,  26,  26,  26,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
      0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
@@ -2686,15 +2690,15 @@ static const uint16_t _hb_ucd_u16[10784]=
 };
 static const int16_t _hb_ucd_i16[196]=
 {
-      0,    0,    0,    0,    1,   -1,    1,   -1,    1,   -1,    0,    0,   -1,    1,   -1,    1,
-      0,    0,    1,   -1,   -1,    1,   -1,    0,    0,    0,    0,    1,    0,    1,   -1,    0,
-      0,    0,    0,    2,    0,   -2,    0,    0,    0,    1,   -1,    1,    2,    0,   -2,    0,
-     -1,    0,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    3,    3,    3,   -3,
+      0,    0,    0,    0,    1,   -1,    0,    0,    2,    0,   -2,    0,    0,    0,    0,    2,
+      0,   -2,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    0,    0,    1,   -1,
+      0,    0,    0,    1,   -1,    0,    0,    0,    0,    1,   -1,    0,    3,    3,    3,   -3,
      -3,   -3,    0,    0,    0, 2016,    0,    0,    0,    0,    0, 2527, 1923, 1914, 1918,    0,
    2250,    0,    0,    0,    0,    0,    0,  138,    0,    7,    0,    0,   -7,    0,    0,    0,
-   1824,    0,    0,    0,    0,    0, 2104,    0, 2108, 2106,    0, 2106, 1316,    0,    0,    0,
-     -1, -138,    0,    0,    1,   -1,    8,    8,    8,    0,    7,    7,    0,    0,   -8,   -8,
-     -8,   -7,   -7,    0,    1,   -1,    0,    2,-1316,    1,   -1,    0,   -1,    3,    1,   -1,
+      1,   -1,    1,   -1,   -1,    1,   -1,    0, 1824,    0,    0,    0,    0,    0, 2104,    0,
+   2108, 2106,    0, 2106, 1316,    0,    0,    0,    0,    1,   -1,    1,   -1, -138,    0,    0,
+      1,   -1,    8,    8,    8,    0,    7,    7,    0,    0,   -8,   -8,   -8,   -7,   -7,    0,
+      1,   -1,    0,    2,-1316,    1,   -1,    0,   -1,    1,   -1,    1,   -1,    3,    1,   -1,
      -3,    1,   -1,    1,   -1,    0,    0,-1914,-1918,    0,    0,-1923,-1824,    0,    0,    0,
       0,-2016,    0,    0,    1,   -1,    0,    1,    0,    0,-2104,    0,    0,    0,    0,-2106,
   -2108,-2106,    0,    0,    1,   -1,-2250,    0,    0,    0,-2527,    0,    0,   -2,    0,    1,
@@ -2703,13 +2707,11 @@ static const int16_t _hb_ucd_i16[196]=
 
 static inline uint8_t _hb_ucd_gc (unsigned u)
 {
-  /* packtab: [2^8,2^5,2^3,2^1] */
-  return u<1114110u ? (uint8_t)(_hb_ucd_u8[7912u+((_hb_ucd_u8[2176u+_hb_ucd_u16[((_hb_ucd_u8[((((((u)>>1))>>3))>>5)])<<5)+((((((u)>>1))>>3))&31)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2;
+  return u<1114110 ? _hb_ucd_u8[7920u+((_hb_ucd_u8[2176u+((_hb_ucd_u16[((_hb_ucd_u8[((((((u)>>1))>>3))>>5)])<<5)+((((((u)>>1))>>3))&31)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
 }
 static inline uint8_t _hb_ucd_ccc (unsigned u)
 {
-  /* packtab: [2^8,2^4,2^3,2^2] */
-  return u<125259u ? (uint8_t)(_hb_ucd_u8[10370u+((_hb_ucd_u8[9270u+((_hb_ucd_u8[8539u+((_hb_ucd_u8[8294u+((((((u)>>2))>>3))>>4)])<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)]) : 0;
+  return u<125259 ? _hb_ucd_u8[10388u+((_hb_ucd_u8[9284u+((_hb_ucd_u8[8548u+((_hb_ucd_u8[8302u+((((((u)>>2))>>3))>>4)])<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)] : 0;
 }
 static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 {
@@ -2717,18 +2719,15 @@ static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 }
 static inline int16_t _hb_ucd_bmg (unsigned u)
 {
-  /* packtab: [2^4,2^3,2^3,2^2] */
-  return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[11118u+((_hb_ucd_u8[11002u+((_hb_ucd_b4(_hb_ucd_u8+10874u,((((((u)>>2))>>3))>>3)))<<3)+((((((u)>>2))>>3))&7)])<<3)+((((u)>>2))&7)]+((u)&3)]) : 0;
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[11140u+((_hb_ucd_u8[11020u+((_hb_ucd_b4(_hb_ucd_u8+10892u,((((((u)>>2))>>3))>>3)))<<3)+((((((u)>>2))>>3))&7)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)] : 0;
 }
 static inline uint8_t _hb_ucd_sc (unsigned u)
 {
-  /* packtab: [2^8,2^4,2^4,2^3] */
-  return u<918000u ? (uint8_t)(_hb_ucd_u8[12639u+_hb_ucd_u16[3296u+((_hb_ucd_u8[11903u+((_hb_ucd_u8[11454u+((((((u)>>3))>>4))>>4)])<<4)+((((((u)>>3))>>4))&15)])<<4)+((((u)>>3))&15)]+((u)&7)]) : 2;
+  return u<918000 ? _hb_ucd_u8[12662u+((_hb_ucd_u16[3328u+((_hb_ucd_u8[11926u+((_hb_ucd_u8[11476u+((((((u)>>3))>>4))>>4)])<<4)+((((((u)>>3))>>4))&15)])<<4)+((((u)>>3))&15)])<<3)+((u)&7)] : 2;
 }
 static inline uint16_t _hb_ucd_dm (unsigned u)
 {
-  /* packtab: [2^8,2^5,2^4] */
-  return u<195102u ? (uint16_t)(_hb_ucd_u16[7360u+((_hb_ucd_u8[18949u+((_hb_ucd_u8[18567u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0;
+  return u<195102 ? _hb_ucd_u16[7408u+((_hb_ucd_u8[18972u+((_hb_ucd_u8[18590u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
 }
 
 
@@ -2736,1620 +2735,1624 @@ static inline uint16_t _hb_ucd_dm (unsigned u)
 
 #include <stdint.h>
 
-static const uint8_t _hb_ucd_u8[14763]=
+static const uint8_t _hb_ucd_u8[14800]=
 {
-    3,  4,  5,  6,  7,  2,  2,  2,  2,  2,  8,  2,  2,  9,  1, 10,
-   11, 12, 13, 14, 15,  0, 16,  2, 17,  0, 18, 19, 20, 21, 22, 23,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 24, 25, 26,  2, 27, 28,
-    2, 29,  2, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  1,  2,  3,  4,  5,  5,  5,  5,  5,  6,  5,  5,  7,  8,  9,
+   10, 11, 12, 13, 14, 15, 16,  5, 17, 15, 18, 19, 20, 21, 22, 23,
+    5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24, 25, 26,  5, 27, 28,
+    5, 29,  5, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   31, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 32,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 33,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 17, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 33, 41, 42, 43, 44, 45,
+   46, 47, 48, 39, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 49, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   50, 17, 17, 17, 51, 17, 52, 53, 54, 55, 56, 57, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 58, 59, 59, 59, 59, 59, 59, 59, 59,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 17, 61, 62, 17, 63, 64, 65,
+   66, 67, 68, 69, 70, 71, 17, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+   17, 17, 17, 97, 98, 99,100,100,100,100,100,100,100,100,100,101,
+   17, 17, 17, 17,102, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,103, 17, 17,104,100,100,100,100,100,100,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,105,100,100,100,100,100,100, 17, 17,106,107,100,108,109,110,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,111,112,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,113,
+   17,114,115,100,100,100,100,100,100,100,100,100,116,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,117, 39,118,119,
+  120,121,122,123,124,125,126,127, 39, 39,128,100,100,100,100,129,
+  130,131,132,100,133,134,135,136,137,138,100,100,139,140,141,100,
+  142,143,144,145, 39, 39,146,147,148, 39,149,150,100,100,100,100,
+   17, 17, 17, 17, 17, 17,151, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17,152, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,153, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17, 17,155,100,
+  100,100,100,100,100,100,100,100, 17, 17,156,100,100,100,100,100,
+   17, 17, 17,157, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17,158,100,100,100,100,100,100,100,100,100,100,100,
+  159,160,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,161,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,162,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
+    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
+   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
+   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
+   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
+   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
+   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
+   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 43, 44, 16, 10,
+   43, 43, 40, 45, 11, 46, 46, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 47, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 48, 34, 32, 34, 11,
+   32, 49, 42, 42, 50, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   47, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 46, 51,  2,  2,  2,
+   16, 16, 16, 16, 52, 53, 54, 55, 56, 42, 42, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 57, 58, 59, 42, 58, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 61,
+   36, 62, 63, 43, 43, 43, 43, 43, 64, 64, 64,  8,  9, 65,  2, 66,
+   42, 42, 42, 42, 42, 59, 67,  2, 68, 36, 36, 36, 36, 69, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 70, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 71, 42, 42, 42, 72, 49, 42, 42, 73, 74, 75, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 76, 77,  2,  2,  2,  2,  2,  2,  2, 78,
+   69, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 79, 61, 36,
+   36, 36, 36, 42, 42, 42, 42, 42, 70, 43, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42,
+   42, 42, 39, 21,  2, 80, 56, 20, 36, 36, 36, 42, 42, 74, 42, 42,
+   42, 42, 74, 42, 74, 42, 42, 43,  2,  2,  2,  2,  2,  2,  2, 63,
+   36, 36, 36, 36, 69, 42, 43, 63, 36, 36, 36, 36, 36, 60, 43, 43,
+   36, 36, 36, 36, 81, 36, 36, 36, 64, 43, 43, 56, 42, 42, 42, 42,
+   36, 36, 36, 36, 82, 42, 42, 42, 42, 83, 42, 42, 42, 42, 42, 42,
+   42, 84, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 84, 70, 85,
+   86, 42, 42, 42, 84, 85, 86, 85, 69, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 87, 36, 36, 36, 36, 36, 36, 36,
+   69, 85, 61, 36, 36, 36, 60, 61, 60, 61, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 36, 36, 36, 60, 60, 43, 36, 36, 43, 70, 85,
+   86, 42, 79, 88, 89, 88, 86, 60, 43, 43, 43, 88, 43, 43, 36, 61,
+   36, 42, 43,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 55, 62, 79,
+   56, 84, 61, 36, 36, 60, 43, 61, 60, 36, 61, 60, 36, 43, 79, 85,
+   86, 79, 43, 56, 79, 56, 42, 43, 56, 43, 43, 43, 61, 36, 60, 60,
+   43, 43, 43,  7,  7,  7,  7,  7, 42, 36, 69, 63, 43, 43, 43, 43,
+   56, 84, 61, 36, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36,
+   60, 36, 61, 36, 36, 43, 70, 85, 86, 42, 42, 56, 84, 88, 86, 43,
+   60, 43, 43, 43, 43, 43, 43, 43, 65, 43, 43, 43, 61, 42, 42, 42,
+   56, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 43, 70, 86,
+   86, 42, 79, 88, 89, 88, 86, 43, 43, 43, 56, 84, 43, 43, 36, 61,
+   77, 27, 27, 27, 43, 43, 43, 43, 43, 70, 61, 36, 36, 60, 43, 36,
+   60, 36, 36, 43, 61, 60, 60, 36, 43, 61, 60, 43, 36, 60, 43, 36,
+   36, 36, 36, 36, 36, 43, 43, 85, 84, 89, 43, 85, 89, 85, 86, 43,
+   60, 43, 43, 88, 43, 43, 43, 43, 27, 90, 66, 66, 55, 91, 43, 43,
+   84, 85, 70, 36, 36, 36, 60, 36, 60, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 43, 70, 42, 84, 85, 89, 42, 79, 42, 42, 43,
+   43, 43, 56, 79, 36, 60, 36, 43, 43, 43, 43, 92, 27, 27, 27, 90,
+   69, 85, 71, 36, 36, 36, 60, 36, 36, 36, 61, 36, 36, 43, 70, 86,
+   85, 85, 89, 84, 89, 85, 42, 43, 43, 43, 88, 89, 43, 43, 36, 60,
+   61, 93, 43, 43, 43, 43, 43, 43, 42, 85, 36, 36, 36, 36, 60, 36,
+   36, 36, 36, 36, 36, 69, 70, 85, 86, 42, 79, 85, 89, 85, 86, 76,
+   43, 43, 36, 93, 27, 27, 27, 94, 27, 27, 27, 27, 90, 36, 36, 36,
+   56, 85, 61, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 36, 36, 36,
+   36, 61, 36, 36, 36, 36, 61, 43, 36, 36, 36, 60, 43, 79, 43, 88,
+   85, 42, 79, 79, 85, 85, 85, 85, 43, 85, 63, 43, 43, 43, 43, 43,
+   61, 36, 36, 36, 36, 36, 36, 36, 69, 36, 42, 42, 42, 79, 43, 95,
+   36, 36, 36, 74, 42, 42, 42, 59,  7,  7,  7,  7,  7,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 61, 60, 60, 36, 36, 60, 36, 36,
+   36, 36, 61, 61, 36, 36, 36, 36, 69, 36, 42, 42, 42, 42, 70, 43,
+   36, 36, 60, 80, 42, 42, 42, 79,  7,  7,  7,  7,  7, 43, 36, 36,
+   76, 66,  2,  2,  2,  2,  2,  2,  2, 96, 96, 66, 42, 66, 66, 66,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 49, 49, 49,  4,  4, 85,
+   36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43,
+   56, 42, 42, 42, 42, 42, 42, 84, 42, 42, 59, 42, 36, 36, 69, 42,
+   42, 42, 42, 42, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 79, 66,
+   66, 66, 66, 75, 66, 66, 91, 66,  2,  2, 96, 66, 21, 63, 43, 43,
+   36, 36, 36, 36, 36, 93, 86, 42, 84, 42, 42, 42, 86, 84, 86, 70,
+    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 85, 42, 36, 36, 42,
+   70, 85, 97, 93, 85, 85, 85, 36, 69, 42, 70, 36, 36, 36, 36, 36,
+   36, 84, 86, 84, 85, 85, 86, 93,  7,  7,  7,  7,  7, 85, 86, 66,
+   11, 11, 11, 47, 43, 43, 47, 43, 16, 16, 16, 16, 16, 52, 44, 16,
+   36, 36, 36, 36, 60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43,
+   60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43, 36, 36, 36, 36,
+   36, 36, 36, 60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 56, 42,
+    2,  2,  2,  2, 98, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43,
+   66, 66, 66, 66, 66, 43, 43, 43, 11, 11, 11, 43, 16, 16, 16, 43,
+  100, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 71,
+  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,102,103, 43,
+   36, 36, 36, 36, 36, 62,  2,104,105, 36, 36, 36, 60, 43, 43, 43,
+   36, 42, 84, 43, 43, 43, 43, 61, 36, 42,106, 63, 43, 43, 43, 43,
+   36, 42, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 60, 36,
+   60, 42, 43, 43, 43, 43, 43, 43, 36, 36, 42, 86, 42, 42, 42, 85,
+   85, 85, 85, 84, 86, 42, 42, 42, 42, 42,  2, 87,  2, 65, 69, 43,
+    7,  7,  7,  7,  7, 43, 43, 43, 27, 27, 27, 27, 27, 43, 43, 43,
+    2,  2,  2,107,  2, 58, 42, 83, 36, 82, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 43, 43, 43, 36, 36, 69, 70, 36, 36, 36, 36,
+   36, 36, 36, 36, 69, 60, 43, 43, 36, 36, 36, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 60, 42, 84, 85, 86, 84, 85, 43, 43,
+   85, 84, 85, 85, 86, 42, 43, 43, 91, 43,  2,  7,  7,  7,  7,  7,
+   36, 36, 36, 36, 36, 36, 36, 43, 36, 36, 60, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 43, 43, 36, 36, 36, 36, 36, 43, 43, 43,
+    7,  7,  7,  7,  7, 99, 43, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+   36, 36, 36, 69, 84, 86, 43,  2, 36, 36, 93, 84, 42, 42, 42, 79,
+   84, 84, 86, 42, 42, 42, 84, 85, 85, 86, 42, 42, 42, 42, 79, 56,
+    2,  2,  2, 87,  2,  2,  2, 43, 42, 42, 42, 42, 42, 42, 42,108,
+   42, 42, 42, 42, 42, 42, 42, 43, 42, 42, 42, 42, 42, 42, 43, 43,
+   42, 42, 97, 36, 36, 36, 36, 36, 36, 36, 84, 42, 42, 84, 84, 85,
+   85, 84, 97, 36, 36, 36, 60,  2, 96, 66, 66, 66, 66, 49, 42, 42,
+   42, 42, 66, 66, 66, 66, 21,  2, 42, 97, 36, 36, 36, 36, 36, 36,
+   93, 42, 42, 85, 42, 86, 42, 36, 36, 36, 36, 84, 42, 85, 86, 86,
+   42, 85, 43, 43, 43, 43,  2,  2, 36, 36, 85, 85, 85, 85, 42, 42,
+   42, 42, 85, 42, 43, 92,  2,  2,  7,  7,  7,  7,  7, 43, 61, 36,
+   36, 36, 36, 36, 39, 39, 39,  2, 16, 16, 16, 16, 34,109, 43, 43,
+   11, 11, 11, 11, 11, 46, 47, 11,  2,  2,  2,  2, 43, 43, 43, 43,
+   42, 59, 42, 42, 42, 42, 42, 42, 84, 42, 42, 42, 70, 36, 69, 36,
+   36, 36, 70, 93, 42, 60, 43, 43, 16, 16, 16, 16, 16, 16, 39, 39,
+   39, 39, 39, 39, 39, 44, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16,
+   16, 16, 16, 16, 16,110, 39, 39, 32, 32, 32, 16, 16, 16, 16, 32,
+   16, 16, 16, 16, 11, 11, 11, 11, 16, 16, 16, 43, 11, 11, 11, 43,
+   16, 16, 16, 16, 47, 47, 47, 47, 16, 16, 16, 16, 16, 16, 16, 43,
+   16, 16, 16, 16,111,111,111,111, 16, 16,109, 16, 11, 11,112,113,
+   40, 16,109, 16, 11, 11,112, 40, 16, 16, 43, 16, 11, 11,114, 40,
+   16, 16, 16, 16, 11, 11,115, 40, 43, 16,109, 16, 11, 11,112,116,
+  117,117,117,117,117,118, 64, 64,119,119,119,  2,120,121,120,121,
+    2,  2,  2,  2,122, 64, 64,123,  2,  2,  2,  2,124,125,  2,126,
+  127,  2,128,129,  2,  2,  2,  2,  2,  9,127,  2,  2,  2,  2,130,
+   64, 64,131, 64, 64, 64, 64, 64,132, 43, 27, 27, 27,  8,128,133,
+   27, 27, 27, 27, 27,  8,128,103, 39, 39, 39, 39, 39, 39, 80, 43,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43, 43,
+   42, 42, 42, 42, 42, 42,134, 50,108, 50,108, 42, 42, 42, 42, 42,
+   79, 43, 43, 43, 43, 43, 43, 43, 66,135, 66,136, 66, 34, 11, 16,
+   11, 32,136, 66, 48, 11, 11, 66, 66, 66,135,135,135, 11, 11,137,
+   11, 11, 35, 36,138, 66, 16, 11,  8,  8, 48, 16, 16, 26, 66,139,
+   27, 27, 27, 27, 27, 27, 27, 27,104,104,104,104,104,104,104,104,
+  104,140,141,104,142, 66, 43, 43,  8,  8,143, 66, 66,  8, 66, 66,
+  143, 26, 66,143, 66, 66, 66,143, 66, 66, 66, 66, 66, 66, 66,  8,
+   66,143,143, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8, 66, 66, 66, 66,  4,  4, 66, 66,
+    8, 66, 66, 66,144,145, 66, 66, 66, 66, 66, 66, 66, 66,143, 66,
+   66, 66, 66, 66, 66, 26,  8,  8,  8,  8, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 66,  8,  8,  8, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 91, 43, 43, 27, 27, 27, 27, 27, 27, 66, 66,
+   66, 66, 66, 66, 66, 27, 27, 27, 66, 66, 66, 26, 66, 66, 66, 66,
+   26, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,
+   66, 66, 66, 66, 66, 66, 66, 26, 66, 66, 66, 66,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66,
+    8,  8,128,146,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,128,147,147,147,147,147,147,147,147,147,147,146,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,143, 26,  8,  8,143, 66, 66, 66, 43, 66, 66, 66, 66, 66,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 39, 11,
+   32, 32,139, 66, 66,136, 34,148, 42, 32, 43, 43, 92,  2, 98,  2,
+   16, 16, 16,149, 43, 43,149, 43, 36, 36, 36, 36, 43, 43, 43, 51,
+   63, 43, 43, 43, 43, 43, 43, 56, 36, 36, 36, 60, 43, 43, 43, 43,
+   36, 36, 36, 60, 36, 36, 36, 60,  2,120,120,  2,124,125,120,  2,
+    2,  2,  2,  6,  2,107,120,  2,120,  4,  4,  4,  4,  2,  2, 87,
+    2,  2,  2,  2,  2,119,  2,  2,107,150,  2,  2,  2,  2,  2,  2,
+   66,  2,151,147,147,147,152, 43, 66, 66, 66, 66, 66, 54, 66, 66,
+   66, 66, 43, 43, 43, 43, 43, 43, 66, 66, 66, 43, 43, 43, 43, 43,
+    1,  2,153,154,  4,  4,  4,  4,  4, 66,  4,  4,  4,  4,155,156,
+  157,104,104,104,104, 42, 42, 85,158, 39, 39, 66,104,159, 62, 66,
+   36, 36, 36, 60, 56,160,161, 68, 36, 36, 36, 36, 36, 62, 39, 68,
+   43, 43, 61, 36, 36, 36, 36, 36, 66, 27, 27, 66, 66, 66, 66, 66,
+   66, 66, 66, 43, 43, 43, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91,
+   27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27,
+  162, 27, 27, 27, 27, 27, 27, 27, 36, 36, 82, 36, 36, 36, 36, 36,
+   66, 66, 66, 91, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36,163,  2,
+    7,  7,  7,  7,  7, 36, 43, 43, 32, 32, 32, 32, 32, 32, 32, 69,
+   50,164, 42, 42, 42, 42, 42, 87, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36,104,104,104,104,104, 42,  2,  2,  2, 43, 43, 43, 43,
+   40, 40, 40,161, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,165, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 46, 43,
+   51, 39,166, 35, 39, 35, 36, 36, 36, 70, 36, 70, 36, 69, 36, 36,
+   36, 93, 86, 84, 66, 66, 79, 43, 27, 27, 27, 66,167, 43, 43, 43,
+   36, 36,  2,  2, 43, 43, 43, 43, 85, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 85, 85, 85, 85, 85, 85, 85, 42, 43, 43, 43, 43,  2,
+   42, 36, 36, 36,  2, 71, 71, 69, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 69, 42, 42, 42, 42, 42, 85, 43, 43, 43, 43, 43, 92,
+   36, 69, 85, 42, 42, 85, 42, 85,106,  2,  2,  2,  2,  2,  2, 51,
+    7,  7,  7,  7,  7, 43, 43,  2, 36, 36, 69, 68, 36, 36, 36, 36,
+    7,  7,  7,  7,  7, 36, 36, 60, 36, 36, 36, 36, 69, 42, 42, 84,
+   86, 84, 86, 79, 43, 43, 43, 43, 36, 69, 36, 36, 36, 36, 84, 43,
+    7,  7,  7,  7,  7, 43,  2,  2, 68, 36, 36, 76, 66, 93, 84, 36,
+   70, 42, 70, 69, 70, 36, 36, 42, 69, 60, 43, 43, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 61, 82,  2, 36, 36, 36, 36, 36, 93, 42, 85,
+    2, 82,168, 79, 43, 43, 43, 43, 61, 36, 36, 60, 61, 36, 36, 60,
+   61, 36, 36, 60, 43, 43, 43, 43, 16, 16, 16, 16, 16,113, 39, 39,
+   16, 16, 16, 16,110, 40, 43, 43, 36, 93, 86, 85, 84,106, 86, 43,
+   36, 36, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 43, 61, 36, 36,
+  169,169,169,169,169,169,169,169,170,170,170,170,170,170,170,170,
+   16, 16, 16,109, 43, 43, 43, 43, 43,149, 16, 16, 43, 43, 61, 70,
+   36, 36, 36, 36,171, 36, 36, 36, 36, 36, 36, 60, 36, 36, 60, 60,
+   36, 61, 60, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40,
+   40, 22, 66, 66, 66, 66, 66, 66, 66, 77, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,147, 66, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 66, 66, 66, 66, 36, 36, 36, 36, 36, 36,167, 66,
+    2,  2,  2,151,129, 43, 43, 43,  6,172,173,147,147,147,147,147,
+  147,147,129,151,129,  2,126,174,  2, 63,  2,  2,155,147,147,129,
+    2,175,  8,176, 65,  2, 43, 43, 36, 36, 60, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 60, 78, 92,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,128,129,  4,  2, 36, 36, 36, 36, 36,
+   68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 60, 43,
+   20,177, 55,178, 26,  8,143, 91, 43, 43, 43, 43, 78, 64, 66, 43,
+   36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 60, 36, 61,
+    2, 63, 43,179, 27, 27, 27, 27, 27, 27, 43, 54, 66, 66, 66, 66,
+  104,104,142, 27, 90, 66, 66, 66, 66, 66, 66, 66, 66, 27, 66, 91,
+   66, 66, 66, 66, 66, 66, 91, 43, 91, 43, 43, 43, 43, 43, 43, 43,
+   66, 66, 66, 66, 66, 66, 49, 43,180, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27, 27, 27, 27, 43, 43, 27, 27, 43, 43, 43, 43, 61, 36,
+  154, 36, 36, 36, 36,181, 43, 43, 36, 36, 36, 42, 42, 79, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 92, 36, 36, 43, 43, 36, 36, 36, 36,
+  182,104,104, 43, 43, 43, 43, 43, 11, 11, 11, 11, 16, 16, 16, 16,
+   11, 11, 43, 43, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 43, 43,
+   36, 36, 36, 36, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43, 43, 92,
+   11, 11, 11, 11, 11, 46, 11, 11, 11, 46, 11,149, 16, 16, 16, 16,
+   16,149, 16, 16, 16, 16, 16, 16, 16,149, 16, 16, 16,149,109, 43,
+   39, 39, 39, 51, 39, 39, 39, 39, 80, 39, 39, 39, 39, 80, 43, 43,
+   36, 36, 36, 43, 60, 36, 36, 36, 36, 36, 36, 61, 60, 43, 60, 61,
+   36, 36, 36, 92, 27, 27, 27, 27, 36, 36, 36, 76,162, 27, 27, 27,
+   43, 43, 43,179, 27, 27, 27, 27, 36, 60, 36, 43, 43,179, 27, 27,
+   36, 36, 36, 27, 27, 27, 43, 92, 36, 36, 36, 36, 36, 43, 43, 92,
+   36, 36, 36, 36, 43, 43, 27, 36, 43, 27, 27, 27, 27, 27, 27, 27,
+   69, 42, 56, 79, 43, 43, 42, 42, 36, 36, 61, 36, 61, 36, 36, 36,
+   36, 36, 36, 43, 42, 79, 43, 56, 27, 27, 27, 27, 99, 43, 43, 43,
+    2,  2,  2,  2, 63, 43, 43, 43, 36, 36, 36, 36, 36, 36,183, 30,
+   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 77, 36, 36, 36,
+   36, 36, 69, 79, 43,179, 27, 27,  2,  2,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 43, 92,  2,  2,  2, 36, 36, 36, 43, 27, 27, 27, 27,
+   36, 60, 43, 43, 27, 27, 27, 27, 36, 43, 43, 43, 92,  2, 63, 43,
+   43, 43, 43, 43,179, 27, 27, 27, 11, 46, 43, 43, 43, 43, 43, 43,
+   16,109, 43, 43, 43, 27, 27, 27, 36, 36, 42, 42, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 68, 11, 11, 11, 43, 56, 42, 42,158,
+   16, 16, 16, 43, 43, 43, 43,  8, 27, 27, 27, 27, 27, 27, 27, 99,
+   36, 36, 36, 36, 36, 56,184, 43, 36, 43, 43, 43, 43, 43, 43, 43,
+   43, 36, 82, 36, 43, 43, 43, 43, 96, 66, 66, 66, 91, 43, 43, 43,
+   43, 43, 43, 43, 43, 42, 42, 42, 27, 27, 27, 94, 43, 43, 43, 43,
+  180, 27, 30,  2,  2, 43, 43, 43, 36, 42, 42,  2,  2, 43, 43, 43,
+   36, 36,183, 27, 27, 27, 43, 43, 86, 97, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 42, 59,  2,  2,  2, 43,
+   27, 27, 27,  7,  7,  7,  7,  7, 70, 69, 70, 43, 43, 43, 43, 56,
+   85, 86, 42, 84, 86, 59,185,  2,  2, 79, 43, 43, 43, 43, 78, 43,
+   42, 70, 36, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42, 86, 42,
+   42, 42, 79,  7,  7,  7,  7,  7,  2,  2, 93, 97, 43, 43, 43, 43,
+   36, 69,  2, 60, 43, 43, 43, 43, 36, 93, 85, 42, 42, 42, 42, 84,
+   97, 36, 62,  2, 58, 42, 59, 86,  7,  7,  7,  7,  7, 62, 62,  2,
+  179, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 85, 86, 42, 85, 84, 42,  2,  2,  2, 70,
+   69, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 60, 36, 36, 61,
+   36, 36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 62, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 69, 85, 86, 42, 42, 42, 79, 43, 43,
+   42, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 56, 70, 85,
+   84, 85, 89, 88, 89, 88, 85, 43, 60, 43, 43, 88, 43, 43, 61, 36,
+   36, 85, 43, 42, 42, 42, 79, 43, 42, 42, 79, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 61, 43, 60, 36, 36, 36, 61, 85, 86, 42, 42,
+   79, 89, 88, 88, 85, 89, 85, 84, 70, 70,  2, 92, 63, 43, 43, 43,
+   56, 79, 43, 43, 43, 43, 43, 43, 36, 36, 93, 85, 42, 42, 42, 42,
+   85, 42, 84, 70, 36, 62,  2,  2,  7,  7,  7,  7,  7,  2, 92, 70,
+   85, 86, 42, 42, 84, 84, 85, 86, 84, 42, 36, 71, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 93, 85, 42, 42, 43, 85, 85, 42, 86,
+   59,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 43,
+   85, 86, 42, 42, 42, 84, 86, 86, 59,  2, 60, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2,  2, 63, 43, 36, 36, 36, 36, 36, 69, 86, 85,
+   42, 42, 42, 86, 62, 43, 43, 43,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 56, 86,
+   85, 42, 42, 86, 42, 42, 43, 43,  7,  7,  7,  7,  7, 27,  2, 96,
+   42, 42, 42, 42, 86, 59, 43, 43, 27, 99, 43, 43, 43, 43, 43, 61,
+   36, 36, 36, 60, 61, 43, 36, 36, 36, 36, 61, 60, 36, 36, 36, 36,
+   85, 85, 85, 88, 89, 56, 84, 70, 97, 86,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 36, 43, 36, 36, 36, 93, 85, 42, 42, 43, 42, 85, 85,
+   70, 71, 89, 43, 43, 43, 43, 43, 69, 42, 42, 42, 42, 70, 36, 36,
+   36, 69, 42, 42, 84, 69, 42, 59,  2,  2,  2, 58, 43, 43, 43, 43,
+   69, 42, 42, 84, 86, 42, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42,
+   42, 42, 42, 84, 42,  2, 71,  2,  2, 63, 43, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2, 43, 43, 43, 84, 42, 84, 84, 43, 43, 43, 43,
+   62, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 42, 42, 42, 86,
+   62,  2,  2, 43, 43, 43, 43, 43,  2, 36, 36, 36, 36, 36, 36, 36,
+   43, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 88, 42, 42, 42,
+   84, 42, 86, 79, 43, 43, 43, 43, 36, 36, 36, 60, 36, 61, 36, 36,
+   69, 42, 42, 79, 43, 79, 42, 56, 42, 42, 42, 69, 43, 43, 43, 43,
+   36, 36, 36, 61, 60, 36, 36, 36, 36, 36, 36, 36, 36, 85, 85, 89,
+   42, 88, 86, 86, 60, 43, 43, 43, 36, 36, 36, 36, 82, 36, 43, 43,
+   36, 69, 84,106, 63, 43, 43, 43, 42, 93, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 42, 42, 79, 43, 85, 84, 59,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 79, 43, 43, 27, 27, 90, 66, 66, 66, 55, 20,
+  167, 66, 66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 43, 43, 92,
+  104,104,104,104,104,104,104,181,  2,  2, 63, 43, 43, 43, 43, 43,
+   62, 63, 43, 43, 43, 43, 43, 43, 64, 64, 64, 64, 64, 64, 64, 64,
+   70, 36, 36, 69, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 85, 86, 42,
+   42, 42, 59, 43, 43, 43, 43, 43, 42, 42, 42, 59,  2,  2, 66, 66,
+   39, 39, 96, 43, 43, 43, 43, 43,  7,  7,  7,  7,  7,179, 27, 27,
+   27, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 61, 36,
+   39, 68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,163,  2,
+   27, 27, 27, 30,  2, 63, 43, 43, 11, 11, 11, 11, 46,149, 16, 16,
+   16, 16, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 43, 56,
+   93, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+   85, 85, 85, 85, 43, 43, 43, 56, 42, 73, 39, 39, 39, 39, 39, 39,
+   39, 87, 79, 43, 43, 43, 43, 43, 85, 39,104,181, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 61, 36, 60, 43, 43, 43, 43, 43, 43,
+   39, 39, 51, 39, 39, 39, 51, 80, 43, 60, 43, 43, 43, 43, 43, 43,
+   36, 60, 61, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 43, 49, 59, 64, 64, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 66, 91, 43, 66, 66, 43, 43, 43, 66, 66, 66,
+  176, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 43, 43, 43, 43,
+   66, 66, 66, 91, 54, 66, 66, 66, 66, 66,186, 86, 42, 66,186, 85,
+   85,187, 64, 64, 64, 83, 42, 42, 42, 75, 49, 42, 42, 42, 66, 66,
+   66, 66, 66, 66, 66, 42, 42, 66, 66, 42, 75, 43, 43, 43, 43, 43,
+   27, 27, 43, 43, 43, 43, 43, 43, 11, 11, 11, 11, 11, 16, 16, 16,
+   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
+   16, 16,109, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 46, 11, 43, 46, 47, 46, 47, 11, 46, 11,
+   11, 11, 11, 16, 16,149,149, 16, 16, 16,149, 16, 16, 16, 16, 16,
+   16, 16, 11, 47, 11, 46, 47, 11, 11, 11, 46, 11, 11, 11, 46, 16,
+   16, 16, 16, 16, 11, 47, 11, 46, 11, 11, 46, 46, 43, 11, 11, 11,
+   46, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
+   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 43, 11, 11, 11, 11,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 43,  7,
+   42, 42, 42, 75, 66, 49, 42, 42, 42, 42, 42, 42, 42, 42, 75, 66,
+   66, 66, 49, 66, 66, 66, 66, 66, 66, 66, 75, 21,  2,  2, 43, 43,
+   43, 43, 43, 43, 43, 56, 42, 42, 16, 16, 16, 16, 16,138, 16, 16,
+   16, 16, 16, 16, 16, 16, 16,109, 43, 43,149, 16, 16,109, 43, 43,
+   42, 42, 42, 79, 42, 42, 42, 42, 42, 42, 42, 42, 79, 56, 42, 42,
+   42, 56, 79, 42, 42, 79, 43, 43, 39, 39, 39, 39, 39, 39, 39, 43,
+   43, 43, 43, 43, 43, 43, 43, 56, 42, 42, 42, 73, 39, 39, 39, 43,
+    7,  7,  7,  7,  7, 43, 43, 76, 36, 36, 36, 36, 36, 36, 36, 79,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7, 43, 43, 95,
+   36, 36, 36, 36, 36, 82, 42, 42,188,  7,  7,  7,  7,189, 43, 92,
+   36, 69, 36, 70, 36, 36, 36, 42, 36, 36, 69, 43, 43, 43, 43, 82,
+   36, 36, 36, 60, 36, 36, 61, 60, 36, 36, 60,179, 27, 27, 27, 27,
+   16, 16, 42, 42, 42, 73, 43, 43, 27, 27, 27, 27, 27, 27,162, 27,
+  190, 27, 99, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 27, 27,162,
+   27, 27, 27, 27, 27, 27, 27, 43, 36, 36, 61, 36, 36, 36, 36, 36,
+   61, 60, 60, 61, 61, 36, 36, 36, 36, 60, 36, 36, 61, 61, 43, 43,
+   43, 60, 43, 61, 61, 61, 61, 36, 61, 60, 60, 61, 61, 61, 61, 61,
+   61, 60, 60, 61, 36, 60, 36, 36, 36, 60, 36, 36, 61, 36, 60, 60,
+   36, 36, 36, 36, 36, 61, 36, 36, 61, 36, 61, 36, 36, 61, 36, 36,
+    8, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 66, 43, 43,
+   54, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27, 27, 27, 90, 66,
+   66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 66, 66, 66, 66, 66,
+   66, 91, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 91, 43, 43, 43,
+   66, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 25, 40, 40,
+   66, 66, 66, 66, 91, 43, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43,
+    8,  8,  8,  8,176, 43, 43, 43, 66, 66, 66, 66, 66, 91, 43, 66,
+   66, 66, 66, 91, 91, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91, 54,
+   66, 66, 66, 66, 66, 91, 43, 54, 66, 91, 66, 66, 66, 66, 66, 66,
+    7,  7,  7,  7,  7, 91, 43, 43, 78, 43, 43, 43, 43, 43, 43, 43,
+  170,170,170,170,170,170,170, 43,170,170,170,170,170,170,170,  0,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  2,  2,  6,  5,  9, 21,  9,  2,  2,  9,
+   25,  9, 26, 12, 11, 11,  2,  6,  5, 21, 17,  2,  2, 26, 26, 23,
+    2, 12, 17, 12, 21, 12, 12, 21,  7,  2,  2,  7,  7, 21, 21,  2,
+    1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7,
+   12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,  2,  1, 12,  2,
+    6,  2, 24,  7,  7,  6,  1, 12, 12, 10, 10, 10, 10, 12, 21,  6,
+    2, 10, 10,  2, 15, 26, 26,  2,  2, 21,  7, 10, 15,  7,  2, 23,
+   21, 26, 10,  7, 21, 15, 15,  2, 17,  7, 29,  7,  7, 22, 18,  2,
+   14, 14, 14,  7, 10, 21, 17, 21, 11, 12,  5,  2,  5,  6,  8,  8,
+    8, 24,  5, 24,  2, 24,  9, 24, 24,  2, 29, 29, 29,  1, 17, 17,
+   20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21, 21, 16, 16, 21,
+   25, 22, 18, 21, 21, 29,  1,  2, 15,  6, 18,  6, 12, 11,  9, 26,
+   26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15, 25, 26,
+   26, 22, 18, 26, 18, 25, 18, 22,  5, 12,  2,  5, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 18, 18, 26, 14, 17,  6, 14,  6,
+   12, 24, 24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,
+    6, 10,  4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,
+   25,  2, 25, 24, 23,  2,  2, 15, 12, 15, 14,  2, 21, 14,  7, 15,
+   12, 17, 21,  1, 26, 10, 10,  1,  7, 13, 13,  2, 23, 15,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,
+    0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,
+    0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,
+    0,  0,  0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,
+   43, 44, 45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,  6,  7,  0,  8,
+    9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18, 16, 19, 16, 19,
+   16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22, 23, 24, 25, 26,
+   27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,  0,  0, 36,  0,
+   37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45, 46,  0,  0, 47,
+    0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,  0, 50,
+    0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,  0, 55, 56, 57,
+    0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,  0,  0, 64, 65,
+    0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  0,  0,  0, 70,
+    0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,  0,
+   74, 75,  0,  0,  0,  0, 76, 77,  0, 78, 79,  0,  0, 80, 81,  0,
+   82, 62,  0, 83, 84,  0,  0, 85, 86, 87,  0, 88,  0, 89,  0, 90,
+    0,  0, 51, 91, 51,  0, 92,  0, 93,  0,  0,  0, 81,  0,  0,  0,
+   94, 95,  0, 96, 97, 98, 99,  0,  0,  0,  0,  0, 51,  0,  0,  0,
+    0,100,101,  0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,  0,  0,
+  103,  0,  0,  0,  0,  0,  0,104,105,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,106,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,108,109,  0,  0,110,  0,  0,  0,  0,  0,  0,111,  0,112,  0,
+  105,  0,  0,  0,  0,  0,113,114,  0,  0,  0,  0,  0,  0,  0,115,
+    0,  0,  0,116,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,118,
+    0,119,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0,
+   14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,
+    0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0,
+   28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35,
+   33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,
+    0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,
+    0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,
+    0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,
+    0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,
+    0,  0, 57, 58,  0,  0,  0, 59, 60, 61, 62,  0,  0,  0,  0, 63,
+   52,  0, 64, 65,  0,  0, 66,  0,  0,  0, 67, 68,  0,  0,  0, 69,
+    0, 70, 71, 72, 73, 74,  1, 75,  0, 76, 77, 78,  0,  0, 79, 80,
+    0,  0,  0, 81,  0,  0,  1,  1,  0,  0, 82,  0,  0, 83,  0,  0,
+    0,  0, 79, 84,  0, 85,  0,  0,  0,  0,  0, 80, 86,  0, 87,  0,
+   52,  0,  1, 80,  0,  0, 88,  0,  0, 89,  0,  0,  0,  0,  0, 90,
+   57,  0,  0,  0,  0,  0,  0, 91, 92,  0,  0, 86,  0,  0, 33,  0,
+    0, 93,  0,  0,  0,  0, 94,  0,  0,  0,  0, 49,  0,  0, 95,  0,
+    0,  0,  0, 96, 97,  0,  0, 98,  0,  0, 99,  0,  0,  0,100,  0,
+    0,  0,101,  0,  0,  0,102,  0,  0,  0,  0,103,104, 95,  0,  0,
+  105,  0,  0,  0, 86,  0,  0,106,  0,  0,  0,107,108,  0,  0,109,
+  110,  0,  0,  0,  0,  0,  0,111,  0,  0,112,  0,  0,  0,  0,113,
+   33,  0,114,115,116, 57,  0,  0,117, 35,  0,  0,118,  0,  0,  0,
+  119,  0,  0,  0,  0,  0,  0,120,  0,  0,121,  0,  0,  0,  0,122,
+   90,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,123,  0,  0,  0,
+    0,124,  0,  0,125,  0,  0,  0,  0,123,  0,  0,126,  0,  0,  0,
+    0,  0, 81,  0,  0,  0,  0,127,  0,  0,  0,128,  0,  0,  0,129,
+    0,130,  0,  0,  0,  0,131,132,133,  0,134,  0,135,  0,  0,  0,
+  136,137,138,  0, 79,  0,  0,  0,  0,  0, 35,  0,  0,  0,139,  0,
+    0,  0,140,  0,  0,  0,141,  0,  0,  0,142,143,  0,144,  0,  0,
+  145,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,
+    5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17,
+   18,  1,  1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
+   25, 26, 27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33,
+   34, 35,  1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
+   42,  0,  0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1,
+   21,  0,  0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,
+    0, 19, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
+   54, 21, 35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,
+    0,  0,  0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,
+    0,  0, 64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,
+    0,  0, 68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,
+    0, 77,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,
+    0, 80,  0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,
+    0,  0, 83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,
+    1, 52, 15, 86, 36, 10, 21,  1,  1,  1,  1, 41,  1, 21, 87,  0,
+    0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0, 88,  0,
+    0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 90,  9, 12,  4,
+   91,  8, 92, 47,  0, 58, 50,  0, 21,  1, 21, 93, 94,  1,  1,  1,
+    1, 95, 96, 97, 98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,
+    0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,102,103,
+    0,  0,104,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,  0,  0,
+    0,  0,  0, 62,  0,  0,105, 68, 61,  0,  0,  0, 78,  0,  0,  0,
+  106,107, 58, 38, 81,  0,  0,  0,  0,  0,  0,108,  1, 14,  4, 12,
+   84,  0,  0,  0,  0, 38, 90,  0,  0,  0,  0,109,  0,  0,110, 61,
+    0,111,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0, 19, 58,
+    0,  0,112, 51,  0,112, 14, 52,113, 41,  0,  0, 62,  0,  0, 61,
+    0,  0,114,  0, 90,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,
+    0,114,  0,  0,  0,  0,115,  0,  0,  0, 78, 55,  0, 38,  1, 58,
+    1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,116,  0,  0,  0,
+   55,  0,  0,  0,  0,116,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,
+    0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,
+    8, 92,  0,  0,  1, 90,  0,  0,117,  0,  0,  0,  0,  0,  0,118,
+    0,119,120,121,122,  0,105,  4,123, 49, 23,  0,  0,  0, 38, 50,
+   38, 58,  0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,
+    0,  0,  0,  1,  0,  0,  0,124,  0,  0,  0,113, 19, 59,  0, 38,
+    0, 81,  0,  0,  4,123,  0,  0,  0,  1,125,  0,  0,  0,  0,  0,
+  230,230,230,230,230,232,220,220,220,220,232,216,220,220,220,220,
+  220,202,202,220,220,220,220,202,202,220,220,220,  1,  1,  1,  1,
+    1,220,220,220,220,230,230,230,230,240,230,220,220,220,230,230,
+  230,220,220,  0,230,230,230,220,220,220,220,230,232,220,220,230,
+  233,234,234,233,234,234,233,230,  0,  0,  0,230,  0,220,230,230,
+  230,230,220,230,230,230,222,220,230,230,220,220,230,222,228,230,
+   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,
+    0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27,
+   28, 29, 30, 31, 32, 33, 34,230,230,220,220,230,220,230,230,220,
+   35,  0,  0,  0,  0,  0,230,230,230,  0,  0,230,230,  0,220,230,
+  230,220,  0,  0,  0, 36,  0,  0,230,220,230,230,220,220,230,220,
+  220,230,220,230,220,230,230,  0,  0,220,  0,  0,230,230,  0,230,
+    0,230,230,230,230,230,  0,  0,  0,220,220,220,230,220,220,220,
+  230,230,  0,220, 27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,
+    0,230,220,230,230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,
+    0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,
+  107,107,107,107,118,118,  9,  0,122,122,122,122,220,220,  0,  0,
+    0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,
+    0,  0,130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,230,
+    0,  0,220,  0,  0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,
+    0,230,  0,  0,  0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,
+  230,  0,  0,220,230,220,  0,220,230,230,230,234,  0,  0,  9,  9,
+    0,  0,  7,  0,230,230,230,  0,230,  0,  1,  1,  1,  0,  0,  0,
+  230,234,214,220,202,230,230,230,230,230,232,228,228,220,218,230,
+  233,220,230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,
+  220,230,  1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,
+    0,  0,  0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,
+    0,220,  0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,
+    0,  0,230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,
+    6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,
+    0,226,216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,
+  230,230,  7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145,
+   26, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,
+    3,  3,  3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12,
+   13,  3,  3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,
+    3,  3, 16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,
+    3,  3,  3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3,
+   27, 28,  0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,
+    0,  0,  0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,
+    0,  0,  0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12,
+   13,  0,  0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22,
+   23, 24, 19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,
+    0,  8,  0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34,
+   35, 19,  0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,
+    0,  1, 45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0,
+   14,  0,  0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51,
+   52, 53, 43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14,
+   19,  1,  0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,
+    0,  0,  0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,
+    0,  0,  0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,
+    1,  0,  0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,
+    0,  7,  0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,
+    0,  0,  8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14,
+   15, 16, 17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,
+    0,  0,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8,
+   21,  9,  0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0,
+   26,  0,  0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,
+    1, 28, 29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,
+    1,  4,  5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21,
+   21, 21, 34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0,
+   39,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,
+    0,  0, 40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,
+    1,  1,  1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,
+    0,  0,  1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21,
+   21, 21,  9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,
+    9,  1,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 12, 13,
+   13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 13, 13, 13,
+   24, 25, 26, 26, 26, 27, 13, 13, 13, 28, 29, 30, 13, 31, 32, 33,
+   34, 35, 36, 37,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7, 38,  7,  7, 39,  7, 40,  7,  7,
+    7, 41, 13, 42,  7,  7, 43,  7,  7,  7, 44, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 45,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 37,
+   37, 37, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+   51, 52,  2,  2, 53, 54, 55, 56, 57, 58, 59, 59, 59, 59, 60, 59,
+   59, 59, 59, 59, 59, 59, 61, 61, 59, 59, 59, 59, 62, 59, 63, 64,
+   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 59, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 78, 69, 69, 69, 69, 79, 79, 79, 79, 79, 79, 79, 79, 79, 80,
+   81, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 94, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 69, 69, 96, 97, 98, 99, 99, 99,
+  100,101,102,103,104,105,106,107,108,109, 95,110,111,112,113,114,
+  115,116,117,117,118,119,120,121,122,123,124,125,126,127,128,129,
+  130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
+   95,146,147,148,149, 95,150,151,152,153,154,155,156,157,158,159,
+  160,161, 95,162,163,164,165,165,165,165,165,165,165,166,167,165,
+  168, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,169,170,170,170,170,170,170,170,170,171,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,172,173,173,
+  173,173,174, 95, 95, 95, 95, 95,175, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95,176,176,176,176,177,178,179,180, 95, 95,
+  181, 95,182,183,184,185,186,186,186,186,186,186,186,186,186,186,
+  186,186,186,186,186,186,186,186,186,186,186,186,187,187,187,188,
+  189,190, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,191,192,193,194,195,195,196, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,197,198,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 59,199,
+   59, 59, 59,200,201,202, 59,203,204,205,206,207,208, 95,209,210,
+  211, 59, 59,212, 59,213,214,214,214,214,214,215, 95, 95, 95, 95,
+   95, 95, 95, 95,216, 95,217,218,219, 95, 95,220, 95, 95, 95,221,
+   95,222, 95,223, 95,224,225,226,227, 95, 95, 95, 95, 95,228,229,
+  230, 95,231,232, 95, 95,233,234, 59,235,236, 95, 59, 59, 59, 59,
+   59, 59, 59,237, 59,238,239,240, 59, 59,241,242, 59,243, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,244, 69, 69,245, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,246, 69, 69, 69, 69, 69, 69, 69, 69, 69,247, 69, 69,
+   69, 69,248, 95, 95, 95, 69, 69, 69, 69,249, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69,250, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,251, 95,
+   95, 95, 95, 95, 95, 95,252, 95,253,254,  0,  1,  2,  2,  0,  1,
+    2,  2,  2,  3,  4,  5,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,
+   19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,  0,
+   26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
+    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
+    9,  2,  9,  2,  9,  9,  9,  9,  2,  9,  9,  9, 55, 55, 55, 55,
+   55, 55,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+   14,  2,  2,  2,  2, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,
+    3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,
+    3,  3,  1,  3,  3,  3, 37, 37, 37, 37, 37, 37,  2, 37, 37, 37,
+   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38,  2,  2, 64, 64,
+   64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90,
+    2,  2, 90, 90, 90,  2, 95, 95, 95, 95,  2,  2, 95,  2,  3,  3,
+    2,  2,  2,  2,  2,  3,  3,  3,  0,  3,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,
+    5,  5,  5,  2,  2,  5,  5,  2,  5,  5,  5,  2,  5,  2,  2,  2,
+    5,  5,  5,  5,  2,  2,  5,  5,  5,  2,  2,  2,  2,  5,  5,  5,
+    2,  5,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2,  2, 11,  2,  2, 11,  2, 11,  2,  2,  2, 11, 11,  2, 10,
+   10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10,
+    2,  2, 10,  2,  2,  2,  2,  2, 10, 10,  2, 21, 21, 21, 21, 21,
+   21, 21, 21,  2,  2, 21, 21,  2, 21, 21, 21, 21,  2,  2, 21, 21,
+    2, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2,
+    2, 22, 22,  2,  2,  2, 22, 22, 22, 22, 23, 23, 23, 23, 23,  2,
+   23, 23, 23, 23,  2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2,  2,
+   23, 23,  2,  2,  2, 23, 16, 16, 16, 16, 16,  2, 16, 16,  2, 16,
+   16, 16, 16, 16,  2,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,
+   16, 16, 20, 20, 20, 20, 20,  2, 20, 20,  2,  2, 20, 20,  2, 36,
+   36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36,
+    2, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2, 36, 36,  2,
+   36,  2, 36,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24,  2,  2,  2,  2,  0,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
+   18,  2, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,  2,  2, 18,  2,
+   18,  2, 25, 25, 25, 25,  2, 25, 25, 25, 25,  2,  2,  2, 25,  2,
+   25, 25, 25,  0,  0,  0,  0, 25, 25,  2, 33, 33, 33, 33,  8,  8,
+    8,  8,  8,  8,  2,  8,  2,  8,  2,  2,  8,  8,  8,  0, 12, 12,
+   12, 12, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
+   30,  2,  2, 30, 30, 30, 30,  2,  2,  2, 29, 29, 29, 29, 29, 29,
+    2,  2, 28, 28, 28, 28, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
+   35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,  2,  2, 45, 45,
+   45, 45, 45, 45,  2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44,  0,
+    0,  2, 43, 43, 43, 43, 46, 46, 46, 46, 46,  2, 46, 46, 31, 31,
+   31, 31, 31, 31,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
+   32, 32, 32, 32,  2,  2, 32,  2,  2,  2, 32, 32, 32,  2, 28, 28,
+    2,  2, 48, 48, 48, 48, 48, 48, 48,  2, 48,  2,  2,  2, 52, 52,
+   52, 52, 52, 52,  2,  2, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58,
+    2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54, 54, 54,  2,  2,
+   54, 54, 91, 91, 91, 91, 91, 91, 91,  2, 91,  2,  2, 91, 91, 91,
+    2,  2,  1,  1,  2,  2, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
+   76, 76, 93, 93, 93, 93, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73,  6,  6,  6,  2,  8,  8,
+    8,  2,  2,  8,  8,  8,  1,  1,  1,  0,  1,  0,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  1,  1,  0,  2, 19, 19,  9,  9,  9,  9,
+    9,  6, 19,  9,  9,  9,  9,  9, 19, 19,  9,  9,  9, 19,  6, 19,
+   19, 19, 19, 19, 19,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,
+    9,  9,  1,  1,  0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,
+    0, 19,  0,  0,  0,  2, 19,  2,  2,  2,  0,  0,  2,  2,  1,  2,
+    2,  2,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27,  2,  2,
+    0,  0, 56, 56, 56, 56,  2, 55, 55, 55, 61, 61, 61, 61,  2,  2,
+    2, 61, 61,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13,
+    2,  2,  0, 13,  0, 13,  0, 13, 13, 13, 13, 13,  1,  1,  1,  1,
+   12, 12,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17,  0,  2, 26, 26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12,
+   12,  2, 12, 12, 12,  0, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39,
+   39,  2, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79,  2, 19,
+   19, 19, 60, 60, 60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 75, 75,
+   75, 75, 75, 75,  2,  2,  2,  2, 75, 75, 69, 69, 69, 69, 69, 69,
+    0, 69, 74, 74, 74, 74,  2,  2,  2, 74, 12,  2,  2,  2, 84, 84,
+   84, 84, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33, 33,
+   33,  2, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,  2,  2, 92, 92,
+   92, 92, 92, 92, 92,  2,  2,  2,  2, 92, 87, 87, 87, 87, 87, 87,
+   87,  2, 19,  9, 19, 19, 19, 19,  0,  0, 87, 87,  2,  2,  2,  2,
+    2, 12, 19, 19, 19,  2,  2,  2,  2,  4, 14,  2, 14,  2, 14, 14,
+    2, 14, 14,  2, 14, 14,  3,  3,  0,  0,  1,  1,  6,  6,  3,  2,
+    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+    0,  0,  2,  2, 12, 12, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49,  2, 49, 49,  2, 49, 49, 49,  2,  2,  0,  2,  2,  2,  9,  2,
+    2,  2,  0,  1,  2,  2, 71, 71, 71, 71, 71,  2,  2,  2, 67, 67,
+   67, 67, 67,  2,  2,  2, 42, 42, 42, 42,  2, 42, 42, 42, 41, 41,
+   41, 41, 41, 41, 41,  2,118,118,118,118,118,118,118,  2, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 51, 51, 51, 51, 50, 50, 50, 50, 50, 50,  2,  2,135,135,
+  135,135,106,106,106,106,104,104,104,104,  2,  2,  2,104,161,161,
+  161,161,161,161,161,  2,161,161,  2,161,161,  2,  2,  2,170,170,
+  170,170,110,110,110,110,110,110,110,  2,110,110,  2,  2, 19, 19,
+    2, 19, 19,  2, 19, 19, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
+   47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81, 81,
+   81, 81, 81, 81,  2, 81,120,120,120,120,116,116,116,116,116,116,
+  116,  2,  2,  2,  2,116,128,128,128,128,128,128,128,  2,128,128,
+    2,  2,  2,  2,  2,128, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
+   72, 72, 72, 72,  2,  2,  2,  2,  2, 72,173,173,173,173,173,173,
+    2,  2, 98, 98, 98, 98, 97, 97, 97, 97,  2,  2, 97, 97, 57, 57,
+   57, 57,  2, 57, 57,  2,  2, 57, 57, 57, 57, 57,  2,  2, 57, 57,
+   57,  2,  2,  2,  2, 57, 57,  2,  2,  2, 88, 88, 88, 88,117,117,
+  117,117,112,112,112,112,112,112,112,  2,  2,  2,  2,112, 78, 78,
+   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 83, 83, 83, 83, 83, 83,
+    2,  2, 82, 82, 82, 82, 82, 82, 82,  2,122,122,122,122,122,122,
+    2,  2,  2,122,122,122,122,  2,  2,  2, 89, 89, 89, 89, 89,  2,
+    2,  2,130,130,130,130,130,130,130,  2,  2,  2,130,130,144,144,
+  144,144,144,144,  2,  2,165,165,165,165,165,165,  2,  2,  2,165,
+  165,165,  2,  2,165,165,  3,  3,  3,  2,156,156,156,156,156,156,
+    2,156,156,156,  2,  2,  2,  2,  3,  3,  3,  2,  2,  2,147,147,
+  147,147,148,148,148,148,148,148,  2,  2,158,158,158,158,158,158,
+    2,  2,153,153,153,153,149,149,149,149,149,149,149,  2, 94, 94,
+   94, 94, 94, 94,  2,  2,  2,  2, 94, 94,  2,  2,  2, 94, 85, 85,
+   85, 85, 85, 85, 85,  2,  2, 85,  2,  2,101,101,101,101,101,  2,
+    2,  2,101,101,  2,  2, 96, 96, 96, 96, 96,  2, 96, 96,111,111,
+  111,111,111,111,111,  2,100,100,100,100,108,108,108,108,108,108,
+    2,108,108,108,  2,  2,129,129,129,129,129,129,129,  2,129,  2,
+  129,129,129,129,  2,129,129,129,  2,  2,109,109,109,109,109,109,
+  109,  2,109,109,  2,  2,107,107,107,107,  2,107,107,107,107,  2,
+    2,107,107,  2,107,107,107,107,  2,  1,107,107,  2,  2,107,  2,
+    2,  2,  2,  2,  2,107,  2,  2,107,107,171,171,171,171,171,171,
+    2,171,  2,  2,171,  2,171,  2,171,  2,  2,171,  2,171,171,171,
+  171,  2,171,  2,  2,  2,  2,171,171,  2,137,137,137,137,  2,137,
+  137,137,137,137,  2,  2,124,124,124,124,124,124,  2,  2,123,123,
+  123,123,123,123,  2,  2,114,114,114,114,114,  2,  2,  2,114,114,
+    2,  2,102,102,102,102,102,102,  2,  2,126,126,126,126,126,126,
+  126,  2,  2,126,126,126,142,142,142,142,125,125,125,125,125,125,
+  125,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
+    2,  2,  2,154,154,  2,154,154,  2,154,154,  2,  2,154,154,154,
+    2,  2,150,150,150,150,  2,  2,150,150,150,  2,  2,  2,141,141,
+  141,141,140,140,140,140,140,140,140,  2,121,121,121,121,121,  2,
+    2,  2,  7,  7,  2,  2,169,169,169,169,169,169,  2,  2,133,133,
+  133,133,133,  2,133,133,133,133,133,  2,133,133,  2,  2,133,  2,
+    2,  2,134,134,134,134,  2,  2,134,134,  2,134,134,134,134,134,
+  134,  2,138,138,138,138,138,138,138,  2,138,138,  2,138,  2,  2,
+  138,  2,138,138,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
+  143,143,143,143,143,  2,143,  2,  2,  2,143,143,  2,  2,175,175,
+  175,175,175,175,  2,  2,145,145,145,145,145,  2,  2,  2,163,163,
+  163,163,163,  2,163,163,163,163,163,  2,  2,  2,163,163, 86,  2,
+    2,  2, 63, 63, 63, 63, 63, 63,  2,  2, 63, 63, 63,  2, 63,  2,
+    2,  2,157,157,157,157,157,157,157,  2, 80, 80, 80, 80, 80, 80,
+    2,  2, 80, 80, 80,  2,127,127,127,127,127,127,127,  2,166,166,
+  166,166,166,166,  2,  2, 79,  2,  2,  2,115,115,115,115,115,115,
+  115,  2,115,115,  2,  2,  2,  2,115,115,159,159,159,159,159,159,
+  159,  2,159,159,  2,  2,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,  2,  2,119,119,  2,119,  2,119,119,119,167,167,
+  167,167,167,167,  2,  2,146,146,146,146,146,146,146,  2,172,172,
+  172,172,172,  2,  2,172, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,
+    2, 99,136,139, 13, 13,155,  2,  2,  2, 13, 13, 13,  2,136,136,
+  136,136,155,155,155,155,155,155,  2,  2,  2,  2,  2,155,136,136,
+  136,  2,  2, 17, 17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 17, 17,
+   17,  2,  2,  2, 15,  2,  2, 17,  2,  2,139,139,139,139,105,105,
+  105,105,105,105,105,  2,105,  2,  2,  2,105,105,  2,  2,  1,  1,
+    1,  2,  0,  0,  0,  1,  0,  1,  1,  1,  0,  0,  1,  1,  2,  2,
+    0,  2,  2,  0,  0,  2,  0,  0,  2,  0,  0,  2,  0,  2,131,131,
+  131,131,  2,  2,  2,131,  2,131,131,131, 56, 56, 56,  2, 56,  2,
+    2, 56, 56, 56,  2, 56, 56,  2, 56, 56,  6,  6,  2,  2,  2,  2,
+    2,  6,151,151,151,151,151,  2,  2,  2,151,151,  2,  2,  2,  2,
+  151,151,160,160,160,160,160,160,160,  2,152,152,152,152,152,152,
+    2,  2,  2,  2,  2,152,164,164,164,164,164,164,  2,  2,168,168,
+  168,168,168,168,168,  2,  2,  2,  2,168,174,174,174,174,174,174,
+  174,  2,174,174,  2,  2,  2,  2,174,174,  2, 30, 30,  2,113,113,
+  113,113,113,  2,  2,113,113,113,113,  2,132,132,132,132,132,132,
+    2,  2,  2,  2,132,132,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,
+    2,  3,  2,  3,  2,  3,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,
+    2,  3, 15,  0,  0,  2,  0,  2,  2,  0, 13,  2,  2,  2,  2,  0,
+    2,  2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,
+    9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,
+    9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26, 27,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18,
+   19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0,
+   31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,
+    0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,
+    0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,
+    0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,
+    0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+   87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,
+  103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,
+  108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,
+    0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,  0,127,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   31,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 32,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-   22,  2, 23, 24, 25,  2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-   36, 37,  5, 38, 39, 40, 41, 42,  3, 43,  5, 44, 45, 46, 47, 48,
-   49, 50, 51,  3,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 52,  2,  2,
-   53,  2,  2,  2, 54,  2, 55, 56, 57, 58, 59, 60,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2, 61,  4,  4,  4,  4,  4,  4,  4,  4,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  2, 62, 63,  2, 64, 65, 66,
-   67, 68, 69, 70, 71, 72,  2, 73, 74, 75, 76, 77, 78, 79, 80, 81,
-   82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
-    2,  2,  2, 98, 99,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,101,
-    2,  2,  2,  2,102,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,103,  2,  2,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,105,  0,  0,  0,  0,  0,  0,  2,  2,106,107,  0,108,109,110,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,111,112,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,113,
-    2,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,116,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  3,118,119,
-  120,121,122,123,124,125,126,127,  3,  3,128,  0,  0,  0,  0,129,
-  130,131,132,  0,133,134,135,136,137,138,  0,  0,139,140,141,  0,
-  142,143,144,145,  3,  3,146,147,148,  3,149,150,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  2,151,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,152,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,153,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,154,  2,  2,155,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  2,  2,156,  0,  0,  0,  0,  0,
-    2,  2,  2,157,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,158,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  159,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,161,
-    0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,
-    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,
-    4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,  6,  6,  6,  6,
-    8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,
-    5,  5,  5,  5,  5,  5,  5,  5,  7,  7,  7,  7,  7,  7,  7,  7,
-   11, 11, 11, 11, 11,  0,  0,  0, 10, 10, 10, 10, 10, 10, 10, 10,
-   13, 13, 13, 13, 13, 13, 13, 13, 16, 16, 16, 16, 16, 16, 16, 16,
-    1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1, 14,
-    1,  1,  1,  1, 14,  1,  1,  1, 18, 18, 18, 18, 18, 18, 18, 18,
-    1,  5,  0, 11, 11, 11, 11, 11,  1,  1,  1,  1,  1,  1, 14,  0,
-    1,  1,  1,  1, 14,  0,  0,  0,  6,  6,  6,  6,  7,  7,  7,  7,
-    1,  1,  1,  1,  1, 14,  0,  0,  1,  1,  1,  1,  1,  1,  0,  0,
-    1,  1,  1,  1,  1,  0,  0,  0,  1,  1,  1, 14,  0,  0,  0,  0,
-    1,  1,  1, 14,  1,  1,  1, 14,  3,  3,  3,  3,  3,  3,  0,  0,
-   28, 28, 28, 28, 28, 28, 28, 28, 11, 11, 11, 11, 11,  1,  1,  1,
-   14, 17,  1,  1,  1,  1,  1,  1, 14,  0,  0,  0,  0,  0,  0,  0,
-   14,  1,  1,  1,  1,  1,  1,  1,  3,  3,  3,  3,  3,  0,  0,  0,
-    3,  3,  3,  0,  0,  0,  0,  0,  3,  3,  3,  3,  3,  3, 29,  0,
-   11, 11, 11, 11, 11, 11, 11, 11,  7,  7,  7,  7,  7,  6,  6,  6,
-    0,  0,  0, 11, 11, 11, 11, 11, 17,  1,  1,  1,  1,  1,  1,  1,
-   11, 11, 11, 11, 11, 10, 10, 10,  1,  1,  1,  0,  0,  0,  0,  0,
-    5, 46,  1,  1,  1,  1,  1,  1,  6,  6,  6,  6, 41, 41, 41, 41,
-    3,  3,  0,  0,  0,  0,  0,  0, 11, 11, 11, 11, 11,  0,  0, 12,
-    1,  1,  0,  0,  0,  0,  0,  0, 29,  0,  0,  0,  0,  0,  0,  0,
-   49, 10, 10, 10, 10, 10, 10, 10,  7,  6,  6,  6,  6,  6,  6,  6,
-   44,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,
-    3,  3,  3,  3,  0,  0,  0,  0, 11, 11, 11, 11, 11, 12,  9, 77,
-   88,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,102,103,104,
-   89,  6,  6,  6,  6,  6,  6,  6, 22, 22, 22, 22, 22, 22, 22, 22,
-   26,  5,  5,  5,  5,  5,  5,  5,  1,  1,  1,  5,  5,  5,  5,  5,
-    5, 20,  1,  1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1,  1,  1,
-   11, 11, 11, 11, 11, 12, 12, 12,  1,  1,  1,  1, 14,  1,  1,  0,
-   14,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1, 14,  1,  1,  1,  1,
-   10, 10, 10, 10, 10, 10, 51,  0,115,  1,  1,  1,  1,  1,  1,  1,
-    5,  5,  5,  5,  5,  5,  5,  0,  1,  1,  1,  1, 13, 13, 13, 12,
-    6,  6,  6,  0,  7,  7,  7,  0, 30, 30, 30, 30, 30, 30, 30, 30,
-    3,  3,  3,  3,  3, 29,  0,  0,  3,  3,  3,  3,  3,  3,  3, 29,
-   10, 10, 10, 10, 10,  3,  3,  3, 75, 10, 10, 10, 10, 10, 10, 10,
-    3,  3,  3, 29,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  0,  0,
-    7,  7,  7,  7,  7, 32,  7,  7,  0, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 51,  0,  0,  0,  1,  1,  1,  1,  1,  1, 86, 10,
-    1,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1, 15, 19,
-    1,  1,  1,  1,  1,  1,  1, 34,  1,  1,  1,  1,  1,  1,  1,  5,
-   15, 15, 15, 15, 15, 15, 15, 15,  1, 14,  0,  0,  0,  0,  0,  0,
-    5,  5,  5, 23,  0,  0,  0,  0, 10, 10,  0,  0,  0,  0,  0,  0,
-    6,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  6,
-    6,  6,  6,  6,  6,  6,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,
-    3,  3,  3,  3, 29,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-   87, 12,100, 12, 27,101, 76, 12,  6,  6,  6,  6,  6,105,106,135,
-   87, 30, 30, 66,107,136,137,108, 50, 10, 89, 12,138,139, 10, 78,
-    7,  7,  7, 59,  7,  7,  7,  8,  6,  6,  6, 60,  6,  6,  6,  6,
-    8,  8,  8,  8, 21, 21, 21, 21, 21, 21, 21, 21,  6,  8,  8,  8,
-    8,  8,  8,  8,  7, 21, 21,  6, 21,  8,  8,  7, 21,  7,  6,  7,
-    7, 21,  8,  7,  8,  6,  7, 21,  8,  8,  8,  7, 21,  6,  8,  7,
-   21,  7, 21, 21,  8, 67,  8,  6,  1,  1,109, 21,110,109, 21, 21,
-   21, 21, 21, 21, 21, 21,  6,  8, 21,110,  8,  7,  8,  8,  8,  8,
-    8,  8,  6,  6,  6,  7, 21,  8, 21, 21,  7,  8,  8,  8,  8,  8,
-    6,  6,  1,  6,  6,  6,  6,  6, 13, 22, 22, 13, 13, 13, 13, 13,
-   13, 22, 22, 22, 22, 22, 22, 22, 13, 13, 68, 22, 22, 22, 68, 68,
-    8,  8, 68,  8,  0, 69,  6, 88,  0,  0, 22,140,  7, 32, 32,  7,
-   21,  7,  7,  7,  7,  7,  7,  7,  7, 39,  7,  7,  7,  7,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 21,  6,  7,  8,  6,  8,  8,  8,  8,
-    6,  6,  8, 90, 21,  8, 21,  7,  8, 43,  5,  5, 79,  8,  8,  8,
-    7, 21, 21, 21, 21, 21, 21,  6, 39,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7, 32, 54, 12, 12, 12,  6,  6,  6,  6,111,141, 44, 70,
-    5,  5,  5,  5,  5,  5,  5,142, 71, 36,  5, 71,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 14,  0, 17,  1, 40, 33,  0,  0,  0,  0,  0,
-   18, 18, 18,  9, 77, 80, 12,  3,  5,  5,  5,  5,  5, 36,143, 12,
-   52,  1,  1,  1,  1, 24,  5,  5, 11, 11, 11, 11, 11, 12, 12,  1,
-   25,  1,  1,  1,  1,  1,  1,  1,  1,  1, 53,  5,  5,  5,144, 43,
-    5,  5, 81, 72, 55,  5,  5,  1, 11, 11, 11, 11, 11,  1, 56, 82,
-   12, 12, 12, 12, 12, 12, 12, 73, 24,  1,  1,  1,  1,  1,  1,  1,
-    5,  5,  5,  5,  5, 23, 17,  1, 25,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 24,  5,  5,  5,  5, 13, 66, 12, 61, 26, 30,
-    1,  1,  1,  5,  5, 72,  5,  5,  5,  5, 72,  5, 72,  5,  5,  0,
-   12, 12, 12, 12, 12, 12, 12, 33,  1,  1,  1,  1, 24,  5,  0, 33,
-    1,  1,  1,  1,145,  1,  1,  1, 18,  0,  0, 26,  5,  5,  5,  5,
-    1,  1,  1,  1, 45,  5,  5,  5,  5, 91,  5,  5,  5,  5,  5,  5,
-    1,  1,  1,  1,  1, 20, 25, 15, 19,  5,  5,  5, 20, 15, 19, 15,
-   24,  5,  5,  5,  1,  1,  1,  1,  1,  5, 12, 11, 11, 11, 11, 11,
-   62,  1,  1,  1,  1,  1,  1,  1, 24, 15, 17,  1,  1,  1, 14, 17,
-   14, 14,  0,  1,  1,  0, 25, 15, 19,  5, 23, 35, 37, 35, 19, 14,
-    0,  0,  0, 35,  0,  0,  1, 17,  1, 30, 10, 10, 10, 70, 40, 23,
-   26, 20, 17,  1,  1, 14,  0, 17, 14,  1, 17, 14,  1,  0, 23, 15,
-   19, 23,  0, 26, 23, 26,  5,  0, 26,  0,  0,  0, 17,  1, 14, 14,
-    5,  1, 24, 33,  0,  0,  0,  0, 26, 20, 17,  1,  1,  1,  1, 17,
-   14,  1, 17,  1,  1,  0, 25, 15, 19,  5,  5, 26, 20, 35, 19,  0,
-   80,  0,  0,  0, 17,  5,  5,  5, 26, 15, 17,  1,  1,  1, 14, 17,
-   14,  1, 17,  1,  1,  0, 25, 19, 19,  5, 23, 35, 37, 35, 19,  0,
-    0,  0, 26, 20,  0,  0,  1, 17, 82, 10, 10, 10,  0,  0,  0,  0,
-    0, 25, 17,  1,  1, 14,  0,  1, 14,  1,  1,  0, 17, 14, 14,  1,
-    0, 17, 14,  0,  1, 14,  0,  1,  1,  1,  1,  1,  1,  0,  0, 15,
-   20, 37,  0, 15, 37, 15, 19,  0, 14,  0,  0, 35,  0,  0,  0,  0,
-   10, 63,  3,  3, 70, 29,  0,  0, 20, 15, 25,  1,  1,  1, 14,  1,
-    1,  1,  1,  1,  1,  0, 25,  5, 20, 15, 37,  5, 23,  5,  5,  0,
-    0,  0, 26, 23,  1, 14,  1,  0,  0,  0,  0, 38, 10, 10, 10, 63,
-   24, 15, 53,  1,  1,  1, 14,  1,  1,  1, 17,  1,  1,  0, 25, 19,
-   15, 15, 37, 20, 37, 15,  5,  0,  0,  0, 35, 37,  0,  0,  1, 14,
-   17, 34,  0,  0,  0,  0,  0,  0,  5, 15,  1,  1,  1,  1, 14,  1,
-    1,  1,  1,  1,  1, 24, 25, 15, 19,  5, 23, 15, 37, 15, 19, 56,
-    0,  0,  1, 34, 10, 10, 10,112, 10, 10, 10, 10, 63,  1,  1,  1,
-   26, 15, 17,  1,  1,  1,  1,  1,  1,  1,  1, 14,  0,  1,  1,  1,
-    1, 17,  1,  1,  1,  1, 17,  0,  1,  1,  1, 14,  0, 23,  0, 35,
-   15,  5, 23, 23, 15, 15, 15, 15,  0, 15, 33,  0,  0,  0,  0,  0,
-   24,  1,  5,  5,  5, 23,  0,113,  1,  1,  1, 72,  5,  5,  5, 36,
-   11, 11, 11, 11, 11, 12,  0,  0, 17, 14, 14,  1,  1, 14,  1,  1,
-    1,  1, 17, 17,  1,  1,  1,  1, 24,  1,  5,  5,  5,  5, 25,  0,
-    1,  1, 14, 61,  5,  5,  5, 23, 11, 11, 11, 11, 11,  0,  1,  1,
-   56,  3, 12, 12, 12, 12, 12, 12, 12, 57, 57,  3,  5,  3,  3,  3,
-   10, 10, 43, 43, 43, 27, 27, 15,  1,  1,  1,  1, 17,  1,  1,  1,
-   26,  5,  5,  5,  5,  5,  5, 20,  5,  5, 36,  5,  1,  1, 24,  5,
-    5,  5,  5,  5, 26,  5,  5,  5,  5,  5,  5,  5,  5,  5, 23,  3,
-    3,  3,  3, 55,  3,  3, 29,  3, 12, 12, 57,  3, 66, 33,  0,  0,
-    1,  1,  1,  1,  1, 34, 19,  5, 20,  5,  5,  5, 19, 20, 19, 25,
-    1,  1,  1, 15,  5,  1,  1,  5, 25, 15, 46, 34, 15, 15, 15,  1,
-   24,  5, 25,  1,  1,  1,  1,  1,  1, 20, 19, 20, 15, 15, 19, 34,
-   11, 11, 11, 11, 11, 15, 19,  3,  7,  7,  7, 39,  0,  0, 39,  0,
-    6,  6,  6,  6,  6,111, 69,  6,  1,  1,  1, 14, 14,  1,  1,  0,
-   14,  1,  1,  0,  1,  1,  1, 14,  1,  1,  1,  1,  1, 14, 26,  5,
-   12, 12, 12, 12,114, 10, 10, 10,  7,  7,  7,  0,  6,  6,  6,  0,
-    1,  1,  1,  1,  1,  1, 56, 53,146,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,147,116,  0,  1,  1,  1,  1,  1, 40, 12, 16,
-  148,  1,  1,  1, 14,  0,  0,  0,  1,  5, 20,  0,  0,  0,  0, 17,
-    1,  5, 83, 33,  0,  0,  0,  0,  1,  5,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1, 14,  1, 14,  5,  0,  0,  0,  0,  0,  0,
-    1,  1,  5, 19,  5,  5,  5, 15, 15, 15, 15, 20, 19,  5,  5,  5,
-    5,  5, 12, 62, 12, 80, 24,  0, 10, 10, 10, 10, 10,  0,  0,  0,
-   12, 12, 12, 92, 12, 71,  5, 91,  1, 45,  1,  1,  1,  1,  1,  1,
-    1,  1, 24, 25,  1,  1,  1,  1,  1,  1,  1,  1, 24, 14,  0,  0,
-    5, 20, 15, 19, 20, 15,  0,  0, 15, 20, 15, 15, 19,  5,  0,  0,
-   29,  0, 12, 11, 11, 11, 11, 11,  1,  1, 14,  0,  0,  0,  0,  0,
-   11, 11, 11, 11, 11, 51,  0,  3,  1,  1,  1, 24, 20, 19,  0, 12,
-    1,  1, 34, 20,  5,  5,  5, 23, 20, 20, 19,  5,  5,  5, 20, 15,
-   15, 19,  5,  5,  5,  5, 23, 26, 12, 12, 12, 62, 12, 12, 12,  0,
-    5,  5,  5,  5,  5,  5,  5, 93,  5,  5,  5,  5,  5,  5,  0,  0,
-    5,  5, 46,  1,  1,  1,  1,  1,  1,  1, 20,  5,  5, 20, 20, 15,
-   15, 20, 46,  1,  1,  1, 14, 12, 57,  3,  3,  3,  3, 43,  5,  5,
-    5,  5,  3,  3,  3,  3, 66, 12, 34,  5,  5, 15,  5, 19,  5,  1,
-    1,  1,  1, 20,  5, 15, 19, 19,  5, 15,  0,  0,  0,  0, 12, 12,
-    1,  1, 15, 15, 15, 15,  5,  5,  5,  5, 15,  5,  0, 38, 12, 12,
-   11, 11, 11, 11, 11,  0, 17,  1,  6,  6,  6,  6, 21, 47,  0,  0,
-    7,  7,  7,  7,  7, 32, 39,  7, 12, 12, 12, 12,  0,  0,  0,  0,
-    5, 36,  5,  5,  5,  5,  5,  5, 20,  5,  5,  5, 25,  1, 24,  1,
-    1,  1, 25, 34,  5, 14,  0,  0,  6,  6,  6,  6,  6,  6, 13, 13,
-   13, 13, 13, 13, 13, 69,  6,  6,  6,  6,  6,  6, 69,  6,  6,  6,
-    6,  6,  6,  6,  6,117, 13, 13,  8,  8,  8,  6,  6,  6,  6,  8,
-    6,  6,  6,  6, 39, 39, 39, 39,  6,  6,  6,  6,  6,  6,  6,  0,
-    6,  6, 47,  6,  7,  7, 94,118, 22,  6, 47,  6,  7,  7, 94, 22,
-    6,  6,  0,  6,  7,  7,149, 22,  6,  6,  6,  6,  7,  7,150, 22,
-    0,  6, 47,  6,  7,  7, 94,151, 74, 74, 74, 74, 74,152, 18, 18,
-   84, 84, 84, 12, 58,119, 58,119, 12, 12, 12, 12,153, 18, 18,154,
-   12, 12, 12, 12,120,121, 12,122,123, 12, 64, 65, 12, 12, 12, 12,
-   12, 77,123, 12, 12, 12, 12,155, 18, 18,156, 18, 18, 18, 18, 18,
-  157,  0, 10, 10, 10,  9, 64,158, 10, 10, 10, 10, 10,  9, 64,116,
-   13, 13, 13, 13, 13, 13, 61,  0, 30,  0,  0,  0,  0,  0,  0,  0,
-    5,  5,  5,  5,  5,  5,159, 79, 93, 79, 93,  5,  5,  5,  5,  5,
-   23,  0,  0,  0,  0,  0,  0,  0,  3, 85,  3, 95,  3, 21,  7,  6,
-    7,  8, 95,  3, 90,  7,  7,  3,  3,  3, 85, 85, 85,  7,  7,160,
-    7,  7, 67,  1,124,  3,  6,  7,  9,  9, 90,  6,  6, 50,  3,125,
-   16,161,162, 16,126,  3,  0,  0,  9,  9, 48,  3,  3,  9,  3,  3,
-   48, 50,  3, 48,  3,  3,  3, 48,  3,  3,  3,  3,  3,  3,  3,  9,
-    3, 48, 48,  3,  3,  3,  3,  3,  3,  3,  9,  9,  9,  9,  9,  9,
-    3,  3,  3,  3, 27, 27,  3,  3,  9,  3,  3,  3,163,164,  3,  3,
-    3,  3,  3,  3,  3,  3, 48,  3,  3,  3,  3,  3,  3, 50,  9,  9,
-    9,  9,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  9,  9,
-    9,  3,  3,  3,  3,  3,  3,  3, 10, 10, 10, 10, 10, 10,  3,  3,
-    3,  3,  3,  3,  3, 10, 10, 10,  3,  3,  3, 50,  3,  3,  3,  3,
-   50,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  9,  9,  9,  9,
-    3,  3,  3,  3,  3,  3,  3, 50,  3,  3,  3,  3, 27, 27, 27, 27,
-   27, 27, 27, 10, 10, 10, 10, 10, 10, 10,  3,  3,  3,  3,  3,  3,
-    9,  9, 64,127,  9,  9,  9,  9,  9,  9,  9, 27, 27, 27, 27, 27,
-    9, 64, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,127,  9,  9,  9,
-    9,  9,  9,  9, 27, 27,  9,  9,  9,  9,  9,  9,  9,  9, 27,  9,
-    9,  9, 48, 50,  9,  9, 48,  3,  3,  3,  0,  3,  3,  3,  3,  3,
-    8,  7,  8, 21, 21, 21, 21,  7,  8,  8, 21,  6,  6,  6, 13,  7,
-    8,  8,125,  3,  3, 95, 21,165,  5,  8,  0,  0, 38, 12,114, 12,
-    6,  6,  6, 42,  0,  0, 42,  0,  1,  1,  1,  1,  0,  0,  0, 54,
-   33,  0,  0,  0,  0,  0,  0, 26, 12, 58, 58, 12,120,121, 58, 12,
-   12, 12, 12, 76, 12, 92, 58, 12, 58, 27, 27, 27, 27, 12, 12, 62,
-   12, 12, 12, 12, 12, 84, 12, 12, 92,166, 12, 12, 12, 12, 12, 12,
-    3, 12, 96, 31, 31, 31,167,  0,  3,  3,  3,  3,  3, 44,  3,  3,
-   87, 12,168,128, 27, 27, 27, 27, 27,  3, 27, 27, 27, 27,129,169,
-  170, 16, 16, 16, 16,  5,  5, 15,130, 13, 13,  3, 16,171, 40,  3,
-    1,  1,  1, 14, 26,172,131, 52,  1,  1,  1,  1,  1, 40, 13, 52,
-    0,  0, 17,  1,  1,  1,  1,  1,  3, 10, 10,  3,  3,  3,  3,  3,
-    3,  3,  3,  0,  0,  0,  0, 44,  3,  3,  3,  3, 10, 10, 10, 10,
-    1,  1, 45,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,132, 12,
-   11, 11, 11, 11, 11,  1,  0,  0,  8,  8,  8,  8,  8,  8,  8, 24,
-   79,173,  5,  5,  5,  5,  5, 62,  8,  8,  8,  8,  8,  8, 13,  5,
-    1,  1,  1, 16, 16, 16, 16, 16,  5, 12, 12, 12,  0,  0,  0,  0,
-   22, 22, 22,131, 13, 13, 13, 13, 22,  8,  8,  8,  8,  8,  8,  8,
-    6,  8,  8,  8,  8,  8,  8,  8, 69,  6,  6,  6, 21, 21, 21,  8,
-    8,  8,  8,  8, 68,174, 21, 67,  8,  8,  6,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  7,  7,  8,  7,  7,  8,  8,  8,  8,  8,  8,
-    8,  8,  7,  7, 21, 21,  8,  8,  8,  8,  8,  8,  8,  8, 32,  0,
-   54, 13,175, 67, 13, 67,  1,  1,  1, 25,  1, 25,  1, 24,  1,  1,
-    1, 34, 19, 20,  3,  3, 23,  0, 10, 10, 10,  3, 97,  0,  0,  0,
-    1,  1, 12, 12,  0,  0,  0,  0, 15,  1,  1,  1,  1,  1,  1,  1,
-    1,  1, 15, 15, 15, 15, 15, 15, 15, 15,  5,  0,  0,  0,  0, 12,
-    5,  1,  1,  1, 12, 53, 53, 24,  1,  1,  1,  5,  5,  5,  5, 12,
-    1,  1,  1, 24,  5,  5,  5,  5,  5, 15,  0,  0,  0,  0,  0, 38,
-    1, 24, 15,  5,  5, 15,  5, 15, 83, 12, 12, 12, 12, 12, 12, 54,
-    1,  1, 24, 52,  1,  1,  1,  1, 11, 11, 11, 11, 11,  1,  1, 14,
-    1,  1,  1,  1, 24,  5,  5, 20, 19, 20, 19, 23,  0,  0,  0,  0,
-    1, 24,  1,  1,  1,  1, 20,  0, 11, 11, 11, 11, 11,  0, 12, 12,
-   52,  1,  1, 56,  3, 34, 20,  1, 25,  5, 25, 24, 25,  1,  1,  5,
-   24, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 45, 12,
-    1,  1,  1,  1,  1, 34,  5, 15, 12, 45,176, 23,  0,  0,  0,  0,
-   17,  1,  1, 14, 17,  1,  1, 14, 17,  1,  1, 14,  0,  0,  0,  0,
-    6,  6,  6,  6,  6,118, 13, 13,  6,  6,  6,  6,117, 22,  0,  0,
-    1, 34, 19, 15, 20, 83, 19,  0,  1,  1,  1, 14,  0, 17,  1,  1,
-    6,  6,  6, 47,  0,  0,  0,  0,  0, 42,  6,  6,  0,  0, 17, 25,
-    1,  1,  1,  1,177,  1,  1,  1,  1,  1,  1, 14,  1,  1, 14, 14,
-    1, 17, 14,  1,  1,  1,  1,  1,  1, 22, 22, 22, 22, 22, 22, 22,
-   22,107,  3,  3,  3,  3,  3,  3,  3, 82,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1, 31,  3,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  3,  3,  3,  3,  1,  1,  1,  1,  1,  1, 97,  3,
-   12, 12, 12, 96, 65,  0,  0,  0, 76,178,179, 31, 31, 31, 31, 31,
-   31, 31, 65, 96, 65, 12,122,180, 12, 33, 12, 12,129, 31, 31, 65,
-   12,181,  9, 98, 80, 12,  0,  0,  1,  1, 14,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1, 14, 73, 38, 12,100, 12, 27,101, 76, 12,
-    6,  6,  6,  6,  6,105,106, 64, 65, 27, 12,  1,  1,  1,  1,  1,
-   52,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,
-    0,  1,  1,  1,  0,  1,  1,  1,  0,  1,  1,  1,  0,  1, 14,  0,
-   30,182, 70,183, 50,  9, 48, 29,  0,  0,  0,  0, 73, 18,  3,  0,
-    1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1,  1,  1, 14,  1, 17,
-   12, 33,  0, 49, 10, 10, 10, 10, 10, 10,  0, 44,  3,  3,  3,  3,
-   16, 16,126, 10, 63,  3,  3,  3,  3,  3,  3,  3,  3, 10,  3, 29,
-    3,  3,  3,  3,  3,  3, 43,  0,133, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10,  0,  0, 10, 10,  0,  0,  0,  0, 17,  1,
-  128,  1,  1,  1,  1, 99,  0,  0,  1,  1,  1,  5,  5, 23,  0,  0,
-    1,  1,  1,  1,  1,  1,  1, 38,  1,  1,  0,  0,  1,  1,  1,  1,
-  184, 16, 16,  0,  0,  0,  0,  0,  7,  7,  7,  7,  6,  6,  6,  6,
-    7,  7,  0,  0,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  0,
-    1,  1,  0,  0,  0,  0,  0, 38,  7, 32,  7, 42,  6,  6,  6,  6,
-    6, 42,  6,  6,  6,  6,  6,  6,  6, 42,  6,  6,  6, 42, 47,  0,
-   13, 13, 13, 54, 13, 13, 13, 13, 61, 13, 13, 13, 13, 61,  0,  0,
-    1,  1,  1,  0, 14,  1,  1,  1,  1,  1,  1, 17, 14,  0, 14, 17,
-    1,  1,  1, 38, 10, 10, 10, 10,  1,  1,  1, 56, 75, 10, 10, 10,
-    0,  0,  0, 49, 10, 10, 10, 10,  1, 14,  1,  0,  0, 49, 10, 10,
-    1,  1,  1, 10, 10, 10,  0, 38,  1,  1,  1,  1,  1,  0,  0, 38,
-    1,  1,  1,  1,  0,  0, 10,  1, 24,  5, 26, 23,  0,  0,  5,  5,
-    1,  1, 17,  1, 17,  1,  1,  1,  1,  1,  1,  0,  5, 23,  0, 26,
-   12, 12, 12, 12, 33,  0,  0,  0,  1,  1,  1,  1,  1,  1, 86, 78,
-    1,  1,  1,  1, 82,  1,  1,  1,  1,  1, 24, 23,  0, 49, 10, 10,
-   12, 12, 12, 33,  0,  0,  0,  0,  1,  1,  1,  0, 38, 12, 12, 12,
-    1,  1,  1,  0, 10, 10, 10, 10,  1, 14,  0,  0, 10, 10, 10, 10,
-    1,  0,  0,  0, 38, 12, 33,  0,  0,  0,  0,  0, 49, 10, 10, 10,
-    7, 32,  0,  0,  0,  0,  0,  0,  6, 47,  0,  0,  0, 10, 10, 10,
-    1,  1,  5,  5,  0,  0,  0,  0, 11, 11, 11, 11, 11,  1,  1, 52,
-    7,  7,  7,  0, 26,  5,  5,130,  6,  6,  6,  0,  0,  0,  0,  9,
-   10, 10, 10, 10, 10, 10, 10, 51,  1,  1,  1,  1,  1, 26,185,  0,
-    0,  1, 45,  1,  0,  0,  0,  0, 57,  3,  3,  3, 29,  0,  0,  0,
-    0,  0,  0,  0,  0,  5,  5,  5, 10, 10, 10,112,  0,  0,  0,  0,
-  133, 10, 78, 12, 12,  0,  0,  0,  1,  5,  5, 12, 12,  0,  0,  0,
-    1,  1, 86, 10, 10, 10,  0,  0, 19, 46,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  5,  5,  5,  5,  5,  5,  5, 36, 12, 12, 12,  0,
-   10, 10, 10, 11, 11, 11, 11, 11, 25, 24, 25,  0,  0,  0,  0, 26,
-   15, 19,  5, 20, 19, 36,186, 12, 12, 23,  0,  0,  0,  0, 73,  0,
-    5, 25,  1,  1,  1,  1,  1,  1,  1,  1,  1, 24,  5,  5, 19,  5,
-    5,  5, 23, 11, 11, 11, 11, 11, 12, 12, 34, 46,  0,  0,  0,  0,
-    1, 24, 12, 14,  0,  0,  0,  0,  1, 34, 15,  5,  5,  5,  5, 20,
-   46,  1, 40, 12, 71,  5, 36, 19, 11, 11, 11, 11, 11, 40, 40, 12,
-   10, 10, 51,  0,  0,  0,  0,  0,  5, 15, 20,  5, 12, 12, 12, 25,
-   24,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1, 14, 14,  1,  1, 17,
-    1,  1,  1,  1,  1,  1,  1, 17,  1,  1,  1,  1, 40,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1, 24, 15, 19,  5,  5,  5, 23,  0,  0,
-    5, 15, 17,  1,  1,  1, 14, 17, 14,  1, 17,  1,  1, 26, 25, 15,
-   20, 15, 37, 35, 37, 35, 15,  0, 14,  0,  0, 35,  0,  0, 17,  1,
-    1, 15,  0,  5,  5,  5, 23,  0,  5,  5, 23,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1, 17,  0, 14,  1,  1,  1, 17, 15, 19,  5,  5,
-   23, 37, 35, 35, 15, 37, 15, 20, 25, 25, 12, 38, 33,  0,  0,  0,
-   26, 23,  0,  0,  0,  0,  0,  0,  1,  1, 34, 15,  5,  5,  5,  5,
-   15,  5, 20, 25,  1, 40, 12, 12, 11, 11, 11, 11, 11, 12, 38, 25,
-   15, 19,  5,  5, 20, 20, 15, 19, 20,  5,  1, 53,  0,  0,  0,  0,
-   15,  5,  5,  0, 15, 15,  5, 19, 36, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12,  1,  1,  5,  0, 15, 19,  5,  5,  5, 20, 19, 19,
-   36, 12, 14,  0,  0,  0,  0,  0, 12, 12, 12, 12, 12, 12, 33,  0,
-    1,  1,  1,  1,  1, 24, 19, 15,  5,  5,  5, 19, 40,  0,  0,  0,
-   11, 11,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1, 14, 26, 19,
-   15,  5,  5, 19,  5,  5,  0,  0, 11, 11, 11, 11, 11, 10, 12, 57,
-    5,  5,  5,  5, 19, 36,  0,  0, 10, 51,  0,  0,  0,  0,  0, 17,
-    1,  1,  1, 14, 17,  0,  1,  1,  1,  1, 17, 14,  1,  1,  1,  1,
-   15, 15, 15, 35, 37, 26, 20, 25, 46, 19, 12, 33,  0,  0,  0,  0,
-    1,  1,  1,  1,  0,  1,  1,  1, 34, 15,  5,  5,  0,  5, 15, 15,
-   25, 53, 37,  0,  0,  0,  0,  0, 24,  5,  5,  5,  5, 25,  1,  1,
-    1, 24,  5,  5, 20, 24,  5, 36, 12, 12, 12, 71,  0,  0,  0,  0,
-   24,  5,  5, 20, 19,  5,  1,  1,  1,  1,  1,  1,  1,  5,  5,  5,
-    5,  5,  5, 20,  5, 12, 53, 12, 12, 33,  0,  0,  0,  0,  0,  0,
-   12, 12, 12, 12, 12,  0,  0,  0, 20,  5, 20, 20,  0,  0,  0,  0,
-   40,  0,  0,  0,  0,  0,  0,  0,  5,  5,  5, 23,  5,  5,  5, 19,
-   40, 12, 12,  0,  0,  0,  0,  0, 12,  1,  1,  1,  1,  1,  1,  1,
-    0,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 35,  5,  5,  5,
-   20,  5, 19, 23,  0,  0,  0,  0,  1,  1,  1, 14,  1, 17,  1,  1,
-   24,  5,  5, 23,  0, 23,  5, 26,  5,  5,  5, 24,  0,  0,  0,  0,
-    1,  1,  1, 17, 14,  1,  1,  1,  1,  1,  1,  1,  1, 15, 15, 37,
-    5, 35, 19, 19, 14,  0,  0,  0,  1,  1,  1,  1, 45,  1,  0,  0,
-    1, 24, 20, 83, 33,  0,  0,  0,  5, 34,  1,  1,  1,  1,  1,  1,
-    1,  1, 15,  5,  5, 23,  0, 15, 20, 36, 12, 12, 12, 12, 12, 12,
-   11, 11, 11, 11, 11, 23,  0,  0, 10, 10, 63,  3,  3,  3, 70, 30,
-   97,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,  0,  0,  0,  0, 38,
-   16, 16, 16, 16, 16, 16, 16, 99, 12, 12, 33,  0,  0,  0,  0,  0,
-   40, 33,  0,  0,  0,  0,  0,  0, 25,  1,  1, 24,  5,  5,  5,  5,
-    5,  5,  5,  0,  0,  0,  0,  0,  5,  5,  5,  5,  5, 15, 19,  5,
-    5,  5, 36,  0,  0,  0,  0,  0,  5,  5,  5, 36, 12, 12,  3,  3,
-   13, 13, 57,  0,  0,  0,  0,  0, 11, 11, 11, 11, 11, 49, 10, 10,
-   10, 17,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0, 17,  1,
-   13, 52,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 45,132, 12,
-   10, 10, 10, 78, 12, 33,  0,  0,  7,  7,  7,  7, 32, 42,  6,  6,
-    6,  6,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1, 14,  0, 26,
-   34, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0,  0, 26,
-    5, 81, 13, 13, 13, 13, 13, 13, 13, 62, 23,  0,  0,  0,  0,  0,
-   15, 13, 16, 99,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,
-   13, 13, 54, 13, 13, 13, 54, 61,  0, 14,  0,  0,  0,  0,  0,  0,
-    1, 14, 17,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  0, 43, 36, 18, 18,  0,  0,  0,  0,  0,  0,
-   11, 11, 11, 11, 11,  3, 29,  0,  3,  3,  0,  0,  0,  3,  3,  3,
-   98,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3, 29, 44,  3,  3,  3,
-    3,  3,134, 19,  5,  3,134, 15, 15,187, 18, 18, 18, 91,  5,  5,
-    5, 55, 43,  5,  5,  5,  3,  3,  3,  3,  3,  3,  3,  5,  5,  3,
-    3,  5, 55,  0,  0,  0,  0,  0,  6,  6, 47,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6, 32,  7,  0, 32, 39, 32, 39,  7, 32,  7,
-    7,  7,  7,  6,  6, 42, 42,  6,  6,  6, 42,  6,  6,  6,  6,  6,
-    6,  6,  7, 39,  7, 32, 39,  7,  7,  7, 32,  7,  7,  7, 32,  6,
-    6,  6,  6,  6,  7, 39,  7, 32,  7,  7, 32, 32,  0,  7,  7,  7,
-   32,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  7,  7,  7,  7,
-   59,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6, 60,  6,  6,
-    6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 59,  6,  6,
-    6,  6, 60,  6,  6,  6,  7,  7,  7,  7, 59,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 60,  6,  6,  6,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7, 59,  6,  6,  6,  6, 60,  6,  6,  6,
-    7,  7,  7,  7, 59,  6,  6,  6,  6, 60,  6,  6,  6,  8,  0, 11,
-    5,  5,  5, 55,  3, 43,  5,  5,  5,  5,  5,  5,  5,  5, 55,  3,
-    3,  3, 43,  3,  3,  3,  3,  3,  3,  3, 55, 66, 12, 12,  0,  0,
-    0,  0,  0,  0,  0, 26,  5,  5,  6,  6,  6,  6,  6,124,  6,  6,
-    6,  6,  6,  6,  6,  6,  6, 47,  0,  0, 42,  6,  6, 47,  0,  0,
-    5,  5,  5, 23,  5,  5,  5,  5,  5,  5,  5,  5, 23, 26,  5,  5,
-    5, 26, 23,  5,  5, 23,  0,  0, 13, 13, 13, 13, 13, 13, 13,  0,
-    0,  0,  0,  0,  0,  0,  0, 26,  5,  5,  5, 81, 13, 13, 13,  0,
-   11, 11, 11, 11, 11,  0,  0, 56,  1,  1,  1,  1,  1,  1,  1, 23,
-    1,  1,  1,  1,  1,  1,  5,  5, 11, 11, 11, 11, 11,  0,  0,113,
-    1,  1,  1,  1,  1, 45,  5,  5,188, 11, 11, 11, 11,189,  0, 38,
-    1, 24,  1, 25,  1,  1,  1,  5,  1,  1, 24,  0,  0,  0,  0, 45,
-    1,  1,  1, 14,  1,  1, 17, 14,  1,  1, 14, 49, 10, 10, 10, 10,
-    6,  6,  5,  5,  5, 81,  0,  0, 10, 10, 10, 10, 10, 10, 75, 10,
-  190, 10, 51,  0,  0,  0,  0,  0, 10, 10, 10, 10, 10, 10, 10, 75,
-   10, 10, 10, 10, 10, 10, 10,  0,  1,  1, 17,  1,  1,  1,  1,  1,
-   17, 14, 14, 17, 17,  1,  1,  1,  1, 14,  1,  1, 17, 17,  0,  0,
-    0, 14,  0, 17, 17, 17, 17,  1, 17, 14, 14, 17, 17, 17, 17, 17,
-   17, 14, 14, 17,  1, 14,  1,  1,  1, 14,  1,  1, 17,  1, 14, 14,
-    1,  1,  1,  1,  1, 17,  1,  1, 17,  1, 17,  1,  1, 17,  1,  1,
-    9,  0,  0,  0,  0,  0,  0,  0, 10, 10, 10, 10, 10, 10, 63,  3,
-    0,  0,  0,  3,  3,  3,  3,  3,  3, 29,  0,  0,  0,  0,  0,  0,
-    3,  3,  3,  3,  3,108, 22, 22,  3,  3,  3,  3, 29,  0,  3,  3,
-    9,  9,  9,  9, 98,  0,  0,  0,  3,  3,  3,  3,  3, 29,  0,  3,
-    3,  3,  3, 29, 29,  0, 44,  3,  3,  3,  3,  3,  3,  3, 29, 44,
-    3,  3,  3,  3,  3, 29,  0, 44,  3, 29,  3,  3,  3,  3,  3,  3,
-   11, 11, 11, 11, 11, 29,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  2,  2,  0,  2,  2,  7,  7,  3,  3, 26, 26,
-    4,  4, 12, 12,  5,  5,  9,  9,  9,  5, 25, 25, 15, 15, 13, 13,
-   21, 21,  6,  6,  7,  2, 10, 10, 14, 14,  2,  7,  1,  1, 10, 12,
-   12, 10,  5,  9, 24, 24, 12,  2,  7, 12, 12,  7,  2, 12, 22, 18,
-    0,  0, 26,  2, 23, 23, 18, 22,  9,  2, 21,  2,  7, 10,  2, 10,
-   12, 21, 10,  2,  2, 21,  2,  9,  7, 21,  8,  8,  2,  5, 26, 12,
-    2, 26,  7,  6, 10,  7,  5,  2, 25, 26,  2, 15, 26, 25, 15,  2,
-    6,  7, 21,  7,  2,  6, 12, 26,  7, 26, 21, 26, 20, 19,  9, 25,
-    5, 25,  6,  2, 21,  6, 15, 26, 25, 22, 18, 21, 26, 21,  5,  7,
-    6, 24,  6,  5, 26, 23, 21, 12,  6, 12,  2,  1, 29, 29, 26, 15,
-   21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12,  6, 26,  7, 10, 21,
-   17, 17,  9, 26,  7, 15, 29, 21, 21,  9, 24,  5, 25,  9,  1, 12,
-   17, 21, 11, 12,  8, 24, 26,  9, 21, 22, 23, 26, 25,  2, 14,  2,
-   23, 21, 21, 25,  9, 22, 21, 18, 24, 16,  5, 22, 25, 18, 24, 26,
-   26, 24,  9,  8,  8,  5,  5, 21, 15,  7,  2, 23, 21, 15, 17,  7,
-   18,  2,  5,  6,  5, 24, 22, 20, 21, 20, 19, 21, 21, 16, 16, 21,
-    7,  5,  5, 26, 14, 15, 18, 25,  7, 14, 17, 22, 17,  6, 24,  6,
-    6, 21, 12, 15, 26, 10, 25,  0,  7, 20, 25,  1, 24, 15,  7, 19,
-    9, 21, 17,  2, 17, 12,  1, 21, 12,  1, 24,  7, 29,  7,  7, 22,
-   14,  7,  2, 24,  9, 24, 24,  2, 29,  1, 27, 28,  1, 29, 21, 29,
-    1,  2, 15,  6, 18,  6, 12, 11, 26,  5, 14,  9,  5, 14, 26, 22,
-   18, 26,  5, 12, 22, 21, 18, 17, 26,  6, 18, 18, 26, 14, 14,  6,
-   12, 24, 11, 21, 24,  9,  6,  9,  6, 10,  7, 25, 17, 16, 16, 22,
-   16, 16, 25, 17, 25, 24, 23,  2, 21, 14, 12, 17, 21,  1, 10,  1,
-    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
-   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
-    0,  0,  0,  0,  0,  0, 41, 42, 43, 44, 45,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  7,  8,  0,  0,  0,  0,  9,  0,  0,
-    0, 10, 11, 12, 13,  0, 14, 15, 16,  0, 17, 18, 19, 20, 21,  1,
-   22,  1, 23,  1,  2,  1,  2,  1,  2,  0,  2,  1, 24,  1,  2, 25,
-    2,  0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,  0, 36,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 37,  0,  0,  0,  0,  0,  0, 38,
-    0,  0, 39,  0,  0, 40,  0, 41,  0,  0,  0, 42, 43, 44, 45, 46,
-   47, 48, 49, 50,  0,  0, 51,  0,  0,  0, 52,  0,  0,  0, 53,  0,
-    0,  0,  0,  0,  0,  0, 54,  0,  3,  0, 55, 56,  0, 57,  0,  0,
-    0,  0,  0,  0, 58, 59, 60,  0,  0,  0,  0, 61,  0,  0, 62, 63,
-   64,  4, 65,  0,  0, 66, 67,  0,  0,  0, 68,  0,  0,  0,  0, 69,
-    0,  0,  0, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 71,  0,  0,  0, 72,  0, 73,  0,  0, 74,  0,  0, 75,  0,
-    0,  0,  0,  0,  0,  0,  0, 76, 77,  0,  0,  0,  0, 78, 79,  0,
-   80, 81,  0,  0, 82,  5,  0, 83,  4,  0, 84, 85,  0,  0, 86, 87,
-   88,  0, 89,  0, 90,  0, 91,  0,  0,  3, 92,  3,  0, 93,  0, 94,
-    0,  0,  0,  5,  0,  0,  0, 95, 96,  0, 97, 98, 99,100,  0,  0,
-    0,  0,  0,  3,  0,  0,  0,  0,101,102,  0,  0,  0,  0,  0,  0,
-  103,  0,  0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,  6,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,  0,
-    0,  0,  0,111,  0,112,  0,  6,  0,  0,  0,  0,  0,113,114,  0,
-    0,  0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,  0,
-    0,  0,  0,  0,  0,  0,118,  0,119,  0,  0,  0,  0,  0,  0,  0,
-    2,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0, 11,  0,  0,  0,
-   14,  0,  0,  0, 16,  3, 17, 18, 19, 20, 21, 22,  0, 23,  0,  0,
-    0,  0, 24, 25, 26, 27,  0,  0,  0,  0, 28,  0,  0, 29, 30,  0,
-   31,  0, 32, 33,  0,  0, 34,  0, 35, 36,  0,  0,  0,  0,  0, 37,
-   38,  0, 39, 40,  0,  0, 41,  0,  0,  0, 42,  0,  0, 43, 44, 45,
-   46,  1, 47,  0,  0,  1,  0,  0,  7,  1, 48,  0,  0,  0,  0,  0,
-   49, 50,  0,  0,  0,  0,  0,  0, 51, 52,  0,  0,  0,  0,  0,  0,
-   53, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,  0, 57, 58,  0,  0,
-    0, 59,  0,  0,  0,  0,  0,  0, 60, 12,  0,  0,  0,  0, 61,  0,
-    0,  0, 62,  0,  5,  0, 63,  0,  0,  0,  0, 64,  0,  0,  0,  0,
-   65,  0, 66,  0,  0,  0,  0,  6, 67,  0,  0,  0, 68, 69, 70, 71,
-    0,  0,  0,  0, 72,  5,  0, 73, 74,  0,  0, 75,  0,  0,  0, 76,
-   77,  0,  0,  0, 78,  0, 79, 80, 81, 82, 83,  3, 84,  0, 85, 86,
-   87,  0,  0,  8,  9,  0,  0,  3,  3,  0,  0, 88,  0,  0, 89,  0,
-    0,  0,  0,  8, 90,  0, 91,  0,  0,  0,  0,  0,  9, 10,  0, 92,
-    0,  5,  0,  3,  9,  0,  0, 93,  0,  0, 94,  0,  0,  6,  0,  0,
-    0,  0,  0,  0, 95, 96,  0,  0, 10,  0,  0,  1,  0,  0, 97,  0,
-    0,  0,  0, 98,  0,  0,  0,  0, 12,  0,  0, 13,  0,  0,  0,  0,
-   99,100,  0,  0,101,  0,  0,102,  0,  0,  0,103,  0,  0,  0,104,
-    0,  0,  0,105,  0,  0,  0,  0,106,107, 13,  0,  0,108,  0,  0,
-    0, 10,  0,  0,109,110,  0,  0,111,112,  0,  0,  0,  0,  0,  0,
-  113,  0,  0,114,  0,  0,  0,  0,115,  1,  0,116,117,118,  6,  0,
-    0,119,  7,  0,  0,120,  0,  0,  0,121,  0,  0,  0,  0,  0,  0,
-  122,  0,  0,123,  0,  0,  0,  0,124, 11,  0,  0,  0,  0,  0,  6,
-    0,  0,  0,  0,  5, 15,  0,  0,  0,  0,125,  0,  0,126,  0,  0,
-    0,  0, 15,  0,  0,127,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,
-  128,  0,  0,  0,129,  0,130,  0,  0,  0,  0,131,132,133,  0,134,
-    0,135,  0,  0,  0,136,137,138,  0,  8,  0,  0,  0,  0,  0,  7,
-    0,  0,  0,139,  0,  0,  0,140,  0,  0,  0,141,  0,  0,  0,142,
-  143,  0,144,  0,  0,145,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,
-    0,  9,  1,  1,  1,  1,  0,  0,  0,  2,  0,  3,  0,  0,  3,  0,
-    0,  0,  0,  0,  0, 19,  0,  0,  0,  6, 11,  0,  0,  0,  0, 14,
-    0,  0, 15,  0,  0,  0,  0,  0,  0, 17, 29,  0,  0,  0,  0,  0,
-   31,  0,  0,  2,  0,  0,  1, 12,  0,  0,  1, 49, 50,  5, 51, 52,
-   53,  5,  5, 22, 32, 23,  1, 54, 24, 55, 16, 33, 56, 57, 58,  1,
-    1,  1,  6,  1,  0,  0, 59,  7, 60,  1, 34,  5,  7, 61, 62, 63,
-   64, 65, 66, 67,  0,  0,  1,  1, 68,  0,  0,  0, 69, 70, 71, 35,
-    1, 25, 72,  0,  0,  0,  0,  8,  1, 26, 16, 26, 73, 27, 74,  0,
-    0,  0, 36, 25, 75, 37,  7, 37, 76,  0,  0,  0,  6,  1,  7,  0,
-    0, 17,  0,  8, 38,  1,  1, 13, 13, 11,  0,  0, 39,  0,  0,  6,
-   18,  1,  0,  0,  8, 16,  5,  1,  1,  1, 77,  7, 36, 18, 78,  7,
-   35,  1, 79, 10,  0,  0,  0, 80,  0,  0,  0,  0,  2,  3,  0,  0,
-   14,  0,  0,  0, 81,  0,  0,  0, 82,  0,  0,  0, 83,  0,  0,  0,
-   84,  0,  0,  0, 40,  0,  0, 85, 86,  0, 87, 88, 89, 90, 91, 92,
-    0,  0,  0, 93,  0,  0,  0, 15, 28,  0,  0,  0,  0, 13,  0, 41,
-    0,  0, 14,  0,  0, 20,  0,  0, 94,  0,  0,  0, 95,  0,  0,  6,
-   29,  0,  0, 13,  1, 96,  1, 18, 33, 97, 25, 23,  7,  1,  1,  1,
-    1, 27,  1,  7, 98,  0,  0,  9,  0,  0,  0,  0,  6, 23,  1,  0,
-    0,  0,  0,  0, 30,  0,  0, 21,  0,  0, 30,  0,  0,  0,  0, 15,
-    0,  0, 12, 32, 24,  5, 99, 22, 42, 17,  0, 10, 11,  0,  7,  1,
-    7,100,101,  1,  1,  1,  1,102,103,104,105,  1,106, 10, 20,107,
-  108,  5, 10,  0,  0,  0,  0,  0,109,110,  0,  0,111,  0,  0,  1,
-    1, 11,  0,  0,  0,  8,  0,  0,  0,  3,  0,  0, 43, 40,  2,  0,
-    0,  0, 44,112, 10,  8, 20,  0,  0,  0,  0,  0,  0,113,  1, 16,
-    5, 24,  0,  8, 12,  0,  0,  0,  0,114,  0,  0,115,  2,  0,116,
-    0,  0,  0,  1,  0,  0,  0,  0, 13, 11,  0,  0,  6, 10,  0,  0,
-   45, 39,  0, 45, 16, 18, 46, 27,  0,  0,  3,  0,  0,  2, 12,  0,
-    0,  0,  2,  3,  0,  0,  3,  0, 21,  0,  0, 31,  0,  0,  0,  0,
-  117,  0,  0,  0, 15,  9,  0,  8,  1, 10,  1, 10,  0,  0,  0,  0,
-    0, 30, 14, 21,  0,  0, 47,  0,  0,  0,  9,  0,  0,  0,  0, 47,
-    0,  0,  0,  0,  2,  0,  0,  0,  0, 28,  0,  0,  4,  0, 21, 41,
-    0,  0, 28,  0,  0,  0, 22, 42,  0,  0,118,  0,  0,  0,  0,  0,
-    0,119,  0,120,121,122,123,  0, 43,  5, 48, 13, 34,  0,  0,  0,
-    8, 11,  8, 10,  0,  0,  1, 12,  1,  1,  1,  1, 26,  1, 38, 44,
-   12,  0,  0,  0,  0,  1,  0,  0,  0,124,  0,  0,  0, 46,  6, 19,
-    0,  8,  0, 20,  0,  0,  5, 48,  0,  0,  0,  1,125,  0,  0,  0,
-    0,230,230,230,230,  0,  0,  0,  9,  9,  0,  0,  0,  0,  9,  0,
-    0,220,220,220,220,  0,  0,  0,230,230,230,220,230,  0,  0,230,
-  230,  7,  0,  0,  0,230,  0,  0,  0,230,230,  0,  0,230,230,230,
-    0,  0,230,230,230,  0,  0,  9,  0,  0,  0,  0,  7,230,230,230,
-  220,  0,220,  0,  0,230,220,220,220,  0,  0,230,  0,  0,230,  0,
-    0,  0,  0,  7,  0,  1,  1,  1,  1,220,230,230,230,220,220,230,
-  230,220,230,230,220,230,  0,  0,230,230,220,  0,  0,  0,  9,  9,
-    0,220,  0,  0,  0,  0,  0,  9,  9,  0,  9,  7,  0,  1,220,220,
-  220,220,220,220,230,230,230,220,220,230,220,220,230,230,220,230,
-  230,220,230,220,230,230,230,  0,230,  0,220,220,220,220,220,  0,
-    0,  9,  9,  0,  0,  1,  0,  0,  0,  0,  0,  0,220,230,  0,230,
-  230,  0,  0,220,220,  0,  0,230,220,  0,  0,  9,  7,220,220,220,
-    0,230,232,220,220,220,220,232,216,220,202,202,220,220,220,220,
-  202,202,220,220,220,230,240,230,220,230,220,220,  0,232,220,220,
-  230,233,234,234,233,234,234,233,230,  0,220,230,230,230,230,222,
-  220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19,
-   20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,
-    0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35,  0,  0,
-    0,230,  0,220,230,  0, 36,  0,  0,220,220,230,220,220,230,230,
-    0,230,230,  0,220, 27, 28, 29,230,  0,230,220,230,  0, 84, 91,
-    0,103,103,  9,  0,107,107,107,107,118,118,  9,  0,122,122,122,
-  122,  0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,
-    0,  0,  0,130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,
-  230,  0,  0,220,  0,  0,228,  0,  0,  0,222,230,220,230,  0,  0,
-  220,230,220,  0,220,230,230,230,234,230,  0,  1,  1,230,234,214,
-  220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,230,
-  220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,220,230,  1,
-    1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,220,  0,  0,
-  230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,  0,230,220,
-    0,  0,  7,  9,  0,  6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,
-    1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,232,232,220,
-  230,230,230,  7,  0,  1,  0,  0, 32,  0, 48,  0,  0, 84, 96,135,
-  144, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,176,  0,  0,  0,  0,  0,  0,  0,  0,  8, 16, 24,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0, 40,
-    0,  0,  0,  0,  0, 48, 56, 64,  0,  0,  0,  0,  0, 72, 80, 88,
-   96,104,  0,  0,  0,  0,  0,  0,  0,  0,112,  0,120,  0,  0,  0,
-    0,  0,  0,128,136,144,152,160,168,  0,  0,  0,176,184,192,  0,
-    0,  0,  0,  0,  0,200,  0,  0,  0,  0,  0,  0,  0,  0,208,  0,
-    0,216,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   16,  0, 36,  0,  0,  0, 24,  0,  0,  0, 24,  0,  0,  0,  0,  0,
-   64,  0, 68,  0,  0,  0,  0,  0,  0,  0, 28,  0,  0,  0, 72,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 20,  0,  0,  0,  0,
-    0,  0, 20,  0, 20,  0,  0,  0,  0,  0,  0,  0, 76, 80, 84, 88,
-    0,  0, 12, 92, 96, 28,  0,100,104,  4,  4,  4,108, 44,112,116,
-  120,  4,124,  0,128,132,  4,  4, 48,136,140,  0, 32,  0,  0,  0,
-   40,  0,  0,  0,  0,  0,  0,  0,  4, 48,  0, 52,144, 20,148,152,
-    4,  0,  0,156,160,164,168,172,  4,  0,176, 56, 60,180, 32,  0,
-   16,184, 56,  0,  0,  0,  0,  0, 52, 12, 12,  0,  0,  0,  0, 12,
-    0,  0,188,  8,  8,  8,  8,192,196,  8,  8,  8,  8,200,204,208,
-  212, 60, 44,  0,  0,  0,  0,  0,  0,  0,216, 28,220,  0, 12,  4,
-   16,  0,  0,  0,  0,224,228,  0,  0,  0,  0,  0,  4,232, 32,  0,
-    0,  0,  0,  0,  0,  0,236, 12,  0,  0,  0,  0, 16,  0, 36,  0,
-    0,  0, 24,  0,  0,  0,240,244,  0,  0,  0,  0,  2,  2,  2,  2,
-    4,  4,  4,  4,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,  6,  8,
-    0, 10, 12,  0,  0,  2,  2,  0,  2,  2,  0,  0,  0,  0, 14, 16,
-    6,  8,  0,  0,  4,  8,  0,  0,  2,  2,  2,  0,  0,  6,  4,  8,
-    2,  0,  2,  0,  0,  0,  0,  6,  0, 20,  0,  0,  0, 22,  0,  0,
-    0,  6,  8,  0, 24, 26, 28,  0,  0,  0, 30,  0,  0,  0,  0, 32,
-   34, 36, 38,  0,  0, 40, 42,  0,  0,  0, 18,  0,  0,  0,  2,  2,
-    2,  2,  0,  2,  2,  2,  0,  6, 44,  0,  0,  0,  0,  2,  0, 46,
-   48, 50,  0,  0, 52,  0,  0,  0,  6,  4, 54,  0,  2,  0,  0,  2,
-    2, 56, 58, 60,  0, 62, 64, 18,  2, 10, 12,  0,  0,  0, 66,  8,
-    0,  2,  2,  2,  0,  6,  4,  4,  4,  4, 68,  2, 70,  4,  4,  4,
-    8, 72,  0,  0, 74, 76,  2,  0, 78,  0,  0,  0,  4,  8,  2,  0,
-    0,  0, 80,  0,  6,  4,  4,  4,  4,  8,  0,  2,  2,  2,  2,  6,
-    4,  4,  4,  8,  0,  0,  0, 82,  0, 84, 86,  0,  0,  0,  2, 88,
-    0,  0,  0, 90,  6,  8,  2,  0,  0,  0,  6,  4,  4,  4,  8,  0,
-    2,  0,  2,  2,  6,  4,  4,  8,  0, 10, 12,  6,  8,  2,  0,  0,
-    4,  5,  6,  7,  8,  9, 10,  1,  1, 11,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1, 12, 13,  2,  2,  2,  2, 14,  0,  0,  0,  0, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24,  0,  0,  0, 25, 26,  3,  3,
-    3, 27,  0,  0,  0, 28, 29, 30,  0, 31, 32, 33, 34, 35, 36, 37,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1, 38,  1,  1, 39,  1, 40,  1,  1,  1, 41,  0, 42,
-    1,  1, 43,  1,  1,  1, 44,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3, 20, 21,  8,  8,  8, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50,  2,  2, 51, 52, 53, 54,  9,  9,  9,  9,  9, 55, 56,
-   57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,  8,  8, 70,
-   71, 72, 73, 74, 75,  5,  5,  5,  5, 76,  5,  5,  5,  5,  5,  5,
-    5, 15, 15,  5,  5,  5,  5, 77,  5, 78, 79, 80, 81, 82, 83,  1,
-   84, 85, 86, 87, 88, 89, 90, 91,  5,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 92,  1,  1,  1,
-    1,  6,  6,  6,  6,  6,  6,  6,  6,  6, 93, 16, 16, 94, 95, 96,
-   97, 98, 99,100,101,102,103,104,105,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-  106,  0,  0,  1,  1,107,108,109, 13, 13, 13,110,111,112,113,114,
-  115,116,117,118,119,  0,120,121,122,123,124,125,126, 17, 17,127,
   128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,  0,155,156,157,158,
-    0,159,160,161,162,163,164,165,166,167,168,169,170,  0,171,172,
-  173,  7,  7,  7,  7,  7,  7,  7,174,175,  7,176,  0,  0,  0,  0,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,  0,  0,
+    0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  177,  4,  4,  4,  4,  4,  4,  4,  4,178,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,179, 11, 11, 11, 11,180,  0,  0,
-    0,  0,  0,181,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 12, 12, 12, 12,182,183,184,185,  0,  0,186,  0,187,188,189,
-  190,  3,  3,  3,  3,  3,  3, 14, 14, 14,191,192,193,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,  0,163,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,  0,  0,  0,  0,
+    0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  194,195,196,197, 18, 18,198,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,199,200,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  5,201,  5,  5,  5,202,203,
-  204,  5,205,206,207,208,209,210,  0,211,212,213,  5,  5,214,  5,
-  215, 10, 10, 10, 10, 10,216,  0,  0,  0,  0,  0,  0,  0,  0,217,
-    0,218,219,220,  0,  0,221,  0,  0,  0,222,  0,223,  0,224,  0,
-  225,226,227,228,  0,  0,  0,  0,  0,229,230,231,  0,232,233,  0,
-    0,234,235,  5,236,237,  0,  5,  5,  5,  5,  5,  5,  5,238,  5,
-  239,240,241,  5,  5,242,243,  5,244,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,245,  1,
-    1,246,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,247,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,248,  1,  1,  1,  1,249,  0,  0,
-    0,  1,  1,  1,  1,250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,251,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,252,  0,  0,  0,  0,  0,  0,
-    0,253,  0, 19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  2,  2,  2,  2, 13, 13, 13, 13, 12, 12, 12, 12,  0,  0,  0,
-    0,136,136,136,136, 80, 80, 80, 80, 19, 19, 19, 19,  3,  3,  3,
-    3, 63, 63, 63, 63, 39, 39, 39, 39, 28, 28, 28, 28,131,131,131,
-  131, 79, 79, 79, 79,  1,  1,  1,  1,127,127,127,127,  6,  6,  6,
-    6,155,155,155,155,  9,  9,  9,  9, 30, 30, 30, 30,139,139,139,
-  139, 15, 15, 15, 15,110,110,110,110, 77, 77, 77, 77, 17, 17, 17,
-   17, 27, 27, 27, 27, 33, 33, 33, 33,113,113,113,113, 49, 49, 49,
-   49, 25, 25, 25, 25, 29, 29, 29, 29,  7,  7,  7,  7,  8,  8,  8,
-    8, 32, 32, 32, 32, 99, 99, 99, 99, 31, 31, 31, 31,105,105,105,
-  105, 55, 55, 55, 55, 62, 62, 62, 62, 56, 56, 56, 56, 91, 91, 91,
-   91,119,119,119,119, 14, 14, 14, 14, 94, 94, 94, 94, 20, 20, 20,
-   20,100,100,100,100,130,130,130,130,157,157,157,157,137,137,137,
-  137, 97, 97, 97, 97,123,123,123,123,133,133,133,133,146,146,146,
-  146, 84, 84, 84, 84,159,159,159,159,132,132,132,132,  4,  4,  4,
-    4, 36, 36, 36, 36, 24, 24, 24, 24, 30, 30, 30,  2, 35, 35, 35,
-   35, 40, 40, 40, 40,124,124,124,124,125,125,125,125,140,140,140,
-  140, 37, 37, 37, 37, 58, 58, 58, 58,  0,  0,  2,  2, 75, 75, 75,
-   75, 68, 68, 68, 68,114,114,114,114,163,163,163,163, 22, 22, 22,
-   22, 23, 23, 23, 23, 76, 76, 76, 76,  0,  0,  0,  2, 26, 26, 26,
-   26, 87, 87, 87, 87,135,135,135,135, 89, 89, 89, 89,141,141,141,
-  141, 70, 70, 70, 70, 92, 92, 92, 92, 96, 96, 96, 96,  5,  5,  5,
-    5, 18, 18, 18, 18, 48, 48, 48, 48, 85, 85, 85, 85,109,109,109,
-  109,102,102,102,102,151,151,151,151, 16, 16, 16, 16,  0,  2,  2,
-    2,165,165,165,165,108,108,108,108,171,171,171,171,142,142,142,
-  142,150,150,150,150,134,134,134,134,138,138,138,138, 64, 64, 64,
-   64, 90, 90, 90, 90, 21, 21, 21, 21, 93, 93, 93, 93, 61, 61, 61,
-   61, 65, 65, 65, 65, 78, 78, 78, 78,126,126,126,126,154,154,154,
-  154,121,121,121,121,166,166,166,166,167,167,167,167,152,152,152,
-  152, 10, 10, 10, 10,  2,  0,  0,  0,104,104,104,104,170,170,170,
-  170, 57, 57, 57, 57,107,107,107,107,175,175,175,175, 38, 38, 38,
-   38, 73, 73, 73, 73, 86, 86, 86, 86, 67, 67, 67, 67, 59, 59, 59,
-   59, 51, 51, 51, 51,161,161,161,161,144,144,144,144,143,143,143,
-  143,172,172,172,172,174,174,174,174, 60, 60, 60, 60, 69, 69, 69,
-   69, 47, 47, 47, 47,112,112,112,112,118,118,118,118,106,106,106,
-  106,156,156,156,156,147,147,147,147,148,148,148,148,169,169,169,
-  169,164,164,164,164,168,168,168,168, 11, 11, 11, 11, 74, 74, 74,
-   74, 42, 42, 42, 42, 50, 50, 50, 50,116,116,116,116,111,111,111,
-  111,115,115,115,115, 52, 52, 52, 52, 13, 13,  2,  2,120,120,120,
-  120, 98, 98, 98, 98, 88, 88, 88, 88,117,117,117,117,101,101,101,
-  101,103,103,103,103, 19, 19, 19,  0, 95, 95, 95, 95, 30, 30,  2,
-    2, 34, 34, 34, 34, 54, 54, 54, 54,  0,  2,  0,  0, 71, 71, 71,
-   71, 53, 53, 53, 53, 81, 81, 81, 81, 66, 66, 66, 66, 83, 83, 83,
-   83,153,153,153,153,160,160,160,160,  2,  2, 22, 22, 30,  2, 30,
-   30,  9,  9,  2,  2,  2,  2,  0,  0, 41, 41, 41, 41, 72, 72, 72,
-   72,173,173,173,173, 82, 82, 82, 82,158,158,158,158,129,129,129,
-  129,145,145,145,145,  2,  3,  3,  3, 23,  2, 23, 23, 16,  2, 16,
-   16,  2,  2,  2,  0, 45, 45, 45, 45, 44, 44, 44, 44, 43, 43, 43,
-   43,128,128,128,128,122,122,122,122,149,149,149,149,  0, 19, 19,
-   19,  0,  0, 19,  0,  9,  2,  9,  9,  5,  2,  2,  5,  2, 10, 10,
-   10, 10, 10,  2, 10,  2, 21, 21, 21, 21,  2,  2, 21, 22, 22, 22,
-    2, 22, 22,  2,  2, 20,  2, 20, 20,  2, 30, 30, 30, 12, 12, 12,
-    2, 19, 19, 19,  2,  2,  2, 12, 12,161,161,  2,161,  3,  3,  3,
-    2,107,  2,  2,107,  2,  3,  2,  3, 19,  0,  0,  0,  2,  2,  9,
-    9,  9,  9,  9,  2,  2,  4,  4,  4,  2, 11, 11, 11, 11, 11, 11,
-    2, 11,  2, 11, 11, 10, 10,  2,  2, 22,  2, 22, 22,  2,  2,  2,
-   22, 23, 23,  2,  2,  2, 36, 36, 36,  2,  2, 36, 36,  2, 25, 25,
-   25, 46, 46, 46, 46, 31, 31,  2,  2, 91, 91,  2,  2,  1,  0,  0,
-    0,  1,  1,  0,  0,  0, 17, 17, 17, 49, 49, 49,  2,161,161,161,
-    2,  2,107,107,107,107,  2,  2,  2,171,171,  2,171,  0,  0,  2,
-    0,  2,  3,  3,  2,  3,  2,  2,  3,  4,  4,  4,  2,  2, 14, 14,
-   14, 14, 14, 14,  2,  3,  0,  3,  3,  0,  3,  3,  3,  3,  3,  3,
-    0, 37, 37, 37,  2,  3,  3,  2,  2,  2,  2,  2,  3,  2,  2,  5,
-    5,  5,  5,  5,  2,  2,  2,  2, 11, 11,  2,  2, 11, 11, 11,  2,
-    2, 10,  2, 10, 10, 21,  2, 21, 21, 21, 21,  2,  2, 22,  2,  2,
-    2,  2, 16, 16, 16, 16, 16,  2,  2, 36, 36, 36,  2, 36,  2,  2,
-    2, 18, 18, 18,  2, 18, 18,  2,  2, 25,  2, 25, 25,  8,  8,  2,
-    8,  2,  8,  2,  2, 29, 29,  2,  2, 46,  2, 46, 46, 32,  2,  2,
-    2,  1,  1,  2,  2,  1,  1,  1,  0, 19, 19,  9,  9,  2,  9,  2,
-    9,  0,  0,  0, 19, 19,  2,  2,  2,  0,  0, 19, 19,  2,  2,  2,
-   61, 15, 15, 15,  2, 17, 17, 17,  0,  2, 19, 19, 19, 75, 75,  2,
-    2, 12,  2,  2,  2, 68, 68,  2,  2, 87, 87,  2,  2, 49, 49,  2,
-    2, 50, 50,  2,  2,  2, 57, 57, 57, 57,  2,  2,  2,112,112,112,
-    2,  2,122,122,122,130,130,130,  2,165,165,  2,  2,156,156,  2,
-    2,  2,  2,  3,  3, 94, 94,  2,  2,129,129,  2,129,107,  2,107,
-  107,123,123,  2,  2,102,102,  2,  2,126,126,126,  2,154,154,154,
-    2,  2,  2,150,150,169,169,  2,  2,138,138,138,  2,138,138,  2,
-  138,143,143,  2,143,163,163,163,  2,103,103,  2,  2,119,119,  2,
-  119,  2,  2,  2, 99, 13, 13, 13,  2,136,136,136,  2,105,  2,  2,
-    2,  0,  0,  0,  1, 56, 56, 56,  2,151,151,  2,  2,  3,  3,  2,
-    3,  0,  0, 26, 26,  0,  9,  9,  9,  9,  9,  0,  9,  9,  0,  9,
-    0,  9,  9,  2,  9,  9,  9, 55, 55,  6,  1,  1,  6,  2,  2,  2,
-   14, 14,  2,  2,  2,  3,  3,  3,  1,  1,  1,  3,  3,  1,  3,  3,
-    3, 37, 37,  2, 37,  2, 37, 37, 37, 38, 38,  2,  2, 64, 64, 64,
-    2,  2, 64, 64, 64, 90, 90,  2,  2, 90, 90, 90,  2,  2,  2, 95,
-    2,  3,  3,  0,  3,  7,  1,  1,  1,  1,  7,  7,  7,  0,  0,  7,
-    7,  2,  5,  5,  5,  5,  2,  5,  5,  5,  2,  5,  2,  5,  5,  2,
-    2,  2,  2,  2,  5,  5,  5,  2,  5,  2, 11, 11,  2,  2, 11,  2,
-    2, 11,  2, 11,  2,  2,  2, 11, 11, 10,  2,  2,  2,  2,  2, 10,
-   10, 21, 21,  2, 21,  2,  2, 21, 21,  2, 22, 22, 22,  2, 22, 22,
-    2,  2, 23, 23,  2, 23, 23, 23,  2,  2,  2, 23, 23,  2,  2,  2,
-   23,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2, 16, 16,  2,  2, 20,
-   20, 36, 36,  2, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2,
-   36, 36,  2, 36,  2,  2, 24, 24, 24, 24, 24, 24,  2,  2, 18, 18,
-    2, 18,  2, 18, 18,  2, 18,  2, 18, 18,  2, 18,  2, 25,  2,  2,
-    2, 25,  0,  0,  0,  0, 25, 25,  2,  8,  8,  8,  0, 30,  2,  2,
-    2, 34,  2,  2,  2, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,  2,
-    2, 45, 45,  2,  2,  2,  2,  2, 45, 44,  0,  0,  2, 32, 32,  0,
-    0, 32,  0, 32, 32, 32, 32,  2,  2, 32, 32, 32,  2, 28, 28,  2,
-    2, 48, 48, 48,  2, 48,  2,  2,  2, 52, 52,  2,  2, 52,  2,  2,
-    2, 58, 58,  2,  2, 58, 58, 58,  2,  2,  2, 58, 58,  2,  2, 54,
-   54, 91, 91, 91,  2, 91,  2,  2, 91, 62,  2, 62, 62,  2,  2,  2,
-   70, 70, 70,  2,  2,  2, 70, 70, 70,  6,  6,  6,  2,  8,  8,  8,
-    2,  2,  8,  8,  8,  1,  0,  1,  1,  0,  1,  0,  0,  1,  1,  0,
-    2,  9,  9,  9,  6, 19,  9,  9,  9,  9,  9, 19, 19,  9,  9,  9,
-   19,  6, 19, 19, 19, 19, 19, 19,  9,  2,  9,  9,  9,  0, 19,  2,
-    2,  1,  2,  2,  2,  0,  0,  9,  0,  2, 55, 55, 55, 61,  2,  2,
-    2, 13, 13,  2, 13,  0, 13,  0, 13,  0, 13, 13, 13, 13, 13,  1,
-    1,  1,  1, 12, 12,  2, 15, 15, 15,  2,  1,  1,  0,  0, 15, 15,
-   15,  2, 26, 26, 26,  2, 12, 12, 12, 12, 12, 12,  0, 39,  2,  2,
-    2, 39, 39, 39,  2, 60,  2,  2,  2,  2,  2, 75, 75, 69, 69,  0,
-   69,  2,  2,  2, 74, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84,
-   84, 33, 33, 33,  2, 68, 68, 68,  2, 92, 92, 92,  2,  2,  2,  2,
-   92, 87, 87, 87,  2, 19,  9, 19, 19, 19, 19,  0,  0,  2,  2,  2,
-   12,  2,  2,  2,  4, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14,
-   14,  3,  3,  0,  0,  1,  1,  6,  6,  3,  2,  3,  3,  3,  2,  2,
-    0,  0,  0, 17, 17, 17, 17,  0,  0,  2, 49, 49, 49, 49, 49,  2,
-   49,  9,  2,  2,  2,  0,  1,  2,  2, 71,  2,  2,  2, 67,  2,  2,
-    2,  2, 42, 42, 42, 41, 41, 41,  2,118,118,118,  2, 53, 53,  2,
-   53, 59, 59,  2,  2,  2,  2,  2,104,161,  2,  2,  2,110,110,110,
-    2,110,110,  2,  2, 19, 19,  2, 19, 19,  2, 19, 19, 47, 47,  2,
-    2, 47,  2, 47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2,
-   47, 81, 81,  2, 81,116,116,116,  2,  2,  2,  2,116,128,128,128,
-    2,128,128,  2,  2,  2,  2,  2,128,  2,  2,  2, 66, 72, 72,  2,
-    2,  2,  2,  2, 72,173,173,  2,  2,  2,  2, 97, 97,  2, 57, 57,
-    2, 57, 57,  2,  2, 57, 57, 57,  2,  2,  2,  2, 57,  2,  2,  2,
-  112, 78, 78,  2,  2,  2, 78, 78, 78, 83, 83,  2,  2, 82, 82, 82,
-    2,122,122,  2,  2,122,  2,  2,  2, 89,  2,  2,  2,  2,  2,130,
-  130,144,144,  2,  2,  2,165,165,165,  2,  2,165,165,156,156,  2,
-  156,  3,  2,  2,  2,148,148,  2,  2,158,158,  2,  2,149,149,149,
-    2,  2,  2, 94, 94,  2,  2,  2, 94, 85, 85, 85,  2,  2, 85,  2,
-    2,101,  2,  2,  2,101,101,  2,  2, 96,  2, 96, 96,111,111,111,
-    2,108,108,  2,108,108,108,  2,  2,129,129,129,  2,129,  2,129,
-  129,129,129,  2,  2,109,109,109,  2,109,109,  2,  2,107,107,  2,
-    1,107,107,  2,  2,  2,  2,  2,107,  2,  2,107,107,  2,  2,171,
-    2,171,  2,171,  2,  2,171,  2,171,171,171,171,  2,171,  2,  2,
-    2,  2,171,171,  2,  2,137,137,137,137,137,  2,  2,124,124,  2,
-    2,114,  2,  2,  2,114,114,  2,  2,  2,126,126,126,125,125,125,
-    2,  2,  2,  2,125,  2,154,  2,  2,  2,154,154,  2,154,154,  2,
-  154,154,  2,  2,154,154,154,  2,  2,150,  2,  2,  2,140,140,140,
-    2,121,  2,  2,  2,  7,  7,  2,  2,133,  2,133,133,133,133,133,
-    2,133,133,  2,  2,133,  2,  2,  2,  2,  2,134,134,  2,134,134,
-  134,134,134,134,  2,  2,  2,138,  2,138,138,  2,  2,143,  2,143,
-  143,143,143,143,  2,143,  2,  2,  2,143,143,  2,  2,175,175,  2,
-    2,145,  2,  2,  2,163,  2,163,163,  2,  2,163,163, 86,  2,  2,
-    2, 63, 63,  2,  2, 63, 63, 63,  2, 63,  2,  2,  2,157,157,157,
-    2, 80, 80,  2,  2, 80, 80, 80,  2,127,127,127,  2,166,166,  2,
-    2, 79,  2,  2,  2,115,115,115,  2,115,115,  2,  2,  2,  2,115,
-  115,159,159,159,  2,159,159,  2,  2,119,119,  2,  2,  2,119,119,
-  119,167,167,  2,  2,146,146,146,  2,172,  2,  2,172, 99, 99, 99,
-    2,136,139, 13, 13,155,  2,  2,  2,155,155,  2,  2,  2,  2,  2,
-  155,  2, 17, 17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 17, 17, 17,
-    2,  2,  2, 15,  2,  2, 17,  2,  2,105,105,105,  2,105,105,  2,
-    2,  1,  1,  1,  2,  0,  1,  1,  1,  0,  0,  1,  1,  2,  2,  0,
-    2,  2,  0,  0,  2,  0,  2,  0,  2,  2,  2,  2,131,  2,131,131,
-  131, 56,  2,  2, 56, 56, 56,  2, 56, 56,  2, 56, 56,  6,  6,  2,
-    2,  2,  2,  2,  6,151,  2,  2,  2,  2,  2,151,151,160,160,160,
-    2,152,152,  2,  2,  2,  2,  2,152,164,164,  2,  2,168,168,168,
-    2,  2,  2,  2,168,174,174,174,  2,174,174,  2,  2,  2,  2,174,
-  174,  2, 30, 30,  2,113,  2,  2,113,113,113,113,  2,132,132,  2,
-    2,  2,  2,132,132,  2,  2,  3,  2,  3,  2,  3,  2, 15,  0,  0,
-    2,  0,  2,  2,  0, 13,  2,  2,  2,  2,  0,  2,  2,  1,  2,  3,
-    4,  5,  6,  7,  8,  9,  0,  0,  0,  0, 10,  0, 11, 12, 13,  0,
-    0,  0, 14,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,170,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 17,  0,  0,  0,  0, 18,
-    0,  0,  0,  0,  0, 19, 20, 21,  0, 22,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  0,  0,
-    0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 27,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-   10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,
-    0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0, 31, 32,  0, 33,  0,
-   34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,  0,
-   45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,  0,  0,  0, 48,  0,
-   49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50,
-   51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0, 54,
-    0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0, 56,
-    0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,
-   59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,  0,  0, 66,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 68,  0, 69, 70,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 72, 73, 74, 75,
-   76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-   92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  0,  0,
-    0,  0,  0,  0,105,106,  0,107,  0,  0,  0,108,  0,109,  0,110,
-    0,111,112,113,  0,114,  0,  0,  0,115,  0,  0,  0,116,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,
-  119,120,121,  0,122,123,124,125,126,  0,127,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,130,131,132,
-  133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,
-  149,150,151,152,153,154,155,156,157,  0,  0,  0,158,159,160,161,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,162,  0,163,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,164,165,  0,  0,  0,  0,  0,  0,  0,166,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,167,
-    0,  0,  0,168,169,  0,  0,170,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,171,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,173,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,174,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,175,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  176,177,  0,  0,  0,  0,178,179,  0,  0,  0,180,181,182,183,184,
-  185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,
-  201,202,203,204,205,206,207,208,209,210,211,212,213,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,179,  0,  0,  0,
+  180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,
+  196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,
+  212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
-static const uint16_t _hb_ucd_u16[10877]=
+static const uint16_t _hb_ucd_u16[10904]=
 {
+     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
+    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
+    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
+     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
+    13,  13,  13,  42,   9,  43,  11,  11,  44,  45,  32,  46,  47,  48,  49,  50,
+    51,  52,  48,  48,  53,  32,  54,  55,  48,  48,  48,  48,  48,  56,  57,  58,
+    59,  60,  48,  32,  61,  48,  48,  48,  48,  48,  62,  63,  64,  48,  65,  66,
+    48,  67,  68,  69,  48,  70,  71,  48,  72,  73,  48,  48,  74,  32,  75,  32,
+    76,  48,  48,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+    90,  83,  84,  91,  92,  93,  94,  95,  96,  97,  84,  98,  99, 100,  88, 101,
+   102,  83,  84, 103, 104, 105,  88, 106, 107, 108, 109, 110, 111, 112,  94, 113,
+   114, 115,  84, 116, 117, 118,  88, 119, 120, 115,  84, 121, 122, 123,  88, 124,
+   125, 115,  48, 126, 127, 128,  88, 129, 130, 131,  48, 132, 133, 134,  94, 135,
+   136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
+   146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
+    48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
+    48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
+   178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
+    48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
+   194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
+    48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
+    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215,  32, 216, 217, 140,
+   218,  48,  48, 219, 220, 160, 221, 222, 223,  48, 224,  64,  48,  48, 225, 226,
+    48,  48, 227, 228, 229,  64,  48, 230, 231,   9,   9, 232, 233, 234, 235, 236,
+    11,  11, 237,  27,  27,  27, 238, 239,  11, 240,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 241,  13,  13,  13,  13,  13,  13,
+   242, 243, 242, 242, 243, 244, 242, 245, 246, 246, 246, 247, 248, 249, 250, 251,
+   252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 262, 263, 264, 265, 266,
+   267, 268, 269, 270, 271, 272, 273, 273, 274, 275, 276, 209, 277, 278, 209, 279,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   281, 209, 282, 209, 209, 209, 209, 283, 209, 284, 280, 285, 209, 286, 287, 209,
+   209, 209, 176, 140, 288, 140, 272, 272, 272, 289, 209, 209, 209, 209, 290, 272,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 291, 292, 209, 209, 293,
+   209, 209, 209, 209, 209, 209, 294, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 295, 296, 272, 297, 209, 209, 298, 280, 299, 280,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   280, 280, 280, 280, 280, 280, 280, 280, 300, 301, 280, 280, 280, 302, 280, 303,
+   209, 209, 209, 280, 304, 209, 209, 305, 209, 209, 209, 209, 209, 209, 209, 209,
+     9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
+    11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
+   315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323, 140, 209,
+   324, 325, 326, 327, 136,  48,  48,  48,  48, 328, 178,  48,  48,  48,  48, 329,
+   330,  48,  48, 136,  48,  48,  48,  48, 200, 331,  48,  48, 209, 209, 332,  48,
+   209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
+    48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 230,
+   339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
+    31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
+   357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
+    64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
+    48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
+   383, 384, 314,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+    48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
+   392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
+    48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
+    32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
+   411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
+   420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
+   422, 272, 272, 423, 273, 273, 273, 424, 425, 426, 427, 140, 140, 209, 209, 428,
+   140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
+    48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
+     9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
+    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
+    48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
+   448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
+    48, 454,  48, 455,  48, 207, 140, 140,  48,  48,  48, 456, 272, 457, 272, 272,
+   458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
+    48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
+    48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 272, 479,  48,  48, 480, 481, 482, 483, 140, 484,
+    48, 464, 485,  48,  62, 486, 140,  48, 487, 140, 140,  48, 488, 140,  48, 313,
+   489,  48,  48, 490, 491, 457, 492, 493, 223,  48,  48, 494, 495,  48, 196, 192,
+   496,  48, 497, 498, 499,  48,  48, 500, 223,  48,  48, 501, 502, 503, 504, 505,
+    48,  97, 506, 507, 508, 140, 140, 140, 509, 510, 511,  48,  48, 512, 513, 192,
+   514,  83,  84, 515, 516, 517, 518, 519, 520,  48,  48, 521, 522, 523, 524, 140,
+    48,  48,  48, 525, 526, 527, 481, 140,  48,  48,  48, 528, 529, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 530, 531, 532, 533, 140, 140,
+    48,  48,  48, 534, 535, 192, 536, 140,  48,  48, 537, 538, 192, 539, 540, 140,
+    48, 541, 542, 543, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 506, 544, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 545,
+   546, 547,  48, 548, 549, 192, 140, 140, 140, 140, 550,  48,  48, 551, 552, 140,
+   553,  48,  48, 554, 555, 556,  48,  48, 557, 558, 559,  48,  48,  48,  48, 196,
+   560, 140, 140, 140, 140, 140, 561, 140, 140, 140, 140, 140,  48,  48, 562, 192,
+    84,  48, 530, 563, 564, 148, 175, 565,  48, 566, 567, 568, 140, 140, 140, 140,
+   569,  48,  48, 570, 571, 192, 572,  48, 573, 574, 192,  48,  48, 575, 192, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 576,
+   577, 115,  48, 578, 579, 580, 140, 140, 140, 140, 140, 100, 272, 581, 582, 583,
+    48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
+   273, 273, 273, 273, 273, 273, 584, 585,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 586,
+    48,  48,  48, 587, 588, 589,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
+    48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 590, 591, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 592,
+    48,  48,  48, 593, 594, 595, 596, 597,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 598,  48, 599, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 272, 600,   9, 601,  11, 602, 140, 140,
+    48,  48,  48,  48, 603, 604, 605, 605, 606, 607, 140, 140, 140, 140, 608, 609,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 610,
+    48, 200, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48,  48, 611,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 612,
+    48,  48, 611, 613, 140, 614, 615,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 616, 617, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 618,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 619, 209, 427, 209, 620,
+    32,  32, 216,  32, 621, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
+   209, 209, 622, 209, 209, 209, 623, 624, 625, 209, 626, 209, 209, 209, 288, 140,
+   209, 209, 209, 209, 627, 140, 140, 140, 140, 140, 140, 140, 272, 628, 272, 628,
+   209, 209, 209, 209, 209, 338, 272, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 629,  11, 630, 631, 632, 242,   9, 633, 634, 635, 636, 637,   9, 629,  11,
+   638, 639,  11, 640, 641, 642, 643,   9, 644,  11,   9, 629,  11, 630, 631,  11,
+   242,   9, 633, 643,   9, 644,  11,   9, 629,  11, 645,   9, 646, 647, 648, 649,
+    11, 650,   9, 651, 652, 653, 654,  11, 655,   9, 656,  11, 657, 539, 539, 539,
+    32,  32,  32, 658,  32,  32, 659, 660, 661, 662,  45, 140, 140, 140, 140, 140,
+   663, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   666, 667, 668,  27,  27,  27, 669, 140, 670, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 671, 672, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 673, 140,  48,  48, 674, 675,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 676, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 590, 677,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 200, 678, 679,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 680, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 681, 621, 140, 140,
+     9,   9, 633,  11, 682, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 504, 272, 272, 683, 684, 140, 140, 140, 140,
+   504, 272, 685, 686, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   687,  48, 688, 689, 690, 691, 692, 693, 694, 206, 695, 206, 140, 140, 140, 696,
+   209, 209, 697, 209, 209, 209, 209, 209, 209, 322, 333, 698, 698, 698, 209, 323,
+   699, 209, 209, 209, 209, 209, 209, 209, 209, 209, 700, 140, 140, 140, 701, 209,
+   702, 209, 209, 697, 703, 704, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 705,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 706, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 176, 697, 427,
+   697, 209, 209, 209, 707, 176, 209, 209, 707, 209, 700, 697, 704, 708, 140, 140,
+   209, 209, 209, 209, 209, 707, 700, 426, 709, 209, 209, 209, 710, 711, 712, 703,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 713, 209, 209, 209, 209, 209, 714,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
+    48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
+    48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140, 140, 140,
+   715, 140, 587, 587, 587, 587, 587, 587, 140, 140, 140, 140, 140, 140, 140, 140,
+    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 716,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 717,
+     0,   0,   0,   0,   1,   2,   1,   2,   0,   0,   3,   3,   4,   5,   4,   5,
+     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   6,   0,   0,   7,   0,
+     8,   8,   8,   8,   8,   8,   8,   9,  10,  11,  12,  11,  11,  11,  13,  11,
+    14,  14,  14,  14,  14,  14,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
+    14,  14,  14,  16,  17,  18,  17,  17,  19,  20,  21,  21,  22,  21,  23,  24,
+    25,  26,  27,  27,  28,  29,  27,  30,  27,  27,  27,  27,  27,  31,  27,  27,
+    32,  33,  33,  33,  34,  27,  27,  27,  35,  35,  35,  36,  37,  37,  37,  38,
+    39,  39,  40,  41,  42,  43,  44,  27,  27,  45,  27,  27,  27,  27,  46,  27,
+    47,  47,  47,  47,  47,  48,  49,  47,  50,  51,  52,  53,  54,  55,  56,  57,
+    58,  59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,
+    74,  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+    90,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105,
+   106, 107, 108, 108, 109, 110, 111, 108, 112, 113, 114, 115, 116, 117, 118, 119,
+   120, 121, 121, 122, 121, 123, 124, 124, 125, 126, 127, 128, 129, 130, 124, 124,
+   131, 131, 131, 131, 132, 131, 133, 134, 131, 132, 131, 135, 135, 136, 124, 124,
+   137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, 138, 139, 138, 138, 140,
+   141, 141, 141, 141, 141, 141, 141, 141, 142, 142, 142, 142, 143, 144, 142, 142,
+   143, 142, 142, 145, 146, 147, 142, 142, 142, 146, 142, 142, 142, 148, 142, 149,
+   142, 150, 151, 151, 151, 151, 151, 152, 153, 153, 153, 153, 153, 153, 153, 153,
+   154, 155, 156, 156, 156, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+   167, 167, 167, 167, 167, 168, 169, 169, 170, 171, 172, 172, 172, 172, 172, 173,
+   172, 172, 174, 153, 153, 153, 153, 175, 176, 177, 178, 178, 179, 180, 181, 182,
+   183, 183, 184, 183, 185, 186, 167, 167, 187, 188, 189, 189, 189, 190, 189, 191,
+   192, 192, 193,   8,   8, 194, 195, 124, 196, 196, 196, 196, 197, 196, 196, 196,
+   198, 198, 198, 198, 199, 199, 199, 200, 201, 201, 201, 202, 203, 204, 204, 204,
+   205, 138, 138, 206, 207, 208, 209, 210,   4,   4, 211,   4,   4, 212, 213, 214,
+     4,   4,   4, 215,   8,   8,   8,   8,  11, 216,  11,  11, 216, 217,  11, 218,
+    11,  11,  11, 219, 219, 220,  11, 221, 222,   0,   0,   0,   0,   0, 223, 224,
+   225, 226,   0,   0, 227,   8,   8, 228,   0,   0, 229, 230, 231,   0,   4,   4,
+   232,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0, 233, 124, 234, 124,   0,   0, 235, 235, 235, 235, 235, 235, 235, 235,
+     0,   0,   0,   0,   0,   0,   0, 236, 237, 237, 237, 237, 237, 237,   4,   4,
+   238, 238, 238, 238, 238, 238, 238, 239, 138, 138, 139, 240, 240, 240, 241, 242,
+   142, 243, 244, 244, 244, 244,  14,  14,   0,   0,   0,   0,   0, 245, 124, 124,
+   246, 247, 246, 246, 246, 246, 246, 248, 246, 246, 246, 246, 246, 246, 246, 246,
+   246, 246, 246, 246, 246, 249, 124,   0, 250,   0, 251, 252, 253, 254, 254, 254,
+   254, 255, 256, 257, 257, 257, 257, 258, 259, 260, 260, 261, 141, 141, 141, 141,
+   262,   0, 260, 260,   0,   0, 263, 257, 141, 262,   0,   0,   0,   0, 141, 264,
+     0,   0,   0,   0,   0, 257, 257, 265, 257, 257, 257, 257, 257, 266,   0,   0,
+   246, 246, 246, 246,   0,   0,   0,   0, 267, 267, 267, 267, 267, 267, 267, 267,
+   268, 267, 267, 267, 269, 270, 270, 270, 271, 271, 271, 271, 271, 271, 271, 271,
+   271, 271, 272, 124,  14,  14,  14,  14,  14,  14, 273, 273, 273, 273, 273, 274,
+     0,   0, 275,   4,   4,   4,   4,   4, 276,   4,   4,   4,   4, 226, 124, 277,
+   278, 278, 279, 233, 280, 280, 280, 281, 282, 282, 282, 282, 283, 284,  47,  47,
+   285, 285, 286, 287, 287, 288, 141, 289, 290, 290, 290, 290, 291, 292, 137, 293,
+   294, 294, 294, 295, 296, 297, 137, 137, 298, 298, 298, 298, 299, 300, 301, 302,
+   303, 304, 244,   4,   4, 305, 306, 151, 151, 151, 151, 151, 301, 301, 307, 308,
+   141, 141, 309, 141, 310, 141, 141, 311, 124, 124, 124, 124, 124, 124, 124, 124,
+   246, 246, 246, 246, 246, 246, 312, 246, 246, 246, 246, 246, 246, 313, 124, 124,
+   314, 315,  21, 316, 317,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,
+    27,  27,  27, 318,  27,  27,  27,  27,  27,  27,  27,  27,  27, 124, 124,  27,
+     8, 233, 319,   0,   0, 320, 321, 322,  27,  27,  27,  27,  27,  27,  27, 323,
+   324,   0,   1,   2,   1,   2, 325, 256, 257, 326, 141, 262, 327, 328, 329, 330,
+   331, 332, 333, 334, 335, 335, 124, 124, 332, 332, 332, 332, 332, 332, 332, 336,
+   337,   0,   0, 338,  11,  11,  11,  11, 339, 340, 341, 124, 124,   0,   0, 342,
+   343, 344, 345, 345, 345, 346, 347, 348, 349, 349, 350, 351, 352, 353, 353, 354,
+   355, 356, 357, 357, 358, 359, 124, 124, 360, 360, 360, 360, 360, 361, 361, 361,
+   362, 363, 364, 365, 365, 366, 365, 367, 368, 368, 369, 370, 370, 370, 371, 372,
+   372, 373, 374, 375, 376, 376, 376, 377, 378, 378, 378, 378, 378, 378, 378, 378,
+   378, 378, 378, 379, 378, 380, 381, 124, 382,   4,   4, 383, 124, 124, 124, 124,
+   384, 385, 385, 386, 387, 388, 389, 389, 390, 391, 392, 124, 124, 124, 393, 394,
+   395, 396, 397, 398, 399, 400, 124, 124, 401, 401, 402, 403, 402, 404, 402, 402,
+   405, 406, 407, 408, 409, 409, 410, 410, 411, 411, 124, 124, 412, 412, 413, 414,
+   415, 415, 415, 416, 417, 418, 419, 420, 421, 422, 423, 124, 124, 124, 124, 124,
+   424, 424, 424, 424, 425, 124, 124, 124, 426, 426, 426, 427, 426, 426, 426, 428,
+   429, 429, 430, 431, 432, 432, 433, 432, 434, 124, 124, 124, 124, 124, 124, 124,
+   124, 124, 124, 124, 124, 124,  27, 435, 436, 436, 437, 438, 439, 440, 124, 441,
+   442, 442, 443, 444, 444, 445, 124, 446, 447, 124, 124, 448, 449, 124, 450, 451,
+   452, 452, 452, 452, 453, 454, 452, 455, 456, 456, 456, 456, 457, 458, 459, 460,
+   461, 461, 461, 462, 463, 464, 464, 465, 466, 466, 466, 466, 466, 466, 467, 468,
+   469, 470, 469, 469, 471, 124, 124, 124, 472, 473, 474, 475, 475, 475, 476, 477,
+   478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 487, 488, 489, 490, 491, 124,
+   492, 492, 492, 492, 492, 493, 494, 124, 495, 495, 495, 495, 496, 497, 124, 124,
+   498, 498, 498, 499, 498, 500, 124, 124, 501, 501, 501, 501, 502, 503, 504, 124,
+   505, 505, 505, 506, 506, 137, 507, 124, 508, 509, 510, 508, 511, 124, 124, 124,
+   512, 512, 512, 513, 124, 124, 124, 124, 124, 124, 514, 514, 514, 514, 514, 515,
+   516, 517, 518, 519, 520, 521, 124, 124, 124, 124, 522, 523, 523, 522, 524, 124,
+   525, 525, 525, 525, 526, 527, 527, 527, 527, 527, 528, 153, 529, 529, 529, 530,
+   531, 124, 124, 124, 124, 124, 532, 124, 124, 124, 124, 124, 533, 533, 534, 535,
+   536, 537, 537, 538, 539, 537, 540, 541, 541, 542, 543, 544, 124, 124, 124, 124,
+   545, 546, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 555, 556, 557, 124,
+   124, 124, 124, 124, 124, 124, 558, 559, 560, 561, 560, 562, 560, 563, 124, 124,
+   124, 124, 124, 564, 565, 565, 565, 566, 567, 567, 567, 567, 567, 567, 567, 567,
+   567, 568, 124, 124, 124, 124, 124, 124, 567, 567, 567, 567, 567, 567, 569, 570,
+   567, 567, 567, 567, 571, 124, 124, 124, 124, 572, 572, 572, 572, 572, 572, 573,
+   574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 575, 574, 574,
+   574, 574, 574, 574, 574, 574, 574, 576, 577, 577, 577, 577, 577, 577, 577, 577,
+   577, 577, 577, 577, 578, 124, 124, 124, 579, 579, 579, 580, 124, 124, 124, 124,
+   273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 581, 582, 583, 584, 585,
+   585, 585, 585, 586, 587, 588, 589, 590, 591, 591, 591, 591, 592, 593, 594, 595,
+   591, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 596, 596, 596, 597,
+   124, 124, 124, 124, 598, 598, 598, 598, 598, 599, 600, 601, 600, 602, 124, 124,
+   603, 603, 603, 603, 604, 603, 603, 603, 605, 603, 124, 124, 124, 124, 606, 607,
+   608, 608, 608, 608, 608, 608, 608, 608, 609, 609, 609, 609, 609, 609, 609, 609,
+   609, 609, 609, 609, 609, 610, 124, 611, 608, 612, 124, 124, 124, 124, 124, 124,
+   608, 608, 608, 608, 608, 608, 608, 613, 124, 124, 124, 124, 124, 124, 124, 614,
+   615, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+   254, 254, 616, 617, 124, 618, 619, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+   620, 620, 620, 620, 620, 620, 620, 621, 622, 622, 622, 622, 622, 622, 623, 624,
+   625, 626, 627, 124, 124, 124, 124, 124,   0,   0,   0,   0,   0,   0,   0, 340,
+     0,   0,   0, 628,   0, 629,   0, 629,   8,   8, 194,   8, 630,   0,   0,   0,
+     0,   0,   0,   0, 627, 124, 124, 124,   0,   0,   0,   0,   0,   0,   0, 631,
+     0,   0, 632,   0,   0,   0, 633, 634, 635,   0, 636,   0,   0,   0, 234, 124,
+    11,  11,  11,  11, 637, 124, 124, 124, 124, 124, 124, 124,   0, 627,   0, 627,
+     0,   0,   0,   0,   0, 638,   0, 639,   0,   0,   0,   0,   0, 223,   0,   0,
+     0, 640, 641, 642, 643,   0,   0,   0, 644, 645,   0, 646, 647, 648,   0,   0,
+     0,   0, 649,   0,   0,   0,   0,   0,   0,   0,   0,   0, 650,   0,   0,   0,
+   651, 651, 651, 651, 651, 651, 651, 651, 652, 653, 654, 124, 124, 124, 124, 124,
+     4, 655, 656, 124, 124, 124, 124, 124, 657, 658, 659,  14,  14,  14, 660, 124,
+   661, 124, 124, 124, 124, 124, 124, 124, 662, 662, 663, 664, 665, 124, 124, 124,
+   124, 666, 667, 124, 668, 668, 668, 669, 124, 124, 124, 124, 124, 670, 670, 671,
+   124, 124, 124, 124, 124, 672, 672, 673, 124, 124, 124, 124, 674, 675, 674, 676,
+   124, 124, 124, 124, 124, 124, 677, 678, 679, 679, 679, 679, 679, 679, 679, 679,
+   679, 679, 679, 679, 680, 681, 124, 124, 682, 682, 682, 682, 683, 684, 124, 124,
+   124, 124, 124, 124, 124, 124, 124, 324,   0,   0,   0, 685, 124, 124, 124, 124,
+   324,   0,   0, 245, 124, 124, 124, 124, 686,  27, 687, 688, 689, 690, 691, 692,
+   693, 694, 695, 694, 124, 124, 124, 696,   0,   0, 348,   0,   0,   0,   0,   0,
+     0, 627, 225, 324, 324, 324,   0, 631,   0,   0, 245, 124, 124, 124, 697,   0,
+   698,   0,   0, 348, 639, 227, 631, 124,   0,   0,   0,   0,   0, 699, 340, 340,
+     0,   0,   0,   0,   0, 233, 348, 629, 348,   0,   0,   0, 700, 233,   0,   0,
+   700,   0, 245, 348, 227, 639, 124, 124,   0,   0,   0,   0,   0, 700, 245, 340,
+   701,   0,   0,   0, 702, 703, 704, 639,   0, 320,   0,   0,   0,   0,   0, 234,
+   246, 246, 246, 246, 246, 246, 124, 124, 246, 312, 246, 246, 246, 246, 246, 246,
+   246, 246, 312, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 705, 246,
+   246, 246, 246, 246, 246, 312, 124, 124, 246, 312, 124, 124, 124, 124, 124, 124,
+   246, 246, 246, 246, 706, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 313,
+   707, 124,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8,   8,
+     8,   8,   8,   8,   8,   8,   8,   0,   0,   0,   0,   0,   1,   2,   2,   2,
+     2,   2,   3,   0,   0,   0,   4,   0,   2,   2,   2,   2,   2,   3,   2,   2,
+     2,   2,   5,   0,   2,   5,   6,   0,   7,   7,   7,   7,   8,   9,  10,  11,
+    12,  13,  14,  15,   8,   8,   8,   8,  16,   8,   8,   8,  17,  18,  18,  18,
+    19,  19,  19,  19,  19,  20,  19,  19,  21,  22,  22,  22,  22,  22,  22,  22,
+    22,  23,  21,  22,  22,  22,  23,  21,  24,  25,  25,  25,  25,  25,  25,  25,
+    25,  25,  12,  12,  25,  25,  26,  27,  25,  28,  12,  12,  29,  30,  29,  31,
+    29,  29,  32,  32,  29,  29,  29,  29,  31,  29,  33,   7,   7,  34,  29,  29,
+    35,  29,  29,  29,  29,  29,  29,  30,  36,  36,  36,  37,  36,  36,  36,  36,
+    36,  36,  38,  39,  40,  40,  40,  40,  41,  12,  12,  12,  42,  42,  42,  42,
+    42,  42,  43,  44,  45,  45,  45,  45,  45,  45,  45,  46,  45,  45,  45,  47,
+    48,  48,  48,  48,  48,  48,  48,  49,  36,  36,  38,  12,  50,  51,  29,  29,
+    52,  29,  29,  29,  53,  53,  53,  53,  54,  55,  53,  53,  53,  56,  53,  53,
+    57,  58,  57,  59,  59,  57,  57,  57,  57,  57,  60,  57,  61,  62,  63,  57,
+    57,  59,  59,  64,  12,  65,  12,  66,  57,  62,  57,  57,  57,  57,  57,  64,
+    67,  67,  68,  69,  70,  71,  71,  71,  71,  71,  72,  71,  72,  73,  74,  72,
+    68,  69,  70,  74,  75,  12,  67,  76,  12,  77,  71,  71,  71,  68,  12,  12,
+    78,  78,  79,  80,  80,  79,  79,  79,  79,  79,  81,  79,  81,  78,  82,  79,
+    79,  80,  80,  82,  83,  12,  12,  12,  79,  84,  79,  79,  82,  12,  78,  79,
+    85,  85,  86,  87,  87,  86,  86,  86,  86,  86,  88,  86,  88,  85,  89,  86,
+    86,  87,  87,  89,  12,  85,  12,  90,  86,  91,  86,  86,  86,  86,  12,  12,
+    92,  93,  94,  92,  95,  96,  97,  95,  98,  99,  94,  92, 100, 100,  96,  92,
+    94,  92,  95,  96,  99,  98,  12,  12,  12,  92, 100, 100, 100, 100,  94,  12,
+   101, 101, 101, 102, 102, 101, 101, 101, 101, 101, 102, 101, 101, 101, 103, 101,
+   101, 102, 102, 103,  12, 104, 105, 103, 101, 106, 101, 101,  12, 107, 101, 101,
+   108, 108, 108, 109, 109, 108, 108, 108, 108, 108, 109, 108, 108, 110, 111, 108,
+   108, 109, 109, 111,  12, 112,  12, 113, 108, 114, 108, 108, 110,  12,  12,  12,
+   115, 115, 115, 116, 116, 115, 115, 115, 115, 115, 115, 115, 115, 116, 116, 115,
+    12, 115, 115, 115, 115, 117, 115, 115, 118, 118, 119, 119, 119, 120, 121, 119,
+   119, 119, 119, 119, 122, 119, 119, 123, 119, 120, 124, 125, 119, 126, 119, 119,
+    12, 121, 119, 119, 121, 127,  12,  12, 128, 129, 129, 129, 129, 129, 129, 129,
+   129, 129, 130, 131, 129, 129, 129,  12,  12,  12,  12,  12, 132, 133, 134, 135,
+   135, 135, 135, 135, 135, 136, 135, 135, 135, 135, 135, 137, 135, 138, 135, 134,
+   135, 135, 137, 135, 139, 139, 139, 139, 139, 139, 140, 139, 139, 139, 139, 141,
+   140, 139, 139, 139, 139, 139, 139, 142, 139, 143, 144,  12, 145, 145, 145, 145,
+   146, 146, 146, 146, 146, 147,  12, 148, 146, 146, 149, 146, 150, 150, 150, 150,
+   151, 151, 151, 151, 151, 151, 152, 153, 151, 154, 152, 153, 152, 153, 151, 154,
+   152, 153, 151, 151, 151, 154, 151, 151, 151, 151, 154, 155, 151, 151, 151, 156,
+   151, 151, 153,  12, 157, 157, 157, 157, 157, 158, 157, 158, 159, 159, 159, 159,
+   160, 160, 160, 160, 160, 160, 160, 161, 162, 162, 162, 162, 162, 162, 163, 164,
+   162, 162, 165,  12, 166, 166, 166, 166, 166, 167,  12, 168, 169, 169, 169, 169,
+   169, 170,  12,  12, 171, 171, 171, 171, 171,  12,  12,  12, 172, 172, 172, 173,
+   173,  12,  12,  12, 174, 174, 174, 174, 174, 174, 174, 175, 174, 174, 175,  12,
+   176, 177, 178, 178, 178, 178, 179,  12, 178, 178, 178, 178, 178, 178, 180,  12,
+   178, 178, 181,  12, 159, 182,  12,  12, 183, 183, 183, 183, 183, 183, 183, 184,
+   183, 183, 183,  12, 185, 183, 183, 183, 186, 186, 186, 186, 186, 186, 186, 187,
+   186, 188,  12,  12, 189, 189, 189, 189, 189, 189, 189,  12, 189, 189, 190,  12,
+   189, 189, 191, 192, 193, 193, 193, 193, 193, 193, 193, 194, 195, 195, 195, 195,
+   195, 195, 195, 196, 195, 195, 195, 197, 195, 195, 198,  12, 195, 195, 195, 198,
+     7,   7,   7, 199,   7,   7,   7,  12, 200, 200, 200, 200, 200, 200, 200, 201,
+   202, 202, 202, 202, 203, 203, 203, 203, 203,  12,  12, 203, 204, 204, 204, 204,
+   204, 204, 205, 204, 204, 204, 206, 207, 208, 208, 208, 208,  19,  19, 209,  12,
+   146, 146, 210, 211, 202, 202,  12,  12, 212,   7,   7,   7, 213,   7, 214, 215,
+     0, 214, 216,  12,   2, 217, 218,   2,   2,   2,   2, 219, 220, 217, 221,   2,
+     2,   2, 222,   2,   2,   2,   2, 223,   8, 224,   8, 224,   8,   8, 225, 225,
+     8,   8,   8, 224,   8,  15,   8,   8,   8,  10,   8, 226,  10,  15,   8,  14,
+     0,   0,   0, 227,   0, 228,   0,   0, 229,   0,   0, 230,   0,   0,   0, 231,
+     2,   2,   2, 232, 233,  12,  12,  12, 234,  12,  12,  12,   0, 235, 236,   0,
+     4,   0,   0,   0,   0,   0,   0,   4,   2,   2,   5,  12,   0,   0, 233,  12,
+     0,   0, 231,  12, 237, 237, 237, 237,   0, 238,   0,   0, 239, 239, 239, 239,
+    18,  18,  18,  18,  18,  12, 240,  18, 241, 241, 241, 241, 241, 241,  12, 242,
+   243,  12,  12, 242, 151, 154,  12,  12, 151, 154, 151, 154,   0,   0,   0, 233,
+   244, 244, 244, 244, 244, 244, 245, 244, 244,  12,  12,  12, 244, 246,  12,  12,
+     0, 247,   0,   0, 248, 244, 249, 250,   0,   0, 244,   0, 251, 252, 252, 252,
+   252, 252, 252, 252, 252, 253, 254, 255, 256, 257, 257, 257, 257, 257, 257, 257,
+   257, 257, 258, 256,  12, 259, 260, 260, 260, 260, 260, 260, 261, 150, 150, 150,
+   150, 150, 150, 262,   0, 233,  12, 131, 150, 150, 150, 263, 257, 257, 257, 258,
+   257, 257,   0,   0, 264, 264, 264, 264, 264, 264, 264, 265, 264, 266,  12,  12,
+   267, 267, 267, 267, 268, 268, 268, 268, 268, 268, 268,  12, 269, 269, 269, 269,
+   269, 269,  12,  12, 236,   2,   2,   2,   2,   2, 230,   2, 270,   2,   2,   2,
+   271, 271, 271, 271, 271, 271, 271, 272, 273, 273, 273, 273, 273, 273,  12,  12,
+   274, 274, 274, 274, 274, 275,  12, 276, 274, 274, 275,  12, 277, 277, 277, 277,
+   277, 277, 277, 278, 279, 279, 279, 279, 279,  12,  12, 280, 150, 150, 150, 281,
+   282, 282, 282, 282, 282, 282, 282, 283, 282, 282, 284, 285, 145, 145, 145, 286,
+   287, 287, 287, 287, 287, 288,  12,  12, 287, 287, 287, 289, 287, 287, 289, 287,
+   290, 290, 290, 290, 291,  12,  12,  12,  12,  12, 292, 290, 293, 293, 293, 293,
+   293, 294,  12,  12, 155, 154, 155, 154, 155, 154,  12,  12,   2,   2,   3,   2,
+     2, 295, 296,  12, 293, 293, 293, 297, 293, 293, 297,  12, 150,  12,  12,  12,
+   150, 262, 298, 150, 150, 150, 150,  12, 244, 244, 244, 246, 244, 244, 246,  12,
+     2, 299,  12,  12, 300,  22,  12,  24,  25,  26,  25, 301, 302, 303,  25,  25,
+    29,  29,  29, 304,   7,   7,   7, 305, 231,   0,   0,   0,   0, 231,   0,  12,
+    29, 306,  29,  29,  29,  29,  29, 307, 308,   0,   0,   0,   0, 309, 257, 257,
+   257, 257, 257, 310, 311, 150, 311, 150, 311, 150, 311, 281,   0, 231,   0, 231,
+    12,  12, 308, 233, 312, 312, 312, 313, 312, 312, 312, 312, 312, 314, 312, 312,
+   312, 312, 314, 315, 312, 312, 312, 316, 312, 312, 314,  12, 231, 131,   0,   0,
+     0, 131,   0,   0,   8,   8,   8,  14,   0,   0,   0, 317, 318,  12,  12,  12,
+     0,   0,   0, 319, 320, 320, 320, 320, 320, 320, 320, 321, 322, 322, 322, 322,
+   323,  12,  12,  12, 214,   0,   0,   0,   0,   0,   0,  12, 324, 324, 324, 324,
+   324,  12,  12, 325, 326, 326, 326, 326, 326, 326, 327,  12, 328, 328, 328, 328,
+   328, 328, 329,  12, 330, 330, 330, 330, 330, 330, 330, 331, 332, 332, 332, 332,
+   332,  12, 332, 332, 332, 333,  12,  12, 334, 334, 334, 334, 335, 335, 335, 335,
+   336, 336, 336, 336, 336, 336, 336, 337, 336, 336, 337,  12, 338, 338, 338, 338,
+   338,  12, 338, 338, 338, 338, 338,  12, 339, 339, 339, 339, 339, 339,  12,  12,
+   340, 340, 340, 340, 340,  12,  12, 341, 342, 342, 343, 342, 343, 344, 342, 342,
+   344, 342, 342, 342, 344, 342, 344, 345, 346, 346, 346, 346, 346,  12,  12,  12,
+   347, 347, 347, 347, 347, 348,  12,  12, 347, 349,  12,  12, 347, 347,  12,  12,
+     2, 350,   2,   2, 351,   2, 299,  12, 352, 353, 354, 352, 352, 352, 352, 352,
+   352, 355, 356, 357, 358, 358, 358, 358, 358, 359, 358, 358, 360, 360, 360, 360,
+   361, 361, 361, 361, 361, 361, 361, 362,  12, 363, 361, 361, 364, 364, 364, 364,
+   365, 366, 367, 364, 368, 368, 368, 368, 368, 368, 368, 369, 370, 370, 370, 370,
+   370, 370, 371, 372, 373, 373, 373, 373, 373, 373, 374,  12, 375, 375, 375, 375,
+   376, 376, 376, 376, 376, 376,  12, 376, 377, 376, 376, 376, 378, 379,  12, 378,
+   378, 380, 380, 378, 378, 378, 378, 378, 378, 381, 382, 383, 378, 378, 384,  12,
+   385, 385, 385, 385, 386, 386, 386, 386, 387, 387, 387, 387, 387, 388, 389, 387,
+   387, 388,  12,  12, 390, 390, 390, 390, 390, 391, 392, 390, 393, 393, 393, 393,
+   393, 394, 393, 393, 395, 395, 395, 395, 396,  12, 395, 395, 397, 397, 397, 397,
+   398,  12, 399, 400,  12,  12, 399, 397, 401, 401, 401, 401, 401, 401, 402,  12,
+   403, 403, 403, 403, 404,  12,  12,  12, 404,  12, 405, 403, 406, 406, 406, 406,
+   406, 406,  12,  12, 406, 406, 407,  12, 408, 408, 408, 408, 408, 409, 410, 408,
+   408, 409,  12, 411,  29,  29,  29, 412, 413, 413, 413, 413, 413, 413, 414, 415,
+   415,  12,  12,  12, 416,  29,  12,  12,  29,  29, 417,  12,  12,  12, 416,  29,
+   418, 418, 418, 418, 418, 418,  12,  12, 419, 419, 419, 419, 419, 419, 420,  12,
+   421, 421, 421, 421, 421, 421, 422,  12, 423, 423, 423, 423, 423, 423, 423,  12,
+   424, 424, 424, 424, 424, 425,  12,  12, 426, 426, 426, 426, 426, 426, 426, 427,
+   428, 426, 426, 426, 426, 427,  12, 429, 430, 430, 430, 430, 431,  12,  12, 432,
+   433, 433, 433, 433, 433, 433, 434,  12, 433, 433, 435,  12, 436, 436, 436, 436,
+   436, 437, 436, 436, 436, 436,  12,  12, 438, 438, 438, 438, 438, 439,  12,  12,
+   440, 440, 440, 440, 118, 119, 119, 119, 119, 127,  12,  12, 441, 441, 441, 441,
+   442, 441, 441, 441, 443,  12,  12,  12, 444, 445, 446, 447, 444, 444, 444, 447,
+   444, 444, 448,  12, 449, 449, 449, 449, 449, 449, 450,  12, 449, 449, 451,  12,
+   452, 453, 452, 454, 454, 452, 452, 452, 452, 452, 455, 452, 455, 453, 456, 452,
+   452, 454, 454, 457, 458, 459,  12, 453, 452, 460, 452, 458, 452, 458,  12,  12,
+   461, 461, 462, 463, 461, 461, 461, 461, 461, 462, 461, 461, 464, 465, 466, 461,
+   461, 462, 467,  12, 468,  12,  12,  12, 469, 469, 469, 469, 469, 469, 469, 470,
+   471,  12,  12,  12, 472, 472, 472, 472, 472, 472,  12,  12, 472, 472, 473,  12,
+   474, 474, 474, 474, 474, 475, 474, 474, 474, 474, 474, 475, 476, 476, 476, 476,
+   476, 477,  12,  12, 476, 476, 478,  12, 178, 178, 178, 180, 479, 479, 479, 479,
+   479, 479, 480,  12, 145,  12,  12,  12, 481, 481, 481, 481, 481, 481, 482, 483,
+   481, 481, 481,  12, 481, 482,  12,  12, 484, 484, 484, 484, 484, 484, 484,  12,
+   485, 485, 485, 485, 486,  12,  12, 487, 488, 489, 490, 488, 488, 491, 488, 488,
+   488, 488, 488, 488, 488, 492, 493, 488, 488, 489,  12,  12, 488, 488, 494,  12,
+   495, 495, 496, 495, 495, 495, 495, 495, 495, 497,  12,  12, 498, 498, 498, 498,
+   498, 498,  12,  12, 499, 499, 499, 499, 500,  12,  12,  12, 501, 501, 501, 501,
+   501, 501, 502,  12,  53,  53, 503,  12, 440, 440,  12,  12, 504, 504, 504, 504,
+   505,  12,  12,  12, 504, 504, 505,  12, 506, 506, 507, 506, 506, 506, 506, 506,
+   506, 508, 506, 506, 506, 509,  12,  12, 506, 506, 506, 510, 511, 511, 511, 511,
+   512, 511, 511, 511, 511, 511, 513, 511, 511, 514,  12,  12, 515, 516, 517, 515,
+   515, 515, 515, 515, 515, 516, 518, 517, 515, 515,  12,  12, 515, 515, 519,  12,
+   520, 521, 522, 520, 520, 520, 520, 520, 520, 520, 520, 523, 521, 520, 524,  12,
+   520, 520, 525,  12, 526, 526, 526, 526, 526, 526, 526,  12, 526, 526, 527,  12,
+   528, 528, 528, 528, 528, 528, 529,  12, 530, 530, 530, 530, 531, 530, 530, 530,
+   530, 530, 532, 533, 530, 530, 532,  12, 534,  12,  12,  12, 100, 100, 100, 100,
+    96,  12,  12,  98, 535, 535, 535, 535, 535, 535, 536,  12, 535, 535, 535, 537,
+   535, 538,  12,  12, 535,  12,  12,  12, 539, 539, 539, 539, 540,  12,  12,  12,
+   541, 541, 541, 541, 541, 542,  12,  12, 541, 541, 543,  12, 544, 544, 544, 544,
+   544, 545,  12,  12, 546, 546, 546, 546, 546, 546, 547,  12, 269, 269, 548,  12,
+   549, 549, 549, 549, 549, 549, 549, 550, 549, 549, 551, 552, 553, 553, 553, 553,
+   553, 553, 553, 554, 553, 553, 555,  12, 556, 556, 556, 556, 556, 556, 556, 557,
+   556, 557,  12,  12, 558, 558, 558, 558, 558, 559,  12,  12, 558, 558, 560, 558,
+   560, 558, 558, 558, 558, 558,  12, 561, 562, 562, 562, 562, 562, 562, 563,  12,
+   564, 564, 564, 564, 564, 564, 565,  12, 566, 566, 566, 566, 566, 566, 567, 566,
+   566,  12,  12,  12, 568, 568, 568, 568, 568, 568, 569, 570, 568, 568,  12, 570,
+   571, 572,  12,  12, 244, 573,  12,  12, 574, 574, 574, 574, 575, 575, 575, 575,
+   575, 576,  12,  12,  12,  12,  12, 577, 574, 574, 574, 578, 578,  12,  12,  12,
+   257, 579, 257, 580, 581, 252, 252, 252, 582,  12,  12,  12, 583,  12,  12,  12,
+   253, 584,  12,  12,  12, 257,  12,  12, 585, 585, 585, 585, 585, 585, 585,  12,
+   586, 586, 586, 586, 586, 586, 587,  12, 586, 586, 586, 588, 586, 586, 588,  12,
+   586, 586, 589, 586,   0,  12,  12,  12,   0,  12, 238,   0, 317,  12,  12,  12,
+     7, 590,  12,  12,   0, 233,  12,  12,   0, 231, 308,   0,   0, 591, 227,   0,
+     0,   0, 591,   7, 212, 592,   7,   0,   0,   0, 593, 227,   8, 224,  12,  12,
+     0, 231,  12,  12,   0,   0, 317,  12,   0,   0,   0, 228, 594, 595, 308, 228,
+     0,   0, 596, 308,   0, 308,   0,   0,   0, 596, 231, 308,   0, 228,   0, 228,
+     0,   0, 596, 231,   0, 597, 238,   0, 228,   0,   0,   0,   0, 233,   0,   0,
+     0,   0,   0, 238, 598, 598, 598, 598, 598, 598, 598,  12,  12,  12, 599, 598,
+   600, 598, 598, 598,   2,   2,   2, 299,  12, 270, 299,  12, 239, 601, 239, 239,
+   239, 239, 602, 239, 603, 604, 601,  12,  19,  19,  19, 605,  12,  12,  12, 606,
+   607, 607, 607, 607, 607, 607, 607, 608, 607, 607, 607, 609, 607, 607, 609, 610,
+   611, 611, 611, 611, 611, 611, 611, 612, 613, 613, 613, 613, 613, 613, 614, 615,
+   616, 616, 616, 616, 616, 616, 617,  12, 618, 618, 618, 618, 618, 618, 619, 620,
+   621, 621, 621, 621, 621, 621, 621, 622, 621, 623,  12, 624, 151, 154, 151, 625,
+   151, 151, 151, 154, 626, 626, 626, 626, 626, 627, 626, 626, 626, 628,  12,  12,
+   629, 629, 629, 629, 629, 629, 629,  12, 629, 629, 630, 631,   0, 317,  12,  12,
+    29, 632,  29,  29, 633, 634, 632,  29, 412,  29, 635,  12, 636,  51, 635, 632,
+   633, 634, 635, 635, 633, 634, 412,  29, 412,  29, 632, 637,  29,  29, 638,  29,
+    29,  29,  29,  12, 632, 632, 638,  29,  50,  12,  12,  12,  12, 238,   0,   0,
+   639,  12,  12,  12,   0,   0, 317,   0,   0,   0,  12,  12,   0,   0, 231, 238,
+     0, 231, 317, 308,   0,   0,   0, 640,   0,   0, 231, 131, 641,  12,  12,  12,
+   244, 244, 573,  12, 642,  12,  12,  12,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 939, 940, 941, 942, 946, 948,   0, 962,
+   969, 970, 971, 976,1001,1002,1003,1008,   0,1033,1040,1041,1042,1043,1047,   0,
+     0,1080,1081,1082,1086,1110,   0,   0,1124,1125,1126,1127,1131,1133,   0,1147,
+  1154,1155,1156,1161,1187,1188,1189,1193,   0,1219,1226,1227,1228,1229,1233,   0,
+     0,1267,1268,1269,1273,1298,   0,1303, 943,1128, 944,1129, 954,1139, 958,1143,
+   959,1144, 960,1145, 961,1146, 964,1149,   0,   0, 973,1158, 974,1159, 975,1160,
+   983,1168, 978,1163, 988,1173, 990,1175, 991,1176, 993,1178, 994,1179,   0,   0,
+  1004,1190,1005,1191,1006,1192,1014,1199,1007,   0,   0,   0,1016,1201,1020,1206,
+     0,1022,1208,1025,1211,1023,1209,   0,   0,   0,   0,1032,1218,1037,1223,1035,
+  1221,   0,   0,   0,1044,1230,1045,1231,1049,1235,   0,   0,1058,1244,1064,1250,
+  1060,1246,1066,1252,1067,1253,1072,1258,1069,1255,1077,1264,1074,1261,   0,   0,
+  1083,1270,1084,1271,1085,1272,1088,1275,1089,1276,1096,1283,1103,1290,1111,1299,
+  1115,1118,1307,1120,1309,1121,1310,   0,1053,1239,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,1093,1280,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,
-    56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,  56,
-   224, 224, 768, 424, 432, 440, 448, 776, 224, 224, 784, 792,  72, 800,  40, 808,
-    48,  48,  48, 816, 824,  48,  48, 832, 840, 848, 856, 864, 872, 880,  48, 888,
-    48,  48,  48, 896, 904,  40,  40,  40,  40, 912,  40,  96, 920, 928, 936, 456,
-    64,  64,  64,  64,  64,  64,  64, 944, 952, 960, 968,  40, 976, 984,  48, 992,
-    72,  72,  72,  40,  40,  40,  48,  48,1000,  48,  48,  48,1008,  48,  48,  48,
-    48,  48,  48,1016,  72,1024,  40,  40,1032, 464,  64,1040,1048,   8,1056,1064,
-  1072,1080,   8,   8,1088,  64,1096,1104,   8,   8,   8,   8,   8,1112,1120,1128,
-  1136,1144,   8,  64,1152,   8,   8,   8,   8,   8, 472,1160, 232,   8,1168,1176,
-     8,1184,1192,1200,   8,1208, 176,   8,1216,1224,   8,   8,1232,  64,1240,  64,
-   480,   8,   8,1248,1256,1264,1272,1280,1288, 240, 128,1296,1304,1312, 144,1320,
-  1328, 240, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 248, 144,1392,
-  1400, 240, 128,1408,1416,1424, 144,1432,1440,1448,1456,1464,1472,1480, 304,1488,
-  1496, 256, 128,1504,1512,1520, 144,1528,1536, 256, 128,1544,1552,1560, 144,1568,
-  1576, 256,   8,1584,1592,1600, 144,1608,1616,1624,   8,1632,1640,1648, 304,1656,
-   312,   8,   8,1664,1672,1680,   0,   0,1688,   8,1696,1704,1712,1720,   0,   0,
-  1728,1736, 320,1744,1752,   8, 152,1760,1768,1776,  64,1784,1792,1800,   0,   0,
-     8,   8,1808,1816, 496,1824,1832,1840,1848,1856,  72,  72,1864,  40,  40,1872,
-     8,   8,   8,   8, 504,1880,   8,   8, 504,   8,   8,1888, 512, 520,   8,   8,
-     8, 512,   8,   8,   8,1896,1904, 528,   8, 264,  72,  72,  72,  72,  72,1912,
-   536,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,1920,   8,1928,1936,   8,   8,   8,   8,1944,1952,
-     8,1960,   8,1968,   8,1976,1984,1992,   8,   8,   8,2000,2008,2016,  80,2024,
-  2032,  80,   8,   8,2040,   8,   8, 160,2048,   8,2056,   8,   8,   8,   8, 328,
-     8, 120,2064,2072,2080,   8, 112,2088,   8,   8, 184,   8, 192,2096,  24,  24,
-     8,2104,   8,   8,   8,2112,2120,2128,  80,  80,2136,2144,  64, 544,2152,   0,
-  2160,   8,   8,2168,2176, 496,2184,2192, 336,   8,2200, 232,   8,   8,2208,2216,
-     8,   8,2224,2232,2240, 232,   8, 552,2248,  72,  72,2256,2264,2272,2280,2288,
-    40,  40,2296,  96,  96,  96,2304,2312,  40,2320,  96,  96,  64,  64,  64,  64,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,2328,  48,  48,  48,  48,  48,  48,
-   168, 560, 168, 168, 560,2336, 168,2344, 344, 344, 344,2352,2360,2368,2376,2384,
-  2392,2400,2408,2416,2424,2432,2440,2448,2456,2464, 568, 568,2472,2480,2488,2496,
-  2504,2512,2520,2528,2536,  88, 104, 104,2544,2552,2560,  24,2568,2576,  24,2584,
-  2592,  24,2600,  24,  24,  24,  24,2608,  24,2616,  56,2624,  24,2632,2640,  24,
-    24,  24, 264,   0, 576,   0,  88,  88,  88,2648,  24,  24,  24,  24,2656,  88,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,2664,2672,  24,  24,2680,
-    24,  24,  24,  24,  24,  24,2688,  24,  24,  24,  24,  24,  24,  24,  24,  24,
-    24,  24,  24,  24,  24,  24,2696,2704,  88,2712,  24,  24,2720,  56,2728,  56,
-    56,  56,  56,  56,  56,  56,  56,  56,2736,2744,  56,  56,  56,2752,  56,2760,
-    24,  24,  24,  56,2768,  24,  24,2776,  24,  24,  24,  24,  24,  24,  24,  24,
-    72,  72,  72,  40,  40,  40,2784,2792,  48,  48,  48,  48,  48,  48,2800,2808,
-    40,  40,2816,   8,   8,   8,2824,2832,   8, 200, 208, 208, 208, 208,  64,  64,
-  2840,2848,2856,2864,2872,2880,   0,   0,  24,2888,  24,  24,  24,  24,  24, 352,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 272,   0,  24,
-  2896,2904,2912,2920, 312,   8,   8,   8,   8,2928, 536,   8,   8,   8,   8,2936,
-  2944,   8,   8, 312,   8,   8,   8,   8, 120,2952,   8,   8,  24,  24,2960,   8,
-    24, 584, 592,  24,2968, 600,  24,  24, 592,  24,  24, 600,  24,  24,  24,  24,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,  24,  24,  24,  24,
-     8,2976,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8, 152,  24,  24,  24, 608,   8,   8, 552,
-  2984,   8,2992,   0,  48,  48,3000,3008,  48,3016,   8,   8,   8,   8,3024,3032,
-   456,3040,3048,3056,  48,  48,  48,3064,3072,3080,3088,3096,3104,3112,   0,3120,
-  3128,   8,3136,3144,   8,   8,   8,3152,3160,   8,   8,3168,3176,  80,  64,3184,
-   232,   8,3192,   8,3200,3208,   8, 152, 480,   8,   8,3216,3224, 360,3232,3240,
-     8,   8,3248,3256,3264,3272,   8,3280,   8,   8,   8,3288,3296,3304,3312,3320,
-  3328,3336, 208,  40,  40,3344,3352,  40,  40,  40,  40,  40,   8,   8,3360,  80,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 368,   8,3368,   8,   8, 184,
-     8,   8,   8,   8,   8,   8, 112,   8,   8,   8,   8,   8,   8, 192,   0,   0,
-  3376,3384,3392,3400,3408,   8,   8,   8,   8,   8,   8,3416,3424,3432,   8,   8,
-     8,   8,   8,3440,  24,   8,   8,   8,   8,3448,   8,   8,3456,   0,   0,3464,
-    64,3472,  64,3480,3488,3496,3504,3512,   8,   8,   8,   8,   8,   8,   8,3520,
-  3528, 424, 432, 440, 448,3536,3544,3552,   8,3560,   8, 120,3568,3576,3584,3592,
-  3600,   8, 520,3608, 112, 112,   0,   0,   8,   8,   8,   8,   8,   8,   8, 176,
-  3616,  88,  88,3624, 104, 104, 104,3632,3640, 280, 376,   0,   0,  24,  24,3648,
-     0,   0,   0,   0,   0,   0,   0,   0,   8, 152,   8,   8,   8, 248,3656,3664,
-     8,   8,3672,   8,3680,   8,   8,3688,   8,3696,   8,   8,3704,3712,   0,   0,
-    72,  72,3720,  40,  40,   8,   8,   8,   8, 112,  80,  72,  72,3728,  40,3736,
-     8,   8, 616,   8,   8,   8,3744, 624, 624,3752,3760,3768,   8,   8,   8, 368,
-     8,   8,   8, 200,   8, 328, 616,   0,3776,  96,  96,3784,   0,   0,   0,   0,
-  3792,   8,   8,3800,   8,3808,   8,3816,   8, 120,3824,   0,   0,   0,   8,3832,
-     8,3840,   8,3848,   8, 192,   0,   0,   8,   8,   8,3856,  88, 632,  88,  88,
-  3864,3872,   8,3880, 640,3888,   8,3896,   8, 648,   0,   0,3904,   8,3912,3920,
-     8,   8,   8,3928,   8,3936,   8,3944,   8,3952,3960,   0,   0,   0,   0,   0,
-     8,   8,   8,   8, 160,   0,   0,   0,  72,  72,  72,3968,  40,  40,  40,3976,
-     8,   8,3984,  80,3992,  72,4000,  40,4008,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,  88,4016,   8,   8,4024, 656,4032,4040,   0,4048,
-     8, 648,4056,   8, 472,4064,   0,   8,4072,   0,   0,   8,4080,   0,   8, 200,
-  4088,   8,   8,4096,4104, 632,4112,4120, 336,   8,   8,4128,4136,   8, 160,  80,
-  4144,   8,4152,4160,4168,   8,   8,4176, 336,   8,   8,4184,4192,4200, 384,4208,
-     8, 488, 664,4216,4224,   0,   0,   0,4232,4240,4248,   8,   8,4256,4264,  80,
-  4272, 240, 128,4280,4288,4296,4304,4312,4320,   8,   8,4328,4336,4344,4352,   0,
-     8,   8,   8,4360,4368,4376, 656,   0,   8,   8,   8,4384,4392,  80,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   8,   8, 672,4400,4408,4416,   0,   0,
-     8,   8,   8,4424,4432,  80,4440,   0,   8,   8,4448,4456,  80, 288,4464,   0,
-     8,4472,4480,4488, 200,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8, 664,4496,   0,   0,   0,   0,   0,   0,  72,  72,  40,  40, 320,4504,
-  4512,4520,   8,4528,4536,  80,   0,   0,   0,   0,4544,   8,   8,4552,4560,   0,
-  4568,   8,   8,4576,4584,4592,   8,   8,4600,4608,4616,   8,   8,   8,   8, 160,
-  4624,   0,   0,   0,   0,   0,4632,   0,   0,   0,   0,   0,   8,   8,4640,  80,
-   128,   8, 672,4648,4656, 320, 528,4664,   8,4672,4680,4688,   0,   0,   0,   0,
-  4696,   8,   8,4704,4712,  80,4720,   8,4728,4736,  80,   8,   8,4744,  80,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,4752,
-  4760, 256,   8,4768,4776,4784,   0,   0,   0,   0,   0, 248,  88,4792,4800,4808,
-     8,   8,   8,   8,   8,   8,   8,   8,   8, 192,   0,   0,   0,   0,   0,   0,
-   104, 104, 104, 104, 104, 104,4816,4824,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8, 368,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,4832,
-     8,   8,   8, 136,4840,4848,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 176,
-     8,   8,   8,   8, 200,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8, 680,4856,  80,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8, 160,   8, 120, 360,   8,   8,   8,   8, 120,  80,   8, 112,4864,
-     8,   8,   8,4872,4880,4888,4896,4904,   8,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,4912,   8,4920,  80,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,  72,  72,  40,  40,  88,4928,  72,4936,  40,4944,   0,   0,
-     8,   8,   8,   8,4952,4960, 688, 688,4968,4976,   0,   0,   0,   0,4984,4992,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 328,   0,5000,
-     8, 120,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8, 696,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,5008,
-     8,   8, 696,5016,   0,5024,5032,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 184,
-     8,   8,   8,   8,   8,   8, 176, 152, 160,5040,5048,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5056,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5064,  24, 376,  24,5072,
-    64,  64, 544,  64, 704,  24,  24,  24,  24,  24,  24,  24, 352,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 272,
-    24,  24,5080,  24,  24,  24,5088,5096,5104,  24,5112,  24,  24,  24, 576,   0,
-    24,  24,  24,  24,5120,   0,   0,   0,   0,   0,   0,   0,  88, 712,  88, 712,
-    24,  24,  24,  24,  24, 608,  88, 640,   0,   0,   0,   0,   0,   0,   0,   0,
-    72, 296,  40, 720, 728,5128, 168,  72, 392,5136,5144,5152,5160,  72, 296,  40,
-  5168,5176,  40,5184,5192,5200, 736,  72, 744,  40,  72, 296,  40, 720, 728,  40,
-   168,  72, 392, 736,  72, 744,  40,  72, 296,  40,5208,  72,5216,5224,5232,5240,
-    40,5248,  72,5256,5264,5272,5280,  40,5288,  72,5296,  40,5304, 288, 288, 288,
-    64,  64,  64,5312,  64,  64,5320,5328,5336,5344, 464,   0,   0,   0,   0,   0,
-  5352,5360,5368,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5376,5384,5392,  96,  96,  96,5400,   0,5408,   0,   0,   0,   0,   0,   0,   0,
-     8,   8, 152,5416,5424,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   8,5432,   0,   8,   8,5440,5448,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,5456,  80,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8, 680,5464,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8, 120,5472,5480,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,5488, 120,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,5496, 704,   0,   0,
-    72,  72, 392,  40,5504, 360,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0, 384,  88,  88,5512,5520,   0,   0,   0,   0,
-   384,  88,5528,5536,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  5544,   8,5552,5560,5568,5576,5584,5592,5600, 184,5608, 184,   0,   0,   0,5616,
-    24,  24, 216,  24,  24,  24,  24,  24,  24, 352, 584, 400, 400, 400,  24, 272,
-  5624,  24,  24,  24,  24,  24,  24,  24,  24,  24, 408,   0,   0,   0,5632,  24,
-  5640,  24,  24, 216, 752, 760, 272,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5648,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,5656, 280, 280,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24, 264, 216, 376,
-   216,  24,  24,  24, 416, 264,  24,  24, 416,  24, 408, 216, 760,5664,   0,   0,
-    24,  24,  24,  24,  24, 416, 408, 280,5672,  24,  24,  24,5680,5688,5696, 752,
-    24,  24,  24,  24,  24,  24,  24,  24,  24,5704,  24,  24,  24,  24,  24,5712,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   0,   0,
-     8, 112,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 112,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8, 248,   8,
-     8,   8,   8,   8,   8, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     8,   8,   8,   8, 176,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8, 192,   0,   0,   0,   0,   0,   0,   0,   0,
-  5720,   0, 136, 136, 136, 136, 136, 136,   0,   0,   0,   0,   0,   0,   0,   0,
-    64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,  64,   0,
-    16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,  16,5728,
-     0,   0,   0,   0,   0,   0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4,
-     8,   8,   8,   8,   8,   8,   8,   8,  16,  16,  16,  16,  16,  16,  16,  16,
-    20,  20,  20,  20,  20,  20,  20,  20,  12,  12,  12,  12,  12,  12,  12,  12,
-    24,  24,  24,  24,  24,  24,  24,  24,  28,  28,  28,  28,  28,  28,  28,  28,
-    32,  32,  32,  32,  32,  32,  32,  32,  40,  40,  40,  40,  40,  40,  40,  40,
-    48,  48,  48,  48,  48,  48,  48,  48,  52,  52,  52,  52,  52,  52,  52,  52,
-    44,  44,  44,  44,  44,  44,  44,  44,  36,  36,  36,  36,  36,  36,  36,  36,
-    64,  64,  64,  64,  64,  64,  64,  64,  92,  92,  92,  92,  92,  92,  92,  92,
-    84,  84,  84,  84,  84,  84,  84,  84,  80,  80,  80,  80,  80,  80,  80,  80,
-    68,  68,  68,  68,  68,  68,  68,  68,  56,  56,  56,  56,  56,  56,  56,  56,
-    12,  12,  12,  12, 228, 232, 228, 232,  12,  12, 468, 468,  32, 472,  32, 472,
-    32,  32,  32, 692,  12,  12, 696,  12,  56,  56,  56,  56,  56,  56,  56, 700,
-   704,  72, 708,  72,  72,  72, 712,  72,  60,  60,  60,  60,  60,  60,  60,  60,
-   716,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60, 720, 308, 724, 308, 308,
-   728, 732, 236, 236, 736, 236, 740, 744, 748, 752,  36,  36, 756, 760,  36, 764,
-    36,  36,  36,  36,  36, 768,  36,  36, 772, 312, 312, 312, 776,  36,  36,  36,
-   316, 316, 316, 780, 320, 320, 320, 784, 476, 476, 788, 792, 796, 800, 804,  36,
-    36, 808,  36,  36,  36,  36, 812,  36, 112, 112, 112, 112, 112, 816, 820, 112,
-   824, 828, 832, 836, 840, 844, 848, 852, 856, 860, 864, 868, 872, 876, 880, 884,
-   888, 892, 896, 900, 904, 908, 912, 916, 920, 924, 928, 932, 936, 940, 944, 948,
-   952, 956, 960, 964, 968, 972, 976, 980, 984, 988, 992, 996,1000,1004,1008,1012,
-  1016,1020,1024,1028,1032,1036,1040,1044,1048,1052, 324, 324,1056,1060,1064, 324,
-  1068,1072,1076,1080,1084,1088,1092,1096,1100, 328, 328,1104, 328,1108,   0,   0,
-  1112,1116,1120,1124,1128,1132,   0,   0, 128, 128, 128, 128, 480, 128,1136,1140,
-   128, 480, 128, 484, 484,1144,   0,   0,  96,  96,  96,  96,  96,  96,  96,  96,
-    96,  96, 116, 116, 488, 116, 116,1148,  88,  88,  88,  88, 492,1152,  88,  88,
-   492,  88,  88,1156, 496,1160,  88,  88,  88, 496,  88,  88,  88,1164,  88,1168,
-    88,1172, 108, 108, 108, 108, 108,1176,1180,1184, 240, 240, 240, 240,1188,1192,
-  1196,1200,1204,1208,1212,1216,1220,1224, 132, 132, 132, 132, 132,1228, 500, 500,
-  1232,1236, 136, 136, 136, 136, 136,1240, 136, 136,1244,  40,  40,  40,  40,1248,
-  1252,1256, 504, 504,1260,1264,1268,1272, 332, 332,1276, 332,1280,1284, 132, 132,
-  1288,1292, 244, 244, 244,1296, 244,1300, 508, 508,1304,  56,  56, 512,1308,   0,
-   140, 140, 140, 140,1312, 140, 140, 140, 248, 248, 248, 248, 336, 336, 336,1316,
-   340, 340, 340,1320,1324, 344, 344, 344,1328, 116, 116,1332,1336,1340,1344,1348,
-    32,  32,1352,  32,  32,1356,1360,1364,  32,  32,  32,1368,  56,  56,  56,  56,
-    72, 516,  72,  72, 516,1372,  72,1376,  72,  72,  72, 520, 520,1380,  72,1384,
-  1388,  12,  12,  12,  12,  12, 524,1392, 528, 532,  12,  12, 348,  56,  56,1396,
-    12,  12,1400,1404,1408,  12,  32,  32,1412,  12,  12,  12,  12,  12,  12,  12,
-    12,  12, 176,   0, 352,   0,  12,  12,  12,  12,  12,  12,  12,  12,  12,1416,
-   148, 148, 148, 148, 148, 148,  32,  32, 144, 144, 144, 144, 144, 144, 144,1420,
-   116, 116, 488, 356, 356, 356,1424,1428,  88,1432, 180, 180, 180, 180,  60,  60,
-    12,  12,  12,  12,  12, 184,   0,   0,   4,1436,   4,   4,   4,   4,   4,1440,
-     4,   4,   4,   4,   4,1444,   0,  12,1448,  12,1452,1456,1460,  76,  76,  76,
-    76,1464, 536, 100, 100, 100, 100,1468,1472, 252, 252,1476,   8,   8,   8,   8,
-   360,  12, 252, 252,  12,  12,1480, 100,   8, 360,  12,  12,  12,  12,   8,1484,
-    12,  12,  12,  12,  12, 100, 100,1488, 100, 100, 100, 100, 100,1492,  12,  12,
-     4,   4,   4,   4,  12,  12,  12,  12,1496,  24,  24,  24,1500, 364, 364, 364,
-    84,  84,1504,   0,  60,  60,  60,  60,  60,  60,  44,  44,  44,  44,  44,1508,
-    12,  12,1512,  32,  32,  32,  32,  32,1516,  32,  32,  32,  32, 532,   0,1520,
-   540, 540,1524, 176, 368, 368, 368,1528, 256, 256, 256, 256,1532,1536, 112, 112,
-   544, 544,1540, 548, 548,1544,   8,1548, 260, 260, 260, 260,1552,1556,  96,1560,
-   372, 372, 372,1564,1568,1572,  96,  96, 264, 264, 264, 264,1576,1580, 376,1584,
-  1588,1592, 180,  32,  32,1596,1600, 108, 108, 108, 108, 108, 376, 376,1604,1608,
-     8,   8,1612,   8,1616,   8,   8,1620,   4,   4,   4,   4,   4,   4, 188,   4,
-     4,   4,   4,   4,   4, 552,   0,   0,1624,1628, 236,1632,1636,  36,  36,  36,
-    36,  36,  36,1640,  36,  36,  36,  36,  36,  36,  36,  36,  36,   0,   0,  36,
-    56, 176,1644,  12,  12, 556,1648,1652,  36,  36,  36,  36,  36,  36,  36,1656,
-   152,  12, 228, 232, 228, 232,1660, 536, 100,1664,   8, 360,1668,1672,1676,1680,
-  1684, 120,1688,1692, 560, 560,   0,   0, 120, 120, 120, 120, 120, 120, 120,1696,
-  1700,  12,  12,1704,  72,  72,  72,  72,1708, 192,1712,   0,   0,  12,  12,1716,
-  1720,1724, 380, 380, 380,1728,1732, 156, 564, 564,1736,1740,1744, 568, 568,1748,
-  1752,1756, 572, 572,1760,1764,   0,   0, 196, 196, 196, 196, 196, 384, 384, 384,
-  1768,1772,1776, 388, 388,1780, 388,1784, 576, 576,1788, 392, 392, 392,1792, 580,
-   580,1796,1800,1804, 396, 396, 396,1808,  80,  80,  80,1812,  80,1816,1820,   0,
-  1824,  32,  32,1828,   0,   0,   0,   0,1832, 584, 584,1836,1840,1844, 588, 588,
-  1848,1852,1856,   0,   0,   0,1860,1864,1868,1872,1876,1880,1884,1888,   0,   0,
-   592, 592, 268,1892, 268,1896, 268, 268,1900,1904,1908,1912, 596, 596, 600, 600,
-   604, 604,   0,   0, 608, 608,1916,1920, 400, 400, 400,1924,1928,1932,1936,1940,
-  1944,1948,1952,   0,   0,   0,   0,   0, 272, 272, 272, 272,1956,   0,   0,   0,
-   160, 160, 160,1960, 160, 160, 160,1964, 612, 612,1968,1972, 404, 404,1976, 404,
-  1980,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  36,1984,
-   616, 616,1988,1992,1996,2000,   0,2004, 620, 620,2008, 624, 624,2012,   0,2016,
-  2020,   0,   0,2024,2028,   0,2032,2036, 200, 200, 200, 200,2040,2044, 200,2048,
-   276, 276, 276, 276,2052,2056,2060,2064, 408, 408, 408,2068,2072, 628, 628,2076,
-   164, 164, 164, 164, 164, 164,2080,2084, 412,2088, 412, 412,2092,   0,   0,   0,
-  2096,2100,2104, 416, 416, 416,2108,2112,2116,2120,2124,2128,2132,2136,2140,2144,
-  2148, 632, 632,2152,2156,2160,2164,   0, 204, 204, 204, 204, 204,2168,2172,   0,
-   280, 280, 280, 280,2176,2180,   0,   0, 284, 284, 284,2184, 284,2188,   0,   0,
-   288, 288, 288, 288,2192,2196,2200,   0, 420, 420, 420, 636, 636,  96,2204,   0,
-   640,2208,2212, 640,2216,   0,   0,   0, 424, 424, 424,2220,   0,   0,   0,   0,
-     0,   0, 208, 208, 208, 208, 208,2224,2228,2232,2236,2240,2244,2248,   0,   0,
-     0,   0, 644, 648, 648, 644,2252,   0, 292, 292, 292, 292,2256, 212, 212, 212,
-   212, 212,2260,  40, 428, 428, 428,2264,2268,   0,   0,   0,   0,   0,2272,   0,
-     0,   0,   0,   0, 652, 652,2276,2280,2284, 432, 432,2288,2292, 432,2296, 656,
-   656,2300,2304,2308,   0,   0,   0,   0,2312, 660, 660,2316,2320,2324,2328,2332,
-  2336,2340,2344, 664, 664,2348,2352,   0,   0,   0,   0,   0,   0,   0,2356,2360,
-   436,2364, 436,2368, 436,2372,   0,   0,   0,   0,   0,2376, 440, 440, 440,2380,
-    28,2384,   0,   0,   0,   0,   0,   0,  28,  28,  28,  28,  28,  28,2388,2392,
-    28,  28,  28,  28,2396,   0,   0,   0,   0, 168, 168, 168, 168, 168, 168,2400,
-    20,  20,  20,  20,  20,2404,  20,  20,  20,  20,  20,  20,  20,  20,  20,2408,
-    52,  52,  52,  52,2412,   0,   0,   0, 444, 444, 444,2416,   0,   0,   0,   0,
-    44,  44,  44,2420,2424,2428,2432, 296, 296, 296, 296,2436,2440,2444,2448,2452,
-   216, 216, 216, 216,2456,2460,2464,2468, 216,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 448, 448, 448,2472,   0,   0,   0,   0, 220, 220, 220, 220,
-   220,2476, 668,2480, 668,2484,   0,   0, 124, 124, 124, 124,2488, 124, 124, 124,
-  2492, 124,   0,   0,   0,   0,2496,2500,  64,  64,  64,  64,  64,2504,   0,2508,
-    16,2512,   0,   0,   0,   0,   0,   0,  16,  16,  16,  16,  16,  16,  16,2516,
-     0,   0,   0,   0,   0,   0,   0,2520,2524,  76,  76,  76,  76,  76,  76,  76,
-    76,  76,  76,  76,  76,  76,  76,  76,  76,  76,2528,2532,   0,2536,2540,  68,
-    68,  68,  68,  68,  68,  68,  68,2544, 172, 172, 172, 172, 172, 172,2548,2552,
-  2556,2560, 224,   0,   0,   0,   0,   0,  12,  12,  12,  12,  12,  12,  12, 192,
-    12,  12,  12,2564,  12, 452,  12, 452,  56,  56, 512,  56,2568,  12,  12,  12,
-    12,  12,  12,  12, 224,   0,   0,   0,  12,  12,  12,  12,  12,  12,  12, 456,
-    12,  12,2572,  12,  12,  12,2576,2580,2584,  12,2588,  12,  12,  12, 352,   0,
-    72,  72,  72,  72,2592,   0,   0,   0,   0,   0,   0,   0,  12, 224,  12, 224,
-    12,  12,  12,  12,  12,2596,  12, 300,  12,  12,  12,  12,  12, 524,  12,  12,
-    12,2600,2604,2608,2612,  12,  12,  12,2616,2620,  12,2624,2628,2632,  12,  12,
-    12,  12,2636,  12,  12,  12,  12,  12,  12,  12,  12,  12,2640,  12,  12,  12,
-  2644,2648,2652,   0,   0,   0,   0,   0,  32,2656,2660,   0,   0,   0,   0,   0,
-  2664,2668,2672,  60,  60,  60,2676,   0,2680,   0,   0,   0,   0,   0,   0,   0,
-   672, 672,2684,2688,2692,   0,   0,   0,   0,2696,2700,   0, 460, 460, 460,2704,
-     0,   0,   0,   0,   0, 676, 676,2708,   0,   0,   0,   0,   0, 680, 680,2712,
-     0,   0,   0,   0, 684,2716, 684,2720,   0,   0,   0,   0,   0,   0,2724,2728,
-   104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,2732,2736,   0,   0,
-   304, 304, 304, 304,2740,2744,   0,   0,   0,   0,   0,   0,   0,   0,   0, 152,
-    12,  12,  12,2748,   0,   0,   0,   0, 152,  12,  12, 184,   0,   0,   0,   0,
-  2752,  36,2756,2760,2764,2768,2772,2776,2780, 688,2784, 688,   0,   0,   0,2788,
-    12,  12, 156,  12,  12,  12,  12,  12,  12, 224, 528, 152, 152, 152,  12, 456,
-    12,  12, 184,   0,   0,   0,2792,  12,2796,  12,  12, 156, 300, 348, 456,   0,
-    12,  12,  12,  12,  12,2800, 192, 192,  12,  12,  12,  12,  12, 176, 156, 452,
-   156,  12,  12,  12, 464, 176,  12,  12, 464,  12, 184, 156, 348, 300,   0,   0,
-    12,  12,  12,  12,  12, 464, 184, 192,2804,  12,  12,  12,2808,2812,2816, 300,
-    12, 556,  12,  12,  12,  12,  12, 352,   4,   4,   4,   4,   4,   4,   0,   0,
-     4, 188,   4,   4,   4,   4,   4,   4,   4,   4, 188,   4,   4,   4,   4,   4,
-     4,   4,   4,   4,   4,   4,2820,   4,   4,   4,   4,   4,   4, 188,   0,   0,
-     4, 188,   0,   0,   0,   0,   0,   0,   4,   4,   4,   4,2824,   4,   4,   4,
-     4,   4,   4,   4,   4,   4,   4, 552,2828,   0,  12,  12,  12,  12,  12,  12,
-     0,   0,   0,   0,   4,   4,   4,   4,   8,   8,   8,   8,  12,  12,  12,  12,
-    16,  16,  16,  16,  20,  20,  20,  20,  36,  36,  36,  36,  32,  32,  32,  32,
-    24,  24,  24,  24,  28,  28,  28,  28,  40,  40,  40,  40,  48,  48,  48,  48,
-    44,  44,  44,  44,  56,  56,  56,  56,  52,  52,  52,  52,  60,  60,  60,  60,
-    64,  64,  64,  64,  76,  76,  76,  76,  68,  68,  68,  68,  80,  80,  80,  80,
-    84,  84,  84,  84,  88,  88,  88,  88,  72,  72,  72,  72,  96,  96,  96,  96,
-   100, 100, 100, 100,  92,  92,  92,  92, 104, 104, 104, 104, 116, 116, 116, 116,
-   120, 120, 120, 120, 124, 124, 124, 124, 108, 108, 108, 108, 132, 132, 132, 132,
-   112, 112, 112, 112, 136, 136, 136, 136, 128, 128, 128, 128, 148, 148, 148, 148,
-   144, 144, 144, 144, 152, 152, 152, 152, 452,  12,  12,  12,  12,  12,  12,   0,
-   180, 180, 180, 180, 176, 176, 176, 176, 184, 184, 184, 184, 140, 140, 140, 140,
-    12,  12, 264,   0,  72, 232,  72, 232,  12,  12,  12, 264,   4,   4,   4, 600,
-    12,  12,  12, 364, 240, 240, 240, 240, 168, 168, 168, 168, 188, 188, 188, 188,
-   248, 248, 248, 248, 252, 252, 252, 252, 160, 160, 160, 160, 204, 204, 204, 204,
-    12,   0,   0,   0, 764,  24,  24,  24,  24,  24, 628,  12, 164, 164, 164, 164,
-   236, 236, 236, 236, 156, 156, 156, 156, 292, 292, 292, 292, 300, 300, 300, 300,
-   268, 268, 268, 268, 208, 208, 208, 208, 324, 324, 324, 324, 192, 192, 192, 192,
-   312, 312, 312, 312, 344, 344, 344, 344, 244, 244, 244, 244, 196, 196, 196, 196,
-   276, 276, 276, 276, 316, 316, 316, 316, 212, 212, 212, 212,  12,  12, 364,   0,
-   216, 216, 216, 216, 220, 220, 220, 220, 256, 256, 256, 256, 476, 476, 476, 476,
-   396, 396, 396, 396, 172, 172, 172, 172, 228, 228, 228, 228, 260, 260, 260, 260,
-   408, 408, 408, 408, 320, 320, 320, 320, 480, 480, 480, 480, 264,   0,   0,   0,
-    12,  12, 296,   0, 412, 412, 412, 412,   8,   8,   8, 812, 484, 484, 484, 484,
-   416, 416, 416, 416, 272, 272, 272, 272, 304, 304, 304, 304, 488, 488, 488, 488,
-   496, 496, 496, 496, 308, 308, 308, 308, 456, 456, 456, 456, 460, 460, 460, 460,
-   420, 420, 420, 420, 368, 368, 368, 368, 328, 328, 328, 328, 372, 372, 372, 372,
-   348, 348, 348, 348, 352, 352, 352, 352, 380, 380, 380, 380, 432, 432, 432, 432,
-   200, 200, 200, 200, 280, 280, 280, 280, 284, 284, 284, 284, 436, 436, 436, 436,
-   440, 440, 440, 440, 364,   0,   0,   0,  12, 264,   0,   0, 444, 444, 444, 444,
-    12,  12,   0,   0,  12,  12, 768,  12,  24, 628,  24,  24, 400, 400, 400, 400,
-   112, 112, 892, 112, 112, 112, 112,1048, 124,1052,   0,1056,  72,  72, 684, 636,
-   684, 636,  72,  72, 136, 136, 900,   0, 340, 340, 340,   0, 156, 156, 904,   0,
-    52,  52,  52,1072,  68, 688,  68, 688,  68, 772,  68,  68,  12, 648,  12,  12,
-    12,  12,  12, 296,  24,  24,  24,1092, 916,  92,  92,  92, 520, 520, 520, 520,
-   524, 524, 524, 524, 572, 572, 572, 572,   4,   4, 600,   0, 296,  12,  12,  12,
-   108, 108, 108,1132, 576, 576, 576, 576, 536, 536, 536, 536, 492, 492, 492, 492,
-   540, 540, 540, 540, 500, 500, 924, 500, 528, 528, 528, 528, 604, 604, 604, 604,
-   608, 608, 608, 608, 464, 464,1144,   0, 612, 612, 612, 612, 616, 616, 616, 616,
-   532, 532, 532, 532, 504, 504, 504, 504, 544, 544, 544, 544, 548, 548, 548, 548,
-   552, 552, 552, 552, 588, 588, 588, 588, 376, 376, 376, 376, 352, 352,1188,   0,
-   424, 424, 424, 424, 384, 384,1200, 384, 384, 384, 384, 384, 556, 556, 556, 556,
-   388, 388, 388, 388, 392, 392, 392, 392, 472, 472, 472, 472, 512, 512, 512, 512,
-   356, 356, 356, 356, 560, 560, 560, 560, 564, 564, 564, 564, 516, 516, 516, 516,
-    28,  28,  28,   0,  24,  24, 840,  12,  24, 840,1264,  12,  68,1268, 844,1272,
-     0,1276, 848, 772,1280,  68,  68,  68,1284, 144, 144, 144,  60,1288,  60,  60,
-   852, 220, 220, 220, 220, 952, 852, 220, 220, 220, 952, 852, 956, 164, 164, 164,
-   164, 164,   0,   0, 164, 164, 960,1292, 164,1296,   0,   0,  28, 964,  28, 968,
-    28,  28, 972, 972, 968,  28,1300,  52,  52,1304,  28,  28,1308,  28,  28,  28,
-    28,  28,  28, 964, 256, 256, 256,1312, 256, 256, 976,1316,1320,   0,   0,   0,
-   396, 396,1324,1328, 400, 400, 400,1332, 400, 400, 400,1336, 632, 632, 632, 632,
-   632, 632, 632,1340, 256, 256, 976,   0, 980, 984,  28,  28,1344,  28,  28,  28,
-  1348,1352, 120, 120, 120,1356, 120, 120, 332,1360, 332, 776, 776, 332, 332, 332,
-   332, 332,1364, 332,1368, 988,1372, 332, 332, 776, 776, 992,   0,1376,   0,1380,
-   332, 988, 332, 332, 332, 332, 332, 992, 856, 856, 860, 996,1000, 568, 568, 568,
-   568, 568, 864, 568, 864,1384,1004, 864, 860, 996,1000,1004,1388,   0, 856,1392,
-     0,1396, 568, 568, 568, 860,   0,   0, 780, 780, 448, 784, 784, 448, 448, 448,
-   448, 448,1008, 448,1008, 780, 868, 448, 448, 784, 784, 868,1400,   0,   0,   0,
-   448,1404, 448, 448, 868,   0, 780, 448, 788, 788, 404, 792, 792, 404, 404, 404,
-   404, 404,1012, 404,1012, 788,1016, 404, 404, 792, 792,1016,   0, 788,   0,1408,
-   404,1412, 404, 404, 404, 404,   0,   0, 680,1416, 796, 680, 872, 800,1420, 872,
-   876,1020, 796, 680, 284, 284, 800, 680, 796, 680, 872, 800,1020, 876,   0,   0,
-     0, 680, 284, 284, 284, 284, 796,   0, 288, 288, 288, 728, 728, 288, 288, 288,
-   288, 288, 728, 288, 288, 288, 880, 288, 288, 728, 728, 880,   0,1424,1428, 880,
-   288,1432, 288, 288,   0,1436, 288, 288, 360, 360, 360, 732, 732, 360, 360, 360,
-   360, 360, 732, 360, 360,1024,1028, 360, 360, 732, 732,1028,   0,1440,   0,1444,
-   360,1448, 360, 360,1024,   0,   0,   0, 172, 172, 172, 804, 804, 172, 172, 172,
-   172, 804, 804, 172,   0, 172, 172, 172, 172,1452, 172, 172, 884, 884, 224, 224,
-   224,1032, 888, 224, 224, 224, 224, 224,1456, 224, 224,1460, 224,1032,1464,1468,
-   224,1472, 224, 224,   0, 888, 224, 224, 888,1036,   0,   0,1476, 228, 228, 228,
-   228, 228,1480, 736, 228, 228, 228,   0,1484,1488,1040, 336, 336, 336, 336, 336,
-   336,1492, 336, 336, 336, 336, 336,1044, 336,1496, 336,1040, 336, 336,1044, 336,
-   112, 112, 112,1500, 892, 112, 112, 112, 112,1504,1508,   0, 124, 124,1512, 124,
-    72, 232, 684, 636, 684, 636,  72, 232,  72, 232,  72,  72,  72,  72, 232, 808,
-    72,  72,  72,1516,  72,  72, 636,   0, 116,1060, 116,1060, 640, 640, 640, 640,
-   640, 640, 640,1520, 236, 236,1524,1528, 236, 236,1532,   0, 740, 740, 740, 740,
-   740,1536,   0,1540, 744, 744, 744, 744, 744,1544,   0,   0, 748, 748, 748, 748,
-   748,   0,   0,   0, 896, 896, 896,1064,1064,   0,   0,   0, 136, 136, 136, 900,
-  1548,1552, 128, 128, 128, 128,1556,   0, 128, 128,1068,   0, 128, 128,1560,   0,
-    40,1564,   0,   0, 340, 340, 340, 340, 340, 340, 340,1568,1572, 340, 340, 340,
-   596, 596, 596, 596, 596, 596, 596,1576, 596,1580,   0,   0, 260, 260, 260,   0,
-   260, 260,1584,   0, 260, 260,1588,1592, 644, 644, 644, 644, 644, 644, 644,1596,
-   156, 156, 156,1600, 156, 156, 156,1604, 156, 156, 156, 904,  52,  52,  52,   0,
-   148, 148, 148,1608, 408,   0,   0, 408, 320, 320,1612, 320, 320, 320,1616,1620,
-    60,  60,1624,   0, 124, 124,1628,1632, 292, 292,   0,   0,1076,  52,  52,  52,
-  1636,  52, 908,1640,  12, 908,1644,   0,  24,1080,1648,  24,  24,  24,  24,1652,
-  1656,1080,1660,  24,  24,  24,1664,  24,  24,  24,  24,1668,  68,  68,1084,1084,
-    68,  68,  68, 688,  68, 844,  68,1672, 844, 772,  68, 848,  12,  12,  12, 912,
-  1676,  12,  12,1088,1680,   0,   0,   0,  12,1684,1096,  12, 768,  12,  12,  12,
-    12,  12,  12, 768,  24,  24, 840,   0,  12, 692,  12,  12, 144,   0,1688, 144,
-   412, 412,   0,1100,1692,   0,   0,1100,  72, 232,   0,   0,   4,   4,1696,   4,
-     4,   0,   0,   0,   4, 600,   0,   0,  12,1700,  12,  12,1704,   4,1708,1712,
-    12,  12,   4,  12,1716,  80,  80,  80,  80,1104,1720,1724,  92,  92,1108, 916,
-     0,1728, 300, 300,1732,   8,   8,   8,  12, 264,   0, 736,   8,   8,   8,1736,
-    92,  92,  92,1108,  92,  92,  12,  12,  36,  36,  36,1740,  36,1744,   0,   0,
-    88,  88,  88,   0,  48,  48,   0,   0,1096,  24,  24,  24,  24,  24,1088,  24,
-  1112,  24,  24,  24, 520, 520, 520,1748, 416, 416,   0,   0, 268,1116,   0,1752,
-   268, 268,1116,   0, 524, 524, 524,1756, 572,   0,   0,1760,   8,   8,   8,1120,
-   208, 208, 208,1764, 208, 208,1768,1772, 100, 100, 100,1776, 272,1780,   0,   0,
-   272, 272, 272,1124, 272, 272,1124, 272,1784,   0,   0,   0,   0,   0,1788, 324,
-   304,1792,   0,   0, 808, 232, 808, 232, 808, 232,   0,   0,  24,  24, 628,  24,
-    24,1796,1800,   0, 304, 304, 304,1128, 304, 304,1128,   0,   8,   0,   0,   0,
-     8, 812,1804,   8,   8,   8,   8,   0,  24, 816,   0,   0,1808, 220,   0, 956,
-   164, 960, 164,1812,1816,1820, 164, 164,  28,  28,  28,1824,  52,  52,  52,1828,
-    12, 296,  12,   0,  28,1832,  28,  28,  28,  28,  28,1836,  12,1840,  92,  92,
-    92,  92,  92,1844, 820,   8, 820,   8, 820,   8, 820,1120,  12, 296,  12, 296,
-     0,   0, 452, 264, 108, 108, 108,1848, 108, 920, 108, 108, 108, 108, 920,1852,
-   108, 108, 920,   0, 296, 736,  12,  12,  12, 736,  12,  12,  68,  68,  68, 848,
-  1856,   0,   0,   0,  12,  12,  12,1860, 652, 652, 652, 652, 652, 652, 652,1864,
-  1868,   0,   0,   0, 908,  12,  12,  12, 576,   0,   0,1872, 696, 696, 696, 696,
-   696, 696,1876,   0, 536, 536,1880,   0, 656, 656, 656, 656, 656, 656, 656,1884,
-   492,   0, 492, 492, 492,1888,   0,   0, 580, 580, 580, 580, 580, 580, 580,1136,
-   580, 580,1136,   0, 308,   0, 308, 308, 308, 308, 308,   0, 540, 540,   0,   0,
-   456,   0,   0,1892, 924, 824, 500, 500, 824, 500, 500, 500, 824, 500, 824,1896,
-   460,   0,   0,   0,  84,1900,   0,   0,  84,1904,   0,   0,  84,  84,   0,   0,
-    24,1908,  24,  24,1912,  24, 816,   0, 528,1916,1920, 528, 528,1924,1928,1932,
-   660, 660, 660, 660, 660,1936, 660, 660, 584, 584, 584, 584, 584, 584, 584,1940,
-     0,1944, 584, 584, 752, 752, 752, 752,1948,1952,1956, 752, 664, 664, 664, 664,
-   664, 664, 664,1960, 700, 700, 700, 700, 700, 700,1964,1968, 704, 704, 704, 704,
-   704, 704,1972,   0, 192, 192,   0, 192,1976, 192, 192, 192, 464,1980,   0, 464,
-   464,1140,1140, 464, 464, 464, 464, 464, 464,1984,1988,1992, 532,1148,1996, 532,
-   532,1148,   0,   0, 420,2000,2004, 420, 668, 668, 668, 668, 668,2008, 668, 668,
-   708, 708, 708, 708,2012,   0, 708, 708, 756, 756, 756, 756,2016,   0,1152,2020,
-     0,   0,1152, 756, 312, 312,2024,   0,1156,   0,   0,   0,1156,   0,2028, 180,
-   504, 504,   0,   0, 504, 504,2032,   0, 368,1160,2036, 368, 368,1160,   0,2040,
-    28,  28,  28, 828, 544, 544,2044,1164,1164,   0,   0,   0,1168,  28,   0,   0,
-    28,  28,2048,   0,   0,   0,1168,  28, 548, 548,   0,   0, 552, 552,2052,   0,
-   712, 712, 712, 712, 712, 712,2056,   0, 672, 672, 672, 672, 672, 672, 672,   0,
-   760, 760, 760, 760, 760,2060,   0,   0, 168, 168, 168,1172,2064, 168, 168, 168,
-   168,1172,   0,2068,2072,   0,   0,2076, 620, 620, 620, 620, 620, 620,2080,   0,
-   620, 620,2084,   0, 328,2088, 328, 328, 328, 328,   0,   0, 588,2092,   0,   0,
-   884, 224, 224, 224, 224,1036,   0,   0,2096, 372, 372, 372,2100,   0,   0,   0,
-   716,2104,2108,1176, 716, 716, 716,1176, 716, 716,2112,   0, 348, 348,2116,   0,
-   348, 348,2120,   0, 468, 928, 468, 832, 832, 468, 468, 468, 468, 468,1180, 468,
-  1180, 928,2124, 468, 468, 832, 832,2128, 932,2132,   0, 928, 468,2136, 468, 932,
-   468, 932,   0,   0, 376, 376, 936,2140, 376, 936, 376, 376,2144,2148,2152, 376,
-   376, 936,2156,   0,2160,   0,   0,   0, 188, 188, 188,2164,2168,   0,   0,   0,
-   244, 244,   0,   0, 244, 244,2172,   0, 196,1184, 196, 196, 196, 196, 196,1184,
-   276,2176,   0,   0, 276, 276,2180,   0, 128, 128, 128,1068, 100,   0,   0,   0,
-   424, 424,1192,2184, 424, 424, 424,   0, 424,1192,   0,   0, 380, 380, 380,   0,
-  2188,   0,   0,2192, 428,1196,2196, 428, 428,2200, 428, 428, 428, 428, 428, 428,
-   428,2204,2208, 428, 428,1196,   0,   0, 428, 428,2212,   0, 384,2216,   0,   0,
-   316, 316,   0,   0,2220,   0,   0,   0, 432, 432,2224,   0, 120, 120,2228,   0,
-   176, 176,   0,   0,1204,   0,   0,   0, 556, 556,1204,   0, 200, 200,2232, 200,
-   200,2236, 200, 200, 200,2240,   0,   0, 200, 200, 200,2244,2248, 388, 388, 388,
-   388, 388,2252, 388, 388,2256,   0,   0, 392,1208,1212, 392, 392,1208,2260,1212,
-   392, 392,   0,   0, 392, 392,2264,   0, 508,1216,2268, 508, 508, 508, 508, 508,
-   508, 508, 508,2272,1216, 508,2276,   0, 508, 508,2280,   0, 472, 472, 472,   0,
-   472, 472,2284,   0, 720, 720, 720, 720, 720, 720,2288,   0,2292, 280, 280, 280,
-   280, 280,1220,2296, 280, 280,1220,   0,2300,   0,   0,   0, 800,   0,   0, 876,
-    32,  32,2304,   0,  32,  32,  32,2308,  32,2312,   0,   0,  32,   0,   0,   0,
-  2316,   0,   0,   0,  20,2320,   0,   0,  20,  20,2324,   0,  56,2328,   0,   0,
-   436, 436,2332,   0,  48,  48,2336,   0, 592, 592, 592, 592, 592, 592, 592,2340,
-   592, 592,2344,2348, 212, 212, 212,2352, 212, 212,2356,   0, 624, 624, 624, 624,
-   624, 624, 624,1224, 624,1224,   0,   0, 160,2360,   0,   0, 160, 160,1228, 160,
-  1228, 160, 160, 160, 160, 160,   0,2364, 440, 440,2368,   0, 204, 204,2372,   0,
-   512, 512,2376, 512, 512,   0,   0,   0, 132, 132,2380,1232, 132, 132,   0,1232,
-  2384,2388,   0,   0,   4,1236,   0,   0,  64,2392,   0,   0,   0,   0,   0,2396,
-    16,  16,  16,1240,1240,   0,   0,   0,  92,2400,  92,2404,2408,  80,  80,  80,
-  2412,   0,   0,   0,2416,   0,   0,   0,1104,2420,   0,   0,   0,  92,   0,   0,
-    76,  76,  76,   0, 140, 140,2424,   0, 140, 140, 140,1244, 140, 140,1244,   0,
-   140, 140,2428, 140,  12,   0, 692,  12,  52,2432,   0,   0,  12, 296, 452,  12,
-    12,1248, 912,  12,  12,  12,1248,  52,1076,2436,  52,  12,  12,  12,2440, 912,
-    68, 688,   0,   0,  12, 296,   0,   0,  12,  12,  12, 648,2444,2448, 452, 648,
-    12,  12, 940, 452,  12, 452,  12,  12,  12, 940, 296, 452,  12, 648,  12, 648,
-    12,  12, 940, 296,  12,2452, 692,  12, 648,  12,  12,  12,  12, 264,  12,  12,
-    12,  12,  12, 692,  44,  44,  44,   0,   0,   0,2456,  44,2460,  44,  44,  44,
-    24,  24,  24, 816,   0,1112, 816,   0, 152,1252, 152, 152, 152, 152,2464, 152,
-  2468,2472,1252,   0,  60,  60,  60,2476,   0,   0,   0,2480, 356, 356, 356,2484,
-   356, 356, 356,1256, 356, 356,1256,2488, 676, 676, 676, 676, 676, 676, 676,2492,
-   444, 444,2496,2500, 560, 560,2504,   0, 564, 564,2508,2512, 516, 516, 516,2516,
-   516,2520,   0,2524,  72, 232,  72,2528,  72,  72,  72, 232, 104,2532, 104, 104,
-   104,2536,   0,   0, 216, 216, 216,   0, 216, 216,2540,2544,  12, 364,   0,   0,
-    28, 724,  28,  28, 944, 948, 724,  28, 828,  28, 836,   0,2548, 984, 836, 724,
-   944, 948, 836, 836, 944, 948, 828,  28, 828,  28, 724,2552,  28,  28,1260,  28,
-   724, 724,1260,  28, 980,   0,   0,   0,   0, 692,  12,  12,2556,   0,   0,   0,
-    12,  12, 364,  12,  12,  12, 296, 692,  12, 296, 364, 452,  12,  12,  12,2560,
-    12,  12, 296, 736,2564,   0,   0,   0,   4,   4,1236,   0,2568,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 939, 940, 941,
-   942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,   0,1033,1040,
-  1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,1124,1125,1126,
-  1127,1131,1133,   0,1147,1154,1155,1156,1161,1187,1188,1189,1193,   0,1219,1226,
-  1227,1228,1229,1233,   0,   0,1267,1268,1269,1273,1298,   0,1303, 943,1128, 944,
-  1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149,   0,   0, 973,
-  1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175, 991,1176, 993,
-  1178, 994,1179,   0,   0,1004,1190,1005,1191,1006,1192,1014,1199,1007,   0,   0,
-     0,1016,1201,1020,1206,   0,1022,1208,1025,1211,1023,1209,   0,   0,   0,   0,
-  1032,1218,1037,1223,1035,1221,   0,   0,   0,1044,1230,1045,1231,1049,1235,   0,
-     0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,1069,1255,1077,
-  1264,1074,1261,   0,   0,1083,1270,1084,1271,1085,1272,1088,1275,1089,1276,1096,
-  1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310,   0,1053,1239,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1093,1280,   0,   0,
+     0,   0,   0,   0,   0, 949,1134,1010,1195,1050,1236,1090,1277,1341,1368,1340,
+  1367,1342,1369,1339,1366,   0,1320,1347,1418,1419,1323,1350,   0,   0, 992,1177,
+  1018,1204,1055,1241,1416,1417,1415,1424,1202,   0,   0,   0, 987,1172,   0,   0,
+  1031,1217,1321,1348,1322,1349,1338,1365, 950,1135, 951,1136, 979,1164, 980,1165,
+  1011,1196,1012,1197,1051,1237,1052,1238,1061,1247,1062,1248,1091,1278,1092,1279,
+  1071,1257,1076,1263,   0,   0, 997,1182,   0,   0,   0,   0,   0,   0, 945,1130,
+   982,1167,1337,1364,1335,1362,1046,1232,1422,1423,1113,1301,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   8,   9,   0,  10,1425,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   7,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,1314,1427,   5,
+  1434,1438,1443,   0,1450,   0,1455,1461,1514,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 949,1134,1010,1195,1050,1236,
-  1090,1277,1341,1368,1340,1367,1342,1369,1339,1366,   0,1320,1347,1418,1419,1323,
-  1350,   0,   0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,1202,   0,   0,
-     0, 987,1172,   0,   0,1031,1217,1321,1348,1322,1349,1338,1365, 950,1135, 951,
-  1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,1061,1247,1062,
-  1248,1091,1278,1092,1279,1071,1257,1076,1263,   0,   0, 997,1182,   0,   0,   0,
-     0,   0,   0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,1422,1423,1113,
-  1301,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,   9,   0,
-    10,1425,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,1314,1427,   5,1434,1438,1443,   0,1450,   0,1455,1461,1514,   0,   0,
+     0,   0,1446,1458,1468,1476,1480,1486,1517,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1446,1458,1468,1476,1480,1486,1517,   0,   0,
+     0,   0,1489,1503,1494,1500,1508,   0,   0,   0,   0,1520,1521,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1526,1528,   0,1525,   0,   0,   0,1522,
+     0,   0,   0,   0,1536,1532,1539,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1534,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1556,   0,   0,   0,   0,   0,   0,1548,1550,   0,1547,   0,   0,   0,1567,
+     0,   0,   0,   0,1558,1554,1561,   0,   0,   0,   0,   0,   0,   0,1568,1569,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1529,1551,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1523,1545,1524,1546,   0,   0,1527,1549,
+     0,   0,1570,1571,1530,1552,1531,1553,   0,   0,1533,1555,1535,1557,1537,1559,
+     0,   0,1572,1573,1544,1566,1538,1560,1540,1562,1541,1563,1542,1564,   0,   0,
+  1543,1565,   0,   0,   0,   0,   0,   0,   0,   0,1606,1607,1609,1608,1610,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1613,   0,1611,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1612,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1489,1503,1494,1500,1508,   0,   0,   0,   0,
-  1520,1521,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1526,1528,   0,
-  1525,   0,   0,   0,1522,   0,   0,   0,   0,1536,1532,1539,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1534,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1556,   0,   0,   0,   0,   0,   0,1548,1550,   0,
-  1547,   0,   0,   0,1567,   0,   0,   0,   0,1558,1554,1561,   0,   0,   0,   0,
-     0,   0,   0,1568,1569,   0,   0,   0,   0,   0,   0,   0,   0,   0,1529,1551,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1523,1545,1524,
-  1546,   0,   0,1527,1549,   0,   0,1570,1571,1530,1552,1531,1553,   0,   0,1533,
-  1555,1535,1557,1537,1559,   0,   0,1572,1573,1544,1566,1538,1560,1540,1562,1541,
-  1563,1542,1564,   0,   0,1543,1565,   0,   0,   0,   0,   0,   0,   0,   0,1606,
-  1607,1609,1608,1610,   0,   0,   0,   0,   0,   0,   0,   0,   0,1613,   0,1611,
+     0,1620,   0,   0,   0,   0,   0,   0,   0,1623,   0,   0,1624,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1612,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1620,   0,   0,   0,   0,   0,   0,   0,1623,   0,
-     0,1624,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1614,1615,1616,1617,1618,1619,1621,1622,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1628,1629,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1625,1626,   0,1627,   0,   0,   0,
-  1634,   0,   0,1635,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1630,1631,1632,   0,   0,1633,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1639,   0,   0,1638,1640,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1636,1637,   0,   0,   0,   0,   0,
-     0,1641,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1642,1644,1643,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1645,   0,   0,   0,   0,   0,   0,   0,1646,   0,   0,
-     0,   0,   0,   0,1648,1649,   0,1647,1650,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1651,1653,1652,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1654,   0,1655,1657,1656,   0,   0,   0,   0,
-  1659,   0,   0,   0,   0,   0,   0,   0,   0,   0,1660,   0,   0,   0,   0,1661,
-     0,   0,   0,   0,1662,   0,   0,   0,   0,1663,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1658,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1664,   0,1665,1673,   0,1674,   0,   0,   0,   0,   0,   0,   0,   0,1666,   0,
+  1614,1615,1616,1617,1618,1619,1621,1622,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1628,1629,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1625,1626,   0,1627,   0,   0,   0,1634,   0,   0,1635,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1668,   0,   0,   0,   0,   0,   0,   0,   0,   0,1669,   0,   0,   0,   0,1670,
-     0,   0,   0,   0,1671,   0,   0,   0,   0,1672,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1667,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1675,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1676,   0,1677,   0,1678,   0,1679,   0,1680,   0,   0,   0,1681,
+     0,1630,1631,1632,   0,   0,1633,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1639,   0,   0,1638,1640,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1636,1637,   0,   0,   0,   0,   0,   0,1641,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1682,   0,1683,   0,   0,1684,1685,   0,
-  1686,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 953,1138, 955,
-  1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153, 966,1151, 967,
-  1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171, 989,1174, 995,
-  1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,1017,1203,1019,
-  1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,1029,1215,1030,
-  1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,1382,1384,1383,
-  1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,1068,1254,1070,
-  1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,1078,1265,1095,
-  1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,1101,1288,1102,
-  1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,1119,1308,1122,
-  1311,1123,1312,1186,1260,1293,1305,   0,1394,   0,   0,   0,   0, 952,1137, 947,
-  1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,1370,1374,1373,
-  1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,1325,1352,1328,
-  1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,1331,1358,1330,
-  1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,1397,1402,1399,
-  1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,1409,1414,1109,
-  1297,1117,1306,1116,1304,1112,1300,   0,   0,   0,   0,   0,   0,1471,1472,1701,
-  1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,1477,1478,1729,
-  1731,1730,1732,   0,   0,1435,1436,1733,1735,1734,1736,   0,   0,1481,1482,1737,
-  1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,1490,1491,1765,
-  1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,1495,1496,1777,
-  1779,1778,1780,   0,   0,1451,1452,1781,1783,1782,1784,   0,   0,1504,1505,1785,
-  1788,1786,1789,1787,1790,   0,1459,   0,1791,   0,1792,   0,1793,1509,1510,1794,
-  1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,1467,  21,1475,
-    22,1479,  23,1485,  24,1493,  27,1499,  28,1507,  29,   0,   0,1704,1708,1709,
-  1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,1740,1744,1745,
-  1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,1797,1801,1802,
-  1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,1470,1469,1822,
-  1474,1465,   0,1473,1825,1429,1428,1426,  12,1432,   0,  26,   0,   0,1315,1823,
-  1484,1466,   0,1483,1829,1433,  13,1437,  14,1441,1826,1827,1828,1488,1487,1513,
-    19,   0,   0,1492,1515,1445,1444,1442,  15,   0,1831,1832,1833,1502,1501,1516,
-    25,1497,1498,1506,1518,1457,1456,1454,  17,1453,1313,  11,   3,   0,   0,1824,
-  1512,1519,   0,1511,1830,1449,  16,1460,  18,1464,   4,   0,   0,  30,  31,   0,
+     0,   0,1642,1644,1643,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1645,   0,   0,   0,   0,   0,   0,   0,1646,   0,   0,   0,   0,   0,   0,1648,
+  1649,   0,1647,1650,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1651,1653,1652,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1654,   0,1655,1657,1656,   0,   0,   0,   0,1659,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1660,   0,   0,   0,   0,1661,   0,   0,   0,   0,1662,
+     0,   0,   0,   0,1663,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1658,   0,   0,   0,   0,   0,   0,   0,   0,   0,1664,   0,1665,1673,   0,
+  1674,   0,   0,   0,   0,   0,   0,   0,   0,1666,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1668,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1669,   0,   0,   0,   0,1670,   0,   0,   0,   0,1671,
+     0,   0,   0,   0,1672,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1667,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1675,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1676,   0,
+  1677,   0,1678,   0,1679,   0,1680,   0,   0,   0,1681,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,  20,   0,   0,   0,   2,   6,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1834,1835,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1836,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1837,1839,1838,   0,   0,   0,
-     0,1840,   0,   0,   0,   0,1841,   0,   0,1842,   0,   0,   0,   0,   0,   0,
-     0,1843,   0,1844,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1845,   0,
-     0,1846,   0,   0,1847,   0,1848,   0,   0,   0,   0,   0,   0, 937,   0,1850,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1849, 936, 938,1851,1852,   0,
-     0,1853,1854,   0,   0,1855,1856,   0,   0,   0,   0,   0,   0,1857,1858,   0,
-     0,1861,1862,   0,   0,1863,1864,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1867,1868,1869,1870,1859,1860,1865,
-  1866,   0,   0,   0,   0,   0,   0,1871,1872,1873,1874,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,  32,  33,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1875,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1877,   0,1878,   0,1879,   0,1880,
-     0,1881,   0,1882,   0,1883,   0,1884,   0,1885,   0,1886,   0,1887,   0,1888,
-     0,   0,1889,   0,1890,   0,1891,   0,   0,   0,   0,   0,   0,1892,1893,   0,
-  1894,1895,   0,1896,1897,   0,1898,1899,   0,1900,1901,   0,   0,   0,   0,   0,
-     0,1876,   0,   0,   0,   0,   0,   0,   0,   0,   0,1902,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1904,   0,1905,   0,1906,   0,1907,
-     0,1908,   0,1909,   0,1910,   0,1911,   0,1912,   0,1913,   0,1914,   0,1915,
-     0,   0,1916,   0,1917,   0,1918,   0,   0,   0,   0,   0,   0,1919,1920,   0,
-  1921,1922,   0,1923,1924,   0,1925,1926,   0,1927,1928,   0,   0,   0,   0,   0,
-     0,1903,   0,   0,1929,1930,1931,1932,   0,   0,   0,1933,   0, 710, 385, 724,
-   715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688,
-   738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462,
-   658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481,
-   527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233,
-   299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167,
-   613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518,
-   174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428,
-   349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297,
-   374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459,
-   476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292,
-   311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778,
-   782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655,
-   737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340,
-   769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406,
-   432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805,
-   813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346,
-   578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210,   0,   0, 227,   0, 379,
-     0,   0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604,   0, 661,   0, 703,
-     0,   0, 735, 743,   0,   0,   0, 793, 794, 795, 808, 741, 773, 118, 127, 130,
-   166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375,
-   381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554,
-   555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651, 690, 695, 705,
-   706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623,   0,   0, 102, 145, 134,
-   115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243, 250, 254, 294,
-   296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362, 370, 379, 388,
-   389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490, 493, 507, 512,
-   514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586, 591, 597, 607,
-   637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706, 709, 717, 728,
-   736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848, 847, 857,  55,
-    65,  66, 883, 892, 916, 822, 824,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1586,   0,1605,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,1576,1577,1579,
-  1580,1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,1593,1594,   0,
-  1595,1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1936,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1937,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1938,   0,1939,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1940,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1943,1944,   0,   0,   0,   0,   0,   0,
-  1945,   0,1946,   0,   0,   0,   0,   0,   0,   0,   0,1947,   0,   0,1948,   0,
+     0,   0,   0,1682,   0,1683,   0,   0,1684,1685,   0,1686,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 953,1138, 955,1140, 956,1141, 957,1142,
+  1324,1351, 963,1148, 965,1150, 968,1153, 966,1151, 967,1152,1378,1380,1379,1381,
+   984,1169, 985,1170,1420,1421, 986,1171, 989,1174, 995,1180, 998,1183, 996,1181,
+   999,1184,1000,1185,1015,1200,1329,1356,1017,1203,1019,1205,1021,1207,1024,1210,
+  1687,1688,1027,1213,1026,1212,1028,1214,1029,1215,1030,1216,1034,1220,1036,1222,
+  1039,1225,1038,1224,1334,1361,1336,1363,1382,1384,1383,1385,1056,1242,1057,1243,
+  1059,1245,1063,1249,1689,1690,1065,1251,1068,1254,1070,1256,1386,1387,1388,1389,
+  1691,1692,1073,1259,1075,1262,1079,1266,1078,1265,1095,1282,1098,1285,1097,1284,
+  1390,1391,1392,1393,1099,1286,1100,1287,1101,1288,1102,1289,1105,1292,1104,1291,
+  1106,1294,1107,1295,1108,1296,1114,1302,1119,1308,1122,1311,1123,1312,1186,1260,
+  1293,1305,   0,1394,   0,   0,   0,   0, 952,1137, 947,1132,1317,1344,1316,1343,
+  1319,1346,1318,1345,1693,1695,1371,1375,1370,1374,1373,1377,1372,1376,1694,1696,
+   981,1166, 977,1162, 972,1157,1326,1353,1325,1352,1328,1355,1327,1354,1697,1698,
+  1009,1194,1013,1198,1054,1240,1048,1234,1331,1358,1330,1357,1333,1360,1332,1359,
+  1699,1700,1396,1401,1395,1400,1398,1403,1397,1402,1399,1404,1094,1281,1087,1274,
+  1406,1411,1405,1410,1408,1413,1407,1412,1409,1414,1109,1297,1117,1306,1116,1304,
+  1112,1300,   0,   0,   0,   0,   0,   0,1471,1472,1701,1705,1702,1706,1703,1707,
+  1430,1431,1715,1719,1716,1720,1717,1721,1477,1478,1729,1731,1730,1732,   0,   0,
+  1435,1436,1733,1735,1734,1736,   0,   0,1481,1482,1737,1741,1738,1742,1739,1743,
+  1439,1440,1751,1755,1752,1756,1753,1757,1490,1491,1765,1768,1766,1769,1767,1770,
+  1447,1448,1771,1774,1772,1775,1773,1776,1495,1496,1777,1779,1778,1780,   0,   0,
+  1451,1452,1781,1783,1782,1784,   0,   0,1504,1505,1785,1788,1786,1789,1787,1790,
+     0,1459,   0,1791,   0,1792,   0,1793,1509,1510,1794,1798,1795,1799,1796,1800,
+  1462,1463,1808,1812,1809,1813,1810,1814,1467,  21,1475,  22,1479,  23,1485,  24,
+  1493,  27,1499,  28,1507,  29,   0,   0,1704,1708,1709,1710,1711,1712,1713,1714,
+  1718,1722,1723,1724,1725,1726,1727,1728,1740,1744,1745,1746,1747,1748,1749,1750,
+  1754,1758,1759,1760,1761,1762,1763,1764,1797,1801,1802,1803,1804,1805,1806,1807,
+  1811,1815,1816,1817,1818,1819,1820,1821,1470,1469,1822,1474,1465,   0,1473,1825,
+  1429,1428,1426,  12,1432,   0,  26,   0,   0,1315,1823,1484,1466,   0,1483,1829,
+  1433,  13,1437,  14,1441,1826,1827,1828,1488,1487,1513,  19,   0,   0,1492,1515,
+  1445,1444,1442,  15,   0,1831,1832,1833,1502,1501,1516,  25,1497,1498,1506,1518,
+  1457,1456,1454,  17,1453,1313,  11,   3,   0,   0,1824,1512,1519,   0,1511,1830,
+  1449,  16,1460,  18,1464,   4,   0,   0,  30,  31,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  20,   0,
+     0,   0,   2,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1834,1835,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1836,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1837,1839,1838,   0,   0,   0,   0,1840,   0,   0,   0,
+     0,1841,   0,   0,1842,   0,   0,   0,   0,   0,   0,   0,1843,   0,1844,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1845,   0,   0,1846,   0,   0,1847,
+     0,1848,   0,   0,   0,   0,   0,   0, 937,   0,1850,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1849, 936, 938,1851,1852,   0,   0,1853,1854,   0,   0,
+  1855,1856,   0,   0,   0,   0,   0,   0,1857,1858,   0,   0,1861,1862,   0,   0,
+  1863,1864,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1867,1868,1869,1870,1859,1860,1865,1866,   0,   0,   0,   0,
+     0,   0,1871,1872,1873,1874,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,  32,  33,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1875,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1877,   0,1878,   0,1879,   0,1880,   0,1881,   0,1882,   0,
+  1883,   0,1884,   0,1885,   0,1886,   0,1887,   0,1888,   0,   0,1889,   0,1890,
+     0,1891,   0,   0,   0,   0,   0,   0,1892,1893,   0,1894,1895,   0,1896,1897,
+     0,1898,1899,   0,1900,1901,   0,   0,   0,   0,   0,   0,1876,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1902,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1904,   0,1905,   0,1906,   0,1907,   0,1908,   0,1909,   0,
+  1910,   0,1911,   0,1912,   0,1913,   0,1914,   0,1915,   0,   0,1916,   0,1917,
+     0,1918,   0,   0,   0,   0,   0,   0,1919,1920,   0,1921,1922,   0,1923,1924,
+     0,1925,1926,   0,1927,1928,   0,   0,   0,   0,   0,   0,1903,   0,   0,1929,
+  1930,1931,1932,   0,   0,   0,1933,   0, 710, 385, 724, 715, 455, 103, 186, 825,
+   825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500,
+   649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679,
+   293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722,
+   781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540,
+   714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589,
+   648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101,
+   430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110,
+   135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801,
+   812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610,
+   726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494,
+   113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748,
+   774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161,
+   395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727,
+   305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684,
+   687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566,
+   568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729,
+   680, 767, 694, 295, 128, 210,   0,   0, 227,   0, 379,   0,   0, 150, 493, 525,
+   544, 551, 552, 556, 783, 576, 604,   0, 661,   0, 703,   0,   0, 735, 743,   0,
+     0,   0, 793, 794, 795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213,
+   215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458,
+   477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591,
+   593, 595, 598, 607, 620, 625, 625, 651, 690, 695, 705, 706, 716, 717, 733, 735,
+   777, 786, 790, 315, 869, 623,   0,   0, 102, 145, 134, 115, 129, 138, 165, 171,
+   207, 202, 206, 212, 227, 231, 240, 243, 250, 254, 294, 296, 303, 308, 319, 325,
+   321, 329, 326, 335, 341, 357, 360, 362, 370, 379, 388, 389, 393, 421, 424, 438,
+   456, 454, 458, 465, 477, 535, 485, 490, 493, 507, 512, 514, 521, 522, 525, 526,
+   528, 533, 532, 541, 565, 569, 574, 586, 591, 597, 607, 637, 647, 674, 691, 693,
+   695, 698, 703, 699, 705, 704, 702, 706, 709, 717, 728, 736, 747, 754, 770, 777,
+   783, 784, 786, 787, 790, 802, 825, 848, 847, 857,  55,  65,  66, 883, 892, 916,
+   822, 824,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1586,   0,1605,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1602,1603,1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584,   0,
+  1585,1587,1588,1589,1591,   0,1592,   0,1593,1594,   0,1595,1596,   0,1598,1599,
+  1600,1601,1604,1582,1578,1590,1597,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1936,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1937,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1950,   0,1949,1951,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1953,1952,   0,1954,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1955,1956,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1957,   0,   0,   0,   0,   0,   0,   0,   0,1958,1961,
-  1959,1965,1960,1962,1964,1963,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1967,1966,1968,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1969,1970,1971,1972,1973,
-  1974,1975,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1976,1977,1978,1980,1979,1981,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 106, 104, 107,
-   826, 114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131, 132, 137, 827,
-    35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37, 157, 158, 159,
-   160,  38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179, 181, 182, 182,
-   182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195, 197, 199, 200,
-   201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216, 153, 234, 221,
-   222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244, 836, 837, 247,
-   248, 249, 246, 251,  39,  40, 253, 255, 255, 838, 257, 258, 259, 261, 839, 262,
-   263, 301, 264,  41, 266, 270, 272, 271, 841, 274, 842, 277, 276, 278, 281, 282,
-    42, 283, 284, 285, 286,  43, 843,  44, 289, 290, 291, 293, 934, 298, 845, 845,
-   621, 300, 300,  45, 852, 894, 302, 304,  46, 306, 309, 310, 312, 316,  48,  47,
-   317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334, 335, 336, 338,
-   339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361, 358, 356,  49,
-   363, 365, 367, 364,  50, 369, 371, 851, 376, 386, 378,  53, 381,  52,  51, 140,
-   141, 387, 382, 614,  78, 388, 389, 390, 394, 392, 856,  54, 399, 396, 402, 404,
-   858, 405, 401, 407,  55, 408, 409, 410, 413, 859, 415,  56, 417, 860, 418,  57,
-   419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433, 437, 441, 438,
-   439, 442, 443, 864, 436, 449, 450,  58, 454, 453, 865, 447, 460, 866, 867, 461,
-   466, 465, 464,  59, 467, 470, 469, 472, 828, 475, 868, 478, 870, 483, 485, 486,
-   871, 488, 489, 872, 873, 495, 497,  60, 498,  61,  61, 504, 505, 507, 508, 511,
-    62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878,  63,  64, 528, 880, 879,
-   881, 882, 530, 531, 531, 533,  66, 534,  67,  68, 884, 536, 538, 541,  69, 885,
-   549, 886, 887, 556, 559,  70, 561, 562, 563, 888, 889, 889, 567,  71, 890, 570,
-   571,  72, 891, 577,  73, 581, 579, 582, 893, 587,  74, 590, 592, 596,  75, 895,
-   896,  76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611, 853,  77, 615,
-   616,  79, 617, 252, 902, 903, 854, 855, 621, 622, 731,  80, 627, 626, 628, 164,
-   629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651, 638, 643, 644,
-   645, 905, 907, 906,  81, 653, 654, 656, 911, 657, 908,  82,  83, 909, 910,  84,
-   664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675,  85, 677, 678,  86,
-   681, 682, 912, 685, 686,  87, 689,  36, 913, 914,  88,  89, 696, 702, 709, 711,
-   915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728, 918, 919, 739,
-   742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762,  90, 764, 922,  91,
-   775, 279, 780, 923, 925,  92,  93, 785, 926,  94, 927, 787, 787, 789, 928, 792,
-    95, 796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807, 930,  99, 931,
-   932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
+     0,   0,1938,   0,1939,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1940,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1943,1944,   0,   0,   0,   0,   0,   0,1945,   0,1946,   0,   0,
+     0,   0,   0,   0,   0,   0,1947,   0,   0,1948,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1950,   0,1949,
+  1951,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1953,1952,   0,1954,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1955,1956,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1957,   0,   0,   0,   0,   0,   0,   0,   0,1958,1961,1959,1965,1960,1962,1964,
+  1963,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1967,1966,1968,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1969,1970,1971,1972,1973,1974,1975,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1976,1977,1978,1980,1979,1981,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 106, 104, 107, 826, 114, 118, 119, 121,
+   123, 124, 127, 125,  34, 830, 130, 131, 132, 137, 827,  35, 133, 139, 829, 142,
+   143, 112, 144, 145, 924, 151, 152,  37, 157, 158, 159, 160,  38, 165, 166, 169,
+   171, 172, 173, 174, 176, 177, 178, 179, 181, 182, 182, 182, 833, 468, 184, 185,
+   834, 187, 188, 189, 196, 192, 194, 195, 197, 199, 200, 201, 203, 204, 204, 206,
+   208, 209, 211, 218, 213, 219, 214, 216, 153, 234, 221, 222, 223, 220, 225, 224,
+   230, 835, 235, 236, 237, 238, 239, 244, 836, 837, 247, 248, 249, 246, 251,  39,
+    40, 253, 255, 255, 838, 257, 258, 259, 261, 839, 262, 263, 301, 264,  41, 266,
+   270, 272, 271, 841, 274, 842, 277, 276, 278, 281, 282,  42, 283, 284, 285, 286,
+    43, 843,  44, 289, 290, 291, 293, 934, 298, 845, 845, 621, 300, 300,  45, 852,
+   894, 302, 304,  46, 306, 309, 310, 312, 316,  48,  47, 317, 846, 318, 323, 324,
+   325, 324, 328, 329, 333, 331, 332, 334, 335, 336, 338, 339, 342, 343, 347, 351,
+   849, 350, 348, 352, 354, 359, 850, 361, 358, 356,  49, 363, 365, 367, 364,  50,
+   369, 371, 851, 376, 386, 378,  53, 381,  52,  51, 140, 141, 387, 382, 614,  78,
+   388, 389, 390, 394, 392, 856,  54, 399, 396, 402, 404, 858, 405, 401, 407,  55,
+   408, 409, 410, 413, 859, 415,  56, 417, 860, 418,  57, 419, 422, 424, 425, 861,
+   840, 862, 426, 863, 429, 431, 427, 433, 437, 441, 438, 439, 442, 443, 864, 436,
+   449, 450,  58, 454, 453, 865, 447, 460, 866, 867, 461, 466, 465, 464,  59, 467,
+   470, 469, 472, 828, 475, 868, 478, 870, 483, 485, 486, 871, 488, 489, 872, 873,
+   495, 497,  60, 498,  61,  61, 504, 505, 507, 508, 511,  62, 513, 874, 515, 875,
+   518, 844, 520, 876, 877, 878,  63,  64, 528, 880, 879, 881, 882, 530, 531, 531,
+   533,  66, 534,  67,  68, 884, 536, 538, 541,  69, 885, 549, 886, 887, 556, 559,
+    70, 561, 562, 563, 888, 889, 889, 567,  71, 890, 570, 571,  72, 891, 577,  73,
+   581, 579, 582, 893, 587,  74, 590, 592, 596,  75, 895, 896,  76, 897, 600, 898,
+   602, 605, 607, 899, 900, 609, 901, 611, 853,  77, 615, 616,  79, 617, 252, 902,
+   903, 854, 855, 621, 622, 731,  80, 627, 626, 628, 164, 629, 630, 631, 633, 904,
+   632, 634, 639, 640, 635, 641, 646, 651, 638, 643, 644, 645, 905, 907, 906,  81,
+   653, 654, 656, 911, 657, 908,  82,  83, 909, 910,  84, 664, 665, 666, 667, 669,
+   668, 671, 670, 674, 672, 673, 675,  85, 677, 678,  86, 681, 682, 912, 685, 686,
+    87, 689,  36, 913, 914,  88,  89, 696, 702, 709, 711, 915, 712, 713, 718, 719,
+   917, 831, 721, 720, 723, 832, 725, 728, 918, 919, 739, 742, 744, 920, 745, 753,
+   756, 757, 755, 760, 761, 921, 762,  90, 764, 922,  91, 775, 279, 780, 923, 925,
+    92,  93, 785, 926,  94, 927, 787, 787, 789, 928, 792,  95, 796, 797, 798, 800,
+    96, 929, 802, 804, 806,  97,  98, 807, 930,  99, 931, 932, 933, 814, 100, 816,
+   817, 818, 819, 820, 821, 935,   0,   0,
 };
 static const int16_t _hb_ucd_i16[92]=
 {
-      0,    0,    1,   -1,   -1,    1,    0,    1,   -1,    0,    0,    2,    0,   -2,    2,    0,
-     -2,    0,   -7,    0,    0,   16,    0,  -16,    3,    3,    3,   -3,   -3,   -3,    0, 2016,
-      0, 2527, 1923, 1914, 1918,    0, 2250,    0,    0,  138,    0,    7, 1824,    0, 2104,    0,
+      0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
+      0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
+   1918,    0, 2250,    0,    0,  138,    0,    7,   -7,    0,   -1,    1, 1824,    0, 2104,    0,
    2108, 2106,    0, 2106, 1316,    0,   -1, -138,    8,    8,    8,    0,    7,    7,   -8,   -8,
      -8,   -7,-1316,    1,   -1,    3,   -3,    1,    0,-1914,-1918,    0,    0,-1923,-1824,    0,
       0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
@@ -4357,13 +4360,11 @@ static const int16_t _hb_ucd_i16[92]=
 
 static inline uint8_t _hb_ucd_gc (unsigned u)
 {
-  /* packtab: [2^8,2^4,2^4,2^3,2^1] */
-  return u<1114110u ? (uint8_t)(_hb_ucd_u8[6536u+((_hb_ucd_u8[800u+_hb_ucd_u16[((_hb_ucd_u8[272u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>4))>>4)])<<4)+((((((((u)>>1))>>3))>>4))&15)])<<4)+((((((u)>>1))>>3))&15)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2;
+  return u<1114110 ? _hb_ucd_u8[6560u+((_hb_ucd_u8[816u+((_hb_ucd_u16[((_hb_ucd_u8[272u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>4))>>4)])<<4)+((((((((u)>>1))>>3))>>4))&15)])<<4)+((((((u)>>1))>>3))&15)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
 }
 static inline uint8_t _hb_ucd_ccc (unsigned u)
 {
-  /* packtab: [2^8,2^3,2^2,2^2,2^2] */
-  return u<125259u ? (uint8_t)(_hb_ucd_u8[8589u+((_hb_ucd_u8[8006u+((_hb_ucd_u8[7529u+((_hb_ucd_u8[7163u+((_hb_ucd_u8[6918u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0;
+  return u<125259 ? _hb_ucd_u8[8620u+((_hb_ucd_u8[8036u+((_hb_ucd_u8[7556u+((_hb_ucd_u8[7188u+((_hb_ucd_u8[6942u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 0;
 }
 static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 {
@@ -4371,18 +4372,15 @@ static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 }
 static inline int16_t _hb_ucd_bmg (unsigned u)
 {
-  /* packtab: [2^4,2^3,2^3,2^2,2^1] */
-  return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[9480u+_hb_ucd_u8[9251u+_hb_ucd_u8[9157u+((_hb_ucd_b4(_hb_ucd_u8+9093u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)]+((((((u)>>1))>>2))&7)]+((((u)>>1))&3)]+((u)&1)]) : 0;
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[9516u+((_hb_ucd_u8[9284u+((_hb_ucd_u8[9188u+((_hb_ucd_b4(_hb_ucd_u8+9124u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)])<<3)+((((((u)>>1))>>2))&7)])<<2)+((((u)>>1))&3)])<<1)+((u)&1)] : 0;
 }
 static inline uint8_t _hb_ucd_sc (unsigned u)
 {
-  /* packtab: [2^8,2^4,2^3,2^2,2^2] */
-  return u<918000u ? (uint8_t)(_hb_ucd_u8[10913u+_hb_ucd_u16[4624u+_hb_ucd_u16[2592u+((_hb_ucd_u8[10177u+((_hb_ucd_u8[9728u+((((((((u)>>2))>>2))>>3))>>4)])<<4)+((((((((u)>>2))>>2))>>3))&15)])<<3)+((((((u)>>2))>>2))&7)]+((((u)>>2))&3)]+((u)&3)]) : 2;
+  return u<918000 ? _hb_ucd_u8[10950u+((_hb_ucd_u16[4648u+((_hb_ucd_u16[2608u+((_hb_ucd_u8[10214u+((_hb_ucd_u8[9764u+((((((((u)>>2))>>2))>>3))>>4)])<<4)+((((((((u)>>2))>>2))>>3))&15)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 2;
 }
 static inline uint16_t _hb_ucd_dm (unsigned u)
 {
-  /* packtab: [2^8,2^5,2^4] */
-  return u<195102u ? (uint16_t)(_hb_ucd_u16[7453u+((_hb_ucd_u8[13867u+((_hb_ucd_u8[13485u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0;
+  return u<195102 ? _hb_ucd_u16[7480u+((_hb_ucd_u8[13904u+((_hb_ucd_u8[13522u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
 }
 
 
@@ -4390,824 +4388,824 @@ static inline uint16_t _hb_ucd_dm (unsigned u)
 
 #include <stdint.h>
 
-static const uint8_t _hb_ucd_u8[13905]=
+static const uint8_t _hb_ucd_u8[13937]=
 {
-    4,  5,  6,  7,  8,  9, 10,  2,  2, 11,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2, 12, 13,  2,  2,  2,  2,  2, 14,  1,  1,  1, 15,
-   16, 17, 18, 19, 20, 21, 22,  2,  3,  0,  0,  0, 23, 24,  2,  2,
-    2, 25,  0,  0,  0, 26, 27, 28,  0, 29, 30, 31, 32, 33, 34, 35,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  0, 36,
-    2,  2,  2,  2,  2,  2, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  9, 10,  7,  7,  7,  7,  7, 11, 12, 12, 12, 13,
+   14, 15, 16, 17, 18, 19, 20,  7, 21, 22, 22, 22, 23, 24,  7,  7,
+    7, 25, 22, 22, 22, 26, 27, 28, 22, 29, 30, 31, 32, 33, 34, 35,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21, 22, 36,
+    7,  7,  7,  7,  7,  7, 37, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   38, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 34, 34, 34, 35, 36, 37, 34, 34, 34, 38, 39, 40, 41,
+   42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+   58, 59, 60, 61, 62, 62, 63, 64, 65, 66, 67, 68, 69, 67, 70, 71,
+   67, 67, 62, 72, 62, 62, 73, 67, 74, 75, 76, 77, 78, 67, 67, 67,
+   79, 80, 34, 81, 82, 83, 67, 67, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 84, 34, 34, 34, 34,
+   85, 34, 34, 34, 34, 34, 34, 34, 34, 86, 34, 34, 87, 88, 89, 90,
+   91, 92, 93, 94, 95, 96, 97, 98, 34, 34, 34, 34, 34, 34, 34, 34,
+   99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,100, 34, 34, 34, 34,101,102, 34, 34,103,104,105,106,107,108,
+   34, 34,109,110,111,112,113,114,115,116,117,118, 34, 34, 34,119,
+  120,121,122,123,124,125,126,127, 34,128,129,130,131,132,133,134,
+  135,136,137,138,139,140,141,142,143,144,111,145,146,147,148,111,
+  149,150,151,152,153,154,155,156,157,158,159,160,111,161,162,163,
+   34, 34, 34, 34, 34, 34, 34, 34,164, 34, 34,111,111,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,165,
+   34, 34, 34, 34, 34, 34, 34, 34,166, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
+  111,111,167,111,111,111,111,111,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34,168,169,170, 34,111,111,171,111,172,173,174,175,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,119,
+   34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,
+  111,111,111,111,111,111,111,111, 34,176,111,111,111,111,111,111,
+  111,111,111,111,111,111,111,111, 67,177, 67, 67, 67,178,179, 67,
+   67, 67,180,181,182,131, 65,111,183,184,185,186,187,188,189,190,
+   67, 67, 67, 67,191,192,111,111,111,111,111,111,111,111,193,111,
+  194,195,196,111,111,197,111,111,111,198,111,199,111,200,111, 34,
+   34,201,202,111,111,111,111,111,131,203,204,111, 34,205,111,111,
+   67, 67,206, 67, 67,111, 67,207, 67, 67, 67, 67, 67, 67, 67, 67,
+   67,208, 67, 67, 67, 67, 67,177,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,
+  209,111,195,195,111,111,111,111,111,111,111,111,111,111,111,111,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
+    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
+   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
+   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
+   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
+   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
+   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
+   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 16, 43, 16, 10,
+   40, 40, 40, 44, 11, 11, 11, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 45, 34, 32, 34, 11,
+   32, 46, 42, 42, 47, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   11, 11, 11, 11, 48,  2,  2,  2, 16, 16, 16, 16, 49, 50, 51, 52,
+   53, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 54,
+   55, 56, 42, 55, 42, 42, 42, 42, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 57,  2,  2,  2,  2,  2,  2, 58, 58, 58,  8,  9, 59,  2, 60,
+   42, 42, 42, 42, 42, 56, 61,  2, 62, 36, 36, 36, 36, 63, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 64, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 65, 42, 42, 42, 66, 46, 42, 42, 67, 68, 69, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 70, 71,  2,  2,  2,  2,  2,  2,  2, 72,
+   63, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 64, 36,
+   36, 36, 36, 42, 42, 42, 42, 42,  7,  7,  7,  7,  7, 36, 36, 36,
+   36, 36, 36, 36, 36, 63, 42, 42, 42, 42, 39, 21,  2, 39, 68, 20,
+   36, 36, 36, 42, 42, 68, 42, 42, 42, 42, 68, 42, 68, 42, 42, 42,
+    2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36, 63, 42, 42,  2,
+   36, 36, 36, 36, 73, 36, 36, 36, 58, 58, 58, 74, 42, 42, 42, 42,
+   36, 36, 36, 36, 75, 42, 42, 42, 42, 74, 42, 42, 42, 42, 42, 42,
+   42, 76, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 64, 77,
+   78, 42, 42, 42, 76, 77, 78, 77, 63, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 79, 36, 36, 36, 36, 36, 36, 36,
+   63, 77, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 77,
+   78, 42, 42, 76, 77, 77, 78, 36, 36, 36, 36, 81, 77, 77, 36, 36,
+   36, 42, 42,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 52, 57, 42,
+   42, 76, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 42, 77,
+   78, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 64, 36, 36, 36,
+   36, 36, 36,  7,  7,  7,  7,  7, 42, 36, 63,  2,  2,  2,  2,  2,
+   78, 42, 42, 42, 76, 77, 78, 42, 59, 20, 20, 20, 82, 42, 42, 42,
+   42, 77, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 78,
+   78, 42, 42, 76, 77, 77, 78, 42, 42, 42, 42, 76, 77, 77, 36, 36,
+   71, 27, 27, 27, 27, 27, 27, 27, 42, 64, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 77, 76, 77, 77, 77, 77, 77, 78, 42,
+   36, 36, 36, 81, 77, 77, 77, 77, 77, 77, 77,  7,  7,  7,  7,  7,
+   27, 83, 60, 60, 52, 60, 60, 60, 76, 77, 64, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 64, 42, 76, 77, 77, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 36, 36, 36, 36,  7,  7,  7, 84, 27, 27, 27, 83,
+   63, 77, 65, 36, 36, 36, 36, 36, 77, 77, 77, 76, 77, 77, 42, 42,
+   42, 42, 76, 77, 77, 77, 36, 36, 85, 81, 77, 77, 77, 77, 77, 77,
+   42, 77, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 63, 64, 77,
+   78, 42, 42, 77, 77, 77, 78, 70, 60, 60, 36, 81, 27, 27, 27, 86,
+   27, 27, 27, 27, 83, 36, 36, 36, 36, 36, 36, 36, 36, 42, 42, 76,
+   77, 42, 42, 42, 77, 77, 77, 77,  7, 77,  2,  2,  2,  2,  2,  2,
+   63, 36, 42, 42, 42, 42, 42, 87, 36, 36, 36, 68, 42, 42, 42, 56,
+    7,  7,  7,  7,  7,  2,  2,  2, 63, 36, 42, 42, 42, 42, 64, 36,
+   36, 36, 36, 39, 42, 42, 42, 42,  7,  7,  7,  7,  7,  7, 36, 36,
+   70, 60,  2,  2,  2,  2,  2,  2,  2, 88, 88, 60, 42, 60, 60, 60,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 46, 46, 46,  4,  4, 77,
+   63, 42, 42, 42, 42, 42, 42, 76, 42, 42, 56, 42, 36, 36, 63, 42,
+   42, 42, 42, 42, 42, 42, 42, 60, 60, 60, 60, 69, 60, 60, 60, 60,
+    2,  2, 88, 60, 21,  2,  2,  2, 36, 36, 36, 36, 36, 81, 78, 42,
+   76, 42, 42, 42, 78, 76, 78, 64, 36, 36, 36, 77, 42, 36, 36, 42,
+   64, 77, 80, 81, 77, 77, 77, 36, 63, 42, 64, 36, 36, 36, 36, 36,
+   36, 76, 78, 76, 77, 77, 78, 81,  7,  7,  7,  7,  7, 77, 78, 60,
+   16, 16, 16, 16, 16, 49, 43, 16, 36, 36, 36, 36, 36, 36, 63, 42,
+    2,  2,  2,  2, 89, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+   60, 60, 60, 60, 60, 60, 60, 60, 11, 11, 11, 11, 16, 16, 16, 16,
+   90, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 70, 65,
+   91, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 92, 93, 93,
+   36, 36, 36, 36, 36, 57,  2, 94, 95, 36, 36, 36, 36, 36, 36, 36,
+   36, 42, 76, 77, 77, 77, 77, 80, 36, 42, 96,  2,  2,  2,  2,  2,
+   36, 42, 42, 42, 42, 42, 42, 42, 36, 36, 42, 78, 42, 42, 42, 77,
+   77, 77, 77, 76, 78, 42, 42, 42, 42, 42,  2, 79,  2, 59, 63, 42,
+    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 97,  2, 55, 42, 74,
+   36, 75, 36, 36, 36, 36, 36, 36, 36, 36, 63, 64, 36, 36, 36, 36,
+   36, 36, 36, 36, 63, 36, 36, 36, 42, 76, 77, 78, 76, 77, 77, 77,
+   77, 76, 77, 77, 78, 42, 42, 42, 60, 60,  2,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7, 27, 27, 60, 36, 36, 36, 63, 76, 78, 42,  2,
+   36, 36, 81, 76, 42, 42, 42, 42, 76, 76, 78, 42, 42, 42, 76, 77,
+   77, 78, 42, 42, 42, 42, 42, 42,  2,  2,  2, 79,  2,  2,  2,  2,
+   42, 42, 42, 42, 42, 42, 42, 98, 42, 42, 80, 36, 36, 36, 36, 36,
+   36, 36, 76, 42, 42, 76, 76, 77, 77, 76, 80, 36, 36, 36, 36,  2,
+   88, 60, 60, 60, 60, 46, 42, 42, 42, 42, 60, 60, 60, 60, 21,  2,
+   42, 80, 36, 36, 36, 36, 36, 36, 81, 42, 42, 77, 42, 78, 42, 36,
+   36, 36, 36, 76, 42, 77, 78, 78, 42, 77, 77, 77, 77, 77,  2,  2,
+   36, 36, 77, 77, 77, 77, 42, 42, 42, 42, 77, 42, 42, 56,  2,  2,
+    7,  7,  7,  7,  7,  7, 85, 36, 36, 36, 36, 36, 39, 39, 39,  2,
+   16, 16, 16, 16, 34, 16, 16, 16, 42, 56, 42, 42, 42, 42, 42, 42,
+   76, 42, 42, 42, 64, 36, 63, 36, 36, 36, 64, 81, 42, 36, 36, 36,
+   16, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 43, 16, 16,
+   16, 16, 16, 16, 43, 16, 16, 16, 16, 16, 16, 16, 16, 99, 39, 39,
+   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
+   16, 16, 16, 16, 34, 11, 11, 11, 16, 16, 16, 16,100,100,100,100,
+   16, 16, 16, 16, 11, 11,101,102, 40, 16, 16, 16, 11, 11,101, 40,
+   16, 16, 16, 16, 11, 11,103, 40,104,104,104,104,104,105, 58, 58,
+   50, 50, 50,  2,106,107,106,107,  2,  2,  2,  2,108, 58, 58,109,
+    2,  2,  2,  2,110,111,  2,112,113,  2,114,115,  2,  2,  2,  2,
+    2,  9,113,  2,  2,  2,  2,116, 58, 58, 58, 58, 58, 58, 58, 58,
+  117, 39, 27, 27, 27,  8,114,118, 27, 27, 27, 27, 27,  8,114, 93,
+   20, 20, 20, 20, 20, 20, 20, 20, 42, 42, 42, 42, 42, 42,119, 47,
+   98, 47, 98, 42, 42, 42, 42, 42, 60,120, 60,121, 60, 34, 11, 16,
+   11, 32,121, 60, 45, 11, 11, 60, 60, 60,120,120,120, 11, 11,122,
+   11, 11, 35, 36,123, 60, 16, 11,  8,  8, 45, 16, 16, 26, 60,124,
+   94, 94, 94, 94, 94, 94, 94, 94, 94,125,126, 94,127, 60, 60, 60,
+    8,  8,128, 60, 60,  8, 60, 60,128, 26, 60,128, 60, 60, 60,128,
+   60, 60, 60, 60, 60, 60, 60,  8, 60,128,128, 60, 60, 60, 60, 60,
+   60, 60,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+   60, 60, 60, 60,  4,  4, 60, 60,  8, 60, 60, 60,129,130, 60, 60,
+   60, 60, 60, 60, 60, 60,128, 60, 60, 60, 60, 60, 60, 26,  8,  8,
+    8,  8, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  8,  8,
+    8, 60, 60, 60, 60, 60, 60, 60, 27, 27, 27, 27, 27, 27, 60, 60,
+   60, 60, 60, 60, 60, 27, 27, 27, 60, 60, 60, 26, 60, 60, 60, 60,
+   26, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  8,  8,  8,  8,
+   60, 60, 60, 60, 60, 60, 60, 26, 60, 60, 60, 60,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 60, 60, 60, 60, 60, 60,
+    8,  8,114,131,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,114,132,132,132,132,132,132,132,132,132,132,131,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,128, 26,  8,  8,128, 60, 32, 11, 32, 34, 34, 34, 34, 11,
+   32, 32, 34, 16, 16, 16, 39, 11, 32, 32,124, 60, 60,121, 34,133,
+   42, 32, 16, 16, 49,  2, 89,  2, 36, 36, 36, 36, 36, 36, 36, 75,
+    2,  2,  2,  2,  2,  2,  2, 55,  2,106,106,  2,110,111,106,  2,
+    2,  2,  2,  6,  2, 97,106,  2,106,  4,  4,  4,  4,  2,  2, 79,
+    2,  2,  2,  2,  2, 50,  2,  2, 97,134,  2,  2,  2,  2,  2,  2,
+   60,  2,135,132,132,132,136, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+    1,  2,137,138,  4,  4,  4,  4,  4, 60,  4,  4,  4,  4,139, 93,
+  140, 94, 94, 94, 94, 42, 42, 77,141, 39, 39, 60, 94,142, 57, 60,
+   71, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 63,143,144, 62,
+   36, 36, 36, 36, 36, 57, 39, 62, 60, 27, 27, 60, 60, 60, 60, 60,
+   27, 27, 27, 27, 27, 60, 60, 60, 60, 60, 60, 60, 27, 27, 27, 27,
+  145, 27, 27, 27, 27, 27, 27, 27, 36, 36, 75, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36,146,  2, 32, 32, 32, 32, 32, 32, 32, 63,
+   47,147, 42, 42, 42, 42, 42, 79, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36, 94, 94, 94, 94, 94, 42,  2,  2,  2,  2,  2,  2,  2,
+   40, 40, 40,144, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 43, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,148, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 11, 11,
+   48, 39,149, 35, 39, 35, 36, 36, 36, 64, 36, 64, 36, 63, 36, 36,
+   36, 81, 78, 76, 60, 60, 42, 42, 27, 27, 27, 60,150, 60, 60, 60,
+   36, 36,  2,  2,  2,  2,  2,  2, 77, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 77, 77, 77, 77, 77, 77, 77, 77, 42, 42, 42, 42, 42,  2,
+   42, 36, 36, 36,  2, 65, 65, 63, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 63, 42, 42, 42, 42, 42, 77, 77, 77, 77, 77, 77, 96,
+   36, 63, 77, 42, 42, 77, 42, 77, 96,  2,  2,  2,  2,  2,  2, 79,
+    7,  7,  7,  7,  7,  7,  7,  2, 36, 36, 63, 62, 36, 36, 36, 36,
+   36, 36, 36, 36, 63, 42, 42, 76, 78, 76, 78, 42, 42, 42, 42, 42,
+   36, 63, 36, 36, 36, 36, 76, 77,  7,  7,  7,  7,  7,  7,  2,  2,
+   62, 36, 36, 70, 60, 81, 76, 36, 64, 42, 64, 63, 64, 36, 36, 42,
+   36, 36, 36, 36, 36, 36, 75,  2, 36, 36, 36, 36, 36, 81, 42, 77,
+    2, 75,151, 42, 42, 42, 42, 42, 16, 16, 16, 16, 16,102, 39, 39,
+   16, 16, 16, 16, 99, 40, 40, 40, 36, 81, 78, 77, 76, 96, 78, 42,
+  152,152,152,152,152,152,152,152,153,153,153,153,153,153,153,153,
+   16, 16, 16, 16, 16, 16, 35, 64, 36, 36, 36, 36,154, 36, 36, 36,
+   36, 40, 40, 40, 40, 40, 40, 40, 40, 22, 60, 60, 60, 60, 60, 60,
+   60, 71, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,132,
+   60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 60, 60, 60,
+   36, 36, 36, 36, 36, 36,150, 60,  2,  2,  2,135,115,  2,  2,  2,
+    6,155,156,132,132,132,132,132,132,132,115,135,115,  2,112,157,
+    2,  2,  2,  2,139,132,132,115,  2,158,  8,  8, 59,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 36,159,  2,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,114,115,  4,  2, 36, 36, 36, 36, 36,
+   62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   20,160, 52, 20, 26,  8,128, 60, 60, 60, 60, 60,161, 58, 60, 60,
+    2,  2,  2, 89, 27, 27, 27, 27, 27, 27, 27, 83, 60, 60, 60, 60,
+   94, 94,127, 27, 83, 60, 60, 60, 60, 60, 60, 60, 60, 27, 60, 60,
+   60, 60, 60, 60, 60, 60, 46, 42,162,162,162,162,162,162,162,162,
+  163, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 86, 36,
+  138, 36, 36, 36, 36, 94, 94, 94, 36, 36, 36, 36, 36, 36, 36, 57,
+  164, 94, 94, 94, 94, 94, 94, 94, 11, 11, 11, 32, 16, 16, 16, 16,
+   36, 36, 36, 57, 27, 27, 27, 27, 36, 36, 36, 70,145, 27, 27, 27,
+   36, 36, 36,165, 27, 27, 27, 27, 36, 36, 36, 36, 36,165, 27, 27,
+   36, 36, 36, 27, 27, 27, 27, 30, 36, 36, 36, 36, 36, 36, 27, 36,
+   63, 42, 42, 42, 42, 42, 42, 42, 36, 36, 36, 36, 42, 42, 42, 42,
+   36, 36, 36, 36, 36, 36,165, 30, 36, 36, 36, 36, 36, 36,165, 27,
+   36, 36, 36, 36, 71, 36, 36, 36, 36, 36, 63, 42, 42,163, 27, 27,
+   36, 36, 36, 36, 57,  2,  2,  2, 36, 36, 36, 36, 27, 27, 27, 27,
+   16, 16, 16, 16, 16, 27, 27, 27, 36, 36, 42, 42, 42, 42, 42, 42,
+    7,  7,  7,  7,  7, 36, 36, 62, 11, 11, 11, 11,166, 42, 42,141,
+   16, 16, 16, 16, 16, 16, 16,  8, 36, 36, 36, 36, 36, 63,167, 50,
+   88, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 42, 42, 42,
+   27, 27, 27, 86, 36, 36, 36, 36,163, 27, 30,  2,  2,  2,  2,  2,
+   36, 42, 42,  2,  2,  2,  2,  2, 36, 36,165, 27, 27, 27, 27, 27,
+   78, 80, 36, 36, 36, 36, 36, 36, 42, 42, 42, 56,  2,  2,  2,  2,
+    2, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,  7,  7,  7,  7,  7,
+   64, 63, 64, 36, 36, 36, 36, 63, 77, 78, 42, 76, 78, 56, 72,  2,
+    2, 42, 42, 42, 42, 42, 66, 58, 36, 36, 36, 63, 42, 42, 78, 42,
+   42, 42, 42,  7,  7,  7,  7,  7,  2,  2, 81, 80, 36, 36, 36, 36,
+   36, 63,  2, 36, 36, 36, 36, 36, 36, 81, 77, 42, 42, 42, 42, 76,
+   80, 36, 57,  2, 55, 42, 56, 78,  7,  7,  7,  7,  7, 57, 57,  2,
+   89, 27, 27, 27, 27, 27, 27, 27, 36, 36, 36, 36, 36, 36, 77, 78,
+   42, 77, 76, 42,  2,  2,  2, 64, 36, 36, 36, 36, 36, 36, 36, 63,
+   76, 77, 77, 77, 77, 77, 77, 77, 36, 36, 36, 81, 77, 77, 80, 36,
+   36, 77, 77, 42, 42, 42, 42, 42, 36, 36, 36, 36, 77, 78, 42, 42,
+   42, 77, 77, 77, 77, 77, 77, 76, 64, 64,  2,  2,  2,  2,  2,  2,
+   55, 42, 42, 42, 42, 42, 42, 42, 36, 36, 81, 77, 42, 42, 42, 42,
+   77, 42, 76, 64, 36, 57,  2,  2,  7,  7,  7,  7,  7,  2,  2, 64,
+   77, 78, 42, 42, 76, 76, 77, 78, 76, 42, 36, 65, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 81, 77, 42, 42, 42, 77, 77, 42, 78,
+   56,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 42,
+   77, 78, 42, 42, 42, 76, 78, 78, 56,  2, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 63, 78, 77, 42, 42, 42, 78, 57,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 63, 78, 77, 42, 42, 78, 42, 42, 42, 42,
+    7,  7,  7,  7,  7, 27,  2, 88, 42, 42, 42, 42, 78, 56,  2,  2,
+   27, 27, 27, 27, 27, 27, 27, 86, 77, 77, 77, 77, 77, 78, 76, 64,
+   80, 78,  2,  2,  2,  2,  2,  2, 81, 77, 42, 42, 42, 42, 77, 77,
+   64, 65, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+   63, 42, 42, 42, 42, 64, 36, 36, 36, 63, 42, 42, 76, 63, 42, 56,
+    2,  2,  2, 55, 42, 42, 42, 42, 63, 42, 42, 76, 78, 42, 36, 36,
+   36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 76, 42,  2, 65,  2,
+   76, 42, 76, 76, 77, 77, 77, 77, 57,  2,  2,  2,  2,  2,  2,  2,
+   42, 42, 42, 42, 42, 42, 42, 78,  2, 36, 36, 36, 36, 36, 36, 36,
+   42, 42, 42, 42, 76, 42, 42, 42, 76, 42, 78, 42, 42, 42, 42, 42,
+   42, 42, 42, 63, 42, 42, 42, 42, 36, 36, 36, 36, 36, 77, 77, 77,
+   42, 76, 78, 78, 36, 36, 36, 36, 36, 36, 36, 36, 75, 36, 36, 36,
+   36, 63, 76, 96,  2,  2,  2,  2, 42, 81, 36, 36, 36, 36, 36, 36,
+   36, 36, 77, 42, 42, 42, 42, 77, 76, 56,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 42, 42, 42, 27, 27, 83, 60, 60, 60, 52, 20,
+  150, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 21,
+   64, 36, 36, 63, 42, 42, 42, 42, 36, 36, 36, 36, 36, 36, 36, 42,
+   42, 42, 42, 42, 42, 77, 78, 42, 42, 42, 56,  2,  2,  2,  2,  2,
+   42, 42, 42, 56,  2,  2, 60, 60, 39, 39, 88, 60, 60, 60, 60, 60,
+    7,  7,  7,  7,  7,168, 27, 27, 27, 86, 36, 36, 36, 36, 36, 36,
+   39, 62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 75,146,  2,
+   27, 27, 27, 30,  2,  2,  2,  2, 11, 11, 11, 11, 11, 32, 16, 16,
+   81, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 78,
+   42, 67, 39, 39, 39, 39, 39, 39, 39, 79, 42, 42, 42, 42, 42, 42,
+   77, 39, 94, 94, 94, 94, 94, 94, 36, 36, 36, 36, 36, 36, 46, 56,
+    7,  7,  7,  7,  7, 60, 60, 60, 60, 60,169, 78, 42, 60,169, 77,
+   77,170, 58, 58, 58, 74, 42, 42, 42, 69, 46, 42, 42, 42, 60, 60,
+   60, 60, 60, 60, 60, 42, 42, 60, 60, 42, 69, 60, 60, 60, 60, 60,
+   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 16,  7,
+   42, 42, 42, 69, 60, 46, 42, 42, 42, 42, 42, 42, 42, 42, 69, 60,
+   60, 60, 46, 60, 60, 60, 60, 60, 60, 60, 69, 21,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 55, 42, 42, 16, 16, 16, 16, 16,123, 16, 16,
+   42, 42, 42, 67, 39, 39, 39, 39,  7,  7,  7,  7,  7,  7,  7, 70,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7,  7,  7,171,
+   36, 36, 36, 36, 36, 75, 42, 42,172,  7,  7,  7,  7,  7,  7, 84,
+   36, 63, 36, 64, 36, 36, 36, 42, 36, 36, 63, 42, 42, 42, 42, 75,
+   16, 16, 42, 42, 42, 67, 39, 39, 27, 27, 27, 27, 27, 27,145, 27,
+  173, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,145,
+   27, 27, 27, 27, 27, 27, 83, 60, 60, 60, 60, 60, 60, 25, 40, 40,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  6,  5,  9, 21, 25,  9, 26, 12, 11, 11,
+    9,  6,  5, 21, 17, 17, 17, 26, 26, 23, 23, 12, 17, 12, 21, 12,
+   12, 21,  7, 21,  1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12,
+   12,  7, 21,  7, 12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,
+   21,  1, 24,  7,  1, 12,  7,  6, 12, 10, 10, 10, 10, 12, 21,  6,
+   10,  7,  7, 10, 23,  7, 15, 26, 13, 21, 13,  7, 15,  7, 12, 23,
+   21, 26, 21, 15, 17,  7, 29,  7,  7, 22, 18, 18, 14, 14, 14,  7,
+   10, 21, 17, 21, 11, 12,  5,  6,  8,  8,  8, 24,  5, 24,  9, 24,
+   29, 29, 29,  1, 20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21,
+   21, 16, 16, 21, 25, 22, 18, 21, 21, 29, 15,  6, 18,  6, 12, 11,
+    9, 26, 26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15,
+   25, 26, 26, 22, 18, 26, 18, 25, 18, 22,  5, 12, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 26, 14, 17,  6, 14,  6, 12, 24,
+   24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,
+    4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,  7,  1,
+   25, 24, 26,  1,  2,  2, 12, 15, 21, 14,  7, 15,  9, 12, 12, 17,
+   13, 15, 26, 10, 10,  1, 13, 23,  7, 13, 23, 15,  0,  1,  2,  3,
+    4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,  0,  0,
+    0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,
+   18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,  0,  0,
+    0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,  0,  0,
+    0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,
-   11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-   27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-   43, 44,  2,  2,  2,  2, 45, 46, 47,  2,  2,  2, 48, 49, 50, 51,
-   52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-   68, 69, 70, 71,  5,  5, 72, 73,  8, 74,  3, 75, 76,  3, 77, 78,
-    3,  3,  5, 79,  5,  5, 80,  3, 81, 82, 83, 84, 85,  3,  3,  3,
-   86, 87,  2, 88, 89, 90,  3,  3,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 91,  2,  2,  2,  2,
-   92,  2,  2,  2,  2,  2,  2,  2,  2, 93,  2,  2, 94, 95, 96, 97,
-   98, 99,100,101,102,103,104,105,  2,  2,  2,  2,  2,  2,  2,  2,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    1,  1,  2,  2,  2,  2,106,107,  2,  2,108,109,110,111,112,113,
-    2,  2,114,115,  0,116,117,118,119,120,121,122,  2,  2,  2,  9,
-  123,124,125,126,127,128,129,130,  2,131,132,133,  6,134,135,136,
-  137,138,139,140,141,142,143,144,145,146,  0,147,148,149,150,  0,
-  151,152,153,154,155,156,157,158,159,160,161,162,  0,163,164,165,
-    2,  2,  2,  2,  2,  2,  2,  2,166,  2,  2,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,167,
-    2,  2,  2,  2,  2,  2,  2,  2,168,  2,  2,  2,  2,  2,  2,  2,
-    0,  0,169,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,170,171,172,  2,  0,  0,173,  0,174,175,176,177,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  2,178,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  3, 10,  3,  3,  3,179,180,  3,
-    3,  3,181,182,183,  6,  8,  0,184,185,186,187,188,189,190,191,
-    3,  3,  3,  3,192,193,  0,  0,  0,  0,  0,  0,  0,  0,194,  0,
-  195,  7,196,  0,  0,197,  0,  0,  0,198,  0,199,  0,200,  0,  2,
-    2,201,202,  0,  0,  0,  0,  0,  6,203,204,  0,  2,205,  0,  0,
-    3,  3,206,  3,  3,  0,  3,207,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,208,  3,  3,  3,  3,  3, 10,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,
-  209,  0,  7,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,
-    3,  3,  3,  3,  3,  3,  3,  3,  5,  5,  5,  5,  5,  5,  5,  5,
-    4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,  6,  6,  6,  6,
-    7,  7,  7,  7,  7,  7,  7,  7, 11, 11, 11, 11, 11, 11, 11, 11,
-    8,  8,  8,  8,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12,
-    9,  9,  9,  9,  9,  9,  9,  9, 13, 13, 13, 13, 13, 13, 13, 13,
-   10, 10, 10, 10, 10, 10, 10, 10, 15, 15, 15, 15, 15, 15, 15, 15,
-   16, 16, 16, 16, 16, 16, 16, 16,  6,  6,  6,  6,  8,  8,  8,  8,
-    9,  9,  9,  9,  9,  1,  1,  1,  1,  4,  4,  9,  9,  9,  9,  9,
-   25, 25, 25, 25, 25, 25, 25, 25, 14, 14, 14, 14, 14, 14, 14, 14,
-    8,  8,  8,  8,  8,  6,  6,  6,  8,  6,  6,  6,  6,  6,  6,  6,
-    1,  1,  1,  4,  4,  4,  4,  4,  4, 14, 30,  1,  1,  1,  1,  1,
-    9,  9,  9,  9,  9, 10, 10, 10,  9,  9,  9,  9,  9,  7,  7,  7,
-    8,  8,  8,  8,  6,  6,  6,  6,  1,  4,  4,  4,  4,  4,  4,  4,
-    4, 30,  1,  1,  1,  1,  1,  1,  6,  6,  6,  6, 32, 32, 32, 32,
-   24, 24, 24, 24, 24, 24, 24, 24,  9,  9,  9,  9,  9,  9,  9, 10,
-    1,  1,  1,  1,  1,  1,  1, 29, 21,  4,  4,  4,  4,  4,  4,  4,
-    1,  1,  1,  1, 29, 10, 10, 10, 29, 10, 10, 10, 10, 10, 10, 10,
-    1,  1,  1,  1,  1,  1,  1,  4,  6,  6,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  8,  8,  6,  6,  6,  6,  6,  6,  6,  8,  8,
-    8,  8,  8,  6,  6,  6,  6,  6,  9,  9,  9,  9,  9, 10, 11, 65,
-   73,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 86, 87, 88,
-   74,  6,  6,  6,  6,  6,  6,  6, 20, 20, 20, 20, 20, 20, 20, 20,
-   19,  8,  8,  8,  8,  8,  8,  8, 22,  1,  1,  1,  1,  1,  1,  1,
-   21,  1,  1,  1,  1,  1,  1,  1,  4, 17,  1,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1, 22, 14,  4, 17, 30,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1, 22, 18,  4, 22,  1,  1,  1,  1,  1,  1,
-   14, 14, 14,  9,  9,  9,  9,  9,  1,  1,  1,  1,  1, 21, 22, 14,
-   10, 10, 10, 10, 60,  7,  7,  7,100,  1,  1,  1,  1,  1,  1,  1,
-   14, 18,  4,  4,  4,  4,  4,  4,  1,  1,  1,  1, 13, 13, 13, 10,
-   20,  6,  6,  6,  8,  8, 79, 20,  6,  6,  6,  6,  8,  8,103, 20,
-   26, 26, 26, 26, 26, 26, 26, 26,  7,  7,  7,  7,  7,  3,  3,  3,
-   63,  7,  7,  7,  7,  7,  7,  7,  1,  1, 34,  1,  1,  1,  1,  1,
-    1,  1,  1, 46,  7,  7,  7,  7,  1,  1,  1,  1,  4,  4,  4,  4,
-    1,  1,  1,  1,  1,  1, 46,  7,  1,  1,  1,  1,  7,  7,  7,  7,
-    1,  1,  1,  1,  1,  1, 14, 18,  1,  1,  1,  1,  1,  1,  1, 21,
-    1,  1,  1,  1,  1,  1,  1, 27,  9,  9,  9,  9,  9,  3,  3,  3,
-   72, 10, 84, 10, 23, 85, 64, 10,  6,  6,  6,  6,  6, 89, 90,119,
-   72, 24, 24, 47, 91,120,121, 92, 36,  7, 74, 10,122,123,  7, 54,
-    8,  8,  8, 48,  8,  8,  8, 12,  6,  6,  6, 49,  6,  6,  6,  6,
-   12, 12, 12, 12, 19, 19, 19, 19, 19, 19, 19, 19,  6, 12, 12, 12,
-   12, 12, 12, 12,  8, 19, 19,  6, 19, 12, 12,  8, 19,  8,  6,  8,
-    8, 19, 12,  8, 12,  6,  8, 19, 12, 12, 12,  8, 19,  6, 12,  8,
-   19,  8, 19, 19, 12, 50, 12,  6,  1,  1, 93, 19, 94, 93, 19, 19,
-   19, 19, 19, 19, 19, 19,  6, 12, 19, 94, 12,  8, 12, 12, 12, 12,
-   12, 12,  6,  6,  6,  8, 19, 12, 19, 19,  8, 12, 12, 12, 12, 12,
-    6,  6,  1,  6,  6,  6,  6,  6, 13, 20, 20, 13, 13, 13, 13, 13,
-   13, 20, 20, 20, 20, 20, 20, 20, 13, 13, 55, 20, 20, 20, 55, 55,
-   12, 12, 55, 12,  6, 56,  6, 73, 20, 20, 20,124,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  8,  6,  6,  6,  6,  6,  6,  6,  6,  6, 19,
-    6,  8, 12,  6, 12, 12, 12, 12,  6,  6, 12, 75, 19, 12, 19,  8,
-   12, 33,  4,  4, 66, 12, 12, 12,  8, 19, 19, 19, 19, 19, 19,  6,
-    8,  8,  8,  8, 95, 10, 10, 10,  6,  6,  6,  6, 76, 26,125, 57,
-  126,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,127,
-   37, 31,  4, 37,  4,  4,  4,  4,  1, 29, 10, 10, 10, 10, 10, 10,
-   15, 15, 15, 11, 65, 67, 10,  3,  4,  4,  4,  4,  4, 31,128, 10,
-   38,  1,  1,  1,  1, 21,  4,  4,  9,  9,  9,  9,  9, 10, 10,  1,
-    1,  1, 39,  4,  4,  4, 96, 33,  4,  4, 68, 51, 40,  4,  4,  1,
-    9,  9,  9,  9,  9,  1, 41, 58, 10, 10, 10, 10, 10, 10, 10, 97,
-    4,  4,  4,  4,  4,  4, 22,  1,  1,  1,  1,  1,  1, 21,  4,  4,
-    4,  4, 13, 47, 10, 13, 51, 24,  1,  1,  1,  4,  4, 51,  4,  4,
-    4,  4, 51,  4, 51,  4,  4,  4,  1,  1,  1,  1, 21,  4,  4, 10,
-    1,  1,  1,  1,129,  1,  1,  1, 15, 15, 15, 69,  4,  4,  4,  4,
-    1,  1,  1,  1, 34,  4,  4,  4,  4, 69,  4,  4,  4,  4,  4,  4,
-    1,  1,  1,  1,  1, 17, 22, 14, 18,  4,  4,  4, 17, 14, 18, 14,
-   21,  4,  4,  4,  1,  1,  1,  1,  1,  4, 10,  9,  9,  9,  9,  9,
-   42,  1,  1,  1,  1,  1,  1,  1, 21, 14, 30,  1,  1,  1,  1,  1,
-   18,  4,  4, 17, 14, 14, 18,  1,  1,  1,  1, 27, 14, 14,  1,  1,
-    1, 24,  7,  7,  7, 57, 29,  4,  1,  1,  1,  1,  1,  1,  4, 14,
-   18,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4, 22,  1,  1,  1,
-    1,  1,  1,  9,  9,  9,  9,  9,  4,  1, 21, 10, 10, 10, 10, 10,
-   18,  4,  4,  4, 17, 14, 18,  4, 67, 24, 24, 24,130,  4,  4,  4,
-   18,  4,  4, 17, 14, 14, 18,  4,  4,  4,  4, 17, 14, 14,  1,  1,
-   58,  7,  7,  7,  7,  7,  7,  7,  1,  1,  1,  1,  1,  1,  1, 14,
-   17, 14, 14, 14, 14, 14, 18,  4,  1,  1,  1, 27, 14, 14, 14, 14,
-    7, 43,  3,  3, 57,  3,  3,  3, 17, 14, 22,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1, 22,  4, 17, 14, 14,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  1,  1,  1,  1,  9,  9,  9, 98,  7,  7,  7, 43,
-   21, 14, 39,  1,  1,  1,  1,  1, 14, 14, 14, 17, 14, 14,  4,  4,
-    4,  4, 17, 14, 14, 14,  1,  1, 99, 27, 14, 14, 14, 14, 14, 14,
-    4, 14,  1,  1,  1,  1,  1,  1, 18,  4,  4, 14, 14, 14, 18, 41,
-    3,  3,  1, 27,  7,  7,  7, 59,  7,  7,  7,  7, 43,  1,  1,  1,
-    1,  1,  1,  1,  1,  4,  4, 17, 14,  4,  4,  4, 14, 14, 14, 14,
-    9, 14, 10, 10, 10, 10, 10, 10, 21,  1,  4,  4,  4,  4,  4,131,
-    1,  1,  1, 51,  4,  4,  4, 31, 21,  1,  4,  4,  4,  4, 22,  1,
-    1,  1,  1, 13,  4,  4,  4,  4,  9,  9,  9,  9,  9,  9,  1,  1,
-   41,  3, 10, 10, 10, 10, 10, 10, 10, 44, 44,  3,  4,  3,  3,  3,
-    7,  7, 33, 33, 33, 23, 23, 14, 21,  4,  4,  4,  4,  4,  4, 17,
-    4,  4, 31,  4,  1,  1, 21,  4,  4,  4,  4,  4,  4,  4,  4,  3,
-    3,  3,  3, 40,  3,  3,  3,  3, 10, 10, 44,  3, 47, 10, 10, 10,
-    1,  1,  1,  1,  1, 27, 18,  4, 17,  4,  4,  4, 18, 17, 18, 22,
-    1,  1,  1, 14,  4,  1,  1,  4, 22, 14, 30, 27, 14, 14, 14,  1,
-   21,  4, 22,  1,  1,  1,  1,  1,  1, 17, 18, 17, 14, 14, 18, 27,
-    9,  9,  9,  9,  9, 14, 18,  3,  6,  6,  6,  6,  6, 76, 56,  6,
-    1,  1,  1,  1,  1,  1, 21,  4,  1,  1,  1,  1,  1,  1, 41, 39,
-  132,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,133, 70, 70,
-    1,  1,  1,  1,  1, 29, 10, 16,134,  1,  1,  1,  1,  1,  1,  1,
-    1,  4, 17, 14, 14, 14, 14, 30,  1,  4, 61, 10, 10, 10, 10, 10,
-    1,  1,  4, 18,  4,  4,  4, 14, 14, 14, 14, 17, 18,  4,  4,  4,
-    4,  4, 10, 42, 10, 67, 21,  4, 10, 10, 10, 77, 10, 37,  4, 69,
-    1, 34,  1,  1,  1,  1,  1,  1,  1,  1, 21, 22,  1,  1,  1,  1,
-    1,  1,  1,  1, 21,  1,  1,  1,  4, 17, 14, 18, 17, 14, 14, 14,
-   14, 17, 14, 14, 18,  4,  4,  4,  3,  3, 10,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  7,  7,  3,  1,  1,  1, 21, 17, 18,  4, 10,
-    1,  1, 27, 17,  4,  4,  4,  4, 17, 17, 18,  4,  4,  4, 17, 14,
-   10, 10, 10, 42, 10, 10, 10, 10,  4,  4,  4,  4,  4,  4,  4, 78,
-    4,  4, 30,  1,  1,  1,  1,  1,  1,  1, 17,  4,  4, 17, 17, 14,
-   14, 17, 30,  1,  1,  1,  1, 10, 44,  3,  3,  3,  3, 33,  4,  4,
-    4,  4,  3,  3,  3,  3, 47, 10, 27,  4,  4, 14,  4, 18,  4,  1,
-    1,  1,  1, 17,  4, 14, 18, 18,  4, 14, 14, 14, 14, 14, 10, 10,
-    1,  1, 14, 14, 14, 14,  4,  4,  4,  4, 14,  4,  4, 31, 10, 10,
-    9,  9,  9,  9,  9,  9, 99,  1,  6,  6,  6,  6, 19,  6,  6,  6,
-    4, 31,  4,  4,  4,  4,  4,  4, 17,  4,  4,  4, 22,  1, 21,  1,
-    1,  1, 22, 27,  4,  1,  1,  1,  6,  6,  6,  6,  6,  6, 13, 13,
-   13, 13, 13, 13, 13, 56,  6,  6,  6,  6,  6,  6, 56,  6,  6,  6,
-    6,  6,  6,  6,  6,101, 13, 13, 12, 12, 12,  6,  6,  6,  6, 12,
-    6,  6,  6,  6, 19,  8,  8,  8,  6,  6,  6,  6,  8,  8, 79,102,
-   62, 62, 62, 62, 62,135, 15, 15, 26, 26, 26, 10, 45,104, 45,104,
-   10, 10, 10, 10,136, 15, 15,137, 10, 10, 10, 10,105,106, 10,107,
-  108, 10, 52, 53, 10, 10, 10, 10, 10, 65,108, 10, 10, 10, 10,138,
-  139, 13,  7,  7,  7, 11, 52,140,  7,  7,  7,  7,  7, 11, 52, 70,
-    4,  4,  4,  4,  4,  4,141, 66, 78, 66, 78,  4,  4,  4,  4,  4,
-    3, 71,  3, 80,  3, 19,  8,  6,  8, 12, 80,  3, 75,  8,  8,  3,
-    3,  3, 71, 71, 71,  8,  8,142,  8,  8, 50,  1,109,  3,  6,  8,
-   11, 11, 75,  6,  6, 36,  3,110, 16,143,144, 16,111,  3,  3,  3,
-   11, 11, 35,  3,  3, 11,  3,  3, 35, 36,  3, 35,  3,  3,  3, 35,
-    3,  3,  3,  3,  3,  3,  3, 11,  3, 35, 35,  3,  3,  3,  3,  3,
-    3,  3, 11, 11, 11, 11, 11, 11,  3,  3,  3,  3, 23, 23,  3,  3,
-   11,  3,  3,  3,145,146,  3,  3,  3,  3,  3,  3,  3,  3, 35,  3,
-    3,  3,  3,  3,  3, 36, 11, 11, 11, 11,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3, 11, 11, 11,  3,  3,  3,  3,  3,  3,  3,
-    7,  7,  7,  7,  7,  7,  3,  3,  3,  3,  3,  3,  3,  7,  7,  7,
-    3,  3,  3, 36,  3,  3,  3,  3, 36,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3, 11, 11, 11, 11,  3,  3,  3,  3,  3,  3,  3, 36,
-    3,  3,  3,  3, 23, 23, 23, 23, 23, 23, 23,  7,  7,  7,  7,  7,
-    7,  7,  3,  3,  3,  3,  3,  3, 11, 11, 52,112, 11, 11, 11, 11,
-   11, 11, 11, 23, 23, 23, 23, 23, 11, 52, 28, 28, 28, 28, 28, 28,
-   28, 28, 28, 28,112, 11, 11, 11, 11, 11, 11, 11, 23, 23, 11, 11,
-   11, 11, 11, 11, 11, 11, 23, 11, 11, 11, 35, 36, 11, 11, 35,  3,
-   12,  8, 12, 19, 19, 19, 19,  8, 12, 12, 19,  6,  6,  6, 13,  8,
-   12, 12,110,  3,  3, 80, 19,147,  4, 12,  6,  6, 76, 10, 60, 10,
-    1,  1,  1,  1,  1,  1,  1, 34, 10, 10, 10, 10, 10, 10, 10, 37,
-   10, 45, 45, 10,105,106, 45, 10, 10, 10, 10, 64, 10, 77, 45, 10,
-   45, 23, 23, 23, 23, 10, 10, 42, 10, 10, 10, 10, 10, 26, 10, 10,
-   77,148, 10, 10, 10, 10, 10, 10,  3, 10, 81, 28, 28, 28,149, 26,
-   72, 10,150,113, 23, 23, 23, 23, 23,  3, 23, 23, 23, 23,114, 70,
-  151, 16, 16, 16, 16,  4,  4, 14,115, 13, 13,  3, 16,152, 29,  3,
-   58,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 21,153,116, 38,
-    1,  1,  1,  1,  1, 29, 13, 38,  3,  7,  7,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  7,  7,  7,  7,  1,  1,  1,  1,  1,  1,117, 10,
-   12, 12, 12, 12, 12, 12, 12, 21, 66,154,  4,  4,  4,  4,  4, 42,
-   12, 12, 12, 12, 12, 12, 13,  4,  1,  1,  1, 16, 16, 16, 16, 16,
-    4, 10, 10, 10, 10, 10, 10, 10, 20, 20, 20,116, 13, 13, 13, 13,
-   20, 12, 12, 12, 12, 12, 12, 12,  6, 12, 12, 12, 12, 12, 12, 12,
-   56,  6,  6,  6, 19, 19, 19, 12, 12, 12, 12, 12, 55,155, 19, 50,
-   12, 12,  6, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  8,  8, 12,
-    8,  8, 12, 12, 12, 12, 12, 12, 12, 12,  8,  8, 19, 19, 12, 12,
-   12, 12, 12, 12, 12, 12,  8,  8, 95, 13,156, 50, 13, 50,  1,  1,
-    1, 22,  1, 22,  1, 21,  1,  1,  1, 27, 18, 17,  3,  3,  4,  4,
-    7,  7,  7,  3, 82,  3,  3,  3,  1,  1, 10, 10, 10, 10, 10, 10,
-   14,  1,  1,  1,  1,  1,  1,  1,  1,  1, 14, 14, 14, 14, 14, 14,
-   14, 14,  4,  4,  4,  4,  4, 10,  4,  1,  1,  1, 10, 39, 39, 21,
-    1,  1,  1,  4,  4,  4,  4, 10,  1,  1,  1, 21,  4,  4,  4,  4,
-    4, 14, 14, 14, 14, 14, 14, 61,  1, 21, 14,  4,  4, 14,  4, 14,
-   61, 10, 10, 10, 10, 10, 10, 42,  1,  1, 21, 38,  1,  1,  1,  1,
-    1,  1,  1,  1, 21,  4,  4, 17, 18, 17, 18,  4,  4,  4,  4,  4,
-    1, 21,  1,  1,  1,  1, 17, 14,  9,  9,  9,  9,  9,  9, 10, 10,
-   38,  1,  1, 41,  3, 27, 17,  1, 22,  4, 22, 21, 22,  1,  1,  4,
-    1,  1,  1,  1,  1,  1, 34, 10,  1,  1,  1,  1,  1, 27,  4, 14,
-   10, 34,157,  4,  4,  4,  4,  4,  6,  6,  6,  6,  6,102, 13, 13,
-    6,  6,  6,  6,101, 20, 20, 20,  1, 27, 18, 14, 17, 61, 18,  4,
-    6,  6,  6,  6,  6,  6, 50, 22,  1,  1,  1,  1,158,  1,  1,  1,
-    1, 20, 20, 20, 20, 20, 20, 20, 20, 91,  3,  3,  3,  3,  3,  3,
-    3, 58,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 28,
-    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  3,  3,
-    1,  1,  1,  1,  1,  1, 82,  3, 10, 10, 10, 81, 53, 10, 10, 10,
-   64,159,160, 28, 28, 28, 28, 28, 28, 28, 53, 81, 53, 10,107,161,
-   10, 10, 10, 10,114, 28, 28, 53, 10,162, 11, 11, 67, 10, 10, 10,
-    1,  1,  1,  1,  1,  1,  1,163, 10, 10, 84, 10, 23, 85, 64, 10,
-    6,  6,  6,  6,  6, 89, 90, 52, 53, 23, 10,  1,  1,  1,  1,  1,
-   38,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,
-   24,164, 57, 24, 36, 11, 35,  3,  3,  3,  3,  3,165, 15,  3,  3,
-   10, 10, 10, 60,  7,  7,  7,  7,  7,  7,  7, 43,  3,  3,  3,  3,
-   16, 16,111,  7, 43,  3,  3,  3,  3,  3,  3,  3,  3,  7,  3,  3,
-    3,  3,  3,  3,  3,  3, 33,  4, 83,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7, 59,  1,113,  1,  1,  1,  1, 16, 16, 16,
-  166, 16, 16, 16, 16, 16, 16, 16,  8,  8,  8, 12,  6,  6,  6,  6,
-    1,  1,  1, 29,  7,  7,  7,  7,  1,  1,  1, 41, 63,  7,  7,  7,
-    1,  1,  1,  1,  1, 46,  7,  7,  1,  1,  1,  7,  7,  7,  7, 54,
-    1,  1,  1,  1,  1,  1,  7,  1,  1,  1,  1,  1,  1,  1, 46, 54,
-    1,  1,  1,  1, 58,  1,  1,  1,  1,  1, 21,  4,  4, 83,  7,  7,
-    6,  6,  6,  6,  6,  7,  7,  7,  1,  1,  4,  4,  4,  4,  4,  4,
-    9,  9,  9,  9,  9,  1,  1, 38,  8,  8,  8,  8,167,  4,  4,115,
-    6,  6,  6,  6,  6,  6,  6, 11,  1,  1,  1,  1,  1, 21,168, 26,
-   44,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,  4,  4,
-    7,  7,  7, 59,  1,  1,  1,  1, 83,  7, 54, 10, 10, 10, 10, 10,
-    1,  4,  4, 10, 10, 10, 10, 10,  1,  1, 46,  7,  7,  7,  7,  7,
-   18, 30,  1,  1,  1,  1,  1,  1,  4,  4,  4, 31, 10, 10, 10, 10,
-   10,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  9,  9,  9,  9,  9,
-   22, 21, 22,  1,  1,  1,  1, 21, 14, 18,  4, 17, 18, 31, 97, 10,
-   10,  4,  4,  4,  4,  4, 96, 15,  1,  1,  1, 21,  4,  4, 18,  4,
-    4,  4,  4,  9,  9,  9,  9,  9, 10, 10, 27, 30,  1,  1,  1,  1,
-    1, 21, 10,  1,  1,  1,  1,  1,  1, 27, 14,  4,  4,  4,  4, 17,
-   30,  1, 29, 10, 37,  4, 31, 18,  9,  9,  9,  9,  9, 29, 29, 10,
-   60,  7,  7,  7,  7,  7,  7,  7,  4, 14, 17,  4, 10, 10, 10, 22,
-   17, 14, 14, 14, 14, 14, 14, 14,  1,  1,  1, 27, 14, 14, 30,  1,
-    1, 14, 14,  4,  4,  4,  4,  4,  1,  1,  1,  1, 14, 18,  4,  4,
-    4, 14, 14, 14, 14, 14, 14, 17, 22, 22, 10, 10, 10, 10, 10, 10,
-   37,  4,  4,  4,  4,  4,  4,  4,  1,  1, 27, 14,  4,  4,  4,  4,
-   14,  4, 17, 22,  1, 29, 10, 10,  9,  9,  9,  9,  9, 10, 10, 22,
-   14, 18,  4,  4, 17, 17, 14, 18, 17,  4,  1, 39,  1,  1,  1,  1,
-   14,  4,  4,  4, 14, 14,  4, 18, 31, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10,  1,  1,  4,  4, 14, 18,  4,  4,  4, 17, 18, 18,
-   31, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 21, 18, 14,
-    4,  4,  4, 18, 29, 10, 10, 10,  1,  1,  1,  1,  1,  1, 21, 18,
-   14,  4,  4, 18,  4,  4,  4,  4,  9,  9,  9,  9,  9,  7, 10, 44,
-    4,  4,  4,  4, 18, 31, 10, 10,  7,  7,  7,  7,  7,  7,  7, 59,
-   14, 14, 14, 14, 14, 18, 17, 22, 30, 18, 10, 10, 10, 10, 10, 10,
-   27, 14,  4,  4,  4,  4, 14, 14, 22, 39, 14, 14, 14, 14, 14, 14,
-   21,  4,  4,  4,  4, 22,  1,  1,  1, 21,  4,  4, 17, 21,  4, 31,
-   10, 10, 10, 37,  4,  4,  4,  4, 21,  4,  4, 17, 18,  4,  1,  1,
-    1,  1,  1,  1,  1,  4,  4,  4,  4,  4,  4, 17,  4, 10, 39, 10,
-   17,  4, 17, 17, 14, 14, 14, 14,  4,  4,  4,  4,  4,  4,  4, 18,
-   10,  1,  1,  1,  1,  1,  1,  1,  4,  4,  4,  4, 17,  4,  4,  4,
-   17,  4, 18,  4,  4,  4,  4,  4,  4,  4,  4, 21,  4,  4,  4,  4,
-    1,  1,  1,  1,  1, 14, 14, 14,  4, 17, 18, 18,  1,  1,  1,  1,
-    1,  1,  1,  1, 34,  1,  1,  1,  1, 21, 17, 61, 10, 10, 10, 10,
-    4, 27,  1,  1,  1,  1,  1,  1,  1,  1, 14,  4,  4,  4,  4, 14,
-   17, 31, 10, 10, 10, 10, 10, 10,  9,  9,  9,  9,  9,  4,  4,  4,
-    7,  7, 43,  3,  3,  3, 57, 24, 82,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3, 47, 22,  1,  1, 21,  4,  4,  4,  4,
-    4,  4,  4,  4,  4, 14, 18,  4,  4,  4, 31, 10, 10, 10, 10, 10,
-    4,  4,  4, 31, 10, 10,  3,  3, 13, 13, 44,  3,  3,  3,  3,  3,
-    9,  9,  9,  9,  9,169,  7,  7,  7, 59,  1,  1,  1,  1,  1,  1,
-   13, 38,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 34,117, 10,
-    7,  7,  7, 54, 10, 10, 10, 10,  8,  8,  8,  8,  8, 12,  6,  6,
-   27, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 18,
-    4, 68, 13, 13, 13, 13, 13, 13, 13, 42,  4,  4,  4,  4,  4,  4,
-   14, 13, 16, 16, 16, 16, 16, 16,  1,  1,  1,  1,  1,  1, 33, 31,
-    3,  3,118, 18,  4,  3,118, 14, 14,170, 15, 15, 15, 69,  4,  4,
-    4, 40, 33,  4,  4,  4,  3,  3,  3,  3,  3,  3,  3,  4,  4,  3,
-    3,  4, 40,  3,  3,  3,  3,  3, 48,  6,  6,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6, 49,  6,  6,  6,  8,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8, 48,  6,  6,  6,  6, 49,  6,  6,  6,  8,  8,
-    8,  8, 48,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6, 49,
-    6,  6,  6,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 48,
-    6,  6,  6,  6, 49,  6,  6,  6,  8,  8,  8,  8, 48,  6,  6,  6,
-    6, 49,  6,  6,  6, 12,  6,  9,  4,  4,  4, 40,  3, 33,  4,  4,
-    4,  4,  4,  4,  4,  4, 40,  3,  3,  3, 33,  3,  3,  3,  3,  3,
-    3,  3, 40, 47, 10, 10, 10, 10, 10, 10, 10, 10, 10, 37,  4,  4,
-    6,  6,  6,  6,  6,109,  6,  6,  4,  4,  4, 68, 13, 13, 13, 13,
-    9,  9,  9,  9,  9,  9,  9, 41,  1,  1,  1,  1,  1,  1,  4,  4,
-    9,  9,  9,  9,  9,  9,  9,171,  1,  1,  1,  1,  1, 34,  4,  4,
-  172,  9,  9,  9,  9,  9,  9, 98,  1, 21,  1, 22,  1,  1,  1,  4,
-    1,  1, 21,  4,  4,  4,  4, 34,  6,  6,  4,  4,  4, 68, 13, 13,
-    7,  7,  7,  7,  7,  7, 63,  7,173,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7, 63,  7,  7,  7,  7,  7,  7, 43,  3,
-    3,  3,  3,  3,  3, 92, 20, 20,  2,  2,  7,  7,  3,  3, 26, 26,
-   12, 12,  4,  4,  5,  5, 15, 15,  9,  9, 13, 13, 21, 21, 25, 25,
-    9,  5,  6,  6, 10, 10,  1,  1, 14, 14, 12, 10, 10, 12,  5,  9,
-   24, 24,  7, 12, 12,  7, 22, 18, 23, 23,  0,  0, 17, 17,  7, 10,
-   18, 22,  7, 21, 10,  7, 12, 21,  8,  8, 26, 12,  7,  6, 25, 26,
-   26, 25, 21, 12,  6,  7, 21,  7, 12, 26,  7, 26, 21,  6, 15, 26,
-   21, 26, 20, 19,  7, 15, 26, 21,  9, 25,  5, 25,  5,  7,  6, 12,
-   25, 22, 18, 21, 15, 21,  6, 24,  6,  5, 26, 23, 26,  7, 15,  7,
-   21, 15, 10, 21, 29, 29, 26, 15, 21, 17, 25, 21, 11, 11, 21, 23,
-   12,  6,  1, 12, 18, 18,  9, 26, 29, 21, 21,  9, 24,  5, 25,  9,
-    5, 21, 17, 21, 11, 12,  8, 24, 26,  9, 21, 22, 23, 26, 12, 15,
-   23, 21, 21, 25,  9, 22, 21, 18, 24, 16,  5, 22, 25, 18, 24, 26,
-   26, 24,  9,  8,  8,  5,  9,  6, 12,  1, 21,  1, 13, 21, 13,  7,
-   17,  7,  5,  6,  5, 24,  9, 24, 22, 20, 21, 20, 19, 21, 21, 16,
-   16, 21,  7,  5,  5, 26, 14, 15, 18, 25,  7, 14, 17, 22, 17,  6,
-   24,  6,  6, 21, 26, 10, 25,  0,  7, 20, 25,  1, 24, 15,  7, 19,
-    9, 21, 17, 26, 23, 12, 17, 12,  1, 21, 24,  7, 23,  7, 12, 23,
-   29,  7,  7, 22, 14,  7, 29,  1, 27, 28,  1, 29, 21, 29, 15,  6,
-   18,  6, 12, 11, 26,  5, 14,  9,  5, 14, 26, 22, 18, 26,  5, 12,
-   22, 21, 18, 17, 26,  6, 26, 14, 14,  6, 12, 24, 11, 21, 24,  9,
-    6,  9,  6, 10,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,  7,  1,
-   25, 24, 26,  1, 21, 14,  9, 12, 12, 17, 13, 15, 10,  1, 13, 23,
-    7, 13, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10,
-   11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30,
-   31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,
-    0,  0,  0,  0, 41, 42, 43, 44, 45,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  7,  8,  0,  0,  0,  0,  9,  0,  0,  0, 10,
-   11, 12, 13,  0, 14, 15, 16,  0, 17, 18, 19, 20, 21,  1, 22,  1,
-   23,  1,  2,  1,  2,  1,  2,  0,  2,  1, 24,  1,  2, 25,  2,  0,
-   26, 27, 28, 29, 30, 31, 32, 33, 34, 35,  0, 36,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 37,  0,  0,  0,  0,  0,  0, 38,  0,  0,
-   39,  0,  0, 40,  0, 41,  0,  0,  0, 42, 43, 44, 45, 46, 47, 48,
-   49, 50,  0,  0, 51,  0,  0,  0, 52,  0,  0,  0, 53,  0,  0,  0,
-    0,  0,  0,  0, 54,  0,  3,  0, 55, 56,  0, 57,  0,  0,  0,  0,
-    0,  0, 58, 59, 60,  0,  0,  0,  0, 61,  0,  0, 62, 63, 64,  4,
-   65,  0,  0, 66, 67,  0,  0,  0, 68,  0,  0,  0,  0, 69,  0,  0,
-    0, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   71,  0,  0,  0, 72,  0, 73,  0,  0, 74,  0,  0, 75,  0,  0,  0,
-    0,  0,  0,  0,  0, 76, 77,  0,  0,  0,  0, 78, 79,  0, 80, 81,
-    0,  0, 82,  5,  0, 83,  4,  0, 84, 85,  0,  0, 86, 87, 88,  0,
-   89,  0, 90,  0, 91,  0,  0,  3, 92,  3,  0, 93,  0, 94,  0,  0,
-    0,  5,  0,  0,  0, 95, 96,  0, 97, 98, 99,100,  0,  0,  0,  0,
-    0,  3,  0,  0,  0,  0,101,102,  0,  0,  0,  0,  0,  0,103,  0,
-    0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,  6,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,  0,  0,  0,
-    0,111,  0,112,  0,  6,  0,  0,  0,  0,  0,113,114,  0,  0,  0,
-    0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,  0,  0,  0,
-    0,  0,  0,  0,118,  0,119,  0,  0,  0,  0,  0,  0,  0,  2,  1,
-    0,  0,  0,  0,  0,  0,  4,  0,  0,  0, 11,  0,  0,  0, 14,  0,
-    0,  0, 16,  3, 17, 18, 19, 20, 21, 22,  0, 23,  0,  0,  0,  0,
-   24, 25, 26, 27,  0,  0,  0,  0, 28,  0,  0, 29, 30,  0, 31,  0,
-   32, 33,  0,  0, 34,  0, 35, 36,  0,  0,  0,  0,  0, 37, 38,  0,
-   39, 40,  0,  0, 41,  0,  0,  0, 42,  0,  0, 43, 44, 45, 46,  1,
-   47,  0,  0,  1,  0,  0,  7,  1, 48,  0,  0,  0,  0,  0, 49, 50,
-    0,  0,  0,  0,  0,  0, 51, 52,  0,  0,  0,  0,  0,  0, 53, 54,
-    0,  0,  0,  0, 55,  0, 56,  0,  0,  0, 57, 58,  0,  0,  0, 59,
-    0,  0,  0,  0,  0,  0, 60, 12,  0,  0,  0,  0, 61,  0,  0,  0,
-   62,  0,  5,  0, 63,  0,  0,  0,  0, 64,  0,  0,  0,  0, 65,  0,
-   66,  0,  0,  0,  0,  6, 67,  0,  0,  0, 68, 69, 70, 71,  0,  0,
-    0,  0, 72,  5,  0, 73, 74,  0,  0, 75,  0,  0,  0, 76, 77,  0,
-    0,  0, 78,  0, 79, 80, 81, 82, 83,  3, 84,  0, 85, 86, 87,  0,
-    0,  8,  9,  0,  0,  3,  3,  0,  0, 88,  0,  0, 89,  0,  0,  0,
-    0,  8, 90,  0, 91,  0,  0,  0,  0,  0,  9, 10,  0, 92,  0,  5,
-    0,  3,  9,  0,  0, 93,  0,  0, 94,  0,  0,  6,  0,  0,  0,  0,
-    0,  0, 95, 96,  0,  0, 10,  0,  0,  1,  0,  0, 97,  0,  0,  0,
-    0, 98,  0,  0,  0,  0, 12,  0,  0, 13,  0,  0,  0,  0, 99,100,
-    0,  0,101,  0,  0,102,  0,  0,  0,103,  0,  0,  0,104,  0,  0,
-    0,105,  0,  0,  0,  0,106,107, 13,  0,  0,108,  0,  0,  0, 10,
-    0,  0,109,110,  0,  0,111,112,  0,  0,  0,  0,  0,  0,113,  0,
-    0,114,  0,  0,  0,  0,115,  1,  0,116,117,118,  6,  0,  0,119,
-    7,  0,  0,120,  0,  0,  0,121,  0,  0,  0,  0,  0,  0,122,  0,
-    0,123,  0,  0,  0,  0,124, 11,  0,  0,  0,  0,  0,  6,  0,  0,
-    0,  0,  5, 15,  0,  0,  0,  0,125,  0,  0,126,  0,  0,  0,  0,
-   15,  0,  0,127,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,128,  0,
-    0,  0,129,  0,130,  0,  0,  0,  0,131,132,133,  0,134,  0,135,
-    0,  0,  0,136,137,138,  0,  8,  0,  0,  0,  0,  0,  7,  0,  0,
-    0,139,  0,  0,  0,140,  0,  0,  0,141,  0,  0,  0,142,143,  0,
-  144,  0,  0,145,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  9,
-    1,  1,  1,  1,  0,  0,  0,  2,  0,  3,  0,  0,  3,  0,  0,  0,
-    0,  0,  0, 19,  0,  0,  0,  6, 11,  0,  0,  0,  0, 14,  0,  0,
-   15,  0,  0,  0,  0,  0,  0, 17, 29,  0,  0,  0,  0,  0, 31,  0,
-    0,  2,  0,  0,  1, 12,  0,  0,  1, 49, 50,  5, 51, 52, 53,  5,
-    5, 22, 32, 23,  1, 54, 24, 55, 16, 33, 56, 57, 58,  1,  1,  1,
-    6,  1,  0,  0, 59,  7, 60,  1, 34,  5,  7, 61, 62, 63, 64, 65,
-   66, 67,  0,  0,  1,  1, 68,  0,  0,  0, 69, 70, 71, 35,  1, 25,
-   72,  0,  0,  0,  0,  8,  1, 26, 16, 26, 73, 27, 74,  0,  0,  0,
-   36, 25, 75, 37,  7, 37, 76,  0,  0,  0,  6,  1,  7,  0,  0, 17,
-    0,  8, 38,  1,  1, 13, 13, 11,  0,  0, 39,  0,  0,  6, 18,  1,
-    0,  0,  8, 16,  5,  1,  1,  1, 77,  7, 36, 18, 78,  7, 35,  1,
-   79, 10,  0,  0,  0, 80,  0,  0,  0,  0,  2,  3,  0,  0, 14,  0,
-    0,  0, 81,  0,  0,  0, 82,  0,  0,  0, 83,  0,  0,  0, 84,  0,
-    0,  0, 40,  0,  0, 85, 86,  0, 87, 88, 89, 90, 91, 92,  0,  0,
-    0, 93,  0,  0,  0, 15, 28,  0,  0,  0,  0, 13,  0, 41,  0,  0,
-   14,  0,  0, 20,  0,  0, 94,  0,  0,  0, 95,  0,  0,  6, 29,  0,
-    0, 13,  1, 96,  1, 18, 33, 97, 25, 23,  7,  1,  1,  1,  1, 27,
-    1,  7, 98,  0,  0,  9,  0,  0,  0,  0,  6, 23,  1,  0,  0,  0,
-    0,  0, 30,  0,  0, 21,  0,  0, 30,  0,  0,  0,  0, 15,  0,  0,
-   12, 32, 24,  5, 99, 22, 42, 17,  0, 10, 11,  0,  7,  1,  7,100,
-  101,  1,  1,  1,  1,102,103,104,105,  1,106, 10, 20,107,108,  5,
-   10,  0,  0,  0,  0,  0,109,110,  0,  0,111,  0,  0,  1,  1, 11,
-    0,  0,  0,  8,  0,  0,  0,  3,  0,  0, 43, 40,  2,  0,  0,  0,
-   44,112, 10,  8, 20,  0,  0,  0,  0,  0,  0,113,  1, 16,  5, 24,
-    0,  8, 12,  0,  0,  0,  0,114,  0,  0,115,  2,  0,116,  0,  0,
-    0,  1,  0,  0,  0,  0, 13, 11,  0,  0,  6, 10,  0,  0, 45, 39,
-    0, 45, 16, 18, 46, 27,  0,  0,  3,  0,  0,  2, 12,  0,  0,  0,
-    2,  3,  0,  0,  3,  0, 21,  0,  0, 31,  0,  0,  0,  0,117,  0,
-    0,  0, 15,  9,  0,  8,  1, 10,  1, 10,  0,  0,  0,  0,  0, 30,
-   14, 21,  0,  0, 47,  0,  0,  0,  9,  0,  0,  0,  0, 47,  0,  0,
-    0,  0,  2,  0,  0,  0,  0, 28,  0,  0,  4,  0, 21, 41,  0,  0,
-   28,  0,  0,  0, 22, 42,  0,  0,118,  0,  0,  0,  0,  0,  0,119,
-    0,120,121,122,123,  0, 43,  5, 48, 13, 34,  0,  0,  0,  8, 11,
-    8, 10,  0,  0,  1, 12,  1,  1,  1,  1, 26,  1, 38, 44, 12,  0,
-    0,  0,  0,  1,  0,  0,  0,124,  0,  0,  0, 46,  6, 19,  0,  8,
-    0, 20,  0,  0,  5, 48,  0,  0,  0,  1,125,  0,  0,  0,  0,230,
-  230,230,230,  0,  0,  0,  9,  9,  0,  0,  0,  0,  9,  0,  0,220,
-  220,220,220,  0,  0,  0,230,230,230,220,230,  0,  0,230,230,  7,
-    0,  0,  0,230,  0,  0,  0,230,230,  0,  0,230,230,230,  0,  0,
-  230,230,230,  0,  0,  9,  0,  0,  0,  0,  7,230,230,230,220,  0,
-  220,  0,  0,230,220,220,220,  0,  0,230,  0,  0,230,  0,  0,  0,
-    0,  7,  0,  1,  1,  1,  1,220,230,230,230,220,220,230,230,220,
-  230,230,220,230,  0,  0,230,230,220,  0,  0,  0,  9,  9,  0,220,
-    0,  0,  0,  0,  0,  9,  9,  0,  9,  7,  0,  1,220,220,220,220,
-  220,220,230,230,230,220,220,230,220,220,230,230,220,230,230,220,
-  230,220,230,230,230,  0,230,  0,220,220,220,220,220,  0,  0,  9,
-    9,  0,  0,  1,  0,  0,  0,  0,  0,  0,220,230,  0,230,230,  0,
-    0,220,220,  0,  0,230,220,  0,  0,  9,  7,220,220,220,  0,230,
-  232,220,220,220,220,232,216,220,202,202,220,220,220,220,202,202,
-  220,220,220,230,240,230,220,230,220,220,  0,232,220,220,230,233,
-  234,234,233,234,234,233,230,  0,220,230,230,230,230,222,220,230,
-  222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21,
-   22,  0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,
-    0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35,  0,  0,  0,230,
-    0,220,230,  0, 36,  0,  0,220,220,230,220,220,230,230,  0,230,
-  230,  0,220, 27, 28, 29,230,  0,230,220,230,  0, 84, 91,  0,103,
-  103,  9,  0,107,107,107,107,118,118,  9,  0,122,122,122,122,  0,
-  220,  0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,
-    0,130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,
-    0,220,  0,  0,228,  0,  0,  0,222,230,220,230,  0,  0,220,230,
-  220,  0,220,230,230,230,234,230,  0,  1,  1,230,234,214,220,202,
-  230,230,230,230,230,232,228,228,220,218,230,233,220,230,220,230,
-  230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,
-    0,218,228,232,222,224,224,  0,  8,  8,  0,220,  0,  0,230,  0,
-    0, 26,  0,  0,220,  0,230,230,  1,220,  0,  0,230,220,  0,  0,
-    7,  9,  0,  6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,
-    1,  0,  0,  0,226,216,216,216,216,216,  0,232,232,220,230,230,
-  230,  7,  0,  1,  0,  0, 32,  0, 48,  0,  0, 84, 96,135,144, 10,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,176,  0,  0,  0,  0,  0,  0,  0,  0,  8, 16, 24,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0, 40,  0,  0,
-    0,  0,  0, 48, 56, 64,  0,  0,  0,  0,  0, 72, 80, 88, 96,104,
-    0,  0,  0,  0,  0,  0,  0,  0,112,  0,120,  0,  0,  0,  0,  0,
-    0,128,136,144,152,160,168,  0,  0,  0,176,184,192,  0,  0,  0,
-    0,  0,  0,200,  0,  0,  0,  0,  0,  0,  0,  0,208,  0,  0,216,
-  224,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,
-   36,  0,  0,  0, 24,  0,  0,  0, 24,  0,  0,  0,  0,  0, 64,  0,
-   68,  0,  0,  0,  0,  0,  0,  0, 28,  0,  0,  0, 72,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 40, 20,  0,  0,  0,  0,  0,  0,
-   20,  0, 20,  0,  0,  0,  0,  0,  0,  0, 76, 80, 84, 88,  0,  0,
-   12, 92, 96, 28,  0,100,104,  4,  4,  4,108, 44,112,116,120,  4,
-  124,  0,128,132,  4,  4, 48,136,140,  0, 32,  0,  0,  0, 40,  0,
-    0,  0,  0,  0,  0,  0,  4, 48,  0, 52,144, 20,148,152,  4,  0,
-    0,156,160,164,168,172,  4,  0,176, 56, 60,180, 32,  0, 16,184,
-   56,  0,  0,  0,  0,  0, 52, 12, 12,  0,  0,  0,  0, 12,  0,  0,
-  188,  8,  8,  8,  8,192,196,  8,  8,  8,  8,200,204,208,212, 60,
-   44,  0,  0,  0,  0,  0,  0,  0,216, 28,220,  0, 12,  4, 16,  0,
-    0,  0,  0,224,228,  0,  0,  0,  0,  0,  4,232, 32,  0,  0,  0,
-    0,  0,  0,  0,236, 12,  0,  0,  0,  0, 16,  0, 36,  0,  0,  0,
-   24,  0,  0,  0,240,244,  0,  0,  0,  0,  2,  2,  2,  2,  4,  4,
-    4,  4,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,  6,  8,  0, 10,
-   12,  0,  0,  2,  2,  0,  2,  2,  0,  0,  0,  0, 14, 16,  6,  8,
-    0,  0,  4,  8,  0,  0,  2,  2,  2,  0,  0,  6,  4,  8,  2,  0,
-    2,  0,  0,  0,  0,  6,  0, 20,  0,  0,  0, 22,  0,  0,  0,  6,
-    8,  0, 24, 26, 28,  0,  0,  0, 30,  0,  0,  0,  0, 32, 34, 36,
-   38,  0,  0, 40, 42,  0,  0,  0, 18,  0,  0,  0,  2,  2,  2,  2,
-    0,  2,  2,  2,  0,  6, 44,  0,  0,  0,  0,  2,  0, 46, 48, 50,
-    0,  0, 52,  0,  0,  0,  6,  4, 54,  0,  2,  0,  0,  2,  2, 56,
-   58, 60,  0, 62, 64, 18,  2, 10, 12,  0,  0,  0, 66,  8,  0,  2,
-    2,  2,  0,  6,  4,  4,  4,  4, 68,  2, 70,  4,  4,  4,  8, 72,
-    0,  0, 74, 76,  2,  0, 78,  0,  0,  0,  4,  8,  2,  0,  0,  0,
-   80,  0,  6,  4,  4,  4,  4,  8,  0,  2,  2,  2,  2,  6,  4,  4,
-    4,  8,  0,  0,  0, 82,  0, 84, 86,  0,  0,  0,  2, 88,  0,  0,
-    0, 90,  6,  8,  2,  0,  0,  0,  6,  4,  4,  4,  8,  0,  2,  0,
-    2,  2,  6,  4,  4,  8,  0, 10, 12,  6,  8,  2,  0,  0, 50, 84,
-  118,152, 17,161, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  7,  8,  9, 10, 11,
-   12, 13, 14, 15,  5, 16, 17, 18,  1,  1,  1,  1,  1,  1, 19,  1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1,  1,  1, 20, 21, 22,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  0,  0,  0,  0,  0,  0,  0,  0, 23, 24, 25, 26, 27, 28, 29,
-   30, 31, 32, 33, 34,  0, 35,  4,  4,  4,  4,  4, 36,  0,  0,  0,
-    0,  0,  0, 37,  0, 38, 39,  3,  3,  3,  3,  3,  3, 40, 41,  0,
-    0,  0,  0,  0,  0,  0, 42, 43,  0,  0, 44,  0,  0,  0, 45, 46,
-    5, 47, 48, 49, 50, 51, 52, 53,  5,  5,  0,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  6,  0,  0,  6,  0,  1,  1,  1,  1,  1,
-    1,  1,  1,  1,  1,  1,  1,  1, 54,  0,  0, 55,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,
-    1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  4,  4,  4,  4,  4,
-    4,  4,  4,  5,  5,  5,  5,  5,  5,  5,  5,  3,  3,  3,  3,  3,
-    3,  3,  3,  1,  1,  1,  1,  1,  0,  0,  0, 26, 27,  8,  8,  8,
-   28, 29, 30, 19, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-   43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,  2,  2, 13,
-   13, 13, 56, 11, 11, 11, 11, 11, 57, 58, 59, 60, 61, 62, 63, 64,
-   65, 66, 67, 68, 69, 70, 71,  8,  8, 16, 16, 72, 73, 74, 75,  3,
-    3,  3,  3, 20, 20,  3,  3,  3,  3,  3,  3, 76, 77, 78, 79,  3,
-    1,  1, 80, 81, 82, 83, 84, 85, 86, 87,  3,  1,  1,  1, 88,  1,
-    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  7,  7, 89, 21, 21, 90,
-   91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,  0,  0,  1,  1,  1,
-    1,102,  9,  9,  9,103,  9,104,105,106,107, 22, 22,108,109,  0,
-  110,111,112,113,114,115,116, 17, 17, 17,  8,117,118,119,120,121,
-  122,123,124,125,126,127,128,  9,129,130,131,132,133,134,135,136,
-  137,138,139,140,141,  0,142,143,144,145,  0,146,147,148,149,150,
-  151,152,153,154,155,156,157,  0,158,159,160,  6,  6,  6,  6,  6,
-    6,  6,  6,  6,  6,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,161, 12, 12, 12, 12, 12,  0,  0,  0,  0,  0,162,  0,  0,
-    0,  0,  0, 14, 14, 14, 14,163,164, 23, 23,  0,  0,165,  0,166,
-  167,168,169,  4,  4,  4,  4,  4,  4, 15, 15, 15, 15,  4,  4,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,171,172,173, 18, 18,
-   18,  0,  0,174,175,  0,  0,  0,  0,  0,  0,  3,  3,  3,  3,  3,
-    3,176,  3,  3,  3,177,178, 16,  3,  3,  0, 10, 10, 10, 10, 10,
-   10,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,179, 19,180,  0,  0,
-  181,  0,  0,  0,182,  0,183,  0,184,  0, 13, 24, 24,185,  0,  0,
-    0,  0,  0,  3,  3,  3,  0,  9,  9,  0,  0,  3,  3,  3,  3,186,
-    0,  3,  3,  1,  0,  0,  0,  0,  0,  0,  0,  3,  0, 25, 25,  0,
-    0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  2,
-    2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,  4,
-    4,  4,  4,  4,  4,  4,  4,  5,  5,  5,  5,  5,  5,  5,  5,  8,
-    8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,  7,
-    7,  7,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,  6,  6,  6, 10,
-   10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 16,
-   16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, 12, 12, 12, 13,
-   13, 13, 13, 13, 13, 13, 13, 18, 18, 18, 18, 18, 18, 18, 18, 17,
-   17, 17, 17, 17, 17, 17, 17, 20, 20, 20, 20, 20, 20, 20, 20, 19,
-   19, 19, 19, 19, 19, 19, 19, 15, 15, 15, 15, 15, 15, 15, 15, 25,
-   25, 25, 25, 25, 25, 25, 25, 23, 23, 23, 23, 23, 23, 23, 23, 26,
-   26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 28,
-   28, 28, 28, 28, 28, 28, 28, 14, 14, 14, 14, 14, 14, 14, 14,  3,
-    3,  3,  3,118,119,118,119,  3,  3,156,156,  7,157,  7,157,  7,
-    7,  7,158,  3,  3,180,  3, 14, 14, 14, 14, 14, 14, 14,181,182,
-   17, 17, 17, 17, 17,183, 17,184, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15,185,100,100,100,100,100,186, 40, 40, 40, 40, 40, 40,187,
-  188,  6,  6,189,190,  6,191,  6,  6,  6,  6,  6,192,  6,  6, 85,
-   85, 85, 85, 85,  6,  6,  6,120,120,120,120,121,121,121,121,122,
-  122,122,122,159,159, 85,  6,  6,  6,  6,  6,  6,  6,193,  6, 30,
-   30, 30, 30, 30,194,195, 30, 45, 45, 45, 45, 45, 45, 45, 45, 46,
-   46, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 48,
-   48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 49,
-   49, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51,
-   51, 51, 51, 51, 51, 51, 51, 41, 41, 41, 41, 41, 41, 41, 41, 81,
-   81, 81,196, 81, 81, 81, 81, 52, 52, 52, 52, 52, 52, 52, 52, 29,
-   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,197, 29, 29, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 35, 35, 35, 35, 35,198, 12,
-   12, 36, 36, 36, 36, 36, 36,160,160,101,101,101,101,199,101,161,
-  161,200,201,162,162,163,163, 37, 37, 37, 37, 37, 37, 37, 37,202,
-   33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 11, 11, 11, 11, 11,102,
-  102,102,102,102,140,140,140, 86, 86, 86, 86, 86, 86, 37, 37,164,
-  164, 42, 42, 42, 42, 42, 42, 42, 42, 42, 14, 14, 14, 14, 14, 53,
-   53, 53, 53, 53, 53, 53, 53,103,103,103,103,123,123,123,123,104,
-  104,104,104,104,141,141,141, 15, 35, 35, 35,103,203,204,205,  7,
-    7,206,  7,  7,207,208,209,  7,  7,  7,210, 14, 14, 14, 14,211,
-    3,  3,  3,  3,  3,  3,212,  3,  7,  3,  3,  3, 14, 14, 14,  3,
-    3,213,214,215,  3,  7,  7,158,  3,  3,  3,  3,  3,  3,  3, 43,
-   43, 43, 43, 43, 43,  7,  7, 54, 54, 54, 54, 54, 54, 54, 54, 35,
-   35, 35,105,105,105,105,105, 12, 12, 12, 12, 12, 12, 15, 15,  1,
-    1,  1,  1,  1,  1,  1,  3,216,  3,217,218,219, 22, 22, 22, 22,
-  220,165, 21, 21, 21, 21,221,106,106,106,222,  2,  2,  2,  2,  2,
-    3,106,106,  3,  3,  3, 21,  2,  2,  3,  3,  3,  3,  2,223,  3,
-    3,  3,  3,  3, 21, 21,224, 21, 21, 21, 21, 21,225,  3,  3,  1,
-    1,  1,  1,  3,  3,  3,  3,  9,  9,  9,  9,  9, 82, 82, 82, 23,
-   23, 23, 23, 15, 15, 15, 15, 15, 15, 13, 13, 13, 13, 13, 13,  3,
-    3,226,  7,  7,  7,  7,  7,227,  7,  7,  7,  7,  7,  7,  7,142,
-  142,142,  3,124,124,124,124, 87, 87, 87, 87, 87, 87, 30, 30,166,
-  166,228,143,143,143,  2,  2,107,107,107,107,229,107, 24, 24, 88,
-   88, 88, 88, 88, 88, 24, 24, 89, 89, 89, 89, 89, 89, 90, 90, 12,
-   12, 12,  7,  7,230,231, 36, 36, 36, 36, 36, 90, 90, 90, 90,  7,
-  232, 40, 40, 40,  6,  6,  6,  6,  6,  6,233,  6,  6,  6,  6, 14,
-    3,234,  3,  3,  3,  3,  6,  6,  6,  6,  6,  6,  6,  6,235,  3,
-    3,118,119,118,119,236,165, 21,237,  2,  2,  2,  2,  3,  3,  3,
-    3,  3,  3, 17, 17, 17, 17, 17,  3, 17, 17, 17,  3,  3,238,167,
-  167,125,125,125,125,239,  3,144,144,144,168,168,145,145,145,169,
-  169, 91, 91, 91, 91, 91, 91,108,108,108,108,108,146,146,146,147,
-  147,147,109,109,109,109,109,148,148,148,126,126,126,126,110,110,
-  110,110,110,127,127,127,127,128,128,128,128,170,170,171,171, 92,
-   92, 92, 92, 92, 92,172,172,173,173,174,174,129,129,129,129,175,
-  175, 93, 93, 93, 93, 93, 93, 94, 94, 94, 94, 94, 94,176,176,130,
-  130,130,130,131,131,131,131,132,132,132,132,177,177,178,178, 55,
-   55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57,
-   57, 57, 57, 57, 57, 57, 57,133,133,133,133, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34,134,134,134,134,240,  6,  6,  6,149,
-  149,149,135,135,135,135,136,136,136,136,150,150,150,179,179, 58,
-   58, 58, 58, 58, 58, 58, 58,111,111,111,111,111,151,151,151,112,
-  112,112,112,112,152,152,152, 59, 59, 59, 59, 59, 59,241, 41, 60,
-   60, 60, 60, 60, 60, 60, 60,153,153,153,113,113,113,113,113, 83,
-   83, 83,242, 83, 83, 83, 83, 61, 61, 61, 61, 61, 61, 61, 61, 62,
-   62, 62, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63, 64,
-   64, 64, 64, 64, 64, 64, 64, 95, 95, 95, 95, 95, 95, 33, 33,114,
-  114,114,114,114, 24, 24, 24, 65, 65, 65, 65, 65, 65, 65, 65, 66,
-   66, 66, 66, 66, 66, 66, 66, 67, 67, 67, 67, 67, 67, 67, 67, 68,
-   68, 68, 68, 68, 68, 68, 68, 69, 69, 69, 69, 69, 69, 69, 69,115,
-  115,115,115,115, 96, 96, 96, 96, 96, 96, 11,137,137,137,137, 30,
-   30, 30, 30, 30, 30, 59, 59, 70, 70, 70, 70, 70, 70, 70, 70, 84,
-   84, 84, 84, 84, 84, 84, 44, 44, 44, 44, 44, 44, 44, 44, 44, 97,
-   97, 97, 97, 97, 97,116,116,116,116,116,117,117,117,117,117, 71,
-   71, 71, 71, 71, 71, 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 82,
-   82, 82, 82, 32, 32, 32, 32, 73, 73, 73, 73, 73, 73, 73, 73, 74,
-   74, 74, 74, 74, 74, 74, 74, 13, 13, 13, 13,154,154,154, 98, 98,
-   98, 98, 98, 98,155,155,155, 75, 75, 75, 75, 75, 75, 75, 75, 38,
-   38, 38, 38, 38, 38, 38, 38, 38, 38, 99, 99, 99, 99, 99, 99, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,243,  1, 21,
-   21, 21, 21, 21, 21, 21, 21,244, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 21,245, 22,246, 21, 19, 39,
-   39, 39, 39, 39, 39, 39, 39, 39, 39,  3,  3,  3,  3,  3,  3, 14,
-   14, 14, 14, 14,  3,  3,  3,  3,  3,  3,  3,  3,  3,247,248,249,
-    3,250,  3,  3,  3,  3,  3, 43, 43, 43, 15, 15, 15, 15, 15, 76,
-   76, 76, 76, 76, 76, 76, 76,138,138,138,138,139,139,139,139, 77,
-   77, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79,
-   79, 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80,251,
-    3,  3,  3,  3,  3,  3,  3,  0,  0,  0,  0,  1,  1,  1,  1,  2,
-    2,  2,  2,  3,  3,  3,  3,  4,  4,  4,  4,  5,  5,  5,  5,  6,
-    6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10,
-   10, 10, 10, 11, 11, 11, 11, 13, 13, 13, 13, 14, 14, 14, 14, 12,
-   12, 12, 12, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 18,
-   18, 18, 18, 21, 21, 21, 21, 22, 22, 22, 22, 19, 19, 19, 19, 20,
-   20, 20, 20, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26,
-   26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30,
-   30, 30, 30, 31, 31, 31, 31, 33, 33, 33, 33, 32, 32, 32, 32, 34,
-   34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37, 38,
-   38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40, 41, 41, 41, 41, 42,
-   42, 42, 42, 43, 43, 43, 43, 44, 44, 44, 44, 46, 46, 46, 46, 47,
-   47, 47, 47, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51,
-   51, 51, 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 45,
-   45, 45, 45, 55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 58,
-   58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 61, 61, 61, 61, 62,
-   62, 62, 62, 63, 63, 63, 63, 64, 64, 64, 64, 65, 65, 65, 65, 66,
-   66, 66, 66, 67, 67, 67, 67, 68, 68, 68, 68, 69, 69, 69, 69, 70,
-   70, 70, 70, 71, 71, 71, 71, 72, 72, 72, 72, 73, 73, 73, 73, 74,
-   74, 74, 74, 75, 75, 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, 78,
-   78, 78, 78, 79, 79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 83,
-   83, 83, 83, 82, 82, 82, 82, 84, 84, 84, 84, 86, 86, 86, 86, 87,
-   87, 87, 87, 88, 88, 88, 88, 89, 89, 89, 89, 90, 90, 90, 90, 91,
-   91, 91, 91, 92, 92, 92, 92, 93, 93, 93, 93, 94, 94, 94, 94, 95,
-   95, 95, 95, 96, 96, 96, 96, 97, 97, 97, 97, 98, 98, 98, 98, 99,
-   99, 99, 99,100,100,100,100, 85, 85, 85, 85,102,102,102,102,103,
-  103,103,103,104,104,104,104,105,105,105,105,106,106,106,106,107,
-  107,107,107,101,101,101,101,108,108,108,108,109,109,109,109,110,
-  110,110,110,111,111,111,111,112,112,112,112,113,113,113,113,114,
-  114,114,114,115,115,115,115,116,116,116,116,117,117,117,117,175,
-    7,  7,  7,  7,  7,174,  3,118,118,118,118,119,119,119,119,120,
-  120,120,120,121,121,121,121,122,122,122,122,123,123,123,123,124,
-  124,124,124,125,125,125,125,126,126,126,126,127,127,127,127,128,
-  128,128,128,129,129,129,129,130,130,130,130,131,131,131,131,132,
-  132,132,132,133,133,133,133,134,134,134,134,135,135,135,135,136,
-  136,136,136,137,137,137,137,138,138,138,138,139,139,139,139,140,
-  140,140,140,141,141,141,141,142,142,142,142,143,143,143,143,144,
-  144,144,144,145,145,145,145,146,146,146,146,147,147,147,147,148,
-  148,148,148,149,149,149,149,150,150,150,150,151,151,151,151,152,
-  152,152,152,153,153,153,153,  3,  3,177,  3,  7,174,  7,  7,  7,
-    7,179,  3,155,155,155,155,156,156,156,156,157,157,157,157,158,
-  158,158,158,159,159,159,159,160,160,160,160,182, 19, 19, 19,154,
-  154,154,154,161,161,161,161,162,162,162,162,163,163,163,163,164,
-  164,164,164,165,165,165,165,166,166,166,166,167,167,167,167,168,
-  168,168,168,169,169,169,169,170,170,170,170,171,171,171,171,172,
-  172,172,172,173,173,173,173,  7,179,194,  3, 17,195, 17,196, 17,
-  197, 17, 17,198, 45, 45, 45, 15,199, 15, 15,200, 85, 85, 85,183,
-   40, 40, 40,  6,184,  6,185,  6,  6,180,180,185,  6,201, 12, 12,
-  202,  6,  6,203,  6,  6,  6,  6,  6,  6,184,204,  6,  6,  6,205,
-  206, 30, 30, 30,207, 30, 30, 81, 81, 81,208, 29,209,210, 29, 35,
-   35,211, 35,102,102,212,213,176,176,176,176,176,214,  3,  3,215,
-  216, 32, 32,186, 12, 12, 12,217, 12,181,218,  3,181,178,  3,  7,
-  187,219,  7,  7,  7,  7,220,221,187,222,  7,  7,  7,223,  7,  7,
-    7,  7,224,  3,  3,  3,178,175,  3,  3,188,  3,225,189,  3,177,
-    3,  3,  3,  3,  3,  3,177,  3,226,  3,  3,227,  1,228,229,  3,
-    3,  1,  3,190, 20, 20, 20, 20, 20,230,190, 19, 19,191,182,231,
-    2,  2,  2,  2,  2,  2,232, 19, 19, 19,191, 19, 19,  3,  3,189,
-    7,  7,  7,  7,  7,188,  7,154,154,154,233,101,101,101,234,  7,
-    7,174,  7,  7,235,236,  3,237, 85, 85,183,  6,  6,  6,238, 12,
-   12, 12,239,  6,  6,  6,180,  3,240, 19, 19, 19, 19, 19,241,  3,
-    3,  3,192,181,  3,  3,  3,242,  6,  6,  6,243, 41, 41, 41, 82,
-   82,244, 82,245, 18, 18, 18,246, 20, 20, 20,247, 20, 20, 20, 20,
-  248, 19, 19,  3,193,178,  3,  3,  3,193, 12,186,192, 12,  3,  3,
-    3,249,178,250,  3,  3,  3,  2,  2,  2,  2, 13, 13, 13, 13, 12,
-   12, 12, 12,  0,  0,  0,  0,136,136,136,136, 80, 80, 80, 80,  3,
-    3,  3,  3, 19, 19, 19, 19, 63, 63, 63, 63, 39, 39, 39, 39,131,
-  131,131,131, 28, 28, 28, 28,  1,  1,  1,  1, 30, 30, 30, 30, 79,
-   79, 79, 79,  6,  6,  6,  6,127,127,127,127,  9,  9,  9,  9,155,
-  155,155,155, 17, 17, 17, 17, 15, 15, 15, 15,139,139,139,139,110,
-  110,110,110, 77, 77, 77, 77, 33, 33, 33, 33, 27, 27, 27, 27, 49,
-   49, 49, 49,119,119,119,119,113,113,113,113, 25, 25, 25, 25,  7,
-    7,  7,  7, 99, 99, 99, 99, 32, 32, 32, 32, 22, 22, 22, 22,165,
-  165,165,165,  8,  8,  8,  8, 29, 29, 29, 29, 31, 31, 31, 31,146,
-  146,146,146,105,105,105,105, 14, 14, 14, 14, 36, 36, 36, 36, 91,
-   91, 91, 91, 56, 56, 56, 56,134,134,134,134, 55, 55, 55, 55,  5,
-    5,  5,  5, 11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 23,
-   23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 18, 18, 18, 18, 62,
-   62, 62, 62,122,122,122,122, 89, 89, 89, 89,130,130,130,130, 94,
-   94, 94, 94,100,100,100,100,108,108,108,108,171,171,171,171,137,
-  137,137,137,124,124,124,124,123,123,123,123,126,126,126,126,142,
-  142,142,142,125,125,125,125,154,154,154,154,150,150,150,150,169,
-  169,169,169,145,145,145,145,163,163,163,163,157,157,157,157,166,
-  166,166,166,167,167,167,167,151,151,151,151,164,164,164,164,168,
-  168,168,168,174,174,174,174,132,132,132,132, 24, 24, 24, 24,107,
-  107,107,107, 86, 86, 86, 86,133,133,133,133,  4,  4,  4,  4, 37,
-   37, 37, 37, 58, 58, 58, 58, 75, 75, 75, 75, 68, 68, 68, 68, 92,
-   92, 92, 92, 87, 87, 87, 87, 59, 59, 59, 59,116,116,116,116, 97,
-   97, 97, 97, 57, 57, 57, 57,114,114,114,114,140,140,140,140,138,
-  138,138,138,159,159,159,159,172,172,172,172, 84, 84, 84, 84, 35,
-   35, 35, 35, 48, 48, 48, 48, 76, 76, 76, 76, 70, 70, 70, 70, 61,
-   61, 61, 61, 26, 26, 26, 26, 40, 40, 40, 40,135,135,135,135,161,
-  161,161,161, 85, 85, 85, 85, 96, 96, 96, 96,109,109,109,109,102,
-  102,102,102,141,141,141,141,143,143,143,143,175,175,175,175, 38,
-   38, 38, 38, 64, 64, 64, 64, 90, 90, 90, 90, 93, 93, 93, 93, 65,
-   65, 65, 65, 67, 67, 67, 67,104,104,104,104,170,170,170,170, 47,
-   47, 47, 47,173,173,173,173,117,117,117,117,112,112,112,112, 78,
-   78, 78, 78,144,144,144,144,156,156,156,156,148,148,148,148,158,
-  158,158,158,121,121,121,121,160,160,160,160,152,152,152,152, 52,
-   52, 52, 52, 73, 73, 73, 73, 60, 60, 60, 60, 74, 74, 74, 74, 42,
-   42, 42, 42,118,118,118,118, 51, 51, 51, 51, 50, 50, 50, 50,106,
-  106,106,106,147,147,147,147,153,153,153,153,101,101,101,101,111,
-  111,111,111,129,129,129,129,115,115,115,115,103,103,103,103, 69,
-   69, 69, 69, 95, 95, 95, 95, 34, 34, 34, 34, 45, 45, 45, 45, 43,
-   43, 43, 43, 46, 46, 46, 46, 54, 54, 54, 54, 71, 71, 71, 71, 41,
-   41, 41, 41, 53, 53, 53, 53, 81, 81, 81, 81,120,120,120,120,128,
-  128,128,128, 66, 66, 66, 66, 72, 72, 72, 72, 98, 98, 98, 98, 88,
-   88, 88, 88, 83, 83, 83, 83, 82, 82, 82, 82,149,149,149,149, 19,
-   19, 19,  0,  0, 19, 19, 19, 44, 44, 44, 44,  0,  0, 19,  0,  1,
-    1,  0,  0, 19,  0,  0,  0,  3,  3,  3,  0,  1,  0,  0,  0,  0,
-   17, 17, 17,  4, 14, 14, 14,  3,  0,  3,  3,  0,  3,  3,  3,  1,
-    1,  1,  0, 19, 19,  9,  9,  0,  0,  0, 19,  0,  0, 19, 19,  0,
-   15, 15, 15, 17, 17, 17,  0,  0,  1,  1,  1,  0,  0,  0,  1,  0,
-    0, 26, 26,  0,  9,  9,  9,  9,  9,  0,  9,  9,  0,  9,  0,  9,
-    9, 55, 55,  6,  1,  1,  6,  6,  4,  4,  4,  3,  3,  3,  1,  1,
-    1,  3,  3,  1,  3,  3,  3,  3,  3,  0,  3,  7,  1,  1,  1,  1,
-    7,  7,  7,  0,  0,  7,  7, 24, 24, 24,  0, 25,  0,  0,  0,  0,
-   25, 25, 25,  8,  8,  8,  0, 35, 35, 35,  0,  0,  0, 35, 35, 44,
-    0,  0,  0, 32, 32,  0,  0, 32,  0, 32, 32,  1,  0,  1,  1,  0,
-    1,  0,  0,  9,  9,  9,  6, 19,  9,  9,  9,  9,  9, 19, 19,  9,
-    9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,  0,  0,  9,  0,  0,
-   13,  0, 13,  0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 15,
-    1,  1,  0, 26, 12, 12, 12, 12, 12, 12,  0, 69, 69,  0, 69, 84,
-   84, 84,  0, 19,  9, 19, 19, 19, 19,  0,  0, 19, 19, 19,  4,  3,
-    3,  0,  0,  1,  1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0,156,
-  156,  3,  3,100, 36, 36, 36,107,107,107,  1,136,139, 13, 13, 17,
-   15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,  0,  0,  1,  1, 15,
-    0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0,  0,  0,  0,
-   10,  0, 11, 12, 13,  0,  0,  0, 14,  0,  0, 15,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,
-   17,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0, 19, 20, 21,  0, 22,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 23,  0,  0,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,
-   27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42, 43, 44,
+   45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
+    0,  0,  0,  0,  3,  0,  0,  0,  4,  5,  6,  7,  0,  8,  9, 10,
+    0, 11, 12, 13, 14, 15, 16, 17, 16, 18, 16, 19, 16, 19, 16, 19,
+    0, 19, 16, 20, 16, 19, 21, 19,  0, 22, 23, 24, 25, 26, 27, 28,
+   29, 30, 31,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,
+    0,  0,  0,  0,  0,  0, 34,  0,  0, 35,  0,  0, 36,  0, 37,  0,
+    0,  0, 38, 39, 40, 41, 42, 43, 44, 45, 46,  0,  0, 47,  0,  0,
+    0, 48,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,  0, 50,  0, 51,
+    0, 52, 53,  0, 54,  0,  0,  0,  0,  0,  0, 55, 56, 57,  0,  0,
+    0,  0, 58,  0,  0, 59, 60, 61, 62, 63,  0,  0, 64, 65,  0,  0,
+    0, 66,  0,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  0,  0,  0, 70,  0, 71,
+    0,  0, 72,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,  0, 74, 75,
+    0,  0,  0,  0, 76, 77,  0, 78, 79,  0,  0, 80, 81,  0, 82, 62,
+    0, 83, 84,  0,  0, 85, 86, 87,  0, 88,  0, 89,  0, 90,  0,  0,
+   51, 91, 51,  0, 92,  0, 93,  0,  0,  0, 81,  0,  0,  0, 94, 95,
+    0, 96, 97, 98, 99,  0,  0,  0,  0,  0, 51,  0,  0,  0,  0,100,
+  101,  0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,  0,  0,103,  0,
+    0,  0,  0,  0,  0,104,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,106,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,108,
+  109,  0,  0,110,  0,  0,  0,  0,  0,  0,111,  0,112,  0,105,  0,
+    0,  0,  0,  0,113,114,  0,  0,  0,  0,  0,  0,  0,115,  0,  0,
+    0,116,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,118,  0,119,
+    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,  8,  0,
+    0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0, 14, 15,
+    0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,  0,  0,
+   22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0, 28, 29,
+   30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35, 33,  0,
+    0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,  0,  0,
+    0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0, 43,
+    0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,  0,  0,
+    0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,  0, 53,
+    0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,  0,  0,
+   57, 58,  0,  0,  0, 59, 60, 61, 62,  0,  0,  0,  0, 63, 52,  0,
+   64, 65,  0,  0, 66,  0,  0,  0, 67, 68,  0,  0,  0, 69,  0, 70,
+   71, 72, 73, 74,  1, 75,  0, 76, 77, 78,  0,  0, 79, 80,  0,  0,
+    0, 81,  0,  0,  1,  1,  0,  0, 82,  0,  0, 83,  0,  0,  0,  0,
+   79, 84,  0, 85,  0,  0,  0,  0,  0, 80, 86,  0, 87,  0, 52,  0,
+    1, 80,  0,  0, 88,  0,  0, 89,  0,  0,  0,  0,  0, 90, 57,  0,
+    0,  0,  0,  0,  0, 91, 92,  0,  0, 86,  0,  0, 33,  0,  0, 93,
+    0,  0,  0,  0, 94,  0,  0,  0,  0, 49,  0,  0, 95,  0,  0,  0,
+    0, 96, 97,  0,  0, 98,  0,  0, 99,  0,  0,  0,100,  0,  0,  0,
+  101,  0,  0,  0,102,  0,  0,  0,  0,103,104, 95,  0,  0,105,  0,
+    0,  0, 86,  0,  0,106,  0,  0,  0,107,108,  0,  0,109,110,  0,
+    0,  0,  0,  0,  0,111,  0,  0,112,  0,  0,  0,  0,113, 33,  0,
+  114,115,116, 57,  0,  0,117, 35,  0,  0,118,  0,  0,  0,119,  0,
+    0,  0,  0,  0,  0,120,  0,  0,121,  0,  0,  0,  0,122, 90,  0,
+    0,  0,  0,  0, 57,  0,  0,  0,  0, 52,123,  0,  0,  0,  0,124,
+    0,  0,125,  0,  0,  0,  0,123,  0,  0,126,  0,  0,  0,  0,  0,
+   81,  0,  0,  0,  0,127,  0,  0,  0,128,  0,  0,  0,129,  0,130,
+    0,  0,  0,  0,131,132,133,  0,134,  0,135,  0,  0,  0,136,137,
+  138,  0, 79,  0,  0,  0,  0,  0, 35,  0,  0,  0,139,  0,  0,  0,
+  140,  0,  0,  0,141,  0,  0,  0,142,143,  0,144,  0,  0,145,  0,
+    0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,
+    7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,
+    1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26,
+   27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,
+    1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,
+    0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,
+    0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19,
+   52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21,
+   35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,
+    0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0,
+   64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0,
+   68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,
+    0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,
+    0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0,
+   83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52,
+   15, 86, 36, 10, 21,  1,  1,  1,  1, 41,  1, 21, 87,  0,  0, 55,
+    0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0, 88,  0,  0, 89,
+    0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 90,  9, 12,  4, 91,  8,
+   92, 47,  0, 58, 50,  0, 21,  1, 21, 93, 94,  1,  1,  1,  1, 95,
+   96, 97, 98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,  0,  0,
+    0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,102,103,  0,  0,
+  104,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,  0,  0,  0,  0,
+    0, 62,  0,  0,105, 68, 61,  0,  0,  0, 78,  0,  0,  0,106,107,
+   58, 38, 81,  0,  0,  0,  0,  0,  0,108,  1, 14,  4, 12, 84,  0,
+    0,  0,  0, 38, 90,  0,  0,  0,  0,109,  0,  0,110, 61,  0,111,
+    0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0, 19, 58,  0,  0,
+  112, 51,  0,112, 14, 52,113, 41,  0,  0, 62,  0,  0, 61,  0,  0,
+  114,  0, 90,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,  0,114,
+    0,  0,  0,  0,115,  0,  0,  0, 78, 55,  0, 38,  1, 58,  1, 58,
+    0,  0,  0,  0,  0, 88, 63, 89,  0,  0,116,  0,  0,  0, 55,  0,
+    0,  0,  0,116,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,  0, 61,
+    0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,  8, 92,
+    0,  0,  1, 90,  0,  0,117,  0,  0,  0,  0,  0,  0,118,  0,119,
+  120,121,122,  0,105,  4,123, 49, 23,  0,  0,  0, 38, 50, 38, 58,
+    0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,  0,  0,
+    0,  1,  0,  0,  0,124,  0,  0,  0,113, 19, 59,  0, 38,  0, 81,
+    0,  0,  4,123,  0,  0,  0,  1,125,  0,  0,  0,  0,  0,230,230,
+  230,230,230,232,220,220,220,220,232,216,220,220,220,220,220,202,
+  202,220,220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,
+  220,220,220,230,230,230,230,240,230,220,220,220,230,230,230,220,
+  220,  0,230,230,230,220,220,220,220,230,232,220,220,230,233,234,
+  234,233,234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,
+  220,230,230,230,222,220,230,230,220,220,230,222,228,230, 10, 11,
+   12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24,
+   25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29,
+   30, 31, 32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,
+    0,  0,  0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,
+    0,  0,  0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,
+  220,230,220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,
+  230,230,230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,
+    0,220, 27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,
+  220,230,230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,
+    0,  9,  9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,
+  107,107,118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,
+    0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,
+  130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,
+  220,  0,  0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,
+    0,  0,  0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,
+    0,220,230,220,  0,220,230,230,230,234,  0,  0,  9,  9,  0,  0,
+    7,  0,230,230,230,  0,230,  0,  1,  1,  1,  0,  0,  0,230,234,
+  214,220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,
+  230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,220,230,
+    1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,  0,  0,
+    0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,  0,220,
+    0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,  0,  0,
+  230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,  6,  6,
+    0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,  0,226,
+  216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,230,230,
+    7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145, 26, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,  3,  3,
+    3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12, 13,  3,
+    3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,  3,  3,
+   16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,  3,  3,
+    3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3, 27, 28,
+    0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,
+    0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,  0,
+    0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12, 13,  0,
+    0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22, 23, 24,
+   19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,  0,  8,
+    0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34, 35, 19,
+    0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,  0,  1,
+   45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0, 14,  0,
+    0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51, 52, 53,
+   43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14, 19,  1,
+    0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,  0,  0,
+    0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,  0,  0,
+    0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+    0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,  0,  7,
+    0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,  0,  0,
+    8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14, 15, 16,
+   17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,  0,  0,
+    1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8, 21,  9,
+    0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0, 26,  0,
+    0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,  1, 28,
+   29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,  1,  4,
+    5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21, 21, 21,
+   34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0, 39,  0,
+    0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,  0,  0,
+   40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,  1,  1,
+    1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,  0,  0,
+    1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21, 21, 21,
+    9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,  9,  1,
+    0,  0, 16, 50, 84,118,136,152,186,187,187,187,187,187,187,187,
+  187,187,187,187,187,187,187,187,187,187,187,187,187,187, 12,  0,
+    1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 13, 13, 13,
+   13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 15, 16, 17, 18, 18, 18, 18, 18, 18,
+   18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 21, 22,
+   23, 24, 25, 26, 27, 28, 29, 30, 31, 19, 32, 33, 33, 33, 33, 33,
+   34, 19, 19, 19, 19, 19, 19, 35, 19, 36, 37, 38, 38, 38, 38, 38,
+   38, 39, 40, 19, 19, 19, 19, 19, 19, 19, 41, 42, 19, 19, 43, 19,
+   19, 19, 44, 45,  9, 46, 47, 48, 49, 50, 51, 52,  9,  9, 19, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 53, 19, 19, 53, 19, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 54, 19, 19, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 55,
+    0,  0,  1,  0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    1,  2,  2,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+   15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 32, 33, 33, 33, 34, 35, 35, 35, 35, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,  2,  2, 51, 51, 52,
+   53, 54, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57,
+   57, 56, 56, 56, 56, 56, 56, 58, 59, 60, 61, 56, 62, 62, 63, 64,
+   65, 66, 67, 68, 69, 70, 56, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+   62, 62, 71, 62, 62, 62, 62, 72, 72, 72, 72, 72, 72, 72, 72, 72,
+   73, 74, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 32,
+   32, 32, 32, 32, 32, 32, 32, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+   87, 62, 62, 62, 62, 88, 89, 89, 89, 90, 89, 91, 92, 93, 94, 95,
+   95, 96, 97, 87, 98, 99,100,101,102,103,104,105,105,105,  2,106,
+  107,108,109,110,111,112,113,114,115,116,117, 89,118,119,120,121,
+  122,123,124,125,126,127,128,129,130, 87,131,132,133,134, 87,135,
+  136,137,138,139,140,141,142,143,144,145,146, 87,147,148,149,150,
+  150,150,150,150,150,150,150,150,150,150, 87, 87, 87, 87, 87, 87,
+   87, 87, 87, 87, 87, 87,151,152,152,152,152,152,152,152,152,153,
+  153,153,153,153, 87, 87, 87, 87, 87,154, 87, 87, 87, 87, 87,155,
+  155,155,155,156,157,158,158, 87, 87,159, 87,160,161,162,163,164,
+  164,164,164,164,164,164,164,164,164,164,164,164,164,165,165,165,
+  165,164,164, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,166,167,
+  168,169,170,170,170, 87, 87,171,172, 87, 87, 87, 87, 87, 87, 56,
+   56, 56, 56, 56, 56,173, 56, 56, 56,174,175, 51, 56, 56, 87,176,
+  176,176,176,176,176, 87, 87, 87, 87, 87, 87, 87, 87,  2, 87,177,
+    6,178, 87, 87,179, 87, 87, 87,180, 87,181, 87,182, 87, 33,183,
+  183,184, 87, 87, 87, 87, 87, 56, 56, 56, 87, 89, 89, 87, 87, 56,
+   56, 56, 56,185, 87, 56, 56, 62, 62, 62, 62, 62, 87, 87, 87, 62,
+   87, 87, 87, 87, 87, 87, 87, 56, 87,186,186,  0,  1,  2,  2,  0,
+    0,  0,  0,  1,  2,  1,  2,  0,  0,  3,  3,  4,  5,  4,  5,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  0,  0,  7,  0,  8,
+    8,  8,  8,  8,  8,  8,  9, 10, 11, 11, 11, 11, 11, 12, 11, 13,
+   13, 13, 13, 13, 13, 13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 15, 16, 16, 16, 16, 16, 17, 18, 18, 18, 18, 18, 18, 19,
+   20, 21, 21, 22, 23, 21, 24, 21, 21, 21, 21, 21, 25, 21, 21, 26,
+   26, 26, 26, 26, 21, 21, 21, 27, 27, 27, 27, 28, 28, 28, 28, 29,
+   29, 29, 29, 30, 30, 26, 21, 21, 21, 21, 21, 21, 21, 31, 21, 32,
+   32, 32, 32, 32, 33, 34, 32, 35, 35, 35, 35, 35, 35, 35, 35, 36,
+   36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 38,
+   38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, 40,
+   40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
+   42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43, 43, 43, 43, 44,
+   44, 44, 45, 44, 44, 44, 44, 46, 46, 46, 46, 46, 46, 46, 46, 47,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 47, 47, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 51, 52,
+   52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 56,
+   56, 57, 57, 57, 57, 58, 57, 59, 59, 60, 61, 62, 62, 63, 63, 64,
+   64, 64, 64, 64, 64, 64, 64, 65, 66, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 55, 55, 55, 55, 55, 67, 67, 67, 67, 67, 68, 68, 68, 69,
+   69, 69, 69, 69, 69, 64, 64, 70, 70, 71, 71, 71, 71, 71, 71, 71,
+   71, 71,  8,  8,  8,  8,  8, 72, 72, 72, 72, 72, 72, 72, 72, 73,
+   73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 75, 76, 76, 76, 13,
+   50, 50, 50, 73, 77, 78, 79,  4,  4, 80,  4,  4, 81, 82, 83,  4,
+    4,  4, 84,  8,  8,  8,  8, 11, 11, 11, 11, 11, 11, 11, 11, 85,
+    0,  0,  0,  0,  0,  0, 86,  0,  4,  0,  0,  0,  8,  8,  8,  0,
+    0, 87, 88, 89,  0,  4,  4,  6,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 90, 90, 90, 90, 90, 90, 90, 90, 91,
+   91, 91, 91, 91, 91,  4,  4, 92, 92, 92, 92, 92, 92, 92, 92, 50,
+   50, 50, 93, 93, 93, 93, 93, 53, 53, 53, 53, 53, 53, 13, 13, 94,
+   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  0, 95,
+    0, 96, 97, 98, 99, 99, 99, 99,100,101,102,102,102,102,103,104,
+  104,104,105, 52, 52, 52, 52, 52,  0,104,104,  0,  0,  0,102, 52,
+   52,  0,  0,  0,  0, 52,106,  0,  0,  0,  0,  0,102,102,107,102,
+  102,102,102,102,108,  0,  0, 94, 94, 94, 94,  0,  0,  0,  0,109,
+  109,109,109,109,109,109,109,109,109,109,109,109,110,110,110,111,
+  111,111,111,111,111,111,111,111,111,111,111, 13, 13, 13, 13, 13,
+   13,112,112,112,112,112,112,  0,  0,113,  4,  4,  4,  4,  4,114,
+    4,  4,  4,  4,  4,  4,  4,115,115,115,  0,116,116,116,116,117,
+  117,117,117,117,117, 32, 32,118,118,119,120,120,120, 52, 52,121,
+  121,121,121,122,121, 49, 49,123,123,123,123,123,123, 49, 49,124,
+  124,124,124,124,124,125,125, 53, 53, 53,  4,  4,126,127, 54, 54,
+   54, 54, 54,125,125,125,125,128,128,128,128,128,128,128,128,  4,
+  129, 18, 18, 18, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+   21, 21,130, 21, 21, 21, 21,  8,  0,131,  0,  0,  0,  0, 21, 21,
+   21, 21, 21, 21, 21, 21,132,  0,  0,  1,  2,  1,  2,133,101,102,
+  134, 52, 52, 52, 52,  0,  0,135,135,135,135,135,135,135,135,  0,
+    0,  0,  0, 11, 11, 11, 11, 11,  0, 11, 11, 11,  0,  0,136,137,
+  137,138,138,138,138,139,  0,140,140,140,141,141,142,142,142,143,
+  143,144,144,144,144,144,144,145,145,145,145,145,146,146,146,147,
+  147,147,148,148,148,148,148,149,149,149,150,150,150,150,151,151,
+  151,151,151,152,152,152,152,153,153,153,153,153,153,153,153,154,
+  154,154,154,155,155,156,156,157,157,157,157,157,157,158,158,159,
+  159,160,160,161,161,161,161,162,162,163,163,163,163,163,163,164,
+  164,164,164,164,164,165,165,166,166,166,166,167,167,167,167,168,
+  168,168,168,169,169,170,170,171,171,171,171,171,171,171,171,172,
+  172,172,172,172,172,172,172,173,173,173,173,173,173,173,173,174,
+  174,174,174,175,175,175,175,175,175,175,175,175,175,175,175,176,
+  176,176,176,177, 21, 21, 21,178,178,178,179,179,179,179,180,180,
+  180,180,181,181,181,182,182,183,183,183,183,183,183,183,183,184,
+  184,184,184,184,185,185,185,186,186,186,186,186,187,187,187,188,
+  188,188,188,188,188,189, 43,190,190,190,190,190,190,190,190,191,
+  191,191,192,192,192,192,192,193,193,193,194,193,193,193,193,195,
+  195,195,195,195,195,195,195,196,196,196,196,196,196,196,196,197,
+  197,197,197,197,197,197,197,198,198,198,198,198,198,198,198,199,
+  199,199,199,199,199, 66, 66,200,200,200,200,200, 49, 49, 49,201,
+  201,201,201,201,201,201,201,202,202,202,202,202,202,202,202,203,
+  203,203,203,203,203,203,203,204,204,204,204,204,204,204,204,205,
+  205,205,205,205,205,205,205,206,206,206,206,206,207,207,207,207,
+  207,207, 55,208,208,208,208, 32, 32, 32, 32, 32, 32,188,188,209,
+  209,209,209,209,209,209,209,210,210,210,210,210,210,210,211,211,
+  211,211,211,211,211,211,211,212,212,212,212,212,212,213,213,213,
+  213,213,214,214,214,214,214,215,215,215,215,215,215,215,215,216,
+  216,216,216,216,216,216,216,110,110,110,110, 39, 39, 39, 39,217,
+  217,217,217,217,217,217,217,218,218,218,218,218,218,218,218,219,
+  219,219,219,219,219,219,219,220,220,220,220,220,220,220,220,221,
+  221,221,221,221,221,221,221,112,112,112,112,112,112,112,112,112,
+  112,112,112,222,222,222,223,223,223,223,223,223,224,224,224,225,
+  225,225,225,225,225,225,225,226,226,226,226,226,226,226,226,227,
+  227,227,227,227,227,227,227,227,227,228,228,228,228,228,228,229,
+  229,229,229,229,229,229,229,229,229,229,229,229,229,230, 94,231,
+  231,231,231,231,231,231,231,232,232,232,232,232,232,232,232,102,
+  102,102,102,102,102,102,102,233, 99, 99, 99, 99, 99, 99, 99, 99,
+   99, 99, 99, 99, 99, 99, 99, 99, 99,102,234, 99,235,102,236,236,
+  236,236,236,236,236,236,236,237,237,237,237,237,237,237,237,237,
+  237,  0,  0,  0,  0,  0,  0,  8,  8,  8,  8,  8,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,238,239,240,  0,241,  0,  0,  0,  0,  0,242,
+  242,242,242,242,242,242,242, 91, 91, 91, 13, 13, 13, 13, 13,243,
+  243,243,243,243,243,243,243,244,244,244,244,245,245,245,245,246,
+  246,246,246,246,246,246,246,247,247,247,247,247,247,247,247,248,
+  248,248,248,248,248,248,248,249,249,249,249,249,249,249,249,250,
+  250,250,250,250,250,250,250,251,  0,  0,  0,  0,  0,  0,  0,  8,
+    8,  8,  8,  8,  8,  8,  8,  0,  0,  0,  0,  1,  2,  2,  2,  2,
+    2,  3,  0,  0,  0,  4,  0,  2,  2,  2,  2,  2,  3,  2,  2,  2,
+    2,  5,  0,  2,  5,  6,  0,  7,  7,  7,  7,  8,  9,  8, 10,  8,
+   11,  8,  8,  8,  8,  8,  8, 12, 13, 13, 13, 14, 14, 14, 14, 14,
+   15, 14, 14, 16, 17, 17, 17, 17, 17, 17, 17, 18, 19, 19, 19, 19,
+   19, 19, 19, 20, 21, 20, 22, 20, 20, 23, 23, 20, 20, 20, 20, 22,
+   20, 24,  7,  7, 25, 20, 20, 26, 20, 20, 20, 20, 20, 20, 21, 27,
+   27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31,
+   31, 31, 31, 32, 20, 20, 20, 33, 33, 33, 33, 34, 35, 33, 33, 33,
+   36, 33, 33, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39, 40,
+   40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, 44,
+   44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 47, 48,
+   48, 48, 48, 49, 49, 49, 49, 49, 50, 51, 49, 52, 52, 52, 52, 53,
+   53, 53, 53, 53, 53, 54, 53, 55, 55, 55, 55, 56, 56, 56, 56, 57,
+   57, 57, 57, 58, 58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 60,
+   60, 61, 62, 63, 63, 63, 63, 64, 64, 64, 64, 64, 65,  0,  0, 66,
+   66, 66, 66, 67, 67, 67, 67, 68, 68, 68, 68, 69, 70, 71, 71, 71,
+   71, 71, 71, 72, 72, 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75,
+   75, 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79,
+   79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 82,  7,  7,  7, 83,
+    7, 84, 85,  0, 84, 86,  0,  2, 87, 88,  2,  2,  2,  2, 89, 90,
+   87, 91,  2,  2,  2, 92,  2,  2,  2,  2, 93,  0,  0,  0, 86,  1,
+    0,  0, 94,  0, 95, 96,  0,  4,  0,  0,  0,  0,  0,  0,  4, 97,
+   97, 97, 97, 98, 98, 98, 98, 13, 13, 13, 13, 99, 99, 99, 99,100,
+  100,100,100,  0,101,  0,  0,102,100,103,104,  0,  0,100,  0,105,
+  106,106,106,106,106,106,106,106,106,107,105,108,109,109,109,109,
+  109,109,109,109,109,110,108,111,111,111,111,112, 55, 55, 55, 55,
+   55, 55,113,109,109,109,110,109,109,  0,  0,114,114,114,114,115,
+  115,115,115,116,116,116,116,117,117,117,117, 96,  2,  2,  2,  2,
+    2, 94,  2,118,118,118,118,119,119,119,119,120,120,120,120,121,
+  121,121,121,121,121,121,122,123,123,123,123,124,124,124,124,124,
+  124,124,125,126,126,126,126,127,127,127,127,128,128,128,128,  2,
+    2,  3,  2,  2,129,130,  0,131,131,131,131,132, 17, 17, 18, 20,
+   20, 20,133,  7,  7,  7,134, 20, 20, 20, 23,  0,135,109,109,109,
+  109,109,136,137,137,137,137,  0,  0,  0,138,139,139,139,139,140,
+  140,140,140, 84,  0,  0,  0,141,141,141,141,142,142,142,142,143,
+  143,143,143,144,144,144,144,145,145,145,145,146,146,146,146,147,
+  147,147,147,148,148,148,148,149,149,149,149,150,150,150,150,151,
+  151,151,151,152,152,152,152,153,153,153,153,154,154,154,154,155,
+  155,155,155,156,156,156,156,157,157,157,157,158,158,158,158,159,
+  159,159,159,160,160,160,160,161,161,161,161,162,162,162,162,163,
+  163,163,163,164,164,164,164,165,165,165,165,166,166,166,166,167,
+  167,167,167,168,168,168,168,169,169,169,169,170,170,170,170,171,
+  171,171,171,172,172,172,172,173,173,173,173,174,174,174,174,175,
+  175,175,175,176,176,176,176,177,177,177,177,178, 20, 20, 20,179,
+  179,179,179,180,180,180,180,181,181,181,181,182,182,182,182,183,
+  183,183,183,184,184,184,184,185,185,185,185,186,186,186,186,187,
+  187,187,187,188,188,188,188,189,189,189,189,190, 45, 45, 45,191,
+  191,191,191,192,192,192,192,193,193,193,193,194,194,194,194,194,
+  194,195,194,196,196,196,196,197,197,197,197,198,198,198,198,199,
+  199,199,199,200,200,200,200,201,201,201,201,202,202,202,202,203,
+  203,203,203,204,204,204,204,205,205,205,205,206,206,206,206,207,
+  207,207,207,208,208,208,208,209,209,209,209,210,210,210,210,211,
+  211,211,211,212,212,212,212,213,213,213,213,214,214,214,214,215,
+  215,215,215,216,216,216,216,217,217,217,217,218,218,218,218,219,
+  219,219,219,220,220,220,220,221,221,221,221,222,222,222,222,223,
+  223,223,223,224,224,224,224,225,225,225,225,226,226,226,226,227,
+  227,227,227,228,228,228,228,229,229,229,229,230,230,230,230,231,
+  232,232,232,233,233,233,233,232,232,232,232,234,106,106,106,235,
+  106,106,106,106,236,109,109,237,237,237,237,238,238,238,238,  0,
+  239, 86,  0,  0,  0,239,  7, 82,138,  7,  0,  0,  0,240, 86,241,
+  241,241,241,242,242,242,242,243,243,243,243,244,244,244,244,245,
+  245,245,245,246,246,246,246,247,247,247,247,248,248,248,248,249,
+  249,249,249,250,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19,
+   19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,
+    0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  9,
+    9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,  6,
+    6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,  4,
+   14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,  0,
+    3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,  1,
+    3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64, 90,
+   90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,  7,
+    1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5, 11,
+   11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22, 23,
+   23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36, 24,
+   24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25, 25,
+    0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,  8,
+    8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29, 28,
+   28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,  0,
+    0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0, 43,
+   43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0, 32,
+    0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52, 58,
+   58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62, 76,
+   76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,  1,
+    1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  1,
+    1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,  9,
+    9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,  0,
+    0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27, 56,
+   56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,  0,
+   13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15, 15,
+   15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0, 39,
+   39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79, 60,
+   60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69, 69,
+   69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0, 68,
+   68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19, 19,
+   19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,  1,
+    1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,  0,
+    1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42, 41,
+   41, 41, 41,118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59, 40,
+   40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,106,
+  106,106,106,104,104,104,104,161,161,161,161,170,170,170,170,110,
+  110,110,110, 47, 47, 47, 47, 81, 81, 81, 81,120,120,120,120,116,
+  116,116,116,128,128,128,128, 66, 66, 66, 66, 72, 72, 72, 72,173,
+  173,173,173, 98, 98, 98, 98, 97, 97, 97, 97, 57, 57, 57, 57, 88,
+   88, 88, 88,117,117,117,117,112,112,112,112, 78, 78, 78, 78, 83,
+   83, 83, 83, 82, 82, 82, 82,122,122,122,122, 89, 89, 89, 89,130,
+  130,130,130,144,144,144,144,165,165,165,165,156,156,156,156,156,
+  156,  3,  3,147,147,147,147,148,148,148,148,158,158,158,158,153,
+  153,153,153,149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,101,
+  101,101,101, 96, 96, 96, 96,111,111,111,111,100,100,100,100,100,
+   36, 36, 36,108,108,108,108,129,129,129,129,109,109,109,109,107,
+  107,107,107,107,107,107,  1,171,171,171,171,137,137,137,137,124,
+  124,124,124,123,123,123,123,114,114,114,114,102,102,102,102,126,
+  126,126,126,142,142,142,142,125,125,125,125,154,154,154,154,150,
+  150,150,150,141,141,141,141,140,140,140,140,121,121,121,121,169,
+  169,169,169,133,133,133,133,134,134,134,134,138,138,138,138,143,
+  143,143,143,175,175,175,175,145,145,145,145,163,163,163,163, 63,
+   63, 63, 63,157,157,157,157, 80, 80, 80, 80,127,127,127,127,166,
+  166,166,166,115,115,115,115,159,159,159,159,103,103,103,103,119,
+  119,119,119,167,167,167,167,146,146,146,146,172,172,172,172, 99,
+   99, 99, 99,136,139, 13, 13,155,155,155,155,136,136,136,136, 17,
+   15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,139,139,139,139,105,
+  105,105,105,  0,  0,  0,  1,  0,  0,  1,  1,131,131,131,131,151,
+  151,151,151,160,160,160,160,152,152,152,152,164,164,164,164,168,
+  168,168,168,174,174,174,174,113,113,113,113,132,132,132,132, 15,
+    0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9,
+   10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16,
+   17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26,
+   27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
     4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17,
    18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,
@@ -5226,6 +5224,8 @@ static const uint8_t _hb_ucd_u8[13905]=
     0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
    86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,
@@ -5260,116 +5260,116 @@ static const uint8_t _hb_ucd_u8[13905]=
     0,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,
   195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,
   211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
+    4,
 };
 static const uint16_t _hb_ucd_u16[5104]=
 {
-     0,   0,   0,   0,   0,   0,   0,   0,  16,  16,  16,  16,  16,  16,  16,  16,
-     8,   8,   8,   8,   8,   8,   8,   8,  24,  24,  24,  24,  24,  24,  24,  24,
-    32,  32,  32,  32,  32,  32,  32,  32,  64,  64,  64,  64,  64,  64,  64,  64,
-    56,  56,  56,  56,  56,  56,  56,  56,  40,  40,  40,  40,  40,  40,  40,  40,
-    24,  24,  24,  24,  24,  24,  56,  56,  96,  96,  96,  96,  96,  96,  96,  96,
-    24,  24,  24,  24,  24,  24,  24, 592, 152, 152, 600, 336, 344, 352, 360, 608,
-   152, 152, 616, 624,  72, 632,  48, 640,  80,  80,  80, 648, 656,  80,  80, 664,
-   672, 680, 688, 696, 704, 712,  80, 720,  80,  80,  80, 728, 736,  48,  48,  48,
-    48, 744,  48,  96, 752, 760, 768, 368,  40,  40,  40,  40,  40,  40,  40, 776,
-   784, 376, 792,  48, 800, 808,  80, 816,  72,  72,  72,  48,  48,  48,  80,  80,
-   824,  80,  80,  80, 832,  80,  80,  80,  80,  80,  80, 376,  72, 840,  48,  48,
-   848, 856,  40, 864, 872,   8,   8, 880, 888, 896,   8,   8, 904,  40, 912, 384,
-     8,   8,   8,   8,   8, 920, 928, 936, 944, 392,   8,  40, 952,   8,   8,   8,
-     8,   8, 184, 384, 136,   8, 960, 968,   8, 976, 984, 104,   8, 992,   8,   8,
-  1000,1008,   8,   8,1016,  40,1024,  40, 400,   8,   8,1032,1040,1048,1056,1064,
-  1072,   8,   8, 408,1080,1088, 144,1096, 416,   8,   8,1104,1112,1120,1128,1136,
-   416,   8,   8, 408,1144,   8, 144,1152, 192,   8,   8, 424,1160,1168, 144,1176,
-   432,   8,   8,1184,1192,1200, 440,1208,1216,   8,   8,1224,1232,1240, 144,1248,
-  1256,   8,   8, 424,1264,1272, 144,1280,1288,   8,   8, 448,1296,1304, 144,1312,
-   192,   8,   8,   8,1320,1328, 440,1336,   8,   8,   8,1344,1352, 200, 104, 104,
-     8,   8,   8,1360,1368,1376,   8,   8,1384,1392, 208,1400,   8,   8,   8,1408,
-  1416,  40,  40,1424,1432,1440, 104, 104,   8,   8,1448,1456, 200,1464,1472,1480,
-  1488,1496,  72,  72,  72,  48,  48,1504,   8,   8,   8,   8,   8,1512, 456,  56,
-     8,  24,  72,  72,  72,  72,  72, 216, 464,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,1520,   8,1528,1536,   8,   8,   8,   8,1544,1552,
-     8,1560,   8,1568,   8, 224,   8, 224,   8,   8,   8,1576,1584,1592,  88,  56,
-  1600,  88,   8,   8,1608,   8,   8,   8,1616,   8,1624,   8,   8,   8,   8,   8,
-     8,   8,1632,1640,1648,   8,   8,   8,   8,   8,   8,   8,   8,1656,  24,  24,
-     8,1664,   8,   8,   8,1672,1680, 472,  88,  88,1688,1696,  40,  40,  40,  40,
-  1704,   8,   8,1712,1720, 200,1728,1736, 232,   8,1744, 136,   8,   8,1752,1760,
-     8,   8,1768,1776,1784, 136,   8, 480,1792,  72,  72,  72, 104,1800,1808,1816,
-    48,  48,1824,  96,  96,  96,1832,1840,  48,1848,  96,  96,  40,  40,  40,  40,
-    80,  80,  80,  80,  80,  80,  80,  80,  80,1856,  80,  80,  80,  80,  80,  80,
-   128, 128, 128, 128, 128,1864, 128,  48, 240, 240, 240,1872, 488, 496, 496, 488,
-  1880,1888,1896,1904,1912,1920, 112,1928,1936,  96, 248, 248, 248,1944,1952,  40,
-  1960,1968,1976,1984,1992,  56, 120, 120,2000,2008,2016,  24,2024,2032,  24,2040,
-  2048,  24,2056,  24,  24,  24,  24,2064,  24,2072,  64,2080,  24,2088,2096,  24,
-    56,2104,  24,  24,  24,  24,2112,  56,  24,  24,  24,2120,2128,  24,  24,2136,
-    24,  24,  24,  24,  24,  24,2144,  24,  24,  24,  24,  24,  24,  24,2152,2160,
-    56,2168,  24,  24,2176,  64,2184,  64,2192,2200,  64,  64,  64,2208,  64,2216,
-    24,  24,  24,  64,2224,  24,  24,  24,  72,  72,  72,  48,  48,  48,2232,2240,
-    80,  80,  80,  80,  80,  80,2248,2256,  48,  48,  48,   8,   8,   8,2264,2272,
-     8,   8,   8,   8,   8,   8,  40,  40,2280,2288,2296,2304,2312,2320, 504, 504,
-  2328,2336,2344,2352,2360,   8,   8,   8,   8,2368, 464,   8,   8,   8,   8,2376,
-     8,2384,   8,   8,  24,  24,  24,   8,  24,  24, 512,  24,2392, 520,  24,  24,
-   512,  24,  24, 520,  24,  24,  24,  24,   8,   8,   8,   8,  24,  24,  24,  24,
-     8, 528,   8,   8,   8,   8,   8,   8,   8,  24,  24,  24,  24,   8,   8, 480,
-  2400,   8, 136,   8,  80,  80,2408,2416,  80,2424,   8,   8,   8,   8,2432,2440,
-   368,2448,2456,2464,  80,  80,  80,2472,2480,2488,2496,2504,2512,2520,  72,2528,
-  2536,   8,2544,2552,   8,   8,   8,2560,2568,   8,   8,2576,2584,  88,  40,2592,
-   136,   8,2600,   8,2608,2616,   8,   8, 400,   8,   8,2624,2632, 256,2640, 136,
-     8,   8,2648,2656,2664,2672,   8,2680,   8,   8,   8,2688, 392,2696,2704,2712,
-     8,   8,   8,  48,  48,2720,2728,  48,  48,  48,  48,  48,   8,   8,2736,  88,
-    48,2744,2752,   8,   8,   8,   8,   8,   8,   8,   8,2760,2768,2776,   8,   8,
-     8,   8,   8,2784,  24,   8,   8,   8,   8,2792,   8,   8,2800,  24,  24,2808,
-    40,2816,  40,2824,2832,2840,2848,   8,   8,   8,   8,   8,   8,   8,   8,2856,
-  2864, 336, 344, 352, 360,2872,2880,2888,   8,2896,   8,   8,   8,   8,2904,2912,
-  2920,  56,  56,2928, 120, 120, 120,2936,2944,  24,  24,  24,  24,  24,  24,2952,
-     8,   8,   8,   8,   8,   8,2960,  56,   8,   8,2968,   8,2976,   8,   8, 184,
-     8, 264,   8,   8,   8,2984, 120, 120,  72,  72, 216,  48,  48,   8,   8,   8,
-     8,   8,  88,  72,  72, 216,  48,  48,   8,   8,   8,   8,   8,   8, 264,  72,
-    72,2992,  48,  48,   8,   8,   8,   8,   8,   8,   8,   8,   8,3000,   8,3008,
-     8,   8, 536,  56,  56,  56,   8,3016,   8,3024,   8, 264,   8,   8,   8,   8,
-     8,   8,   8,3032,  56,  56,  56,  56, 272,   8,   8, 544,  56, 104,   8,3040,
-     8, 552,  56,  56,3048,   8,3056, 104,   8,   8,   8, 280,   8, 560,   8, 560,
-     8, 280, 456,  56,  56,  56,  56,  56,  72,  72,  72,  72,  48,  48,  48,3064,
-     8,   8,3072,  88,3080,  72,3088,  48,3096,  64,  64,  64,  64,  64,  64,  64,
-     8,   8,3104,   8, 528,3112,  24,3120,   8, 552,3128,   8, 184,3136, 104,   8,
-  3144, 104, 104,   8,3152,  56,   8,   8,3160,   8,   8, 544,3168,3176,3184,3192,
-   232,   8,   8,3200,3208,   8,   8,  88, 432,   8,3216,3224,3232,   8,   8,3240,
-   232,   8,   8,3248,3256,3264,3272,  56,   8,   8, 568,3280, 272,  40,  40,  40,
-     8,   8, 280,   8,   8, 576, 472,  88, 192,   8,   8, 448,3288,3296,3304,  40,
-     8,   8,   8,3312,3320,3328,3336,  40,   8,   8,   8,3344,3352,3360,   8,   8,
-     8,   8,   8,3368,3376,  88,  88,  88,   8,   8, 584,3384,3392,3400,  40,  40,
-     8,   8,   8,3408,3416,  88, 104, 104,   8,   8,3424,3432,  88,  88,  88,  88,
-     8,3440,3448,3456,   8,   8,   8,   8,   8,   8, 568,3464, 104, 104, 104, 104,
-    72,  72,  72,  72,  48,  48, 208,3472,   8,   8,   8,3480,3488,  88,  88,  88,
-     8,   8,   8,   8,   8,3496,3504, 160,3512,   8,   8,3520,3528,3536,   8,   8,
-  3544,3552, 104,   8,   8,   8,   8,   8, 104, 104, 104, 104, 104, 104,3560, 160,
-     8,   8,   8,   8,   8,   8, 288,  88,   8,   8, 584,3568, 288, 208,  56,3576,
-     8, 224,3584,3592,  40,  40,  40,  40,   8,   8,   8, 272,3600,  88,   8,   8,
-  3608,3616,  88,   8,   8,3624,  88,  88,   8,   8,   8,   8,   8,   8,   8,3632,
-  3640,   8,   8,3648,3656,3664,  40,  40,   8,   8,   8,   8,  56,3672,3680,3688,
-   120, 120, 120, 120, 120, 120, 120, 104,   8,   8,   8,   8,   8,   8,   8, 288,
-     8,   8,   8, 112,3696,  40,   8,   8,   8, 296,3704,  88,  88,  88,  88,  88,
-     8,   8,   8,   8,   8,   8, 256,   8,   8,   8,   8,   8,  88,   8,   8,3712,
-     8,   8,   8,3720,3728,3736,3744,   8,  96,  96,  96,  96,3752,   8,3760,  88,
-    72,  72,  72,  72,  72,  72,  48,  48,  56,3768,  72,3776,  48,  48,  48,  48,
-     8,   8,   8,   8, 576,3784, 160, 160,3792,3800,  96,  96,  96,  96,3808,3816,
-     8,3824, 112, 112, 112, 112, 112, 112,  24,  24,  24,  24,  24,  24,  24,  64,
-    40,  40,  40,  40,  40,  24,  24,  24,  24,  24,  24,  24,  24,  24,3832,3840,
-  3848,  24,3856,  24,  24,  24,  24,  24,  24,  24,  24,  24,3864,  24,  24,  24,
-    72, 168,  48, 304, 312,  48, 128,  72, 176, 320,  72, 328,  48,  72, 168,  48,
-   304, 312,  48, 128,  72, 176, 320,  72, 328,  48,  72, 168,  48, 304, 312,  48,
-   128,  72, 176, 320,  72, 328,  48,  72, 168,  48, 128,  72,3872,3880,3888,3896,
-    48,3904,  72,3912,3920,3928,3936,  48,3944,  72,3952,  48,3960,  88,  88,  88,
-    40,  40,  40,3968,  40,  40,3976,3984,3992,4000,  40,  40,  40,  40,  40,  40,
-  4008,  48,  48,  48,  48,  48,  48,  48,  40,  40,  40,  96,  96,  96,  96,  96,
-     8,   8,   8,4016,4024,  24,  24,  24,   8,   8, 296,  40,   8,   8,4032,4040,
-     8,   8,   8,   8,   8,   8,4048,  88,   8,   8,   8,   8,   8,   8, 296,4056,
-     8,   8,   8,   8,   8,   8,4064,4072,   8,   8,   8,   8, 536,  40,  40,  40,
-    72,  72, 176,  48,4080, 256, 104, 104,  56,  56,4088,4096,  56,  56,  56,  56,
-    56,  56,4104,  56,  56,  56,  56,  56,   8,   8,   8,   8,   8,   8,   8,  64,
-  4112,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,  24,4120,
-    24,  24,  24,  24,  24,  64,  64,  64, 112, 112, 112, 112, 112, 112, 112, 112,
+     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
+    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
+    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
+     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
+    13,  13,  13,  35,   9,  42,  11,  11,  43,  44,  32,  45,  46,  47,  47,  48,
+    49,  50,  47,  47,  51,  32,  52,  53,  47,  47,  47,  47,  47,  54,  55,  56,
+    57,  58,  47,  32,  59,  47,  47,  47,  47,  47,  60,  53,  61,  47,  62,  63,
+    47,  64,  65,  66,  47,  67,  47,  47,  68,  69,  47,  47,  70,  32,  71,  32,
+    72,  47,  47,  73,  74,  75,  76,  77,  78,  47,  47,  79,  80,  81,  82,  83,
+    84,  47,  47,  85,  86,  87,  88,  89,  84,  47,  47,  79,  90,  47,  82,  91,
+    92,  47,  47,  93,  94,  95,  82,  96,  97,  47,  47,  98,  99, 100, 101, 102,
+   103,  47,  47, 104, 105, 106,  82, 107, 108,  47,  47,  93, 109, 110,  82, 111,
+   112,  47,  47, 113, 114, 115,  82, 116,  92,  47,  47,  47, 117, 118, 101, 119,
+    47,  47,  47, 120, 121, 122,  66,  66,  47,  47,  47, 123, 124, 125,  47,  47,
+   126, 127, 128, 129,  47,  47,  47, 130, 131,  32,  32, 132, 133, 134,  66,  66,
+    47,  47, 135, 136, 122, 137, 138, 139, 140, 141,   9,   9,   9,  11,  11, 142,
+    47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47, 143, 144, 145,
+    47, 146,   9,   9,   9,   9,   9, 147, 148,  47,  47,  47,  47,  47,  47,  47,
+    47,  47,  47,  47,  47,  47, 149,  47, 150, 151,  47,  47,  47,  47, 152, 153,
+    47, 154,  47, 155,  47, 156,  47, 156,  47,  47,  47, 157, 158, 159, 160, 145,
+   161, 160,  47,  47, 162,  47,  47,  47, 163,  47, 164,  47,  47,  47,  47,  47,
+    47,  47, 165, 166, 167,  47,  47,  47,  47,  47,  47,  47,  47, 168, 146, 146,
+    47, 169,  47,  47,  47, 170, 171, 172, 160, 160, 173, 174,  32,  32,  32,  32,
+   175,  47,  47, 176, 177, 122, 178, 179, 180,  47, 181,  61,  47,  47, 182, 183,
+    47,  47, 184, 185, 186,  61,  47, 187, 188,   9,   9,   9,  66, 189, 190, 191,
+    11,  11, 192,  27,  27,  27, 193, 194,  11, 195,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 196,  13,  13,  13,  13,  13,  13,
+   197, 197, 197, 197, 197, 198, 197,  11, 199, 199, 199, 200, 201, 202, 202, 201,
+   203, 204, 205, 206, 207, 208, 209, 210, 211,  27, 212, 212, 212, 213, 214,  32,
+   215, 216, 217, 218, 219, 145, 220, 220, 221, 222, 223, 146, 224, 225, 146, 226,
+   227, 227, 227, 227, 227, 227, 227, 227, 228, 146, 229, 146, 146, 146, 146, 230,
+   146, 231, 227, 232, 146, 233, 234, 146, 146, 146, 146, 146, 146, 146, 145, 145,
+   145, 235, 146, 146, 146, 146, 236, 145, 146, 146, 146, 146, 146, 146, 146, 146,
+   146, 146, 146, 237, 238, 146, 146, 239, 146, 146, 146, 146, 146, 146, 240, 146,
+   146, 146, 146, 146, 146, 146, 241, 242, 145, 243, 146, 146, 244, 227, 245, 227,
+   246, 247, 227, 227, 227, 248, 227, 249, 146, 146, 146, 227, 250, 146, 146, 146,
+     9,   9,   9,  11,  11,  11, 251, 252,  13,  13,  13,  13,  13,  13, 253, 254,
+    11,  11,  11,  47,  47,  47, 255, 256,  47,  47,  47,  47,  47,  47,  32,  32,
+   257, 258, 259, 260, 261, 262, 263, 263, 264, 265, 266, 267, 268,  47,  47,  47,
+    47, 269, 148,  47,  47,  47,  47, 270,  47, 271,  47,  47, 146, 146, 146,  47,
+   146, 146, 272, 146, 273, 274, 146, 146, 272, 146, 146, 274, 146, 146, 146, 146,
+    47,  47,  47,  47, 146, 146, 146, 146,  47, 275,  47,  47,  47,  47,  47,  47,
+    47, 146, 146, 146, 146,  47,  47, 187, 276,  47,  61,  47,  13,  13, 277, 278,
+    13, 279,  47,  47,  47,  47, 280, 281,  31, 282, 283, 284,  13,  13,  13, 285,
+   286, 287, 288, 289, 290, 291,   9, 292, 293,  47, 294, 295,  47,  47,  47, 296,
+   297,  47,  47, 298, 299, 160,  32, 300,  61,  47, 301,  47, 302, 303,  47,  47,
+    72,  47,  47, 304, 305, 306, 307,  61,  47,  47, 308, 309, 310, 311,  47, 312,
+    47,  47,  47, 313,  58, 314, 315, 316,  47,  47,  47,  11,  11, 317, 318,  11,
+    11,  11,  11,  11,  47,  47, 319, 160, 320, 320, 320, 320, 320, 320, 320, 320,
+   321, 321, 321, 321, 321, 321, 321, 321,  11, 322, 323,  47,  47,  47,  47,  47,
+    47,  47,  47, 324, 325, 326,  47,  47,  47,  47,  47, 327, 146,  47,  47,  47,
+    47, 328,  47,  47, 329, 146, 146, 330,  32, 331,  32, 332, 333, 334, 335,  47,
+    47,  47,  47,  47,  47,  47,  47, 336, 337,   2,   3,   4,   5, 338, 339, 340,
+    47, 341,  47,  47,  47,  47, 342, 343, 344, 145, 145, 345, 220, 220, 220, 346,
+   347, 146, 146, 146, 146, 146, 146, 348, 349, 349, 349, 349, 349, 349, 349, 349,
+    47,  47,  47,  47,  47,  47, 350, 145,  47,  47, 351,  47, 352,  47,  47,  60,
+    47, 353,  47,  47,  47, 354, 220, 220,   9,   9, 147,  11,  11,  47,  47,  47,
+    47,  47, 160,   9,   9, 147,  11,  11,  47,  47,  47,  47,  47,  47, 353,   9,
+     9, 355,  11,  11,  47,  47,  47,  47,  27,  27,  27,  27,  27,  27,  27,  27,
+    47,  47,  47,  47,  47, 356,  47, 357,  47,  47, 358, 145, 145, 145,  47, 359,
+    47, 360,  47, 353,  47,  47,  47,  47,  47,  47,  47, 361, 145, 145, 145, 145,
+   362,  47,  47, 363, 145,  66,  47, 364,  47, 365, 145, 145, 366,  47, 367,  66,
+    47,  47,  47, 368,  47, 369,  47, 369,  47, 368, 144, 145, 145, 145, 145, 145,
+     9,   9,   9,   9,  11,  11,  11, 370,  47,  47, 371, 160, 372,   9, 373,  11,
+   374, 227, 227, 227, 227, 227, 227, 227, 145, 145, 145, 145, 145, 145, 145, 145,
+    47,  47, 375,  47, 275, 376, 146, 377,  47, 365, 378,  47,  60, 379,  66,  47,
+   380,  66,  66,  47, 381, 145,  47,  47, 382,  47,  47, 363, 383, 384, 385, 386,
+   180,  47,  47, 387, 388,  47,  47, 160,  97,  47, 389, 390, 391,  47,  47, 392,
+   180,  47,  47, 393, 394, 395, 396, 145,  47,  47, 397, 398, 362,  32,  32,  32,
+    47,  47, 368,  47,  47, 399, 172, 160,  92,  47,  47, 113, 400, 401, 402,  32,
+    47,  47,  47, 403, 404, 405, 406,  32,  47,  47,  47, 407, 408, 409,  47,  47,
+    47,  47,  47, 410, 411, 160, 160, 160,  47,  47, 412, 413, 414, 415,  32,  32,
+    47,  47,  47, 416, 417, 160,  66,  66,  47,  47, 418, 419, 160, 160, 160, 160,
+    47, 420, 421, 422,  47,  47,  47,  47,  47,  47, 397, 423,  66,  66,  66,  66,
+     9,   9,   9,   9,  11,  11, 128, 424,  47,  47,  47, 425, 426, 160, 160, 160,
+    47,  47,  47,  47,  47, 427, 428, 429, 430,  47,  47, 431, 432, 433,  47,  47,
+   434, 435,  66,  47,  47,  47,  47,  47,  66,  66,  66,  66,  66,  66, 436, 429,
+    47,  47,  47,  47,  47,  47, 437, 160,  47,  47, 412, 438, 437, 128, 145, 439,
+    47, 156, 440, 441,  32,  32,  32,  32,  47,  47,  47, 362, 442, 160,  47,  47,
+   443, 444, 160,  47,  47, 445, 160, 160,  47,  47,  47,  47,  47,  47,  47, 446,
+   447,  47,  47, 448, 449, 450,  32,  32,  47,  47,  47,  47, 145, 451, 452, 453,
+   220, 220, 220, 220, 220, 220, 220,  66,  47,  47,  47,  47,  47,  47,  47, 437,
+    47,  47,  47, 209, 454,  32,  47,  47,  47, 455, 456, 160, 160, 160, 160, 160,
+    47,  47,  47,  47,  47,  47, 306,  47,  47,  47,  47,  47, 160,  47,  47, 457,
+    47,  47,  47, 458, 459, 460, 461,  47,  27,  27,  27,  27, 462,  47, 463, 160,
+     9,   9,   9,   9,   9,   9,  11,  11, 145, 464,   9, 465,  11,  11,  11,  11,
+    47,  47,  47,  47, 399, 466, 429, 429, 467, 468,  27,  27,  27,  27, 469, 470,
+    47, 471, 209, 209, 209, 209, 209, 209, 146, 146, 146, 146, 146, 146, 146, 472,
+   146, 146, 146, 146, 146, 146, 146, 227,  32,  32,  32,  32,  32, 146, 146, 146,
+   146, 146, 146, 146, 146, 146, 473, 474, 475, 146, 476, 146, 146, 146, 146, 146,
+   146, 146, 146, 146, 477, 146, 146, 146,   9, 478,  11, 479, 480,  11, 197,   9,
+   481, 482,   9, 483,  11,   9, 478,  11, 479, 480,  11, 197,   9, 481, 482,   9,
+   483,  11,   9, 478,  11, 479, 480,  11, 197,   9, 481, 482,   9, 483,  11,   9,
+   478,  11, 197,   9, 484, 485, 486, 487,  11, 488,   9, 489, 490, 491, 492,  11,
+   493,   9, 494,  11, 495, 160, 160, 160,  32,  32,  32, 496,  32,  32, 497, 498,
+   499, 500,  32,  32,  32,  32,  32,  32, 501,  11,  11,  11,  11,  11,  11,  11,
+    32,  32,  32,  27,  27,  27,  27,  27,  32,  32,  32,  32,  32,  32,  32,  32,
+    47,  47,  47, 502, 503, 146, 146, 146,  47,  47, 455,  32,  47,  47, 504, 505,
+    47,  47,  47,  47,  47,  47, 506, 160,  47,  47,  47,  47,  47,  47, 455, 507,
+    47,  47,  47,  47,  47,  47, 508, 509,  47,  47,  47,  47, 358,  32,  32,  32,
+     9,   9, 481,  11, 510, 306,  66,  66, 145, 145, 511, 512, 145, 145, 145, 145,
+   145, 145, 513, 145, 145, 145, 145, 145,  47,  47,  47,  47,  47,  47,  47, 227,
+   514, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 515,
+   146, 146, 146, 146, 146, 227, 227, 227, 209, 209, 209, 209, 209, 209, 209, 209,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
      0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
@@ -5587,9 +5587,9 @@ static const uint16_t _hb_ucd_u16[5104]=
 };
 static const int16_t _hb_ucd_i16[92]=
 {
-      0,    0,    1,   -1,   -1,    1,    0,    1,   -1,    0,    0,    2,    0,   -2,    2,    0,
-     -2,    0,   -7,    0,    0,   16,    0,  -16,    3,    3,    3,   -3,   -3,   -3,    0, 2016,
-      0, 2527, 1923, 1914, 1918,    0, 2250,    0,    0,  138,    0,    7, 1824,    0, 2104,    0,
+      0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
+      0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
+   1918,    0, 2250,    0,    0,  138,    0,    7,   -7,    0,   -1,    1, 1824,    0, 2104,    0,
    2108, 2106,    0, 2106, 1316,    0,   -1, -138,    8,    8,    8,    0,    7,    7,   -8,   -8,
      -8,   -7,-1316,    1,   -1,    3,   -3,    1,    0,-1914,-1918,    0,    0,-1923,-1824,    0,
       0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
@@ -5597,13 +5597,11 @@ static const int16_t _hb_ucd_i16[92]=
 
 static inline uint8_t _hb_ucd_gc (unsigned u)
 {
-  /* packtab: [2^8,2^4,2^3,2^3,2^1] */
-  return u<1114112u ? (uint8_t)(_hb_ucd_u8[5288u+((_hb_ucd_u8[1160u+_hb_ucd_u16[((_hb_ucd_u8[544u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>3))>>4)])<<4)+((((((((u)>>1))>>3))>>3))&15)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2;
+  return u<1114112 ? _hb_ucd_u8[5296u+((_hb_ucd_u8[1168u+((_hb_ucd_u16[((_hb_ucd_u8[544u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>3))>>4)])<<4)+((((((((u)>>1))>>3))>>3))&15)])<<3)+((((((u)>>1))>>3))&7)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
 }
 static inline uint8_t _hb_ucd_ccc (unsigned u)
 {
-  /* packtab: [2^8,2^3,2^2,2^2,2^2] */
-  return u<125259u ? (uint8_t)(_hb_ucd_u8[7307u+((_hb_ucd_u8[6724u+((_hb_ucd_u8[6247u+((_hb_ucd_u8[5881u+((_hb_ucd_u8[5636u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0;
+  return u<125259 ? _hb_ucd_u8[7322u+((_hb_ucd_u8[6738u+((_hb_ucd_u8[6258u+((_hb_ucd_u8[5890u+((_hb_ucd_u8[5644u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 0;
 }
 static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 {
@@ -5611,18 +5609,15 @@ static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 }
 static inline int16_t _hb_ucd_bmg (unsigned u)
 {
-  /* packtab: [2^4,2^3,2^3,2^2,2^1] */
-  return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[8198u+_hb_ucd_u8[7969u+_hb_ucd_u8[7875u+((_hb_ucd_b4(_hb_ucd_u8+7811u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)]+((((((u)>>1))>>2))&7)]+((((u)>>1))&3)]+((u)&1)]) : 0;
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[8218u+((_hb_ucd_u8[7986u+((_hb_ucd_u8[7890u+((_hb_ucd_b4(_hb_ucd_u8+7826u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)])<<3)+((((((u)>>1))>>2))&7)])<<2)+((((u)>>1))&3)])<<1)+((u)&1)] : 0;
 }
 static inline uint8_t _hb_ucd_sc (unsigned u)
 {
-  /* packtab: [2^4,2^4,2^3,2^3,2^2,2^2] */
-  return u<918016u ? (uint8_t)(_hb_ucd_u8[11623u+((_hb_ucd_u8[10615u+((_hb_ucd_u8[9119u+((_hb_ucd_u8[8675u+((_hb_ucd_u8[8475u+((_hb_ucd_b4(_hb_ucd_u8+8446u,((((((((((u)>>2))>>2))>>3))>>3))>>4)))<<4)+((((((((((u)>>2))>>2))>>3))>>3))&15)])<<3)+((((((((u)>>2))>>2))>>3))&7)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 2;
+  return u<918016 ? _hb_ucd_u8[11655u+((_hb_ucd_u8[10647u+((_hb_ucd_u8[9151u+((_hb_ucd_u8[8703u+((_hb_ucd_u8[8495u+((_hb_ucd_b4(_hb_ucd_u8+8466u,((((((((((u)>>2))>>2))>>3))>>3))>>4)))<<4)+((((((((((u)>>2))>>2))>>3))>>3))&15)])<<3)+((((((((u)>>2))>>2))>>3))&7)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 2;
 }
 static inline uint16_t _hb_ucd_dm (unsigned u)
 {
-  /* packtab: [2^8,2^5,2^4] */
-  return u<195102u ? (uint16_t)(_hb_ucd_u16[1680u+((_hb_ucd_u8[13009u+((_hb_ucd_u8[12627u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0;
+  return u<195102 ? _hb_ucd_u16[1680u+((_hb_ucd_u8[13041u+((_hb_ucd_u8[12659u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
 }
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh b/engine/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
index 72009525..711dd9b6 100644
--- a/engine/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-unicode-emoji-table.hh
@@ -27,36 +27,36 @@
 
 static const uint8_t _hb_emoji_u8[624]=
 {
-    1,  0,  0,  0, 50,  4,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   16, 17, 17, 17, 50, 20, 21, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,118,152,
+    0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,152,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    3,  4,  0,  0,  5,  0,  6,  0,  0,  0,  0,  0,  7,  0,  0,  8,
-    0,  0,  0,  9,  0,  0, 10, 11, 12, 13, 14, 15, 16, 17, 18,  0,
-    0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 20, 21,  0,  0,
-   22,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  0,  0,  0,  0,  0,
-   24,  0, 25, 26,  0, 27, 28, 29, 30, 31,  1,  1, 32,  1, 33, 34,
-    1,  1,  1, 35, 36, 37, 38, 39,  1, 40,  1, 41,  0,  0,  0, 42,
-   43, 44, 45, 46, 47, 48,  1,  1,  0, 49,  1,  1,  0,  0,  0,  0,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255,255,
-    0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,
-    0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  2,
-    0,  0,240,  3,  0,  6,  0,  0,  0,  0,  0, 12,  0,  1,  0,  0,
-    0,128,  0,  0,  0,254, 15,  7,  4,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 12, 64,  0,  1,  0,  0,  0,  0,  0,  0,120,
-   31, 64, 50, 33, 77,196,  0,  7,  5,255, 15,128,105,  1,  0,200,
-    0,  0,252, 26,131, 12,  3, 96, 48,193, 26,  0,  0,  6,191, 39,
-   36,191, 84, 32,  2,  1, 24,  0,144, 80,184,  0, 24,  0,  0,  0,
-    0,  0,224,  0,  2,  0,  1,128,  0,  0,  0,  0,  0,  0, 48,  0,
-  224,  0,  0, 24,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1, 32,  0,  0,128,  2,  0,  0,  0,  0,
-   16,  0,  0,  0,  0,240,  0,  0,  0,  0,240,255,  0,128,  1,  0,
-    1,128,  1,  0,  0,  0,192,255,  0,  0,  0,  0,  0,  0,  3,192,
-    0, 64,254,  7,  0,192,255,255,255,255,255,255, 63,  0,  0,  0,
-  254,255,  0,  4,  0,128,252,247,  0,254,255,255,192,255,255,255,
+    2,  3,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  6,  0,  0,  7,
+    0,  0,  0,  8,  0,  0,  9, 10, 11, 12, 13, 14, 15, 16, 17,  0,
+    0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0, 19, 20,  0,  0,
+   21,  0,  0,  0,  0,  0,  0,  0,  0,  0, 22,  0,  0,  0,  0,  0,
+   23,  0, 24, 25,  0, 26, 27, 28, 29, 30, 31, 31, 32, 31, 33, 34,
+   31, 31, 31, 35, 36, 37, 38, 39, 31, 40, 31, 41,  0,  0,  0, 42,
+   43, 44, 45, 46, 47, 48, 31, 31,  0, 49, 31, 31,  0,  0,  0,  0,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 36,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 16,  0,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  4,  0,  0,  2,  0,  0,240,  3,  0,  6,  0,  0,
+    0,  0,  0, 12,  0,  1,  0,  0,  0,128,  0,  0,  0,254, 15,  7,
+    4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 64,  0,
+    1,  0,  0,  0,  0,  0,  0,120, 31, 64, 50, 33, 77,196,  0,  7,
+    5,255, 15,128,105,  1,  0,200,  0,  0,252, 26,131, 12,  3, 96,
+   48,193, 26,  0,  0,  6,191, 39, 36,191, 84, 32,  2,  1, 24,  0,
+  144, 80,184,  0, 24,  0,  0,  0,  0,  0,224,  0,  2,  0,  1,128,
+    0,  0,  0,  0,  0,  0, 48,  0,224,  0,  0, 24,  0,  0,  0,  0,
+    0,  0, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1, 32,
+    0,  0,128,  2,  0,  0,  0,  0, 16,  0,  0,  0,  0,240,  0,  0,
+    0,  0,240,255,  0,128,  1,  0,  1,128,  1,  0,  0,  0,192,255,
+    0,  0,  0,  0,  0,  0,  3,192,  0, 64,254,  7,  0,192,255,255,
+  255,255,255,255, 63,  0,  0,  0,254,255,  0,  4,  0,128,252,247,
+    0,254,255,255,192,255,255,255,255,255,255,255,255,255,255,255,
   255,255,255,255,243,255,255,255,255,255,207,206,255,255,255,255,
   255,255,255,255,255,255,185,  7,255,255,255,255,255,255,255,191,
   255,255,255,255,255,255,255, 63,  0,126,255,255,255,128,249,  7,
@@ -78,8 +78,7 @@ static inline uint8_t _hb_emoji_b1 (const uint8_t* a, unsigned i)
 }
 static inline uint8_t _hb_emoji_is_Extended_Pictographic (unsigned u)
 {
-  /* packtab: [2^4,2^4,2^6] */
-  return u<131070u ? (uint8_t)(_hb_emoji_b1(_hb_emoji_u8+224u,((_hb_emoji_u8[64u+((_hb_emoji_b4(_hb_emoji_u8,((((u)>>6))>>4)))<<4)+((((u)>>6))&15)])<<6)+((u)&63))) : 0;
+  return u<131070 ? _hb_emoji_b1(_hb_emoji_u8+224u,((_hb_emoji_u8[64u+((_hb_emoji_b4(_hb_emoji_u8,((((u)>>6))>>4)))<<4)+((((u)>>6))&15)])<<6)+((u)&63)) : 0;
 }
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-draw.cc b/engine/thirdparty/harfbuzz/src/hb-vector-svg-draw.cc
deleted file mode 100644
index 82f31b4f..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-draw.cc
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-vector.h"
-#include "hb-blob.hh"
-#include "hb-geometry.hh"
-#include "hb-machinery.hh"
-#include "hb-map.hh"
-#include "hb-vector-svg-path.hh"
-#include "hb-vector-svg-subset.hh"
-#include "hb-vector-svg-utils.hh"
-
-#include <algorithm>
-#include <math.h>
-#include <string.h>
-
-#include "hb-vector-svg.hh"
-
-HB_UNUSED static inline bool
-hb_svg_buffer_contains (const hb_vector_t<char> &buf, const char *needle)
-{
-  unsigned nlen = (unsigned) strlen (needle);
-  if (!nlen || buf.length < nlen)
-    return false;
-
-  for (unsigned i = 0; i + nlen <= buf.length; i++)
-    if (buf.arrayZ[i] == needle[0] &&
-        !memcmp (buf.arrayZ + i, needle, nlen))
-      return true;
-  return false;
-}
-
-struct hb_vector_draw_t
-{
-  hb_object_header_t header;
-
-  hb_vector_format_t format = HB_VECTOR_FORMAT_SVG;
-  hb_transform_t<> transform = {1, 0, 0, 1, 0, 0};
-  float x_scale_factor = 1.f;
-  float y_scale_factor = 1.f;
-  hb_vector_extents_t extents = {0, 0, 0, 0};
-  bool has_extents = false;
-  unsigned precision = 2;
-  bool flat = false;
-
-  hb_vector_t<char> defs;
-  hb_vector_t<char> body;
-  hb_vector_t<char> path;
-  hb_set_t *defined_glyphs = nullptr;
-  hb_blob_t *recycled_blob = nullptr;
-
-  void append_xy (float x, float y)
-  {
-    float tx, ty;
-    hb_svg_transform_point (transform, x_scale_factor, y_scale_factor, x, y, &tx, &ty);
-    hb_svg_append_num (&path, tx, precision);
-    hb_svg_append_c (&path, ',');
-    hb_svg_append_num (&path, ty, precision);
-  }
-};
-
-static void
-hb_vector_draw_move_to (hb_draw_funcs_t *,
-                        void *draw_data,
-                        hb_draw_state_t *,
-                        float to_x, float to_y,
-                        void *)
-{
-  auto *d = (hb_vector_draw_t *) draw_data;
-  hb_svg_append_c (&d->path, 'M');
-  d->append_xy (to_x, to_y);
-}
-
-static void
-hb_vector_draw_line_to (hb_draw_funcs_t *,
-                        void *draw_data,
-                        hb_draw_state_t *,
-                        float to_x, float to_y,
-                        void *)
-{
-  auto *d = (hb_vector_draw_t *) draw_data;
-  hb_svg_append_c (&d->path, 'L');
-  d->append_xy (to_x, to_y);
-}
-
-static void
-hb_vector_draw_quadratic_to (hb_draw_funcs_t *,
-                             void *draw_data,
-                             hb_draw_state_t *,
-                             float cx, float cy,
-                             float to_x, float to_y,
-                             void *)
-{
-  auto *d = (hb_vector_draw_t *) draw_data;
-  hb_svg_append_c (&d->path, 'Q');
-  d->append_xy (cx, cy);
-  hb_svg_append_c (&d->path, ' ');
-  d->append_xy (to_x, to_y);
-}
-
-static void
-hb_vector_draw_cubic_to (hb_draw_funcs_t *,
-                         void *draw_data,
-                         hb_draw_state_t *,
-                         float c1x, float c1y,
-                         float c2x, float c2y,
-                         float to_x, float to_y,
-                         void *)
-{
-  auto *d = (hb_vector_draw_t *) draw_data;
-  hb_svg_append_c (&d->path, 'C');
-  d->append_xy (c1x, c1y);
-  hb_svg_append_c (&d->path, ' ');
-  d->append_xy (c2x, c2y);
-  hb_svg_append_c (&d->path, ' ');
-  d->append_xy (to_x, to_y);
-}
-
-static void
-hb_vector_draw_close_path (hb_draw_funcs_t *,
-                           void *draw_data,
-                           hb_draw_state_t *,
-                           void *)
-{
-  auto *d = (hb_vector_draw_t *) draw_data;
-  hb_svg_append_c (&d->path, 'Z');
-}
-
-static inline void free_static_vector_draw_funcs ();
-
-static struct hb_vector_draw_funcs_lazy_loader_t
-  : hb_draw_funcs_lazy_loader_t<hb_vector_draw_funcs_lazy_loader_t>
-{
-  static hb_draw_funcs_t *create ()
-  {
-    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
-    hb_draw_funcs_set_move_to_func (funcs, (hb_draw_move_to_func_t) hb_vector_draw_move_to, nullptr, nullptr);
-    hb_draw_funcs_set_line_to_func (funcs, (hb_draw_line_to_func_t) hb_vector_draw_line_to, nullptr, nullptr);
-    hb_draw_funcs_set_quadratic_to_func (funcs, (hb_draw_quadratic_to_func_t) hb_vector_draw_quadratic_to, nullptr, nullptr);
-    hb_draw_funcs_set_cubic_to_func (funcs, (hb_draw_cubic_to_func_t) hb_vector_draw_cubic_to, nullptr, nullptr);
-    hb_draw_funcs_set_close_path_func (funcs, (hb_draw_close_path_func_t) hb_vector_draw_close_path, nullptr, nullptr);
-    hb_draw_funcs_make_immutable (funcs);
-    hb_atexit (free_static_vector_draw_funcs);
-    return funcs;
-  }
-} static_vector_draw_funcs;
-
-static inline void
-free_static_vector_draw_funcs ()
-{
-  static_vector_draw_funcs.free_instance ();
-}
-
-static hb_draw_funcs_t *
-hb_vector_draw_funcs_get ()
-{
-  return static_vector_draw_funcs.get_unconst ();
-}
-
-/**
- * hb_vector_draw_create_or_fail:
- * @format: output format.
- *
- * Creates a new draw context for vector output.
- *
- * Return value: (nullable): a newly allocated #hb_vector_draw_t, or `NULL` on failure.
- *
- * Since: 13.0.0
- */
-hb_vector_draw_t *
-hb_vector_draw_create_or_fail (hb_vector_format_t format)
-{
-  if (format != HB_VECTOR_FORMAT_SVG)
-    return nullptr;
-
-  hb_vector_draw_t *draw = hb_object_create<hb_vector_draw_t> ();
-  if (unlikely (!draw))
-    return nullptr;
-  draw->format = format;
-  draw->defined_glyphs = hb_set_create ();
-  draw->defs.alloc (2048);
-  draw->body.alloc (8192);
-  draw->path.alloc (2048);
-  return draw;
-}
-
-/**
- * hb_vector_draw_reference:
- * @draw: a draw context.
- *
- * Increases the reference count of @draw.
- *
- * Return value: (transfer full): referenced @draw.
- *
- * Since: 13.0.0
- */
-hb_vector_draw_t *
-hb_vector_draw_reference (hb_vector_draw_t *draw)
-{
-  return hb_object_reference (draw);
-}
-
-/**
- * hb_vector_draw_destroy:
- * @draw: a draw context.
- *
- * Decreases the reference count of @draw and destroys it when it reaches zero.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_destroy (hb_vector_draw_t *draw)
-{
-  if (!hb_object_should_destroy (draw))
-    return;
-
-  hb_blob_destroy (draw->recycled_blob);
-  hb_set_destroy (draw->defined_glyphs);
-  hb_object_actually_destroy (draw);
-  hb_free (draw);
-}
-
-/**
- * hb_vector_draw_set_user_data:
- * @draw: a draw context.
- * @key: user-data key.
- * @data: user-data value.
- * @destroy: (nullable): destroy callback for @data.
- * @replace: whether to replace an existing value for @key.
- *
- * Attaches user data to @draw.
- *
- * Return value: `true` on success, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_draw_set_user_data (hb_vector_draw_t   *draw,
-                              hb_user_data_key_t *key,
-                              void               *data,
-                              hb_destroy_func_t   destroy,
-                              hb_bool_t           replace)
-{
-  return hb_object_set_user_data (draw, key, data, destroy, replace);
-}
-
-/**
- * hb_vector_draw_get_user_data:
- * @draw: a draw context.
- * @key: user-data key.
- *
- * Gets previously attached user data from @draw.
- *
- * Return value: (nullable): user-data value associated with @key.
- *
- * Since: 13.0.0
- */
-void *
-hb_vector_draw_get_user_data (hb_vector_draw_t   *draw,
-                              hb_user_data_key_t *key)
-{
-  return hb_object_get_user_data (draw, key);
-}
-
-/**
- * hb_vector_draw_set_transform:
- * @draw: a draw context.
- * @xx: transform xx component.
- * @yx: transform yx component.
- * @xy: transform xy component.
- * @yy: transform yy component.
- * @dx: transform x translation.
- * @dy: transform y translation.
- *
- * Sets the affine transform used when drawing glyphs.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_set_transform (hb_vector_draw_t *draw,
-                              float xx, float yx,
-                              float xy, float yy,
-                              float dx, float dy)
-{
-  draw->transform = {xx, yx, xy, yy, dx, dy};
-}
-
-/**
- * hb_vector_draw_get_transform:
- * @draw: a draw context.
- * @xx: (out) (nullable): transform xx component.
- * @yx: (out) (nullable): transform yx component.
- * @xy: (out) (nullable): transform xy component.
- * @yy: (out) (nullable): transform yy component.
- * @dx: (out) (nullable): transform x translation.
- * @dy: (out) (nullable): transform y translation.
- *
- * Gets the affine transform used when drawing glyphs.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_get_transform (hb_vector_draw_t *draw,
-                              float *xx, float *yx,
-                              float *xy, float *yy,
-                              float *dx, float *dy)
-{
-  if (xx) *xx = draw->transform.xx;
-  if (yx) *yx = draw->transform.yx;
-  if (xy) *xy = draw->transform.xy;
-  if (yy) *yy = draw->transform.yy;
-  if (dx) *dx = draw->transform.x0;
-  if (dy) *dy = draw->transform.y0;
-}
-
-/**
- * hb_vector_draw_set_scale_factor:
- * @draw: a draw context.
- * @x_scale_factor: x scale factor.
- * @y_scale_factor: y scale factor.
- *
- * Sets additional output scaling factors.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_set_scale_factor (hb_vector_draw_t *draw,
-                                 float x_scale_factor,
-                                 float y_scale_factor)
-{
-  draw->x_scale_factor = x_scale_factor > 0.f ? x_scale_factor : 1.f;
-  draw->y_scale_factor = y_scale_factor > 0.f ? y_scale_factor : 1.f;
-}
-
-/**
- * hb_vector_draw_get_scale_factor:
- * @draw: a draw context.
- * @x_scale_factor: (out) (nullable): x scale factor.
- * @y_scale_factor: (out) (nullable): y scale factor.
- *
- * Gets additional output scaling factors.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_get_scale_factor (hb_vector_draw_t *draw,
-                                 float *x_scale_factor,
-                                 float *y_scale_factor)
-{
-  if (x_scale_factor) *x_scale_factor = draw->x_scale_factor;
-  if (y_scale_factor) *y_scale_factor = draw->y_scale_factor;
-}
-
-/**
- * hb_vector_draw_set_extents:
- * @draw: a draw context.
- * @extents: (nullable): output extents to set or expand.
- *
- * Sets or expands output extents on @draw. Passing `NULL` clears extents.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_set_extents (hb_vector_draw_t *draw,
-                            const hb_vector_extents_t *extents)
-{
-  if (!extents)
-  {
-    draw->extents = {0, 0, 0, 0};
-    draw->has_extents = false;
-    return;
-  }
-
-  if (!(extents->width > 0.f && extents->height > 0.f))
-    return;
-
-  if (draw->has_extents)
-  {
-    float x0 = hb_min (draw->extents.x, extents->x);
-    float y0 = hb_min (draw->extents.y, extents->y);
-    float x1 = hb_max (draw->extents.x + draw->extents.width,
-                       extents->x + extents->width);
-    float y1 = hb_max (draw->extents.y + draw->extents.height,
-                       extents->y + extents->height);
-    draw->extents = {x0, y0, x1 - x0, y1 - y0};
-  }
-  else
-  {
-    draw->extents = *extents;
-    draw->has_extents = true;
-  }
-}
-
-/**
- * hb_vector_draw_get_extents:
- * @draw: a draw context.
- * @extents: (out) (nullable): where to store current output extents.
- *
- * Gets current output extents from @draw.
- *
- * Return value: `true` if extents are set, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_draw_get_extents (hb_vector_draw_t *draw,
-                            hb_vector_extents_t *extents)
-{
-  if (!draw->has_extents)
-    return false;
-
-  if (extents)
-    *extents = draw->extents;
-  return true;
-}
-
-/**
- * hb_vector_draw_set_glyph_extents:
- * @draw: a draw context.
- * @glyph_extents: glyph extents in font units.
- *
- * Expands @draw extents using @glyph_extents under the current transform.
- *
- * Return value: `true` on success, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_draw_set_glyph_extents (hb_vector_draw_t *draw,
-                                  const hb_glyph_extents_t *glyph_extents)
-{
-  hb_bool_t has_extents = draw->has_extents;
-  hb_bool_t ret = hb_svg_set_glyph_extents_common (draw->transform,
-						   draw->x_scale_factor,
-						   draw->y_scale_factor,
-						   glyph_extents,
-						   &draw->extents,
-						   &has_extents);
-  draw->has_extents = has_extents;
-  return ret;
-}
-
-/**
- * hb_vector_draw_get_funcs:
- *
- * Gets draw callbacks implemented by the vector draw backend.
- *
- * Return value: (transfer none): immutable #hb_draw_funcs_t singleton.
- *
- * Since: 13.0.0
- */
-hb_draw_funcs_t *
-hb_vector_draw_get_funcs (void)
-{
-  return hb_vector_draw_funcs_get ();
-}
-
-/**
- * hb_vector_draw_glyph:
- * @draw: a draw context.
- * @font: font object.
- * @glyph: glyph ID.
- * @pen_x: glyph x origin before context transform.
- * @pen_y: glyph y origin before context transform.
- * @extents_mode: extents update mode.
- *
- * Draws one glyph into @draw.
- *
- * Return value: `true` if glyph data was emitted, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_draw_glyph (hb_vector_draw_t *draw,
-                      hb_font_t *font,
-                      hb_codepoint_t glyph,
-                      float pen_x,
-                      float pen_y,
-                      hb_vector_extents_mode_t extents_mode)
-{
-  if (draw->format != HB_VECTOR_FORMAT_SVG)
-    return false;
-
-  if (extents_mode == HB_VECTOR_EXTENTS_MODE_EXPAND)
-  {
-    hb_glyph_extents_t ge;
-    if (hb_font_get_glyph_extents (font, glyph, &ge))
-    {
-      float xx = draw->transform.xx;
-      float yx = draw->transform.yx;
-      float xy = draw->transform.xy;
-      float yy = draw->transform.yy;
-      float tx = draw->transform.x0 + xx * pen_x + xy * pen_y;
-      float ty = draw->transform.y0 + yx * pen_x + yy * pen_y;
-      hb_transform_t<> extents_transform = {xx, yx, -xy, -yy, tx, ty};
-
-      hb_bool_t has_extents = draw->has_extents;
-      hb_svg_set_glyph_extents_common (extents_transform,
-                                       draw->x_scale_factor,
-                                       draw->y_scale_factor,
-                                       &ge,
-                                       &draw->extents,
-                                       &has_extents);
-      draw->has_extents = has_extents;
-    }
-  }
-
-  bool needs_def = !draw->flat && !hb_set_has (draw->defined_glyphs, glyph);
-  if (needs_def)
-  {
-    draw->path.clear ();
-    hb_svg_path_sink_t sink = {&draw->path, draw->precision};
-    hb_font_draw_glyph (font, glyph, hb_svg_path_draw_funcs_get (), &sink);
-    if (!draw->path.length)
-      return false;
-    hb_svg_append_str (&draw->defs, "<path id=\"p");
-    hb_svg_append_unsigned (&draw->defs, glyph);
-    hb_svg_append_str (&draw->defs, "\" d=\"");
-    hb_svg_append_len (&draw->defs, draw->path.arrayZ, draw->path.length);
-    hb_svg_append_str (&draw->defs, "\"/>\n");
-    hb_set_add (draw->defined_glyphs, glyph);
-  }
-
-  if (draw->flat)
-  {
-    draw->path.clear ();
-    hb_svg_path_sink_t sink = {&draw->path, draw->precision};
-    hb_font_draw_glyph (font, glyph, hb_svg_path_draw_funcs_get (), &sink);
-
-    if (!draw->path.length)
-      return false;
-
-    float xx = draw->transform.xx;
-    float yx = draw->transform.yx;
-    float xy = draw->transform.xy;
-    float yy = draw->transform.yy;
-    float tx = draw->transform.x0 + xx * pen_x + xy * pen_y;
-    float ty = draw->transform.y0 + yx * pen_x + yy * pen_y;
-
-    hb_svg_append_str (&draw->body, "<path d=\"");
-    hb_svg_append_len (&draw->body, draw->path.arrayZ, draw->path.length);
-    hb_svg_append_str (&draw->body, "\" transform=\"");
-    hb_svg_append_instance_transform (&draw->body,
-                                      draw->precision,
-                                      draw->x_scale_factor,
-                                      draw->y_scale_factor,
-                                      xx, yx, xy, yy, tx, ty);
-    hb_svg_append_str (&draw->body, "\"/>\n");
-    return true;
-  }
-
-  float xx = draw->transform.xx;
-  float yx = draw->transform.yx;
-  float xy = draw->transform.xy;
-  float yy = draw->transform.yy;
-  float tx = draw->transform.x0 + xx * pen_x + xy * pen_y;
-  float ty = draw->transform.y0 + yx * pen_x + yy * pen_y;
-
-  hb_svg_append_str (&draw->body, "<use href=\"#p");
-  hb_svg_append_unsigned (&draw->body, glyph);
-  hb_svg_append_str (&draw->body, "\" transform=\"");
-  hb_svg_append_instance_transform (&draw->body,
-                                    draw->precision,
-                                    draw->x_scale_factor,
-                                    draw->y_scale_factor,
-                                    xx, yx, xy, yy, tx, ty);
-  hb_svg_append_str (&draw->body, "\"/>\n");
-  return true;
-}
-
-/**
- * hb_vector_svg_set_flat:
- * @draw: a draw context.
- * @flat: whether to flatten geometry and disable reuse.
- *
- * Enables or disables SVG draw flattening.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_svg_set_flat (hb_vector_draw_t *draw,
-                        hb_bool_t flat)
-{
-  draw->flat = !!flat;
-}
-
-/**
- * hb_vector_svg_set_precision:
- * @draw: a draw context.
- * @precision: decimal precision.
- *
- * Sets numeric output precision for SVG draw output.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_svg_set_precision (hb_vector_draw_t *draw,
-                             unsigned precision)
-{
-  draw->precision = hb_min (precision, 12u);
-}
-
-/**
- * hb_vector_draw_render:
- * @draw: a draw context.
- *
- * Renders accumulated draw content to an SVG blob.
- *
- * Return value: (transfer full) (nullable): output blob, or `NULL` if rendering cannot proceed.
- *
- * Since: 13.0.0
- */
-hb_blob_t *
-hb_vector_draw_render (hb_vector_draw_t *draw)
-{
-  if (draw->format != HB_VECTOR_FORMAT_SVG)
-    return nullptr;
-  if (!draw->has_extents)
-    return nullptr;
-
-  hb_vector_t<char> out;
-  hb_svg_recover_recycled_buffer (draw->recycled_blob, &out);
-  unsigned estimated = draw->defs.length +
-                       (draw->body.length ? draw->body.length : draw->path.length) +
-                       256;
-  out.alloc (estimated);
-  hb_svg_append_str (&out, "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"");
-  hb_svg_append_num (&out, draw->extents.x, draw->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, draw->extents.y, draw->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, draw->extents.width, draw->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, draw->extents.height, draw->precision);
-  hb_svg_append_str (&out, "\" width=\"");
-  hb_svg_append_num (&out, draw->extents.width, draw->precision);
-  hb_svg_append_str (&out, "\" height=\"");
-  hb_svg_append_num (&out, draw->extents.height, draw->precision);
-  hb_svg_append_str (&out, "\">\n");
-
-  if (draw->defs.length)
-  {
-    hb_svg_append_str (&out, "<defs>\n");
-    hb_svg_append_len (&out, draw->defs.arrayZ, draw->defs.length);
-    hb_svg_append_str (&out, "</defs>\n");
-  }
-
-  if (draw->body.length)
-  {
-    hb_svg_append_len (&out, draw->body.arrayZ, draw->body.length);
-  }
-  else if (draw->path.length)
-  {
-    hb_svg_append_str (&out, "<path d=\"");
-    hb_svg_append_len (&out, draw->path.arrayZ, draw->path.length);
-    hb_svg_append_str (&out, "\"/>\n");
-  }
-
-  hb_svg_append_str (&out, "</svg>\n");
-
-  hb_blob_t *blob = hb_svg_blob_from_buffer (&draw->recycled_blob, &out);
-
-  draw->path.clear ();
-  draw->defs.clear ();
-  draw->body.clear ();
-  hb_set_clear (draw->defined_glyphs);
-  draw->has_extents = false;
-  draw->extents = {0, 0, 0, 0};
-
-  return blob;
-}
-
-/**
- * hb_vector_draw_reset:
- * @draw: a draw context.
- *
- * Resets @draw state and clears accumulated content.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_reset (hb_vector_draw_t *draw)
-{
-  draw->transform = {1, 0, 0, 1, 0, 0};
-  draw->x_scale_factor = 1.f;
-  draw->y_scale_factor = 1.f;
-  draw->extents = {0, 0, 0, 0};
-  draw->has_extents = false;
-  draw->precision = 2;
-  draw->flat = false;
-  draw->defs.clear ();
-  draw->body.clear ();
-  draw->path.clear ();
-  hb_set_clear (draw->defined_glyphs);
-}
-
-/**
- * hb_vector_draw_recycle_blob:
- * @draw: a draw context.
- * @blob: (nullable): previously rendered blob to recycle.
- *
- * Provides a blob for internal buffer reuse by later render calls.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_draw_recycle_blob (hb_vector_draw_t *draw,
-                             hb_blob_t *blob)
-{
-  hb_blob_destroy (draw->recycled_blob);
-  draw->recycled_blob = nullptr;
-  if (!blob || blob == hb_blob_get_empty ())
-    return;
-  draw->recycled_blob = blob;
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-paint.cc b/engine/thirdparty/harfbuzz/src/hb-vector-svg-paint.cc
deleted file mode 100644
index b23efb7e..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-paint.cc
+++ /dev/null
@@ -1,1830 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-vector.h"
-#include "hb-blob.hh"
-#include "hb-geometry.hh"
-#include "hb-machinery.hh"
-#include "hb-map.hh"
-#include "hb-vector-svg-path.hh"
-#include "hb-vector-svg-subset.hh"
-#include "hb-vector-svg-utils.hh"
-
-#include <algorithm>
-#include <math.h>
-#include <string.h>
-
-#include "hb-vector-svg.hh"
-
-struct hb_svg_color_glyph_cache_key_t
-{
-  hb_codepoint_t glyph = HB_CODEPOINT_INVALID;
-  unsigned palette = 0;
-  hb_color_t foreground = 0;
-
-  hb_svg_color_glyph_cache_key_t () = default;
-  hb_svg_color_glyph_cache_key_t (hb_codepoint_t g, unsigned p, hb_color_t f)
-    : glyph (g), palette (p), foreground (f) {}
-
-  bool operator == (const hb_svg_color_glyph_cache_key_t &o) const
-  {
-    return glyph == o.glyph &&
-           palette == o.palette &&
-           foreground == o.foreground;
-  }
-
-  uint32_t hash () const
-  {
-    uint32_t h = hb_hash (glyph);
-    h = h * 31u + hb_hash (palette);
-    h = h * 31u + hb_hash (foreground);
-    return h;
-  }
-};
-
-struct hb_vector_paint_t
-{
-  hb_object_header_t header;
-
-  hb_vector_format_t format = HB_VECTOR_FORMAT_SVG;
-  hb_transform_t<> transform = {1, 0, 0, 1, 0, 0};
-  float x_scale_factor = 1.f;
-  float y_scale_factor = 1.f;
-  hb_vector_extents_t extents = {0, 0, 0, 0};
-  bool has_extents = false;
-
-  hb_color_t foreground = HB_COLOR (0, 0, 0, 255);
-  int palette = 0;
-  hb_hashmap_t<unsigned, hb_color_t> custom_palette_colors;
-  unsigned precision = 2;
-  bool flat = false;
-
-  hb_vector_t<char> defs;
-  hb_vector_t<char> path;
-  hb_vector_t<hb_vector_t<char>> group_stack;
-  uint64_t transform_group_open_mask = 0;
-  unsigned transform_group_depth = 0;
-  unsigned transform_group_overflow_depth = 0;
-
-  unsigned clip_rect_counter = 0;
-  unsigned gradient_counter = 0;
-  unsigned color_glyph_counter = 0;
-  hb_set_t *defined_outlines = nullptr;
-  hb_set_t *defined_clips = nullptr;
-  hb_hashmap_t<hb_svg_color_glyph_cache_key_t, uint64_t> defined_color_glyphs;
-  hb_vector_t<hb_color_stop_t> color_stops_scratch;
-  hb_vector_t<char> subset_body_scratch;
-  hb_vector_t<char> captured_scratch;
-  hb_blob_t *recycled_blob = nullptr;
-  bool current_color_glyph_has_svg_image = false;
-  hb_codepoint_t current_svg_image_glyph = HB_CODEPOINT_INVALID;
-  hb_face_t *current_face = nullptr;
-  unsigned svg_image_counter = 0;
-
-  hb_vector_t<char> &current_body () { return group_stack.tail (); }
-
-  void append_global_transform_prefix (hb_vector_t<char> *buf)
-  {
-    if (transform.xx == 1.f && transform.yx == 0.f &&
-        transform.xy == 0.f && transform.yy == 1.f &&
-        transform.x0 == 0.f && transform.y0 == 0.f &&
-        x_scale_factor == 1.f && y_scale_factor == 1.f)
-      return;
-
-    unsigned sprec = hb_svg_scale_precision (precision);
-    hb_svg_append_str (buf, "<g transform=\"matrix(");
-    hb_svg_append_num (buf, transform.xx / x_scale_factor, sprec, true);
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_num (buf, transform.yx / y_scale_factor, sprec, true);
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_num (buf, transform.xy / x_scale_factor, sprec, true);
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_num (buf, transform.yy / y_scale_factor, sprec, true);
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_num (buf, transform.x0 / x_scale_factor, precision);
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_num (buf, transform.y0 / y_scale_factor, precision);
-    hb_svg_append_str (buf, ")\">\n");
-  }
-
-  void append_global_transform_suffix (hb_vector_t<char> *buf)
-  {
-    if (transform.xx == 1.f && transform.yx == 0.f &&
-        transform.xy == 0.f && transform.yy == 1.f &&
-        transform.x0 == 0.f && transform.y0 == 0.f &&
-        x_scale_factor == 1.f && y_scale_factor == 1.f)
-      return;
-    hb_svg_append_str (buf, "</g>\n");
-  }
-};
-
-static inline uint64_t
-hb_svg_pack_color_glyph_cache_entry (unsigned def_id,
-                                     bool image_like)
-{
-  return ((uint64_t) def_id << 1) | (image_like ? 1ull : 0ull);
-}
-
-static inline unsigned
-hb_svg_cache_entry_def_id (uint64_t v)
-{
-  return (unsigned) (v >> 1);
-}
-
-static inline bool
-hb_svg_cache_entry_image_like (uint64_t v)
-{
-  return !!(v & 1ull);
-}
-
-static inline hb_svg_color_glyph_cache_key_t
-hb_svg_color_glyph_cache_key (hb_codepoint_t glyph,
-                              unsigned palette,
-                              hb_color_t foreground)
-{
-  return {glyph, palette, foreground};
-}
-
-static hb_bool_t
-hb_svg_get_color_stops (hb_vector_paint_t *paint,
-                        hb_color_line_t *color_line,
-                        hb_vector_t<hb_color_stop_t> *stops)
-{
-  unsigned len = hb_color_line_get_color_stops (color_line, 0, nullptr, nullptr);
-  if (unlikely (!stops->resize (len)))
-    return false;
-  hb_color_line_get_color_stops (color_line, 0, &len, stops->arrayZ);
-
-  for (unsigned i = 0; i < len; i++)
-    if (stops->arrayZ[i].is_foreground)
-      stops->arrayZ[i].color = HB_COLOR (hb_color_get_blue (paint->foreground),
-                                         hb_color_get_green (paint->foreground),
-                                         hb_color_get_red (paint->foreground),
-                                         (unsigned) hb_color_get_alpha (stops->arrayZ[i].color) *
-                                         hb_color_get_alpha (paint->foreground) / 255);
-  return true;
-}
-
-static const char *
-hb_svg_extend_mode_str (hb_paint_extend_t ext)
-{
-  switch (ext)
-  {
-    case HB_PAINT_EXTEND_PAD: return "pad";
-    case HB_PAINT_EXTEND_REPEAT: return "repeat";
-    case HB_PAINT_EXTEND_REFLECT: return "reflect";
-    default: return "pad";
-  }
-}
-
-static int
-hb_svg_color_stop_cmp (const void *a, const void *b)
-{
-  const hb_color_stop_t *x = (const hb_color_stop_t *) a;
-  const hb_color_stop_t *y = (const hb_color_stop_t *) b;
-  if (x->offset < y->offset) return -1;
-  if (x->offset > y->offset) return 1;
-  return 0;
-}
-
-static void
-hb_svg_emit_color_stops (hb_vector_paint_t *paint,
-                         hb_vector_t<char> *buf,
-                         hb_vector_t<hb_color_stop_t> *stops)
-{
-  for (unsigned i = 0; i < stops->length; i++)
-  {
-    hb_color_t c = stops->arrayZ[i].color;
-    hb_svg_append_str (buf, "<stop offset=\"");
-    hb_svg_append_num (buf, stops->arrayZ[i].offset, 4);
-    hb_svg_append_str (buf, "\" stop-color=\"rgb(");
-    hb_svg_append_unsigned (buf, hb_color_get_red (c));
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_unsigned (buf, hb_color_get_green (c));
-    hb_svg_append_c (buf, ',');
-    hb_svg_append_unsigned (buf, hb_color_get_blue (c));
-    hb_svg_append_str (buf, ")\"");
-    if (hb_color_get_alpha (c) != 255)
-    {
-      hb_svg_append_str (buf, " stop-opacity=\"");
-      hb_svg_append_num (buf, hb_color_get_alpha (c) / 255.f, 4);
-      hb_svg_append_c (buf, '"');
-    }
-    hb_svg_append_str (buf, "/>\n");
-  }
-}
-
-static const char *
-hb_svg_composite_mode_str (hb_paint_composite_mode_t mode)
-{
-  switch (mode)
-  {
-    case HB_PAINT_COMPOSITE_MODE_CLEAR:
-    case HB_PAINT_COMPOSITE_MODE_SRC:
-    case HB_PAINT_COMPOSITE_MODE_DEST:
-    case HB_PAINT_COMPOSITE_MODE_DEST_OVER:
-    case HB_PAINT_COMPOSITE_MODE_SRC_IN:
-    case HB_PAINT_COMPOSITE_MODE_DEST_IN:
-    case HB_PAINT_COMPOSITE_MODE_SRC_OUT:
-    case HB_PAINT_COMPOSITE_MODE_DEST_OUT:
-    case HB_PAINT_COMPOSITE_MODE_SRC_ATOP:
-    case HB_PAINT_COMPOSITE_MODE_DEST_ATOP:
-    case HB_PAINT_COMPOSITE_MODE_XOR:
-    case HB_PAINT_COMPOSITE_MODE_PLUS:
-      return nullptr;
-    case HB_PAINT_COMPOSITE_MODE_SRC_OVER: return "normal";
-    case HB_PAINT_COMPOSITE_MODE_SCREEN: return "screen";
-    case HB_PAINT_COMPOSITE_MODE_OVERLAY: return "overlay";
-    case HB_PAINT_COMPOSITE_MODE_DARKEN: return "darken";
-    case HB_PAINT_COMPOSITE_MODE_LIGHTEN: return "lighten";
-    case HB_PAINT_COMPOSITE_MODE_COLOR_DODGE: return "color-dodge";
-    case HB_PAINT_COMPOSITE_MODE_COLOR_BURN: return "color-burn";
-    case HB_PAINT_COMPOSITE_MODE_HARD_LIGHT: return "hard-light";
-    case HB_PAINT_COMPOSITE_MODE_SOFT_LIGHT: return "soft-light";
-    case HB_PAINT_COMPOSITE_MODE_DIFFERENCE: return "difference";
-    case HB_PAINT_COMPOSITE_MODE_EXCLUSION: return "exclusion";
-    case HB_PAINT_COMPOSITE_MODE_MULTIPLY: return "multiply";
-    case HB_PAINT_COMPOSITE_MODE_HSL_HUE: return "hue";
-    case HB_PAINT_COMPOSITE_MODE_HSL_SATURATION: return "saturation";
-    case HB_PAINT_COMPOSITE_MODE_HSL_COLOR: return "color";
-    case HB_PAINT_COMPOSITE_MODE_HSL_LUMINOSITY: return "luminosity";
-    default: return nullptr;
-  }
-}
-
-struct hb_svg_point_t { float x, y; };
-struct hb_svg_rgba_t { float r, g, b, a; };
-
-static inline float
-hb_svg_lerp (float a, float b, float t)
-{ return a + (b - a) * t; }
-
-static inline float
-hb_svg_clamp01 (float v)
-{
-  if (v < 0.f) return 0.f;
-  if (v > 1.f) return 1.f;
-  return v;
-}
-
-static inline hb_svg_rgba_t
-hb_svg_rgba_from_hb_color (hb_color_t c)
-{
-  return {(float) hb_color_get_red (c) / 255.f,
-          (float) hb_color_get_green (c) / 255.f,
-          (float) hb_color_get_blue (c) / 255.f,
-          (float) hb_color_get_alpha (c) / 255.f};
-}
-
-static inline hb_color_t
-hb_svg_hb_color_from_rgba (const hb_svg_rgba_t &c)
-{
-  unsigned r = (unsigned) roundf (hb_svg_clamp01 (c.r) * 255.f);
-  unsigned g = (unsigned) roundf (hb_svg_clamp01 (c.g) * 255.f);
-  unsigned b = (unsigned) roundf (hb_svg_clamp01 (c.b) * 255.f);
-  unsigned a = (unsigned) roundf (hb_svg_clamp01 (c.a) * 255.f);
-  return HB_COLOR (b, g, r, a);
-}
-
-static inline hb_svg_rgba_t
-hb_svg_lerp_rgba (const hb_svg_rgba_t &c0,
-                  const hb_svg_rgba_t &c1,
-                  float t)
-{
-  return {hb_svg_lerp (c0.r, c1.r, t),
-          hb_svg_lerp (c0.g, c1.g, t),
-          hb_svg_lerp (c0.b, c1.b, t),
-          hb_svg_lerp (c0.a, c1.a, t)};
-}
-
-static inline float hb_svg_dot (const hb_svg_point_t &p, const hb_svg_point_t &q) { return p.x * q.x + p.y * q.y; }
-static inline hb_svg_point_t hb_svg_add (const hb_svg_point_t &p, const hb_svg_point_t &q) { return {p.x + q.x, p.y + q.y}; }
-static inline hb_svg_point_t hb_svg_sub (const hb_svg_point_t &p, const hb_svg_point_t &q) { return {p.x - q.x, p.y - q.y}; }
-static inline hb_svg_point_t hb_svg_scale (const hb_svg_point_t &p, float f) { return {p.x * f, p.y * f}; }
-
-static inline hb_svg_point_t
-hb_svg_normalize (const hb_svg_point_t &p)
-{
-  float len = sqrtf (hb_svg_dot (p, p));
-  if (len == 0.f) return {0.f, 0.f};
-  return hb_svg_scale (p, 1.f / len);
-}
-
-static void
-hb_svg_add_sweep_patch (hb_vector_t<char> *body,
-                        unsigned precision,
-                        float cx, float cy, float radius,
-                        float a0, const hb_svg_rgba_t &c0_in,
-                        float a1, const hb_svg_rgba_t &c1_in)
-{
-  static const float max_angle = HB_PI / 16.f;
-  hb_svg_point_t center = {cx, cy};
-  int num_splits = (int) ceilf (fabsf (a1 - a0) / max_angle);
-  if (num_splits < 1) num_splits = 1;
-
-  hb_svg_point_t p0 = {cosf (a0), sinf (a0)};
-  hb_svg_rgba_t color0 = c0_in;
-
-  for (int a = 0; a < num_splits; a++)
-  {
-    float k = (a + 1.f) / num_splits;
-    float angle1 = hb_svg_lerp (a0, a1, k);
-    hb_svg_rgba_t color1 = hb_svg_lerp_rgba (c0_in, c1_in, k);
-
-    hb_svg_point_t p1 = {cosf (angle1), sinf (angle1)};
-    hb_svg_point_t sp0 = hb_svg_add (center, hb_svg_scale (p0, radius));
-    hb_svg_point_t sp1 = hb_svg_add (center, hb_svg_scale (p1, radius));
-
-    hb_svg_point_t A = hb_svg_normalize (hb_svg_add (p0, p1));
-    hb_svg_point_t U = {-A.y, A.x};
-    float up0 = hb_svg_dot (U, p0);
-    float up1 = hb_svg_dot (U, p1);
-    if (fabsf (up0) < 1e-6f || fabsf (up1) < 1e-6f)
-    {
-      p0 = p1;
-      color0 = color1;
-      continue;
-    }
-    hb_svg_point_t C0 = hb_svg_add (A, hb_svg_scale (U, hb_svg_dot (hb_svg_sub (p0, A), p0) / up0));
-    hb_svg_point_t C1 = hb_svg_add (A, hb_svg_scale (U, hb_svg_dot (hb_svg_sub (p1, A), p1) / up1));
-
-    hb_svg_point_t sc0 = hb_svg_add (center, hb_svg_scale (hb_svg_add (C0, hb_svg_scale (hb_svg_sub (C0, p0), 0.33333f)), radius));
-    hb_svg_point_t sc1 = hb_svg_add (center, hb_svg_scale (hb_svg_add (C1, hb_svg_scale (hb_svg_sub (C1, p1), 0.33333f)), radius));
-
-    hb_svg_rgba_t mid_color = hb_svg_lerp_rgba (color0, color1, 0.5f);
-    hb_color_t mid = hb_svg_hb_color_from_rgba (mid_color);
-
-    hb_svg_append_str (body, "<path d=\"M");
-    hb_svg_append_num (body, center.x, precision);
-    hb_svg_append_c (body, ',');
-    hb_svg_append_num (body, center.y, precision);
-    hb_svg_append_str (body, "L");
-    hb_svg_append_num (body, sp0.x, precision);
-    hb_svg_append_c (body, ',');
-    hb_svg_append_num (body, sp0.y, precision);
-    hb_svg_append_str (body, "C");
-    hb_svg_append_num (body, sc0.x, precision);
-    hb_svg_append_c (body, ',');
-    hb_svg_append_num (body, sc0.y, precision);
-    hb_svg_append_c (body, ' ');
-    hb_svg_append_num (body, sc1.x, precision);
-    hb_svg_append_c (body, ',');
-    hb_svg_append_num (body, sc1.y, precision);
-    hb_svg_append_c (body, ' ');
-    hb_svg_append_num (body, sp1.x, precision);
-    hb_svg_append_c (body, ',');
-    hb_svg_append_num (body, sp1.y, precision);
-    hb_svg_append_str (body, "Z\" fill=\"");
-    hb_svg_append_color (body, mid, true);
-    hb_svg_append_str (body, "\"/>\n");
-
-    p0 = p1;
-    color0 = color1;
-  }
-}
-
-static void
-hb_svg_add_sweep_gradient_patches (hb_vector_t<char> *body,
-                                   unsigned precision,
-                                   hb_color_stop_t *stops,
-                                   unsigned n_stops,
-                                   hb_paint_extend_t extend,
-                                   float cx, float cy, float radius,
-                                   float start_angle, float end_angle)
-{
-  if (!n_stops) return;
-
-  hb_svg_rgba_t colors_buf[16];
-  float angles_buf[16];
-  hb_svg_rgba_t *colors = colors_buf;
-  float *angles = angles_buf;
-  bool dynamic = false;
-
-  if (start_angle == end_angle)
-  {
-    if (extend == HB_PAINT_EXTEND_PAD)
-    {
-      if (start_angle > 0.f)
-      {
-        hb_svg_rgba_t c = hb_svg_rgba_from_hb_color (stops[0].color);
-        hb_svg_add_sweep_patch (body, precision, cx, cy, radius, 0.f, c, start_angle, c);
-      }
-      if (end_angle < HB_2_PI)
-      {
-        hb_svg_rgba_t c = hb_svg_rgba_from_hb_color (stops[n_stops - 1].color);
-        hb_svg_add_sweep_patch (body, precision, cx, cy, radius, end_angle, c, HB_2_PI, c);
-      }
-    }
-    return;
-  }
-
-  if (end_angle < start_angle)
-  {
-    float tmp = start_angle; start_angle = end_angle; end_angle = tmp;
-    for (unsigned i = 0; i < n_stops - 1 - i; i++)
-    {
-      hb_color_stop_t t = stops[i];
-      stops[i] = stops[n_stops - 1 - i];
-      stops[n_stops - 1 - i] = t;
-    }
-    for (unsigned i = 0; i < n_stops; i++)
-      stops[i].offset = 1.f - stops[i].offset;
-  }
-
-  if (n_stops > 16)
-  {
-    angles = (float *) hb_malloc (sizeof (float) * n_stops);
-    colors = (hb_svg_rgba_t *) hb_malloc (sizeof (hb_svg_rgba_t) * n_stops);
-    if (!angles || !colors)
-    {
-      hb_free (angles);
-      hb_free (colors);
-      return;
-    }
-    dynamic = true;
-  }
-
-  for (unsigned i = 0; i < n_stops; i++)
-  {
-    angles[i] = start_angle + stops[i].offset * (end_angle - start_angle);
-    colors[i] = hb_svg_rgba_from_hb_color (stops[i].color);
-  }
-
-  if (extend == HB_PAINT_EXTEND_PAD)
-  {
-    unsigned pos;
-    hb_svg_rgba_t color0 = colors[0];
-    for (pos = 0; pos < n_stops; pos++)
-    {
-      if (angles[pos] >= 0)
-      {
-        if (pos > 0)
-        {
-          float f = (0.f - angles[pos - 1]) / (angles[pos] - angles[pos - 1]);
-          color0 = hb_svg_lerp_rgba (colors[pos - 1], colors[pos], f);
-        }
-        break;
-      }
-    }
-    if (pos == n_stops)
-    {
-      color0 = colors[n_stops - 1];
-      hb_svg_add_sweep_patch (body, precision, cx, cy, radius, 0.f, color0, HB_2_PI, color0);
-      goto done;
-    }
-    hb_svg_add_sweep_patch (body, precision, cx, cy, radius, 0.f, color0, angles[pos], colors[pos]);
-    for (pos++; pos < n_stops; pos++)
-    {
-      if (angles[pos] <= HB_2_PI)
-        hb_svg_add_sweep_patch (body, precision, cx, cy, radius, angles[pos - 1], colors[pos - 1], angles[pos], colors[pos]);
-      else
-      {
-        float f = (HB_2_PI - angles[pos - 1]) / (angles[pos] - angles[pos - 1]);
-        hb_svg_rgba_t color1 = hb_svg_lerp_rgba (colors[pos - 1], colors[pos], f);
-        hb_svg_add_sweep_patch (body, precision, cx, cy, radius, angles[pos - 1], colors[pos - 1], HB_2_PI, color1);
-        break;
-      }
-    }
-    if (pos == n_stops)
-    {
-      color0 = colors[n_stops - 1];
-      hb_svg_add_sweep_patch (body, precision, cx, cy, radius, angles[n_stops - 1], color0, HB_2_PI, color0);
-      goto done;
-    }
-  }
-  else
-  {
-    float span = angles[n_stops - 1] - angles[0];
-    if (fabsf (span) < 1e-6f)
-      goto done;
-
-    int k = 0;
-    if (angles[0] >= 0)
-    {
-      float ss = angles[0];
-      while (ss > 0)
-      {
-        if (span > 0) { ss -= span; k--; }
-        else          { ss += span; k++; }
-      }
-    }
-    else
-    {
-      float ee = angles[n_stops - 1];
-      while (ee < 0)
-      {
-        if (span > 0) { ee += span; k++; }
-        else          { ee -= span; k--; }
-      }
-    }
-
-    span = fabsf (span);
-    for (int l = k; l < 1000; l++)
-    {
-      for (unsigned i = 1; i < n_stops; i++)
-      {
-        float a0_l, a1_l;
-        const hb_svg_rgba_t *col0, *col1;
-        if ((l % 2 != 0) && (extend == HB_PAINT_EXTEND_REFLECT))
-        {
-          a0_l = angles[0] + angles[n_stops - 1] - angles[n_stops - i] + l * span;
-          a1_l = angles[0] + angles[n_stops - 1] - angles[n_stops - 1 - i] + l * span;
-          col0 = &colors[n_stops - i];
-          col1 = &colors[n_stops - 1 - i];
-        }
-        else
-        {
-          a0_l = angles[i - 1] + l * span;
-          a1_l = angles[i] + l * span;
-          col0 = &colors[i - 1];
-          col1 = &colors[i];
-        }
-
-        if (a1_l < 0.f) continue;
-        if (a0_l < 0.f)
-        {
-          float f = (0.f - a0_l) / (a1_l - a0_l);
-          hb_svg_rgba_t c = hb_svg_lerp_rgba (*col0, *col1, f);
-          hb_svg_add_sweep_patch (body, precision, cx, cy, radius, 0.f, c, a1_l, *col1);
-        }
-        else if (a1_l >= HB_2_PI)
-        {
-          float f = (HB_2_PI - a0_l) / (a1_l - a0_l);
-          hb_svg_rgba_t c = hb_svg_lerp_rgba (*col0, *col1, f);
-          hb_svg_add_sweep_patch (body, precision, cx, cy, radius, a0_l, *col0, HB_2_PI, c);
-          goto done;
-        }
-        else
-          hb_svg_add_sweep_patch (body, precision, cx, cy, radius, a0_l, *col0, a1_l, *col1);
-      }
-    }
-  }
-
-done:
-  if (dynamic)
-  {
-    hb_free (angles);
-    hb_free (colors);
-  }
-}
-
-
-static void hb_vector_paint_push_transform (hb_paint_funcs_t *, void *,
-                                            float, float, float, float, float, float,
-                                            void *);
-static void hb_vector_paint_pop_transform (hb_paint_funcs_t *, void *, void *);
-static void hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, void *);
-static void hb_vector_paint_push_clip_rectangle (hb_paint_funcs_t *, void *, float, float, float, float, void *);
-static void hb_vector_paint_pop_clip (hb_paint_funcs_t *, void *, void *);
-static void hb_vector_paint_color (hb_paint_funcs_t *, void *, hb_bool_t, hb_color_t, void *);
-static hb_bool_t hb_vector_paint_image (hb_paint_funcs_t *, void *, hb_blob_t *, unsigned, unsigned, hb_tag_t, float, hb_glyph_extents_t *, void *);
-static void hb_vector_paint_linear_gradient (hb_paint_funcs_t *, void *, hb_color_line_t *, float, float, float, float, float, float, void *);
-static void hb_vector_paint_radial_gradient (hb_paint_funcs_t *, void *, hb_color_line_t *, float, float, float, float, float, float, void *);
-static void hb_vector_paint_sweep_gradient (hb_paint_funcs_t *, void *, hb_color_line_t *, float, float, float, float, void *);
-static void hb_vector_paint_push_group (hb_paint_funcs_t *, void *, void *);
-static void hb_vector_paint_pop_group (hb_paint_funcs_t *, void *, hb_paint_composite_mode_t, void *);
-static hb_bool_t hb_vector_paint_color_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, void *);
-static hb_bool_t hb_vector_paint_custom_palette_color (hb_paint_funcs_t *, void *, unsigned, hb_color_t *, void *);
-
-static inline void free_static_vector_paint_funcs ();
-static struct hb_vector_paint_funcs_lazy_loader_t
-  : hb_paint_funcs_lazy_loader_t<hb_vector_paint_funcs_lazy_loader_t>
-{
-  static hb_paint_funcs_t *create ()
-  {
-    hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
-    hb_paint_funcs_set_push_transform_func (funcs, (hb_paint_push_transform_func_t) hb_vector_paint_push_transform, nullptr, nullptr);
-    hb_paint_funcs_set_pop_transform_func (funcs, (hb_paint_pop_transform_func_t) hb_vector_paint_pop_transform, nullptr, nullptr);
-    hb_paint_funcs_set_push_clip_glyph_func (funcs, (hb_paint_push_clip_glyph_func_t) hb_vector_paint_push_clip_glyph, nullptr, nullptr);
-    hb_paint_funcs_set_push_clip_rectangle_func (funcs, (hb_paint_push_clip_rectangle_func_t) hb_vector_paint_push_clip_rectangle, nullptr, nullptr);
-    hb_paint_funcs_set_pop_clip_func (funcs, (hb_paint_pop_clip_func_t) hb_vector_paint_pop_clip, nullptr, nullptr);
-    hb_paint_funcs_set_color_func (funcs, (hb_paint_color_func_t) hb_vector_paint_color, nullptr, nullptr);
-    hb_paint_funcs_set_image_func (funcs, (hb_paint_image_func_t) hb_vector_paint_image, nullptr, nullptr);
-    hb_paint_funcs_set_linear_gradient_func (funcs, (hb_paint_linear_gradient_func_t) hb_vector_paint_linear_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_radial_gradient_func (funcs, (hb_paint_radial_gradient_func_t) hb_vector_paint_radial_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_sweep_gradient_func (funcs, (hb_paint_sweep_gradient_func_t) hb_vector_paint_sweep_gradient, nullptr, nullptr);
-    hb_paint_funcs_set_push_group_func (funcs, (hb_paint_push_group_func_t) hb_vector_paint_push_group, nullptr, nullptr);
-    hb_paint_funcs_set_pop_group_func (funcs, (hb_paint_pop_group_func_t) hb_vector_paint_pop_group, nullptr, nullptr);
-    hb_paint_funcs_set_color_glyph_func (funcs, (hb_paint_color_glyph_func_t) hb_vector_paint_color_glyph, nullptr, nullptr);
-    hb_paint_funcs_set_custom_palette_color_func (funcs, (hb_paint_custom_palette_color_func_t) hb_vector_paint_custom_palette_color, nullptr, nullptr);
-    hb_paint_funcs_make_immutable (funcs);
-    hb_atexit (free_static_vector_paint_funcs);
-    return funcs;
-  }
-} static_vector_paint_funcs;
-
-static inline void
-free_static_vector_paint_funcs ()
-{
-  static_vector_paint_funcs.free_instance ();
-}
-
-static hb_paint_funcs_t *
-hb_vector_paint_funcs_get ()
-{
-  return static_vector_paint_funcs.get_unconst ();
-}
-
-static hb_bool_t
-hb_vector_paint_ensure_initialized (hb_vector_paint_t *paint)
-{
-  if (paint->group_stack.length)
-    return true;
-  if (unlikely (!paint->group_stack.push_or_fail ()))
-    return false;
-  paint->group_stack.tail ().alloc (4096);
-  return !paint->group_stack.in_error ();
-}
-
-static void
-hb_vector_paint_push_transform (hb_paint_funcs_t *,
-                                void *paint_data,
-                                float xx, float yx,
-                                float xy, float yy,
-                                float dx, float dy,
-                                void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  if (unlikely (paint->transform_group_overflow_depth))
-  {
-    paint->transform_group_overflow_depth++;
-    return;
-  }
-  if (unlikely (paint->transform_group_depth >= 64))
-  {
-    paint->transform_group_overflow_depth = 1;
-    return;
-  }
-
-  hb_bool_t opened =
-    !(fabsf (xx - 1.f) < 1e-6f && fabsf (yx) < 1e-6f &&
-      fabsf (xy) < 1e-6f && fabsf (yy - 1.f) < 1e-6f &&
-      fabsf (dx) < 1e-6f && fabsf (dy) < 1e-6f);
-  paint->transform_group_open_mask = (paint->transform_group_open_mask << 1) | (opened ? 1ull : 0ull);
-  paint->transform_group_depth++;
-
-  if (!opened)
-    return;
-
-  auto &body = paint->current_body ();
-  unsigned sprec = hb_svg_scale_precision (paint->precision);
-  hb_svg_append_str (&body, "<g transform=\"matrix(");
-  hb_svg_append_num (&body, xx, sprec, true);
-  hb_svg_append_c (&body, ',');
-  hb_svg_append_num (&body, yx, sprec, true);
-  hb_svg_append_c (&body, ',');
-  hb_svg_append_num (&body, xy, sprec, true);
-  hb_svg_append_c (&body, ',');
-  hb_svg_append_num (&body, yy, sprec, true);
-  hb_svg_append_c (&body, ',');
-  hb_svg_append_num (&body, dx, paint->precision);
-  hb_svg_append_c (&body, ',');
-  hb_svg_append_num (&body, dy, paint->precision);
-  hb_svg_append_str (&body, ")\">\n");
-}
-
-static void
-hb_vector_paint_pop_transform (hb_paint_funcs_t *,
-                               void *paint_data,
-                               void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-  if (unlikely (paint->transform_group_overflow_depth))
-  {
-    paint->transform_group_overflow_depth--;
-    return;
-  }
-  if (!paint->transform_group_depth)
-    return;
-  paint->transform_group_depth--;
-  hb_bool_t opened = !!(paint->transform_group_open_mask & 1ull);
-  paint->transform_group_open_mask >>= 1;
-  if (opened)
-    hb_svg_append_str (&paint->current_body (), "</g>\n");
-}
-
-static void
-hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *,
-                                 void *paint_data,
-                                 hb_codepoint_t glyph,
-                                 hb_font_t *font,
-                                 void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  if (!hb_set_has (paint->defined_outlines, glyph))
-  {
-    hb_set_add (paint->defined_outlines, glyph);
-    paint->path.clear ();
-    hb_svg_path_sink_t sink = {&paint->path, paint->precision};
-    hb_font_draw_glyph (font, glyph, hb_svg_path_draw_funcs_get (), &sink);
-    hb_svg_append_str (&paint->defs, "<path id=\"p");
-    hb_svg_append_unsigned (&paint->defs, glyph);
-    hb_svg_append_str (&paint->defs, "\" d=\"");
-    hb_svg_append_len (&paint->defs, paint->path.arrayZ, paint->path.length);
-    hb_svg_append_str (&paint->defs, "\"/>\n");
-  }
-
-  if (!hb_set_has (paint->defined_clips, glyph))
-  {
-    hb_set_add (paint->defined_clips, glyph);
-    hb_svg_append_str (&paint->defs, "<clipPath id=\"clip-g");
-    hb_svg_append_unsigned (&paint->defs, glyph);
-    hb_svg_append_str (&paint->defs, "\"><use href=\"#p");
-    hb_svg_append_unsigned (&paint->defs, glyph);
-    hb_svg_append_str (&paint->defs, "\"/></clipPath>\n");
-  }
-
-  hb_svg_append_str (&paint->current_body (), "<g clip-path=\"url(#clip-g");
-  hb_svg_append_unsigned (&paint->current_body (), glyph);
-  hb_svg_append_str (&paint->current_body (), ")\">\n");
-}
-
-static void
-hb_vector_paint_push_clip_rectangle (hb_paint_funcs_t *,
-                                     void *paint_data,
-                                     float xmin, float ymin,
-                                     float xmax, float ymax,
-                                     void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  unsigned clip_id = paint->clip_rect_counter++;
-  hb_svg_append_str (&paint->defs, "<clipPath id=\"c");
-  hb_svg_append_unsigned (&paint->defs, clip_id);
-  hb_svg_append_str (&paint->defs, "\"><rect x=\"");
-  hb_svg_append_num (&paint->defs, xmin, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" y=\"");
-  hb_svg_append_num (&paint->defs, ymin, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" width=\"");
-  hb_svg_append_num (&paint->defs, xmax - xmin, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" height=\"");
-  hb_svg_append_num (&paint->defs, ymax - ymin, paint->precision);
-  hb_svg_append_str (&paint->defs, "\"/></clipPath>\n");
-
-  hb_svg_append_str (&paint->current_body (), "<g clip-path=\"url(#c");
-  hb_svg_append_unsigned (&paint->current_body (), clip_id);
-  hb_svg_append_str (&paint->current_body (), ")\">\n");
-}
-
-static void
-hb_vector_paint_pop_clip (hb_paint_funcs_t *,
-                          void *paint_data,
-                          void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-  hb_svg_append_str (&paint->current_body (), "</g>\n");
-}
-
-static void
-hb_vector_paint_color (hb_paint_funcs_t *,
-                       void *paint_data,
-                       hb_bool_t is_foreground,
-                       hb_color_t color,
-                       void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  hb_color_t c = color;
-  if (is_foreground)
-    c = HB_COLOR (hb_color_get_blue (paint->foreground),
-                  hb_color_get_green (paint->foreground),
-                  hb_color_get_red (paint->foreground),
-                  (unsigned) hb_color_get_alpha (paint->foreground) * hb_color_get_alpha (color) / 255);
-
-  auto &body = paint->current_body ();
-  hb_svg_append_str (&body, "<rect x=\"-32767\" y=\"-32767\" width=\"65534\" height=\"65534\" fill=\"");
-  hb_svg_append_color (&body, c, true);
-  hb_svg_append_str (&body, "\"/>\n");
-}
-
-static hb_bool_t
-hb_vector_paint_image (hb_paint_funcs_t *,
-                       void *paint_data,
-                       hb_blob_t *image,
-                       unsigned width,
-                       unsigned height,
-                       hb_tag_t format,
-                       float slant HB_UNUSED,
-                       hb_glyph_extents_t *extents,
-                       void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return false;
-
-  auto &body = paint->current_body ();
-  if (format == HB_TAG ('s','v','g',' '))
-  {
-    paint->current_color_glyph_has_svg_image = true;
-
-    paint->subset_body_scratch.clear ();
-    bool subset_ok = hb_svg_subset_glyph_image (paint->current_face,
-                                                image,
-                                                paint->current_svg_image_glyph,
-                                                &paint->svg_image_counter,
-                                                &paint->defs,
-                                                &paint->subset_body_scratch);
-    if (unlikely (!subset_ok))
-      return false;
-
-    if (extents)
-    {
-      hb_svg_append_str (&body, "<g transform=\"translate(");
-      hb_svg_append_num (&body, (float) extents->x_bearing, paint->precision);
-      hb_svg_append_c (&body, ',');
-      hb_svg_append_num (&body, (float) extents->y_bearing, paint->precision);
-      hb_svg_append_str (&body, ") scale(");
-      hb_svg_append_num (&body, (float) extents->width / width, paint->precision);
-      hb_svg_append_c (&body, ',');
-      hb_svg_append_num (&body, (float) extents->height / height, paint->precision);
-      hb_svg_append_str (&body, ")\">\n");
-    }
-
-    hb_svg_append_len (&body,
-                       paint->subset_body_scratch.arrayZ,
-                       paint->subset_body_scratch.length);
-    hb_svg_append_c (&body, '\n');
-
-    if (extents)
-      hb_svg_append_str (&body, "</g>\n");
-
-    return true;
-  }
-
-  if (format == HB_TAG ('p','n','g',' '))
-  {
-    if (!extents || !width || !height)
-      return false;
-
-    unsigned len = 0;
-    const char *png_data = hb_blob_get_data (image, &len);
-    if (!png_data || !len)
-      return false;
-
-    hb_svg_append_str (&body, "<g transform=\"translate(");
-    hb_svg_append_num (&body, (float) extents->x_bearing, paint->precision);
-    hb_svg_append_c (&body, ',');
-    hb_svg_append_num (&body, (float) extents->y_bearing, paint->precision);
-    hb_svg_append_str (&body, ") scale(");
-    hb_svg_append_num (&body, (float) extents->width / width, paint->precision);
-    hb_svg_append_c (&body, ',');
-    hb_svg_append_num (&body, (float) extents->height / height, paint->precision);
-    hb_svg_append_str (&body, ")\">\n");
-
-    hb_svg_append_str (&body, "<image href=\"data:image/png;base64,");
-    hb_svg_append_base64 (&body, (const uint8_t *) png_data, len);
-    hb_svg_append_str (&body, "\" width=\"");
-    hb_svg_append_num (&body, (float) width, paint->precision);
-    hb_svg_append_str (&body, "\" height=\"");
-    hb_svg_append_num (&body, (float) height, paint->precision);
-    hb_svg_append_str (&body, "\"/>\n</g>\n");
-
-    return true;
-  }
-
-  return false;
-}
-
-static void
-hb_vector_paint_linear_gradient (hb_paint_funcs_t *,
-                                 void *paint_data,
-                                 hb_color_line_t *color_line,
-                                 float x0, float y0,
-                                 float x1, float y1,
-                                 float x2, float y2,
-                                 void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  hb_vector_t<hb_color_stop_t> &stops = paint->color_stops_scratch;
-  if (!hb_svg_get_color_stops (paint, color_line, &stops) || !stops.length)
-    return;
-
-  qsort (stops.arrayZ, stops.length, sizeof (hb_color_stop_t), hb_svg_color_stop_cmp);
-
-  unsigned grad_id = paint->gradient_counter++;
-
-  hb_svg_append_str (&paint->defs, "<linearGradient id=\"gr");
-  hb_svg_append_unsigned (&paint->defs, grad_id);
-  hb_svg_append_str (&paint->defs, "\" gradientUnits=\"userSpaceOnUse\" x1=\"");
-  hb_svg_append_num (&paint->defs, x0, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" y1=\"");
-  hb_svg_append_num (&paint->defs, y0, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" x2=\"");
-  hb_svg_append_num (&paint->defs, x1 + (x1 - x2), paint->precision);
-  hb_svg_append_str (&paint->defs, "\" y2=\"");
-  hb_svg_append_num (&paint->defs, y1 + (y1 - y2), paint->precision);
-  hb_svg_append_str (&paint->defs, "\" spreadMethod=\"");
-  hb_svg_append_str (&paint->defs, hb_svg_extend_mode_str (hb_color_line_get_extend (color_line)));
-  hb_svg_append_str (&paint->defs, "\">\n");
-  hb_svg_emit_color_stops (paint, &paint->defs, &stops);
-  hb_svg_append_str (&paint->defs, "</linearGradient>\n");
-
-  hb_svg_append_str (&paint->current_body (),
-                     "<rect x=\"-32767\" y=\"-32767\" width=\"65534\" height=\"65534\" fill=\"url(#gr");
-  hb_svg_append_unsigned (&paint->current_body (), grad_id);
-  hb_svg_append_str (&paint->current_body (), ")\"/>\n");
-}
-
-static void
-hb_vector_paint_radial_gradient (hb_paint_funcs_t *,
-                                 void *paint_data,
-                                 hb_color_line_t *color_line,
-                                 float x0, float y0, float r0,
-                                 float x1, float y1, float r1,
-                                 void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  hb_vector_t<hb_color_stop_t> &stops = paint->color_stops_scratch;
-  if (!hb_svg_get_color_stops (paint, color_line, &stops) || !stops.length)
-    return;
-
-  qsort (stops.arrayZ, stops.length, sizeof (hb_color_stop_t), hb_svg_color_stop_cmp);
-
-  unsigned grad_id = paint->gradient_counter++;
-
-  hb_svg_append_str (&paint->defs, "<radialGradient id=\"gr");
-  hb_svg_append_unsigned (&paint->defs, grad_id);
-  hb_svg_append_str (&paint->defs, "\" gradientUnits=\"userSpaceOnUse\" cx=\"");
-  hb_svg_append_num (&paint->defs, x1, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" cy=\"");
-  hb_svg_append_num (&paint->defs, y1, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" r=\"");
-  hb_svg_append_num (&paint->defs, r1, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" fx=\"");
-  hb_svg_append_num (&paint->defs, x0, paint->precision);
-  hb_svg_append_str (&paint->defs, "\" fy=\"");
-  hb_svg_append_num (&paint->defs, y0, paint->precision);
-  if (r0 > 0)
-  {
-    hb_svg_append_str (&paint->defs, "\" fr=\"");
-    hb_svg_append_num (&paint->defs, r0, paint->precision);
-  }
-  hb_svg_append_str (&paint->defs, "\" spreadMethod=\"");
-  hb_svg_append_str (&paint->defs, hb_svg_extend_mode_str (hb_color_line_get_extend (color_line)));
-  hb_svg_append_str (&paint->defs, "\">\n");
-  hb_svg_emit_color_stops (paint, &paint->defs, &stops);
-  hb_svg_append_str (&paint->defs, "</radialGradient>\n");
-
-  hb_svg_append_str (&paint->current_body (),
-                     "<rect x=\"-32767\" y=\"-32767\" width=\"65534\" height=\"65534\" fill=\"url(#gr");
-  hb_svg_append_unsigned (&paint->current_body (), grad_id);
-  hb_svg_append_str (&paint->current_body (), ")\"/>\n");
-}
-
-static void
-hb_vector_paint_sweep_gradient (hb_paint_funcs_t *,
-                                void *paint_data,
-                                hb_color_line_t *color_line,
-                                float cx, float cy,
-                                float start_angle, float end_angle,
-                                void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-
-  hb_vector_t<hb_color_stop_t> &stops = paint->color_stops_scratch;
-  if (!hb_svg_get_color_stops (paint, color_line, &stops) || !stops.length)
-    return;
-
-  qsort (stops.arrayZ, stops.length, sizeof (hb_color_stop_t), hb_svg_color_stop_cmp);
-  hb_svg_add_sweep_gradient_patches (&paint->current_body (),
-                                     paint->precision,
-                                     stops.arrayZ,
-                                     stops.length,
-                                     hb_color_line_get_extend (color_line),
-                                     cx, cy,
-                                     32767.f,
-                                     start_angle,
-                                     end_angle);
-}
-
-static void
-hb_vector_paint_push_group (hb_paint_funcs_t *,
-                            void *paint_data,
-                            void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-  paint->group_stack.push_or_fail (hb_vector_t<char> {});
-}
-
-static void
-hb_vector_paint_pop_group (hb_paint_funcs_t *,
-                           void *paint_data,
-                           hb_paint_composite_mode_t mode,
-                           void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return;
-  if (paint->group_stack.length < 2)
-    return;
-
-  hb_vector_t<char> group = paint->group_stack.pop ();
-  auto &body = paint->current_body ();
-
-  const char *blend = hb_svg_composite_mode_str (mode);
-  if (blend)
-  {
-    hb_svg_append_str (&body, "<g style=\"mix-blend-mode:");
-    hb_svg_append_str (&body, blend);
-    hb_svg_append_str (&body, "\">\n");
-    hb_svg_append_len (&body, group.arrayZ, group.length);
-    hb_svg_append_str (&body, "</g>\n");
-  }
-  else
-    hb_svg_append_len (&body, group.arrayZ, group.length);
-}
-
-static hb_bool_t
-hb_vector_paint_color_glyph (hb_paint_funcs_t *,
-                             void *paint_data,
-                             hb_codepoint_t glyph,
-                             hb_font_t *font,
-                             void *)
-{
-  auto *paint = (hb_vector_paint_t *) paint_data;
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return false;
-  hb_codepoint_t old_gid = paint->current_svg_image_glyph;
-  hb_face_t *old_face = paint->current_face;
-  paint->current_svg_image_glyph = glyph;
-  paint->current_face = hb_font_get_face (font);
-  hb_font_paint_glyph (font, glyph,
-                       hb_vector_paint_funcs_get (),
-                       paint,
-                       paint->palette,
-                       paint->foreground);
-  paint->current_svg_image_glyph = old_gid;
-  paint->current_face = old_face;
-  return true;
-}
-
-
-
-/**
- * hb_vector_paint_create_or_fail:
- * @format: output format.
- *
- * Creates a new paint context for vector output.
- *
- * Return value: (nullable): a newly allocated #hb_vector_paint_t, or `NULL` on failure.
- *
- * Since: 13.0.0
- */
-hb_vector_paint_t *
-hb_vector_paint_create_or_fail (hb_vector_format_t format)
-{
-  if (format != HB_VECTOR_FORMAT_SVG)
-    return nullptr;
-
-  hb_vector_paint_t *paint = hb_object_create<hb_vector_paint_t> ();
-  if (unlikely (!paint))
-    return nullptr;
-  paint->format = format;
-
-  paint->defined_outlines = hb_set_create ();
-  paint->defined_clips = hb_set_create ();
-  paint->defs.alloc (4096);
-  paint->path.alloc (2048);
-  paint->subset_body_scratch.alloc (2048);
-  paint->captured_scratch.alloc (4096);
-  paint->color_stops_scratch.alloc (16);
-
-  return paint;
-}
-
-/**
- * hb_vector_paint_reference:
- * @paint: a paint context.
- *
- * Increases the reference count of @paint.
- *
- * Return value: (transfer full): referenced @paint.
- *
- * Since: 13.0.0
- */
-hb_vector_paint_t *
-hb_vector_paint_reference (hb_vector_paint_t *paint)
-{
-  return hb_object_reference (paint);
-}
-
-/**
- * hb_vector_paint_destroy:
- * @paint: a paint context.
- *
- * Decreases the reference count of @paint and destroys it when it reaches zero.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_destroy (hb_vector_paint_t *paint)
-{
-  if (!hb_object_should_destroy (paint))
-    return;
-
-  hb_blob_destroy (paint->recycled_blob);
-  hb_set_destroy (paint->defined_outlines);
-  hb_set_destroy (paint->defined_clips);
-  hb_object_actually_destroy (paint);
-  hb_free (paint);
-}
-
-/**
- * hb_vector_paint_set_user_data:
- * @paint: a paint context.
- * @key: user-data key.
- * @data: user-data value.
- * @destroy: (nullable): destroy callback for @data.
- * @replace: whether to replace an existing value for @key.
- *
- * Attaches user data to @paint.
- *
- * Return value: `true` on success, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_paint_set_user_data (hb_vector_paint_t  *paint,
-                               hb_user_data_key_t *key,
-                               void               *data,
-                               hb_destroy_func_t   destroy,
-                               hb_bool_t           replace)
-{
-  return hb_object_set_user_data (paint, key, data, destroy, replace);
-}
-
-/**
- * hb_vector_paint_get_user_data:
- * @paint: a paint context.
- * @key: user-data key.
- *
- * Gets previously attached user data from @paint.
- *
- * Return value: (nullable): user-data value associated with @key.
- *
- * Since: 13.0.0
- */
-void *
-hb_vector_paint_get_user_data (hb_vector_paint_t  *paint,
-                               hb_user_data_key_t *key)
-{
-  return hb_object_get_user_data (paint, key);
-}
-
-/**
- * hb_vector_paint_set_transform:
- * @paint: a paint context.
- * @xx: transform xx component.
- * @yx: transform yx component.
- * @xy: transform xy component.
- * @yy: transform yy component.
- * @dx: transform x translation.
- * @dy: transform y translation.
- *
- * Sets the affine transform used when painting glyphs.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_transform (hb_vector_paint_t *paint,
-                               float xx, float yx,
-                               float xy, float yy,
-                               float dx, float dy)
-{
-  paint->transform = {xx, yx, xy, yy, dx, dy};
-}
-
-/**
- * hb_vector_paint_get_transform:
- * @paint: a paint context.
- * @xx: (out) (nullable): transform xx component.
- * @yx: (out) (nullable): transform yx component.
- * @xy: (out) (nullable): transform xy component.
- * @yy: (out) (nullable): transform yy component.
- * @dx: (out) (nullable): transform x translation.
- * @dy: (out) (nullable): transform y translation.
- *
- * Gets the affine transform used when painting glyphs.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_get_transform (hb_vector_paint_t *paint,
-                               float *xx, float *yx,
-                               float *xy, float *yy,
-                               float *dx, float *dy)
-{
-  if (xx) *xx = paint->transform.xx;
-  if (yx) *yx = paint->transform.yx;
-  if (xy) *xy = paint->transform.xy;
-  if (yy) *yy = paint->transform.yy;
-  if (dx) *dx = paint->transform.x0;
-  if (dy) *dy = paint->transform.y0;
-}
-
-/**
- * hb_vector_paint_set_scale_factor:
- * @paint: a paint context.
- * @x_scale_factor: x scale factor.
- * @y_scale_factor: y scale factor.
- *
- * Sets additional output scaling factors.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_scale_factor (hb_vector_paint_t *paint,
-                                  float x_scale_factor,
-                                  float y_scale_factor)
-{
-  paint->x_scale_factor = x_scale_factor > 0.f ? x_scale_factor : 1.f;
-  paint->y_scale_factor = y_scale_factor > 0.f ? y_scale_factor : 1.f;
-}
-
-/**
- * hb_vector_paint_get_scale_factor:
- * @paint: a paint context.
- * @x_scale_factor: (out) (nullable): x scale factor.
- * @y_scale_factor: (out) (nullable): y scale factor.
- *
- * Gets additional output scaling factors.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_get_scale_factor (hb_vector_paint_t *paint,
-                                  float *x_scale_factor,
-                                  float *y_scale_factor)
-{
-  if (x_scale_factor) *x_scale_factor = paint->x_scale_factor;
-  if (y_scale_factor) *y_scale_factor = paint->y_scale_factor;
-}
-
-/**
- * hb_vector_paint_set_extents:
- * @paint: a paint context.
- * @extents: (nullable): output extents to set or expand.
- *
- * Sets or expands output extents on @paint. Passing `NULL` clears extents.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_extents (hb_vector_paint_t *paint,
-                             const hb_vector_extents_t *extents)
-{
-  if (!extents)
-  {
-    paint->extents = {0, 0, 0, 0};
-    paint->has_extents = false;
-    return;
-  }
-
-  if (!(extents->width > 0.f && extents->height > 0.f))
-    return;
-
-  if (paint->has_extents)
-  {
-    float x0 = hb_min (paint->extents.x, extents->x);
-    float y0 = hb_min (paint->extents.y, extents->y);
-    float x1 = hb_max (paint->extents.x + paint->extents.width,
-		       extents->x + extents->width);
-    float y1 = hb_max (paint->extents.y + paint->extents.height,
-		       extents->y + extents->height);
-    paint->extents = {x0, y0, x1 - x0, y1 - y0};
-  }
-  else
-  {
-    paint->extents = *extents;
-    paint->has_extents = true;
-  }
-}
-
-/**
- * hb_vector_paint_get_extents:
- * @paint: a paint context.
- * @extents: (out) (nullable): where to store current output extents.
- *
- * Gets current output extents from @paint.
- *
- * Return value: `true` if extents are set, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_paint_get_extents (hb_vector_paint_t *paint,
-                             hb_vector_extents_t *extents)
-{
-  if (!paint->has_extents)
-    return false;
-
-  if (extents)
-    *extents = paint->extents;
-  return true;
-}
-
-/**
- * hb_vector_paint_set_glyph_extents:
- * @paint: a paint context.
- * @glyph_extents: glyph extents in font units.
- *
- * Expands @paint extents using @glyph_extents under the current transform.
- *
- * Return value: `true` on success, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_paint_set_glyph_extents (hb_vector_paint_t *paint,
-                                   const hb_glyph_extents_t *glyph_extents)
-{
-  hb_bool_t has_extents = paint->has_extents;
-  hb_bool_t ret = hb_svg_set_glyph_extents_common (paint->transform,
-						   paint->x_scale_factor,
-						   paint->y_scale_factor,
-						   glyph_extents,
-						   &paint->extents,
-						   &has_extents);
-  paint->has_extents = has_extents;
-  return ret;
-}
-
-/**
- * hb_vector_paint_set_foreground:
- * @paint: a paint context.
- * @foreground: foreground color used for COLR foreground paints.
- *
- * Sets fallback foreground color used by paint operations.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_foreground (hb_vector_paint_t *paint,
-                                hb_color_t foreground)
-{
-  paint->foreground = foreground;
-}
-
-/**
- * hb_vector_paint_set_palette:
- * @paint: a paint context.
- * @palette: palette index for color glyph painting.
- *
- * Sets the color palette index used by paint operations.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_palette (hb_vector_paint_t *paint,
-                             int palette)
-{
-  paint->palette = palette;
-}
-
-/**
- * hb_vector_paint_set_custom_palette_color:
- * @paint: a paint context.
- * @color_index: color index to override.
- * @color: replacement color.
- *
- * Overrides one font palette color entry for subsequent paint operations.
- * Overrides are keyed by @color_index and persist on @paint until cleared
- * (or replaced for the same index).
- *
- * These overrides are consulted by paint operations that resolve CPAL
- * entries, including SVG glyph content using `var(--colorN)`.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_set_custom_palette_color (hb_vector_paint_t *paint,
-                                          unsigned color_index,
-                                          hb_color_t color)
-{
-  paint->custom_palette_colors.set (color_index, color);
-}
-
-/**
- * hb_vector_paint_clear_custom_palette_colors:
- * @paint: a paint context.
- *
- * Clears all custom palette color overrides previously set on @paint.
- *
- * After this call, palette lookups use the selected font palette without
- * custom override entries.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_clear_custom_palette_colors (hb_vector_paint_t *paint)
-{
-  paint->custom_palette_colors.clear ();
-}
-
-/**
- * hb_vector_paint_get_funcs:
- *
- * Gets paint callbacks implemented by the vector paint backend.
- *
- * Return value: (transfer none): immutable #hb_paint_funcs_t singleton.
- *
- * Since: 13.0.0
- */
-hb_paint_funcs_t *
-hb_vector_paint_get_funcs (void)
-{
-  return hb_vector_paint_funcs_get ();
-}
-
-static hb_bool_t
-hb_vector_paint_custom_palette_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
-                                      void *paint_data,
-                                      unsigned color_index,
-                                      hb_color_t *color,
-                                      void *user_data HB_UNUSED)
-{
-  hb_vector_paint_t *paint = (hb_vector_paint_t *) paint_data;
-  if (!paint || !color)
-    return false;
-
-  hb_color_t *value = nullptr;
-  if (!paint->custom_palette_colors.has (color_index, &value) || !value)
-    return false;
-  *color = *value;
-  return true;
-}
-
-/**
- * hb_vector_paint_glyph:
- * @paint: a paint context.
- * @font: font object.
- * @glyph: glyph ID.
- * @pen_x: glyph x origin before context transform.
- * @pen_y: glyph y origin before context transform.
- * @extents_mode: extents update mode.
- *
- * Paints one color glyph into @paint.
- *
- * Return value: `true` if glyph paint data was emitted, `false` otherwise.
- *
- * Since: 13.0.0
- */
-hb_bool_t
-hb_vector_paint_glyph (hb_vector_paint_t *paint,
-		       hb_font_t         *font,
-		       hb_codepoint_t     glyph,
-		       float              pen_x,
-		       float              pen_y,
-		       hb_vector_extents_mode_t extents_mode)
-{
-  float xx = paint->transform.xx;
-  float yx = paint->transform.yx;
-  float xy = paint->transform.xy;
-  float yy = paint->transform.yy;
-  float tx = paint->transform.x0 + xx * pen_x + xy * pen_y;
-  float ty = paint->transform.y0 + yx * pen_x + yy * pen_y;
-
-  if (extents_mode == HB_VECTOR_EXTENTS_MODE_EXPAND)
-  {
-    hb_glyph_extents_t ge;
-    if (hb_font_get_glyph_extents (font, glyph, &ge))
-    {
-      hb_bool_t has_extents = paint->has_extents;
-      hb_transform_t<> extents_transform = {xx, yx, -xy, -yy, tx, ty};
-      hb_bool_t ret = hb_svg_set_glyph_extents_common (extents_transform,
-							paint->x_scale_factor,
-							paint->y_scale_factor,
-							&ge,
-							&paint->extents,
-							&has_extents);
-      paint->has_extents = has_extents;
-      (void) ret;
-    }
-  }
-
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return false;
-
-  bool can_cache = !paint->flat;
-  hb_svg_color_glyph_cache_key_t cache_key = hb_svg_color_glyph_cache_key (glyph,
-                                                                            (unsigned) paint->palette,
-                                                                            paint->foreground);
-  if (can_cache)
-  {
-    if (paint->defined_color_glyphs.has (cache_key))
-    {
-      uint64_t entry = paint->defined_color_glyphs.get (cache_key);
-      unsigned def_id = hb_svg_cache_entry_def_id (entry);
-      bool image_like = hb_svg_cache_entry_image_like (entry);
-      auto &body = paint->current_body ();
-      hb_svg_append_str (&body, "<use href=\"#cg");
-      hb_svg_append_unsigned (&body, def_id);
-      hb_svg_append_str (&body, "\" transform=\"");
-      if (image_like)
-        hb_svg_append_image_instance_translate (&body, paint->precision,
-                                                paint->x_scale_factor,
-                                                paint->y_scale_factor,
-                                                tx, ty);
-      else
-        hb_svg_append_instance_transform (&body, paint->precision,
-                                          paint->x_scale_factor,
-                                          paint->y_scale_factor,
-                                          xx, yx, xy, yy, tx, ty);
-      hb_svg_append_str (&body, "\"/>\n");
-      return true;
-    }
-  }
-
-  bool has_svg_image = false;
-  if (can_cache)
-  {
-    if (unlikely (!paint->group_stack.push_or_fail (hb_vector_t<char> {})))
-      return false;
-    paint->current_color_glyph_has_svg_image = false;
-  }
-
-  if (can_cache)
-  {
-    hb_codepoint_t old_gid = paint->current_svg_image_glyph;
-    hb_face_t *old_face = paint->current_face;
-    paint->current_svg_image_glyph = glyph;
-    paint->current_face = hb_font_get_face (font);
-    hb_bool_t ret = hb_font_paint_glyph_or_fail (font, glyph,
-						  hb_vector_paint_get_funcs (), paint,
-						  (unsigned) paint->palette,
-						  paint->foreground);
-    paint->current_svg_image_glyph = old_gid;
-    paint->current_face = old_face;
-    if (unlikely (!ret))
-    {
-      paint->group_stack.pop ();
-      return false;
-    }
-
-    paint->captured_scratch = paint->group_stack.pop ();
-    has_svg_image = paint->current_color_glyph_has_svg_image;
-    if (unlikely (!paint->captured_scratch.length))
-      return false;
-
-    unsigned def_id = paint->color_glyph_counter++;
-    if (unlikely (!paint->defined_color_glyphs.set (cache_key,
-                                                    hb_svg_pack_color_glyph_cache_entry (def_id,
-                                                                                         has_svg_image))))
-      return false;
-
-    hb_svg_append_str (&paint->defs, "<g id=\"cg");
-    hb_svg_append_unsigned (&paint->defs, def_id);
-    hb_svg_append_str (&paint->defs, "\">\n");
-    hb_svg_append_len (&paint->defs,
-                       paint->captured_scratch.arrayZ,
-                       paint->captured_scratch.length);
-    hb_svg_append_str (&paint->defs, "</g>\n");
-
-    auto &body = paint->current_body ();
-    hb_svg_append_str (&body, "<use href=\"#cg");
-    hb_svg_append_unsigned (&body, def_id);
-    hb_svg_append_str (&body, "\" transform=\"");
-    if (has_svg_image)
-      hb_svg_append_image_instance_translate (&body, paint->precision,
-                                              paint->x_scale_factor,
-                                              paint->y_scale_factor,
-                                              tx, ty);
-    else
-      hb_svg_append_instance_transform (&body, paint->precision,
-                                        paint->x_scale_factor,
-                                        paint->y_scale_factor,
-                                        xx, yx, xy, yy, tx, ty);
-    hb_svg_append_str (&body, "\"/>\n");
-    return true;
-  }
-
-  auto &body = paint->current_body ();
-  hb_svg_append_str (&body, "<g transform=\"");
-  hb_svg_append_instance_transform (&body, paint->precision,
-				    paint->x_scale_factor,
-				    paint->y_scale_factor,
-				    xx, yx, xy, yy, tx, ty);
-  hb_svg_append_str (&body, "\">\n");
-  hb_codepoint_t old_gid = paint->current_svg_image_glyph;
-  hb_face_t *old_face = paint->current_face;
-  paint->current_svg_image_glyph = glyph;
-  paint->current_face = hb_font_get_face (font);
-  hb_bool_t ret = hb_font_paint_glyph_or_fail (font, glyph,
-						hb_vector_paint_get_funcs (), paint,
-						(unsigned) paint->palette,
-						paint->foreground);
-  paint->current_svg_image_glyph = old_gid;
-  paint->current_face = old_face;
-  hb_svg_append_str (&body, "</g>\n");
-  return ret;
-}
-
-/**
- * hb_vector_svg_paint_set_flat:
- * @paint: a paint context.
- * @flat: whether to flatten paint output and disable glyph-group reuse.
- *
- * Enables or disables SVG paint flattening.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_svg_paint_set_flat (hb_vector_paint_t *paint,
-                              hb_bool_t flat)
-{
-  paint->flat = !!flat;
-}
-
-/**
- * hb_vector_svg_paint_set_precision:
- * @paint: a paint context.
- * @precision: decimal precision.
- *
- * Sets numeric output precision for SVG paint output.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_svg_paint_set_precision (hb_vector_paint_t *paint,
-                                   unsigned precision)
-{
-  paint->precision = hb_min (precision, 12u);
-}
-
-static void
-hb_vector_paint_clear_render_state (hb_vector_paint_t *paint)
-{
-  paint->extents = {0, 0, 0, 0};
-  paint->has_extents = false;
-
-  paint->defs.clear ();
-  paint->path.clear ();
-  paint->group_stack.clear ();
-  paint->transform_group_open_mask = 0;
-  paint->transform_group_depth = 0;
-  paint->transform_group_overflow_depth = 0;
-  paint->clip_rect_counter = 0;
-  paint->gradient_counter = 0;
-  paint->color_glyph_counter = 0;
-  paint->current_color_glyph_has_svg_image = false;
-  paint->current_svg_image_glyph = HB_CODEPOINT_INVALID;
-  paint->current_face = nullptr;
-  paint->svg_image_counter = 0;
-  hb_set_clear (paint->defined_outlines);
-  hb_set_clear (paint->defined_clips);
-  paint->defined_color_glyphs.clear ();
-  paint->color_stops_scratch.clear ();
-  paint->subset_body_scratch.clear ();
-  paint->captured_scratch.clear ();
-}
-
-/**
- * hb_vector_paint_render:
- * @paint: a paint context.
- *
- * Renders accumulated paint content to an SVG blob.
- *
- * Return value: (transfer full) (nullable): output blob, or `NULL` if rendering cannot proceed.
- *
- * Since: 13.0.0
- */
-hb_blob_t *
-hb_vector_paint_render (hb_vector_paint_t *paint)
-{
-  if (paint->format != HB_VECTOR_FORMAT_SVG)
-    return nullptr;
-  if (!paint->has_extents)
-    return nullptr;
-
-  if (unlikely (!hb_vector_paint_ensure_initialized (paint)))
-    return nullptr;
-
-  hb_vector_t<char> out;
-  hb_svg_recover_recycled_buffer (paint->recycled_blob, &out);
-  unsigned estimated = paint->defs.length +
-                       paint->group_stack.arrayZ[0].length +
-                       320;
-  out.alloc (estimated);
-  hb_svg_append_str (&out, "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"");
-  hb_svg_append_num (&out, paint->extents.x, paint->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, paint->extents.y, paint->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, paint->extents.width, paint->precision);
-  hb_svg_append_c (&out, ' ');
-  hb_svg_append_num (&out, paint->extents.height, paint->precision);
-  hb_svg_append_str (&out, "\" width=\"");
-  hb_svg_append_num (&out, paint->extents.width, paint->precision);
-  hb_svg_append_str (&out, "\" height=\"");
-  hb_svg_append_num (&out, paint->extents.height, paint->precision);
-  hb_svg_append_str (&out, "\">\n");
-
-  if (paint->defs.length)
-  {
-    hb_svg_append_str (&out, "<defs>\n");
-    hb_svg_append_len (&out, paint->defs.arrayZ, paint->defs.length);
-    hb_svg_append_str (&out, "</defs>\n");
-  }
-
-  paint->append_global_transform_prefix (&out);
-  hb_svg_append_len (&out, paint->group_stack.arrayZ[0].arrayZ, paint->group_stack.arrayZ[0].length);
-  paint->append_global_transform_suffix (&out);
-
-  hb_svg_append_str (&out, "</svg>\n");
-
-  hb_blob_t *blob = hb_svg_blob_from_buffer (&paint->recycled_blob, &out);
-
-  hb_vector_paint_clear_render_state (paint);
-
-  return blob;
-}
-
-/**
- * hb_vector_paint_reset:
- * @paint: a paint context.
- *
- * Resets @paint state and clears accumulated content.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_reset (hb_vector_paint_t *paint)
-{
-  paint->transform = {1, 0, 0, 1, 0, 0};
-  paint->x_scale_factor = 1.f;
-  paint->y_scale_factor = 1.f;
-  paint->foreground = HB_COLOR (0, 0, 0, 255);
-  paint->palette = 0;
-  paint->precision = 2;
-  paint->flat = false;
-  hb_vector_paint_clear_render_state (paint);
-}
-
-/**
- * hb_vector_paint_recycle_blob:
- * @paint: a paint context.
- * @blob: (nullable): previously rendered blob to recycle.
- *
- * Provides a blob for internal buffer reuse by later render calls.
- *
- * Since: 13.0.0
- */
-void
-hb_vector_paint_recycle_blob (hb_vector_paint_t *paint,
-                              hb_blob_t *blob)
-{
-  hb_blob_destroy (paint->recycled_blob);
-  paint->recycled_blob = nullptr;
-  if (!blob || blob == hb_blob_get_empty ())
-    return;
-  paint->recycled_blob = blob;
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.cc b/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.cc
deleted file mode 100644
index 286bc31a..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-machinery.hh"
-#include "hb-vector-svg-path.hh"
-#include "hb-vector-svg-utils.hh"
-
-static void
-hb_svg_path_move_to (hb_draw_funcs_t *,
-                     void *draw_data,
-                     hb_draw_state_t *,
-                     float to_x, float to_y,
-                     void *)
-{
-  auto *s = (hb_svg_path_sink_t *) draw_data;
-  hb_svg_append_c (s->path, 'M');
-  hb_svg_append_num (s->path, to_x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, to_y, s->precision);
-}
-
-static void
-hb_svg_path_line_to (hb_draw_funcs_t *,
-                     void *draw_data,
-                     hb_draw_state_t *,
-                     float to_x, float to_y,
-                     void *)
-{
-  auto *s = (hb_svg_path_sink_t *) draw_data;
-  hb_svg_append_c (s->path, 'L');
-  hb_svg_append_num (s->path, to_x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, to_y, s->precision);
-}
-
-static void
-hb_svg_path_quadratic_to (hb_draw_funcs_t *,
-                          void *draw_data,
-                          hb_draw_state_t *,
-                          float cx, float cy,
-                          float to_x, float to_y,
-                          void *)
-{
-  auto *s = (hb_svg_path_sink_t *) draw_data;
-  hb_svg_append_c (s->path, 'Q');
-  hb_svg_append_num (s->path, cx, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, cy, s->precision);
-  hb_svg_append_c (s->path, ' ');
-  hb_svg_append_num (s->path, to_x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, to_y, s->precision);
-}
-
-static void
-hb_svg_path_cubic_to (hb_draw_funcs_t *,
-                      void *draw_data,
-                      hb_draw_state_t *,
-                      float c1x, float c1y,
-                      float c2x, float c2y,
-                      float to_x, float to_y,
-                      void *)
-{
-  auto *s = (hb_svg_path_sink_t *) draw_data;
-  hb_svg_append_c (s->path, 'C');
-  hb_svg_append_num (s->path, c1x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, c1y, s->precision);
-  hb_svg_append_c (s->path, ' ');
-  hb_svg_append_num (s->path, c2x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, c2y, s->precision);
-  hb_svg_append_c (s->path, ' ');
-  hb_svg_append_num (s->path, to_x, s->precision);
-  hb_svg_append_c (s->path, ',');
-  hb_svg_append_num (s->path, to_y, s->precision);
-}
-
-static void
-hb_svg_path_close_path (hb_draw_funcs_t *,
-                        void *draw_data,
-                        hb_draw_state_t *,
-                        void *)
-{
-  auto *s = (hb_svg_path_sink_t *) draw_data;
-  hb_svg_append_c (s->path, 'Z');
-}
-
-static inline void
-free_static_svg_path_draw_funcs ();
-
-static struct hb_svg_path_draw_funcs_lazy_loader_t
-  : hb_draw_funcs_lazy_loader_t<hb_svg_path_draw_funcs_lazy_loader_t>
-{
-  static hb_draw_funcs_t *create ()
-  {
-    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
-    hb_draw_funcs_set_move_to_func (funcs, (hb_draw_move_to_func_t) hb_svg_path_move_to, nullptr, nullptr);
-    hb_draw_funcs_set_line_to_func (funcs, (hb_draw_line_to_func_t) hb_svg_path_line_to, nullptr, nullptr);
-    hb_draw_funcs_set_quadratic_to_func (funcs, (hb_draw_quadratic_to_func_t) hb_svg_path_quadratic_to, nullptr, nullptr);
-    hb_draw_funcs_set_cubic_to_func (funcs, (hb_draw_cubic_to_func_t) hb_svg_path_cubic_to, nullptr, nullptr);
-    hb_draw_funcs_set_close_path_func (funcs, (hb_draw_close_path_func_t) hb_svg_path_close_path, nullptr, nullptr);
-    hb_draw_funcs_make_immutable (funcs);
-    hb_atexit (free_static_svg_path_draw_funcs);
-    return funcs;
-  }
-} static_svg_path_draw_funcs;
-
-static inline void
-free_static_svg_path_draw_funcs ()
-{
-  static_svg_path_draw_funcs.free_instance ();
-}
-
-hb_draw_funcs_t *
-hb_svg_path_draw_funcs_get (void)
-{
-  return static_svg_path_draw_funcs.get_unconst ();
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.hh b/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.hh
deleted file mode 100644
index 7e3b25c1..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-path.hh
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_VECTOR_SVG_PATH_HH
-#define HB_VECTOR_SVG_PATH_HH
-
-#include "hb.hh"
-#include "hb-vector.hh"
-#include "hb-draw.h"
-
-struct hb_svg_path_sink_t
-{
-  hb_vector_t<char> *path;
-  unsigned precision;
-};
-
-HB_INTERNAL hb_draw_funcs_t *
-hb_svg_path_draw_funcs_get (void);
-
-#endif /* HB_VECTOR_SVG_PATH_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.cc b/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.cc
deleted file mode 100644
index b46f4047..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.cc
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-face.hh"
-#include "hb-vector-svg-subset.hh"
-#ifndef HB_NO_SVG
-#include "OT/Color/svg/svg.hh"
-#include "hb-raster-svg-parse.hh"
-#endif
-#include "hb-vector-svg-utils.hh"
-#include "hb-map.hh"
-#include "hb-ot-color.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifndef HB_NO_SVG
-#include "hb-vector-svg.hh"
-
-static bool
-hb_svg_append_with_prefix (hb_vector_t<char> *out,
-                           const char *s,
-                           unsigned n,
-                           const char *prefix,
-                           unsigned prefix_len)
-{
-  unsigned i = 0;
-  while (i < n)
-  {
-    if (i + 4 <= n && !memcmp (s + i, "id=\"", 4))
-    {
-      if (!hb_svg_append_len (out, s + i, 4)) return false;
-      i += 4;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '"')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 4 <= n && !memcmp (s + i, "id='", 4))
-    {
-      if (!hb_svg_append_len (out, s + i, 4)) return false;
-      i += 4;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '\'')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 7 <= n && !memcmp (s + i, "href=\"#", 7))
-    {
-      if (!hb_svg_append_len (out, s + i, 7)) return false;
-      i += 7;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '"')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 7 <= n && !memcmp (s + i, "href='#", 7))
-    {
-      if (!hb_svg_append_len (out, s + i, 7)) return false;
-      i += 7;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '\'')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 13 <= n && !memcmp (s + i, "xlink:href=\"#", 13))
-    {
-      if (!hb_svg_append_len (out, s + i, 13)) return false;
-      i += 13;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '"')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 13 <= n && !memcmp (s + i, "xlink:href='#", 13))
-    {
-      if (!hb_svg_append_len (out, s + i, 13)) return false;
-      i += 13;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '\'')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 5 <= n && !memcmp (s + i, "url(#", 5))
-    {
-      if (!hb_svg_append_len (out, s + i, 5)) return false;
-      i += 5;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != ')')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 6 <= n && !memcmp (s + i, "url(\"#", 6))
-    {
-      if (!hb_svg_append_len (out, s + i, 6)) return false;
-      i += 6;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '"')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (i + 6 <= n && !memcmp (s + i, "url('#", 6))
-    {
-      if (!hb_svg_append_len (out, s + i, 6)) return false;
-      i += 6;
-      if (!hb_svg_append_len (out, prefix, prefix_len)) return false;
-      while (i < n && s[i] != '\'')
-      {
-        if (!hb_svg_append_c (out, s[i])) return false;
-        i++;
-      }
-      continue;
-    }
-    if (!hb_svg_append_c (out, s[i]))
-      return false;
-    i++;
-  }
-  return true;
-}
-
-static bool
-hb_svg_add_unique_id (hb_vector_t<OT::SVG::svg_id_span_t> *v,
-                      hb_hashmap_t<OT::SVG::svg_id_span_t, hb_bool_t> *seen_ids,
-                      const char *p,
-                      unsigned n)
-{
-  if (!n) return true;
-  OT::SVG::svg_id_span_t key = {p, n};
-  if (seen_ids->has (key))
-    return true;
-  if (unlikely (!seen_ids->set (key, true)))
-    return false;
-  auto *slot = v->push ();
-  if (unlikely (v->in_error ()))
-    return false;
-  *slot = key;
-  return true;
-}
-
-static bool
-hb_svg_collect_refs (const char *s,
-                     unsigned n,
-                     hb_vector_t<OT::SVG::svg_id_span_t> *ids,
-                     hb_hashmap_t<OT::SVG::svg_id_span_t, hb_bool_t> *seen_ids)
-{
-  unsigned i = 0;
-  while (i < n)
-  {
-    if (i + 7 <= n && !memcmp (s + i, "href=\"#", 7))
-    {
-      i += 7;
-      unsigned b = i;
-      while (i < n && s[i] != '"' && s[i] != '\'' && s[i] != ' ' && s[i] != '>') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 7 <= n && !memcmp (s + i, "href='#", 7))
-    {
-      i += 7;
-      unsigned b = i;
-      while (i < n && s[i] != '\'' && s[i] != '"' && s[i] != ' ' && s[i] != '>') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 13 <= n && !memcmp (s + i, "xlink:href=\"#", 13))
-    {
-      i += 13;
-      unsigned b = i;
-      while (i < n && s[i] != '"' && s[i] != '\'' && s[i] != ' ' && s[i] != '>') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 13 <= n && !memcmp (s + i, "xlink:href='#", 13))
-    {
-      i += 13;
-      unsigned b = i;
-      while (i < n && s[i] != '\'' && s[i] != '"' && s[i] != ' ' && s[i] != '>') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 5 <= n && !memcmp (s + i, "url(#", 5))
-    {
-      i += 5;
-      unsigned b = i;
-      while (i < n && s[i] != ')') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 6 <= n && !memcmp (s + i, "url(\"#", 6))
-    {
-      i += 6;
-      unsigned b = i;
-      while (i < n && s[i] != '"') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    if (i + 6 <= n && !memcmp (s + i, "url('#", 6))
-    {
-      i += 6;
-      unsigned b = i;
-      while (i < n && s[i] != '\'') i++;
-      if (i > b && unlikely (!hb_svg_add_unique_id (ids, seen_ids, s + b, i - b))) return false;
-      continue;
-    }
-    i++;
-  }
-  return true;
-}
-
-static bool
-hb_svg_find_root_open_tag (const char *svg,
-                           unsigned len,
-                           unsigned *root_open_len,
-                           bool *missing_viewport)
-{
-  hb_svg_xml_parser_t parser (svg, len);
-  hb_svg_token_type_t tok = parser.next ();
-  if (!((tok == SVG_TOKEN_OPEN_TAG || tok == SVG_TOKEN_SELF_CLOSE_TAG) &&
-        parser.tag_name.eq ("svg")))
-    return false;
-
-  if (missing_viewport)
-  {
-    *missing_viewport =
-      parser.find_attr ("width").is_null () ||
-      parser.find_attr ("height").is_null ();
-  }
-
-  if (root_open_len)
-    *root_open_len = (unsigned) (parser.p - parser.tag_start);
-  return true;
-}
-
-bool
-hb_svg_subset_glyph_image (hb_face_t *face,
-                           hb_blob_t *image,
-                           hb_codepoint_t glyph,
-                           unsigned *image_counter,
-                           hb_vector_t<char> *defs_dst,
-                           hb_vector_t<char> *body_dst)
-{
-  bool ret = false;
-  hb_blob_t *normalized_image = nullptr;
-  unsigned len = 0;
-  const char *svg = nullptr;
-  unsigned doc_index = 0;
-  hb_codepoint_t start_glyph = HB_CODEPOINT_INVALID;
-  hb_codepoint_t end_glyph = HB_CODEPOINT_INVALID;
-  const OT::SVG::svg_doc_cache_t *doc_cache = nullptr;
-  unsigned glyph_start = 0, glyph_end = 0;
-  const hb_vector_t<OT::SVG::svg_defs_entry_t> *defs_entries = nullptr;
-  hb_vector_t<OT::SVG::svg_id_span_t> needed_ids;
-  hb_hashmap_t<OT::SVG::svg_id_span_t, hb_bool_t> needed_ids_set;
-  hb_vector_t<unsigned> chosen_defs;
-  hb_vector_t<uint8_t> chosen_def_marks;
-  unsigned root_open_len = 0;
-  bool glyph_is_root_svg = false;
-  bool root_missing_viewport = false;
-  char prefix[32];
-  int prefix_len = 0;
-
-  if (glyph == HB_CODEPOINT_INVALID || !image_counter || !defs_dst || !body_dst)
-    goto done;
-
-  normalized_image = OT::hb_ot_svg_reference_normalized_blob (image, &svg, &len);
-  if (!normalized_image || !svg || !len)
-    goto done;
-
-  if (!hb_ot_color_glyph_get_svg_document_index (face, glyph, &doc_index))
-    goto done;
-
-  if (!hb_ot_color_get_svg_document_glyph_range (face, doc_index, &start_glyph, &end_glyph))
-    goto done;
-
-  doc_cache = face->table.SVG->get_or_create_doc_cache (normalized_image, svg, len,
-                                                        doc_index, start_glyph, end_glyph);
-  if (!doc_cache)
-    goto done;
-  svg = face->table.SVG->doc_cache_get_svg (doc_cache, &len);
-
-  if (!face->table.SVG->doc_cache_get_glyph_span (doc_cache, glyph, &glyph_start, &glyph_end))
-    goto done;
-
-  defs_entries = face->table.SVG->doc_cache_get_defs_entries (doc_cache);
-  if (!hb_svg_find_root_open_tag (svg, len, &root_open_len, &root_missing_viewport))
-    goto done;
-  glyph_is_root_svg = glyph_start == 0;
-
-  needed_ids.alloc (16);
-  if (!hb_svg_collect_refs (svg + glyph_start, glyph_end - glyph_start,
-                            &needed_ids, &needed_ids_set))
-    goto done;
-
-  chosen_defs.alloc (16);
-  if (unlikely (!chosen_def_marks.resize ((int) defs_entries->length)))
-    goto done;
-  hb_memset (chosen_def_marks.arrayZ, 0, defs_entries->length);
-  for (unsigned qi = 0; qi < needed_ids.length; qi++)
-  {
-    const auto &need = needed_ids.arrayZ[qi];
-    for (unsigned i = 0; i < defs_entries->length; i++)
-    {
-      const auto &e = defs_entries->arrayZ[i];
-      if (e.id.len == need.len && !memcmp (e.id.p, need.p, need.len))
-      {
-        if (!chosen_def_marks.arrayZ[i])
-        {
-          chosen_def_marks.arrayZ[i] = 1;
-          if (unlikely (!chosen_defs.push_or_fail (i)))
-            goto done;
-          if (!hb_svg_collect_refs (svg + e.start, e.end - e.start,
-                                    &needed_ids, &needed_ids_set))
-            goto done;
-        }
-        break;
-      }
-    }
-  }
-
-  prefix_len = snprintf (prefix, sizeof (prefix), "hbimg%u_", (*image_counter)++);
-  if (prefix_len <= 0 || (unsigned) prefix_len >= sizeof (prefix))
-    goto done;
-
-  body_dst->alloc (body_dst->length + (glyph_end - glyph_start) + 64);
-
-  for (unsigned i = 0; i < chosen_defs.length; i++)
-  {
-    const auto &e = defs_entries->arrayZ[chosen_defs.arrayZ[i]];
-    if (!hb_svg_append_with_prefix (defs_dst, svg + e.start, e.end - e.start, prefix, (unsigned) prefix_len))
-      goto done;
-    if (!hb_svg_append_c (defs_dst, '\n'))
-      goto done;
-  }
-
-  if (glyph_is_root_svg && root_missing_viewport && root_open_len > 1)
-  {
-    unsigned upem = face->get_upem ();
-    if (!hb_svg_append_with_prefix (body_dst,
-                                    svg + glyph_start,
-                                    root_open_len - 1,
-                                    prefix,
-                                    (unsigned) prefix_len))
-      goto done;
-    if (!hb_svg_append_str (body_dst, " width=\""))
-      goto done;
-    if (!hb_svg_append_unsigned (body_dst, upem))
-      goto done;
-    if (!hb_svg_append_str (body_dst, "\" height=\""))
-      goto done;
-    if (!hb_svg_append_unsigned (body_dst, upem))
-      goto done;
-    if (!hb_svg_append_str (body_dst, "\" overflow=\"visible"))
-      goto done;
-    if (!hb_svg_append_c (body_dst, '"'))
-      goto done;
-    if (!hb_svg_append_c (body_dst, '>'))
-      goto done;
-    ret = hb_svg_append_with_prefix (body_dst,
-                                     svg + glyph_start + root_open_len,
-                                     glyph_end - glyph_start - root_open_len,
-                                     prefix,
-                                     (unsigned) prefix_len);
-  }
-  else if (glyph_is_root_svg && root_open_len > 1)
-  {
-    if (!hb_svg_append_with_prefix (body_dst,
-                                    svg + glyph_start,
-                                    root_open_len - 1,
-                                    prefix,
-                                    (unsigned) prefix_len))
-      goto done;
-    if (!hb_svg_append_str (body_dst, " overflow=\"visible\""))
-      goto done;
-    if (!hb_svg_append_c (body_dst, '>'))
-      goto done;
-    ret = hb_svg_append_with_prefix (body_dst,
-                                     svg + glyph_start + root_open_len,
-                                     glyph_end - glyph_start - root_open_len,
-                                     prefix,
-                                     (unsigned) prefix_len);
-  }
-  else
-    ret = hb_svg_append_with_prefix (body_dst,
-                                     svg + glyph_start,
-                                     glyph_end - glyph_start,
-                                     prefix,
-                                     (unsigned) prefix_len);
-
-done:
-  hb_blob_destroy (normalized_image);
-  return ret;
-}
-#else
-bool
-hb_svg_subset_glyph_image (hb_face_t *face HB_UNUSED,
-                           hb_blob_t *image HB_UNUSED,
-                           hb_codepoint_t glyph HB_UNUSED,
-                           unsigned *image_counter HB_UNUSED,
-                           hb_vector_t<char> *defs_dst HB_UNUSED,
-                           hb_vector_t<char> *body_dst HB_UNUSED)
-{
-  return false;
-}
-#endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.hh b/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.hh
deleted file mode 100644
index 32cb66c8..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-subset.hh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_VECTOR_SVG_SUBSET_HH
-#define HB_VECTOR_SVG_SUBSET_HH
-
-#include "hb.hh"
-#include "hb-vector.hh"
-#include "hb-blob.hh"
-#include "hb-face.h"
-
-HB_INTERNAL bool
-hb_svg_subset_glyph_image (hb_face_t *face,
-                           hb_blob_t *image,
-                           hb_codepoint_t glyph,
-                           unsigned *image_counter,
-                           hb_vector_t<char> *defs_dst,
-                           hb_vector_t<char> *body_dst);
-
-
-#endif /* HB_VECTOR_SVG_SUBSET_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.cc b/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.cc
deleted file mode 100644
index 766b98e7..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-machinery.hh"
-#include "hb-vector-svg-utils.hh"
-
-#include <string.h>
-
-struct hb_svg_decimal_point_t
-{
-  char value[8];
-};
-
-static hb_svg_decimal_point_t hb_svg_decimal_point_default = {{'.', '\0'}};
-
-static inline void free_static_svg_decimal_point ();
-
-static struct hb_svg_decimal_point_lazy_loader_t
-  : hb_lazy_loader_t<hb_svg_decimal_point_t, hb_svg_decimal_point_lazy_loader_t>
-{
-  static hb_svg_decimal_point_t *create ()
-  {
-    auto *p = (hb_svg_decimal_point_t *) hb_calloc (1, sizeof (hb_svg_decimal_point_t));
-    if (!p)
-      return nullptr;
-
-    p->value[0] = '.';
-    p->value[1] = '\0';
-
-#ifndef HB_NO_SETLOCALE
-    lconv *lc = nullptr;
-#ifdef HAVE_LOCALECONV_L
-    hb_locale_t current_locale = hb_uselocale ((hb_locale_t) 0);
-    if (current_locale)
-      lc = localeconv_l (current_locale);
-#endif
-    if (!lc)
-      lc = localeconv ();
-    if (lc && lc->decimal_point && lc->decimal_point[0])
-    {
-      strncpy (p->value, lc->decimal_point, sizeof (p->value) - 1);
-      p->value[sizeof (p->value) - 1] = '\0';
-    }
-#endif
-
-    hb_atexit (free_static_svg_decimal_point);
-    return p;
-  }
-
-  static void destroy (hb_svg_decimal_point_t *p)
-  { hb_free (p); }
-
-  static const hb_svg_decimal_point_t *get_null ()
-  { return &hb_svg_decimal_point_default; }
-} static_svg_decimal_point;
-
-static inline void
-free_static_svg_decimal_point ()
-{
-  static_svg_decimal_point.free_instance ();
-}
-
-const char *
-hb_svg_decimal_point_get (void)
-{
-  return static_svg_decimal_point.get_unconst ()->value;
-}
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.hh b/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.hh
deleted file mode 100644
index 138b51b6..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg-utils.hh
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_VECTOR_SVG_UTILS_HH
-#define HB_VECTOR_SVG_UTILS_HH
-
-#include "hb.hh"
-#include "hb-vector.hh"
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-HB_INTERNAL const char *
-hb_svg_decimal_point_get (void);
-
-static inline bool
-hb_svg_append_len (hb_vector_t<char> *buf,
-                   const char *s,
-                   unsigned len)
-{
-  unsigned old_len = buf->length;
-  if (unlikely (!buf->resize_dirty ((int) (old_len + len))))
-    return false;
-  hb_memcpy (buf->arrayZ + old_len, s, len);
-  return true;
-}
-
-static inline bool
-hb_svg_append_c (hb_vector_t<char> *buf, char c)
-{
-  return buf->push_or_fail (c);
-}
-
-static inline void
-hb_svg_append_num (hb_vector_t<char> *buf,
-                   float v,
-                   unsigned precision,
-                   bool keep_nonzero = false)
-{
-  unsigned effective_precision = precision;
-  if (effective_precision > 12)
-    effective_precision = 12;
-  if (keep_nonzero && v != 0.f)
-    while (effective_precision < 12)
-    {
-      float rounded_zero_threshold = 0.5f;
-      for (unsigned i = 0; i < effective_precision; i++)
-        rounded_zero_threshold *= 0.1f;
-      if (fabsf (v) >= rounded_zero_threshold)
-        break;
-      effective_precision++;
-    }
-
-  float rounded_zero_threshold = 0.5f;
-  for (unsigned i = 0; i < effective_precision; i++)
-    rounded_zero_threshold *= 0.1f;
-  if (fabsf (v) < rounded_zero_threshold)
-    v = 0.f;
-
-  if (!(v == v) || !std::isfinite (v))
-  {
-    hb_svg_append_c (buf, '0');
-    return;
-  }
-
-  static const char float_formats[13][6] = {
-    "%.0f",  "%.1f",  "%.2f",  "%.3f",  "%.4f",  "%.5f",  "%.6f",
-    "%.7f",  "%.8f",  "%.9f",  "%.10f", "%.11f", "%.12f",
-  };
-  char out[128];
-  snprintf (out, sizeof (out), float_formats[effective_precision], (double) v);
-
-  const char *decimal_point = hb_svg_decimal_point_get ();
-
-  if (decimal_point[0] != '.' || decimal_point[1] != '\0')
-  {
-    char *p = strstr (out, decimal_point);
-    if (p)
-    {
-      unsigned dp_len = (unsigned) strlen (decimal_point);
-      unsigned tail_len = (unsigned) strlen (p + dp_len);
-      memmove (p + 1, p + dp_len, tail_len + 1);
-      *p = '.';
-    }
-  }
-
-  char *dot = strchr (out, '.');
-  if (dot)
-  {
-    char *end = out + strlen (out) - 1;
-    while (end > dot && *end == '0')
-      *end-- = '\0';
-    if (end == dot)
-      *end = '\0';
-  }
-
-  hb_svg_append_len (buf, out, (unsigned) strlen (out));
-}
-
-static inline unsigned
-hb_svg_scale_precision (unsigned precision)
-{
-  return precision < 7 ? 7 : precision;
-}
-
-#endif /* HB_VECTOR_SVG_UTILS_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector-svg.hh b/engine/thirdparty/harfbuzz/src/hb-vector-svg.hh
deleted file mode 100644
index 418d5bc4..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector-svg.hh
+++ /dev/null
@@ -1,366 +0,0 @@
-#ifndef HB_VECTOR_SVG_HH
-#define HB_VECTOR_SVG_HH
-
-#include "hb-vector.h"
-
-static inline bool
-hb_svg_append_str (hb_vector_t<char> *buf, const char *s)
-{
-  return hb_svg_append_len (buf, s, (unsigned) strlen (s));
-}
-
-static inline bool
-hb_svg_append_unsigned (hb_vector_t<char> *buf, unsigned v)
-{
-  char tmp[10];
-  unsigned n = 0;
-  do {
-    tmp[n++] = (char) ('0' + (v % 10));
-    v /= 10;
-  } while (v);
-
-  unsigned old_len = buf->length;
-  if (unlikely (!buf->resize_dirty ((int) (old_len + n))))
-    return false;
-
-  for (unsigned i = 0; i < n; i++)
-    buf->arrayZ[old_len + i] = tmp[n - 1 - i];
-  return true;
-}
-
-static inline bool
-hb_svg_append_hex_byte (hb_vector_t<char> *buf, unsigned v)
-{
-  static const char hex[] = "0123456789ABCDEF";
-  char tmp[2] = {hex[(v >> 4) & 15], hex[v & 15]};
-  return hb_svg_append_len (buf, tmp, 2);
-}
-
-static inline bool
-hb_svg_append_base64 (hb_vector_t<char> *buf,
-                      const uint8_t *data,
-                      unsigned len)
-{
-  static const char b64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  unsigned out_len = ((len + 2) / 3) * 4;
-  unsigned old_len = buf->length;
-  if (unlikely (!buf->resize_dirty ((int) (old_len + out_len))))
-    return false;
-
-  char *dst = buf->arrayZ + old_len;
-  unsigned di = 0;
-  unsigned i = 0;
-  while (i + 2 < len)
-  {
-    unsigned v = ((unsigned) data[i] << 16) |
-                 ((unsigned) data[i + 1] << 8) |
-                 ((unsigned) data[i + 2]);
-    dst[di++] = b64[(v >> 18) & 63];
-    dst[di++] = b64[(v >> 12) & 63];
-    dst[di++] = b64[(v >> 6) & 63];
-    dst[di++] = b64[v & 63];
-    i += 3;
-  }
-
-  if (i < len)
-  {
-    unsigned v = (unsigned) data[i] << 16;
-    if (i + 1 < len)
-      v |= (unsigned) data[i + 1] << 8;
-    dst[di++] = b64[(v >> 18) & 63];
-    dst[di++] = b64[(v >> 12) & 63];
-    dst[di++] = (i + 1 < len) ? b64[(v >> 6) & 63] : '=';
-    dst[di++] = '=';
-  }
-
-  return true;
-}
-
-struct hb_svg_blob_meta_t
-{
-  char *data;
-  int allocated;
-  bool transferred;
-  bool in_replace;
-};
-
-static hb_user_data_key_t hb_svg_blob_meta_user_data_key;
-
-static inline void
-hb_svg_blob_meta_set_buffer (hb_svg_blob_meta_t *meta,
-                             char *data,
-                             int allocated)
-{
-  meta->data = data;
-  meta->allocated = allocated;
-  meta->transferred = false;
-}
-
-static inline void
-hb_svg_blob_meta_release_buffer (hb_svg_blob_meta_t *meta)
-{
-  if (!meta)
-    return;
-  if (!meta->transferred && meta->data)
-    hb_free (meta->data);
-  meta->data = nullptr;
-  meta->allocated = 0;
-  meta->transferred = true;
-}
-
-static inline void
-hb_svg_blob_meta_destroy (void *data)
-{
-  auto *meta = (hb_svg_blob_meta_t *) data;
-  hb_svg_blob_meta_release_buffer (meta);
-  if (meta->in_replace)
-  {
-    meta->in_replace = false;
-    return;
-  }
-  hb_free (meta);
-}
-
-static inline hb_blob_t *
-hb_svg_blob_from_buffer (hb_blob_t **recycled_blob,
-                         hb_vector_t<char> *buf)
-{
-  unsigned len = 0;
-  int allocated = 0;
-  char *data = buf->steal (&len, &allocated);
-  if (!data)
-    return nullptr;
-
-  hb_blob_t *blob = nullptr;
-  if (*recycled_blob)
-    blob = *recycled_blob;
-  bool reused_blob = blob && blob != hb_blob_get_empty ();
-  bool new_meta = false;
-  auto *meta = reused_blob
-             ? (hb_svg_blob_meta_t *) hb_blob_get_user_data (blob, &hb_svg_blob_meta_user_data_key)
-             : nullptr;
-  if (!meta)
-  {
-    meta = (hb_svg_blob_meta_t *) hb_malloc (sizeof (hb_svg_blob_meta_t));
-    if (!meta)
-    {
-      hb_free (data);
-      return nullptr;
-    }
-    meta->data = nullptr;
-    meta->allocated = 0;
-    meta->transferred = true;
-    meta->in_replace = false;
-    new_meta = true;
-  }
-
-  if (reused_blob)
-  {
-    meta->in_replace = true;
-    blob->replace_buffer (data, len, HB_MEMORY_MODE_WRITABLE, meta, hb_svg_blob_meta_destroy);
-    hb_svg_blob_meta_set_buffer (meta, data, allocated);
-  }
-  else
-  {
-    hb_svg_blob_meta_set_buffer (meta, data, allocated);
-    blob = hb_blob_create_or_fail (data, len, HB_MEMORY_MODE_WRITABLE, meta, hb_svg_blob_meta_destroy);
-    if (unlikely (!blob))
-      return nullptr;
-  }
-
-  if (unlikely (blob == hb_blob_get_empty ()))
-  {
-    if (new_meta)
-      hb_free (meta);
-    hb_free (data);
-    return nullptr;
-  }
-
-  if (new_meta &&
-      !hb_blob_set_user_data (blob,
-                              &hb_svg_blob_meta_user_data_key,
-                              meta,
-                              nullptr,
-                              true))
-  {
-    if (!reused_blob)
-      hb_blob_destroy (blob);
-    return nullptr;
-  }
-
-  if (*recycled_blob)
-    *recycled_blob = nullptr;
-
-  return blob;
-}
-
-static inline void
-hb_svg_recover_recycled_buffer (hb_blob_t *blob,
-                                hb_vector_t<char> *buf)
-{
-  if (!blob)
-    return;
-
-  auto *meta = (hb_svg_blob_meta_t *) hb_blob_get_user_data (blob, &hb_svg_blob_meta_user_data_key);
-  if (!meta || meta->transferred || !meta->data)
-    return;
-
-  buf->recycle_buffer (meta->data, 0, meta->allocated);
-  meta->data = nullptr;
-  meta->allocated = 0;
-  meta->transferred = true;
-}
-
-static inline void
-hb_svg_append_color (hb_vector_t<char> *buf,
-                     hb_color_t color,
-                     bool with_alpha)
-{
-  static const char hex[] = "0123456789ABCDEF";
-  unsigned r = hb_color_get_red (color);
-  unsigned g = hb_color_get_green (color);
-  unsigned b = hb_color_get_blue (color);
-  unsigned a = hb_color_get_alpha (color);
-  hb_svg_append_c (buf, '#');
-  if (((r >> 4) == (r & 0xF)) &&
-      ((g >> 4) == (g & 0xF)) &&
-      ((b >> 4) == (b & 0xF)))
-  {
-    hb_svg_append_c (buf, hex[r & 0xF]);
-    hb_svg_append_c (buf, hex[g & 0xF]);
-    hb_svg_append_c (buf, hex[b & 0xF]);
-  }
-  else
-  {
-    hb_svg_append_hex_byte (buf, r);
-    hb_svg_append_hex_byte (buf, g);
-    hb_svg_append_hex_byte (buf, b);
-  }
-  if (with_alpha && a != 255)
-  {
-    hb_svg_append_str (buf, "\" fill-opacity=\"");
-    hb_svg_append_num (buf, a / 255.f, 4);
-  }
-}
-
-static inline void
-hb_svg_transform_point (const hb_transform_t<> &t,
-                        float x_scale_factor,
-                        float y_scale_factor,
-                        float x, float y,
-                        float *tx, float *ty)
-{
-  float xx = x, yy = y;
-  t.transform_point (xx, yy);
-  *tx = xx / (x_scale_factor > 0 ? x_scale_factor : 1.f);
-  *ty = yy / (y_scale_factor > 0 ? y_scale_factor : 1.f);
-}
-
-static inline hb_bool_t
-hb_svg_set_glyph_extents_common (const hb_transform_t<> &transform,
-                                 float x_scale_factor,
-                                 float y_scale_factor,
-                                 const hb_glyph_extents_t *glyph_extents,
-                                 hb_vector_extents_t *extents,
-                                 hb_bool_t *has_extents)
-{
-  float x0 = (float) glyph_extents->x_bearing;
-  float y0 = (float) glyph_extents->y_bearing;
-  float x1 = x0 + glyph_extents->width;
-  float y1 = y0 + glyph_extents->height;
-
-  float px[4] = {x0, x0, x1, x1};
-  float py[4] = {y0, y1, y0, y1};
-
-  float tx, ty;
-  hb_svg_transform_point (transform, x_scale_factor, y_scale_factor, px[0], py[0], &tx, &ty);
-  float tx_min = tx, tx_max = tx;
-  float ty_min = ty, ty_max = ty;
-
-  for (unsigned i = 1; i < 4; i++)
-  {
-    hb_svg_transform_point (transform, x_scale_factor, y_scale_factor, px[i], py[i], &tx, &ty);
-    tx_min = hb_min (tx_min, tx);
-    tx_max = hb_max (tx_max, tx);
-    ty_min = hb_min (ty_min, ty);
-    ty_max = hb_max (ty_max, ty);
-  }
-
-  if (tx_max <= tx_min || ty_max <= ty_min)
-    return false;
-
-  if (*has_extents)
-  {
-    float x0 = hb_min (extents->x, tx_min);
-    float y0 = hb_min (extents->y, ty_min);
-    float x1 = hb_max (extents->x + extents->width, tx_max);
-    float y1 = hb_max (extents->y + extents->height, ty_max);
-    *extents = {x0, y0, x1 - x0, y1 - y0};
-  }
-  else
-  {
-    *extents = {tx_min, ty_min, tx_max - tx_min, ty_max - ty_min};
-    *has_extents = true;
-  }
-  return true;
-}
-
-static inline void
-hb_svg_append_instance_transform (hb_vector_t<char> *out,
-                                  unsigned precision,
-                                  float x_scale_factor,
-                                  float y_scale_factor,
-                                  float xx, float yx,
-                                  float xy, float yy,
-                                  float tx, float ty)
-{
-  unsigned sprec = hb_svg_scale_precision (precision);
-  if (xx == 1.f && yx == 0.f && xy == 0.f && yy == 1.f)
-  {
-    float sx = 1.f / x_scale_factor;
-    float sy = 1.f / y_scale_factor;
-    hb_svg_append_str (out, "translate(");
-    hb_svg_append_num (out, tx / x_scale_factor, precision);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, -ty / y_scale_factor, precision);
-    hb_svg_append_str (out, ") scale(");
-    hb_svg_append_num (out, sx, sprec, true);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, -sy, sprec, true);
-    hb_svg_append_c (out, ')');
-  }
-  else
-  {
-    hb_svg_append_str (out, "matrix(");
-    hb_svg_append_num (out, xx / x_scale_factor, sprec, true);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, yx / y_scale_factor, sprec, true);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, -xy / x_scale_factor, sprec, true);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, -yy / y_scale_factor, sprec, true);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, tx / x_scale_factor, precision);
-    hb_svg_append_c (out, ',');
-    hb_svg_append_num (out, -ty / y_scale_factor, precision);
-    hb_svg_append_c (out, ')');
-  }
-}
-
-static inline void
-hb_svg_append_image_instance_translate (hb_vector_t<char> *out,
-                                        unsigned precision,
-                                        float x_scale_factor,
-                                        float y_scale_factor,
-                                        float tx, float ty)
-{
-  hb_svg_append_str (out, "translate(");
-  hb_svg_append_num (out, tx / x_scale_factor, precision);
-  hb_svg_append_c (out, ',');
-  hb_svg_append_num (out, -ty / y_scale_factor, precision);
-  hb_svg_append_c (out, ')');
-}
-
-#endif /* HB_VECTOR_SVG_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector.cc b/engine/thirdparty/harfbuzz/src/hb-vector.cc
deleted file mode 100644
index 2b422253..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#include "hb.hh"
-
-#include "hb-vector.h"
-
-/**
- * SECTION:hb-vector
- * @title: hb-vector
- * @short_description: Glyph vector conversion
- * @include: hb-vector.h
- *
- * Functions for converting glyph draw and paint callbacks to vector output.
- *
- * The initial backend is SVG.  Extents must be set before calling render
- * functions; otherwise render returns `NULL`.
- **/
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector.h b/engine/thirdparty/harfbuzz/src/hb-vector.h
deleted file mode 100644
index dd32f2ec..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-vector.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2026  Behdad Esfahbod
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_VECTOR_H
-#define HB_VECTOR_H
-
-#include "hb.h"
-
-HB_BEGIN_DECLS
-
-/**
- * hb_vector_format_t:
- * @HB_VECTOR_FORMAT_INVALID: Invalid format.
- * @HB_VECTOR_FORMAT_SVG: SVG output.
- *
- * Output format for vector conversion.
- *
- * Since: 13.0.0
- */
-typedef enum {
-  HB_VECTOR_FORMAT_INVALID = HB_TAG_NONE,
-  HB_VECTOR_FORMAT_SVG = HB_TAG ('s','v','g',' '),
-} hb_vector_format_t;
-
-/**
- * hb_vector_extents_t:
- * @x: Left edge of the output coordinate system.
- * @y: Top edge of the output coordinate system.
- * @width: Width of the output coordinate system.
- * @height: Height of the output coordinate system.
- *
- * Vector output extents, mapped to SVG viewBox.
- *
- * Since: 13.0.0
- */
-typedef struct hb_vector_extents_t {
-  float x, y;
-  float width, height;
-} hb_vector_extents_t;
-
-/**
- * hb_vector_extents_mode_t:
- * @HB_VECTOR_EXTENTS_MODE_NONE: Do not update extents.
- * @HB_VECTOR_EXTENTS_MODE_EXPAND: Union glyph ink extents into current extents.
- *
- * Controls whether convenience glyph APIs update context extents.
- *
- * Since: 13.0.0
- */
-typedef enum {
-  HB_VECTOR_EXTENTS_MODE_NONE = 0,
-  HB_VECTOR_EXTENTS_MODE_EXPAND = 1,
-} hb_vector_extents_mode_t;
-
-/**
- * hb_vector_draw_t:
- *
- * Opaque draw context for vector outline conversion.
- *
- * Since: 13.0.0
- */
-typedef struct hb_vector_draw_t hb_vector_draw_t;
-
-/**
- * hb_vector_paint_t:
- *
- * Opaque paint context for vector color-glyph conversion.
- *
- * Since: 13.0.0
- */
-typedef struct hb_vector_paint_t hb_vector_paint_t;
-
-/* hb_vector_draw_t */
-
-HB_EXTERN hb_vector_draw_t *
-hb_vector_draw_create_or_fail (hb_vector_format_t format);
-
-HB_EXTERN hb_vector_draw_t *
-hb_vector_draw_reference (hb_vector_draw_t *draw);
-
-HB_EXTERN void
-hb_vector_draw_destroy (hb_vector_draw_t *draw);
-
-HB_EXTERN hb_bool_t
-hb_vector_draw_set_user_data (hb_vector_draw_t   *draw,
-                              hb_user_data_key_t *key,
-                              void               *data,
-                              hb_destroy_func_t   destroy,
-                              hb_bool_t           replace);
-
-HB_EXTERN void *
-hb_vector_draw_get_user_data (hb_vector_draw_t   *draw,
-                              hb_user_data_key_t *key);
-
-HB_EXTERN void
-hb_vector_draw_set_transform (hb_vector_draw_t *draw,
-                              float xx, float yx,
-                              float xy, float yy,
-                              float dx, float dy);
-
-HB_EXTERN void
-hb_vector_draw_get_transform (hb_vector_draw_t *draw,
-                              float *xx, float *yx,
-                              float *xy, float *yy,
-                              float *dx, float *dy);
-
-HB_EXTERN void
-hb_vector_draw_set_scale_factor (hb_vector_draw_t *draw,
-                                 float x_scale_factor,
-                                 float y_scale_factor);
-
-HB_EXTERN void
-hb_vector_draw_get_scale_factor (hb_vector_draw_t *draw,
-                                 float *x_scale_factor,
-                                 float *y_scale_factor);
-
-HB_EXTERN void
-hb_vector_draw_set_extents (hb_vector_draw_t *draw,
-                            const hb_vector_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_vector_draw_get_extents (hb_vector_draw_t *draw,
-                            hb_vector_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_vector_draw_set_glyph_extents (hb_vector_draw_t *draw,
-                                  const hb_glyph_extents_t *glyph_extents);
-
-HB_EXTERN hb_draw_funcs_t *
-hb_vector_draw_get_funcs (void);
-
-HB_EXTERN hb_bool_t
-hb_vector_draw_glyph (hb_vector_draw_t *draw,
-                      hb_font_t *font,
-                      hb_codepoint_t glyph,
-                      float pen_x,
-                      float pen_y,
-                      hb_vector_extents_mode_t extents_mode);
-
-HB_EXTERN void
-hb_vector_svg_set_flat (hb_vector_draw_t *draw,
-                        hb_bool_t flat);
-
-HB_EXTERN void
-hb_vector_svg_set_precision (hb_vector_draw_t *draw,
-                             unsigned precision);
-
-HB_EXTERN hb_blob_t *
-hb_vector_draw_render (hb_vector_draw_t *draw);
-
-HB_EXTERN void
-hb_vector_draw_reset (hb_vector_draw_t *draw);
-
-HB_EXTERN void
-hb_vector_draw_recycle_blob (hb_vector_draw_t *draw,
-                             hb_blob_t *blob);
-
-
-/* hb_vector_paint_t */
-
-HB_EXTERN hb_vector_paint_t *
-hb_vector_paint_create_or_fail (hb_vector_format_t format);
-
-HB_EXTERN hb_vector_paint_t *
-hb_vector_paint_reference (hb_vector_paint_t *paint);
-
-HB_EXTERN void
-hb_vector_paint_destroy (hb_vector_paint_t *paint);
-
-HB_EXTERN hb_bool_t
-hb_vector_paint_set_user_data (hb_vector_paint_t  *paint,
-                               hb_user_data_key_t *key,
-                               void               *data,
-                               hb_destroy_func_t   destroy,
-                               hb_bool_t           replace);
-
-HB_EXTERN void *
-hb_vector_paint_get_user_data (hb_vector_paint_t  *paint,
-                               hb_user_data_key_t *key);
-
-HB_EXTERN void
-hb_vector_paint_set_transform (hb_vector_paint_t *paint,
-                               float xx, float yx,
-                               float xy, float yy,
-                               float dx, float dy);
-
-HB_EXTERN void
-hb_vector_paint_get_transform (hb_vector_paint_t *paint,
-                               float *xx, float *yx,
-                               float *xy, float *yy,
-                               float *dx, float *dy);
-
-HB_EXTERN void
-hb_vector_paint_set_scale_factor (hb_vector_paint_t *paint,
-                                  float x_scale_factor,
-                                  float y_scale_factor);
-
-HB_EXTERN void
-hb_vector_paint_get_scale_factor (hb_vector_paint_t *paint,
-                                  float *x_scale_factor,
-                                  float *y_scale_factor);
-
-HB_EXTERN void
-hb_vector_paint_set_extents (hb_vector_paint_t *paint,
-                             const hb_vector_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_vector_paint_get_extents (hb_vector_paint_t *paint,
-                             hb_vector_extents_t *extents);
-
-HB_EXTERN hb_bool_t
-hb_vector_paint_set_glyph_extents (hb_vector_paint_t *paint,
-                                   const hb_glyph_extents_t *glyph_extents);
-
-HB_EXTERN void
-hb_vector_paint_set_foreground (hb_vector_paint_t *paint,
-                                hb_color_t foreground);
-
-HB_EXTERN void
-hb_vector_paint_set_palette (hb_vector_paint_t *paint,
-                             int palette);
-
-HB_EXTERN void
-hb_vector_paint_set_custom_palette_color (hb_vector_paint_t *paint,
-                                          unsigned color_index,
-                                          hb_color_t color);
-
-HB_EXTERN void
-hb_vector_paint_clear_custom_palette_colors (hb_vector_paint_t *paint);
-
-HB_EXTERN hb_paint_funcs_t *
-hb_vector_paint_get_funcs (void);
-
-HB_EXTERN hb_bool_t
-hb_vector_paint_glyph (hb_vector_paint_t *paint,
-		       hb_font_t         *font,
-		       hb_codepoint_t     glyph,
-		       float              pen_x,
-		       float              pen_y,
-		       hb_vector_extents_mode_t extents_mode);
-
-HB_EXTERN void
-hb_vector_svg_paint_set_flat (hb_vector_paint_t *paint,
-                              hb_bool_t flat);
-
-HB_EXTERN void
-hb_vector_svg_paint_set_precision (hb_vector_paint_t *paint,
-                                   unsigned precision);
-
-HB_EXTERN hb_blob_t *
-hb_vector_paint_render (hb_vector_paint_t *paint);
-
-HB_EXTERN void
-hb_vector_paint_reset (hb_vector_paint_t *paint);
-
-HB_EXTERN void
-hb_vector_paint_recycle_blob (hb_vector_paint_t *paint,
-                              hb_blob_t *blob);
-
-HB_END_DECLS
-
-#endif /* HB_VECTOR_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector.hh b/engine/thirdparty/harfbuzz/src/hb-vector.hh
index 71c0c27a..dc34f415 100644
--- a/engine/thirdparty/harfbuzz/src/hb-vector.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-vector.hh
@@ -62,7 +62,7 @@ struct hb_vector_t
 	    hb_requires (hb_is_iterable (Iterable))>
   explicit hb_vector_t (const Iterable &o) : hb_vector_t ()
   {
-    extend (o, true);
+    extend (o);
   }
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
   hb_vector_t (const hb_vector_t &o) : hb_vector_t ()
@@ -117,12 +117,12 @@ struct hb_vector_t
   template <typename Iterable,
 	    hb_requires (hb_is_iterable (Iterable))>
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
-  void extend (const Iterable &o, bool exact=false)
+  void extend (const Iterable &o)
   {
     auto iter = hb_iter (o);
     if (iter.is_random_access_iterator || iter.has_fast_len)
     {
-      if (unlikely (!alloc (length + hb_len (iter), exact)))
+      if (unlikely (!alloc (hb_len (iter), true)))
 	return;
       unsigned count = hb_len (iter);
       for (unsigned i = 0; i < count; i++)
@@ -138,16 +138,16 @@ struct hb_vector_t
     }
   }
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
-  void extend (array_t o, bool exact=false)
+  void extend (array_t o)
   {
-    alloc (length + o.length, exact);
+    alloc (length + o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
-  void extend (c_array_t o, bool exact=false)
+  void extend (c_array_t o)
   {
-    alloc (length + o.length, exact);
+    alloc (length + o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
@@ -186,34 +186,6 @@ struct hb_vector_t
     return *this;
   }
 
-  /* Transfer ownership of the backing storage to caller.
-   * Returns nullptr if storage is not owned by this vector. */
-  Type *
-  steal (unsigned *len = nullptr, int *allocated_out = nullptr)
-  {
-    if (!is_owned ())
-      return nullptr;
-    if (len)
-      *len = length;
-    if (allocated_out)
-      *allocated_out = allocated;
-    Type *p = arrayZ;
-    init ();
-    return p;
-  }
-
-  /* Adopt a previously detached owned buffer. */
-  void
-  recycle_buffer (Type *buffer,
-                  unsigned len,
-                  int allocated_len)
-  {
-    fini ();
-    arrayZ = buffer;
-    length = len;
-    allocated = allocated_len;
-  }
-
   friend void swap (hb_vector_t& a, hb_vector_t& b) noexcept
   {
     hb_swap (a.allocated, b.allocated);
@@ -318,12 +290,6 @@ struct hb_vector_t
   }
   template <typename... Args>
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
-  bool push_or_fail (Args&&... args)
-  {
-    return push (std::forward<Args> (args)...) != std::addressof (Crap (Type));
-  }
-  template <typename... Args>
-  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   Type *push_has_room (Args&&... args)
   {
     /* Emplace. */
@@ -347,11 +313,6 @@ struct hb_vector_t
     assert (allocated < 0);
     allocated = -(allocated + 1);
   }
-  void ensure_error ()
-  {
-    if (!in_error ())
-      set_error ();
-  }
 
   Type *
   _realloc (unsigned new_allocated)
@@ -604,7 +565,7 @@ struct hb_vector_t
 
   template <typename allocator_t>
   HB_ALWAYS_INLINE_VECTOR_ALLOCS
-  bool duplicate_vector_from_pool (allocator_t *allocator, const hb_vector_t &other)
+  bool allocate_from_pool (allocator_t *allocator, const hb_vector_t &other)
   {
     if (unlikely (!allocate_from_pool (allocator, other.length, false)))
       return false;
diff --git a/engine/thirdparty/harfbuzz/src/hb-version.h b/engine/thirdparty/harfbuzz/src/hb-version.h
index fe844a3a..58534a82 100644
--- a/engine/thirdparty/harfbuzz/src/hb-version.h
+++ b/engine/thirdparty/harfbuzz/src/hb-version.h
@@ -41,26 +41,26 @@ HB_BEGIN_DECLS
  *
  * The major component of the library version available at compile-time.
  */
-#define HB_VERSION_MAJOR 13
+#define HB_VERSION_MAJOR 12
 /**
  * HB_VERSION_MINOR:
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 1
+#define HB_VERSION_MINOR 2
 /**
  * HB_VERSION_MICRO:
  *
  * The micro component of the library version available at compile-time.
  */
-#define HB_VERSION_MICRO 1
+#define HB_VERSION_MICRO 0
 
 /**
  * HB_VERSION_STRING:
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "13.1.1"
+#define HB_VERSION_STRING "12.2.0"
 
 /**
  * HB_VERSION_ATLEAST:
diff --git a/engine/thirdparty/harfbuzz/src/hb-zlib.cc b/engine/thirdparty/harfbuzz/src/hb-zlib.cc
deleted file mode 100644
index 2703e943..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-zlib.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef HB_ZLIB_CC
-#define HB_ZLIB_CC
-
-#include "hb.hh"
-
-#include "hb-zlib.hh"
-
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
-
-hb_blob_t *
-hb_blob_decompress_gzip (hb_blob_t *blob,
-                         unsigned   max_output_len)
-{
-#ifndef HAVE_ZLIB
-  return nullptr;
-#else
-  unsigned compressed_len = 0;
-  const uint8_t *compressed = (const uint8_t *) hb_blob_get_data (blob, &compressed_len);
-  if (!compressed || !compressed_len)
-    return nullptr;
-
-  z_stream stream = {};
-  stream.next_in = (Bytef *) compressed;
-  stream.avail_in = compressed_len;
-
-  if (inflateInit2 (&stream, 16 + MAX_WBITS) != Z_OK)
-    return nullptr;
-
-  uint32_t expected_size = 0;
-  hb_gzip_get_uncompressed_size ((const char *) compressed,
-                                 compressed_len,
-                                 &expected_size);
-
-  size_t allocated = hb_min ((size_t) hb_max (expected_size, 4096u),
-                             (size_t) max_output_len);
-  char *output = (char *) hb_malloc (allocated);
-  if (!output)
-  {
-    inflateEnd (&stream);
-    return nullptr;
-  }
-
-  int status = Z_OK;
-  while (true)
-  {
-    size_t produced = (size_t) stream.total_out;
-    if (unlikely (produced >= (size_t) max_output_len))
-      goto fail;
-
-    if (produced == allocated)
-    {
-      size_t new_allocated = hb_min (allocated * 2, (size_t) max_output_len);
-      if (unlikely (new_allocated <= allocated))
-        goto fail;
-
-      char *new_output = (char *) hb_realloc (output, new_allocated);
-      if (unlikely (!new_output))
-        goto fail;
-
-      output = new_output;
-      allocated = new_allocated;
-    }
-
-    stream.next_out = (Bytef *) output + stream.total_out;
-    stream.avail_out = (uInt) (allocated - (size_t) stream.total_out);
-
-    status = inflate (&stream, Z_FINISH);
-    if (status == Z_STREAM_END)
-      break;
-
-    if ((status == Z_OK || status == Z_BUF_ERROR) && stream.avail_out == 0)
-      continue;
-
-    goto fail;
-  }
-
-  inflateEnd (&stream);
-
-  if (unlikely ((size_t) stream.total_out > (size_t) max_output_len))
-    goto fail_free;
-
-  return hb_blob_create_or_fail (output,
-                                 (unsigned) stream.total_out,
-                                 HB_MEMORY_MODE_WRITABLE,
-                                 output,
-                                 hb_free);
-
-fail:
-  inflateEnd (&stream);
-fail_free:
-  hb_free (output);
-  return nullptr;
-#endif
-}
-
-#endif /* HB_ZLIB_CC */
diff --git a/engine/thirdparty/harfbuzz/src/hb-zlib.hh b/engine/thirdparty/harfbuzz/src/hb-zlib.hh
deleted file mode 100644
index 3b8eb791..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-zlib.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef HB_ZLIB_HH
-#define HB_ZLIB_HH
-
-#include "hb-blob.hh"
-
-static inline bool
-hb_blob_is_gzip (const char *data,
-                 unsigned    data_len)
-{
-  return data_len >= 3 &&
-         (unsigned char) data[0] == 0x1Fu &&
-         (unsigned char) data[1] == 0x8Bu &&
-         (unsigned char) data[2] == 0x08u;
-}
-
-static inline bool
-hb_gzip_get_uncompressed_size (const char *data,
-                               unsigned    data_len,
-                               uint32_t   *size)
-{
-  if (data_len < 4)
-    return false;
-
-  const unsigned char *trailer = (const unsigned char *) data + data_len - 4;
-  if (size)
-    *size = (uint32_t) trailer[0] |
-            ((uint32_t) trailer[1] << 8) |
-            ((uint32_t) trailer[2] << 16) |
-            ((uint32_t) trailer[3] << 24);
-  return true;
-}
-
-HB_INTERNAL hb_blob_t *
-hb_blob_decompress_gzip (hb_blob_t *blob,
-                         unsigned   max_output_len);
-
-#endif /* HB_ZLIB_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb.hh b/engine/thirdparty/harfbuzz/src/hb.hh
index 2ebae65f..34a6df8a 100644
--- a/engine/thirdparty/harfbuzz/src/hb.hh
+++ b/engine/thirdparty/harfbuzz/src/hb.hh
@@ -526,7 +526,7 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
 
 /* Pie time. */
 // https://github.com/harfbuzz/harfbuzz/issues/4166
-#define HB_PI 3.14159265358979323846f
+#define HB_PI 3.14159265358979f
 #define HB_2_PI (2.f * HB_PI)
 
 /* Compile-time custom allocator support. */
diff --git a/engine/thirdparty/jolt_physics/Jolt/AABBTree/AABBTreeBuilder.h b/engine/thirdparty/jolt_physics/Jolt/AABBTree/AABBTreeBuilder.h
index f2720786..3b0635c1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/AABBTree/AABBTreeBuilder.h
+++ b/engine/thirdparty/jolt_physics/Jolt/AABBTree/AABBTreeBuilder.h
@@ -50,9 +50,6 @@ public:
 		/// Check if this node has any children
 		inline bool			HasChildren() const						{ return mChild[0] != cInvalidNodeIndex || mChild[1] != cInvalidNodeIndex; }
 
-		/// Get child node
-		inline const Node * GetChild(uint inIdx, const Array<Node> &inNodes) const { return mChild[inIdx] != cInvalidNodeIndex? &inNodes[mChild[inIdx]] : nullptr; }
-
 		/// Min depth of tree
 		uint				GetMinDepth(const Array<Node> &inNodes) const;
 
@@ -98,7 +95,7 @@ public:
 	};
 
 	/// Constructor
-	explicit				AABBTreeBuilder(TriangleSplitter &inSplitter, uint inMaxTrianglesPerLeaf = 16);
+							AABBTreeBuilder(TriangleSplitter &inSplitter, uint inMaxTrianglesPerLeaf = 16);
 
 	/// Recursively build tree, returns the root node of the tree
 	Node *					Build(AABBTreeBuilderStats &outStats);
diff --git a/engine/thirdparty/jolt_physics/Jolt/ConfigurationString.h b/engine/thirdparty/jolt_physics/Jolt/ConfigurationString.h
index 566f13a3..ef502e0d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/ConfigurationString.h
+++ b/engine/thirdparty/jolt_physics/Jolt/ConfigurationString.h
@@ -32,9 +32,9 @@ inline const char *GetConfigurationString()
 #else
 	#error Unknown CPU architecture
 #endif
-#if JPH_CPU_ARCH_BITS == 64
+#if JPH_CPU_ADDRESS_BITS == 64
 		"64-bit "
-#elif JPH_CPU_ARCH_BITS == 32
+#elif JPH_CPU_ADDRESS_BITS == 32
 		"32-bit "
 #endif
 		"with instructions: "
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Array.h b/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
index c4a060ab..5f5f4e2c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
@@ -238,7 +238,7 @@ private:
 	}
 
 	/// Free memory
-	inline void				deallocate()
+	inline void				free()
 	{
 		get_allocator().deallocate(mElements, mCapacity);
 		mElements = nullptr;
@@ -251,7 +251,7 @@ private:
 		if (mElements != nullptr)
 		{
 			clear();
-			deallocate();
+			free();
 		}
 	}
 
@@ -411,7 +411,7 @@ public:
 		if (mElements != nullptr)
 		{
 			if (mSize == 0)
-				deallocate();
+				free();
 			else if (mCapacity > mSize)
 				reallocate(mSize);
 		}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Color.h b/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
index 4995701b..7706ca85 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
@@ -49,20 +49,6 @@ public:
 	/// Get a visually distinct color
 	static Color			sGetDistinctColor(int inIndex);
 
-	/// Get a color value on the gradient from green through yellow to red
-	/// @param inValue Value in the range [0, 1], 0 = green, 0.5 = yellow, 1 = red
-	static Color			sGreenRedGradient(float inValue)
-	{
-		if (inValue < 0.0f)
-			return Color::sGreen;
-		else if (inValue < 0.5f)
-			return Color(uint8(510.0f * inValue), 255, 0);
-		else if (inValue < 1.0f)
-			return Color(255, uint8(510.0f * (1.0f - inValue)), 0);
-		else
-			return Color::sRed;
-	}
-
 	/// Predefined colors
 	static const Color		sBlack;
 	static const Color		sDarkRed;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Core.h b/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
index 687c1fd9..b433a779 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
@@ -6,7 +6,7 @@
 
 // Jolt library version
 #define JPH_VERSION_MAJOR 5
-#define JPH_VERSION_MINOR 5
+#define JPH_VERSION_MINOR 4
 #define JPH_VERSION_PATCH 0
 
 // Determine which features the library was compiled with
@@ -121,9 +121,9 @@
 	// X86 CPU architecture
 	#define JPH_CPU_X86
 	#if defined(__x86_64__) || defined(_M_X64)
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 	#endif
 	#define JPH_USE_SSE
 	#define JPH_VECTOR_ALIGNMENT 16
@@ -171,12 +171,12 @@
 	// ARM CPU architecture
 	#define JPH_CPU_ARM
 	#if defined(__aarch64__) || defined(_M_ARM64)
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 		#define JPH_USE_NEON
 		#define JPH_VECTOR_ALIGNMENT 16
 		#define JPH_DVECTOR_ALIGNMENT 32
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 		#define JPH_VECTOR_ALIGNMENT 8 // 32-bit ARM does not support aligning on the stack on 16 byte boundaries
 		#define JPH_DVECTOR_ALIGNMENT 8
 	#endif
@@ -184,11 +184,11 @@
 	// RISC-V CPU architecture
 	#define JPH_CPU_RISCV
 	#if __riscv_xlen == 64
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 		#define JPH_VECTOR_ALIGNMENT 16
 		#define JPH_DVECTOR_ALIGNMENT 32
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 		#define JPH_VECTOR_ALIGNMENT 16
 		#define JPH_DVECTOR_ALIGNMENT 8
 	#endif
@@ -196,9 +196,9 @@
 	// WebAssembly CPU architecture
 	#define JPH_CPU_WASM
 	#if defined(__wasm64__)
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 	#endif
 	#define JPH_VECTOR_ALIGNMENT 16
 	#define JPH_DVECTOR_ALIGNMENT 32
@@ -211,9 +211,9 @@
 	// PowerPC CPU architecture
 	#define JPH_CPU_PPC
 	#if defined(__powerpc64__)
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 	#endif
 	#ifdef _BIG_ENDIAN
 		#define JPH_CPU_BIG_ENDIAN
@@ -224,16 +224,16 @@
 	// LoongArch CPU architecture
 	#define JPH_CPU_LOONGARCH
 	#if defined(__loongarch64)
-		#define JPH_CPU_ARCH_BITS 64
+		#define JPH_CPU_ADDRESS_BITS 64
 	#else
-		#define JPH_CPU_ARCH_BITS 32
+		#define JPH_CPU_ADDRESS_BITS 32
 	#endif
 	#define JPH_VECTOR_ALIGNMENT 16
 	#define JPH_DVECTOR_ALIGNMENT 8
 #elif defined(__e2k__)
 	// E2K CPU architecture (MCST Elbrus 2000)
 	#define JPH_CPU_E2K
-	#define JPH_CPU_ARCH_BITS 64
+	#define JPH_CPU_ADDRESS_BITS 64
 	#define JPH_VECTOR_ALIGNMENT 16
 	#define JPH_DVECTOR_ALIGNMENT 32
 
@@ -321,15 +321,9 @@
 #else
 	#define JPH_MSVC2019_SUPPRESS_WARNING(w)
 #endif
-#if _MSC_VER >= 1950
-#define JPH_MSVC2026_PLUS_SUPPRESS_WARNING(w) JPH_MSVC_SUPPRESS_WARNING(w)
-#else
-#define JPH_MSVC2026_PLUS_SUPPRESS_WARNING(w)
-#endif
 #else
 #define JPH_MSVC_SUPPRESS_WARNING(w)
 #define JPH_MSVC2019_SUPPRESS_WARNING(w)
-#define JPH_MSVC2026_PLUS_SUPPRESS_WARNING(w)
 #endif
 
 // Disable common warnings triggered by Jolt when compiling with -Wall
@@ -453,7 +447,6 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
 #include <float.h>
 #include <limits.h>
 #include <string.h>
-#include <new>
 #include <utility>
 #include <cmath>
 #include <sstream>
@@ -509,6 +502,7 @@ static_assert(sizeof(uint8) == 1, "Invalid size of uint8");
 static_assert(sizeof(uint16) == 2, "Invalid size of uint16");
 static_assert(sizeof(uint32) == 4, "Invalid size of uint32");
 static_assert(sizeof(uint64) == 8, "Invalid size of uint64");
+static_assert(sizeof(void *) == (JPH_CPU_ADDRESS_BITS == 64? 8 : 4), "Invalid size of pointer" );
 
 // Determine if we want extra debugging code to be active
 #if !defined(NDEBUG) && !defined(JPH_NO_DEBUG)
@@ -534,12 +528,6 @@ static_assert(sizeof(uint64) == 8, "Invalid size of uint64");
 	#error Undefined
 #endif
 
-// Default memory allocation alignment.
-// This define can be overridden in case the user provides an Allocate function that has a different alignment than the platform default.
-#ifndef JPH_DEFAULT_ALLOCATE_ALIGNMENT
-	#define JPH_DEFAULT_ALLOCATE_ALIGNMENT __STDCPP_DEFAULT_NEW_ALIGNMENT__
-#endif
-
 // Cache line size (used for aligning to cache line)
 #ifndef JPH_CACHE_LINE_SIZE
 	#define JPH_CACHE_LINE_SIZE 64
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h b/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
index a295a717..822cb284 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
@@ -842,7 +842,7 @@ public:
 
 private:
 	/// If this allocator needs to fall back to aligned allocations because the type requires it
-	static constexpr bool	cNeedsAlignedAllocate = alignof(KeyValue) > JPH_DEFAULT_ALLOCATE_ALIGNMENT;
+	static constexpr bool	cNeedsAlignedAllocate = alignof(KeyValue) > (JPH_CPU_ADDRESS_BITS == 32? 8 : 16);
 
 	/// Max load factor is cMaxLoadFactorNumerator / cMaxLoadFactorDenominator
 	static constexpr uint64	cMaxLoadFactorNumerator = 7;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/JobSystemThreadPool.cpp b/engine/thirdparty/jolt_physics/Jolt/Core/JobSystemThreadPool.cpp
index bf5c87e6..6d4dc10f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/JobSystemThreadPool.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/JobSystemThreadPool.cpp
@@ -11,7 +11,6 @@
 #ifdef JPH_PLATFORM_WINDOWS
 	JPH_SUPPRESS_WARNING_PUSH
 	JPH_MSVC_SUPPRESS_WARNING(5039) // winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
-	JPH_MSVC2026_PLUS_SUPPRESS_WARNING(4865) // wingdi.h(2806,1): '<unnamed-enum-DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER>': the underlying type will change from 'int' to '__int64' when '/Zc:enumTypes' is specified on the command line
 	#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 	#endif
@@ -20,6 +19,7 @@
 #else
 	#include <windows.h>
 #endif
+
 	JPH_SUPPRESS_WARNING_POP
 #endif
 #ifdef JPH_PLATFORM_LINUX
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Memory.h b/engine/thirdparty/jolt_physics/Jolt/Core/Memory.h
index 5df9781d..4f3dbc7d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Memory.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Memory.h
@@ -8,20 +8,13 @@ JPH_NAMESPACE_BEGIN
 
 #ifndef JPH_DISABLE_CUSTOM_ALLOCATOR
 
-/// Normal memory allocation, must be at least 8 byte aligned on 32 bit platform and 16 byte aligned on 64 bit platform.
-/// Note that you can override JPH_DEFAULT_ALLOCATE_ALIGNMENT if your allocator's alignment is different from the alignment as defined by `__STDCPP_DEFAULT_NEW_ALIGNMENT__`.
+// Normal memory allocation, must be at least 8 byte aligned on 32 bit platform and 16 byte aligned on 64 bit platform
 using AllocateFunction = void *(*)(size_t inSize);
-
-/// Reallocate memory. inBlock can be nullptr in which case it must behave as a memory allocation.
 using ReallocateFunction = void *(*)(void *inBlock, size_t inOldSize, size_t inNewSize);
-
-/// Free memory. inBlock can be nullptr in which case it must do nothing.
 using FreeFunction = void (*)(void *inBlock);
 
-/// Aligned memory allocation.
+// Aligned memory allocation
 using AlignedAllocateFunction = void *(*)(size_t inSize, size_t inAlignment);
-
-/// Free aligned memory. inBlock can be nullptr in which case it must do nothing.
 using AlignedFreeFunction = void (*)(void *inBlock);
 
 // User defined allocation / free functions
@@ -38,7 +31,7 @@ JPH_EXPORT void RegisterDefaultAllocator();
 // It uses the non-aligned version, which on 32 bit platforms usually returns an 8 byte aligned block.
 // We therefore default to 16 byte aligned allocations when the regular new operator is used.
 // See: https://github.com/godotengine/godot/issues/105455#issuecomment-2824311547
-#if defined(JPH_COMPILER_MINGW) && JPH_CPU_ARCH_BITS == 32
+#if defined(JPH_COMPILER_MINGW) && JPH_CPU_ADDRESS_BITS == 32
 	#define JPH_INTERNAL_DEFAULT_ALLOCATE(size) JPH::AlignedAllocate(size, 16)
 	#define JPH_INTERNAL_DEFAULT_FREE(pointer) JPH::AlignedFree(pointer)
 #else
@@ -50,16 +43,12 @@ JPH_EXPORT void RegisterDefaultAllocator();
 #define JPH_OVERRIDE_NEW_DELETE \
 	JPH_INLINE void *operator new (size_t inCount)												{ return JPH_INTERNAL_DEFAULT_ALLOCATE(inCount); } \
 	JPH_INLINE void operator delete (void *inPointer) noexcept									{ JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
-	JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] size_t inSize) noexcept	{ JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
 	JPH_INLINE void *operator new[] (size_t inCount)											{ return JPH_INTERNAL_DEFAULT_ALLOCATE(inCount); } \
 	JPH_INLINE void operator delete[] (void *inPointer) noexcept								{ JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
-	JPH_INLINE void operator delete[] (void *inPointer, [[maybe_unused]] size_t inSize) noexcept{ JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
 	JPH_INLINE void *operator new (size_t inCount, std::align_val_t inAlignment)				{ return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \
-	JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
-	JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] size_t inSize, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
+	JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept	{ JPH::AlignedFree(inPointer); } \
 	JPH_INLINE void *operator new[] (size_t inCount, std::align_val_t inAlignment)				{ return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \
 	JPH_INLINE void operator delete[] (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept	{ JPH::AlignedFree(inPointer); } \
-	JPH_INLINE void operator delete[] (void *inPointer, [[maybe_unused]] size_t inSize, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
 	JPH_INLINE void *operator new ([[maybe_unused]] size_t inCount, void *inPointer) noexcept	{ return inPointer; } \
 	JPH_INLINE void operator delete ([[maybe_unused]] void *inPointer, [[maybe_unused]] void *inPlace) noexcept { /* Do nothing */ } \
 	JPH_INLINE void *operator new[] ([[maybe_unused]] size_t inCount, void *inPointer) noexcept	{ return inPointer; } \
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.h b/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.h
index 89264855..87886531 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.h
@@ -113,9 +113,6 @@ public:
 	/// Remove a thread from being instrumented
 	void						RemoveThread(ProfileThread *inThread);
 
-	/// Get the amount of ticks per second, note that this number will never be fully accurate as the amount of ticks per second may vary with CPU load, so this number is only to be used to give an indication of time for profiling purposes
-	uint64						GetProcessorTicksPerSecond() const;
-
 	/// Singleton instance
 	static Profiler *			sInstance;
 
@@ -170,6 +167,9 @@ private:
 	/// We measure the amount of ticks per second, this function resets the reference time point
 	void						UpdateReferenceTime();
 
+	/// Get the amount of ticks per second, note that this number will never be fully accurate as the amount of ticks per second may vary with CPU load, so this number is only to be used to give an indication of time for profiling purposes
+	uint64						GetProcessorTicksPerSecond() const;
+
 	/// Dump profiling statistics
 	void						DumpInternal();
 	void						DumpChart(const char *inTag, const Threads &inThreads, const KeyToAggregator &inKeyToAggregators, const Aggregators &inAggregators);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/STLAllocator.h b/engine/thirdparty/jolt_physics/Jolt/Core/STLAllocator.h
index da328eed..f9573279 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/STLAllocator.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/STLAllocator.h
@@ -44,7 +44,7 @@ public:
 	inline					STLAllocator(const STLAllocator<T2> &) { }
 
 	/// If this allocator needs to fall back to aligned allocations because the type requires it
-	static constexpr bool	needs_aligned_allocate = alignof(T) > JPH_DEFAULT_ALLOCATE_ALIGNMENT;
+	static constexpr bool	needs_aligned_allocate = alignof(T) > (JPH_CPU_ADDRESS_BITS == 32? 8 : 16);
 
 	/// Allocate memory
 	inline pointer			allocate(size_type inN)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
index ee7c31a9..43a054c6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
@@ -9,8 +9,7 @@
 #ifdef JPH_PLATFORM_WINDOWS
 	JPH_SUPPRESS_WARNING_PUSH
 	JPH_MSVC_SUPPRESS_WARNING(5039) // winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
-	JPH_MSVC2026_PLUS_SUPPRESS_WARNING(4865) // wingdi.h(2806,1): '<unnamed-enum-DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER>': the underlying type will change from 'int' to '__int64' when '/Zc:enumTypes' is specified on the command line
-#ifndef WIN32_LEAN_AND_MEAN
+	#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 	#endif
 #ifndef JPH_COMPILER_MINGW
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h b/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
index 77b69a3b..b3d5496c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
@@ -17,9 +17,6 @@ class JPH_EXPORT TempAllocator : public NonCopyable
 public:
 	JPH_OVERRIDE_NEW_DELETE
 
-	/// If this allocator needs to fall back to aligned allocations because JPH_RVECTOR_ALIGNMENT is bigger than the platform default
-	static constexpr bool			needs_aligned_allocate = JPH_RVECTOR_ALIGNMENT > JPH_DEFAULT_ALLOCATE_ALIGNMENT;
-
 	/// Destructor
 	virtual							~TempAllocator() = default;
 
@@ -37,22 +34,17 @@ public:
 	JPH_OVERRIDE_NEW_DELETE
 
 	/// Constructs the allocator with a maximum allocatable size of inSize
-	explicit						TempAllocatorImpl(size_t inSize) : mSize(inSize)
+	explicit						TempAllocatorImpl(size_t inSize) :
+		mBase(static_cast<uint8 *>(AlignedAllocate(inSize, JPH_RVECTOR_ALIGNMENT))),
+		mSize(inSize)
 	{
-		if constexpr (needs_aligned_allocate)
-			mBase = static_cast<uint8 *>(AlignedAllocate(inSize, JPH_RVECTOR_ALIGNMENT));
-		else
-			mBase = static_cast<uint8 *>(JPH::Allocate(inSize));
 	}
 
 	/// Destructor, frees the block
 	virtual							~TempAllocatorImpl() override
 	{
 		JPH_ASSERT(mTop == 0);
-		if constexpr (needs_aligned_allocate)
-			AlignedFree(mBase);
-		else
-			JPH::Free(mBase);
+		AlignedFree(mBase);
 	}
 
 	// See: TempAllocator
@@ -140,27 +132,14 @@ public:
 	// See: TempAllocator
 	virtual void *					Allocate(uint inSize) override
 	{
-		if (inSize > 0)
-		{
-			if constexpr (needs_aligned_allocate)
-				return AlignedAllocate(inSize, JPH_RVECTOR_ALIGNMENT);
-			else
-				return JPH::Allocate(inSize);
-		}
-		else
-			return nullptr;
+		return inSize > 0? AlignedAllocate(inSize, JPH_RVECTOR_ALIGNMENT) : nullptr;
 	}
 
 	// See: TempAllocator
 	virtual void					Free(void *inAddress, [[maybe_unused]] uint inSize) override
 	{
 		if (inAddress != nullptr)
-		{
-			if constexpr (needs_aligned_allocate)
-				AlignedFree(inAddress);
-			else
-				JPH::Free(inAddress);
-		}
+			AlignedFree(inAddress);
 	}
 };
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.cpp b/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.cpp
index 133e1cc3..d0814009 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.cpp
@@ -9,8 +9,7 @@
 #if defined(JPH_PLATFORM_WINDOWS)
 	JPH_SUPPRESS_WARNING_PUSH
 	JPH_MSVC_SUPPRESS_WARNING(5039) // winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
-	JPH_MSVC2026_PLUS_SUPPRESS_WARNING(4865) // wingdi.h(2806,1): '<unnamed-enum-DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER>': the underlying type will change from 'int' to '__int64' when '/Zc:enumTypes' is specified on the command line
-#ifndef WIN32_LEAN_AND_MEAN
+	#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 	#endif
 #ifndef JPH_COMPILER_MINGW
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.h b/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.h
index a0d427c3..22b47c1e 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/TickCounter.h
@@ -38,7 +38,7 @@ JPH_INLINE uint64 GetProcessorTickCount()
 	asm volatile("mrs %0, cntvct_el0" : "=r" (val));
 	return val;
 #elif defined(JPH_CPU_LOONGARCH)
-	#if JPH_CPU_ARCH_BITS == 64
+	#if JPH_CPU_ADDRESS_BITS == 64
 		__drdtime_t t = __rdtime_d();
 		return t.dvalue;
 	#else
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
index 87696bb9..31009520 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
@@ -542,7 +542,7 @@ public:
 			AddConvexRadius add_convex_b(inB, inConvexRadiusB);
 			TransformedConvexObject transformed_a(inStart, add_convex_a);
 			if (!GetPenetrationDepthStepEPA(transformed_a, add_convex_b, inPenetrationTolerance, outContactNormal, outPointA, outPointB))
-				outContactNormal = inDirection; // Failed to get the deepest point, use points returned by GJK and use cast direction as normal
+				return false;
 		}
 		else if (contact_normal_invalid)
 		{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
index ddbfd342..bd40c687 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
@@ -871,8 +871,6 @@ uint32 Vec3::CompressUnitVector() const
 	constexpr float cOneOverSqrt2 = 0.70710678f;
 	constexpr uint cNumBits = 14;
 	constexpr uint cMask = (1 << cNumBits) - 1;
-	constexpr uint cMaxValue = cMask - 1; // Need odd number of buckets to quantize to or else we can't encode 0
-	constexpr float cScale = float(cMaxValue) / (2.0f * cOneOverSqrt2);
 
 	// Store sign bit
 	Vec3 v = *this;
@@ -888,7 +886,7 @@ uint32 Vec3::CompressUnitVector() const
 	value |= max_element << 29;
 
 	// Store the other two components in a compressed format
-	UVec4 compressed = Vec3::sClamp((v + Vec3::sReplicate(cOneOverSqrt2)) * cScale + Vec3::sReplicate(0.5f), Vec3::sZero(), Vec3::sReplicate(cMaxValue)).ToInt();
+	UVec4 compressed = Vec3::sClamp((v + Vec3::sReplicate(cOneOverSqrt2)) * (float(cMask) / (2.0f * cOneOverSqrt2)) + Vec3::sReplicate(0.5f), Vec3::sZero(), Vec3::sReplicate(cMask)).ToInt();
 	switch (max_element)
 	{
 	case 0:
@@ -910,11 +908,9 @@ Vec3 Vec3::sDecompressUnitVector(uint32 inValue)
 	constexpr float cOneOverSqrt2 = 0.70710678f;
 	constexpr uint cNumBits = 14;
 	constexpr uint cMask = (1u << cNumBits) - 1;
-	constexpr uint cMaxValue = cMask - 1; // Need odd number of buckets to quantize to or else we can't encode 0
-	constexpr float cScale = 2.0f * cOneOverSqrt2 / float(cMaxValue);
 
 	// Restore two components
-	Vec3 v = Vec3(UVec4(inValue & cMask, (inValue >> cNumBits) & cMask, 0, 0).ToFloat()) * cScale - Vec3(cOneOverSqrt2, cOneOverSqrt2, 0.0f);
+	Vec3 v = Vec3(UVec4(inValue & cMask, (inValue >> cNumBits) & cMask, 0, 0).ToFloat()) * (2.0f * cOneOverSqrt2 / float(cMask)) - Vec3(cOneOverSqrt2, cOneOverSqrt2, 0.0f);
 	JPH_ASSERT(v.GetZ() == 0.0f);
 
 	// Restore the highest component
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
index 0954fd04..392c2668 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
@@ -1072,8 +1072,6 @@ uint32 Vec4::CompressUnitVector() const
 	constexpr float cOneOverSqrt2 = 0.70710678f;
 	constexpr uint cNumBits = 9;
 	constexpr uint cMask = (1 << cNumBits) - 1;
-	constexpr uint cMaxValue = cMask - 1; // Need odd number of buckets to quantize to or else we can't encode 0
-	constexpr float cScale = float(cMaxValue) / (2.0f * cOneOverSqrt2);
 
 	// Store sign bit
 	Vec4 v = *this;
@@ -1089,7 +1087,7 @@ uint32 Vec4::CompressUnitVector() const
 	value |= max_element << 29;
 
 	// Store the other three components in a compressed format
-	UVec4 compressed = Vec4::sClamp((v + Vec4::sReplicate(cOneOverSqrt2)) * cScale + Vec4::sReplicate(0.5f), Vec4::sZero(), Vec4::sReplicate(cMaxValue)).ToInt();
+	UVec4 compressed = Vec4::sClamp((v + Vec4::sReplicate(cOneOverSqrt2)) * (float(cMask) / (2.0f * cOneOverSqrt2)) + Vec4::sReplicate(0.5f), Vec4::sZero(), Vec4::sReplicate(cMask)).ToInt();
 	switch (max_element)
 	{
 	case 0:
@@ -1116,11 +1114,9 @@ Vec4 Vec4::sDecompressUnitVector(uint32 inValue)
 	constexpr float cOneOverSqrt2 = 0.70710678f;
 	constexpr uint cNumBits = 9;
 	constexpr uint cMask = (1u << cNumBits) - 1;
-	constexpr uint cMaxValue = cMask - 1; // Need odd number of buckets to quantize to or else we can't encode 0
-	constexpr float cScale = 2.0f * cOneOverSqrt2 / float(cMaxValue);
 
 	// Restore three components
-	Vec4 v = Vec4(UVec4(inValue & cMask, (inValue >> cNumBits) & cMask, (inValue >> (2 * cNumBits)) & cMask, 0).ToFloat()) * cScale - Vec4(cOneOverSqrt2, cOneOverSqrt2, cOneOverSqrt2, 0.0f);
+	Vec4 v = Vec4(UVec4(inValue & cMask, (inValue >> cNumBits) & cMask, (inValue >> (2 * cNumBits)) & cMask, 0).ToFloat()) * (2.0f * cOneOverSqrt2 / float(cMask)) - Vec4(cOneOverSqrt2, cOneOverSqrt2, cOneOverSqrt2, 0.0f);
 	JPH_ASSERT(v.GetW() == 0.0f);
 
 	// Restore the highest component
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
index fe5249c3..44d71eb9 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
@@ -178,7 +178,7 @@ public:
 	/// If you want the body to wake up when it is sleeping, use BodyInterface::AddForce instead.
 	inline void				AddForce(Vec3Arg inForce)										{ JPH_ASSERT(IsDynamic()); (Vec3::sLoadFloat3Unsafe(mMotionProperties->mForce) + inForce).StoreFloat3(&mMotionProperties->mForce); }
 
-	/// Add force (unit: N) at world space position inPosition for the next time step, will be reset after the next call to PhysicsSystem::Update.
+	/// Add force (unit: N) at inPosition for the next time step, will be reset after the next call to PhysicsSystem::Update.
 	/// If you want the body to wake up when it is sleeping, use BodyInterface::AddForce instead.
 	inline void				AddForce(Vec3Arg inForce, RVec3Arg inPosition);
 
@@ -444,7 +444,7 @@ private:
 	// 122 bytes up to here (64-bit mode, single precision, 16-bit ObjectLayer)
 };
 
-static_assert(sizeof(void *) != 8 || JPH_RVECTOR_ALIGNMENT < 16 || sizeof(Body) == JPH_IF_SINGLE_PRECISION_ELSE(128, 160), "Body size is incorrect");
+static_assert(JPH_CPU_ADDRESS_BITS != 64 || JPH_RVECTOR_ALIGNMENT < 16 || sizeof(Body) == JPH_IF_SINGLE_PRECISION_ELSE(128, 160), "Body size is incorrect");
 static_assert(alignof(Body) == max(JPH_VECTOR_ALIGNMENT, JPH_RVECTOR_ALIGNMENT), "Body should properly align");
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyCreationSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyCreationSettings.h
index 898b8e40..8949b2ec 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyCreationSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyCreationSettings.h
@@ -102,8 +102,8 @@ public:
 	bool					mAllowSleeping = true;											///< If this body can go to sleep or not
 	float					mFriction = 0.2f;												///< Friction of the body (dimensionless number, usually between 0 and 1, 0 = no friction, 1 = friction force equals force that presses the two bodies together). Note that bodies can have negative friction but the combined friction (see PhysicsSystem::SetCombineFriction) should never go below zero.
 	float					mRestitution = 0.0f;											///< Restitution of body (dimensionless number, usually between 0 and 1, 0 = completely inelastic collision response, 1 = completely elastic collision response). Note that bodies can have negative restitution but the combined restitution (see PhysicsSystem::SetCombineRestitution) should never go below zero.
-	float					mLinearDamping = 0.05f;											///< Linear damping: dv/dt = -c * v. c. Value should be zero or positive and is usually close to 0.
-	float					mAngularDamping = 0.05f;										///< Angular damping: dw/dt = -c * w. c. Value should be zero or positive and is usually close to 0.
+	float					mLinearDamping = 0.05f;											///< Linear damping: dv/dt = -c * v. c must be between 0 and 1 but is usually close to 0.
+	float					mAngularDamping = 0.05f;										///< Angular damping: dw/dt = -c * w. c must be between 0 and 1 but is usually close to 0.
 	float					mMaxLinearVelocity = 500.0f;									///< Maximum linear velocity that this body can reach (m/s)
 	float					mMaxAngularVelocity = 0.25f * JPH_PI * 60.0f;					///< Maximum angular velocity that this body can reach (rad/s)
 	float					mGravityFactor = 1.0f;											///< Value to multiply gravity with for this body
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
index d30bfe57..4a079937 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
@@ -139,7 +139,7 @@ void BodyInterface::AddBody(const BodyID &inBodyID, EActivation inActivationMode
 void BodyInterface::RemoveBody(const BodyID &inBodyID)
 {
 	BodyLockWrite lock(*mBodyLockInterface, inBodyID);
-	if (lock.SucceededAndIsInBroadPhase())
+	if (lock.Succeeded())
 	{
 		const Body &body = lock.GetBody();
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
index f7c3032c..cae78b24 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
@@ -144,8 +144,8 @@ public:
 	void						ActivateBodiesInAABox(const AABox &inBox, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter);
 	void						DeactivateBody(const BodyID &inBodyID);
 	void						DeactivateBodies(const BodyID *inBodyIDs, int inNumber);
-	bool						IsActive(const BodyID &inBodyID) const; ///< Checks if a body is currently actively simulating
-	void						ResetSleepTimer(const BodyID &inBodyID); ///< @see Body::ResetSleepTimer
+	bool						IsActive(const BodyID &inBodyID) const;
+	void						ResetSleepTimer(const BodyID &inBodyID);
 	///@}
 
 	/// Create a two body constraint
@@ -178,8 +178,8 @@ public:
 
 	///@name Object layer of a body
 	///@{
-	void						SetObjectLayer(const BodyID &inBodyID, ObjectLayer inLayer); ///< The collision layer this body belongs to (determines if two objects can collide)
-	ObjectLayer					GetObjectLayer(const BodyID &inBodyID) const; ///< @see Body::GetObjectLayer
+	void						SetObjectLayer(const BodyID &inBodyID, ObjectLayer inLayer);
+	ObjectLayer					GetObjectLayer(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Position and rotation of a body
@@ -189,11 +189,11 @@ public:
 	void						GetPositionAndRotation(const BodyID &inBodyID, RVec3 &outPosition, Quat &outRotation) const;
 	void						SetPosition(const BodyID &inBodyID, RVec3Arg inPosition, EActivation inActivationMode);
 	RVec3						GetPosition(const BodyID &inBodyID) const;
-	RVec3						GetCenterOfMassPosition(const BodyID &inBodyID) const; ///< @see Body::GetCenterOfMassPosition
+	RVec3						GetCenterOfMassPosition(const BodyID &inBodyID) const;
 	void						SetRotation(const BodyID &inBodyID, QuatArg inRotation, EActivation inActivationMode);
 	Quat						GetRotation(const BodyID &inBodyID) const;
-	RMat44						GetWorldTransform(const BodyID &inBodyID) const; ///< @see Body::GetWorldTransform
-	RMat44						GetCenterOfMassTransform(const BodyID &inBodyID) const; ///< @see Body::GetCenterOfMassTransform
+	RMat44						GetWorldTransform(const BodyID &inBodyID) const;
+	RMat44						GetCenterOfMassTransform(const BodyID &inBodyID) const;
 	///@}
 
 	/// Set velocity of body such that it will be positioned at inTargetPosition/Rotation in inDeltaTime seconds (will activate body if needed)
@@ -203,13 +203,13 @@ public:
 	/// Note that the linear velocity is the velocity of the center of mass, which may not coincide with the position of your object, to correct for this: \f$VelocityCOM = Velocity - AngularVelocity \times ShapeCOM\f$
 	void						SetLinearAndAngularVelocity(const BodyID &inBodyID, Vec3Arg inLinearVelocity, Vec3Arg inAngularVelocity);
 	void						GetLinearAndAngularVelocity(const BodyID &inBodyID, Vec3 &outLinearVelocity, Vec3 &outAngularVelocity) const;
-	void						SetLinearVelocity(const BodyID &inBodyID, Vec3Arg inLinearVelocity); ///< @see Body::SetLinearVelocity
-	Vec3						GetLinearVelocity(const BodyID &inBodyID) const; ///< @see Body::GetLinearVelocity
+	void						SetLinearVelocity(const BodyID &inBodyID, Vec3Arg inLinearVelocity);
+	Vec3						GetLinearVelocity(const BodyID &inBodyID) const;
 	void						AddLinearVelocity(const BodyID &inBodyID, Vec3Arg inLinearVelocity); ///< Add velocity to current velocity
 	void						AddLinearAndAngularVelocity(const BodyID &inBodyID, Vec3Arg inLinearVelocity, Vec3Arg inAngularVelocity); ///< Add linear and angular to current velocities
-	void						SetAngularVelocity(const BodyID &inBodyID, Vec3Arg inAngularVelocity); ///< @see Body::SetAngularVelocity
-	Vec3						GetAngularVelocity(const BodyID &inBodyID) const; ///< @see Body::GetAngularVelocity
-	Vec3						GetPointVelocity(const BodyID &inBodyID, RVec3Arg inPoint) const; ///< Velocity of point inPoint (in world space, e.g. on the surface of the body) of the body. @see Body::GetPointVelocity
+	void						SetAngularVelocity(const BodyID &inBodyID, Vec3Arg inAngularVelocity);
+	Vec3						GetAngularVelocity(const BodyID &inBodyID) const;
+	Vec3						GetPointVelocity(const BodyID &inBodyID, RVec3Arg inPoint) const; ///< Velocity of point inPoint (in world space, e.g. on the surface of the body) of the body
 
 	/// Set the complete motion state of a body.
 	/// Note that the linear velocity is the velocity of the center of mass, which may not coincide with the position of your object, to correct for this: \f$VelocityCOM = Velocity - AngularVelocity \times ShapeCOM\f$
@@ -217,86 +217,86 @@ public:
 
 	///@name Add forces to the body. Note that you should add a body to the physics system before applying forces or torques.
 	///@{
-	void						AddForce(const BodyID &inBodyID, Vec3Arg inForce, EActivation inActivationMode = EActivation::Activate); ///< @see Body::AddForce
-	void						AddForce(const BodyID &inBodyID, Vec3Arg inForce, RVec3Arg inPoint, EActivation inActivationMode = EActivation::Activate); ///< Applied at world space position inPoint. @see Body::AddForce
-	void						AddTorque(const BodyID &inBodyID, Vec3Arg inTorque, EActivation inActivationMode = EActivation::Activate); ///< @see Body::AddTorque
+	void						AddForce(const BodyID &inBodyID, Vec3Arg inForce, EActivation inActivationMode = EActivation::Activate); ///< See Body::AddForce
+	void						AddForce(const BodyID &inBodyID, Vec3Arg inForce, RVec3Arg inPoint, EActivation inActivationMode = EActivation::Activate); ///< Applied at inPoint
+	void						AddTorque(const BodyID &inBodyID, Vec3Arg inTorque, EActivation inActivationMode = EActivation::Activate); ///< See Body::AddTorque
 	void						AddForceAndTorque(const BodyID &inBodyID, Vec3Arg inForce, Vec3Arg inTorque, EActivation inActivationMode = EActivation::Activate); ///< A combination of Body::AddForce and Body::AddTorque
 	///@}
 
 	///@name Add an impulse to the body. Note that you should add a body to the physics system before applying impulses.
 	///@{
-	void						AddImpulse(const BodyID &inBodyID, Vec3Arg inImpulse); ///< Applied at center of mass. @see Body::AddImpulse
-	void						AddImpulse(const BodyID &inBodyID, Vec3Arg inImpulse, RVec3Arg inPoint); ///< Applied at world space position inPoint. @see Body::AddImpulse
-	void						AddAngularImpulse(const BodyID &inBodyID, Vec3Arg inAngularImpulse); ///< @see Body::AddAngularImpulse
-	bool						ApplyBuoyancyImpulse(const BodyID &inBodyID, RVec3Arg inSurfacePosition, Vec3Arg inSurfaceNormal, float inBuoyancy, float inLinearDrag, float inAngularDrag, Vec3Arg inFluidVelocity, Vec3Arg inGravity, float inDeltaTime); ///< @see Body::ApplyBuoyancyImpulse
+	void						AddImpulse(const BodyID &inBodyID, Vec3Arg inImpulse); ///< Applied at center of mass
+	void						AddImpulse(const BodyID &inBodyID, Vec3Arg inImpulse, RVec3Arg inPoint); ///< Applied at inPoint
+	void						AddAngularImpulse(const BodyID &inBodyID, Vec3Arg inAngularImpulse);
+	bool						ApplyBuoyancyImpulse(const BodyID &inBodyID, RVec3Arg inSurfacePosition, Vec3Arg inSurfaceNormal, float inBuoyancy, float inLinearDrag, float inAngularDrag, Vec3Arg inFluidVelocity, Vec3Arg inGravity, float inDeltaTime);
 	///@}
 
 	///@name Body type
 	///@{
-	EBodyType					GetBodyType(const BodyID &inBodyID) const; ///< @see Body::GetBodyType
+	EBodyType					GetBodyType(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Body motion type
 	///@{
-	void						SetMotionType(const BodyID &inBodyID, EMotionType inMotionType, EActivation inActivationMode); ///< @see Body::SetMotionType
-	EMotionType					GetMotionType(const BodyID &inBodyID) const; ///< @see Body::GetMotionType
+	void						SetMotionType(const BodyID &inBodyID, EMotionType inMotionType, EActivation inActivationMode);
+	EMotionType					GetMotionType(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Body motion quality
 	///@{
-	void						SetMotionQuality(const BodyID &inBodyID, EMotionQuality inMotionQuality); ///< How well it detects collisions when it has a high velocity
-	EMotionQuality				GetMotionQuality(const BodyID &inBodyID) const; ///< @see MotionProperties::GetMotionQuality
+	void						SetMotionQuality(const BodyID &inBodyID, EMotionQuality inMotionQuality);
+	EMotionQuality				GetMotionQuality(const BodyID &inBodyID) const;
 	///@}
 
 	/// Get inverse inertia tensor in world space
-	Mat44						GetInverseInertia(const BodyID &inBodyID) const; ///< @see Body::GetInverseInertia
+	Mat44						GetInverseInertia(const BodyID &inBodyID) const;
 
 	///@name Restitution
 	///@{
-	void						SetRestitution(const BodyID &inBodyID, float inRestitution); ///< @see Body::SetRestitution
-	float						GetRestitution(const BodyID &inBodyID) const; ///< @see Body::GetRestitution
+	void						SetRestitution(const BodyID &inBodyID, float inRestitution);
+	float						GetRestitution(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Friction
 	///@{
-	void						SetFriction(const BodyID &inBodyID, float inFriction); ///< @see Body::SetFriction
-	float						GetFriction(const BodyID &inBodyID) const; ///< @see Body::GetFriction
+	void						SetFriction(const BodyID &inBodyID, float inFriction);
+	float						GetFriction(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Gravity factor
 	///@{
-	void						SetGravityFactor(const BodyID &inBodyID, float inGravityFactor); ///< @see MotionProperties::SetGravityFactor
-	float						GetGravityFactor(const BodyID &inBodyID) const; ///< @see MotionProperties::GetGravityFactor
+	void						SetGravityFactor(const BodyID &inBodyID, float inGravityFactor);
+	float						GetGravityFactor(const BodyID &inBodyID) const;
 	///@}
 
     ///@name Max linear velocity
     ///@{
-    void						SetMaxLinearVelocity(const BodyID &inBodyID, float inLinearVelocity); ///< @see MotionProperties::SetMaxLinearVelocity
-    float						GetMaxLinearVelocity(const BodyID &inBodyID) const; ///< @see MotionProperties::GetMaxLinearVelocity
+    void						SetMaxLinearVelocity(const BodyID &inBodyID, float inLinearVelocity);
+    float						GetMaxLinearVelocity(const BodyID &inBodyID) const;
     ///@}
 
     ///@name Max angular velocity
     ///@{
-    void						SetMaxAngularVelocity(const BodyID &inBodyID, float inAngularVelocity); ///< @see MotionProperties::SetMaxAngularVelocity
-    float						GetMaxAngularVelocity(const BodyID &inBodyID) const; ///< @see MotionProperties::GetMaxAngularVelocity
+    void						SetMaxAngularVelocity(const BodyID &inBodyID, float inAngularVelocity);
+    float						GetMaxAngularVelocity(const BodyID &inBodyID) const;
     ///@}
 
 	///@name Manifold reduction
 	///@{
-	void						SetUseManifoldReduction(const BodyID &inBodyID, bool inUseReduction); ///< @see Body::SetUseManifoldReduction
-	bool						GetUseManifoldReduction(const BodyID &inBodyID) const; ///< @see Body::GetUseManifoldReduction
+	void						SetUseManifoldReduction(const BodyID &inBodyID, bool inUseReduction);
+	bool						GetUseManifoldReduction(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Sensor
 	///@{
-	void						SetIsSensor(const BodyID &inBodyID, bool inIsSensor); ///< @see Body::SetIsSensor
-	bool						IsSensor(const BodyID &inBodyID) const; ///< @see Body::IsSensor
+	void						SetIsSensor(const BodyID &inBodyID, bool inIsSensor);
+	bool						IsSensor(const BodyID &inBodyID) const;
 	///@}
 
 	///@name Collision group
 	///@{
-	void						SetCollisionGroup(const BodyID &inBodyID, const CollisionGroup &inCollisionGroup); ///< @see Body::SetCollisionGroup
-	const CollisionGroup &		GetCollisionGroup(const BodyID &inBodyID) const; ///< @see Body::GetCollisionGroup
+	void						SetCollisionGroup(const BodyID &inBodyID, const CollisionGroup &inCollisionGroup);
+	const CollisionGroup &		GetCollisionGroup(const BodyID &inBodyID) const;
 	///@}
 
 	/// Get transform and shape for this body, used to perform collision detection
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
index f6c0584e..ebf524ba 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
@@ -47,8 +47,7 @@ JPH_NAMESPACE_BEGIN
 	}
 #endif
 
-/// @cond INTERNAL
-/// Helper class that combines a body and its motion properties
+// Helper class that combines a body and its motion properties
 class BodyWithMotionProperties : public Body
 {
 public:
@@ -56,10 +55,8 @@ public:
 
 	MotionProperties			mMotionProperties;
 };
-/// @endcond
 
-/// @cond INTERNAL
-/// Helper class that combines a soft body its motion properties and shape
+// Helper class that combines a soft body its motion properties and shape
 class SoftBodyWithMotionPropertiesAndShape : public Body
 {
 public:
@@ -71,7 +68,6 @@ public:
 	SoftBodyMotionProperties	mMotionProperties;
 	SoftBodyShape				mShape;
 };
-/// @endcond
 
 inline void BodyManager::sDeleteBody(Body *inBody)
 {
@@ -610,11 +606,6 @@ void BodyManager::DeactivateBodies(const BodyID *inBodyIDs, int inNumber)
 				// Mark this body as no longer active
 				body.mMotionProperties->mIslandIndex = Body::cInactiveIndex;
 
-			#ifdef JPH_TRACK_SIMULATION_STATS
-				// Reset simulation stats
-				body.mMotionProperties->mSimulationStats.Reset();
-			#endif
-
 				// Reset velocity
 				body.mMotionProperties->mLinearVelocity = Vec3::sZero();
 				body.mMotionProperties->mAngularVelocity = Vec3::sZero();
@@ -1169,52 +1160,4 @@ void BodyManager::ValidateActiveBodyBounds()
 }
 #endif // JPH_DEBUG
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-void BodyManager::ResetSimulationStats()
-{
-	JPH_PROFILE_FUNCTION();
-
-	UniqueLock lock(mActiveBodiesMutex JPH_IF_ENABLE_ASSERTS(, this, EPhysicsLockTypes::ActiveBodiesList));
-
-	for (uint type = 0; type < cBodyTypeCount; ++type)
-		for (BodyID *id = mActiveBodies[type], *id_end = mActiveBodies[type] + mNumActiveBodies[type].load(memory_order_relaxed); id < id_end; ++id)
-		{
-			const Body *body = mBodies[id->GetIndex()];
-			body->mMotionProperties->GetSimulationStats().Reset();
-		}
-}
-
-#ifdef JPH_PROFILE_ENABLED
-void BodyManager::ReportSimulationStats()
-{
-	UniqueLock lock(mActiveBodiesMutex JPH_IF_ENABLE_ASSERTS(, this, EPhysicsLockTypes::ActiveBodiesList));
-
-	Trace("BodyID, IslandIndex, LargeIsland, BroadPhase (us), NarrowPhase (us), VelocityConstraint (us), PositionConstraint (us), UpdateBounds (us), CCD (us), NumContactConstraints, NumVelocitySteps, NumPositionSteps");
-
-	double us_per_tick = 1000000.0 / Profiler::sInstance->GetProcessorTicksPerSecond();
-
-	for (uint type = 0; type < cBodyTypeCount; ++type)
-		for (BodyID *id = mActiveBodies[type], *id_end = mActiveBodies[type] + mNumActiveBodies[type].load(memory_order_relaxed); id < id_end; ++id)
-		{
-			const Body *body = mBodies[id->GetIndex()];
-			const MotionProperties *mp = body->mMotionProperties;
-			const MotionProperties::SimulationStats &stats = mp->GetSimulationStats();
-			Trace("%u, %u, %s, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %u, %u, %u",
-				body->GetID().GetIndex(),
-				mp->GetIslandIndexInternal(),
-				stats.mIsLargeIsland? "True" : "False",
-				double(stats.mBroadPhaseTicks) * us_per_tick,
-				double(stats.mNarrowPhaseTicks) * us_per_tick,
-				double(stats.mVelocityConstraintTicks) * us_per_tick,
-				double(stats.mPositionConstraintTicks) * us_per_tick,
-				double(stats.mUpdateBoundsTicks) * us_per_tick,
-				double(stats.mCCDTicks) * us_per_tick,
-				stats.mNumContactConstraints.load(memory_order_relaxed),
-				stats.mNumVelocitySteps,
-				stats.mNumPositionSteps);
-		}
-}
-#endif // JPH_PROFILE_ENABLED
-#endif // JPH_TRACK_SIMULATION_STATS
-
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.h
index 9b189984..3a91b621 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.h
@@ -40,9 +40,6 @@ using BodyVector = Array<Body *>;
 using BodyIDVector = Array<BodyID>;
 
 /// Class that contains all bodies
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
-/// Its functionality is exposed through PhysicsSystem, BodyInterface, BodyLockRead and BodyLockWrite.
 class JPH_EXPORT BodyManager : public NonCopyable
 {
 public:
@@ -230,16 +227,6 @@ public:
 	};
 
 	/// Draw settings
-	///
-	/// Note that there are several debug drawing features that are not exposed through this interface since they use information
-	/// that is only available deep inside the simulation update and are mostly there to facilitate debugging Jolt. These options
-	/// use DebugRenderer::sInstance to draw.
-	///
-	/// E.g.:
-	/// * To draw contact information, use ContactConstraintManager::sDrawContactManifolds.
-	/// * To draw when continuous collision detection is used, use PhysicsSystem::sDrawMotionQualityLinearCast.
-	/// * To draw what's going on in a CharacterVirtual update, use CharacterVirtual::sDrawConstraints, CharacterVirtual::sDrawWalkStairs and CharacterVirtual::sDrawStickToFloor.
-	/// * To draw the volume of water that interacts with a shape, use Shape::sDrawSubmergedVolumes.
 	struct DrawSettings
 	{
 		bool						mDrawGetSupportFunction = false;				///< Draw the GetSupport() function, used for convex collision detection
@@ -302,16 +289,6 @@ public:
 	void							ValidateActiveBodyBounds();
 #endif // JPH_DEBUG
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	/// Resets the per body simulation stats
-	void							ResetSimulationStats();
-
-#ifdef JPH_PROFILE_ENABLED
-	/// Dump the per body simulation stats to the TTY
-	void							ReportSimulationStats();
-#endif
-#endif
-
 private:
 	/// Increment and get the sequence number of the body
 #ifdef JPH_COMPILER_CLANG
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.h
index 15d19f00..d8a485b6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.h
@@ -76,11 +76,11 @@ public:
 	inline void				ClampLinearVelocity();
 	inline void				ClampAngularVelocity();
 
-	/// Get linear damping: dv/dt = -c * v. c. Value should be zero or positive and is usually close to 0.
+	/// Get linear damping: dv/dt = -c * v. c must be between 0 and 1 but is usually close to 0.
 	inline float			GetLinearDamping() const										{ return mLinearDamping; }
 	void					SetLinearDamping(float inLinearDamping)							{ JPH_ASSERT(inLinearDamping >= 0.0f); mLinearDamping = inLinearDamping; }
 
-	/// Get angular damping: dw/dt = -c * w. c. Value should be zero or positive and is usually close to 0.
+	/// Get angular damping: dw/dt = -c * w. c must be between 0 and 1 but is usually close to 0.
 	inline float			GetAngularDamping() const										{ return mAngularDamping; }
 	void					SetAngularDamping(float inAngularDamping)						{ JPH_ASSERT(inAngularDamping >= 0.0f); mAngularDamping = inAngularDamping; }
 
@@ -186,28 +186,6 @@ public:
 	void					SetNumPositionStepsOverride(uint inN)							{ JPH_ASSERT(inN < 256); mNumPositionStepsOverride = uint8(inN); }
 	uint					GetNumPositionStepsOverride() const								{ return mNumPositionStepsOverride; }
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	/// Stats for this body. These are average for the simulation island the body was part of.
-	struct SimulationStats
-	{
-		void				Reset()															{ mBroadPhaseTicks = 0; mNarrowPhaseTicks.store(0, memory_order_relaxed); mVelocityConstraintTicks = 0; mPositionConstraintTicks = 0; mUpdateBoundsTicks = 0; mCCDTicks.store(0, memory_order_relaxed); mNumContactConstraints.store(0, memory_order_relaxed); mNumVelocitySteps = 0; mNumPositionSteps = 0; mIsLargeIsland = false; }
-
-		uint64				mBroadPhaseTicks = 0;											///< Number of processor ticks spent doing broad phase collision detection
-		atomic<uint64>		mNarrowPhaseTicks = 0;											///< Number of ticks spent doing narrow phase collision detection
-		uint64				mVelocityConstraintTicks = 0;									///< Number of ticks spent solving velocity constraints
-		uint64				mPositionConstraintTicks = 0;									///< Number of ticks spent solving position constraints
-		uint64				mUpdateBoundsTicks = 0;											///< Number of ticks spent updating the broadphase and checking if the body should go to sleep
-		atomic<uint64>		mCCDTicks = 0;													///< Number of ticks spent doing CCD
-		atomic<uint32>		mNumContactConstraints = 0;										///< Number of contact constraints created for this body
-		uint8				mNumVelocitySteps = 0;											///< Number of velocity iterations performed
-		uint8				mNumPositionSteps = 0;											///< Number of position iterations performed
-		bool				mIsLargeIsland = false;											///< If this body was part of a large island
-	};
-
-	const SimulationStats &	GetSimulationStats() const										{ return mSimulationStats; }
-	SimulationStats &		GetSimulationStats()											{ return mSimulationStats; }
-#endif // JPH_TRACK_SIMULATION_STATS
-
 	////////////////////////////////////////////////////////////
 	// FUNCTIONS BELOW THIS LINE ARE FOR INTERNAL USE ONLY
 	////////////////////////////////////////////////////////////
@@ -270,8 +248,8 @@ private:
 	Float3					mForce { 0, 0, 0 };												///< Accumulated world space force (N). Note loaded through intrinsics so ensure that the 4 bytes after this are readable!
 	Float3					mTorque { 0, 0, 0 };											///< Accumulated world space torque (N m). Note loaded through intrinsics so ensure that the 4 bytes after this are readable!
 	float					mInvMass;														///< Inverse mass of the object (1/kg)
-	float					mLinearDamping;													///< Linear damping: dv/dt = -c * v. Value should be zero or positive and is usually close to 0.
-	float					mAngularDamping;												///< Angular damping: dw/dt = -c * w. Value should be zero or positive and is usually close to 0.
+	float					mLinearDamping;													///< Linear damping: dv/dt = -c * v. c must be between 0 and 1 but is usually close to 0.
+	float					mAngularDamping;												///< Angular damping: dw/dt = -c * w. c must be between 0 and 1 but is usually close to 0.
 	float					mMaxLinearVelocity;												///< Maximum linear velocity that this body can reach (m/s)
 	float					mMaxAngularVelocity;											///< Maximum angular velocity that this body can reach (rad/s)
 	float					mGravityFactor;													///< Factor to multiply gravity with
@@ -297,10 +275,6 @@ private:
 	EBodyType				mCachedBodyType;												///< Copied from Body::mBodyType and cached for asserting purposes
 	EMotionType				mCachedMotionType;												///< Copied from Body::mMotionType and cached for asserting purposes
 #endif
-
-#ifdef JPH_TRACK_SIMULATION_STATS
-	SimulationStats			mSimulationStats;
-#endif // JPH_TRACK_SIMULATION_STATS
 };
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
index ef70671c..4f6d63a1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
@@ -81,7 +81,6 @@ public:
 };
 
 /// This class receives callbacks when a virtual character hits something.
-/// Once created, register it on a CharacterVirtual by using the character's SetListener method.
 class JPH_EXPORT CharacterContactListener
 {
 public:
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhase.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhase.h
index c4d9861a..937f9f07 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhase.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhase.h
@@ -95,6 +95,9 @@ public:
 	/// Same as BroadPhaseQuery::CastAABox but can be implemented in a way to take no broad phase locks.
 	virtual void		CastAABoxNoLock(const AABoxCast &inBox, CastShapeBodyCollector &ioCollector, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter) const = 0;
 
+	/// Get the bounding box of all objects in the broadphase
+	virtual AABox		GetBounds() const = 0;
+
 #ifdef JPH_TRACK_BROADPHASE_STATS
 	/// Trace the collected broadphase stats in CSV form.
 	/// This report can be used to judge and tweak the efficiency of the broadphase.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h
index 4fb70f12..10085e66 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuery.h
@@ -48,9 +48,6 @@ public:
 
 	/// Cast a box and add any hits to ioCollector
 	virtual void		CastAABox(const AABoxCast &inBox, CastShapeBodyCollector &ioCollector, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter = { }, const ObjectLayerFilter &inObjectLayerFilter = { }) const = 0;
-
-	/// Get the bounding box of all objects in the broadphase
-	virtual AABox		GetBounds() const = 0;
 };
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
index f3f5d908..a70f3620 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
@@ -1452,10 +1452,6 @@ void QuadTree::FindCollidingPairs(const BodyVector &inBodies, const BodyID *inAc
 		const Body &body1 = *inBodies[b1_id.GetIndex()];
 		JPH_ASSERT(!body1.IsStatic());
 
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		uint64 start_tick = GetProcessorTickCount();
-	#endif
-
 		// Expand the bounding box by the speculative contact distance
 		AABox bounds1 = body1.GetWorldSpaceBounds();
 		bounds1.ExpandBy(Vec3::sReplicate(inSpeculativeContactDistance));
@@ -1525,11 +1521,6 @@ void QuadTree::FindCollidingPairs(const BodyVector &inBodies, const BodyID *inAc
 			--top;
 		}
 		while (top >= 0);
-
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		uint64 num_ticks = GetProcessorTickCount() - start_tick;
-		const_cast<MotionProperties::SimulationStats &>(body1.GetMotionPropertiesUnchecked()->GetSimulationStats()).mBroadPhaseTicks += num_ticks;
-	#endif
 	}
 
 	// Test that the root node was not swapped while finding collision pairs.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CastSphereVsTriangles.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CastSphereVsTriangles.cpp
index 990dfa68..8e101064 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CastSphereVsTriangles.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CastSphereVsTriangles.cpp
@@ -212,9 +212,7 @@ void CastSphereVsTriangles::Cast(Vec3Arg inV0, Vec3Arg inV1, Vec3Arg inV2, uint8
 		// Get contact point and normal
 		uint32 closest_feature;
 		Vec3 q = ClosestPoint::GetClosestPointOnTriangle(v0 - p, v1 - p, v2 - p, closest_feature);
-		// The distance between p and the triangle should be mRadius, but for very long casts,
-		// floating point accuracy can become low enough so that p is on the plane and q is zero
-		Vec3 contact_normal = q.NormalizedOr(back_facing? triangle_normal : -triangle_normal);
+		Vec3 contact_normal = q.Normalized();
 		Vec3 contact_point_ab = p + q;
 		AddHitWithActiveEdgeDetection(v0, v1, v2, back_facing, triangle_normal, inActiveEdges, inSubShapeID2, fraction, contact_point_ab, contact_point_ab, contact_normal);
 	}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
index 134f300d..cfec8139 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
@@ -101,9 +101,6 @@ public:
 
 	/// How backfacing triangles should be treated
 	EBackFaceMode				mBackFaceMode				= EBackFaceMode::IgnoreBackFaces;
-
-	/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared. (unit: meter^2)
-	float						mInternalEdgeRemovalVertexToleranceSq = cDefaultInternalEdgeRemovalVertexToleranceSq;
 };
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h
index a081df2c..a4f7c957 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h
@@ -6,7 +6,6 @@
 
 #include <Jolt/Physics/Collision/CollideShape.h>
 #include <Jolt/Physics/Collision/CollisionDispatch.h>
-#include <Jolt/Physics/Collision/TransformedShape.h>
 #include <Jolt/Core/STLLocalAllocator.h>
 
 JPH_NAMESPACE_BEGIN
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideSoftBodyVerticesVsTriangles.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideSoftBodyVerticesVsTriangles.h
index b5ef0ee1..c91becb6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideSoftBodyVerticesVsTriangles.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideSoftBodyVerticesVsTriangles.h
@@ -14,9 +14,8 @@ class JPH_EXPORT CollideSoftBodyVerticesVsTriangles
 {
 public:
 						CollideSoftBodyVerticesVsTriangles(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale) :
-		mTransform(inCenterOfMassTransform),
-		mInvTransform(mTransform.InversedRotationTranslation()),
-		mScale(inScale),
+		mTransform(inCenterOfMassTransform * Mat44::sScale(inScale)),
+		mInvTransform(mTransform.Inversed()),
 		mNormalSign(ScaleHelpers::IsInsideOut(inScale)? -1.0f : 1.0f)
 	{
 	}
@@ -29,20 +28,15 @@ public:
 
 	JPH_INLINE void		ProcessTriangle(Vec3Arg inV0, Vec3Arg inV1, Vec3Arg inV2)
 	{
-		// Apply the scale to the triangle
-		Vec3 v0 = mScale * inV0;
-		Vec3 v1 = mScale * inV1;
-		Vec3 v2 = mScale * inV2;
-
 		// Get the closest point from the vertex to the triangle
 		uint32 set;
-		Vec3 closest_point = ClosestPoint::GetClosestPointOnTriangle(v0 - mLocalPosition, v1 - mLocalPosition, v2 - mLocalPosition, set);
+		Vec3 closest_point = ClosestPoint::GetClosestPointOnTriangle(inV0 - mLocalPosition, inV1 - mLocalPosition, inV2 - mLocalPosition, set);
 		float dist_sq = closest_point.LengthSq();
 		if (dist_sq < mClosestDistanceSq)
 		{
-			mV0 = v0;
-			mV1 = v1;
-			mV2 = v2;
+			mV0 = inV0;
+			mV1 = inV1;
+			mV2 = inV2;
 			mClosestPoint = closest_point;
 			mClosestDistanceSq = dist_sq;
 			mSet = set;
@@ -61,10 +55,10 @@ public:
 
 			if (mSet == 0b111)
 			{
-				// Closest is interior to the triangle, use plane as collision plane but don't allow more than sTriangleThickness penetration
+				// Closest is interior to the triangle, use plane as collision plane but don't allow more than 0.1 m penetration
 				// because otherwise a triangle half a level a way will have a huge penetration if it is back facing
-				float penetration = triangle_normal.Dot(v0 - ioVertex.GetPosition());
-				if (penetration < sTriangleThickness && ioVertex.UpdatePenetration(penetration))
+				float penetration = min(triangle_normal.Dot(v0 - ioVertex.GetPosition()), 0.1f);
+				if (ioVertex.UpdatePenetration(penetration))
 					ioVertex.SetCollision(Plane::sFromPointAndNormal(v0, triangle_normal), inCollidingShapeIndex);
 			}
 			else
@@ -83,14 +77,8 @@ public:
 		}
 	}
 
-	/// Triangles are considered to have some thickness. This thickness extends backwards along the negative triangle normal.
-	/// Make this value smaller than the smallest 'wall thickness' so that the back side of the triangle doesn't protrude through the other side.
-	/// Make this value too small and tunneling is more likely to occur.
-	static inline float	sTriangleThickness = 0.1f;
-
 	Mat44				mTransform;
 	Mat44				mInvTransform;
-	Vec3				mScale;
 	Vec3				mLocalPosition;
 	Vec3				mV0, mV1, mV2;
 	Vec3				mClosestPoint;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
index eee55022..cec7d7be 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
@@ -31,7 +31,7 @@ class InternalEdgeRemovingCollector : public CollideShapeCollector
 	{
 		for (const Voided &vf : mVoidedFeatures)
 			if (vf.mSubShapeID == inSubShapeID
-				&& inV.IsClose(Vec3::sLoadFloat3Unsafe(vf.mFeature), mVertexToleranceSq))
+				&& inV.IsClose(Vec3::sLoadFloat3Unsafe(vf.mFeature), 1.0e-8f))
 				return true;
 		return false;
 	}
@@ -76,15 +76,13 @@ class InternalEdgeRemovingCollector : public CollideShapeCollector
 
 public:
 	/// Constructor, configures a collector to be called with all the results that do not hit internal edges
-	explicit				InternalEdgeRemovingCollector(CollideShapeCollector &inChainedCollector,
-			float inVertexToleranceSq
+	explicit				InternalEdgeRemovingCollector(CollideShapeCollector &inChainedCollector
 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 			, RVec3Arg inBaseOffset
 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 		) :
 		CollideShapeCollector(inChainedCollector),
-		mChainedCollector(inChainedCollector),
-		mVertexToleranceSq(inVertexToleranceSq)
+		mChainedCollector(inChainedCollector)
 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 			, mBaseOffset(inBaseOffset)
 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
@@ -251,7 +249,7 @@ public:
 		JPH_ASSERT(inCollideShapeSettings.mActiveEdgeMode == EActiveEdgeMode::CollideWithAll); // Won't work without colliding with all edges
 		JPH_ASSERT(inCollideShapeSettings.mCollectFacesMode == ECollectFacesMode::CollectFaces); // Won't work without collecting faces
 
-		InternalEdgeRemovingCollector wrapper(ioCollector, inCollideShapeSettings.mInternalEdgeRemovalVertexToleranceSq
+		InternalEdgeRemovingCollector wrapper(ioCollector
 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 			, inBaseOffset
 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
@@ -273,7 +271,6 @@ private:
 	CollideShapeCollector &	mChainedCollector;
 	Array<Voided, STLLocalAllocator<Voided, cMaxLocalVoidedFeatures>> mVoidedFeatures;
 	Array<CollideShapeResult, STLLocalAllocator<CollideShapeResult, cMaxLocalDelayedResults>> mDelayedResults;
-	float					mVertexToleranceSq;		// Max squared distance to consider a vertex to be the same as another vertex, used to determine if a feature is voided
 #ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 	RVec3					mBaseOffset; 			// Base offset for the query, used to draw the results in the right place
 #endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
index 1a8c2c78..670cee33 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
@@ -301,7 +301,7 @@ void NarrowPhaseQuery::CollideShapeWithInternalEdgeRemoval(const Shape *inShape,
 	settings.mActiveEdgeMode = EActiveEdgeMode::CollideWithAll;
 	settings.mCollectFacesMode = ECollectFacesMode::CollectFaces;
 
-	InternalEdgeRemovingCollector wrapper(ioCollector, settings.mInternalEdgeRemovalVertexToleranceSq
+	InternalEdgeRemovingCollector wrapper(ioCollector
 	#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
 		, inBaseOffset
 	#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.cpp
index 2375bc3b..fc228125 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.cpp
@@ -55,17 +55,11 @@ ShapeSettings::ShapeResult BoxShapeSettings::Create() const
 BoxShape::BoxShape(const BoxShapeSettings &inSettings, ShapeResult &outResult) :
 	ConvexShape(EShapeSubType::Box, inSettings, outResult),
 	mHalfExtent(inSettings.mHalfExtent),
-	mConvexRadius(min(inSettings.mConvexRadius, inSettings.mHalfExtent.ReduceMin()))
+	mConvexRadius(inSettings.mConvexRadius)
 {
-	// Check half extents
-	if (inSettings.mHalfExtent.ReduceMin() < 0.0f)
-	{
-		outResult.SetError("Invalid half extent");
-		return;
-	}
-
 	// Check convex radius
-	if (inSettings.mConvexRadius < 0.0f)
+	if (inSettings.mConvexRadius < 0.0f
+		|| inSettings.mHalfExtent.ReduceMin() < inSettings.mConvexRadius)
 	{
 		outResult.SetError("Invalid convex radius");
 		return;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.h
index 01c9d27a..030dd2db 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/BoxShape.h
@@ -20,7 +20,7 @@ public:
 
 	/// Create a box with half edge length inHalfExtent and convex radius inConvexRadius.
 	/// (internally the convex radius will be subtracted from the half extent so the total box will not grow with the convex radius).
-	explicit				BoxShapeSettings(Vec3Arg inHalfExtent, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShapeSettings(inMaterial), mHalfExtent(inHalfExtent), mConvexRadius(inConvexRadius) { }
+							BoxShapeSettings(Vec3Arg inHalfExtent, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShapeSettings(inMaterial), mHalfExtent(inHalfExtent), mConvexRadius(inConvexRadius) { }
 
 	// See: ShapeSettings
 	virtual ShapeResult		Create() const override;
@@ -41,7 +41,7 @@ public:
 
 	/// Create a box with half edge length inHalfExtent and convex radius inConvexRadius.
 	/// (internally the convex radius will be subtracted from the half extent so the total box will not grow with the convex radius).
-	explicit				BoxShape(Vec3Arg inHalfExtent, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShape(EShapeSubType::Box, inMaterial), mHalfExtent(inHalfExtent), mConvexRadius(min(inConvexRadius, inHalfExtent.ReduceMin())) { JPH_ASSERT(inHalfExtent.ReduceMin() >= 0.0f); JPH_ASSERT(inConvexRadius >= 0.0f); }
+							BoxShape(Vec3Arg inHalfExtent, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShape(EShapeSubType::Box, inMaterial), mHalfExtent(inHalfExtent), mConvexRadius(inConvexRadius) { JPH_ASSERT(inConvexRadius >= 0.0f); JPH_ASSERT(inHalfExtent.ReduceMin() >= inConvexRadius); }
 
 	/// Get half extent of box
 	Vec3					GetHalfExtent() const										{ return mHalfExtent; }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
index 25b8c903..033c3c5c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
@@ -243,7 +243,7 @@ public:
 		// 3 padding bytes left
 	};
 
-	static_assert(sizeof(SubShape) == (sizeof(void *) == 8? 40 : 36), "Compiler added unexpected padding");
+	static_assert(sizeof(SubShape) == (JPH_CPU_ADDRESS_BITS == 64? 40 : 36), "Compiler added unexpected padding");
 
 	using SubShapes = Array<SubShape>;
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
index 19bce761..c6b18600 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
@@ -25,7 +25,7 @@ public:
 	/// Create a convex hull from inPoints and maximum convex radius inMaxConvexRadius, the radius is automatically lowered if the hull requires it.
 	/// (internally this will be subtracted so the total size will not grow with the convex radius).
 							ConvexHullShapeSettings(const Vec3 *inPoints, int inNumPoints, float inMaxConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShapeSettings(inMaterial), mPoints(inPoints, inPoints + inNumPoints), mMaxConvexRadius(inMaxConvexRadius) { }
-	explicit				ConvexHullShapeSettings(const Array<Vec3> &inPoints, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShapeSettings(inMaterial), mPoints(inPoints), mMaxConvexRadius(inConvexRadius) { }
+							ConvexHullShapeSettings(const Array<Vec3> &inPoints, float inConvexRadius = cDefaultConvexRadius, const PhysicsMaterial *inMaterial = nullptr) : ConvexShapeSettings(inMaterial), mPoints(inPoints), mMaxConvexRadius(inConvexRadius) { }
 
 	// See: ShapeSettings
 	virtual ShapeResult		Create() const override;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
index 826df0dd..cb8d4ac9 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
@@ -91,15 +91,15 @@ CylinderShape::CylinderShape(const CylinderShapeSettings &inSettings, ShapeResul
 	ConvexShape(EShapeSubType::Cylinder, inSettings, outResult),
 	mHalfHeight(inSettings.mHalfHeight),
 	mRadius(inSettings.mRadius),
-	mConvexRadius(min(inSettings.mConvexRadius, min(inSettings.mHalfHeight, inSettings.mRadius)))
+	mConvexRadius(inSettings.mConvexRadius)
 {
-	if (inSettings.mHalfHeight < 0.0f)
+	if (inSettings.mHalfHeight < inSettings.mConvexRadius)
 	{
 		outResult.SetError("Invalid height");
 		return;
 	}
 
-	if (inSettings.mRadius < 0.0f)
+	if (inSettings.mRadius < inSettings.mConvexRadius)
 	{
 		outResult.SetError("Invalid radius");
 		return;
@@ -118,10 +118,10 @@ CylinderShape::CylinderShape(float inHalfHeight, float inRadius, float inConvexR
 	ConvexShape(EShapeSubType::Cylinder, inMaterial),
 	mHalfHeight(inHalfHeight),
 	mRadius(inRadius),
-	mConvexRadius(min(inConvexRadius, min(inHalfHeight, inRadius)))
+	mConvexRadius(inConvexRadius)
 {
-	JPH_ASSERT(inHalfHeight >= 0.0f);
-	JPH_ASSERT(inRadius >= 0.0f);
+	JPH_ASSERT(inHalfHeight >= inConvexRadius);
+	JPH_ASSERT(inRadius >= inConvexRadius);
 	JPH_ASSERT(inConvexRadius >= 0.0f);
 }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/EmptyShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/EmptyShape.cpp
index 658c5a34..8cb81f68 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/EmptyShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/EmptyShape.cpp
@@ -23,7 +23,8 @@ JPH_IMPLEMENT_SERIALIZABLE_VIRTUAL(EmptyShapeSettings)
 ShapeSettings::ShapeResult EmptyShapeSettings::Create() const
 {
 	if (mCachedResult.IsEmpty())
-		Ref<Shape> shape = new EmptyShape(*this, mCachedResult);
+		new EmptyShape(*this, mCachedResult);
+
 	return mCachedResult;
 }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
index d859b22e..1d910635 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
@@ -185,9 +185,9 @@ uint32 HeightFieldShapeSettings::CalculateBitsPerSampleForError(float inMaxError
 									// Not accurate enough, increase bits per sample
 									bits_per_sample++;
 
-									// Don't go above cMaxBitsPerSample bits per sample
-									if (bits_per_sample == cMaxBitsPerSample)
-										return cMaxBitsPerSample;
+									// Don't go above 8 bits per sample
+									if (bits_per_sample == 8)
+										return bits_per_sample;
 								}
 							}
 						}
@@ -416,7 +416,7 @@ void HeightFieldShape::StoreMaterialIndices(const HeightFieldShapeSettings &inSe
 
 void HeightFieldShape::CacheValues()
 {
-	mSampleMask = uint16((uint32(1) << mBitsPerSample) - 1);
+	mSampleMask = uint8((uint32(1) << mBitsPerSample) - 1);
 }
 
 void HeightFieldShape::AllocateBuffers()
@@ -424,7 +424,7 @@ void HeightFieldShape::AllocateBuffers()
 	uint num_blocks = GetNumBlocks();
 	uint max_stride = (num_blocks + 1) >> 1;
 	mRangeBlocksSize = sGridOffsets[sGetMaxLevel(num_blocks) - 1] + Square(max_stride);
-	mHeightSamplesSize = (mSampleCount * mSampleCount * mBitsPerSample + 7) / 8 + 2; // Since we read 3 bytes per sample, we need 2 extra bytes of padding
+	mHeightSamplesSize = (mSampleCount * mSampleCount * mBitsPerSample + 7) / 8 + 1;
 	mActiveEdgesSize = (Square(mSampleCount - 1) * 3 + 7) / 8 + 1; // See explanation at HeightFieldShape::CalculateActiveEdges
 
 	JPH_ASSERT(mRangeBlocks == nullptr && mHeightSamples == nullptr && mActiveEdges == nullptr);
@@ -457,9 +457,9 @@ HeightFieldShape::HeightFieldShape(const HeightFieldShapeSettings &inSettings, S
 	}
 
 	// Check bits per sample
-	if (inSettings.mBitsPerSample < 1 || inSettings.mBitsPerSample > HeightFieldShapeConstants::cMaxBitsPerSample)
+	if (inSettings.mBitsPerSample < 1 || inSettings.mBitsPerSample > 8)
 	{
-		outResult.SetError("HeightFieldShape: Bits per sample must be in the range [1, 16]!");
+		outResult.SetError("HeightFieldShape: Bits per sample must be in the range [1, 8]!");
 		return;
 	}
 
@@ -727,10 +727,9 @@ HeightFieldShape::HeightFieldShape(const HeightFieldShapeSettings &inSettings, S
 			uint byte_pos = sample >> 3;
 			uint bit_pos = sample & 0b111;
 			output_value <<= bit_pos;
-			JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
+			JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
 			mHeightSamples[byte_pos] |= uint8(output_value);
 			mHeightSamples[byte_pos + 1] |= uint8(output_value >> 8);
-			mHeightSamples[byte_pos + 2] |= uint8(output_value >> 16);
 			sample += inSettings.mBitsPerSample;
 		}
 
@@ -817,7 +816,7 @@ inline void HeightFieldShape::GetBlockOffsetAndScale(uint inBlockX, uint inBlock
 	outBlockScale = float(block.mMax[n] - block.mMin[n]) / float(mSampleMask);
 }
 
-inline uint16 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
+inline uint8 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
 {
 	JPH_ASSERT(inX < mSampleCount);
 	JPH_ASSERT(inY < mSampleCount);
@@ -828,16 +827,16 @@ inline uint16 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
 	uint bit_pos = sample & 0b111;
 
 	// Fetch the height sample value
-	JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
+	JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
 	const uint8 *height_samples = mHeightSamples + byte_pos;
-	uint32 height_sample = uint32(height_samples[0]) | (uint32(height_samples[1]) << 8) | (uint32(height_samples[2]) << 16);
-	return uint16(height_sample >> bit_pos) & mSampleMask;
+	uint16 height_sample = uint16(height_samples[0]) | uint16(uint16(height_samples[1]) << 8);
+	return uint8(height_sample >> bit_pos) & mSampleMask;
 }
 
 inline Vec3 HeightFieldShape::GetPosition(uint inX, uint inY, float inBlockOffset, float inBlockScale, bool &outNoCollision) const
 {
 	// Get quantized value
-	uint16 height_sample = GetHeightSample(inX, inY);
+	uint8 height_sample = GetHeightSample(inX, inY);
 	outNoCollision = height_sample == mSampleMask;
 
 	// Add 0.5 to the quantized value to minimize the error (see constructor)
@@ -981,7 +980,7 @@ void HeightFieldShape::GetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
 						uint output_y = block_y * mBlockSize + sample_y;
 
 						// Get quantized value
-						uint16 height_sample = GetHeightSample(inX + output_x, inY + output_y);
+						uint8 height_sample = GetHeightSample(inX + output_x, inY + output_y);
 
 						// Dequantize
 						float h = height_sample != mSampleMask? offset + height_sample * scale : cNoCollisionValue;
@@ -1130,7 +1129,7 @@ void HeightFieldShape::SetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
 				{
 					// Quantize height
 					float h = heights[sample_y * heights_stride + sample_x];
-					uint16 quantized_height = h != cNoCollisionValue? uint16(Clamp((int)floor((h - offset) / scale), 0, int(mSampleMask) - 1)) : mSampleMask;
+					uint8 quantized_height = h != cNoCollisionValue? uint8(Clamp((int)floor((h - offset) / scale), 0, int(mSampleMask) - 1)) : mSampleMask;
 
 					// Determine bit position of sample
 					uint sample = ((affected_y + sample_y) * mSampleCount + affected_x + sample_x) * uint(mBitsPerSample);
@@ -1138,14 +1137,13 @@ void HeightFieldShape::SetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
 					uint bit_pos = sample & 0b111;
 
 					// Update the height value sample
-					JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
+					JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
 					uint8 *height_samples = mHeightSamples + byte_pos;
-					uint32 height_sample = uint32(height_samples[0]) | (uint32(height_samples[1]) << 8) | (uint32(height_samples[2]) << 16);
-					height_sample &= ~(uint32(mSampleMask) << bit_pos);
-					height_sample |= uint32(quantized_height) << bit_pos;
+					uint16 height_sample = uint16(height_samples[0]) | uint16(uint16(height_samples[1]) << 8);
+					height_sample &= ~(uint16(mSampleMask) << bit_pos);
+					height_sample |= uint16(quantized_height) << bit_pos;
 					height_samples[0] = uint8(height_sample);
 					height_samples[1] = uint8(height_sample >> 8);
-					height_samples[2] = uint8(height_sample >> 16);
 				}
 		}
 
@@ -2259,12 +2257,8 @@ void HeightFieldShape::CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform,
 
 		JPH_INLINE int	VisitRangeBlock(Vec4Arg inBoundsMinX, Vec4Arg inBoundsMinY, Vec4Arg inBoundsMinZ, Vec4Arg inBoundsMaxX, Vec4Arg inBoundsMaxY, Vec4Arg inBoundsMaxZ, UVec4 &ioProperties, int inStackTop)
 		{
-			// Scale the bounding boxes of this node
-			Vec4 bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z;
-			AABox4Scale(mScale, inBoundsMinX, inBoundsMinY, inBoundsMinZ, inBoundsMaxX, inBoundsMaxY, inBoundsMaxZ, bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z);
-
 			// Get distance to vertex
-			Vec4 dist_sq = AABox4DistanceSqToPoint(mLocalPosition, bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z);
+			Vec4 dist_sq = AABox4DistanceSqToPoint(mLocalPosition, inBoundsMinX, inBoundsMinY, inBoundsMinZ, inBoundsMaxX, inBoundsMaxY, inBoundsMaxZ);
 
 			// Clear distance for invalid bounds
 			dist_sq = Vec4::sSelect(Vec4::sReplicate(FLT_MAX), dist_sq, Vec4::sLessOrEqual(inBoundsMinY, inBoundsMaxY));
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
index c9bdc605..5aa6de88 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
@@ -33,9 +33,6 @@ namespace HeightFieldShapeConstants
 	/// When height samples are converted to 16 bit:
 	constexpr uint16				cNoCollisionValue16 = 0xffff;				///< This is the magic value for 'no collision'
 	constexpr uint16				cMaxHeightValue16 = 0xfffe;					///< This is the maximum allowed height value
-
-	/// Maximum value for HeightFieldShapeSettings::mBitsPerSample
-	constexpr uint32				cMaxBitsPerSample = 16;
 };
 
 /// Class that constructs a HeightFieldShape
@@ -66,7 +63,7 @@ public:
 
 	/// Given mBlockSize, mSampleCount and mHeightSamples, calculate the amount of bits needed to stay below absolute error inMaxError
 	/// @param inMaxError Maximum allowed error in mHeightSamples after compression (note that this does not take mScale.Y into account)
-	/// @return Needed bits per sample in the range [1, 16].
+	/// @return Needed bits per sample in the range [1, 8].
 	uint32							CalculateBitsPerSampleForError(float inMaxError) const;
 
 	/// The height field is a surface defined by: mOffset + mScale * (x, mHeightSamples[y * mSampleCount + x], y).
@@ -86,12 +83,12 @@ public:
 	uint32							mMaterialsCapacity = 0;
 
 	/// The heightfield is divided in blocks of mBlockSize * mBlockSize * 2 triangles and the acceleration structure culls blocks only,
-	/// bigger block sizes reduce memory consumption but also reduce query performance. Valid values are [2, 8], does not need to be
+	/// bigger block sizes reduce memory consumption but also reduce query performance. Sensible values are [2, 8], does not need to be
 	/// a power of 2. Note that at run-time we'll perform one more grid subdivision, so the effective block size is half of what is provided here.
 	uint32							mBlockSize = 2;
 
-	/// How many bits per sample to use to compress the height field. Can be in the range [1, 16].
-	/// Note that each sample is compressed relative to the min/max value of its block of mBlockSize * mBlockSize samples so the effective precision is higher.
+	/// How many bits per sample to use to compress the height field. Can be in the range [1, 8].
+	/// Note that each sample is compressed relative to the min/max value of its block of mBlockSize * mBlockSize pixels so the effective precision is higher.
 	/// Also note that increasing mBlockSize saves more memory than reducing the amount of bits per sample.
 	uint32							mBitsPerSample = 8;
 
@@ -310,7 +307,7 @@ private:
 	inline void						GetBlockOffsetAndScale(uint inBlockX, uint inBlockY, uint inRangeBlockOffset, uint inRangeBlockStride, float &outBlockOffset, float &outBlockScale) const;
 
 	/// Get the height sample at position (inX, inY)
-	inline uint16					GetHeightSample(uint inX, uint inY) const;
+	inline uint8					GetHeightSample(uint inX, uint inY) const;
 
 	/// Faster version of GetPosition when block offset and scale are already known
 	inline Vec3						GetPosition(uint inX, uint inY, float inBlockOffset, float inBlockScale, bool &outNoCollision) const;
@@ -361,7 +358,7 @@ private:
 	uint32							mRangeBlocksSize = 0;						///< Size of mRangeBlocks in elements
 	uint32							mActiveEdgesSize = 0;						///< Size of mActiveEdges in bytes
 	uint8							mBitsPerSample = 8;							///< See HeightFieldShapeSettings::mBitsPerSample
-	uint16							mSampleMask = 0xff;							///< All bits set for a sample: (1 << mBitsPerSample) - 1, used to indicate that there's no collision
+	uint8							mSampleMask = 0xff;							///< All bits set for a sample: (1 << mBitsPerSample) - 1, used to indicate that there's no collision
 	uint16							mMinSample = HeightFieldShapeConstants::cNoCollisionValue16; ///< Min and max value in mHeightSamples quantized to 16 bit, for calculating bounding box
 	uint16							mMaxSample = HeightFieldShapeConstants::cNoCollisionValue16;
 	RangeBlock *					mRangeBlocks = nullptr;						///< Hierarchical grid of range data describing the height variations within 1 block. The grid for level <level> starts at offset sGridOffsets[<level>]
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
index 8297285e..557078ad 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
@@ -849,12 +849,8 @@ void MeshShape::CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3Ar
 
 		JPH_INLINE int	VisitNodes(Vec4Arg inBoundsMinX, Vec4Arg inBoundsMinY, Vec4Arg inBoundsMinZ, Vec4Arg inBoundsMaxX, Vec4Arg inBoundsMaxY, Vec4Arg inBoundsMaxZ, UVec4 &ioProperties, int inStackTop)
 		{
-			// Scale the bounding boxes of this node
-			Vec4 bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z;
-			AABox4Scale(mScale, inBoundsMinX, inBoundsMinY, inBoundsMinZ, inBoundsMaxX, inBoundsMaxY, inBoundsMaxZ, bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z);
-
 			// Get distance to vertex
-			Vec4 dist_sq = AABox4DistanceSqToPoint(mLocalPosition, bounds_min_x, bounds_min_y, bounds_min_z, bounds_max_x, bounds_max_y, bounds_max_z);
+			Vec4 dist_sq = AABox4DistanceSqToPoint(mLocalPosition, inBoundsMinX, inBoundsMinY, inBoundsMinZ, inBoundsMaxX, inBoundsMaxY, inBoundsMaxZ);
 
 			// Sort so that highest values are first (we want to first process closer hits and we process stack top to bottom)
 			return SortReverseAndStore(dist_sq, mClosestDistanceSq, ioProperties, &mDistanceStack[inStackTop]);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
index dc24b7a9..b5a637ed 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
@@ -28,7 +28,7 @@ public:
 									MeshShapeSettings() = default;
 
 	/// Create a mesh shape.
-	explicit						MeshShapeSettings(const TriangleList &inTriangles, PhysicsMaterialList inMaterials = PhysicsMaterialList());
+									MeshShapeSettings(const TriangleList &inTriangles, PhysicsMaterialList inMaterials = PhysicsMaterialList());
 									MeshShapeSettings(VertexList inVertices, IndexedTriangleList inTriangles, PhysicsMaterialList inMaterials = PhysicsMaterialList());
 
 	/// Sanitize the mesh data. Remove duplicate and degenerate triangles. This is called automatically when constructing the MeshShapeSettings with a list of (indexed-) triangles.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
index 0b7d4043..16155bb2 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
@@ -23,6 +23,7 @@ ShapeSettings::ShapeResult MutableCompoundShapeSettings::Create() const
 	// Build a mutable compound shape
 	if (mCachedResult.IsEmpty())
 		Ref<Shape> shape = new MutableCompoundShape(*this, mCachedResult);
+
 	return mCachedResult;
 }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
index 4f65da3f..d34054b6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
@@ -22,7 +22,7 @@ public:
 									PlaneShapeSettings() = default;
 
 	/// Create a plane shape.
-	explicit						PlaneShapeSettings(const Plane &inPlane, const PhysicsMaterial *inMaterial = nullptr, float inHalfExtent = cDefaultHalfExtent) : mPlane(inPlane), mMaterial(inMaterial), mHalfExtent(inHalfExtent) { }
+									PlaneShapeSettings(const Plane &inPlane, const PhysicsMaterial *inMaterial = nullptr, float inHalfExtent = cDefaultHalfExtent) : mPlane(inPlane), mMaterial(inMaterial), mHalfExtent(inHalfExtent) { }
 
 	// See: ShapeSettings
 	virtual ShapeResult				Create() const override;
@@ -46,7 +46,7 @@ public:
 
 	/// Constructor
 									PlaneShape() : Shape(EShapeType::Plane, EShapeSubType::Plane) { }
-	explicit						PlaneShape(const Plane &inPlane, const PhysicsMaterial *inMaterial = nullptr, float inHalfExtent = PlaneShapeSettings::cDefaultHalfExtent) : Shape(EShapeType::Plane, EShapeSubType::Plane), mPlane(inPlane), mMaterial(inMaterial), mHalfExtent(inHalfExtent) { CalculateLocalBounds(); }
+									PlaneShape(const Plane &inPlane, const PhysicsMaterial *inMaterial = nullptr, float inHalfExtent = PlaneShapeSettings::cDefaultHalfExtent) : Shape(EShapeType::Plane, EShapeSubType::Plane), mPlane(inPlane), mMaterial(inMaterial), mHalfExtent(inHalfExtent) { CalculateLocalBounds(); }
 									PlaneShape(const PlaneShapeSettings &inSettings, ShapeResult &outResult);
 
 	/// Get the plane
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.h
index 3e432b65..c3055233 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.h
@@ -18,7 +18,7 @@ public:
 							SphereShapeSettings() = default;
 
 	/// Create a sphere with radius inRadius
-	explicit				SphereShapeSettings(float inRadius, const PhysicsMaterial *inMaterial = nullptr)	: ConvexShapeSettings(inMaterial), mRadius(inRadius) { }
+							SphereShapeSettings(float inRadius, const PhysicsMaterial *inMaterial = nullptr)	: ConvexShapeSettings(inMaterial), mRadius(inRadius) { }
 
 	// See: ShapeSettings
 	virtual ShapeResult		Create() const override;
@@ -38,7 +38,7 @@ public:
 							SphereShape(const SphereShapeSettings &inSettings, ShapeResult &outResult);
 
 	/// Create a sphere with radius inRadius
-	explicit				SphereShape(float inRadius, const PhysicsMaterial *inMaterial = nullptr)			: ConvexShape(EShapeSubType::Sphere, inMaterial), mRadius(inRadius) { JPH_ASSERT(inRadius > 0.0f); }
+							SphereShape(float inRadius, const PhysicsMaterial *inMaterial = nullptr)			: ConvexShape(EShapeSubType::Sphere, inMaterial), mRadius(inRadius) { JPH_ASSERT(inRadius > 0.0f); }
 
 	/// Radius of the sphere
 	float					GetRadius() const																	{ return mRadius; }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
index 9222d25f..bec0c474 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
@@ -55,12 +55,12 @@ ShapeSettings::ShapeResult TaperedCylinderShapeSettings::Create() const
 			settings.mRadius = mTopRadius;
 			settings.mMaterial = mMaterial;
 			settings.mConvexRadius = mConvexRadius;
-			shape = new CylinderShape(settings, mCachedResult);
+			new CylinderShape(settings, mCachedResult);
 		}
 		else
 		{
 			// Normal tapered cylinder shape
-			shape = new TaperedCylinderShape(*this, mCachedResult);
+			new TaperedCylinderShape(*this, mCachedResult);
 		}
 	}
 	return mCachedResult;
@@ -79,7 +79,7 @@ TaperedCylinderShape::TaperedCylinderShape(const TaperedCylinderShapeSettings &i
 	ConvexShape(EShapeSubType::TaperedCylinder, inSettings, outResult),
 	mTopRadius(inSettings.mTopRadius),
 	mBottomRadius(inSettings.mBottomRadius),
-	mConvexRadius(min(inSettings.mConvexRadius, min(inSettings.mTopRadius, inSettings.mBottomRadius)))
+	mConvexRadius(inSettings.mConvexRadius)
 {
 	if (mTopRadius < 0.0f)
 	{
@@ -93,15 +93,27 @@ TaperedCylinderShape::TaperedCylinderShape(const TaperedCylinderShapeSettings &i
 		return;
 	}
 
-	if (mConvexRadius < 0.0f)
+	if (inSettings.mHalfHeight <= 0.0f)
+	{
+		outResult.SetError("Invalid height");
+		return;
+	}
+
+	if (inSettings.mConvexRadius < 0.0f)
 	{
 		outResult.SetError("Invalid convex radius");
 		return;
 	}
 
-	if (inSettings.mHalfHeight <= 0.0f)
+	if (inSettings.mTopRadius < inSettings.mConvexRadius)
 	{
-		outResult.SetError("Invalid height");
+		outResult.SetError("Convex radius must be smaller than convex radius");
+		return;
+	}
+
+	if (inSettings.mBottomRadius < inSettings.mConvexRadius)
+	{
+		outResult.SetError("Convex radius must be smaller than bottom radius");
 		return;
 	}
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/TransformedShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/TransformedShape.h
index 113ff64b..21557b1e 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/TransformedShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/TransformedShape.h
@@ -188,7 +188,7 @@ public:
 	SubShapeIDCreator			mSubShapeIDCreator;							///< Optional sub shape ID creator for the shape (can be used when expanding compound shapes into multiple transformed shapes)
 };
 
-static_assert(sizeof(void *) != 8 || JPH_RVECTOR_ALIGNMENT < 16 || sizeof(TransformedShape) == JPH_IF_SINGLE_PRECISION_ELSE(64, 96), "Not properly packed");
+static_assert(JPH_CPU_ADDRESS_BITS != 64 || JPH_RVECTOR_ALIGNMENT < 16 || sizeof(TransformedShape) == JPH_IF_SINGLE_PRECISION_ELSE(64, 96), "Not properly packed");
 static_assert(alignof(TransformedShape) == max(JPH_VECTOR_ALIGNMENT, JPH_RVECTOR_ALIGNMENT), "Not properly aligned");
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/CalculateSolverSteps.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/CalculateSolverSteps.h
index 2c061158..857eddfb 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/CalculateSolverSteps.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/CalculateSolverSteps.h
@@ -8,8 +8,7 @@
 
 JPH_NAMESPACE_BEGIN
 
-/// @cond INTERNAL
-/// Internal class used to calculate the total number of velocity and position steps
+/// Class used to calculate the total number of velocity and position steps
 class CalculateSolverSteps
 {
 public:
@@ -52,9 +51,7 @@ private:
 	bool						mApplyDefaultVelocity = false;
 	bool						mApplyDefaultPosition = false;
 };
-/// @endcond
 
-/// @cond INTERNAL
 /// Dummy class to replace the steps calculator when we don't need the result
 class DummyCalculateSolverSteps
 {
@@ -65,6 +62,5 @@ public:
 		/* Nothing to do */
 	}
 };
-/// @endcond
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/Constraint.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/Constraint.h
index d5e5baed..a30a838c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/Constraint.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/Constraint.h
@@ -77,7 +77,7 @@ public:
 	/// If this constraint is enabled initially. Use Constraint::SetEnabled to toggle after creation.
 	bool						mEnabled = true;
 
-	/// Priority of the constraint when solving. Higher numbers are more likely to be solved correctly.
+	/// Priority of the constraint when solving. Higher numbers have are more likely to be solved correctly.
 	/// Note that if you want a deterministic simulation and you cannot guarantee the order in which constraints are added/removed, you can make the priority for all constraints unique to get a deterministic ordering.
 	uint32						mConstraintPriority = 0;
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintManager.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintManager.h
index 8dffcda0..e1bfb0f2 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintManager.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintManager.h
@@ -21,9 +21,6 @@ class DebugRenderer;
 using Constraints = Array<Ref<Constraint>>;
 
 /// A constraint manager manages all constraints of the same type
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
-/// Its functionality is exposed through PhysicsSystem and BodyInterface.
 class JPH_EXPORT ConstraintManager : public NonCopyable
 {
 public:
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
index 09dfab49..306ae64f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
@@ -990,14 +990,6 @@ void ContactConstraintManager::GetContactsFromCache(ContactAllocator &ioContactA
 			if (sDrawContactManifolds)
 				constraint.Draw(DebugRenderer::sInstance, Color::sYellow);
 		#endif // JPH_DEBUG_RENDERER
-
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			// Track new contact constraints
-			if (!body1->IsStatic())
-				body1->GetMotionPropertiesUnchecked()->GetSimulationStats().mNumContactConstraints.fetch_add(1, memory_order_relaxed);
-			if (!body2->IsStatic())
-				body2->GetMotionPropertiesUnchecked()->GetSimulationStats().mNumContactConstraints.fetch_add(1, memory_order_relaxed);
-		#endif
 		}
 
 		// Mark contact as persisted so that we won't fire OnContactRemoved callbacks
@@ -1238,14 +1230,6 @@ bool ContactConstraintManager::TemplatedAddContactConstraint(ContactAllocator &i
 		if (sDrawContactManifolds)
 			constraint.Draw(DebugRenderer::sInstance, Color::sOrange);
 	#endif // JPH_DEBUG_RENDERER
-
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		// Track new contact constraints
-		if constexpr (Type1 != EMotionType::Static)
-			inBody1.GetMotionPropertiesUnchecked()->GetSimulationStats().mNumContactConstraints.fetch_add(1, memory_order_relaxed);
-		if constexpr (Type2 != EMotionType::Static)
-			inBody2.GetMotionPropertiesUnchecked()->GetSimulationStats().mNumContactConstraints.fetch_add(1, memory_order_relaxed);
-	#endif
 	}
 	else
 	{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
index dfe5fc8c..73e5d749 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
@@ -24,9 +24,6 @@ JPH_NAMESPACE_BEGIN
 struct PhysicsSettings;
 class PhysicsUpdateContext;
 
-/// A contact constraint manager manages all contacts between two bodies
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
 class JPH_EXPORT ContactConstraintManager : public NonCopyable
 {
 public:
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.cpp
index 60bb930e..c5e9f56f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.cpp
@@ -382,12 +382,6 @@ void IslandBuilder::Finalize(const BodyID *inActiveBodies, uint32 inNumActiveBod
 	SortIslands(inTempAllocator);
 
 	mNumPositionSteps = (uint8 *)inTempAllocator->Allocate(mNumIslands * sizeof(uint8));
-
-#ifdef JPH_TRACK_SIMULATION_STATS
-	mIslandStats = (IslandStats *)inTempAllocator->Allocate(mNumIslands * sizeof(IslandStats));
-	for (uint32 i = 0; i < mNumIslands; ++i)
-		new (&mIslandStats[i]) IslandStats();
-#endif
 }
 
 void IslandBuilder::GetBodiesInIsland(uint32 inIslandIndex, BodyID *&outBodiesBegin, BodyID *&outBodiesEnd) const
@@ -438,10 +432,6 @@ void IslandBuilder::ResetIslands(TempAllocator *inTempAllocator)
 {
 	JPH_PROFILE_FUNCTION();
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	inTempAllocator->Free(mIslandStats, mNumIslands * sizeof(IslandStats));
-#endif
-
 	inTempAllocator->Free(mNumPositionSteps, mNumIslands * sizeof(uint8));
 
 	if (mIslandsSorted != nullptr)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.h b/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.h
index 24eee59d..4c2f097d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/IslandBuilder.h
@@ -15,7 +15,7 @@ class TempAllocator;
 //#define JPH_VALIDATE_ISLAND_BUILDER
 
 /// Keeps track of connected bodies and builds islands for multithreaded velocity/position update
-class JPH_EXPORT IslandBuilder : public NonCopyable
+class IslandBuilder : public NonCopyable
 {
 public:
 	/// Destructor
@@ -54,21 +54,6 @@ public:
 	void					SetNumPositionSteps(uint32 inIslandIndex, uint inNumPositionSteps)	{ JPH_ASSERT(inIslandIndex < mNumIslands); JPH_ASSERT(inNumPositionSteps < 256); mNumPositionSteps[inIslandIndex] = uint8(inNumPositionSteps); }
 	uint					GetNumPositionSteps(uint32 inIslandIndex) const						{ JPH_ASSERT(inIslandIndex < mNumIslands); return mNumPositionSteps[inIslandIndex]; }
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	struct IslandStats
-	{
-		atomic<uint64>		mVelocityConstraintTicks = 0;
-		atomic<uint64>		mPositionConstraintTicks = 0;
-		atomic<uint64>		mUpdateBoundsTicks = 0;
-		uint8				mNumVelocitySteps = 0;
-		uint8				mNumPositionSteps = 0;												///< Tracking this a 2nd time since IslandBuilder::mNumPositionSteps is not filled in when there are no constraints or for large islands.
-		bool				mIsLargeIsland = false;
-	};
-
-	/// Tracks simulation stats per island
-	IslandStats &			GetIslandStats(uint32 inIslandIndex)								{ return mIslandStats[inIslandIndex]; }
-#endif
-
 	/// After you're done calling the three functions above, call this function to free associated data
 	void					ResetIslands(TempAllocator *inTempAllocator);
 
@@ -116,10 +101,6 @@ private:
 
 	uint8 *					mNumPositionSteps = nullptr;					///< Number of position steps for each island
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	IslandStats *			mIslandStats = nullptr;							///< Per island statistics
-#endif
-
 	// Counters
 	uint32					mMaxActiveBodies;								///< Maximum size of the active bodies list (see BodyManager::mActiveBodies)
 	uint32					mNumActiveBodies = 0;							///< Number of active bodies passed to
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/LargeIslandSplitter.h b/engine/thirdparty/jolt_physics/Jolt/Physics/LargeIslandSplitter.h
index 4a7169c6..36f0d614 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/LargeIslandSplitter.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/LargeIslandSplitter.h
@@ -21,8 +21,6 @@ class CalculateSolverSteps;
 ///
 /// This basically implements what is described in: High-Performance Physical Simulations on Next-Generation Architecture with Many Cores by Chen et al.
 /// See: http://web.eecs.umich.edu/~msmelyan/papers/physsim_onmanycore_itj.pdf section "PARALLELIZATION METHODOLOGY"
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
 class LargeIslandSplitter : public NonCopyable
 {
 private:
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
index cbd88d1a..1109e253 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
@@ -16,10 +16,7 @@ constexpr float cDefaultPenetrationTolerance = 1.0e-4f; ///< Stop when there's l
 constexpr float cDefaultConvexRadius = 0.05f;
 
 /// Used by (Tapered)CapsuleShape to determine when supporting face is an edge rather than a point (unit: meter)
-constexpr float cCapsuleProjectionSlop = 0.02f;
-
-/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared (unit: meter^2)
-constexpr float cDefaultInternalEdgeRemovalVertexToleranceSq = 1.0e-8f;
+static constexpr float cCapsuleProjectionSlop = 0.02f;
 
 /// Maximum amount of jobs to allow
 constexpr int cMaxPhysicsJobs = 2048;
@@ -76,9 +73,6 @@ struct PhysicsSettings
 	/// Maximum allowed distance between old and new contact point to preserve contact forces for warm start (units: meter^2)
 	float		mContactPointPreserveLambdaMaxDistSq = Square(0.01f); ///< 1 cm
 
-	/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared. (unit: meter^2)
-	float		mInternalEdgeRemovalVertexToleranceSq = cDefaultInternalEdgeRemovalVertexToleranceSq;
-
 	/// Number of solver velocity iterations to run
 	/// Note that this needs to be >= 2 in order for friction to work (friction is applied using the non-penetration impulse from the previous iteration)
 	uint		mNumVelocitySteps = 10;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
index c2ead513..d4618a75 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
@@ -129,48 +129,6 @@ void PhysicsSystem::RemoveStepListener(PhysicsStepListener *inListener)
 	mStepListeners.pop_back();
 }
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-void PhysicsSystem::GatherIslandStats()
-{
-	JPH_PROFILE_FUNCTION();
-
-	for (uint32 island_idx = 0; island_idx < mIslandBuilder.GetNumIslands(); ++island_idx)
-	{
-		BodyID *bodies_begin, *bodies_end;
-		mIslandBuilder.GetBodiesInIsland(island_idx, bodies_begin, bodies_end);
-		uint64 num_bodies = bodies_end - bodies_begin;
-
-		// Calculate the number of dynamic bodies
-		uint64 num_dynamic_bodies = 0;
-		for (BodyID *body_id = bodies_begin; body_id < bodies_end; ++body_id)
-			if (mBodyManager.GetBody(*body_id).GetMotionType() == EMotionType::Dynamic)
-				++num_dynamic_bodies;
-		num_dynamic_bodies = max<uint64>(num_dynamic_bodies, 1); // Ensure we don't divide by zero
-
-		// Equally distribute the stats over all bodies
-		const IslandBuilder::IslandStats &stats = mIslandBuilder.GetIslandStats(island_idx);
-		uint64 num_velocity_ticks = stats.mVelocityConstraintTicks / num_dynamic_bodies;
-		uint64 num_position_ticks = stats.mPositionConstraintTicks / num_dynamic_bodies;
-		uint64 num_update_bounds_ticks = stats.mUpdateBoundsTicks / num_bodies;
-
-		for (BodyID *body_id = bodies_begin; body_id < bodies_end; ++body_id)
-		{
-			Body &body = mBodyManager.GetBody(*body_id);
-			MotionProperties::SimulationStats &out_stats = body.GetMotionProperties()->GetSimulationStats();
-			out_stats.mNumVelocitySteps = stats.mNumVelocitySteps;
-			out_stats.mNumPositionSteps = stats.mNumPositionSteps;
-			if (body.GetMotionType() == EMotionType::Dynamic)
-			{
-				out_stats.mVelocityConstraintTicks += num_velocity_ticks; // In case of multiple collision steps we accumulate
-				out_stats.mPositionConstraintTicks += num_position_ticks;
-			}
-			out_stats.mUpdateBoundsTicks += num_update_bounds_ticks;
-			out_stats.mIsLargeIsland = stats.mIsLargeIsland;
-		}
-	}
-}
-#endif // JPH_TRACK_SIMULATION_STATS
-
 EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionSteps, TempAllocator *inTempAllocator, JobSystem *inJobSystem)
 {
 	JPH_PROFILE_FUNCTION();
@@ -204,11 +162,6 @@ EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionStep
 		return EPhysicsUpdateError::None;
 	}
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	// Reset accumulated stats on the active bodies
-	mBodyManager.ResetSimulationStats();
-#endif
-
 	// Calculate ratio between current and previous frame delta time to scale initial constraint forces
 	float step_delta_time = inDeltaTime / inCollisionSteps;
 	float warm_start_impulse_ratio = mPhysicsSettings.mConstraintWarmStart && mPreviousStepDeltaTime > 0.0f? step_delta_time / mPreviousStepDeltaTime : 0.0f;
@@ -446,11 +399,6 @@ EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionStep
 						mBodyManager.ValidateActiveBodyBounds();
 					#endif // JPH_DEBUG
 
-					#ifdef JPH_TRACK_SIMULATION_STATS
-						// Gather stats from the islands and distribute them over the bodies
-						GatherIslandStats();
-					#endif
-
 						// Store the number of active bodies at the start of the step
 						next_step->mNumActiveBodiesAtStepStart = mBodyManager.GetNumActiveBodies(EBodyType::RigidBody);
 
@@ -632,11 +580,6 @@ EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionStep
 	mBodyManager.ValidateActiveBodyBounds();
 #endif // JPH_DEBUG
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	// Gather stats from the islands and distribute them over the bodies
-	GatherIslandStats();
-#endif
-
 	// Clear the large island splitter
 	mLargeIslandSplitter.Reset(inTempAllocator);
 
@@ -1080,10 +1023,6 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 	// If the cache hasn't handled this body pair do actual collision detection
 	if (!pair_handled)
 	{
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		uint64 start_ticks = GetProcessorTickCount();
-	#endif
-
 		// Create entry in the cache for this body pair
 		// Needs to happen irrespective if we found a collision or not (we want to remember that no collision was found too)
 		ContactConstraintManager::BodyPairHandle body_pair_handle = mContactManager.AddBodyPair(ioContactAllocator, *body1, *body2);
@@ -1096,7 +1035,6 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 		settings.mActiveEdgeMode = mPhysicsSettings.mCheckActiveEdges? EActiveEdgeMode::CollideOnlyWithActive : EActiveEdgeMode::CollideWithAll;
 		settings.mMaxSeparationDistance = body1->IsSensor() || body2->IsSensor()? 0.0f : mPhysicsSettings.mSpeculativeContactDistance;
 		settings.mActiveEdgeMovementDirection = body1->GetLinearVelocity() - body2->GetLinearVelocity();
-		settings.mInternalEdgeRemovalVertexToleranceSq = mPhysicsSettings.mInternalEdgeRemovalVertexToleranceSq;
 
 		// Create shape filter
 		SimShapeFilterWrapper shape_filter(mSimShapeFilter, body1);
@@ -1324,24 +1262,6 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 
 			constraint_created = collector.mConstraintCreated;
 		}
-
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		// Track time spent processing collision for this body pair
-		uint64 num_ticks = GetProcessorTickCount() - start_ticks;
-		if (body1->GetMotionType() > body2->GetMotionType())
-		{
-			// Assign all ticks to the body with the higher motion type
-			body1->GetMotionProperties()->GetSimulationStats().mNarrowPhaseTicks.fetch_add(num_ticks, memory_order_relaxed);
-		}
-		else
-		{
-			// When two bodies with the same motion type are involved, we give both bodies half the ticks
-			JPH_ASSERT(body1->GetMotionType() == body2->GetMotionType());
-			num_ticks /= 2;
-			body1->GetMotionProperties()->GetSimulationStats().mNarrowPhaseTicks.fetch_add(num_ticks, memory_order_relaxed);
-			body1->GetMotionProperties()->GetSimulationStats().mNarrowPhaseTicks.fetch_add(num_ticks, memory_order_relaxed);
-		}
-	#endif
 	}
 
 	// If a contact constraint was created, we need to do some extra work
@@ -1423,10 +1343,6 @@ void PhysicsSystem::JobSolveVelocityConstraints(PhysicsUpdateContext *ioContext,
 			{
 			case LargeIslandSplitter::EStatus::BatchRetrieved:
 				{
-				#ifdef JPH_TRACK_SIMULATION_STATS
-					uint64 start_tick = GetProcessorTickCount();
-				#endif
-
 					if (first_iteration)
 					{
 						// Iteration 0 is used to warm start the batch (we added 1 to the number of iterations in LargeIslandSplitter::SplitIsland)
@@ -1449,11 +1365,6 @@ void PhysicsSystem::JobSolveVelocityConstraints(PhysicsUpdateContext *ioContext,
 					if (last_iteration)
 						mContactManager.StoreAppliedImpulses(contacts_begin, contacts_end);
 
-				#ifdef JPH_TRACK_SIMULATION_STATS
-					uint64 num_ticks = GetProcessorTickCount() - start_tick;
-					mIslandBuilder.GetIslandStats(mLargeIslandSplitter.GetIslandIndex(split_island_index)).mVelocityConstraintTicks.fetch_add(num_ticks, memory_order_relaxed);
-				#endif
-
 					// We processed work, loop again
 					continue;
 				}
@@ -1503,10 +1414,6 @@ void PhysicsSystem::JobSolveVelocityConstraints(PhysicsUpdateContext *ioContext,
 				continue;
 			}
 
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			uint64 start_tick = GetProcessorTickCount();
-		#endif
-
 			// Sorting is costly but needed for a deterministic simulation, allow the user to turn this off
 			if (mPhysicsSettings.mDeterministicSimulation)
 			{
@@ -1518,46 +1425,30 @@ void PhysicsSystem::JobSolveVelocityConstraints(PhysicsUpdateContext *ioContext,
 			}
 
 			// Split up large islands
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			bool is_large_island = true;
-		#endif
 			CalculateSolverSteps steps_calculator(mPhysicsSettings);
-			if (!mPhysicsSettings.mUseLargeIslandSplitter
-				|| !mLargeIslandSplitter.SplitIsland(island_idx, mIslandBuilder, mBodyManager, mContactManager, active_constraints, steps_calculator))
+			if (mPhysicsSettings.mUseLargeIslandSplitter
+				&& mLargeIslandSplitter.SplitIsland(island_idx, mIslandBuilder, mBodyManager, mContactManager, active_constraints, steps_calculator))
+				continue; // Loop again to try to fetch the newly split island
+
+			// We didn't create a split, just run the solver now for this entire island. Begin by warm starting.
+			ConstraintManager::sWarmStartVelocityConstraints(active_constraints, constraints_begin, constraints_end, warm_start_impulse_ratio, steps_calculator);
+			mContactManager.WarmStartVelocityConstraints(contacts_begin, contacts_end, warm_start_impulse_ratio, steps_calculator);
+			steps_calculator.Finalize();
+
+			// Store the number of position steps for later
+			mIslandBuilder.SetNumPositionSteps(island_idx, steps_calculator.GetNumPositionSteps());
+
+			// Solve velocity constraints
+			for (uint velocity_step = 0; velocity_step < steps_calculator.GetNumVelocitySteps(); ++velocity_step)
 			{
-			#ifdef JPH_TRACK_SIMULATION_STATS
-				is_large_island = false;
-			#endif
-
-				// We didn't create a split, just run the solver now for this entire island. Begin by warm starting.
-				ConstraintManager::sWarmStartVelocityConstraints(active_constraints, constraints_begin, constraints_end, warm_start_impulse_ratio, steps_calculator);
-				mContactManager.WarmStartVelocityConstraints(contacts_begin, contacts_end, warm_start_impulse_ratio, steps_calculator);
-				steps_calculator.Finalize();
-
-				// Store the number of position steps for later
-				mIslandBuilder.SetNumPositionSteps(island_idx, steps_calculator.GetNumPositionSteps());
-
-				// Solve velocity constraints
-				for (uint velocity_step = 0; velocity_step < steps_calculator.GetNumVelocitySteps(); ++velocity_step)
-				{
-					bool applied_impulse = ConstraintManager::sSolveVelocityConstraints(active_constraints, constraints_begin, constraints_end, delta_time);
-					applied_impulse |= mContactManager.SolveVelocityConstraints(contacts_begin, contacts_end);
-					if (!applied_impulse)
-						break;
-				}
-
-				// Save back the lambdas in the contact cache for the warm start of the next physics update
-				mContactManager.StoreAppliedImpulses(contacts_begin, contacts_end);
+				bool applied_impulse = ConstraintManager::sSolveVelocityConstraints(active_constraints, constraints_begin, constraints_end, delta_time);
+				applied_impulse |= mContactManager.SolveVelocityConstraints(contacts_begin, contacts_end);
+				if (!applied_impulse)
+					break;
 			}
 
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			uint64 num_ticks = GetProcessorTickCount() - start_tick;
-			IslandBuilder::IslandStats &stats = mIslandBuilder.GetIslandStats(island_idx);
-			stats.mNumVelocitySteps = (uint8)steps_calculator.GetNumVelocitySteps();
-			stats.mNumPositionSteps = (uint8)steps_calculator.GetNumPositionSteps();
-			stats.mVelocityConstraintTicks.fetch_add(num_ticks, memory_order_relaxed);
-			stats.mIsLargeIsland = is_large_island;
-		#endif
+			// Save back the lambdas in the contact cache for the warm start of the next physics update
+			mContactManager.StoreAppliedImpulses(contacts_begin, contacts_end);
 
 			// We processed work, loop again
 			continue;
@@ -2042,20 +1933,11 @@ void PhysicsSystem::JobFindCCDContacts(const PhysicsUpdateContext *ioContext, Ph
 		// Create shape filter
 		SimShapeFilterWrapper shape_filter(mSimShapeFilter, &body);
 
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		uint64 start_tick = GetProcessorTickCount();
-	#endif
-
 		// Check if we collide with any other body. Note that we use the non-locking interface as we know the broadphase cannot be modified at this point.
 		RShapeCast shape_cast(body.GetShape(), Vec3::sOne(), body.GetCenterOfMassTransform(), ccd_body.mDeltaPosition);
 		CCDBroadPhaseCollector bp_collector(ccd_body, body, shape_cast, settings, shape_filter, np_collector, mBodyManager, ioStep, ioContext->mStepDeltaTime);
 		mBroadPhase->CastAABoxNoLock({ shape_cast.mShapeWorldBounds, shape_cast.mDirection }, bp_collector, broadphase_layer_filter, object_layer_filter);
 
-	#ifdef JPH_TRACK_SIMULATION_STATS
-		uint64 num_ticks = GetProcessorTickCount() - start_tick;
-		const_cast<MotionProperties::SimulationStats &>(body.GetMotionPropertiesUnchecked()->GetSimulationStats()).mCCDTicks.fetch_add(num_ticks, memory_order_relaxed);
-	#endif
-
 		// Check if there was a hit
 		if (ccd_body.mFractionPlusSlop < 1.0f)
 		{
@@ -2520,31 +2402,20 @@ void PhysicsSystem::JobSolvePositionConstraints(PhysicsUpdateContext *ioContext,
 			switch (mLargeIslandSplitter.FetchNextBatch(split_island_index, constraints_begin, constraints_end, contacts_begin, contacts_end, first_iteration))
 			{
 			case LargeIslandSplitter::EStatus::BatchRetrieved:
-				{
-				#ifdef JPH_TRACK_SIMULATION_STATS
-					uint64 start_tick = GetProcessorTickCount();
-				#endif
+				// Solve the batch
+				ConstraintManager::sSolvePositionConstraints(active_constraints, constraints_begin, constraints_end, delta_time, baumgarte);
+				mContactManager.SolvePositionConstraints(contacts_begin, contacts_end);
 
-					// Solve the batch
-					ConstraintManager::sSolvePositionConstraints(active_constraints, constraints_begin, constraints_end, delta_time, baumgarte);
-					mContactManager.SolvePositionConstraints(contacts_begin, contacts_end);
+				// Mark the batch as processed
+				bool last_iteration, final_batch;
+				mLargeIslandSplitter.MarkBatchProcessed(split_island_index, constraints_begin, constraints_end, contacts_begin, contacts_end, last_iteration, final_batch);
 
-					// Mark the batch as processed
-					bool last_iteration, final_batch;
-					mLargeIslandSplitter.MarkBatchProcessed(split_island_index, constraints_begin, constraints_end, contacts_begin, contacts_end, last_iteration, final_batch);
+				// The final batch will update all bounds and check sleeping
+				if (final_batch)
+					CheckSleepAndUpdateBounds(mLargeIslandSplitter.GetIslandIndex(split_island_index), ioContext, ioStep, bodies_to_sleep);
 
-					// The final batch will update all bounds and check sleeping
-					if (final_batch)
-						CheckSleepAndUpdateBounds(mLargeIslandSplitter.GetIslandIndex(split_island_index), ioContext, ioStep, bodies_to_sleep);
-
-				#ifdef JPH_TRACK_SIMULATION_STATS
-					uint64 num_ticks = GetProcessorTickCount() - start_tick;
-					mIslandBuilder.GetIslandStats(mLargeIslandSplitter.GetIslandIndex(split_island_index)).mPositionConstraintTicks.fetch_add(num_ticks, memory_order_relaxed);
-				#endif
-
-					// We processed work, loop again
-					continue;
-				}
+				// We processed work, loop again
+				continue;
 
 			case LargeIslandSplitter::EStatus::WaitingForBatch:
 				break;
@@ -2580,10 +2451,6 @@ void PhysicsSystem::JobSolvePositionConstraints(PhysicsUpdateContext *ioContext,
 				&& num_items >= LargeIslandSplitter::cLargeIslandTreshold)
 				continue;
 
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			uint64 start_tick = GetProcessorTickCount();
-		#endif
-
 			// Check if this island needs solving
 			if (num_items > 0)
 			{
@@ -2598,21 +2465,9 @@ void PhysicsSystem::JobSolvePositionConstraints(PhysicsUpdateContext *ioContext,
 				}
 			}
 
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			// Accumulate time spent in solving position constraints
-			uint64 solve_position_ticks = GetProcessorTickCount();
-			IslandBuilder::IslandStats &stats = mIslandBuilder.GetIslandStats(island_idx);
-			stats.mPositionConstraintTicks.fetch_add(solve_position_ticks - start_tick, memory_order_relaxed);
-		#endif
-
 			// After solving we will update all bounds and check sleeping
 			CheckSleepAndUpdateBounds(island_idx, ioContext, ioStep, bodies_to_sleep);
 
-		#ifdef JPH_TRACK_SIMULATION_STATS
-			// Accumulate time spent in updating bounding box
-			stats.mUpdateBoundsTicks.fetch_add(GetProcessorTickCount() - solve_position_ticks, memory_order_relaxed);
-		#endif
-
 			// We processed work, loop again
 			continue;
 		}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
index cff88d27..8ba7b1e1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
@@ -247,8 +247,7 @@ public:
 	/// - During the ContactListener::OnContactRemoved callback this function can be used to determine if this is the last contact pair between the bodies (function returns false) or if there are other contacts still present (function returns true).
 	bool						WereBodiesInContact(const BodyID &inBody1ID, const BodyID &inBody2ID) const { return mContactManager.WereBodiesInContact(inBody1ID, inBody2ID); }
 
-	/// Get the bounding box of all bodies in the physics system.
-	/// Deprecated: Use GetBroadPhaseQuery().GetBounds() instead.
+	/// Get the bounding box of all bodies in the physics system
 	AABox						GetBounds() const											{ return mBroadPhase->GetBounds(); }
 
 #ifdef JPH_TRACK_BROADPHASE_STATS
@@ -256,11 +255,6 @@ public:
 	void						ReportBroadphaseStats()										{ mBroadPhase->ReportStats(); }
 #endif // JPH_TRACK_BROADPHASE_STATS
 
-#if defined(JPH_TRACK_SIMULATION_STATS) && defined(JPH_PROFILE_ENABLED)
-	/// Dump the per body simulation stats to the TTY
-	void						ReportSimulationStats()										{ mBodyManager.ReportSimulationStats(); }
-#endif
-
 private:
 	using CCDBody = PhysicsUpdateContext::Step::CCDBody;
 
@@ -289,11 +283,6 @@ private:
 	/// Tries to spawn a new FindCollisions job if max concurrency hasn't been reached yet
 	void						TrySpawnJobFindCollisions(PhysicsUpdateContext::Step *ioStep) const;
 
-#ifdef JPH_TRACK_SIMULATION_STATS
-	/// Gather stats from the islands and distribute them over the bodies
-	void						GatherIslandStats();
-#endif
-
 	using ContactAllocator = ContactConstraintManager::ContactAllocator;
 
 	/// Process narrow phase for a single body pair
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.cpp
index 4522ee49..7c60ae6b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.cpp
@@ -8,7 +8,6 @@
 
 JPH_NAMESPACE_BEGIN
 
-/// @cond INTERNAL
 PhysicsUpdateContext::PhysicsUpdateContext(TempAllocator &inTempAllocator) :
 	mTempAllocator(&inTempAllocator),
 	mSteps(inTempAllocator)
@@ -20,6 +19,5 @@ PhysicsUpdateContext::~PhysicsUpdateContext()
 	JPH_ASSERT(mBodyPairs == nullptr);
 	JPH_ASSERT(mActiveConstraints == nullptr);
 }
-/// @endcond
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.h b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.h
index c0987a2f..fe99c46c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsUpdateContext.h
@@ -19,10 +19,7 @@ class Constraint;
 class TempAllocator;
 class SoftBodyUpdateContext;
 
-/// @cond INTERNAL
-/// Internal information used during the PhysicsSystem::Update call
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
+/// Information used during the Update call
 class PhysicsUpdateContext : public NonCopyable
 {
 public:
@@ -171,6 +168,5 @@ public:
 	SoftBodyUpdateContext *	mSoftBodyUpdateContexts = nullptr;						///< Contexts for updating soft bodies
 	atomic<uint>			mSoftBodyToCollide { 0 };								///< Next soft body to take when running SoftBodyCollide jobs
 };
-/// @endcond
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.cpp
index 660eb4da..ec9e3aa4 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.cpp
@@ -190,38 +190,6 @@ bool RagdollSettings::Stabilize()
 	return true;
 }
 
-void RagdollSettings::CalculateConstraintPriorities(uint32 inBasePriority)
-{
-	JPH_ASSERT(inBasePriority + (uint32)mParts.size() > inBasePriority, "Base priority is too high and will cause overflows");
-	JPH_ASSERT(mSkeleton->AreJointsCorrectlyOrdered());
-
-	// Calculate priority for each part. Start with the base priority and increment towards the root
-	Array<uint32> priorities;
-	priorities.resize(mParts.size(), inBasePriority);
-	for (int i = (int)mParts.size() - 1; i >= 0; --i)
-	{
-		uint32 cur_priority = inBasePriority;
-		int j = i;
-		do
-		{
-			priorities[j] = max(priorities[j], cur_priority);
-			cur_priority++;
-
-			j = mSkeleton->GetJoint(j).mParentJointIndex;
-		}
-		while (j != -1);
-	}
-
-	// Copy the priorities to the constraints
-	for (uint i = 0, n = (uint)mParts.size(); i < n; ++i)
-		if (mParts[i].mToParent != nullptr)
-			mParts[i].mToParent->mConstraintPriority = priorities[i];
-
-	// Use the minimum of the priorities of connected bodies for additional constraints
-	for (AdditionalConstraint &constraint : mAdditionalConstraints)
-		constraint.mConstraint->mConstraintPriority = min(priorities[constraint.mBodyIdx[0]], priorities[constraint.mBodyIdx[1]]);
-}
-
 void RagdollSettings::DisableParentChildCollisions(const Mat44 *inJointMatrices, float inMinSeparationDistance)
 {
 	int joint_count = mSkeleton->GetJointCount();
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.h
index ff8e5232..8fe40108 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Ragdoll/Ragdoll.h
@@ -27,11 +27,6 @@ public:
 	/// @return True on success, false on failure.
 	bool								Stabilize();
 
-	/// Initializes the constraint priorities so that constraints near the leaves of the ragdoll have a lower priority
-	/// than constraints near the root of the ragdoll.
-	/// @param inBasePriority The lowest priority that will be used in the ragdoll.
-	void								CalculateConstraintPriorities(uint32 inBasePriority = 0);
-
 	/// After the ragdoll has been fully configured, call this function to automatically create and add a GroupFilterTable collision filter to all bodies
 	/// and configure them so that parent and children don't collide.
 	///
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyCreationSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyCreationSettings.h
index 4a617c11..537e1112 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyCreationSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyCreationSettings.h
@@ -59,7 +59,7 @@ public:
 	CollisionGroup		mCollisionGroup;					///< The collision group this body belongs to (determines if two objects can collide)
 
 	uint32				mNumIterations = 5;					///< Number of solver iterations
-	float				mLinearDamping = 0.1f;				///< Linear damping: dv/dt = -mLinearDamping * v. Value should be zero or positive and is usually close to 0.
+	float				mLinearDamping = 0.1f;				///< Linear damping: dv/dt = -mLinearDamping * v
 	float				mMaxLinearVelocity = 500.0f;		///< Maximum linear velocity that a vertex can reach (m/s)
 	float				mRestitution = 0.0f;				///< Restitution when colliding
 	float				mFriction = 0.2f;					///< Friction coefficient when colliding
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
index c12d5cac..14997a49 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
@@ -130,7 +130,7 @@ public:
 
 		/// Constructor
 						Vertex() = default;
-		explicit		Vertex(const Float3 &inPosition, const Float3 &inVelocity = Float3(0, 0, 0), float inInvMass = 1.0f) : mPosition(inPosition), mVelocity(inVelocity), mInvMass(inInvMass) { }
+						Vertex(const Float3 &inPosition, const Float3 &inVelocity = Float3(0, 0, 0), float inInvMass = 1.0f) : mPosition(inPosition), mVelocity(inVelocity), mInvMass(inInvMass) { }
 
 		Float3			mPosition { 0, 0, 0 };						///< Initial position of the vertex
 		Float3			mVelocity { 0, 0, 0 };						///< Initial velocity of the vertex
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyUpdateContext.h b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyUpdateContext.h
index 9b391070..2f565f56 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyUpdateContext.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyUpdateContext.h
@@ -14,10 +14,7 @@ class SoftBodyMotionProperties;
 class SoftBodyContactListener;
 class SimShapeFilter;
 
-/// @cond INTERNAL
 /// Temporary data used by the update of a soft body
-///
-/// WARNING: This class is an internal part of PhysicsSystem, it has no functions that can be called by users of the library.
 class SoftBodyUpdateContext : public NonCopyable
 {
 public:
@@ -58,6 +55,5 @@ public:
 	Vec3								mDeltaPosition;								///< Delta position of the body in the current time step, should be applied after the update
 	ECanSleep							mCanSleep;									///< Can the body sleep? Should be applied after the update
 };
-/// @endcond
 
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.h
index 5f20c23b..7c222756 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.h
@@ -90,7 +90,7 @@ public:
 	/// @param inObjectLayer Object layer to test collision with
 	/// @param inUp World space up vector, used to avoid colliding with vertical walls.
 	/// @param inMaxSlopeAngle Max angle (rad) that is considered for colliding wheels. This is to avoid colliding with vertical walls.
-	explicit						VehicleCollisionTesterRay(ObjectLayer inObjectLayer, Vec3Arg inUp = Vec3::sAxisY(), float inMaxSlopeAngle = DegreesToRadians(80.0f)) : VehicleCollisionTester(inObjectLayer), mUp(inUp), mCosMaxSlopeAngle(Cos(inMaxSlopeAngle)) { }
+									VehicleCollisionTesterRay(ObjectLayer inObjectLayer, Vec3Arg inUp = Vec3::sAxisY(), float inMaxSlopeAngle = DegreesToRadians(80.0f)) : VehicleCollisionTester(inObjectLayer), mUp(inUp), mCosMaxSlopeAngle(Cos(inMaxSlopeAngle)) { }
 
 	// See: VehicleCollisionTester
 	virtual bool					Collide(PhysicsSystem &inPhysicsSystem, const VehicleConstraint &inVehicleConstraint, uint inWheelIndex, RVec3Arg inOrigin, Vec3Arg inDirection, const BodyID &inVehicleBodyID, Body *&outBody, SubShapeID &outSubShapeID, RVec3 &outContactPosition, Vec3 &outContactNormal, float &outSuspensionLength) const override;
@@ -133,7 +133,7 @@ public:
 	/// Constructor
 	/// @param inObjectLayer Object layer to test collision with
 	/// @param inConvexRadiusFraction Fraction of half the wheel width (or wheel radius if it is smaller) that is used as the convex radius
-	explicit						VehicleCollisionTesterCastCylinder(ObjectLayer inObjectLayer, float inConvexRadiusFraction = 0.1f) : VehicleCollisionTester(inObjectLayer), mConvexRadiusFraction(inConvexRadiusFraction) { JPH_ASSERT(mConvexRadiusFraction >= 0.0f && mConvexRadiusFraction <= 1.0f); }
+									VehicleCollisionTesterCastCylinder(ObjectLayer inObjectLayer, float inConvexRadiusFraction = 0.1f) : VehicleCollisionTester(inObjectLayer), mConvexRadiusFraction(inConvexRadiusFraction) { JPH_ASSERT(mConvexRadiusFraction >= 0.0f && mConvexRadiusFraction <= 1.0f); }
 
 	// See: VehicleCollisionTester
 	virtual bool					Collide(PhysicsSystem &inPhysicsSystem, const VehicleConstraint &inVehicleConstraint, uint inWheelIndex, RVec3Arg inOrigin, Vec3Arg inDirection, const BodyID &inVehicleBodyID, Body *&outBody, SubShapeID &outSubShapeID, RVec3 &outContactPosition, Vec3 &outContactNormal, float &outSuspensionLength) const override;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleEngine.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleEngine.h
index c1cc35f6..29212ffd 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleEngine.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleEngine.h
@@ -36,7 +36,7 @@ public:
 	float					mMaxRPM = 6000.0f;							///< Max amount of revolutions per minute (rpm) the engine can generate
 	LinearCurve				mNormalizedTorque;							///< Y-axis: Curve that describes a ratio of the max torque the engine can produce (0 = 0, 1 = mMaxTorque). X-axis: the fraction of the RPM of the engine (0 = mMinRPM, 1 = mMaxRPM)
 	float					mInertia = 0.5f;							///< Moment of inertia (kg m^2) of the engine
-	float					mAngularDamping = 0.2f;						///< Angular damping factor of the wheel: dw/dt = -c * w. Value should be zero or positive and is usually close to 0.
+	float					mAngularDamping = 0.2f;						///< Angular damping factor of the wheel: dw/dt = -c * w
 };
 
 /// Runtime data for engine
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/WheeledVehicleController.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/WheeledVehicleController.h
index 7178151f..487f60c5 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/WheeledVehicleController.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/WheeledVehicleController.h
@@ -29,7 +29,7 @@ public:
 	virtual void				RestoreBinaryState(StreamIn &inStream) override;
 
 	float						mInertia = 0.9f;							///< Moment of inertia (kg m^2), for a cylinder this would be 0.5 * M * R^2 which is 0.9 for a wheel with a mass of 20 kg and radius 0.3 m
-	float						mAngularDamping = 0.2f;						///< Angular damping factor of the wheel: dw/dt = -c * w. Value should be zero or positive and is usually close to 0.
+	float						mAngularDamping = 0.2f;						///< Angular damping factor of the wheel: dw/dt = -c * w
 	float						mMaxSteerAngle = DegreesToRadians(70.0f);	///< How much this wheel can steer (radians)
 	LinearCurve					mLongitudinalFriction;						///< On the Y-axis: friction in the forward direction of the tire. Friction is normally between 0 (no friction) and 1 (full friction) although friction can be a little bit higher than 1 because of the profile of a tire. On the X-axis: the slip ratio (fraction) defined as (omega_wheel * r_wheel - v_longitudinal) / |v_longitudinal|. You can see slip ratio as the amount the wheel is spinning relative to the floor: 0 means the wheel has full traction and is rolling perfectly in sync with the ground, 1 is for example when the wheel is locked and sliding over the ground.
 	LinearCurve					mLateralFriction;							///< On the Y-axis: friction in the sideways direction of the tire. Friction is normally between 0 (no friction) and 1 (full friction) although friction can be a little bit higher than 1 because of the profile of a tire. On the X-axis: the slip angle (degrees) defined as angle between relative contact velocity and tire direction.
diff --git a/engine/thirdparty/jolt_physics/patches/0001-backport-upstream-commit-b385bc3d7.patch b/engine/thirdparty/jolt_physics/patches/0001-backport-upstream-commit-b385bc3d7.patch
new file mode 100644
index 00000000..bb616412
--- /dev/null
+++ b/engine/thirdparty/jolt_physics/patches/0001-backport-upstream-commit-b385bc3d7.patch
@@ -0,0 +1,28 @@
+diff --git a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintPart/RotationEulerConstraintPart.h b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintPart/RotationEulerConstraintPart.h
+index ec84776a46..387c0d9737 100644
+--- a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintPart/RotationEulerConstraintPart.h
++++ b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ConstraintPart/RotationEulerConstraintPart.h
+@@ -143,8 +143,21 @@ public:
+ 		mInvI2 = inBody2.IsDynamic()? inBody2.GetMotionProperties()->GetInverseInertiaForRotation(inRotation2) : Mat44::sZero();
+ 
+ 		// Calculate effective mass: K^-1 = (J M^-1 J^T)^-1
+-		if (!mEffectiveMass.SetInversed3x3(mInvI1 + mInvI2))
+-			Deactivate();
++		Mat44 inertia_sum = mInvI1 + mInvI2;
++		if (!mEffectiveMass.SetInversed3x3(inertia_sum))
++		{
++			// If a column is zero, the axis is locked and we set the column to identity.
++			// This does not matter because any impulse will always be multiplied with mInvI1 or mInvI2 which will result in zero for the locked coordinate.
++			Vec4 zero = Vec4::sZero();
++			if (inertia_sum.GetColumn4(0) == zero)
++				inertia_sum.SetColumn4(0, Vec4(1, 0, 0, 0));
++			if (inertia_sum.GetColumn4(1) == zero)
++				inertia_sum.SetColumn4(1, Vec4(0, 1, 0, 0));
++			if (inertia_sum.GetColumn4(2) == zero)
++				inertia_sum.SetColumn4(2, Vec4(0, 0, 1, 0));
++			if (!mEffectiveMass.SetInversed3x3(inertia_sum))
++				Deactivate();
++		}
+ 	}
+ 
+ 	/// Deactivate this constraint
diff --git a/engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-ccfe0a0df.patch b/engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-ccfe0a0df.patch
new file mode 100644
index 00000000..b6bfd8ca
--- /dev/null
+++ b/engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-ccfe0a0df.patch
@@ -0,0 +1,12 @@
+diff --git a/thirdparty/jolt_physics/Jolt/Core/Core.h b/thirdparty/jolt_physics/Jolt/Core/Core.h
+index b306f5a686..b433a77946 100644
+--- a/thirdparty/jolt_physics/Jolt/Core/Core.h
++++ b/thirdparty/jolt_physics/Jolt/Core/Core.h
+@@ -453,6 +453,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
+ #include <functional>
+ #include <algorithm>
+ #include <cstdint>
++#include <type_traits>
+ #if defined(JPH_COMPILER_MSVC) || (defined(JPH_COMPILER_CLANG) && defined(_MSC_VER)) // MSVC or clang-cl
+ 	#include <malloc.h> // for alloca
+ #endif
diff --git a/engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-9e48d59be.patch b/engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-9e48d59be.patch
new file mode 100644
index 00000000..9d73732f
--- /dev/null
+++ b/engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-9e48d59be.patch
@@ -0,0 +1,15 @@
+diff --git a/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp b/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
+index ccfcc1bbe0..e343dd2fa7 100644
+--- a/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
++++ b/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
+@@ -74,6 +74,10 @@ void RegisterTypesInternal(uint64 inVersionID)
+ 	{
+ 		Trace("Version mismatch, make sure you compile the client code with the same Jolt version and compiler definitions!");
+ 		uint64 mismatch = JPH_VERSION_ID ^ inVersionID;
++		if (mismatch & 0xffffff)
++			Trace("Client reported version %d.%d.%d, library version is %d.%d.%d.",
++				(inVersionID >> 16) & 0xff, (inVersionID >> 8) & 0xff, inVersionID & 0xff,
++				JPH_VERSION_MAJOR, JPH_VERSION_MINOR, JPH_VERSION_PATCH);
+ 		auto check_bit = [mismatch](int inBit, const char *inLabel) { if (mismatch & (uint64(1) << (inBit + 23))) Trace("Mismatching define %s.", inLabel); };
+ 		check_bit(1, "JPH_DOUBLE_PRECISION");
+ 		check_bit(2, "JPH_CROSS_PLATFORM_DETERMINISTIC");
diff --git a/engine/thirdparty/jolt_physics/patches/0001-backport-upstream-commit-ee3725250.patch b/engine/thirdparty/jolt_physics/patches/0004-backport-upstream-commit-ee3725250.patch
similarity index 100%
rename from engine/thirdparty/jolt_physics/patches/0001-backport-upstream-commit-ee3725250.patch
rename to engine/thirdparty/jolt_physics/patches/0004-backport-upstream-commit-ee3725250.patch
diff --git a/engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-449b645.patch b/engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-449b645.patch
deleted file mode 100644
index 87afad03..00000000
--- a/engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-449b645.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h b/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
-index cfec8139..134f300d 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
-+++ b/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShape.h
-@@ -101,6 +101,9 @@ public:
- 
- 	/// How backfacing triangles should be treated
- 	EBackFaceMode				mBackFaceMode				= EBackFaceMode::IgnoreBackFaces;
-+
-+	/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared. (unit: meter^2)
-+	float						mInternalEdgeRemovalVertexToleranceSq = cDefaultInternalEdgeRemovalVertexToleranceSq;
- };
- 
- JPH_NAMESPACE_END
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h b/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
-index cec7d7be..eee55022 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
-+++ b/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
-@@ -31,7 +31,7 @@ class InternalEdgeRemovingCollector : public CollideShapeCollector
- 	{
- 		for (const Voided &vf : mVoidedFeatures)
- 			if (vf.mSubShapeID == inSubShapeID
--				&& inV.IsClose(Vec3::sLoadFloat3Unsafe(vf.mFeature), 1.0e-8f))
-+				&& inV.IsClose(Vec3::sLoadFloat3Unsafe(vf.mFeature), mVertexToleranceSq))
- 				return true;
- 		return false;
- 	}
-@@ -76,13 +76,15 @@ class InternalEdgeRemovingCollector : public CollideShapeCollector
- 
- public:
- 	/// Constructor, configures a collector to be called with all the results that do not hit internal edges
--	explicit				InternalEdgeRemovingCollector(CollideShapeCollector &inChainedCollector
-+	explicit				InternalEdgeRemovingCollector(CollideShapeCollector &inChainedCollector,
-+			float inVertexToleranceSq
- 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 			, RVec3Arg inBaseOffset
- 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 		) :
- 		CollideShapeCollector(inChainedCollector),
--		mChainedCollector(inChainedCollector)
-+		mChainedCollector(inChainedCollector),
-+		mVertexToleranceSq(inVertexToleranceSq)
- 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 			, mBaseOffset(inBaseOffset)
- 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
-@@ -249,7 +251,7 @@ public:
- 		JPH_ASSERT(inCollideShapeSettings.mActiveEdgeMode == EActiveEdgeMode::CollideWithAll); // Won't work without colliding with all edges
- 		JPH_ASSERT(inCollideShapeSettings.mCollectFacesMode == ECollectFacesMode::CollectFaces); // Won't work without collecting faces
- 
--		InternalEdgeRemovingCollector wrapper(ioCollector
-+		InternalEdgeRemovingCollector wrapper(ioCollector, inCollideShapeSettings.mInternalEdgeRemovalVertexToleranceSq
- 		#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 			, inBaseOffset
- 		#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
-@@ -271,6 +273,7 @@ private:
- 	CollideShapeCollector &	mChainedCollector;
- 	Array<Voided, STLLocalAllocator<Voided, cMaxLocalVoidedFeatures>> mVoidedFeatures;
- 	Array<CollideShapeResult, STLLocalAllocator<CollideShapeResult, cMaxLocalDelayedResults>> mDelayedResults;
-+	float					mVertexToleranceSq;		// Max squared distance to consider a vertex to be the same as another vertex, used to determine if a feature is voided
- #ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 	RVec3					mBaseOffset; 			// Base offset for the query, used to draw the results in the right place
- #endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp b/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
-index 670cee33..1a8c2c78 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
-+++ b/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
-@@ -301,7 +301,7 @@ void NarrowPhaseQuery::CollideShapeWithInternalEdgeRemoval(const Shape *inShape,
- 	settings.mActiveEdgeMode = EActiveEdgeMode::CollideWithAll;
- 	settings.mCollectFacesMode = ECollectFacesMode::CollectFaces;
- 
--	InternalEdgeRemovingCollector wrapper(ioCollector
-+	InternalEdgeRemovingCollector wrapper(ioCollector, settings.mInternalEdgeRemovalVertexToleranceSq
- 	#ifdef JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
- 		, inBaseOffset
- 	#endif // JPH_INTERNAL_EDGE_REMOVING_COLLECTOR_DEBUG
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp b/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
-index ff55f4ba..d859b22e 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
-+++ b/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
-@@ -185,9 +185,9 @@ uint32 HeightFieldShapeSettings::CalculateBitsPerSampleForError(float inMaxError
- 									// Not accurate enough, increase bits per sample
- 									bits_per_sample++;
- 
--									// Don't go above 8 bits per sample
--									if (bits_per_sample == 8)
--										return bits_per_sample;
-+									// Don't go above cMaxBitsPerSample bits per sample
-+									if (bits_per_sample == cMaxBitsPerSample)
-+										return cMaxBitsPerSample;
- 								}
- 							}
- 						}
-@@ -416,7 +416,7 @@ void HeightFieldShape::StoreMaterialIndices(const HeightFieldShapeSettings &inSe
- 
- void HeightFieldShape::CacheValues()
- {
--	mSampleMask = uint8((uint32(1) << mBitsPerSample) - 1);
-+	mSampleMask = uint16((uint32(1) << mBitsPerSample) - 1);
- }
- 
- void HeightFieldShape::AllocateBuffers()
-@@ -424,7 +424,7 @@ void HeightFieldShape::AllocateBuffers()
- 	uint num_blocks = GetNumBlocks();
- 	uint max_stride = (num_blocks + 1) >> 1;
- 	mRangeBlocksSize = sGridOffsets[sGetMaxLevel(num_blocks) - 1] + Square(max_stride);
--	mHeightSamplesSize = (mSampleCount * mSampleCount * mBitsPerSample + 7) / 8 + 1;
-+	mHeightSamplesSize = (mSampleCount * mSampleCount * mBitsPerSample + 7) / 8 + 2; // Since we read 3 bytes per sample, we need 2 extra bytes of padding
- 	mActiveEdgesSize = (Square(mSampleCount - 1) * 3 + 7) / 8 + 1; // See explanation at HeightFieldShape::CalculateActiveEdges
- 
- 	JPH_ASSERT(mRangeBlocks == nullptr && mHeightSamples == nullptr && mActiveEdges == nullptr);
-@@ -457,9 +457,9 @@ HeightFieldShape::HeightFieldShape(const HeightFieldShapeSettings &inSettings, S
- 	}
- 
- 	// Check bits per sample
--	if (inSettings.mBitsPerSample < 1 || inSettings.mBitsPerSample > 8)
-+	if (inSettings.mBitsPerSample < 1 || inSettings.mBitsPerSample > HeightFieldShapeConstants::cMaxBitsPerSample)
- 	{
--		outResult.SetError("HeightFieldShape: Bits per sample must be in the range [1, 8]!");
-+		outResult.SetError("HeightFieldShape: Bits per sample must be in the range [1, 16]!");
- 		return;
- 	}
- 
-@@ -727,9 +727,10 @@ HeightFieldShape::HeightFieldShape(const HeightFieldShapeSettings &inSettings, S
- 			uint byte_pos = sample >> 3;
- 			uint bit_pos = sample & 0b111;
- 			output_value <<= bit_pos;
--			JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
-+			JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
- 			mHeightSamples[byte_pos] |= uint8(output_value);
- 			mHeightSamples[byte_pos + 1] |= uint8(output_value >> 8);
-+			mHeightSamples[byte_pos + 2] |= uint8(output_value >> 16);
- 			sample += inSettings.mBitsPerSample;
- 		}
- 
-@@ -816,7 +817,7 @@ inline void HeightFieldShape::GetBlockOffsetAndScale(uint inBlockX, uint inBlock
- 	outBlockScale = float(block.mMax[n] - block.mMin[n]) / float(mSampleMask);
- }
- 
--inline uint8 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
-+inline uint16 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
- {
- 	JPH_ASSERT(inX < mSampleCount);
- 	JPH_ASSERT(inY < mSampleCount);
-@@ -827,16 +828,16 @@ inline uint8 HeightFieldShape::GetHeightSample(uint inX, uint inY) const
- 	uint bit_pos = sample & 0b111;
- 
- 	// Fetch the height sample value
--	JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
-+	JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
- 	const uint8 *height_samples = mHeightSamples + byte_pos;
--	uint16 height_sample = uint16(height_samples[0]) | uint16(uint16(height_samples[1]) << 8);
--	return uint8(height_sample >> bit_pos) & mSampleMask;
-+	uint32 height_sample = uint32(height_samples[0]) | (uint32(height_samples[1]) << 8) | (uint32(height_samples[2]) << 16);
-+	return uint16(height_sample >> bit_pos) & mSampleMask;
- }
- 
- inline Vec3 HeightFieldShape::GetPosition(uint inX, uint inY, float inBlockOffset, float inBlockScale, bool &outNoCollision) const
- {
- 	// Get quantized value
--	uint8 height_sample = GetHeightSample(inX, inY);
-+	uint16 height_sample = GetHeightSample(inX, inY);
- 	outNoCollision = height_sample == mSampleMask;
- 
- 	// Add 0.5 to the quantized value to minimize the error (see constructor)
-@@ -980,7 +981,7 @@ void HeightFieldShape::GetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
- 						uint output_y = block_y * mBlockSize + sample_y;
- 
- 						// Get quantized value
--						uint8 height_sample = GetHeightSample(inX + output_x, inY + output_y);
-+						uint16 height_sample = GetHeightSample(inX + output_x, inY + output_y);
- 
- 						// Dequantize
- 						float h = height_sample != mSampleMask? offset + height_sample * scale : cNoCollisionValue;
-@@ -1129,7 +1130,7 @@ void HeightFieldShape::SetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
- 				{
- 					// Quantize height
- 					float h = heights[sample_y * heights_stride + sample_x];
--					uint8 quantized_height = h != cNoCollisionValue? uint8(Clamp((int)floor((h - offset) / scale), 0, int(mSampleMask) - 1)) : mSampleMask;
-+					uint16 quantized_height = h != cNoCollisionValue? uint16(Clamp((int)floor((h - offset) / scale), 0, int(mSampleMask) - 1)) : mSampleMask;
- 
- 					// Determine bit position of sample
- 					uint sample = ((affected_y + sample_y) * mSampleCount + affected_x + sample_x) * uint(mBitsPerSample);
-@@ -1137,13 +1138,14 @@ void HeightFieldShape::SetHeights(uint inX, uint inY, uint inSizeX, uint inSizeY
- 					uint bit_pos = sample & 0b111;
- 
- 					// Update the height value sample
--					JPH_ASSERT(byte_pos + 1 < mHeightSamplesSize);
-+					JPH_ASSERT(byte_pos + 2 < mHeightSamplesSize); // We read max 16 bits which could be spread out over 3 bytes
- 					uint8 *height_samples = mHeightSamples + byte_pos;
--					uint16 height_sample = uint16(height_samples[0]) | uint16(uint16(height_samples[1]) << 8);
--					height_sample &= ~(uint16(mSampleMask) << bit_pos);
--					height_sample |= uint16(quantized_height) << bit_pos;
-+					uint32 height_sample = uint32(height_samples[0]) | (uint32(height_samples[1]) << 8) | (uint32(height_samples[2]) << 16);
-+					height_sample &= ~(uint32(mSampleMask) << bit_pos);
-+					height_sample |= uint32(quantized_height) << bit_pos;
- 					height_samples[0] = uint8(height_sample);
- 					height_samples[1] = uint8(height_sample >> 8);
-+					height_samples[2] = uint8(height_sample >> 16);
- 				}
- 		}
- 
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h b/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
-index 5aa6de88..c9bdc605 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
-+++ b/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
-@@ -33,6 +33,9 @@ namespace HeightFieldShapeConstants
- 	/// When height samples are converted to 16 bit:
- 	constexpr uint16				cNoCollisionValue16 = 0xffff;				///< This is the magic value for 'no collision'
- 	constexpr uint16				cMaxHeightValue16 = 0xfffe;					///< This is the maximum allowed height value
-+
-+	/// Maximum value for HeightFieldShapeSettings::mBitsPerSample
-+	constexpr uint32				cMaxBitsPerSample = 16;
- };
- 
- /// Class that constructs a HeightFieldShape
-@@ -63,7 +66,7 @@ public:
- 
- 	/// Given mBlockSize, mSampleCount and mHeightSamples, calculate the amount of bits needed to stay below absolute error inMaxError
- 	/// @param inMaxError Maximum allowed error in mHeightSamples after compression (note that this does not take mScale.Y into account)
--	/// @return Needed bits per sample in the range [1, 8].
-+	/// @return Needed bits per sample in the range [1, 16].
- 	uint32							CalculateBitsPerSampleForError(float inMaxError) const;
- 
- 	/// The height field is a surface defined by: mOffset + mScale * (x, mHeightSamples[y * mSampleCount + x], y).
-@@ -83,12 +86,12 @@ public:
- 	uint32							mMaterialsCapacity = 0;
- 
- 	/// The heightfield is divided in blocks of mBlockSize * mBlockSize * 2 triangles and the acceleration structure culls blocks only,
--	/// bigger block sizes reduce memory consumption but also reduce query performance. Sensible values are [2, 8], does not need to be
-+	/// bigger block sizes reduce memory consumption but also reduce query performance. Valid values are [2, 8], does not need to be
- 	/// a power of 2. Note that at run-time we'll perform one more grid subdivision, so the effective block size is half of what is provided here.
- 	uint32							mBlockSize = 2;
- 
--	/// How many bits per sample to use to compress the height field. Can be in the range [1, 8].
--	/// Note that each sample is compressed relative to the min/max value of its block of mBlockSize * mBlockSize pixels so the effective precision is higher.
-+	/// How many bits per sample to use to compress the height field. Can be in the range [1, 16].
-+	/// Note that each sample is compressed relative to the min/max value of its block of mBlockSize * mBlockSize samples so the effective precision is higher.
- 	/// Also note that increasing mBlockSize saves more memory than reducing the amount of bits per sample.
- 	uint32							mBitsPerSample = 8;
- 
-@@ -307,7 +310,7 @@ private:
- 	inline void						GetBlockOffsetAndScale(uint inBlockX, uint inBlockY, uint inRangeBlockOffset, uint inRangeBlockStride, float &outBlockOffset, float &outBlockScale) const;
- 
- 	/// Get the height sample at position (inX, inY)
--	inline uint8					GetHeightSample(uint inX, uint inY) const;
-+	inline uint16					GetHeightSample(uint inX, uint inY) const;
- 
- 	/// Faster version of GetPosition when block offset and scale are already known
- 	inline Vec3						GetPosition(uint inX, uint inY, float inBlockOffset, float inBlockScale, bool &outNoCollision) const;
-@@ -358,7 +361,7 @@ private:
- 	uint32							mRangeBlocksSize = 0;						///< Size of mRangeBlocks in elements
- 	uint32							mActiveEdgesSize = 0;						///< Size of mActiveEdges in bytes
- 	uint8							mBitsPerSample = 8;							///< See HeightFieldShapeSettings::mBitsPerSample
--	uint8							mSampleMask = 0xff;							///< All bits set for a sample: (1 << mBitsPerSample) - 1, used to indicate that there's no collision
-+	uint16							mSampleMask = 0xff;							///< All bits set for a sample: (1 << mBitsPerSample) - 1, used to indicate that there's no collision
- 	uint16							mMinSample = HeightFieldShapeConstants::cNoCollisionValue16; ///< Min and max value in mHeightSamples quantized to 16 bit, for calculating bounding box
- 	uint16							mMaxSample = HeightFieldShapeConstants::cNoCollisionValue16;
- 	RangeBlock *					mRangeBlocks = nullptr;						///< Hierarchical grid of range data describing the height variations within 1 block. The grid for level <level> starts at offset sGridOffsets[<level>]
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h b/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
-index 1109e253..cbd88d1a 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
-+++ b/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
-@@ -16,7 +16,10 @@ constexpr float cDefaultPenetrationTolerance = 1.0e-4f; ///< Stop when there's l
- constexpr float cDefaultConvexRadius = 0.05f;
- 
- /// Used by (Tapered)CapsuleShape to determine when supporting face is an edge rather than a point (unit: meter)
--static constexpr float cCapsuleProjectionSlop = 0.02f;
-+constexpr float cCapsuleProjectionSlop = 0.02f;
-+
-+/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared (unit: meter^2)
-+constexpr float cDefaultInternalEdgeRemovalVertexToleranceSq = 1.0e-8f;
- 
- /// Maximum amount of jobs to allow
- constexpr int cMaxPhysicsJobs = 2048;
-@@ -73,6 +76,9 @@ struct PhysicsSettings
- 	/// Maximum allowed distance between old and new contact point to preserve contact forces for warm start (units: meter^2)
- 	float		mContactPointPreserveLambdaMaxDistSq = Square(0.01f); ///< 1 cm
- 
-+	/// Max squared distance to consider a vertex to be the same as another vertex, used by the internal edge removal algorithm to determine if two edges are shared. (unit: meter^2)
-+	float		mInternalEdgeRemovalVertexToleranceSq = cDefaultInternalEdgeRemovalVertexToleranceSq;
-+
- 	/// Number of solver velocity iterations to run
- 	/// Note that this needs to be >= 2 in order for friction to work (friction is applied using the non-penetration impulse from the previous iteration)
- 	uint		mNumVelocitySteps = 10;
-diff --git a/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp b/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
-index 7b4babfc..c2ead513 100644
---- a/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
-+++ b/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
-@@ -1096,6 +1096,7 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
- 		settings.mActiveEdgeMode = mPhysicsSettings.mCheckActiveEdges? EActiveEdgeMode::CollideOnlyWithActive : EActiveEdgeMode::CollideWithAll;
- 		settings.mMaxSeparationDistance = body1->IsSensor() || body2->IsSensor()? 0.0f : mPhysicsSettings.mSpeculativeContactDistance;
- 		settings.mActiveEdgeMovementDirection = body1->GetLinearVelocity() - body2->GetLinearVelocity();
-+		settings.mInternalEdgeRemovalVertexToleranceSq = mPhysicsSettings.mInternalEdgeRemovalVertexToleranceSq;
- 
- 		// Create shape filter
- 		SimShapeFilterWrapper shape_filter(mSimShapeFilter, body1);
-2.52.0.windows.1
diff --git a/engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-bc7f1fb8c.patch b/engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-bc7f1fb8c.patch
similarity index 98%
rename from engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-bc7f1fb8c.patch
rename to engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-bc7f1fb8c.patch
index dde2762c..61b81e80 100644
--- a/engine/thirdparty/jolt_physics/patches/0002-backport-upstream-commit-bc7f1fb8c.patch
+++ b/engine/thirdparty/jolt_physics/patches/0005-backport-upstream-commit-bc7f1fb8c.patch
@@ -1,5 +1,5 @@
 diff --git a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
-index 7de3a4483e..972fc13583 100644
+index 9e572dd829..7bb3e58ee0 100644
 --- a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
 +++ b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
 @@ -46,7 +46,7 @@ void ContactConstraintManager::WorldContactPoint::CalculateNonPenetrationConstra
@@ -185,7 +185,7 @@ index 7de3a4483e..972fc13583 100644
  
  			// Notify island builder
  			mUpdateContext->mIslandBuilder->LinkContact(constraint_idx, body1->GetIndexInActiveBodiesInternal(), body2->GetIndexInActiveBodiesInternal());
-@@ -1144,11 +1148,9 @@ bool ContactConstraintManager::TemplatedAddContactConstraint(ContactAllocator &i
+@@ -1136,11 +1140,9 @@ bool ContactConstraintManager::TemplatedAddContactConstraint(ContactAllocator &i
  		// Notify island builder
  		mUpdateContext->mIslandBuilder->LinkContact(constraint_idx, inBody1.GetIndexInActiveBodiesInternal(), inBody2.GetIndexInActiveBodiesInternal());
  
@@ -199,7 +199,7 @@ index 7de3a4483e..972fc13583 100644
  
  		// Calculate scaled mass and inertia
  		float inv_m1;
-@@ -1222,7 +1224,7 @@ bool ContactConstraintManager::TemplatedAddContactConstraint(ContactAllocator &i
+@@ -1214,7 +1216,7 @@ bool ContactConstraintManager::TemplatedAddContactConstraint(ContactAllocator &i
  			wcp.mContactPoint = &cp;
  
  			// Setup velocity constraint
@@ -209,10 +209,10 @@ index 7de3a4483e..972fc13583 100644
  
  	#ifdef JPH_DEBUG_RENDERER
 diff --git a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
-index 0b5938b77e..dfe5fc8c38 100644
+index 635ce435fe..73e5d749b0 100644
 --- a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
 +++ b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
-@@ -427,7 +427,7 @@ private:
+@@ -424,7 +424,7 @@ private:
  		void					CalculateNonPenetrationConstraintProperties(const Body &inBody1, float inInvMass1, float inInvInertiaScale1, const Body &inBody2, float inInvMass2, float inInvInertiaScale2, RVec3Arg inWorldSpacePosition1, RVec3Arg inWorldSpacePosition2, Vec3Arg inWorldSpaceNormal);
  
  		template <EMotionType Type1, EMotionType Type2>
@@ -221,7 +221,7 @@ index 0b5938b77e..dfe5fc8c38 100644
  
  		/// The constraint parts
  		AxisConstraintPart		mNonPenetrationConstraint;
-@@ -485,10 +485,10 @@ public:
+@@ -482,10 +482,10 @@ public:
  private:
  	/// Internal helper function to calculate the friction and non-penetration constraint properties. Templated to the motion type to reduce the amount of branches and calculations.
  	template <EMotionType Type1, EMotionType Type2>
diff --git a/engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-365a15367.patch b/engine/thirdparty/jolt_physics/patches/0006-backport-upstream-commit-365a15367.patch
similarity index 97%
rename from engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-365a15367.patch
rename to engine/thirdparty/jolt_physics/patches/0006-backport-upstream-commit-365a15367.patch
index 11690b04..ee3a1e92 100644
--- a/engine/thirdparty/jolt_physics/patches/0003-backport-upstream-commit-365a15367.patch
+++ b/engine/thirdparty/jolt_physics/patches/0006-backport-upstream-commit-365a15367.patch
@@ -1,5 +1,5 @@
 diff --git a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
-index 972fc13583..09dfab4921 100644
+index 7bb3e58ee0..306ae64ff3 100644
 --- a/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
 +++ b/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
 @@ -70,7 +70,10 @@ JPH_INLINE void ContactConstraintManager::WorldContactPoint::TemplatedCalculateF
diff --git a/engine/thirdparty/jolt_physics/patches/0004-backport-upstream-commit-e0a6a9a16.patch b/engine/thirdparty/jolt_physics/patches/0007-backport-upstream-commit-e0a6a9a16.patch
similarity index 100%
rename from engine/thirdparty/jolt_physics/patches/0004-backport-upstream-commit-e0a6a9a16.patch
rename to engine/thirdparty/jolt_physics/patches/0007-backport-upstream-commit-e0a6a9a16.patch
diff --git a/engine/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch b/engine/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch
index 6dea60df..7d31486c 100644
--- a/engine/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch
+++ b/engine/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch
@@ -1,9 +1,9 @@
 diff --git a/thirdparty/libjpeg-turbo/src/jconfig.h b/thirdparty/libjpeg-turbo/src/jconfig.h
 new file mode 100644
-index 0000000000..50e5986c69
+index 0000000000..42d9654c0f
 --- /dev/null
 +++ b/thirdparty/libjpeg-turbo/src/jconfig.h
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,62 @@
 +// Originally generated by libjpeg-turbo's cmake build, then modified to support multiple platforms.
 +
 +/* Version ID for the JPEG library.
@@ -12,10 +12,10 @@ index 0000000000..50e5986c69
 +#define JPEG_LIB_VERSION  62
 +
 +/* libjpeg-turbo version */
-+#define LIBJPEG_TURBO_VERSION  3.1.3
++#define LIBJPEG_TURBO_VERSION  3.1.0
 +
 +/* libjpeg-turbo version in integer form */
-+#define LIBJPEG_TURBO_VERSION_NUMBER  3001003
++#define LIBJPEG_TURBO_VERSION_NUMBER  3001000
 +
 +/* Support arithmetic encoding when using 8-bit samples */
 +#define C_ARITH_CODING_SUPPORTED 1
@@ -27,15 +27,8 @@ index 0000000000..50e5986c69
 +#define MEM_SRCDST_SUPPORTED  1
 +
 +/* Use accelerated SIMD routines when using 8-bit samples */
-+// Godot: Disabled for simplicity of compiling the library cross-platform.
-+// Could be enabled if it's confirmed to be worth the effort.
 +//#define WITH_SIMD 1
 +
-+// Godot: Disable those as they're for forcing different SIMD CPU support
-+// via environment variables, that's super niche and we don't build with SIMD.
-+#define NO_GETENV
-+#define NO_PUTENV
-+
 +/* This version of libjpeg-turbo supports run-time selection of data precision,
 + * so BITS_IN_JSAMPLE is no longer used to specify the data precision at build
 + * time.  However, some downstream software expects the macro to be defined.
@@ -75,29 +68,32 @@ index 0000000000..50e5986c69
 +#endif
 diff --git a/thirdparty/libjpeg-turbo/src/jconfigint.h b/thirdparty/libjpeg-turbo/src/jconfigint.h
 new file mode 100644
-index 0000000000..38acc75108
+index 0000000000..45bd3ec321
 --- /dev/null
 +++ b/thirdparty/libjpeg-turbo/src/jconfigint.h
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,102 @@
 +// Originally generated by libjpeg-turbo's cmake build, then modified to support multiple platforms.
 +
 +/* libjpeg-turbo build number */
-+#define BUILD  "Godot"
++#define BUILD  "20250317"
 +
 +/* How to hide global symbols. */
-+#if defined(__GNUC__)
-+#define HIDDEN  __attribute__((visibility("hidden")))
-+#else
-+#define HIDDEN
++#ifndef HIDDEN
++	#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
++		#define HIDDEN  __attribute__((visibility("hidden")))
++	#else
++		#define HIDDEN
++	#endif
 +#endif
 +
++/* Compiler's inline keyword */
++#undef inline
++
 +/* How to obtain function inlining. */
-+#if defined(_MSC_VER)
-+#define INLINE  __forceinline
-+#elif defined(__GNUC__)
-+#define INLINE  __inline__ __attribute__((always_inline))
++#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
++	#define INLINE  __inline__ __attribute__((always_inline))
 +#else
-+#define INLINE  inline
++	#define INLINE inline
 +#endif
 +
 +/* How to obtain thread-local storage */
@@ -111,7 +107,7 @@ index 0000000000..38acc75108
 +#define PACKAGE_NAME  "libjpeg-turbo"
 +
 +/* Version number of package */
-+#define VERSION  "3.1.3"
++#define VERSION  "3.1.0"
 +
 +/* The size of `size_t', as computed by sizeof. */
 +#if defined(__SIZEOF_SIZE_T__)
@@ -130,9 +126,7 @@ index 0000000000..38acc75108
 +#endif
 +
 +/* Define to 1 if you have the <intrin.h> header file. */
-+#if defined(_MSC_VER)
-+	#define HAVE_INTRIN_H
-+#endif
++/* #undef HAVE_INTRIN_H */
 +
 +#if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
 +#if (SIZEOF_SIZE_T == 8)
@@ -177,11 +171,37 @@ index 0000000000..38acc75108
 +#define D_ARITH_CODING_SUPPORTED 1
 +
 +/* Use accelerated SIMD routines. */
-+// Godot: Disabled for simplicity of compiling the library cross-platform.
-+// Could be enabled if it's confirmed to be worth the effort.
 +//#define WITH_SIMD 1
 +
 +#endif
+diff --git a/thirdparty/libjpeg-turbo/src/jmorecfg.h b/thirdparty/libjpeg-turbo/src/jmorecfg.h
+index 89c7842c87..c96edd2300 100644
+--- a/thirdparty/libjpeg-turbo/src/jmorecfg.h
++++ b/thirdparty/libjpeg-turbo/src/jmorecfg.h
+@@ -1,3 +1,5 @@
++// Modified to remove lossless jpeg support.
++
+ /*
+  * jmorecfg.h
+  *
+@@ -242,7 +244,7 @@ typedef int boolean;
+ 
+ #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+ #define C_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
+-#define C_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
++//#define C_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
+ #define ENTROPY_OPT_SUPPORTED       /* Optimization of entropy coding parms? */
+ /* Note: if you selected 12-bit data precision, it is dangerous to turn off
+  * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
+@@ -259,7 +261,7 @@ typedef int boolean;
+ 
+ #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+ #define D_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
+-#define D_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
++//#define D_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
+ #define SAVE_MARKERS_SUPPORTED      /* jpeg_save_markers() needed? */
+ #define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
+ #define IDCT_SCALING_SUPPORTED      /* Output rescaling via IDCT? */
 diff --git a/thirdparty/libjpeg-turbo/src/jversion.h b/thirdparty/libjpeg-turbo/src/jversion.h
 new file mode 100644
 index 0000000000..40f7a6cc82
diff --git a/engine/thirdparty/libjpeg-turbo/patches/0002-disable-16bitlossless.patch b/engine/thirdparty/libjpeg-turbo/patches/0002-disable-16bitlossless.patch
index 9d7a5d75..c93a8d97 100644
--- a/engine/thirdparty/libjpeg-turbo/patches/0002-disable-16bitlossless.patch
+++ b/engine/thirdparty/libjpeg-turbo/patches/0002-disable-16bitlossless.patch
@@ -1,33 +1,18 @@
-diff --git a/thirdparty/libjpeg-turbo/src/jmorecfg.h b/thirdparty/libjpeg-turbo/src/jmorecfg.h
-index 89c7842c87..c96edd2300 100644
---- a/thirdparty/libjpeg-turbo/src/jmorecfg.h
-+++ b/thirdparty/libjpeg-turbo/src/jmorecfg.h
-@@ -1,3 +1,5 @@
-+// Modified to remove lossless jpeg support.
-+
- /*
-  * jmorecfg.h
-  *
-@@ -242,7 +244,7 @@ typedef int boolean;
+diff --git a/thirdparty/README.md b/thirdparty/README.md
+index c22ef77af7..52b635df05 100644
+--- a/thirdparty/README.md
++++ b/thirdparty/README.md
+@@ -539,7 +539,7 @@ Patches:
+ ## libjpeg-turbo
  
- #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
- #define C_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
--#define C_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
-+//#define C_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
- #define ENTROPY_OPT_SUPPORTED       /* Optimization of entropy coding parms? */
- /* Note: if you selected 12-bit data precision, it is dangerous to turn off
-  * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
-@@ -259,7 +261,7 @@ typedef int boolean;
+ - Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo
+-- Version: 3.1.0 (20ade4dea9589515a69793e447a6c6220b464535, 2024)
++- Version: 3.1.3 (af9c1c268520a29adf98cad5138dafe612b3d318, 2025)
+ - License: BSD-3-Clause and IJG
  
- #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
- #define D_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
--#define D_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
-+//#define D_LOSSLESS_SUPPORTED        /* Lossless JPEG? */
- #define SAVE_MARKERS_SUPPORTED      /* jpeg_save_markers() needed? */
- #define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
- #define IDCT_SCALING_SUPPORTED      /* Output rescaling via IDCT? */
+ Files extracted from upstream source:
 diff --git a/thirdparty/libjpeg-turbo/src/turbojpeg.c b/thirdparty/libjpeg-turbo/src/turbojpeg.c
-index 23dbe6bb75..969174f72e 100644
+index 45fc0f954c..d514da43d2 100644
 --- a/thirdparty/libjpeg-turbo/src/turbojpeg.c
 +++ b/thirdparty/libjpeg-turbo/src/turbojpeg.c
 @@ -1196,9 +1196,6 @@ bailout:
diff --git a/engine/thirdparty/libjpeg-turbo/patches/0003-remove-bmp-ppm-support.patch b/engine/thirdparty/libjpeg-turbo/patches/0003-remove-bmp-ppm-support.patch
index 9500fb47..b16e81cc 100644
--- a/engine/thirdparty/libjpeg-turbo/patches/0003-remove-bmp-ppm-support.patch
+++ b/engine/thirdparty/libjpeg-turbo/patches/0003-remove-bmp-ppm-support.patch
@@ -1,3 +1,16 @@
+diff --git a/thirdparty/README.md b/thirdparty/README.md
+index c22ef77af7..52b635df05 100644
+--- a/thirdparty/README.md
++++ b/thirdparty/README.md
+@@ -539,7 +539,7 @@ Patches:
+ ## libjpeg-turbo
+ 
+ - Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo
+-- Version: 3.1.0 (20ade4dea9589515a69793e447a6c6220b464535, 2024)
++- Version: 3.1.3 (af9c1c268520a29adf98cad5138dafe612b3d318, 2025)
+ - License: BSD-3-Clause and IJG
+ 
+ Files extracted from upstream source:
 diff --git a/thirdparty/libjpeg-turbo/src/turbojpeg-mp.c b/thirdparty/libjpeg-turbo/src/turbojpeg-mp.c
 index 6fecc5cb80..21d26536c1 100644
 --- a/thirdparty/libjpeg-turbo/src/turbojpeg-mp.c
@@ -275,10 +288,20 @@ index 6fecc5cb80..21d26536c1 100644
  #undef _JSAMPROW
  #undef _buffer
 diff --git a/thirdparty/libjpeg-turbo/src/turbojpeg.c b/thirdparty/libjpeg-turbo/src/turbojpeg.c
-index d514da43d2..969174f72e 100644
+index 45fc0f954c..969174f72e 100644
 --- a/thirdparty/libjpeg-turbo/src/turbojpeg.c
 +++ b/thirdparty/libjpeg-turbo/src/turbojpeg.c
-@@ -3091,48 +3091,3 @@ bailout:
+@@ -1196,9 +1196,6 @@ bailout:
+ #define BITS_IN_JSAMPLE  12
+ #include "turbojpeg-mp.c"
+ #undef BITS_IN_JSAMPLE
+-#define BITS_IN_JSAMPLE  16
+-#include "turbojpeg-mp.c"
+-#undef BITS_IN_JSAMPLE
+ 
+ /* TurboJPEG 1.2+ */
+ DLLEXPORT int tjCompress2(tjhandle handle, const unsigned char *srcBuf,
+@@ -3094,48 +3091,3 @@ bailout:
    free(sizes);
    return retval;
  }
diff --git a/engine/thirdparty/libjpeg-turbo/src/jconfig.h b/engine/thirdparty/libjpeg-turbo/src/jconfig.h
index 50e5986c..42d9654c 100644
--- a/engine/thirdparty/libjpeg-turbo/src/jconfig.h
+++ b/engine/thirdparty/libjpeg-turbo/src/jconfig.h
@@ -6,10 +6,10 @@
 #define JPEG_LIB_VERSION  62
 
 /* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION  3.1.3
+#define LIBJPEG_TURBO_VERSION  3.1.0
 
 /* libjpeg-turbo version in integer form */
-#define LIBJPEG_TURBO_VERSION_NUMBER  3001003
+#define LIBJPEG_TURBO_VERSION_NUMBER  3001000
 
 /* Support arithmetic encoding when using 8-bit samples */
 #define C_ARITH_CODING_SUPPORTED 1
@@ -21,15 +21,8 @@
 #define MEM_SRCDST_SUPPORTED  1
 
 /* Use accelerated SIMD routines when using 8-bit samples */
-// Godot: Disabled for simplicity of compiling the library cross-platform.
-// Could be enabled if it's confirmed to be worth the effort.
 //#define WITH_SIMD 1
 
-// Godot: Disable those as they're for forcing different SIMD CPU support
-// via environment variables, that's super niche and we don't build with SIMD.
-#define NO_GETENV
-#define NO_PUTENV
-
 /* This version of libjpeg-turbo supports run-time selection of data precision,
  * so BITS_IN_JSAMPLE is no longer used to specify the data precision at build
  * time.  However, some downstream software expects the macro to be defined.
diff --git a/engine/thirdparty/libjpeg-turbo/src/jconfigint.h b/engine/thirdparty/libjpeg-turbo/src/jconfigint.h
index 38acc751..45bd3ec3 100644
--- a/engine/thirdparty/libjpeg-turbo/src/jconfigint.h
+++ b/engine/thirdparty/libjpeg-turbo/src/jconfigint.h
@@ -1,22 +1,25 @@
 // Originally generated by libjpeg-turbo's cmake build, then modified to support multiple platforms.
 
 /* libjpeg-turbo build number */
-#define BUILD  "Godot"
+#define BUILD  "20250317"
 
 /* How to hide global symbols. */
-#if defined(__GNUC__)
-#define HIDDEN  __attribute__((visibility("hidden")))
-#else
-#define HIDDEN
+#ifndef HIDDEN
+	#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
+		#define HIDDEN  __attribute__((visibility("hidden")))
+	#else
+		#define HIDDEN
+	#endif
 #endif
 
+/* Compiler's inline keyword */
+#undef inline
+
 /* How to obtain function inlining. */
-#if defined(_MSC_VER)
-#define INLINE  __forceinline
-#elif defined(__GNUC__)
-#define INLINE  __inline__ __attribute__((always_inline))
+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
+	#define INLINE  __inline__ __attribute__((always_inline))
 #else
-#define INLINE  inline
+	#define INLINE inline
 #endif
 
 /* How to obtain thread-local storage */
@@ -30,7 +33,7 @@
 #define PACKAGE_NAME  "libjpeg-turbo"
 
 /* Version number of package */
-#define VERSION  "3.1.3"
+#define VERSION  "3.1.0"
 
 /* The size of `size_t', as computed by sizeof. */
 #if defined(__SIZEOF_SIZE_T__)
@@ -49,9 +52,7 @@
 #endif
 
 /* Define to 1 if you have the <intrin.h> header file. */
-#if defined(_MSC_VER)
-	#define HAVE_INTRIN_H
-#endif
+/* #undef HAVE_INTRIN_H */
 
 #if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
 #if (SIZEOF_SIZE_T == 8)
@@ -96,8 +97,6 @@
 #define D_ARITH_CODING_SUPPORTED 1
 
 /* Use accelerated SIMD routines. */
-// Godot: Disabled for simplicity of compiling the library cross-platform.
-// Could be enabled if it's confirmed to be worth the effort.
 //#define WITH_SIMD 1
 
 #endif
diff --git a/engine/thirdparty/metal-cpp/Foundation/Foundation.hpp b/engine/thirdparty/metal-cpp/Foundation/Foundation.hpp
deleted file mode 100644
index 31e8fb3c..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/Foundation.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/Foundation.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSArray.hpp"
-#include "NSAutoreleasePool.hpp"
-#include "NSBundle.hpp"
-#include "NSData.hpp"
-#include "NSDate.hpp"
-#include "NSDefines.hpp"
-#include "NSDictionary.hpp"
-#include "NSEnumerator.hpp"
-#include "NSError.hpp"
-#include "NSLock.hpp"
-#include "NSNotification.hpp"
-#include "NSNumber.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSProcessInfo.hpp"
-#include "NSRange.hpp"
-#include "NSSet.hpp"
-#include "NSSharedPtr.hpp"
-#include "NSString.hpp"
-#include "NSTypes.hpp"
-#include "NSURL.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSArray.hpp b/engine/thirdparty/metal-cpp/Foundation/NSArray.hpp
deleted file mode 100644
index ea04d1ea..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSArray.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSArray.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-#include "NSEnumerator.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class Array : public Copying<Array>
-{
-public:
-    static Array* array();
-    static Array* array(const Object* pObject);
-    static Array* array(const Object* const* pObjects, UInteger count);
-
-    static Array* alloc();
-
-    Array*        init();
-    Array*        init(const Object* const* pObjects, UInteger count);
-    Array*        init(const class Coder* pCoder);
-
-    template <class _Object = Object>
-    _Object*            object(UInteger index) const;
-    UInteger            count() const;
-    Enumerator<Object>* objectEnumerator() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::array()
-{
-    return Object::sendMessage<Array*>(_NS_PRIVATE_CLS(NSArray), _NS_PRIVATE_SEL(array));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::array(const Object* pObject)
-{
-    return Object::sendMessage<Array*>(_NS_PRIVATE_CLS(NSArray), _NS_PRIVATE_SEL(arrayWithObject_), pObject);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::array(const Object* const* pObjects, UInteger count)
-{
-    return Object::sendMessage<Array*>(_NS_PRIVATE_CLS(NSArray), _NS_PRIVATE_SEL(arrayWithObjects_count_), pObjects, count);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::alloc()
-{
-    return NS::Object::alloc<Array>(_NS_PRIVATE_CLS(NSArray));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::init()
-{
-    return NS::Object::init<Array>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::init(const Object* const* pObjects, UInteger count)
-{
-    return Object::sendMessage<Array*>(this, _NS_PRIVATE_SEL(initWithObjects_count_), pObjects, count);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Array::init(const class Coder* pCoder)
-{
-    return Object::sendMessage<Array*>(this, _NS_PRIVATE_SEL(initWithCoder_), pCoder);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Array::count() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(count));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Object>
-_NS_INLINE _Object* NS::Array::object(UInteger index) const
-{
-    return Object::sendMessage<_Object*>(this, _NS_PRIVATE_SEL(objectAtIndex_), index);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Enumerator<NS::Object>* NS::Array::objectEnumerator() const
-{
-    return NS::Object::sendMessage<Enumerator<NS::Object>*>(this, _NS_PRIVATE_SEL(objectEnumerator));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSAutoreleasePool.hpp b/engine/thirdparty/metal-cpp/Foundation/NSAutoreleasePool.hpp
deleted file mode 100644
index 6d01a465..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSAutoreleasePool.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSAutoreleasePool.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class AutoreleasePool : public Object
-{
-public:
-    static AutoreleasePool* alloc();
-    AutoreleasePool*        init();
-
-    void                    drain();
-
-    void                    addObject(Object* pObject);
-
-    static void             showPools();
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::AutoreleasePool* NS::AutoreleasePool::alloc()
-{
-    return NS::Object::alloc<AutoreleasePool>(_NS_PRIVATE_CLS(NSAutoreleasePool));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::AutoreleasePool* NS::AutoreleasePool::init()
-{
-    return NS::Object::init<AutoreleasePool>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::AutoreleasePool::drain()
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(drain));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::AutoreleasePool::addObject(Object* pObject)
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(addObject_), pObject);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::AutoreleasePool::showPools()
-{
-    Object::sendMessage<void>(_NS_PRIVATE_CLS(NSAutoreleasePool), _NS_PRIVATE_SEL(showPools));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSBundle.hpp b/engine/thirdparty/metal-cpp/Foundation/NSBundle.hpp
deleted file mode 100644
index b9637f51..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSBundle.hpp
+++ /dev/null
@@ -1,374 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSBundle.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSNotification.hpp"
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-_NS_CONST(NotificationName, BundleDidLoadNotification);
-_NS_CONST(NotificationName, BundleResourceRequestLowDiskSpaceNotification);
-
-class String* LocalizedString(const String* pKey, const String*);
-class String* LocalizedStringFromTable(const String* pKey, const String* pTbl, const String*);
-class String* LocalizedStringFromTableInBundle(const String* pKey, const String* pTbl, const class Bundle* pBdle, const String*);
-class String* LocalizedStringWithDefaultValue(const String* pKey, const String* pTbl, const class Bundle* pBdle, const String* pVal, const String*);
-
-class Bundle : public Referencing<Bundle>
-{
-public:
-    static Bundle*      mainBundle();
-
-    static Bundle*      bundle(const class String* pPath);
-    static Bundle*      bundle(const class URL* pURL);
-
-    static class Array* allBundles();
-    static class Array* allFrameworks();
-
-    static Bundle*      alloc();
-
-    Bundle*             init(const class String* pPath);
-    Bundle*             init(const class URL* pURL);
-
-    bool                load();
-    bool                unload();
-
-    bool                isLoaded() const;
-
-    bool                preflightAndReturnError(class Error** pError) const;
-    bool                loadAndReturnError(class Error** pError);
-
-    class URL*          bundleURL() const;
-    class URL*          resourceURL() const;
-    class URL*          executableURL() const;
-    class URL*          URLForAuxiliaryExecutable(const class String* pExecutableName) const;
-
-    class URL*          privateFrameworksURL() const;
-    class URL*          sharedFrameworksURL() const;
-    class URL*          sharedSupportURL() const;
-    class URL*          builtInPlugInsURL() const;
-    class URL*          appStoreReceiptURL() const;
-
-    class String*       bundlePath() const;
-    class String*       resourcePath() const;
-    class String*       executablePath() const;
-    class String*       pathForAuxiliaryExecutable(const class String* pExecutableName) const;
-
-    class String*       privateFrameworksPath() const;
-    class String*       sharedFrameworksPath() const;
-    class String*       sharedSupportPath() const;
-    class String*       builtInPlugInsPath() const;
-
-    class String*       bundleIdentifier() const;
-    class Dictionary*   infoDictionary() const;
-    class Dictionary*   localizedInfoDictionary() const;
-    class Object*       objectForInfoDictionaryKey(const class String* pKey);
-
-    class String*       localizedString(const class String* pKey, const class String* pValue = nullptr, const class String* pTableName = nullptr) const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_PRIVATE_DEF_CONST(NS::NotificationName, BundleDidLoadNotification);
-_NS_PRIVATE_DEF_CONST(NS::NotificationName, BundleResourceRequestLowDiskSpaceNotification);
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::LocalizedString(const String* pKey, const String*)
-{
-    return Bundle::mainBundle()->localizedString(pKey, nullptr, nullptr);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::LocalizedStringFromTable(const String* pKey, const String* pTbl, const String*)
-{
-    return Bundle::mainBundle()->localizedString(pKey, nullptr, pTbl);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::LocalizedStringFromTableInBundle(const String* pKey, const String* pTbl, const Bundle* pBdl, const String*)
-{
-    return pBdl->localizedString(pKey, nullptr, pTbl);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::LocalizedStringWithDefaultValue(const String* pKey, const String* pTbl, const Bundle* pBdl, const String* pVal, const String*)
-{
-    return pBdl->localizedString(pKey, pVal, pTbl);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::mainBundle()
-{
-    return Object::sendMessage<Bundle*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(mainBundle));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::bundle(const class String* pPath)
-{
-    return Object::sendMessage<Bundle*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(bundleWithPath_), pPath);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::bundle(const class URL* pURL)
-{
-    return Object::sendMessage<Bundle*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(bundleWithURL_), pURL);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Bundle::allBundles()
-{
-    return Object::sendMessage<Array*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(allBundles));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Bundle::allFrameworks()
-{
-    return Object::sendMessage<Array*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(allFrameworks));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::alloc()
-{
-    return Object::sendMessage<Bundle*>(_NS_PRIVATE_CLS(NSBundle), _NS_PRIVATE_SEL(alloc));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::init(const String* pPath)
-{
-    return Object::sendMessage<Bundle*>(this, _NS_PRIVATE_SEL(initWithPath_), pPath);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Bundle* NS::Bundle::init(const URL* pURL)
-{
-    return Object::sendMessage<Bundle*>(this, _NS_PRIVATE_SEL(initWithURL_), pURL);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Bundle::load()
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(load));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Bundle::unload()
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(unload));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Bundle::isLoaded() const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(isLoaded));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Bundle::preflightAndReturnError(Error** pError) const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(preflightAndReturnError_), pError);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Bundle::loadAndReturnError(Error** pError)
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(loadAndReturnError_), pError);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::bundleURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(bundleURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::resourceURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(resourceURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::executableURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(executableURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::URLForAuxiliaryExecutable(const String* pExecutableName) const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(URLForAuxiliaryExecutable_), pExecutableName);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::privateFrameworksURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(privateFrameworksURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::sharedFrameworksURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(sharedFrameworksURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::sharedSupportURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(sharedSupportURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::builtInPlugInsURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(builtInPlugInsURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::Bundle::appStoreReceiptURL() const
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(appStoreReceiptURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::bundlePath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(bundlePath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::resourcePath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(resourcePath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::executablePath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(executablePath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::pathForAuxiliaryExecutable(const String* pExecutableName) const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(pathForAuxiliaryExecutable_), pExecutableName);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::privateFrameworksPath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(privateFrameworksPath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::sharedFrameworksPath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(sharedFrameworksPath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::sharedSupportPath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(sharedSupportPath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::builtInPlugInsPath() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(builtInPlugInsPath));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::bundleIdentifier() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(bundleIdentifier));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Bundle::infoDictionary() const
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(infoDictionary));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Bundle::localizedInfoDictionary() const
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(localizedInfoDictionary));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Object* NS::Bundle::objectForInfoDictionaryKey(const String* pKey)
-{
-    return Object::sendMessage<Object*>(this, _NS_PRIVATE_SEL(objectForInfoDictionaryKey_), pKey);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Bundle::localizedString(const String* pKey, const String* pValue /* = nullptr */, const String* pTableName /* = nullptr */) const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(localizedStringForKey_value_table_), pKey, pValue, pTableName);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSData.hpp b/engine/thirdparty/metal-cpp/Foundation/NSData.hpp
deleted file mode 100644
index 03576df5..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSData.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSData.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class Data : public Copying<Data>
-{
-public:
-    void*    mutableBytes() const;
-    UInteger length() const;
-    const void * bytes() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void* NS::Data::mutableBytes() const
-{
-    return Object::sendMessage<void*>(this, _NS_PRIVATE_SEL(mutableBytes));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Data::length() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(length));
-}
-
-_NS_INLINE const void * NS::Data::bytes() const
-{
-    return Object::sendMessage<const void *>(this, _NS_PRIVATE_SEL(bytes));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSDate.hpp b/engine/thirdparty/metal-cpp/Foundation/NSDate.hpp
deleted file mode 100644
index 0a5ec7dd..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSDate.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSDate.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-
-using TimeInterval = double;
-
-class Date : public Copying<Date>
-{
-public:
-    static Date* dateWithTimeIntervalSinceNow(TimeInterval secs);
-};
-
-} // NS
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Date* NS::Date::dateWithTimeIntervalSinceNow(NS::TimeInterval secs)
-{
-    return NS::Object::sendMessage<NS::Date*>(_NS_PRIVATE_CLS(NSDate), _NS_PRIVATE_SEL(dateWithTimeIntervalSinceNow_), secs);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSDefines.hpp b/engine/thirdparty/metal-cpp/Foundation/NSDefines.hpp
deleted file mode 100644
index 33bef732..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSDefines.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSDefines.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-// Forward declarations to avoid conflicts with Godot types (String, Object, Error)
-namespace NS {
-class Array;
-class Dictionary;
-class Error;
-class Object;
-class String;
-class URL;
-} // namespace NS
-
-#define _NS_WEAK_IMPORT __attribute__((weak_import))
-#ifdef METALCPP_SYMBOL_VISIBILITY_HIDDEN
-#define _NS_EXPORT __attribute__((visibility("hidden")))
-#else
-#define _NS_EXPORT __attribute__((visibility("default")))
-#endif // METALCPP_SYMBOL_VISIBILITY_HIDDEN
-#define _NS_EXTERN extern "C" _NS_EXPORT
-#define _NS_INLINE inline __attribute__((always_inline))
-#define _NS_PACKED __attribute__((packed))
-
-#define _NS_CONST(type, name) _NS_EXTERN type const name
-#define _NS_ENUM(type, name) enum name : type
-#define _NS_OPTIONS(type, name) \
-    using name = type;          \
-    enum : name
-
-#define _NS_CAST_TO_UINT(value) static_cast<NS::UInteger>(value)
-#define _NS_VALIDATE_SIZE(ns, name) static_assert(sizeof(ns::name) == sizeof(ns##name), "size mismatch " #ns "::" #name)
-#define _NS_VALIDATE_ENUM(ns, name) static_assert(_NS_CAST_TO_UINT(ns::name) == _NS_CAST_TO_UINT(ns##name), "value mismatch " #ns "::" #name)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSDictionary.hpp b/engine/thirdparty/metal-cpp/Foundation/NSDictionary.hpp
deleted file mode 100644
index d4a1519d..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSDictionary.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSDictionary.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSEnumerator.hpp"
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class Dictionary : public NS::Copying<Dictionary>
-{
-public:
-    static Dictionary* dictionary();
-    static Dictionary* dictionary(const Object* pObject, const Object* pKey);
-    static Dictionary* dictionary(const Object* const* pObjects, const Object* const* pKeys, UInteger count);
-
-    static Dictionary* alloc();
-
-    Dictionary*        init();
-    Dictionary*        init(const Object* const* pObjects, const Object* const* pKeys, UInteger count);
-    Dictionary*        init(const class Coder* pCoder);
-
-    template <class _KeyType = Object>
-    Enumerator<_KeyType>* keyEnumerator() const;
-
-    template <class _Object = Object>
-    _Object* object(const Object* pKey) const;
-    UInteger count() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::dictionary()
-{
-    return Object::sendMessage<Dictionary*>(_NS_PRIVATE_CLS(NSDictionary), _NS_PRIVATE_SEL(dictionary));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::dictionary(const Object* pObject, const Object* pKey)
-{
-    return Object::sendMessage<Dictionary*>(_NS_PRIVATE_CLS(NSDictionary), _NS_PRIVATE_SEL(dictionaryWithObject_forKey_), pObject, pKey);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::dictionary(const Object* const* pObjects, const Object* const* pKeys, UInteger count)
-{
-    return Object::sendMessage<Dictionary*>(_NS_PRIVATE_CLS(NSDictionary), _NS_PRIVATE_SEL(dictionaryWithObjects_forKeys_count_),
-        pObjects, pKeys, count);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::alloc()
-{
-    return NS::Object::alloc<Dictionary>(_NS_PRIVATE_CLS(NSDictionary));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::init()
-{
-    return NS::Object::init<Dictionary>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::init(const Object* const* pObjects, const Object* const* pKeys, UInteger count)
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(initWithObjects_forKeys_count_), pObjects, pKeys, count);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Dictionary::init(const class Coder* pCoder)
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(initWithCoder_), pCoder);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _KeyType>
-_NS_INLINE NS::Enumerator<_KeyType>* NS::Dictionary::keyEnumerator() const
-{
-    return Object::sendMessage<Enumerator<_KeyType>*>(this, _NS_PRIVATE_SEL(keyEnumerator));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Object>
-_NS_INLINE _Object* NS::Dictionary::object(const Object* pKey) const
-{
-    return Object::sendMessage<_Object*>(this, _NS_PRIVATE_SEL(objectForKey_), pKey);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Dictionary::count() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(count));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSEnumerator.hpp b/engine/thirdparty/metal-cpp/Foundation/NSEnumerator.hpp
deleted file mode 100644
index 5a2500c1..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSEnumerator.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSEnumerator.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-struct FastEnumerationState
-{
-    unsigned long  state;
-    Object**       itemsPtr;
-    unsigned long* mutationsPtr;
-    unsigned long  extra[5];
-} _NS_PACKED;
-
-class FastEnumeration : public Referencing<FastEnumeration>
-{
-public:
-    NS::UInteger countByEnumerating(FastEnumerationState* pState, Object** pBuffer, NS::UInteger len);
-};
-
-template <class _ObjectType>
-class Enumerator : public Referencing<Enumerator<_ObjectType>, FastEnumeration>
-{
-public:
-    _ObjectType* nextObject();
-    class Array* allObjects();
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::FastEnumeration::countByEnumerating(FastEnumerationState* pState, Object** pBuffer, NS::UInteger len)
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(countByEnumeratingWithState_objects_count_), pState, pBuffer, len);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _ObjectType>
-_NS_INLINE _ObjectType* NS::Enumerator<_ObjectType>::nextObject()
-{
-    return Object::sendMessage<_ObjectType*>(this, _NS_PRIVATE_SEL(nextObject));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _ObjectType>
-_NS_INLINE NS::Array* NS::Enumerator<_ObjectType>::allObjects()
-{
-    return Object::sendMessage<Array*>(this, _NS_PRIVATE_SEL(allObjects));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSError.hpp b/engine/thirdparty/metal-cpp/Foundation/NSError.hpp
deleted file mode 100644
index ea331d46..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSError.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSError.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-using ErrorDomain = class String*;
-
-_NS_CONST(ErrorDomain, CocoaErrorDomain);
-_NS_CONST(ErrorDomain, POSIXErrorDomain);
-_NS_CONST(ErrorDomain, OSStatusErrorDomain);
-_NS_CONST(ErrorDomain, MachErrorDomain);
-
-using ErrorUserInfoKey = class String*;
-
-_NS_CONST(ErrorUserInfoKey, UnderlyingErrorKey);
-_NS_CONST(ErrorUserInfoKey, LocalizedDescriptionKey);
-_NS_CONST(ErrorUserInfoKey, LocalizedFailureReasonErrorKey);
-_NS_CONST(ErrorUserInfoKey, LocalizedRecoverySuggestionErrorKey);
-_NS_CONST(ErrorUserInfoKey, LocalizedRecoveryOptionsErrorKey);
-_NS_CONST(ErrorUserInfoKey, RecoveryAttempterErrorKey);
-_NS_CONST(ErrorUserInfoKey, HelpAnchorErrorKey);
-_NS_CONST(ErrorUserInfoKey, DebugDescriptionErrorKey);
-_NS_CONST(ErrorUserInfoKey, LocalizedFailureErrorKey);
-_NS_CONST(ErrorUserInfoKey, StringEncodingErrorKey);
-_NS_CONST(ErrorUserInfoKey, URLErrorKey);
-_NS_CONST(ErrorUserInfoKey, FilePathErrorKey);
-
-class Error : public Copying<Error>
-{
-public:
-    static Error*     error(ErrorDomain domain, Integer code, class Dictionary* pDictionary);
-
-    static Error*     alloc();
-    Error*            init();
-    Error*            init(ErrorDomain domain, Integer code, class Dictionary* pDictionary);
-
-    Integer           code() const;
-    ErrorDomain       domain() const;
-    class Dictionary* userInfo() const;
-
-    class String*     localizedDescription() const;
-    class Array*      localizedRecoveryOptions() const;
-    class String*     localizedRecoverySuggestion() const;
-    class String*     localizedFailureReason() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_PRIVATE_DEF_CONST(NS::ErrorDomain, CocoaErrorDomain);
-_NS_PRIVATE_DEF_CONST(NS::ErrorDomain, POSIXErrorDomain);
-_NS_PRIVATE_DEF_CONST(NS::ErrorDomain, OSStatusErrorDomain);
-_NS_PRIVATE_DEF_CONST(NS::ErrorDomain, MachErrorDomain);
-
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, UnderlyingErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, LocalizedDescriptionKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, LocalizedFailureReasonErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, LocalizedRecoverySuggestionErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, LocalizedRecoveryOptionsErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, RecoveryAttempterErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, HelpAnchorErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, DebugDescriptionErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, LocalizedFailureErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, StringEncodingErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, URLErrorKey);
-_NS_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, FilePathErrorKey);
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Error* NS::Error::error(ErrorDomain domain, Integer code, class Dictionary* pDictionary)
-{
-    return Object::sendMessage<Error*>(_NS_PRIVATE_CLS(NSError), _NS_PRIVATE_SEL(errorWithDomain_code_userInfo_), domain, code, pDictionary);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Error* NS::Error::alloc()
-{
-    return Object::alloc<Error>(_NS_PRIVATE_CLS(NSError));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Error* NS::Error::init()
-{
-    return Object::init<Error>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Error* NS::Error::init(ErrorDomain domain, Integer code, class Dictionary* pDictionary)
-{
-    return Object::sendMessage<Error*>(this, _NS_PRIVATE_SEL(initWithDomain_code_userInfo_), domain, code, pDictionary);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Integer NS::Error::code() const
-{
-    return Object::sendMessage<Integer>(this, _NS_PRIVATE_SEL(code));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::ErrorDomain NS::Error::domain() const
-{
-    return Object::sendMessage<ErrorDomain>(this, _NS_PRIVATE_SEL(domain));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Error::userInfo() const
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(userInfo));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Error::localizedDescription() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(localizedDescription));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::Error::localizedRecoveryOptions() const
-{
-    return Object::sendMessage<Array*>(this, _NS_PRIVATE_SEL(localizedRecoveryOptions));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Error::localizedRecoverySuggestion() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(localizedRecoverySuggestion));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Error::localizedFailureReason() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(localizedFailureReason));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSLock.hpp b/engine/thirdparty/metal-cpp/Foundation/NSLock.hpp
deleted file mode 100644
index 01df2194..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSLock.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSLock.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-#include "NSDate.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-
-template <class _Class, class _Base = class Object>
-class Locking : public _Base
-{
-public:
-    void lock();
-    void unlock();
-};
-
-class Condition : public Locking<Condition>
-{
-public:
-    static Condition* alloc();
-
-    Condition*        init();
-
-    void              wait();
-    bool              waitUntilDate(Date* pLimit);
-    void              signal();
-    void              broadcast();
-};
-
-} // NS
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template<class _Class, class _Base /* = NS::Object */>
-_NS_INLINE void NS::Locking<_Class, _Base>::lock()
-{
-    NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(lock));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template<class _Class, class _Base /* = NS::Object */>
-_NS_INLINE void NS::Locking<_Class, _Base>::unlock()
-{
-    NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(unlock));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Condition* NS::Condition::alloc()
-{
-    return NS::Object::alloc<NS::Condition>(_NS_PRIVATE_CLS(NSCondition));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Condition* NS::Condition::init()
-{
-    return NS::Object::init<NS::Condition>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::Condition::wait()
-{
-    NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(wait));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Condition::waitUntilDate(NS::Date* pLimit)
-{
-    return NS::Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(waitUntilDate_), pLimit);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::Condition::signal()
-{
-    NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(signal));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::Condition::broadcast()
-{
-    NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(broadcast));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSNotification.hpp b/engine/thirdparty/metal-cpp/Foundation/NSNotification.hpp
deleted file mode 100644
index 6b5be121..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSNotification.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSNotification.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSDictionary.hpp"
-#include "NSObject.hpp"
-#include "NSString.hpp"
-#include "NSTypes.hpp"
-#include <functional>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-using NotificationName = class String*;
-
-class Notification : public NS::Referencing<Notification>
-{
-public:
-    NS::String*     name() const;
-    NS::Object*     object() const;
-    NS::Dictionary* userInfo() const;
-};
-
-using ObserverBlock = void(^)(Notification*);
-using ObserverFunction = std::function<void(Notification*)>;
-
-class NotificationCenter : public NS::Referencing<NotificationCenter>
-{
-    public:
-        static class NotificationCenter* defaultCenter();
-        Object* addObserver(NotificationName name, Object* pObj, void* pQueue, ObserverBlock block);
-        Object* addObserver(NotificationName name, Object* pObj, void* pQueue, ObserverFunction &handler);
-        void removeObserver(Object* pObserver);
-
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Notification::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _NS_PRIVATE_SEL(name));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Object* NS::Notification::object() const
-{
-    return Object::sendMessage<NS::Object*>(this, _NS_PRIVATE_SEL(object));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::Notification::userInfo() const
-{
-    return Object::sendMessage<NS::Dictionary*>(this, _NS_PRIVATE_SEL(userInfo));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::NotificationCenter* NS::NotificationCenter::defaultCenter()
-{
-    return NS::Object::sendMessage<NS::NotificationCenter*>(_NS_PRIVATE_CLS(NSNotificationCenter), _NS_PRIVATE_SEL(defaultCenter));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Object* NS::NotificationCenter::addObserver(NS::NotificationName name, Object* pObj, void* pQueue, NS::ObserverBlock block)
-{
-    return NS::Object::sendMessage<Object*>(this, _NS_PRIVATE_SEL(addObserverName_object_queue_block_), name, pObj, pQueue, block);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Object* NS::NotificationCenter::addObserver(NS::NotificationName name, Object* pObj, void* pQueue, NS::ObserverFunction &handler)
-{
-    __block ObserverFunction blockFunction = handler;
-
-    return addObserver(name, pObj, pQueue, ^(NS::Notification* pNotif) {blockFunction(pNotif);});
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::NotificationCenter::removeObserver(Object* pObserver)
-{
-    return NS::Object::sendMessage<void>(this, _NS_PRIVATE_SEL(removeObserver_), pObserver);
-}
-
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSNumber.hpp b/engine/thirdparty/metal-cpp/Foundation/NSNumber.hpp
deleted file mode 100644
index eec7ceac..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSNumber.hpp
+++ /dev/null
@@ -1,501 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSNumber.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSObjCRuntime.hpp"
-#include "NSObject.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class Value : public Copying<Value>
-{
-public:
-    static Value* value(const void* pValue, const char* pType);
-    static Value* value(const void* pPointer);
-
-    static Value* alloc();
-
-    Value*        init(const void* pValue, const char* pType);
-    Value*        init(const class Coder* pCoder);
-
-    void          getValue(void* pValue, UInteger size) const;
-    const char*   objCType() const;
-
-    bool          isEqualToValue(Value* pValue) const;
-    void*         pointerValue() const;
-};
-
-class Number : public Copying<Number, Value>
-{
-public:
-    static Number*     number(char value);
-    static Number*     number(unsigned char value);
-    static Number*     number(short value);
-    static Number*     number(unsigned short value);
-    static Number*     number(int value);
-    static Number*     number(unsigned int value);
-    static Number*     number(long value);
-    static Number*     number(unsigned long value);
-    static Number*     number(long long value);
-    static Number*     number(unsigned long long value);
-    static Number*     number(float value);
-    static Number*     number(double value);
-    static Number*     number(bool value);
-
-    static Number*     alloc();
-
-    Number*            init(const class Coder* pCoder);
-    Number*            init(char value);
-    Number*            init(unsigned char value);
-    Number*            init(short value);
-    Number*            init(unsigned short value);
-    Number*            init(int value);
-    Number*            init(unsigned int value);
-    Number*            init(long value);
-    Number*            init(unsigned long value);
-    Number*            init(long long value);
-    Number*            init(unsigned long long value);
-    Number*            init(float value);
-    Number*            init(double value);
-    Number*            init(bool value);
-
-    char               charValue() const;
-    unsigned char      unsignedCharValue() const;
-    short              shortValue() const;
-    unsigned short     unsignedShortValue() const;
-    int                intValue() const;
-    unsigned int       unsignedIntValue() const;
-    long               longValue() const;
-    unsigned long      unsignedLongValue() const;
-    long long          longLongValue() const;
-    unsigned long long unsignedLongLongValue() const;
-    float              floatValue() const;
-    double             doubleValue() const;
-    bool               boolValue() const;
-    Integer            integerValue() const;
-    UInteger           unsignedIntegerValue() const;
-    class String*      stringValue() const;
-
-    ComparisonResult   compare(const Number* pOtherNumber) const;
-    bool               isEqualToNumber(const Number* pNumber) const;
-
-    class String*      descriptionWithLocale(const Object* pLocale) const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Value* NS::Value::value(const void* pValue, const char* pType)
-{
-    return Object::sendMessage<Value*>(_NS_PRIVATE_CLS(NSValue), _NS_PRIVATE_SEL(valueWithBytes_objCType_), pValue, pType);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Value* NS::Value::value(const void* pPointer)
-{
-    return Object::sendMessage<Value*>(_NS_PRIVATE_CLS(NSValue), _NS_PRIVATE_SEL(valueWithPointer_), pPointer);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Value* NS::Value::alloc()
-{
-    return NS::Object::alloc<Value>(_NS_PRIVATE_CLS(NSValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Value* NS::Value::init(const void* pValue, const char* pType)
-{
-    return Object::sendMessage<Value*>(this, _NS_PRIVATE_SEL(initWithBytes_objCType_), pValue, pType);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Value* NS::Value::init(const class Coder* pCoder)
-{
-    return Object::sendMessage<Value*>(this, _NS_PRIVATE_SEL(initWithCoder_), pCoder);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::Value::getValue(void* pValue, UInteger size) const
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(getValue_size_), pValue, size);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE const char* NS::Value::objCType() const
-{
-    return Object::sendMessage<const char*>(this, _NS_PRIVATE_SEL(objCType));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Value::isEqualToValue(Value* pValue) const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(isEqualToValue_), pValue);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void* NS::Value::pointerValue() const
-{
-    return Object::sendMessage<void*>(this, _NS_PRIVATE_SEL(pointerValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(char value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithChar_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(unsigned char value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithUnsignedChar_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(short value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithShort_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(unsigned short value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithUnsignedShort_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(int value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithInt_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(unsigned int value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithUnsignedInt_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(long value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(unsigned long value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithUnsignedLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(long long value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithLongLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(unsigned long long value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithUnsignedLongLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(float value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithFloat_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(double value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithDouble_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::number(bool value)
-{
-    return Object::sendMessage<Number*>(_NS_PRIVATE_CLS(NSNumber), _NS_PRIVATE_SEL(numberWithBool_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::alloc()
-{
-    return NS::Object::alloc<Number>(_NS_PRIVATE_CLS(NSNumber));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(const Coder* pCoder)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithCoder_), pCoder);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(char value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithChar_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(unsigned char value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithUnsignedChar_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(short value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithShort_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(unsigned short value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithUnsignedShort_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(int value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithInt_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(unsigned int value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithUnsignedInt_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(long value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(unsigned long value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithUnsignedLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(long long value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithLongLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(unsigned long long value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithUnsignedLongLong_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(float value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithFloat_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(double value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithDouble_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Number* NS::Number::init(bool value)
-{
-    return Object::sendMessage<Number*>(this, _NS_PRIVATE_SEL(initWithBool_), value);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE char NS::Number::charValue() const
-{
-    return Object::sendMessage<char>(this, _NS_PRIVATE_SEL(charValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned char NS::Number::unsignedCharValue() const
-{
-    return Object::sendMessage<unsigned char>(this, _NS_PRIVATE_SEL(unsignedCharValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE short NS::Number::shortValue() const
-{
-    return Object::sendMessage<short>(this, _NS_PRIVATE_SEL(shortValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned short NS::Number::unsignedShortValue() const
-{
-    return Object::sendMessage<unsigned short>(this, _NS_PRIVATE_SEL(unsignedShortValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE int NS::Number::intValue() const
-{
-    return Object::sendMessage<int>(this, _NS_PRIVATE_SEL(intValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned int NS::Number::unsignedIntValue() const
-{
-    return Object::sendMessage<unsigned int>(this, _NS_PRIVATE_SEL(unsignedIntValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE long NS::Number::longValue() const
-{
-    return Object::sendMessage<long>(this, _NS_PRIVATE_SEL(longValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned long NS::Number::unsignedLongValue() const
-{
-    return Object::sendMessage<unsigned long>(this, _NS_PRIVATE_SEL(unsignedLongValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE long long NS::Number::longLongValue() const
-{
-    return Object::sendMessage<long long>(this, _NS_PRIVATE_SEL(longLongValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned long long NS::Number::unsignedLongLongValue() const
-{
-    return Object::sendMessage<unsigned long long>(this, _NS_PRIVATE_SEL(unsignedLongLongValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE float NS::Number::floatValue() const
-{
-    return Object::sendMessage<float>(this, _NS_PRIVATE_SEL(floatValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE double NS::Number::doubleValue() const
-{
-    return Object::sendMessage<double>(this, _NS_PRIVATE_SEL(doubleValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Number::boolValue() const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(boolValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Integer NS::Number::integerValue() const
-{
-    return Object::sendMessage<Integer>(this, _NS_PRIVATE_SEL(integerValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Number::unsignedIntegerValue() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(unsignedIntegerValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Number::stringValue() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(stringValue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::ComparisonResult NS::Number::compare(const Number* pOtherNumber) const
-{
-    return Object::sendMessage<ComparisonResult>(this, _NS_PRIVATE_SEL(compare_), pOtherNumber);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Number::isEqualToNumber(const Number* pNumber) const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(isEqualToNumber_), pNumber);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Number::descriptionWithLocale(const Object* pLocale) const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(descriptionWithLocale_), pLocale);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSObjCRuntime.hpp b/engine/thirdparty/metal-cpp/Foundation/NSObjCRuntime.hpp
deleted file mode 100644
index 9a5364c2..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSObjCRuntime.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSObjCRuntime.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-
-_NS_ENUM(Integer, ComparisonResult) {
-    OrderedAscending = -1L,
-    OrderedSame,
-    OrderedDescending
-};
-
-const Integer NotFound = IntegerMax;
-
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSObject.hpp b/engine/thirdparty/metal-cpp/Foundation/NSObject.hpp
deleted file mode 100644
index 828c18cd..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSObject.hpp
+++ /dev/null
@@ -1,304 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSObject.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-#include <objc/message.h>
-#include <objc/runtime.h>
-
-#include <type_traits>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-template <class _Class, class _Base = class Object>
-class _NS_EXPORT Referencing : public _Base
-{
-public:
-    _Class*  retain();
-    void     release();
-
-    _Class*  autorelease();
-
-    UInteger retainCount() const;
-};
-
-template <class _Class, class _Base = class Object>
-class Copying : public Referencing<_Class, _Base>
-{
-public:
-    _Class* copy() const;
-};
-
-template <class _Class, class _Base = class Object>
-class SecureCoding : public Referencing<_Class, _Base>
-{
-};
-
-class Object : public Referencing<Object, objc_object>
-{
-public:
-    UInteger      hash() const;
-    bool          isEqual(const Object* pObject) const;
-
-    class String* description() const;
-    class String* debugDescription() const;
-
-    template <typename _Ret, typename... _Args>
-    static _Ret sendMessage(const void* pObj, SEL selector, _Args... args);
-
-    template <typename _Ret, typename... _Args>
-    static _Ret sendMessageSafe(const void* pObj, SEL selector, _Args... args);
-
-protected:
-    friend class Referencing<Object, objc_object>;
-
-    template <class _Class>
-    static _Class* alloc(const char* pClassName);
-    template <class _Class>
-    static _Class* alloc(const void* pClass);
-    template <class _Class>
-    _Class* init();
-
-    template <class _Dst>
-    static _Dst                   bridgingCast(const void* pObj);
-    static class MethodSignature* methodSignatureForSelector(const void* pObj, SEL selector);
-    static bool                   respondsToSelector(const void* pObj, SEL selector);
-    template <typename _Type>
-    static constexpr bool doesRequireMsgSendStret();
-
-private:
-    Object() = delete;
-    Object(const Object&) = delete;
-    ~Object() = delete;
-
-    Object& operator=(const Object&) = delete;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class, class _Base /* = Object */>
-_NS_INLINE _Class* NS::Referencing<_Class, _Base>::retain()
-{
-    return Object::sendMessage<_Class*>(this, _NS_PRIVATE_SEL(retain));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class, class _Base /* = Object */>
-_NS_INLINE void NS::Referencing<_Class, _Base>::release()
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(release));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class, class _Base /* = Object */>
-_NS_INLINE _Class* NS::Referencing<_Class, _Base>::autorelease()
-{
-    return Object::sendMessage<_Class*>(this, _NS_PRIVATE_SEL(autorelease));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class, class _Base /* = Object */>
-_NS_INLINE NS::UInteger NS::Referencing<_Class, _Base>::retainCount() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(retainCount));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class, class _Base /* = Object */>
-_NS_INLINE _Class* NS::Copying<_Class, _Base>::copy() const
-{
-    return Object::sendMessage<_Class*>(this, _NS_PRIVATE_SEL(copy));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Dst>
-_NS_INLINE _Dst NS::Object::bridgingCast(const void* pObj)
-{
-#ifdef __OBJC__
-    return (__bridge _Dst)pObj;
-#else
-    return (_Dst)pObj;
-#endif // __OBJC__
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <typename _Type>
-_NS_INLINE constexpr bool NS::Object::doesRequireMsgSendStret()
-{
-#if (defined(__i386__) || defined(__x86_64__))
-    constexpr size_t kStructLimit = (sizeof(std::uintptr_t) << 1);
-
-    return sizeof(_Type) > kStructLimit;
-#elif defined(__arm64__)
-    return false;
-#elif defined(__arm__)
-    constexpr size_t kStructLimit = sizeof(std::uintptr_t);
-
-    return std::is_class_v<_Type> && (sizeof(_Type) > kStructLimit);
-#else
-#error "Unsupported architecture!"
-#endif
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <>
-_NS_INLINE constexpr bool NS::Object::doesRequireMsgSendStret<void>()
-{
-    return false;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <typename _Ret, typename... _Args>
-_NS_INLINE _Ret NS::Object::sendMessage(const void* pObj, SEL selector, _Args... args)
-{
-#if (defined(__i386__) || defined(__x86_64__))
-    if constexpr (std::is_floating_point<_Ret>())
-    {
-        using SendMessageProcFpret = _Ret (*)(const void*, SEL, _Args...);
-
-        const SendMessageProcFpret pProc = reinterpret_cast<SendMessageProcFpret>(&objc_msgSend_fpret);
-
-        return (*pProc)(pObj, selector, args...);
-    }
-    else
-#endif // ( defined( __i386__ )  || defined( __x86_64__ )  )
-#if !defined(__arm64__)
-        if constexpr (doesRequireMsgSendStret<_Ret>())
-    {
-        using SendMessageProcStret = void (*)(_Ret*, const void*, SEL, _Args...);
-
-        const SendMessageProcStret pProc = reinterpret_cast<SendMessageProcStret>(&objc_msgSend_stret);
-        _Ret                       ret;
-
-        (*pProc)(&ret, pObj, selector, args...);
-
-        return ret;
-    }
-    else
-#endif // !defined( __arm64__ )
-    {
-        using SendMessageProc = _Ret (*)(const void*, SEL, _Args...);
-
-        const SendMessageProc pProc = reinterpret_cast<SendMessageProc>(&objc_msgSend);
-
-        return (*pProc)(pObj, selector, args...);
-    }
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::MethodSignature* NS::Object::methodSignatureForSelector(const void* pObj, SEL selector)
-{
-    return sendMessage<MethodSignature*>(pObj, _NS_PRIVATE_SEL(methodSignatureForSelector_), selector);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Object::respondsToSelector(const void* pObj, SEL selector)
-{
-    return sendMessage<bool>(pObj, _NS_PRIVATE_SEL(respondsToSelector_), selector);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <typename _Ret, typename... _Args>
-_NS_INLINE _Ret NS::Object::sendMessageSafe(const void* pObj, SEL selector, _Args... args)
-{
-    if ((respondsToSelector(pObj, selector)) || (nullptr != methodSignatureForSelector(pObj, selector)))
-    {
-        return sendMessage<_Ret>(pObj, selector, args...);
-    }
-
-    if constexpr (!std::is_void<_Ret>::value)
-    {
-        return _Ret(0);
-    }
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class>
-_NS_INLINE _Class* NS::Object::alloc(const char* pClassName)
-{
-    return sendMessage<_Class*>(objc_lookUpClass(pClassName), _NS_PRIVATE_SEL(alloc));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class>
-_NS_INLINE _Class* NS::Object::alloc(const void* pClass)
-{
-    return sendMessage<_Class*>(pClass, _NS_PRIVATE_SEL(alloc));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-template <class _Class>
-_NS_INLINE _Class* NS::Object::init()
-{
-    return sendMessage<_Class*>(this, _NS_PRIVATE_SEL(init));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Object::hash() const
-{
-    return sendMessage<UInteger>(this, _NS_PRIVATE_SEL(hash));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Object::isEqual(const Object* pObject) const
-{
-    return sendMessage<bool>(this, _NS_PRIVATE_SEL(isEqual_), pObject);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Object::description() const
-{
-    return sendMessage<String*>(this, _NS_PRIVATE_SEL(description));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::Object::debugDescription() const
-{
-    return sendMessageSafe<String*>(this, _NS_PRIVATE_SEL(debugDescription));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSPrivate.hpp b/engine/thirdparty/metal-cpp/Foundation/NSPrivate.hpp
deleted file mode 100644
index 12a14636..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSPrivate.hpp
+++ /dev/null
@@ -1,535 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSPrivate.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include <objc/runtime.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _NS_PRIVATE_CLS(symbol) (Private::Class::s_k##symbol)
-#define _NS_PRIVATE_SEL(accessor) (Private::Selector::s_k##accessor)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#if defined(NS_PRIVATE_IMPLEMENTATION)
-
-#include <dlfcn.h>
-
-namespace NS::Private
-{
-    template <typename _Type>
-    inline _Type const LoadSymbol(const char* pSymbol)
-    {
-        const _Type* pAddress = static_cast<_Type*>(dlsym(RTLD_DEFAULT, pSymbol));
-
-        return pAddress ? *pAddress : _Type();
-    }
-} // NS::Private
-
-#ifdef METALCPP_SYMBOL_VISIBILITY_HIDDEN
-#define _NS_PRIVATE_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#define _NS_PRIVATE_VISIBILITY __attribute__((visibility("default")))
-#endif // METALCPP_SYMBOL_VISIBILITY_HIDDEN
-
-#define _NS_PRIVATE_IMPORT __attribute__((weak_import))
-
-#ifdef __OBJC__
-#define _NS_PRIVATE_OBJC_LOOKUP_CLASS(symbol) ((__bridge void*)objc_lookUpClass(#symbol))
-#define _NS_PRIVATE_OBJC_GET_PROTOCOL(symbol) ((__bridge void*)objc_getProtocol(#symbol))
-#else
-#define _NS_PRIVATE_OBJC_LOOKUP_CLASS(symbol) objc_lookUpClass(#symbol)
-#define _NS_PRIVATE_OBJC_GET_PROTOCOL(symbol) objc_getProtocol(#symbol)
-#endif // __OBJC__
-
-#define _NS_PRIVATE_DEF_CLS(symbol) void* s_k##symbol _NS_PRIVATE_VISIBILITY = _NS_PRIVATE_OBJC_LOOKUP_CLASS(symbol)
-#define _NS_PRIVATE_DEF_PRO(symbol) void* s_k##symbol _NS_PRIVATE_VISIBILITY = _NS_PRIVATE_OBJC_GET_PROTOCOL(symbol)
-#define _NS_PRIVATE_DEF_SEL(accessor, symbol) SEL s_k##accessor _NS_PRIVATE_VISIBILITY = sel_registerName(symbol)
-
-#if defined(__MAC_26_0) || defined(__IPHONE_26_0) || defined(__TVOS_26_0)
-#define _NS_PRIVATE_DEF_CONST(type, symbol)              \
-    _NS_EXTERN type const NS##symbol _NS_PRIVATE_IMPORT; \
-    type const                       NS::symbol = (nullptr != &NS##symbol) ? NS##symbol : type()
-#else
-#define _NS_PRIVATE_DEF_CONST(type, symbol) \
-    _NS_EXTERN type const MTL##symbol _NS_PRIVATE_IMPORT; \
-    type const             NS::symbol = Private::LoadSymbol<type>("NS" #symbol)
-#endif
-
-#else
-
-#define _NS_PRIVATE_DEF_CLS(symbol) extern void* s_k##symbol
-#define _NS_PRIVATE_DEF_PRO(symbol) extern void* s_k##symbol
-#define _NS_PRIVATE_DEF_SEL(accessor, symbol) extern SEL s_k##accessor
-#define _NS_PRIVATE_DEF_CONST(type, symbol) extern type const NS::symbol
-
-#endif // NS_PRIVATE_IMPLEMENTATION
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-namespace Private
-{
-    namespace Class
-    {
-
-        _NS_PRIVATE_DEF_CLS(NSArray);
-        _NS_PRIVATE_DEF_CLS(NSAutoreleasePool);
-        _NS_PRIVATE_DEF_CLS(NSBundle);
-        _NS_PRIVATE_DEF_CLS(NSCondition);
-        _NS_PRIVATE_DEF_CLS(NSDate);
-        _NS_PRIVATE_DEF_CLS(NSDictionary);
-        _NS_PRIVATE_DEF_CLS(NSError);
-        _NS_PRIVATE_DEF_CLS(NSNotificationCenter);
-        _NS_PRIVATE_DEF_CLS(NSNumber);
-        _NS_PRIVATE_DEF_CLS(NSObject);
-        _NS_PRIVATE_DEF_CLS(NSProcessInfo);
-        _NS_PRIVATE_DEF_CLS(NSSet);
-        _NS_PRIVATE_DEF_CLS(NSString);
-        _NS_PRIVATE_DEF_CLS(NSURL);
-        _NS_PRIVATE_DEF_CLS(NSValue);
-
-    } // Class
-} // Private
-} // MTL
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-namespace Private
-{
-    namespace Protocol
-    {
-
-    } // Protocol
-} // Private
-} // NS
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-namespace Private
-{
-    namespace Selector
-    {
-
-        _NS_PRIVATE_DEF_SEL(addObject_,
-            "addObject:");
-        _NS_PRIVATE_DEF_SEL(addObserverName_object_queue_block_,
-            "addObserverForName:object:queue:usingBlock:");
-        _NS_PRIVATE_DEF_SEL(activeProcessorCount,
-            "activeProcessorCount");
-        _NS_PRIVATE_DEF_SEL(allBundles,
-            "allBundles");
-        _NS_PRIVATE_DEF_SEL(allFrameworks,
-            "allFrameworks");
-        _NS_PRIVATE_DEF_SEL(allObjects,
-            "allObjects");
-        _NS_PRIVATE_DEF_SEL(alloc,
-            "alloc");
-        _NS_PRIVATE_DEF_SEL(appStoreReceiptURL,
-            "appStoreReceiptURL");
-        _NS_PRIVATE_DEF_SEL(arguments,
-            "arguments");
-        _NS_PRIVATE_DEF_SEL(array,
-            "array");
-        _NS_PRIVATE_DEF_SEL(arrayWithObject_,
-            "arrayWithObject:");
-        _NS_PRIVATE_DEF_SEL(arrayWithObjects_count_,
-            "arrayWithObjects:count:");
-        _NS_PRIVATE_DEF_SEL(automaticTerminationSupportEnabled,
-            "automaticTerminationSupportEnabled");
-        _NS_PRIVATE_DEF_SEL(autorelease,
-            "autorelease");
-        _NS_PRIVATE_DEF_SEL(beginActivityWithOptions_reason_,
-            "beginActivityWithOptions:reason:");
-        _NS_PRIVATE_DEF_SEL(boolValue,
-            "boolValue");
-        _NS_PRIVATE_DEF_SEL(broadcast,
-            "broadcast");
-        _NS_PRIVATE_DEF_SEL(builtInPlugInsPath,
-            "builtInPlugInsPath");
-        _NS_PRIVATE_DEF_SEL(builtInPlugInsURL,
-            "builtInPlugInsURL");
-        _NS_PRIVATE_DEF_SEL(bundleIdentifier,
-            "bundleIdentifier");
-        _NS_PRIVATE_DEF_SEL(bundlePath,
-            "bundlePath");
-        _NS_PRIVATE_DEF_SEL(bundleURL,
-            "bundleURL");
-        _NS_PRIVATE_DEF_SEL(bundleWithPath_,
-            "bundleWithPath:");
-        _NS_PRIVATE_DEF_SEL(bundleWithURL_,
-            "bundleWithURL:");
-        _NS_PRIVATE_DEF_SEL(bytes,
-            "bytes");
-        _NS_PRIVATE_DEF_SEL(caseInsensitiveCompare_,
-            "caseInsensitiveCompare:");
-        _NS_PRIVATE_DEF_SEL(characterAtIndex_,
-            "characterAtIndex:");
-        _NS_PRIVATE_DEF_SEL(charValue,
-            "charValue");
-        _NS_PRIVATE_DEF_SEL(countByEnumeratingWithState_objects_count_,
-            "countByEnumeratingWithState:objects:count:");
-        _NS_PRIVATE_DEF_SEL(cStringUsingEncoding_,
-            "cStringUsingEncoding:");
-        _NS_PRIVATE_DEF_SEL(code,
-            "code");
-        _NS_PRIVATE_DEF_SEL(compare_,
-            "compare:");
-        _NS_PRIVATE_DEF_SEL(copy,
-            "copy");
-        _NS_PRIVATE_DEF_SEL(count,
-            "count");
-        _NS_PRIVATE_DEF_SEL(dateWithTimeIntervalSinceNow_,
-            "dateWithTimeIntervalSinceNow:");
-        _NS_PRIVATE_DEF_SEL(defaultCenter,
-            "defaultCenter");
-        _NS_PRIVATE_DEF_SEL(descriptionWithLocale_,
-            "descriptionWithLocale:");
-        _NS_PRIVATE_DEF_SEL(disableAutomaticTermination_,
-            "disableAutomaticTermination:");
-        _NS_PRIVATE_DEF_SEL(disableSuddenTermination,
-            "disableSuddenTermination");
-        _NS_PRIVATE_DEF_SEL(debugDescription,
-            "debugDescription");
-        _NS_PRIVATE_DEF_SEL(description,
-            "description");
-        _NS_PRIVATE_DEF_SEL(dictionary,
-            "dictionary");
-        _NS_PRIVATE_DEF_SEL(dictionaryWithObject_forKey_,
-            "dictionaryWithObject:forKey:");
-        _NS_PRIVATE_DEF_SEL(dictionaryWithObjects_forKeys_count_,
-            "dictionaryWithObjects:forKeys:count:");
-        _NS_PRIVATE_DEF_SEL(domain,
-            "domain");
-        _NS_PRIVATE_DEF_SEL(doubleValue,
-            "doubleValue");
-        _NS_PRIVATE_DEF_SEL(drain,
-            "drain");
-        _NS_PRIVATE_DEF_SEL(enableAutomaticTermination_,
-            "enableAutomaticTermination:");
-        _NS_PRIVATE_DEF_SEL(enableSuddenTermination,
-            "enableSuddenTermination");
-        _NS_PRIVATE_DEF_SEL(endActivity_,
-            "endActivity:");
-        _NS_PRIVATE_DEF_SEL(environment,
-            "environment");
-        _NS_PRIVATE_DEF_SEL(errorWithDomain_code_userInfo_,
-            "errorWithDomain:code:userInfo:");
-        _NS_PRIVATE_DEF_SEL(executablePath,
-            "executablePath");
-        _NS_PRIVATE_DEF_SEL(executableURL,
-            "executableURL");
-        _NS_PRIVATE_DEF_SEL(fileSystemRepresentation,
-            "fileSystemRepresentation");
-        _NS_PRIVATE_DEF_SEL(fileURLWithPath_,
-            "fileURLWithPath:");
-        _NS_PRIVATE_DEF_SEL(floatValue,
-            "floatValue");
-        _NS_PRIVATE_DEF_SEL(fullUserName,
-            "fullUserName");
-        _NS_PRIVATE_DEF_SEL(getValue_size_,
-            "getValue:size:");
-        _NS_PRIVATE_DEF_SEL(globallyUniqueString,
-            "globallyUniqueString");
-        _NS_PRIVATE_DEF_SEL(hash,
-            "hash");
-        _NS_PRIVATE_DEF_SEL(hasPerformanceProfile_,
-            "hasPerformanceProfile:");
-        _NS_PRIVATE_DEF_SEL(hostName,
-            "hostName");
-        _NS_PRIVATE_DEF_SEL(infoDictionary,
-            "infoDictionary");
-        _NS_PRIVATE_DEF_SEL(init,
-            "init");
-        _NS_PRIVATE_DEF_SEL(initFileURLWithPath_,
-            "initFileURLWithPath:");
-        _NS_PRIVATE_DEF_SEL(initWithBool_,
-            "initWithBool:");
-        _NS_PRIVATE_DEF_SEL(initWithBytes_length_encoding_,
-            "initWithBytes:length:encoding:");
-        _NS_PRIVATE_DEF_SEL(initWithBytes_objCType_,
-            "initWithBytes:objCType:");
-        _NS_PRIVATE_DEF_SEL(initWithBytesNoCopy_length_encoding_freeWhenDone_,
-            "initWithBytesNoCopy:length:encoding:freeWhenDone:");
-        _NS_PRIVATE_DEF_SEL(initWithChar_,
-            "initWithChar:");
-        _NS_PRIVATE_DEF_SEL(initWithCoder_,
-            "initWithCoder:");
-        _NS_PRIVATE_DEF_SEL(initWithCString_encoding_,
-            "initWithCString:encoding:");
-        _NS_PRIVATE_DEF_SEL(initWithDomain_code_userInfo_,
-            "initWithDomain:code:userInfo:");
-        _NS_PRIVATE_DEF_SEL(initWithDouble_,
-            "initWithDouble:");
-        _NS_PRIVATE_DEF_SEL(initWithFloat_,
-            "initWithFloat:");
-        _NS_PRIVATE_DEF_SEL(initWithInt_,
-            "initWithInt:");
-        _NS_PRIVATE_DEF_SEL(initWithLong_,
-            "initWithLong:");
-        _NS_PRIVATE_DEF_SEL(initWithLongLong_,
-            "initWithLongLong:");
-        _NS_PRIVATE_DEF_SEL(initWithObjects_count_,
-            "initWithObjects:count:");
-        _NS_PRIVATE_DEF_SEL(initWithObjects_forKeys_count_,
-            "initWithObjects:forKeys:count:");
-        _NS_PRIVATE_DEF_SEL(initWithPath_,
-            "initWithPath:");
-        _NS_PRIVATE_DEF_SEL(initWithShort_,
-            "initWithShort:");
-        _NS_PRIVATE_DEF_SEL(initWithString_,
-            "initWithString:");
-        _NS_PRIVATE_DEF_SEL(initWithUnsignedChar_,
-            "initWithUnsignedChar:");
-        _NS_PRIVATE_DEF_SEL(initWithUnsignedInt_,
-            "initWithUnsignedInt:");
-        _NS_PRIVATE_DEF_SEL(initWithUnsignedLong_,
-            "initWithUnsignedLong:");
-        _NS_PRIVATE_DEF_SEL(initWithUnsignedLongLong_,
-            "initWithUnsignedLongLong:");
-        _NS_PRIVATE_DEF_SEL(initWithUnsignedShort_,
-            "initWithUnsignedShort:");
-        _NS_PRIVATE_DEF_SEL(initWithURL_,
-            "initWithURL:");
-        _NS_PRIVATE_DEF_SEL(integerValue,
-            "integerValue");
-        _NS_PRIVATE_DEF_SEL(intValue,
-            "intValue");
-        _NS_PRIVATE_DEF_SEL(isDeviceCertified_,
-            "isDeviceCertifiedFor:");
-        _NS_PRIVATE_DEF_SEL(isEqual_,
-            "isEqual:");
-        _NS_PRIVATE_DEF_SEL(isEqualToNumber_,
-            "isEqualToNumber:");
-        _NS_PRIVATE_DEF_SEL(isEqualToString_,
-            "isEqualToString:");
-        _NS_PRIVATE_DEF_SEL(isEqualToValue_,
-            "isEqualToValue:");
-        _NS_PRIVATE_DEF_SEL(isiOSAppOnMac,
-            "isiOSAppOnMac");
-        _NS_PRIVATE_DEF_SEL(isLoaded,
-            "isLoaded");
-        _NS_PRIVATE_DEF_SEL(isLowPowerModeEnabled,
-            "isLowPowerModeEnabled");
-        _NS_PRIVATE_DEF_SEL(isMacCatalystApp,
-            "isMacCatalystApp");
-        _NS_PRIVATE_DEF_SEL(isOperatingSystemAtLeastVersion_,
-            "isOperatingSystemAtLeastVersion:");
-        _NS_PRIVATE_DEF_SEL(keyEnumerator,
-            "keyEnumerator");
-        _NS_PRIVATE_DEF_SEL(length,
-            "length");
-        _NS_PRIVATE_DEF_SEL(lengthOfBytesUsingEncoding_,
-            "lengthOfBytesUsingEncoding:");
-        _NS_PRIVATE_DEF_SEL(load,
-            "load");
-        _NS_PRIVATE_DEF_SEL(loadAndReturnError_,
-            "loadAndReturnError:");
-        _NS_PRIVATE_DEF_SEL(localizedDescription,
-            "localizedDescription");
-        _NS_PRIVATE_DEF_SEL(localizedFailureReason,
-            "localizedFailureReason");
-        _NS_PRIVATE_DEF_SEL(localizedInfoDictionary,
-            "localizedInfoDictionary");
-        _NS_PRIVATE_DEF_SEL(localizedRecoveryOptions,
-            "localizedRecoveryOptions");
-        _NS_PRIVATE_DEF_SEL(localizedRecoverySuggestion,
-            "localizedRecoverySuggestion");
-        _NS_PRIVATE_DEF_SEL(localizedStringForKey_value_table_,
-            "localizedStringForKey:value:table:");
-        _NS_PRIVATE_DEF_SEL(lock,
-            "lock");
-        _NS_PRIVATE_DEF_SEL(longValue,
-            "longValue");
-        _NS_PRIVATE_DEF_SEL(longLongValue,
-            "longLongValue");
-        _NS_PRIVATE_DEF_SEL(mainBundle,
-            "mainBundle");
-        _NS_PRIVATE_DEF_SEL(maximumLengthOfBytesUsingEncoding_,
-            "maximumLengthOfBytesUsingEncoding:");
-        _NS_PRIVATE_DEF_SEL(methodSignatureForSelector_,
-            "methodSignatureForSelector:");
-        _NS_PRIVATE_DEF_SEL(mutableBytes,
-            "mutableBytes");
-        _NS_PRIVATE_DEF_SEL(name,
-            "name");
-        _NS_PRIVATE_DEF_SEL(nextObject,
-            "nextObject");
-        _NS_PRIVATE_DEF_SEL(numberWithBool_,
-            "numberWithBool:");
-        _NS_PRIVATE_DEF_SEL(numberWithChar_,
-            "numberWithChar:");
-        _NS_PRIVATE_DEF_SEL(numberWithDouble_,
-            "numberWithDouble:");
-        _NS_PRIVATE_DEF_SEL(numberWithFloat_,
-            "numberWithFloat:");
-        _NS_PRIVATE_DEF_SEL(numberWithInt_,
-            "numberWithInt:");
-        _NS_PRIVATE_DEF_SEL(numberWithLong_,
-            "numberWithLong:");
-        _NS_PRIVATE_DEF_SEL(numberWithLongLong_,
-            "numberWithLongLong:");
-        _NS_PRIVATE_DEF_SEL(numberWithShort_,
-            "numberWithShort:");
-        _NS_PRIVATE_DEF_SEL(numberWithUnsignedChar_,
-            "numberWithUnsignedChar:");
-        _NS_PRIVATE_DEF_SEL(numberWithUnsignedInt_,
-            "numberWithUnsignedInt:");
-        _NS_PRIVATE_DEF_SEL(numberWithUnsignedLong_,
-            "numberWithUnsignedLong:");
-        _NS_PRIVATE_DEF_SEL(numberWithUnsignedLongLong_,
-            "numberWithUnsignedLongLong:");
-        _NS_PRIVATE_DEF_SEL(numberWithUnsignedShort_,
-            "numberWithUnsignedShort:");
-        _NS_PRIVATE_DEF_SEL(objCType,
-            "objCType");
-        _NS_PRIVATE_DEF_SEL(object,
-            "object");
-        _NS_PRIVATE_DEF_SEL(objectAtIndex_,
-            "objectAtIndex:");
-        _NS_PRIVATE_DEF_SEL(objectEnumerator,
-            "objectEnumerator");
-        _NS_PRIVATE_DEF_SEL(objectForInfoDictionaryKey_,
-            "objectForInfoDictionaryKey:");
-        _NS_PRIVATE_DEF_SEL(objectForKey_,
-            "objectForKey:");
-        _NS_PRIVATE_DEF_SEL(operatingSystem,
-            "operatingSystem");
-        _NS_PRIVATE_DEF_SEL(operatingSystemVersion,
-            "operatingSystemVersion");
-        _NS_PRIVATE_DEF_SEL(operatingSystemVersionString,
-            "operatingSystemVersionString");
-        _NS_PRIVATE_DEF_SEL(pathForAuxiliaryExecutable_,
-            "pathForAuxiliaryExecutable:");
-        _NS_PRIVATE_DEF_SEL(performActivityWithOptions_reason_usingBlock_,
-            "performActivityWithOptions:reason:usingBlock:");
-        _NS_PRIVATE_DEF_SEL(performExpiringActivityWithReason_usingBlock_,
-            "performExpiringActivityWithReason:usingBlock:");
-        _NS_PRIVATE_DEF_SEL(physicalMemory,
-            "physicalMemory");
-        _NS_PRIVATE_DEF_SEL(pointerValue,
-            "pointerValue");
-        _NS_PRIVATE_DEF_SEL(preflightAndReturnError_,
-            "preflightAndReturnError:");
-        _NS_PRIVATE_DEF_SEL(privateFrameworksPath,
-            "privateFrameworksPath");
-        _NS_PRIVATE_DEF_SEL(privateFrameworksURL,
-            "privateFrameworksURL");
-        _NS_PRIVATE_DEF_SEL(processIdentifier,
-            "processIdentifier");
-        _NS_PRIVATE_DEF_SEL(processInfo,
-            "processInfo");
-        _NS_PRIVATE_DEF_SEL(processName,
-            "processName");
-        _NS_PRIVATE_DEF_SEL(processorCount,
-            "processorCount");
-        _NS_PRIVATE_DEF_SEL(rangeOfString_options_,
-            "rangeOfString:options:");
-        _NS_PRIVATE_DEF_SEL(release,
-            "release");
-        _NS_PRIVATE_DEF_SEL(removeObserver_,
-            "removeObserver:");
-        _NS_PRIVATE_DEF_SEL(resourcePath,
-            "resourcePath");
-        _NS_PRIVATE_DEF_SEL(resourceURL,
-            "resourceURL");
-        _NS_PRIVATE_DEF_SEL(respondsToSelector_,
-            "respondsToSelector:");
-        _NS_PRIVATE_DEF_SEL(retain,
-            "retain");
-        _NS_PRIVATE_DEF_SEL(retainCount,
-            "retainCount");
-        _NS_PRIVATE_DEF_SEL(setAutomaticTerminationSupportEnabled_,
-            "setAutomaticTerminationSupportEnabled:");
-        _NS_PRIVATE_DEF_SEL(setProcessName_,
-            "setProcessName:");
-        _NS_PRIVATE_DEF_SEL(sharedFrameworksPath,
-            "sharedFrameworksPath");
-        _NS_PRIVATE_DEF_SEL(sharedFrameworksURL,
-            "sharedFrameworksURL");
-        _NS_PRIVATE_DEF_SEL(sharedSupportPath,
-            "sharedSupportPath");
-        _NS_PRIVATE_DEF_SEL(sharedSupportURL,
-            "sharedSupportURL");
-        _NS_PRIVATE_DEF_SEL(shortValue,
-            "shortValue");
-        _NS_PRIVATE_DEF_SEL(showPools,
-            "showPools");
-        _NS_PRIVATE_DEF_SEL(signal,
-            "signal");
-        _NS_PRIVATE_DEF_SEL(string,
-            "string");
-        _NS_PRIVATE_DEF_SEL(stringValue,
-            "stringValue");
-        _NS_PRIVATE_DEF_SEL(stringWithString_,
-            "stringWithString:");
-        _NS_PRIVATE_DEF_SEL(stringWithCString_encoding_,
-            "stringWithCString:encoding:");
-        _NS_PRIVATE_DEF_SEL(stringByAppendingString_,
-            "stringByAppendingString:");
-        _NS_PRIVATE_DEF_SEL(systemUptime,
-            "systemUptime");
-        _NS_PRIVATE_DEF_SEL(thermalState,
-            "thermalState");
-        _NS_PRIVATE_DEF_SEL(unload,
-            "unload");
-        _NS_PRIVATE_DEF_SEL(unlock,
-            "unlock");
-        _NS_PRIVATE_DEF_SEL(unsignedCharValue,
-            "unsignedCharValue");
-        _NS_PRIVATE_DEF_SEL(unsignedIntegerValue,
-            "unsignedIntegerValue");
-        _NS_PRIVATE_DEF_SEL(unsignedIntValue,
-            "unsignedIntValue");
-        _NS_PRIVATE_DEF_SEL(unsignedLongValue,
-            "unsignedLongValue");
-        _NS_PRIVATE_DEF_SEL(unsignedLongLongValue,
-            "unsignedLongLongValue");
-        _NS_PRIVATE_DEF_SEL(unsignedShortValue,
-            "unsignedShortValue");
-        _NS_PRIVATE_DEF_SEL(URLForAuxiliaryExecutable_,
-            "URLForAuxiliaryExecutable:");
-        _NS_PRIVATE_DEF_SEL(userInfo,
-            "userInfo");
-        _NS_PRIVATE_DEF_SEL(userName,
-            "userName");
-        _NS_PRIVATE_DEF_SEL(UTF8String,
-            "UTF8String");
-        _NS_PRIVATE_DEF_SEL(valueWithBytes_objCType_,
-            "valueWithBytes:objCType:");
-        _NS_PRIVATE_DEF_SEL(valueWithPointer_,
-            "valueWithPointer:");
-        _NS_PRIVATE_DEF_SEL(wait,
-            "wait");
-        _NS_PRIVATE_DEF_SEL(waitUntilDate_,
-            "waitUntilDate:");
-    } // Class
-} // Private
-} // MTL
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSProcessInfo.hpp b/engine/thirdparty/metal-cpp/Foundation/NSProcessInfo.hpp
deleted file mode 100644
index 09c212d5..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSProcessInfo.hpp
+++ /dev/null
@@ -1,386 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSProcessInfo.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSNotification.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-#include <functional>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-_NS_CONST(NotificationName, ProcessInfoThermalStateDidChangeNotification);
-_NS_CONST(NotificationName, ProcessInfoPowerStateDidChangeNotification);
-_NS_CONST(NotificationName, ProcessInfoPerformanceProfileDidChangeNotification);
-
-_NS_ENUM(NS::Integer, ProcessInfoThermalState) {
-    ProcessInfoThermalStateNominal = 0,
-    ProcessInfoThermalStateFair = 1,
-    ProcessInfoThermalStateSerious = 2,
-    ProcessInfoThermalStateCritical = 3
-};
-
-_NS_OPTIONS(std::uint64_t, ActivityOptions) {
-    ActivityIdleDisplaySleepDisabled = (1ULL << 40),
-    ActivityIdleSystemSleepDisabled = (1ULL << 20),
-    ActivitySuddenTerminationDisabled = (1ULL << 14),
-    ActivityAutomaticTerminationDisabled = (1ULL << 15),
-    ActivityUserInitiated = (0x00FFFFFFULL | ActivityIdleSystemSleepDisabled),
-    ActivityUserInitiatedAllowingIdleSystemSleep = (ActivityUserInitiated & ~ActivityIdleSystemSleepDisabled),
-    ActivityBackground = 0x000000FFULL,
-    ActivityLatencyCritical = 0xFF00000000ULL,
-};
-
-typedef NS::Integer DeviceCertification;
-_NS_CONST(DeviceCertification, DeviceCertificationiPhonePerformanceGaming);
-
-typedef NS::Integer ProcessPerformanceProfile;
-_NS_CONST(ProcessPerformanceProfile, ProcessPerformanceProfileDefault);
-_NS_CONST(ProcessPerformanceProfile, ProcessPerformanceProfileSustained);
-
-class ProcessInfo : public Referencing<ProcessInfo>
-{
-public:
-    static ProcessInfo*     processInfo();
-
-    class Array*            arguments() const;
-    class Dictionary*       environment() const;
-    class String*           hostName() const;
-    class String*           processName() const;
-    void                    setProcessName(const String* pString);
-    int                     processIdentifier() const;
-    class String*           globallyUniqueString() const;
-
-    class String*           userName() const;
-    class String*           fullUserName() const;
-
-    UInteger                operatingSystem() const;
-    OperatingSystemVersion  operatingSystemVersion() const;
-    class String*           operatingSystemVersionString() const;
-    bool                    isOperatingSystemAtLeastVersion(OperatingSystemVersion version) const;
-
-    UInteger                processorCount() const;
-    UInteger                activeProcessorCount() const;
-    unsigned long long      physicalMemory() const;
-    TimeInterval            systemUptime() const;
-
-    void                    disableSuddenTermination();
-    void                    enableSuddenTermination();
-
-    void                    disableAutomaticTermination(const class String* pReason);
-    void                    enableAutomaticTermination(const class String* pReason);
-    bool                    automaticTerminationSupportEnabled() const;
-    void                    setAutomaticTerminationSupportEnabled(bool enabled);
-
-    class Object*           beginActivity(ActivityOptions options, const class String* pReason);
-    void                    endActivity(class Object* pActivity);
-    void                    performActivity(ActivityOptions options, const class String* pReason, void (^block)(void));
-    void                    performActivity(ActivityOptions options, const class String* pReason, const std::function<void()>& func);
-    void                    performExpiringActivity(const class String* pReason, void (^block)(bool expired));
-    void                    performExpiringActivity(const class String* pReason, const std::function<void(bool expired)>& func);
-
-    ProcessInfoThermalState thermalState() const;
-    bool                    isLowPowerModeEnabled() const;
-
-    bool                    isiOSAppOnMac() const;
-    bool                    isMacCatalystApp() const;
-
-    bool                    isDeviceCertified(DeviceCertification performanceTier) const;
-    bool                    hasPerformanceProfile(ProcessPerformanceProfile performanceProfile) const;
-
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_PRIVATE_DEF_CONST(NS::NotificationName, ProcessInfoThermalStateDidChangeNotification);
-_NS_PRIVATE_DEF_CONST(NS::NotificationName, ProcessInfoPowerStateDidChangeNotification);
-
-// The linker searches for these symbols in the Metal framework, be sure to link it in as well:
-_NS_PRIVATE_DEF_CONST(NS::NotificationName, ProcessInfoPerformanceProfileDidChangeNotification);
-_NS_PRIVATE_DEF_CONST(NS::DeviceCertification, DeviceCertificationiPhonePerformanceGaming);
-_NS_PRIVATE_DEF_CONST(NS::ProcessPerformanceProfile, ProcessPerformanceProfileDefault);
-_NS_PRIVATE_DEF_CONST(NS::ProcessPerformanceProfile, ProcessPerformanceProfileSustained);
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::ProcessInfo* NS::ProcessInfo::processInfo()
-{
-    return Object::sendMessage<ProcessInfo*>(_NS_PRIVATE_CLS(NSProcessInfo), _NS_PRIVATE_SEL(processInfo));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Array* NS::ProcessInfo::arguments() const
-{
-    return Object::sendMessage<Array*>(this, _NS_PRIVATE_SEL(arguments));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Dictionary* NS::ProcessInfo::environment() const
-{
-    return Object::sendMessage<Dictionary*>(this, _NS_PRIVATE_SEL(environment));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::hostName() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(hostName));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::processName() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(processName));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::setProcessName(const String* pString)
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(setProcessName_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE int NS::ProcessInfo::processIdentifier() const
-{
-    return Object::sendMessage<int>(this, _NS_PRIVATE_SEL(processIdentifier));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::globallyUniqueString() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(globallyUniqueString));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::userName() const
-{
-    return Object::sendMessageSafe<String*>(this, _NS_PRIVATE_SEL(userName));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::fullUserName() const
-{
-    return Object::sendMessageSafe<String*>(this, _NS_PRIVATE_SEL(fullUserName));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::ProcessInfo::operatingSystem() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(operatingSystem));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::OperatingSystemVersion NS::ProcessInfo::operatingSystemVersion() const
-{
-    return Object::sendMessage<OperatingSystemVersion>(this, _NS_PRIVATE_SEL(operatingSystemVersion));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::ProcessInfo::operatingSystemVersionString() const
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(operatingSystemVersionString));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::isOperatingSystemAtLeastVersion(OperatingSystemVersion version) const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(isOperatingSystemAtLeastVersion_), version);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::ProcessInfo::processorCount() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(processorCount));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::ProcessInfo::activeProcessorCount() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(activeProcessorCount));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE unsigned long long NS::ProcessInfo::physicalMemory() const
-{
-    return Object::sendMessage<unsigned long long>(this, _NS_PRIVATE_SEL(physicalMemory));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::TimeInterval NS::ProcessInfo::systemUptime() const
-{
-    return Object::sendMessage<TimeInterval>(this, _NS_PRIVATE_SEL(systemUptime));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::disableSuddenTermination()
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(disableSuddenTermination));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::enableSuddenTermination()
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(enableSuddenTermination));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::disableAutomaticTermination(const String* pReason)
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(disableAutomaticTermination_), pReason);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::enableAutomaticTermination(const String* pReason)
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(enableAutomaticTermination_), pReason);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::automaticTerminationSupportEnabled() const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(automaticTerminationSupportEnabled));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::setAutomaticTerminationSupportEnabled(bool enabled)
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(setAutomaticTerminationSupportEnabled_), enabled);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Object* NS::ProcessInfo::beginActivity(ActivityOptions options, const String* pReason)
-{
-    return Object::sendMessage<Object*>(this, _NS_PRIVATE_SEL(beginActivityWithOptions_reason_), options, pReason);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::endActivity(Object* pActivity)
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(endActivity_), pActivity);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::performActivity(ActivityOptions options, const String* pReason, void (^block)(void))
-{
-    Object::sendMessage<void>(this, _NS_PRIVATE_SEL(performActivityWithOptions_reason_usingBlock_), options, pReason, block);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::performActivity(ActivityOptions options, const String* pReason, const std::function<void()>& function)
-{
-    __block std::function<void()> blockFunction = function;
-
-    performActivity(options, pReason, ^() { blockFunction(); });
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::performExpiringActivity(const String* pReason, void (^block)(bool expired))
-{
-    Object::sendMessageSafe<void>(this, _NS_PRIVATE_SEL(performExpiringActivityWithReason_usingBlock_), pReason, block);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE void NS::ProcessInfo::performExpiringActivity(const String* pReason, const std::function<void(bool expired)>& function)
-{
-    __block std::function<void(bool expired)> blockFunction = function;
-
-    performExpiringActivity(pReason, ^(bool expired) { blockFunction(expired); });
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::ProcessInfoThermalState NS::ProcessInfo::thermalState() const
-{
-    return Object::sendMessage<ProcessInfoThermalState>(this, _NS_PRIVATE_SEL(thermalState));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::isLowPowerModeEnabled() const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(isLowPowerModeEnabled));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::isiOSAppOnMac() const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(isiOSAppOnMac));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::isMacCatalystApp() const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(isMacCatalystApp));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::isDeviceCertified(DeviceCertification performanceTier) const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(isDeviceCertified_), performanceTier);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::ProcessInfo::hasPerformanceProfile(ProcessPerformanceProfile performanceProfile) const
-{
-    return Object::sendMessageSafe<bool>(this, _NS_PRIVATE_SEL(hasPerformanceProfile_), performanceProfile);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSRange.hpp b/engine/thirdparty/metal-cpp/Foundation/NSRange.hpp
deleted file mode 100644
index 8500271d..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSRange.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSRange.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-struct Range
-{
-    static Range Make(UInteger loc, UInteger len);
-
-    Range(UInteger loc, UInteger len);
-
-    bool     Equal(const Range& range) const;
-    bool     LocationInRange(UInteger loc) const;
-    UInteger Max() const;
-
-    UInteger location;
-    UInteger length;
-} _NS_PACKED;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Range::Range(UInteger loc, UInteger len)
-    : location(loc)
-    , length(len)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Range NS::Range::Make(UInteger loc, UInteger len)
-{
-    return Range(loc, len);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Range::Equal(const Range& range) const
-{
-    return (location == range.location) && (length == range.length);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::Range::LocationInRange(UInteger loc) const
-{
-    return (!(loc < location)) && ((loc - location) < length);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Range::Max() const
-{
-    return location + length;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSSet.hpp b/engine/thirdparty/metal-cpp/Foundation/NSSet.hpp
deleted file mode 100644
index 382b6714..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSSet.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSSet.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSObject.hpp"
-#include "NSEnumerator.hpp"
-
-/*****Immutable Set*******/
-
-namespace NS
-{
-    class Set : public NS::Copying <Set>
-    {
-        public:
-            UInteger count() const;
-            Enumerator<Object>* objectEnumerator() const;
-
-            static Set* alloc();
-
-            Set* init();
-            Set* init(const Object* const* pObjects, UInteger count);
-            Set* init(const class Coder* pCoder);
-
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::Set::count() const
-{
-    return NS::Object::sendMessage<NS::UInteger>(this, _NS_PRIVATE_SEL(count));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Enumerator<NS::Object>* NS::Set::objectEnumerator() const
-{
-    return NS::Object::sendMessage<Enumerator<NS::Object>*>(this, _NS_PRIVATE_SEL(objectEnumerator));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Set* NS::Set::alloc()
-{
-    return NS::Object::alloc<Set>(_NS_PRIVATE_CLS(NSSet));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Set* NS::Set::init()
-{
-    return NS::Object::init<Set>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Set* NS::Set::init(const Object* const* pObjects, NS::UInteger count)
-{
-    return NS::Object::sendMessage<Set*>(this, _NS_PRIVATE_SEL(initWithObjects_count_), pObjects, count);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Set* NS::Set::init(const class Coder* pCoder)
-{
-    return Object::sendMessage<Set*>(this, _NS_PRIVATE_SEL(initWithCoder_), pCoder);
-}
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSSharedPtr.hpp b/engine/thirdparty/metal-cpp/Foundation/NSSharedPtr.hpp
deleted file mode 100644
index f1cf68e4..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSSharedPtr.hpp
+++ /dev/null
@@ -1,310 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSSharedPtr.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include <cstddef>
-#include "NSDefines.hpp"
-
-namespace NS
-{
-template <class _Class>
-class SharedPtr
-{
-public:
-    /**
-     * Create a new null pointer.
-     */
-    SharedPtr();
-
-    /**
-     * Destroy this SharedPtr, decreasing the reference count.
-     */
-    ~SharedPtr();
-
-    /**
-     * Create a new null pointer.
-     */
-    SharedPtr(std::nullptr_t) noexcept;
-
-    /**
-     * SharedPtr copy constructor.
-     */
-    SharedPtr(const SharedPtr<_Class>& other) noexcept;
-
-    /**
-     * Construction from another pointee type.
-     */
-    template <class _OtherClass>
-    SharedPtr(const SharedPtr<_OtherClass>& other, typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>> * = nullptr) noexcept;
-
-    /**
-     * SharedPtr move constructor.
-     */
-    SharedPtr(SharedPtr<_Class>&& other) noexcept;
-
-    /**
-     * Move from another pointee type.
-     */
-    template <class _OtherClass>
-    SharedPtr(SharedPtr<_OtherClass>&& other, typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>> * = nullptr) noexcept;
-
-    /**
-     * Copy assignment operator.
-     * Copying increases reference count. Only releases previous pointee if objects are different.
-     */
-    SharedPtr& operator=(const SharedPtr<_Class>& other);
-
-    /**
-     * Copy-assignment from different pointee.
-     * Copying increases reference count. Only releases previous pointee if objects are different.
-     */
-    template <class _OtherClass>
-    typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>, SharedPtr &>
-    operator=(const SharedPtr<_OtherClass>& other);
-
-    /**
-     * Move assignment operator.
-     * Move without affecting reference counts, unless pointees are equal. Moved-from object is reset to nullptr.
-     */
-    SharedPtr& operator=(SharedPtr<_Class>&& other);
-
-    /**
-     * Move-asignment from different pointee.
-     * Move without affecting reference counts, unless pointees are equal. Moved-from object is reset to nullptr.
-     */
-    template <class _OtherClass>
-    typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>, SharedPtr &>
-    operator=(SharedPtr<_OtherClass>&& other);
-
-    /**
-     * Access raw pointee.
-     * @warning Avoid wrapping the returned value again, as it may lead double frees unless this object becomes detached.
-     */
-    _Class* get() const;
-
-    /**
-     * Call operations directly on the pointee.
-     */
-    _Class* operator->() const;
-
-    /**
-     * Implicit cast to bool.
-     */
-    explicit operator bool() const;
-
-    /**
-     * Reset this SharedPtr to null, decreasing the reference count.
-     */
-    void reset();
-
-    /**
-     * Detach the SharedPtr from the pointee, without decreasing the reference count.
-     */
-    void detach();
-
-    template <class _OtherClass>
-    friend SharedPtr<_OtherClass> RetainPtr(_OtherClass* ptr);
-
-    template <class _OtherClass>
-    friend SharedPtr<_OtherClass> TransferPtr(_OtherClass* ptr);
-
-private:
-    _Class* m_pObject;
-};
-
-/**
- * Create a SharedPtr by retaining an existing raw pointer.
- * Increases the reference count of the passed-in object.
- * If the passed-in object was in an AutoreleasePool, it will be removed from it.
- */
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class> RetainPtr(_Class* pObject)
-{
-    NS::SharedPtr<_Class> ret;
-    ret.m_pObject = pObject->retain();
-    return ret;
-}
-
-/*
- * Create a SharedPtr by transfering the ownership of an existing raw pointer to SharedPtr.
- * Does not increase the reference count of the passed-in pointer, it is assumed to be >= 1.
- * This method does not remove objects from an AutoreleasePool.
-*/
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class> TransferPtr(_Class* pObject)
-{
-    NS::SharedPtr<_Class> ret;
-    ret.m_pObject = pObject;
-    return ret;
-}
-
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr()
-    : m_pObject(nullptr)
-{
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::~SharedPtr<_Class>() __attribute__((no_sanitize("undefined")))
-{
-    m_pObject->release();
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr(std::nullptr_t) noexcept
-    : m_pObject(nullptr)
-{
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr(const SharedPtr<_Class>& other) noexcept
-    : m_pObject(other.m_pObject->retain())
-{
-}
-
-template <class _Class>
-template <class _OtherClass>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr(const SharedPtr<_OtherClass>& other, typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>> *) noexcept
-    : m_pObject(reinterpret_cast<_Class*>(other.get()->retain()))
-{
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr(SharedPtr<_Class>&& other) noexcept
-    : m_pObject(other.m_pObject)
-{
-    other.m_pObject = nullptr;
-}
-
-template <class _Class>
-template <class _OtherClass>
-_NS_INLINE NS::SharedPtr<_Class>::SharedPtr(SharedPtr<_OtherClass>&& other, typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>> *) noexcept
-    : m_pObject(reinterpret_cast<_Class*>(other.get()))
-{
-    other.detach();
-}
-
-template <class _Class>
-_NS_INLINE _Class* NS::SharedPtr<_Class>::get() const
-{
-    return m_pObject;
-}
-
-template <class _Class>
-_NS_INLINE _Class* NS::SharedPtr<_Class>::operator->() const
-{
-    return m_pObject;
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>::operator bool() const
-{
-    return nullptr != m_pObject;
-}
-
-template <class _Class>
-_NS_INLINE void NS::SharedPtr<_Class>::reset() __attribute__((no_sanitize("undefined")))
-{
-    m_pObject->release();
-    m_pObject = nullptr;
-}
-
-template <class _Class>
-_NS_INLINE void NS::SharedPtr<_Class>::detach()
-{
-    m_pObject = nullptr;
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>& NS::SharedPtr<_Class>::operator=(const SharedPtr<_Class>& other) __attribute__((no_sanitize("undefined")))
-{
-    _Class* pOldObject = m_pObject;
-
-    m_pObject = other.m_pObject->retain();
-
-    pOldObject->release();
-
-    return *this;
-}
-
-template <class _Class>
-template <class _OtherClass>
-typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>, NS::SharedPtr<_Class> &>
-_NS_INLINE NS::SharedPtr<_Class>::operator=(const SharedPtr<_OtherClass>& other) __attribute__((no_sanitize("undefined")))
-{
-    _Class* pOldObject = m_pObject;
-
-    m_pObject = reinterpret_cast<_Class*>(other.get()->retain());
-
-    pOldObject->release();
-
-    return *this;
-}
-
-template <class _Class>
-_NS_INLINE NS::SharedPtr<_Class>& NS::SharedPtr<_Class>::operator=(SharedPtr<_Class>&& other) __attribute__((no_sanitize("undefined")))
-{
-    if (m_pObject != other.m_pObject)
-    {
-        m_pObject->release();
-        m_pObject = other.m_pObject;
-    }
-    else
-    {
-        m_pObject = other.m_pObject;
-        other.m_pObject->release();
-    }
-    other.m_pObject = nullptr;
-    return *this;
-}
-
-template <class _Class>
-template <class _OtherClass>
-typename std::enable_if_t<std::is_convertible_v<_OtherClass *, _Class *>, NS::SharedPtr<_Class> &>
-_NS_INLINE NS::SharedPtr<_Class>::operator=(SharedPtr<_OtherClass>&& other) __attribute__((no_sanitize("undefined")))
-{
-    if (m_pObject != other.get())
-    {
-        m_pObject->release();
-        m_pObject = reinterpret_cast<_Class*>(other.get());
-        other.detach();
-    }
-    else
-    {
-        m_pObject = other.get();
-        other.reset();
-    }
-    return *this;
-}
-
-template <class _ClassLhs, class _ClassRhs>
-_NS_INLINE bool operator==(const NS::SharedPtr<_ClassLhs>& lhs, const NS::SharedPtr<_ClassRhs>& rhs)
-{
-    return lhs.get() == rhs.get();
-}
-
-template <class _ClassLhs, class _ClassRhs>
-_NS_INLINE bool operator!=(const NS::SharedPtr<_ClassLhs>& lhs, const NS::SharedPtr<_ClassRhs>& rhs)
-{
-    return lhs.get() != rhs.get();
-}
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSString.hpp b/engine/thirdparty/metal-cpp/Foundation/NSString.hpp
deleted file mode 100644
index 654584e2..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSString.hpp
+++ /dev/null
@@ -1,261 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSString.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObjCRuntime.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSRange.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-_NS_ENUM(NS::UInteger, StringEncoding) {
-    ASCIIStringEncoding = 1,
-    NEXTSTEPStringEncoding = 2,
-    JapaneseEUCStringEncoding = 3,
-    UTF8StringEncoding = 4,
-    ISOLatin1StringEncoding = 5,
-    SymbolStringEncoding = 6,
-    NonLossyASCIIStringEncoding = 7,
-    ShiftJISStringEncoding = 8,
-    ISOLatin2StringEncoding = 9,
-    UnicodeStringEncoding = 10,
-    WindowsCP1251StringEncoding = 11,
-    WindowsCP1252StringEncoding = 12,
-    WindowsCP1253StringEncoding = 13,
-    WindowsCP1254StringEncoding = 14,
-    WindowsCP1250StringEncoding = 15,
-    ISO2022JPStringEncoding = 21,
-    MacOSRomanStringEncoding = 30,
-
-    UTF16StringEncoding = UnicodeStringEncoding,
-
-    UTF16BigEndianStringEncoding = 0x90000100,
-    UTF16LittleEndianStringEncoding = 0x94000100,
-
-    UTF32StringEncoding = 0x8c000100,
-    UTF32BigEndianStringEncoding = 0x98000100,
-    UTF32LittleEndianStringEncoding = 0x9c000100
-};
-
-_NS_OPTIONS(NS::UInteger, StringCompareOptions) {
-    CaseInsensitiveSearch = 1,
-    LiteralSearch = 2,
-    BackwardsSearch = 4,
-    AnchoredSearch = 8,
-    NumericSearch = 64,
-    DiacriticInsensitiveSearch = 128,
-    WidthInsensitiveSearch = 256,
-    ForcedOrderingSearch = 512,
-    RegularExpressionSearch = 1024
-};
-
-using unichar = unsigned short;
-
-class String : public Copying<String>
-{
-public:
-    static String*   string();
-    static String*   string(const String* pString);
-    static String*   string(const char* pString, StringEncoding encoding);
-
-    static String*   alloc();
-    String*          init();
-    String*          init(const String* pString);
-    String*          init(const char* pString, StringEncoding encoding);
-    String*          init(void* pBytes, UInteger len, StringEncoding encoding, bool freeBuffer);
-
-    unichar          character(UInteger index) const;
-    UInteger         length() const;
-
-    const char*      cString(StringEncoding encoding) const;
-    const char*      utf8String() const;
-    UInteger         maximumLengthOfBytes(StringEncoding encoding) const;
-    UInteger         lengthOfBytes(StringEncoding encoding) const;
-
-    bool             isEqualToString(const String* pString) const;
-    Range            rangeOfString(const String* pString, StringCompareOptions options) const;
-
-    const char*      fileSystemRepresentation() const;
-
-    String*          stringByAppendingString(const String* pString) const;
-    ComparisonResult caseInsensitiveCompare(const String* pString) const;
-    NS::String* init(const void * bytes, NS::UInteger len, NS::StringEncoding encoding);
-};
-
-/// Create an NS::String* from a string literal.
-#define MTLSTR(literal) (NS::String*)__builtin___CFStringMakeConstantString("" literal "")
-
-template <std::size_t _StringLen>
-[[deprecated("please use MTLSTR(str)")]] constexpr const String* MakeConstantString(const char (&str)[_StringLen])
-{
-    return reinterpret_cast<const String*>(__CFStringMakeConstantString(str));
-}
-
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::string()
-{
-    return Object::sendMessage<String*>(_NS_PRIVATE_CLS(NSString), _NS_PRIVATE_SEL(string));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::string(const String* pString)
-{
-    return Object::sendMessage<String*>(_NS_PRIVATE_CLS(NSString), _NS_PRIVATE_SEL(stringWithString_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::string(const char* pString, StringEncoding encoding)
-{
-    return Object::sendMessage<String*>(_NS_PRIVATE_CLS(NSString), _NS_PRIVATE_SEL(stringWithCString_encoding_), pString, encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::alloc()
-{
-    return Object::alloc<String>(_NS_PRIVATE_CLS(NSString));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::init()
-{
-    return Object::init<String>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::init(const String* pString)
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(initWithString_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::init(const char* pString, StringEncoding encoding)
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(initWithCString_encoding_), pString, encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::init(void* pBytes, UInteger len, StringEncoding encoding, bool freeBuffer)
-{
-    return Object::sendMessage<String*>(this, _NS_PRIVATE_SEL(initWithBytesNoCopy_length_encoding_freeWhenDone_), pBytes, len, encoding, freeBuffer);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::unichar NS::String::character(UInteger index) const
-{
-    return Object::sendMessage<unichar>(this, _NS_PRIVATE_SEL(characterAtIndex_), index);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::String::length() const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(length));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE const char* NS::String::cString(StringEncoding encoding) const
-{
-    return Object::sendMessage<const char*>(this, _NS_PRIVATE_SEL(cStringUsingEncoding_), encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE const char* NS::String::utf8String() const
-{
-    return Object::sendMessage<const char*>(this, _NS_PRIVATE_SEL(UTF8String));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::String::maximumLengthOfBytes(StringEncoding encoding) const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(maximumLengthOfBytesUsingEncoding_), encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::UInteger NS::String::lengthOfBytes(StringEncoding encoding) const
-{
-    return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(lengthOfBytesUsingEncoding_), encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE bool NS::String::isEqualToString(const NS::String* pString) const
-{
-    return Object::sendMessage<bool>(this, _NS_PRIVATE_SEL(isEqualToString_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::Range NS::String::rangeOfString(const NS::String* pString, NS::StringCompareOptions options) const
-{
-    return Object::sendMessage<Range>(this, _NS_PRIVATE_SEL(rangeOfString_options_), pString, options);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE const char* NS::String::fileSystemRepresentation() const
-{
-    return Object::sendMessage<const char*>(this, _NS_PRIVATE_SEL(fileSystemRepresentation));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::String* NS::String::stringByAppendingString(const String* pString) const
-{
-    return Object::sendMessage<NS::String*>(this, _NS_PRIVATE_SEL(stringByAppendingString_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::ComparisonResult NS::String::caseInsensitiveCompare(const String* pString) const
-{
-    return Object::sendMessage<NS::ComparisonResult>(this, _NS_PRIVATE_SEL(caseInsensitiveCompare_), pString);
-}
-
-_NS_INLINE NS::String* NS::String::init(const void * bytes, NS::UInteger len, NS::StringEncoding encoding)
-{
-    return Object::sendMessage<NS::String*>(this, _NS_PRIVATE_SEL(initWithBytes_length_encoding_), bytes, len, encoding);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSTypes.hpp b/engine/thirdparty/metal-cpp/Foundation/NSTypes.hpp
deleted file mode 100644
index e6b723e5..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSTypes.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSTypes.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <cstdint>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-using TimeInterval = double;
-
-using Integer = std::intptr_t;
-using UInteger = std::uintptr_t;
-
-const Integer  IntegerMax = INTPTR_MAX;
-const Integer  IntegerMin = INTPTR_MIN;
-const UInteger UIntegerMax = UINTPTR_MAX;
-
-struct OperatingSystemVersion
-{
-    Integer majorVersion;
-    Integer minorVersion;
-    Integer patchVersion;
-} _NS_PACKED;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Foundation/NSURL.hpp b/engine/thirdparty/metal-cpp/Foundation/NSURL.hpp
deleted file mode 100644
index d90e5d70..00000000
--- a/engine/thirdparty/metal-cpp/Foundation/NSURL.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Foundation/NSURL.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "NSDefines.hpp"
-#include "NSObject.hpp"
-#include "NSPrivate.hpp"
-#include "NSTypes.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace NS
-{
-class URL : public Copying<URL>
-{
-public:
-    static URL* fileURLWithPath(const class String* pPath);
-
-    static URL* alloc();
-    URL*        init();
-    URL*        init(const class String* pString);
-    URL*        initFileURLWithPath(const class String* pPath);
-
-    const char* fileSystemRepresentation() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::URL::fileURLWithPath(const String* pPath)
-{
-    return Object::sendMessage<URL*>(_NS_PRIVATE_CLS(NSURL), _NS_PRIVATE_SEL(fileURLWithPath_), pPath);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::URL::alloc()
-{
-    return Object::alloc<URL>(_NS_PRIVATE_CLS(NSURL));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::URL::init()
-{
-    return Object::init<URL>();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::URL::init(const String* pString)
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(initWithString_), pString);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE NS::URL* NS::URL::initFileURLWithPath(const String* pPath)
-{
-    return Object::sendMessage<URL*>(this, _NS_PRIVATE_SEL(initFileURLWithPath_), pPath);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_NS_INLINE const char* NS::URL::fileSystemRepresentation() const
-{
-    return Object::sendMessage<const char*>(this, _NS_PRIVATE_SEL(fileSystemRepresentation));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/LICENSE.txt b/engine/thirdparty/metal-cpp/LICENSE.txt
deleted file mode 100644
index d07f885e..00000000
--- a/engine/thirdparty/metal-cpp/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright © 2024 Apple Inc.
-
-   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
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4AccelerationStructure.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4AccelerationStructure.hpp
deleted file mode 100644
index 11540150..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4AccelerationStructure.hpp
+++ /dev/null
@@ -1,1395 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4AccelerationStructure.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAccelerationStructure.hpp"
-#include "MTLAccelerationStructureTypes.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLStageInputOutputDescriptor.hpp"
-
-namespace MTL4
-{
-class AccelerationStructureBoundingBoxGeometryDescriptor;
-class AccelerationStructureCurveGeometryDescriptor;
-class AccelerationStructureDescriptor;
-class AccelerationStructureGeometryDescriptor;
-class AccelerationStructureMotionBoundingBoxGeometryDescriptor;
-class AccelerationStructureMotionCurveGeometryDescriptor;
-class AccelerationStructureMotionTriangleGeometryDescriptor;
-class AccelerationStructureTriangleGeometryDescriptor;
-class IndirectInstanceAccelerationStructureDescriptor;
-class InstanceAccelerationStructureDescriptor;
-class PrimitiveAccelerationStructureDescriptor;
-
-class AccelerationStructureDescriptor : public NS::Copying<AccelerationStructureDescriptor, MTL::AccelerationStructureDescriptor>
-{
-public:
-    static AccelerationStructureDescriptor* alloc();
-
-    AccelerationStructureDescriptor*        init();
-};
-class AccelerationStructureGeometryDescriptor : public NS::Copying<AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureGeometryDescriptor* alloc();
-
-    bool                                            allowDuplicateIntersectionFunctionInvocation() const;
-
-    AccelerationStructureGeometryDescriptor*        init();
-
-    NS::UInteger                                    intersectionFunctionTableOffset() const;
-
-    NS::String*                                     label() const;
-
-    bool                                            opaque() const;
-
-    BufferRange                                     primitiveDataBuffer() const;
-
-    NS::UInteger                                    primitiveDataElementSize() const;
-
-    NS::UInteger                                    primitiveDataStride() const;
-
-    void                                            setAllowDuplicateIntersectionFunctionInvocation(bool allowDuplicateIntersectionFunctionInvocation);
-
-    void                                            setIntersectionFunctionTableOffset(NS::UInteger intersectionFunctionTableOffset);
-
-    void                                            setLabel(const NS::String* label);
-
-    void                                            setOpaque(bool opaque);
-
-    void                                            setPrimitiveDataBuffer(const MTL4::BufferRange primitiveDataBuffer);
-
-    void                                            setPrimitiveDataElementSize(NS::UInteger primitiveDataElementSize);
-
-    void                                            setPrimitiveDataStride(NS::UInteger primitiveDataStride);
-};
-class PrimitiveAccelerationStructureDescriptor : public NS::Copying<PrimitiveAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static PrimitiveAccelerationStructureDescriptor* alloc();
-
-    NS::Array*                                       geometryDescriptors() const;
-
-    PrimitiveAccelerationStructureDescriptor*        init();
-
-    MTL::MotionBorderMode                            motionEndBorderMode() const;
-
-    float                                            motionEndTime() const;
-
-    NS::UInteger                                     motionKeyframeCount() const;
-
-    MTL::MotionBorderMode                            motionStartBorderMode() const;
-
-    float                                            motionStartTime() const;
-
-    void                                             setGeometryDescriptors(const NS::Array* geometryDescriptors);
-
-    void                                             setMotionEndBorderMode(MTL::MotionBorderMode motionEndBorderMode);
-
-    void                                             setMotionEndTime(float motionEndTime);
-
-    void                                             setMotionKeyframeCount(NS::UInteger motionKeyframeCount);
-
-    void                                             setMotionStartBorderMode(MTL::MotionBorderMode motionStartBorderMode);
-
-    void                                             setMotionStartTime(float motionStartTime);
-};
-class AccelerationStructureTriangleGeometryDescriptor : public NS::Copying<AccelerationStructureTriangleGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureTriangleGeometryDescriptor* alloc();
-
-    BufferRange                                             indexBuffer() const;
-
-    MTL::IndexType                                          indexType() const;
-
-    AccelerationStructureTriangleGeometryDescriptor*        init();
-
-    void                                                    setIndexBuffer(const MTL4::BufferRange indexBuffer);
-
-    void                                                    setIndexType(MTL::IndexType indexType);
-
-    void                                                    setTransformationMatrixBuffer(const MTL4::BufferRange transformationMatrixBuffer);
-
-    void                                                    setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout);
-
-    void                                                    setTriangleCount(NS::UInteger triangleCount);
-
-    void                                                    setVertexBuffer(const MTL4::BufferRange vertexBuffer);
-
-    void                                                    setVertexFormat(MTL::AttributeFormat vertexFormat);
-
-    void                                                    setVertexStride(NS::UInteger vertexStride);
-
-    BufferRange                                             transformationMatrixBuffer() const;
-
-    MTL::MatrixLayout                                       transformationMatrixLayout() const;
-
-    NS::UInteger                                            triangleCount() const;
-
-    BufferRange                                             vertexBuffer() const;
-
-    MTL::AttributeFormat                                    vertexFormat() const;
-
-    NS::UInteger                                            vertexStride() const;
-};
-class AccelerationStructureBoundingBoxGeometryDescriptor : public NS::Copying<AccelerationStructureBoundingBoxGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureBoundingBoxGeometryDescriptor* alloc();
-
-    BufferRange                                                boundingBoxBuffer() const;
-
-    NS::UInteger                                               boundingBoxCount() const;
-
-    NS::UInteger                                               boundingBoxStride() const;
-
-    AccelerationStructureBoundingBoxGeometryDescriptor*        init();
-
-    void                                                       setBoundingBoxBuffer(const MTL4::BufferRange boundingBoxBuffer);
-
-    void                                                       setBoundingBoxCount(NS::UInteger boundingBoxCount);
-
-    void                                                       setBoundingBoxStride(NS::UInteger boundingBoxStride);
-};
-class AccelerationStructureMotionTriangleGeometryDescriptor : public NS::Copying<AccelerationStructureMotionTriangleGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionTriangleGeometryDescriptor* alloc();
-
-    BufferRange                                                   indexBuffer() const;
-
-    MTL::IndexType                                                indexType() const;
-
-    AccelerationStructureMotionTriangleGeometryDescriptor*        init();
-
-    void                                                          setIndexBuffer(const MTL4::BufferRange indexBuffer);
-
-    void                                                          setIndexType(MTL::IndexType indexType);
-
-    void                                                          setTransformationMatrixBuffer(const MTL4::BufferRange transformationMatrixBuffer);
-
-    void                                                          setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout);
-
-    void                                                          setTriangleCount(NS::UInteger triangleCount);
-
-    void                                                          setVertexBuffers(const MTL4::BufferRange vertexBuffers);
-
-    void                                                          setVertexFormat(MTL::AttributeFormat vertexFormat);
-
-    void                                                          setVertexStride(NS::UInteger vertexStride);
-
-    BufferRange                                                   transformationMatrixBuffer() const;
-
-    MTL::MatrixLayout                                             transformationMatrixLayout() const;
-
-    NS::UInteger                                                  triangleCount() const;
-
-    BufferRange                                                   vertexBuffers() const;
-
-    MTL::AttributeFormat                                          vertexFormat() const;
-
-    NS::UInteger                                                  vertexStride() const;
-};
-class AccelerationStructureMotionBoundingBoxGeometryDescriptor : public NS::Copying<AccelerationStructureMotionBoundingBoxGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionBoundingBoxGeometryDescriptor* alloc();
-
-    BufferRange                                                      boundingBoxBuffers() const;
-
-    NS::UInteger                                                     boundingBoxCount() const;
-
-    NS::UInteger                                                     boundingBoxStride() const;
-
-    AccelerationStructureMotionBoundingBoxGeometryDescriptor*        init();
-
-    void                                                             setBoundingBoxBuffers(const MTL4::BufferRange boundingBoxBuffers);
-
-    void                                                             setBoundingBoxCount(NS::UInteger boundingBoxCount);
-
-    void                                                             setBoundingBoxStride(NS::UInteger boundingBoxStride);
-};
-class AccelerationStructureCurveGeometryDescriptor : public NS::Copying<AccelerationStructureCurveGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureCurveGeometryDescriptor* alloc();
-
-    BufferRange                                          controlPointBuffer() const;
-
-    NS::UInteger                                         controlPointCount() const;
-
-    MTL::AttributeFormat                                 controlPointFormat() const;
-
-    NS::UInteger                                         controlPointStride() const;
-
-    MTL::CurveBasis                                      curveBasis() const;
-
-    MTL::CurveEndCaps                                    curveEndCaps() const;
-
-    MTL::CurveType                                       curveType() const;
-
-    BufferRange                                          indexBuffer() const;
-
-    MTL::IndexType                                       indexType() const;
-
-    AccelerationStructureCurveGeometryDescriptor*        init();
-
-    BufferRange                                          radiusBuffer() const;
-
-    MTL::AttributeFormat                                 radiusFormat() const;
-
-    NS::UInteger                                         radiusStride() const;
-
-    NS::UInteger                                         segmentControlPointCount() const;
-
-    NS::UInteger                                         segmentCount() const;
-
-    void                                                 setControlPointBuffer(const MTL4::BufferRange controlPointBuffer);
-
-    void                                                 setControlPointCount(NS::UInteger controlPointCount);
-
-    void                                                 setControlPointFormat(MTL::AttributeFormat controlPointFormat);
-
-    void                                                 setControlPointStride(NS::UInteger controlPointStride);
-
-    void                                                 setCurveBasis(MTL::CurveBasis curveBasis);
-
-    void                                                 setCurveEndCaps(MTL::CurveEndCaps curveEndCaps);
-
-    void                                                 setCurveType(MTL::CurveType curveType);
-
-    void                                                 setIndexBuffer(const MTL4::BufferRange indexBuffer);
-
-    void                                                 setIndexType(MTL::IndexType indexType);
-
-    void                                                 setRadiusBuffer(const MTL4::BufferRange radiusBuffer);
-
-    void                                                 setRadiusFormat(MTL::AttributeFormat radiusFormat);
-
-    void                                                 setRadiusStride(NS::UInteger radiusStride);
-
-    void                                                 setSegmentControlPointCount(NS::UInteger segmentControlPointCount);
-
-    void                                                 setSegmentCount(NS::UInteger segmentCount);
-};
-class AccelerationStructureMotionCurveGeometryDescriptor : public NS::Copying<AccelerationStructureMotionCurveGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionCurveGeometryDescriptor* alloc();
-
-    BufferRange                                                controlPointBuffers() const;
-
-    NS::UInteger                                               controlPointCount() const;
-
-    MTL::AttributeFormat                                       controlPointFormat() const;
-
-    NS::UInteger                                               controlPointStride() const;
-
-    MTL::CurveBasis                                            curveBasis() const;
-
-    MTL::CurveEndCaps                                          curveEndCaps() const;
-
-    MTL::CurveType                                             curveType() const;
-
-    BufferRange                                                indexBuffer() const;
-
-    MTL::IndexType                                             indexType() const;
-
-    AccelerationStructureMotionCurveGeometryDescriptor*        init();
-
-    BufferRange                                                radiusBuffers() const;
-
-    MTL::AttributeFormat                                       radiusFormat() const;
-
-    NS::UInteger                                               radiusStride() const;
-
-    NS::UInteger                                               segmentControlPointCount() const;
-
-    NS::UInteger                                               segmentCount() const;
-
-    void                                                       setControlPointBuffers(const MTL4::BufferRange controlPointBuffers);
-
-    void                                                       setControlPointCount(NS::UInteger controlPointCount);
-
-    void                                                       setControlPointFormat(MTL::AttributeFormat controlPointFormat);
-
-    void                                                       setControlPointStride(NS::UInteger controlPointStride);
-
-    void                                                       setCurveBasis(MTL::CurveBasis curveBasis);
-
-    void                                                       setCurveEndCaps(MTL::CurveEndCaps curveEndCaps);
-
-    void                                                       setCurveType(MTL::CurveType curveType);
-
-    void                                                       setIndexBuffer(const MTL4::BufferRange indexBuffer);
-
-    void                                                       setIndexType(MTL::IndexType indexType);
-
-    void                                                       setRadiusBuffers(const MTL4::BufferRange radiusBuffers);
-
-    void                                                       setRadiusFormat(MTL::AttributeFormat radiusFormat);
-
-    void                                                       setRadiusStride(NS::UInteger radiusStride);
-
-    void                                                       setSegmentControlPointCount(NS::UInteger segmentControlPointCount);
-
-    void                                                       setSegmentCount(NS::UInteger segmentCount);
-};
-class InstanceAccelerationStructureDescriptor : public NS::Copying<InstanceAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static InstanceAccelerationStructureDescriptor*  alloc();
-
-    InstanceAccelerationStructureDescriptor*         init();
-
-    NS::UInteger                                     instanceCount() const;
-
-    BufferRange                                      instanceDescriptorBuffer() const;
-
-    NS::UInteger                                     instanceDescriptorStride() const;
-
-    MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType() const;
-
-    MTL::MatrixLayout                                instanceTransformationMatrixLayout() const;
-
-    BufferRange                                      motionTransformBuffer() const;
-
-    NS::UInteger                                     motionTransformCount() const;
-
-    NS::UInteger                                     motionTransformStride() const;
-
-    MTL::TransformType                               motionTransformType() const;
-
-    void                                             setInstanceCount(NS::UInteger instanceCount);
-
-    void                                             setInstanceDescriptorBuffer(const MTL4::BufferRange instanceDescriptorBuffer);
-
-    void                                             setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride);
-
-    void                                             setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType);
-
-    void                                             setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout);
-
-    void                                             setMotionTransformBuffer(const MTL4::BufferRange motionTransformBuffer);
-
-    void                                             setMotionTransformCount(NS::UInteger motionTransformCount);
-
-    void                                             setMotionTransformStride(NS::UInteger motionTransformStride);
-
-    void                                             setMotionTransformType(MTL::TransformType motionTransformType);
-};
-class IndirectInstanceAccelerationStructureDescriptor : public NS::Copying<IndirectInstanceAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static IndirectInstanceAccelerationStructureDescriptor* alloc();
-
-    IndirectInstanceAccelerationStructureDescriptor*        init();
-
-    BufferRange                                             instanceCountBuffer() const;
-
-    BufferRange                                             instanceDescriptorBuffer() const;
-
-    NS::UInteger                                            instanceDescriptorStride() const;
-
-    MTL::AccelerationStructureInstanceDescriptorType        instanceDescriptorType() const;
-
-    MTL::MatrixLayout                                       instanceTransformationMatrixLayout() const;
-
-    NS::UInteger                                            maxInstanceCount() const;
-
-    NS::UInteger                                            maxMotionTransformCount() const;
-
-    BufferRange                                             motionTransformBuffer() const;
-
-    BufferRange                                             motionTransformCountBuffer() const;
-
-    NS::UInteger                                            motionTransformStride() const;
-
-    MTL::TransformType                                      motionTransformType() const;
-
-    void                                                    setInstanceCountBuffer(const MTL4::BufferRange instanceCountBuffer);
-
-    void                                                    setInstanceDescriptorBuffer(const MTL4::BufferRange instanceDescriptorBuffer);
-
-    void                                                    setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride);
-
-    void                                                    setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType);
-
-    void                                                    setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout);
-
-    void                                                    setMaxInstanceCount(NS::UInteger maxInstanceCount);
-
-    void                                                    setMaxMotionTransformCount(NS::UInteger maxMotionTransformCount);
-
-    void                                                    setMotionTransformBuffer(const MTL4::BufferRange motionTransformBuffer);
-
-    void                                                    setMotionTransformCountBuffer(const MTL4::BufferRange motionTransformCountBuffer);
-
-    void                                                    setMotionTransformStride(NS::UInteger motionTransformStride);
-
-    void                                                    setMotionTransformType(MTL::TransformType motionTransformType);
-};
-
-}
-_MTL_INLINE MTL4::AccelerationStructureDescriptor* MTL4::AccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureDescriptor* MTL4::AccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE MTL4::AccelerationStructureGeometryDescriptor* MTL4::AccelerationStructureGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureGeometryDescriptor));
-}
-
-_MTL_INLINE bool MTL4::AccelerationStructureGeometryDescriptor::allowDuplicateIntersectionFunctionInvocation() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(allowDuplicateIntersectionFunctionInvocation));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureGeometryDescriptor* MTL4::AccelerationStructureGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureGeometryDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureGeometryDescriptor::intersectionFunctionTableOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(intersectionFunctionTableOffset));
-}
-
-_MTL_INLINE NS::String* MTL4::AccelerationStructureGeometryDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE bool MTL4::AccelerationStructureGeometryDescriptor::opaque() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(opaque));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureGeometryDescriptor::primitiveDataBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(primitiveDataBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureGeometryDescriptor::primitiveDataElementSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(primitiveDataElementSize));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureGeometryDescriptor::primitiveDataStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(primitiveDataStride));
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setAllowDuplicateIntersectionFunctionInvocation(bool allowDuplicateIntersectionFunctionInvocation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAllowDuplicateIntersectionFunctionInvocation_), allowDuplicateIntersectionFunctionInvocation);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setIntersectionFunctionTableOffset(NS::UInteger intersectionFunctionTableOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTableOffset_), intersectionFunctionTableOffset);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setOpaque(bool opaque)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaque_), opaque);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setPrimitiveDataBuffer(const MTL4::BufferRange primitiveDataBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataBuffer_), primitiveDataBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setPrimitiveDataElementSize(NS::UInteger primitiveDataElementSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataElementSize_), primitiveDataElementSize);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureGeometryDescriptor::setPrimitiveDataStride(NS::UInteger primitiveDataStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataStride_), primitiveDataStride);
-}
-
-_MTL_INLINE MTL4::PrimitiveAccelerationStructureDescriptor* MTL4::PrimitiveAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::PrimitiveAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTL4PrimitiveAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL4::PrimitiveAccelerationStructureDescriptor::geometryDescriptors() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(geometryDescriptors));
-}
-
-_MTL_INLINE MTL4::PrimitiveAccelerationStructureDescriptor* MTL4::PrimitiveAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL4::PrimitiveAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE MTL::MotionBorderMode MTL4::PrimitiveAccelerationStructureDescriptor::motionEndBorderMode() const
-{
-    return Object::sendMessage<MTL::MotionBorderMode>(this, _MTL_PRIVATE_SEL(motionEndBorderMode));
-}
-
-_MTL_INLINE float MTL4::PrimitiveAccelerationStructureDescriptor::motionEndTime() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(motionEndTime));
-}
-
-_MTL_INLINE NS::UInteger MTL4::PrimitiveAccelerationStructureDescriptor::motionKeyframeCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionKeyframeCount));
-}
-
-_MTL_INLINE MTL::MotionBorderMode MTL4::PrimitiveAccelerationStructureDescriptor::motionStartBorderMode() const
-{
-    return Object::sendMessage<MTL::MotionBorderMode>(this, _MTL_PRIVATE_SEL(motionStartBorderMode));
-}
-
-_MTL_INLINE float MTL4::PrimitiveAccelerationStructureDescriptor::motionStartTime() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(motionStartTime));
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setGeometryDescriptors(const NS::Array* geometryDescriptors)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setGeometryDescriptors_), geometryDescriptors);
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setMotionEndBorderMode(MTL::MotionBorderMode motionEndBorderMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionEndBorderMode_), motionEndBorderMode);
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setMotionEndTime(float motionEndTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionEndTime_), motionEndTime);
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setMotionKeyframeCount(NS::UInteger motionKeyframeCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionKeyframeCount_), motionKeyframeCount);
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setMotionStartBorderMode(MTL::MotionBorderMode motionStartBorderMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionStartBorderMode_), motionStartBorderMode);
-}
-
-_MTL_INLINE void MTL4::PrimitiveAccelerationStructureDescriptor::setMotionStartTime(float motionStartTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionStartTime_), motionStartTime);
-}
-
-_MTL_INLINE MTL4::AccelerationStructureTriangleGeometryDescriptor* MTL4::AccelerationStructureTriangleGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureTriangleGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureTriangleGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureTriangleGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE MTL::IndexType MTL4::AccelerationStructureTriangleGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureTriangleGeometryDescriptor* MTL4::AccelerationStructureTriangleGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureTriangleGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setIndexBuffer(const MTL4::BufferRange indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setTransformationMatrixBuffer(const MTL4::BufferRange transformationMatrixBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBuffer_), transformationMatrixBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixLayout_), transformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setTriangleCount(NS::UInteger triangleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleCount_), triangleCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setVertexBuffer(const MTL4::BufferRange vertexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_), vertexBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setVertexFormat(MTL::AttributeFormat vertexFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFormat_), vertexFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureTriangleGeometryDescriptor::setVertexStride(NS::UInteger vertexStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexStride_), vertexStride);
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureTriangleGeometryDescriptor::transformationMatrixBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(transformationMatrixBuffer));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL4::AccelerationStructureTriangleGeometryDescriptor::transformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(transformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureTriangleGeometryDescriptor::triangleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(triangleCount));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureTriangleGeometryDescriptor::vertexBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(vertexBuffer));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureTriangleGeometryDescriptor::vertexFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(vertexFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureTriangleGeometryDescriptor::vertexStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(vertexStride));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureBoundingBoxGeometryDescriptor* MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureBoundingBoxGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureBoundingBoxGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(boundingBoxBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxStride));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureBoundingBoxGeometryDescriptor* MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureBoundingBoxGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxBuffer(const MTL4::BufferRange boundingBoxBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxBuffer_), boundingBoxBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxCount(NS::UInteger boundingBoxCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxCount_), boundingBoxCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxStride(NS::UInteger boundingBoxStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxStride_), boundingBoxStride);
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionTriangleGeometryDescriptor* MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureMotionTriangleGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureMotionTriangleGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE MTL::IndexType MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionTriangleGeometryDescriptor* MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureMotionTriangleGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setIndexBuffer(const MTL4::BufferRange indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setTransformationMatrixBuffer(const MTL4::BufferRange transformationMatrixBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBuffer_), transformationMatrixBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixLayout_), transformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setTriangleCount(NS::UInteger triangleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleCount_), triangleCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexBuffers(const MTL4::BufferRange vertexBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffers_), vertexBuffers);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexFormat(MTL::AttributeFormat vertexFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFormat_), vertexFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexStride(NS::UInteger vertexStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexStride_), vertexStride);
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::transformationMatrixBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(transformationMatrixBuffer));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::transformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(transformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::triangleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(triangleCount));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::vertexBuffers() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(vertexBuffers));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::vertexFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(vertexFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionTriangleGeometryDescriptor::vertexStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(vertexStride));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor* MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureMotionBoundingBoxGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxBuffers() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(boundingBoxBuffers));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxStride));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor* MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxBuffers(const MTL4::BufferRange boundingBoxBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxBuffers_), boundingBoxBuffers);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxCount(NS::UInteger boundingBoxCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxCount_), boundingBoxCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxStride(NS::UInteger boundingBoxStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxStride_), boundingBoxStride);
-}
-
-_MTL_INLINE MTL4::AccelerationStructureCurveGeometryDescriptor* MTL4::AccelerationStructureCurveGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureCurveGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureCurveGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureCurveGeometryDescriptor::controlPointBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(controlPointBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureCurveGeometryDescriptor::controlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointCount));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureCurveGeometryDescriptor::controlPointFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(controlPointFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureCurveGeometryDescriptor::controlPointStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointStride));
-}
-
-_MTL_INLINE MTL::CurveBasis MTL4::AccelerationStructureCurveGeometryDescriptor::curveBasis() const
-{
-    return Object::sendMessage<MTL::CurveBasis>(this, _MTL_PRIVATE_SEL(curveBasis));
-}
-
-_MTL_INLINE MTL::CurveEndCaps MTL4::AccelerationStructureCurveGeometryDescriptor::curveEndCaps() const
-{
-    return Object::sendMessage<MTL::CurveEndCaps>(this, _MTL_PRIVATE_SEL(curveEndCaps));
-}
-
-_MTL_INLINE MTL::CurveType MTL4::AccelerationStructureCurveGeometryDescriptor::curveType() const
-{
-    return Object::sendMessage<MTL::CurveType>(this, _MTL_PRIVATE_SEL(curveType));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureCurveGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE MTL::IndexType MTL4::AccelerationStructureCurveGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureCurveGeometryDescriptor* MTL4::AccelerationStructureCurveGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureCurveGeometryDescriptor>();
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureCurveGeometryDescriptor::radiusBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(radiusBuffer));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureCurveGeometryDescriptor::radiusFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(radiusFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureCurveGeometryDescriptor::radiusStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(radiusStride));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureCurveGeometryDescriptor::segmentControlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentControlPointCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureCurveGeometryDescriptor::segmentCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentCount));
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setControlPointBuffer(const MTL4::BufferRange controlPointBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointBuffer_), controlPointBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setControlPointCount(NS::UInteger controlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointCount_), controlPointCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setControlPointFormat(MTL::AttributeFormat controlPointFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointFormat_), controlPointFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setControlPointStride(NS::UInteger controlPointStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointStride_), controlPointStride);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setCurveBasis(MTL::CurveBasis curveBasis)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveBasis_), curveBasis);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setCurveEndCaps(MTL::CurveEndCaps curveEndCaps)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveEndCaps_), curveEndCaps);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setCurveType(MTL::CurveType curveType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveType_), curveType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setIndexBuffer(const MTL4::BufferRange indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setRadiusBuffer(const MTL4::BufferRange radiusBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusBuffer_), radiusBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setRadiusFormat(MTL::AttributeFormat radiusFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusFormat_), radiusFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setRadiusStride(NS::UInteger radiusStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusStride_), radiusStride);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setSegmentControlPointCount(NS::UInteger segmentControlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentControlPointCount_), segmentControlPointCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureCurveGeometryDescriptor::setSegmentCount(NS::UInteger segmentCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentCount_), segmentCount);
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionCurveGeometryDescriptor* MTL4::AccelerationStructureMotionCurveGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::AccelerationStructureMotionCurveGeometryDescriptor>(_MTL_PRIVATE_CLS(MTL4AccelerationStructureMotionCurveGeometryDescriptor));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionCurveGeometryDescriptor::controlPointBuffers() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(controlPointBuffers));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionCurveGeometryDescriptor::controlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointCount));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureMotionCurveGeometryDescriptor::controlPointFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(controlPointFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionCurveGeometryDescriptor::controlPointStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointStride));
-}
-
-_MTL_INLINE MTL::CurveBasis MTL4::AccelerationStructureMotionCurveGeometryDescriptor::curveBasis() const
-{
-    return Object::sendMessage<MTL::CurveBasis>(this, _MTL_PRIVATE_SEL(curveBasis));
-}
-
-_MTL_INLINE MTL::CurveEndCaps MTL4::AccelerationStructureMotionCurveGeometryDescriptor::curveEndCaps() const
-{
-    return Object::sendMessage<MTL::CurveEndCaps>(this, _MTL_PRIVATE_SEL(curveEndCaps));
-}
-
-_MTL_INLINE MTL::CurveType MTL4::AccelerationStructureMotionCurveGeometryDescriptor::curveType() const
-{
-    return Object::sendMessage<MTL::CurveType>(this, _MTL_PRIVATE_SEL(curveType));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionCurveGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE MTL::IndexType MTL4::AccelerationStructureMotionCurveGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL4::AccelerationStructureMotionCurveGeometryDescriptor* MTL4::AccelerationStructureMotionCurveGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL4::AccelerationStructureMotionCurveGeometryDescriptor>();
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::AccelerationStructureMotionCurveGeometryDescriptor::radiusBuffers() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(radiusBuffers));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL4::AccelerationStructureMotionCurveGeometryDescriptor::radiusFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(radiusFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionCurveGeometryDescriptor::radiusStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(radiusStride));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionCurveGeometryDescriptor::segmentControlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentControlPointCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::AccelerationStructureMotionCurveGeometryDescriptor::segmentCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentCount));
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointBuffers(const MTL4::BufferRange controlPointBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointBuffers_), controlPointBuffers);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointCount(NS::UInteger controlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointCount_), controlPointCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointFormat(MTL::AttributeFormat controlPointFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointFormat_), controlPointFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointStride(NS::UInteger controlPointStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointStride_), controlPointStride);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setCurveBasis(MTL::CurveBasis curveBasis)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveBasis_), curveBasis);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setCurveEndCaps(MTL::CurveEndCaps curveEndCaps)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveEndCaps_), curveEndCaps);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setCurveType(MTL::CurveType curveType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveType_), curveType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setIndexBuffer(const MTL4::BufferRange indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusBuffers(const MTL4::BufferRange radiusBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusBuffers_), radiusBuffers);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusFormat(MTL::AttributeFormat radiusFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusFormat_), radiusFormat);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusStride(NS::UInteger radiusStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusStride_), radiusStride);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setSegmentControlPointCount(NS::UInteger segmentControlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentControlPointCount_), segmentControlPointCount);
-}
-
-_MTL_INLINE void MTL4::AccelerationStructureMotionCurveGeometryDescriptor::setSegmentCount(NS::UInteger segmentCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentCount_), segmentCount);
-}
-
-_MTL_INLINE MTL4::InstanceAccelerationStructureDescriptor* MTL4::InstanceAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::InstanceAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTL4InstanceAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL4::InstanceAccelerationStructureDescriptor* MTL4::InstanceAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL4::InstanceAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL4::InstanceAccelerationStructureDescriptor::instanceCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceCount));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::InstanceAccelerationStructureDescriptor::instanceDescriptorBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(instanceDescriptorBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::InstanceAccelerationStructureDescriptor::instanceDescriptorStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureInstanceDescriptorType MTL4::InstanceAccelerationStructureDescriptor::instanceDescriptorType() const
-{
-    return Object::sendMessage<MTL::AccelerationStructureInstanceDescriptorType>(this, _MTL_PRIVATE_SEL(instanceDescriptorType));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL4::InstanceAccelerationStructureDescriptor::instanceTransformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(instanceTransformationMatrixLayout));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::InstanceAccelerationStructureDescriptor::motionTransformBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(motionTransformBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::InstanceAccelerationStructureDescriptor::motionTransformCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::InstanceAccelerationStructureDescriptor::motionTransformStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformStride));
-}
-
-_MTL_INLINE MTL::TransformType MTL4::InstanceAccelerationStructureDescriptor::motionTransformType() const
-{
-    return Object::sendMessage<MTL::TransformType>(this, _MTL_PRIVATE_SEL(motionTransformType));
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setInstanceCount(NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceCount_), instanceCount);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setInstanceDescriptorBuffer(const MTL4::BufferRange instanceDescriptorBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBuffer_), instanceDescriptorBuffer);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorStride_), instanceDescriptorStride);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorType_), instanceDescriptorType);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceTransformationMatrixLayout_), instanceTransformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setMotionTransformBuffer(const MTL4::BufferRange motionTransformBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBuffer_), motionTransformBuffer);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setMotionTransformCount(NS::UInteger motionTransformCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformCount_), motionTransformCount);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setMotionTransformStride(NS::UInteger motionTransformStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformStride_), motionTransformStride);
-}
-
-_MTL_INLINE void MTL4::InstanceAccelerationStructureDescriptor::setMotionTransformType(MTL::TransformType motionTransformType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformType_), motionTransformType);
-}
-
-_MTL_INLINE MTL4::IndirectInstanceAccelerationStructureDescriptor* MTL4::IndirectInstanceAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::IndirectInstanceAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTL4IndirectInstanceAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL4::IndirectInstanceAccelerationStructureDescriptor* MTL4::IndirectInstanceAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL4::IndirectInstanceAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::IndirectInstanceAccelerationStructureDescriptor::instanceCountBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(instanceCountBuffer));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(instanceDescriptorBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureInstanceDescriptorType MTL4::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorType() const
-{
-    return Object::sendMessage<MTL::AccelerationStructureInstanceDescriptorType>(this, _MTL_PRIVATE_SEL(instanceDescriptorType));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL4::IndirectInstanceAccelerationStructureDescriptor::instanceTransformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(instanceTransformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL4::IndirectInstanceAccelerationStructureDescriptor::maxInstanceCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxInstanceCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::IndirectInstanceAccelerationStructureDescriptor::maxMotionTransformCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxMotionTransformCount));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::IndirectInstanceAccelerationStructureDescriptor::motionTransformBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(motionTransformBuffer));
-}
-
-_MTL_INLINE MTL4::BufferRange MTL4::IndirectInstanceAccelerationStructureDescriptor::motionTransformCountBuffer() const
-{
-    return Object::sendMessage<MTL4::BufferRange>(this, _MTL_PRIVATE_SEL(motionTransformCountBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL4::IndirectInstanceAccelerationStructureDescriptor::motionTransformStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformStride));
-}
-
-_MTL_INLINE MTL::TransformType MTL4::IndirectInstanceAccelerationStructureDescriptor::motionTransformType() const
-{
-    return Object::sendMessage<MTL::TransformType>(this, _MTL_PRIVATE_SEL(motionTransformType));
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setInstanceCountBuffer(const MTL4::BufferRange instanceCountBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceCountBuffer_), instanceCountBuffer);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorBuffer(const MTL4::BufferRange instanceDescriptorBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBuffer_), instanceDescriptorBuffer);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorStride_), instanceDescriptorStride);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorType_), instanceDescriptorType);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceTransformationMatrixLayout_), instanceTransformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMaxInstanceCount(NS::UInteger maxInstanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxInstanceCount_), maxInstanceCount);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMaxMotionTransformCount(NS::UInteger maxMotionTransformCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxMotionTransformCount_), maxMotionTransformCount);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformBuffer(const MTL4::BufferRange motionTransformBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBuffer_), motionTransformBuffer);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformCountBuffer(const MTL4::BufferRange motionTransformCountBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformCountBuffer_), motionTransformCountBuffer);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformStride(NS::UInteger motionTransformStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformStride_), motionTransformStride);
-}
-
-_MTL_INLINE void MTL4::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformType(MTL::TransformType motionTransformType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformType_), motionTransformType);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4Archive.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4Archive.hpp
deleted file mode 100644
index c83ef638..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4Archive.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4Archive.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class ComputePipelineState;
-class RenderPipelineState;
-}
-
-namespace MTL4
-{
-class BinaryFunction;
-class BinaryFunctionDescriptor;
-class ComputePipelineDescriptor;
-class PipelineDescriptor;
-class PipelineStageDynamicLinkingDescriptor;
-class RenderPipelineDynamicLinkingDescriptor;
-
-class Archive : public NS::Referencing<Archive>
-{
-public:
-    NS::String*                label() const;
-
-    BinaryFunction*            newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, NS::Error** error);
-
-    MTL::ComputePipelineState* newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, NS::Error** error);
-    MTL::ComputePipelineState* newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, NS::Error** error);
-
-    MTL::RenderPipelineState*  newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, NS::Error** error);
-    MTL::RenderPipelineState*  newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, NS::Error** error);
-
-    void                       setLabel(const NS::String* label);
-};
-
-}
-_MTL_INLINE NS::String* MTL4::Archive::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::BinaryFunction* MTL4::Archive::newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::BinaryFunction*>(this, _MTL_PRIVATE_SEL(newBinaryFunctionWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL4::Archive::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL4::Archive::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_error_), descriptor, dynamicLinkingDescriptor, error);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL4::Archive::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL4::Archive::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_error_), descriptor, dynamicLinkingDescriptor, error);
-}
-
-_MTL_INLINE void MTL4::Archive::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4ArgumentTable.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4ArgumentTable.hpp
deleted file mode 100644
index 7788ed94..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4ArgumentTable.hpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4ArgumentTable.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLGPUAddress.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Device;
-}
-
-namespace MTL4
-{
-class ArgumentTableDescriptor : public NS::Copying<ArgumentTableDescriptor>
-{
-public:
-    static ArgumentTableDescriptor* alloc();
-
-    ArgumentTableDescriptor*        init();
-    bool                            initializeBindings() const;
-
-    NS::String*                     label() const;
-
-    NS::UInteger                    maxBufferBindCount() const;
-
-    NS::UInteger                    maxSamplerStateBindCount() const;
-
-    NS::UInteger                    maxTextureBindCount() const;
-
-    void                            setInitializeBindings(bool initializeBindings);
-
-    void                            setLabel(const NS::String* label);
-
-    void                            setMaxBufferBindCount(NS::UInteger maxBufferBindCount);
-
-    void                            setMaxSamplerStateBindCount(NS::UInteger maxSamplerStateBindCount);
-
-    void                            setMaxTextureBindCount(NS::UInteger maxTextureBindCount);
-
-    void                            setSupportAttributeStrides(bool supportAttributeStrides);
-    bool                            supportAttributeStrides() const;
-};
-class ArgumentTable : public NS::Referencing<ArgumentTable>
-{
-public:
-    MTL::Device* device() const;
-
-    NS::String*  label() const;
-
-    void         setAddress(MTL::GPUAddress gpuAddress, NS::UInteger bindingIndex);
-    void         setAddress(MTL::GPUAddress gpuAddress, NS::UInteger stride, NS::UInteger bindingIndex);
-
-    void         setResource(MTL::ResourceID resourceID, NS::UInteger bindingIndex);
-
-    void         setSamplerState(MTL::ResourceID resourceID, NS::UInteger bindingIndex);
-
-    void         setTexture(MTL::ResourceID resourceID, NS::UInteger bindingIndex);
-};
-
-}
-_MTL_INLINE MTL4::ArgumentTableDescriptor* MTL4::ArgumentTableDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::ArgumentTableDescriptor>(_MTL_PRIVATE_CLS(MTL4ArgumentTableDescriptor));
-}
-
-_MTL_INLINE MTL4::ArgumentTableDescriptor* MTL4::ArgumentTableDescriptor::init()
-{
-    return NS::Object::init<MTL4::ArgumentTableDescriptor>();
-}
-
-_MTL_INLINE bool MTL4::ArgumentTableDescriptor::initializeBindings() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(initializeBindings));
-}
-
-_MTL_INLINE NS::String* MTL4::ArgumentTableDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL4::ArgumentTableDescriptor::maxBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxBufferBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::ArgumentTableDescriptor::maxSamplerStateBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxSamplerStateBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::ArgumentTableDescriptor::maxTextureBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTextureBindCount));
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setInitializeBindings(bool initializeBindings)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInitializeBindings_), initializeBindings);
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setMaxBufferBindCount(NS::UInteger maxBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxBufferBindCount_), maxBufferBindCount);
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setMaxSamplerStateBindCount(NS::UInteger maxSamplerStateBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxSamplerStateBindCount_), maxSamplerStateBindCount);
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setMaxTextureBindCount(NS::UInteger maxTextureBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTextureBindCount_), maxTextureBindCount);
-}
-
-_MTL_INLINE void MTL4::ArgumentTableDescriptor::setSupportAttributeStrides(bool supportAttributeStrides)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportAttributeStrides_), supportAttributeStrides);
-}
-
-_MTL_INLINE bool MTL4::ArgumentTableDescriptor::supportAttributeStrides() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportAttributeStrides));
-}
-
-_MTL_INLINE MTL::Device* MTL4::ArgumentTable::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL4::ArgumentTable::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::ArgumentTable::setAddress(MTL::GPUAddress gpuAddress, NS::UInteger bindingIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAddress_atIndex_), gpuAddress, bindingIndex);
-}
-
-_MTL_INLINE void MTL4::ArgumentTable::setAddress(MTL::GPUAddress gpuAddress, NS::UInteger stride, NS::UInteger bindingIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAddress_attributeStride_atIndex_), gpuAddress, stride, bindingIndex);
-}
-
-_MTL_INLINE void MTL4::ArgumentTable::setResource(MTL::ResourceID resourceID, NS::UInteger bindingIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResource_atBufferIndex_), resourceID, bindingIndex);
-}
-
-_MTL_INLINE void MTL4::ArgumentTable::setSamplerState(MTL::ResourceID resourceID, NS::UInteger bindingIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerState_atIndex_), resourceID, bindingIndex);
-}
-
-_MTL_INLINE void MTL4::ArgumentTable::setTexture(MTL::ResourceID resourceID, NS::UInteger bindingIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTexture_atIndex_), resourceID, bindingIndex);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunction.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunction.hpp
deleted file mode 100644
index 30d90a6b..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunction.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4BinaryFunction.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLLibrary.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-
-class BinaryFunction : public NS::Referencing<BinaryFunction>
-{
-public:
-    MTL::FunctionType functionType() const;
-
-    NS::String*       name() const;
-};
-
-}
-
-_MTL_INLINE MTL::FunctionType MTL4::BinaryFunction::functionType() const
-{
-    return Object::sendMessage<MTL::FunctionType>(this, _MTL_PRIVATE_SEL(functionType));
-}
-
-_MTL_INLINE NS::String* MTL4::BinaryFunction::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunctionDescriptor.hpp
deleted file mode 100644
index ce173ce0..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4BinaryFunctionDescriptor.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4BinaryFunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class BinaryFunctionDescriptor;
-class FunctionDescriptor;
-
-_MTL_OPTIONS(NS::UInteger, BinaryFunctionOptions) {
-    BinaryFunctionOptionNone = 0,
-    BinaryFunctionOptionPipelineIndependent = 1 << 1,
-};
-
-class BinaryFunctionDescriptor : public NS::Copying<BinaryFunctionDescriptor>
-{
-public:
-    static BinaryFunctionDescriptor* alloc();
-
-    FunctionDescriptor*              functionDescriptor() const;
-
-    BinaryFunctionDescriptor*        init();
-
-    NS::String*                      name() const;
-
-    BinaryFunctionOptions            options() const;
-
-    void                             setFunctionDescriptor(const MTL4::FunctionDescriptor* functionDescriptor);
-
-    void                             setName(const NS::String* name);
-
-    void                             setOptions(MTL4::BinaryFunctionOptions options);
-};
-
-}
-_MTL_INLINE MTL4::BinaryFunctionDescriptor* MTL4::BinaryFunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::BinaryFunctionDescriptor>(_MTL_PRIVATE_CLS(MTL4BinaryFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::BinaryFunctionDescriptor::functionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(functionDescriptor));
-}
-
-_MTL_INLINE MTL4::BinaryFunctionDescriptor* MTL4::BinaryFunctionDescriptor::init()
-{
-    return NS::Object::init<MTL4::BinaryFunctionDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::BinaryFunctionDescriptor::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL4::BinaryFunctionOptions MTL4::BinaryFunctionDescriptor::options() const
-{
-    return Object::sendMessage<MTL4::BinaryFunctionOptions>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE void MTL4::BinaryFunctionDescriptor::setFunctionDescriptor(const MTL4::FunctionDescriptor* functionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionDescriptor_), functionDescriptor);
-}
-
-_MTL_INLINE void MTL4::BinaryFunctionDescriptor::setName(const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setName_), name);
-}
-
-_MTL_INLINE void MTL4::BinaryFunctionDescriptor::setOptions(MTL4::BinaryFunctionOptions options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptions_), options);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CommandAllocator.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CommandAllocator.hpp
deleted file mode 100644
index a36b0508..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CommandAllocator.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CommandAllocator.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Device;
-}
-
-namespace MTL4
-{
-
-class CommandAllocatorDescriptor : public NS::Copying<CommandAllocatorDescriptor>
-{
-public:
-    static CommandAllocatorDescriptor* alloc();
-
-    CommandAllocatorDescriptor*        init();
-
-    NS::String*                        label() const;
-    void                               setLabel(const NS::String* label);
-};
-
-class CommandAllocator : public NS::Referencing<CommandAllocator>
-{
-public:
-    uint64_t     allocatedSize();
-
-    MTL::Device* device() const;
-
-    NS::String*  label() const;
-
-    void         reset();
-};
-
-}
-
-_MTL_INLINE MTL4::CommandAllocatorDescriptor* MTL4::CommandAllocatorDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::CommandAllocatorDescriptor>(_MTL_PRIVATE_CLS(MTL4CommandAllocatorDescriptor));
-}
-
-_MTL_INLINE MTL4::CommandAllocatorDescriptor* MTL4::CommandAllocatorDescriptor::init()
-{
-    return NS::Object::init<MTL4::CommandAllocatorDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::CommandAllocatorDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::CommandAllocatorDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE uint64_t MTL4::CommandAllocator::allocatedSize()
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(allocatedSize));
-}
-
-_MTL_INLINE MTL::Device* MTL4::CommandAllocator::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL4::CommandAllocator::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::CommandAllocator::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CommandBuffer.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CommandBuffer.hpp
deleted file mode 100644
index a69cc941..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CommandBuffer.hpp
+++ /dev/null
@@ -1,193 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CommandBuffer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4RenderCommandEncoder.hpp"
-#include "MTLAccelerationStructureTypes.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class CommandAllocator;
-class CommandBufferOptions;
-class ComputeCommandEncoder;
-class CounterHeap;
-class MachineLearningCommandEncoder;
-class RenderCommandEncoder;
-class RenderPassDescriptor;
-}
-
-namespace MTL
-{
-class Device;
-class Fence;
-class LogState;
-class ResidencySet;
-}
-
-namespace MTL4
-{
-class CommandBufferOptions : public NS::Copying<CommandBufferOptions>
-{
-public:
-    static CommandBufferOptions* alloc();
-
-    CommandBufferOptions*        init();
-
-    MTL::LogState*               logState() const;
-    void                         setLogState(const MTL::LogState* logState);
-};
-class CommandBuffer : public NS::Referencing<CommandBuffer>
-{
-public:
-    void                           beginCommandBuffer(const MTL4::CommandAllocator* allocator);
-    void                           beginCommandBuffer(const MTL4::CommandAllocator* allocator, const MTL4::CommandBufferOptions* options);
-
-    ComputeCommandEncoder*         computeCommandEncoder();
-
-    MTL::Device*                   device() const;
-
-    void                           endCommandBuffer();
-
-    NS::String*                    label() const;
-
-    MachineLearningCommandEncoder* machineLearningCommandEncoder();
-
-    void                           popDebugGroup();
-
-    void                           pushDebugGroup(const NS::String* string);
-
-    RenderCommandEncoder*          renderCommandEncoder(const MTL4::RenderPassDescriptor* descriptor);
-    RenderCommandEncoder*          renderCommandEncoder(const MTL4::RenderPassDescriptor* descriptor, MTL4::RenderEncoderOptions options);
-
-    void                           resolveCounterHeap(const MTL4::CounterHeap* counterHeap, NS::Range range, const MTL4::BufferRange bufferRange, const MTL::Fence* fenceToWait, const MTL::Fence* fenceToUpdate);
-
-    void                           setLabel(const NS::String* label);
-
-    void                           useResidencySet(const MTL::ResidencySet* residencySet);
-    void                           useResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    void                           writeTimestampIntoHeap(const MTL4::CounterHeap* counterHeap, NS::UInteger index);
-};
-
-}
-_MTL_INLINE MTL4::CommandBufferOptions* MTL4::CommandBufferOptions::alloc()
-{
-    return NS::Object::alloc<MTL4::CommandBufferOptions>(_MTL_PRIVATE_CLS(MTL4CommandBufferOptions));
-}
-
-_MTL_INLINE MTL4::CommandBufferOptions* MTL4::CommandBufferOptions::init()
-{
-    return NS::Object::init<MTL4::CommandBufferOptions>();
-}
-
-_MTL_INLINE MTL::LogState* MTL4::CommandBufferOptions::logState() const
-{
-    return Object::sendMessage<MTL::LogState*>(this, _MTL_PRIVATE_SEL(logState));
-}
-
-_MTL_INLINE void MTL4::CommandBufferOptions::setLogState(const MTL::LogState* logState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLogState_), logState);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::beginCommandBuffer(const MTL4::CommandAllocator* allocator)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(beginCommandBufferWithAllocator_), allocator);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::beginCommandBuffer(const MTL4::CommandAllocator* allocator, const MTL4::CommandBufferOptions* options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(beginCommandBufferWithAllocator_options_), allocator, options);
-}
-
-_MTL_INLINE MTL4::ComputeCommandEncoder* MTL4::CommandBuffer::computeCommandEncoder()
-{
-    return Object::sendMessage<MTL4::ComputeCommandEncoder*>(this, _MTL_PRIVATE_SEL(computeCommandEncoder));
-}
-
-_MTL_INLINE MTL::Device* MTL4::CommandBuffer::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::endCommandBuffer()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(endCommandBuffer));
-}
-
-_MTL_INLINE NS::String* MTL4::CommandBuffer::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::MachineLearningCommandEncoder* MTL4::CommandBuffer::machineLearningCommandEncoder()
-{
-    return Object::sendMessage<MTL4::MachineLearningCommandEncoder*>(this, _MTL_PRIVATE_SEL(machineLearningCommandEncoder));
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::popDebugGroup()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(popDebugGroup));
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::pushDebugGroup(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(pushDebugGroup_), string);
-}
-
-_MTL_INLINE MTL4::RenderCommandEncoder* MTL4::CommandBuffer::renderCommandEncoder(const MTL4::RenderPassDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL4::RenderCommandEncoder*>(this, _MTL_PRIVATE_SEL(renderCommandEncoderWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL4::RenderCommandEncoder* MTL4::CommandBuffer::renderCommandEncoder(const MTL4::RenderPassDescriptor* descriptor, MTL4::RenderEncoderOptions options)
-{
-    return Object::sendMessage<MTL4::RenderCommandEncoder*>(this, _MTL_PRIVATE_SEL(renderCommandEncoderWithDescriptor_options_), descriptor, options);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::resolveCounterHeap(const MTL4::CounterHeap* counterHeap, NS::Range range, const MTL4::BufferRange bufferRange, const MTL::Fence* fenceToWait, const MTL::Fence* fenceToUpdate)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resolveCounterHeap_withRange_intoBuffer_waitFence_updateFence_), counterHeap, range, bufferRange, fenceToWait, fenceToUpdate);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::useResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::useResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE void MTL4::CommandBuffer::writeTimestampIntoHeap(const MTL4::CounterHeap* counterHeap, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeTimestampIntoHeap_atIndex_), counterHeap, index);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CommandEncoder.hpp
deleted file mode 100644
index 2336021e..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CommandEncoder.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class CommandBuffer;
-}
-
-namespace MTL
-{
-class Fence;
-}
-
-namespace MTL4
-{
-_MTL_OPTIONS(NS::UInteger, VisibilityOptions) {
-    VisibilityOptionNone = 0,
-    VisibilityOptionDevice = 1,
-    VisibilityOptionResourceAlias = 1 << 1,
-};
-
-class CommandEncoder : public NS::Referencing<CommandEncoder>
-{
-public:
-    void           barrierAfterEncoderStages(MTL::Stages afterEncoderStages, MTL::Stages beforeEncoderStages, MTL4::VisibilityOptions visibilityOptions);
-
-    void           barrierAfterQueueStages(MTL::Stages afterQueueStages, MTL::Stages beforeStages, MTL4::VisibilityOptions visibilityOptions);
-
-    void           barrierAfterStages(MTL::Stages afterStages, MTL::Stages beforeQueueStages, MTL4::VisibilityOptions visibilityOptions);
-
-    CommandBuffer* commandBuffer() const;
-
-    void           endEncoding();
-
-    void           insertDebugSignpost(const NS::String* string);
-
-    NS::String*    label() const;
-
-    void           popDebugGroup();
-
-    void           pushDebugGroup(const NS::String* string);
-
-    void           setLabel(const NS::String* label);
-
-    void           updateFence(const MTL::Fence* fence, MTL::Stages afterEncoderStages);
-
-    void           waitForFence(const MTL::Fence* fence, MTL::Stages beforeEncoderStages);
-};
-
-}
-_MTL_INLINE void MTL4::CommandEncoder::barrierAfterEncoderStages(MTL::Stages afterEncoderStages, MTL::Stages beforeEncoderStages, MTL4::VisibilityOptions visibilityOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(barrierAfterEncoderStages_beforeEncoderStages_visibilityOptions_), afterEncoderStages, beforeEncoderStages, visibilityOptions);
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::barrierAfterQueueStages(MTL::Stages afterQueueStages, MTL::Stages beforeStages, MTL4::VisibilityOptions visibilityOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(barrierAfterQueueStages_beforeStages_visibilityOptions_), afterQueueStages, beforeStages, visibilityOptions);
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::barrierAfterStages(MTL::Stages afterStages, MTL::Stages beforeQueueStages, MTL4::VisibilityOptions visibilityOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(barrierAfterStages_beforeQueueStages_visibilityOptions_), afterStages, beforeQueueStages, visibilityOptions);
-}
-
-_MTL_INLINE MTL4::CommandBuffer* MTL4::CommandEncoder::commandBuffer() const
-{
-    return Object::sendMessage<MTL4::CommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBuffer));
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::endEncoding()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(endEncoding));
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::insertDebugSignpost(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(insertDebugSignpost_), string);
-}
-
-_MTL_INLINE NS::String* MTL4::CommandEncoder::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::popDebugGroup()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(popDebugGroup));
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::pushDebugGroup(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(pushDebugGroup_), string);
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::updateFence(const MTL::Fence* fence, MTL::Stages afterEncoderStages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_afterEncoderStages_), fence, afterEncoderStages);
-}
-
-_MTL_INLINE void MTL4::CommandEncoder::waitForFence(const MTL::Fence* fence, MTL::Stages beforeEncoderStages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_beforeEncoderStages_), fence, beforeEncoderStages);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CommandQueue.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CommandQueue.hpp
deleted file mode 100644
index cbd21c7a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CommandQueue.hpp
+++ /dev/null
@@ -1,283 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CommandQueue.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4CommitFeedback.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResourceStateCommandEncoder.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-#include <dispatch/dispatch.h>
-
-namespace MTL
-{
-class Buffer;
-class Device;
-class Drawable;
-class Event;
-class Heap;
-class ResidencySet;
-class Texture;
-}
-
-namespace MTL4
-{
-class CommandBuffer;
-class CommandQueueDescriptor;
-class CommitOptions;
-struct CopySparseBufferMappingOperation;
-struct CopySparseTextureMappingOperation;
-struct UpdateSparseBufferMappingOperation;
-struct UpdateSparseTextureMappingOperation;
-_MTL_ENUM(NS::Integer, CommandQueueError) {
-    CommandQueueErrorNone = 0,
-    CommandQueueErrorTimeout = 1,
-    CommandQueueErrorNotPermitted = 2,
-    CommandQueueErrorOutOfMemory = 3,
-    CommandQueueErrorDeviceRemoved = 4,
-    CommandQueueErrorAccessRevoked = 5,
-    CommandQueueErrorInternal = 6,
-};
-
-struct UpdateSparseTextureMappingOperation
-{
-    MTL::SparseTextureMappingMode mode;
-    MTL::Region                   textureRegion;
-    NS::UInteger                  textureLevel;
-    NS::UInteger                  textureSlice;
-    NS::UInteger                  heapOffset;
-} _MTL_PACKED;
-
-struct CopySparseTextureMappingOperation
-{
-    MTL::Region  sourceRegion;
-    NS::UInteger sourceLevel;
-    NS::UInteger sourceSlice;
-    MTL::Origin  destinationOrigin;
-    NS::UInteger destinationLevel;
-    NS::UInteger destinationSlice;
-} _MTL_PACKED;
-
-struct UpdateSparseBufferMappingOperation
-{
-    MTL::SparseTextureMappingMode mode;
-    NS::Range                     bufferRange;
-    NS::UInteger                  heapOffset;
-} _MTL_PACKED;
-
-struct CopySparseBufferMappingOperation
-{
-    NS::Range    sourceRange;
-    NS::UInteger destinationOffset;
-} _MTL_PACKED;
-
-class CommitOptions : public NS::Referencing<CommitOptions>
-{
-public:
-    void                  addFeedbackHandler(const MTL4::CommitFeedbackHandler block);
-    void                  addFeedbackHandler(const MTL4::CommitFeedbackHandlerFunction& function);
-
-    static CommitOptions* alloc();
-
-    CommitOptions*        init();
-};
-class CommandQueueDescriptor : public NS::Copying<CommandQueueDescriptor>
-{
-public:
-    static CommandQueueDescriptor* alloc();
-
-    dispatch_queue_t               feedbackQueue() const;
-
-    CommandQueueDescriptor*        init();
-
-    NS::String*                    label() const;
-
-    void                           setFeedbackQueue(const dispatch_queue_t feedbackQueue);
-
-    void                           setLabel(const NS::String* label);
-};
-class CommandQueue : public NS::Referencing<CommandQueue>
-{
-public:
-    void         addResidencySet(const MTL::ResidencySet* residencySet);
-    void         addResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    void         commit(const MTL4::CommandBuffer* const commandBuffers[], NS::UInteger count);
-    void         commit(const MTL4::CommandBuffer* const commandBuffers[], NS::UInteger count, const MTL4::CommitOptions* options);
-
-    void         copyBufferMappingsFromBuffer(const MTL::Buffer* sourceBuffer, const MTL::Buffer* destinationBuffer, const MTL4::CopySparseBufferMappingOperation* operations, NS::UInteger count);
-
-    void         copyTextureMappingsFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture, const MTL4::CopySparseTextureMappingOperation* operations, NS::UInteger count);
-
-    MTL::Device* device() const;
-
-    NS::String*  label() const;
-
-    void         removeResidencySet(const MTL::ResidencySet* residencySet);
-    void         removeResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    void         signalDrawable(const MTL::Drawable* drawable);
-
-    void         signalEvent(const MTL::Event* event, uint64_t value);
-
-    void         updateBufferMappings(const MTL::Buffer* buffer, const MTL::Heap* heap, const MTL4::UpdateSparseBufferMappingOperation* operations, NS::UInteger count);
-
-    void         updateTextureMappings(const MTL::Texture* texture, const MTL::Heap* heap, const MTL4::UpdateSparseTextureMappingOperation* operations, NS::UInteger count);
-
-    void         wait(const MTL::Event* event, uint64_t value);
-    void         wait(const MTL::Drawable* drawable);
-};
-
-}
-
-_MTL_INLINE void MTL4::CommitOptions::addFeedbackHandler(const MTL4::CommitFeedbackHandler block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addFeedbackHandler_), block);
-}
-
-_MTL_INLINE void MTL4::CommitOptions::addFeedbackHandler(const MTL4::CommitFeedbackHandlerFunction& function)
-{
-    __block MTL4::CommitFeedbackHandlerFunction blockFunction = function;
-    addFeedbackHandler(^(MTL4::CommitFeedback* pFeedback) { blockFunction(pFeedback); });
-}
-
-_MTL_INLINE MTL4::CommitOptions* MTL4::CommitOptions::alloc()
-{
-    return NS::Object::alloc<MTL4::CommitOptions>(_MTL_PRIVATE_CLS(MTL4CommitOptions));
-}
-
-_MTL_INLINE MTL4::CommitOptions* MTL4::CommitOptions::init()
-{
-    return NS::Object::init<MTL4::CommitOptions>();
-}
-
-_MTL_INLINE MTL4::CommandQueueDescriptor* MTL4::CommandQueueDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::CommandQueueDescriptor>(_MTL_PRIVATE_CLS(MTL4CommandQueueDescriptor));
-}
-
-_MTL_INLINE dispatch_queue_t MTL4::CommandQueueDescriptor::feedbackQueue() const
-{
-    return Object::sendMessage<dispatch_queue_t>(this, _MTL_PRIVATE_SEL(feedbackQueue));
-}
-
-_MTL_INLINE MTL4::CommandQueueDescriptor* MTL4::CommandQueueDescriptor::init()
-{
-    return NS::Object::init<MTL4::CommandQueueDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::CommandQueueDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::CommandQueueDescriptor::setFeedbackQueue(const dispatch_queue_t feedbackQueue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFeedbackQueue_), feedbackQueue);
-}
-
-_MTL_INLINE void MTL4::CommandQueueDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::addResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::addResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::commit(const MTL4::CommandBuffer* const commandBuffers[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(commit_count_), commandBuffers, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::commit(const MTL4::CommandBuffer* const commandBuffers[], NS::UInteger count, const MTL4::CommitOptions* options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(commit_count_options_), commandBuffers, count, options);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::copyBufferMappingsFromBuffer(const MTL::Buffer* sourceBuffer, const MTL::Buffer* destinationBuffer, const MTL4::CopySparseBufferMappingOperation* operations, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyBufferMappingsFromBuffer_toBuffer_operations_count_), sourceBuffer, destinationBuffer, operations, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::copyTextureMappingsFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture, const MTL4::CopySparseTextureMappingOperation* operations, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyTextureMappingsFromTexture_toTexture_operations_count_), sourceTexture, destinationTexture, operations, count);
-}
-
-_MTL_INLINE MTL::Device* MTL4::CommandQueue::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL4::CommandQueue::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL4::CommandQueue::removeResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::removeResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::signalDrawable(const MTL::Drawable* drawable)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(signalDrawable_), drawable);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::signalEvent(const MTL::Event* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(signalEvent_value_), event, value);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::updateBufferMappings(const MTL::Buffer* buffer, const MTL::Heap* heap, const MTL4::UpdateSparseBufferMappingOperation* operations, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateBufferMappings_heap_operations_count_), buffer, heap, operations, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::updateTextureMappings(const MTL::Texture* texture, const MTL::Heap* heap, const MTL4::UpdateSparseTextureMappingOperation* operations, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateTextureMappings_heap_operations_count_), texture, heap, operations, count);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::wait(const MTL::Event* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForEvent_value_), event, value);
-}
-
-_MTL_INLINE void MTL4::CommandQueue::wait(const MTL::Drawable* drawable)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForDrawable_), drawable);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CommitFeedback.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CommitFeedback.hpp
deleted file mode 100644
index 6b8181f7..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CommitFeedback.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CommitFeedback.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <functional>
-
-namespace MTL4
-{
-class CommitFeedback;
-
-using CommitFeedbackHandler = void (^)(MTL4::CommitFeedback*);
-using CommitFeedbackHandlerFunction = std::function<void(MTL4::CommitFeedback*)>;
-
-class CommitFeedback : public NS::Referencing<CommitFeedback>
-{
-public:
-    CFTimeInterval GPUEndTime() const;
-
-    CFTimeInterval GPUStartTime() const;
-
-    NS::Error*     error() const;
-};
-
-}
-_MTL_INLINE CFTimeInterval MTL4::CommitFeedback::GPUEndTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(GPUEndTime));
-}
-
-_MTL_INLINE CFTimeInterval MTL4::CommitFeedback::GPUStartTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(GPUStartTime));
-}
-
-_MTL_INLINE NS::Error* MTL4::CommitFeedback::error() const
-{
-    return Object::sendMessage<NS::Error*>(this, _MTL_PRIVATE_SEL(error));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4Compiler.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4Compiler.hpp
deleted file mode 100644
index 94249b29..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4Compiler.hpp
+++ /dev/null
@@ -1,345 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4Compiler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLDevice.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-#include <functional>
-
-namespace MTL4
-{
-class BinaryFunction;
-class BinaryFunctionDescriptor;
-class CompilerDescriptor;
-class CompilerTask;
-class CompilerTaskOptions;
-class ComputePipelineDescriptor;
-class LibraryDescriptor;
-class MachineLearningPipelineDescriptor;
-class MachineLearningPipelineState;
-class PipelineDataSetSerializer;
-class PipelineDescriptor;
-class PipelineStageDynamicLinkingDescriptor;
-class RenderPipelineDynamicLinkingDescriptor;
-}
-
-namespace MTL
-{
-class ComputePipelineState;
-class Device;
-class DynamicLibrary;
-class Library;
-class RenderPipelineState;
-
-using NewDynamicLibraryCompletionHandler = void (^)(MTL::DynamicLibrary*, NS::Error*);
-using NewDynamicLibraryCompletionHandlerFunction = std::function<void(MTL::DynamicLibrary*, NS::Error*)>;
-}
-
-namespace MTL4
-{
-using NewComputePipelineStateCompletionHandler = void (^)(MTL::ComputePipelineState*, NS::Error*);
-using NewComputePipelineStateCompletionHandlerFunction = std::function<void(MTL::ComputePipelineState*, NS::Error*)>;
-using NewRenderPipelineStateCompletionHandler = void (^)(MTL::RenderPipelineState*, NS::Error*);
-using NewRenderPipelineStateCompletionHandlerFunction = std::function<void(MTL::RenderPipelineState*, NS::Error*)>;
-using NewBinaryFunctionCompletionHandler = void (^)(MTL4::BinaryFunction*, NS::Error*);
-using NewBinaryFunctionCompletionHandlerFunction = std::function<void(MTL4::BinaryFunction*, NS::Error*)>;
-using NewMachineLearningPipelineStateCompletionHandler = void (^)(MTL4::MachineLearningPipelineState*, NS::Error*);
-using NewMachineLearningPipelineStateCompletionHandlerFunction = std::function<void(MTL4::MachineLearningPipelineState*, NS::Error*)>;
-
-class CompilerDescriptor : public NS::Copying<CompilerDescriptor>
-{
-public:
-    static CompilerDescriptor* alloc();
-
-    CompilerDescriptor*        init();
-
-    NS::String*                label() const;
-
-    PipelineDataSetSerializer* pipelineDataSetSerializer() const;
-
-    void                       setLabel(const NS::String* label);
-
-    void                       setPipelineDataSetSerializer(const MTL4::PipelineDataSetSerializer* pipelineDataSetSerializer);
-};
-class CompilerTaskOptions : public NS::Copying<CompilerTaskOptions>
-{
-public:
-    static CompilerTaskOptions* alloc();
-
-    CompilerTaskOptions*        init();
-
-    NS::Array*                  lookupArchives() const;
-    void                        setLookupArchives(const NS::Array* lookupArchives);
-};
-class Compiler : public NS::Referencing<Compiler>
-{
-public:
-    MTL::Device*                  device() const;
-
-    NS::String*                   label() const;
-
-    BinaryFunction*               newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error);
-    CompilerTask*                 newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL4::NewBinaryFunctionCompletionHandler completionHandler);
-
-    MTL::ComputePipelineState*    newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error);
-    MTL::ComputePipelineState*    newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error);
-    CompilerTask*                 newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewComputePipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewComputePipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newComputePipelineState(const MTL4::ComputePipelineDescriptor* pDescriptor, const MTL4::CompilerTaskOptions* options, const MTL4::NewComputePipelineStateCompletionHandlerFunction& function);
-
-    MTL::DynamicLibrary*          newDynamicLibrary(const MTL::Library* library, NS::Error** error);
-    MTL::DynamicLibrary*          newDynamicLibrary(const NS::URL* url, NS::Error** error);
-    CompilerTask*                 newDynamicLibrary(const MTL::Library* library, const MTL::NewDynamicLibraryCompletionHandler completionHandler);
-    CompilerTask*                 newDynamicLibrary(const NS::URL* url, const MTL::NewDynamicLibraryCompletionHandler completionHandler);
-    CompilerTask*                 newDynamicLibrary(const MTL::Library* pLibrary, const MTL::NewDynamicLibraryCompletionHandlerFunction& function);
-    CompilerTask*                 newDynamicLibrary(const NS::URL* pURL, const MTL::NewDynamicLibraryCompletionHandlerFunction& function);
-
-    MTL::Library*                 newLibrary(const MTL4::LibraryDescriptor* descriptor, NS::Error** error);
-    CompilerTask*                 newLibrary(const MTL4::LibraryDescriptor* descriptor, const MTL::NewLibraryCompletionHandler completionHandler);
-    CompilerTask*                 newLibrary(const MTL4::LibraryDescriptor* pDescriptor, const MTL::NewLibraryCompletionHandlerFunction& function);
-
-    MachineLearningPipelineState* newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* descriptor, NS::Error** error);
-    CompilerTask*                 newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* descriptor, const MTL4::NewMachineLearningPipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* pDescriptor, const MTL4::NewMachineLearningPipelineStateCompletionHandlerFunction& function);
-
-    MTL::RenderPipelineState*     newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error);
-    MTL::RenderPipelineState*     newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error);
-    CompilerTask*                 newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewRenderPipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewRenderPipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newRenderPipelineState(const MTL4::PipelineDescriptor* pDescriptor, const MTL4::CompilerTaskOptions* options, const MTL4::NewRenderPipelineStateCompletionHandlerFunction& function);
-    MTL::RenderPipelineState*     newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* descriptor, const MTL::RenderPipelineState* pipeline, NS::Error** error);
-    CompilerTask*                 newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* descriptor, const MTL::RenderPipelineState* pipeline, const MTL::NewRenderPipelineStateCompletionHandler completionHandler);
-    CompilerTask*                 newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* pDescriptor, const MTL::RenderPipelineState* pPipeline, const MTL4::NewRenderPipelineStateCompletionHandlerFunction& function);
-
-    PipelineDataSetSerializer*    pipelineDataSetSerializer() const;
-};
-
-}
-_MTL_INLINE MTL4::CompilerDescriptor* MTL4::CompilerDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::CompilerDescriptor>(_MTL_PRIVATE_CLS(MTL4CompilerDescriptor));
-}
-
-_MTL_INLINE MTL4::CompilerDescriptor* MTL4::CompilerDescriptor::init()
-{
-    return NS::Object::init<MTL4::CompilerDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::CompilerDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::PipelineDataSetSerializer* MTL4::CompilerDescriptor::pipelineDataSetSerializer() const
-{
-    return Object::sendMessage<MTL4::PipelineDataSetSerializer*>(this, _MTL_PRIVATE_SEL(pipelineDataSetSerializer));
-}
-
-_MTL_INLINE void MTL4::CompilerDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::CompilerDescriptor::setPipelineDataSetSerializer(const MTL4::PipelineDataSetSerializer* pipelineDataSetSerializer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPipelineDataSetSerializer_), pipelineDataSetSerializer);
-}
-
-_MTL_INLINE MTL4::CompilerTaskOptions* MTL4::CompilerTaskOptions::alloc()
-{
-    return NS::Object::alloc<MTL4::CompilerTaskOptions>(_MTL_PRIVATE_CLS(MTL4CompilerTaskOptions));
-}
-
-_MTL_INLINE MTL4::CompilerTaskOptions* MTL4::CompilerTaskOptions::init()
-{
-    return NS::Object::init<MTL4::CompilerTaskOptions>();
-}
-
-_MTL_INLINE NS::Array* MTL4::CompilerTaskOptions::lookupArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(lookupArchives));
-}
-
-_MTL_INLINE void MTL4::CompilerTaskOptions::setLookupArchives(const NS::Array* lookupArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLookupArchives_), lookupArchives);
-}
-
-_MTL_INLINE MTL::Device* MTL4::Compiler::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL4::Compiler::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::BinaryFunction* MTL4::Compiler::newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::BinaryFunction*>(this, _MTL_PRIVATE_SEL(newBinaryFunctionWithDescriptor_compilerTaskOptions_error_), descriptor, compilerTaskOptions, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newBinaryFunction(const MTL4::BinaryFunctionDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL4::NewBinaryFunctionCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newBinaryFunctionWithDescriptor_compilerTaskOptions_completionHandler_), descriptor, compilerTaskOptions, completionHandler);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL4::Compiler::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_compilerTaskOptions_error_), descriptor, compilerTaskOptions, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL4::Compiler::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_error_), descriptor, dynamicLinkingDescriptor, compilerTaskOptions, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewComputePipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_compilerTaskOptions_completionHandler_), descriptor, compilerTaskOptions, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newComputePipelineState(const MTL4::ComputePipelineDescriptor* descriptor, const MTL4::PipelineStageDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewComputePipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_completionHandler_), descriptor, dynamicLinkingDescriptor, compilerTaskOptions, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newComputePipelineState(const MTL4::ComputePipelineDescriptor* pDescriptor, const MTL4::CompilerTaskOptions* options, const MTL4::NewComputePipelineStateCompletionHandlerFunction& function)
-{
-    __block MTL4::NewComputePipelineStateCompletionHandlerFunction blockFunction = function;
-    return newComputePipelineState(pDescriptor, options, ^(MTL::ComputePipelineState* pPipeline, NS::Error* pError) { blockFunction(pPipeline, pError); });
-}
-
-_MTL_INLINE MTL::DynamicLibrary* MTL4::Compiler::newDynamicLibrary(const MTL::Library* library, NS::Error** error)
-{
-    return Object::sendMessage<MTL::DynamicLibrary*>(this, _MTL_PRIVATE_SEL(newDynamicLibrary_error_), library, error);
-}
-
-_MTL_INLINE MTL::DynamicLibrary* MTL4::Compiler::newDynamicLibrary(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL::DynamicLibrary*>(this, _MTL_PRIVATE_SEL(newDynamicLibraryWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newDynamicLibrary(const MTL::Library* library, const MTL::NewDynamicLibraryCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newDynamicLibrary_completionHandler_), library, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newDynamicLibrary(const NS::URL* url, const MTL::NewDynamicLibraryCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newDynamicLibraryWithURL_completionHandler_), url, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newDynamicLibrary(const MTL::Library* pLibrary, const MTL::NewDynamicLibraryCompletionHandlerFunction& function)
-{
-    __block MTL::NewDynamicLibraryCompletionHandlerFunction blockFunction = function;
-    return newDynamicLibrary(pLibrary, ^(MTL::DynamicLibrary* pLibraryRef, NS::Error* pError) { blockFunction(pLibraryRef, pError); });
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newDynamicLibrary(const NS::URL* pURL, const MTL::NewDynamicLibraryCompletionHandlerFunction& function)
-{
-    __block MTL::NewDynamicLibraryCompletionHandlerFunction blockFunction = function;
-    return newDynamicLibrary(pURL, ^(MTL::DynamicLibrary* pLibrary, NS::Error* pError) { blockFunction(pLibrary, pError); });
-}
-
-_MTL_INLINE MTL::Library* MTL4::Compiler::newLibrary(const MTL4::LibraryDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newLibrary(const MTL4::LibraryDescriptor* descriptor, const MTL::NewLibraryCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newLibraryWithDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newLibrary(const MTL4::LibraryDescriptor* pDescriptor, const MTL::NewLibraryCompletionHandlerFunction& function)
-{
-    __block MTL::NewLibraryCompletionHandlerFunction blockFunction = function;
-    return newLibrary(pDescriptor, ^(MTL::Library* pLibrary, NS::Error* pError) { blockFunction(pLibrary, pError); });
-}
-
-_MTL_INLINE MTL4::MachineLearningPipelineState* MTL4::Compiler::newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::MachineLearningPipelineState*>(this, _MTL_PRIVATE_SEL(newMachineLearningPipelineStateWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* descriptor, const MTL4::NewMachineLearningPipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newMachineLearningPipelineStateWithDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newMachineLearningPipelineState(const MTL4::MachineLearningPipelineDescriptor* pDescriptor, const MTL4::NewMachineLearningPipelineStateCompletionHandlerFunction& function)
-{
-    __block MTL4::NewMachineLearningPipelineStateCompletionHandlerFunction blockFunction = function;
-    return newMachineLearningPipelineState(pDescriptor, ^(MTL4::MachineLearningPipelineState* pPipeline, NS::Error* pError) { blockFunction(pPipeline, pError); });
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL4::Compiler::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_compilerTaskOptions_error_), descriptor, compilerTaskOptions, error);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL4::Compiler::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_error_), descriptor, dynamicLinkingDescriptor, compilerTaskOptions, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewRenderPipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_compilerTaskOptions_completionHandler_), descriptor, compilerTaskOptions, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newRenderPipelineState(const MTL4::PipelineDescriptor* descriptor, const MTL4::RenderPipelineDynamicLinkingDescriptor* dynamicLinkingDescriptor, const MTL4::CompilerTaskOptions* compilerTaskOptions, const MTL::NewRenderPipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_completionHandler_), descriptor, dynamicLinkingDescriptor, compilerTaskOptions, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newRenderPipelineState(const MTL4::PipelineDescriptor* pDescriptor, const MTL4::CompilerTaskOptions* options, const MTL4::NewRenderPipelineStateCompletionHandlerFunction& function)
-{
-    __block MTL4::NewRenderPipelineStateCompletionHandlerFunction blockFunction = function;
-    return newRenderPipelineState(pDescriptor, options, ^(MTL::RenderPipelineState* pPipeline, NS::Error* pError) { blockFunction(pPipeline, pError); });
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL4::Compiler::newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* descriptor, const MTL::RenderPipelineState* pipeline, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateBySpecializationWithDescriptor_pipeline_error_), descriptor, pipeline, error);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* descriptor, const MTL::RenderPipelineState* pipeline, const MTL::NewRenderPipelineStateCompletionHandler completionHandler)
-{
-    return Object::sendMessage<MTL4::CompilerTask*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateBySpecializationWithDescriptor_pipeline_completionHandler_), descriptor, pipeline, completionHandler);
-}
-
-_MTL_INLINE MTL4::CompilerTask* MTL4::Compiler::newRenderPipelineStateBySpecialization(const MTL4::PipelineDescriptor* pDescriptor, const MTL::RenderPipelineState* pPipeline, const MTL4::NewRenderPipelineStateCompletionHandlerFunction& function)
-{
-    __block MTL4::NewRenderPipelineStateCompletionHandlerFunction blockFunction = function;
-    return newRenderPipelineStateBySpecialization(pDescriptor, pPipeline, ^(MTL::RenderPipelineState* pPipelineRef, NS::Error* pError) { blockFunction(pPipelineRef, pError); });
-}
-
-_MTL_INLINE MTL4::PipelineDataSetSerializer* MTL4::Compiler::pipelineDataSetSerializer() const
-{
-    return Object::sendMessage<MTL4::PipelineDataSetSerializer*>(this, _MTL_PRIVATE_SEL(pipelineDataSetSerializer));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4CompilerTask.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4CompilerTask.hpp
deleted file mode 100644
index a1ee9cdf..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4CompilerTask.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4CompilerTask.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class Compiler;
-_MTL_ENUM(NS::Integer, CompilerTaskStatus) {
-    CompilerTaskStatusNone = 0,
-    CompilerTaskStatusScheduled = 1,
-    CompilerTaskStatusCompiling = 2,
-    CompilerTaskStatusFinished = 3,
-};
-
-class CompilerTask : public NS::Referencing<CompilerTask>
-{
-public:
-    Compiler*          compiler() const;
-
-    CompilerTaskStatus status() const;
-
-    void               waitUntilCompleted();
-};
-
-}
-
-_MTL_INLINE MTL4::Compiler* MTL4::CompilerTask::compiler() const
-{
-    return Object::sendMessage<MTL4::Compiler*>(this, _MTL_PRIVATE_SEL(compiler));
-}
-
-_MTL_INLINE MTL4::CompilerTaskStatus MTL4::CompilerTask::status() const
-{
-    return Object::sendMessage<MTL4::CompilerTaskStatus>(this, _MTL_PRIVATE_SEL(status));
-}
-
-_MTL_INLINE void MTL4::CompilerTask::waitUntilCompleted()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitUntilCompleted));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4ComputeCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4ComputeCommandEncoder.hpp
deleted file mode 100644
index 7ef19da2..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4ComputeCommandEncoder.hpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4ComputeCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4CommandEncoder.hpp"
-#include "MTL4Counters.hpp"
-#include "MTLAccelerationStructure.hpp"
-#include "MTLAccelerationStructureTypes.hpp"
-#include "MTLBlitCommandEncoder.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLGPUAddress.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL4
-{
-class AccelerationStructureDescriptor;
-class ArgumentTable;
-class CounterHeap;
-}
-
-namespace MTL
-{
-class AccelerationStructure;
-class Buffer;
-class ComputePipelineState;
-class IndirectCommandBuffer;
-class Tensor;
-class TensorExtents;
-class Texture;
-}
-
-namespace MTL4
-{
-class ComputeCommandEncoder : public NS::Referencing<ComputeCommandEncoder, CommandEncoder>
-{
-public:
-    void        buildAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL4::BufferRange scratchBuffer);
-
-    void        copyAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure);
-
-    void        copyAndCompactAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure);
-
-    void        copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger size);
-    void        copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin);
-    void        copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin, MTL::BlitOption options);
-
-    void        copyFromTensor(const MTL::Tensor* sourceTensor, const MTL::TensorExtents* sourceOrigin, const MTL::TensorExtents* sourceDimensions, const MTL::Tensor* destinationTensor, const MTL::TensorExtents* destinationOrigin, const MTL::TensorExtents* destinationDimensions);
-
-    void        copyFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture);
-    void        copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, NS::UInteger sliceCount, NS::UInteger levelCount);
-    void        copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin);
-    void        copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage);
-    void        copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage, MTL::BlitOption options);
-
-    void        copyIndirectCommandBuffer(const MTL::IndirectCommandBuffer* source, NS::Range sourceRange, const MTL::IndirectCommandBuffer* destination, NS::UInteger destinationIndex);
-
-    void        dispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup);
-    void        dispatchThreadgroups(MTL::GPUAddress indirectBuffer, MTL::Size threadsPerThreadgroup);
-
-    void        dispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup);
-    void        dispatchThreads(MTL::GPUAddress indirectBuffer);
-
-    void        executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange);
-    void        executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, MTL::GPUAddress indirectRangeBuffer);
-
-    void        fillBuffer(const MTL::Buffer* buffer, NS::Range range, uint8_t value);
-
-    void        generateMipmaps(const MTL::Texture* texture);
-
-    void        optimizeContentsForCPUAccess(const MTL::Texture* texture);
-    void        optimizeContentsForCPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level);
-
-    void        optimizeContentsForGPUAccess(const MTL::Texture* texture);
-    void        optimizeContentsForGPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level);
-
-    void        optimizeIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range range);
-
-    void        refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL4::BufferRange scratchBuffer);
-    void        refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL4::BufferRange scratchBuffer, MTL::AccelerationStructureRefitOptions options);
-
-    void        resetCommandsInBuffer(const MTL::IndirectCommandBuffer* buffer, NS::Range range);
-
-    void        setArgumentTable(const MTL4::ArgumentTable* argumentTable);
-
-    void        setComputePipelineState(const MTL::ComputePipelineState* state);
-
-    void        setImageblockWidth(NS::UInteger width, NS::UInteger height);
-
-    void        setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-
-    MTL::Stages stages();
-
-    void        writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL4::BufferRange buffer);
-
-    void        writeTimestamp(MTL4::TimestampGranularity granularity, const MTL4::CounterHeap* counterHeap, NS::UInteger index);
-};
-
-}
-_MTL_INLINE void MTL4::ComputeCommandEncoder::buildAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL4::BufferRange scratchBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(buildAccelerationStructure_descriptor_scratchBuffer_), accelerationStructure, descriptor, scratchBuffer);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyAccelerationStructure_toAccelerationStructure_), sourceAccelerationStructure, destinationAccelerationStructure);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyAndCompactAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyAndCompactAccelerationStructure_toAccelerationStructure_), sourceAccelerationStructure, destinationAccelerationStructure);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger size)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_toBuffer_destinationOffset_size_), sourceBuffer, sourceOffset, destinationBuffer, destinationOffset, size);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_), sourceBuffer, sourceOffset, sourceBytesPerRow, sourceBytesPerImage, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin, MTL::BlitOption options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_options_), sourceBuffer, sourceOffset, sourceBytesPerRow, sourceBytesPerImage, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin, options);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTensor(const MTL::Tensor* sourceTensor, const MTL::TensorExtents* sourceOrigin, const MTL::TensorExtents* sourceDimensions, const MTL::Tensor* destinationTensor, const MTL::TensorExtents* destinationOrigin, const MTL::TensorExtents* destinationDimensions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTensor_sourceOrigin_sourceDimensions_toTensor_destinationOrigin_destinationDimensions_), sourceTensor, sourceOrigin, sourceDimensions, destinationTensor, destinationOrigin, destinationDimensions);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_toTexture_), sourceTexture, destinationTexture);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, NS::UInteger sliceCount, NS::UInteger levelCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_toTexture_destinationSlice_destinationLevel_sliceCount_levelCount_), sourceTexture, sourceSlice, sourceLevel, destinationTexture, destinationSlice, destinationLevel, sliceCount, levelCount);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationBuffer, destinationOffset, destinationBytesPerRow, destinationBytesPerImage);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage, MTL::BlitOption options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_options_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationBuffer, destinationOffset, destinationBytesPerRow, destinationBytesPerImage, options);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::copyIndirectCommandBuffer(const MTL::IndirectCommandBuffer* source, NS::Range sourceRange, const MTL::IndirectCommandBuffer* destination, NS::UInteger destinationIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyIndirectCommandBuffer_sourceRange_destination_destinationIndex_), source, sourceRange, destination, destinationIndex);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::dispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadgroups_threadsPerThreadgroup_), threadgroupsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::dispatchThreadgroups(MTL::GPUAddress indirectBuffer, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadgroupsWithIndirectBuffer_threadsPerThreadgroup_), indirectBuffer, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::dispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreads_threadsPerThreadgroup_), threadsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::dispatchThreads(MTL::GPUAddress indirectBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadsWithIndirectBuffer_), indirectBuffer);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_withRange_), indirectCommandBuffer, executionRange);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, MTL::GPUAddress indirectRangeBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_indirectBuffer_), indirectCommandbuffer, indirectRangeBuffer);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::fillBuffer(const MTL::Buffer* buffer, NS::Range range, uint8_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(fillBuffer_range_value_), buffer, range, value);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::generateMipmaps(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(generateMipmapsForTexture_), texture);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::optimizeContentsForCPUAccess(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForCPUAccess_), texture);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::optimizeContentsForCPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForCPUAccess_slice_level_), texture, slice, level);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::optimizeContentsForGPUAccess(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForGPUAccess_), texture);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::optimizeContentsForGPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForGPUAccess_slice_level_), texture, slice, level);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::optimizeIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeIndirectCommandBuffer_withRange_), indirectCommandBuffer, range);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL4::BufferRange scratchBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_), sourceAccelerationStructure, descriptor, destinationAccelerationStructure, scratchBuffer);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL4::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL4::BufferRange scratchBuffer, MTL::AccelerationStructureRefitOptions options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_options_), sourceAccelerationStructure, descriptor, destinationAccelerationStructure, scratchBuffer, options);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::resetCommandsInBuffer(const MTL::IndirectCommandBuffer* buffer, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resetCommandsInBuffer_withRange_), buffer, range);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::setArgumentTable(const MTL4::ArgumentTable* argumentTable)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentTable_), argumentTable);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::setComputePipelineState(const MTL::ComputePipelineState* state)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputePipelineState_), state);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::setImageblockWidth(NS::UInteger width, NS::UInteger height)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setImageblockWidth_height_), width, height);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_atIndex_), length, index);
-}
-
-_MTL_INLINE MTL::Stages MTL4::ComputeCommandEncoder::stages()
-{
-    return Object::sendMessage<MTL::Stages>(this, _MTL_PRIVATE_SEL(stages));
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL4::BufferRange buffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeCompactedAccelerationStructureSize_toBuffer_), accelerationStructure, buffer);
-}
-
-_MTL_INLINE void MTL4::ComputeCommandEncoder::writeTimestamp(MTL4::TimestampGranularity granularity, const MTL4::CounterHeap* counterHeap, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeTimestampWithGranularity_intoHeap_atIndex_), granularity, counterHeap, index);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4ComputePipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4ComputePipeline.hpp
deleted file mode 100644
index a808431a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4ComputePipeline.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4ComputePipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL4
-{
-class ComputePipelineDescriptor;
-class FunctionDescriptor;
-class StaticLinkingDescriptor;
-
-class ComputePipelineDescriptor : public NS::Copying<ComputePipelineDescriptor, PipelineDescriptor>
-{
-public:
-    static ComputePipelineDescriptor* alloc();
-
-    FunctionDescriptor*               computeFunctionDescriptor() const;
-
-    ComputePipelineDescriptor*        init();
-
-    NS::UInteger                      maxTotalThreadsPerThreadgroup() const;
-
-    MTL::Size                         requiredThreadsPerThreadgroup() const;
-
-    void                              reset();
-
-    void                              setComputeFunctionDescriptor(const MTL4::FunctionDescriptor* computeFunctionDescriptor);
-
-    void                              setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup);
-
-    void                              setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup);
-
-    void                              setStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* staticLinkingDescriptor);
-
-    void                              setSupportBinaryLinking(bool supportBinaryLinking);
-
-    void                              setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers);
-
-    void                              setThreadGroupSizeIsMultipleOfThreadExecutionWidth(bool threadGroupSizeIsMultipleOfThreadExecutionWidth);
-
-    StaticLinkingDescriptor*          staticLinkingDescriptor() const;
-
-    bool                              supportBinaryLinking() const;
-
-    IndirectCommandBufferSupportState supportIndirectCommandBuffers() const;
-
-    bool                              threadGroupSizeIsMultipleOfThreadExecutionWidth() const;
-};
-
-}
-_MTL_INLINE MTL4::ComputePipelineDescriptor* MTL4::ComputePipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::ComputePipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4ComputePipelineDescriptor));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::ComputePipelineDescriptor::computeFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(computeFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::ComputePipelineDescriptor* MTL4::ComputePipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::ComputePipelineDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL4::ComputePipelineDescriptor::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE MTL::Size MTL4::ComputePipelineDescriptor::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setComputeFunctionDescriptor(const MTL4::FunctionDescriptor* computeFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputeFunctionDescriptor_), computeFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerThreadgroup_), maxTotalThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerThreadgroup_), requiredThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* staticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStaticLinkingDescriptor_), staticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setSupportBinaryLinking(bool supportBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportBinaryLinking_), supportBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE void MTL4::ComputePipelineDescriptor::setThreadGroupSizeIsMultipleOfThreadExecutionWidth(bool threadGroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadGroupSizeIsMultipleOfThreadExecutionWidth_), threadGroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::ComputePipelineDescriptor::staticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(staticLinkingDescriptor));
-}
-
-_MTL_INLINE bool MTL4::ComputePipelineDescriptor::supportBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportBinaryLinking));
-}
-
-_MTL_INLINE MTL4::IndirectCommandBufferSupportState MTL4::ComputePipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessage<MTL4::IndirectCommandBufferSupportState>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE bool MTL4::ComputePipelineDescriptor::threadGroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(threadGroupSizeIsMultipleOfThreadExecutionWidth));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4Counters.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4Counters.hpp
deleted file mode 100644
index b507b766..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4Counters.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4Counters.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <cstdint>
-
-#include <cstdint>
-
-namespace MTL4
-{
-class CounterHeapDescriptor;
-_MTL_ENUM(NS::Integer, CounterHeapType) {
-    CounterHeapTypeInvalid,
-    CounterHeapTypeTimestamp,
-};
-
-_MTL_ENUM(NS::Integer, TimestampGranularity) {
-    TimestampGranularityRelaxed = 0,
-    TimestampGranularityPrecise = 1,
-};
-
-struct TimestampHeapEntry
-{
-    uint64_t timestamp;
-} _MTL_PACKED;
-
-class CounterHeapDescriptor : public NS::Copying<CounterHeapDescriptor>
-{
-public:
-    static CounterHeapDescriptor* alloc();
-
-    NS::UInteger                  count() const;
-
-    CounterHeapDescriptor*        init();
-
-    void                          setCount(NS::UInteger count);
-
-    void                          setType(MTL4::CounterHeapType type);
-    CounterHeapType               type() const;
-};
-class CounterHeap : public NS::Referencing<CounterHeap>
-{
-public:
-    NS::UInteger    count() const;
-    void            invalidateCounterRange(NS::Range range);
-
-    NS::String*     label() const;
-
-    NS::Data*       resolveCounterRange(NS::Range range);
-
-    void            setLabel(const NS::String* label);
-
-    CounterHeapType type() const;
-};
-
-}
-
-_MTL_INLINE MTL4::CounterHeapDescriptor* MTL4::CounterHeapDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::CounterHeapDescriptor>(_MTL_PRIVATE_CLS(MTL4CounterHeapDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL4::CounterHeapDescriptor::count() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(count));
-}
-
-_MTL_INLINE MTL4::CounterHeapDescriptor* MTL4::CounterHeapDescriptor::init()
-{
-    return NS::Object::init<MTL4::CounterHeapDescriptor>();
-}
-
-_MTL_INLINE void MTL4::CounterHeapDescriptor::setCount(NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCount_), count);
-}
-
-_MTL_INLINE void MTL4::CounterHeapDescriptor::setType(MTL4::CounterHeapType type)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setType_), type);
-}
-
-_MTL_INLINE MTL4::CounterHeapType MTL4::CounterHeapDescriptor::type() const
-{
-    return Object::sendMessage<MTL4::CounterHeapType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE NS::UInteger MTL4::CounterHeap::count() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(count));
-}
-
-_MTL_INLINE void MTL4::CounterHeap::invalidateCounterRange(NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(invalidateCounterRange_), range);
-}
-
-_MTL_INLINE NS::String* MTL4::CounterHeap::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::Data* MTL4::CounterHeap::resolveCounterRange(NS::Range range)
-{
-    return Object::sendMessage<NS::Data*>(this, _MTL_PRIVATE_SEL(resolveCounterRange_), range);
-}
-
-_MTL_INLINE void MTL4::CounterHeap::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL4::CounterHeapType MTL4::CounterHeap::type() const
-{
-    return Object::sendMessage<MTL4::CounterHeapType>(this, _MTL_PRIVATE_SEL(type));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4FunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4FunctionDescriptor.hpp
deleted file mode 100644
index 9049677e..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4FunctionDescriptor.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal//MTL4FunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-
-class FunctionDescriptor : public NS::Copying<FunctionDescriptor>
-{
-public:
-    static FunctionDescriptor* alloc();
-
-    FunctionDescriptor*        init();
-};
-
-}
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::FunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::FunctionDescriptor>(_MTL_PRIVATE_CLS(MTL4FunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::FunctionDescriptor::init()
-{
-    return NS::Object::init<MTL4::FunctionDescriptor>();
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4LibraryDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4LibraryDescriptor.hpp
deleted file mode 100644
index bc491b69..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4LibraryDescriptor.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4LibraryDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class LibraryDescriptor;
-}
-
-namespace MTL
-{
-class CompileOptions;
-}
-
-namespace MTL4
-{
-class LibraryDescriptor : public NS::Copying<LibraryDescriptor>
-{
-public:
-    static LibraryDescriptor* alloc();
-
-    LibraryDescriptor*        init();
-
-    NS::String*               name() const;
-
-    MTL::CompileOptions*      options() const;
-
-    void                      setName(const NS::String* name);
-
-    void                      setOptions(const MTL::CompileOptions* options);
-
-    void                      setSource(const NS::String* source);
-    NS::String*               source() const;
-};
-
-}
-_MTL_INLINE MTL4::LibraryDescriptor* MTL4::LibraryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::LibraryDescriptor>(_MTL_PRIVATE_CLS(MTL4LibraryDescriptor));
-}
-
-_MTL_INLINE MTL4::LibraryDescriptor* MTL4::LibraryDescriptor::init()
-{
-    return NS::Object::init<MTL4::LibraryDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::LibraryDescriptor::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::CompileOptions* MTL4::LibraryDescriptor::options() const
-{
-    return Object::sendMessage<MTL::CompileOptions*>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE void MTL4::LibraryDescriptor::setName(const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setName_), name);
-}
-
-_MTL_INLINE void MTL4::LibraryDescriptor::setOptions(const MTL::CompileOptions* options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptions_), options);
-}
-
-_MTL_INLINE void MTL4::LibraryDescriptor::setSource(const NS::String* source)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSource_), source);
-}
-
-_MTL_INLINE NS::String* MTL4::LibraryDescriptor::source() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(source));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4LibraryFunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4LibraryFunctionDescriptor.hpp
deleted file mode 100644
index 1dec4bf2..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4LibraryFunctionDescriptor.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4LibraryFunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4FunctionDescriptor.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class LibraryFunctionDescriptor;
-}
-
-namespace MTL
-{
-class Library;
-}
-
-namespace MTL4
-{
-class LibraryFunctionDescriptor : public NS::Copying<LibraryFunctionDescriptor, FunctionDescriptor>
-{
-public:
-    static LibraryFunctionDescriptor* alloc();
-
-    LibraryFunctionDescriptor*        init();
-
-    MTL::Library*                     library() const;
-
-    NS::String*                       name() const;
-
-    void                              setLibrary(const MTL::Library* library);
-
-    void                              setName(const NS::String* name);
-};
-
-}
-_MTL_INLINE MTL4::LibraryFunctionDescriptor* MTL4::LibraryFunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::LibraryFunctionDescriptor>(_MTL_PRIVATE_CLS(MTL4LibraryFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::LibraryFunctionDescriptor* MTL4::LibraryFunctionDescriptor::init()
-{
-    return NS::Object::init<MTL4::LibraryFunctionDescriptor>();
-}
-
-_MTL_INLINE MTL::Library* MTL4::LibraryFunctionDescriptor::library() const
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(library));
-}
-
-_MTL_INLINE NS::String* MTL4::LibraryFunctionDescriptor::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE void MTL4::LibraryFunctionDescriptor::setLibrary(const MTL::Library* library)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLibrary_), library);
-}
-
-_MTL_INLINE void MTL4::LibraryFunctionDescriptor::setName(const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setName_), name);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4LinkingDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4LinkingDescriptor.hpp
deleted file mode 100644
index ef5900b1..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4LinkingDescriptor.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4LinkingDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class PipelineStageDynamicLinkingDescriptor;
-class RenderPipelineDynamicLinkingDescriptor;
-class StaticLinkingDescriptor;
-
-class StaticLinkingDescriptor : public NS::Copying<StaticLinkingDescriptor>
-{
-public:
-    static StaticLinkingDescriptor* alloc();
-
-    NS::Array*                      functionDescriptors() const;
-
-    NS::Dictionary*                 groups() const;
-
-    StaticLinkingDescriptor*        init();
-
-    NS::Array*                      privateFunctionDescriptors() const;
-
-    void                            setFunctionDescriptors(const NS::Array* functionDescriptors);
-
-    void                            setGroups(const NS::Dictionary* groups);
-
-    void                            setPrivateFunctionDescriptors(const NS::Array* privateFunctionDescriptors);
-};
-class PipelineStageDynamicLinkingDescriptor : public NS::Copying<PipelineStageDynamicLinkingDescriptor>
-{
-public:
-    static PipelineStageDynamicLinkingDescriptor* alloc();
-
-    NS::Array*                                    binaryLinkedFunctions() const;
-
-    PipelineStageDynamicLinkingDescriptor*        init();
-
-    NS::UInteger                                  maxCallStackDepth() const;
-
-    NS::Array*                                    preloadedLibraries() const;
-
-    void                                          setBinaryLinkedFunctions(const NS::Array* binaryLinkedFunctions);
-
-    void                                          setMaxCallStackDepth(NS::UInteger maxCallStackDepth);
-
-    void                                          setPreloadedLibraries(const NS::Array* preloadedLibraries);
-};
-class RenderPipelineDynamicLinkingDescriptor : public NS::Copying<RenderPipelineDynamicLinkingDescriptor>
-{
-public:
-    static RenderPipelineDynamicLinkingDescriptor* alloc();
-
-    PipelineStageDynamicLinkingDescriptor*         fragmentLinkingDescriptor() const;
-
-    RenderPipelineDynamicLinkingDescriptor*        init();
-
-    PipelineStageDynamicLinkingDescriptor*         meshLinkingDescriptor() const;
-
-    PipelineStageDynamicLinkingDescriptor*         objectLinkingDescriptor() const;
-
-    PipelineStageDynamicLinkingDescriptor*         tileLinkingDescriptor() const;
-
-    PipelineStageDynamicLinkingDescriptor*         vertexLinkingDescriptor() const;
-};
-
-}
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::StaticLinkingDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::StaticLinkingDescriptor>(_MTL_PRIVATE_CLS(MTL4StaticLinkingDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL4::StaticLinkingDescriptor::functionDescriptors() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functionDescriptors));
-}
-
-_MTL_INLINE NS::Dictionary* MTL4::StaticLinkingDescriptor::groups() const
-{
-    return Object::sendMessage<NS::Dictionary*>(this, _MTL_PRIVATE_SEL(groups));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::StaticLinkingDescriptor::init()
-{
-    return NS::Object::init<MTL4::StaticLinkingDescriptor>();
-}
-
-_MTL_INLINE NS::Array* MTL4::StaticLinkingDescriptor::privateFunctionDescriptors() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(privateFunctionDescriptors));
-}
-
-_MTL_INLINE void MTL4::StaticLinkingDescriptor::setFunctionDescriptors(const NS::Array* functionDescriptors)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionDescriptors_), functionDescriptors);
-}
-
-_MTL_INLINE void MTL4::StaticLinkingDescriptor::setGroups(const NS::Dictionary* groups)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setGroups_), groups);
-}
-
-_MTL_INLINE void MTL4::StaticLinkingDescriptor::setPrivateFunctionDescriptors(const NS::Array* privateFunctionDescriptors)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrivateFunctionDescriptors_), privateFunctionDescriptors);
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::PipelineStageDynamicLinkingDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::PipelineStageDynamicLinkingDescriptor>(_MTL_PRIVATE_CLS(MTL4PipelineStageDynamicLinkingDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL4::PipelineStageDynamicLinkingDescriptor::binaryLinkedFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryLinkedFunctions));
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::PipelineStageDynamicLinkingDescriptor::init()
-{
-    return NS::Object::init<MTL4::PipelineStageDynamicLinkingDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL4::PipelineStageDynamicLinkingDescriptor::maxCallStackDepth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCallStackDepth));
-}
-
-_MTL_INLINE NS::Array* MTL4::PipelineStageDynamicLinkingDescriptor::preloadedLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(preloadedLibraries));
-}
-
-_MTL_INLINE void MTL4::PipelineStageDynamicLinkingDescriptor::setBinaryLinkedFunctions(const NS::Array* binaryLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryLinkedFunctions_), binaryLinkedFunctions);
-}
-
-_MTL_INLINE void MTL4::PipelineStageDynamicLinkingDescriptor::setMaxCallStackDepth(NS::UInteger maxCallStackDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCallStackDepth_), maxCallStackDepth);
-}
-
-_MTL_INLINE void MTL4::PipelineStageDynamicLinkingDescriptor::setPreloadedLibraries(const NS::Array* preloadedLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPreloadedLibraries_), preloadedLibraries);
-}
-
-_MTL_INLINE MTL4::RenderPipelineDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPipelineDynamicLinkingDescriptor>(_MTL_PRIVATE_CLS(MTL4RenderPipelineDynamicLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::fragmentLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::PipelineStageDynamicLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(fragmentLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::RenderPipelineDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::init()
-{
-    return NS::Object::init<MTL4::RenderPipelineDynamicLinkingDescriptor>();
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::meshLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::PipelineStageDynamicLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(meshLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::objectLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::PipelineStageDynamicLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(objectLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::tileLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::PipelineStageDynamicLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(tileLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineStageDynamicLinkingDescriptor* MTL4::RenderPipelineDynamicLinkingDescriptor::vertexLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::PipelineStageDynamicLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(vertexLinkingDescriptor));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningCommandEncoder.hpp
deleted file mode 100644
index 4d3cff66..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningCommandEncoder.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4MachineLearningCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4CommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class ArgumentTable;
-class MachineLearningPipelineState;
-}
-
-namespace MTL
-{
-class Heap;
-}
-
-namespace MTL4
-{
-class MachineLearningCommandEncoder : public NS::Referencing<MachineLearningCommandEncoder, CommandEncoder>
-{
-public:
-    void dispatchNetwork(const MTL::Heap* heap);
-
-    void setArgumentTable(const MTL4::ArgumentTable* argumentTable);
-
-    void setPipelineState(const MTL4::MachineLearningPipelineState* pipelineState);
-};
-
-}
-_MTL_INLINE void MTL4::MachineLearningCommandEncoder::dispatchNetwork(const MTL::Heap* heap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchNetworkWithIntermediatesHeap_), heap);
-}
-
-_MTL_INLINE void MTL4::MachineLearningCommandEncoder::setArgumentTable(const MTL4::ArgumentTable* argumentTable)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentTable_), argumentTable);
-}
-
-_MTL_INLINE void MTL4::MachineLearningCommandEncoder::setPipelineState(const MTL4::MachineLearningPipelineState* pipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPipelineState_), pipelineState);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningPipeline.hpp
deleted file mode 100644
index 713569f9..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4MachineLearningPipeline.hpp
+++ /dev/null
@@ -1,172 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4MachineLearningPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-class MachineLearningPipelineDescriptor;
-class MachineLearningPipelineReflection;
-}
-
-namespace MTL
-{
-class Device;
-class TensorExtents;
-}
-
-namespace MTL4
-{
-class MachineLearningPipelineDescriptor : public NS::Copying<MachineLearningPipelineDescriptor, PipelineDescriptor>
-{
-public:
-    static MachineLearningPipelineDescriptor* alloc();
-
-    MachineLearningPipelineDescriptor*        init();
-
-    MTL::TensorExtents*                       inputDimensionsAtBufferIndex(NS::Integer bufferIndex);
-
-    NS::String*                               label() const;
-
-    FunctionDescriptor*                       machineLearningFunctionDescriptor() const;
-
-    void                                      reset();
-
-    void                                      setInputDimensions(const MTL::TensorExtents* dimensions, NS::Integer bufferIndex);
-    void                                      setInputDimensions(const NS::Array* dimensions, NS::Range range);
-
-    void                                      setLabel(const NS::String* label);
-
-    void                                      setMachineLearningFunctionDescriptor(const MTL4::FunctionDescriptor* machineLearningFunctionDescriptor);
-};
-class MachineLearningPipelineReflection : public NS::Referencing<MachineLearningPipelineReflection>
-{
-public:
-    static MachineLearningPipelineReflection* alloc();
-
-    NS::Array*                                bindings() const;
-
-    MachineLearningPipelineReflection*        init();
-};
-class MachineLearningPipelineState : public NS::Referencing<MachineLearningPipelineState, MTL::Allocation>
-{
-public:
-    MTL::Device*                       device() const;
-
-    NS::UInteger                       intermediatesHeapSize() const;
-
-    NS::String*                        label() const;
-
-    MachineLearningPipelineReflection* reflection() const;
-};
-
-}
-_MTL_INLINE MTL4::MachineLearningPipelineDescriptor* MTL4::MachineLearningPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::MachineLearningPipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4MachineLearningPipelineDescriptor));
-}
-
-_MTL_INLINE MTL4::MachineLearningPipelineDescriptor* MTL4::MachineLearningPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::MachineLearningPipelineDescriptor>();
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL4::MachineLearningPipelineDescriptor::inputDimensionsAtBufferIndex(NS::Integer bufferIndex)
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(inputDimensionsAtBufferIndex_), bufferIndex);
-}
-
-_MTL_INLINE NS::String* MTL4::MachineLearningPipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::MachineLearningPipelineDescriptor::machineLearningFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(machineLearningFunctionDescriptor));
-}
-
-_MTL_INLINE void MTL4::MachineLearningPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::MachineLearningPipelineDescriptor::setInputDimensions(const MTL::TensorExtents* dimensions, NS::Integer bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInputDimensions_atBufferIndex_), dimensions, bufferIndex);
-}
-
-_MTL_INLINE void MTL4::MachineLearningPipelineDescriptor::setInputDimensions(const NS::Array* dimensions, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInputDimensions_withRange_), dimensions, range);
-}
-
-_MTL_INLINE void MTL4::MachineLearningPipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::MachineLearningPipelineDescriptor::setMachineLearningFunctionDescriptor(const MTL4::FunctionDescriptor* machineLearningFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMachineLearningFunctionDescriptor_), machineLearningFunctionDescriptor);
-}
-
-_MTL_INLINE MTL4::MachineLearningPipelineReflection* MTL4::MachineLearningPipelineReflection::alloc()
-{
-    return NS::Object::alloc<MTL4::MachineLearningPipelineReflection>(_MTL_PRIVATE_CLS(MTL4MachineLearningPipelineReflection));
-}
-
-_MTL_INLINE NS::Array* MTL4::MachineLearningPipelineReflection::bindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(bindings));
-}
-
-_MTL_INLINE MTL4::MachineLearningPipelineReflection* MTL4::MachineLearningPipelineReflection::init()
-{
-    return NS::Object::init<MTL4::MachineLearningPipelineReflection>();
-}
-
-_MTL_INLINE MTL::Device* MTL4::MachineLearningPipelineState::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MachineLearningPipelineState::intermediatesHeapSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(intermediatesHeapSize));
-}
-
-_MTL_INLINE NS::String* MTL4::MachineLearningPipelineState::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::MachineLearningPipelineReflection* MTL4::MachineLearningPipelineState::reflection() const
-{
-    return Object::sendMessage<MTL4::MachineLearningPipelineReflection*>(this, _MTL_PRIVATE_SEL(reflection));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4MeshRenderPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4MeshRenderPipeline.hpp
deleted file mode 100644
index f66dffe2..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4MeshRenderPipeline.hpp
+++ /dev/null
@@ -1,413 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4MeshRenderPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTL4RenderPipeline.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-class MeshRenderPipelineDescriptor;
-class RenderPipelineColorAttachmentDescriptorArray;
-class StaticLinkingDescriptor;
-
-class MeshRenderPipelineDescriptor : public NS::Copying<MeshRenderPipelineDescriptor, PipelineDescriptor>
-{
-public:
-    static MeshRenderPipelineDescriptor*          alloc();
-
-    AlphaToCoverageState                          alphaToCoverageState() const;
-
-    AlphaToOneState                               alphaToOneState() const;
-
-    LogicalToPhysicalColorAttachmentMappingState  colorAttachmentMappingState() const;
-
-    RenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    FunctionDescriptor*                           fragmentFunctionDescriptor() const;
-
-    StaticLinkingDescriptor*                      fragmentStaticLinkingDescriptor() const;
-
-    MeshRenderPipelineDescriptor*                 init();
-
-    bool                                          isRasterizationEnabled() const;
-
-    NS::UInteger                                  maxTotalThreadgroupsPerMeshGrid() const;
-
-    NS::UInteger                                  maxTotalThreadsPerMeshThreadgroup() const;
-
-    NS::UInteger                                  maxTotalThreadsPerObjectThreadgroup() const;
-
-    NS::UInteger                                  maxVertexAmplificationCount() const;
-
-    FunctionDescriptor*                           meshFunctionDescriptor() const;
-
-    StaticLinkingDescriptor*                      meshStaticLinkingDescriptor() const;
-
-    bool                                          meshThreadgroupSizeIsMultipleOfThreadExecutionWidth() const;
-
-    FunctionDescriptor*                           objectFunctionDescriptor() const;
-
-    StaticLinkingDescriptor*                      objectStaticLinkingDescriptor() const;
-
-    bool                                          objectThreadgroupSizeIsMultipleOfThreadExecutionWidth() const;
-
-    NS::UInteger                                  payloadMemoryLength() const;
-
-    NS::UInteger                                  rasterSampleCount() const;
-
-    [[deprecated("please use isRasterizationEnabled instead")]]
-    bool                              rasterizationEnabled() const;
-
-    MTL::Size                         requiredThreadsPerMeshThreadgroup() const;
-
-    MTL::Size                         requiredThreadsPerObjectThreadgroup() const;
-
-    void                              reset();
-
-    void                              setAlphaToCoverageState(MTL4::AlphaToCoverageState alphaToCoverageState);
-
-    void                              setAlphaToOneState(MTL4::AlphaToOneState alphaToOneState);
-
-    void                              setColorAttachmentMappingState(MTL4::LogicalToPhysicalColorAttachmentMappingState colorAttachmentMappingState);
-
-    void                              setFragmentFunctionDescriptor(const MTL4::FunctionDescriptor* fragmentFunctionDescriptor);
-
-    void                              setFragmentStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* fragmentStaticLinkingDescriptor);
-
-    void                              setMaxTotalThreadgroupsPerMeshGrid(NS::UInteger maxTotalThreadgroupsPerMeshGrid);
-
-    void                              setMaxTotalThreadsPerMeshThreadgroup(NS::UInteger maxTotalThreadsPerMeshThreadgroup);
-
-    void                              setMaxTotalThreadsPerObjectThreadgroup(NS::UInteger maxTotalThreadsPerObjectThreadgroup);
-
-    void                              setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount);
-
-    void                              setMeshFunctionDescriptor(const MTL4::FunctionDescriptor* meshFunctionDescriptor);
-
-    void                              setMeshStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* meshStaticLinkingDescriptor);
-
-    void                              setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool meshThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-
-    void                              setObjectFunctionDescriptor(const MTL4::FunctionDescriptor* objectFunctionDescriptor);
-
-    void                              setObjectStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* objectStaticLinkingDescriptor);
-
-    void                              setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool objectThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-
-    void                              setPayloadMemoryLength(NS::UInteger payloadMemoryLength);
-
-    void                              setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void                              setRasterizationEnabled(bool rasterizationEnabled);
-
-    void                              setRequiredThreadsPerMeshThreadgroup(MTL::Size requiredThreadsPerMeshThreadgroup);
-
-    void                              setRequiredThreadsPerObjectThreadgroup(MTL::Size requiredThreadsPerObjectThreadgroup);
-
-    void                              setSupportFragmentBinaryLinking(bool supportFragmentBinaryLinking);
-
-    void                              setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers);
-
-    void                              setSupportMeshBinaryLinking(bool supportMeshBinaryLinking);
-
-    void                              setSupportObjectBinaryLinking(bool supportObjectBinaryLinking);
-
-    bool                              supportFragmentBinaryLinking() const;
-
-    IndirectCommandBufferSupportState supportIndirectCommandBuffers() const;
-
-    bool                              supportMeshBinaryLinking() const;
-
-    bool                              supportObjectBinaryLinking() const;
-};
-
-}
-_MTL_INLINE MTL4::MeshRenderPipelineDescriptor* MTL4::MeshRenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::MeshRenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4MeshRenderPipelineDescriptor));
-}
-
-_MTL_INLINE MTL4::AlphaToCoverageState MTL4::MeshRenderPipelineDescriptor::alphaToCoverageState() const
-{
-    return Object::sendMessage<MTL4::AlphaToCoverageState>(this, _MTL_PRIVATE_SEL(alphaToCoverageState));
-}
-
-_MTL_INLINE MTL4::AlphaToOneState MTL4::MeshRenderPipelineDescriptor::alphaToOneState() const
-{
-    return Object::sendMessage<MTL4::AlphaToOneState>(this, _MTL_PRIVATE_SEL(alphaToOneState));
-}
-
-_MTL_INLINE MTL4::LogicalToPhysicalColorAttachmentMappingState MTL4::MeshRenderPipelineDescriptor::colorAttachmentMappingState() const
-{
-    return Object::sendMessage<MTL4::LogicalToPhysicalColorAttachmentMappingState>(this, _MTL_PRIVATE_SEL(colorAttachmentMappingState));
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptorArray* MTL4::MeshRenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL4::RenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::MeshRenderPipelineDescriptor::fragmentFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(fragmentFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::MeshRenderPipelineDescriptor::fragmentStaticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(fragmentStaticLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::MeshRenderPipelineDescriptor* MTL4::MeshRenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::MeshRenderPipelineDescriptor>();
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::isRasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::maxTotalThreadgroupsPerMeshGrid() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadgroupsPerMeshGrid));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::maxTotalThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::maxTotalThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::maxVertexAmplificationCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexAmplificationCount));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::MeshRenderPipelineDescriptor::meshFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(meshFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::MeshRenderPipelineDescriptor::meshStaticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(meshStaticLinkingDescriptor));
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::meshThreadgroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(meshThreadgroupSizeIsMultipleOfThreadExecutionWidth));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::MeshRenderPipelineDescriptor::objectFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(objectFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::MeshRenderPipelineDescriptor::objectStaticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(objectStaticLinkingDescriptor));
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::objectThreadgroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(objectThreadgroupSizeIsMultipleOfThreadExecutionWidth));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::payloadMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(payloadMemoryLength));
-}
-
-_MTL_INLINE NS::UInteger MTL4::MeshRenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::rasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE MTL::Size MTL4::MeshRenderPipelineDescriptor::requiredThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE MTL::Size MTL4::MeshRenderPipelineDescriptor::requiredThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setAlphaToCoverageState(MTL4::AlphaToCoverageState alphaToCoverageState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToCoverageState_), alphaToCoverageState);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setAlphaToOneState(MTL4::AlphaToOneState alphaToOneState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToOneState_), alphaToOneState);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setColorAttachmentMappingState(MTL4::LogicalToPhysicalColorAttachmentMappingState colorAttachmentMappingState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorAttachmentMappingState_), colorAttachmentMappingState);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setFragmentFunctionDescriptor(const MTL4::FunctionDescriptor* fragmentFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentFunctionDescriptor_), fragmentFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setFragmentStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* fragmentStaticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentStaticLinkingDescriptor_), fragmentStaticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMaxTotalThreadgroupsPerMeshGrid(NS::UInteger maxTotalThreadgroupsPerMeshGrid)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadgroupsPerMeshGrid_), maxTotalThreadgroupsPerMeshGrid);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMaxTotalThreadsPerMeshThreadgroup(NS::UInteger maxTotalThreadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerMeshThreadgroup_), maxTotalThreadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMaxTotalThreadsPerObjectThreadgroup(NS::UInteger maxTotalThreadsPerObjectThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerObjectThreadgroup_), maxTotalThreadsPerObjectThreadgroup);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexAmplificationCount_), maxVertexAmplificationCount);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMeshFunctionDescriptor(const MTL4::FunctionDescriptor* meshFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshFunctionDescriptor_), meshFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMeshStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* meshStaticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshStaticLinkingDescriptor_), meshStaticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool meshThreadgroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth_), meshThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setObjectFunctionDescriptor(const MTL4::FunctionDescriptor* objectFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectFunctionDescriptor_), objectFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setObjectStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* objectStaticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectStaticLinkingDescriptor_), objectStaticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool objectThreadgroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth_), objectThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setPayloadMemoryLength(NS::UInteger payloadMemoryLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPayloadMemoryLength_), payloadMemoryLength);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setRasterizationEnabled(bool rasterizationEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationEnabled_), rasterizationEnabled);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setRequiredThreadsPerMeshThreadgroup(MTL::Size requiredThreadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerMeshThreadgroup_), requiredThreadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setRequiredThreadsPerObjectThreadgroup(MTL::Size requiredThreadsPerObjectThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerObjectThreadgroup_), requiredThreadsPerObjectThreadgroup);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setSupportFragmentBinaryLinking(bool supportFragmentBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportFragmentBinaryLinking_), supportFragmentBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setSupportMeshBinaryLinking(bool supportMeshBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportMeshBinaryLinking_), supportMeshBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::MeshRenderPipelineDescriptor::setSupportObjectBinaryLinking(bool supportObjectBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportObjectBinaryLinking_), supportObjectBinaryLinking);
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::supportFragmentBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportFragmentBinaryLinking));
-}
-
-_MTL_INLINE MTL4::IndirectCommandBufferSupportState MTL4::MeshRenderPipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessage<MTL4::IndirectCommandBufferSupportState>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::supportMeshBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportMeshBinaryLinking));
-}
-
-_MTL_INLINE bool MTL4::MeshRenderPipelineDescriptor::supportObjectBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportObjectBinaryLinking));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4PipelineDataSetSerializer.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4PipelineDataSetSerializer.hpp
deleted file mode 100644
index 9dbd6103..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4PipelineDataSetSerializer.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4PipelineDataSetSerializer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class PipelineDataSetSerializerDescriptor;
-
-_MTL_OPTIONS(NS::UInteger, PipelineDataSetSerializerConfiguration) {
-    PipelineDataSetSerializerConfigurationCaptureDescriptors = 1,
-    PipelineDataSetSerializerConfigurationCaptureBinaries = 1 << 1,
-};
-
-class PipelineDataSetSerializerDescriptor : public NS::Copying<PipelineDataSetSerializerDescriptor>
-{
-public:
-    static PipelineDataSetSerializerDescriptor* alloc();
-
-    PipelineDataSetSerializerConfiguration      configuration() const;
-
-    PipelineDataSetSerializerDescriptor*        init();
-
-    void                                        setConfiguration(MTL4::PipelineDataSetSerializerConfiguration configuration);
-};
-class PipelineDataSetSerializer : public NS::Referencing<PipelineDataSetSerializer>
-{
-public:
-    bool      serializeAsArchiveAndFlushToURL(const NS::URL* url, NS::Error** error);
-
-    NS::Data* serializeAsPipelinesScript(NS::Error** error);
-};
-
-}
-_MTL_INLINE MTL4::PipelineDataSetSerializerDescriptor* MTL4::PipelineDataSetSerializerDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::PipelineDataSetSerializerDescriptor>(_MTL_PRIVATE_CLS(MTL4PipelineDataSetSerializerDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineDataSetSerializerConfiguration MTL4::PipelineDataSetSerializerDescriptor::configuration() const
-{
-    return Object::sendMessage<MTL4::PipelineDataSetSerializerConfiguration>(this, _MTL_PRIVATE_SEL(configuration));
-}
-
-_MTL_INLINE MTL4::PipelineDataSetSerializerDescriptor* MTL4::PipelineDataSetSerializerDescriptor::init()
-{
-    return NS::Object::init<MTL4::PipelineDataSetSerializerDescriptor>();
-}
-
-_MTL_INLINE void MTL4::PipelineDataSetSerializerDescriptor::setConfiguration(MTL4::PipelineDataSetSerializerConfiguration configuration)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConfiguration_), configuration);
-}
-
-_MTL_INLINE bool MTL4::PipelineDataSetSerializer::serializeAsArchiveAndFlushToURL(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(serializeAsArchiveAndFlushToURL_error_), url, error);
-}
-
-_MTL_INLINE NS::Data* MTL4::PipelineDataSetSerializer::serializeAsPipelinesScript(NS::Error** error)
-{
-    return Object::sendMessage<NS::Data*>(this, _MTL_PRIVATE_SEL(serializeAsPipelinesScriptWithError_), error);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4PipelineState.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4PipelineState.hpp
deleted file mode 100644
index cecefa8a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4PipelineState.hpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4PipelineState.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPipeline.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class PipelineDescriptor;
-class PipelineOptions;
-_MTL_ENUM(NS::Integer, AlphaToOneState) {
-    AlphaToOneStateDisabled = 0,
-    AlphaToOneStateEnabled = 1,
-};
-
-_MTL_ENUM(NS::Integer, AlphaToCoverageState) {
-    AlphaToCoverageStateDisabled = 0,
-    AlphaToCoverageStateEnabled = 1,
-};
-
-_MTL_ENUM(NS::Integer, BlendState) {
-    BlendStateDisabled = 0,
-    BlendStateEnabled = 1,
-    BlendStateUnspecialized = 2,
-};
-
-_MTL_ENUM(NS::Integer, IndirectCommandBufferSupportState) {
-    IndirectCommandBufferSupportStateDisabled = 0,
-    IndirectCommandBufferSupportStateEnabled = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, ShaderReflection) {
-    ShaderReflectionNone = 0,
-    ShaderReflectionBindingInfo = 1,
-    ShaderReflectionBufferTypeInfo = 1 << 1,
-};
-
-class PipelineOptions : public NS::Copying<PipelineOptions>
-{
-public:
-    static PipelineOptions* alloc();
-
-    PipelineOptions*        init();
-
-    void                    setShaderReflection(MTL4::ShaderReflection shaderReflection);
-
-    void                    setShaderValidation(MTL::ShaderValidation shaderValidation);
-
-    ShaderReflection        shaderReflection() const;
-
-    MTL::ShaderValidation   shaderValidation() const;
-};
-class PipelineDescriptor : public NS::Copying<PipelineDescriptor>
-{
-public:
-    static PipelineDescriptor* alloc();
-
-    PipelineDescriptor*        init();
-
-    NS::String*                label() const;
-
-    PipelineOptions*           options() const;
-
-    void                       setLabel(const NS::String* label);
-
-    void                       setOptions(const MTL4::PipelineOptions* options);
-};
-
-}
-_MTL_INLINE MTL4::PipelineOptions* MTL4::PipelineOptions::alloc()
-{
-    return NS::Object::alloc<MTL4::PipelineOptions>(_MTL_PRIVATE_CLS(MTL4PipelineOptions));
-}
-
-_MTL_INLINE MTL4::PipelineOptions* MTL4::PipelineOptions::init()
-{
-    return NS::Object::init<MTL4::PipelineOptions>();
-}
-
-_MTL_INLINE void MTL4::PipelineOptions::setShaderReflection(MTL4::ShaderReflection shaderReflection)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderReflection_), shaderReflection);
-}
-
-_MTL_INLINE void MTL4::PipelineOptions::setShaderValidation(MTL::ShaderValidation shaderValidation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderValidation_), shaderValidation);
-}
-
-_MTL_INLINE MTL4::ShaderReflection MTL4::PipelineOptions::shaderReflection() const
-{
-    return Object::sendMessage<MTL4::ShaderReflection>(this, _MTL_PRIVATE_SEL(shaderReflection));
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL4::PipelineOptions::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE MTL4::PipelineDescriptor* MTL4::PipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::PipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4PipelineDescriptor));
-}
-
-_MTL_INLINE MTL4::PipelineDescriptor* MTL4::PipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::PipelineDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL4::PipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL4::PipelineOptions* MTL4::PipelineDescriptor::options() const
-{
-    return Object::sendMessage<MTL4::PipelineOptions*>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE void MTL4::PipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL4::PipelineDescriptor::setOptions(const MTL4::PipelineOptions* options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptions_), options);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4RenderCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4RenderCommandEncoder.hpp
deleted file mode 100644
index 0dd01f4d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4RenderCommandEncoder.hpp
+++ /dev/null
@@ -1,340 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4RenderCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4CommandEncoder.hpp"
-#include "MTL4Counters.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDefines.hpp"
-#include "MTLGPUAddress.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderCommandEncoder.hpp"
-#include "MTLRenderPass.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL4
-{
-class ArgumentTable;
-class CounterHeap;
-}
-
-namespace MTL
-{
-class DepthStencilState;
-class IndirectCommandBuffer;
-class LogicalToPhysicalColorAttachmentMap;
-class RenderPipelineState;
-struct ScissorRect;
-struct VertexAmplificationViewMapping;
-struct Viewport;
-
-}
-namespace MTL4
-{
-_MTL_OPTIONS(NS::UInteger, RenderEncoderOptions) {
-    RenderEncoderOptionNone = 0,
-    RenderEncoderOptionSuspending = 1,
-    RenderEncoderOptionResuming = 1 << 1,
-};
-
-class RenderCommandEncoder : public NS::Referencing<RenderCommandEncoder, CommandEncoder>
-{
-public:
-    void         dispatchThreadsPerTile(MTL::Size threadsPerTile);
-
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, NS::UInteger instanceCount);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, MTL::GPUAddress indirectBuffer);
-
-    void         drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-    void         drawMeshThreadgroups(MTL::GPUAddress indirectBuffer, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void         drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, MTL::GPUAddress indirectBuffer);
-
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange);
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, MTL::GPUAddress indirectRangeBuffer);
-
-    void         setArgumentTable(const MTL4::ArgumentTable* argumentTable, MTL::RenderStages stages);
-
-    void         setBlendColor(float red, float green, float blue, float alpha);
-
-    void         setColorAttachmentMap(const MTL::LogicalToPhysicalColorAttachmentMap* mapping);
-
-    void         setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex);
-
-    void         setCullMode(MTL::CullMode cullMode);
-
-    void         setDepthBias(float depthBias, float slopeScale, float clamp);
-
-    void         setDepthClipMode(MTL::DepthClipMode depthClipMode);
-
-    void         setDepthStencilState(const MTL::DepthStencilState* depthStencilState);
-
-    void         setDepthStoreAction(MTL::StoreAction storeAction);
-
-    void         setDepthTestBounds(float minBound, float maxBound);
-
-    void         setFrontFacingWinding(MTL::Winding frontFacingWinding);
-
-    void         setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-
-    void         setRenderPipelineState(const MTL::RenderPipelineState* pipelineState);
-
-    void         setScissorRect(MTL::ScissorRect rect);
-    void         setScissorRects(const MTL::ScissorRect* scissorRects, NS::UInteger count);
-
-    void         setStencilReferenceValue(uint32_t referenceValue);
-    void         setStencilReferenceValues(uint32_t frontReferenceValue, uint32_t backReferenceValue);
-
-    void         setStencilStoreAction(MTL::StoreAction storeAction);
-
-    void         setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger offset, NS::UInteger index);
-
-    void         setTriangleFillMode(MTL::TriangleFillMode fillMode);
-
-    void         setVertexAmplificationCount(NS::UInteger count, const MTL::VertexAmplificationViewMapping* viewMappings);
-
-    void         setViewport(MTL::Viewport viewport);
-    void         setViewports(const MTL::Viewport* viewports, NS::UInteger count);
-
-    void         setVisibilityResultMode(MTL::VisibilityResultMode mode, NS::UInteger offset);
-
-    NS::UInteger tileHeight() const;
-
-    NS::UInteger tileWidth() const;
-
-    void         writeTimestamp(MTL4::TimestampGranularity granularity, MTL::RenderStages stage, const MTL4::CounterHeap* counterHeap, NS::UInteger index);
-};
-
-}
-_MTL_INLINE void MTL4::RenderCommandEncoder::dispatchThreadsPerTile(MTL::Size threadsPerTile)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadsPerTile_), threadsPerTile);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_), primitiveType, indexCount, indexType, indexBuffer, indexBufferLength);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_instanceCount_), primitiveType, indexCount, indexType, indexBuffer, indexBufferLength, instanceCount);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_instanceCount_baseVertex_baseInstance_), primitiveType, indexCount, indexType, indexBuffer, indexBufferLength, instanceCount, baseVertex, baseInstance);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, MTL::IndexType indexType, MTL::GPUAddress indexBuffer, NS::UInteger indexBufferLength, MTL::GPUAddress indirectBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexType_indexBuffer_indexBufferLength_indirectBuffer_), primitiveType, indexType, indexBuffer, indexBufferLength, indirectBuffer);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreadgroups_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadgroupsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawMeshThreadgroups(MTL::GPUAddress indirectBuffer, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreadgroupsWithIndirectBuffer_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), indirectBuffer, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreads_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_), primitiveType, vertexStart, vertexCount);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_), primitiveType, vertexStart, vertexCount, instanceCount);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_baseInstance_), primitiveType, vertexStart, vertexCount, instanceCount, baseInstance);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, MTL::GPUAddress indirectBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_indirectBuffer_), primitiveType, indirectBuffer);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_withRange_), indirectCommandBuffer, executionRange);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, MTL::GPUAddress indirectRangeBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_indirectBuffer_), indirectCommandBuffer, indirectRangeBuffer);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setArgumentTable(const MTL4::ArgumentTable* argumentTable, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentTable_atStages_), argumentTable, stages);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setBlendColor(float red, float green, float blue, float alpha)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBlendColorRed_green_blue_alpha_), red, green, blue, alpha);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setColorAttachmentMap(const MTL::LogicalToPhysicalColorAttachmentMap* mapping)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorAttachmentMap_), mapping);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorStoreAction_atIndex_), storeAction, colorAttachmentIndex);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setCullMode(MTL::CullMode cullMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCullMode_), cullMode);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setDepthBias(float depthBias, float slopeScale, float clamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthBias_slopeScale_clamp_), depthBias, slopeScale, clamp);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setDepthClipMode(MTL::DepthClipMode depthClipMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthClipMode_), depthClipMode);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setDepthStencilState(const MTL::DepthStencilState* depthStencilState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilState_), depthStencilState);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setDepthStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setDepthTestBounds(float minBound, float maxBound)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthTestMinBound_maxBound_), minBound, maxBound);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setFrontFacingWinding(MTL::Winding frontFacingWinding)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFrontFacingWinding_), frontFacingWinding);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectThreadgroupMemoryLength_atIndex_), length, index);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setRenderPipelineState(const MTL::RenderPipelineState* pipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderPipelineState_), pipelineState);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setScissorRect(MTL::ScissorRect rect)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScissorRect_), rect);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setScissorRects(const MTL::ScissorRect* scissorRects, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScissorRects_count_), scissorRects, count);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setStencilReferenceValue(uint32_t referenceValue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilReferenceValue_), referenceValue);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setStencilReferenceValues(uint32_t frontReferenceValue, uint32_t backReferenceValue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilFrontReferenceValue_backReferenceValue_), frontReferenceValue, backReferenceValue);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setStencilStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_offset_atIndex_), length, offset, index);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setTriangleFillMode(MTL::TriangleFillMode fillMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleFillMode_), fillMode);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setVertexAmplificationCount(NS::UInteger count, const MTL::VertexAmplificationViewMapping* viewMappings)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexAmplificationCount_viewMappings_), count, viewMappings);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setViewport(MTL::Viewport viewport)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setViewport_), viewport);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setViewports(const MTL::Viewport* viewports, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setViewports_count_), viewports, count);
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::setVisibilityResultMode(MTL::VisibilityResultMode mode, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultMode_offset_), mode, offset);
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderCommandEncoder::tileHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderCommandEncoder::tileWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileWidth));
-}
-
-_MTL_INLINE void MTL4::RenderCommandEncoder::writeTimestamp(MTL4::TimestampGranularity granularity, MTL::RenderStages stage, const MTL4::CounterHeap* counterHeap, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeTimestampWithGranularity_afterStage_intoHeap_atIndex_), granularity, stage, counterHeap, index);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4RenderPass.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4RenderPass.hpp
deleted file mode 100644
index c5aa9ed6..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4RenderPass.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4RenderPass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderPass.hpp"
-
-namespace MTL4
-{
-class RenderPassDescriptor;
-}
-
-namespace MTL
-{
-class Buffer;
-class RasterizationRateMap;
-class RenderPassColorAttachmentDescriptorArray;
-class RenderPassDepthAttachmentDescriptor;
-class RenderPassStencilAttachmentDescriptor;
-struct SamplePosition;
-}
-
-namespace MTL4
-{
-class RenderPassDescriptor : public NS::Copying<RenderPassDescriptor>
-{
-public:
-    static RenderPassDescriptor*                   alloc();
-
-    MTL::RenderPassColorAttachmentDescriptorArray* colorAttachments() const;
-
-    NS::UInteger                                   defaultRasterSampleCount() const;
-
-    MTL::RenderPassDepthAttachmentDescriptor*      depthAttachment() const;
-
-    NS::UInteger                                   getSamplePositions(MTL::SamplePosition* positions, NS::UInteger count);
-
-    NS::UInteger                                   imageblockSampleLength() const;
-
-    RenderPassDescriptor*                          init();
-
-    MTL::RasterizationRateMap*                     rasterizationRateMap() const;
-
-    NS::UInteger                                   renderTargetArrayLength() const;
-
-    NS::UInteger                                   renderTargetHeight() const;
-
-    NS::UInteger                                   renderTargetWidth() const;
-
-    void                                           setDefaultRasterSampleCount(NS::UInteger defaultRasterSampleCount);
-
-    void                                           setDepthAttachment(const MTL::RenderPassDepthAttachmentDescriptor* depthAttachment);
-
-    void                                           setImageblockSampleLength(NS::UInteger imageblockSampleLength);
-
-    void                                           setRasterizationRateMap(const MTL::RasterizationRateMap* rasterizationRateMap);
-
-    void                                           setRenderTargetArrayLength(NS::UInteger renderTargetArrayLength);
-
-    void                                           setRenderTargetHeight(NS::UInteger renderTargetHeight);
-
-    void                                           setRenderTargetWidth(NS::UInteger renderTargetWidth);
-
-    void                                           setSamplePositions(const MTL::SamplePosition* positions, NS::UInteger count);
-
-    void                                           setStencilAttachment(const MTL::RenderPassStencilAttachmentDescriptor* stencilAttachment);
-
-    void                                           setSupportColorAttachmentMapping(bool supportColorAttachmentMapping);
-
-    void                                           setThreadgroupMemoryLength(NS::UInteger threadgroupMemoryLength);
-
-    void                                           setTileHeight(NS::UInteger tileHeight);
-
-    void                                           setTileWidth(NS::UInteger tileWidth);
-
-    void                                           setVisibilityResultBuffer(const MTL::Buffer* visibilityResultBuffer);
-
-    void                                           setVisibilityResultType(MTL::VisibilityResultType visibilityResultType);
-
-    MTL::RenderPassStencilAttachmentDescriptor*    stencilAttachment() const;
-
-    bool                                           supportColorAttachmentMapping() const;
-
-    NS::UInteger                                   threadgroupMemoryLength() const;
-
-    NS::UInteger                                   tileHeight() const;
-
-    NS::UInteger                                   tileWidth() const;
-
-    MTL::Buffer*                                   visibilityResultBuffer() const;
-
-    MTL::VisibilityResultType                      visibilityResultType() const;
-};
-
-}
-_MTL_INLINE MTL4::RenderPassDescriptor* MTL4::RenderPassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPassDescriptor>(_MTL_PRIVATE_CLS(MTL4RenderPassDescriptor));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptorArray* MTL4::RenderPassDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::RenderPassColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::defaultRasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(defaultRasterSampleCount));
-}
-
-_MTL_INLINE MTL::RenderPassDepthAttachmentDescriptor* MTL4::RenderPassDescriptor::depthAttachment() const
-{
-    return Object::sendMessage<MTL::RenderPassDepthAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(depthAttachment));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::getSamplePositions(MTL::SamplePosition* positions, NS::UInteger count)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(getSamplePositions_count_), positions, count);
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::imageblockSampleLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(imageblockSampleLength));
-}
-
-_MTL_INLINE MTL4::RenderPassDescriptor* MTL4::RenderPassDescriptor::init()
-{
-    return NS::Object::init<MTL4::RenderPassDescriptor>();
-}
-
-_MTL_INLINE MTL::RasterizationRateMap* MTL4::RenderPassDescriptor::rasterizationRateMap() const
-{
-    return Object::sendMessage<MTL::RasterizationRateMap*>(this, _MTL_PRIVATE_SEL(rasterizationRateMap));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::renderTargetArrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetArrayLength));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::renderTargetHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::renderTargetWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetWidth));
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setDefaultRasterSampleCount(NS::UInteger defaultRasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDefaultRasterSampleCount_), defaultRasterSampleCount);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setDepthAttachment(const MTL::RenderPassDepthAttachmentDescriptor* depthAttachment)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthAttachment_), depthAttachment);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setImageblockSampleLength(NS::UInteger imageblockSampleLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setImageblockSampleLength_), imageblockSampleLength);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setRasterizationRateMap(const MTL::RasterizationRateMap* rasterizationRateMap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationRateMap_), rasterizationRateMap);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setRenderTargetArrayLength(NS::UInteger renderTargetArrayLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetArrayLength_), renderTargetArrayLength);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setRenderTargetHeight(NS::UInteger renderTargetHeight)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetHeight_), renderTargetHeight);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setRenderTargetWidth(NS::UInteger renderTargetWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetWidth_), renderTargetWidth);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setSamplePositions(const MTL::SamplePosition* positions, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplePositions_count_), positions, count);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setStencilAttachment(const MTL::RenderPassStencilAttachmentDescriptor* stencilAttachment)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilAttachment_), stencilAttachment);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setSupportColorAttachmentMapping(bool supportColorAttachmentMapping)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportColorAttachmentMapping_), supportColorAttachmentMapping);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setThreadgroupMemoryLength(NS::UInteger threadgroupMemoryLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_), threadgroupMemoryLength);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setTileHeight(NS::UInteger tileHeight)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileHeight_), tileHeight);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setTileWidth(NS::UInteger tileWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileWidth_), tileWidth);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setVisibilityResultBuffer(const MTL::Buffer* visibilityResultBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultBuffer_), visibilityResultBuffer);
-}
-
-_MTL_INLINE void MTL4::RenderPassDescriptor::setVisibilityResultType(MTL::VisibilityResultType visibilityResultType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultType_), visibilityResultType);
-}
-
-_MTL_INLINE MTL::RenderPassStencilAttachmentDescriptor* MTL4::RenderPassDescriptor::stencilAttachment() const
-{
-    return Object::sendMessage<MTL::RenderPassStencilAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(stencilAttachment));
-}
-
-_MTL_INLINE bool MTL4::RenderPassDescriptor::supportColorAttachmentMapping() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportColorAttachmentMapping));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::threadgroupMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryLength));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::tileHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPassDescriptor::tileWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileWidth));
-}
-
-_MTL_INLINE MTL::Buffer* MTL4::RenderPassDescriptor::visibilityResultBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(visibilityResultBuffer));
-}
-
-_MTL_INLINE MTL::VisibilityResultType MTL4::RenderPassDescriptor::visibilityResultType() const
-{
-    return Object::sendMessage<MTL::VisibilityResultType>(this, _MTL_PRIVATE_SEL(visibilityResultType));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4RenderPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4RenderPipeline.hpp
deleted file mode 100644
index fc2e5e6f..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4RenderPipeline.hpp
+++ /dev/null
@@ -1,587 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4RenderPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPixelFormat.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderPipeline.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-class RenderPipelineBinaryFunctionsDescriptor;
-class RenderPipelineColorAttachmentDescriptor;
-class RenderPipelineColorAttachmentDescriptorArray;
-class RenderPipelineDescriptor;
-class StaticLinkingDescriptor;
-}
-
-namespace MTL
-{
-class VertexDescriptor;
-}
-
-namespace MTL4
-{
-_MTL_ENUM(NS::Integer, LogicalToPhysicalColorAttachmentMappingState) {
-    LogicalToPhysicalColorAttachmentMappingStateIdentity = 0,
-    LogicalToPhysicalColorAttachmentMappingStateInherited = 1,
-};
-
-class RenderPipelineColorAttachmentDescriptor : public NS::Copying<RenderPipelineColorAttachmentDescriptor>
-{
-public:
-    static RenderPipelineColorAttachmentDescriptor* alloc();
-
-    MTL::BlendOperation                             alphaBlendOperation() const;
-
-    BlendState                                      blendingState() const;
-
-    MTL::BlendFactor                                destinationAlphaBlendFactor() const;
-
-    MTL::BlendFactor                                destinationRGBBlendFactor() const;
-
-    RenderPipelineColorAttachmentDescriptor*        init();
-
-    MTL::PixelFormat                                pixelFormat() const;
-
-    void                                            reset();
-
-    MTL::BlendOperation                             rgbBlendOperation() const;
-
-    void                                            setAlphaBlendOperation(MTL::BlendOperation alphaBlendOperation);
-
-    void                                            setBlendingState(MTL4::BlendState blendingState);
-
-    void                                            setDestinationAlphaBlendFactor(MTL::BlendFactor destinationAlphaBlendFactor);
-
-    void                                            setDestinationRGBBlendFactor(MTL::BlendFactor destinationRGBBlendFactor);
-
-    void                                            setPixelFormat(MTL::PixelFormat pixelFormat);
-
-    void                                            setRgbBlendOperation(MTL::BlendOperation rgbBlendOperation);
-
-    void                                            setSourceAlphaBlendFactor(MTL::BlendFactor sourceAlphaBlendFactor);
-
-    void                                            setSourceRGBBlendFactor(MTL::BlendFactor sourceRGBBlendFactor);
-
-    void                                            setWriteMask(MTL::ColorWriteMask writeMask);
-
-    MTL::BlendFactor                                sourceAlphaBlendFactor() const;
-
-    MTL::BlendFactor                                sourceRGBBlendFactor() const;
-
-    MTL::ColorWriteMask                             writeMask() const;
-};
-
-class RenderPipelineColorAttachmentDescriptorArray : public NS::Copying<RenderPipelineColorAttachmentDescriptorArray>
-{
-public:
-    static RenderPipelineColorAttachmentDescriptorArray* alloc();
-
-    RenderPipelineColorAttachmentDescriptorArray*        init();
-
-    RenderPipelineColorAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-
-    void                                                 reset();
-
-    void                                                 setObject(const MTL4::RenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-
-class RenderPipelineBinaryFunctionsDescriptor : public NS::Copying<RenderPipelineBinaryFunctionsDescriptor>
-{
-public:
-    static RenderPipelineBinaryFunctionsDescriptor* alloc();
-
-    NS::Array*                                      fragmentAdditionalBinaryFunctions() const;
-
-    RenderPipelineBinaryFunctionsDescriptor*        init();
-
-    NS::Array*                                      meshAdditionalBinaryFunctions() const;
-
-    NS::Array*                                      objectAdditionalBinaryFunctions() const;
-
-    void                                            reset();
-
-    void                                            setFragmentAdditionalBinaryFunctions(const NS::Array* fragmentAdditionalBinaryFunctions);
-
-    void                                            setMeshAdditionalBinaryFunctions(const NS::Array* meshAdditionalBinaryFunctions);
-
-    void                                            setObjectAdditionalBinaryFunctions(const NS::Array* objectAdditionalBinaryFunctions);
-
-    void                                            setTileAdditionalBinaryFunctions(const NS::Array* tileAdditionalBinaryFunctions);
-
-    void                                            setVertexAdditionalBinaryFunctions(const NS::Array* vertexAdditionalBinaryFunctions);
-
-    NS::Array*                                      tileAdditionalBinaryFunctions() const;
-
-    NS::Array*                                      vertexAdditionalBinaryFunctions() const;
-};
-
-class RenderPipelineDescriptor : public NS::Copying<RenderPipelineDescriptor, PipelineDescriptor>
-{
-public:
-    static RenderPipelineDescriptor*              alloc();
-
-    AlphaToCoverageState                          alphaToCoverageState() const;
-
-    AlphaToOneState                               alphaToOneState() const;
-
-    LogicalToPhysicalColorAttachmentMappingState  colorAttachmentMappingState() const;
-
-    RenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    FunctionDescriptor*                           fragmentFunctionDescriptor() const;
-
-    StaticLinkingDescriptor*                      fragmentStaticLinkingDescriptor() const;
-
-    RenderPipelineDescriptor*                     init();
-
-    MTL::PrimitiveTopologyClass                   inputPrimitiveTopology() const;
-
-    bool                                          isRasterizationEnabled() const;
-
-    NS::UInteger                                  maxVertexAmplificationCount() const;
-
-    NS::UInteger                                  rasterSampleCount() const;
-
-    [[deprecated("please use isRasterizationEnabled instead")]]
-    bool                              rasterizationEnabled() const;
-
-    void                              reset();
-
-    void                              setAlphaToCoverageState(MTL4::AlphaToCoverageState alphaToCoverageState);
-
-    void                              setAlphaToOneState(MTL4::AlphaToOneState alphaToOneState);
-
-    void                              setColorAttachmentMappingState(MTL4::LogicalToPhysicalColorAttachmentMappingState colorAttachmentMappingState);
-
-    void                              setFragmentFunctionDescriptor(const MTL4::FunctionDescriptor* fragmentFunctionDescriptor);
-
-    void                              setFragmentStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* fragmentStaticLinkingDescriptor);
-
-    void                              setInputPrimitiveTopology(MTL::PrimitiveTopologyClass inputPrimitiveTopology);
-
-    void                              setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount);
-
-    void                              setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void                              setRasterizationEnabled(bool rasterizationEnabled);
-
-    void                              setSupportFragmentBinaryLinking(bool supportFragmentBinaryLinking);
-
-    void                              setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers);
-
-    void                              setSupportVertexBinaryLinking(bool supportVertexBinaryLinking);
-
-    void                              setVertexDescriptor(const MTL::VertexDescriptor* vertexDescriptor);
-
-    void                              setVertexFunctionDescriptor(const MTL4::FunctionDescriptor* vertexFunctionDescriptor);
-
-    void                              setVertexStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* vertexStaticLinkingDescriptor);
-
-    bool                              supportFragmentBinaryLinking() const;
-
-    IndirectCommandBufferSupportState supportIndirectCommandBuffers() const;
-
-    bool                              supportVertexBinaryLinking() const;
-
-    MTL::VertexDescriptor*            vertexDescriptor() const;
-
-    FunctionDescriptor*               vertexFunctionDescriptor() const;
-
-    StaticLinkingDescriptor*          vertexStaticLinkingDescriptor() const;
-};
-
-}
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptor* MTL4::RenderPipelineColorAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPipelineColorAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTL4RenderPipelineColorAttachmentDescriptor));
-}
-
-_MTL_INLINE MTL::BlendOperation MTL4::RenderPipelineColorAttachmentDescriptor::alphaBlendOperation() const
-{
-    return Object::sendMessage<MTL::BlendOperation>(this, _MTL_PRIVATE_SEL(alphaBlendOperation));
-}
-
-_MTL_INLINE MTL4::BlendState MTL4::RenderPipelineColorAttachmentDescriptor::blendingState() const
-{
-    return Object::sendMessage<MTL4::BlendState>(this, _MTL_PRIVATE_SEL(blendingState));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL4::RenderPipelineColorAttachmentDescriptor::destinationAlphaBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(destinationAlphaBlendFactor));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL4::RenderPipelineColorAttachmentDescriptor::destinationRGBBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(destinationRGBBlendFactor));
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptor* MTL4::RenderPipelineColorAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL4::RenderPipelineColorAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::PixelFormat MTL4::RenderPipelineColorAttachmentDescriptor::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE MTL::BlendOperation MTL4::RenderPipelineColorAttachmentDescriptor::rgbBlendOperation() const
-{
-    return Object::sendMessage<MTL::BlendOperation>(this, _MTL_PRIVATE_SEL(rgbBlendOperation));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setAlphaBlendOperation(MTL::BlendOperation alphaBlendOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaBlendOperation_), alphaBlendOperation);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setBlendingState(MTL4::BlendState blendingState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBlendingState_), blendingState);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setDestinationAlphaBlendFactor(MTL::BlendFactor destinationAlphaBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDestinationAlphaBlendFactor_), destinationAlphaBlendFactor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setDestinationRGBBlendFactor(MTL::BlendFactor destinationRGBBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDestinationRGBBlendFactor_), destinationRGBBlendFactor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setRgbBlendOperation(MTL::BlendOperation rgbBlendOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRgbBlendOperation_), rgbBlendOperation);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setSourceAlphaBlendFactor(MTL::BlendFactor sourceAlphaBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSourceAlphaBlendFactor_), sourceAlphaBlendFactor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setSourceRGBBlendFactor(MTL::BlendFactor sourceRGBBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSourceRGBBlendFactor_), sourceRGBBlendFactor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptor::setWriteMask(MTL::ColorWriteMask writeMask)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setWriteMask_), writeMask);
-}
-
-_MTL_INLINE MTL::BlendFactor MTL4::RenderPipelineColorAttachmentDescriptor::sourceAlphaBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(sourceAlphaBlendFactor));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL4::RenderPipelineColorAttachmentDescriptor::sourceRGBBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(sourceRGBBlendFactor));
-}
-
-_MTL_INLINE MTL::ColorWriteMask MTL4::RenderPipelineColorAttachmentDescriptor::writeMask() const
-{
-    return Object::sendMessage<MTL::ColorWriteMask>(this, _MTL_PRIVATE_SEL(writeMask));
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptorArray* MTL4::RenderPipelineColorAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPipelineColorAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTL4RenderPipelineColorAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptorArray* MTL4::RenderPipelineColorAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL4::RenderPipelineColorAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptor* MTL4::RenderPipelineColorAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL4::RenderPipelineColorAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptorArray::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineColorAttachmentDescriptorArray::setObject(const MTL4::RenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL4::RenderPipelineBinaryFunctionsDescriptor* MTL4::RenderPipelineBinaryFunctionsDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPipelineBinaryFunctionsDescriptor>(_MTL_PRIVATE_CLS(MTL4RenderPipelineBinaryFunctionsDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL4::RenderPipelineBinaryFunctionsDescriptor::fragmentAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(fragmentAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE MTL4::RenderPipelineBinaryFunctionsDescriptor* MTL4::RenderPipelineBinaryFunctionsDescriptor::init()
-{
-    return NS::Object::init<MTL4::RenderPipelineBinaryFunctionsDescriptor>();
-}
-
-_MTL_INLINE NS::Array* MTL4::RenderPipelineBinaryFunctionsDescriptor::meshAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(meshAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL4::RenderPipelineBinaryFunctionsDescriptor::objectAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(objectAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::setFragmentAdditionalBinaryFunctions(const NS::Array* fragmentAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentAdditionalBinaryFunctions_), fragmentAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::setMeshAdditionalBinaryFunctions(const NS::Array* meshAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshAdditionalBinaryFunctions_), meshAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::setObjectAdditionalBinaryFunctions(const NS::Array* objectAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectAdditionalBinaryFunctions_), objectAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::setTileAdditionalBinaryFunctions(const NS::Array* tileAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileAdditionalBinaryFunctions_), tileAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineBinaryFunctionsDescriptor::setVertexAdditionalBinaryFunctions(const NS::Array* vertexAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexAdditionalBinaryFunctions_), vertexAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE NS::Array* MTL4::RenderPipelineBinaryFunctionsDescriptor::tileAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(tileAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL4::RenderPipelineBinaryFunctionsDescriptor::vertexAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE MTL4::RenderPipelineDescriptor* MTL4::RenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::RenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4RenderPipelineDescriptor));
-}
-
-_MTL_INLINE MTL4::AlphaToCoverageState MTL4::RenderPipelineDescriptor::alphaToCoverageState() const
-{
-    return Object::sendMessage<MTL4::AlphaToCoverageState>(this, _MTL_PRIVATE_SEL(alphaToCoverageState));
-}
-
-_MTL_INLINE MTL4::AlphaToOneState MTL4::RenderPipelineDescriptor::alphaToOneState() const
-{
-    return Object::sendMessage<MTL4::AlphaToOneState>(this, _MTL_PRIVATE_SEL(alphaToOneState));
-}
-
-_MTL_INLINE MTL4::LogicalToPhysicalColorAttachmentMappingState MTL4::RenderPipelineDescriptor::colorAttachmentMappingState() const
-{
-    return Object::sendMessage<MTL4::LogicalToPhysicalColorAttachmentMappingState>(this, _MTL_PRIVATE_SEL(colorAttachmentMappingState));
-}
-
-_MTL_INLINE MTL4::RenderPipelineColorAttachmentDescriptorArray* MTL4::RenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL4::RenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::RenderPipelineDescriptor::fragmentFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(fragmentFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::RenderPipelineDescriptor::fragmentStaticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(fragmentStaticLinkingDescriptor));
-}
-
-_MTL_INLINE MTL4::RenderPipelineDescriptor* MTL4::RenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::RenderPipelineDescriptor>();
-}
-
-_MTL_INLINE MTL::PrimitiveTopologyClass MTL4::RenderPipelineDescriptor::inputPrimitiveTopology() const
-{
-    return Object::sendMessage<MTL::PrimitiveTopologyClass>(this, _MTL_PRIVATE_SEL(inputPrimitiveTopology));
-}
-
-_MTL_INLINE bool MTL4::RenderPipelineDescriptor::isRasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPipelineDescriptor::maxVertexAmplificationCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexAmplificationCount));
-}
-
-_MTL_INLINE NS::UInteger MTL4::RenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE bool MTL4::RenderPipelineDescriptor::rasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setAlphaToCoverageState(MTL4::AlphaToCoverageState alphaToCoverageState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToCoverageState_), alphaToCoverageState);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setAlphaToOneState(MTL4::AlphaToOneState alphaToOneState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToOneState_), alphaToOneState);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setColorAttachmentMappingState(MTL4::LogicalToPhysicalColorAttachmentMappingState colorAttachmentMappingState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorAttachmentMappingState_), colorAttachmentMappingState);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setFragmentFunctionDescriptor(const MTL4::FunctionDescriptor* fragmentFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentFunctionDescriptor_), fragmentFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setFragmentStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* fragmentStaticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentStaticLinkingDescriptor_), fragmentStaticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setInputPrimitiveTopology(MTL::PrimitiveTopologyClass inputPrimitiveTopology)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInputPrimitiveTopology_), inputPrimitiveTopology);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexAmplificationCount_), maxVertexAmplificationCount);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setRasterizationEnabled(bool rasterizationEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationEnabled_), rasterizationEnabled);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setSupportFragmentBinaryLinking(bool supportFragmentBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportFragmentBinaryLinking_), supportFragmentBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setSupportIndirectCommandBuffers(MTL4::IndirectCommandBufferSupportState supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setSupportVertexBinaryLinking(bool supportVertexBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportVertexBinaryLinking_), supportVertexBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setVertexDescriptor(const MTL::VertexDescriptor* vertexDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexDescriptor_), vertexDescriptor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setVertexFunctionDescriptor(const MTL4::FunctionDescriptor* vertexFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFunctionDescriptor_), vertexFunctionDescriptor);
-}
-
-_MTL_INLINE void MTL4::RenderPipelineDescriptor::setVertexStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* vertexStaticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexStaticLinkingDescriptor_), vertexStaticLinkingDescriptor);
-}
-
-_MTL_INLINE bool MTL4::RenderPipelineDescriptor::supportFragmentBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportFragmentBinaryLinking));
-}
-
-_MTL_INLINE MTL4::IndirectCommandBufferSupportState MTL4::RenderPipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessage<MTL4::IndirectCommandBufferSupportState>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE bool MTL4::RenderPipelineDescriptor::supportVertexBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportVertexBinaryLinking));
-}
-
-_MTL_INLINE MTL::VertexDescriptor* MTL4::RenderPipelineDescriptor::vertexDescriptor() const
-{
-    return Object::sendMessage<MTL::VertexDescriptor*>(this, _MTL_PRIVATE_SEL(vertexDescriptor));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::RenderPipelineDescriptor::vertexFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(vertexFunctionDescriptor));
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::RenderPipelineDescriptor::vertexStaticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(vertexStaticLinkingDescriptor));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4SpecializedFunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4SpecializedFunctionDescriptor.hpp
deleted file mode 100644
index 57c0094d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4SpecializedFunctionDescriptor.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4SpecializedFunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4FunctionDescriptor.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-class SpecializedFunctionDescriptor;
-}
-
-namespace MTL
-{
-class FunctionConstantValues;
-}
-
-namespace MTL4
-{
-class SpecializedFunctionDescriptor : public NS::Copying<SpecializedFunctionDescriptor, FunctionDescriptor>
-{
-public:
-    static SpecializedFunctionDescriptor* alloc();
-
-    MTL::FunctionConstantValues*          constantValues() const;
-
-    FunctionDescriptor*                   functionDescriptor() const;
-
-    SpecializedFunctionDescriptor*        init();
-
-    void                                  setConstantValues(const MTL::FunctionConstantValues* constantValues);
-
-    void                                  setFunctionDescriptor(const MTL4::FunctionDescriptor* functionDescriptor);
-
-    void                                  setSpecializedName(const NS::String* specializedName);
-    NS::String*                           specializedName() const;
-};
-
-}
-_MTL_INLINE MTL4::SpecializedFunctionDescriptor* MTL4::SpecializedFunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::SpecializedFunctionDescriptor>(_MTL_PRIVATE_CLS(MTL4SpecializedFunctionDescriptor));
-}
-
-_MTL_INLINE MTL::FunctionConstantValues* MTL4::SpecializedFunctionDescriptor::constantValues() const
-{
-    return Object::sendMessage<MTL::FunctionConstantValues*>(this, _MTL_PRIVATE_SEL(constantValues));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::SpecializedFunctionDescriptor::functionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(functionDescriptor));
-}
-
-_MTL_INLINE MTL4::SpecializedFunctionDescriptor* MTL4::SpecializedFunctionDescriptor::init()
-{
-    return NS::Object::init<MTL4::SpecializedFunctionDescriptor>();
-}
-
-_MTL_INLINE void MTL4::SpecializedFunctionDescriptor::setConstantValues(const MTL::FunctionConstantValues* constantValues)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantValues_), constantValues);
-}
-
-_MTL_INLINE void MTL4::SpecializedFunctionDescriptor::setFunctionDescriptor(const MTL4::FunctionDescriptor* functionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionDescriptor_), functionDescriptor);
-}
-
-_MTL_INLINE void MTL4::SpecializedFunctionDescriptor::setSpecializedName(const NS::String* specializedName)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSpecializedName_), specializedName);
-}
-
-_MTL_INLINE NS::String* MTL4::SpecializedFunctionDescriptor::specializedName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(specializedName));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4StitchedFunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4StitchedFunctionDescriptor.hpp
deleted file mode 100644
index ca8ea5cf..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4StitchedFunctionDescriptor.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4StitchedFunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4FunctionDescriptor.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL4
-{
-class StitchedFunctionDescriptor;
-}
-
-namespace MTL
-{
-class FunctionStitchingGraph;
-}
-
-namespace MTL4
-{
-class StitchedFunctionDescriptor : public NS::Copying<StitchedFunctionDescriptor, FunctionDescriptor>
-{
-public:
-    static StitchedFunctionDescriptor* alloc();
-
-    NS::Array*                         functionDescriptors() const;
-
-    MTL::FunctionStitchingGraph*       functionGraph() const;
-
-    StitchedFunctionDescriptor*        init();
-
-    void                               setFunctionDescriptors(const NS::Array* functionDescriptors);
-
-    void                               setFunctionGraph(const MTL::FunctionStitchingGraph* functionGraph);
-};
-
-}
-_MTL_INLINE MTL4::StitchedFunctionDescriptor* MTL4::StitchedFunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::StitchedFunctionDescriptor>(_MTL_PRIVATE_CLS(MTL4StitchedFunctionDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL4::StitchedFunctionDescriptor::functionDescriptors() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functionDescriptors));
-}
-
-_MTL_INLINE MTL::FunctionStitchingGraph* MTL4::StitchedFunctionDescriptor::functionGraph() const
-{
-    return Object::sendMessage<MTL::FunctionStitchingGraph*>(this, _MTL_PRIVATE_SEL(functionGraph));
-}
-
-_MTL_INLINE MTL4::StitchedFunctionDescriptor* MTL4::StitchedFunctionDescriptor::init()
-{
-    return NS::Object::init<MTL4::StitchedFunctionDescriptor>();
-}
-
-_MTL_INLINE void MTL4::StitchedFunctionDescriptor::setFunctionDescriptors(const NS::Array* functionDescriptors)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionDescriptors_), functionDescriptors);
-}
-
-_MTL_INLINE void MTL4::StitchedFunctionDescriptor::setFunctionGraph(const MTL::FunctionStitchingGraph* functionGraph)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionGraph_), functionGraph);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTL4TileRenderPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTL4TileRenderPipeline.hpp
deleted file mode 100644
index dc74f484..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTL4TileRenderPipeline.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTL4TileRenderPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL4
-{
-class FunctionDescriptor;
-class StaticLinkingDescriptor;
-class TileRenderPipelineDescriptor;
-}
-
-namespace MTL
-{
-class TileRenderPipelineColorAttachmentDescriptorArray;
-}
-
-namespace MTL4
-{
-class TileRenderPipelineDescriptor : public NS::Copying<TileRenderPipelineDescriptor, PipelineDescriptor>
-{
-public:
-    static TileRenderPipelineDescriptor*                   alloc();
-
-    MTL::TileRenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    TileRenderPipelineDescriptor*                          init();
-
-    NS::UInteger                                           maxTotalThreadsPerThreadgroup() const;
-
-    NS::UInteger                                           rasterSampleCount() const;
-
-    MTL::Size                                              requiredThreadsPerThreadgroup() const;
-
-    void                                                   reset();
-
-    void                                                   setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup);
-
-    void                                                   setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void                                                   setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup);
-
-    void                                                   setStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* staticLinkingDescriptor);
-
-    void                                                   setSupportBinaryLinking(bool supportBinaryLinking);
-
-    void                                                   setThreadgroupSizeMatchesTileSize(bool threadgroupSizeMatchesTileSize);
-
-    void                                                   setTileFunctionDescriptor(const MTL4::FunctionDescriptor* tileFunctionDescriptor);
-
-    StaticLinkingDescriptor*                               staticLinkingDescriptor() const;
-
-    bool                                                   supportBinaryLinking() const;
-
-    bool                                                   threadgroupSizeMatchesTileSize() const;
-
-    FunctionDescriptor*                                    tileFunctionDescriptor() const;
-};
-
-}
-_MTL_INLINE MTL4::TileRenderPipelineDescriptor* MTL4::TileRenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL4::TileRenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTL4TileRenderPipelineDescriptor));
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptorArray* MTL4::TileRenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::TileRenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL4::TileRenderPipelineDescriptor* MTL4::TileRenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL4::TileRenderPipelineDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL4::TileRenderPipelineDescriptor::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL4::TileRenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE MTL::Size MTL4::TileRenderPipelineDescriptor::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerThreadgroup_), maxTotalThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerThreadgroup_), requiredThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setStaticLinkingDescriptor(const MTL4::StaticLinkingDescriptor* staticLinkingDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStaticLinkingDescriptor_), staticLinkingDescriptor);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setSupportBinaryLinking(bool supportBinaryLinking)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportBinaryLinking_), supportBinaryLinking);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setThreadgroupSizeMatchesTileSize(bool threadgroupSizeMatchesTileSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupSizeMatchesTileSize_), threadgroupSizeMatchesTileSize);
-}
-
-_MTL_INLINE void MTL4::TileRenderPipelineDescriptor::setTileFunctionDescriptor(const MTL4::FunctionDescriptor* tileFunctionDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileFunctionDescriptor_), tileFunctionDescriptor);
-}
-
-_MTL_INLINE MTL4::StaticLinkingDescriptor* MTL4::TileRenderPipelineDescriptor::staticLinkingDescriptor() const
-{
-    return Object::sendMessage<MTL4::StaticLinkingDescriptor*>(this, _MTL_PRIVATE_SEL(staticLinkingDescriptor));
-}
-
-_MTL_INLINE bool MTL4::TileRenderPipelineDescriptor::supportBinaryLinking() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportBinaryLinking));
-}
-
-_MTL_INLINE bool MTL4::TileRenderPipelineDescriptor::threadgroupSizeMatchesTileSize() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(threadgroupSizeMatchesTileSize));
-}
-
-_MTL_INLINE MTL4::FunctionDescriptor* MTL4::TileRenderPipelineDescriptor::tileFunctionDescriptor() const
-{
-    return Object::sendMessage<MTL4::FunctionDescriptor*>(this, _MTL_PRIVATE_SEL(tileFunctionDescriptor));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructure.hpp b/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructure.hpp
deleted file mode 100644
index d3457c39..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructure.hpp
+++ /dev/null
@@ -1,1887 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLAccelerationStructure.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAccelerationStructureTypes.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLStageInputOutputDescriptor.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class AccelerationStructureBoundingBoxGeometryDescriptor;
-class AccelerationStructureCurveGeometryDescriptor;
-class AccelerationStructureDescriptor;
-class AccelerationStructureGeometryDescriptor;
-class AccelerationStructureMotionBoundingBoxGeometryDescriptor;
-class AccelerationStructureMotionCurveGeometryDescriptor;
-class AccelerationStructureMotionTriangleGeometryDescriptor;
-class AccelerationStructureTriangleGeometryDescriptor;
-class Buffer;
-class IndirectInstanceAccelerationStructureDescriptor;
-class InstanceAccelerationStructureDescriptor;
-class MotionKeyframeData;
-class PrimitiveAccelerationStructureDescriptor;
-}
-
-namespace MTL
-{
-_MTL_ENUM(NS::Integer, MatrixLayout) {
-    MatrixLayoutColumnMajor = 0,
-    MatrixLayoutRowMajor = 1,
-};
-
-_MTL_ENUM(uint32_t, MotionBorderMode) {
-    MotionBorderModeClamp = 0,
-    MotionBorderModeVanish = 1,
-};
-
-_MTL_ENUM(NS::Integer, CurveType) {
-    CurveTypeRound = 0,
-    CurveTypeFlat = 1,
-};
-
-_MTL_ENUM(NS::Integer, CurveBasis) {
-    CurveBasisBSpline = 0,
-    CurveBasisCatmullRom = 1,
-    CurveBasisLinear = 2,
-    CurveBasisBezier = 3,
-};
-
-_MTL_ENUM(NS::Integer, CurveEndCaps) {
-    CurveEndCapsNone = 0,
-    CurveEndCapsDisk = 1,
-    CurveEndCapsSphere = 2,
-};
-
-_MTL_ENUM(NS::UInteger, AccelerationStructureInstanceDescriptorType) {
-    AccelerationStructureInstanceDescriptorTypeDefault = 0,
-    AccelerationStructureInstanceDescriptorTypeUserID = 1,
-    AccelerationStructureInstanceDescriptorTypeMotion = 2,
-    AccelerationStructureInstanceDescriptorTypeIndirect = 3,
-    AccelerationStructureInstanceDescriptorTypeIndirectMotion = 4,
-};
-
-_MTL_ENUM(NS::Integer, TransformType) {
-    TransformTypePackedFloat4x3 = 0,
-    TransformTypeComponent = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, AccelerationStructureRefitOptions) {
-    AccelerationStructureRefitOptionVertexData = 1,
-    AccelerationStructureRefitOptionPerPrimitiveData = 1 << 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, AccelerationStructureUsage) {
-    AccelerationStructureUsageNone = 0,
-    AccelerationStructureUsageRefit = 1,
-    AccelerationStructureUsagePreferFastBuild = 1 << 1,
-    AccelerationStructureUsageExtendedLimits = 1 << 2,
-    AccelerationStructureUsagePreferFastIntersection = 1 << 4,
-    AccelerationStructureUsageMinimizeMemory = 1 << 5,
-};
-
-_MTL_OPTIONS(uint32_t, AccelerationStructureInstanceOptions) {
-    AccelerationStructureInstanceOptionNone = 0,
-    AccelerationStructureInstanceOptionDisableTriangleCulling = 1,
-    AccelerationStructureInstanceOptionTriangleFrontFacingWindingCounterClockwise = 1 << 1,
-    AccelerationStructureInstanceOptionOpaque = 1 << 2,
-    AccelerationStructureInstanceOptionNonOpaque = 1 << 3,
-};
-
-struct AccelerationStructureInstanceDescriptor
-{
-    MTL::PackedFloat4x3                       transformationMatrix;
-    MTL::AccelerationStructureInstanceOptions options;
-    uint32_t                                  mask;
-    uint32_t                                  intersectionFunctionTableOffset;
-    uint32_t                                  accelerationStructureIndex;
-} _MTL_PACKED;
-
-struct AccelerationStructureUserIDInstanceDescriptor
-{
-    MTL::PackedFloat4x3                       transformationMatrix;
-    MTL::AccelerationStructureInstanceOptions options;
-    uint32_t                                  mask;
-    uint32_t                                  intersectionFunctionTableOffset;
-    uint32_t                                  accelerationStructureIndex;
-    uint32_t                                  userID;
-} _MTL_PACKED;
-
-struct AccelerationStructureMotionInstanceDescriptor
-{
-    MTL::AccelerationStructureInstanceOptions options;
-    uint32_t                                  mask;
-    uint32_t                                  intersectionFunctionTableOffset;
-    uint32_t                                  accelerationStructureIndex;
-    uint32_t                                  userID;
-    uint32_t                                  motionTransformsStartIndex;
-    uint32_t                                  motionTransformsCount;
-    MTL::MotionBorderMode                     motionStartBorderMode;
-    MTL::MotionBorderMode                     motionEndBorderMode;
-    float                                     motionStartTime;
-    float                                     motionEndTime;
-} _MTL_PACKED;
-
-struct IndirectAccelerationStructureInstanceDescriptor
-{
-    MTL::PackedFloat4x3                       transformationMatrix;
-    MTL::AccelerationStructureInstanceOptions options;
-    uint32_t                                  mask;
-    uint32_t                                  intersectionFunctionTableOffset;
-    uint32_t                                  userID;
-    MTL::ResourceID                           accelerationStructureID;
-} _MTL_PACKED;
-
-struct IndirectAccelerationStructureMotionInstanceDescriptor
-{
-    MTL::AccelerationStructureInstanceOptions options;
-    uint32_t                                  mask;
-    uint32_t                                  intersectionFunctionTableOffset;
-    uint32_t                                  userID;
-    MTL::ResourceID                           accelerationStructureID;
-    uint32_t                                  motionTransformsStartIndex;
-    uint32_t                                  motionTransformsCount;
-    MTL::MotionBorderMode                     motionStartBorderMode;
-    MTL::MotionBorderMode                     motionEndBorderMode;
-    float                                     motionStartTime;
-    float                                     motionEndTime;
-} _MTL_PACKED;
-
-class AccelerationStructureDescriptor : public NS::Copying<AccelerationStructureDescriptor>
-{
-public:
-    static AccelerationStructureDescriptor* alloc();
-
-    AccelerationStructureDescriptor*        init();
-
-    void                                    setUsage(MTL::AccelerationStructureUsage usage);
-    AccelerationStructureUsage              usage() const;
-};
-class AccelerationStructureGeometryDescriptor : public NS::Copying<AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureGeometryDescriptor* alloc();
-
-    bool                                            allowDuplicateIntersectionFunctionInvocation() const;
-
-    AccelerationStructureGeometryDescriptor*        init();
-
-    NS::UInteger                                    intersectionFunctionTableOffset() const;
-
-    NS::String*                                     label() const;
-
-    bool                                            opaque() const;
-
-    Buffer*                                         primitiveDataBuffer() const;
-    NS::UInteger                                    primitiveDataBufferOffset() const;
-
-    NS::UInteger                                    primitiveDataElementSize() const;
-
-    NS::UInteger                                    primitiveDataStride() const;
-
-    void                                            setAllowDuplicateIntersectionFunctionInvocation(bool allowDuplicateIntersectionFunctionInvocation);
-
-    void                                            setIntersectionFunctionTableOffset(NS::UInteger intersectionFunctionTableOffset);
-
-    void                                            setLabel(const NS::String* label);
-
-    void                                            setOpaque(bool opaque);
-
-    void                                            setPrimitiveDataBuffer(const MTL::Buffer* primitiveDataBuffer);
-    void                                            setPrimitiveDataBufferOffset(NS::UInteger primitiveDataBufferOffset);
-
-    void                                            setPrimitiveDataElementSize(NS::UInteger primitiveDataElementSize);
-
-    void                                            setPrimitiveDataStride(NS::UInteger primitiveDataStride);
-};
-class PrimitiveAccelerationStructureDescriptor : public NS::Copying<PrimitiveAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static PrimitiveAccelerationStructureDescriptor* alloc();
-
-    static PrimitiveAccelerationStructureDescriptor* descriptor();
-    NS::Array*                                       geometryDescriptors() const;
-
-    PrimitiveAccelerationStructureDescriptor*        init();
-
-    MotionBorderMode                                 motionEndBorderMode() const;
-
-    float                                            motionEndTime() const;
-
-    NS::UInteger                                     motionKeyframeCount() const;
-
-    MotionBorderMode                                 motionStartBorderMode() const;
-
-    float                                            motionStartTime() const;
-
-    void                                             setGeometryDescriptors(const NS::Array* geometryDescriptors);
-
-    void                                             setMotionEndBorderMode(MTL::MotionBorderMode motionEndBorderMode);
-
-    void                                             setMotionEndTime(float motionEndTime);
-
-    void                                             setMotionKeyframeCount(NS::UInteger motionKeyframeCount);
-
-    void                                             setMotionStartBorderMode(MTL::MotionBorderMode motionStartBorderMode);
-
-    void                                             setMotionStartTime(float motionStartTime);
-};
-class AccelerationStructureTriangleGeometryDescriptor : public NS::Copying<AccelerationStructureTriangleGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureTriangleGeometryDescriptor* alloc();
-
-    static AccelerationStructureTriangleGeometryDescriptor* descriptor();
-
-    Buffer*                                                 indexBuffer() const;
-    NS::UInteger                                            indexBufferOffset() const;
-
-    IndexType                                               indexType() const;
-
-    AccelerationStructureTriangleGeometryDescriptor*        init();
-
-    void                                                    setIndexBuffer(const MTL::Buffer* indexBuffer);
-    void                                                    setIndexBufferOffset(NS::UInteger indexBufferOffset);
-
-    void                                                    setIndexType(MTL::IndexType indexType);
-
-    void                                                    setTransformationMatrixBuffer(const MTL::Buffer* transformationMatrixBuffer);
-    void                                                    setTransformationMatrixBufferOffset(NS::UInteger transformationMatrixBufferOffset);
-
-    void                                                    setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout);
-
-    void                                                    setTriangleCount(NS::UInteger triangleCount);
-
-    void                                                    setVertexBuffer(const MTL::Buffer* vertexBuffer);
-    void                                                    setVertexBufferOffset(NS::UInteger vertexBufferOffset);
-
-    void                                                    setVertexFormat(MTL::AttributeFormat vertexFormat);
-
-    void                                                    setVertexStride(NS::UInteger vertexStride);
-
-    Buffer*                                                 transformationMatrixBuffer() const;
-    NS::UInteger                                            transformationMatrixBufferOffset() const;
-
-    MatrixLayout                                            transformationMatrixLayout() const;
-
-    NS::UInteger                                            triangleCount() const;
-
-    Buffer*                                                 vertexBuffer() const;
-    NS::UInteger                                            vertexBufferOffset() const;
-
-    AttributeFormat                                         vertexFormat() const;
-
-    NS::UInteger                                            vertexStride() const;
-};
-class AccelerationStructureBoundingBoxGeometryDescriptor : public NS::Copying<AccelerationStructureBoundingBoxGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureBoundingBoxGeometryDescriptor* alloc();
-
-    Buffer*                                                    boundingBoxBuffer() const;
-    NS::UInteger                                               boundingBoxBufferOffset() const;
-
-    NS::UInteger                                               boundingBoxCount() const;
-
-    NS::UInteger                                               boundingBoxStride() const;
-
-    static AccelerationStructureBoundingBoxGeometryDescriptor* descriptor();
-
-    AccelerationStructureBoundingBoxGeometryDescriptor*        init();
-
-    void                                                       setBoundingBoxBuffer(const MTL::Buffer* boundingBoxBuffer);
-    void                                                       setBoundingBoxBufferOffset(NS::UInteger boundingBoxBufferOffset);
-
-    void                                                       setBoundingBoxCount(NS::UInteger boundingBoxCount);
-
-    void                                                       setBoundingBoxStride(NS::UInteger boundingBoxStride);
-};
-class MotionKeyframeData : public NS::Referencing<MotionKeyframeData>
-{
-public:
-    static MotionKeyframeData* alloc();
-
-    Buffer*                    buffer() const;
-
-    static MotionKeyframeData* data();
-
-    MotionKeyframeData*        init();
-
-    NS::UInteger               offset() const;
-
-    void                       setBuffer(const MTL::Buffer* buffer);
-
-    void                       setOffset(NS::UInteger offset);
-};
-class AccelerationStructureMotionTriangleGeometryDescriptor : public NS::Copying<AccelerationStructureMotionTriangleGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionTriangleGeometryDescriptor* alloc();
-
-    static AccelerationStructureMotionTriangleGeometryDescriptor* descriptor();
-
-    Buffer*                                                       indexBuffer() const;
-    NS::UInteger                                                  indexBufferOffset() const;
-
-    IndexType                                                     indexType() const;
-
-    AccelerationStructureMotionTriangleGeometryDescriptor*        init();
-
-    void                                                          setIndexBuffer(const MTL::Buffer* indexBuffer);
-    void                                                          setIndexBufferOffset(NS::UInteger indexBufferOffset);
-
-    void                                                          setIndexType(MTL::IndexType indexType);
-
-    void                                                          setTransformationMatrixBuffer(const MTL::Buffer* transformationMatrixBuffer);
-    void                                                          setTransformationMatrixBufferOffset(NS::UInteger transformationMatrixBufferOffset);
-
-    void                                                          setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout);
-
-    void                                                          setTriangleCount(NS::UInteger triangleCount);
-
-    void                                                          setVertexBuffers(const NS::Array* vertexBuffers);
-
-    void                                                          setVertexFormat(MTL::AttributeFormat vertexFormat);
-
-    void                                                          setVertexStride(NS::UInteger vertexStride);
-
-    Buffer*                                                       transformationMatrixBuffer() const;
-    NS::UInteger                                                  transformationMatrixBufferOffset() const;
-
-    MatrixLayout                                                  transformationMatrixLayout() const;
-
-    NS::UInteger                                                  triangleCount() const;
-
-    NS::Array*                                                    vertexBuffers() const;
-
-    AttributeFormat                                               vertexFormat() const;
-
-    NS::UInteger                                                  vertexStride() const;
-};
-class AccelerationStructureMotionBoundingBoxGeometryDescriptor : public NS::Copying<AccelerationStructureMotionBoundingBoxGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionBoundingBoxGeometryDescriptor* alloc();
-
-    NS::Array*                                                       boundingBoxBuffers() const;
-
-    NS::UInteger                                                     boundingBoxCount() const;
-
-    NS::UInteger                                                     boundingBoxStride() const;
-
-    static AccelerationStructureMotionBoundingBoxGeometryDescriptor* descriptor();
-
-    AccelerationStructureMotionBoundingBoxGeometryDescriptor*        init();
-
-    void                                                             setBoundingBoxBuffers(const NS::Array* boundingBoxBuffers);
-
-    void                                                             setBoundingBoxCount(NS::UInteger boundingBoxCount);
-
-    void                                                             setBoundingBoxStride(NS::UInteger boundingBoxStride);
-};
-class AccelerationStructureCurveGeometryDescriptor : public NS::Copying<AccelerationStructureCurveGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureCurveGeometryDescriptor* alloc();
-
-    Buffer*                                              controlPointBuffer() const;
-    NS::UInteger                                         controlPointBufferOffset() const;
-
-    NS::UInteger                                         controlPointCount() const;
-
-    AttributeFormat                                      controlPointFormat() const;
-
-    NS::UInteger                                         controlPointStride() const;
-
-    CurveBasis                                           curveBasis() const;
-
-    CurveEndCaps                                         curveEndCaps() const;
-
-    CurveType                                            curveType() const;
-
-    static AccelerationStructureCurveGeometryDescriptor* descriptor();
-
-    Buffer*                                              indexBuffer() const;
-    NS::UInteger                                         indexBufferOffset() const;
-
-    IndexType                                            indexType() const;
-
-    AccelerationStructureCurveGeometryDescriptor*        init();
-
-    Buffer*                                              radiusBuffer() const;
-    NS::UInteger                                         radiusBufferOffset() const;
-
-    AttributeFormat                                      radiusFormat() const;
-
-    NS::UInteger                                         radiusStride() const;
-
-    NS::UInteger                                         segmentControlPointCount() const;
-
-    NS::UInteger                                         segmentCount() const;
-
-    void                                                 setControlPointBuffer(const MTL::Buffer* controlPointBuffer);
-    void                                                 setControlPointBufferOffset(NS::UInteger controlPointBufferOffset);
-
-    void                                                 setControlPointCount(NS::UInteger controlPointCount);
-
-    void                                                 setControlPointFormat(MTL::AttributeFormat controlPointFormat);
-
-    void                                                 setControlPointStride(NS::UInteger controlPointStride);
-
-    void                                                 setCurveBasis(MTL::CurveBasis curveBasis);
-
-    void                                                 setCurveEndCaps(MTL::CurveEndCaps curveEndCaps);
-
-    void                                                 setCurveType(MTL::CurveType curveType);
-
-    void                                                 setIndexBuffer(const MTL::Buffer* indexBuffer);
-    void                                                 setIndexBufferOffset(NS::UInteger indexBufferOffset);
-
-    void                                                 setIndexType(MTL::IndexType indexType);
-
-    void                                                 setRadiusBuffer(const MTL::Buffer* radiusBuffer);
-    void                                                 setRadiusBufferOffset(NS::UInteger radiusBufferOffset);
-
-    void                                                 setRadiusFormat(MTL::AttributeFormat radiusFormat);
-
-    void                                                 setRadiusStride(NS::UInteger radiusStride);
-
-    void                                                 setSegmentControlPointCount(NS::UInteger segmentControlPointCount);
-
-    void                                                 setSegmentCount(NS::UInteger segmentCount);
-};
-class AccelerationStructureMotionCurveGeometryDescriptor : public NS::Copying<AccelerationStructureMotionCurveGeometryDescriptor, AccelerationStructureGeometryDescriptor>
-{
-public:
-    static AccelerationStructureMotionCurveGeometryDescriptor* alloc();
-
-    NS::Array*                                                 controlPointBuffers() const;
-
-    NS::UInteger                                               controlPointCount() const;
-
-    AttributeFormat                                            controlPointFormat() const;
-
-    NS::UInteger                                               controlPointStride() const;
-
-    CurveBasis                                                 curveBasis() const;
-
-    CurveEndCaps                                               curveEndCaps() const;
-
-    CurveType                                                  curveType() const;
-
-    static AccelerationStructureMotionCurveGeometryDescriptor* descriptor();
-
-    Buffer*                                                    indexBuffer() const;
-    NS::UInteger                                               indexBufferOffset() const;
-
-    IndexType                                                  indexType() const;
-
-    AccelerationStructureMotionCurveGeometryDescriptor*        init();
-
-    NS::Array*                                                 radiusBuffers() const;
-
-    AttributeFormat                                            radiusFormat() const;
-
-    NS::UInteger                                               radiusStride() const;
-
-    NS::UInteger                                               segmentControlPointCount() const;
-
-    NS::UInteger                                               segmentCount() const;
-
-    void                                                       setControlPointBuffers(const NS::Array* controlPointBuffers);
-
-    void                                                       setControlPointCount(NS::UInteger controlPointCount);
-
-    void                                                       setControlPointFormat(MTL::AttributeFormat controlPointFormat);
-
-    void                                                       setControlPointStride(NS::UInteger controlPointStride);
-
-    void                                                       setCurveBasis(MTL::CurveBasis curveBasis);
-
-    void                                                       setCurveEndCaps(MTL::CurveEndCaps curveEndCaps);
-
-    void                                                       setCurveType(MTL::CurveType curveType);
-
-    void                                                       setIndexBuffer(const MTL::Buffer* indexBuffer);
-    void                                                       setIndexBufferOffset(NS::UInteger indexBufferOffset);
-
-    void                                                       setIndexType(MTL::IndexType indexType);
-
-    void                                                       setRadiusBuffers(const NS::Array* radiusBuffers);
-
-    void                                                       setRadiusFormat(MTL::AttributeFormat radiusFormat);
-
-    void                                                       setRadiusStride(NS::UInteger radiusStride);
-
-    void                                                       setSegmentControlPointCount(NS::UInteger segmentControlPointCount);
-
-    void                                                       setSegmentCount(NS::UInteger segmentCount);
-};
-class InstanceAccelerationStructureDescriptor : public NS::Copying<InstanceAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static InstanceAccelerationStructureDescriptor* alloc();
-
-    static InstanceAccelerationStructureDescriptor* descriptor();
-
-    InstanceAccelerationStructureDescriptor*        init();
-
-    NS::UInteger                                    instanceCount() const;
-
-    Buffer*                                         instanceDescriptorBuffer() const;
-    NS::UInteger                                    instanceDescriptorBufferOffset() const;
-
-    NS::UInteger                                    instanceDescriptorStride() const;
-
-    AccelerationStructureInstanceDescriptorType     instanceDescriptorType() const;
-
-    MatrixLayout                                    instanceTransformationMatrixLayout() const;
-
-    NS::Array*                                      instancedAccelerationStructures() const;
-
-    Buffer*                                         motionTransformBuffer() const;
-    NS::UInteger                                    motionTransformBufferOffset() const;
-
-    NS::UInteger                                    motionTransformCount() const;
-
-    NS::UInteger                                    motionTransformStride() const;
-
-    TransformType                                   motionTransformType() const;
-
-    void                                            setInstanceCount(NS::UInteger instanceCount);
-
-    void                                            setInstanceDescriptorBuffer(const MTL::Buffer* instanceDescriptorBuffer);
-    void                                            setInstanceDescriptorBufferOffset(NS::UInteger instanceDescriptorBufferOffset);
-
-    void                                            setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride);
-
-    void                                            setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType);
-
-    void                                            setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout);
-
-    void                                            setInstancedAccelerationStructures(const NS::Array* instancedAccelerationStructures);
-
-    void                                            setMotionTransformBuffer(const MTL::Buffer* motionTransformBuffer);
-    void                                            setMotionTransformBufferOffset(NS::UInteger motionTransformBufferOffset);
-
-    void                                            setMotionTransformCount(NS::UInteger motionTransformCount);
-
-    void                                            setMotionTransformStride(NS::UInteger motionTransformStride);
-
-    void                                            setMotionTransformType(MTL::TransformType motionTransformType);
-};
-class IndirectInstanceAccelerationStructureDescriptor : public NS::Copying<IndirectInstanceAccelerationStructureDescriptor, AccelerationStructureDescriptor>
-{
-public:
-    static IndirectInstanceAccelerationStructureDescriptor* alloc();
-
-    static IndirectInstanceAccelerationStructureDescriptor* descriptor();
-
-    IndirectInstanceAccelerationStructureDescriptor*        init();
-
-    Buffer*                                                 instanceCountBuffer() const;
-    NS::UInteger                                            instanceCountBufferOffset() const;
-
-    Buffer*                                                 instanceDescriptorBuffer() const;
-    NS::UInteger                                            instanceDescriptorBufferOffset() const;
-
-    NS::UInteger                                            instanceDescriptorStride() const;
-
-    AccelerationStructureInstanceDescriptorType             instanceDescriptorType() const;
-
-    MatrixLayout                                            instanceTransformationMatrixLayout() const;
-
-    NS::UInteger                                            maxInstanceCount() const;
-
-    NS::UInteger                                            maxMotionTransformCount() const;
-
-    Buffer*                                                 motionTransformBuffer() const;
-    NS::UInteger                                            motionTransformBufferOffset() const;
-
-    Buffer*                                                 motionTransformCountBuffer() const;
-    NS::UInteger                                            motionTransformCountBufferOffset() const;
-
-    NS::UInteger                                            motionTransformStride() const;
-
-    TransformType                                           motionTransformType() const;
-
-    void                                                    setInstanceCountBuffer(const MTL::Buffer* instanceCountBuffer);
-    void                                                    setInstanceCountBufferOffset(NS::UInteger instanceCountBufferOffset);
-
-    void                                                    setInstanceDescriptorBuffer(const MTL::Buffer* instanceDescriptorBuffer);
-    void                                                    setInstanceDescriptorBufferOffset(NS::UInteger instanceDescriptorBufferOffset);
-
-    void                                                    setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride);
-
-    void                                                    setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType);
-
-    void                                                    setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout);
-
-    void                                                    setMaxInstanceCount(NS::UInteger maxInstanceCount);
-
-    void                                                    setMaxMotionTransformCount(NS::UInteger maxMotionTransformCount);
-
-    void                                                    setMotionTransformBuffer(const MTL::Buffer* motionTransformBuffer);
-    void                                                    setMotionTransformBufferOffset(NS::UInteger motionTransformBufferOffset);
-
-    void                                                    setMotionTransformCountBuffer(const MTL::Buffer* motionTransformCountBuffer);
-    void                                                    setMotionTransformCountBufferOffset(NS::UInteger motionTransformCountBufferOffset);
-
-    void                                                    setMotionTransformStride(NS::UInteger motionTransformStride);
-
-    void                                                    setMotionTransformType(MTL::TransformType motionTransformType);
-};
-class AccelerationStructure : public NS::Referencing<AccelerationStructure, Resource>
-{
-public:
-    ResourceID   gpuResourceID() const;
-
-    NS::UInteger size() const;
-};
-
-}
-
-_MTL_INLINE MTL::AccelerationStructureDescriptor* MTL::AccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructureDescriptor* MTL::AccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE void MTL::AccelerationStructureDescriptor::setUsage(MTL::AccelerationStructureUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setUsage_), usage);
-}
-
-_MTL_INLINE MTL::AccelerationStructureUsage MTL::AccelerationStructureDescriptor::usage() const
-{
-    return Object::sendMessage<MTL::AccelerationStructureUsage>(this, _MTL_PRIVATE_SEL(usage));
-}
-
-_MTL_INLINE MTL::AccelerationStructureGeometryDescriptor* MTL::AccelerationStructureGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureGeometryDescriptor));
-}
-
-_MTL_INLINE bool MTL::AccelerationStructureGeometryDescriptor::allowDuplicateIntersectionFunctionInvocation() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(allowDuplicateIntersectionFunctionInvocation));
-}
-
-_MTL_INLINE MTL::AccelerationStructureGeometryDescriptor* MTL::AccelerationStructureGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureGeometryDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureGeometryDescriptor::intersectionFunctionTableOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(intersectionFunctionTableOffset));
-}
-
-_MTL_INLINE NS::String* MTL::AccelerationStructureGeometryDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE bool MTL::AccelerationStructureGeometryDescriptor::opaque() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(opaque));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureGeometryDescriptor::primitiveDataBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(primitiveDataBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureGeometryDescriptor::primitiveDataBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(primitiveDataBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureGeometryDescriptor::primitiveDataElementSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(primitiveDataElementSize));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureGeometryDescriptor::primitiveDataStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(primitiveDataStride));
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setAllowDuplicateIntersectionFunctionInvocation(bool allowDuplicateIntersectionFunctionInvocation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAllowDuplicateIntersectionFunctionInvocation_), allowDuplicateIntersectionFunctionInvocation);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setIntersectionFunctionTableOffset(NS::UInteger intersectionFunctionTableOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTableOffset_), intersectionFunctionTableOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setOpaque(bool opaque)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaque_), opaque);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setPrimitiveDataBuffer(const MTL::Buffer* primitiveDataBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataBuffer_), primitiveDataBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setPrimitiveDataBufferOffset(NS::UInteger primitiveDataBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataBufferOffset_), primitiveDataBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setPrimitiveDataElementSize(NS::UInteger primitiveDataElementSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataElementSize_), primitiveDataElementSize);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureGeometryDescriptor::setPrimitiveDataStride(NS::UInteger primitiveDataStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrimitiveDataStride_), primitiveDataStride);
-}
-
-_MTL_INLINE MTL::PrimitiveAccelerationStructureDescriptor* MTL::PrimitiveAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::PrimitiveAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTLPrimitiveAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL::PrimitiveAccelerationStructureDescriptor* MTL::PrimitiveAccelerationStructureDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::PrimitiveAccelerationStructureDescriptor*>(_MTL_PRIVATE_CLS(MTLPrimitiveAccelerationStructureDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::PrimitiveAccelerationStructureDescriptor::geometryDescriptors() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(geometryDescriptors));
-}
-
-_MTL_INLINE MTL::PrimitiveAccelerationStructureDescriptor* MTL::PrimitiveAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL::PrimitiveAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE MTL::MotionBorderMode MTL::PrimitiveAccelerationStructureDescriptor::motionEndBorderMode() const
-{
-    return Object::sendMessage<MTL::MotionBorderMode>(this, _MTL_PRIVATE_SEL(motionEndBorderMode));
-}
-
-_MTL_INLINE float MTL::PrimitiveAccelerationStructureDescriptor::motionEndTime() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(motionEndTime));
-}
-
-_MTL_INLINE NS::UInteger MTL::PrimitiveAccelerationStructureDescriptor::motionKeyframeCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionKeyframeCount));
-}
-
-_MTL_INLINE MTL::MotionBorderMode MTL::PrimitiveAccelerationStructureDescriptor::motionStartBorderMode() const
-{
-    return Object::sendMessage<MTL::MotionBorderMode>(this, _MTL_PRIVATE_SEL(motionStartBorderMode));
-}
-
-_MTL_INLINE float MTL::PrimitiveAccelerationStructureDescriptor::motionStartTime() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(motionStartTime));
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setGeometryDescriptors(const NS::Array* geometryDescriptors)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setGeometryDescriptors_), geometryDescriptors);
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setMotionEndBorderMode(MTL::MotionBorderMode motionEndBorderMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionEndBorderMode_), motionEndBorderMode);
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setMotionEndTime(float motionEndTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionEndTime_), motionEndTime);
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setMotionKeyframeCount(NS::UInteger motionKeyframeCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionKeyframeCount_), motionKeyframeCount);
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setMotionStartBorderMode(MTL::MotionBorderMode motionStartBorderMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionStartBorderMode_), motionStartBorderMode);
-}
-
-_MTL_INLINE void MTL::PrimitiveAccelerationStructureDescriptor::setMotionStartTime(float motionStartTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionStartTime_), motionStartTime);
-}
-
-_MTL_INLINE MTL::AccelerationStructureTriangleGeometryDescriptor* MTL::AccelerationStructureTriangleGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureTriangleGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureTriangleGeometryDescriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructureTriangleGeometryDescriptor* MTL::AccelerationStructureTriangleGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureTriangleGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureTriangleGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureTriangleGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureTriangleGeometryDescriptor::indexBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(indexBufferOffset));
-}
-
-_MTL_INLINE MTL::IndexType MTL::AccelerationStructureTriangleGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureTriangleGeometryDescriptor* MTL::AccelerationStructureTriangleGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureTriangleGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setIndexBuffer(const MTL::Buffer* indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setIndexBufferOffset(NS::UInteger indexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBufferOffset_), indexBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setTransformationMatrixBuffer(const MTL::Buffer* transformationMatrixBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBuffer_), transformationMatrixBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setTransformationMatrixBufferOffset(NS::UInteger transformationMatrixBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBufferOffset_), transformationMatrixBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixLayout_), transformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setTriangleCount(NS::UInteger triangleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleCount_), triangleCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setVertexBuffer(const MTL::Buffer* vertexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_), vertexBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setVertexBufferOffset(NS::UInteger vertexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBufferOffset_), vertexBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setVertexFormat(MTL::AttributeFormat vertexFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFormat_), vertexFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureTriangleGeometryDescriptor::setVertexStride(NS::UInteger vertexStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexStride_), vertexStride);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureTriangleGeometryDescriptor::transformationMatrixBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(transformationMatrixBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureTriangleGeometryDescriptor::transformationMatrixBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(transformationMatrixBufferOffset));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL::AccelerationStructureTriangleGeometryDescriptor::transformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(transformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureTriangleGeometryDescriptor::triangleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(triangleCount));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureTriangleGeometryDescriptor::vertexBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(vertexBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureTriangleGeometryDescriptor::vertexBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(vertexBufferOffset));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureTriangleGeometryDescriptor::vertexFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(vertexFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureTriangleGeometryDescriptor::vertexStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(vertexStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureBoundingBoxGeometryDescriptor* MTL::AccelerationStructureBoundingBoxGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureBoundingBoxGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureBoundingBoxGeometryDescriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(boundingBoxBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureBoundingBoxGeometryDescriptor::boundingBoxStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureBoundingBoxGeometryDescriptor* MTL::AccelerationStructureBoundingBoxGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureBoundingBoxGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureBoundingBoxGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructureBoundingBoxGeometryDescriptor* MTL::AccelerationStructureBoundingBoxGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureBoundingBoxGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxBuffer(const MTL::Buffer* boundingBoxBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxBuffer_), boundingBoxBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxBufferOffset(NS::UInteger boundingBoxBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxBufferOffset_), boundingBoxBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxCount(NS::UInteger boundingBoxCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxCount_), boundingBoxCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureBoundingBoxGeometryDescriptor::setBoundingBoxStride(NS::UInteger boundingBoxStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxStride_), boundingBoxStride);
-}
-
-_MTL_INLINE MTL::MotionKeyframeData* MTL::MotionKeyframeData::alloc()
-{
-    return NS::Object::alloc<MTL::MotionKeyframeData>(_MTL_PRIVATE_CLS(MTLMotionKeyframeData));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::MotionKeyframeData::buffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(buffer));
-}
-
-_MTL_INLINE MTL::MotionKeyframeData* MTL::MotionKeyframeData::data()
-{
-    return Object::sendMessage<MTL::MotionKeyframeData*>(_MTL_PRIVATE_CLS(MTLMotionKeyframeData), _MTL_PRIVATE_SEL(data));
-}
-
-_MTL_INLINE MTL::MotionKeyframeData* MTL::MotionKeyframeData::init()
-{
-    return NS::Object::init<MTL::MotionKeyframeData>();
-}
-
-_MTL_INLINE NS::UInteger MTL::MotionKeyframeData::offset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(offset));
-}
-
-_MTL_INLINE void MTL::MotionKeyframeData::setBuffer(const MTL::Buffer* buffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffer_), buffer);
-}
-
-_MTL_INLINE void MTL::MotionKeyframeData::setOffset(NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOffset_), offset);
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionTriangleGeometryDescriptor* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureMotionTriangleGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionTriangleGeometryDescriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionTriangleGeometryDescriptor* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureMotionTriangleGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionTriangleGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionTriangleGeometryDescriptor::indexBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(indexBufferOffset));
-}
-
-_MTL_INLINE MTL::IndexType MTL::AccelerationStructureMotionTriangleGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionTriangleGeometryDescriptor* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureMotionTriangleGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setIndexBuffer(const MTL::Buffer* indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setIndexBufferOffset(NS::UInteger indexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBufferOffset_), indexBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setTransformationMatrixBuffer(const MTL::Buffer* transformationMatrixBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBuffer_), transformationMatrixBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setTransformationMatrixBufferOffset(NS::UInteger transformationMatrixBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixBufferOffset_), transformationMatrixBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setTransformationMatrixLayout(MTL::MatrixLayout transformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTransformationMatrixLayout_), transformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setTriangleCount(NS::UInteger triangleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleCount_), triangleCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexBuffers(const NS::Array* vertexBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffers_), vertexBuffers);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexFormat(MTL::AttributeFormat vertexFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFormat_), vertexFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionTriangleGeometryDescriptor::setVertexStride(NS::UInteger vertexStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexStride_), vertexStride);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::transformationMatrixBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(transformationMatrixBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionTriangleGeometryDescriptor::transformationMatrixBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(transformationMatrixBufferOffset));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL::AccelerationStructureMotionTriangleGeometryDescriptor::transformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(transformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionTriangleGeometryDescriptor::triangleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(triangleCount));
-}
-
-_MTL_INLINE NS::Array* MTL::AccelerationStructureMotionTriangleGeometryDescriptor::vertexBuffers() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexBuffers));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureMotionTriangleGeometryDescriptor::vertexFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(vertexFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionTriangleGeometryDescriptor::vertexStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(vertexStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor* MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionBoundingBoxGeometryDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxBuffers() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(boundingBoxBuffers));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::boundingBoxStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(boundingBoxStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor* MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionBoundingBoxGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor* MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor>();
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxBuffers(const NS::Array* boundingBoxBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxBuffers_), boundingBoxBuffers);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxCount(NS::UInteger boundingBoxCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxCount_), boundingBoxCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionBoundingBoxGeometryDescriptor::setBoundingBoxStride(NS::UInteger boundingBoxStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBoundingBoxStride_), boundingBoxStride);
-}
-
-_MTL_INLINE MTL::AccelerationStructureCurveGeometryDescriptor* MTL::AccelerationStructureCurveGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureCurveGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureCurveGeometryDescriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureCurveGeometryDescriptor::controlPointBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(controlPointBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::controlPointBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::controlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointCount));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureCurveGeometryDescriptor::controlPointFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(controlPointFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::controlPointStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointStride));
-}
-
-_MTL_INLINE MTL::CurveBasis MTL::AccelerationStructureCurveGeometryDescriptor::curveBasis() const
-{
-    return Object::sendMessage<MTL::CurveBasis>(this, _MTL_PRIVATE_SEL(curveBasis));
-}
-
-_MTL_INLINE MTL::CurveEndCaps MTL::AccelerationStructureCurveGeometryDescriptor::curveEndCaps() const
-{
-    return Object::sendMessage<MTL::CurveEndCaps>(this, _MTL_PRIVATE_SEL(curveEndCaps));
-}
-
-_MTL_INLINE MTL::CurveType MTL::AccelerationStructureCurveGeometryDescriptor::curveType() const
-{
-    return Object::sendMessage<MTL::CurveType>(this, _MTL_PRIVATE_SEL(curveType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureCurveGeometryDescriptor* MTL::AccelerationStructureCurveGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureCurveGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureCurveGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureCurveGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::indexBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(indexBufferOffset));
-}
-
-_MTL_INLINE MTL::IndexType MTL::AccelerationStructureCurveGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureCurveGeometryDescriptor* MTL::AccelerationStructureCurveGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureCurveGeometryDescriptor>();
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureCurveGeometryDescriptor::radiusBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(radiusBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::radiusBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(radiusBufferOffset));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureCurveGeometryDescriptor::radiusFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(radiusFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::radiusStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(radiusStride));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::segmentControlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentControlPointCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureCurveGeometryDescriptor::segmentCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentCount));
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setControlPointBuffer(const MTL::Buffer* controlPointBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointBuffer_), controlPointBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setControlPointBufferOffset(NS::UInteger controlPointBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointBufferOffset_), controlPointBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setControlPointCount(NS::UInteger controlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointCount_), controlPointCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setControlPointFormat(MTL::AttributeFormat controlPointFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointFormat_), controlPointFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setControlPointStride(NS::UInteger controlPointStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointStride_), controlPointStride);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setCurveBasis(MTL::CurveBasis curveBasis)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveBasis_), curveBasis);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setCurveEndCaps(MTL::CurveEndCaps curveEndCaps)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveEndCaps_), curveEndCaps);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setCurveType(MTL::CurveType curveType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveType_), curveType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setIndexBuffer(const MTL::Buffer* indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setIndexBufferOffset(NS::UInteger indexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBufferOffset_), indexBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setRadiusBuffer(const MTL::Buffer* radiusBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusBuffer_), radiusBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setRadiusBufferOffset(NS::UInteger radiusBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusBufferOffset_), radiusBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setRadiusFormat(MTL::AttributeFormat radiusFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusFormat_), radiusFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setRadiusStride(NS::UInteger radiusStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusStride_), radiusStride);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setSegmentControlPointCount(NS::UInteger segmentControlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentControlPointCount_), segmentControlPointCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCurveGeometryDescriptor::setSegmentCount(NS::UInteger segmentCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentCount_), segmentCount);
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionCurveGeometryDescriptor* MTL::AccelerationStructureMotionCurveGeometryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructureMotionCurveGeometryDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionCurveGeometryDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::AccelerationStructureMotionCurveGeometryDescriptor::controlPointBuffers() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(controlPointBuffers));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::controlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointCount));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureMotionCurveGeometryDescriptor::controlPointFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(controlPointFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::controlPointStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(controlPointStride));
-}
-
-_MTL_INLINE MTL::CurveBasis MTL::AccelerationStructureMotionCurveGeometryDescriptor::curveBasis() const
-{
-    return Object::sendMessage<MTL::CurveBasis>(this, _MTL_PRIVATE_SEL(curveBasis));
-}
-
-_MTL_INLINE MTL::CurveEndCaps MTL::AccelerationStructureMotionCurveGeometryDescriptor::curveEndCaps() const
-{
-    return Object::sendMessage<MTL::CurveEndCaps>(this, _MTL_PRIVATE_SEL(curveEndCaps));
-}
-
-_MTL_INLINE MTL::CurveType MTL::AccelerationStructureMotionCurveGeometryDescriptor::curveType() const
-{
-    return Object::sendMessage<MTL::CurveType>(this, _MTL_PRIVATE_SEL(curveType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionCurveGeometryDescriptor* MTL::AccelerationStructureMotionCurveGeometryDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructureMotionCurveGeometryDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructureMotionCurveGeometryDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::AccelerationStructureMotionCurveGeometryDescriptor::indexBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(indexBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::indexBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(indexBufferOffset));
-}
-
-_MTL_INLINE MTL::IndexType MTL::AccelerationStructureMotionCurveGeometryDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::AccelerationStructureMotionCurveGeometryDescriptor* MTL::AccelerationStructureMotionCurveGeometryDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructureMotionCurveGeometryDescriptor>();
-}
-
-_MTL_INLINE NS::Array* MTL::AccelerationStructureMotionCurveGeometryDescriptor::radiusBuffers() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(radiusBuffers));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AccelerationStructureMotionCurveGeometryDescriptor::radiusFormat() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(radiusFormat));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::radiusStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(radiusStride));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::segmentControlPointCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentControlPointCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructureMotionCurveGeometryDescriptor::segmentCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(segmentCount));
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointBuffers(const NS::Array* controlPointBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointBuffers_), controlPointBuffers);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointCount(NS::UInteger controlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointCount_), controlPointCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointFormat(MTL::AttributeFormat controlPointFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointFormat_), controlPointFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setControlPointStride(NS::UInteger controlPointStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlPointStride_), controlPointStride);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setCurveBasis(MTL::CurveBasis curveBasis)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveBasis_), curveBasis);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setCurveEndCaps(MTL::CurveEndCaps curveEndCaps)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveEndCaps_), curveEndCaps);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setCurveType(MTL::CurveType curveType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCurveType_), curveType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setIndexBuffer(const MTL::Buffer* indexBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBuffer_), indexBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setIndexBufferOffset(NS::UInteger indexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBufferOffset_), indexBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusBuffers(const NS::Array* radiusBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusBuffers_), radiusBuffers);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusFormat(MTL::AttributeFormat radiusFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusFormat_), radiusFormat);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setRadiusStride(NS::UInteger radiusStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRadiusStride_), radiusStride);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setSegmentControlPointCount(NS::UInteger segmentControlPointCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentControlPointCount_), segmentControlPointCount);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureMotionCurveGeometryDescriptor::setSegmentCount(NS::UInteger segmentCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSegmentCount_), segmentCount);
-}
-
-_MTL_INLINE MTL::InstanceAccelerationStructureDescriptor* MTL::InstanceAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::InstanceAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTLInstanceAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL::InstanceAccelerationStructureDescriptor* MTL::InstanceAccelerationStructureDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::InstanceAccelerationStructureDescriptor*>(_MTL_PRIVATE_CLS(MTLInstanceAccelerationStructureDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::InstanceAccelerationStructureDescriptor* MTL::InstanceAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL::InstanceAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::instanceCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceCount));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::InstanceAccelerationStructureDescriptor::instanceDescriptorBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(instanceDescriptorBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::instanceDescriptorBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::instanceDescriptorStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureInstanceDescriptorType MTL::InstanceAccelerationStructureDescriptor::instanceDescriptorType() const
-{
-    return Object::sendMessage<MTL::AccelerationStructureInstanceDescriptorType>(this, _MTL_PRIVATE_SEL(instanceDescriptorType));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL::InstanceAccelerationStructureDescriptor::instanceTransformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(instanceTransformationMatrixLayout));
-}
-
-_MTL_INLINE NS::Array* MTL::InstanceAccelerationStructureDescriptor::instancedAccelerationStructures() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(instancedAccelerationStructures));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::InstanceAccelerationStructureDescriptor::motionTransformBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(motionTransformBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::motionTransformBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::motionTransformCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::InstanceAccelerationStructureDescriptor::motionTransformStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformStride));
-}
-
-_MTL_INLINE MTL::TransformType MTL::InstanceAccelerationStructureDescriptor::motionTransformType() const
-{
-    return Object::sendMessage<MTL::TransformType>(this, _MTL_PRIVATE_SEL(motionTransformType));
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceCount(NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceCount_), instanceCount);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceDescriptorBuffer(const MTL::Buffer* instanceDescriptorBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBuffer_), instanceDescriptorBuffer);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceDescriptorBufferOffset(NS::UInteger instanceDescriptorBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBufferOffset_), instanceDescriptorBufferOffset);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorStride_), instanceDescriptorStride);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorType_), instanceDescriptorType);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceTransformationMatrixLayout_), instanceTransformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setInstancedAccelerationStructures(const NS::Array* instancedAccelerationStructures)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstancedAccelerationStructures_), instancedAccelerationStructures);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setMotionTransformBuffer(const MTL::Buffer* motionTransformBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBuffer_), motionTransformBuffer);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setMotionTransformBufferOffset(NS::UInteger motionTransformBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBufferOffset_), motionTransformBufferOffset);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setMotionTransformCount(NS::UInteger motionTransformCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformCount_), motionTransformCount);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setMotionTransformStride(NS::UInteger motionTransformStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformStride_), motionTransformStride);
-}
-
-_MTL_INLINE void MTL::InstanceAccelerationStructureDescriptor::setMotionTransformType(MTL::TransformType motionTransformType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformType_), motionTransformType);
-}
-
-_MTL_INLINE MTL::IndirectInstanceAccelerationStructureDescriptor* MTL::IndirectInstanceAccelerationStructureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::IndirectInstanceAccelerationStructureDescriptor>(_MTL_PRIVATE_CLS(MTLIndirectInstanceAccelerationStructureDescriptor));
-}
-
-_MTL_INLINE MTL::IndirectInstanceAccelerationStructureDescriptor* MTL::IndirectInstanceAccelerationStructureDescriptor::descriptor()
-{
-    return Object::sendMessage<MTL::IndirectInstanceAccelerationStructureDescriptor*>(_MTL_PRIVATE_CLS(MTLIndirectInstanceAccelerationStructureDescriptor), _MTL_PRIVATE_SEL(descriptor));
-}
-
-_MTL_INLINE MTL::IndirectInstanceAccelerationStructureDescriptor* MTL::IndirectInstanceAccelerationStructureDescriptor::init()
-{
-    return NS::Object::init<MTL::IndirectInstanceAccelerationStructureDescriptor>();
-}
-
-_MTL_INLINE MTL::Buffer* MTL::IndirectInstanceAccelerationStructureDescriptor::instanceCountBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(instanceCountBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::instanceCountBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceCountBufferOffset));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(instanceDescriptorBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(instanceDescriptorStride));
-}
-
-_MTL_INLINE MTL::AccelerationStructureInstanceDescriptorType MTL::IndirectInstanceAccelerationStructureDescriptor::instanceDescriptorType() const
-{
-    return Object::sendMessage<MTL::AccelerationStructureInstanceDescriptorType>(this, _MTL_PRIVATE_SEL(instanceDescriptorType));
-}
-
-_MTL_INLINE MTL::MatrixLayout MTL::IndirectInstanceAccelerationStructureDescriptor::instanceTransformationMatrixLayout() const
-{
-    return Object::sendMessage<MTL::MatrixLayout>(this, _MTL_PRIVATE_SEL(instanceTransformationMatrixLayout));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::maxInstanceCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxInstanceCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::maxMotionTransformCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxMotionTransformCount));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(motionTransformBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformBufferOffset));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformCountBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(motionTransformCountBuffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformCountBufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformCountBufferOffset));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(motionTransformStride));
-}
-
-_MTL_INLINE MTL::TransformType MTL::IndirectInstanceAccelerationStructureDescriptor::motionTransformType() const
-{
-    return Object::sendMessage<MTL::TransformType>(this, _MTL_PRIVATE_SEL(motionTransformType));
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceCountBuffer(const MTL::Buffer* instanceCountBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceCountBuffer_), instanceCountBuffer);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceCountBufferOffset(NS::UInteger instanceCountBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceCountBufferOffset_), instanceCountBufferOffset);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorBuffer(const MTL::Buffer* instanceDescriptorBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBuffer_), instanceDescriptorBuffer);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorBufferOffset(NS::UInteger instanceDescriptorBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorBufferOffset_), instanceDescriptorBufferOffset);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorStride(NS::UInteger instanceDescriptorStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorStride_), instanceDescriptorStride);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceDescriptorType(MTL::AccelerationStructureInstanceDescriptorType instanceDescriptorType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceDescriptorType_), instanceDescriptorType);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setInstanceTransformationMatrixLayout(MTL::MatrixLayout instanceTransformationMatrixLayout)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstanceTransformationMatrixLayout_), instanceTransformationMatrixLayout);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMaxInstanceCount(NS::UInteger maxInstanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxInstanceCount_), maxInstanceCount);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMaxMotionTransformCount(NS::UInteger maxMotionTransformCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxMotionTransformCount_), maxMotionTransformCount);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformBuffer(const MTL::Buffer* motionTransformBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBuffer_), motionTransformBuffer);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformBufferOffset(NS::UInteger motionTransformBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformBufferOffset_), motionTransformBufferOffset);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformCountBuffer(const MTL::Buffer* motionTransformCountBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformCountBuffer_), motionTransformCountBuffer);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformCountBufferOffset(NS::UInteger motionTransformCountBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformCountBufferOffset_), motionTransformCountBufferOffset);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformStride(NS::UInteger motionTransformStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformStride_), motionTransformStride);
-}
-
-_MTL_INLINE void MTL::IndirectInstanceAccelerationStructureDescriptor::setMotionTransformType(MTL::TransformType motionTransformType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMotionTransformType_), motionTransformType);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::AccelerationStructure::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructure::size() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(size));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureCommandEncoder.hpp
deleted file mode 100644
index 5f82344a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureCommandEncoder.hpp
+++ /dev/null
@@ -1,260 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLAccelerationStructureCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAccelerationStructure.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDataType.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class AccelerationStructure;
-class AccelerationStructureDescriptor;
-class AccelerationStructurePassDescriptor;
-class AccelerationStructurePassSampleBufferAttachmentDescriptor;
-class AccelerationStructurePassSampleBufferAttachmentDescriptorArray;
-class Buffer;
-class CounterSampleBuffer;
-class Fence;
-class Heap;
-class Resource;
-
-class AccelerationStructureCommandEncoder : public NS::Referencing<AccelerationStructureCommandEncoder, CommandEncoder>
-{
-public:
-    void buildAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset);
-
-    void copyAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure);
-
-    void copyAndCompactAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure);
-
-    void refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset);
-    void refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset, MTL::AccelerationStructureRefitOptions options);
-
-    void sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier);
-
-    void updateFence(const MTL::Fence* fence);
-
-    void useHeap(const MTL::Heap* heap);
-    void useHeaps(const MTL::Heap* const heaps[], NS::UInteger count);
-
-    void useResource(const MTL::Resource* resource, MTL::ResourceUsage usage);
-    void useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage);
-
-    void waitForFence(const MTL::Fence* fence);
-
-    void writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL::Buffer* buffer, NS::UInteger offset);
-    void writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL::Buffer* buffer, NS::UInteger offset, MTL::DataType sizeDataType);
-};
-class AccelerationStructurePassSampleBufferAttachmentDescriptor : public NS::Copying<AccelerationStructurePassSampleBufferAttachmentDescriptor>
-{
-public:
-    static AccelerationStructurePassSampleBufferAttachmentDescriptor* alloc();
-
-    NS::UInteger                                                      endOfEncoderSampleIndex() const;
-
-    AccelerationStructurePassSampleBufferAttachmentDescriptor*        init();
-
-    CounterSampleBuffer*                                              sampleBuffer() const;
-
-    void                                                              setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex);
-
-    void                                                              setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer);
-
-    void                                                              setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex);
-    NS::UInteger                                                      startOfEncoderSampleIndex() const;
-};
-class AccelerationStructurePassSampleBufferAttachmentDescriptorArray : public NS::Referencing<AccelerationStructurePassSampleBufferAttachmentDescriptorArray>
-{
-public:
-    static AccelerationStructurePassSampleBufferAttachmentDescriptorArray* alloc();
-
-    AccelerationStructurePassSampleBufferAttachmentDescriptorArray*        init();
-
-    AccelerationStructurePassSampleBufferAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                                   setObject(const MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class AccelerationStructurePassDescriptor : public NS::Copying<AccelerationStructurePassDescriptor>
-{
-public:
-    static AccelerationStructurePassDescriptor*                     accelerationStructurePassDescriptor();
-
-    static AccelerationStructurePassDescriptor*                     alloc();
-
-    AccelerationStructurePassDescriptor*                            init();
-
-    AccelerationStructurePassSampleBufferAttachmentDescriptorArray* sampleBufferAttachments() const;
-};
-
-}
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::buildAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(buildAccelerationStructure_descriptor_scratchBuffer_scratchBufferOffset_), accelerationStructure, descriptor, scratchBuffer, scratchBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::copyAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyAccelerationStructure_toAccelerationStructure_), sourceAccelerationStructure, destinationAccelerationStructure);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::copyAndCompactAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructure* destinationAccelerationStructure)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyAndCompactAccelerationStructure_toAccelerationStructure_), sourceAccelerationStructure, destinationAccelerationStructure);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_scratchBufferOffset_), sourceAccelerationStructure, descriptor, destinationAccelerationStructure, scratchBuffer, scratchBufferOffset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::refitAccelerationStructure(const MTL::AccelerationStructure* sourceAccelerationStructure, const MTL::AccelerationStructureDescriptor* descriptor, const MTL::AccelerationStructure* destinationAccelerationStructure, const MTL::Buffer* scratchBuffer, NS::UInteger scratchBufferOffset, MTL::AccelerationStructureRefitOptions options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_scratchBufferOffset_options_), sourceAccelerationStructure, descriptor, destinationAccelerationStructure, scratchBuffer, scratchBufferOffset, options);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(sampleCountersInBuffer_atSampleIndex_withBarrier_), sampleBuffer, sampleIndex, barrier);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::updateFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_), fence);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::useHeap(const MTL::Heap* heap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeap_), heap);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::useHeaps(const MTL::Heap* const heaps[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeaps_count_), heaps, count);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::useResource(const MTL::Resource* resource, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResource_usage_), resource, usage);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResources_count_usage_), resources, count, usage);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::waitForFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_), fence);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL::Buffer* buffer, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeCompactedAccelerationStructureSize_toBuffer_offset_), accelerationStructure, buffer, offset);
-}
-
-_MTL_INLINE void MTL::AccelerationStructureCommandEncoder::writeCompactedAccelerationStructureSize(const MTL::AccelerationStructure* accelerationStructure, const MTL::Buffer* buffer, NS::UInteger offset, MTL::DataType sizeDataType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(writeCompactedAccelerationStructureSize_toBuffer_offset_sizeDataType_), accelerationStructure, buffer, offset, sizeDataType);
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructurePassSampleBufferAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::endOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::sampleBuffer() const
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(sampleBuffer));
-}
-
-_MTL_INLINE void MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfEncoderSampleIndex_), endOfEncoderSampleIndex);
-}
-
-_MTL_INLINE void MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleBuffer_), sampleBuffer);
-}
-
-_MTL_INLINE void MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfEncoderSampleIndex_), startOfEncoderSampleIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor::startOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLAccelerationStructurePassSampleBufferAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor* MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray::setObject(const MTL::AccelerationStructurePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassDescriptor* MTL::AccelerationStructurePassDescriptor::accelerationStructurePassDescriptor()
-{
-    return Object::sendMessage<MTL::AccelerationStructurePassDescriptor*>(_MTL_PRIVATE_CLS(MTLAccelerationStructurePassDescriptor), _MTL_PRIVATE_SEL(accelerationStructurePassDescriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassDescriptor* MTL::AccelerationStructurePassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AccelerationStructurePassDescriptor>(_MTL_PRIVATE_CLS(MTLAccelerationStructurePassDescriptor));
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassDescriptor* MTL::AccelerationStructurePassDescriptor::init()
-{
-    return NS::Object::init<MTL::AccelerationStructurePassDescriptor>();
-}
-
-_MTL_INLINE MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray* MTL::AccelerationStructurePassDescriptor::sampleBufferAttachments() const
-{
-    return Object::sendMessage<MTL::AccelerationStructurePassSampleBufferAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(sampleBufferAttachments));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureTypes.hpp b/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureTypes.hpp
deleted file mode 100644
index a08b1e96..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLAccelerationStructureTypes.hpp
+++ /dev/null
@@ -1,292 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLAccelerationStructureTypes.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLDefines.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLStageInputOutputDescriptor.hpp"
-
-#include "../Foundation/Foundation.hpp"
-#include <cstdint>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL
-{
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnested-anon-types"
-struct PackedFloat3
-{
-    PackedFloat3();
-    PackedFloat3(float x, float y, float z);
-
-    float& operator[](int idx);
-    float  operator[](int idx) const;
-
-    union
-    {
-        struct
-        {
-            float x;
-            float y;
-            float z;
-        };
-
-        float elements[3];
-    };
-} _MTL_PACKED;
-#pragma clang diagnostic pop
-
-struct PackedFloat4x3
-{
-    PackedFloat4x3();
-    PackedFloat4x3(const PackedFloat3& col0, const PackedFloat3& col1, const PackedFloat3& col2, const PackedFloat3& col3);
-
-    PackedFloat3&       operator[](int idx);
-    const PackedFloat3& operator[](int idx) const;
-
-    PackedFloat3        columns[4];
-} _MTL_PACKED;
-
-struct AxisAlignedBoundingBox
-{
-    AxisAlignedBoundingBox();
-    AxisAlignedBoundingBox(PackedFloat3 p);
-    AxisAlignedBoundingBox(PackedFloat3 min, PackedFloat3 max);
-
-    PackedFloat3 min;
-    PackedFloat3 max;
-} _MTL_PACKED;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnested-anon-types"
-struct PackedFloatQuaternion
-{
-    PackedFloatQuaternion();
-    PackedFloatQuaternion(float x, float y, float z, float w);
-
-    float&       operator[](int idx);
-    const float& operator[](int idx) const;
-
-    union 
-    {
-        struct
-        {
-            float x;
-            float y;
-            float z;
-            float w;
-        };
-
-        float elements[4];
-    };
-    
-} _MTL_PACKED;
-#pragma clang diagnostic pop
-
-struct ComponentTransform
-{
-    PackedFloat3          scale;
-    PackedFloat3          shear;
-    PackedFloat3          pivot;
-    PackedFloatQuaternion rotation;
-    PackedFloat3          translation;
-} _MTL_PACKED;
-
-}
-
-namespace MTL4
-{
-
-struct BufferRange
-{
-    BufferRange() = default;
-    BufferRange(uint64_t bufferAddress);
-    BufferRange(uint64_t bufferAddress, uint64_t length);
-
-    static MTL4::BufferRange Make(uint64_t bufferAddress, uint64_t length);
-
-    uint64_t          bufferAddress;
-    uint64_t          length;
-} _MTL_PACKED;
-
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloat3::PackedFloat3()
-    : x(0.0f)
-    , y(0.0f)
-    , z(0.0f)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloat3::PackedFloat3(float _x, float _y, float _z)
-    : x(_x)
-    , y(_y)
-    , z(_z)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE float& MTL::PackedFloat3::operator[](int idx)
-{
-    return elements[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE float MTL::PackedFloat3::operator[](int idx) const
-{
-    return elements[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloat4x3::PackedFloat4x3()
-{
-    columns[0] = PackedFloat3(0.0f, 0.0f, 0.0f);
-    columns[1] = PackedFloat3(0.0f, 0.0f, 0.0f);
-    columns[2] = PackedFloat3(0.0f, 0.0f, 0.0f);
-    columns[3] = PackedFloat3(0.0f, 0.0f, 0.0f);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloat4x3::PackedFloat4x3(const PackedFloat3& col0, const PackedFloat3& col1, const PackedFloat3& col2, const PackedFloat3& col3)
-{
-    columns[0] = col0;
-    columns[1] = col1;
-    columns[2] = col2;
-    columns[3] = col3;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloat3& MTL::PackedFloat4x3::operator[](int idx)
-{
-    return columns[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE const MTL::PackedFloat3& MTL::PackedFloat4x3::operator[](int idx) const
-{
-    return columns[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#if __apple_build_version__ > 16000026
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnan-infinity-disabled"
-#endif // __apple_build_version__ > 16000026
-_MTL_INLINE MTL::AxisAlignedBoundingBox::AxisAlignedBoundingBox()
-    : min(INFINITY, INFINITY, INFINITY)
-    , max(-INFINITY, -INFINITY, -INFINITY)
-{
-}
-#if __apple_build_version__ > 16000026
-#pragma clang diagnostic pop
-#endif // if __apple_build_version__ > 16000026
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::AxisAlignedBoundingBox::AxisAlignedBoundingBox(PackedFloat3 p)
-    : min(p)
-    , max(p)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::AxisAlignedBoundingBox::AxisAlignedBoundingBox(PackedFloat3 _min, PackedFloat3 _max)
-    : min(_min)
-    , max(_max)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloatQuaternion::PackedFloatQuaternion()
-    : x(0.0f)
-    , y(0.0f)
-    , z(0.0f)
-    , w(0.0f)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::PackedFloatQuaternion::PackedFloatQuaternion(float x, float y, float z, float w)
-    : x(x)
-    , y(y)
-    , z(z)
-    , w(w)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE float& MTL::PackedFloatQuaternion::operator[](int idx)
-{
-    return elements[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE const float& MTL::PackedFloatQuaternion::operator[](int idx) const
-{
-    return elements[idx];
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL4::BufferRange::BufferRange(uint64_t bufferAddress)
-: bufferAddress(bufferAddress)
-, length(-1)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL4::BufferRange::BufferRange(uint64_t bufferAddress, uint64_t length)
-: bufferAddress(bufferAddress)
-, length(length)
-{
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL4::BufferRange MTL4::BufferRange::Make(uint64_t bufferAddress, uint64_t length)
-{
-    return MTL4::BufferRange(bufferAddress, length);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLAllocation.hpp b/engine/thirdparty/metal-cpp/Metal/MTLAllocation.hpp
deleted file mode 100644
index ba201058..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLAllocation.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLAllocation.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Allocation : public NS::Referencing<Allocation>
-{
-public:
-    NS::UInteger allocatedSize() const;
-};
-
-}
-_MTL_INLINE NS::UInteger MTL::Allocation::allocatedSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(allocatedSize));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLArgument.hpp b/engine/thirdparty/metal-cpp/Metal/MTLArgument.hpp
deleted file mode 100644
index f91bd917..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLArgument.hpp
+++ /dev/null
@@ -1,787 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLArgument.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDataType.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTensor.hpp"
-#include "MTLTexture.hpp"
-
-namespace MTL
-{
-class Argument;
-class ArrayType;
-class PointerType;
-class StructMember;
-class StructType;
-class TensorExtents;
-class TensorReferenceType;
-class TextureReferenceType;
-class Type;
-_MTL_ENUM(NS::UInteger, IndexType) {
-    IndexTypeUInt16 = 0,
-    IndexTypeUInt32 = 1,
-};
-
-_MTL_ENUM(NS::Integer, BindingType) {
-    BindingTypeBuffer = 0,
-    BindingTypeThreadgroupMemory = 1,
-    BindingTypeTexture = 2,
-    BindingTypeSampler = 3,
-    BindingTypeImageblockData = 16,
-    BindingTypeImageblock = 17,
-    BindingTypeVisibleFunctionTable = 24,
-    BindingTypePrimitiveAccelerationStructure = 25,
-    BindingTypeInstanceAccelerationStructure = 26,
-    BindingTypeIntersectionFunctionTable = 27,
-    BindingTypeObjectPayload = 34,
-    BindingTypeTensor = 37,
-};
-
-_MTL_ENUM(NS::UInteger, ArgumentType) {
-    ArgumentTypeBuffer = 0,
-    ArgumentTypeThreadgroupMemory = 1,
-    ArgumentTypeTexture = 2,
-    ArgumentTypeSampler = 3,
-    ArgumentTypeImageblockData = 16,
-    ArgumentTypeImageblock = 17,
-    ArgumentTypeVisibleFunctionTable = 24,
-    ArgumentTypePrimitiveAccelerationStructure = 25,
-    ArgumentTypeInstanceAccelerationStructure = 26,
-    ArgumentTypeIntersectionFunctionTable = 27,
-};
-
-_MTL_ENUM(NS::UInteger, BindingAccess) {
-    BindingAccessReadOnly = 0,
-    BindingAccessReadWrite = 1,
-    BindingAccessWriteOnly = 2,
-    ArgumentAccessReadOnly = 0,
-    ArgumentAccessReadWrite = 1,
-    ArgumentAccessWriteOnly = 2,
-};
-
-class Type : public NS::Referencing<Type>
-{
-public:
-    static Type* alloc();
-
-    DataType     dataType() const;
-
-    Type*        init();
-};
-class StructMember : public NS::Referencing<StructMember>
-{
-public:
-    static StructMember*  alloc();
-
-    NS::UInteger          argumentIndex() const;
-
-    ArrayType*            arrayType();
-
-    DataType              dataType() const;
-
-    StructMember*         init();
-
-    NS::String*           name() const;
-
-    NS::UInteger          offset() const;
-
-    PointerType*          pointerType();
-
-    StructType*           structType();
-
-    TensorReferenceType*  tensorReferenceType();
-
-    TextureReferenceType* textureReferenceType();
-};
-class StructType : public NS::Referencing<StructType, Type>
-{
-public:
-    static StructType* alloc();
-
-    StructType*        init();
-
-    StructMember*      memberByName(const NS::String* name);
-
-    NS::Array*         members() const;
-};
-class ArrayType : public NS::Referencing<ArrayType, Type>
-{
-public:
-    static ArrayType*     alloc();
-
-    NS::UInteger          argumentIndexStride() const;
-
-    NS::UInteger          arrayLength() const;
-
-    ArrayType*            elementArrayType();
-
-    PointerType*          elementPointerType();
-
-    StructType*           elementStructType();
-
-    TensorReferenceType*  elementTensorReferenceType();
-
-    TextureReferenceType* elementTextureReferenceType();
-
-    DataType              elementType() const;
-
-    ArrayType*            init();
-
-    NS::UInteger          stride() const;
-};
-class PointerType : public NS::Referencing<PointerType, Type>
-{
-public:
-    BindingAccess       access() const;
-
-    NS::UInteger        alignment() const;
-
-    static PointerType* alloc();
-
-    NS::UInteger        dataSize() const;
-
-    ArrayType*          elementArrayType();
-
-    bool                elementIsArgumentBuffer() const;
-
-    StructType*         elementStructType();
-
-    DataType            elementType() const;
-
-    PointerType*        init();
-};
-class TextureReferenceType : public NS::Referencing<TextureReferenceType, Type>
-{
-public:
-    BindingAccess                access() const;
-
-    static TextureReferenceType* alloc();
-
-    TextureReferenceType*        init();
-
-    bool                         isDepthTexture() const;
-
-    DataType                     textureDataType() const;
-
-    TextureType                  textureType() const;
-};
-class TensorReferenceType : public NS::Referencing<TensorReferenceType, Type>
-{
-public:
-    BindingAccess               access() const;
-
-    static TensorReferenceType* alloc();
-
-    TensorExtents*              dimensions() const;
-
-    DataType                    indexType() const;
-
-    TensorReferenceType*        init();
-
-    TensorDataType              tensorDataType() const;
-};
-class Argument : public NS::Referencing<Argument>
-{
-public:
-    BindingAccess access() const;
-
-    [[deprecated("please use isActive instead")]]
-    bool             active() const;
-
-    static Argument* alloc();
-
-    NS::UInteger     arrayLength() const;
-
-    NS::UInteger     bufferAlignment() const;
-
-    NS::UInteger     bufferDataSize() const;
-
-    DataType         bufferDataType() const;
-
-    PointerType*     bufferPointerType() const;
-
-    StructType*      bufferStructType() const;
-
-    NS::UInteger     index() const;
-
-    Argument*        init();
-
-    bool             isActive() const;
-
-    bool             isDepthTexture() const;
-
-    NS::String*      name() const;
-
-    DataType         textureDataType() const;
-
-    TextureType      textureType() const;
-
-    NS::UInteger     threadgroupMemoryAlignment() const;
-
-    NS::UInteger     threadgroupMemoryDataSize() const;
-
-    ArgumentType     type() const;
-};
-class Binding : public NS::Referencing<Binding>
-{
-public:
-    BindingAccess access() const;
-
-    [[deprecated("please use isArgument instead")]]
-    bool         argument() const;
-
-    NS::UInteger index() const;
-
-    bool         isArgument() const;
-
-    bool         isUsed() const;
-
-    NS::String*  name() const;
-
-    BindingType  type() const;
-
-    [[deprecated("please use isUsed instead")]]
-    bool used() const;
-};
-class BufferBinding : public NS::Referencing<BufferBinding, Binding>
-{
-public:
-    NS::UInteger bufferAlignment() const;
-
-    NS::UInteger bufferDataSize() const;
-
-    DataType     bufferDataType() const;
-
-    PointerType* bufferPointerType() const;
-
-    StructType*  bufferStructType() const;
-};
-class ThreadgroupBinding : public NS::Referencing<ThreadgroupBinding, Binding>
-{
-public:
-    NS::UInteger threadgroupMemoryAlignment() const;
-
-    NS::UInteger threadgroupMemoryDataSize() const;
-};
-class TextureBinding : public NS::Referencing<TextureBinding, Binding>
-{
-public:
-    NS::UInteger arrayLength() const;
-
-    [[deprecated("please use isDepthTexture instead")]]
-    bool        depthTexture() const;
-    bool        isDepthTexture() const;
-
-    DataType    textureDataType() const;
-
-    TextureType textureType() const;
-};
-class ObjectPayloadBinding : public NS::Referencing<ObjectPayloadBinding, Binding>
-{
-public:
-    NS::UInteger objectPayloadAlignment() const;
-
-    NS::UInteger objectPayloadDataSize() const;
-};
-class TensorBinding : public NS::Referencing<TensorBinding, Binding>
-{
-public:
-    TensorExtents* dimensions() const;
-
-    DataType       indexType() const;
-
-    TensorDataType tensorDataType() const;
-};
-
-}
-_MTL_INLINE MTL::Type* MTL::Type::alloc()
-{
-    return NS::Object::alloc<MTL::Type>(_MTL_PRIVATE_CLS(MTLType));
-}
-
-_MTL_INLINE MTL::DataType MTL::Type::dataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(dataType));
-}
-
-_MTL_INLINE MTL::Type* MTL::Type::init()
-{
-    return NS::Object::init<MTL::Type>();
-}
-
-_MTL_INLINE MTL::StructMember* MTL::StructMember::alloc()
-{
-    return NS::Object::alloc<MTL::StructMember>(_MTL_PRIVATE_CLS(MTLStructMember));
-}
-
-_MTL_INLINE NS::UInteger MTL::StructMember::argumentIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(argumentIndex));
-}
-
-_MTL_INLINE MTL::ArrayType* MTL::StructMember::arrayType()
-{
-    return Object::sendMessage<MTL::ArrayType*>(this, _MTL_PRIVATE_SEL(arrayType));
-}
-
-_MTL_INLINE MTL::DataType MTL::StructMember::dataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(dataType));
-}
-
-_MTL_INLINE MTL::StructMember* MTL::StructMember::init()
-{
-    return NS::Object::init<MTL::StructMember>();
-}
-
-_MTL_INLINE NS::String* MTL::StructMember::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE NS::UInteger MTL::StructMember::offset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(offset));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::StructMember::pointerType()
-{
-    return Object::sendMessage<MTL::PointerType*>(this, _MTL_PRIVATE_SEL(pointerType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::StructMember::structType()
-{
-    return Object::sendMessage<MTL::StructType*>(this, _MTL_PRIVATE_SEL(structType));
-}
-
-_MTL_INLINE MTL::TensorReferenceType* MTL::StructMember::tensorReferenceType()
-{
-    return Object::sendMessage<MTL::TensorReferenceType*>(this, _MTL_PRIVATE_SEL(tensorReferenceType));
-}
-
-_MTL_INLINE MTL::TextureReferenceType* MTL::StructMember::textureReferenceType()
-{
-    return Object::sendMessage<MTL::TextureReferenceType*>(this, _MTL_PRIVATE_SEL(textureReferenceType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::StructType::alloc()
-{
-    return NS::Object::alloc<MTL::StructType>(_MTL_PRIVATE_CLS(MTLStructType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::StructType::init()
-{
-    return NS::Object::init<MTL::StructType>();
-}
-
-_MTL_INLINE MTL::StructMember* MTL::StructType::memberByName(const NS::String* name)
-{
-    return Object::sendMessage<MTL::StructMember*>(this, _MTL_PRIVATE_SEL(memberByName_), name);
-}
-
-_MTL_INLINE NS::Array* MTL::StructType::members() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(members));
-}
-
-_MTL_INLINE MTL::ArrayType* MTL::ArrayType::alloc()
-{
-    return NS::Object::alloc<MTL::ArrayType>(_MTL_PRIVATE_CLS(MTLArrayType));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArrayType::argumentIndexStride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(argumentIndexStride));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArrayType::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE MTL::ArrayType* MTL::ArrayType::elementArrayType()
-{
-    return Object::sendMessage<MTL::ArrayType*>(this, _MTL_PRIVATE_SEL(elementArrayType));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::ArrayType::elementPointerType()
-{
-    return Object::sendMessage<MTL::PointerType*>(this, _MTL_PRIVATE_SEL(elementPointerType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::ArrayType::elementStructType()
-{
-    return Object::sendMessage<MTL::StructType*>(this, _MTL_PRIVATE_SEL(elementStructType));
-}
-
-_MTL_INLINE MTL::TensorReferenceType* MTL::ArrayType::elementTensorReferenceType()
-{
-    return Object::sendMessage<MTL::TensorReferenceType*>(this, _MTL_PRIVATE_SEL(elementTensorReferenceType));
-}
-
-_MTL_INLINE MTL::TextureReferenceType* MTL::ArrayType::elementTextureReferenceType()
-{
-    return Object::sendMessage<MTL::TextureReferenceType*>(this, _MTL_PRIVATE_SEL(elementTextureReferenceType));
-}
-
-_MTL_INLINE MTL::DataType MTL::ArrayType::elementType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(elementType));
-}
-
-_MTL_INLINE MTL::ArrayType* MTL::ArrayType::init()
-{
-    return NS::Object::init<MTL::ArrayType>();
-}
-
-_MTL_INLINE NS::UInteger MTL::ArrayType::stride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(stride));
-}
-
-_MTL_INLINE MTL::BindingAccess MTL::PointerType::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE NS::UInteger MTL::PointerType::alignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(alignment));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::PointerType::alloc()
-{
-    return NS::Object::alloc<MTL::PointerType>(_MTL_PRIVATE_CLS(MTLPointerType));
-}
-
-_MTL_INLINE NS::UInteger MTL::PointerType::dataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(dataSize));
-}
-
-_MTL_INLINE MTL::ArrayType* MTL::PointerType::elementArrayType()
-{
-    return Object::sendMessage<MTL::ArrayType*>(this, _MTL_PRIVATE_SEL(elementArrayType));
-}
-
-_MTL_INLINE bool MTL::PointerType::elementIsArgumentBuffer() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(elementIsArgumentBuffer));
-}
-
-_MTL_INLINE MTL::StructType* MTL::PointerType::elementStructType()
-{
-    return Object::sendMessage<MTL::StructType*>(this, _MTL_PRIVATE_SEL(elementStructType));
-}
-
-_MTL_INLINE MTL::DataType MTL::PointerType::elementType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(elementType));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::PointerType::init()
-{
-    return NS::Object::init<MTL::PointerType>();
-}
-
-_MTL_INLINE MTL::BindingAccess MTL::TextureReferenceType::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE MTL::TextureReferenceType* MTL::TextureReferenceType::alloc()
-{
-    return NS::Object::alloc<MTL::TextureReferenceType>(_MTL_PRIVATE_CLS(MTLTextureReferenceType));
-}
-
-_MTL_INLINE MTL::TextureReferenceType* MTL::TextureReferenceType::init()
-{
-    return NS::Object::init<MTL::TextureReferenceType>();
-}
-
-_MTL_INLINE bool MTL::TextureReferenceType::isDepthTexture() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthTexture));
-}
-
-_MTL_INLINE MTL::DataType MTL::TextureReferenceType::textureDataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(textureDataType));
-}
-
-_MTL_INLINE MTL::TextureType MTL::TextureReferenceType::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE MTL::BindingAccess MTL::TensorReferenceType::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE MTL::TensorReferenceType* MTL::TensorReferenceType::alloc()
-{
-    return NS::Object::alloc<MTL::TensorReferenceType>(_MTL_PRIVATE_CLS(MTLTensorReferenceType));
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorReferenceType::dimensions() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(dimensions));
-}
-
-_MTL_INLINE MTL::DataType MTL::TensorReferenceType::indexType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::TensorReferenceType* MTL::TensorReferenceType::init()
-{
-    return NS::Object::init<MTL::TensorReferenceType>();
-}
-
-_MTL_INLINE MTL::TensorDataType MTL::TensorReferenceType::tensorDataType() const
-{
-    return Object::sendMessage<MTL::TensorDataType>(this, _MTL_PRIVATE_SEL(tensorDataType));
-}
-
-_MTL_INLINE MTL::BindingAccess MTL::Argument::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE bool MTL::Argument::active() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE MTL::Argument* MTL::Argument::alloc()
-{
-    return NS::Object::alloc<MTL::Argument>(_MTL_PRIVATE_CLS(MTLArgument));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::bufferAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferAlignment));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::bufferDataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferDataSize));
-}
-
-_MTL_INLINE MTL::DataType MTL::Argument::bufferDataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(bufferDataType));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::Argument::bufferPointerType() const
-{
-    return Object::sendMessage<MTL::PointerType*>(this, _MTL_PRIVATE_SEL(bufferPointerType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::Argument::bufferStructType() const
-{
-    return Object::sendMessage<MTL::StructType*>(this, _MTL_PRIVATE_SEL(bufferStructType));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::index() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(index));
-}
-
-_MTL_INLINE MTL::Argument* MTL::Argument::init()
-{
-    return NS::Object::init<MTL::Argument>();
-}
-
-_MTL_INLINE bool MTL::Argument::isActive() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE bool MTL::Argument::isDepthTexture() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthTexture));
-}
-
-_MTL_INLINE NS::String* MTL::Argument::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::DataType MTL::Argument::textureDataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(textureDataType));
-}
-
-_MTL_INLINE MTL::TextureType MTL::Argument::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::threadgroupMemoryAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryAlignment));
-}
-
-_MTL_INLINE NS::UInteger MTL::Argument::threadgroupMemoryDataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryDataSize));
-}
-
-_MTL_INLINE MTL::ArgumentType MTL::Argument::type() const
-{
-    return Object::sendMessage<MTL::ArgumentType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE MTL::BindingAccess MTL::Binding::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE bool MTL::Binding::argument() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isArgument));
-}
-
-_MTL_INLINE NS::UInteger MTL::Binding::index() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(index));
-}
-
-_MTL_INLINE bool MTL::Binding::isArgument() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isArgument));
-}
-
-_MTL_INLINE bool MTL::Binding::isUsed() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isUsed));
-}
-
-_MTL_INLINE NS::String* MTL::Binding::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::BindingType MTL::Binding::type() const
-{
-    return Object::sendMessage<MTL::BindingType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE bool MTL::Binding::used() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isUsed));
-}
-
-_MTL_INLINE NS::UInteger MTL::BufferBinding::bufferAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferAlignment));
-}
-
-_MTL_INLINE NS::UInteger MTL::BufferBinding::bufferDataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferDataSize));
-}
-
-_MTL_INLINE MTL::DataType MTL::BufferBinding::bufferDataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(bufferDataType));
-}
-
-_MTL_INLINE MTL::PointerType* MTL::BufferBinding::bufferPointerType() const
-{
-    return Object::sendMessage<MTL::PointerType*>(this, _MTL_PRIVATE_SEL(bufferPointerType));
-}
-
-_MTL_INLINE MTL::StructType* MTL::BufferBinding::bufferStructType() const
-{
-    return Object::sendMessage<MTL::StructType*>(this, _MTL_PRIVATE_SEL(bufferStructType));
-}
-
-_MTL_INLINE NS::UInteger MTL::ThreadgroupBinding::threadgroupMemoryAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryAlignment));
-}
-
-_MTL_INLINE NS::UInteger MTL::ThreadgroupBinding::threadgroupMemoryDataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryDataSize));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureBinding::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE bool MTL::TextureBinding::depthTexture() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthTexture));
-}
-
-_MTL_INLINE bool MTL::TextureBinding::isDepthTexture() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthTexture));
-}
-
-_MTL_INLINE MTL::DataType MTL::TextureBinding::textureDataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(textureDataType));
-}
-
-_MTL_INLINE MTL::TextureType MTL::TextureBinding::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE NS::UInteger MTL::ObjectPayloadBinding::objectPayloadAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(objectPayloadAlignment));
-}
-
-_MTL_INLINE NS::UInteger MTL::ObjectPayloadBinding::objectPayloadDataSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(objectPayloadDataSize));
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorBinding::dimensions() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(dimensions));
-}
-
-_MTL_INLINE MTL::DataType MTL::TensorBinding::indexType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::TensorDataType MTL::TensorBinding::tensorDataType() const
-{
-    return Object::sendMessage<MTL::TensorDataType>(this, _MTL_PRIVATE_SEL(tensorDataType));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLArgumentEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLArgumentEncoder.hpp
deleted file mode 100644
index 83dbbc20..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLArgumentEncoder.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLArgumentEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLDepthStencil.hpp"
-
-namespace MTL
-{
-class AccelerationStructure;
-class ArgumentEncoder;
-class Buffer;
-class ComputePipelineState;
-class Device;
-class IndirectCommandBuffer;
-class IntersectionFunctionTable;
-class RenderPipelineState;
-class SamplerState;
-class Texture;
-class VisibleFunctionTable;
-
-static const NS::UInteger AttributeStrideStatic = NS::UIntegerMax;
-
-class ArgumentEncoder : public NS::Referencing<ArgumentEncoder>
-{
-public:
-    NS::UInteger     alignment() const;
-
-    void*            constantData(NS::UInteger index);
-
-    Device*          device() const;
-
-    NS::UInteger     encodedLength() const;
-
-    NS::String*      label() const;
-
-    ArgumentEncoder* newArgumentEncoder(NS::UInteger index);
-
-    void             setAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger index);
-
-    void             setArgumentBuffer(const MTL::Buffer* argumentBuffer, NS::UInteger offset);
-    void             setArgumentBuffer(const MTL::Buffer* argumentBuffer, NS::UInteger startOffset, NS::UInteger arrayElement);
-
-    void             setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void             setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range);
-
-    void             setComputePipelineState(const MTL::ComputePipelineState* pipeline, NS::UInteger index);
-    void             setComputePipelineStates(const MTL::ComputePipelineState* const pipelines[], NS::Range range);
-
-    void             setDepthStencilState(const MTL::DepthStencilState* depthStencilState, NS::UInteger index);
-    void             setDepthStencilStates(const MTL::DepthStencilState* const depthStencilStates[], NS::Range range);
-
-    void             setIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::UInteger index);
-    void             setIndirectCommandBuffers(const MTL::IndirectCommandBuffer* const buffers[], NS::Range range);
-
-    void             setIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger index);
-    void             setIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range);
-
-    void             setLabel(const NS::String* label);
-
-    void             setRenderPipelineState(const MTL::RenderPipelineState* pipeline, NS::UInteger index);
-    void             setRenderPipelineStates(const MTL::RenderPipelineState* const pipelines[], NS::Range range);
-
-    void             setSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void             setSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-
-    void             setTexture(const MTL::Texture* texture, NS::UInteger index);
-    void             setTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void             setVisibleFunctionTable(const MTL::VisibleFunctionTable* visibleFunctionTable, NS::UInteger index);
-    void             setVisibleFunctionTables(const MTL::VisibleFunctionTable* const visibleFunctionTables[], NS::Range range);
-};
-
-}
-
-_MTL_INLINE NS::UInteger MTL::ArgumentEncoder::alignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(alignment));
-}
-
-_MTL_INLINE void* MTL::ArgumentEncoder::constantData(NS::UInteger index)
-{
-    return Object::sendMessage<void*>(this, _MTL_PRIVATE_SEL(constantDataAtIndex_), index);
-}
-
-_MTL_INLINE MTL::Device* MTL::ArgumentEncoder::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArgumentEncoder::encodedLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(encodedLength));
-}
-
-_MTL_INLINE NS::String* MTL::ArgumentEncoder::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::ArgumentEncoder* MTL::ArgumentEncoder::newArgumentEncoder(NS::UInteger index)
-{
-    return Object::sendMessage<MTL::ArgumentEncoder*>(this, _MTL_PRIVATE_SEL(newArgumentEncoderForBufferAtIndex_), index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAccelerationStructure_atIndex_), accelerationStructure, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setArgumentBuffer(const MTL::Buffer* argumentBuffer, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentBuffer_offset_), argumentBuffer, offset);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setArgumentBuffer(const MTL::Buffer* argumentBuffer, NS::UInteger startOffset, NS::UInteger arrayElement)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentBuffer_startOffset_arrayElement_), argumentBuffer, startOffset, arrayElement);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setComputePipelineState(const MTL::ComputePipelineState* pipeline, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputePipelineState_atIndex_), pipeline, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setComputePipelineStates(const MTL::ComputePipelineState* const pipelines[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputePipelineStates_withRange_), pipelines, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setDepthStencilState(const MTL::DepthStencilState* depthStencilState, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilState_atIndex_), depthStencilState, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setDepthStencilStates(const MTL::DepthStencilState* const depthStencilStates[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilStates_withRange_), depthStencilStates, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndirectCommandBuffer_atIndex_), indirectCommandBuffer, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setIndirectCommandBuffers(const MTL::IndirectCommandBuffer* const buffers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndirectCommandBuffers_withRange_), buffers, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTable_atIndex_), intersectionFunctionTable, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTables_withRange_), intersectionFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setRenderPipelineState(const MTL::RenderPipelineState* pipeline, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderPipelineState_atIndex_), pipeline, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setRenderPipelineStates(const MTL::RenderPipelineState* const pipelines[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderPipelineStates_withRange_), pipelines, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setVisibleFunctionTable(const MTL::VisibleFunctionTable* visibleFunctionTable, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTable_atIndex_), visibleFunctionTable, index);
-}
-
-_MTL_INLINE void MTL::ArgumentEncoder::setVisibleFunctionTables(const MTL::VisibleFunctionTable* const visibleFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTables_withRange_), visibleFunctionTables, range);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLBinaryArchive.hpp b/engine/thirdparty/metal-cpp/Metal/MTLBinaryArchive.hpp
deleted file mode 100644
index c3f16895..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLBinaryArchive.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLBinaryArchive.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class BinaryArchiveDescriptor;
-class ComputePipelineDescriptor;
-class Device;
-class FunctionDescriptor;
-class Library;
-class MeshRenderPipelineDescriptor;
-class RenderPipelineDescriptor;
-class StitchedLibraryDescriptor;
-class TileRenderPipelineDescriptor;
-_MTL_ENUM(NS::UInteger, BinaryArchiveError) {
-    BinaryArchiveErrorNone = 0,
-    BinaryArchiveErrorInvalidFile = 1,
-    BinaryArchiveErrorUnexpectedElement = 2,
-    BinaryArchiveErrorCompilationFailure = 3,
-    BinaryArchiveErrorInternalError = 4,
-};
-
-_MTL_CONST(NS::ErrorDomain, BinaryArchiveDomain);
-class BinaryArchiveDescriptor : public NS::Copying<BinaryArchiveDescriptor>
-{
-public:
-    static BinaryArchiveDescriptor* alloc();
-
-    BinaryArchiveDescriptor*        init();
-
-    void                            setUrl(const NS::URL* url);
-    NS::URL*                        url() const;
-};
-class BinaryArchive : public NS::Referencing<BinaryArchive>
-{
-public:
-    bool        addComputePipelineFunctions(const MTL::ComputePipelineDescriptor* descriptor, NS::Error** error);
-
-    bool        addFunction(const MTL::FunctionDescriptor* descriptor, const MTL::Library* library, NS::Error** error);
-
-    bool        addLibrary(const MTL::StitchedLibraryDescriptor* descriptor, NS::Error** error);
-
-    bool        addMeshRenderPipelineFunctions(const MTL::MeshRenderPipelineDescriptor* descriptor, NS::Error** error);
-
-    bool        addRenderPipelineFunctions(const MTL::RenderPipelineDescriptor* descriptor, NS::Error** error);
-
-    bool        addTileRenderPipelineFunctions(const MTL::TileRenderPipelineDescriptor* descriptor, NS::Error** error);
-
-    Device*     device() const;
-
-    NS::String* label() const;
-
-    bool        serializeToURL(const NS::URL* url, NS::Error** error);
-
-    void        setLabel(const NS::String* label);
-};
-
-}
-_MTL_PRIVATE_DEF_CONST(NS::ErrorDomain, BinaryArchiveDomain);
-_MTL_INLINE MTL::BinaryArchiveDescriptor* MTL::BinaryArchiveDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::BinaryArchiveDescriptor>(_MTL_PRIVATE_CLS(MTLBinaryArchiveDescriptor));
-}
-
-_MTL_INLINE MTL::BinaryArchiveDescriptor* MTL::BinaryArchiveDescriptor::init()
-{
-    return NS::Object::init<MTL::BinaryArchiveDescriptor>();
-}
-
-_MTL_INLINE void MTL::BinaryArchiveDescriptor::setUrl(const NS::URL* url)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setUrl_), url);
-}
-
-_MTL_INLINE NS::URL* MTL::BinaryArchiveDescriptor::url() const
-{
-    return Object::sendMessage<NS::URL*>(this, _MTL_PRIVATE_SEL(url));
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addComputePipelineFunctions(const MTL::ComputePipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addComputePipelineFunctionsWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addFunction(const MTL::FunctionDescriptor* descriptor, const MTL::Library* library, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addFunctionWithDescriptor_library_error_), descriptor, library, error);
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addLibrary(const MTL::StitchedLibraryDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addLibraryWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addMeshRenderPipelineFunctions(const MTL::MeshRenderPipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addMeshRenderPipelineFunctionsWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addRenderPipelineFunctions(const MTL::RenderPipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addRenderPipelineFunctionsWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::addTileRenderPipelineFunctions(const MTL::TileRenderPipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(addTileRenderPipelineFunctionsWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::Device* MTL::BinaryArchive::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::BinaryArchive::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE bool MTL::BinaryArchive::serializeToURL(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(serializeToURL_error_), url, error);
-}
-
-_MTL_INLINE void MTL::BinaryArchive::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLBlitCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLBlitCommandEncoder.hpp
deleted file mode 100644
index 319f05ef..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLBlitCommandEncoder.hpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLBlitCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Buffer;
-class CounterSampleBuffer;
-class Fence;
-class IndirectCommandBuffer;
-class Resource;
-class Tensor;
-class TensorExtents;
-class Texture;
-
-_MTL_OPTIONS(NS::UInteger, BlitOption) {
-    BlitOptionNone = 0,
-    BlitOptionDepthFromDepthStencil = 1,
-    BlitOptionStencilFromDepthStencil = 1 << 1,
-    BlitOptionRowLinearPVRTC = 1 << 2,
-};
-
-class BlitCommandEncoder : public NS::Referencing<BlitCommandEncoder, CommandEncoder>
-{
-public:
-    void copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin);
-    void copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin, MTL::BlitOption options);
-    void copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger size);
-
-    void copyFromTensor(const MTL::Tensor* sourceTensor, const MTL::TensorExtents* sourceOrigin, const MTL::TensorExtents* sourceDimensions, const MTL::Tensor* destinationTensor, const MTL::TensorExtents* destinationOrigin, const MTL::TensorExtents* destinationDimensions);
-
-    void copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin);
-    void copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage);
-    void copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage, MTL::BlitOption options);
-    void copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, NS::UInteger sliceCount, NS::UInteger levelCount);
-    void copyFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture);
-
-    void copyIndirectCommandBuffer(const MTL::IndirectCommandBuffer* source, NS::Range sourceRange, const MTL::IndirectCommandBuffer* destination, NS::UInteger destinationIndex);
-
-    void fillBuffer(const MTL::Buffer* buffer, NS::Range range, uint8_t value);
-
-    void generateMipmaps(const MTL::Texture* texture);
-
-    void getTextureAccessCounters(const MTL::Texture* texture, MTL::Region region, NS::UInteger mipLevel, NS::UInteger slice, bool resetCounters, const MTL::Buffer* countersBuffer, NS::UInteger countersBufferOffset);
-
-    void optimizeContentsForCPUAccess(const MTL::Texture* texture);
-    void optimizeContentsForCPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level);
-
-    void optimizeContentsForGPUAccess(const MTL::Texture* texture);
-    void optimizeContentsForGPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level);
-
-    void optimizeIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range range);
-
-    void resetCommandsInBuffer(const MTL::IndirectCommandBuffer* buffer, NS::Range range);
-
-    void resetTextureAccessCounters(const MTL::Texture* texture, MTL::Region region, NS::UInteger mipLevel, NS::UInteger slice);
-
-    void resolveCounters(const MTL::CounterSampleBuffer* sampleBuffer, NS::Range range, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset);
-
-    void sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier);
-
-    void synchronizeResource(const MTL::Resource* resource);
-
-    void synchronizeTexture(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level);
-
-    void updateFence(const MTL::Fence* fence);
-
-    void waitForFence(const MTL::Fence* fence);
-};
-
-}
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_), sourceBuffer, sourceOffset, sourceBytesPerRow, sourceBytesPerImage, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin, MTL::BlitOption options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_options_), sourceBuffer, sourceOffset, sourceBytesPerRow, sourceBytesPerImage, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin, options);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromBuffer(const MTL::Buffer* sourceBuffer, NS::UInteger sourceOffset, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger size)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromBuffer_sourceOffset_toBuffer_destinationOffset_size_), sourceBuffer, sourceOffset, destinationBuffer, destinationOffset, size);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTensor(const MTL::Tensor* sourceTensor, const MTL::TensorExtents* sourceOrigin, const MTL::TensorExtents* sourceDimensions, const MTL::Tensor* destinationTensor, const MTL::TensorExtents* destinationOrigin, const MTL::TensorExtents* destinationDimensions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTensor_sourceOrigin_sourceDimensions_toTensor_destinationOrigin_destinationDimensions_), sourceTensor, sourceOrigin, sourceDimensions, destinationTensor, destinationOrigin, destinationDimensions);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationBuffer, destinationOffset, destinationBytesPerRow, destinationBytesPerImage);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset, NS::UInteger destinationBytesPerRow, NS::UInteger destinationBytesPerImage, MTL::BlitOption options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_options_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationBuffer, destinationOffset, destinationBytesPerRow, destinationBytesPerImage, options);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, NS::UInteger sliceCount, NS::UInteger levelCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_sourceSlice_sourceLevel_toTexture_destinationSlice_destinationLevel_sliceCount_levelCount_), sourceTexture, sourceSlice, sourceLevel, destinationTexture, destinationSlice, destinationLevel, sliceCount, levelCount);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyFromTexture(const MTL::Texture* sourceTexture, const MTL::Texture* destinationTexture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyFromTexture_toTexture_), sourceTexture, destinationTexture);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::copyIndirectCommandBuffer(const MTL::IndirectCommandBuffer* source, NS::Range sourceRange, const MTL::IndirectCommandBuffer* destination, NS::UInteger destinationIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyIndirectCommandBuffer_sourceRange_destination_destinationIndex_), source, sourceRange, destination, destinationIndex);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::fillBuffer(const MTL::Buffer* buffer, NS::Range range, uint8_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(fillBuffer_range_value_), buffer, range, value);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::generateMipmaps(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(generateMipmapsForTexture_), texture);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::getTextureAccessCounters(const MTL::Texture* texture, MTL::Region region, NS::UInteger mipLevel, NS::UInteger slice, bool resetCounters, const MTL::Buffer* countersBuffer, NS::UInteger countersBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(getTextureAccessCounters_region_mipLevel_slice_resetCounters_countersBuffer_countersBufferOffset_), texture, region, mipLevel, slice, resetCounters, countersBuffer, countersBufferOffset);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::optimizeContentsForCPUAccess(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForCPUAccess_), texture);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::optimizeContentsForCPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForCPUAccess_slice_level_), texture, slice, level);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::optimizeContentsForGPUAccess(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForGPUAccess_), texture);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::optimizeContentsForGPUAccess(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeContentsForGPUAccess_slice_level_), texture, slice, level);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::optimizeIndirectCommandBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(optimizeIndirectCommandBuffer_withRange_), indirectCommandBuffer, range);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::resetCommandsInBuffer(const MTL::IndirectCommandBuffer* buffer, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resetCommandsInBuffer_withRange_), buffer, range);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::resetTextureAccessCounters(const MTL::Texture* texture, MTL::Region region, NS::UInteger mipLevel, NS::UInteger slice)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resetTextureAccessCounters_region_mipLevel_slice_), texture, region, mipLevel, slice);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::resolveCounters(const MTL::CounterSampleBuffer* sampleBuffer, NS::Range range, const MTL::Buffer* destinationBuffer, NS::UInteger destinationOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resolveCounters_inRange_destinationBuffer_destinationOffset_), sampleBuffer, range, destinationBuffer, destinationOffset);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(sampleCountersInBuffer_atSampleIndex_withBarrier_), sampleBuffer, sampleIndex, barrier);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::synchronizeResource(const MTL::Resource* resource)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(synchronizeResource_), resource);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::synchronizeTexture(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(synchronizeTexture_slice_level_), texture, slice, level);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::updateFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_), fence);
-}
-
-_MTL_INLINE void MTL::BlitCommandEncoder::waitForFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_), fence);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLBlitPass.hpp b/engine/thirdparty/metal-cpp/Metal/MTLBlitPass.hpp
deleted file mode 100644
index 6b15e0b5..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLBlitPass.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLBlitPass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class BlitPassDescriptor;
-class BlitPassSampleBufferAttachmentDescriptor;
-class BlitPassSampleBufferAttachmentDescriptorArray;
-class CounterSampleBuffer;
-
-class BlitPassSampleBufferAttachmentDescriptor : public NS::Copying<BlitPassSampleBufferAttachmentDescriptor>
-{
-public:
-    static BlitPassSampleBufferAttachmentDescriptor* alloc();
-
-    NS::UInteger                                     endOfEncoderSampleIndex() const;
-
-    BlitPassSampleBufferAttachmentDescriptor*        init();
-
-    CounterSampleBuffer*                             sampleBuffer() const;
-
-    void                                             setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex);
-
-    void                                             setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer);
-
-    void                                             setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex);
-    NS::UInteger                                     startOfEncoderSampleIndex() const;
-};
-class BlitPassSampleBufferAttachmentDescriptorArray : public NS::Referencing<BlitPassSampleBufferAttachmentDescriptorArray>
-{
-public:
-    static BlitPassSampleBufferAttachmentDescriptorArray* alloc();
-
-    BlitPassSampleBufferAttachmentDescriptorArray*        init();
-
-    BlitPassSampleBufferAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                  setObject(const MTL::BlitPassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class BlitPassDescriptor : public NS::Copying<BlitPassDescriptor>
-{
-public:
-    static BlitPassDescriptor*                     alloc();
-
-    static BlitPassDescriptor*                     blitPassDescriptor();
-
-    BlitPassDescriptor*                            init();
-
-    BlitPassSampleBufferAttachmentDescriptorArray* sampleBufferAttachments() const;
-};
-
-}
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptor* MTL::BlitPassSampleBufferAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::BlitPassSampleBufferAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLBlitPassSampleBufferAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::BlitPassSampleBufferAttachmentDescriptor::endOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptor* MTL::BlitPassSampleBufferAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::BlitPassSampleBufferAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::BlitPassSampleBufferAttachmentDescriptor::sampleBuffer() const
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(sampleBuffer));
-}
-
-_MTL_INLINE void MTL::BlitPassSampleBufferAttachmentDescriptor::setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfEncoderSampleIndex_), endOfEncoderSampleIndex);
-}
-
-_MTL_INLINE void MTL::BlitPassSampleBufferAttachmentDescriptor::setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleBuffer_), sampleBuffer);
-}
-
-_MTL_INLINE void MTL::BlitPassSampleBufferAttachmentDescriptor::setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfEncoderSampleIndex_), startOfEncoderSampleIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::BlitPassSampleBufferAttachmentDescriptor::startOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptorArray* MTL::BlitPassSampleBufferAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::BlitPassSampleBufferAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLBlitPassSampleBufferAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptorArray* MTL::BlitPassSampleBufferAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::BlitPassSampleBufferAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptor* MTL::BlitPassSampleBufferAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::BlitPassSampleBufferAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::BlitPassSampleBufferAttachmentDescriptorArray::setObject(const MTL::BlitPassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::BlitPassDescriptor* MTL::BlitPassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::BlitPassDescriptor>(_MTL_PRIVATE_CLS(MTLBlitPassDescriptor));
-}
-
-_MTL_INLINE MTL::BlitPassDescriptor* MTL::BlitPassDescriptor::blitPassDescriptor()
-{
-    return Object::sendMessage<MTL::BlitPassDescriptor*>(_MTL_PRIVATE_CLS(MTLBlitPassDescriptor), _MTL_PRIVATE_SEL(blitPassDescriptor));
-}
-
-_MTL_INLINE MTL::BlitPassDescriptor* MTL::BlitPassDescriptor::init()
-{
-    return NS::Object::init<MTL::BlitPassDescriptor>();
-}
-
-_MTL_INLINE MTL::BlitPassSampleBufferAttachmentDescriptorArray* MTL::BlitPassDescriptor::sampleBufferAttachments() const
-{
-    return Object::sendMessage<MTL::BlitPassSampleBufferAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(sampleBufferAttachments));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLBuffer.hpp b/engine/thirdparty/metal-cpp/Metal/MTLBuffer.hpp
deleted file mode 100644
index a93be1b0..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLBuffer.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLBuffer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLGPUAddress.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-
-namespace MTL
-{
-class Buffer;
-class Device;
-class Tensor;
-class TensorDescriptor;
-class Texture;
-class TextureDescriptor;
-
-class Buffer : public NS::Referencing<Buffer, Resource>
-{
-public:
-    void             addDebugMarker(const NS::String* marker, NS::Range range);
-
-    void*            contents();
-
-    void             didModifyRange(NS::Range range);
-
-    GPUAddress       gpuAddress() const;
-
-    NS::UInteger     length() const;
-
-    Buffer*          newRemoteBufferViewForDevice(const MTL::Device* device);
-
-    Tensor*          newTensor(const MTL::TensorDescriptor* descriptor, NS::UInteger offset, NS::Error** error);
-
-    Texture*         newTexture(const MTL::TextureDescriptor* descriptor, NS::UInteger offset, NS::UInteger bytesPerRow);
-
-    Buffer*          remoteStorageBuffer() const;
-
-    void             removeAllDebugMarkers();
-
-    BufferSparseTier sparseBufferTier() const;
-};
-
-}
-_MTL_INLINE void MTL::Buffer::addDebugMarker(const NS::String* marker, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addDebugMarker_range_), marker, range);
-}
-
-_MTL_INLINE void* MTL::Buffer::contents()
-{
-    return Object::sendMessage<void*>(this, _MTL_PRIVATE_SEL(contents));
-}
-
-_MTL_INLINE void MTL::Buffer::didModifyRange(NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(didModifyRange_), range);
-}
-
-_MTL_INLINE MTL::GPUAddress MTL::Buffer::gpuAddress() const
-{
-    return Object::sendMessage<MTL::GPUAddress>(this, _MTL_PRIVATE_SEL(gpuAddress));
-}
-
-_MTL_INLINE NS::UInteger MTL::Buffer::length() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(length));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Buffer::newRemoteBufferViewForDevice(const MTL::Device* device)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newRemoteBufferViewForDevice_), device);
-}
-
-_MTL_INLINE MTL::Tensor* MTL::Buffer::newTensor(const MTL::TensorDescriptor* descriptor, NS::UInteger offset, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Tensor*>(this, _MTL_PRIVATE_SEL(newTensorWithDescriptor_offset_error_), descriptor, offset, error);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Buffer::newTexture(const MTL::TextureDescriptor* descriptor, NS::UInteger offset, NS::UInteger bytesPerRow)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureWithDescriptor_offset_bytesPerRow_), descriptor, offset, bytesPerRow);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Buffer::remoteStorageBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(remoteStorageBuffer));
-}
-
-_MTL_INLINE void MTL::Buffer::removeAllDebugMarkers()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeAllDebugMarkers));
-}
-
-_MTL_INLINE MTL::BufferSparseTier MTL::Buffer::sparseBufferTier() const
-{
-    return Object::sendMessage<MTL::BufferSparseTier>(this, _MTL_PRIVATE_SEL(sparseBufferTier));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCaptureManager.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCaptureManager.hpp
deleted file mode 100644
index a7622418..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCaptureManager.hpp
+++ /dev/null
@@ -1,217 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCaptureManager.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class CaptureDescriptor;
-class CaptureManager;
-class CaptureScope;
-class CommandQueue;
-class Device;
-}
-
-namespace MTL4
-{
-class CommandQueue;
-}
-
-namespace MTL
-{
-_MTL_ENUM(NS::Integer, CaptureError) {
-    CaptureErrorNotSupported = 1,
-    CaptureErrorAlreadyCapturing = 2,
-    CaptureErrorInvalidDescriptor = 3,
-};
-
-_MTL_ENUM(NS::Integer, CaptureDestination) {
-    CaptureDestinationDeveloperTools = 1,
-    CaptureDestinationGPUTraceDocument = 2,
-};
-
-class CaptureDescriptor : public NS::Copying<CaptureDescriptor>
-{
-public:
-    static CaptureDescriptor* alloc();
-
-    NS::Object*               captureObject() const;
-
-    CaptureDestination        destination() const;
-
-    CaptureDescriptor*        init();
-
-    NS::URL*                  outputURL() const;
-
-    void                      setCaptureObject(NS::Object* captureObject);
-
-    void                      setDestination(MTL::CaptureDestination destination);
-
-    void                      setOutputURL(const NS::URL* outputURL);
-};
-class CaptureManager : public NS::Referencing<CaptureManager>
-{
-public:
-    static CaptureManager* alloc();
-
-    CaptureScope*          defaultCaptureScope() const;
-
-    CaptureManager*        init();
-
-    bool                   isCapturing() const;
-
-    CaptureScope*          newCaptureScope(const MTL::Device* device);
-    CaptureScope*          newCaptureScope(const MTL::CommandQueue* commandQueue);
-    CaptureScope*          newCaptureScope(const MTL4::CommandQueue* commandQueue);
-
-    void                   setDefaultCaptureScope(const MTL::CaptureScope* defaultCaptureScope);
-
-    static CaptureManager* sharedCaptureManager();
-
-    bool                   startCapture(const MTL::CaptureDescriptor* descriptor, NS::Error** error);
-    void                   startCapture(const MTL::Device* device);
-    void                   startCapture(const MTL::CommandQueue* commandQueue);
-    void                   startCapture(const MTL::CaptureScope* captureScope);
-
-    void                   stopCapture();
-
-    bool                   supportsDestination(MTL::CaptureDestination destination);
-};
-
-}
-_MTL_INLINE MTL::CaptureDescriptor* MTL::CaptureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::CaptureDescriptor>(_MTL_PRIVATE_CLS(MTLCaptureDescriptor));
-}
-
-_MTL_INLINE NS::Object* MTL::CaptureDescriptor::captureObject() const
-{
-    return Object::sendMessage<NS::Object*>(this, _MTL_PRIVATE_SEL(captureObject));
-}
-
-_MTL_INLINE MTL::CaptureDestination MTL::CaptureDescriptor::destination() const
-{
-    return Object::sendMessage<MTL::CaptureDestination>(this, _MTL_PRIVATE_SEL(destination));
-}
-
-_MTL_INLINE MTL::CaptureDescriptor* MTL::CaptureDescriptor::init()
-{
-    return NS::Object::init<MTL::CaptureDescriptor>();
-}
-
-_MTL_INLINE NS::URL* MTL::CaptureDescriptor::outputURL() const
-{
-    return Object::sendMessage<NS::URL*>(this, _MTL_PRIVATE_SEL(outputURL));
-}
-
-_MTL_INLINE void MTL::CaptureDescriptor::setCaptureObject(NS::Object* captureObject)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCaptureObject_), captureObject);
-}
-
-_MTL_INLINE void MTL::CaptureDescriptor::setDestination(MTL::CaptureDestination destination)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDestination_), destination);
-}
-
-_MTL_INLINE void MTL::CaptureDescriptor::setOutputURL(const NS::URL* outputURL)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOutputURL_), outputURL);
-}
-
-_MTL_INLINE MTL::CaptureManager* MTL::CaptureManager::alloc()
-{
-    return NS::Object::alloc<MTL::CaptureManager>(_MTL_PRIVATE_CLS(MTLCaptureManager));
-}
-
-_MTL_INLINE MTL::CaptureScope* MTL::CaptureManager::defaultCaptureScope() const
-{
-    return Object::sendMessage<MTL::CaptureScope*>(this, _MTL_PRIVATE_SEL(defaultCaptureScope));
-}
-
-_MTL_INLINE MTL::CaptureManager* MTL::CaptureManager::init()
-{
-    return NS::Object::init<MTL::CaptureManager>();
-}
-
-_MTL_INLINE bool MTL::CaptureManager::isCapturing() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isCapturing));
-}
-
-_MTL_INLINE MTL::CaptureScope* MTL::CaptureManager::newCaptureScope(const MTL::Device* device)
-{
-    return Object::sendMessage<MTL::CaptureScope*>(this, _MTL_PRIVATE_SEL(newCaptureScopeWithDevice_), device);
-}
-
-_MTL_INLINE MTL::CaptureScope* MTL::CaptureManager::newCaptureScope(const MTL::CommandQueue* commandQueue)
-{
-    return Object::sendMessage<MTL::CaptureScope*>(this, _MTL_PRIVATE_SEL(newCaptureScopeWithCommandQueue_), commandQueue);
-}
-
-_MTL_INLINE MTL::CaptureScope* MTL::CaptureManager::newCaptureScope(const MTL4::CommandQueue* commandQueue)
-{
-    return Object::sendMessage<MTL::CaptureScope*>(this, _MTL_PRIVATE_SEL(newCaptureScopeWithMTL4CommandQueue_), commandQueue);
-}
-
-_MTL_INLINE void MTL::CaptureManager::setDefaultCaptureScope(const MTL::CaptureScope* defaultCaptureScope)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDefaultCaptureScope_), defaultCaptureScope);
-}
-
-_MTL_INLINE MTL::CaptureManager* MTL::CaptureManager::sharedCaptureManager()
-{
-    return Object::sendMessage<MTL::CaptureManager*>(_MTL_PRIVATE_CLS(MTLCaptureManager), _MTL_PRIVATE_SEL(sharedCaptureManager));
-}
-
-_MTL_INLINE bool MTL::CaptureManager::startCapture(const MTL::CaptureDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(startCaptureWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE void MTL::CaptureManager::startCapture(const MTL::Device* device)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(startCaptureWithDevice_), device);
-}
-
-_MTL_INLINE void MTL::CaptureManager::startCapture(const MTL::CommandQueue* commandQueue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(startCaptureWithCommandQueue_), commandQueue);
-}
-
-_MTL_INLINE void MTL::CaptureManager::startCapture(const MTL::CaptureScope* captureScope)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(startCaptureWithScope_), captureScope);
-}
-
-_MTL_INLINE void MTL::CaptureManager::stopCapture()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(stopCapture));
-}
-
-_MTL_INLINE bool MTL::CaptureManager::supportsDestination(MTL::CaptureDestination destination)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsDestination_), destination);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCaptureScope.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCaptureScope.hpp
deleted file mode 100644
index 96ade67d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCaptureScope.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCaptureScope.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLDefines.hpp"
-#include "MTLPrivate.hpp"
-
-#include "../Foundation/Foundation.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL
-{
-class CaptureScope : public NS::Referencing<CaptureScope>
-{
-public:
-    class Device*       device() const;
-
-    NS::String*         label() const;
-    void                setLabel(const NS::String* pLabel);
-
-    class CommandQueue* commandQueue() const;
-
-    void                beginScope();
-    void                endScope();
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::Device* MTL::CaptureScope::device() const
-{
-    return Object::sendMessage<Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE NS::String* MTL::CaptureScope::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE void MTL::CaptureScope::setLabel(const NS::String* pLabel)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), pLabel);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE MTL::CommandQueue* MTL::CaptureScope::commandQueue() const
-{
-    return Object::sendMessage<CommandQueue*>(this, _MTL_PRIVATE_SEL(commandQueue));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE void MTL::CaptureScope::beginScope()
-{
-    return Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(beginScope));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTL_INLINE void MTL::CaptureScope::endScope()
-{
-    return Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(endScope));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCommandBuffer.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCommandBuffer.hpp
deleted file mode 100644
index c504573d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCommandBuffer.hpp
+++ /dev/null
@@ -1,464 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCommandBuffer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <CoreFoundation/CoreFoundation.h>
-#include <cstdint>
-
-#include <functional>
-
-namespace MTL
-{
-class AccelerationStructureCommandEncoder;
-class AccelerationStructurePassDescriptor;
-class BlitCommandEncoder;
-class BlitPassDescriptor;
-class CommandBuffer;
-class CommandBufferDescriptor;
-class CommandQueue;
-class ComputeCommandEncoder;
-class ComputePassDescriptor;
-class Device;
-class Drawable;
-class Event;
-class LogContainer;
-class LogState;
-class ParallelRenderCommandEncoder;
-class RenderCommandEncoder;
-class RenderPassDescriptor;
-class ResidencySet;
-class ResourceStateCommandEncoder;
-class ResourceStatePassDescriptor;
-_MTL_ENUM(NS::UInteger, CommandBufferStatus) {
-    CommandBufferStatusNotEnqueued = 0,
-    CommandBufferStatusEnqueued = 1,
-    CommandBufferStatusCommitted = 2,
-    CommandBufferStatusScheduled = 3,
-    CommandBufferStatusCompleted = 4,
-    CommandBufferStatusError = 5,
-};
-
-_MTL_ENUM(NS::UInteger, CommandBufferError) {
-    CommandBufferErrorNone = 0,
-    CommandBufferErrorInternal = 1,
-    CommandBufferErrorTimeout = 2,
-    CommandBufferErrorPageFault = 3,
-    CommandBufferErrorBlacklisted = 4,
-    CommandBufferErrorAccessRevoked = 4,
-    CommandBufferErrorNotPermitted = 7,
-    CommandBufferErrorOutOfMemory = 8,
-    CommandBufferErrorInvalidResource = 9,
-    CommandBufferErrorMemoryless = 10,
-    CommandBufferErrorDeviceRemoved = 11,
-    CommandBufferErrorStackOverflow = 12,
-};
-
-_MTL_ENUM(NS::Integer, CommandEncoderErrorState) {
-    CommandEncoderErrorStateUnknown = 0,
-    CommandEncoderErrorStateCompleted = 1,
-    CommandEncoderErrorStateAffected = 2,
-    CommandEncoderErrorStatePending = 3,
-    CommandEncoderErrorStateFaulted = 4,
-};
-
-_MTL_ENUM(NS::UInteger, DispatchType) {
-    DispatchTypeSerial = 0,
-    DispatchTypeConcurrent = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, CommandBufferErrorOption) {
-    CommandBufferErrorOptionNone = 0,
-    CommandBufferErrorOptionEncoderExecutionStatus = 1,
-};
-
-using CommandBufferHandler = void (^)(CommandBuffer*);
-using HandlerFunction = std::function<void(CommandBuffer*)>;
-
-class CommandBufferDescriptor : public NS::Copying<CommandBufferDescriptor>
-{
-public:
-    static CommandBufferDescriptor* alloc();
-
-    CommandBufferErrorOption        errorOptions() const;
-
-    CommandBufferDescriptor*        init();
-
-    LogState*                       logState() const;
-
-    bool                            retainedReferences() const;
-
-    void                            setErrorOptions(MTL::CommandBufferErrorOption errorOptions);
-
-    void                            setLogState(const MTL::LogState* logState);
-
-    void                            setRetainedReferences(bool retainedReferences);
-};
-class CommandBufferEncoderInfo : public NS::Referencing<CommandBufferEncoderInfo>
-{
-public:
-    NS::Array*               debugSignposts() const;
-
-    CommandEncoderErrorState errorState() const;
-
-    NS::String*              label() const;
-};
-class CommandBuffer : public NS::Referencing<CommandBuffer>
-{
-public:
-    CFTimeInterval                       GPUEndTime() const;
-
-    CFTimeInterval                       GPUStartTime() const;
-
-    AccelerationStructureCommandEncoder* accelerationStructureCommandEncoder();
-    AccelerationStructureCommandEncoder* accelerationStructureCommandEncoder(const MTL::AccelerationStructurePassDescriptor* descriptor);
-
-    void                                 addCompletedHandler(const MTL::CommandBufferHandler block);
-    void                                 addCompletedHandler(const MTL::HandlerFunction& function);
-
-    void                                 addScheduledHandler(const MTL::CommandBufferHandler block);
-    void                                 addScheduledHandler(const MTL::HandlerFunction& function);
-
-    BlitCommandEncoder*                  blitCommandEncoder();
-    BlitCommandEncoder*                  blitCommandEncoder(const MTL::BlitPassDescriptor* blitPassDescriptor);
-
-    CommandQueue*                        commandQueue() const;
-
-    void                                 commit();
-
-    ComputeCommandEncoder*               computeCommandEncoder(const MTL::ComputePassDescriptor* computePassDescriptor);
-    ComputeCommandEncoder*               computeCommandEncoder();
-    ComputeCommandEncoder*               computeCommandEncoder(MTL::DispatchType dispatchType);
-
-    Device*                              device() const;
-
-    void                                 encodeSignalEvent(const MTL::Event* event, uint64_t value);
-
-    void                                 encodeWait(const MTL::Event* event, uint64_t value);
-
-    void                                 enqueue();
-
-    NS::Error*                           error() const;
-    CommandBufferErrorOption             errorOptions() const;
-
-    CFTimeInterval                       kernelEndTime() const;
-
-    CFTimeInterval                       kernelStartTime() const;
-
-    NS::String*                          label() const;
-
-    LogContainer*                        logs() const;
-
-    ParallelRenderCommandEncoder*        parallelRenderCommandEncoder(const MTL::RenderPassDescriptor* renderPassDescriptor);
-
-    void                                 popDebugGroup();
-
-    void                                 presentDrawable(const MTL::Drawable* drawable);
-    void                                 presentDrawableAfterMinimumDuration(const MTL::Drawable* drawable, CFTimeInterval duration);
-
-    void                                 presentDrawableAtTime(const MTL::Drawable* drawable, CFTimeInterval presentationTime);
-
-    void                                 pushDebugGroup(const NS::String* string);
-
-    RenderCommandEncoder*                renderCommandEncoder(const MTL::RenderPassDescriptor* renderPassDescriptor);
-
-    ResourceStateCommandEncoder*         resourceStateCommandEncoder();
-    ResourceStateCommandEncoder*         resourceStateCommandEncoder(const MTL::ResourceStatePassDescriptor* resourceStatePassDescriptor);
-
-    bool                                 retainedReferences() const;
-
-    void                                 setLabel(const NS::String* label);
-
-    CommandBufferStatus                  status() const;
-
-    void                                 useResidencySet(const MTL::ResidencySet* residencySet);
-    void                                 useResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    void                                 waitUntilCompleted();
-
-    void                                 waitUntilScheduled();
-};
-
-}
-_MTL_INLINE MTL::CommandBufferDescriptor* MTL::CommandBufferDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::CommandBufferDescriptor>(_MTL_PRIVATE_CLS(MTLCommandBufferDescriptor));
-}
-
-_MTL_INLINE MTL::CommandBufferErrorOption MTL::CommandBufferDescriptor::errorOptions() const
-{
-    return Object::sendMessage<MTL::CommandBufferErrorOption>(this, _MTL_PRIVATE_SEL(errorOptions));
-}
-
-_MTL_INLINE MTL::CommandBufferDescriptor* MTL::CommandBufferDescriptor::init()
-{
-    return NS::Object::init<MTL::CommandBufferDescriptor>();
-}
-
-_MTL_INLINE MTL::LogState* MTL::CommandBufferDescriptor::logState() const
-{
-    return Object::sendMessage<MTL::LogState*>(this, _MTL_PRIVATE_SEL(logState));
-}
-
-_MTL_INLINE bool MTL::CommandBufferDescriptor::retainedReferences() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(retainedReferences));
-}
-
-_MTL_INLINE void MTL::CommandBufferDescriptor::setErrorOptions(MTL::CommandBufferErrorOption errorOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setErrorOptions_), errorOptions);
-}
-
-_MTL_INLINE void MTL::CommandBufferDescriptor::setLogState(const MTL::LogState* logState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLogState_), logState);
-}
-
-_MTL_INLINE void MTL::CommandBufferDescriptor::setRetainedReferences(bool retainedReferences)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRetainedReferences_), retainedReferences);
-}
-
-_MTL_INLINE NS::Array* MTL::CommandBufferEncoderInfo::debugSignposts() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(debugSignposts));
-}
-
-_MTL_INLINE MTL::CommandEncoderErrorState MTL::CommandBufferEncoderInfo::errorState() const
-{
-    return Object::sendMessage<MTL::CommandEncoderErrorState>(this, _MTL_PRIVATE_SEL(errorState));
-}
-
-_MTL_INLINE NS::String* MTL::CommandBufferEncoderInfo::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE CFTimeInterval MTL::CommandBuffer::GPUEndTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(GPUEndTime));
-}
-
-_MTL_INLINE CFTimeInterval MTL::CommandBuffer::GPUStartTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(GPUStartTime));
-}
-
-_MTL_INLINE MTL::AccelerationStructureCommandEncoder* MTL::CommandBuffer::accelerationStructureCommandEncoder()
-{
-    return Object::sendMessage<MTL::AccelerationStructureCommandEncoder*>(this, _MTL_PRIVATE_SEL(accelerationStructureCommandEncoder));
-}
-
-_MTL_INLINE MTL::AccelerationStructureCommandEncoder* MTL::CommandBuffer::accelerationStructureCommandEncoder(const MTL::AccelerationStructurePassDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::AccelerationStructureCommandEncoder*>(this, _MTL_PRIVATE_SEL(accelerationStructureCommandEncoderWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::addCompletedHandler(const MTL::CommandBufferHandler block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addCompletedHandler_), block);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::addCompletedHandler(const MTL::HandlerFunction& function)
-{
-    __block HandlerFunction blockFunction = function;
-    addCompletedHandler(^(MTL::CommandBuffer* pCommandBuffer) { blockFunction(pCommandBuffer); });
-}
-
-_MTL_INLINE void MTL::CommandBuffer::addScheduledHandler(const MTL::CommandBufferHandler block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addScheduledHandler_), block);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::addScheduledHandler(const MTL::HandlerFunction& function)
-{
-    __block HandlerFunction blockFunction = function;
-    addScheduledHandler(^(MTL::CommandBuffer* pCommandBuffer) { blockFunction(pCommandBuffer); });
-}
-
-_MTL_INLINE MTL::BlitCommandEncoder* MTL::CommandBuffer::blitCommandEncoder()
-{
-    return Object::sendMessage<MTL::BlitCommandEncoder*>(this, _MTL_PRIVATE_SEL(blitCommandEncoder));
-}
-
-_MTL_INLINE MTL::BlitCommandEncoder* MTL::CommandBuffer::blitCommandEncoder(const MTL::BlitPassDescriptor* blitPassDescriptor)
-{
-    return Object::sendMessage<MTL::BlitCommandEncoder*>(this, _MTL_PRIVATE_SEL(blitCommandEncoderWithDescriptor_), blitPassDescriptor);
-}
-
-_MTL_INLINE MTL::CommandQueue* MTL::CommandBuffer::commandQueue() const
-{
-    return Object::sendMessage<MTL::CommandQueue*>(this, _MTL_PRIVATE_SEL(commandQueue));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::commit()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(commit));
-}
-
-_MTL_INLINE MTL::ComputeCommandEncoder* MTL::CommandBuffer::computeCommandEncoder(const MTL::ComputePassDescriptor* computePassDescriptor)
-{
-    return Object::sendMessage<MTL::ComputeCommandEncoder*>(this, _MTL_PRIVATE_SEL(computeCommandEncoderWithDescriptor_), computePassDescriptor);
-}
-
-_MTL_INLINE MTL::ComputeCommandEncoder* MTL::CommandBuffer::computeCommandEncoder()
-{
-    return Object::sendMessage<MTL::ComputeCommandEncoder*>(this, _MTL_PRIVATE_SEL(computeCommandEncoder));
-}
-
-_MTL_INLINE MTL::ComputeCommandEncoder* MTL::CommandBuffer::computeCommandEncoder(MTL::DispatchType dispatchType)
-{
-    return Object::sendMessage<MTL::ComputeCommandEncoder*>(this, _MTL_PRIVATE_SEL(computeCommandEncoderWithDispatchType_), dispatchType);
-}
-
-_MTL_INLINE MTL::Device* MTL::CommandBuffer::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::encodeSignalEvent(const MTL::Event* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(encodeSignalEvent_value_), event, value);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::encodeWait(const MTL::Event* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(encodeWaitForEvent_value_), event, value);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::enqueue()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(enqueue));
-}
-
-_MTL_INLINE NS::Error* MTL::CommandBuffer::error() const
-{
-    return Object::sendMessage<NS::Error*>(this, _MTL_PRIVATE_SEL(error));
-}
-
-_MTL_INLINE MTL::CommandBufferErrorOption MTL::CommandBuffer::errorOptions() const
-{
-    return Object::sendMessage<MTL::CommandBufferErrorOption>(this, _MTL_PRIVATE_SEL(errorOptions));
-}
-
-_MTL_INLINE CFTimeInterval MTL::CommandBuffer::kernelEndTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(kernelEndTime));
-}
-
-_MTL_INLINE CFTimeInterval MTL::CommandBuffer::kernelStartTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(kernelStartTime));
-}
-
-_MTL_INLINE NS::String* MTL::CommandBuffer::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::LogContainer* MTL::CommandBuffer::logs() const
-{
-    return Object::sendMessage<MTL::LogContainer*>(this, _MTL_PRIVATE_SEL(logs));
-}
-
-_MTL_INLINE MTL::ParallelRenderCommandEncoder* MTL::CommandBuffer::parallelRenderCommandEncoder(const MTL::RenderPassDescriptor* renderPassDescriptor)
-{
-    return Object::sendMessage<MTL::ParallelRenderCommandEncoder*>(this, _MTL_PRIVATE_SEL(parallelRenderCommandEncoderWithDescriptor_), renderPassDescriptor);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::popDebugGroup()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(popDebugGroup));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::presentDrawable(const MTL::Drawable* drawable)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(presentDrawable_), drawable);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::presentDrawableAfterMinimumDuration(const MTL::Drawable* drawable, CFTimeInterval duration)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(presentDrawable_afterMinimumDuration_), drawable, duration);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::presentDrawableAtTime(const MTL::Drawable* drawable, CFTimeInterval presentationTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(presentDrawable_atTime_), drawable, presentationTime);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::pushDebugGroup(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(pushDebugGroup_), string);
-}
-
-_MTL_INLINE MTL::RenderCommandEncoder* MTL::CommandBuffer::renderCommandEncoder(const MTL::RenderPassDescriptor* renderPassDescriptor)
-{
-    return Object::sendMessage<MTL::RenderCommandEncoder*>(this, _MTL_PRIVATE_SEL(renderCommandEncoderWithDescriptor_), renderPassDescriptor);
-}
-
-_MTL_INLINE MTL::ResourceStateCommandEncoder* MTL::CommandBuffer::resourceStateCommandEncoder()
-{
-    return Object::sendMessage<MTL::ResourceStateCommandEncoder*>(this, _MTL_PRIVATE_SEL(resourceStateCommandEncoder));
-}
-
-_MTL_INLINE MTL::ResourceStateCommandEncoder* MTL::CommandBuffer::resourceStateCommandEncoder(const MTL::ResourceStatePassDescriptor* resourceStatePassDescriptor)
-{
-    return Object::sendMessage<MTL::ResourceStateCommandEncoder*>(this, _MTL_PRIVATE_SEL(resourceStateCommandEncoderWithDescriptor_), resourceStatePassDescriptor);
-}
-
-_MTL_INLINE bool MTL::CommandBuffer::retainedReferences() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(retainedReferences));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::CommandBufferStatus MTL::CommandBuffer::status() const
-{
-    return Object::sendMessage<MTL::CommandBufferStatus>(this, _MTL_PRIVATE_SEL(status));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::useResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::useResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE void MTL::CommandBuffer::waitUntilCompleted()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitUntilCompleted));
-}
-
-_MTL_INLINE void MTL::CommandBuffer::waitUntilScheduled()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitUntilScheduled));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCommandEncoder.hpp
deleted file mode 100644
index a230ff5d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCommandEncoder.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Device;
-
-_MTL_OPTIONS(NS::UInteger, ResourceUsage) {
-    ResourceUsageRead = 1,
-    ResourceUsageWrite = 1 << 1,
-    ResourceUsageSample = 1 << 2,
-};
-
-_MTL_OPTIONS(NS::UInteger, BarrierScope) {
-    BarrierScopeBuffers = 1,
-    BarrierScopeTextures = 1 << 1,
-    BarrierScopeRenderTargets = 1 << 2,
-};
-
-_MTL_OPTIONS(NS::UInteger, Stages) {
-    StageVertex = 1,
-    StageFragment = 1 << 1,
-    StageTile = 1 << 2,
-    StageObject = 1 << 3,
-    StageMesh = 1 << 4,
-    StageResourceState = 1 << 26,
-    StageDispatch = 1 << 27,
-    StageBlit = 1 << 28,
-    StageAccelerationStructure = 1 << 29,
-    StageMachineLearning = 1 << 30,
-    StageAll = 9223372036854775807,
-};
-
-class CommandEncoder : public NS::Referencing<CommandEncoder>
-{
-public:
-    void        barrierAfterQueueStages(MTL::Stages afterQueueStages, MTL::Stages beforeStages);
-
-    Device*     device() const;
-
-    void        endEncoding();
-
-    void        insertDebugSignpost(const NS::String* string);
-
-    NS::String* label() const;
-
-    void        popDebugGroup();
-
-    void        pushDebugGroup(const NS::String* string);
-
-    void        setLabel(const NS::String* label);
-};
-
-}
-_MTL_INLINE void MTL::CommandEncoder::barrierAfterQueueStages(MTL::Stages afterQueueStages, MTL::Stages beforeStages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(barrierAfterQueueStages_beforeStages_), afterQueueStages, beforeStages);
-}
-
-_MTL_INLINE MTL::Device* MTL::CommandEncoder::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE void MTL::CommandEncoder::endEncoding()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(endEncoding));
-}
-
-_MTL_INLINE void MTL::CommandEncoder::insertDebugSignpost(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(insertDebugSignpost_), string);
-}
-
-_MTL_INLINE NS::String* MTL::CommandEncoder::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::CommandEncoder::popDebugGroup()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(popDebugGroup));
-}
-
-_MTL_INLINE void MTL::CommandEncoder::pushDebugGroup(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(pushDebugGroup_), string);
-}
-
-_MTL_INLINE void MTL::CommandEncoder::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCommandQueue.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCommandQueue.hpp
deleted file mode 100644
index 5d3bf164..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCommandQueue.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCommandQueue.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class CommandBuffer;
-class CommandBufferDescriptor;
-class CommandQueueDescriptor;
-class Device;
-class LogState;
-class ResidencySet;
-
-class CommandQueue : public NS::Referencing<CommandQueue>
-{
-public:
-    void           addResidencySet(const MTL::ResidencySet* residencySet);
-    void           addResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    CommandBuffer* commandBuffer();
-    CommandBuffer* commandBuffer(const MTL::CommandBufferDescriptor* descriptor);
-    CommandBuffer* commandBufferWithUnretainedReferences();
-
-    Device*        device() const;
-
-    void           insertDebugCaptureBoundary();
-
-    NS::String*    label() const;
-
-    void           removeResidencySet(const MTL::ResidencySet* residencySet);
-    void           removeResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count);
-
-    void           setLabel(const NS::String* label);
-};
-class CommandQueueDescriptor : public NS::Copying<CommandQueueDescriptor>
-{
-public:
-    static CommandQueueDescriptor* alloc();
-
-    CommandQueueDescriptor*        init();
-
-    LogState*                      logState() const;
-
-    NS::UInteger                   maxCommandBufferCount() const;
-
-    void                           setLogState(const MTL::LogState* logState);
-
-    void                           setMaxCommandBufferCount(NS::UInteger maxCommandBufferCount);
-};
-
-}
-_MTL_INLINE void MTL::CommandQueue::addResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL::CommandQueue::addResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE MTL::CommandBuffer* MTL::CommandQueue::commandBuffer()
-{
-    return Object::sendMessage<MTL::CommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBuffer));
-}
-
-_MTL_INLINE MTL::CommandBuffer* MTL::CommandQueue::commandBuffer(const MTL::CommandBufferDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::CommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBufferWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::CommandBuffer* MTL::CommandQueue::commandBufferWithUnretainedReferences()
-{
-    return Object::sendMessage<MTL::CommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBufferWithUnretainedReferences));
-}
-
-_MTL_INLINE MTL::Device* MTL::CommandQueue::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE void MTL::CommandQueue::insertDebugCaptureBoundary()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(insertDebugCaptureBoundary));
-}
-
-_MTL_INLINE NS::String* MTL::CommandQueue::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::CommandQueue::removeResidencySet(const MTL::ResidencySet* residencySet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeResidencySet_), residencySet);
-}
-
-_MTL_INLINE void MTL::CommandQueue::removeResidencySets(const MTL::ResidencySet* const residencySets[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeResidencySets_count_), residencySets, count);
-}
-
-_MTL_INLINE void MTL::CommandQueue::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::CommandQueueDescriptor* MTL::CommandQueueDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::CommandQueueDescriptor>(_MTL_PRIVATE_CLS(MTLCommandQueueDescriptor));
-}
-
-_MTL_INLINE MTL::CommandQueueDescriptor* MTL::CommandQueueDescriptor::init()
-{
-    return NS::Object::init<MTL::CommandQueueDescriptor>();
-}
-
-_MTL_INLINE MTL::LogState* MTL::CommandQueueDescriptor::logState() const
-{
-    return Object::sendMessage<MTL::LogState*>(this, _MTL_PRIVATE_SEL(logState));
-}
-
-_MTL_INLINE NS::UInteger MTL::CommandQueueDescriptor::maxCommandBufferCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCommandBufferCount));
-}
-
-_MTL_INLINE void MTL::CommandQueueDescriptor::setLogState(const MTL::LogState* logState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLogState_), logState);
-}
-
-_MTL_INLINE void MTL::CommandQueueDescriptor::setMaxCommandBufferCount(NS::UInteger maxCommandBufferCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCommandBufferCount_), maxCommandBufferCount);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLComputeCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLComputeCommandEncoder.hpp
deleted file mode 100644
index 2f555e57..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLComputeCommandEncoder.hpp
+++ /dev/null
@@ -1,324 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLComputeCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandBuffer.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class AccelerationStructure;
-class Buffer;
-class ComputePipelineState;
-class CounterSampleBuffer;
-class Fence;
-class Heap;
-class IndirectCommandBuffer;
-class IntersectionFunctionTable;
-class Resource;
-class SamplerState;
-class Texture;
-class VisibleFunctionTable;
-
-struct DispatchThreadgroupsIndirectArguments
-{
-    uint32_t threadgroupsPerGrid[3];
-} _MTL_PACKED;
-
-struct DispatchThreadsIndirectArguments
-{
-    uint32_t threadsPerGrid[3];
-    uint32_t threadsPerThreadgroup[3];
-} _MTL_PACKED;
-
-struct StageInRegionIndirectArguments
-{
-    uint32_t stageInOrigin[3];
-    uint32_t stageInSize[3];
-} _MTL_PACKED;
-
-class ComputeCommandEncoder : public NS::Referencing<ComputeCommandEncoder, CommandEncoder>
-{
-public:
-    void         dispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup);
-    void         dispatchThreadgroups(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset, MTL::Size threadsPerThreadgroup);
-
-    void         dispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup);
-
-    DispatchType dispatchType() const;
-
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange);
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, const MTL::Buffer* indirectRangeBuffer, NS::UInteger indirectBufferOffset);
-
-    void         memoryBarrier(MTL::BarrierScope scope);
-    void         memoryBarrier(const MTL::Resource* const resources[], NS::UInteger count);
-
-    void         sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier);
-
-    void         setAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex);
-
-    void         setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-    void         setBufferOffset(NS::UInteger offset, NS::UInteger index);
-    void         setBufferOffset(NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-
-    void         setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range);
-    void         setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, const NS::UInteger* strides, NS::Range range);
-
-    void         setBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-    void         setBytes(const void* bytes, NS::UInteger length, NS::UInteger stride, NS::UInteger index);
-
-    void         setComputePipelineState(const MTL::ComputePipelineState* state);
-
-    void         setImageblockWidth(NS::UInteger width, NS::UInteger height);
-
-    void         setIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex);
-    void         setIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range);
-
-    void         setSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range);
-
-    void         setStageInRegion(MTL::Region region);
-    void         setStageInRegion(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-
-    void         setTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-
-    void         setVisibleFunctionTable(const MTL::VisibleFunctionTable* visibleFunctionTable, NS::UInteger bufferIndex);
-    void         setVisibleFunctionTables(const MTL::VisibleFunctionTable* const visibleFunctionTables[], NS::Range range);
-
-    void         updateFence(const MTL::Fence* fence);
-
-    void         useHeap(const MTL::Heap* heap);
-    void         useHeaps(const MTL::Heap* const heaps[], NS::UInteger count);
-
-    void         useResource(const MTL::Resource* resource, MTL::ResourceUsage usage);
-    void         useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage);
-
-    void         waitForFence(const MTL::Fence* fence);
-};
-
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::dispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadgroups_threadsPerThreadgroup_), threadgroupsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::dispatchThreadgroups(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadgroupsWithIndirectBuffer_indirectBufferOffset_threadsPerThreadgroup_), indirectBuffer, indirectBufferOffset, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::dispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreads_threadsPerThreadgroup_), threadsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE MTL::DispatchType MTL::ComputeCommandEncoder::dispatchType() const
-{
-    return Object::sendMessage<MTL::DispatchType>(this, _MTL_PRIVATE_SEL(dispatchType));
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_withRange_), indirectCommandBuffer, executionRange);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, const MTL::Buffer* indirectRangeBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_indirectBuffer_indirectBufferOffset_), indirectCommandbuffer, indirectRangeBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::memoryBarrier(MTL::BarrierScope scope)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(memoryBarrierWithScope_), scope);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::memoryBarrier(const MTL::Resource* const resources[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(memoryBarrierWithResources_count_), resources, count);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(sampleCountersInBuffer_atSampleIndex_withBarrier_), sampleBuffer, sampleIndex, barrier);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAccelerationStructure_atBufferIndex_), accelerationStructure, bufferIndex);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffer_offset_attributeStride_atIndex_), buffer, offset, stride, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBufferOffset(NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBufferOffset_attributeStride_atIndex_), offset, stride, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, const NS::UInteger* strides, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffers_offsets_attributeStrides_withRange_), buffers, offsets, strides, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setBytes(const void* bytes, NS::UInteger length, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBytes_length_attributeStride_atIndex_), bytes, length, stride, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setComputePipelineState(const MTL::ComputePipelineState* state)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputePipelineState_), state);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setImageblockWidth(NS::UInteger width, NS::UInteger height)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setImageblockWidth_height_), width, height);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTable_atBufferIndex_), intersectionFunctionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIntersectionFunctionTables_withBufferRange_), intersectionFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setStageInRegion(MTL::Region region)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStageInRegion_), region);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setStageInRegion(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStageInRegionWithIndirectBuffer_indirectBufferOffset_), indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_atIndex_), length, index);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setVisibleFunctionTable(const MTL::VisibleFunctionTable* visibleFunctionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTable_atBufferIndex_), visibleFunctionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::setVisibleFunctionTables(const MTL::VisibleFunctionTable* const visibleFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTables_withBufferRange_), visibleFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::updateFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_), fence);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::useHeap(const MTL::Heap* heap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeap_), heap);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::useHeaps(const MTL::Heap* const heaps[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeaps_count_), heaps, count);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::useResource(const MTL::Resource* resource, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResource_usage_), resource, usage);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResources_count_usage_), resources, count, usage);
-}
-
-_MTL_INLINE void MTL::ComputeCommandEncoder::waitForFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_), fence);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLComputePass.hpp b/engine/thirdparty/metal-cpp/Metal/MTLComputePass.hpp
deleted file mode 100644
index fb34f7d8..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLComputePass.hpp
+++ /dev/null
@@ -1,169 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLComputePass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandBuffer.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class ComputePassDescriptor;
-class ComputePassSampleBufferAttachmentDescriptor;
-class ComputePassSampleBufferAttachmentDescriptorArray;
-class CounterSampleBuffer;
-
-class ComputePassSampleBufferAttachmentDescriptor : public NS::Copying<ComputePassSampleBufferAttachmentDescriptor>
-{
-public:
-    static ComputePassSampleBufferAttachmentDescriptor* alloc();
-
-    NS::UInteger                                        endOfEncoderSampleIndex() const;
-
-    ComputePassSampleBufferAttachmentDescriptor*        init();
-
-    CounterSampleBuffer*                                sampleBuffer() const;
-
-    void                                                setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex);
-
-    void                                                setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer);
-
-    void                                                setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex);
-    NS::UInteger                                        startOfEncoderSampleIndex() const;
-};
-class ComputePassSampleBufferAttachmentDescriptorArray : public NS::Referencing<ComputePassSampleBufferAttachmentDescriptorArray>
-{
-public:
-    static ComputePassSampleBufferAttachmentDescriptorArray* alloc();
-
-    ComputePassSampleBufferAttachmentDescriptorArray*        init();
-
-    ComputePassSampleBufferAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                     setObject(const MTL::ComputePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class ComputePassDescriptor : public NS::Copying<ComputePassDescriptor>
-{
-public:
-    static ComputePassDescriptor*                     alloc();
-
-    static ComputePassDescriptor*                     computePassDescriptor();
-
-    DispatchType                                      dispatchType() const;
-
-    ComputePassDescriptor*                            init();
-
-    ComputePassSampleBufferAttachmentDescriptorArray* sampleBufferAttachments() const;
-
-    void                                              setDispatchType(MTL::DispatchType dispatchType);
-};
-
-}
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptor* MTL::ComputePassSampleBufferAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ComputePassSampleBufferAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLComputePassSampleBufferAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePassSampleBufferAttachmentDescriptor::endOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptor* MTL::ComputePassSampleBufferAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::ComputePassSampleBufferAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::ComputePassSampleBufferAttachmentDescriptor::sampleBuffer() const
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(sampleBuffer));
-}
-
-_MTL_INLINE void MTL::ComputePassSampleBufferAttachmentDescriptor::setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfEncoderSampleIndex_), endOfEncoderSampleIndex);
-}
-
-_MTL_INLINE void MTL::ComputePassSampleBufferAttachmentDescriptor::setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleBuffer_), sampleBuffer);
-}
-
-_MTL_INLINE void MTL::ComputePassSampleBufferAttachmentDescriptor::setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfEncoderSampleIndex_), startOfEncoderSampleIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePassSampleBufferAttachmentDescriptor::startOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptorArray* MTL::ComputePassSampleBufferAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::ComputePassSampleBufferAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLComputePassSampleBufferAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptorArray* MTL::ComputePassSampleBufferAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::ComputePassSampleBufferAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptor* MTL::ComputePassSampleBufferAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::ComputePassSampleBufferAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::ComputePassSampleBufferAttachmentDescriptorArray::setObject(const MTL::ComputePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::ComputePassDescriptor* MTL::ComputePassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ComputePassDescriptor>(_MTL_PRIVATE_CLS(MTLComputePassDescriptor));
-}
-
-_MTL_INLINE MTL::ComputePassDescriptor* MTL::ComputePassDescriptor::computePassDescriptor()
-{
-    return Object::sendMessage<MTL::ComputePassDescriptor*>(_MTL_PRIVATE_CLS(MTLComputePassDescriptor), _MTL_PRIVATE_SEL(computePassDescriptor));
-}
-
-_MTL_INLINE MTL::DispatchType MTL::ComputePassDescriptor::dispatchType() const
-{
-    return Object::sendMessage<MTL::DispatchType>(this, _MTL_PRIVATE_SEL(dispatchType));
-}
-
-_MTL_INLINE MTL::ComputePassDescriptor* MTL::ComputePassDescriptor::init()
-{
-    return NS::Object::init<MTL::ComputePassDescriptor>();
-}
-
-_MTL_INLINE MTL::ComputePassSampleBufferAttachmentDescriptorArray* MTL::ComputePassDescriptor::sampleBufferAttachments() const
-{
-    return Object::sendMessage<MTL::ComputePassSampleBufferAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(sampleBufferAttachments));
-}
-
-_MTL_INLINE void MTL::ComputePassDescriptor::setDispatchType(MTL::DispatchType dispatchType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDispatchType_), dispatchType);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLComputePipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTLComputePipeline.hpp
deleted file mode 100644
index d200af75..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLComputePipeline.hpp
+++ /dev/null
@@ -1,439 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLComputePipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPipeline.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class ComputePipelineDescriptor;
-class ComputePipelineReflection;
-class ComputePipelineState;
-class Device;
-class Function;
-class FunctionHandle;
-class IntersectionFunctionTable;
-class IntersectionFunctionTableDescriptor;
-class LinkedFunctions;
-class PipelineBufferDescriptorArray;
-class StageInputOutputDescriptor;
-class VisibleFunctionTable;
-class VisibleFunctionTableDescriptor;
-
-}
-namespace MTL4
-{
-class BinaryFunction;
-
-}
-namespace MTL
-{
-class ComputePipelineReflection : public NS::Referencing<ComputePipelineReflection>
-{
-public:
-    static ComputePipelineReflection* alloc();
-
-    NS::Array*                        arguments() const;
-
-    NS::Array*                        bindings() const;
-
-    ComputePipelineReflection*        init();
-};
-class ComputePipelineDescriptor : public NS::Copying<ComputePipelineDescriptor>
-{
-public:
-    static ComputePipelineDescriptor* alloc();
-
-    NS::Array*                        binaryArchives() const;
-
-    PipelineBufferDescriptorArray*    buffers() const;
-
-    Function*                         computeFunction() const;
-
-    ComputePipelineDescriptor*        init();
-
-    NS::Array*                        insertLibraries() const;
-
-    NS::String*                       label() const;
-
-    LinkedFunctions*                  linkedFunctions() const;
-
-    NS::UInteger                      maxCallStackDepth() const;
-
-    NS::UInteger                      maxTotalThreadsPerThreadgroup() const;
-
-    NS::Array*                        preloadedLibraries() const;
-
-    Size                              requiredThreadsPerThreadgroup() const;
-
-    void                              reset();
-
-    void                              setBinaryArchives(const NS::Array* binaryArchives);
-
-    void                              setComputeFunction(const MTL::Function* computeFunction);
-
-    void                              setInsertLibraries(const NS::Array* insertLibraries);
-
-    void                              setLabel(const NS::String* label);
-
-    void                              setLinkedFunctions(const MTL::LinkedFunctions* linkedFunctions);
-
-    void                              setMaxCallStackDepth(NS::UInteger maxCallStackDepth);
-
-    void                              setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup);
-
-    void                              setPreloadedLibraries(const NS::Array* preloadedLibraries);
-
-    void                              setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup);
-
-    void                              setShaderValidation(MTL::ShaderValidation shaderValidation);
-
-    void                              setStageInputDescriptor(const MTL::StageInputOutputDescriptor* stageInputDescriptor);
-
-    void                              setSupportAddingBinaryFunctions(bool supportAddingBinaryFunctions);
-
-    void                              setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers);
-
-    void                              setThreadGroupSizeIsMultipleOfThreadExecutionWidth(bool threadGroupSizeIsMultipleOfThreadExecutionWidth);
-
-    ShaderValidation                  shaderValidation() const;
-
-    StageInputOutputDescriptor*       stageInputDescriptor() const;
-
-    bool                              supportAddingBinaryFunctions() const;
-
-    bool                              supportIndirectCommandBuffers() const;
-
-    bool                              threadGroupSizeIsMultipleOfThreadExecutionWidth() const;
-};
-class ComputePipelineState : public NS::Referencing<ComputePipelineState, Allocation>
-{
-public:
-    Device*                    device() const;
-
-    FunctionHandle*            functionHandle(const NS::String* name);
-    FunctionHandle*            functionHandle(const MTL4::BinaryFunction* function);
-    FunctionHandle*            functionHandle(const MTL::Function* function);
-
-    ResourceID                 gpuResourceID() const;
-
-    NS::UInteger               imageblockMemoryLength(MTL::Size imageblockDimensions);
-
-    NS::String*                label() const;
-
-    NS::UInteger               maxTotalThreadsPerThreadgroup() const;
-
-    ComputePipelineState*      newComputePipelineStateWithBinaryFunctions(const NS::Array* additionalBinaryFunctions, NS::Error** error);
-    ComputePipelineState*      newComputePipelineState(const NS::Array* functions, NS::Error** error);
-
-    IntersectionFunctionTable* newIntersectionFunctionTable(const MTL::IntersectionFunctionTableDescriptor* descriptor);
-
-    VisibleFunctionTable*      newVisibleFunctionTable(const MTL::VisibleFunctionTableDescriptor* descriptor);
-
-    ComputePipelineReflection* reflection() const;
-
-    Size                       requiredThreadsPerThreadgroup() const;
-
-    ShaderValidation           shaderValidation() const;
-
-    NS::UInteger               staticThreadgroupMemoryLength() const;
-
-    bool                       supportIndirectCommandBuffers() const;
-
-    NS::UInteger               threadExecutionWidth() const;
-};
-
-}
-_MTL_INLINE MTL::ComputePipelineReflection* MTL::ComputePipelineReflection::alloc()
-{
-    return NS::Object::alloc<MTL::ComputePipelineReflection>(_MTL_PRIVATE_CLS(MTLComputePipelineReflection));
-}
-
-_MTL_INLINE NS::Array* MTL::ComputePipelineReflection::arguments() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(arguments));
-}
-
-_MTL_INLINE NS::Array* MTL::ComputePipelineReflection::bindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(bindings));
-}
-
-_MTL_INLINE MTL::ComputePipelineReflection* MTL::ComputePipelineReflection::init()
-{
-    return NS::Object::init<MTL::ComputePipelineReflection>();
-}
-
-_MTL_INLINE MTL::ComputePipelineDescriptor* MTL::ComputePipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ComputePipelineDescriptor>(_MTL_PRIVATE_CLS(MTLComputePipelineDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::ComputePipelineDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::ComputePipelineDescriptor::buffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(buffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::ComputePipelineDescriptor::computeFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(computeFunction));
-}
-
-_MTL_INLINE MTL::ComputePipelineDescriptor* MTL::ComputePipelineDescriptor::init()
-{
-    return NS::Object::init<MTL::ComputePipelineDescriptor>();
-}
-
-_MTL_INLINE NS::Array* MTL::ComputePipelineDescriptor::insertLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(insertLibraries));
-}
-
-_MTL_INLINE NS::String* MTL::ComputePipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::ComputePipelineDescriptor::linkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(linkedFunctions));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineDescriptor::maxCallStackDepth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCallStackDepth));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineDescriptor::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE NS::Array* MTL::ComputePipelineDescriptor::preloadedLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(preloadedLibraries));
-}
-
-_MTL_INLINE MTL::Size MTL::ComputePipelineDescriptor::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setComputeFunction(const MTL::Function* computeFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputeFunction_), computeFunction);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setInsertLibraries(const NS::Array* insertLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInsertLibraries_), insertLibraries);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setLinkedFunctions(const MTL::LinkedFunctions* linkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLinkedFunctions_), linkedFunctions);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setMaxCallStackDepth(NS::UInteger maxCallStackDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCallStackDepth_), maxCallStackDepth);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerThreadgroup_), maxTotalThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setPreloadedLibraries(const NS::Array* preloadedLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPreloadedLibraries_), preloadedLibraries);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerThreadgroup_), requiredThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setShaderValidation(MTL::ShaderValidation shaderValidation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderValidation_), shaderValidation);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setStageInputDescriptor(const MTL::StageInputOutputDescriptor* stageInputDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStageInputDescriptor_), stageInputDescriptor);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setSupportAddingBinaryFunctions(bool supportAddingBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportAddingBinaryFunctions_), supportAddingBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE void MTL::ComputePipelineDescriptor::setThreadGroupSizeIsMultipleOfThreadExecutionWidth(bool threadGroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadGroupSizeIsMultipleOfThreadExecutionWidth_), threadGroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::ComputePipelineDescriptor::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE MTL::StageInputOutputDescriptor* MTL::ComputePipelineDescriptor::stageInputDescriptor() const
-{
-    return Object::sendMessage<MTL::StageInputOutputDescriptor*>(this, _MTL_PRIVATE_SEL(stageInputDescriptor));
-}
-
-_MTL_INLINE bool MTL::ComputePipelineDescriptor::supportAddingBinaryFunctions() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportAddingBinaryFunctions));
-}
-
-_MTL_INLINE bool MTL::ComputePipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE bool MTL::ComputePipelineDescriptor::threadGroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(threadGroupSizeIsMultipleOfThreadExecutionWidth));
-}
-
-_MTL_INLINE MTL::Device* MTL::ComputePipelineState::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::ComputePipelineState::functionHandle(const NS::String* name)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithName_), name);
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::ComputePipelineState::functionHandle(const MTL4::BinaryFunction* function)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithBinaryFunction_), function);
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::ComputePipelineState::functionHandle(const MTL::Function* function)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithFunction_), function);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::ComputePipelineState::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineState::imageblockMemoryLength(MTL::Size imageblockDimensions)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(imageblockMemoryLengthForDimensions_), imageblockDimensions);
-}
-
-_MTL_INLINE NS::String* MTL::ComputePipelineState::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineState::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL::ComputePipelineState::newComputePipelineStateWithBinaryFunctions(const NS::Array* additionalBinaryFunctions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithBinaryFunctions_error_), additionalBinaryFunctions, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL::ComputePipelineState::newComputePipelineState(const NS::Array* functions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithAdditionalBinaryFunctions_error_), functions, error);
-}
-
-_MTL_INLINE MTL::IntersectionFunctionTable* MTL::ComputePipelineState::newIntersectionFunctionTable(const MTL::IntersectionFunctionTableDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::IntersectionFunctionTable*>(this, _MTL_PRIVATE_SEL(newIntersectionFunctionTableWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::VisibleFunctionTable* MTL::ComputePipelineState::newVisibleFunctionTable(const MTL::VisibleFunctionTableDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::VisibleFunctionTable*>(this, _MTL_PRIVATE_SEL(newVisibleFunctionTableWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::ComputePipelineReflection* MTL::ComputePipelineState::reflection() const
-{
-    return Object::sendMessage<MTL::ComputePipelineReflection*>(this, _MTL_PRIVATE_SEL(reflection));
-}
-
-_MTL_INLINE MTL::Size MTL::ComputePipelineState::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::ComputePipelineState::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineState::staticThreadgroupMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(staticThreadgroupMemoryLength));
-}
-
-_MTL_INLINE bool MTL::ComputePipelineState::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE NS::UInteger MTL::ComputePipelineState::threadExecutionWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadExecutionWidth));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLCounters.hpp b/engine/thirdparty/metal-cpp/Metal/MTLCounters.hpp
deleted file mode 100644
index 6d655f15..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLCounters.hpp
+++ /dev/null
@@ -1,243 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLCounters.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class CounterSampleBufferDescriptor;
-class CounterSet;
-class Device;
-_MTL_ENUM(NS::Integer, CounterSampleBufferError) {
-    CounterSampleBufferErrorOutOfMemory = 0,
-    CounterSampleBufferErrorInvalid = 1,
-    CounterSampleBufferErrorInternal = 2,
-};
-
-using CommonCounter = NS::String*;
-using CommonCounterSet = NS::String*;
-
-static const NS::UInteger CounterErrorValue = static_cast<NS::UInteger>(~0ULL);
-static const NS::UInteger CounterDontSample = static_cast<NS::UInteger>(-1);
-_MTL_CONST(NS::ErrorDomain, CounterErrorDomain);
-_MTL_CONST(CommonCounter, CommonCounterTimestamp);
-_MTL_CONST(CommonCounter, CommonCounterTessellationInputPatches);
-_MTL_CONST(CommonCounter, CommonCounterVertexInvocations);
-_MTL_CONST(CommonCounter, CommonCounterPostTessellationVertexInvocations);
-_MTL_CONST(CommonCounter, CommonCounterClipperInvocations);
-_MTL_CONST(CommonCounter, CommonCounterClipperPrimitivesOut);
-_MTL_CONST(CommonCounter, CommonCounterFragmentInvocations);
-_MTL_CONST(CommonCounter, CommonCounterFragmentsPassed);
-_MTL_CONST(CommonCounter, CommonCounterComputeKernelInvocations);
-_MTL_CONST(CommonCounter, CommonCounterTotalCycles);
-_MTL_CONST(CommonCounter, CommonCounterVertexCycles);
-_MTL_CONST(CommonCounter, CommonCounterTessellationCycles);
-_MTL_CONST(CommonCounter, CommonCounterPostTessellationVertexCycles);
-_MTL_CONST(CommonCounter, CommonCounterFragmentCycles);
-_MTL_CONST(CommonCounter, CommonCounterRenderTargetWriteCycles);
-_MTL_CONST(CommonCounterSet, CommonCounterSetTimestamp);
-_MTL_CONST(CommonCounterSet, CommonCounterSetStageUtilization);
-_MTL_CONST(CommonCounterSet, CommonCounterSetStatistic);
-struct CounterResultTimestamp
-{
-    uint64_t timestamp;
-} _MTL_PACKED;
-
-struct CounterResultStageUtilization
-{
-    uint64_t totalCycles;
-    uint64_t vertexCycles;
-    uint64_t tessellationCycles;
-    uint64_t postTessellationVertexCycles;
-    uint64_t fragmentCycles;
-    uint64_t renderTargetCycles;
-} _MTL_PACKED;
-
-struct CounterResultStatistic
-{
-    uint64_t tessellationInputPatches;
-    uint64_t vertexInvocations;
-    uint64_t postTessellationVertexInvocations;
-    uint64_t clipperInvocations;
-    uint64_t clipperPrimitivesOut;
-    uint64_t fragmentInvocations;
-    uint64_t fragmentsPassed;
-    uint64_t computeKernelInvocations;
-} _MTL_PACKED;
-
-class Counter : public NS::Referencing<Counter>
-{
-public:
-    NS::String* name() const;
-};
-class CounterSet : public NS::Referencing<CounterSet>
-{
-public:
-    NS::Array*  counters() const;
-
-    NS::String* name() const;
-};
-class CounterSampleBufferDescriptor : public NS::Copying<CounterSampleBufferDescriptor>
-{
-public:
-    static CounterSampleBufferDescriptor* alloc();
-
-    CounterSet*                           counterSet() const;
-
-    CounterSampleBufferDescriptor*        init();
-
-    NS::String*                           label() const;
-
-    NS::UInteger                          sampleCount() const;
-
-    void                                  setCounterSet(const MTL::CounterSet* counterSet);
-
-    void                                  setLabel(const NS::String* label);
-
-    void                                  setSampleCount(NS::UInteger sampleCount);
-
-    void                                  setStorageMode(MTL::StorageMode storageMode);
-    StorageMode                           storageMode() const;
-};
-class CounterSampleBuffer : public NS::Referencing<CounterSampleBuffer>
-{
-public:
-    Device*      device() const;
-
-    NS::String*  label() const;
-
-    NS::Data*    resolveCounterRange(NS::Range range);
-
-    NS::UInteger sampleCount() const;
-};
-
-}
-
-_MTL_PRIVATE_DEF_CONST(NS::ErrorDomain, CounterErrorDomain);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterTimestamp);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterTessellationInputPatches);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterVertexInvocations);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterPostTessellationVertexInvocations);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterClipperInvocations);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterClipperPrimitivesOut);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterFragmentInvocations);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterFragmentsPassed);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterComputeKernelInvocations);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterTotalCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterVertexCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterTessellationCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterPostTessellationVertexCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterFragmentCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounter, CommonCounterRenderTargetWriteCycles);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounterSet, CommonCounterSetTimestamp);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounterSet, CommonCounterSetStageUtilization);
-_MTL_PRIVATE_DEF_CONST(MTL::CommonCounterSet, CommonCounterSetStatistic);
-
-_MTL_INLINE NS::String* MTL::Counter::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE NS::Array* MTL::CounterSet::counters() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(counters));
-}
-
-_MTL_INLINE NS::String* MTL::CounterSet::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::CounterSampleBufferDescriptor* MTL::CounterSampleBufferDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::CounterSampleBufferDescriptor>(_MTL_PRIVATE_CLS(MTLCounterSampleBufferDescriptor));
-}
-
-_MTL_INLINE MTL::CounterSet* MTL::CounterSampleBufferDescriptor::counterSet() const
-{
-    return Object::sendMessage<MTL::CounterSet*>(this, _MTL_PRIVATE_SEL(counterSet));
-}
-
-_MTL_INLINE MTL::CounterSampleBufferDescriptor* MTL::CounterSampleBufferDescriptor::init()
-{
-    return NS::Object::init<MTL::CounterSampleBufferDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::CounterSampleBufferDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::CounterSampleBufferDescriptor::sampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
-
-_MTL_INLINE void MTL::CounterSampleBufferDescriptor::setCounterSet(const MTL::CounterSet* counterSet)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCounterSet_), counterSet);
-}
-
-_MTL_INLINE void MTL::CounterSampleBufferDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::CounterSampleBufferDescriptor::setSampleCount(NS::UInteger sampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleCount_), sampleCount);
-}
-
-_MTL_INLINE void MTL::CounterSampleBufferDescriptor::setStorageMode(MTL::StorageMode storageMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStorageMode_), storageMode);
-}
-
-_MTL_INLINE MTL::StorageMode MTL::CounterSampleBufferDescriptor::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
-
-_MTL_INLINE MTL::Device* MTL::CounterSampleBuffer::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::CounterSampleBuffer::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::Data* MTL::CounterSampleBuffer::resolveCounterRange(NS::Range range)
-{
-    return Object::sendMessage<NS::Data*>(this, _MTL_PRIVATE_SEL(resolveCounterRange_), range);
-}
-
-_MTL_INLINE NS::UInteger MTL::CounterSampleBuffer::sampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDataType.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDataType.hpp
deleted file mode 100644
index f0e9b25a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDataType.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDataType.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-_MTL_ENUM(NS::UInteger, DataType) {
-    DataTypeNone = 0,
-    DataTypeStruct = 1,
-    DataTypeArray = 2,
-    DataTypeFloat = 3,
-    DataTypeFloat2 = 4,
-    DataTypeFloat3 = 5,
-    DataTypeFloat4 = 6,
-    DataTypeFloat2x2 = 7,
-    DataTypeFloat2x3 = 8,
-    DataTypeFloat2x4 = 9,
-    DataTypeFloat3x2 = 10,
-    DataTypeFloat3x3 = 11,
-    DataTypeFloat3x4 = 12,
-    DataTypeFloat4x2 = 13,
-    DataTypeFloat4x3 = 14,
-    DataTypeFloat4x4 = 15,
-    DataTypeHalf = 16,
-    DataTypeHalf2 = 17,
-    DataTypeHalf3 = 18,
-    DataTypeHalf4 = 19,
-    DataTypeHalf2x2 = 20,
-    DataTypeHalf2x3 = 21,
-    DataTypeHalf2x4 = 22,
-    DataTypeHalf3x2 = 23,
-    DataTypeHalf3x3 = 24,
-    DataTypeHalf3x4 = 25,
-    DataTypeHalf4x2 = 26,
-    DataTypeHalf4x3 = 27,
-    DataTypeHalf4x4 = 28,
-    DataTypeInt = 29,
-    DataTypeInt2 = 30,
-    DataTypeInt3 = 31,
-    DataTypeInt4 = 32,
-    DataTypeUInt = 33,
-    DataTypeUInt2 = 34,
-    DataTypeUInt3 = 35,
-    DataTypeUInt4 = 36,
-    DataTypeShort = 37,
-    DataTypeShort2 = 38,
-    DataTypeShort3 = 39,
-    DataTypeShort4 = 40,
-    DataTypeUShort = 41,
-    DataTypeUShort2 = 42,
-    DataTypeUShort3 = 43,
-    DataTypeUShort4 = 44,
-    DataTypeChar = 45,
-    DataTypeChar2 = 46,
-    DataTypeChar3 = 47,
-    DataTypeChar4 = 48,
-    DataTypeUChar = 49,
-    DataTypeUChar2 = 50,
-    DataTypeUChar3 = 51,
-    DataTypeUChar4 = 52,
-    DataTypeBool = 53,
-    DataTypeBool2 = 54,
-    DataTypeBool3 = 55,
-    DataTypeBool4 = 56,
-    DataTypeTexture = 58,
-    DataTypeSampler = 59,
-    DataTypePointer = 60,
-    DataTypeR8Unorm = 62,
-    DataTypeR8Snorm = 63,
-    DataTypeR16Unorm = 64,
-    DataTypeR16Snorm = 65,
-    DataTypeRG8Unorm = 66,
-    DataTypeRG8Snorm = 67,
-    DataTypeRG16Unorm = 68,
-    DataTypeRG16Snorm = 69,
-    DataTypeRGBA8Unorm = 70,
-    DataTypeRGBA8Unorm_sRGB = 71,
-    DataTypeRGBA8Snorm = 72,
-    DataTypeRGBA16Unorm = 73,
-    DataTypeRGBA16Snorm = 74,
-    DataTypeRGB10A2Unorm = 75,
-    DataTypeRG11B10Float = 76,
-    DataTypeRGB9E5Float = 77,
-    DataTypeRenderPipeline = 78,
-    DataTypeComputePipeline = 79,
-    DataTypeIndirectCommandBuffer = 80,
-    DataTypeLong = 81,
-    DataTypeLong2 = 82,
-    DataTypeLong3 = 83,
-    DataTypeLong4 = 84,
-    DataTypeULong = 85,
-    DataTypeULong2 = 86,
-    DataTypeULong3 = 87,
-    DataTypeULong4 = 88,
-    DataTypeVisibleFunctionTable = 115,
-    DataTypeIntersectionFunctionTable = 116,
-    DataTypePrimitiveAccelerationStructure = 117,
-    DataTypeInstanceAccelerationStructure = 118,
-    DataTypeBFloat = 121,
-    DataTypeBFloat2 = 122,
-    DataTypeBFloat3 = 123,
-    DataTypeBFloat4 = 124,
-    DataTypeDepthStencilState = 139,
-    DataTypeTensor = 140,
-};
-
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDefines.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDefines.hpp
deleted file mode 100644
index 4260a2b1..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDefines.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDefines.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "../Foundation/NSDefines.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _MTL_EXPORT _NS_EXPORT
-#define _MTL_EXTERN _NS_EXTERN
-#define _MTL_INLINE _NS_INLINE
-#define _MTL_PACKED _NS_PACKED
-
-#define _MTL_CONST(type, name) _NS_CONST(type, name)
-#define _MTL_ENUM(type, name) _NS_ENUM(type, name)
-#define _MTL_OPTIONS(type, name) _NS_OPTIONS(type, name)
-
-#define _MTL_VALIDATE_SIZE(ns, name) _NS_VALIDATE_SIZE(ns, name)
-#define _MTL_VALIDATE_ENUM(ns, name) _NS_VALIDATE_ENUM(ns, name)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDepthStencil.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDepthStencil.hpp
deleted file mode 100644
index e1116175..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDepthStencil.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDepthStencil.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class DepthStencilDescriptor;
-class Device;
-class StencilDescriptor;
-_MTL_ENUM(NS::UInteger, CompareFunction) {
-    CompareFunctionNever = 0,
-    CompareFunctionLess = 1,
-    CompareFunctionEqual = 2,
-    CompareFunctionLessEqual = 3,
-    CompareFunctionGreater = 4,
-    CompareFunctionNotEqual = 5,
-    CompareFunctionGreaterEqual = 6,
-    CompareFunctionAlways = 7,
-};
-
-_MTL_ENUM(NS::UInteger, StencilOperation) {
-    StencilOperationKeep = 0,
-    StencilOperationZero = 1,
-    StencilOperationReplace = 2,
-    StencilOperationIncrementClamp = 3,
-    StencilOperationDecrementClamp = 4,
-    StencilOperationInvert = 5,
-    StencilOperationIncrementWrap = 6,
-    StencilOperationDecrementWrap = 7,
-};
-
-class StencilDescriptor : public NS::Copying<StencilDescriptor>
-{
-public:
-    static StencilDescriptor* alloc();
-
-    StencilOperation          depthFailureOperation() const;
-
-    StencilOperation          depthStencilPassOperation() const;
-
-    StencilDescriptor*        init();
-
-    uint32_t                  readMask() const;
-
-    void                      setDepthFailureOperation(MTL::StencilOperation depthFailureOperation);
-
-    void                      setDepthStencilPassOperation(MTL::StencilOperation depthStencilPassOperation);
-
-    void                      setReadMask(uint32_t readMask);
-
-    void                      setStencilCompareFunction(MTL::CompareFunction stencilCompareFunction);
-
-    void                      setStencilFailureOperation(MTL::StencilOperation stencilFailureOperation);
-
-    void                      setWriteMask(uint32_t writeMask);
-
-    CompareFunction           stencilCompareFunction() const;
-
-    StencilOperation          stencilFailureOperation() const;
-
-    uint32_t                  writeMask() const;
-};
-class DepthStencilDescriptor : public NS::Copying<DepthStencilDescriptor>
-{
-public:
-    static DepthStencilDescriptor* alloc();
-
-    StencilDescriptor*             backFaceStencil() const;
-
-    CompareFunction                depthCompareFunction() const;
-
-    [[deprecated("please use isDepthWriteEnabled instead")]]
-    bool                    depthWriteEnabled() const;
-
-    StencilDescriptor*      frontFaceStencil() const;
-
-    DepthStencilDescriptor* init();
-
-    bool                    isDepthWriteEnabled() const;
-
-    NS::String*             label() const;
-
-    void                    setBackFaceStencil(const MTL::StencilDescriptor* backFaceStencil);
-
-    void                    setDepthCompareFunction(MTL::CompareFunction depthCompareFunction);
-
-    void                    setDepthWriteEnabled(bool depthWriteEnabled);
-
-    void                    setFrontFaceStencil(const MTL::StencilDescriptor* frontFaceStencil);
-
-    void                    setLabel(const NS::String* label);
-};
-class DepthStencilState : public NS::Referencing<DepthStencilState>
-{
-public:
-    Device*     device() const;
-
-    ResourceID  gpuResourceID() const;
-
-    NS::String* label() const;
-};
-
-}
-_MTL_INLINE MTL::StencilDescriptor* MTL::StencilDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::StencilDescriptor>(_MTL_PRIVATE_CLS(MTLStencilDescriptor));
-}
-
-_MTL_INLINE MTL::StencilOperation MTL::StencilDescriptor::depthFailureOperation() const
-{
-    return Object::sendMessage<MTL::StencilOperation>(this, _MTL_PRIVATE_SEL(depthFailureOperation));
-}
-
-_MTL_INLINE MTL::StencilOperation MTL::StencilDescriptor::depthStencilPassOperation() const
-{
-    return Object::sendMessage<MTL::StencilOperation>(this, _MTL_PRIVATE_SEL(depthStencilPassOperation));
-}
-
-_MTL_INLINE MTL::StencilDescriptor* MTL::StencilDescriptor::init()
-{
-    return NS::Object::init<MTL::StencilDescriptor>();
-}
-
-_MTL_INLINE uint32_t MTL::StencilDescriptor::readMask() const
-{
-    return Object::sendMessage<uint32_t>(this, _MTL_PRIVATE_SEL(readMask));
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setDepthFailureOperation(MTL::StencilOperation depthFailureOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthFailureOperation_), depthFailureOperation);
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setDepthStencilPassOperation(MTL::StencilOperation depthStencilPassOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilPassOperation_), depthStencilPassOperation);
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setReadMask(uint32_t readMask)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setReadMask_), readMask);
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setStencilCompareFunction(MTL::CompareFunction stencilCompareFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilCompareFunction_), stencilCompareFunction);
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setStencilFailureOperation(MTL::StencilOperation stencilFailureOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilFailureOperation_), stencilFailureOperation);
-}
-
-_MTL_INLINE void MTL::StencilDescriptor::setWriteMask(uint32_t writeMask)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setWriteMask_), writeMask);
-}
-
-_MTL_INLINE MTL::CompareFunction MTL::StencilDescriptor::stencilCompareFunction() const
-{
-    return Object::sendMessage<MTL::CompareFunction>(this, _MTL_PRIVATE_SEL(stencilCompareFunction));
-}
-
-_MTL_INLINE MTL::StencilOperation MTL::StencilDescriptor::stencilFailureOperation() const
-{
-    return Object::sendMessage<MTL::StencilOperation>(this, _MTL_PRIVATE_SEL(stencilFailureOperation));
-}
-
-_MTL_INLINE uint32_t MTL::StencilDescriptor::writeMask() const
-{
-    return Object::sendMessage<uint32_t>(this, _MTL_PRIVATE_SEL(writeMask));
-}
-
-_MTL_INLINE MTL::DepthStencilDescriptor* MTL::DepthStencilDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::DepthStencilDescriptor>(_MTL_PRIVATE_CLS(MTLDepthStencilDescriptor));
-}
-
-_MTL_INLINE MTL::StencilDescriptor* MTL::DepthStencilDescriptor::backFaceStencil() const
-{
-    return Object::sendMessage<MTL::StencilDescriptor*>(this, _MTL_PRIVATE_SEL(backFaceStencil));
-}
-
-_MTL_INLINE MTL::CompareFunction MTL::DepthStencilDescriptor::depthCompareFunction() const
-{
-    return Object::sendMessage<MTL::CompareFunction>(this, _MTL_PRIVATE_SEL(depthCompareFunction));
-}
-
-_MTL_INLINE bool MTL::DepthStencilDescriptor::depthWriteEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthWriteEnabled));
-}
-
-_MTL_INLINE MTL::StencilDescriptor* MTL::DepthStencilDescriptor::frontFaceStencil() const
-{
-    return Object::sendMessage<MTL::StencilDescriptor*>(this, _MTL_PRIVATE_SEL(frontFaceStencil));
-}
-
-_MTL_INLINE MTL::DepthStencilDescriptor* MTL::DepthStencilDescriptor::init()
-{
-    return NS::Object::init<MTL::DepthStencilDescriptor>();
-}
-
-_MTL_INLINE bool MTL::DepthStencilDescriptor::isDepthWriteEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isDepthWriteEnabled));
-}
-
-_MTL_INLINE NS::String* MTL::DepthStencilDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::DepthStencilDescriptor::setBackFaceStencil(const MTL::StencilDescriptor* backFaceStencil)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBackFaceStencil_), backFaceStencil);
-}
-
-_MTL_INLINE void MTL::DepthStencilDescriptor::setDepthCompareFunction(MTL::CompareFunction depthCompareFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthCompareFunction_), depthCompareFunction);
-}
-
-_MTL_INLINE void MTL::DepthStencilDescriptor::setDepthWriteEnabled(bool depthWriteEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthWriteEnabled_), depthWriteEnabled);
-}
-
-_MTL_INLINE void MTL::DepthStencilDescriptor::setFrontFaceStencil(const MTL::StencilDescriptor* frontFaceStencil)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFrontFaceStencil_), frontFaceStencil);
-}
-
-_MTL_INLINE void MTL::DepthStencilDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::Device* MTL::DepthStencilState::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::DepthStencilState::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::String* MTL::DepthStencilState::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDevice.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDevice.hpp
deleted file mode 100644
index 0e867397..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDevice.hpp
+++ /dev/null
@@ -1,1493 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDevice.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTL4Counters.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDataType.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPixelFormat.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTexture.hpp"
-#include "MTLTypes.hpp"
-#include <IOSurface/IOSurfaceRef.h>
-#include <cstdint>
-#include <dispatch/dispatch.h>
-
-#include <TargetConditionals.h>
-#include <cstdint>
-#include <functional>
-
-namespace MTL
-{
-class AccelerationStructure;
-class AccelerationStructureDescriptor;
-class Architecture;
-class ArgumentDescriptor;
-class ArgumentEncoder;
-class BinaryArchive;
-class BinaryArchiveDescriptor;
-class Buffer;
-class BufferBinding;
-class CommandQueue;
-class CommandQueueDescriptor;
-class CompileOptions;
-class ComputePipelineDescriptor;
-class ComputePipelineReflection;
-class ComputePipelineState;
-class CounterSampleBuffer;
-class CounterSampleBufferDescriptor;
-class DepthStencilDescriptor;
-class DepthStencilState;
-class Device;
-class DynamicLibrary;
-class Event;
-class Fence;
-class Function;
-class FunctionConstantValues;
-class FunctionHandle;
-class Heap;
-class HeapDescriptor;
-class IOCommandQueue;
-class IOCommandQueueDescriptor;
-class IOFileHandle;
-class IndirectCommandBuffer;
-class IndirectCommandBufferDescriptor;
-class Library;
-class LogState;
-class LogStateDescriptor;
-class MeshRenderPipelineDescriptor;
-class RasterizationRateMap;
-class RasterizationRateMapDescriptor;
-struct Region;
-class RenderPipelineDescriptor;
-class RenderPipelineReflection;
-class RenderPipelineState;
-class ResidencySet;
-class ResidencySetDescriptor;
-class ResourceViewPoolDescriptor;
-struct SamplePosition;
-class SamplerDescriptor;
-class SamplerState;
-class SharedEvent;
-class SharedEventHandle;
-class SharedTextureHandle;
-class StitchedLibraryDescriptor;
-class Tensor;
-class TensorDescriptor;
-class Texture;
-class TextureDescriptor;
-class TextureViewPool;
-class TileRenderPipelineDescriptor;
-
-}
-namespace MTL4
-{
-class Archive;
-class ArgumentTable;
-class ArgumentTableDescriptor;
-class BinaryFunction;
-class CommandAllocator;
-class CommandAllocatorDescriptor;
-class CommandBuffer;
-class CommandQueue;
-class CommandQueueDescriptor;
-class Compiler;
-class CompilerDescriptor;
-class CounterHeap;
-class CounterHeapDescriptor;
-class PipelineDataSetSerializer;
-class PipelineDataSetSerializerDescriptor;
-
-}
-namespace MTL
-{
-_MTL_ENUM(NS::Integer, IOCompressionMethod) {
-    IOCompressionMethodZlib = 0,
-    IOCompressionMethodLZFSE = 1,
-    IOCompressionMethodLZ4 = 2,
-    IOCompressionMethodLZMA = 3,
-    IOCompressionMethodLZBitmap = 4,
-};
-
-_MTL_ENUM(NS::UInteger, FeatureSet) {
-    FeatureSet_iOS_GPUFamily1_v1 = 0,
-    FeatureSet_iOS_GPUFamily2_v1 = 1,
-    FeatureSet_iOS_GPUFamily1_v2 = 2,
-    FeatureSet_iOS_GPUFamily2_v2 = 3,
-    FeatureSet_iOS_GPUFamily3_v1 = 4,
-    FeatureSet_iOS_GPUFamily1_v3 = 5,
-    FeatureSet_iOS_GPUFamily2_v3 = 6,
-    FeatureSet_iOS_GPUFamily3_v2 = 7,
-    FeatureSet_iOS_GPUFamily1_v4 = 8,
-    FeatureSet_iOS_GPUFamily2_v4 = 9,
-    FeatureSet_iOS_GPUFamily3_v3 = 10,
-    FeatureSet_iOS_GPUFamily4_v1 = 11,
-    FeatureSet_iOS_GPUFamily1_v5 = 12,
-    FeatureSet_iOS_GPUFamily2_v5 = 13,
-    FeatureSet_iOS_GPUFamily3_v4 = 14,
-    FeatureSet_iOS_GPUFamily4_v2 = 15,
-    FeatureSet_iOS_GPUFamily5_v1 = 16,
-    FeatureSet_macOS_GPUFamily1_v1 = 10000,
-    FeatureSet_OSX_GPUFamily1_v1 = 10000,
-    FeatureSet_macOS_GPUFamily1_v2 = 10001,
-    FeatureSet_OSX_GPUFamily1_v2 = 10001,
-    FeatureSet_macOS_ReadWriteTextureTier2 = 10002,
-    FeatureSet_OSX_ReadWriteTextureTier2 = 10002,
-    FeatureSet_macOS_GPUFamily1_v3 = 10003,
-    FeatureSet_macOS_GPUFamily1_v4 = 10004,
-    FeatureSet_macOS_GPUFamily2_v1 = 10005,
-    FeatureSet_watchOS_GPUFamily1_v1 = 20000,
-    FeatureSet_WatchOS_GPUFamily1_v1 = 20000,
-    FeatureSet_watchOS_GPUFamily2_v1 = 20001,
-    FeatureSet_WatchOS_GPUFamily2_v1 = 20001,
-    FeatureSet_tvOS_GPUFamily1_v1 = 30000,
-    FeatureSet_TVOS_GPUFamily1_v1 = 30000,
-    FeatureSet_tvOS_GPUFamily1_v2 = 30001,
-    FeatureSet_tvOS_GPUFamily1_v3 = 30002,
-    FeatureSet_tvOS_GPUFamily2_v1 = 30003,
-    FeatureSet_tvOS_GPUFamily1_v4 = 30004,
-    FeatureSet_tvOS_GPUFamily2_v2 = 30005,
-};
-
-_MTL_ENUM(NS::Integer, GPUFamily) {
-    GPUFamilyApple1 = 1001,
-    GPUFamilyApple2 = 1002,
-    GPUFamilyApple3 = 1003,
-    GPUFamilyApple4 = 1004,
-    GPUFamilyApple5 = 1005,
-    GPUFamilyApple6 = 1006,
-    GPUFamilyApple7 = 1007,
-    GPUFamilyApple8 = 1008,
-    GPUFamilyApple9 = 1009,
-    GPUFamilyApple10 = 1010,
-    GPUFamilyMac1 = 2001,
-    GPUFamilyMac2 = 2002,
-    GPUFamilyCommon1 = 3001,
-    GPUFamilyCommon2 = 3002,
-    GPUFamilyCommon3 = 3003,
-    GPUFamilyMacCatalyst1 = 4001,
-    GPUFamilyMacCatalyst2 = 4002,
-    GPUFamilyMetal3 = 5001,
-    GPUFamilyMetal4 = 5002,
-};
-
-_MTL_ENUM(NS::UInteger, DeviceLocation) {
-    DeviceLocationBuiltIn = 0,
-    DeviceLocationSlot = 1,
-    DeviceLocationExternal = 2,
-    DeviceLocationUnspecified = NS::UIntegerMax,
-};
-
-_MTL_ENUM(NS::UInteger, ReadWriteTextureTier) {
-    ReadWriteTextureTierNone = 0,
-    ReadWriteTextureTier1 = 1,
-    ReadWriteTextureTier2 = 2,
-};
-
-_MTL_ENUM(NS::UInteger, ArgumentBuffersTier) {
-    ArgumentBuffersTier1 = 0,
-    ArgumentBuffersTier2 = 1,
-};
-
-_MTL_ENUM(NS::UInteger, SparseTextureRegionAlignmentMode) {
-    SparseTextureRegionAlignmentModeOutward = 0,
-    SparseTextureRegionAlignmentModeInward = 1,
-};
-
-_MTL_ENUM(NS::UInteger, CounterSamplingPoint) {
-    CounterSamplingPointAtStageBoundary = 0,
-    CounterSamplingPointAtDrawBoundary = 1,
-    CounterSamplingPointAtDispatchBoundary = 2,
-    CounterSamplingPointAtTileDispatchBoundary = 3,
-    CounterSamplingPointAtBlitBoundary = 4,
-};
-
-_MTL_OPTIONS(NS::UInteger, PipelineOption) {
-    PipelineOptionNone = 0,
-    PipelineOptionArgumentInfo = 1,
-    PipelineOptionBindingInfo = 1,
-    PipelineOptionBufferTypeInfo = 1 << 1,
-    PipelineOptionFailOnBinaryArchiveMiss = 1 << 2,
-};
-
-using DeviceNotificationName = NS::String*;
-using DeviceNotificationHandlerBlock = void (^)(MTL::Device* pDevice, MTL::DeviceNotificationName notifyName);
-using DeviceNotificationHandlerFunction = std::function<void(MTL::Device* pDevice, MTL::DeviceNotificationName notifyName)>;
-using AutoreleasedComputePipelineReflection = MTL::ComputePipelineReflection*;
-using AutoreleasedRenderPipelineReflection = MTL::RenderPipelineReflection*;
-using NewLibraryCompletionHandler = void (^)(MTL::Library*, NS::Error*);
-using NewLibraryCompletionHandlerFunction = std::function<void(MTL::Library*, NS::Error*)>;
-using NewRenderPipelineStateCompletionHandler = void (^)(MTL::RenderPipelineState*, NS::Error*);
-using NewRenderPipelineStateCompletionHandlerFunction = std::function<void(MTL::RenderPipelineState*, NS::Error*)>;
-using NewRenderPipelineStateWithReflectionCompletionHandler = void (^)(MTL::RenderPipelineState*, MTL::RenderPipelineReflection*, NS::Error*);
-using NewRenderPipelineStateWithReflectionCompletionHandlerFunction = std::function<void(MTL::RenderPipelineState*, MTL::RenderPipelineReflection*, NS::Error*)>;
-using NewComputePipelineStateCompletionHandler = void (^)(MTL::ComputePipelineState*, NS::Error*);
-using NewComputePipelineStateCompletionHandlerFunction = std::function<void(MTL::ComputePipelineState*, NS::Error*)>;
-using NewComputePipelineStateWithReflectionCompletionHandler = void (^)(MTL::ComputePipelineState*, MTL::ComputePipelineReflection*, NS::Error*);
-using NewComputePipelineStateWithReflectionCompletionHandlerFunction = std::function<void(MTL::ComputePipelineState*, MTL::ComputePipelineReflection*, NS::Error*)>;
-using Timestamp = std::uint64_t;
-
-_MTL_CONST(DeviceNotificationName, DeviceWasAddedNotification);
-_MTL_CONST(DeviceNotificationName, DeviceRemovalRequestedNotification);
-_MTL_CONST(DeviceNotificationName, DeviceWasRemovedNotification);
-_MTL_CONST(NS::ErrorUserInfoKey, CommandBufferEncoderInfoErrorKey);
-Device*    CreateSystemDefaultDevice();
-NS::Array* CopyAllDevices();
-NS::Array* CopyAllDevicesWithObserver(NS::Object** pOutObserver, MTL::DeviceNotificationHandlerBlock handler);
-NS::Array* CopyAllDevicesWithObserver(NS::Object** pOutObserver, const MTL::DeviceNotificationHandlerFunction& handler);
-void       RemoveDeviceObserver(const NS::Object* pObserver);
-struct AccelerationStructureSizes
-{
-    NS::UInteger accelerationStructureSize;
-    NS::UInteger buildScratchBufferSize;
-    NS::UInteger refitScratchBufferSize;
-} _MTL_PACKED;
-
-struct SizeAndAlign
-{
-    NS::UInteger size;
-    NS::UInteger align;
-} _MTL_PACKED;
-
-class ArgumentDescriptor : public NS::Copying<ArgumentDescriptor>
-{
-public:
-    BindingAccess              access() const;
-
-    static ArgumentDescriptor* alloc();
-
-    static ArgumentDescriptor* argumentDescriptor();
-
-    NS::UInteger               arrayLength() const;
-
-    NS::UInteger               constantBlockAlignment() const;
-
-    DataType                   dataType() const;
-
-    NS::UInteger               index() const;
-
-    ArgumentDescriptor*        init();
-
-    void                       setAccess(MTL::BindingAccess access);
-
-    void                       setArrayLength(NS::UInteger arrayLength);
-
-    void                       setConstantBlockAlignment(NS::UInteger constantBlockAlignment);
-
-    void                       setDataType(MTL::DataType dataType);
-
-    void                       setIndex(NS::UInteger index);
-
-    void                       setTextureType(MTL::TextureType textureType);
-    TextureType                textureType() const;
-};
-class Architecture : public NS::Copying<Architecture>
-{
-public:
-    static Architecture* alloc();
-
-    Architecture*        init();
-
-    NS::String*          name() const;
-};
-class Device : public NS::Referencing<Device>
-{
-public:
-    AccelerationStructureSizes accelerationStructureSizes(const MTL::AccelerationStructureDescriptor* descriptor);
-
-    Architecture*              architecture() const;
-
-    bool                       areBarycentricCoordsSupported() const;
-
-    bool                       areProgrammableSamplePositionsSupported() const;
-
-    bool                       areRasterOrderGroupsSupported() const;
-
-    ArgumentBuffersTier        argumentBuffersSupport() const;
-
-    [[deprecated("please use areBarycentricCoordsSupported instead")]]
-    bool         barycentricCoordsSupported() const;
-
-    void         convertSparsePixelRegions(const MTL::Region* pixelRegions, MTL::Region* tileRegions, MTL::Size tileSize, MTL::SparseTextureRegionAlignmentMode mode, NS::UInteger numRegions);
-
-    void         convertSparseTileRegions(const MTL::Region* tileRegions, MTL::Region* pixelRegions, MTL::Size tileSize, NS::UInteger numRegions);
-
-    NS::Array*   counterSets() const;
-
-    NS::UInteger currentAllocatedSize() const;
-
-    [[deprecated("please use isDepth24Stencil8PixelFormatSupported instead")]]
-    bool            depth24Stencil8PixelFormatSupported() const;
-
-    FunctionHandle* functionHandle(const MTL::Function* function);
-    FunctionHandle* functionHandle(const MTL4::BinaryFunction* function);
-
-    void            getDefaultSamplePositions(MTL::SamplePosition* positions, NS::UInteger count);
-
-    bool            hasUnifiedMemory() const;
-
-    [[deprecated("please use isHeadless instead")]]
-    bool           headless() const;
-
-    SizeAndAlign   heapAccelerationStructureSizeAndAlign(NS::UInteger size);
-    SizeAndAlign   heapAccelerationStructureSizeAndAlign(const MTL::AccelerationStructureDescriptor* descriptor);
-
-    SizeAndAlign   heapBufferSizeAndAlign(NS::UInteger length, MTL::ResourceOptions options);
-
-    SizeAndAlign   heapTextureSizeAndAlign(const MTL::TextureDescriptor* desc);
-
-    bool           isDepth24Stencil8PixelFormatSupported() const;
-
-    bool           isHeadless() const;
-
-    bool           isLowPower() const;
-
-    bool           isRemovable() const;
-
-    DeviceLocation location() const;
-    NS::UInteger   locationNumber() const;
-
-    [[deprecated("please use isLowPower instead")]]
-    bool                             lowPower() const;
-
-    NS::UInteger                     maxArgumentBufferSamplerCount() const;
-
-    NS::UInteger                     maxBufferLength() const;
-
-    NS::UInteger                     maxThreadgroupMemoryLength() const;
-
-    Size                             maxThreadsPerThreadgroup() const;
-
-    uint64_t                         maxTransferRate() const;
-
-    NS::UInteger                     maximumConcurrentCompilationTaskCount() const;
-
-    NS::UInteger                     minimumLinearTextureAlignmentForPixelFormat(MTL::PixelFormat format);
-
-    NS::UInteger                     minimumTextureBufferAlignmentForPixelFormat(MTL::PixelFormat format);
-
-    NS::String*                      name() const;
-
-    AccelerationStructure*           newAccelerationStructure(NS::UInteger size);
-    AccelerationStructure*           newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor);
-
-    MTL4::Archive*                   newArchive(const NS::URL* url, NS::Error** error);
-
-    ArgumentEncoder*                 newArgumentEncoder(const NS::Array* arguments);
-    ArgumentEncoder*                 newArgumentEncoder(const MTL::BufferBinding* bufferBinding);
-
-    MTL4::ArgumentTable*             newArgumentTable(const MTL4::ArgumentTableDescriptor* descriptor, NS::Error** error);
-
-    BinaryArchive*                   newBinaryArchive(const MTL::BinaryArchiveDescriptor* descriptor, NS::Error** error);
-
-    Buffer*                          newBuffer(NS::UInteger length, MTL::ResourceOptions options);
-    Buffer*                          newBuffer(const void* pointer, NS::UInteger length, MTL::ResourceOptions options);
-    Buffer*                          newBuffer(const void* pointer, NS::UInteger length, MTL::ResourceOptions options, void (^deallocator)(void*, NS::UInteger));
-    Buffer*                          newBuffer(NS::UInteger length, MTL::ResourceOptions options, MTL::SparsePageSize placementSparsePageSize);
-
-    MTL4::CommandAllocator*          newCommandAllocator();
-    MTL4::CommandAllocator*          newCommandAllocator(const MTL4::CommandAllocatorDescriptor* descriptor, NS::Error** error);
-
-    MTL4::CommandBuffer*             newCommandBuffer();
-
-    CommandQueue*                    newCommandQueue();
-    CommandQueue*                    newCommandQueue(NS::UInteger maxCommandBufferCount);
-    CommandQueue*                    newCommandQueue(const MTL::CommandQueueDescriptor* descriptor);
-
-    MTL4::Compiler*                  newCompiler(const MTL4::CompilerDescriptor* descriptor, NS::Error** error);
-
-    ComputePipelineState*            newComputePipelineState(const MTL::Function* computeFunction, NS::Error** error);
-    ComputePipelineState*            newComputePipelineState(const MTL::Function* computeFunction, MTL::PipelineOption options, const MTL::AutoreleasedComputePipelineReflection* reflection, NS::Error** error);
-    void                             newComputePipelineState(const MTL::Function* computeFunction, const MTL::NewComputePipelineStateCompletionHandler completionHandler);
-    void                             newComputePipelineState(const MTL::Function* computeFunction, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandler completionHandler);
-    ComputePipelineState*            newComputePipelineState(const MTL::ComputePipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedComputePipelineReflection* reflection, NS::Error** error);
-    void                             newComputePipelineState(const MTL::ComputePipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandler completionHandler);
-    void                             newComputePipelineState(const MTL::Function* pFunction, const MTL::NewComputePipelineStateCompletionHandlerFunction& completionHandler);
-    void                             newComputePipelineState(const MTL::Function* pFunction, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandlerFunction& completionHandler);
-    void                             newComputePipelineState(const MTL::ComputePipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandlerFunction& completionHandler);
-
-    MTL4::CounterHeap*               newCounterHeap(const MTL4::CounterHeapDescriptor* descriptor, NS::Error** error);
-
-    CounterSampleBuffer*             newCounterSampleBuffer(const MTL::CounterSampleBufferDescriptor* descriptor, NS::Error** error);
-
-    Library*                         newDefaultLibrary();
-    Library*                         newDefaultLibrary(const NS::Bundle* bundle, NS::Error** error);
-
-    DepthStencilState*               newDepthStencilState(const MTL::DepthStencilDescriptor* descriptor);
-
-    DynamicLibrary*                  newDynamicLibrary(const MTL::Library* library, NS::Error** error);
-    DynamicLibrary*                  newDynamicLibrary(const NS::URL* url, NS::Error** error);
-
-    Event*                           newEvent();
-
-    Fence*                           newFence();
-
-    Heap*                            newHeap(const MTL::HeapDescriptor* descriptor);
-
-    IOCommandQueue*                  newIOCommandQueue(const MTL::IOCommandQueueDescriptor* descriptor, NS::Error** error);
-
-    IOFileHandle*                    newIOFileHandle(const NS::URL* url, NS::Error** error);
-    IOFileHandle*                    newIOFileHandle(const NS::URL* url, MTL::IOCompressionMethod compressionMethod, NS::Error** error);
-
-    IOFileHandle*                    newIOHandle(const NS::URL* url, NS::Error** error);
-    IOFileHandle*                    newIOHandle(const NS::URL* url, MTL::IOCompressionMethod compressionMethod, NS::Error** error);
-
-    IndirectCommandBuffer*           newIndirectCommandBuffer(const MTL::IndirectCommandBufferDescriptor* descriptor, NS::UInteger maxCount, MTL::ResourceOptions options);
-
-    Library*                         newLibrary(const NS::String* filepath, NS::Error** error);
-    Library*                         newLibrary(const NS::URL* url, NS::Error** error);
-    Library*                         newLibrary(const dispatch_data_t data, NS::Error** error);
-    Library*                         newLibrary(const NS::String* source, const MTL::CompileOptions* options, NS::Error** error);
-    void                             newLibrary(const NS::String* source, const MTL::CompileOptions* options, const MTL::NewLibraryCompletionHandler completionHandler);
-    Library*                         newLibrary(const MTL::StitchedLibraryDescriptor* descriptor, NS::Error** error);
-    void                             newLibrary(const MTL::StitchedLibraryDescriptor* descriptor, const MTL::NewLibraryCompletionHandler completionHandler);
-    void                             newLibrary(const NS::String* pSource, const MTL::CompileOptions* pOptions, const MTL::NewLibraryCompletionHandlerFunction& completionHandler);
-    void                             newLibrary(const MTL::StitchedLibraryDescriptor* pDescriptor, const MTL::NewLibraryCompletionHandlerFunction& completionHandler);
-
-    LogState*                        newLogState(const MTL::LogStateDescriptor* descriptor, NS::Error** error);
-
-    MTL4::CommandQueue*              newMTL4CommandQueue();
-    MTL4::CommandQueue*              newMTL4CommandQueue(const MTL4::CommandQueueDescriptor* descriptor, NS::Error** error);
-
-    MTL4::PipelineDataSetSerializer* newPipelineDataSetSerializer(const MTL4::PipelineDataSetSerializerDescriptor* descriptor);
-
-    RasterizationRateMap*            newRasterizationRateMap(const MTL::RasterizationRateMapDescriptor* descriptor);
-
-    RenderPipelineState*             newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, NS::Error** error);
-    RenderPipelineState*             newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error);
-    void                             newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, const MTL::NewRenderPipelineStateCompletionHandler completionHandler);
-    void                             newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler);
-    RenderPipelineState*             newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error);
-    void                             newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler);
-    RenderPipelineState*             newRenderPipelineState(const MTL::MeshRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error);
-    void                             newRenderPipelineState(const MTL::MeshRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler);
-    void                             newRenderPipelineState(const MTL::RenderPipelineDescriptor* pDescriptor, const MTL::NewRenderPipelineStateCompletionHandlerFunction& completionHandler);
-    void                             newRenderPipelineState(const MTL::RenderPipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction& completionHandler);
-    void                             newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction& completionHandler);
-
-    ResidencySet*                    newResidencySet(const MTL::ResidencySetDescriptor* desc, NS::Error** error);
-
-    SamplerState*                    newSamplerState(const MTL::SamplerDescriptor* descriptor);
-
-    SharedEvent*                     newSharedEvent();
-    SharedEvent*                     newSharedEvent(const MTL::SharedEventHandle* sharedEventHandle);
-
-    Texture*                         newSharedTexture(const MTL::TextureDescriptor* descriptor);
-    Texture*                         newSharedTexture(const MTL::SharedTextureHandle* sharedHandle);
-
-    Tensor*                          newTensor(const MTL::TensorDescriptor* descriptor, NS::Error** error);
-
-    Texture*                         newTexture(const MTL::TextureDescriptor* descriptor);
-    Texture*                         newTexture(const MTL::TextureDescriptor* descriptor, const IOSurfaceRef iosurface, NS::UInteger plane);
-    TextureViewPool*                 newTextureViewPool(const MTL::ResourceViewPoolDescriptor* descriptor, NS::Error** error);
-
-    uint32_t                         peerCount() const;
-
-    uint64_t                         peerGroupID() const;
-
-    uint32_t                         peerIndex() const;
-
-    [[deprecated("please use areProgrammableSamplePositionsSupported instead")]]
-    bool     programmableSamplePositionsSupported() const;
-
-    uint64_t queryTimestampFrequency();
-
-    [[deprecated("please use areRasterOrderGroupsSupported instead")]]
-    bool                 rasterOrderGroupsSupported() const;
-
-    ReadWriteTextureTier readWriteTextureSupport() const;
-
-    uint64_t             recommendedMaxWorkingSetSize() const;
-
-    uint64_t             registryID() const;
-
-    [[deprecated("please use isRemovable instead")]]
-    bool         removable() const;
-
-    void         sampleTimestamps(MTL::Timestamp* cpuTimestamp, MTL::Timestamp* gpuTimestamp);
-
-    void         setShouldMaximizeConcurrentCompilation(bool shouldMaximizeConcurrentCompilation);
-    bool         shouldMaximizeConcurrentCompilation() const;
-
-    NS::UInteger sizeOfCounterHeapEntry(MTL4::CounterHeapType type);
-
-    Size         sparseTileSize(MTL::TextureType textureType, MTL::PixelFormat pixelFormat, NS::UInteger sampleCount);
-    Size         sparseTileSize(MTL::TextureType textureType, MTL::PixelFormat pixelFormat, NS::UInteger sampleCount, MTL::SparsePageSize sparsePageSize);
-    NS::UInteger sparseTileSizeInBytes() const;
-    NS::UInteger sparseTileSizeInBytes(MTL::SparsePageSize sparsePageSize);
-
-    bool         supports32BitFloatFiltering() const;
-
-    bool         supports32BitMSAA() const;
-
-    bool         supportsBCTextureCompression() const;
-
-    bool         supportsCounterSampling(MTL::CounterSamplingPoint samplingPoint);
-
-    bool         supportsDynamicLibraries() const;
-
-    bool         supportsFamily(MTL::GPUFamily gpuFamily);
-
-    bool         supportsFeatureSet(MTL::FeatureSet featureSet);
-
-    bool         supportsFunctionPointers() const;
-    bool         supportsFunctionPointersFromRender() const;
-
-    bool         supportsPrimitiveMotionBlur() const;
-
-    bool         supportsPullModelInterpolation() const;
-
-    bool         supportsQueryTextureLOD() const;
-
-    bool         supportsRasterizationRateMap(NS::UInteger layerCount);
-
-    bool         supportsRaytracing() const;
-    bool         supportsRaytracingFromRender() const;
-
-    bool         supportsRenderDynamicLibraries() const;
-
-    bool         supportsShaderBarycentricCoordinates() const;
-
-    bool         supportsTextureSampleCount(NS::UInteger sampleCount);
-
-    bool         supportsVertexAmplificationCount(NS::UInteger count);
-
-    SizeAndAlign tensorSizeAndAlign(const MTL::TensorDescriptor* descriptor);
-};
-
-}
-
-#if defined(MTL_PRIVATE_IMPLEMENTATION)
-extern "C" MTL::Device* MTLCreateSystemDefaultDevice();
-extern "C" NS::Array*   MTLCopyAllDevices();
-extern "C" NS::Array*   MTLCopyAllDevicesWithObserver(NS::Object**, MTL::DeviceNotificationHandlerBlock);
-extern "C" void         MTLRemoveDeviceObserver(const NS::Object*);
-_MTL_PRIVATE_DEF_WEAK_CONST(MTL::DeviceNotificationName, DeviceWasAddedNotification);
-_MTL_PRIVATE_DEF_WEAK_CONST(MTL::DeviceNotificationName, DeviceRemovalRequestedNotification);
-_MTL_PRIVATE_DEF_WEAK_CONST(MTL::DeviceNotificationName, DeviceWasRemovedNotification);
-_MTL_PRIVATE_DEF_CONST(NS::ErrorUserInfoKey, CommandBufferEncoderInfoErrorKey);
-_NS_EXPORT MTL::Device* MTL::CreateSystemDefaultDevice()
-{
-    return ::MTLCreateSystemDefaultDevice();
-}
-
-_NS_EXPORT NS::Array* MTL::CopyAllDevices()
-{
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 180000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
-    return ::MTLCopyAllDevices();
-#else
-    return nullptr;
-#endif
-}
-
-_NS_EXPORT NS::Array* MTL::CopyAllDevicesWithObserver(NS::Object** pOutObserver, MTL::DeviceNotificationHandlerBlock handler)
-{
-#if TARGET_OS_OSX
-    return ::MTLCopyAllDevicesWithObserver(pOutObserver, handler);
-#else
-    (void)pOutObserver;
-    (void)handler;
-    return nullptr;
-#endif // TARGET_OS_OSX
-}
-
-_NS_EXPORT NS::Array* MTL::CopyAllDevicesWithObserver(NS::Object** pOutObserver, const MTL::DeviceNotificationHandlerFunction& handler)
-{
-    __block DeviceNotificationHandlerFunction function = handler;
-    return CopyAllDevicesWithObserver(pOutObserver, ^(Device* pDevice, DeviceNotificationName pNotificationName) { function(pDevice, pNotificationName); });
-}
-
-_NS_EXPORT void MTL::RemoveDeviceObserver(const NS::Object* pObserver)
-{
-    (void)pObserver;
-#if TARGET_OS_OSX
-    ::MTLRemoveDeviceObserver(pObserver);
-#endif // TARGET_OS_OSX
-}
-
-#endif // MTL_PRIVATE_IMPLEMENTATION
-
-_MTL_INLINE MTL::BindingAccess MTL::ArgumentDescriptor::access() const
-{
-    return Object::sendMessage<MTL::BindingAccess>(this, _MTL_PRIVATE_SEL(access));
-}
-
-_MTL_INLINE MTL::ArgumentDescriptor* MTL::ArgumentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ArgumentDescriptor>(_MTL_PRIVATE_CLS(MTLArgumentDescriptor));
-}
-
-_MTL_INLINE MTL::ArgumentDescriptor* MTL::ArgumentDescriptor::argumentDescriptor()
-{
-    return Object::sendMessage<MTL::ArgumentDescriptor*>(_MTL_PRIVATE_CLS(MTLArgumentDescriptor), _MTL_PRIVATE_SEL(argumentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArgumentDescriptor::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArgumentDescriptor::constantBlockAlignment() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(constantBlockAlignment));
-}
-
-_MTL_INLINE MTL::DataType MTL::ArgumentDescriptor::dataType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(dataType));
-}
-
-_MTL_INLINE NS::UInteger MTL::ArgumentDescriptor::index() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(index));
-}
-
-_MTL_INLINE MTL::ArgumentDescriptor* MTL::ArgumentDescriptor::init()
-{
-    return NS::Object::init<MTL::ArgumentDescriptor>();
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setAccess(MTL::BindingAccess access)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAccess_), access);
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setArrayLength(NS::UInteger arrayLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArrayLength_), arrayLength);
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setConstantBlockAlignment(NS::UInteger constantBlockAlignment)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantBlockAlignment_), constantBlockAlignment);
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setDataType(MTL::DataType dataType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDataType_), dataType);
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setIndex(NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndex_), index);
-}
-
-_MTL_INLINE void MTL::ArgumentDescriptor::setTextureType(MTL::TextureType textureType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTextureType_), textureType);
-}
-
-_MTL_INLINE MTL::TextureType MTL::ArgumentDescriptor::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE MTL::Architecture* MTL::Architecture::alloc()
-{
-    return NS::Object::alloc<MTL::Architecture>(_MTL_PRIVATE_CLS(MTLArchitecture));
-}
-
-_MTL_INLINE MTL::Architecture* MTL::Architecture::init()
-{
-    return NS::Object::init<MTL::Architecture>();
-}
-
-_MTL_INLINE NS::String* MTL::Architecture::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::AccelerationStructureSizes MTL::Device::accelerationStructureSizes(const MTL::AccelerationStructureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::AccelerationStructureSizes>(this, _MTL_PRIVATE_SEL(accelerationStructureSizesWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::Architecture* MTL::Device::architecture() const
-{
-    return Object::sendMessage<MTL::Architecture*>(this, _MTL_PRIVATE_SEL(architecture));
-}
-
-_MTL_INLINE bool MTL::Device::areBarycentricCoordsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areBarycentricCoordsSupported));
-}
-
-_MTL_INLINE bool MTL::Device::areProgrammableSamplePositionsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areProgrammableSamplePositionsSupported));
-}
-
-_MTL_INLINE bool MTL::Device::areRasterOrderGroupsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areRasterOrderGroupsSupported));
-}
-
-_MTL_INLINE MTL::ArgumentBuffersTier MTL::Device::argumentBuffersSupport() const
-{
-    return Object::sendMessage<MTL::ArgumentBuffersTier>(this, _MTL_PRIVATE_SEL(argumentBuffersSupport));
-}
-
-_MTL_INLINE bool MTL::Device::barycentricCoordsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areBarycentricCoordsSupported));
-}
-
-_MTL_INLINE void MTL::Device::convertSparsePixelRegions(const MTL::Region* pixelRegions, MTL::Region* tileRegions, MTL::Size tileSize, MTL::SparseTextureRegionAlignmentMode mode, NS::UInteger numRegions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(convertSparsePixelRegions_toTileRegions_withTileSize_alignmentMode_numRegions_), pixelRegions, tileRegions, tileSize, mode, numRegions);
-}
-
-_MTL_INLINE void MTL::Device::convertSparseTileRegions(const MTL::Region* tileRegions, MTL::Region* pixelRegions, MTL::Size tileSize, NS::UInteger numRegions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(convertSparseTileRegions_toPixelRegions_withTileSize_numRegions_), tileRegions, pixelRegions, tileSize, numRegions);
-}
-
-_MTL_INLINE NS::Array* MTL::Device::counterSets() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(counterSets));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::currentAllocatedSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(currentAllocatedSize));
-}
-
-_MTL_INLINE bool MTL::Device::depth24Stencil8PixelFormatSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(isDepth24Stencil8PixelFormatSupported));
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::Device::functionHandle(const MTL::Function* function)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithFunction_), function);
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::Device::functionHandle(const MTL4::BinaryFunction* function)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithBinaryFunction_), function);
-}
-
-_MTL_INLINE void MTL::Device::getDefaultSamplePositions(MTL::SamplePosition* positions, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(getDefaultSamplePositions_count_), positions, count);
-}
-
-_MTL_INLINE bool MTL::Device::hasUnifiedMemory() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(hasUnifiedMemory));
-}
-
-_MTL_INLINE bool MTL::Device::headless() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isHeadless));
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::Device::heapAccelerationStructureSizeAndAlign(NS::UInteger size)
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(heapAccelerationStructureSizeAndAlignWithSize_), size);
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::Device::heapAccelerationStructureSizeAndAlign(const MTL::AccelerationStructureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(heapAccelerationStructureSizeAndAlignWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::Device::heapBufferSizeAndAlign(NS::UInteger length, MTL::ResourceOptions options)
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(heapBufferSizeAndAlignWithLength_options_), length, options);
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::Device::heapTextureSizeAndAlign(const MTL::TextureDescriptor* desc)
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(heapTextureSizeAndAlignWithDescriptor_), desc);
-}
-
-_MTL_INLINE bool MTL::Device::isDepth24Stencil8PixelFormatSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(isDepth24Stencil8PixelFormatSupported));
-}
-
-_MTL_INLINE bool MTL::Device::isHeadless() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isHeadless));
-}
-
-_MTL_INLINE bool MTL::Device::isLowPower() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isLowPower));
-}
-
-_MTL_INLINE bool MTL::Device::isRemovable() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRemovable));
-}
-
-_MTL_INLINE MTL::DeviceLocation MTL::Device::location() const
-{
-    return Object::sendMessage<MTL::DeviceLocation>(this, _MTL_PRIVATE_SEL(location));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::locationNumber() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(locationNumber));
-}
-
-_MTL_INLINE bool MTL::Device::lowPower() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isLowPower));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::maxArgumentBufferSamplerCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxArgumentBufferSamplerCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::maxBufferLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxBufferLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::maxThreadgroupMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxThreadgroupMemoryLength));
-}
-
-_MTL_INLINE MTL::Size MTL::Device::maxThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(maxThreadsPerThreadgroup));
-}
-
-_MTL_INLINE uint64_t MTL::Device::maxTransferRate() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(maxTransferRate));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::maximumConcurrentCompilationTaskCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maximumConcurrentCompilationTaskCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::minimumLinearTextureAlignmentForPixelFormat(MTL::PixelFormat format)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(minimumLinearTextureAlignmentForPixelFormat_), format);
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::minimumTextureBufferAlignmentForPixelFormat(MTL::PixelFormat format)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(minimumTextureBufferAlignmentForPixelFormat_), format);
-}
-
-_MTL_INLINE NS::String* MTL::Device::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Device::newAccelerationStructure(NS::UInteger size)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithSize_), size);
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Device::newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL4::Archive* MTL::Device::newArchive(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::Archive*>(this, _MTL_PRIVATE_SEL(newArchiveWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL::ArgumentEncoder* MTL::Device::newArgumentEncoder(const NS::Array* arguments)
-{
-    return Object::sendMessage<MTL::ArgumentEncoder*>(this, _MTL_PRIVATE_SEL(newArgumentEncoderWithArguments_), arguments);
-}
-
-_MTL_INLINE MTL::ArgumentEncoder* MTL::Device::newArgumentEncoder(const MTL::BufferBinding* bufferBinding)
-{
-    return Object::sendMessage<MTL::ArgumentEncoder*>(this, _MTL_PRIVATE_SEL(newArgumentEncoderWithBufferBinding_), bufferBinding);
-}
-
-_MTL_INLINE MTL4::ArgumentTable* MTL::Device::newArgumentTable(const MTL4::ArgumentTableDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::ArgumentTable*>(this, _MTL_PRIVATE_SEL(newArgumentTableWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::BinaryArchive* MTL::Device::newBinaryArchive(const MTL::BinaryArchiveDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::BinaryArchive*>(this, _MTL_PRIVATE_SEL(newBinaryArchiveWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Device::newBuffer(NS::UInteger length, MTL::ResourceOptions options)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithLength_options_), length, options);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Device::newBuffer(const void* pointer, NS::UInteger length, MTL::ResourceOptions options)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithBytes_length_options_), pointer, length, options);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Device::newBuffer(const void* pointer, NS::UInteger length, MTL::ResourceOptions options, void (^deallocator)(void*, NS::UInteger))
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithBytesNoCopy_length_options_deallocator_), pointer, length, options, deallocator);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Device::newBuffer(NS::UInteger length, MTL::ResourceOptions options, MTL::SparsePageSize placementSparsePageSize)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithLength_options_placementSparsePageSize_), length, options, placementSparsePageSize);
-}
-
-_MTL_INLINE MTL4::CommandAllocator* MTL::Device::newCommandAllocator()
-{
-    return Object::sendMessage<MTL4::CommandAllocator*>(this, _MTL_PRIVATE_SEL(newCommandAllocator));
-}
-
-_MTL_INLINE MTL4::CommandAllocator* MTL::Device::newCommandAllocator(const MTL4::CommandAllocatorDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::CommandAllocator*>(this, _MTL_PRIVATE_SEL(newCommandAllocatorWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL4::CommandBuffer* MTL::Device::newCommandBuffer()
-{
-    return Object::sendMessage<MTL4::CommandBuffer*>(this, _MTL_PRIVATE_SEL(newCommandBuffer));
-}
-
-_MTL_INLINE MTL::CommandQueue* MTL::Device::newCommandQueue()
-{
-    return Object::sendMessage<MTL::CommandQueue*>(this, _MTL_PRIVATE_SEL(newCommandQueue));
-}
-
-_MTL_INLINE MTL::CommandQueue* MTL::Device::newCommandQueue(NS::UInteger maxCommandBufferCount)
-{
-    return Object::sendMessage<MTL::CommandQueue*>(this, _MTL_PRIVATE_SEL(newCommandQueueWithMaxCommandBufferCount_), maxCommandBufferCount);
-}
-
-_MTL_INLINE MTL::CommandQueue* MTL::Device::newCommandQueue(const MTL::CommandQueueDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::CommandQueue*>(this, _MTL_PRIVATE_SEL(newCommandQueueWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL4::Compiler* MTL::Device::newCompiler(const MTL4::CompilerDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::Compiler*>(this, _MTL_PRIVATE_SEL(newCompilerWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL::Device::newComputePipelineState(const MTL::Function* computeFunction, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithFunction_error_), computeFunction, error);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL::Device::newComputePipelineState(const MTL::Function* computeFunction, MTL::PipelineOption options, const MTL::AutoreleasedComputePipelineReflection* reflection, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithFunction_options_reflection_error_), computeFunction, options, reflection, error);
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::Function* computeFunction, const MTL::NewComputePipelineStateCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithFunction_completionHandler_), computeFunction, completionHandler);
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::Function* computeFunction, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithFunction_options_completionHandler_), computeFunction, options, completionHandler);
-}
-
-_MTL_INLINE MTL::ComputePipelineState* MTL::Device::newComputePipelineState(const MTL::ComputePipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedComputePipelineReflection* reflection, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ComputePipelineState*>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_options_reflection_error_), descriptor, options, reflection, error);
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::ComputePipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newComputePipelineStateWithDescriptor_options_completionHandler_), descriptor, options, completionHandler);
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::Function* pFunction, const MTL::NewComputePipelineStateCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewComputePipelineStateCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newComputePipelineState(pFunction, ^(MTL::ComputePipelineState* pPipelineState, NS::Error* pError) { blockCompletionHandler(pPipelineState, pError); });
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::Function* pFunction, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewComputePipelineStateWithReflectionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newComputePipelineState(pFunction, options, ^(MTL::ComputePipelineState* pPipelineState, MTL::ComputePipelineReflection* pReflection, NS::Error* pError) { blockCompletionHandler(pPipelineState, pReflection, pError); });
-}
-
-_MTL_INLINE void MTL::Device::newComputePipelineState(const MTL::ComputePipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewComputePipelineStateWithReflectionCompletionHandlerFunction& completionHandler)
-{
-    __block NewComputePipelineStateWithReflectionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newComputePipelineState(pDescriptor, options, ^(ComputePipelineState* pPipelineState, ComputePipelineReflection* pReflection, NS::Error* pError) { blockCompletionHandler(pPipelineState, pReflection, pError); });
-}
-
-_MTL_INLINE MTL4::CounterHeap* MTL::Device::newCounterHeap(const MTL4::CounterHeapDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::CounterHeap*>(this, _MTL_PRIVATE_SEL(newCounterHeapWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::Device::newCounterSampleBuffer(const MTL::CounterSampleBufferDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(newCounterSampleBufferWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newDefaultLibrary()
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newDefaultLibrary));
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newDefaultLibrary(const NS::Bundle* bundle, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newDefaultLibraryWithBundle_error_), bundle, error);
-}
-
-_MTL_INLINE MTL::DepthStencilState* MTL::Device::newDepthStencilState(const MTL::DepthStencilDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::DepthStencilState*>(this, _MTL_PRIVATE_SEL(newDepthStencilStateWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::DynamicLibrary* MTL::Device::newDynamicLibrary(const MTL::Library* library, NS::Error** error)
-{
-    return Object::sendMessage<MTL::DynamicLibrary*>(this, _MTL_PRIVATE_SEL(newDynamicLibrary_error_), library, error);
-}
-
-_MTL_INLINE MTL::DynamicLibrary* MTL::Device::newDynamicLibrary(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL::DynamicLibrary*>(this, _MTL_PRIVATE_SEL(newDynamicLibraryWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL::Event* MTL::Device::newEvent()
-{
-    return Object::sendMessage<MTL::Event*>(this, _MTL_PRIVATE_SEL(newEvent));
-}
-
-_MTL_INLINE MTL::Fence* MTL::Device::newFence()
-{
-    return Object::sendMessage<MTL::Fence*>(this, _MTL_PRIVATE_SEL(newFence));
-}
-
-_MTL_INLINE MTL::Heap* MTL::Device::newHeap(const MTL::HeapDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::Heap*>(this, _MTL_PRIVATE_SEL(newHeapWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::IOCommandQueue* MTL::Device::newIOCommandQueue(const MTL::IOCommandQueueDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::IOCommandQueue*>(this, _MTL_PRIVATE_SEL(newIOCommandQueueWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::IOFileHandle* MTL::Device::newIOFileHandle(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL::IOFileHandle*>(this, _MTL_PRIVATE_SEL(newIOFileHandleWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL::IOFileHandle* MTL::Device::newIOFileHandle(const NS::URL* url, MTL::IOCompressionMethod compressionMethod, NS::Error** error)
-{
-    return Object::sendMessage<MTL::IOFileHandle*>(this, _MTL_PRIVATE_SEL(newIOFileHandleWithURL_compressionMethod_error_), url, compressionMethod, error);
-}
-
-_MTL_INLINE MTL::IOFileHandle* MTL::Device::newIOHandle(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL::IOFileHandle*>(this, _MTL_PRIVATE_SEL(newIOHandleWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL::IOFileHandle* MTL::Device::newIOHandle(const NS::URL* url, MTL::IOCompressionMethod compressionMethod, NS::Error** error)
-{
-    return Object::sendMessage<MTL::IOFileHandle*>(this, _MTL_PRIVATE_SEL(newIOHandleWithURL_compressionMethod_error_), url, compressionMethod, error);
-}
-
-_MTL_INLINE MTL::IndirectCommandBuffer* MTL::Device::newIndirectCommandBuffer(const MTL::IndirectCommandBufferDescriptor* descriptor, NS::UInteger maxCount, MTL::ResourceOptions options)
-{
-    return Object::sendMessage<MTL::IndirectCommandBuffer*>(this, _MTL_PRIVATE_SEL(newIndirectCommandBufferWithDescriptor_maxCommandCount_options_), descriptor, maxCount, options);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newLibrary(const NS::String* filepath, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithFile_error_), filepath, error);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newLibrary(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithURL_error_), url, error);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newLibrary(const dispatch_data_t data, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithData_error_), data, error);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newLibrary(const NS::String* source, const MTL::CompileOptions* options, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithSource_options_error_), source, options, error);
-}
-
-_MTL_INLINE void MTL::Device::newLibrary(const NS::String* source, const MTL::CompileOptions* options, const MTL::NewLibraryCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newLibraryWithSource_options_completionHandler_), source, options, completionHandler);
-}
-
-_MTL_INLINE MTL::Library* MTL::Device::newLibrary(const MTL::StitchedLibraryDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Library*>(this, _MTL_PRIVATE_SEL(newLibraryWithStitchedDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE void MTL::Device::newLibrary(const MTL::StitchedLibraryDescriptor* descriptor, const MTL::NewLibraryCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newLibraryWithStitchedDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE void MTL::Device::newLibrary(const NS::String* pSource, const MTL::CompileOptions* pOptions, const MTL::NewLibraryCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewLibraryCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newLibrary(pSource, pOptions, ^(MTL::Library* pLibrary, NS::Error* pError) { blockCompletionHandler(pLibrary, pError); });
-}
-
-_MTL_INLINE void MTL::Device::newLibrary(const MTL::StitchedLibraryDescriptor* pDescriptor, const MTL::NewLibraryCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewLibraryCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newLibrary(pDescriptor, ^(MTL::Library* pLibrary, NS::Error* pError) { blockCompletionHandler(pLibrary, pError); });
-}
-
-_MTL_INLINE MTL::LogState* MTL::Device::newLogState(const MTL::LogStateDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::LogState*>(this, _MTL_PRIVATE_SEL(newLogStateWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL4::CommandQueue* MTL::Device::newMTL4CommandQueue()
-{
-    return Object::sendMessage<MTL4::CommandQueue*>(this, _MTL_PRIVATE_SEL(newMTL4CommandQueue));
-}
-
-_MTL_INLINE MTL4::CommandQueue* MTL::Device::newMTL4CommandQueue(const MTL4::CommandQueueDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL4::CommandQueue*>(this, _MTL_PRIVATE_SEL(newMTL4CommandQueueWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL4::PipelineDataSetSerializer* MTL::Device::newPipelineDataSetSerializer(const MTL4::PipelineDataSetSerializerDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL4::PipelineDataSetSerializer*>(this, _MTL_PRIVATE_SEL(newPipelineDataSetSerializerWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::RasterizationRateMap* MTL::Device::newRasterizationRateMap(const MTL::RasterizationRateMapDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::RasterizationRateMap*>(this, _MTL_PRIVATE_SEL(newRasterizationRateMapWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_options_reflection_error_), descriptor, options, reflection, error);
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, const MTL::NewRenderPipelineStateCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithDescriptor_options_completionHandler_), descriptor, options, completionHandler);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::Device::newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithTileDescriptor_options_reflection_error_), descriptor, options, reflection, error);
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithTileDescriptor_options_completionHandler_), descriptor, options, completionHandler);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::Device::newRenderPipelineState(const MTL::MeshRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::AutoreleasedRenderPipelineReflection* reflection, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithMeshDescriptor_options_reflection_error_), descriptor, options, reflection, error);
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::MeshRenderPipelineDescriptor* descriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandler completionHandler)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithMeshDescriptor_options_completionHandler_), descriptor, options, completionHandler);
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* pDescriptor, const MTL::NewRenderPipelineStateCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewRenderPipelineStateCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newRenderPipelineState(pDescriptor, ^(MTL::RenderPipelineState* pPipelineState, NS::Error* pError) { blockCompletionHandler(pPipelineState, pError); });
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::RenderPipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newRenderPipelineState(pDescriptor, options, ^(MTL::RenderPipelineState* pPipelineState, MTL::RenderPipelineReflection* pReflection, NS::Error* pError) { blockCompletionHandler(pPipelineState, pReflection, pError); });
-}
-
-_MTL_INLINE void MTL::Device::newRenderPipelineState(const MTL::TileRenderPipelineDescriptor* pDescriptor, MTL::PipelineOption options, const MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::NewRenderPipelineStateWithReflectionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newRenderPipelineState(pDescriptor, options, ^(MTL::RenderPipelineState* pPipelineState, MTL::RenderPipelineReflection* pReflection, NS::Error* pError) { blockCompletionHandler(pPipelineState, pReflection, pError); });
-}
-
-_MTL_INLINE MTL::ResidencySet* MTL::Device::newResidencySet(const MTL::ResidencySetDescriptor* desc, NS::Error** error)
-{
-    return Object::sendMessage<MTL::ResidencySet*>(this, _MTL_PRIVATE_SEL(newResidencySetWithDescriptor_error_), desc, error);
-}
-
-_MTL_INLINE MTL::SamplerState* MTL::Device::newSamplerState(const MTL::SamplerDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::SamplerState*>(this, _MTL_PRIVATE_SEL(newSamplerStateWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::SharedEvent* MTL::Device::newSharedEvent()
-{
-    return Object::sendMessage<MTL::SharedEvent*>(this, _MTL_PRIVATE_SEL(newSharedEvent));
-}
-
-_MTL_INLINE MTL::SharedEvent* MTL::Device::newSharedEvent(const MTL::SharedEventHandle* sharedEventHandle)
-{
-    return Object::sendMessage<MTL::SharedEvent*>(this, _MTL_PRIVATE_SEL(newSharedEventWithHandle_), sharedEventHandle);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Device::newSharedTexture(const MTL::TextureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newSharedTextureWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Device::newSharedTexture(const MTL::SharedTextureHandle* sharedHandle)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newSharedTextureWithHandle_), sharedHandle);
-}
-
-_MTL_INLINE MTL::Tensor* MTL::Device::newTensor(const MTL::TensorDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Tensor*>(this, _MTL_PRIVATE_SEL(newTensorWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Device::newTexture(const MTL::TextureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Device::newTexture(const MTL::TextureDescriptor* descriptor, const IOSurfaceRef iosurface, NS::UInteger plane)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureWithDescriptor_iosurface_plane_), descriptor, iosurface, plane);
-}
-
-_MTL_INLINE MTL::TextureViewPool* MTL::Device::newTextureViewPool(const MTL::ResourceViewPoolDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::TextureViewPool*>(this, _MTL_PRIVATE_SEL(newTextureViewPoolWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE uint32_t MTL::Device::peerCount() const
-{
-    return Object::sendMessage<uint32_t>(this, _MTL_PRIVATE_SEL(peerCount));
-}
-
-_MTL_INLINE uint64_t MTL::Device::peerGroupID() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(peerGroupID));
-}
-
-_MTL_INLINE uint32_t MTL::Device::peerIndex() const
-{
-    return Object::sendMessage<uint32_t>(this, _MTL_PRIVATE_SEL(peerIndex));
-}
-
-_MTL_INLINE bool MTL::Device::programmableSamplePositionsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areProgrammableSamplePositionsSupported));
-}
-
-_MTL_INLINE uint64_t MTL::Device::queryTimestampFrequency()
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(queryTimestampFrequency));
-}
-
-_MTL_INLINE bool MTL::Device::rasterOrderGroupsSupported() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(areRasterOrderGroupsSupported));
-}
-
-_MTL_INLINE MTL::ReadWriteTextureTier MTL::Device::readWriteTextureSupport() const
-{
-    return Object::sendMessage<MTL::ReadWriteTextureTier>(this, _MTL_PRIVATE_SEL(readWriteTextureSupport));
-}
-
-_MTL_INLINE uint64_t MTL::Device::recommendedMaxWorkingSetSize() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(recommendedMaxWorkingSetSize));
-}
-
-_MTL_INLINE uint64_t MTL::Device::registryID() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(registryID));
-}
-
-_MTL_INLINE bool MTL::Device::removable() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRemovable));
-}
-
-_MTL_INLINE void MTL::Device::sampleTimestamps(MTL::Timestamp* cpuTimestamp, MTL::Timestamp* gpuTimestamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(sampleTimestamps_gpuTimestamp_), cpuTimestamp, gpuTimestamp);
-}
-
-_MTL_INLINE void MTL::Device::setShouldMaximizeConcurrentCompilation(bool shouldMaximizeConcurrentCompilation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShouldMaximizeConcurrentCompilation_), shouldMaximizeConcurrentCompilation);
-}
-
-_MTL_INLINE bool MTL::Device::shouldMaximizeConcurrentCompilation() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(shouldMaximizeConcurrentCompilation));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::sizeOfCounterHeapEntry(MTL4::CounterHeapType type)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sizeOfCounterHeapEntry_), type);
-}
-
-_MTL_INLINE MTL::Size MTL::Device::sparseTileSize(MTL::TextureType textureType, MTL::PixelFormat pixelFormat, NS::UInteger sampleCount)
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(sparseTileSizeWithTextureType_pixelFormat_sampleCount_), textureType, pixelFormat, sampleCount);
-}
-
-_MTL_INLINE MTL::Size MTL::Device::sparseTileSize(MTL::TextureType textureType, MTL::PixelFormat pixelFormat, NS::UInteger sampleCount, MTL::SparsePageSize sparsePageSize)
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(sparseTileSizeWithTextureType_pixelFormat_sampleCount_sparsePageSize_), textureType, pixelFormat, sampleCount, sparsePageSize);
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::sparseTileSizeInBytes() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sparseTileSizeInBytes));
-}
-
-_MTL_INLINE NS::UInteger MTL::Device::sparseTileSizeInBytes(MTL::SparsePageSize sparsePageSize)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sparseTileSizeInBytesForSparsePageSize_), sparsePageSize);
-}
-
-_MTL_INLINE bool MTL::Device::supports32BitFloatFiltering() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supports32BitFloatFiltering));
-}
-
-_MTL_INLINE bool MTL::Device::supports32BitMSAA() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supports32BitMSAA));
-}
-
-_MTL_INLINE bool MTL::Device::supportsBCTextureCompression() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsBCTextureCompression));
-}
-
-_MTL_INLINE bool MTL::Device::supportsCounterSampling(MTL::CounterSamplingPoint samplingPoint)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsCounterSampling_), samplingPoint);
-}
-
-_MTL_INLINE bool MTL::Device::supportsDynamicLibraries() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsDynamicLibraries));
-}
-
-_MTL_INLINE bool MTL::Device::supportsFamily(MTL::GPUFamily gpuFamily)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsFamily_), gpuFamily);
-}
-
-_MTL_INLINE bool MTL::Device::supportsFeatureSet(MTL::FeatureSet featureSet)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsFeatureSet_), featureSet);
-}
-
-_MTL_INLINE bool MTL::Device::supportsFunctionPointers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsFunctionPointers));
-}
-
-_MTL_INLINE bool MTL::Device::supportsFunctionPointersFromRender() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsFunctionPointersFromRender));
-}
-
-_MTL_INLINE bool MTL::Device::supportsPrimitiveMotionBlur() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsPrimitiveMotionBlur));
-}
-
-_MTL_INLINE bool MTL::Device::supportsPullModelInterpolation() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsPullModelInterpolation));
-}
-
-_MTL_INLINE bool MTL::Device::supportsQueryTextureLOD() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsQueryTextureLOD));
-}
-
-_MTL_INLINE bool MTL::Device::supportsRasterizationRateMap(NS::UInteger layerCount)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsRasterizationRateMapWithLayerCount_), layerCount);
-}
-
-_MTL_INLINE bool MTL::Device::supportsRaytracing() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsRaytracing));
-}
-
-_MTL_INLINE bool MTL::Device::supportsRaytracingFromRender() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsRaytracingFromRender));
-}
-
-_MTL_INLINE bool MTL::Device::supportsRenderDynamicLibraries() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsRenderDynamicLibraries));
-}
-
-_MTL_INLINE bool MTL::Device::supportsShaderBarycentricCoordinates() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsShaderBarycentricCoordinates));
-}
-
-_MTL_INLINE bool MTL::Device::supportsTextureSampleCount(NS::UInteger sampleCount)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsTextureSampleCount_), sampleCount);
-}
-
-_MTL_INLINE bool MTL::Device::supportsVertexAmplificationCount(NS::UInteger count)
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportsVertexAmplificationCount_), count);
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::Device::tensorSizeAndAlign(const MTL::TensorDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(tensorSizeAndAlignWithDescriptor_), descriptor);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDrawable.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDrawable.hpp
deleted file mode 100644
index fad4feda..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDrawable.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDrawable.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <functional>
-
-namespace MTL
-{
-class Drawable;
-
-using DrawablePresentedHandler = void (^)(MTL::Drawable*);
-using DrawablePresentedHandlerFunction = std::function<void(MTL::Drawable*)>;
-
-class Drawable : public NS::Referencing<Drawable>
-{
-public:
-    void           addPresentedHandler(const MTL::DrawablePresentedHandler block);
-    void           addPresentedHandler(const MTL::DrawablePresentedHandlerFunction& function);
-
-    NS::UInteger   drawableID() const;
-
-    void           present();
-    void           presentAfterMinimumDuration(CFTimeInterval duration);
-
-    void           presentAtTime(CFTimeInterval presentationTime);
-
-    CFTimeInterval presentedTime() const;
-};
-
-}
-_MTL_INLINE void MTL::Drawable::addPresentedHandler(const MTL::DrawablePresentedHandler block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addPresentedHandler_), block);
-}
-
-_MTL_INLINE void MTL::Drawable::addPresentedHandler(const MTL::DrawablePresentedHandlerFunction& function)
-{
-    __block DrawablePresentedHandlerFunction blockFunction = function;
-    addPresentedHandler(^(Drawable* pDrawable) { blockFunction(pDrawable); });
-}
-
-_MTL_INLINE NS::UInteger MTL::Drawable::drawableID() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(drawableID));
-}
-
-_MTL_INLINE void MTL::Drawable::present()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(present));
-}
-
-_MTL_INLINE void MTL::Drawable::presentAfterMinimumDuration(CFTimeInterval duration)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(presentAfterMinimumDuration_), duration);
-}
-
-_MTL_INLINE void MTL::Drawable::presentAtTime(CFTimeInterval presentationTime)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(presentAtTime_), presentationTime);
-}
-
-_MTL_INLINE CFTimeInterval MTL::Drawable::presentedTime() const
-{
-    return Object::sendMessage<CFTimeInterval>(this, _MTL_PRIVATE_SEL(presentedTime));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLDynamicLibrary.hpp b/engine/thirdparty/metal-cpp/Metal/MTLDynamicLibrary.hpp
deleted file mode 100644
index 0726acc1..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLDynamicLibrary.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLDynamicLibrary.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Device;
-_MTL_ENUM(NS::UInteger, DynamicLibraryError) {
-    DynamicLibraryErrorNone = 0,
-    DynamicLibraryErrorInvalidFile = 1,
-    DynamicLibraryErrorCompilationFailure = 2,
-    DynamicLibraryErrorUnresolvedInstallName = 3,
-    DynamicLibraryErrorDependencyLoadFailure = 4,
-    DynamicLibraryErrorUnsupported = 5,
-};
-
-class DynamicLibrary : public NS::Referencing<DynamicLibrary>
-{
-public:
-    Device*     device() const;
-
-    NS::String* installName() const;
-
-    NS::String* label() const;
-
-    bool        serializeToURL(const NS::URL* url, NS::Error** error);
-
-    void        setLabel(const NS::String* label);
-};
-
-}
-_MTL_INLINE MTL::Device* MTL::DynamicLibrary::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::DynamicLibrary::installName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(installName));
-}
-
-_MTL_INLINE NS::String* MTL::DynamicLibrary::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE bool MTL::DynamicLibrary::serializeToURL(const NS::URL* url, NS::Error** error)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(serializeToURL_error_), url, error);
-}
-
-_MTL_INLINE void MTL::DynamicLibrary::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLEvent.hpp b/engine/thirdparty/metal-cpp/Metal/MTLEvent.hpp
deleted file mode 100644
index d06b9693..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLEvent.hpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLEvent.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <cstdint>
-#include <dispatch/dispatch.h>
-
-#include <cstdint>
-#include <functional>
-
-namespace MTL
-{
-class Device;
-class SharedEvent;
-class SharedEventHandle;
-class SharedEventListener;
-
-using SharedEventNotificationBlock = void (^)(SharedEvent* pEvent, std::uint64_t value);
-using SharedEventNotificationFunction = std::function<void(SharedEvent* pEvent, std::uint64_t value)>;
-
-class Event : public NS::Referencing<Event>
-{
-public:
-    Device*     device() const;
-
-    NS::String* label() const;
-    void        setLabel(const NS::String* label);
-};
-class SharedEventListener : public NS::Referencing<SharedEventListener>
-{
-public:
-    static SharedEventListener* alloc();
-
-    dispatch_queue_t            dispatchQueue() const;
-
-    SharedEventListener*        init();
-    SharedEventListener*        init(const dispatch_queue_t dispatchQueue);
-
-    static SharedEventListener* sharedListener();
-};
-class SharedEvent : public NS::Referencing<SharedEvent, Event>
-{
-public:
-    SharedEventHandle* newSharedEventHandle();
-
-    void               notifyListener(const MTL::SharedEventListener* listener, uint64_t value, const MTL::SharedEventNotificationBlock block);
-    void               notifyListener(const MTL::SharedEventListener* listener, uint64_t value, const MTL::SharedEventNotificationFunction& function);
-
-    void               setSignaledValue(uint64_t signaledValue);
-    uint64_t           signaledValue() const;
-    bool               waitUntilSignaledValue(uint64_t value, uint64_t milliseconds);
-};
-class SharedEventHandle : public NS::SecureCoding<SharedEventHandle>
-{
-public:
-    static SharedEventHandle* alloc();
-
-    SharedEventHandle*        init();
-
-    NS::String*               label() const;
-};
-
-}
-_MTL_INLINE MTL::Device* MTL::Event::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::Event::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::Event::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::SharedEventListener* MTL::SharedEventListener::alloc()
-{
-    return NS::Object::alloc<MTL::SharedEventListener>(_MTL_PRIVATE_CLS(MTLSharedEventListener));
-}
-
-_MTL_INLINE dispatch_queue_t MTL::SharedEventListener::dispatchQueue() const
-{
-    return Object::sendMessage<dispatch_queue_t>(this, _MTL_PRIVATE_SEL(dispatchQueue));
-}
-
-_MTL_INLINE MTL::SharedEventListener* MTL::SharedEventListener::init()
-{
-    return NS::Object::init<MTL::SharedEventListener>();
-}
-
-_MTL_INLINE MTL::SharedEventListener* MTL::SharedEventListener::init(const dispatch_queue_t dispatchQueue)
-{
-    return Object::sendMessage<MTL::SharedEventListener*>(this, _MTL_PRIVATE_SEL(initWithDispatchQueue_), dispatchQueue);
-}
-
-_MTL_INLINE MTL::SharedEventListener* MTL::SharedEventListener::sharedListener()
-{
-    return Object::sendMessage<MTL::SharedEventListener*>(_MTL_PRIVATE_CLS(MTLSharedEventListener), _MTL_PRIVATE_SEL(sharedListener));
-}
-
-_MTL_INLINE MTL::SharedEventHandle* MTL::SharedEvent::newSharedEventHandle()
-{
-    return Object::sendMessage<MTL::SharedEventHandle*>(this, _MTL_PRIVATE_SEL(newSharedEventHandle));
-}
-
-_MTL_INLINE void MTL::SharedEvent::notifyListener(const MTL::SharedEventListener* listener, uint64_t value, const MTL::SharedEventNotificationBlock block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(notifyListener_atValue_block_), listener, value, block);
-}
-
-_MTL_INLINE void MTL::SharedEvent::notifyListener(const MTL::SharedEventListener* listener, uint64_t value, const MTL::SharedEventNotificationFunction& function)
-{
-    __block MTL::SharedEventNotificationFunction callback = function;
-    notifyListener(listener, value, ^void(SharedEvent* pEvent, std::uint64_t innerValue) { callback(pEvent, innerValue); });
-}
-
-_MTL_INLINE void MTL::SharedEvent::setSignaledValue(uint64_t signaledValue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSignaledValue_), signaledValue);
-}
-
-_MTL_INLINE uint64_t MTL::SharedEvent::signaledValue() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(signaledValue));
-}
-
-_MTL_INLINE bool MTL::SharedEvent::waitUntilSignaledValue(uint64_t value, uint64_t milliseconds)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(waitUntilSignaledValue_timeoutMS_), value, milliseconds);
-}
-
-_MTL_INLINE MTL::SharedEventHandle* MTL::SharedEventHandle::alloc()
-{
-    return NS::Object::alloc<MTL::SharedEventHandle>(_MTL_PRIVATE_CLS(MTLSharedEventHandle));
-}
-
-_MTL_INLINE MTL::SharedEventHandle* MTL::SharedEventHandle::init()
-{
-    return NS::Object::init<MTL::SharedEventHandle>();
-}
-
-_MTL_INLINE NS::String* MTL::SharedEventHandle::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFence.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFence.hpp
deleted file mode 100644
index f31df4ce..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFence.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFence.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Device;
-
-class Fence : public NS::Referencing<Fence>
-{
-public:
-    Device*     device() const;
-
-    NS::String* label() const;
-    void        setLabel(const NS::String* label);
-};
-
-}
-_MTL_INLINE MTL::Device* MTL::Fence::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::Fence::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::Fence::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFunctionConstantValues.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFunctionConstantValues.hpp
deleted file mode 100644
index dce89d15..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFunctionConstantValues.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFunctionConstantValues.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDataType.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class FunctionConstantValues;
-
-class FunctionConstantValues : public NS::Copying<FunctionConstantValues>
-{
-public:
-    static FunctionConstantValues* alloc();
-
-    FunctionConstantValues*        init();
-
-    void                           reset();
-
-    void                           setConstantValue(const void* value, MTL::DataType type, NS::UInteger index);
-    void                           setConstantValue(const void* value, MTL::DataType type, const NS::String* name);
-    void                           setConstantValues(const void* values, MTL::DataType type, NS::Range range);
-};
-
-}
-_MTL_INLINE MTL::FunctionConstantValues* MTL::FunctionConstantValues::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionConstantValues>(_MTL_PRIVATE_CLS(MTLFunctionConstantValues));
-}
-
-_MTL_INLINE MTL::FunctionConstantValues* MTL::FunctionConstantValues::init()
-{
-    return NS::Object::init<MTL::FunctionConstantValues>();
-}
-
-_MTL_INLINE void MTL::FunctionConstantValues::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::FunctionConstantValues::setConstantValue(const void* value, MTL::DataType type, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantValue_type_atIndex_), value, type, index);
-}
-
-_MTL_INLINE void MTL::FunctionConstantValues::setConstantValue(const void* value, MTL::DataType type, const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantValue_type_withName_), value, type, name);
-}
-
-_MTL_INLINE void MTL::FunctionConstantValues::setConstantValues(const void* values, MTL::DataType type, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantValues_type_withRange_), values, type, range);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFunctionDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFunctionDescriptor.hpp
deleted file mode 100644
index aa296b5c..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFunctionDescriptor.hpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFunctionDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class FunctionConstantValues;
-class FunctionDescriptor;
-class IntersectionFunctionDescriptor;
-
-_MTL_OPTIONS(NS::UInteger, FunctionOptions) {
-    FunctionOptionNone = 0,
-    FunctionOptionCompileToBinary = 1,
-    FunctionOptionStoreFunctionInMetalPipelinesScript = 1 << 1,
-    FunctionOptionStoreFunctionInMetalScript = 1 << 1,
-    FunctionOptionFailOnBinaryArchiveMiss = 1 << 2,
-    FunctionOptionPipelineIndependent = 1 << 3,
-};
-
-class FunctionDescriptor : public NS::Copying<FunctionDescriptor>
-{
-public:
-    static FunctionDescriptor* alloc();
-
-    NS::Array*                 binaryArchives() const;
-
-    FunctionConstantValues*    constantValues() const;
-
-    static FunctionDescriptor* functionDescriptor();
-
-    FunctionDescriptor*        init();
-
-    NS::String*                name() const;
-
-    FunctionOptions            options() const;
-
-    void                       setBinaryArchives(const NS::Array* binaryArchives);
-
-    void                       setConstantValues(const MTL::FunctionConstantValues* constantValues);
-
-    void                       setName(const NS::String* name);
-
-    void                       setOptions(MTL::FunctionOptions options);
-
-    void                       setSpecializedName(const NS::String* specializedName);
-    NS::String*                specializedName() const;
-};
-class IntersectionFunctionDescriptor : public NS::Copying<IntersectionFunctionDescriptor, FunctionDescriptor>
-{
-public:
-    static IntersectionFunctionDescriptor* alloc();
-
-    IntersectionFunctionDescriptor*        init();
-};
-
-}
-_MTL_INLINE MTL::FunctionDescriptor* MTL::FunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionDescriptor>(_MTL_PRIVATE_CLS(MTLFunctionDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE MTL::FunctionConstantValues* MTL::FunctionDescriptor::constantValues() const
-{
-    return Object::sendMessage<MTL::FunctionConstantValues*>(this, _MTL_PRIVATE_SEL(constantValues));
-}
-
-_MTL_INLINE MTL::FunctionDescriptor* MTL::FunctionDescriptor::functionDescriptor()
-{
-    return Object::sendMessage<MTL::FunctionDescriptor*>(_MTL_PRIVATE_CLS(MTLFunctionDescriptor), _MTL_PRIVATE_SEL(functionDescriptor));
-}
-
-_MTL_INLINE MTL::FunctionDescriptor* MTL::FunctionDescriptor::init()
-{
-    return NS::Object::init<MTL::FunctionDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::FunctionDescriptor::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::FunctionOptions MTL::FunctionDescriptor::options() const
-{
-    return Object::sendMessage<MTL::FunctionOptions>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE void MTL::FunctionDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::FunctionDescriptor::setConstantValues(const MTL::FunctionConstantValues* constantValues)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setConstantValues_), constantValues);
-}
-
-_MTL_INLINE void MTL::FunctionDescriptor::setName(const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setName_), name);
-}
-
-_MTL_INLINE void MTL::FunctionDescriptor::setOptions(MTL::FunctionOptions options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptions_), options);
-}
-
-_MTL_INLINE void MTL::FunctionDescriptor::setSpecializedName(const NS::String* specializedName)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSpecializedName_), specializedName);
-}
-
-_MTL_INLINE NS::String* MTL::FunctionDescriptor::specializedName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(specializedName));
-}
-
-_MTL_INLINE MTL::IntersectionFunctionDescriptor* MTL::IntersectionFunctionDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::IntersectionFunctionDescriptor>(_MTL_PRIVATE_CLS(MTLIntersectionFunctionDescriptor));
-}
-
-_MTL_INLINE MTL::IntersectionFunctionDescriptor* MTL::IntersectionFunctionDescriptor::init()
-{
-    return NS::Object::init<MTL::IntersectionFunctionDescriptor>();
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFunctionHandle.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFunctionHandle.hpp
deleted file mode 100644
index 7a3ff95d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFunctionHandle.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFunctionHandle.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLLibrary.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Device;
-
-class FunctionHandle : public NS::Referencing<FunctionHandle>
-{
-public:
-    Device*      device() const;
-
-    FunctionType functionType() const;
-
-    ResourceID   gpuResourceID() const;
-
-    NS::String*  name() const;
-};
-
-}
-_MTL_INLINE MTL::Device* MTL::FunctionHandle::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::FunctionType MTL::FunctionHandle::functionType() const
-{
-    return Object::sendMessage<MTL::FunctionType>(this, _MTL_PRIVATE_SEL(functionType));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::FunctionHandle::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::String* MTL::FunctionHandle::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFunctionLog.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFunctionLog.hpp
deleted file mode 100644
index 454e6058..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFunctionLog.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFunctionLog.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Function;
-class FunctionLogDebugLocation;
-_MTL_ENUM(NS::UInteger, FunctionLogType) {
-    FunctionLogTypeValidation = 0,
-};
-
-class LogContainer : public NS::Referencing<LogContainer, NS::FastEnumeration>
-{
-};
-class FunctionLogDebugLocation : public NS::Referencing<FunctionLogDebugLocation>
-{
-public:
-    NS::URL*     URL() const;
-
-    NS::UInteger column() const;
-
-    NS::String*  functionName() const;
-
-    NS::UInteger line() const;
-};
-class FunctionLog : public NS::Referencing<FunctionLog>
-{
-public:
-    FunctionLogDebugLocation* debugLocation() const;
-
-    NS::String*               encoderLabel() const;
-
-    Function*                 function() const;
-
-    FunctionLogType           type() const;
-};
-
-}
-_MTL_INLINE NS::URL* MTL::FunctionLogDebugLocation::URL() const
-{
-    return Object::sendMessage<NS::URL*>(this, _MTL_PRIVATE_SEL(URL));
-}
-
-_MTL_INLINE NS::UInteger MTL::FunctionLogDebugLocation::column() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(column));
-}
-
-_MTL_INLINE NS::String* MTL::FunctionLogDebugLocation::functionName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(functionName));
-}
-
-_MTL_INLINE NS::UInteger MTL::FunctionLogDebugLocation::line() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(line));
-}
-
-_MTL_INLINE MTL::FunctionLogDebugLocation* MTL::FunctionLog::debugLocation() const
-{
-    return Object::sendMessage<MTL::FunctionLogDebugLocation*>(this, _MTL_PRIVATE_SEL(debugLocation));
-}
-
-_MTL_INLINE NS::String* MTL::FunctionLog::encoderLabel() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(encoderLabel));
-}
-
-_MTL_INLINE MTL::Function* MTL::FunctionLog::function() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(function));
-}
-
-_MTL_INLINE MTL::FunctionLogType MTL::FunctionLog::type() const
-{
-    return Object::sendMessage<MTL::FunctionLogType>(this, _MTL_PRIVATE_SEL(type));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLFunctionStitching.hpp b/engine/thirdparty/metal-cpp/Metal/MTLFunctionStitching.hpp
deleted file mode 100644
index 8dd5fd29..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLFunctionStitching.hpp
+++ /dev/null
@@ -1,319 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLFunctionStitching.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class FunctionStitchingAttributeAlwaysInline;
-class FunctionStitchingFunctionNode;
-class FunctionStitchingGraph;
-class FunctionStitchingInputNode;
-class StitchedLibraryDescriptor;
-
-_MTL_OPTIONS(NS::UInteger, StitchedLibraryOptions) {
-    StitchedLibraryOptionNone = 0,
-    StitchedLibraryOptionFailOnBinaryArchiveMiss = 1,
-    StitchedLibraryOptionStoreLibraryInMetalPipelinesScript = 1 << 1,
-};
-
-class FunctionStitchingAttribute : public NS::Referencing<FunctionStitchingAttribute>
-{
-};
-class FunctionStitchingAttributeAlwaysInline : public NS::Referencing<FunctionStitchingAttributeAlwaysInline, FunctionStitchingAttribute>
-{
-public:
-    static FunctionStitchingAttributeAlwaysInline* alloc();
-
-    FunctionStitchingAttributeAlwaysInline*        init();
-};
-class FunctionStitchingNode : public NS::Copying<FunctionStitchingNode>
-{
-};
-class FunctionStitchingInputNode : public NS::Referencing<FunctionStitchingInputNode, FunctionStitchingNode>
-{
-public:
-    static FunctionStitchingInputNode* alloc();
-
-    NS::UInteger                       argumentIndex() const;
-
-    FunctionStitchingInputNode*        init();
-    FunctionStitchingInputNode*        init(NS::UInteger argument);
-
-    void                               setArgumentIndex(NS::UInteger argumentIndex);
-};
-class FunctionStitchingFunctionNode : public NS::Referencing<FunctionStitchingFunctionNode, FunctionStitchingNode>
-{
-public:
-    static FunctionStitchingFunctionNode* alloc();
-
-    NS::Array*                            arguments() const;
-
-    NS::Array*                            controlDependencies() const;
-
-    FunctionStitchingFunctionNode*        init();
-    FunctionStitchingFunctionNode*        init(const NS::String* name, const NS::Array* arguments, const NS::Array* controlDependencies);
-
-    NS::String*                           name() const;
-
-    void                                  setArguments(const NS::Array* arguments);
-
-    void                                  setControlDependencies(const NS::Array* controlDependencies);
-
-    void                                  setName(const NS::String* name);
-};
-class FunctionStitchingGraph : public NS::Copying<FunctionStitchingGraph>
-{
-public:
-    static FunctionStitchingGraph* alloc();
-
-    NS::Array*                     attributes() const;
-
-    NS::String*                    functionName() const;
-
-    FunctionStitchingGraph*        init();
-    FunctionStitchingGraph*        init(const NS::String* functionName, const NS::Array* nodes, const MTL::FunctionStitchingFunctionNode* outputNode, const NS::Array* attributes);
-
-    NS::Array*                     nodes() const;
-
-    FunctionStitchingFunctionNode* outputNode() const;
-
-    void                           setAttributes(const NS::Array* attributes);
-
-    void                           setFunctionName(const NS::String* functionName);
-
-    void                           setNodes(const NS::Array* nodes);
-
-    void                           setOutputNode(const MTL::FunctionStitchingFunctionNode* outputNode);
-};
-class StitchedLibraryDescriptor : public NS::Copying<StitchedLibraryDescriptor>
-{
-public:
-    static StitchedLibraryDescriptor* alloc();
-
-    NS::Array*                        binaryArchives() const;
-
-    NS::Array*                        functionGraphs() const;
-
-    NS::Array*                        functions() const;
-
-    StitchedLibraryDescriptor*        init();
-
-    StitchedLibraryOptions            options() const;
-
-    void                              setBinaryArchives(const NS::Array* binaryArchives);
-
-    void                              setFunctionGraphs(const NS::Array* functionGraphs);
-
-    void                              setFunctions(const NS::Array* functions);
-
-    void                              setOptions(MTL::StitchedLibraryOptions options);
-};
-
-}
-_MTL_INLINE MTL::FunctionStitchingAttributeAlwaysInline* MTL::FunctionStitchingAttributeAlwaysInline::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionStitchingAttributeAlwaysInline>(_MTL_PRIVATE_CLS(MTLFunctionStitchingAttributeAlwaysInline));
-}
-
-_MTL_INLINE MTL::FunctionStitchingAttributeAlwaysInline* MTL::FunctionStitchingAttributeAlwaysInline::init()
-{
-    return NS::Object::init<MTL::FunctionStitchingAttributeAlwaysInline>();
-}
-
-_MTL_INLINE MTL::FunctionStitchingInputNode* MTL::FunctionStitchingInputNode::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionStitchingInputNode>(_MTL_PRIVATE_CLS(MTLFunctionStitchingInputNode));
-}
-
-_MTL_INLINE NS::UInteger MTL::FunctionStitchingInputNode::argumentIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(argumentIndex));
-}
-
-_MTL_INLINE MTL::FunctionStitchingInputNode* MTL::FunctionStitchingInputNode::init()
-{
-    return NS::Object::init<MTL::FunctionStitchingInputNode>();
-}
-
-_MTL_INLINE MTL::FunctionStitchingInputNode* MTL::FunctionStitchingInputNode::init(NS::UInteger argument)
-{
-    return Object::sendMessage<MTL::FunctionStitchingInputNode*>(this, _MTL_PRIVATE_SEL(initWithArgumentIndex_), argument);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingInputNode::setArgumentIndex(NS::UInteger argumentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArgumentIndex_), argumentIndex);
-}
-
-_MTL_INLINE MTL::FunctionStitchingFunctionNode* MTL::FunctionStitchingFunctionNode::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionStitchingFunctionNode>(_MTL_PRIVATE_CLS(MTLFunctionStitchingFunctionNode));
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionStitchingFunctionNode::arguments() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(arguments));
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionStitchingFunctionNode::controlDependencies() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(controlDependencies));
-}
-
-_MTL_INLINE MTL::FunctionStitchingFunctionNode* MTL::FunctionStitchingFunctionNode::init()
-{
-    return NS::Object::init<MTL::FunctionStitchingFunctionNode>();
-}
-
-_MTL_INLINE MTL::FunctionStitchingFunctionNode* MTL::FunctionStitchingFunctionNode::init(const NS::String* name, const NS::Array* arguments, const NS::Array* controlDependencies)
-{
-    return Object::sendMessage<MTL::FunctionStitchingFunctionNode*>(this, _MTL_PRIVATE_SEL(initWithName_arguments_controlDependencies_), name, arguments, controlDependencies);
-}
-
-_MTL_INLINE NS::String* MTL::FunctionStitchingFunctionNode::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE void MTL::FunctionStitchingFunctionNode::setArguments(const NS::Array* arguments)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArguments_), arguments);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingFunctionNode::setControlDependencies(const NS::Array* controlDependencies)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setControlDependencies_), controlDependencies);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingFunctionNode::setName(const NS::String* name)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setName_), name);
-}
-
-_MTL_INLINE MTL::FunctionStitchingGraph* MTL::FunctionStitchingGraph::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionStitchingGraph>(_MTL_PRIVATE_CLS(MTLFunctionStitchingGraph));
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionStitchingGraph::attributes() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(attributes));
-}
-
-_MTL_INLINE NS::String* MTL::FunctionStitchingGraph::functionName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(functionName));
-}
-
-_MTL_INLINE MTL::FunctionStitchingGraph* MTL::FunctionStitchingGraph::init()
-{
-    return NS::Object::init<MTL::FunctionStitchingGraph>();
-}
-
-_MTL_INLINE MTL::FunctionStitchingGraph* MTL::FunctionStitchingGraph::init(const NS::String* functionName, const NS::Array* nodes, const MTL::FunctionStitchingFunctionNode* outputNode, const NS::Array* attributes)
-{
-    return Object::sendMessage<MTL::FunctionStitchingGraph*>(this, _MTL_PRIVATE_SEL(initWithFunctionName_nodes_outputNode_attributes_), functionName, nodes, outputNode, attributes);
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionStitchingGraph::nodes() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(nodes));
-}
-
-_MTL_INLINE MTL::FunctionStitchingFunctionNode* MTL::FunctionStitchingGraph::outputNode() const
-{
-    return Object::sendMessage<MTL::FunctionStitchingFunctionNode*>(this, _MTL_PRIVATE_SEL(outputNode));
-}
-
-_MTL_INLINE void MTL::FunctionStitchingGraph::setAttributes(const NS::Array* attributes)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAttributes_), attributes);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingGraph::setFunctionName(const NS::String* functionName)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionName_), functionName);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingGraph::setNodes(const NS::Array* nodes)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setNodes_), nodes);
-}
-
-_MTL_INLINE void MTL::FunctionStitchingGraph::setOutputNode(const MTL::FunctionStitchingFunctionNode* outputNode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOutputNode_), outputNode);
-}
-
-_MTL_INLINE MTL::StitchedLibraryDescriptor* MTL::StitchedLibraryDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::StitchedLibraryDescriptor>(_MTL_PRIVATE_CLS(MTLStitchedLibraryDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::StitchedLibraryDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE NS::Array* MTL::StitchedLibraryDescriptor::functionGraphs() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functionGraphs));
-}
-
-_MTL_INLINE NS::Array* MTL::StitchedLibraryDescriptor::functions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functions));
-}
-
-_MTL_INLINE MTL::StitchedLibraryDescriptor* MTL::StitchedLibraryDescriptor::init()
-{
-    return NS::Object::init<MTL::StitchedLibraryDescriptor>();
-}
-
-_MTL_INLINE MTL::StitchedLibraryOptions MTL::StitchedLibraryDescriptor::options() const
-{
-    return Object::sendMessage<MTL::StitchedLibraryOptions>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE void MTL::StitchedLibraryDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::StitchedLibraryDescriptor::setFunctionGraphs(const NS::Array* functionGraphs)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionGraphs_), functionGraphs);
-}
-
-_MTL_INLINE void MTL::StitchedLibraryDescriptor::setFunctions(const NS::Array* functions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctions_), functions);
-}
-
-_MTL_INLINE void MTL::StitchedLibraryDescriptor::setOptions(MTL::StitchedLibraryOptions options)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptions_), options);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLGPUAddress.hpp b/engine/thirdparty/metal-cpp/Metal/MTLGPUAddress.hpp
deleted file mode 100644
index fb9d61d5..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLGPUAddress.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLGPUAddress.hpp
-//
-// Copyright 2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#ifdef __METAL_VERSION__
-
-#include <metal_stdlib>
-
-#else
-
-#include <cstdint>
-
-#endif // __METAL_VERSION__
-
-namespace MTL
-{
-    using GPUAddress = uint64_t;
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLHeaderBridge.hpp b/engine/thirdparty/metal-cpp/Metal/MTLHeaderBridge.hpp
deleted file mode 100644
index 6a3a1422..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLHeaderBridge.hpp
+++ /dev/null
@@ -1,3120 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLHeaderBridge.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-#include "MTLPrivate.hpp"
-
-namespace MTL::Private::Class
-{
-
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureBoundingBoxGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureCurveGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureMotionBoundingBoxGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureMotionCurveGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureMotionTriangleGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4AccelerationStructureTriangleGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4ArgumentTableDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4BinaryFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4CommandAllocatorDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4CommandBufferOptions);
-_MTL_PRIVATE_DEF_CLS(MTL4CommandQueueDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4CommitOptions);
-_MTL_PRIVATE_DEF_CLS(MTL4CompilerDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4CompilerTaskOptions);
-_MTL_PRIVATE_DEF_CLS(MTL4ComputePipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4CounterHeapDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4FunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4IndirectInstanceAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4InstanceAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4LibraryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4LibraryFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4MachineLearningPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4MachineLearningPipelineReflection);
-_MTL_PRIVATE_DEF_CLS(MTL4MeshRenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4PipelineDataSetSerializerDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4PipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4PipelineOptions);
-_MTL_PRIVATE_DEF_CLS(MTL4PipelineStageDynamicLinkingDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4PrimitiveAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPipelineBinaryFunctionsDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPipelineColorAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPipelineColorAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4RenderPipelineDynamicLinkingDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4SpecializedFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4StaticLinkingDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4StitchedFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTL4TileRenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureBoundingBoxGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureCurveGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureMotionBoundingBoxGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureMotionCurveGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureMotionTriangleGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructurePassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructurePassSampleBufferAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructurePassSampleBufferAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLAccelerationStructureTriangleGeometryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLArchitecture);
-_MTL_PRIVATE_DEF_CLS(MTLArgument);
-_MTL_PRIVATE_DEF_CLS(MTLArgumentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLArrayType);
-_MTL_PRIVATE_DEF_CLS(MTLAttribute);
-_MTL_PRIVATE_DEF_CLS(MTLAttributeDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLAttributeDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLBinaryArchiveDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLBlitPassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLBlitPassSampleBufferAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLBlitPassSampleBufferAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLBufferLayoutDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLBufferLayoutDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLCaptureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLCaptureManager);
-_MTL_PRIVATE_DEF_CLS(MTLCommandBufferDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLCommandQueueDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLCompileOptions);
-_MTL_PRIVATE_DEF_CLS(MTLComputePassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLComputePassSampleBufferAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLComputePassSampleBufferAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLComputePipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLComputePipelineReflection);
-_MTL_PRIVATE_DEF_CLS(MTLCounterSampleBufferDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLDepthStencilDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionConstant);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionConstantValues);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionReflection);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionStitchingAttributeAlwaysInline);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionStitchingFunctionNode);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionStitchingGraph);
-_MTL_PRIVATE_DEF_CLS(MTLFunctionStitchingInputNode);
-_MTL_PRIVATE_DEF_CLS(MTLHeapDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLIOCommandQueueDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLIndirectCommandBufferDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLIndirectInstanceAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLInstanceAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLIntersectionFunctionDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLIntersectionFunctionTableDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLLinkedFunctions);
-_MTL_PRIVATE_DEF_CLS(MTLLogStateDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLLogicalToPhysicalColorAttachmentMap);
-_MTL_PRIVATE_DEF_CLS(MTLMeshRenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLMotionKeyframeData);
-_MTL_PRIVATE_DEF_CLS(MTLPipelineBufferDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLPipelineBufferDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLPointerType);
-_MTL_PRIVATE_DEF_CLS(MTLPrimitiveAccelerationStructureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRasterizationRateLayerArray);
-_MTL_PRIVATE_DEF_CLS(MTLRasterizationRateLayerDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRasterizationRateMapDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRasterizationRateSampleArray);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassColorAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassColorAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassDepthAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassSampleBufferAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassSampleBufferAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPassStencilAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPipelineColorAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPipelineColorAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPipelineFunctionsDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLRenderPipelineReflection);
-_MTL_PRIVATE_DEF_CLS(MTLResidencySetDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLResourceStatePassDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLResourceStatePassSampleBufferAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLResourceStatePassSampleBufferAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLResourceViewPoolDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLSamplerDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLSharedEventHandle);
-_MTL_PRIVATE_DEF_CLS(MTLSharedEventListener);
-_MTL_PRIVATE_DEF_CLS(MTLSharedTextureHandle);
-_MTL_PRIVATE_DEF_CLS(MTLStageInputOutputDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLStencilDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLStitchedLibraryDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLStructMember);
-_MTL_PRIVATE_DEF_CLS(MTLStructType);
-_MTL_PRIVATE_DEF_CLS(MTLTensorDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLTensorExtents);
-_MTL_PRIVATE_DEF_CLS(MTLTensorReferenceType);
-_MTL_PRIVATE_DEF_CLS(MTLTextureDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLTextureReferenceType);
-_MTL_PRIVATE_DEF_CLS(MTLTextureViewDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLTileRenderPipelineColorAttachmentDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLTileRenderPipelineColorAttachmentDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLTileRenderPipelineDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLType);
-_MTL_PRIVATE_DEF_CLS(MTLVertexAttribute);
-_MTL_PRIVATE_DEF_CLS(MTLVertexAttributeDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLVertexAttributeDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLVertexBufferLayoutDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLVertexBufferLayoutDescriptorArray);
-_MTL_PRIVATE_DEF_CLS(MTLVertexDescriptor);
-_MTL_PRIVATE_DEF_CLS(MTLVisibleFunctionTableDescriptor);
-
-}
-
-namespace MTL::Private::Protocol
-{
-
-_MTL_PRIVATE_DEF_PRO(MTL4Archive);
-_MTL_PRIVATE_DEF_PRO(MTL4ArgumentTable);
-_MTL_PRIVATE_DEF_PRO(MTL4BinaryFunction);
-_MTL_PRIVATE_DEF_PRO(MTL4CommandAllocator);
-_MTL_PRIVATE_DEF_PRO(MTL4CommandBuffer);
-_MTL_PRIVATE_DEF_PRO(MTL4CommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTL4CommandQueue);
-_MTL_PRIVATE_DEF_PRO(MTL4CommitFeedback);
-_MTL_PRIVATE_DEF_PRO(MTL4Compiler);
-_MTL_PRIVATE_DEF_PRO(MTL4CompilerTask);
-_MTL_PRIVATE_DEF_PRO(MTL4ComputeCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTL4CounterHeap);
-_MTL_PRIVATE_DEF_PRO(MTL4MachineLearningCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTL4MachineLearningPipelineState);
-_MTL_PRIVATE_DEF_PRO(MTL4PipelineDataSetSerializer);
-_MTL_PRIVATE_DEF_PRO(MTL4RenderCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLAccelerationStructure);
-_MTL_PRIVATE_DEF_PRO(MTLAccelerationStructureCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLAllocation);
-_MTL_PRIVATE_DEF_PRO(MTLArgumentEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLBinaryArchive);
-_MTL_PRIVATE_DEF_PRO(MTLBinding);
-_MTL_PRIVATE_DEF_PRO(MTLBlitCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLBufferBinding);
-_MTL_PRIVATE_DEF_PRO(MTLCommandBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLCommandBufferEncoderInfo);
-_MTL_PRIVATE_DEF_PRO(MTLCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLCommandQueue);
-_MTL_PRIVATE_DEF_PRO(MTLComputeCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLComputePipelineState);
-_MTL_PRIVATE_DEF_PRO(MTLCounter);
-_MTL_PRIVATE_DEF_PRO(MTLCounterSampleBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLCounterSet);
-_MTL_PRIVATE_DEF_PRO(MTLDepthStencilState);
-_MTL_PRIVATE_DEF_PRO(MTLDevice);
-_MTL_PRIVATE_DEF_PRO(MTLDrawable);
-_MTL_PRIVATE_DEF_PRO(MTLDynamicLibrary);
-_MTL_PRIVATE_DEF_PRO(MTLEvent);
-_MTL_PRIVATE_DEF_PRO(MTLFence);
-_MTL_PRIVATE_DEF_PRO(MTLFunction);
-_MTL_PRIVATE_DEF_PRO(MTLFunctionHandle);
-_MTL_PRIVATE_DEF_PRO(MTLFunctionLog);
-_MTL_PRIVATE_DEF_PRO(MTLFunctionLogDebugLocation);
-_MTL_PRIVATE_DEF_PRO(MTLFunctionStitchingAttribute);
-_MTL_PRIVATE_DEF_PRO(MTLFunctionStitchingNode);
-_MTL_PRIVATE_DEF_PRO(MTLHeap);
-_MTL_PRIVATE_DEF_PRO(MTLIOCommandBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLIOCommandQueue);
-_MTL_PRIVATE_DEF_PRO(MTLIOFileHandle);
-_MTL_PRIVATE_DEF_PRO(MTLIOScratchBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLIOScratchBufferAllocator);
-_MTL_PRIVATE_DEF_PRO(MTLIndirectCommandBuffer);
-_MTL_PRIVATE_DEF_PRO(MTLIndirectComputeCommand);
-_MTL_PRIVATE_DEF_PRO(MTLIndirectRenderCommand);
-_MTL_PRIVATE_DEF_PRO(MTLIntersectionFunctionTable);
-_MTL_PRIVATE_DEF_PRO(MTLLibrary);
-_MTL_PRIVATE_DEF_PRO(MTLLogContainer);
-_MTL_PRIVATE_DEF_PRO(MTLLogState);
-_MTL_PRIVATE_DEF_PRO(MTLObjectPayloadBinding);
-_MTL_PRIVATE_DEF_PRO(MTLParallelRenderCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLRasterizationRateMap);
-_MTL_PRIVATE_DEF_PRO(MTLRenderCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLRenderPipelineState);
-_MTL_PRIVATE_DEF_PRO(MTLResidencySet);
-_MTL_PRIVATE_DEF_PRO(MTLResource);
-_MTL_PRIVATE_DEF_PRO(MTLResourceStateCommandEncoder);
-_MTL_PRIVATE_DEF_PRO(MTLResourceViewPool);
-_MTL_PRIVATE_DEF_PRO(MTLSamplerState);
-_MTL_PRIVATE_DEF_PRO(MTLSharedEvent);
-_MTL_PRIVATE_DEF_PRO(MTLTensor);
-_MTL_PRIVATE_DEF_PRO(MTLTensorBinding);
-_MTL_PRIVATE_DEF_PRO(MTLTexture);
-_MTL_PRIVATE_DEF_PRO(MTLTextureBinding);
-_MTL_PRIVATE_DEF_PRO(MTLTextureViewPool);
-_MTL_PRIVATE_DEF_PRO(MTLThreadgroupBinding);
-_MTL_PRIVATE_DEF_PRO(MTLVisibleFunctionTable);
-
-}
-
-namespace MTL::Private::Selector
-{
-
-_MTL_PRIVATE_DEF_SEL(GPUEndTime,
-    "GPUEndTime");
-_MTL_PRIVATE_DEF_SEL(GPUStartTime,
-    "GPUStartTime");
-_MTL_PRIVATE_DEF_SEL(URL,
-    "URL");
-_MTL_PRIVATE_DEF_SEL(accelerationStructureCommandEncoder,
-    "accelerationStructureCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(accelerationStructureCommandEncoderWithDescriptor_,
-    "accelerationStructureCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(accelerationStructurePassDescriptor,
-    "accelerationStructurePassDescriptor");
-_MTL_PRIVATE_DEF_SEL(accelerationStructureSizesWithDescriptor_,
-    "accelerationStructureSizesWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(access,
-    "access");
-_MTL_PRIVATE_DEF_SEL(addAllocation_,
-    "addAllocation:");
-_MTL_PRIVATE_DEF_SEL(addAllocations_count_,
-    "addAllocations:count:");
-_MTL_PRIVATE_DEF_SEL(addBarrier,
-    "addBarrier");
-_MTL_PRIVATE_DEF_SEL(addCompletedHandler_,
-    "addCompletedHandler:");
-_MTL_PRIVATE_DEF_SEL(addComputePipelineFunctionsWithDescriptor_error_,
-    "addComputePipelineFunctionsWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(addDebugMarker_range_,
-    "addDebugMarker:range:");
-_MTL_PRIVATE_DEF_SEL(addFeedbackHandler_,
-    "addFeedbackHandler:");
-_MTL_PRIVATE_DEF_SEL(addFunctionWithDescriptor_library_error_,
-    "addFunctionWithDescriptor:library:error:");
-_MTL_PRIVATE_DEF_SEL(addLibraryWithDescriptor_error_,
-    "addLibraryWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(addLogHandler_,
-    "addLogHandler:");
-_MTL_PRIVATE_DEF_SEL(addMeshRenderPipelineFunctionsWithDescriptor_error_,
-    "addMeshRenderPipelineFunctionsWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(addPresentedHandler_,
-    "addPresentedHandler:");
-_MTL_PRIVATE_DEF_SEL(addRenderPipelineFunctionsWithDescriptor_error_,
-    "addRenderPipelineFunctionsWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(addResidencySet_,
-    "addResidencySet:");
-_MTL_PRIVATE_DEF_SEL(addResidencySets_count_,
-    "addResidencySets:count:");
-_MTL_PRIVATE_DEF_SEL(addScheduledHandler_,
-    "addScheduledHandler:");
-_MTL_PRIVATE_DEF_SEL(addTileRenderPipelineFunctionsWithDescriptor_error_,
-    "addTileRenderPipelineFunctionsWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(alignment,
-    "alignment");
-_MTL_PRIVATE_DEF_SEL(allAllocations,
-    "allAllocations");
-_MTL_PRIVATE_DEF_SEL(allocatedSize,
-    "allocatedSize");
-_MTL_PRIVATE_DEF_SEL(allocationCount,
-    "allocationCount");
-_MTL_PRIVATE_DEF_SEL(allowDuplicateIntersectionFunctionInvocation,
-    "allowDuplicateIntersectionFunctionInvocation");
-_MTL_PRIVATE_DEF_SEL(allowGPUOptimizedContents,
-    "allowGPUOptimizedContents");
-_MTL_PRIVATE_DEF_SEL(allowReferencingUndefinedSymbols,
-    "allowReferencingUndefinedSymbols");
-_MTL_PRIVATE_DEF_SEL(alphaBlendOperation,
-    "alphaBlendOperation");
-_MTL_PRIVATE_DEF_SEL(alphaToCoverageState,
-    "alphaToCoverageState");
-_MTL_PRIVATE_DEF_SEL(alphaToOneState,
-    "alphaToOneState");
-_MTL_PRIVATE_DEF_SEL(architecture,
-    "architecture");
-_MTL_PRIVATE_DEF_SEL(areBarycentricCoordsSupported,
-    "areBarycentricCoordsSupported");
-_MTL_PRIVATE_DEF_SEL(areProgrammableSamplePositionsSupported,
-    "areProgrammableSamplePositionsSupported");
-_MTL_PRIVATE_DEF_SEL(areRasterOrderGroupsSupported,
-    "areRasterOrderGroupsSupported");
-_MTL_PRIVATE_DEF_SEL(argumentBuffersSupport,
-    "argumentBuffersSupport");
-_MTL_PRIVATE_DEF_SEL(argumentDescriptor,
-    "argumentDescriptor");
-_MTL_PRIVATE_DEF_SEL(argumentIndex,
-    "argumentIndex");
-_MTL_PRIVATE_DEF_SEL(argumentIndexStride,
-    "argumentIndexStride");
-_MTL_PRIVATE_DEF_SEL(arguments,
-    "arguments");
-_MTL_PRIVATE_DEF_SEL(arrayLength,
-    "arrayLength");
-_MTL_PRIVATE_DEF_SEL(arrayType,
-    "arrayType");
-_MTL_PRIVATE_DEF_SEL(attributeIndex,
-    "attributeIndex");
-_MTL_PRIVATE_DEF_SEL(attributeType,
-    "attributeType");
-_MTL_PRIVATE_DEF_SEL(attributes,
-    "attributes");
-_MTL_PRIVATE_DEF_SEL(backFaceStencil,
-    "backFaceStencil");
-_MTL_PRIVATE_DEF_SEL(barrierAfterEncoderStages_beforeEncoderStages_visibilityOptions_,
-    "barrierAfterEncoderStages:beforeEncoderStages:visibilityOptions:");
-_MTL_PRIVATE_DEF_SEL(barrierAfterQueueStages_beforeStages_,
-    "barrierAfterQueueStages:beforeStages:");
-_MTL_PRIVATE_DEF_SEL(barrierAfterQueueStages_beforeStages_visibilityOptions_,
-    "barrierAfterQueueStages:beforeStages:visibilityOptions:");
-_MTL_PRIVATE_DEF_SEL(barrierAfterStages_beforeQueueStages_visibilityOptions_,
-    "barrierAfterStages:beforeQueueStages:visibilityOptions:");
-_MTL_PRIVATE_DEF_SEL(baseResourceID,
-    "baseResourceID");
-_MTL_PRIVATE_DEF_SEL(beginCommandBufferWithAllocator_,
-    "beginCommandBufferWithAllocator:");
-_MTL_PRIVATE_DEF_SEL(beginCommandBufferWithAllocator_options_,
-    "beginCommandBufferWithAllocator:options:");
-_MTL_PRIVATE_DEF_SEL(binaryArchives,
-    "binaryArchives");
-_MTL_PRIVATE_DEF_SEL(binaryFunctions,
-    "binaryFunctions");
-_MTL_PRIVATE_DEF_SEL(binaryLinkedFunctions,
-    "binaryLinkedFunctions");
-_MTL_PRIVATE_DEF_SEL(bindings,
-    "bindings");
-_MTL_PRIVATE_DEF_SEL(blendingState,
-    "blendingState");
-_MTL_PRIVATE_DEF_SEL(blitCommandEncoder,
-    "blitCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(blitCommandEncoderWithDescriptor_,
-    "blitCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(blitPassDescriptor,
-    "blitPassDescriptor");
-_MTL_PRIVATE_DEF_SEL(borderColor,
-    "borderColor");
-_MTL_PRIVATE_DEF_SEL(boundingBoxBuffer,
-    "boundingBoxBuffer");
-_MTL_PRIVATE_DEF_SEL(boundingBoxBufferOffset,
-    "boundingBoxBufferOffset");
-_MTL_PRIVATE_DEF_SEL(boundingBoxBuffers,
-    "boundingBoxBuffers");
-_MTL_PRIVATE_DEF_SEL(boundingBoxCount,
-    "boundingBoxCount");
-_MTL_PRIVATE_DEF_SEL(boundingBoxStride,
-    "boundingBoxStride");
-_MTL_PRIVATE_DEF_SEL(buffer,
-    "buffer");
-_MTL_PRIVATE_DEF_SEL(bufferAlignment,
-    "bufferAlignment");
-_MTL_PRIVATE_DEF_SEL(bufferBytesPerRow,
-    "bufferBytesPerRow");
-_MTL_PRIVATE_DEF_SEL(bufferDataSize,
-    "bufferDataSize");
-_MTL_PRIVATE_DEF_SEL(bufferDataType,
-    "bufferDataType");
-_MTL_PRIVATE_DEF_SEL(bufferIndex,
-    "bufferIndex");
-_MTL_PRIVATE_DEF_SEL(bufferOffset,
-    "bufferOffset");
-_MTL_PRIVATE_DEF_SEL(bufferPointerType,
-    "bufferPointerType");
-_MTL_PRIVATE_DEF_SEL(bufferSize,
-    "bufferSize");
-_MTL_PRIVATE_DEF_SEL(bufferStructType,
-    "bufferStructType");
-_MTL_PRIVATE_DEF_SEL(buffers,
-    "buffers");
-_MTL_PRIVATE_DEF_SEL(buildAccelerationStructure_descriptor_scratchBuffer_,
-    "buildAccelerationStructure:descriptor:scratchBuffer:");
-_MTL_PRIVATE_DEF_SEL(buildAccelerationStructure_descriptor_scratchBuffer_scratchBufferOffset_,
-    "buildAccelerationStructure:descriptor:scratchBuffer:scratchBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(captureObject,
-    "captureObject");
-_MTL_PRIVATE_DEF_SEL(clearBarrier,
-    "clearBarrier");
-_MTL_PRIVATE_DEF_SEL(clearColor,
-    "clearColor");
-_MTL_PRIVATE_DEF_SEL(clearDepth,
-    "clearDepth");
-_MTL_PRIVATE_DEF_SEL(clearStencil,
-    "clearStencil");
-_MTL_PRIVATE_DEF_SEL(colorAttachmentMappingState,
-    "colorAttachmentMappingState");
-_MTL_PRIVATE_DEF_SEL(colorAttachments,
-    "colorAttachments");
-_MTL_PRIVATE_DEF_SEL(column,
-    "column");
-_MTL_PRIVATE_DEF_SEL(commandBuffer,
-    "commandBuffer");
-_MTL_PRIVATE_DEF_SEL(commandBufferWithDescriptor_,
-    "commandBufferWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(commandBufferWithUnretainedReferences,
-    "commandBufferWithUnretainedReferences");
-_MTL_PRIVATE_DEF_SEL(commandQueue,
-    "commandQueue");
-_MTL_PRIVATE_DEF_SEL(commandTypes,
-    "commandTypes");
-_MTL_PRIVATE_DEF_SEL(commit,
-    "commit");
-_MTL_PRIVATE_DEF_SEL(commit_count_,
-    "commit:count:");
-_MTL_PRIVATE_DEF_SEL(commit_count_options_,
-    "commit:count:options:");
-_MTL_PRIVATE_DEF_SEL(compareFunction,
-    "compareFunction");
-_MTL_PRIVATE_DEF_SEL(compileSymbolVisibility,
-    "compileSymbolVisibility");
-_MTL_PRIVATE_DEF_SEL(compiler,
-    "compiler");
-_MTL_PRIVATE_DEF_SEL(compressionType,
-    "compressionType");
-_MTL_PRIVATE_DEF_SEL(computeCommandEncoder,
-    "computeCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(computeCommandEncoderWithDescriptor_,
-    "computeCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(computeCommandEncoderWithDispatchType_,
-    "computeCommandEncoderWithDispatchType:");
-_MTL_PRIVATE_DEF_SEL(computeFunction,
-    "computeFunction");
-_MTL_PRIVATE_DEF_SEL(computeFunctionDescriptor,
-    "computeFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(computePassDescriptor,
-    "computePassDescriptor");
-_MTL_PRIVATE_DEF_SEL(concurrentDispatchThreadgroups_threadsPerThreadgroup_,
-    "concurrentDispatchThreadgroups:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(concurrentDispatchThreads_threadsPerThreadgroup_,
-    "concurrentDispatchThreads:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(configuration,
-    "configuration");
-_MTL_PRIVATE_DEF_SEL(constantBlockAlignment,
-    "constantBlockAlignment");
-_MTL_PRIVATE_DEF_SEL(constantDataAtIndex_,
-    "constantDataAtIndex:");
-_MTL_PRIVATE_DEF_SEL(constantValues,
-    "constantValues");
-_MTL_PRIVATE_DEF_SEL(containsAllocation_,
-    "containsAllocation:");
-_MTL_PRIVATE_DEF_SEL(contents,
-    "contents");
-_MTL_PRIVATE_DEF_SEL(controlDependencies,
-    "controlDependencies");
-_MTL_PRIVATE_DEF_SEL(controlPointBuffer,
-    "controlPointBuffer");
-_MTL_PRIVATE_DEF_SEL(controlPointBufferOffset,
-    "controlPointBufferOffset");
-_MTL_PRIVATE_DEF_SEL(controlPointBuffers,
-    "controlPointBuffers");
-_MTL_PRIVATE_DEF_SEL(controlPointCount,
-    "controlPointCount");
-_MTL_PRIVATE_DEF_SEL(controlPointFormat,
-    "controlPointFormat");
-_MTL_PRIVATE_DEF_SEL(controlPointStride,
-    "controlPointStride");
-_MTL_PRIVATE_DEF_SEL(convertSparsePixelRegions_toTileRegions_withTileSize_alignmentMode_numRegions_,
-    "convertSparsePixelRegions:toTileRegions:withTileSize:alignmentMode:numRegions:");
-_MTL_PRIVATE_DEF_SEL(convertSparseTileRegions_toPixelRegions_withTileSize_numRegions_,
-    "convertSparseTileRegions:toPixelRegions:withTileSize:numRegions:");
-_MTL_PRIVATE_DEF_SEL(copyAccelerationStructure_toAccelerationStructure_,
-    "copyAccelerationStructure:toAccelerationStructure:");
-_MTL_PRIVATE_DEF_SEL(copyAndCompactAccelerationStructure_toAccelerationStructure_,
-    "copyAndCompactAccelerationStructure:toAccelerationStructure:");
-_MTL_PRIVATE_DEF_SEL(copyBufferMappingsFromBuffer_toBuffer_operations_count_,
-    "copyBufferMappingsFromBuffer:toBuffer:operations:count:");
-_MTL_PRIVATE_DEF_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_,
-    "copyFromBuffer:sourceOffset:sourceBytesPerRow:sourceBytesPerImage:sourceSize:toTexture:destinationSlice:destinationLevel:destinationOrigin:");
-_MTL_PRIVATE_DEF_SEL(copyFromBuffer_sourceOffset_sourceBytesPerRow_sourceBytesPerImage_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_options_,
-    "copyFromBuffer:sourceOffset:sourceBytesPerRow:sourceBytesPerImage:sourceSize:toTexture:destinationSlice:destinationLevel:destinationOrigin:options:");
-_MTL_PRIVATE_DEF_SEL(copyFromBuffer_sourceOffset_toBuffer_destinationOffset_size_,
-    "copyFromBuffer:sourceOffset:toBuffer:destinationOffset:size:");
-_MTL_PRIVATE_DEF_SEL(copyFromTensor_sourceOrigin_sourceDimensions_toTensor_destinationOrigin_destinationDimensions_,
-    "copyFromTensor:sourceOrigin:sourceDimensions:toTensor:destinationOrigin:destinationDimensions:");
-_MTL_PRIVATE_DEF_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_,
-    "copyFromTexture:sourceSlice:sourceLevel:sourceOrigin:sourceSize:toBuffer:destinationOffset:destinationBytesPerRow:destinationBytesPerImage:");
-_MTL_PRIVATE_DEF_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toBuffer_destinationOffset_destinationBytesPerRow_destinationBytesPerImage_options_,
-    "copyFromTexture:sourceSlice:sourceLevel:sourceOrigin:sourceSize:toBuffer:destinationOffset:destinationBytesPerRow:destinationBytesPerImage:options:");
-_MTL_PRIVATE_DEF_SEL(copyFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_,
-    "copyFromTexture:sourceSlice:sourceLevel:sourceOrigin:sourceSize:toTexture:destinationSlice:destinationLevel:destinationOrigin:");
-_MTL_PRIVATE_DEF_SEL(copyFromTexture_sourceSlice_sourceLevel_toTexture_destinationSlice_destinationLevel_sliceCount_levelCount_,
-    "copyFromTexture:sourceSlice:sourceLevel:toTexture:destinationSlice:destinationLevel:sliceCount:levelCount:");
-_MTL_PRIVATE_DEF_SEL(copyFromTexture_toTexture_,
-    "copyFromTexture:toTexture:");
-_MTL_PRIVATE_DEF_SEL(copyIndirectCommandBuffer_sourceRange_destination_destinationIndex_,
-    "copyIndirectCommandBuffer:sourceRange:destination:destinationIndex:");
-_MTL_PRIVATE_DEF_SEL(copyParameterDataToBuffer_offset_,
-    "copyParameterDataToBuffer:offset:");
-_MTL_PRIVATE_DEF_SEL(copyResourceViewsFromPool_sourceRange_destinationIndex_,
-    "copyResourceViewsFromPool:sourceRange:destinationIndex:");
-_MTL_PRIVATE_DEF_SEL(copyStatusToBuffer_offset_,
-    "copyStatusToBuffer:offset:");
-_MTL_PRIVATE_DEF_SEL(copyTextureMappingsFromTexture_toTexture_operations_count_,
-    "copyTextureMappingsFromTexture:toTexture:operations:count:");
-_MTL_PRIVATE_DEF_SEL(count,
-    "count");
-_MTL_PRIVATE_DEF_SEL(counterSet,
-    "counterSet");
-_MTL_PRIVATE_DEF_SEL(counterSets,
-    "counterSets");
-_MTL_PRIVATE_DEF_SEL(counters,
-    "counters");
-_MTL_PRIVATE_DEF_SEL(cpuCacheMode,
-    "cpuCacheMode");
-_MTL_PRIVATE_DEF_SEL(currentAllocatedSize,
-    "currentAllocatedSize");
-_MTL_PRIVATE_DEF_SEL(curveBasis,
-    "curveBasis");
-_MTL_PRIVATE_DEF_SEL(curveEndCaps,
-    "curveEndCaps");
-_MTL_PRIVATE_DEF_SEL(curveType,
-    "curveType");
-_MTL_PRIVATE_DEF_SEL(data,
-    "data");
-_MTL_PRIVATE_DEF_SEL(dataSize,
-    "dataSize");
-_MTL_PRIVATE_DEF_SEL(dataType,
-    "dataType");
-_MTL_PRIVATE_DEF_SEL(dealloc,
-    "dealloc");
-_MTL_PRIVATE_DEF_SEL(debugLocation,
-    "debugLocation");
-_MTL_PRIVATE_DEF_SEL(debugSignposts,
-    "debugSignposts");
-_MTL_PRIVATE_DEF_SEL(defaultCaptureScope,
-    "defaultCaptureScope");
-_MTL_PRIVATE_DEF_SEL(defaultRasterSampleCount,
-    "defaultRasterSampleCount");
-_MTL_PRIVATE_DEF_SEL(depth,
-    "depth");
-_MTL_PRIVATE_DEF_SEL(depthAttachment,
-    "depthAttachment");
-_MTL_PRIVATE_DEF_SEL(depthAttachmentPixelFormat,
-    "depthAttachmentPixelFormat");
-_MTL_PRIVATE_DEF_SEL(depthCompareFunction,
-    "depthCompareFunction");
-_MTL_PRIVATE_DEF_SEL(depthFailureOperation,
-    "depthFailureOperation");
-_MTL_PRIVATE_DEF_SEL(depthPlane,
-    "depthPlane");
-_MTL_PRIVATE_DEF_SEL(depthResolveFilter,
-    "depthResolveFilter");
-_MTL_PRIVATE_DEF_SEL(depthStencilPassOperation,
-    "depthStencilPassOperation");
-_MTL_PRIVATE_DEF_SEL(descriptor,
-    "descriptor");
-_MTL_PRIVATE_DEF_SEL(destination,
-    "destination");
-_MTL_PRIVATE_DEF_SEL(destinationAlphaBlendFactor,
-    "destinationAlphaBlendFactor");
-_MTL_PRIVATE_DEF_SEL(destinationRGBBlendFactor,
-    "destinationRGBBlendFactor");
-_MTL_PRIVATE_DEF_SEL(device,
-    "device");
-_MTL_PRIVATE_DEF_SEL(didModifyRange_,
-    "didModifyRange:");
-_MTL_PRIVATE_DEF_SEL(dimensions,
-    "dimensions");
-_MTL_PRIVATE_DEF_SEL(dispatchNetworkWithIntermediatesHeap_,
-    "dispatchNetworkWithIntermediatesHeap:");
-_MTL_PRIVATE_DEF_SEL(dispatchQueue,
-    "dispatchQueue");
-_MTL_PRIVATE_DEF_SEL(dispatchThreadgroups_threadsPerThreadgroup_,
-    "dispatchThreadgroups:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(dispatchThreadgroupsWithIndirectBuffer_indirectBufferOffset_threadsPerThreadgroup_,
-    "dispatchThreadgroupsWithIndirectBuffer:indirectBufferOffset:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(dispatchThreadgroupsWithIndirectBuffer_threadsPerThreadgroup_,
-    "dispatchThreadgroupsWithIndirectBuffer:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(dispatchThreads_threadsPerThreadgroup_,
-    "dispatchThreads:threadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(dispatchThreadsPerTile_,
-    "dispatchThreadsPerTile:");
-_MTL_PRIVATE_DEF_SEL(dispatchThreadsWithIndirectBuffer_,
-    "dispatchThreadsWithIndirectBuffer:");
-_MTL_PRIVATE_DEF_SEL(dispatchType,
-    "dispatchType");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPatches_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_indirectBuffer_indirectBufferOffset_,
-    "drawIndexedPatches:patchIndexBuffer:patchIndexBufferOffset:controlPointIndexBuffer:controlPointIndexBufferOffset:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_instanceCount_baseInstance_,
-    "drawIndexedPatches:patchStart:patchCount:patchIndexBuffer:patchIndexBufferOffset:controlPointIndexBuffer:controlPointIndexBufferOffset:instanceCount:baseInstance:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_instanceCount_baseInstance_tessellationFactorBuffer_tessellationFactorBufferOffset_tessellationFactorBufferInstanceStride_,
-    "drawIndexedPatches:patchStart:patchCount:patchIndexBuffer:patchIndexBufferOffset:controlPointIndexBuffer:controlPointIndexBufferOffset:instanceCount:baseInstance:tessellationFactorBuffer:tessellationFactorBufferOffset:tessellationFactorBufferInstanceStride:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferLength:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_instanceCount_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferLength:instanceCount:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferLength_instanceCount_baseVertex_baseInstance_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferLength:instanceCount:baseVertex:baseInstance:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_instanceCount_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferOffset:instanceCount:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_instanceCount_baseVertex_baseInstance_,
-    "drawIndexedPrimitives:indexCount:indexType:indexBuffer:indexBufferOffset:instanceCount:baseVertex:baseInstance:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexType_indexBuffer_indexBufferLength_indirectBuffer_,
-    "drawIndexedPrimitives:indexType:indexBuffer:indexBufferLength:indirectBuffer:");
-_MTL_PRIVATE_DEF_SEL(drawIndexedPrimitives_indexType_indexBuffer_indexBufferOffset_indirectBuffer_indirectBufferOffset_,
-    "drawIndexedPrimitives:indexType:indexBuffer:indexBufferOffset:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(drawMeshThreadgroups_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_,
-    "drawMeshThreadgroups:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(drawMeshThreadgroupsWithIndirectBuffer_indirectBufferOffset_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_,
-    "drawMeshThreadgroupsWithIndirectBuffer:indirectBufferOffset:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(drawMeshThreadgroupsWithIndirectBuffer_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_,
-    "drawMeshThreadgroupsWithIndirectBuffer:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(drawMeshThreads_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_,
-    "drawMeshThreads:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(drawPatches_patchIndexBuffer_patchIndexBufferOffset_indirectBuffer_indirectBufferOffset_,
-    "drawPatches:patchIndexBuffer:patchIndexBufferOffset:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(drawPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_instanceCount_baseInstance_,
-    "drawPatches:patchStart:patchCount:patchIndexBuffer:patchIndexBufferOffset:instanceCount:baseInstance:");
-_MTL_PRIVATE_DEF_SEL(drawPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_instanceCount_baseInstance_tessellationFactorBuffer_tessellationFactorBufferOffset_tessellationFactorBufferInstanceStride_,
-    "drawPatches:patchStart:patchCount:patchIndexBuffer:patchIndexBufferOffset:instanceCount:baseInstance:tessellationFactorBuffer:tessellationFactorBufferOffset:tessellationFactorBufferInstanceStride:");
-_MTL_PRIVATE_DEF_SEL(drawPrimitives_indirectBuffer_,
-    "drawPrimitives:indirectBuffer:");
-_MTL_PRIVATE_DEF_SEL(drawPrimitives_indirectBuffer_indirectBufferOffset_,
-    "drawPrimitives:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(drawPrimitives_vertexStart_vertexCount_,
-    "drawPrimitives:vertexStart:vertexCount:");
-_MTL_PRIVATE_DEF_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_,
-    "drawPrimitives:vertexStart:vertexCount:instanceCount:");
-_MTL_PRIVATE_DEF_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_baseInstance_,
-    "drawPrimitives:vertexStart:vertexCount:instanceCount:baseInstance:");
-_MTL_PRIVATE_DEF_SEL(drawableID,
-    "drawableID");
-_MTL_PRIVATE_DEF_SEL(elementArrayType,
-    "elementArrayType");
-_MTL_PRIVATE_DEF_SEL(elementIsArgumentBuffer,
-    "elementIsArgumentBuffer");
-_MTL_PRIVATE_DEF_SEL(elementPointerType,
-    "elementPointerType");
-_MTL_PRIVATE_DEF_SEL(elementStructType,
-    "elementStructType");
-_MTL_PRIVATE_DEF_SEL(elementTensorReferenceType,
-    "elementTensorReferenceType");
-_MTL_PRIVATE_DEF_SEL(elementTextureReferenceType,
-    "elementTextureReferenceType");
-_MTL_PRIVATE_DEF_SEL(elementType,
-    "elementType");
-_MTL_PRIVATE_DEF_SEL(enableLogging,
-    "enableLogging");
-_MTL_PRIVATE_DEF_SEL(encodeSignalEvent_value_,
-    "encodeSignalEvent:value:");
-_MTL_PRIVATE_DEF_SEL(encodeWaitForEvent_value_,
-    "encodeWaitForEvent:value:");
-_MTL_PRIVATE_DEF_SEL(encodedLength,
-    "encodedLength");
-_MTL_PRIVATE_DEF_SEL(encoderLabel,
-    "encoderLabel");
-_MTL_PRIVATE_DEF_SEL(endCommandBuffer,
-    "endCommandBuffer");
-_MTL_PRIVATE_DEF_SEL(endEncoding,
-    "endEncoding");
-_MTL_PRIVATE_DEF_SEL(endOfEncoderSampleIndex,
-    "endOfEncoderSampleIndex");
-_MTL_PRIVATE_DEF_SEL(endOfFragmentSampleIndex,
-    "endOfFragmentSampleIndex");
-_MTL_PRIVATE_DEF_SEL(endOfVertexSampleIndex,
-    "endOfVertexSampleIndex");
-_MTL_PRIVATE_DEF_SEL(endResidency,
-    "endResidency");
-_MTL_PRIVATE_DEF_SEL(enqueue,
-    "enqueue");
-_MTL_PRIVATE_DEF_SEL(enqueueBarrier,
-    "enqueueBarrier");
-_MTL_PRIVATE_DEF_SEL(error,
-    "error");
-_MTL_PRIVATE_DEF_SEL(errorOptions,
-    "errorOptions");
-_MTL_PRIVATE_DEF_SEL(errorState,
-    "errorState");
-_MTL_PRIVATE_DEF_SEL(executeCommandsInBuffer_indirectBuffer_,
-    "executeCommandsInBuffer:indirectBuffer:");
-_MTL_PRIVATE_DEF_SEL(executeCommandsInBuffer_indirectBuffer_indirectBufferOffset_,
-    "executeCommandsInBuffer:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(executeCommandsInBuffer_withRange_,
-    "executeCommandsInBuffer:withRange:");
-_MTL_PRIVATE_DEF_SEL(extentAtDimensionIndex_,
-    "extentAtDimensionIndex:");
-_MTL_PRIVATE_DEF_SEL(fastMathEnabled,
-    "fastMathEnabled");
-_MTL_PRIVATE_DEF_SEL(feedbackQueue,
-    "feedbackQueue");
-_MTL_PRIVATE_DEF_SEL(fillBuffer_range_value_,
-    "fillBuffer:range:value:");
-_MTL_PRIVATE_DEF_SEL(firstMipmapInTail,
-    "firstMipmapInTail");
-_MTL_PRIVATE_DEF_SEL(format,
-    "format");
-_MTL_PRIVATE_DEF_SEL(fragmentAdditionalBinaryFunctions,
-    "fragmentAdditionalBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(fragmentArguments,
-    "fragmentArguments");
-_MTL_PRIVATE_DEF_SEL(fragmentBindings,
-    "fragmentBindings");
-_MTL_PRIVATE_DEF_SEL(fragmentBuffers,
-    "fragmentBuffers");
-_MTL_PRIVATE_DEF_SEL(fragmentFunction,
-    "fragmentFunction");
-_MTL_PRIVATE_DEF_SEL(fragmentFunctionDescriptor,
-    "fragmentFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(fragmentLinkedFunctions,
-    "fragmentLinkedFunctions");
-_MTL_PRIVATE_DEF_SEL(fragmentLinkingDescriptor,
-    "fragmentLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(fragmentPreloadedLibraries,
-    "fragmentPreloadedLibraries");
-_MTL_PRIVATE_DEF_SEL(fragmentStaticLinkingDescriptor,
-    "fragmentStaticLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(frontFaceStencil,
-    "frontFaceStencil");
-_MTL_PRIVATE_DEF_SEL(function,
-    "function");
-_MTL_PRIVATE_DEF_SEL(functionConstantsDictionary,
-    "functionConstantsDictionary");
-_MTL_PRIVATE_DEF_SEL(functionCount,
-    "functionCount");
-_MTL_PRIVATE_DEF_SEL(functionDescriptor,
-    "functionDescriptor");
-_MTL_PRIVATE_DEF_SEL(functionDescriptors,
-    "functionDescriptors");
-_MTL_PRIVATE_DEF_SEL(functionGraph,
-    "functionGraph");
-_MTL_PRIVATE_DEF_SEL(functionGraphs,
-    "functionGraphs");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithBinaryFunction_,
-    "functionHandleWithBinaryFunction:");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithBinaryFunction_stage_,
-    "functionHandleWithBinaryFunction:stage:");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithFunction_,
-    "functionHandleWithFunction:");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithFunction_stage_,
-    "functionHandleWithFunction:stage:");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithName_,
-    "functionHandleWithName:");
-_MTL_PRIVATE_DEF_SEL(functionHandleWithName_stage_,
-    "functionHandleWithName:stage:");
-_MTL_PRIVATE_DEF_SEL(functionName,
-    "functionName");
-_MTL_PRIVATE_DEF_SEL(functionNames,
-    "functionNames");
-_MTL_PRIVATE_DEF_SEL(functionType,
-    "functionType");
-_MTL_PRIVATE_DEF_SEL(functions,
-    "functions");
-_MTL_PRIVATE_DEF_SEL(generateMipmapsForTexture_,
-    "generateMipmapsForTexture:");
-_MTL_PRIVATE_DEF_SEL(geometryDescriptors,
-    "geometryDescriptors");
-_MTL_PRIVATE_DEF_SEL(getBytes_bytesPerRow_bytesPerImage_fromRegion_mipmapLevel_slice_,
-    "getBytes:bytesPerRow:bytesPerImage:fromRegion:mipmapLevel:slice:");
-_MTL_PRIVATE_DEF_SEL(getBytes_bytesPerRow_fromRegion_mipmapLevel_,
-    "getBytes:bytesPerRow:fromRegion:mipmapLevel:");
-_MTL_PRIVATE_DEF_SEL(getBytes_strides_fromSliceOrigin_sliceDimensions_,
-    "getBytes:strides:fromSliceOrigin:sliceDimensions:");
-_MTL_PRIVATE_DEF_SEL(getDefaultSamplePositions_count_,
-    "getDefaultSamplePositions:count:");
-_MTL_PRIVATE_DEF_SEL(getPhysicalIndexForLogicalIndex_,
-    "getPhysicalIndexForLogicalIndex:");
-_MTL_PRIVATE_DEF_SEL(getSamplePositions_count_,
-    "getSamplePositions:count:");
-_MTL_PRIVATE_DEF_SEL(getTextureAccessCounters_region_mipLevel_slice_resetCounters_countersBuffer_countersBufferOffset_,
-    "getTextureAccessCounters:region:mipLevel:slice:resetCounters:countersBuffer:countersBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(gpuAddress,
-    "gpuAddress");
-_MTL_PRIVATE_DEF_SEL(gpuResourceID,
-    "gpuResourceID");
-_MTL_PRIVATE_DEF_SEL(groups,
-    "groups");
-_MTL_PRIVATE_DEF_SEL(hasUnifiedMemory,
-    "hasUnifiedMemory");
-_MTL_PRIVATE_DEF_SEL(hazardTrackingMode,
-    "hazardTrackingMode");
-_MTL_PRIVATE_DEF_SEL(heap,
-    "heap");
-_MTL_PRIVATE_DEF_SEL(heapAccelerationStructureSizeAndAlignWithDescriptor_,
-    "heapAccelerationStructureSizeAndAlignWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(heapAccelerationStructureSizeAndAlignWithSize_,
-    "heapAccelerationStructureSizeAndAlignWithSize:");
-_MTL_PRIVATE_DEF_SEL(heapBufferSizeAndAlignWithLength_options_,
-    "heapBufferSizeAndAlignWithLength:options:");
-_MTL_PRIVATE_DEF_SEL(heapOffset,
-    "heapOffset");
-_MTL_PRIVATE_DEF_SEL(heapTextureSizeAndAlignWithDescriptor_,
-    "heapTextureSizeAndAlignWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(height,
-    "height");
-_MTL_PRIVATE_DEF_SEL(horizontal,
-    "horizontal");
-_MTL_PRIVATE_DEF_SEL(horizontalSampleStorage,
-    "horizontalSampleStorage");
-_MTL_PRIVATE_DEF_SEL(imageblockMemoryLengthForDimensions_,
-    "imageblockMemoryLengthForDimensions:");
-_MTL_PRIVATE_DEF_SEL(imageblockSampleLength,
-    "imageblockSampleLength");
-_MTL_PRIVATE_DEF_SEL(index,
-    "index");
-_MTL_PRIVATE_DEF_SEL(indexBuffer,
-    "indexBuffer");
-_MTL_PRIVATE_DEF_SEL(indexBufferIndex,
-    "indexBufferIndex");
-_MTL_PRIVATE_DEF_SEL(indexBufferOffset,
-    "indexBufferOffset");
-_MTL_PRIVATE_DEF_SEL(indexType,
-    "indexType");
-_MTL_PRIVATE_DEF_SEL(indirectComputeCommandAtIndex_,
-    "indirectComputeCommandAtIndex:");
-_MTL_PRIVATE_DEF_SEL(indirectRenderCommandAtIndex_,
-    "indirectRenderCommandAtIndex:");
-_MTL_PRIVATE_DEF_SEL(inheritBuffers,
-    "inheritBuffers");
-_MTL_PRIVATE_DEF_SEL(inheritCullMode,
-    "inheritCullMode");
-_MTL_PRIVATE_DEF_SEL(inheritDepthBias,
-    "inheritDepthBias");
-_MTL_PRIVATE_DEF_SEL(inheritDepthClipMode,
-    "inheritDepthClipMode");
-_MTL_PRIVATE_DEF_SEL(inheritDepthStencilState,
-    "inheritDepthStencilState");
-_MTL_PRIVATE_DEF_SEL(inheritFrontFacingWinding,
-    "inheritFrontFacingWinding");
-_MTL_PRIVATE_DEF_SEL(inheritPipelineState,
-    "inheritPipelineState");
-_MTL_PRIVATE_DEF_SEL(inheritTriangleFillMode,
-    "inheritTriangleFillMode");
-_MTL_PRIVATE_DEF_SEL(init,
-    "init");
-_MTL_PRIVATE_DEF_SEL(initWithArgumentIndex_,
-    "initWithArgumentIndex:");
-_MTL_PRIVATE_DEF_SEL(initWithDispatchQueue_,
-    "initWithDispatchQueue:");
-_MTL_PRIVATE_DEF_SEL(initWithFunctionName_nodes_outputNode_attributes_,
-    "initWithFunctionName:nodes:outputNode:attributes:");
-_MTL_PRIVATE_DEF_SEL(initWithName_arguments_controlDependencies_,
-    "initWithName:arguments:controlDependencies:");
-_MTL_PRIVATE_DEF_SEL(initWithRank_values_,
-    "initWithRank:values:");
-_MTL_PRIVATE_DEF_SEL(initWithSampleCount_,
-    "initWithSampleCount:");
-_MTL_PRIVATE_DEF_SEL(initWithSampleCount_horizontal_vertical_,
-    "initWithSampleCount:horizontal:vertical:");
-_MTL_PRIVATE_DEF_SEL(initialCapacity,
-    "initialCapacity");
-_MTL_PRIVATE_DEF_SEL(initializeBindings,
-    "initializeBindings");
-_MTL_PRIVATE_DEF_SEL(inputDimensionsAtBufferIndex_,
-    "inputDimensionsAtBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(inputPrimitiveTopology,
-    "inputPrimitiveTopology");
-_MTL_PRIVATE_DEF_SEL(insertDebugCaptureBoundary,
-    "insertDebugCaptureBoundary");
-_MTL_PRIVATE_DEF_SEL(insertDebugSignpost_,
-    "insertDebugSignpost:");
-_MTL_PRIVATE_DEF_SEL(insertLibraries,
-    "insertLibraries");
-_MTL_PRIVATE_DEF_SEL(installName,
-    "installName");
-_MTL_PRIVATE_DEF_SEL(instanceCount,
-    "instanceCount");
-_MTL_PRIVATE_DEF_SEL(instanceCountBuffer,
-    "instanceCountBuffer");
-_MTL_PRIVATE_DEF_SEL(instanceCountBufferOffset,
-    "instanceCountBufferOffset");
-_MTL_PRIVATE_DEF_SEL(instanceDescriptorBuffer,
-    "instanceDescriptorBuffer");
-_MTL_PRIVATE_DEF_SEL(instanceDescriptorBufferOffset,
-    "instanceDescriptorBufferOffset");
-_MTL_PRIVATE_DEF_SEL(instanceDescriptorStride,
-    "instanceDescriptorStride");
-_MTL_PRIVATE_DEF_SEL(instanceDescriptorType,
-    "instanceDescriptorType");
-_MTL_PRIVATE_DEF_SEL(instanceTransformationMatrixLayout,
-    "instanceTransformationMatrixLayout");
-_MTL_PRIVATE_DEF_SEL(instancedAccelerationStructures,
-    "instancedAccelerationStructures");
-_MTL_PRIVATE_DEF_SEL(intermediatesHeapSize,
-    "intermediatesHeapSize");
-_MTL_PRIVATE_DEF_SEL(intersectionFunctionTableDescriptor,
-    "intersectionFunctionTableDescriptor");
-_MTL_PRIVATE_DEF_SEL(intersectionFunctionTableOffset,
-    "intersectionFunctionTableOffset");
-_MTL_PRIVATE_DEF_SEL(invalidateCounterRange_,
-    "invalidateCounterRange:");
-_MTL_PRIVATE_DEF_SEL(iosurface,
-    "iosurface");
-_MTL_PRIVATE_DEF_SEL(iosurfacePlane,
-    "iosurfacePlane");
-_MTL_PRIVATE_DEF_SEL(isActive,
-    "isActive");
-_MTL_PRIVATE_DEF_SEL(isAliasable,
-    "isAliasable");
-_MTL_PRIVATE_DEF_SEL(isAlphaToCoverageEnabled,
-    "isAlphaToCoverageEnabled");
-_MTL_PRIVATE_DEF_SEL(isAlphaToOneEnabled,
-    "isAlphaToOneEnabled");
-_MTL_PRIVATE_DEF_SEL(isArgument,
-    "isArgument");
-_MTL_PRIVATE_DEF_SEL(isBlendingEnabled,
-    "isBlendingEnabled");
-_MTL_PRIVATE_DEF_SEL(isCapturing,
-    "isCapturing");
-_MTL_PRIVATE_DEF_SEL(isDepth24Stencil8PixelFormatSupported,
-    "isDepth24Stencil8PixelFormatSupported");
-_MTL_PRIVATE_DEF_SEL(isDepthTexture,
-    "isDepthTexture");
-_MTL_PRIVATE_DEF_SEL(isDepthWriteEnabled,
-    "isDepthWriteEnabled");
-_MTL_PRIVATE_DEF_SEL(isFramebufferOnly,
-    "isFramebufferOnly");
-_MTL_PRIVATE_DEF_SEL(isHeadless,
-    "isHeadless");
-_MTL_PRIVATE_DEF_SEL(isLowPower,
-    "isLowPower");
-_MTL_PRIVATE_DEF_SEL(isPatchControlPointData,
-    "isPatchControlPointData");
-_MTL_PRIVATE_DEF_SEL(isPatchData,
-    "isPatchData");
-_MTL_PRIVATE_DEF_SEL(isRasterizationEnabled,
-    "isRasterizationEnabled");
-_MTL_PRIVATE_DEF_SEL(isRemovable,
-    "isRemovable");
-_MTL_PRIVATE_DEF_SEL(isShareable,
-    "isShareable");
-_MTL_PRIVATE_DEF_SEL(isSparse,
-    "isSparse");
-_MTL_PRIVATE_DEF_SEL(isTessellationFactorScaleEnabled,
-    "isTessellationFactorScaleEnabled");
-_MTL_PRIVATE_DEF_SEL(isUsed,
-    "isUsed");
-_MTL_PRIVATE_DEF_SEL(kernelEndTime,
-    "kernelEndTime");
-_MTL_PRIVATE_DEF_SEL(kernelStartTime,
-    "kernelStartTime");
-_MTL_PRIVATE_DEF_SEL(label,
-    "label");
-_MTL_PRIVATE_DEF_SEL(languageVersion,
-    "languageVersion");
-_MTL_PRIVATE_DEF_SEL(layerAtIndex_,
-    "layerAtIndex:");
-_MTL_PRIVATE_DEF_SEL(layerCount,
-    "layerCount");
-_MTL_PRIVATE_DEF_SEL(layers,
-    "layers");
-_MTL_PRIVATE_DEF_SEL(layouts,
-    "layouts");
-_MTL_PRIVATE_DEF_SEL(length,
-    "length");
-_MTL_PRIVATE_DEF_SEL(level,
-    "level");
-_MTL_PRIVATE_DEF_SEL(levelRange,
-    "levelRange");
-_MTL_PRIVATE_DEF_SEL(libraries,
-    "libraries");
-_MTL_PRIVATE_DEF_SEL(library,
-    "library");
-_MTL_PRIVATE_DEF_SEL(libraryType,
-    "libraryType");
-_MTL_PRIVATE_DEF_SEL(line,
-    "line");
-_MTL_PRIVATE_DEF_SEL(linkedFunctions,
-    "linkedFunctions");
-_MTL_PRIVATE_DEF_SEL(loadAction,
-    "loadAction");
-_MTL_PRIVATE_DEF_SEL(loadBuffer_offset_size_sourceHandle_sourceHandleOffset_,
-    "loadBuffer:offset:size:sourceHandle:sourceHandleOffset:");
-_MTL_PRIVATE_DEF_SEL(loadBytes_size_sourceHandle_sourceHandleOffset_,
-    "loadBytes:size:sourceHandle:sourceHandleOffset:");
-_MTL_PRIVATE_DEF_SEL(loadTexture_slice_level_size_sourceBytesPerRow_sourceBytesPerImage_destinationOrigin_sourceHandle_sourceHandleOffset_,
-    "loadTexture:slice:level:size:sourceBytesPerRow:sourceBytesPerImage:destinationOrigin:sourceHandle:sourceHandleOffset:");
-_MTL_PRIVATE_DEF_SEL(location,
-    "location");
-_MTL_PRIVATE_DEF_SEL(locationNumber,
-    "locationNumber");
-_MTL_PRIVATE_DEF_SEL(lodAverage,
-    "lodAverage");
-_MTL_PRIVATE_DEF_SEL(lodBias,
-    "lodBias");
-_MTL_PRIVATE_DEF_SEL(lodMaxClamp,
-    "lodMaxClamp");
-_MTL_PRIVATE_DEF_SEL(lodMinClamp,
-    "lodMinClamp");
-_MTL_PRIVATE_DEF_SEL(logState,
-    "logState");
-_MTL_PRIVATE_DEF_SEL(logs,
-    "logs");
-_MTL_PRIVATE_DEF_SEL(lookupArchives,
-    "lookupArchives");
-_MTL_PRIVATE_DEF_SEL(machineLearningCommandEncoder,
-    "machineLearningCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(machineLearningFunctionDescriptor,
-    "machineLearningFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(magFilter,
-    "magFilter");
-_MTL_PRIVATE_DEF_SEL(makeAliasable,
-    "makeAliasable");
-_MTL_PRIVATE_DEF_SEL(mapPhysicalToScreenCoordinates_forLayer_,
-    "mapPhysicalToScreenCoordinates:forLayer:");
-_MTL_PRIVATE_DEF_SEL(mapScreenToPhysicalCoordinates_forLayer_,
-    "mapScreenToPhysicalCoordinates:forLayer:");
-_MTL_PRIVATE_DEF_SEL(mathFloatingPointFunctions,
-    "mathFloatingPointFunctions");
-_MTL_PRIVATE_DEF_SEL(mathMode,
-    "mathMode");
-_MTL_PRIVATE_DEF_SEL(maxAnisotropy,
-    "maxAnisotropy");
-_MTL_PRIVATE_DEF_SEL(maxArgumentBufferSamplerCount,
-    "maxArgumentBufferSamplerCount");
-_MTL_PRIVATE_DEF_SEL(maxAvailableSizeWithAlignment_,
-    "maxAvailableSizeWithAlignment:");
-_MTL_PRIVATE_DEF_SEL(maxBufferBindCount,
-    "maxBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxBufferLength,
-    "maxBufferLength");
-_MTL_PRIVATE_DEF_SEL(maxCallStackDepth,
-    "maxCallStackDepth");
-_MTL_PRIVATE_DEF_SEL(maxCommandBufferCount,
-    "maxCommandBufferCount");
-_MTL_PRIVATE_DEF_SEL(maxCommandsInFlight,
-    "maxCommandsInFlight");
-_MTL_PRIVATE_DEF_SEL(maxCompatiblePlacementSparsePageSize,
-    "maxCompatiblePlacementSparsePageSize");
-_MTL_PRIVATE_DEF_SEL(maxFragmentBufferBindCount,
-    "maxFragmentBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxFragmentCallStackDepth,
-    "maxFragmentCallStackDepth");
-_MTL_PRIVATE_DEF_SEL(maxInstanceCount,
-    "maxInstanceCount");
-_MTL_PRIVATE_DEF_SEL(maxKernelBufferBindCount,
-    "maxKernelBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxKernelThreadgroupMemoryBindCount,
-    "maxKernelThreadgroupMemoryBindCount");
-_MTL_PRIVATE_DEF_SEL(maxMeshBufferBindCount,
-    "maxMeshBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxMotionTransformCount,
-    "maxMotionTransformCount");
-_MTL_PRIVATE_DEF_SEL(maxObjectBufferBindCount,
-    "maxObjectBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxObjectThreadgroupMemoryBindCount,
-    "maxObjectThreadgroupMemoryBindCount");
-_MTL_PRIVATE_DEF_SEL(maxSampleCount,
-    "maxSampleCount");
-_MTL_PRIVATE_DEF_SEL(maxSamplerStateBindCount,
-    "maxSamplerStateBindCount");
-_MTL_PRIVATE_DEF_SEL(maxTessellationFactor,
-    "maxTessellationFactor");
-_MTL_PRIVATE_DEF_SEL(maxTextureBindCount,
-    "maxTextureBindCount");
-_MTL_PRIVATE_DEF_SEL(maxThreadgroupMemoryLength,
-    "maxThreadgroupMemoryLength");
-_MTL_PRIVATE_DEF_SEL(maxThreadsPerThreadgroup,
-    "maxThreadsPerThreadgroup");
-_MTL_PRIVATE_DEF_SEL(maxTotalThreadgroupsPerMeshGrid,
-    "maxTotalThreadgroupsPerMeshGrid");
-_MTL_PRIVATE_DEF_SEL(maxTotalThreadsPerMeshThreadgroup,
-    "maxTotalThreadsPerMeshThreadgroup");
-_MTL_PRIVATE_DEF_SEL(maxTotalThreadsPerObjectThreadgroup,
-    "maxTotalThreadsPerObjectThreadgroup");
-_MTL_PRIVATE_DEF_SEL(maxTotalThreadsPerThreadgroup,
-    "maxTotalThreadsPerThreadgroup");
-_MTL_PRIVATE_DEF_SEL(maxTransferRate,
-    "maxTransferRate");
-_MTL_PRIVATE_DEF_SEL(maxVertexAmplificationCount,
-    "maxVertexAmplificationCount");
-_MTL_PRIVATE_DEF_SEL(maxVertexBufferBindCount,
-    "maxVertexBufferBindCount");
-_MTL_PRIVATE_DEF_SEL(maxVertexCallStackDepth,
-    "maxVertexCallStackDepth");
-_MTL_PRIVATE_DEF_SEL(maximumConcurrentCompilationTaskCount,
-    "maximumConcurrentCompilationTaskCount");
-_MTL_PRIVATE_DEF_SEL(memberByName_,
-    "memberByName:");
-_MTL_PRIVATE_DEF_SEL(members,
-    "members");
-_MTL_PRIVATE_DEF_SEL(memoryBarrierWithResources_count_,
-    "memoryBarrierWithResources:count:");
-_MTL_PRIVATE_DEF_SEL(memoryBarrierWithResources_count_afterStages_beforeStages_,
-    "memoryBarrierWithResources:count:afterStages:beforeStages:");
-_MTL_PRIVATE_DEF_SEL(memoryBarrierWithScope_,
-    "memoryBarrierWithScope:");
-_MTL_PRIVATE_DEF_SEL(memoryBarrierWithScope_afterStages_beforeStages_,
-    "memoryBarrierWithScope:afterStages:beforeStages:");
-_MTL_PRIVATE_DEF_SEL(meshAdditionalBinaryFunctions,
-    "meshAdditionalBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(meshBindings,
-    "meshBindings");
-_MTL_PRIVATE_DEF_SEL(meshBuffers,
-    "meshBuffers");
-_MTL_PRIVATE_DEF_SEL(meshFunction,
-    "meshFunction");
-_MTL_PRIVATE_DEF_SEL(meshFunctionDescriptor,
-    "meshFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(meshLinkedFunctions,
-    "meshLinkedFunctions");
-_MTL_PRIVATE_DEF_SEL(meshLinkingDescriptor,
-    "meshLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(meshStaticLinkingDescriptor,
-    "meshStaticLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(meshThreadExecutionWidth,
-    "meshThreadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(meshThreadgroupSizeIsMultipleOfThreadExecutionWidth,
-    "meshThreadgroupSizeIsMultipleOfThreadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(minFilter,
-    "minFilter");
-_MTL_PRIVATE_DEF_SEL(minimumLinearTextureAlignmentForPixelFormat_,
-    "minimumLinearTextureAlignmentForPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(minimumTextureBufferAlignmentForPixelFormat_,
-    "minimumTextureBufferAlignmentForPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(mipFilter,
-    "mipFilter");
-_MTL_PRIVATE_DEF_SEL(mipmapLevelCount,
-    "mipmapLevelCount");
-_MTL_PRIVATE_DEF_SEL(motionEndBorderMode,
-    "motionEndBorderMode");
-_MTL_PRIVATE_DEF_SEL(motionEndTime,
-    "motionEndTime");
-_MTL_PRIVATE_DEF_SEL(motionKeyframeCount,
-    "motionKeyframeCount");
-_MTL_PRIVATE_DEF_SEL(motionStartBorderMode,
-    "motionStartBorderMode");
-_MTL_PRIVATE_DEF_SEL(motionStartTime,
-    "motionStartTime");
-_MTL_PRIVATE_DEF_SEL(motionTransformBuffer,
-    "motionTransformBuffer");
-_MTL_PRIVATE_DEF_SEL(motionTransformBufferOffset,
-    "motionTransformBufferOffset");
-_MTL_PRIVATE_DEF_SEL(motionTransformCount,
-    "motionTransformCount");
-_MTL_PRIVATE_DEF_SEL(motionTransformCountBuffer,
-    "motionTransformCountBuffer");
-_MTL_PRIVATE_DEF_SEL(motionTransformCountBufferOffset,
-    "motionTransformCountBufferOffset");
-_MTL_PRIVATE_DEF_SEL(motionTransformStride,
-    "motionTransformStride");
-_MTL_PRIVATE_DEF_SEL(motionTransformType,
-    "motionTransformType");
-_MTL_PRIVATE_DEF_SEL(moveTextureMappingsFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_,
-    "moveTextureMappingsFromTexture:sourceSlice:sourceLevel:sourceOrigin:sourceSize:toTexture:destinationSlice:destinationLevel:destinationOrigin:");
-_MTL_PRIVATE_DEF_SEL(mutability,
-    "mutability");
-_MTL_PRIVATE_DEF_SEL(name,
-    "name");
-_MTL_PRIVATE_DEF_SEL(newAccelerationStructureWithDescriptor_,
-    "newAccelerationStructureWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newAccelerationStructureWithDescriptor_offset_,
-    "newAccelerationStructureWithDescriptor:offset:");
-_MTL_PRIVATE_DEF_SEL(newAccelerationStructureWithSize_,
-    "newAccelerationStructureWithSize:");
-_MTL_PRIVATE_DEF_SEL(newAccelerationStructureWithSize_offset_,
-    "newAccelerationStructureWithSize:offset:");
-_MTL_PRIVATE_DEF_SEL(newArchiveWithURL_error_,
-    "newArchiveWithURL:error:");
-_MTL_PRIVATE_DEF_SEL(newArgumentEncoderForBufferAtIndex_,
-    "newArgumentEncoderForBufferAtIndex:");
-_MTL_PRIVATE_DEF_SEL(newArgumentEncoderWithArguments_,
-    "newArgumentEncoderWithArguments:");
-_MTL_PRIVATE_DEF_SEL(newArgumentEncoderWithBufferBinding_,
-    "newArgumentEncoderWithBufferBinding:");
-_MTL_PRIVATE_DEF_SEL(newArgumentEncoderWithBufferIndex_,
-    "newArgumentEncoderWithBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(newArgumentEncoderWithBufferIndex_reflection_,
-    "newArgumentEncoderWithBufferIndex:reflection:");
-_MTL_PRIVATE_DEF_SEL(newArgumentTableWithDescriptor_error_,
-    "newArgumentTableWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newBinaryArchiveWithDescriptor_error_,
-    "newBinaryArchiveWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newBinaryFunctionWithDescriptor_compilerTaskOptions_completionHandler_,
-    "newBinaryFunctionWithDescriptor:compilerTaskOptions:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newBinaryFunctionWithDescriptor_compilerTaskOptions_error_,
-    "newBinaryFunctionWithDescriptor:compilerTaskOptions:error:");
-_MTL_PRIVATE_DEF_SEL(newBinaryFunctionWithDescriptor_error_,
-    "newBinaryFunctionWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newBufferWithBytes_length_options_,
-    "newBufferWithBytes:length:options:");
-_MTL_PRIVATE_DEF_SEL(newBufferWithBytesNoCopy_length_options_deallocator_,
-    "newBufferWithBytesNoCopy:length:options:deallocator:");
-_MTL_PRIVATE_DEF_SEL(newBufferWithLength_options_,
-    "newBufferWithLength:options:");
-_MTL_PRIVATE_DEF_SEL(newBufferWithLength_options_offset_,
-    "newBufferWithLength:options:offset:");
-_MTL_PRIVATE_DEF_SEL(newBufferWithLength_options_placementSparsePageSize_,
-    "newBufferWithLength:options:placementSparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(newCaptureScopeWithCommandQueue_,
-    "newCaptureScopeWithCommandQueue:");
-_MTL_PRIVATE_DEF_SEL(newCaptureScopeWithDevice_,
-    "newCaptureScopeWithDevice:");
-_MTL_PRIVATE_DEF_SEL(newCaptureScopeWithMTL4CommandQueue_,
-    "newCaptureScopeWithMTL4CommandQueue:");
-_MTL_PRIVATE_DEF_SEL(newCommandAllocator,
-    "newCommandAllocator");
-_MTL_PRIVATE_DEF_SEL(newCommandAllocatorWithDescriptor_error_,
-    "newCommandAllocatorWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newCommandBuffer,
-    "newCommandBuffer");
-_MTL_PRIVATE_DEF_SEL(newCommandQueue,
-    "newCommandQueue");
-_MTL_PRIVATE_DEF_SEL(newCommandQueueWithDescriptor_,
-    "newCommandQueueWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newCommandQueueWithMaxCommandBufferCount_,
-    "newCommandQueueWithMaxCommandBufferCount:");
-_MTL_PRIVATE_DEF_SEL(newCompilerWithDescriptor_error_,
-    "newCompilerWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithAdditionalBinaryFunctions_error_,
-    "newComputePipelineStateWithAdditionalBinaryFunctions:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithBinaryFunctions_error_,
-    "newComputePipelineStateWithBinaryFunctions:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_compilerTaskOptions_completionHandler_,
-    "newComputePipelineStateWithDescriptor:compilerTaskOptions:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_compilerTaskOptions_error_,
-    "newComputePipelineStateWithDescriptor:compilerTaskOptions:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_completionHandler_,
-    "newComputePipelineStateWithDescriptor:dynamicLinkingDescriptor:compilerTaskOptions:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_error_,
-    "newComputePipelineStateWithDescriptor:dynamicLinkingDescriptor:compilerTaskOptions:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_dynamicLinkingDescriptor_error_,
-    "newComputePipelineStateWithDescriptor:dynamicLinkingDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_error_,
-    "newComputePipelineStateWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_options_completionHandler_,
-    "newComputePipelineStateWithDescriptor:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithDescriptor_options_reflection_error_,
-    "newComputePipelineStateWithDescriptor:options:reflection:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithFunction_completionHandler_,
-    "newComputePipelineStateWithFunction:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithFunction_error_,
-    "newComputePipelineStateWithFunction:error:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithFunction_options_completionHandler_,
-    "newComputePipelineStateWithFunction:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newComputePipelineStateWithFunction_options_reflection_error_,
-    "newComputePipelineStateWithFunction:options:reflection:error:");
-_MTL_PRIVATE_DEF_SEL(newCounterHeapWithDescriptor_error_,
-    "newCounterHeapWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newCounterSampleBufferWithDescriptor_error_,
-    "newCounterSampleBufferWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newDefaultLibrary,
-    "newDefaultLibrary");
-_MTL_PRIVATE_DEF_SEL(newDefaultLibraryWithBundle_error_,
-    "newDefaultLibraryWithBundle:error:");
-_MTL_PRIVATE_DEF_SEL(newDepthStencilStateWithDescriptor_,
-    "newDepthStencilStateWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newDynamicLibrary_completionHandler_,
-    "newDynamicLibrary:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newDynamicLibrary_error_,
-    "newDynamicLibrary:error:");
-_MTL_PRIVATE_DEF_SEL(newDynamicLibraryWithURL_completionHandler_,
-    "newDynamicLibraryWithURL:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newDynamicLibraryWithURL_error_,
-    "newDynamicLibraryWithURL:error:");
-_MTL_PRIVATE_DEF_SEL(newEvent,
-    "newEvent");
-_MTL_PRIVATE_DEF_SEL(newFence,
-    "newFence");
-_MTL_PRIVATE_DEF_SEL(newFunctionWithDescriptor_completionHandler_,
-    "newFunctionWithDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newFunctionWithDescriptor_error_,
-    "newFunctionWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newFunctionWithName_,
-    "newFunctionWithName:");
-_MTL_PRIVATE_DEF_SEL(newFunctionWithName_constantValues_completionHandler_,
-    "newFunctionWithName:constantValues:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newFunctionWithName_constantValues_error_,
-    "newFunctionWithName:constantValues:error:");
-_MTL_PRIVATE_DEF_SEL(newHeapWithDescriptor_,
-    "newHeapWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newIOCommandQueueWithDescriptor_error_,
-    "newIOCommandQueueWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newIOFileHandleWithURL_compressionMethod_error_,
-    "newIOFileHandleWithURL:compressionMethod:error:");
-_MTL_PRIVATE_DEF_SEL(newIOFileHandleWithURL_error_,
-    "newIOFileHandleWithURL:error:");
-_MTL_PRIVATE_DEF_SEL(newIOHandleWithURL_compressionMethod_error_,
-    "newIOHandleWithURL:compressionMethod:error:");
-_MTL_PRIVATE_DEF_SEL(newIOHandleWithURL_error_,
-    "newIOHandleWithURL:error:");
-_MTL_PRIVATE_DEF_SEL(newIndirectCommandBufferWithDescriptor_maxCommandCount_options_,
-    "newIndirectCommandBufferWithDescriptor:maxCommandCount:options:");
-_MTL_PRIVATE_DEF_SEL(newIntersectionFunctionTableWithDescriptor_,
-    "newIntersectionFunctionTableWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newIntersectionFunctionTableWithDescriptor_stage_,
-    "newIntersectionFunctionTableWithDescriptor:stage:");
-_MTL_PRIVATE_DEF_SEL(newIntersectionFunctionWithDescriptor_completionHandler_,
-    "newIntersectionFunctionWithDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newIntersectionFunctionWithDescriptor_error_,
-    "newIntersectionFunctionWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithData_error_,
-    "newLibraryWithData:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithDescriptor_completionHandler_,
-    "newLibraryWithDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithDescriptor_error_,
-    "newLibraryWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithFile_error_,
-    "newLibraryWithFile:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithSource_options_completionHandler_,
-    "newLibraryWithSource:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithSource_options_error_,
-    "newLibraryWithSource:options:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithStitchedDescriptor_completionHandler_,
-    "newLibraryWithStitchedDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithStitchedDescriptor_error_,
-    "newLibraryWithStitchedDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newLibraryWithURL_error_,
-    "newLibraryWithURL:error:");
-_MTL_PRIVATE_DEF_SEL(newLogStateWithDescriptor_error_,
-    "newLogStateWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newMTL4CommandQueue,
-    "newMTL4CommandQueue");
-_MTL_PRIVATE_DEF_SEL(newMTL4CommandQueueWithDescriptor_error_,
-    "newMTL4CommandQueueWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newMachineLearningPipelineStateWithDescriptor_completionHandler_,
-    "newMachineLearningPipelineStateWithDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newMachineLearningPipelineStateWithDescriptor_error_,
-    "newMachineLearningPipelineStateWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newPipelineDataSetSerializerWithDescriptor_,
-    "newPipelineDataSetSerializerWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newRasterizationRateMapWithDescriptor_,
-    "newRasterizationRateMapWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newRemoteBufferViewForDevice_,
-    "newRemoteBufferViewForDevice:");
-_MTL_PRIVATE_DEF_SEL(newRemoteTextureViewForDevice_,
-    "newRemoteTextureViewForDevice:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineDescriptorForSpecialization,
-    "newRenderPipelineDescriptorForSpecialization");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateBySpecializationWithDescriptor_pipeline_completionHandler_,
-    "newRenderPipelineStateBySpecializationWithDescriptor:pipeline:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateBySpecializationWithDescriptor_pipeline_error_,
-    "newRenderPipelineStateBySpecializationWithDescriptor:pipeline:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithAdditionalBinaryFunctions_error_,
-    "newRenderPipelineStateWithAdditionalBinaryFunctions:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithBinaryFunctions_error_,
-    "newRenderPipelineStateWithBinaryFunctions:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_compilerTaskOptions_completionHandler_,
-    "newRenderPipelineStateWithDescriptor:compilerTaskOptions:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_compilerTaskOptions_error_,
-    "newRenderPipelineStateWithDescriptor:compilerTaskOptions:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_completionHandler_,
-    "newRenderPipelineStateWithDescriptor:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_completionHandler_,
-    "newRenderPipelineStateWithDescriptor:dynamicLinkingDescriptor:compilerTaskOptions:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_compilerTaskOptions_error_,
-    "newRenderPipelineStateWithDescriptor:dynamicLinkingDescriptor:compilerTaskOptions:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_dynamicLinkingDescriptor_error_,
-    "newRenderPipelineStateWithDescriptor:dynamicLinkingDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_error_,
-    "newRenderPipelineStateWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_options_completionHandler_,
-    "newRenderPipelineStateWithDescriptor:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithDescriptor_options_reflection_error_,
-    "newRenderPipelineStateWithDescriptor:options:reflection:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithMeshDescriptor_options_completionHandler_,
-    "newRenderPipelineStateWithMeshDescriptor:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithMeshDescriptor_options_reflection_error_,
-    "newRenderPipelineStateWithMeshDescriptor:options:reflection:error:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithTileDescriptor_options_completionHandler_,
-    "newRenderPipelineStateWithTileDescriptor:options:completionHandler:");
-_MTL_PRIVATE_DEF_SEL(newRenderPipelineStateWithTileDescriptor_options_reflection_error_,
-    "newRenderPipelineStateWithTileDescriptor:options:reflection:error:");
-_MTL_PRIVATE_DEF_SEL(newResidencySetWithDescriptor_error_,
-    "newResidencySetWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newSamplerStateWithDescriptor_,
-    "newSamplerStateWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newScratchBufferWithMinimumSize_,
-    "newScratchBufferWithMinimumSize:");
-_MTL_PRIVATE_DEF_SEL(newSharedEvent,
-    "newSharedEvent");
-_MTL_PRIVATE_DEF_SEL(newSharedEventHandle,
-    "newSharedEventHandle");
-_MTL_PRIVATE_DEF_SEL(newSharedEventWithHandle_,
-    "newSharedEventWithHandle:");
-_MTL_PRIVATE_DEF_SEL(newSharedTextureHandle,
-    "newSharedTextureHandle");
-_MTL_PRIVATE_DEF_SEL(newSharedTextureWithDescriptor_,
-    "newSharedTextureWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newSharedTextureWithHandle_,
-    "newSharedTextureWithHandle:");
-_MTL_PRIVATE_DEF_SEL(newTensorWithDescriptor_error_,
-    "newTensorWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newTensorWithDescriptor_offset_error_,
-    "newTensorWithDescriptor:offset:error:");
-_MTL_PRIVATE_DEF_SEL(newTextureViewPoolWithDescriptor_error_,
-    "newTextureViewPoolWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(newTextureViewWithDescriptor_,
-    "newTextureViewWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newTextureViewWithPixelFormat_,
-    "newTextureViewWithPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(newTextureViewWithPixelFormat_textureType_levels_slices_,
-    "newTextureViewWithPixelFormat:textureType:levels:slices:");
-_MTL_PRIVATE_DEF_SEL(newTextureViewWithPixelFormat_textureType_levels_slices_swizzle_,
-    "newTextureViewWithPixelFormat:textureType:levels:slices:swizzle:");
-_MTL_PRIVATE_DEF_SEL(newTextureWithDescriptor_,
-    "newTextureWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newTextureWithDescriptor_iosurface_plane_,
-    "newTextureWithDescriptor:iosurface:plane:");
-_MTL_PRIVATE_DEF_SEL(newTextureWithDescriptor_offset_,
-    "newTextureWithDescriptor:offset:");
-_MTL_PRIVATE_DEF_SEL(newTextureWithDescriptor_offset_bytesPerRow_,
-    "newTextureWithDescriptor:offset:bytesPerRow:");
-_MTL_PRIVATE_DEF_SEL(newVisibleFunctionTableWithDescriptor_,
-    "newVisibleFunctionTableWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(newVisibleFunctionTableWithDescriptor_stage_,
-    "newVisibleFunctionTableWithDescriptor:stage:");
-_MTL_PRIVATE_DEF_SEL(nodes,
-    "nodes");
-_MTL_PRIVATE_DEF_SEL(normalizedCoordinates,
-    "normalizedCoordinates");
-_MTL_PRIVATE_DEF_SEL(notifyListener_atValue_block_,
-    "notifyListener:atValue:block:");
-_MTL_PRIVATE_DEF_SEL(objectAdditionalBinaryFunctions,
-    "objectAdditionalBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(objectAtIndexedSubscript_,
-    "objectAtIndexedSubscript:");
-_MTL_PRIVATE_DEF_SEL(objectBindings,
-    "objectBindings");
-_MTL_PRIVATE_DEF_SEL(objectBuffers,
-    "objectBuffers");
-_MTL_PRIVATE_DEF_SEL(objectFunction,
-    "objectFunction");
-_MTL_PRIVATE_DEF_SEL(objectFunctionDescriptor,
-    "objectFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(objectLinkedFunctions,
-    "objectLinkedFunctions");
-_MTL_PRIVATE_DEF_SEL(objectLinkingDescriptor,
-    "objectLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(objectPayloadAlignment,
-    "objectPayloadAlignment");
-_MTL_PRIVATE_DEF_SEL(objectPayloadDataSize,
-    "objectPayloadDataSize");
-_MTL_PRIVATE_DEF_SEL(objectStaticLinkingDescriptor,
-    "objectStaticLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(objectThreadExecutionWidth,
-    "objectThreadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(objectThreadgroupSizeIsMultipleOfThreadExecutionWidth,
-    "objectThreadgroupSizeIsMultipleOfThreadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(offset,
-    "offset");
-_MTL_PRIVATE_DEF_SEL(opaque,
-    "opaque");
-_MTL_PRIVATE_DEF_SEL(optimizationLevel,
-    "optimizationLevel");
-_MTL_PRIVATE_DEF_SEL(optimizeContentsForCPUAccess_,
-    "optimizeContentsForCPUAccess:");
-_MTL_PRIVATE_DEF_SEL(optimizeContentsForCPUAccess_slice_level_,
-    "optimizeContentsForCPUAccess:slice:level:");
-_MTL_PRIVATE_DEF_SEL(optimizeContentsForGPUAccess_,
-    "optimizeContentsForGPUAccess:");
-_MTL_PRIVATE_DEF_SEL(optimizeContentsForGPUAccess_slice_level_,
-    "optimizeContentsForGPUAccess:slice:level:");
-_MTL_PRIVATE_DEF_SEL(optimizeIndirectCommandBuffer_withRange_,
-    "optimizeIndirectCommandBuffer:withRange:");
-_MTL_PRIVATE_DEF_SEL(options,
-    "options");
-_MTL_PRIVATE_DEF_SEL(outputNode,
-    "outputNode");
-_MTL_PRIVATE_DEF_SEL(outputURL,
-    "outputURL");
-_MTL_PRIVATE_DEF_SEL(parallelRenderCommandEncoderWithDescriptor_,
-    "parallelRenderCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(parameterBufferSizeAndAlign,
-    "parameterBufferSizeAndAlign");
-_MTL_PRIVATE_DEF_SEL(parentRelativeLevel,
-    "parentRelativeLevel");
-_MTL_PRIVATE_DEF_SEL(parentRelativeSlice,
-    "parentRelativeSlice");
-_MTL_PRIVATE_DEF_SEL(parentTexture,
-    "parentTexture");
-_MTL_PRIVATE_DEF_SEL(patchControlPointCount,
-    "patchControlPointCount");
-_MTL_PRIVATE_DEF_SEL(patchType,
-    "patchType");
-_MTL_PRIVATE_DEF_SEL(payloadMemoryLength,
-    "payloadMemoryLength");
-_MTL_PRIVATE_DEF_SEL(peerCount,
-    "peerCount");
-_MTL_PRIVATE_DEF_SEL(peerGroupID,
-    "peerGroupID");
-_MTL_PRIVATE_DEF_SEL(peerIndex,
-    "peerIndex");
-_MTL_PRIVATE_DEF_SEL(physicalGranularity,
-    "physicalGranularity");
-_MTL_PRIVATE_DEF_SEL(physicalSizeForLayer_,
-    "physicalSizeForLayer:");
-_MTL_PRIVATE_DEF_SEL(pipelineDataSetSerializer,
-    "pipelineDataSetSerializer");
-_MTL_PRIVATE_DEF_SEL(pixelFormat,
-    "pixelFormat");
-_MTL_PRIVATE_DEF_SEL(placementSparsePageSize,
-    "placementSparsePageSize");
-_MTL_PRIVATE_DEF_SEL(pointerType,
-    "pointerType");
-_MTL_PRIVATE_DEF_SEL(popDebugGroup,
-    "popDebugGroup");
-_MTL_PRIVATE_DEF_SEL(preloadedLibraries,
-    "preloadedLibraries");
-_MTL_PRIVATE_DEF_SEL(preprocessorMacros,
-    "preprocessorMacros");
-_MTL_PRIVATE_DEF_SEL(present,
-    "present");
-_MTL_PRIVATE_DEF_SEL(presentAfterMinimumDuration_,
-    "presentAfterMinimumDuration:");
-_MTL_PRIVATE_DEF_SEL(presentAtTime_,
-    "presentAtTime:");
-_MTL_PRIVATE_DEF_SEL(presentDrawable_,
-    "presentDrawable:");
-_MTL_PRIVATE_DEF_SEL(presentDrawable_afterMinimumDuration_,
-    "presentDrawable:afterMinimumDuration:");
-_MTL_PRIVATE_DEF_SEL(presentDrawable_atTime_,
-    "presentDrawable:atTime:");
-_MTL_PRIVATE_DEF_SEL(presentedTime,
-    "presentedTime");
-_MTL_PRIVATE_DEF_SEL(preserveInvariance,
-    "preserveInvariance");
-_MTL_PRIVATE_DEF_SEL(primitiveDataBuffer,
-    "primitiveDataBuffer");
-_MTL_PRIVATE_DEF_SEL(primitiveDataBufferOffset,
-    "primitiveDataBufferOffset");
-_MTL_PRIVATE_DEF_SEL(primitiveDataElementSize,
-    "primitiveDataElementSize");
-_MTL_PRIVATE_DEF_SEL(primitiveDataStride,
-    "primitiveDataStride");
-_MTL_PRIVATE_DEF_SEL(priority,
-    "priority");
-_MTL_PRIVATE_DEF_SEL(privateFunctionDescriptors,
-    "privateFunctionDescriptors");
-_MTL_PRIVATE_DEF_SEL(privateFunctions,
-    "privateFunctions");
-_MTL_PRIVATE_DEF_SEL(pushDebugGroup_,
-    "pushDebugGroup:");
-_MTL_PRIVATE_DEF_SEL(queryTimestampFrequency,
-    "queryTimestampFrequency");
-_MTL_PRIVATE_DEF_SEL(rAddressMode,
-    "rAddressMode");
-_MTL_PRIVATE_DEF_SEL(radiusBuffer,
-    "radiusBuffer");
-_MTL_PRIVATE_DEF_SEL(radiusBufferOffset,
-    "radiusBufferOffset");
-_MTL_PRIVATE_DEF_SEL(radiusBuffers,
-    "radiusBuffers");
-_MTL_PRIVATE_DEF_SEL(radiusFormat,
-    "radiusFormat");
-_MTL_PRIVATE_DEF_SEL(radiusStride,
-    "radiusStride");
-_MTL_PRIVATE_DEF_SEL(rank,
-    "rank");
-_MTL_PRIVATE_DEF_SEL(rasterSampleCount,
-    "rasterSampleCount");
-_MTL_PRIVATE_DEF_SEL(rasterizationRateMap,
-    "rasterizationRateMap");
-_MTL_PRIVATE_DEF_SEL(rasterizationRateMapDescriptorWithScreenSize_,
-    "rasterizationRateMapDescriptorWithScreenSize:");
-_MTL_PRIVATE_DEF_SEL(rasterizationRateMapDescriptorWithScreenSize_layer_,
-    "rasterizationRateMapDescriptorWithScreenSize:layer:");
-_MTL_PRIVATE_DEF_SEL(rasterizationRateMapDescriptorWithScreenSize_layerCount_layers_,
-    "rasterizationRateMapDescriptorWithScreenSize:layerCount:layers:");
-_MTL_PRIVATE_DEF_SEL(readMask,
-    "readMask");
-_MTL_PRIVATE_DEF_SEL(readWriteTextureSupport,
-    "readWriteTextureSupport");
-_MTL_PRIVATE_DEF_SEL(recommendedMaxWorkingSetSize,
-    "recommendedMaxWorkingSetSize");
-_MTL_PRIVATE_DEF_SEL(reductionMode,
-    "reductionMode");
-_MTL_PRIVATE_DEF_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_,
-    "refitAccelerationStructure:descriptor:destination:scratchBuffer:");
-_MTL_PRIVATE_DEF_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_options_,
-    "refitAccelerationStructure:descriptor:destination:scratchBuffer:options:");
-_MTL_PRIVATE_DEF_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_scratchBufferOffset_,
-    "refitAccelerationStructure:descriptor:destination:scratchBuffer:scratchBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(refitAccelerationStructure_descriptor_destination_scratchBuffer_scratchBufferOffset_options_,
-    "refitAccelerationStructure:descriptor:destination:scratchBuffer:scratchBufferOffset:options:");
-_MTL_PRIVATE_DEF_SEL(reflection,
-    "reflection");
-_MTL_PRIVATE_DEF_SEL(reflectionForFunctionWithName_,
-    "reflectionForFunctionWithName:");
-_MTL_PRIVATE_DEF_SEL(registryID,
-    "registryID");
-_MTL_PRIVATE_DEF_SEL(remoteStorageBuffer,
-    "remoteStorageBuffer");
-_MTL_PRIVATE_DEF_SEL(remoteStorageTexture,
-    "remoteStorageTexture");
-_MTL_PRIVATE_DEF_SEL(removeAllAllocations,
-    "removeAllAllocations");
-_MTL_PRIVATE_DEF_SEL(removeAllDebugMarkers,
-    "removeAllDebugMarkers");
-_MTL_PRIVATE_DEF_SEL(removeAllocation_,
-    "removeAllocation:");
-_MTL_PRIVATE_DEF_SEL(removeAllocations_count_,
-    "removeAllocations:count:");
-_MTL_PRIVATE_DEF_SEL(removeResidencySet_,
-    "removeResidencySet:");
-_MTL_PRIVATE_DEF_SEL(removeResidencySets_count_,
-    "removeResidencySets:count:");
-_MTL_PRIVATE_DEF_SEL(renderCommandEncoder,
-    "renderCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(renderCommandEncoderWithDescriptor_,
-    "renderCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(renderCommandEncoderWithDescriptor_options_,
-    "renderCommandEncoderWithDescriptor:options:");
-_MTL_PRIVATE_DEF_SEL(renderPassDescriptor,
-    "renderPassDescriptor");
-_MTL_PRIVATE_DEF_SEL(renderTargetArrayLength,
-    "renderTargetArrayLength");
-_MTL_PRIVATE_DEF_SEL(renderTargetHeight,
-    "renderTargetHeight");
-_MTL_PRIVATE_DEF_SEL(renderTargetWidth,
-    "renderTargetWidth");
-_MTL_PRIVATE_DEF_SEL(replaceRegion_mipmapLevel_slice_withBytes_bytesPerRow_bytesPerImage_,
-    "replaceRegion:mipmapLevel:slice:withBytes:bytesPerRow:bytesPerImage:");
-_MTL_PRIVATE_DEF_SEL(replaceRegion_mipmapLevel_withBytes_bytesPerRow_,
-    "replaceRegion:mipmapLevel:withBytes:bytesPerRow:");
-_MTL_PRIVATE_DEF_SEL(replaceSliceOrigin_sliceDimensions_withBytes_strides_,
-    "replaceSliceOrigin:sliceDimensions:withBytes:strides:");
-_MTL_PRIVATE_DEF_SEL(requestResidency,
-    "requestResidency");
-_MTL_PRIVATE_DEF_SEL(required,
-    "required");
-_MTL_PRIVATE_DEF_SEL(requiredThreadsPerMeshThreadgroup,
-    "requiredThreadsPerMeshThreadgroup");
-_MTL_PRIVATE_DEF_SEL(requiredThreadsPerObjectThreadgroup,
-    "requiredThreadsPerObjectThreadgroup");
-_MTL_PRIVATE_DEF_SEL(requiredThreadsPerThreadgroup,
-    "requiredThreadsPerThreadgroup");
-_MTL_PRIVATE_DEF_SEL(requiredThreadsPerTileThreadgroup,
-    "requiredThreadsPerTileThreadgroup");
-_MTL_PRIVATE_DEF_SEL(reset,
-    "reset");
-_MTL_PRIVATE_DEF_SEL(resetCommandsInBuffer_withRange_,
-    "resetCommandsInBuffer:withRange:");
-_MTL_PRIVATE_DEF_SEL(resetTextureAccessCounters_region_mipLevel_slice_,
-    "resetTextureAccessCounters:region:mipLevel:slice:");
-_MTL_PRIVATE_DEF_SEL(resetWithRange_,
-    "resetWithRange:");
-_MTL_PRIVATE_DEF_SEL(resolveCounterHeap_withRange_intoBuffer_waitFence_updateFence_,
-    "resolveCounterHeap:withRange:intoBuffer:waitFence:updateFence:");
-_MTL_PRIVATE_DEF_SEL(resolveCounterRange_,
-    "resolveCounterRange:");
-_MTL_PRIVATE_DEF_SEL(resolveCounters_inRange_destinationBuffer_destinationOffset_,
-    "resolveCounters:inRange:destinationBuffer:destinationOffset:");
-_MTL_PRIVATE_DEF_SEL(resolveDepthPlane,
-    "resolveDepthPlane");
-_MTL_PRIVATE_DEF_SEL(resolveLevel,
-    "resolveLevel");
-_MTL_PRIVATE_DEF_SEL(resolveSlice,
-    "resolveSlice");
-_MTL_PRIVATE_DEF_SEL(resolveTexture,
-    "resolveTexture");
-_MTL_PRIVATE_DEF_SEL(resourceOptions,
-    "resourceOptions");
-_MTL_PRIVATE_DEF_SEL(resourceStateCommandEncoder,
-    "resourceStateCommandEncoder");
-_MTL_PRIVATE_DEF_SEL(resourceStateCommandEncoderWithDescriptor_,
-    "resourceStateCommandEncoderWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(resourceStatePassDescriptor,
-    "resourceStatePassDescriptor");
-_MTL_PRIVATE_DEF_SEL(resourceViewCount,
-    "resourceViewCount");
-_MTL_PRIVATE_DEF_SEL(retainedReferences,
-    "retainedReferences");
-_MTL_PRIVATE_DEF_SEL(rgbBlendOperation,
-    "rgbBlendOperation");
-_MTL_PRIVATE_DEF_SEL(rootResource,
-    "rootResource");
-_MTL_PRIVATE_DEF_SEL(sAddressMode,
-    "sAddressMode");
-_MTL_PRIVATE_DEF_SEL(sampleBuffer,
-    "sampleBuffer");
-_MTL_PRIVATE_DEF_SEL(sampleBufferAttachments,
-    "sampleBufferAttachments");
-_MTL_PRIVATE_DEF_SEL(sampleCount,
-    "sampleCount");
-_MTL_PRIVATE_DEF_SEL(sampleCountersInBuffer_atSampleIndex_withBarrier_,
-    "sampleCountersInBuffer:atSampleIndex:withBarrier:");
-_MTL_PRIVATE_DEF_SEL(sampleTimestamps_gpuTimestamp_,
-    "sampleTimestamps:gpuTimestamp:");
-_MTL_PRIVATE_DEF_SEL(scratchBufferAllocator,
-    "scratchBufferAllocator");
-_MTL_PRIVATE_DEF_SEL(screenSize,
-    "screenSize");
-_MTL_PRIVATE_DEF_SEL(segmentControlPointCount,
-    "segmentControlPointCount");
-_MTL_PRIVATE_DEF_SEL(segmentCount,
-    "segmentCount");
-_MTL_PRIVATE_DEF_SEL(serializeAsArchiveAndFlushToURL_error_,
-    "serializeAsArchiveAndFlushToURL:error:");
-_MTL_PRIVATE_DEF_SEL(serializeAsPipelinesScriptWithError_,
-    "serializeAsPipelinesScriptWithError:");
-_MTL_PRIVATE_DEF_SEL(serializeToURL_error_,
-    "serializeToURL:error:");
-_MTL_PRIVATE_DEF_SEL(setAccelerationStructure_atBufferIndex_,
-    "setAccelerationStructure:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setAccelerationStructure_atIndex_,
-    "setAccelerationStructure:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setAccess_,
-    "setAccess:");
-_MTL_PRIVATE_DEF_SEL(setAddress_atIndex_,
-    "setAddress:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setAddress_attributeStride_atIndex_,
-    "setAddress:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setAllowDuplicateIntersectionFunctionInvocation_,
-    "setAllowDuplicateIntersectionFunctionInvocation:");
-_MTL_PRIVATE_DEF_SEL(setAllowGPUOptimizedContents_,
-    "setAllowGPUOptimizedContents:");
-_MTL_PRIVATE_DEF_SEL(setAllowReferencingUndefinedSymbols_,
-    "setAllowReferencingUndefinedSymbols:");
-_MTL_PRIVATE_DEF_SEL(setAlphaBlendOperation_,
-    "setAlphaBlendOperation:");
-_MTL_PRIVATE_DEF_SEL(setAlphaToCoverageEnabled_,
-    "setAlphaToCoverageEnabled:");
-_MTL_PRIVATE_DEF_SEL(setAlphaToCoverageState_,
-    "setAlphaToCoverageState:");
-_MTL_PRIVATE_DEF_SEL(setAlphaToOneEnabled_,
-    "setAlphaToOneEnabled:");
-_MTL_PRIVATE_DEF_SEL(setAlphaToOneState_,
-    "setAlphaToOneState:");
-_MTL_PRIVATE_DEF_SEL(setArgumentBuffer_offset_,
-    "setArgumentBuffer:offset:");
-_MTL_PRIVATE_DEF_SEL(setArgumentBuffer_startOffset_arrayElement_,
-    "setArgumentBuffer:startOffset:arrayElement:");
-_MTL_PRIVATE_DEF_SEL(setArgumentIndex_,
-    "setArgumentIndex:");
-_MTL_PRIVATE_DEF_SEL(setArgumentTable_,
-    "setArgumentTable:");
-_MTL_PRIVATE_DEF_SEL(setArgumentTable_atStages_,
-    "setArgumentTable:atStages:");
-_MTL_PRIVATE_DEF_SEL(setArguments_,
-    "setArguments:");
-_MTL_PRIVATE_DEF_SEL(setArrayLength_,
-    "setArrayLength:");
-_MTL_PRIVATE_DEF_SEL(setAttributes_,
-    "setAttributes:");
-_MTL_PRIVATE_DEF_SEL(setBackFaceStencil_,
-    "setBackFaceStencil:");
-_MTL_PRIVATE_DEF_SEL(setBarrier,
-    "setBarrier");
-_MTL_PRIVATE_DEF_SEL(setBinaryArchives_,
-    "setBinaryArchives:");
-_MTL_PRIVATE_DEF_SEL(setBinaryFunctions_,
-    "setBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setBinaryLinkedFunctions_,
-    "setBinaryLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setBlendColorRed_green_blue_alpha_,
-    "setBlendColorRed:green:blue:alpha:");
-_MTL_PRIVATE_DEF_SEL(setBlendingEnabled_,
-    "setBlendingEnabled:");
-_MTL_PRIVATE_DEF_SEL(setBlendingState_,
-    "setBlendingState:");
-_MTL_PRIVATE_DEF_SEL(setBorderColor_,
-    "setBorderColor:");
-_MTL_PRIVATE_DEF_SEL(setBoundingBoxBuffer_,
-    "setBoundingBoxBuffer:");
-_MTL_PRIVATE_DEF_SEL(setBoundingBoxBufferOffset_,
-    "setBoundingBoxBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setBoundingBoxBuffers_,
-    "setBoundingBoxBuffers:");
-_MTL_PRIVATE_DEF_SEL(setBoundingBoxCount_,
-    "setBoundingBoxCount:");
-_MTL_PRIVATE_DEF_SEL(setBoundingBoxStride_,
-    "setBoundingBoxStride:");
-_MTL_PRIVATE_DEF_SEL(setBuffer_,
-    "setBuffer:");
-_MTL_PRIVATE_DEF_SEL(setBuffer_offset_atIndex_,
-    "setBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setBuffer_offset_attributeStride_atIndex_,
-    "setBuffer:offset:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setBufferIndex_,
-    "setBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setBufferOffset_atIndex_,
-    "setBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setBufferOffset_attributeStride_atIndex_,
-    "setBufferOffset:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setBufferSize_,
-    "setBufferSize:");
-_MTL_PRIVATE_DEF_SEL(setBuffers_offsets_attributeStrides_withRange_,
-    "setBuffers:offsets:attributeStrides:withRange:");
-_MTL_PRIVATE_DEF_SEL(setBuffers_offsets_withRange_,
-    "setBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setBytes_length_atIndex_,
-    "setBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setBytes_length_attributeStride_atIndex_,
-    "setBytes:length:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setCaptureObject_,
-    "setCaptureObject:");
-_MTL_PRIVATE_DEF_SEL(setClearColor_,
-    "setClearColor:");
-_MTL_PRIVATE_DEF_SEL(setClearDepth_,
-    "setClearDepth:");
-_MTL_PRIVATE_DEF_SEL(setClearStencil_,
-    "setClearStencil:");
-_MTL_PRIVATE_DEF_SEL(setColorAttachmentMap_,
-    "setColorAttachmentMap:");
-_MTL_PRIVATE_DEF_SEL(setColorAttachmentMappingState_,
-    "setColorAttachmentMappingState:");
-_MTL_PRIVATE_DEF_SEL(setColorStoreAction_atIndex_,
-    "setColorStoreAction:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setColorStoreActionOptions_atIndex_,
-    "setColorStoreActionOptions:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setCommandTypes_,
-    "setCommandTypes:");
-_MTL_PRIVATE_DEF_SEL(setCompareFunction_,
-    "setCompareFunction:");
-_MTL_PRIVATE_DEF_SEL(setCompileSymbolVisibility_,
-    "setCompileSymbolVisibility:");
-_MTL_PRIVATE_DEF_SEL(setCompressionType_,
-    "setCompressionType:");
-_MTL_PRIVATE_DEF_SEL(setComputeFunction_,
-    "setComputeFunction:");
-_MTL_PRIVATE_DEF_SEL(setComputeFunctionDescriptor_,
-    "setComputeFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setComputePipelineState_,
-    "setComputePipelineState:");
-_MTL_PRIVATE_DEF_SEL(setComputePipelineState_atIndex_,
-    "setComputePipelineState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setComputePipelineStates_withRange_,
-    "setComputePipelineStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setConfiguration_,
-    "setConfiguration:");
-_MTL_PRIVATE_DEF_SEL(setConstantBlockAlignment_,
-    "setConstantBlockAlignment:");
-_MTL_PRIVATE_DEF_SEL(setConstantValue_type_atIndex_,
-    "setConstantValue:type:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setConstantValue_type_withName_,
-    "setConstantValue:type:withName:");
-_MTL_PRIVATE_DEF_SEL(setConstantValues_,
-    "setConstantValues:");
-_MTL_PRIVATE_DEF_SEL(setConstantValues_type_withRange_,
-    "setConstantValues:type:withRange:");
-_MTL_PRIVATE_DEF_SEL(setControlDependencies_,
-    "setControlDependencies:");
-_MTL_PRIVATE_DEF_SEL(setControlPointBuffer_,
-    "setControlPointBuffer:");
-_MTL_PRIVATE_DEF_SEL(setControlPointBufferOffset_,
-    "setControlPointBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setControlPointBuffers_,
-    "setControlPointBuffers:");
-_MTL_PRIVATE_DEF_SEL(setControlPointCount_,
-    "setControlPointCount:");
-_MTL_PRIVATE_DEF_SEL(setControlPointFormat_,
-    "setControlPointFormat:");
-_MTL_PRIVATE_DEF_SEL(setControlPointStride_,
-    "setControlPointStride:");
-_MTL_PRIVATE_DEF_SEL(setCount_,
-    "setCount:");
-_MTL_PRIVATE_DEF_SEL(setCounterSet_,
-    "setCounterSet:");
-_MTL_PRIVATE_DEF_SEL(setCpuCacheMode_,
-    "setCpuCacheMode:");
-_MTL_PRIVATE_DEF_SEL(setCullMode_,
-    "setCullMode:");
-_MTL_PRIVATE_DEF_SEL(setCurveBasis_,
-    "setCurveBasis:");
-_MTL_PRIVATE_DEF_SEL(setCurveEndCaps_,
-    "setCurveEndCaps:");
-_MTL_PRIVATE_DEF_SEL(setCurveType_,
-    "setCurveType:");
-_MTL_PRIVATE_DEF_SEL(setDataType_,
-    "setDataType:");
-_MTL_PRIVATE_DEF_SEL(setDefaultCaptureScope_,
-    "setDefaultCaptureScope:");
-_MTL_PRIVATE_DEF_SEL(setDefaultRasterSampleCount_,
-    "setDefaultRasterSampleCount:");
-_MTL_PRIVATE_DEF_SEL(setDepth_,
-    "setDepth:");
-_MTL_PRIVATE_DEF_SEL(setDepthAttachment_,
-    "setDepthAttachment:");
-_MTL_PRIVATE_DEF_SEL(setDepthAttachmentPixelFormat_,
-    "setDepthAttachmentPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(setDepthBias_slopeScale_clamp_,
-    "setDepthBias:slopeScale:clamp:");
-_MTL_PRIVATE_DEF_SEL(setDepthClipMode_,
-    "setDepthClipMode:");
-_MTL_PRIVATE_DEF_SEL(setDepthCompareFunction_,
-    "setDepthCompareFunction:");
-_MTL_PRIVATE_DEF_SEL(setDepthFailureOperation_,
-    "setDepthFailureOperation:");
-_MTL_PRIVATE_DEF_SEL(setDepthPlane_,
-    "setDepthPlane:");
-_MTL_PRIVATE_DEF_SEL(setDepthResolveFilter_,
-    "setDepthResolveFilter:");
-_MTL_PRIVATE_DEF_SEL(setDepthStencilPassOperation_,
-    "setDepthStencilPassOperation:");
-_MTL_PRIVATE_DEF_SEL(setDepthStencilState_,
-    "setDepthStencilState:");
-_MTL_PRIVATE_DEF_SEL(setDepthStencilState_atIndex_,
-    "setDepthStencilState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setDepthStencilStates_withRange_,
-    "setDepthStencilStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setDepthStoreAction_,
-    "setDepthStoreAction:");
-_MTL_PRIVATE_DEF_SEL(setDepthStoreActionOptions_,
-    "setDepthStoreActionOptions:");
-_MTL_PRIVATE_DEF_SEL(setDepthTestMinBound_maxBound_,
-    "setDepthTestMinBound:maxBound:");
-_MTL_PRIVATE_DEF_SEL(setDepthWriteEnabled_,
-    "setDepthWriteEnabled:");
-_MTL_PRIVATE_DEF_SEL(setDestination_,
-    "setDestination:");
-_MTL_PRIVATE_DEF_SEL(setDestinationAlphaBlendFactor_,
-    "setDestinationAlphaBlendFactor:");
-_MTL_PRIVATE_DEF_SEL(setDestinationRGBBlendFactor_,
-    "setDestinationRGBBlendFactor:");
-_MTL_PRIVATE_DEF_SEL(setDimensions_,
-    "setDimensions:");
-_MTL_PRIVATE_DEF_SEL(setDispatchType_,
-    "setDispatchType:");
-_MTL_PRIVATE_DEF_SEL(setEnableLogging_,
-    "setEnableLogging:");
-_MTL_PRIVATE_DEF_SEL(setEndOfEncoderSampleIndex_,
-    "setEndOfEncoderSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setEndOfFragmentSampleIndex_,
-    "setEndOfFragmentSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setEndOfVertexSampleIndex_,
-    "setEndOfVertexSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setErrorOptions_,
-    "setErrorOptions:");
-_MTL_PRIVATE_DEF_SEL(setFastMathEnabled_,
-    "setFastMathEnabled:");
-_MTL_PRIVATE_DEF_SEL(setFeedbackQueue_,
-    "setFeedbackQueue:");
-_MTL_PRIVATE_DEF_SEL(setFormat_,
-    "setFormat:");
-_MTL_PRIVATE_DEF_SEL(setFragmentAccelerationStructure_atBufferIndex_,
-    "setFragmentAccelerationStructure:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentAdditionalBinaryFunctions_,
-    "setFragmentAdditionalBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setFragmentBuffer_offset_atIndex_,
-    "setFragmentBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentBufferOffset_atIndex_,
-    "setFragmentBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentBuffers_offsets_withRange_,
-    "setFragmentBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setFragmentBytes_length_atIndex_,
-    "setFragmentBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentFunction_,
-    "setFragmentFunction:");
-_MTL_PRIVATE_DEF_SEL(setFragmentFunctionDescriptor_,
-    "setFragmentFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setFragmentIntersectionFunctionTable_atBufferIndex_,
-    "setFragmentIntersectionFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentIntersectionFunctionTables_withBufferRange_,
-    "setFragmentIntersectionFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setFragmentLinkedFunctions_,
-    "setFragmentLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setFragmentPreloadedLibraries_,
-    "setFragmentPreloadedLibraries:");
-_MTL_PRIVATE_DEF_SEL(setFragmentSamplerState_atIndex_,
-    "setFragmentSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setFragmentSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setFragmentSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setFragmentSamplerStates_withRange_,
-    "setFragmentSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setFragmentStaticLinkingDescriptor_,
-    "setFragmentStaticLinkingDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setFragmentTexture_atIndex_,
-    "setFragmentTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentTextures_withRange_,
-    "setFragmentTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setFragmentVisibleFunctionTable_atBufferIndex_,
-    "setFragmentVisibleFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setFragmentVisibleFunctionTables_withBufferRange_,
-    "setFragmentVisibleFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setFrontFaceStencil_,
-    "setFrontFaceStencil:");
-_MTL_PRIVATE_DEF_SEL(setFrontFacingWinding_,
-    "setFrontFacingWinding:");
-_MTL_PRIVATE_DEF_SEL(setFunction_atIndex_,
-    "setFunction:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setFunctionCount_,
-    "setFunctionCount:");
-_MTL_PRIVATE_DEF_SEL(setFunctionDescriptor_,
-    "setFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setFunctionDescriptors_,
-    "setFunctionDescriptors:");
-_MTL_PRIVATE_DEF_SEL(setFunctionGraph_,
-    "setFunctionGraph:");
-_MTL_PRIVATE_DEF_SEL(setFunctionGraphs_,
-    "setFunctionGraphs:");
-_MTL_PRIVATE_DEF_SEL(setFunctionName_,
-    "setFunctionName:");
-_MTL_PRIVATE_DEF_SEL(setFunctions_,
-    "setFunctions:");
-_MTL_PRIVATE_DEF_SEL(setFunctions_withRange_,
-    "setFunctions:withRange:");
-_MTL_PRIVATE_DEF_SEL(setGeometryDescriptors_,
-    "setGeometryDescriptors:");
-_MTL_PRIVATE_DEF_SEL(setGroups_,
-    "setGroups:");
-_MTL_PRIVATE_DEF_SEL(setHazardTrackingMode_,
-    "setHazardTrackingMode:");
-_MTL_PRIVATE_DEF_SEL(setHeight_,
-    "setHeight:");
-_MTL_PRIVATE_DEF_SEL(setImageblockSampleLength_,
-    "setImageblockSampleLength:");
-_MTL_PRIVATE_DEF_SEL(setImageblockWidth_height_,
-    "setImageblockWidth:height:");
-_MTL_PRIVATE_DEF_SEL(setIndex_,
-    "setIndex:");
-_MTL_PRIVATE_DEF_SEL(setIndexBuffer_,
-    "setIndexBuffer:");
-_MTL_PRIVATE_DEF_SEL(setIndexBufferIndex_,
-    "setIndexBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setIndexBufferOffset_,
-    "setIndexBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setIndexType_,
-    "setIndexType:");
-_MTL_PRIVATE_DEF_SEL(setIndirectCommandBuffer_atIndex_,
-    "setIndirectCommandBuffer:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setIndirectCommandBuffers_withRange_,
-    "setIndirectCommandBuffers:withRange:");
-_MTL_PRIVATE_DEF_SEL(setInheritBuffers_,
-    "setInheritBuffers:");
-_MTL_PRIVATE_DEF_SEL(setInheritCullMode_,
-    "setInheritCullMode:");
-_MTL_PRIVATE_DEF_SEL(setInheritDepthBias_,
-    "setInheritDepthBias:");
-_MTL_PRIVATE_DEF_SEL(setInheritDepthClipMode_,
-    "setInheritDepthClipMode:");
-_MTL_PRIVATE_DEF_SEL(setInheritDepthStencilState_,
-    "setInheritDepthStencilState:");
-_MTL_PRIVATE_DEF_SEL(setInheritFrontFacingWinding_,
-    "setInheritFrontFacingWinding:");
-_MTL_PRIVATE_DEF_SEL(setInheritPipelineState_,
-    "setInheritPipelineState:");
-_MTL_PRIVATE_DEF_SEL(setInheritTriangleFillMode_,
-    "setInheritTriangleFillMode:");
-_MTL_PRIVATE_DEF_SEL(setInitialCapacity_,
-    "setInitialCapacity:");
-_MTL_PRIVATE_DEF_SEL(setInitializeBindings_,
-    "setInitializeBindings:");
-_MTL_PRIVATE_DEF_SEL(setInputDimensions_atBufferIndex_,
-    "setInputDimensions:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setInputDimensions_withRange_,
-    "setInputDimensions:withRange:");
-_MTL_PRIVATE_DEF_SEL(setInputPrimitiveTopology_,
-    "setInputPrimitiveTopology:");
-_MTL_PRIVATE_DEF_SEL(setInsertLibraries_,
-    "setInsertLibraries:");
-_MTL_PRIVATE_DEF_SEL(setInstallName_,
-    "setInstallName:");
-_MTL_PRIVATE_DEF_SEL(setInstanceCount_,
-    "setInstanceCount:");
-_MTL_PRIVATE_DEF_SEL(setInstanceCountBuffer_,
-    "setInstanceCountBuffer:");
-_MTL_PRIVATE_DEF_SEL(setInstanceCountBufferOffset_,
-    "setInstanceCountBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setInstanceDescriptorBuffer_,
-    "setInstanceDescriptorBuffer:");
-_MTL_PRIVATE_DEF_SEL(setInstanceDescriptorBufferOffset_,
-    "setInstanceDescriptorBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setInstanceDescriptorStride_,
-    "setInstanceDescriptorStride:");
-_MTL_PRIVATE_DEF_SEL(setInstanceDescriptorType_,
-    "setInstanceDescriptorType:");
-_MTL_PRIVATE_DEF_SEL(setInstanceTransformationMatrixLayout_,
-    "setInstanceTransformationMatrixLayout:");
-_MTL_PRIVATE_DEF_SEL(setInstancedAccelerationStructures_,
-    "setInstancedAccelerationStructures:");
-_MTL_PRIVATE_DEF_SEL(setIntersectionFunctionTable_atBufferIndex_,
-    "setIntersectionFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setIntersectionFunctionTable_atIndex_,
-    "setIntersectionFunctionTable:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setIntersectionFunctionTableOffset_,
-    "setIntersectionFunctionTableOffset:");
-_MTL_PRIVATE_DEF_SEL(setIntersectionFunctionTables_withBufferRange_,
-    "setIntersectionFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setIntersectionFunctionTables_withRange_,
-    "setIntersectionFunctionTables:withRange:");
-_MTL_PRIVATE_DEF_SEL(setKernelBuffer_offset_atIndex_,
-    "setKernelBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setKernelBuffer_offset_attributeStride_atIndex_,
-    "setKernelBuffer:offset:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setLabel_,
-    "setLabel:");
-_MTL_PRIVATE_DEF_SEL(setLanguageVersion_,
-    "setLanguageVersion:");
-_MTL_PRIVATE_DEF_SEL(setLayer_atIndex_,
-    "setLayer:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setLevel_,
-    "setLevel:");
-_MTL_PRIVATE_DEF_SEL(setLevelRange_,
-    "setLevelRange:");
-_MTL_PRIVATE_DEF_SEL(setLibraries_,
-    "setLibraries:");
-_MTL_PRIVATE_DEF_SEL(setLibrary_,
-    "setLibrary:");
-_MTL_PRIVATE_DEF_SEL(setLibraryType_,
-    "setLibraryType:");
-_MTL_PRIVATE_DEF_SEL(setLinkedFunctions_,
-    "setLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setLoadAction_,
-    "setLoadAction:");
-_MTL_PRIVATE_DEF_SEL(setLodAverage_,
-    "setLodAverage:");
-_MTL_PRIVATE_DEF_SEL(setLodBias_,
-    "setLodBias:");
-_MTL_PRIVATE_DEF_SEL(setLodMaxClamp_,
-    "setLodMaxClamp:");
-_MTL_PRIVATE_DEF_SEL(setLodMinClamp_,
-    "setLodMinClamp:");
-_MTL_PRIVATE_DEF_SEL(setLogState_,
-    "setLogState:");
-_MTL_PRIVATE_DEF_SEL(setLookupArchives_,
-    "setLookupArchives:");
-_MTL_PRIVATE_DEF_SEL(setMachineLearningFunctionDescriptor_,
-    "setMachineLearningFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setMagFilter_,
-    "setMagFilter:");
-_MTL_PRIVATE_DEF_SEL(setMathFloatingPointFunctions_,
-    "setMathFloatingPointFunctions:");
-_MTL_PRIVATE_DEF_SEL(setMathMode_,
-    "setMathMode:");
-_MTL_PRIVATE_DEF_SEL(setMaxAnisotropy_,
-    "setMaxAnisotropy:");
-_MTL_PRIVATE_DEF_SEL(setMaxBufferBindCount_,
-    "setMaxBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxCallStackDepth_,
-    "setMaxCallStackDepth:");
-_MTL_PRIVATE_DEF_SEL(setMaxCommandBufferCount_,
-    "setMaxCommandBufferCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxCommandsInFlight_,
-    "setMaxCommandsInFlight:");
-_MTL_PRIVATE_DEF_SEL(setMaxCompatiblePlacementSparsePageSize_,
-    "setMaxCompatiblePlacementSparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(setMaxFragmentBufferBindCount_,
-    "setMaxFragmentBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxFragmentCallStackDepth_,
-    "setMaxFragmentCallStackDepth:");
-_MTL_PRIVATE_DEF_SEL(setMaxInstanceCount_,
-    "setMaxInstanceCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxKernelBufferBindCount_,
-    "setMaxKernelBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxKernelThreadgroupMemoryBindCount_,
-    "setMaxKernelThreadgroupMemoryBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxMeshBufferBindCount_,
-    "setMaxMeshBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxMotionTransformCount_,
-    "setMaxMotionTransformCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxObjectBufferBindCount_,
-    "setMaxObjectBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxObjectThreadgroupMemoryBindCount_,
-    "setMaxObjectThreadgroupMemoryBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxSamplerStateBindCount_,
-    "setMaxSamplerStateBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxTessellationFactor_,
-    "setMaxTessellationFactor:");
-_MTL_PRIVATE_DEF_SEL(setMaxTextureBindCount_,
-    "setMaxTextureBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxTotalThreadgroupsPerMeshGrid_,
-    "setMaxTotalThreadgroupsPerMeshGrid:");
-_MTL_PRIVATE_DEF_SEL(setMaxTotalThreadsPerMeshThreadgroup_,
-    "setMaxTotalThreadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setMaxTotalThreadsPerObjectThreadgroup_,
-    "setMaxTotalThreadsPerObjectThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setMaxTotalThreadsPerThreadgroup_,
-    "setMaxTotalThreadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setMaxVertexAmplificationCount_,
-    "setMaxVertexAmplificationCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxVertexBufferBindCount_,
-    "setMaxVertexBufferBindCount:");
-_MTL_PRIVATE_DEF_SEL(setMaxVertexCallStackDepth_,
-    "setMaxVertexCallStackDepth:");
-_MTL_PRIVATE_DEF_SEL(setMeshAdditionalBinaryFunctions_,
-    "setMeshAdditionalBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setMeshBuffer_offset_atIndex_,
-    "setMeshBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshBufferOffset_atIndex_,
-    "setMeshBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshBuffers_offsets_withRange_,
-    "setMeshBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setMeshBytes_length_atIndex_,
-    "setMeshBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshFunction_,
-    "setMeshFunction:");
-_MTL_PRIVATE_DEF_SEL(setMeshFunctionDescriptor_,
-    "setMeshFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setMeshLinkedFunctions_,
-    "setMeshLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setMeshSamplerState_atIndex_,
-    "setMeshSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setMeshSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setMeshSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setMeshSamplerStates_withRange_,
-    "setMeshSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setMeshStaticLinkingDescriptor_,
-    "setMeshStaticLinkingDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setMeshTexture_atIndex_,
-    "setMeshTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setMeshTextures_withRange_,
-    "setMeshTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth_,
-    "setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth:");
-_MTL_PRIVATE_DEF_SEL(setMinFilter_,
-    "setMinFilter:");
-_MTL_PRIVATE_DEF_SEL(setMipFilter_,
-    "setMipFilter:");
-_MTL_PRIVATE_DEF_SEL(setMipmapLevelCount_,
-    "setMipmapLevelCount:");
-_MTL_PRIVATE_DEF_SEL(setMotionEndBorderMode_,
-    "setMotionEndBorderMode:");
-_MTL_PRIVATE_DEF_SEL(setMotionEndTime_,
-    "setMotionEndTime:");
-_MTL_PRIVATE_DEF_SEL(setMotionKeyframeCount_,
-    "setMotionKeyframeCount:");
-_MTL_PRIVATE_DEF_SEL(setMotionStartBorderMode_,
-    "setMotionStartBorderMode:");
-_MTL_PRIVATE_DEF_SEL(setMotionStartTime_,
-    "setMotionStartTime:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformBuffer_,
-    "setMotionTransformBuffer:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformBufferOffset_,
-    "setMotionTransformBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformCount_,
-    "setMotionTransformCount:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformCountBuffer_,
-    "setMotionTransformCountBuffer:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformCountBufferOffset_,
-    "setMotionTransformCountBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformStride_,
-    "setMotionTransformStride:");
-_MTL_PRIVATE_DEF_SEL(setMotionTransformType_,
-    "setMotionTransformType:");
-_MTL_PRIVATE_DEF_SEL(setMutability_,
-    "setMutability:");
-_MTL_PRIVATE_DEF_SEL(setName_,
-    "setName:");
-_MTL_PRIVATE_DEF_SEL(setNodes_,
-    "setNodes:");
-_MTL_PRIVATE_DEF_SEL(setNormalizedCoordinates_,
-    "setNormalizedCoordinates:");
-_MTL_PRIVATE_DEF_SEL(setObject_atIndexedSubscript_,
-    "setObject:atIndexedSubscript:");
-_MTL_PRIVATE_DEF_SEL(setObjectAdditionalBinaryFunctions_,
-    "setObjectAdditionalBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setObjectBuffer_offset_atIndex_,
-    "setObjectBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectBufferOffset_atIndex_,
-    "setObjectBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectBuffers_offsets_withRange_,
-    "setObjectBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setObjectBytes_length_atIndex_,
-    "setObjectBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectFunction_,
-    "setObjectFunction:");
-_MTL_PRIVATE_DEF_SEL(setObjectFunctionDescriptor_,
-    "setObjectFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setObjectLinkedFunctions_,
-    "setObjectLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setObjectSamplerState_atIndex_,
-    "setObjectSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setObjectSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setObjectSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setObjectSamplerStates_withRange_,
-    "setObjectSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setObjectStaticLinkingDescriptor_,
-    "setObjectStaticLinkingDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setObjectTexture_atIndex_,
-    "setObjectTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectTextures_withRange_,
-    "setObjectTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setObjectThreadgroupMemoryLength_atIndex_,
-    "setObjectThreadgroupMemoryLength:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth_,
-    "setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth:");
-_MTL_PRIVATE_DEF_SEL(setOffset_,
-    "setOffset:");
-_MTL_PRIVATE_DEF_SEL(setOpaque_,
-    "setOpaque:");
-_MTL_PRIVATE_DEF_SEL(setOpaqueCurveIntersectionFunctionWithSignature_atIndex_,
-    "setOpaqueCurveIntersectionFunctionWithSignature:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setOpaqueCurveIntersectionFunctionWithSignature_withRange_,
-    "setOpaqueCurveIntersectionFunctionWithSignature:withRange:");
-_MTL_PRIVATE_DEF_SEL(setOpaqueTriangleIntersectionFunctionWithSignature_atIndex_,
-    "setOpaqueTriangleIntersectionFunctionWithSignature:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setOpaqueTriangleIntersectionFunctionWithSignature_withRange_,
-    "setOpaqueTriangleIntersectionFunctionWithSignature:withRange:");
-_MTL_PRIVATE_DEF_SEL(setOptimizationLevel_,
-    "setOptimizationLevel:");
-_MTL_PRIVATE_DEF_SEL(setOptions_,
-    "setOptions:");
-_MTL_PRIVATE_DEF_SEL(setOutputNode_,
-    "setOutputNode:");
-_MTL_PRIVATE_DEF_SEL(setOutputURL_,
-    "setOutputURL:");
-_MTL_PRIVATE_DEF_SEL(setOwnerWithIdentity_,
-    "setOwnerWithIdentity:");
-_MTL_PRIVATE_DEF_SEL(setPayloadMemoryLength_,
-    "setPayloadMemoryLength:");
-_MTL_PRIVATE_DEF_SEL(setPhysicalIndex_forLogicalIndex_,
-    "setPhysicalIndex:forLogicalIndex:");
-_MTL_PRIVATE_DEF_SEL(setPipelineDataSetSerializer_,
-    "setPipelineDataSetSerializer:");
-_MTL_PRIVATE_DEF_SEL(setPipelineState_,
-    "setPipelineState:");
-_MTL_PRIVATE_DEF_SEL(setPixelFormat_,
-    "setPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(setPlacementSparsePageSize_,
-    "setPlacementSparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(setPreloadedLibraries_,
-    "setPreloadedLibraries:");
-_MTL_PRIVATE_DEF_SEL(setPreprocessorMacros_,
-    "setPreprocessorMacros:");
-_MTL_PRIVATE_DEF_SEL(setPreserveInvariance_,
-    "setPreserveInvariance:");
-_MTL_PRIVATE_DEF_SEL(setPrimitiveDataBuffer_,
-    "setPrimitiveDataBuffer:");
-_MTL_PRIVATE_DEF_SEL(setPrimitiveDataBufferOffset_,
-    "setPrimitiveDataBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setPrimitiveDataElementSize_,
-    "setPrimitiveDataElementSize:");
-_MTL_PRIVATE_DEF_SEL(setPrimitiveDataStride_,
-    "setPrimitiveDataStride:");
-_MTL_PRIVATE_DEF_SEL(setPriority_,
-    "setPriority:");
-_MTL_PRIVATE_DEF_SEL(setPrivateFunctionDescriptors_,
-    "setPrivateFunctionDescriptors:");
-_MTL_PRIVATE_DEF_SEL(setPrivateFunctions_,
-    "setPrivateFunctions:");
-_MTL_PRIVATE_DEF_SEL(setPurgeableState_,
-    "setPurgeableState:");
-_MTL_PRIVATE_DEF_SEL(setRAddressMode_,
-    "setRAddressMode:");
-_MTL_PRIVATE_DEF_SEL(setRadiusBuffer_,
-    "setRadiusBuffer:");
-_MTL_PRIVATE_DEF_SEL(setRadiusBufferOffset_,
-    "setRadiusBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setRadiusBuffers_,
-    "setRadiusBuffers:");
-_MTL_PRIVATE_DEF_SEL(setRadiusFormat_,
-    "setRadiusFormat:");
-_MTL_PRIVATE_DEF_SEL(setRadiusStride_,
-    "setRadiusStride:");
-_MTL_PRIVATE_DEF_SEL(setRasterSampleCount_,
-    "setRasterSampleCount:");
-_MTL_PRIVATE_DEF_SEL(setRasterizationEnabled_,
-    "setRasterizationEnabled:");
-_MTL_PRIVATE_DEF_SEL(setRasterizationRateMap_,
-    "setRasterizationRateMap:");
-_MTL_PRIVATE_DEF_SEL(setReadMask_,
-    "setReadMask:");
-_MTL_PRIVATE_DEF_SEL(setReductionMode_,
-    "setReductionMode:");
-_MTL_PRIVATE_DEF_SEL(setRenderPipelineState_,
-    "setRenderPipelineState:");
-_MTL_PRIVATE_DEF_SEL(setRenderPipelineState_atIndex_,
-    "setRenderPipelineState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setRenderPipelineStates_withRange_,
-    "setRenderPipelineStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setRenderTargetArrayLength_,
-    "setRenderTargetArrayLength:");
-_MTL_PRIVATE_DEF_SEL(setRenderTargetHeight_,
-    "setRenderTargetHeight:");
-_MTL_PRIVATE_DEF_SEL(setRenderTargetWidth_,
-    "setRenderTargetWidth:");
-_MTL_PRIVATE_DEF_SEL(setRequiredThreadsPerMeshThreadgroup_,
-    "setRequiredThreadsPerMeshThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setRequiredThreadsPerObjectThreadgroup_,
-    "setRequiredThreadsPerObjectThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setRequiredThreadsPerThreadgroup_,
-    "setRequiredThreadsPerThreadgroup:");
-_MTL_PRIVATE_DEF_SEL(setResolveDepthPlane_,
-    "setResolveDepthPlane:");
-_MTL_PRIVATE_DEF_SEL(setResolveLevel_,
-    "setResolveLevel:");
-_MTL_PRIVATE_DEF_SEL(setResolveSlice_,
-    "setResolveSlice:");
-_MTL_PRIVATE_DEF_SEL(setResolveTexture_,
-    "setResolveTexture:");
-_MTL_PRIVATE_DEF_SEL(setResource_atBufferIndex_,
-    "setResource:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setResourceOptions_,
-    "setResourceOptions:");
-_MTL_PRIVATE_DEF_SEL(setResourceViewCount_,
-    "setResourceViewCount:");
-_MTL_PRIVATE_DEF_SEL(setRetainedReferences_,
-    "setRetainedReferences:");
-_MTL_PRIVATE_DEF_SEL(setRgbBlendOperation_,
-    "setRgbBlendOperation:");
-_MTL_PRIVATE_DEF_SEL(setSAddressMode_,
-    "setSAddressMode:");
-_MTL_PRIVATE_DEF_SEL(setSampleBuffer_,
-    "setSampleBuffer:");
-_MTL_PRIVATE_DEF_SEL(setSampleCount_,
-    "setSampleCount:");
-_MTL_PRIVATE_DEF_SEL(setSamplePositions_count_,
-    "setSamplePositions:count:");
-_MTL_PRIVATE_DEF_SEL(setSamplerState_atIndex_,
-    "setSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setSamplerStates_withRange_,
-    "setSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setScissorRect_,
-    "setScissorRect:");
-_MTL_PRIVATE_DEF_SEL(setScissorRects_count_,
-    "setScissorRects:count:");
-_MTL_PRIVATE_DEF_SEL(setScratchBufferAllocator_,
-    "setScratchBufferAllocator:");
-_MTL_PRIVATE_DEF_SEL(setScreenSize_,
-    "setScreenSize:");
-_MTL_PRIVATE_DEF_SEL(setSegmentControlPointCount_,
-    "setSegmentControlPointCount:");
-_MTL_PRIVATE_DEF_SEL(setSegmentCount_,
-    "setSegmentCount:");
-_MTL_PRIVATE_DEF_SEL(setShaderReflection_,
-    "setShaderReflection:");
-_MTL_PRIVATE_DEF_SEL(setShaderValidation_,
-    "setShaderValidation:");
-_MTL_PRIVATE_DEF_SEL(setShouldMaximizeConcurrentCompilation_,
-    "setShouldMaximizeConcurrentCompilation:");
-_MTL_PRIVATE_DEF_SEL(setSignaledValue_,
-    "setSignaledValue:");
-_MTL_PRIVATE_DEF_SEL(setSize_,
-    "setSize:");
-_MTL_PRIVATE_DEF_SEL(setSlice_,
-    "setSlice:");
-_MTL_PRIVATE_DEF_SEL(setSliceRange_,
-    "setSliceRange:");
-_MTL_PRIVATE_DEF_SEL(setSource_,
-    "setSource:");
-_MTL_PRIVATE_DEF_SEL(setSourceAlphaBlendFactor_,
-    "setSourceAlphaBlendFactor:");
-_MTL_PRIVATE_DEF_SEL(setSourceRGBBlendFactor_,
-    "setSourceRGBBlendFactor:");
-_MTL_PRIVATE_DEF_SEL(setSparsePageSize_,
-    "setSparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(setSpecializedName_,
-    "setSpecializedName:");
-_MTL_PRIVATE_DEF_SEL(setStageInRegion_,
-    "setStageInRegion:");
-_MTL_PRIVATE_DEF_SEL(setStageInRegionWithIndirectBuffer_indirectBufferOffset_,
-    "setStageInRegionWithIndirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setStageInputDescriptor_,
-    "setStageInputDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setStartOfEncoderSampleIndex_,
-    "setStartOfEncoderSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setStartOfFragmentSampleIndex_,
-    "setStartOfFragmentSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setStartOfVertexSampleIndex_,
-    "setStartOfVertexSampleIndex:");
-_MTL_PRIVATE_DEF_SEL(setStaticLinkingDescriptor_,
-    "setStaticLinkingDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setStencilAttachment_,
-    "setStencilAttachment:");
-_MTL_PRIVATE_DEF_SEL(setStencilAttachmentPixelFormat_,
-    "setStencilAttachmentPixelFormat:");
-_MTL_PRIVATE_DEF_SEL(setStencilCompareFunction_,
-    "setStencilCompareFunction:");
-_MTL_PRIVATE_DEF_SEL(setStencilFailureOperation_,
-    "setStencilFailureOperation:");
-_MTL_PRIVATE_DEF_SEL(setStencilFrontReferenceValue_backReferenceValue_,
-    "setStencilFrontReferenceValue:backReferenceValue:");
-_MTL_PRIVATE_DEF_SEL(setStencilReferenceValue_,
-    "setStencilReferenceValue:");
-_MTL_PRIVATE_DEF_SEL(setStencilResolveFilter_,
-    "setStencilResolveFilter:");
-_MTL_PRIVATE_DEF_SEL(setStencilStoreAction_,
-    "setStencilStoreAction:");
-_MTL_PRIVATE_DEF_SEL(setStencilStoreActionOptions_,
-    "setStencilStoreActionOptions:");
-_MTL_PRIVATE_DEF_SEL(setStepFunction_,
-    "setStepFunction:");
-_MTL_PRIVATE_DEF_SEL(setStepRate_,
-    "setStepRate:");
-_MTL_PRIVATE_DEF_SEL(setStorageMode_,
-    "setStorageMode:");
-_MTL_PRIVATE_DEF_SEL(setStoreAction_,
-    "setStoreAction:");
-_MTL_PRIVATE_DEF_SEL(setStoreActionOptions_,
-    "setStoreActionOptions:");
-_MTL_PRIVATE_DEF_SEL(setStride_,
-    "setStride:");
-_MTL_PRIVATE_DEF_SEL(setStrides_,
-    "setStrides:");
-_MTL_PRIVATE_DEF_SEL(setSupportAddingBinaryFunctions_,
-    "setSupportAddingBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setSupportAddingFragmentBinaryFunctions_,
-    "setSupportAddingFragmentBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setSupportAddingVertexBinaryFunctions_,
-    "setSupportAddingVertexBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setSupportArgumentBuffers_,
-    "setSupportArgumentBuffers:");
-_MTL_PRIVATE_DEF_SEL(setSupportAttributeStrides_,
-    "setSupportAttributeStrides:");
-_MTL_PRIVATE_DEF_SEL(setSupportBinaryLinking_,
-    "setSupportBinaryLinking:");
-_MTL_PRIVATE_DEF_SEL(setSupportColorAttachmentMapping_,
-    "setSupportColorAttachmentMapping:");
-_MTL_PRIVATE_DEF_SEL(setSupportDynamicAttributeStride_,
-    "setSupportDynamicAttributeStride:");
-_MTL_PRIVATE_DEF_SEL(setSupportFragmentBinaryLinking_,
-    "setSupportFragmentBinaryLinking:");
-_MTL_PRIVATE_DEF_SEL(setSupportIndirectCommandBuffers_,
-    "setSupportIndirectCommandBuffers:");
-_MTL_PRIVATE_DEF_SEL(setSupportMeshBinaryLinking_,
-    "setSupportMeshBinaryLinking:");
-_MTL_PRIVATE_DEF_SEL(setSupportObjectBinaryLinking_,
-    "setSupportObjectBinaryLinking:");
-_MTL_PRIVATE_DEF_SEL(setSupportRayTracing_,
-    "setSupportRayTracing:");
-_MTL_PRIVATE_DEF_SEL(setSupportVertexBinaryLinking_,
-    "setSupportVertexBinaryLinking:");
-_MTL_PRIVATE_DEF_SEL(setSwizzle_,
-    "setSwizzle:");
-_MTL_PRIVATE_DEF_SEL(setTAddressMode_,
-    "setTAddressMode:");
-_MTL_PRIVATE_DEF_SEL(setTessellationControlPointIndexType_,
-    "setTessellationControlPointIndexType:");
-_MTL_PRIVATE_DEF_SEL(setTessellationFactorBuffer_offset_instanceStride_,
-    "setTessellationFactorBuffer:offset:instanceStride:");
-_MTL_PRIVATE_DEF_SEL(setTessellationFactorFormat_,
-    "setTessellationFactorFormat:");
-_MTL_PRIVATE_DEF_SEL(setTessellationFactorScale_,
-    "setTessellationFactorScale:");
-_MTL_PRIVATE_DEF_SEL(setTessellationFactorScaleEnabled_,
-    "setTessellationFactorScaleEnabled:");
-_MTL_PRIVATE_DEF_SEL(setTessellationFactorStepFunction_,
-    "setTessellationFactorStepFunction:");
-_MTL_PRIVATE_DEF_SEL(setTessellationOutputWindingOrder_,
-    "setTessellationOutputWindingOrder:");
-_MTL_PRIVATE_DEF_SEL(setTessellationPartitionMode_,
-    "setTessellationPartitionMode:");
-_MTL_PRIVATE_DEF_SEL(setTexture_,
-    "setTexture:");
-_MTL_PRIVATE_DEF_SEL(setTexture_atIndex_,
-    "setTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTextureType_,
-    "setTextureType:");
-_MTL_PRIVATE_DEF_SEL(setTextureView_atIndex_,
-    "setTextureView:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTextureView_descriptor_atIndex_,
-    "setTextureView:descriptor:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTextureViewFromBuffer_descriptor_offset_bytesPerRow_atIndex_,
-    "setTextureViewFromBuffer:descriptor:offset:bytesPerRow:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTextures_withRange_,
-    "setTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setThreadGroupSizeIsMultipleOfThreadExecutionWidth_,
-    "setThreadGroupSizeIsMultipleOfThreadExecutionWidth:");
-_MTL_PRIVATE_DEF_SEL(setThreadgroupMemoryLength_,
-    "setThreadgroupMemoryLength:");
-_MTL_PRIVATE_DEF_SEL(setThreadgroupMemoryLength_atIndex_,
-    "setThreadgroupMemoryLength:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setThreadgroupMemoryLength_offset_atIndex_,
-    "setThreadgroupMemoryLength:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setThreadgroupSizeMatchesTileSize_,
-    "setThreadgroupSizeMatchesTileSize:");
-_MTL_PRIVATE_DEF_SEL(setTileAccelerationStructure_atBufferIndex_,
-    "setTileAccelerationStructure:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileAdditionalBinaryFunctions_,
-    "setTileAdditionalBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setTileBuffer_offset_atIndex_,
-    "setTileBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileBufferOffset_atIndex_,
-    "setTileBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileBuffers_offsets_withRange_,
-    "setTileBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setTileBytes_length_atIndex_,
-    "setTileBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileFunction_,
-    "setTileFunction:");
-_MTL_PRIVATE_DEF_SEL(setTileFunctionDescriptor_,
-    "setTileFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setTileHeight_,
-    "setTileHeight:");
-_MTL_PRIVATE_DEF_SEL(setTileIntersectionFunctionTable_atBufferIndex_,
-    "setTileIntersectionFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileIntersectionFunctionTables_withBufferRange_,
-    "setTileIntersectionFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setTileSamplerState_atIndex_,
-    "setTileSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setTileSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setTileSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setTileSamplerStates_withRange_,
-    "setTileSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setTileTexture_atIndex_,
-    "setTileTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileTextures_withRange_,
-    "setTileTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setTileVisibleFunctionTable_atBufferIndex_,
-    "setTileVisibleFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setTileVisibleFunctionTables_withBufferRange_,
-    "setTileVisibleFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setTileWidth_,
-    "setTileWidth:");
-_MTL_PRIVATE_DEF_SEL(setTransformationMatrixBuffer_,
-    "setTransformationMatrixBuffer:");
-_MTL_PRIVATE_DEF_SEL(setTransformationMatrixBufferOffset_,
-    "setTransformationMatrixBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setTransformationMatrixLayout_,
-    "setTransformationMatrixLayout:");
-_MTL_PRIVATE_DEF_SEL(setTriangleCount_,
-    "setTriangleCount:");
-_MTL_PRIVATE_DEF_SEL(setTriangleFillMode_,
-    "setTriangleFillMode:");
-_MTL_PRIVATE_DEF_SEL(setType_,
-    "setType:");
-_MTL_PRIVATE_DEF_SEL(setUrl_,
-    "setUrl:");
-_MTL_PRIVATE_DEF_SEL(setUsage_,
-    "setUsage:");
-_MTL_PRIVATE_DEF_SEL(setVertexAccelerationStructure_atBufferIndex_,
-    "setVertexAccelerationStructure:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexAdditionalBinaryFunctions_,
-    "setVertexAdditionalBinaryFunctions:");
-_MTL_PRIVATE_DEF_SEL(setVertexAmplificationCount_viewMappings_,
-    "setVertexAmplificationCount:viewMappings:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffer_,
-    "setVertexBuffer:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffer_offset_atIndex_,
-    "setVertexBuffer:offset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffer_offset_attributeStride_atIndex_,
-    "setVertexBuffer:offset:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexBufferOffset_,
-    "setVertexBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(setVertexBufferOffset_atIndex_,
-    "setVertexBufferOffset:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexBufferOffset_attributeStride_atIndex_,
-    "setVertexBufferOffset:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffers_,
-    "setVertexBuffers:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffers_offsets_attributeStrides_withRange_,
-    "setVertexBuffers:offsets:attributeStrides:withRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexBuffers_offsets_withRange_,
-    "setVertexBuffers:offsets:withRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexBytes_length_atIndex_,
-    "setVertexBytes:length:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexBytes_length_attributeStride_atIndex_,
-    "setVertexBytes:length:attributeStride:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexDescriptor_,
-    "setVertexDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setVertexFormat_,
-    "setVertexFormat:");
-_MTL_PRIVATE_DEF_SEL(setVertexFunction_,
-    "setVertexFunction:");
-_MTL_PRIVATE_DEF_SEL(setVertexFunctionDescriptor_,
-    "setVertexFunctionDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setVertexIntersectionFunctionTable_atBufferIndex_,
-    "setVertexIntersectionFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexIntersectionFunctionTables_withBufferRange_,
-    "setVertexIntersectionFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexLinkedFunctions_,
-    "setVertexLinkedFunctions:");
-_MTL_PRIVATE_DEF_SEL(setVertexPreloadedLibraries_,
-    "setVertexPreloadedLibraries:");
-_MTL_PRIVATE_DEF_SEL(setVertexSamplerState_atIndex_,
-    "setVertexSamplerState:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexSamplerState_lodMinClamp_lodMaxClamp_atIndex_,
-    "setVertexSamplerState:lodMinClamp:lodMaxClamp:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexSamplerStates_lodMinClamps_lodMaxClamps_withRange_,
-    "setVertexSamplerStates:lodMinClamps:lodMaxClamps:withRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexSamplerStates_withRange_,
-    "setVertexSamplerStates:withRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexStaticLinkingDescriptor_,
-    "setVertexStaticLinkingDescriptor:");
-_MTL_PRIVATE_DEF_SEL(setVertexStride_,
-    "setVertexStride:");
-_MTL_PRIVATE_DEF_SEL(setVertexTexture_atIndex_,
-    "setVertexTexture:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexTextures_withRange_,
-    "setVertexTextures:withRange:");
-_MTL_PRIVATE_DEF_SEL(setVertexVisibleFunctionTable_atBufferIndex_,
-    "setVertexVisibleFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setVertexVisibleFunctionTables_withBufferRange_,
-    "setVertexVisibleFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setViewport_,
-    "setViewport:");
-_MTL_PRIVATE_DEF_SEL(setViewports_count_,
-    "setViewports:count:");
-_MTL_PRIVATE_DEF_SEL(setVisibilityResultBuffer_,
-    "setVisibilityResultBuffer:");
-_MTL_PRIVATE_DEF_SEL(setVisibilityResultMode_offset_,
-    "setVisibilityResultMode:offset:");
-_MTL_PRIVATE_DEF_SEL(setVisibilityResultType_,
-    "setVisibilityResultType:");
-_MTL_PRIVATE_DEF_SEL(setVisibleFunctionTable_atBufferIndex_,
-    "setVisibleFunctionTable:atBufferIndex:");
-_MTL_PRIVATE_DEF_SEL(setVisibleFunctionTable_atIndex_,
-    "setVisibleFunctionTable:atIndex:");
-_MTL_PRIVATE_DEF_SEL(setVisibleFunctionTables_withBufferRange_,
-    "setVisibleFunctionTables:withBufferRange:");
-_MTL_PRIVATE_DEF_SEL(setVisibleFunctionTables_withRange_,
-    "setVisibleFunctionTables:withRange:");
-_MTL_PRIVATE_DEF_SEL(setWidth_,
-    "setWidth:");
-_MTL_PRIVATE_DEF_SEL(setWriteMask_,
-    "setWriteMask:");
-_MTL_PRIVATE_DEF_SEL(shaderReflection,
-    "shaderReflection");
-_MTL_PRIVATE_DEF_SEL(shaderValidation,
-    "shaderValidation");
-_MTL_PRIVATE_DEF_SEL(sharedCaptureManager,
-    "sharedCaptureManager");
-_MTL_PRIVATE_DEF_SEL(sharedListener,
-    "sharedListener");
-_MTL_PRIVATE_DEF_SEL(shouldMaximizeConcurrentCompilation,
-    "shouldMaximizeConcurrentCompilation");
-_MTL_PRIVATE_DEF_SEL(signalDrawable_,
-    "signalDrawable:");
-_MTL_PRIVATE_DEF_SEL(signalEvent_value_,
-    "signalEvent:value:");
-_MTL_PRIVATE_DEF_SEL(signaledValue,
-    "signaledValue");
-_MTL_PRIVATE_DEF_SEL(size,
-    "size");
-_MTL_PRIVATE_DEF_SEL(sizeOfCounterHeapEntry_,
-    "sizeOfCounterHeapEntry:");
-_MTL_PRIVATE_DEF_SEL(slice,
-    "slice");
-_MTL_PRIVATE_DEF_SEL(sliceRange,
-    "sliceRange");
-_MTL_PRIVATE_DEF_SEL(source,
-    "source");
-_MTL_PRIVATE_DEF_SEL(sourceAlphaBlendFactor,
-    "sourceAlphaBlendFactor");
-_MTL_PRIVATE_DEF_SEL(sourceRGBBlendFactor,
-    "sourceRGBBlendFactor");
-_MTL_PRIVATE_DEF_SEL(sparseBufferTier,
-    "sparseBufferTier");
-_MTL_PRIVATE_DEF_SEL(sparsePageSize,
-    "sparsePageSize");
-_MTL_PRIVATE_DEF_SEL(sparseTextureTier,
-    "sparseTextureTier");
-_MTL_PRIVATE_DEF_SEL(sparseTileSizeInBytes,
-    "sparseTileSizeInBytes");
-_MTL_PRIVATE_DEF_SEL(sparseTileSizeInBytesForSparsePageSize_,
-    "sparseTileSizeInBytesForSparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(sparseTileSizeWithTextureType_pixelFormat_sampleCount_,
-    "sparseTileSizeWithTextureType:pixelFormat:sampleCount:");
-_MTL_PRIVATE_DEF_SEL(sparseTileSizeWithTextureType_pixelFormat_sampleCount_sparsePageSize_,
-    "sparseTileSizeWithTextureType:pixelFormat:sampleCount:sparsePageSize:");
-_MTL_PRIVATE_DEF_SEL(specializedName,
-    "specializedName");
-_MTL_PRIVATE_DEF_SEL(stageInputAttributes,
-    "stageInputAttributes");
-_MTL_PRIVATE_DEF_SEL(stageInputDescriptor,
-    "stageInputDescriptor");
-_MTL_PRIVATE_DEF_SEL(stageInputOutputDescriptor,
-    "stageInputOutputDescriptor");
-_MTL_PRIVATE_DEF_SEL(stages,
-    "stages");
-_MTL_PRIVATE_DEF_SEL(startCaptureWithCommandQueue_,
-    "startCaptureWithCommandQueue:");
-_MTL_PRIVATE_DEF_SEL(startCaptureWithDescriptor_error_,
-    "startCaptureWithDescriptor:error:");
-_MTL_PRIVATE_DEF_SEL(startCaptureWithDevice_,
-    "startCaptureWithDevice:");
-_MTL_PRIVATE_DEF_SEL(startCaptureWithScope_,
-    "startCaptureWithScope:");
-_MTL_PRIVATE_DEF_SEL(startOfEncoderSampleIndex,
-    "startOfEncoderSampleIndex");
-_MTL_PRIVATE_DEF_SEL(startOfFragmentSampleIndex,
-    "startOfFragmentSampleIndex");
-_MTL_PRIVATE_DEF_SEL(startOfVertexSampleIndex,
-    "startOfVertexSampleIndex");
-_MTL_PRIVATE_DEF_SEL(staticLinkingDescriptor,
-    "staticLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(staticThreadgroupMemoryLength,
-    "staticThreadgroupMemoryLength");
-_MTL_PRIVATE_DEF_SEL(status,
-    "status");
-_MTL_PRIVATE_DEF_SEL(stencilAttachment,
-    "stencilAttachment");
-_MTL_PRIVATE_DEF_SEL(stencilAttachmentPixelFormat,
-    "stencilAttachmentPixelFormat");
-_MTL_PRIVATE_DEF_SEL(stencilCompareFunction,
-    "stencilCompareFunction");
-_MTL_PRIVATE_DEF_SEL(stencilFailureOperation,
-    "stencilFailureOperation");
-_MTL_PRIVATE_DEF_SEL(stencilResolveFilter,
-    "stencilResolveFilter");
-_MTL_PRIVATE_DEF_SEL(stepFunction,
-    "stepFunction");
-_MTL_PRIVATE_DEF_SEL(stepRate,
-    "stepRate");
-_MTL_PRIVATE_DEF_SEL(stopCapture,
-    "stopCapture");
-_MTL_PRIVATE_DEF_SEL(storageMode,
-    "storageMode");
-_MTL_PRIVATE_DEF_SEL(storeAction,
-    "storeAction");
-_MTL_PRIVATE_DEF_SEL(storeActionOptions,
-    "storeActionOptions");
-_MTL_PRIVATE_DEF_SEL(stride,
-    "stride");
-_MTL_PRIVATE_DEF_SEL(strides,
-    "strides");
-_MTL_PRIVATE_DEF_SEL(structType,
-    "structType");
-_MTL_PRIVATE_DEF_SEL(supportAddingBinaryFunctions,
-    "supportAddingBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(supportAddingFragmentBinaryFunctions,
-    "supportAddingFragmentBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(supportAddingVertexBinaryFunctions,
-    "supportAddingVertexBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(supportArgumentBuffers,
-    "supportArgumentBuffers");
-_MTL_PRIVATE_DEF_SEL(supportAttributeStrides,
-    "supportAttributeStrides");
-_MTL_PRIVATE_DEF_SEL(supportBinaryLinking,
-    "supportBinaryLinking");
-_MTL_PRIVATE_DEF_SEL(supportColorAttachmentMapping,
-    "supportColorAttachmentMapping");
-_MTL_PRIVATE_DEF_SEL(supportDynamicAttributeStride,
-    "supportDynamicAttributeStride");
-_MTL_PRIVATE_DEF_SEL(supportFragmentBinaryLinking,
-    "supportFragmentBinaryLinking");
-_MTL_PRIVATE_DEF_SEL(supportIndirectCommandBuffers,
-    "supportIndirectCommandBuffers");
-_MTL_PRIVATE_DEF_SEL(supportMeshBinaryLinking,
-    "supportMeshBinaryLinking");
-_MTL_PRIVATE_DEF_SEL(supportObjectBinaryLinking,
-    "supportObjectBinaryLinking");
-_MTL_PRIVATE_DEF_SEL(supportRayTracing,
-    "supportRayTracing");
-_MTL_PRIVATE_DEF_SEL(supportVertexBinaryLinking,
-    "supportVertexBinaryLinking");
-_MTL_PRIVATE_DEF_SEL(supports32BitFloatFiltering,
-    "supports32BitFloatFiltering");
-_MTL_PRIVATE_DEF_SEL(supports32BitMSAA,
-    "supports32BitMSAA");
-_MTL_PRIVATE_DEF_SEL(supportsBCTextureCompression,
-    "supportsBCTextureCompression");
-_MTL_PRIVATE_DEF_SEL(supportsCounterSampling_,
-    "supportsCounterSampling:");
-_MTL_PRIVATE_DEF_SEL(supportsDestination_,
-    "supportsDestination:");
-_MTL_PRIVATE_DEF_SEL(supportsDynamicLibraries,
-    "supportsDynamicLibraries");
-_MTL_PRIVATE_DEF_SEL(supportsFamily_,
-    "supportsFamily:");
-_MTL_PRIVATE_DEF_SEL(supportsFeatureSet_,
-    "supportsFeatureSet:");
-_MTL_PRIVATE_DEF_SEL(supportsFunctionPointers,
-    "supportsFunctionPointers");
-_MTL_PRIVATE_DEF_SEL(supportsFunctionPointersFromRender,
-    "supportsFunctionPointersFromRender");
-_MTL_PRIVATE_DEF_SEL(supportsPrimitiveMotionBlur,
-    "supportsPrimitiveMotionBlur");
-_MTL_PRIVATE_DEF_SEL(supportsPullModelInterpolation,
-    "supportsPullModelInterpolation");
-_MTL_PRIVATE_DEF_SEL(supportsQueryTextureLOD,
-    "supportsQueryTextureLOD");
-_MTL_PRIVATE_DEF_SEL(supportsRasterizationRateMapWithLayerCount_,
-    "supportsRasterizationRateMapWithLayerCount:");
-_MTL_PRIVATE_DEF_SEL(supportsRaytracing,
-    "supportsRaytracing");
-_MTL_PRIVATE_DEF_SEL(supportsRaytracingFromRender,
-    "supportsRaytracingFromRender");
-_MTL_PRIVATE_DEF_SEL(supportsRenderDynamicLibraries,
-    "supportsRenderDynamicLibraries");
-_MTL_PRIVATE_DEF_SEL(supportsShaderBarycentricCoordinates,
-    "supportsShaderBarycentricCoordinates");
-_MTL_PRIVATE_DEF_SEL(supportsTextureSampleCount_,
-    "supportsTextureSampleCount:");
-_MTL_PRIVATE_DEF_SEL(supportsVertexAmplificationCount_,
-    "supportsVertexAmplificationCount:");
-_MTL_PRIVATE_DEF_SEL(swizzle,
-    "swizzle");
-_MTL_PRIVATE_DEF_SEL(synchronizeResource_,
-    "synchronizeResource:");
-_MTL_PRIVATE_DEF_SEL(synchronizeTexture_slice_level_,
-    "synchronizeTexture:slice:level:");
-_MTL_PRIVATE_DEF_SEL(tAddressMode,
-    "tAddressMode");
-_MTL_PRIVATE_DEF_SEL(tailSizeInBytes,
-    "tailSizeInBytes");
-_MTL_PRIVATE_DEF_SEL(tensorDataType,
-    "tensorDataType");
-_MTL_PRIVATE_DEF_SEL(tensorReferenceType,
-    "tensorReferenceType");
-_MTL_PRIVATE_DEF_SEL(tensorSizeAndAlignWithDescriptor_,
-    "tensorSizeAndAlignWithDescriptor:");
-_MTL_PRIVATE_DEF_SEL(tessellationControlPointIndexType,
-    "tessellationControlPointIndexType");
-_MTL_PRIVATE_DEF_SEL(tessellationFactorFormat,
-    "tessellationFactorFormat");
-_MTL_PRIVATE_DEF_SEL(tessellationFactorStepFunction,
-    "tessellationFactorStepFunction");
-_MTL_PRIVATE_DEF_SEL(tessellationOutputWindingOrder,
-    "tessellationOutputWindingOrder");
-_MTL_PRIVATE_DEF_SEL(tessellationPartitionMode,
-    "tessellationPartitionMode");
-_MTL_PRIVATE_DEF_SEL(texture,
-    "texture");
-_MTL_PRIVATE_DEF_SEL(texture2DDescriptorWithPixelFormat_width_height_mipmapped_,
-    "texture2DDescriptorWithPixelFormat:width:height:mipmapped:");
-_MTL_PRIVATE_DEF_SEL(textureBarrier,
-    "textureBarrier");
-_MTL_PRIVATE_DEF_SEL(textureBufferDescriptorWithPixelFormat_width_resourceOptions_usage_,
-    "textureBufferDescriptorWithPixelFormat:width:resourceOptions:usage:");
-_MTL_PRIVATE_DEF_SEL(textureCubeDescriptorWithPixelFormat_size_mipmapped_,
-    "textureCubeDescriptorWithPixelFormat:size:mipmapped:");
-_MTL_PRIVATE_DEF_SEL(textureDataType,
-    "textureDataType");
-_MTL_PRIVATE_DEF_SEL(textureReferenceType,
-    "textureReferenceType");
-_MTL_PRIVATE_DEF_SEL(textureType,
-    "textureType");
-_MTL_PRIVATE_DEF_SEL(threadExecutionWidth,
-    "threadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(threadGroupSizeIsMultipleOfThreadExecutionWidth,
-    "threadGroupSizeIsMultipleOfThreadExecutionWidth");
-_MTL_PRIVATE_DEF_SEL(threadgroupMemoryAlignment,
-    "threadgroupMemoryAlignment");
-_MTL_PRIVATE_DEF_SEL(threadgroupMemoryDataSize,
-    "threadgroupMemoryDataSize");
-_MTL_PRIVATE_DEF_SEL(threadgroupMemoryLength,
-    "threadgroupMemoryLength");
-_MTL_PRIVATE_DEF_SEL(threadgroupSizeMatchesTileSize,
-    "threadgroupSizeMatchesTileSize");
-_MTL_PRIVATE_DEF_SEL(tileAdditionalBinaryFunctions,
-    "tileAdditionalBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(tileArguments,
-    "tileArguments");
-_MTL_PRIVATE_DEF_SEL(tileBindings,
-    "tileBindings");
-_MTL_PRIVATE_DEF_SEL(tileBuffers,
-    "tileBuffers");
-_MTL_PRIVATE_DEF_SEL(tileFunction,
-    "tileFunction");
-_MTL_PRIVATE_DEF_SEL(tileFunctionDescriptor,
-    "tileFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(tileHeight,
-    "tileHeight");
-_MTL_PRIVATE_DEF_SEL(tileLinkingDescriptor,
-    "tileLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(tileWidth,
-    "tileWidth");
-_MTL_PRIVATE_DEF_SEL(transformationMatrixBuffer,
-    "transformationMatrixBuffer");
-_MTL_PRIVATE_DEF_SEL(transformationMatrixBufferOffset,
-    "transformationMatrixBufferOffset");
-_MTL_PRIVATE_DEF_SEL(transformationMatrixLayout,
-    "transformationMatrixLayout");
-_MTL_PRIVATE_DEF_SEL(triangleCount,
-    "triangleCount");
-_MTL_PRIVATE_DEF_SEL(tryCancel,
-    "tryCancel");
-_MTL_PRIVATE_DEF_SEL(type,
-    "type");
-_MTL_PRIVATE_DEF_SEL(updateBufferMappings_heap_operations_count_,
-    "updateBufferMappings:heap:operations:count:");
-_MTL_PRIVATE_DEF_SEL(updateFence_,
-    "updateFence:");
-_MTL_PRIVATE_DEF_SEL(updateFence_afterEncoderStages_,
-    "updateFence:afterEncoderStages:");
-_MTL_PRIVATE_DEF_SEL(updateFence_afterStages_,
-    "updateFence:afterStages:");
-_MTL_PRIVATE_DEF_SEL(updateTextureMapping_mode_indirectBuffer_indirectBufferOffset_,
-    "updateTextureMapping:mode:indirectBuffer:indirectBufferOffset:");
-_MTL_PRIVATE_DEF_SEL(updateTextureMapping_mode_region_mipLevel_slice_,
-    "updateTextureMapping:mode:region:mipLevel:slice:");
-_MTL_PRIVATE_DEF_SEL(updateTextureMappings_heap_operations_count_,
-    "updateTextureMappings:heap:operations:count:");
-_MTL_PRIVATE_DEF_SEL(updateTextureMappings_mode_regions_mipLevels_slices_numRegions_,
-    "updateTextureMappings:mode:regions:mipLevels:slices:numRegions:");
-_MTL_PRIVATE_DEF_SEL(url,
-    "url");
-_MTL_PRIVATE_DEF_SEL(usage,
-    "usage");
-_MTL_PRIVATE_DEF_SEL(useHeap_,
-    "useHeap:");
-_MTL_PRIVATE_DEF_SEL(useHeap_stages_,
-    "useHeap:stages:");
-_MTL_PRIVATE_DEF_SEL(useHeaps_count_,
-    "useHeaps:count:");
-_MTL_PRIVATE_DEF_SEL(useHeaps_count_stages_,
-    "useHeaps:count:stages:");
-_MTL_PRIVATE_DEF_SEL(useResidencySet_,
-    "useResidencySet:");
-_MTL_PRIVATE_DEF_SEL(useResidencySets_count_,
-    "useResidencySets:count:");
-_MTL_PRIVATE_DEF_SEL(useResource_usage_,
-    "useResource:usage:");
-_MTL_PRIVATE_DEF_SEL(useResource_usage_stages_,
-    "useResource:usage:stages:");
-_MTL_PRIVATE_DEF_SEL(useResources_count_usage_,
-    "useResources:count:usage:");
-_MTL_PRIVATE_DEF_SEL(useResources_count_usage_stages_,
-    "useResources:count:usage:stages:");
-_MTL_PRIVATE_DEF_SEL(usedSize,
-    "usedSize");
-_MTL_PRIVATE_DEF_SEL(vertexAdditionalBinaryFunctions,
-    "vertexAdditionalBinaryFunctions");
-_MTL_PRIVATE_DEF_SEL(vertexArguments,
-    "vertexArguments");
-_MTL_PRIVATE_DEF_SEL(vertexAttributes,
-    "vertexAttributes");
-_MTL_PRIVATE_DEF_SEL(vertexBindings,
-    "vertexBindings");
-_MTL_PRIVATE_DEF_SEL(vertexBuffer,
-    "vertexBuffer");
-_MTL_PRIVATE_DEF_SEL(vertexBufferOffset,
-    "vertexBufferOffset");
-_MTL_PRIVATE_DEF_SEL(vertexBuffers,
-    "vertexBuffers");
-_MTL_PRIVATE_DEF_SEL(vertexDescriptor,
-    "vertexDescriptor");
-_MTL_PRIVATE_DEF_SEL(vertexFormat,
-    "vertexFormat");
-_MTL_PRIVATE_DEF_SEL(vertexFunction,
-    "vertexFunction");
-_MTL_PRIVATE_DEF_SEL(vertexFunctionDescriptor,
-    "vertexFunctionDescriptor");
-_MTL_PRIVATE_DEF_SEL(vertexLinkedFunctions,
-    "vertexLinkedFunctions");
-_MTL_PRIVATE_DEF_SEL(vertexLinkingDescriptor,
-    "vertexLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(vertexPreloadedLibraries,
-    "vertexPreloadedLibraries");
-_MTL_PRIVATE_DEF_SEL(vertexStaticLinkingDescriptor,
-    "vertexStaticLinkingDescriptor");
-_MTL_PRIVATE_DEF_SEL(vertexStride,
-    "vertexStride");
-_MTL_PRIVATE_DEF_SEL(vertical,
-    "vertical");
-_MTL_PRIVATE_DEF_SEL(verticalSampleStorage,
-    "verticalSampleStorage");
-_MTL_PRIVATE_DEF_SEL(visibilityResultBuffer,
-    "visibilityResultBuffer");
-_MTL_PRIVATE_DEF_SEL(visibilityResultType,
-    "visibilityResultType");
-_MTL_PRIVATE_DEF_SEL(visibleFunctionTableDescriptor,
-    "visibleFunctionTableDescriptor");
-_MTL_PRIVATE_DEF_SEL(waitForDrawable_,
-    "waitForDrawable:");
-_MTL_PRIVATE_DEF_SEL(waitForEvent_value_,
-    "waitForEvent:value:");
-_MTL_PRIVATE_DEF_SEL(waitForFence_,
-    "waitForFence:");
-_MTL_PRIVATE_DEF_SEL(waitForFence_beforeEncoderStages_,
-    "waitForFence:beforeEncoderStages:");
-_MTL_PRIVATE_DEF_SEL(waitForFence_beforeStages_,
-    "waitForFence:beforeStages:");
-_MTL_PRIVATE_DEF_SEL(waitUntilCompleted,
-    "waitUntilCompleted");
-_MTL_PRIVATE_DEF_SEL(waitUntilScheduled,
-    "waitUntilScheduled");
-_MTL_PRIVATE_DEF_SEL(waitUntilSignaledValue_timeoutMS_,
-    "waitUntilSignaledValue:timeoutMS:");
-_MTL_PRIVATE_DEF_SEL(width,
-    "width");
-_MTL_PRIVATE_DEF_SEL(writeCompactedAccelerationStructureSize_toBuffer_,
-    "writeCompactedAccelerationStructureSize:toBuffer:");
-_MTL_PRIVATE_DEF_SEL(writeCompactedAccelerationStructureSize_toBuffer_offset_,
-    "writeCompactedAccelerationStructureSize:toBuffer:offset:");
-_MTL_PRIVATE_DEF_SEL(writeCompactedAccelerationStructureSize_toBuffer_offset_sizeDataType_,
-    "writeCompactedAccelerationStructureSize:toBuffer:offset:sizeDataType:");
-_MTL_PRIVATE_DEF_SEL(writeMask,
-    "writeMask");
-_MTL_PRIVATE_DEF_SEL(writeTimestampIntoHeap_atIndex_,
-    "writeTimestampIntoHeap:atIndex:");
-_MTL_PRIVATE_DEF_SEL(writeTimestampWithGranularity_afterStage_intoHeap_atIndex_,
-    "writeTimestampWithGranularity:afterStage:intoHeap:atIndex:");
-_MTL_PRIVATE_DEF_SEL(writeTimestampWithGranularity_intoHeap_atIndex_,
-    "writeTimestampWithGranularity:intoHeap:atIndex:");
-
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLHeap.hpp b/engine/thirdparty/metal-cpp/Metal/MTLHeap.hpp
deleted file mode 100644
index 251b284a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLHeap.hpp
+++ /dev/null
@@ -1,318 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLHeap.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-
-namespace MTL
-{
-class AccelerationStructure;
-class AccelerationStructureDescriptor;
-class Buffer;
-class Device;
-class HeapDescriptor;
-class Texture;
-class TextureDescriptor;
-_MTL_ENUM(NS::Integer, HeapType) {
-    HeapTypeAutomatic = 0,
-    HeapTypePlacement = 1,
-    HeapTypeSparse = 2,
-};
-
-class HeapDescriptor : public NS::Copying<HeapDescriptor>
-{
-public:
-    static HeapDescriptor* alloc();
-
-    CPUCacheMode           cpuCacheMode() const;
-
-    HazardTrackingMode     hazardTrackingMode() const;
-
-    HeapDescriptor*        init();
-
-    SparsePageSize         maxCompatiblePlacementSparsePageSize() const;
-
-    ResourceOptions        resourceOptions() const;
-
-    void                   setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode);
-
-    void                   setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode);
-
-    void                   setMaxCompatiblePlacementSparsePageSize(MTL::SparsePageSize maxCompatiblePlacementSparsePageSize);
-
-    void                   setResourceOptions(MTL::ResourceOptions resourceOptions);
-
-    void                   setSize(NS::UInteger size);
-
-    void                   setSparsePageSize(MTL::SparsePageSize sparsePageSize);
-
-    void                   setStorageMode(MTL::StorageMode storageMode);
-
-    void                   setType(MTL::HeapType type);
-
-    NS::UInteger           size() const;
-    SparsePageSize         sparsePageSize() const;
-
-    StorageMode            storageMode() const;
-
-    HeapType               type() const;
-};
-class Heap : public NS::Referencing<Heap, Allocation>
-{
-public:
-    CPUCacheMode           cpuCacheMode() const;
-
-    NS::UInteger           currentAllocatedSize() const;
-
-    Device*                device() const;
-
-    HazardTrackingMode     hazardTrackingMode() const;
-
-    NS::String*            label() const;
-
-    NS::UInteger           maxAvailableSize(NS::UInteger alignment);
-
-    AccelerationStructure* newAccelerationStructure(NS::UInteger size);
-    AccelerationStructure* newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor);
-    AccelerationStructure* newAccelerationStructure(NS::UInteger size, NS::UInteger offset);
-    AccelerationStructure* newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor, NS::UInteger offset);
-
-    Buffer*                newBuffer(NS::UInteger length, MTL::ResourceOptions options);
-    Buffer*                newBuffer(NS::UInteger length, MTL::ResourceOptions options, NS::UInteger offset);
-
-    Texture*               newTexture(const MTL::TextureDescriptor* descriptor);
-    Texture*               newTexture(const MTL::TextureDescriptor* descriptor, NS::UInteger offset);
-
-    ResourceOptions        resourceOptions() const;
-
-    void                   setLabel(const NS::String* label);
-
-    PurgeableState         setPurgeableState(MTL::PurgeableState state);
-
-    NS::UInteger           size() const;
-
-    StorageMode            storageMode() const;
-
-    HeapType               type() const;
-
-    NS::UInteger           usedSize() const;
-};
-
-}
-_MTL_INLINE MTL::HeapDescriptor* MTL::HeapDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::HeapDescriptor>(_MTL_PRIVATE_CLS(MTLHeapDescriptor));
-}
-
-_MTL_INLINE MTL::CPUCacheMode MTL::HeapDescriptor::cpuCacheMode() const
-{
-    return Object::sendMessage<MTL::CPUCacheMode>(this, _MTL_PRIVATE_SEL(cpuCacheMode));
-}
-
-_MTL_INLINE MTL::HazardTrackingMode MTL::HeapDescriptor::hazardTrackingMode() const
-{
-    return Object::sendMessage<MTL::HazardTrackingMode>(this, _MTL_PRIVATE_SEL(hazardTrackingMode));
-}
-
-_MTL_INLINE MTL::HeapDescriptor* MTL::HeapDescriptor::init()
-{
-    return NS::Object::init<MTL::HeapDescriptor>();
-}
-
-_MTL_INLINE MTL::SparsePageSize MTL::HeapDescriptor::maxCompatiblePlacementSparsePageSize() const
-{
-    return Object::sendMessage<MTL::SparsePageSize>(this, _MTL_PRIVATE_SEL(maxCompatiblePlacementSparsePageSize));
-}
-
-_MTL_INLINE MTL::ResourceOptions MTL::HeapDescriptor::resourceOptions() const
-{
-    return Object::sendMessage<MTL::ResourceOptions>(this, _MTL_PRIVATE_SEL(resourceOptions));
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCpuCacheMode_), cpuCacheMode);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setHazardTrackingMode_), hazardTrackingMode);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setMaxCompatiblePlacementSparsePageSize(MTL::SparsePageSize maxCompatiblePlacementSparsePageSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCompatiblePlacementSparsePageSize_), maxCompatiblePlacementSparsePageSize);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setResourceOptions(MTL::ResourceOptions resourceOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResourceOptions_), resourceOptions);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setSize(NS::UInteger size)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSize_), size);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setSparsePageSize(MTL::SparsePageSize sparsePageSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSparsePageSize_), sparsePageSize);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setStorageMode(MTL::StorageMode storageMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStorageMode_), storageMode);
-}
-
-_MTL_INLINE void MTL::HeapDescriptor::setType(MTL::HeapType type)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setType_), type);
-}
-
-_MTL_INLINE NS::UInteger MTL::HeapDescriptor::size() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(size));
-}
-
-_MTL_INLINE MTL::SparsePageSize MTL::HeapDescriptor::sparsePageSize() const
-{
-    return Object::sendMessage<MTL::SparsePageSize>(this, _MTL_PRIVATE_SEL(sparsePageSize));
-}
-
-_MTL_INLINE MTL::StorageMode MTL::HeapDescriptor::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
-
-_MTL_INLINE MTL::HeapType MTL::HeapDescriptor::type() const
-{
-    return Object::sendMessage<MTL::HeapType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE MTL::CPUCacheMode MTL::Heap::cpuCacheMode() const
-{
-    return Object::sendMessage<MTL::CPUCacheMode>(this, _MTL_PRIVATE_SEL(cpuCacheMode));
-}
-
-_MTL_INLINE NS::UInteger MTL::Heap::currentAllocatedSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(currentAllocatedSize));
-}
-
-_MTL_INLINE MTL::Device* MTL::Heap::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::HazardTrackingMode MTL::Heap::hazardTrackingMode() const
-{
-    return Object::sendMessage<MTL::HazardTrackingMode>(this, _MTL_PRIVATE_SEL(hazardTrackingMode));
-}
-
-_MTL_INLINE NS::String* MTL::Heap::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::Heap::maxAvailableSize(NS::UInteger alignment)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxAvailableSizeWithAlignment_), alignment);
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Heap::newAccelerationStructure(NS::UInteger size)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithSize_), size);
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Heap::newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Heap::newAccelerationStructure(NS::UInteger size, NS::UInteger offset)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithSize_offset_), size, offset);
-}
-
-_MTL_INLINE MTL::AccelerationStructure* MTL::Heap::newAccelerationStructure(const MTL::AccelerationStructureDescriptor* descriptor, NS::UInteger offset)
-{
-    return Object::sendMessage<MTL::AccelerationStructure*>(this, _MTL_PRIVATE_SEL(newAccelerationStructureWithDescriptor_offset_), descriptor, offset);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Heap::newBuffer(NS::UInteger length, MTL::ResourceOptions options)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithLength_options_), length, options);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Heap::newBuffer(NS::UInteger length, MTL::ResourceOptions options, NS::UInteger offset)
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(newBufferWithLength_options_offset_), length, options, offset);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Heap::newTexture(const MTL::TextureDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Heap::newTexture(const MTL::TextureDescriptor* descriptor, NS::UInteger offset)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureWithDescriptor_offset_), descriptor, offset);
-}
-
-_MTL_INLINE MTL::ResourceOptions MTL::Heap::resourceOptions() const
-{
-    return Object::sendMessage<MTL::ResourceOptions>(this, _MTL_PRIVATE_SEL(resourceOptions));
-}
-
-_MTL_INLINE void MTL::Heap::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::PurgeableState MTL::Heap::setPurgeableState(MTL::PurgeableState state)
-{
-    return Object::sendMessage<MTL::PurgeableState>(this, _MTL_PRIVATE_SEL(setPurgeableState_), state);
-}
-
-_MTL_INLINE NS::UInteger MTL::Heap::size() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(size));
-}
-
-_MTL_INLINE MTL::StorageMode MTL::Heap::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
-
-_MTL_INLINE MTL::HeapType MTL::Heap::type() const
-{
-    return Object::sendMessage<MTL::HeapType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE NS::UInteger MTL::Heap::usedSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(usedSize));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIOCommandBuffer.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIOCommandBuffer.hpp
deleted file mode 100644
index 9402318d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIOCommandBuffer.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIOCommandBuffer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Buffer;
-class IOCommandBuffer;
-class IOFileHandle;
-class SharedEvent;
-class Texture;
-_MTL_ENUM(NS::Integer, IOStatus) {
-    IOStatusPending = 0,
-    IOStatusCancelled = 1,
-    IOStatusError = 2,
-    IOStatusComplete = 3,
-};
-
-using IOCommandBufferHandler = void (^)(MTL::IOCommandBuffer*);
-using IOCommandBufferHandlerFunction = std::function<void(MTL::IOCommandBuffer*)>;
-
-class IOCommandBuffer : public NS::Referencing<IOCommandBuffer>
-{
-public:
-    void        addBarrier();
-
-    void        addCompletedHandler(const MTL::IOCommandBufferHandler block);
-    void        addCompletedHandler(const MTL::IOCommandBufferHandlerFunction& function);
-
-    void        commit();
-
-    void        copyStatusToBuffer(const MTL::Buffer* buffer, NS::UInteger offset);
-
-    void        enqueue();
-
-    NS::Error*  error() const;
-
-    NS::String* label() const;
-
-    void        loadBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger size, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset);
-
-    void        loadBytes(const void* pointer, NS::UInteger size, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset);
-
-    void        loadTexture(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level, MTL::Size size, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Origin destinationOrigin, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset);
-
-    void        popDebugGroup();
-
-    void        pushDebugGroup(const NS::String* string);
-
-    void        setLabel(const NS::String* label);
-
-    void        signalEvent(const MTL::SharedEvent* event, uint64_t value);
-
-    IOStatus    status() const;
-
-    void        tryCancel();
-
-    void        wait(const MTL::SharedEvent* event, uint64_t value);
-    void        waitUntilCompleted();
-};
-
-}
-_MTL_INLINE void MTL::IOCommandBuffer::addBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addBarrier));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::addCompletedHandler(const MTL::IOCommandBufferHandler block)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addCompletedHandler_), block);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::addCompletedHandler(const MTL::IOCommandBufferHandlerFunction& function)
-{
-    __block MTL::IOCommandBufferHandlerFunction blockFunction = function;
-    addCompletedHandler(^(MTL::IOCommandBuffer* pCommandBuffer) { blockFunction(pCommandBuffer); });
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::commit()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(commit));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::copyStatusToBuffer(const MTL::Buffer* buffer, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyStatusToBuffer_offset_), buffer, offset);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::enqueue()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(enqueue));
-}
-
-_MTL_INLINE NS::Error* MTL::IOCommandBuffer::error() const
-{
-    return Object::sendMessage<NS::Error*>(this, _MTL_PRIVATE_SEL(error));
-}
-
-_MTL_INLINE NS::String* MTL::IOCommandBuffer::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::loadBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger size, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(loadBuffer_offset_size_sourceHandle_sourceHandleOffset_), buffer, offset, size, sourceHandle, sourceHandleOffset);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::loadBytes(const void* pointer, NS::UInteger size, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(loadBytes_size_sourceHandle_sourceHandleOffset_), pointer, size, sourceHandle, sourceHandleOffset);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::loadTexture(const MTL::Texture* texture, NS::UInteger slice, NS::UInteger level, MTL::Size size, NS::UInteger sourceBytesPerRow, NS::UInteger sourceBytesPerImage, MTL::Origin destinationOrigin, const MTL::IOFileHandle* sourceHandle, NS::UInteger sourceHandleOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(loadTexture_slice_level_size_sourceBytesPerRow_sourceBytesPerImage_destinationOrigin_sourceHandle_sourceHandleOffset_), texture, slice, level, size, sourceBytesPerRow, sourceBytesPerImage, destinationOrigin, sourceHandle, sourceHandleOffset);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::popDebugGroup()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(popDebugGroup));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::pushDebugGroup(const NS::String* string)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(pushDebugGroup_), string);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::signalEvent(const MTL::SharedEvent* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(signalEvent_value_), event, value);
-}
-
-_MTL_INLINE MTL::IOStatus MTL::IOCommandBuffer::status() const
-{
-    return Object::sendMessage<MTL::IOStatus>(this, _MTL_PRIVATE_SEL(status));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::tryCancel()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(tryCancel));
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::wait(const MTL::SharedEvent* event, uint64_t value)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForEvent_value_), event, value);
-}
-
-_MTL_INLINE void MTL::IOCommandBuffer::waitUntilCompleted()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitUntilCompleted));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIOCommandQueue.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIOCommandQueue.hpp
deleted file mode 100644
index ac956c8f..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIOCommandQueue.hpp
+++ /dev/null
@@ -1,211 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIOCommandQueue.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class Buffer;
-class IOCommandBuffer;
-class IOCommandQueueDescriptor;
-class IOScratchBuffer;
-class IOScratchBufferAllocator;
-_MTL_ENUM(NS::Integer, IOPriority) {
-    IOPriorityHigh = 0,
-    IOPriorityNormal = 1,
-    IOPriorityLow = 2,
-};
-
-_MTL_ENUM(NS::Integer, IOCommandQueueType) {
-    IOCommandQueueTypeConcurrent = 0,
-    IOCommandQueueTypeSerial = 1,
-};
-
-_MTL_ENUM(NS::Integer, IOError) {
-    IOErrorURLInvalid = 1,
-    IOErrorInternal = 2,
-};
-
-_MTL_CONST(NS::ErrorDomain, IOErrorDomain);
-class IOCommandQueue : public NS::Referencing<IOCommandQueue>
-{
-public:
-    IOCommandBuffer* commandBuffer();
-    IOCommandBuffer* commandBufferWithUnretainedReferences();
-
-    void             enqueueBarrier();
-
-    NS::String*      label() const;
-    void             setLabel(const NS::String* label);
-};
-class IOScratchBuffer : public NS::Referencing<IOScratchBuffer>
-{
-public:
-    Buffer* buffer() const;
-};
-class IOScratchBufferAllocator : public NS::Referencing<IOScratchBufferAllocator>
-{
-public:
-    IOScratchBuffer* newScratchBuffer(NS::UInteger minimumSize);
-};
-class IOCommandQueueDescriptor : public NS::Copying<IOCommandQueueDescriptor>
-{
-public:
-    static IOCommandQueueDescriptor* alloc();
-
-    IOCommandQueueDescriptor*        init();
-
-    NS::UInteger                     maxCommandBufferCount() const;
-
-    NS::UInteger                     maxCommandsInFlight() const;
-
-    IOPriority                       priority() const;
-
-    IOScratchBufferAllocator*        scratchBufferAllocator() const;
-
-    void                             setMaxCommandBufferCount(NS::UInteger maxCommandBufferCount);
-
-    void                             setMaxCommandsInFlight(NS::UInteger maxCommandsInFlight);
-
-    void                             setPriority(MTL::IOPriority priority);
-
-    void                             setScratchBufferAllocator(const MTL::IOScratchBufferAllocator* scratchBufferAllocator);
-
-    void                             setType(MTL::IOCommandQueueType type);
-    IOCommandQueueType               type() const;
-};
-class IOFileHandle : public NS::Referencing<IOFileHandle>
-{
-public:
-    NS::String* label() const;
-    void        setLabel(const NS::String* label);
-};
-
-}
-_MTL_PRIVATE_DEF_CONST(NS::ErrorDomain, IOErrorDomain);
-_MTL_INLINE MTL::IOCommandBuffer* MTL::IOCommandQueue::commandBuffer()
-{
-    return Object::sendMessage<MTL::IOCommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBuffer));
-}
-
-_MTL_INLINE MTL::IOCommandBuffer* MTL::IOCommandQueue::commandBufferWithUnretainedReferences()
-{
-    return Object::sendMessage<MTL::IOCommandBuffer*>(this, _MTL_PRIVATE_SEL(commandBufferWithUnretainedReferences));
-}
-
-_MTL_INLINE void MTL::IOCommandQueue::enqueueBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(enqueueBarrier));
-}
-
-_MTL_INLINE NS::String* MTL::IOCommandQueue::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::IOCommandQueue::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::Buffer* MTL::IOScratchBuffer::buffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(buffer));
-}
-
-_MTL_INLINE MTL::IOScratchBuffer* MTL::IOScratchBufferAllocator::newScratchBuffer(NS::UInteger minimumSize)
-{
-    return Object::sendMessage<MTL::IOScratchBuffer*>(this, _MTL_PRIVATE_SEL(newScratchBufferWithMinimumSize_), minimumSize);
-}
-
-_MTL_INLINE MTL::IOCommandQueueDescriptor* MTL::IOCommandQueueDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::IOCommandQueueDescriptor>(_MTL_PRIVATE_CLS(MTLIOCommandQueueDescriptor));
-}
-
-_MTL_INLINE MTL::IOCommandQueueDescriptor* MTL::IOCommandQueueDescriptor::init()
-{
-    return NS::Object::init<MTL::IOCommandQueueDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::IOCommandQueueDescriptor::maxCommandBufferCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCommandBufferCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IOCommandQueueDescriptor::maxCommandsInFlight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCommandsInFlight));
-}
-
-_MTL_INLINE MTL::IOPriority MTL::IOCommandQueueDescriptor::priority() const
-{
-    return Object::sendMessage<MTL::IOPriority>(this, _MTL_PRIVATE_SEL(priority));
-}
-
-_MTL_INLINE MTL::IOScratchBufferAllocator* MTL::IOCommandQueueDescriptor::scratchBufferAllocator() const
-{
-    return Object::sendMessage<MTL::IOScratchBufferAllocator*>(this, _MTL_PRIVATE_SEL(scratchBufferAllocator));
-}
-
-_MTL_INLINE void MTL::IOCommandQueueDescriptor::setMaxCommandBufferCount(NS::UInteger maxCommandBufferCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCommandBufferCount_), maxCommandBufferCount);
-}
-
-_MTL_INLINE void MTL::IOCommandQueueDescriptor::setMaxCommandsInFlight(NS::UInteger maxCommandsInFlight)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCommandsInFlight_), maxCommandsInFlight);
-}
-
-_MTL_INLINE void MTL::IOCommandQueueDescriptor::setPriority(MTL::IOPriority priority)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPriority_), priority);
-}
-
-_MTL_INLINE void MTL::IOCommandQueueDescriptor::setScratchBufferAllocator(const MTL::IOScratchBufferAllocator* scratchBufferAllocator)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScratchBufferAllocator_), scratchBufferAllocator);
-}
-
-_MTL_INLINE void MTL::IOCommandQueueDescriptor::setType(MTL::IOCommandQueueType type)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setType_), type);
-}
-
-_MTL_INLINE MTL::IOCommandQueueType MTL::IOCommandQueueDescriptor::type() const
-{
-    return Object::sendMessage<MTL::IOCommandQueueType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE NS::String* MTL::IOFileHandle::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::IOFileHandle::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIOCompressor.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIOCompressor.hpp
deleted file mode 100644
index 920fa611..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIOCompressor.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIOCompressor.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLDevice.hpp"
-
-#include "../Foundation/Foundation.hpp"
-
-namespace MTL
-{
-using IOCompressionContext=void*;
-
-_MTL_ENUM(NS::Integer, IOCompressionStatus) {
-    IOCompressionStatusComplete = 0,
-    IOCompressionStatusError = 1,
-};
-
-size_t IOCompressionContextDefaultChunkSize();
-
-IOCompressionContext IOCreateCompressionContext(const char* path, IOCompressionMethod type, size_t chunkSize);
-
-void IOCompressionContextAppendData(IOCompressionContext context, const void* data, size_t size);
-
-IOCompressionStatus IOFlushAndDestroyCompressionContext(IOCompressionContext context);
-
-}
-
-#if defined(MTL_PRIVATE_IMPLEMENTATION)
-
-namespace MTL::Private {
-
-MTL_DEF_FUNC(MTLIOCompressionContextDefaultChunkSize, size_t (*)(void));
-
-MTL_DEF_FUNC( MTLIOCreateCompressionContext, void* (*)(const char*, MTL::IOCompressionMethod, size_t) );
-
-MTL_DEF_FUNC( MTLIOCompressionContextAppendData, void (*)(void*, const void*, size_t) );
-
-MTL_DEF_FUNC( MTLIOFlushAndDestroyCompressionContext, MTL::IOCompressionStatus (*)(void*) );
-
-}
-
-_NS_EXPORT size_t MTL::IOCompressionContextDefaultChunkSize()
-{
-    return MTL::Private::MTLIOCompressionContextDefaultChunkSize();
-}
-
-_NS_EXPORT void* MTL::IOCreateCompressionContext(const char* path, IOCompressionMethod type, size_t chunkSize)
-{
-    if ( MTL::Private::MTLIOCreateCompressionContext )
-    {
-        return MTL::Private::MTLIOCreateCompressionContext( path, type, chunkSize );
-    }
-    return nullptr;
-}
-
-_NS_EXPORT void MTL::IOCompressionContextAppendData(void* context, const void* data, size_t size)
-{
-    if ( MTL::Private::MTLIOCompressionContextAppendData )
-    {
-        MTL::Private::MTLIOCompressionContextAppendData( context, data, size );
-    }
-}
-
-_NS_EXPORT MTL::IOCompressionStatus MTL::IOFlushAndDestroyCompressionContext(void* context)
-{
-    if ( MTL::Private::MTLIOFlushAndDestroyCompressionContext )
-    {
-        return MTL::Private::MTLIOFlushAndDestroyCompressionContext( context );
-    }
-    return MTL::IOCompressionStatusError;
-}
-
-#endif
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandBuffer.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandBuffer.hpp
deleted file mode 100644
index 6944d562..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandBuffer.hpp
+++ /dev/null
@@ -1,376 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIndirectCommandBuffer.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class IndirectCommandBufferDescriptor;
-class IndirectComputeCommand;
-class IndirectRenderCommand;
-
-_MTL_OPTIONS(NS::UInteger, IndirectCommandType) {
-    IndirectCommandTypeDraw = 1,
-    IndirectCommandTypeDrawIndexed = 1 << 1,
-    IndirectCommandTypeDrawPatches = 1 << 2,
-    IndirectCommandTypeDrawIndexedPatches = 1 << 3,
-    IndirectCommandTypeConcurrentDispatch = 1 << 5,
-    IndirectCommandTypeConcurrentDispatchThreads = 1 << 6,
-    IndirectCommandTypeDrawMeshThreadgroups = 1 << 7,
-    IndirectCommandTypeDrawMeshThreads = 1 << 8,
-};
-
-struct IndirectCommandBufferExecutionRange
-{
-    uint32_t location;
-    uint32_t length;
-} _MTL_PACKED;
-
-class IndirectCommandBufferDescriptor : public NS::Copying<IndirectCommandBufferDescriptor>
-{
-public:
-    static IndirectCommandBufferDescriptor* alloc();
-
-    IndirectCommandType                     commandTypes() const;
-
-    bool                                    inheritBuffers() const;
-
-    bool                                    inheritCullMode() const;
-
-    bool                                    inheritDepthBias() const;
-
-    bool                                    inheritDepthClipMode() const;
-
-    bool                                    inheritDepthStencilState() const;
-
-    bool                                    inheritFrontFacingWinding() const;
-
-    bool                                    inheritPipelineState() const;
-
-    bool                                    inheritTriangleFillMode() const;
-
-    IndirectCommandBufferDescriptor*        init();
-
-    NS::UInteger                            maxFragmentBufferBindCount() const;
-
-    NS::UInteger                            maxKernelBufferBindCount() const;
-
-    NS::UInteger                            maxKernelThreadgroupMemoryBindCount() const;
-
-    NS::UInteger                            maxMeshBufferBindCount() const;
-
-    NS::UInteger                            maxObjectBufferBindCount() const;
-
-    NS::UInteger                            maxObjectThreadgroupMemoryBindCount() const;
-
-    NS::UInteger                            maxVertexBufferBindCount() const;
-
-    void                                    setCommandTypes(MTL::IndirectCommandType commandTypes);
-
-    void                                    setInheritBuffers(bool inheritBuffers);
-
-    void                                    setInheritCullMode(bool inheritCullMode);
-
-    void                                    setInheritDepthBias(bool inheritDepthBias);
-
-    void                                    setInheritDepthClipMode(bool inheritDepthClipMode);
-
-    void                                    setInheritDepthStencilState(bool inheritDepthStencilState);
-
-    void                                    setInheritFrontFacingWinding(bool inheritFrontFacingWinding);
-
-    void                                    setInheritPipelineState(bool inheritPipelineState);
-
-    void                                    setInheritTriangleFillMode(bool inheritTriangleFillMode);
-
-    void                                    setMaxFragmentBufferBindCount(NS::UInteger maxFragmentBufferBindCount);
-
-    void                                    setMaxKernelBufferBindCount(NS::UInteger maxKernelBufferBindCount);
-
-    void                                    setMaxKernelThreadgroupMemoryBindCount(NS::UInteger maxKernelThreadgroupMemoryBindCount);
-
-    void                                    setMaxMeshBufferBindCount(NS::UInteger maxMeshBufferBindCount);
-
-    void                                    setMaxObjectBufferBindCount(NS::UInteger maxObjectBufferBindCount);
-
-    void                                    setMaxObjectThreadgroupMemoryBindCount(NS::UInteger maxObjectThreadgroupMemoryBindCount);
-
-    void                                    setMaxVertexBufferBindCount(NS::UInteger maxVertexBufferBindCount);
-
-    void                                    setSupportColorAttachmentMapping(bool supportColorAttachmentMapping);
-
-    void                                    setSupportDynamicAttributeStride(bool supportDynamicAttributeStride);
-
-    void                                    setSupportRayTracing(bool supportRayTracing);
-
-    bool                                    supportColorAttachmentMapping() const;
-
-    bool                                    supportDynamicAttributeStride() const;
-
-    bool                                    supportRayTracing() const;
-};
-class IndirectCommandBuffer : public NS::Referencing<IndirectCommandBuffer, Resource>
-{
-public:
-    ResourceID              gpuResourceID() const;
-
-    IndirectComputeCommand* indirectComputeCommand(NS::UInteger commandIndex);
-
-    IndirectRenderCommand*  indirectRenderCommand(NS::UInteger commandIndex);
-
-    void                    reset(NS::Range range);
-
-    NS::UInteger            size() const;
-};
-
-}
-
-_MTL_INLINE MTL::IndirectCommandBufferDescriptor* MTL::IndirectCommandBufferDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::IndirectCommandBufferDescriptor>(_MTL_PRIVATE_CLS(MTLIndirectCommandBufferDescriptor));
-}
-
-_MTL_INLINE MTL::IndirectCommandType MTL::IndirectCommandBufferDescriptor::commandTypes() const
-{
-    return Object::sendMessage<MTL::IndirectCommandType>(this, _MTL_PRIVATE_SEL(commandTypes));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritBuffers() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritBuffers));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritCullMode() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritCullMode));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritDepthBias() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritDepthBias));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritDepthClipMode() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritDepthClipMode));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritDepthStencilState() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritDepthStencilState));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritFrontFacingWinding() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritFrontFacingWinding));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritPipelineState() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritPipelineState));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::inheritTriangleFillMode() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(inheritTriangleFillMode));
-}
-
-_MTL_INLINE MTL::IndirectCommandBufferDescriptor* MTL::IndirectCommandBufferDescriptor::init()
-{
-    return NS::Object::init<MTL::IndirectCommandBufferDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxFragmentBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxFragmentBufferBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxKernelBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxKernelBufferBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxKernelThreadgroupMemoryBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxKernelThreadgroupMemoryBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxMeshBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxMeshBufferBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxObjectBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxObjectBufferBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxObjectThreadgroupMemoryBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxObjectThreadgroupMemoryBindCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBufferDescriptor::maxVertexBufferBindCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexBufferBindCount));
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setCommandTypes(MTL::IndirectCommandType commandTypes)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCommandTypes_), commandTypes);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritBuffers(bool inheritBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritBuffers_), inheritBuffers);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritCullMode(bool inheritCullMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritCullMode_), inheritCullMode);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritDepthBias(bool inheritDepthBias)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritDepthBias_), inheritDepthBias);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritDepthClipMode(bool inheritDepthClipMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritDepthClipMode_), inheritDepthClipMode);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritDepthStencilState(bool inheritDepthStencilState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritDepthStencilState_), inheritDepthStencilState);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritFrontFacingWinding(bool inheritFrontFacingWinding)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritFrontFacingWinding_), inheritFrontFacingWinding);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritPipelineState(bool inheritPipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritPipelineState_), inheritPipelineState);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setInheritTriangleFillMode(bool inheritTriangleFillMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInheritTriangleFillMode_), inheritTriangleFillMode);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxFragmentBufferBindCount(NS::UInteger maxFragmentBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxFragmentBufferBindCount_), maxFragmentBufferBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxKernelBufferBindCount(NS::UInteger maxKernelBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxKernelBufferBindCount_), maxKernelBufferBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxKernelThreadgroupMemoryBindCount(NS::UInteger maxKernelThreadgroupMemoryBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxKernelThreadgroupMemoryBindCount_), maxKernelThreadgroupMemoryBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxMeshBufferBindCount(NS::UInteger maxMeshBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxMeshBufferBindCount_), maxMeshBufferBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxObjectBufferBindCount(NS::UInteger maxObjectBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxObjectBufferBindCount_), maxObjectBufferBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxObjectThreadgroupMemoryBindCount(NS::UInteger maxObjectThreadgroupMemoryBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxObjectThreadgroupMemoryBindCount_), maxObjectThreadgroupMemoryBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setMaxVertexBufferBindCount(NS::UInteger maxVertexBufferBindCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexBufferBindCount_), maxVertexBufferBindCount);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setSupportColorAttachmentMapping(bool supportColorAttachmentMapping)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportColorAttachmentMapping_), supportColorAttachmentMapping);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setSupportDynamicAttributeStride(bool supportDynamicAttributeStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportDynamicAttributeStride_), supportDynamicAttributeStride);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBufferDescriptor::setSupportRayTracing(bool supportRayTracing)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportRayTracing_), supportRayTracing);
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::supportColorAttachmentMapping() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportColorAttachmentMapping));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::supportDynamicAttributeStride() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportDynamicAttributeStride));
-}
-
-_MTL_INLINE bool MTL::IndirectCommandBufferDescriptor::supportRayTracing() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportRayTracing));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::IndirectCommandBuffer::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE MTL::IndirectComputeCommand* MTL::IndirectCommandBuffer::indirectComputeCommand(NS::UInteger commandIndex)
-{
-    return Object::sendMessage<MTL::IndirectComputeCommand*>(this, _MTL_PRIVATE_SEL(indirectComputeCommandAtIndex_), commandIndex);
-}
-
-_MTL_INLINE MTL::IndirectRenderCommand* MTL::IndirectCommandBuffer::indirectRenderCommand(NS::UInteger commandIndex)
-{
-    return Object::sendMessage<MTL::IndirectRenderCommand*>(this, _MTL_PRIVATE_SEL(indirectRenderCommandAtIndex_), commandIndex);
-}
-
-_MTL_INLINE void MTL::IndirectCommandBuffer::reset(NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(resetWithRange_), range);
-}
-
-_MTL_INLINE NS::UInteger MTL::IndirectCommandBuffer::size() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(size));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandEncoder.hpp
deleted file mode 100644
index 9e1a9400..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIndirectCommandEncoder.hpp
+++ /dev/null
@@ -1,272 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIndirectCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderCommandEncoder.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Buffer;
-class ComputePipelineState;
-class RenderPipelineState;
-
-class IndirectRenderCommand : public NS::Referencing<IndirectRenderCommand>
-{
-public:
-    void clearBarrier();
-
-    void drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance, const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride);
-
-    void drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance);
-
-    void drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void drawPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance, const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride);
-
-    void drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance);
-
-    void reset();
-
-    void setBarrier();
-
-    void setCullMode(MTL::CullMode cullMode);
-
-    void setDepthBias(float depthBias, float slopeScale, float clamp);
-
-    void setDepthClipMode(MTL::DepthClipMode depthClipMode);
-
-    void setDepthStencilState(const MTL::DepthStencilState* depthStencilState);
-
-    void setFragmentBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-
-    void setFrontFacingWinding(MTL::Winding frontFacingWindning);
-
-    void setMeshBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-
-    void setObjectBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-
-    void setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-
-    void setRenderPipelineState(const MTL::RenderPipelineState* pipelineState);
-
-    void setTriangleFillMode(MTL::TriangleFillMode fillMode);
-
-    void setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-};
-class IndirectComputeCommand : public NS::Referencing<IndirectComputeCommand>
-{
-public:
-    void clearBarrier();
-
-    void concurrentDispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup);
-
-    void concurrentDispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup);
-
-    void reset();
-
-    void setBarrier();
-
-    void setComputePipelineState(const MTL::ComputePipelineState* pipelineState);
-
-    void setImageblockWidth(NS::UInteger width, NS::UInteger height);
-
-    void setKernelBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void setKernelBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-
-    void setStageInRegion(MTL::Region region);
-
-    void setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-};
-
-}
-_MTL_INLINE void MTL::IndirectRenderCommand::clearBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(clearBarrier));
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance, const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_instanceCount_baseInstance_tessellationFactorBuffer_tessellationFactorBufferOffset_tessellationFactorBufferInstanceStride_), numberOfPatchControlPoints, patchStart, patchCount, patchIndexBuffer, patchIndexBufferOffset, controlPointIndexBuffer, controlPointIndexBufferOffset, instanceCount, baseInstance, buffer, offset, instanceStride);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_instanceCount_baseVertex_baseInstance_), primitiveType, indexCount, indexType, indexBuffer, indexBufferOffset, instanceCount, baseVertex, baseInstance);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreadgroups_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadgroupsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreads_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance, const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_instanceCount_baseInstance_tessellationFactorBuffer_tessellationFactorBufferOffset_tessellationFactorBufferInstanceStride_), numberOfPatchControlPoints, patchStart, patchCount, patchIndexBuffer, patchIndexBufferOffset, instanceCount, baseInstance, buffer, offset, instanceStride);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_baseInstance_), primitiveType, vertexStart, vertexCount, instanceCount, baseInstance);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBarrier));
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setCullMode(MTL::CullMode cullMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCullMode_), cullMode);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setDepthBias(float depthBias, float slopeScale, float clamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthBias_slopeScale_clamp_), depthBias, slopeScale, clamp);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setDepthClipMode(MTL::DepthClipMode depthClipMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthClipMode_), depthClipMode);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setDepthStencilState(const MTL::DepthStencilState* depthStencilState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilState_), depthStencilState);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setFragmentBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setFrontFacingWinding(MTL::Winding frontFacingWindning)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFrontFacingWinding_), frontFacingWindning);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setMeshBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setObjectBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectThreadgroupMemoryLength_atIndex_), length, index);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setRenderPipelineState(const MTL::RenderPipelineState* pipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderPipelineState_), pipelineState);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setTriangleFillMode(MTL::TriangleFillMode fillMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleFillMode_), fillMode);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IndirectRenderCommand::setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_offset_attributeStride_atIndex_), buffer, offset, stride, index);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::clearBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(clearBarrier));
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::concurrentDispatchThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(concurrentDispatchThreadgroups_threadsPerThreadgroup_), threadgroupsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::concurrentDispatchThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(concurrentDispatchThreads_threadsPerThreadgroup_), threadsPerGrid, threadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBarrier));
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setComputePipelineState(const MTL::ComputePipelineState* pipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setComputePipelineState_), pipelineState);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setImageblockWidth(NS::UInteger width, NS::UInteger height)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setImageblockWidth_height_), width, height);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setKernelBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setKernelBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setKernelBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setKernelBuffer_offset_attributeStride_atIndex_), buffer, offset, stride, index);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setStageInRegion(MTL::Region region)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStageInRegion_), region);
-}
-
-_MTL_INLINE void MTL::IndirectComputeCommand::setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_atIndex_), length, index);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLIntersectionFunctionTable.hpp b/engine/thirdparty/metal-cpp/Metal/MTLIntersectionFunctionTable.hpp
deleted file mode 100644
index 436653b2..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLIntersectionFunctionTable.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLIntersectionFunctionTable.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Buffer;
-class FunctionHandle;
-class IntersectionFunctionTableDescriptor;
-class VisibleFunctionTable;
-
-_MTL_OPTIONS(NS::UInteger, IntersectionFunctionSignature) {
-    IntersectionFunctionSignatureNone = 0,
-    IntersectionFunctionSignatureInstancing = 1,
-    IntersectionFunctionSignatureTriangleData = 1 << 1,
-    IntersectionFunctionSignatureWorldSpaceData = 1 << 2,
-    IntersectionFunctionSignatureInstanceMotion = 1 << 3,
-    IntersectionFunctionSignaturePrimitiveMotion = 1 << 4,
-    IntersectionFunctionSignatureExtendedLimits = 1 << 5,
-    IntersectionFunctionSignatureMaxLevels = 1 << 6,
-    IntersectionFunctionSignatureCurveData = 1 << 7,
-    IntersectionFunctionSignatureIntersectionFunctionBuffer = 1 << 8,
-    IntersectionFunctionSignatureUserData = 1 << 9,
-};
-
-struct IntersectionFunctionBufferArguments
-{
-    uint64_t intersectionFunctionBuffer;
-    uint64_t intersectionFunctionBufferSize;
-    uint64_t intersectionFunctionStride;
-} _MTL_PACKED;
-
-class IntersectionFunctionTableDescriptor : public NS::Copying<IntersectionFunctionTableDescriptor>
-{
-public:
-    static IntersectionFunctionTableDescriptor* alloc();
-
-    NS::UInteger                                functionCount() const;
-
-    IntersectionFunctionTableDescriptor*        init();
-
-    static IntersectionFunctionTableDescriptor* intersectionFunctionTableDescriptor();
-
-    void                                        setFunctionCount(NS::UInteger functionCount);
-};
-class IntersectionFunctionTable : public NS::Referencing<IntersectionFunctionTable, Resource>
-{
-public:
-    ResourceID gpuResourceID() const;
-
-    void       setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void       setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range);
-
-    void       setFunction(const MTL::FunctionHandle* function, NS::UInteger index);
-    void       setFunctions(const MTL::FunctionHandle* const functions[], NS::Range range);
-
-    void       setOpaqueCurveIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::UInteger index);
-    void       setOpaqueCurveIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::Range range);
-
-    void       setOpaqueTriangleIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::UInteger index);
-    void       setOpaqueTriangleIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::Range range);
-
-    void       setVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex);
-    void       setVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range bufferRange);
-};
-
-}
-
-_MTL_INLINE MTL::IntersectionFunctionTableDescriptor* MTL::IntersectionFunctionTableDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::IntersectionFunctionTableDescriptor>(_MTL_PRIVATE_CLS(MTLIntersectionFunctionTableDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::IntersectionFunctionTableDescriptor::functionCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(functionCount));
-}
-
-_MTL_INLINE MTL::IntersectionFunctionTableDescriptor* MTL::IntersectionFunctionTableDescriptor::init()
-{
-    return NS::Object::init<MTL::IntersectionFunctionTableDescriptor>();
-}
-
-_MTL_INLINE MTL::IntersectionFunctionTableDescriptor* MTL::IntersectionFunctionTableDescriptor::intersectionFunctionTableDescriptor()
-{
-    return Object::sendMessage<MTL::IntersectionFunctionTableDescriptor*>(_MTL_PRIVATE_CLS(MTLIntersectionFunctionTableDescriptor), _MTL_PRIVATE_SEL(intersectionFunctionTableDescriptor));
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTableDescriptor::setFunctionCount(NS::UInteger functionCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionCount_), functionCount);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::IntersectionFunctionTable::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setFunction(const MTL::FunctionHandle* function, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunction_atIndex_), function, index);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setFunctions(const MTL::FunctionHandle* const functions[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctions_withRange_), functions, range);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setOpaqueCurveIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaqueCurveIntersectionFunctionWithSignature_atIndex_), signature, index);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setOpaqueCurveIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaqueCurveIntersectionFunctionWithSignature_withRange_), signature, range);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setOpaqueTriangleIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaqueTriangleIntersectionFunctionWithSignature_atIndex_), signature, index);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setOpaqueTriangleIntersectionFunction(MTL::IntersectionFunctionSignature signature, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOpaqueTriangleIntersectionFunctionWithSignature_withRange_), signature, range);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTable_atBufferIndex_), functionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::IntersectionFunctionTable::setVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range bufferRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibleFunctionTables_withBufferRange_), functionTables, bufferRange);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLLibrary.hpp b/engine/thirdparty/metal-cpp/Metal/MTLLibrary.hpp
deleted file mode 100644
index 44aa3a7a..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLLibrary.hpp
+++ /dev/null
@@ -1,786 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLLibrary.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDataType.hpp"
-#include "MTLDefines.hpp"
-#include "MTLFunctionDescriptor.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Argument;
-class ArgumentEncoder;
-class Attribute;
-class CompileOptions;
-class Device;
-class Function;
-class FunctionConstant;
-class FunctionConstantValues;
-class FunctionDescriptor;
-class FunctionReflection;
-class IntersectionFunctionDescriptor;
-class VertexAttribute;
-_MTL_ENUM(NS::UInteger, PatchType) {
-    PatchTypeNone = 0,
-    PatchTypeTriangle = 1,
-    PatchTypeQuad = 2,
-};
-
-_MTL_ENUM(NS::UInteger, FunctionType) {
-    FunctionTypeVertex = 1,
-    FunctionTypeFragment = 2,
-    FunctionTypeKernel = 3,
-    FunctionTypeVisible = 5,
-    FunctionTypeIntersection = 6,
-    FunctionTypeMesh = 7,
-    FunctionTypeObject = 8,
-};
-
-_MTL_ENUM(NS::UInteger, LanguageVersion) {
-    LanguageVersion1_0 = 65536,
-    LanguageVersion1_1 = 65537,
-    LanguageVersion1_2 = 65538,
-    LanguageVersion2_0 = 131072,
-    LanguageVersion2_1 = 131073,
-    LanguageVersion2_2 = 131074,
-    LanguageVersion2_3 = 131075,
-    LanguageVersion2_4 = 131076,
-    LanguageVersion3_0 = 196608,
-    LanguageVersion3_1 = 196609,
-    LanguageVersion3_2 = 196610,
-    LanguageVersion4_0 = 262144,
-};
-
-_MTL_ENUM(NS::Integer, LibraryType) {
-    LibraryTypeExecutable = 0,
-    LibraryTypeDynamic = 1,
-};
-
-_MTL_ENUM(NS::Integer, LibraryOptimizationLevel) {
-    LibraryOptimizationLevelDefault = 0,
-    LibraryOptimizationLevelSize = 1,
-};
-
-_MTL_ENUM(NS::Integer, CompileSymbolVisibility) {
-    CompileSymbolVisibilityDefault = 0,
-    CompileSymbolVisibilityHidden = 1,
-};
-
-_MTL_ENUM(NS::Integer, MathMode) {
-    MathModeSafe = 0,
-    MathModeRelaxed = 1,
-    MathModeFast = 2,
-};
-
-_MTL_ENUM(NS::Integer, MathFloatingPointFunctions) {
-    MathFloatingPointFunctionsFast = 0,
-    MathFloatingPointFunctionsPrecise = 1,
-};
-
-_MTL_ENUM(NS::UInteger, LibraryError) {
-    LibraryErrorUnsupported = 1,
-    LibraryErrorInternal = 2,
-    LibraryErrorCompileFailure = 3,
-    LibraryErrorCompileWarning = 4,
-    LibraryErrorFunctionNotFound = 5,
-    LibraryErrorFileNotFound = 6,
-};
-
-using AutoreleasedArgument = MTL::Argument*;
-using FunctionCompletionHandlerFunction = std::function<void(MTL::Function* pFunction, NS::Error* pError)>;
-
-class VertexAttribute : public NS::Referencing<VertexAttribute>
-{
-public:
-    [[deprecated("please use isActive instead")]]
-    bool                    active() const;
-
-    static VertexAttribute* alloc();
-
-    NS::UInteger            attributeIndex() const;
-
-    DataType                attributeType() const;
-
-    VertexAttribute*        init();
-
-    bool                    isActive() const;
-
-    bool                    isPatchControlPointData() const;
-
-    bool                    isPatchData() const;
-
-    NS::String*             name() const;
-
-    [[deprecated("please use isPatchControlPointData instead")]]
-    bool patchControlPointData() const;
-
-    [[deprecated("please use isPatchData instead")]]
-    bool patchData() const;
-};
-class Attribute : public NS::Referencing<Attribute>
-{
-public:
-    [[deprecated("please use isActive instead")]]
-    bool              active() const;
-
-    static Attribute* alloc();
-
-    NS::UInteger      attributeIndex() const;
-
-    DataType          attributeType() const;
-
-    Attribute*        init();
-
-    bool              isActive() const;
-
-    bool              isPatchControlPointData() const;
-
-    bool              isPatchData() const;
-
-    NS::String*       name() const;
-
-    [[deprecated("please use isPatchControlPointData instead")]]
-    bool patchControlPointData() const;
-
-    [[deprecated("please use isPatchData instead")]]
-    bool patchData() const;
-};
-class FunctionConstant : public NS::Referencing<FunctionConstant>
-{
-public:
-    static FunctionConstant* alloc();
-
-    NS::UInteger             index() const;
-
-    FunctionConstant*        init();
-
-    NS::String*              name() const;
-
-    bool                     required() const;
-
-    DataType                 type() const;
-};
-class Function : public NS::Referencing<Function>
-{
-public:
-    Device*          device() const;
-
-    NS::Dictionary*  functionConstantsDictionary() const;
-
-    FunctionType     functionType() const;
-
-    NS::String*      label() const;
-
-    NS::String*      name() const;
-
-    ArgumentEncoder* newArgumentEncoder(NS::UInteger bufferIndex);
-    ArgumentEncoder* newArgumentEncoder(NS::UInteger bufferIndex, const MTL::AutoreleasedArgument* reflection);
-
-    FunctionOptions  options() const;
-
-    NS::Integer      patchControlPointCount() const;
-
-    PatchType        patchType() const;
-
-    void             setLabel(const NS::String* label);
-
-    NS::Array*       stageInputAttributes() const;
-
-    NS::Array*       vertexAttributes() const;
-};
-class CompileOptions : public NS::Copying<CompileOptions>
-{
-public:
-    static CompileOptions*     alloc();
-
-    bool                       allowReferencingUndefinedSymbols() const;
-
-    CompileSymbolVisibility    compileSymbolVisibility() const;
-
-    bool                       enableLogging() const;
-
-    bool                       fastMathEnabled() const;
-
-    CompileOptions*            init();
-
-    NS::String*                installName() const;
-
-    LanguageVersion            languageVersion() const;
-
-    NS::Array*                 libraries() const;
-
-    LibraryType                libraryType() const;
-
-    MathFloatingPointFunctions mathFloatingPointFunctions() const;
-
-    MathMode                   mathMode() const;
-
-    NS::UInteger               maxTotalThreadsPerThreadgroup() const;
-
-    LibraryOptimizationLevel   optimizationLevel() const;
-
-    NS::Dictionary*            preprocessorMacros() const;
-
-    bool                       preserveInvariance() const;
-
-    Size                       requiredThreadsPerThreadgroup() const;
-
-    void                       setAllowReferencingUndefinedSymbols(bool allowReferencingUndefinedSymbols);
-
-    void                       setCompileSymbolVisibility(MTL::CompileSymbolVisibility compileSymbolVisibility);
-
-    void                       setEnableLogging(bool enableLogging);
-
-    void                       setFastMathEnabled(bool fastMathEnabled);
-
-    void                       setInstallName(const NS::String* installName);
-
-    void                       setLanguageVersion(MTL::LanguageVersion languageVersion);
-
-    void                       setLibraries(const NS::Array* libraries);
-
-    void                       setLibraryType(MTL::LibraryType libraryType);
-
-    void                       setMathFloatingPointFunctions(MTL::MathFloatingPointFunctions mathFloatingPointFunctions);
-
-    void                       setMathMode(MTL::MathMode mathMode);
-
-    void                       setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup);
-
-    void                       setOptimizationLevel(MTL::LibraryOptimizationLevel optimizationLevel);
-
-    void                       setPreprocessorMacros(const NS::Dictionary* preprocessorMacros);
-
-    void                       setPreserveInvariance(bool preserveInvariance);
-
-    void                       setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup);
-};
-class FunctionReflection : public NS::Referencing<FunctionReflection>
-{
-public:
-    static FunctionReflection* alloc();
-
-    NS::Array*                 bindings() const;
-
-    FunctionReflection*        init();
-};
-class Library : public NS::Referencing<Library>
-{
-public:
-    Device*             device() const;
-
-    NS::Array*          functionNames() const;
-
-    NS::String*         installName() const;
-
-    NS::String*         label() const;
-
-    Function*           newFunction(const NS::String* functionName);
-    Function*           newFunction(const NS::String* name, const MTL::FunctionConstantValues* constantValues, NS::Error** error);
-    void                newFunction(const NS::String* name, const MTL::FunctionConstantValues* constantValues, void (^completionHandler)(MTL::Function*, NS::Error*));
-    void                newFunction(const MTL::FunctionDescriptor* descriptor, void (^completionHandler)(MTL::Function*, NS::Error*));
-    Function*           newFunction(const MTL::FunctionDescriptor* descriptor, NS::Error** error);
-    void                newFunction(const NS::String* pFunctionName, const MTL::FunctionConstantValues* pConstantValues, const MTL::FunctionCompletionHandlerFunction& completionHandler);
-    void                newFunction(const MTL::FunctionDescriptor* pDescriptor, const MTL::FunctionCompletionHandlerFunction& completionHandler);
-
-    void                newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* descriptor, void (^completionHandler)(MTL::Function*, NS::Error*));
-    Function*           newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* descriptor, NS::Error** error);
-    void                newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* pDescriptor, const MTL::FunctionCompletionHandlerFunction& completionHandler);
-
-    FunctionReflection* reflectionForFunction(const NS::String* functionName);
-
-    void                setLabel(const NS::String* label);
-
-    LibraryType         type() const;
-};
-
-}
-_MTL_INLINE bool MTL::VertexAttribute::active() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE MTL::VertexAttribute* MTL::VertexAttribute::alloc()
-{
-    return NS::Object::alloc<MTL::VertexAttribute>(_MTL_PRIVATE_CLS(MTLVertexAttribute));
-}
-
-_MTL_INLINE NS::UInteger MTL::VertexAttribute::attributeIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(attributeIndex));
-}
-
-_MTL_INLINE MTL::DataType MTL::VertexAttribute::attributeType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(attributeType));
-}
-
-_MTL_INLINE MTL::VertexAttribute* MTL::VertexAttribute::init()
-{
-    return NS::Object::init<MTL::VertexAttribute>();
-}
-
-_MTL_INLINE bool MTL::VertexAttribute::isActive() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE bool MTL::VertexAttribute::isPatchControlPointData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchControlPointData));
-}
-
-_MTL_INLINE bool MTL::VertexAttribute::isPatchData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchData));
-}
-
-_MTL_INLINE NS::String* MTL::VertexAttribute::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE bool MTL::VertexAttribute::patchControlPointData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchControlPointData));
-}
-
-_MTL_INLINE bool MTL::VertexAttribute::patchData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchData));
-}
-
-_MTL_INLINE bool MTL::Attribute::active() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE MTL::Attribute* MTL::Attribute::alloc()
-{
-    return NS::Object::alloc<MTL::Attribute>(_MTL_PRIVATE_CLS(MTLAttribute));
-}
-
-_MTL_INLINE NS::UInteger MTL::Attribute::attributeIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(attributeIndex));
-}
-
-_MTL_INLINE MTL::DataType MTL::Attribute::attributeType() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(attributeType));
-}
-
-_MTL_INLINE MTL::Attribute* MTL::Attribute::init()
-{
-    return NS::Object::init<MTL::Attribute>();
-}
-
-_MTL_INLINE bool MTL::Attribute::isActive() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isActive));
-}
-
-_MTL_INLINE bool MTL::Attribute::isPatchControlPointData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchControlPointData));
-}
-
-_MTL_INLINE bool MTL::Attribute::isPatchData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchData));
-}
-
-_MTL_INLINE NS::String* MTL::Attribute::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE bool MTL::Attribute::patchControlPointData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchControlPointData));
-}
-
-_MTL_INLINE bool MTL::Attribute::patchData() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isPatchData));
-}
-
-_MTL_INLINE MTL::FunctionConstant* MTL::FunctionConstant::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionConstant>(_MTL_PRIVATE_CLS(MTLFunctionConstant));
-}
-
-_MTL_INLINE NS::UInteger MTL::FunctionConstant::index() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(index));
-}
-
-_MTL_INLINE MTL::FunctionConstant* MTL::FunctionConstant::init()
-{
-    return NS::Object::init<MTL::FunctionConstant>();
-}
-
-_MTL_INLINE NS::String* MTL::FunctionConstant::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE bool MTL::FunctionConstant::required() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(required));
-}
-
-_MTL_INLINE MTL::DataType MTL::FunctionConstant::type() const
-{
-    return Object::sendMessage<MTL::DataType>(this, _MTL_PRIVATE_SEL(type));
-}
-
-_MTL_INLINE MTL::Device* MTL::Function::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::Dictionary* MTL::Function::functionConstantsDictionary() const
-{
-    return Object::sendMessage<NS::Dictionary*>(this, _MTL_PRIVATE_SEL(functionConstantsDictionary));
-}
-
-_MTL_INLINE MTL::FunctionType MTL::Function::functionType() const
-{
-    return Object::sendMessage<MTL::FunctionType>(this, _MTL_PRIVATE_SEL(functionType));
-}
-
-_MTL_INLINE NS::String* MTL::Function::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::String* MTL::Function::name() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(name));
-}
-
-_MTL_INLINE MTL::ArgumentEncoder* MTL::Function::newArgumentEncoder(NS::UInteger bufferIndex)
-{
-    return Object::sendMessage<MTL::ArgumentEncoder*>(this, _MTL_PRIVATE_SEL(newArgumentEncoderWithBufferIndex_), bufferIndex);
-}
-
-_MTL_INLINE MTL::ArgumentEncoder* MTL::Function::newArgumentEncoder(NS::UInteger bufferIndex, const MTL::AutoreleasedArgument* reflection)
-{
-    return Object::sendMessage<MTL::ArgumentEncoder*>(this, _MTL_PRIVATE_SEL(newArgumentEncoderWithBufferIndex_reflection_), bufferIndex, reflection);
-}
-
-_MTL_INLINE MTL::FunctionOptions MTL::Function::options() const
-{
-    return Object::sendMessage<MTL::FunctionOptions>(this, _MTL_PRIVATE_SEL(options));
-}
-
-_MTL_INLINE NS::Integer MTL::Function::patchControlPointCount() const
-{
-    return Object::sendMessage<NS::Integer>(this, _MTL_PRIVATE_SEL(patchControlPointCount));
-}
-
-_MTL_INLINE MTL::PatchType MTL::Function::patchType() const
-{
-    return Object::sendMessage<MTL::PatchType>(this, _MTL_PRIVATE_SEL(patchType));
-}
-
-_MTL_INLINE void MTL::Function::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE NS::Array* MTL::Function::stageInputAttributes() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(stageInputAttributes));
-}
-
-_MTL_INLINE NS::Array* MTL::Function::vertexAttributes() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexAttributes));
-}
-
-_MTL_INLINE MTL::CompileOptions* MTL::CompileOptions::alloc()
-{
-    return NS::Object::alloc<MTL::CompileOptions>(_MTL_PRIVATE_CLS(MTLCompileOptions));
-}
-
-_MTL_INLINE bool MTL::CompileOptions::allowReferencingUndefinedSymbols() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(allowReferencingUndefinedSymbols));
-}
-
-_MTL_INLINE MTL::CompileSymbolVisibility MTL::CompileOptions::compileSymbolVisibility() const
-{
-    return Object::sendMessage<MTL::CompileSymbolVisibility>(this, _MTL_PRIVATE_SEL(compileSymbolVisibility));
-}
-
-_MTL_INLINE bool MTL::CompileOptions::enableLogging() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(enableLogging));
-}
-
-_MTL_INLINE bool MTL::CompileOptions::fastMathEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(fastMathEnabled));
-}
-
-_MTL_INLINE MTL::CompileOptions* MTL::CompileOptions::init()
-{
-    return NS::Object::init<MTL::CompileOptions>();
-}
-
-_MTL_INLINE NS::String* MTL::CompileOptions::installName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(installName));
-}
-
-_MTL_INLINE MTL::LanguageVersion MTL::CompileOptions::languageVersion() const
-{
-    return Object::sendMessage<MTL::LanguageVersion>(this, _MTL_PRIVATE_SEL(languageVersion));
-}
-
-_MTL_INLINE NS::Array* MTL::CompileOptions::libraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(libraries));
-}
-
-_MTL_INLINE MTL::LibraryType MTL::CompileOptions::libraryType() const
-{
-    return Object::sendMessage<MTL::LibraryType>(this, _MTL_PRIVATE_SEL(libraryType));
-}
-
-_MTL_INLINE MTL::MathFloatingPointFunctions MTL::CompileOptions::mathFloatingPointFunctions() const
-{
-    return Object::sendMessage<MTL::MathFloatingPointFunctions>(this, _MTL_PRIVATE_SEL(mathFloatingPointFunctions));
-}
-
-_MTL_INLINE MTL::MathMode MTL::CompileOptions::mathMode() const
-{
-    return Object::sendMessage<MTL::MathMode>(this, _MTL_PRIVATE_SEL(mathMode));
-}
-
-_MTL_INLINE NS::UInteger MTL::CompileOptions::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE MTL::LibraryOptimizationLevel MTL::CompileOptions::optimizationLevel() const
-{
-    return Object::sendMessage<MTL::LibraryOptimizationLevel>(this, _MTL_PRIVATE_SEL(optimizationLevel));
-}
-
-_MTL_INLINE NS::Dictionary* MTL::CompileOptions::preprocessorMacros() const
-{
-    return Object::sendMessage<NS::Dictionary*>(this, _MTL_PRIVATE_SEL(preprocessorMacros));
-}
-
-_MTL_INLINE bool MTL::CompileOptions::preserveInvariance() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(preserveInvariance));
-}
-
-_MTL_INLINE MTL::Size MTL::CompileOptions::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE void MTL::CompileOptions::setAllowReferencingUndefinedSymbols(bool allowReferencingUndefinedSymbols)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAllowReferencingUndefinedSymbols_), allowReferencingUndefinedSymbols);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setCompileSymbolVisibility(MTL::CompileSymbolVisibility compileSymbolVisibility)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCompileSymbolVisibility_), compileSymbolVisibility);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setEnableLogging(bool enableLogging)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEnableLogging_), enableLogging);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setFastMathEnabled(bool fastMathEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFastMathEnabled_), fastMathEnabled);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setInstallName(const NS::String* installName)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInstallName_), installName);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setLanguageVersion(MTL::LanguageVersion languageVersion)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLanguageVersion_), languageVersion);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setLibraries(const NS::Array* libraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLibraries_), libraries);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setLibraryType(MTL::LibraryType libraryType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLibraryType_), libraryType);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setMathFloatingPointFunctions(MTL::MathFloatingPointFunctions mathFloatingPointFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMathFloatingPointFunctions_), mathFloatingPointFunctions);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setMathMode(MTL::MathMode mathMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMathMode_), mathMode);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerThreadgroup_), maxTotalThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setOptimizationLevel(MTL::LibraryOptimizationLevel optimizationLevel)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOptimizationLevel_), optimizationLevel);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setPreprocessorMacros(const NS::Dictionary* preprocessorMacros)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPreprocessorMacros_), preprocessorMacros);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setPreserveInvariance(bool preserveInvariance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPreserveInvariance_), preserveInvariance);
-}
-
-_MTL_INLINE void MTL::CompileOptions::setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerThreadgroup_), requiredThreadsPerThreadgroup);
-}
-
-_MTL_INLINE MTL::FunctionReflection* MTL::FunctionReflection::alloc()
-{
-    return NS::Object::alloc<MTL::FunctionReflection>(_MTL_PRIVATE_CLS(MTLFunctionReflection));
-}
-
-_MTL_INLINE NS::Array* MTL::FunctionReflection::bindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(bindings));
-}
-
-_MTL_INLINE MTL::FunctionReflection* MTL::FunctionReflection::init()
-{
-    return NS::Object::init<MTL::FunctionReflection>();
-}
-
-_MTL_INLINE MTL::Device* MTL::Library::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::Array* MTL::Library::functionNames() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functionNames));
-}
-
-_MTL_INLINE NS::String* MTL::Library::installName() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(installName));
-}
-
-_MTL_INLINE NS::String* MTL::Library::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::Function* MTL::Library::newFunction(const NS::String* functionName)
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(newFunctionWithName_), functionName);
-}
-
-_MTL_INLINE MTL::Function* MTL::Library::newFunction(const NS::String* name, const MTL::FunctionConstantValues* constantValues, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(newFunctionWithName_constantValues_error_), name, constantValues, error);
-}
-
-_MTL_INLINE void MTL::Library::newFunction(const NS::String* name, const MTL::FunctionConstantValues* constantValues, void (^completionHandler)(MTL::Function*, NS::Error*))
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newFunctionWithName_constantValues_completionHandler_), name, constantValues, completionHandler);
-}
-
-_MTL_INLINE void MTL::Library::newFunction(const MTL::FunctionDescriptor* descriptor, void (^completionHandler)(MTL::Function*, NS::Error*))
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newFunctionWithDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE MTL::Function* MTL::Library::newFunction(const MTL::FunctionDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(newFunctionWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE void MTL::Library::newFunction(const NS::String* pFunctionName, const MTL::FunctionConstantValues* pConstantValues, const MTL::FunctionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::FunctionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newFunction(pFunctionName, pConstantValues, ^(MTL::Function* pFunction, NS::Error* pError) { blockCompletionHandler(pFunction, pError); });
-}
-
-_MTL_INLINE void MTL::Library::newFunction(const MTL::FunctionDescriptor* pDescriptor, const MTL::FunctionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::FunctionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newFunction(pDescriptor, ^(MTL::Function* pFunction, NS::Error* pError) { blockCompletionHandler(pFunction, pError); });
-}
-
-_MTL_INLINE void MTL::Library::newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* descriptor, void (^completionHandler)(MTL::Function*, NS::Error*))
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(newIntersectionFunctionWithDescriptor_completionHandler_), descriptor, completionHandler);
-}
-
-_MTL_INLINE MTL::Function* MTL::Library::newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* descriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(newIntersectionFunctionWithDescriptor_error_), descriptor, error);
-}
-
-_MTL_INLINE void MTL::Library::newIntersectionFunction(const MTL::IntersectionFunctionDescriptor* pDescriptor, const MTL::FunctionCompletionHandlerFunction& completionHandler)
-{
-    __block MTL::FunctionCompletionHandlerFunction blockCompletionHandler = completionHandler;
-    newIntersectionFunction(pDescriptor, ^(MTL::Function* pFunction, NS::Error* pError) { blockCompletionHandler(pFunction, pError); });
-}
-
-_MTL_INLINE MTL::FunctionReflection* MTL::Library::reflectionForFunction(const NS::String* functionName)
-{
-    return Object::sendMessage<MTL::FunctionReflection*>(this, _MTL_PRIVATE_SEL(reflectionForFunctionWithName_), functionName);
-}
-
-_MTL_INLINE void MTL::Library::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE MTL::LibraryType MTL::Library::type() const
-{
-    return Object::sendMessage<MTL::LibraryType>(this, _MTL_PRIVATE_SEL(type));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLLinkedFunctions.hpp b/engine/thirdparty/metal-cpp/Metal/MTLLinkedFunctions.hpp
deleted file mode 100644
index 4b1bd953..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLLinkedFunctions.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLLinkedFunctions.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-
-class LinkedFunctions : public NS::Copying<LinkedFunctions>
-{
-public:
-    static LinkedFunctions* alloc();
-
-    NS::Array*              binaryFunctions() const;
-    NS::Array*              functions() const;
-
-    NS::Dictionary*         groups() const;
-
-    LinkedFunctions*        init();
-
-    static LinkedFunctions* linkedFunctions();
-
-    NS::Array*              privateFunctions() const;
-
-    void                    setBinaryFunctions(const NS::Array* binaryFunctions);
-
-    void                    setFunctions(const NS::Array* functions);
-
-    void                    setGroups(const NS::Dictionary* groups);
-
-    void                    setPrivateFunctions(const NS::Array* privateFunctions);
-};
-
-}
-_MTL_INLINE MTL::LinkedFunctions* MTL::LinkedFunctions::alloc()
-{
-    return NS::Object::alloc<MTL::LinkedFunctions>(_MTL_PRIVATE_CLS(MTLLinkedFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::LinkedFunctions::binaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::LinkedFunctions::functions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(functions));
-}
-
-_MTL_INLINE NS::Dictionary* MTL::LinkedFunctions::groups() const
-{
-    return Object::sendMessage<NS::Dictionary*>(this, _MTL_PRIVATE_SEL(groups));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::LinkedFunctions::init()
-{
-    return NS::Object::init<MTL::LinkedFunctions>();
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::LinkedFunctions::linkedFunctions()
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(_MTL_PRIVATE_CLS(MTLLinkedFunctions), _MTL_PRIVATE_SEL(linkedFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::LinkedFunctions::privateFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(privateFunctions));
-}
-
-_MTL_INLINE void MTL::LinkedFunctions::setBinaryFunctions(const NS::Array* binaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryFunctions_), binaryFunctions);
-}
-
-_MTL_INLINE void MTL::LinkedFunctions::setFunctions(const NS::Array* functions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctions_), functions);
-}
-
-_MTL_INLINE void MTL::LinkedFunctions::setGroups(const NS::Dictionary* groups)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setGroups_), groups);
-}
-
-_MTL_INLINE void MTL::LinkedFunctions::setPrivateFunctions(const NS::Array* privateFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPrivateFunctions_), privateFunctions);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLLogState.hpp b/engine/thirdparty/metal-cpp/Metal/MTLLogState.hpp
deleted file mode 100644
index b802adf3..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLLogState.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLLogState.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class LogStateDescriptor;
-_MTL_ENUM(NS::Integer, LogLevel) {
-    LogLevelUndefined = 0,
-    LogLevelDebug = 1,
-    LogLevelInfo = 2,
-    LogLevelNotice = 3,
-    LogLevelError = 4,
-    LogLevelFault = 5,
-};
-
-_MTL_ENUM(NS::UInteger, LogStateError) {
-    LogStateErrorInvalidSize = 1,
-    LogStateErrorInvalid = 2,
-};
-
-using LogHandlerFunction = std::function<void(NS::String* subsystem, NS::String* category, MTL::LogLevel logLevel, NS::String* message)>;
-
-_MTL_CONST(NS::ErrorDomain, LogStateErrorDomain);
-class LogState : public NS::Referencing<LogState>
-{
-public:
-    void addLogHandler(void (^block)(NS::String*, NS::String*, MTL::LogLevel, NS::String*));
-    void addLogHandler(const MTL::LogHandlerFunction& handler);
-};
-class LogStateDescriptor : public NS::Copying<LogStateDescriptor>
-{
-public:
-    static LogStateDescriptor* alloc();
-
-    NS::Integer                bufferSize() const;
-
-    LogStateDescriptor*        init();
-
-    LogLevel                   level() const;
-
-    void                       setBufferSize(NS::Integer bufferSize);
-
-    void                       setLevel(MTL::LogLevel level);
-};
-
-}
-_MTL_PRIVATE_DEF_CONST(NS::ErrorDomain, LogStateErrorDomain);
-_MTL_INLINE void MTL::LogState::addLogHandler(void (^block)(NS::String*, NS::String*, MTL::LogLevel, NS::String*))
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addLogHandler_), block);
-}
-
-_MTL_INLINE void MTL::LogState::addLogHandler(const MTL::LogHandlerFunction& handler)
-{
-    __block LogHandlerFunction function = handler;
-    addLogHandler(^void(NS::String* subsystem, NS::String* category, MTL::LogLevel logLevel, NS::String* message) { function(subsystem, category, logLevel, message); });
-}
-
-_MTL_INLINE MTL::LogStateDescriptor* MTL::LogStateDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::LogStateDescriptor>(_MTL_PRIVATE_CLS(MTLLogStateDescriptor));
-}
-
-_MTL_INLINE NS::Integer MTL::LogStateDescriptor::bufferSize() const
-{
-    return Object::sendMessage<NS::Integer>(this, _MTL_PRIVATE_SEL(bufferSize));
-}
-
-_MTL_INLINE MTL::LogStateDescriptor* MTL::LogStateDescriptor::init()
-{
-    return NS::Object::init<MTL::LogStateDescriptor>();
-}
-
-_MTL_INLINE MTL::LogLevel MTL::LogStateDescriptor::level() const
-{
-    return Object::sendMessage<MTL::LogLevel>(this, _MTL_PRIVATE_SEL(level));
-}
-
-_MTL_INLINE void MTL::LogStateDescriptor::setBufferSize(NS::Integer bufferSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBufferSize_), bufferSize);
-}
-
-_MTL_INLINE void MTL::LogStateDescriptor::setLevel(MTL::LogLevel level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLevel_), level);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLParallelRenderCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLParallelRenderCommandEncoder.hpp
deleted file mode 100644
index 8c345126..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLParallelRenderCommandEncoder.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLParallelRenderCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderPass.hpp"
-
-namespace MTL
-{
-class RenderCommandEncoder;
-
-class ParallelRenderCommandEncoder : public NS::Referencing<ParallelRenderCommandEncoder, CommandEncoder>
-{
-public:
-    RenderCommandEncoder* renderCommandEncoder();
-
-    void                  setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex);
-    void                  setColorStoreActionOptions(MTL::StoreActionOptions storeActionOptions, NS::UInteger colorAttachmentIndex);
-
-    void                  setDepthStoreAction(MTL::StoreAction storeAction);
-    void                  setDepthStoreActionOptions(MTL::StoreActionOptions storeActionOptions);
-
-    void                  setStencilStoreAction(MTL::StoreAction storeAction);
-    void                  setStencilStoreActionOptions(MTL::StoreActionOptions storeActionOptions);
-};
-
-}
-_MTL_INLINE MTL::RenderCommandEncoder* MTL::ParallelRenderCommandEncoder::renderCommandEncoder()
-{
-    return Object::sendMessage<MTL::RenderCommandEncoder*>(this, _MTL_PRIVATE_SEL(renderCommandEncoder));
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorStoreAction_atIndex_), storeAction, colorAttachmentIndex);
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setColorStoreActionOptions(MTL::StoreActionOptions storeActionOptions, NS::UInteger colorAttachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorStoreActionOptions_atIndex_), storeActionOptions, colorAttachmentIndex);
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setDepthStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setDepthStoreActionOptions(MTL::StoreActionOptions storeActionOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStoreActionOptions_), storeActionOptions);
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setStencilStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL::ParallelRenderCommandEncoder::setStencilStoreActionOptions(MTL::StoreActionOptions storeActionOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilStoreActionOptions_), storeActionOptions);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTLPipeline.hpp
deleted file mode 100644
index 930bb7eb..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLPipeline.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class PipelineBufferDescriptor;
-class PipelineBufferDescriptorArray;
-_MTL_ENUM(NS::UInteger, Mutability) {
-    MutabilityDefault = 0,
-    MutabilityMutable = 1,
-    MutabilityImmutable = 2,
-};
-
-_MTL_ENUM(NS::Integer, ShaderValidation) {
-    ShaderValidationDefault = 0,
-    ShaderValidationEnabled = 1,
-    ShaderValidationDisabled = 2,
-};
-
-class PipelineBufferDescriptor : public NS::Copying<PipelineBufferDescriptor>
-{
-public:
-    static PipelineBufferDescriptor* alloc();
-
-    PipelineBufferDescriptor*        init();
-
-    Mutability                       mutability() const;
-    void                             setMutability(MTL::Mutability mutability);
-};
-class PipelineBufferDescriptorArray : public NS::Referencing<PipelineBufferDescriptorArray>
-{
-public:
-    static PipelineBufferDescriptorArray* alloc();
-
-    PipelineBufferDescriptorArray*        init();
-
-    PipelineBufferDescriptor*             object(NS::UInteger bufferIndex);
-    void                                  setObject(const MTL::PipelineBufferDescriptor* buffer, NS::UInteger bufferIndex);
-};
-
-}
-_MTL_INLINE MTL::PipelineBufferDescriptor* MTL::PipelineBufferDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::PipelineBufferDescriptor>(_MTL_PRIVATE_CLS(MTLPipelineBufferDescriptor));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptor* MTL::PipelineBufferDescriptor::init()
-{
-    return NS::Object::init<MTL::PipelineBufferDescriptor>();
-}
-
-_MTL_INLINE MTL::Mutability MTL::PipelineBufferDescriptor::mutability() const
-{
-    return Object::sendMessage<MTL::Mutability>(this, _MTL_PRIVATE_SEL(mutability));
-}
-
-_MTL_INLINE void MTL::PipelineBufferDescriptor::setMutability(MTL::Mutability mutability)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMutability_), mutability);
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::PipelineBufferDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::PipelineBufferDescriptorArray>(_MTL_PRIVATE_CLS(MTLPipelineBufferDescriptorArray));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::PipelineBufferDescriptorArray::init()
-{
-    return NS::Object::init<MTL::PipelineBufferDescriptorArray>();
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptor* MTL::PipelineBufferDescriptorArray::object(NS::UInteger bufferIndex)
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), bufferIndex);
-}
-
-_MTL_INLINE void MTL::PipelineBufferDescriptorArray::setObject(const MTL::PipelineBufferDescriptor* buffer, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), buffer, bufferIndex);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLPixelFormat.hpp b/engine/thirdparty/metal-cpp/Metal/MTLPixelFormat.hpp
deleted file mode 100644
index 6d5d886c..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLPixelFormat.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLPixelFormat.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-_MTL_ENUM(NS::UInteger, PixelFormat) {
-    PixelFormatInvalid = 0,
-    PixelFormatA8Unorm = 1,
-    PixelFormatR8Unorm = 10,
-    PixelFormatR8Unorm_sRGB = 11,
-    PixelFormatR8Snorm = 12,
-    PixelFormatR8Uint = 13,
-    PixelFormatR8Sint = 14,
-    PixelFormatR16Unorm = 20,
-    PixelFormatR16Snorm = 22,
-    PixelFormatR16Uint = 23,
-    PixelFormatR16Sint = 24,
-    PixelFormatR16Float = 25,
-    PixelFormatRG8Unorm = 30,
-    PixelFormatRG8Unorm_sRGB = 31,
-    PixelFormatRG8Snorm = 32,
-    PixelFormatRG8Uint = 33,
-    PixelFormatRG8Sint = 34,
-    PixelFormatB5G6R5Unorm = 40,
-    PixelFormatA1BGR5Unorm = 41,
-    PixelFormatABGR4Unorm = 42,
-    PixelFormatBGR5A1Unorm = 43,
-    PixelFormatR32Uint = 53,
-    PixelFormatR32Sint = 54,
-    PixelFormatR32Float = 55,
-    PixelFormatRG16Unorm = 60,
-    PixelFormatRG16Snorm = 62,
-    PixelFormatRG16Uint = 63,
-    PixelFormatRG16Sint = 64,
-    PixelFormatRG16Float = 65,
-    PixelFormatRGBA8Unorm = 70,
-    PixelFormatRGBA8Unorm_sRGB = 71,
-    PixelFormatRGBA8Snorm = 72,
-    PixelFormatRGBA8Uint = 73,
-    PixelFormatRGBA8Sint = 74,
-    PixelFormatBGRA8Unorm = 80,
-    PixelFormatBGRA8Unorm_sRGB = 81,
-    PixelFormatRGB10A2Unorm = 90,
-    PixelFormatRGB10A2Uint = 91,
-    PixelFormatRG11B10Float = 92,
-    PixelFormatRGB9E5Float = 93,
-    PixelFormatBGR10A2Unorm = 94,
-    PixelFormatBGR10_XR = 554,
-    PixelFormatBGR10_XR_sRGB = 555,
-    PixelFormatRG32Uint = 103,
-    PixelFormatRG32Sint = 104,
-    PixelFormatRG32Float = 105,
-    PixelFormatRGBA16Unorm = 110,
-    PixelFormatRGBA16Snorm = 112,
-    PixelFormatRGBA16Uint = 113,
-    PixelFormatRGBA16Sint = 114,
-    PixelFormatRGBA16Float = 115,
-    PixelFormatBGRA10_XR = 552,
-    PixelFormatBGRA10_XR_sRGB = 553,
-    PixelFormatRGBA32Uint = 123,
-    PixelFormatRGBA32Sint = 124,
-    PixelFormatRGBA32Float = 125,
-    PixelFormatBC1_RGBA = 130,
-    PixelFormatBC1_RGBA_sRGB = 131,
-    PixelFormatBC2_RGBA = 132,
-    PixelFormatBC2_RGBA_sRGB = 133,
-    PixelFormatBC3_RGBA = 134,
-    PixelFormatBC3_RGBA_sRGB = 135,
-    PixelFormatBC4_RUnorm = 140,
-    PixelFormatBC4_RSnorm = 141,
-    PixelFormatBC5_RGUnorm = 142,
-    PixelFormatBC5_RGSnorm = 143,
-    PixelFormatBC6H_RGBFloat = 150,
-    PixelFormatBC6H_RGBUfloat = 151,
-    PixelFormatBC7_RGBAUnorm = 152,
-    PixelFormatBC7_RGBAUnorm_sRGB = 153,
-    PixelFormatPVRTC_RGB_2BPP = 160,
-    PixelFormatPVRTC_RGB_2BPP_sRGB = 161,
-    PixelFormatPVRTC_RGB_4BPP = 162,
-    PixelFormatPVRTC_RGB_4BPP_sRGB = 163,
-    PixelFormatPVRTC_RGBA_2BPP = 164,
-    PixelFormatPVRTC_RGBA_2BPP_sRGB = 165,
-    PixelFormatPVRTC_RGBA_4BPP = 166,
-    PixelFormatPVRTC_RGBA_4BPP_sRGB = 167,
-    PixelFormatEAC_R11Unorm = 170,
-    PixelFormatEAC_R11Snorm = 172,
-    PixelFormatEAC_RG11Unorm = 174,
-    PixelFormatEAC_RG11Snorm = 176,
-    PixelFormatEAC_RGBA8 = 178,
-    PixelFormatEAC_RGBA8_sRGB = 179,
-    PixelFormatETC2_RGB8 = 180,
-    PixelFormatETC2_RGB8_sRGB = 181,
-    PixelFormatETC2_RGB8A1 = 182,
-    PixelFormatETC2_RGB8A1_sRGB = 183,
-    PixelFormatASTC_4x4_sRGB = 186,
-    PixelFormatASTC_5x4_sRGB = 187,
-    PixelFormatASTC_5x5_sRGB = 188,
-    PixelFormatASTC_6x5_sRGB = 189,
-    PixelFormatASTC_6x6_sRGB = 190,
-    PixelFormatASTC_8x5_sRGB = 192,
-    PixelFormatASTC_8x6_sRGB = 193,
-    PixelFormatASTC_8x8_sRGB = 194,
-    PixelFormatASTC_10x5_sRGB = 195,
-    PixelFormatASTC_10x6_sRGB = 196,
-    PixelFormatASTC_10x8_sRGB = 197,
-    PixelFormatASTC_10x10_sRGB = 198,
-    PixelFormatASTC_12x10_sRGB = 199,
-    PixelFormatASTC_12x12_sRGB = 200,
-    PixelFormatASTC_4x4_LDR = 204,
-    PixelFormatASTC_5x4_LDR = 205,
-    PixelFormatASTC_5x5_LDR = 206,
-    PixelFormatASTC_6x5_LDR = 207,
-    PixelFormatASTC_6x6_LDR = 208,
-    PixelFormatASTC_8x5_LDR = 210,
-    PixelFormatASTC_8x6_LDR = 211,
-    PixelFormatASTC_8x8_LDR = 212,
-    PixelFormatASTC_10x5_LDR = 213,
-    PixelFormatASTC_10x6_LDR = 214,
-    PixelFormatASTC_10x8_LDR = 215,
-    PixelFormatASTC_10x10_LDR = 216,
-    PixelFormatASTC_12x10_LDR = 217,
-    PixelFormatASTC_12x12_LDR = 218,
-    PixelFormatASTC_4x4_HDR = 222,
-    PixelFormatASTC_5x4_HDR = 223,
-    PixelFormatASTC_5x5_HDR = 224,
-    PixelFormatASTC_6x5_HDR = 225,
-    PixelFormatASTC_6x6_HDR = 226,
-    PixelFormatASTC_8x5_HDR = 228,
-    PixelFormatASTC_8x6_HDR = 229,
-    PixelFormatASTC_8x8_HDR = 230,
-    PixelFormatASTC_10x5_HDR = 231,
-    PixelFormatASTC_10x6_HDR = 232,
-    PixelFormatASTC_10x8_HDR = 233,
-    PixelFormatASTC_10x10_HDR = 234,
-    PixelFormatASTC_12x10_HDR = 235,
-    PixelFormatASTC_12x12_HDR = 236,
-    PixelFormatGBGR422 = 240,
-    PixelFormatBGRG422 = 241,
-    PixelFormatDepth16Unorm = 250,
-    PixelFormatDepth32Float = 252,
-    PixelFormatStencil8 = 253,
-    PixelFormatDepth24Unorm_Stencil8 = 255,
-    PixelFormatDepth32Float_Stencil8 = 260,
-    PixelFormatX32_Stencil8 = 261,
-    PixelFormatX24_Stencil8 = 262,
-    PixelFormatUnspecialized = 263,
-};
-
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLPrivate.hpp b/engine/thirdparty/metal-cpp/Metal/MTLPrivate.hpp
deleted file mode 100644
index 41bcaa50..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLPrivate.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLPrivate.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLDefines.hpp"
-
-#include <objc/runtime.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _MTL_PRIVATE_CLS(symbol) (MTL::Private::Class::s_k##symbol)
-#define _MTL_PRIVATE_SEL(accessor) (MTL::Private::Selector::s_k##accessor)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#if defined(MTL_PRIVATE_IMPLEMENTATION)
-
-#ifdef METALCPP_SYMBOL_VISIBILITY_HIDDEN
-#define _MTL_PRIVATE_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#define _MTL_PRIVATE_VISIBILITY __attribute__((visibility("default")))
-#endif // METALCPP_SYMBOL_VISIBILITY_HIDDEN
-
-#define _MTL_PRIVATE_IMPORT __attribute__((weak_import))
-
-#ifdef __OBJC__
-#define _MTL_PRIVATE_OBJC_LOOKUP_CLASS(symbol) ((__bridge void*)objc_lookUpClass(#symbol))
-#define _MTL_PRIVATE_OBJC_GET_PROTOCOL(symbol) ((__bridge void*)objc_getProtocol(#symbol))
-#else
-#define _MTL_PRIVATE_OBJC_LOOKUP_CLASS(symbol) objc_lookUpClass(#symbol)
-#define _MTL_PRIVATE_OBJC_GET_PROTOCOL(symbol) objc_getProtocol(#symbol)
-#endif // __OBJC__
-
-#define _MTL_PRIVATE_DEF_CLS(symbol) void* s_k##symbol _MTL_PRIVATE_VISIBILITY = _MTL_PRIVATE_OBJC_LOOKUP_CLASS(symbol)
-#define _MTL_PRIVATE_DEF_PRO(symbol) void* s_k##symbol _MTL_PRIVATE_VISIBILITY = _MTL_PRIVATE_OBJC_GET_PROTOCOL(symbol)
-#define _MTL_PRIVATE_DEF_SEL(accessor, symbol) SEL s_k##accessor _MTL_PRIVATE_VISIBILITY = sel_registerName(symbol)
-
-#include <dlfcn.h>
-#define MTL_DEF_FUNC( name, signature ) \
-    using Fn##name = signature; \
-    Fn##name name = reinterpret_cast< Fn##name >( dlsym( RTLD_DEFAULT, #name ) )
-
-namespace MTL::Private
-{
-    template <typename _Type>
-    inline _Type const LoadSymbol(const char* pSymbol)
-    {
-        const _Type* pAddress = static_cast<_Type*>(dlsym(RTLD_DEFAULT, pSymbol));
-
-        return pAddress ? *pAddress : nullptr;
-    }
-} // MTL::Private
-
-#if defined(__MAC_26_0) || defined(__IPHONE_26_0) || defined(__TVOS_26_0)
-
-#define _MTL_PRIVATE_DEF_STR(type, symbol)                  \
-    _MTL_EXTERN type const MTL##symbol _MTL_PRIVATE_IMPORT; \
-    type const                         MTL::symbol = (nullptr != &MTL##symbol) ? MTL##symbol : nullptr
-
-#define _MTL_PRIVATE_DEF_CONST(type, symbol)              \
-    _MTL_EXTERN type const MTL##symbol _MTL_PRIVATE_IMPORT; \
-    type const                         MTL::symbol = (nullptr != &MTL##symbol) ? MTL##symbol : nullptr
-
-#define _MTL_PRIVATE_DEF_WEAK_CONST(type, symbol) \
-    _MTL_EXTERN type const MTL##symbol;    \
-    type const             MTL::symbol = MTL::Private::LoadSymbol<type>("MTL" #symbol)
-
-#else
-
-#define _MTL_PRIVATE_DEF_STR(type, symbol) \
-    _MTL_EXTERN type const MTL##symbol;    \
-    type const             MTL::symbol = MTL::Private::LoadSymbol<type>("MTL" #symbol)
-
-#define _MTL_PRIVATE_DEF_CONST(type, symbol) \
-    _MTL_EXTERN type const MTL##symbol;    \
-    type const             MTL::symbol = MTL::Private::LoadSymbol<type>("MTL" #symbol)
-
-#define _MTL_PRIVATE_DEF_WEAK_CONST(type, symbol) _MTL_PRIVATE_DEF_CONST(type, symbol)
-
-#endif
-
-#else
-
-#define _MTL_PRIVATE_DEF_CLS(symbol) extern void* s_k##symbol
-#define _MTL_PRIVATE_DEF_PRO(symbol) extern void* s_k##symbol
-#define _MTL_PRIVATE_DEF_SEL(accessor, symbol) extern SEL s_k##accessor
-#define _MTL_PRIVATE_DEF_STR(type, symbol) extern type const MTL::symbol
-#define _MTL_PRIVATE_DEF_CONST(type, symbol) extern type const MTL::symbol
-#define _MTL_PRIVATE_DEF_WEAK_CONST(type, symbol) extern type const MTL::symbol
-
-#endif // MTL_PRIVATE_IMPLEMENTATION
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL
-{
-namespace Private
-{
-    namespace Class
-    {
-
-    } // Class
-} // Private
-} // MTL
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL
-{
-namespace Private
-{
-    namespace Protocol
-    {
-
-    } // Protocol
-} // Private
-} // MTL
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL
-{
-namespace Private
-{
-    namespace Selector
-    {
-
-        _MTL_PRIVATE_DEF_SEL(beginScope,
-            "beginScope");
-        _MTL_PRIVATE_DEF_SEL(endScope,
-            "endScope");
-    } // Class
-} // Private
-} // MTL
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLRasterizationRate.hpp b/engine/thirdparty/metal-cpp/Metal/MTLRasterizationRate.hpp
deleted file mode 100644
index b2804fa8..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLRasterizationRate.hpp
+++ /dev/null
@@ -1,337 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLRasterizationRate.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLDevice.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Buffer;
-class Device;
-class RasterizationRateLayerArray;
-class RasterizationRateLayerDescriptor;
-class RasterizationRateMapDescriptor;
-class RasterizationRateSampleArray;
-
-class RasterizationRateSampleArray : public NS::Referencing<RasterizationRateSampleArray>
-{
-public:
-    static RasterizationRateSampleArray* alloc();
-
-    RasterizationRateSampleArray*        init();
-
-    NS::Number*                          object(NS::UInteger index);
-    void                                 setObject(const NS::Number* value, NS::UInteger index);
-};
-class RasterizationRateLayerDescriptor : public NS::Copying<RasterizationRateLayerDescriptor>
-{
-public:
-    static RasterizationRateLayerDescriptor* alloc();
-
-    RasterizationRateSampleArray*            horizontal() const;
-    float*                                   horizontalSampleStorage() const;
-
-    RasterizationRateLayerDescriptor*        init();
-    RasterizationRateLayerDescriptor*        init(MTL::Size sampleCount);
-    RasterizationRateLayerDescriptor*        init(MTL::Size sampleCount, const float* horizontal, const float* vertical);
-
-    Size                                     maxSampleCount() const;
-    Size                                     sampleCount() const;
-    void                                     setSampleCount(MTL::Size sampleCount);
-
-    RasterizationRateSampleArray*            vertical() const;
-    float*                                   verticalSampleStorage() const;
-};
-class RasterizationRateLayerArray : public NS::Referencing<RasterizationRateLayerArray>
-{
-public:
-    static RasterizationRateLayerArray* alloc();
-
-    RasterizationRateLayerArray*        init();
-
-    RasterizationRateLayerDescriptor*   object(NS::UInteger layerIndex);
-    void                                setObject(const MTL::RasterizationRateLayerDescriptor* layer, NS::UInteger layerIndex);
-};
-class RasterizationRateMapDescriptor : public NS::Copying<RasterizationRateMapDescriptor>
-{
-public:
-    static RasterizationRateMapDescriptor* alloc();
-
-    RasterizationRateMapDescriptor*        init();
-
-    NS::String*                            label() const;
-
-    RasterizationRateLayerDescriptor*      layer(NS::UInteger layerIndex);
-    NS::UInteger                           layerCount() const;
-
-    RasterizationRateLayerArray*           layers() const;
-
-    static RasterizationRateMapDescriptor* rasterizationRateMapDescriptor(MTL::Size screenSize);
-    static RasterizationRateMapDescriptor* rasterizationRateMapDescriptor(MTL::Size screenSize, const MTL::RasterizationRateLayerDescriptor* layer);
-    static RasterizationRateMapDescriptor* rasterizationRateMapDescriptor(MTL::Size screenSize, NS::UInteger layerCount, const MTL::RasterizationRateLayerDescriptor* const* layers);
-
-    Size                                   screenSize() const;
-
-    void                                   setLabel(const NS::String* label);
-
-    void                                   setLayer(const MTL::RasterizationRateLayerDescriptor* layer, NS::UInteger layerIndex);
-
-    void                                   setScreenSize(MTL::Size screenSize);
-};
-class RasterizationRateMap : public NS::Referencing<RasterizationRateMap>
-{
-public:
-    void         copyParameterDataToBuffer(const MTL::Buffer* buffer, NS::UInteger offset);
-
-    Device*      device() const;
-
-    NS::String*  label() const;
-
-    NS::UInteger layerCount() const;
-
-    Coordinate2D mapPhysicalToScreenCoordinates(MTL::Coordinate2D physicalCoordinates, NS::UInteger layerIndex);
-
-    Coordinate2D mapScreenToPhysicalCoordinates(MTL::Coordinate2D screenCoordinates, NS::UInteger layerIndex);
-
-    SizeAndAlign parameterBufferSizeAndAlign() const;
-
-    Size         physicalGranularity() const;
-
-    Size         physicalSize(NS::UInteger layerIndex);
-
-    Size         screenSize() const;
-};
-
-}
-_MTL_INLINE MTL::RasterizationRateSampleArray* MTL::RasterizationRateSampleArray::alloc()
-{
-    return NS::Object::alloc<MTL::RasterizationRateSampleArray>(_MTL_PRIVATE_CLS(MTLRasterizationRateSampleArray));
-}
-
-_MTL_INLINE MTL::RasterizationRateSampleArray* MTL::RasterizationRateSampleArray::init()
-{
-    return NS::Object::init<MTL::RasterizationRateSampleArray>();
-}
-
-_MTL_INLINE NS::Number* MTL::RasterizationRateSampleArray::object(NS::UInteger index)
-{
-    return Object::sendMessage<NS::Number*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), index);
-}
-
-_MTL_INLINE void MTL::RasterizationRateSampleArray::setObject(const NS::Number* value, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), value, index);
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateLayerDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RasterizationRateLayerDescriptor>(_MTL_PRIVATE_CLS(MTLRasterizationRateLayerDescriptor));
-}
-
-_MTL_INLINE MTL::RasterizationRateSampleArray* MTL::RasterizationRateLayerDescriptor::horizontal() const
-{
-    return Object::sendMessage<MTL::RasterizationRateSampleArray*>(this, _MTL_PRIVATE_SEL(horizontal));
-}
-
-_MTL_INLINE float* MTL::RasterizationRateLayerDescriptor::horizontalSampleStorage() const
-{
-    return Object::sendMessage<float*>(this, _MTL_PRIVATE_SEL(horizontalSampleStorage));
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateLayerDescriptor::init()
-{
-    return NS::Object::init<MTL::RasterizationRateLayerDescriptor>();
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateLayerDescriptor::init(MTL::Size sampleCount)
-{
-    return Object::sendMessage<MTL::RasterizationRateLayerDescriptor*>(this, _MTL_PRIVATE_SEL(initWithSampleCount_), sampleCount);
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateLayerDescriptor::init(MTL::Size sampleCount, const float* horizontal, const float* vertical)
-{
-    return Object::sendMessage<MTL::RasterizationRateLayerDescriptor*>(this, _MTL_PRIVATE_SEL(initWithSampleCount_horizontal_vertical_), sampleCount, horizontal, vertical);
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateLayerDescriptor::maxSampleCount() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(maxSampleCount));
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateLayerDescriptor::sampleCount() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
-
-_MTL_INLINE void MTL::RasterizationRateLayerDescriptor::setSampleCount(MTL::Size sampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleCount_), sampleCount);
-}
-
-_MTL_INLINE MTL::RasterizationRateSampleArray* MTL::RasterizationRateLayerDescriptor::vertical() const
-{
-    return Object::sendMessage<MTL::RasterizationRateSampleArray*>(this, _MTL_PRIVATE_SEL(vertical));
-}
-
-_MTL_INLINE float* MTL::RasterizationRateLayerDescriptor::verticalSampleStorage() const
-{
-    return Object::sendMessage<float*>(this, _MTL_PRIVATE_SEL(verticalSampleStorage));
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerArray* MTL::RasterizationRateLayerArray::alloc()
-{
-    return NS::Object::alloc<MTL::RasterizationRateLayerArray>(_MTL_PRIVATE_CLS(MTLRasterizationRateLayerArray));
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerArray* MTL::RasterizationRateLayerArray::init()
-{
-    return NS::Object::init<MTL::RasterizationRateLayerArray>();
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateLayerArray::object(NS::UInteger layerIndex)
-{
-    return Object::sendMessage<MTL::RasterizationRateLayerDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), layerIndex);
-}
-
-_MTL_INLINE void MTL::RasterizationRateLayerArray::setObject(const MTL::RasterizationRateLayerDescriptor* layer, NS::UInteger layerIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), layer, layerIndex);
-}
-
-_MTL_INLINE MTL::RasterizationRateMapDescriptor* MTL::RasterizationRateMapDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RasterizationRateMapDescriptor>(_MTL_PRIVATE_CLS(MTLRasterizationRateMapDescriptor));
-}
-
-_MTL_INLINE MTL::RasterizationRateMapDescriptor* MTL::RasterizationRateMapDescriptor::init()
-{
-    return NS::Object::init<MTL::RasterizationRateMapDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::RasterizationRateMapDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerDescriptor* MTL::RasterizationRateMapDescriptor::layer(NS::UInteger layerIndex)
-{
-    return Object::sendMessage<MTL::RasterizationRateLayerDescriptor*>(this, _MTL_PRIVATE_SEL(layerAtIndex_), layerIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::RasterizationRateMapDescriptor::layerCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(layerCount));
-}
-
-_MTL_INLINE MTL::RasterizationRateLayerArray* MTL::RasterizationRateMapDescriptor::layers() const
-{
-    return Object::sendMessage<MTL::RasterizationRateLayerArray*>(this, _MTL_PRIVATE_SEL(layers));
-}
-
-_MTL_INLINE MTL::RasterizationRateMapDescriptor* MTL::RasterizationRateMapDescriptor::rasterizationRateMapDescriptor(MTL::Size screenSize)
-{
-    return Object::sendMessage<MTL::RasterizationRateMapDescriptor*>(_MTL_PRIVATE_CLS(MTLRasterizationRateMapDescriptor), _MTL_PRIVATE_SEL(rasterizationRateMapDescriptorWithScreenSize_), screenSize);
-}
-
-_MTL_INLINE MTL::RasterizationRateMapDescriptor* MTL::RasterizationRateMapDescriptor::rasterizationRateMapDescriptor(MTL::Size screenSize, const MTL::RasterizationRateLayerDescriptor* layer)
-{
-    return Object::sendMessage<MTL::RasterizationRateMapDescriptor*>(_MTL_PRIVATE_CLS(MTLRasterizationRateMapDescriptor), _MTL_PRIVATE_SEL(rasterizationRateMapDescriptorWithScreenSize_layer_), screenSize, layer);
-}
-
-_MTL_INLINE MTL::RasterizationRateMapDescriptor* MTL::RasterizationRateMapDescriptor::rasterizationRateMapDescriptor(MTL::Size screenSize, NS::UInteger layerCount, const MTL::RasterizationRateLayerDescriptor* const* layers)
-{
-    return Object::sendMessage<MTL::RasterizationRateMapDescriptor*>(_MTL_PRIVATE_CLS(MTLRasterizationRateMapDescriptor), _MTL_PRIVATE_SEL(rasterizationRateMapDescriptorWithScreenSize_layerCount_layers_), screenSize, layerCount, layers);
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateMapDescriptor::screenSize() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(screenSize));
-}
-
-_MTL_INLINE void MTL::RasterizationRateMapDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::RasterizationRateMapDescriptor::setLayer(const MTL::RasterizationRateLayerDescriptor* layer, NS::UInteger layerIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLayer_atIndex_), layer, layerIndex);
-}
-
-_MTL_INLINE void MTL::RasterizationRateMapDescriptor::setScreenSize(MTL::Size screenSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScreenSize_), screenSize);
-}
-
-_MTL_INLINE void MTL::RasterizationRateMap::copyParameterDataToBuffer(const MTL::Buffer* buffer, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(copyParameterDataToBuffer_offset_), buffer, offset);
-}
-
-_MTL_INLINE MTL::Device* MTL::RasterizationRateMap::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::RasterizationRateMap::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::RasterizationRateMap::layerCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(layerCount));
-}
-
-_MTL_INLINE MTL::Coordinate2D MTL::RasterizationRateMap::mapPhysicalToScreenCoordinates(MTL::Coordinate2D physicalCoordinates, NS::UInteger layerIndex)
-{
-    return Object::sendMessage<MTL::Coordinate2D>(this, _MTL_PRIVATE_SEL(mapPhysicalToScreenCoordinates_forLayer_), physicalCoordinates, layerIndex);
-}
-
-_MTL_INLINE MTL::Coordinate2D MTL::RasterizationRateMap::mapScreenToPhysicalCoordinates(MTL::Coordinate2D screenCoordinates, NS::UInteger layerIndex)
-{
-    return Object::sendMessage<MTL::Coordinate2D>(this, _MTL_PRIVATE_SEL(mapScreenToPhysicalCoordinates_forLayer_), screenCoordinates, layerIndex);
-}
-
-_MTL_INLINE MTL::SizeAndAlign MTL::RasterizationRateMap::parameterBufferSizeAndAlign() const
-{
-    return Object::sendMessage<MTL::SizeAndAlign>(this, _MTL_PRIVATE_SEL(parameterBufferSizeAndAlign));
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateMap::physicalGranularity() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(physicalGranularity));
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateMap::physicalSize(NS::UInteger layerIndex)
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(physicalSizeForLayer_), layerIndex);
-}
-
-_MTL_INLINE MTL::Size MTL::RasterizationRateMap::screenSize() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(screenSize));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLRenderCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLRenderCommandEncoder.hpp
deleted file mode 100644
index b2667b77..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLRenderCommandEncoder.hpp
+++ /dev/null
@@ -1,1019 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResourceStatePass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLArgument.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderPass.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class AccelerationStructure;
-class Buffer;
-class CounterSampleBuffer;
-class DepthStencilState;
-class Fence;
-class Heap;
-class IndirectCommandBuffer;
-class IntersectionFunctionTable;
-class LogicalToPhysicalColorAttachmentMap;
-class RenderPipelineState;
-class Resource;
-class SamplerState;
-struct ScissorRect;
-class Texture;
-struct VertexAmplificationViewMapping;
-struct Viewport;
-class VisibleFunctionTable;
-_MTL_ENUM(NS::UInteger, PrimitiveType) {
-    PrimitiveTypePoint = 0,
-    PrimitiveTypeLine = 1,
-    PrimitiveTypeLineStrip = 2,
-    PrimitiveTypeTriangle = 3,
-    PrimitiveTypeTriangleStrip = 4,
-};
-
-_MTL_ENUM(NS::UInteger, VisibilityResultMode) {
-    VisibilityResultModeDisabled = 0,
-    VisibilityResultModeBoolean = 1,
-    VisibilityResultModeCounting = 2,
-};
-
-_MTL_ENUM(NS::UInteger, CullMode) {
-    CullModeNone = 0,
-    CullModeFront = 1,
-    CullModeBack = 2,
-};
-
-_MTL_ENUM(NS::UInteger, Winding) {
-    WindingClockwise = 0,
-    WindingCounterClockwise = 1,
-};
-
-_MTL_ENUM(NS::UInteger, DepthClipMode) {
-    DepthClipModeClip = 0,
-    DepthClipModeClamp = 1,
-};
-
-_MTL_ENUM(NS::UInteger, TriangleFillMode) {
-    TriangleFillModeFill = 0,
-    TriangleFillModeLines = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, RenderStages) {
-    RenderStageVertex = 1,
-    RenderStageFragment = 1 << 1,
-    RenderStageTile = 1 << 2,
-    RenderStageObject = 1 << 3,
-    RenderStageMesh = 1 << 4,
-};
-
-struct ScissorRect
-{
-    NS::UInteger x;
-    NS::UInteger y;
-    NS::UInteger width;
-    NS::UInteger height;
-} _MTL_PACKED;
-
-struct Viewport
-{
-    double originX;
-    double originY;
-    double width;
-    double height;
-    double znear;
-    double zfar;
-} _MTL_PACKED;
-
-struct DrawPrimitivesIndirectArguments
-{
-    uint32_t vertexCount;
-    uint32_t instanceCount;
-    uint32_t vertexStart;
-    uint32_t baseInstance;
-} _MTL_PACKED;
-
-struct DrawIndexedPrimitivesIndirectArguments
-{
-    uint32_t indexCount;
-    uint32_t instanceCount;
-    uint32_t indexStart;
-    int32_t  baseVertex;
-    uint32_t baseInstance;
-} _MTL_PACKED;
-
-struct VertexAmplificationViewMapping
-{
-    uint32_t viewportArrayIndexOffset;
-    uint32_t renderTargetArrayIndexOffset;
-} _MTL_PACKED;
-
-struct DrawPatchIndirectArguments
-{
-    uint32_t patchCount;
-    uint32_t instanceCount;
-    uint32_t patchStart;
-    uint32_t baseInstance;
-} _MTL_PACKED;
-
-struct QuadTessellationFactorsHalf
-{
-    uint16_t edgeTessellationFactor[4];
-    uint16_t insideTessellationFactor[2];
-} _MTL_PACKED;
-
-struct TriangleTessellationFactorsHalf
-{
-    uint16_t edgeTessellationFactor[3];
-    uint16_t insideTessellationFactor;
-} _MTL_PACKED;
-
-class RenderCommandEncoder : public NS::Referencing<RenderCommandEncoder, CommandEncoder>
-{
-public:
-    void         dispatchThreadsPerTile(MTL::Size threadsPerTile);
-
-    void         drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance);
-    void         drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance);
-    void         drawIndexedPrimitives(MTL::PrimitiveType primitiveType, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-
-    void         drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-    void         drawMeshThreadgroups(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void         drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup);
-
-    void         drawPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance);
-    void         drawPatches(NS::UInteger numberOfPatchControlPoints, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance);
-    void         drawPrimitives(MTL::PrimitiveType primitiveType, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange);
-    void         executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, const MTL::Buffer* indirectRangeBuffer, NS::UInteger indirectBufferOffset);
-
-    void         memoryBarrier(MTL::BarrierScope scope, MTL::RenderStages after, MTL::RenderStages before);
-    void         memoryBarrier(const MTL::Resource* const resources[], NS::UInteger count, MTL::RenderStages after, MTL::RenderStages before);
-
-    void         sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier);
-
-    void         setBlendColor(float red, float green, float blue, float alpha);
-
-    void         setColorAttachmentMap(const MTL::LogicalToPhysicalColorAttachmentMap* mapping);
-
-    void         setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex);
-    void         setColorStoreActionOptions(MTL::StoreActionOptions storeActionOptions, NS::UInteger colorAttachmentIndex);
-
-    void         setCullMode(MTL::CullMode cullMode);
-
-    void         setDepthBias(float depthBias, float slopeScale, float clamp);
-
-    void         setDepthClipMode(MTL::DepthClipMode depthClipMode);
-
-    void         setDepthStencilState(const MTL::DepthStencilState* depthStencilState);
-
-    void         setDepthStoreAction(MTL::StoreAction storeAction);
-    void         setDepthStoreActionOptions(MTL::StoreActionOptions storeActionOptions);
-
-    void         setDepthTestBounds(float minBound, float maxBound);
-
-    void         setFragmentAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex);
-
-    void         setFragmentBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setFragmentBufferOffset(NS::UInteger offset, NS::UInteger index);
-
-    void         setFragmentBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range);
-
-    void         setFragmentBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-
-    void         setFragmentIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex);
-    void         setFragmentIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range);
-
-    void         setFragmentSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setFragmentSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setFragmentSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setFragmentSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range);
-
-    void         setFragmentTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setFragmentTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setFragmentVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex);
-    void         setFragmentVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range);
-
-    void         setFrontFacingWinding(MTL::Winding frontFacingWinding);
-
-    void         setMeshBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setMeshBufferOffset(NS::UInteger offset, NS::UInteger index);
-
-    void         setMeshBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range);
-
-    void         setMeshBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-
-    void         setMeshSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setMeshSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setMeshSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setMeshSamplerStates(const MTL::SamplerState* const samplers[], const float* lodMinClamps, const float* lodMaxClamps, NS::Range range);
-
-    void         setMeshTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setMeshTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setObjectBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setObjectBufferOffset(NS::UInteger offset, NS::UInteger index);
-
-    void         setObjectBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range);
-
-    void         setObjectBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-
-    void         setObjectSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setObjectSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setObjectSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setObjectSamplerStates(const MTL::SamplerState* const samplers[], const float* lodMinClamps, const float* lodMaxClamps, NS::Range range);
-
-    void         setObjectTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setObjectTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index);
-
-    void         setRenderPipelineState(const MTL::RenderPipelineState* pipelineState);
-
-    void         setScissorRect(MTL::ScissorRect rect);
-    void         setScissorRects(const MTL::ScissorRect* scissorRects, NS::UInteger count);
-
-    void         setStencilReferenceValue(uint32_t referenceValue);
-    void         setStencilReferenceValues(uint32_t frontReferenceValue, uint32_t backReferenceValue);
-
-    void         setStencilStoreAction(MTL::StoreAction storeAction);
-    void         setStencilStoreActionOptions(MTL::StoreActionOptions storeActionOptions);
-
-    void         setTessellationFactorBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride);
-
-    void         setTessellationFactorScale(float scale);
-
-    void         setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger offset, NS::UInteger index);
-
-    void         setTileAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex);
-
-    void         setTileBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setTileBufferOffset(NS::UInteger offset, NS::UInteger index);
-
-    void         setTileBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range);
-
-    void         setTileBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-
-    void         setTileIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex);
-    void         setTileIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range);
-
-    void         setTileSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setTileSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setTileSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setTileSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range);
-
-    void         setTileTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setTileTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setTileVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex);
-    void         setTileVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range);
-
-    void         setTriangleFillMode(MTL::TriangleFillMode fillMode);
-
-    void         setVertexAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex);
-
-    void         setVertexAmplificationCount(NS::UInteger count, const MTL::VertexAmplificationViewMapping* viewMappings);
-
-    void         setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index);
-    void         setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-    void         setVertexBufferOffset(NS::UInteger offset, NS::UInteger index);
-    void         setVertexBufferOffset(NS::UInteger offset, NS::UInteger stride, NS::UInteger index);
-
-    void         setVertexBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range);
-    void         setVertexBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, const NS::UInteger* strides, NS::Range range);
-
-    void         setVertexBytes(const void* bytes, NS::UInteger length, NS::UInteger index);
-    void         setVertexBytes(const void* bytes, NS::UInteger length, NS::UInteger stride, NS::UInteger index);
-
-    void         setVertexIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex);
-    void         setVertexIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range);
-
-    void         setVertexSamplerState(const MTL::SamplerState* sampler, NS::UInteger index);
-    void         setVertexSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index);
-    void         setVertexSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range);
-    void         setVertexSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range);
-
-    void         setVertexTexture(const MTL::Texture* texture, NS::UInteger index);
-    void         setVertexTextures(const MTL::Texture* const textures[], NS::Range range);
-
-    void         setVertexVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex);
-    void         setVertexVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range);
-
-    void         setViewport(MTL::Viewport viewport);
-    void         setViewports(const MTL::Viewport* viewports, NS::UInteger count);
-
-    void         setVisibilityResultMode(MTL::VisibilityResultMode mode, NS::UInteger offset);
-
-    void         textureBarrier();
-
-    NS::UInteger tileHeight() const;
-
-    NS::UInteger tileWidth() const;
-
-    void         updateFence(const MTL::Fence* fence, MTL::RenderStages stages);
-
-    void         useHeap(const MTL::Heap* heap);
-    void         useHeap(const MTL::Heap* heap, MTL::RenderStages stages);
-    void         useHeaps(const MTL::Heap* const heaps[], NS::UInteger count);
-    void         useHeaps(const MTL::Heap* const heaps[], NS::UInteger count, MTL::RenderStages stages);
-
-    void         useResource(const MTL::Resource* resource, MTL::ResourceUsage usage);
-    void         useResource(const MTL::Resource* resource, MTL::ResourceUsage usage, MTL::RenderStages stages);
-    void         useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage);
-    void         useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage, MTL::RenderStages stages);
-
-    void         waitForFence(const MTL::Fence* fence, MTL::RenderStages stages);
-};
-
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::dispatchThreadsPerTile(MTL::Size threadsPerTile)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(dispatchThreadsPerTile_), threadsPerTile);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_instanceCount_baseInstance_), numberOfPatchControlPoints, patchStart, patchCount, patchIndexBuffer, patchIndexBufferOffset, controlPointIndexBuffer, controlPointIndexBufferOffset, instanceCount, baseInstance);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPatches(NS::UInteger numberOfPatchControlPoints, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* controlPointIndexBuffer, NS::UInteger controlPointIndexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPatches_patchIndexBuffer_patchIndexBufferOffset_controlPointIndexBuffer_controlPointIndexBufferOffset_indirectBuffer_indirectBufferOffset_), numberOfPatchControlPoints, patchIndexBuffer, patchIndexBufferOffset, controlPointIndexBuffer, controlPointIndexBufferOffset, indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_instanceCount_), primitiveType, indexCount, indexType, indexBuffer, indexBufferOffset, instanceCount);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_), primitiveType, indexCount, indexType, indexBuffer, indexBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger indexCount, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, NS::UInteger instanceCount, NS::Integer baseVertex, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexCount_indexType_indexBuffer_indexBufferOffset_instanceCount_baseVertex_baseInstance_), primitiveType, indexCount, indexType, indexBuffer, indexBufferOffset, instanceCount, baseVertex, baseInstance);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawIndexedPrimitives(MTL::PrimitiveType primitiveType, MTL::IndexType indexType, const MTL::Buffer* indexBuffer, NS::UInteger indexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawIndexedPrimitives_indexType_indexBuffer_indexBufferOffset_indirectBuffer_indirectBufferOffset_), primitiveType, indexType, indexBuffer, indexBufferOffset, indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawMeshThreadgroups(MTL::Size threadgroupsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreadgroups_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadgroupsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawMeshThreadgroups(const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreadgroupsWithIndirectBuffer_indirectBufferOffset_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), indirectBuffer, indirectBufferOffset, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawMeshThreads(MTL::Size threadsPerGrid, MTL::Size threadsPerObjectThreadgroup, MTL::Size threadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawMeshThreads_threadsPerObjectThreadgroup_threadsPerMeshThreadgroup_), threadsPerGrid, threadsPerObjectThreadgroup, threadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPatches(NS::UInteger numberOfPatchControlPoints, NS::UInteger patchStart, NS::UInteger patchCount, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, NS::UInteger instanceCount, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPatches_patchStart_patchCount_patchIndexBuffer_patchIndexBufferOffset_instanceCount_baseInstance_), numberOfPatchControlPoints, patchStart, patchCount, patchIndexBuffer, patchIndexBufferOffset, instanceCount, baseInstance);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPatches(NS::UInteger numberOfPatchControlPoints, const MTL::Buffer* patchIndexBuffer, NS::UInteger patchIndexBufferOffset, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPatches_patchIndexBuffer_patchIndexBufferOffset_indirectBuffer_indirectBufferOffset_), numberOfPatchControlPoints, patchIndexBuffer, patchIndexBufferOffset, indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_), primitiveType, vertexStart, vertexCount, instanceCount);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_), primitiveType, vertexStart, vertexCount);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, NS::UInteger vertexStart, NS::UInteger vertexCount, NS::UInteger instanceCount, NS::UInteger baseInstance)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_vertexStart_vertexCount_instanceCount_baseInstance_), primitiveType, vertexStart, vertexCount, instanceCount, baseInstance);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::drawPrimitives(MTL::PrimitiveType primitiveType, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(drawPrimitives_indirectBuffer_indirectBufferOffset_), primitiveType, indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandBuffer, NS::Range executionRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_withRange_), indirectCommandBuffer, executionRange);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::executeCommandsInBuffer(const MTL::IndirectCommandBuffer* indirectCommandbuffer, const MTL::Buffer* indirectRangeBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(executeCommandsInBuffer_indirectBuffer_indirectBufferOffset_), indirectCommandbuffer, indirectRangeBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::memoryBarrier(MTL::BarrierScope scope, MTL::RenderStages after, MTL::RenderStages before)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(memoryBarrierWithScope_afterStages_beforeStages_), scope, after, before);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::memoryBarrier(const MTL::Resource* const resources[], NS::UInteger count, MTL::RenderStages after, MTL::RenderStages before)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(memoryBarrierWithResources_count_afterStages_beforeStages_), resources, count, after, before);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::sampleCountersInBuffer(const MTL::CounterSampleBuffer* sampleBuffer, NS::UInteger sampleIndex, bool barrier)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(sampleCountersInBuffer_atSampleIndex_withBarrier_), sampleBuffer, sampleIndex, barrier);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setBlendColor(float red, float green, float blue, float alpha)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBlendColorRed_green_blue_alpha_), red, green, blue, alpha);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setColorAttachmentMap(const MTL::LogicalToPhysicalColorAttachmentMap* mapping)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorAttachmentMap_), mapping);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setColorStoreAction(MTL::StoreAction storeAction, NS::UInteger colorAttachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorStoreAction_atIndex_), storeAction, colorAttachmentIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setColorStoreActionOptions(MTL::StoreActionOptions storeActionOptions, NS::UInteger colorAttachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setColorStoreActionOptions_atIndex_), storeActionOptions, colorAttachmentIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setCullMode(MTL::CullMode cullMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCullMode_), cullMode);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthBias(float depthBias, float slopeScale, float clamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthBias_slopeScale_clamp_), depthBias, slopeScale, clamp);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthClipMode(MTL::DepthClipMode depthClipMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthClipMode_), depthClipMode);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthStencilState(const MTL::DepthStencilState* depthStencilState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStencilState_), depthStencilState);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthStoreActionOptions(MTL::StoreActionOptions storeActionOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthStoreActionOptions_), storeActionOptions);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setDepthTestBounds(float minBound, float maxBound)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthTestMinBound_maxBound_), minBound, maxBound);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentAccelerationStructure_atBufferIndex_), accelerationStructure, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentIntersectionFunctionTable_atBufferIndex_), intersectionFunctionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentIntersectionFunctionTables_withBufferRange_), intersectionFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentVisibleFunctionTable_atBufferIndex_), functionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFragmentVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentVisibleFunctionTables_withBufferRange_), functionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setFrontFacingWinding(MTL::Winding frontFacingWinding)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFrontFacingWinding_), frontFacingWinding);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshSamplerStates(const MTL::SamplerState* const samplers[], const float* lodMinClamps, const float* lodMaxClamps, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setMeshTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectSamplerStates(const MTL::SamplerState* const samplers[], const float* lodMinClamps, const float* lodMaxClamps, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setObjectThreadgroupMemoryLength(NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectThreadgroupMemoryLength_atIndex_), length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setRenderPipelineState(const MTL::RenderPipelineState* pipelineState)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderPipelineState_), pipelineState);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setScissorRect(MTL::ScissorRect rect)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScissorRect_), rect);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setScissorRects(const MTL::ScissorRect* scissorRects, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setScissorRects_count_), scissorRects, count);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setStencilReferenceValue(uint32_t referenceValue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilReferenceValue_), referenceValue);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setStencilReferenceValues(uint32_t frontReferenceValue, uint32_t backReferenceValue)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilFrontReferenceValue_backReferenceValue_), frontReferenceValue, backReferenceValue);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setStencilStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setStencilStoreActionOptions(MTL::StoreActionOptions storeActionOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilStoreActionOptions_), storeActionOptions);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTessellationFactorBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger instanceStride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationFactorBuffer_offset_instanceStride_), buffer, offset, instanceStride);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTessellationFactorScale(float scale)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationFactorScale_), scale);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setThreadgroupMemoryLength(NS::UInteger length, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_offset_atIndex_), length, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileAccelerationStructure_atBufferIndex_), accelerationStructure, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileIntersectionFunctionTable_atBufferIndex_), intersectionFunctionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileIntersectionFunctionTables_withBufferRange_), intersectionFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileVisibleFunctionTable_atBufferIndex_), functionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTileVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileVisibleFunctionTables_withBufferRange_), functionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setTriangleFillMode(MTL::TriangleFillMode fillMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTriangleFillMode_), fillMode);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexAccelerationStructure(const MTL::AccelerationStructure* accelerationStructure, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexAccelerationStructure_atBufferIndex_), accelerationStructure, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexAmplificationCount(NS::UInteger count, const MTL::VertexAmplificationViewMapping* viewMappings)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexAmplificationCount_viewMappings_), count, viewMappings);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_offset_atIndex_), buffer, offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBuffer(const MTL::Buffer* buffer, NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffer_offset_attributeStride_atIndex_), buffer, offset, stride, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBufferOffset(NS::UInteger offset, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBufferOffset_atIndex_), offset, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBufferOffset(NS::UInteger offset, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBufferOffset_attributeStride_atIndex_), offset, stride, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBuffers(const MTL::Buffer* const buffers[], const NS::UInteger offsets[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffers_offsets_withRange_), buffers, offsets, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBuffers(const MTL::Buffer* const buffers[], const NS::UInteger* offsets, const NS::UInteger* strides, NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBuffers_offsets_attributeStrides_withRange_), buffers, offsets, strides, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBytes(const void* bytes, NS::UInteger length, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBytes_length_atIndex_), bytes, length, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexBytes(const void* bytes, NS::UInteger length, NS::UInteger stride, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexBytes_length_attributeStride_atIndex_), bytes, length, stride, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexIntersectionFunctionTable(const MTL::IntersectionFunctionTable* intersectionFunctionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexIntersectionFunctionTable_atBufferIndex_), intersectionFunctionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexIntersectionFunctionTables(const MTL::IntersectionFunctionTable* const intersectionFunctionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexIntersectionFunctionTables_withBufferRange_), intersectionFunctionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexSamplerState(const MTL::SamplerState* sampler, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexSamplerState_atIndex_), sampler, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexSamplerState(const MTL::SamplerState* sampler, float lodMinClamp, float lodMaxClamp, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexSamplerState_lodMinClamp_lodMaxClamp_atIndex_), sampler, lodMinClamp, lodMaxClamp, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexSamplerStates(const MTL::SamplerState* const samplers[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexSamplerStates_withRange_), samplers, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexSamplerStates(const MTL::SamplerState* const samplers[], const float lodMinClamps[], const float lodMaxClamps[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexSamplerStates_lodMinClamps_lodMaxClamps_withRange_), samplers, lodMinClamps, lodMaxClamps, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexTexture(const MTL::Texture* texture, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexTexture_atIndex_), texture, index);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexTextures(const MTL::Texture* const textures[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexTextures_withRange_), textures, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexVisibleFunctionTable(const MTL::VisibleFunctionTable* functionTable, NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexVisibleFunctionTable_atBufferIndex_), functionTable, bufferIndex);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVertexVisibleFunctionTables(const MTL::VisibleFunctionTable* const functionTables[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexVisibleFunctionTables_withBufferRange_), functionTables, range);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setViewport(MTL::Viewport viewport)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setViewport_), viewport);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setViewports(const MTL::Viewport* viewports, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setViewports_count_), viewports, count);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::setVisibilityResultMode(MTL::VisibilityResultMode mode, NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultMode_offset_), mode, offset);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::textureBarrier()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(textureBarrier));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderCommandEncoder::tileHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderCommandEncoder::tileWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileWidth));
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::updateFence(const MTL::Fence* fence, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_afterStages_), fence, stages);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useHeap(const MTL::Heap* heap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeap_), heap);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useHeap(const MTL::Heap* heap, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeap_stages_), heap, stages);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useHeaps(const MTL::Heap* const heaps[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeaps_count_), heaps, count);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useHeaps(const MTL::Heap* const heaps[], NS::UInteger count, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useHeaps_count_stages_), heaps, count, stages);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useResource(const MTL::Resource* resource, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResource_usage_), resource, usage);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useResource(const MTL::Resource* resource, MTL::ResourceUsage usage, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResource_usage_stages_), resource, usage, stages);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResources_count_usage_), resources, count, usage);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::useResources(const MTL::Resource* const resources[], NS::UInteger count, MTL::ResourceUsage usage, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(useResources_count_usage_stages_), resources, count, usage, stages);
-}
-
-_MTL_INLINE void MTL::RenderCommandEncoder::waitForFence(const MTL::Fence* fence, MTL::RenderStages stages)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_beforeStages_), fence, stages);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLRenderPass.hpp b/engine/thirdparty/metal-cpp/Metal/MTLRenderPass.hpp
deleted file mode 100644
index ed2172d7..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLRenderPass.hpp
+++ /dev/null
@@ -1,792 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLRenderPass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Buffer;
-class CounterSampleBuffer;
-class RasterizationRateMap;
-class RenderPassAttachmentDescriptor;
-class RenderPassColorAttachmentDescriptor;
-class RenderPassColorAttachmentDescriptorArray;
-class RenderPassDepthAttachmentDescriptor;
-class RenderPassDescriptor;
-class RenderPassSampleBufferAttachmentDescriptor;
-class RenderPassSampleBufferAttachmentDescriptorArray;
-class RenderPassStencilAttachmentDescriptor;
-struct SamplePosition;
-class Texture;
-_MTL_ENUM(NS::UInteger, LoadAction) {
-    LoadActionDontCare = 0,
-    LoadActionLoad = 1,
-    LoadActionClear = 2,
-};
-
-_MTL_ENUM(NS::UInteger, StoreAction) {
-    StoreActionDontCare = 0,
-    StoreActionStore = 1,
-    StoreActionMultisampleResolve = 2,
-    StoreActionStoreAndMultisampleResolve = 3,
-    StoreActionUnknown = 4,
-    StoreActionCustomSampleDepthStore = 5,
-};
-
-_MTL_ENUM(NS::Integer, VisibilityResultType) {
-    VisibilityResultTypeReset = 0,
-    VisibilityResultTypeAccumulate = 1,
-};
-
-_MTL_ENUM(NS::UInteger, MultisampleDepthResolveFilter) {
-    MultisampleDepthResolveFilterSample0 = 0,
-    MultisampleDepthResolveFilterMin = 1,
-    MultisampleDepthResolveFilterMax = 2,
-};
-
-_MTL_ENUM(NS::UInteger, MultisampleStencilResolveFilter) {
-    MultisampleStencilResolveFilterSample0 = 0,
-    MultisampleStencilResolveFilterDepthResolvedSample = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, StoreActionOptions) {
-    StoreActionOptionNone = 0,
-    StoreActionOptionCustomSamplePositions = 1,
-    StoreActionOptionValidMask = 1,
-};
-
-struct ClearColor
-{
-    ClearColor() = default;
-
-    ClearColor(double red, double green, double blue, double alpha);
-
-    static ClearColor Make(double red, double green, double blue, double alpha);
-
-    double            red;
-    double            green;
-    double            blue;
-    double            alpha;
-} _MTL_PACKED;
-
-class RenderPassAttachmentDescriptor : public NS::Copying<RenderPassAttachmentDescriptor>
-{
-public:
-    static RenderPassAttachmentDescriptor* alloc();
-
-    NS::UInteger                           depthPlane() const;
-
-    RenderPassAttachmentDescriptor*        init();
-
-    NS::UInteger                           level() const;
-
-    LoadAction                             loadAction() const;
-
-    NS::UInteger                           resolveDepthPlane() const;
-
-    NS::UInteger                           resolveLevel() const;
-
-    NS::UInteger                           resolveSlice() const;
-
-    Texture*                               resolveTexture() const;
-
-    void                                   setDepthPlane(NS::UInteger depthPlane);
-
-    void                                   setLevel(NS::UInteger level);
-
-    void                                   setLoadAction(MTL::LoadAction loadAction);
-
-    void                                   setResolveDepthPlane(NS::UInteger resolveDepthPlane);
-
-    void                                   setResolveLevel(NS::UInteger resolveLevel);
-
-    void                                   setResolveSlice(NS::UInteger resolveSlice);
-
-    void                                   setResolveTexture(const MTL::Texture* resolveTexture);
-
-    void                                   setSlice(NS::UInteger slice);
-
-    void                                   setStoreAction(MTL::StoreAction storeAction);
-    void                                   setStoreActionOptions(MTL::StoreActionOptions storeActionOptions);
-
-    void                                   setTexture(const MTL::Texture* texture);
-
-    NS::UInteger                           slice() const;
-
-    StoreAction                            storeAction() const;
-    StoreActionOptions                     storeActionOptions() const;
-
-    Texture*                               texture() const;
-};
-class RenderPassColorAttachmentDescriptor : public NS::Copying<RenderPassColorAttachmentDescriptor, RenderPassAttachmentDescriptor>
-{
-public:
-    static RenderPassColorAttachmentDescriptor* alloc();
-
-    ClearColor                                  clearColor() const;
-
-    RenderPassColorAttachmentDescriptor*        init();
-
-    void                                        setClearColor(MTL::ClearColor clearColor);
-};
-class RenderPassDepthAttachmentDescriptor : public NS::Copying<RenderPassDepthAttachmentDescriptor, RenderPassAttachmentDescriptor>
-{
-public:
-    static RenderPassDepthAttachmentDescriptor* alloc();
-
-    double                                      clearDepth() const;
-
-    MultisampleDepthResolveFilter               depthResolveFilter() const;
-
-    RenderPassDepthAttachmentDescriptor*        init();
-
-    void                                        setClearDepth(double clearDepth);
-
-    void                                        setDepthResolveFilter(MTL::MultisampleDepthResolveFilter depthResolveFilter);
-};
-class RenderPassStencilAttachmentDescriptor : public NS::Copying<RenderPassStencilAttachmentDescriptor, RenderPassAttachmentDescriptor>
-{
-public:
-    static RenderPassStencilAttachmentDescriptor* alloc();
-
-    uint32_t                                      clearStencil() const;
-
-    RenderPassStencilAttachmentDescriptor*        init();
-
-    void                                          setClearStencil(uint32_t clearStencil);
-
-    void                                          setStencilResolveFilter(MTL::MultisampleStencilResolveFilter stencilResolveFilter);
-    MultisampleStencilResolveFilter               stencilResolveFilter() const;
-};
-class RenderPassColorAttachmentDescriptorArray : public NS::Referencing<RenderPassColorAttachmentDescriptorArray>
-{
-public:
-    static RenderPassColorAttachmentDescriptorArray* alloc();
-
-    RenderPassColorAttachmentDescriptorArray*        init();
-
-    RenderPassColorAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                             setObject(const MTL::RenderPassColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class RenderPassSampleBufferAttachmentDescriptor : public NS::Copying<RenderPassSampleBufferAttachmentDescriptor>
-{
-public:
-    static RenderPassSampleBufferAttachmentDescriptor* alloc();
-
-    NS::UInteger                                       endOfFragmentSampleIndex() const;
-
-    NS::UInteger                                       endOfVertexSampleIndex() const;
-
-    RenderPassSampleBufferAttachmentDescriptor*        init();
-
-    CounterSampleBuffer*                               sampleBuffer() const;
-
-    void                                               setEndOfFragmentSampleIndex(NS::UInteger endOfFragmentSampleIndex);
-
-    void                                               setEndOfVertexSampleIndex(NS::UInteger endOfVertexSampleIndex);
-
-    void                                               setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer);
-
-    void                                               setStartOfFragmentSampleIndex(NS::UInteger startOfFragmentSampleIndex);
-
-    void                                               setStartOfVertexSampleIndex(NS::UInteger startOfVertexSampleIndex);
-
-    NS::UInteger                                       startOfFragmentSampleIndex() const;
-
-    NS::UInteger                                       startOfVertexSampleIndex() const;
-};
-class RenderPassSampleBufferAttachmentDescriptorArray : public NS::Referencing<RenderPassSampleBufferAttachmentDescriptorArray>
-{
-public:
-    static RenderPassSampleBufferAttachmentDescriptorArray* alloc();
-
-    RenderPassSampleBufferAttachmentDescriptorArray*        init();
-
-    RenderPassSampleBufferAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                    setObject(const MTL::RenderPassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class RenderPassDescriptor : public NS::Copying<RenderPassDescriptor>
-{
-public:
-    static RenderPassDescriptor*                     alloc();
-
-    RenderPassColorAttachmentDescriptorArray*        colorAttachments() const;
-
-    NS::UInteger                                     defaultRasterSampleCount() const;
-
-    RenderPassDepthAttachmentDescriptor*             depthAttachment() const;
-
-    NS::UInteger                                     getSamplePositions(MTL::SamplePosition* positions, NS::UInteger count);
-
-    NS::UInteger                                     imageblockSampleLength() const;
-
-    RenderPassDescriptor*                            init();
-
-    RasterizationRateMap*                            rasterizationRateMap() const;
-
-    static RenderPassDescriptor*                     renderPassDescriptor();
-
-    NS::UInteger                                     renderTargetArrayLength() const;
-
-    NS::UInteger                                     renderTargetHeight() const;
-
-    NS::UInteger                                     renderTargetWidth() const;
-
-    RenderPassSampleBufferAttachmentDescriptorArray* sampleBufferAttachments() const;
-
-    void                                             setDefaultRasterSampleCount(NS::UInteger defaultRasterSampleCount);
-
-    void                                             setDepthAttachment(const MTL::RenderPassDepthAttachmentDescriptor* depthAttachment);
-
-    void                                             setImageblockSampleLength(NS::UInteger imageblockSampleLength);
-
-    void                                             setRasterizationRateMap(const MTL::RasterizationRateMap* rasterizationRateMap);
-
-    void                                             setRenderTargetArrayLength(NS::UInteger renderTargetArrayLength);
-
-    void                                             setRenderTargetHeight(NS::UInteger renderTargetHeight);
-
-    void                                             setRenderTargetWidth(NS::UInteger renderTargetWidth);
-
-    void                                             setSamplePositions(const MTL::SamplePosition* positions, NS::UInteger count);
-
-    void                                             setStencilAttachment(const MTL::RenderPassStencilAttachmentDescriptor* stencilAttachment);
-
-    void                                             setSupportColorAttachmentMapping(bool supportColorAttachmentMapping);
-
-    void                                             setThreadgroupMemoryLength(NS::UInteger threadgroupMemoryLength);
-
-    void                                             setTileHeight(NS::UInteger tileHeight);
-
-    void                                             setTileWidth(NS::UInteger tileWidth);
-
-    void                                             setVisibilityResultBuffer(const MTL::Buffer* visibilityResultBuffer);
-
-    void                                             setVisibilityResultType(MTL::VisibilityResultType visibilityResultType);
-
-    RenderPassStencilAttachmentDescriptor*           stencilAttachment() const;
-
-    bool                                             supportColorAttachmentMapping() const;
-
-    NS::UInteger                                     threadgroupMemoryLength() const;
-
-    NS::UInteger                                     tileHeight() const;
-
-    NS::UInteger                                     tileWidth() const;
-
-    Buffer*                                          visibilityResultBuffer() const;
-
-    VisibilityResultType                             visibilityResultType() const;
-};
-
-}
-_MTL_INLINE MTL::ClearColor::ClearColor(double red, double green, double blue, double alpha)
-    : red(red)
-    , green(green)
-    , blue(blue)
-    , alpha(alpha)
-{
-}
-
-_MTL_INLINE MTL::ClearColor MTL::ClearColor::Make(double red, double green, double blue, double alpha)
-{
-    return ClearColor(red, green, blue, alpha);
-}
-
-_MTL_INLINE MTL::RenderPassAttachmentDescriptor* MTL::RenderPassAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::depthPlane() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(depthPlane));
-}
-
-_MTL_INLINE MTL::RenderPassAttachmentDescriptor* MTL::RenderPassAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassAttachmentDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::level() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(level));
-}
-
-_MTL_INLINE MTL::LoadAction MTL::RenderPassAttachmentDescriptor::loadAction() const
-{
-    return Object::sendMessage<MTL::LoadAction>(this, _MTL_PRIVATE_SEL(loadAction));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::resolveDepthPlane() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(resolveDepthPlane));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::resolveLevel() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(resolveLevel));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::resolveSlice() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(resolveSlice));
-}
-
-_MTL_INLINE MTL::Texture* MTL::RenderPassAttachmentDescriptor::resolveTexture() const
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(resolveTexture));
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setDepthPlane(NS::UInteger depthPlane)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthPlane_), depthPlane);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setLevel(NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLevel_), level);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setLoadAction(MTL::LoadAction loadAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLoadAction_), loadAction);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setResolveDepthPlane(NS::UInteger resolveDepthPlane)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResolveDepthPlane_), resolveDepthPlane);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setResolveLevel(NS::UInteger resolveLevel)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResolveLevel_), resolveLevel);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setResolveSlice(NS::UInteger resolveSlice)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResolveSlice_), resolveSlice);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setResolveTexture(const MTL::Texture* resolveTexture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResolveTexture_), resolveTexture);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setSlice(NS::UInteger slice)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSlice_), slice);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setStoreAction(MTL::StoreAction storeAction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStoreAction_), storeAction);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setStoreActionOptions(MTL::StoreActionOptions storeActionOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStoreActionOptions_), storeActionOptions);
-}
-
-_MTL_INLINE void MTL::RenderPassAttachmentDescriptor::setTexture(const MTL::Texture* texture)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTexture_), texture);
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassAttachmentDescriptor::slice() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(slice));
-}
-
-_MTL_INLINE MTL::StoreAction MTL::RenderPassAttachmentDescriptor::storeAction() const
-{
-    return Object::sendMessage<MTL::StoreAction>(this, _MTL_PRIVATE_SEL(storeAction));
-}
-
-_MTL_INLINE MTL::StoreActionOptions MTL::RenderPassAttachmentDescriptor::storeActionOptions() const
-{
-    return Object::sendMessage<MTL::StoreActionOptions>(this, _MTL_PRIVATE_SEL(storeActionOptions));
-}
-
-_MTL_INLINE MTL::Texture* MTL::RenderPassAttachmentDescriptor::texture() const
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(texture));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptor* MTL::RenderPassColorAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassColorAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassColorAttachmentDescriptor));
-}
-
-_MTL_INLINE MTL::ClearColor MTL::RenderPassColorAttachmentDescriptor::clearColor() const
-{
-    return Object::sendMessage<MTL::ClearColor>(this, _MTL_PRIVATE_SEL(clearColor));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptor* MTL::RenderPassColorAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassColorAttachmentDescriptor>();
-}
-
-_MTL_INLINE void MTL::RenderPassColorAttachmentDescriptor::setClearColor(MTL::ClearColor clearColor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setClearColor_), clearColor);
-}
-
-_MTL_INLINE MTL::RenderPassDepthAttachmentDescriptor* MTL::RenderPassDepthAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassDepthAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassDepthAttachmentDescriptor));
-}
-
-_MTL_INLINE double MTL::RenderPassDepthAttachmentDescriptor::clearDepth() const
-{
-    return Object::sendMessage<double>(this, _MTL_PRIVATE_SEL(clearDepth));
-}
-
-_MTL_INLINE MTL::MultisampleDepthResolveFilter MTL::RenderPassDepthAttachmentDescriptor::depthResolveFilter() const
-{
-    return Object::sendMessage<MTL::MultisampleDepthResolveFilter>(this, _MTL_PRIVATE_SEL(depthResolveFilter));
-}
-
-_MTL_INLINE MTL::RenderPassDepthAttachmentDescriptor* MTL::RenderPassDepthAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassDepthAttachmentDescriptor>();
-}
-
-_MTL_INLINE void MTL::RenderPassDepthAttachmentDescriptor::setClearDepth(double clearDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setClearDepth_), clearDepth);
-}
-
-_MTL_INLINE void MTL::RenderPassDepthAttachmentDescriptor::setDepthResolveFilter(MTL::MultisampleDepthResolveFilter depthResolveFilter)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthResolveFilter_), depthResolveFilter);
-}
-
-_MTL_INLINE MTL::RenderPassStencilAttachmentDescriptor* MTL::RenderPassStencilAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassStencilAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassStencilAttachmentDescriptor));
-}
-
-_MTL_INLINE uint32_t MTL::RenderPassStencilAttachmentDescriptor::clearStencil() const
-{
-    return Object::sendMessage<uint32_t>(this, _MTL_PRIVATE_SEL(clearStencil));
-}
-
-_MTL_INLINE MTL::RenderPassStencilAttachmentDescriptor* MTL::RenderPassStencilAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassStencilAttachmentDescriptor>();
-}
-
-_MTL_INLINE void MTL::RenderPassStencilAttachmentDescriptor::setClearStencil(uint32_t clearStencil)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setClearStencil_), clearStencil);
-}
-
-_MTL_INLINE void MTL::RenderPassStencilAttachmentDescriptor::setStencilResolveFilter(MTL::MultisampleStencilResolveFilter stencilResolveFilter)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilResolveFilter_), stencilResolveFilter);
-}
-
-_MTL_INLINE MTL::MultisampleStencilResolveFilter MTL::RenderPassStencilAttachmentDescriptor::stencilResolveFilter() const
-{
-    return Object::sendMessage<MTL::MultisampleStencilResolveFilter>(this, _MTL_PRIVATE_SEL(stencilResolveFilter));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptorArray* MTL::RenderPassColorAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassColorAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLRenderPassColorAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptorArray* MTL::RenderPassColorAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::RenderPassColorAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptor* MTL::RenderPassColorAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::RenderPassColorAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::RenderPassColorAttachmentDescriptorArray::setObject(const MTL::RenderPassColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptor* MTL::RenderPassSampleBufferAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassSampleBufferAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassSampleBufferAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassSampleBufferAttachmentDescriptor::endOfFragmentSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfFragmentSampleIndex));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassSampleBufferAttachmentDescriptor::endOfVertexSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfVertexSampleIndex));
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptor* MTL::RenderPassSampleBufferAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassSampleBufferAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::RenderPassSampleBufferAttachmentDescriptor::sampleBuffer() const
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(sampleBuffer));
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptor::setEndOfFragmentSampleIndex(NS::UInteger endOfFragmentSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfFragmentSampleIndex_), endOfFragmentSampleIndex);
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptor::setEndOfVertexSampleIndex(NS::UInteger endOfVertexSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfVertexSampleIndex_), endOfVertexSampleIndex);
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptor::setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleBuffer_), sampleBuffer);
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptor::setStartOfFragmentSampleIndex(NS::UInteger startOfFragmentSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfFragmentSampleIndex_), startOfFragmentSampleIndex);
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptor::setStartOfVertexSampleIndex(NS::UInteger startOfVertexSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfVertexSampleIndex_), startOfVertexSampleIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassSampleBufferAttachmentDescriptor::startOfFragmentSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfFragmentSampleIndex));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassSampleBufferAttachmentDescriptor::startOfVertexSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfVertexSampleIndex));
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptorArray* MTL::RenderPassSampleBufferAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassSampleBufferAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLRenderPassSampleBufferAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptorArray* MTL::RenderPassSampleBufferAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::RenderPassSampleBufferAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptor* MTL::RenderPassSampleBufferAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::RenderPassSampleBufferAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::RenderPassSampleBufferAttachmentDescriptorArray::setObject(const MTL::RenderPassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::RenderPassDescriptor* MTL::RenderPassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPassDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPassDescriptor));
-}
-
-_MTL_INLINE MTL::RenderPassColorAttachmentDescriptorArray* MTL::RenderPassDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::RenderPassColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::defaultRasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(defaultRasterSampleCount));
-}
-
-_MTL_INLINE MTL::RenderPassDepthAttachmentDescriptor* MTL::RenderPassDescriptor::depthAttachment() const
-{
-    return Object::sendMessage<MTL::RenderPassDepthAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(depthAttachment));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::getSamplePositions(MTL::SamplePosition* positions, NS::UInteger count)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(getSamplePositions_count_), positions, count);
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::imageblockSampleLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(imageblockSampleLength));
-}
-
-_MTL_INLINE MTL::RenderPassDescriptor* MTL::RenderPassDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPassDescriptor>();
-}
-
-_MTL_INLINE MTL::RasterizationRateMap* MTL::RenderPassDescriptor::rasterizationRateMap() const
-{
-    return Object::sendMessage<MTL::RasterizationRateMap*>(this, _MTL_PRIVATE_SEL(rasterizationRateMap));
-}
-
-_MTL_INLINE MTL::RenderPassDescriptor* MTL::RenderPassDescriptor::renderPassDescriptor()
-{
-    return Object::sendMessage<MTL::RenderPassDescriptor*>(_MTL_PRIVATE_CLS(MTLRenderPassDescriptor), _MTL_PRIVATE_SEL(renderPassDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::renderTargetArrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetArrayLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::renderTargetHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::renderTargetWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(renderTargetWidth));
-}
-
-_MTL_INLINE MTL::RenderPassSampleBufferAttachmentDescriptorArray* MTL::RenderPassDescriptor::sampleBufferAttachments() const
-{
-    return Object::sendMessage<MTL::RenderPassSampleBufferAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(sampleBufferAttachments));
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setDefaultRasterSampleCount(NS::UInteger defaultRasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDefaultRasterSampleCount_), defaultRasterSampleCount);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setDepthAttachment(const MTL::RenderPassDepthAttachmentDescriptor* depthAttachment)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthAttachment_), depthAttachment);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setImageblockSampleLength(NS::UInteger imageblockSampleLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setImageblockSampleLength_), imageblockSampleLength);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setRasterizationRateMap(const MTL::RasterizationRateMap* rasterizationRateMap)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationRateMap_), rasterizationRateMap);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setRenderTargetArrayLength(NS::UInteger renderTargetArrayLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetArrayLength_), renderTargetArrayLength);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setRenderTargetHeight(NS::UInteger renderTargetHeight)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetHeight_), renderTargetHeight);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setRenderTargetWidth(NS::UInteger renderTargetWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRenderTargetWidth_), renderTargetWidth);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setSamplePositions(const MTL::SamplePosition* positions, NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSamplePositions_count_), positions, count);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setStencilAttachment(const MTL::RenderPassStencilAttachmentDescriptor* stencilAttachment)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilAttachment_), stencilAttachment);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setSupportColorAttachmentMapping(bool supportColorAttachmentMapping)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportColorAttachmentMapping_), supportColorAttachmentMapping);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setThreadgroupMemoryLength(NS::UInteger threadgroupMemoryLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupMemoryLength_), threadgroupMemoryLength);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setTileHeight(NS::UInteger tileHeight)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileHeight_), tileHeight);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setTileWidth(NS::UInteger tileWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileWidth_), tileWidth);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setVisibilityResultBuffer(const MTL::Buffer* visibilityResultBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultBuffer_), visibilityResultBuffer);
-}
-
-_MTL_INLINE void MTL::RenderPassDescriptor::setVisibilityResultType(MTL::VisibilityResultType visibilityResultType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVisibilityResultType_), visibilityResultType);
-}
-
-_MTL_INLINE MTL::RenderPassStencilAttachmentDescriptor* MTL::RenderPassDescriptor::stencilAttachment() const
-{
-    return Object::sendMessage<MTL::RenderPassStencilAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(stencilAttachment));
-}
-
-_MTL_INLINE bool MTL::RenderPassDescriptor::supportColorAttachmentMapping() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportColorAttachmentMapping));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::threadgroupMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(threadgroupMemoryLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::tileHeight() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileHeight));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPassDescriptor::tileWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tileWidth));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::RenderPassDescriptor::visibilityResultBuffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(visibilityResultBuffer));
-}
-
-_MTL_INLINE MTL::VisibilityResultType MTL::RenderPassDescriptor::visibilityResultType() const
-{
-    return Object::sendMessage<MTL::VisibilityResultType>(this, _MTL_PRIVATE_SEL(visibilityResultType));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLRenderPipeline.hpp b/engine/thirdparty/metal-cpp/Metal/MTLRenderPipeline.hpp
deleted file mode 100644
index aaa9cdad..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLRenderPipeline.hpp
+++ /dev/null
@@ -1,1876 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLRenderPipeline.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPipeline.hpp"
-#include "MTLPixelFormat.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRenderCommandEncoder.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Device;
-class Function;
-class FunctionHandle;
-class IntersectionFunctionTable;
-class IntersectionFunctionTableDescriptor;
-class LinkedFunctions;
-class LogicalToPhysicalColorAttachmentMap;
-class MeshRenderPipelineDescriptor;
-class PipelineBufferDescriptorArray;
-class RenderPipelineColorAttachmentDescriptor;
-class RenderPipelineColorAttachmentDescriptorArray;
-class RenderPipelineDescriptor;
-class RenderPipelineFunctionsDescriptor;
-class RenderPipelineReflection;
-class RenderPipelineState;
-class TileRenderPipelineColorAttachmentDescriptor;
-class TileRenderPipelineColorAttachmentDescriptorArray;
-class TileRenderPipelineDescriptor;
-class VertexDescriptor;
-class VisibleFunctionTable;
-class VisibleFunctionTableDescriptor;
-
-}
-namespace MTL4
-{
-class BinaryFunction;
-class PipelineDescriptor;
-class RenderPipelineBinaryFunctionsDescriptor;
-
-}
-namespace MTL
-{
-_MTL_ENUM(NS::UInteger, BlendFactor) {
-    BlendFactorZero = 0,
-    BlendFactorOne = 1,
-    BlendFactorSourceColor = 2,
-    BlendFactorOneMinusSourceColor = 3,
-    BlendFactorSourceAlpha = 4,
-    BlendFactorOneMinusSourceAlpha = 5,
-    BlendFactorDestinationColor = 6,
-    BlendFactorOneMinusDestinationColor = 7,
-    BlendFactorDestinationAlpha = 8,
-    BlendFactorOneMinusDestinationAlpha = 9,
-    BlendFactorSourceAlphaSaturated = 10,
-    BlendFactorBlendColor = 11,
-    BlendFactorOneMinusBlendColor = 12,
-    BlendFactorBlendAlpha = 13,
-    BlendFactorOneMinusBlendAlpha = 14,
-    BlendFactorSource1Color = 15,
-    BlendFactorOneMinusSource1Color = 16,
-    BlendFactorSource1Alpha = 17,
-    BlendFactorOneMinusSource1Alpha = 18,
-    BlendFactorUnspecialized = 19,
-};
-
-_MTL_ENUM(NS::UInteger, BlendOperation) {
-    BlendOperationAdd = 0,
-    BlendOperationSubtract = 1,
-    BlendOperationReverseSubtract = 2,
-    BlendOperationMin = 3,
-    BlendOperationMax = 4,
-    BlendOperationUnspecialized = 5,
-};
-
-_MTL_ENUM(NS::UInteger, PrimitiveTopologyClass) {
-    PrimitiveTopologyClassUnspecified = 0,
-    PrimitiveTopologyClassPoint = 1,
-    PrimitiveTopologyClassLine = 2,
-    PrimitiveTopologyClassTriangle = 3,
-};
-
-_MTL_ENUM(NS::UInteger, TessellationPartitionMode) {
-    TessellationPartitionModePow2 = 0,
-    TessellationPartitionModeInteger = 1,
-    TessellationPartitionModeFractionalOdd = 2,
-    TessellationPartitionModeFractionalEven = 3,
-};
-
-_MTL_ENUM(NS::UInteger, TessellationFactorStepFunction) {
-    TessellationFactorStepFunctionConstant = 0,
-    TessellationFactorStepFunctionPerPatch = 1,
-    TessellationFactorStepFunctionPerInstance = 2,
-    TessellationFactorStepFunctionPerPatchAndPerInstance = 3,
-};
-
-_MTL_ENUM(NS::UInteger, TessellationFactorFormat) {
-    TessellationFactorFormatHalf = 0,
-};
-
-_MTL_ENUM(NS::UInteger, TessellationControlPointIndexType) {
-    TessellationControlPointIndexTypeNone = 0,
-    TessellationControlPointIndexTypeUInt16 = 1,
-    TessellationControlPointIndexTypeUInt32 = 2,
-};
-
-_MTL_OPTIONS(NS::UInteger, ColorWriteMask) {
-    ColorWriteMaskNone = 0,
-    ColorWriteMaskRed = 1 << 3,
-    ColorWriteMaskGreen = 1 << 2,
-    ColorWriteMaskBlue = 1 << 1,
-    ColorWriteMaskAlpha = 1,
-    ColorWriteMaskAll = 15,
-    ColorWriteMaskUnspecialized = 1 << 4,
-};
-
-class RenderPipelineColorAttachmentDescriptor : public NS::Copying<RenderPipelineColorAttachmentDescriptor>
-{
-public:
-    static RenderPipelineColorAttachmentDescriptor* alloc();
-
-    BlendOperation                                  alphaBlendOperation() const;
-
-    [[deprecated("please use isBlendingEnabled instead")]]
-    bool                                     blendingEnabled() const;
-
-    BlendFactor                              destinationAlphaBlendFactor() const;
-
-    BlendFactor                              destinationRGBBlendFactor() const;
-
-    RenderPipelineColorAttachmentDescriptor* init();
-
-    bool                                     isBlendingEnabled() const;
-
-    PixelFormat                              pixelFormat() const;
-
-    BlendOperation                           rgbBlendOperation() const;
-
-    void                                     setAlphaBlendOperation(MTL::BlendOperation alphaBlendOperation);
-
-    void                                     setBlendingEnabled(bool blendingEnabled);
-
-    void                                     setDestinationAlphaBlendFactor(MTL::BlendFactor destinationAlphaBlendFactor);
-
-    void                                     setDestinationRGBBlendFactor(MTL::BlendFactor destinationRGBBlendFactor);
-
-    void                                     setPixelFormat(MTL::PixelFormat pixelFormat);
-
-    void                                     setRgbBlendOperation(MTL::BlendOperation rgbBlendOperation);
-
-    void                                     setSourceAlphaBlendFactor(MTL::BlendFactor sourceAlphaBlendFactor);
-
-    void                                     setSourceRGBBlendFactor(MTL::BlendFactor sourceRGBBlendFactor);
-
-    void                                     setWriteMask(MTL::ColorWriteMask writeMask);
-
-    BlendFactor                              sourceAlphaBlendFactor() const;
-
-    BlendFactor                              sourceRGBBlendFactor() const;
-
-    ColorWriteMask                           writeMask() const;
-};
-class LogicalToPhysicalColorAttachmentMap : public NS::Copying<LogicalToPhysicalColorAttachmentMap>
-{
-public:
-    static LogicalToPhysicalColorAttachmentMap* alloc();
-
-    NS::UInteger                                getPhysicalIndex(NS::UInteger logicalIndex);
-
-    LogicalToPhysicalColorAttachmentMap*        init();
-
-    void                                        reset();
-
-    void                                        setPhysicalIndex(NS::UInteger physicalIndex, NS::UInteger logicalIndex);
-};
-class RenderPipelineReflection : public NS::Referencing<RenderPipelineReflection>
-{
-public:
-    static RenderPipelineReflection* alloc();
-
-    NS::Array*                       fragmentArguments() const;
-
-    NS::Array*                       fragmentBindings() const;
-
-    RenderPipelineReflection*        init();
-
-    NS::Array*                       meshBindings() const;
-
-    NS::Array*                       objectBindings() const;
-
-    NS::Array*                       tileArguments() const;
-
-    NS::Array*                       tileBindings() const;
-
-    NS::Array*                       vertexArguments() const;
-
-    NS::Array*                       vertexBindings() const;
-};
-class RenderPipelineDescriptor : public NS::Copying<RenderPipelineDescriptor>
-{
-public:
-    static RenderPipelineDescriptor* alloc();
-
-    [[deprecated("please use isAlphaToCoverageEnabled instead")]]
-    bool alphaToCoverageEnabled() const;
-
-    [[deprecated("please use isAlphaToOneEnabled instead")]]
-    bool                                          alphaToOneEnabled() const;
-
-    NS::Array*                                    binaryArchives() const;
-
-    RenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    PixelFormat                                   depthAttachmentPixelFormat() const;
-
-    PipelineBufferDescriptorArray*                fragmentBuffers() const;
-
-    Function*                                     fragmentFunction() const;
-
-    LinkedFunctions*                              fragmentLinkedFunctions() const;
-
-    NS::Array*                                    fragmentPreloadedLibraries() const;
-
-    RenderPipelineDescriptor*                     init();
-
-    PrimitiveTopologyClass                        inputPrimitiveTopology() const;
-
-    bool                                          isAlphaToCoverageEnabled() const;
-
-    bool                                          isAlphaToOneEnabled() const;
-
-    bool                                          isRasterizationEnabled() const;
-
-    bool                                          isTessellationFactorScaleEnabled() const;
-
-    NS::String*                                   label() const;
-
-    NS::UInteger                                  maxFragmentCallStackDepth() const;
-
-    NS::UInteger                                  maxTessellationFactor() const;
-
-    NS::UInteger                                  maxVertexAmplificationCount() const;
-
-    NS::UInteger                                  maxVertexCallStackDepth() const;
-
-    NS::UInteger                                  rasterSampleCount() const;
-
-    [[deprecated("please use isRasterizationEnabled instead")]]
-    bool                              rasterizationEnabled() const;
-
-    void                              reset();
-
-    NS::UInteger                      sampleCount() const;
-
-    void                              setAlphaToCoverageEnabled(bool alphaToCoverageEnabled);
-
-    void                              setAlphaToOneEnabled(bool alphaToOneEnabled);
-
-    void                              setBinaryArchives(const NS::Array* binaryArchives);
-
-    void                              setDepthAttachmentPixelFormat(MTL::PixelFormat depthAttachmentPixelFormat);
-
-    void                              setFragmentFunction(const MTL::Function* fragmentFunction);
-
-    void                              setFragmentLinkedFunctions(const MTL::LinkedFunctions* fragmentLinkedFunctions);
-
-    void                              setFragmentPreloadedLibraries(const NS::Array* fragmentPreloadedLibraries);
-
-    void                              setInputPrimitiveTopology(MTL::PrimitiveTopologyClass inputPrimitiveTopology);
-
-    void                              setLabel(const NS::String* label);
-
-    void                              setMaxFragmentCallStackDepth(NS::UInteger maxFragmentCallStackDepth);
-
-    void                              setMaxTessellationFactor(NS::UInteger maxTessellationFactor);
-
-    void                              setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount);
-
-    void                              setMaxVertexCallStackDepth(NS::UInteger maxVertexCallStackDepth);
-
-    void                              setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void                              setRasterizationEnabled(bool rasterizationEnabled);
-
-    void                              setSampleCount(NS::UInteger sampleCount);
-
-    void                              setShaderValidation(MTL::ShaderValidation shaderValidation);
-
-    void                              setStencilAttachmentPixelFormat(MTL::PixelFormat stencilAttachmentPixelFormat);
-
-    void                              setSupportAddingFragmentBinaryFunctions(bool supportAddingFragmentBinaryFunctions);
-
-    void                              setSupportAddingVertexBinaryFunctions(bool supportAddingVertexBinaryFunctions);
-
-    void                              setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers);
-
-    void                              setTessellationControlPointIndexType(MTL::TessellationControlPointIndexType tessellationControlPointIndexType);
-
-    void                              setTessellationFactorFormat(MTL::TessellationFactorFormat tessellationFactorFormat);
-
-    void                              setTessellationFactorScaleEnabled(bool tessellationFactorScaleEnabled);
-
-    void                              setTessellationFactorStepFunction(MTL::TessellationFactorStepFunction tessellationFactorStepFunction);
-
-    void                              setTessellationOutputWindingOrder(MTL::Winding tessellationOutputWindingOrder);
-
-    void                              setTessellationPartitionMode(MTL::TessellationPartitionMode tessellationPartitionMode);
-
-    void                              setVertexDescriptor(const MTL::VertexDescriptor* vertexDescriptor);
-
-    void                              setVertexFunction(const MTL::Function* vertexFunction);
-
-    void                              setVertexLinkedFunctions(const MTL::LinkedFunctions* vertexLinkedFunctions);
-
-    void                              setVertexPreloadedLibraries(const NS::Array* vertexPreloadedLibraries);
-
-    ShaderValidation                  shaderValidation() const;
-
-    PixelFormat                       stencilAttachmentPixelFormat() const;
-
-    bool                              supportAddingFragmentBinaryFunctions() const;
-
-    bool                              supportAddingVertexBinaryFunctions() const;
-
-    bool                              supportIndirectCommandBuffers() const;
-
-    TessellationControlPointIndexType tessellationControlPointIndexType() const;
-
-    TessellationFactorFormat          tessellationFactorFormat() const;
-
-    [[deprecated("please use isTessellationFactorScaleEnabled instead")]]
-    bool                           tessellationFactorScaleEnabled() const;
-
-    TessellationFactorStepFunction tessellationFactorStepFunction() const;
-
-    Winding                        tessellationOutputWindingOrder() const;
-
-    TessellationPartitionMode      tessellationPartitionMode() const;
-
-    PipelineBufferDescriptorArray* vertexBuffers() const;
-
-    VertexDescriptor*              vertexDescriptor() const;
-
-    Function*                      vertexFunction() const;
-
-    LinkedFunctions*               vertexLinkedFunctions() const;
-
-    NS::Array*                     vertexPreloadedLibraries() const;
-};
-class RenderPipelineFunctionsDescriptor : public NS::Copying<RenderPipelineFunctionsDescriptor>
-{
-public:
-    static RenderPipelineFunctionsDescriptor* alloc();
-
-    NS::Array*                                fragmentAdditionalBinaryFunctions() const;
-
-    RenderPipelineFunctionsDescriptor*        init();
-
-    void                                      setFragmentAdditionalBinaryFunctions(const NS::Array* fragmentAdditionalBinaryFunctions);
-
-    void                                      setTileAdditionalBinaryFunctions(const NS::Array* tileAdditionalBinaryFunctions);
-
-    void                                      setVertexAdditionalBinaryFunctions(const NS::Array* vertexAdditionalBinaryFunctions);
-
-    NS::Array*                                tileAdditionalBinaryFunctions() const;
-
-    NS::Array*                                vertexAdditionalBinaryFunctions() const;
-};
-class RenderPipelineState : public NS::Referencing<RenderPipelineState, Allocation>
-{
-public:
-    Device*                    device() const;
-
-    FunctionHandle*            functionHandle(const NS::String* name, MTL::RenderStages stage);
-    FunctionHandle*            functionHandle(const MTL4::BinaryFunction* function, MTL::RenderStages stage);
-    FunctionHandle*            functionHandle(const MTL::Function* function, MTL::RenderStages stage);
-
-    ResourceID                 gpuResourceID() const;
-
-    NS::UInteger               imageblockMemoryLength(MTL::Size imageblockDimensions);
-
-    NS::UInteger               imageblockSampleLength() const;
-
-    NS::String*                label() const;
-
-    NS::UInteger               maxTotalThreadgroupsPerMeshGrid() const;
-
-    NS::UInteger               maxTotalThreadsPerMeshThreadgroup() const;
-
-    NS::UInteger               maxTotalThreadsPerObjectThreadgroup() const;
-
-    NS::UInteger               maxTotalThreadsPerThreadgroup() const;
-
-    NS::UInteger               meshThreadExecutionWidth() const;
-
-    IntersectionFunctionTable* newIntersectionFunctionTable(const MTL::IntersectionFunctionTableDescriptor* descriptor, MTL::RenderStages stage);
-
-    MTL4::PipelineDescriptor*  newRenderPipelineDescriptor();
-
-    RenderPipelineState*       newRenderPipelineState(const MTL4::RenderPipelineBinaryFunctionsDescriptor* binaryFunctionsDescriptor, NS::Error** error);
-    RenderPipelineState*       newRenderPipelineState(const MTL::RenderPipelineFunctionsDescriptor* additionalBinaryFunctions, NS::Error** error);
-
-    VisibleFunctionTable*      newVisibleFunctionTable(const MTL::VisibleFunctionTableDescriptor* descriptor, MTL::RenderStages stage);
-
-    NS::UInteger               objectThreadExecutionWidth() const;
-
-    RenderPipelineReflection*  reflection() const;
-
-    Size                       requiredThreadsPerMeshThreadgroup() const;
-
-    Size                       requiredThreadsPerObjectThreadgroup() const;
-
-    Size                       requiredThreadsPerTileThreadgroup() const;
-
-    ShaderValidation           shaderValidation() const;
-
-    bool                       supportIndirectCommandBuffers() const;
-
-    bool                       threadgroupSizeMatchesTileSize() const;
-};
-class RenderPipelineColorAttachmentDescriptorArray : public NS::Referencing<RenderPipelineColorAttachmentDescriptorArray>
-{
-public:
-    static RenderPipelineColorAttachmentDescriptorArray* alloc();
-
-    RenderPipelineColorAttachmentDescriptorArray*        init();
-
-    RenderPipelineColorAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                 setObject(const MTL::RenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class TileRenderPipelineColorAttachmentDescriptor : public NS::Copying<TileRenderPipelineColorAttachmentDescriptor>
-{
-public:
-    static TileRenderPipelineColorAttachmentDescriptor* alloc();
-
-    TileRenderPipelineColorAttachmentDescriptor*        init();
-
-    PixelFormat                                         pixelFormat() const;
-    void                                                setPixelFormat(MTL::PixelFormat pixelFormat);
-};
-class TileRenderPipelineColorAttachmentDescriptorArray : public NS::Referencing<TileRenderPipelineColorAttachmentDescriptorArray>
-{
-public:
-    static TileRenderPipelineColorAttachmentDescriptorArray* alloc();
-
-    TileRenderPipelineColorAttachmentDescriptorArray*        init();
-
-    TileRenderPipelineColorAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                     setObject(const MTL::TileRenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class TileRenderPipelineDescriptor : public NS::Copying<TileRenderPipelineDescriptor>
-{
-public:
-    static TileRenderPipelineDescriptor*              alloc();
-
-    NS::Array*                                        binaryArchives() const;
-
-    TileRenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    TileRenderPipelineDescriptor*                     init();
-
-    NS::String*                                       label() const;
-
-    LinkedFunctions*                                  linkedFunctions() const;
-
-    NS::UInteger                                      maxCallStackDepth() const;
-
-    NS::UInteger                                      maxTotalThreadsPerThreadgroup() const;
-
-    NS::Array*                                        preloadedLibraries() const;
-
-    NS::UInteger                                      rasterSampleCount() const;
-
-    Size                                              requiredThreadsPerThreadgroup() const;
-
-    void                                              reset();
-
-    void                                              setBinaryArchives(const NS::Array* binaryArchives);
-
-    void                                              setLabel(const NS::String* label);
-
-    void                                              setLinkedFunctions(const MTL::LinkedFunctions* linkedFunctions);
-
-    void                                              setMaxCallStackDepth(NS::UInteger maxCallStackDepth);
-
-    void                                              setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup);
-
-    void                                              setPreloadedLibraries(const NS::Array* preloadedLibraries);
-
-    void                                              setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void                                              setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup);
-
-    void                                              setShaderValidation(MTL::ShaderValidation shaderValidation);
-
-    void                                              setSupportAddingBinaryFunctions(bool supportAddingBinaryFunctions);
-
-    void                                              setThreadgroupSizeMatchesTileSize(bool threadgroupSizeMatchesTileSize);
-
-    void                                              setTileFunction(const MTL::Function* tileFunction);
-
-    ShaderValidation                                  shaderValidation() const;
-
-    bool                                              supportAddingBinaryFunctions() const;
-
-    bool                                              threadgroupSizeMatchesTileSize() const;
-
-    PipelineBufferDescriptorArray*                    tileBuffers() const;
-
-    Function*                                         tileFunction() const;
-};
-class MeshRenderPipelineDescriptor : public NS::Copying<MeshRenderPipelineDescriptor>
-{
-public:
-    static MeshRenderPipelineDescriptor* alloc();
-
-    [[deprecated("please use isAlphaToCoverageEnabled instead")]]
-    bool alphaToCoverageEnabled() const;
-
-    [[deprecated("please use isAlphaToOneEnabled instead")]]
-    bool                                          alphaToOneEnabled() const;
-
-    NS::Array*                                    binaryArchives() const;
-
-    RenderPipelineColorAttachmentDescriptorArray* colorAttachments() const;
-
-    PixelFormat                                   depthAttachmentPixelFormat() const;
-
-    PipelineBufferDescriptorArray*                fragmentBuffers() const;
-
-    Function*                                     fragmentFunction() const;
-
-    LinkedFunctions*                              fragmentLinkedFunctions() const;
-
-    MeshRenderPipelineDescriptor*                 init();
-
-    bool                                          isAlphaToCoverageEnabled() const;
-
-    bool                                          isAlphaToOneEnabled() const;
-
-    bool                                          isRasterizationEnabled() const;
-
-    NS::String*                                   label() const;
-
-    NS::UInteger                                  maxTotalThreadgroupsPerMeshGrid() const;
-
-    NS::UInteger                                  maxTotalThreadsPerMeshThreadgroup() const;
-
-    NS::UInteger                                  maxTotalThreadsPerObjectThreadgroup() const;
-
-    NS::UInteger                                  maxVertexAmplificationCount() const;
-
-    PipelineBufferDescriptorArray*                meshBuffers() const;
-
-    Function*                                     meshFunction() const;
-
-    LinkedFunctions*                              meshLinkedFunctions() const;
-
-    bool                                          meshThreadgroupSizeIsMultipleOfThreadExecutionWidth() const;
-
-    PipelineBufferDescriptorArray*                objectBuffers() const;
-
-    Function*                                     objectFunction() const;
-
-    LinkedFunctions*                              objectLinkedFunctions() const;
-
-    bool                                          objectThreadgroupSizeIsMultipleOfThreadExecutionWidth() const;
-
-    NS::UInteger                                  payloadMemoryLength() const;
-
-    NS::UInteger                                  rasterSampleCount() const;
-
-    [[deprecated("please use isRasterizationEnabled instead")]]
-    bool             rasterizationEnabled() const;
-
-    Size             requiredThreadsPerMeshThreadgroup() const;
-
-    Size             requiredThreadsPerObjectThreadgroup() const;
-
-    void             reset();
-
-    void             setAlphaToCoverageEnabled(bool alphaToCoverageEnabled);
-
-    void             setAlphaToOneEnabled(bool alphaToOneEnabled);
-
-    void             setBinaryArchives(const NS::Array* binaryArchives);
-
-    void             setDepthAttachmentPixelFormat(MTL::PixelFormat depthAttachmentPixelFormat);
-
-    void             setFragmentFunction(const MTL::Function* fragmentFunction);
-
-    void             setFragmentLinkedFunctions(const MTL::LinkedFunctions* fragmentLinkedFunctions);
-
-    void             setLabel(const NS::String* label);
-
-    void             setMaxTotalThreadgroupsPerMeshGrid(NS::UInteger maxTotalThreadgroupsPerMeshGrid);
-
-    void             setMaxTotalThreadsPerMeshThreadgroup(NS::UInteger maxTotalThreadsPerMeshThreadgroup);
-
-    void             setMaxTotalThreadsPerObjectThreadgroup(NS::UInteger maxTotalThreadsPerObjectThreadgroup);
-
-    void             setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount);
-
-    void             setMeshFunction(const MTL::Function* meshFunction);
-
-    void             setMeshLinkedFunctions(const MTL::LinkedFunctions* meshLinkedFunctions);
-
-    void             setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool meshThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-
-    void             setObjectFunction(const MTL::Function* objectFunction);
-
-    void             setObjectLinkedFunctions(const MTL::LinkedFunctions* objectLinkedFunctions);
-
-    void             setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool objectThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-
-    void             setPayloadMemoryLength(NS::UInteger payloadMemoryLength);
-
-    void             setRasterSampleCount(NS::UInteger rasterSampleCount);
-
-    void             setRasterizationEnabled(bool rasterizationEnabled);
-
-    void             setRequiredThreadsPerMeshThreadgroup(MTL::Size requiredThreadsPerMeshThreadgroup);
-
-    void             setRequiredThreadsPerObjectThreadgroup(MTL::Size requiredThreadsPerObjectThreadgroup);
-
-    void             setShaderValidation(MTL::ShaderValidation shaderValidation);
-
-    void             setStencilAttachmentPixelFormat(MTL::PixelFormat stencilAttachmentPixelFormat);
-
-    void             setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers);
-
-    ShaderValidation shaderValidation() const;
-
-    PixelFormat      stencilAttachmentPixelFormat() const;
-
-    bool             supportIndirectCommandBuffers() const;
-};
-
-}
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptor* MTL::RenderPipelineColorAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPipelineColorAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPipelineColorAttachmentDescriptor));
-}
-
-_MTL_INLINE MTL::BlendOperation MTL::RenderPipelineColorAttachmentDescriptor::alphaBlendOperation() const
-{
-    return Object::sendMessage<MTL::BlendOperation>(this, _MTL_PRIVATE_SEL(alphaBlendOperation));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineColorAttachmentDescriptor::blendingEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isBlendingEnabled));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL::RenderPipelineColorAttachmentDescriptor::destinationAlphaBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(destinationAlphaBlendFactor));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL::RenderPipelineColorAttachmentDescriptor::destinationRGBBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(destinationRGBBlendFactor));
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptor* MTL::RenderPipelineColorAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPipelineColorAttachmentDescriptor>();
-}
-
-_MTL_INLINE bool MTL::RenderPipelineColorAttachmentDescriptor::isBlendingEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isBlendingEnabled));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::RenderPipelineColorAttachmentDescriptor::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE MTL::BlendOperation MTL::RenderPipelineColorAttachmentDescriptor::rgbBlendOperation() const
-{
-    return Object::sendMessage<MTL::BlendOperation>(this, _MTL_PRIVATE_SEL(rgbBlendOperation));
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setAlphaBlendOperation(MTL::BlendOperation alphaBlendOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaBlendOperation_), alphaBlendOperation);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setBlendingEnabled(bool blendingEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBlendingEnabled_), blendingEnabled);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setDestinationAlphaBlendFactor(MTL::BlendFactor destinationAlphaBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDestinationAlphaBlendFactor_), destinationAlphaBlendFactor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setDestinationRGBBlendFactor(MTL::BlendFactor destinationRGBBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDestinationRGBBlendFactor_), destinationRGBBlendFactor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setRgbBlendOperation(MTL::BlendOperation rgbBlendOperation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRgbBlendOperation_), rgbBlendOperation);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setSourceAlphaBlendFactor(MTL::BlendFactor sourceAlphaBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSourceAlphaBlendFactor_), sourceAlphaBlendFactor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setSourceRGBBlendFactor(MTL::BlendFactor sourceRGBBlendFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSourceRGBBlendFactor_), sourceRGBBlendFactor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptor::setWriteMask(MTL::ColorWriteMask writeMask)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setWriteMask_), writeMask);
-}
-
-_MTL_INLINE MTL::BlendFactor MTL::RenderPipelineColorAttachmentDescriptor::sourceAlphaBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(sourceAlphaBlendFactor));
-}
-
-_MTL_INLINE MTL::BlendFactor MTL::RenderPipelineColorAttachmentDescriptor::sourceRGBBlendFactor() const
-{
-    return Object::sendMessage<MTL::BlendFactor>(this, _MTL_PRIVATE_SEL(sourceRGBBlendFactor));
-}
-
-_MTL_INLINE MTL::ColorWriteMask MTL::RenderPipelineColorAttachmentDescriptor::writeMask() const
-{
-    return Object::sendMessage<MTL::ColorWriteMask>(this, _MTL_PRIVATE_SEL(writeMask));
-}
-
-_MTL_INLINE MTL::LogicalToPhysicalColorAttachmentMap* MTL::LogicalToPhysicalColorAttachmentMap::alloc()
-{
-    return NS::Object::alloc<MTL::LogicalToPhysicalColorAttachmentMap>(_MTL_PRIVATE_CLS(MTLLogicalToPhysicalColorAttachmentMap));
-}
-
-_MTL_INLINE NS::UInteger MTL::LogicalToPhysicalColorAttachmentMap::getPhysicalIndex(NS::UInteger logicalIndex)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(getPhysicalIndexForLogicalIndex_), logicalIndex);
-}
-
-_MTL_INLINE MTL::LogicalToPhysicalColorAttachmentMap* MTL::LogicalToPhysicalColorAttachmentMap::init()
-{
-    return NS::Object::init<MTL::LogicalToPhysicalColorAttachmentMap>();
-}
-
-_MTL_INLINE void MTL::LogicalToPhysicalColorAttachmentMap::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::LogicalToPhysicalColorAttachmentMap::setPhysicalIndex(NS::UInteger physicalIndex, NS::UInteger logicalIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPhysicalIndex_forLogicalIndex_), physicalIndex, logicalIndex);
-}
-
-_MTL_INLINE MTL::RenderPipelineReflection* MTL::RenderPipelineReflection::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPipelineReflection>(_MTL_PRIVATE_CLS(MTLRenderPipelineReflection));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::fragmentArguments() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(fragmentArguments));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::fragmentBindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(fragmentBindings));
-}
-
-_MTL_INLINE MTL::RenderPipelineReflection* MTL::RenderPipelineReflection::init()
-{
-    return NS::Object::init<MTL::RenderPipelineReflection>();
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::meshBindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(meshBindings));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::objectBindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(objectBindings));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::tileArguments() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(tileArguments));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::tileBindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(tileBindings));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::vertexArguments() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexArguments));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineReflection::vertexBindings() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexBindings));
-}
-
-_MTL_INLINE MTL::RenderPipelineDescriptor* MTL::RenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPipelineDescriptor));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::alphaToCoverageEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToCoverageEnabled));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::alphaToOneEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToOneEnabled));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptorArray* MTL::RenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::RenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::RenderPipelineDescriptor::depthAttachmentPixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(depthAttachmentPixelFormat));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::RenderPipelineDescriptor::fragmentBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(fragmentBuffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::RenderPipelineDescriptor::fragmentFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(fragmentFunction));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::RenderPipelineDescriptor::fragmentLinkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(fragmentLinkedFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineDescriptor::fragmentPreloadedLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(fragmentPreloadedLibraries));
-}
-
-_MTL_INLINE MTL::RenderPipelineDescriptor* MTL::RenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPipelineDescriptor>();
-}
-
-_MTL_INLINE MTL::PrimitiveTopologyClass MTL::RenderPipelineDescriptor::inputPrimitiveTopology() const
-{
-    return Object::sendMessage<MTL::PrimitiveTopologyClass>(this, _MTL_PRIVATE_SEL(inputPrimitiveTopology));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::isAlphaToCoverageEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToCoverageEnabled));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::isAlphaToOneEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToOneEnabled));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::isRasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::isTessellationFactorScaleEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isTessellationFactorScaleEnabled));
-}
-
-_MTL_INLINE NS::String* MTL::RenderPipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::maxFragmentCallStackDepth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxFragmentCallStackDepth));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::maxTessellationFactor() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTessellationFactor));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::maxVertexAmplificationCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexAmplificationCount));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::maxVertexCallStackDepth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexCallStackDepth));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::rasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineDescriptor::sampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setAlphaToCoverageEnabled(bool alphaToCoverageEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToCoverageEnabled_), alphaToCoverageEnabled);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setAlphaToOneEnabled(bool alphaToOneEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToOneEnabled_), alphaToOneEnabled);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setDepthAttachmentPixelFormat(MTL::PixelFormat depthAttachmentPixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthAttachmentPixelFormat_), depthAttachmentPixelFormat);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setFragmentFunction(const MTL::Function* fragmentFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentFunction_), fragmentFunction);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setFragmentLinkedFunctions(const MTL::LinkedFunctions* fragmentLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentLinkedFunctions_), fragmentLinkedFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setFragmentPreloadedLibraries(const NS::Array* fragmentPreloadedLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentPreloadedLibraries_), fragmentPreloadedLibraries);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setInputPrimitiveTopology(MTL::PrimitiveTopologyClass inputPrimitiveTopology)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInputPrimitiveTopology_), inputPrimitiveTopology);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setMaxFragmentCallStackDepth(NS::UInteger maxFragmentCallStackDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxFragmentCallStackDepth_), maxFragmentCallStackDepth);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setMaxTessellationFactor(NS::UInteger maxTessellationFactor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTessellationFactor_), maxTessellationFactor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexAmplificationCount_), maxVertexAmplificationCount);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setMaxVertexCallStackDepth(NS::UInteger maxVertexCallStackDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexCallStackDepth_), maxVertexCallStackDepth);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setRasterizationEnabled(bool rasterizationEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationEnabled_), rasterizationEnabled);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setSampleCount(NS::UInteger sampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleCount_), sampleCount);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setShaderValidation(MTL::ShaderValidation shaderValidation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderValidation_), shaderValidation);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setStencilAttachmentPixelFormat(MTL::PixelFormat stencilAttachmentPixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilAttachmentPixelFormat_), stencilAttachmentPixelFormat);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setSupportAddingFragmentBinaryFunctions(bool supportAddingFragmentBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportAddingFragmentBinaryFunctions_), supportAddingFragmentBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setSupportAddingVertexBinaryFunctions(bool supportAddingVertexBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportAddingVertexBinaryFunctions_), supportAddingVertexBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationControlPointIndexType(MTL::TessellationControlPointIndexType tessellationControlPointIndexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationControlPointIndexType_), tessellationControlPointIndexType);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationFactorFormat(MTL::TessellationFactorFormat tessellationFactorFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationFactorFormat_), tessellationFactorFormat);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationFactorScaleEnabled(bool tessellationFactorScaleEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationFactorScaleEnabled_), tessellationFactorScaleEnabled);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationFactorStepFunction(MTL::TessellationFactorStepFunction tessellationFactorStepFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationFactorStepFunction_), tessellationFactorStepFunction);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationOutputWindingOrder(MTL::Winding tessellationOutputWindingOrder)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationOutputWindingOrder_), tessellationOutputWindingOrder);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setTessellationPartitionMode(MTL::TessellationPartitionMode tessellationPartitionMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTessellationPartitionMode_), tessellationPartitionMode);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setVertexDescriptor(const MTL::VertexDescriptor* vertexDescriptor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexDescriptor_), vertexDescriptor);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setVertexFunction(const MTL::Function* vertexFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexFunction_), vertexFunction);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setVertexLinkedFunctions(const MTL::LinkedFunctions* vertexLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexLinkedFunctions_), vertexLinkedFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineDescriptor::setVertexPreloadedLibraries(const NS::Array* vertexPreloadedLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexPreloadedLibraries_), vertexPreloadedLibraries);
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::RenderPipelineDescriptor::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::RenderPipelineDescriptor::stencilAttachmentPixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(stencilAttachmentPixelFormat));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::supportAddingFragmentBinaryFunctions() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportAddingFragmentBinaryFunctions));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::supportAddingVertexBinaryFunctions() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportAddingVertexBinaryFunctions));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE MTL::TessellationControlPointIndexType MTL::RenderPipelineDescriptor::tessellationControlPointIndexType() const
-{
-    return Object::sendMessage<MTL::TessellationControlPointIndexType>(this, _MTL_PRIVATE_SEL(tessellationControlPointIndexType));
-}
-
-_MTL_INLINE MTL::TessellationFactorFormat MTL::RenderPipelineDescriptor::tessellationFactorFormat() const
-{
-    return Object::sendMessage<MTL::TessellationFactorFormat>(this, _MTL_PRIVATE_SEL(tessellationFactorFormat));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineDescriptor::tessellationFactorScaleEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isTessellationFactorScaleEnabled));
-}
-
-_MTL_INLINE MTL::TessellationFactorStepFunction MTL::RenderPipelineDescriptor::tessellationFactorStepFunction() const
-{
-    return Object::sendMessage<MTL::TessellationFactorStepFunction>(this, _MTL_PRIVATE_SEL(tessellationFactorStepFunction));
-}
-
-_MTL_INLINE MTL::Winding MTL::RenderPipelineDescriptor::tessellationOutputWindingOrder() const
-{
-    return Object::sendMessage<MTL::Winding>(this, _MTL_PRIVATE_SEL(tessellationOutputWindingOrder));
-}
-
-_MTL_INLINE MTL::TessellationPartitionMode MTL::RenderPipelineDescriptor::tessellationPartitionMode() const
-{
-    return Object::sendMessage<MTL::TessellationPartitionMode>(this, _MTL_PRIVATE_SEL(tessellationPartitionMode));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::RenderPipelineDescriptor::vertexBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(vertexBuffers));
-}
-
-_MTL_INLINE MTL::VertexDescriptor* MTL::RenderPipelineDescriptor::vertexDescriptor() const
-{
-    return Object::sendMessage<MTL::VertexDescriptor*>(this, _MTL_PRIVATE_SEL(vertexDescriptor));
-}
-
-_MTL_INLINE MTL::Function* MTL::RenderPipelineDescriptor::vertexFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(vertexFunction));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::RenderPipelineDescriptor::vertexLinkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(vertexLinkedFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineDescriptor::vertexPreloadedLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexPreloadedLibraries));
-}
-
-_MTL_INLINE MTL::RenderPipelineFunctionsDescriptor* MTL::RenderPipelineFunctionsDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPipelineFunctionsDescriptor>(_MTL_PRIVATE_CLS(MTLRenderPipelineFunctionsDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineFunctionsDescriptor::fragmentAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(fragmentAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE MTL::RenderPipelineFunctionsDescriptor* MTL::RenderPipelineFunctionsDescriptor::init()
-{
-    return NS::Object::init<MTL::RenderPipelineFunctionsDescriptor>();
-}
-
-_MTL_INLINE void MTL::RenderPipelineFunctionsDescriptor::setFragmentAdditionalBinaryFunctions(const NS::Array* fragmentAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentAdditionalBinaryFunctions_), fragmentAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineFunctionsDescriptor::setTileAdditionalBinaryFunctions(const NS::Array* tileAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileAdditionalBinaryFunctions_), tileAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::RenderPipelineFunctionsDescriptor::setVertexAdditionalBinaryFunctions(const NS::Array* vertexAdditionalBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setVertexAdditionalBinaryFunctions_), vertexAdditionalBinaryFunctions);
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineFunctionsDescriptor::tileAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(tileAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE NS::Array* MTL::RenderPipelineFunctionsDescriptor::vertexAdditionalBinaryFunctions() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(vertexAdditionalBinaryFunctions));
-}
-
-_MTL_INLINE MTL::Device* MTL::RenderPipelineState::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::RenderPipelineState::functionHandle(const NS::String* name, MTL::RenderStages stage)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithName_stage_), name, stage);
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::RenderPipelineState::functionHandle(const MTL4::BinaryFunction* function, MTL::RenderStages stage)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithBinaryFunction_stage_), function, stage);
-}
-
-_MTL_INLINE MTL::FunctionHandle* MTL::RenderPipelineState::functionHandle(const MTL::Function* function, MTL::RenderStages stage)
-{
-    return Object::sendMessage<MTL::FunctionHandle*>(this, _MTL_PRIVATE_SEL(functionHandleWithFunction_stage_), function, stage);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::RenderPipelineState::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::imageblockMemoryLength(MTL::Size imageblockDimensions)
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(imageblockMemoryLengthForDimensions_), imageblockDimensions);
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::imageblockSampleLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(imageblockSampleLength));
-}
-
-_MTL_INLINE NS::String* MTL::RenderPipelineState::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::maxTotalThreadgroupsPerMeshGrid() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadgroupsPerMeshGrid));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::maxTotalThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::maxTotalThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::meshThreadExecutionWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(meshThreadExecutionWidth));
-}
-
-_MTL_INLINE MTL::IntersectionFunctionTable* MTL::RenderPipelineState::newIntersectionFunctionTable(const MTL::IntersectionFunctionTableDescriptor* descriptor, MTL::RenderStages stage)
-{
-    return Object::sendMessage<MTL::IntersectionFunctionTable*>(this, _MTL_PRIVATE_SEL(newIntersectionFunctionTableWithDescriptor_stage_), descriptor, stage);
-}
-
-_MTL_INLINE MTL4::PipelineDescriptor* MTL::RenderPipelineState::newRenderPipelineDescriptor()
-{
-    return Object::sendMessage<MTL4::PipelineDescriptor*>(this, _MTL_PRIVATE_SEL(newRenderPipelineDescriptorForSpecialization));
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::RenderPipelineState::newRenderPipelineState(const MTL4::RenderPipelineBinaryFunctionsDescriptor* binaryFunctionsDescriptor, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithBinaryFunctions_error_), binaryFunctionsDescriptor, error);
-}
-
-_MTL_INLINE MTL::RenderPipelineState* MTL::RenderPipelineState::newRenderPipelineState(const MTL::RenderPipelineFunctionsDescriptor* additionalBinaryFunctions, NS::Error** error)
-{
-    return Object::sendMessage<MTL::RenderPipelineState*>(this, _MTL_PRIVATE_SEL(newRenderPipelineStateWithAdditionalBinaryFunctions_error_), additionalBinaryFunctions, error);
-}
-
-_MTL_INLINE MTL::VisibleFunctionTable* MTL::RenderPipelineState::newVisibleFunctionTable(const MTL::VisibleFunctionTableDescriptor* descriptor, MTL::RenderStages stage)
-{
-    return Object::sendMessage<MTL::VisibleFunctionTable*>(this, _MTL_PRIVATE_SEL(newVisibleFunctionTableWithDescriptor_stage_), descriptor, stage);
-}
-
-_MTL_INLINE NS::UInteger MTL::RenderPipelineState::objectThreadExecutionWidth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(objectThreadExecutionWidth));
-}
-
-_MTL_INLINE MTL::RenderPipelineReflection* MTL::RenderPipelineState::reflection() const
-{
-    return Object::sendMessage<MTL::RenderPipelineReflection*>(this, _MTL_PRIVATE_SEL(reflection));
-}
-
-_MTL_INLINE MTL::Size MTL::RenderPipelineState::requiredThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE MTL::Size MTL::RenderPipelineState::requiredThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE MTL::Size MTL::RenderPipelineState::requiredThreadsPerTileThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerTileThreadgroup));
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::RenderPipelineState::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineState::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
-
-_MTL_INLINE bool MTL::RenderPipelineState::threadgroupSizeMatchesTileSize() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(threadgroupSizeMatchesTileSize));
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptorArray* MTL::RenderPipelineColorAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::RenderPipelineColorAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLRenderPipelineColorAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptorArray* MTL::RenderPipelineColorAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::RenderPipelineColorAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptor* MTL::RenderPipelineColorAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::RenderPipelineColorAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::RenderPipelineColorAttachmentDescriptorArray::setObject(const MTL::RenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptor* MTL::TileRenderPipelineColorAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::TileRenderPipelineColorAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLTileRenderPipelineColorAttachmentDescriptor));
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptor* MTL::TileRenderPipelineColorAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::TileRenderPipelineColorAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::TileRenderPipelineColorAttachmentDescriptor::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineColorAttachmentDescriptor::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptorArray* MTL::TileRenderPipelineColorAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::TileRenderPipelineColorAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLTileRenderPipelineColorAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptorArray* MTL::TileRenderPipelineColorAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::TileRenderPipelineColorAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptor* MTL::TileRenderPipelineColorAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::TileRenderPipelineColorAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineColorAttachmentDescriptorArray::setObject(const MTL::TileRenderPipelineColorAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::TileRenderPipelineDescriptor* MTL::TileRenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::TileRenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTLTileRenderPipelineDescriptor));
-}
-
-_MTL_INLINE NS::Array* MTL::TileRenderPipelineDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE MTL::TileRenderPipelineColorAttachmentDescriptorArray* MTL::TileRenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::TileRenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL::TileRenderPipelineDescriptor* MTL::TileRenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL::TileRenderPipelineDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::TileRenderPipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::TileRenderPipelineDescriptor::linkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(linkedFunctions));
-}
-
-_MTL_INLINE NS::UInteger MTL::TileRenderPipelineDescriptor::maxCallStackDepth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxCallStackDepth));
-}
-
-_MTL_INLINE NS::UInteger MTL::TileRenderPipelineDescriptor::maxTotalThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerThreadgroup));
-}
-
-_MTL_INLINE NS::Array* MTL::TileRenderPipelineDescriptor::preloadedLibraries() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(preloadedLibraries));
-}
-
-_MTL_INLINE NS::UInteger MTL::TileRenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE MTL::Size MTL::TileRenderPipelineDescriptor::requiredThreadsPerThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerThreadgroup));
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setLinkedFunctions(const MTL::LinkedFunctions* linkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLinkedFunctions_), linkedFunctions);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setMaxCallStackDepth(NS::UInteger maxCallStackDepth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxCallStackDepth_), maxCallStackDepth);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setMaxTotalThreadsPerThreadgroup(NS::UInteger maxTotalThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerThreadgroup_), maxTotalThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setPreloadedLibraries(const NS::Array* preloadedLibraries)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPreloadedLibraries_), preloadedLibraries);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setRequiredThreadsPerThreadgroup(MTL::Size requiredThreadsPerThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerThreadgroup_), requiredThreadsPerThreadgroup);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setShaderValidation(MTL::ShaderValidation shaderValidation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderValidation_), shaderValidation);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setSupportAddingBinaryFunctions(bool supportAddingBinaryFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportAddingBinaryFunctions_), supportAddingBinaryFunctions);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setThreadgroupSizeMatchesTileSize(bool threadgroupSizeMatchesTileSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setThreadgroupSizeMatchesTileSize_), threadgroupSizeMatchesTileSize);
-}
-
-_MTL_INLINE void MTL::TileRenderPipelineDescriptor::setTileFunction(const MTL::Function* tileFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTileFunction_), tileFunction);
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::TileRenderPipelineDescriptor::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE bool MTL::TileRenderPipelineDescriptor::supportAddingBinaryFunctions() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportAddingBinaryFunctions));
-}
-
-_MTL_INLINE bool MTL::TileRenderPipelineDescriptor::threadgroupSizeMatchesTileSize() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(threadgroupSizeMatchesTileSize));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::TileRenderPipelineDescriptor::tileBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(tileBuffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::TileRenderPipelineDescriptor::tileFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(tileFunction));
-}
-
-_MTL_INLINE MTL::MeshRenderPipelineDescriptor* MTL::MeshRenderPipelineDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::MeshRenderPipelineDescriptor>(_MTL_PRIVATE_CLS(MTLMeshRenderPipelineDescriptor));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::alphaToCoverageEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToCoverageEnabled));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::alphaToOneEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToOneEnabled));
-}
-
-_MTL_INLINE NS::Array* MTL::MeshRenderPipelineDescriptor::binaryArchives() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(binaryArchives));
-}
-
-_MTL_INLINE MTL::RenderPipelineColorAttachmentDescriptorArray* MTL::MeshRenderPipelineDescriptor::colorAttachments() const
-{
-    return Object::sendMessage<MTL::RenderPipelineColorAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(colorAttachments));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::MeshRenderPipelineDescriptor::depthAttachmentPixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(depthAttachmentPixelFormat));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::MeshRenderPipelineDescriptor::fragmentBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(fragmentBuffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::MeshRenderPipelineDescriptor::fragmentFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(fragmentFunction));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::MeshRenderPipelineDescriptor::fragmentLinkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(fragmentLinkedFunctions));
-}
-
-_MTL_INLINE MTL::MeshRenderPipelineDescriptor* MTL::MeshRenderPipelineDescriptor::init()
-{
-    return NS::Object::init<MTL::MeshRenderPipelineDescriptor>();
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::isAlphaToCoverageEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToCoverageEnabled));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::isAlphaToOneEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAlphaToOneEnabled));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::isRasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE NS::String* MTL::MeshRenderPipelineDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::maxTotalThreadgroupsPerMeshGrid() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadgroupsPerMeshGrid));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::maxTotalThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::maxTotalThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxTotalThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::maxVertexAmplificationCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxVertexAmplificationCount));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::MeshRenderPipelineDescriptor::meshBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(meshBuffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::MeshRenderPipelineDescriptor::meshFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(meshFunction));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::MeshRenderPipelineDescriptor::meshLinkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(meshLinkedFunctions));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::meshThreadgroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(meshThreadgroupSizeIsMultipleOfThreadExecutionWidth));
-}
-
-_MTL_INLINE MTL::PipelineBufferDescriptorArray* MTL::MeshRenderPipelineDescriptor::objectBuffers() const
-{
-    return Object::sendMessage<MTL::PipelineBufferDescriptorArray*>(this, _MTL_PRIVATE_SEL(objectBuffers));
-}
-
-_MTL_INLINE MTL::Function* MTL::MeshRenderPipelineDescriptor::objectFunction() const
-{
-    return Object::sendMessage<MTL::Function*>(this, _MTL_PRIVATE_SEL(objectFunction));
-}
-
-_MTL_INLINE MTL::LinkedFunctions* MTL::MeshRenderPipelineDescriptor::objectLinkedFunctions() const
-{
-    return Object::sendMessage<MTL::LinkedFunctions*>(this, _MTL_PRIVATE_SEL(objectLinkedFunctions));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::objectThreadgroupSizeIsMultipleOfThreadExecutionWidth() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(objectThreadgroupSizeIsMultipleOfThreadExecutionWidth));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::payloadMemoryLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(payloadMemoryLength));
-}
-
-_MTL_INLINE NS::UInteger MTL::MeshRenderPipelineDescriptor::rasterSampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rasterSampleCount));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::rasterizationEnabled() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isRasterizationEnabled));
-}
-
-_MTL_INLINE MTL::Size MTL::MeshRenderPipelineDescriptor::requiredThreadsPerMeshThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerMeshThreadgroup));
-}
-
-_MTL_INLINE MTL::Size MTL::MeshRenderPipelineDescriptor::requiredThreadsPerObjectThreadgroup() const
-{
-    return Object::sendMessage<MTL::Size>(this, _MTL_PRIVATE_SEL(requiredThreadsPerObjectThreadgroup));
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setAlphaToCoverageEnabled(bool alphaToCoverageEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToCoverageEnabled_), alphaToCoverageEnabled);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setAlphaToOneEnabled(bool alphaToOneEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAlphaToOneEnabled_), alphaToOneEnabled);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setBinaryArchives(const NS::Array* binaryArchives)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBinaryArchives_), binaryArchives);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setDepthAttachmentPixelFormat(MTL::PixelFormat depthAttachmentPixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepthAttachmentPixelFormat_), depthAttachmentPixelFormat);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setFragmentFunction(const MTL::Function* fragmentFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentFunction_), fragmentFunction);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setFragmentLinkedFunctions(const MTL::LinkedFunctions* fragmentLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFragmentLinkedFunctions_), fragmentLinkedFunctions);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMaxTotalThreadgroupsPerMeshGrid(NS::UInteger maxTotalThreadgroupsPerMeshGrid)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadgroupsPerMeshGrid_), maxTotalThreadgroupsPerMeshGrid);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMaxTotalThreadsPerMeshThreadgroup(NS::UInteger maxTotalThreadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerMeshThreadgroup_), maxTotalThreadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMaxTotalThreadsPerObjectThreadgroup(NS::UInteger maxTotalThreadsPerObjectThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxTotalThreadsPerObjectThreadgroup_), maxTotalThreadsPerObjectThreadgroup);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMaxVertexAmplificationCount(NS::UInteger maxVertexAmplificationCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxVertexAmplificationCount_), maxVertexAmplificationCount);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMeshFunction(const MTL::Function* meshFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshFunction_), meshFunction);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMeshLinkedFunctions(const MTL::LinkedFunctions* meshLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshLinkedFunctions_), meshLinkedFunctions);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool meshThreadgroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMeshThreadgroupSizeIsMultipleOfThreadExecutionWidth_), meshThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setObjectFunction(const MTL::Function* objectFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectFunction_), objectFunction);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setObjectLinkedFunctions(const MTL::LinkedFunctions* objectLinkedFunctions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectLinkedFunctions_), objectLinkedFunctions);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth(bool objectThreadgroupSizeIsMultipleOfThreadExecutionWidth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObjectThreadgroupSizeIsMultipleOfThreadExecutionWidth_), objectThreadgroupSizeIsMultipleOfThreadExecutionWidth);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setPayloadMemoryLength(NS::UInteger payloadMemoryLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPayloadMemoryLength_), payloadMemoryLength);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setRasterSampleCount(NS::UInteger rasterSampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterSampleCount_), rasterSampleCount);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setRasterizationEnabled(bool rasterizationEnabled)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRasterizationEnabled_), rasterizationEnabled);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setRequiredThreadsPerMeshThreadgroup(MTL::Size requiredThreadsPerMeshThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerMeshThreadgroup_), requiredThreadsPerMeshThreadgroup);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setRequiredThreadsPerObjectThreadgroup(MTL::Size requiredThreadsPerObjectThreadgroup)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRequiredThreadsPerObjectThreadgroup_), requiredThreadsPerObjectThreadgroup);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setShaderValidation(MTL::ShaderValidation shaderValidation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setShaderValidation_), shaderValidation);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setStencilAttachmentPixelFormat(MTL::PixelFormat stencilAttachmentPixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStencilAttachmentPixelFormat_), stencilAttachmentPixelFormat);
-}
-
-_MTL_INLINE void MTL::MeshRenderPipelineDescriptor::setSupportIndirectCommandBuffers(bool supportIndirectCommandBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportIndirectCommandBuffers_), supportIndirectCommandBuffers);
-}
-
-_MTL_INLINE MTL::ShaderValidation MTL::MeshRenderPipelineDescriptor::shaderValidation() const
-{
-    return Object::sendMessage<MTL::ShaderValidation>(this, _MTL_PRIVATE_SEL(shaderValidation));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::MeshRenderPipelineDescriptor::stencilAttachmentPixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(stencilAttachmentPixelFormat));
-}
-
-_MTL_INLINE bool MTL::MeshRenderPipelineDescriptor::supportIndirectCommandBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportIndirectCommandBuffers));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLResidencySet.hpp b/engine/thirdparty/metal-cpp/Metal/MTLResidencySet.hpp
deleted file mode 100644
index d073972d..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLResidencySet.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResidencySet.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Allocation;
-class Device;
-class ResidencySetDescriptor;
-
-class ResidencySetDescriptor : public NS::Copying<ResidencySetDescriptor>
-{
-public:
-    static ResidencySetDescriptor* alloc();
-
-    ResidencySetDescriptor*        init();
-    NS::UInteger                   initialCapacity() const;
-
-    NS::String*                    label() const;
-
-    void                           setInitialCapacity(NS::UInteger initialCapacity);
-
-    void                           setLabel(const NS::String* label);
-};
-class ResidencySet : public NS::Referencing<ResidencySet>
-{
-public:
-    void         addAllocation(const MTL::Allocation* allocation);
-    void         addAllocations(const MTL::Allocation* const allocations[], NS::UInteger count);
-
-    NS::Array*   allAllocations() const;
-
-    uint64_t     allocatedSize() const;
-
-    NS::UInteger allocationCount() const;
-
-    void         commit();
-
-    bool         containsAllocation(const MTL::Allocation* anAllocation);
-
-    Device*      device() const;
-
-    void         endResidency();
-
-    NS::String*  label() const;
-
-    void         removeAllAllocations();
-
-    void         removeAllocation(const MTL::Allocation* allocation);
-    void         removeAllocations(const MTL::Allocation* const allocations[], NS::UInteger count);
-
-    void         requestResidency();
-};
-
-}
-_MTL_INLINE MTL::ResidencySetDescriptor* MTL::ResidencySetDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ResidencySetDescriptor>(_MTL_PRIVATE_CLS(MTLResidencySetDescriptor));
-}
-
-_MTL_INLINE MTL::ResidencySetDescriptor* MTL::ResidencySetDescriptor::init()
-{
-    return NS::Object::init<MTL::ResidencySetDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::ResidencySetDescriptor::initialCapacity() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(initialCapacity));
-}
-
-_MTL_INLINE NS::String* MTL::ResidencySetDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::ResidencySetDescriptor::setInitialCapacity(NS::UInteger initialCapacity)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setInitialCapacity_), initialCapacity);
-}
-
-_MTL_INLINE void MTL::ResidencySetDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::ResidencySet::addAllocation(const MTL::Allocation* allocation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addAllocation_), allocation);
-}
-
-_MTL_INLINE void MTL::ResidencySet::addAllocations(const MTL::Allocation* const allocations[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(addAllocations_count_), allocations, count);
-}
-
-_MTL_INLINE NS::Array* MTL::ResidencySet::allAllocations() const
-{
-    return Object::sendMessage<NS::Array*>(this, _MTL_PRIVATE_SEL(allAllocations));
-}
-
-_MTL_INLINE uint64_t MTL::ResidencySet::allocatedSize() const
-{
-    return Object::sendMessage<uint64_t>(this, _MTL_PRIVATE_SEL(allocatedSize));
-}
-
-_MTL_INLINE NS::UInteger MTL::ResidencySet::allocationCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(allocationCount));
-}
-
-_MTL_INLINE void MTL::ResidencySet::commit()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(commit));
-}
-
-_MTL_INLINE bool MTL::ResidencySet::containsAllocation(const MTL::Allocation* anAllocation)
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(containsAllocation_), anAllocation);
-}
-
-_MTL_INLINE MTL::Device* MTL::ResidencySet::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE void MTL::ResidencySet::endResidency()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(endResidency));
-}
-
-_MTL_INLINE NS::String* MTL::ResidencySet::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::ResidencySet::removeAllAllocations()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeAllAllocations));
-}
-
-_MTL_INLINE void MTL::ResidencySet::removeAllocation(const MTL::Allocation* allocation)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeAllocation_), allocation);
-}
-
-_MTL_INLINE void MTL::ResidencySet::removeAllocations(const MTL::Allocation* const allocations[], NS::UInteger count)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(removeAllocations_count_), allocations, count);
-}
-
-_MTL_INLINE void MTL::ResidencySet::requestResidency()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(requestResidency));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLResource.hpp b/engine/thirdparty/metal-cpp/Metal/MTLResource.hpp
deleted file mode 100644
index 21e49bb9..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLResource.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResource.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include <mach/mach.h>
-
-namespace MTL
-{
-class Device;
-class Heap;
-_MTL_ENUM(NS::UInteger, PurgeableState) {
-    PurgeableStateKeepCurrent = 1,
-    PurgeableStateNonVolatile = 2,
-    PurgeableStateVolatile = 3,
-    PurgeableStateEmpty = 4,
-};
-
-_MTL_ENUM(NS::UInteger, CPUCacheMode) {
-    CPUCacheModeDefaultCache = 0,
-    CPUCacheModeWriteCombined = 1,
-};
-
-_MTL_ENUM(NS::UInteger, StorageMode) {
-    StorageModeShared = 0,
-    StorageModeManaged = 1,
-    StorageModePrivate = 2,
-    StorageModeMemoryless = 3,
-};
-
-_MTL_ENUM(NS::UInteger, HazardTrackingMode) {
-    HazardTrackingModeDefault = 0,
-    HazardTrackingModeUntracked = 1,
-    HazardTrackingModeTracked = 2,
-};
-
-_MTL_ENUM(NS::Integer, SparsePageSize) {
-    SparsePageSize16 = 101,
-    SparsePageSize64 = 102,
-    SparsePageSize256 = 103,
-};
-
-_MTL_ENUM(NS::Integer, BufferSparseTier) {
-    BufferSparseTierNone = 0,
-    BufferSparseTier1 = 1,
-};
-
-_MTL_ENUM(NS::Integer, TextureSparseTier) {
-    TextureSparseTierNone = 0,
-    TextureSparseTier1 = 1,
-    TextureSparseTier2 = 2,
-};
-
-_MTL_OPTIONS(NS::UInteger, ResourceOptions) {
-    ResourceCPUCacheModeDefaultCache = 0,
-    ResourceCPUCacheModeWriteCombined = 1,
-    ResourceStorageModeShared = 0,
-    ResourceStorageModeManaged = 1 << 4,
-    ResourceStorageModePrivate = 1 << 5,
-    ResourceStorageModeMemoryless = 1 << 5,
-    ResourceHazardTrackingModeDefault = 0,
-    ResourceHazardTrackingModeUntracked = 1 << 8,
-    ResourceHazardTrackingModeTracked = 1 << 9,
-    ResourceOptionCPUCacheModeDefault = 0,
-    ResourceOptionCPUCacheModeWriteCombined = 1,
-};
-
-class Resource : public NS::Referencing<Resource, Allocation>
-{
-public:
-    NS::UInteger       allocatedSize() const;
-
-    CPUCacheMode       cpuCacheMode() const;
-
-    Device*            device() const;
-
-    HazardTrackingMode hazardTrackingMode() const;
-
-    Heap*              heap() const;
-    NS::UInteger       heapOffset() const;
-
-    bool               isAliasable();
-
-    NS::String*        label() const;
-
-    void               makeAliasable();
-
-    ResourceOptions    resourceOptions() const;
-
-    void               setLabel(const NS::String* label);
-
-    kern_return_t      setOwner(task_id_token_t task_id_token);
-
-    PurgeableState     setPurgeableState(MTL::PurgeableState state);
-
-    StorageMode        storageMode() const;
-};
-
-}
-_MTL_INLINE NS::UInteger MTL::Resource::allocatedSize() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(allocatedSize));
-}
-
-_MTL_INLINE MTL::CPUCacheMode MTL::Resource::cpuCacheMode() const
-{
-    return Object::sendMessage<MTL::CPUCacheMode>(this, _MTL_PRIVATE_SEL(cpuCacheMode));
-}
-
-_MTL_INLINE MTL::Device* MTL::Resource::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::HazardTrackingMode MTL::Resource::hazardTrackingMode() const
-{
-    return Object::sendMessage<MTL::HazardTrackingMode>(this, _MTL_PRIVATE_SEL(hazardTrackingMode));
-}
-
-_MTL_INLINE MTL::Heap* MTL::Resource::heap() const
-{
-    return Object::sendMessage<MTL::Heap*>(this, _MTL_PRIVATE_SEL(heap));
-}
-
-_MTL_INLINE NS::UInteger MTL::Resource::heapOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(heapOffset));
-}
-
-_MTL_INLINE bool MTL::Resource::isAliasable()
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isAliasable));
-}
-
-_MTL_INLINE NS::String* MTL::Resource::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE void MTL::Resource::makeAliasable()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(makeAliasable));
-}
-
-_MTL_INLINE MTL::ResourceOptions MTL::Resource::resourceOptions() const
-{
-    return Object::sendMessage<MTL::ResourceOptions>(this, _MTL_PRIVATE_SEL(resourceOptions));
-}
-
-_MTL_INLINE void MTL::Resource::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE kern_return_t MTL::Resource::setOwner(task_id_token_t task_id_token)
-{
-    return Object::sendMessage<kern_return_t>(this, _MTL_PRIVATE_SEL(setOwnerWithIdentity_), task_id_token);
-}
-
-_MTL_INLINE MTL::PurgeableState MTL::Resource::setPurgeableState(MTL::PurgeableState state)
-{
-    return Object::sendMessage<MTL::PurgeableState>(this, _MTL_PRIVATE_SEL(setPurgeableState_), state);
-}
-
-_MTL_INLINE MTL::StorageMode MTL::Resource::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLResourceStateCommandEncoder.hpp b/engine/thirdparty/metal-cpp/Metal/MTLResourceStateCommandEncoder.hpp
deleted file mode 100644
index 3f565c30..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLResourceStateCommandEncoder.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResourceStateCommandEncoder.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-#include <cstdint>
-
-namespace MTL
-{
-class Buffer;
-class Fence;
-struct Region;
-class Texture;
-_MTL_ENUM(NS::UInteger, SparseTextureMappingMode) {
-    SparseTextureMappingModeMap = 0,
-    SparseTextureMappingModeUnmap = 1,
-};
-
-struct MapIndirectArguments
-{
-    uint32_t regionOriginX;
-    uint32_t regionOriginY;
-    uint32_t regionOriginZ;
-    uint32_t regionSizeWidth;
-    uint32_t regionSizeHeight;
-    uint32_t regionSizeDepth;
-    uint32_t mipMapLevel;
-    uint32_t sliceId;
-} _MTL_PACKED;
-
-class ResourceStateCommandEncoder : public NS::Referencing<ResourceStateCommandEncoder, CommandEncoder>
-{
-public:
-    void moveTextureMappingsFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin);
-
-    void updateFence(const MTL::Fence* fence);
-
-    void updateTextureMapping(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Region region, const NS::UInteger mipLevel, const NS::UInteger slice);
-    void updateTextureMapping(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset);
-    void updateTextureMappings(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Region* regions, const NS::UInteger* mipLevels, const NS::UInteger* slices, NS::UInteger numRegions);
-
-    void waitForFence(const MTL::Fence* fence);
-};
-
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::moveTextureMappingsFromTexture(const MTL::Texture* sourceTexture, NS::UInteger sourceSlice, NS::UInteger sourceLevel, MTL::Origin sourceOrigin, MTL::Size sourceSize, const MTL::Texture* destinationTexture, NS::UInteger destinationSlice, NS::UInteger destinationLevel, MTL::Origin destinationOrigin)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(moveTextureMappingsFromTexture_sourceSlice_sourceLevel_sourceOrigin_sourceSize_toTexture_destinationSlice_destinationLevel_destinationOrigin_), sourceTexture, sourceSlice, sourceLevel, sourceOrigin, sourceSize, destinationTexture, destinationSlice, destinationLevel, destinationOrigin);
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::updateFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateFence_), fence);
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::updateTextureMapping(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Region region, const NS::UInteger mipLevel, const NS::UInteger slice)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateTextureMapping_mode_region_mipLevel_slice_), texture, mode, region, mipLevel, slice);
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::updateTextureMapping(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Buffer* indirectBuffer, NS::UInteger indirectBufferOffset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateTextureMapping_mode_indirectBuffer_indirectBufferOffset_), texture, mode, indirectBuffer, indirectBufferOffset);
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::updateTextureMappings(const MTL::Texture* texture, const MTL::SparseTextureMappingMode mode, const MTL::Region* regions, const NS::UInteger* mipLevels, const NS::UInteger* slices, NS::UInteger numRegions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(updateTextureMappings_mode_regions_mipLevels_slices_numRegions_), texture, mode, regions, mipLevels, slices, numRegions);
-}
-
-_MTL_INLINE void MTL::ResourceStateCommandEncoder::waitForFence(const MTL::Fence* fence)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(waitForFence_), fence);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLResourceStatePass.hpp b/engine/thirdparty/metal-cpp/Metal/MTLResourceStatePass.hpp
deleted file mode 100644
index f3689012..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLResourceStatePass.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResourceStatePass.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class CounterSampleBuffer;
-class ResourceStatePassDescriptor;
-class ResourceStatePassSampleBufferAttachmentDescriptor;
-class ResourceStatePassSampleBufferAttachmentDescriptorArray;
-
-class ResourceStatePassSampleBufferAttachmentDescriptor : public NS::Copying<ResourceStatePassSampleBufferAttachmentDescriptor>
-{
-public:
-    static ResourceStatePassSampleBufferAttachmentDescriptor* alloc();
-
-    NS::UInteger                                              endOfEncoderSampleIndex() const;
-
-    ResourceStatePassSampleBufferAttachmentDescriptor*        init();
-
-    CounterSampleBuffer*                                      sampleBuffer() const;
-
-    void                                                      setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex);
-
-    void                                                      setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer);
-
-    void                                                      setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex);
-    NS::UInteger                                              startOfEncoderSampleIndex() const;
-};
-class ResourceStatePassSampleBufferAttachmentDescriptorArray : public NS::Referencing<ResourceStatePassSampleBufferAttachmentDescriptorArray>
-{
-public:
-    static ResourceStatePassSampleBufferAttachmentDescriptorArray* alloc();
-
-    ResourceStatePassSampleBufferAttachmentDescriptorArray*        init();
-
-    ResourceStatePassSampleBufferAttachmentDescriptor*             object(NS::UInteger attachmentIndex);
-    void                                                           setObject(const MTL::ResourceStatePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex);
-};
-class ResourceStatePassDescriptor : public NS::Copying<ResourceStatePassDescriptor>
-{
-public:
-    static ResourceStatePassDescriptor*                     alloc();
-
-    ResourceStatePassDescriptor*                            init();
-
-    static ResourceStatePassDescriptor*                     resourceStatePassDescriptor();
-
-    ResourceStatePassSampleBufferAttachmentDescriptorArray* sampleBufferAttachments() const;
-};
-
-}
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptor* MTL::ResourceStatePassSampleBufferAttachmentDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ResourceStatePassSampleBufferAttachmentDescriptor>(_MTL_PRIVATE_CLS(MTLResourceStatePassSampleBufferAttachmentDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::ResourceStatePassSampleBufferAttachmentDescriptor::endOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(endOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptor* MTL::ResourceStatePassSampleBufferAttachmentDescriptor::init()
-{
-    return NS::Object::init<MTL::ResourceStatePassSampleBufferAttachmentDescriptor>();
-}
-
-_MTL_INLINE MTL::CounterSampleBuffer* MTL::ResourceStatePassSampleBufferAttachmentDescriptor::sampleBuffer() const
-{
-    return Object::sendMessage<MTL::CounterSampleBuffer*>(this, _MTL_PRIVATE_SEL(sampleBuffer));
-}
-
-_MTL_INLINE void MTL::ResourceStatePassSampleBufferAttachmentDescriptor::setEndOfEncoderSampleIndex(NS::UInteger endOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setEndOfEncoderSampleIndex_), endOfEncoderSampleIndex);
-}
-
-_MTL_INLINE void MTL::ResourceStatePassSampleBufferAttachmentDescriptor::setSampleBuffer(const MTL::CounterSampleBuffer* sampleBuffer)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleBuffer_), sampleBuffer);
-}
-
-_MTL_INLINE void MTL::ResourceStatePassSampleBufferAttachmentDescriptor::setStartOfEncoderSampleIndex(NS::UInteger startOfEncoderSampleIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStartOfEncoderSampleIndex_), startOfEncoderSampleIndex);
-}
-
-_MTL_INLINE NS::UInteger MTL::ResourceStatePassSampleBufferAttachmentDescriptor::startOfEncoderSampleIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(startOfEncoderSampleIndex));
-}
-
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray* MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray>(_MTL_PRIVATE_CLS(MTLResourceStatePassSampleBufferAttachmentDescriptorArray));
-}
-
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray* MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray::init()
-{
-    return NS::Object::init<MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray>();
-}
-
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptor* MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray::object(NS::UInteger attachmentIndex)
-{
-    return Object::sendMessage<MTL::ResourceStatePassSampleBufferAttachmentDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), attachmentIndex);
-}
-
-_MTL_INLINE void MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray::setObject(const MTL::ResourceStatePassSampleBufferAttachmentDescriptor* attachment, NS::UInteger attachmentIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attachment, attachmentIndex);
-}
-
-_MTL_INLINE MTL::ResourceStatePassDescriptor* MTL::ResourceStatePassDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ResourceStatePassDescriptor>(_MTL_PRIVATE_CLS(MTLResourceStatePassDescriptor));
-}
-
-_MTL_INLINE MTL::ResourceStatePassDescriptor* MTL::ResourceStatePassDescriptor::init()
-{
-    return NS::Object::init<MTL::ResourceStatePassDescriptor>();
-}
-
-_MTL_INLINE MTL::ResourceStatePassDescriptor* MTL::ResourceStatePassDescriptor::resourceStatePassDescriptor()
-{
-    return Object::sendMessage<MTL::ResourceStatePassDescriptor*>(_MTL_PRIVATE_CLS(MTLResourceStatePassDescriptor), _MTL_PRIVATE_SEL(resourceStatePassDescriptor));
-}
-
-_MTL_INLINE MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray* MTL::ResourceStatePassDescriptor::sampleBufferAttachments() const
-{
-    return Object::sendMessage<MTL::ResourceStatePassSampleBufferAttachmentDescriptorArray*>(this, _MTL_PRIVATE_SEL(sampleBufferAttachments));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLResourceViewPool.hpp b/engine/thirdparty/metal-cpp/Metal/MTLResourceViewPool.hpp
deleted file mode 100644
index aa8bfda3..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLResourceViewPool.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLResourceViewPool.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Device;
-class ResourceViewPool;
-class ResourceViewPoolDescriptor;
-
-class ResourceViewPoolDescriptor : public NS::Copying<ResourceViewPoolDescriptor>
-{
-public:
-    static ResourceViewPoolDescriptor* alloc();
-
-    ResourceViewPoolDescriptor*        init();
-
-    NS::String*                        label() const;
-
-    NS::UInteger                       resourceViewCount() const;
-
-    void                               setLabel(const NS::String* label);
-
-    void                               setResourceViewCount(NS::UInteger resourceViewCount);
-};
-class ResourceViewPool : public NS::Referencing<ResourceViewPool>
-{
-public:
-    ResourceID   baseResourceID() const;
-
-    ResourceID   copyResourceViewsFromPool(const MTL::ResourceViewPool* sourcePool, NS::Range sourceRange, NS::UInteger destinationIndex);
-
-    Device*      device() const;
-
-    NS::String*  label() const;
-
-    NS::UInteger resourceViewCount() const;
-};
-
-}
-_MTL_INLINE MTL::ResourceViewPoolDescriptor* MTL::ResourceViewPoolDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::ResourceViewPoolDescriptor>(_MTL_PRIVATE_CLS(MTLResourceViewPoolDescriptor));
-}
-
-_MTL_INLINE MTL::ResourceViewPoolDescriptor* MTL::ResourceViewPoolDescriptor::init()
-{
-    return NS::Object::init<MTL::ResourceViewPoolDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::ResourceViewPoolDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::ResourceViewPoolDescriptor::resourceViewCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(resourceViewCount));
-}
-
-_MTL_INLINE void MTL::ResourceViewPoolDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::ResourceViewPoolDescriptor::setResourceViewCount(NS::UInteger resourceViewCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResourceViewCount_), resourceViewCount);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::ResourceViewPool::baseResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(baseResourceID));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::ResourceViewPool::copyResourceViewsFromPool(const MTL::ResourceViewPool* sourcePool, NS::Range sourceRange, NS::UInteger destinationIndex)
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(copyResourceViewsFromPool_sourceRange_destinationIndex_), sourcePool, sourceRange, destinationIndex);
-}
-
-_MTL_INLINE MTL::Device* MTL::ResourceViewPool::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE NS::String* MTL::ResourceViewPool::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE NS::UInteger MTL::ResourceViewPool::resourceViewCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(resourceViewCount));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLSampler.hpp b/engine/thirdparty/metal-cpp/Metal/MTLSampler.hpp
deleted file mode 100644
index f2286656..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLSampler.hpp
+++ /dev/null
@@ -1,345 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLSampler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLDepthStencil.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Device;
-class SamplerDescriptor;
-_MTL_ENUM(NS::UInteger, SamplerMinMagFilter) {
-    SamplerMinMagFilterNearest = 0,
-    SamplerMinMagFilterLinear = 1,
-};
-
-_MTL_ENUM(NS::UInteger, SamplerMipFilter) {
-    SamplerMipFilterNotMipmapped = 0,
-    SamplerMipFilterNearest = 1,
-    SamplerMipFilterLinear = 2,
-};
-
-_MTL_ENUM(NS::UInteger, SamplerAddressMode) {
-    SamplerAddressModeClampToEdge = 0,
-    SamplerAddressModeMirrorClampToEdge = 1,
-    SamplerAddressModeRepeat = 2,
-    SamplerAddressModeMirrorRepeat = 3,
-    SamplerAddressModeClampToZero = 4,
-    SamplerAddressModeClampToBorderColor = 5,
-};
-
-_MTL_ENUM(NS::UInteger, SamplerBorderColor) {
-    SamplerBorderColorTransparentBlack = 0,
-    SamplerBorderColorOpaqueBlack = 1,
-    SamplerBorderColorOpaqueWhite = 2,
-};
-
-_MTL_ENUM(NS::UInteger, SamplerReductionMode) {
-    SamplerReductionModeWeightedAverage = 0,
-    SamplerReductionModeMinimum = 1,
-    SamplerReductionModeMaximum = 2,
-};
-
-class SamplerDescriptor : public NS::Copying<SamplerDescriptor>
-{
-public:
-    static SamplerDescriptor* alloc();
-
-    SamplerBorderColor        borderColor() const;
-
-    CompareFunction           compareFunction() const;
-
-    SamplerDescriptor*        init();
-
-    NS::String*               label() const;
-
-    bool                      lodAverage() const;
-
-    float                     lodBias() const;
-
-    float                     lodMaxClamp() const;
-
-    float                     lodMinClamp() const;
-
-    SamplerMinMagFilter       magFilter() const;
-
-    NS::UInteger              maxAnisotropy() const;
-
-    SamplerMinMagFilter       minFilter() const;
-
-    SamplerMipFilter          mipFilter() const;
-
-    bool                      normalizedCoordinates() const;
-
-    SamplerAddressMode        rAddressMode() const;
-
-    SamplerReductionMode      reductionMode() const;
-
-    SamplerAddressMode        sAddressMode() const;
-
-    void                      setBorderColor(MTL::SamplerBorderColor borderColor);
-
-    void                      setCompareFunction(MTL::CompareFunction compareFunction);
-
-    void                      setLabel(const NS::String* label);
-
-    void                      setLodAverage(bool lodAverage);
-
-    void                      setLodBias(float lodBias);
-
-    void                      setLodMaxClamp(float lodMaxClamp);
-
-    void                      setLodMinClamp(float lodMinClamp);
-
-    void                      setMagFilter(MTL::SamplerMinMagFilter magFilter);
-
-    void                      setMaxAnisotropy(NS::UInteger maxAnisotropy);
-
-    void                      setMinFilter(MTL::SamplerMinMagFilter minFilter);
-
-    void                      setMipFilter(MTL::SamplerMipFilter mipFilter);
-
-    void                      setNormalizedCoordinates(bool normalizedCoordinates);
-
-    void                      setRAddressMode(MTL::SamplerAddressMode rAddressMode);
-
-    void                      setReductionMode(MTL::SamplerReductionMode reductionMode);
-
-    void                      setSAddressMode(MTL::SamplerAddressMode sAddressMode);
-
-    void                      setSupportArgumentBuffers(bool supportArgumentBuffers);
-
-    void                      setTAddressMode(MTL::SamplerAddressMode tAddressMode);
-
-    bool                      supportArgumentBuffers() const;
-
-    SamplerAddressMode        tAddressMode() const;
-};
-class SamplerState : public NS::Referencing<SamplerState>
-{
-public:
-    Device*     device() const;
-
-    ResourceID  gpuResourceID() const;
-
-    NS::String* label() const;
-};
-
-}
-_MTL_INLINE MTL::SamplerDescriptor* MTL::SamplerDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::SamplerDescriptor>(_MTL_PRIVATE_CLS(MTLSamplerDescriptor));
-}
-
-_MTL_INLINE MTL::SamplerBorderColor MTL::SamplerDescriptor::borderColor() const
-{
-    return Object::sendMessage<MTL::SamplerBorderColor>(this, _MTL_PRIVATE_SEL(borderColor));
-}
-
-_MTL_INLINE MTL::CompareFunction MTL::SamplerDescriptor::compareFunction() const
-{
-    return Object::sendMessage<MTL::CompareFunction>(this, _MTL_PRIVATE_SEL(compareFunction));
-}
-
-_MTL_INLINE MTL::SamplerDescriptor* MTL::SamplerDescriptor::init()
-{
-    return NS::Object::init<MTL::SamplerDescriptor>();
-}
-
-_MTL_INLINE NS::String* MTL::SamplerDescriptor::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE bool MTL::SamplerDescriptor::lodAverage() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(lodAverage));
-}
-
-_MTL_INLINE float MTL::SamplerDescriptor::lodBias() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(lodBias));
-}
-
-_MTL_INLINE float MTL::SamplerDescriptor::lodMaxClamp() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(lodMaxClamp));
-}
-
-_MTL_INLINE float MTL::SamplerDescriptor::lodMinClamp() const
-{
-    return Object::sendMessage<float>(this, _MTL_PRIVATE_SEL(lodMinClamp));
-}
-
-_MTL_INLINE MTL::SamplerMinMagFilter MTL::SamplerDescriptor::magFilter() const
-{
-    return Object::sendMessage<MTL::SamplerMinMagFilter>(this, _MTL_PRIVATE_SEL(magFilter));
-}
-
-_MTL_INLINE NS::UInteger MTL::SamplerDescriptor::maxAnisotropy() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(maxAnisotropy));
-}
-
-_MTL_INLINE MTL::SamplerMinMagFilter MTL::SamplerDescriptor::minFilter() const
-{
-    return Object::sendMessage<MTL::SamplerMinMagFilter>(this, _MTL_PRIVATE_SEL(minFilter));
-}
-
-_MTL_INLINE MTL::SamplerMipFilter MTL::SamplerDescriptor::mipFilter() const
-{
-    return Object::sendMessage<MTL::SamplerMipFilter>(this, _MTL_PRIVATE_SEL(mipFilter));
-}
-
-_MTL_INLINE bool MTL::SamplerDescriptor::normalizedCoordinates() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(normalizedCoordinates));
-}
-
-_MTL_INLINE MTL::SamplerAddressMode MTL::SamplerDescriptor::rAddressMode() const
-{
-    return Object::sendMessage<MTL::SamplerAddressMode>(this, _MTL_PRIVATE_SEL(rAddressMode));
-}
-
-_MTL_INLINE MTL::SamplerReductionMode MTL::SamplerDescriptor::reductionMode() const
-{
-    return Object::sendMessage<MTL::SamplerReductionMode>(this, _MTL_PRIVATE_SEL(reductionMode));
-}
-
-_MTL_INLINE MTL::SamplerAddressMode MTL::SamplerDescriptor::sAddressMode() const
-{
-    return Object::sendMessage<MTL::SamplerAddressMode>(this, _MTL_PRIVATE_SEL(sAddressMode));
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setBorderColor(MTL::SamplerBorderColor borderColor)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBorderColor_), borderColor);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setCompareFunction(MTL::CompareFunction compareFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCompareFunction_), compareFunction);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setLabel(const NS::String* label)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLabel_), label);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setLodAverage(bool lodAverage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLodAverage_), lodAverage);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setLodBias(float lodBias)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLodBias_), lodBias);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setLodMaxClamp(float lodMaxClamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLodMaxClamp_), lodMaxClamp);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setLodMinClamp(float lodMinClamp)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLodMinClamp_), lodMinClamp);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setMagFilter(MTL::SamplerMinMagFilter magFilter)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMagFilter_), magFilter);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setMaxAnisotropy(NS::UInteger maxAnisotropy)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMaxAnisotropy_), maxAnisotropy);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setMinFilter(MTL::SamplerMinMagFilter minFilter)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMinFilter_), minFilter);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setMipFilter(MTL::SamplerMipFilter mipFilter)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMipFilter_), mipFilter);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setNormalizedCoordinates(bool normalizedCoordinates)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setNormalizedCoordinates_), normalizedCoordinates);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setRAddressMode(MTL::SamplerAddressMode rAddressMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setRAddressMode_), rAddressMode);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setReductionMode(MTL::SamplerReductionMode reductionMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setReductionMode_), reductionMode);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setSAddressMode(MTL::SamplerAddressMode sAddressMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSAddressMode_), sAddressMode);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setSupportArgumentBuffers(bool supportArgumentBuffers)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSupportArgumentBuffers_), supportArgumentBuffers);
-}
-
-_MTL_INLINE void MTL::SamplerDescriptor::setTAddressMode(MTL::SamplerAddressMode tAddressMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTAddressMode_), tAddressMode);
-}
-
-_MTL_INLINE bool MTL::SamplerDescriptor::supportArgumentBuffers() const
-{
-    return Object::sendMessageSafe<bool>(this, _MTL_PRIVATE_SEL(supportArgumentBuffers));
-}
-
-_MTL_INLINE MTL::SamplerAddressMode MTL::SamplerDescriptor::tAddressMode() const
-{
-    return Object::sendMessage<MTL::SamplerAddressMode>(this, _MTL_PRIVATE_SEL(tAddressMode));
-}
-
-_MTL_INLINE MTL::Device* MTL::SamplerState::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::SamplerState::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::String* MTL::SamplerState::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLStageInputOutputDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTLStageInputOutputDescriptor.hpp
deleted file mode 100644
index b9a7a483..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLStageInputOutputDescriptor.hpp
+++ /dev/null
@@ -1,356 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLStageInputOutputDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLArgument.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class AttributeDescriptor;
-class AttributeDescriptorArray;
-class BufferLayoutDescriptor;
-class BufferLayoutDescriptorArray;
-class StageInputOutputDescriptor;
-_MTL_ENUM(NS::UInteger, AttributeFormat) {
-    AttributeFormatInvalid = 0,
-    AttributeFormatUChar2 = 1,
-    AttributeFormatUChar3 = 2,
-    AttributeFormatUChar4 = 3,
-    AttributeFormatChar2 = 4,
-    AttributeFormatChar3 = 5,
-    AttributeFormatChar4 = 6,
-    AttributeFormatUChar2Normalized = 7,
-    AttributeFormatUChar3Normalized = 8,
-    AttributeFormatUChar4Normalized = 9,
-    AttributeFormatChar2Normalized = 10,
-    AttributeFormatChar3Normalized = 11,
-    AttributeFormatChar4Normalized = 12,
-    AttributeFormatUShort2 = 13,
-    AttributeFormatUShort3 = 14,
-    AttributeFormatUShort4 = 15,
-    AttributeFormatShort2 = 16,
-    AttributeFormatShort3 = 17,
-    AttributeFormatShort4 = 18,
-    AttributeFormatUShort2Normalized = 19,
-    AttributeFormatUShort3Normalized = 20,
-    AttributeFormatUShort4Normalized = 21,
-    AttributeFormatShort2Normalized = 22,
-    AttributeFormatShort3Normalized = 23,
-    AttributeFormatShort4Normalized = 24,
-    AttributeFormatHalf2 = 25,
-    AttributeFormatHalf3 = 26,
-    AttributeFormatHalf4 = 27,
-    AttributeFormatFloat = 28,
-    AttributeFormatFloat2 = 29,
-    AttributeFormatFloat3 = 30,
-    AttributeFormatFloat4 = 31,
-    AttributeFormatInt = 32,
-    AttributeFormatInt2 = 33,
-    AttributeFormatInt3 = 34,
-    AttributeFormatInt4 = 35,
-    AttributeFormatUInt = 36,
-    AttributeFormatUInt2 = 37,
-    AttributeFormatUInt3 = 38,
-    AttributeFormatUInt4 = 39,
-    AttributeFormatInt1010102Normalized = 40,
-    AttributeFormatUInt1010102Normalized = 41,
-    AttributeFormatUChar4Normalized_BGRA = 42,
-    AttributeFormatUChar = 45,
-    AttributeFormatChar = 46,
-    AttributeFormatUCharNormalized = 47,
-    AttributeFormatCharNormalized = 48,
-    AttributeFormatUShort = 49,
-    AttributeFormatShort = 50,
-    AttributeFormatUShortNormalized = 51,
-    AttributeFormatShortNormalized = 52,
-    AttributeFormatHalf = 53,
-    AttributeFormatFloatRG11B10 = 54,
-    AttributeFormatFloatRGB9E5 = 55,
-};
-
-_MTL_ENUM(NS::UInteger, StepFunction) {
-    StepFunctionConstant = 0,
-    StepFunctionPerVertex = 1,
-    StepFunctionPerInstance = 2,
-    StepFunctionPerPatch = 3,
-    StepFunctionPerPatchControlPoint = 4,
-    StepFunctionThreadPositionInGridX = 5,
-    StepFunctionThreadPositionInGridY = 6,
-    StepFunctionThreadPositionInGridXIndexed = 7,
-    StepFunctionThreadPositionInGridYIndexed = 8,
-};
-
-class BufferLayoutDescriptor : public NS::Copying<BufferLayoutDescriptor>
-{
-public:
-    static BufferLayoutDescriptor* alloc();
-
-    BufferLayoutDescriptor*        init();
-
-    void                           setStepFunction(MTL::StepFunction stepFunction);
-
-    void                           setStepRate(NS::UInteger stepRate);
-
-    void                           setStride(NS::UInteger stride);
-
-    StepFunction                   stepFunction() const;
-
-    NS::UInteger                   stepRate() const;
-
-    NS::UInteger                   stride() const;
-};
-class BufferLayoutDescriptorArray : public NS::Referencing<BufferLayoutDescriptorArray>
-{
-public:
-    static BufferLayoutDescriptorArray* alloc();
-
-    BufferLayoutDescriptorArray*        init();
-
-    BufferLayoutDescriptor*             object(NS::UInteger index);
-    void                                setObject(const MTL::BufferLayoutDescriptor* bufferDesc, NS::UInteger index);
-};
-class AttributeDescriptor : public NS::Copying<AttributeDescriptor>
-{
-public:
-    static AttributeDescriptor* alloc();
-
-    NS::UInteger                bufferIndex() const;
-
-    AttributeFormat             format() const;
-
-    AttributeDescriptor*        init();
-
-    NS::UInteger                offset() const;
-
-    void                        setBufferIndex(NS::UInteger bufferIndex);
-
-    void                        setFormat(MTL::AttributeFormat format);
-
-    void                        setOffset(NS::UInteger offset);
-};
-class AttributeDescriptorArray : public NS::Referencing<AttributeDescriptorArray>
-{
-public:
-    static AttributeDescriptorArray* alloc();
-
-    AttributeDescriptorArray*        init();
-
-    AttributeDescriptor*             object(NS::UInteger index);
-    void                             setObject(const MTL::AttributeDescriptor* attributeDesc, NS::UInteger index);
-};
-class StageInputOutputDescriptor : public NS::Copying<StageInputOutputDescriptor>
-{
-public:
-    static StageInputOutputDescriptor* alloc();
-
-    AttributeDescriptorArray*          attributes() const;
-
-    NS::UInteger                       indexBufferIndex() const;
-
-    IndexType                          indexType() const;
-
-    StageInputOutputDescriptor*        init();
-
-    BufferLayoutDescriptorArray*       layouts() const;
-
-    void                               reset();
-
-    void                               setIndexBufferIndex(NS::UInteger indexBufferIndex);
-
-    void                               setIndexType(MTL::IndexType indexType);
-
-    static StageInputOutputDescriptor* stageInputOutputDescriptor();
-};
-
-}
-_MTL_INLINE MTL::BufferLayoutDescriptor* MTL::BufferLayoutDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::BufferLayoutDescriptor>(_MTL_PRIVATE_CLS(MTLBufferLayoutDescriptor));
-}
-
-_MTL_INLINE MTL::BufferLayoutDescriptor* MTL::BufferLayoutDescriptor::init()
-{
-    return NS::Object::init<MTL::BufferLayoutDescriptor>();
-}
-
-_MTL_INLINE void MTL::BufferLayoutDescriptor::setStepFunction(MTL::StepFunction stepFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStepFunction_), stepFunction);
-}
-
-_MTL_INLINE void MTL::BufferLayoutDescriptor::setStepRate(NS::UInteger stepRate)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStepRate_), stepRate);
-}
-
-_MTL_INLINE void MTL::BufferLayoutDescriptor::setStride(NS::UInteger stride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStride_), stride);
-}
-
-_MTL_INLINE MTL::StepFunction MTL::BufferLayoutDescriptor::stepFunction() const
-{
-    return Object::sendMessage<MTL::StepFunction>(this, _MTL_PRIVATE_SEL(stepFunction));
-}
-
-_MTL_INLINE NS::UInteger MTL::BufferLayoutDescriptor::stepRate() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(stepRate));
-}
-
-_MTL_INLINE NS::UInteger MTL::BufferLayoutDescriptor::stride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(stride));
-}
-
-_MTL_INLINE MTL::BufferLayoutDescriptorArray* MTL::BufferLayoutDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::BufferLayoutDescriptorArray>(_MTL_PRIVATE_CLS(MTLBufferLayoutDescriptorArray));
-}
-
-_MTL_INLINE MTL::BufferLayoutDescriptorArray* MTL::BufferLayoutDescriptorArray::init()
-{
-    return NS::Object::init<MTL::BufferLayoutDescriptorArray>();
-}
-
-_MTL_INLINE MTL::BufferLayoutDescriptor* MTL::BufferLayoutDescriptorArray::object(NS::UInteger index)
-{
-    return Object::sendMessage<MTL::BufferLayoutDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), index);
-}
-
-_MTL_INLINE void MTL::BufferLayoutDescriptorArray::setObject(const MTL::BufferLayoutDescriptor* bufferDesc, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), bufferDesc, index);
-}
-
-_MTL_INLINE MTL::AttributeDescriptor* MTL::AttributeDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::AttributeDescriptor>(_MTL_PRIVATE_CLS(MTLAttributeDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::AttributeDescriptor::bufferIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferIndex));
-}
-
-_MTL_INLINE MTL::AttributeFormat MTL::AttributeDescriptor::format() const
-{
-    return Object::sendMessage<MTL::AttributeFormat>(this, _MTL_PRIVATE_SEL(format));
-}
-
-_MTL_INLINE MTL::AttributeDescriptor* MTL::AttributeDescriptor::init()
-{
-    return NS::Object::init<MTL::AttributeDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::AttributeDescriptor::offset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(offset));
-}
-
-_MTL_INLINE void MTL::AttributeDescriptor::setBufferIndex(NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBufferIndex_), bufferIndex);
-}
-
-_MTL_INLINE void MTL::AttributeDescriptor::setFormat(MTL::AttributeFormat format)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFormat_), format);
-}
-
-_MTL_INLINE void MTL::AttributeDescriptor::setOffset(NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOffset_), offset);
-}
-
-_MTL_INLINE MTL::AttributeDescriptorArray* MTL::AttributeDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::AttributeDescriptorArray>(_MTL_PRIVATE_CLS(MTLAttributeDescriptorArray));
-}
-
-_MTL_INLINE MTL::AttributeDescriptorArray* MTL::AttributeDescriptorArray::init()
-{
-    return NS::Object::init<MTL::AttributeDescriptorArray>();
-}
-
-_MTL_INLINE MTL::AttributeDescriptor* MTL::AttributeDescriptorArray::object(NS::UInteger index)
-{
-    return Object::sendMessage<MTL::AttributeDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), index);
-}
-
-_MTL_INLINE void MTL::AttributeDescriptorArray::setObject(const MTL::AttributeDescriptor* attributeDesc, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attributeDesc, index);
-}
-
-_MTL_INLINE MTL::StageInputOutputDescriptor* MTL::StageInputOutputDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::StageInputOutputDescriptor>(_MTL_PRIVATE_CLS(MTLStageInputOutputDescriptor));
-}
-
-_MTL_INLINE MTL::AttributeDescriptorArray* MTL::StageInputOutputDescriptor::attributes() const
-{
-    return Object::sendMessage<MTL::AttributeDescriptorArray*>(this, _MTL_PRIVATE_SEL(attributes));
-}
-
-_MTL_INLINE NS::UInteger MTL::StageInputOutputDescriptor::indexBufferIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(indexBufferIndex));
-}
-
-_MTL_INLINE MTL::IndexType MTL::StageInputOutputDescriptor::indexType() const
-{
-    return Object::sendMessage<MTL::IndexType>(this, _MTL_PRIVATE_SEL(indexType));
-}
-
-_MTL_INLINE MTL::StageInputOutputDescriptor* MTL::StageInputOutputDescriptor::init()
-{
-    return NS::Object::init<MTL::StageInputOutputDescriptor>();
-}
-
-_MTL_INLINE MTL::BufferLayoutDescriptorArray* MTL::StageInputOutputDescriptor::layouts() const
-{
-    return Object::sendMessage<MTL::BufferLayoutDescriptorArray*>(this, _MTL_PRIVATE_SEL(layouts));
-}
-
-_MTL_INLINE void MTL::StageInputOutputDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE void MTL::StageInputOutputDescriptor::setIndexBufferIndex(NS::UInteger indexBufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexBufferIndex_), indexBufferIndex);
-}
-
-_MTL_INLINE void MTL::StageInputOutputDescriptor::setIndexType(MTL::IndexType indexType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setIndexType_), indexType);
-}
-
-_MTL_INLINE MTL::StageInputOutputDescriptor* MTL::StageInputOutputDescriptor::stageInputOutputDescriptor()
-{
-    return Object::sendMessage<MTL::StageInputOutputDescriptor*>(_MTL_PRIVATE_CLS(MTLStageInputOutputDescriptor), _MTL_PRIVATE_SEL(stageInputOutputDescriptor));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLTensor.hpp b/engine/thirdparty/metal-cpp/Metal/MTLTensor.hpp
deleted file mode 100644
index 221b8c9f..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLTensor.hpp
+++ /dev/null
@@ -1,297 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLTensor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Buffer;
-class TensorDescriptor;
-class TensorExtents;
-
-_MTL_CONST(NS::ErrorDomain, TensorDomain);
-
-_MTL_ENUM(NS::Integer, TensorDataType) {
-    TensorDataTypeNone = 0,
-    TensorDataTypeFloat32 = 3,
-    TensorDataTypeFloat16 = 16,
-    TensorDataTypeBFloat16 = 121,
-    TensorDataTypeInt8 = 45,
-    TensorDataTypeUInt8 = 49,
-    TensorDataTypeInt16 = 37,
-    TensorDataTypeUInt16 = 41,
-    TensorDataTypeInt32 = 29,
-    TensorDataTypeUInt32 = 33,
-};
-
-_MTL_ENUM(NS::Integer, TensorError) {
-    TensorErrorNone = 0,
-    TensorErrorInternalError = 1,
-    TensorErrorInvalidDescriptor = 2,
-};
-
-_MTL_OPTIONS(NS::UInteger, TensorUsage) {
-    TensorUsageCompute = 1,
-    TensorUsageRender = 1 << 1,
-    TensorUsageMachineLearning = 1 << 2,
-};
-
-class TensorExtents : public NS::Referencing<TensorExtents>
-{
-public:
-    static TensorExtents* alloc();
-
-    NS::Integer           extentAtDimensionIndex(NS::UInteger dimensionIndex);
-
-    TensorExtents*        init();
-    TensorExtents*        init(NS::UInteger rank, const NS::Integer* values);
-
-    NS::UInteger          rank() const;
-};
-class TensorDescriptor : public NS::Copying<TensorDescriptor>
-{
-public:
-    static TensorDescriptor* alloc();
-
-    CPUCacheMode             cpuCacheMode() const;
-
-    TensorDataType           dataType() const;
-
-    TensorExtents*           dimensions() const;
-
-    HazardTrackingMode       hazardTrackingMode() const;
-
-    TensorDescriptor*        init();
-
-    ResourceOptions          resourceOptions() const;
-
-    void                     setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode);
-
-    void                     setDataType(MTL::TensorDataType dataType);
-
-    void                     setDimensions(const MTL::TensorExtents* dimensions);
-
-    void                     setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode);
-
-    void                     setResourceOptions(MTL::ResourceOptions resourceOptions);
-
-    void                     setStorageMode(MTL::StorageMode storageMode);
-
-    void                     setStrides(const MTL::TensorExtents* strides);
-
-    void                     setUsage(MTL::TensorUsage usage);
-
-    StorageMode              storageMode() const;
-
-    TensorExtents*           strides() const;
-
-    TensorUsage              usage() const;
-};
-class Tensor : public NS::Referencing<Tensor, Resource>
-{
-public:
-    Buffer*        buffer() const;
-    NS::UInteger   bufferOffset() const;
-
-    TensorDataType dataType() const;
-
-    TensorExtents* dimensions() const;
-
-    void           getBytes(void* bytes, const MTL::TensorExtents* strides, const MTL::TensorExtents* sliceOrigin, const MTL::TensorExtents* sliceDimensions);
-
-    ResourceID     gpuResourceID() const;
-
-    void           replaceSliceOrigin(const MTL::TensorExtents* sliceOrigin, const MTL::TensorExtents* sliceDimensions, const void* bytes, const MTL::TensorExtents* strides);
-
-    TensorExtents* strides() const;
-
-    TensorUsage    usage() const;
-};
-
-}
-
-_MTL_PRIVATE_DEF_CONST(NS::ErrorDomain, TensorDomain);
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorExtents::alloc()
-{
-    return NS::Object::alloc<MTL::TensorExtents>(_MTL_PRIVATE_CLS(MTLTensorExtents));
-}
-
-_MTL_INLINE NS::Integer MTL::TensorExtents::extentAtDimensionIndex(NS::UInteger dimensionIndex)
-{
-    return Object::sendMessage<NS::Integer>(this, _MTL_PRIVATE_SEL(extentAtDimensionIndex_), dimensionIndex);
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorExtents::init()
-{
-    return NS::Object::init<MTL::TensorExtents>();
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorExtents::init(NS::UInteger rank, const NS::Integer* values)
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(initWithRank_values_), rank, values);
-}
-
-_MTL_INLINE NS::UInteger MTL::TensorExtents::rank() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(rank));
-}
-
-_MTL_INLINE MTL::TensorDescriptor* MTL::TensorDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::TensorDescriptor>(_MTL_PRIVATE_CLS(MTLTensorDescriptor));
-}
-
-_MTL_INLINE MTL::CPUCacheMode MTL::TensorDescriptor::cpuCacheMode() const
-{
-    return Object::sendMessage<MTL::CPUCacheMode>(this, _MTL_PRIVATE_SEL(cpuCacheMode));
-}
-
-_MTL_INLINE MTL::TensorDataType MTL::TensorDescriptor::dataType() const
-{
-    return Object::sendMessage<MTL::TensorDataType>(this, _MTL_PRIVATE_SEL(dataType));
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorDescriptor::dimensions() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(dimensions));
-}
-
-_MTL_INLINE MTL::HazardTrackingMode MTL::TensorDescriptor::hazardTrackingMode() const
-{
-    return Object::sendMessage<MTL::HazardTrackingMode>(this, _MTL_PRIVATE_SEL(hazardTrackingMode));
-}
-
-_MTL_INLINE MTL::TensorDescriptor* MTL::TensorDescriptor::init()
-{
-    return NS::Object::init<MTL::TensorDescriptor>();
-}
-
-_MTL_INLINE MTL::ResourceOptions MTL::TensorDescriptor::resourceOptions() const
-{
-    return Object::sendMessage<MTL::ResourceOptions>(this, _MTL_PRIVATE_SEL(resourceOptions));
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCpuCacheMode_), cpuCacheMode);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setDataType(MTL::TensorDataType dataType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDataType_), dataType);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setDimensions(const MTL::TensorExtents* dimensions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDimensions_), dimensions);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setHazardTrackingMode_), hazardTrackingMode);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setResourceOptions(MTL::ResourceOptions resourceOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResourceOptions_), resourceOptions);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setStorageMode(MTL::StorageMode storageMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStorageMode_), storageMode);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setStrides(const MTL::TensorExtents* strides)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStrides_), strides);
-}
-
-_MTL_INLINE void MTL::TensorDescriptor::setUsage(MTL::TensorUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setUsage_), usage);
-}
-
-_MTL_INLINE MTL::StorageMode MTL::TensorDescriptor::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::TensorDescriptor::strides() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(strides));
-}
-
-_MTL_INLINE MTL::TensorUsage MTL::TensorDescriptor::usage() const
-{
-    return Object::sendMessage<MTL::TensorUsage>(this, _MTL_PRIVATE_SEL(usage));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Tensor::buffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(buffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::Tensor::bufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferOffset));
-}
-
-_MTL_INLINE MTL::TensorDataType MTL::Tensor::dataType() const
-{
-    return Object::sendMessage<MTL::TensorDataType>(this, _MTL_PRIVATE_SEL(dataType));
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::Tensor::dimensions() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(dimensions));
-}
-
-_MTL_INLINE void MTL::Tensor::getBytes(void* bytes, const MTL::TensorExtents* strides, const MTL::TensorExtents* sliceOrigin, const MTL::TensorExtents* sliceDimensions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(getBytes_strides_fromSliceOrigin_sliceDimensions_), bytes, strides, sliceOrigin, sliceDimensions);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::Tensor::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE void MTL::Tensor::replaceSliceOrigin(const MTL::TensorExtents* sliceOrigin, const MTL::TensorExtents* sliceDimensions, const void* bytes, const MTL::TensorExtents* strides)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(replaceSliceOrigin_sliceDimensions_withBytes_strides_), sliceOrigin, sliceDimensions, bytes, strides);
-}
-
-_MTL_INLINE MTL::TensorExtents* MTL::Tensor::strides() const
-{
-    return Object::sendMessage<MTL::TensorExtents*>(this, _MTL_PRIVATE_SEL(strides));
-}
-
-_MTL_INLINE MTL::TensorUsage MTL::Tensor::usage() const
-{
-    return Object::sendMessage<MTL::TensorUsage>(this, _MTL_PRIVATE_SEL(usage));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLTexture.hpp b/engine/thirdparty/metal-cpp/Metal/MTLTexture.hpp
deleted file mode 100644
index 631d9202..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLTexture.hpp
+++ /dev/null
@@ -1,803 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLTexture.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPixelFormat.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTypes.hpp"
-#include <IOSurface/IOSurfaceRef.h>
-
-namespace MTL
-{
-class Buffer;
-class Device;
-class Resource;
-class SharedTextureHandle;
-class Texture;
-class TextureDescriptor;
-class TextureViewDescriptor;
-}
-
-namespace MTL
-{
-_MTL_ENUM(NS::UInteger, TextureType) {
-    TextureType1D = 0,
-    TextureType1DArray = 1,
-    TextureType2D = 2,
-    TextureType2DArray = 3,
-    TextureType2DMultisample = 4,
-    TextureTypeCube = 5,
-    TextureTypeCubeArray = 6,
-    TextureType3D = 7,
-    TextureType2DMultisampleArray = 8,
-    TextureTypeTextureBuffer = 9,
-};
-
-_MTL_ENUM(uint8_t, TextureSwizzle) {
-    TextureSwizzleZero = 0,
-    TextureSwizzleOne = 1,
-    TextureSwizzleRed = 2,
-    TextureSwizzleGreen = 3,
-    TextureSwizzleBlue = 4,
-    TextureSwizzleAlpha = 5,
-};
-
-_MTL_ENUM(NS::Integer, TextureCompressionType) {
-    TextureCompressionTypeLossless = 0,
-    TextureCompressionTypeLossy = 1,
-};
-
-_MTL_OPTIONS(NS::UInteger, TextureUsage) {
-    TextureUsageUnknown = 0,
-    TextureUsageShaderRead = 1,
-    TextureUsageShaderWrite = 1 << 1,
-    TextureUsageRenderTarget = 1 << 2,
-    TextureUsagePixelFormatView = 1 << 4,
-    TextureUsageShaderAtomic = 1 << 5,
-};
-
-struct TextureSwizzleChannels
-{
-
-    TextureSwizzleChannels(MTL::TextureSwizzle r, MTL::TextureSwizzle g, MTL::TextureSwizzle b, MTL::TextureSwizzle a);
-
-    TextureSwizzleChannels();
-
-    static TextureSwizzleChannels Default();
-
-    static TextureSwizzleChannels Make(MTL::TextureSwizzle r, MTL::TextureSwizzle g, MTL::TextureSwizzle b, MTL::TextureSwizzle a);
-
-    MTL::TextureSwizzle           red;
-    MTL::TextureSwizzle           green;
-    MTL::TextureSwizzle           blue;
-    MTL::TextureSwizzle           alpha;
-} _MTL_PACKED;
-
-class SharedTextureHandle : public NS::SecureCoding<SharedTextureHandle>
-{
-public:
-    static SharedTextureHandle* alloc();
-
-    Device*                     device() const;
-
-    SharedTextureHandle*        init();
-
-    NS::String*                 label() const;
-};
-class TextureDescriptor : public NS::Copying<TextureDescriptor>
-{
-public:
-    static TextureDescriptor* alloc();
-
-    bool                      allowGPUOptimizedContents() const;
-
-    NS::UInteger              arrayLength() const;
-
-    TextureCompressionType    compressionType() const;
-
-    CPUCacheMode              cpuCacheMode() const;
-
-    NS::UInteger              depth() const;
-
-    HazardTrackingMode        hazardTrackingMode() const;
-
-    NS::UInteger              height() const;
-
-    TextureDescriptor*        init();
-
-    NS::UInteger              mipmapLevelCount() const;
-
-    PixelFormat               pixelFormat() const;
-
-    SparsePageSize            placementSparsePageSize() const;
-
-    ResourceOptions           resourceOptions() const;
-
-    NS::UInteger              sampleCount() const;
-
-    void                      setAllowGPUOptimizedContents(bool allowGPUOptimizedContents);
-
-    void                      setArrayLength(NS::UInteger arrayLength);
-
-    void                      setCompressionType(MTL::TextureCompressionType compressionType);
-
-    void                      setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode);
-
-    void                      setDepth(NS::UInteger depth);
-
-    void                      setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode);
-
-    void                      setHeight(NS::UInteger height);
-
-    void                      setMipmapLevelCount(NS::UInteger mipmapLevelCount);
-
-    void                      setPixelFormat(MTL::PixelFormat pixelFormat);
-
-    void                      setPlacementSparsePageSize(MTL::SparsePageSize placementSparsePageSize);
-
-    void                      setResourceOptions(MTL::ResourceOptions resourceOptions);
-
-    void                      setSampleCount(NS::UInteger sampleCount);
-
-    void                      setStorageMode(MTL::StorageMode storageMode);
-
-    void                      setSwizzle(MTL::TextureSwizzleChannels swizzle);
-
-    void                      setTextureType(MTL::TextureType textureType);
-
-    void                      setUsage(MTL::TextureUsage usage);
-
-    void                      setWidth(NS::UInteger width);
-
-    StorageMode               storageMode() const;
-
-    TextureSwizzleChannels    swizzle() const;
-
-    static TextureDescriptor* texture2DDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger width, NS::UInteger height, bool mipmapped);
-
-    static TextureDescriptor* textureBufferDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger width, MTL::ResourceOptions resourceOptions, MTL::TextureUsage usage);
-
-    static TextureDescriptor* textureCubeDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger size, bool mipmapped);
-
-    TextureType               textureType() const;
-
-    TextureUsage              usage() const;
-
-    NS::UInteger              width() const;
-};
-class TextureViewDescriptor : public NS::Copying<TextureViewDescriptor>
-{
-public:
-    static TextureViewDescriptor* alloc();
-
-    TextureViewDescriptor*        init();
-
-    NS::Range                     levelRange() const;
-
-    PixelFormat                   pixelFormat() const;
-
-    void                          setLevelRange(NS::Range levelRange);
-
-    void                          setPixelFormat(MTL::PixelFormat pixelFormat);
-
-    void                          setSliceRange(NS::Range sliceRange);
-
-    void                          setSwizzle(MTL::TextureSwizzleChannels swizzle);
-
-    void                          setTextureType(MTL::TextureType textureType);
-
-    NS::Range                     sliceRange() const;
-
-    TextureSwizzleChannels        swizzle() const;
-
-    TextureType                   textureType() const;
-};
-class Texture : public NS::Referencing<Texture, Resource>
-{
-public:
-    bool                   allowGPUOptimizedContents() const;
-
-    NS::UInteger           arrayLength() const;
-
-    Buffer*                buffer() const;
-    NS::UInteger           bufferBytesPerRow() const;
-
-    NS::UInteger           bufferOffset() const;
-
-    TextureCompressionType compressionType() const;
-
-    NS::UInteger           depth() const;
-
-    NS::UInteger           firstMipmapInTail() const;
-
-    [[deprecated("please use isFramebufferOnly instead")]]
-    bool                 framebufferOnly() const;
-
-    void                 getBytes(void* pixelBytes, NS::UInteger bytesPerRow, NS::UInteger bytesPerImage, MTL::Region region, NS::UInteger level, NS::UInteger slice);
-    void                 getBytes(void* pixelBytes, NS::UInteger bytesPerRow, MTL::Region region, NS::UInteger level);
-
-    ResourceID           gpuResourceID() const;
-
-    NS::UInteger         height() const;
-
-    IOSurfaceRef         iosurface() const;
-    NS::UInteger         iosurfacePlane() const;
-
-    bool                 isFramebufferOnly() const;
-
-    bool                 isShareable() const;
-
-    bool                 isSparse() const;
-
-    NS::UInteger         mipmapLevelCount() const;
-
-    Texture*             newRemoteTextureViewForDevice(const MTL::Device* device);
-
-    SharedTextureHandle* newSharedTextureHandle();
-
-    Texture*             newTextureView(MTL::PixelFormat pixelFormat);
-    Texture*             newTextureView(MTL::PixelFormat pixelFormat, MTL::TextureType textureType, NS::Range levelRange, NS::Range sliceRange);
-    Texture*             newTextureView(const MTL::TextureViewDescriptor* descriptor);
-    Texture*             newTextureView(MTL::PixelFormat pixelFormat, MTL::TextureType textureType, NS::Range levelRange, NS::Range sliceRange, MTL::TextureSwizzleChannels swizzle);
-
-    NS::UInteger         parentRelativeLevel() const;
-
-    NS::UInteger         parentRelativeSlice() const;
-
-    Texture*             parentTexture() const;
-
-    PixelFormat          pixelFormat() const;
-
-    Texture*             remoteStorageTexture() const;
-
-    void                 replaceRegion(MTL::Region region, NS::UInteger level, NS::UInteger slice, const void* pixelBytes, NS::UInteger bytesPerRow, NS::UInteger bytesPerImage);
-    void                 replaceRegion(MTL::Region region, NS::UInteger level, const void* pixelBytes, NS::UInteger bytesPerRow);
-
-    Resource*            rootResource() const;
-
-    NS::UInteger         sampleCount() const;
-
-    [[deprecated("please use isShareable instead")]]
-    bool                   shareable() const;
-
-    TextureSparseTier      sparseTextureTier() const;
-
-    TextureSwizzleChannels swizzle() const;
-
-    NS::UInteger           tailSizeInBytes() const;
-
-    TextureType            textureType() const;
-
-    TextureUsage           usage() const;
-
-    NS::UInteger           width() const;
-};
-
-}
-_MTL_INLINE MTL::TextureSwizzleChannels::TextureSwizzleChannels(MTL::TextureSwizzle r, MTL::TextureSwizzle g, MTL::TextureSwizzle b, MTL::TextureSwizzle a)
-    : red(r)
-    , green(g)
-    , blue(b)
-    , alpha(a)
-{
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels::TextureSwizzleChannels()
-    : red(MTL::TextureSwizzleRed)
-    , green(MTL::TextureSwizzleGreen)
-    , blue(MTL::TextureSwizzleBlue)
-    , alpha(MTL::TextureSwizzleAlpha)
-{
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels MTL::TextureSwizzleChannels::Default()
-{
-    return MTL::TextureSwizzleChannels();
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels MTL::TextureSwizzleChannels::Make(MTL::TextureSwizzle r, MTL::TextureSwizzle g, MTL::TextureSwizzle b, MTL::TextureSwizzle a)
-{
-    return TextureSwizzleChannels(r, g, b, a);
-}
-
-_MTL_INLINE MTL::SharedTextureHandle* MTL::SharedTextureHandle::alloc()
-{
-    return NS::Object::alloc<MTL::SharedTextureHandle>(_MTL_PRIVATE_CLS(MTLSharedTextureHandle));
-}
-
-_MTL_INLINE MTL::Device* MTL::SharedTextureHandle::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _MTL_PRIVATE_SEL(device));
-}
-
-_MTL_INLINE MTL::SharedTextureHandle* MTL::SharedTextureHandle::init()
-{
-    return NS::Object::init<MTL::SharedTextureHandle>();
-}
-
-_MTL_INLINE NS::String* MTL::SharedTextureHandle::label() const
-{
-    return Object::sendMessage<NS::String*>(this, _MTL_PRIVATE_SEL(label));
-}
-
-_MTL_INLINE MTL::TextureDescriptor* MTL::TextureDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::TextureDescriptor>(_MTL_PRIVATE_CLS(MTLTextureDescriptor));
-}
-
-_MTL_INLINE bool MTL::TextureDescriptor::allowGPUOptimizedContents() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(allowGPUOptimizedContents));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE MTL::TextureCompressionType MTL::TextureDescriptor::compressionType() const
-{
-    return Object::sendMessage<MTL::TextureCompressionType>(this, _MTL_PRIVATE_SEL(compressionType));
-}
-
-_MTL_INLINE MTL::CPUCacheMode MTL::TextureDescriptor::cpuCacheMode() const
-{
-    return Object::sendMessage<MTL::CPUCacheMode>(this, _MTL_PRIVATE_SEL(cpuCacheMode));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::depth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(depth));
-}
-
-_MTL_INLINE MTL::HazardTrackingMode MTL::TextureDescriptor::hazardTrackingMode() const
-{
-    return Object::sendMessage<MTL::HazardTrackingMode>(this, _MTL_PRIVATE_SEL(hazardTrackingMode));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::height() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(height));
-}
-
-_MTL_INLINE MTL::TextureDescriptor* MTL::TextureDescriptor::init()
-{
-    return NS::Object::init<MTL::TextureDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::mipmapLevelCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(mipmapLevelCount));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::TextureDescriptor::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE MTL::SparsePageSize MTL::TextureDescriptor::placementSparsePageSize() const
-{
-    return Object::sendMessage<MTL::SparsePageSize>(this, _MTL_PRIVATE_SEL(placementSparsePageSize));
-}
-
-_MTL_INLINE MTL::ResourceOptions MTL::TextureDescriptor::resourceOptions() const
-{
-    return Object::sendMessage<MTL::ResourceOptions>(this, _MTL_PRIVATE_SEL(resourceOptions));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::sampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setAllowGPUOptimizedContents(bool allowGPUOptimizedContents)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setAllowGPUOptimizedContents_), allowGPUOptimizedContents);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setArrayLength(NS::UInteger arrayLength)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setArrayLength_), arrayLength);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setCompressionType(MTL::TextureCompressionType compressionType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCompressionType_), compressionType);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setCpuCacheMode(MTL::CPUCacheMode cpuCacheMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setCpuCacheMode_), cpuCacheMode);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setDepth(NS::UInteger depth)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setDepth_), depth);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setHazardTrackingMode(MTL::HazardTrackingMode hazardTrackingMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setHazardTrackingMode_), hazardTrackingMode);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setHeight(NS::UInteger height)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setHeight_), height);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setMipmapLevelCount(NS::UInteger mipmapLevelCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setMipmapLevelCount_), mipmapLevelCount);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setPlacementSparsePageSize(MTL::SparsePageSize placementSparsePageSize)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPlacementSparsePageSize_), placementSparsePageSize);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setResourceOptions(MTL::ResourceOptions resourceOptions)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setResourceOptions_), resourceOptions);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setSampleCount(NS::UInteger sampleCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSampleCount_), sampleCount);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setStorageMode(MTL::StorageMode storageMode)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStorageMode_), storageMode);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setSwizzle(MTL::TextureSwizzleChannels swizzle)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSwizzle_), swizzle);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setTextureType(MTL::TextureType textureType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTextureType_), textureType);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setUsage(MTL::TextureUsage usage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setUsage_), usage);
-}
-
-_MTL_INLINE void MTL::TextureDescriptor::setWidth(NS::UInteger width)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setWidth_), width);
-}
-
-_MTL_INLINE MTL::StorageMode MTL::TextureDescriptor::storageMode() const
-{
-    return Object::sendMessage<MTL::StorageMode>(this, _MTL_PRIVATE_SEL(storageMode));
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels MTL::TextureDescriptor::swizzle() const
-{
-    return Object::sendMessage<MTL::TextureSwizzleChannels>(this, _MTL_PRIVATE_SEL(swizzle));
-}
-
-_MTL_INLINE MTL::TextureDescriptor* MTL::TextureDescriptor::texture2DDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger width, NS::UInteger height, bool mipmapped)
-{
-    return Object::sendMessage<MTL::TextureDescriptor*>(_MTL_PRIVATE_CLS(MTLTextureDescriptor), _MTL_PRIVATE_SEL(texture2DDescriptorWithPixelFormat_width_height_mipmapped_), pixelFormat, width, height, mipmapped);
-}
-
-_MTL_INLINE MTL::TextureDescriptor* MTL::TextureDescriptor::textureBufferDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger width, MTL::ResourceOptions resourceOptions, MTL::TextureUsage usage)
-{
-    return Object::sendMessage<MTL::TextureDescriptor*>(_MTL_PRIVATE_CLS(MTLTextureDescriptor), _MTL_PRIVATE_SEL(textureBufferDescriptorWithPixelFormat_width_resourceOptions_usage_), pixelFormat, width, resourceOptions, usage);
-}
-
-_MTL_INLINE MTL::TextureDescriptor* MTL::TextureDescriptor::textureCubeDescriptor(MTL::PixelFormat pixelFormat, NS::UInteger size, bool mipmapped)
-{
-    return Object::sendMessage<MTL::TextureDescriptor*>(_MTL_PRIVATE_CLS(MTLTextureDescriptor), _MTL_PRIVATE_SEL(textureCubeDescriptorWithPixelFormat_size_mipmapped_), pixelFormat, size, mipmapped);
-}
-
-_MTL_INLINE MTL::TextureType MTL::TextureDescriptor::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE MTL::TextureUsage MTL::TextureDescriptor::usage() const
-{
-    return Object::sendMessage<MTL::TextureUsage>(this, _MTL_PRIVATE_SEL(usage));
-}
-
-_MTL_INLINE NS::UInteger MTL::TextureDescriptor::width() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(width));
-}
-
-_MTL_INLINE MTL::TextureViewDescriptor* MTL::TextureViewDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::TextureViewDescriptor>(_MTL_PRIVATE_CLS(MTLTextureViewDescriptor));
-}
-
-_MTL_INLINE MTL::TextureViewDescriptor* MTL::TextureViewDescriptor::init()
-{
-    return NS::Object::init<MTL::TextureViewDescriptor>();
-}
-
-_MTL_INLINE NS::Range MTL::TextureViewDescriptor::levelRange() const
-{
-    return Object::sendMessage<NS::Range>(this, _MTL_PRIVATE_SEL(levelRange));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::TextureViewDescriptor::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE void MTL::TextureViewDescriptor::setLevelRange(NS::Range levelRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setLevelRange_), levelRange);
-}
-
-_MTL_INLINE void MTL::TextureViewDescriptor::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE void MTL::TextureViewDescriptor::setSliceRange(NS::Range sliceRange)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSliceRange_), sliceRange);
-}
-
-_MTL_INLINE void MTL::TextureViewDescriptor::setSwizzle(MTL::TextureSwizzleChannels swizzle)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setSwizzle_), swizzle);
-}
-
-_MTL_INLINE void MTL::TextureViewDescriptor::setTextureType(MTL::TextureType textureType)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setTextureType_), textureType);
-}
-
-_MTL_INLINE NS::Range MTL::TextureViewDescriptor::sliceRange() const
-{
-    return Object::sendMessage<NS::Range>(this, _MTL_PRIVATE_SEL(sliceRange));
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels MTL::TextureViewDescriptor::swizzle() const
-{
-    return Object::sendMessage<MTL::TextureSwizzleChannels>(this, _MTL_PRIVATE_SEL(swizzle));
-}
-
-_MTL_INLINE MTL::TextureType MTL::TextureViewDescriptor::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE bool MTL::Texture::allowGPUOptimizedContents() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(allowGPUOptimizedContents));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::arrayLength() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(arrayLength));
-}
-
-_MTL_INLINE MTL::Buffer* MTL::Texture::buffer() const
-{
-    return Object::sendMessage<MTL::Buffer*>(this, _MTL_PRIVATE_SEL(buffer));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::bufferBytesPerRow() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferBytesPerRow));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::bufferOffset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferOffset));
-}
-
-_MTL_INLINE MTL::TextureCompressionType MTL::Texture::compressionType() const
-{
-    return Object::sendMessage<MTL::TextureCompressionType>(this, _MTL_PRIVATE_SEL(compressionType));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::depth() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(depth));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::firstMipmapInTail() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(firstMipmapInTail));
-}
-
-_MTL_INLINE bool MTL::Texture::framebufferOnly() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isFramebufferOnly));
-}
-
-_MTL_INLINE void MTL::Texture::getBytes(void* pixelBytes, NS::UInteger bytesPerRow, NS::UInteger bytesPerImage, MTL::Region region, NS::UInteger level, NS::UInteger slice)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(getBytes_bytesPerRow_bytesPerImage_fromRegion_mipmapLevel_slice_), pixelBytes, bytesPerRow, bytesPerImage, region, level, slice);
-}
-
-_MTL_INLINE void MTL::Texture::getBytes(void* pixelBytes, NS::UInteger bytesPerRow, MTL::Region region, NS::UInteger level)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(getBytes_bytesPerRow_fromRegion_mipmapLevel_), pixelBytes, bytesPerRow, region, level);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::Texture::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::height() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(height));
-}
-
-_MTL_INLINE IOSurfaceRef MTL::Texture::iosurface() const
-{
-    return Object::sendMessage<IOSurfaceRef>(this, _MTL_PRIVATE_SEL(iosurface));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::iosurfacePlane() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(iosurfacePlane));
-}
-
-_MTL_INLINE bool MTL::Texture::isFramebufferOnly() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isFramebufferOnly));
-}
-
-_MTL_INLINE bool MTL::Texture::isShareable() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isShareable));
-}
-
-_MTL_INLINE bool MTL::Texture::isSparse() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isSparse));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::mipmapLevelCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(mipmapLevelCount));
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::newRemoteTextureViewForDevice(const MTL::Device* device)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newRemoteTextureViewForDevice_), device);
-}
-
-_MTL_INLINE MTL::SharedTextureHandle* MTL::Texture::newSharedTextureHandle()
-{
-    return Object::sendMessage<MTL::SharedTextureHandle*>(this, _MTL_PRIVATE_SEL(newSharedTextureHandle));
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::newTextureView(MTL::PixelFormat pixelFormat)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureViewWithPixelFormat_), pixelFormat);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::newTextureView(MTL::PixelFormat pixelFormat, MTL::TextureType textureType, NS::Range levelRange, NS::Range sliceRange)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureViewWithPixelFormat_textureType_levels_slices_), pixelFormat, textureType, levelRange, sliceRange);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::newTextureView(const MTL::TextureViewDescriptor* descriptor)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureViewWithDescriptor_), descriptor);
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::newTextureView(MTL::PixelFormat pixelFormat, MTL::TextureType textureType, NS::Range levelRange, NS::Range sliceRange, MTL::TextureSwizzleChannels swizzle)
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(newTextureViewWithPixelFormat_textureType_levels_slices_swizzle_), pixelFormat, textureType, levelRange, sliceRange, swizzle);
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::parentRelativeLevel() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(parentRelativeLevel));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::parentRelativeSlice() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(parentRelativeSlice));
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::parentTexture() const
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(parentTexture));
-}
-
-_MTL_INLINE MTL::PixelFormat MTL::Texture::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this, _MTL_PRIVATE_SEL(pixelFormat));
-}
-
-_MTL_INLINE MTL::Texture* MTL::Texture::remoteStorageTexture() const
-{
-    return Object::sendMessage<MTL::Texture*>(this, _MTL_PRIVATE_SEL(remoteStorageTexture));
-}
-
-_MTL_INLINE void MTL::Texture::replaceRegion(MTL::Region region, NS::UInteger level, NS::UInteger slice, const void* pixelBytes, NS::UInteger bytesPerRow, NS::UInteger bytesPerImage)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(replaceRegion_mipmapLevel_slice_withBytes_bytesPerRow_bytesPerImage_), region, level, slice, pixelBytes, bytesPerRow, bytesPerImage);
-}
-
-_MTL_INLINE void MTL::Texture::replaceRegion(MTL::Region region, NS::UInteger level, const void* pixelBytes, NS::UInteger bytesPerRow)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(replaceRegion_mipmapLevel_withBytes_bytesPerRow_), region, level, pixelBytes, bytesPerRow);
-}
-
-_MTL_INLINE MTL::Resource* MTL::Texture::rootResource() const
-{
-    return Object::sendMessage<MTL::Resource*>(this, _MTL_PRIVATE_SEL(rootResource));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::sampleCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(sampleCount));
-}
-
-_MTL_INLINE bool MTL::Texture::shareable() const
-{
-    return Object::sendMessage<bool>(this, _MTL_PRIVATE_SEL(isShareable));
-}
-
-_MTL_INLINE MTL::TextureSparseTier MTL::Texture::sparseTextureTier() const
-{
-    return Object::sendMessage<MTL::TextureSparseTier>(this, _MTL_PRIVATE_SEL(sparseTextureTier));
-}
-
-_MTL_INLINE MTL::TextureSwizzleChannels MTL::Texture::swizzle() const
-{
-    return Object::sendMessage<MTL::TextureSwizzleChannels>(this, _MTL_PRIVATE_SEL(swizzle));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::tailSizeInBytes() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(tailSizeInBytes));
-}
-
-_MTL_INLINE MTL::TextureType MTL::Texture::textureType() const
-{
-    return Object::sendMessage<MTL::TextureType>(this, _MTL_PRIVATE_SEL(textureType));
-}
-
-_MTL_INLINE MTL::TextureUsage MTL::Texture::usage() const
-{
-    return Object::sendMessage<MTL::TextureUsage>(this, _MTL_PRIVATE_SEL(usage));
-}
-
-_MTL_INLINE NS::UInteger MTL::Texture::width() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(width));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLTextureViewPool.hpp b/engine/thirdparty/metal-cpp/Metal/MTLTextureViewPool.hpp
deleted file mode 100644
index cb7556f5..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLTextureViewPool.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLTextureViewPool.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResourceViewPool.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class Buffer;
-class Texture;
-class TextureDescriptor;
-class TextureViewDescriptor;
-
-class TextureViewPool : public NS::Referencing<TextureViewPool, ResourceViewPool>
-{
-public:
-    ResourceID setTextureView(const MTL::Texture* texture, NS::UInteger index);
-    ResourceID setTextureView(const MTL::Texture* texture, const MTL::TextureViewDescriptor* descriptor, NS::UInteger index);
-    ResourceID setTextureViewFromBuffer(const MTL::Buffer* buffer, const MTL::TextureDescriptor* descriptor, NS::UInteger offset, NS::UInteger bytesPerRow, NS::UInteger index);
-};
-
-}
-_MTL_INLINE MTL::ResourceID MTL::TextureViewPool::setTextureView(const MTL::Texture* texture, NS::UInteger index)
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(setTextureView_atIndex_), texture, index);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::TextureViewPool::setTextureView(const MTL::Texture* texture, const MTL::TextureViewDescriptor* descriptor, NS::UInteger index)
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(setTextureView_descriptor_atIndex_), texture, descriptor, index);
-}
-
-_MTL_INLINE MTL::ResourceID MTL::TextureViewPool::setTextureViewFromBuffer(const MTL::Buffer* buffer, const MTL::TextureDescriptor* descriptor, NS::UInteger offset, NS::UInteger bytesPerRow, NS::UInteger index)
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(setTextureViewFromBuffer_descriptor_offset_bytesPerRow_atIndex_), buffer, descriptor, offset, bytesPerRow, index);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLTypes.hpp b/engine/thirdparty/metal-cpp/Metal/MTLTypes.hpp
deleted file mode 100644
index c6bbc031..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLTypes.hpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLTypes.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-struct SamplePosition;
-
-using Coordinate2D = MTL::SamplePosition;
-
-struct Origin
-{
-    Origin() = default;
-
-    Origin(NS::UInteger x, NS::UInteger y, NS::UInteger z);
-
-    static Origin Make(NS::UInteger x, NS::UInteger y, NS::UInteger z);
-
-    NS::UInteger  x;
-    NS::UInteger  y;
-    NS::UInteger  z;
-} _MTL_PACKED;
-
-struct Size
-{
-    Size() = default;
-
-    Size(NS::UInteger width, NS::UInteger height, NS::UInteger depth);
-
-    static Size  Make(NS::UInteger width, NS::UInteger height, NS::UInteger depth);
-
-    NS::UInteger width;
-    NS::UInteger height;
-    NS::UInteger depth;
-} _MTL_PACKED;
-
-struct Region
-{
-    Region() = default;
-
-    Region(NS::UInteger x, NS::UInteger width);
-
-    Region(NS::UInteger x, NS::UInteger y, NS::UInteger width, NS::UInteger height);
-
-    Region(NS::UInteger x, NS::UInteger y, NS::UInteger z, NS::UInteger width, NS::UInteger height, NS::UInteger depth);
-
-    static Region Make1D(NS::UInteger x, NS::UInteger width);
-
-    static Region Make2D(NS::UInteger x, NS::UInteger y, NS::UInteger width, NS::UInteger height);
-
-    static Region Make3D(NS::UInteger x, NS::UInteger y, NS::UInteger z, NS::UInteger width, NS::UInteger height, NS::UInteger depth);
-
-    MTL::Origin   origin;
-    MTL::Size     size;
-} _MTL_PACKED;
-
-struct SamplePosition
-{
-    SamplePosition() = default;
-
-    SamplePosition(float x, float y);
-
-    static SamplePosition Make(float x, float y);
-
-    float                 x;
-    float                 y;
-} _MTL_PACKED;
-
-struct ResourceID
-{
-    uint64_t _impl;
-} _MTL_PACKED;
-
-}
-_MTL_INLINE MTL::Origin::Origin(NS::UInteger x, NS::UInteger y, NS::UInteger z)
-    : x(x)
-    , y(y)
-    , z(z)
-{
-}
-
-_MTL_INLINE MTL::Origin MTL::Origin::Make(NS::UInteger x, NS::UInteger y, NS::UInteger z)
-{
-    return Origin(x, y, z);
-}
-
-_MTL_INLINE MTL::Size::Size(NS::UInteger width, NS::UInteger height, NS::UInteger depth)
-    : width(width)
-    , height(height)
-    , depth(depth)
-{
-}
-
-_MTL_INLINE MTL::Size MTL::Size::Make(NS::UInteger width, NS::UInteger height, NS::UInteger depth)
-{
-    return Size(width, height, depth);
-}
-
-_MTL_INLINE MTL::Region::Region(NS::UInteger x, NS::UInteger width)
-    : origin(x, 0, 0)
-    , size(width, 1, 1)
-{
-}
-
-_MTL_INLINE MTL::Region::Region(NS::UInteger x, NS::UInteger y, NS::UInteger width, NS::UInteger height)
-    : origin(x, y, 0)
-    , size(width, height, 1)
-{
-}
-
-_MTL_INLINE MTL::Region::Region(NS::UInteger x, NS::UInteger y, NS::UInteger z, NS::UInteger width, NS::UInteger height, NS::UInteger depth)
-    : origin(x, y, z)
-    , size(width, height, depth)
-{
-}
-
-_MTL_INLINE MTL::Region MTL::Region::Make1D(NS::UInteger x, NS::UInteger width)
-{
-    return Region(x, width);
-}
-
-_MTL_INLINE MTL::Region MTL::Region::Make2D(NS::UInteger x, NS::UInteger y, NS::UInteger width, NS::UInteger height)
-{
-    return Region(x, y, width, height);
-}
-
-_MTL_INLINE MTL::Region MTL::Region::Make3D(NS::UInteger x, NS::UInteger y, NS::UInteger z, NS::UInteger width, NS::UInteger height, NS::UInteger depth)
-{
-    return Region(x, y, z, width, height, depth);
-}
-
-_MTL_INLINE MTL::SamplePosition::SamplePosition(float x, float y)
-    : x(x)
-    , y(y)
-{
-}
-
-_MTL_INLINE MTL::SamplePosition MTL::SamplePosition::Make(float x, float y)
-{
-    return SamplePosition(x, y);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLVersion.hpp b/engine/thirdparty/metal-cpp/Metal/MTLVersion.hpp
deleted file mode 100644
index d3503972..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLVersion.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLVersion.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define METALCPP_VERSION_MAJOR 370
-#define METALCPP_VERSION_MINOR 63
-#define METALCPP_VERSION_PATCH 1
-
-#define METALCPP_SUPPORTS_VERSION(major, minor, patch) \
-    ((major < METALCPP_VERSION_MAJOR) || \
-    (major == METALCPP_VERSION_MAJOR && minor < METALCPP_VERSION_MINOR) || \
-    (major == METALCPP_VERSION_MAJOR && minor == METALCPP_VERSION_MINOR && patch <= METALCPP_VERSION_PATCH))
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLVertexDescriptor.hpp b/engine/thirdparty/metal-cpp/Metal/MTLVertexDescriptor.hpp
deleted file mode 100644
index 4a38f3bc..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLVertexDescriptor.hpp
+++ /dev/null
@@ -1,326 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLVertexDescriptor.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-
-namespace MTL
-{
-class VertexAttributeDescriptor;
-class VertexAttributeDescriptorArray;
-class VertexBufferLayoutDescriptor;
-class VertexBufferLayoutDescriptorArray;
-class VertexDescriptor;
-_MTL_ENUM(NS::UInteger, VertexFormat) {
-    VertexFormatInvalid = 0,
-    VertexFormatUChar2 = 1,
-    VertexFormatUChar3 = 2,
-    VertexFormatUChar4 = 3,
-    VertexFormatChar2 = 4,
-    VertexFormatChar3 = 5,
-    VertexFormatChar4 = 6,
-    VertexFormatUChar2Normalized = 7,
-    VertexFormatUChar3Normalized = 8,
-    VertexFormatUChar4Normalized = 9,
-    VertexFormatChar2Normalized = 10,
-    VertexFormatChar3Normalized = 11,
-    VertexFormatChar4Normalized = 12,
-    VertexFormatUShort2 = 13,
-    VertexFormatUShort3 = 14,
-    VertexFormatUShort4 = 15,
-    VertexFormatShort2 = 16,
-    VertexFormatShort3 = 17,
-    VertexFormatShort4 = 18,
-    VertexFormatUShort2Normalized = 19,
-    VertexFormatUShort3Normalized = 20,
-    VertexFormatUShort4Normalized = 21,
-    VertexFormatShort2Normalized = 22,
-    VertexFormatShort3Normalized = 23,
-    VertexFormatShort4Normalized = 24,
-    VertexFormatHalf2 = 25,
-    VertexFormatHalf3 = 26,
-    VertexFormatHalf4 = 27,
-    VertexFormatFloat = 28,
-    VertexFormatFloat2 = 29,
-    VertexFormatFloat3 = 30,
-    VertexFormatFloat4 = 31,
-    VertexFormatInt = 32,
-    VertexFormatInt2 = 33,
-    VertexFormatInt3 = 34,
-    VertexFormatInt4 = 35,
-    VertexFormatUInt = 36,
-    VertexFormatUInt2 = 37,
-    VertexFormatUInt3 = 38,
-    VertexFormatUInt4 = 39,
-    VertexFormatInt1010102Normalized = 40,
-    VertexFormatUInt1010102Normalized = 41,
-    VertexFormatUChar4Normalized_BGRA = 42,
-    VertexFormatUChar = 45,
-    VertexFormatChar = 46,
-    VertexFormatUCharNormalized = 47,
-    VertexFormatCharNormalized = 48,
-    VertexFormatUShort = 49,
-    VertexFormatShort = 50,
-    VertexFormatUShortNormalized = 51,
-    VertexFormatShortNormalized = 52,
-    VertexFormatHalf = 53,
-    VertexFormatFloatRG11B10 = 54,
-    VertexFormatFloatRGB9E5 = 55,
-};
-
-_MTL_ENUM(NS::UInteger, VertexStepFunction) {
-    VertexStepFunctionConstant = 0,
-    VertexStepFunctionPerVertex = 1,
-    VertexStepFunctionPerInstance = 2,
-    VertexStepFunctionPerPatch = 3,
-    VertexStepFunctionPerPatchControlPoint = 4,
-};
-
-static const NS::UInteger BufferLayoutStrideDynamic = NS::UIntegerMax;
-
-class VertexBufferLayoutDescriptor : public NS::Copying<VertexBufferLayoutDescriptor>
-{
-public:
-    static VertexBufferLayoutDescriptor* alloc();
-
-    VertexBufferLayoutDescriptor*        init();
-
-    void                                 setStepFunction(MTL::VertexStepFunction stepFunction);
-
-    void                                 setStepRate(NS::UInteger stepRate);
-
-    void                                 setStride(NS::UInteger stride);
-
-    VertexStepFunction                   stepFunction() const;
-
-    NS::UInteger                         stepRate() const;
-
-    NS::UInteger                         stride() const;
-};
-class VertexBufferLayoutDescriptorArray : public NS::Referencing<VertexBufferLayoutDescriptorArray>
-{
-public:
-    static VertexBufferLayoutDescriptorArray* alloc();
-
-    VertexBufferLayoutDescriptorArray*        init();
-
-    VertexBufferLayoutDescriptor*             object(NS::UInteger index);
-    void                                      setObject(const MTL::VertexBufferLayoutDescriptor* bufferDesc, NS::UInteger index);
-};
-class VertexAttributeDescriptor : public NS::Copying<VertexAttributeDescriptor>
-{
-public:
-    static VertexAttributeDescriptor* alloc();
-
-    NS::UInteger                      bufferIndex() const;
-
-    VertexFormat                      format() const;
-
-    VertexAttributeDescriptor*        init();
-
-    NS::UInteger                      offset() const;
-
-    void                              setBufferIndex(NS::UInteger bufferIndex);
-
-    void                              setFormat(MTL::VertexFormat format);
-
-    void                              setOffset(NS::UInteger offset);
-};
-class VertexAttributeDescriptorArray : public NS::Referencing<VertexAttributeDescriptorArray>
-{
-public:
-    static VertexAttributeDescriptorArray* alloc();
-
-    VertexAttributeDescriptorArray*        init();
-
-    VertexAttributeDescriptor*             object(NS::UInteger index);
-    void                                   setObject(const MTL::VertexAttributeDescriptor* attributeDesc, NS::UInteger index);
-};
-class VertexDescriptor : public NS::Copying<VertexDescriptor>
-{
-public:
-    static VertexDescriptor*           alloc();
-
-    VertexAttributeDescriptorArray*    attributes() const;
-
-    VertexDescriptor*                  init();
-
-    VertexBufferLayoutDescriptorArray* layouts() const;
-
-    void                               reset();
-
-    static VertexDescriptor*           vertexDescriptor();
-};
-
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptor* MTL::VertexBufferLayoutDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::VertexBufferLayoutDescriptor>(_MTL_PRIVATE_CLS(MTLVertexBufferLayoutDescriptor));
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptor* MTL::VertexBufferLayoutDescriptor::init()
-{
-    return NS::Object::init<MTL::VertexBufferLayoutDescriptor>();
-}
-
-_MTL_INLINE void MTL::VertexBufferLayoutDescriptor::setStepFunction(MTL::VertexStepFunction stepFunction)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStepFunction_), stepFunction);
-}
-
-_MTL_INLINE void MTL::VertexBufferLayoutDescriptor::setStepRate(NS::UInteger stepRate)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStepRate_), stepRate);
-}
-
-_MTL_INLINE void MTL::VertexBufferLayoutDescriptor::setStride(NS::UInteger stride)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setStride_), stride);
-}
-
-_MTL_INLINE MTL::VertexStepFunction MTL::VertexBufferLayoutDescriptor::stepFunction() const
-{
-    return Object::sendMessage<MTL::VertexStepFunction>(this, _MTL_PRIVATE_SEL(stepFunction));
-}
-
-_MTL_INLINE NS::UInteger MTL::VertexBufferLayoutDescriptor::stepRate() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(stepRate));
-}
-
-_MTL_INLINE NS::UInteger MTL::VertexBufferLayoutDescriptor::stride() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(stride));
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptorArray* MTL::VertexBufferLayoutDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::VertexBufferLayoutDescriptorArray>(_MTL_PRIVATE_CLS(MTLVertexBufferLayoutDescriptorArray));
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptorArray* MTL::VertexBufferLayoutDescriptorArray::init()
-{
-    return NS::Object::init<MTL::VertexBufferLayoutDescriptorArray>();
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptor* MTL::VertexBufferLayoutDescriptorArray::object(NS::UInteger index)
-{
-    return Object::sendMessage<MTL::VertexBufferLayoutDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), index);
-}
-
-_MTL_INLINE void MTL::VertexBufferLayoutDescriptorArray::setObject(const MTL::VertexBufferLayoutDescriptor* bufferDesc, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), bufferDesc, index);
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptor* MTL::VertexAttributeDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::VertexAttributeDescriptor>(_MTL_PRIVATE_CLS(MTLVertexAttributeDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::VertexAttributeDescriptor::bufferIndex() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(bufferIndex));
-}
-
-_MTL_INLINE MTL::VertexFormat MTL::VertexAttributeDescriptor::format() const
-{
-    return Object::sendMessage<MTL::VertexFormat>(this, _MTL_PRIVATE_SEL(format));
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptor* MTL::VertexAttributeDescriptor::init()
-{
-    return NS::Object::init<MTL::VertexAttributeDescriptor>();
-}
-
-_MTL_INLINE NS::UInteger MTL::VertexAttributeDescriptor::offset() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(offset));
-}
-
-_MTL_INLINE void MTL::VertexAttributeDescriptor::setBufferIndex(NS::UInteger bufferIndex)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setBufferIndex_), bufferIndex);
-}
-
-_MTL_INLINE void MTL::VertexAttributeDescriptor::setFormat(MTL::VertexFormat format)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFormat_), format);
-}
-
-_MTL_INLINE void MTL::VertexAttributeDescriptor::setOffset(NS::UInteger offset)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setOffset_), offset);
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptorArray* MTL::VertexAttributeDescriptorArray::alloc()
-{
-    return NS::Object::alloc<MTL::VertexAttributeDescriptorArray>(_MTL_PRIVATE_CLS(MTLVertexAttributeDescriptorArray));
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptorArray* MTL::VertexAttributeDescriptorArray::init()
-{
-    return NS::Object::init<MTL::VertexAttributeDescriptorArray>();
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptor* MTL::VertexAttributeDescriptorArray::object(NS::UInteger index)
-{
-    return Object::sendMessage<MTL::VertexAttributeDescriptor*>(this, _MTL_PRIVATE_SEL(objectAtIndexedSubscript_), index);
-}
-
-_MTL_INLINE void MTL::VertexAttributeDescriptorArray::setObject(const MTL::VertexAttributeDescriptor* attributeDesc, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setObject_atIndexedSubscript_), attributeDesc, index);
-}
-
-_MTL_INLINE MTL::VertexDescriptor* MTL::VertexDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::VertexDescriptor>(_MTL_PRIVATE_CLS(MTLVertexDescriptor));
-}
-
-_MTL_INLINE MTL::VertexAttributeDescriptorArray* MTL::VertexDescriptor::attributes() const
-{
-    return Object::sendMessage<MTL::VertexAttributeDescriptorArray*>(this, _MTL_PRIVATE_SEL(attributes));
-}
-
-_MTL_INLINE MTL::VertexDescriptor* MTL::VertexDescriptor::init()
-{
-    return NS::Object::init<MTL::VertexDescriptor>();
-}
-
-_MTL_INLINE MTL::VertexBufferLayoutDescriptorArray* MTL::VertexDescriptor::layouts() const
-{
-    return Object::sendMessage<MTL::VertexBufferLayoutDescriptorArray*>(this, _MTL_PRIVATE_SEL(layouts));
-}
-
-_MTL_INLINE void MTL::VertexDescriptor::reset()
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(reset));
-}
-
-_MTL_INLINE MTL::VertexDescriptor* MTL::VertexDescriptor::vertexDescriptor()
-{
-    return Object::sendMessage<MTL::VertexDescriptor*>(_MTL_PRIVATE_CLS(MTLVertexDescriptor), _MTL_PRIVATE_SEL(vertexDescriptor));
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/MTLVisibleFunctionTable.hpp b/engine/thirdparty/metal-cpp/Metal/MTLVisibleFunctionTable.hpp
deleted file mode 100644
index de144ea2..00000000
--- a/engine/thirdparty/metal-cpp/Metal/MTLVisibleFunctionTable.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/MTLVisibleFunctionTable.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-#include "../Foundation/Foundation.hpp"
-#include "MTLDefines.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLResource.hpp"
-#include "MTLTypes.hpp"
-
-namespace MTL
-{
-class FunctionHandle;
-class VisibleFunctionTableDescriptor;
-
-class VisibleFunctionTableDescriptor : public NS::Copying<VisibleFunctionTableDescriptor>
-{
-public:
-    static VisibleFunctionTableDescriptor* alloc();
-
-    NS::UInteger                           functionCount() const;
-
-    VisibleFunctionTableDescriptor*        init();
-
-    void                                   setFunctionCount(NS::UInteger functionCount);
-
-    static VisibleFunctionTableDescriptor* visibleFunctionTableDescriptor();
-};
-class VisibleFunctionTable : public NS::Referencing<VisibleFunctionTable, Resource>
-{
-public:
-    ResourceID gpuResourceID() const;
-
-    void       setFunction(const MTL::FunctionHandle* function, NS::UInteger index);
-    void       setFunctions(const MTL::FunctionHandle* const functions[], NS::Range range);
-};
-
-}
-_MTL_INLINE MTL::VisibleFunctionTableDescriptor* MTL::VisibleFunctionTableDescriptor::alloc()
-{
-    return NS::Object::alloc<MTL::VisibleFunctionTableDescriptor>(_MTL_PRIVATE_CLS(MTLVisibleFunctionTableDescriptor));
-}
-
-_MTL_INLINE NS::UInteger MTL::VisibleFunctionTableDescriptor::functionCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this, _MTL_PRIVATE_SEL(functionCount));
-}
-
-_MTL_INLINE MTL::VisibleFunctionTableDescriptor* MTL::VisibleFunctionTableDescriptor::init()
-{
-    return NS::Object::init<MTL::VisibleFunctionTableDescriptor>();
-}
-
-_MTL_INLINE void MTL::VisibleFunctionTableDescriptor::setFunctionCount(NS::UInteger functionCount)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctionCount_), functionCount);
-}
-
-_MTL_INLINE MTL::VisibleFunctionTableDescriptor* MTL::VisibleFunctionTableDescriptor::visibleFunctionTableDescriptor()
-{
-    return Object::sendMessage<MTL::VisibleFunctionTableDescriptor*>(_MTL_PRIVATE_CLS(MTLVisibleFunctionTableDescriptor), _MTL_PRIVATE_SEL(visibleFunctionTableDescriptor));
-}
-
-_MTL_INLINE MTL::ResourceID MTL::VisibleFunctionTable::gpuResourceID() const
-{
-    return Object::sendMessage<MTL::ResourceID>(this, _MTL_PRIVATE_SEL(gpuResourceID));
-}
-
-_MTL_INLINE void MTL::VisibleFunctionTable::setFunction(const MTL::FunctionHandle* function, NS::UInteger index)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunction_atIndex_), function, index);
-}
-
-_MTL_INLINE void MTL::VisibleFunctionTable::setFunctions(const MTL::FunctionHandle* const functions[], NS::Range range)
-{
-    Object::sendMessage<void>(this, _MTL_PRIVATE_SEL(setFunctions_withRange_), functions, range);
-}
diff --git a/engine/thirdparty/metal-cpp/Metal/Metal.hpp b/engine/thirdparty/metal-cpp/Metal/Metal.hpp
deleted file mode 100644
index 0d89cc04..00000000
--- a/engine/thirdparty/metal-cpp/Metal/Metal.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// Metal/Metal.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLAccelerationStructure.hpp"
-#include "MTLAccelerationStructureCommandEncoder.hpp"
-#include "MTLAccelerationStructureTypes.hpp"
-#include "MTLAllocation.hpp"
-#include "MTLArgument.hpp"
-#include "MTLArgumentEncoder.hpp"
-#include "MTLBinaryArchive.hpp"
-#include "MTLBlitCommandEncoder.hpp"
-#include "MTLBlitPass.hpp"
-#include "MTLBuffer.hpp"
-#include "MTLCaptureManager.hpp"
-#include "MTLCaptureScope.hpp"
-#include "MTLCommandBuffer.hpp"
-#include "MTLCommandEncoder.hpp"
-#include "MTLCommandQueue.hpp"
-#include "MTLComputeCommandEncoder.hpp"
-#include "MTLComputePass.hpp"
-#include "MTLComputePipeline.hpp"
-#include "MTLCounters.hpp"
-#include "MTLDefines.hpp"
-#include "MTLDepthStencil.hpp"
-#include "MTLDevice.hpp"
-#include "MTLDrawable.hpp"
-#include "MTLDynamicLibrary.hpp"
-#include "MTLEvent.hpp"
-#include "MTLFence.hpp"
-#include "MTLFunctionConstantValues.hpp"
-#include "MTLFunctionDescriptor.hpp"
-#include "MTLFunctionHandle.hpp"
-#include "MTLFunctionLog.hpp"
-#include "MTLFunctionStitching.hpp"
-#include "MTLHeaderBridge.hpp"
-#include "MTLHeap.hpp"
-#include "MTLIndirectCommandBuffer.hpp"
-#include "MTLIndirectCommandEncoder.hpp"
-#include "MTLIntersectionFunctionTable.hpp"
-#include "MTLIOCommandBuffer.hpp"
-#include "MTLIOCommandQueue.hpp"
-#include "MTLIOCompressor.hpp"
-#include "MTLLibrary.hpp"
-#include "MTLLinkedFunctions.hpp"
-#include "MTLLogState.hpp"
-#include "MTLParallelRenderCommandEncoder.hpp"
-#include "MTLPipeline.hpp"
-#include "MTLPixelFormat.hpp"
-#include "MTLPrivate.hpp"
-#include "MTLRasterizationRate.hpp"
-#include "MTLRenderCommandEncoder.hpp"
-#include "MTLRenderPass.hpp"
-#include "MTLRenderPipeline.hpp"
-#include "MTLResidencySet.hpp"
-#include "MTLResource.hpp"
-#include "MTLResourceStateCommandEncoder.hpp"
-#include "MTLResourceStatePass.hpp"
-#include "MTLSampler.hpp"
-#include "MTLStageInputOutputDescriptor.hpp"
-#include "MTLTexture.hpp"
-#include "MTLTypes.hpp"
-#include "MTLVertexDescriptor.hpp"
-#include "MTLVisibleFunctionTable.hpp"
-#include "MTLVersion.hpp"
-#include "MTLTensor.hpp"
-#include "MTLResourceViewPool.hpp"
-#include "MTLTextureViewPool.hpp"
-#include "MTLDataType.hpp"
-#include "MTL4ArgumentTable.hpp"
-#include "MTL4BinaryFunction.hpp"
-#include "MTL4CommandAllocator.hpp"
-#include "MTL4CommandBuffer.hpp"
-#include "MTL4CommandEncoder.hpp"
-#include "MTL4CommandQueue.hpp"
-#include "MTL4Counters.hpp"
-#include "MTL4RenderPass.hpp"
-#include "MTL4RenderCommandEncoder.hpp"
-#include "MTL4ComputeCommandEncoder.hpp"
-#include "MTL4MachineLearningCommandEncoder.hpp"
-#include "MTL4Compiler.hpp"
-#include "MTL4CompilerTask.hpp"
-#include "MTL4LibraryDescriptor.hpp"
-#include "MTL4FunctionDescriptor.hpp"
-#include "MTL4LibraryFunctionDescriptor.hpp"
-#include "MTL4SpecializedFunctionDescriptor.hpp"
-#include "MTL4StitchedFunctionDescriptor.hpp"
-#include "MTL4PipelineState.hpp"
-#include "MTL4ComputePipeline.hpp"
-#include "MTL4RenderPipeline.hpp"
-#include "MTL4MachineLearningPipeline.hpp"
-#include "MTL4TileRenderPipeline.hpp"
-#include "MTL4MeshRenderPipeline.hpp"
-#include "MTL4PipelineDataSetSerializer.hpp"
-#include "MTL4Archive.hpp"
-#include "MTL4CommitFeedback.hpp"
-#include "MTL4BinaryFunctionDescriptor.hpp"
-#include "MTL4LinkingDescriptor.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXFrameInterpolator.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTL4FXFrameInterpolator.hpp
deleted file mode 100644
index 1c50ec9e..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXFrameInterpolator.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTL4FXFrameInterpolator.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "MTLFXFrameInterpolator.hpp"
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class FrameInterpolator : public NS::Referencing<FrameInterpolator, MTLFX::FrameInterpolatorBase>
-    {
-    public:
-        void encodeToCommandBuffer(MTL4::CommandBuffer* commandBuffer);
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTL4FX::FrameInterpolator::encodeToCommandBuffer(MTL4::CommandBuffer* commandBuffer)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), commandBuffer );
-}
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXSpatialScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTL4FXSpatialScaler.hpp
deleted file mode 100644
index 8ea8dfdd..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXSpatialScaler.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTL4FXSpatialScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "MTLFXSpatialScaler.hpp"
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class SpatialScaler : public NS::Referencing< SpatialScaler, MTLFX::SpatialScalerBase >
-    {
-    public:
-        void encodeToCommandBuffer( MTL4::CommandBuffer* pCommandBuffer );
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTL4FX::SpatialScaler::encodeToCommandBuffer( MTL4::CommandBuffer* pCommandBuffer )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), pCommandBuffer );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalDenoisedScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalDenoisedScaler.hpp
deleted file mode 100644
index 73014bbc..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalDenoisedScaler.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXTemporalDenoisedScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "MTLFXTemporalDenoisedScaler.hpp"
-#include "../Metal/Metal.hpp"
-
-#include <simd/simd.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class TemporalDenoisedScaler : public NS::Referencing< TemporalDenoisedScaler, MTLFX::TemporalDenoisedScalerBase >
-    {
-    public:
-        void encodeToCommandBuffer(MTL4::CommandBuffer* commandBuffer);
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTL4FX::TemporalDenoisedScaler::encodeToCommandBuffer( MTL4::CommandBuffer* commandBuffer )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), commandBuffer );
-}
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalScaler.hpp
deleted file mode 100644
index 3bda5dca..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTL4FXTemporalScaler.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTL4FXTemporalScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "MTLFXTemporalScaler.hpp"
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class TemporalScaler : public NS::Referencing< TemporalScaler, MTLFX::TemporalScalerBase >
-    {
-    public:
-        void encodeToCommandBuffer( MTL4::CommandBuffer* pCommandBuffer );
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTL4FX::TemporalScaler::encodeToCommandBuffer( MTL4::CommandBuffer* pCommandBuffer )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), pCommandBuffer );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXDefines.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXDefines.hpp
deleted file mode 100644
index 320e0aa8..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXDefines.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXDefines.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "../Foundation/NSDefines.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _MTLFX_EXPORT                           _NS_EXPORT
-#define _MTLFX_EXTERN                           _NS_EXTERN
-#define _MTLFX_INLINE                           _NS_INLINE
-#define _MTLFX_PACKED                           _NS_PACKED
-
-#define _MTLFX_CONST( type, name )              _NS_CONST( type, name )
-#define _MTLFX_ENUM( type, name )               _NS_ENUM( type, name )
-#define _MTLFX_OPTIONS( type, name )            _NS_OPTIONS( type, name )
-
-#define _MTLFX_VALIDATE_SIZE( mtlfx, name )     _NS_VALIDATE_SIZE( mtlfx, name )
-#define _MTLFX_VALIDATE_ENUM( mtlfx, name )     _NS_VALIDATE_ENUM( mtlfx, name )
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXFrameInterpolator.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXFrameInterpolator.hpp
deleted file mode 100644
index 10ff69cb..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXFrameInterpolator.hpp
+++ /dev/null
@@ -1,719 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXFrameInterpolator.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-#include "MTLFXTemporalScaler.hpp"
-
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class TemporalScaler;
-    class TemporalDenoisedScaler;
-    class FrameInterpolator;
-}
-
-namespace MTLFX
-{
-    class FrameInterpolatorDescriptor : public NS::Copying< FrameInterpolatorDescriptor >
-    {
-    public:
-        static FrameInterpolatorDescriptor* alloc();
-        FrameInterpolatorDescriptor*        init();
-
-        MTL::PixelFormat                    colorTextureFormat() const;
-        void                                setColorTextureFormat(MTL::PixelFormat colorTextureFormat);
-
-        MTL::PixelFormat                    outputTextureFormat() const;
-        void                                setOutputTextureFormat(MTL::PixelFormat outputTextureFormat);
-
-        MTL::PixelFormat                    depthTextureFormat() const;
-        void                                setDepthTextureFormat(MTL::PixelFormat depthTextureFormat);
-
-        MTL::PixelFormat                    motionTextureFormat() const;
-        void                                setMotionTextureFormat(MTL::PixelFormat motionTextureFormat);
-
-        MTL::PixelFormat                    uiTextureFormat() const;
-        void                                setUITextureFormat(MTL::PixelFormat uiTextureFormat);
-
-        MTLFX::FrameInterpolatableScaler*   scaler() const;
-        void                                setScaler(MTLFX::FrameInterpolatableScaler* scaler);
-
-        NS::UInteger                        inputWidth() const;
-        void                                setInputWidth( NS::UInteger inputWidth );
-
-        NS::UInteger                        inputHeight() const;
-        void                                setInputHeight( NS::UInteger inputHeight );
-
-        NS::UInteger                        outputWidth() const;
-        void                                setOutputWidth( NS::UInteger outputWidth );
-
-        NS::UInteger                        outputHeight() const;
-        void                                setOutputHeight( NS::UInteger outputHeight );
-
-        class FrameInterpolator*            newFrameInterpolator( const MTL::Device* pDevice) const;
-        MTL4FX::FrameInterpolator*          newFrameInterpolator( const MTL::Device* pDevice, const MTL4::Compiler* pCompiler) const;
-
-        static bool                         supportsMetal4FX(MTL::Device* device);
-        static bool                         supportsDevice(MTL::Device* device);
-    };
-
-    class FrameInterpolatorBase : public NS::Referencing<FrameInterpolatorBase>
-    {
-    public:
-        MTL::TextureUsage colorTextureUsage() const;
-        MTL::TextureUsage outputTextureUsage() const;
-        MTL::TextureUsage depthTextureUsage() const;
-        MTL::TextureUsage motionTextureUsage() const;
-        MTL::TextureUsage uiTextureUsage() const;
-
-        MTL::PixelFormat  colorTextureFormat() const;
-        MTL::PixelFormat  depthTextureFormat() const;
-        MTL::PixelFormat  motionTextureFormat() const;
-        MTL::PixelFormat  outputTextureFormat() const;
-
-        NS::UInteger      inputWidth() const;
-        NS::UInteger      inputHeight() const;
-        NS::UInteger      outputWidth() const;
-        NS::UInteger      outputHeight() const;
-        MTL::PixelFormat  uiTextureFormat() const;
-
-        MTL::Texture*     colorTexture() const;
-        void              setColorTexture(MTL::Texture* colorTexture);
-
-        MTL::Texture*     prevColorTexture() const;
-        void              setPrevColorTexture(MTL::Texture* prevColorTexture);
-
-        MTL::Texture*     depthTexture() const;
-        void              setDepthTexture(MTL::Texture* depthTexture);
-
-        MTL::Texture*     motionTexture() const;
-        void              setMotionTexture(MTL::Texture* motionTexture);
-
-        float             motionVectorScaleX() const;
-        void              setMotionVectorScaleX(float scaleX);
-
-        float             motionVectorScaleY() const;
-        void              setMotionVectorScaleY(float scaleY);
-
-        float             deltaTime() const;
-        void              setDeltaTime( float deltaTime );
-
-        float             nearPlane() const;
-        void              setNearPlane( float nearPlane );
-
-        float             farPlane() const;
-        void              setFarPlane( float farPlane );
-
-        float             fieldOfView() const;
-        void              setFieldOfView( float fieldOfView );
-
-        float             aspectRatio() const;
-        void              setAspectRatio( float aspectRatio );
-
-        MTL::Texture*     uiTexture() const;
-        void              setUITexture(MTL::Texture* uiTexture);
-
-        float             jitterOffsetX() const;
-        void              setJitterOffsetX( float jitterOffsetX );
-
-        float             jitterOffsetY() const;
-        void              setJitterOffsetY( float jitterOffsetY );
-
-        bool              isUITextureComposited() const;
-        void              setIsUITextureComposited( bool uiTextureComposited );
-
-        bool              shouldResetHistory() const;
-        void              setShouldResetHistory( bool shouldResetHistory );
-
-        MTL::Texture*     outputTexture() const;
-        void              setOutputTexture( MTL::Texture* outputTexture );
-
-        MTL::Fence*       fence() const;
-        void              setFence( MTL::Fence* fence );
-
-        bool              isDepthReversed() const;
-        void              setDepthReversed( bool depthReversed );
-    };
-
-    class FrameInterpolator : public NS::Referencing<FrameInterpolator, FrameInterpolatorBase>
-    {
-    public:
-        void              encodeToCommandBuffer(MTL::CommandBuffer* commandBuffer);
-    };
-
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::FrameInterpolatorDescriptor* MTLFX::FrameInterpolatorDescriptor::alloc()
-{
-    return NS::Object::alloc< FrameInterpolatorDescriptor >( _MTLFX_PRIVATE_CLS( MTLFXFrameInterpolatorDescriptor ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::FrameInterpolatorDescriptor* MTLFX::FrameInterpolatorDescriptor::init()
-{
-    return NS::Object::init< FrameInterpolatorDescriptor >();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorDescriptor::colorTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setColorTextureFormat( MTL::PixelFormat colorTextureFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTextureFormat_ ), colorTextureFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorDescriptor::outputTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setOutputTextureFormat( MTL::PixelFormat outputTextureFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTextureFormat_ ), outputTextureFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorDescriptor::depthTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setDepthTextureFormat( MTL::PixelFormat depthTextureFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTextureFormat_ ), depthTextureFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorDescriptor::motionTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setMotionTextureFormat( MTL::PixelFormat motionTextureFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTextureFormat_ ), motionTextureFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorDescriptor::uiTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( uiTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setUITextureFormat( MTL::PixelFormat uiTextureFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setUITextureFormat_ ), uiTextureFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::FrameInterpolatableScaler* MTLFX::FrameInterpolatorDescriptor::scaler() const
-{
-    return NS::Object::sendMessage< MTLFX::FrameInterpolatableScaler* >( this, _MTLFX_PRIVATE_SEL( scaler ) );
-}
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setScaler(MTLFX::FrameInterpolatableScaler* scaler)
-{
-    NS::Object::sendMessage< void >(this, _MTLFX_PRIVATE_SEL( setScaler_ ), scaler );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorDescriptor::inputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setInputWidth( NS::UInteger inputWidth )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputWidth_ ), inputWidth );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorDescriptor::inputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setInputHeight( NS::UInteger inputHeight )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputHeight_ ), inputHeight );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorDescriptor::outputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setOutputWidth( NS::UInteger outputWidth )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputWidth_ ), outputWidth );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorDescriptor::outputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorDescriptor::setOutputHeight( NS::UInteger outputHeight )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputHeight_ ), outputHeight );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::FrameInterpolator* MTLFX::FrameInterpolatorDescriptor::newFrameInterpolator( const MTL::Device* device ) const
-{
-    return NS::Object::sendMessage< MTLFX::FrameInterpolator* >( this, _MTLFX_PRIVATE_SEL( newFrameInterpolatorWithDevice_ ), device );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL4FX::FrameInterpolator* MTLFX::FrameInterpolatorDescriptor::newFrameInterpolator( const MTL::Device* device, const MTL4::Compiler* compiler ) const
-{
-    return NS::Object::sendMessage< MTL4FX::FrameInterpolator* >( this, _MTLFX_PRIVATE_SEL( newFrameInterpolatorWithDevice_compiler_ ), device, compiler );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::FrameInterpolatorDescriptor::supportsMetal4FX(MTL::Device* device)
-{
-    return NS::Object::sendMessageSafe< bool >( _MTLFX_PRIVATE_CLS(MTLFXFrameInterpolatorDescriptor), _MTLFX_PRIVATE_SEL( supportsMetal4FX_ ), device );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::FrameInterpolatorDescriptor::supportsDevice(MTL::Device* device)
-{
-    return NS::Object::sendMessageSafe< bool >( _MTLFX_PRIVATE_CLS(MTLFXFrameInterpolatorDescriptor), _MTLFX_PRIVATE_SEL( supportsDevice_ ), device );
-}
-
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::FrameInterpolatorBase::colorTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( colorTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::FrameInterpolatorBase::outputTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( outputTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::FrameInterpolatorBase::depthTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( depthTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::FrameInterpolatorBase::motionTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( motionTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::FrameInterpolatorBase::uiTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( uiTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorBase::colorTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorBase::depthTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorBase::motionTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorBase::outputTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorBase::inputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorBase::inputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorBase::outputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::FrameInterpolatorBase::outputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::FrameInterpolatorBase::uiTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( uiTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::colorTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( colorTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setColorTexture(MTL::Texture* colorTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTexture_ ), colorTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::prevColorTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( prevColorTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setPrevColorTexture(MTL::Texture* prevColorTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setPrevColorTexture_ ), prevColorTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::depthTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( depthTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setDepthTexture(MTL::Texture* depthTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTexture_ ), depthTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::motionTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( motionTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setMotionTexture(MTL::Texture* motionTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTexture_ ), motionTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::FrameInterpolatorBase::motionVectorScaleX() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setMotionVectorScaleX(float scaleX)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleX_ ), scaleX );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::FrameInterpolatorBase::motionVectorScaleY() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setMotionVectorScaleY(float scaleY)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleY_ ), scaleY );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float  MTLFX::FrameInterpolatorBase::deltaTime() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( deltaTime ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void   MTLFX::FrameInterpolatorBase::setDeltaTime( float deltaTime )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDeltaTime_ ), deltaTime );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float  MTLFX::FrameInterpolatorBase::nearPlane() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( nearPlane ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void  MTLFX::FrameInterpolatorBase::setNearPlane( float nearPlane )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setNearPlane_ ), nearPlane );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float  MTLFX::FrameInterpolatorBase::farPlane() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( farPlane ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setFarPlane( float farPlane )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFarPlane_ ), farPlane );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float  MTLFX::FrameInterpolatorBase::fieldOfView() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( fieldOfView ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void   MTLFX::FrameInterpolatorBase::setFieldOfView( float fieldOfView )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFieldOfView_ ), fieldOfView );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float  MTLFX::FrameInterpolatorBase::aspectRatio() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( aspectRatio ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void   MTLFX::FrameInterpolatorBase::setAspectRatio( float aspectRatio )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setAspectRatio_ ), aspectRatio );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::uiTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( uiTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setUITexture(MTL::Texture* uiTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setUITexture_ ), uiTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::FrameInterpolatorBase::jitterOffsetX() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setJitterOffsetX( float jitterOffsetX )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetX_ ), jitterOffsetX );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::FrameInterpolatorBase::jitterOffsetY() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setJitterOffsetY( float jitterOffsetY )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetY_ ), jitterOffsetY );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::FrameInterpolatorBase::isUITextureComposited() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isUITextureComposited ) );
-}
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setIsUITextureComposited( bool uiTextureComposited )
-{
-    NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setIsUITextureComposited_ ), uiTextureComposited );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::FrameInterpolatorBase::shouldResetHistory() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( shouldResetHistory ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setShouldResetHistory(bool shouldResetHistory)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setShouldResetHistory_ ), shouldResetHistory );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::FrameInterpolatorBase::outputTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( outputTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setOutputTexture(MTL::Texture* outputTexture)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTexture_ ), outputTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Fence* MTLFX::FrameInterpolatorBase::fence() const
-{
-    return NS::Object::sendMessage< MTL::Fence* >( this, _MTLFX_PRIVATE_SEL( fence ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setFence(MTL::Fence* fence)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFence_ ), fence );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::FrameInterpolatorBase::isDepthReversed() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isDepthReversed ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolatorBase::setDepthReversed(bool depthReversed)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthReversed_ ), depthReversed );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::FrameInterpolator::encodeToCommandBuffer(MTL::CommandBuffer* commandBuffer)
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), commandBuffer );
-}
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXPrivate.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXPrivate.hpp
deleted file mode 100644
index 21fd728e..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXPrivate.hpp
+++ /dev/null
@@ -1,482 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXPrivate.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-
-#include <objc/runtime.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _MTLFX_PRIVATE_CLS( symbol )                    ( MTLFX::Private::Class::s_k##symbol )
-#define _MTLFX_PRIVATE_SEL( accessor )                  ( MTLFX::Private::Selector::s_k##accessor )
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#if defined( MTLFX_PRIVATE_IMPLEMENTATION )
-
-#if defined( METALCPP_SYMBOL_VISIBILITY_HIDDEN )
-#define _MTLFX_PRIVATE_VISIBILITY                       __attribute__( ( visibility("hidden" ) ) )
-#else
-#define _MTLFX_PRIVATE_VISIBILITY                       __attribute__( ( visibility("default" ) ) )
-#endif // METALCPP_SYMBOL_VISIBILITY_HIDDEN
-
-#define _MTLFX_PRIVATE_IMPORT                           __attribute__( ( weak_import ) )
-
-#ifdef __OBJC__
-#define _MTLFX_PRIVATE_OBJC_LOOKUP_CLASS( symbol )      ( ( __bridge void* ) objc_lookUpClass( #symbol ) )
-#define _MTLFX_PRIVATE_OBJC_GET_PROTOCOL( symbol )      ( ( __bridge void* ) objc_getProtocol( #symbol ) )
-#else
-#define _MTLFX_PRIVATE_OBJC_LOOKUP_CLASS( symbol )      objc_lookUpClass(#symbol)
-#define _MTLFX_PRIVATE_OBJC_GET_PROTOCOL( symbol )      objc_getProtocol(#symbol)
-#endif // __OBJC__
-
-#define _MTLFX_PRIVATE_DEF_CLS( symbol )                void* s_k##symbol _MTLFX_PRIVATE_VISIBILITY = _MTLFX_PRIVATE_OBJC_LOOKUP_CLASS( symbol )
-#define _MTLFX_PRIVATE_DEF_PRO( symbol )                void* s_k##symbol _MTLFX_PRIVATE_VISIBILITY = _MTLFX_PRIVATE_OBJC_GET_PROTOCOL( symbol )
-#define _MTLFX_PRIVATE_DEF_SEL( accessor, symbol )       SEL s_k##accessor _MTLFX_PRIVATE_VISIBILITY = sel_registerName( symbol )
-
-#include <dlfcn.h>
-#define MTLFX_DEF_FUNC( name, signature )               using Fn##name = signature; \
-                                                        Fn##name name = reinterpret_cast< Fn##name >( dlsym( RTLD_DEFAULT, #name ) )
-
-namespace MTLFX::Private
-{
-    template <typename _Type>
-
-    inline _Type const LoadSymbol(const char* pSymbol)
-    {
-        const _Type* pAddress = static_cast<_Type*>(dlsym(RTLD_DEFAULT, pSymbol));
-
-        return pAddress ? *pAddress : nullptr;
-    }
-} // MTLFX::Private
-
-#if defined(__MAC_26_0) || defined(__IPHONE_26_0) || defined(__TVOS_26_0)
-
-#define _MTLFX_PRIVATE_DEF_STR( type, symbol )                                                                                  \
-    _MTLFX_EXTERN type const                            MTLFX##symbol _MTLFX_PRIVATE_IMPORT;                                    \
-    type const                                          MTLFX::symbol = ( nullptr != &MTLFX##symbol ) ? MTLFX##ssymbol : nullptr
-
-#define _MTLFX_PRIVATE_DEF_CONST( type, symbol )                                                                                \
-    _MTLFX_EXTERN type const                            MTLFX##ssymbol _MTLFX_PRIVATE_IMPORT;                                   \
-    type const                                          MTLFX::symbol = (nullptr != &MTLFX##ssymbol) ? MTLFX##ssymbol : nullptr
-
-#define _MTLFX_PRIVATE_DEF_WEAK_CONST( type, symbol )                                                                           \
-    _MTLFX_EXTERN type const                            MTLFX##ssymbol;                                                         \
-    type const                                          MTLFX::symbol = Private::LoadSymbol< type >( "MTLFX" #symbol )
-
-#else
-
-#define _MTLFX_PRIVATE_DEF_STR( type, symbol )                                                                                  \
-    _MTLFX_EXTERN type const                            MTLFX##ssymbol;                                                         \
-    type const                                          MTLFX::symbol = Private::LoadSymbol< type >( "MTLFX" #symbol )
-
-#define _MTLFX_PRIVATE_DEF_CONST( type, symbol )                                                                                \
-    _MTLFX_EXTERN type const                            MTLFX##ssymbol;                                                         \
-    type const                                          MTLFX::symbol = Private::LoadSymbol< type >( "MTLFX" #symbol )
-
-#define _MTLFX_PRIVATE_DEF_WEAK_CONST( type, symbol )   _MTLFX_PRIVATE_DEF_CONST( type, symbol )
-
-#endif
-
-#else
-
-#define _MTLFX_PRIVATE_DEF_CLS( symbol )                extern void* s_k##symbol
-#define _MTLFX_PRIVATE_DEF_PRO( symbol )                extern void* s_k##symbol
-#define _MTLFX_PRIVATE_DEF_SEL( accessor, symbol )      extern SEL s_k##accessor
-#define _MTLFX_PRIVATE_DEF_STR( type, symbol )          extern type const MTLFX::symbol
-#define _MTLFX_PRIVATE_DEF_CONST( type, symbol )        extern type const MTLFX::symbol
-#define _MTLFX_PRIVATE_DEF_WEAK_CONST( type, symbol )   extern type const MTLFX::symbol
-
-#endif // MTLFX_PRIVATE_IMPLEMENTATION
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTLFX
-{
-    namespace Private
-    {
-        namespace Class
-        {
-            _MTLFX_PRIVATE_DEF_CLS( MTLFXSpatialScalerDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTLFXTemporalScalerDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTLFXFrameInterpolatorDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTLFXTemporalDenoisedScalerDescriptor );
-
-            _MTLFX_PRIVATE_DEF_CLS( MTL4FXSpatialScalerDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTL4FXTemporalScalerDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTL4FXFrameInterpolatorDescriptor );
-            _MTLFX_PRIVATE_DEF_CLS( MTL4FXTemporalDenoisedScalerDescriptor );
-        } // Class
-    } // Private
-} // MTLFX
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTLFX
-{
-    namespace Private
-    {
-        namespace Protocol
-        {
-            _MTLFX_PRIVATE_DEF_PRO( MTLFXSpatialScaler );
-            _MTLFX_PRIVATE_DEF_PRO( MTLFXTemporalScaler );
-        } // Protocol
-    } // Private
-} // MTLFX
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTLFX
-{
-    namespace Private
-    {
-        namespace Selector
-        {
-            _MTLFX_PRIVATE_DEF_SEL( aspectRatio,
-                                    "aspectRatio" );
-            _MTLFX_PRIVATE_DEF_SEL( colorProcessingMode,
-                                    "colorProcessingMode" );
-            _MTLFX_PRIVATE_DEF_SEL( colorTexture,
-                                    "colorTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( colorTextureFormat,
-                                    "colorTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( colorTextureUsage,
-                                    "colorTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( deltaTime,
-                                    "deltaTime" );
-            _MTLFX_PRIVATE_DEF_SEL( denoiseStrengthMaskTexture,
-                                    "denoiseStrengthMaskTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( denoiseStrengthMaskTextureFormat,
-                                    "denoiseStrengthMaskTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( denoiseStrengthMaskTextureUsage,
-                                    "denoiseStrengthMaskTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( depthTexture,
-                                    "depthTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( depthTextureFormat,
-                                    "depthTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( depthTextureUsage,
-                                    "depthTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( diffuseAlbedoTexture,
-                                    "diffuseAlbedoTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( diffuseAlbedoTextureFormat,
-                                    "diffuseAlbedoTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( diffuseAlbedoTextureUsage,
-                                    "diffuseAlbedoTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( encodeToCommandBuffer_,
-                                    "encodeToCommandBuffer:" );
-            _MTLFX_PRIVATE_DEF_SEL( exposureTexture,
-                                    "exposureTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( farPlane,
-                                    "farPlane" );
-            _MTLFX_PRIVATE_DEF_SEL( fence,
-                                    "fence" );
-            _MTLFX_PRIVATE_DEF_SEL( fieldOfView,
-                                    "fieldOfView" );
-            _MTLFX_PRIVATE_DEF_SEL( height,
-                                    "height" );
-            _MTLFX_PRIVATE_DEF_SEL( inputContentHeight,
-                                    "inputContentHeight" );
-            _MTLFX_PRIVATE_DEF_SEL( inputContentMaxScale,
-                                    "inputContentMaxScale" );
-            _MTLFX_PRIVATE_DEF_SEL( inputContentMinScale,
-                                    "inputContentMinScale" );
-            _MTLFX_PRIVATE_DEF_SEL( inputContentWidth,
-                                    "inputContentWidth" );
-            _MTLFX_PRIVATE_DEF_SEL( inputHeight,
-                                    "inputHeight" );
-            _MTLFX_PRIVATE_DEF_SEL( inputWidth,
-                                    "inputWidth" );
-            _MTLFX_PRIVATE_DEF_SEL( isAutoExposureEnabled,
-                                    "isAutoExposureEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isDenoiseStrengthMaskTextureEnabled,
-                                    "isDenoiseStrengthMaskTextureEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isDepthReversed,
-                                    "isDepthReversed" );
-            _MTLFX_PRIVATE_DEF_SEL( isInputContentPropertiesEnabled,
-                                    "isInputContentPropertiesEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isTransparencyOverlayTextureEnabled,
-                                    "isTransparencyOverlayTextureEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isReactiveMaskTextureEnabled,
-                                    "isReactiveMaskTextureEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isSpecularHitDistanceTextureEnabled,
-                                    "isSpecularHitDistanceTextureEnabled" );
-            _MTLFX_PRIVATE_DEF_SEL( isUITextureComposited,
-                                    "isUITextureComposited" );
-            _MTLFX_PRIVATE_DEF_SEL( jitterOffsetX,
-                                    "jitterOffsetX" );
-            _MTLFX_PRIVATE_DEF_SEL( jitterOffsetY,
-                                    "jitterOffsetY" );
-            _MTLFX_PRIVATE_DEF_SEL( maskTexture,
-                                    "maskTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( maskTextureFormat,
-                                    "maskTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( maskTextureUsage,
-                                    "maskTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( motionTexture,
-                                    "motionTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( motionTextureFormat,
-                                    "motionTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( motionTextureUsage,
-                                    "motionTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( motionVectorScaleX,
-                                    "motionVectorScaleX" );
-            _MTLFX_PRIVATE_DEF_SEL( motionVectorScaleY,
-                                    "motionVectorScaleY" );
-            _MTLFX_PRIVATE_DEF_SEL( nearPlane,
-                                    "nearPlane" );
-            _MTLFX_PRIVATE_DEF_SEL( newFrameInterpolatorWithDevice_,
-                                    "newFrameInterpolatorWithDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( newFrameInterpolatorWithDevice_compiler_,
-                                    "newFrameInterpolatorWithDevice:compiler:" );
-            _MTLFX_PRIVATE_DEF_SEL( newTemporalDenoisedScalerWithDevice_,
-                                    "newTemporalDenoisedScalerWithDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( newTemporalDenoisedScalerWithDevice_compiler_,
-                                    "newTemporalDenoisedScalerWithDevice:compiler:" );
-            _MTLFX_PRIVATE_DEF_SEL( newSpatialScalerWithDevice_,
-                                    "newSpatialScalerWithDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( newSpatialScalerWithDevice_compiler_,
-                                    "newSpatialScalerWithDevice:compiler:" );
-            _MTLFX_PRIVATE_DEF_SEL( newTemporalScalerWithDevice_,
-                                    "newTemporalScalerWithDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( newTemporalScalerWithDevice_compiler_,
-                                    "newTemporalScalerWithDevice:compiler:" );
-            _MTLFX_PRIVATE_DEF_SEL( normalTexture,
-                                    "normalTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( normalTextureFormat,
-                                    "normalTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( normalTextureUsage,
-                                    "normalTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( outputHeight,
-                                    "outputHeight" );
-            _MTLFX_PRIVATE_DEF_SEL( outputTexture,
-                                    "outputTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( outputTextureFormat,
-                                    "outputTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( outputTextureUsage,
-                                    "outputTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( outputWidth,
-                                    "outputWidth" );
-            _MTLFX_PRIVATE_DEF_SEL( preExposure,
-                                    "preExposure" );
-            _MTLFX_PRIVATE_DEF_SEL( transparencyOverlayTextureFormat,
-                                    "transparencyOverlayTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( transparencyOverlayTextureUsage,
-                                    "transparencyOverlayTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( prevColorTexture,
-                                    "prevColorTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( reactiveMaskTextureFormat,
-                                    "reactiveMaskTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( reactiveTextureUsage,
-                                    "reactiveTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( reactiveMaskTexture,
-                                    "reactiveMaskTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( reset,
-                                    "reset" );
-            _MTLFX_PRIVATE_DEF_SEL( requiresSynchronousInitialization,
-                                    "requiresSynchronousInitialization" );
-            _MTLFX_PRIVATE_DEF_SEL( roughnessTextureFormat,
-                                    "roughnessTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( roughnessTextureUsage,
-                                    "roughnessTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( scaler,
-                                    "scaler" );
-            _MTLFX_PRIVATE_DEF_SEL( scaler4,
-                                    "scaler4" );
-            _MTLFX_PRIVATE_DEF_SEL( setAspectRatio_,
-                                    "setAspectRatio:" );
-            _MTLFX_PRIVATE_DEF_SEL( setAutoExposureEnabled_,
-                                    "setAutoExposureEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setColorProcessingMode_,
-                                    "setColorProcessingMode:" );
-            _MTLFX_PRIVATE_DEF_SEL( setColorTexture_,
-                                    "setColorTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setColorTextureFormat_,
-                                    "setColorTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDeltaTime_,
-                                    "setDeltaTime:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDenoiseStrengthMaskTexture_,
-                                    "setDenoiseStrengthMaskTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDenoiseStrengthMaskTextureEnabled_,
-                                    "setDenoiseStrengthMaskTextureEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDenoiseStrengthMaskTextureFormat_,
-                                    "setDenoiseStrengthMaskTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDepthInverted_,
-                                    "setDepthInverted:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDepthReversed_,
-                                    "setDepthReversed:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDepthTexture_,
-                                    "setDepthTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDepthTextureFormat_,
-                                    "setDepthTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDiffuseAlbedoTexture_,
-                                    "setDiffuseAlbedoTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setDiffuseAlbedoTextureFormat_,
-                                    "setDiffuseAlbedoTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setExposureTexture_,
-                                    "setExposureTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setFarPlane_,
-                                    "setFarPlane:" );
-            _MTLFX_PRIVATE_DEF_SEL( setFence_,
-                                    "setFence:" );
-            _MTLFX_PRIVATE_DEF_SEL( setFieldOfView_,
-                                    "setFieldOfView:" );
-            _MTLFX_PRIVATE_DEF_SEL( setHeight_,
-                                    "setHeight:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputContentHeight_,
-                                    "setInputContentHeight:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputContentMaxScale_,
-                                    "setInputContentMaxScale:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputContentMinScale_,
-                                    "setInputContentMinScale:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputContentPropertiesEnabled_,
-                                    "setInputContentPropertiesEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputContentWidth_,
-                                    "setInputContentWidth:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputHeight_,
-                                    "setInputHeight:" );
-            _MTLFX_PRIVATE_DEF_SEL( setInputWidth_,
-                                    "setInputWidth:" );
-            _MTLFX_PRIVATE_DEF_SEL( setIsUITextureComposited_,
-                                    "setIsUITextureComposited:" );
-            _MTLFX_PRIVATE_DEF_SEL( setJitterOffsetX_,
-                                    "setJitterOffsetX:" );
-            _MTLFX_PRIVATE_DEF_SEL( setJitterOffsetY_,
-                                    "setJitterOffsetY:" );
-            _MTLFX_PRIVATE_DEF_SEL( setNearPlane_,
-                                    "setNearPlane:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMaskTexture_,
-                                    "setMaskTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMaskTextureFormat_,
-                                    "setMaskTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMotionTexture_,
-                                    "setMotionTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMotionTextureFormat_,
-                                    "setMotionTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMotionVectorScaleX_,
-                                    "setMotionVectorScaleX:" );
-            _MTLFX_PRIVATE_DEF_SEL( setMotionVectorScaleY_,
-                                    "setMotionVectorScaleY:" );
-            _MTLFX_PRIVATE_DEF_SEL( setNormalTexture_,
-                                    "setNormalTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setNormalTextureFormat_,
-                                    "setNormalTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setOutputHeight_,
-                                    "setOutputHeight:" );
-            _MTLFX_PRIVATE_DEF_SEL( setOutputTexture_,
-                                    "setOutputTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setOutputTextureFormat_,
-                                    "setOutputTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setOutputWidth_,
-                                    "setOutputWidth:" );
-            _MTLFX_PRIVATE_DEF_SEL( transparencyOverlayTexture,
-                                    "transparencyOverlayTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( setTransparencyOverlayTexture_,
-                                    "setTransparencyOverlayTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setTransparencyOverlayTextureEnabled_,
-                                    "setTransparencyOverlayTextureEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setPreExposure_,
-                                    "setPreExposure:" );
-            _MTLFX_PRIVATE_DEF_SEL( setTransparencyOverlayTextureFormat_,
-                                    "setTransparencyOverlayTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setPrevColorTexture_,
-                                    "setPrevColorTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setReactiveMaskTexture_,
-                                    "setReactiveMaskTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setReactiveMaskTextureEnabled_,
-                                    "setReactiveMaskTextureEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setReactiveMaskTextureFormat_,
-                                    "setReactiveMaskTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setRequiresSynchronousInitialization_,
-                                    "setRequiresSynchronousInitialization:" );
-            _MTLFX_PRIVATE_DEF_SEL( setReset_,
-                                    "setReset:" );
-            _MTLFX_PRIVATE_DEF_SEL( roughnessTexture,
-                                    "roughnessTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( setRoughnessTexture_,
-                                    "setRoughnessTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setRoughnessTextureFormat_,
-                                    "setRoughnessTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setScaler_,
-                                    "setScaler:" );
-            _MTLFX_PRIVATE_DEF_SEL( setShouldResetHistory_,
-                                    "setShouldResetHistory:" );
-            _MTLFX_PRIVATE_DEF_SEL( specularHitDistanceTexture,
-                                    "specularHitDistanceTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( setSpecularHitDistanceTexture_,
-                                    "setSpecularHitDistanceTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setSpecularHitDistanceTextureEnabled_,
-                                    "setSpecularHitDistanceTextureEnabled:" );
-            _MTLFX_PRIVATE_DEF_SEL( setSpecularAlbedoTexture_,
-                                    "setSpecularAlbedoTexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setSpecularAlbedoTextureFormat_,
-                                    "setSpecularAlbedoTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setSpecularHitDistanceTextureFormat_,
-                                    "setSpecularHitDistanceTextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setUITexture_,
-                                    "setUITexture:" );
-            _MTLFX_PRIVATE_DEF_SEL( setUITextureFormat_,
-                                    "setUITextureFormat:" );
-            _MTLFX_PRIVATE_DEF_SEL( setViewToClipMatrix_,
-                                    "setViewToClipMatrix:" );
-            _MTLFX_PRIVATE_DEF_SEL( setWidth_,
-                                    "setWidth:" );
-            _MTLFX_PRIVATE_DEF_SEL( setWorldToViewMatrix_,
-                                    "setWorldToViewMatrix:" );
-            _MTLFX_PRIVATE_DEF_SEL( shouldResetHistory,
-                                    "shouldResetHistory" );
-            _MTLFX_PRIVATE_DEF_SEL( specularAlbedoTexture,
-                                    "specularAlbedoTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( specularAlbedoTextureFormat,
-                                    "specularAlbedoTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( specularAlbedoTextureUsage,
-                                    "specularAlbedoTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( specularHitDistanceTextureFormat,
-                                    "specularHitDistanceTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( specularHitDistanceTextureUsage,
-                                    "specularHitDistanceTextureUsage" );
-            _MTLFX_PRIVATE_DEF_SEL( supportedInputContentMaxScaleForDevice_,
-                                    "supportedInputContentMaxScaleForDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( supportedInputContentMinScaleForDevice_,
-                                    "supportedInputContentMinScaleForDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( supportsDevice_,
-                                    "supportsDevice:" );
-            _MTLFX_PRIVATE_DEF_SEL( supportsMetal4FX_,
-                                    "supportsMetal4FX:" );
-            _MTLFX_PRIVATE_DEF_SEL( uiTexture,
-                                    "uiTexture" );
-            _MTLFX_PRIVATE_DEF_SEL( uiTextureFormat,
-                                    "uiTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( uiTextureUsage,
-                                    "uiTextureFormat" );
-            _MTLFX_PRIVATE_DEF_SEL( viewToClipMatrix,
-                                    "viewToClipMatrix" );
-            _MTLFX_PRIVATE_DEF_SEL( width,
-                                    "width" );
-            _MTLFX_PRIVATE_DEF_SEL( worldToViewMatrix,
-                                    "worldToViewMatrix" );
-        } // Selector
-    } // Private
-} // MTLFX
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXSpatialScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXSpatialScaler.hpp
deleted file mode 100644
index cb1186ed..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXSpatialScaler.hpp
+++ /dev/null
@@ -1,397 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXSpatialScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class SpatialScaler;
-}
-
-namespace MTLFX
-{
-    _MTLFX_ENUM( NS::Integer, SpatialScalerColorProcessingMode )
-    {
-        SpatialScalerColorProcessingModePerceptual  = 0,
-        SpatialScalerColorProcessingModeLinear      = 1,
-        SpatialScalerColorProcessingModeHDR         = 2
-    };
-
-    class SpatialScalerDescriptor : public NS::Copying< SpatialScalerDescriptor >
-    {
-    public:
-        static class SpatialScalerDescriptor*       alloc();
-        class SpatialScalerDescriptor*              init();
-
-        MTL::PixelFormat                            colorTextureFormat() const;
-        void                                        setColorTextureFormat( MTL::PixelFormat format );
-
-        MTL::PixelFormat                            outputTextureFormat() const;
-        void                                        setOutputTextureFormat( MTL::PixelFormat format );
-
-        NS::UInteger                                inputWidth() const;
-        void                                        setInputWidth( NS::UInteger width );
-
-        NS::UInteger                                inputHeight() const;
-        void                                        setInputHeight( NS::UInteger height );
-
-        NS::UInteger                                outputWidth() const;
-        void                                        setOutputWidth( NS::UInteger width );
-
-        NS::UInteger                                outputHeight() const;
-        void                                        setOutputHeight( NS::UInteger height );
-
-        SpatialScalerColorProcessingMode            colorProcessingMode() const;
-        void                                        setColorProcessingMode( SpatialScalerColorProcessingMode mode );
-
-        class SpatialScaler*                        newSpatialScaler( const MTL::Device* pDevice ) const;
-        MTL4FX::SpatialScaler*                      newSpatialScaler( const MTL::Device* pDevice, const MTL4::Compiler* pCompiler ) const;
-
-        static bool                                 supportsDevice( const MTL::Device* pDevice);
-        static bool                                 supportsMetal4FX( const MTL::Device* pDevice );
-    };
-
-    class SpatialScalerBase : public NS::Referencing< SpatialScaler >
-    {
-    public:
-        MTL::TextureUsage                           colorTextureUsage() const;
-        MTL::TextureUsage                           outputTextureUsage() const;
-
-        NS::UInteger                                inputContentWidth() const;
-        void                                        setInputContentWidth( NS::UInteger width );
-
-        NS::UInteger                                inputContentHeight() const;
-        void                                        setInputContentHeight( NS::UInteger height );
-
-        MTL::Texture*                               colorTexture() const;
-        void                                        setColorTexture( MTL::Texture* pTexture );
-
-        MTL::Texture*                               outputTexture() const;
-        void                                        setOutputTexture( MTL::Texture* pTexture );
-
-        MTL::PixelFormat                            colorTextureFormat() const;
-        MTL::PixelFormat                            outputTextureFormat() const;
-        NS::UInteger                                inputWidth() const;
-        NS::UInteger                                inputHeight() const;
-        NS::UInteger                                outputWidth() const;
-        NS::UInteger                                outputHeight() const;
-        SpatialScalerColorProcessingMode            colorProcessingMode() const;
-
-        MTL::Fence*                                 fence() const;
-        void                                        setFence( MTL::Fence* pFence );
-    };
-
-    class SpatialScaler : public NS::Referencing< SpatialScaler, SpatialScalerBase >
-    {
-    public:
-        void                                        encodeToCommandBuffer( MTL::CommandBuffer* pCommandBuffer );
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::SpatialScalerDescriptor* MTLFX::SpatialScalerDescriptor::alloc()
-{
-    return NS::Object::alloc< SpatialScalerDescriptor >( _MTLFX_PRIVATE_CLS( MTLFXSpatialScalerDescriptor ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::SpatialScalerDescriptor* MTLFX::SpatialScalerDescriptor::init()
-{
-    return NS::Object::init< SpatialScalerDescriptor >();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::SpatialScalerDescriptor::colorTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setColorTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::SpatialScalerDescriptor::outputTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setOutputTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerDescriptor::inputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setInputWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerDescriptor::inputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setInputHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerDescriptor::outputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setOutputWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerDescriptor::outputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setOutputHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::SpatialScalerColorProcessingMode MTLFX::SpatialScalerDescriptor::colorProcessingMode() const
-{
-    return Object::sendMessage< SpatialScalerColorProcessingMode >( this, _MTLFX_PRIVATE_SEL( colorProcessingMode ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerDescriptor::setColorProcessingMode( SpatialScalerColorProcessingMode mode )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorProcessingMode_ ), mode );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::SpatialScaler* MTLFX::SpatialScalerDescriptor::newSpatialScaler( const MTL::Device* pDevice ) const
-{
-    return Object::sendMessage< SpatialScaler* >( this, _MTLFX_PRIVATE_SEL( newSpatialScalerWithDevice_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL4FX::SpatialScaler* MTLFX::SpatialScalerDescriptor::newSpatialScaler( const MTL::Device* pDevice, const MTL4::Compiler* pCompiler ) const
-{
-    return Object::sendMessage< MTL4FX::SpatialScaler* >( this, _MTLFX_PRIVATE_SEL( newSpatialScalerWithDevice_compiler_ ), pDevice, pCompiler );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::SpatialScalerDescriptor::supportsDevice( const MTL::Device* pDevice )
-{
-    return Object::sendMessageSafe< bool >( _NS_PRIVATE_CLS( MTLFXSpatialScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportsDevice_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::SpatialScalerDescriptor::supportsMetal4FX( const MTL::Device* pDevice )
-{
-    return Object::sendMessageSafe< bool >( _NS_PRIVATE_CLS( MTLFXSpatialScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportsMetal4FX_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::SpatialScalerBase::colorTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( colorTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::SpatialScalerBase::outputTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( outputTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::inputContentWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputContentWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerBase::setInputContentWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::inputContentHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputContentHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerBase::setInputContentHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::SpatialScalerBase::colorTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( colorTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerBase::setColorTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::SpatialScalerBase::outputTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( outputTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerBase::setOutputTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::SpatialScalerBase::colorTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::SpatialScalerBase::outputTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::inputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::inputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::outputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::SpatialScalerBase::outputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::SpatialScalerColorProcessingMode MTLFX::SpatialScalerBase::colorProcessingMode() const
-{
-    return Object::sendMessage< SpatialScalerColorProcessingMode >( this, _MTLFX_PRIVATE_SEL( colorProcessingMode ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Fence* MTLFX::SpatialScalerBase::fence() const
-{
-    return Object::sendMessage< MTL::Fence* >( this, _MTLFX_PRIVATE_SEL( fence ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScalerBase::setFence( MTL::Fence* pFence )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFence_ ), pFence );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::SpatialScaler::encodeToCommandBuffer( MTL::CommandBuffer* pCommandBuffer )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), pCommandBuffer );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalDenoisedScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalDenoisedScaler.hpp
deleted file mode 100644
index 5863e078..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalDenoisedScaler.hpp
+++ /dev/null
@@ -1,1208 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXTemporalDenoisedScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-#include "MTLFXTemporalScaler.hpp"
-
-#include "../Metal/Metal.hpp"
-
-#include <simd/simd.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class TemporalDenoisedScaler;
-}
-
-namespace MTLFX
-{
-    class TemporalDenoisedScalerDescriptor : public NS::Copying< TemporalDenoisedScalerDescriptor >
-    {
-        public:
-            static class TemporalDenoisedScalerDescriptor*       alloc();
-            class TemporalDenoisedScalerDescriptor*              init();
-
-            MTL::PixelFormat                                     colorTextureFormat() const;
-            void                                                 setColorTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     depthTextureFormat() const;
-            void                                                 setDepthTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     motionTextureFormat() const;
-            void                                                 setMotionTextureFormat( MTL::PixelFormat pixelFormal );
-
-            MTL::PixelFormat                                     diffuseAlbedoTextureFormat() const;
-            void                                                 setDiffuseAlbedoTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     specularAlbedoTextureFormat() const;
-            void                                                 setSpecularAlbedoTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     normalTextureFormat() const;
-            void                                                 setNormalTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     roughnessTextureFormat() const;
-            void                                                 setRoughnessTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     specularHitDistanceTextureFormat() const;
-            void                                                 setSpecularHitDistanceTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     denoiseStrengthMaskTextureFormat() const;
-            void                                                 setDenoiseStrengthMaskTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     transparencyOverlayTextureFormat() const;
-            void                                                 setTransparencyOverlayTextureFormat( MTL::PixelFormat pixelFormat );
-
-            MTL::PixelFormat                                     outputTextureFormat() const;
-            void                                                 setOutputTextureFormat( MTL::PixelFormat pixelFormat );
-
-            NS::UInteger                                         inputWidth() const;
-            void                                                 setInputWidth( NS::UInteger inputWidth );
-
-            NS::UInteger                                         inputHeight() const;
-            void                                                 setInputHeight( NS::UInteger inputHeight );
-
-            NS::UInteger                                         outputWidth() const;
-            void                                                 setOutputWidth( NS::UInteger outputWidth );
-
-            NS::UInteger                                         outputHeight() const;
-            void                                                 setOutputHeight( NS::UInteger outputHeight );
-
-            bool                                                 requiresSynchronousInitialization() const;
-            void                                                 setRequiresSynchronousInitialization( bool requiresSynchronousInitialization );
-
-            bool                                                 isAutoExposureEnabled() const;
-            void                                                 setAutoExposureEnabled( bool enabled );
-
-            bool                                                 isInputContentPropertiesEnabled() const;
-            void                                                 setInputContentPropertiesEnabled( bool enabled );
-
-            float                                                inputContentMinScale() const;
-            void                                                 setInputContentMinScale( float inputContentMinScale );
-
-            float                                                inputContentMaxScale() const;
-            void                                                 setInputContentMaxScale( float inputContentMaxScale );
-
-            bool                                                 isReactiveMaskTextureEnabled() const;
-            void                                                 setReactiveMaskTextureEnabled( bool enabled );
-
-            MTL::PixelFormat                                     reactiveMaskTextureFormat() const;
-            void                                                 setReactiveMaskTextureFormat( MTL::PixelFormat pixelFormat );
-
-            bool                                                 isSpecularHitDistanceTextureEnabled() const;
-            void                                                 setSpecularHitDistanceTextureEnabled( bool enabled );
-
-            bool                                                 isDenoiseStrengthMaskTextureEnabled() const;
-            void                                                 setDenoiseStrengthMaskTextureEnabled( bool enabled );
-
-            bool                                                 isTransparencyOverlayTextureEnabled() const;
-            void                                                 setTransparencyOverlayTextureEnabled( bool enabled );
-
-            class TemporalDenoisedScaler*                        newTemporalDenoisedScaler( const MTL::Device* device ) const;
-            MTL4FX::TemporalDenoisedScaler*                      newTemporalDenoisedScaler( const MTL::Device* device, const MTL4::Compiler* compiler) const;
-
-            static float                                         supportedInputContentMinScale(MTL::Device* device);
-            static float                                         supportedInputContentMaxScale(MTL::Device* device);
-
-            static bool                                          supportsMetal4FX( MTL::Device* device);
-            static bool                                          supportsDevice( MTL::Device* device);
-    };
-
-    class TemporalDenoisedScalerBase : public NS::Referencing< TemporalDenoisedScalerBase, FrameInterpolatableScaler >
-    {
-    public:
-        MTL::TextureUsage                                       colorTextureUsage() const;
-        MTL::TextureUsage                                       depthTextureUsage() const;
-        MTL::TextureUsage                                       motionTextureUsage() const;
-        MTL::TextureUsage                                       reactiveTextureUsage() const;
-        MTL::TextureUsage                                       diffuseAlbedoTextureUsage() const;
-        MTL::TextureUsage                                       specularAlbedoTextureUsage() const;
-        MTL::TextureUsage                                       normalTextureUsage() const;
-        MTL::TextureUsage                                       roughnessTextureUsage() const;
-        MTL::TextureUsage                                       specularHitDistanceTextureUsage() const;
-        MTL::TextureUsage                                       denoiseStrengthMaskTextureUsage() const;
-        MTL::TextureUsage                                       transparencyOverlayTextureUsage() const;
-        MTL::TextureUsage                                       outputTextureUsage() const;
-
-        MTL::Texture*                                           colorTexture() const;
-        void                                                    setColorTexture( MTL::Texture* colorTexture );
-
-        MTL::Texture*                                           depthTexture() const;
-        void                                                    setDepthTexture( MTL::Texture* depthTexture );
-
-        MTL::Texture*                                           motionTexture() const;
-        void                                                    setMotionTexture( MTL::Texture* motionTexture );
-
-        MTL::Texture*                                           diffuseAlbedoTexture() const;
-        void                                                    setDiffuseAlbedoTexture( MTL::Texture* diffuseAlbedoTexture );
-
-        MTL::Texture*                                           specularAlbedoTexture() const;
-        void                                                    setSpecularAlbedoTexture( MTL::Texture* specularAlbedoTexture );
-
-        MTL::Texture*                                           normalTexture() const;
-        void                                                    setNormalTexture( MTL::Texture* normalTexture );
-
-        MTL::Texture*                                           roughnessTexture() const;
-        void                                                    setRoughnessTexture( MTL::Texture* roughnessTexture );
-
-        MTL::Texture*                                           specularHitDistanceTexture() const;
-        void                                                    setSpecularHitDistanceTexture( MTL::Texture* specularHitDistanceTexture );
-
-        MTL::Texture*                                           denoiseStrengthMaskTexture() const;
-        void                                                    setDenoiseStrengthMaskTexture( MTL::Texture* denoiseStrengthMaskTexture );
-
-        MTL::Texture*                                           transparencyOverlayTexture() const;
-        void                                                    setTransparencyOverlayTexture( MTL::Texture* transparencyOverlayTexture );
-
-        MTL::Texture*                                           outputTexture() const;
-        void                                                    setOutputTexture( MTL::Texture* outputTexture );
-
-        MTL::Texture*                                           exposureTexture() const;
-        void                                                    setExposureTexture( MTL::Texture* exposureTexture );
-
-        float                                                   preExposure() const;
-        void                                                    setPreExposure( float preExposure );
-
-        MTL::Texture*                                           reactiveMaskTexture() const;
-        void                                                    setReactiveMaskTexture( MTL::Texture* reactiveMaskTexture );
-
-        float                                                   jitterOffsetX() const;
-        void                                                    setJitterOffsetX( float jitterOffsetX );
-
-        float                                                   jitterOffsetY() const;
-        void                                                    setJitterOffsetY( float jitterOffsetY );
-
-        float                                                   motionVectorScaleX() const;
-        void                                                    setMotionVectorScaleX( float motionVectorScaleX );
-
-        float                                                   motionVectorScaleY() const;
-        void                                                    setMotionVectorScaleY( float motionVectorScaleY );
-
-        bool                                                    shouldResetHistory() const;
-        void                                                    setShouldResetHistory( bool shouldResetHistory );
-
-        bool                                                    isDepthReversed() const;
-        void                                                    setDepthReversed( bool depthReversed );
-
-        MTL::PixelFormat                                        colorTextureFormat() const;
-        MTL::PixelFormat                                        depthTextureFormat() const;
-        MTL::PixelFormat                                        motionTextureFormat() const;
-        MTL::PixelFormat                                        diffuseAlbedoTextureFormat() const;
-        MTL::PixelFormat                                        specularAlbedoTextureFormat() const;
-        MTL::PixelFormat                                        normalTextureFormat() const;
-        MTL::PixelFormat                                        roughnessTextureFormat() const;
-        MTL::PixelFormat                                        specularHitDistanceTextureFormat() const;
-        MTL::PixelFormat                                        denoiseStrengthMaskTextureFormat() const;
-        MTL::PixelFormat                                        transparencyOverlayTextureFormat() const;
-        MTL::PixelFormat                                        reactiveMaskTextureFormat() const;
-        MTL::PixelFormat                                        outputTextureFormat() const;
-
-        NS::UInteger                                            inputWidth() const;
-        NS::UInteger                                            inputHeight() const;
-        NS::UInteger                                            outputWidth() const;
-        NS::UInteger                                            outputHeight() const;
-        float                                                   inputContentMinScale() const;
-        float                                                   inputContentMaxScale() const;
-
-        simd::float4x4                                          worldToViewMatrix() const;
-        void                                                    setWorldToViewMatrix( simd::float4x4 worldToViewMatrix );
-
-        simd::float4x4                                          viewToClipMatrix() const;
-        void                                                    setViewToClipMatrix( simd::float4x4 viewToClipMatrix );
-
-        MTL::Fence*                                             fence() const;
-        void                                                    setFence( MTL::Fence* fence );
-    };
-
-    class TemporalDenoisedScaler : public NS::Referencing< TemporalDenoisedScaler, TemporalDenoisedScalerBase >
-    {
-    public:
-
-        void                                                    encodeToCommandBuffer(MTL::CommandBuffer* commandBuffer);
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalDenoisedScalerDescriptor* MTLFX::TemporalDenoisedScalerDescriptor::alloc()
-{
-    return NS::Object::alloc< TemporalDenoisedScalerDescriptor >( _MTLFX_PRIVATE_CLS( MTLFXTemporalDenoisedScalerDescriptor ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalDenoisedScalerDescriptor* MTLFX::TemporalDenoisedScalerDescriptor::init()
-{
-    return NS::Object::init< TemporalDenoisedScalerDescriptor >();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::colorTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setColorTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::depthTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setDepthTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::motionTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setMotionTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::diffuseAlbedoTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( diffuseAlbedoTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setDiffuseAlbedoTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDiffuseAlbedoTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::specularAlbedoTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( specularAlbedoTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setSpecularAlbedoTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setSpecularAlbedoTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::normalTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( normalTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setNormalTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setNormalTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::roughnessTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( roughnessTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setRoughnessTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setRoughnessTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::specularHitDistanceTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( specularHitDistanceTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setSpecularHitDistanceTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setSpecularHitDistanceTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::denoiseStrengthMaskTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( denoiseStrengthMaskTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setDenoiseStrengthMaskTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDenoiseStrengthMaskTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::transparencyOverlayTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( transparencyOverlayTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setTransparencyOverlayTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setTransparencyOverlayTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::outputTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setOutputTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerDescriptor::inputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setInputWidth( NS::UInteger inputWidth )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputWidth_ ), inputWidth );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerDescriptor::inputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setInputHeight( NS::UInteger inputHeight )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputHeight_ ), inputHeight );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerDescriptor::outputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setOutputWidth( NS::UInteger outputWidth )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputWidth_ ), outputWidth );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerDescriptor::outputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setOutputHeight( NS::UInteger outputHeight )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputHeight_ ), outputHeight );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::requiresSynchronousInitialization() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( requiresSynchronousInitialization ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setRequiresSynchronousInitialization( bool requiresSynchronousInitialization )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setRequiresSynchronousInitialization_ ), requiresSynchronousInitialization );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isAutoExposureEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isAutoExposureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setAutoExposureEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setAutoExposureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isInputContentPropertiesEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isInputContentPropertiesEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setInputContentPropertiesEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentPropertiesEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerDescriptor::inputContentMinScale() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMinScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setInputContentMinScale( float inputContentMinScale )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentMinScale_ ), inputContentMinScale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerDescriptor::inputContentMaxScale() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMaxScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setInputContentMaxScale( float inputContentMaxScale )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentMaxScale_ ), inputContentMaxScale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isReactiveMaskTextureEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isReactiveMaskTextureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setReactiveMaskTextureEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTextureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerDescriptor::reactiveMaskTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( reactiveMaskTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setReactiveMaskTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isSpecularHitDistanceTextureEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isSpecularHitDistanceTextureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setSpecularHitDistanceTextureEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setSpecularHitDistanceTextureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isDenoiseStrengthMaskTextureEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isDenoiseStrengthMaskTextureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setDenoiseStrengthMaskTextureEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDenoiseStrengthMaskTextureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::isTransparencyOverlayTextureEnabled() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isTransparencyOverlayTextureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerDescriptor::setTransparencyOverlayTextureEnabled( bool enabled )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setTransparencyOverlayTextureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalDenoisedScaler* MTLFX::TemporalDenoisedScalerDescriptor::newTemporalDenoisedScaler( const MTL::Device* device ) const
-{
-    return NS::Object::sendMessage< TemporalDenoisedScaler* >( this, _MTLFX_PRIVATE_SEL( newTemporalDenoisedScalerWithDevice_ ), device );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL4FX::TemporalDenoisedScaler* MTLFX::TemporalDenoisedScalerDescriptor::newTemporalDenoisedScaler( const MTL::Device* device, const MTL4::Compiler* compiler ) const
-{
-    return NS::Object::sendMessage< MTL4FX::TemporalDenoisedScaler* >( this, _MTLFX_PRIVATE_SEL( newTemporalDenoisedScalerWithDevice_compiler_ ), device, compiler );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerDescriptor::supportedInputContentMinScale( MTL::Device* pDevice )
-{
-    float scale = 1.0f;
-
-    if ( nullptr != methodSignatureForSelector( _MTLFX_PRIVATE_CLS( MTLFXTemporalDenoisedScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMinScaleForDevice_ ) ) )
-    {
-        scale = sendMessage< float >( _NS_PRIVATE_CLS( MTLFXTemporalDenoisedScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMinScaleForDevice_ ), pDevice );
-    }
-
-    return scale;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerDescriptor::supportedInputContentMaxScale( MTL::Device* pDevice )
-{
-    float scale = 1.0f;
-
-    if ( nullptr != methodSignatureForSelector( _MTLFX_PRIVATE_CLS( MTLFXTemporalDenoisedScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMaxScaleForDevice_ ) ) )
-    {
-        scale = sendMessage< float >( _MTLFX_PRIVATE_CLS( MTLFXTemporalDenoisedScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMaxScaleForDevice_ ), pDevice );
-    }
-    else if ( supportsDevice( pDevice ) )
-    {
-        scale = 2.0f;
-    }
-
-    return scale;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::supportsMetal4FX( MTL::Device* device )
-{
-    return NS::Object::sendMessageSafe< bool >( _MTLFX_PRIVATE_CLS(MTLFXTemporalDenoisedScalerDescriptor), _MTLFX_PRIVATE_SEL( supportsMetal4FX_ ), device );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerDescriptor::supportsDevice( MTL::Device* device )
-{
-    return NS::Object::sendMessageSafe< bool >( _MTLFX_PRIVATE_CLS(MTLFXTemporalDenoisedScalerDescriptor), _MTLFX_PRIVATE_SEL( supportsDevice_ ), device );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::colorTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( colorTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::depthTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( depthTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::motionTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( motionTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::reactiveTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( reactiveTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::diffuseAlbedoTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( diffuseAlbedoTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::specularAlbedoTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( specularAlbedoTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::normalTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( normalTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::roughnessTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( roughnessTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::specularHitDistanceTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( specularHitDistanceTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::denoiseStrengthMaskTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( denoiseStrengthMaskTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::transparencyOverlayTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( transparencyOverlayTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalDenoisedScalerBase::outputTextureUsage() const
-{
-    return NS::Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( outputTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::colorTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( colorTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setColorTexture( MTL::Texture* colorTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTexture_ ), colorTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::depthTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( depthTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setDepthTexture( MTL::Texture* depthTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTexture_ ), depthTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::motionTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( motionTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setMotionTexture( MTL::Texture* motionTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTexture_ ), motionTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::diffuseAlbedoTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( diffuseAlbedoTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setDiffuseAlbedoTexture( MTL::Texture* diffuseAlbedoTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDiffuseAlbedoTexture_ ), diffuseAlbedoTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::specularAlbedoTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( specularAlbedoTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setSpecularAlbedoTexture( MTL::Texture* specularAlbedoTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setSpecularAlbedoTexture_ ), specularAlbedoTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::normalTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( normalTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setNormalTexture( MTL::Texture* normalTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setNormalTexture_ ), normalTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::roughnessTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( roughnessTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setRoughnessTexture( MTL::Texture* roughnessTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setRoughnessTexture_ ), roughnessTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::specularHitDistanceTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( specularHitDistanceTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setSpecularHitDistanceTexture( MTL::Texture* specularHitDistanceTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setSpecularHitDistanceTexture_ ), specularHitDistanceTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::denoiseStrengthMaskTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( denoiseStrengthMaskTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setDenoiseStrengthMaskTexture( MTL::Texture* denoiseStrengthMaskTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDenoiseStrengthMaskTexture_ ), denoiseStrengthMaskTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::transparencyOverlayTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( transparencyOverlayTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setTransparencyOverlayTexture( MTL::Texture* transparencyOverlayTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setTransparencyOverlayTexture_ ), transparencyOverlayTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::outputTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( outputTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setOutputTexture( MTL::Texture* outputTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTexture_ ), outputTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::exposureTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( exposureTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setExposureTexture( MTL::Texture* exposureTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setExposureTexture_ ), exposureTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::preExposure() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( preExposure ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setPreExposure( float preExposure )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setPreExposure_ ), preExposure );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalDenoisedScalerBase::reactiveMaskTexture() const
-{
-    return NS::Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( reactiveMaskTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setReactiveMaskTexture( MTL::Texture* reactiveMaskTexture )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTexture_ ), reactiveMaskTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::jitterOffsetX() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setJitterOffsetX( float jitterOffsetX )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetX_ ), jitterOffsetX );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::jitterOffsetY() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setJitterOffsetY( float jitterOffsetY )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetY_ ), jitterOffsetY );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::motionVectorScaleX() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setMotionVectorScaleX( float motionVectorScaleX )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleX_ ), motionVectorScaleX );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::motionVectorScaleY() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setMotionVectorScaleY( float motionVectorScaleY )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleY_ ), motionVectorScaleY );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerBase::shouldResetHistory() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( shouldResetHistory ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setShouldResetHistory( bool shouldResetHistory )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setShouldResetHistory_ ), shouldResetHistory );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalDenoisedScalerBase::isDepthReversed() const
-{
-    return NS::Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isDepthReversed ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setDepthReversed( bool depthReversed )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthReversed_ ), depthReversed );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::colorTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::depthTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::motionTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::diffuseAlbedoTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( diffuseAlbedoTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::specularAlbedoTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( specularAlbedoTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::normalTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( normalTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::roughnessTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( roughnessTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::specularHitDistanceTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( specularHitDistanceTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::denoiseStrengthMaskTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( denoiseStrengthMaskTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::transparencyOverlayTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( transparencyOverlayTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::reactiveMaskTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( reactiveMaskTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalDenoisedScalerBase::outputTextureFormat() const
-{
-    return NS::Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerBase::inputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerBase::inputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerBase::outputWidth() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalDenoisedScalerBase::outputHeight() const
-{
-    return NS::Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::inputContentMinScale() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMinScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalDenoisedScalerBase::inputContentMaxScale() const
-{
-    return NS::Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMaxScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE simd::float4x4 MTLFX::TemporalDenoisedScalerBase::worldToViewMatrix() const
-{
-    return NS::Object::sendMessage< simd::float4x4 >( this, _MTLFX_PRIVATE_SEL( worldToViewMatrix ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setWorldToViewMatrix( simd::float4x4 worldToViewMatrix )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setWorldToViewMatrix_ ), worldToViewMatrix );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE simd::float4x4 MTLFX::TemporalDenoisedScalerBase::viewToClipMatrix() const
-{
-    return NS::Object::sendMessage< simd::float4x4 >( this, _MTLFX_PRIVATE_SEL( viewToClipMatrix ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setViewToClipMatrix( simd::float4x4 viewToClipMatrix )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setViewToClipMatrix_ ), viewToClipMatrix );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Fence* MTLFX::TemporalDenoisedScalerBase::fence() const
-{
-    return NS::Object::sendMessage< MTL::Fence* >( this, _MTLFX_PRIVATE_SEL( fence ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScalerBase::setFence( MTL::Fence* fence )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFence_ ), fence );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalDenoisedScaler::encodeToCommandBuffer( MTL::CommandBuffer* commandBuffer )
-{
-    return NS::Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), commandBuffer );
-}
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalScaler.hpp b/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalScaler.hpp
deleted file mode 100644
index c13d4242..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MTLFXTemporalScaler.hpp
+++ /dev/null
@@ -1,803 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MTLFXTemporalScaler.hpp
-//
-// Copyright 2020-2025 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXDefines.hpp"
-#include "MTLFXPrivate.hpp"
-
-#include "../Metal/Metal.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace MTL4FX
-{
-    class TemporalScaler;
-}
-
-namespace MTLFX
-{
-    class TemporalScalerDescriptor : public NS::Copying< TemporalScalerDescriptor >
-    {
-    public:
-        static class TemporalScalerDescriptor*      alloc();
-        class TemporalScalerDescriptor*             init();
-
-        MTL::PixelFormat                            colorTextureFormat() const;
-        void                                        setColorTextureFormat( MTL::PixelFormat format );
-
-        MTL::PixelFormat                            depthTextureFormat() const;
-        void                                        setDepthTextureFormat( MTL::PixelFormat format );
-
-        MTL::PixelFormat                            motionTextureFormat() const;
-        void                                        setMotionTextureFormat( MTL::PixelFormat format );
-
-        MTL::PixelFormat                            outputTextureFormat() const;
-        void                                        setOutputTextureFormat( MTL::PixelFormat format );
-
-        NS::UInteger                                inputWidth() const;
-        void                                        setInputWidth( NS::UInteger width );
-
-        NS::UInteger                                inputHeight() const;
-        void                                        setInputHeight( NS::UInteger height );
-
-        NS::UInteger                                outputWidth() const;
-        void                                        setOutputWidth( NS::UInteger width );
-
-        NS::UInteger                                outputHeight() const;
-        void                                        setOutputHeight( NS::UInteger height );
-
-        bool                                        isAutoExposureEnabled() const;
-        void                                        setAutoExposureEnabled( bool enabled );
-
-        bool                                        isInputContentPropertiesEnabled() const;
-        void                                        setInputContentPropertiesEnabled( bool enabled );
-
-        bool                                        requiresSynchronousInitialization() const;
-        void                                        setRequiresSynchronousInitialization(bool requiresSynchronousInitialization);
-
-        bool                                        isReactiveMaskTextureEnabled() const;
-        void                                        setReactiveMaskTextureEnabled( bool enabled );
-
-        MTL::PixelFormat                            reactiveMaskTextureFormat() const;
-        void                                        setReactiveMaskTextureFormat( MTL::PixelFormat pixelFormat );
-
-        float                                       inputContentMinScale() const;
-        void                                        setInputContentMinScale( float scale );
-
-        float                                       inputContentMaxScale() const;
-        void                                        setInputContentMaxScale( float scale );
-
-        class TemporalScaler*                       newTemporalScaler( const MTL::Device* pDevice ) const;
-        MTL4FX::TemporalScaler*                     newTemporalScaler( const MTL::Device* pDevice, const MTL4::Compiler* pCompiler) const;
-
-        static float                                supportedInputContentMinScale( const MTL::Device* pDevice );
-        static float                                supportedInputContentMaxScale( const MTL::Device* pDevice );
-
-        static bool                                 supportsDevice( const MTL::Device* pDevice );
-        static bool                                 supportsMetal4FX( const MTL::Device* pDevice );
-    };
-
-    class FrameInterpolatableScaler : public NS::Copying< FrameInterpolatableScaler >
-    {
-	};
-
-    class TemporalScalerBase : public NS::Referencing< TemporalScaler, FrameInterpolatableScaler >
-    {
-    public:
-        MTL::TextureUsage                           colorTextureUsage() const;
-        MTL::TextureUsage                           depthTextureUsage() const;
-        MTL::TextureUsage                           motionTextureUsage() const;
-        MTL::TextureUsage                           outputTextureUsage() const;
-
-        NS::UInteger                                inputContentWidth() const;
-        void                                        setInputContentWidth( NS::UInteger width );
-
-        NS::UInteger                                inputContentHeight() const;
-        void                                        setInputContentHeight( NS::UInteger height );
-
-        MTL::Texture*                               colorTexture() const;
-        void                                        setColorTexture( MTL::Texture* pTexture );
-
-        MTL::Texture*                               depthTexture() const;
-        void                                        setDepthTexture( MTL::Texture* pTexture );
-
-        MTL::Texture*                               motionTexture() const;
-        void                                        setMotionTexture( MTL::Texture* pTexture );
-
-        MTL::Texture*                               outputTexture() const;
-        void                                        setOutputTexture( MTL::Texture* pTexture );
-
-        MTL::Texture*                               exposureTexture() const;
-        void                                        setExposureTexture( MTL::Texture* pTexture );
-
-        float                                       preExposure() const;
-        void                                        setPreExposure( float preExposure );
-        
-        float                                       jitterOffsetX() const;
-        void                                        setJitterOffsetX( float offset );
-
-        float                                       jitterOffsetY() const;
-        void                                        setJitterOffsetY( float offset );
-
-        float                                       motionVectorScaleX() const;
-        void                                        setMotionVectorScaleX( float scale );
-
-        float                                       motionVectorScaleY() const;
-        void                                        setMotionVectorScaleY( float scale );
-
-        MTL::Texture*                               reactiveMaskTexture() const;
-        void                                        setReactiveMaskTexture( MTL::Texture* reactiveMaskTexture );
-
-        MTL::TextureUsage                           reactiveTextureUsage() const;
-
-        bool                                        reset() const;
-        void                                        setReset( bool reset );
-
-        bool                                        isDepthReversed() const;
-        void                                        setDepthReversed( bool depthReversed );
-
-        MTL::PixelFormat                            colorTextureFormat() const;
-        MTL::PixelFormat                            depthTextureFormat() const;
-        MTL::PixelFormat                            motionTextureFormat() const;
-        MTL::PixelFormat                            reactiveTextureFormat() const;
-        MTL::PixelFormat                            outputTextureFormat() const;
-        NS::UInteger                                inputWidth() const;
-        NS::UInteger                                inputHeight() const;
-        NS::UInteger                                outputWidth() const;
-        NS::UInteger                                outputHeight() const;
-        float                                       inputContentMinScale() const;
-        float                                       inputContentMaxScale() const;
-
-        MTL::Fence*                                 fence() const;
-        void                                        setFence( MTL::Fence* pFence );
-    };
-
-    class TemporalScaler : public NS::Referencing< TemporalScaler, TemporalScalerBase >
-    {
-    public:
-        void                                        encodeToCommandBuffer( MTL::CommandBuffer* pCommandBuffer );
-    };
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalScalerDescriptor* MTLFX::TemporalScalerDescriptor::alloc()
-{
-    return NS::Object::alloc< TemporalScalerDescriptor >( _MTLFX_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalScalerDescriptor* MTLFX::TemporalScalerDescriptor::init()
-{
-    return NS::Object::init< TemporalScalerDescriptor >();
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerDescriptor::colorTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setColorTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerDescriptor::depthTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setDepthTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerDescriptor::motionTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setMotionTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerDescriptor::outputTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setOutputTextureFormat( MTL::PixelFormat format )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTextureFormat_ ), format );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerDescriptor::inputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setInputWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerDescriptor::inputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setInputHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerDescriptor::outputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setOutputWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerDescriptor::outputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setOutputHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::isAutoExposureEnabled() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isAutoExposureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setAutoExposureEnabled( bool enabled )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setAutoExposureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::isInputContentPropertiesEnabled() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isInputContentPropertiesEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setInputContentPropertiesEnabled( bool enabled )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentPropertiesEnabled_ ), enabled );
-}
-
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::requiresSynchronousInitialization() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( requiresSynchronousInitialization ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setRequiresSynchronousInitialization(bool requiresSynchronousInitialization)
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setRequiresSynchronousInitialization_ ), requiresSynchronousInitialization );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::isReactiveMaskTextureEnabled() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isReactiveMaskTextureEnabled ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setReactiveMaskTextureEnabled( bool enabled )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTextureEnabled_ ), enabled );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerDescriptor::reactiveMaskTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( reactiveMaskTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setReactiveMaskTextureFormat( MTL::PixelFormat pixelFormat )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTextureFormat_ ), pixelFormat );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerDescriptor::inputContentMinScale() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMinScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setInputContentMinScale( float scale )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentMinScale_ ), scale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerDescriptor::inputContentMaxScale() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMaxScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerDescriptor::setInputContentMaxScale( float scale )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentMaxScale_ ), scale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTLFX::TemporalScaler* MTLFX::TemporalScalerDescriptor::newTemporalScaler( const MTL::Device* pDevice ) const
-{
-    return Object::sendMessage< TemporalScaler* >( this, _MTLFX_PRIVATE_SEL( newTemporalScalerWithDevice_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL4FX::TemporalScaler* MTLFX::TemporalScalerDescriptor::newTemporalScaler( const MTL::Device* pDevice, const MTL4::Compiler* pCompiler ) const
-{
-    return Object::sendMessage< MTL4FX::TemporalScaler* >( this, _MTLFX_PRIVATE_SEL( newTemporalScalerWithDevice_compiler_ ), pDevice, pCompiler );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerDescriptor::supportedInputContentMinScale( const MTL::Device* pDevice )
-{
-    float scale = 1.0f;
-
-    if ( nullptr != methodSignatureForSelector( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMinScaleForDevice_ ) ) )
-    {
-        scale = sendMessage< float >( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMinScaleForDevice_ ), pDevice );
-    }
-
-    return scale;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerDescriptor::supportedInputContentMaxScale( const MTL::Device* pDevice )
-{
-    float scale = 1.0f;
-
-    if ( nullptr != methodSignatureForSelector( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMaxScaleForDevice_ ) ) )
-    {
-        scale = sendMessage< float >( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportedInputContentMaxScaleForDevice_ ), pDevice );
-    }
-    else if ( supportsDevice( pDevice ) )
-    {
-        scale = 2.0f;
-    }
-
-    return scale;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::supportsDevice( const MTL::Device* pDevice )
-{
-    return Object::sendMessageSafe< bool >( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportsDevice_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerDescriptor::supportsMetal4FX( const MTL::Device* pDevice )
-{
-    return Object::sendMessageSafe< bool >( _NS_PRIVATE_CLS( MTLFXTemporalScalerDescriptor ), _MTLFX_PRIVATE_SEL( supportsMetal4FX_ ), pDevice );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalScalerBase::colorTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( colorTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalScalerBase::depthTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( depthTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalScalerBase::motionTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( motionTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalScalerBase::outputTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( outputTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::inputContentWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputContentWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setInputContentWidth( NS::UInteger width )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentWidth_ ), width );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::inputContentHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputContentHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setInputContentHeight( NS::UInteger height )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setInputContentHeight_ ), height );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::colorTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( colorTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setColorTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setColorTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::depthTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( depthTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setDepthTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::motionTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( motionTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setMotionTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::outputTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( outputTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setOutputTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setOutputTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::exposureTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( exposureTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setExposureTexture( MTL::Texture* pTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setExposureTexture_ ), pTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::preExposure() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( preExposure ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setPreExposure( float preExposure )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setPreExposure_ ), preExposure );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::jitterOffsetX() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setJitterOffsetX( float offset )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetX_ ), offset );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::jitterOffsetY() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( jitterOffsetY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setJitterOffsetY( float offset )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setJitterOffsetY_ ), offset );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::motionVectorScaleX() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleX ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setMotionVectorScaleX( float scale )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleX_ ), scale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::motionVectorScaleY() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( motionVectorScaleY ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setMotionVectorScaleY( float scale )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setMotionVectorScaleY_ ), scale );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Texture* MTLFX::TemporalScalerBase::reactiveMaskTexture() const
-{
-    return Object::sendMessage< MTL::Texture* >( this, _MTLFX_PRIVATE_SEL( reactiveMaskTexture ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setReactiveMaskTexture( MTL::Texture* reactiveMaskTexture )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReactiveMaskTexture_ ), reactiveMaskTexture );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::TextureUsage MTLFX::TemporalScalerBase::reactiveTextureUsage() const
-{
-    return Object::sendMessage< MTL::TextureUsage >( this, _MTLFX_PRIVATE_SEL( reactiveTextureUsage ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerBase::reset() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( reset ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setReset( bool reset )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setReset_ ), reset );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE bool MTLFX::TemporalScalerBase::isDepthReversed() const
-{
-    return Object::sendMessage< bool >( this, _MTLFX_PRIVATE_SEL( isDepthReversed ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setDepthReversed( bool depthReversed )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setDepthReversed_ ), depthReversed );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerBase::colorTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( colorTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerBase::depthTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( depthTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerBase::motionTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( motionTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::PixelFormat MTLFX::TemporalScalerBase::outputTextureFormat() const
-{
-    return Object::sendMessage< MTL::PixelFormat >( this, _MTLFX_PRIVATE_SEL( outputTextureFormat ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::inputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::inputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( inputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::outputWidth() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputWidth ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE NS::UInteger MTLFX::TemporalScalerBase::outputHeight() const
-{
-    return Object::sendMessage< NS::UInteger >( this, _MTLFX_PRIVATE_SEL( outputHeight ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::inputContentMinScale() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMinScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE float MTLFX::TemporalScalerBase::inputContentMaxScale() const
-{
-    return Object::sendMessage< float >( this, _MTLFX_PRIVATE_SEL( inputContentMaxScale ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE MTL::Fence* MTLFX::TemporalScalerBase::fence() const
-{
-    return Object::sendMessage< MTL::Fence* >( this, _MTLFX_PRIVATE_SEL( fence ) );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScalerBase::setFence( MTL::Fence* pFence )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( setFence_ ), pFence );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_MTLFX_INLINE void MTLFX::TemporalScaler::encodeToCommandBuffer( MTL::CommandBuffer* pCommandBuffer )
-{
-    Object::sendMessage< void >( this, _MTLFX_PRIVATE_SEL( encodeToCommandBuffer_ ), pCommandBuffer );
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/MetalFX/MetalFX.hpp b/engine/thirdparty/metal-cpp/MetalFX/MetalFX.hpp
deleted file mode 100644
index 20e647e8..00000000
--- a/engine/thirdparty/metal-cpp/MetalFX/MetalFX.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// MetalFX/MetalFX.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "MTLFXSpatialScaler.hpp"
-#include "MTLFXTemporalScaler.hpp"
-#include "MTLFXTemporalDenoisedScaler.hpp"
-#include "MTLFXFrameInterpolator.hpp"
-
-#include "MTL4FXSpatialScaler.hpp"
-#include "MTL4FXTemporalScaler.hpp"
-#include "MTL4FXTemporalDenoisedScaler.hpp"
-#include "MTL4FXFrameInterpolator.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/CADefines.hpp b/engine/thirdparty/metal-cpp/QuartzCore/CADefines.hpp
deleted file mode 100644
index b0641de0..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/CADefines.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// QuartzCore/CADefines.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "../Foundation/NSDefines.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _CA_EXPORT _NS_EXPORT
-#define _CA_EXTERN _NS_EXTERN
-#define _CA_INLINE _NS_INLINE
-#define _CA_PACKED _NS_PACKED
-
-#define _CA_CONST(type, name) _NS_CONST(type, name)
-#define _CA_ENUM(type, name) _NS_ENUM(type, name)
-#define _CA_OPTIONS(type, name) _NS_OPTIONS(type, name)
-
-#define _CA_VALIDATE_SIZE(ns, name) _NS_VALIDATE_SIZE(ns, name)
-#define _CA_VALIDATE_ENUM(ns, name) _NS_VALIDATE_ENUM(ns, name)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/CALayer.hpp b/engine/thirdparty/metal-cpp/QuartzCore/CALayer.hpp
deleted file mode 100644
index d3672685..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/CALayer.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#include "CADefines.hpp"
-#include "CAPrivate.hpp"
-#include "../Foundation/NSObject.hpp"
-#include <CoreGraphics/CoreGraphics.h>
-
-namespace CA
-{
-using DynamicRange = NS::String*;
-
-_CA_CONST(DynamicRange, DynamicRangeAutomatic);
-_CA_CONST(DynamicRange, DynamicRangeStandard);
-_CA_CONST(DynamicRange, DynamicRangeConstrainedHigh);
-_CA_CONST(DynamicRange, DynamicRangeHigh);
-
-
-class Layer : public NS::Referencing<Layer>
-{
-public:
-    bool wantsExtendedDynamicRangeContent() const;
-    void setWantsExtendedDynamicRangeContent(bool wantsExtendedDynamicRangeContent);
-    CA::DynamicRange preferredDynamicRange() const;
-    void setPreferredDynamicRange(CA::DynamicRange preferredDynamicRange);
-    CGFloat contentsHeadroom() const;
-    void setContentsHeadroom(CGFloat contentsHeadroom);
-    bool opaque() const;
-    void setOpaque(bool opaque);
-
-};
-
-} // namespace CA
-
-// --- Inline implementations ---
-
-_CA_INLINE bool CA::Layer::wantsExtendedDynamicRangeContent() const
-{
-    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(wantsExtendedDynamicRangeContent));
-}
-
-_CA_INLINE void CA::Layer::setWantsExtendedDynamicRangeContent(bool wantsExtendedDynamicRangeContent)
-{
-    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setWantsExtendedDynamicRangeContent_), wantsExtendedDynamicRangeContent);
-}
-
-_CA_INLINE CA::DynamicRange CA::Layer::preferredDynamicRange() const
-{
-    return Object::sendMessage<CA::DynamicRange>(this, _CA_PRIVATE_SEL(preferredDynamicRange));
-}
-
-_CA_INLINE void CA::Layer::setPreferredDynamicRange(CA::DynamicRange preferredDynamicRange)
-{
-    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setPreferredDynamicRange_), preferredDynamicRange);
-}
-
-_CA_INLINE CGFloat CA::Layer::contentsHeadroom() const
-{
-    return Object::sendMessage<CGFloat>(this, _CA_PRIVATE_SEL(contentsHeadroom));
-}
-
-_CA_INLINE void CA::Layer::setContentsHeadroom(CGFloat contentsHeadroom)
-{
-    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setContentsHeadroom_), contentsHeadroom);
-}
-
-_CA_INLINE bool CA::Layer::opaque() const
-{
-    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(opaque));
-}
-
-_CA_INLINE void CA::Layer::setOpaque(bool opaque)
-{
-    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setOpaque_), opaque);
-}
-
-_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeAutomatic);
-_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeStandard);
-_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeConstrainedHigh);
-_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeHigh);
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/CAMetalDrawable.hpp b/engine/thirdparty/metal-cpp/QuartzCore/CAMetalDrawable.hpp
deleted file mode 100644
index 0057773a..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/CAMetalDrawable.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// QuartzCore/CAMetalDrawable.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "../Metal/MTLDrawable.hpp"
-#include "../Metal/MTLTexture.hpp"
-
-#include "CADefines.hpp"
-#include "CAPrivate.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace CA
-{
-class MetalDrawable : public NS::Referencing<MetalDrawable, MTL::Drawable>
-{
-public:
-    class MetalLayer* layer() const;
-    MTL::Texture*     texture() const;
-};
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE CA::MetalLayer* CA::MetalDrawable::layer() const
-{
-    return Object::sendMessage<MetalLayer*>(this, _CA_PRIVATE_SEL(layer));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE MTL::Texture* CA::MetalDrawable::texture() const
-{
-    return Object::sendMessage<MTL::Texture*>(this, _CA_PRIVATE_SEL(texture));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/CAMetalLayer.hpp b/engine/thirdparty/metal-cpp/QuartzCore/CAMetalLayer.hpp
deleted file mode 100644
index 8dfb0ae3..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/CAMetalLayer.hpp
+++ /dev/null
@@ -1,217 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// QuartzCore/CAMetalDrawable.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "../Metal/MTLPixelFormat.hpp"
-#include "../Metal/MTLTexture.hpp"
-#include "../Metal/MTLResidencySet.hpp"
-#include "../Foundation/NSTypes.hpp"
-#include <CoreGraphics/CGGeometry.h>
-#include <CoreGraphics/CGColorSpace.h>
-
-#include "CADefines.hpp"
-#include "CAMetalDrawable.hpp"
-#include "CAPrivate.hpp"
-#include "CALayer.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace CA
-{
-
-class MetalLayer : public NS::Referencing<MetalLayer, Layer>
-{
-public:
-    static class MetalLayer* layer();
-
-    MTL::Device*             device() const;
-    void                     setDevice(MTL::Device* device);
-
-    MTL::PixelFormat         pixelFormat() const;
-    void                     setPixelFormat(MTL::PixelFormat pixelFormat);
-
-    bool                     framebufferOnly() const;
-    void                     setFramebufferOnly(bool framebufferOnly);
-
-    CGSize                   drawableSize() const;
-    void                     setDrawableSize(CGSize drawableSize);
-
-    class MetalDrawable*     nextDrawable();
-
-    NS::UInteger             maximumDrawableCount() const;
-    void                     setMaximumDrawableCount(NS::UInteger maximumDrawableCount);
-
-    bool                     displaySyncEnabled() const;
-    void                     setDisplaySyncEnabled(bool displaySyncEnabled);
-
-    CGColorSpaceRef          colorspace() const;
-    void                     setColorspace(CGColorSpaceRef colorspace);
-
-    bool                     allowsNextDrawableTimeout() const;
-    void                     setAllowsNextDrawableTimeout(bool allowsNextDrawableTimeout);
-
-    MTL::ResidencySet*       residencySet() const;
-};
-} // namespace CA
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-_CA_INLINE CA::MetalLayer* CA::MetalLayer::layer()
-{
-    return Object::sendMessage<CA::MetalLayer*>(_CA_PRIVATE_CLS(CAMetalLayer), _CA_PRIVATE_SEL(layer));
-}
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE MTL::Device* CA::MetalLayer::device() const
-{
-    return Object::sendMessage<MTL::Device*>(this, _CA_PRIVATE_SEL(device));
-}
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setDevice(MTL::Device* device)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setDevice_), device);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE MTL::PixelFormat CA::MetalLayer::pixelFormat() const
-{
-    return Object::sendMessage<MTL::PixelFormat>(this,
-        _CA_PRIVATE_SEL(pixelFormat));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setPixelFormat(MTL::PixelFormat pixelFormat)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setPixelFormat_),
-        pixelFormat);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE bool CA::MetalLayer::framebufferOnly() const
-{
-    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(framebufferOnly));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setFramebufferOnly(bool framebufferOnly)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setFramebufferOnly_),
-        framebufferOnly);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE CGSize CA::MetalLayer::drawableSize() const
-{
-    return Object::sendMessage<CGSize>(this, _CA_PRIVATE_SEL(drawableSize));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setDrawableSize(CGSize drawableSize)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setDrawableSize_),
-        drawableSize);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE CA::MetalDrawable* CA::MetalLayer::nextDrawable()
-{
-    return Object::sendMessage<MetalDrawable*>(this,
-        _CA_PRIVATE_SEL(nextDrawable));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE NS::UInteger CA::MetalLayer::maximumDrawableCount() const
-{
-    return Object::sendMessage<NS::UInteger>(this,
-        _CA_PRIVATE_SEL(maximumDrawableCount));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setMaximumDrawableCount(NS::UInteger maximumDrawableCount)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setMaximumDrawableCount_),
-        maximumDrawableCount);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE bool CA::MetalLayer::displaySyncEnabled() const
-{
-    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(displaySyncEnabled));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setDisplaySyncEnabled(bool displaySyncEnabled)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setDisplaySyncEnabled_),
-        displaySyncEnabled);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE CGColorSpaceRef CA::MetalLayer::colorspace() const
-{
-    return Object::sendMessage<CGColorSpaceRef>(this, _CA_PRIVATE_SEL(colorspace));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setColorspace(CGColorSpaceRef colorspace)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setColorspace_),
-        colorspace);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE bool CA::MetalLayer::allowsNextDrawableTimeout() const
-{
-    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(allowsNextDrawableTimeout));
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE void CA::MetalLayer::setAllowsNextDrawableTimeout(bool allowsNextDrawableTimeout)
-{
-    return Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setAllowsNextDrawableTimeout_),
-    allowsNextDrawableTimeout);
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-_CA_INLINE MTL::ResidencySet* CA::MetalLayer::residencySet() const
-{
-    return Object::sendMessage<MTL::ResidencySet*>(this, _CA_PRIVATE_SEL(residencySet) );
-}
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/CAPrivate.hpp b/engine/thirdparty/metal-cpp/QuartzCore/CAPrivate.hpp
deleted file mode 100644
index 8f882215..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/CAPrivate.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// QuartzCore/CAPrivate.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "CADefines.hpp"
-
-#include <objc/runtime.h>
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#define _CA_PRIVATE_CLS(symbol) (Private::Class::s_k##symbol)
-#define _CA_PRIVATE_SEL(accessor) (Private::Selector::s_k##accessor)
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#if defined(CA_PRIVATE_IMPLEMENTATION)
-
-#ifdef METALCPP_SYMBOL_VISIBILITY_HIDDEN
-#define _CA_PRIVATE_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#define _CA_PRIVATE_VISIBILITY __attribute__((visibility("default")))
-#endif // METALCPP_SYMBOL_VISIBILITY_HIDDEN
-
-#define _CA_PRIVATE_IMPORT __attribute__((weak_import))
-
-#ifdef __OBJC__
-#define _CA_PRIVATE_OBJC_LOOKUP_CLASS(symbol) ((__bridge void*)objc_lookUpClass(#symbol))
-#define _CA_PRIVATE_OBJC_GET_PROTOCOL(symbol) ((__bridge void*)objc_getProtocol(#symbol))
-#else
-#define _CA_PRIVATE_OBJC_LOOKUP_CLASS(symbol) objc_lookUpClass(#symbol)
-#define _CA_PRIVATE_OBJC_GET_PROTOCOL(symbol) objc_getProtocol(#symbol)
-#endif // __OBJC__
-
-#define _CA_PRIVATE_DEF_CLS(symbol) void* s_k##symbol _CA_PRIVATE_VISIBILITY = _CA_PRIVATE_OBJC_LOOKUP_CLASS(symbol)
-#define _CA_PRIVATE_DEF_PRO(symbol) void* s_k##symbol _CA_PRIVATE_VISIBILITY = _CA_PRIVATE_OBJC_GET_PROTOCOL(symbol)
-#define _CA_PRIVATE_DEF_SEL(accessor, symbol) SEL s_k##accessor _CA_PRIVATE_VISIBILITY = sel_registerName(symbol)
-
-#include <dlfcn.h>
-
-namespace CA::Private
-{
-    template <typename _Type>
-    inline _Type const LoadSymbol(const char* pSymbol)
-    {
-        const _Type* pAddress = static_cast<_Type*>(dlsym(RTLD_DEFAULT, pSymbol));
-
-        return pAddress ? *pAddress : nullptr;
-    }
-} // CA::Private
-
-#if defined(__MAC_26_0) || defined(__IPHONE_26_0) || defined(__TVOS_26_0)
-
-#define _CA_PRIVATE_DEF_STR(type, symbol)                \
-    _CA_EXTERN type const CA##symbol _CA_PRIVATE_IMPORT; \
-    type const                       CA::symbol = (nullptr != &CA##symbol) ? CA##symbol : nullptr
-
-#define _CA_PRIVATE_DEF_CONST(type, symbol)              \
-    _CA_EXTERN type const CA##symbol _CA_PRIVATE_IMPORT; \
-    type const                         CA::symbol = (nullptr != &CA##symbol) ? CA##symbol : nullptr
-
-#else
-
-#define _CA_PRIVATE_DEF_STR(type, symbol)    \
-    _CA_EXTERN type const CA##symbol;    \
-    type const             CA::symbol = CA::Private::LoadSymbol<type>("CA" #symbol)
-
-#define _CA_PRIVATE_DEF_CONST(type, symbol)    \
-    _CA_EXTERN type const CA##symbol;    \
-    type const             CA::symbol = CA::Private::LoadSymbol<type>("CA" #symbol)
-
-#endif
-
-#else
-
-#define _CA_PRIVATE_DEF_CLS(symbol) extern void* s_k##symbol
-#define _CA_PRIVATE_DEF_PRO(symbol) extern void* s_k##symbol
-#define _CA_PRIVATE_DEF_SEL(accessor, symbol) extern SEL s_k##accessor
-#define _CA_PRIVATE_DEF_STR(type, symbol) extern type const CA::symbol
-#define _CA_PRIVATE_DEF_CONST(type, symbol) extern type const CA::symbol
-
-#endif // CA_PRIVATE_IMPLEMENTATION
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace CA
-{
-namespace Private
-{
-    namespace Class
-    {
-        _CA_PRIVATE_DEF_CLS(CAMetalLayer);
-            _CA_PRIVATE_DEF_CLS(CALayer);
-    } // Class
-} // Private
-} // CA
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace CA
-{
-namespace Private
-{
-    namespace Protocol
-    {
-
-        _CA_PRIVATE_DEF_PRO(CAMetalDrawable);
-
-    } // Protocol
-} // Private
-} // CA
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-namespace CA
-{
-namespace Private
-{
-    namespace Selector
-    {
-        _CA_PRIVATE_DEF_SEL(allowsNextDrawableTimeout,
-            "allowsNextDrawableTimeout");
-        _CA_PRIVATE_DEF_SEL(colorspace,
-            "colorspace");
-        _CA_PRIVATE_DEF_SEL(contentsHeadroom,
-            "contentsHeadroom");
-        _CA_PRIVATE_DEF_SEL(device,
-            "device");
-        _CA_PRIVATE_DEF_SEL(displaySyncEnabled,
-            "displaySyncEnabled");
-        _CA_PRIVATE_DEF_SEL(drawableSize,
-            "drawableSize");
-        _CA_PRIVATE_DEF_SEL(framebufferOnly,
-            "framebufferOnly");
-        _CA_PRIVATE_DEF_SEL(layer,
-            "layer");
-        _CA_PRIVATE_DEF_SEL(maximumDrawableCount,
-            "maximumDrawableCount");
-        _CA_PRIVATE_DEF_SEL(nextDrawable,
-            "nextDrawable");
-        _CA_PRIVATE_DEF_SEL(opaque,
-            "opaque");
-        _CA_PRIVATE_DEF_SEL(pixelFormat,
-            "pixelFormat");
-        _CA_PRIVATE_DEF_SEL(preferredDynamicRange,
-            "preferredDynamicRange");
-        _CA_PRIVATE_DEF_SEL(residencySet,
-            "residencySet");
-        _CA_PRIVATE_DEF_SEL(setAllowsNextDrawableTimeout_,
-            "setAllowsNextDrawableTimeout:");
-        _CA_PRIVATE_DEF_SEL(setColorspace_,
-            "setColorspace:");
-        _CA_PRIVATE_DEF_SEL(setContentsHeadroom_,
-            "setContentsHeadroom:");
-        _CA_PRIVATE_DEF_SEL(setDevice_,
-            "setDevice:");
-        _CA_PRIVATE_DEF_SEL(setDisplaySyncEnabled_,
-            "setDisplaySyncEnabled:");
-        _CA_PRIVATE_DEF_SEL(setDrawableSize_,
-            "setDrawableSize:");
-        _CA_PRIVATE_DEF_SEL(setFramebufferOnly_,
-            "setFramebufferOnly:");
-        _CA_PRIVATE_DEF_SEL(setMaximumDrawableCount_,
-            "setMaximumDrawableCount:");
-        _CA_PRIVATE_DEF_SEL(setOpaque_,
-            "setOpaque:");
-        _CA_PRIVATE_DEF_SEL(setPixelFormat_,
-            "setPixelFormat:");
-        _CA_PRIVATE_DEF_SEL(setPreferredDynamicRange_,
-            "setPreferredDynamicRange:");
-        _CA_PRIVATE_DEF_SEL(setWantsExtendedDynamicRangeContent_,
-            "setWantsExtendedDynamicRangeContent:");
-        _CA_PRIVATE_DEF_SEL(texture,
-            "texture");
-        _CA_PRIVATE_DEF_SEL(wantsExtendedDynamicRangeContent,
-            "wantsExtendedDynamicRangeContent");
-
-    } // Class
-} // Private
-} // CA
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/QuartzCore/QuartzCore.hpp b/engine/thirdparty/metal-cpp/QuartzCore/QuartzCore.hpp
deleted file mode 100644
index 01418e0c..00000000
--- a/engine/thirdparty/metal-cpp/QuartzCore/QuartzCore.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//
-// QuartzCore/QuartzCore.hpp
-//
-// Copyright 2020-2024 Apple Inc.
-//
-// 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
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#pragma once
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-#include "CALayer.hpp"
-#include "CAMetalDrawable.hpp"
-#include "CAMetalLayer.hpp"
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/engine/thirdparty/metal-cpp/metal_cpp.cpp b/engine/thirdparty/metal-cpp/metal_cpp.cpp
deleted file mode 100644
index 7d20dc7c..00000000
--- a/engine/thirdparty/metal-cpp/metal_cpp.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************/
-/*  metal_cpp.cpp                                                         */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#define NS_PRIVATE_IMPLEMENTATION
-#define CA_PRIVATE_IMPLEMENTATION
-#define MTL_PRIVATE_IMPLEMENTATION
-#define MTLFX_PRIVATE_IMPLEMENTATION
-
-#include "Foundation/Foundation.hpp"
-#include "Metal/Metal.hpp"
-#include "MetalFX/MetalFX.hpp"
-#include "QuartzCore/QuartzCore.hpp"
diff --git a/engine/thirdparty/metal-cpp/patches/0001-add-missing-apis.patch b/engine/thirdparty/metal-cpp/patches/0001-add-missing-apis.patch
deleted file mode 100644
index cd737664..00000000
--- a/engine/thirdparty/metal-cpp/patches/0001-add-missing-apis.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-diff -ruN original/Foundation/NSData.hpp patched/Foundation/NSData.hpp
---- original/Foundation/NSData.hpp	2026-02-18 06:41:30
-+++ patched/Foundation/NSData.hpp	2026-02-18 06:41:30
-@@ -34,6 +34,7 @@
- public:
-     void*    mutableBytes() const;
-     UInteger length() const;
-+    const void * bytes() const;
- };
- }
- 
-@@ -49,6 +50,11 @@
- _NS_INLINE NS::UInteger NS::Data::length() const
- {
-     return Object::sendMessage<UInteger>(this, _NS_PRIVATE_SEL(length));
-+}
-+
-+_NS_INLINE const void * NS::Data::bytes() const
-+{
-+    return Object::sendMessage<const void *>(this, _NS_PRIVATE_SEL(bytes));
- }
- 
- //-------------------------------------------------------------------------------------------------------------------------------------------------------------
-diff -ruN original/Foundation/NSDefines.hpp patched/Foundation/NSDefines.hpp
---- original/Foundation/NSDefines.hpp	2026-02-18 06:41:30
-+++ patched/Foundation/NSDefines.hpp	2026-02-18 06:41:30
-@@ -22,6 +22,16 @@
- 
- //-------------------------------------------------------------------------------------------------------------------------------------------------------------
- 
-+// Forward declarations to avoid conflicts with Godot types (String, Object, Error)
-+namespace NS {
-+class Array;
-+class Dictionary;
-+class Error;
-+class Object;
-+class String;
-+class URL;
-+} // namespace NS
-+
- #define _NS_WEAK_IMPORT __attribute__((weak_import))
- #ifdef METALCPP_SYMBOL_VISIBILITY_HIDDEN
- #define _NS_EXPORT __attribute__((visibility("hidden")))
-diff -ruN original/Foundation/NSObject.hpp patched/Foundation/NSObject.hpp
---- original/Foundation/NSObject.hpp	2026-02-18 06:41:30
-+++ patched/Foundation/NSObject.hpp	2026-02-18 06:41:30
-@@ -68,6 +68,12 @@
-     class String* description() const;
-     class String* debugDescription() const;
- 
-+    template <typename _Ret, typename... _Args>
-+    static _Ret sendMessage(const void* pObj, SEL selector, _Args... args);
-+
-+    template <typename _Ret, typename... _Args>
-+    static _Ret sendMessageSafe(const void* pObj, SEL selector, _Args... args);
-+
- protected:
-     friend class Referencing<Object, objc_object>;
- 
-@@ -84,10 +90,6 @@
-     static bool                   respondsToSelector(const void* pObj, SEL selector);
-     template <typename _Type>
-     static constexpr bool doesRequireMsgSendStret();
--    template <typename _Ret, typename... _Args>
--    static _Ret sendMessage(const void* pObj, SEL selector, _Args... args);
--    template <typename _Ret, typename... _Args>
--    static _Ret sendMessageSafe(const void* pObj, SEL selector, _Args... args);
- 
- private:
-     Object() = delete;
-diff -ruN original/Foundation/NSPrivate.hpp patched/Foundation/NSPrivate.hpp
---- original/Foundation/NSPrivate.hpp	2026-02-18 06:41:30
-+++ patched/Foundation/NSPrivate.hpp	2026-02-18 06:41:30
-@@ -184,6 +184,8 @@
-             "bundleWithPath:");
-         _NS_PRIVATE_DEF_SEL(bundleWithURL_,
-             "bundleWithURL:");
-+        _NS_PRIVATE_DEF_SEL(bytes,
-+            "bytes");
-         _NS_PRIVATE_DEF_SEL(caseInsensitiveCompare_,
-             "caseInsensitiveCompare:");
-         _NS_PRIVATE_DEF_SEL(characterAtIndex_,
-@@ -268,6 +270,8 @@
-             "initFileURLWithPath:");
-         _NS_PRIVATE_DEF_SEL(initWithBool_,
-             "initWithBool:");
-+        _NS_PRIVATE_DEF_SEL(initWithBytes_length_encoding_,
-+            "initWithBytes:length:encoding:");
-         _NS_PRIVATE_DEF_SEL(initWithBytes_objCType_,
-             "initWithBytes:objCType:");
-         _NS_PRIVATE_DEF_SEL(initWithBytesNoCopy_length_encoding_freeWhenDone_,
-diff -ruN original/Foundation/NSString.hpp patched/Foundation/NSString.hpp
---- original/Foundation/NSString.hpp	2026-02-18 06:41:30
-+++ patched/Foundation/NSString.hpp	2026-02-18 06:41:30
-@@ -104,6 +104,7 @@
- 
-     String*          stringByAppendingString(const String* pString) const;
-     ComparisonResult caseInsensitiveCompare(const String* pString) const;
-+    NS::String* init(const void * bytes, NS::UInteger len, NS::StringEncoding encoding);
- };
- 
- /// Create an NS::String* from a string literal.
-@@ -250,6 +251,11 @@
- _NS_INLINE NS::ComparisonResult NS::String::caseInsensitiveCompare(const String* pString) const
- {
-     return Object::sendMessage<NS::ComparisonResult>(this, _NS_PRIVATE_SEL(caseInsensitiveCompare_), pString);
-+}
-+
-+_NS_INLINE NS::String* NS::String::init(const void * bytes, NS::UInteger len, NS::StringEncoding encoding)
-+{
-+    return Object::sendMessage<NS::String*>(this, _NS_PRIVATE_SEL(initWithBytes_length_encoding_), bytes, len, encoding);
- }
- 
- //-------------------------------------------------------------------------------------------------------------------------------------------------------------
-diff -ruN original/QuartzCore/CALayer.hpp patched/QuartzCore/CALayer.hpp
---- original/QuartzCore/CALayer.hpp	1970-01-01 11:00:00
-+++ patched/QuartzCore/CALayer.hpp	2026-02-18 06:41:30
-@@ -0,0 +1,79 @@
-+#pragma once
-+
-+#include "CADefines.hpp"
-+#include "CAPrivate.hpp"
-+#include "../Foundation/NSObject.hpp"
-+#include <CoreGraphics/CoreGraphics.h>
-+
-+namespace CA
-+{
-+using DynamicRange = NS::String*;
-+
-+_CA_CONST(DynamicRange, DynamicRangeAutomatic);
-+_CA_CONST(DynamicRange, DynamicRangeStandard);
-+_CA_CONST(DynamicRange, DynamicRangeConstrainedHigh);
-+_CA_CONST(DynamicRange, DynamicRangeHigh);
-+
-+
-+class Layer : public NS::Referencing<Layer>
-+{
-+public:
-+    bool wantsExtendedDynamicRangeContent() const;
-+    void setWantsExtendedDynamicRangeContent(bool wantsExtendedDynamicRangeContent);
-+    CA::DynamicRange preferredDynamicRange() const;
-+    void setPreferredDynamicRange(CA::DynamicRange preferredDynamicRange);
-+    CGFloat contentsHeadroom() const;
-+    void setContentsHeadroom(CGFloat contentsHeadroom);
-+    bool opaque() const;
-+    void setOpaque(bool opaque);
-+
-+};
-+
-+} // namespace CA
-+
-+// --- Inline implementations ---
-+
-+_CA_INLINE bool CA::Layer::wantsExtendedDynamicRangeContent() const
-+{
-+    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(wantsExtendedDynamicRangeContent));
-+}
-+
-+_CA_INLINE void CA::Layer::setWantsExtendedDynamicRangeContent(bool wantsExtendedDynamicRangeContent)
-+{
-+    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setWantsExtendedDynamicRangeContent_), wantsExtendedDynamicRangeContent);
-+}
-+
-+_CA_INLINE CA::DynamicRange CA::Layer::preferredDynamicRange() const
-+{
-+    return Object::sendMessage<CA::DynamicRange>(this, _CA_PRIVATE_SEL(preferredDynamicRange));
-+}
-+
-+_CA_INLINE void CA::Layer::setPreferredDynamicRange(CA::DynamicRange preferredDynamicRange)
-+{
-+    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setPreferredDynamicRange_), preferredDynamicRange);
-+}
-+
-+_CA_INLINE CGFloat CA::Layer::contentsHeadroom() const
-+{
-+    return Object::sendMessage<CGFloat>(this, _CA_PRIVATE_SEL(contentsHeadroom));
-+}
-+
-+_CA_INLINE void CA::Layer::setContentsHeadroom(CGFloat contentsHeadroom)
-+{
-+    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setContentsHeadroom_), contentsHeadroom);
-+}
-+
-+_CA_INLINE bool CA::Layer::opaque() const
-+{
-+    return Object::sendMessage<bool>(this, _CA_PRIVATE_SEL(opaque));
-+}
-+
-+_CA_INLINE void CA::Layer::setOpaque(bool opaque)
-+{
-+    Object::sendMessage<void>(this, _CA_PRIVATE_SEL(setOpaque_), opaque);
-+}
-+
-+_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeAutomatic);
-+_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeStandard);
-+_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeConstrainedHigh);
-+_CA_PRIVATE_DEF_CONST(CA::DynamicRange, DynamicRangeHigh);
-diff -ruN original/QuartzCore/CAMetalLayer.hpp patched/QuartzCore/CAMetalLayer.hpp
---- original/QuartzCore/CAMetalLayer.hpp	2026-02-18 06:41:30
-+++ patched/QuartzCore/CAMetalLayer.hpp	2026-02-18 06:41:31
-@@ -32,13 +32,14 @@
- #include "CADefines.hpp"
- #include "CAMetalDrawable.hpp"
- #include "CAPrivate.hpp"
-+#include "CALayer.hpp"
- 
- //-------------------------------------------------------------------------------------------------------------------------------------------------------------
- 
- namespace CA
- {
- 
--class MetalLayer : public NS::Referencing<MetalLayer>
-+class MetalLayer : public NS::Referencing<MetalLayer, Layer>
- {
- public:
-     static class MetalLayer* layer();
-diff -ruN original/QuartzCore/CAPrivate.hpp patched/QuartzCore/CAPrivate.hpp
---- original/QuartzCore/CAPrivate.hpp	2026-02-18 06:41:30
-+++ patched/QuartzCore/CAPrivate.hpp	2026-02-18 06:41:31
-@@ -54,16 +54,49 @@
- #define _CA_PRIVATE_DEF_CLS(symbol) void* s_k##symbol _CA_PRIVATE_VISIBILITY = _CA_PRIVATE_OBJC_LOOKUP_CLASS(symbol)
- #define _CA_PRIVATE_DEF_PRO(symbol) void* s_k##symbol _CA_PRIVATE_VISIBILITY = _CA_PRIVATE_OBJC_GET_PROTOCOL(symbol)
- #define _CA_PRIVATE_DEF_SEL(accessor, symbol) SEL s_k##accessor _CA_PRIVATE_VISIBILITY = sel_registerName(symbol)
-+
-+#include <dlfcn.h>
-+
-+namespace CA::Private
-+{
-+    template <typename _Type>
-+    inline _Type const LoadSymbol(const char* pSymbol)
-+    {
-+        const _Type* pAddress = static_cast<_Type*>(dlsym(RTLD_DEFAULT, pSymbol));
-+
-+        return pAddress ? *pAddress : nullptr;
-+    }
-+} // CA::Private
-+
-+#if defined(__MAC_26_0) || defined(__IPHONE_26_0) || defined(__TVOS_26_0)
-+
- #define _CA_PRIVATE_DEF_STR(type, symbol)                \
-     _CA_EXTERN type const CA##symbol _CA_PRIVATE_IMPORT; \
-     type const                       CA::symbol = (nullptr != &CA##symbol) ? CA##symbol : nullptr
- 
-+#define _CA_PRIVATE_DEF_CONST(type, symbol)              \
-+    _CA_EXTERN type const CA##symbol _CA_PRIVATE_IMPORT; \
-+    type const                         CA::symbol = (nullptr != &CA##symbol) ? CA##symbol : nullptr
-+
- #else
- 
-+#define _CA_PRIVATE_DEF_STR(type, symbol)    \
-+    _CA_EXTERN type const CA##symbol;    \
-+    type const             CA::symbol = CA::Private::LoadSymbol<type>("CA" #symbol)
-+
-+#define _CA_PRIVATE_DEF_CONST(type, symbol)    \
-+    _CA_EXTERN type const CA##symbol;    \
-+    type const             CA::symbol = CA::Private::LoadSymbol<type>("CA" #symbol)
-+
-+#endif
-+
-+#else
-+
- #define _CA_PRIVATE_DEF_CLS(symbol) extern void* s_k##symbol
- #define _CA_PRIVATE_DEF_PRO(symbol) extern void* s_k##symbol
- #define _CA_PRIVATE_DEF_SEL(accessor, symbol) extern SEL s_k##accessor
- #define _CA_PRIVATE_DEF_STR(type, symbol) extern type const CA::symbol
-+#define _CA_PRIVATE_DEF_CONST(type, symbol) extern type const CA::symbol
- 
- #endif // CA_PRIVATE_IMPLEMENTATION
- 
-@@ -76,6 +109,7 @@
-     namespace Class
-     {
-         _CA_PRIVATE_DEF_CLS(CAMetalLayer);
-+            _CA_PRIVATE_DEF_CLS(CALayer);
-     } // Class
- } // Private
- } // CA
-@@ -107,6 +141,8 @@
-             "allowsNextDrawableTimeout");
-         _CA_PRIVATE_DEF_SEL(colorspace,
-             "colorspace");
-+        _CA_PRIVATE_DEF_SEL(contentsHeadroom,
-+            "contentsHeadroom");
-         _CA_PRIVATE_DEF_SEL(device,
-             "device");
-         _CA_PRIVATE_DEF_SEL(displaySyncEnabled,
-@@ -121,14 +157,20 @@
-             "maximumDrawableCount");
-         _CA_PRIVATE_DEF_SEL(nextDrawable,
-             "nextDrawable");
-+        _CA_PRIVATE_DEF_SEL(opaque,
-+            "opaque");
-         _CA_PRIVATE_DEF_SEL(pixelFormat,
-             "pixelFormat");
-+        _CA_PRIVATE_DEF_SEL(preferredDynamicRange,
-+            "preferredDynamicRange");
-         _CA_PRIVATE_DEF_SEL(residencySet,
-             "residencySet");
-         _CA_PRIVATE_DEF_SEL(setAllowsNextDrawableTimeout_,
-             "setAllowsNextDrawableTimeout:");
-         _CA_PRIVATE_DEF_SEL(setColorspace_,
-             "setColorspace:");
-+        _CA_PRIVATE_DEF_SEL(setContentsHeadroom_,
-+            "setContentsHeadroom:");
-         _CA_PRIVATE_DEF_SEL(setDevice_,
-             "setDevice:");
-         _CA_PRIVATE_DEF_SEL(setDisplaySyncEnabled_,
-@@ -139,10 +181,19 @@
-             "setFramebufferOnly:");
-         _CA_PRIVATE_DEF_SEL(setMaximumDrawableCount_,
-             "setMaximumDrawableCount:");
-+        _CA_PRIVATE_DEF_SEL(setOpaque_,
-+            "setOpaque:");
-         _CA_PRIVATE_DEF_SEL(setPixelFormat_,
-             "setPixelFormat:");
-+        _CA_PRIVATE_DEF_SEL(setPreferredDynamicRange_,
-+            "setPreferredDynamicRange:");
-+        _CA_PRIVATE_DEF_SEL(setWantsExtendedDynamicRangeContent_,
-+            "setWantsExtendedDynamicRangeContent:");
-         _CA_PRIVATE_DEF_SEL(texture,
-             "texture");
-+        _CA_PRIVATE_DEF_SEL(wantsExtendedDynamicRangeContent,
-+            "wantsExtendedDynamicRangeContent");
-+
-     } // Class
- } // Private
- } // CA
-diff -ruN original/QuartzCore/QuartzCore.hpp patched/QuartzCore/QuartzCore.hpp
---- original/QuartzCore/QuartzCore.hpp	2026-02-18 06:41:30
-+++ patched/QuartzCore/QuartzCore.hpp	2026-02-18 06:41:31
-@@ -22,6 +22,7 @@
- 
- //-------------------------------------------------------------------------------------------------------------------------------------------------------------
- 
-+#include "CALayer.hpp"
- #include "CAMetalDrawable.hpp"
- #include "CAMetalLayer.hpp"
- 
diff --git a/engine/thirdparty/metal-cpp/update-metal-cpp.sh b/engine/thirdparty/metal-cpp/update-metal-cpp.sh
deleted file mode 100755
index 19e42b8c..00000000
--- a/engine/thirdparty/metal-cpp/update-metal-cpp.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash -e
-
-# metal-cpp update script for Godot
-#
-# metal-cpp source: https://developer.apple.com/metal/cpp/
-# This version includes Metal 4 APIs (macOS 26 / iOS 26).
-
-VERSION="macOS26-iOS26"
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-
-# If a zip is provided as argument, extract it
-if [ -n "$1" ]; then
-    echo "Updating metal-cpp from: $1"
-
-    rm -rf \
-        "$SCRIPT_DIR/Foundation" \
-        "$SCRIPT_DIR/Metal" \
-        "$SCRIPT_DIR/MetalFX" \
-        "$SCRIPT_DIR/QuartzCore" \
-        "$SCRIPT_DIR/SingleHeader"
-
-    unzip -q "$1" -d "$SCRIPT_DIR"
-
-    echo "Extracted metal-cpp $VERSION"
-else
-    echo "Applying patches only..."
-fi
-
-# =============================================================================
-# Apply Godot-specific patches
-# =============================================================================
-
-echo "Applying Godot compatibility patches..."
-
-# Apply patch files (idempotent)
-PATCH_DIR="$SCRIPT_DIR/patches"
-if [ -d "$PATCH_DIR" ]; then
-    for PATCH in "$PATCH_DIR"/*.patch; do
-        if [ ! -e "$PATCH" ]; then
-            echo "  No patches found in $PATCH_DIR"
-            break
-        fi
-
-        PATCH_NAME="$(basename "$PATCH")"
-        if git -C "$REPO_ROOT" apply --check "$PATCH" > /dev/null 2>&1; then
-            git -C "$REPO_ROOT" apply "$PATCH"
-            echo "  $PATCH_NAME: applied"
-        elif git -C "$REPO_ROOT" apply --reverse --check "$PATCH" > /dev/null 2>&1; then
-            echo "  $PATCH_NAME: already applied"
-        else
-            echo "  $PATCH_NAME: failed to apply"
-            exit 1
-        fi
-    done
-else
-    echo "  Warning: $PATCH_DIR not found"
-fi
-
-echo "Done."
diff --git a/engine/thirdparty/sdl/core/linux/SDL_udev.c b/engine/thirdparty/sdl/core/linux/SDL_udev.c
index d9e7e118..fbf2ff04 100644
--- a/engine/thirdparty/sdl/core/linux/SDL_udev.c
+++ b/engine/thirdparty/sdl/core/linux/SDL_udev.c
@@ -277,43 +277,6 @@ bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *pr
     return true;
 }
 
-bool SDL_UDEV_GetProductSerial(const char *device_path, const char **serial)
-{
-    struct stat statbuf;
-    char type;
-    struct udev_device *dev;
-    const char *val;
-
-    if (!_this) {
-        return false;
-    }
-
-    if (stat(device_path, &statbuf) < 0) {
-        return false;
-    }
-
-    if (S_ISBLK(statbuf.st_mode)) {
-        type = 'b';
-    } else if (S_ISCHR(statbuf.st_mode)) {
-        type = 'c';
-    } else {
-        return false;
-    }
-
-    dev = _this->syms.udev_device_new_from_devnum(_this->udev, type, statbuf.st_rdev);
-    if (!dev) {
-        return false;
-    }
-
-    val = _this->syms.udev_device_get_property_value(dev, "ID_SERIAL_SHORT");
-    if (val) {
-        *serial = val;
-        return true;
-    }
-
-    return false;
-}
-
 void SDL_UDEV_UnloadLibrary(void)
 {
     if (!_this) {
diff --git a/engine/thirdparty/sdl/core/linux/SDL_udev.h b/engine/thirdparty/sdl/core/linux/SDL_udev.h
index 9b18fa22..50bed362 100644
--- a/engine/thirdparty/sdl/core/linux/SDL_udev.h
+++ b/engine/thirdparty/sdl/core/linux/SDL_udev.h
@@ -31,7 +31,7 @@
 #endif
 
 //#include <libudev.h>
-#include <thirdparty/linuxbsd_headers/udev/libudev.h>
+#include "thirdparty/linuxbsd_headers/udev/libudev.h"
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -104,7 +104,6 @@ extern bool SDL_UDEV_LoadLibrary(void);
 extern void SDL_UDEV_Poll(void);
 extern bool SDL_UDEV_Scan(void);
 extern bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *product, Uint16 *version, int *class);
-extern bool SDL_UDEV_GetProductSerial(const char *device_path, const char **serial);
 extern bool SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
 extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
 extern const SDL_UDEV_Symbols *SDL_UDEV_GetUdevSyms(void);
diff --git a/engine/thirdparty/sdl/haptic/dummy/SDL_syshaptic.c b/engine/thirdparty/sdl/haptic/dummy/SDL_syshaptic.c
deleted file mode 100644
index 81f711f0..00000000
--- a/engine/thirdparty/sdl/haptic/dummy/SDL_syshaptic.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-#include "SDL_internal.h"
-
-#if defined(SDL_HAPTIC_DUMMY) || defined(SDL_HAPTIC_DISABLED)
-
-#include "../SDL_syshaptic.h"
-
-static bool SDL_SYS_LogicError(void)
-{
-    return SDL_SetError("Logic error: No haptic devices available.");
-}
-
-bool SDL_SYS_HapticInit(void)
-{
-    return true;
-}
-
-int SDL_SYS_NumHaptics(void)
-{
-    return 0;
-}
-
-SDL_HapticID SDL_SYS_HapticInstanceID(int index)
-{
-    SDL_SYS_LogicError();
-    return 0;
-}
-
-const char *SDL_SYS_HapticName(int index)
-{
-    SDL_SYS_LogicError();
-    return NULL;
-}
-
-bool SDL_SYS_HapticOpen(SDL_Haptic *haptic)
-{
-    return SDL_SYS_LogicError();
-}
-
-int SDL_SYS_HapticMouse(void)
-{
-    return -1;
-}
-
-bool SDL_SYS_JoystickIsHaptic(SDL_Joystick *joystick)
-{
-    return false;
-}
-
-bool SDL_SYS_HapticOpenFromJoystick(SDL_Haptic *haptic, SDL_Joystick *joystick)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_JoystickSameHaptic(SDL_Haptic *haptic, SDL_Joystick *joystick)
-{
-    return false;
-}
-
-void SDL_SYS_HapticClose(SDL_Haptic *haptic)
-{
-    return;
-}
-
-void SDL_SYS_HapticQuit(void)
-{
-    return;
-}
-
-bool SDL_SYS_HapticNewEffect(SDL_Haptic *haptic,
-                            struct haptic_effect *effect, const SDL_HapticEffect *base)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticUpdateEffect(SDL_Haptic *haptic,
-                               struct haptic_effect *effect,
-                               const SDL_HapticEffect *data)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticRunEffect(SDL_Haptic *haptic, struct haptic_effect *effect,
-                            Uint32 iterations)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticStopEffect(SDL_Haptic *haptic, struct haptic_effect *effect)
-{
-    return SDL_SYS_LogicError();
-}
-
-void SDL_SYS_HapticDestroyEffect(SDL_Haptic *haptic, struct haptic_effect *effect)
-{
-    SDL_SYS_LogicError();
-    return;
-}
-
-int SDL_SYS_HapticGetEffectStatus(SDL_Haptic *haptic,
-                                  struct haptic_effect *effect)
-{
-    SDL_SYS_LogicError();
-    return -1;
-}
-
-bool SDL_SYS_HapticSetGain(SDL_Haptic *haptic, int gain)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticSetAutocenter(SDL_Haptic *haptic, int autocenter)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticPause(SDL_Haptic *haptic)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticResume(SDL_Haptic *haptic)
-{
-    return SDL_SYS_LogicError();
-}
-
-bool SDL_SYS_HapticStopAll(SDL_Haptic *haptic)
-{
-    return SDL_SYS_LogicError();
-}
-
-#endif // SDL_HAPTIC_DUMMY || SDL_HAPTIC_DISABLED
diff --git a/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m b/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
index 3e8f4a8b..48e90517 100644
--- a/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
+++ b/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
@@ -158,13 +158,6 @@ static bool IsControllerSwitchJoyConPair(GCController *controller)
     }
     return false;
 }
-static bool IsControllerNVIDIASHIELD(GCController *controller)
-{
-    if ([controller.vendorName hasPrefix:@"NVIDIA Controller"]) {
-        return true;
-    }
-    return false;
-}
 static bool IsControllerStadia(GCController *controller)
 {
     if ([controller.vendorName hasPrefix:@"Stadia"]) {
@@ -346,7 +339,6 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
     device->is_ps5 = IsControllerPS5(controller);
     device->is_switch_pro = IsControllerSwitchPro(controller);
     device->is_switch_joycon_pair = IsControllerSwitchJoyConPair(controller);
-    device->is_shield = IsControllerNVIDIASHIELD(controller);
     device->is_stadia = IsControllerStadia(controller);
     device->is_backbone_one = IsControllerBackboneOne(controller);
     device->is_switch_joyconL = IsControllerSwitchJoyConL(controller);
@@ -358,7 +350,6 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
         (device->is_ps5 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS5)) ||
         (device->is_switch_pro && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO)) ||
         (device->is_switch_joycon_pair && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_PAIR, 0, "")) ||
-        (device->is_shield && HIDAPI_IsDevicePresent(USB_VENDOR_NVIDIA, USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104, 0, "")) ||
         (device->is_stadia && HIDAPI_IsDevicePresent(USB_VENDOR_GOOGLE, USB_PRODUCT_GOOGLE_STADIA_CONTROLLER, 0, "")) ||
         (device->is_switch_joyconL && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_LEFT, 0, "")) ||
         (device->is_switch_joyconR && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_RIGHT, 0, ""))) {
@@ -495,7 +486,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
         subtype = 4;
 
 #ifdef DEBUG_CONTROLLER_PROFILE
-        NSLog(@"Elements used:\n");
+        NSLog(@"Elements used:\n", controller.vendorName);
         for (id key in device->buttons) {
             NSLog(@"\tButton: %@ (%s)\n", key, elements[key].analog ? "analog" : "digital");
         }
diff --git a/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h b/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
index dfa76159..783b3f48 100644
--- a/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
+++ b/engine/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
@@ -53,7 +53,6 @@ typedef struct joystick_hwdata
     bool is_switch_joycon_pair;
     bool is_switch_joyconL;
     bool is_switch_joyconR;
-    bool is_shield;
     bool is_stadia;
     bool is_backbone_one;
     int is_siri_remote;
diff --git a/engine/thirdparty/sdl/joystick/hidapi/SDL_hidapi_switch.c b/engine/thirdparty/sdl/joystick/hidapi/SDL_hidapi_switch.c
index 580a6bd2..8585b284 100644
--- a/engine/thirdparty/sdl/joystick/hidapi/SDL_hidapi_switch.c
+++ b/engine/thirdparty/sdl/joystick/hidapi/SDL_hidapi_switch.c
@@ -1780,24 +1780,16 @@ static Uint32 HIDAPI_DriverSwitch_GetJoystickCapabilities(SDL_HIDAPI_Device *dev
     if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_ProController && !ctx->m_bInputOnly) {
         // Doesn't have an RGB LED, so don't return SDL_JOYSTICK_CAP_RGB_LED here
         result |= SDL_JOYSTICK_CAP_RUMBLE;
-		// But has the HOME LED, so
-		result |= SDL_JOYSTICK_CAP_MONO_LED;
     } else if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConLeft ||
                ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConRight) {
         result |= SDL_JOYSTICK_CAP_RUMBLE;
-		if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_JoyConRight) {
-			result |= SDL_JOYSTICK_CAP_MONO_LED; // Those types of controllers also have the Home LED.
-		}
     }
-
     return result;
 }
 
 static bool HIDAPI_DriverSwitch_SetJoystickLED(SDL_HIDAPI_Device *device, SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue)
 {
-	SDL_DriverSwitch_Context *ctx = (SDL_DriverSwitch_Context *)device->context;
-	int value = (int)((SDL_max(red, SDL_max(green, blue)) / 255.0f) * 100.0f); // The colors are received between 0-255 and we need them to be 0-100.
-	return SetHomeLED(ctx, (Uint8)value);
+    return SDL_Unsupported();
 }
 
 static bool HIDAPI_DriverSwitch_SendJoystickEffect(SDL_HIDAPI_Device *device, SDL_Joystick *joystick, const void *data, int size)
diff --git a/engine/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c b/engine/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
index 4f86bc8a..7d936d4c 100644
--- a/engine/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
+++ b/engine/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
@@ -1591,13 +1591,6 @@ static bool LINUX_JoystickOpen(SDL_Joystick *joystick, int device_index)
         item_sensor->hwdata = joystick->hwdata;
     }
 
-    #ifdef SDL_USE_LIBUDEV
-    const char *serial = NULL;
-    if (SDL_UDEV_GetProductSerial(item->path, &serial)) {
-        joystick->serial = SDL_strdup(serial);
-    }
-    #endif
-
     // mark joystick as fresh and ready
     joystick->hwdata->fresh = true;
 
diff --git a/engine/thirdparty/sdl/loadso/dummy/SDL_sysloadso.c b/engine/thirdparty/sdl/loadso/dummy/SDL_sysloadso.c
deleted file mode 100644
index 733386ba..00000000
--- a/engine/thirdparty/sdl/loadso/dummy/SDL_sysloadso.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-#include "SDL_internal.h"
-
-#if defined(SDL_LOADSO_DUMMY)
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-// System dependent library loading routines
-
-SDL_SharedObject *SDL_LoadObject(const char *sofile)
-{
-    SDL_Unsupported();
-    return NULL;
-}
-
-SDL_FunctionPointer SDL_LoadFunction(SDL_SharedObject *handle, const char *name)
-{
-    SDL_Unsupported();
-    return NULL;
-}
-
-void SDL_UnloadObject(SDL_SharedObject *handle)
-{
-    // no-op.
-}
-
-#endif // SDL_LOADSO_DUMMY
diff --git a/engine/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch b/engine/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch
index e3af445a..491ef726 100644
--- a/engine/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch
+++ b/engine/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch
@@ -55,7 +55,7 @@ index 738f4bafe3f..50bed36248e 100644
  
 -#include <libudev.h>
 +//#include <libudev.h>
-+#include <thirdparty/linuxbsd_headers/udev/libudev.h>
++#include "thirdparty/linuxbsd_headers/udev/libudev.h"
  #include <sys/time.h>
  #include <sys/types.h>
  
diff --git a/engine/thirdparty/sdl/patches/0007-shield-duplicate-macos.patch b/engine/thirdparty/sdl/patches/0007-shield-duplicate-macos.patch
deleted file mode 100644
index 9795f7bf..00000000
--- a/engine/thirdparty/sdl/patches/0007-shield-duplicate-macos.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m b/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
-index 48e9051798..3e8f4a8bab 100644
---- a/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
-+++ b/thirdparty/sdl/joystick/apple/SDL_mfijoystick.m
-@@ -158,6 +158,13 @@ static bool IsControllerSwitchJoyConPair(GCController *controller)
-     }
-     return false;
- }
-+static bool IsControllerNVIDIASHIELD(GCController *controller)
-+{
-+    if ([controller.vendorName hasPrefix:@"NVIDIA Controller"]) {
-+        return true;
-+    }
-+    return false;
-+}
- static bool IsControllerStadia(GCController *controller)
- {
-     if ([controller.vendorName hasPrefix:@"Stadia"]) {
-@@ -339,6 +346,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
-     device->is_ps5 = IsControllerPS5(controller);
-     device->is_switch_pro = IsControllerSwitchPro(controller);
-     device->is_switch_joycon_pair = IsControllerSwitchJoyConPair(controller);
-+    device->is_shield = IsControllerNVIDIASHIELD(controller);
-     device->is_stadia = IsControllerStadia(controller);
-     device->is_backbone_one = IsControllerBackboneOne(controller);
-     device->is_switch_joyconL = IsControllerSwitchJoyConL(controller);
-@@ -350,6 +358,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
-         (device->is_ps5 && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_PS5)) ||
-         (device->is_switch_pro && HIDAPI_IsDeviceTypePresent(SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO)) ||
-         (device->is_switch_joycon_pair && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_PAIR, 0, "")) ||
-+        (device->is_shield && HIDAPI_IsDevicePresent(USB_VENDOR_NVIDIA, USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104, 0, "")) ||
-         (device->is_stadia && HIDAPI_IsDevicePresent(USB_VENDOR_GOOGLE, USB_PRODUCT_GOOGLE_STADIA_CONTROLLER, 0, "")) ||
-         (device->is_switch_joyconL && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_LEFT, 0, "")) ||
-         (device->is_switch_joyconR && HIDAPI_IsDevicePresent(USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH_JOYCON_RIGHT, 0, ""))) {
-@@ -486,7 +495,7 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
-         subtype = 4;
- 
- #ifdef DEBUG_CONTROLLER_PROFILE
--        NSLog(@"Elements used:\n", controller.vendorName);
-+        NSLog(@"Elements used:\n");
-         for (id key in device->buttons) {
-             NSLog(@"\tButton: %@ (%s)\n", key, elements[key].analog ? "analog" : "digital");
-         }
-diff --git a/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h b/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
-index 783b3f488c..dfa7615964 100644
---- a/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
-+++ b/thirdparty/sdl/joystick/apple/SDL_mfijoystick_c.h
-@@ -53,6 +53,7 @@ typedef struct joystick_hwdata
-     bool is_switch_joycon_pair;
-     bool is_switch_joyconL;
-     bool is_switch_joyconR;
-+    bool is_shield;
-     bool is_stadia;
-     bool is_backbone_one;
-     int is_siri_remote;
diff --git a/engine/thirdparty/sdl/patches/0008-fix-linux-joycon-serial-num.patch b/engine/thirdparty/sdl/patches/0008-fix-linux-joycon-serial-num.patch
deleted file mode 100644
index 7491f527..00000000
--- a/engine/thirdparty/sdl/patches/0008-fix-linux-joycon-serial-num.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/thirdparty/sdl/core/linux/SDL_udev.c b/thirdparty/sdl/core/linux/SDL_udev.c
-index fbf2ff0444..d9e7e11849 100644
---- a/thirdparty/sdl/core/linux/SDL_udev.c
-+++ b/thirdparty/sdl/core/linux/SDL_udev.c
-@@ -277,6 +277,43 @@ bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *pr
-     return true;
- }
- 
-+bool SDL_UDEV_GetProductSerial(const char *device_path, const char **serial)
-+{
-+    struct stat statbuf;
-+    char type;
-+    struct udev_device *dev;
-+    const char *val;
-+
-+    if (!_this) {
-+        return false;
-+    }
-+
-+    if (stat(device_path, &statbuf) < 0) {
-+        return false;
-+    }
-+
-+    if (S_ISBLK(statbuf.st_mode)) {
-+        type = 'b';
-+    } else if (S_ISCHR(statbuf.st_mode)) {
-+        type = 'c';
-+    } else {
-+        return false;
-+    }
-+
-+    dev = _this->syms.udev_device_new_from_devnum(_this->udev, type, statbuf.st_rdev);
-+    if (!dev) {
-+        return false;
-+    }
-+
-+    val = _this->syms.udev_device_get_property_value(dev, "ID_SERIAL_SHORT");
-+    if (val) {
-+        *serial = val;
-+        return true;
-+    }
-+
-+    return false;
-+}
-+
- void SDL_UDEV_UnloadLibrary(void)
- {
-     if (!_this) {
-diff --git a/thirdparty/sdl/core/linux/SDL_udev.h b/thirdparty/sdl/core/linux/SDL_udev.h
-index 50bed36248..05b79342cd 100644
---- a/thirdparty/sdl/core/linux/SDL_udev.h
-+++ b/thirdparty/sdl/core/linux/SDL_udev.h
-@@ -104,6 +104,7 @@ extern bool SDL_UDEV_LoadLibrary(void);
- extern void SDL_UDEV_Poll(void);
- extern bool SDL_UDEV_Scan(void);
- extern bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *product, Uint16 *version, int *class);
-+extern bool SDL_UDEV_GetProductSerial(const char *device_path, const char **serial);
- extern bool SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
- extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
- extern const SDL_UDEV_Symbols *SDL_UDEV_GetUdevSyms(void);
-diff --git a/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c b/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
-index ea73821c06..70fed1cf57 100644
---- a/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
-+++ b/thirdparty/sdl/joystick/linux/SDL_sysjoystick.c
-@@ -1587,6 +1587,13 @@ static bool LINUX_JoystickOpen(SDL_Joystick *joystick, int device_index)
-         item_sensor->hwdata = joystick->hwdata;
-     }
- 
-+    #ifdef SDL_USE_LIBUDEV
-+    const char *serial = NULL;
-+    if (SDL_UDEV_GetProductSerial(item->path, &serial)) {
-+        joystick->serial = SDL_strdup(serial);
-+    }
-+    #endif
-+
-     // mark joystick as fresh and ready
-     joystick->hwdata->fresh = true;
- 
diff --git a/engine/thirdparty/sdl/update-sdl.sh b/engine/thirdparty/sdl/update-sdl.sh
index 08d0e32b..6c68a415 100755
--- a/engine/thirdparty/sdl/update-sdl.sh
+++ b/engine/thirdparty/sdl/update-sdl.sh
@@ -52,13 +52,13 @@ rm -f $target/core/windows/version.rc
 rm -f $target/core/linux/SDL_{fcitx,ibus,ime,system_theme}.*
 
 mkdir $target/haptic
-cp -rv haptic/{*.{c,h},darwin,dummy,linux,windows} $target/haptic
+cp -rv haptic/{*.{c,h},darwin,linux,windows} $target/haptic
 
 mkdir $target/joystick
 cp -rv joystick/{*.{c,h},apple,darwin,hidapi,linux,windows} $target/joystick
 
 mkdir $target/loadso
-cp -rv loadso/{dlopen,dummy} $target/loadso
+cp -rv loadso/dlopen $target/loadso
 
 mkdir $target/sensor
 cp -rv sensor/{*.{c,h},dummy,windows} $target/sensor
diff --git a/engine/thirdparty/spirv-cross/spirv_cfg.cpp b/engine/thirdparty/spirv-cross/spirv_cfg.cpp
index c68886d9..93299479 100644
--- a/engine/thirdparty/spirv-cross/spirv_cfg.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_cfg.cpp
@@ -81,105 +81,31 @@ bool CFG::is_back_edge(uint32_t to) const
 	// We have a back edge if the visit order is set with the temporary magic value 0.
 	// Crossing edges will have already been recorded with a visit order.
 	auto itr = visit_order.find(to);
-	return itr != end(visit_order) && itr->second.visited_branches && !itr->second.visited_resolve;
+	return itr != end(visit_order) && itr->second.get() == 0;
 }
 
-bool CFG::has_visited_branch(uint32_t to) const
+bool CFG::has_visited_forward_edge(uint32_t to) const
 {
+	// If > 0, we have visited the edge already, and this is not a back edge branch.
 	auto itr = visit_order.find(to);
-	return itr != end(visit_order) && itr->second.visited_branches;
+	return itr != end(visit_order) && itr->second.get() > 0;
 }
 
-void CFG::post_order_visit_entry(uint32_t block)
+bool CFG::post_order_visit(uint32_t block_id)
 {
-	visit_stack.push_back(block);
+	// If we have already branched to this block (back edge), stop recursion.
+	// If our branches are back-edges, we do not record them.
+	// We have to record crossing edges however.
+	if (has_visited_forward_edge(block_id))
+		return true;
+	else if (is_back_edge(block_id))
+		return false;
 
-	while (!visit_stack.empty())
-	{
-		bool keep_iterating;
-		do
-		{
-			// Reverse the order to allow for stack-like behavior and preserves the visit order from recursive algorithm.
-			// Traverse depth first.
-			uint32_t to_visit = visit_stack.back();
-			last_visited_size = visit_stack.size();
-			post_order_visit_branches(to_visit);
-			keep_iterating = last_visited_size != visit_stack.size();
-			if (keep_iterating)
-				std::reverse(visit_stack.begin() + last_visited_size, visit_stack.end());
-		} while (keep_iterating);
+	// Block back-edges from recursively revisiting ourselves.
+	visit_order[block_id].get() = 0;
 
-		// We've reached the end of some tree leaf. Resolve the stack.
-		// Any node which has been visited for real can be popped now.
-		while (!visit_stack.empty() && visit_order[visit_stack.back()].visited_branches)
-		{
-			post_order_visit_resolve(visit_stack.back());
-			visit_stack.pop_back();
-		}
-	}
-}
-
-void CFG::visit_branch(uint32_t block_id)
-{
-	// Prune obvious duplicates.
-	if (std::find(visit_stack.begin() + last_visited_size, visit_stack.end(), block_id) == visit_stack.end() &&
-	    !has_visited_branch(block_id))
-	{
-		visit_stack.push_back(block_id);
-	}
-}
-
-void CFG::post_order_visit_branches(uint32_t block_id)
-{
 	auto &block = compiler.get<SPIRBlock>(block_id);
 
-	auto &visit = visit_order[block_id];
-	if (visit.visited_branches)
-		return;
-	visit.visited_branches = true;
-
-	if (block.merge == SPIRBlock::MergeLoop)
-		visit_branch(block.merge_block);
-	else if (block.merge == SPIRBlock::MergeSelection)
-		visit_branch(block.next_block);
-
-	// First visit our branch targets.
-	switch (block.terminator)
-	{
-	case SPIRBlock::Direct:
-		visit_branch(block.next_block);
-		break;
-
-	case SPIRBlock::Select:
-		visit_branch(block.true_block);
-		visit_branch(block.false_block);
-		break;
-
-	case SPIRBlock::MultiSelect:
-	{
-		const auto &cases = compiler.get_case_list(block);
-		for (const auto &target : cases)
-			visit_branch(target.block);
-		if (block.default_block)
-			visit_branch(block.default_block);
-		break;
-	}
-
-	default:
-		break;
-	}
-}
-
-void CFG::post_order_visit_resolve(uint32_t block_id)
-{
-	auto &block = compiler.get<SPIRBlock>(block_id);
-
-	auto &visit_block = visit_order[block_id];
-	assert(visit_block.visited_branches);
-	auto &visited = visit_order[block_id].visited_resolve;
-	if (visited)
-		return;
-
 	// If this is a loop header, add an implied branch to the merge target.
 	// This is needed to avoid annoying cases with do { ... } while(false) loops often generated by inliners.
 	// To the CFG, this is linear control flow, but we risk picking the do/while scope as our dominating block.
@@ -190,21 +116,21 @@ void CFG::post_order_visit_resolve(uint32_t block_id)
 	// is lower than inside the loop, which is going to be key for some traversal algorithms like post-dominance analysis.
 	// For selection constructs true/false blocks will end up visiting the merge block directly and it works out fine,
 	// but for loops, only the header might end up actually branching to merge block.
-	if (block.merge == SPIRBlock::MergeLoop && !is_back_edge(block.merge_block))
+	if (block.merge == SPIRBlock::MergeLoop && post_order_visit(block.merge_block))
 		add_branch(block_id, block.merge_block);
 
 	// First visit our branch targets.
 	switch (block.terminator)
 	{
 	case SPIRBlock::Direct:
-		if (!is_back_edge(block.next_block))
+		if (post_order_visit(block.next_block))
 			add_branch(block_id, block.next_block);
 		break;
 
 	case SPIRBlock::Select:
-		if (!is_back_edge(block.true_block))
+		if (post_order_visit(block.true_block))
 			add_branch(block_id, block.true_block);
-		if (!is_back_edge(block.false_block))
+		if (post_order_visit(block.false_block))
 			add_branch(block_id, block.false_block);
 		break;
 
@@ -213,10 +139,10 @@ void CFG::post_order_visit_resolve(uint32_t block_id)
 		const auto &cases = compiler.get_case_list(block);
 		for (const auto &target : cases)
 		{
-			if (!is_back_edge(target.block))
+			if (post_order_visit(target.block))
 				add_branch(block_id, target.block);
 		}
-		if (block.default_block && !is_back_edge(block.default_block))
+		if (block.default_block && post_order_visit(block.default_block))
 			add_branch(block_id, block.default_block);
 		break;
 	}
@@ -231,7 +157,7 @@ void CFG::post_order_visit_resolve(uint32_t block_id)
 	// We can use the variable without a Phi since there is only one possible parent here.
 	// However, in this case, we need to hoist out the inner variable to outside the branch.
 	// Use same strategy as loops.
-	if (block.merge == SPIRBlock::MergeSelection && !is_back_edge(block.next_block))
+	if (block.merge == SPIRBlock::MergeSelection && post_order_visit(block.next_block))
 	{
 		// If there is only one preceding edge to the merge block and it's not ourselves, we need a fixup.
 		// Add a fake branch so any dominator in either the if (), or else () block, or a lone case statement
@@ -275,9 +201,10 @@ void CFG::post_order_visit_resolve(uint32_t block_id)
 		}
 	}
 
-	visited = true;
-	visit_block.order = ++visit_count;
+	// Then visit ourselves. Start counting at one, to let 0 be a magic value for testing back vs. crossing edges.
+	visit_order[block_id].get() = ++visit_count;
 	post_order.push_back(block_id);
+	return true;
 }
 
 void CFG::build_post_order_visit_order()
@@ -286,12 +213,11 @@ void CFG::build_post_order_visit_order()
 	visit_count = 0;
 	visit_order.clear();
 	post_order.clear();
-	post_order_visit_entry(block);
+	post_order_visit(block);
 }
 
 void CFG::add_branch(uint32_t from, uint32_t to)
 {
-	assert(from && to);
 	const auto add_unique = [](SmallVector<uint32_t> &l, uint32_t value) {
 		auto itr = find(begin(l), end(l), value);
 		if (itr == end(l))
diff --git a/engine/thirdparty/spirv-cross/spirv_cfg.hpp b/engine/thirdparty/spirv-cross/spirv_cfg.hpp
index 1c21ea07..1d85fe0a 100644
--- a/engine/thirdparty/spirv-cross/spirv_cfg.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_cfg.hpp
@@ -68,7 +68,7 @@ public:
 	{
 		auto itr = visit_order.find(block);
 		assert(itr != std::end(visit_order));
-		int v = itr->second.order;
+		int v = itr->second.get();
 		assert(v > 0);
 		return uint32_t(v);
 	}
@@ -114,9 +114,17 @@ public:
 private:
 	struct VisitOrder
 	{
-		int order = -1;
-		bool visited_resolve = false;
-		bool visited_branches = false;
+		int &get()
+		{
+			return v;
+		}
+
+		const int &get() const
+		{
+			return v;
+		}
+
+		int v = -1;
 	};
 
 	Compiler &compiler;
@@ -131,17 +139,11 @@ private:
 	void add_branch(uint32_t from, uint32_t to);
 	void build_post_order_visit_order();
 	void build_immediate_dominators();
-	void post_order_visit_branches(uint32_t block);
-	void post_order_visit_resolve(uint32_t block);
-	void post_order_visit_entry(uint32_t block);
+	bool post_order_visit(uint32_t block);
 	uint32_t visit_count = 0;
 
 	bool is_back_edge(uint32_t to) const;
-	bool has_visited_branch(uint32_t to) const;
-	void visit_branch(uint32_t block_id);
-
-	SmallVector<uint32_t> visit_stack;
-	size_t last_visited_size = 0;
+	bool has_visited_forward_edge(uint32_t to) const;
 };
 
 class DominatorBuilder
diff --git a/engine/thirdparty/spirv-cross/spirv_common.hpp b/engine/thirdparty/spirv-cross/spirv_common.hpp
index 02d84230..4780d275 100644
--- a/engine/thirdparty/spirv-cross/spirv_common.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_common.hpp
@@ -27,17 +27,8 @@
 #ifndef SPV_ENABLE_UTILITY_CODE
 #define SPV_ENABLE_UTILITY_CODE
 #endif
-
-// Pragmatic hack to avoid symbol conflicts when including both hpp11 and hpp headers in same translation unit.
-// This is an unfortunate SPIRV-Headers issue that we cannot easily deal with ourselves.
-#ifdef SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#define spv SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#define SPIRV_CROSS_SPV_HEADER_NAMESPACE SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#else
-#define SPIRV_CROSS_SPV_HEADER_NAMESPACE spv
-#endif
-
 #include "spirv.hpp"
+
 #include "spirv_cross_containers.hpp"
 #include "spirv_cross_error_handling.hpp"
 #include <functional>
@@ -583,7 +574,6 @@ struct SPIRType : IVariant
 		Sampler,
 		AccelerationStructure,
 		RayQuery,
-		CoopVecNV,
 
 		// Keep internal types at the end.
 		ControlPointArray,
@@ -593,9 +583,7 @@ struct SPIRType : IVariant
 		MeshGridProperties,
 		BFloat16,
 		FloatE4M3,
-		FloatE5M2,
-
-		Tensor
+		FloatE5M2
 	};
 
 	// Scalar/vector/matrix support.
@@ -620,29 +608,13 @@ struct SPIRType : IVariant
 	bool pointer = false;
 	bool forward_pointer = false;
 
-	union
+	struct
 	{
-		struct
-		{
-			uint32_t use_id;
-			uint32_t rows_id;
-			uint32_t columns_id;
-			uint32_t scope_id;
-		} cooperative;
-
-		struct
-		{
-			uint32_t component_type_id;
-			uint32_t component_count_id;
-		} coopVecNV;
-
-		struct
-		{
-			uint32_t type;
-			uint32_t rank;
-			uint32_t shape;
-		} tensor;
-	} ext;
+		uint32_t use_id = 0;
+		uint32_t rows_id = 0;
+		uint32_t columns_id = 0;
+		uint32_t scope_id = 0;
+	} cooperative;
 
 	spv::StorageClass storage = spv::StorageClassGeneric;
 
@@ -700,12 +672,6 @@ struct SPIRExtension : IVariant
 		NonSemanticGeneric
 	};
 
-	enum ShaderDebugInfoOps
-	{
-		DebugLine = 103,
-		DebugSource = 35
-	};
-
 	explicit SPIRExtension(Extension ext_)
 	    : ext(ext_)
 	{
@@ -732,10 +698,6 @@ struct SPIREntryPoint
 	std::string name;
 	std::string orig_name;
 	std::unordered_map<uint32_t, uint32_t> fp_fast_math_defaults;
-	bool signed_zero_inf_nan_preserve_8 = false;
-	bool signed_zero_inf_nan_preserve_16 = false;
-	bool signed_zero_inf_nan_preserve_32 = false;
-	bool signed_zero_inf_nan_preserve_64 = false;
 	SmallVector<VariableID> interface_variables;
 
 	Bitset flags;
@@ -968,7 +930,6 @@ struct SPIRBlock : IVariant
 	// All access to these variables are dominated by this block,
 	// so before branching anywhere we need to make sure that we declare these variables.
 	SmallVector<VariableID> dominated_variables;
-	SmallVector<bool> rearm_dominated_variables;
 
 	// These are variables which should be declared in a for loop header, if we
 	// fail to use a classic for-loop,
@@ -1864,8 +1825,7 @@ private:
 
 static inline bool type_is_floating_point(const SPIRType &type)
 {
-	return type.basetype == SPIRType::Half || type.basetype == SPIRType::Float || type.basetype == SPIRType::Double ||
-	       type.basetype == SPIRType::BFloat16 || type.basetype == SPIRType::FloatE5M2 || type.basetype == SPIRType::FloatE4M3;
+	return type.basetype == SPIRType::Half || type.basetype == SPIRType::Float || type.basetype == SPIRType::Double;
 }
 
 static inline bool type_is_integral(const SPIRType &type)
@@ -2050,7 +2010,4 @@ struct hash<SPIRV_CROSS_NAMESPACE::TypedID<type>>
 };
 } // namespace std
 
-#ifdef SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#undef spv
-#endif
 #endif
diff --git a/engine/thirdparty/spirv-cross/spirv_cross.cpp b/engine/thirdparty/spirv-cross/spirv_cross.cpp
index 2204e391..350eff34 100644
--- a/engine/thirdparty/spirv-cross/spirv_cross.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_cross.cpp
@@ -31,7 +31,7 @@
 #include <utility>
 
 using namespace std;
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
 
 Compiler::Compiler(vector<uint32_t> ir_)
@@ -280,9 +280,6 @@ bool Compiler::block_is_pure(const SPIRBlock &block)
 			// This is a global side effect of the function.
 			return false;
 
-		case OpTensorReadARM:
-			return false;
-
 		case OpExtInst:
 		{
 			uint32_t extension_set = ops[2];
@@ -376,7 +373,6 @@ void Compiler::register_global_read_dependencies(const SPIRBlock &block, uint32_
 
 		case OpLoad:
 		case OpCooperativeMatrixLoadKHR:
-		case OpCooperativeVectorLoadNV:
 		case OpImageRead:
 		{
 			// If we're in a storage class which does not get invalidated, adding dependencies here is no big deal.
@@ -628,7 +624,7 @@ bool Compiler::is_immutable(uint32_t id) const
 		return false;
 }
 
-static inline bool storage_class_is_interface(StorageClass storage)
+static inline bool storage_class_is_interface(spv::StorageClass storage)
 {
 	switch (storage)
 	{
@@ -661,8 +657,8 @@ bool Compiler::is_hidden_variable(const SPIRVariable &var, bool include_builtins
 
 	// In SPIR-V 1.4 and up we must also use the active variable interface to disable global variables
 	// which are not part of the entry point.
-	if (ir.get_spirv_version() >= 0x10400 && var.storage != StorageClassGeneric &&
-	    var.storage != StorageClassFunction && !interface_variable_exists_in_entry_point(var.self))
+	if (ir.get_spirv_version() >= 0x10400 && var.storage != spv::StorageClassGeneric &&
+	    var.storage != spv::StorageClassFunction && !interface_variable_exists_in_entry_point(var.self))
 	{
 		return true;
 	}
@@ -742,14 +738,6 @@ bool Compiler::is_physical_pointer(const SPIRType &type) const
 	return type.op == OpTypePointer && type.storage == StorageClassPhysicalStorageBuffer;
 }
 
-bool Compiler::is_physical_or_buffer_pointer(const SPIRType &type) const
-{
-	return type.op == OpTypePointer &&
-	       (type.storage == StorageClassPhysicalStorageBuffer || type.storage == StorageClassUniform ||
-	        type.storage == StorageClassStorageBuffer || type.storage == StorageClassWorkgroup ||
-	        type.storage == StorageClassPushConstant);
-}
-
 bool Compiler::is_physical_pointer_to_buffer_block(const SPIRType &type) const
 {
 	return is_physical_pointer(type) && get_pointee_type(type).self == type.parent_type &&
@@ -1164,11 +1152,6 @@ ShaderResources Compiler::get_shader_resources(const unordered_set<VariableID> *
 			{
 				res.acceleration_structures.push_back({ var.self, var.basetype, type.self, get_name(var.self) });
 			}
-			// Tensors
-			else if (type.basetype == SPIRType::Tensor)
-			{
-				res.tensors.push_back({ var.self, var.basetype, type.self, get_name(var.self) });
-			}
 			else
 			{
 				res.gl_plain_uniforms.push_back({ var.self, var.basetype, type.self, get_name(var.self) });
@@ -1186,8 +1169,11 @@ bool Compiler::type_is_top_level_block(const SPIRType &type) const
 	return has_decoration(type.self, DecorationBlock) || has_decoration(type.self, DecorationBufferBlock);
 }
 
-bool Compiler::type_is_explicit_layout(const SPIRType &type) const
+bool Compiler::type_is_block_like(const SPIRType &type) const
 {
+	if (type_is_top_level_block(type))
+		return true;
+
 	if (type.basetype == SPIRType::Struct)
 	{
 		// Block-like types may have Offset decorations.
@@ -1199,14 +1185,6 @@ bool Compiler::type_is_explicit_layout(const SPIRType &type) const
 	return false;
 }
 
-bool Compiler::type_is_block_like(const SPIRType &type) const
-{
-	if (type_is_top_level_block(type))
-		return true;
-	else
-		return type_is_explicit_layout(type);
-}
-
 void Compiler::parse_fixup()
 {
 	// Figure out specialization constants for work group sizes.
@@ -1349,7 +1327,7 @@ const SPIRType &Compiler::get_pointee_type(uint32_t type_id) const
 
 uint32_t Compiler::get_variable_data_type_id(const SPIRVariable &var) const
 {
-	if (var.phi_variable || var.storage == StorageClassAtomicCounter)
+	if (var.phi_variable || var.storage == spv::StorageClass::StorageClassAtomicCounter)
 		return var.basetype;
 	return get_pointee_type_id(var.basetype);
 }
@@ -1386,7 +1364,7 @@ bool Compiler::is_sampled_image_type(const SPIRType &type)
 	       type.image.dim != DimBuffer;
 }
 
-void Compiler::set_member_decoration_string(TypeID id, uint32_t index, Decoration decoration,
+void Compiler::set_member_decoration_string(TypeID id, uint32_t index, spv::Decoration decoration,
                                             const std::string &argument)
 {
 	ir.set_member_decoration_string(id, index, decoration, argument);
@@ -1447,7 +1425,7 @@ void Compiler::unset_member_decoration(TypeID id, uint32_t index, Decoration dec
 	ir.unset_member_decoration(id, index, decoration);
 }
 
-void Compiler::set_decoration_string(ID id, Decoration decoration, const std::string &argument)
+void Compiler::set_decoration_string(ID id, spv::Decoration decoration, const std::string &argument)
 {
 	ir.set_decoration_string(id, decoration, argument);
 }
@@ -1610,7 +1588,7 @@ void Compiler::unset_decoration(ID id, Decoration decoration)
 	ir.unset_decoration(id, decoration);
 }
 
-bool Compiler::get_binary_offset_for_decoration(VariableID id, Decoration decoration, uint32_t &word_offset) const
+bool Compiler::get_binary_offset_for_decoration(VariableID id, spv::Decoration decoration, uint32_t &word_offset) const
 {
 	auto *m = ir.find_meta(id);
 	if (!m)
@@ -1915,15 +1893,6 @@ bool Compiler::traverse_all_reachable_opcodes(const SPIRBlock &block, OpcodeHand
 	handler.set_current_block(block);
 	handler.rearm_current_block(block);
 
-	if (handler.enable_result_types)
-	{
-		for (auto &phi: block.phi_variables)
-		{
-			auto &v = get<SPIRVariable>(phi.function_variable);
-			handler.result_types[phi.function_variable] = v.basetype;
-		}
-	}
-
 	// Ideally, perhaps traverse the CFG instead of all blocks in order to eliminate dead blocks,
 	// but this shouldn't be a problem in practice unless the SPIR-V is doing insane things like recursing
 	// inside dead blocks ...
@@ -1935,24 +1904,11 @@ bool Compiler::traverse_all_reachable_opcodes(const SPIRBlock &block, OpcodeHand
 		if (!handler.handle(op, ops, i.length))
 			return false;
 
-		if (handler.enable_result_types)
-		{
-			// If it has one, keep track of the instruction's result type, mapped by ID
-			uint32_t result_type, result_id;
-			if (instruction_to_result_type(result_type, result_id, op, ops, i.length))
-				handler.result_types[result_id] = result_type;
-		}
-
 		if (op == OpFunctionCall)
 		{
 			auto &func = get<SPIRFunction>(ops[2]);
 			if (handler.follow_function_call(func))
 			{
-				if (handler.enable_result_types)
-					for (auto &arg : func.arguments)
-						if (!arg.alias_global_variable)
-							handler.result_types[arg.id] = arg.type;
-
 				if (!handler.begin_function_scope(ops, i.length))
 					return false;
 				if (!traverse_all_reachable_opcodes(get<SPIRFunction>(ops[2]), handler))
@@ -2487,7 +2443,7 @@ uint32_t Compiler::get_work_group_size_specialization_constants(SpecializationCo
 	return execution.workgroup_size.constant;
 }
 
-uint32_t Compiler::get_execution_mode_argument(ExecutionMode mode, uint32_t index) const
+uint32_t Compiler::get_execution_mode_argument(spv::ExecutionMode mode, uint32_t index) const
 {
 	auto &execution = get_entry_point();
 	switch (mode)
@@ -2673,14 +2629,14 @@ SmallVector<EntryPoint> Compiler::get_entry_points_and_stages() const
 	return entries;
 }
 
-void Compiler::rename_entry_point(const std::string &old_name, const std::string &new_name, ExecutionModel model)
+void Compiler::rename_entry_point(const std::string &old_name, const std::string &new_name, spv::ExecutionModel model)
 {
 	auto &entry = get_entry_point(old_name, model);
 	entry.orig_name = new_name;
 	entry.name = new_name;
 }
 
-void Compiler::set_entry_point(const std::string &name, ExecutionModel model)
+void Compiler::set_entry_point(const std::string &name, spv::ExecutionModel model)
 {
 	auto &entry = get_entry_point(name, model);
 	ir.default_entry_point = entry.self;
@@ -3376,7 +3332,7 @@ void Compiler::analyze_parameter_preservation(
 
 Compiler::AnalyzeVariableScopeAccessHandler::AnalyzeVariableScopeAccessHandler(Compiler &compiler_,
                                                                                SPIRFunction &entry_)
-    : OpcodeHandler(compiler_)
+    : compiler(compiler_)
     , entry(entry_)
 {
 }
@@ -3494,11 +3450,11 @@ bool Compiler::AnalyzeVariableScopeAccessHandler::handle_terminator(const SPIRBl
 	return true;
 }
 
-bool Compiler::AnalyzeVariableScopeAccessHandler::handle(Op op, const uint32_t *args, uint32_t length)
+bool Compiler::AnalyzeVariableScopeAccessHandler::handle(spv::Op op, const uint32_t *args, uint32_t length)
 {
 	// Keep track of the types of temporaries, so we can hoist them out as necessary.
 	uint32_t result_type = 0, result_id = 0;
-	if (instruction_to_result_type(result_type, result_id, op, args, length))
+	if (compiler.instruction_to_result_type(result_type, result_id, op, args, length))
 	{
 		// For some opcodes, we will need to override the result id.
 		// If we need to hoist the temporary, the temporary type is the input, not the result.
@@ -3841,7 +3797,7 @@ bool Compiler::AnalyzeVariableScopeAccessHandler::handle(Op op, const uint32_t *
 }
 
 Compiler::StaticExpressionAccessHandler::StaticExpressionAccessHandler(Compiler &compiler_, uint32_t variable_id_)
-    : OpcodeHandler(compiler_)
+    : compiler(compiler_)
     , variable_id(variable_id_)
 {
 }
@@ -3851,7 +3807,7 @@ bool Compiler::StaticExpressionAccessHandler::follow_function_call(const SPIRFun
 	return false;
 }
 
-bool Compiler::StaticExpressionAccessHandler::handle(Op op, const uint32_t *args, uint32_t length)
+bool Compiler::StaticExpressionAccessHandler::handle(spv::Op op, const uint32_t *args, uint32_t length)
 {
 	switch (op)
 	{
@@ -4382,7 +4338,6 @@ bool Compiler::may_read_undefined_variable_in_block(const SPIRBlock &block, uint
 
 		case OpCopyObject:
 		case OpLoad:
-		case OpCooperativeVectorLoadNV:
 		case OpCooperativeMatrixLoadKHR:
 			if (ops[2] == var)
 				return true;
@@ -4411,7 +4366,7 @@ bool Compiler::may_read_undefined_variable_in_block(const SPIRBlock &block, uint
 	return true;
 }
 
-bool Compiler::GeometryEmitDisocveryHandler::handle(Op opcode, const uint32_t *, uint32_t)
+bool Compiler::GeometryEmitDisocveryHandler::handle(spv::Op opcode, const uint32_t *, uint32_t)
 {
 	if (opcode == OpEmitVertex || opcode == OpEndPrimitive)
 	{
@@ -4429,9 +4384,8 @@ bool Compiler::GeometryEmitDisocveryHandler::begin_function_scope(const uint32_t
 	return true;
 }
 
-bool Compiler::GeometryEmitDisocveryHandler::end_function_scope(const uint32_t *stream, uint32_t)
+bool Compiler::GeometryEmitDisocveryHandler::end_function_scope([[maybe_unused]] const uint32_t *stream, uint32_t)
 {
-	(void)stream;
 	assert(function_stack.back() == &compiler.get<SPIRFunction>(stream[2]));
 	function_stack.pop_back();
 
@@ -4552,7 +4506,7 @@ void Compiler::ActiveBuiltinHandler::add_if_builtin_or_block(uint32_t id)
 	add_if_builtin(id, true);
 }
 
-bool Compiler::ActiveBuiltinHandler::handle(Op opcode, const uint32_t *args, uint32_t length)
+bool Compiler::ActiveBuiltinHandler::handle(spv::Op opcode, const uint32_t *args, uint32_t length)
 {
 	switch (opcode)
 	{
@@ -4747,7 +4701,7 @@ void Compiler::analyze_image_and_sampler_usage()
 			comparison_ids.insert(combined.combined_id);
 }
 
-bool Compiler::CombinedImageSamplerDrefHandler::handle(Op opcode, const uint32_t *args, uint32_t)
+bool Compiler::CombinedImageSamplerDrefHandler::handle(spv::Op opcode, const uint32_t *args, uint32_t)
 {
 	// Mark all sampled images which are used with Dref.
 	switch (opcode)
@@ -4856,11 +4810,11 @@ void Compiler::build_function_control_flow_graphs_and_analyze()
 }
 
 Compiler::CFGBuilder::CFGBuilder(Compiler &compiler_)
-    : OpcodeHandler(compiler_)
+    : compiler(compiler_)
 {
 }
 
-bool Compiler::CFGBuilder::handle(Op, const uint32_t *, uint32_t)
+bool Compiler::CFGBuilder::handle(spv::Op, const uint32_t *, uint32_t)
 {
 	return true;
 }
@@ -5036,7 +4990,7 @@ void Compiler::make_constant_null(uint32_t id, uint32_t type)
 	}
 }
 
-const SmallVector<Capability> &Compiler::get_declared_capabilities() const
+const SmallVector<spv::Capability> &Compiler::get_declared_capabilities() const
 {
 	return ir.declared_capabilities;
 }
@@ -5111,7 +5065,7 @@ bool Compiler::reflection_ssbo_instance_name_is_significant() const
 	return aliased_ssbo_types;
 }
 
-bool Compiler::instruction_to_result_type(uint32_t &result_type, uint32_t &result_id, Op op,
+bool Compiler::instruction_to_result_type(uint32_t &result_type, uint32_t &result_id, spv::Op op,
                                           const uint32_t *args, uint32_t length)
 {
 	if (length < 2)
@@ -5158,7 +5112,7 @@ Bitset Compiler::combined_decoration_for_member(const SPIRType &type, uint32_t i
 	return flags;
 }
 
-bool Compiler::is_desktop_only_format(ImageFormat format)
+bool Compiler::is_desktop_only_format(spv::ImageFormat format)
 {
 	switch (format)
 	{
@@ -5201,7 +5155,7 @@ bool Compiler::is_depth_image(const SPIRType &type, uint32_t id) const
 bool Compiler::type_is_opaque_value(const SPIRType &type) const
 {
 	return !type.pointer && (type.basetype == SPIRType::SampledImage || type.basetype == SPIRType::Image ||
-	                         type.basetype == SPIRType::Sampler || type.basetype == SPIRType::Tensor);
+	                         type.basetype == SPIRType::Sampler);
 }
 
 // Make these member functions so we can easily break on any force_recompile events.
@@ -5228,7 +5182,7 @@ void Compiler::clear_force_recompile()
 }
 
 Compiler::PhysicalStorageBufferPointerHandler::PhysicalStorageBufferPointerHandler(Compiler &compiler_)
-    : OpcodeHandler(compiler_)
+    : compiler(compiler_)
 {
 }
 
@@ -5277,7 +5231,7 @@ bool Compiler::PhysicalStorageBufferPointerHandler::type_is_bda_block_entry(uint
 
 uint32_t Compiler::PhysicalStorageBufferPointerHandler::get_minimum_scalar_alignment(const SPIRType &type) const
 {
-	if (type.storage == StorageClassPhysicalStorageBuffer)
+	if (type.storage == spv::StorageClassPhysicalStorageBuffer)
 		return 8;
 	else if (type.basetype == SPIRType::Struct)
 	{
@@ -5519,7 +5473,6 @@ bool Compiler::InterlockedResourceAccessHandler::handle(Op opcode, const uint32_
 	{
 	case OpLoad:
 	case OpCooperativeMatrixLoadKHR:
-	case OpCooperativeVectorLoadNV:
 	{
 		if (length < 3)
 			return false;
@@ -5598,7 +5551,6 @@ bool Compiler::InterlockedResourceAccessHandler::handle(Op opcode, const uint32_
 	case OpImageWrite:
 	case OpAtomicStore:
 	case OpCooperativeMatrixStoreKHR:
-	case OpCooperativeVectorStoreNV:
 	{
 		if (length < 1)
 			return false;
@@ -5795,13 +5747,3 @@ void Compiler::add_loop_level()
 {
 	current_loop_level++;
 }
-
-const SPIRType *Compiler::OpcodeHandler::get_expression_result_type(uint32_t id) const
-{
-	auto itr = result_types.find(id);
-	if (itr == result_types.end())
-		return nullptr;
-
-	return &compiler.get<SPIRType>(itr->second);
-}
-
diff --git a/engine/thirdparty/spirv-cross/spirv_cross.hpp b/engine/thirdparty/spirv-cross/spirv_cross.hpp
index 06f2b73f..b65b5ac7 100644
--- a/engine/thirdparty/spirv-cross/spirv_cross.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_cross.hpp
@@ -27,20 +27,12 @@
 #ifndef SPV_ENABLE_UTILITY_CODE
 #define SPV_ENABLE_UTILITY_CODE
 #endif
-
-// Pragmatic hack to avoid symbol conflicts when including both hpp11 and hpp headers in same translation unit.
-// This is an unfortunate SPIRV-Headers issue that we cannot easily deal with ourselves.
-#ifdef SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#define spv SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#endif
-
 #include "spirv.hpp"
 #include "spirv_cfg.hpp"
 #include "spirv_cross_parsed_ir.hpp"
 
 namespace SPIRV_CROSS_NAMESPACE
 {
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
 struct Resource
 {
 	// Resources are identified with their SPIR-V ID.
@@ -77,7 +69,7 @@ struct BuiltInResource
 	// A builtin present here does not necessarily mean it's considered an active builtin,
 	// since variable ID "activeness" is only tracked on OpVariable level, not Block members.
 	// For that, update_active_builtins() -> has_active_builtin() can be used to further refine the reflection.
-	BuiltIn builtin;
+	spv::BuiltIn builtin;
 
 	// This is the actual value type of the builtin.
 	// Typically float4, float, array<float, N> for the gl_PerVertex builtins.
@@ -103,7 +95,6 @@ struct ShaderResources
 	SmallVector<Resource> atomic_counters;
 	SmallVector<Resource> acceleration_structures;
 	SmallVector<Resource> gl_plain_uniforms;
-	SmallVector<Resource> tensors;
 
 	// There can only be one push constant block,
 	// but keep the vector in case this restriction is lifted in the future.
@@ -160,7 +151,7 @@ enum BufferPackingStandard
 struct EntryPoint
 {
 	std::string name;
-	ExecutionModel execution_model;
+	spv::ExecutionModel execution_model;
 };
 
 class Compiler
@@ -191,8 +182,8 @@ public:
 	const std::string &get_name(ID id) const;
 
 	// Applies a decoration to an ID. Effectively injects OpDecorate.
-	void set_decoration(ID id, Decoration decoration, uint32_t argument = 0);
-	void set_decoration_string(ID id, Decoration decoration, const std::string &argument);
+	void set_decoration(ID id, spv::Decoration decoration, uint32_t argument = 0);
+	void set_decoration_string(ID id, spv::Decoration decoration, const std::string &argument);
 
 	// Overrides the identifier OpName of an ID.
 	// Identifiers beginning with underscores or identifiers which contain double underscores
@@ -200,22 +191,22 @@ public:
 	void set_name(ID id, const std::string &name);
 
 	// Gets a bitmask for the decorations which are applied to ID.
-	// I.e. (1ull << DecorationFoo) | (1ull << DecorationBar)
+	// I.e. (1ull << spv::DecorationFoo) | (1ull << spv::DecorationBar)
 	const Bitset &get_decoration_bitset(ID id) const;
 
 	// Returns whether the decoration has been applied to the ID.
-	bool has_decoration(ID id, Decoration decoration) const;
+	bool has_decoration(ID id, spv::Decoration decoration) const;
 
 	// Gets the value for decorations which take arguments.
-	// If the decoration is a boolean (i.e. DecorationNonWritable),
+	// If the decoration is a boolean (i.e. spv::DecorationNonWritable),
 	// 1 will be returned.
 	// If decoration doesn't exist or decoration is not recognized,
 	// 0 will be returned.
-	uint32_t get_decoration(ID id, Decoration decoration) const;
-	const std::string &get_decoration_string(ID id, Decoration decoration) const;
+	uint32_t get_decoration(ID id, spv::Decoration decoration) const;
+	const std::string &get_decoration_string(ID id, spv::Decoration decoration) const;
 
 	// Removes the decoration for an ID.
-	void unset_decoration(ID id, Decoration decoration);
+	void unset_decoration(ID id, spv::Decoration decoration);
 
 	// Gets the SPIR-V type associated with ID.
 	// Mostly used with Resource::type_id and Resource::base_type_id to parse the underlying type of a resource.
@@ -225,7 +216,7 @@ public:
 	const SPIRType &get_type_from_variable(VariableID id) const;
 
 	// Gets the underlying storage class for an OpVariable.
-	StorageClass get_storage_class(VariableID id) const;
+	spv::StorageClass get_storage_class(VariableID id) const;
 
 	// If get_name() is an empty string, get the fallback name which will be used
 	// instead in the disassembled source.
@@ -240,8 +231,8 @@ public:
 	const std::string &get_member_name(TypeID id, uint32_t index) const;
 
 	// Given an OpTypeStruct in ID, obtain the OpMemberDecoration for member number "index".
-	uint32_t get_member_decoration(TypeID id, uint32_t index, Decoration decoration) const;
-	const std::string &get_member_decoration_string(TypeID id, uint32_t index, Decoration decoration) const;
+	uint32_t get_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration) const;
+	const std::string &get_member_decoration_string(TypeID id, uint32_t index, spv::Decoration decoration) const;
 
 	// Sets the member identifier for OpTypeStruct ID, member number "index".
 	void set_member_name(TypeID id, uint32_t index, const std::string &name);
@@ -254,15 +245,15 @@ public:
 	const Bitset &get_member_decoration_bitset(TypeID id, uint32_t index) const;
 
 	// Returns whether the decoration has been applied to a member of a struct.
-	bool has_member_decoration(TypeID id, uint32_t index, Decoration decoration) const;
+	bool has_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration) const;
 
 	// Similar to set_decoration, but for struct members.
-	void set_member_decoration(TypeID id, uint32_t index, Decoration decoration, uint32_t argument = 0);
-	void set_member_decoration_string(TypeID id, uint32_t index, Decoration decoration,
+	void set_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration, uint32_t argument = 0);
+	void set_member_decoration_string(TypeID id, uint32_t index, spv::Decoration decoration,
 	                                  const std::string &argument);
 
 	// Unsets a member decoration, similar to unset_decoration.
-	void unset_member_decoration(TypeID id, uint32_t index, Decoration decoration);
+	void unset_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration);
 
 	// Gets the fallback name for a member, similar to get_fallback_name.
 	virtual const std::string get_fallback_member_name(uint32_t index) const
@@ -348,28 +339,28 @@ public:
 	// Names for entry points in the SPIR-V module may alias if they belong to different execution models.
 	// To disambiguate, we must pass along with the entry point names the execution model.
 	SmallVector<EntryPoint> get_entry_points_and_stages() const;
-	void set_entry_point(const std::string &entry, ExecutionModel execution_model);
+	void set_entry_point(const std::string &entry, spv::ExecutionModel execution_model);
 
 	// Renames an entry point from old_name to new_name.
 	// If old_name is currently selected as the current entry point, it will continue to be the current entry point,
 	// albeit with a new name.
 	// get_entry_points() is essentially invalidated at this point.
 	void rename_entry_point(const std::string &old_name, const std::string &new_name,
-	                        ExecutionModel execution_model);
-	const SPIREntryPoint &get_entry_point(const std::string &name, ExecutionModel execution_model) const;
-	SPIREntryPoint &get_entry_point(const std::string &name, ExecutionModel execution_model);
+	                        spv::ExecutionModel execution_model);
+	const SPIREntryPoint &get_entry_point(const std::string &name, spv::ExecutionModel execution_model) const;
+	SPIREntryPoint &get_entry_point(const std::string &name, spv::ExecutionModel execution_model);
 	const std::string &get_cleansed_entry_point_name(const std::string &name,
-	                                                 ExecutionModel execution_model) const;
+	                                                 spv::ExecutionModel execution_model) const;
 
 	// Traverses all reachable opcodes and sets active_builtins to a bitmask of all builtin variables which are accessed in the shader.
 	void update_active_builtins();
-	bool has_active_builtin(BuiltIn builtin, StorageClass storage) const;
+	bool has_active_builtin(spv::BuiltIn builtin, spv::StorageClass storage) const;
 
 	// Query and modify OpExecutionMode.
 	const Bitset &get_execution_mode_bitset() const;
 
-	void unset_execution_mode(ExecutionMode mode);
-	void set_execution_mode(ExecutionMode mode, uint32_t arg0 = 0, uint32_t arg1 = 0, uint32_t arg2 = 0);
+	void unset_execution_mode(spv::ExecutionMode mode);
+	void set_execution_mode(spv::ExecutionMode mode, uint32_t arg0 = 0, uint32_t arg1 = 0, uint32_t arg2 = 0);
 
 	// Gets argument for an execution mode (LocalSize, Invocations, OutputVertices).
 	// For LocalSize or LocalSizeId, the index argument is used to select the dimension (X = 0, Y = 1, Z = 2).
@@ -377,8 +368,8 @@ public:
 	// LocalSizeId query returns an ID. If LocalSizeId execution mode is not used, it returns 0.
 	// LocalSize always returns a literal. If execution mode is LocalSizeId,
 	// the literal (spec constant or not) is still returned.
-	uint32_t get_execution_mode_argument(ExecutionMode mode, uint32_t index = 0) const;
-	ExecutionModel get_execution_model() const;
+	uint32_t get_execution_mode_argument(spv::ExecutionMode mode, uint32_t index = 0) const;
+	spv::ExecutionModel get_execution_model() const;
 
 	bool is_tessellation_shader() const;
 	bool is_tessellating_triangles() const;
@@ -491,7 +482,7 @@ public:
 	// If the decoration was declared, sets the word_offset to an offset into the provided SPIR-V binary buffer and returns true,
 	// otherwise, returns false.
 	// If the decoration does not have any value attached to it (e.g. DecorationRelaxedPrecision), this function will also return false.
-	bool get_binary_offset_for_decoration(VariableID id, Decoration decoration, uint32_t &word_offset) const;
+	bool get_binary_offset_for_decoration(VariableID id, spv::Decoration decoration, uint32_t &word_offset) const;
 
 	// HLSL counter buffer reflection interface.
 	// Append/Consume/Increment/Decrement in HLSL is implemented as two "neighbor" buffer objects where
@@ -517,7 +508,7 @@ public:
 	bool buffer_get_hlsl_counter_buffer(VariableID id, uint32_t &counter_id) const;
 
 	// Gets the list of all SPIR-V Capabilities which were declared in the SPIR-V module.
-	const SmallVector<Capability> &get_declared_capabilities() const;
+	const SmallVector<spv::Capability> &get_declared_capabilities() const;
 
 	// Gets the list of all SPIR-V extensions which were declared in the SPIR-V module.
 	const SmallVector<std::string> &get_declared_extensions() const;
@@ -680,21 +671,20 @@ protected:
 
 	const SPIREntryPoint &get_entry_point() const;
 	SPIREntryPoint &get_entry_point();
-	static bool is_tessellation_shader(ExecutionModel model);
+	static bool is_tessellation_shader(spv::ExecutionModel model);
 
 	virtual std::string to_name(uint32_t id, bool allow_alias = true) const;
 	bool is_builtin_variable(const SPIRVariable &var) const;
 	bool is_builtin_type(const SPIRType &type) const;
 	bool is_hidden_variable(const SPIRVariable &var, bool include_builtins = false) const;
 	bool is_immutable(uint32_t id) const;
-	bool is_member_builtin(const SPIRType &type, uint32_t index, BuiltIn *builtin) const;
+	bool is_member_builtin(const SPIRType &type, uint32_t index, spv::BuiltIn *builtin) const;
 	bool is_scalar(const SPIRType &type) const;
 	bool is_vector(const SPIRType &type) const;
 	bool is_matrix(const SPIRType &type) const;
 	bool is_array(const SPIRType &type) const;
 	bool is_pointer(const SPIRType &type) const;
 	bool is_physical_pointer(const SPIRType &type) const;
-	bool is_physical_or_buffer_pointer(const SPIRType &type) const;
 	bool is_physical_pointer_to_buffer_block(const SPIRType &type) const;
 	static bool is_runtime_size_array(const SPIRType &type);
 	uint32_t expression_type_id(uint32_t id) const;
@@ -797,12 +787,11 @@ protected:
 	// Used internally to implement various traversals for queries.
 	struct OpcodeHandler
 	{
-		explicit OpcodeHandler(Compiler &compiler_) : compiler(compiler_) {}
 		virtual ~OpcodeHandler() = default;
 
 		// Return true if traversal should continue.
 		// If false, traversal will end immediately.
-		virtual bool handle(Op opcode, const uint32_t *args, uint32_t length) = 0;
+		virtual bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) = 0;
 		virtual bool handle_terminator(const SPIRBlock &)
 		{
 			return true;
@@ -833,40 +822,20 @@ protected:
 		{
 			return true;
 		}
-
-		Compiler &compiler;
-		std::unordered_map<uint32_t, uint32_t> result_types;
-		const SPIRType *get_expression_result_type(uint32_t id) const;
-		bool enable_result_types = false;
-
-		template <typename T> T &get(uint32_t id)
-		{
-			return compiler.get<T>(id);
-		}
-
-		template <typename T> const T &get(uint32_t id) const
-		{
-			return compiler.get<T>(id);
-		}
-
-		template <typename T, typename... P>
-		T &set(uint32_t id, P &&... args)
-		{
-			return compiler.set<T>(id, std::forward<P>(args)...);
-		}
 	};
 
 	struct BufferAccessHandler : OpcodeHandler
 	{
 		BufferAccessHandler(const Compiler &compiler_, SmallVector<BufferRange> &ranges_, uint32_t id_)
-		    : OpcodeHandler(const_cast<Compiler &>(compiler_))
+		    : compiler(compiler_)
 		    , ranges(ranges_)
 		    , id(id_)
 		{
 		}
 
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
 
+		const Compiler &compiler;
 		SmallVector<BufferRange> &ranges;
 		uint32_t id;
 
@@ -876,26 +845,29 @@ protected:
 	struct InterfaceVariableAccessHandler : OpcodeHandler
 	{
 		InterfaceVariableAccessHandler(const Compiler &compiler_, std::unordered_set<VariableID> &variables_)
-		    : OpcodeHandler(const_cast<Compiler &>(compiler_))
+		    : compiler(compiler_)
 		    , variables(variables_)
 		{
 		}
 
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
 
+		const Compiler &compiler;
 		std::unordered_set<VariableID> &variables;
 	};
 
 	struct CombinedImageSamplerHandler : OpcodeHandler
 	{
-		explicit CombinedImageSamplerHandler(Compiler &compiler_)
-		    : OpcodeHandler(compiler_)
+		CombinedImageSamplerHandler(Compiler &compiler_)
+		    : compiler(compiler_)
 		{
 		}
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
 		bool begin_function_scope(const uint32_t *args, uint32_t length) override;
 		bool end_function_scope(const uint32_t *args, uint32_t length) override;
 
+		Compiler &compiler;
+
 		// Each function in the call stack needs its own remapping for parameters so we can deduce which global variable each texture/sampler the parameter is statically bound to.
 		std::stack<std::unordered_map<uint32_t, uint32_t>> parameter_remapping;
 		std::stack<SPIRFunction *> functions;
@@ -909,24 +881,27 @@ protected:
 
 	struct DummySamplerForCombinedImageHandler : OpcodeHandler
 	{
-		explicit DummySamplerForCombinedImageHandler(Compiler &compiler_)
-		    : OpcodeHandler(compiler_)
+		DummySamplerForCombinedImageHandler(Compiler &compiler_)
+		    : compiler(compiler_)
 		{
 		}
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
+
+		Compiler &compiler;
 		bool need_dummy_sampler = false;
 	};
 
 	struct ActiveBuiltinHandler : OpcodeHandler
 	{
-		explicit ActiveBuiltinHandler(Compiler &compiler_)
-		    : OpcodeHandler(compiler_)
+		ActiveBuiltinHandler(Compiler &compiler_)
+		    : compiler(compiler_)
 		{
 		}
 
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
+		Compiler &compiler;
 
-		void handle_builtin(const SPIRType &type, BuiltIn builtin, const Bitset &decoration_flags);
+		void handle_builtin(const SPIRType &type, spv::BuiltIn builtin, const Bitset &decoration_flags);
 		void add_if_builtin(uint32_t id);
 		void add_if_builtin_or_block(uint32_t id);
 		void add_if_builtin(uint32_t id, bool allow_blocks);
@@ -978,12 +953,13 @@ protected:
 
 	struct CombinedImageSamplerDrefHandler : OpcodeHandler
 	{
-		explicit CombinedImageSamplerDrefHandler(Compiler &compiler_)
-		    : OpcodeHandler(compiler_)
+		CombinedImageSamplerDrefHandler(Compiler &compiler_)
+		    : compiler(compiler_)
 		{
 		}
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
 
+		Compiler &compiler;
 		std::unordered_set<uint32_t> dref_combined_samplers;
 	};
 
@@ -991,13 +967,14 @@ protected:
 	{
 		CombinedImageSamplerUsageHandler(Compiler &compiler_,
 		                                 const std::unordered_set<uint32_t> &dref_combined_samplers_)
-		    : OpcodeHandler(compiler_)
+		    : compiler(compiler_)
 		    , dref_combined_samplers(dref_combined_samplers_)
 		{
 		}
 
 		bool begin_function_scope(const uint32_t *args, uint32_t length) override;
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
+		Compiler &compiler;
 		const std::unordered_set<uint32_t> &dref_combined_samplers;
 
 		std::unordered_map<uint32_t, std::unordered_set<uint32_t>> dependency_hierarchy;
@@ -1019,7 +996,8 @@ protected:
 		explicit CFGBuilder(Compiler &compiler_);
 
 		bool follow_function_call(const SPIRFunction &func) override;
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
+		Compiler &compiler;
 		std::unordered_map<uint32_t, std::unique_ptr<CFG>> function_cfgs;
 	};
 
@@ -1033,9 +1011,10 @@ protected:
 		void notify_variable_access(uint32_t id, uint32_t block);
 		bool id_is_phi_variable(uint32_t id) const;
 		bool id_is_potential_temporary(uint32_t id) const;
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
 		bool handle_terminator(const SPIRBlock &block) override;
 
+		Compiler &compiler;
 		SPIRFunction &entry;
 		std::unordered_map<uint32_t, std::unordered_set<uint32_t>> accessed_variables_to_block;
 		std::unordered_map<uint32_t, std::unordered_set<uint32_t>> accessed_temporaries_to_block;
@@ -1053,8 +1032,9 @@ protected:
 	{
 		StaticExpressionAccessHandler(Compiler &compiler_, uint32_t variable_id_);
 		bool follow_function_call(const SPIRFunction &) override;
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
 
+		Compiler &compiler;
 		uint32_t variable_id;
 		uint32_t static_expression = 0;
 		uint32_t write_count = 0;
@@ -1068,7 +1048,8 @@ protected:
 	struct PhysicalStorageBufferPointerHandler : OpcodeHandler
 	{
 		explicit PhysicalStorageBufferPointerHandler(Compiler &compiler_);
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
+		Compiler &compiler;
 
 		std::unordered_set<uint32_t> non_block_types;
 		std::unordered_map<uint32_t, PhysicalBlockMeta> physical_block_type_meta;
@@ -1095,11 +1076,12 @@ protected:
 	struct GeometryEmitDisocveryHandler : OpcodeHandler
 	{
 		explicit GeometryEmitDisocveryHandler(Compiler &compiler_)
-		    : OpcodeHandler(compiler_)
+		    : compiler(compiler_)
 		{
 		}
+		Compiler &compiler;
 
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
 		bool begin_function_scope(const uint32_t *, uint32_t) override;
 		bool end_function_scope(const uint32_t *, uint32_t) override;
 		SmallVector<SPIRFunction *> function_stack;
@@ -1114,15 +1096,16 @@ protected:
 	struct InterlockedResourceAccessHandler : OpcodeHandler
 	{
 		InterlockedResourceAccessHandler(Compiler &compiler_, uint32_t entry_point_id)
-		    : OpcodeHandler(compiler_)
+		    : compiler(compiler_)
 		{
 			call_stack.push_back(entry_point_id);
 		}
 
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
 		bool begin_function_scope(const uint32_t *args, uint32_t length) override;
 		bool end_function_scope(const uint32_t *args, uint32_t length) override;
 
+		Compiler &compiler;
 		bool in_crit_sec = false;
 
 		uint32_t interlock_function_id = 0;
@@ -1138,16 +1121,17 @@ protected:
 	struct InterlockedResourceAccessPrepassHandler : OpcodeHandler
 	{
 		InterlockedResourceAccessPrepassHandler(Compiler &compiler_, uint32_t entry_point_id)
-		    : OpcodeHandler(compiler_)
+		    : compiler(compiler_)
 		{
 			call_stack.push_back(entry_point_id);
 		}
 
 		void rearm_current_block(const SPIRBlock &block) override;
-		bool handle(Op op, const uint32_t *args, uint32_t length) override;
+		bool handle(spv::Op op, const uint32_t *args, uint32_t length) override;
 		bool begin_function_scope(const uint32_t *args, uint32_t length) override;
 		bool end_function_scope(const uint32_t *args, uint32_t length) override;
 
+		Compiler &compiler;
 		uint32_t interlock_function_id = 0;
 		uint32_t current_block_id = 0;
 		bool split_function_case = false;
@@ -1164,11 +1148,11 @@ protected:
 
 	std::unordered_map<uint32_t, std::string> declared_block_names;
 
-	static bool instruction_to_result_type(
-			uint32_t &result_type, uint32_t &result_id, Op op, const uint32_t *args, uint32_t length);
+	bool instruction_to_result_type(uint32_t &result_type, uint32_t &result_id, spv::Op op, const uint32_t *args,
+	                                uint32_t length);
 
 	Bitset combined_decoration_for_member(const SPIRType &type, uint32_t index) const;
-	static bool is_desktop_only_format(ImageFormat format);
+	static bool is_desktop_only_format(spv::ImageFormat format);
 
 	bool is_depth_image(const SPIRType &type, uint32_t id) const;
 
@@ -1187,7 +1171,6 @@ protected:
 	bool type_contains_recursion(const SPIRType &type);
 	bool type_is_array_of_pointers(const SPIRType &type) const;
 	bool type_is_block_like(const SPIRType &type) const;
-	bool type_is_explicit_layout(const SPIRType &type) const;
 	bool type_is_top_level_block(const SPIRType &type) const;
 	bool type_is_opaque_value(const SPIRType &type) const;
 
@@ -1213,8 +1196,4 @@ private:
 };
 } // namespace SPIRV_CROSS_NAMESPACE
 
-#ifdef SPIRV_CROSS_SPV_HEADER_NAMESPACE_OVERRIDE
-#undef spv
-#endif
-
 #endif
diff --git a/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.cpp b/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.cpp
index 1c23ece1..760b8037 100644
--- a/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.cpp
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 using namespace std;
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 
 namespace SPIRV_CROSS_NAMESPACE
 {
@@ -527,27 +527,8 @@ void ParsedIR::mark_used_as_array_length(ID id)
 	switch (ids[id].get_type())
 	{
 	case TypeConstant:
-	{
-		auto &c = get<SPIRConstant>(id);
-		c.is_used_as_array_length = true;
-
-		// Mark composite dependencies as well.
-		for (auto &sub_id: c.m.id)
-			if (sub_id)
-				mark_used_as_array_length(sub_id);
-
-		for (uint32_t col = 0; col < c.m.columns; col++)
-		{
-			for (auto &sub_id : c.m.c[col].id)
-				if (sub_id)
-					mark_used_as_array_length(sub_id);
-		}
-
-		for (auto &sub_id : c.subconstants)
-			if (sub_id)
-				mark_used_as_array_length(sub_id);
+		get<SPIRConstant>(id).is_used_as_array_length = true;
 		break;
-	}
 
 	case TypeConstantOp:
 	{
diff --git a/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.hpp b/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.hpp
index 0e825b4f..3892248a 100644
--- a/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_cross_parsed_ir.hpp
@@ -30,7 +30,6 @@
 
 namespace SPIRV_CROSS_NAMESPACE
 {
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
 
 // This data structure holds all information needed to perform cross-compilation and reflection.
 // It is the output of the Parser, but any implementation could create this structure.
@@ -88,7 +87,7 @@ public:
 
 	// Declared capabilities and extensions in the SPIR-V module.
 	// Not really used except for reflection at the moment.
-	SmallVector<Capability> declared_capabilities;
+	SmallVector<spv::Capability> declared_capabilities;
 	SmallVector<std::string> declared_extensions;
 
 	// Meta data about blocks. The cross-compiler needs to query if a block is either of these types.
@@ -112,7 +111,6 @@ public:
 
 	struct Source
 	{
-		SourceLanguage lang = SourceLanguageUnknown;
 		uint32_t version = 0;
 		bool es = false;
 		bool known = false;
@@ -123,8 +121,8 @@ public:
 
 	Source source;
 
-	AddressingModel addressing_model = AddressingModelMax;
-	MemoryModel memory_model = MemoryModelMax;
+	spv::AddressingModel addressing_model = spv::AddressingModelMax;
+	spv::MemoryModel memory_model = spv::MemoryModelMax;
 
 	// Decoration handling methods.
 	// Can be useful for simple "raw" reflection.
@@ -132,25 +130,25 @@ public:
 	// and might as well just have the whole suite of decoration/name handling in one place.
 	void set_name(ID id, const std::string &name);
 	const std::string &get_name(ID id) const;
-	void set_decoration(ID id, Decoration decoration, uint32_t argument = 0);
-	void set_decoration_string(ID id, Decoration decoration, const std::string &argument);
-	bool has_decoration(ID id, Decoration decoration) const;
-	uint32_t get_decoration(ID id, Decoration decoration) const;
-	const std::string &get_decoration_string(ID id, Decoration decoration) const;
+	void set_decoration(ID id, spv::Decoration decoration, uint32_t argument = 0);
+	void set_decoration_string(ID id, spv::Decoration decoration, const std::string &argument);
+	bool has_decoration(ID id, spv::Decoration decoration) const;
+	uint32_t get_decoration(ID id, spv::Decoration decoration) const;
+	const std::string &get_decoration_string(ID id, spv::Decoration decoration) const;
 	const Bitset &get_decoration_bitset(ID id) const;
-	void unset_decoration(ID id, Decoration decoration);
+	void unset_decoration(ID id, spv::Decoration decoration);
 
 	// Decoration handling methods (for members of a struct).
 	void set_member_name(TypeID id, uint32_t index, const std::string &name);
 	const std::string &get_member_name(TypeID id, uint32_t index) const;
-	void set_member_decoration(TypeID id, uint32_t index, Decoration decoration, uint32_t argument = 0);
-	void set_member_decoration_string(TypeID id, uint32_t index, Decoration decoration,
+	void set_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration, uint32_t argument = 0);
+	void set_member_decoration_string(TypeID id, uint32_t index, spv::Decoration decoration,
 	                                  const std::string &argument);
-	uint32_t get_member_decoration(TypeID id, uint32_t index, Decoration decoration) const;
-	const std::string &get_member_decoration_string(TypeID id, uint32_t index, Decoration decoration) const;
-	bool has_member_decoration(TypeID id, uint32_t index, Decoration decoration) const;
+	uint32_t get_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration) const;
+	const std::string &get_member_decoration_string(TypeID id, uint32_t index, spv::Decoration decoration) const;
+	bool has_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration) const;
 	const Bitset &get_member_decoration_bitset(TypeID id, uint32_t index) const;
-	void unset_member_decoration(TypeID id, uint32_t index, Decoration decoration);
+	void unset_member_decoration(TypeID id, uint32_t index, spv::Decoration decoration);
 
 	void mark_used_as_array_length(ID id);
 	uint32_t increase_bound_by(uint32_t count);
diff --git a/engine/thirdparty/spirv-cross/spirv_cross_util.cpp b/engine/thirdparty/spirv-cross/spirv_cross_util.cpp
deleted file mode 100644
index f30706f5..00000000
--- a/engine/thirdparty/spirv-cross/spirv_cross_util.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2015-2021 Arm Limited
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * At your option, you may choose to accept this material under either:
- *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
- *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- */
-
-#include "spirv_cross_util.hpp"
-#include "spirv_common.hpp"
-
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
-using namespace SPIRV_CROSS_NAMESPACE;
-
-namespace spirv_cross_util
-{
-void rename_interface_variable(Compiler &compiler, const SmallVector<Resource> &resources, uint32_t location,
-                               const std::string &name)
-{
-	for (auto &v : resources)
-	{
-		if (!compiler.has_decoration(v.id, DecorationLocation))
-			continue;
-
-		auto loc = compiler.get_decoration(v.id, DecorationLocation);
-		if (loc != location)
-			continue;
-
-		auto &type = compiler.get_type(v.base_type_id);
-
-		// This is more of a friendly variant. If we need to rename interface variables, we might have to rename
-		// structs as well and make sure all the names match up.
-		if (type.basetype == SPIRType::Struct)
-		{
-			compiler.set_name(v.base_type_id, join("SPIRV_Cross_Interface_Location", location));
-			for (uint32_t i = 0; i < uint32_t(type.member_types.size()); i++)
-				compiler.set_member_name(v.base_type_id, i, join("InterfaceMember", i));
-		}
-
-		compiler.set_name(v.id, name);
-	}
-}
-
-void inherit_combined_sampler_bindings(Compiler &compiler)
-{
-	auto &samplers = compiler.get_combined_image_samplers();
-	for (auto &s : samplers)
-	{
-		if (compiler.has_decoration(s.image_id, DecorationDescriptorSet))
-		{
-			uint32_t set = compiler.get_decoration(s.image_id, DecorationDescriptorSet);
-			compiler.set_decoration(s.combined_id, DecorationDescriptorSet, set);
-		}
-
-		if (compiler.has_decoration(s.image_id, DecorationBinding))
-		{
-			uint32_t binding = compiler.get_decoration(s.image_id, DecorationBinding);
-			compiler.set_decoration(s.combined_id, DecorationBinding, binding);
-		}
-	}
-}
-} // namespace spirv_cross_util
diff --git a/engine/thirdparty/spirv-cross/spirv_cross_util.hpp b/engine/thirdparty/spirv-cross/spirv_cross_util.hpp
deleted file mode 100644
index e6e3fcdb..00000000
--- a/engine/thirdparty/spirv-cross/spirv_cross_util.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015-2021 Arm Limited
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * At your option, you may choose to accept this material under either:
- *  1. The Apache License, Version 2.0, found at <http://www.apache.org/licenses/LICENSE-2.0>, or
- *  2. The MIT License, found at <http://opensource.org/licenses/MIT>.
- */
-
-#ifndef SPIRV_CROSS_UTIL_HPP
-#define SPIRV_CROSS_UTIL_HPP
-
-#include "spirv_cross.hpp"
-
-namespace spirv_cross_util
-{
-void rename_interface_variable(SPIRV_CROSS_NAMESPACE::Compiler &compiler,
-                               const SPIRV_CROSS_NAMESPACE::SmallVector<SPIRV_CROSS_NAMESPACE::Resource> &resources,
-                               uint32_t location, const std::string &name);
-void inherit_combined_sampler_bindings(SPIRV_CROSS_NAMESPACE::Compiler &compiler);
-} // namespace spirv_cross_util
-
-#endif
diff --git a/engine/thirdparty/spirv-cross/spirv_glsl.cpp b/engine/thirdparty/spirv-cross/spirv_glsl.cpp
index f9ce6cb0..a01cef44 100644
--- a/engine/thirdparty/spirv-cross/spirv_glsl.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_glsl.cpp
@@ -37,13 +37,10 @@
 #endif
 #include <locale.h>
 
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
 using namespace std;
 
-namespace SPIRV_CROSS_NAMESPACE
-{
-
 enum ExtraSubExpressionType
 {
 	// Create masks above any legal ID range to allow multiple address spaces into the extra_sub_expressions map.
@@ -51,46 +48,6 @@ enum ExtraSubExpressionType
 	EXTRA_SUB_EXPRESSION_TYPE_AUX = 0x20000000
 };
 
-struct GlslConstantNameMapping
-{
-	uint32_t value;
-	const char *alias;
-};
-
-#define DEF_GLSL_MAPPING(x) { x, "gl_" #x }
-#define DEF_GLSL_MAPPING_EXT(x) { x##KHR, "gl_" #x }
-static const GlslConstantNameMapping CoopVecComponentTypeNames[] = {
-	DEF_GLSL_MAPPING(ComponentTypeFloat16NV),
-	DEF_GLSL_MAPPING(ComponentTypeFloat32NV),
-	DEF_GLSL_MAPPING(ComponentTypeFloat64NV),
-	DEF_GLSL_MAPPING(ComponentTypeSignedInt8NV),
-	DEF_GLSL_MAPPING(ComponentTypeSignedInt16NV),
-	DEF_GLSL_MAPPING(ComponentTypeSignedInt32NV),
-	DEF_GLSL_MAPPING(ComponentTypeSignedInt64NV),
-	DEF_GLSL_MAPPING(ComponentTypeUnsignedInt8NV),
-	DEF_GLSL_MAPPING(ComponentTypeUnsignedInt16NV),
-	DEF_GLSL_MAPPING(ComponentTypeUnsignedInt32NV),
-	DEF_GLSL_MAPPING(ComponentTypeUnsignedInt64NV),
-	DEF_GLSL_MAPPING(ComponentTypeSignedInt8PackedNV),
-	DEF_GLSL_MAPPING(ComponentTypeUnsignedInt8PackedNV),
-	DEF_GLSL_MAPPING(ComponentTypeFloatE4M3NV),
-	DEF_GLSL_MAPPING(ComponentTypeFloatE5M2NV),
-};
-
-static const GlslConstantNameMapping CoopVecMatrixLayoutNames[] = {
-	DEF_GLSL_MAPPING(CooperativeVectorMatrixLayoutRowMajorNV),
-	DEF_GLSL_MAPPING(CooperativeVectorMatrixLayoutColumnMajorNV),
-	DEF_GLSL_MAPPING(CooperativeVectorMatrixLayoutInferencingOptimalNV),
-	DEF_GLSL_MAPPING(CooperativeVectorMatrixLayoutTrainingOptimalNV),
-};
-
-static const GlslConstantNameMapping CoopMatMatrixLayoutNames[] = {
-	DEF_GLSL_MAPPING_EXT(CooperativeMatrixLayoutRowMajor),
-	DEF_GLSL_MAPPING_EXT(CooperativeMatrixLayoutColumnMajor),
-};
-#undef DEF_GLSL_MAPPING
-#undef DEF_GLSL_MAPPING_EXT
-
 static bool is_unsigned_opcode(Op op)
 {
 	// Don't have to be exhaustive, only relevant for legacy target checking ...
@@ -202,7 +159,6 @@ static BufferPackingStandard packing_to_substruct_packing(BufferPackingStandard
 		return packing;
 	}
 }
-}
 
 void CompilerGLSL::init()
 {
@@ -267,7 +223,7 @@ static const char *to_pls_layout(PlsFormat format)
 	}
 }
 
-static std::pair<Op, SPIRType::BaseType> pls_format_to_basetype(PlsFormat format)
+static std::pair<spv::Op, SPIRType::BaseType> pls_format_to_basetype(PlsFormat format)
 {
 	switch (format)
 	{
@@ -278,17 +234,17 @@ static std::pair<Op, SPIRType::BaseType> pls_format_to_basetype(PlsFormat format
 	case PlsRGB10A2:
 	case PlsRGBA8:
 	case PlsRG16:
-		return std::make_pair(OpTypeFloat, SPIRType::Float);
+		return std::make_pair(spv::OpTypeFloat, SPIRType::Float);
 
 	case PlsRGBA8I:
 	case PlsRG16I:
-		return std::make_pair(OpTypeInt, SPIRType::Int);
+		return std::make_pair(spv::OpTypeInt, SPIRType::Int);
 
 	case PlsRGB10A2UI:
 	case PlsRGBA8UI:
 	case PlsRG16UI:
 	case PlsR32UI:
-		return std::make_pair(OpTypeInt, SPIRType::UInt);
+		return std::make_pair(spv::OpTypeInt, SPIRType::UInt);
 	}
 }
 
@@ -654,20 +610,6 @@ void CompilerGLSL::find_static_extensions()
 			ray_tracing_is_khr = true;
 			break;
 
-		case CapabilityRayQueryPositionFetchKHR:
-			if (options.es || options.version < 460 || !options.vulkan_semantics)
-				SPIRV_CROSS_THROW("RayQuery Position Fetch requires Vulkan GLSL 460.");
-			require_extension_internal("GL_EXT_ray_tracing_position_fetch");
-			ray_tracing_is_khr = true;
-			break;
-
-		case CapabilityRayTracingPositionFetchKHR:
-			if (options.es || options.version < 460 || !options.vulkan_semantics)
-				SPIRV_CROSS_THROW("Ray Tracing Position Fetch requires Vulkan GLSL 460.");
-			require_extension_internal("GL_EXT_ray_tracing_position_fetch");
-			ray_tracing_is_khr = true;
-			break;
-
 		case CapabilityRayTraversalPrimitiveCullingKHR:
 			if (options.es || options.version < 460 || !options.vulkan_semantics)
 				SPIRV_CROSS_THROW("RayQuery requires Vulkan GLSL 460.");
@@ -675,19 +617,6 @@ void CompilerGLSL::find_static_extensions()
 			ray_tracing_is_khr = true;
 			break;
 
-		case CapabilityRayTracingClusterAccelerationStructureNV:
-			if (options.es || options.version < 460 || !options.vulkan_semantics)
-				SPIRV_CROSS_THROW("Cluster AS requires Vulkan GLSL 460.");
-			require_extension_internal("GL_NV_cluster_acceleration_structure");
-			ray_tracing_is_khr = true;
-			break;
-
-		case CapabilityTensorsARM:
-			if (options.es || options.version < 460 || !options.vulkan_semantics)
-				SPIRV_CROSS_THROW("Tensor requires Vulkan GLSL 460.");
-			require_extension_internal("GL_ARM_tensors");
-			break;
-
 		default:
 			break;
 		}
@@ -1490,7 +1419,7 @@ string CompilerGLSL::layout_for_member(const SPIRType &type, uint32_t index)
 	return res;
 }
 
-const char *CompilerGLSL::format_to_glsl(ImageFormat format)
+const char *CompilerGLSL::format_to_glsl(spv::ImageFormat format)
 {
 	if (options.es && is_desktop_only_format(format))
 		SPIRV_CROSS_THROW("Attempting to use image format not supported in ES profile.");
@@ -2624,7 +2553,7 @@ void CompilerGLSL::emit_buffer_block_flattened(const SPIRVariable &var)
 			SPIRV_CROSS_THROW("Basic types in a flattened UBO must be float, int or uint.");
 
 		auto flags = ir.get_buffer_block_flags(var);
-		statement("uniform ", flags_to_qualifiers_glsl(tmp, 0, flags), type_to_glsl(tmp), " ", buffer_name, "[",
+		statement("uniform ", flags_to_qualifiers_glsl(tmp, flags), type_to_glsl(tmp), " ", buffer_name, "[",
 		          buffer_size, "];");
 	}
 	else
@@ -4338,7 +4267,7 @@ void CompilerGLSL::emit_subgroup_arithmetic_workaround(const std::string &func,
 	}
 }
 
-void CompilerGLSL::emit_extension_workarounds(ExecutionModel model)
+void CompilerGLSL::emit_extension_workarounds(spv::ExecutionModel model)
 {
 	static const char *workaround_types[] = { "int",   "ivec2", "ivec3", "ivec4", "uint",   "uvec2", "uvec3", "uvec4",
 		                                      "float", "vec2",  "vec3",  "vec4",  "double", "dvec2", "dvec3", "dvec4" };
@@ -4657,7 +4586,7 @@ void CompilerGLSL::emit_extension_workarounds(ExecutionModel model)
 
 		if (shader_subgroup_supporter.is_feature_requested(Supp::SubgroupMemBarrier))
 		{
-			if (model == ExecutionModelGLCompute)
+			if (model == spv::ExecutionModelGLCompute)
 			{
 				statement("#ifndef GL_KHR_shader_subgroup_basic");
 				statement("void subgroupMemoryBarrier() { groupMemoryBarrier(); }");
@@ -4743,7 +4672,7 @@ void CompilerGLSL::emit_extension_workarounds(ExecutionModel model)
 		}
 
 		auto arithmetic_feature_helper =
-		    [&](Supp::Feature feat, std::string func_name, Op op, GroupOperation group_op)
+		    [&](Supp::Feature feat, std::string func_name, spv::Op op, spv::GroupOperation group_op)
 		{
 			if (shader_subgroup_supporter.is_feature_requested(feat))
 			{
@@ -5051,10 +4980,10 @@ void CompilerGLSL::emit_polyfills(uint32_t polyfills, bool relaxed)
 // Returns a string representation of the ID, usable as a function arg.
 // Default is to simply return the expression representation fo the arg ID.
 // Subclasses may override to modify the return value.
-string CompilerGLSL::to_func_call_arg(const SPIRFunction::Parameter &arg, uint32_t id)
+string CompilerGLSL::to_func_call_arg(const SPIRFunction::Parameter &, uint32_t id)
 {
 	// BDA expects pointers through function interface.
-	if (!arg.alias_global_variable && is_physical_or_buffer_pointer(expression_type(id)))
+	if (is_physical_pointer(expression_type(id)))
 		return to_pointer_expression(id);
 
 	// Make sure that we use the name of the original variable, and not the parameter alias.
@@ -5865,22 +5794,8 @@ string CompilerGLSL::constant_op_expression(const SPIRConstantOp &cop)
 
 	case OpCompositeExtract:
 	{
-		// Trivial vector extracts (of WorkGroupSize typically),
-		// punch through to the input spec constant if the composite is used as array size.
-		const auto *c = maybe_get<SPIRConstant>(cop.arguments[0]);
-
-		string expr;
-		if (c && cop.arguments.size() == 2 && c->is_used_as_array_length &&
-		    !backend.supports_spec_constant_array_size &&
-		    is_vector(get<SPIRType>(c->constant_type)))
-		{
-			expr = to_expression(c->specialization_constant_id(0, cop.arguments[1]));
-		}
-		else
-		{
-			expr = access_chain_internal(cop.arguments[0], &cop.arguments[1], uint32_t(cop.arguments.size() - 1),
-			                             ACCESS_CHAIN_INDEX_IS_LITERAL_BIT, nullptr);
-		}
+		auto expr = access_chain_internal(cop.arguments[0], &cop.arguments[1], uint32_t(cop.arguments.size() - 1),
+		                                  ACCESS_CHAIN_INDEX_IS_LITERAL_BIT, nullptr);
 		return expr;
 	}
 
@@ -6028,9 +5943,9 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c,
 		require_extension_internal("GL_EXT_null_initializer");
 		return backend.constant_null_initializer;
 	}
-	else if (c.replicated && type.op != OpTypeArray)
+	else if (c.replicated && type.op != spv::OpTypeArray)
 	{
-		if (type.op == OpTypeMatrix)
+		if (type.op == spv::OpTypeMatrix)
 		{
 			uint32_t num_elements = type.columns;
 			// GLSL does not allow the replication constructor for matrices
@@ -6165,7 +6080,7 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c,
 		else
 			return join(type_to_glsl(type), "(0)");
 	}
-	else if (c.columns() == 1 && type.op != OpTypeCooperativeMatrixKHR)
+	else if (c.columns() == 1 && type.op != spv::OpTypeCooperativeMatrixKHR)
 	{
 		auto res = constant_expression_vector(c, 0);
 
@@ -6892,20 +6807,10 @@ void CompilerGLSL::emit_uninitialized_temporary(uint32_t result_type, uint32_t r
 		if (options.force_zero_initialized_variables && type_can_zero_initialize(type))
 			initializer = join(" = ", to_zero_initialized_expression(result_type));
 
-		statement(flags_to_qualifiers_glsl(type, result_id, flags), variable_decl(type, to_name(result_id)), initializer, ";");
+		statement(flags_to_qualifiers_glsl(type, flags), variable_decl(type, to_name(result_id)), initializer, ";");
 	}
 }
 
-bool CompilerGLSL::can_declare_inline_temporary(uint32_t id) const
-{
-	if (!block_temporary_hoisting && current_continue_block && !hoisted_temporaries.count(id))
-		return false;
-	if (hoisted_temporaries.count(id))
-		return false;
-
-	return true;
-}
-
 string CompilerGLSL::declare_temporary(uint32_t result_type, uint32_t result_id)
 {
 	auto &type = get<SPIRType>(result_type);
@@ -6937,7 +6842,7 @@ string CompilerGLSL::declare_temporary(uint32_t result_type, uint32_t result_id)
 		// The result_id has not been made into an expression yet, so use flags interface.
 		add_local_variable_name(result_id);
 		auto &flags = get_decoration_bitset(result_id);
-		return join(flags_to_qualifiers_glsl(type, result_id, flags), variable_decl(type, to_name(result_id)), " = ");
+		return join(flags_to_qualifiers_glsl(type, flags), variable_decl(type, to_name(result_id)), " = ");
 	}
 }
 
@@ -6983,42 +6888,6 @@ SPIRExpression &CompilerGLSL::emit_op(uint32_t result_type, uint32_t result_id,
 	}
 }
 
-void CompilerGLSL::emit_transposed_op(uint32_t result_type, uint32_t result_id, const string &rhs, bool forwarding)
-{
-	if (forwarding && (forced_temporaries.find(result_id) == end(forced_temporaries)))
-	{
-		// Just forward it without temporary.
-		// If the forward is trivial, we do not force flushing to temporary for this expression.
-		forwarded_temporaries.insert(result_id);
-		auto &e = set<SPIRExpression>(result_id, rhs, result_type, true);
-		e.need_transpose = true;
-	}
-	else if (can_declare_inline_temporary(result_id))
-	{
-		// If expression isn't immutable, bind it to a temporary and make the new temporary immutable (they always are).
-		// Since the expression is transposed, we have to ensure the temporary is the transposed type.
-
-		auto &transposed_type_id = extra_sub_expressions[result_id];
-		if (!transposed_type_id)
-		{
-			auto dummy_type = get<SPIRType>(result_type);
-			std::swap(dummy_type.columns, dummy_type.vecsize);
-			transposed_type_id = ir.increase_bound_by(1);
-			set<SPIRType>(transposed_type_id, dummy_type);
-		}
-
-		statement(declare_temporary(transposed_type_id, result_id), rhs, ";");
-		auto &e = set<SPIRExpression>(result_id, to_name(result_id), result_type, true);
-		e.need_transpose = true;
-	}
-	else
-	{
-		// If we cannot declare the temporary because it's already been hoisted, we don't have the
-		// chance to override the temporary type ourselves. Just transpose() the expression.
-		emit_op(result_type, result_id, join("transpose(", rhs, ")"), forwarding);
-	}
-}
-
 void CompilerGLSL::emit_unary_op(uint32_t result_type, uint32_t result_id, uint32_t op0, const char *op)
 {
 	bool forward = should_forward(op0);
@@ -7046,7 +6915,7 @@ void CompilerGLSL::emit_binary_op(uint32_t result_type, uint32_t result_id, uint
 {
 	// Various FP arithmetic opcodes such as add, sub, mul will hit this.
 	bool force_temporary_precise = backend.support_precise_qualifier &&
-	                               has_legacy_nocontract(result_type, result_id) &&
+	                               has_decoration(result_id, DecorationNoContraction) &&
 	                               type_is_floating_point(get<SPIRType>(result_type));
 	bool forward = should_forward(op0) && should_forward(op1) && !force_temporary_precise;
 
@@ -7530,29 +7399,29 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
 	const char *type;
 	switch (imgtype.image.dim)
 	{
-	case Dim1D:
+	case spv::Dim1D:
 		// Force 2D path for ES.
 		if (options.es)
 			type = (imgtype.image.arrayed && !options.es) ? "2DArray" : "2D";
 		else
 			type = (imgtype.image.arrayed && !options.es) ? "1DArray" : "1D";
 		break;
-	case Dim2D:
+	case spv::Dim2D:
 		type = (imgtype.image.arrayed && !options.es) ? "2DArray" : "2D";
 		break;
-	case Dim3D:
+	case spv::Dim3D:
 		type = "3D";
 		break;
-	case DimCube:
+	case spv::DimCube:
 		type = "Cube";
 		break;
-	case DimRect:
+	case spv::DimRect:
 		type = "2DRect";
 		break;
-	case DimBuffer:
+	case spv::DimBuffer:
 		type = "Buffer";
 		break;
-	case DimSubpassData:
+	case spv::DimSubpassData:
 		type = "2D";
 		break;
 	default:
@@ -7595,7 +7464,7 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
 		else
 			SPIRV_CROSS_THROW(join(op, " not allowed on depth samplers in legacy ES"));
 
-		if (imgtype.image.dim == DimCube)
+		if (imgtype.image.dim == spv::DimCube)
 			return "shadowCubeNV";
 	}
 
@@ -7862,7 +7731,7 @@ string CompilerGLSL::to_combined_image_sampler(VariableID image_id, VariableID s
 	}
 }
 
-bool CompilerGLSL::is_supported_subgroup_op_in_opengl(Op op, const uint32_t *ops)
+bool CompilerGLSL::is_supported_subgroup_op_in_opengl(spv::Op op, const uint32_t *ops)
 {
 	switch (op)
 	{
@@ -8124,19 +7993,19 @@ std::string CompilerGLSL::to_texture_op(const Instruction &i, bool sparse, bool
 	uint32_t coord_components = 0;
 	switch (imgtype.image.dim)
 	{
-	case Dim1D:
+	case spv::Dim1D:
 		coord_components = 1;
 		break;
-	case Dim2D:
+	case spv::Dim2D:
 		coord_components = 2;
 		break;
-	case Dim3D:
+	case spv::Dim3D:
 		coord_components = 3;
 		break;
-	case DimCube:
+	case spv::DimCube:
 		coord_components = 3;
 		break;
-	case DimBuffer:
+	case spv::DimBuffer:
 		coord_components = 1;
 		break;
 	default:
@@ -9577,35 +9446,6 @@ void CompilerGLSL::emit_subgroup_op(const Instruction &i)
 	auto int_type = to_signed_basetype(integer_width);
 	auto uint_type = to_unsigned_basetype(integer_width);
 
-	if (options.vulkan_semantics)
-	{
-		auto &return_type = get<SPIRType>(ops[0]);
-		switch (return_type.basetype)
-		{
-		case SPIRType::SByte:
-		case SPIRType::UByte:
-			require_extension_internal("GL_EXT_shader_subgroup_extended_types_int8");
-			break;
-
-		case SPIRType::Short:
-		case SPIRType::UShort:
-			require_extension_internal("GL_EXT_shader_subgroup_extended_types_int16");
-			break;
-
-		case SPIRType::Half:
-			require_extension_internal("GL_EXT_shader_subgroup_extended_types_float16");
-			break;
-
-		case SPIRType::Int64:
-		case SPIRType::UInt64:
-			require_extension_internal("GL_EXT_shader_subgroup_extended_types_int64");
-			break;
-
-		default:
-			break;
-		}
-	}
-
 	switch (op)
 	{
 	case OpGroupNonUniformElect:
@@ -10125,9 +9965,9 @@ string CompilerGLSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
 			auto model = get_entry_point().model;
 			switch (model)
 			{
-			case ExecutionModelIntersectionKHR:
-			case ExecutionModelAnyHitKHR:
-			case ExecutionModelClosestHitKHR:
+			case spv::ExecutionModelIntersectionKHR:
+			case spv::ExecutionModelAnyHitKHR:
+			case spv::ExecutionModelClosestHitKHR:
 				// gl_InstanceID is allowed in these shaders.
 				break;
 
@@ -10459,22 +10299,6 @@ string CompilerGLSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
 	case BuiltInCullPrimitiveEXT:
 		return "gl_CullPrimitiveEXT";
 
-	case BuiltInHitTriangleVertexPositionsKHR:
-	{
-		if (!options.vulkan_semantics)
-			SPIRV_CROSS_THROW("Need Vulkan semantics for EXT_ray_tracing_position_fetch.");
-		require_extension_internal("GL_EXT_ray_tracing_position_fetch");
-		return "gl_HitTriangleVertexPositionsEXT";
-	}
-
-	case BuiltInClusterIDNV:
-	{
-		if (!options.vulkan_semantics)
-			SPIRV_CROSS_THROW("Can only use ClusterIDNV in Vulkan GLSL.");
-		require_extension_internal("GL_NV_cluster_acceleration_structure");
-		return "gl_ClusterIDNV";
-	}
-
 	default:
 		return join("gl_BuiltIn_", convert_to_string(builtin));
 	}
@@ -10587,7 +10411,7 @@ string CompilerGLSL::access_chain_internal(uint32_t base, const uint32_t *indice
 	bool dimension_flatten = false;
 	bool access_meshlet_position_y = false;
 	bool chain_is_builtin = false;
-	BuiltIn chained_builtin = {};
+	spv::BuiltIn chained_builtin = {};
 
 	if (auto *base_expr = maybe_get<SPIRExpression>(base))
 	{
@@ -10718,8 +10542,8 @@ string CompilerGLSL::access_chain_internal(uint32_t base, const uint32_t *indice
 			if (ptr_chain_array_entry)
 				expr = join("(", expr, ")");
 		}
-		// Arrays and OpTypeCooperativeVectorNV (aka fancy arrays)
-		else if (!type->array.empty() || type->op == OpTypeCooperativeVectorNV)
+		// Arrays
+		else if (!type->array.empty())
 		{
 			// If we are flattening multidimensional arrays, only create opening bracket on first
 			// array index.
@@ -11118,7 +10942,7 @@ bool CompilerGLSL::check_physical_type_cast(std::string &, const SPIRType *, uin
 	return false;
 }
 
-bool CompilerGLSL::prepare_access_chain_for_scalar_access(std::string &, const SPIRType &, StorageClass, bool &)
+bool CompilerGLSL::prepare_access_chain_for_scalar_access(std::string &, const SPIRType &, spv::StorageClass, bool &)
 {
 	return false;
 }
@@ -11627,7 +11451,7 @@ bool CompilerGLSL::should_dereference(uint32_t id)
 	// If id is a variable but not a phi variable, we should not dereference it.
 	// BDA passed around as parameters are always pointers.
 	if (auto *var = maybe_get<SPIRVariable>(id))
-		return (var->parameter && is_physical_or_buffer_pointer(type)) || var->phi_variable;
+		return (var->parameter && is_physical_pointer(type)) || var->phi_variable;
 
 	if (auto *expr = maybe_get<SPIRExpression>(id))
 	{
@@ -11663,8 +11487,8 @@ bool CompilerGLSL::should_dereference(uint32_t id)
 bool CompilerGLSL::should_dereference_caller_param(uint32_t id)
 {
 	const auto &type = expression_type(id);
-	// BDA is always passed around as pointers. Similarly, we need to pass variable buffer pointers as pointers.
-	if (is_physical_or_buffer_pointer(type))
+	// BDA is always passed around as pointers.
+	if (is_physical_pointer(type))
 		return false;
 
 	return should_dereference(id);
@@ -11824,7 +11648,7 @@ void CompilerGLSL::emit_variable_temporary_copies(const SPIRVariable &var)
 	{
 		auto &type = get<SPIRType>(var.basetype);
 		auto &flags = get_decoration_bitset(var.self);
-		statement(flags_to_qualifiers_glsl(type, var.self, flags), variable_decl(type, join("_", var.self, "_copy")), ";");
+		statement(flags_to_qualifiers_glsl(type, flags), variable_decl(type, join("_", var.self, "_copy")), ";");
 		flushed_phi_variables.insert(var.self);
 	}
 }
@@ -11965,7 +11789,7 @@ string CompilerGLSL::build_composite_combiner(uint32_t return_type, const uint32
 	// Can only merge swizzles for vectors.
 	auto &type = get<SPIRType>(return_type);
 	bool can_apply_swizzle_opt = type.basetype != SPIRType::Struct && type.array.empty() && type.columns == 1 &&
-	                             type.op != OpTypeCooperativeMatrixKHR;
+	                             type.op != spv::OpTypeCooperativeMatrixKHR;
 	bool swizzle_optimization = false;
 
 	for (uint32_t i = 0; i < length; i++)
@@ -13092,7 +12916,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		if (composite_type_is_complex)
 			allow_base_expression = false;
 
-		if (composite_type.op == OpTypeCooperativeMatrixKHR)
+		if (composite_type.op == spv::OpTypeCooperativeMatrixKHR)
 			allow_base_expression = false;
 
 		// Packed expressions or physical ID mapped expressions cannot be split up.
@@ -13553,7 +13377,8 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 			auto expr = join(enclose_expression(to_unpacked_row_major_matrix_expression(ops[3])), " * ",
 			                 enclose_expression(to_unpacked_row_major_matrix_expression(ops[2])));
 			bool forward = should_forward(ops[2]) && should_forward(ops[3]);
-			emit_transposed_op(ops[0], ops[1], expr, forward);
+			auto &e = emit_op(ops[0], ops[1], expr, forward);
+			e.need_transpose = true;
 			a->need_transpose = true;
 			b->need_transpose = true;
 			inherit_expression_dependencies(ops[1], ops[2]);
@@ -13576,7 +13401,8 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 			auto expr = join(enclose_expression(to_unpacked_row_major_matrix_expression(ops[2])), " * ",
 			                 to_enclosed_unpacked_expression(ops[3]));
 			bool forward = should_forward(ops[2]) && should_forward(ops[3]);
-			emit_transposed_op(ops[0], ops[1], expr, forward);
+			auto &e = emit_op(ops[0], ops[1], expr, forward);
+			e.need_transpose = true;
 			a->need_transpose = true;
 			inherit_expression_dependencies(ops[1], ops[2]);
 			inherit_expression_dependencies(ops[1], ops[3]);
@@ -14051,8 +13877,8 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		if (type.op == OpTypeCooperativeMatrixKHR && opcode == OpFConvert)
 		{
 			auto &expr_type = expression_type(ops[2]);
-			if (get<SPIRConstant>(type.ext.cooperative.use_id).scalar() !=
-			    get<SPIRConstant>(expr_type.ext.cooperative.use_id).scalar())
+			if (get<SPIRConstant>(type.cooperative.use_id).scalar() !=
+			    get<SPIRConstant>(expr_type.cooperative.use_id).scalar())
 			{
 				// Somewhat questionable with spec constant uses.
 				if (!options.vulkan_semantics)
@@ -14062,7 +13888,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		}
 
 		if ((type.basetype == SPIRType::FloatE4M3 || type.basetype == SPIRType::FloatE5M2) &&
-		    has_decoration(id, DecorationSaturatedToLargestFloat8NormalConversionEXT))
+		    has_decoration(id, spv::DecorationSaturatedToLargestFloat8NormalConversionEXT))
 		{
 			emit_uninitialized_temporary_expression(result_type, id);
 			statement("saturatedConvertEXT(", to_expression(id), ", ", to_unpacked_expression(ops[2]), ");");
@@ -15217,11 +15043,8 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		{
 			emit_spv_amd_gcn_shader_op(ops[0], ops[1], ops[3], &ops[4], length - 4);
 		}
-		else if (ext == SPIRExtension::NonSemanticShaderDebugInfo)
-		{
-			emit_non_semantic_shader_debug_info(ops[0], ops[1], ops[3], &ops[4], length - 4);
-		}
 		else if (ext == SPIRExtension::SPV_debug_info ||
+		         ext == SPIRExtension::NonSemanticShaderDebugInfo ||
 		         ext == SPIRExtension::NonSemanticGeneric)
 		{
 			break; // Ignore SPIR-V debug information extended instructions.
@@ -15367,7 +15190,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		uint32_t result_type = ops[0];
 		uint32_t id = ops[1];
 
-		if (type.image.dim == DimSubpassData)
+		if (type.image.dim == spv::DimSubpassData)
 		{
 			emit_unary_func_op(result_type, id, ops[2], "fragmentMaskFetchAMD");
 		}
@@ -15386,7 +15209,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		uint32_t result_type = ops[0];
 		uint32_t id = ops[1];
 
-		if (type.image.dim == DimSubpassData)
+		if (type.image.dim == spv::DimSubpassData)
 		{
 			emit_binary_func_op(result_type, id, ops[2], ops[4], "fragmentFetchAMD");
 		}
@@ -15596,11 +15419,6 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		flush_variable_declaration(ops[0]);
 		statement("rayQueryConfirmIntersectionEXT(", to_expression(ops[0]), ");");
 		break;
-	case OpRayQueryGetIntersectionTriangleVertexPositionsKHR:
-		flush_variable_declaration(ops[1]);
-		emit_uninitialized_temporary_expression(ops[0], ops[1]);
-		statement("rayQueryGetIntersectionTriangleVertexPositionsEXT(", to_expression(ops[2]), ", bool(", to_expression(ops[3]), "), ", to_expression(ops[1]), ");");
-		break;
 #define GLSL_RAY_QUERY_GET_OP(op) \
 	case OpRayQueryGet##op##KHR: \
 		flush_variable_declaration(ops[2]); \
@@ -15631,81 +15449,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 	GLSL_RAY_QUERY_GET_OP2(IntersectionWorldToObject);
 #undef GLSL_RAY_QUERY_GET_OP
 #undef GLSL_RAY_QUERY_GET_OP2
-	case OpRayQueryGetClusterIdNV:
-		flush_variable_declaration(ops[2]);
-		emit_op(ops[0], ops[1], join("rayQueryGetIntersectionClusterIdNV(", to_expression(ops[2]), ", ", "bool(", to_expression(ops[3]), "))"), false);
-		break;
-	case OpTensorQuerySizeARM:
-		flush_variable_declaration(ops[1]);
-		// tensorSizeARM(tensor, dimension)
-		emit_binary_func_op(ops[0], ops[1], ops[2], ops[3], "tensorSizeARM");
-		break;
-	case OpTensorReadARM:
-	{
-		flush_variable_declaration(ops[1]);
-		emit_uninitialized_temporary_expression(ops[0], ops[1]);
 
-		SmallVector<std::string> args {
-			to_expression(ops[2]), // tensor
-			to_expression(ops[3]), // coordinates
-			to_expression(ops[1]), // out value
-		};
-		if (length > 4)
-		{
-			std::string tensor_operands;
-			if (ops[4] == 0)
-				tensor_operands = "0x0u";
-			else if (ops[4] == TensorOperandsNontemporalARMMask)
-				tensor_operands = "gl_TensorOperandsNonTemporalARM";
-			else if (ops[4] == TensorOperandsOutOfBoundsValueARMMask)
-				tensor_operands = "gl_TensorOperandsOutOfBoundsValueARM";
-			else if (ops[4] == (TensorOperandsNontemporalARMMask | TensorOperandsOutOfBoundsValueARMMask))
-				tensor_operands = "gl_TensorOperandsNonTemporalARM | gl_TensorOperandsOutOfBoundsValueARM";
-			else
-				SPIRV_CROSS_THROW("Invalid tensorOperands for tensorReadARM.");
-			if ((ops[4] & TensorOperandsOutOfBoundsValueARMMask) && length != 6)
-				SPIRV_CROSS_THROW("gl_TensorOperandsOutOfBoundsValueARM requires an outOfBoundsValue argument.");
-			args.push_back(tensor_operands); // tensorOperands
-		}
-		if (length >= 6)
-		{
-			if ((length > 6) || (ops[4] & TensorOperandsOutOfBoundsValueARMMask) == 0)
-				SPIRV_CROSS_THROW("Too many arguments to tensorReadARM.");
-			args.push_back(to_expression(ops[5])); // outOfBoundsValue
-		}
-
-		// tensorRead(tensor, sizeof(type), coordinates, value, operand, ...)
-		statement("tensorReadARM(", merge(args), ");");
-		break;
-	}
-	case OpTensorWriteARM:
-	{
-		flush_variable_declaration(ops[0]);
-
-		SmallVector<std::string> args {
-			to_expression(ops[0]), // tensor
-			to_expression(ops[1]), // coordinates
-			to_expression(ops[2]), // out value
-		};
-
-		if (length > 3)
-		{
-			std::string tensor_operands;
-			if (ops[3] == 0)
-				tensor_operands = "0x0u";
-			else if (ops[3] == TensorOperandsNontemporalARMMask)
-				tensor_operands = "gl_TensorOperandsNonTemporalARM";
-			else
-				SPIRV_CROSS_THROW("Invalid tensorOperands for tensorWriteARM.");
-			args.push_back(tensor_operands); // tensorOperands
-		}
-		if (length > 4)
-			SPIRV_CROSS_THROW("Too many arguments to tensorWriteARM.");
-
-		// tensorWrite(tensor, sizeof(type), coordinates, value)
-		statement("tensorWriteARM(", merge(args), ");");
-		break;
-	}
 	case OpConvertUToAccelerationStructureKHR:
 	{
 		require_extension_internal("GL_EXT_ray_tracing");
@@ -15851,104 +15595,6 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		break;
 	}
 
-	case OpCooperativeVectorLoadNV:
-	{
-		uint32_t result_type = ops[0];
-		uint32_t id = ops[1];
-
-		emit_uninitialized_temporary_expression(result_type, id);
-
-		statement("coopVecLoadNV(", to_expression(id), ", ", to_expression(ops[2]), ", ", to_expression(ops[3]), ");");
-		register_read(id, ops[2], false);
-		break;
-	}
-
-	case OpCooperativeVectorStoreNV:
-	{
-		uint32_t id = ops[0];
-
-		statement("coopVecStoreNV(", to_expression(ops[2]), ", ", to_expression(id), ", ", to_expression(ops[1]), ");");
-		register_write(ops[2]);
-		break;
-	}
-
-	case OpCooperativeVectorOuterProductAccumulateNV:
-	{
-		auto buf = ops[0];
-		auto offset = ops[1];
-		auto v1 = ops[2];
-		auto v2 = ops[3];
-		auto matrix_layout_id = ops[4];
-		auto matrix_iterpretation_id = ops[5];
-		auto matrix_stride_id = length >= 6 ? ops[6] : 0;
-		statement(join("coopVecOuterProductAccumulateNV(", to_expression(v1), ", ", to_expression(v2), ", ",
-		               to_expression(buf), ", ", to_expression(offset), ", ",
-		               matrix_stride_id ? to_expression(matrix_stride_id) : "0",
-					   ", ", to_pretty_expression_if_int_constant(
-							   matrix_layout_id, std::begin(CoopVecMatrixLayoutNames), std::end(CoopVecMatrixLayoutNames)),
-		               ", ", to_pretty_expression_if_int_constant(
-							   matrix_iterpretation_id, std::begin(CoopVecComponentTypeNames), std::end(CoopVecComponentTypeNames)),
-		               ");"));
-		register_write(ops[0]);
-		break;
-	}
-
-	case OpCooperativeVectorReduceSumAccumulateNV:
-	{
-		auto buf = ops[0];
-		auto offset = ops[1];
-		auto v1 = ops[2];
-		statement(join("coopVecReduceSumAccumulateNV(", to_expression(v1), ", ", to_expression(buf), ", ",
-		               to_expression(offset), ");"));
-		register_write(ops[0]);
-		break;
-	}
-
-	case OpCooperativeVectorMatrixMulNV:
-	case OpCooperativeVectorMatrixMulAddNV:
-	{
-		uint32_t result_type = ops[0];
-		uint32_t id = ops[1];
-
-		emit_uninitialized_temporary_expression(result_type, id);
-
-		std::string stmt;
-		switch (opcode)
-		{
-		case OpCooperativeVectorMatrixMulAddNV:
-			stmt += "coopVecMatMulAddNV(";
-			break;
-		case OpCooperativeVectorMatrixMulNV:
-			stmt += "coopVecMatMulNV(";
-			break;
-		default:
-			SPIRV_CROSS_THROW("Invalid op code for coopvec instruction.");
-		}
-		for (uint32_t i = 1; i < length; i++)
-		{
-			// arguments 3, 6 and in case of MulAddNv also 9 use component type int constants
-			if (i == 3 || i == 6 || (i == 9 && opcode == OpCooperativeVectorMatrixMulAddNV))
-			{
-				stmt += to_pretty_expression_if_int_constant(
-						ops[i], std::begin(CoopVecComponentTypeNames), std::end(CoopVecComponentTypeNames));
-			}
-			else if ((i == 12 && opcode == OpCooperativeVectorMatrixMulAddNV) ||
-			         (i == 9 && opcode == OpCooperativeVectorMatrixMulNV))
-			{
-				stmt += to_pretty_expression_if_int_constant(
-						ops[i], std::begin(CoopVecMatrixLayoutNames), std::end(CoopVecMatrixLayoutNames));
-			}
-			else
-				stmt += to_expression(ops[i]);
-
-			if (i < length - 1)
-				stmt += ", ";
-		}
-		stmt += ");";
-		statement(stmt);
-		break;
-	}
-
 	case OpCooperativeMatrixLengthKHR:
 	{
 		// Need to synthesize a dummy temporary, since the SPIR-V opcode is based on the type.
@@ -15976,10 +15622,27 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		if (!is_forcing_recompilation())
 			split_expr = split_coopmat_pointer(expr);
 
-		string layout_expr = to_pretty_expression_if_int_constant(
-				ops[3], std::begin(CoopMatMatrixLayoutNames), std::end(CoopMatMatrixLayoutNames));
-		statement("coopMatLoad(", to_expression(id), ", ", split_expr.first, ", ", split_expr.second, ", ",
-		          to_expression(ops[4]), ", ", layout_expr, ");");
+		string layout_expr;
+		if (const auto *layout = maybe_get<SPIRConstant>(ops[3]))
+		{
+			if (!layout->specialization)
+			{
+				if (layout->scalar() == spv::CooperativeMatrixLayoutColumnMajorKHR)
+					layout_expr = "gl_CooperativeMatrixLayoutColumnMajor";
+				else
+					layout_expr = "gl_CooperativeMatrixLayoutRowMajor";
+			}
+		}
+
+		if (layout_expr.empty())
+			layout_expr = join("int(", to_expression(ops[3]), ")");
+
+		statement("coopMatLoad(",
+		          to_expression(id), ", ",
+		          split_expr.first, ", ",
+		          split_expr.second, ", ",
+		          to_expression(ops[4]), ", ",
+		          layout_expr, ");");
 
 		register_read(id, ops[2], false);
 		break;
@@ -15999,11 +15662,27 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		if (!is_forcing_recompilation())
 			split_expr = split_coopmat_pointer(expr);
 
-		string layout_expr = to_pretty_expression_if_int_constant(
-				ops[2], std::begin(CoopMatMatrixLayoutNames), std::end(CoopMatMatrixLayoutNames));
+		string layout_expr;
+		if (const auto *layout = maybe_get<SPIRConstant>(ops[2]))
+		{
+			if (!layout->specialization)
+			{
+				if (layout->scalar() == spv::CooperativeMatrixLayoutColumnMajorKHR)
+					layout_expr = "gl_CooperativeMatrixLayoutColumnMajor";
+				else
+					layout_expr = "gl_CooperativeMatrixLayoutRowMajor";
+			}
+		}
 
-		statement("coopMatStore(", to_expression(ops[1]), ", ", split_expr.first, ", ", split_expr.second, ", ",
-		          to_expression(ops[3]), ", ", layout_expr, ");");
+		if (layout_expr.empty())
+			layout_expr = join("int(", to_expression(ops[2]), ")");
+
+		statement("coopMatStore(",
+		          to_expression(ops[1]), ", ",
+		          split_expr.first, ", ",
+		          split_expr.second, ", ",
+		          to_expression(ops[3]), ", ",
+		          layout_expr, ");");
 
 		// TODO: Do we care about memory operands?
 
@@ -16043,15 +15722,15 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 		auto value_to_replicate = to_expression(ops[2]);
 		std::string rhs;
 		// Matrices don't have a replicating constructor for vectors. Need to manually replicate
-		if (type.op == OpTypeMatrix || type.op == OpTypeArray)
+		if (type.op == spv::OpTypeMatrix || type.op == spv::OpTypeArray)
 		{
-			if (type.op == OpTypeArray && type.array.size() != 1)
+			if (type.op == spv::OpTypeArray && type.array.size() != 1)
 			{
 				SPIRV_CROSS_THROW(
 				    "Multi-dimensional arrays currently not supported for OpCompositeConstructReplicateEXT");
 			}
-			uint32_t num_elements = type.op == OpTypeMatrix ? type.columns : type.array[0];
-			if (backend.use_initializer_list && type.op == OpTypeArray)
+			uint32_t num_elements = type.op == spv::OpTypeMatrix ? type.columns : type.array[0];
+			if (backend.use_initializer_list && type.op == spv::OpTypeArray)
 			{
 				rhs += "{";
 			}
@@ -16066,7 +15745,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
 				if (i < num_elements - 1)
 					rhs += ", ";
 			}
-			if (backend.use_initializer_list && type.op == OpTypeArray)
+			if (backend.use_initializer_list && type.op == spv::OpTypeArray)
 				rhs += "}";
 			else
 				rhs += ")";
@@ -16296,7 +15975,7 @@ void CompilerGLSL::emit_struct_member(const SPIRType &type, uint32_t member_type
 	if (is_block)
 		qualifiers = to_interpolation_qualifiers(memberflags);
 
-	statement(layout_for_member(type, index), qualifiers, qualifier, flags_to_qualifiers_glsl(membertype, 0, memberflags),
+	statement(layout_for_member(type, index), qualifiers, qualifier, flags_to_qualifiers_glsl(membertype, memberflags),
 	          variable_decl(membertype, to_member_name(type, index)), ";");
 }
 
@@ -16304,7 +15983,7 @@ void CompilerGLSL::emit_struct_padding_target(const SPIRType &)
 {
 }
 
-string CompilerGLSL::flags_to_qualifiers_glsl(const SPIRType &type, uint32_t id, const Bitset &flags)
+string CompilerGLSL::flags_to_qualifiers_glsl(const SPIRType &type, const Bitset &flags)
 {
 	// GL_EXT_buffer_reference variables can be marked as restrict.
 	if (flags.get(DecorationRestrictPointerEXT))
@@ -16312,12 +15991,8 @@ string CompilerGLSL::flags_to_qualifiers_glsl(const SPIRType &type, uint32_t id,
 
 	string qual;
 
-	if (type_is_floating_point(type) &&
-	    (flags.get(DecorationNoContraction) || (type.self && has_legacy_nocontract(type.self, id))) &&
-	    backend.support_precise_qualifier)
-	{
+	if (type_is_floating_point(type) && flags.get(DecorationNoContraction) && backend.support_precise_qualifier)
 		qual = "precise ";
-	}
 
 	// Structs do not have precision qualifiers, neither do doubles (desktop only anyways, so no mediump/highp).
 	bool type_supports_precision =
@@ -16386,7 +16061,7 @@ string CompilerGLSL::to_precision_qualifiers_glsl(uint32_t id)
 		if (result_type.width < 32)
 			return "mediump ";
 	}
-	return flags_to_qualifiers_glsl(type, id, ir.meta[id].decoration.decoration_flags);
+	return flags_to_qualifiers_glsl(type, ir.meta[id].decoration.decoration_flags);
 }
 
 void CompilerGLSL::fixup_io_block_patch_primitive_qualifiers(const SPIRVariable &var)
@@ -16469,13 +16144,6 @@ string CompilerGLSL::to_qualifiers_glsl(uint32_t id)
 				SPIRV_CROSS_THROW("Cannot use GL_EXT_shader_image_load_formatted in ESSL.");
 		}
 	}
-	else if (type.basetype == SPIRType::Tensor)
-	{
-		if (flags.get(DecorationNonWritable))
-			res += "readonly ";
-		if (flags.get(DecorationNonReadable))
-			res += "writeonly ";
-	}
 
 	res += to_precision_qualifiers_glsl(id);
 
@@ -16910,14 +16578,6 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
 	case SPIRType::RayQuery:
 		return "rayQueryEXT";
 
-	case SPIRType::Tensor:
-		if (type.ext.tensor.rank == 0)
-			SPIRV_CROSS_THROW("GLSL tensors must have a Rank.");
-		if (type.ext.tensor.shape != 0)
-			SPIRV_CROSS_THROW("GLSL tensors cannot have a Shape.");
-		return join("tensorARM<", type_to_glsl(get<SPIRType>(type.ext.tensor.type)), ", ",
-								to_expression(type.ext.tensor.rank), ">");
-
 	case SPIRType::Void:
 		return "void";
 
@@ -16945,28 +16605,17 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
 			require_extension_internal("GL_ARB_shader_atomic_counters");
 	}
 
-	if (type.op == OpTypeCooperativeVectorNV)
-	{
-		require_extension_internal("GL_NV_cooperative_vector");
-		if (!options.vulkan_semantics)
-			SPIRV_CROSS_THROW("Cooperative vector NV only available in Vulkan.");
-
-		std::string component_type_str = type_to_glsl(get<SPIRType>(type.ext.coopVecNV.component_type_id));
-
-		return join("coopvecNV<", component_type_str, ", ", to_expression(type.ext.coopVecNV.component_count_id), ">");
-	}
-
 	const SPIRType *coop_type = &type;
 	while (is_pointer(*coop_type) || is_array(*coop_type))
 		coop_type = &get<SPIRType>(coop_type->parent_type);
 
-	if (coop_type->op == OpTypeCooperativeMatrixKHR)
+	if (coop_type->op == spv::OpTypeCooperativeMatrixKHR)
 	{
 		require_extension_internal("GL_KHR_cooperative_matrix");
 		if (!options.vulkan_semantics)
 			SPIRV_CROSS_THROW("Cooperative matrix only available in Vulkan.");
 		// GLSL doesn't support this as spec constant, which makes sense ...
-		uint32_t use_type = get<SPIRConstant>(coop_type->ext.cooperative.use_id).scalar();
+		uint32_t use_type = get<SPIRConstant>(coop_type->cooperative.use_id).scalar();
 
 		const char *use = nullptr;
 		switch (use_type)
@@ -16988,14 +16637,14 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
 		}
 
 		string scope_expr;
-		if (const auto *scope = maybe_get<SPIRConstant>(coop_type->ext.cooperative.scope_id))
+		if (const auto *scope = maybe_get<SPIRConstant>(coop_type->cooperative.scope_id))
 		{
 			if (!scope->specialization)
 			{
 				require_extension_internal("GL_KHR_memory_scope_semantics");
-				if (scope->scalar() == ScopeSubgroup)
+				if (scope->scalar() == spv::ScopeSubgroup)
 					scope_expr = "gl_ScopeSubgroup";
-				else if (scope->scalar() == ScopeWorkgroup)
+				else if (scope->scalar() == spv::ScopeWorkgroup)
 					scope_expr = "gl_ScopeWorkgroup";
 				else
 					SPIRV_CROSS_THROW("Invalid scope for cooperative matrix.");
@@ -17003,12 +16652,12 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
 		}
 
 		if (scope_expr.empty())
-			scope_expr = to_expression(coop_type->ext.cooperative.scope_id);
+			scope_expr = to_expression(coop_type->cooperative.scope_id);
 
 		return join("coopmat<", type_to_glsl(get<SPIRType>(coop_type->parent_type)), ", ",
 		            scope_expr, ", ",
-		            to_expression(coop_type->ext.cooperative.rows_id), ", ",
-		            to_expression(coop_type->ext.cooperative.columns_id), ", ", use, ">");
+		            to_expression(coop_type->cooperative.rows_id), ", ",
+		            to_expression(coop_type->cooperative.columns_id), ", ", use, ">");
 	}
 
 	if (type.vecsize == 1 && type.columns == 1) // Scalar builtin
@@ -17227,7 +16876,7 @@ void CompilerGLSL::flatten_buffer_block(VariableID id)
 	flattened_buffer_blocks.insert(id);
 }
 
-bool CompilerGLSL::builtin_translates_to_nonarray(BuiltIn /*builtin*/) const
+bool CompilerGLSL::builtin_translates_to_nonarray(spv::BuiltIn /*builtin*/) const
 {
 	return false; // GLSL itself does not need to translate array builtin types to non-array builtin types
 }
@@ -17272,7 +16921,7 @@ void CompilerGLSL::add_function_overload(const SPIRFunction &func)
 		uint32_t type_id = get_pointee_type_id(arg.type);
 
 		// Workaround glslang bug. It seems to only consider the base type when resolving overloads.
-		if (get<SPIRType>(type_id).op == OpTypeCooperativeMatrixKHR)
+		if (get<SPIRType>(type_id).op == spv::OpTypeCooperativeMatrixKHR)
 			type_id = get<SPIRType>(type_id).parent_type;
 
 		auto &type = get<SPIRType>(type_id);
@@ -17331,7 +16980,7 @@ void CompilerGLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret
 	string decl;
 
 	auto &type = get<SPIRType>(func.return_type);
-	decl += flags_to_qualifiers_glsl(type, 0, return_flags);
+	decl += flags_to_qualifiers_glsl(type, return_flags);
 	decl += type_to_glsl(type);
 	decl += type_to_array_glsl(type, 0);
 	decl += " ";
@@ -18189,7 +17838,7 @@ void CompilerGLSL::emit_hoisted_temporaries(SmallVector<pair<TypeID, ID>> &tempo
 		if (options.force_zero_initialized_variables && type_can_zero_initialize(type))
 			initializer = join(" = ", to_zero_initialized_expression(tmp.first));
 
-		statement(flags_to_qualifiers_glsl(type, tmp.second, flags), variable_decl(type, to_name(tmp.second)), initializer, ";");
+		statement(flags_to_qualifiers_glsl(type, flags), variable_decl(type, to_name(tmp.second)), initializer, ";");
 
 		hoisted_temporaries.insert(tmp.second);
 		forced_temporaries.insert(tmp.second);
@@ -18204,7 +17853,7 @@ void CompilerGLSL::emit_hoisted_temporaries(SmallVector<pair<TypeID, ID>> &tempo
 		{
 			uint32_t mirror_id = mirrored_precision_itr->second;
 			auto &mirror_flags = get_decoration_bitset(mirror_id);
-			statement(flags_to_qualifiers_glsl(type, mirror_id, mirror_flags),
+			statement(flags_to_qualifiers_glsl(type, mirror_flags),
 			          variable_decl(type, to_name(mirror_id)),
 			          initializer, ";");
 			// The temporary might be read from before it's assigned, set up the expression now.
@@ -18215,26 +17864,6 @@ void CompilerGLSL::emit_hoisted_temporaries(SmallVector<pair<TypeID, ID>> &tempo
 }
 
 void CompilerGLSL::emit_block_chain(SPIRBlock &block)
-{
-	SmallVector<BlockID> cleanup_stack;
-	BlockID next_block = emit_block_chain_inner(block);
-
-	while (next_block != 0)
-	{
-		cleanup_stack.push_back(next_block);
-		next_block = emit_block_chain_inner(get<SPIRBlock>(next_block));
-	}
-
-	while (!cleanup_stack.empty())
-	{
-		emit_block_chain_cleanup(get<SPIRBlock>(cleanup_stack.back()));
-		cleanup_stack.pop_back();
-	}
-
-	emit_block_chain_cleanup(block);
-}
-
-BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 {
 	bool select_branch_to_true_block = false;
 	bool select_branch_to_false_block = false;
@@ -18285,13 +17914,12 @@ BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 	}
 
 	// Remember deferred declaration state. We will restore it before returning.
-	assert(block.rearm_dominated_variables.empty());
-	block.rearm_dominated_variables.resize(block.dominated_variables.size());
+	SmallVector<bool, 64> rearm_dominated_variables(block.dominated_variables.size());
 	for (size_t i = 0; i < block.dominated_variables.size(); i++)
 	{
 		uint32_t var_id = block.dominated_variables[i];
 		auto &var = get<SPIRVariable>(var_id);
-		block.rearm_dominated_variables[i] = var.deferred_declaration;
+		rearm_dominated_variables[i] = var.deferred_declaration;
 	}
 
 	// This is the method often used by spirv-opt to implement loops.
@@ -18884,8 +18512,6 @@ BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 		SPIRV_CROSS_THROW("Unimplemented block terminator.");
 	}
 
-	BlockID trailing_block_id = 0;
-
 	if (block.next_block && emit_next_block)
 	{
 		// If we hit this case, we're dealing with an unconditional branch, which means we will output
@@ -18893,10 +18519,8 @@ BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 		if (block.merge != SPIRBlock::MergeSelection)
 		{
 			flush_phi(block.self, block.next_block);
-
 			// For a direct branch, need to remember to invalidate expressions in the next linear block instead.
-			get<SPIRBlock>(block.next_block).invalidate_expressions.clear();
-			std::swap(get<SPIRBlock>(block.next_block).invalidate_expressions, block.invalidate_expressions);
+			get<SPIRBlock>(block.next_block).invalidate_expressions = block.invalidate_expressions;
 		}
 
 		// For switch fallthrough cases, we terminate the chain here, but we still need to handle Phi.
@@ -18917,15 +18541,7 @@ BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 				branch_to_continue(block.self, block.next_block);
 			}
 			else if (BlockID(block.self) != block.next_block)
-			{
-				// Recursing here is quite scary since it's quite easy to stack overflow if
-				// the SPIR-V is constructed a particular way.
-				// We have to simulate the tail call ourselves.
-				if (block.merge != SPIRBlock::MergeLoop)
-					trailing_block_id = block.next_block;
-				else
-					emit_block_chain(get<SPIRBlock>(block.next_block));
-			}
+				emit_block_chain(get<SPIRBlock>(block.next_block));
 		}
 	}
 
@@ -18967,28 +18583,20 @@ BlockID CompilerGLSL::emit_block_chain_inner(SPIRBlock &block)
 		if (is_continue(block.merge_block))
 			branch_to_continue(block.self, block.merge_block);
 		else
-			trailing_block_id = block.merge_block;
+			emit_block_chain(get<SPIRBlock>(block.merge_block));
 	}
 
-	return trailing_block_id;
-}
-
-void CompilerGLSL::emit_block_chain_cleanup(SPIRBlock &block)
-{
 	// Forget about control dependent expressions now.
 	block.invalidate_expressions.clear();
 
-	// After we return, we must be out of scope, so if we somehow have to re-emit this block,
+	// After we return, we must be out of scope, so if we somehow have to re-emit this function,
 	// re-declare variables if necessary.
-	// We only need one array here for rearm_dominated_variables,
-	// since it should be impossible for the same block to be remitted in the same chain twice.
-	assert(block.rearm_dominated_variables.size() == block.dominated_variables.size());
+	assert(rearm_dominated_variables.size() == block.dominated_variables.size());
 	for (size_t i = 0; i < block.dominated_variables.size(); i++)
 	{
 		uint32_t var = block.dominated_variables[i];
-		get<SPIRVariable>(var).deferred_declaration = block.rearm_dominated_variables[i];
+		get<SPIRVariable>(var).deferred_declaration = rearm_dominated_variables[i];
 	}
-	block.rearm_dominated_variables.clear();
 
 	// Just like for deferred declaration, we need to forget about loop variable enable
 	// if our block chain is reinstantiated later.
@@ -19530,34 +19138,6 @@ void CompilerGLSL::emit_line_directive(uint32_t file_id, uint32_t line_literal)
 	}
 }
 
-void CompilerGLSL::emit_non_semantic_shader_debug_info(uint32_t, uint32_t result_id, uint32_t eop,
-                                                       const uint32_t *args, uint32_t)
-{
-	if (!options.emit_line_directives)
-		return;
-
-	switch (eop)
-	{
-	case SPIRExtension::DebugLine:
-	{
-		// We're missing line end and columns here, but I don't think we can emit those in any meaningful way.
-		emit_line_directive(args[0], get<SPIRConstant>(args[1]).scalar());
-		break;
-	}
-
-	case SPIRExtension::DebugSource:
-	{
-		// Forward the string declaration here. We ignore the optional text operand.
-		auto &str = get<SPIRString>(args[0]).str;
-		set<SPIRString>(result_id, str);
-		break;
-	}
-
-	default:
-		break;
-	}
-}
-
 void CompilerGLSL::emit_copy_logical_type(uint32_t lhs_id, uint32_t lhs_type_id, uint32_t rhs_id, uint32_t rhs_type_id,
                                           SmallVector<uint32_t> chain)
 {
@@ -20093,7 +19673,7 @@ bool CompilerGLSL::is_stage_output_location_masked(uint32_t location, uint32_t c
 	return masked_output_locations.count({ location, component }) != 0;
 }
 
-bool CompilerGLSL::is_stage_output_builtin_masked(BuiltIn builtin) const
+bool CompilerGLSL::is_stage_output_builtin_masked(spv::BuiltIn builtin) const
 {
 	return masked_output_builtins.count(builtin) != 0;
 }
@@ -20197,96 +19777,3 @@ std::string CompilerGLSL::format_double(double value) const
 	return convert_to_string(value, current_locale_radix_character);
 }
 
-std::string CompilerGLSL::to_pretty_expression_if_int_constant(
-		uint32_t id,
-		const GlslConstantNameMapping *mapping_start, const GlslConstantNameMapping *mapping_end,
-		bool register_expression_read)
-{
-	auto *c = maybe_get<SPIRConstant>(id);
-	if (c && !c->specialization)
-	{
-		auto value = c->scalar();
-		auto pretty_name = std::find_if(mapping_start, mapping_end,
-		                                [value](const GlslConstantNameMapping &mapping) { return mapping.value == value; });
-		if (pretty_name != mapping_end)
-			return pretty_name->alias;
-	}
-	return join("int(", to_expression(id, register_expression_read), ")");
-}
-
-uint32_t CompilerGLSL::get_fp_fast_math_flags_for_op(uint32_t result_type, uint32_t id) const
-{
-	uint32_t fp_flags = ~0;
-
-	if (!type_is_floating_point(get<SPIRType>(result_type)))
-		return fp_flags;
-
-	auto &ep = get_entry_point();
-
-	// Per-operation flag supersedes all defaults.
-	if (id != 0 && has_decoration(id, DecorationFPFastMathMode))
-		return get_decoration(id, DecorationFPFastMathMode);
-
-	// Handle float_controls1 execution modes.
-	uint32_t width = get<SPIRType>(result_type).width;
-
-	bool szinp = false;
-
-	switch (width)
-	{
-	case 8:
-		szinp = ep.signed_zero_inf_nan_preserve_8;
-		break;
-
-	case 16:
-		szinp = ep.signed_zero_inf_nan_preserve_16;
-		break;
-
-	case 32:
-		szinp = ep.signed_zero_inf_nan_preserve_32;
-		break;
-
-	case 64:
-		szinp = ep.signed_zero_inf_nan_preserve_64;
-		break;
-
-	default:
-		break;
-	}
-
-	if (szinp)
-		fp_flags &= ~(FPFastMathModeNSZMask | FPFastMathModeNotInfMask | FPFastMathModeNotNaNMask);
-
-	// Legacy NoContraction deals with any kind of transform to the expression.
-	if (id != 0 && has_decoration(id, DecorationNoContraction))
-		fp_flags &= ~(FPFastMathModeAllowContractMask | FPFastMathModeAllowTransformMask | FPFastMathModeAllowReassocMask);
-
-	// Handle float_controls2 execution modes.
-	bool found_default = false;
-	for (auto &fp_pair : ep.fp_fast_math_defaults)
-	{
-		if (get<SPIRType>(fp_pair.first).width == width && fp_pair.second)
-		{
-			fp_flags &= get<SPIRConstant>(fp_pair.second).scalar();
-			found_default = true;
-		}
-	}
-
-	// From SPV_KHR_float_controls2:
-	// "This definition implies that, if the entry point set any FPFastMathDefault execution mode
-	// then any type for which a default is not set uses no fast math flags
-	// (although this can still be overridden on a per-operation basis).
-	// Modules must not mix setting fast math modes explicitly using this extension and relying on older API defaults."
-	if (!found_default && !ep.fp_fast_math_defaults.empty())
-		fp_flags = 0;
-
-	return fp_flags;
-}
-
-bool CompilerGLSL::has_legacy_nocontract(uint32_t result_type, uint32_t id) const
-{
-	const auto fp_flags = FPFastMathModeAllowContractMask |
-	                      FPFastMathModeAllowTransformMask |
-	                      FPFastMathModeAllowReassocMask;
-	return (get_fp_fast_math_flags_for_op(result_type, id) & fp_flags) != fp_flags;
-}
diff --git a/engine/thirdparty/spirv-cross/spirv_glsl.hpp b/engine/thirdparty/spirv-cross/spirv_glsl.hpp
index 98e93ee9..03ff330c 100644
--- a/engine/thirdparty/spirv-cross/spirv_glsl.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_glsl.hpp
@@ -32,9 +32,6 @@
 
 namespace SPIRV_CROSS_NAMESPACE
 {
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
-struct GlslConstantNameMapping;
-
 enum PlsFormat
 {
 	PlsNone = 0,
@@ -290,7 +287,7 @@ public:
 	// This option is only meaningful for MSL and HLSL, since GLSL matches by location directly.
 	// Masking builtins only takes effect if the builtin in question is part of the stage output interface.
 	void mask_stage_output_by_location(uint32_t location, uint32_t component);
-	void mask_stage_output_by_builtin(BuiltIn builtin);
+	void mask_stage_output_by_builtin(spv::BuiltIn builtin);
 
 	// Allow to control how to format float literals in the output.
 	// Set to "nullptr" to use the default "convert_to_string" function.
@@ -390,7 +387,7 @@ protected:
 	};
 
 	// TODO remove this function when all subgroup ops are supported (or make it always return true)
-	static bool is_supported_subgroup_op_in_opengl(Op op, const uint32_t *ops);
+	static bool is_supported_subgroup_op_in_opengl(spv::Op op, const uint32_t *ops);
 
 	void reset(uint32_t iteration_count);
 	void emit_function(SPIRFunction &func, const Bitset &return_flags);
@@ -417,7 +414,7 @@ protected:
 
 	// For relax_nan_checks.
 	GLSLstd450 get_remapped_glsl_op(GLSLstd450 std450_op) const;
-	Op get_remapped_spirv_op(Op op) const;
+	spv::Op get_remapped_spirv_op(spv::Op op) const;
 
 	virtual void emit_glsl_op(uint32_t result_type, uint32_t result_id, uint32_t op, const uint32_t *args,
 	                          uint32_t count);
@@ -429,8 +426,6 @@ protected:
 	                                                   const uint32_t *args, uint32_t count);
 	virtual void emit_spv_amd_gcn_shader_op(uint32_t result_type, uint32_t result_id, uint32_t op, const uint32_t *args,
 	                                        uint32_t count);
-	void emit_non_semantic_shader_debug_info(uint32_t result_type, uint32_t result_id, uint32_t op,
-	                                         const uint32_t *args, uint32_t count);
 	virtual void emit_header();
 	void emit_line_directive(uint32_t file_id, uint32_t line_literal);
 	void build_workgroup_size(SmallVector<std::string> &arguments, const SpecializationConstant &x,
@@ -444,7 +439,7 @@ protected:
 	                                  SmallVector<uint32_t> &inherited_expressions);
 	virtual void emit_subgroup_op(const Instruction &i);
 	virtual std::string type_to_glsl(const SPIRType &type, uint32_t id = 0);
-	virtual std::string builtin_to_glsl(BuiltIn builtin, StorageClass storage);
+	virtual std::string builtin_to_glsl(spv::BuiltIn builtin, spv::StorageClass storage);
 	virtual void emit_struct_member(const SPIRType &type, uint32_t member_type_id, uint32_t index,
 	                                const std::string &qualifier = "", uint32_t base_offset = 0);
 	virtual void emit_struct_padding_target(const SPIRType &type);
@@ -456,7 +451,7 @@ protected:
 	virtual std::string constant_expression_vector(const SPIRConstant &c, uint32_t vector);
 	virtual void emit_fixup();
 	virtual std::string variable_decl(const SPIRType &type, const std::string &name, uint32_t id = 0);
-	virtual bool variable_decl_is_remapped_storage(const SPIRVariable &var, StorageClass storage) const;
+	virtual bool variable_decl_is_remapped_storage(const SPIRVariable &var, spv::StorageClass storage) const;
 	virtual std::string to_func_call_arg(const SPIRFunction::Parameter &arg, uint32_t id);
 	virtual void emit_workgroup_initialization(const SPIRVariable &var);
 
@@ -501,7 +496,7 @@ protected:
 	virtual std::string unpack_expression_type(std::string expr_str, const SPIRType &type, uint32_t physical_type_id,
 	                                           bool packed_type, bool row_major);
 
-	virtual bool builtin_translates_to_nonarray(BuiltIn builtin) const;
+	virtual bool builtin_translates_to_nonarray(spv::BuiltIn builtin) const;
 
 	virtual bool is_user_type_structured(uint32_t id) const;
 
@@ -667,21 +662,20 @@ protected:
 		bool workgroup_size_is_hidden = false;
 		bool requires_relaxed_precision_analysis = false;
 		bool implicit_c_integer_promotion_rules = false;
-		bool supports_spec_constant_array_size = true;
 	} backend;
 
 	void emit_struct(SPIRType &type);
 	void emit_resources();
-	void emit_extension_workarounds(ExecutionModel model);
-	void emit_subgroup_arithmetic_workaround(const std::string &func, Op op, GroupOperation group_op);
+	void emit_extension_workarounds(spv::ExecutionModel model);
+	void emit_subgroup_arithmetic_workaround(const std::string &func, spv::Op op, spv::GroupOperation group_op);
 	void emit_polyfills(uint32_t polyfills, bool relaxed);
 	void emit_buffer_block_native(const SPIRVariable &var);
 	void emit_buffer_reference_block(uint32_t type_id, bool forward_declaration);
 	void emit_buffer_block_legacy(const SPIRVariable &var);
 	void emit_buffer_block_flattened(const SPIRVariable &type);
-	void fixup_implicit_builtin_block_names(ExecutionModel model);
-	void emit_declared_builtin_block(StorageClass storage, ExecutionModel model);
-	bool should_force_emit_builtin_block(StorageClass storage);
+	void fixup_implicit_builtin_block_names(spv::ExecutionModel model);
+	void emit_declared_builtin_block(spv::StorageClass storage, spv::ExecutionModel model);
+	bool should_force_emit_builtin_block(spv::StorageClass storage);
 	void emit_push_constant_block_vulkan(const SPIRVariable &var);
 	void emit_push_constant_block_glsl(const SPIRVariable &var);
 	void emit_interface_block(const SPIRVariable &type);
@@ -691,8 +685,6 @@ protected:
 	void emit_flattened_io_block_member(const std::string &basename, const SPIRType &type, const char *qual,
 	                                    const SmallVector<uint32_t> &indices);
 	void emit_block_chain(SPIRBlock &block);
-	BlockID emit_block_chain_inner(SPIRBlock &block);
-	void emit_block_chain_cleanup(SPIRBlock &block);
 	void emit_hoisted_temporaries(SmallVector<std::pair<TypeID, ID>> &temporaries);
 	int get_constant_mapping_to_workgroup_component(const SPIRConstant &constant) const;
 	void emit_constant(const SPIRConstant &constant);
@@ -763,7 +755,6 @@ protected:
 	bool expression_read_implies_multiple_reads(uint32_t id) const;
 	SPIRExpression &emit_op(uint32_t result_type, uint32_t result_id, const std::string &rhs, bool forward_rhs,
 	                        bool suppress_usage_tracking = false);
-	void emit_transposed_op(uint32_t result_type, uint32_t result_id, const std::string &rhs, bool forward_rhs);
 
 	void access_chain_internal_append_index(std::string &expr, uint32_t base, const SPIRType *type,
 	                                        AccessChainFlags flags, bool &access_chain_is_arrayed, uint32_t index);
@@ -775,12 +766,12 @@ protected:
 	// Relevant for PtrAccessChain / BDA.
 	virtual uint32_t get_physical_type_stride(const SPIRType &type) const;
 
-	StorageClass get_expression_effective_storage_class(uint32_t ptr);
+	spv::StorageClass get_expression_effective_storage_class(uint32_t ptr);
 	virtual bool access_chain_needs_stage_io_builtin_translation(uint32_t base);
 
 	virtual bool check_physical_type_cast(std::string &expr, const SPIRType *type, uint32_t physical_type);
 	virtual bool prepare_access_chain_for_scalar_access(std::string &expr, const SPIRType &type,
-	                                                    StorageClass storage, bool &is_packed);
+	                                                    spv::StorageClass storage, bool &is_packed);
 
 	std::string access_chain(uint32_t base, const uint32_t *indices, uint32_t count, const SPIRType &target_type,
 	                         AccessChainMeta *meta = nullptr, bool ptr_chain = false);
@@ -806,16 +797,11 @@ protected:
 	const char *index_to_swizzle(uint32_t index);
 	std::string remap_swizzle(const SPIRType &result_type, uint32_t input_components, const std::string &expr);
 	std::string declare_temporary(uint32_t type, uint32_t id);
-	bool can_declare_inline_temporary(uint32_t id) const;
 	void emit_uninitialized_temporary(uint32_t type, uint32_t id);
 	SPIRExpression &emit_uninitialized_temporary_expression(uint32_t type, uint32_t id);
 	virtual void append_global_func_args(const SPIRFunction &func, uint32_t index, SmallVector<std::string> &arglist);
 	std::string to_non_uniform_aware_expression(uint32_t id);
 	std::string to_atomic_ptr_expression(uint32_t id);
-	std::string to_pretty_expression_if_int_constant(
-			uint32_t id,
-			const GlslConstantNameMapping *mapping_start, const GlslConstantNameMapping *mapping_end,
-			bool register_expression_read = true);
 	std::string to_expression(uint32_t id, bool register_expression_read = true);
 	std::string to_composite_constructor_expression(const SPIRType &parent_type, uint32_t id, bool block_like_type);
 	std::string to_rerolled_array_expression(const SPIRType &parent_type, const std::string &expr, const SPIRType &type);
@@ -844,15 +830,15 @@ protected:
 	void emit_output_variable_initializer(const SPIRVariable &var);
 	std::string to_precision_qualifiers_glsl(uint32_t id);
 	virtual const char *to_storage_qualifiers_glsl(const SPIRVariable &var);
-	std::string flags_to_qualifiers_glsl(const SPIRType &type, uint32_t id, const Bitset &flags);
-	const char *format_to_glsl(ImageFormat format);
+	std::string flags_to_qualifiers_glsl(const SPIRType &type, const Bitset &flags);
+	const char *format_to_glsl(spv::ImageFormat format);
 	virtual std::string layout_for_member(const SPIRType &type, uint32_t index);
 	virtual std::string to_interpolation_qualifiers(const Bitset &flags);
 	std::string layout_for_variable(const SPIRVariable &variable);
 	std::string to_combined_image_sampler(VariableID image_id, VariableID samp_id);
 	virtual bool skip_argument(uint32_t id) const;
 	virtual bool emit_array_copy(const char *expr, uint32_t lhs_id, uint32_t rhs_id,
-	                             StorageClass lhs_storage, StorageClass rhs_storage);
+	                             spv::StorageClass lhs_storage, spv::StorageClass rhs_storage);
 	virtual void emit_block_hints(const SPIRBlock &block);
 	virtual std::string to_initializer_expression(const SPIRVariable &var);
 	virtual std::string to_zero_initialized_expression(uint32_t type_id);
@@ -1027,7 +1013,7 @@ protected:
 
 	bool type_is_empty(const SPIRType &type);
 
-	bool can_use_io_location(StorageClass storage, bool block);
+	bool can_use_io_location(spv::StorageClass storage, bool block);
 	const Instruction *get_next_instruction_in_block(const Instruction &instr);
 	static uint32_t mask_relevant_memory_semantics(uint32_t semantics);
 
@@ -1042,7 +1028,7 @@ protected:
 	// Builtins in GLSL are always specific signedness, but the SPIR-V can declare them
 	// as either unsigned or signed.
 	// Sometimes we will need to automatically perform casts on load and store to make this work.
-	virtual SPIRType::BaseType get_builtin_basetype(BuiltIn builtin, SPIRType::BaseType default_type);
+	virtual SPIRType::BaseType get_builtin_basetype(spv::BuiltIn builtin, SPIRType::BaseType default_type);
 	virtual void cast_to_variable_store(uint32_t target_id, std::string &expr, const SPIRType &expr_type);
 	virtual void cast_from_variable_load(uint32_t source_id, std::string &expr, const SPIRType &expr_type);
 	void unroll_array_from_complex_load(uint32_t target_id, uint32_t source_id, std::string &expr);
@@ -1071,7 +1057,7 @@ protected:
 	static const char *vector_swizzle(int vecsize, int index);
 
 	bool is_stage_output_location_masked(uint32_t location, uint32_t component) const;
-	bool is_stage_output_builtin_masked(BuiltIn builtin) const;
+	bool is_stage_output_builtin_masked(spv::BuiltIn builtin) const;
 	bool is_stage_output_variable_masked(const SPIRVariable &var) const;
 	bool is_stage_output_block_member_masked(const SPIRVariable &var, uint32_t index, bool strip_array) const;
 	bool is_per_primitive_variable(const SPIRVariable &var) const;
@@ -1084,9 +1070,6 @@ protected:
 	std::string format_float(float value) const;
 	std::string format_double(double value) const;
 
-	uint32_t get_fp_fast_math_flags_for_op(uint32_t result_type, uint32_t id) const;
-	bool has_legacy_nocontract(uint32_t result_type, uint32_t id) const;
-
 private:
 	void init();
 
diff --git a/engine/thirdparty/spirv-cross/spirv_msl.cpp b/engine/thirdparty/spirv-cross/spirv_msl.cpp
index 5ea6b974..1c4f1ed1 100644
--- a/engine/thirdparty/spirv-cross/spirv_msl.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_msl.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <numeric>
 
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
 using namespace std;
 
@@ -124,7 +124,7 @@ void CompilerMSL::add_msl_resource_binding(const MSLResourceBinding &binding)
 void CompilerMSL::add_dynamic_buffer(uint32_t desc_set, uint32_t binding, uint32_t index)
 {
 	SetBindingPair pair = { desc_set, binding };
-	buffers_requiring_dynamic_offset[pair] = { index, 0, "" };
+	buffers_requiring_dynamic_offset[pair] = { index, 0 };
 }
 
 void CompilerMSL::add_inline_uniform_block(uint32_t desc_set, uint32_t binding)
@@ -164,7 +164,7 @@ bool CompilerMSL::is_msl_shader_output_used(uint32_t location)
 	       location_outputs_in_use_fallback.count(location) == 0;
 }
 
-uint32_t CompilerMSL::get_automatic_builtin_input_location(BuiltIn builtin) const
+uint32_t CompilerMSL::get_automatic_builtin_input_location(spv::BuiltIn builtin) const
 {
 	auto itr = builtin_to_automatic_input_location.find(builtin);
 	if (itr == builtin_to_automatic_input_location.end())
@@ -173,7 +173,7 @@ uint32_t CompilerMSL::get_automatic_builtin_input_location(BuiltIn builtin) cons
 		return itr->second;
 }
 
-uint32_t CompilerMSL::get_automatic_builtin_output_location(BuiltIn builtin) const
+uint32_t CompilerMSL::get_automatic_builtin_output_location(spv::BuiltIn builtin) const
 {
 	auto itr = builtin_to_automatic_output_location.find(builtin);
 	if (itr == builtin_to_automatic_output_location.end())
@@ -242,7 +242,7 @@ void CompilerMSL::set_fragment_output_components(uint32_t location, uint32_t com
 	fragment_output_components[location] = components;
 }
 
-bool CompilerMSL::builtin_translates_to_nonarray(BuiltIn builtin) const
+bool CompilerMSL::builtin_translates_to_nonarray(spv::BuiltIn builtin) const
 {
 	return (builtin == BuiltInSampleMask);
 }
@@ -279,15 +279,15 @@ void CompilerMSL::build_implicit_builtins()
 	bool force_frag_depth_passthrough =
 	    get_execution_model() == ExecutionModelFragment && !uses_explicit_early_fragment_test() && need_subpass_input &&
 	    msl_options.enable_frag_depth_builtin && msl_options.input_attachment_is_ds_attachment;
-	needs_point_size_output =
+	bool need_point_size =
 	    msl_options.enable_point_size_builtin && msl_options.enable_point_size_default &&
-	    entry_point_is_vertex();
+	    get_execution_model() == ExecutionModelVertex;
 
 	if (need_subpass_input || need_sample_pos || need_subgroup_mask || need_vertex_params || need_tesc_params ||
 	    need_tese_params || need_multiview || need_dispatch_base || need_vertex_base_params || need_grid_params ||
 	    needs_sample_id || needs_subgroup_invocation_id || needs_subgroup_size || needs_helper_invocation ||
 	    has_additional_fixed_sample_mask() || need_local_invocation_index || need_workgroup_size ||
-	    force_frag_depth_passthrough || needs_point_size_output || is_mesh_shader())
+	    force_frag_depth_passthrough || need_point_size || is_mesh_shader())
 	{
 		bool has_frag_coord = false;
 		bool has_sample_id = false;
@@ -315,7 +315,7 @@ void CompilerMSL::build_implicit_builtins()
 				return;
 
 			auto &type = this->get<SPIRType>(var.basetype);
-			if (needs_point_size_output && has_decoration(type.self, DecorationBlock))
+			if (need_point_size && has_decoration(type.self, DecorationBlock))
 			{
 				const auto member_count = static_cast<uint32_t>(type.member_types.size());
 				for (uint32_t i = 0; i < member_count; i++)
@@ -684,6 +684,28 @@ void CompilerMSL::build_implicit_builtins()
 				mark_implicit_builtin(StorageClassInput, BuiltInBaseInstance, var_id);
 			}
 
+			if (need_multiview)
+			{
+				// Multiview shaders are not allowed to write to gl_Layer, ostensibly because
+				// it is implicitly written from gl_ViewIndex, but we have to do that explicitly.
+				// Note that we can't just abuse gl_ViewIndex for this purpose: it's an input, but
+				// gl_Layer is an output in vertex-pipeline shaders.
+				uint32_t type_ptr_out_id = ir.increase_bound_by(2);
+				SPIRType uint_type_ptr_out = get_uint_type();
+				uint_type_ptr.op = OpTypePointer;
+				uint_type_ptr_out.pointer = true;
+				uint_type_ptr_out.pointer_depth++;
+				uint_type_ptr_out.parent_type = get_uint_type_id();
+				uint_type_ptr_out.storage = StorageClassOutput;
+				auto &ptr_out_type = set<SPIRType>(type_ptr_out_id, uint_type_ptr_out);
+				ptr_out_type.self = get_uint_type_id();
+				uint32_t var_id = type_ptr_out_id + 1;
+				set<SPIRVariable>(var_id, type_ptr_out_id, StorageClassOutput);
+				set_decoration(var_id, DecorationBuiltIn, BuiltInLayer);
+				builtin_layer_id = var_id;
+				mark_implicit_builtin(StorageClassOutput, BuiltInLayer, var_id);
+			}
+
 			if (need_multiview && !has_view_idx)
 			{
 				uint32_t var_id = ir.increase_bound_by(1);
@@ -696,28 +718,6 @@ void CompilerMSL::build_implicit_builtins()
 			}
 		}
 
-		if (need_multiview)
-		{
-			// Multiview shaders are not allowed to write to gl_Layer, ostensibly because
-			// it is implicitly written from gl_ViewIndex, but we have to do that explicitly.
-			// Note that we can't just abuse gl_ViewIndex for this purpose: it's an input, but
-			// gl_Layer is an output in vertex-pipeline shaders.
-			uint32_t type_ptr_out_id = ir.increase_bound_by(2);
-			SPIRType uint_type_ptr_out = get_uint_type();
-			uint_type_ptr_out.op = OpTypePointer;
-			uint_type_ptr_out.pointer = true;
-			uint_type_ptr_out.pointer_depth++;
-			uint_type_ptr_out.parent_type = get_uint_type_id();
-			uint_type_ptr_out.storage = StorageClassOutput;
-			auto &ptr_out_type = set<SPIRType>(type_ptr_out_id, uint_type_ptr_out);
-			ptr_out_type.self = get_uint_type_id();
-			uint32_t var_id = type_ptr_out_id + 1;
-			set<SPIRVariable>(var_id, type_ptr_out_id, StorageClassOutput);
-			set_decoration(var_id, DecorationBuiltIn, BuiltInLayer);
-			builtin_layer_id = var_id;
-			mark_implicit_builtin(StorageClassOutput, BuiltInLayer, var_id);
-		}
-
 		if ((need_tesc_params && (msl_options.multi_patch_workgroup || !has_invocation_id || !has_primitive_id)) ||
 		    (need_tese_params && !has_primitive_id) || need_grid_params)
 		{
@@ -894,7 +894,7 @@ void CompilerMSL::build_implicit_builtins()
 			set<SPIRType>(type_id, bool_type);
 
 			SPIRType bool_type_ptr_in = bool_type;
-			bool_type_ptr_in.op = OpTypePointer;
+			bool_type_ptr_in.op = spv::OpTypePointer;
 			bool_type_ptr_in.pointer = true;
 			bool_type_ptr_in.pointer_depth++;
 			bool_type_ptr_in.parent_type = type_id;
@@ -998,7 +998,7 @@ void CompilerMSL::build_implicit_builtins()
 			set<SPIRType>(type_id, float_type);
 
 			SPIRType float_type_ptr_in = float_type;
-			float_type_ptr_in.op = OpTypePointer;
+			float_type_ptr_in.op = spv::OpTypePointer;
 			float_type_ptr_in.pointer = true;
 			float_type_ptr_in.pointer_depth++;
 			float_type_ptr_in.parent_type = type_id;
@@ -1013,7 +1013,7 @@ void CompilerMSL::build_implicit_builtins()
 			active_output_builtins.set(BuiltInFragDepth);
 		}
 
-		if (!has_point_size && needs_point_size_output)
+		if (!has_point_size && need_point_size)
 		{
 			uint32_t offset = ir.increase_bound_by(3);
 			uint32_t type_id = offset;
@@ -1028,7 +1028,7 @@ void CompilerMSL::build_implicit_builtins()
 			set<SPIRType>(type_id, float_type);
 
 			SPIRType float_type_ptr_in = float_type;
-			float_type_ptr_in.op = OpTypePointer;
+			float_type_ptr_in.op = spv::OpTypePointer;
 			float_type_ptr_in.pointer = true;
 			float_type_ptr_in.pointer_depth++;
 			float_type_ptr_in.parent_type = type_id;
@@ -1182,7 +1182,7 @@ void CompilerMSL::build_implicit_builtins()
 		builtin_mesh_sizes_id = var_id;
 	}
 
-	if (get_execution_model() == ExecutionModelTaskEXT)
+	if (get_execution_model() == spv::ExecutionModelTaskEXT)
 	{
 		uint32_t offset = ir.increase_bound_by(3);
 		uint32_t type_id = offset;
@@ -1194,7 +1194,7 @@ void CompilerMSL::build_implicit_builtins()
 		set<SPIRType>(type_id, mesh_grid_type);
 
 		SPIRType mesh_grid_type_ptr = mesh_grid_type;
-		mesh_grid_type_ptr.op = OpTypePointer;
+		mesh_grid_type_ptr.op = spv::OpTypePointer;
 		mesh_grid_type_ptr.pointer = true;
 		mesh_grid_type_ptr.pointer_depth++;
 		mesh_grid_type_ptr.parent_type = type_id;
@@ -1211,7 +1211,7 @@ void CompilerMSL::build_implicit_builtins()
 // Checks if the specified builtin variable (e.g. gl_InstanceIndex) is marked as active.
 // If not, it marks it as active and forces a recompilation.
 // This might be used when the optimization of inactive builtins was too optimistic (e.g. when "spvOut" is emitted).
-void CompilerMSL::ensure_builtin(StorageClass storage, BuiltIn builtin)
+void CompilerMSL::ensure_builtin(spv::StorageClass storage, spv::BuiltIn builtin)
 {
 	Bitset *active_builtins = nullptr;
 	switch (storage)
@@ -1494,27 +1494,24 @@ void CompilerMSL::emit_entry_point_declarations()
 	// Emit dynamic buffers here.
 	for (auto &dynamic_buffer : buffers_requiring_dynamic_offset)
 	{
-		if (!dynamic_buffer.second.var_id)
+		if (!dynamic_buffer.second.second)
 		{
 			// Could happen if no buffer was used at requested binding point.
 			continue;
 		}
 
-		const auto &var = get<SPIRVariable>(dynamic_buffer.second.var_id);
+		const auto &var = get<SPIRVariable>(dynamic_buffer.second.second);
 		uint32_t var_id = var.self;
 		const auto &type = get_variable_data_type(var);
-
-		add_local_variable_name(var.self);
 		string name = to_name(var.self);
-
 		uint32_t desc_set = get_decoration(var.self, DecorationDescriptorSet);
 		uint32_t arg_id = argument_buffer_ids[desc_set];
-		uint32_t base_index = dynamic_buffer.second.base_index;
+		uint32_t base_index = dynamic_buffer.second.first;
 
 		if (is_array(type))
 		{
 			is_using_builtin_array = true;
-			statement(get_variable_address_space(var), " ", type_to_glsl(type), "* ", to_restrict(var_id, true), name,
+			statement(get_argument_address_space(var), " ", type_to_glsl(type), "* ", to_restrict(var_id, true), name,
 			          type_to_array_glsl(type, var_id), " =");
 
 			uint32_t array_size = get_resource_array_size(type, var_id);
@@ -1525,9 +1522,9 @@ void CompilerMSL::emit_entry_point_declarations()
 
 			for (uint32_t i = 0; i < array_size; i++)
 			{
-				statement("(", get_variable_address_space(var), " ", type_to_glsl(type), "* ",
-				          to_restrict(var_id, false), ")((", get_variable_address_space(var), " char* ",
-				          to_restrict(var_id, false), ")", to_name(arg_id), ".", dynamic_buffer.second.mbr_name,
+				statement("(", get_argument_address_space(var), " ", type_to_glsl(type), "* ",
+				          to_restrict(var_id, false), ")((", get_argument_address_space(var), " char* ",
+				          to_restrict(var_id, false), ")", to_name(arg_id), ".", ensure_valid_name(name, "m"),
 				          "[", i, "]", " + ", to_name(dynamic_offsets_buffer_id), "[", base_index + i, "]),");
 			}
 
@@ -1537,10 +1534,10 @@ void CompilerMSL::emit_entry_point_declarations()
 		}
 		else
 		{
-			statement(get_variable_address_space(var), " auto& ", to_restrict(var_id, true), name, " = *(",
-			          get_variable_address_space(var), " ", type_to_glsl(type), "* ", to_restrict(var_id, false), ")((",
-			          get_variable_address_space(var), " char* ", to_restrict(var_id, false), ")", to_name(arg_id), ".",
-			          dynamic_buffer.second.mbr_name, " + ", to_name(dynamic_offsets_buffer_id), "[", base_index, "]);");
+			statement(get_argument_address_space(var), " auto& ", to_restrict(var_id, true), name, " = *(",
+			          get_argument_address_space(var), " ", type_to_glsl(type), "* ", to_restrict(var_id, false), ")((",
+			          get_argument_address_space(var), " char* ", to_restrict(var_id, false), ")", to_name(arg_id), ".",
+			          ensure_valid_name(name, "m"), " + ", to_name(dynamic_offsets_buffer_id), "[", base_index, "]);");
 		}
 	}
 
@@ -1550,8 +1547,6 @@ void CompilerMSL::emit_entry_point_declarations()
 		const auto &var = *arg;
 		const auto &type = get_variable_data_type(var);
 		const auto &buffer_type = get_variable_element_type(var);
-
-		// This has already been added as a resource name.
 		const string name = to_name(var.self);
 
 		if (is_var_runtime_size_array(var))
@@ -1562,24 +1557,10 @@ void CompilerMSL::emit_entry_point_declarations()
 			}
 
 			string resource_name;
-
 			if (descriptor_set_is_argument_buffer(get_decoration(var.self, DecorationDescriptorSet)))
-			{
 				resource_name = ir.meta[var.self].decoration.qualified_alias;
-			}
 			else
-			{
-				bool is_aliased = std::find_if(buffer_aliases_discrete.begin(), buffer_aliases_discrete.end(),
-				                               [&](uint32_t id) { return var.self == id; }) != buffer_aliases_discrete.end();
-
-				uint32_t desc_set = get_decoration(var.self, DecorationDescriptorSet);
-				uint32_t desc_binding = get_decoration(var.self, DecorationBinding);
-
-				if (is_aliased)
-					resource_name = join("spvBufferAliasSet", desc_set, "Binding", desc_binding);
-				else
-					resource_name = join("spvDescriptorSet", desc_set, "Binding", desc_binding);
-			}
+				resource_name = name + "_";
 
 			switch (type.basetype)
 			{
@@ -1591,10 +1572,10 @@ void CompilerMSL::emit_entry_point_declarations()
 			case SPIRType::SampledImage:
 				statement("spvDescriptorArray<", type_to_glsl(buffer_type, var.self), "> ", name, " {", resource_name, "};");
 				// Unsupported with argument buffer for now.
-				statement("spvDescriptorArray<sampler> ", name, "Smplr {", resource_name, "Smplr};");
+				statement("spvDescriptorArray<sampler> ", name, "Smplr {", name, "Smplr_};");
 				break;
 			case SPIRType::Struct:
-				statement("spvDescriptorArray<", get_variable_address_space(var), " ", type_to_glsl(buffer_type), "*> ",
+				statement("spvDescriptorArray<", get_argument_address_space(var), " ", type_to_glsl(buffer_type), "*> ",
 				          name, " {", resource_name, "};");
 				break;
 			default:
@@ -1605,7 +1586,7 @@ void CompilerMSL::emit_entry_point_declarations()
 		else if (!type.array.empty() && type.basetype == SPIRType::Struct)
 		{
 			// Emit only buffer arrays here.
-			statement(get_variable_address_space(var), " ", type_to_glsl(buffer_type), "* ",
+			statement(get_argument_address_space(var), " ", type_to_glsl(buffer_type), "* ",
 			          to_restrict(var.self, true), name, "[] =");
 			begin_scope();
 			uint32_t array_size = get_resource_array_size(type, var.self);
@@ -1623,14 +1604,8 @@ void CompilerMSL::emit_entry_point_declarations()
 	for (auto &var_id : buffer_aliases_discrete)
 	{
 		const auto &var = get<SPIRVariable>(var_id);
-
-		// We already declare this alias in a different way.
-		if (is_var_runtime_size_array(var))
-			continue;
-
 		const auto &type = get_variable_data_type(var);
-		auto addr_space = get_variable_address_space(var);
-		// This resource name has already been added.
+		auto addr_space = get_argument_address_space(var);
 		auto name = to_name(var_id);
 
 		uint32_t desc_set = get_decoration(var_id, DecorationDescriptorSet);
@@ -1644,6 +1619,36 @@ void CompilerMSL::emit_entry_point_declarations()
 	// Discrete descriptors are processed in entry point emission every compiler iteration.
 	buffer_aliases_discrete.clear();
 
+	for (auto &var_pair : buffer_aliases_argument)
+	{
+		uint32_t var_id = var_pair.first;
+		uint32_t alias_id = var_pair.second;
+
+		const auto &var = get<SPIRVariable>(var_id);
+		const auto &type = get_variable_data_type(var);
+		auto addr_space = get_argument_address_space(var);
+
+		if (type.array.empty())
+		{
+			statement(addr_space, " auto& ", to_restrict(var_id, true), to_name(var_id), " = (", addr_space, " ",
+			          type_to_glsl(type), "&)", ir.meta[alias_id].decoration.qualified_alias, ";");
+		}
+		else
+		{
+			const char *desc_addr_space = descriptor_address_space(var_id, var.storage, "thread");
+
+			// Esoteric type cast. Reference to array of pointers.
+			// Auto here defers to UBO or SSBO. The address space of the reference needs to refer to the
+			// address space of the argument buffer itself, which is usually constant, but can be const device for
+			// large argument buffers.
+			is_using_builtin_array = true;
+			statement(desc_addr_space, " auto& ", to_restrict(var_id, true), to_name(var_id), " = (", addr_space, " ",
+			          type_to_glsl(type), "* ", desc_addr_space, " (&)",
+			          type_to_array_glsl(type, var_id), ")", ir.meta[alias_id].decoration.qualified_alias, ";");
+			is_using_builtin_array = false;
+		}
+	}
+
 	// Emit disabled fragment outputs.
 	std::sort(disabled_frag_outputs.begin(), disabled_frag_outputs.end());
 	for (uint32_t var_id : disabled_frag_outputs)
@@ -1706,7 +1711,6 @@ string CompilerMSL::compile()
 	backend.array_is_value_type_in_buffer_blocks = false;
 	backend.support_pointer_to_pointer = true;
 	backend.implicit_c_integer_promotion_rules = true;
-	backend.supports_spec_constant_array_size = false;
 
 	capture_output_to_buffer = msl_options.capture_output_to_buffer;
 	is_rasterization_disabled = msl_options.disable_rasterization || capture_output_to_buffer;
@@ -1876,9 +1880,6 @@ void CompilerMSL::preprocess_op_codes()
 	    (preproc.uses_image_write && !msl_options.supports_msl_version(2, 2)))
 		is_rasterization_disabled = true;
 
-	// FIXME: This currently does not consider BDA side effects, so we cannot deduce const device for BDA.
-	has_descriptor_side_effects_buffer = preproc.uses_buffer_write;
-
 	// Tessellation control shaders are run as compute functions in Metal, and so
 	// must capture their output to a buffer.
 	if (is_tesc_shader() || (get_execution_model() == ExecutionModelVertex && msl_options.vertex_for_tessellation))
@@ -2704,7 +2705,7 @@ uint32_t CompilerMSL::build_msl_interpolant_type(uint32_t type_id, bool is_noper
 	return new_type_id;
 }
 
-bool CompilerMSL::add_component_variable_to_interface_block(StorageClass storage, const std::string &ib_var_ref,
+bool CompilerMSL::add_component_variable_to_interface_block(spv::StorageClass storage, const std::string &ib_var_ref,
                                                             SPIRVariable &var,
                                                             const SPIRType &type,
                                                             InterfaceBlockMeta &meta)
@@ -3764,7 +3765,7 @@ void CompilerMSL::add_tess_level_input(const std::string &base_ref, const std::s
 	}
 }
 
-bool CompilerMSL::variable_storage_requires_stage_io(StorageClass storage) const
+bool CompilerMSL::variable_storage_requires_stage_io(spv::StorageClass storage) const
 {
 	if (storage == StorageClassOutput)
 		return !capture_output_to_buffer;
@@ -4873,7 +4874,7 @@ uint32_t CompilerMSL::ensure_correct_builtin_type(uint32_t type_id, BuiltIn buil
 
 		uint32_t ptr_type_id = next_id++;
 		auto &ptr_type = set<SPIRType>(ptr_type_id, base_type);
-		ptr_type.op = OpTypePointer;
+		ptr_type.op = spv::OpTypePointer;
 		ptr_type.pointer = true;
 		ptr_type.pointer_depth++;
 		ptr_type.storage = type.storage;
@@ -5873,8 +5874,8 @@ void CompilerMSL::emit_custom_templates()
 			begin_scope();
 			statement("return elements[pos];");
 			end_scope();
-			if (get_execution_model() == ExecutionModelMeshEXT ||
-			    get_execution_model() == ExecutionModelTaskEXT)
+			if (get_execution_model() == spv::ExecutionModelMeshEXT ||
+			    get_execution_model() == spv::ExecutionModelTaskEXT)
 			{
 				statement("");
 				statement("object_data T& operator [] (size_t pos) object_data");
@@ -6981,40 +6982,6 @@ void CompilerMSL::emit_custom_functions()
 				statement("return (vec<bool, N>)simd_shuffle((vec<ushort, N>)value, lane);");
 			end_scope();
 			statement("");
-
-			if (msl_options.supports_msl_version(2, 2))
-			{
-				// Despite being a template in MSL, it does not support 64-bit shuffles.
-				// Unsure if there's a cleaner way to statically unroll based on vec<> template, but this will do.
-				statement("template<>");
-				statement("inline ulong spvSubgroupShuffle(ulong value, ushort lane)");
-				begin_scope();
-				statement("return as_type<ulong>(spvSubgroupShuffle(as_type<uint2>(value), lane));");
-				end_scope();
-				statement("");
-				statement("template<>");
-				statement("inline ulong2 spvSubgroupShuffle(ulong2 value, ushort lane)");
-				begin_scope();
-				statement("return ulong2(spvSubgroupShuffle(value.x, lane), spvSubgroupShuffle(value.y, lane));");
-				end_scope();
-				statement("");
-				statement("inline ulong3 spvSubgroupShuffle(ulong3 value, ushort lane)");
-				begin_scope();
-				statement("return ulong3(spvSubgroupShuffle(value.xy, lane), spvSubgroupShuffle(value.z, lane));");
-				end_scope();
-				statement("");
-				statement("inline ulong4 spvSubgroupShuffle(ulong4 value, ushort lane)");
-				begin_scope();
-				statement("return ulong4(spvSubgroupShuffle(value.xy, lane), spvSubgroupShuffle(value.zw, lane));");
-				end_scope();
-				statement("");
-				statement("template<uint N>");
-				statement("inline vec<long, N> spvSubgroupShuffle(vec<long, N> value, ushort lane)");
-				begin_scope();
-				statement("return vec<long, N>(spvSubgroupShuffle(vec<ulong, N>(value), lane));");
-				end_scope();
-				statement("");
-			}
 			break;
 
 		case SPVFuncImplSubgroupShuffleXor:
@@ -8064,14 +8031,18 @@ void CompilerMSL::emit_custom_functions()
 
 		case SPVFuncImplVariableSizedDescriptor:
 			statement("template<typename T>");
-			statement("struct spvBufferDescriptor;");
-			statement("");
-			statement("template<typename T>");
-			statement("struct spvBufferDescriptor<device T*>");
+			statement("struct spvBufferDescriptor");
 			begin_scope();
-			statement("device T* value;");
+			statement("T value;");
 			statement("int length;");
-			statement("int padding;");
+			statement("const device T& operator -> () const device");
+			begin_scope();
+			statement("return value;");
+			end_scope();
+			statement("const device T& operator * () const device");
+			begin_scope();
+			statement("return value;");
+			end_scope();
 			end_scope_decl();
 			statement("");
 			break;
@@ -8082,9 +8053,13 @@ void CompilerMSL::emit_custom_functions()
 				statement("template<typename T>");
 				statement("struct spvDescriptorArray");
 				begin_scope();
-				statement("spvDescriptorArray(const device spvDescriptor<T>* ptr_) : ptr(&ptr_->value) {}");
-				statement("spvDescriptorArray(const device void *ptr_) : spvDescriptorArray(static_cast<const device spvDescriptor<T>*>(ptr_)) {}");
-				statement("const device T& operator [] (size_t i) const { return ptr[i]; }");
+				statement("spvDescriptorArray(const device spvDescriptor<T>* ptr) : ptr(&ptr->value)");
+				begin_scope();
+				end_scope();
+				statement("const device T& operator [] (size_t i) const");
+				begin_scope();
+				statement("return ptr[i];");
+				end_scope();
 				statement("const device T* ptr;");
 				end_scope_decl();
 				statement("");
@@ -8102,10 +8077,17 @@ void CompilerMSL::emit_custom_functions()
 				statement("template<typename T>");
 				statement("struct spvDescriptorArray<device T*>");
 				begin_scope();
-				statement("spvDescriptorArray(const device spvBufferDescriptor<device T*>* ptr_) : ptr(ptr_) {}");
-				statement("spvDescriptorArray(const device void *ptr_) : spvDescriptorArray(static_cast<const device spvBufferDescriptor<device T*>*>(ptr_)) {}");
-				statement("device T* operator [] (size_t i) const { return ptr[i].value; }");
-				statement("int length(int i) const { return ptr[i].length; }");
+				statement("spvDescriptorArray(const device spvBufferDescriptor<device T*>* ptr) : ptr(ptr)");
+				begin_scope();
+				end_scope();
+				statement("const device T* operator [] (size_t i) const");
+				begin_scope();
+				statement("return ptr[i].value;");
+				end_scope();
+				statement("const int length(int i) const");
+				begin_scope();
+				statement("return ptr[i].length;");
+				end_scope();
 				statement("const device spvBufferDescriptor<device T*>* ptr;");
 				end_scope_decl();
 				statement("");
@@ -8309,9 +8291,8 @@ void CompilerMSL::emit_resources()
 		else if (execution.flags.get(ExecutionModeOutputPoints))
 			topology = "topology::point";
 
-		const char *per_vertex = mesh_out_per_vertex ? "spvPerVertex" : "float4";
 		const char *per_primitive = mesh_out_per_primitive ? "spvPerPrimitive" : "void";
-		statement("using spvMesh_t = mesh<", per_vertex, ", ", per_primitive, ", ", execution.output_vertices, ", ",
+		statement("using spvMesh_t = mesh<", "spvPerVertex, ", per_primitive, ", ", execution.output_vertices, ", ",
 		          execution.output_primitives, ", ", topology, ">;");
 		statement("");
 	}
@@ -8429,22 +8410,9 @@ void CompilerMSL::emit_specialization_constants_and_structs()
 					if (unique_func_constants[constant_id] == c.self)
 						statement("constant ", sc_type_name, " ", sc_tmp_name, " [[function_constant(", constant_id,
 						          ")]];");
-					// RenderDoc and other instrumentation may reuse the same SpecId with different base types.
-					// We deduplicate to one [[function_constant(id)]] temp and then initialize all variants from it.
-					// Metal forbids as_type to/from 'bool', so if either side is Boolean, avoid bitcasting here and
-					// prefer a value cast via a constructor instead (e.g. uint(tmp) / float(tmp) / bool(tmp)).
-					// This preserves expected toggle semantics and prevents illegal MSL like as_type<uint>(bool_tmp).
-					{
-						string sc_true_expr;
-						if (sc_tmp_type == type.basetype)
-							sc_true_expr = sc_tmp_name;
-						else if (sc_tmp_type == SPIRType::Boolean || type.basetype == SPIRType::Boolean)
-							sc_true_expr = join(sc_type_name, "(", sc_tmp_name, ")");
-						else
-							sc_true_expr = bitcast_expression(type, sc_tmp_type, sc_tmp_name);
-						statement("constant ", sc_type_name, " ", sc_name, " = is_function_constant_defined(", sc_tmp_name,
-						          ") ? ", sc_true_expr, " : ", constant_expression(c), ";");
-					}
+					statement("constant ", sc_type_name, " ", sc_name, " = is_function_constant_defined(", sc_tmp_name,
+					          ") ? ", bitcast_expression(type, sc_tmp_type, sc_tmp_name), " : ", constant_expression(c),
+					          ";");
 				}
 				else if (has_decoration(c.self, DecorationSpecId))
 				{
@@ -9244,18 +9212,13 @@ bool CompilerMSL::is_out_of_bounds_tessellation_level(uint32_t id_lhs)
 }
 
 bool CompilerMSL::prepare_access_chain_for_scalar_access(std::string &expr, const SPIRType &type,
-                                                         StorageClass storage, bool &is_packed)
+                                                         spv::StorageClass storage, bool &is_packed)
 {
 	// If there is any risk of writes happening with the access chain in question,
 	// and there is a risk of concurrent write access to other components,
 	// we must cast the access chain to a plain pointer to ensure we only access the exact scalars we expect.
 	// The MSL compiler refuses to allow component-level access for any non-packed vector types.
-	// MSL refuses to take address or reference to vector component, even for packed types, so just force
-	// through the pointer cast. No much we can do sadly.
-	// For packed types, we could technically omit this if we know the reference does not have to turn into a pointer
-	// of some kind, but that requires external analysis passes to figure out, and
-	// this case is likely rare enough that we don't need to bother.
-	if (storage == StorageClassStorageBuffer || storage == StorageClassWorkgroup)
+	if (!is_packed && (storage == StorageClassStorageBuffer || storage == StorageClassWorkgroup))
 	{
 		const char *addr_space = storage == StorageClassWorkgroup ? "threadgroup" : "device";
 		expr = join("((", addr_space, " ", type_to_glsl(type), "*)&", enclose_expression(expr), ")");
@@ -9579,30 +9542,26 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)
 		break;
 
 	case OpFMul:
-		if (msl_options.invariant_float_math || has_legacy_nocontract(ops[0], ops[1]))
+		if (msl_options.invariant_float_math || has_decoration(ops[1], DecorationNoContraction))
 			MSL_BFOP(spvFMul);
 		else
 			MSL_BOP(*);
 		break;
 
 	case OpFAdd:
-		if (msl_options.invariant_float_math || has_legacy_nocontract(ops[0], ops[1]))
+		if (msl_options.invariant_float_math || has_decoration(ops[1], DecorationNoContraction))
 			MSL_BFOP(spvFAdd);
 		else
 			MSL_BOP(+);
 		break;
 
 	case OpFSub:
-		if (msl_options.invariant_float_math || has_legacy_nocontract(ops[0], ops[1]))
+		if (msl_options.invariant_float_math || has_decoration(ops[1], DecorationNoContraction))
 			MSL_BFOP(spvFSub);
 		else
 			MSL_BOP(-);
 		break;
 
-	case OpFmaKHR:
-		MSL_TFOP(fma);
-		break;
-
 	// Atomics
 	case OpAtomicExchange:
 	{
@@ -10095,7 +10054,7 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)
 	case OpVectorTimesMatrix:
 	case OpMatrixTimesVector:
 	{
-		if (!msl_options.invariant_float_math && !has_legacy_nocontract(ops[0], ops[1]))
+		if (!msl_options.invariant_float_math && !has_decoration(ops[1], DecorationNoContraction))
 		{
 			CompilerGLSL::emit_instruction(instruction);
 			break;
@@ -10137,7 +10096,7 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)
 
 	case OpMatrixTimesMatrix:
 	{
-		if (!msl_options.invariant_float_math && !has_legacy_nocontract(ops[0], ops[1]))
+		if (!msl_options.invariant_float_math && !has_decoration(ops[1], DecorationNoContraction))
 		{
 			CompilerGLSL::emit_instruction(instruction);
 			break;
@@ -10158,7 +10117,8 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)
 			         enclose_expression(to_unpacked_row_major_matrix_expression(ops[2])), ")");
 
 			bool forward = should_forward(ops[2]) && should_forward(ops[3]);
-			emit_transposed_op(ops[0], ops[1], expr, forward);
+			auto &e = emit_op(ops[0], ops[1], expr, forward);
+			e.need_transpose = true;
 			a->need_transpose = true;
 			b->need_transpose = true;
 			inherit_expression_dependencies(ops[1], ops[2]);
@@ -10822,13 +10782,13 @@ bool CompilerMSL::emit_array_copy(const char *expr, uint32_t lhs_id, uint32_t rh
 	auto *lhs_var = maybe_get_backing_variable(lhs_id);
 	if (lhs_var && lhs_storage == StorageClassStorageBuffer && storage_class_array_is_thread(lhs_var->storage))
 		lhs_is_array_template = true;
-	else if (lhs_var && lhs_storage != StorageClassGeneric && type_is_explicit_layout(get<SPIRType>(lhs_var->basetype)))
+	else if (lhs_var && lhs_storage != StorageClassGeneric && type_is_block_like(get<SPIRType>(lhs_var->basetype)))
 		lhs_is_array_template = false;
 
 	auto *rhs_var = maybe_get_backing_variable(rhs_id);
 	if (rhs_var && rhs_storage == StorageClassStorageBuffer && storage_class_array_is_thread(rhs_var->storage))
 		rhs_is_array_template = true;
-	else if (rhs_var && rhs_storage != StorageClassGeneric && type_is_explicit_layout(get<SPIRType>(rhs_var->basetype)))
+	else if (rhs_var && rhs_storage != StorageClassGeneric && type_is_block_like(get<SPIRType>(rhs_var->basetype)))
 		rhs_is_array_template = false;
 
 	// If threadgroup storage qualifiers are *not* used:
@@ -10919,7 +10879,7 @@ bool CompilerMSL::emit_array_copy(const char *expr, uint32_t lhs_id, uint32_t rh
 	return true;
 }
 
-uint32_t CompilerMSL::get_physical_tess_level_array_size(BuiltIn builtin) const
+uint32_t CompilerMSL::get_physical_tess_level_array_size(spv::BuiltIn builtin) const
 {
 	if (is_tessellating_triangles())
 		return builtin == BuiltInTessLevelInner ? 1 : 3;
@@ -11090,7 +11050,7 @@ void CompilerMSL::emit_atomic_func_op(uint32_t result_type, uint32_t result_id,
 			}
 
 			exp += join(image_expr, ".", op, "(");
-			if (ptr_type.storage == StorageClassImage && (res_type->image.arrayed || res_type->image.dim == DimCube))
+			if (ptr_type.storage == StorageClassImage && res_type->image.arrayed)
 			{
 				switch (res_type->image.dim)
 				{
@@ -11099,21 +11059,13 @@ void CompilerMSL::emit_atomic_func_op(uint32_t result_type, uint32_t result_id,
 						exp += join("uint2(", coord, ".x, 0), ", coord, ".y");
 					else
 						exp += join(coord, ".x, ", coord, ".y");
+
 					break;
 				case Dim2D:
 					exp += join(coord, ".xy, ", coord, ".z");
 					break;
-				case DimCube:
-					if (!msl_options.supports_msl_version(4, 0))
-						SPIRV_CROSS_THROW("Cannot do atomics on Cube textures before 4.0.");
-
-					if (res_type->image.arrayed)
-						exp += join(coord, ".xy, ", coord, ".z % 6u, ", coord, ".z / 6u");
-					else
-						exp += join(coord, ".xy, ", coord, ".z");
-					break;
 				default:
-					SPIRV_CROSS_THROW("Cannot do atomics on unknown dimension.");
+					SPIRV_CROSS_THROW("Cannot do atomics on Cube textures.");
 				}
 			}
 			else if (ptr_type.storage == StorageClassImage && res_type->image.dim == Dim1D && msl_options.texture_1D_as_2D)
@@ -11140,7 +11092,7 @@ void CompilerMSL::emit_atomic_func_op(uint32_t result_type, uint32_t result_id,
 		}
 		else if (var && ptr_type.storage != StorageClassPhysicalStorageBuffer)
 		{
-			exp += get_variable_address_space(*var);
+			exp += get_argument_address_space(*var);
 		}
 		else
 		{
@@ -11287,76 +11239,35 @@ void CompilerMSL::emit_glsl_op(uint32_t result_type, uint32_t id, uint32_t eop,
 
 	auto &restype = get<SPIRType>(result_type);
 
-	// Only precise:: preserves NaN in trancendentals (supposedly, cannot find documentation for this).
-	const auto drop_nan_inf = FPFastMathModeNotInfMask | FPFastMathModeNotNaNMask;
-	bool preserve_nan = (get_fp_fast_math_flags_for_op(result_type, id) & drop_nan_inf) != drop_nan_inf;
-	const char *preserve_str = preserve_nan ? "precise" : "fast";
-
-	// TODO: Emit the default behavior to match existing code. Might need to be revisited.
-	// Only fp32 has the precise:: override.
-#define EMIT_PRECISE_OVERRIDE(glsl_op, op) \
-	case GLSLstd450##glsl_op: \
-		if (restype.basetype == SPIRType::Float && preserve_nan) \
-			emit_unary_func_op(result_type, id, args[0], "precise::" op); \
-		else \
-			CompilerGLSL::emit_glsl_op(result_type, id, eop, args, count); \
-		break
-
 	switch (op)
 	{
-	EMIT_PRECISE_OVERRIDE(Cos, "cos");
-	EMIT_PRECISE_OVERRIDE(Sin, "sin");
-	EMIT_PRECISE_OVERRIDE(Tan, "tan");
-	EMIT_PRECISE_OVERRIDE(Acos, "acos");
-	EMIT_PRECISE_OVERRIDE(Asin, "asin");
-	EMIT_PRECISE_OVERRIDE(Atan, "atan");
-	EMIT_PRECISE_OVERRIDE(Exp, "exp");
-	EMIT_PRECISE_OVERRIDE(Exp2, "exp2");
-	EMIT_PRECISE_OVERRIDE(Log, "log");
-	EMIT_PRECISE_OVERRIDE(Log2, "log2");
-	EMIT_PRECISE_OVERRIDE(Sqrt, "sqrt");
-#undef EMIT_PRECISE_OVERRIDE
-
 	case GLSLstd450Sinh:
 		if (restype.basetype == SPIRType::Half)
 		{
-			auto ftype = restype;
-			ftype.basetype = SPIRType::Float;
-
 			// MSL does not have overload for half. Force-cast back to half.
-			auto expr = join(type_to_glsl(restype), "(", preserve_str, "::sinh(", type_to_glsl(ftype), "(", to_unpacked_expression(args[0]), ")))");
+			auto expr = join("half(fast::sinh(", to_unpacked_expression(args[0]), "))");
 			emit_op(result_type, id, expr, should_forward(args[0]));
 			inherit_expression_dependencies(id, args[0]);
 		}
-		else if (preserve_nan)
-			emit_unary_func_op(result_type, id, args[0], "precise::sinh");
 		else
 			emit_unary_func_op(result_type, id, args[0], "fast::sinh");
 		break;
 	case GLSLstd450Cosh:
 		if (restype.basetype == SPIRType::Half)
 		{
-			auto ftype = restype;
-			ftype.basetype = SPIRType::Float;
-
 			// MSL does not have overload for half. Force-cast back to half.
-			auto expr = join(type_to_glsl(restype), "(", preserve_str, "::cosh(", type_to_glsl(ftype), "(", to_unpacked_expression(args[0]), ")))");
+			auto expr = join("half(fast::cosh(", to_unpacked_expression(args[0]), "))");
 			emit_op(result_type, id, expr, should_forward(args[0]));
 			inherit_expression_dependencies(id, args[0]);
 		}
-		else if (preserve_nan)
-			emit_unary_func_op(result_type, id, args[0], "precise::cosh");
 		else
 			emit_unary_func_op(result_type, id, args[0], "fast::cosh");
 		break;
 	case GLSLstd450Tanh:
 		if (restype.basetype == SPIRType::Half)
 		{
-			auto ftype = restype;
-			ftype.basetype = SPIRType::Float;
-
 			// MSL does not have overload for half. Force-cast back to half.
-			auto expr = join(type_to_glsl(restype), "(", preserve_str, "::tanh(", type_to_glsl(ftype), "(", to_unpacked_expression(args[0]), ")))");
+			auto expr = join("half(fast::tanh(", to_unpacked_expression(args[0]), "))");
 			emit_op(result_type, id, expr, should_forward(args[0]));
 			inherit_expression_dependencies(id, args[0]);
 		}
@@ -11367,13 +11278,7 @@ void CompilerMSL::emit_glsl_op(uint32_t result_type, uint32_t id, uint32_t eop,
 		if (restype.basetype == SPIRType::Half)
 		{
 			// MSL does not have overload for half. Force-cast back to half.
-			auto ftype = restype;
-			ftype.basetype = SPIRType::Float;
-
-			auto expr = join(type_to_glsl(restype),
-			                 "(", preserve_str, "::atan2(",
-			                 type_to_glsl(ftype), "(", to_unpacked_expression(args[0]), "), ",
-			                 type_to_glsl(ftype), "(", to_unpacked_expression(args[1]), ")))");
+			auto expr = join("half(fast::atan2(", to_unpacked_expression(args[0]), ", ", to_unpacked_expression(args[1]), "))");
 			emit_op(result_type, id, expr, should_forward(args[0]) && should_forward(args[1]));
 			inherit_expression_dependencies(id, args[0]);
 			inherit_expression_dependencies(id, args[1]);
@@ -11382,10 +11287,7 @@ void CompilerMSL::emit_glsl_op(uint32_t result_type, uint32_t id, uint32_t eop,
 			emit_binary_func_op(result_type, id, args[0], args[1], "precise::atan2");
 		break;
 	case GLSLstd450InverseSqrt:
-		if (restype.basetype == SPIRType::Float && preserve_nan)
-			emit_unary_func_op(result_type, id, args[0], "precise::rsqrt");
-		else
-			emit_unary_func_op(result_type, id, args[0], "rsqrt");
+		emit_unary_func_op(result_type, id, args[0], "rsqrt");
 		break;
 	case GLSLstd450RoundEven:
 		emit_unary_func_op(result_type, id, args[0], "rint");
@@ -11617,14 +11519,11 @@ void CompilerMSL::emit_glsl_op(uint32_t result_type, uint32_t id, uint32_t eop,
 	{
 		auto &exp_type = expression_type(args[0]);
 		// MSL does not support scalar versions here.
-		// MSL has no implementation for normalize in the fast:: namespace for half
+		// MSL has no implementation for normalize in the fast:: namespace for half2 and half3
 		// Returns -1 or 1 for valid input, sign() does the job.
-
-		// precise::normalize asm looks ridiculous.
-		// Don't think this actually matters unless proven otherwise.
 		if (exp_type.vecsize == 1)
 			emit_unary_func_op(result_type, id, args[0], "sign");
-		else if (exp_type.basetype == SPIRType::Half)
+		else if (exp_type.vecsize <= 3 && exp_type.basetype == SPIRType::Half)
 			emit_unary_func_op(result_type, id, args[0], "normalize");
 		else
 			emit_unary_func_op(result_type, id, args[0], "fast::normalize");
@@ -11687,10 +11586,7 @@ void CompilerMSL::emit_glsl_op(uint32_t result_type, uint32_t id, uint32_t eop,
 
 	case GLSLstd450Pow:
 		// powr makes x < 0.0 undefined, just like SPIR-V.
-		if (restype.basetype == SPIRType::Float && preserve_nan)
-			emit_binary_func_op(result_type, id, args[0], args[1], "precise::powr");
-		else
-			emit_binary_func_op(result_type, id, args[0], args[1], "powr");
+		emit_binary_func_op(result_type, id, args[0], args[1], "powr");
 		break;
 
 	default:
@@ -13077,6 +12973,7 @@ string CompilerMSL::to_swizzle_expression(uint32_t id)
 string CompilerMSL::to_buffer_size_expression(uint32_t id)
 {
 	auto expr = to_expression(id);
+	auto index = expr.find_first_of('[');
 
 	// This is quite crude, but we need to translate the reference name (*spvDescriptorSetN.name) to
 	// the pointer expression spvDescriptorSetN.name to make a reasonable expression here.
@@ -13084,26 +12981,17 @@ string CompilerMSL::to_buffer_size_expression(uint32_t id)
 	if (expr.size() >= 3 && expr[0] == '(' && expr[1] == '*')
 		expr = address_of_expression(expr);
 
-	auto index = expr.find_first_of('[');
-	string buffer_expr, array_expr;
-
-	if (index != string::npos)
-	{
-		buffer_expr = expr.substr(0, index);
-		array_expr = expr.substr(index);
-	}
-
 	// If a buffer is part of an argument buffer translate this to a legal identifier.
 	for (auto &c : expr)
 		if (c == '.')
 			c = '_';
 
 	if (index == string::npos)
-	{
 		return expr + buffer_size_name_suffix;
-	}
 	else
 	{
+		auto buffer_expr = expr.substr(0, index);
+		auto array_expr = expr.substr(index);
 		if (auto var = maybe_get_backing_variable(id))
 		{
 			if (is_var_runtime_size_array(*var))
@@ -13116,11 +13004,6 @@ string CompilerMSL::to_buffer_size_expression(uint32_t id)
 					return buffer_expr + ".length(" + array_expr.substr(1, last_pos - 1) + ")";
 			}
 		}
-
-		for (auto &c : buffer_expr)
-			if (c == '.')
-				c = '_';
-
 		return buffer_expr + buffer_size_name_suffix + array_expr;
 	}
 }
@@ -13175,20 +13058,17 @@ string CompilerMSL::convert_row_major_matrix(string exp_str, const SPIRType &exp
 // Called automatically at the end of the entry point function
 void CompilerMSL::emit_fixup()
 {
-	if (stage_out_var_id && !capture_output_to_buffer)
+	if (is_vertex_like_shader() && stage_out_var_id && !qual_pos_var_name.empty() && !capture_output_to_buffer)
 	{
-		if (needs_point_size_output && !writes_to_point_size)
+		if (msl_options.enable_point_size_default && !writes_to_point_size)
 			statement(builtin_to_glsl(BuiltInPointSize, StorageClassOutput), " = ", format_float(msl_options.default_point_size), ";");
 
-		if (is_vertex_like_shader() && !qual_pos_var_name.empty())
-		{
-			if (options.vertex.fixup_clipspace)
-				statement(qual_pos_var_name, ".z = (", qual_pos_var_name, ".z + ", qual_pos_var_name,
-						  ".w) * 0.5;       // Adjust clip-space for Metal");
+		if (options.vertex.fixup_clipspace)
+			statement(qual_pos_var_name, ".z = (", qual_pos_var_name, ".z + ", qual_pos_var_name,
+			          ".w) * 0.5;       // Adjust clip-space for Metal");
 
-			if (options.vertex.flip_vert_y)
-				statement(qual_pos_var_name, ".y = -(", qual_pos_var_name, ".y);", "    // Invert Y-axis for Metal");
-		}
+		if (options.vertex.flip_vert_y)
+			statement(qual_pos_var_name, ".y = -(", qual_pos_var_name, ".y);", "    // Invert Y-axis for Metal");
 	}
 }
 
@@ -13842,7 +13722,7 @@ uint32_t CompilerMSL::get_member_location(uint32_t type_id, uint32_t index, uint
 		return k_unknown_location;
 }
 
-uint32_t CompilerMSL::get_or_allocate_builtin_input_member_location(BuiltIn builtin,
+uint32_t CompilerMSL::get_or_allocate_builtin_input_member_location(spv::BuiltIn builtin,
                                                                     uint32_t type_id, uint32_t index,
                                                                     uint32_t *comp)
 {
@@ -13887,7 +13767,7 @@ uint32_t CompilerMSL::get_or_allocate_builtin_input_member_location(BuiltIn buil
 	return loc;
 }
 
-uint32_t CompilerMSL::get_or_allocate_builtin_output_member_location(BuiltIn builtin,
+uint32_t CompilerMSL::get_or_allocate_builtin_output_member_location(spv::BuiltIn builtin,
                                                                      uint32_t type_id, uint32_t index,
                                                                      uint32_t *comp)
 {
@@ -13930,26 +13810,6 @@ uint32_t CompilerMSL::get_or_allocate_builtin_output_member_location(BuiltIn bui
 	return loc;
 }
 
-bool CompilerMSL::entry_point_is_vertex() const
-{
-	// MSL vertex entrypoint is used for non-tessellation vertex stage or tessellation evaluation stage.
-	return (get_execution_model() == ExecutionModelVertex && !msl_options.vertex_for_tessellation) ||
-			get_execution_model() == ExecutionModelTessellationEvaluation;
-}
-
-bool CompilerMSL::entry_point_returns_stage_output() const
-{
-	if (get_execution_model() == ExecutionModelVertex && msl_options.vertex_for_tessellation)
-		return false;
-	bool ep_should_return_output = !get_is_rasterization_disabled();
-	return stage_out_var_id && ep_should_return_output;
-}
-
-bool CompilerMSL::entry_point_requires_const_device_buffers() const
-{
-	return !has_descriptor_side_effects_buffer && !capture_output_to_buffer;
-}
-
 // Returns the type declaration for a function, including the
 // entry type if the current function is the entry point function
 string CompilerMSL::func_type_decl(SPIRType &type)
@@ -13960,7 +13820,8 @@ string CompilerMSL::func_type_decl(SPIRType &type)
 		return return_type;
 
 	// If an outgoing interface block has been defined, and it should be returned, override the entry point return type
-	if (entry_point_returns_stage_output())
+	bool ep_should_return_output = !get_is_rasterization_disabled();
+	if (stage_out_var_id && ep_should_return_output)
 		return_type = type_to_glsl(get_stage_out_struct_type()) + type_to_array_glsl(type, 0);
 
 	// Prepend a entry type, based on the execution model
@@ -14023,7 +13884,7 @@ bool CompilerMSL::is_tese_shader() const
 
 bool CompilerMSL::is_mesh_shader() const
 {
-	return get_execution_model() == ExecutionModelMeshEXT;
+	return get_execution_model() == spv::ExecutionModelMeshEXT;
 }
 
 bool CompilerMSL::uses_explicit_early_fragment_test()
@@ -14033,17 +13894,11 @@ bool CompilerMSL::uses_explicit_early_fragment_test()
 }
 
 // In MSL, address space qualifiers are required for all pointer or reference variables
-string CompilerMSL::get_variable_address_space(const SPIRVariable &argument)
+string CompilerMSL::get_argument_address_space(const SPIRVariable &argument)
 {
 	const auto &type = get<SPIRType>(argument.basetype);
-	return get_type_address_space(type, argument.self, true);
-}
-
-string CompilerMSL::get_leaf_argument_address_space(const SPIRVariable &argument)
-{
-	const auto &type = get<SPIRType>(argument.basetype);
-	// BDA and variable buffer pointer is always passed around by (pointer) value. There is no storage class for the argument itself.
-	if (is_physical_or_buffer_pointer(type))
+	// BDA is always passed around by value. There is no storage class for the argument itself.
+	if (is_physical_pointer(type))
 		return "";
 	return get_type_address_space(type, argument.self, true);
 }
@@ -14089,19 +13944,26 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id, bo
 		break;
 
 	case StorageClassStorageBuffer:
-	case StorageClassPhysicalStorageBuffer:
 	{
-		// When dealing with descriptor aliasing, it becomes very problematic to make use of
-		// readonly qualifiers.
-		// If rasterization is not disabled in vertex/tese, Metal does not allow side effects and refuses to compile "device",
-		// even if there are no writes. Just force const device.
-		if (entry_point_requires_const_device_buffers() && type.basetype != SPIRType::AtomicCounter)
-			addr_space = "const device";
-		else
-			addr_space = "device";
+		// For arguments from variable pointers, we use the write count deduction, so
+		// we should not assume any constness here. Only for global SSBOs.
+		bool readonly = false;
+		if (!var || has_decoration(type.self, DecorationBlock))
+			readonly = flags.get(DecorationNonWritable);
+
+		if (decoration_flags_signal_coherent(flags))
+			readonly = false;
+
+		addr_space = readonly ? "const device" : "device";
 		break;
 	}
 
+	case StorageClassPhysicalStorageBuffer:
+		// We cannot fully trust NonWritable coming from glslang due to a bug in buffer_reference handling.
+		// There isn't much gain in emitting const in C++ languages anyway.
+		addr_space = "device";
+		break;
+
 	case StorageClassUniform:
 	case StorageClassUniformConstant:
 	case StorageClassPushConstant:
@@ -14109,18 +13971,12 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id, bo
 		{
 			bool ssbo = has_decoration(type.self, DecorationBufferBlock);
 			if (ssbo)
-			{
-				if (entry_point_requires_const_device_buffers() && type.basetype != SPIRType::AtomicCounter)
-					addr_space = "const device";
-				else
-					addr_space = "device";
-			}
+				addr_space = flags.get(DecorationNonWritable) ? "const device" : "device";
 			else
 				addr_space = "constant";
 		}
 		else if (!argument)
 		{
-			// This is used for helper UBOs we insert ourselves.
 			addr_space = "constant";
 		}
 		else if (type_is_msl_framebuffer_fetch(type))
@@ -14128,7 +13984,6 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id, bo
 			// Subpass inputs are passed around by value.
 			addr_space = "";
 		}
-
 		break;
 
 	case StorageClassFunction:
@@ -14191,9 +14046,6 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id, bo
 		break;
 	}
 
-	if (!addr_space && var && is_var_runtime_size_array(*var))
-		addr_space = "device";
-
 	if (!addr_space)
 	{
 		// No address space for plain values.
@@ -14645,7 +14497,7 @@ string CompilerMSL::entry_point_args_argument_buffer(bool append_comma)
 
 		claimed_bindings.set(buffer_binding);
 
-		ep_args += get_variable_address_space(var) + " ";
+		ep_args += get_argument_address_space(var) + " ";
 
 		if (recursive_inputs.count(type.self))
 			ep_args += string("void* ") + to_restrict(id, true) + to_name(id) + "_vp";
@@ -14737,21 +14589,17 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 			// For fully mutable-style aliasing, we need argument buffers where we can exploit the fact
 			// that descriptors are all 8 bytes.
 			SPIRVariable *discrete_descriptor_alias = nullptr;
-
-			const auto resource_is_aliasing_candidate = [this](const SPIRVariable &var_) {
-				return is_var_runtime_size_array(var_) || var_.storage == StorageClassUniform ||
-				       var_.storage == StorageClassStorageBuffer;
-			};
-
-			if (resource_is_aliasing_candidate(var))
+			if (var.storage == StorageClassUniform || var.storage == StorageClassStorageBuffer)
 			{
 				for (auto &resource : resources)
 				{
-					if (resource_is_aliasing_candidate(*resource.var) &&
-					    get_decoration(resource.var->self, DecorationDescriptorSet) ==
+					if (get_decoration(resource.var->self, DecorationDescriptorSet) ==
 					    get_decoration(var_id, DecorationDescriptorSet) &&
 					    get_decoration(resource.var->self, DecorationBinding) ==
-					    get_decoration(var_id, DecorationBinding))
+					    get_decoration(var_id, DecorationBinding) &&
+					    resource.basetype == SPIRType::Struct && type.basetype == SPIRType::Struct &&
+					    (resource.var->storage == StorageClassUniform ||
+					     resource.var->storage == StorageClassStorageBuffer))
 					{
 						discrete_descriptor_alias = resource.var;
 						// Self-reference marks that we should declare the resource,
@@ -14760,13 +14608,6 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 						// Need to promote interlocked usage so that the primary declaration is correct.
 						if (interlocked_resources.count(var_id))
 							interlocked_resources.insert(resource.var->self);
-
-						// Aliasing with unroll just gets too messy to deal with. I sure hope this never comes up ...
-						if ((is_array(get_variable_data_type(*resource.var)) && !is_var_runtime_size_array(*resource.var)) ||
-						    (is_array(get_variable_data_type(var)) && !is_var_runtime_size_array(var)))
-						{
-							SPIRV_CROSS_THROW("Attempting to alias same binding with a descriptor array which is not implemented through argument buffers. This is unsupported.");
-						}
 						break;
 					}
 				}
@@ -14837,57 +14678,6 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 
 		uint32_t var_id = var.self;
 
-		if (is_var_runtime_size_array(var))
-		{
-			add_spv_func_and_recompile(SPVFuncImplVariableDescriptorArray);
-			const bool ssbo = has_decoration(type.self, DecorationBufferBlock);
-			if ((var.storage == StorageClassStorageBuffer || ssbo) && msl_options.runtime_array_rich_descriptor)
-				add_spv_func_and_recompile(SPVFuncImplVariableSizedDescriptor);
-			else
-				add_spv_func_and_recompile(SPVFuncImplVariableDescriptor);
-		}
-
-		if (r.discrete_descriptor_alias)
-		{
-			if (r.var == r.discrete_descriptor_alias)
-			{
-				auto primary_name = join("spvBufferAliasSet",
-				                         get_decoration(var_id, DecorationDescriptorSet),
-				                         "Binding",
-				                         get_decoration(var_id, DecorationBinding));
-
-				// Declare the primary alias as void*
-				if (!ep_args.empty())
-					ep_args += ", ";
-				ep_args += get_variable_address_space(var) + " void* " + primary_name;
-				ep_args += " [[buffer(" + convert_to_string(r.index) + ")";
-				if (interlocked_resources.count(var_id))
-					ep_args += ", raster_order_group(0)";
-				ep_args += "]]";
-			}
-
-			buffer_aliases_discrete.push_back(r.var->self);
-			continue;
-		}
-
-		uint32_t desc_set = get_decoration(var_id, DecorationDescriptorSet);
-		uint32_t desc_binding = get_decoration(var_id, DecorationBinding);
-
-		if (is_var_runtime_size_array(var))
-		{
-			// This must be implemented as an argument buffer. Cast to intended descriptor array type on-demand.
-			if (!ep_args.empty())
-				ep_args += ", ";
-			ep_args += join("device const void* spvDescriptorSet", desc_set, "Binding", desc_binding);
-			if (type.basetype == SPIRType::SampledImage && r.basetype == SPIRType::Sampler)
-				ep_args += "Smplr";
-			ep_args += " [[buffer(" + convert_to_string(r.index) + ")";
-			if (interlocked_resources.count(var_id))
-				ep_args += ", raster_order_group(0)";
-			ep_args += "]]";
-			continue;
-		}
-
 		switch (r.basetype)
 		{
 		case SPIRType::Struct:
@@ -14896,31 +14686,80 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 			if (m.members.size() == 0)
 				break;
 
-			if (!type.array.empty())
+			if (r.discrete_descriptor_alias)
+			{
+				if (r.var == r.discrete_descriptor_alias)
+				{
+					auto primary_name = join("spvBufferAliasSet",
+					                         get_decoration(var_id, DecorationDescriptorSet),
+					                         "Binding",
+					                         get_decoration(var_id, DecorationBinding));
+
+					// Declare the primary alias as void*
+					if (!ep_args.empty())
+						ep_args += ", ";
+					ep_args += get_argument_address_space(var) + " void* " + primary_name;
+					ep_args += " [[buffer(" + convert_to_string(r.index) + ")";
+					if (interlocked_resources.count(var_id))
+						ep_args += ", raster_order_group(0)";
+					ep_args += "]]";
+				}
+
+				buffer_aliases_discrete.push_back(r.var->self);
+			}
+			else if (!type.array.empty())
 			{
 				if (type.array.size() > 1)
 					SPIRV_CROSS_THROW("Arrays of arrays of buffers are not supported.");
 
 				is_using_builtin_array = true;
-				uint32_t array_size = get_resource_array_size(type, var_id);
-				for (uint32_t i = 0; i < array_size; ++i)
+				if (is_var_runtime_size_array(var))
 				{
+					add_spv_func_and_recompile(SPVFuncImplVariableDescriptorArray);
 					if (!ep_args.empty())
 						ep_args += ", ";
-					ep_args += get_variable_address_space(var) + " " + type_to_glsl(type) + "* " +
-							   to_restrict(var_id, true) + r.name + "_" + convert_to_string(i);
-					ep_args += " [[buffer(" + convert_to_string(r.index + i) + ")";
+					const bool ssbo = has_decoration(type.self, DecorationBufferBlock);
+					if ((var.storage == spv::StorageClassStorageBuffer || ssbo) &&
+					    msl_options.runtime_array_rich_descriptor)
+					{
+						add_spv_func_and_recompile(SPVFuncImplVariableSizedDescriptor);
+						ep_args += "const device spvBufferDescriptor<" + get_argument_address_space(var) + " " +
+						           type_to_glsl(type) + "*>* ";
+					}
+					else
+					{
+						add_spv_func_and_recompile(SPVFuncImplVariableDescriptor);
+						ep_args += "const device spvDescriptor<" + get_argument_address_space(var) + " " +
+						           type_to_glsl(type) + "*>* ";
+					}
+					ep_args += to_restrict(var_id, true) + r.name + "_";
+					ep_args += " [[buffer(" + convert_to_string(r.index) + ")";
 					if (interlocked_resources.count(var_id))
 						ep_args += ", raster_order_group(0)";
 					ep_args += "]]";
 				}
+				else
+				{
+					uint32_t array_size = get_resource_array_size(type, var_id);
+					for (uint32_t i = 0; i < array_size; ++i)
+					{
+						if (!ep_args.empty())
+							ep_args += ", ";
+						ep_args += get_argument_address_space(var) + " " + type_to_glsl(type) + "* " +
+						           to_restrict(var_id, true) + r.name + "_" + convert_to_string(i);
+						ep_args += " [[buffer(" + convert_to_string(r.index + i) + ")";
+						if (interlocked_resources.count(var_id))
+							ep_args += ", raster_order_group(0)";
+						ep_args += "]]";
+					}
+				}
 				is_using_builtin_array = false;
 			}
 			else
 			{
 				if (!ep_args.empty())
 					ep_args += ", ";
-				ep_args += get_variable_address_space(var) + " ";
+				ep_args += get_argument_address_space(var) + " ";
 
 				if (recursive_inputs.count(type.self))
 					ep_args += string("void* ") + to_restrict(var_id, true) + r.name + "_vp";
@@ -14938,7 +14777,10 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 			if (!ep_args.empty())
 				ep_args += ", ";
 			ep_args += sampler_type(type, var_id, false) + " " + r.name;
-			ep_args += " [[sampler(" + convert_to_string(r.index) + ")]]";
+			if (is_var_runtime_size_array(var))
+				ep_args += "_ [[buffer(" + convert_to_string(r.index) + ")]]";
+			else
+				ep_args += " [[sampler(" + convert_to_string(r.index) + ")]]";
 			break;
 		case SPIRType::Image:
 		{
@@ -14953,7 +14795,10 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 				if (r.plane > 0)
 					ep_args += join(plane_name_suffix, r.plane);
 
-				ep_args += " [[texture(" + convert_to_string(r.index) + ")";
+				if (is_var_runtime_size_array(var))
+					ep_args += "_ [[buffer(" + convert_to_string(r.index) + ")";
+				else
+					ep_args += " [[texture(" + convert_to_string(r.index) + ")";
 
 				if (interlocked_resources.count(var_id))
 					ep_args += ", raster_order_group(0)";
@@ -14983,10 +14828,23 @@ void CompilerMSL::entry_point_args_discrete_descriptors(string &ep_args)
 		}
 		case SPIRType::AccelerationStructure:
 		{
-			if (!ep_args.empty())
-				ep_args += ", ";
-			ep_args += type_to_glsl(type, var_id) + " " + r.name;
-			ep_args += " [[buffer(" + convert_to_string(r.index) + ")]]";
+			if (is_var_runtime_size_array(var))
+			{
+				add_spv_func_and_recompile(SPVFuncImplVariableDescriptor);
+				const auto &parent_type = get<SPIRType>(type.parent_type);
+				if (!ep_args.empty())
+					ep_args += ", ";
+				ep_args += "const device spvDescriptor<" + type_to_glsl(parent_type) + ">* " +
+				           to_restrict(var_id, true) + r.name + "_";
+				ep_args += " [[buffer(" + convert_to_string(r.index) + ")]]";
+			}
+			else
+			{
+				if (!ep_args.empty())
+					ep_args += ", ";
+				ep_args += type_to_glsl(type, var_id) + " " + r.name;
+				ep_args += " [[buffer(" + convert_to_string(r.index) + ")]]";
+			}
 			break;
 		}
 		default:
@@ -15112,7 +14970,7 @@ void CompilerMSL::fix_up_shader_inputs_outputs()
 		{
 			recursive_inputs.insert(type.self);
 			entry_func.fixup_hooks_in.push_back([this, &type, &var, var_id]() {
-				auto addr_space = get_variable_address_space(var);
+				auto addr_space = get_argument_address_space(var);
 				auto var_name = to_name(var_id);
 				statement(addr_space, " auto& ", to_restrict(var_id, true), var_name,
 				          " = *(", addr_space, " ", type_to_glsl(type), "*)", var_name, "_vp;");
@@ -15809,7 +15667,7 @@ string CompilerMSL::argument_decl(const SPIRFunction::Parameter &arg)
 
 	// Physical pointer types are passed by pointer, not reference.
 	auto &data_type = get_variable_data_type(var);
-	bool passed_by_value = arg.alias_global_variable ? false : is_physical_or_buffer_pointer(var_type);
+	bool passed_by_value = is_physical_pointer(var_type);
 	auto &type = passed_by_value ? var_type : data_type;
 
 	// If we need to modify the name of the variable, make sure we use the original variable.
@@ -15821,18 +15679,10 @@ string CompilerMSL::argument_decl(const SPIRFunction::Parameter &arg)
 	bool constref = !arg.alias_global_variable && !passed_by_value && is_pointer(var_type) && arg.write_count == 0;
 	// Framebuffer fetch is plain value, const looks out of place, but it is not wrong.
 	// readonly coming from glslang is not reliable in all cases.
-	// For UBOs, readonly is implied, and for SSBOs we use global check.
-	if (type_is_msl_framebuffer_fetch(type) ||
-	    type_storage == StorageClassStorageBuffer ||
-	    type_storage == StorageClassUniform ||
-	    type_storage == StorageClassPhysicalStorageBuffer)
-	{
+	if (type_is_msl_framebuffer_fetch(type) || type_storage == StorageClassPhysicalStorageBuffer)
 		constref = false;
-	}
 	else if (type_storage == StorageClassUniformConstant)
-	{
 		constref = true;
-	}
 
 	bool type_is_image = type.basetype == SPIRType::Image || type.basetype == SPIRType::SampledImage ||
 	                     type.basetype == SPIRType::Sampler;
@@ -15852,7 +15702,7 @@ string CompilerMSL::argument_decl(const SPIRFunction::Parameter &arg)
 	                              spv_function_implementations.count(SPVFuncImplDynamicImageSampler);
 
 	// Allow Metal to use the array<T> template to make arrays a value type
-	string address_space = arg.alias_global_variable ? get_variable_address_space(var) : get_leaf_argument_address_space(var);
+	string address_space = get_argument_address_space(var);
 	bool builtin = has_decoration(var.self, DecorationBuiltIn);
 	auto builtin_type = BuiltIn(get_decoration(arg.id, DecorationBuiltIn));
 
@@ -15949,29 +15799,10 @@ string CompilerMSL::argument_decl(const SPIRFunction::Parameter &arg)
 		}
 		else
 		{
-			// Variable pointer to array is kinda awkward ...
-			bool pointer_to_logical_buffer_array =
-					!is_physical_pointer(type) && is_pointer(type) &&
-					has_decoration(type.parent_type, DecorationArrayStride);
-
-			if (pointer_to_logical_buffer_array)
-			{
-				decl.pop_back();
-				decl += " (*";
-				decl += to_expression(name_id);
-				decl += ")";
-				bool old_is_using_builtin_array = is_using_builtin_array;
-				is_using_builtin_array = true;
-				decl += type_to_array_glsl(type, name_id);
-				is_using_builtin_array = old_is_using_builtin_array;
-			}
-			else
-			{
-				if (!address_space.empty())
-					decl = join(address_space, " ", decl);
-				decl += " ";
-				decl += to_expression(name_id);
-			}
+			if (!address_space.empty())
+				decl = join(address_space, " ", decl);
+			decl += " ";
+			decl += to_expression(name_id);
 		}
 	}
 	else if (is_array(type) && !type_is_image)
@@ -16415,12 +16246,6 @@ const std::unordered_set<std::string> &CompilerMSL::get_illegal_func_names()
 		"M_2_SQRTPI",
 		"M_SQRT2",
 		"M_SQRT1_2",
-		"int8",
-		"uint8",
-		"int16",
-		"uint16",
-		"float8",
-		"float16",
 	};
 
 	return illegal_func_names;
@@ -16589,11 +16414,8 @@ string CompilerMSL::type_to_glsl(const SPIRType &type, uint32_t id, bool member)
 			// the C-style nesting works right.
 			// FIXME: This is somewhat of a hack.
 			bool old_is_using_builtin_array = is_using_builtin_array;
-			bool pointer_to_buffer_array = is_pointer(type) && has_decoration(type.parent_type, DecorationArrayStride);
 			if (is_physical_pointer(type))
 				is_using_builtin_array = false;
-			else if (pointer_to_buffer_array)
-				is_using_builtin_array = true;
 
 			type_name = join(type_address_space, " ", type_to_glsl(*p_parent_type, id));
 
@@ -16788,7 +16610,7 @@ string CompilerMSL::type_to_array_glsl(const SPIRType &type, uint32_t variable_i
 	default:
 		if (type_is_array_of_pointers(type) || using_builtin_array())
 		{
-			const SPIRVariable *var = variable_id ? maybe_get<SPIRVariable>(variable_id) : nullptr;
+			const SPIRVariable *var = variable_id ? &get<SPIRVariable>(variable_id) : nullptr;
 			if (var && (var->storage == StorageClassUniform || var->storage == StorageClassStorageBuffer) &&
 			    is_array(get_variable_data_type(*var)))
 			{
@@ -16817,7 +16639,7 @@ string CompilerMSL::constant_op_expression(const SPIRConstantOp &cop)
 	}
 }
 
-bool CompilerMSL::variable_decl_is_remapped_storage(const SPIRVariable &variable, StorageClass storage) const
+bool CompilerMSL::variable_decl_is_remapped_storage(const SPIRVariable &variable, spv::StorageClass storage) const
 {
 	if (variable.storage == storage)
 		return true;
@@ -17563,18 +17385,13 @@ void CompilerMSL::emit_subgroup_cluster_op_cast(uint32_t result_type, uint32_t r
 	inherit_expression_dependencies(result_id, op0);
 }
 
-// Note: Metal forbids bitcasting to/from 'bool' using as_type. This function is used widely
-// for generating casts in the backend. To avoid generating illegal MSL when the canonical
-// function constant type (from deduplicated SpecId) is Boolean, fall back to value-cast in
-// that case by returning type_to_glsl(out_type) instead of as_type<...>.
 string CompilerMSL::bitcast_glsl_op(const SPIRType &out_type, const SPIRType &in_type)
 {
 	if (out_type.basetype == in_type.basetype)
 		return "";
 
-	// Avoid bitcasting to/from booleans in MSL; use value cast instead.
-	if (out_type.basetype == SPIRType::Boolean || in_type.basetype == SPIRType::Boolean)
-		return type_to_glsl(out_type);
+	assert(out_type.basetype != SPIRType::Boolean);
+	assert(in_type.basetype != SPIRType::Boolean);
 
 	bool integral_cast = type_is_integral(out_type) && type_is_integral(in_type) && (out_type.vecsize == in_type.vecsize);
 	bool same_size_cast = (out_type.width * out_type.vecsize) == (in_type.width * in_type.vecsize);
@@ -17959,10 +17776,7 @@ string CompilerMSL::builtin_qualifier(BuiltIn builtin)
 		{
 			// thread_execution_width is an alias for threads_per_simdgroup, and it's only available since 1.0,
 			// but not in fragment.
-            if (msl_options.supports_msl_version(3, 0))
-                return "threads_per_simdgroup";
-            else
-                return "thread_execution_width";
+			return "thread_execution_width";
 		}
 
 	case BuiltInNumSubgroups:
@@ -17992,7 +17806,6 @@ string CompilerMSL::builtin_qualifier(BuiltIn builtin)
 			return "thread_index_in_simdgroup";
 		}
 		else if (execution.model == ExecutionModelKernel || execution.model == ExecutionModelGLCompute ||
-                 execution.model == ExecutionModelTaskEXT || execution.model == ExecutionModelMeshEXT ||
 		         execution.model == ExecutionModelTessellationControl ||
 		         (execution.model == ExecutionModelVertex && msl_options.vertex_for_tessellation))
 		{
@@ -18469,7 +18282,7 @@ void CompilerMSL::analyze_workgroup_variables()
 	});
 }
 
-bool CompilerMSL::SampledImageScanner::handle(Op opcode, const uint32_t *args, uint32_t length)
+bool CompilerMSL::SampledImageScanner::handle(spv::Op opcode, const uint32_t *args, uint32_t length)
 {
 	switch (opcode)
 	{
@@ -18481,12 +18294,12 @@ bool CompilerMSL::SampledImageScanner::handle(Op opcode, const uint32_t *args, u
 			return false;
 
 		uint32_t result_type = args[0];
-		auto &type = get<SPIRType>(result_type);
+		auto &type = compiler.get<SPIRType>(result_type);
 		if ((type.basetype != SPIRType::Image && type.basetype != SPIRType::SampledImage) || type.image.sampled != 1)
 			return true;
 
 		uint32_t id = args[1];
-		set<SPIRExpression>(id, "", result_type, true);
+		compiler.set<SPIRExpression>(id, "", result_type, true);
 		break;
 	}
 	case OpImageSampleExplicitLod:
@@ -18500,9 +18313,9 @@ bool CompilerMSL::SampledImageScanner::handle(Op opcode, const uint32_t *args, u
 	case OpImageFetch:
 	case OpImageGather:
 	case OpImageDrefGather:
-		self.has_sampled_images =
-		    self.has_sampled_images || self.is_sampled_image_type(self.expression_type(args[2]));
-		self.needs_swizzle_buffer_def = self.needs_swizzle_buffer_def || self.has_sampled_images;
+		compiler.has_sampled_images =
+		    compiler.has_sampled_images || compiler.is_sampled_image_type(compiler.expression_type(args[2]));
+		compiler.needs_swizzle_buffer_def = compiler.needs_swizzle_buffer_def || compiler.has_sampled_images;
 		break;
 	default:
 		break;
@@ -18532,7 +18345,7 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 	SPVFuncImpl spv_func = get_spv_func_impl(opcode, args, length);
 	if (spv_func != SPVFuncImplNone)
 	{
-		self.spv_function_implementations.insert(spv_func);
+		compiler.spv_function_implementations.insert(spv_func);
 		suppress_missing_prototypes = true;
 	}
 
@@ -18550,9 +18363,9 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 	// Emulate texture2D atomic operations
 	case OpImageTexelPointer:
 	{
-		if (!self.msl_options.supports_msl_version(3, 1))
+		if (!compiler.msl_options.supports_msl_version(3, 1))
 		{
-			auto *var = self.maybe_get_backing_variable(args[2]);
+			auto *var = compiler.maybe_get_backing_variable(args[2]);
 			image_pointers_emulated[args[1]] = var ? var->self : ID(0);
 		}
 		break;
@@ -18588,7 +18401,7 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		if (it != image_pointers_emulated.end())
 		{
 			uses_image_write = true;
-			self.atomic_image_vars_emulated.insert(it->second);
+			compiler.atomic_image_vars_emulated.insert(it->second);
 		}
 		else
 			check_resource_write(args[2]);
@@ -18601,7 +18414,7 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		auto it = image_pointers_emulated.find(args[0]);
 		if (it != image_pointers_emulated.end())
 		{
-			self.atomic_image_vars_emulated.insert(it->second);
+			compiler.atomic_image_vars_emulated.insert(it->second);
 			uses_image_write = true;
 		}
 		else
@@ -18615,7 +18428,7 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		auto it = image_pointers_emulated.find(args[2]);
 		if (it != image_pointers_emulated.end())
 		{
-			self.atomic_image_vars_emulated.insert(it->second);
+			compiler.atomic_image_vars_emulated.insert(it->second);
 		}
 		break;
 	}
@@ -18640,7 +18453,7 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		// Add the correct invocation ID for calculating clustered rotate case.
 		if (length > 5)
 		{
-			if (static_cast<Scope>(self.evaluate_constant_u32(args[2])) == ScopeSubgroup)
+			if (static_cast<Scope>(compiler.evaluate_constant_u32(args[2])) == ScopeSubgroup)
 				needs_subgroup_invocation_id = true;
 			else
 				needs_local_invocation_index = true;
@@ -18664,18 +18477,18 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 	case OpGroupNonUniformLogicalOr:
 	case OpGroupNonUniformLogicalXor:
 		if ((compiler.get_execution_model() != ExecutionModelFragment ||
-		     self.msl_options.supports_msl_version(2, 2)) &&
+		     compiler.msl_options.supports_msl_version(2, 2)) &&
 		    args[3] == GroupOperationClusteredReduce)
 			needs_subgroup_invocation_id = true;
 		break;
 
 	case OpArrayLength:
 	{
-		auto *var = self.maybe_get_backing_variable(args[2]);
+		auto *var = compiler.maybe_get_backing_variable(args[2]);
 		if (var != nullptr)
 		{
-			if (!self.is_var_runtime_size_array(*var))
-				self.buffers_requiring_array_length.insert(var->self);
+			if (!compiler.is_var_runtime_size_array(*var))
+				compiler.buffers_requiring_array_length.insert(var->self);
 		}
 		break;
 	}
@@ -18689,16 +18502,16 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		uint32_t id = args[1];
 		uint32_t ptr = args[2];
 
-		set<SPIRExpression>(id, "", result_type, true);
-		self.register_read(id, ptr, true);
-		self.ir.ids[id].set_allow_type_rewrite();
+		compiler.set<SPIRExpression>(id, "", result_type, true);
+		compiler.register_read(id, ptr, true);
+		compiler.ir.ids[id].set_allow_type_rewrite();
 		break;
 	}
 
 	case OpExtInst:
 	{
 		uint32_t extension_set = args[2];
-		SPIRExtension::Extension ext = get<SPIRExtension>(extension_set).ext;
+		SPIRExtension::Extension ext = compiler.get<SPIRExtension>(extension_set).ext;
 		if (ext == SPIRExtension::GLSL)
 		{
 			auto op_450 = static_cast<GLSLstd450>(args[3]);
@@ -18708,15 +18521,15 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 			case GLSLstd450InterpolateAtSample:
 			case GLSLstd450InterpolateAtOffset:
 			{
-				if (!self.msl_options.supports_msl_version(2, 3))
+				if (!compiler.msl_options.supports_msl_version(2, 3))
 					SPIRV_CROSS_THROW("Pull-model interpolation requires MSL 2.3.");
 				// Fragment varyings used with pull-model interpolation need special handling,
 				// due to the way pull-model interpolation works in Metal.
-				auto *var = self.maybe_get_backing_variable(args[4]);
+				auto *var = compiler.maybe_get_backing_variable(args[4]);
 				if (var)
 				{
-					self.pull_model_inputs.insert(var->self);
-					auto &var_type = self.get_variable_element_type(*var);
+					compiler.pull_model_inputs.insert(var->self);
+					auto &var_type = compiler.get_variable_element_type(*var);
 					// In addition, if this variable has a 'Sample' decoration, we need the sample ID
 					// in order to do default interpolation.
 					if (compiler.has_decoration(var->self, DecorationSample))
@@ -18745,14 +18558,14 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		else if (ext == SPIRExtension::NonSemanticDebugPrintf)
 		{
 			// Operation 1 is printf.
-			if (args[3] == 1 && !self.msl_options.supports_msl_version(3, 2))
+			if (args[3] == 1 && !compiler.msl_options.supports_msl_version(3, 2))
 				SPIRV_CROSS_THROW("Debug printf requires MSL 3.2.");
 		}
 		break;
 	}
 
 	case OpIsHelperInvocationEXT:
-		if (self.needs_manual_helper_invocation_updates())
+		if (compiler.needs_manual_helper_invocation_updates())
 			needs_helper_invocation = true;
 		break;
 
@@ -18760,27 +18573,20 @@ bool CompilerMSL::OpCodePreprocessor::handle(Op opcode, const uint32_t *args, ui
 		break;
 	}
 
+	// If it has one, keep track of the instruction's result type, mapped by ID
+	uint32_t result_type, result_id;
+	if (compiler.instruction_to_result_type(result_type, result_id, opcode, args, length))
+		result_types[result_id] = result_type;
+
 	return true;
 }
 
 // If the variable is a Uniform or StorageBuffer, mark that a resource has been written to.
 void CompilerMSL::OpCodePreprocessor::check_resource_write(uint32_t var_id)
 {
-	auto *type = get_expression_result_type(var_id);
-	auto sc = StorageClassMax;
-
-	if (type)
-	{
-		sc = type->storage;
-	}
-	else
-	{
-		auto *var = self.maybe_get_backing_variable(var_id);
-		if (var)
-			sc = var->storage;
-	}
-
-	if (sc == StorageClassUniform || sc == StorageClassStorageBuffer || sc == StorageClassPhysicalStorageBuffer)
+	auto *p_var = compiler.maybe_get_backing_variable(var_id);
+	StorageClass sc = p_var ? p_var->storage : StorageClassMax;
+	if (sc == StorageClassUniform || sc == StorageClassStorageBuffer)
 		uses_buffer_write = true;
 }
 
@@ -18797,8 +18603,11 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 
 	case OpFAdd:
 	case OpFSub:
-		if (self.msl_options.invariant_float_math || self.has_legacy_nocontract(args[0], args[1]))
+		if (compiler.msl_options.invariant_float_math ||
+		    compiler.has_decoration(args[1], DecorationNoContraction))
+		{
 			return opcode == OpFAdd ? SPVFuncImplFAdd : SPVFuncImplFSub;
+		}
 		break;
 
 	case OpFMul:
@@ -18806,8 +18615,11 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 	case OpMatrixTimesVector:
 	case OpVectorTimesMatrix:
 	case OpMatrixTimesMatrix:
-		if (self.msl_options.invariant_float_math || self.has_legacy_nocontract(args[0], args[1]))
+		if (compiler.msl_options.invariant_float_math ||
+		    compiler.has_decoration(args[1], DecorationNoContraction))
+		{
 			return SPVFuncImplFMul;
+		}
 		break;
 
 	case OpQuantizeToF16:
@@ -18841,8 +18653,8 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 		auto it = image_pointers_emulated.find(args[opcode == OpAtomicStore ? 0 : 2]);
 		if (it != image_pointers_emulated.end())
 		{
-			uint32_t tid = get<SPIRVariable>(it->second).basetype;
-			if (tid && get<SPIRType>(tid).image.dim == Dim2D)
+			uint32_t tid = compiler.get<SPIRVariable>(it->second).basetype;
+			if (tid && compiler.get<SPIRType>(tid).image.dim == Dim2D)
 				return SPVFuncImplImage2DAtomicCoords;
 		}
 		break;
@@ -18854,7 +18666,7 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 	{
 		// Retrieve the image type, and if it's a Buffer, emit a texel coordinate function
 		uint32_t tid = result_types[args[opcode == OpImageWrite ? 0 : 2]];
-		if (tid && get<SPIRType>(tid).image.dim == DimBuffer && !self.msl_options.texture_buffer_native)
+		if (tid && compiler.get<SPIRType>(tid).image.dim == DimBuffer && !compiler.msl_options.texture_buffer_native)
 			return SPVFuncImplTexelBufferCoords;
 		break;
 	}
@@ -18862,7 +18674,7 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 	case OpExtInst:
 	{
 		uint32_t extension_set = args[2];
-		if (get<SPIRExtension>(extension_set).ext == SPIRExtension::GLSL)
+		if (compiler.get<SPIRExtension>(extension_set).ext == SPIRExtension::GLSL)
 		{
 			auto op_450 = static_cast<GLSLstd450>(args[3]);
 			switch (op_450)
@@ -18881,28 +18693,28 @@ CompilerMSL::SPVFuncImpl CompilerMSL::OpCodePreprocessor::get_spv_func_impl(Op o
 				return SPVFuncImplSSign;
 			case GLSLstd450Reflect:
 			{
-				auto &type = get<SPIRType>(args[0]);
+				auto &type = compiler.get<SPIRType>(args[0]);
 				if (type.vecsize == 1)
 					return SPVFuncImplReflectScalar;
 				break;
 			}
 			case GLSLstd450Refract:
 			{
-				auto &type = get<SPIRType>(args[0]);
+				auto &type = compiler.get<SPIRType>(args[0]);
 				if (type.vecsize == 1)
 					return SPVFuncImplRefractScalar;
 				break;
 			}
 			case GLSLstd450FaceForward:
 			{
-				auto &type = get<SPIRType>(args[0]);
+				auto &type = compiler.get<SPIRType>(args[0]);
 				if (type.vecsize == 1)
 					return SPVFuncImplFaceForwardScalar;
 				break;
 			}
 			case GLSLstd450MatrixInverse:
 			{
-				auto &mat_type = get<SPIRType>(args[0]);
+				auto &mat_type = compiler.get<SPIRType>(args[0]);
 				switch (mat_type.columns)
 				{
 				case 2:
@@ -19696,7 +19508,7 @@ void CompilerMSL::analyze_argument_buffers()
 
 		auto &ptr_type = set<SPIRType>(ptr_type_id, OpTypePointer);
 		ptr_type = buffer_type;
-		ptr_type.op = OpTypePointer;
+		ptr_type.op = spv::OpTypePointer;
 		ptr_type.pointer = true;
 		ptr_type.pointer_depth++;
 		ptr_type.parent_type = type_id;
@@ -19798,8 +19610,6 @@ void CompilerMSL::analyze_argument_buffers()
 				next_arg_buff_index += resource.plane_count * count;
 			}
 
-			// Here we're locking down the member name early before compilation loops, so ensure that
-			// the resource name is not reused, even through a reset().
 			string mbr_name = ensure_valid_name(resource.name, "m");
 			if (resource.plane > 0)
 				mbr_name += join(plane_name_suffix, resource.plane);
@@ -19857,9 +19667,7 @@ void CompilerMSL::analyze_argument_buffers()
 				{
 					// Don't set the qualified name here; we'll define a variable holding the corrected buffer address later.
 					buffer_type.member_types.push_back(var.basetype);
-					auto &dynamic_buffer = buffers_requiring_dynamic_offset[pair];
-					dynamic_buffer.var_id = var.self;
-					dynamic_buffer.mbr_name = mbr_name;
+					buffers_requiring_dynamic_offset[pair].second = var.self;
 				}
 				else if (inline_uniform_blocks.count(pair))
 				{
@@ -19931,7 +19739,7 @@ void CompilerMSL::analyze_argument_buffers()
 		{
 			recursive_inputs.insert(type_id);
 			auto &entry_func = this->get<SPIRFunction>(ir.default_entry_point);
-			auto addr_space = get_variable_address_space(buffer_var);
+			auto addr_space = get_argument_address_space(buffer_var);
 			entry_func.fixup_hooks_in.push_back([this, addr_space, buffer_name, buffer_type_name]() {
 				statement(addr_space, " auto& ", buffer_name, " = *(", addr_space, " ", buffer_type_name, "*)", buffer_name, "_vp;");
 			});
@@ -19974,7 +19782,7 @@ void CompilerMSL::add_argument_buffer_padding_buffer_type(SPIRType &struct_type,
 		uint32_t ptr_type_id = buff_type_id + 1;
 		auto &ptr_type = set<SPIRType>(ptr_type_id, OpTypePointer);
 		ptr_type = buff_type;
-		ptr_type.op = OpTypePointer;
+		ptr_type.op = spv::OpTypePointer;
 		ptr_type.pointer = true;
 		ptr_type.pointer_depth++;
 		ptr_type.parent_type = buff_type_id;
@@ -20092,7 +19900,7 @@ bool CompilerMSL::specialization_constant_is_macro(uint32_t const_id) const
 }
 
 // Start with all fast math flags enabled, and selectively disable based execution modes and float controls
-uint32_t CompilerMSL::get_fp_fast_math_flags(bool incl_ops) const
+uint32_t CompilerMSL::get_fp_fast_math_flags(bool incl_ops)
 {
 	uint32_t fp_flags = ~0;
 	auto &ep = get_entry_point();
diff --git a/engine/thirdparty/spirv-cross/spirv_msl.hpp b/engine/thirdparty/spirv-cross/spirv_msl.hpp
index f63f5a23..99cbb5e1 100644
--- a/engine/thirdparty/spirv-cross/spirv_msl.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_msl.hpp
@@ -33,7 +33,6 @@
 
 namespace SPIRV_CROSS_NAMESPACE
 {
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
 
 // Indicates the format of a shader interface variable. Currently limited to specifying
 // if the input is an 8-bit unsigned integer, 16-bit unsigned integer, or
@@ -79,7 +78,7 @@ struct MSLShaderInterfaceVariable
 	uint32_t location = 0;
 	uint32_t component = 0;
 	MSLShaderVariableFormat format = MSL_SHADER_VARIABLE_FORMAT_OTHER;
-	BuiltIn builtin = BuiltInMax;
+	spv::BuiltIn builtin = spv::BuiltInMax;
 	uint32_t vecsize = 0;
 	MSLShaderVariableRate rate = MSL_SHADER_VARIABLE_RATE_PER_VERTEX;
 };
@@ -105,7 +104,7 @@ struct MSLShaderInterfaceVariable
 // become a [[buffer(N)]], [[texture(N)]] or [[sampler(N)]] depending on the resource types used.
 struct MSLResourceBinding
 {
-	ExecutionModel stage = ExecutionModelMax;
+	spv::ExecutionModel stage = spv::ExecutionModelMax;
 	SPIRType::BaseType basetype = SPIRType::Unknown;
 	uint32_t desc_set = 0;
 	uint32_t binding = 0;
@@ -592,9 +591,9 @@ public:
 	// rasterization if vertex shader requires rasterization to be disabled.
 	bool get_is_rasterization_disabled() const
 	{
-		return is_rasterization_disabled && (get_entry_point().model == ExecutionModelVertex ||
-		                                     get_entry_point().model == ExecutionModelTessellationControl ||
-		                                     get_entry_point().model == ExecutionModelTessellationEvaluation);
+		return is_rasterization_disabled && (get_entry_point().model == spv::ExecutionModelVertex ||
+		                                     get_entry_point().model == spv::ExecutionModelTessellationControl ||
+		                                     get_entry_point().model == spv::ExecutionModelTessellationEvaluation);
 	}
 
 	// Provide feedback to calling API to allow it to pass an auxiliary
@@ -707,20 +706,20 @@ public:
 	// This is typical for tessellation builtin inputs such as tess levels, gl_Position, etc.
 	// This returns k_unknown_location if the location was explicitly assigned with
 	// add_msl_shader_input or the builtin is not used, otherwise returns N in [[attribute(N)]].
-	uint32_t get_automatic_builtin_input_location(BuiltIn builtin) const;
+	uint32_t get_automatic_builtin_input_location(spv::BuiltIn builtin) const;
 
 	// If not using add_msl_shader_output, it's possible
 	// that certain builtin attributes need to be automatically assigned locations.
 	// This is typical for tessellation builtin outputs such as tess levels, gl_Position, etc.
 	// This returns k_unknown_location if the location were explicitly assigned with
 	// add_msl_shader_output or the builtin were not used, otherwise returns N in [[attribute(N)]].
-	uint32_t get_automatic_builtin_output_location(BuiltIn builtin) const;
+	uint32_t get_automatic_builtin_output_location(spv::BuiltIn builtin) const;
 
 	// NOTE: Only resources which are remapped using add_msl_resource_binding will be reported here.
 	// Constexpr samplers are always assumed to be emitted.
 	// No specific MSLResourceBinding remapping is required for constexpr samplers as long as they are remapped
 	// by remap_constexpr_sampler(_by_binding).
-	bool is_msl_resource_binding_used(ExecutionModel model, uint32_t set, uint32_t binding) const;
+	bool is_msl_resource_binding_used(spv::ExecutionModel model, uint32_t set, uint32_t binding) const;
 
 	// This must only be called after a successful call to CompilerMSL::compile().
 	// For a variable resource ID obtained through reflection API, report the automatically assigned resource index.
@@ -778,7 +777,7 @@ public:
 	// If incl_ops is enabled, the FPFastMathMode of any SPIR-V operations are also included in the bitwise-AND
 	// to determine the minimal fast-math that applies to all default execution modes and all operations.
 	// The returned value is also affected by execution modes SignedZeroInfNanPreserve and ContractionOff.
-	uint32_t get_fp_fast_math_flags(bool incl_ops) const;
+	uint32_t get_fp_fast_math_flags(bool incl_ops);
 
 protected:
 	// An enum of SPIR-V functions that are implemented in additional
@@ -932,14 +931,14 @@ protected:
 	std::string type_to_array_glsl(const SPIRType &type, uint32_t variable_id) override;
 	std::string constant_op_expression(const SPIRConstantOp &cop) override;
 
-	bool variable_decl_is_remapped_storage(const SPIRVariable &variable, StorageClass storage) const override;
+	bool variable_decl_is_remapped_storage(const SPIRVariable &variable, spv::StorageClass storage) const override;
 
 	// GCC workaround of lambdas calling protected functions (for older GCC versions)
 	std::string variable_decl(const SPIRType &type, const std::string &name, uint32_t id = 0) override;
 
 	std::string image_type_glsl(const SPIRType &type, uint32_t id, bool member) override;
 	std::string sampler_type(const SPIRType &type, uint32_t id, bool member);
-	std::string builtin_to_glsl(BuiltIn builtin, StorageClass storage) override;
+	std::string builtin_to_glsl(spv::BuiltIn builtin, spv::StorageClass storage) override;
 	std::string to_func_call_arg(const SPIRFunction::Parameter &arg, uint32_t id) override;
 	std::string to_name(uint32_t id, bool allow_alias = true) const override;
 	std::string to_function_name(const TextureFunctionNameArguments &args) override;
@@ -951,7 +950,7 @@ protected:
 	                                   bool is_packed, bool row_major) override;
 
 	// Returns true for BuiltInSampleMask because gl_SampleMask[] is an array in SPIR-V, but [[sample_mask]] is a scalar in Metal.
-	bool builtin_translates_to_nonarray(BuiltIn builtin) const override;
+	bool builtin_translates_to_nonarray(spv::BuiltIn builtin) const override;
 
 	std::string bitcast_glsl_op(const SPIRType &result_type, const SPIRType &argument_type) override;
 	bool emit_complex_bitcast(uint32_t result_id, uint32_t id, uint32_t op0) override;
@@ -991,8 +990,8 @@ protected:
 	void extract_global_variables_from_function(uint32_t func_id, std::set<uint32_t> &added_arg_ids,
 	                                            std::unordered_set<uint32_t> &global_var_ids,
 	                                            std::unordered_set<uint32_t> &processed_func_ids);
-	uint32_t add_interface_block(StorageClass storage, bool patch = false);
-	uint32_t add_interface_block_pointer(uint32_t ib_var_id, StorageClass storage);
+	uint32_t add_interface_block(spv::StorageClass storage, bool patch = false);
+	uint32_t add_interface_block_pointer(uint32_t ib_var_id, spv::StorageClass storage);
 	uint32_t add_meshlet_block(bool per_primitive);
 
 	struct InterfaceBlockMeta
@@ -1013,23 +1012,23 @@ protected:
 
 	std::string to_tesc_invocation_id();
 	void emit_local_masked_variable(const SPIRVariable &masked_var, bool strip_array);
-	void add_variable_to_interface_block(StorageClass storage, const std::string &ib_var_ref, SPIRType &ib_type,
+	void add_variable_to_interface_block(spv::StorageClass storage, const std::string &ib_var_ref, SPIRType &ib_type,
 	                                     SPIRVariable &var, InterfaceBlockMeta &meta);
-	void add_composite_variable_to_interface_block(StorageClass storage, const std::string &ib_var_ref,
+	void add_composite_variable_to_interface_block(spv::StorageClass storage, const std::string &ib_var_ref,
 	                                               SPIRType &ib_type, SPIRVariable &var, InterfaceBlockMeta &meta);
-	void add_plain_variable_to_interface_block(StorageClass storage, const std::string &ib_var_ref,
+	void add_plain_variable_to_interface_block(spv::StorageClass storage, const std::string &ib_var_ref,
 	                                           SPIRType &ib_type, SPIRVariable &var, InterfaceBlockMeta &meta);
-	bool add_component_variable_to_interface_block(StorageClass storage, const std::string &ib_var_ref,
+	bool add_component_variable_to_interface_block(spv::StorageClass storage, const std::string &ib_var_ref,
 	                                               SPIRVariable &var, const SPIRType &type,
 	                                               InterfaceBlockMeta &meta);
-	void add_plain_member_variable_to_interface_block(StorageClass storage,
+	void add_plain_member_variable_to_interface_block(spv::StorageClass storage,
 	                                                  const std::string &ib_var_ref, SPIRType &ib_type,
 	                                                  SPIRVariable &var, SPIRType &var_type,
 	                                                  uint32_t mbr_idx, InterfaceBlockMeta &meta,
 	                                                  const std::string &mbr_name_qual,
 	                                                  const std::string &var_chain_qual,
 	                                                  uint32_t &location, uint32_t &var_mbr_idx);
-	void add_composite_member_variable_to_interface_block(StorageClass storage,
+	void add_composite_member_variable_to_interface_block(spv::StorageClass storage,
 	                                                      const std::string &ib_var_ref, SPIRType &ib_type,
 	                                                      SPIRVariable &var, SPIRType &var_type,
 	                                                      uint32_t mbr_idx, InterfaceBlockMeta &meta,
@@ -1041,11 +1040,11 @@ protected:
 	void add_tess_level_input(const std::string &base_ref, const std::string &mbr_name, SPIRVariable &var);
 
 	void ensure_struct_members_valid_vecsizes(SPIRType &struct_type, uint32_t &location);
-	void fix_up_interface_member_indices(StorageClass storage, uint32_t ib_type_id);
+	void fix_up_interface_member_indices(spv::StorageClass storage, uint32_t ib_type_id);
 
 	void mark_location_as_used_by_shader(uint32_t location, const SPIRType &type,
-	                                     StorageClass storage, bool fallback = false);
-	uint32_t ensure_correct_builtin_type(uint32_t type_id, BuiltIn builtin);
+	                                     spv::StorageClass storage, bool fallback = false);
+	uint32_t ensure_correct_builtin_type(uint32_t type_id, spv::BuiltIn builtin);
 	uint32_t ensure_correct_input_type(uint32_t type_id, uint32_t location, uint32_t component,
 	                                   uint32_t num_components, bool strip_array);
 
@@ -1060,9 +1059,6 @@ protected:
 
 	void fix_up_shader_inputs_outputs();
 
-	bool entry_point_is_vertex() const;
-	bool entry_point_returns_stage_output() const;
-	bool entry_point_requires_const_device_buffers() const;
 	std::string func_type_decl(SPIRType &type);
 	std::string entry_point_args_classic(bool append_comma);
 	std::string entry_point_args_argument_buffer(bool append_comma);
@@ -1076,23 +1072,23 @@ protected:
 	std::string to_buffer_size_expression(uint32_t id);
 	bool is_sample_rate() const;
 	bool is_intersection_query() const;
-	bool is_direct_input_builtin(BuiltIn builtin);
-	std::string builtin_qualifier(BuiltIn builtin);
-	std::string builtin_type_decl(BuiltIn builtin, uint32_t id = 0);
-	std::string built_in_func_arg(BuiltIn builtin, bool prefix_comma);
+	bool is_direct_input_builtin(spv::BuiltIn builtin);
+	std::string builtin_qualifier(spv::BuiltIn builtin);
+	std::string builtin_type_decl(spv::BuiltIn builtin, uint32_t id = 0);
+	std::string built_in_func_arg(spv::BuiltIn builtin, bool prefix_comma);
 	std::string member_attribute_qualifier(const SPIRType &type, uint32_t index);
 	std::string member_location_attribute_qualifier(const SPIRType &type, uint32_t index);
 	std::string argument_decl(const SPIRFunction::Parameter &arg);
-	const char *descriptor_address_space(uint32_t id, StorageClass storage, const char *plain_address_space) const;
+	const char *descriptor_address_space(uint32_t id, spv::StorageClass storage, const char *plain_address_space) const;
 	std::string round_fp_tex_coords(std::string tex_coords, bool coord_is_fp);
 	uint32_t get_metal_resource_index(SPIRVariable &var, SPIRType::BaseType basetype, uint32_t plane = 0);
 	uint32_t get_member_location(uint32_t type_id, uint32_t index, uint32_t *comp = nullptr) const;
-	uint32_t get_or_allocate_builtin_input_member_location(BuiltIn builtin,
+	uint32_t get_or_allocate_builtin_input_member_location(spv::BuiltIn builtin,
 	                                                       uint32_t type_id, uint32_t index, uint32_t *comp = nullptr);
-	uint32_t get_or_allocate_builtin_output_member_location(BuiltIn builtin,
+	uint32_t get_or_allocate_builtin_output_member_location(spv::BuiltIn builtin,
 	                                                        uint32_t type_id, uint32_t index, uint32_t *comp = nullptr);
 
-	uint32_t get_physical_tess_level_array_size(BuiltIn builtin) const;
+	uint32_t get_physical_tess_level_array_size(spv::BuiltIn builtin) const;
 
 	uint32_t get_physical_type_stride(const SPIRType &type) const override;
 
@@ -1126,9 +1122,7 @@ protected:
 	void mark_struct_members_packed(const SPIRType &type);
 	void ensure_member_packing_rules_msl(SPIRType &ib_type, uint32_t index);
 	bool validate_member_packing_rules_msl(const SPIRType &type, uint32_t index) const;
-	std::string get_variable_address_space(const SPIRVariable &argument);
-	// Special case of get_variable_address_space which is only used for leaf functions.
-	std::string get_leaf_argument_address_space(const SPIRVariable &argument);
+	std::string get_argument_address_space(const SPIRVariable &argument);
 	std::string get_type_address_space(const SPIRType &type, uint32_t id, bool argument = false);
 	bool decoration_flags_signal_volatile(const Bitset &flags) const;
 	bool decoration_flags_signal_coherent(const Bitset &flags) const;
@@ -1140,7 +1134,7 @@ protected:
 	std::string get_tess_factor_struct_name();
 	SPIRType &get_uint_type();
 	uint32_t get_uint_type_id();
-	void emit_atomic_func_op(uint32_t result_type, uint32_t result_id, const char *op, Op opcode,
+	void emit_atomic_func_op(uint32_t result_type, uint32_t result_id, const char *op, spv::Op opcode,
 	                         uint32_t mem_order_1, uint32_t mem_order_2, bool has_mem_order_2, uint32_t op0, uint32_t op1 = 0,
 	                         bool op1_is_pointer = false, bool op1_is_literal = false, uint32_t op2 = 0);
 	const char *get_memory_order(uint32_t spv_mem_sem);
@@ -1148,7 +1142,7 @@ protected:
 	void add_typedef_line(const std::string &line);
 	void emit_barrier(uint32_t id_exe_scope, uint32_t id_mem_scope, uint32_t id_mem_sem);
 	bool emit_array_copy(const char *expr, uint32_t lhs_id, uint32_t rhs_id,
-	                     StorageClass lhs_storage, StorageClass rhs_storage) override;
+	                     spv::StorageClass lhs_storage, spv::StorageClass rhs_storage) override;
 	void build_implicit_builtins();
 	uint32_t build_constant_uint_array_pointer();
 	void emit_entry_point_declarations() override;
@@ -1198,7 +1192,7 @@ protected:
 	void analyze_workgroup_variables();
 
 	bool access_chain_needs_stage_io_builtin_translation(uint32_t base) override;
-	bool prepare_access_chain_for_scalar_access(std::string &expr, const SPIRType &type, StorageClass storage,
+	bool prepare_access_chain_for_scalar_access(std::string &expr, const SPIRType &type, spv::StorageClass storage,
 	                                            bool &is_packed) override;
 	void fix_up_interpolant_access_chain(const uint32_t *ops, uint32_t length);
 	bool check_physical_type_cast(std::string &expr, const SPIRType *type, uint32_t physical_type) override;
@@ -1207,9 +1201,9 @@ protected:
 	bool emit_tessellation_io_load(uint32_t result_type, uint32_t id, uint32_t ptr);
 	bool is_out_of_bounds_tessellation_level(uint32_t id_lhs);
 
-	void ensure_builtin(StorageClass storage, BuiltIn builtin);
+	void ensure_builtin(spv::StorageClass storage, spv::BuiltIn builtin);
 
-	void mark_implicit_builtin(StorageClass storage, BuiltIn builtin, uint32_t id);
+	void mark_implicit_builtin(spv::StorageClass storage, spv::BuiltIn builtin, uint32_t id);
 
 	std::string convert_to_f32(const std::string &expr, uint32_t components);
 
@@ -1270,7 +1264,6 @@ protected:
 	bool using_builtin_array() const;
 
 	bool is_rasterization_disabled = false;
-	bool has_descriptor_side_effects_buffer = false;
 	bool capture_output_to_buffer = false;
 	bool needs_swizzle_buffer_def = false;
 	bool used_swizzle_buffer = false;
@@ -1281,7 +1274,6 @@ protected:
 	bool needs_sample_id = false;
 	bool needs_helper_invocation = false;
 	bool needs_workgroup_zero_init = false;
-	bool needs_point_size_output = false;
 	bool writes_to_depth = false;
 	bool writes_to_point_size = false;
 	std::string qual_pos_var_name;
@@ -1300,7 +1292,7 @@ protected:
 	std::string patch_output_buffer_var_name = "spvPatchOut";
 	std::string tess_factor_buffer_var_name = "spvTessLevel";
 	std::string index_buffer_var_name = "spvIndices";
-	Op previous_instruction_opcode = OpNop;
+	spv::Op previous_instruction_opcode = spv::OpNop;
 
 	// Must be ordered since declaration is in a specific order.
 	std::map<uint32_t, MSLConstexprSampler> constexpr_samplers_by_id;
@@ -1308,6 +1300,7 @@ protected:
 	const MSLConstexprSampler *find_constexpr_sampler(uint32_t id) const;
 
 	std::unordered_set<uint32_t> buffers_requiring_array_length;
+	SmallVector<std::pair<uint32_t, uint32_t>> buffer_aliases_argument;
 	SmallVector<uint32_t> buffer_aliases_discrete;
 	std::unordered_set<uint32_t> atomic_image_vars_emulated; // Emulate texture2D atomic operations
 	std::unordered_set<uint32_t> pull_model_inputs;
@@ -1316,13 +1309,7 @@ protected:
 	SmallVector<SPIRVariable *> entry_point_bindings;
 
 	// Must be ordered since array is in a specific order.
-	struct DynamicBuffer
-	{
-		uint32_t base_index;
-		uint32_t var_id;
-		std::string mbr_name;
-	};
-	std::map<SetBindingPair, DynamicBuffer> buffers_requiring_dynamic_offset;
+	std::map<SetBindingPair, std::pair<uint32_t, uint32_t>> buffers_requiring_dynamic_offset;
 
 	SmallVector<uint32_t> disabled_frag_outputs;
 
@@ -1359,7 +1346,7 @@ protected:
 	bool type_is_msl_framebuffer_fetch(const SPIRType &type) const;
 	bool is_supported_argument_buffer_type(const SPIRType &type) const;
 
-	bool variable_storage_requires_stage_io(StorageClass storage) const;
+	bool variable_storage_requires_stage_io(spv::StorageClass storage) const;
 
 	bool needs_manual_helper_invocation_updates() const
 	{
@@ -1367,7 +1354,7 @@ protected:
 	}
 	bool needs_frag_discard_checks() const
 	{
-		return get_execution_model() == ExecutionModelFragment && msl_options.supports_msl_version(2, 3) &&
+		return get_execution_model() == spv::ExecutionModelFragment && msl_options.supports_msl_version(2, 3) &&
 		       msl_options.check_discarded_frag_stores && frag_shader_needs_discard_checks;
 	}
 
@@ -1377,17 +1364,17 @@ protected:
 	// OpcodeHandler that handles several MSL preprocessing operations.
 	struct OpCodePreprocessor : OpcodeHandler
 	{
-		explicit OpCodePreprocessor(CompilerMSL &compiler_)
-		    : OpcodeHandler(compiler_), self(compiler_)
+		OpCodePreprocessor(CompilerMSL &compiler_)
+		    : compiler(compiler_)
 		{
-			enable_result_types = true;
 		}
 
-		bool handle(Op opcode, const uint32_t *args, uint32_t length) override;
-		CompilerMSL::SPVFuncImpl get_spv_func_impl(Op opcode, const uint32_t *args, uint32_t length);
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t length) override;
+		CompilerMSL::SPVFuncImpl get_spv_func_impl(spv::Op opcode, const uint32_t *args, uint32_t length);
 		void check_resource_write(uint32_t var_id);
 
-		CompilerMSL &self;
+		CompilerMSL &compiler;
+		std::unordered_map<uint32_t, uint32_t> result_types;
 		std::unordered_map<uint32_t, uint32_t> image_pointers_emulated; // Emulate texture2D atomic operations
 		bool suppress_missing_prototypes = false;
 		bool uses_atomics = false;
@@ -1404,13 +1391,14 @@ protected:
 	// OpcodeHandler that scans for uses of sampled images
 	struct SampledImageScanner : OpcodeHandler
 	{
-		explicit SampledImageScanner(CompilerMSL &compiler_)
-		    : OpcodeHandler(compiler_), self(compiler_)
+		SampledImageScanner(CompilerMSL &compiler_)
+		    : compiler(compiler_)
 		{
 		}
 
-		CompilerMSL &self;
-		bool handle(Op opcode, const uint32_t *args, uint32_t) override;
+		bool handle(spv::Op opcode, const uint32_t *args, uint32_t) override;
+
+		CompilerMSL &compiler;
 	};
 
 	// Sorts the members of a SPIRType and associated Meta info based on a settable sorting
diff --git a/engine/thirdparty/spirv-cross/spirv_parser.cpp b/engine/thirdparty/spirv-cross/spirv_parser.cpp
index 63431294..da1b8a89 100644
--- a/engine/thirdparty/spirv-cross/spirv_parser.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_parser.cpp
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 using namespace std;
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 
 namespace SPIRV_CROSS_NAMESPACE
 {
@@ -213,8 +213,8 @@ void Parser::parse(const Instruction &instruction)
 
 	case OpSource:
 	{
-		ir.source.lang = static_cast<SourceLanguage>(ops[0]);
-		switch (ir.source.lang)
+		auto lang = static_cast<SourceLanguage>(ops[0]);
+		switch (lang)
 		{
 		case SourceLanguageESSL:
 			ir.source.es = true;
@@ -318,19 +318,6 @@ void Parser::parse(const Instruction &instruction)
 					ir.load_type_width.insert({ ops[1], type->width });
 			}
 		}
-		else if (op == OpExtInst)
-		{
-			// Don't want to deal with ForwardRefs here.
-
-			auto &ext = get<SPIRExtension>(ops[2]);
-			if (ext.ext == SPIRExtension::NonSemanticShaderDebugInfo)
-			{
-				// Parse global ShaderDebugInfo we care about.
-				// Just forward the string information.
-				if (ops[3] == SPIRExtension::DebugSource)
-					set<SPIRString>(ops[1], get<SPIRString>(ops[4]).str);
-			}
-		}
 		break;
 	}
 
@@ -382,30 +369,6 @@ void Parser::parse(const Instruction &instruction)
 			execution.output_primitives = ops[2];
 			break;
 
-		case ExecutionModeSignedZeroInfNanPreserve:
-			switch (ops[2])
-			{
-			case 8:
-				execution.signed_zero_inf_nan_preserve_8 = true;
-				break;
-
-			case 16:
-				execution.signed_zero_inf_nan_preserve_16 = true;
-				break;
-
-			case 32:
-				execution.signed_zero_inf_nan_preserve_32 = true;
-				break;
-
-			case 64:
-				execution.signed_zero_inf_nan_preserve_64 = true;
-				break;
-
-			default:
-				SPIRV_CROSS_THROW("Invalid bit-width for SignedZeroInfNanPreserve.");
-			}
-			break;
-
 		default:
 			break;
 		}
@@ -594,7 +557,7 @@ void Parser::parse(const Instruction &instruction)
 		{
 			if (length > 2)
 			{
-				if (ops[2] == FPEncodingBFloat16KHR)
+				if (ops[2] == spv::FPEncodingBFloat16KHR)
 					type.basetype = SPIRType::BFloat16;
 				else
 					SPIRV_CROSS_THROW("Unrecognized encoding for OpTypeFloat 16.");
@@ -606,9 +569,9 @@ void Parser::parse(const Instruction &instruction)
 		{
 			if (length < 2)
 				SPIRV_CROSS_THROW("Missing encoding for OpTypeFloat 8.");
-			else if (ops[2] == FPEncodingFloat8E4M3EXT)
+			else if (ops[2] == spv::FPEncodingFloat8E4M3EXT)
 				type.basetype = SPIRType::FloatE4M3;
-			else if (ops[2] == FPEncodingFloat8E5M2EXT)
+			else if (ops[2] == spv::FPEncodingFloat8E5M2EXT)
 				type.basetype = SPIRType::FloatE5M2;
 			else
 				SPIRV_CROSS_THROW("Invalid encoding for OpTypeFloat 8.");
@@ -670,33 +633,15 @@ void Parser::parse(const Instruction &instruction)
 		auto &matrixbase = set<SPIRType>(id, base);
 
 		matrixbase.op = op;
-		matrixbase.ext.cooperative.scope_id = ops[2];
-		matrixbase.ext.cooperative.rows_id = ops[3];
-		matrixbase.ext.cooperative.columns_id = ops[4];
-		matrixbase.ext.cooperative.use_id = ops[5];
+		matrixbase.cooperative.scope_id = ops[2];
+		matrixbase.cooperative.rows_id = ops[3];
+		matrixbase.cooperative.columns_id = ops[4];
+		matrixbase.cooperative.use_id = ops[5];
 		matrixbase.self = id;
 		matrixbase.parent_type = ops[1];
 		break;
 	}
 
-	case OpTypeCooperativeVectorNV:
-	{
-		uint32_t id = ops[0];
-		auto &type = set<SPIRType>(id, op);
-
-		type.basetype = SPIRType::CoopVecNV;
-		type.op = op;
-		type.ext.coopVecNV.component_type_id = ops[1];
-		type.ext.coopVecNV.component_count_id = ops[2];
-		type.parent_type = ops[1];
-
-		// CoopVec-Nv can be used with integer operations like SMax where
-		// where spirv-opt does explicit checks on integer bitwidth
-		auto component_type = get<SPIRType>(type.ext.coopVecNV.component_type_id);
-		type.width = component_type.width;
-		break;
-	}
-
 	case OpTypeArray:
 	{
 		uint32_t id = ops[0];
@@ -894,20 +839,6 @@ void Parser::parse(const Instruction &instruction)
 		break;
 	}
 
-	case OpTypeTensorARM:
-	{
-		uint32_t id = ops[0];
-		auto &type = set<SPIRType>(id, op);
-		type.basetype = SPIRType::Tensor;
-		type.ext.tensor = {};
-		type.ext.tensor.type = ops[1];
-		if (length >= 3)
-			type.ext.tensor.rank = ops[2];
-		if (length >= 4)
-			type.ext.tensor.shape = ops[3];
-		break;
-	}
-
 	// Variable declaration
 	// All variables are essentially pointers with a storage qualifier.
 	case OpVariable:
@@ -944,7 +875,7 @@ void Parser::parse(const Instruction &instruction)
 		uint32_t id = ops[1];
 
 		// Instead of a temporary, create a new function-wide temporary with this ID instead.
-		auto &var = set<SPIRVariable>(id, result_type, StorageClassFunction);
+		auto &var = set<SPIRVariable>(id, result_type, spv::StorageClassFunction);
 		var.phi_variable = true;
 
 		current_function->add_local_variable(id);
diff --git a/engine/thirdparty/spirv-cross/spirv_reflect.cpp b/engine/thirdparty/spirv-cross/spirv_reflect.cpp
index 38076130..552d671a 100644
--- a/engine/thirdparty/spirv-cross/spirv_reflect.cpp
+++ b/engine/thirdparty/spirv-cross/spirv_reflect.cpp
@@ -25,7 +25,7 @@
 #include "spirv_glsl.hpp"
 #include <iomanip>
 
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
+using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
 using namespace std;
 
@@ -449,7 +449,7 @@ void CompilerReflection::emit_type_member_qualifiers(const SPIRType &type, uint3
 	}
 }
 
-string CompilerReflection::execution_model_to_str(ExecutionModel model)
+string CompilerReflection::execution_model_to_str(spv::ExecutionModel model)
 {
 	switch (model)
 	{
@@ -477,12 +477,6 @@ string CompilerReflection::execution_model_to_str(ExecutionModel model)
 		return "rmiss";
 	case ExecutionModelCallableNV:
 		return "rcall";
-	case ExecutionModelMeshNV:
-	case ExecutionModelMeshEXT:
-		return "mesh";
-	case ExecutionModelTaskNV:
-	case ExecutionModelTaskEXT:
-		return "task";
 	default:
 		return "???";
 	}
@@ -510,9 +504,7 @@ void CompilerReflection::emit_entry_points()
 			json_stream->begin_json_object();
 			json_stream->emit_json_key_value("name", e.name);
 			json_stream->emit_json_key_value("mode", execution_model_to_str(e.execution_model));
-			if (e.execution_model == ExecutionModelGLCompute || e.execution_model == ExecutionModelMeshEXT ||
-			    e.execution_model == ExecutionModelMeshNV || e.execution_model == ExecutionModelTaskEXT ||
-			    e.execution_model == ExecutionModelTaskNV)
+			if (e.execution_model == ExecutionModelGLCompute)
 			{
 				const auto &spv_entry = get_entry_point(e.name, e.execution_model);
 
@@ -555,7 +547,6 @@ void CompilerReflection::emit_resources()
 	emit_resources("push_constants", res.push_constant_buffers);
 	emit_resources("counters", res.atomic_counters);
 	emit_resources("acceleration_structures", res.acceleration_structures);
-	emit_resources("tensors", res.tensors);
 }
 
 void CompilerReflection::emit_resources(const char *tag, const SmallVector<Resource> &resources)
diff --git a/engine/thirdparty/spirv-cross/spirv_reflect.hpp b/engine/thirdparty/spirv-cross/spirv_reflect.hpp
index 492a951f..a129ba54 100644
--- a/engine/thirdparty/spirv-cross/spirv_reflect.hpp
+++ b/engine/thirdparty/spirv-cross/spirv_reflect.hpp
@@ -34,7 +34,6 @@ class Stream;
 
 namespace SPIRV_CROSS_NAMESPACE
 {
-using namespace SPIRV_CROSS_SPV_HEADER_NAMESPACE;
 class CompilerReflection : public CompilerGLSL
 {
 	using Parent = CompilerGLSL;
@@ -68,7 +67,7 @@ public:
 	std::string compile() override;
 
 private:
-	static std::string execution_model_to_str(ExecutionModel model);
+	static std::string execution_model_to_str(spv::ExecutionModel model);
 
 	void emit_entry_points();
 	void emit_types();
diff --git a/engine/thirdparty/spirv-headers/LICENSE b/engine/thirdparty/spirv-headers/LICENSE
index 111e0fc8..b929b417 100644
--- a/engine/thirdparty/spirv-headers/LICENSE
+++ b/engine/thirdparty/spirv-headers/LICENSE
@@ -24,4 +24,3 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
diff --git a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.h b/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.h
index e8b5ad19..12d0bf9d 100644
--- a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.h
+++ b/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.h
@@ -195,7 +195,6 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeSampleInterlockUnorderedEXT = 5369,
     SpvExecutionModeShadingRateInterlockOrderedEXT = 5370,
     SpvExecutionModeShadingRateInterlockUnorderedEXT = 5371,
-    SpvExecutionModeShader64BitIndexingEXT = 5427,
     SpvExecutionModeSharedLocalMemorySizeINTEL = 5618,
     SpvExecutionModeRoundingModeRTPINTEL = 5620,
     SpvExecutionModeRoundingModeRTNINTEL = 5621,
@@ -250,11 +249,8 @@ typedef enum SpvStorageClass_ {
     SpvStorageClassPhysicalStorageBufferEXT = 5349,
     SpvStorageClassHitObjectAttributeNV = 5385,
     SpvStorageClassTaskPayloadWorkgroupEXT = 5402,
-    SpvStorageClassHitObjectAttributeEXT = 5411,
     SpvStorageClassCodeSectionINTEL = 5605,
-    SpvStorageClassDeviceOnlyALTERA = 5936,
     SpvStorageClassDeviceOnlyINTEL = 5936,
-    SpvStorageClassHostOnlyALTERA = 5937,
     SpvStorageClassHostOnlyINTEL = 5937,
     SpvStorageClassMax = 0x7fffffff,
 } SpvStorageClass;
@@ -493,7 +489,6 @@ typedef enum SpvFunctionParameterAttribute_ {
     SpvFunctionParameterAttributeNoCapture = 5,
     SpvFunctionParameterAttributeNoWrite = 6,
     SpvFunctionParameterAttributeNoReadWrite = 7,
-    SpvFunctionParameterAttributeRuntimeAlignedALTERA = 5940,
     SpvFunctionParameterAttributeRuntimeAlignedINTEL = 5940,
     SpvFunctionParameterAttributeMax = 0x7fffffff,
 } SpvFunctionParameterAttribute;
@@ -578,7 +573,6 @@ typedef enum SpvDecoration_ {
     SpvDecorationAliasedPointer = 5356,
     SpvDecorationAliasedPointerEXT = 5356,
     SpvDecorationHitObjectShaderRecordBufferNV = 5386,
-    SpvDecorationHitObjectShaderRecordBufferEXT = 5389,
     SpvDecorationBindlessSamplerNV = 5398,
     SpvDecorationBindlessImageNV = 5399,
     SpvDecorationBoundSamplerNV = 5400,
@@ -599,95 +593,54 @@ typedef enum SpvDecoration_ {
     SpvDecorationUserTypeGOOGLE = 5636,
     SpvDecorationFunctionRoundingModeINTEL = 5822,
     SpvDecorationFunctionDenormModeINTEL = 5823,
-    SpvDecorationRegisterALTERA = 5825,
     SpvDecorationRegisterINTEL = 5825,
-    SpvDecorationMemoryALTERA = 5826,
     SpvDecorationMemoryINTEL = 5826,
-    SpvDecorationNumbanksALTERA = 5827,
     SpvDecorationNumbanksINTEL = 5827,
-    SpvDecorationBankwidthALTERA = 5828,
     SpvDecorationBankwidthINTEL = 5828,
-    SpvDecorationMaxPrivateCopiesALTERA = 5829,
     SpvDecorationMaxPrivateCopiesINTEL = 5829,
-    SpvDecorationSinglepumpALTERA = 5830,
     SpvDecorationSinglepumpINTEL = 5830,
-    SpvDecorationDoublepumpALTERA = 5831,
     SpvDecorationDoublepumpINTEL = 5831,
-    SpvDecorationMaxReplicatesALTERA = 5832,
     SpvDecorationMaxReplicatesINTEL = 5832,
-    SpvDecorationSimpleDualPortALTERA = 5833,
     SpvDecorationSimpleDualPortINTEL = 5833,
-    SpvDecorationMergeALTERA = 5834,
     SpvDecorationMergeINTEL = 5834,
-    SpvDecorationBankBitsALTERA = 5835,
     SpvDecorationBankBitsINTEL = 5835,
-    SpvDecorationForcePow2DepthALTERA = 5836,
     SpvDecorationForcePow2DepthINTEL = 5836,
-    SpvDecorationStridesizeALTERA = 5883,
     SpvDecorationStridesizeINTEL = 5883,
-    SpvDecorationWordsizeALTERA = 5884,
     SpvDecorationWordsizeINTEL = 5884,
-    SpvDecorationTrueDualPortALTERA = 5885,
     SpvDecorationTrueDualPortINTEL = 5885,
-    SpvDecorationBurstCoalesceALTERA = 5899,
     SpvDecorationBurstCoalesceINTEL = 5899,
-    SpvDecorationCacheSizeALTERA = 5900,
     SpvDecorationCacheSizeINTEL = 5900,
-    SpvDecorationDontStaticallyCoalesceALTERA = 5901,
     SpvDecorationDontStaticallyCoalesceINTEL = 5901,
-    SpvDecorationPrefetchALTERA = 5902,
     SpvDecorationPrefetchINTEL = 5902,
-    SpvDecorationStallEnableALTERA = 5905,
     SpvDecorationStallEnableINTEL = 5905,
-    SpvDecorationFuseLoopsInFunctionALTERA = 5907,
     SpvDecorationFuseLoopsInFunctionINTEL = 5907,
-    SpvDecorationMathOpDSPModeALTERA = 5909,
     SpvDecorationMathOpDSPModeINTEL = 5909,
     SpvDecorationAliasScopeINTEL = 5914,
     SpvDecorationNoAliasINTEL = 5915,
-    SpvDecorationInitiationIntervalALTERA = 5917,
     SpvDecorationInitiationIntervalINTEL = 5917,
-    SpvDecorationMaxConcurrencyALTERA = 5918,
     SpvDecorationMaxConcurrencyINTEL = 5918,
-    SpvDecorationPipelineEnableALTERA = 5919,
     SpvDecorationPipelineEnableINTEL = 5919,
-    SpvDecorationBufferLocationALTERA = 5921,
     SpvDecorationBufferLocationINTEL = 5921,
-    SpvDecorationIOPipeStorageALTERA = 5944,
     SpvDecorationIOPipeStorageINTEL = 5944,
     SpvDecorationFunctionFloatingPointModeINTEL = 6080,
     SpvDecorationSingleElementVectorINTEL = 6085,
     SpvDecorationVectorComputeCallableFunctionINTEL = 6087,
     SpvDecorationMediaBlockIOINTEL = 6140,
-    SpvDecorationStallFreeALTERA = 6151,
     SpvDecorationStallFreeINTEL = 6151,
     SpvDecorationFPMaxErrorDecorationINTEL = 6170,
-    SpvDecorationLatencyControlLabelALTERA = 6172,
     SpvDecorationLatencyControlLabelINTEL = 6172,
-    SpvDecorationLatencyControlConstraintALTERA = 6173,
     SpvDecorationLatencyControlConstraintINTEL = 6173,
-    SpvDecorationConduitKernelArgumentALTERA = 6175,
     SpvDecorationConduitKernelArgumentINTEL = 6175,
-    SpvDecorationRegisterMapKernelArgumentALTERA = 6176,
     SpvDecorationRegisterMapKernelArgumentINTEL = 6176,
-    SpvDecorationMMHostInterfaceAddressWidthALTERA = 6177,
     SpvDecorationMMHostInterfaceAddressWidthINTEL = 6177,
-    SpvDecorationMMHostInterfaceDataWidthALTERA = 6178,
     SpvDecorationMMHostInterfaceDataWidthINTEL = 6178,
-    SpvDecorationMMHostInterfaceLatencyALTERA = 6179,
     SpvDecorationMMHostInterfaceLatencyINTEL = 6179,
-    SpvDecorationMMHostInterfaceReadWriteModeALTERA = 6180,
     SpvDecorationMMHostInterfaceReadWriteModeINTEL = 6180,
-    SpvDecorationMMHostInterfaceMaxBurstALTERA = 6181,
     SpvDecorationMMHostInterfaceMaxBurstINTEL = 6181,
-    SpvDecorationMMHostInterfaceWaitRequestALTERA = 6182,
     SpvDecorationMMHostInterfaceWaitRequestINTEL = 6182,
-    SpvDecorationStableKernelArgumentALTERA = 6183,
     SpvDecorationStableKernelArgumentINTEL = 6183,
     SpvDecorationHostAccessINTEL = 6188,
-    SpvDecorationInitModeALTERA = 6190,
     SpvDecorationInitModeINTEL = 6190,
-    SpvDecorationImplementInRegisterMapALTERA = 6191,
     SpvDecorationImplementInRegisterMapINTEL = 6191,
     SpvDecorationConditionalINTEL = 6247,
     SpvDecorationCacheControlLoadINTEL = 6442,
@@ -869,25 +822,15 @@ typedef enum SpvLoopControlShift_ {
     SpvLoopControlIterationMultipleShift = 6,
     SpvLoopControlPeelCountShift = 7,
     SpvLoopControlPartialCountShift = 8,
-    SpvLoopControlInitiationIntervalALTERAShift = 16,
     SpvLoopControlInitiationIntervalINTELShift = 16,
-    SpvLoopControlMaxConcurrencyALTERAShift = 17,
     SpvLoopControlMaxConcurrencyINTELShift = 17,
-    SpvLoopControlDependencyArrayALTERAShift = 18,
     SpvLoopControlDependencyArrayINTELShift = 18,
-    SpvLoopControlPipelineEnableALTERAShift = 19,
     SpvLoopControlPipelineEnableINTELShift = 19,
-    SpvLoopControlLoopCoalesceALTERAShift = 20,
     SpvLoopControlLoopCoalesceINTELShift = 20,
-    SpvLoopControlMaxInterleavingALTERAShift = 21,
     SpvLoopControlMaxInterleavingINTELShift = 21,
-    SpvLoopControlSpeculatedIterationsALTERAShift = 22,
     SpvLoopControlSpeculatedIterationsINTELShift = 22,
-    SpvLoopControlNoFusionALTERAShift = 23,
     SpvLoopControlNoFusionINTELShift = 23,
-    SpvLoopControlLoopCountALTERAShift = 24,
     SpvLoopControlLoopCountINTELShift = 24,
-    SpvLoopControlMaxReinvocationDelayALTERAShift = 25,
     SpvLoopControlMaxReinvocationDelayINTELShift = 25,
     SpvLoopControlMax = 0x7fffffff,
 } SpvLoopControlShift;
@@ -903,25 +846,15 @@ typedef enum SpvLoopControlMask_ {
     SpvLoopControlIterationMultipleMask = 0x00000040,
     SpvLoopControlPeelCountMask = 0x00000080,
     SpvLoopControlPartialCountMask = 0x00000100,
-    SpvLoopControlInitiationIntervalALTERAMask = 0x00010000,
     SpvLoopControlInitiationIntervalINTELMask = 0x00010000,
-    SpvLoopControlMaxConcurrencyALTERAMask = 0x00020000,
     SpvLoopControlMaxConcurrencyINTELMask = 0x00020000,
-    SpvLoopControlDependencyArrayALTERAMask = 0x00040000,
     SpvLoopControlDependencyArrayINTELMask = 0x00040000,
-    SpvLoopControlPipelineEnableALTERAMask = 0x00080000,
     SpvLoopControlPipelineEnableINTELMask = 0x00080000,
-    SpvLoopControlLoopCoalesceALTERAMask = 0x00100000,
     SpvLoopControlLoopCoalesceINTELMask = 0x00100000,
-    SpvLoopControlMaxInterleavingALTERAMask = 0x00200000,
     SpvLoopControlMaxInterleavingINTELMask = 0x00200000,
-    SpvLoopControlSpeculatedIterationsALTERAMask = 0x00400000,
     SpvLoopControlSpeculatedIterationsINTELMask = 0x00400000,
-    SpvLoopControlNoFusionALTERAMask = 0x00800000,
     SpvLoopControlNoFusionINTELMask = 0x00800000,
-    SpvLoopControlLoopCountALTERAMask = 0x01000000,
     SpvLoopControlLoopCountINTELMask = 0x01000000,
-    SpvLoopControlMaxReinvocationDelayALTERAMask = 0x02000000,
     SpvLoopControlMaxReinvocationDelayINTELMask = 0x02000000,
 } SpvLoopControlMask;
 
@@ -1255,7 +1188,6 @@ typedef enum SpvCapability_ {
     SpvCapabilityDisplacementMicromapNV = 5380,
     SpvCapabilityRayTracingOpacityMicromapEXT = 5381,
     SpvCapabilityShaderInvocationReorderNV = 5383,
-    SpvCapabilityShaderInvocationReorderEXT = 5388,
     SpvCapabilityBindlessTextureNV = 5390,
     SpvCapabilityRayQueryPositionFetchKHR = 5391,
     SpvCapabilityCooperativeVectorNV = 5394,
@@ -1264,7 +1196,6 @@ typedef enum SpvCapability_ {
     SpvCapabilityRawAccessChainsNV = 5414,
     SpvCapabilityRayTracingSpheresGeometryNV = 5418,
     SpvCapabilityRayTracingLinearSweptSpheresGeometryNV = 5419,
-    SpvCapabilityShader64BitIndexingEXT = 5426,
     SpvCapabilityCooperativeMatrixReductionsNV = 5430,
     SpvCapabilityCooperativeMatrixConversionsNV = 5431,
     SpvCapabilityCooperativeMatrixPerElementOperationsNV = 5432,
@@ -1294,42 +1225,26 @@ typedef enum SpvCapability_ {
     SpvCapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698,
     SpvCapabilityVariableLengthArrayINTEL = 5817,
     SpvCapabilityFunctionFloatControlINTEL = 5821,
-    SpvCapabilityFPGAMemoryAttributesALTERA = 5824,
     SpvCapabilityFPGAMemoryAttributesINTEL = 5824,
     SpvCapabilityFPFastMathModeINTEL = 5837,
-    SpvCapabilityArbitraryPrecisionIntegersALTERA = 5844,
     SpvCapabilityArbitraryPrecisionIntegersINTEL = 5844,
-    SpvCapabilityArbitraryPrecisionFloatingPointALTERA = 5845,
     SpvCapabilityArbitraryPrecisionFloatingPointINTEL = 5845,
     SpvCapabilityUnstructuredLoopControlsINTEL = 5886,
-    SpvCapabilityFPGALoopControlsALTERA = 5888,
     SpvCapabilityFPGALoopControlsINTEL = 5888,
     SpvCapabilityKernelAttributesINTEL = 5892,
     SpvCapabilityFPGAKernelAttributesINTEL = 5897,
-    SpvCapabilityFPGAMemoryAccessesALTERA = 5898,
     SpvCapabilityFPGAMemoryAccessesINTEL = 5898,
-    SpvCapabilityFPGAClusterAttributesALTERA = 5904,
     SpvCapabilityFPGAClusterAttributesINTEL = 5904,
-    SpvCapabilityLoopFuseALTERA = 5906,
     SpvCapabilityLoopFuseINTEL = 5906,
-    SpvCapabilityFPGADSPControlALTERA = 5908,
     SpvCapabilityFPGADSPControlINTEL = 5908,
     SpvCapabilityMemoryAccessAliasingINTEL = 5910,
-    SpvCapabilityFPGAInvocationPipeliningAttributesALTERA = 5916,
     SpvCapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
-    SpvCapabilityFPGABufferLocationALTERA = 5920,
     SpvCapabilityFPGABufferLocationINTEL = 5920,
-    SpvCapabilityArbitraryPrecisionFixedPointALTERA = 5922,
     SpvCapabilityArbitraryPrecisionFixedPointINTEL = 5922,
-    SpvCapabilityUSMStorageClassesALTERA = 5935,
     SpvCapabilityUSMStorageClassesINTEL = 5935,
-    SpvCapabilityRuntimeAlignedAttributeALTERA = 5939,
     SpvCapabilityRuntimeAlignedAttributeINTEL = 5939,
-    SpvCapabilityIOPipesALTERA = 5943,
     SpvCapabilityIOPipesINTEL = 5943,
-    SpvCapabilityBlockingPipesALTERA = 5945,
     SpvCapabilityBlockingPipesINTEL = 5945,
-    SpvCapabilityFPGARegALTERA = 5948,
     SpvCapabilityFPGARegINTEL = 5948,
     SpvCapabilityDotProductInputAll = 6016,
     SpvCapabilityDotProductInputAllKHR = 6016,
@@ -1345,7 +1260,6 @@ typedef enum SpvCapability_ {
     SpvCapabilityBitInstructions = 6025,
     SpvCapabilityGroupNonUniformRotateKHR = 6026,
     SpvCapabilityFloatControls2 = 6029,
-    SpvCapabilityFMAKHR = 6030,
     SpvCapabilityAtomicFloat32AddEXT = 6033,
     SpvCapabilityAtomicFloat64AddEXT = 6034,
     SpvCapabilityLongCompositesINTEL = 6089,
@@ -1356,18 +1270,13 @@ typedef enum SpvCapability_ {
     SpvCapabilityBFloat16ConversionINTEL = 6115,
     SpvCapabilitySplitBarrierINTEL = 6141,
     SpvCapabilityArithmeticFenceEXT = 6144,
-    SpvCapabilityFPGAClusterAttributesV2ALTERA = 6150,
     SpvCapabilityFPGAClusterAttributesV2INTEL = 6150,
     SpvCapabilityFPGAKernelAttributesv2INTEL = 6161,
-    SpvCapabilityTaskSequenceALTERA = 6162,
     SpvCapabilityTaskSequenceINTEL = 6162,
     SpvCapabilityFPMaxErrorINTEL = 6169,
-    SpvCapabilityFPGALatencyControlALTERA = 6171,
     SpvCapabilityFPGALatencyControlINTEL = 6171,
-    SpvCapabilityFPGAArgumentInterfacesALTERA = 6174,
     SpvCapabilityFPGAArgumentInterfacesINTEL = 6174,
     SpvCapabilityGlobalVariableHostAccessINTEL = 6187,
-    SpvCapabilityGlobalVariableFPGADecorationsALTERA = 6189,
     SpvCapabilityGlobalVariableFPGADecorationsINTEL = 6189,
     SpvCapabilitySubgroupBufferPrefetchINTEL = 6220,
     SpvCapabilitySubgroup2DBlockIOINTEL = 6228,
@@ -1579,9 +1488,7 @@ typedef enum SpvTensorOperandsMask_ {
 } SpvTensorOperandsMask;
 
 typedef enum SpvInitializationModeQualifier_ {
-    SpvInitializationModeQualifierInitOnDeviceReprogramALTERA = 0,
     SpvInitializationModeQualifierInitOnDeviceReprogramINTEL = 0,
-    SpvInitializationModeQualifierInitOnDeviceResetALTERA = 1,
     SpvInitializationModeQualifierInitOnDeviceResetINTEL = 1,
     SpvInitializationModeQualifierMax = 0x7fffffff,
 } SpvInitializationModeQualifier;
@@ -2068,7 +1975,6 @@ typedef enum SpvOp_ {
     SpvOpUntypedInBoundsPtrAccessChainKHR = 4424,
     SpvOpUntypedArrayLengthKHR = 4425,
     SpvOpUntypedPrefetchKHR = 4426,
-    SpvOpFmaKHR = 4427,
     SpvOpSubgroupAllKHR = 4428,
     SpvOpSubgroupAnyKHR = 4429,
     SpvOpSubgroupAllEqualKHR = 4430,
@@ -2189,36 +2095,6 @@ typedef enum SpvOp_ {
     SpvOpFetchMicroTriangleVertexBarycentricNV = 5301,
     SpvOpCooperativeVectorLoadNV = 5302,
     SpvOpCooperativeVectorStoreNV = 5303,
-    SpvOpHitObjectRecordFromQueryEXT = 5304,
-    SpvOpHitObjectRecordMissEXT = 5305,
-    SpvOpHitObjectRecordMissMotionEXT = 5306,
-    SpvOpHitObjectGetIntersectionTriangleVertexPositionsEXT = 5307,
-    SpvOpHitObjectGetRayFlagsEXT = 5308,
-    SpvOpHitObjectSetShaderBindingTableRecordIndexEXT = 5309,
-    SpvOpHitObjectReorderExecuteShaderEXT = 5310,
-    SpvOpHitObjectTraceReorderExecuteEXT = 5311,
-    SpvOpHitObjectTraceMotionReorderExecuteEXT = 5312,
-    SpvOpTypeHitObjectEXT = 5313,
-    SpvOpReorderThreadWithHintEXT = 5314,
-    SpvOpReorderThreadWithHitObjectEXT = 5315,
-    SpvOpHitObjectTraceRayEXT = 5316,
-    SpvOpHitObjectTraceRayMotionEXT = 5317,
-    SpvOpHitObjectRecordEmptyEXT = 5318,
-    SpvOpHitObjectExecuteShaderEXT = 5319,
-    SpvOpHitObjectGetCurrentTimeEXT = 5320,
-    SpvOpHitObjectGetAttributesEXT = 5321,
-    SpvOpHitObjectGetHitKindEXT = 5322,
-    SpvOpHitObjectGetPrimitiveIndexEXT = 5323,
-    SpvOpHitObjectGetGeometryIndexEXT = 5324,
-    SpvOpHitObjectGetInstanceIdEXT = 5325,
-    SpvOpHitObjectGetInstanceCustomIndexEXT = 5326,
-    SpvOpHitObjectGetObjectRayOriginEXT = 5327,
-    SpvOpHitObjectGetObjectRayDirectionEXT = 5328,
-    SpvOpHitObjectGetWorldRayDirectionEXT = 5329,
-    SpvOpHitObjectGetWorldRayOriginEXT = 5330,
-    SpvOpHitObjectGetObjectToWorldEXT = 5331,
-    SpvOpHitObjectGetWorldToObjectEXT = 5332,
-    SpvOpHitObjectGetRayTMaxEXT = 5333,
     SpvOpReportIntersectionKHR = 5334,
     SpvOpReportIntersectionNV = 5334,
     SpvOpIgnoreIntersectionNV = 5335,
@@ -2233,12 +2109,6 @@ typedef enum SpvOp_ {
     SpvOpRayQueryGetClusterIdNV = 5345,
     SpvOpRayQueryGetIntersectionClusterIdNV = 5345,
     SpvOpHitObjectGetClusterIdNV = 5346,
-    SpvOpHitObjectGetRayTMinEXT = 5347,
-    SpvOpHitObjectGetShaderBindingTableRecordIndexEXT = 5348,
-    SpvOpHitObjectGetShaderRecordBufferHandleEXT = 5349,
-    SpvOpHitObjectIsEmptyEXT = 5350,
-    SpvOpHitObjectIsHitEXT = 5351,
-    SpvOpHitObjectIsMissEXT = 5352,
     SpvOpTypeCooperativeMatrixNV = 5358,
     SpvOpCooperativeMatrixLoadNV = 5359,
     SpvOpCooperativeMatrixStoreNV = 5360,
@@ -2445,41 +2315,23 @@ typedef enum SpvOp_ {
     SpvOpVariableLengthArrayINTEL = 5818,
     SpvOpSaveMemoryINTEL = 5819,
     SpvOpRestoreMemoryINTEL = 5820,
-    SpvOpArbitraryFloatSinCosPiALTERA = 5840,
     SpvOpArbitraryFloatSinCosPiINTEL = 5840,
-    SpvOpArbitraryFloatCastALTERA = 5841,
     SpvOpArbitraryFloatCastINTEL = 5841,
-    SpvOpArbitraryFloatCastFromIntALTERA = 5842,
     SpvOpArbitraryFloatCastFromIntINTEL = 5842,
-    SpvOpArbitraryFloatCastToIntALTERA = 5843,
     SpvOpArbitraryFloatCastToIntINTEL = 5843,
-    SpvOpArbitraryFloatAddALTERA = 5846,
     SpvOpArbitraryFloatAddINTEL = 5846,
-    SpvOpArbitraryFloatSubALTERA = 5847,
     SpvOpArbitraryFloatSubINTEL = 5847,
-    SpvOpArbitraryFloatMulALTERA = 5848,
     SpvOpArbitraryFloatMulINTEL = 5848,
-    SpvOpArbitraryFloatDivALTERA = 5849,
     SpvOpArbitraryFloatDivINTEL = 5849,
-    SpvOpArbitraryFloatGTALTERA = 5850,
     SpvOpArbitraryFloatGTINTEL = 5850,
-    SpvOpArbitraryFloatGEALTERA = 5851,
     SpvOpArbitraryFloatGEINTEL = 5851,
-    SpvOpArbitraryFloatLTALTERA = 5852,
     SpvOpArbitraryFloatLTINTEL = 5852,
-    SpvOpArbitraryFloatLEALTERA = 5853,
     SpvOpArbitraryFloatLEINTEL = 5853,
-    SpvOpArbitraryFloatEQALTERA = 5854,
     SpvOpArbitraryFloatEQINTEL = 5854,
-    SpvOpArbitraryFloatRecipALTERA = 5855,
     SpvOpArbitraryFloatRecipINTEL = 5855,
-    SpvOpArbitraryFloatRSqrtALTERA = 5856,
     SpvOpArbitraryFloatRSqrtINTEL = 5856,
-    SpvOpArbitraryFloatCbrtALTERA = 5857,
     SpvOpArbitraryFloatCbrtINTEL = 5857,
-    SpvOpArbitraryFloatHypotALTERA = 5858,
     SpvOpArbitraryFloatHypotINTEL = 5858,
-    SpvOpArbitraryFloatSqrtALTERA = 5859,
     SpvOpArbitraryFloatSqrtINTEL = 5859,
     SpvOpArbitraryFloatLogINTEL = 5860,
     SpvOpArbitraryFloatLog2INTEL = 5861,
@@ -2508,37 +2360,21 @@ typedef enum SpvOp_ {
     SpvOpAliasDomainDeclINTEL = 5911,
     SpvOpAliasScopeDeclINTEL = 5912,
     SpvOpAliasScopeListDeclINTEL = 5913,
-    SpvOpFixedSqrtALTERA = 5923,
     SpvOpFixedSqrtINTEL = 5923,
-    SpvOpFixedRecipALTERA = 5924,
     SpvOpFixedRecipINTEL = 5924,
-    SpvOpFixedRsqrtALTERA = 5925,
     SpvOpFixedRsqrtINTEL = 5925,
-    SpvOpFixedSinALTERA = 5926,
     SpvOpFixedSinINTEL = 5926,
-    SpvOpFixedCosALTERA = 5927,
     SpvOpFixedCosINTEL = 5927,
-    SpvOpFixedSinCosALTERA = 5928,
     SpvOpFixedSinCosINTEL = 5928,
-    SpvOpFixedSinPiALTERA = 5929,
     SpvOpFixedSinPiINTEL = 5929,
-    SpvOpFixedCosPiALTERA = 5930,
     SpvOpFixedCosPiINTEL = 5930,
-    SpvOpFixedSinCosPiALTERA = 5931,
     SpvOpFixedSinCosPiINTEL = 5931,
-    SpvOpFixedLogALTERA = 5932,
     SpvOpFixedLogINTEL = 5932,
-    SpvOpFixedExpALTERA = 5933,
     SpvOpFixedExpINTEL = 5933,
-    SpvOpPtrCastToCrossWorkgroupALTERA = 5934,
     SpvOpPtrCastToCrossWorkgroupINTEL = 5934,
-    SpvOpCrossWorkgroupCastToPtrALTERA = 5938,
     SpvOpCrossWorkgroupCastToPtrINTEL = 5938,
-    SpvOpReadPipeBlockingALTERA = 5946,
     SpvOpReadPipeBlockingINTEL = 5946,
-    SpvOpWritePipeBlockingALTERA = 5947,
     SpvOpWritePipeBlockingINTEL = 5947,
-    SpvOpFPGARegALTERA = 5949,
     SpvOpFPGARegINTEL = 5949,
     SpvOpRayQueryGetRayTMinKHR = 6016,
     SpvOpRayQueryGetRayFlagsKHR = 6017,
@@ -2568,15 +2404,10 @@ typedef enum SpvOp_ {
     SpvOpControlBarrierArriveINTEL = 6142,
     SpvOpControlBarrierWaitINTEL = 6143,
     SpvOpArithmeticFenceEXT = 6145,
-    SpvOpTaskSequenceCreateALTERA = 6163,
     SpvOpTaskSequenceCreateINTEL = 6163,
-    SpvOpTaskSequenceAsyncALTERA = 6164,
     SpvOpTaskSequenceAsyncINTEL = 6164,
-    SpvOpTaskSequenceGetALTERA = 6165,
     SpvOpTaskSequenceGetINTEL = 6165,
-    SpvOpTaskSequenceReleaseALTERA = 6166,
     SpvOpTaskSequenceReleaseINTEL = 6166,
-    SpvOpTypeTaskSequenceALTERA = 6199,
     SpvOpTypeTaskSequenceINTEL = 6199,
     SpvOpSubgroupBlockPrefetchINTEL = 6221,
     SpvOpSubgroup2DBlockLoadINTEL = 6231,
@@ -2988,7 +2819,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpUntypedInBoundsPtrAccessChainKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpUntypedArrayLengthKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpUntypedPrefetchKHR: *hasResult = false; *hasResultType = false; break;
-    case SpvOpFmaKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
@@ -3103,36 +2933,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpFetchMicroTriangleVertexBarycentricNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpCooperativeVectorLoadNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpCooperativeVectorStoreNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordFromQueryEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordMissEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordMissMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetIntersectionTriangleVertexPositionsEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetRayFlagsEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectSetShaderBindingTableRecordIndexEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectReorderExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectTraceReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectTraceMotionReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpTypeHitObjectEXT: *hasResult = true; *hasResultType = false; break;
-    case SpvOpReorderThreadWithHintEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpReorderThreadWithHitObjectEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectTraceRayEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectTraceRayMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordEmptyEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetCurrentTimeEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetAttributesEXT: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetHitKindEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetPrimitiveIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetGeometryIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetInstanceIdEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetInstanceCustomIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetWorldRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetWorldRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectToWorldEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetWorldToObjectEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetRayTMaxEXT: *hasResult = true; *hasResultType = true; break;
     case SpvOpReportIntersectionKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpIgnoreIntersectionNV: *hasResult = false; *hasResultType = false; break;
     case SpvOpTerminateRayNV: *hasResult = false; *hasResultType = false; break;
@@ -3144,12 +2944,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
     case SpvOpRayQueryGetIntersectionClusterIdNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetRayTMinEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetShaderBindingTableRecordIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetShaderRecordBufferHandleEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsEmptyEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsHitEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsMissEXT: *hasResult = true; *hasResultType = true; break;
     case SpvOpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
     case SpvOpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
@@ -3353,24 +3147,24 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpVariableLengthArrayINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpSaveMemoryINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpRestoreMemoryINTEL: *hasResult = false; *hasResultType = false; break;
-    case SpvOpArbitraryFloatSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatCastALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatCastFromIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatCastToIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatAddALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatSubALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatMulALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatDivALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatGTALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatGEALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatLTALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatLEALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatEQALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatRSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatCbrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatHypotALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpArbitraryFloatSqrtALTERA: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatSinCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatCastINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatCastFromIntINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatCastToIntINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatAddINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatSubINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatMulINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatDivINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatGTINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatGEINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatLTINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatLEINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatEQINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatRecipINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatRSqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatCbrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatHypotINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpArbitraryFloatSqrtINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpArbitraryFloatLogINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpArbitraryFloatLog2INTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpArbitraryFloatLog10INTEL: *hasResult = true; *hasResultType = true; break;
@@ -3398,22 +3192,22 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpAliasDomainDeclINTEL: *hasResult = true; *hasResultType = false; break;
     case SpvOpAliasScopeDeclINTEL: *hasResult = true; *hasResultType = false; break;
     case SpvOpAliasScopeListDeclINTEL: *hasResult = true; *hasResultType = false; break;
-    case SpvOpFixedSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedRsqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedSinALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedSinCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedSinPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedLogALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFixedExpALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpPtrCastToCrossWorkgroupALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpCrossWorkgroupCastToPtrALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpReadPipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpWritePipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpFPGARegALTERA: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedSqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedRecipINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedRsqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedSinINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedCosINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedSinCosINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedSinPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedSinCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedLogINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFixedExpINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpPtrCastToCrossWorkgroupINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpCrossWorkgroupCastToPtrINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpReadPipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpWritePipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpFPGARegINTEL: *hasResult = true; *hasResultType = true; break;
     case SpvOpRayQueryGetRayTMinKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpRayQueryGetRayFlagsKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpRayQueryGetIntersectionTKHR: *hasResult = true; *hasResultType = true; break;
@@ -3442,11 +3236,11 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpArithmeticFenceEXT: *hasResult = true; *hasResultType = true; break;
-    case SpvOpTaskSequenceCreateALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpTaskSequenceAsyncALTERA: *hasResult = false; *hasResultType = false; break;
-    case SpvOpTaskSequenceGetALTERA: *hasResult = true; *hasResultType = true; break;
-    case SpvOpTaskSequenceReleaseALTERA: *hasResult = false; *hasResultType = false; break;
-    case SpvOpTypeTaskSequenceALTERA: *hasResult = true; *hasResultType = false; break;
+    case SpvOpTaskSequenceCreateINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpTaskSequenceAsyncINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpTaskSequenceGetINTEL: *hasResult = true; *hasResultType = true; break;
+    case SpvOpTaskSequenceReleaseINTEL: *hasResult = false; *hasResultType = false; break;
+    case SpvOpTypeTaskSequenceINTEL: *hasResult = true; *hasResultType = false; break;
     case SpvOpSubgroupBlockPrefetchINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpSubgroup2DBlockLoadINTEL: *hasResult = false; *hasResultType = false; break;
     case SpvOpSubgroup2DBlockLoadTransformINTEL: *hasResult = false; *hasResultType = false; break;
@@ -3622,7 +3416,6 @@ inline const char* SpvExecutionModeToString(SpvExecutionMode value) {
     case SpvExecutionModeSampleInterlockUnorderedEXT: return "SampleInterlockUnorderedEXT";
     case SpvExecutionModeShadingRateInterlockOrderedEXT: return "ShadingRateInterlockOrderedEXT";
     case SpvExecutionModeShadingRateInterlockUnorderedEXT: return "ShadingRateInterlockUnorderedEXT";
-    case SpvExecutionModeShader64BitIndexingEXT: return "Shader64BitIndexingEXT";
     case SpvExecutionModeSharedLocalMemorySizeINTEL: return "SharedLocalMemorySizeINTEL";
     case SpvExecutionModeRoundingModeRTPINTEL: return "RoundingModeRTPINTEL";
     case SpvExecutionModeRoundingModeRTNINTEL: return "RoundingModeRTNINTEL";
@@ -3672,10 +3465,9 @@ inline const char* SpvStorageClassToString(SpvStorageClass value) {
     case SpvStorageClassPhysicalStorageBuffer: return "PhysicalStorageBuffer";
     case SpvStorageClassHitObjectAttributeNV: return "HitObjectAttributeNV";
     case SpvStorageClassTaskPayloadWorkgroupEXT: return "TaskPayloadWorkgroupEXT";
-    case SpvStorageClassHitObjectAttributeEXT: return "HitObjectAttributeEXT";
     case SpvStorageClassCodeSectionINTEL: return "CodeSectionINTEL";
-    case SpvStorageClassDeviceOnlyALTERA: return "DeviceOnlyALTERA";
-    case SpvStorageClassHostOnlyALTERA: return "HostOnlyALTERA";
+    case SpvStorageClassDeviceOnlyINTEL: return "DeviceOnlyINTEL";
+    case SpvStorageClassHostOnlyINTEL: return "HostOnlyINTEL";
     default: return "Unknown";
     }
 }
@@ -3857,7 +3649,7 @@ inline const char* SpvFunctionParameterAttributeToString(SpvFunctionParameterAtt
     case SpvFunctionParameterAttributeNoCapture: return "NoCapture";
     case SpvFunctionParameterAttributeNoWrite: return "NoWrite";
     case SpvFunctionParameterAttributeNoReadWrite: return "NoReadWrite";
-    case SpvFunctionParameterAttributeRuntimeAlignedALTERA: return "RuntimeAlignedALTERA";
+    case SpvFunctionParameterAttributeRuntimeAlignedINTEL: return "RuntimeAlignedINTEL";
     default: return "Unknown";
     }
 }
@@ -3938,7 +3730,6 @@ inline const char* SpvDecorationToString(SpvDecoration value) {
     case SpvDecorationRestrictPointer: return "RestrictPointer";
     case SpvDecorationAliasedPointer: return "AliasedPointer";
     case SpvDecorationHitObjectShaderRecordBufferNV: return "HitObjectShaderRecordBufferNV";
-    case SpvDecorationHitObjectShaderRecordBufferEXT: return "HitObjectShaderRecordBufferEXT";
     case SpvDecorationBindlessSamplerNV: return "BindlessSamplerNV";
     case SpvDecorationBindlessImageNV: return "BindlessImageNV";
     case SpvDecorationBoundSamplerNV: return "BoundSamplerNV";
@@ -3957,55 +3748,55 @@ inline const char* SpvDecorationToString(SpvDecoration value) {
     case SpvDecorationUserTypeGOOGLE: return "UserTypeGOOGLE";
     case SpvDecorationFunctionRoundingModeINTEL: return "FunctionRoundingModeINTEL";
     case SpvDecorationFunctionDenormModeINTEL: return "FunctionDenormModeINTEL";
-    case SpvDecorationRegisterALTERA: return "RegisterALTERA";
-    case SpvDecorationMemoryALTERA: return "MemoryALTERA";
-    case SpvDecorationNumbanksALTERA: return "NumbanksALTERA";
-    case SpvDecorationBankwidthALTERA: return "BankwidthALTERA";
-    case SpvDecorationMaxPrivateCopiesALTERA: return "MaxPrivateCopiesALTERA";
-    case SpvDecorationSinglepumpALTERA: return "SinglepumpALTERA";
-    case SpvDecorationDoublepumpALTERA: return "DoublepumpALTERA";
-    case SpvDecorationMaxReplicatesALTERA: return "MaxReplicatesALTERA";
-    case SpvDecorationSimpleDualPortALTERA: return "SimpleDualPortALTERA";
-    case SpvDecorationMergeALTERA: return "MergeALTERA";
-    case SpvDecorationBankBitsALTERA: return "BankBitsALTERA";
-    case SpvDecorationForcePow2DepthALTERA: return "ForcePow2DepthALTERA";
-    case SpvDecorationStridesizeALTERA: return "StridesizeALTERA";
-    case SpvDecorationWordsizeALTERA: return "WordsizeALTERA";
-    case SpvDecorationTrueDualPortALTERA: return "TrueDualPortALTERA";
-    case SpvDecorationBurstCoalesceALTERA: return "BurstCoalesceALTERA";
-    case SpvDecorationCacheSizeALTERA: return "CacheSizeALTERA";
-    case SpvDecorationDontStaticallyCoalesceALTERA: return "DontStaticallyCoalesceALTERA";
-    case SpvDecorationPrefetchALTERA: return "PrefetchALTERA";
-    case SpvDecorationStallEnableALTERA: return "StallEnableALTERA";
-    case SpvDecorationFuseLoopsInFunctionALTERA: return "FuseLoopsInFunctionALTERA";
-    case SpvDecorationMathOpDSPModeALTERA: return "MathOpDSPModeALTERA";
+    case SpvDecorationRegisterINTEL: return "RegisterINTEL";
+    case SpvDecorationMemoryINTEL: return "MemoryINTEL";
+    case SpvDecorationNumbanksINTEL: return "NumbanksINTEL";
+    case SpvDecorationBankwidthINTEL: return "BankwidthINTEL";
+    case SpvDecorationMaxPrivateCopiesINTEL: return "MaxPrivateCopiesINTEL";
+    case SpvDecorationSinglepumpINTEL: return "SinglepumpINTEL";
+    case SpvDecorationDoublepumpINTEL: return "DoublepumpINTEL";
+    case SpvDecorationMaxReplicatesINTEL: return "MaxReplicatesINTEL";
+    case SpvDecorationSimpleDualPortINTEL: return "SimpleDualPortINTEL";
+    case SpvDecorationMergeINTEL: return "MergeINTEL";
+    case SpvDecorationBankBitsINTEL: return "BankBitsINTEL";
+    case SpvDecorationForcePow2DepthINTEL: return "ForcePow2DepthINTEL";
+    case SpvDecorationStridesizeINTEL: return "StridesizeINTEL";
+    case SpvDecorationWordsizeINTEL: return "WordsizeINTEL";
+    case SpvDecorationTrueDualPortINTEL: return "TrueDualPortINTEL";
+    case SpvDecorationBurstCoalesceINTEL: return "BurstCoalesceINTEL";
+    case SpvDecorationCacheSizeINTEL: return "CacheSizeINTEL";
+    case SpvDecorationDontStaticallyCoalesceINTEL: return "DontStaticallyCoalesceINTEL";
+    case SpvDecorationPrefetchINTEL: return "PrefetchINTEL";
+    case SpvDecorationStallEnableINTEL: return "StallEnableINTEL";
+    case SpvDecorationFuseLoopsInFunctionINTEL: return "FuseLoopsInFunctionINTEL";
+    case SpvDecorationMathOpDSPModeINTEL: return "MathOpDSPModeINTEL";
     case SpvDecorationAliasScopeINTEL: return "AliasScopeINTEL";
     case SpvDecorationNoAliasINTEL: return "NoAliasINTEL";
-    case SpvDecorationInitiationIntervalALTERA: return "InitiationIntervalALTERA";
-    case SpvDecorationMaxConcurrencyALTERA: return "MaxConcurrencyALTERA";
-    case SpvDecorationPipelineEnableALTERA: return "PipelineEnableALTERA";
-    case SpvDecorationBufferLocationALTERA: return "BufferLocationALTERA";
-    case SpvDecorationIOPipeStorageALTERA: return "IOPipeStorageALTERA";
+    case SpvDecorationInitiationIntervalINTEL: return "InitiationIntervalINTEL";
+    case SpvDecorationMaxConcurrencyINTEL: return "MaxConcurrencyINTEL";
+    case SpvDecorationPipelineEnableINTEL: return "PipelineEnableINTEL";
+    case SpvDecorationBufferLocationINTEL: return "BufferLocationINTEL";
+    case SpvDecorationIOPipeStorageINTEL: return "IOPipeStorageINTEL";
     case SpvDecorationFunctionFloatingPointModeINTEL: return "FunctionFloatingPointModeINTEL";
     case SpvDecorationSingleElementVectorINTEL: return "SingleElementVectorINTEL";
     case SpvDecorationVectorComputeCallableFunctionINTEL: return "VectorComputeCallableFunctionINTEL";
     case SpvDecorationMediaBlockIOINTEL: return "MediaBlockIOINTEL";
-    case SpvDecorationStallFreeALTERA: return "StallFreeALTERA";
+    case SpvDecorationStallFreeINTEL: return "StallFreeINTEL";
     case SpvDecorationFPMaxErrorDecorationINTEL: return "FPMaxErrorDecorationINTEL";
-    case SpvDecorationLatencyControlLabelALTERA: return "LatencyControlLabelALTERA";
-    case SpvDecorationLatencyControlConstraintALTERA: return "LatencyControlConstraintALTERA";
-    case SpvDecorationConduitKernelArgumentALTERA: return "ConduitKernelArgumentALTERA";
-    case SpvDecorationRegisterMapKernelArgumentALTERA: return "RegisterMapKernelArgumentALTERA";
-    case SpvDecorationMMHostInterfaceAddressWidthALTERA: return "MMHostInterfaceAddressWidthALTERA";
-    case SpvDecorationMMHostInterfaceDataWidthALTERA: return "MMHostInterfaceDataWidthALTERA";
-    case SpvDecorationMMHostInterfaceLatencyALTERA: return "MMHostInterfaceLatencyALTERA";
-    case SpvDecorationMMHostInterfaceReadWriteModeALTERA: return "MMHostInterfaceReadWriteModeALTERA";
-    case SpvDecorationMMHostInterfaceMaxBurstALTERA: return "MMHostInterfaceMaxBurstALTERA";
-    case SpvDecorationMMHostInterfaceWaitRequestALTERA: return "MMHostInterfaceWaitRequestALTERA";
-    case SpvDecorationStableKernelArgumentALTERA: return "StableKernelArgumentALTERA";
+    case SpvDecorationLatencyControlLabelINTEL: return "LatencyControlLabelINTEL";
+    case SpvDecorationLatencyControlConstraintINTEL: return "LatencyControlConstraintINTEL";
+    case SpvDecorationConduitKernelArgumentINTEL: return "ConduitKernelArgumentINTEL";
+    case SpvDecorationRegisterMapKernelArgumentINTEL: return "RegisterMapKernelArgumentINTEL";
+    case SpvDecorationMMHostInterfaceAddressWidthINTEL: return "MMHostInterfaceAddressWidthINTEL";
+    case SpvDecorationMMHostInterfaceDataWidthINTEL: return "MMHostInterfaceDataWidthINTEL";
+    case SpvDecorationMMHostInterfaceLatencyINTEL: return "MMHostInterfaceLatencyINTEL";
+    case SpvDecorationMMHostInterfaceReadWriteModeINTEL: return "MMHostInterfaceReadWriteModeINTEL";
+    case SpvDecorationMMHostInterfaceMaxBurstINTEL: return "MMHostInterfaceMaxBurstINTEL";
+    case SpvDecorationMMHostInterfaceWaitRequestINTEL: return "MMHostInterfaceWaitRequestINTEL";
+    case SpvDecorationStableKernelArgumentINTEL: return "StableKernelArgumentINTEL";
     case SpvDecorationHostAccessINTEL: return "HostAccessINTEL";
-    case SpvDecorationInitModeALTERA: return "InitModeALTERA";
-    case SpvDecorationImplementInRegisterMapALTERA: return "ImplementInRegisterMapALTERA";
+    case SpvDecorationInitModeINTEL: return "InitModeINTEL";
+    case SpvDecorationImplementInRegisterMapINTEL: return "ImplementInRegisterMapINTEL";
     case SpvDecorationConditionalINTEL: return "ConditionalINTEL";
     case SpvDecorationCacheControlLoadINTEL: return "CacheControlLoadINTEL";
     case SpvDecorationCacheControlStoreINTEL: return "CacheControlStoreINTEL";
@@ -4356,7 +4147,6 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilityDisplacementMicromapNV: return "DisplacementMicromapNV";
     case SpvCapabilityRayTracingOpacityMicromapEXT: return "RayTracingOpacityMicromapEXT";
     case SpvCapabilityShaderInvocationReorderNV: return "ShaderInvocationReorderNV";
-    case SpvCapabilityShaderInvocationReorderEXT: return "ShaderInvocationReorderEXT";
     case SpvCapabilityBindlessTextureNV: return "BindlessTextureNV";
     case SpvCapabilityRayQueryPositionFetchKHR: return "RayQueryPositionFetchKHR";
     case SpvCapabilityCooperativeVectorNV: return "CooperativeVectorNV";
@@ -4365,7 +4155,6 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilityRawAccessChainsNV: return "RawAccessChainsNV";
     case SpvCapabilityRayTracingSpheresGeometryNV: return "RayTracingSpheresGeometryNV";
     case SpvCapabilityRayTracingLinearSweptSpheresGeometryNV: return "RayTracingLinearSweptSpheresGeometryNV";
-    case SpvCapabilityShader64BitIndexingEXT: return "Shader64BitIndexingEXT";
     case SpvCapabilityCooperativeMatrixReductionsNV: return "CooperativeMatrixReductionsNV";
     case SpvCapabilityCooperativeMatrixConversionsNV: return "CooperativeMatrixConversionsNV";
     case SpvCapabilityCooperativeMatrixPerElementOperationsNV: return "CooperativeMatrixPerElementOperationsNV";
@@ -4395,27 +4184,27 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilitySubgroupAvcMotionEstimationChromaINTEL: return "SubgroupAvcMotionEstimationChromaINTEL";
     case SpvCapabilityVariableLengthArrayINTEL: return "VariableLengthArrayINTEL";
     case SpvCapabilityFunctionFloatControlINTEL: return "FunctionFloatControlINTEL";
-    case SpvCapabilityFPGAMemoryAttributesALTERA: return "FPGAMemoryAttributesALTERA";
+    case SpvCapabilityFPGAMemoryAttributesINTEL: return "FPGAMemoryAttributesINTEL";
     case SpvCapabilityFPFastMathModeINTEL: return "FPFastMathModeINTEL";
-    case SpvCapabilityArbitraryPrecisionIntegersALTERA: return "ArbitraryPrecisionIntegersALTERA";
-    case SpvCapabilityArbitraryPrecisionFloatingPointALTERA: return "ArbitraryPrecisionFloatingPointALTERA";
+    case SpvCapabilityArbitraryPrecisionIntegersINTEL: return "ArbitraryPrecisionIntegersINTEL";
+    case SpvCapabilityArbitraryPrecisionFloatingPointINTEL: return "ArbitraryPrecisionFloatingPointINTEL";
     case SpvCapabilityUnstructuredLoopControlsINTEL: return "UnstructuredLoopControlsINTEL";
-    case SpvCapabilityFPGALoopControlsALTERA: return "FPGALoopControlsALTERA";
+    case SpvCapabilityFPGALoopControlsINTEL: return "FPGALoopControlsINTEL";
     case SpvCapabilityKernelAttributesINTEL: return "KernelAttributesINTEL";
     case SpvCapabilityFPGAKernelAttributesINTEL: return "FPGAKernelAttributesINTEL";
-    case SpvCapabilityFPGAMemoryAccessesALTERA: return "FPGAMemoryAccessesALTERA";
-    case SpvCapabilityFPGAClusterAttributesALTERA: return "FPGAClusterAttributesALTERA";
-    case SpvCapabilityLoopFuseALTERA: return "LoopFuseALTERA";
-    case SpvCapabilityFPGADSPControlALTERA: return "FPGADSPControlALTERA";
+    case SpvCapabilityFPGAMemoryAccessesINTEL: return "FPGAMemoryAccessesINTEL";
+    case SpvCapabilityFPGAClusterAttributesINTEL: return "FPGAClusterAttributesINTEL";
+    case SpvCapabilityLoopFuseINTEL: return "LoopFuseINTEL";
+    case SpvCapabilityFPGADSPControlINTEL: return "FPGADSPControlINTEL";
     case SpvCapabilityMemoryAccessAliasingINTEL: return "MemoryAccessAliasingINTEL";
-    case SpvCapabilityFPGAInvocationPipeliningAttributesALTERA: return "FPGAInvocationPipeliningAttributesALTERA";
-    case SpvCapabilityFPGABufferLocationALTERA: return "FPGABufferLocationALTERA";
-    case SpvCapabilityArbitraryPrecisionFixedPointALTERA: return "ArbitraryPrecisionFixedPointALTERA";
-    case SpvCapabilityUSMStorageClassesALTERA: return "USMStorageClassesALTERA";
-    case SpvCapabilityRuntimeAlignedAttributeALTERA: return "RuntimeAlignedAttributeALTERA";
-    case SpvCapabilityIOPipesALTERA: return "IOPipesALTERA";
-    case SpvCapabilityBlockingPipesALTERA: return "BlockingPipesALTERA";
-    case SpvCapabilityFPGARegALTERA: return "FPGARegALTERA";
+    case SpvCapabilityFPGAInvocationPipeliningAttributesINTEL: return "FPGAInvocationPipeliningAttributesINTEL";
+    case SpvCapabilityFPGABufferLocationINTEL: return "FPGABufferLocationINTEL";
+    case SpvCapabilityArbitraryPrecisionFixedPointINTEL: return "ArbitraryPrecisionFixedPointINTEL";
+    case SpvCapabilityUSMStorageClassesINTEL: return "USMStorageClassesINTEL";
+    case SpvCapabilityRuntimeAlignedAttributeINTEL: return "RuntimeAlignedAttributeINTEL";
+    case SpvCapabilityIOPipesINTEL: return "IOPipesINTEL";
+    case SpvCapabilityBlockingPipesINTEL: return "BlockingPipesINTEL";
+    case SpvCapabilityFPGARegINTEL: return "FPGARegINTEL";
     case SpvCapabilityDotProductInputAll: return "DotProductInputAll";
     case SpvCapabilityDotProductInput4x8Bit: return "DotProductInput4x8Bit";
     case SpvCapabilityDotProductInput4x8BitPacked: return "DotProductInput4x8BitPacked";
@@ -4426,7 +4215,6 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilityBitInstructions: return "BitInstructions";
     case SpvCapabilityGroupNonUniformRotateKHR: return "GroupNonUniformRotateKHR";
     case SpvCapabilityFloatControls2: return "FloatControls2";
-    case SpvCapabilityFMAKHR: return "FMAKHR";
     case SpvCapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT";
     case SpvCapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT";
     case SpvCapabilityLongCompositesINTEL: return "LongCompositesINTEL";
@@ -4436,14 +4224,14 @@ inline const char* SpvCapabilityToString(SpvCapability value) {
     case SpvCapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL";
     case SpvCapabilitySplitBarrierINTEL: return "SplitBarrierINTEL";
     case SpvCapabilityArithmeticFenceEXT: return "ArithmeticFenceEXT";
-    case SpvCapabilityFPGAClusterAttributesV2ALTERA: return "FPGAClusterAttributesV2ALTERA";
+    case SpvCapabilityFPGAClusterAttributesV2INTEL: return "FPGAClusterAttributesV2INTEL";
     case SpvCapabilityFPGAKernelAttributesv2INTEL: return "FPGAKernelAttributesv2INTEL";
-    case SpvCapabilityTaskSequenceALTERA: return "TaskSequenceALTERA";
+    case SpvCapabilityTaskSequenceINTEL: return "TaskSequenceINTEL";
     case SpvCapabilityFPMaxErrorINTEL: return "FPMaxErrorINTEL";
-    case SpvCapabilityFPGALatencyControlALTERA: return "FPGALatencyControlALTERA";
-    case SpvCapabilityFPGAArgumentInterfacesALTERA: return "FPGAArgumentInterfacesALTERA";
+    case SpvCapabilityFPGALatencyControlINTEL: return "FPGALatencyControlINTEL";
+    case SpvCapabilityFPGAArgumentInterfacesINTEL: return "FPGAArgumentInterfacesINTEL";
     case SpvCapabilityGlobalVariableHostAccessINTEL: return "GlobalVariableHostAccessINTEL";
-    case SpvCapabilityGlobalVariableFPGADecorationsALTERA: return "GlobalVariableFPGADecorationsALTERA";
+    case SpvCapabilityGlobalVariableFPGADecorationsINTEL: return "GlobalVariableFPGADecorationsINTEL";
     case SpvCapabilitySubgroupBufferPrefetchINTEL: return "SubgroupBufferPrefetchINTEL";
     case SpvCapabilitySubgroup2DBlockIOINTEL: return "Subgroup2DBlockIOINTEL";
     case SpvCapabilitySubgroup2DBlockTransformINTEL: return "Subgroup2DBlockTransformINTEL";
@@ -4567,8 +4355,8 @@ inline const char* SpvTensorClampModeToString(SpvTensorClampMode value) {
 
 inline const char* SpvInitializationModeQualifierToString(SpvInitializationModeQualifier value) {
     switch (value) {
-    case SpvInitializationModeQualifierInitOnDeviceReprogramALTERA: return "InitOnDeviceReprogramALTERA";
-    case SpvInitializationModeQualifierInitOnDeviceResetALTERA: return "InitOnDeviceResetALTERA";
+    case SpvInitializationModeQualifierInitOnDeviceReprogramINTEL: return "InitOnDeviceReprogramINTEL";
+    case SpvInitializationModeQualifierInitOnDeviceResetINTEL: return "InitOnDeviceResetINTEL";
     default: return "Unknown";
     }
 }
@@ -5022,7 +4810,6 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpUntypedInBoundsPtrAccessChainKHR: return "OpUntypedInBoundsPtrAccessChainKHR";
     case SpvOpUntypedArrayLengthKHR: return "OpUntypedArrayLengthKHR";
     case SpvOpUntypedPrefetchKHR: return "OpUntypedPrefetchKHR";
-    case SpvOpFmaKHR: return "OpFmaKHR";
     case SpvOpSubgroupAllKHR: return "OpSubgroupAllKHR";
     case SpvOpSubgroupAnyKHR: return "OpSubgroupAnyKHR";
     case SpvOpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
@@ -5137,36 +4924,6 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpFetchMicroTriangleVertexBarycentricNV: return "OpFetchMicroTriangleVertexBarycentricNV";
     case SpvOpCooperativeVectorLoadNV: return "OpCooperativeVectorLoadNV";
     case SpvOpCooperativeVectorStoreNV: return "OpCooperativeVectorStoreNV";
-    case SpvOpHitObjectRecordFromQueryEXT: return "OpHitObjectRecordFromQueryEXT";
-    case SpvOpHitObjectRecordMissEXT: return "OpHitObjectRecordMissEXT";
-    case SpvOpHitObjectRecordMissMotionEXT: return "OpHitObjectRecordMissMotionEXT";
-    case SpvOpHitObjectGetIntersectionTriangleVertexPositionsEXT: return "OpHitObjectGetIntersectionTriangleVertexPositionsEXT";
-    case SpvOpHitObjectGetRayFlagsEXT: return "OpHitObjectGetRayFlagsEXT";
-    case SpvOpHitObjectSetShaderBindingTableRecordIndexEXT: return "OpHitObjectSetShaderBindingTableRecordIndexEXT";
-    case SpvOpHitObjectReorderExecuteShaderEXT: return "OpHitObjectReorderExecuteShaderEXT";
-    case SpvOpHitObjectTraceReorderExecuteEXT: return "OpHitObjectTraceReorderExecuteEXT";
-    case SpvOpHitObjectTraceMotionReorderExecuteEXT: return "OpHitObjectTraceMotionReorderExecuteEXT";
-    case SpvOpTypeHitObjectEXT: return "OpTypeHitObjectEXT";
-    case SpvOpReorderThreadWithHintEXT: return "OpReorderThreadWithHintEXT";
-    case SpvOpReorderThreadWithHitObjectEXT: return "OpReorderThreadWithHitObjectEXT";
-    case SpvOpHitObjectTraceRayEXT: return "OpHitObjectTraceRayEXT";
-    case SpvOpHitObjectTraceRayMotionEXT: return "OpHitObjectTraceRayMotionEXT";
-    case SpvOpHitObjectRecordEmptyEXT: return "OpHitObjectRecordEmptyEXT";
-    case SpvOpHitObjectExecuteShaderEXT: return "OpHitObjectExecuteShaderEXT";
-    case SpvOpHitObjectGetCurrentTimeEXT: return "OpHitObjectGetCurrentTimeEXT";
-    case SpvOpHitObjectGetAttributesEXT: return "OpHitObjectGetAttributesEXT";
-    case SpvOpHitObjectGetHitKindEXT: return "OpHitObjectGetHitKindEXT";
-    case SpvOpHitObjectGetPrimitiveIndexEXT: return "OpHitObjectGetPrimitiveIndexEXT";
-    case SpvOpHitObjectGetGeometryIndexEXT: return "OpHitObjectGetGeometryIndexEXT";
-    case SpvOpHitObjectGetInstanceIdEXT: return "OpHitObjectGetInstanceIdEXT";
-    case SpvOpHitObjectGetInstanceCustomIndexEXT: return "OpHitObjectGetInstanceCustomIndexEXT";
-    case SpvOpHitObjectGetObjectRayOriginEXT: return "OpHitObjectGetObjectRayOriginEXT";
-    case SpvOpHitObjectGetObjectRayDirectionEXT: return "OpHitObjectGetObjectRayDirectionEXT";
-    case SpvOpHitObjectGetWorldRayDirectionEXT: return "OpHitObjectGetWorldRayDirectionEXT";
-    case SpvOpHitObjectGetWorldRayOriginEXT: return "OpHitObjectGetWorldRayOriginEXT";
-    case SpvOpHitObjectGetObjectToWorldEXT: return "OpHitObjectGetObjectToWorldEXT";
-    case SpvOpHitObjectGetWorldToObjectEXT: return "OpHitObjectGetWorldToObjectEXT";
-    case SpvOpHitObjectGetRayTMaxEXT: return "OpHitObjectGetRayTMaxEXT";
     case SpvOpReportIntersectionKHR: return "OpReportIntersectionKHR";
     case SpvOpIgnoreIntersectionNV: return "OpIgnoreIntersectionNV";
     case SpvOpTerminateRayNV: return "OpTerminateRayNV";
@@ -5178,12 +4935,6 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpExecuteCallableNV: return "OpExecuteCallableNV";
     case SpvOpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
     case SpvOpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
-    case SpvOpHitObjectGetRayTMinEXT: return "OpHitObjectGetRayTMinEXT";
-    case SpvOpHitObjectGetShaderBindingTableRecordIndexEXT: return "OpHitObjectGetShaderBindingTableRecordIndexEXT";
-    case SpvOpHitObjectGetShaderRecordBufferHandleEXT: return "OpHitObjectGetShaderRecordBufferHandleEXT";
-    case SpvOpHitObjectIsEmptyEXT: return "OpHitObjectIsEmptyEXT";
-    case SpvOpHitObjectIsHitEXT: return "OpHitObjectIsHitEXT";
-    case SpvOpHitObjectIsMissEXT: return "OpHitObjectIsMissEXT";
     case SpvOpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
     case SpvOpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
     case SpvOpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";
@@ -5387,24 +5138,24 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpVariableLengthArrayINTEL: return "OpVariableLengthArrayINTEL";
     case SpvOpSaveMemoryINTEL: return "OpSaveMemoryINTEL";
     case SpvOpRestoreMemoryINTEL: return "OpRestoreMemoryINTEL";
-    case SpvOpArbitraryFloatSinCosPiALTERA: return "OpArbitraryFloatSinCosPiALTERA";
-    case SpvOpArbitraryFloatCastALTERA: return "OpArbitraryFloatCastALTERA";
-    case SpvOpArbitraryFloatCastFromIntALTERA: return "OpArbitraryFloatCastFromIntALTERA";
-    case SpvOpArbitraryFloatCastToIntALTERA: return "OpArbitraryFloatCastToIntALTERA";
-    case SpvOpArbitraryFloatAddALTERA: return "OpArbitraryFloatAddALTERA";
-    case SpvOpArbitraryFloatSubALTERA: return "OpArbitraryFloatSubALTERA";
-    case SpvOpArbitraryFloatMulALTERA: return "OpArbitraryFloatMulALTERA";
-    case SpvOpArbitraryFloatDivALTERA: return "OpArbitraryFloatDivALTERA";
-    case SpvOpArbitraryFloatGTALTERA: return "OpArbitraryFloatGTALTERA";
-    case SpvOpArbitraryFloatGEALTERA: return "OpArbitraryFloatGEALTERA";
-    case SpvOpArbitraryFloatLTALTERA: return "OpArbitraryFloatLTALTERA";
-    case SpvOpArbitraryFloatLEALTERA: return "OpArbitraryFloatLEALTERA";
-    case SpvOpArbitraryFloatEQALTERA: return "OpArbitraryFloatEQALTERA";
-    case SpvOpArbitraryFloatRecipALTERA: return "OpArbitraryFloatRecipALTERA";
-    case SpvOpArbitraryFloatRSqrtALTERA: return "OpArbitraryFloatRSqrtALTERA";
-    case SpvOpArbitraryFloatCbrtALTERA: return "OpArbitraryFloatCbrtALTERA";
-    case SpvOpArbitraryFloatHypotALTERA: return "OpArbitraryFloatHypotALTERA";
-    case SpvOpArbitraryFloatSqrtALTERA: return "OpArbitraryFloatSqrtALTERA";
+    case SpvOpArbitraryFloatSinCosPiINTEL: return "OpArbitraryFloatSinCosPiINTEL";
+    case SpvOpArbitraryFloatCastINTEL: return "OpArbitraryFloatCastINTEL";
+    case SpvOpArbitraryFloatCastFromIntINTEL: return "OpArbitraryFloatCastFromIntINTEL";
+    case SpvOpArbitraryFloatCastToIntINTEL: return "OpArbitraryFloatCastToIntINTEL";
+    case SpvOpArbitraryFloatAddINTEL: return "OpArbitraryFloatAddINTEL";
+    case SpvOpArbitraryFloatSubINTEL: return "OpArbitraryFloatSubINTEL";
+    case SpvOpArbitraryFloatMulINTEL: return "OpArbitraryFloatMulINTEL";
+    case SpvOpArbitraryFloatDivINTEL: return "OpArbitraryFloatDivINTEL";
+    case SpvOpArbitraryFloatGTINTEL: return "OpArbitraryFloatGTINTEL";
+    case SpvOpArbitraryFloatGEINTEL: return "OpArbitraryFloatGEINTEL";
+    case SpvOpArbitraryFloatLTINTEL: return "OpArbitraryFloatLTINTEL";
+    case SpvOpArbitraryFloatLEINTEL: return "OpArbitraryFloatLEINTEL";
+    case SpvOpArbitraryFloatEQINTEL: return "OpArbitraryFloatEQINTEL";
+    case SpvOpArbitraryFloatRecipINTEL: return "OpArbitraryFloatRecipINTEL";
+    case SpvOpArbitraryFloatRSqrtINTEL: return "OpArbitraryFloatRSqrtINTEL";
+    case SpvOpArbitraryFloatCbrtINTEL: return "OpArbitraryFloatCbrtINTEL";
+    case SpvOpArbitraryFloatHypotINTEL: return "OpArbitraryFloatHypotINTEL";
+    case SpvOpArbitraryFloatSqrtINTEL: return "OpArbitraryFloatSqrtINTEL";
     case SpvOpArbitraryFloatLogINTEL: return "OpArbitraryFloatLogINTEL";
     case SpvOpArbitraryFloatLog2INTEL: return "OpArbitraryFloatLog2INTEL";
     case SpvOpArbitraryFloatLog10INTEL: return "OpArbitraryFloatLog10INTEL";
@@ -5432,22 +5183,22 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpAliasDomainDeclINTEL: return "OpAliasDomainDeclINTEL";
     case SpvOpAliasScopeDeclINTEL: return "OpAliasScopeDeclINTEL";
     case SpvOpAliasScopeListDeclINTEL: return "OpAliasScopeListDeclINTEL";
-    case SpvOpFixedSqrtALTERA: return "OpFixedSqrtALTERA";
-    case SpvOpFixedRecipALTERA: return "OpFixedRecipALTERA";
-    case SpvOpFixedRsqrtALTERA: return "OpFixedRsqrtALTERA";
-    case SpvOpFixedSinALTERA: return "OpFixedSinALTERA";
-    case SpvOpFixedCosALTERA: return "OpFixedCosALTERA";
-    case SpvOpFixedSinCosALTERA: return "OpFixedSinCosALTERA";
-    case SpvOpFixedSinPiALTERA: return "OpFixedSinPiALTERA";
-    case SpvOpFixedCosPiALTERA: return "OpFixedCosPiALTERA";
-    case SpvOpFixedSinCosPiALTERA: return "OpFixedSinCosPiALTERA";
-    case SpvOpFixedLogALTERA: return "OpFixedLogALTERA";
-    case SpvOpFixedExpALTERA: return "OpFixedExpALTERA";
-    case SpvOpPtrCastToCrossWorkgroupALTERA: return "OpPtrCastToCrossWorkgroupALTERA";
-    case SpvOpCrossWorkgroupCastToPtrALTERA: return "OpCrossWorkgroupCastToPtrALTERA";
-    case SpvOpReadPipeBlockingALTERA: return "OpReadPipeBlockingALTERA";
-    case SpvOpWritePipeBlockingALTERA: return "OpWritePipeBlockingALTERA";
-    case SpvOpFPGARegALTERA: return "OpFPGARegALTERA";
+    case SpvOpFixedSqrtINTEL: return "OpFixedSqrtINTEL";
+    case SpvOpFixedRecipINTEL: return "OpFixedRecipINTEL";
+    case SpvOpFixedRsqrtINTEL: return "OpFixedRsqrtINTEL";
+    case SpvOpFixedSinINTEL: return "OpFixedSinINTEL";
+    case SpvOpFixedCosINTEL: return "OpFixedCosINTEL";
+    case SpvOpFixedSinCosINTEL: return "OpFixedSinCosINTEL";
+    case SpvOpFixedSinPiINTEL: return "OpFixedSinPiINTEL";
+    case SpvOpFixedCosPiINTEL: return "OpFixedCosPiINTEL";
+    case SpvOpFixedSinCosPiINTEL: return "OpFixedSinCosPiINTEL";
+    case SpvOpFixedLogINTEL: return "OpFixedLogINTEL";
+    case SpvOpFixedExpINTEL: return "OpFixedExpINTEL";
+    case SpvOpPtrCastToCrossWorkgroupINTEL: return "OpPtrCastToCrossWorkgroupINTEL";
+    case SpvOpCrossWorkgroupCastToPtrINTEL: return "OpCrossWorkgroupCastToPtrINTEL";
+    case SpvOpReadPipeBlockingINTEL: return "OpReadPipeBlockingINTEL";
+    case SpvOpWritePipeBlockingINTEL: return "OpWritePipeBlockingINTEL";
+    case SpvOpFPGARegINTEL: return "OpFPGARegINTEL";
     case SpvOpRayQueryGetRayTMinKHR: return "OpRayQueryGetRayTMinKHR";
     case SpvOpRayQueryGetRayFlagsKHR: return "OpRayQueryGetRayFlagsKHR";
     case SpvOpRayQueryGetIntersectionTKHR: return "OpRayQueryGetIntersectionTKHR";
@@ -5476,11 +5227,11 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpControlBarrierArriveINTEL: return "OpControlBarrierArriveINTEL";
     case SpvOpControlBarrierWaitINTEL: return "OpControlBarrierWaitINTEL";
     case SpvOpArithmeticFenceEXT: return "OpArithmeticFenceEXT";
-    case SpvOpTaskSequenceCreateALTERA: return "OpTaskSequenceCreateALTERA";
-    case SpvOpTaskSequenceAsyncALTERA: return "OpTaskSequenceAsyncALTERA";
-    case SpvOpTaskSequenceGetALTERA: return "OpTaskSequenceGetALTERA";
-    case SpvOpTaskSequenceReleaseALTERA: return "OpTaskSequenceReleaseALTERA";
-    case SpvOpTypeTaskSequenceALTERA: return "OpTypeTaskSequenceALTERA";
+    case SpvOpTaskSequenceCreateINTEL: return "OpTaskSequenceCreateINTEL";
+    case SpvOpTaskSequenceAsyncINTEL: return "OpTaskSequenceAsyncINTEL";
+    case SpvOpTaskSequenceGetINTEL: return "OpTaskSequenceGetINTEL";
+    case SpvOpTaskSequenceReleaseINTEL: return "OpTaskSequenceReleaseINTEL";
+    case SpvOpTypeTaskSequenceINTEL: return "OpTypeTaskSequenceINTEL";
     case SpvOpSubgroupBlockPrefetchINTEL: return "OpSubgroupBlockPrefetchINTEL";
     case SpvOpSubgroup2DBlockLoadINTEL: return "OpSubgroup2DBlockLoadINTEL";
     case SpvOpSubgroup2DBlockLoadTransformINTEL: return "OpSubgroup2DBlockLoadTransformINTEL";
diff --git a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp b/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp
index 7da782df..b89d4bc5 100644
--- a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp
+++ b/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp
@@ -191,7 +191,6 @@ enum ExecutionMode {
     ExecutionModeSampleInterlockUnorderedEXT = 5369,
     ExecutionModeShadingRateInterlockOrderedEXT = 5370,
     ExecutionModeShadingRateInterlockUnorderedEXT = 5371,
-    ExecutionModeShader64BitIndexingEXT = 5427,
     ExecutionModeSharedLocalMemorySizeINTEL = 5618,
     ExecutionModeRoundingModeRTPINTEL = 5620,
     ExecutionModeRoundingModeRTNINTEL = 5621,
@@ -246,11 +245,8 @@ enum StorageClass {
     StorageClassPhysicalStorageBufferEXT = 5349,
     StorageClassHitObjectAttributeNV = 5385,
     StorageClassTaskPayloadWorkgroupEXT = 5402,
-    StorageClassHitObjectAttributeEXT = 5411,
     StorageClassCodeSectionINTEL = 5605,
-    StorageClassDeviceOnlyALTERA = 5936,
     StorageClassDeviceOnlyINTEL = 5936,
-    StorageClassHostOnlyALTERA = 5937,
     StorageClassHostOnlyINTEL = 5937,
     StorageClassMax = 0x7fffffff,
 };
@@ -489,7 +485,6 @@ enum FunctionParameterAttribute {
     FunctionParameterAttributeNoCapture = 5,
     FunctionParameterAttributeNoWrite = 6,
     FunctionParameterAttributeNoReadWrite = 7,
-    FunctionParameterAttributeRuntimeAlignedALTERA = 5940,
     FunctionParameterAttributeRuntimeAlignedINTEL = 5940,
     FunctionParameterAttributeMax = 0x7fffffff,
 };
@@ -574,7 +569,6 @@ enum Decoration {
     DecorationAliasedPointer = 5356,
     DecorationAliasedPointerEXT = 5356,
     DecorationHitObjectShaderRecordBufferNV = 5386,
-    DecorationHitObjectShaderRecordBufferEXT = 5389,
     DecorationBindlessSamplerNV = 5398,
     DecorationBindlessImageNV = 5399,
     DecorationBoundSamplerNV = 5400,
@@ -595,95 +589,54 @@ enum Decoration {
     DecorationUserTypeGOOGLE = 5636,
     DecorationFunctionRoundingModeINTEL = 5822,
     DecorationFunctionDenormModeINTEL = 5823,
-    DecorationRegisterALTERA = 5825,
     DecorationRegisterINTEL = 5825,
-    DecorationMemoryALTERA = 5826,
     DecorationMemoryINTEL = 5826,
-    DecorationNumbanksALTERA = 5827,
     DecorationNumbanksINTEL = 5827,
-    DecorationBankwidthALTERA = 5828,
     DecorationBankwidthINTEL = 5828,
-    DecorationMaxPrivateCopiesALTERA = 5829,
     DecorationMaxPrivateCopiesINTEL = 5829,
-    DecorationSinglepumpALTERA = 5830,
     DecorationSinglepumpINTEL = 5830,
-    DecorationDoublepumpALTERA = 5831,
     DecorationDoublepumpINTEL = 5831,
-    DecorationMaxReplicatesALTERA = 5832,
     DecorationMaxReplicatesINTEL = 5832,
-    DecorationSimpleDualPortALTERA = 5833,
     DecorationSimpleDualPortINTEL = 5833,
-    DecorationMergeALTERA = 5834,
     DecorationMergeINTEL = 5834,
-    DecorationBankBitsALTERA = 5835,
     DecorationBankBitsINTEL = 5835,
-    DecorationForcePow2DepthALTERA = 5836,
     DecorationForcePow2DepthINTEL = 5836,
-    DecorationStridesizeALTERA = 5883,
     DecorationStridesizeINTEL = 5883,
-    DecorationWordsizeALTERA = 5884,
     DecorationWordsizeINTEL = 5884,
-    DecorationTrueDualPortALTERA = 5885,
     DecorationTrueDualPortINTEL = 5885,
-    DecorationBurstCoalesceALTERA = 5899,
     DecorationBurstCoalesceINTEL = 5899,
-    DecorationCacheSizeALTERA = 5900,
     DecorationCacheSizeINTEL = 5900,
-    DecorationDontStaticallyCoalesceALTERA = 5901,
     DecorationDontStaticallyCoalesceINTEL = 5901,
-    DecorationPrefetchALTERA = 5902,
     DecorationPrefetchINTEL = 5902,
-    DecorationStallEnableALTERA = 5905,
     DecorationStallEnableINTEL = 5905,
-    DecorationFuseLoopsInFunctionALTERA = 5907,
     DecorationFuseLoopsInFunctionINTEL = 5907,
-    DecorationMathOpDSPModeALTERA = 5909,
     DecorationMathOpDSPModeINTEL = 5909,
     DecorationAliasScopeINTEL = 5914,
     DecorationNoAliasINTEL = 5915,
-    DecorationInitiationIntervalALTERA = 5917,
     DecorationInitiationIntervalINTEL = 5917,
-    DecorationMaxConcurrencyALTERA = 5918,
     DecorationMaxConcurrencyINTEL = 5918,
-    DecorationPipelineEnableALTERA = 5919,
     DecorationPipelineEnableINTEL = 5919,
-    DecorationBufferLocationALTERA = 5921,
     DecorationBufferLocationINTEL = 5921,
-    DecorationIOPipeStorageALTERA = 5944,
     DecorationIOPipeStorageINTEL = 5944,
     DecorationFunctionFloatingPointModeINTEL = 6080,
     DecorationSingleElementVectorINTEL = 6085,
     DecorationVectorComputeCallableFunctionINTEL = 6087,
     DecorationMediaBlockIOINTEL = 6140,
-    DecorationStallFreeALTERA = 6151,
     DecorationStallFreeINTEL = 6151,
     DecorationFPMaxErrorDecorationINTEL = 6170,
-    DecorationLatencyControlLabelALTERA = 6172,
     DecorationLatencyControlLabelINTEL = 6172,
-    DecorationLatencyControlConstraintALTERA = 6173,
     DecorationLatencyControlConstraintINTEL = 6173,
-    DecorationConduitKernelArgumentALTERA = 6175,
     DecorationConduitKernelArgumentINTEL = 6175,
-    DecorationRegisterMapKernelArgumentALTERA = 6176,
     DecorationRegisterMapKernelArgumentINTEL = 6176,
-    DecorationMMHostInterfaceAddressWidthALTERA = 6177,
     DecorationMMHostInterfaceAddressWidthINTEL = 6177,
-    DecorationMMHostInterfaceDataWidthALTERA = 6178,
     DecorationMMHostInterfaceDataWidthINTEL = 6178,
-    DecorationMMHostInterfaceLatencyALTERA = 6179,
     DecorationMMHostInterfaceLatencyINTEL = 6179,
-    DecorationMMHostInterfaceReadWriteModeALTERA = 6180,
     DecorationMMHostInterfaceReadWriteModeINTEL = 6180,
-    DecorationMMHostInterfaceMaxBurstALTERA = 6181,
     DecorationMMHostInterfaceMaxBurstINTEL = 6181,
-    DecorationMMHostInterfaceWaitRequestALTERA = 6182,
     DecorationMMHostInterfaceWaitRequestINTEL = 6182,
-    DecorationStableKernelArgumentALTERA = 6183,
     DecorationStableKernelArgumentINTEL = 6183,
     DecorationHostAccessINTEL = 6188,
-    DecorationInitModeALTERA = 6190,
     DecorationInitModeINTEL = 6190,
-    DecorationImplementInRegisterMapALTERA = 6191,
     DecorationImplementInRegisterMapINTEL = 6191,
     DecorationConditionalINTEL = 6247,
     DecorationCacheControlLoadINTEL = 6442,
@@ -865,25 +818,15 @@ enum LoopControlShift {
     LoopControlIterationMultipleShift = 6,
     LoopControlPeelCountShift = 7,
     LoopControlPartialCountShift = 8,
-    LoopControlInitiationIntervalALTERAShift = 16,
     LoopControlInitiationIntervalINTELShift = 16,
-    LoopControlMaxConcurrencyALTERAShift = 17,
     LoopControlMaxConcurrencyINTELShift = 17,
-    LoopControlDependencyArrayALTERAShift = 18,
     LoopControlDependencyArrayINTELShift = 18,
-    LoopControlPipelineEnableALTERAShift = 19,
     LoopControlPipelineEnableINTELShift = 19,
-    LoopControlLoopCoalesceALTERAShift = 20,
     LoopControlLoopCoalesceINTELShift = 20,
-    LoopControlMaxInterleavingALTERAShift = 21,
     LoopControlMaxInterleavingINTELShift = 21,
-    LoopControlSpeculatedIterationsALTERAShift = 22,
     LoopControlSpeculatedIterationsINTELShift = 22,
-    LoopControlNoFusionALTERAShift = 23,
     LoopControlNoFusionINTELShift = 23,
-    LoopControlLoopCountALTERAShift = 24,
     LoopControlLoopCountINTELShift = 24,
-    LoopControlMaxReinvocationDelayALTERAShift = 25,
     LoopControlMaxReinvocationDelayINTELShift = 25,
     LoopControlMax = 0x7fffffff,
 };
@@ -899,25 +842,15 @@ enum LoopControlMask {
     LoopControlIterationMultipleMask = 0x00000040,
     LoopControlPeelCountMask = 0x00000080,
     LoopControlPartialCountMask = 0x00000100,
-    LoopControlInitiationIntervalALTERAMask = 0x00010000,
     LoopControlInitiationIntervalINTELMask = 0x00010000,
-    LoopControlMaxConcurrencyALTERAMask = 0x00020000,
     LoopControlMaxConcurrencyINTELMask = 0x00020000,
-    LoopControlDependencyArrayALTERAMask = 0x00040000,
     LoopControlDependencyArrayINTELMask = 0x00040000,
-    LoopControlPipelineEnableALTERAMask = 0x00080000,
     LoopControlPipelineEnableINTELMask = 0x00080000,
-    LoopControlLoopCoalesceALTERAMask = 0x00100000,
     LoopControlLoopCoalesceINTELMask = 0x00100000,
-    LoopControlMaxInterleavingALTERAMask = 0x00200000,
     LoopControlMaxInterleavingINTELMask = 0x00200000,
-    LoopControlSpeculatedIterationsALTERAMask = 0x00400000,
     LoopControlSpeculatedIterationsINTELMask = 0x00400000,
-    LoopControlNoFusionALTERAMask = 0x00800000,
     LoopControlNoFusionINTELMask = 0x00800000,
-    LoopControlLoopCountALTERAMask = 0x01000000,
     LoopControlLoopCountINTELMask = 0x01000000,
-    LoopControlMaxReinvocationDelayALTERAMask = 0x02000000,
     LoopControlMaxReinvocationDelayINTELMask = 0x02000000,
 };
 
@@ -1251,7 +1184,6 @@ enum Capability {
     CapabilityDisplacementMicromapNV = 5380,
     CapabilityRayTracingOpacityMicromapEXT = 5381,
     CapabilityShaderInvocationReorderNV = 5383,
-    CapabilityShaderInvocationReorderEXT = 5388,
     CapabilityBindlessTextureNV = 5390,
     CapabilityRayQueryPositionFetchKHR = 5391,
     CapabilityCooperativeVectorNV = 5394,
@@ -1260,7 +1192,6 @@ enum Capability {
     CapabilityRawAccessChainsNV = 5414,
     CapabilityRayTracingSpheresGeometryNV = 5418,
     CapabilityRayTracingLinearSweptSpheresGeometryNV = 5419,
-    CapabilityShader64BitIndexingEXT = 5426,
     CapabilityCooperativeMatrixReductionsNV = 5430,
     CapabilityCooperativeMatrixConversionsNV = 5431,
     CapabilityCooperativeMatrixPerElementOperationsNV = 5432,
@@ -1290,42 +1221,26 @@ enum Capability {
     CapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698,
     CapabilityVariableLengthArrayINTEL = 5817,
     CapabilityFunctionFloatControlINTEL = 5821,
-    CapabilityFPGAMemoryAttributesALTERA = 5824,
     CapabilityFPGAMemoryAttributesINTEL = 5824,
     CapabilityFPFastMathModeINTEL = 5837,
-    CapabilityArbitraryPrecisionIntegersALTERA = 5844,
     CapabilityArbitraryPrecisionIntegersINTEL = 5844,
-    CapabilityArbitraryPrecisionFloatingPointALTERA = 5845,
     CapabilityArbitraryPrecisionFloatingPointINTEL = 5845,
     CapabilityUnstructuredLoopControlsINTEL = 5886,
-    CapabilityFPGALoopControlsALTERA = 5888,
     CapabilityFPGALoopControlsINTEL = 5888,
     CapabilityKernelAttributesINTEL = 5892,
     CapabilityFPGAKernelAttributesINTEL = 5897,
-    CapabilityFPGAMemoryAccessesALTERA = 5898,
     CapabilityFPGAMemoryAccessesINTEL = 5898,
-    CapabilityFPGAClusterAttributesALTERA = 5904,
     CapabilityFPGAClusterAttributesINTEL = 5904,
-    CapabilityLoopFuseALTERA = 5906,
     CapabilityLoopFuseINTEL = 5906,
-    CapabilityFPGADSPControlALTERA = 5908,
     CapabilityFPGADSPControlINTEL = 5908,
     CapabilityMemoryAccessAliasingINTEL = 5910,
-    CapabilityFPGAInvocationPipeliningAttributesALTERA = 5916,
     CapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
-    CapabilityFPGABufferLocationALTERA = 5920,
     CapabilityFPGABufferLocationINTEL = 5920,
-    CapabilityArbitraryPrecisionFixedPointALTERA = 5922,
     CapabilityArbitraryPrecisionFixedPointINTEL = 5922,
-    CapabilityUSMStorageClassesALTERA = 5935,
     CapabilityUSMStorageClassesINTEL = 5935,
-    CapabilityRuntimeAlignedAttributeALTERA = 5939,
     CapabilityRuntimeAlignedAttributeINTEL = 5939,
-    CapabilityIOPipesALTERA = 5943,
     CapabilityIOPipesINTEL = 5943,
-    CapabilityBlockingPipesALTERA = 5945,
     CapabilityBlockingPipesINTEL = 5945,
-    CapabilityFPGARegALTERA = 5948,
     CapabilityFPGARegINTEL = 5948,
     CapabilityDotProductInputAll = 6016,
     CapabilityDotProductInputAllKHR = 6016,
@@ -1341,7 +1256,6 @@ enum Capability {
     CapabilityBitInstructions = 6025,
     CapabilityGroupNonUniformRotateKHR = 6026,
     CapabilityFloatControls2 = 6029,
-    CapabilityFMAKHR = 6030,
     CapabilityAtomicFloat32AddEXT = 6033,
     CapabilityAtomicFloat64AddEXT = 6034,
     CapabilityLongCompositesINTEL = 6089,
@@ -1352,18 +1266,13 @@ enum Capability {
     CapabilityBFloat16ConversionINTEL = 6115,
     CapabilitySplitBarrierINTEL = 6141,
     CapabilityArithmeticFenceEXT = 6144,
-    CapabilityFPGAClusterAttributesV2ALTERA = 6150,
     CapabilityFPGAClusterAttributesV2INTEL = 6150,
     CapabilityFPGAKernelAttributesv2INTEL = 6161,
-    CapabilityTaskSequenceALTERA = 6162,
     CapabilityTaskSequenceINTEL = 6162,
     CapabilityFPMaxErrorINTEL = 6169,
-    CapabilityFPGALatencyControlALTERA = 6171,
     CapabilityFPGALatencyControlINTEL = 6171,
-    CapabilityFPGAArgumentInterfacesALTERA = 6174,
     CapabilityFPGAArgumentInterfacesINTEL = 6174,
     CapabilityGlobalVariableHostAccessINTEL = 6187,
-    CapabilityGlobalVariableFPGADecorationsALTERA = 6189,
     CapabilityGlobalVariableFPGADecorationsINTEL = 6189,
     CapabilitySubgroupBufferPrefetchINTEL = 6220,
     CapabilitySubgroup2DBlockIOINTEL = 6228,
@@ -1575,9 +1484,7 @@ enum TensorOperandsMask {
 };
 
 enum InitializationModeQualifier {
-    InitializationModeQualifierInitOnDeviceReprogramALTERA = 0,
     InitializationModeQualifierInitOnDeviceReprogramINTEL = 0,
-    InitializationModeQualifierInitOnDeviceResetALTERA = 1,
     InitializationModeQualifierInitOnDeviceResetINTEL = 1,
     InitializationModeQualifierMax = 0x7fffffff,
 };
@@ -2064,7 +1971,6 @@ enum Op {
     OpUntypedInBoundsPtrAccessChainKHR = 4424,
     OpUntypedArrayLengthKHR = 4425,
     OpUntypedPrefetchKHR = 4426,
-    OpFmaKHR = 4427,
     OpSubgroupAllKHR = 4428,
     OpSubgroupAnyKHR = 4429,
     OpSubgroupAllEqualKHR = 4430,
@@ -2185,36 +2091,6 @@ enum Op {
     OpFetchMicroTriangleVertexBarycentricNV = 5301,
     OpCooperativeVectorLoadNV = 5302,
     OpCooperativeVectorStoreNV = 5303,
-    OpHitObjectRecordFromQueryEXT = 5304,
-    OpHitObjectRecordMissEXT = 5305,
-    OpHitObjectRecordMissMotionEXT = 5306,
-    OpHitObjectGetIntersectionTriangleVertexPositionsEXT = 5307,
-    OpHitObjectGetRayFlagsEXT = 5308,
-    OpHitObjectSetShaderBindingTableRecordIndexEXT = 5309,
-    OpHitObjectReorderExecuteShaderEXT = 5310,
-    OpHitObjectTraceReorderExecuteEXT = 5311,
-    OpHitObjectTraceMotionReorderExecuteEXT = 5312,
-    OpTypeHitObjectEXT = 5313,
-    OpReorderThreadWithHintEXT = 5314,
-    OpReorderThreadWithHitObjectEXT = 5315,
-    OpHitObjectTraceRayEXT = 5316,
-    OpHitObjectTraceRayMotionEXT = 5317,
-    OpHitObjectRecordEmptyEXT = 5318,
-    OpHitObjectExecuteShaderEXT = 5319,
-    OpHitObjectGetCurrentTimeEXT = 5320,
-    OpHitObjectGetAttributesEXT = 5321,
-    OpHitObjectGetHitKindEXT = 5322,
-    OpHitObjectGetPrimitiveIndexEXT = 5323,
-    OpHitObjectGetGeometryIndexEXT = 5324,
-    OpHitObjectGetInstanceIdEXT = 5325,
-    OpHitObjectGetInstanceCustomIndexEXT = 5326,
-    OpHitObjectGetObjectRayOriginEXT = 5327,
-    OpHitObjectGetObjectRayDirectionEXT = 5328,
-    OpHitObjectGetWorldRayDirectionEXT = 5329,
-    OpHitObjectGetWorldRayOriginEXT = 5330,
-    OpHitObjectGetObjectToWorldEXT = 5331,
-    OpHitObjectGetWorldToObjectEXT = 5332,
-    OpHitObjectGetRayTMaxEXT = 5333,
     OpReportIntersectionKHR = 5334,
     OpReportIntersectionNV = 5334,
     OpIgnoreIntersectionNV = 5335,
@@ -2229,12 +2105,6 @@ enum Op {
     OpRayQueryGetClusterIdNV = 5345,
     OpRayQueryGetIntersectionClusterIdNV = 5345,
     OpHitObjectGetClusterIdNV = 5346,
-    OpHitObjectGetRayTMinEXT = 5347,
-    OpHitObjectGetShaderBindingTableRecordIndexEXT = 5348,
-    OpHitObjectGetShaderRecordBufferHandleEXT = 5349,
-    OpHitObjectIsEmptyEXT = 5350,
-    OpHitObjectIsHitEXT = 5351,
-    OpHitObjectIsMissEXT = 5352,
     OpTypeCooperativeMatrixNV = 5358,
     OpCooperativeMatrixLoadNV = 5359,
     OpCooperativeMatrixStoreNV = 5360,
@@ -2441,41 +2311,23 @@ enum Op {
     OpVariableLengthArrayINTEL = 5818,
     OpSaveMemoryINTEL = 5819,
     OpRestoreMemoryINTEL = 5820,
-    OpArbitraryFloatSinCosPiALTERA = 5840,
     OpArbitraryFloatSinCosPiINTEL = 5840,
-    OpArbitraryFloatCastALTERA = 5841,
     OpArbitraryFloatCastINTEL = 5841,
-    OpArbitraryFloatCastFromIntALTERA = 5842,
     OpArbitraryFloatCastFromIntINTEL = 5842,
-    OpArbitraryFloatCastToIntALTERA = 5843,
     OpArbitraryFloatCastToIntINTEL = 5843,
-    OpArbitraryFloatAddALTERA = 5846,
     OpArbitraryFloatAddINTEL = 5846,
-    OpArbitraryFloatSubALTERA = 5847,
     OpArbitraryFloatSubINTEL = 5847,
-    OpArbitraryFloatMulALTERA = 5848,
     OpArbitraryFloatMulINTEL = 5848,
-    OpArbitraryFloatDivALTERA = 5849,
     OpArbitraryFloatDivINTEL = 5849,
-    OpArbitraryFloatGTALTERA = 5850,
     OpArbitraryFloatGTINTEL = 5850,
-    OpArbitraryFloatGEALTERA = 5851,
     OpArbitraryFloatGEINTEL = 5851,
-    OpArbitraryFloatLTALTERA = 5852,
     OpArbitraryFloatLTINTEL = 5852,
-    OpArbitraryFloatLEALTERA = 5853,
     OpArbitraryFloatLEINTEL = 5853,
-    OpArbitraryFloatEQALTERA = 5854,
     OpArbitraryFloatEQINTEL = 5854,
-    OpArbitraryFloatRecipALTERA = 5855,
     OpArbitraryFloatRecipINTEL = 5855,
-    OpArbitraryFloatRSqrtALTERA = 5856,
     OpArbitraryFloatRSqrtINTEL = 5856,
-    OpArbitraryFloatCbrtALTERA = 5857,
     OpArbitraryFloatCbrtINTEL = 5857,
-    OpArbitraryFloatHypotALTERA = 5858,
     OpArbitraryFloatHypotINTEL = 5858,
-    OpArbitraryFloatSqrtALTERA = 5859,
     OpArbitraryFloatSqrtINTEL = 5859,
     OpArbitraryFloatLogINTEL = 5860,
     OpArbitraryFloatLog2INTEL = 5861,
@@ -2504,37 +2356,21 @@ enum Op {
     OpAliasDomainDeclINTEL = 5911,
     OpAliasScopeDeclINTEL = 5912,
     OpAliasScopeListDeclINTEL = 5913,
-    OpFixedSqrtALTERA = 5923,
     OpFixedSqrtINTEL = 5923,
-    OpFixedRecipALTERA = 5924,
     OpFixedRecipINTEL = 5924,
-    OpFixedRsqrtALTERA = 5925,
     OpFixedRsqrtINTEL = 5925,
-    OpFixedSinALTERA = 5926,
     OpFixedSinINTEL = 5926,
-    OpFixedCosALTERA = 5927,
     OpFixedCosINTEL = 5927,
-    OpFixedSinCosALTERA = 5928,
     OpFixedSinCosINTEL = 5928,
-    OpFixedSinPiALTERA = 5929,
     OpFixedSinPiINTEL = 5929,
-    OpFixedCosPiALTERA = 5930,
     OpFixedCosPiINTEL = 5930,
-    OpFixedSinCosPiALTERA = 5931,
     OpFixedSinCosPiINTEL = 5931,
-    OpFixedLogALTERA = 5932,
     OpFixedLogINTEL = 5932,
-    OpFixedExpALTERA = 5933,
     OpFixedExpINTEL = 5933,
-    OpPtrCastToCrossWorkgroupALTERA = 5934,
     OpPtrCastToCrossWorkgroupINTEL = 5934,
-    OpCrossWorkgroupCastToPtrALTERA = 5938,
     OpCrossWorkgroupCastToPtrINTEL = 5938,
-    OpReadPipeBlockingALTERA = 5946,
     OpReadPipeBlockingINTEL = 5946,
-    OpWritePipeBlockingALTERA = 5947,
     OpWritePipeBlockingINTEL = 5947,
-    OpFPGARegALTERA = 5949,
     OpFPGARegINTEL = 5949,
     OpRayQueryGetRayTMinKHR = 6016,
     OpRayQueryGetRayFlagsKHR = 6017,
@@ -2564,15 +2400,10 @@ enum Op {
     OpControlBarrierArriveINTEL = 6142,
     OpControlBarrierWaitINTEL = 6143,
     OpArithmeticFenceEXT = 6145,
-    OpTaskSequenceCreateALTERA = 6163,
     OpTaskSequenceCreateINTEL = 6163,
-    OpTaskSequenceAsyncALTERA = 6164,
     OpTaskSequenceAsyncINTEL = 6164,
-    OpTaskSequenceGetALTERA = 6165,
     OpTaskSequenceGetINTEL = 6165,
-    OpTaskSequenceReleaseALTERA = 6166,
     OpTaskSequenceReleaseINTEL = 6166,
-    OpTypeTaskSequenceALTERA = 6199,
     OpTypeTaskSequenceINTEL = 6199,
     OpSubgroupBlockPrefetchINTEL = 6221,
     OpSubgroup2DBlockLoadINTEL = 6231,
@@ -2984,7 +2815,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpUntypedInBoundsPtrAccessChainKHR: *hasResult = true; *hasResultType = true; break;
     case OpUntypedArrayLengthKHR: *hasResult = true; *hasResultType = true; break;
     case OpUntypedPrefetchKHR: *hasResult = false; *hasResultType = false; break;
-    case OpFmaKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
@@ -3099,36 +2929,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpFetchMicroTriangleVertexBarycentricNV: *hasResult = true; *hasResultType = true; break;
     case OpCooperativeVectorLoadNV: *hasResult = true; *hasResultType = true; break;
     case OpCooperativeVectorStoreNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordFromQueryEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordMissEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordMissMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetIntersectionTriangleVertexPositionsEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetRayFlagsEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectSetShaderBindingTableRecordIndexEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectReorderExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectTraceReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectTraceMotionReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case OpTypeHitObjectEXT: *hasResult = true; *hasResultType = false; break;
-    case OpReorderThreadWithHintEXT: *hasResult = false; *hasResultType = false; break;
-    case OpReorderThreadWithHitObjectEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectTraceRayEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectTraceRayMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordEmptyEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetCurrentTimeEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetAttributesEXT: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetHitKindEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetPrimitiveIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetGeometryIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetInstanceIdEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetInstanceCustomIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetWorldRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetWorldRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectToWorldEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetWorldToObjectEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetRayTMaxEXT: *hasResult = true; *hasResultType = true; break;
     case OpReportIntersectionKHR: *hasResult = true; *hasResultType = true; break;
     case OpIgnoreIntersectionNV: *hasResult = false; *hasResultType = false; break;
     case OpTerminateRayNV: *hasResult = false; *hasResultType = false; break;
@@ -3140,12 +2940,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
     case OpRayQueryGetIntersectionClusterIdNV: *hasResult = true; *hasResultType = true; break;
     case OpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetRayTMinEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetShaderBindingTableRecordIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetShaderRecordBufferHandleEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsEmptyEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsHitEXT: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsMissEXT: *hasResult = true; *hasResultType = true; break;
     case OpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
     case OpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
     case OpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
@@ -3349,24 +3143,24 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpVariableLengthArrayINTEL: *hasResult = true; *hasResultType = true; break;
     case OpSaveMemoryINTEL: *hasResult = true; *hasResultType = true; break;
     case OpRestoreMemoryINTEL: *hasResult = false; *hasResultType = false; break;
-    case OpArbitraryFloatSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatCastALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatCastFromIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatCastToIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatAddALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatSubALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatMulALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatDivALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatGTALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatGEALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatLTALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatLEALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatEQALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatRSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatCbrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatHypotALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpArbitraryFloatSqrtALTERA: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatSinCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatCastINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatCastFromIntINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatCastToIntINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatAddINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatSubINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatMulINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatDivINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatGTINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatGEINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatLTINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatLEINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatEQINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatRecipINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatRSqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatCbrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatHypotINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpArbitraryFloatSqrtINTEL: *hasResult = true; *hasResultType = true; break;
     case OpArbitraryFloatLogINTEL: *hasResult = true; *hasResultType = true; break;
     case OpArbitraryFloatLog2INTEL: *hasResult = true; *hasResultType = true; break;
     case OpArbitraryFloatLog10INTEL: *hasResult = true; *hasResultType = true; break;
@@ -3394,22 +3188,22 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpAliasDomainDeclINTEL: *hasResult = true; *hasResultType = false; break;
     case OpAliasScopeDeclINTEL: *hasResult = true; *hasResultType = false; break;
     case OpAliasScopeListDeclINTEL: *hasResult = true; *hasResultType = false; break;
-    case OpFixedSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedRsqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedSinALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedSinCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedSinPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedLogALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFixedExpALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpPtrCastToCrossWorkgroupALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpCrossWorkgroupCastToPtrALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpReadPipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpWritePipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpFPGARegALTERA: *hasResult = true; *hasResultType = true; break;
+    case OpFixedSqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedRecipINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedRsqrtINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedSinINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedCosINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedSinCosINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedSinPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedSinCosPiINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedLogINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFixedExpINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpPtrCastToCrossWorkgroupINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpCrossWorkgroupCastToPtrINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpReadPipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpWritePipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpFPGARegINTEL: *hasResult = true; *hasResultType = true; break;
     case OpRayQueryGetRayTMinKHR: *hasResult = true; *hasResultType = true; break;
     case OpRayQueryGetRayFlagsKHR: *hasResult = true; *hasResultType = true; break;
     case OpRayQueryGetIntersectionTKHR: *hasResult = true; *hasResultType = true; break;
@@ -3438,11 +3232,11 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
     case OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
     case OpArithmeticFenceEXT: *hasResult = true; *hasResultType = true; break;
-    case OpTaskSequenceCreateALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpTaskSequenceAsyncALTERA: *hasResult = false; *hasResultType = false; break;
-    case OpTaskSequenceGetALTERA: *hasResult = true; *hasResultType = true; break;
-    case OpTaskSequenceReleaseALTERA: *hasResult = false; *hasResultType = false; break;
-    case OpTypeTaskSequenceALTERA: *hasResult = true; *hasResultType = false; break;
+    case OpTaskSequenceCreateINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpTaskSequenceAsyncINTEL: *hasResult = false; *hasResultType = false; break;
+    case OpTaskSequenceGetINTEL: *hasResult = true; *hasResultType = true; break;
+    case OpTaskSequenceReleaseINTEL: *hasResult = false; *hasResultType = false; break;
+    case OpTypeTaskSequenceINTEL: *hasResult = true; *hasResultType = false; break;
     case OpSubgroupBlockPrefetchINTEL: *hasResult = false; *hasResultType = false; break;
     case OpSubgroup2DBlockLoadINTEL: *hasResult = false; *hasResultType = false; break;
     case OpSubgroup2DBlockLoadTransformINTEL: *hasResult = false; *hasResultType = false; break;
@@ -3618,7 +3412,6 @@ inline const char* ExecutionModeToString(ExecutionMode value) {
     case ExecutionModeSampleInterlockUnorderedEXT: return "SampleInterlockUnorderedEXT";
     case ExecutionModeShadingRateInterlockOrderedEXT: return "ShadingRateInterlockOrderedEXT";
     case ExecutionModeShadingRateInterlockUnorderedEXT: return "ShadingRateInterlockUnorderedEXT";
-    case ExecutionModeShader64BitIndexingEXT: return "Shader64BitIndexingEXT";
     case ExecutionModeSharedLocalMemorySizeINTEL: return "SharedLocalMemorySizeINTEL";
     case ExecutionModeRoundingModeRTPINTEL: return "RoundingModeRTPINTEL";
     case ExecutionModeRoundingModeRTNINTEL: return "RoundingModeRTNINTEL";
@@ -3668,10 +3461,9 @@ inline const char* StorageClassToString(StorageClass value) {
     case StorageClassPhysicalStorageBuffer: return "PhysicalStorageBuffer";
     case StorageClassHitObjectAttributeNV: return "HitObjectAttributeNV";
     case StorageClassTaskPayloadWorkgroupEXT: return "TaskPayloadWorkgroupEXT";
-    case StorageClassHitObjectAttributeEXT: return "HitObjectAttributeEXT";
     case StorageClassCodeSectionINTEL: return "CodeSectionINTEL";
-    case StorageClassDeviceOnlyALTERA: return "DeviceOnlyALTERA";
-    case StorageClassHostOnlyALTERA: return "HostOnlyALTERA";
+    case StorageClassDeviceOnlyINTEL: return "DeviceOnlyINTEL";
+    case StorageClassHostOnlyINTEL: return "HostOnlyINTEL";
     default: return "Unknown";
     }
 }
@@ -3853,7 +3645,7 @@ inline const char* FunctionParameterAttributeToString(FunctionParameterAttribute
     case FunctionParameterAttributeNoCapture: return "NoCapture";
     case FunctionParameterAttributeNoWrite: return "NoWrite";
     case FunctionParameterAttributeNoReadWrite: return "NoReadWrite";
-    case FunctionParameterAttributeRuntimeAlignedALTERA: return "RuntimeAlignedALTERA";
+    case FunctionParameterAttributeRuntimeAlignedINTEL: return "RuntimeAlignedINTEL";
     default: return "Unknown";
     }
 }
@@ -3934,7 +3726,6 @@ inline const char* DecorationToString(Decoration value) {
     case DecorationRestrictPointer: return "RestrictPointer";
     case DecorationAliasedPointer: return "AliasedPointer";
     case DecorationHitObjectShaderRecordBufferNV: return "HitObjectShaderRecordBufferNV";
-    case DecorationHitObjectShaderRecordBufferEXT: return "HitObjectShaderRecordBufferEXT";
     case DecorationBindlessSamplerNV: return "BindlessSamplerNV";
     case DecorationBindlessImageNV: return "BindlessImageNV";
     case DecorationBoundSamplerNV: return "BoundSamplerNV";
@@ -3953,55 +3744,55 @@ inline const char* DecorationToString(Decoration value) {
     case DecorationUserTypeGOOGLE: return "UserTypeGOOGLE";
     case DecorationFunctionRoundingModeINTEL: return "FunctionRoundingModeINTEL";
     case DecorationFunctionDenormModeINTEL: return "FunctionDenormModeINTEL";
-    case DecorationRegisterALTERA: return "RegisterALTERA";
-    case DecorationMemoryALTERA: return "MemoryALTERA";
-    case DecorationNumbanksALTERA: return "NumbanksALTERA";
-    case DecorationBankwidthALTERA: return "BankwidthALTERA";
-    case DecorationMaxPrivateCopiesALTERA: return "MaxPrivateCopiesALTERA";
-    case DecorationSinglepumpALTERA: return "SinglepumpALTERA";
-    case DecorationDoublepumpALTERA: return "DoublepumpALTERA";
-    case DecorationMaxReplicatesALTERA: return "MaxReplicatesALTERA";
-    case DecorationSimpleDualPortALTERA: return "SimpleDualPortALTERA";
-    case DecorationMergeALTERA: return "MergeALTERA";
-    case DecorationBankBitsALTERA: return "BankBitsALTERA";
-    case DecorationForcePow2DepthALTERA: return "ForcePow2DepthALTERA";
-    case DecorationStridesizeALTERA: return "StridesizeALTERA";
-    case DecorationWordsizeALTERA: return "WordsizeALTERA";
-    case DecorationTrueDualPortALTERA: return "TrueDualPortALTERA";
-    case DecorationBurstCoalesceALTERA: return "BurstCoalesceALTERA";
-    case DecorationCacheSizeALTERA: return "CacheSizeALTERA";
-    case DecorationDontStaticallyCoalesceALTERA: return "DontStaticallyCoalesceALTERA";
-    case DecorationPrefetchALTERA: return "PrefetchALTERA";
-    case DecorationStallEnableALTERA: return "StallEnableALTERA";
-    case DecorationFuseLoopsInFunctionALTERA: return "FuseLoopsInFunctionALTERA";
-    case DecorationMathOpDSPModeALTERA: return "MathOpDSPModeALTERA";
+    case DecorationRegisterINTEL: return "RegisterINTEL";
+    case DecorationMemoryINTEL: return "MemoryINTEL";
+    case DecorationNumbanksINTEL: return "NumbanksINTEL";
+    case DecorationBankwidthINTEL: return "BankwidthINTEL";
+    case DecorationMaxPrivateCopiesINTEL: return "MaxPrivateCopiesINTEL";
+    case DecorationSinglepumpINTEL: return "SinglepumpINTEL";
+    case DecorationDoublepumpINTEL: return "DoublepumpINTEL";
+    case DecorationMaxReplicatesINTEL: return "MaxReplicatesINTEL";
+    case DecorationSimpleDualPortINTEL: return "SimpleDualPortINTEL";
+    case DecorationMergeINTEL: return "MergeINTEL";
+    case DecorationBankBitsINTEL: return "BankBitsINTEL";
+    case DecorationForcePow2DepthINTEL: return "ForcePow2DepthINTEL";
+    case DecorationStridesizeINTEL: return "StridesizeINTEL";
+    case DecorationWordsizeINTEL: return "WordsizeINTEL";
+    case DecorationTrueDualPortINTEL: return "TrueDualPortINTEL";
+    case DecorationBurstCoalesceINTEL: return "BurstCoalesceINTEL";
+    case DecorationCacheSizeINTEL: return "CacheSizeINTEL";
+    case DecorationDontStaticallyCoalesceINTEL: return "DontStaticallyCoalesceINTEL";
+    case DecorationPrefetchINTEL: return "PrefetchINTEL";
+    case DecorationStallEnableINTEL: return "StallEnableINTEL";
+    case DecorationFuseLoopsInFunctionINTEL: return "FuseLoopsInFunctionINTEL";
+    case DecorationMathOpDSPModeINTEL: return "MathOpDSPModeINTEL";
     case DecorationAliasScopeINTEL: return "AliasScopeINTEL";
     case DecorationNoAliasINTEL: return "NoAliasINTEL";
-    case DecorationInitiationIntervalALTERA: return "InitiationIntervalALTERA";
-    case DecorationMaxConcurrencyALTERA: return "MaxConcurrencyALTERA";
-    case DecorationPipelineEnableALTERA: return "PipelineEnableALTERA";
-    case DecorationBufferLocationALTERA: return "BufferLocationALTERA";
-    case DecorationIOPipeStorageALTERA: return "IOPipeStorageALTERA";
+    case DecorationInitiationIntervalINTEL: return "InitiationIntervalINTEL";
+    case DecorationMaxConcurrencyINTEL: return "MaxConcurrencyINTEL";
+    case DecorationPipelineEnableINTEL: return "PipelineEnableINTEL";
+    case DecorationBufferLocationINTEL: return "BufferLocationINTEL";
+    case DecorationIOPipeStorageINTEL: return "IOPipeStorageINTEL";
     case DecorationFunctionFloatingPointModeINTEL: return "FunctionFloatingPointModeINTEL";
     case DecorationSingleElementVectorINTEL: return "SingleElementVectorINTEL";
     case DecorationVectorComputeCallableFunctionINTEL: return "VectorComputeCallableFunctionINTEL";
     case DecorationMediaBlockIOINTEL: return "MediaBlockIOINTEL";
-    case DecorationStallFreeALTERA: return "StallFreeALTERA";
+    case DecorationStallFreeINTEL: return "StallFreeINTEL";
     case DecorationFPMaxErrorDecorationINTEL: return "FPMaxErrorDecorationINTEL";
-    case DecorationLatencyControlLabelALTERA: return "LatencyControlLabelALTERA";
-    case DecorationLatencyControlConstraintALTERA: return "LatencyControlConstraintALTERA";
-    case DecorationConduitKernelArgumentALTERA: return "ConduitKernelArgumentALTERA";
-    case DecorationRegisterMapKernelArgumentALTERA: return "RegisterMapKernelArgumentALTERA";
-    case DecorationMMHostInterfaceAddressWidthALTERA: return "MMHostInterfaceAddressWidthALTERA";
-    case DecorationMMHostInterfaceDataWidthALTERA: return "MMHostInterfaceDataWidthALTERA";
-    case DecorationMMHostInterfaceLatencyALTERA: return "MMHostInterfaceLatencyALTERA";
-    case DecorationMMHostInterfaceReadWriteModeALTERA: return "MMHostInterfaceReadWriteModeALTERA";
-    case DecorationMMHostInterfaceMaxBurstALTERA: return "MMHostInterfaceMaxBurstALTERA";
-    case DecorationMMHostInterfaceWaitRequestALTERA: return "MMHostInterfaceWaitRequestALTERA";
-    case DecorationStableKernelArgumentALTERA: return "StableKernelArgumentALTERA";
+    case DecorationLatencyControlLabelINTEL: return "LatencyControlLabelINTEL";
+    case DecorationLatencyControlConstraintINTEL: return "LatencyControlConstraintINTEL";
+    case DecorationConduitKernelArgumentINTEL: return "ConduitKernelArgumentINTEL";
+    case DecorationRegisterMapKernelArgumentINTEL: return "RegisterMapKernelArgumentINTEL";
+    case DecorationMMHostInterfaceAddressWidthINTEL: return "MMHostInterfaceAddressWidthINTEL";
+    case DecorationMMHostInterfaceDataWidthINTEL: return "MMHostInterfaceDataWidthINTEL";
+    case DecorationMMHostInterfaceLatencyINTEL: return "MMHostInterfaceLatencyINTEL";
+    case DecorationMMHostInterfaceReadWriteModeINTEL: return "MMHostInterfaceReadWriteModeINTEL";
+    case DecorationMMHostInterfaceMaxBurstINTEL: return "MMHostInterfaceMaxBurstINTEL";
+    case DecorationMMHostInterfaceWaitRequestINTEL: return "MMHostInterfaceWaitRequestINTEL";
+    case DecorationStableKernelArgumentINTEL: return "StableKernelArgumentINTEL";
     case DecorationHostAccessINTEL: return "HostAccessINTEL";
-    case DecorationInitModeALTERA: return "InitModeALTERA";
-    case DecorationImplementInRegisterMapALTERA: return "ImplementInRegisterMapALTERA";
+    case DecorationInitModeINTEL: return "InitModeINTEL";
+    case DecorationImplementInRegisterMapINTEL: return "ImplementInRegisterMapINTEL";
     case DecorationConditionalINTEL: return "ConditionalINTEL";
     case DecorationCacheControlLoadINTEL: return "CacheControlLoadINTEL";
     case DecorationCacheControlStoreINTEL: return "CacheControlStoreINTEL";
@@ -4352,7 +4143,6 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilityDisplacementMicromapNV: return "DisplacementMicromapNV";
     case CapabilityRayTracingOpacityMicromapEXT: return "RayTracingOpacityMicromapEXT";
     case CapabilityShaderInvocationReorderNV: return "ShaderInvocationReorderNV";
-    case CapabilityShaderInvocationReorderEXT: return "ShaderInvocationReorderEXT";
     case CapabilityBindlessTextureNV: return "BindlessTextureNV";
     case CapabilityRayQueryPositionFetchKHR: return "RayQueryPositionFetchKHR";
     case CapabilityCooperativeVectorNV: return "CooperativeVectorNV";
@@ -4361,7 +4151,6 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilityRawAccessChainsNV: return "RawAccessChainsNV";
     case CapabilityRayTracingSpheresGeometryNV: return "RayTracingSpheresGeometryNV";
     case CapabilityRayTracingLinearSweptSpheresGeometryNV: return "RayTracingLinearSweptSpheresGeometryNV";
-    case CapabilityShader64BitIndexingEXT: return "Shader64BitIndexingEXT";
     case CapabilityCooperativeMatrixReductionsNV: return "CooperativeMatrixReductionsNV";
     case CapabilityCooperativeMatrixConversionsNV: return "CooperativeMatrixConversionsNV";
     case CapabilityCooperativeMatrixPerElementOperationsNV: return "CooperativeMatrixPerElementOperationsNV";
@@ -4391,27 +4180,27 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilitySubgroupAvcMotionEstimationChromaINTEL: return "SubgroupAvcMotionEstimationChromaINTEL";
     case CapabilityVariableLengthArrayINTEL: return "VariableLengthArrayINTEL";
     case CapabilityFunctionFloatControlINTEL: return "FunctionFloatControlINTEL";
-    case CapabilityFPGAMemoryAttributesALTERA: return "FPGAMemoryAttributesALTERA";
+    case CapabilityFPGAMemoryAttributesINTEL: return "FPGAMemoryAttributesINTEL";
     case CapabilityFPFastMathModeINTEL: return "FPFastMathModeINTEL";
-    case CapabilityArbitraryPrecisionIntegersALTERA: return "ArbitraryPrecisionIntegersALTERA";
-    case CapabilityArbitraryPrecisionFloatingPointALTERA: return "ArbitraryPrecisionFloatingPointALTERA";
+    case CapabilityArbitraryPrecisionIntegersINTEL: return "ArbitraryPrecisionIntegersINTEL";
+    case CapabilityArbitraryPrecisionFloatingPointINTEL: return "ArbitraryPrecisionFloatingPointINTEL";
     case CapabilityUnstructuredLoopControlsINTEL: return "UnstructuredLoopControlsINTEL";
-    case CapabilityFPGALoopControlsALTERA: return "FPGALoopControlsALTERA";
+    case CapabilityFPGALoopControlsINTEL: return "FPGALoopControlsINTEL";
     case CapabilityKernelAttributesINTEL: return "KernelAttributesINTEL";
     case CapabilityFPGAKernelAttributesINTEL: return "FPGAKernelAttributesINTEL";
-    case CapabilityFPGAMemoryAccessesALTERA: return "FPGAMemoryAccessesALTERA";
-    case CapabilityFPGAClusterAttributesALTERA: return "FPGAClusterAttributesALTERA";
-    case CapabilityLoopFuseALTERA: return "LoopFuseALTERA";
-    case CapabilityFPGADSPControlALTERA: return "FPGADSPControlALTERA";
+    case CapabilityFPGAMemoryAccessesINTEL: return "FPGAMemoryAccessesINTEL";
+    case CapabilityFPGAClusterAttributesINTEL: return "FPGAClusterAttributesINTEL";
+    case CapabilityLoopFuseINTEL: return "LoopFuseINTEL";
+    case CapabilityFPGADSPControlINTEL: return "FPGADSPControlINTEL";
     case CapabilityMemoryAccessAliasingINTEL: return "MemoryAccessAliasingINTEL";
-    case CapabilityFPGAInvocationPipeliningAttributesALTERA: return "FPGAInvocationPipeliningAttributesALTERA";
-    case CapabilityFPGABufferLocationALTERA: return "FPGABufferLocationALTERA";
-    case CapabilityArbitraryPrecisionFixedPointALTERA: return "ArbitraryPrecisionFixedPointALTERA";
-    case CapabilityUSMStorageClassesALTERA: return "USMStorageClassesALTERA";
-    case CapabilityRuntimeAlignedAttributeALTERA: return "RuntimeAlignedAttributeALTERA";
-    case CapabilityIOPipesALTERA: return "IOPipesALTERA";
-    case CapabilityBlockingPipesALTERA: return "BlockingPipesALTERA";
-    case CapabilityFPGARegALTERA: return "FPGARegALTERA";
+    case CapabilityFPGAInvocationPipeliningAttributesINTEL: return "FPGAInvocationPipeliningAttributesINTEL";
+    case CapabilityFPGABufferLocationINTEL: return "FPGABufferLocationINTEL";
+    case CapabilityArbitraryPrecisionFixedPointINTEL: return "ArbitraryPrecisionFixedPointINTEL";
+    case CapabilityUSMStorageClassesINTEL: return "USMStorageClassesINTEL";
+    case CapabilityRuntimeAlignedAttributeINTEL: return "RuntimeAlignedAttributeINTEL";
+    case CapabilityIOPipesINTEL: return "IOPipesINTEL";
+    case CapabilityBlockingPipesINTEL: return "BlockingPipesINTEL";
+    case CapabilityFPGARegINTEL: return "FPGARegINTEL";
     case CapabilityDotProductInputAll: return "DotProductInputAll";
     case CapabilityDotProductInput4x8Bit: return "DotProductInput4x8Bit";
     case CapabilityDotProductInput4x8BitPacked: return "DotProductInput4x8BitPacked";
@@ -4422,7 +4211,6 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilityBitInstructions: return "BitInstructions";
     case CapabilityGroupNonUniformRotateKHR: return "GroupNonUniformRotateKHR";
     case CapabilityFloatControls2: return "FloatControls2";
-    case CapabilityFMAKHR: return "FMAKHR";
     case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT";
     case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT";
     case CapabilityLongCompositesINTEL: return "LongCompositesINTEL";
@@ -4432,14 +4220,14 @@ inline const char* CapabilityToString(Capability value) {
     case CapabilityBFloat16ConversionINTEL: return "BFloat16ConversionINTEL";
     case CapabilitySplitBarrierINTEL: return "SplitBarrierINTEL";
     case CapabilityArithmeticFenceEXT: return "ArithmeticFenceEXT";
-    case CapabilityFPGAClusterAttributesV2ALTERA: return "FPGAClusterAttributesV2ALTERA";
+    case CapabilityFPGAClusterAttributesV2INTEL: return "FPGAClusterAttributesV2INTEL";
     case CapabilityFPGAKernelAttributesv2INTEL: return "FPGAKernelAttributesv2INTEL";
-    case CapabilityTaskSequenceALTERA: return "TaskSequenceALTERA";
+    case CapabilityTaskSequenceINTEL: return "TaskSequenceINTEL";
     case CapabilityFPMaxErrorINTEL: return "FPMaxErrorINTEL";
-    case CapabilityFPGALatencyControlALTERA: return "FPGALatencyControlALTERA";
-    case CapabilityFPGAArgumentInterfacesALTERA: return "FPGAArgumentInterfacesALTERA";
+    case CapabilityFPGALatencyControlINTEL: return "FPGALatencyControlINTEL";
+    case CapabilityFPGAArgumentInterfacesINTEL: return "FPGAArgumentInterfacesINTEL";
     case CapabilityGlobalVariableHostAccessINTEL: return "GlobalVariableHostAccessINTEL";
-    case CapabilityGlobalVariableFPGADecorationsALTERA: return "GlobalVariableFPGADecorationsALTERA";
+    case CapabilityGlobalVariableFPGADecorationsINTEL: return "GlobalVariableFPGADecorationsINTEL";
     case CapabilitySubgroupBufferPrefetchINTEL: return "SubgroupBufferPrefetchINTEL";
     case CapabilitySubgroup2DBlockIOINTEL: return "Subgroup2DBlockIOINTEL";
     case CapabilitySubgroup2DBlockTransformINTEL: return "Subgroup2DBlockTransformINTEL";
@@ -4563,8 +4351,8 @@ inline const char* TensorClampModeToString(TensorClampMode value) {
 
 inline const char* InitializationModeQualifierToString(InitializationModeQualifier value) {
     switch (value) {
-    case InitializationModeQualifierInitOnDeviceReprogramALTERA: return "InitOnDeviceReprogramALTERA";
-    case InitializationModeQualifierInitOnDeviceResetALTERA: return "InitOnDeviceResetALTERA";
+    case InitializationModeQualifierInitOnDeviceReprogramINTEL: return "InitOnDeviceReprogramINTEL";
+    case InitializationModeQualifierInitOnDeviceResetINTEL: return "InitOnDeviceResetINTEL";
     default: return "Unknown";
     }
 }
@@ -5018,7 +4806,6 @@ inline const char* OpToString(Op value) {
     case OpUntypedInBoundsPtrAccessChainKHR: return "OpUntypedInBoundsPtrAccessChainKHR";
     case OpUntypedArrayLengthKHR: return "OpUntypedArrayLengthKHR";
     case OpUntypedPrefetchKHR: return "OpUntypedPrefetchKHR";
-    case OpFmaKHR: return "OpFmaKHR";
     case OpSubgroupAllKHR: return "OpSubgroupAllKHR";
     case OpSubgroupAnyKHR: return "OpSubgroupAnyKHR";
     case OpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
@@ -5133,36 +4920,6 @@ inline const char* OpToString(Op value) {
     case OpFetchMicroTriangleVertexBarycentricNV: return "OpFetchMicroTriangleVertexBarycentricNV";
     case OpCooperativeVectorLoadNV: return "OpCooperativeVectorLoadNV";
     case OpCooperativeVectorStoreNV: return "OpCooperativeVectorStoreNV";
-    case OpHitObjectRecordFromQueryEXT: return "OpHitObjectRecordFromQueryEXT";
-    case OpHitObjectRecordMissEXT: return "OpHitObjectRecordMissEXT";
-    case OpHitObjectRecordMissMotionEXT: return "OpHitObjectRecordMissMotionEXT";
-    case OpHitObjectGetIntersectionTriangleVertexPositionsEXT: return "OpHitObjectGetIntersectionTriangleVertexPositionsEXT";
-    case OpHitObjectGetRayFlagsEXT: return "OpHitObjectGetRayFlagsEXT";
-    case OpHitObjectSetShaderBindingTableRecordIndexEXT: return "OpHitObjectSetShaderBindingTableRecordIndexEXT";
-    case OpHitObjectReorderExecuteShaderEXT: return "OpHitObjectReorderExecuteShaderEXT";
-    case OpHitObjectTraceReorderExecuteEXT: return "OpHitObjectTraceReorderExecuteEXT";
-    case OpHitObjectTraceMotionReorderExecuteEXT: return "OpHitObjectTraceMotionReorderExecuteEXT";
-    case OpTypeHitObjectEXT: return "OpTypeHitObjectEXT";
-    case OpReorderThreadWithHintEXT: return "OpReorderThreadWithHintEXT";
-    case OpReorderThreadWithHitObjectEXT: return "OpReorderThreadWithHitObjectEXT";
-    case OpHitObjectTraceRayEXT: return "OpHitObjectTraceRayEXT";
-    case OpHitObjectTraceRayMotionEXT: return "OpHitObjectTraceRayMotionEXT";
-    case OpHitObjectRecordEmptyEXT: return "OpHitObjectRecordEmptyEXT";
-    case OpHitObjectExecuteShaderEXT: return "OpHitObjectExecuteShaderEXT";
-    case OpHitObjectGetCurrentTimeEXT: return "OpHitObjectGetCurrentTimeEXT";
-    case OpHitObjectGetAttributesEXT: return "OpHitObjectGetAttributesEXT";
-    case OpHitObjectGetHitKindEXT: return "OpHitObjectGetHitKindEXT";
-    case OpHitObjectGetPrimitiveIndexEXT: return "OpHitObjectGetPrimitiveIndexEXT";
-    case OpHitObjectGetGeometryIndexEXT: return "OpHitObjectGetGeometryIndexEXT";
-    case OpHitObjectGetInstanceIdEXT: return "OpHitObjectGetInstanceIdEXT";
-    case OpHitObjectGetInstanceCustomIndexEXT: return "OpHitObjectGetInstanceCustomIndexEXT";
-    case OpHitObjectGetObjectRayOriginEXT: return "OpHitObjectGetObjectRayOriginEXT";
-    case OpHitObjectGetObjectRayDirectionEXT: return "OpHitObjectGetObjectRayDirectionEXT";
-    case OpHitObjectGetWorldRayDirectionEXT: return "OpHitObjectGetWorldRayDirectionEXT";
-    case OpHitObjectGetWorldRayOriginEXT: return "OpHitObjectGetWorldRayOriginEXT";
-    case OpHitObjectGetObjectToWorldEXT: return "OpHitObjectGetObjectToWorldEXT";
-    case OpHitObjectGetWorldToObjectEXT: return "OpHitObjectGetWorldToObjectEXT";
-    case OpHitObjectGetRayTMaxEXT: return "OpHitObjectGetRayTMaxEXT";
     case OpReportIntersectionKHR: return "OpReportIntersectionKHR";
     case OpIgnoreIntersectionNV: return "OpIgnoreIntersectionNV";
     case OpTerminateRayNV: return "OpTerminateRayNV";
@@ -5174,12 +4931,6 @@ inline const char* OpToString(Op value) {
     case OpExecuteCallableNV: return "OpExecuteCallableNV";
     case OpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
     case OpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
-    case OpHitObjectGetRayTMinEXT: return "OpHitObjectGetRayTMinEXT";
-    case OpHitObjectGetShaderBindingTableRecordIndexEXT: return "OpHitObjectGetShaderBindingTableRecordIndexEXT";
-    case OpHitObjectGetShaderRecordBufferHandleEXT: return "OpHitObjectGetShaderRecordBufferHandleEXT";
-    case OpHitObjectIsEmptyEXT: return "OpHitObjectIsEmptyEXT";
-    case OpHitObjectIsHitEXT: return "OpHitObjectIsHitEXT";
-    case OpHitObjectIsMissEXT: return "OpHitObjectIsMissEXT";
     case OpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
     case OpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
     case OpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";
@@ -5383,24 +5134,24 @@ inline const char* OpToString(Op value) {
     case OpVariableLengthArrayINTEL: return "OpVariableLengthArrayINTEL";
     case OpSaveMemoryINTEL: return "OpSaveMemoryINTEL";
     case OpRestoreMemoryINTEL: return "OpRestoreMemoryINTEL";
-    case OpArbitraryFloatSinCosPiALTERA: return "OpArbitraryFloatSinCosPiALTERA";
-    case OpArbitraryFloatCastALTERA: return "OpArbitraryFloatCastALTERA";
-    case OpArbitraryFloatCastFromIntALTERA: return "OpArbitraryFloatCastFromIntALTERA";
-    case OpArbitraryFloatCastToIntALTERA: return "OpArbitraryFloatCastToIntALTERA";
-    case OpArbitraryFloatAddALTERA: return "OpArbitraryFloatAddALTERA";
-    case OpArbitraryFloatSubALTERA: return "OpArbitraryFloatSubALTERA";
-    case OpArbitraryFloatMulALTERA: return "OpArbitraryFloatMulALTERA";
-    case OpArbitraryFloatDivALTERA: return "OpArbitraryFloatDivALTERA";
-    case OpArbitraryFloatGTALTERA: return "OpArbitraryFloatGTALTERA";
-    case OpArbitraryFloatGEALTERA: return "OpArbitraryFloatGEALTERA";
-    case OpArbitraryFloatLTALTERA: return "OpArbitraryFloatLTALTERA";
-    case OpArbitraryFloatLEALTERA: return "OpArbitraryFloatLEALTERA";
-    case OpArbitraryFloatEQALTERA: return "OpArbitraryFloatEQALTERA";
-    case OpArbitraryFloatRecipALTERA: return "OpArbitraryFloatRecipALTERA";
-    case OpArbitraryFloatRSqrtALTERA: return "OpArbitraryFloatRSqrtALTERA";
-    case OpArbitraryFloatCbrtALTERA: return "OpArbitraryFloatCbrtALTERA";
-    case OpArbitraryFloatHypotALTERA: return "OpArbitraryFloatHypotALTERA";
-    case OpArbitraryFloatSqrtALTERA: return "OpArbitraryFloatSqrtALTERA";
+    case OpArbitraryFloatSinCosPiINTEL: return "OpArbitraryFloatSinCosPiINTEL";
+    case OpArbitraryFloatCastINTEL: return "OpArbitraryFloatCastINTEL";
+    case OpArbitraryFloatCastFromIntINTEL: return "OpArbitraryFloatCastFromIntINTEL";
+    case OpArbitraryFloatCastToIntINTEL: return "OpArbitraryFloatCastToIntINTEL";
+    case OpArbitraryFloatAddINTEL: return "OpArbitraryFloatAddINTEL";
+    case OpArbitraryFloatSubINTEL: return "OpArbitraryFloatSubINTEL";
+    case OpArbitraryFloatMulINTEL: return "OpArbitraryFloatMulINTEL";
+    case OpArbitraryFloatDivINTEL: return "OpArbitraryFloatDivINTEL";
+    case OpArbitraryFloatGTINTEL: return "OpArbitraryFloatGTINTEL";
+    case OpArbitraryFloatGEINTEL: return "OpArbitraryFloatGEINTEL";
+    case OpArbitraryFloatLTINTEL: return "OpArbitraryFloatLTINTEL";
+    case OpArbitraryFloatLEINTEL: return "OpArbitraryFloatLEINTEL";
+    case OpArbitraryFloatEQINTEL: return "OpArbitraryFloatEQINTEL";
+    case OpArbitraryFloatRecipINTEL: return "OpArbitraryFloatRecipINTEL";
+    case OpArbitraryFloatRSqrtINTEL: return "OpArbitraryFloatRSqrtINTEL";
+    case OpArbitraryFloatCbrtINTEL: return "OpArbitraryFloatCbrtINTEL";
+    case OpArbitraryFloatHypotINTEL: return "OpArbitraryFloatHypotINTEL";
+    case OpArbitraryFloatSqrtINTEL: return "OpArbitraryFloatSqrtINTEL";
     case OpArbitraryFloatLogINTEL: return "OpArbitraryFloatLogINTEL";
     case OpArbitraryFloatLog2INTEL: return "OpArbitraryFloatLog2INTEL";
     case OpArbitraryFloatLog10INTEL: return "OpArbitraryFloatLog10INTEL";
@@ -5428,22 +5179,22 @@ inline const char* OpToString(Op value) {
     case OpAliasDomainDeclINTEL: return "OpAliasDomainDeclINTEL";
     case OpAliasScopeDeclINTEL: return "OpAliasScopeDeclINTEL";
     case OpAliasScopeListDeclINTEL: return "OpAliasScopeListDeclINTEL";
-    case OpFixedSqrtALTERA: return "OpFixedSqrtALTERA";
-    case OpFixedRecipALTERA: return "OpFixedRecipALTERA";
-    case OpFixedRsqrtALTERA: return "OpFixedRsqrtALTERA";
-    case OpFixedSinALTERA: return "OpFixedSinALTERA";
-    case OpFixedCosALTERA: return "OpFixedCosALTERA";
-    case OpFixedSinCosALTERA: return "OpFixedSinCosALTERA";
-    case OpFixedSinPiALTERA: return "OpFixedSinPiALTERA";
-    case OpFixedCosPiALTERA: return "OpFixedCosPiALTERA";
-    case OpFixedSinCosPiALTERA: return "OpFixedSinCosPiALTERA";
-    case OpFixedLogALTERA: return "OpFixedLogALTERA";
-    case OpFixedExpALTERA: return "OpFixedExpALTERA";
-    case OpPtrCastToCrossWorkgroupALTERA: return "OpPtrCastToCrossWorkgroupALTERA";
-    case OpCrossWorkgroupCastToPtrALTERA: return "OpCrossWorkgroupCastToPtrALTERA";
-    case OpReadPipeBlockingALTERA: return "OpReadPipeBlockingALTERA";
-    case OpWritePipeBlockingALTERA: return "OpWritePipeBlockingALTERA";
-    case OpFPGARegALTERA: return "OpFPGARegALTERA";
+    case OpFixedSqrtINTEL: return "OpFixedSqrtINTEL";
+    case OpFixedRecipINTEL: return "OpFixedRecipINTEL";
+    case OpFixedRsqrtINTEL: return "OpFixedRsqrtINTEL";
+    case OpFixedSinINTEL: return "OpFixedSinINTEL";
+    case OpFixedCosINTEL: return "OpFixedCosINTEL";
+    case OpFixedSinCosINTEL: return "OpFixedSinCosINTEL";
+    case OpFixedSinPiINTEL: return "OpFixedSinPiINTEL";
+    case OpFixedCosPiINTEL: return "OpFixedCosPiINTEL";
+    case OpFixedSinCosPiINTEL: return "OpFixedSinCosPiINTEL";
+    case OpFixedLogINTEL: return "OpFixedLogINTEL";
+    case OpFixedExpINTEL: return "OpFixedExpINTEL";
+    case OpPtrCastToCrossWorkgroupINTEL: return "OpPtrCastToCrossWorkgroupINTEL";
+    case OpCrossWorkgroupCastToPtrINTEL: return "OpCrossWorkgroupCastToPtrINTEL";
+    case OpReadPipeBlockingINTEL: return "OpReadPipeBlockingINTEL";
+    case OpWritePipeBlockingINTEL: return "OpWritePipeBlockingINTEL";
+    case OpFPGARegINTEL: return "OpFPGARegINTEL";
     case OpRayQueryGetRayTMinKHR: return "OpRayQueryGetRayTMinKHR";
     case OpRayQueryGetRayFlagsKHR: return "OpRayQueryGetRayFlagsKHR";
     case OpRayQueryGetIntersectionTKHR: return "OpRayQueryGetIntersectionTKHR";
@@ -5472,11 +5223,11 @@ inline const char* OpToString(Op value) {
     case OpControlBarrierArriveINTEL: return "OpControlBarrierArriveINTEL";
     case OpControlBarrierWaitINTEL: return "OpControlBarrierWaitINTEL";
     case OpArithmeticFenceEXT: return "OpArithmeticFenceEXT";
-    case OpTaskSequenceCreateALTERA: return "OpTaskSequenceCreateALTERA";
-    case OpTaskSequenceAsyncALTERA: return "OpTaskSequenceAsyncALTERA";
-    case OpTaskSequenceGetALTERA: return "OpTaskSequenceGetALTERA";
-    case OpTaskSequenceReleaseALTERA: return "OpTaskSequenceReleaseALTERA";
-    case OpTypeTaskSequenceALTERA: return "OpTypeTaskSequenceALTERA";
+    case OpTaskSequenceCreateINTEL: return "OpTaskSequenceCreateINTEL";
+    case OpTaskSequenceAsyncINTEL: return "OpTaskSequenceAsyncINTEL";
+    case OpTaskSequenceGetINTEL: return "OpTaskSequenceGetINTEL";
+    case OpTaskSequenceReleaseINTEL: return "OpTaskSequenceReleaseINTEL";
+    case OpTypeTaskSequenceINTEL: return "OpTypeTaskSequenceINTEL";
     case OpSubgroupBlockPrefetchINTEL: return "OpSubgroupBlockPrefetchINTEL";
     case OpSubgroup2DBlockLoadINTEL: return "OpSubgroup2DBlockLoadINTEL";
     case OpSubgroup2DBlockLoadTransformINTEL: return "OpSubgroup2DBlockLoadTransformINTEL";
diff --git a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 b/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp11
deleted file mode 100644
index 084be712..00000000
--- a/engine/thirdparty/spirv-headers/include/spirv/unified1/spirv.hpp11
+++ /dev/null
@@ -1,5586 +0,0 @@
-// Copyright: 2014-2024 The Khronos Group Inc.
-// License: MIT
-// 
-// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
-// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
-// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
-// https://www.khronos.org/registry/
-
-// This header is automatically generated by the same tool that creates
-// the Binary Section of the SPIR-V specification.
-
-// Enumeration tokens for SPIR-V, in various styles:
-//   C, C++, C++11, JSON, Lua, Python, C#, D, Beef
-// 
-// - C will have tokens with a "Spv" prefix, e.g.: SpvSourceLanguageGLSL
-// - C++ will have tokens in the "spv" name space, e.g.: spv::SourceLanguageGLSL
-// - C++11 will use enum classes in the spv namespace, e.g.: spv::SourceLanguage::GLSL
-// - Lua will use tables, e.g.: spv.SourceLanguage.GLSL
-// - Python will use dictionaries, e.g.: spv['SourceLanguage']['GLSL']
-// - C# will use enum classes in the Specification class located in the "Spv" namespace,
-//     e.g.: Spv.Specification.SourceLanguage.GLSL
-// - D will have tokens under the "spv" module, e.g: spv.SourceLanguage.GLSL
-// - Beef will use enum classes in the Specification class located in the "Spv" namespace,
-//     e.g.: Spv.Specification.SourceLanguage.GLSL
-// 
-// Some tokens act like mask values, which can be OR'd together,
-// while others are mutually exclusive.  The mask-like ones have
-// "Mask" in their name, and a parallel enum that has the shift
-// amount (1 << x) for each corresponding enumerant.
-
-#ifndef spirv_HPP
-#define spirv_HPP
-
-namespace spv {
-
-typedef unsigned int Id;
-
-#define SPV_VERSION 0x10600
-#define SPV_REVISION 1
-
-static const unsigned int MagicNumber = 0x07230203;
-static const unsigned int Version = 0x00010600;
-static const unsigned int Revision = 1;
-static const unsigned int OpCodeMask = 0xffff;
-static const unsigned int WordCountShift = 16;
-
-enum class SourceLanguage : unsigned {
-    Unknown = 0,
-    ESSL = 1,
-    GLSL = 2,
-    OpenCL_C = 3,
-    OpenCL_CPP = 4,
-    HLSL = 5,
-    CPP_for_OpenCL = 6,
-    SYCL = 7,
-    HERO_C = 8,
-    NZSL = 9,
-    WGSL = 10,
-    Slang = 11,
-    Zig = 12,
-    Rust = 13,
-    Max = 0x7fffffff,
-};
-
-enum class ExecutionModel : unsigned {
-    Vertex = 0,
-    TessellationControl = 1,
-    TessellationEvaluation = 2,
-    Geometry = 3,
-    Fragment = 4,
-    GLCompute = 5,
-    Kernel = 6,
-    TaskNV = 5267,
-    MeshNV = 5268,
-    RayGenerationKHR = 5313,
-    RayGenerationNV = 5313,
-    IntersectionKHR = 5314,
-    IntersectionNV = 5314,
-    AnyHitKHR = 5315,
-    AnyHitNV = 5315,
-    ClosestHitKHR = 5316,
-    ClosestHitNV = 5316,
-    MissKHR = 5317,
-    MissNV = 5317,
-    CallableKHR = 5318,
-    CallableNV = 5318,
-    TaskEXT = 5364,
-    MeshEXT = 5365,
-    Max = 0x7fffffff,
-};
-
-enum class AddressingModel : unsigned {
-    Logical = 0,
-    Physical32 = 1,
-    Physical64 = 2,
-    PhysicalStorageBuffer64 = 5348,
-    PhysicalStorageBuffer64EXT = 5348,
-    Max = 0x7fffffff,
-};
-
-enum class MemoryModel : unsigned {
-    Simple = 0,
-    GLSL450 = 1,
-    OpenCL = 2,
-    Vulkan = 3,
-    VulkanKHR = 3,
-    Max = 0x7fffffff,
-};
-
-enum class ExecutionMode : unsigned {
-    Invocations = 0,
-    SpacingEqual = 1,
-    SpacingFractionalEven = 2,
-    SpacingFractionalOdd = 3,
-    VertexOrderCw = 4,
-    VertexOrderCcw = 5,
-    PixelCenterInteger = 6,
-    OriginUpperLeft = 7,
-    OriginLowerLeft = 8,
-    EarlyFragmentTests = 9,
-    PointMode = 10,
-    Xfb = 11,
-    DepthReplacing = 12,
-    DepthGreater = 14,
-    DepthLess = 15,
-    DepthUnchanged = 16,
-    LocalSize = 17,
-    LocalSizeHint = 18,
-    InputPoints = 19,
-    InputLines = 20,
-    InputLinesAdjacency = 21,
-    Triangles = 22,
-    InputTrianglesAdjacency = 23,
-    Quads = 24,
-    Isolines = 25,
-    OutputVertices = 26,
-    OutputPoints = 27,
-    OutputLineStrip = 28,
-    OutputTriangleStrip = 29,
-    VecTypeHint = 30,
-    ContractionOff = 31,
-    Initializer = 33,
-    Finalizer = 34,
-    SubgroupSize = 35,
-    SubgroupsPerWorkgroup = 36,
-    SubgroupsPerWorkgroupId = 37,
-    LocalSizeId = 38,
-    LocalSizeHintId = 39,
-    NonCoherentColorAttachmentReadEXT = 4169,
-    NonCoherentDepthAttachmentReadEXT = 4170,
-    NonCoherentStencilAttachmentReadEXT = 4171,
-    SubgroupUniformControlFlowKHR = 4421,
-    PostDepthCoverage = 4446,
-    DenormPreserve = 4459,
-    DenormFlushToZero = 4460,
-    SignedZeroInfNanPreserve = 4461,
-    RoundingModeRTE = 4462,
-    RoundingModeRTZ = 4463,
-    NonCoherentTileAttachmentReadQCOM = 4489,
-    TileShadingRateQCOM = 4490,
-    EarlyAndLateFragmentTestsAMD = 5017,
-    StencilRefReplacingEXT = 5027,
-    CoalescingAMDX = 5069,
-    IsApiEntryAMDX = 5070,
-    MaxNodeRecursionAMDX = 5071,
-    StaticNumWorkgroupsAMDX = 5072,
-    ShaderIndexAMDX = 5073,
-    MaxNumWorkgroupsAMDX = 5077,
-    StencilRefUnchangedFrontAMD = 5079,
-    StencilRefGreaterFrontAMD = 5080,
-    StencilRefLessFrontAMD = 5081,
-    StencilRefUnchangedBackAMD = 5082,
-    StencilRefGreaterBackAMD = 5083,
-    StencilRefLessBackAMD = 5084,
-    QuadDerivativesKHR = 5088,
-    RequireFullQuadsKHR = 5089,
-    SharesInputWithAMDX = 5102,
-    OutputLinesEXT = 5269,
-    OutputLinesNV = 5269,
-    OutputPrimitivesEXT = 5270,
-    OutputPrimitivesNV = 5270,
-    DerivativeGroupQuadsKHR = 5289,
-    DerivativeGroupQuadsNV = 5289,
-    DerivativeGroupLinearKHR = 5290,
-    DerivativeGroupLinearNV = 5290,
-    OutputTrianglesEXT = 5298,
-    OutputTrianglesNV = 5298,
-    PixelInterlockOrderedEXT = 5366,
-    PixelInterlockUnorderedEXT = 5367,
-    SampleInterlockOrderedEXT = 5368,
-    SampleInterlockUnorderedEXT = 5369,
-    ShadingRateInterlockOrderedEXT = 5370,
-    ShadingRateInterlockUnorderedEXT = 5371,
-    Shader64BitIndexingEXT = 5427,
-    SharedLocalMemorySizeINTEL = 5618,
-    RoundingModeRTPINTEL = 5620,
-    RoundingModeRTNINTEL = 5621,
-    FloatingPointModeALTINTEL = 5622,
-    FloatingPointModeIEEEINTEL = 5623,
-    MaxWorkgroupSizeINTEL = 5893,
-    MaxWorkDimINTEL = 5894,
-    NoGlobalOffsetINTEL = 5895,
-    NumSIMDWorkitemsINTEL = 5896,
-    SchedulerTargetFmaxMhzINTEL = 5903,
-    MaximallyReconvergesKHR = 6023,
-    FPFastMathDefault = 6028,
-    StreamingInterfaceINTEL = 6154,
-    RegisterMapInterfaceINTEL = 6160,
-    NamedBarrierCountINTEL = 6417,
-    MaximumRegistersINTEL = 6461,
-    MaximumRegistersIdINTEL = 6462,
-    NamedMaximumRegistersINTEL = 6463,
-    Max = 0x7fffffff,
-};
-
-enum class StorageClass : unsigned {
-    UniformConstant = 0,
-    Input = 1,
-    Uniform = 2,
-    Output = 3,
-    Workgroup = 4,
-    CrossWorkgroup = 5,
-    Private = 6,
-    Function = 7,
-    Generic = 8,
-    PushConstant = 9,
-    AtomicCounter = 10,
-    Image = 11,
-    StorageBuffer = 12,
-    TileImageEXT = 4172,
-    TileAttachmentQCOM = 4491,
-    NodePayloadAMDX = 5068,
-    CallableDataKHR = 5328,
-    CallableDataNV = 5328,
-    IncomingCallableDataKHR = 5329,
-    IncomingCallableDataNV = 5329,
-    RayPayloadKHR = 5338,
-    RayPayloadNV = 5338,
-    HitAttributeKHR = 5339,
-    HitAttributeNV = 5339,
-    IncomingRayPayloadKHR = 5342,
-    IncomingRayPayloadNV = 5342,
-    ShaderRecordBufferKHR = 5343,
-    ShaderRecordBufferNV = 5343,
-    PhysicalStorageBuffer = 5349,
-    PhysicalStorageBufferEXT = 5349,
-    HitObjectAttributeNV = 5385,
-    TaskPayloadWorkgroupEXT = 5402,
-    HitObjectAttributeEXT = 5411,
-    CodeSectionINTEL = 5605,
-    DeviceOnlyALTERA = 5936,
-    DeviceOnlyINTEL = 5936,
-    HostOnlyALTERA = 5937,
-    HostOnlyINTEL = 5937,
-    Max = 0x7fffffff,
-};
-
-enum class Dim : unsigned {
-    Dim1D = 0,
-    Dim2D = 1,
-    Dim3D = 2,
-    Cube = 3,
-    Rect = 4,
-    Buffer = 5,
-    SubpassData = 6,
-    TileImageDataEXT = 4173,
-    Max = 0x7fffffff,
-};
-
-enum class SamplerAddressingMode : unsigned {
-    None = 0,
-    ClampToEdge = 1,
-    Clamp = 2,
-    Repeat = 3,
-    RepeatMirrored = 4,
-    Max = 0x7fffffff,
-};
-
-enum class SamplerFilterMode : unsigned {
-    Nearest = 0,
-    Linear = 1,
-    Max = 0x7fffffff,
-};
-
-enum class ImageFormat : unsigned {
-    Unknown = 0,
-    Rgba32f = 1,
-    Rgba16f = 2,
-    R32f = 3,
-    Rgba8 = 4,
-    Rgba8Snorm = 5,
-    Rg32f = 6,
-    Rg16f = 7,
-    R11fG11fB10f = 8,
-    R16f = 9,
-    Rgba16 = 10,
-    Rgb10A2 = 11,
-    Rg16 = 12,
-    Rg8 = 13,
-    R16 = 14,
-    R8 = 15,
-    Rgba16Snorm = 16,
-    Rg16Snorm = 17,
-    Rg8Snorm = 18,
-    R16Snorm = 19,
-    R8Snorm = 20,
-    Rgba32i = 21,
-    Rgba16i = 22,
-    Rgba8i = 23,
-    R32i = 24,
-    Rg32i = 25,
-    Rg16i = 26,
-    Rg8i = 27,
-    R16i = 28,
-    R8i = 29,
-    Rgba32ui = 30,
-    Rgba16ui = 31,
-    Rgba8ui = 32,
-    R32ui = 33,
-    Rgb10a2ui = 34,
-    Rg32ui = 35,
-    Rg16ui = 36,
-    Rg8ui = 37,
-    R16ui = 38,
-    R8ui = 39,
-    R64ui = 40,
-    R64i = 41,
-    Max = 0x7fffffff,
-};
-
-enum class ImageChannelOrder : unsigned {
-    R = 0,
-    A = 1,
-    RG = 2,
-    RA = 3,
-    RGB = 4,
-    RGBA = 5,
-    BGRA = 6,
-    ARGB = 7,
-    Intensity = 8,
-    Luminance = 9,
-    Rx = 10,
-    RGx = 11,
-    RGBx = 12,
-    Depth = 13,
-    DepthStencil = 14,
-    sRGB = 15,
-    sRGBx = 16,
-    sRGBA = 17,
-    sBGRA = 18,
-    ABGR = 19,
-    Max = 0x7fffffff,
-};
-
-enum class ImageChannelDataType : unsigned {
-    SnormInt8 = 0,
-    SnormInt16 = 1,
-    UnormInt8 = 2,
-    UnormInt16 = 3,
-    UnormShort565 = 4,
-    UnormShort555 = 5,
-    UnormInt101010 = 6,
-    SignedInt8 = 7,
-    SignedInt16 = 8,
-    SignedInt32 = 9,
-    UnsignedInt8 = 10,
-    UnsignedInt16 = 11,
-    UnsignedInt32 = 12,
-    HalfFloat = 13,
-    Float = 14,
-    UnormInt24 = 15,
-    UnormInt101010_2 = 16,
-    UnormInt10X6EXT = 17,
-    UnsignedIntRaw10EXT = 19,
-    UnsignedIntRaw12EXT = 20,
-    UnormInt2_101010EXT = 21,
-    UnsignedInt10X6EXT = 22,
-    UnsignedInt12X4EXT = 23,
-    UnsignedInt14X2EXT = 24,
-    UnormInt12X4EXT = 25,
-    UnormInt14X2EXT = 26,
-    Max = 0x7fffffff,
-};
-
-enum class ImageOperandsShift : unsigned {
-    Bias = 0,
-    Lod = 1,
-    Grad = 2,
-    ConstOffset = 3,
-    Offset = 4,
-    ConstOffsets = 5,
-    Sample = 6,
-    MinLod = 7,
-    MakeTexelAvailable = 8,
-    MakeTexelAvailableKHR = 8,
-    MakeTexelVisible = 9,
-    MakeTexelVisibleKHR = 9,
-    NonPrivateTexel = 10,
-    NonPrivateTexelKHR = 10,
-    VolatileTexel = 11,
-    VolatileTexelKHR = 11,
-    SignExtend = 12,
-    ZeroExtend = 13,
-    Nontemporal = 14,
-    Offsets = 16,
-    Max = 0x7fffffff,
-};
-
-enum class ImageOperandsMask : unsigned {
-    MaskNone = 0,
-    Bias = 0x00000001,
-    Lod = 0x00000002,
-    Grad = 0x00000004,
-    ConstOffset = 0x00000008,
-    Offset = 0x00000010,
-    ConstOffsets = 0x00000020,
-    Sample = 0x00000040,
-    MinLod = 0x00000080,
-    MakeTexelAvailable = 0x00000100,
-    MakeTexelAvailableKHR = 0x00000100,
-    MakeTexelVisible = 0x00000200,
-    MakeTexelVisibleKHR = 0x00000200,
-    NonPrivateTexel = 0x00000400,
-    NonPrivateTexelKHR = 0x00000400,
-    VolatileTexel = 0x00000800,
-    VolatileTexelKHR = 0x00000800,
-    SignExtend = 0x00001000,
-    ZeroExtend = 0x00002000,
-    Nontemporal = 0x00004000,
-    Offsets = 0x00010000,
-};
-
-enum class FPFastMathModeShift : unsigned {
-    NotNaN = 0,
-    NotInf = 1,
-    NSZ = 2,
-    AllowRecip = 3,
-    Fast = 4,
-    AllowContract = 16,
-    AllowContractFastINTEL = 16,
-    AllowReassoc = 17,
-    AllowReassocINTEL = 17,
-    AllowTransform = 18,
-    Max = 0x7fffffff,
-};
-
-enum class FPFastMathModeMask : unsigned {
-    MaskNone = 0,
-    NotNaN = 0x00000001,
-    NotInf = 0x00000002,
-    NSZ = 0x00000004,
-    AllowRecip = 0x00000008,
-    Fast = 0x00000010,
-    AllowContract = 0x00010000,
-    AllowContractFastINTEL = 0x00010000,
-    AllowReassoc = 0x00020000,
-    AllowReassocINTEL = 0x00020000,
-    AllowTransform = 0x00040000,
-};
-
-enum class FPRoundingMode : unsigned {
-    RTE = 0,
-    RTZ = 1,
-    RTP = 2,
-    RTN = 3,
-    Max = 0x7fffffff,
-};
-
-enum class LinkageType : unsigned {
-    Export = 0,
-    Import = 1,
-    LinkOnceODR = 2,
-    Max = 0x7fffffff,
-};
-
-enum class AccessQualifier : unsigned {
-    ReadOnly = 0,
-    WriteOnly = 1,
-    ReadWrite = 2,
-    Max = 0x7fffffff,
-};
-
-enum class FunctionParameterAttribute : unsigned {
-    Zext = 0,
-    Sext = 1,
-    ByVal = 2,
-    Sret = 3,
-    NoAlias = 4,
-    NoCapture = 5,
-    NoWrite = 6,
-    NoReadWrite = 7,
-    RuntimeAlignedALTERA = 5940,
-    RuntimeAlignedINTEL = 5940,
-    Max = 0x7fffffff,
-};
-
-enum class Decoration : unsigned {
-    RelaxedPrecision = 0,
-    SpecId = 1,
-    Block = 2,
-    BufferBlock = 3,
-    RowMajor = 4,
-    ColMajor = 5,
-    ArrayStride = 6,
-    MatrixStride = 7,
-    GLSLShared = 8,
-    GLSLPacked = 9,
-    CPacked = 10,
-    BuiltIn = 11,
-    NoPerspective = 13,
-    Flat = 14,
-    Patch = 15,
-    Centroid = 16,
-    Sample = 17,
-    Invariant = 18,
-    Restrict = 19,
-    Aliased = 20,
-    Volatile = 21,
-    Constant = 22,
-    Coherent = 23,
-    NonWritable = 24,
-    NonReadable = 25,
-    Uniform = 26,
-    UniformId = 27,
-    SaturatedConversion = 28,
-    Stream = 29,
-    Location = 30,
-    Component = 31,
-    Index = 32,
-    Binding = 33,
-    DescriptorSet = 34,
-    Offset = 35,
-    XfbBuffer = 36,
-    XfbStride = 37,
-    FuncParamAttr = 38,
-    FPRoundingMode = 39,
-    FPFastMathMode = 40,
-    LinkageAttributes = 41,
-    NoContraction = 42,
-    InputAttachmentIndex = 43,
-    Alignment = 44,
-    MaxByteOffset = 45,
-    AlignmentId = 46,
-    MaxByteOffsetId = 47,
-    SaturatedToLargestFloat8NormalConversionEXT = 4216,
-    NoSignedWrap = 4469,
-    NoUnsignedWrap = 4470,
-    WeightTextureQCOM = 4487,
-    BlockMatchTextureQCOM = 4488,
-    BlockMatchSamplerQCOM = 4499,
-    ExplicitInterpAMD = 4999,
-    NodeSharesPayloadLimitsWithAMDX = 5019,
-    NodeMaxPayloadsAMDX = 5020,
-    TrackFinishWritingAMDX = 5078,
-    PayloadNodeNameAMDX = 5091,
-    PayloadNodeBaseIndexAMDX = 5098,
-    PayloadNodeSparseArrayAMDX = 5099,
-    PayloadNodeArraySizeAMDX = 5100,
-    PayloadDispatchIndirectAMDX = 5105,
-    OverrideCoverageNV = 5248,
-    PassthroughNV = 5250,
-    ViewportRelativeNV = 5252,
-    SecondaryViewportRelativeNV = 5256,
-    PerPrimitiveEXT = 5271,
-    PerPrimitiveNV = 5271,
-    PerViewNV = 5272,
-    PerTaskNV = 5273,
-    PerVertexKHR = 5285,
-    PerVertexNV = 5285,
-    NonUniform = 5300,
-    NonUniformEXT = 5300,
-    RestrictPointer = 5355,
-    RestrictPointerEXT = 5355,
-    AliasedPointer = 5356,
-    AliasedPointerEXT = 5356,
-    HitObjectShaderRecordBufferNV = 5386,
-    HitObjectShaderRecordBufferEXT = 5389,
-    BindlessSamplerNV = 5398,
-    BindlessImageNV = 5399,
-    BoundSamplerNV = 5400,
-    BoundImageNV = 5401,
-    SIMTCallINTEL = 5599,
-    ReferencedIndirectlyINTEL = 5602,
-    ClobberINTEL = 5607,
-    SideEffectsINTEL = 5608,
-    VectorComputeVariableINTEL = 5624,
-    FuncParamIOKindINTEL = 5625,
-    VectorComputeFunctionINTEL = 5626,
-    StackCallINTEL = 5627,
-    GlobalVariableOffsetINTEL = 5628,
-    CounterBuffer = 5634,
-    HlslCounterBufferGOOGLE = 5634,
-    HlslSemanticGOOGLE = 5635,
-    UserSemantic = 5635,
-    UserTypeGOOGLE = 5636,
-    FunctionRoundingModeINTEL = 5822,
-    FunctionDenormModeINTEL = 5823,
-    RegisterALTERA = 5825,
-    RegisterINTEL = 5825,
-    MemoryALTERA = 5826,
-    MemoryINTEL = 5826,
-    NumbanksALTERA = 5827,
-    NumbanksINTEL = 5827,
-    BankwidthALTERA = 5828,
-    BankwidthINTEL = 5828,
-    MaxPrivateCopiesALTERA = 5829,
-    MaxPrivateCopiesINTEL = 5829,
-    SinglepumpALTERA = 5830,
-    SinglepumpINTEL = 5830,
-    DoublepumpALTERA = 5831,
-    DoublepumpINTEL = 5831,
-    MaxReplicatesALTERA = 5832,
-    MaxReplicatesINTEL = 5832,
-    SimpleDualPortALTERA = 5833,
-    SimpleDualPortINTEL = 5833,
-    MergeALTERA = 5834,
-    MergeINTEL = 5834,
-    BankBitsALTERA = 5835,
-    BankBitsINTEL = 5835,
-    ForcePow2DepthALTERA = 5836,
-    ForcePow2DepthINTEL = 5836,
-    StridesizeALTERA = 5883,
-    StridesizeINTEL = 5883,
-    WordsizeALTERA = 5884,
-    WordsizeINTEL = 5884,
-    TrueDualPortALTERA = 5885,
-    TrueDualPortINTEL = 5885,
-    BurstCoalesceALTERA = 5899,
-    BurstCoalesceINTEL = 5899,
-    CacheSizeALTERA = 5900,
-    CacheSizeINTEL = 5900,
-    DontStaticallyCoalesceALTERA = 5901,
-    DontStaticallyCoalesceINTEL = 5901,
-    PrefetchALTERA = 5902,
-    PrefetchINTEL = 5902,
-    StallEnableALTERA = 5905,
-    StallEnableINTEL = 5905,
-    FuseLoopsInFunctionALTERA = 5907,
-    FuseLoopsInFunctionINTEL = 5907,
-    MathOpDSPModeALTERA = 5909,
-    MathOpDSPModeINTEL = 5909,
-    AliasScopeINTEL = 5914,
-    NoAliasINTEL = 5915,
-    InitiationIntervalALTERA = 5917,
-    InitiationIntervalINTEL = 5917,
-    MaxConcurrencyALTERA = 5918,
-    MaxConcurrencyINTEL = 5918,
-    PipelineEnableALTERA = 5919,
-    PipelineEnableINTEL = 5919,
-    BufferLocationALTERA = 5921,
-    BufferLocationINTEL = 5921,
-    IOPipeStorageALTERA = 5944,
-    IOPipeStorageINTEL = 5944,
-    FunctionFloatingPointModeINTEL = 6080,
-    SingleElementVectorINTEL = 6085,
-    VectorComputeCallableFunctionINTEL = 6087,
-    MediaBlockIOINTEL = 6140,
-    StallFreeALTERA = 6151,
-    StallFreeINTEL = 6151,
-    FPMaxErrorDecorationINTEL = 6170,
-    LatencyControlLabelALTERA = 6172,
-    LatencyControlLabelINTEL = 6172,
-    LatencyControlConstraintALTERA = 6173,
-    LatencyControlConstraintINTEL = 6173,
-    ConduitKernelArgumentALTERA = 6175,
-    ConduitKernelArgumentINTEL = 6175,
-    RegisterMapKernelArgumentALTERA = 6176,
-    RegisterMapKernelArgumentINTEL = 6176,
-    MMHostInterfaceAddressWidthALTERA = 6177,
-    MMHostInterfaceAddressWidthINTEL = 6177,
-    MMHostInterfaceDataWidthALTERA = 6178,
-    MMHostInterfaceDataWidthINTEL = 6178,
-    MMHostInterfaceLatencyALTERA = 6179,
-    MMHostInterfaceLatencyINTEL = 6179,
-    MMHostInterfaceReadWriteModeALTERA = 6180,
-    MMHostInterfaceReadWriteModeINTEL = 6180,
-    MMHostInterfaceMaxBurstALTERA = 6181,
-    MMHostInterfaceMaxBurstINTEL = 6181,
-    MMHostInterfaceWaitRequestALTERA = 6182,
-    MMHostInterfaceWaitRequestINTEL = 6182,
-    StableKernelArgumentALTERA = 6183,
-    StableKernelArgumentINTEL = 6183,
-    HostAccessINTEL = 6188,
-    InitModeALTERA = 6190,
-    InitModeINTEL = 6190,
-    ImplementInRegisterMapALTERA = 6191,
-    ImplementInRegisterMapINTEL = 6191,
-    ConditionalINTEL = 6247,
-    CacheControlLoadINTEL = 6442,
-    CacheControlStoreINTEL = 6443,
-    Max = 0x7fffffff,
-};
-
-enum class BuiltIn : unsigned {
-    Position = 0,
-    PointSize = 1,
-    ClipDistance = 3,
-    CullDistance = 4,
-    VertexId = 5,
-    InstanceId = 6,
-    PrimitiveId = 7,
-    InvocationId = 8,
-    Layer = 9,
-    ViewportIndex = 10,
-    TessLevelOuter = 11,
-    TessLevelInner = 12,
-    TessCoord = 13,
-    PatchVertices = 14,
-    FragCoord = 15,
-    PointCoord = 16,
-    FrontFacing = 17,
-    SampleId = 18,
-    SamplePosition = 19,
-    SampleMask = 20,
-    FragDepth = 22,
-    HelperInvocation = 23,
-    NumWorkgroups = 24,
-    WorkgroupSize = 25,
-    WorkgroupId = 26,
-    LocalInvocationId = 27,
-    GlobalInvocationId = 28,
-    LocalInvocationIndex = 29,
-    WorkDim = 30,
-    GlobalSize = 31,
-    EnqueuedWorkgroupSize = 32,
-    GlobalOffset = 33,
-    GlobalLinearId = 34,
-    SubgroupSize = 36,
-    SubgroupMaxSize = 37,
-    NumSubgroups = 38,
-    NumEnqueuedSubgroups = 39,
-    SubgroupId = 40,
-    SubgroupLocalInvocationId = 41,
-    VertexIndex = 42,
-    InstanceIndex = 43,
-    CoreIDARM = 4160,
-    CoreCountARM = 4161,
-    CoreMaxIDARM = 4162,
-    WarpIDARM = 4163,
-    WarpMaxIDARM = 4164,
-    SubgroupEqMask = 4416,
-    SubgroupEqMaskKHR = 4416,
-    SubgroupGeMask = 4417,
-    SubgroupGeMaskKHR = 4417,
-    SubgroupGtMask = 4418,
-    SubgroupGtMaskKHR = 4418,
-    SubgroupLeMask = 4419,
-    SubgroupLeMaskKHR = 4419,
-    SubgroupLtMask = 4420,
-    SubgroupLtMaskKHR = 4420,
-    BaseVertex = 4424,
-    BaseInstance = 4425,
-    DrawIndex = 4426,
-    PrimitiveShadingRateKHR = 4432,
-    DeviceIndex = 4438,
-    ViewIndex = 4440,
-    ShadingRateKHR = 4444,
-    TileOffsetQCOM = 4492,
-    TileDimensionQCOM = 4493,
-    TileApronSizeQCOM = 4494,
-    BaryCoordNoPerspAMD = 4992,
-    BaryCoordNoPerspCentroidAMD = 4993,
-    BaryCoordNoPerspSampleAMD = 4994,
-    BaryCoordSmoothAMD = 4995,
-    BaryCoordSmoothCentroidAMD = 4996,
-    BaryCoordSmoothSampleAMD = 4997,
-    BaryCoordPullModelAMD = 4998,
-    FragStencilRefEXT = 5014,
-    RemainingRecursionLevelsAMDX = 5021,
-    ShaderIndexAMDX = 5073,
-    ViewportMaskNV = 5253,
-    SecondaryPositionNV = 5257,
-    SecondaryViewportMaskNV = 5258,
-    PositionPerViewNV = 5261,
-    ViewportMaskPerViewNV = 5262,
-    FullyCoveredEXT = 5264,
-    TaskCountNV = 5274,
-    PrimitiveCountNV = 5275,
-    PrimitiveIndicesNV = 5276,
-    ClipDistancePerViewNV = 5277,
-    CullDistancePerViewNV = 5278,
-    LayerPerViewNV = 5279,
-    MeshViewCountNV = 5280,
-    MeshViewIndicesNV = 5281,
-    BaryCoordKHR = 5286,
-    BaryCoordNV = 5286,
-    BaryCoordNoPerspKHR = 5287,
-    BaryCoordNoPerspNV = 5287,
-    FragSizeEXT = 5292,
-    FragmentSizeNV = 5292,
-    FragInvocationCountEXT = 5293,
-    InvocationsPerPixelNV = 5293,
-    PrimitivePointIndicesEXT = 5294,
-    PrimitiveLineIndicesEXT = 5295,
-    PrimitiveTriangleIndicesEXT = 5296,
-    CullPrimitiveEXT = 5299,
-    LaunchIdKHR = 5319,
-    LaunchIdNV = 5319,
-    LaunchSizeKHR = 5320,
-    LaunchSizeNV = 5320,
-    WorldRayOriginKHR = 5321,
-    WorldRayOriginNV = 5321,
-    WorldRayDirectionKHR = 5322,
-    WorldRayDirectionNV = 5322,
-    ObjectRayOriginKHR = 5323,
-    ObjectRayOriginNV = 5323,
-    ObjectRayDirectionKHR = 5324,
-    ObjectRayDirectionNV = 5324,
-    RayTminKHR = 5325,
-    RayTminNV = 5325,
-    RayTmaxKHR = 5326,
-    RayTmaxNV = 5326,
-    InstanceCustomIndexKHR = 5327,
-    InstanceCustomIndexNV = 5327,
-    ObjectToWorldKHR = 5330,
-    ObjectToWorldNV = 5330,
-    WorldToObjectKHR = 5331,
-    WorldToObjectNV = 5331,
-    HitTNV = 5332,
-    HitKindKHR = 5333,
-    HitKindNV = 5333,
-    CurrentRayTimeNV = 5334,
-    HitTriangleVertexPositionsKHR = 5335,
-    HitMicroTriangleVertexPositionsNV = 5337,
-    HitMicroTriangleVertexBarycentricsNV = 5344,
-    IncomingRayFlagsKHR = 5351,
-    IncomingRayFlagsNV = 5351,
-    RayGeometryIndexKHR = 5352,
-    HitIsSphereNV = 5359,
-    HitIsLSSNV = 5360,
-    HitSpherePositionNV = 5361,
-    WarpsPerSMNV = 5374,
-    SMCountNV = 5375,
-    WarpIDNV = 5376,
-    SMIDNV = 5377,
-    HitLSSPositionsNV = 5396,
-    HitKindFrontFacingMicroTriangleNV = 5405,
-    HitKindBackFacingMicroTriangleNV = 5406,
-    HitSphereRadiusNV = 5420,
-    HitLSSRadiiNV = 5421,
-    ClusterIDNV = 5436,
-    CullMaskKHR = 6021,
-    Max = 0x7fffffff,
-};
-
-enum class SelectionControlShift : unsigned {
-    Flatten = 0,
-    DontFlatten = 1,
-    Max = 0x7fffffff,
-};
-
-enum class SelectionControlMask : unsigned {
-    MaskNone = 0,
-    Flatten = 0x00000001,
-    DontFlatten = 0x00000002,
-};
-
-enum class LoopControlShift : unsigned {
-    Unroll = 0,
-    DontUnroll = 1,
-    DependencyInfinite = 2,
-    DependencyLength = 3,
-    MinIterations = 4,
-    MaxIterations = 5,
-    IterationMultiple = 6,
-    PeelCount = 7,
-    PartialCount = 8,
-    InitiationIntervalALTERA = 16,
-    InitiationIntervalINTEL = 16,
-    MaxConcurrencyALTERA = 17,
-    MaxConcurrencyINTEL = 17,
-    DependencyArrayALTERA = 18,
-    DependencyArrayINTEL = 18,
-    PipelineEnableALTERA = 19,
-    PipelineEnableINTEL = 19,
-    LoopCoalesceALTERA = 20,
-    LoopCoalesceINTEL = 20,
-    MaxInterleavingALTERA = 21,
-    MaxInterleavingINTEL = 21,
-    SpeculatedIterationsALTERA = 22,
-    SpeculatedIterationsINTEL = 22,
-    NoFusionALTERA = 23,
-    NoFusionINTEL = 23,
-    LoopCountALTERA = 24,
-    LoopCountINTEL = 24,
-    MaxReinvocationDelayALTERA = 25,
-    MaxReinvocationDelayINTEL = 25,
-    Max = 0x7fffffff,
-};
-
-enum class LoopControlMask : unsigned {
-    MaskNone = 0,
-    Unroll = 0x00000001,
-    DontUnroll = 0x00000002,
-    DependencyInfinite = 0x00000004,
-    DependencyLength = 0x00000008,
-    MinIterations = 0x00000010,
-    MaxIterations = 0x00000020,
-    IterationMultiple = 0x00000040,
-    PeelCount = 0x00000080,
-    PartialCount = 0x00000100,
-    InitiationIntervalALTERA = 0x00010000,
-    InitiationIntervalINTEL = 0x00010000,
-    MaxConcurrencyALTERA = 0x00020000,
-    MaxConcurrencyINTEL = 0x00020000,
-    DependencyArrayALTERA = 0x00040000,
-    DependencyArrayINTEL = 0x00040000,
-    PipelineEnableALTERA = 0x00080000,
-    PipelineEnableINTEL = 0x00080000,
-    LoopCoalesceALTERA = 0x00100000,
-    LoopCoalesceINTEL = 0x00100000,
-    MaxInterleavingALTERA = 0x00200000,
-    MaxInterleavingINTEL = 0x00200000,
-    SpeculatedIterationsALTERA = 0x00400000,
-    SpeculatedIterationsINTEL = 0x00400000,
-    NoFusionALTERA = 0x00800000,
-    NoFusionINTEL = 0x00800000,
-    LoopCountALTERA = 0x01000000,
-    LoopCountINTEL = 0x01000000,
-    MaxReinvocationDelayALTERA = 0x02000000,
-    MaxReinvocationDelayINTEL = 0x02000000,
-};
-
-enum class FunctionControlShift : unsigned {
-    Inline = 0,
-    DontInline = 1,
-    Pure = 2,
-    Const = 3,
-    OptNoneEXT = 16,
-    OptNoneINTEL = 16,
-    Max = 0x7fffffff,
-};
-
-enum class FunctionControlMask : unsigned {
-    MaskNone = 0,
-    Inline = 0x00000001,
-    DontInline = 0x00000002,
-    Pure = 0x00000004,
-    Const = 0x00000008,
-    OptNoneEXT = 0x00010000,
-    OptNoneINTEL = 0x00010000,
-};
-
-enum class MemorySemanticsShift : unsigned {
-    Acquire = 1,
-    Release = 2,
-    AcquireRelease = 3,
-    SequentiallyConsistent = 4,
-    UniformMemory = 6,
-    SubgroupMemory = 7,
-    WorkgroupMemory = 8,
-    CrossWorkgroupMemory = 9,
-    AtomicCounterMemory = 10,
-    ImageMemory = 11,
-    OutputMemory = 12,
-    OutputMemoryKHR = 12,
-    MakeAvailable = 13,
-    MakeAvailableKHR = 13,
-    MakeVisible = 14,
-    MakeVisibleKHR = 14,
-    Volatile = 15,
-    Max = 0x7fffffff,
-};
-
-enum class MemorySemanticsMask : unsigned {
-    MaskNone = 0,
-    Acquire = 0x00000002,
-    Release = 0x00000004,
-    AcquireRelease = 0x00000008,
-    SequentiallyConsistent = 0x00000010,
-    UniformMemory = 0x00000040,
-    SubgroupMemory = 0x00000080,
-    WorkgroupMemory = 0x00000100,
-    CrossWorkgroupMemory = 0x00000200,
-    AtomicCounterMemory = 0x00000400,
-    ImageMemory = 0x00000800,
-    OutputMemory = 0x00001000,
-    OutputMemoryKHR = 0x00001000,
-    MakeAvailable = 0x00002000,
-    MakeAvailableKHR = 0x00002000,
-    MakeVisible = 0x00004000,
-    MakeVisibleKHR = 0x00004000,
-    Volatile = 0x00008000,
-};
-
-enum class MemoryAccessShift : unsigned {
-    Volatile = 0,
-    Aligned = 1,
-    Nontemporal = 2,
-    MakePointerAvailable = 3,
-    MakePointerAvailableKHR = 3,
-    MakePointerVisible = 4,
-    MakePointerVisibleKHR = 4,
-    NonPrivatePointer = 5,
-    NonPrivatePointerKHR = 5,
-    AliasScopeINTELMask = 16,
-    NoAliasINTELMask = 17,
-    Max = 0x7fffffff,
-};
-
-enum class MemoryAccessMask : unsigned {
-    MaskNone = 0,
-    Volatile = 0x00000001,
-    Aligned = 0x00000002,
-    Nontemporal = 0x00000004,
-    MakePointerAvailable = 0x00000008,
-    MakePointerAvailableKHR = 0x00000008,
-    MakePointerVisible = 0x00000010,
-    MakePointerVisibleKHR = 0x00000010,
-    NonPrivatePointer = 0x00000020,
-    NonPrivatePointerKHR = 0x00000020,
-    AliasScopeINTELMask = 0x00010000,
-    NoAliasINTELMask = 0x00020000,
-};
-
-enum class Scope : unsigned {
-    CrossDevice = 0,
-    Device = 1,
-    Workgroup = 2,
-    Subgroup = 3,
-    Invocation = 4,
-    QueueFamily = 5,
-    QueueFamilyKHR = 5,
-    ShaderCallKHR = 6,
-    Max = 0x7fffffff,
-};
-
-enum class GroupOperation : unsigned {
-    Reduce = 0,
-    InclusiveScan = 1,
-    ExclusiveScan = 2,
-    ClusteredReduce = 3,
-    PartitionedReduceNV = 6,
-    PartitionedInclusiveScanNV = 7,
-    PartitionedExclusiveScanNV = 8,
-    Max = 0x7fffffff,
-};
-
-enum class KernelEnqueueFlags : unsigned {
-    NoWait = 0,
-    WaitKernel = 1,
-    WaitWorkGroup = 2,
-    Max = 0x7fffffff,
-};
-
-enum class KernelProfilingInfoShift : unsigned {
-    CmdExecTime = 0,
-    Max = 0x7fffffff,
-};
-
-enum class KernelProfilingInfoMask : unsigned {
-    MaskNone = 0,
-    CmdExecTime = 0x00000001,
-};
-
-enum class Capability : unsigned {
-    Matrix = 0,
-    Shader = 1,
-    Geometry = 2,
-    Tessellation = 3,
-    Addresses = 4,
-    Linkage = 5,
-    Kernel = 6,
-    Vector16 = 7,
-    Float16Buffer = 8,
-    Float16 = 9,
-    Float64 = 10,
-    Int64 = 11,
-    Int64Atomics = 12,
-    ImageBasic = 13,
-    ImageReadWrite = 14,
-    ImageMipmap = 15,
-    Pipes = 17,
-    Groups = 18,
-    DeviceEnqueue = 19,
-    LiteralSampler = 20,
-    AtomicStorage = 21,
-    Int16 = 22,
-    TessellationPointSize = 23,
-    GeometryPointSize = 24,
-    ImageGatherExtended = 25,
-    StorageImageMultisample = 27,
-    UniformBufferArrayDynamicIndexing = 28,
-    SampledImageArrayDynamicIndexing = 29,
-    StorageBufferArrayDynamicIndexing = 30,
-    StorageImageArrayDynamicIndexing = 31,
-    ClipDistance = 32,
-    CullDistance = 33,
-    ImageCubeArray = 34,
-    SampleRateShading = 35,
-    ImageRect = 36,
-    SampledRect = 37,
-    GenericPointer = 38,
-    Int8 = 39,
-    InputAttachment = 40,
-    SparseResidency = 41,
-    MinLod = 42,
-    Sampled1D = 43,
-    Image1D = 44,
-    SampledCubeArray = 45,
-    SampledBuffer = 46,
-    ImageBuffer = 47,
-    ImageMSArray = 48,
-    StorageImageExtendedFormats = 49,
-    ImageQuery = 50,
-    DerivativeControl = 51,
-    InterpolationFunction = 52,
-    TransformFeedback = 53,
-    GeometryStreams = 54,
-    StorageImageReadWithoutFormat = 55,
-    StorageImageWriteWithoutFormat = 56,
-    MultiViewport = 57,
-    SubgroupDispatch = 58,
-    NamedBarrier = 59,
-    PipeStorage = 60,
-    GroupNonUniform = 61,
-    GroupNonUniformVote = 62,
-    GroupNonUniformArithmetic = 63,
-    GroupNonUniformBallot = 64,
-    GroupNonUniformShuffle = 65,
-    GroupNonUniformShuffleRelative = 66,
-    GroupNonUniformClustered = 67,
-    GroupNonUniformQuad = 68,
-    ShaderLayer = 69,
-    ShaderViewportIndex = 70,
-    UniformDecoration = 71,
-    CoreBuiltinsARM = 4165,
-    TileImageColorReadAccessEXT = 4166,
-    TileImageDepthReadAccessEXT = 4167,
-    TileImageStencilReadAccessEXT = 4168,
-    TensorsARM = 4174,
-    StorageTensorArrayDynamicIndexingARM = 4175,
-    StorageTensorArrayNonUniformIndexingARM = 4176,
-    GraphARM = 4191,
-    CooperativeMatrixLayoutsARM = 4201,
-    Float8EXT = 4212,
-    Float8CooperativeMatrixEXT = 4213,
-    FragmentShadingRateKHR = 4422,
-    SubgroupBallotKHR = 4423,
-    DrawParameters = 4427,
-    WorkgroupMemoryExplicitLayoutKHR = 4428,
-    WorkgroupMemoryExplicitLayout8BitAccessKHR = 4429,
-    WorkgroupMemoryExplicitLayout16BitAccessKHR = 4430,
-    SubgroupVoteKHR = 4431,
-    StorageBuffer16BitAccess = 4433,
-    StorageUniformBufferBlock16 = 4433,
-    StorageUniform16 = 4434,
-    UniformAndStorageBuffer16BitAccess = 4434,
-    StoragePushConstant16 = 4435,
-    StorageInputOutput16 = 4436,
-    DeviceGroup = 4437,
-    MultiView = 4439,
-    VariablePointersStorageBuffer = 4441,
-    VariablePointers = 4442,
-    AtomicStorageOps = 4445,
-    SampleMaskPostDepthCoverage = 4447,
-    StorageBuffer8BitAccess = 4448,
-    UniformAndStorageBuffer8BitAccess = 4449,
-    StoragePushConstant8 = 4450,
-    DenormPreserve = 4464,
-    DenormFlushToZero = 4465,
-    SignedZeroInfNanPreserve = 4466,
-    RoundingModeRTE = 4467,
-    RoundingModeRTZ = 4468,
-    RayQueryProvisionalKHR = 4471,
-    RayQueryKHR = 4472,
-    UntypedPointersKHR = 4473,
-    RayTraversalPrimitiveCullingKHR = 4478,
-    RayTracingKHR = 4479,
-    TextureSampleWeightedQCOM = 4484,
-    TextureBoxFilterQCOM = 4485,
-    TextureBlockMatchQCOM = 4486,
-    TileShadingQCOM = 4495,
-    CooperativeMatrixConversionQCOM = 4496,
-    TextureBlockMatch2QCOM = 4498,
-    Float16ImageAMD = 5008,
-    ImageGatherBiasLodAMD = 5009,
-    FragmentMaskAMD = 5010,
-    StencilExportEXT = 5013,
-    ImageReadWriteLodAMD = 5015,
-    Int64ImageEXT = 5016,
-    ShaderClockKHR = 5055,
-    ShaderEnqueueAMDX = 5067,
-    QuadControlKHR = 5087,
-    Int4TypeINTEL = 5112,
-    Int4CooperativeMatrixINTEL = 5114,
-    BFloat16TypeKHR = 5116,
-    BFloat16DotProductKHR = 5117,
-    BFloat16CooperativeMatrixKHR = 5118,
-    SampleMaskOverrideCoverageNV = 5249,
-    GeometryShaderPassthroughNV = 5251,
-    ShaderViewportIndexLayerEXT = 5254,
-    ShaderViewportIndexLayerNV = 5254,
-    ShaderViewportMaskNV = 5255,
-    ShaderStereoViewNV = 5259,
-    PerViewAttributesNV = 5260,
-    FragmentFullyCoveredEXT = 5265,
-    MeshShadingNV = 5266,
-    ImageFootprintNV = 5282,
-    MeshShadingEXT = 5283,
-    FragmentBarycentricKHR = 5284,
-    FragmentBarycentricNV = 5284,
-    ComputeDerivativeGroupQuadsKHR = 5288,
-    ComputeDerivativeGroupQuadsNV = 5288,
-    FragmentDensityEXT = 5291,
-    ShadingRateNV = 5291,
-    GroupNonUniformPartitionedNV = 5297,
-    ShaderNonUniform = 5301,
-    ShaderNonUniformEXT = 5301,
-    RuntimeDescriptorArray = 5302,
-    RuntimeDescriptorArrayEXT = 5302,
-    InputAttachmentArrayDynamicIndexing = 5303,
-    InputAttachmentArrayDynamicIndexingEXT = 5303,
-    UniformTexelBufferArrayDynamicIndexing = 5304,
-    UniformTexelBufferArrayDynamicIndexingEXT = 5304,
-    StorageTexelBufferArrayDynamicIndexing = 5305,
-    StorageTexelBufferArrayDynamicIndexingEXT = 5305,
-    UniformBufferArrayNonUniformIndexing = 5306,
-    UniformBufferArrayNonUniformIndexingEXT = 5306,
-    SampledImageArrayNonUniformIndexing = 5307,
-    SampledImageArrayNonUniformIndexingEXT = 5307,
-    StorageBufferArrayNonUniformIndexing = 5308,
-    StorageBufferArrayNonUniformIndexingEXT = 5308,
-    StorageImageArrayNonUniformIndexing = 5309,
-    StorageImageArrayNonUniformIndexingEXT = 5309,
-    InputAttachmentArrayNonUniformIndexing = 5310,
-    InputAttachmentArrayNonUniformIndexingEXT = 5310,
-    UniformTexelBufferArrayNonUniformIndexing = 5311,
-    UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
-    StorageTexelBufferArrayNonUniformIndexing = 5312,
-    StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
-    RayTracingPositionFetchKHR = 5336,
-    RayTracingNV = 5340,
-    RayTracingMotionBlurNV = 5341,
-    VulkanMemoryModel = 5345,
-    VulkanMemoryModelKHR = 5345,
-    VulkanMemoryModelDeviceScope = 5346,
-    VulkanMemoryModelDeviceScopeKHR = 5346,
-    PhysicalStorageBufferAddresses = 5347,
-    PhysicalStorageBufferAddressesEXT = 5347,
-    ComputeDerivativeGroupLinearKHR = 5350,
-    ComputeDerivativeGroupLinearNV = 5350,
-    RayTracingProvisionalKHR = 5353,
-    CooperativeMatrixNV = 5357,
-    FragmentShaderSampleInterlockEXT = 5363,
-    FragmentShaderShadingRateInterlockEXT = 5372,
-    ShaderSMBuiltinsNV = 5373,
-    FragmentShaderPixelInterlockEXT = 5378,
-    DemoteToHelperInvocation = 5379,
-    DemoteToHelperInvocationEXT = 5379,
-    DisplacementMicromapNV = 5380,
-    RayTracingOpacityMicromapEXT = 5381,
-    ShaderInvocationReorderNV = 5383,
-    ShaderInvocationReorderEXT = 5388,
-    BindlessTextureNV = 5390,
-    RayQueryPositionFetchKHR = 5391,
-    CooperativeVectorNV = 5394,
-    AtomicFloat16VectorNV = 5404,
-    RayTracingDisplacementMicromapNV = 5409,
-    RawAccessChainsNV = 5414,
-    RayTracingSpheresGeometryNV = 5418,
-    RayTracingLinearSweptSpheresGeometryNV = 5419,
-    Shader64BitIndexingEXT = 5426,
-    CooperativeMatrixReductionsNV = 5430,
-    CooperativeMatrixConversionsNV = 5431,
-    CooperativeMatrixPerElementOperationsNV = 5432,
-    CooperativeMatrixTensorAddressingNV = 5433,
-    CooperativeMatrixBlockLoadsNV = 5434,
-    CooperativeVectorTrainingNV = 5435,
-    RayTracingClusterAccelerationStructureNV = 5437,
-    TensorAddressingNV = 5439,
-    SubgroupShuffleINTEL = 5568,
-    SubgroupBufferBlockIOINTEL = 5569,
-    SubgroupImageBlockIOINTEL = 5570,
-    SubgroupImageMediaBlockIOINTEL = 5579,
-    RoundToInfinityINTEL = 5582,
-    FloatingPointModeINTEL = 5583,
-    IntegerFunctions2INTEL = 5584,
-    FunctionPointersINTEL = 5603,
-    IndirectReferencesINTEL = 5604,
-    AsmINTEL = 5606,
-    AtomicFloat32MinMaxEXT = 5612,
-    AtomicFloat64MinMaxEXT = 5613,
-    AtomicFloat16MinMaxEXT = 5616,
-    VectorComputeINTEL = 5617,
-    VectorAnyINTEL = 5619,
-    ExpectAssumeKHR = 5629,
-    SubgroupAvcMotionEstimationINTEL = 5696,
-    SubgroupAvcMotionEstimationIntraINTEL = 5697,
-    SubgroupAvcMotionEstimationChromaINTEL = 5698,
-    VariableLengthArrayINTEL = 5817,
-    FunctionFloatControlINTEL = 5821,
-    FPGAMemoryAttributesALTERA = 5824,
-    FPGAMemoryAttributesINTEL = 5824,
-    FPFastMathModeINTEL = 5837,
-    ArbitraryPrecisionIntegersALTERA = 5844,
-    ArbitraryPrecisionIntegersINTEL = 5844,
-    ArbitraryPrecisionFloatingPointALTERA = 5845,
-    ArbitraryPrecisionFloatingPointINTEL = 5845,
-    UnstructuredLoopControlsINTEL = 5886,
-    FPGALoopControlsALTERA = 5888,
-    FPGALoopControlsINTEL = 5888,
-    KernelAttributesINTEL = 5892,
-    FPGAKernelAttributesINTEL = 5897,
-    FPGAMemoryAccessesALTERA = 5898,
-    FPGAMemoryAccessesINTEL = 5898,
-    FPGAClusterAttributesALTERA = 5904,
-    FPGAClusterAttributesINTEL = 5904,
-    LoopFuseALTERA = 5906,
-    LoopFuseINTEL = 5906,
-    FPGADSPControlALTERA = 5908,
-    FPGADSPControlINTEL = 5908,
-    MemoryAccessAliasingINTEL = 5910,
-    FPGAInvocationPipeliningAttributesALTERA = 5916,
-    FPGAInvocationPipeliningAttributesINTEL = 5916,
-    FPGABufferLocationALTERA = 5920,
-    FPGABufferLocationINTEL = 5920,
-    ArbitraryPrecisionFixedPointALTERA = 5922,
-    ArbitraryPrecisionFixedPointINTEL = 5922,
-    USMStorageClassesALTERA = 5935,
-    USMStorageClassesINTEL = 5935,
-    RuntimeAlignedAttributeALTERA = 5939,
-    RuntimeAlignedAttributeINTEL = 5939,
-    IOPipesALTERA = 5943,
-    IOPipesINTEL = 5943,
-    BlockingPipesALTERA = 5945,
-    BlockingPipesINTEL = 5945,
-    FPGARegALTERA = 5948,
-    FPGARegINTEL = 5948,
-    DotProductInputAll = 6016,
-    DotProductInputAllKHR = 6016,
-    DotProductInput4x8Bit = 6017,
-    DotProductInput4x8BitKHR = 6017,
-    DotProductInput4x8BitPacked = 6018,
-    DotProductInput4x8BitPackedKHR = 6018,
-    DotProduct = 6019,
-    DotProductKHR = 6019,
-    RayCullMaskKHR = 6020,
-    CooperativeMatrixKHR = 6022,
-    ReplicatedCompositesEXT = 6024,
-    BitInstructions = 6025,
-    GroupNonUniformRotateKHR = 6026,
-    FloatControls2 = 6029,
-    FMAKHR = 6030,
-    AtomicFloat32AddEXT = 6033,
-    AtomicFloat64AddEXT = 6034,
-    LongCompositesINTEL = 6089,
-    OptNoneEXT = 6094,
-    OptNoneINTEL = 6094,
-    AtomicFloat16AddEXT = 6095,
-    DebugInfoModuleINTEL = 6114,
-    BFloat16ConversionINTEL = 6115,
-    SplitBarrierINTEL = 6141,
-    ArithmeticFenceEXT = 6144,
-    FPGAClusterAttributesV2ALTERA = 6150,
-    FPGAClusterAttributesV2INTEL = 6150,
-    FPGAKernelAttributesv2INTEL = 6161,
-    TaskSequenceALTERA = 6162,
-    TaskSequenceINTEL = 6162,
-    FPMaxErrorINTEL = 6169,
-    FPGALatencyControlALTERA = 6171,
-    FPGALatencyControlINTEL = 6171,
-    FPGAArgumentInterfacesALTERA = 6174,
-    FPGAArgumentInterfacesINTEL = 6174,
-    GlobalVariableHostAccessINTEL = 6187,
-    GlobalVariableFPGADecorationsALTERA = 6189,
-    GlobalVariableFPGADecorationsINTEL = 6189,
-    SubgroupBufferPrefetchINTEL = 6220,
-    Subgroup2DBlockIOINTEL = 6228,
-    Subgroup2DBlockTransformINTEL = 6229,
-    Subgroup2DBlockTransposeINTEL = 6230,
-    SubgroupMatrixMultiplyAccumulateINTEL = 6236,
-    TernaryBitwiseFunctionINTEL = 6241,
-    UntypedVariableLengthArrayINTEL = 6243,
-    SpecConditionalINTEL = 6245,
-    FunctionVariantsINTEL = 6246,
-    GroupUniformArithmeticKHR = 6400,
-    TensorFloat32RoundingINTEL = 6425,
-    MaskedGatherScatterINTEL = 6427,
-    CacheControlsINTEL = 6441,
-    RegisterLimitsINTEL = 6460,
-    BindlessImagesINTEL = 6528,
-    Max = 0x7fffffff,
-};
-
-enum class RayFlagsShift : unsigned {
-    OpaqueKHR = 0,
-    NoOpaqueKHR = 1,
-    TerminateOnFirstHitKHR = 2,
-    SkipClosestHitShaderKHR = 3,
-    CullBackFacingTrianglesKHR = 4,
-    CullFrontFacingTrianglesKHR = 5,
-    CullOpaqueKHR = 6,
-    CullNoOpaqueKHR = 7,
-    SkipBuiltinPrimitivesNV = 8,
-    SkipTrianglesKHR = 8,
-    SkipAABBsKHR = 9,
-    ForceOpacityMicromap2StateEXT = 10,
-    Max = 0x7fffffff,
-};
-
-enum class RayFlagsMask : unsigned {
-    MaskNone = 0,
-    OpaqueKHR = 0x00000001,
-    NoOpaqueKHR = 0x00000002,
-    TerminateOnFirstHitKHR = 0x00000004,
-    SkipClosestHitShaderKHR = 0x00000008,
-    CullBackFacingTrianglesKHR = 0x00000010,
-    CullFrontFacingTrianglesKHR = 0x00000020,
-    CullOpaqueKHR = 0x00000040,
-    CullNoOpaqueKHR = 0x00000080,
-    SkipBuiltinPrimitivesNV = 0x00000100,
-    SkipTrianglesKHR = 0x00000100,
-    SkipAABBsKHR = 0x00000200,
-    ForceOpacityMicromap2StateEXT = 0x00000400,
-};
-
-enum class RayQueryIntersection : unsigned {
-    RayQueryCandidateIntersectionKHR = 0,
-    RayQueryCommittedIntersectionKHR = 1,
-    Max = 0x7fffffff,
-};
-
-enum class RayQueryCommittedIntersectionType : unsigned {
-    RayQueryCommittedIntersectionNoneKHR = 0,
-    RayQueryCommittedIntersectionTriangleKHR = 1,
-    RayQueryCommittedIntersectionGeneratedKHR = 2,
-    Max = 0x7fffffff,
-};
-
-enum class RayQueryCandidateIntersectionType : unsigned {
-    RayQueryCandidateIntersectionTriangleKHR = 0,
-    RayQueryCandidateIntersectionAABBKHR = 1,
-    Max = 0x7fffffff,
-};
-
-enum class FragmentShadingRateShift : unsigned {
-    Vertical2Pixels = 0,
-    Vertical4Pixels = 1,
-    Horizontal2Pixels = 2,
-    Horizontal4Pixels = 3,
-    Max = 0x7fffffff,
-};
-
-enum class FragmentShadingRateMask : unsigned {
-    MaskNone = 0,
-    Vertical2Pixels = 0x00000001,
-    Vertical4Pixels = 0x00000002,
-    Horizontal2Pixels = 0x00000004,
-    Horizontal4Pixels = 0x00000008,
-};
-
-enum class FPDenormMode : unsigned {
-    Preserve = 0,
-    FlushToZero = 1,
-    Max = 0x7fffffff,
-};
-
-enum class FPOperationMode : unsigned {
-    IEEE = 0,
-    ALT = 1,
-    Max = 0x7fffffff,
-};
-
-enum class QuantizationModes : unsigned {
-    TRN = 0,
-    TRN_ZERO = 1,
-    RND = 2,
-    RND_ZERO = 3,
-    RND_INF = 4,
-    RND_MIN_INF = 5,
-    RND_CONV = 6,
-    RND_CONV_ODD = 7,
-    Max = 0x7fffffff,
-};
-
-enum class OverflowModes : unsigned {
-    WRAP = 0,
-    SAT = 1,
-    SAT_ZERO = 2,
-    SAT_SYM = 3,
-    Max = 0x7fffffff,
-};
-
-enum class PackedVectorFormat : unsigned {
-    PackedVectorFormat4x8Bit = 0,
-    PackedVectorFormat4x8BitKHR = 0,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeMatrixOperandsShift : unsigned {
-    MatrixASignedComponentsKHR = 0,
-    MatrixBSignedComponentsKHR = 1,
-    MatrixCSignedComponentsKHR = 2,
-    MatrixResultSignedComponentsKHR = 3,
-    SaturatingAccumulationKHR = 4,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeMatrixOperandsMask : unsigned {
-    MaskNone = 0,
-    MatrixASignedComponentsKHR = 0x00000001,
-    MatrixBSignedComponentsKHR = 0x00000002,
-    MatrixCSignedComponentsKHR = 0x00000004,
-    MatrixResultSignedComponentsKHR = 0x00000008,
-    SaturatingAccumulationKHR = 0x00000010,
-};
-
-enum class CooperativeMatrixLayout : unsigned {
-    RowMajorKHR = 0,
-    ColumnMajorKHR = 1,
-    RowBlockedInterleavedARM = 4202,
-    ColumnBlockedInterleavedARM = 4203,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeMatrixUse : unsigned {
-    MatrixAKHR = 0,
-    MatrixBKHR = 1,
-    MatrixAccumulatorKHR = 2,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeMatrixReduceShift : unsigned {
-    Row = 0,
-    Column = 1,
-    CooperativeMatrixReduce2x2 = 2,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeMatrixReduceMask : unsigned {
-    MaskNone = 0,
-    Row = 0x00000001,
-    Column = 0x00000002,
-    CooperativeMatrixReduce2x2 = 0x00000004,
-};
-
-enum class TensorClampMode : unsigned {
-    Undefined = 0,
-    Constant = 1,
-    ClampToEdge = 2,
-    Repeat = 3,
-    RepeatMirrored = 4,
-    Max = 0x7fffffff,
-};
-
-enum class TensorAddressingOperandsShift : unsigned {
-    TensorView = 0,
-    DecodeFunc = 1,
-    Max = 0x7fffffff,
-};
-
-enum class TensorAddressingOperandsMask : unsigned {
-    MaskNone = 0,
-    TensorView = 0x00000001,
-    DecodeFunc = 0x00000002,
-};
-
-enum class TensorOperandsShift : unsigned {
-    NontemporalARM = 0,
-    OutOfBoundsValueARM = 1,
-    MakeElementAvailableARM = 2,
-    MakeElementVisibleARM = 3,
-    NonPrivateElementARM = 4,
-    Max = 0x7fffffff,
-};
-
-enum class TensorOperandsMask : unsigned {
-    MaskNone = 0,
-    NontemporalARM = 0x00000001,
-    OutOfBoundsValueARM = 0x00000002,
-    MakeElementAvailableARM = 0x00000004,
-    MakeElementVisibleARM = 0x00000008,
-    NonPrivateElementARM = 0x00000010,
-};
-
-enum class InitializationModeQualifier : unsigned {
-    InitOnDeviceReprogramALTERA = 0,
-    InitOnDeviceReprogramINTEL = 0,
-    InitOnDeviceResetALTERA = 1,
-    InitOnDeviceResetINTEL = 1,
-    Max = 0x7fffffff,
-};
-
-enum class HostAccessQualifier : unsigned {
-    NoneINTEL = 0,
-    ReadINTEL = 1,
-    WriteINTEL = 2,
-    ReadWriteINTEL = 3,
-    Max = 0x7fffffff,
-};
-
-enum class LoadCacheControl : unsigned {
-    UncachedINTEL = 0,
-    CachedINTEL = 1,
-    StreamingINTEL = 2,
-    InvalidateAfterReadINTEL = 3,
-    ConstCachedINTEL = 4,
-    Max = 0x7fffffff,
-};
-
-enum class StoreCacheControl : unsigned {
-    UncachedINTEL = 0,
-    WriteThroughINTEL = 1,
-    WriteBackINTEL = 2,
-    StreamingINTEL = 3,
-    Max = 0x7fffffff,
-};
-
-enum class NamedMaximumNumberOfRegisters : unsigned {
-    AutoINTEL = 0,
-    Max = 0x7fffffff,
-};
-
-enum class MatrixMultiplyAccumulateOperandsShift : unsigned {
-    MatrixASignedComponentsINTEL = 0,
-    MatrixBSignedComponentsINTEL = 1,
-    MatrixCBFloat16INTEL = 2,
-    MatrixResultBFloat16INTEL = 3,
-    MatrixAPackedInt8INTEL = 4,
-    MatrixBPackedInt8INTEL = 5,
-    MatrixAPackedInt4INTEL = 6,
-    MatrixBPackedInt4INTEL = 7,
-    MatrixATF32INTEL = 8,
-    MatrixBTF32INTEL = 9,
-    MatrixAPackedFloat16INTEL = 10,
-    MatrixBPackedFloat16INTEL = 11,
-    MatrixAPackedBFloat16INTEL = 12,
-    MatrixBPackedBFloat16INTEL = 13,
-    Max = 0x7fffffff,
-};
-
-enum class MatrixMultiplyAccumulateOperandsMask : unsigned {
-    MaskNone = 0,
-    MatrixASignedComponentsINTEL = 0x00000001,
-    MatrixBSignedComponentsINTEL = 0x00000002,
-    MatrixCBFloat16INTEL = 0x00000004,
-    MatrixResultBFloat16INTEL = 0x00000008,
-    MatrixAPackedInt8INTEL = 0x00000010,
-    MatrixBPackedInt8INTEL = 0x00000020,
-    MatrixAPackedInt4INTEL = 0x00000040,
-    MatrixBPackedInt4INTEL = 0x00000080,
-    MatrixATF32INTEL = 0x00000100,
-    MatrixBTF32INTEL = 0x00000200,
-    MatrixAPackedFloat16INTEL = 0x00000400,
-    MatrixBPackedFloat16INTEL = 0x00000800,
-    MatrixAPackedBFloat16INTEL = 0x00001000,
-    MatrixBPackedBFloat16INTEL = 0x00002000,
-};
-
-enum class RawAccessChainOperandsShift : unsigned {
-    RobustnessPerComponentNV = 0,
-    RobustnessPerElementNV = 1,
-    Max = 0x7fffffff,
-};
-
-enum class RawAccessChainOperandsMask : unsigned {
-    MaskNone = 0,
-    RobustnessPerComponentNV = 0x00000001,
-    RobustnessPerElementNV = 0x00000002,
-};
-
-enum class FPEncoding : unsigned {
-    BFloat16KHR = 0,
-    Float8E4M3EXT = 4214,
-    Float8E5M2EXT = 4215,
-    Max = 0x7fffffff,
-};
-
-enum class CooperativeVectorMatrixLayout : unsigned {
-    RowMajorNV = 0,
-    ColumnMajorNV = 1,
-    InferencingOptimalNV = 2,
-    TrainingOptimalNV = 3,
-    Max = 0x7fffffff,
-};
-
-enum class ComponentType : unsigned {
-    Float16NV = 0,
-    Float32NV = 1,
-    Float64NV = 2,
-    SignedInt8NV = 3,
-    SignedInt16NV = 4,
-    SignedInt32NV = 5,
-    SignedInt64NV = 6,
-    UnsignedInt8NV = 7,
-    UnsignedInt16NV = 8,
-    UnsignedInt32NV = 9,
-    UnsignedInt64NV = 10,
-    SignedInt8PackedNV = 1000491000,
-    UnsignedInt8PackedNV = 1000491001,
-    FloatE4M3NV = 1000491002,
-    FloatE5M2NV = 1000491003,
-    Max = 0x7fffffff,
-};
-
-enum class Op : unsigned {
-    OpNop = 0,
-    OpUndef = 1,
-    OpSourceContinued = 2,
-    OpSource = 3,
-    OpSourceExtension = 4,
-    OpName = 5,
-    OpMemberName = 6,
-    OpString = 7,
-    OpLine = 8,
-    OpExtension = 10,
-    OpExtInstImport = 11,
-    OpExtInst = 12,
-    OpMemoryModel = 14,
-    OpEntryPoint = 15,
-    OpExecutionMode = 16,
-    OpCapability = 17,
-    OpTypeVoid = 19,
-    OpTypeBool = 20,
-    OpTypeInt = 21,
-    OpTypeFloat = 22,
-    OpTypeVector = 23,
-    OpTypeMatrix = 24,
-    OpTypeImage = 25,
-    OpTypeSampler = 26,
-    OpTypeSampledImage = 27,
-    OpTypeArray = 28,
-    OpTypeRuntimeArray = 29,
-    OpTypeStruct = 30,
-    OpTypeOpaque = 31,
-    OpTypePointer = 32,
-    OpTypeFunction = 33,
-    OpTypeEvent = 34,
-    OpTypeDeviceEvent = 35,
-    OpTypeReserveId = 36,
-    OpTypeQueue = 37,
-    OpTypePipe = 38,
-    OpTypeForwardPointer = 39,
-    OpConstantTrue = 41,
-    OpConstantFalse = 42,
-    OpConstant = 43,
-    OpConstantComposite = 44,
-    OpConstantSampler = 45,
-    OpConstantNull = 46,
-    OpSpecConstantTrue = 48,
-    OpSpecConstantFalse = 49,
-    OpSpecConstant = 50,
-    OpSpecConstantComposite = 51,
-    OpSpecConstantOp = 52,
-    OpFunction = 54,
-    OpFunctionParameter = 55,
-    OpFunctionEnd = 56,
-    OpFunctionCall = 57,
-    OpVariable = 59,
-    OpImageTexelPointer = 60,
-    OpLoad = 61,
-    OpStore = 62,
-    OpCopyMemory = 63,
-    OpCopyMemorySized = 64,
-    OpAccessChain = 65,
-    OpInBoundsAccessChain = 66,
-    OpPtrAccessChain = 67,
-    OpArrayLength = 68,
-    OpGenericPtrMemSemantics = 69,
-    OpInBoundsPtrAccessChain = 70,
-    OpDecorate = 71,
-    OpMemberDecorate = 72,
-    OpDecorationGroup = 73,
-    OpGroupDecorate = 74,
-    OpGroupMemberDecorate = 75,
-    OpVectorExtractDynamic = 77,
-    OpVectorInsertDynamic = 78,
-    OpVectorShuffle = 79,
-    OpCompositeConstruct = 80,
-    OpCompositeExtract = 81,
-    OpCompositeInsert = 82,
-    OpCopyObject = 83,
-    OpTranspose = 84,
-    OpSampledImage = 86,
-    OpImageSampleImplicitLod = 87,
-    OpImageSampleExplicitLod = 88,
-    OpImageSampleDrefImplicitLod = 89,
-    OpImageSampleDrefExplicitLod = 90,
-    OpImageSampleProjImplicitLod = 91,
-    OpImageSampleProjExplicitLod = 92,
-    OpImageSampleProjDrefImplicitLod = 93,
-    OpImageSampleProjDrefExplicitLod = 94,
-    OpImageFetch = 95,
-    OpImageGather = 96,
-    OpImageDrefGather = 97,
-    OpImageRead = 98,
-    OpImageWrite = 99,
-    OpImage = 100,
-    OpImageQueryFormat = 101,
-    OpImageQueryOrder = 102,
-    OpImageQuerySizeLod = 103,
-    OpImageQuerySize = 104,
-    OpImageQueryLod = 105,
-    OpImageQueryLevels = 106,
-    OpImageQuerySamples = 107,
-    OpConvertFToU = 109,
-    OpConvertFToS = 110,
-    OpConvertSToF = 111,
-    OpConvertUToF = 112,
-    OpUConvert = 113,
-    OpSConvert = 114,
-    OpFConvert = 115,
-    OpQuantizeToF16 = 116,
-    OpConvertPtrToU = 117,
-    OpSatConvertSToU = 118,
-    OpSatConvertUToS = 119,
-    OpConvertUToPtr = 120,
-    OpPtrCastToGeneric = 121,
-    OpGenericCastToPtr = 122,
-    OpGenericCastToPtrExplicit = 123,
-    OpBitcast = 124,
-    OpSNegate = 126,
-    OpFNegate = 127,
-    OpIAdd = 128,
-    OpFAdd = 129,
-    OpISub = 130,
-    OpFSub = 131,
-    OpIMul = 132,
-    OpFMul = 133,
-    OpUDiv = 134,
-    OpSDiv = 135,
-    OpFDiv = 136,
-    OpUMod = 137,
-    OpSRem = 138,
-    OpSMod = 139,
-    OpFRem = 140,
-    OpFMod = 141,
-    OpVectorTimesScalar = 142,
-    OpMatrixTimesScalar = 143,
-    OpVectorTimesMatrix = 144,
-    OpMatrixTimesVector = 145,
-    OpMatrixTimesMatrix = 146,
-    OpOuterProduct = 147,
-    OpDot = 148,
-    OpIAddCarry = 149,
-    OpISubBorrow = 150,
-    OpUMulExtended = 151,
-    OpSMulExtended = 152,
-    OpAny = 154,
-    OpAll = 155,
-    OpIsNan = 156,
-    OpIsInf = 157,
-    OpIsFinite = 158,
-    OpIsNormal = 159,
-    OpSignBitSet = 160,
-    OpLessOrGreater = 161,
-    OpOrdered = 162,
-    OpUnordered = 163,
-    OpLogicalEqual = 164,
-    OpLogicalNotEqual = 165,
-    OpLogicalOr = 166,
-    OpLogicalAnd = 167,
-    OpLogicalNot = 168,
-    OpSelect = 169,
-    OpIEqual = 170,
-    OpINotEqual = 171,
-    OpUGreaterThan = 172,
-    OpSGreaterThan = 173,
-    OpUGreaterThanEqual = 174,
-    OpSGreaterThanEqual = 175,
-    OpULessThan = 176,
-    OpSLessThan = 177,
-    OpULessThanEqual = 178,
-    OpSLessThanEqual = 179,
-    OpFOrdEqual = 180,
-    OpFUnordEqual = 181,
-    OpFOrdNotEqual = 182,
-    OpFUnordNotEqual = 183,
-    OpFOrdLessThan = 184,
-    OpFUnordLessThan = 185,
-    OpFOrdGreaterThan = 186,
-    OpFUnordGreaterThan = 187,
-    OpFOrdLessThanEqual = 188,
-    OpFUnordLessThanEqual = 189,
-    OpFOrdGreaterThanEqual = 190,
-    OpFUnordGreaterThanEqual = 191,
-    OpShiftRightLogical = 194,
-    OpShiftRightArithmetic = 195,
-    OpShiftLeftLogical = 196,
-    OpBitwiseOr = 197,
-    OpBitwiseXor = 198,
-    OpBitwiseAnd = 199,
-    OpNot = 200,
-    OpBitFieldInsert = 201,
-    OpBitFieldSExtract = 202,
-    OpBitFieldUExtract = 203,
-    OpBitReverse = 204,
-    OpBitCount = 205,
-    OpDPdx = 207,
-    OpDPdy = 208,
-    OpFwidth = 209,
-    OpDPdxFine = 210,
-    OpDPdyFine = 211,
-    OpFwidthFine = 212,
-    OpDPdxCoarse = 213,
-    OpDPdyCoarse = 214,
-    OpFwidthCoarse = 215,
-    OpEmitVertex = 218,
-    OpEndPrimitive = 219,
-    OpEmitStreamVertex = 220,
-    OpEndStreamPrimitive = 221,
-    OpControlBarrier = 224,
-    OpMemoryBarrier = 225,
-    OpAtomicLoad = 227,
-    OpAtomicStore = 228,
-    OpAtomicExchange = 229,
-    OpAtomicCompareExchange = 230,
-    OpAtomicCompareExchangeWeak = 231,
-    OpAtomicIIncrement = 232,
-    OpAtomicIDecrement = 233,
-    OpAtomicIAdd = 234,
-    OpAtomicISub = 235,
-    OpAtomicSMin = 236,
-    OpAtomicUMin = 237,
-    OpAtomicSMax = 238,
-    OpAtomicUMax = 239,
-    OpAtomicAnd = 240,
-    OpAtomicOr = 241,
-    OpAtomicXor = 242,
-    OpPhi = 245,
-    OpLoopMerge = 246,
-    OpSelectionMerge = 247,
-    OpLabel = 248,
-    OpBranch = 249,
-    OpBranchConditional = 250,
-    OpSwitch = 251,
-    OpKill = 252,
-    OpReturn = 253,
-    OpReturnValue = 254,
-    OpUnreachable = 255,
-    OpLifetimeStart = 256,
-    OpLifetimeStop = 257,
-    OpGroupAsyncCopy = 259,
-    OpGroupWaitEvents = 260,
-    OpGroupAll = 261,
-    OpGroupAny = 262,
-    OpGroupBroadcast = 263,
-    OpGroupIAdd = 264,
-    OpGroupFAdd = 265,
-    OpGroupFMin = 266,
-    OpGroupUMin = 267,
-    OpGroupSMin = 268,
-    OpGroupFMax = 269,
-    OpGroupUMax = 270,
-    OpGroupSMax = 271,
-    OpReadPipe = 274,
-    OpWritePipe = 275,
-    OpReservedReadPipe = 276,
-    OpReservedWritePipe = 277,
-    OpReserveReadPipePackets = 278,
-    OpReserveWritePipePackets = 279,
-    OpCommitReadPipe = 280,
-    OpCommitWritePipe = 281,
-    OpIsValidReserveId = 282,
-    OpGetNumPipePackets = 283,
-    OpGetMaxPipePackets = 284,
-    OpGroupReserveReadPipePackets = 285,
-    OpGroupReserveWritePipePackets = 286,
-    OpGroupCommitReadPipe = 287,
-    OpGroupCommitWritePipe = 288,
-    OpEnqueueMarker = 291,
-    OpEnqueueKernel = 292,
-    OpGetKernelNDrangeSubGroupCount = 293,
-    OpGetKernelNDrangeMaxSubGroupSize = 294,
-    OpGetKernelWorkGroupSize = 295,
-    OpGetKernelPreferredWorkGroupSizeMultiple = 296,
-    OpRetainEvent = 297,
-    OpReleaseEvent = 298,
-    OpCreateUserEvent = 299,
-    OpIsValidEvent = 300,
-    OpSetUserEventStatus = 301,
-    OpCaptureEventProfilingInfo = 302,
-    OpGetDefaultQueue = 303,
-    OpBuildNDRange = 304,
-    OpImageSparseSampleImplicitLod = 305,
-    OpImageSparseSampleExplicitLod = 306,
-    OpImageSparseSampleDrefImplicitLod = 307,
-    OpImageSparseSampleDrefExplicitLod = 308,
-    OpImageSparseSampleProjImplicitLod = 309,
-    OpImageSparseSampleProjExplicitLod = 310,
-    OpImageSparseSampleProjDrefImplicitLod = 311,
-    OpImageSparseSampleProjDrefExplicitLod = 312,
-    OpImageSparseFetch = 313,
-    OpImageSparseGather = 314,
-    OpImageSparseDrefGather = 315,
-    OpImageSparseTexelsResident = 316,
-    OpNoLine = 317,
-    OpAtomicFlagTestAndSet = 318,
-    OpAtomicFlagClear = 319,
-    OpImageSparseRead = 320,
-    OpSizeOf = 321,
-    OpTypePipeStorage = 322,
-    OpConstantPipeStorage = 323,
-    OpCreatePipeFromPipeStorage = 324,
-    OpGetKernelLocalSizeForSubgroupCount = 325,
-    OpGetKernelMaxNumSubgroups = 326,
-    OpTypeNamedBarrier = 327,
-    OpNamedBarrierInitialize = 328,
-    OpMemoryNamedBarrier = 329,
-    OpModuleProcessed = 330,
-    OpExecutionModeId = 331,
-    OpDecorateId = 332,
-    OpGroupNonUniformElect = 333,
-    OpGroupNonUniformAll = 334,
-    OpGroupNonUniformAny = 335,
-    OpGroupNonUniformAllEqual = 336,
-    OpGroupNonUniformBroadcast = 337,
-    OpGroupNonUniformBroadcastFirst = 338,
-    OpGroupNonUniformBallot = 339,
-    OpGroupNonUniformInverseBallot = 340,
-    OpGroupNonUniformBallotBitExtract = 341,
-    OpGroupNonUniformBallotBitCount = 342,
-    OpGroupNonUniformBallotFindLSB = 343,
-    OpGroupNonUniformBallotFindMSB = 344,
-    OpGroupNonUniformShuffle = 345,
-    OpGroupNonUniformShuffleXor = 346,
-    OpGroupNonUniformShuffleUp = 347,
-    OpGroupNonUniformShuffleDown = 348,
-    OpGroupNonUniformIAdd = 349,
-    OpGroupNonUniformFAdd = 350,
-    OpGroupNonUniformIMul = 351,
-    OpGroupNonUniformFMul = 352,
-    OpGroupNonUniformSMin = 353,
-    OpGroupNonUniformUMin = 354,
-    OpGroupNonUniformFMin = 355,
-    OpGroupNonUniformSMax = 356,
-    OpGroupNonUniformUMax = 357,
-    OpGroupNonUniformFMax = 358,
-    OpGroupNonUniformBitwiseAnd = 359,
-    OpGroupNonUniformBitwiseOr = 360,
-    OpGroupNonUniformBitwiseXor = 361,
-    OpGroupNonUniformLogicalAnd = 362,
-    OpGroupNonUniformLogicalOr = 363,
-    OpGroupNonUniformLogicalXor = 364,
-    OpGroupNonUniformQuadBroadcast = 365,
-    OpGroupNonUniformQuadSwap = 366,
-    OpCopyLogical = 400,
-    OpPtrEqual = 401,
-    OpPtrNotEqual = 402,
-    OpPtrDiff = 403,
-    OpColorAttachmentReadEXT = 4160,
-    OpDepthAttachmentReadEXT = 4161,
-    OpStencilAttachmentReadEXT = 4162,
-    OpTypeTensorARM = 4163,
-    OpTensorReadARM = 4164,
-    OpTensorWriteARM = 4165,
-    OpTensorQuerySizeARM = 4166,
-    OpGraphConstantARM = 4181,
-    OpGraphEntryPointARM = 4182,
-    OpGraphARM = 4183,
-    OpGraphInputARM = 4184,
-    OpGraphSetOutputARM = 4185,
-    OpGraphEndARM = 4186,
-    OpTypeGraphARM = 4190,
-    OpTerminateInvocation = 4416,
-    OpTypeUntypedPointerKHR = 4417,
-    OpUntypedVariableKHR = 4418,
-    OpUntypedAccessChainKHR = 4419,
-    OpUntypedInBoundsAccessChainKHR = 4420,
-    OpSubgroupBallotKHR = 4421,
-    OpSubgroupFirstInvocationKHR = 4422,
-    OpUntypedPtrAccessChainKHR = 4423,
-    OpUntypedInBoundsPtrAccessChainKHR = 4424,
-    OpUntypedArrayLengthKHR = 4425,
-    OpUntypedPrefetchKHR = 4426,
-    OpFmaKHR = 4427,
-    OpSubgroupAllKHR = 4428,
-    OpSubgroupAnyKHR = 4429,
-    OpSubgroupAllEqualKHR = 4430,
-    OpGroupNonUniformRotateKHR = 4431,
-    OpSubgroupReadInvocationKHR = 4432,
-    OpExtInstWithForwardRefsKHR = 4433,
-    OpUntypedGroupAsyncCopyKHR = 4434,
-    OpTraceRayKHR = 4445,
-    OpExecuteCallableKHR = 4446,
-    OpConvertUToAccelerationStructureKHR = 4447,
-    OpIgnoreIntersectionKHR = 4448,
-    OpTerminateRayKHR = 4449,
-    OpSDot = 4450,
-    OpSDotKHR = 4450,
-    OpUDot = 4451,
-    OpUDotKHR = 4451,
-    OpSUDot = 4452,
-    OpSUDotKHR = 4452,
-    OpSDotAccSat = 4453,
-    OpSDotAccSatKHR = 4453,
-    OpUDotAccSat = 4454,
-    OpUDotAccSatKHR = 4454,
-    OpSUDotAccSat = 4455,
-    OpSUDotAccSatKHR = 4455,
-    OpTypeCooperativeMatrixKHR = 4456,
-    OpCooperativeMatrixLoadKHR = 4457,
-    OpCooperativeMatrixStoreKHR = 4458,
-    OpCooperativeMatrixMulAddKHR = 4459,
-    OpCooperativeMatrixLengthKHR = 4460,
-    OpConstantCompositeReplicateEXT = 4461,
-    OpSpecConstantCompositeReplicateEXT = 4462,
-    OpCompositeConstructReplicateEXT = 4463,
-    OpTypeRayQueryKHR = 4472,
-    OpRayQueryInitializeKHR = 4473,
-    OpRayQueryTerminateKHR = 4474,
-    OpRayQueryGenerateIntersectionKHR = 4475,
-    OpRayQueryConfirmIntersectionKHR = 4476,
-    OpRayQueryProceedKHR = 4477,
-    OpRayQueryGetIntersectionTypeKHR = 4479,
-    OpImageSampleWeightedQCOM = 4480,
-    OpImageBoxFilterQCOM = 4481,
-    OpImageBlockMatchSSDQCOM = 4482,
-    OpImageBlockMatchSADQCOM = 4483,
-    OpBitCastArrayQCOM = 4497,
-    OpImageBlockMatchWindowSSDQCOM = 4500,
-    OpImageBlockMatchWindowSADQCOM = 4501,
-    OpImageBlockMatchGatherSSDQCOM = 4502,
-    OpImageBlockMatchGatherSADQCOM = 4503,
-    OpCompositeConstructCoopMatQCOM = 4540,
-    OpCompositeExtractCoopMatQCOM = 4541,
-    OpExtractSubArrayQCOM = 4542,
-    OpGroupIAddNonUniformAMD = 5000,
-    OpGroupFAddNonUniformAMD = 5001,
-    OpGroupFMinNonUniformAMD = 5002,
-    OpGroupUMinNonUniformAMD = 5003,
-    OpGroupSMinNonUniformAMD = 5004,
-    OpGroupFMaxNonUniformAMD = 5005,
-    OpGroupUMaxNonUniformAMD = 5006,
-    OpGroupSMaxNonUniformAMD = 5007,
-    OpFragmentMaskFetchAMD = 5011,
-    OpFragmentFetchAMD = 5012,
-    OpReadClockKHR = 5056,
-    OpAllocateNodePayloadsAMDX = 5074,
-    OpEnqueueNodePayloadsAMDX = 5075,
-    OpTypeNodePayloadArrayAMDX = 5076,
-    OpFinishWritingNodePayloadAMDX = 5078,
-    OpNodePayloadArrayLengthAMDX = 5090,
-    OpIsNodePayloadValidAMDX = 5101,
-    OpConstantStringAMDX = 5103,
-    OpSpecConstantStringAMDX = 5104,
-    OpGroupNonUniformQuadAllKHR = 5110,
-    OpGroupNonUniformQuadAnyKHR = 5111,
-    OpHitObjectRecordHitMotionNV = 5249,
-    OpHitObjectRecordHitWithIndexMotionNV = 5250,
-    OpHitObjectRecordMissMotionNV = 5251,
-    OpHitObjectGetWorldToObjectNV = 5252,
-    OpHitObjectGetObjectToWorldNV = 5253,
-    OpHitObjectGetObjectRayDirectionNV = 5254,
-    OpHitObjectGetObjectRayOriginNV = 5255,
-    OpHitObjectTraceRayMotionNV = 5256,
-    OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-    OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-    OpHitObjectRecordEmptyNV = 5259,
-    OpHitObjectTraceRayNV = 5260,
-    OpHitObjectRecordHitNV = 5261,
-    OpHitObjectRecordHitWithIndexNV = 5262,
-    OpHitObjectRecordMissNV = 5263,
-    OpHitObjectExecuteShaderNV = 5264,
-    OpHitObjectGetCurrentTimeNV = 5265,
-    OpHitObjectGetAttributesNV = 5266,
-    OpHitObjectGetHitKindNV = 5267,
-    OpHitObjectGetPrimitiveIndexNV = 5268,
-    OpHitObjectGetGeometryIndexNV = 5269,
-    OpHitObjectGetInstanceIdNV = 5270,
-    OpHitObjectGetInstanceCustomIndexNV = 5271,
-    OpHitObjectGetWorldRayDirectionNV = 5272,
-    OpHitObjectGetWorldRayOriginNV = 5273,
-    OpHitObjectGetRayTMaxNV = 5274,
-    OpHitObjectGetRayTMinNV = 5275,
-    OpHitObjectIsEmptyNV = 5276,
-    OpHitObjectIsHitNV = 5277,
-    OpHitObjectIsMissNV = 5278,
-    OpReorderThreadWithHitObjectNV = 5279,
-    OpReorderThreadWithHintNV = 5280,
-    OpTypeHitObjectNV = 5281,
-    OpImageSampleFootprintNV = 5283,
-    OpTypeCooperativeVectorNV = 5288,
-    OpCooperativeVectorMatrixMulNV = 5289,
-    OpCooperativeVectorOuterProductAccumulateNV = 5290,
-    OpCooperativeVectorReduceSumAccumulateNV = 5291,
-    OpCooperativeVectorMatrixMulAddNV = 5292,
-    OpCooperativeMatrixConvertNV = 5293,
-    OpEmitMeshTasksEXT = 5294,
-    OpSetMeshOutputsEXT = 5295,
-    OpGroupNonUniformPartitionNV = 5296,
-    OpWritePackedPrimitiveIndices4x8NV = 5299,
-    OpFetchMicroTriangleVertexPositionNV = 5300,
-    OpFetchMicroTriangleVertexBarycentricNV = 5301,
-    OpCooperativeVectorLoadNV = 5302,
-    OpCooperativeVectorStoreNV = 5303,
-    OpHitObjectRecordFromQueryEXT = 5304,
-    OpHitObjectRecordMissEXT = 5305,
-    OpHitObjectRecordMissMotionEXT = 5306,
-    OpHitObjectGetIntersectionTriangleVertexPositionsEXT = 5307,
-    OpHitObjectGetRayFlagsEXT = 5308,
-    OpHitObjectSetShaderBindingTableRecordIndexEXT = 5309,
-    OpHitObjectReorderExecuteShaderEXT = 5310,
-    OpHitObjectTraceReorderExecuteEXT = 5311,
-    OpHitObjectTraceMotionReorderExecuteEXT = 5312,
-    OpTypeHitObjectEXT = 5313,
-    OpReorderThreadWithHintEXT = 5314,
-    OpReorderThreadWithHitObjectEXT = 5315,
-    OpHitObjectTraceRayEXT = 5316,
-    OpHitObjectTraceRayMotionEXT = 5317,
-    OpHitObjectRecordEmptyEXT = 5318,
-    OpHitObjectExecuteShaderEXT = 5319,
-    OpHitObjectGetCurrentTimeEXT = 5320,
-    OpHitObjectGetAttributesEXT = 5321,
-    OpHitObjectGetHitKindEXT = 5322,
-    OpHitObjectGetPrimitiveIndexEXT = 5323,
-    OpHitObjectGetGeometryIndexEXT = 5324,
-    OpHitObjectGetInstanceIdEXT = 5325,
-    OpHitObjectGetInstanceCustomIndexEXT = 5326,
-    OpHitObjectGetObjectRayOriginEXT = 5327,
-    OpHitObjectGetObjectRayDirectionEXT = 5328,
-    OpHitObjectGetWorldRayDirectionEXT = 5329,
-    OpHitObjectGetWorldRayOriginEXT = 5330,
-    OpHitObjectGetObjectToWorldEXT = 5331,
-    OpHitObjectGetWorldToObjectEXT = 5332,
-    OpHitObjectGetRayTMaxEXT = 5333,
-    OpReportIntersectionKHR = 5334,
-    OpReportIntersectionNV = 5334,
-    OpIgnoreIntersectionNV = 5335,
-    OpTerminateRayNV = 5336,
-    OpTraceNV = 5337,
-    OpTraceMotionNV = 5338,
-    OpTraceRayMotionNV = 5339,
-    OpRayQueryGetIntersectionTriangleVertexPositionsKHR = 5340,
-    OpTypeAccelerationStructureKHR = 5341,
-    OpTypeAccelerationStructureNV = 5341,
-    OpExecuteCallableNV = 5344,
-    OpRayQueryGetClusterIdNV = 5345,
-    OpRayQueryGetIntersectionClusterIdNV = 5345,
-    OpHitObjectGetClusterIdNV = 5346,
-    OpHitObjectGetRayTMinEXT = 5347,
-    OpHitObjectGetShaderBindingTableRecordIndexEXT = 5348,
-    OpHitObjectGetShaderRecordBufferHandleEXT = 5349,
-    OpHitObjectIsEmptyEXT = 5350,
-    OpHitObjectIsHitEXT = 5351,
-    OpHitObjectIsMissEXT = 5352,
-    OpTypeCooperativeMatrixNV = 5358,
-    OpCooperativeMatrixLoadNV = 5359,
-    OpCooperativeMatrixStoreNV = 5360,
-    OpCooperativeMatrixMulAddNV = 5361,
-    OpCooperativeMatrixLengthNV = 5362,
-    OpBeginInvocationInterlockEXT = 5364,
-    OpEndInvocationInterlockEXT = 5365,
-    OpCooperativeMatrixReduceNV = 5366,
-    OpCooperativeMatrixLoadTensorNV = 5367,
-    OpCooperativeMatrixStoreTensorNV = 5368,
-    OpCooperativeMatrixPerElementOpNV = 5369,
-    OpTypeTensorLayoutNV = 5370,
-    OpTypeTensorViewNV = 5371,
-    OpCreateTensorLayoutNV = 5372,
-    OpTensorLayoutSetDimensionNV = 5373,
-    OpTensorLayoutSetStrideNV = 5374,
-    OpTensorLayoutSliceNV = 5375,
-    OpTensorLayoutSetClampValueNV = 5376,
-    OpCreateTensorViewNV = 5377,
-    OpTensorViewSetDimensionNV = 5378,
-    OpTensorViewSetStrideNV = 5379,
-    OpDemoteToHelperInvocation = 5380,
-    OpDemoteToHelperInvocationEXT = 5380,
-    OpIsHelperInvocationEXT = 5381,
-    OpTensorViewSetClipNV = 5382,
-    OpTensorLayoutSetBlockSizeNV = 5384,
-    OpCooperativeMatrixTransposeNV = 5390,
-    OpConvertUToImageNV = 5391,
-    OpConvertUToSamplerNV = 5392,
-    OpConvertImageToUNV = 5393,
-    OpConvertSamplerToUNV = 5394,
-    OpConvertUToSampledImageNV = 5395,
-    OpConvertSampledImageToUNV = 5396,
-    OpSamplerImageAddressingModeNV = 5397,
-    OpRawAccessChainNV = 5398,
-    OpRayQueryGetIntersectionSpherePositionNV = 5427,
-    OpRayQueryGetIntersectionSphereRadiusNV = 5428,
-    OpRayQueryGetIntersectionLSSPositionsNV = 5429,
-    OpRayQueryGetIntersectionLSSRadiiNV = 5430,
-    OpRayQueryGetIntersectionLSSHitValueNV = 5431,
-    OpHitObjectGetSpherePositionNV = 5432,
-    OpHitObjectGetSphereRadiusNV = 5433,
-    OpHitObjectGetLSSPositionsNV = 5434,
-    OpHitObjectGetLSSRadiiNV = 5435,
-    OpHitObjectIsSphereHitNV = 5436,
-    OpHitObjectIsLSSHitNV = 5437,
-    OpRayQueryIsSphereHitNV = 5438,
-    OpRayQueryIsLSSHitNV = 5439,
-    OpSubgroupShuffleINTEL = 5571,
-    OpSubgroupShuffleDownINTEL = 5572,
-    OpSubgroupShuffleUpINTEL = 5573,
-    OpSubgroupShuffleXorINTEL = 5574,
-    OpSubgroupBlockReadINTEL = 5575,
-    OpSubgroupBlockWriteINTEL = 5576,
-    OpSubgroupImageBlockReadINTEL = 5577,
-    OpSubgroupImageBlockWriteINTEL = 5578,
-    OpSubgroupImageMediaBlockReadINTEL = 5580,
-    OpSubgroupImageMediaBlockWriteINTEL = 5581,
-    OpUCountLeadingZerosINTEL = 5585,
-    OpUCountTrailingZerosINTEL = 5586,
-    OpAbsISubINTEL = 5587,
-    OpAbsUSubINTEL = 5588,
-    OpIAddSatINTEL = 5589,
-    OpUAddSatINTEL = 5590,
-    OpIAverageINTEL = 5591,
-    OpUAverageINTEL = 5592,
-    OpIAverageRoundedINTEL = 5593,
-    OpUAverageRoundedINTEL = 5594,
-    OpISubSatINTEL = 5595,
-    OpUSubSatINTEL = 5596,
-    OpIMul32x16INTEL = 5597,
-    OpUMul32x16INTEL = 5598,
-    OpConstantFunctionPointerINTEL = 5600,
-    OpFunctionPointerCallINTEL = 5601,
-    OpAsmTargetINTEL = 5609,
-    OpAsmINTEL = 5610,
-    OpAsmCallINTEL = 5611,
-    OpAtomicFMinEXT = 5614,
-    OpAtomicFMaxEXT = 5615,
-    OpAssumeTrueKHR = 5630,
-    OpExpectKHR = 5631,
-    OpDecorateString = 5632,
-    OpDecorateStringGOOGLE = 5632,
-    OpMemberDecorateString = 5633,
-    OpMemberDecorateStringGOOGLE = 5633,
-    OpVmeImageINTEL = 5699,
-    OpTypeVmeImageINTEL = 5700,
-    OpTypeAvcImePayloadINTEL = 5701,
-    OpTypeAvcRefPayloadINTEL = 5702,
-    OpTypeAvcSicPayloadINTEL = 5703,
-    OpTypeAvcMcePayloadINTEL = 5704,
-    OpTypeAvcMceResultINTEL = 5705,
-    OpTypeAvcImeResultINTEL = 5706,
-    OpTypeAvcImeResultSingleReferenceStreamoutINTEL = 5707,
-    OpTypeAvcImeResultDualReferenceStreamoutINTEL = 5708,
-    OpTypeAvcImeSingleReferenceStreaminINTEL = 5709,
-    OpTypeAvcImeDualReferenceStreaminINTEL = 5710,
-    OpTypeAvcRefResultINTEL = 5711,
-    OpTypeAvcSicResultINTEL = 5712,
-    OpSubgroupAvcMceGetDefaultInterBaseMultiReferencePenaltyINTEL = 5713,
-    OpSubgroupAvcMceSetInterBaseMultiReferencePenaltyINTEL = 5714,
-    OpSubgroupAvcMceGetDefaultInterShapePenaltyINTEL = 5715,
-    OpSubgroupAvcMceSetInterShapePenaltyINTEL = 5716,
-    OpSubgroupAvcMceGetDefaultInterDirectionPenaltyINTEL = 5717,
-    OpSubgroupAvcMceSetInterDirectionPenaltyINTEL = 5718,
-    OpSubgroupAvcMceGetDefaultIntraLumaShapePenaltyINTEL = 5719,
-    OpSubgroupAvcMceGetDefaultInterMotionVectorCostTableINTEL = 5720,
-    OpSubgroupAvcMceGetDefaultHighPenaltyCostTableINTEL = 5721,
-    OpSubgroupAvcMceGetDefaultMediumPenaltyCostTableINTEL = 5722,
-    OpSubgroupAvcMceGetDefaultLowPenaltyCostTableINTEL = 5723,
-    OpSubgroupAvcMceSetMotionVectorCostFunctionINTEL = 5724,
-    OpSubgroupAvcMceGetDefaultIntraLumaModePenaltyINTEL = 5725,
-    OpSubgroupAvcMceGetDefaultNonDcLumaIntraPenaltyINTEL = 5726,
-    OpSubgroupAvcMceGetDefaultIntraChromaModeBasePenaltyINTEL = 5727,
-    OpSubgroupAvcMceSetAcOnlyHaarINTEL = 5728,
-    OpSubgroupAvcMceSetSourceInterlacedFieldPolarityINTEL = 5729,
-    OpSubgroupAvcMceSetSingleReferenceInterlacedFieldPolarityINTEL = 5730,
-    OpSubgroupAvcMceSetDualReferenceInterlacedFieldPolaritiesINTEL = 5731,
-    OpSubgroupAvcMceConvertToImePayloadINTEL = 5732,
-    OpSubgroupAvcMceConvertToImeResultINTEL = 5733,
-    OpSubgroupAvcMceConvertToRefPayloadINTEL = 5734,
-    OpSubgroupAvcMceConvertToRefResultINTEL = 5735,
-    OpSubgroupAvcMceConvertToSicPayloadINTEL = 5736,
-    OpSubgroupAvcMceConvertToSicResultINTEL = 5737,
-    OpSubgroupAvcMceGetMotionVectorsINTEL = 5738,
-    OpSubgroupAvcMceGetInterDistortionsINTEL = 5739,
-    OpSubgroupAvcMceGetBestInterDistortionsINTEL = 5740,
-    OpSubgroupAvcMceGetInterMajorShapeINTEL = 5741,
-    OpSubgroupAvcMceGetInterMinorShapeINTEL = 5742,
-    OpSubgroupAvcMceGetInterDirectionsINTEL = 5743,
-    OpSubgroupAvcMceGetInterMotionVectorCountINTEL = 5744,
-    OpSubgroupAvcMceGetInterReferenceIdsINTEL = 5745,
-    OpSubgroupAvcMceGetInterReferenceInterlacedFieldPolaritiesINTEL = 5746,
-    OpSubgroupAvcImeInitializeINTEL = 5747,
-    OpSubgroupAvcImeSetSingleReferenceINTEL = 5748,
-    OpSubgroupAvcImeSetDualReferenceINTEL = 5749,
-    OpSubgroupAvcImeRefWindowSizeINTEL = 5750,
-    OpSubgroupAvcImeAdjustRefOffsetINTEL = 5751,
-    OpSubgroupAvcImeConvertToMcePayloadINTEL = 5752,
-    OpSubgroupAvcImeSetMaxMotionVectorCountINTEL = 5753,
-    OpSubgroupAvcImeSetUnidirectionalMixDisableINTEL = 5754,
-    OpSubgroupAvcImeSetEarlySearchTerminationThresholdINTEL = 5755,
-    OpSubgroupAvcImeSetWeightedSadINTEL = 5756,
-    OpSubgroupAvcImeEvaluateWithSingleReferenceINTEL = 5757,
-    OpSubgroupAvcImeEvaluateWithDualReferenceINTEL = 5758,
-    OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminINTEL = 5759,
-    OpSubgroupAvcImeEvaluateWithDualReferenceStreaminINTEL = 5760,
-    OpSubgroupAvcImeEvaluateWithSingleReferenceStreamoutINTEL = 5761,
-    OpSubgroupAvcImeEvaluateWithDualReferenceStreamoutINTEL = 5762,
-    OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminoutINTEL = 5763,
-    OpSubgroupAvcImeEvaluateWithDualReferenceStreaminoutINTEL = 5764,
-    OpSubgroupAvcImeConvertToMceResultINTEL = 5765,
-    OpSubgroupAvcImeGetSingleReferenceStreaminINTEL = 5766,
-    OpSubgroupAvcImeGetDualReferenceStreaminINTEL = 5767,
-    OpSubgroupAvcImeStripSingleReferenceStreamoutINTEL = 5768,
-    OpSubgroupAvcImeStripDualReferenceStreamoutINTEL = 5769,
-    OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeMotionVectorsINTEL = 5770,
-    OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeDistortionsINTEL = 5771,
-    OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeReferenceIdsINTEL = 5772,
-    OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeMotionVectorsINTEL = 5773,
-    OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeDistortionsINTEL = 5774,
-    OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeReferenceIdsINTEL = 5775,
-    OpSubgroupAvcImeGetBorderReachedINTEL = 5776,
-    OpSubgroupAvcImeGetTruncatedSearchIndicationINTEL = 5777,
-    OpSubgroupAvcImeGetUnidirectionalEarlySearchTerminationINTEL = 5778,
-    OpSubgroupAvcImeGetWeightingPatternMinimumMotionVectorINTEL = 5779,
-    OpSubgroupAvcImeGetWeightingPatternMinimumDistortionINTEL = 5780,
-    OpSubgroupAvcFmeInitializeINTEL = 5781,
-    OpSubgroupAvcBmeInitializeINTEL = 5782,
-    OpSubgroupAvcRefConvertToMcePayloadINTEL = 5783,
-    OpSubgroupAvcRefSetBidirectionalMixDisableINTEL = 5784,
-    OpSubgroupAvcRefSetBilinearFilterEnableINTEL = 5785,
-    OpSubgroupAvcRefEvaluateWithSingleReferenceINTEL = 5786,
-    OpSubgroupAvcRefEvaluateWithDualReferenceINTEL = 5787,
-    OpSubgroupAvcRefEvaluateWithMultiReferenceINTEL = 5788,
-    OpSubgroupAvcRefEvaluateWithMultiReferenceInterlacedINTEL = 5789,
-    OpSubgroupAvcRefConvertToMceResultINTEL = 5790,
-    OpSubgroupAvcSicInitializeINTEL = 5791,
-    OpSubgroupAvcSicConfigureSkcINTEL = 5792,
-    OpSubgroupAvcSicConfigureIpeLumaINTEL = 5793,
-    OpSubgroupAvcSicConfigureIpeLumaChromaINTEL = 5794,
-    OpSubgroupAvcSicGetMotionVectorMaskINTEL = 5795,
-    OpSubgroupAvcSicConvertToMcePayloadINTEL = 5796,
-    OpSubgroupAvcSicSetIntraLumaShapePenaltyINTEL = 5797,
-    OpSubgroupAvcSicSetIntraLumaModeCostFunctionINTEL = 5798,
-    OpSubgroupAvcSicSetIntraChromaModeCostFunctionINTEL = 5799,
-    OpSubgroupAvcSicSetBilinearFilterEnableINTEL = 5800,
-    OpSubgroupAvcSicSetSkcForwardTransformEnableINTEL = 5801,
-    OpSubgroupAvcSicSetBlockBasedRawSkipSadINTEL = 5802,
-    OpSubgroupAvcSicEvaluateIpeINTEL = 5803,
-    OpSubgroupAvcSicEvaluateWithSingleReferenceINTEL = 5804,
-    OpSubgroupAvcSicEvaluateWithDualReferenceINTEL = 5805,
-    OpSubgroupAvcSicEvaluateWithMultiReferenceINTEL = 5806,
-    OpSubgroupAvcSicEvaluateWithMultiReferenceInterlacedINTEL = 5807,
-    OpSubgroupAvcSicConvertToMceResultINTEL = 5808,
-    OpSubgroupAvcSicGetIpeLumaShapeINTEL = 5809,
-    OpSubgroupAvcSicGetBestIpeLumaDistortionINTEL = 5810,
-    OpSubgroupAvcSicGetBestIpeChromaDistortionINTEL = 5811,
-    OpSubgroupAvcSicGetPackedIpeLumaModesINTEL = 5812,
-    OpSubgroupAvcSicGetIpeChromaModeINTEL = 5813,
-    OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL = 5814,
-    OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL = 5815,
-    OpSubgroupAvcSicGetInterRawSadsINTEL = 5816,
-    OpVariableLengthArrayINTEL = 5818,
-    OpSaveMemoryINTEL = 5819,
-    OpRestoreMemoryINTEL = 5820,
-    OpArbitraryFloatSinCosPiALTERA = 5840,
-    OpArbitraryFloatSinCosPiINTEL = 5840,
-    OpArbitraryFloatCastALTERA = 5841,
-    OpArbitraryFloatCastINTEL = 5841,
-    OpArbitraryFloatCastFromIntALTERA = 5842,
-    OpArbitraryFloatCastFromIntINTEL = 5842,
-    OpArbitraryFloatCastToIntALTERA = 5843,
-    OpArbitraryFloatCastToIntINTEL = 5843,
-    OpArbitraryFloatAddALTERA = 5846,
-    OpArbitraryFloatAddINTEL = 5846,
-    OpArbitraryFloatSubALTERA = 5847,
-    OpArbitraryFloatSubINTEL = 5847,
-    OpArbitraryFloatMulALTERA = 5848,
-    OpArbitraryFloatMulINTEL = 5848,
-    OpArbitraryFloatDivALTERA = 5849,
-    OpArbitraryFloatDivINTEL = 5849,
-    OpArbitraryFloatGTALTERA = 5850,
-    OpArbitraryFloatGTINTEL = 5850,
-    OpArbitraryFloatGEALTERA = 5851,
-    OpArbitraryFloatGEINTEL = 5851,
-    OpArbitraryFloatLTALTERA = 5852,
-    OpArbitraryFloatLTINTEL = 5852,
-    OpArbitraryFloatLEALTERA = 5853,
-    OpArbitraryFloatLEINTEL = 5853,
-    OpArbitraryFloatEQALTERA = 5854,
-    OpArbitraryFloatEQINTEL = 5854,
-    OpArbitraryFloatRecipALTERA = 5855,
-    OpArbitraryFloatRecipINTEL = 5855,
-    OpArbitraryFloatRSqrtALTERA = 5856,
-    OpArbitraryFloatRSqrtINTEL = 5856,
-    OpArbitraryFloatCbrtALTERA = 5857,
-    OpArbitraryFloatCbrtINTEL = 5857,
-    OpArbitraryFloatHypotALTERA = 5858,
-    OpArbitraryFloatHypotINTEL = 5858,
-    OpArbitraryFloatSqrtALTERA = 5859,
-    OpArbitraryFloatSqrtINTEL = 5859,
-    OpArbitraryFloatLogINTEL = 5860,
-    OpArbitraryFloatLog2INTEL = 5861,
-    OpArbitraryFloatLog10INTEL = 5862,
-    OpArbitraryFloatLog1pINTEL = 5863,
-    OpArbitraryFloatExpINTEL = 5864,
-    OpArbitraryFloatExp2INTEL = 5865,
-    OpArbitraryFloatExp10INTEL = 5866,
-    OpArbitraryFloatExpm1INTEL = 5867,
-    OpArbitraryFloatSinINTEL = 5868,
-    OpArbitraryFloatCosINTEL = 5869,
-    OpArbitraryFloatSinCosINTEL = 5870,
-    OpArbitraryFloatSinPiINTEL = 5871,
-    OpArbitraryFloatCosPiINTEL = 5872,
-    OpArbitraryFloatASinINTEL = 5873,
-    OpArbitraryFloatASinPiINTEL = 5874,
-    OpArbitraryFloatACosINTEL = 5875,
-    OpArbitraryFloatACosPiINTEL = 5876,
-    OpArbitraryFloatATanINTEL = 5877,
-    OpArbitraryFloatATanPiINTEL = 5878,
-    OpArbitraryFloatATan2INTEL = 5879,
-    OpArbitraryFloatPowINTEL = 5880,
-    OpArbitraryFloatPowRINTEL = 5881,
-    OpArbitraryFloatPowNINTEL = 5882,
-    OpLoopControlINTEL = 5887,
-    OpAliasDomainDeclINTEL = 5911,
-    OpAliasScopeDeclINTEL = 5912,
-    OpAliasScopeListDeclINTEL = 5913,
-    OpFixedSqrtALTERA = 5923,
-    OpFixedSqrtINTEL = 5923,
-    OpFixedRecipALTERA = 5924,
-    OpFixedRecipINTEL = 5924,
-    OpFixedRsqrtALTERA = 5925,
-    OpFixedRsqrtINTEL = 5925,
-    OpFixedSinALTERA = 5926,
-    OpFixedSinINTEL = 5926,
-    OpFixedCosALTERA = 5927,
-    OpFixedCosINTEL = 5927,
-    OpFixedSinCosALTERA = 5928,
-    OpFixedSinCosINTEL = 5928,
-    OpFixedSinPiALTERA = 5929,
-    OpFixedSinPiINTEL = 5929,
-    OpFixedCosPiALTERA = 5930,
-    OpFixedCosPiINTEL = 5930,
-    OpFixedSinCosPiALTERA = 5931,
-    OpFixedSinCosPiINTEL = 5931,
-    OpFixedLogALTERA = 5932,
-    OpFixedLogINTEL = 5932,
-    OpFixedExpALTERA = 5933,
-    OpFixedExpINTEL = 5933,
-    OpPtrCastToCrossWorkgroupALTERA = 5934,
-    OpPtrCastToCrossWorkgroupINTEL = 5934,
-    OpCrossWorkgroupCastToPtrALTERA = 5938,
-    OpCrossWorkgroupCastToPtrINTEL = 5938,
-    OpReadPipeBlockingALTERA = 5946,
-    OpReadPipeBlockingINTEL = 5946,
-    OpWritePipeBlockingALTERA = 5947,
-    OpWritePipeBlockingINTEL = 5947,
-    OpFPGARegALTERA = 5949,
-    OpFPGARegINTEL = 5949,
-    OpRayQueryGetRayTMinKHR = 6016,
-    OpRayQueryGetRayFlagsKHR = 6017,
-    OpRayQueryGetIntersectionTKHR = 6018,
-    OpRayQueryGetIntersectionInstanceCustomIndexKHR = 6019,
-    OpRayQueryGetIntersectionInstanceIdKHR = 6020,
-    OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR = 6021,
-    OpRayQueryGetIntersectionGeometryIndexKHR = 6022,
-    OpRayQueryGetIntersectionPrimitiveIndexKHR = 6023,
-    OpRayQueryGetIntersectionBarycentricsKHR = 6024,
-    OpRayQueryGetIntersectionFrontFaceKHR = 6025,
-    OpRayQueryGetIntersectionCandidateAABBOpaqueKHR = 6026,
-    OpRayQueryGetIntersectionObjectRayDirectionKHR = 6027,
-    OpRayQueryGetIntersectionObjectRayOriginKHR = 6028,
-    OpRayQueryGetWorldRayDirectionKHR = 6029,
-    OpRayQueryGetWorldRayOriginKHR = 6030,
-    OpRayQueryGetIntersectionObjectToWorldKHR = 6031,
-    OpRayQueryGetIntersectionWorldToObjectKHR = 6032,
-    OpAtomicFAddEXT = 6035,
-    OpTypeBufferSurfaceINTEL = 6086,
-    OpTypeStructContinuedINTEL = 6090,
-    OpConstantCompositeContinuedINTEL = 6091,
-    OpSpecConstantCompositeContinuedINTEL = 6092,
-    OpCompositeConstructContinuedINTEL = 6096,
-    OpConvertFToBF16INTEL = 6116,
-    OpConvertBF16ToFINTEL = 6117,
-    OpControlBarrierArriveINTEL = 6142,
-    OpControlBarrierWaitINTEL = 6143,
-    OpArithmeticFenceEXT = 6145,
-    OpTaskSequenceCreateALTERA = 6163,
-    OpTaskSequenceCreateINTEL = 6163,
-    OpTaskSequenceAsyncALTERA = 6164,
-    OpTaskSequenceAsyncINTEL = 6164,
-    OpTaskSequenceGetALTERA = 6165,
-    OpTaskSequenceGetINTEL = 6165,
-    OpTaskSequenceReleaseALTERA = 6166,
-    OpTaskSequenceReleaseINTEL = 6166,
-    OpTypeTaskSequenceALTERA = 6199,
-    OpTypeTaskSequenceINTEL = 6199,
-    OpSubgroupBlockPrefetchINTEL = 6221,
-    OpSubgroup2DBlockLoadINTEL = 6231,
-    OpSubgroup2DBlockLoadTransformINTEL = 6232,
-    OpSubgroup2DBlockLoadTransposeINTEL = 6233,
-    OpSubgroup2DBlockPrefetchINTEL = 6234,
-    OpSubgroup2DBlockStoreINTEL = 6235,
-    OpSubgroupMatrixMultiplyAccumulateINTEL = 6237,
-    OpBitwiseFunctionINTEL = 6242,
-    OpUntypedVariableLengthArrayINTEL = 6244,
-    OpConditionalExtensionINTEL = 6248,
-    OpConditionalEntryPointINTEL = 6249,
-    OpConditionalCapabilityINTEL = 6250,
-    OpSpecConstantTargetINTEL = 6251,
-    OpSpecConstantArchitectureINTEL = 6252,
-    OpSpecConstantCapabilitiesINTEL = 6253,
-    OpConditionalCopyObjectINTEL = 6254,
-    OpGroupIMulKHR = 6401,
-    OpGroupFMulKHR = 6402,
-    OpGroupBitwiseAndKHR = 6403,
-    OpGroupBitwiseOrKHR = 6404,
-    OpGroupBitwiseXorKHR = 6405,
-    OpGroupLogicalAndKHR = 6406,
-    OpGroupLogicalOrKHR = 6407,
-    OpGroupLogicalXorKHR = 6408,
-    OpRoundFToTF32INTEL = 6426,
-    OpMaskedGatherINTEL = 6428,
-    OpMaskedScatterINTEL = 6429,
-    OpConvertHandleToImageINTEL = 6529,
-    OpConvertHandleToSamplerINTEL = 6530,
-    OpConvertHandleToSampledImageINTEL = 6531,
-    Max = 0x7fffffff,
-};
-
-#ifdef SPV_ENABLE_UTILITY_CODE
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
-inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
-    *hasResult = *hasResultType = false;
-    switch (opcode) {
-    default: /* unknown opcode */ break;
-    case Op::OpNop: *hasResult = false; *hasResultType = false; break;
-    case Op::OpUndef: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSourceContinued: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSource: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSourceExtension: *hasResult = false; *hasResultType = false; break;
-    case Op::OpName: *hasResult = false; *hasResultType = false; break;
-    case Op::OpMemberName: *hasResult = false; *hasResultType = false; break;
-    case Op::OpString: *hasResult = true; *hasResultType = false; break;
-    case Op::OpLine: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExtension: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExtInstImport: *hasResult = true; *hasResultType = false; break;
-    case Op::OpExtInst: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMemoryModel: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEntryPoint: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExecutionMode: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCapability: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeVoid: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeBool: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeInt: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeFloat: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeVector: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeMatrix: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeImage: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeSampler: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeSampledImage: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeArray: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeRuntimeArray: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeStruct: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeOpaque: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypePointer: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeFunction: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeEvent: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeDeviceEvent: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeReserveId: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeQueue: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypePipe: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeForwardPointer: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConstantTrue: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantFalse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstant: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantComposite: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantSampler: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantNull: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantTrue: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantFalse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstant: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantComposite: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantOp: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFunction: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFunctionParameter: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFunctionEnd: *hasResult = false; *hasResultType = false; break;
-    case Op::OpFunctionCall: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVariable: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageTexelPointer: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLoad: *hasResult = true; *hasResultType = true; break;
-    case Op::OpStore: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCopyMemory: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCopyMemorySized: *hasResult = false; *hasResultType = false; break;
-    case Op::OpAccessChain: *hasResult = true; *hasResultType = true; break;
-    case Op::OpInBoundsAccessChain: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrAccessChain: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArrayLength: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGenericPtrMemSemantics: *hasResult = true; *hasResultType = true; break;
-    case Op::OpInBoundsPtrAccessChain: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDecorate: *hasResult = false; *hasResultType = false; break;
-    case Op::OpMemberDecorate: *hasResult = false; *hasResultType = false; break;
-    case Op::OpDecorationGroup: *hasResult = true; *hasResultType = false; break;
-    case Op::OpGroupDecorate: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupMemberDecorate: *hasResult = false; *hasResultType = false; break;
-    case Op::OpVectorExtractDynamic: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVectorInsertDynamic: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVectorShuffle: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeConstruct: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeExtract: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeInsert: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCopyObject: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTranspose: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSampledImage: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleDrefImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleDrefExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleProjImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleProjExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleProjDrefImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleProjDrefExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageFetch: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageGather: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageDrefGather: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageRead: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageWrite: *hasResult = false; *hasResultType = false; break;
-    case Op::OpImage: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQueryFormat: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQueryOrder: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQuerySizeLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQuerySize: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQueryLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQueryLevels: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageQuerySamples: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertFToU: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertFToS: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertSToF: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertUToF: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUConvert: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSConvert: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFConvert: *hasResult = true; *hasResultType = true; break;
-    case Op::OpQuantizeToF16: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertPtrToU: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSatConvertSToU: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSatConvertUToS: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertUToPtr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrCastToGeneric: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGenericCastToPtr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGenericCastToPtrExplicit: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitcast: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSNegate: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFNegate: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpISub: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFSub: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIMul: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFMul: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUDiv: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSDiv: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFDiv: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUMod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSRem: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSMod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFRem: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFMod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVectorTimesScalar: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMatrixTimesScalar: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVectorTimesMatrix: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMatrixTimesVector: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMatrixTimesMatrix: *hasResult = true; *hasResultType = true; break;
-    case Op::OpOuterProduct: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIAddCarry: *hasResult = true; *hasResultType = true; break;
-    case Op::OpISubBorrow: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUMulExtended: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSMulExtended: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAny: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAll: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsNan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsInf: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsFinite: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsNormal: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSignBitSet: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLessOrGreater: *hasResult = true; *hasResultType = true; break;
-    case Op::OpOrdered: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUnordered: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLogicalEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLogicalNotEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLogicalOr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLogicalAnd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLogicalNot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSelect: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpINotEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUGreaterThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSGreaterThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUGreaterThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSGreaterThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpULessThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSLessThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpULessThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSLessThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdNotEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordNotEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdLessThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordLessThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdGreaterThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordGreaterThan: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdLessThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordLessThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFOrdGreaterThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFUnordGreaterThanEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpShiftRightLogical: *hasResult = true; *hasResultType = true; break;
-    case Op::OpShiftRightArithmetic: *hasResult = true; *hasResultType = true; break;
-    case Op::OpShiftLeftLogical: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitwiseOr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitwiseXor: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitwiseAnd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpNot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitFieldInsert: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitFieldSExtract: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitFieldUExtract: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitReverse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitCount: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdx: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdy: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFwidth: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdxFine: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdyFine: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFwidthFine: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdxCoarse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDPdyCoarse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFwidthCoarse: *hasResult = true; *hasResultType = true; break;
-    case Op::OpEmitVertex: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEndPrimitive: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEmitStreamVertex: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEndStreamPrimitive: *hasResult = false; *hasResultType = false; break;
-    case Op::OpControlBarrier: *hasResult = false; *hasResultType = false; break;
-    case Op::OpMemoryBarrier: *hasResult = false; *hasResultType = false; break;
-    case Op::OpAtomicLoad: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicStore: *hasResult = false; *hasResultType = false; break;
-    case Op::OpAtomicExchange: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicCompareExchange: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicCompareExchangeWeak: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicIIncrement: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicIDecrement: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicIAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicISub: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicSMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicUMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicSMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicUMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicAnd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicOr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicXor: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPhi: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLoopMerge: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSelectionMerge: *hasResult = false; *hasResultType = false; break;
-    case Op::OpLabel: *hasResult = true; *hasResultType = false; break;
-    case Op::OpBranch: *hasResult = false; *hasResultType = false; break;
-    case Op::OpBranchConditional: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSwitch: *hasResult = false; *hasResultType = false; break;
-    case Op::OpKill: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReturn: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReturnValue: *hasResult = false; *hasResultType = false; break;
-    case Op::OpUnreachable: *hasResult = false; *hasResultType = false; break;
-    case Op::OpLifetimeStart: *hasResult = false; *hasResultType = false; break;
-    case Op::OpLifetimeStop: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupAsyncCopy: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupWaitEvents: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupAll: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupAny: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupBroadcast: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupIAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupUMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupSMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupUMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupSMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReadPipe: *hasResult = true; *hasResultType = true; break;
-    case Op::OpWritePipe: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReservedReadPipe: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReservedWritePipe: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReserveReadPipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReserveWritePipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCommitReadPipe: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCommitWritePipe: *hasResult = false; *hasResultType = false; break;
-    case Op::OpIsValidReserveId: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetNumPipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetMaxPipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupReserveReadPipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupReserveWritePipePackets: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupCommitReadPipe: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupCommitWritePipe: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEnqueueMarker: *hasResult = true; *hasResultType = true; break;
-    case Op::OpEnqueueKernel: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelNDrangeSubGroupCount: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelNDrangeMaxSubGroupSize: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelWorkGroupSize: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelPreferredWorkGroupSizeMultiple: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRetainEvent: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReleaseEvent: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCreateUserEvent: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsValidEvent: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSetUserEventStatus: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCaptureEventProfilingInfo: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGetDefaultQueue: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBuildNDRange: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleDrefImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleDrefExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleProjImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleProjExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleProjDrefImplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseSampleProjDrefExplicitLod: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseFetch: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseGather: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseDrefGather: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSparseTexelsResident: *hasResult = true; *hasResultType = true; break;
-    case Op::OpNoLine: *hasResult = false; *hasResultType = false; break;
-    case Op::OpAtomicFlagTestAndSet: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicFlagClear: *hasResult = false; *hasResultType = false; break;
-    case Op::OpImageSparseRead: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSizeOf: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypePipeStorage: *hasResult = true; *hasResultType = false; break;
-    case Op::OpConstantPipeStorage: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCreatePipeFromPipeStorage: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelLocalSizeForSubgroupCount: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGetKernelMaxNumSubgroups: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeNamedBarrier: *hasResult = true; *hasResultType = false; break;
-    case Op::OpNamedBarrierInitialize: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMemoryNamedBarrier: *hasResult = false; *hasResultType = false; break;
-    case Op::OpModuleProcessed: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExecutionModeId: *hasResult = false; *hasResultType = false; break;
-    case Op::OpDecorateId: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupNonUniformElect: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformAll: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformAny: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformAllEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBroadcast: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBroadcastFirst: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBallot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformInverseBallot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBallotBitExtract: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBallotBitCount: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBallotFindLSB: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBallotFindMSB: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformShuffle: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformShuffleXor: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformShuffleUp: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformShuffleDown: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformIAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformFAdd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformIMul: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformFMul: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformSMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformUMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformFMin: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformSMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformUMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformFMax: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBitwiseAnd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBitwiseOr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformBitwiseXor: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformLogicalAnd: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformLogicalOr: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformLogicalXor: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformQuadBroadcast: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformQuadSwap: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCopyLogical: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrDiff: *hasResult = true; *hasResultType = true; break;
-    case Op::OpColorAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDepthAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpStencilAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeTensorARM: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTensorReadARM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorWriteARM: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTensorQuerySizeARM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGraphConstantARM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGraphEntryPointARM: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGraphARM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGraphInputARM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGraphSetOutputARM: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGraphEndARM: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeGraphARM: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeUntypedPointerKHR: *hasResult = true; *hasResultType = false; break;
-    case Op::OpUntypedVariableKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedAccessChainKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedInBoundsAccessChainKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupBallotKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupFirstInvocationKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedPtrAccessChainKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedInBoundsPtrAccessChainKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedArrayLengthKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedPrefetchKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpFmaKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAllKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpExtInstWithForwardRefsKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedGroupAsyncCopyKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIgnoreIntersectionKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTerminateRayKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSDot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUDot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSUDot: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSDotAccSat: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUDotAccSat: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSUDotAccSat: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeCooperativeMatrixKHR: *hasResult = true; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixLoadKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixStoreKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixMulAddKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixLengthKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantCompositeReplicateEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantCompositeReplicateEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeConstructReplicateEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeRayQueryKHR: *hasResult = true; *hasResultType = false; break;
-    case Op::OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryConfirmIntersectionKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryProceedKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionTypeKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageSampleWeightedQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBoxFilterQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchSSDQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchSADQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitCastArrayQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchWindowSSDQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchWindowSADQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchGatherSSDQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpImageBlockMatchGatherSADQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeConstructCoopMatQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCompositeExtractCoopMatQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpExtractSubArrayQCOM: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupIAddNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFAddNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFMinNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupUMinNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupSMinNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFMaxNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupUMaxNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupSMaxNonUniformAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFragmentMaskFetchAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFragmentFetchAMD: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReadClockKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAllocateNodePayloadsAMDX: *hasResult = true; *hasResultType = true; break;
-    case Op::OpEnqueueNodePayloadsAMDX: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeNodePayloadArrayAMDX: *hasResult = true; *hasResultType = false; break;
-    case Op::OpFinishWritingNodePayloadAMDX: *hasResult = true; *hasResultType = true; break;
-    case Op::OpNodePayloadArrayLengthAMDX: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIsNodePayloadValidAMDX: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantStringAMDX: *hasResult = true; *hasResultType = false; break;
-    case Op::OpSpecConstantStringAMDX: *hasResult = true; *hasResultType = false; break;
-    case Op::OpGroupNonUniformQuadAllKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupNonUniformQuadAnyKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectRecordHitMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitWithIndexMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetWorldToObjectNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectToWorldNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectTraceRayMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetShaderRecordBufferHandleNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetShaderBindingTableRecordIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectRecordEmptyNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceRayNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitWithIndexNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectExecuteShaderNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetCurrentTimeNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetAttributesNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetHitKindNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetPrimitiveIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetGeometryIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceIdNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceCustomIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMaxNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMinNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsEmptyNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsMissNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReorderThreadWithHitObjectNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReorderThreadWithHintNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeHitObjectNV: *hasResult = true; *hasResultType = false; break;
-    case Op::OpImageSampleFootprintNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeCooperativeVectorNV: *hasResult = true; *hasResultType = false; break;
-    case Op::OpCooperativeVectorMatrixMulNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeVectorOuterProductAccumulateNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeVectorReduceSumAccumulateNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeVectorMatrixMulAddNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixConvertNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpEmitMeshTasksEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSetMeshOutputsEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpGroupNonUniformPartitionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpWritePackedPrimitiveIndices4x8NV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpFetchMicroTriangleVertexPositionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFetchMicroTriangleVertexBarycentricNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeVectorLoadNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeVectorStoreNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordFromQueryEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayFlagsEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectSetShaderBindingTableRecordIndexEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectReorderExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceMotionReorderExecuteEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeHitObjectEXT: *hasResult = true; *hasResultType = false; break;
-    case Op::OpReorderThreadWithHintEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReorderThreadWithHitObjectEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceRayEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceRayMotionEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordEmptyEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectExecuteShaderEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetCurrentTimeEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetAttributesEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetHitKindEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetPrimitiveIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetGeometryIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceIdEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceCustomIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayDirectionEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayOriginEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectToWorldEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldToObjectEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMaxEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReportIntersectionKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIgnoreIntersectionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTerminateRayNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTraceNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTraceMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTraceRayMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeAccelerationStructureKHR: *hasResult = true; *hasResultType = false; break;
-    case Op::OpExecuteCallableNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRayQueryGetIntersectionClusterIdNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetClusterIdNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMinEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetShaderBindingTableRecordIndexEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetShaderRecordBufferHandleEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsEmptyEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsHitEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsMissEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeCooperativeMatrixNV: *hasResult = true; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixLoadNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixMulAddNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixLengthNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBeginInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpEndInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixReduceNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixLoadTensorNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixStoreTensorNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCooperativeMatrixPerElementOpNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeTensorLayoutNV: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeTensorViewNV: *hasResult = true; *hasResultType = false; break;
-    case Op::OpCreateTensorLayoutNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorLayoutSetDimensionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorLayoutSetStrideNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorLayoutSliceNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorLayoutSetClampValueNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCreateTensorViewNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorViewSetDimensionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorViewSetStrideNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDemoteToHelperInvocation: *hasResult = false; *hasResultType = false; break;
-    case Op::OpIsHelperInvocationEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorViewSetClipNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTensorLayoutSetBlockSizeNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCooperativeMatrixTransposeNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertUToImageNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertUToSamplerNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertImageToUNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertSamplerToUNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertUToSampledImageNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertSampledImageToUNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSamplerImageAddressingModeNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpRawAccessChainNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionSpherePositionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionSphereRadiusNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionLSSPositionsNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionLSSRadiiNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionLSSHitValueNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetSpherePositionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetSphereRadiusNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetLSSPositionsNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetLSSRadiiNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsSphereHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsLSSHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryIsSphereHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryIsLSSHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupShuffleINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupShuffleDownINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupShuffleUpINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupShuffleXorINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupBlockReadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupBlockWriteINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroupImageBlockReadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupImageBlockWriteINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroupImageMediaBlockReadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupImageMediaBlockWriteINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpUCountLeadingZerosINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUCountTrailingZerosINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAbsISubINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAbsUSubINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIAddSatINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUAddSatINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIAverageINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUAverageINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIAverageRoundedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUAverageRoundedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpISubSatINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUSubSatINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpIMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConstantFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFunctionPointerCallINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAsmTargetINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpAsmINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicFMaxEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAssumeTrueKHR: *hasResult = false; *hasResultType = false; break;
-    case Op::OpExpectKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpDecorateString: *hasResult = false; *hasResultType = false; break;
-    case Op::OpMemberDecorateString: *hasResult = false; *hasResultType = false; break;
-    case Op::OpVmeImageINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeVmeImageINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImePayloadINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcRefPayloadINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcSicPayloadINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcMcePayloadINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcMceResultINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImeResultINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImeResultSingleReferenceStreamoutINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImeResultDualReferenceStreamoutINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImeSingleReferenceStreaminINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcImeDualReferenceStreaminINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcRefResultINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeAvcSicResultINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpSubgroupAvcMceGetDefaultInterBaseMultiReferencePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetInterBaseMultiReferencePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultInterShapePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetInterShapePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultInterDirectionPenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetInterDirectionPenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultIntraLumaShapePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultInterMotionVectorCostTableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultHighPenaltyCostTableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultMediumPenaltyCostTableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultLowPenaltyCostTableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetMotionVectorCostFunctionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultIntraLumaModePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultNonDcLumaIntraPenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetDefaultIntraChromaModeBasePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetAcOnlyHaarINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetSourceInterlacedFieldPolarityINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetSingleReferenceInterlacedFieldPolarityINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceSetDualReferenceInterlacedFieldPolaritiesINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToImePayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToImeResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToRefPayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToRefResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToSicPayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceConvertToSicResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetMotionVectorsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterDistortionsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetBestInterDistortionsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterMajorShapeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterMinorShapeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterDirectionsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterMotionVectorCountINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterReferenceIdsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcMceGetInterReferenceInterlacedFieldPolaritiesINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeInitializeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetSingleReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetDualReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeRefWindowSizeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeAdjustRefOffsetINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeConvertToMcePayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetMaxMotionVectorCountINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetUnidirectionalMixDisableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetEarlySearchTerminationThresholdINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeSetWeightedSadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreaminINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreamoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreamoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreaminoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeConvertToMceResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetSingleReferenceStreaminINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetDualReferenceStreaminINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeStripSingleReferenceStreamoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeStripDualReferenceStreamoutINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeMotionVectorsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeDistortionsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeReferenceIdsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeMotionVectorsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeDistortionsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeReferenceIdsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetBorderReachedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetTruncatedSearchIndicationINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetUnidirectionalEarlySearchTerminationINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetWeightingPatternMinimumMotionVectorINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcImeGetWeightingPatternMinimumDistortionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcFmeInitializeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcBmeInitializeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefConvertToMcePayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefSetBidirectionalMixDisableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefSetBilinearFilterEnableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefEvaluateWithSingleReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefEvaluateWithDualReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefEvaluateWithMultiReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefEvaluateWithMultiReferenceInterlacedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcRefConvertToMceResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicInitializeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicConfigureSkcINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicConfigureIpeLumaINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicConfigureIpeLumaChromaINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetMotionVectorMaskINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicConvertToMcePayloadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetIntraLumaShapePenaltyINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetIntraLumaModeCostFunctionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetIntraChromaModeCostFunctionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetBilinearFilterEnableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetSkcForwardTransformEnableINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicSetBlockBasedRawSkipSadINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicEvaluateIpeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicEvaluateWithSingleReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicEvaluateWithDualReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicEvaluateWithMultiReferenceINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicEvaluateWithMultiReferenceInterlacedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicConvertToMceResultINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetIpeLumaShapeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetBestIpeLumaDistortionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetBestIpeChromaDistortionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetPackedIpeLumaModesINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetIpeChromaModeINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSubgroupAvcSicGetInterRawSadsINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpVariableLengthArrayINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSaveMemoryINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRestoreMemoryINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpArbitraryFloatSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCastALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCastFromIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCastToIntALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatAddALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatSubALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatMulALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatDivALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatGTALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatGEALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLTALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLEALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatEQALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatRSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCbrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatHypotALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLogINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLog2INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLog10INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatLog1pINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatExpINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatExp2INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatExp10INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatExpm1INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatSinINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCosINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatSinCosINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatSinPiINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatCosPiINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatASinINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatASinPiINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatACosINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatACosPiINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatATanINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatATanPiINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatATan2INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatPowINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatPowRINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpArbitraryFloatPowNINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpLoopControlINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpAliasDomainDeclINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpAliasScopeDeclINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpAliasScopeListDeclINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpFixedSqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedRecipALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedRsqrtALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedSinALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedSinCosALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedSinPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedSinCosPiALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedLogALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFixedExpALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpPtrCastToCrossWorkgroupALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpCrossWorkgroupCastToPtrALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReadPipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpWritePipeBlockingALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpFPGARegALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetRayTMinKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetRayFlagsKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionTKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionInstanceIdKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionGeometryIndexKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionPrimitiveIndexKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionBarycentricsKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionFrontFaceKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionObjectRayDirectionKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionObjectRayOriginKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetWorldRayDirectionKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetWorldRayOriginKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionObjectToWorldKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRayQueryGetIntersectionWorldToObjectKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpAtomicFAddEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTypeBufferSurfaceINTEL: *hasResult = true; *hasResultType = false; break;
-    case Op::OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpCompositeConstructContinuedINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertFToBF16INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertBF16ToFINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpArithmeticFenceEXT: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTaskSequenceCreateALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTaskSequenceAsyncALTERA: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTaskSequenceGetALTERA: *hasResult = true; *hasResultType = true; break;
-    case Op::OpTaskSequenceReleaseALTERA: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeTaskSequenceALTERA: *hasResult = true; *hasResultType = false; break;
-    case Op::OpSubgroupBlockPrefetchINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroup2DBlockLoadINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroup2DBlockLoadTransformINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroup2DBlockLoadTransposeINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroup2DBlockPrefetchINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroup2DBlockStoreINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSubgroupMatrixMultiplyAccumulateINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpBitwiseFunctionINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpUntypedVariableLengthArrayINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConditionalExtensionINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConditionalEntryPointINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConditionalCapabilityINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpSpecConstantTargetINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantArchitectureINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpSpecConstantCapabilitiesINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConditionalCopyObjectINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupIMulKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupFMulKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupBitwiseAndKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupBitwiseOrKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupBitwiseXorKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupLogicalAndKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupLogicalOrKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpGroupLogicalXorKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpRoundFToTF32INTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMaskedGatherINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpMaskedScatterINTEL: *hasResult = false; *hasResultType = false; break;
-    case Op::OpConvertHandleToImageINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertHandleToSamplerINTEL: *hasResult = true; *hasResultType = true; break;
-    case Op::OpConvertHandleToSampledImageINTEL: *hasResult = true; *hasResultType = true; break;
-    }
-}
-inline const char* SourceLanguageToString(SourceLanguage value) {
-    switch (value) {
-    case SourceLanguage::Unknown: return "Unknown";
-    case SourceLanguage::ESSL: return "ESSL";
-    case SourceLanguage::GLSL: return "GLSL";
-    case SourceLanguage::OpenCL_C: return "OpenCL_C";
-    case SourceLanguage::OpenCL_CPP: return "OpenCL_CPP";
-    case SourceLanguage::HLSL: return "HLSL";
-    case SourceLanguage::CPP_for_OpenCL: return "CPP_for_OpenCL";
-    case SourceLanguage::SYCL: return "SYCL";
-    case SourceLanguage::HERO_C: return "HERO_C";
-    case SourceLanguage::NZSL: return "NZSL";
-    case SourceLanguage::WGSL: return "WGSL";
-    case SourceLanguage::Slang: return "Slang";
-    case SourceLanguage::Zig: return "Zig";
-    case SourceLanguage::Rust: return "Rust";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ExecutionModelToString(ExecutionModel value) {
-    switch (value) {
-    case ExecutionModel::Vertex: return "Vertex";
-    case ExecutionModel::TessellationControl: return "TessellationControl";
-    case ExecutionModel::TessellationEvaluation: return "TessellationEvaluation";
-    case ExecutionModel::Geometry: return "Geometry";
-    case ExecutionModel::Fragment: return "Fragment";
-    case ExecutionModel::GLCompute: return "GLCompute";
-    case ExecutionModel::Kernel: return "Kernel";
-    case ExecutionModel::TaskNV: return "TaskNV";
-    case ExecutionModel::MeshNV: return "MeshNV";
-    case ExecutionModel::RayGenerationKHR: return "RayGenerationKHR";
-    case ExecutionModel::IntersectionKHR: return "IntersectionKHR";
-    case ExecutionModel::AnyHitKHR: return "AnyHitKHR";
-    case ExecutionModel::ClosestHitKHR: return "ClosestHitKHR";
-    case ExecutionModel::MissKHR: return "MissKHR";
-    case ExecutionModel::CallableKHR: return "CallableKHR";
-    case ExecutionModel::TaskEXT: return "TaskEXT";
-    case ExecutionModel::MeshEXT: return "MeshEXT";
-    default: return "Unknown";
-    }
-}
-
-inline const char* AddressingModelToString(AddressingModel value) {
-    switch (value) {
-    case AddressingModel::Logical: return "Logical";
-    case AddressingModel::Physical32: return "Physical32";
-    case AddressingModel::Physical64: return "Physical64";
-    case AddressingModel::PhysicalStorageBuffer64: return "PhysicalStorageBuffer64";
-    default: return "Unknown";
-    }
-}
-
-inline const char* MemoryModelToString(MemoryModel value) {
-    switch (value) {
-    case MemoryModel::Simple: return "Simple";
-    case MemoryModel::GLSL450: return "GLSL450";
-    case MemoryModel::OpenCL: return "OpenCL";
-    case MemoryModel::Vulkan: return "Vulkan";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ExecutionModeToString(ExecutionMode value) {
-    switch (value) {
-    case ExecutionMode::Invocations: return "Invocations";
-    case ExecutionMode::SpacingEqual: return "SpacingEqual";
-    case ExecutionMode::SpacingFractionalEven: return "SpacingFractionalEven";
-    case ExecutionMode::SpacingFractionalOdd: return "SpacingFractionalOdd";
-    case ExecutionMode::VertexOrderCw: return "VertexOrderCw";
-    case ExecutionMode::VertexOrderCcw: return "VertexOrderCcw";
-    case ExecutionMode::PixelCenterInteger: return "PixelCenterInteger";
-    case ExecutionMode::OriginUpperLeft: return "OriginUpperLeft";
-    case ExecutionMode::OriginLowerLeft: return "OriginLowerLeft";
-    case ExecutionMode::EarlyFragmentTests: return "EarlyFragmentTests";
-    case ExecutionMode::PointMode: return "PointMode";
-    case ExecutionMode::Xfb: return "Xfb";
-    case ExecutionMode::DepthReplacing: return "DepthReplacing";
-    case ExecutionMode::DepthGreater: return "DepthGreater";
-    case ExecutionMode::DepthLess: return "DepthLess";
-    case ExecutionMode::DepthUnchanged: return "DepthUnchanged";
-    case ExecutionMode::LocalSize: return "LocalSize";
-    case ExecutionMode::LocalSizeHint: return "LocalSizeHint";
-    case ExecutionMode::InputPoints: return "InputPoints";
-    case ExecutionMode::InputLines: return "InputLines";
-    case ExecutionMode::InputLinesAdjacency: return "InputLinesAdjacency";
-    case ExecutionMode::Triangles: return "Triangles";
-    case ExecutionMode::InputTrianglesAdjacency: return "InputTrianglesAdjacency";
-    case ExecutionMode::Quads: return "Quads";
-    case ExecutionMode::Isolines: return "Isolines";
-    case ExecutionMode::OutputVertices: return "OutputVertices";
-    case ExecutionMode::OutputPoints: return "OutputPoints";
-    case ExecutionMode::OutputLineStrip: return "OutputLineStrip";
-    case ExecutionMode::OutputTriangleStrip: return "OutputTriangleStrip";
-    case ExecutionMode::VecTypeHint: return "VecTypeHint";
-    case ExecutionMode::ContractionOff: return "ContractionOff";
-    case ExecutionMode::Initializer: return "Initializer";
-    case ExecutionMode::Finalizer: return "Finalizer";
-    case ExecutionMode::SubgroupSize: return "SubgroupSize";
-    case ExecutionMode::SubgroupsPerWorkgroup: return "SubgroupsPerWorkgroup";
-    case ExecutionMode::SubgroupsPerWorkgroupId: return "SubgroupsPerWorkgroupId";
-    case ExecutionMode::LocalSizeId: return "LocalSizeId";
-    case ExecutionMode::LocalSizeHintId: return "LocalSizeHintId";
-    case ExecutionMode::NonCoherentColorAttachmentReadEXT: return "NonCoherentColorAttachmentReadEXT";
-    case ExecutionMode::NonCoherentDepthAttachmentReadEXT: return "NonCoherentDepthAttachmentReadEXT";
-    case ExecutionMode::NonCoherentStencilAttachmentReadEXT: return "NonCoherentStencilAttachmentReadEXT";
-    case ExecutionMode::SubgroupUniformControlFlowKHR: return "SubgroupUniformControlFlowKHR";
-    case ExecutionMode::PostDepthCoverage: return "PostDepthCoverage";
-    case ExecutionMode::DenormPreserve: return "DenormPreserve";
-    case ExecutionMode::DenormFlushToZero: return "DenormFlushToZero";
-    case ExecutionMode::SignedZeroInfNanPreserve: return "SignedZeroInfNanPreserve";
-    case ExecutionMode::RoundingModeRTE: return "RoundingModeRTE";
-    case ExecutionMode::RoundingModeRTZ: return "RoundingModeRTZ";
-    case ExecutionMode::NonCoherentTileAttachmentReadQCOM: return "NonCoherentTileAttachmentReadQCOM";
-    case ExecutionMode::TileShadingRateQCOM: return "TileShadingRateQCOM";
-    case ExecutionMode::EarlyAndLateFragmentTestsAMD: return "EarlyAndLateFragmentTestsAMD";
-    case ExecutionMode::StencilRefReplacingEXT: return "StencilRefReplacingEXT";
-    case ExecutionMode::CoalescingAMDX: return "CoalescingAMDX";
-    case ExecutionMode::IsApiEntryAMDX: return "IsApiEntryAMDX";
-    case ExecutionMode::MaxNodeRecursionAMDX: return "MaxNodeRecursionAMDX";
-    case ExecutionMode::StaticNumWorkgroupsAMDX: return "StaticNumWorkgroupsAMDX";
-    case ExecutionMode::ShaderIndexAMDX: return "ShaderIndexAMDX";
-    case ExecutionMode::MaxNumWorkgroupsAMDX: return "MaxNumWorkgroupsAMDX";
-    case ExecutionMode::StencilRefUnchangedFrontAMD: return "StencilRefUnchangedFrontAMD";
-    case ExecutionMode::StencilRefGreaterFrontAMD: return "StencilRefGreaterFrontAMD";
-    case ExecutionMode::StencilRefLessFrontAMD: return "StencilRefLessFrontAMD";
-    case ExecutionMode::StencilRefUnchangedBackAMD: return "StencilRefUnchangedBackAMD";
-    case ExecutionMode::StencilRefGreaterBackAMD: return "StencilRefGreaterBackAMD";
-    case ExecutionMode::StencilRefLessBackAMD: return "StencilRefLessBackAMD";
-    case ExecutionMode::QuadDerivativesKHR: return "QuadDerivativesKHR";
-    case ExecutionMode::RequireFullQuadsKHR: return "RequireFullQuadsKHR";
-    case ExecutionMode::SharesInputWithAMDX: return "SharesInputWithAMDX";
-    case ExecutionMode::OutputLinesEXT: return "OutputLinesEXT";
-    case ExecutionMode::OutputPrimitivesEXT: return "OutputPrimitivesEXT";
-    case ExecutionMode::DerivativeGroupQuadsKHR: return "DerivativeGroupQuadsKHR";
-    case ExecutionMode::DerivativeGroupLinearKHR: return "DerivativeGroupLinearKHR";
-    case ExecutionMode::OutputTrianglesEXT: return "OutputTrianglesEXT";
-    case ExecutionMode::PixelInterlockOrderedEXT: return "PixelInterlockOrderedEXT";
-    case ExecutionMode::PixelInterlockUnorderedEXT: return "PixelInterlockUnorderedEXT";
-    case ExecutionMode::SampleInterlockOrderedEXT: return "SampleInterlockOrderedEXT";
-    case ExecutionMode::SampleInterlockUnorderedEXT: return "SampleInterlockUnorderedEXT";
-    case ExecutionMode::ShadingRateInterlockOrderedEXT: return "ShadingRateInterlockOrderedEXT";
-    case ExecutionMode::ShadingRateInterlockUnorderedEXT: return "ShadingRateInterlockUnorderedEXT";
-    case ExecutionMode::Shader64BitIndexingEXT: return "Shader64BitIndexingEXT";
-    case ExecutionMode::SharedLocalMemorySizeINTEL: return "SharedLocalMemorySizeINTEL";
-    case ExecutionMode::RoundingModeRTPINTEL: return "RoundingModeRTPINTEL";
-    case ExecutionMode::RoundingModeRTNINTEL: return "RoundingModeRTNINTEL";
-    case ExecutionMode::FloatingPointModeALTINTEL: return "FloatingPointModeALTINTEL";
-    case ExecutionMode::FloatingPointModeIEEEINTEL: return "FloatingPointModeIEEEINTEL";
-    case ExecutionMode::MaxWorkgroupSizeINTEL: return "MaxWorkgroupSizeINTEL";
-    case ExecutionMode::MaxWorkDimINTEL: return "MaxWorkDimINTEL";
-    case ExecutionMode::NoGlobalOffsetINTEL: return "NoGlobalOffsetINTEL";
-    case ExecutionMode::NumSIMDWorkitemsINTEL: return "NumSIMDWorkitemsINTEL";
-    case ExecutionMode::SchedulerTargetFmaxMhzINTEL: return "SchedulerTargetFmaxMhzINTEL";
-    case ExecutionMode::MaximallyReconvergesKHR: return "MaximallyReconvergesKHR";
-    case ExecutionMode::FPFastMathDefault: return "FPFastMathDefault";
-    case ExecutionMode::StreamingInterfaceINTEL: return "StreamingInterfaceINTEL";
-    case ExecutionMode::RegisterMapInterfaceINTEL: return "RegisterMapInterfaceINTEL";
-    case ExecutionMode::NamedBarrierCountINTEL: return "NamedBarrierCountINTEL";
-    case ExecutionMode::MaximumRegistersINTEL: return "MaximumRegistersINTEL";
-    case ExecutionMode::MaximumRegistersIdINTEL: return "MaximumRegistersIdINTEL";
-    case ExecutionMode::NamedMaximumRegistersINTEL: return "NamedMaximumRegistersINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* StorageClassToString(StorageClass value) {
-    switch (value) {
-    case StorageClass::UniformConstant: return "UniformConstant";
-    case StorageClass::Input: return "Input";
-    case StorageClass::Uniform: return "Uniform";
-    case StorageClass::Output: return "Output";
-    case StorageClass::Workgroup: return "Workgroup";
-    case StorageClass::CrossWorkgroup: return "CrossWorkgroup";
-    case StorageClass::Private: return "Private";
-    case StorageClass::Function: return "Function";
-    case StorageClass::Generic: return "Generic";
-    case StorageClass::PushConstant: return "PushConstant";
-    case StorageClass::AtomicCounter: return "AtomicCounter";
-    case StorageClass::Image: return "Image";
-    case StorageClass::StorageBuffer: return "StorageBuffer";
-    case StorageClass::TileImageEXT: return "TileImageEXT";
-    case StorageClass::TileAttachmentQCOM: return "TileAttachmentQCOM";
-    case StorageClass::NodePayloadAMDX: return "NodePayloadAMDX";
-    case StorageClass::CallableDataKHR: return "CallableDataKHR";
-    case StorageClass::IncomingCallableDataKHR: return "IncomingCallableDataKHR";
-    case StorageClass::RayPayloadKHR: return "RayPayloadKHR";
-    case StorageClass::HitAttributeKHR: return "HitAttributeKHR";
-    case StorageClass::IncomingRayPayloadKHR: return "IncomingRayPayloadKHR";
-    case StorageClass::ShaderRecordBufferKHR: return "ShaderRecordBufferKHR";
-    case StorageClass::PhysicalStorageBuffer: return "PhysicalStorageBuffer";
-    case StorageClass::HitObjectAttributeNV: return "HitObjectAttributeNV";
-    case StorageClass::TaskPayloadWorkgroupEXT: return "TaskPayloadWorkgroupEXT";
-    case StorageClass::HitObjectAttributeEXT: return "HitObjectAttributeEXT";
-    case StorageClass::CodeSectionINTEL: return "CodeSectionINTEL";
-    case StorageClass::DeviceOnlyALTERA: return "DeviceOnlyALTERA";
-    case StorageClass::HostOnlyALTERA: return "HostOnlyALTERA";
-    default: return "Unknown";
-    }
-}
-
-inline const char* DimToString(Dim value) {
-    switch (value) {
-    case Dim::Dim1D: return "1D";
-    case Dim::Dim2D: return "2D";
-    case Dim::Dim3D: return "3D";
-    case Dim::Cube: return "Cube";
-    case Dim::Rect: return "Rect";
-    case Dim::Buffer: return "Buffer";
-    case Dim::SubpassData: return "SubpassData";
-    case Dim::TileImageDataEXT: return "TileImageDataEXT";
-    default: return "Unknown";
-    }
-}
-
-inline const char* SamplerAddressingModeToString(SamplerAddressingMode value) {
-    switch (value) {
-    case SamplerAddressingMode::None: return "None";
-    case SamplerAddressingMode::ClampToEdge: return "ClampToEdge";
-    case SamplerAddressingMode::Clamp: return "Clamp";
-    case SamplerAddressingMode::Repeat: return "Repeat";
-    case SamplerAddressingMode::RepeatMirrored: return "RepeatMirrored";
-    default: return "Unknown";
-    }
-}
-
-inline const char* SamplerFilterModeToString(SamplerFilterMode value) {
-    switch (value) {
-    case SamplerFilterMode::Nearest: return "Nearest";
-    case SamplerFilterMode::Linear: return "Linear";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ImageFormatToString(ImageFormat value) {
-    switch (value) {
-    case ImageFormat::Unknown: return "Unknown";
-    case ImageFormat::Rgba32f: return "Rgba32f";
-    case ImageFormat::Rgba16f: return "Rgba16f";
-    case ImageFormat::R32f: return "R32f";
-    case ImageFormat::Rgba8: return "Rgba8";
-    case ImageFormat::Rgba8Snorm: return "Rgba8Snorm";
-    case ImageFormat::Rg32f: return "Rg32f";
-    case ImageFormat::Rg16f: return "Rg16f";
-    case ImageFormat::R11fG11fB10f: return "R11fG11fB10f";
-    case ImageFormat::R16f: return "R16f";
-    case ImageFormat::Rgba16: return "Rgba16";
-    case ImageFormat::Rgb10A2: return "Rgb10A2";
-    case ImageFormat::Rg16: return "Rg16";
-    case ImageFormat::Rg8: return "Rg8";
-    case ImageFormat::R16: return "R16";
-    case ImageFormat::R8: return "R8";
-    case ImageFormat::Rgba16Snorm: return "Rgba16Snorm";
-    case ImageFormat::Rg16Snorm: return "Rg16Snorm";
-    case ImageFormat::Rg8Snorm: return "Rg8Snorm";
-    case ImageFormat::R16Snorm: return "R16Snorm";
-    case ImageFormat::R8Snorm: return "R8Snorm";
-    case ImageFormat::Rgba32i: return "Rgba32i";
-    case ImageFormat::Rgba16i: return "Rgba16i";
-    case ImageFormat::Rgba8i: return "Rgba8i";
-    case ImageFormat::R32i: return "R32i";
-    case ImageFormat::Rg32i: return "Rg32i";
-    case ImageFormat::Rg16i: return "Rg16i";
-    case ImageFormat::Rg8i: return "Rg8i";
-    case ImageFormat::R16i: return "R16i";
-    case ImageFormat::R8i: return "R8i";
-    case ImageFormat::Rgba32ui: return "Rgba32ui";
-    case ImageFormat::Rgba16ui: return "Rgba16ui";
-    case ImageFormat::Rgba8ui: return "Rgba8ui";
-    case ImageFormat::R32ui: return "R32ui";
-    case ImageFormat::Rgb10a2ui: return "Rgb10a2ui";
-    case ImageFormat::Rg32ui: return "Rg32ui";
-    case ImageFormat::Rg16ui: return "Rg16ui";
-    case ImageFormat::Rg8ui: return "Rg8ui";
-    case ImageFormat::R16ui: return "R16ui";
-    case ImageFormat::R8ui: return "R8ui";
-    case ImageFormat::R64ui: return "R64ui";
-    case ImageFormat::R64i: return "R64i";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ImageChannelOrderToString(ImageChannelOrder value) {
-    switch (value) {
-    case ImageChannelOrder::R: return "R";
-    case ImageChannelOrder::A: return "A";
-    case ImageChannelOrder::RG: return "RG";
-    case ImageChannelOrder::RA: return "RA";
-    case ImageChannelOrder::RGB: return "RGB";
-    case ImageChannelOrder::RGBA: return "RGBA";
-    case ImageChannelOrder::BGRA: return "BGRA";
-    case ImageChannelOrder::ARGB: return "ARGB";
-    case ImageChannelOrder::Intensity: return "Intensity";
-    case ImageChannelOrder::Luminance: return "Luminance";
-    case ImageChannelOrder::Rx: return "Rx";
-    case ImageChannelOrder::RGx: return "RGx";
-    case ImageChannelOrder::RGBx: return "RGBx";
-    case ImageChannelOrder::Depth: return "Depth";
-    case ImageChannelOrder::DepthStencil: return "DepthStencil";
-    case ImageChannelOrder::sRGB: return "sRGB";
-    case ImageChannelOrder::sRGBx: return "sRGBx";
-    case ImageChannelOrder::sRGBA: return "sRGBA";
-    case ImageChannelOrder::sBGRA: return "sBGRA";
-    case ImageChannelOrder::ABGR: return "ABGR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ImageChannelDataTypeToString(ImageChannelDataType value) {
-    switch (value) {
-    case ImageChannelDataType::SnormInt8: return "SnormInt8";
-    case ImageChannelDataType::SnormInt16: return "SnormInt16";
-    case ImageChannelDataType::UnormInt8: return "UnormInt8";
-    case ImageChannelDataType::UnormInt16: return "UnormInt16";
-    case ImageChannelDataType::UnormShort565: return "UnormShort565";
-    case ImageChannelDataType::UnormShort555: return "UnormShort555";
-    case ImageChannelDataType::UnormInt101010: return "UnormInt101010";
-    case ImageChannelDataType::SignedInt8: return "SignedInt8";
-    case ImageChannelDataType::SignedInt16: return "SignedInt16";
-    case ImageChannelDataType::SignedInt32: return "SignedInt32";
-    case ImageChannelDataType::UnsignedInt8: return "UnsignedInt8";
-    case ImageChannelDataType::UnsignedInt16: return "UnsignedInt16";
-    case ImageChannelDataType::UnsignedInt32: return "UnsignedInt32";
-    case ImageChannelDataType::HalfFloat: return "HalfFloat";
-    case ImageChannelDataType::Float: return "Float";
-    case ImageChannelDataType::UnormInt24: return "UnormInt24";
-    case ImageChannelDataType::UnormInt101010_2: return "UnormInt101010_2";
-    case ImageChannelDataType::UnormInt10X6EXT: return "UnormInt10X6EXT";
-    case ImageChannelDataType::UnsignedIntRaw10EXT: return "UnsignedIntRaw10EXT";
-    case ImageChannelDataType::UnsignedIntRaw12EXT: return "UnsignedIntRaw12EXT";
-    case ImageChannelDataType::UnormInt2_101010EXT: return "UnormInt2_101010EXT";
-    case ImageChannelDataType::UnsignedInt10X6EXT: return "UnsignedInt10X6EXT";
-    case ImageChannelDataType::UnsignedInt12X4EXT: return "UnsignedInt12X4EXT";
-    case ImageChannelDataType::UnsignedInt14X2EXT: return "UnsignedInt14X2EXT";
-    case ImageChannelDataType::UnormInt12X4EXT: return "UnormInt12X4EXT";
-    case ImageChannelDataType::UnormInt14X2EXT: return "UnormInt14X2EXT";
-    default: return "Unknown";
-    }
-}
-
-inline const char* FPRoundingModeToString(FPRoundingMode value) {
-    switch (value) {
-    case FPRoundingMode::RTE: return "RTE";
-    case FPRoundingMode::RTZ: return "RTZ";
-    case FPRoundingMode::RTP: return "RTP";
-    case FPRoundingMode::RTN: return "RTN";
-    default: return "Unknown";
-    }
-}
-
-inline const char* LinkageTypeToString(LinkageType value) {
-    switch (value) {
-    case LinkageType::Export: return "Export";
-    case LinkageType::Import: return "Import";
-    case LinkageType::LinkOnceODR: return "LinkOnceODR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* AccessQualifierToString(AccessQualifier value) {
-    switch (value) {
-    case AccessQualifier::ReadOnly: return "ReadOnly";
-    case AccessQualifier::WriteOnly: return "WriteOnly";
-    case AccessQualifier::ReadWrite: return "ReadWrite";
-    default: return "Unknown";
-    }
-}
-
-inline const char* FunctionParameterAttributeToString(FunctionParameterAttribute value) {
-    switch (value) {
-    case FunctionParameterAttribute::Zext: return "Zext";
-    case FunctionParameterAttribute::Sext: return "Sext";
-    case FunctionParameterAttribute::ByVal: return "ByVal";
-    case FunctionParameterAttribute::Sret: return "Sret";
-    case FunctionParameterAttribute::NoAlias: return "NoAlias";
-    case FunctionParameterAttribute::NoCapture: return "NoCapture";
-    case FunctionParameterAttribute::NoWrite: return "NoWrite";
-    case FunctionParameterAttribute::NoReadWrite: return "NoReadWrite";
-    case FunctionParameterAttribute::RuntimeAlignedALTERA: return "RuntimeAlignedALTERA";
-    default: return "Unknown";
-    }
-}
-
-inline const char* DecorationToString(Decoration value) {
-    switch (value) {
-    case Decoration::RelaxedPrecision: return "RelaxedPrecision";
-    case Decoration::SpecId: return "SpecId";
-    case Decoration::Block: return "Block";
-    case Decoration::BufferBlock: return "BufferBlock";
-    case Decoration::RowMajor: return "RowMajor";
-    case Decoration::ColMajor: return "ColMajor";
-    case Decoration::ArrayStride: return "ArrayStride";
-    case Decoration::MatrixStride: return "MatrixStride";
-    case Decoration::GLSLShared: return "GLSLShared";
-    case Decoration::GLSLPacked: return "GLSLPacked";
-    case Decoration::CPacked: return "CPacked";
-    case Decoration::BuiltIn: return "BuiltIn";
-    case Decoration::NoPerspective: return "NoPerspective";
-    case Decoration::Flat: return "Flat";
-    case Decoration::Patch: return "Patch";
-    case Decoration::Centroid: return "Centroid";
-    case Decoration::Sample: return "Sample";
-    case Decoration::Invariant: return "Invariant";
-    case Decoration::Restrict: return "Restrict";
-    case Decoration::Aliased: return "Aliased";
-    case Decoration::Volatile: return "Volatile";
-    case Decoration::Constant: return "Constant";
-    case Decoration::Coherent: return "Coherent";
-    case Decoration::NonWritable: return "NonWritable";
-    case Decoration::NonReadable: return "NonReadable";
-    case Decoration::Uniform: return "Uniform";
-    case Decoration::UniformId: return "UniformId";
-    case Decoration::SaturatedConversion: return "SaturatedConversion";
-    case Decoration::Stream: return "Stream";
-    case Decoration::Location: return "Location";
-    case Decoration::Component: return "Component";
-    case Decoration::Index: return "Index";
-    case Decoration::Binding: return "Binding";
-    case Decoration::DescriptorSet: return "DescriptorSet";
-    case Decoration::Offset: return "Offset";
-    case Decoration::XfbBuffer: return "XfbBuffer";
-    case Decoration::XfbStride: return "XfbStride";
-    case Decoration::FuncParamAttr: return "FuncParamAttr";
-    case Decoration::FPRoundingMode: return "FPRoundingMode";
-    case Decoration::FPFastMathMode: return "FPFastMathMode";
-    case Decoration::LinkageAttributes: return "LinkageAttributes";
-    case Decoration::NoContraction: return "NoContraction";
-    case Decoration::InputAttachmentIndex: return "InputAttachmentIndex";
-    case Decoration::Alignment: return "Alignment";
-    case Decoration::MaxByteOffset: return "MaxByteOffset";
-    case Decoration::AlignmentId: return "AlignmentId";
-    case Decoration::MaxByteOffsetId: return "MaxByteOffsetId";
-    case Decoration::SaturatedToLargestFloat8NormalConversionEXT: return "SaturatedToLargestFloat8NormalConversionEXT";
-    case Decoration::NoSignedWrap: return "NoSignedWrap";
-    case Decoration::NoUnsignedWrap: return "NoUnsignedWrap";
-    case Decoration::WeightTextureQCOM: return "WeightTextureQCOM";
-    case Decoration::BlockMatchTextureQCOM: return "BlockMatchTextureQCOM";
-    case Decoration::BlockMatchSamplerQCOM: return "BlockMatchSamplerQCOM";
-    case Decoration::ExplicitInterpAMD: return "ExplicitInterpAMD";
-    case Decoration::NodeSharesPayloadLimitsWithAMDX: return "NodeSharesPayloadLimitsWithAMDX";
-    case Decoration::NodeMaxPayloadsAMDX: return "NodeMaxPayloadsAMDX";
-    case Decoration::TrackFinishWritingAMDX: return "TrackFinishWritingAMDX";
-    case Decoration::PayloadNodeNameAMDX: return "PayloadNodeNameAMDX";
-    case Decoration::PayloadNodeBaseIndexAMDX: return "PayloadNodeBaseIndexAMDX";
-    case Decoration::PayloadNodeSparseArrayAMDX: return "PayloadNodeSparseArrayAMDX";
-    case Decoration::PayloadNodeArraySizeAMDX: return "PayloadNodeArraySizeAMDX";
-    case Decoration::PayloadDispatchIndirectAMDX: return "PayloadDispatchIndirectAMDX";
-    case Decoration::OverrideCoverageNV: return "OverrideCoverageNV";
-    case Decoration::PassthroughNV: return "PassthroughNV";
-    case Decoration::ViewportRelativeNV: return "ViewportRelativeNV";
-    case Decoration::SecondaryViewportRelativeNV: return "SecondaryViewportRelativeNV";
-    case Decoration::PerPrimitiveEXT: return "PerPrimitiveEXT";
-    case Decoration::PerViewNV: return "PerViewNV";
-    case Decoration::PerTaskNV: return "PerTaskNV";
-    case Decoration::PerVertexKHR: return "PerVertexKHR";
-    case Decoration::NonUniform: return "NonUniform";
-    case Decoration::RestrictPointer: return "RestrictPointer";
-    case Decoration::AliasedPointer: return "AliasedPointer";
-    case Decoration::HitObjectShaderRecordBufferNV: return "HitObjectShaderRecordBufferNV";
-    case Decoration::HitObjectShaderRecordBufferEXT: return "HitObjectShaderRecordBufferEXT";
-    case Decoration::BindlessSamplerNV: return "BindlessSamplerNV";
-    case Decoration::BindlessImageNV: return "BindlessImageNV";
-    case Decoration::BoundSamplerNV: return "BoundSamplerNV";
-    case Decoration::BoundImageNV: return "BoundImageNV";
-    case Decoration::SIMTCallINTEL: return "SIMTCallINTEL";
-    case Decoration::ReferencedIndirectlyINTEL: return "ReferencedIndirectlyINTEL";
-    case Decoration::ClobberINTEL: return "ClobberINTEL";
-    case Decoration::SideEffectsINTEL: return "SideEffectsINTEL";
-    case Decoration::VectorComputeVariableINTEL: return "VectorComputeVariableINTEL";
-    case Decoration::FuncParamIOKindINTEL: return "FuncParamIOKindINTEL";
-    case Decoration::VectorComputeFunctionINTEL: return "VectorComputeFunctionINTEL";
-    case Decoration::StackCallINTEL: return "StackCallINTEL";
-    case Decoration::GlobalVariableOffsetINTEL: return "GlobalVariableOffsetINTEL";
-    case Decoration::CounterBuffer: return "CounterBuffer";
-    case Decoration::HlslSemanticGOOGLE: return "HlslSemanticGOOGLE";
-    case Decoration::UserTypeGOOGLE: return "UserTypeGOOGLE";
-    case Decoration::FunctionRoundingModeINTEL: return "FunctionRoundingModeINTEL";
-    case Decoration::FunctionDenormModeINTEL: return "FunctionDenormModeINTEL";
-    case Decoration::RegisterALTERA: return "RegisterALTERA";
-    case Decoration::MemoryALTERA: return "MemoryALTERA";
-    case Decoration::NumbanksALTERA: return "NumbanksALTERA";
-    case Decoration::BankwidthALTERA: return "BankwidthALTERA";
-    case Decoration::MaxPrivateCopiesALTERA: return "MaxPrivateCopiesALTERA";
-    case Decoration::SinglepumpALTERA: return "SinglepumpALTERA";
-    case Decoration::DoublepumpALTERA: return "DoublepumpALTERA";
-    case Decoration::MaxReplicatesALTERA: return "MaxReplicatesALTERA";
-    case Decoration::SimpleDualPortALTERA: return "SimpleDualPortALTERA";
-    case Decoration::MergeALTERA: return "MergeALTERA";
-    case Decoration::BankBitsALTERA: return "BankBitsALTERA";
-    case Decoration::ForcePow2DepthALTERA: return "ForcePow2DepthALTERA";
-    case Decoration::StridesizeALTERA: return "StridesizeALTERA";
-    case Decoration::WordsizeALTERA: return "WordsizeALTERA";
-    case Decoration::TrueDualPortALTERA: return "TrueDualPortALTERA";
-    case Decoration::BurstCoalesceALTERA: return "BurstCoalesceALTERA";
-    case Decoration::CacheSizeALTERA: return "CacheSizeALTERA";
-    case Decoration::DontStaticallyCoalesceALTERA: return "DontStaticallyCoalesceALTERA";
-    case Decoration::PrefetchALTERA: return "PrefetchALTERA";
-    case Decoration::StallEnableALTERA: return "StallEnableALTERA";
-    case Decoration::FuseLoopsInFunctionALTERA: return "FuseLoopsInFunctionALTERA";
-    case Decoration::MathOpDSPModeALTERA: return "MathOpDSPModeALTERA";
-    case Decoration::AliasScopeINTEL: return "AliasScopeINTEL";
-    case Decoration::NoAliasINTEL: return "NoAliasINTEL";
-    case Decoration::InitiationIntervalALTERA: return "InitiationIntervalALTERA";
-    case Decoration::MaxConcurrencyALTERA: return "MaxConcurrencyALTERA";
-    case Decoration::PipelineEnableALTERA: return "PipelineEnableALTERA";
-    case Decoration::BufferLocationALTERA: return "BufferLocationALTERA";
-    case Decoration::IOPipeStorageALTERA: return "IOPipeStorageALTERA";
-    case Decoration::FunctionFloatingPointModeINTEL: return "FunctionFloatingPointModeINTEL";
-    case Decoration::SingleElementVectorINTEL: return "SingleElementVectorINTEL";
-    case Decoration::VectorComputeCallableFunctionINTEL: return "VectorComputeCallableFunctionINTEL";
-    case Decoration::MediaBlockIOINTEL: return "MediaBlockIOINTEL";
-    case Decoration::StallFreeALTERA: return "StallFreeALTERA";
-    case Decoration::FPMaxErrorDecorationINTEL: return "FPMaxErrorDecorationINTEL";
-    case Decoration::LatencyControlLabelALTERA: return "LatencyControlLabelALTERA";
-    case Decoration::LatencyControlConstraintALTERA: return "LatencyControlConstraintALTERA";
-    case Decoration::ConduitKernelArgumentALTERA: return "ConduitKernelArgumentALTERA";
-    case Decoration::RegisterMapKernelArgumentALTERA: return "RegisterMapKernelArgumentALTERA";
-    case Decoration::MMHostInterfaceAddressWidthALTERA: return "MMHostInterfaceAddressWidthALTERA";
-    case Decoration::MMHostInterfaceDataWidthALTERA: return "MMHostInterfaceDataWidthALTERA";
-    case Decoration::MMHostInterfaceLatencyALTERA: return "MMHostInterfaceLatencyALTERA";
-    case Decoration::MMHostInterfaceReadWriteModeALTERA: return "MMHostInterfaceReadWriteModeALTERA";
-    case Decoration::MMHostInterfaceMaxBurstALTERA: return "MMHostInterfaceMaxBurstALTERA";
-    case Decoration::MMHostInterfaceWaitRequestALTERA: return "MMHostInterfaceWaitRequestALTERA";
-    case Decoration::StableKernelArgumentALTERA: return "StableKernelArgumentALTERA";
-    case Decoration::HostAccessINTEL: return "HostAccessINTEL";
-    case Decoration::InitModeALTERA: return "InitModeALTERA";
-    case Decoration::ImplementInRegisterMapALTERA: return "ImplementInRegisterMapALTERA";
-    case Decoration::ConditionalINTEL: return "ConditionalINTEL";
-    case Decoration::CacheControlLoadINTEL: return "CacheControlLoadINTEL";
-    case Decoration::CacheControlStoreINTEL: return "CacheControlStoreINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* BuiltInToString(BuiltIn value) {
-    switch (value) {
-    case BuiltIn::Position: return "Position";
-    case BuiltIn::PointSize: return "PointSize";
-    case BuiltIn::ClipDistance: return "ClipDistance";
-    case BuiltIn::CullDistance: return "CullDistance";
-    case BuiltIn::VertexId: return "VertexId";
-    case BuiltIn::InstanceId: return "InstanceId";
-    case BuiltIn::PrimitiveId: return "PrimitiveId";
-    case BuiltIn::InvocationId: return "InvocationId";
-    case BuiltIn::Layer: return "Layer";
-    case BuiltIn::ViewportIndex: return "ViewportIndex";
-    case BuiltIn::TessLevelOuter: return "TessLevelOuter";
-    case BuiltIn::TessLevelInner: return "TessLevelInner";
-    case BuiltIn::TessCoord: return "TessCoord";
-    case BuiltIn::PatchVertices: return "PatchVertices";
-    case BuiltIn::FragCoord: return "FragCoord";
-    case BuiltIn::PointCoord: return "PointCoord";
-    case BuiltIn::FrontFacing: return "FrontFacing";
-    case BuiltIn::SampleId: return "SampleId";
-    case BuiltIn::SamplePosition: return "SamplePosition";
-    case BuiltIn::SampleMask: return "SampleMask";
-    case BuiltIn::FragDepth: return "FragDepth";
-    case BuiltIn::HelperInvocation: return "HelperInvocation";
-    case BuiltIn::NumWorkgroups: return "NumWorkgroups";
-    case BuiltIn::WorkgroupSize: return "WorkgroupSize";
-    case BuiltIn::WorkgroupId: return "WorkgroupId";
-    case BuiltIn::LocalInvocationId: return "LocalInvocationId";
-    case BuiltIn::GlobalInvocationId: return "GlobalInvocationId";
-    case BuiltIn::LocalInvocationIndex: return "LocalInvocationIndex";
-    case BuiltIn::WorkDim: return "WorkDim";
-    case BuiltIn::GlobalSize: return "GlobalSize";
-    case BuiltIn::EnqueuedWorkgroupSize: return "EnqueuedWorkgroupSize";
-    case BuiltIn::GlobalOffset: return "GlobalOffset";
-    case BuiltIn::GlobalLinearId: return "GlobalLinearId";
-    case BuiltIn::SubgroupSize: return "SubgroupSize";
-    case BuiltIn::SubgroupMaxSize: return "SubgroupMaxSize";
-    case BuiltIn::NumSubgroups: return "NumSubgroups";
-    case BuiltIn::NumEnqueuedSubgroups: return "NumEnqueuedSubgroups";
-    case BuiltIn::SubgroupId: return "SubgroupId";
-    case BuiltIn::SubgroupLocalInvocationId: return "SubgroupLocalInvocationId";
-    case BuiltIn::VertexIndex: return "VertexIndex";
-    case BuiltIn::InstanceIndex: return "InstanceIndex";
-    case BuiltIn::CoreIDARM: return "CoreIDARM";
-    case BuiltIn::CoreCountARM: return "CoreCountARM";
-    case BuiltIn::CoreMaxIDARM: return "CoreMaxIDARM";
-    case BuiltIn::WarpIDARM: return "WarpIDARM";
-    case BuiltIn::WarpMaxIDARM: return "WarpMaxIDARM";
-    case BuiltIn::SubgroupEqMask: return "SubgroupEqMask";
-    case BuiltIn::SubgroupGeMask: return "SubgroupGeMask";
-    case BuiltIn::SubgroupGtMask: return "SubgroupGtMask";
-    case BuiltIn::SubgroupLeMask: return "SubgroupLeMask";
-    case BuiltIn::SubgroupLtMask: return "SubgroupLtMask";
-    case BuiltIn::BaseVertex: return "BaseVertex";
-    case BuiltIn::BaseInstance: return "BaseInstance";
-    case BuiltIn::DrawIndex: return "DrawIndex";
-    case BuiltIn::PrimitiveShadingRateKHR: return "PrimitiveShadingRateKHR";
-    case BuiltIn::DeviceIndex: return "DeviceIndex";
-    case BuiltIn::ViewIndex: return "ViewIndex";
-    case BuiltIn::ShadingRateKHR: return "ShadingRateKHR";
-    case BuiltIn::TileOffsetQCOM: return "TileOffsetQCOM";
-    case BuiltIn::TileDimensionQCOM: return "TileDimensionQCOM";
-    case BuiltIn::TileApronSizeQCOM: return "TileApronSizeQCOM";
-    case BuiltIn::BaryCoordNoPerspAMD: return "BaryCoordNoPerspAMD";
-    case BuiltIn::BaryCoordNoPerspCentroidAMD: return "BaryCoordNoPerspCentroidAMD";
-    case BuiltIn::BaryCoordNoPerspSampleAMD: return "BaryCoordNoPerspSampleAMD";
-    case BuiltIn::BaryCoordSmoothAMD: return "BaryCoordSmoothAMD";
-    case BuiltIn::BaryCoordSmoothCentroidAMD: return "BaryCoordSmoothCentroidAMD";
-    case BuiltIn::BaryCoordSmoothSampleAMD: return "BaryCoordSmoothSampleAMD";
-    case BuiltIn::BaryCoordPullModelAMD: return "BaryCoordPullModelAMD";
-    case BuiltIn::FragStencilRefEXT: return "FragStencilRefEXT";
-    case BuiltIn::RemainingRecursionLevelsAMDX: return "RemainingRecursionLevelsAMDX";
-    case BuiltIn::ShaderIndexAMDX: return "ShaderIndexAMDX";
-    case BuiltIn::ViewportMaskNV: return "ViewportMaskNV";
-    case BuiltIn::SecondaryPositionNV: return "SecondaryPositionNV";
-    case BuiltIn::SecondaryViewportMaskNV: return "SecondaryViewportMaskNV";
-    case BuiltIn::PositionPerViewNV: return "PositionPerViewNV";
-    case BuiltIn::ViewportMaskPerViewNV: return "ViewportMaskPerViewNV";
-    case BuiltIn::FullyCoveredEXT: return "FullyCoveredEXT";
-    case BuiltIn::TaskCountNV: return "TaskCountNV";
-    case BuiltIn::PrimitiveCountNV: return "PrimitiveCountNV";
-    case BuiltIn::PrimitiveIndicesNV: return "PrimitiveIndicesNV";
-    case BuiltIn::ClipDistancePerViewNV: return "ClipDistancePerViewNV";
-    case BuiltIn::CullDistancePerViewNV: return "CullDistancePerViewNV";
-    case BuiltIn::LayerPerViewNV: return "LayerPerViewNV";
-    case BuiltIn::MeshViewCountNV: return "MeshViewCountNV";
-    case BuiltIn::MeshViewIndicesNV: return "MeshViewIndicesNV";
-    case BuiltIn::BaryCoordKHR: return "BaryCoordKHR";
-    case BuiltIn::BaryCoordNoPerspKHR: return "BaryCoordNoPerspKHR";
-    case BuiltIn::FragSizeEXT: return "FragSizeEXT";
-    case BuiltIn::FragInvocationCountEXT: return "FragInvocationCountEXT";
-    case BuiltIn::PrimitivePointIndicesEXT: return "PrimitivePointIndicesEXT";
-    case BuiltIn::PrimitiveLineIndicesEXT: return "PrimitiveLineIndicesEXT";
-    case BuiltIn::PrimitiveTriangleIndicesEXT: return "PrimitiveTriangleIndicesEXT";
-    case BuiltIn::CullPrimitiveEXT: return "CullPrimitiveEXT";
-    case BuiltIn::LaunchIdKHR: return "LaunchIdKHR";
-    case BuiltIn::LaunchSizeKHR: return "LaunchSizeKHR";
-    case BuiltIn::WorldRayOriginKHR: return "WorldRayOriginKHR";
-    case BuiltIn::WorldRayDirectionKHR: return "WorldRayDirectionKHR";
-    case BuiltIn::ObjectRayOriginKHR: return "ObjectRayOriginKHR";
-    case BuiltIn::ObjectRayDirectionKHR: return "ObjectRayDirectionKHR";
-    case BuiltIn::RayTminKHR: return "RayTminKHR";
-    case BuiltIn::RayTmaxKHR: return "RayTmaxKHR";
-    case BuiltIn::InstanceCustomIndexKHR: return "InstanceCustomIndexKHR";
-    case BuiltIn::ObjectToWorldKHR: return "ObjectToWorldKHR";
-    case BuiltIn::WorldToObjectKHR: return "WorldToObjectKHR";
-    case BuiltIn::HitTNV: return "HitTNV";
-    case BuiltIn::HitKindKHR: return "HitKindKHR";
-    case BuiltIn::CurrentRayTimeNV: return "CurrentRayTimeNV";
-    case BuiltIn::HitTriangleVertexPositionsKHR: return "HitTriangleVertexPositionsKHR";
-    case BuiltIn::HitMicroTriangleVertexPositionsNV: return "HitMicroTriangleVertexPositionsNV";
-    case BuiltIn::HitMicroTriangleVertexBarycentricsNV: return "HitMicroTriangleVertexBarycentricsNV";
-    case BuiltIn::IncomingRayFlagsKHR: return "IncomingRayFlagsKHR";
-    case BuiltIn::RayGeometryIndexKHR: return "RayGeometryIndexKHR";
-    case BuiltIn::HitIsSphereNV: return "HitIsSphereNV";
-    case BuiltIn::HitIsLSSNV: return "HitIsLSSNV";
-    case BuiltIn::HitSpherePositionNV: return "HitSpherePositionNV";
-    case BuiltIn::WarpsPerSMNV: return "WarpsPerSMNV";
-    case BuiltIn::SMCountNV: return "SMCountNV";
-    case BuiltIn::WarpIDNV: return "WarpIDNV";
-    case BuiltIn::SMIDNV: return "SMIDNV";
-    case BuiltIn::HitLSSPositionsNV: return "HitLSSPositionsNV";
-    case BuiltIn::HitKindFrontFacingMicroTriangleNV: return "HitKindFrontFacingMicroTriangleNV";
-    case BuiltIn::HitKindBackFacingMicroTriangleNV: return "HitKindBackFacingMicroTriangleNV";
-    case BuiltIn::HitSphereRadiusNV: return "HitSphereRadiusNV";
-    case BuiltIn::HitLSSRadiiNV: return "HitLSSRadiiNV";
-    case BuiltIn::ClusterIDNV: return "ClusterIDNV";
-    case BuiltIn::CullMaskKHR: return "CullMaskKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ScopeToString(Scope value) {
-    switch (value) {
-    case Scope::CrossDevice: return "CrossDevice";
-    case Scope::Device: return "Device";
-    case Scope::Workgroup: return "Workgroup";
-    case Scope::Subgroup: return "Subgroup";
-    case Scope::Invocation: return "Invocation";
-    case Scope::QueueFamily: return "QueueFamily";
-    case Scope::ShaderCallKHR: return "ShaderCallKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* GroupOperationToString(GroupOperation value) {
-    switch (value) {
-    case GroupOperation::Reduce: return "Reduce";
-    case GroupOperation::InclusiveScan: return "InclusiveScan";
-    case GroupOperation::ExclusiveScan: return "ExclusiveScan";
-    case GroupOperation::ClusteredReduce: return "ClusteredReduce";
-    case GroupOperation::PartitionedReduceNV: return "PartitionedReduceNV";
-    case GroupOperation::PartitionedInclusiveScanNV: return "PartitionedInclusiveScanNV";
-    case GroupOperation::PartitionedExclusiveScanNV: return "PartitionedExclusiveScanNV";
-    default: return "Unknown";
-    }
-}
-
-inline const char* KernelEnqueueFlagsToString(KernelEnqueueFlags value) {
-    switch (value) {
-    case KernelEnqueueFlags::NoWait: return "NoWait";
-    case KernelEnqueueFlags::WaitKernel: return "WaitKernel";
-    case KernelEnqueueFlags::WaitWorkGroup: return "WaitWorkGroup";
-    default: return "Unknown";
-    }
-}
-
-inline const char* CapabilityToString(Capability value) {
-    switch (value) {
-    case Capability::Matrix: return "Matrix";
-    case Capability::Shader: return "Shader";
-    case Capability::Geometry: return "Geometry";
-    case Capability::Tessellation: return "Tessellation";
-    case Capability::Addresses: return "Addresses";
-    case Capability::Linkage: return "Linkage";
-    case Capability::Kernel: return "Kernel";
-    case Capability::Vector16: return "Vector16";
-    case Capability::Float16Buffer: return "Float16Buffer";
-    case Capability::Float16: return "Float16";
-    case Capability::Float64: return "Float64";
-    case Capability::Int64: return "Int64";
-    case Capability::Int64Atomics: return "Int64Atomics";
-    case Capability::ImageBasic: return "ImageBasic";
-    case Capability::ImageReadWrite: return "ImageReadWrite";
-    case Capability::ImageMipmap: return "ImageMipmap";
-    case Capability::Pipes: return "Pipes";
-    case Capability::Groups: return "Groups";
-    case Capability::DeviceEnqueue: return "DeviceEnqueue";
-    case Capability::LiteralSampler: return "LiteralSampler";
-    case Capability::AtomicStorage: return "AtomicStorage";
-    case Capability::Int16: return "Int16";
-    case Capability::TessellationPointSize: return "TessellationPointSize";
-    case Capability::GeometryPointSize: return "GeometryPointSize";
-    case Capability::ImageGatherExtended: return "ImageGatherExtended";
-    case Capability::StorageImageMultisample: return "StorageImageMultisample";
-    case Capability::UniformBufferArrayDynamicIndexing: return "UniformBufferArrayDynamicIndexing";
-    case Capability::SampledImageArrayDynamicIndexing: return "SampledImageArrayDynamicIndexing";
-    case Capability::StorageBufferArrayDynamicIndexing: return "StorageBufferArrayDynamicIndexing";
-    case Capability::StorageImageArrayDynamicIndexing: return "StorageImageArrayDynamicIndexing";
-    case Capability::ClipDistance: return "ClipDistance";
-    case Capability::CullDistance: return "CullDistance";
-    case Capability::ImageCubeArray: return "ImageCubeArray";
-    case Capability::SampleRateShading: return "SampleRateShading";
-    case Capability::ImageRect: return "ImageRect";
-    case Capability::SampledRect: return "SampledRect";
-    case Capability::GenericPointer: return "GenericPointer";
-    case Capability::Int8: return "Int8";
-    case Capability::InputAttachment: return "InputAttachment";
-    case Capability::SparseResidency: return "SparseResidency";
-    case Capability::MinLod: return "MinLod";
-    case Capability::Sampled1D: return "Sampled1D";
-    case Capability::Image1D: return "Image1D";
-    case Capability::SampledCubeArray: return "SampledCubeArray";
-    case Capability::SampledBuffer: return "SampledBuffer";
-    case Capability::ImageBuffer: return "ImageBuffer";
-    case Capability::ImageMSArray: return "ImageMSArray";
-    case Capability::StorageImageExtendedFormats: return "StorageImageExtendedFormats";
-    case Capability::ImageQuery: return "ImageQuery";
-    case Capability::DerivativeControl: return "DerivativeControl";
-    case Capability::InterpolationFunction: return "InterpolationFunction";
-    case Capability::TransformFeedback: return "TransformFeedback";
-    case Capability::GeometryStreams: return "GeometryStreams";
-    case Capability::StorageImageReadWithoutFormat: return "StorageImageReadWithoutFormat";
-    case Capability::StorageImageWriteWithoutFormat: return "StorageImageWriteWithoutFormat";
-    case Capability::MultiViewport: return "MultiViewport";
-    case Capability::SubgroupDispatch: return "SubgroupDispatch";
-    case Capability::NamedBarrier: return "NamedBarrier";
-    case Capability::PipeStorage: return "PipeStorage";
-    case Capability::GroupNonUniform: return "GroupNonUniform";
-    case Capability::GroupNonUniformVote: return "GroupNonUniformVote";
-    case Capability::GroupNonUniformArithmetic: return "GroupNonUniformArithmetic";
-    case Capability::GroupNonUniformBallot: return "GroupNonUniformBallot";
-    case Capability::GroupNonUniformShuffle: return "GroupNonUniformShuffle";
-    case Capability::GroupNonUniformShuffleRelative: return "GroupNonUniformShuffleRelative";
-    case Capability::GroupNonUniformClustered: return "GroupNonUniformClustered";
-    case Capability::GroupNonUniformQuad: return "GroupNonUniformQuad";
-    case Capability::ShaderLayer: return "ShaderLayer";
-    case Capability::ShaderViewportIndex: return "ShaderViewportIndex";
-    case Capability::UniformDecoration: return "UniformDecoration";
-    case Capability::CoreBuiltinsARM: return "CoreBuiltinsARM";
-    case Capability::TileImageColorReadAccessEXT: return "TileImageColorReadAccessEXT";
-    case Capability::TileImageDepthReadAccessEXT: return "TileImageDepthReadAccessEXT";
-    case Capability::TileImageStencilReadAccessEXT: return "TileImageStencilReadAccessEXT";
-    case Capability::TensorsARM: return "TensorsARM";
-    case Capability::StorageTensorArrayDynamicIndexingARM: return "StorageTensorArrayDynamicIndexingARM";
-    case Capability::StorageTensorArrayNonUniformIndexingARM: return "StorageTensorArrayNonUniformIndexingARM";
-    case Capability::GraphARM: return "GraphARM";
-    case Capability::CooperativeMatrixLayoutsARM: return "CooperativeMatrixLayoutsARM";
-    case Capability::Float8EXT: return "Float8EXT";
-    case Capability::Float8CooperativeMatrixEXT: return "Float8CooperativeMatrixEXT";
-    case Capability::FragmentShadingRateKHR: return "FragmentShadingRateKHR";
-    case Capability::SubgroupBallotKHR: return "SubgroupBallotKHR";
-    case Capability::DrawParameters: return "DrawParameters";
-    case Capability::WorkgroupMemoryExplicitLayoutKHR: return "WorkgroupMemoryExplicitLayoutKHR";
-    case Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR: return "WorkgroupMemoryExplicitLayout8BitAccessKHR";
-    case Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR: return "WorkgroupMemoryExplicitLayout16BitAccessKHR";
-    case Capability::SubgroupVoteKHR: return "SubgroupVoteKHR";
-    case Capability::StorageBuffer16BitAccess: return "StorageBuffer16BitAccess";
-    case Capability::StorageUniform16: return "StorageUniform16";
-    case Capability::StoragePushConstant16: return "StoragePushConstant16";
-    case Capability::StorageInputOutput16: return "StorageInputOutput16";
-    case Capability::DeviceGroup: return "DeviceGroup";
-    case Capability::MultiView: return "MultiView";
-    case Capability::VariablePointersStorageBuffer: return "VariablePointersStorageBuffer";
-    case Capability::VariablePointers: return "VariablePointers";
-    case Capability::AtomicStorageOps: return "AtomicStorageOps";
-    case Capability::SampleMaskPostDepthCoverage: return "SampleMaskPostDepthCoverage";
-    case Capability::StorageBuffer8BitAccess: return "StorageBuffer8BitAccess";
-    case Capability::UniformAndStorageBuffer8BitAccess: return "UniformAndStorageBuffer8BitAccess";
-    case Capability::StoragePushConstant8: return "StoragePushConstant8";
-    case Capability::DenormPreserve: return "DenormPreserve";
-    case Capability::DenormFlushToZero: return "DenormFlushToZero";
-    case Capability::SignedZeroInfNanPreserve: return "SignedZeroInfNanPreserve";
-    case Capability::RoundingModeRTE: return "RoundingModeRTE";
-    case Capability::RoundingModeRTZ: return "RoundingModeRTZ";
-    case Capability::RayQueryProvisionalKHR: return "RayQueryProvisionalKHR";
-    case Capability::RayQueryKHR: return "RayQueryKHR";
-    case Capability::UntypedPointersKHR: return "UntypedPointersKHR";
-    case Capability::RayTraversalPrimitiveCullingKHR: return "RayTraversalPrimitiveCullingKHR";
-    case Capability::RayTracingKHR: return "RayTracingKHR";
-    case Capability::TextureSampleWeightedQCOM: return "TextureSampleWeightedQCOM";
-    case Capability::TextureBoxFilterQCOM: return "TextureBoxFilterQCOM";
-    case Capability::TextureBlockMatchQCOM: return "TextureBlockMatchQCOM";
-    case Capability::TileShadingQCOM: return "TileShadingQCOM";
-    case Capability::CooperativeMatrixConversionQCOM: return "CooperativeMatrixConversionQCOM";
-    case Capability::TextureBlockMatch2QCOM: return "TextureBlockMatch2QCOM";
-    case Capability::Float16ImageAMD: return "Float16ImageAMD";
-    case Capability::ImageGatherBiasLodAMD: return "ImageGatherBiasLodAMD";
-    case Capability::FragmentMaskAMD: return "FragmentMaskAMD";
-    case Capability::StencilExportEXT: return "StencilExportEXT";
-    case Capability::ImageReadWriteLodAMD: return "ImageReadWriteLodAMD";
-    case Capability::Int64ImageEXT: return "Int64ImageEXT";
-    case Capability::ShaderClockKHR: return "ShaderClockKHR";
-    case Capability::ShaderEnqueueAMDX: return "ShaderEnqueueAMDX";
-    case Capability::QuadControlKHR: return "QuadControlKHR";
-    case Capability::Int4TypeINTEL: return "Int4TypeINTEL";
-    case Capability::Int4CooperativeMatrixINTEL: return "Int4CooperativeMatrixINTEL";
-    case Capability::BFloat16TypeKHR: return "BFloat16TypeKHR";
-    case Capability::BFloat16DotProductKHR: return "BFloat16DotProductKHR";
-    case Capability::BFloat16CooperativeMatrixKHR: return "BFloat16CooperativeMatrixKHR";
-    case Capability::SampleMaskOverrideCoverageNV: return "SampleMaskOverrideCoverageNV";
-    case Capability::GeometryShaderPassthroughNV: return "GeometryShaderPassthroughNV";
-    case Capability::ShaderViewportIndexLayerEXT: return "ShaderViewportIndexLayerEXT";
-    case Capability::ShaderViewportMaskNV: return "ShaderViewportMaskNV";
-    case Capability::ShaderStereoViewNV: return "ShaderStereoViewNV";
-    case Capability::PerViewAttributesNV: return "PerViewAttributesNV";
-    case Capability::FragmentFullyCoveredEXT: return "FragmentFullyCoveredEXT";
-    case Capability::MeshShadingNV: return "MeshShadingNV";
-    case Capability::ImageFootprintNV: return "ImageFootprintNV";
-    case Capability::MeshShadingEXT: return "MeshShadingEXT";
-    case Capability::FragmentBarycentricKHR: return "FragmentBarycentricKHR";
-    case Capability::ComputeDerivativeGroupQuadsKHR: return "ComputeDerivativeGroupQuadsKHR";
-    case Capability::FragmentDensityEXT: return "FragmentDensityEXT";
-    case Capability::GroupNonUniformPartitionedNV: return "GroupNonUniformPartitionedNV";
-    case Capability::ShaderNonUniform: return "ShaderNonUniform";
-    case Capability::RuntimeDescriptorArray: return "RuntimeDescriptorArray";
-    case Capability::InputAttachmentArrayDynamicIndexing: return "InputAttachmentArrayDynamicIndexing";
-    case Capability::UniformTexelBufferArrayDynamicIndexing: return "UniformTexelBufferArrayDynamicIndexing";
-    case Capability::StorageTexelBufferArrayDynamicIndexing: return "StorageTexelBufferArrayDynamicIndexing";
-    case Capability::UniformBufferArrayNonUniformIndexing: return "UniformBufferArrayNonUniformIndexing";
-    case Capability::SampledImageArrayNonUniformIndexing: return "SampledImageArrayNonUniformIndexing";
-    case Capability::StorageBufferArrayNonUniformIndexing: return "StorageBufferArrayNonUniformIndexing";
-    case Capability::StorageImageArrayNonUniformIndexing: return "StorageImageArrayNonUniformIndexing";
-    case Capability::InputAttachmentArrayNonUniformIndexing: return "InputAttachmentArrayNonUniformIndexing";
-    case Capability::UniformTexelBufferArrayNonUniformIndexing: return "UniformTexelBufferArrayNonUniformIndexing";
-    case Capability::StorageTexelBufferArrayNonUniformIndexing: return "StorageTexelBufferArrayNonUniformIndexing";
-    case Capability::RayTracingPositionFetchKHR: return "RayTracingPositionFetchKHR";
-    case Capability::RayTracingNV: return "RayTracingNV";
-    case Capability::RayTracingMotionBlurNV: return "RayTracingMotionBlurNV";
-    case Capability::VulkanMemoryModel: return "VulkanMemoryModel";
-    case Capability::VulkanMemoryModelDeviceScope: return "VulkanMemoryModelDeviceScope";
-    case Capability::PhysicalStorageBufferAddresses: return "PhysicalStorageBufferAddresses";
-    case Capability::ComputeDerivativeGroupLinearKHR: return "ComputeDerivativeGroupLinearKHR";
-    case Capability::RayTracingProvisionalKHR: return "RayTracingProvisionalKHR";
-    case Capability::CooperativeMatrixNV: return "CooperativeMatrixNV";
-    case Capability::FragmentShaderSampleInterlockEXT: return "FragmentShaderSampleInterlockEXT";
-    case Capability::FragmentShaderShadingRateInterlockEXT: return "FragmentShaderShadingRateInterlockEXT";
-    case Capability::ShaderSMBuiltinsNV: return "ShaderSMBuiltinsNV";
-    case Capability::FragmentShaderPixelInterlockEXT: return "FragmentShaderPixelInterlockEXT";
-    case Capability::DemoteToHelperInvocation: return "DemoteToHelperInvocation";
-    case Capability::DisplacementMicromapNV: return "DisplacementMicromapNV";
-    case Capability::RayTracingOpacityMicromapEXT: return "RayTracingOpacityMicromapEXT";
-    case Capability::ShaderInvocationReorderNV: return "ShaderInvocationReorderNV";
-    case Capability::ShaderInvocationReorderEXT: return "ShaderInvocationReorderEXT";
-    case Capability::BindlessTextureNV: return "BindlessTextureNV";
-    case Capability::RayQueryPositionFetchKHR: return "RayQueryPositionFetchKHR";
-    case Capability::CooperativeVectorNV: return "CooperativeVectorNV";
-    case Capability::AtomicFloat16VectorNV: return "AtomicFloat16VectorNV";
-    case Capability::RayTracingDisplacementMicromapNV: return "RayTracingDisplacementMicromapNV";
-    case Capability::RawAccessChainsNV: return "RawAccessChainsNV";
-    case Capability::RayTracingSpheresGeometryNV: return "RayTracingSpheresGeometryNV";
-    case Capability::RayTracingLinearSweptSpheresGeometryNV: return "RayTracingLinearSweptSpheresGeometryNV";
-    case Capability::Shader64BitIndexingEXT: return "Shader64BitIndexingEXT";
-    case Capability::CooperativeMatrixReductionsNV: return "CooperativeMatrixReductionsNV";
-    case Capability::CooperativeMatrixConversionsNV: return "CooperativeMatrixConversionsNV";
-    case Capability::CooperativeMatrixPerElementOperationsNV: return "CooperativeMatrixPerElementOperationsNV";
-    case Capability::CooperativeMatrixTensorAddressingNV: return "CooperativeMatrixTensorAddressingNV";
-    case Capability::CooperativeMatrixBlockLoadsNV: return "CooperativeMatrixBlockLoadsNV";
-    case Capability::CooperativeVectorTrainingNV: return "CooperativeVectorTrainingNV";
-    case Capability::RayTracingClusterAccelerationStructureNV: return "RayTracingClusterAccelerationStructureNV";
-    case Capability::TensorAddressingNV: return "TensorAddressingNV";
-    case Capability::SubgroupShuffleINTEL: return "SubgroupShuffleINTEL";
-    case Capability::SubgroupBufferBlockIOINTEL: return "SubgroupBufferBlockIOINTEL";
-    case Capability::SubgroupImageBlockIOINTEL: return "SubgroupImageBlockIOINTEL";
-    case Capability::SubgroupImageMediaBlockIOINTEL: return "SubgroupImageMediaBlockIOINTEL";
-    case Capability::RoundToInfinityINTEL: return "RoundToInfinityINTEL";
-    case Capability::FloatingPointModeINTEL: return "FloatingPointModeINTEL";
-    case Capability::IntegerFunctions2INTEL: return "IntegerFunctions2INTEL";
-    case Capability::FunctionPointersINTEL: return "FunctionPointersINTEL";
-    case Capability::IndirectReferencesINTEL: return "IndirectReferencesINTEL";
-    case Capability::AsmINTEL: return "AsmINTEL";
-    case Capability::AtomicFloat32MinMaxEXT: return "AtomicFloat32MinMaxEXT";
-    case Capability::AtomicFloat64MinMaxEXT: return "AtomicFloat64MinMaxEXT";
-    case Capability::AtomicFloat16MinMaxEXT: return "AtomicFloat16MinMaxEXT";
-    case Capability::VectorComputeINTEL: return "VectorComputeINTEL";
-    case Capability::VectorAnyINTEL: return "VectorAnyINTEL";
-    case Capability::ExpectAssumeKHR: return "ExpectAssumeKHR";
-    case Capability::SubgroupAvcMotionEstimationINTEL: return "SubgroupAvcMotionEstimationINTEL";
-    case Capability::SubgroupAvcMotionEstimationIntraINTEL: return "SubgroupAvcMotionEstimationIntraINTEL";
-    case Capability::SubgroupAvcMotionEstimationChromaINTEL: return "SubgroupAvcMotionEstimationChromaINTEL";
-    case Capability::VariableLengthArrayINTEL: return "VariableLengthArrayINTEL";
-    case Capability::FunctionFloatControlINTEL: return "FunctionFloatControlINTEL";
-    case Capability::FPGAMemoryAttributesALTERA: return "FPGAMemoryAttributesALTERA";
-    case Capability::FPFastMathModeINTEL: return "FPFastMathModeINTEL";
-    case Capability::ArbitraryPrecisionIntegersALTERA: return "ArbitraryPrecisionIntegersALTERA";
-    case Capability::ArbitraryPrecisionFloatingPointALTERA: return "ArbitraryPrecisionFloatingPointALTERA";
-    case Capability::UnstructuredLoopControlsINTEL: return "UnstructuredLoopControlsINTEL";
-    case Capability::FPGALoopControlsALTERA: return "FPGALoopControlsALTERA";
-    case Capability::KernelAttributesINTEL: return "KernelAttributesINTEL";
-    case Capability::FPGAKernelAttributesINTEL: return "FPGAKernelAttributesINTEL";
-    case Capability::FPGAMemoryAccessesALTERA: return "FPGAMemoryAccessesALTERA";
-    case Capability::FPGAClusterAttributesALTERA: return "FPGAClusterAttributesALTERA";
-    case Capability::LoopFuseALTERA: return "LoopFuseALTERA";
-    case Capability::FPGADSPControlALTERA: return "FPGADSPControlALTERA";
-    case Capability::MemoryAccessAliasingINTEL: return "MemoryAccessAliasingINTEL";
-    case Capability::FPGAInvocationPipeliningAttributesALTERA: return "FPGAInvocationPipeliningAttributesALTERA";
-    case Capability::FPGABufferLocationALTERA: return "FPGABufferLocationALTERA";
-    case Capability::ArbitraryPrecisionFixedPointALTERA: return "ArbitraryPrecisionFixedPointALTERA";
-    case Capability::USMStorageClassesALTERA: return "USMStorageClassesALTERA";
-    case Capability::RuntimeAlignedAttributeALTERA: return "RuntimeAlignedAttributeALTERA";
-    case Capability::IOPipesALTERA: return "IOPipesALTERA";
-    case Capability::BlockingPipesALTERA: return "BlockingPipesALTERA";
-    case Capability::FPGARegALTERA: return "FPGARegALTERA";
-    case Capability::DotProductInputAll: return "DotProductInputAll";
-    case Capability::DotProductInput4x8Bit: return "DotProductInput4x8Bit";
-    case Capability::DotProductInput4x8BitPacked: return "DotProductInput4x8BitPacked";
-    case Capability::DotProduct: return "DotProduct";
-    case Capability::RayCullMaskKHR: return "RayCullMaskKHR";
-    case Capability::CooperativeMatrixKHR: return "CooperativeMatrixKHR";
-    case Capability::ReplicatedCompositesEXT: return "ReplicatedCompositesEXT";
-    case Capability::BitInstructions: return "BitInstructions";
-    case Capability::GroupNonUniformRotateKHR: return "GroupNonUniformRotateKHR";
-    case Capability::FloatControls2: return "FloatControls2";
-    case Capability::FMAKHR: return "FMAKHR";
-    case Capability::AtomicFloat32AddEXT: return "AtomicFloat32AddEXT";
-    case Capability::AtomicFloat64AddEXT: return "AtomicFloat64AddEXT";
-    case Capability::LongCompositesINTEL: return "LongCompositesINTEL";
-    case Capability::OptNoneEXT: return "OptNoneEXT";
-    case Capability::AtomicFloat16AddEXT: return "AtomicFloat16AddEXT";
-    case Capability::DebugInfoModuleINTEL: return "DebugInfoModuleINTEL";
-    case Capability::BFloat16ConversionINTEL: return "BFloat16ConversionINTEL";
-    case Capability::SplitBarrierINTEL: return "SplitBarrierINTEL";
-    case Capability::ArithmeticFenceEXT: return "ArithmeticFenceEXT";
-    case Capability::FPGAClusterAttributesV2ALTERA: return "FPGAClusterAttributesV2ALTERA";
-    case Capability::FPGAKernelAttributesv2INTEL: return "FPGAKernelAttributesv2INTEL";
-    case Capability::TaskSequenceALTERA: return "TaskSequenceALTERA";
-    case Capability::FPMaxErrorINTEL: return "FPMaxErrorINTEL";
-    case Capability::FPGALatencyControlALTERA: return "FPGALatencyControlALTERA";
-    case Capability::FPGAArgumentInterfacesALTERA: return "FPGAArgumentInterfacesALTERA";
-    case Capability::GlobalVariableHostAccessINTEL: return "GlobalVariableHostAccessINTEL";
-    case Capability::GlobalVariableFPGADecorationsALTERA: return "GlobalVariableFPGADecorationsALTERA";
-    case Capability::SubgroupBufferPrefetchINTEL: return "SubgroupBufferPrefetchINTEL";
-    case Capability::Subgroup2DBlockIOINTEL: return "Subgroup2DBlockIOINTEL";
-    case Capability::Subgroup2DBlockTransformINTEL: return "Subgroup2DBlockTransformINTEL";
-    case Capability::Subgroup2DBlockTransposeINTEL: return "Subgroup2DBlockTransposeINTEL";
-    case Capability::SubgroupMatrixMultiplyAccumulateINTEL: return "SubgroupMatrixMultiplyAccumulateINTEL";
-    case Capability::TernaryBitwiseFunctionINTEL: return "TernaryBitwiseFunctionINTEL";
-    case Capability::UntypedVariableLengthArrayINTEL: return "UntypedVariableLengthArrayINTEL";
-    case Capability::SpecConditionalINTEL: return "SpecConditionalINTEL";
-    case Capability::FunctionVariantsINTEL: return "FunctionVariantsINTEL";
-    case Capability::GroupUniformArithmeticKHR: return "GroupUniformArithmeticKHR";
-    case Capability::TensorFloat32RoundingINTEL: return "TensorFloat32RoundingINTEL";
-    case Capability::MaskedGatherScatterINTEL: return "MaskedGatherScatterINTEL";
-    case Capability::CacheControlsINTEL: return "CacheControlsINTEL";
-    case Capability::RegisterLimitsINTEL: return "RegisterLimitsINTEL";
-    case Capability::BindlessImagesINTEL: return "BindlessImagesINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* RayQueryIntersectionToString(RayQueryIntersection value) {
-    switch (value) {
-    case RayQueryIntersection::RayQueryCandidateIntersectionKHR: return "RayQueryCandidateIntersectionKHR";
-    case RayQueryIntersection::RayQueryCommittedIntersectionKHR: return "RayQueryCommittedIntersectionKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* RayQueryCommittedIntersectionTypeToString(RayQueryCommittedIntersectionType value) {
-    switch (value) {
-    case RayQueryCommittedIntersectionType::RayQueryCommittedIntersectionNoneKHR: return "RayQueryCommittedIntersectionNoneKHR";
-    case RayQueryCommittedIntersectionType::RayQueryCommittedIntersectionTriangleKHR: return "RayQueryCommittedIntersectionTriangleKHR";
-    case RayQueryCommittedIntersectionType::RayQueryCommittedIntersectionGeneratedKHR: return "RayQueryCommittedIntersectionGeneratedKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* RayQueryCandidateIntersectionTypeToString(RayQueryCandidateIntersectionType value) {
-    switch (value) {
-    case RayQueryCandidateIntersectionType::RayQueryCandidateIntersectionTriangleKHR: return "RayQueryCandidateIntersectionTriangleKHR";
-    case RayQueryCandidateIntersectionType::RayQueryCandidateIntersectionAABBKHR: return "RayQueryCandidateIntersectionAABBKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* FPDenormModeToString(FPDenormMode value) {
-    switch (value) {
-    case FPDenormMode::Preserve: return "Preserve";
-    case FPDenormMode::FlushToZero: return "FlushToZero";
-    default: return "Unknown";
-    }
-}
-
-inline const char* FPOperationModeToString(FPOperationMode value) {
-    switch (value) {
-    case FPOperationMode::IEEE: return "IEEE";
-    case FPOperationMode::ALT: return "ALT";
-    default: return "Unknown";
-    }
-}
-
-inline const char* QuantizationModesToString(QuantizationModes value) {
-    switch (value) {
-    case QuantizationModes::TRN: return "TRN";
-    case QuantizationModes::TRN_ZERO: return "TRN_ZERO";
-    case QuantizationModes::RND: return "RND";
-    case QuantizationModes::RND_ZERO: return "RND_ZERO";
-    case QuantizationModes::RND_INF: return "RND_INF";
-    case QuantizationModes::RND_MIN_INF: return "RND_MIN_INF";
-    case QuantizationModes::RND_CONV: return "RND_CONV";
-    case QuantizationModes::RND_CONV_ODD: return "RND_CONV_ODD";
-    default: return "Unknown";
-    }
-}
-
-inline const char* OverflowModesToString(OverflowModes value) {
-    switch (value) {
-    case OverflowModes::WRAP: return "WRAP";
-    case OverflowModes::SAT: return "SAT";
-    case OverflowModes::SAT_ZERO: return "SAT_ZERO";
-    case OverflowModes::SAT_SYM: return "SAT_SYM";
-    default: return "Unknown";
-    }
-}
-
-inline const char* PackedVectorFormatToString(PackedVectorFormat value) {
-    switch (value) {
-    case PackedVectorFormat::PackedVectorFormat4x8Bit: return "PackedVectorFormat4x8Bit";
-    default: return "Unknown";
-    }
-}
-
-inline const char* CooperativeMatrixLayoutToString(CooperativeMatrixLayout value) {
-    switch (value) {
-    case CooperativeMatrixLayout::RowMajorKHR: return "RowMajorKHR";
-    case CooperativeMatrixLayout::ColumnMajorKHR: return "ColumnMajorKHR";
-    case CooperativeMatrixLayout::RowBlockedInterleavedARM: return "RowBlockedInterleavedARM";
-    case CooperativeMatrixLayout::ColumnBlockedInterleavedARM: return "ColumnBlockedInterleavedARM";
-    default: return "Unknown";
-    }
-}
-
-inline const char* CooperativeMatrixUseToString(CooperativeMatrixUse value) {
-    switch (value) {
-    case CooperativeMatrixUse::MatrixAKHR: return "MatrixAKHR";
-    case CooperativeMatrixUse::MatrixBKHR: return "MatrixBKHR";
-    case CooperativeMatrixUse::MatrixAccumulatorKHR: return "MatrixAccumulatorKHR";
-    default: return "Unknown";
-    }
-}
-
-inline const char* TensorClampModeToString(TensorClampMode value) {
-    switch (value) {
-    case TensorClampMode::Undefined: return "Undefined";
-    case TensorClampMode::Constant: return "Constant";
-    case TensorClampMode::ClampToEdge: return "ClampToEdge";
-    case TensorClampMode::Repeat: return "Repeat";
-    case TensorClampMode::RepeatMirrored: return "RepeatMirrored";
-    default: return "Unknown";
-    }
-}
-
-inline const char* InitializationModeQualifierToString(InitializationModeQualifier value) {
-    switch (value) {
-    case InitializationModeQualifier::InitOnDeviceReprogramALTERA: return "InitOnDeviceReprogramALTERA";
-    case InitializationModeQualifier::InitOnDeviceResetALTERA: return "InitOnDeviceResetALTERA";
-    default: return "Unknown";
-    }
-}
-
-inline const char* HostAccessQualifierToString(HostAccessQualifier value) {
-    switch (value) {
-    case HostAccessQualifier::NoneINTEL: return "NoneINTEL";
-    case HostAccessQualifier::ReadINTEL: return "ReadINTEL";
-    case HostAccessQualifier::WriteINTEL: return "WriteINTEL";
-    case HostAccessQualifier::ReadWriteINTEL: return "ReadWriteINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* LoadCacheControlToString(LoadCacheControl value) {
-    switch (value) {
-    case LoadCacheControl::UncachedINTEL: return "UncachedINTEL";
-    case LoadCacheControl::CachedINTEL: return "CachedINTEL";
-    case LoadCacheControl::StreamingINTEL: return "StreamingINTEL";
-    case LoadCacheControl::InvalidateAfterReadINTEL: return "InvalidateAfterReadINTEL";
-    case LoadCacheControl::ConstCachedINTEL: return "ConstCachedINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* StoreCacheControlToString(StoreCacheControl value) {
-    switch (value) {
-    case StoreCacheControl::UncachedINTEL: return "UncachedINTEL";
-    case StoreCacheControl::WriteThroughINTEL: return "WriteThroughINTEL";
-    case StoreCacheControl::WriteBackINTEL: return "WriteBackINTEL";
-    case StoreCacheControl::StreamingINTEL: return "StreamingINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* NamedMaximumNumberOfRegistersToString(NamedMaximumNumberOfRegisters value) {
-    switch (value) {
-    case NamedMaximumNumberOfRegisters::AutoINTEL: return "AutoINTEL";
-    default: return "Unknown";
-    }
-}
-
-inline const char* FPEncodingToString(FPEncoding value) {
-    switch (value) {
-    case FPEncoding::BFloat16KHR: return "BFloat16KHR";
-    case FPEncoding::Float8E4M3EXT: return "Float8E4M3EXT";
-    case FPEncoding::Float8E5M2EXT: return "Float8E5M2EXT";
-    default: return "Unknown";
-    }
-}
-
-inline const char* CooperativeVectorMatrixLayoutToString(CooperativeVectorMatrixLayout value) {
-    switch (value) {
-    case CooperativeVectorMatrixLayout::RowMajorNV: return "RowMajorNV";
-    case CooperativeVectorMatrixLayout::ColumnMajorNV: return "ColumnMajorNV";
-    case CooperativeVectorMatrixLayout::InferencingOptimalNV: return "InferencingOptimalNV";
-    case CooperativeVectorMatrixLayout::TrainingOptimalNV: return "TrainingOptimalNV";
-    default: return "Unknown";
-    }
-}
-
-inline const char* ComponentTypeToString(ComponentType value) {
-    switch (value) {
-    case ComponentType::Float16NV: return "Float16NV";
-    case ComponentType::Float32NV: return "Float32NV";
-    case ComponentType::Float64NV: return "Float64NV";
-    case ComponentType::SignedInt8NV: return "SignedInt8NV";
-    case ComponentType::SignedInt16NV: return "SignedInt16NV";
-    case ComponentType::SignedInt32NV: return "SignedInt32NV";
-    case ComponentType::SignedInt64NV: return "SignedInt64NV";
-    case ComponentType::UnsignedInt8NV: return "UnsignedInt8NV";
-    case ComponentType::UnsignedInt16NV: return "UnsignedInt16NV";
-    case ComponentType::UnsignedInt32NV: return "UnsignedInt32NV";
-    case ComponentType::UnsignedInt64NV: return "UnsignedInt64NV";
-    case ComponentType::SignedInt8PackedNV: return "SignedInt8PackedNV";
-    case ComponentType::UnsignedInt8PackedNV: return "UnsignedInt8PackedNV";
-    case ComponentType::FloatE4M3NV: return "FloatE4M3NV";
-    case ComponentType::FloatE5M2NV: return "FloatE5M2NV";
-    default: return "Unknown";
-    }
-}
-
-inline const char* OpToString(Op value) {
-    switch (value) {
-    case Op::OpNop: return "OpNop";
-    case Op::OpUndef: return "OpUndef";
-    case Op::OpSourceContinued: return "OpSourceContinued";
-    case Op::OpSource: return "OpSource";
-    case Op::OpSourceExtension: return "OpSourceExtension";
-    case Op::OpName: return "OpName";
-    case Op::OpMemberName: return "OpMemberName";
-    case Op::OpString: return "OpString";
-    case Op::OpLine: return "OpLine";
-    case Op::OpExtension: return "OpExtension";
-    case Op::OpExtInstImport: return "OpExtInstImport";
-    case Op::OpExtInst: return "OpExtInst";
-    case Op::OpMemoryModel: return "OpMemoryModel";
-    case Op::OpEntryPoint: return "OpEntryPoint";
-    case Op::OpExecutionMode: return "OpExecutionMode";
-    case Op::OpCapability: return "OpCapability";
-    case Op::OpTypeVoid: return "OpTypeVoid";
-    case Op::OpTypeBool: return "OpTypeBool";
-    case Op::OpTypeInt: return "OpTypeInt";
-    case Op::OpTypeFloat: return "OpTypeFloat";
-    case Op::OpTypeVector: return "OpTypeVector";
-    case Op::OpTypeMatrix: return "OpTypeMatrix";
-    case Op::OpTypeImage: return "OpTypeImage";
-    case Op::OpTypeSampler: return "OpTypeSampler";
-    case Op::OpTypeSampledImage: return "OpTypeSampledImage";
-    case Op::OpTypeArray: return "OpTypeArray";
-    case Op::OpTypeRuntimeArray: return "OpTypeRuntimeArray";
-    case Op::OpTypeStruct: return "OpTypeStruct";
-    case Op::OpTypeOpaque: return "OpTypeOpaque";
-    case Op::OpTypePointer: return "OpTypePointer";
-    case Op::OpTypeFunction: return "OpTypeFunction";
-    case Op::OpTypeEvent: return "OpTypeEvent";
-    case Op::OpTypeDeviceEvent: return "OpTypeDeviceEvent";
-    case Op::OpTypeReserveId: return "OpTypeReserveId";
-    case Op::OpTypeQueue: return "OpTypeQueue";
-    case Op::OpTypePipe: return "OpTypePipe";
-    case Op::OpTypeForwardPointer: return "OpTypeForwardPointer";
-    case Op::OpConstantTrue: return "OpConstantTrue";
-    case Op::OpConstantFalse: return "OpConstantFalse";
-    case Op::OpConstant: return "OpConstant";
-    case Op::OpConstantComposite: return "OpConstantComposite";
-    case Op::OpConstantSampler: return "OpConstantSampler";
-    case Op::OpConstantNull: return "OpConstantNull";
-    case Op::OpSpecConstantTrue: return "OpSpecConstantTrue";
-    case Op::OpSpecConstantFalse: return "OpSpecConstantFalse";
-    case Op::OpSpecConstant: return "OpSpecConstant";
-    case Op::OpSpecConstantComposite: return "OpSpecConstantComposite";
-    case Op::OpSpecConstantOp: return "OpSpecConstantOp";
-    case Op::OpFunction: return "OpFunction";
-    case Op::OpFunctionParameter: return "OpFunctionParameter";
-    case Op::OpFunctionEnd: return "OpFunctionEnd";
-    case Op::OpFunctionCall: return "OpFunctionCall";
-    case Op::OpVariable: return "OpVariable";
-    case Op::OpImageTexelPointer: return "OpImageTexelPointer";
-    case Op::OpLoad: return "OpLoad";
-    case Op::OpStore: return "OpStore";
-    case Op::OpCopyMemory: return "OpCopyMemory";
-    case Op::OpCopyMemorySized: return "OpCopyMemorySized";
-    case Op::OpAccessChain: return "OpAccessChain";
-    case Op::OpInBoundsAccessChain: return "OpInBoundsAccessChain";
-    case Op::OpPtrAccessChain: return "OpPtrAccessChain";
-    case Op::OpArrayLength: return "OpArrayLength";
-    case Op::OpGenericPtrMemSemantics: return "OpGenericPtrMemSemantics";
-    case Op::OpInBoundsPtrAccessChain: return "OpInBoundsPtrAccessChain";
-    case Op::OpDecorate: return "OpDecorate";
-    case Op::OpMemberDecorate: return "OpMemberDecorate";
-    case Op::OpDecorationGroup: return "OpDecorationGroup";
-    case Op::OpGroupDecorate: return "OpGroupDecorate";
-    case Op::OpGroupMemberDecorate: return "OpGroupMemberDecorate";
-    case Op::OpVectorExtractDynamic: return "OpVectorExtractDynamic";
-    case Op::OpVectorInsertDynamic: return "OpVectorInsertDynamic";
-    case Op::OpVectorShuffle: return "OpVectorShuffle";
-    case Op::OpCompositeConstruct: return "OpCompositeConstruct";
-    case Op::OpCompositeExtract: return "OpCompositeExtract";
-    case Op::OpCompositeInsert: return "OpCompositeInsert";
-    case Op::OpCopyObject: return "OpCopyObject";
-    case Op::OpTranspose: return "OpTranspose";
-    case Op::OpSampledImage: return "OpSampledImage";
-    case Op::OpImageSampleImplicitLod: return "OpImageSampleImplicitLod";
-    case Op::OpImageSampleExplicitLod: return "OpImageSampleExplicitLod";
-    case Op::OpImageSampleDrefImplicitLod: return "OpImageSampleDrefImplicitLod";
-    case Op::OpImageSampleDrefExplicitLod: return "OpImageSampleDrefExplicitLod";
-    case Op::OpImageSampleProjImplicitLod: return "OpImageSampleProjImplicitLod";
-    case Op::OpImageSampleProjExplicitLod: return "OpImageSampleProjExplicitLod";
-    case Op::OpImageSampleProjDrefImplicitLod: return "OpImageSampleProjDrefImplicitLod";
-    case Op::OpImageSampleProjDrefExplicitLod: return "OpImageSampleProjDrefExplicitLod";
-    case Op::OpImageFetch: return "OpImageFetch";
-    case Op::OpImageGather: return "OpImageGather";
-    case Op::OpImageDrefGather: return "OpImageDrefGather";
-    case Op::OpImageRead: return "OpImageRead";
-    case Op::OpImageWrite: return "OpImageWrite";
-    case Op::OpImage: return "OpImage";
-    case Op::OpImageQueryFormat: return "OpImageQueryFormat";
-    case Op::OpImageQueryOrder: return "OpImageQueryOrder";
-    case Op::OpImageQuerySizeLod: return "OpImageQuerySizeLod";
-    case Op::OpImageQuerySize: return "OpImageQuerySize";
-    case Op::OpImageQueryLod: return "OpImageQueryLod";
-    case Op::OpImageQueryLevels: return "OpImageQueryLevels";
-    case Op::OpImageQuerySamples: return "OpImageQuerySamples";
-    case Op::OpConvertFToU: return "OpConvertFToU";
-    case Op::OpConvertFToS: return "OpConvertFToS";
-    case Op::OpConvertSToF: return "OpConvertSToF";
-    case Op::OpConvertUToF: return "OpConvertUToF";
-    case Op::OpUConvert: return "OpUConvert";
-    case Op::OpSConvert: return "OpSConvert";
-    case Op::OpFConvert: return "OpFConvert";
-    case Op::OpQuantizeToF16: return "OpQuantizeToF16";
-    case Op::OpConvertPtrToU: return "OpConvertPtrToU";
-    case Op::OpSatConvertSToU: return "OpSatConvertSToU";
-    case Op::OpSatConvertUToS: return "OpSatConvertUToS";
-    case Op::OpConvertUToPtr: return "OpConvertUToPtr";
-    case Op::OpPtrCastToGeneric: return "OpPtrCastToGeneric";
-    case Op::OpGenericCastToPtr: return "OpGenericCastToPtr";
-    case Op::OpGenericCastToPtrExplicit: return "OpGenericCastToPtrExplicit";
-    case Op::OpBitcast: return "OpBitcast";
-    case Op::OpSNegate: return "OpSNegate";
-    case Op::OpFNegate: return "OpFNegate";
-    case Op::OpIAdd: return "OpIAdd";
-    case Op::OpFAdd: return "OpFAdd";
-    case Op::OpISub: return "OpISub";
-    case Op::OpFSub: return "OpFSub";
-    case Op::OpIMul: return "OpIMul";
-    case Op::OpFMul: return "OpFMul";
-    case Op::OpUDiv: return "OpUDiv";
-    case Op::OpSDiv: return "OpSDiv";
-    case Op::OpFDiv: return "OpFDiv";
-    case Op::OpUMod: return "OpUMod";
-    case Op::OpSRem: return "OpSRem";
-    case Op::OpSMod: return "OpSMod";
-    case Op::OpFRem: return "OpFRem";
-    case Op::OpFMod: return "OpFMod";
-    case Op::OpVectorTimesScalar: return "OpVectorTimesScalar";
-    case Op::OpMatrixTimesScalar: return "OpMatrixTimesScalar";
-    case Op::OpVectorTimesMatrix: return "OpVectorTimesMatrix";
-    case Op::OpMatrixTimesVector: return "OpMatrixTimesVector";
-    case Op::OpMatrixTimesMatrix: return "OpMatrixTimesMatrix";
-    case Op::OpOuterProduct: return "OpOuterProduct";
-    case Op::OpDot: return "OpDot";
-    case Op::OpIAddCarry: return "OpIAddCarry";
-    case Op::OpISubBorrow: return "OpISubBorrow";
-    case Op::OpUMulExtended: return "OpUMulExtended";
-    case Op::OpSMulExtended: return "OpSMulExtended";
-    case Op::OpAny: return "OpAny";
-    case Op::OpAll: return "OpAll";
-    case Op::OpIsNan: return "OpIsNan";
-    case Op::OpIsInf: return "OpIsInf";
-    case Op::OpIsFinite: return "OpIsFinite";
-    case Op::OpIsNormal: return "OpIsNormal";
-    case Op::OpSignBitSet: return "OpSignBitSet";
-    case Op::OpLessOrGreater: return "OpLessOrGreater";
-    case Op::OpOrdered: return "OpOrdered";
-    case Op::OpUnordered: return "OpUnordered";
-    case Op::OpLogicalEqual: return "OpLogicalEqual";
-    case Op::OpLogicalNotEqual: return "OpLogicalNotEqual";
-    case Op::OpLogicalOr: return "OpLogicalOr";
-    case Op::OpLogicalAnd: return "OpLogicalAnd";
-    case Op::OpLogicalNot: return "OpLogicalNot";
-    case Op::OpSelect: return "OpSelect";
-    case Op::OpIEqual: return "OpIEqual";
-    case Op::OpINotEqual: return "OpINotEqual";
-    case Op::OpUGreaterThan: return "OpUGreaterThan";
-    case Op::OpSGreaterThan: return "OpSGreaterThan";
-    case Op::OpUGreaterThanEqual: return "OpUGreaterThanEqual";
-    case Op::OpSGreaterThanEqual: return "OpSGreaterThanEqual";
-    case Op::OpULessThan: return "OpULessThan";
-    case Op::OpSLessThan: return "OpSLessThan";
-    case Op::OpULessThanEqual: return "OpULessThanEqual";
-    case Op::OpSLessThanEqual: return "OpSLessThanEqual";
-    case Op::OpFOrdEqual: return "OpFOrdEqual";
-    case Op::OpFUnordEqual: return "OpFUnordEqual";
-    case Op::OpFOrdNotEqual: return "OpFOrdNotEqual";
-    case Op::OpFUnordNotEqual: return "OpFUnordNotEqual";
-    case Op::OpFOrdLessThan: return "OpFOrdLessThan";
-    case Op::OpFUnordLessThan: return "OpFUnordLessThan";
-    case Op::OpFOrdGreaterThan: return "OpFOrdGreaterThan";
-    case Op::OpFUnordGreaterThan: return "OpFUnordGreaterThan";
-    case Op::OpFOrdLessThanEqual: return "OpFOrdLessThanEqual";
-    case Op::OpFUnordLessThanEqual: return "OpFUnordLessThanEqual";
-    case Op::OpFOrdGreaterThanEqual: return "OpFOrdGreaterThanEqual";
-    case Op::OpFUnordGreaterThanEqual: return "OpFUnordGreaterThanEqual";
-    case Op::OpShiftRightLogical: return "OpShiftRightLogical";
-    case Op::OpShiftRightArithmetic: return "OpShiftRightArithmetic";
-    case Op::OpShiftLeftLogical: return "OpShiftLeftLogical";
-    case Op::OpBitwiseOr: return "OpBitwiseOr";
-    case Op::OpBitwiseXor: return "OpBitwiseXor";
-    case Op::OpBitwiseAnd: return "OpBitwiseAnd";
-    case Op::OpNot: return "OpNot";
-    case Op::OpBitFieldInsert: return "OpBitFieldInsert";
-    case Op::OpBitFieldSExtract: return "OpBitFieldSExtract";
-    case Op::OpBitFieldUExtract: return "OpBitFieldUExtract";
-    case Op::OpBitReverse: return "OpBitReverse";
-    case Op::OpBitCount: return "OpBitCount";
-    case Op::OpDPdx: return "OpDPdx";
-    case Op::OpDPdy: return "OpDPdy";
-    case Op::OpFwidth: return "OpFwidth";
-    case Op::OpDPdxFine: return "OpDPdxFine";
-    case Op::OpDPdyFine: return "OpDPdyFine";
-    case Op::OpFwidthFine: return "OpFwidthFine";
-    case Op::OpDPdxCoarse: return "OpDPdxCoarse";
-    case Op::OpDPdyCoarse: return "OpDPdyCoarse";
-    case Op::OpFwidthCoarse: return "OpFwidthCoarse";
-    case Op::OpEmitVertex: return "OpEmitVertex";
-    case Op::OpEndPrimitive: return "OpEndPrimitive";
-    case Op::OpEmitStreamVertex: return "OpEmitStreamVertex";
-    case Op::OpEndStreamPrimitive: return "OpEndStreamPrimitive";
-    case Op::OpControlBarrier: return "OpControlBarrier";
-    case Op::OpMemoryBarrier: return "OpMemoryBarrier";
-    case Op::OpAtomicLoad: return "OpAtomicLoad";
-    case Op::OpAtomicStore: return "OpAtomicStore";
-    case Op::OpAtomicExchange: return "OpAtomicExchange";
-    case Op::OpAtomicCompareExchange: return "OpAtomicCompareExchange";
-    case Op::OpAtomicCompareExchangeWeak: return "OpAtomicCompareExchangeWeak";
-    case Op::OpAtomicIIncrement: return "OpAtomicIIncrement";
-    case Op::OpAtomicIDecrement: return "OpAtomicIDecrement";
-    case Op::OpAtomicIAdd: return "OpAtomicIAdd";
-    case Op::OpAtomicISub: return "OpAtomicISub";
-    case Op::OpAtomicSMin: return "OpAtomicSMin";
-    case Op::OpAtomicUMin: return "OpAtomicUMin";
-    case Op::OpAtomicSMax: return "OpAtomicSMax";
-    case Op::OpAtomicUMax: return "OpAtomicUMax";
-    case Op::OpAtomicAnd: return "OpAtomicAnd";
-    case Op::OpAtomicOr: return "OpAtomicOr";
-    case Op::OpAtomicXor: return "OpAtomicXor";
-    case Op::OpPhi: return "OpPhi";
-    case Op::OpLoopMerge: return "OpLoopMerge";
-    case Op::OpSelectionMerge: return "OpSelectionMerge";
-    case Op::OpLabel: return "OpLabel";
-    case Op::OpBranch: return "OpBranch";
-    case Op::OpBranchConditional: return "OpBranchConditional";
-    case Op::OpSwitch: return "OpSwitch";
-    case Op::OpKill: return "OpKill";
-    case Op::OpReturn: return "OpReturn";
-    case Op::OpReturnValue: return "OpReturnValue";
-    case Op::OpUnreachable: return "OpUnreachable";
-    case Op::OpLifetimeStart: return "OpLifetimeStart";
-    case Op::OpLifetimeStop: return "OpLifetimeStop";
-    case Op::OpGroupAsyncCopy: return "OpGroupAsyncCopy";
-    case Op::OpGroupWaitEvents: return "OpGroupWaitEvents";
-    case Op::OpGroupAll: return "OpGroupAll";
-    case Op::OpGroupAny: return "OpGroupAny";
-    case Op::OpGroupBroadcast: return "OpGroupBroadcast";
-    case Op::OpGroupIAdd: return "OpGroupIAdd";
-    case Op::OpGroupFAdd: return "OpGroupFAdd";
-    case Op::OpGroupFMin: return "OpGroupFMin";
-    case Op::OpGroupUMin: return "OpGroupUMin";
-    case Op::OpGroupSMin: return "OpGroupSMin";
-    case Op::OpGroupFMax: return "OpGroupFMax";
-    case Op::OpGroupUMax: return "OpGroupUMax";
-    case Op::OpGroupSMax: return "OpGroupSMax";
-    case Op::OpReadPipe: return "OpReadPipe";
-    case Op::OpWritePipe: return "OpWritePipe";
-    case Op::OpReservedReadPipe: return "OpReservedReadPipe";
-    case Op::OpReservedWritePipe: return "OpReservedWritePipe";
-    case Op::OpReserveReadPipePackets: return "OpReserveReadPipePackets";
-    case Op::OpReserveWritePipePackets: return "OpReserveWritePipePackets";
-    case Op::OpCommitReadPipe: return "OpCommitReadPipe";
-    case Op::OpCommitWritePipe: return "OpCommitWritePipe";
-    case Op::OpIsValidReserveId: return "OpIsValidReserveId";
-    case Op::OpGetNumPipePackets: return "OpGetNumPipePackets";
-    case Op::OpGetMaxPipePackets: return "OpGetMaxPipePackets";
-    case Op::OpGroupReserveReadPipePackets: return "OpGroupReserveReadPipePackets";
-    case Op::OpGroupReserveWritePipePackets: return "OpGroupReserveWritePipePackets";
-    case Op::OpGroupCommitReadPipe: return "OpGroupCommitReadPipe";
-    case Op::OpGroupCommitWritePipe: return "OpGroupCommitWritePipe";
-    case Op::OpEnqueueMarker: return "OpEnqueueMarker";
-    case Op::OpEnqueueKernel: return "OpEnqueueKernel";
-    case Op::OpGetKernelNDrangeSubGroupCount: return "OpGetKernelNDrangeSubGroupCount";
-    case Op::OpGetKernelNDrangeMaxSubGroupSize: return "OpGetKernelNDrangeMaxSubGroupSize";
-    case Op::OpGetKernelWorkGroupSize: return "OpGetKernelWorkGroupSize";
-    case Op::OpGetKernelPreferredWorkGroupSizeMultiple: return "OpGetKernelPreferredWorkGroupSizeMultiple";
-    case Op::OpRetainEvent: return "OpRetainEvent";
-    case Op::OpReleaseEvent: return "OpReleaseEvent";
-    case Op::OpCreateUserEvent: return "OpCreateUserEvent";
-    case Op::OpIsValidEvent: return "OpIsValidEvent";
-    case Op::OpSetUserEventStatus: return "OpSetUserEventStatus";
-    case Op::OpCaptureEventProfilingInfo: return "OpCaptureEventProfilingInfo";
-    case Op::OpGetDefaultQueue: return "OpGetDefaultQueue";
-    case Op::OpBuildNDRange: return "OpBuildNDRange";
-    case Op::OpImageSparseSampleImplicitLod: return "OpImageSparseSampleImplicitLod";
-    case Op::OpImageSparseSampleExplicitLod: return "OpImageSparseSampleExplicitLod";
-    case Op::OpImageSparseSampleDrefImplicitLod: return "OpImageSparseSampleDrefImplicitLod";
-    case Op::OpImageSparseSampleDrefExplicitLod: return "OpImageSparseSampleDrefExplicitLod";
-    case Op::OpImageSparseSampleProjImplicitLod: return "OpImageSparseSampleProjImplicitLod";
-    case Op::OpImageSparseSampleProjExplicitLod: return "OpImageSparseSampleProjExplicitLod";
-    case Op::OpImageSparseSampleProjDrefImplicitLod: return "OpImageSparseSampleProjDrefImplicitLod";
-    case Op::OpImageSparseSampleProjDrefExplicitLod: return "OpImageSparseSampleProjDrefExplicitLod";
-    case Op::OpImageSparseFetch: return "OpImageSparseFetch";
-    case Op::OpImageSparseGather: return "OpImageSparseGather";
-    case Op::OpImageSparseDrefGather: return "OpImageSparseDrefGather";
-    case Op::OpImageSparseTexelsResident: return "OpImageSparseTexelsResident";
-    case Op::OpNoLine: return "OpNoLine";
-    case Op::OpAtomicFlagTestAndSet: return "OpAtomicFlagTestAndSet";
-    case Op::OpAtomicFlagClear: return "OpAtomicFlagClear";
-    case Op::OpImageSparseRead: return "OpImageSparseRead";
-    case Op::OpSizeOf: return "OpSizeOf";
-    case Op::OpTypePipeStorage: return "OpTypePipeStorage";
-    case Op::OpConstantPipeStorage: return "OpConstantPipeStorage";
-    case Op::OpCreatePipeFromPipeStorage: return "OpCreatePipeFromPipeStorage";
-    case Op::OpGetKernelLocalSizeForSubgroupCount: return "OpGetKernelLocalSizeForSubgroupCount";
-    case Op::OpGetKernelMaxNumSubgroups: return "OpGetKernelMaxNumSubgroups";
-    case Op::OpTypeNamedBarrier: return "OpTypeNamedBarrier";
-    case Op::OpNamedBarrierInitialize: return "OpNamedBarrierInitialize";
-    case Op::OpMemoryNamedBarrier: return "OpMemoryNamedBarrier";
-    case Op::OpModuleProcessed: return "OpModuleProcessed";
-    case Op::OpExecutionModeId: return "OpExecutionModeId";
-    case Op::OpDecorateId: return "OpDecorateId";
-    case Op::OpGroupNonUniformElect: return "OpGroupNonUniformElect";
-    case Op::OpGroupNonUniformAll: return "OpGroupNonUniformAll";
-    case Op::OpGroupNonUniformAny: return "OpGroupNonUniformAny";
-    case Op::OpGroupNonUniformAllEqual: return "OpGroupNonUniformAllEqual";
-    case Op::OpGroupNonUniformBroadcast: return "OpGroupNonUniformBroadcast";
-    case Op::OpGroupNonUniformBroadcastFirst: return "OpGroupNonUniformBroadcastFirst";
-    case Op::OpGroupNonUniformBallot: return "OpGroupNonUniformBallot";
-    case Op::OpGroupNonUniformInverseBallot: return "OpGroupNonUniformInverseBallot";
-    case Op::OpGroupNonUniformBallotBitExtract: return "OpGroupNonUniformBallotBitExtract";
-    case Op::OpGroupNonUniformBallotBitCount: return "OpGroupNonUniformBallotBitCount";
-    case Op::OpGroupNonUniformBallotFindLSB: return "OpGroupNonUniformBallotFindLSB";
-    case Op::OpGroupNonUniformBallotFindMSB: return "OpGroupNonUniformBallotFindMSB";
-    case Op::OpGroupNonUniformShuffle: return "OpGroupNonUniformShuffle";
-    case Op::OpGroupNonUniformShuffleXor: return "OpGroupNonUniformShuffleXor";
-    case Op::OpGroupNonUniformShuffleUp: return "OpGroupNonUniformShuffleUp";
-    case Op::OpGroupNonUniformShuffleDown: return "OpGroupNonUniformShuffleDown";
-    case Op::OpGroupNonUniformIAdd: return "OpGroupNonUniformIAdd";
-    case Op::OpGroupNonUniformFAdd: return "OpGroupNonUniformFAdd";
-    case Op::OpGroupNonUniformIMul: return "OpGroupNonUniformIMul";
-    case Op::OpGroupNonUniformFMul: return "OpGroupNonUniformFMul";
-    case Op::OpGroupNonUniformSMin: return "OpGroupNonUniformSMin";
-    case Op::OpGroupNonUniformUMin: return "OpGroupNonUniformUMin";
-    case Op::OpGroupNonUniformFMin: return "OpGroupNonUniformFMin";
-    case Op::OpGroupNonUniformSMax: return "OpGroupNonUniformSMax";
-    case Op::OpGroupNonUniformUMax: return "OpGroupNonUniformUMax";
-    case Op::OpGroupNonUniformFMax: return "OpGroupNonUniformFMax";
-    case Op::OpGroupNonUniformBitwiseAnd: return "OpGroupNonUniformBitwiseAnd";
-    case Op::OpGroupNonUniformBitwiseOr: return "OpGroupNonUniformBitwiseOr";
-    case Op::OpGroupNonUniformBitwiseXor: return "OpGroupNonUniformBitwiseXor";
-    case Op::OpGroupNonUniformLogicalAnd: return "OpGroupNonUniformLogicalAnd";
-    case Op::OpGroupNonUniformLogicalOr: return "OpGroupNonUniformLogicalOr";
-    case Op::OpGroupNonUniformLogicalXor: return "OpGroupNonUniformLogicalXor";
-    case Op::OpGroupNonUniformQuadBroadcast: return "OpGroupNonUniformQuadBroadcast";
-    case Op::OpGroupNonUniformQuadSwap: return "OpGroupNonUniformQuadSwap";
-    case Op::OpCopyLogical: return "OpCopyLogical";
-    case Op::OpPtrEqual: return "OpPtrEqual";
-    case Op::OpPtrNotEqual: return "OpPtrNotEqual";
-    case Op::OpPtrDiff: return "OpPtrDiff";
-    case Op::OpColorAttachmentReadEXT: return "OpColorAttachmentReadEXT";
-    case Op::OpDepthAttachmentReadEXT: return "OpDepthAttachmentReadEXT";
-    case Op::OpStencilAttachmentReadEXT: return "OpStencilAttachmentReadEXT";
-    case Op::OpTypeTensorARM: return "OpTypeTensorARM";
-    case Op::OpTensorReadARM: return "OpTensorReadARM";
-    case Op::OpTensorWriteARM: return "OpTensorWriteARM";
-    case Op::OpTensorQuerySizeARM: return "OpTensorQuerySizeARM";
-    case Op::OpGraphConstantARM: return "OpGraphConstantARM";
-    case Op::OpGraphEntryPointARM: return "OpGraphEntryPointARM";
-    case Op::OpGraphARM: return "OpGraphARM";
-    case Op::OpGraphInputARM: return "OpGraphInputARM";
-    case Op::OpGraphSetOutputARM: return "OpGraphSetOutputARM";
-    case Op::OpGraphEndARM: return "OpGraphEndARM";
-    case Op::OpTypeGraphARM: return "OpTypeGraphARM";
-    case Op::OpTerminateInvocation: return "OpTerminateInvocation";
-    case Op::OpTypeUntypedPointerKHR: return "OpTypeUntypedPointerKHR";
-    case Op::OpUntypedVariableKHR: return "OpUntypedVariableKHR";
-    case Op::OpUntypedAccessChainKHR: return "OpUntypedAccessChainKHR";
-    case Op::OpUntypedInBoundsAccessChainKHR: return "OpUntypedInBoundsAccessChainKHR";
-    case Op::OpSubgroupBallotKHR: return "OpSubgroupBallotKHR";
-    case Op::OpSubgroupFirstInvocationKHR: return "OpSubgroupFirstInvocationKHR";
-    case Op::OpUntypedPtrAccessChainKHR: return "OpUntypedPtrAccessChainKHR";
-    case Op::OpUntypedInBoundsPtrAccessChainKHR: return "OpUntypedInBoundsPtrAccessChainKHR";
-    case Op::OpUntypedArrayLengthKHR: return "OpUntypedArrayLengthKHR";
-    case Op::OpUntypedPrefetchKHR: return "OpUntypedPrefetchKHR";
-    case Op::OpFmaKHR: return "OpFmaKHR";
-    case Op::OpSubgroupAllKHR: return "OpSubgroupAllKHR";
-    case Op::OpSubgroupAnyKHR: return "OpSubgroupAnyKHR";
-    case Op::OpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
-    case Op::OpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
-    case Op::OpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
-    case Op::OpExtInstWithForwardRefsKHR: return "OpExtInstWithForwardRefsKHR";
-    case Op::OpUntypedGroupAsyncCopyKHR: return "OpUntypedGroupAsyncCopyKHR";
-    case Op::OpTraceRayKHR: return "OpTraceRayKHR";
-    case Op::OpExecuteCallableKHR: return "OpExecuteCallableKHR";
-    case Op::OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";
-    case Op::OpIgnoreIntersectionKHR: return "OpIgnoreIntersectionKHR";
-    case Op::OpTerminateRayKHR: return "OpTerminateRayKHR";
-    case Op::OpSDot: return "OpSDot";
-    case Op::OpUDot: return "OpUDot";
-    case Op::OpSUDot: return "OpSUDot";
-    case Op::OpSDotAccSat: return "OpSDotAccSat";
-    case Op::OpUDotAccSat: return "OpUDotAccSat";
-    case Op::OpSUDotAccSat: return "OpSUDotAccSat";
-    case Op::OpTypeCooperativeMatrixKHR: return "OpTypeCooperativeMatrixKHR";
-    case Op::OpCooperativeMatrixLoadKHR: return "OpCooperativeMatrixLoadKHR";
-    case Op::OpCooperativeMatrixStoreKHR: return "OpCooperativeMatrixStoreKHR";
-    case Op::OpCooperativeMatrixMulAddKHR: return "OpCooperativeMatrixMulAddKHR";
-    case Op::OpCooperativeMatrixLengthKHR: return "OpCooperativeMatrixLengthKHR";
-    case Op::OpConstantCompositeReplicateEXT: return "OpConstantCompositeReplicateEXT";
-    case Op::OpSpecConstantCompositeReplicateEXT: return "OpSpecConstantCompositeReplicateEXT";
-    case Op::OpCompositeConstructReplicateEXT: return "OpCompositeConstructReplicateEXT";
-    case Op::OpTypeRayQueryKHR: return "OpTypeRayQueryKHR";
-    case Op::OpRayQueryInitializeKHR: return "OpRayQueryInitializeKHR";
-    case Op::OpRayQueryTerminateKHR: return "OpRayQueryTerminateKHR";
-    case Op::OpRayQueryGenerateIntersectionKHR: return "OpRayQueryGenerateIntersectionKHR";
-    case Op::OpRayQueryConfirmIntersectionKHR: return "OpRayQueryConfirmIntersectionKHR";
-    case Op::OpRayQueryProceedKHR: return "OpRayQueryProceedKHR";
-    case Op::OpRayQueryGetIntersectionTypeKHR: return "OpRayQueryGetIntersectionTypeKHR";
-    case Op::OpImageSampleWeightedQCOM: return "OpImageSampleWeightedQCOM";
-    case Op::OpImageBoxFilterQCOM: return "OpImageBoxFilterQCOM";
-    case Op::OpImageBlockMatchSSDQCOM: return "OpImageBlockMatchSSDQCOM";
-    case Op::OpImageBlockMatchSADQCOM: return "OpImageBlockMatchSADQCOM";
-    case Op::OpBitCastArrayQCOM: return "OpBitCastArrayQCOM";
-    case Op::OpImageBlockMatchWindowSSDQCOM: return "OpImageBlockMatchWindowSSDQCOM";
-    case Op::OpImageBlockMatchWindowSADQCOM: return "OpImageBlockMatchWindowSADQCOM";
-    case Op::OpImageBlockMatchGatherSSDQCOM: return "OpImageBlockMatchGatherSSDQCOM";
-    case Op::OpImageBlockMatchGatherSADQCOM: return "OpImageBlockMatchGatherSADQCOM";
-    case Op::OpCompositeConstructCoopMatQCOM: return "OpCompositeConstructCoopMatQCOM";
-    case Op::OpCompositeExtractCoopMatQCOM: return "OpCompositeExtractCoopMatQCOM";
-    case Op::OpExtractSubArrayQCOM: return "OpExtractSubArrayQCOM";
-    case Op::OpGroupIAddNonUniformAMD: return "OpGroupIAddNonUniformAMD";
-    case Op::OpGroupFAddNonUniformAMD: return "OpGroupFAddNonUniformAMD";
-    case Op::OpGroupFMinNonUniformAMD: return "OpGroupFMinNonUniformAMD";
-    case Op::OpGroupUMinNonUniformAMD: return "OpGroupUMinNonUniformAMD";
-    case Op::OpGroupSMinNonUniformAMD: return "OpGroupSMinNonUniformAMD";
-    case Op::OpGroupFMaxNonUniformAMD: return "OpGroupFMaxNonUniformAMD";
-    case Op::OpGroupUMaxNonUniformAMD: return "OpGroupUMaxNonUniformAMD";
-    case Op::OpGroupSMaxNonUniformAMD: return "OpGroupSMaxNonUniformAMD";
-    case Op::OpFragmentMaskFetchAMD: return "OpFragmentMaskFetchAMD";
-    case Op::OpFragmentFetchAMD: return "OpFragmentFetchAMD";
-    case Op::OpReadClockKHR: return "OpReadClockKHR";
-    case Op::OpAllocateNodePayloadsAMDX: return "OpAllocateNodePayloadsAMDX";
-    case Op::OpEnqueueNodePayloadsAMDX: return "OpEnqueueNodePayloadsAMDX";
-    case Op::OpTypeNodePayloadArrayAMDX: return "OpTypeNodePayloadArrayAMDX";
-    case Op::OpFinishWritingNodePayloadAMDX: return "OpFinishWritingNodePayloadAMDX";
-    case Op::OpNodePayloadArrayLengthAMDX: return "OpNodePayloadArrayLengthAMDX";
-    case Op::OpIsNodePayloadValidAMDX: return "OpIsNodePayloadValidAMDX";
-    case Op::OpConstantStringAMDX: return "OpConstantStringAMDX";
-    case Op::OpSpecConstantStringAMDX: return "OpSpecConstantStringAMDX";
-    case Op::OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
-    case Op::OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
-    case Op::OpHitObjectRecordHitMotionNV: return "OpHitObjectRecordHitMotionNV";
-    case Op::OpHitObjectRecordHitWithIndexMotionNV: return "OpHitObjectRecordHitWithIndexMotionNV";
-    case Op::OpHitObjectRecordMissMotionNV: return "OpHitObjectRecordMissMotionNV";
-    case Op::OpHitObjectGetWorldToObjectNV: return "OpHitObjectGetWorldToObjectNV";
-    case Op::OpHitObjectGetObjectToWorldNV: return "OpHitObjectGetObjectToWorldNV";
-    case Op::OpHitObjectGetObjectRayDirectionNV: return "OpHitObjectGetObjectRayDirectionNV";
-    case Op::OpHitObjectGetObjectRayOriginNV: return "OpHitObjectGetObjectRayOriginNV";
-    case Op::OpHitObjectTraceRayMotionNV: return "OpHitObjectTraceRayMotionNV";
-    case Op::OpHitObjectGetShaderRecordBufferHandleNV: return "OpHitObjectGetShaderRecordBufferHandleNV";
-    case Op::OpHitObjectGetShaderBindingTableRecordIndexNV: return "OpHitObjectGetShaderBindingTableRecordIndexNV";
-    case Op::OpHitObjectRecordEmptyNV: return "OpHitObjectRecordEmptyNV";
-    case Op::OpHitObjectTraceRayNV: return "OpHitObjectTraceRayNV";
-    case Op::OpHitObjectRecordHitNV: return "OpHitObjectRecordHitNV";
-    case Op::OpHitObjectRecordHitWithIndexNV: return "OpHitObjectRecordHitWithIndexNV";
-    case Op::OpHitObjectRecordMissNV: return "OpHitObjectRecordMissNV";
-    case Op::OpHitObjectExecuteShaderNV: return "OpHitObjectExecuteShaderNV";
-    case Op::OpHitObjectGetCurrentTimeNV: return "OpHitObjectGetCurrentTimeNV";
-    case Op::OpHitObjectGetAttributesNV: return "OpHitObjectGetAttributesNV";
-    case Op::OpHitObjectGetHitKindNV: return "OpHitObjectGetHitKindNV";
-    case Op::OpHitObjectGetPrimitiveIndexNV: return "OpHitObjectGetPrimitiveIndexNV";
-    case Op::OpHitObjectGetGeometryIndexNV: return "OpHitObjectGetGeometryIndexNV";
-    case Op::OpHitObjectGetInstanceIdNV: return "OpHitObjectGetInstanceIdNV";
-    case Op::OpHitObjectGetInstanceCustomIndexNV: return "OpHitObjectGetInstanceCustomIndexNV";
-    case Op::OpHitObjectGetWorldRayDirectionNV: return "OpHitObjectGetWorldRayDirectionNV";
-    case Op::OpHitObjectGetWorldRayOriginNV: return "OpHitObjectGetWorldRayOriginNV";
-    case Op::OpHitObjectGetRayTMaxNV: return "OpHitObjectGetRayTMaxNV";
-    case Op::OpHitObjectGetRayTMinNV: return "OpHitObjectGetRayTMinNV";
-    case Op::OpHitObjectIsEmptyNV: return "OpHitObjectIsEmptyNV";
-    case Op::OpHitObjectIsHitNV: return "OpHitObjectIsHitNV";
-    case Op::OpHitObjectIsMissNV: return "OpHitObjectIsMissNV";
-    case Op::OpReorderThreadWithHitObjectNV: return "OpReorderThreadWithHitObjectNV";
-    case Op::OpReorderThreadWithHintNV: return "OpReorderThreadWithHintNV";
-    case Op::OpTypeHitObjectNV: return "OpTypeHitObjectNV";
-    case Op::OpImageSampleFootprintNV: return "OpImageSampleFootprintNV";
-    case Op::OpTypeCooperativeVectorNV: return "OpTypeCooperativeVectorNV";
-    case Op::OpCooperativeVectorMatrixMulNV: return "OpCooperativeVectorMatrixMulNV";
-    case Op::OpCooperativeVectorOuterProductAccumulateNV: return "OpCooperativeVectorOuterProductAccumulateNV";
-    case Op::OpCooperativeVectorReduceSumAccumulateNV: return "OpCooperativeVectorReduceSumAccumulateNV";
-    case Op::OpCooperativeVectorMatrixMulAddNV: return "OpCooperativeVectorMatrixMulAddNV";
-    case Op::OpCooperativeMatrixConvertNV: return "OpCooperativeMatrixConvertNV";
-    case Op::OpEmitMeshTasksEXT: return "OpEmitMeshTasksEXT";
-    case Op::OpSetMeshOutputsEXT: return "OpSetMeshOutputsEXT";
-    case Op::OpGroupNonUniformPartitionNV: return "OpGroupNonUniformPartitionNV";
-    case Op::OpWritePackedPrimitiveIndices4x8NV: return "OpWritePackedPrimitiveIndices4x8NV";
-    case Op::OpFetchMicroTriangleVertexPositionNV: return "OpFetchMicroTriangleVertexPositionNV";
-    case Op::OpFetchMicroTriangleVertexBarycentricNV: return "OpFetchMicroTriangleVertexBarycentricNV";
-    case Op::OpCooperativeVectorLoadNV: return "OpCooperativeVectorLoadNV";
-    case Op::OpCooperativeVectorStoreNV: return "OpCooperativeVectorStoreNV";
-    case Op::OpHitObjectRecordFromQueryEXT: return "OpHitObjectRecordFromQueryEXT";
-    case Op::OpHitObjectRecordMissEXT: return "OpHitObjectRecordMissEXT";
-    case Op::OpHitObjectRecordMissMotionEXT: return "OpHitObjectRecordMissMotionEXT";
-    case Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT: return "OpHitObjectGetIntersectionTriangleVertexPositionsEXT";
-    case Op::OpHitObjectGetRayFlagsEXT: return "OpHitObjectGetRayFlagsEXT";
-    case Op::OpHitObjectSetShaderBindingTableRecordIndexEXT: return "OpHitObjectSetShaderBindingTableRecordIndexEXT";
-    case Op::OpHitObjectReorderExecuteShaderEXT: return "OpHitObjectReorderExecuteShaderEXT";
-    case Op::OpHitObjectTraceReorderExecuteEXT: return "OpHitObjectTraceReorderExecuteEXT";
-    case Op::OpHitObjectTraceMotionReorderExecuteEXT: return "OpHitObjectTraceMotionReorderExecuteEXT";
-    case Op::OpTypeHitObjectEXT: return "OpTypeHitObjectEXT";
-    case Op::OpReorderThreadWithHintEXT: return "OpReorderThreadWithHintEXT";
-    case Op::OpReorderThreadWithHitObjectEXT: return "OpReorderThreadWithHitObjectEXT";
-    case Op::OpHitObjectTraceRayEXT: return "OpHitObjectTraceRayEXT";
-    case Op::OpHitObjectTraceRayMotionEXT: return "OpHitObjectTraceRayMotionEXT";
-    case Op::OpHitObjectRecordEmptyEXT: return "OpHitObjectRecordEmptyEXT";
-    case Op::OpHitObjectExecuteShaderEXT: return "OpHitObjectExecuteShaderEXT";
-    case Op::OpHitObjectGetCurrentTimeEXT: return "OpHitObjectGetCurrentTimeEXT";
-    case Op::OpHitObjectGetAttributesEXT: return "OpHitObjectGetAttributesEXT";
-    case Op::OpHitObjectGetHitKindEXT: return "OpHitObjectGetHitKindEXT";
-    case Op::OpHitObjectGetPrimitiveIndexEXT: return "OpHitObjectGetPrimitiveIndexEXT";
-    case Op::OpHitObjectGetGeometryIndexEXT: return "OpHitObjectGetGeometryIndexEXT";
-    case Op::OpHitObjectGetInstanceIdEXT: return "OpHitObjectGetInstanceIdEXT";
-    case Op::OpHitObjectGetInstanceCustomIndexEXT: return "OpHitObjectGetInstanceCustomIndexEXT";
-    case Op::OpHitObjectGetObjectRayOriginEXT: return "OpHitObjectGetObjectRayOriginEXT";
-    case Op::OpHitObjectGetObjectRayDirectionEXT: return "OpHitObjectGetObjectRayDirectionEXT";
-    case Op::OpHitObjectGetWorldRayDirectionEXT: return "OpHitObjectGetWorldRayDirectionEXT";
-    case Op::OpHitObjectGetWorldRayOriginEXT: return "OpHitObjectGetWorldRayOriginEXT";
-    case Op::OpHitObjectGetObjectToWorldEXT: return "OpHitObjectGetObjectToWorldEXT";
-    case Op::OpHitObjectGetWorldToObjectEXT: return "OpHitObjectGetWorldToObjectEXT";
-    case Op::OpHitObjectGetRayTMaxEXT: return "OpHitObjectGetRayTMaxEXT";
-    case Op::OpReportIntersectionKHR: return "OpReportIntersectionKHR";
-    case Op::OpIgnoreIntersectionNV: return "OpIgnoreIntersectionNV";
-    case Op::OpTerminateRayNV: return "OpTerminateRayNV";
-    case Op::OpTraceNV: return "OpTraceNV";
-    case Op::OpTraceMotionNV: return "OpTraceMotionNV";
-    case Op::OpTraceRayMotionNV: return "OpTraceRayMotionNV";
-    case Op::OpRayQueryGetIntersectionTriangleVertexPositionsKHR: return "OpRayQueryGetIntersectionTriangleVertexPositionsKHR";
-    case Op::OpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
-    case Op::OpExecuteCallableNV: return "OpExecuteCallableNV";
-    case Op::OpRayQueryGetClusterIdNV: return "OpRayQueryGetClusterIdNV";
-    case Op::OpHitObjectGetClusterIdNV: return "OpHitObjectGetClusterIdNV";
-    case Op::OpHitObjectGetRayTMinEXT: return "OpHitObjectGetRayTMinEXT";
-    case Op::OpHitObjectGetShaderBindingTableRecordIndexEXT: return "OpHitObjectGetShaderBindingTableRecordIndexEXT";
-    case Op::OpHitObjectGetShaderRecordBufferHandleEXT: return "OpHitObjectGetShaderRecordBufferHandleEXT";
-    case Op::OpHitObjectIsEmptyEXT: return "OpHitObjectIsEmptyEXT";
-    case Op::OpHitObjectIsHitEXT: return "OpHitObjectIsHitEXT";
-    case Op::OpHitObjectIsMissEXT: return "OpHitObjectIsMissEXT";
-    case Op::OpTypeCooperativeMatrixNV: return "OpTypeCooperativeMatrixNV";
-    case Op::OpCooperativeMatrixLoadNV: return "OpCooperativeMatrixLoadNV";
-    case Op::OpCooperativeMatrixStoreNV: return "OpCooperativeMatrixStoreNV";
-    case Op::OpCooperativeMatrixMulAddNV: return "OpCooperativeMatrixMulAddNV";
-    case Op::OpCooperativeMatrixLengthNV: return "OpCooperativeMatrixLengthNV";
-    case Op::OpBeginInvocationInterlockEXT: return "OpBeginInvocationInterlockEXT";
-    case Op::OpEndInvocationInterlockEXT: return "OpEndInvocationInterlockEXT";
-    case Op::OpCooperativeMatrixReduceNV: return "OpCooperativeMatrixReduceNV";
-    case Op::OpCooperativeMatrixLoadTensorNV: return "OpCooperativeMatrixLoadTensorNV";
-    case Op::OpCooperativeMatrixStoreTensorNV: return "OpCooperativeMatrixStoreTensorNV";
-    case Op::OpCooperativeMatrixPerElementOpNV: return "OpCooperativeMatrixPerElementOpNV";
-    case Op::OpTypeTensorLayoutNV: return "OpTypeTensorLayoutNV";
-    case Op::OpTypeTensorViewNV: return "OpTypeTensorViewNV";
-    case Op::OpCreateTensorLayoutNV: return "OpCreateTensorLayoutNV";
-    case Op::OpTensorLayoutSetDimensionNV: return "OpTensorLayoutSetDimensionNV";
-    case Op::OpTensorLayoutSetStrideNV: return "OpTensorLayoutSetStrideNV";
-    case Op::OpTensorLayoutSliceNV: return "OpTensorLayoutSliceNV";
-    case Op::OpTensorLayoutSetClampValueNV: return "OpTensorLayoutSetClampValueNV";
-    case Op::OpCreateTensorViewNV: return "OpCreateTensorViewNV";
-    case Op::OpTensorViewSetDimensionNV: return "OpTensorViewSetDimensionNV";
-    case Op::OpTensorViewSetStrideNV: return "OpTensorViewSetStrideNV";
-    case Op::OpDemoteToHelperInvocation: return "OpDemoteToHelperInvocation";
-    case Op::OpIsHelperInvocationEXT: return "OpIsHelperInvocationEXT";
-    case Op::OpTensorViewSetClipNV: return "OpTensorViewSetClipNV";
-    case Op::OpTensorLayoutSetBlockSizeNV: return "OpTensorLayoutSetBlockSizeNV";
-    case Op::OpCooperativeMatrixTransposeNV: return "OpCooperativeMatrixTransposeNV";
-    case Op::OpConvertUToImageNV: return "OpConvertUToImageNV";
-    case Op::OpConvertUToSamplerNV: return "OpConvertUToSamplerNV";
-    case Op::OpConvertImageToUNV: return "OpConvertImageToUNV";
-    case Op::OpConvertSamplerToUNV: return "OpConvertSamplerToUNV";
-    case Op::OpConvertUToSampledImageNV: return "OpConvertUToSampledImageNV";
-    case Op::OpConvertSampledImageToUNV: return "OpConvertSampledImageToUNV";
-    case Op::OpSamplerImageAddressingModeNV: return "OpSamplerImageAddressingModeNV";
-    case Op::OpRawAccessChainNV: return "OpRawAccessChainNV";
-    case Op::OpRayQueryGetIntersectionSpherePositionNV: return "OpRayQueryGetIntersectionSpherePositionNV";
-    case Op::OpRayQueryGetIntersectionSphereRadiusNV: return "OpRayQueryGetIntersectionSphereRadiusNV";
-    case Op::OpRayQueryGetIntersectionLSSPositionsNV: return "OpRayQueryGetIntersectionLSSPositionsNV";
-    case Op::OpRayQueryGetIntersectionLSSRadiiNV: return "OpRayQueryGetIntersectionLSSRadiiNV";
-    case Op::OpRayQueryGetIntersectionLSSHitValueNV: return "OpRayQueryGetIntersectionLSSHitValueNV";
-    case Op::OpHitObjectGetSpherePositionNV: return "OpHitObjectGetSpherePositionNV";
-    case Op::OpHitObjectGetSphereRadiusNV: return "OpHitObjectGetSphereRadiusNV";
-    case Op::OpHitObjectGetLSSPositionsNV: return "OpHitObjectGetLSSPositionsNV";
-    case Op::OpHitObjectGetLSSRadiiNV: return "OpHitObjectGetLSSRadiiNV";
-    case Op::OpHitObjectIsSphereHitNV: return "OpHitObjectIsSphereHitNV";
-    case Op::OpHitObjectIsLSSHitNV: return "OpHitObjectIsLSSHitNV";
-    case Op::OpRayQueryIsSphereHitNV: return "OpRayQueryIsSphereHitNV";
-    case Op::OpRayQueryIsLSSHitNV: return "OpRayQueryIsLSSHitNV";
-    case Op::OpSubgroupShuffleINTEL: return "OpSubgroupShuffleINTEL";
-    case Op::OpSubgroupShuffleDownINTEL: return "OpSubgroupShuffleDownINTEL";
-    case Op::OpSubgroupShuffleUpINTEL: return "OpSubgroupShuffleUpINTEL";
-    case Op::OpSubgroupShuffleXorINTEL: return "OpSubgroupShuffleXorINTEL";
-    case Op::OpSubgroupBlockReadINTEL: return "OpSubgroupBlockReadINTEL";
-    case Op::OpSubgroupBlockWriteINTEL: return "OpSubgroupBlockWriteINTEL";
-    case Op::OpSubgroupImageBlockReadINTEL: return "OpSubgroupImageBlockReadINTEL";
-    case Op::OpSubgroupImageBlockWriteINTEL: return "OpSubgroupImageBlockWriteINTEL";
-    case Op::OpSubgroupImageMediaBlockReadINTEL: return "OpSubgroupImageMediaBlockReadINTEL";
-    case Op::OpSubgroupImageMediaBlockWriteINTEL: return "OpSubgroupImageMediaBlockWriteINTEL";
-    case Op::OpUCountLeadingZerosINTEL: return "OpUCountLeadingZerosINTEL";
-    case Op::OpUCountTrailingZerosINTEL: return "OpUCountTrailingZerosINTEL";
-    case Op::OpAbsISubINTEL: return "OpAbsISubINTEL";
-    case Op::OpAbsUSubINTEL: return "OpAbsUSubINTEL";
-    case Op::OpIAddSatINTEL: return "OpIAddSatINTEL";
-    case Op::OpUAddSatINTEL: return "OpUAddSatINTEL";
-    case Op::OpIAverageINTEL: return "OpIAverageINTEL";
-    case Op::OpUAverageINTEL: return "OpUAverageINTEL";
-    case Op::OpIAverageRoundedINTEL: return "OpIAverageRoundedINTEL";
-    case Op::OpUAverageRoundedINTEL: return "OpUAverageRoundedINTEL";
-    case Op::OpISubSatINTEL: return "OpISubSatINTEL";
-    case Op::OpUSubSatINTEL: return "OpUSubSatINTEL";
-    case Op::OpIMul32x16INTEL: return "OpIMul32x16INTEL";
-    case Op::OpUMul32x16INTEL: return "OpUMul32x16INTEL";
-    case Op::OpConstantFunctionPointerINTEL: return "OpConstantFunctionPointerINTEL";
-    case Op::OpFunctionPointerCallINTEL: return "OpFunctionPointerCallINTEL";
-    case Op::OpAsmTargetINTEL: return "OpAsmTargetINTEL";
-    case Op::OpAsmINTEL: return "OpAsmINTEL";
-    case Op::OpAsmCallINTEL: return "OpAsmCallINTEL";
-    case Op::OpAtomicFMinEXT: return "OpAtomicFMinEXT";
-    case Op::OpAtomicFMaxEXT: return "OpAtomicFMaxEXT";
-    case Op::OpAssumeTrueKHR: return "OpAssumeTrueKHR";
-    case Op::OpExpectKHR: return "OpExpectKHR";
-    case Op::OpDecorateString: return "OpDecorateString";
-    case Op::OpMemberDecorateString: return "OpMemberDecorateString";
-    case Op::OpVmeImageINTEL: return "OpVmeImageINTEL";
-    case Op::OpTypeVmeImageINTEL: return "OpTypeVmeImageINTEL";
-    case Op::OpTypeAvcImePayloadINTEL: return "OpTypeAvcImePayloadINTEL";
-    case Op::OpTypeAvcRefPayloadINTEL: return "OpTypeAvcRefPayloadINTEL";
-    case Op::OpTypeAvcSicPayloadINTEL: return "OpTypeAvcSicPayloadINTEL";
-    case Op::OpTypeAvcMcePayloadINTEL: return "OpTypeAvcMcePayloadINTEL";
-    case Op::OpTypeAvcMceResultINTEL: return "OpTypeAvcMceResultINTEL";
-    case Op::OpTypeAvcImeResultINTEL: return "OpTypeAvcImeResultINTEL";
-    case Op::OpTypeAvcImeResultSingleReferenceStreamoutINTEL: return "OpTypeAvcImeResultSingleReferenceStreamoutINTEL";
-    case Op::OpTypeAvcImeResultDualReferenceStreamoutINTEL: return "OpTypeAvcImeResultDualReferenceStreamoutINTEL";
-    case Op::OpTypeAvcImeSingleReferenceStreaminINTEL: return "OpTypeAvcImeSingleReferenceStreaminINTEL";
-    case Op::OpTypeAvcImeDualReferenceStreaminINTEL: return "OpTypeAvcImeDualReferenceStreaminINTEL";
-    case Op::OpTypeAvcRefResultINTEL: return "OpTypeAvcRefResultINTEL";
-    case Op::OpTypeAvcSicResultINTEL: return "OpTypeAvcSicResultINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultInterBaseMultiReferencePenaltyINTEL: return "OpSubgroupAvcMceGetDefaultInterBaseMultiReferencePenaltyINTEL";
-    case Op::OpSubgroupAvcMceSetInterBaseMultiReferencePenaltyINTEL: return "OpSubgroupAvcMceSetInterBaseMultiReferencePenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultInterShapePenaltyINTEL: return "OpSubgroupAvcMceGetDefaultInterShapePenaltyINTEL";
-    case Op::OpSubgroupAvcMceSetInterShapePenaltyINTEL: return "OpSubgroupAvcMceSetInterShapePenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultInterDirectionPenaltyINTEL: return "OpSubgroupAvcMceGetDefaultInterDirectionPenaltyINTEL";
-    case Op::OpSubgroupAvcMceSetInterDirectionPenaltyINTEL: return "OpSubgroupAvcMceSetInterDirectionPenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultIntraLumaShapePenaltyINTEL: return "OpSubgroupAvcMceGetDefaultIntraLumaShapePenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultInterMotionVectorCostTableINTEL: return "OpSubgroupAvcMceGetDefaultInterMotionVectorCostTableINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultHighPenaltyCostTableINTEL: return "OpSubgroupAvcMceGetDefaultHighPenaltyCostTableINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultMediumPenaltyCostTableINTEL: return "OpSubgroupAvcMceGetDefaultMediumPenaltyCostTableINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultLowPenaltyCostTableINTEL: return "OpSubgroupAvcMceGetDefaultLowPenaltyCostTableINTEL";
-    case Op::OpSubgroupAvcMceSetMotionVectorCostFunctionINTEL: return "OpSubgroupAvcMceSetMotionVectorCostFunctionINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultIntraLumaModePenaltyINTEL: return "OpSubgroupAvcMceGetDefaultIntraLumaModePenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultNonDcLumaIntraPenaltyINTEL: return "OpSubgroupAvcMceGetDefaultNonDcLumaIntraPenaltyINTEL";
-    case Op::OpSubgroupAvcMceGetDefaultIntraChromaModeBasePenaltyINTEL: return "OpSubgroupAvcMceGetDefaultIntraChromaModeBasePenaltyINTEL";
-    case Op::OpSubgroupAvcMceSetAcOnlyHaarINTEL: return "OpSubgroupAvcMceSetAcOnlyHaarINTEL";
-    case Op::OpSubgroupAvcMceSetSourceInterlacedFieldPolarityINTEL: return "OpSubgroupAvcMceSetSourceInterlacedFieldPolarityINTEL";
-    case Op::OpSubgroupAvcMceSetSingleReferenceInterlacedFieldPolarityINTEL: return "OpSubgroupAvcMceSetSingleReferenceInterlacedFieldPolarityINTEL";
-    case Op::OpSubgroupAvcMceSetDualReferenceInterlacedFieldPolaritiesINTEL: return "OpSubgroupAvcMceSetDualReferenceInterlacedFieldPolaritiesINTEL";
-    case Op::OpSubgroupAvcMceConvertToImePayloadINTEL: return "OpSubgroupAvcMceConvertToImePayloadINTEL";
-    case Op::OpSubgroupAvcMceConvertToImeResultINTEL: return "OpSubgroupAvcMceConvertToImeResultINTEL";
-    case Op::OpSubgroupAvcMceConvertToRefPayloadINTEL: return "OpSubgroupAvcMceConvertToRefPayloadINTEL";
-    case Op::OpSubgroupAvcMceConvertToRefResultINTEL: return "OpSubgroupAvcMceConvertToRefResultINTEL";
-    case Op::OpSubgroupAvcMceConvertToSicPayloadINTEL: return "OpSubgroupAvcMceConvertToSicPayloadINTEL";
-    case Op::OpSubgroupAvcMceConvertToSicResultINTEL: return "OpSubgroupAvcMceConvertToSicResultINTEL";
-    case Op::OpSubgroupAvcMceGetMotionVectorsINTEL: return "OpSubgroupAvcMceGetMotionVectorsINTEL";
-    case Op::OpSubgroupAvcMceGetInterDistortionsINTEL: return "OpSubgroupAvcMceGetInterDistortionsINTEL";
-    case Op::OpSubgroupAvcMceGetBestInterDistortionsINTEL: return "OpSubgroupAvcMceGetBestInterDistortionsINTEL";
-    case Op::OpSubgroupAvcMceGetInterMajorShapeINTEL: return "OpSubgroupAvcMceGetInterMajorShapeINTEL";
-    case Op::OpSubgroupAvcMceGetInterMinorShapeINTEL: return "OpSubgroupAvcMceGetInterMinorShapeINTEL";
-    case Op::OpSubgroupAvcMceGetInterDirectionsINTEL: return "OpSubgroupAvcMceGetInterDirectionsINTEL";
-    case Op::OpSubgroupAvcMceGetInterMotionVectorCountINTEL: return "OpSubgroupAvcMceGetInterMotionVectorCountINTEL";
-    case Op::OpSubgroupAvcMceGetInterReferenceIdsINTEL: return "OpSubgroupAvcMceGetInterReferenceIdsINTEL";
-    case Op::OpSubgroupAvcMceGetInterReferenceInterlacedFieldPolaritiesINTEL: return "OpSubgroupAvcMceGetInterReferenceInterlacedFieldPolaritiesINTEL";
-    case Op::OpSubgroupAvcImeInitializeINTEL: return "OpSubgroupAvcImeInitializeINTEL";
-    case Op::OpSubgroupAvcImeSetSingleReferenceINTEL: return "OpSubgroupAvcImeSetSingleReferenceINTEL";
-    case Op::OpSubgroupAvcImeSetDualReferenceINTEL: return "OpSubgroupAvcImeSetDualReferenceINTEL";
-    case Op::OpSubgroupAvcImeRefWindowSizeINTEL: return "OpSubgroupAvcImeRefWindowSizeINTEL";
-    case Op::OpSubgroupAvcImeAdjustRefOffsetINTEL: return "OpSubgroupAvcImeAdjustRefOffsetINTEL";
-    case Op::OpSubgroupAvcImeConvertToMcePayloadINTEL: return "OpSubgroupAvcImeConvertToMcePayloadINTEL";
-    case Op::OpSubgroupAvcImeSetMaxMotionVectorCountINTEL: return "OpSubgroupAvcImeSetMaxMotionVectorCountINTEL";
-    case Op::OpSubgroupAvcImeSetUnidirectionalMixDisableINTEL: return "OpSubgroupAvcImeSetUnidirectionalMixDisableINTEL";
-    case Op::OpSubgroupAvcImeSetEarlySearchTerminationThresholdINTEL: return "OpSubgroupAvcImeSetEarlySearchTerminationThresholdINTEL";
-    case Op::OpSubgroupAvcImeSetWeightedSadINTEL: return "OpSubgroupAvcImeSetWeightedSadINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceINTEL: return "OpSubgroupAvcImeEvaluateWithSingleReferenceINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceINTEL: return "OpSubgroupAvcImeEvaluateWithDualReferenceINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminINTEL: return "OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreaminINTEL: return "OpSubgroupAvcImeEvaluateWithDualReferenceStreaminINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreamoutINTEL: return "OpSubgroupAvcImeEvaluateWithSingleReferenceStreamoutINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreamoutINTEL: return "OpSubgroupAvcImeEvaluateWithDualReferenceStreamoutINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminoutINTEL: return "OpSubgroupAvcImeEvaluateWithSingleReferenceStreaminoutINTEL";
-    case Op::OpSubgroupAvcImeEvaluateWithDualReferenceStreaminoutINTEL: return "OpSubgroupAvcImeEvaluateWithDualReferenceStreaminoutINTEL";
-    case Op::OpSubgroupAvcImeConvertToMceResultINTEL: return "OpSubgroupAvcImeConvertToMceResultINTEL";
-    case Op::OpSubgroupAvcImeGetSingleReferenceStreaminINTEL: return "OpSubgroupAvcImeGetSingleReferenceStreaminINTEL";
-    case Op::OpSubgroupAvcImeGetDualReferenceStreaminINTEL: return "OpSubgroupAvcImeGetDualReferenceStreaminINTEL";
-    case Op::OpSubgroupAvcImeStripSingleReferenceStreamoutINTEL: return "OpSubgroupAvcImeStripSingleReferenceStreamoutINTEL";
-    case Op::OpSubgroupAvcImeStripDualReferenceStreamoutINTEL: return "OpSubgroupAvcImeStripDualReferenceStreamoutINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeMotionVectorsINTEL: return "OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeMotionVectorsINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeDistortionsINTEL: return "OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeDistortionsINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeReferenceIdsINTEL: return "OpSubgroupAvcImeGetStreamoutSingleReferenceMajorShapeReferenceIdsINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeMotionVectorsINTEL: return "OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeMotionVectorsINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeDistortionsINTEL: return "OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeDistortionsINTEL";
-    case Op::OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeReferenceIdsINTEL: return "OpSubgroupAvcImeGetStreamoutDualReferenceMajorShapeReferenceIdsINTEL";
-    case Op::OpSubgroupAvcImeGetBorderReachedINTEL: return "OpSubgroupAvcImeGetBorderReachedINTEL";
-    case Op::OpSubgroupAvcImeGetTruncatedSearchIndicationINTEL: return "OpSubgroupAvcImeGetTruncatedSearchIndicationINTEL";
-    case Op::OpSubgroupAvcImeGetUnidirectionalEarlySearchTerminationINTEL: return "OpSubgroupAvcImeGetUnidirectionalEarlySearchTerminationINTEL";
-    case Op::OpSubgroupAvcImeGetWeightingPatternMinimumMotionVectorINTEL: return "OpSubgroupAvcImeGetWeightingPatternMinimumMotionVectorINTEL";
-    case Op::OpSubgroupAvcImeGetWeightingPatternMinimumDistortionINTEL: return "OpSubgroupAvcImeGetWeightingPatternMinimumDistortionINTEL";
-    case Op::OpSubgroupAvcFmeInitializeINTEL: return "OpSubgroupAvcFmeInitializeINTEL";
-    case Op::OpSubgroupAvcBmeInitializeINTEL: return "OpSubgroupAvcBmeInitializeINTEL";
-    case Op::OpSubgroupAvcRefConvertToMcePayloadINTEL: return "OpSubgroupAvcRefConvertToMcePayloadINTEL";
-    case Op::OpSubgroupAvcRefSetBidirectionalMixDisableINTEL: return "OpSubgroupAvcRefSetBidirectionalMixDisableINTEL";
-    case Op::OpSubgroupAvcRefSetBilinearFilterEnableINTEL: return "OpSubgroupAvcRefSetBilinearFilterEnableINTEL";
-    case Op::OpSubgroupAvcRefEvaluateWithSingleReferenceINTEL: return "OpSubgroupAvcRefEvaluateWithSingleReferenceINTEL";
-    case Op::OpSubgroupAvcRefEvaluateWithDualReferenceINTEL: return "OpSubgroupAvcRefEvaluateWithDualReferenceINTEL";
-    case Op::OpSubgroupAvcRefEvaluateWithMultiReferenceINTEL: return "OpSubgroupAvcRefEvaluateWithMultiReferenceINTEL";
-    case Op::OpSubgroupAvcRefEvaluateWithMultiReferenceInterlacedINTEL: return "OpSubgroupAvcRefEvaluateWithMultiReferenceInterlacedINTEL";
-    case Op::OpSubgroupAvcRefConvertToMceResultINTEL: return "OpSubgroupAvcRefConvertToMceResultINTEL";
-    case Op::OpSubgroupAvcSicInitializeINTEL: return "OpSubgroupAvcSicInitializeINTEL";
-    case Op::OpSubgroupAvcSicConfigureSkcINTEL: return "OpSubgroupAvcSicConfigureSkcINTEL";
-    case Op::OpSubgroupAvcSicConfigureIpeLumaINTEL: return "OpSubgroupAvcSicConfigureIpeLumaINTEL";
-    case Op::OpSubgroupAvcSicConfigureIpeLumaChromaINTEL: return "OpSubgroupAvcSicConfigureIpeLumaChromaINTEL";
-    case Op::OpSubgroupAvcSicGetMotionVectorMaskINTEL: return "OpSubgroupAvcSicGetMotionVectorMaskINTEL";
-    case Op::OpSubgroupAvcSicConvertToMcePayloadINTEL: return "OpSubgroupAvcSicConvertToMcePayloadINTEL";
-    case Op::OpSubgroupAvcSicSetIntraLumaShapePenaltyINTEL: return "OpSubgroupAvcSicSetIntraLumaShapePenaltyINTEL";
-    case Op::OpSubgroupAvcSicSetIntraLumaModeCostFunctionINTEL: return "OpSubgroupAvcSicSetIntraLumaModeCostFunctionINTEL";
-    case Op::OpSubgroupAvcSicSetIntraChromaModeCostFunctionINTEL: return "OpSubgroupAvcSicSetIntraChromaModeCostFunctionINTEL";
-    case Op::OpSubgroupAvcSicSetBilinearFilterEnableINTEL: return "OpSubgroupAvcSicSetBilinearFilterEnableINTEL";
-    case Op::OpSubgroupAvcSicSetSkcForwardTransformEnableINTEL: return "OpSubgroupAvcSicSetSkcForwardTransformEnableINTEL";
-    case Op::OpSubgroupAvcSicSetBlockBasedRawSkipSadINTEL: return "OpSubgroupAvcSicSetBlockBasedRawSkipSadINTEL";
-    case Op::OpSubgroupAvcSicEvaluateIpeINTEL: return "OpSubgroupAvcSicEvaluateIpeINTEL";
-    case Op::OpSubgroupAvcSicEvaluateWithSingleReferenceINTEL: return "OpSubgroupAvcSicEvaluateWithSingleReferenceINTEL";
-    case Op::OpSubgroupAvcSicEvaluateWithDualReferenceINTEL: return "OpSubgroupAvcSicEvaluateWithDualReferenceINTEL";
-    case Op::OpSubgroupAvcSicEvaluateWithMultiReferenceINTEL: return "OpSubgroupAvcSicEvaluateWithMultiReferenceINTEL";
-    case Op::OpSubgroupAvcSicEvaluateWithMultiReferenceInterlacedINTEL: return "OpSubgroupAvcSicEvaluateWithMultiReferenceInterlacedINTEL";
-    case Op::OpSubgroupAvcSicConvertToMceResultINTEL: return "OpSubgroupAvcSicConvertToMceResultINTEL";
-    case Op::OpSubgroupAvcSicGetIpeLumaShapeINTEL: return "OpSubgroupAvcSicGetIpeLumaShapeINTEL";
-    case Op::OpSubgroupAvcSicGetBestIpeLumaDistortionINTEL: return "OpSubgroupAvcSicGetBestIpeLumaDistortionINTEL";
-    case Op::OpSubgroupAvcSicGetBestIpeChromaDistortionINTEL: return "OpSubgroupAvcSicGetBestIpeChromaDistortionINTEL";
-    case Op::OpSubgroupAvcSicGetPackedIpeLumaModesINTEL: return "OpSubgroupAvcSicGetPackedIpeLumaModesINTEL";
-    case Op::OpSubgroupAvcSicGetIpeChromaModeINTEL: return "OpSubgroupAvcSicGetIpeChromaModeINTEL";
-    case Op::OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL: return "OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL";
-    case Op::OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL: return "OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL";
-    case Op::OpSubgroupAvcSicGetInterRawSadsINTEL: return "OpSubgroupAvcSicGetInterRawSadsINTEL";
-    case Op::OpVariableLengthArrayINTEL: return "OpVariableLengthArrayINTEL";
-    case Op::OpSaveMemoryINTEL: return "OpSaveMemoryINTEL";
-    case Op::OpRestoreMemoryINTEL: return "OpRestoreMemoryINTEL";
-    case Op::OpArbitraryFloatSinCosPiALTERA: return "OpArbitraryFloatSinCosPiALTERA";
-    case Op::OpArbitraryFloatCastALTERA: return "OpArbitraryFloatCastALTERA";
-    case Op::OpArbitraryFloatCastFromIntALTERA: return "OpArbitraryFloatCastFromIntALTERA";
-    case Op::OpArbitraryFloatCastToIntALTERA: return "OpArbitraryFloatCastToIntALTERA";
-    case Op::OpArbitraryFloatAddALTERA: return "OpArbitraryFloatAddALTERA";
-    case Op::OpArbitraryFloatSubALTERA: return "OpArbitraryFloatSubALTERA";
-    case Op::OpArbitraryFloatMulALTERA: return "OpArbitraryFloatMulALTERA";
-    case Op::OpArbitraryFloatDivALTERA: return "OpArbitraryFloatDivALTERA";
-    case Op::OpArbitraryFloatGTALTERA: return "OpArbitraryFloatGTALTERA";
-    case Op::OpArbitraryFloatGEALTERA: return "OpArbitraryFloatGEALTERA";
-    case Op::OpArbitraryFloatLTALTERA: return "OpArbitraryFloatLTALTERA";
-    case Op::OpArbitraryFloatLEALTERA: return "OpArbitraryFloatLEALTERA";
-    case Op::OpArbitraryFloatEQALTERA: return "OpArbitraryFloatEQALTERA";
-    case Op::OpArbitraryFloatRecipALTERA: return "OpArbitraryFloatRecipALTERA";
-    case Op::OpArbitraryFloatRSqrtALTERA: return "OpArbitraryFloatRSqrtALTERA";
-    case Op::OpArbitraryFloatCbrtALTERA: return "OpArbitraryFloatCbrtALTERA";
-    case Op::OpArbitraryFloatHypotALTERA: return "OpArbitraryFloatHypotALTERA";
-    case Op::OpArbitraryFloatSqrtALTERA: return "OpArbitraryFloatSqrtALTERA";
-    case Op::OpArbitraryFloatLogINTEL: return "OpArbitraryFloatLogINTEL";
-    case Op::OpArbitraryFloatLog2INTEL: return "OpArbitraryFloatLog2INTEL";
-    case Op::OpArbitraryFloatLog10INTEL: return "OpArbitraryFloatLog10INTEL";
-    case Op::OpArbitraryFloatLog1pINTEL: return "OpArbitraryFloatLog1pINTEL";
-    case Op::OpArbitraryFloatExpINTEL: return "OpArbitraryFloatExpINTEL";
-    case Op::OpArbitraryFloatExp2INTEL: return "OpArbitraryFloatExp2INTEL";
-    case Op::OpArbitraryFloatExp10INTEL: return "OpArbitraryFloatExp10INTEL";
-    case Op::OpArbitraryFloatExpm1INTEL: return "OpArbitraryFloatExpm1INTEL";
-    case Op::OpArbitraryFloatSinINTEL: return "OpArbitraryFloatSinINTEL";
-    case Op::OpArbitraryFloatCosINTEL: return "OpArbitraryFloatCosINTEL";
-    case Op::OpArbitraryFloatSinCosINTEL: return "OpArbitraryFloatSinCosINTEL";
-    case Op::OpArbitraryFloatSinPiINTEL: return "OpArbitraryFloatSinPiINTEL";
-    case Op::OpArbitraryFloatCosPiINTEL: return "OpArbitraryFloatCosPiINTEL";
-    case Op::OpArbitraryFloatASinINTEL: return "OpArbitraryFloatASinINTEL";
-    case Op::OpArbitraryFloatASinPiINTEL: return "OpArbitraryFloatASinPiINTEL";
-    case Op::OpArbitraryFloatACosINTEL: return "OpArbitraryFloatACosINTEL";
-    case Op::OpArbitraryFloatACosPiINTEL: return "OpArbitraryFloatACosPiINTEL";
-    case Op::OpArbitraryFloatATanINTEL: return "OpArbitraryFloatATanINTEL";
-    case Op::OpArbitraryFloatATanPiINTEL: return "OpArbitraryFloatATanPiINTEL";
-    case Op::OpArbitraryFloatATan2INTEL: return "OpArbitraryFloatATan2INTEL";
-    case Op::OpArbitraryFloatPowINTEL: return "OpArbitraryFloatPowINTEL";
-    case Op::OpArbitraryFloatPowRINTEL: return "OpArbitraryFloatPowRINTEL";
-    case Op::OpArbitraryFloatPowNINTEL: return "OpArbitraryFloatPowNINTEL";
-    case Op::OpLoopControlINTEL: return "OpLoopControlINTEL";
-    case Op::OpAliasDomainDeclINTEL: return "OpAliasDomainDeclINTEL";
-    case Op::OpAliasScopeDeclINTEL: return "OpAliasScopeDeclINTEL";
-    case Op::OpAliasScopeListDeclINTEL: return "OpAliasScopeListDeclINTEL";
-    case Op::OpFixedSqrtALTERA: return "OpFixedSqrtALTERA";
-    case Op::OpFixedRecipALTERA: return "OpFixedRecipALTERA";
-    case Op::OpFixedRsqrtALTERA: return "OpFixedRsqrtALTERA";
-    case Op::OpFixedSinALTERA: return "OpFixedSinALTERA";
-    case Op::OpFixedCosALTERA: return "OpFixedCosALTERA";
-    case Op::OpFixedSinCosALTERA: return "OpFixedSinCosALTERA";
-    case Op::OpFixedSinPiALTERA: return "OpFixedSinPiALTERA";
-    case Op::OpFixedCosPiALTERA: return "OpFixedCosPiALTERA";
-    case Op::OpFixedSinCosPiALTERA: return "OpFixedSinCosPiALTERA";
-    case Op::OpFixedLogALTERA: return "OpFixedLogALTERA";
-    case Op::OpFixedExpALTERA: return "OpFixedExpALTERA";
-    case Op::OpPtrCastToCrossWorkgroupALTERA: return "OpPtrCastToCrossWorkgroupALTERA";
-    case Op::OpCrossWorkgroupCastToPtrALTERA: return "OpCrossWorkgroupCastToPtrALTERA";
-    case Op::OpReadPipeBlockingALTERA: return "OpReadPipeBlockingALTERA";
-    case Op::OpWritePipeBlockingALTERA: return "OpWritePipeBlockingALTERA";
-    case Op::OpFPGARegALTERA: return "OpFPGARegALTERA";
-    case Op::OpRayQueryGetRayTMinKHR: return "OpRayQueryGetRayTMinKHR";
-    case Op::OpRayQueryGetRayFlagsKHR: return "OpRayQueryGetRayFlagsKHR";
-    case Op::OpRayQueryGetIntersectionTKHR: return "OpRayQueryGetIntersectionTKHR";
-    case Op::OpRayQueryGetIntersectionInstanceCustomIndexKHR: return "OpRayQueryGetIntersectionInstanceCustomIndexKHR";
-    case Op::OpRayQueryGetIntersectionInstanceIdKHR: return "OpRayQueryGetIntersectionInstanceIdKHR";
-    case Op::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR: return "OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR";
-    case Op::OpRayQueryGetIntersectionGeometryIndexKHR: return "OpRayQueryGetIntersectionGeometryIndexKHR";
-    case Op::OpRayQueryGetIntersectionPrimitiveIndexKHR: return "OpRayQueryGetIntersectionPrimitiveIndexKHR";
-    case Op::OpRayQueryGetIntersectionBarycentricsKHR: return "OpRayQueryGetIntersectionBarycentricsKHR";
-    case Op::OpRayQueryGetIntersectionFrontFaceKHR: return "OpRayQueryGetIntersectionFrontFaceKHR";
-    case Op::OpRayQueryGetIntersectionCandidateAABBOpaqueKHR: return "OpRayQueryGetIntersectionCandidateAABBOpaqueKHR";
-    case Op::OpRayQueryGetIntersectionObjectRayDirectionKHR: return "OpRayQueryGetIntersectionObjectRayDirectionKHR";
-    case Op::OpRayQueryGetIntersectionObjectRayOriginKHR: return "OpRayQueryGetIntersectionObjectRayOriginKHR";
-    case Op::OpRayQueryGetWorldRayDirectionKHR: return "OpRayQueryGetWorldRayDirectionKHR";
-    case Op::OpRayQueryGetWorldRayOriginKHR: return "OpRayQueryGetWorldRayOriginKHR";
-    case Op::OpRayQueryGetIntersectionObjectToWorldKHR: return "OpRayQueryGetIntersectionObjectToWorldKHR";
-    case Op::OpRayQueryGetIntersectionWorldToObjectKHR: return "OpRayQueryGetIntersectionWorldToObjectKHR";
-    case Op::OpAtomicFAddEXT: return "OpAtomicFAddEXT";
-    case Op::OpTypeBufferSurfaceINTEL: return "OpTypeBufferSurfaceINTEL";
-    case Op::OpTypeStructContinuedINTEL: return "OpTypeStructContinuedINTEL";
-    case Op::OpConstantCompositeContinuedINTEL: return "OpConstantCompositeContinuedINTEL";
-    case Op::OpSpecConstantCompositeContinuedINTEL: return "OpSpecConstantCompositeContinuedINTEL";
-    case Op::OpCompositeConstructContinuedINTEL: return "OpCompositeConstructContinuedINTEL";
-    case Op::OpConvertFToBF16INTEL: return "OpConvertFToBF16INTEL";
-    case Op::OpConvertBF16ToFINTEL: return "OpConvertBF16ToFINTEL";
-    case Op::OpControlBarrierArriveINTEL: return "OpControlBarrierArriveINTEL";
-    case Op::OpControlBarrierWaitINTEL: return "OpControlBarrierWaitINTEL";
-    case Op::OpArithmeticFenceEXT: return "OpArithmeticFenceEXT";
-    case Op::OpTaskSequenceCreateALTERA: return "OpTaskSequenceCreateALTERA";
-    case Op::OpTaskSequenceAsyncALTERA: return "OpTaskSequenceAsyncALTERA";
-    case Op::OpTaskSequenceGetALTERA: return "OpTaskSequenceGetALTERA";
-    case Op::OpTaskSequenceReleaseALTERA: return "OpTaskSequenceReleaseALTERA";
-    case Op::OpTypeTaskSequenceALTERA: return "OpTypeTaskSequenceALTERA";
-    case Op::OpSubgroupBlockPrefetchINTEL: return "OpSubgroupBlockPrefetchINTEL";
-    case Op::OpSubgroup2DBlockLoadINTEL: return "OpSubgroup2DBlockLoadINTEL";
-    case Op::OpSubgroup2DBlockLoadTransformINTEL: return "OpSubgroup2DBlockLoadTransformINTEL";
-    case Op::OpSubgroup2DBlockLoadTransposeINTEL: return "OpSubgroup2DBlockLoadTransposeINTEL";
-    case Op::OpSubgroup2DBlockPrefetchINTEL: return "OpSubgroup2DBlockPrefetchINTEL";
-    case Op::OpSubgroup2DBlockStoreINTEL: return "OpSubgroup2DBlockStoreINTEL";
-    case Op::OpSubgroupMatrixMultiplyAccumulateINTEL: return "OpSubgroupMatrixMultiplyAccumulateINTEL";
-    case Op::OpBitwiseFunctionINTEL: return "OpBitwiseFunctionINTEL";
-    case Op::OpUntypedVariableLengthArrayINTEL: return "OpUntypedVariableLengthArrayINTEL";
-    case Op::OpConditionalExtensionINTEL: return "OpConditionalExtensionINTEL";
-    case Op::OpConditionalEntryPointINTEL: return "OpConditionalEntryPointINTEL";
-    case Op::OpConditionalCapabilityINTEL: return "OpConditionalCapabilityINTEL";
-    case Op::OpSpecConstantTargetINTEL: return "OpSpecConstantTargetINTEL";
-    case Op::OpSpecConstantArchitectureINTEL: return "OpSpecConstantArchitectureINTEL";
-    case Op::OpSpecConstantCapabilitiesINTEL: return "OpSpecConstantCapabilitiesINTEL";
-    case Op::OpConditionalCopyObjectINTEL: return "OpConditionalCopyObjectINTEL";
-    case Op::OpGroupIMulKHR: return "OpGroupIMulKHR";
-    case Op::OpGroupFMulKHR: return "OpGroupFMulKHR";
-    case Op::OpGroupBitwiseAndKHR: return "OpGroupBitwiseAndKHR";
-    case Op::OpGroupBitwiseOrKHR: return "OpGroupBitwiseOrKHR";
-    case Op::OpGroupBitwiseXorKHR: return "OpGroupBitwiseXorKHR";
-    case Op::OpGroupLogicalAndKHR: return "OpGroupLogicalAndKHR";
-    case Op::OpGroupLogicalOrKHR: return "OpGroupLogicalOrKHR";
-    case Op::OpGroupLogicalXorKHR: return "OpGroupLogicalXorKHR";
-    case Op::OpRoundFToTF32INTEL: return "OpRoundFToTF32INTEL";
-    case Op::OpMaskedGatherINTEL: return "OpMaskedGatherINTEL";
-    case Op::OpMaskedScatterINTEL: return "OpMaskedScatterINTEL";
-    case Op::OpConvertHandleToImageINTEL: return "OpConvertHandleToImageINTEL";
-    case Op::OpConvertHandleToSamplerINTEL: return "OpConvertHandleToSamplerINTEL";
-    case Op::OpConvertHandleToSampledImageINTEL: return "OpConvertHandleToSampledImageINTEL";
-    default: return "Unknown";
-    }
-}
-
-#endif /* SPV_ENABLE_UTILITY_CODE */
-
-// Overload bitwise operators for mask bit combining
-
-constexpr ImageOperandsMask operator|(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr ImageOperandsMask operator&(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr ImageOperandsMask operator^(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr ImageOperandsMask operator~(ImageOperandsMask a) { return ImageOperandsMask(~unsigned(a)); }
-constexpr FPFastMathModeMask operator|(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) | unsigned(b)); }
-constexpr FPFastMathModeMask operator&(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) & unsigned(b)); }
-constexpr FPFastMathModeMask operator^(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) ^ unsigned(b)); }
-constexpr FPFastMathModeMask operator~(FPFastMathModeMask a) { return FPFastMathModeMask(~unsigned(a)); }
-constexpr SelectionControlMask operator|(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) | unsigned(b)); }
-constexpr SelectionControlMask operator&(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) & unsigned(b)); }
-constexpr SelectionControlMask operator^(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) ^ unsigned(b)); }
-constexpr SelectionControlMask operator~(SelectionControlMask a) { return SelectionControlMask(~unsigned(a)); }
-constexpr LoopControlMask operator|(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) | unsigned(b)); }
-constexpr LoopControlMask operator&(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) & unsigned(b)); }
-constexpr LoopControlMask operator^(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) ^ unsigned(b)); }
-constexpr LoopControlMask operator~(LoopControlMask a) { return LoopControlMask(~unsigned(a)); }
-constexpr FunctionControlMask operator|(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) | unsigned(b)); }
-constexpr FunctionControlMask operator&(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) & unsigned(b)); }
-constexpr FunctionControlMask operator^(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) ^ unsigned(b)); }
-constexpr FunctionControlMask operator~(FunctionControlMask a) { return FunctionControlMask(~unsigned(a)); }
-constexpr MemorySemanticsMask operator|(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) | unsigned(b)); }
-constexpr MemorySemanticsMask operator&(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) & unsigned(b)); }
-constexpr MemorySemanticsMask operator^(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) ^ unsigned(b)); }
-constexpr MemorySemanticsMask operator~(MemorySemanticsMask a) { return MemorySemanticsMask(~unsigned(a)); }
-constexpr MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
-constexpr MemoryAccessMask operator&(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) & unsigned(b)); }
-constexpr MemoryAccessMask operator^(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) ^ unsigned(b)); }
-constexpr MemoryAccessMask operator~(MemoryAccessMask a) { return MemoryAccessMask(~unsigned(a)); }
-constexpr KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
-constexpr KernelProfilingInfoMask operator&(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) & unsigned(b)); }
-constexpr KernelProfilingInfoMask operator^(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) ^ unsigned(b)); }
-constexpr KernelProfilingInfoMask operator~(KernelProfilingInfoMask a) { return KernelProfilingInfoMask(~unsigned(a)); }
-constexpr RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
-constexpr RayFlagsMask operator&(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) & unsigned(b)); }
-constexpr RayFlagsMask operator^(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) ^ unsigned(b)); }
-constexpr RayFlagsMask operator~(RayFlagsMask a) { return RayFlagsMask(~unsigned(a)); }
-constexpr FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
-constexpr FragmentShadingRateMask operator&(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) & unsigned(b)); }
-constexpr FragmentShadingRateMask operator^(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) ^ unsigned(b)); }
-constexpr FragmentShadingRateMask operator~(FragmentShadingRateMask a) { return FragmentShadingRateMask(~unsigned(a)); }
-constexpr CooperativeMatrixOperandsMask operator|(CooperativeMatrixOperandsMask a, CooperativeMatrixOperandsMask b) { return CooperativeMatrixOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr CooperativeMatrixOperandsMask operator&(CooperativeMatrixOperandsMask a, CooperativeMatrixOperandsMask b) { return CooperativeMatrixOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr CooperativeMatrixOperandsMask operator^(CooperativeMatrixOperandsMask a, CooperativeMatrixOperandsMask b) { return CooperativeMatrixOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr CooperativeMatrixOperandsMask operator~(CooperativeMatrixOperandsMask a) { return CooperativeMatrixOperandsMask(~unsigned(a)); }
-constexpr CooperativeMatrixReduceMask operator|(CooperativeMatrixReduceMask a, CooperativeMatrixReduceMask b) { return CooperativeMatrixReduceMask(unsigned(a) | unsigned(b)); }
-constexpr CooperativeMatrixReduceMask operator&(CooperativeMatrixReduceMask a, CooperativeMatrixReduceMask b) { return CooperativeMatrixReduceMask(unsigned(a) & unsigned(b)); }
-constexpr CooperativeMatrixReduceMask operator^(CooperativeMatrixReduceMask a, CooperativeMatrixReduceMask b) { return CooperativeMatrixReduceMask(unsigned(a) ^ unsigned(b)); }
-constexpr CooperativeMatrixReduceMask operator~(CooperativeMatrixReduceMask a) { return CooperativeMatrixReduceMask(~unsigned(a)); }
-constexpr TensorAddressingOperandsMask operator|(TensorAddressingOperandsMask a, TensorAddressingOperandsMask b) { return TensorAddressingOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr TensorAddressingOperandsMask operator&(TensorAddressingOperandsMask a, TensorAddressingOperandsMask b) { return TensorAddressingOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr TensorAddressingOperandsMask operator^(TensorAddressingOperandsMask a, TensorAddressingOperandsMask b) { return TensorAddressingOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr TensorAddressingOperandsMask operator~(TensorAddressingOperandsMask a) { return TensorAddressingOperandsMask(~unsigned(a)); }
-constexpr TensorOperandsMask operator|(TensorOperandsMask a, TensorOperandsMask b) { return TensorOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr TensorOperandsMask operator&(TensorOperandsMask a, TensorOperandsMask b) { return TensorOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr TensorOperandsMask operator^(TensorOperandsMask a, TensorOperandsMask b) { return TensorOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr TensorOperandsMask operator~(TensorOperandsMask a) { return TensorOperandsMask(~unsigned(a)); }
-constexpr MatrixMultiplyAccumulateOperandsMask operator|(MatrixMultiplyAccumulateOperandsMask a, MatrixMultiplyAccumulateOperandsMask b) { return MatrixMultiplyAccumulateOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr MatrixMultiplyAccumulateOperandsMask operator&(MatrixMultiplyAccumulateOperandsMask a, MatrixMultiplyAccumulateOperandsMask b) { return MatrixMultiplyAccumulateOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr MatrixMultiplyAccumulateOperandsMask operator^(MatrixMultiplyAccumulateOperandsMask a, MatrixMultiplyAccumulateOperandsMask b) { return MatrixMultiplyAccumulateOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr MatrixMultiplyAccumulateOperandsMask operator~(MatrixMultiplyAccumulateOperandsMask a) { return MatrixMultiplyAccumulateOperandsMask(~unsigned(a)); }
-constexpr RawAccessChainOperandsMask operator|(RawAccessChainOperandsMask a, RawAccessChainOperandsMask b) { return RawAccessChainOperandsMask(unsigned(a) | unsigned(b)); }
-constexpr RawAccessChainOperandsMask operator&(RawAccessChainOperandsMask a, RawAccessChainOperandsMask b) { return RawAccessChainOperandsMask(unsigned(a) & unsigned(b)); }
-constexpr RawAccessChainOperandsMask operator^(RawAccessChainOperandsMask a, RawAccessChainOperandsMask b) { return RawAccessChainOperandsMask(unsigned(a) ^ unsigned(b)); }
-constexpr RawAccessChainOperandsMask operator~(RawAccessChainOperandsMask a) { return RawAccessChainOperandsMask(~unsigned(a)); }
-
-}  // end namespace spv
-
-#endif  // #ifndef spirv_HPP
-
diff --git a/engine/thirdparty/spirv-reflect/patches/0001-specialization-constants.patch b/engine/thirdparty/spirv-reflect/patches/0001-specialization-constants.patch
new file mode 100644
index 00000000..e8003e8d
--- /dev/null
+++ b/engine/thirdparty/spirv-reflect/patches/0001-specialization-constants.patch
@@ -0,0 +1,102 @@
+diff --git a/thirdparty/spirv-reflect/spirv_reflect.c b/thirdparty/spirv-reflect/spirv_reflect.c
+index b4f6bc17c2..ba64a3f54d 100644
+--- a/thirdparty/spirv-reflect/spirv_reflect.c
++++ b/thirdparty/spirv-reflect/spirv_reflect.c
+@@ -1571,6 +1571,8 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser, SpvRefle
+       } break;
+ 
+       case SpvDecorationSpecId: {
++        uint32_t word_offset = p_node->word_offset + member_offset+ 3;
++        CHECKED_READU32(p_parser, word_offset, p_target_decorations->spec_id);
+         spec_constant_count++;
+       } break;
+ 
+@@ -1692,21 +1694,43 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser, SpvRefle
+   }
+   for (uint32_t i = 0; i < p_parser->node_count; ++i) {
+     SpvReflectPrvNode* p_node = &(p_parser->nodes[i]);
+-    if (p_node->op == SpvOpDecorate) {
+-      uint32_t decoration = (uint32_t)INVALID_VALUE;
+-      CHECKED_READU32(p_parser, p_node->word_offset + 2, decoration);
+-      if (decoration == SpvDecorationSpecId) {
+-        const uint32_t count = p_module->spec_constant_count;
+-        CHECKED_READU32(p_parser, p_node->word_offset + 1, p_module->spec_constants[count].spirv_id);
+-        CHECKED_READU32(p_parser, p_node->word_offset + 3, p_module->spec_constants[count].constant_id);
+-        // If being used for a OpSpecConstantComposite (ex. LocalSizeId), there won't be a name
+-        SpvReflectPrvNode* target_node = FindNode(p_parser, p_module->spec_constants[count].spirv_id);
+-        if (IsNotNull(target_node)) {
+-          p_module->spec_constants[count].name = target_node->name;
++    const uint32_t count = p_module->spec_constant_count;
++    switch(p_node->op) {
++      default: continue;
++      case SpvOpSpecConstantTrue: {
++        p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL;
++        p_module->spec_constants[count].default_value.int_bool_value = 1;
++      } break;
++      case SpvOpSpecConstantFalse: {
++        p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL;
++        p_module->spec_constants[count].default_value.int_bool_value = 0;
++      } break;
++      case SpvOpSpecConstant: {
++        SpvReflectResult result = SPV_REFLECT_RESULT_SUCCESS;
++        uint32_t element_type_id = (uint32_t)INVALID_VALUE;
++        uint32_t default_value = 0;
++        CHECKED_READU32(p_parser, p_node->word_offset + 1, element_type_id);
++        CHECKED_READU32(p_parser, p_node->word_offset + 3, default_value);
++
++        SpvReflectPrvNode* p_next_node = FindNode(p_parser, element_type_id);
++
++        if (p_next_node->op == SpvOpTypeInt) {
++          p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_INT;
++        } else if (p_next_node->op == SpvOpTypeFloat) {
++          p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT;
++        } else {
++          return SPV_REFLECT_RESULT_ERROR_PARSE_FAILED;
+         }
+-        p_module->spec_constant_count++;
+-      }
++
++        p_module->spec_constants[count].default_value.int_bool_value = default_value; //bits are the same for int and float
++      } break;
+     }
++
++    p_module->spec_constants[count].name = p_node->name;
++    p_module->spec_constants[count].constant_id = p_node->decorations.spec_id;
++    p_module->spec_constants[count].spirv_id = p_node->result_id;
++
++    p_module->spec_constant_count++;
+   }
+ 
+   return SPV_REFLECT_RESULT_SUCCESS;
+diff --git a/thirdparty/spirv-reflect/spirv_reflect.h b/thirdparty/spirv-reflect/spirv_reflect.h
+index 9a42f14eed..cf8cfe2183 100644
+--- a/thirdparty/spirv-reflect/spirv_reflect.h
++++ b/thirdparty/spirv-reflect/spirv_reflect.h
+@@ -568,6 +568,15 @@ typedef struct SpvReflectCapability {
+ } SpvReflectCapability;
+ 
+ 
++/*! @enum SpvReflectSpecializationConstantType
++
++*/
++typedef enum SpvReflectSpecializationConstantType {
++  SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL = 0,
++  SPV_REFLECT_SPECIALIZATION_CONSTANT_INT = 1,
++  SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT = 2,
++} SpvReflectSpecializationConstantType;
++
+ /*! @struct SpvReflectSpecId
+ 
+ */
+@@ -575,6 +584,11 @@ typedef struct SpvReflectSpecializationConstant {
+   uint32_t spirv_id;
+   uint32_t constant_id;
+   const char* name;
++  SpvReflectSpecializationConstantType constant_type;
++  union {
++    float float_value;
++    uint32_t int_bool_value;
++  } default_value;
+ } SpvReflectSpecializationConstant;
+ 
+ /*! @struct SpvReflectShaderModule
diff --git a/engine/thirdparty/spirv-reflect/patches/0001-zero-size-for-sc-sized-arrays.patch b/engine/thirdparty/spirv-reflect/patches/0002-zero-size-for-sc-sized-arrays.patch
similarity index 93%
rename from engine/thirdparty/spirv-reflect/patches/0001-zero-size-for-sc-sized-arrays.patch
rename to engine/thirdparty/spirv-reflect/patches/0002-zero-size-for-sc-sized-arrays.patch
index ed1d08bc..b12642cd 100644
--- a/engine/thirdparty/spirv-reflect/patches/0001-zero-size-for-sc-sized-arrays.patch
+++ b/engine/thirdparty/spirv-reflect/patches/0002-zero-size-for-sc-sized-arrays.patch
@@ -2,7 +2,7 @@ diff --git a/thirdparty/spirv-reflect/spirv_reflect.c b/thirdparty/spirv-reflect
 index ba64a3f54d..599667be26 100644
 --- a/thirdparty/spirv-reflect/spirv_reflect.c
 +++ b/thirdparty/spirv-reflect/spirv_reflect.c
-@@ -2686,6 +2686,11 @@ static SpvReflectResult ParseDescriptorBlockVariableSizes(SpvReflectPrvParser* p
+@@ -2688,6 +2688,11 @@ static SpvReflectResult ParseDescriptorBlockVariableSizes(SpvReflectPrvParser* p
          // ...then array
          uint32_t element_count = (p_member_var->array.dims_count > 0 ? 1 : 0);
          for (uint32_t i = 0; i < p_member_var->array.dims_count; ++i) {
diff --git a/engine/thirdparty/spirv-reflect/patches/0002-spirv-headers.patch b/engine/thirdparty/spirv-reflect/patches/0003-spirv-headers.patch
similarity index 100%
rename from engine/thirdparty/spirv-reflect/patches/0002-spirv-headers.patch
rename to engine/thirdparty/spirv-reflect/patches/0003-spirv-headers.patch
diff --git a/engine/thirdparty/spirv-reflect/spirv_reflect.c b/engine/thirdparty/spirv-reflect/spirv_reflect.c
index cca1f68f..599667be 100644
--- a/engine/thirdparty/spirv-reflect/spirv_reflect.c
+++ b/engine/thirdparty/spirv-reflect/spirv_reflect.c
@@ -42,13 +42,12 @@
 
 // clang-format off
 enum {
-  SPIRV_STARTING_WORD_INDEX           = 5,
-  SPIRV_WORD_SIZE                     = sizeof(uint32_t),
-  SPIRV_BYTE_WIDTH                    = 8,
-  SPIRV_MINIMUM_FILE_SIZE             = SPIRV_STARTING_WORD_INDEX * SPIRV_WORD_SIZE,
-  SPIRV_DATA_ALIGNMENT                = 4 * SPIRV_WORD_SIZE, // 16
-  SPIRV_ACCESS_CHAIN_INDEX_OFFSET     = 4,
-  SPIRV_PHYSICAL_STORAGE_POINTER_SIZE = 8, // Pointers are defined as 64-bit
+  SPIRV_STARTING_WORD_INDEX       = 5,
+  SPIRV_WORD_SIZE                 = sizeof(uint32_t),
+  SPIRV_BYTE_WIDTH                = 8,
+  SPIRV_MINIMUM_FILE_SIZE         = SPIRV_STARTING_WORD_INDEX * SPIRV_WORD_SIZE,
+  SPIRV_DATA_ALIGNMENT            = 4 * SPIRV_WORD_SIZE, // 16
+  SPIRV_ACCESS_CHAIN_INDEX_OFFSET = 4,
 };
 
 enum {
@@ -161,14 +160,10 @@ typedef struct SpvReflectPrvAccessedVariable {
   SpvReflectPrvNode*     p_node;
   uint32_t               result_id;
   uint32_t               variable_ptr;
-  uint32_t               function_id;
-  uint32_t               function_parameter_index;
 } SpvReflectPrvAccessedVariable;
 
 typedef struct SpvReflectPrvFunction {
   uint32_t                        id;
-  uint32_t                        parameter_count;
-  uint32_t*                       parameters;
   uint32_t                        callee_count;
   uint32_t*                       callees;
   struct SpvReflectPrvFunction**  callee_ptrs;
@@ -225,7 +220,6 @@ typedef struct SpvReflectPrvParser {
   uint32_t                        type_count;
   uint32_t                        descriptor_count;
   uint32_t                        push_constant_count;
-  uint32_t                        spec_constant_count;
 
   SpvReflectTypeDescription*      physical_pointer_check[MAX_RECURSIVE_PHYSICAL_POINTER_CHECK];
   uint32_t                        physical_pointer_count;
@@ -648,7 +642,6 @@ static void DestroyParser(SpvReflectPrvParser* p_parser) {
 
     // Free functions
     for (size_t i = 0; i < p_parser->function_count; ++i) {
-      SafeFree(p_parser->functions[i].parameters);
       SafeFree(p_parser->functions[i].callees);
       SafeFree(p_parser->functions[i].callee_ptrs);
       SafeFree(p_parser->functions[i].accessed_variables);
@@ -688,7 +681,7 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser) {
     if (node_word_count == 0) {
       return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_INSTRUCTION;
     }
-    if (op == SpvOpAccessChain || op == SpvOpInBoundsAccessChain) {
+    if (op == SpvOpAccessChain) {
       ++(p_parser->access_chain_count);
     }
     spirv_word_index += node_word_count;
@@ -846,7 +839,6 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser) {
       case SpvOpTypeAccelerationStructureKHR:
       case SpvOpTypeRayQueryKHR:
       case SpvOpTypeHitObjectNV:
-      case SpvOpTypeCooperativeVectorNV:
       case SpvOpTypeCooperativeMatrixNV:
       case SpvOpTypeCooperativeMatrixKHR: {
         CHECKED_READU32(p_parser, p_node->word_offset + 1, p_node->result_id);
@@ -936,8 +928,7 @@ static SpvReflectResult ParseNodes(SpvReflectPrvParser* p_parser) {
         CHECKED_READU32(p_parser, p_node->word_offset + 2, p_node->result_id);
       } break;
 
-      case SpvOpAccessChain:
-      case SpvOpInBoundsAccessChain: {
+      case SpvOpAccessChain: {
         SpvReflectPrvAccessChain* p_access_chain = &(p_parser->access_chains[access_chain_index]);
         CHECKED_READU32(p_parser, p_node->word_offset + 1, p_access_chain->result_type_id);
         CHECKED_READU32(p_parser, p_node->word_offset + 2, p_access_chain->result_id);
@@ -1104,7 +1095,6 @@ static SpvReflectResult ParseFunction(SpvReflectPrvParser* p_parser, SpvReflectP
                                       size_t first_label_index) {
   p_func->id = p_func_node->result_id;
 
-  p_func->parameter_count = 0;
   p_func->callee_count = 0;
   p_func->accessed_variable_count = 0;
 
@@ -1115,11 +1105,7 @@ static SpvReflectResult ParseFunction(SpvReflectPrvParser* p_parser, SpvReflectP
       break;
     }
     switch (p_node->op) {
-      case SpvOpFunctionParameter: {
-        ++(p_func->parameter_count);
-      } break;
       case SpvOpFunctionCall: {
-        p_func->accessed_variable_count += p_node->word_count - 4;
         ++(p_func->callee_count);
       } break;
       case SpvOpLoad:
@@ -1142,13 +1128,6 @@ static SpvReflectResult ParseFunction(SpvReflectPrvParser* p_parser, SpvReflectP
     }
   }
 
-  if (p_func->parameter_count > 0) {
-    p_func->parameters = (uint32_t*)calloc(p_func->parameter_count, sizeof(*(p_func->parameters)));
-    if (IsNull(p_func->parameters)) {
-      return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
-    }
-  }
-
   if (p_func->callee_count > 0) {
     p_func->callees = (uint32_t*)calloc(p_func->callee_count, sizeof(*(p_func->callees)));
     if (IsNull(p_func->callees)) {
@@ -1164,7 +1143,6 @@ static SpvReflectResult ParseFunction(SpvReflectPrvParser* p_parser, SpvReflectP
     }
   }
 
-  p_func->parameter_count = 0;
   p_func->callee_count = 0;
   p_func->accessed_variable_count = 0;
   // Now have allocation, fill in values
@@ -1174,25 +1152,8 @@ static SpvReflectResult ParseFunction(SpvReflectPrvParser* p_parser, SpvReflectP
       break;
     }
     switch (p_node->op) {
-      case SpvOpFunctionParameter: {
-        CHECKED_READU32(p_parser, p_node->word_offset + 2, p_func->parameters[p_func->parameter_count]);
-        (++p_func->parameter_count);
-      } break;
       case SpvOpFunctionCall: {
         CHECKED_READU32(p_parser, p_node->word_offset + 3, p_func->callees[p_func->callee_count]);
-        const uint32_t result_index = p_node->word_offset + 2;
-        for (uint32_t j = 0, parameter_count = p_node->word_count - 4; j < parameter_count; j++) {
-          const uint32_t ptr_index = p_node->word_offset + 4 + j;
-          SpvReflectPrvAccessedVariable* access_ptr = &p_func->accessed_variables[p_func->accessed_variable_count];
-
-          access_ptr->p_node = p_node;
-          // Need to track Result ID as not sure there has been any memory access through here yet
-          CHECKED_READU32(p_parser, result_index, access_ptr->result_id);
-          CHECKED_READU32(p_parser, ptr_index, access_ptr->variable_ptr);
-          access_ptr->function_id = p_func->callees[p_func->callee_count];
-          access_ptr->function_parameter_index = j;
-          (++p_func->accessed_variable_count);
-        }
         (++p_func->callee_count);
       } break;
       case SpvOpLoad:
@@ -1277,12 +1238,14 @@ static SpvReflectResult ParseFunctions(SpvReflectPrvParser* p_parser) {
 
       // Skip over function declarations that aren't definitions
       bool func_definition = false;
-      for (size_t j = i; j < p_parser->node_count; ++j) {
-        if (p_parser->nodes[j].op == SpvOpLabel) {
+      // Intentionally reuse i to avoid iterating over these nodes more than
+      // once
+      for (; i < p_parser->node_count; ++i) {
+        if (p_parser->nodes[i].op == SpvOpLabel) {
           func_definition = true;
           break;
         }
-        if (p_parser->nodes[j].op == SpvOpFunctionEnd) {
+        if (p_parser->nodes[i].op == SpvOpFunctionEnd) {
           break;
         }
       }
@@ -1421,7 +1384,7 @@ static bool UserTypeMatches(const char* user_type, const char* pattern) {
   return false;
 }
 
-static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser) {
+static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser, SpvReflectShaderModule* p_module) {
   uint32_t spec_constant_count = 0;
   for (uint32_t i = 0; i < p_parser->node_count; ++i) {
     SpvReflectPrvNode* p_node = &(p_parser->nodes[i]);
@@ -1608,7 +1571,7 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser) {
       } break;
 
       case SpvDecorationSpecId: {
-        uint32_t word_offset = p_node->word_offset + member_offset + 3;
+        uint32_t word_offset = p_node->word_offset + member_offset+ 3;
         CHECKED_READU32(p_parser, word_offset, p_target_decorations->spec_id);
         spec_constant_count++;
       } break;
@@ -1723,7 +1686,53 @@ static SpvReflectResult ParseDecorations(SpvReflectPrvParser* p_parser) {
     }
   }
 
-  p_parser->spec_constant_count = spec_constant_count;
+  if (spec_constant_count > 0) {
+    p_module->spec_constants = (SpvReflectSpecializationConstant*)calloc(spec_constant_count, sizeof(*p_module->spec_constants));
+    if (IsNull(p_module->spec_constants)) {
+      return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
+    }
+  }
+  for (uint32_t i = 0; i < p_parser->node_count; ++i) {
+    SpvReflectPrvNode* p_node = &(p_parser->nodes[i]);
+    const uint32_t count = p_module->spec_constant_count;
+    switch(p_node->op) {
+      default: continue;
+      case SpvOpSpecConstantTrue: {
+        p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL;
+        p_module->spec_constants[count].default_value.int_bool_value = 1;
+      } break;
+      case SpvOpSpecConstantFalse: {
+        p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL;
+        p_module->spec_constants[count].default_value.int_bool_value = 0;
+      } break;
+      case SpvOpSpecConstant: {
+        SpvReflectResult result = SPV_REFLECT_RESULT_SUCCESS;
+        uint32_t element_type_id = (uint32_t)INVALID_VALUE;
+        uint32_t default_value = 0;
+        CHECKED_READU32(p_parser, p_node->word_offset + 1, element_type_id);
+        CHECKED_READU32(p_parser, p_node->word_offset + 3, default_value);
+
+        SpvReflectPrvNode* p_next_node = FindNode(p_parser, element_type_id);
+
+        if (p_next_node->op == SpvOpTypeInt) {
+          p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_INT;
+        } else if (p_next_node->op == SpvOpTypeFloat) {
+          p_module->spec_constants[count].constant_type = SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT;
+        } else {
+          return SPV_REFLECT_RESULT_ERROR_PARSE_FAILED;
+        }
+
+        p_module->spec_constants[count].default_value.int_bool_value = default_value; //bits are the same for int and float
+      } break;
+    }
+
+    p_module->spec_constants[count].name = p_node->name;
+    p_module->spec_constants[count].constant_id = p_node->decorations.spec_id;
+    p_module->spec_constants[count].spirv_id = p_node->result_id;
+
+    p_module->spec_constant_count++;
+  }
+
   return SPV_REFLECT_RESULT_SUCCESS;
 }
 
@@ -1968,13 +1977,6 @@ static SpvReflectResult ParseType(SpvReflectPrvParser* p_parser, SpvReflectPrvNo
         p_type->type_flags |= SPV_REFLECT_TYPE_FLAG_REF;
         IF_READU32_CAST(result, p_parser, p_node->word_offset + 2, SpvStorageClass, p_type->storage_class);
 
-        SpvReflectPrvNode* p_next_node = FindNode(p_parser, p_node->type_id);
-        if (IsNull(p_next_node)) {
-          result = SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
-          SPV_REFLECT_ASSERT(false);
-          break;
-        }
-
         bool found_recursion = false;
         if (p_type->storage_class == SpvStorageClassPhysicalStorageBuffer) {
           // Need to make sure we haven't started an infinite recursive loop
@@ -1986,7 +1988,7 @@ static SpvReflectResult ParseType(SpvReflectPrvParser* p_parser, SpvReflectPrvNo
               return SPV_REFLECT_RESULT_SUCCESS;
             }
           }
-          if (!found_recursion && p_next_node->op == SpvOpTypeStruct) {
+          if (!found_recursion) {
             p_parser->physical_pointer_struct_count++;
             p_parser->physical_pointer_check[p_parser->physical_pointer_count] = p_type;
             p_parser->physical_pointer_count++;
@@ -1996,7 +1998,12 @@ static SpvReflectResult ParseType(SpvReflectPrvParser* p_parser, SpvReflectPrvNo
           }
         }
 
-        if (!found_recursion) {
+        // Parse type
+        SpvReflectPrvNode* p_next_node = FindNode(p_parser, p_node->type_id);
+        if (IsNull(p_next_node)) {
+          result = SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
+          SPV_REFLECT_ASSERT(false);
+        } else if (!found_recursion) {
           if (p_next_node->op == SpvOpTypeStruct) {
             p_type->struct_type_description = FindType(p_module, p_next_node->result_id);
           }
@@ -2172,8 +2179,7 @@ static SpvReflectResult ParseDescriptorBindings(SpvReflectPrvParser* p_parser, S
     // from the pointer so that we can use it to deduce deescriptor types.
     SpvStorageClass pointer_storage_class = SpvStorageClassMax;
     if (p_type->op == SpvOpTypePointer) {
-      assert(p_type->storage_class != -1 && "Pointer types must have a valid storage class.");
-      pointer_storage_class = (SpvStorageClass)p_type->storage_class;
+      pointer_storage_class = p_type->storage_class;
       // Find the type's node
       SpvReflectPrvNode* p_type_node = FindNode(p_parser, p_type->id);
       if (IsNull(p_type_node)) {
@@ -2509,7 +2515,7 @@ static SpvReflectResult ParseDescriptorBlockVariable(SpvReflectPrvParser* p_pars
         p_member_ptr_type = p_member_type;
 
         // strip array
-        if (p_member_type->op == SpvOpTypeArray || p_member_type->op == SpvOpTypeRuntimeArray) {
+        if (p_member_type->op == SpvOpTypeArray) {
           SpvReflectPrvNode* p_node = FindNode(p_parser, p_member_type->id);
           if (p_node == NULL) {
             return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
@@ -2529,19 +2535,15 @@ static SpvReflectResult ParseDescriptorBlockVariable(SpvReflectPrvParser* p_pars
           }
         }
         if (!found_recursion) {
-          SpvReflectTypeDescription* struct_type = FindType(p_module, p_member_type->id);
-          // could be pointer directly to non-struct type here
-          if (struct_type->struct_type_description) {
-            uint32_t struct_id = struct_type->struct_type_description->id;
-            p_parser->physical_pointer_structs[p_parser->physical_pointer_struct_count].struct_id = struct_id;
-            p_parser->physical_pointer_structs[p_parser->physical_pointer_struct_count].p_var = p_member_var;
-            p_parser->physical_pointer_struct_count++;
+          uint32_t struct_id = FindType(p_module, p_member_type->id)->struct_type_description->id;
+          p_parser->physical_pointer_structs[p_parser->physical_pointer_struct_count].struct_id = struct_id;
+          p_parser->physical_pointer_structs[p_parser->physical_pointer_struct_count].p_var = p_member_var;
+          p_parser->physical_pointer_struct_count++;
 
-            p_parser->physical_pointer_check[p_parser->physical_pointer_count] = p_member_type;
-            p_parser->physical_pointer_count++;
-            if (p_parser->physical_pointer_count >= MAX_RECURSIVE_PHYSICAL_POINTER_CHECK) {
-              return SPV_REFLECT_RESULT_ERROR_SPIRV_MAX_RECURSIVE_EXCEEDED;
-            }
+          p_parser->physical_pointer_check[p_parser->physical_pointer_count] = p_member_type;
+          p_parser->physical_pointer_count++;
+          if (p_parser->physical_pointer_count >= MAX_RECURSIVE_PHYSICAL_POINTER_CHECK) {
+            return SPV_REFLECT_RESULT_ERROR_SPIRV_MAX_RECURSIVE_EXCEEDED;
           }
         }
 
@@ -2717,13 +2719,7 @@ static SpvReflectResult ParseDescriptorBlockVariableSizes(SpvReflectPrvParser* p
         if (IsNull(p_member_type)) {
           return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
         }
-
-        // If we found a struct, we need to fall through and get the size of it or else we grab the size here
-        if (p_member_type->op != SpvOpTypeStruct) {
-          // If we hit this, we are seeing a POD pointer and the size is fixed
-          p_member_var->size = SPIRV_PHYSICAL_STORAGE_POINTER_SIZE;
-          break;
-        }
+        assert(p_member_type->op == SpvOpTypeStruct);
         FALLTHROUGH;
       }
 
@@ -2815,11 +2811,19 @@ static void MarkSelfAndAllMemberVarsAsUsed(SpvReflectBlockVariable* p_var) {
   p_var->flags &= ~SPV_REFLECT_VARIABLE_FLAGS_UNUSED;
 
   SpvOp op_type = p_var->type_description->op;
-  if (op_type == SpvOpTypeStruct) {
-    for (uint32_t i = 0; i < p_var->member_count; ++i) {
-      SpvReflectBlockVariable* p_member_var = &p_var->members[i];
-      MarkSelfAndAllMemberVarsAsUsed(p_member_var);
-    }
+  switch (op_type) {
+    default:
+      break;
+
+    case SpvOpTypeArray: {
+    } break;
+
+    case SpvOpTypeStruct: {
+      for (uint32_t i = 0; i < p_var->member_count; ++i) {
+        SpvReflectBlockVariable* p_member_var = &p_var->members[i];
+        MarkSelfAndAllMemberVarsAsUsed(p_member_var);
+      }
+    } break;
   }
 }
 
@@ -2936,10 +2940,7 @@ static SpvReflectResult ParseDescriptorBlockVariableUsage(SpvReflectPrvParser* p
         if (result != SPV_REFLECT_RESULT_SUCCESS) {
           return result;
         }
-      } else if (is_pointer_to_pointer) {
-        // Clear UNUSED flag, but only for the pointer
-        p_member_var->flags &= ~SPV_REFLECT_VARIABLE_FLAGS_UNUSED;
-      } else {
+      } else if (!is_pointer_to_pointer) {
         // Clear UNUSED flag for remaining variables
         MarkSelfAndAllMemberVarsAsUsed(p_member_var);
       }
@@ -3377,7 +3378,7 @@ static uint32_t GetUint32Constant(SpvReflectPrvParser* p_parser, uint32_t id) {
 }
 
 static bool HasByteAddressBufferOffset(SpvReflectPrvNode* p_node, SpvReflectDescriptorBinding* p_binding) {
-  return IsNotNull(p_node) && IsNotNull(p_binding) && (p_node->op == SpvOpAccessChain || p_node->op == SpvOpInBoundsAccessChain) && p_node->word_count == 6 &&
+  return IsNotNull(p_node) && IsNotNull(p_binding) && p_node->op == SpvOpAccessChain && p_node->word_count == 6 &&
          (p_binding->user_type == SPV_REFLECT_USER_TYPE_BYTE_ADDRESS_BUFFER ||
           p_binding->user_type == SPV_REFLECT_USER_TYPE_RW_BYTE_ADDRESS_BUFFER);
 }
@@ -3467,44 +3468,6 @@ static SpvReflectResult ParseByteAddressBuffer(SpvReflectPrvParser* p_parser, Sp
   return SPV_REFLECT_RESULT_SUCCESS;
 }
 
-static SpvReflectResult ParseFunctionParameterAccess(SpvReflectPrvParser* p_parser, uint32_t callee_function_id,
-                                                     uint32_t function_parameter_index, uint32_t* p_accessed) {
-  SpvReflectPrvFunction* p_func = NULL;
-  for (size_t i = 0; i < p_parser->function_count; ++i) {
-    if (p_parser->functions[i].id == callee_function_id) {
-      p_func = &(p_parser->functions[i]);
-      break;
-    }
-  }
-  if (p_func == NULL) {
-    return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
-  }
-
-  assert(function_parameter_index < p_func->parameter_count);
-
-  for (size_t i = 0; i < p_func->accessed_variable_count; ++i) {
-    if (p_func->parameters[function_parameter_index] == p_func->accessed_variables[i].variable_ptr) {
-      SpvReflectPrvAccessedVariable* p_var = &p_func->accessed_variables[i];
-      if (p_var->function_id > 0) {
-        SpvReflectResult result =
-            ParseFunctionParameterAccess(p_parser, p_var->function_id, p_var->function_parameter_index, p_accessed);
-        if (result != SPV_REFLECT_RESULT_SUCCESS) {
-          return result;
-        }
-      } else {
-        *p_accessed = 1;
-      }
-      // Early out as soon as p_accessed is true
-      if (*p_accessed) {
-        return SPV_REFLECT_RESULT_SUCCESS;
-      }
-    }
-  }
-
-  *p_accessed = 0;
-  return SPV_REFLECT_RESULT_SUCCESS;
-}
-
 static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_parser, SpvReflectShaderModule* p_module,
                                                      SpvReflectEntryPoint* p_entry, size_t uniform_count, uint32_t* uniforms,
                                                      size_t push_constant_count, uint32_t* push_constants) {
@@ -3555,22 +3518,14 @@ static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_pars
     }
     used_acessed_count += p_parser->functions[j].accessed_variable_count;
   }
-
-  // If there are no used accessed, this is something like an empty function/early return
-  // Basically there is going to be nothing to reflect, but everything after this expects |p_used_accesses| to be allocated with
-  // real memory, see https://github.com/KhronosGroup/SPIRV-Reflect/issues/319
-  if (used_acessed_count == 0) {
-    SafeFree(p_called_functions);
-    return SPV_REFLECT_RESULT_SUCCESS;
+  SpvReflectPrvAccessedVariable* p_used_accesses = NULL;
+  if (used_acessed_count > 0) {
+    p_used_accesses = (SpvReflectPrvAccessedVariable*)calloc(used_acessed_count, sizeof(SpvReflectPrvAccessedVariable));
+    if (IsNull(p_used_accesses)) {
+      SafeFree(p_called_functions);
+      return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
+    }
   }
-
-  SpvReflectPrvAccessedVariable* p_used_accesses =
-      (SpvReflectPrvAccessedVariable*)calloc(used_acessed_count, sizeof(SpvReflectPrvAccessedVariable));
-  if (IsNull(p_used_accesses)) {
-    SafeFree(p_called_functions);
-    return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
-  }
-
   used_acessed_count = 0;
   for (size_t i = 0, j = 0; i < called_function_count; ++i) {
     while (p_parser->functions[j].id != p_called_functions[i]) {
@@ -3609,18 +3564,8 @@ static SpvReflectResult ParseStaticallyUsedResources(SpvReflectPrvParser* p_pars
     uint32_t byte_address_buffer_offset_count = 0;
 
     for (uint32_t j = 0; j < used_acessed_count; j++) {
-      SpvReflectPrvAccessedVariable* p_var = &p_used_accesses[j];
-      if (p_var->variable_ptr == p_binding->spirv_id) {
-        if (p_var->function_id > 0) {
-          result =
-              ParseFunctionParameterAccess(p_parser, p_var->function_id, p_var->function_parameter_index, &p_binding->accessed);
-          if (result != SPV_REFLECT_RESULT_SUCCESS) {
-            SafeFree(p_used_accesses);
-            return result;
-          }
-        } else {
-          p_binding->accessed = 1;
-        }
+      if (p_used_accesses[j].variable_ptr == p_binding->spirv_id) {
+        p_binding->accessed = 1;
 
         if (HasByteAddressBufferOffset(p_used_accesses[j].p_node, p_binding)) {
           byte_address_buffer_offset_count++;
@@ -4018,7 +3963,7 @@ static SpvReflectResult ParsePushConstantBlocks(SpvReflectPrvParser* p_parser, S
     }
 
     p_push_constant->name = p_node->name;
-    result = ParseDescriptorBlockVariableSizes(p_parser, p_module, true, false, true, p_push_constant);
+    result = ParseDescriptorBlockVariableSizes(p_parser, p_module, true, false, false, p_push_constant);
     if (result != SPV_REFLECT_RESULT_SUCCESS) {
       return result;
     }
@@ -4037,63 +3982,6 @@ static SpvReflectResult ParsePushConstantBlocks(SpvReflectPrvParser* p_parser, S
   return SPV_REFLECT_RESULT_SUCCESS;
 }
 
-static SpvReflectResult ParseSpecConstants(SpvReflectPrvParser* p_parser, SpvReflectShaderModule* p_module) {
-  if (p_parser->spec_constant_count > 0) {
-    p_module->spec_constants = (SpvReflectSpecializationConstant*)calloc(p_parser->spec_constant_count, sizeof(*p_module->spec_constants));
-    if (IsNull(p_module->spec_constants)) {
-      return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED;
-    }
-  } else {
-    return SPV_REFLECT_RESULT_SUCCESS;
-  }
-  for (uint32_t i = 0; i < p_parser->node_count; ++i) {
-    SpvReflectPrvNode* p_node = &(p_parser->nodes[i]);
-    if (p_node->op == SpvOpDecorate) {
-      uint32_t decoration = (uint32_t)INVALID_VALUE;
-      CHECKED_READU32(p_parser, p_node->word_offset + 2, decoration);
-      if (decoration == SpvDecorationSpecId) {
-        SpvReflectSpecializationConstant* p_spec_constant = &(p_module->spec_constants[p_module->spec_constant_count]);
-        CHECKED_READU32(p_parser, p_node->word_offset + 1, p_spec_constant->spirv_id);
-        CHECKED_READU32(p_parser, p_node->word_offset + 3, p_spec_constant->constant_id);
-        SpvReflectPrvNode* target_node = FindNode(p_parser, p_spec_constant->spirv_id);
-        if (IsNotNull(target_node)) {
-          // If being used for a OpSpecConstantComposite (ex. LocalSizeId), there won't be a name
-          p_spec_constant->name = target_node->name;
-
-          // During external specialization, Boolean values are true if non-zero and false if zero.
-          static uint32_t true_value = 1;
-          static uint32_t false_value = 0;
-          switch (target_node->op) {
-            default:
-              // Unexpected, since Spec states:
-              //   (SpecId) Apply only to a scalar specialization constant
-              SPV_REFLECT_ASSERT(false);
-              return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_INSTRUCTION;
-            case SpvOpSpecConstantTrue:
-              p_spec_constant->default_value_size = sizeof(uint32_t);
-              p_spec_constant->default_value = &true_value;
-              break;
-            case SpvOpSpecConstantFalse:
-              p_spec_constant->default_value_size = sizeof(uint32_t);
-              p_spec_constant->default_value = &false_value;
-              break;
-            case SpvOpSpecConstant:
-              p_spec_constant->default_value_size = (target_node->word_count - 3) * sizeof(uint32_t);
-              p_spec_constant->default_value = p_parser->spirv_code + target_node->word_offset + 3;
-              break;
-          }
-          p_spec_constant->type_description = FindType(p_module, target_node->result_type_id);
-        } else {
-          // Decoration target not found
-          return SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ID_REFERENCE;
-        }
-        p_module->spec_constant_count++;
-      }
-    }
-  }
-  return SPV_REFLECT_RESULT_SUCCESS;
-}
-
 static int SortCompareDescriptorSet(const void* a, const void* b) {
   const SpvReflectDescriptorSet* p_elem_a = (const SpvReflectDescriptorSet*)a;
   const SpvReflectDescriptorSet* p_elem_b = (const SpvReflectDescriptorSet*)b;
@@ -4346,7 +4234,7 @@ static SpvReflectResult CreateShaderModule(uint32_t flags, size_t size, const vo
     SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
   }
   if (result == SPV_REFLECT_RESULT_SUCCESS) {
-    result = ParseDecorations(&parser);
+    result = ParseDecorations(&parser, p_module);
     SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
   }
 
@@ -4387,10 +4275,6 @@ static SpvReflectResult CreateShaderModule(uint32_t flags, size_t size, const vo
     result = ParsePushConstantBlocks(&parser, p_module);
     SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
   }
-  if (result == SPV_REFLECT_RESULT_SUCCESS) {
-    result = ParseSpecConstants(&parser, p_module);
-    SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
-  }
   if (result == SPV_REFLECT_RESULT_SUCCESS) {
     result = ParseEntryPoints(&parser, p_module);
     SPV_REFLECT_ASSERT(result == SPV_REFLECT_RESULT_SUCCESS);
@@ -5530,14 +5414,6 @@ const char* spvReflectSourceLanguage(SpvSourceLanguage source_lang) {
       return "Hero C";
     case SpvSourceLanguageNZSL:
       return "NZSL";
-    case SpvSourceLanguageWGSL:
-      return "WGSL";
-    case SpvSourceLanguageSlang:
-      return "Slang";
-    case SpvSourceLanguageZig:
-      return "Zig";
-    case SpvSourceLanguageRust:
-      return "Rust";
     default:
       break;
   }
diff --git a/engine/thirdparty/spirv-reflect/spirv_reflect.h b/engine/thirdparty/spirv-reflect/spirv_reflect.h
index 431bce99..8f281ec8 100644
--- a/engine/thirdparty/spirv-reflect/spirv_reflect.h
+++ b/engine/thirdparty/spirv-reflect/spirv_reflect.h
@@ -325,7 +325,6 @@ typedef enum SpvReflectGenerator {
   SPV_REFLECT_GENERATOR_KHRONOS_SPIRV_TOOLS_LINKER            = 17,
   SPV_REFLECT_GENERATOR_WINE_VKD3D_SHADER_COMPILER            = 18,
   SPV_REFLECT_GENERATOR_CLAY_CLAY_SHADER_COMPILER             = 19,
-  SPV_REFLECT_GENERATOR_SLANG_SHADER_COMPILER                 = 40,
 } SpvReflectGenerator;
 
 enum {
@@ -394,9 +393,7 @@ typedef struct SpvReflectTypeDescription {
   const char*                       type_name;
   // Non-NULL if type is member of a struct
   const char*                       struct_member_name;
-
-  // The storage class (SpvStorageClass) if the type, and -1 if it does not have a storage class.
-  int                               storage_class;
+  SpvStorageClass                   storage_class;
   SpvReflectTypeFlags               type_flags;
   SpvReflectDecorationFlags         decoration_flags;
 
@@ -432,9 +429,7 @@ typedef struct SpvReflectInterfaceVariable {
   SpvStorageClass                     storage_class;
   const char*                         semantic;
   SpvReflectDecorationFlags           decoration_flags;
-
-  // The builtin id (SpvBuiltIn) if the variable is a builtin, and -1 otherwise.
-  int                                 built_in;
+  SpvBuiltIn                          built_in;
   SpvReflectNumericTraits             numeric;
   SpvReflectArrayTraits               array;
 
@@ -573,6 +568,15 @@ typedef struct SpvReflectCapability {
 } SpvReflectCapability;
 
 
+/*! @enum SpvReflectSpecializationConstantType
+
+*/
+typedef enum SpvReflectSpecializationConstantType {
+  SPV_REFLECT_SPECIALIZATION_CONSTANT_BOOL = 0,
+  SPV_REFLECT_SPECIALIZATION_CONSTANT_INT = 1,
+  SPV_REFLECT_SPECIALIZATION_CONSTANT_FLOAT = 2,
+} SpvReflectSpecializationConstantType;
+
 /*! @struct SpvReflectSpecId
 
 */
@@ -580,21 +584,11 @@ typedef struct SpvReflectSpecializationConstant {
   uint32_t spirv_id;
   uint32_t constant_id;
   const char* name;
-  SpvReflectTypeDescription* type_description;
-
-  // Size of the default value in bytes (always a multiple of 4).
-  // Will be 4 for 8/16/32-bit constants and 8 for 64-bit constants.
-  uint32_t default_value_size;
-
-  // Pointer to the raw default value data.  
-  // The interpretation of this data depends on type_description->op:  
-  // - SpvOpSpecConstantTrue:  size = 4, data = uint32_t(1)  
-  // - SpvOpSpecConstantFalse: size = 4, data = uint32_t(0)  
-  // - SpvOpSpecConstant:      data contains the bit pattern of the default value  
-  //   * The type will be a scalar integer or float.
-  //   * Types 32 bits wide or smaller take one word.  
-  //   * Larger types take multiple words, with low-order words appearing first.  
-  void* default_value;  
+  SpvReflectSpecializationConstantType constant_type;
+  union {
+    float float_value;
+    uint32_t int_bool_value;
+  } default_value;
 } SpvReflectSpecializationConstant;
 
 /*! @struct SpvReflectShaderModule
@@ -1821,9 +1815,9 @@ inline const char* ShaderModule::GetEntryPointName() const {
   return this->GetEntryPointName(0);
 }
 
-/*! @fn GetSourceFile
+/*! @fn GetEntryPoint
 
-  @return Returns source file
+  @return Returns entry point
 
 */
 inline const char* ShaderModule::GetSourceFile() const {
diff --git a/engine/thirdparty/thorvg/AUTHORS b/engine/thirdparty/thorvg/AUTHORS
new file mode 100644
index 00000000..4f8fbb47
--- /dev/null
+++ b/engine/thirdparty/thorvg/AUTHORS
@@ -0,0 +1,41 @@
+Hermet Park <hermet@lottiefiles.com>
+Prudhvi Raj Vasireddi <prudhvi.raj@samsung.com>
+Junsu Choi <jsuya.choi@samsung.com>
+Pranay Samanta <pranay.ks@samsung.com>
+Mateusz Palkowski <m.palkowski@samsung.com>
+Subhransu Mohanty <sub.mohanty@samsung.com>
+Mira Grudzinska <mira@lottiefiles.com>
+Michal Szczecinski <m.szczecinsk@partner.samsung.com>
+Shinwoo Kim <cinoo.kim@samsung.com>
+Piotr Kalota <p.kalota@samsung.com>
+Vincent Torri <vincent.torri@gmail.com>
+Pankaj Kumar <pankaj.m1@samsung.com>
+Patryk Kaczmarek <patryk.k@partner.samsung.com>
+Michal Maciola <m.maciola@samsung.com>
+Peter Vullings <peter@projectitis.com>
+K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
+Rémi Verschelde <rverschelde@gmail.com>
+Martin Liska <mliksa@suse.cz>
+Vincenzo Pupillo <vincenzo.pupillo@unimi.it>
+EunSik Jeong <rinechran@outlook.jp>
+Rafał Mikrut <mikrutrafal@protonmail.com>
+Martin Capitanio <capnm@capitanio.org>
+RuiwenTang <tangruiwen1989@gmail.com>
+YouJin Lee <ol-of@naver.com>
+Sergii Liebodkin <sergii@lottiefiles.com>
+Jinny You <jinny@lottiefiles.com>
+Nattu Adnan <nattu@reallynattu.com>
+Gabor Kiss-Vamosi <kisvegabor@gmail.com>
+Lorcán Mc Donagh <lorcan@lmdsp.com>
+Lucas Niu <hoiyu3twon9@gmail.com>
+Francisco Ramírez <franchuti688@gmail.com> 
+Abdelrahman Ashraf <a.theashraf@gmail.com>
+Neo Xu <neo.xu1990@gmail.com>
+Thaddeus Crews <repiteo@outlook.com>
+Josh Soref <jsoref@gmail.com>
+Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Łukasz Pomietło <oficjalnyadreslukasza@gmail.com>
+Kelly Loh <kelly@lottiefiles.com>
+Dragoș Tiselice <dragos@lottiefiles.com>
+Marcin Baszczewski <marcin@baszczewski.pl>
+Fabian Blatz <fabianblatz@gmail.com>
diff --git a/engine/thirdparty/thorvg/CONTRIBUTORS.md b/engine/thirdparty/thorvg/CONTRIBUTORS.md
deleted file mode 100644
index 169fef1e..00000000
--- a/engine/thirdparty/thorvg/CONTRIBUTORS.md
+++ /dev/null
@@ -1,60 +0,0 @@
-## Project Lead
-- Hermet Park <hermetpark@gmail.com>
-
-## Core Contributors
-- Pranay Samanta <pranay.ks@samsung.com>
-- Junsu Choi <jsuya.choi@samsung.com>
-- Mira Grudzinska <veleveta@gmail.com>
-- Ruiwen Tang <tangruiwen1989@gmail.com>
-- Sergii Liebodkin <sergii@lottiefiles.com>
-- Jinny You <jinny@lottiefiles.com>
-- Jay WenJie <jay@lottiefiles.com>
-
-## Contributors
-- Prudhvi Raj Vasireddi <prudhvi.raj@samsung.com>
-- Mateusz Palkowski <m.palkowski@samsung.com>
-- Subhransu Mohanty <sub.mohanty@samsung.com>
-- Michal Szczecinski <m.szczecinsk@partner.samsung.com>
-- Shinwoo Kim <cinoo.kim@samsung.com>
-- Piotr Kalota <p.kalota@samsung.com>
-- Vincent Torri <vincent.torri@gmail.com>
-- Pankaj Kumar <pankaj.m1@samsung.com>
-- Patryk Kaczmarek <patryk.k@partner.samsung.com>
-- Michal Maciola <m.maciola@samsung.com>
-- Peter Vullings <peter@projectitis.com>
-- K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
-- Rémi Verschelde <rverschelde@gmail.com>
-- Martin Liska <mliksa@suse.cz>
-- Vincenzo Pupillo <vincenzo.pupillo@unimi.it>
-- EunSik Jeong <rinechran@outlook.jp>
-- Rafał Mikrut <mikrutrafal@protonmail.com>
-- Martin Capitanio <capnm@capitanio.org>
-- YouJin Lee <ol-of@naver.com>
-- Nattu Adnan <nattu@reallynattu.com>
-- Gabor Kiss-Vamosi <kisvegabor@gmail.com>
-- Lorcán Mc Donagh <lorcan@lmdsp.com>
-- Lucas Niu <hoiyu3twon9@gmail.com>
-- Francisco Ramírez <franchuti688@gmail.com>
-- Abdelrahman Ashraf <a.theashraf@gmail.com>
-- Neo Xu <neo.xu1990@gmail.com>
-- Thaddeus Crews <repiteo@outlook.com>
-- Josh Soref <jsoref@gmail.com>
-- Elliott Sales de Andrade <quantum.analyst@gmail.com>
-- Łukasz Pomietło <oficjalnyadreslukasza@gmail.com>
-- Kelly Loh <kelly@lottiefiles.com>
-- Dragoș Tiselice <dragos@lottiefiles.com>
-- Marcin Baszczewski <marcin@baszczewski.pl>
-- Fabian Blatz <fabianblatz@gmail.com>
-- Jakub Marcowski <chubercikbattle@gmail.com>
-- Benjamin Halko <benjaminhalko@hotmail.com>
-- Benson Muite <benson_muite@emailplus.com>
-- kkocdko <kkocdko@gmail.com>
-- SoonGeon Noh <nors.nsg@gmail.com>
-- Giseong Ji <jiggyjiggy0323@gmail.com>
-- KunYoung Park <rjsdud3263@gmail.com>
-- Wang SiMiao 王思淼 <wangsimiao1@xiaomi.com>
-- Jackson Hu <huming2207@gmail.com>
-- Andy French <andyf@canva.com>
-- Andreas Deininger <andreas@deininger.net>
-- Jonathan Liu <net147@gmail.com>
-- Shiny Chang <owner@shinychang.net>
diff --git a/engine/thirdparty/thorvg/LICENSE b/engine/thirdparty/thorvg/LICENSE
index bb1f9b63..f97be650 100644
--- a/engine/thirdparty/thorvg/LICENSE
+++ b/engine/thirdparty/thorvg/LICENSE
@@ -1,21 +1,7 @@
-MIT License
+Copyright (c) 2020 - 2024 notice for the ThorVG Project (see AUTHORS)
 
-Copyright (c) 2020 - 2026 ThorVG Project
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/engine/thirdparty/thorvg/inc/config.h b/engine/thirdparty/thorvg/inc/config.h
index e405722e..5b19cc1d 100644
--- a/engine/thirdparty/thorvg/inc/config.h
+++ b/engine/thirdparty/thorvg/inc/config.h
@@ -15,5 +15,5 @@
 // For internal debugging:
 //#define THORVG_LOG_ENABLED
 
-#define THORVG_VERSION_STRING "1.0.3"
+#define THORVG_VERSION_STRING "0.15.16"
 #endif
diff --git a/engine/thirdparty/thorvg/inc/thorvg.h b/engine/thirdparty/thorvg/inc/thorvg.h
index 2594499e..e39f0061 100644
--- a/engine/thirdparty/thorvg/inc/thorvg.h
+++ b/engine/thirdparty/thorvg/inc/thorvg.h
@@ -3,12 +3,9 @@
 
 #include <cstdint>
 #include <functional>
+#include <memory>
+#include <string>
 #include <list>
-#include <cstdarg>
-
-#define TVG_VERSION_MAJOR 1  // for compile-time checks
-#define TVG_VERSION_MINOR 0  // for compile-time checks
-#define TVG_VERSION_MICRO 3  // for compile-time checks
 
 #ifdef TVG_API
     #undef TVG_API
@@ -47,22 +44,13 @@
 #endif
 
 #define _TVG_DECLARE_PRIVATE(A) \
+    struct Impl; \
+    Impl* pImpl; \
 protected: \
     A(const A&) = delete; \
     const A& operator=(const A&) = delete; \
     A()
 
-#define _TVG_DECLARE_PRIVATE_BASE(A) \
-    _TVG_DECLARE_PRIVATE(A); \
-public: \
-    struct Impl; \
-    Impl* pImpl
-
-#define _TVG_DECLARE_PRIVATE_DERIVE(A) \
-    _TVG_DECLARE_PRIVATE(A); \
-protected: \
-    ~A() {}
-
 #define _TVG_DISABLE_CTOR(A) \
     A() = delete; \
     ~A() = delete
@@ -73,9 +61,8 @@ protected: \
 namespace tvg
 {
 
-struct RenderMethod;
-struct Animation;
-struct Shape;
+class RenderMethod;
+class Animation;
 
 /**
  * @defgroup ThorVG ThorVG
@@ -91,7 +78,7 @@ struct Shape;
  * Please note that some APIs may additionally specify the reasons that trigger their return values.
  *
  */
-enum struct Result
+enum class Result
 {
     Success = 0,           ///< The value returned in case of a correct request execution.
     InvalidArguments,      ///< The value returned in the event of a problem with the arguments given to the API - e.g. empty paths or null pointers.
@@ -99,50 +86,17 @@ enum struct Result
     FailedAllocation,      ///< The value returned in case of unsuccessful memory allocation.
     MemoryCorruption,      ///< The value returned in the event of bad memory handling - e.g. failing in pointer releasing or casting
     NonSupport,            ///< The value returned in case of choosing unsupported engine features(options).
-    Unknown = 255          ///< The value returned in all other cases.
+    Unknown                ///< The value returned in all other cases.
 };
 
 
 /**
- * @brief Enumeration specifying the methods of combining the 8-bit color channels into 32-bit color.
- */
-enum struct ColorSpace : uint8_t
-{
-    ABGR8888 = 0,      ///< The channels are joined in the order: alpha, blue, green, red. Colors are alpha-premultiplied.
-    ARGB8888,          ///< The channels are joined in the order: alpha, red, green, blue. Colors are alpha-premultiplied.
-    ABGR8888S,         ///< The channels are joined in the order: alpha, blue, green, red. Colors are un-alpha-premultiplied. @since 0.12
-    ARGB8888S,         ///< The channels are joined in the order: alpha, red, green, blue. Colors are un-alpha-premultiplied. @since 0.12
-    Grayscale8,        ///< One single channel data.
-    Unknown = 255      ///< Unknown channel data. This is reserved for an initial ColorSpace value. @since 1.0
-};
-
-
-/**
- * @brief Enumeration to specify rendering engine behavior.
+ * @brief Enumeration specifying the values of the path commands accepted by TVG.
  *
- * @note The availability or behavior of @c SmartRender may vary depending on platform or backend support.
- *       It attempts to optimize rendering performance by updating only the regions  of the canvas that have
- *       changed between frames (partial redraw). This can be highly effective in scenarios  where most of the
- *       canvas remains static and only small portions are updated—such as simple animations or GUI interactions.
- *       However, in complex scenes where a large portion of the canvas changes frequently (e.g., full-screen animations
- *       or heavy object movements), the overhead of tracking changes and managing update regions may outweigh the benefits,
- *       resulting in decreased performance compared to the default rendering mode. Thus, it is recommended to benchmark
- *       both modes in your specific use case to determine the optimal setting.
- *
- * @since 1.0
+ * Not to be confused with the path commands from the svg path element (like M, L, Q, H and many others).
+ * TVG interprets all of them and translates to the ones from the PathCommand values.
  */
-enum struct EngineOption : uint8_t
-{
-    None = 0,                   /**< No engine options are enabled. This may be used to explicitly disable all optional behaviors. */
-    Default = 1 << 0,           /**< Uses the default rendering mode. */
-    SmartRender = 1 << 1        /**< Enables automatic partial (smart) rendering optimizations. */
-};
-
-
-/**
- * @brief Enumeration specifying the values of the path commands accepted by ThorVG.
- */
-enum struct PathCommand : uint8_t
+enum class PathCommand
 {
     Close = 0, ///< Ends the current sub-path and connects it with its initial point. This command doesn't expect any points.
     MoveTo,    ///< Sets a new initial point of the sub-path and a new current point. This command expects 1 point: the starting position.
@@ -154,29 +108,29 @@ enum struct PathCommand : uint8_t
 /**
  * @brief Enumeration determining the ending type of a stroke in the open sub-paths.
  */
-enum struct StrokeCap : uint8_t
+enum class StrokeCap
 {
-    Butt = 0, ///< The stroke ends exactly at each of the two end-points of a sub-path. For zero length sub-paths no stroke is rendered.
-    Round,    ///< The stroke is extended in both end-points of a sub-path by a half circle, with a radius equal to the half of a stroke width. For zero length sub-paths a full circle is rendered.
-    Square    ///< The stroke is extended in both end-points of a sub-path by a rectangle, with the width equal to the stroke width and the length equal to the half of the stroke width. For zero length sub-paths the square is rendered with the size of the stroke width.
+    Square = 0, ///< The stroke is extended in both end-points of a sub-path by a rectangle, with the width equal to the stroke width and the length equal to the half of the stroke width. For zero length sub-paths the square is rendered with the size of the stroke width.
+    Round,      ///< The stroke is extended in both end-points of a sub-path by a half circle, with a radius equal to the half of a stroke width. For zero length sub-paths a full circle is rendered.
+    Butt        ///< The stroke ends exactly at each of the two end-points of a sub-path. For zero length sub-paths no stroke is rendered.
 };
 
 
 /**
  * @brief Enumeration determining the style used at the corners of joined stroked path segments.
  */
-enum struct StrokeJoin : uint8_t
+enum class StrokeJoin
 {
-    Miter = 0, ///< The outer corner of the joined path segments is spiked. The spike is created by extension beyond the join point of the outer edges of the stroke until they intersect. In case the extension goes beyond the limit, the join style is converted to the Bevel style.
+    Bevel = 0, ///< The outer corner of the joined path segments is bevelled at the join point. The triangular region of the corner is enclosed by a straight line between the outer corners of each stroke.
     Round,     ///< The outer corner of the joined path segments is rounded. The circular region is centered at the join point.
-    Bevel      ///< The outer corner of the joined path segments is bevelled at the join point. The triangular region of the corner is enclosed by a straight line between the outer corners of each stroke.
+    Miter      ///< The outer corner of the joined path segments is spiked. The spike is created by extension beyond the join point of the outer edges of the stroke until they intersect. In case the extension goes beyond the limit, the join style is converted to the Bevel style.
 };
 
 
 /**
  * @brief Enumeration specifying how to fill the area outside the gradient bounds.
  */
-enum struct FillSpread : uint8_t
+enum class FillSpread
 {
     Pad = 0, ///< The remaining area is filled with the closest stop color.
     Reflect, ///< The gradient pattern is reflected outside the gradient area until the expected region is filled.
@@ -187,45 +141,34 @@ enum struct FillSpread : uint8_t
 /**
  * @brief Enumeration specifying the algorithm used to establish which parts of the shape are treated as the inside of the shape.
  */
-enum struct FillRule : uint8_t
+enum class FillRule
 {
-    NonZero = 0, ///< A line from the point to a location outside the shape is drawn. The intersections of the line with the path segment of the shape are counted. Starting from zero, if the path segment of the shape crosses the line clockwise, one is added, otherwise one is subtracted. If the resulting sum is non zero, the point is inside the shape.
+    Winding = 0, ///< A line from the point to a location outside the shape is drawn. The intersections of the line with the path segment of the shape are counted. Starting from zero, if the path segment of the shape crosses the line clockwise, one is added, otherwise one is subtracted. If the resulting sum is non zero, the point is inside the shape.
     EvenOdd      ///< A line from the point to a location outside the shape is drawn and its intersections with the path segments of the shape are counted. If the number of intersections is an odd number, the point is inside the shape.
 };
 
 
 /**
- * @brief Defines the image filtering method used during image scaling or transformation.
- *
- * @note Experimental API
- */
-enum struct FilterMethod : uint8_t
-{
-    Bilinear = 0,  ///< Smooth interpolation using surrounding pixels for higher quality.
-    Nearest        ///< Fast filtering using nearest-neighbor sampling.
-};
-
-
-/**
- * @brief Enumeration indicating the method used in the mask of two objects - the target and the source.
+ * @brief Enumeration indicating the method used in the composition of two objects - the target and the source.
  *
  * Notation: S(Source), T(Target), SA(Source Alpha), TA(Target Alpha)
  *
- * @see Paint::mask()
+ * @see Paint::composite()
  */
-enum struct MaskMethod : uint8_t
+enum class CompositeMethod
 {
-    None = 0,       ///< No Masking is applied.
-    Alpha,          ///< Alpha Masking using the masking target's pixels as an alpha value.
-    InvAlpha,       ///< Alpha Masking using the complement to the masking target's pixels as an alpha value.
-    Luma,           ///< Alpha Masking using the grayscale (0.2126R + 0.7152G + 0.0722*B) of the masking target's pixels. @since 0.9
-    InvLuma,        ///< Alpha Masking using the grayscale (0.2126R + 0.7152G + 0.0722*B) of the complement to the masking target's pixels. @since 0.11
-    Add,            ///< Combines the target and source objects pixels using target alpha. (T * TA) + (S * (255 - TA)) @since 1.0
-    Subtract,       ///< Subtracts the source color from the target color while considering their respective target alpha. (T * TA) - (S * (255 - TA)) @since 1.0
-    Intersect,      ///< Computes the result by taking the minimum value between the target alpha and the source alpha and multiplies it with the target color. (T * min(TA, SA)) @since 1.0
-    Difference,     ///< Calculates the absolute difference between the target color and the source color multiplied by the complement of the target alpha. abs(T - S * (255 - TA)) @since 1.0
-    Lighten,        ///< Where multiple masks intersect, the highest transparency value is used. @since 1.0
-    Darken          ///< Where multiple masks intersect, the lowest transparency value is used. @since 1.0
+    None = 0,           ///< No composition is applied.
+    ClipPath,           ///< The intersection of the source and the target is determined and only the resulting pixels from the source are rendered. Note that ClipPath only supports the Shape type. @deprecated Use Paint::clip() instead.
+    AlphaMask,          ///< Alpha Masking using the compositing target's pixels as an alpha value.
+    InvAlphaMask,       ///< Alpha Masking using the complement to the compositing target's pixels as an alpha value.
+    LumaMask,           ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the compositing target's pixels. @since 0.9
+    InvLumaMask,        ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the complement to the compositing target's pixels. @since 0.11
+    AddMask,            ///< Combines the target and source objects pixels using target alpha. (T * TA) + (S * (255 - TA)) (Experimental API)
+    SubtractMask,       ///< Subtracts the source color from the target color while considering their respective target alpha. (T * TA) - (S * (255 - TA)) (Experimental API)
+    IntersectMask,      ///< Computes the result by taking the minimum value between the target alpha and the source alpha and multiplies it with the target color. (T * min(TA, SA)) (Experimental API)
+    DifferenceMask,     ///< Calculates the absolute difference between the target color and the source color multiplied by the complement of the target alpha. abs(T - S * (255 - TA)) (Experimental API)
+    LightenMask,        ///< Where multiple masks intersect, the highest transparency value is used. (Experimental API)
+    DarkenMask          ///< Where multiple masks intersect, the lowest transparency value is used. (Experimental API)
 };
 
 
@@ -238,26 +181,26 @@ enum struct MaskMethod : uint8_t
  *
  * @since 0.15
  */
-enum struct BlendMethod : uint8_t
+enum class BlendMethod : uint8_t
 {
     Normal = 0,        ///< Perform the alpha blending(default). S if (Sa == 255), otherwise (Sa * S) + (255 - Sa) * D
     Multiply,          ///< Takes the RGB channel values from 0 to 255 of each pixel in the top layer and multiples them with the values for the corresponding pixel from the bottom layer. (S * D)
     Screen,            ///< The values of the pixels in the two layers are inverted, multiplied, and then inverted again. (S + D) - (S * D)
-    Overlay,           ///< Combines Multiply and Screen blend modes. (2 * S * D) if (D < 128), otherwise 255 - 2 * (255 - S) * (255 - D)
+    Overlay,           ///< Combines Multiply and Screen blend modes. (2 * S * D) if (2 * D < Da), otherwise (Sa * Da) - 2 * (Da - S) * (Sa - D)
     Darken,            ///< Creates a pixel that retains the smallest components of the top and bottom layer pixels. min(S, D)
     Lighten,           ///< Only has the opposite action of Darken Only. max(S, D)
     ColorDodge,        ///< Divides the bottom layer by the inverted top layer. D / (255 - S)
     ColorBurn,         ///< Divides the inverted bottom layer by the top layer, and then inverts the result. 255 - (255 - D) / S
-    HardLight,         ///< The same as Overlay but with the color roles reversed. (2 * S * D) if (S < 128), otherwise 255 - 2 * (255 - S) * (255 - D)
-    SoftLight,         ///< The same as Overlay but with applying pure black or white does not result in pure black or white. (255 - 2 * S) * (D * D) + (2 * S * D)
+    HardLight,         ///< The same as Overlay but with the color roles reversed. (2 * S * D) if (S < Sa), otherwise (Sa * Da) - 2 * (Da - S) * (Sa - D)
+    SoftLight,         ///< The same as Overlay but with applying pure black or white does not result in pure black or white. (1 - 2 * S) * (D ^ 2) + (2 * S * D)
     Difference,        ///< Subtracts the bottom layer from the top layer or the other way around, to always get a non-negative value. (S - D) if (S > D), otherwise (D - S)
-    Exclusion,         ///< The result is twice the product of the top and bottom layers, subtracted from their sum. S + D - (2 * S * D)
-    Hue,               ///< Combine with HSL(Sh + Ds + Dl) then convert it to RGB. @since 1.0
-    Saturation,        ///< Combine with HSL(Dh + Ss + Dl) then convert it to RGB. @since 1.0
-    Color,             ///< Combine with HSL(Sh + Ss + Dl) then convert it to RGB. @since 1.0
-    Luminosity,        ///< Combine with HSL(Dh + Ds + Sl) then convert it to RGB. @since 1.0
+    Exclusion,         ///< The result is twice the product of the top and bottom layers, subtracted from their sum. s + d - (2 * s * d)
+    Hue,               ///< Reserved. Not supported.
+    Saturation,        ///< Reserved. Not supported.
+    Color,             ///< Reserved. Not supported.
+    Luminosity,        ///< Reserved. Not supported.
     Add,               ///< Simply adds pixel values of one layer with the other. (S + D)
-    Composition = 255  ///< For intermediate composition layers; suitable for use with Scene or Picture. @since 1.0
+    HardMix            ///< Reserved. Not supported.
 };
 
 
@@ -267,38 +210,29 @@ enum struct BlendMethod : uint8_t
  * This enum provides options to apply various post-processing effects to a scene.
  * Scene effects are typically applied to modify the final appearance of a rendered scene, such as blurring.
  *
- * @see Scene::add(SceneEffect effect, ...)
+ * @see Scene::push(SceneEffect effect, ...)
  *
- * @since 1.0
+ * @note Experimental API
  */
-enum struct SceneEffect : uint8_t
+enum class SceneEffect : uint8_t
 {
-    Clear = 0,         ///< Clear all previously applied scene effects, restoring the scene to its original state.
-    GaussianBlur,      ///< Apply a blur effect with a Gaussian filter. Param(4) = {sigma(double)[> 0], direction(int)[both: 0 / horizontal: 1 / vertical: 2], border(int)[duplicate: 0 / wrap: 1], quality(int)[0 - 100]}
-    DropShadow,        ///< Apply a drop shadow effect with a Gaussian Blur filter. Param(8) = {color_R(int)[0 - 255], color_G(int)[0 - 255], color_B(int)[0 - 255], opacity(int)[0 - 255], angle(double)[0 - 360], distance(double), blur_sigma(double)[> 0], quality(int)[0 - 100]}
-    Fill,              ///< Override the scene content color with a given fill information. Param(4) = {color_R(int)[0 - 255], color_G(int)[0 - 255], color_B(int)[0 - 255], opacity(int)[0 - 255]}
-    Tint,              ///< Tinting the current scene color with a given black, white color parameters. Param(7) = {black_R(int)[0 - 255], black_G(int)[0 - 255], black_B(int)[0 - 255], white_R(int)[0 - 255], white_G(int)[0 - 255], white_B(int)[0 - 255], intensity(double)[0 - 100]}
-    Tritone            ///< Apply a tritone color effect to the scene using three color parameters for shadows, midtones, and highlights. A blending factor determines the mix between the original color and the tritone colors. Param(9) = {Shadow_R(int)[0 - 255], Shadow_G(int)[0 - 255], Shadow_B(int)[0 - 255], Midtone_R(int)[0 - 255], Midtone_G(int)[0 - 255], Midtone_B(int)[0 - 255], Highlight_R(int)[0 - 255], Highlight_G(int)[0 - 255], Highlight_B(int)[0 - 255], Blend(int)[0 - 255]}
+    ClearAll = 0,      ///< Reset all previously applied scene effects, restoring the scene to its original state.
+    GaussianBlur,      ///< Apply a blur effect with a Gaussian filter. Param(3) = {sigma(float)[> 0], direction(int)[both: 0 / horizontal: 1 / vertical: 2], border(int)[duplicate: 0 / wrap: 1], quality(int)[0 - 100]}
+    DropShadow,        ///< Apply a drop shadow effect with a Gaussian Blur filter. Param(8) = {color_R(int)[0 - 255], color_G(int)[0 - 255], color_B(int)[0 - 255], opacity(int)[0 - 255], angle(float)[0 - 360], distance(float), blur_sigma(float)[> 0], quality(int)[0 - 100]}
+    Fill,              ///< Override the scene content color with a given fill information (Experimental API). Param(5) = {color_R(int)[0 - 255], color_G(int)[0 - 255], color_B(int)[0 - 255], opacity(int)[0 - 255]}
+    Tint,              ///< Tinting the current scene color with a given black, white color paramters (Experimental API). Param(7) = {black_R(int)[0 - 255], black_G(int)[0 - 255], black_B(int)[0 - 255], white_R(int)[0 - 255], white_G(int)[0 - 255], white_B(int)[0 - 255], intensity(float)[0 - 100]}
+    Tritone            ///< Apply a tritone color effect to the scene using three color parameters for shadows, midtones, and highlights (Experimental API). Param(9) = {Shadow_R(int)[0 - 255], Shadow_G(int)[0 - 255], Shadow_B(int)[0 - 255], Midtone_R(int)[0 - 255], Midtone_G(int)[0 - 255], Midtone_B(int)[0 - 255], Highlight_R(int)[0 - 255], Highlight_G(int)[0 - 255], Highlight_B(int)[0 - 255]}
 };
 
 
 /**
- * @brief Enumeration that defines methods used for wrapping text.
- *
- * This enum provides options to control how text is wrapped when it exceeds the available space.
- * Wrapping affects the layout and flow of text in the rendering area.
- *
- * @see Text::wrap(TextWrap mode)
- *
- * @since 1.0
+ * @brief Enumeration specifying the engine type used for the graphics backend. For multiple backends bitwise operation is allowed.
  */
-enum struct TextWrap : uint8_t
+enum class CanvasEngine
 {
-    None = 0,      ///< Do not wrap text. Text is rendered on a single line and may overflow the bounding area.
-    Character,     ///< Wrap at the character level. If a word cannot fit, it is broken into individual characters to fit the line.
-    Word,          ///< Wrap at the word level. Words that do not fit are moved to the next line.
-    Smart,         ///< Smart choose wrapping method: word wrap first, falling back to character wrap if a word does not fit.
-    Ellipsis       ///< Truncate overflowing text and append an ellipsis ("...") at the end. Typically used for single-line labels.
+    Sw = (1 << 1), ///< CPU rasterizer.
+    Gl = (1 << 2), ///< OpenGL rasterizer.
+    Wg = (1 << 3), ///< WebGPU rasterizer. @since 0.15
 };
 
 
@@ -310,11 +244,11 @@ enum struct TextWrap : uint8_t
  * @see Paint::type()
  * @see Fill::type()
  *
- * @since 1.0
+ * @note Experimental API
  */
-enum struct Type : uint8_t
+enum class Type : uint8_t
 {
-    Undefined = 0,         ///< Unknown class
+    Undefined = 0,         ///< Unkown class
     Shape,                 ///< Shape class
     Scene,                 ///< Scene class
     Picture,               ///< Picture class
@@ -352,50 +286,6 @@ struct Matrix
 };
 
 
-/**
- * @brief Describes the font metrics of a text object.
- *
- * Provides the basic vertical layout metrics used for text rendering,
- * such as ascent, descent, and line spacing (linegap).
- *
- * @see Text::metrics()
- * @note Experimental API
- */
-struct TextMetrics
-{
-    float ascent;   ///< Distance from the baseline to the top of the highest glyph (usually positive).
-    float descent;  ///< Distance from the baseline to the bottom of the lowest glyph (usually negative, as in TTF).
-    float linegap;  ///< Additional spacing recommended between lines (leading).
-    float advance;  ///< The total vertical advance between lines of text: ascent - descent + linegap (i.e., ascent + |descent| + linegap when descent is negative).
-};
-
-
-/**
- * @brief Describes the layout metrics of a glyph.
- *
- * Provides the basic layout metrics used for positioning an individual glyph,
- * including its advance along the baseline direction, bearing relative to the
- * inline axis origin, and its bounding box in local glyph space.
- *
- * The advance value represents the distance the pen position moves along the
- * baseline (inline direction), regardless of whether the text is laid out
- * horizontally or vertically.
- *
- * The bounding box is defined in the glyph’s local coordinate space and is
- * independent of any layout direction or transformation.
- *
- * @see Text::metrics()
- * @note Experimental API
- */
-struct GlyphMetrics
-{
-    float advance;  ///< The advance distance along the baseline (inline) direction.
-    float bearing;  ///< The bearing from the origin to the glyph’s visible bound along the inline-start direction.
-    Point min;      ///< The minimum point of the glyph bounding box in local space.
-    Point max;      ///< The maximum point of the glyph bounding box in local space.
-};
-
-
 /**
  * @class Paint
  *
@@ -405,43 +295,10 @@ struct GlyphMetrics
  * Paint represents such a graphical object and its behaviors such as duplication, transformation and composition.
  * TVG recommends the user to regard a paint as a set of volatile commands. They can prepare a Paint and then request a Canvas to run them.
  */
-struct TVG_API Paint
+class TVG_API Paint
 {
-    /**
-     * @brief Retrieves the parent paint object.
-     *
-     * This function returns a pointer to the parent object if the current paint
-     * belongs to one. Otherwise, it returns @c nullptr.
-     *
-     * @return A pointer to the parent object if available, otherwise @c nullptr.
-     *
-     * @see Scene::add()
-     * @see Canvas::add()
-     *
-     * @since 1.0
-    */
-    const Paint* parent() const noexcept;
-
-    /**
-     * @brief Sets the visibility of the Paint object.
-     *
-     * This is useful for selectively excluding paint objects during rendering.
-     *
-     * @param[in] on A boolean flag indicating visibility. The default is @c true.
-     *               @c true, the object will be rendered by the engine.
-     *               @c false, the object will be excluded from the drawing process.
-     *
-     * @note An invisible object is not considered inactive—it may still participate
-     *       in internal update processing if its properties are updated, but it will not
-     *       be taken into account for the final drawing output. To completely deactivate
-     *       a paint object, remove it from the canvas.
-     *
-     * @see Paint::visible() const
-     * @see Result Canvas::remove(Paint* paint)
-     *
-     * @since 1.0
-     */
-    Result visible(bool on) noexcept;
+public:
+    virtual ~Paint();
 
     /**
      * @brief Sets the angle by which the object is rotated.
@@ -499,7 +356,7 @@ struct TVG_API Paint
      *
      * @since 0.4
      */
-    Matrix& transform() noexcept;
+    Matrix transform() noexcept;
 
     /**
      * @brief Sets the opacity of the object.
@@ -511,15 +368,12 @@ struct TVG_API Paint
     Result opacity(uint8_t o) noexcept;
 
     /**
-     * @brief Sets the masking target object and the masking method.
+     * @brief Sets the composition target object and the composition method.
      *
      * @param[in] target The paint of the target object.
-     * @param[in] method The method used to mask the source object with the target.
-     *
-     * @retval Result::InsufficientCondition if the target has already belonged to another paint.
-     * @retval Result::InvalidArguments @p method equals @c MaskMethod::None and @p target is not @c nullptr.
+     * @param[in] method The method used to composite the source object with the target.
      */
-    Result mask(Paint* target, MaskMethod method) noexcept;
+    Result composite(std::unique_ptr<Paint> target, CompositeMethod method) noexcept;
 
     /**
      * @brief Clip the drawing region of the paint object.
@@ -528,13 +382,12 @@ struct TVG_API Paint
      *
      * @param[in] clipper The shape object as the clipper.
      *
-     * @retval Result::InsufficientCondition if the @p clipper has already belonged to another paint.
+     * @retval Result::NonSupport If the @p clipper type is not Shape.
      *
-     * @see Paint::clip()
-     *
-     * @since 1.0
+     * @note @p clipper only supports the Shape type.
+     * @note Experimental API
      */
-    Result clip(Shape* clipper) noexcept;
+    Result clip(std::unique_ptr<Paint> clipper) noexcept;
 
     /**
      * @brief Sets the blending method for the paint object.
@@ -545,78 +398,30 @@ struct TVG_API Paint
      *
      * @param[in] method The blending method to be set.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Result blend(BlendMethod method) noexcept;
 
     /**
-     * @brief Retrieves the object-oriented bounding box (OBB) of the paint object in canvas space.
-     *
-     * This function returns the bounding box of the paint, as an oriented bounding box (OBB) after transformations are applied.
-     * The returned values @p pt4 may have invalid if the operation fails. Thus, please check the retval.
-     *
-     * This bounding box can be used to obtain the transformed bounding region in canvas space
-     * by taking the geometry's axis-aligned bounding box (AABB) in the object's local coordinate space
-     * and applying the object's transformations.
-     *
-     * @param[out] pt4 An array of four points representing the bounding box. The array size must be 4.
-     *
-     * @retval Result::InsufficientCondition If the paint has not been updated by the canvas.
-     * 
-     * @see Paint::bounds(float* x, float* y, float* w, float* h)
-     * @see Canvas::update()
-     *
-     * @since 1.0
+     * @deprecated Use bounds(float* x, float* y, float* w, float* h, bool transformed) instead
      */
-    Result bounds(Point* pt4) noexcept;
+    TVG_DEPRECATED Result bounds(float* x, float* y, float* w, float* h) const noexcept;
 
     /**
-     * @brief Retrieves the axis-aligned bounding box (AABB) of the paint object in canvas space.
+     * @brief Gets the axis-aligned bounding box of the paint object.
      *
-     * Returns the bounding box of the paint as an axis-aligned bounding box (AABB), with all relevant transformations applied.
-     * The returned values @p x, @p y, @p w, @p h, may have invalid if the operation fails. Thus, please check the retval.
+     * @param[out] x The x-coordinate of the upper-left corner of the object.
+     * @param[out] y The y-coordinate of the upper-left corner of the object.
+     * @param[out] w The width of the object.
+     * @param[out] h The height of the object.
+     * @param[in] transformed If @c true, the paint's transformations are taken into account in the scene it belongs to. Otherwise they aren't.
      *
-     * This bounding box can be used to determine the actual rendered area of the object on the canvas,
-     * for purposes such as hit-testing, culling, or layout calculations.
-     *
-     * @param[out] x The x-coordinate of the upper-left corner of the bounding box.
-     * @param[out] y The y-coordinate of the upper-left corner of the bounding box.
-     * @param[out] w The width of the bounding box.
-     * @param[out] h The height of the bounding box.
-     *
-     * @retval Result::InsufficientCondition If the paint has not been updated by the canvas.
-     *
-     * @see Paint::bounds(Point* pt4)
+     * @note This is useful when you need to figure out the bounding box of the paint in the canvas space.
+     * @note The bounding box doesn't indicate the actual drawing region. It's the smallest rectangle that encloses the object.
+     * @note If @p transformed is @c true, the paint needs to be pushed into a canvas and updated before this api is called.
      * @see Canvas::update()
      */
-    Result bounds(float* x, float* y, float* w, float* h) noexcept;
-
-    /**
-     * @brief Checks whether a given region intersects the filled area of the paint.
-     *
-     * This function determines whether the specified rectangular region—defined by (`x`, `y`, `w`, `h`)—
-     * intersects the geometric fill region of the paint object.
-     *
-     * This is useful for hit-testing purposes, such as detecting whether a user interaction (e.g., touch or click)
-     * occurs within a painted region.
-     *
-     * The paint must be updated in a Canvas beforehand—typically after the Canvas has been
-     * drawn and synchronized.
-     *
-     * @param[in] x The x-coordinate of the top-left corner of the test region.
-     * @param[in] y The y-coordinate of the top-left corner of the test region.
-     * @param[in] w The width of the region to test. Must be greater than 0; defaults to 1.
-     * @param[in] h The height of the region to test. Must be greater than 0; defaults to 1.
-     *
-     * @return @c true if any part of the region intersects the filled area; otherwise, @c false.
-     *
-     * @note To test a single point, set the region size to w = 1, h = 1.
-     * @note For efficiency, an AABB (axis-aligned bounding box) test is performed internally before precise hit detection.
-     * @note This test does not take into account the results of blending or masking.
-     * @note This test does take into account the the hidden paints as well. @see Paint::visible()
-     * @since 1.0
-     */
-    bool intersects(int32_t x, int32_t y, int32_t w = 1, int32_t h = 1) noexcept;
+    Result bounds(float* x, float* y, float* w, float* h, bool transformed) const noexcept;
 
     /**
      * @brief Duplicates the object.
@@ -635,87 +440,15 @@ struct TVG_API Paint
     uint8_t opacity() const noexcept;
 
     /**
-     * @brief Gets the masking target object and the masking method.
+     * @brief Gets the composition target object and the composition method.
      *
      * @param[out] target The paint of the target object.
      *
-     * @return The method used to mask the source object with the target.
+     * @return The method used to composite the source object with the target.
      *
      * @since 0.5
      */
-    MaskMethod mask(const Paint** target) const noexcept;
-
-    /**
-     * @brief Get the clipper shape of the paint object.
-     *
-     * This function returns the clipper that has been previously set to this paint object.
-     *
-     * @return The shape object used as the clipper, or @c nullptr if no clipper is set.
-     *
-     * @see Paint::clip(Shape* clipper)
-     *
-     * @since 1.0
-     */
-    Shape* clip() const noexcept;
-
-    /**
-     * @brief Gets the current visibility status of the Paint object.
-     *
-     * @return true if the object is visible and will be rendered.
-     *         false if the object is hidden and will not be rendered.
-     *
-     * @see Paint::visible(bool on)
-     *
-     * @since 1.0
-     */
-    bool visible() const noexcept;
-
-    /**
-     * @brief Increment the reference count for the Paint instance.
-     *
-     * This method increases the reference count of the Paint object, allowing shared ownership and control over its lifetime.
-     *
-     * @return The updated reference count after the increment by 1.
-     *
-     * @warning Please ensure that each call to ref() is paired with a corresponding call to unref() to prevent a dangling instance.
-     *
-     * @see Paint::unref()
-     * @see Paint::refCnt()
-     *
-     * @since 1.0
-     */
-    uint16_t ref() noexcept;
-
-    /**
-     * @brief Decrement the reference count for the Paint instance.
-     *
-     * This method decreases the reference count of the Paint object by 1.
-     * If the reference count reaches zero and the @p free flag is set to true, the Paint instance is automatically deleted.
-     *
-     * @param[in] free Flag indicating whether to delete the Paint instance when the reference count reaches zero.
-     *
-     * @return The updated reference count after the decrement.
-     *
-     * @see Paint::ref()
-     * @see Paint::refCnt()
-     *
-     * @since 1.0
-     */
-    uint16_t unref(bool free = true) noexcept;
-
-    /**
-     * @brief Retrieve the current reference count of the Paint instance.
-     *
-     * This method provides the current reference count, allowing the user to check the shared ownership state of the Paint object.
-     *
-     * @return The current reference count of the Paint instance.
-     *
-     * @see Paint::ref()
-     * @see Paint::unref()
-     *
-     * @since 1.0
-     */
-    uint16_t refCnt() const noexcept;
+    CompositeMethod composite(const Paint** target) const noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -724,7 +457,7 @@ struct TVG_API Paint
      *
      * @return The class type ID of the Paint instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     virtual Type type() const noexcept = 0;
 
@@ -733,26 +466,16 @@ struct TVG_API Paint
      *
      * This is reserved to specify an paint instance in a scene.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     uint32_t id = 0;
 
     /**
-     * @brief Safely releases a Paint object.
-     *
-     * This is the counterpart to the `gen()` API, and releases the given Paint object safely, 
-     * handling @c nullptr and managing ownership properly.
-     *
-     * @param[in] paint A Paint object to release.
-     *
-     * @since 1.0
+     * @see Paint::type()
      */
-    static void rel(Paint* paint) noexcept;
+    TVG_DEPRECATED uint32_t identifier() const noexcept;
 
-protected:
-    virtual ~Paint();
-
-    _TVG_DECLARE_PRIVATE_BASE(Paint);
+    _TVG_DECLARE_PRIVATE(Paint);
 };
 
 
@@ -767,8 +490,9 @@ protected:
  * It specifies the gradient behavior in case the area defined by the gradient bounds
  * is smaller than the area to be filled.
  */
-struct TVG_API Fill
+class TVG_API Fill
 {
+public:
     /**
      * @brief A data structure storing the information about the color and its relative position inside the gradient bounds.
      */
@@ -830,7 +554,7 @@ struct TVG_API Fill
      *
      * @return The augmented transformation matrix.
      */
-    Matrix& transform() const noexcept;
+    Matrix transform() const noexcept;
 
     /**
      * @brief Creates a copy of the Fill object.
@@ -848,11 +572,16 @@ struct TVG_API Fill
      *
      * @return The class type ID of the Fill instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     virtual Type type() const noexcept = 0;
 
-    _TVG_DECLARE_PRIVATE_BASE(Fill);
+    /**
+     * @see Fill::type()
+     */
+    TVG_DEPRECATED uint32_t identifier() const noexcept;
+
+    _TVG_DECLARE_PRIVATE(Fill);
 };
 
 
@@ -866,135 +595,98 @@ struct TVG_API Fill
  * @note A Canvas behavior depends on the raster engine though the final content of the buffer is expected to be identical.
  * @warning The Paint objects belonging to one Canvas can't be shared among multiple Canvases.
  */
-struct TVG_API Canvas
+class TVG_API Canvas
 {
+public:
+    Canvas(RenderMethod*);
     virtual ~Canvas();
 
+    TVG_DEPRECATED Result reserve(uint32_t n) noexcept;
+
     /**
-     * @brief Returns the list of paints currently held by the Canvas.
+     * @brief Returns the list of the paints that currently held by the Canvas.
      *
-     * This function provides a list of paint nodes, allowing users to access scene-graph information.
+     * This function provides the list of paint nodes, allowing users a direct opportunity to modify the scene tree.
      *
      * @warning Please avoid accessing the paints during Canvas update/draw. You can access them after calling sync().
-     * @see Canvas::add()
-     * @see Canvas::remove()
+     * @see Canvas::sync()
      *
-     * @warning This is read-only. Do not modify the list.
-     * @note 1.0
+     * @note Experimental API
      */
-    const std::list<Paint*>& paints() const noexcept;
+    std::list<Paint*>& paints() noexcept;
 
     /**
-     * @brief Adds a paint object to the canvas root scene.
+     * @brief Passes drawing elements to the Canvas using Paint objects.
      *
-     * Appends a paint object to the root scene of the canvas. If the optional @p at
-     * parameter is provided, the paint object is inserted immediately before the
-     * specified paint in the root scene. If @p at is @c nullptr, the paint object
-     * is appended to the end of the root scene.
+     * Only pushed paints in the canvas will be drawing targets.
+     * They are retained by the canvas until you call Canvas::clear().
      *
-     * @param[in] target A pointer to the Paint object to be added to the root scene.
-     *                   This parameter must not be @c nullptr.
-     * @param[in] at     A pointer to an existing Paint object in the root scene
-     *                   before which @p target will be inserted. If @c nullptr,
-     *                   @p target is appended to the end of the root scene.
-     *                   The default value is @c nullptr.
+     * @param[in] paint A Paint object to be drawn.
      *
-     * @note Ownership of the @p target object is transferred to the canvas upon
-     *       successful addition. To retain ownership, call @ref Paint::ref()
-     *       before adding it to the canvas.
-     * @note The rendering order of paint objects follows their order in the root
-     *       scene. If layering is required, ensure the paints are added in the
-     *       desired order.
+     * @retval Result::MemoryCorruption In case a @c nullptr is passed as the argument.
      *
+     * @note The rendering order of the paints is the same as the order as they were pushed into the canvas. Consider sorting the paints before pushing them if you intend to use layering.
      * @see Canvas::paints()
-     * @see Canvas::remove()
-     * @see Paint::ref()
-     *
-     * @since 1.0
+     * @see Canvas::clear()
      */
-    Result add(Paint* target, Paint* at = nullptr) noexcept;
+    virtual Result push(std::unique_ptr<Paint> paint) noexcept;
 
     /**
-     * @brief Removes a paint object or all paint objects from the root scene.
+     * @brief Clear the internal canvas resources that used for the drawing.
      *
-     * This function removes a specified paint object from the root scene. If no paint
-     * object is specified (i.e., the default @c nullptr is used), the function
-     * performs to clear all paints from the root scene.
+     * This API sets the total number of paints pushed into the canvas to zero.
+     * Depending on the value of the @p free argument, the paints are either freed or retained.
+     * So if you need to update paint properties while maintaining the existing scene structure, you can set @p free = false.
      *
-     * @param[in] paint A pointer to the Paint object to be removed from the root scene.
-     *                  If @c nullptr, remove all the paints from the root scene.
+     * @param[in] free If @c true, the memory occupied by paints is deallocated, otherwise it is not.
      *
-     * @see Canvas::add()
+     *
+     * @see Canvas::push()
      * @see Canvas::paints()
-     *
-     * @since 1.0
      */
-    Result remove(Paint* paint = nullptr) noexcept;
+    virtual Result clear(bool free = true) noexcept;
 
     /**
-     * @brief Requests the canvas to update modified paint objects in preparation for rendering.
+     * @brief Request the canvas to update the paint objects.
      *
-     * This function triggers an internal update for all paint instances that have been modified
-     * since the last update. It ensures that the canvas state is ready for accurate rendering.
+     * If a @c nullptr is passed all paint objects retained by the Canvas are updated,
+     * otherwise only the paint to which the given @p paint points.
      *
-     * @retval Result::InsufficientCondition The canvas is not properly prepared.
-     *         This may occur if the canvas target has not been set or if the update is called during drawing.
-     *         Call Canvas::sync() before trying.
+     * @param[in] paint A pointer to the Paint object or @c nullptr.
      *
-     * @note Only paint objects that have been changed will be processed.
-     * @note If the canvas is configured with multiple threads, the update may be performed asynchronously.
+     * @note The Update behavior can be asynchronous if the assigned thread number is greater than zero.
+     */
+    virtual Result update(Paint* paint = nullptr) noexcept;
+
+    /**
+     * @brief Requests the canvas to draw the Paint objects.
      *
+     * @note Drawing can be asynchronous if the assigned thread number is greater than zero. To guarantee the drawing is done, call sync() afterwards.
      * @see Canvas::sync()
      */
-    Result update() noexcept;
+    virtual Result draw() noexcept;
 
     /**
-     * @brief Requests the canvas to render the Paint objects.
+     * @brief Sets the drawing region in the canvas.
      *
-     * @param[in] clear If @c true, clears the target buffer to zero before drawing.
-     *
-     * @retval Result::InsufficientCondition The canvas is not properly prepared.
-     *         This may occur if Canvas::target() has not been set or if draw() is called multiple times
-     *         without calling Canvas::sync() in between.
-     *
-     * @note Clearing the buffer is unnecessary if the canvas will be fully covered 
-     *       with opaque content. Skipping the clear can improve performance.
-     * @note Drawing may be performed asynchronously if the thread count is greater than zero.
-     *       To ensure the drawing process is complete, call sync() afterwards.
-     * @note If the canvas has not been updated prior to Canvas::draw(), it may implicitly perform Canvas::update().
-     *
-     * @see Canvas::sync()
-     * @see Canvas::update()
-     */
-    Result draw(bool clear = false) noexcept;
-
-    /**
-     * @brief Sets the drawing region of the canvas.
-     *
-     * This function defines a rectangular area of the canvas to be used for drawing operations.
-     * The specified viewport clips rendering output to the boundaries of that rectangle.
-     *
-     * Please note that changing the viewport is only allowed at the beginning of the rendering sequence—that is, after calling Canvas::sync().
+     * This function defines the rectangular area of the canvas that will be used for drawing operations.
+     * The specified viewport is used to clip the rendering output to the boundaries of the rectangle.
      *
      * @param[in] x The x-coordinate of the upper-left corner of the rectangle.
      * @param[in] y The y-coordinate of the upper-left corner of the rectangle.
      * @param[in] w The width of the rectangle.
      * @param[in] h The height of the rectangle.
      *
-     * @retval Result::InsufficientCondition If the canvas is not in a synced state.
-     *
-     * @see Canvas::sync()
      * @see SwCanvas::target()
      * @see GlCanvas::target()
      * @see WgCanvas::target()
      *
-     * @warning Changing the viewport is not allowed after calling Canvas::add(),
-     *          Canvas::remove(), Canvas::update(), or Canvas::draw().
+     * @warning It's not allowed to change the viewport during Canvas::push() - Canvas::sync() or Canvas::update() - Canvas::sync().
      *
-     * @note When the target is reset, the viewport will also be reset to match the target size.
+     * @note When resetting the target, the viewport will also be reset to the target size.
      * @since 0.15
      */
-    Result viewport(int32_t x, int32_t y, int32_t w, int32_t h) noexcept;
+    virtual Result viewport(int32_t x, int32_t y, int32_t w, int32_t h) noexcept;
 
     /**
      * @brief Guarantees that drawing task is finished.
@@ -1002,11 +694,13 @@ struct TVG_API Canvas
      * The Canvas rendering can be performed asynchronously. To make sure that rendering is finished,
      * the sync() must be called after the draw() regardless of threading.
      *
+     * @retval Result::InsufficientCondition: The canvas is either already in sync condition or in a damaged condition (a draw is required before syncing).
+     *
      * @see Canvas::draw()
      */
-    Result sync() noexcept;
+    virtual Result sync() noexcept;
 
-    _TVG_DECLARE_PRIVATE_BASE(Canvas);
+    _TVG_DECLARE_PRIVATE(Canvas);
 };
 
 
@@ -1017,11 +711,12 @@ struct TVG_API Canvas
  *
  * Besides the APIs inherited from the Fill class, it enables setting and getting the linear gradient bounds.
  * The behavior outside the gradient bounds depends on the value specified in the spread API.
- *
- * @warning This class is not designed for inheritance.
  */
-struct TVG_API LinearGradient : Fill
+class TVG_API LinearGradient final : public Fill
 {
+public:
+    ~LinearGradient();
+
     /**
      * @brief Sets the linear gradient bounds.
      *
@@ -1058,7 +753,7 @@ struct TVG_API LinearGradient : Fill
      *
      * @return A new LinearGradient object.
      */
-    static LinearGradient* gen() noexcept;
+    static std::unique_ptr<LinearGradient> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -1067,10 +762,15 @@ struct TVG_API LinearGradient : Fill
      *
      * @return The class type ID of the LinearGradient instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
+    /**
+     * @see LinearGradient::type()
+     */
+    TVG_DEPRECATED static uint32_t identifier() noexcept;
+
     _TVG_DECLARE_PRIVATE(LinearGradient);
 };
 
@@ -1080,57 +780,45 @@ struct TVG_API LinearGradient : Fill
  *
  * @brief A class representing the radial gradient fill of the Shape object.
  *
- * @warning This class is not designed for inheritance.
  */
-struct TVG_API RadialGradient : Fill
+class TVG_API RadialGradient final : public Fill
 {
-    /**
-     * @brief Sets the radial gradient attributes.
-     *
-     * The radial gradient is defined by the end circle with a center (@p cx, @p cy) and a radius @p r and
-     * the start circle with a center/focal point (@p fx, @p fy) and a radius @p fr.
-     * The gradient will be rendered such that the gradient stop at an offset of 100% aligns with the edge of the end circle
-     * and the stop at an offset of 0% aligns with the edge of the start circle.
-     *
-     * @param[in] cx The horizontal coordinate of the center of the end circle.
-     * @param[in] cy The vertical coordinate of the center of the end circle.
-     * @param[in] r The radius of the end circle.
-     * @param[in] fx The horizontal coordinate of the center of the start circle.
-     * @param[in] fy The vertical coordinate of the center of the start circle.
-     * @param[in] fr The radius of the start circle.
-     *
-     * @retval Result::InvalidArguments in case the radius @p r or @p fr value is negative.
-     *
-     * @note In case the radius @p r is zero, an object is filled with a single color using the last color specified in the colorStops().
-     * @note In case the focal point (@p fx and @p fy) lies outside the end circle, it is projected onto the edge of the end circle.
-     * @note If the start circle doesn't fully fit inside the end circle (after possible repositioning), the @p fr is reduced accordingly.
-     * @note By manipulating the position and size of the focal point, a wide range of visual effects can be achieved, such as directing
-     * the gradient focus towards a specific edge or enhancing the depth and complexity of shading patterns.
-     * If a focal effect is not desired, simply align the focal point (@p fx and @p fy) with the center of the end circle (@p cx and @p cy)
-     * and set the radius (@p fr) to zero. This will result in a uniform gradient without any focal variations.
-     */
-    Result radial(float cx, float cy, float r, float fx, float fy, float fr) noexcept;
+public:
+    ~RadialGradient();
 
     /**
-     * @brief Gets the radial gradient attributes.
+     * @brief Sets the radial gradient bounds.
      *
-     * @param[out] cx The horizontal coordinate of the center of the end circle.
-     * @param[out] cy The vertical coordinate of the center of the end circle.
-     * @param[out] r The radius of the end circle.
-     * @param[out] fx The horizontal coordinate of the center of the start circle.
-     * @param[out] fy The vertical coordinate of the center of the start circle.
-     * @param[out] fr The radius of the start circle.
+     * The radial gradient bounds are defined as a circle centered in a given point (@p cx, @p cy) of a given radius.
      *
-     * @see RadialGradient::radial()
+     * @param[in] cx The horizontal coordinate of the center of the bounding circle.
+     * @param[in] cy The vertical coordinate of the center of the bounding circle.
+     * @param[in] radius The radius of the bounding circle.
+     *
+     * @retval Result::InvalidArguments in case the @p radius value is zero or less.
+     *
+     * @note In case the @p radius is zero, an object is filled with a single color using the last color specified in the colorStops().
      */
-    Result radial(float* cx, float* cy, float* r, float* fx = nullptr, float* fy = nullptr, float* fr = nullptr) const noexcept;
+    Result radial(float cx, float cy, float radius) noexcept;
+
+    /**
+     * @brief Gets the radial gradient bounds.
+     *
+     * The radial gradient bounds are defined as a circle centered in a given point (@p cx, @p cy) of a given radius.
+     *
+     * @param[out] cx The horizontal coordinate of the center of the bounding circle.
+     * @param[out] cy The vertical coordinate of the center of the bounding circle.
+     * @param[out] radius The radius of the bounding circle.
+     *
+     */
+    Result radial(float* cx, float* cy, float* radius) const noexcept;
 
     /**
      * @brief Creates a new RadialGradient object.
      *
      * @return A new RadialGradient object.
      */
-    static RadialGradient* gen() noexcept;
+    static std::unique_ptr<RadialGradient> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -1139,10 +827,15 @@ struct TVG_API RadialGradient : Fill
      *
      * @return The class type ID of the LinearGradient instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
+    /**
+     * @see RadialGradient::type()
+     */
+    TVG_DEPRECATED static uint32_t identifier() noexcept;
+
     _TVG_DECLARE_PRIVATE(RadialGradient);
 };
 
@@ -1158,11 +851,12 @@ struct TVG_API RadialGradient : Fill
  *
  * The stroke of Shape is an optional property in case the Shape needs to be represented with/without the outline borders.
  * It's efficient since the shape path and the stroking path can be shared with each other. It's also convenient when controlling both in one context.
- *
- * @warning This class is not designed for inheritance.
  */
-struct TVG_API Shape : Paint
+class TVG_API Shape final : public Paint
 {
+public:
+    ~Shape();
+
     /**
      * @brief Resets the shape path.
      *
@@ -1239,11 +933,10 @@ struct TVG_API Shape : Paint
      * @param[in] h The height of the rectangle.
      * @param[in] rx The x-axis radius of the ellipse defining the rounded corners of the rectangle.
      * @param[in] ry The y-axis radius of the ellipse defining the rounded corners of the rectangle.
-     * @param[in] cw Specifies the path direction: @c true for clockwise, @c false for counterclockwise.
      *
      * @note For @p rx and @p ry greater than or equal to the half of @p w and the half of @p h, respectively, the shape become an ellipse.
      */
-    Result appendRect(float x, float y, float w, float h, float rx = 0, float ry = 0, bool cw = true) noexcept;
+    Result appendRect(float x, float y, float w, float h, float rx = 0, float ry = 0) noexcept;
 
     /**
      * @brief Appends an ellipse to the path.
@@ -1258,10 +951,26 @@ struct TVG_API Shape : Paint
      * @param[in] cy The vertical coordinate of the center of the ellipse.
      * @param[in] rx The x-axis radius of the ellipse.
      * @param[in] ry The y-axis radius of the ellipse.
-     * @param[in] cw Specifies the path direction: @c true for clockwise, @c false for counterclockwise.
      *
      */
-    Result appendCircle(float cx, float cy, float rx, float ry, bool cw = true) noexcept;
+    Result appendCircle(float cx, float cy, float rx, float ry) noexcept;
+
+    /**
+     * @brief Appends a circular arc to the path.
+     *
+     * The arc is treated as a new sub-path - it is not connected with the previous sub-path.
+     * The current point value is set to the end-point of the arc in case @p pie is @c false, and to the center of the arc otherwise.
+     *
+     * @param[in] cx The horizontal coordinate of the center of the arc.
+     * @param[in] cy The vertical coordinate of the center of the arc.
+     * @param[in] radius The radius of the arc.
+     * @param[in] startAngle The start angle of the arc given in degrees, measured counter-clockwise from the horizontal line.
+     * @param[in] sweep The central angle of the arc given in degrees, measured counter-clockwise from @p startAngle.
+     * @param[in] pie Specifies whether to draw radii from the arc's center to both of its end-point - drawn if @c true.
+     *
+     * @note Setting @p sweep value greater than 360 degrees, is equivalent to calling appendCircle(cx, cy, radius, radius).
+     */
+    TVG_DEPRECATED Result appendArc(float cx, float cy, float radius, float startAngle, float sweep, bool pie) noexcept;
 
     /**
      * @brief Appends a given sub-path to the path.
@@ -1280,72 +989,45 @@ struct TVG_API Shape : Paint
     Result appendPath(const PathCommand* cmds, uint32_t cmdCnt, const Point* pts, uint32_t ptsCnt) noexcept;
 
     /**
-     * @brief Sets the stroke width for the path.
+     * @brief Sets the stroke width for all of the figures from the path.
      *
-     * This function defines the thickness of the stroke applied to all figures
-     * in the path object. A stroke is the outline drawn along the edges of the
-     * path's geometry.
+     * @param[in] width The width of the stroke. The default value is 0.
      *
-     * @param[in] width The width of the stroke in pixels. Must be positive value. (The default is 0)
-     *
-     * @note A value of @p width 0 disables the stroke.
-     *
-     * @see strokeFill()
      */
-    Result strokeWidth(float width) noexcept;
+    Result stroke(float width) noexcept;
 
     /**
-     * @brief Sets the stroke color for the path.
-     *
-     * This function defines the RGBA color of the stroke applied to all figures
-     * in the path object. The stroke color is used when rendering the outline
-     * of the path geometry.
+     * @brief Sets the color of the stroke for all of the figures from the path.
      *
      * @param[in] r The red color channel value in the range [0 ~ 255]. The default value is 0.
      * @param[in] g The green color channel value in the range [0 ~ 255]. The default value is 0.
      * @param[in] b The blue color channel value in the range [0 ~ 255]. The default value is 0.
      * @param[in] a The alpha channel value in the range [0 ~ 255], where 0 is completely transparent and 255 is opaque. The default value is 0.
      *
-     * @note If the stroke width is 0 (default), the stroke will not be visible regardless of the color.
-     * @note Either a solid color or a gradient fill is applied, depending on what was set as last.
-     *
-     * @see strokeWidth()
-     * @see strokeFill(Fill* f)
      */
-    Result strokeFill(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255) noexcept;
+    Result stroke(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255) noexcept;
 
     /**
      * @brief Sets the gradient fill of the stroke for all of the figures from the path.
      *
      * @param[in] f The gradient fill.
      *
-     * @retval Result::InvalidArgument In case a @c nullptr is passed as the argument.
-     *
-     * @note If the stroke width is 0 (default), the stroke will not be visible regardless of the color.
-     * @note Either a solid color or a gradient fill is applied, depending on what was set as last.
-     *
-     * @see strokeFill(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+     * @retval Result::MemoryCorruption In case a @c nullptr is passed as the argument.
      */
-    Result strokeFill(Fill* f) noexcept;
+    Result stroke(std::unique_ptr<Fill> f) noexcept;
 
     /**
      * @brief Sets the dash pattern of the stroke.
      *
-     * @param[in] dashPattern An array of alternating dash and gap lengths.
+     * @param[in] dashPattern The array of consecutive pair values of the dash length and the gap length.
      * @param[in] cnt The length of the @p dashPattern array.
-     * @param[in] offset The shift of the starting point within the repeating dash pattern, from which the pattern begins to be applied.
      *
-     * @retval Result::InvalidArguments In case @p dashPattern is @c nullptr and @p cnt > 0 or @p dashPattern is not @c nullptr and @p cnt is zero.
+     * @retval Result::InvalidArguments In case @p dashPattern is @c nullptr and @p cnt > 0, @p cnt is zero, any of the dash pattern values is zero or less.
      *
      * @note To reset the stroke dash pattern, pass @c nullptr to @p dashPattern and zero to @p cnt.
-     * @note Values of @p dashPattern less than zero are treated as zero.
-     * @note If all values in the @p dashPattern are equal to or less than 0, the dash is ignored.
-     * @note If the @p dashPattern contains an odd number of elements, the sequence is repeated in the same
-     * order to form an even-length pattern, preserving the alternation of dashes and gaps.
-     *
-     * @since 1.0
+     * @warning @p cnt must be greater than 1 if the dash pattern is valid.
      */
-    Result strokeDash(const float* dashPattern, uint32_t cnt, float offset = 0.0f) noexcept;
+    Result stroke(const float* dashPattern, uint32_t cnt) noexcept;
 
     /**
      * @brief Sets the cap style of the stroke in the open sub-paths.
@@ -1353,7 +1035,7 @@ struct TVG_API Shape : Paint
      * @param[in] cap The cap style value. The default value is @c StrokeCap::Square.
      *
      */
-    Result strokeCap(StrokeCap cap) noexcept;
+    Result stroke(StrokeCap cap) noexcept;
 
     /**
      * @brief Sets the join style for stroked path segments.
@@ -1363,7 +1045,7 @@ struct TVG_API Shape : Paint
      * @param[in] join The join style value. The default value is @c StrokeJoin::Bevel.
      *
      */
-    Result strokeJoin(StrokeJoin join) noexcept;
+    Result stroke(StrokeJoin join) noexcept;
 
     /**
      * @brief Sets the stroke miterlimit.
@@ -1377,7 +1059,7 @@ struct TVG_API Shape : Paint
     Result strokeMiterlimit(float miterlimit) noexcept;
 
     /**
-     * @brief Sets the trim of the shape along the defined path segment, allowing control over which part of the shape is visible.
+     * @brief Sets the trim of the stroke along the defined path segment, allowing control over which part of the stroke is visible.
      *
      * If the values of the arguments @p begin and @p end exceed the 0-1 range, they are wrapped around in a manner similar to angle wrapping, effectively treating the range as circular.
      *
@@ -1386,9 +1068,9 @@ struct TVG_API Shape : Paint
      * @param[in] simultaneous Determines how to trim multiple paths within a single shape. If set to @c true (default), trimming is applied simultaneously to all paths;
      * Otherwise, all paths are treated as a single entity with a combined length equal to the sum of their individual lengths and are trimmed as such.
      *
-     * @since 1.0
+     * @note Experimental API
      */
-    Result trimpath(float begin, float end, bool simultaneous = true) noexcept;
+    Result strokeTrim(float begin, float end, bool simultaneous = true) noexcept;
 
     /**
      * @brief Sets the solid color for all of the figures from the path.
@@ -1413,17 +1095,14 @@ struct TVG_API Shape : Paint
      *
      * @note Either a solid color or a gradient fill is applied, depending on what was set as last.
      */
-    Result fill(Fill* f) noexcept;
+    Result fill(std::unique_ptr<Fill> f) noexcept;
 
     /**
-     * @brief Sets the fill rule for the shape.
+     * @brief Sets the fill rule for the Shape object.
      *
-     * Specifies how the interior of the shape is determined when its path intersects itself.
-     * The default fill rule is @c FillRule::NonZero.
-     *
-     * @param[in] r The fill rule to apply to the shape.
+     * @param[in] r The fill rule value. The default value is @c FillRule::Winding.
      */
-    Result fillRule(FillRule r) noexcept;
+    Result fill(FillRule r) noexcept;
 
     /**
      * @brief Sets the rendering order of the stroke and the fill.
@@ -1435,21 +1114,22 @@ struct TVG_API Shape : Paint
     Result order(bool strokeFirst) noexcept;
 
     /**
-     * @brief Retrieves the current path data of the shape.
+     * @brief Gets the commands data of the path.
      *
-     * This function provides access to the shape's path data, including the commands
-     * and points that define the path.
+     * @param[out] cmds The pointer to the array of the commands from the path.
      *
-     * @param[out] cmds Pointer to the array of commands representing the path.
-     *                  Can be @c nullptr if this information is not needed.
-     * @param[out] cmdsCnt Pointer to the variable that receives the number of commands in the @p cmds array.
-     *                     Can be @c nullptr if this information is not needed.
-     * @param[out] pts Pointer to the array of two-dimensional points that define the path.
-     *                 Can be @c nullptr if this information is not needed.
-     * @param[out] ptsCnt Pointer to the variable that receives the number of points in the @p pts array.
-     *                    Can be @c nullptr if this information is not needed.
+     * @return The length of the @p cmds array when succeed, zero otherwise.
      */
-    Result path(const PathCommand** cmds, uint32_t* cmdsCnt, const Point** pts, uint32_t* ptsCnt) const noexcept;
+    uint32_t pathCommands(const PathCommand** cmds) const noexcept;
+
+    /**
+     * @brief Gets the points values of the path.
+     *
+     * @param[out] pts The pointer to the array of the two-dimensional points from the path.
+     *
+     * @return The length of the @p pts array when succeed, zero otherwise.
+     */
+    uint32_t pathCoords(const Point** pts) const noexcept;
 
     /**
      * @brief Gets the pointer to the gradient fill of the shape.
@@ -1467,16 +1147,12 @@ struct TVG_API Shape : Paint
      * @param[out] a The alpha channel value in the range [0 ~ 255], where 0 is completely transparent and 255 is opaque.
      *
      */
-    Result fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a = nullptr) const noexcept;
+    Result fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a = nullptr) const noexcept;
 
     /**
-     * @brief Retrieves the current fill rule used by the shape.
+     * @brief Gets the fill rule value.
      *
-     * This function returns the fill rule, which determines how the interior 
-     * regions of the shape are calculated when it overlaps itself.
-     *
-     * @see Shape::fillRule(FillRule r)
-     * @return The current FillRule value of the shape.
+     * @return The fill rule value of the shape.
      */
     FillRule fillRule() const noexcept;
 
@@ -1496,7 +1172,7 @@ struct TVG_API Shape : Paint
      * @param[out] a The alpha channel value in the range [0 ~ 255], where 0 is completely transparent and 255 is opaque.
      *
      */
-    Result strokeFill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a = nullptr) const noexcept;
+    Result strokeColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a = nullptr) const noexcept;
 
     /**
      * @brief Gets the pointer to the gradient fill of the stroke.
@@ -1509,13 +1185,10 @@ struct TVG_API Shape : Paint
      * @brief Gets the dash pattern of the stroke.
      *
      * @param[out] dashPattern The pointer to the memory, where the dash pattern array is stored.
-     * @param[out] offset The shift of the starting point within the repeating dash pattern.
      *
      * @return The length of the @p dashPattern array.
-     *
-     * @since 1.0
      */
-    uint32_t strokeDash(const float** dashPattern, float* offset = nullptr) const noexcept;
+    uint32_t strokeDash(const float** dashPattern) const noexcept;
 
     /**
      * @brief Gets the cap style used for stroking the path.
@@ -1543,14 +1216,9 @@ struct TVG_API Shape : Paint
     /**
      * @brief Creates a new Shape object.
      *
-     * This function allocates and returns a new Shape instance.
-     * To properly destroy the Shape object, use @ref Paint::rel().
-     *
-     * @return A pointer to the newly created Shape object.
-     *
-     * @see Paint::rel()
+     * @return A new Shape object.
      */
-    static Shape* gen() noexcept;
+    static std::unique_ptr<Shape> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -1559,27 +1227,33 @@ struct TVG_API Shape : Paint
      *
      * @return The class type ID of the Shape instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
-    _TVG_DECLARE_PRIVATE_DERIVE(Shape);
+    /**
+     * @see Shape::type()
+     */
+    TVG_DEPRECATED static uint32_t identifier() noexcept;
+
+    _TVG_DECLARE_PRIVATE(Shape);
 };
 
 
 /**
  * @class Picture
  *
- * @brief A class representing an image read in one of the supported formats: raw, svg, png, jpg, lot and etc.
+ * @brief A class representing an image read in one of the supported formats: raw, svg, png, jpg, lottie(json) and etc.
  * Besides the methods inherited from the Paint, it provides methods to load & draw images on the canvas.
  *
  * @note Supported formats are depended on the available TVG loaders.
  * @note See Animation class if the picture data is animatable.
- *
- * @warning This class is not designed for inheritance.
  */
-struct TVG_API Picture : Paint
+class TVG_API Picture final : public Paint
 {
+public:
+    ~Picture();
+
     /**
      * @brief Loads a picture data directly from a file.
      *
@@ -1587,7 +1261,7 @@ struct TVG_API Picture : Paint
      * This means that loading the same file again will not result in duplicate operations;
      * instead, ThorVG will reuse the previously loaded picture data.
      *
-     * @param[in] filename A file name, including the path, for the picture file.
+     * @param[in] path A path to the picture file.
      *
      * @retval Result::InvalidArguments In case the @p path is invalid.
      * @retval Result::NonSupport When trying to load a file with an unknown extension.
@@ -1595,7 +1269,12 @@ struct TVG_API Picture : Paint
      * @note The Load behavior can be asynchronous if the assigned thread number is greater than zero.
      * @see Initializer::init()
      */
-    Result load(const char* filename) noexcept;
+    Result load(const std::string& path) noexcept;
+
+    /**
+     * @deprecated Use load(const char* data, uint32_t size, const std::string& mimeType, bool copy) instead.
+     */
+    TVG_DEPRECATED Result load(const char* data, uint32_t size, bool copy = false) noexcept;
 
     /**
      * @brief Loads a picture data from a memory block of a given size.
@@ -1606,8 +1285,7 @@ struct TVG_API Picture : Paint
      *
      * @param[in] data A pointer to a memory location where the content of the picture file is stored. A null-terminated string is expected for non-binary data if @p copy is @c false.
      * @param[in] size The size in bytes of the memory occupied by the @p data.
-     * @param[in] mimeType Mimetype or extension of data such as "jpg", "jpeg", "lot", "lottie+json", "svg", "svg+xml", "png", etc. In case an empty string or an unknown type is provided, the loaders will be tried one by one.
-     * @param[in] rpath A resource directory path, if the @p data needs to access any external resources.
+     * @param[in] mimeType Mimetype or extension of data such as "jpg", "jpeg", "lottie", "svg", "svg+xml", "png", etc. In case an empty string or an unknown type is provided, the loaders will be tried one by one.
      * @param[in] copy If @c true the data are copied into the engine local buffer, otherwise they are not.
      *
      * @retval Result::InvalidArguments In case no data are provided or the @p size is zero or less.
@@ -1615,10 +1293,10 @@ struct TVG_API Picture : Paint
      *
      * @warning It's the user responsibility to release the @p data memory.
      *
-     * @note If you are unsure about the MIME type, you can provide an empty value like @c nullptr, and thorvg will attempt to figure it out.
+     * @note If you are unsure about the MIME type, you can provide an empty value like @c "", and thorvg will attempt to figure it out.
      * @since 0.5
      */
-    Result load(const char* data, uint32_t size, const char* mimeType, const char* rpath = nullptr, bool copy = false) noexcept;
+    Result load(const char* data, uint32_t size, const std::string& mimeType, bool copy = false) noexcept;
 
     /**
      * @brief Resizes the picture content to the given width and height.
@@ -1642,105 +1320,21 @@ struct TVG_API Picture : Paint
     Result size(float* w, float* h) const noexcept;
 
     /**
-     * @brief Sets the normalized origin point of the Picture object.
+     * @brief Loads raw data in ARGB8888 format from a memory block of the given size.
      *
-     * This method defines the origin point of the Picture using normalized coordinates.
-     * Unlike a typical pivot point used only for transformations, this origin affects both
-     * the transformation behavior and the actual rendering position of the Picture.
+     * ThorVG efficiently caches the loaded data using the specified @p data address as a key
+     * when the @p copy has @c false. This means that loading the same data again will not result in duplicate operations
+     * for the sharable @p data. Instead, ThorVG will reuse the previously loaded picture data.
      *
-     * The specified origin becomes the reference point for positioning the Picture on the canvas.
-     * For example, setting the origin to (0.5f, 0.5f) moves the visual center of the picture
-     * to the position specified by Paint::translate().
-     *
-     * The coordinates are given in a normalized range relative to the picture's bounds:
-     * - (0.0f, 0.0f): top-left corner
-     * - (0.5f, 0.5f): center
-     * - (1.0f, 1.0f): bottom-right corner
-     *
-     * @param[in] x The normalized x-coordinate of the origin point (range: 0.0f to 1.0f).
-     * @param[in] y The normalized y-coordinate of the origin point (range: 0.0f to 1.0f).
-     *
-     * @note This origin directly affects how the Picture is placed on the canvas when using
-     *       transformations such as translate(), rotate(), or scale().
-     *
-     * @see Paint::translate()
-     * @see Paint::rotate()
-     * @see Paint::scale()
-     *
-     * @since 1.0
-     */
-    Result origin(float x, float y) noexcept;
-
-    /**
-     * @brief Gets the normalized origin point of the Picture object.
-     *
-     * This method retrieves the current origin point of the Picture, expressed
-     * in normalized coordinates relative to the picture’s bounds.
-     *
-     * @param[out] x The normalized x-coordinate of the origin (range: 0.0f to 1.0f).
-     * @param[out] y The normalized y-coordinate of the origin (range: 0.0f to 1.0f).
-     *
-     * @see origin()
-     * @since 1.0
-     */
-    Result origin(float* x, float* y) const noexcept;
-
-    /**
-     * @brief Loads raw image data in a specific format from a memory block of the given size.
-     *
-     * ThorVG efficiently caches the loaded data, using the provided @p data address as a key
-     * when @p copy is set to @c false. This allows ThorVG to avoid redundant operations
-     * by reusing the previously loaded picture data for the same sharable @p data,
-     * rather than duplicating the load process.
-     *
-     * @param[in] data A pointer to the memory block where the raw image data is stored.
-     * @param[in] w The width of the image in pixels.
-     * @param[in] h The height of the image in pixels.
-     * @param[in] cs Specifies how the 32-bit color values should be interpreted.
-     * @param[in] copy If @c true, the data is copied into the engine's local buffer. If @c false, the data is not copied.
+     * @param[in] data A pointer to a memory location where the content of the picture raw data is stored.
+     * @param[in] w The width of the image @p data in pixels.
+     * @param[in] h The height of the image @p data in pixels.
+     * @param[in] premultiplied If @c true, the given image data is alpha-premultiplied.
+     * @param[in] copy If @c true the data are copied into the engine local buffer, otherwise they are not.
      *
      * @since 0.9
      */
-    Result load(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy = false) noexcept;
-
-    /**
-     * @brief Sets the asset resolver callback for handling external resources (e.g., images and fonts).
-     *
-     * This callback is invoked when an external asset reference (such as an image source or file path)
-     * is encountered in a Picture object. It allows the user to provide a custom mechanism for loading
-     * or substituting assets, such as loading from an external source or a virtual filesystem.
-     *
-     * @param[in] func A user-defined function that handles the resolution of asset paths.
-     *                 @p resolver can return @c true if the asset was successfully resolved by the user, or @c false if it was not.
-     * @param[in] data A pointer to user-defined data that will be passed to the callback each time it is invoked.
-     *                 This can be used to maintain context or access external resources.
-     *
-     * @retval Result::InsufficientCondition If the picture is already loaded.
-     * 
-     * @warning This function must be called before @ref Picture::load()
-     *          Setting the resolver after loading will have no effect on asset resolution for that asset.
-     * @note @p src will be either a font path or a font name. In the case of a font name, @p src will begin with "name:", e.g., "name:FreeSans-Medium".
-     * @note If @c false is returned by @p func, ThorVG will attempt to resolve the resource using its internal resolution mechanism as a fallback.
-     * @note To unset the resolver, pass @c nullptr as the @p func parameter.
-     *
-     * @note Experimental API
-     */
-    Result resolver(std::function<bool(Paint* paint, const char* src, void* data)> func, void* data) noexcept;
-
-    /**
-     * @brief Sets the image filtering method for rendering this picture.
-     *
-     * Specifies how the image data should be filtered when it is scaled or transformed
-     * during rendering. This affects the visual quality and performance of the output.
-     *
-     * @param[in] method The filtering method to apply. Default is @c FilterMethod::Bilinear.
-     *
-     * @return Always returns @c Result::Success.
-     *
-     * @see FilterMethod
-     * @note Experimental API
-     */
-    Result filter(FilterMethod method) noexcept;
+    Result load(uint32_t* data, uint32_t w, uint32_t h, bool copy) noexcept;
 
     /**
      * @brief Retrieve a paint object from the Picture scene by its Unique ID.
@@ -1753,21 +1347,16 @@ struct TVG_API Picture : Paint
      *
      * @see Accessor::id()
      *
-     * @since 1.0
+     * @note Experimental API
      */
     const Paint* paint(uint32_t id) noexcept;
 
     /**
      * @brief Creates a new Picture object.
      *
-     * This function allocates and returns a new Picture instance.
-     * To properly destroy the Picture object, use @ref Paint::rel().
-     *
-     * @return A pointer to the newly created Picture object.
-     *
-     * @see Paint::rel()
+     * @return A new Picture object.
      */
-    static Picture* gen() noexcept;
+    static std::unique_ptr<Picture> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -1776,12 +1365,17 @@ struct TVG_API Picture : Paint
      *
      * @return The class type ID of the Picture instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
+    /**
+     * @see Picture::type()
+     */
+    TVG_DEPRECATED static uint32_t identifier() noexcept;
+
     _TVG_DECLARE_ACCESSOR(Animation);
-    _TVG_DECLARE_PRIVATE_DERIVE(Picture);
+    _TVG_DECLARE_PRIVATE(Picture);
 };
 
 
@@ -1795,101 +1389,74 @@ struct TVG_API Picture : Paint
  *
  * As a group, the scene can be transformed, made translucent and composited with other target paints,
  * its children will be affected by the scene world.
- *
- * @warning This class is not designed for inheritance.
  */
-struct TVG_API Scene : Paint
+class TVG_API Scene final : public Paint
 {
+public:
+    ~Scene();
+
     /**
-     * @brief Adds a paint object to the scene.
+     * @brief Passes drawing elements to the Scene using Paint objects.
      *
-     * Appends a paint object to the scene. If the optional @p at parameter is provided, 
-     * the paint object is inserted immediately before the specified paint in the scene. 
-     * If @p at is @c nullptr, the paint object is appended to the end of the scene.
+     * Only the paints pushed into the scene will be the drawn targets.
+     * The paints are retained by the scene until Scene::clear() is called.
      *
-     * @param[in] target A pointer to the Paint object to be added to the scene.
-     *                   This parameter must not be @c nullptr.
-     * @param[in] at     A pointer to an existing Paint object in the scene before
-     *                   which @p target will be inserted. If @c nullptr,
-     *                   @p target is appended to the end of the scene.
-     *                   The default value is @c nullptr.
-     *
-     * @note Ownership of the @p target object is transferred to the scene upon
-     *       successful addition. To retain ownership, call @ref Paint::ref()
-     *       before adding it to the scene.
-     * @note The rendering order of paint objects follows their order in the scene.
-     *       If layering is required, ensure the paints are added in the desired order.
+     * @param[in] paint A Paint object to be drawn.
      *
+     * @note The rendering order of the paints is the same as the order as they were pushed. Consider sorting the paints before pushing them if you intend to use layering.
      * @see Scene::paints()
-     * @see Scene::remove()
-     * @see Paint::ref()
-     *
-     * @since 1.0
+     * @see Scene::clear()
      */
-    Result add(Paint* target, Paint* at = nullptr) noexcept;
+    Result push(std::unique_ptr<Paint> paint) noexcept;
+
+    TVG_DEPRECATED Result reserve(uint32_t size) noexcept;
 
     /**
-     * @brief Returns the list of paints currently held by the Scene.
+     * @brief Returns the list of the paints that currently held by the Scene.
      *
-     * This function provides a list of paint nodes, allowing users to access scene-graph information.
+     * This function provides the list of paint nodes, allowing users a direct opportunity to modify the scene tree.
      *
-     * @see Scene::add()
-     * @see Scene::remove()
+     * @warning Please avoid accessing the paints during Scene update/draw. You can access them after calling Canvas::sync().
+     * @see Canvas::sync()
+     * @see Scene::push(std::unique_ptr<Paint> paint)
+     * @see Scene::clear()
      *
-     * @warning This is read-only. Do not modify the list.
-     * @since 1.0
+     * @note Experimental API
      */
-    const std::list<Paint*>& paints() const noexcept;
+    std::list<Paint*>& paints() noexcept;
 
     /**
-     * @brief Removes a paint object or all paint objects from the scene.
+     * @brief Sets the total number of the paints pushed into the scene to be zero.
+     * Depending on the value of the @p free argument, the paints are freed or not.
      *
-     * This function removes a specified paint object from the scene. If no paint
-     * object is specified (i.e., the default @c nullptr is used), the function
-     * performs to clear all paints from the scene.
+     * @param[in] free If @c true, the memory occupied by paints is deallocated, otherwise it is not.
      *
-     * @param[in] paint A pointer to the Paint object to be removed from the scene.
-     *                  If @c nullptr, remove all the paints from the scene.
+     * @warning If you don't free the paints they become dangled. They are supposed to be reused, otherwise you are responsible for their lives. Thus please use the @p free argument only when you know how it works, otherwise it's not recommended.
      *
-     * @see Scene::add()
-     * @see Scene::paints()
-     *
-     * @since 1.0
+     * @since 0.2
      */
-    Result remove(Paint* paint = nullptr) noexcept;
+    Result clear(bool free = true) noexcept;
 
     /**
-     * @brief Add a post-processing effect to the scene.
+     * @brief Apply a post-processing effect to the scene.
      *
-     * Adds a post-processing effect to the scene's effect pipeline, which is applied
-     * after the scene has been rendered. Effects are applied cumulatively and in the
-     * order they are added. Calling this function multiple times will chain multiple
-     * effects sequentially.
+     * This function adds a specified scene effect, such as clearing all effects or applying a Gaussian blur,
+     * to the scene after it has been rendered. Multiple effects can be applied in sequence.
      *
-     * Certain effects may be used to modify the pipeline behavior itself. For example,
-     * @c SceneEffect::Clear removes all previously added effects.
+     * @param[in] effect The scene effect to apply. Options are defined in the SceneEffect enum.
+     *                   For example, use SceneEffect::GaussianBlur to apply a blur with specific parameters.
+     * @param[in] ... Additional variadic parameters required for certain effects (e.g., sigma and direction for GaussianBlur).
      *
-     * @param[in] effect The scene effect to add. Available effects are defined in the @ref SceneEffect enum.
-     * @param[in] ...    Additional variadic parameters required for certain effects (e.g., sigma and direction for GaussianBlur).
-     *
-     * @note The caller must provide the correct parameters for the selected effect.
-     *       Supplying incorrect or insufficient arguments results in undefined behavior.
-     *
-     * @since 1.0
+     * @note Experimental API
      */
-    Result add(SceneEffect effect, ...) noexcept;
+    Result push(SceneEffect effect, ...) noexcept;
 
     /**
      * @brief Creates a new Scene object.
      *
-     * This function allocates and returns a new Scene instance.
-     * To properly destroy the Scene object, use @ref Paint::rel().
-     *
-     * @return A pointer to the newly created Scene object.
-     *
-     * @see Paint::rel()
+     * @return A new Scene object.
      */
-    static Scene* gen() noexcept;
+    static std::unique_ptr<Scene> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -1898,11 +1465,16 @@ struct TVG_API Scene : Paint
      *
      * @return The class type ID of the Scene instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
-    _TVG_DECLARE_PRIVATE_DERIVE(Scene);
+    /**
+     * @see Scene::type()
+     */
+    TVG_DEPRECATED static uint32_t identifier() noexcept;
+
+    _TVG_DECLARE_PRIVATE(Scene);
 };
 
 
@@ -1911,51 +1483,38 @@ struct TVG_API Scene : Paint
  *
  * @brief A class to represent text objects in a graphical context, allowing for rendering and manipulation of unicode text.
  *
- * @warning This class is not designed for inheritance.
- *
  * @since 0.15
  */
-struct TVG_API Text : Paint
+class TVG_API Text final : public Paint
 {
+public:
+    ~Text();
+
     /**
-     * @brief Sets the font family for the text.
+     * @brief Sets the font properties for the text.
      *
-     * This function specifies the name of the font to be used when rendering text.
+     * This function allows you to define the font characteristics used for text rendering.
+     * It sets the font name, size and optionally the style.
      *
-     * @param[in] name The name of the font. This should match a font available through the canvas backend.
-     *                 If set to @c nullptr, ThorVG will attempt to select a fallback font available on the engine.
+     * @param[in] name The name of the font. This should correspond to a font available in the canvas.
+     *                 If set to @c nullptr, ThorVG will attempt to select a fallback font available on the system.
+     * @param[in] size The size of the font in points. This determines how large the text will appear.
+     * @param[in] style The style of the font. It can be used to set the font to 'italic'.
+     *                  If not specified, the default style is used. Only 'italic' style is supported currently.
      *
      * @retval Result::InsufficientCondition when the specified @p name cannot be found.
      *
-     * @note This function only sets the font family name. Use @ref size() to define the font size.
-     * @note If the @p name is not specified, ThorVG will select an available fallback font.
-     *
-     * @see Text::size()
-     * @see Text::load()
-     *
+     * @note If the @p name is not specified, ThorVG will select any available font candidate.
      * @since 1.0
+     *
+     * @code
+     * // Tip for fallback support to use any available font.
+     * if (text->font("Arial", 24) != tvg::Result::Success) {
+     *     text->font(nullptr, 24);
+     * }
+     * @endcode
      */
-    Result font(const char* name) noexcept;
-
-    /**
-     * @brief Sets the font size for the text.
-     *
-     * This function sets the font size used during text rendering.
-     * The size is specified in point units, and supports floating-point precision
-     * for smooth scaling and animation effects.
-     *
-     * @param[in] size The font size in points. Must be greater than 0.0.
-     *
-     * @retval Result::InvalidArguments if the @p size is less than or equal to 0.
-     *
-     * @note Use this function in combination with @ref font() to fully define text appearance.
-     * @note Fractional sizes (e.g., 12.5) are supported for sub-pixel rendering and animations.
-     *
-     * @see Text::font()
-     *
-     * @since 1.0
-     */
-    Result size(float size) noexcept;
+    Result font(const char* name, float size, const char* style = nullptr) noexcept;
 
     /**
      * @brief Assigns the given unicode text to be rendered.
@@ -1965,126 +1524,9 @@ struct TVG_API Text : Paint
      *
      * @param[in] text The multi-byte text encoded with utf8 string to be rendered.
      *
-     * @see Text::text()
-     * @since 1.0
-     */
-    Result text(const char* text) noexcept;
-
-    /**
-     * @brief Returns the currently assigned unicode text.
-     *
-     * This function retrieves the unicode string that is currently set
-     * for rendering. The returned text is encoded in UTF-8.
-     *
-     * @return The UTF-8 encoded multi-byte text string.
-     *
-     * @see Text::text(const char* text)
      * @note Experimental API
      */
-    const char* text() const noexcept;
-
-    /**
-     * @brief Sets text alignment or anchor per axis.
-     *
-     * If layout width/height is set on an axis, align within the layout box.
-     * Otherwise, treat it as an anchor within the text bounds which point of
-     * the text box is pinned to the paint position.
-     *
-     * @param[in] x Horizontal alignment/anchor in [0..1]: 0=left/start, 0.5=center, 1=right/end. (Default is 0)
-     * @param[in] y Vertical alignment/anchor in [0..1]: 0=top, 0.5=middle, 1=bottom. (Default is 0)
-     *
-     * @since 1.0
-     *
-     * @see layout()
-     */
-    Result align(float x, float y) noexcept;
-
-    /**
-     * @brief Sets the virtual layout box (constraints) for the text.
-     *
-     * If width/height is set on an axis, that axis is constrained by a virtual layout box and
-     * the text may wrap/align inside it. If width/height == 0, the axis is
-     * unconstrained and @ref align() acts as an anchor on that axis.
-     *
-     * @param[in] w Layout width in user space. Use 0 for no horizontal constraint. (Default is 0)
-     * @param[in] h Layout height in user space. Use 0 for no vertical constraint. (Default is 0)
-     *
-     * @note This defines constraints only; alignment/anchoring is controlled by @ref align().
-     * @since 1.0
-     *
-     * @see align()
-     * @see spacing()
-     */
-    Result layout(float w, float h) noexcept;
-
-    /**
-     * @brief Sets the text wrapping mode for this text object.
-     *
-     * This method controls how the text is laid out when it exceeds the available space.
-     * The wrapping mode determines whether text is truncated, wrapped by character or word,
-     * or adjusted automatically. An ellipsis mode is also available for truncation with "...".
-     *
-     * @param[in] mode The wrapping strategy to apply. Default is @c TextWrap::None
-     *
-     * @see TextWrap
-     * @see Text::lines()
-     * @since 1.0
-     */
-    Result wrap(TextWrap mode) noexcept;
-
-    /**
-     * @brief Returns the number of text lines.
-     *
-     * This function retrieves the number of lines generated after applying text layout and wrapping.
-     * The returned value reflects the current wrapping configuration set by Text::wrap().
-     * The line count is also increased by explicit line feed characters ('\n') contained in the text.
-     *
-     * @return The total number of lines.
-     *
-     * @see Text::wrap()
-     * @since Experimental API
-     */
-    uint32_t lines() noexcept;
-
-    /**
-     * @brief Apply an italic (slant) transformation to the text.
-     *
-     * This function applies a shear transformation to simulate an italic (oblique) style
-     * for the current text object. The shear factor determines the degree of slant
-     * applied along the X-axis.
-     *
-     * @param[in] shear The shear factor to apply. A value of 0.0 applies no slant, while values around 0.5 result in a strong slant.
-     *                  Must be in the range [0.0, 0.5]. Default value is 0.18.
-     *
-     * @note The @p shear factor will be clamped to the valid range if it exceeds the limits.
-     * @note This does not require the font itself to be italic.
-     *       It visually simulates the effect by applying a transformation matrix.
-     *
-     * @warning Excessive slanting may cause visual distortion depending on the font and size.
-     *
-     * @see Text::font()
-     *
-     * @since 1.0
-     */
-    Result italic(float shear = 0.18f) noexcept;
-
-    /**
-     * @brief Sets an outline (stroke) around the text object.
-     *
-     * This function adds an outline to the text with the specified width and RGB color.
-     * The outline enhances the visibility of the text by rendering a stroke around its glyphs.
-     *
-     * @param width The width of the outline. Must be positive value. (The default is 0)
-     * @param r     Red component of the outline color (0–255).
-     * @param g     Green component of the outline color (0–255).
-     * @param b     Blue component of the outline color (0–255).
-     *
-     * @note To disable the outline, set @p width to 0.
-     * @see Text::fill() to set the main text fill color.
-     *
-     * @since 1.0
-     */
-    Result outline(float width, uint8_t r, uint8_t g, uint8_t b) noexcept;
+    Result text(const char* text) noexcept;
 
     /**
      * @brief Sets the text color.
@@ -2094,7 +1536,6 @@ struct TVG_API Text : Paint
      * @param[in] b The blue color channel value in the range [0 ~ 255]. The default value is 0.
      *
      * @see Text::font()
-     * @see Text::outline()
      *
      * @since 0.15
      */
@@ -2112,70 +1553,7 @@ struct TVG_API Text : Paint
      *
      * @since 0.15
      */
-    Result fill(Fill* f) noexcept;
-
-    /**
-     * @brief Set the spacing scale factors for text layout.
-     *
-     * This function adjusts the letter spacing (horizontal space between glyphs) and
-     * line spacing (vertical space between lines of text) using scale factors.
-     *
-     * Both values are relative to the font's default metrics:
-     * - The letter spacing is applied as a scale factor to the glyph's advance width.
-     * - The line spacing is applied as a scale factor to the glyph's advance height.
-     *
-     * @param[in] letter The scale factor for letter spacing.
-     *                   Values > 1.0 increase spacing, values < 1.0 decrease it.
-     *                   Must be greater than or equal to 0.0. (default: 1.0)
-     *
-     * @param[in] line The scale factor for line spacing.
-     *                 Values > 1.0 increase line spacing, values < 1.0 decrease it.
-     *                 Must be greater than or equal to 0.0. (default: 1.0)
-     *
-     * @since 1.0
-     */
-    Result spacing(float letter, float line) noexcept;
-
-    /**
-     * @brief Retrieves the layout metrics of the text object.
-     *
-     * Fills the provided `TextMetrics` structure with the font layout values of this text object,
-     * such as ascent, descent, linegap, and line advance.
-     *
-     * The returned values reflect the font size applied to the text object,
-     * but do not include any transformations (e.g., scale, rotation, or translation).
-     *
-     * @param[out] metrics A reference to a `TextMetrics` structure to be filled with the resulting values.
-     *
-     * @return Result::InsufficientCondition if no font or size has been set yet.
-     *
-     * @see TextMetrics
-     * @note Experimental API
-     */
-    Result metrics(TextMetrics& metrics) const noexcept;
-
-    /**
-     * @brief Retrieves the layout metrics of a glyph in the text object.
-     *
-     * Fills the provided `GlyphMetrics` structure with the horizontal layout values
-     * of the specified glyph, such as advance, left-side bearing, and bounding box.
-     *
-     * The returned values reflect the font size applied to the text object,
-     * but do not include any transformations (e.g., scale, rotation, or translation).
-     *
-     * The input character must be a single UTF-8 encoded character.
-     *
-     * @param[in] ch A pointer to a UTF-8 encoded character.
-     * @param[out] metrics A reference to a @ref GlyphMetrics structure to be filled with the resulting values.
-     *
-     * @return Result::InsufficientCondition if no font or size has been set yet.
-     * @return Result::InvalidArguments if the given character is invalid or not supported.
-     *
-     * @see GlyphMetrics
-     * @note Currently, ThorVG only supports horizontal text layout.
-     * @note Experimental API
-     */
-    Result metrics(const char* ch, GlyphMetrics& metrics) const noexcept;
+    Result fill(std::unique_ptr<Fill> f) noexcept;
 
     /**
      * @brief Loads a scalable font data (ttf) from a file.
@@ -2184,16 +1562,16 @@ struct TVG_API Text : Paint
      * This means that loading the same file again will not result in duplicate operations;
      * instead, ThorVG will reuse the previously loaded font data.
      *
-     * @param[in] filename A file name, including the path, for the font file.
+     * @param[in] path The path to the font file.
      *
      * @retval Result::InvalidArguments In case the @p path is invalid.
      * @retval Result::NonSupport When trying to load a file with an unknown extension.
      *
-     * @see Text::unload(const char* filename)
+     * @see Text::unload(const std::string& path)
      *
      * @since 0.15
      */
-    static Result load(const char* filename) noexcept;
+    static Result load(const std::string& path) noexcept;
 
     /**
      * @brief Loads a scalable font data (ttf) from a memory block of a given size.
@@ -2215,42 +1593,37 @@ struct TVG_API Text : Paint
      * @warning It's the user responsibility to release the @p data memory.
      *
      * @note To unload the font data loaded using this API, pass the proper @p name and @c nullptr as @p data.
-     * @note If you are unsure about the MIME type, you can provide an empty value like @c nullptr, and thorvg will attempt to figure it out.
+     * @note If you are unsure about the MIME type, you can provide an empty value like @c "", and thorvg will attempt to figure it out.
      * @see Text::font(const char* name, float size, const char* style)
      *
-     * @since 0.15
+     * @note 0.15
      */
-    static Result load(const char* name, const char* data, uint32_t size, const char* mimeType = "ttf", bool copy = false) noexcept;
+    static Result load(const char* name, const char* data, uint32_t size, const std::string& mimeType = "ttf", bool copy = false) noexcept;
 
     /**
      * @brief Unloads the specified scalable font data (TTF) that was previously loaded.
      *
      * This function is used to release resources associated with a font file that has been loaded into memory.
      *
-     * @param[in] filename The file name of the loaded font, including the path.
+     * @param[in] path The file path of the loaded font.
      *
      * @retval Result::InsufficientCondition Fails if the loader is not initialized.
      *
      * @note If the font data is currently in use, it will not be immediately unloaded.
-     * @see Text::load(const char* filename)
+     * @see Text::load(const std::string& path)
      * 
      * @since 0.15
      */
-    static Result unload(const char* filename) noexcept;
+    static Result unload(const std::string& path) noexcept;
 
     /**
      * @brief Creates a new Text object.
      *
-     * This function allocates and returns a new Text instance.
-     * To properly destroy the Text object, use @ref Paint::rel().
-     *
-     * @return A pointer to the newly created Text object.
-     *
-     * @see Paint::rel()
+     * @return A new Text object.
      *
      * @since 0.15
      */
-    static Text* gen() noexcept;
+    static std::unique_ptr<Text> gen() noexcept;
 
     /**
      * @brief Returns the ID value of this class.
@@ -2259,11 +1632,11 @@ struct TVG_API Text : Paint
      *
      * @return The class type ID of the Text instance.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Type type() const noexcept override;
 
-    _TVG_DECLARE_PRIVATE_DERIVE(Text);
+    _TVG_DECLARE_PRIVATE(Text);
 };
 
 
@@ -2272,9 +1645,32 @@ struct TVG_API Text : Paint
  *
  * @brief A class for the rendering graphical elements with a software raster engine.
  */
-struct TVG_API SwCanvas final : Canvas
+class TVG_API SwCanvas final : public Canvas
 {
-    ~SwCanvas() override;
+public:
+    ~SwCanvas();
+
+    /**
+     * @brief Enumeration specifying the methods of combining the 8-bit color channels into 32-bit color.
+     */
+    enum Colorspace
+    {
+        ABGR8888 = 0,      ///< The channels are joined in the order: alpha, blue, green, red. Colors are alpha-premultiplied. (a << 24 | b << 16 | g << 8 | r)
+        ARGB8888,          ///< The channels are joined in the order: alpha, red, green, blue. Colors are alpha-premultiplied. (a << 24 | r << 16 | g << 8 | b)
+        ABGR8888S,         ///< The channels are joined in the order: alpha, blue, green, red. Colors are un-alpha-premultiplied. @since 0.12
+        ARGB8888S,         ///< The channels are joined in the order: alpha, red, green, blue. Colors are un-alpha-premultiplied. @since 0.12
+    };
+
+    /**
+     * @brief Enumeration specifying the methods of Memory Pool behavior policy.
+     * @since 0.4
+     */
+    enum MempoolPolicy
+    {
+        Default = 0, ///< Default behavior that ThorVG is designed to.
+        Shareable,   ///< Memory Pool is shared among the SwCanvases.
+        Individual   ///< Allocate designated memory pool that is only used by current instance.
+    };
 
     /**
      * @brief Sets the drawing target for the rasterization.
@@ -2291,26 +1687,42 @@ struct TVG_API SwCanvas final : Canvas
      * @retval Result::InsufficientCondition if the canvas is performing rendering. Please ensure the canvas is synced.
      * @retval Result::NonSupport In case the software engine is not supported.
      *
-     * @warning Do not access @p buffer during Canvas::add() - Canvas::sync(). It should not be accessed while the engine is writing on it.
+     * @warning Do not access @p buffer during Canvas::push() - Canvas::sync(). It should not be accessed while the engine is writing on it.
      *
      * @see Canvas::viewport()
      * @see Canvas::sync()
     */
-    Result target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h, ColorSpace cs) noexcept;
+    Result target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h, Colorspace cs) noexcept;
 
     /**
-     * @brief Creates a new SwCanvas object with optional rendering engine settings.
+     * @brief Set sw engine memory pool behavior policy.
      *
-     * This method generates a software canvas instance that can be used for drawing vector graphics.
-     * It accepts an optional parameter @p op to choose between different rendering engine behaviors.
+     * Basically ThorVG draws a lot of shapes, it allocates/deallocates a few chunk of memory
+     * while processing rendering. It internally uses one shared memory pool
+     * which can be reused among the canvases in order to avoid memory overhead.
      *
-     * @param[in] op The rendering engine option. Default is @c EngineOption::Default.
+     * Thus ThorVG suggests using a memory pool policy to satisfy user demands,
+     * if it needs to guarantee the thread-safety of the internal data access.
      *
+     * @param[in] policy The method specifying the Memory Pool behavior. The default value is @c MempoolPolicy::Default.
+     *
+     * @retval Result::InsufficientCondition If the canvas contains some paints already.
+     * @retval Result::NonSupport In case the software engine is not supported.
+     *
+     * @note When @c policy is set as @c MempoolPolicy::Individual, the current instance of canvas uses its own individual
+     *       memory data, which is not shared with others. This is necessary when the canvas is accessed on a worker-thread.
+     *
+     * @warning It's not allowed after pushing any paints.
+     *
+     * @since 0.4
+    */
+    Result mempool(MempoolPolicy policy) noexcept;
+
+    /**
+     * @brief Creates a new SwCanvas object.
      * @return A new SwCanvas object.
-     *
-     * @see enum EngineOption
      */
-    static SwCanvas* gen(EngineOption op = EngineOption::Default) noexcept;
+    static std::unique_ptr<SwCanvas> gen() noexcept;
 
     _TVG_DECLARE_PRIVATE(SwCanvas);
 };
@@ -2323,9 +1735,10 @@ struct TVG_API SwCanvas final : Canvas
  *
  * @since 0.14
  */
-struct TVG_API GlCanvas final : Canvas
+class TVG_API GlCanvas final : public Canvas
 {
-    ~GlCanvas() override;
+public:
+    ~GlCanvas();
 
     /**
      * @brief Sets the drawing target for rasterization.
@@ -2333,44 +1746,29 @@ struct TVG_API GlCanvas final : Canvas
      * This function specifies the drawing target where the rasterization will occur. It can target
      * a specific framebuffer object (FBO) or the main surface.
      *
-     * @param[in] display The platform-specific display handle (EGLDisplay for EGL). Set @c nullptr for other systems.
-     * @param[in] surface The platform-specific surface handle (EGLSurface for EGL, HDC for WGL). Set @c nullptr for other systems.
-     * @param[in] context The OpenGL context to be used for rendering on this canvas.
      * @param[in] id The GL target ID, usually indicating the FBO ID. A value of @c 0 specifies the main surface.
      * @param[in] w The width (in pixels) of the raster image.
      * @param[in] h The height (in pixels) of the raster image.
-     * @param[in] cs Specifies how the pixel values should be interpreted. Currently, it only allows @c ColorSpace::ABGR8888S as @c GL_RGBA8.
      *
-     * @retval Result::InsufficientCondition If the canvas is currently rendering.
-     *         Ensure that @ref Canvas::sync() has been called before setting a new target.
+     * @retval Result::InsufficientCondition if the canvas is performing rendering. Please ensure the canvas is synced.
      * @retval Result::NonSupport In case the gl engine is not supported.
      *
-     * @note If @p display and @p surface are not provided, the ThorVG GL engine assumes that
-     *       the appropriate OpenGL context is already current and will not attempt to bind a new one.
-     *
+     * @see Canvas::viewport()
      * @see Canvas::sync()
      *
-     * @since 1.0
+     * @note Currently, this only allows the GL_RGBA8 color space format.
+     * @note Experimental API
     */
-    Result target(void* display, void* surface, void* context, int32_t id, uint32_t w, uint32_t h, ColorSpace cs) noexcept;
+    Result target(int32_t id, uint32_t w, uint32_t h) noexcept;
 
     /**
-     * @brief Creates a new OpenGL/ES Canvas object with optional rendering engine settings.
-     *
-     * This method generates a OpenGL canvas instance that can be used for drawing vector graphics.
-     * It accepts an optional parameter @p op to choose between different rendering engine behaviors.
-     *
-     * @param[in] op The rendering engine option. Default is @c EngineOption::Default.
+     * @brief Creates a new GlCanvas object.
      *
      * @return A new GlCanvas object.
      *
-     * @note Currently, it does not support @c EngineOption::SmartRender. The request will be ignored.
-     *
-     * @see enum EngineOption
-     *
-     * @since 1.0
+     * @since 0.14
      */
-    static GlCanvas* gen(EngineOption op = EngineOption::Default) noexcept;
+    static std::unique_ptr<GlCanvas> gen() noexcept;
 
     _TVG_DECLARE_PRIVATE(GlCanvas);
 };
@@ -2385,48 +1783,38 @@ struct TVG_API GlCanvas final : Canvas
  *
  * @since 0.15
  */
-struct TVG_API WgCanvas final : Canvas
+class TVG_API WgCanvas final : public Canvas
 {
-    ~WgCanvas() override;
+public:
+    ~WgCanvas();
 
     /**
      * @brief Sets the drawing target for the rasterization.
      *
-     * @param[in] device WGPUDevice, a desired handle for the wgpu device. If it is @c nullptr, ThorVG will assign an appropriate device internally.
      * @param[in] instance WGPUInstance, context for all other wgpu objects.
-     * @param[in] target Either WGPUSurface or WGPUTexture, serving as handles to a presentable surface or texture.
-     * @param[in] w The width of the target.
-     * @param[in] h The height of the target.
-     * @param[in] cs Specifies how the pixel values should be interpreted. Currently, it only allows @c ColorSpace::ABGR8888S as @c WGPUTextureFormat_RGBA8Unorm.
-     * @param[in] type @c 0: surface, @c 1: texture are used as pesentable target.
+     * @param[in] surface WGPUSurface, handle to a presentable surface.
+     * @param[in] w The width of the surface.
+     * @param[in] h The height of the surface.
+     * @param[in] device WGPUDevice, a desired handle for the wgpu device. If it is @c nullptr, ThorVG will assign an appropriate device internally.
      *
      * @retval Result::InsufficientCondition if the canvas is performing rendering. Please ensure the canvas is synced.
      * @retval Result::NonSupport In case the wg engine is not supported.
      *
-     * @since 1.0
+     * @note Experimental API
      *
      * @see Canvas::viewport()
      * @see Canvas::sync()
      */
-    Result target(void* device, void* instance, void* target, uint32_t w, uint32_t h, ColorSpace cs, int type = 0) noexcept;
+    Result target(void* instance, void* surface, uint32_t w, uint32_t h, void* device = nullptr) noexcept;
 
     /**
-     * @brief Creates a new WebGPU Canvas object with optional rendering engine settings.
-     *
-     * This method generates a WebGPU canvas instance that can be used for drawing vector graphics.
-     * It accepts an optional parameter @p op to choose between different rendering engine behaviors.
-     *
-     * @param[in] op The rendering engine option. Default is @c EngineOption::Default.
+     * @brief Creates a new WgCanvas object.
      *
      * @return A new WgCanvas object.
      *
-     * @note Currently, it does not support @c EngineOption::SmartRender. The request will be ignored.
-     *
-     * @see enum EngineOption
-     *
-     * @since 1.0
+     * @since 0.15
      */
-    static WgCanvas* gen(EngineOption op = EngineOption::Default) noexcept;
+    static std::unique_ptr<WgCanvas> gen() noexcept;
 
     _TVG_DECLARE_PRIVATE(WgCanvas);
 };
@@ -2437,40 +1825,39 @@ struct TVG_API WgCanvas final : Canvas
  *
  * @brief A class that enables initialization and termination of the TVG engines.
  */
-struct TVG_API Initializer final
+class TVG_API Initializer final
 {
+public:
     /**
-     * @brief Initializes the ThorVG engine runtime.
+     * @brief Initializes TVG engines.
      *
-     * ThorVG requires an active runtime environment for rendering operations.
-     * This function sets up an internal task scheduler and creates a specified number
-     * of worker threads to enable parallel rendering.
+     * TVG requires the running-engine environment.
+     * TVG runs its own task-scheduler for parallelizing rendering tasks efficiently.
+     * You can indicate the number of threads, the count of which is designated @p threads.
+     * In the initialization step, TVG will generate/spawn the threads as set by @p threads count.
      *
-     * @param[in] threads The number of worker threads to launch.
-     *                    A value of 0 indicates that only the main thread will be used.
+     * @param[in] engine The engine types to initialize. This is relative to the Canvas types, in which it will be used. For multiple backends bitwise operation is allowed.
+     * @param[in] threads The number of additional threads. Zero indicates only the main thread is to be used.
      *
-     * @return Result indicating success or failure of initialization.
-     *
-     * @note This function uses internal reference counting to allow multiple init() calls.
-     *       However, the number of threads is fixed during the first successful initialization
-     *       and cannot be changed in subsequent calls.
+     * @retval Result::NonSupport In case the engine type is not supported on the system.
      *
+     * @note The Initializer keeps track of the number of times it was called. Threads count is fixed at the first init() call.
      * @see Initializer::term()
      */
-    static Result init(uint32_t threads = 0) noexcept;
+    static Result init(CanvasEngine engine, uint32_t threads) noexcept;
 
     /**
-     * @brief Terminates the ThorVG engine.
+     * @brief Terminates TVG engines.
      *
-     * Cleans up resources and stops any internal threads initialized by init().
+     * @param[in] engine The engine types to terminate. This is relative to the Canvas types, in which it will be used. For multiple backends bitwise operation is allowed
      *
-     * @retval Result::InsufficientCondition Returned if there is nothing to terminate (e.g., init() was not called).
+     * @retval Result::InsufficientCondition In case there is nothing to be terminated.
+     * @retval Result::NonSupport In case the engine type is not supported on the system.
      *
-     * @note The initializer maintains a reference count for safe repeated use.
-     *       Only the final call to term() will fully shut down the engine.
+     * @note Initializer does own reference counting for multiple calls.
      * @see Initializer::init()
      */
-    static Result term() noexcept;
+    static Result term(CanvasEngine engine) noexcept;
 
     /**
      * @brief Retrieves the version of the TVG engine.
@@ -2498,9 +1885,11 @@ struct TVG_API Initializer final
  *
  * @since 0.13
  */
-struct TVG_API Animation
+
+class TVG_API Animation
 {
-    virtual ~Animation();
+public:
+    ~Animation();
 
     /**
      * @brief Specifies the current frame in the animation.
@@ -2515,19 +1904,21 @@ struct TVG_API Animation
      *       Values less than 0.001 may be disregarded and may not be accurately retained by the Animation.
      *
      * @see totalFrame()
+     *
      */
     Result frame(float no) noexcept;
 
     /**
      * @brief Retrieves a picture instance associated with this animation instance.
      *
-     * This function provides access to the picture instance that can be used to load animation formats, such as lot.
-     * After setting up the picture, it can be added to the designated canvas, enabling control over animation frames
+     * This function provides access to the picture instance that can be used to load animation formats, such as Lottie(json).
+     * After setting up the picture, it can be pushed to the designated canvas, enabling control over animation frames
      * with this Animation instance.
      *
      * @return A picture instance that is tied to this animation.
      *
      * @warning The picture instance is owned by Animation. It should not be deleted manually.
+     *
      */
     Picture* picture() const noexcept;
 
@@ -2538,8 +1929,9 @@ struct TVG_API Animation
      *
      * @note If the Picture is not properly configured, this function will return 0.
      *
-     * @see Animation::frame()
+     * @see Animation::frame(float no)
      * @see Animation::totalFrame()
+     *
      */
     float curFrame() const noexcept;
 
@@ -2550,6 +1942,7 @@ struct TVG_API Animation
      *
      * @note Frame numbering starts from 0.
      * @note If the Picture is not properly configured, this function will return 0.
+     *
      */
     float totalFrame() const noexcept;
 
@@ -2559,6 +1952,7 @@ struct TVG_API Animation
      * @return The duration of the animation in seconds.
      *
      * @note If the Picture is not properly configured, this function will return 0.
+     *
      */
     float duration() const noexcept;
 
@@ -2570,33 +1964,30 @@ struct TVG_API Animation
      * After setting, the number of animation frames and the playback time are calculated
      * by mapping the playback segment as the entire range.
      *
-     * @param[in] begin segment begin frame.
-     * @param[in] end segment end frame.
+     * @param[in] begin segment start.
+     * @param[in] end segment end.
      *
      * @retval Result::InsufficientCondition In case the animation is not loaded.
-     * @retval Result::InvalidArguments If the @p begin is higher than @p end.
      * @retval Result::NonSupport When it's not animatable.
      *
-     * @note Animation allows a range from 0.0 to the total frame. @p end should not be higher than @p begin.
+     * @note Animation allows a range from 0.0 to 1.0. @p end should not be higher than @p begin.
      * @note If a marker has been specified, its range will be disregarded.
-     *
      * @see LottieAnimation::segment(const char* marker)
-     * @see Animation::totalFrame()
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Result segment(float begin, float end) noexcept;
 
     /**
-     * @brief Gets the current segment range information.
+     * @brief Gets the current segment.
      *
-     * @param[out] begin segment begin frame.
-     * @param[out] end segment end frame.
+     * @param[out] begin segment start.
+     * @param[out] end segment end.
      *
      * @retval Result::InsufficientCondition In case the animation is not loaded.
      * @retval Result::NonSupport When it's not animatable.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Result segment(float* begin, float* end = nullptr) noexcept;
 
@@ -2604,10 +1995,11 @@ struct TVG_API Animation
      * @brief Creates a new Animation object.
      *
      * @return A new Animation object.
+     *
      */
-    static Animation* gen() noexcept;
+    static std::unique_ptr<Animation> gen() noexcept;
 
-    _TVG_DECLARE_PRIVATE_BASE(Animation);
+    _TVG_DECLARE_PRIVATE(Animation);
 };
 
 
@@ -2628,8 +2020,9 @@ struct TVG_API Animation
  *
  * @since 0.5
  */
-struct TVG_API Saver final
+class TVG_API Saver final
 {
+public:
     ~Saver();
 
     /**
@@ -2637,9 +2030,9 @@ struct TVG_API Saver final
      *
      * @param[in] paint The paint to be drawn as the background image for the saving paint.
      *
-     * @since 1.0
+     * @note Experimental API
      */
-    Result background(Paint* paint) noexcept;
+    Result background(std::unique_ptr<Paint> paint) noexcept;
 
     /**
      * @brief Exports the given @p paint data to the given @p path
@@ -2649,8 +2042,8 @@ struct TVG_API Saver final
      * if you wish to optimize for speed.
      *
      * @param[in] paint The paint to be saved with all its associated properties.
-     * @param[in] filename A file name, including the path, where the paint data will be saved.
-     * @param[in] quality The encoded quality level. @c 0 is the minimum, @c 100 is the maximum value(recommended).
+     * @param[in] path A path to the file, in which the paint data is to be saved.
+     * @param[in] compress If @c true then compress data if possible.
      *
      * @retval Result::InsufficientCondition If currently saving other resources.
      * @retval Result::NonSupport When trying to save a file with an unknown extension or in an unsupported format.
@@ -2661,7 +2054,7 @@ struct TVG_API Saver final
      *
      * @since 0.5
      */
-    Result save(Paint* paint, const char* filename, uint32_t quality = 100) noexcept;
+    Result save(std::unique_ptr<Paint> paint, const std::string& path, bool compress = true) noexcept;
 
     /**
      * @brief Export the provided animation data to the specified file path.
@@ -2669,7 +2062,7 @@ struct TVG_API Saver final
      * This function exports the given animation data to the provided file path. You can also specify the desired frame rate in frames per second (FPS) by providing the fps parameter.
      *
      * @param[in] animation The animation to be saved, including all associated properties.
-     * @param[in] filename A file name, including the path, where the animation will be saved.
+     * @param[in] path The path to the file where the animation will be saved.
      * @param[in] quality The encoded quality level. @c 0 is the minimum, @c 100 is the maximum value(recommended).
      * @param[in] fps The desired frames per second (FPS). For example, to encode data at 60 FPS, pass 60. Pass 0 to keep the original frame data.
      *
@@ -2682,9 +2075,9 @@ struct TVG_API Saver final
      *
      * @see Saver::sync()
      *
-     * @since 1.0
+     * @note Experimental API
      */
-    Result save(Animation* animation, const char* filename, uint32_t quality = 100, uint32_t fps = 0) noexcept;
+    Result save(std::unique_ptr<Animation> animation, const std::string& path, uint32_t quality = 100, uint32_t fps = 0) noexcept;
 
     /**
      * @brief Guarantees that the saving task is finished.
@@ -2707,9 +2100,9 @@ struct TVG_API Saver final
      *
      * @since 0.5
      */
-    static Saver* gen() noexcept;
+    static std::unique_ptr<Saver> gen() noexcept;
 
-    _TVG_DECLARE_PRIVATE_BASE(Saver);
+    _TVG_DECLARE_PRIVATE(Saver);
 };
 
 
@@ -2724,10 +2117,13 @@ struct TVG_API Saver final
  *
  * @since 0.10
  */
-struct TVG_API Accessor final
+class TVG_API Accessor final
 {
+public:
     ~Accessor();
 
+    TVG_DEPRECATED std::unique_ptr<Picture> set(std::unique_ptr<Picture> picture, std::function<bool(const Paint* paint)> func) noexcept;
+
     /**
      * @brief Set the access function for traversing the Picture scene tree nodes.
      *
@@ -2737,7 +2133,7 @@ struct TVG_API Accessor final
      *
      * @note The bitmap based picture might not have the scene-tree.
      *
-     * @since 1.0
+     * @note Experimental API
      */
     Result set(Paint* paint, std::function<bool(const Paint* paint, void* data)> func, void* data) noexcept;
 
@@ -2753,7 +2149,7 @@ struct TVG_API Accessor final
      *
      * @see Paint::id
      *
-     * @since 1.0
+     * @note Experimental API
      */
     static uint32_t id(const char* name) noexcept;
 
@@ -2762,11 +2158,34 @@ struct TVG_API Accessor final
      *
      * @return A new Accessor object.
      */
-    static Accessor* gen() noexcept;
+    static std::unique_ptr<Accessor> gen() noexcept;
 
-    _TVG_DECLARE_PRIVATE_BASE(Accessor);
+    _TVG_DECLARE_PRIVATE(Accessor);
 };
 
+
+/**
+ * @brief The cast() function is a utility function used to cast a 'Paint' to type 'T'.
+ * @since 0.11
+ */
+template<typename T = tvg::Paint>
+std::unique_ptr<T> cast(Paint* paint)
+{
+    return std::unique_ptr<T>(static_cast<T*>(paint));
+}
+
+
+/**
+ * @brief The cast() function is a utility function used to cast a 'Fill' to type 'T'.
+ * @since 0.11
+ */
+template<typename T = tvg::Fill>
+std::unique_ptr<T> cast(Fill* fill)
+{
+    return std::unique_ptr<T>(static_cast<T*>(fill));
+}
+
+
 /** @}*/
 
 } //namespace
diff --git a/engine/thirdparty/thorvg/patches/0001-let-delete-be-delete.patch b/engine/thirdparty/thorvg/patches/0001-let-delete-be-delete.patch
deleted file mode 100644
index 430950c2..00000000
--- a/engine/thirdparty/thorvg/patches/0001-let-delete-be-delete.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/thirdparty/thorvg/src/common/tvgCommon.h b/thirdparty/thorvg/src/common/tvgCommon.h
-index a98d5eb818..386df483b5 100644
---- a/thirdparty/thorvg/src/common/tvgCommon.h
-+++ b/thirdparty/thorvg/src/common/tvgCommon.h
-@@ -67,9 +67,6 @@ using namespace tvg;
-     #define strncpy strncpy_s
- #endif
- 
--void* operator new(std::size_t size);
--void operator delete(void* ptr) noexcept;
--
- namespace tvg {
- 
-     enum class FileType { Png = 0, Jpg, Webp, Svg, Lot, Ttf, Raw, Gif, Unknown };
-diff --git a/thirdparty/thorvg/src/renderer/tvgInitializer.cpp b/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
-index cd47d70f30..6c7777889f 100644
---- a/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
-+++ b/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
-@@ -131,27 +131,3 @@ uint16_t THORVG_VERSION_NUMBER()
- {
-     return _version;
- }
--
--
--void* operator new(std::size_t size)
--{
--    return tvg::malloc(size);
--}
--
--
--void operator delete(void* ptr) noexcept
--{
--    tvg::free(ptr);
--}
--
--
--void* operator new[](std::size_t size)
--{
--    return tvg::malloc(size);
--}
--
--
--void operator delete[](void* ptr) noexcept
--{
--    tvg::free(ptr);
--}
diff --git a/engine/thirdparty/thorvg/patches/0001-revert-tvglines-bezier-precision.patch b/engine/thirdparty/thorvg/patches/0001-revert-tvglines-bezier-precision.patch
new file mode 100644
index 00000000..c36836ea
--- /dev/null
+++ b/engine/thirdparty/thorvg/patches/0001-revert-tvglines-bezier-precision.patch
@@ -0,0 +1,13 @@
+diff --git a/thirdparty/thorvg/src/common/tvgMath.cpp b/thirdparty/thorvg/src/common/tvgMath.cpp
+index cb7f24ff40..f27f69faeb 100644
+--- a/thirdparty/thorvg/src/common/tvgMath.cpp
++++ b/thirdparty/thorvg/src/common/tvgMath.cpp
+@@ -79,7 +79,7 @@ float _bezAt(const Bezier& bz, float at, float length, LengthFunc lineLengthFunc
+         Bezier left;
+         right.split(t, left);
+         length = _bezLength(left, lineLengthFunc);
+-        if (fabsf(length - at) < BEZIER_EPSILON || fabsf(smallest - biggest) < 1e-3f) {
++        if (fabsf(length - at) < BEZIER_EPSILON || fabsf(smallest - biggest) < BEZIER_EPSILON) {
+             break;
+         }
+         if (length < at) {
diff --git a/engine/thirdparty/thorvg/patches/0002-use-heap-alloc.patch b/engine/thirdparty/thorvg/patches/0002-use-heap-alloc.patch
new file mode 100644
index 00000000..8bacdf59
--- /dev/null
+++ b/engine/thirdparty/thorvg/patches/0002-use-heap-alloc.patch
@@ -0,0 +1,44 @@
+diff --git a/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp b/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
+index 81d5c098a2..4c0a0f53db 100644
+--- a/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
++++ b/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
+@@ -475,11 +475,14 @@ bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAt
+     if (!buf) return false;
+ 
+     end = buf + bufLength;
+-    key = (char*)alloca(end - buf + 1);
+-    val = (char*)alloca(end - buf + 1);
+ 
+     if (buf == end) return true;
+ 
++    char* key_buf = (char*)malloc(end - buf + 1);
++    char* val_buf = (char*)malloc(end - buf + 1);
++
++    key = key_buf;
++    val = val_buf;
+     do {
+         char* sep = (char*)strchr(buf, ':');
+         next = (char*)strchr(buf, ';');
+@@ -487,7 +490,11 @@ bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAt
+         if (auto src = strstr(buf, "src")) {//src tag from css font-face contains extra semicolon
+             if (src < sep) {
+                 if (next + 1 < end) next = (char*)strchr(next + 1, ';');
+-                else return true;
++                else {
++                    free(key_buf);
++                    free(val_buf);
++                    return true;
++                }
+             }
+         }
+ 
+@@ -534,6 +541,9 @@ bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAt
+         buf = next + 1;
+     } while (true);
+ 
++    free(key_buf);
++    free(val_buf);
++
+     return true;
+ }
+ 
diff --git a/engine/thirdparty/thorvg/patches/0003-explicit-includes.patch b/engine/thirdparty/thorvg/patches/0003-explicit-includes.patch
new file mode 100644
index 00000000..98ef3761
--- /dev/null
+++ b/engine/thirdparty/thorvg/patches/0003-explicit-includes.patch
@@ -0,0 +1,36 @@
+diff --git a/thirdparty/thorvg/src/common/tvgCompressor.cpp b/thirdparty/thorvg/src/common/tvgCompressor.cpp
+index 714f21e07c..d97ae85705 100644
+--- a/thirdparty/thorvg/src/common/tvgCompressor.cpp
++++ b/thirdparty/thorvg/src/common/tvgCompressor.cpp
+@@ -57,6 +57,7 @@
+ 
+ 
+ 
++#include <cstdlib>
+ #include <string>
+ #include <memory.h>
+ #include "tvgCompressor.h"
+diff --git a/thirdparty/thorvg/src/common/tvgStr.cpp b/thirdparty/thorvg/src/common/tvgStr.cpp
+index 957fe18d53..fe2e13bc71 100644
+--- a/thirdparty/thorvg/src/common/tvgStr.cpp
++++ b/thirdparty/thorvg/src/common/tvgStr.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "config.h"
+ #include <cmath>
++#include <cstdlib>
+ #include <cstring>
+ #include <memory.h>
+ #include "tvgMath.h"
+diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
+index 542cd17e56..45fdc9cf0d 100644
+--- a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
++++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
+@@ -20,6 +20,7 @@
+  * SOFTWARE.
+  */
+ 
++#include <cstdlib>
+ #include <cstring>
+ #include "tvgSvgUtil.h"
+ 
diff --git a/engine/thirdparty/thorvg/src/common/tvgAllocator.h b/engine/thirdparty/thorvg/src/common/tvgAllocator.h
deleted file mode 100644
index b0fbd442..00000000
--- a/engine/thirdparty/thorvg/src/common/tvgAllocator.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2026 ThorVG project. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _TVG_ALLOCATOR_H_
-#define _TVG_ALLOCATOR_H_
-
-#include <cstdlib>
-#include <cstddef>
-
-//separate memory alloators for clean customization
-namespace tvg
-{
-    template<typename T = void>
-    static inline T* malloc(size_t size)
-    {
-        return static_cast<T*>(std::malloc(size));
-    }
-
-    template<typename T = void>
-    static inline T* calloc(size_t nmem, size_t size)
-    {
-        return static_cast<T*>(std::calloc(nmem, size));
-    }
-
-    template<typename T = void>
-    static inline T* realloc(T* ptr, size_t size)
-    {
-        return static_cast<T*>(std::realloc(ptr, size));
-    }
-
-    template<typename T = void>
-    static inline void free(T* ptr)
-    {
-        std::free(ptr);
-    }
-}
-
-#endif //_TVG_ALLOCATOR_H_
diff --git a/engine/thirdparty/thorvg/src/common/tvgArray.h b/engine/thirdparty/thorvg/src/common/tvgArray.h
index c2b273d1..19c8f697 100644
--- a/engine/thirdparty/thorvg/src/common/tvgArray.h
+++ b/engine/thirdparty/thorvg/src/common/tvgArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,9 @@
 #ifndef _TVG_ARRAY_H_
 #define _TVG_ARRAY_H_
 
-#include "tvgCommon.h"
-
-#define ARRAY_FOREACH(A, B) \
-    for (auto A = (B).begin(); A < (B).end(); ++A)
-
-#define ARRAY_REVERSE_FOREACH(A, B) \
-    for (auto A = (B).end() - 1; A >= (B).begin(); --A)
+#include <memory.h>
+#include <cstdint>
+#include <cstdlib>
 
 namespace tvg
 {
@@ -41,7 +37,7 @@ struct Array
     uint32_t count = 0;
     uint32_t reserved = 0;
 
-    Array() = default;
+    Array(){}
 
     Array(int32_t size)
     {
@@ -58,7 +54,7 @@ struct Array
     {
         if (count + 1 > reserved) {
             reserved = count + (count + 2) / 2;
-            data = tvg::realloc<T>(data, sizeof(T) * reserved);
+            data = static_cast<T*>(realloc(data, sizeof(T) * reserved));
         }
         data[count++] = element;
     }
@@ -75,7 +71,7 @@ struct Array
     {
         if (size > reserved) {
             reserved = size;
-            data = tvg::realloc<T>(data, sizeof(T) * reserved);
+            data = static_cast<T*>(realloc(data, sizeof(T) * reserved));
         }
         return true;
     }
@@ -95,24 +91,6 @@ struct Array
         return data[idx];
     }
 
-    void operator=(const Array& rhs)
-    {
-        reserve(rhs.count);
-        if (rhs.count > 0) memcpy(data, rhs.data, sizeof(T) * rhs.count);
-        count = rhs.count;
-    }
-
-    void move(Array& to)
-    {
-        to.reset();
-        to.data = data;
-        to.count = count;
-        to.reserved = reserved;
-
-        data = nullptr;
-        count = reserved = 0;
-    }
-
     const T* begin() const
     {
         return data;
@@ -148,12 +126,6 @@ struct Array
         return data[count - 1];
     }
 
-    T& next()
-    {
-        if (full()) grow(count + 1);
-        return data[count++];
-    }
-
     T& first()
     {
         return data[0];
@@ -166,7 +138,7 @@ struct Array
 
     void reset()
     {
-        tvg::free(data);
+        free(data);
         data = nullptr;
         count = reserved = 0;
     }
@@ -181,14 +153,48 @@ struct Array
         return count == 0;
     }
 
-    bool full()
+    template<class COMPARE>
+    void sort()
     {
-        return count == reserved;
+        qsort<COMPARE>(data, 0, static_cast<int32_t>(count) - 1);
+    }
+
+    void operator=(const Array& rhs)
+    {
+        reserve(rhs.count);
+        if (rhs.count > 0) memcpy(data, rhs.data, sizeof(T) * rhs.count);
+        count = rhs.count;
     }
 
     ~Array()
     {
-        tvg::free(data);
+        free(data);
+    }
+
+private:
+    template<class COMPARE>
+    void qsort(T* arr, int32_t low, int32_t high)
+    {
+        if (low < high) {
+            int32_t i = low;
+            int32_t j = high;
+            T tmp = arr[low];
+            while (i < j) {
+                while (i < j && !COMPARE{}(arr[j], tmp)) --j;
+                if (i < j) {
+                    arr[i] = arr[j];
+                    ++i;
+                }
+                while (i < j && COMPARE{}(arr[i], tmp)) ++i;
+                if (i < j) {
+                    arr[j] = arr[i];
+                    --j;
+                }
+            }
+            arr[i] = tmp;
+            qsort<COMPARE>(arr, low, i - 1);
+            qsort<COMPARE>(arr, i + 1, high);
+        }
     }
 };
 
diff --git a/engine/thirdparty/thorvg/src/common/tvgColor.cpp b/engine/thirdparty/thorvg/src/common/tvgColor.cpp
deleted file mode 100644
index b025ee14..00000000
--- a/engine/thirdparty/thorvg/src/common/tvgColor.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2026 ThorVG project. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "tvgMath.h"
-#include "tvgColor.h"
-namespace tvg
-{
-
-void hsl2rgb(float h, float s, float l, uint8_t& r, uint8_t& g, uint8_t& b)
-{
-    if (tvg::zero(s))  {
-        r = g = b = (uint8_t)nearbyint(l * 255.0f);
-        return;
-    } 
-
-    if (tvg::equal(h, 360.0f)) {
-        h = 0.0f;
-    } else {
-        h = fmod(h, 360.0f);
-        if (h < 0.0f) h += 360.0f;
-        h /= 60.0f;
-    }
-
-    auto v = (l <= 0.5f) ? (l * (1.0f + s)) : (l + s - (l * s));
-    auto p = l + l - v;
-    auto sv = tvg::zero(v) ? 0.0f : (v - p) / v;
-    auto i = static_cast<uint8_t>(h);
-    auto f = h - i;
-    auto vsf = v * sv * f;
-    auto t = p + vsf;
-    auto q = v - vsf;
-    float tr, tg, tb;
-
-    switch (i) {
-        case 0: tr = v; tg = t; tb = p; break;
-        case 1: tr = q; tg = v; tb = p; break;
-        case 2: tr = p; tg = v; tb = t; break;
-        case 3: tr = p; tg = q; tb = v; break;
-        case 4: tr = t; tg = p; tb = v; break;
-        case 5: tr = v; tg = p; tb = q; break;
-        default: tr = tg = tb = 0.0f; break;
-    }
-    r = (uint8_t)nearbyint(tr * 255.0f);
-    g = (uint8_t)nearbyint(tg * 255.0f);
-    b = (uint8_t)nearbyint(tb * 255.0f);
-}
-
-}
diff --git a/engine/thirdparty/thorvg/src/common/tvgColor.h b/engine/thirdparty/thorvg/src/common/tvgColor.h
deleted file mode 100644
index 8a007070..00000000
--- a/engine/thirdparty/thorvg/src/common/tvgColor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2026 ThorVG project. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _TVG_COLOR_H_
-#define _TVG_COLOR_H_
-
-
-#include "tvgCommon.h"
-
-namespace tvg
-{
-    struct RGB
-    {
-        uint8_t r, g, b;
-    };
-
-    struct RGBA
-    {
-        uint8_t r, g, b, a;
-    };
-
-    struct HSL
-    {
-        float h, s, l;
-    };
-
-    void hsl2rgb(float h, float s, float l, uint8_t& r, uint8_t& g, uint8_t& b);
-}
-
-#endif //_TVG_COLOR_H_
diff --git a/engine/thirdparty/thorvg/src/common/tvgCompressor.cpp b/engine/thirdparty/thorvg/src/common/tvgCompressor.cpp
index 71bab2cd..d97ae857 100644
--- a/engine/thirdparty/thorvg/src/common/tvgCompressor.cpp
+++ b/engine/thirdparty/thorvg/src/common/tvgCompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,412 @@
  * SOFTWARE.
  */
 
+/*
+ * Lempel–Ziv–Welch (LZW) encoder/decoder by Guilherme R. Lampert(guilherme.ronaldo.lampert@gmail.com)
+
+ * This is the compression scheme used by the GIF image format and the Unix 'compress' tool.
+ * Main differences from this implementation is that End Of Input (EOI) and Clear Codes (CC)
+ * are not stored in the output and the max code length in bits is 12, vs 16 in compress.
+ *
+ * EOI is simply detected by the end of the data stream, while CC happens if the
+ * dictionary gets filled. Data is written/read from bit streams, which handle
+ * byte-alignment for us in a transparent way.
+
+ * The decoder relies on the hardcoded data layout produced by the encoder, since
+ * no additional reconstruction data is added to the output, so they must match.
+ * The nice thing about LZW is that we can reconstruct the dictionary directly from
+ * the stream of codes generated by the encoder, so this avoids storing additional
+ * headers in the bit stream.
+
+ * The output code length is variable. It starts with the minimum number of bits
+ * required to store the base byte-sized dictionary and automatically increases
+ * as the dictionary gets larger (it starts at 9-bits and grows to 10-bits when
+ * code 512 is added, then 11-bits when 1024 is added, and so on). If the dictionary
+ * is filled (4096 items for a 12-bits dictionary), the whole thing is cleared and
+ * the process starts over. This is the main reason why the encoder and the decoder
+ * must match perfectly, since the lengths of the codes will not be specified with
+ * the data itself.
+
+ * USEFUL LINKS:
+ * https://en.wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Welch
+ * http://rosettacode.org/wiki/LZW_compression
+ * http://www.cs.duke.edu/csed/curious/compression/lzw.html
+ * http://www.cs.cf.ac.uk/Dave/Multimedia/node214.html
+ * http://marknelson.us/1989/10/01/lzw-data-compression/
+ */
 #include "config.h"
-#include "tvgCommon.h"
+
+
+
+#include <cstdlib>
+#include <string>
+#include <memory.h>
 #include "tvgCompressor.h"
 
 namespace tvg {
 
 
+/************************************************************************/
+/* LZW Implementation                                                   */
+/************************************************************************/
+
+
+//LZW Dictionary helper:
+constexpr int Nil = -1;
+constexpr int MaxDictBits = 12;
+constexpr int StartBits = 9;
+constexpr int FirstCode = (1 << (StartBits - 1)); // 256
+constexpr int MaxDictEntries = (1 << MaxDictBits);     // 4096
+
+
+//Round up to the next power-of-two number, e.g. 37 => 64
+static int nextPowerOfTwo(int num)
+{
+    --num;
+    for (size_t i = 1; i < sizeof(num) * 8; i <<= 1) {
+        num = num | num >> i;
+    }
+    return ++num;
+}
+
+
+struct BitStreamWriter
+{
+    uint8_t* stream;       //Growable buffer to store our bits. Heap allocated & owned by the class instance.
+    int bytesAllocated;    //Current size of heap-allocated stream buffer *in bytes*.
+    int granularity;       //Amount bytesAllocated multiplies by when auto-resizing in appendBit().
+    int currBytePos;       //Current byte being written to, from 0 to bytesAllocated-1.
+    int nextBitPos;        //Bit position within the current byte to access next. 0 to 7.
+    int numBitsWritten;    //Number of bits in use from the stream buffer, not including byte-rounding padding.
+
+    void internalInit()
+    {
+        stream = nullptr;
+        bytesAllocated = 0;
+        granularity = 2;
+        currBytePos = 0;
+        nextBitPos = 0;
+        numBitsWritten = 0;
+    }
+
+    uint8_t* allocBytes(const int bytesWanted, uint8_t * oldPtr, const int oldSize)
+    {
+        auto newMemory = static_cast<uint8_t *>(malloc(bytesWanted));
+        memset(newMemory, 0, bytesWanted);
+
+        if (oldPtr) {
+            memcpy(newMemory, oldPtr, oldSize);
+            free(oldPtr);
+        }
+        return newMemory;
+    }
+
+    BitStreamWriter()
+    {
+        /* 8192 bits for a start (1024 bytes). It will resize if needed.
+           Default granularity is 2. */
+        internalInit();
+        allocate(8192);
+    }
+
+    BitStreamWriter(const int initialSizeInBits, const int growthGranularity = 2)
+    {
+        internalInit();
+        setGranularity(growthGranularity);
+        allocate(initialSizeInBits);
+    }
+
+    ~BitStreamWriter()
+    {
+        free(stream);
+    }
+
+    void allocate(int bitsWanted)
+    {
+        //Require at least a byte.
+        if (bitsWanted <= 0) bitsWanted = 8;
+
+        //Round upwards if needed:
+        if ((bitsWanted % 8) != 0) bitsWanted = nextPowerOfTwo(bitsWanted);
+
+        //We might already have the required count.
+        const int sizeInBytes = bitsWanted / 8;
+        if (sizeInBytes <= bytesAllocated) return;
+
+        stream = allocBytes(sizeInBytes, stream, bytesAllocated);
+        bytesAllocated = sizeInBytes;
+    }
+
+    void appendBit(const int bit)
+    {
+        const uint32_t mask = uint32_t(1) << nextBitPos;
+        stream[currBytePos] = (stream[currBytePos] & ~mask) | (-bit & mask);
+        ++numBitsWritten;
+
+        if (++nextBitPos == 8) {
+            nextBitPos = 0;
+            if (++currBytePos == bytesAllocated) allocate(bytesAllocated * granularity * 8);
+        }
+    }
+
+    void appendBitsU64(const uint64_t num, const int bitCount)
+    {
+        for (int b = 0; b < bitCount; ++b) {
+            const uint64_t mask = uint64_t(1) << b;
+            const int bit = !!(num & mask);
+            appendBit(bit);
+        }
+    }
+
+    uint8_t* release()
+    {
+        auto oldPtr = stream;
+        internalInit();
+        return oldPtr;
+    }
+
+    void setGranularity(const int growthGranularity)
+    {
+        granularity = (growthGranularity >= 2) ? growthGranularity : 2;
+    }
+
+    int getByteCount() const
+    {
+        int usedBytes = numBitsWritten / 8;
+        int leftovers = numBitsWritten % 8;
+        if (leftovers != 0) ++usedBytes;
+        return usedBytes;
+    }
+};
+
+
+struct BitStreamReader
+{
+    const uint8_t* stream;       // Pointer to the external bit stream. Not owned by the reader.
+    const int sizeInBytes;       // Size of the stream *in bytes*. Might include padding.
+    const int sizeInBits;        // Size of the stream *in bits*, padding *not* include.
+    int currBytePos = 0;         // Current byte being read in the stream.
+    int nextBitPos = 0;          // Bit position within the current byte to access next. 0 to 7.
+    int numBitsRead = 0;         // Total bits read from the stream so far. Never includes byte-rounding padding.
+
+    BitStreamReader(const uint8_t* bitStream, const int byteCount, const int bitCount) : stream(bitStream), sizeInBytes(byteCount), sizeInBits(bitCount)
+    {
+    }
+
+    bool readNextBit(int& bitOut)
+    {
+        if (numBitsRead >= sizeInBits) return false; //We are done.
+
+        const uint32_t mask = uint32_t(1) << nextBitPos;
+        bitOut = !!(stream[currBytePos] & mask);
+        ++numBitsRead;
+
+        if (++nextBitPos == 8) {
+            nextBitPos = 0;
+            ++currBytePos;
+        }
+        return true;
+    }
+
+    uint64_t readBitsU64(const int bitCount)
+    {
+        uint64_t num = 0;
+        for (int b = 0; b < bitCount; ++b) {
+            int bit;
+            if (!readNextBit(bit)) break;
+            /* Based on a "Stanford bit-hack":
+               http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching */
+            const uint64_t mask = uint64_t(1) << b;
+            num = (num & ~mask) | (-bit & mask);
+        }
+        return num;
+    }
+
+    bool isEndOfStream() const
+    {
+        return numBitsRead >= sizeInBits;
+    }
+};
+
+
+struct Dictionary
+{
+    struct Entry
+    {
+        int code;
+        int value;
+    };
+
+    //Dictionary entries 0-255 are always reserved to the byte/ASCII range.
+    int size;
+    Entry entries[MaxDictEntries];
+
+    Dictionary()
+    {
+        /* First 256 dictionary entries are reserved to the byte/ASCII range.
+           Additional entries follow for the character sequences found in the input.
+           Up to 4096 - 256 (MaxDictEntries - FirstCode). */
+        size = FirstCode;
+
+        for (int i = 0; i < size; ++i) {
+            entries[i].code  = Nil;
+            entries[i].value = i;
+        }
+    }
+
+    int findIndex(const int code, const int value) const
+    {
+        if (code == Nil) return value;
+
+        //Linear search for now.
+        //TODO: Worth optimizing with a proper hash-table?
+        for (int i = 0; i < size; ++i) {
+            if (entries[i].code == code && entries[i].value == value) return i;
+        }
+        return Nil;
+    }
+
+    bool add(const int code, const int value)
+    {
+        if (size == MaxDictEntries) return false;
+        entries[size].code  = code;
+        entries[size].value = value;
+        ++size;
+        return true;
+    }
+
+    bool flush(int & codeBitsWidth)
+    {
+        if (size == (1 << codeBitsWidth)) {
+            ++codeBitsWidth;
+            if (codeBitsWidth > MaxDictBits) {
+                //Clear the dictionary (except the first 256 byte entries).
+                codeBitsWidth = StartBits;
+                size = FirstCode;
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+
+static bool outputByte(int code, uint8_t*& output, int outputSizeBytes, int& bytesDecodedSoFar)
+{
+    if (bytesDecodedSoFar >= outputSizeBytes) return false;
+    *output++ = static_cast<uint8_t>(code);
+    ++bytesDecodedSoFar;
+    return true;
+}
+
+
+static bool outputSequence(const Dictionary& dict, int code, uint8_t*& output, int outputSizeBytes, int& bytesDecodedSoFar, int& firstByte)
+{
+    /* A sequence is stored backwards, so we have to write
+       it to a temp then output the buffer in reverse. */
+    int i = 0;
+    uint8_t sequence[MaxDictEntries];
+
+    do {
+        sequence[i++] = dict.entries[code].value;
+        code = dict.entries[code].code;
+    } while (code >= 0);
+
+    firstByte = sequence[--i];
+
+    for (; i >= 0; --i) {
+        if (!outputByte(sequence[i], output, outputSizeBytes, bytesDecodedSoFar)) return false;
+    }
+    return true;
+}
+
+
+uint8_t* lzwDecode(const uint8_t* compressed, uint32_t compressedSizeBytes, uint32_t compressedSizeBits, uint32_t uncompressedSizeBytes)
+{
+    int code = Nil;
+    int prevCode = Nil;
+    int firstByte = 0;
+    int bytesDecoded = 0;
+    int codeBitsWidth = StartBits;
+    auto uncompressed = (uint8_t*) malloc(sizeof(uint8_t) * uncompressedSizeBytes);
+    auto ptr = uncompressed;
+
+    /* We'll reconstruct the dictionary based on the bit stream codes.
+       Unlike Huffman encoding, we don't store the dictionary as a prefix to the data. */
+    Dictionary dictionary;
+    BitStreamReader bitStream(compressed, compressedSizeBytes, compressedSizeBits);
+
+    /* We check to avoid an overflow of the user buffer.
+       If the buffer is smaller than the decompressed size, we break the loop and return the current decompression count. */
+    while (!bitStream.isEndOfStream()) {
+        code = static_cast<int>(bitStream.readBitsU64(codeBitsWidth));
+
+        if (prevCode == Nil) {
+            if (!outputByte(code, ptr, uncompressedSizeBytes, bytesDecoded)) break;
+            firstByte = code;
+            prevCode  = code;
+            continue;
+        }
+        if (code >= dictionary.size) {
+            if (!outputSequence(dictionary, prevCode, ptr, uncompressedSizeBytes, bytesDecoded, firstByte)) break;
+            if (!outputByte(firstByte, ptr, uncompressedSizeBytes, bytesDecoded)) break;
+        } else if (!outputSequence(dictionary, code, ptr, uncompressedSizeBytes, bytesDecoded, firstByte)) break;
+
+        dictionary.add(prevCode, firstByte);
+        if (dictionary.flush(codeBitsWidth)) prevCode = Nil;
+        else prevCode = code;
+    }
+
+    return uncompressed;
+}
+
+
+uint8_t* lzwEncode(const uint8_t* uncompressed, uint32_t uncompressedSizeBytes, uint32_t* compressedSizeBytes, uint32_t* compressedSizeBits)
+{
+    //LZW encoding context:
+    int code = Nil;
+    int codeBitsWidth = StartBits;
+    Dictionary dictionary;
+
+    //Output bit stream we write to. This will allocate memory as needed to accommodate the encoded data.
+    BitStreamWriter bitStream;
+
+    for (; uncompressedSizeBytes > 0; --uncompressedSizeBytes, ++uncompressed) {
+        const int value = *uncompressed;
+        const int index = dictionary.findIndex(code, value);
+
+        if (index != Nil) {
+            code = index;
+            continue;
+        }
+
+        //Write the dictionary code using the minimum bit-with:
+        bitStream.appendBitsU64(code, codeBitsWidth);
+
+        //Flush it when full so we can restart the sequences.
+        if (!dictionary.flush(codeBitsWidth)) {
+            //There's still space for this sequence.
+            dictionary.add(code, value);
+        }
+        code = value;
+    }
+
+    //Residual code at the end:
+    if (code != Nil) bitStream.appendBitsU64(code, codeBitsWidth);
+
+    //Pass ownership of the compressed data buffer to the user pointer:
+    *compressedSizeBytes = bitStream.getByteCount();
+    *compressedSizeBits = bitStream.numBitsWritten;
+
+    return bitStream.release();
+}
+
+
 /************************************************************************/
 /* B64 Implementation                                                   */
 /************************************************************************/
 
+
 size_t b64Decode(const char* encoded, const size_t len, char** decoded)
 {
     static constexpr const char B64_INDEX[256] =
@@ -48,7 +443,7 @@ size_t b64Decode(const char* encoded, const size_t len, char** decoded)
     if (!decoded || !encoded || len == 0) return 0;
 
     auto reserved = 3 * (1 + (len >> 2)) + 1;
-    auto output = tvg::malloc<char>(reserved * sizeof(char));
+    auto output = static_cast<char*>(malloc(reserved * sizeof(char)));
     if (!output) return 0;
     output[reserved - 1] = '\0';
 
@@ -79,7 +474,7 @@ size_t b64Decode(const char* encoded, const size_t len, char** decoded)
 
 
 /************************************************************************/
-/* DJB2 Implementation                                                  */
+/* DJB2 Implementation                                                   */
 /************************************************************************/
 
 unsigned long djb2Encode(const char* str)
diff --git a/engine/thirdparty/thorvg/src/common/tvgCompressor.h b/engine/thirdparty/thorvg/src/common/tvgCompressor.h
index 1584c9a3..b043cc77 100644
--- a/engine/thirdparty/thorvg/src/common/tvgCompressor.h
+++ b/engine/thirdparty/thorvg/src/common/tvgCompressor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,8 @@
 
 namespace tvg
 {
+    uint8_t* lzwEncode(const uint8_t* uncompressed, uint32_t uncompressedSizeBytes, uint32_t* compressedSizeBytes, uint32_t* compressedSizeBits);
+    uint8_t* lzwDecode(const uint8_t* compressed, uint32_t compressedSizeBytes, uint32_t compressedSizeBits, uint32_t uncompressedSizeBytes);
     size_t b64Decode(const char* encoded, const size_t len, char** decoded);
     unsigned long djb2Encode(const char* str);
 }
diff --git a/engine/thirdparty/thorvg/src/common/tvgInlist.h b/engine/thirdparty/thorvg/src/common/tvgInlist.h
index 3abe9669..fc99ae3d 100644
--- a/engine/thirdparty/thorvg/src/common/tvgInlist.h
+++ b/engine/thirdparty/thorvg/src/common/tvgInlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,11 +36,6 @@ struct Inlist
     T* head = nullptr;
     T* tail = nullptr;
 
-    ~Inlist()
-    {
-        free();
-    }
-
     void free()
     {
         while (head) {
@@ -111,14 +106,6 @@ struct Inlist
     }
 };
 
-#define INLIST_FOREACH(inlist, cur) \
-    for (auto cur = inlist.head; cur; cur = cur->next)
-
-#define INLIST_SAFE_FOREACH(inlist, cur) \
-    auto cur = inlist.head; \
-    auto next = cur ? cur->next : nullptr; \
-    for (; cur; cur = next, next = (cur ? cur->next : nullptr))
-
 }
 
 #endif // _TVG_INLIST_H_
diff --git a/engine/thirdparty/thorvg/src/common/tvgLock.h b/engine/thirdparty/thorvg/src/common/tvgLock.h
index b71ba7e6..d3a4e41c 100644
--- a/engine/thirdparty/thorvg/src/common/tvgLock.h
+++ b/engine/thirdparty/thorvg/src/common/tvgLock.h
@@ -23,12 +23,13 @@
 #ifndef _TVG_LOCK_H_
 #define _TVG_LOCK_H_
 
+#ifdef THORVG_THREAD_SUPPORT
+
 #include <mutex>
 #include "tvgTaskScheduler.h"
 
-namespace tvg
-{
-#ifdef THORVG_THREAD_SUPPORT
+namespace tvg {
+
     struct Key
     {
         std::mutex mtx;
@@ -53,15 +54,23 @@ namespace tvg
             }
         }
     };
+
+}
+
 #else //THORVG_THREAD_SUPPORT
+
+namespace tvg {
+
     struct Key {};
 
     struct ScopedLock
     {
         ScopedLock(Key& key) {}
     };
-#endif //THORVG_THREAD_SUPPORT
+
 }
 
+#endif //THORVG_THREAD_SUPPORT
+
 #endif //_TVG_LOCK_H_
 
diff --git a/engine/thirdparty/thorvg/src/common/tvgMath.cpp b/engine/thirdparty/thorvg/src/common/tvgMath.cpp
index a919efab..f27f69fa 100644
--- a/engine/thirdparty/thorvg/src/common/tvgMath.cpp
+++ b/engine/thirdparty/thorvg/src/common/tvgMath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,6 @@
  */
 
 #include "tvgMath.h"
-#include "tvgArray.h"
 
 #define BEZIER_EPSILON 1e-2f
 
@@ -80,7 +79,7 @@ float _bezAt(const Bezier& bz, float at, float length, LengthFunc lineLengthFunc
         Bezier left;
         right.split(t, left);
         length = _bezLength(left, lineLengthFunc);
-        if (fabsf(length - at) < BEZIER_EPSILON || fabsf(smallest - biggest) < 1e-3f) {
+        if (fabsf(length - at) < BEZIER_EPSILON || fabsf(smallest - biggest) < BEZIER_EPSILON) {
             break;
         }
         if (length < at) {
@@ -101,48 +100,6 @@ float _bezAt(const Bezier& bz, float at, float length, LengthFunc lineLengthFunc
 
 namespace tvg {
 
-uint8_t lerp(const uint8_t &start, const uint8_t &end, float t)
-{
-    return static_cast<uint8_t>(tvg::clamp(static_cast<int>(start + (end - start) * t), 0, 255));
-}
-
-
-float length(const PathCommand* cmds, uint32_t cmdsCnt, const Point* pts, uint32_t ptsCnt)
-{
-    if (ptsCnt < 2) return 0.0f;
-
-    auto start = pts;
-    auto length = 0.0f;
-
-    while (cmdsCnt-- > 0) {
-        switch (*cmds) {
-            case PathCommand::Close: {
-                length += tvg::length(*(pts - 1), *start);
-                break;
-            }
-            case PathCommand::MoveTo: {
-                start = pts;
-                ++pts;
-                break;
-            }
-            case PathCommand::LineTo: {
-                length += tvg::length(*(pts - 1), *pts);
-                ++pts;
-                break;
-            }
-            case PathCommand::CubicTo: {
-                length += Bezier{*(pts - 1), *pts, *(pts + 1), *(pts + 2)}.length();
-                pts += 3;
-                break;
-            }
-        }
-        ++cmds;
-    }
-
-    return length;
-}
-
-
 //https://en.wikipedia.org/wiki/Remez_algorithm
 float atan2(float y, float x)
 {
@@ -265,15 +222,6 @@ Point normal(const Point& p1, const Point& p2)
 }
 
 
-void normalize(Point& pt)
-{
-    if (zero(pt)) return;       //prevent zero division
-    auto ilength = 1.0f / sqrtf((pt.x * pt.x) + (pt.y * pt.y));
-    pt.x *= ilength;
-    pt.y *= ilength;
-}
-
-
 float Line::length() const
 {
     return _lineLength(pt1, pt2);
@@ -293,21 +241,6 @@ void Line::split(float at, Line& left, Line& right) const
 }
 
 
-Bezier::Bezier(const Point& st, const Point& ed, float radius)
-{
-    // Calculate the angle between the start and end points
-    auto angle = tvg::atan2(ed.y - st.y, ed.x - st.x);
-
-    // Calculate the control points of the cubic bezier curve
-    auto c = radius * PATH_KAPPA;  // c = radius * (4/3) * tan(pi/8)
- 
-    start = {st.x, st.y};
-    ctrl1 = {st.x + radius * cos(angle), st.y + radius * sin(angle)};
-    ctrl2 = {ed.x - c * cos(angle), ed.y - c * sin(angle)};
-    end = {ed.x, ed.y};
-}
-
-
 void Bezier::split(Bezier& left, Bezier& right) const
 {
     auto c = (ctrl1.x + ctrl2.x) * 0.5f;
@@ -430,83 +363,12 @@ float Bezier::angle(float t) const
 }
 
 
-void Bezier::bounds(BBox& box, const Point& start, const Point& ctrl1, const Point& ctrl2, const Point& end)
+uint8_t lerp(const uint8_t &start, const uint8_t &end, float t)
 {
-    if (box.min.x > start.x) box.min.x = start.x;
-    if (box.min.y > start.y) box.min.y = start.y;
-    if (box.min.x > end.x) box.min.x = end.x;
-    if (box.min.y > end.y) box.min.y = end.y;
-
-    if (box.max.x < start.x) box.max.x = start.x;
-    if (box.max.y < start.y) box.max.y = start.y;
-    if (box.max.x < end.x) box.max.x = end.x;
-    if (box.max.y < end.y) box.max.y = end.y;
-
-    //find x/y-direction extrema (solving derivative of Bezier curve)
-    auto findMinMax = [&](float start, float ctrl1, float ctrl2, float end, float& min, float& max) -> void {
-        auto a = -1.0f * start + 3.0f * ctrl1 - 3.0f * ctrl2 + end;
-        auto b = start - 2.0f * ctrl1 + ctrl2;
-        auto c = -1.0f * start + ctrl1;
-        auto h = b * b - a * c;
-        if (h <= 0.0f) return;
-        h = sqrtf(h);
-        float t[2] = {(-b - h) / a, (-b + h) / a};
-        for (int i = 0; i < 2; ++i) {
-            if (t[i] <= 0.0f || t[i] >= 1.0f) continue;
-            auto s = 1.0f - t[i];
-            auto q = s * s * s * start + 3.0f * s * s * t[i] * ctrl1 + 3.0f * s * t[i] * t[i] * ctrl2 + t[i] * t[i] * t[i] * end;
-            if (q < min) min = q;
-            if (q > max) max = q;
-        }
-    };
-
-    findMinMax(start.x, ctrl1.x, ctrl2.x, end.x, box.min.x, box.max.x);
-    findMinMax(start.y, ctrl1.y, ctrl2.y, end.y, box.min.y, box.max.y);
+    auto result = static_cast<int>(start + (end - start) * t);
+    tvg::clamp(result, 0, 255);
+    return static_cast<uint8_t>(result);
 }
 
-
-bool Bezier::flatten() const
-{
-    float diff1_x = fabsf((ctrl1.x * 3.f) - (start.x * 2.f) - end.x);
-    float diff1_y = fabsf((ctrl1.y * 3.f) - (start.y * 2.f) - end.y);
-    float diff2_x = fabsf((ctrl2.x * 3.f) - (end.x * 2.f) - start.x);
-    float diff2_y = fabsf((ctrl2.y * 3.f) - (end.y * 2.f) - start.y);
-    if (diff1_x < diff2_x) diff1_x = diff2_x;
-    if (diff1_y < diff2_y) diff1_y = diff2_y;
-    return (diff1_x + diff1_y <= 0.5f);
 }
 
-
-uint32_t Bezier::segments() const
-{
-    static constexpr uint32_t MaxSegments = 1u << 10; // 2^10 segments cap keeps runtime bounded
-    uint32_t count = 0;
-    Array<Bezier> stack;
-    stack.push(*this);
-    Bezier left, right;
-
-    while (!stack.empty()) {
-        auto current = stack.last();
-        stack.pop();
-        if (current.flatten()) {
-            ++count;
-            continue;
-        }
-        if (count + stack.count + 2 >= MaxSegments) {
-            TVGERR("Common", "Bezier segments count exceeded the maximum limit.");
-            return MaxSegments;
-        }
-        current.split(left, right);
-        stack.push(left);
-        stack.push(right);
-    }
-    return count;
-}
-
-
-Bezier Bezier::operator*(const Matrix& m)
-{
-    return Bezier{start * m, ctrl1* m, ctrl2 * m, end * m};
-}
-
-}  // namespace tvg
diff --git a/engine/thirdparty/thorvg/src/common/tvgMath.h b/engine/thirdparty/thorvg/src/common/tvgMath.h
index 2768d44d..513a3895 100644
--- a/engine/thirdparty/thorvg/src/common/tvgMath.h
+++ b/engine/thirdparty/thorvg/src/common/tvgMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,7 +42,6 @@ namespace tvg
 /************************************************************************/
 
 float atan2(float y, float x);
-float length(const PathCommand* cmds, uint32_t cmdsCnt, const Point* pts, uint32_t ptsCnt);
 
 
 static inline float deg2rad(float degree)
@@ -70,11 +69,10 @@ static inline bool equal(float a, float b)
 
 
 template <typename T>
-static inline constexpr const T& clamp(const T& v, const T& min, const T& max)
+static inline void clamp(T& v, const T& min, const T& max)
 {
-    if (v < min) return min;
-    else if (v > max) return max;
-    return v;
+    if (v < min) v = min;
+    else if (v > max) v = max;
 }
 
 /************************************************************************/
@@ -122,50 +120,38 @@ static inline void identity(Matrix* m)
 }
 
 
-static inline constexpr const Matrix identity()
+static inline void scale(Matrix* m, float sx, float sy)
 {
-    return {1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f};
+    m->e11 *= sx;
+    m->e22 *= sy;
 }
 
 
-static inline float scaling(const Matrix& m)
+static inline void scaleR(Matrix* m, float x, float y)
 {
-    return sqrtf(m.e11 * m.e11 + m.e21 * m.e21);
-}
-
-
-static inline void scale(Matrix* m, const Point& p)
-{
-    m->e11 *= p.x;
-    m->e22 *= p.y;
-}
-
-
-static inline void scaleR(Matrix* m, const Point& p)
-{
-    if (p.x != 1.0f) {
-        m->e11 *= p.x;
-        m->e21 *= p.x;
+    if (x != 1.0f) {
+        m->e11 *= x;
+        m->e21 *= x;
     }
-    if (p.y != 1.0f) {
-        m->e22 *= p.y;
-        m->e12 *= p.y;
+    if (y != 1.0f) {
+        m->e22 *= y;
+        m->e12 *= y;
     }
 }
 
 
-static inline void translate(Matrix* m, const Point& p)
+static inline void translate(Matrix* m, float x, float y)
 {
-    m->e13 += p.x;
-    m->e23 += p.y;
+    m->e13 += x;
+    m->e23 += y;
 }
 
 
-static inline void translateR(Matrix* m, const Point& p)
+static inline void translateR(Matrix* m, float x, float y)
 {
-    if (p.x == 0.0f && p.y == 0.0f) return;
-    m->e13 += (p.x * m->e11 + p.y * m->e12);
-    m->e23 += (p.x * m->e21 + p.y * m->e22);
+    if (x == 0.0f && y == 0.0f) return;
+    m->e13 += (x * m->e11 + y * m->e12);
+    m->e23 += (x * m->e21 + y * m->e22);
 }
 
 
@@ -181,13 +167,6 @@ static inline void operator*=(Matrix& lhs, const Matrix& rhs)
 }
 
 
-static inline Matrix operator*(const Matrix* lhs, const Matrix& rhs)
-{
-    if (lhs) return *lhs * rhs;
-    return rhs;
-}
-
-
 static inline void log(const Matrix& m)
 {
     TVGLOG("COMMON", "Matrix: [%f %f %f] [%f %f %f] [%f %f %f]", m.e11, m.e12, m.e13, m.e21, m.e22, m.e23, m.e31, m.e32, m.e33);
@@ -201,39 +180,6 @@ static inline void log(const Matrix& m)
 void operator*=(Point& pt, const Matrix& m);
 Point operator*(const Point& pt, const Matrix& m);
 Point normal(const Point& p1, const Point& p2);
-void normalize(Point& pt);
-
-static inline constexpr const Point operator*=(Point& pt, const Matrix* m)
-{
-    if (m) pt *= *m;
-    return pt;
-}
-
-
-static inline Point operator*(const Point& pt, const Matrix* m)
-{
-    if (m) return pt * *m;
-    return pt;
-}
-
-
-static inline Point min(const Point& lhs, const Point& rhs)
-{
-    return {std::min(lhs.x, rhs.x), std::min(lhs.y, rhs.y)};
-}
-
-
-static inline Point max(const Point& lhs, const Point& rhs)
-{
-    return {std::max(lhs.x, rhs.x), std::max(lhs.y, rhs.y)};
-}
-
-
-static inline float dot(const Point& lhs, const Point& rhs)
-{
-    return lhs.x * rhs.x + lhs.y * rhs.y;
-}
-
 
 static inline float cross(const Point& lhs, const Point& rhs)
 {
@@ -247,10 +193,10 @@ static inline bool zero(const Point& p)
 }
 
 
-static inline float length(const Point& a, const Point& b)
+static inline float length(const Point* a, const Point* b)
 {
-    auto x = b.x - a.x;
-    auto y = b.y - a.y;
+    auto x = b->x - a->x;
+    auto y = b->y - a->y;
 
     if (x < 0) x = -x;
     if (y < 0) y = -y;
@@ -265,12 +211,6 @@ static inline float length(const Point& a)
 }
 
 
-static inline float length2(const Point& a)
-{
-    return a.x * a.x + a.y * a.y;
-};
-
-
 static inline bool operator==(const Point& lhs, const Point& rhs)
 {
     return tvg::equal(lhs.x, rhs.x) && tvg::equal(lhs.y, rhs.y);
@@ -289,110 +229,36 @@ static inline Point operator-(const Point& lhs, const Point& rhs)
 }
 
 
-static inline Point operator-(const Point& lhs, const float rhs)
-{
-    return {lhs.x - rhs, lhs.y - rhs};
-}
-
-
 static inline Point operator+(const Point& lhs, const Point& rhs)
 {
     return {lhs.x + rhs.x, lhs.y + rhs.y};
 }
 
 
-static inline Point operator+(const Point& lhs, const float rhs)
-{
-    return {lhs.x + rhs, lhs.y + rhs};
-}
-
-
-static inline void operator+=(Point& lhs, const Point& rhs)
-{
-    lhs.x += rhs.x;
-    lhs.y += rhs.y;
-}
-
-
-static inline Point operator*(const Point& lhs, const Point& rhs)
-{
-    return {lhs.x * rhs.x, lhs.y * rhs.y};
-}
-
-
-static inline void operator*=(Point& lhs, const Point& rhs)
-{
-    lhs.x *= rhs.x;
-    lhs.y *= rhs.y;
-}
-
-
-static inline Point operator*(const Point& lhs, const float rhs)
+static inline Point operator*(const Point& lhs, float rhs)
 {
     return {lhs.x * rhs, lhs.y * rhs};
 }
 
 
-static inline void operator*=(Point& lhs, const float rhs)
-{
-    lhs.x *= rhs;
-    lhs.y *= rhs;
-}
-
-
 static inline Point operator*(const float& lhs, const Point& rhs)
 {
     return {lhs * rhs.x, lhs * rhs.y};
 }
 
 
-static inline Point operator/(const Point& lhs, const Point& rhs)
-{
-    return {lhs.x / rhs.x, lhs.y / rhs.y};
-}
-
-
 static inline Point operator/(const Point& lhs, const float rhs)
 {
     return {lhs.x / rhs, lhs.y / rhs};
 }
 
 
-static inline Point operator-(const Point& a)
-{
-    return {-a.x, -a.y};
-}
-
-enum class Orientation
-{
-    Linear = 0,
-    Clockwise,
-    CounterClockwise,
-};
-
-
-static inline Orientation orientation(const Point& p1, const Point& p2, const Point& p3)
-{
-    auto val = cross(p2 - p1, p3 - p1);
-    if (zero(val)) return Orientation::Linear;
-    else return val > 0 ? Orientation::Clockwise : Orientation::CounterClockwise;
-}
-
-
 static inline void log(const Point& pt)
 {
     TVGLOG("COMMON", "Point: [%f %f]", pt.x, pt.y);
 }
 
 
-static inline bool closed(const Point& lhs, const Point& rhs, float tolerance)
-{
-    float dx = lhs.x - rhs.x;
-    float dy = lhs.y - rhs.y;
-    return (dx * dx + dy * dy) < (tolerance * tolerance);
-}
-
-
 /************************************************************************/
 /* Line functions                                                       */
 /************************************************************************/
@@ -407,32 +273,6 @@ struct Line
 };
 
 
-/************************************************************************/
-/* Geometry functions                                                   */
-/************************************************************************/
-
-struct BBox
-{
-    Point min, max;
-
-    void init()
-    {
-        min = {FLT_MAX, FLT_MAX};
-        max = {-FLT_MAX, -FLT_MAX};
-    }
-};
-
-
-static inline uint32_t arcSegmentsCnt(float arcAngle, float pixelRadius) 
-{
-    if (pixelRadius < FLOAT_EPSILON) return 2;
-    static constexpr auto PX_TOLERANCE = 0.25f;
-    // Sagitta-based formula Approximation: 1 - cos(θ/2) ≈ (θ/2)²/2, so θ ≈ 2 * sqrt(2 * s/r)
-    auto segmentAngle = 2.0f * sqrtf(2.0f * PX_TOLERANCE / pixelRadius);
-    return static_cast<uint32_t>(ceilf(fabsf(arcAngle) / segmentAngle)) + 1;
-}
-
-
 /************************************************************************/
 /* Bezier functions                                                     */
 /************************************************************************/
@@ -444,13 +284,6 @@ struct Bezier
     Point ctrl2;
     Point end;
 
-    Bezier() {}
-    Bezier(const Point& p0, const Point& p1, const Point& p2, const Point& p3):
-        start(p0), ctrl1(p1), ctrl2(p2), end(p3) {}
-    // Constructor that approximates a quarter-circle segment of arc between 'start' and 'end' points 
-    // using a cubic Bezier curve with a given 'radius'.
-    Bezier(const Point& start, const Point& end, float radius);
-
     void split(float t, Bezier& left);
     void split(Bezier& left, Bezier& right) const;
     void split(float at, Bezier& left, Bezier& right) const;
@@ -460,125 +293,8 @@ struct Bezier
     float atApprox(float at, float length) const;
     Point at(float t) const;
     float angle(float t) const;
-    bool flatten() const;
-    uint32_t segments() const;
-
-    Bezier operator*(const Matrix& m);
-
-    static void bounds(BBox& box, const Point& start, const Point& ctrl1, const Point& ctrl2, const Point& end);
 };
 
-static inline bool edgesCross(const Point& p0, const Point& p1, const Point& p2, const Point& p3)
-{
-    auto orientSign = [](const Point& a, const Point& b, const Point& c) {
-        auto value = cross(b - a, c - a);
-        if (zero(value)) return int8_t{0};
-        return (value > 0.0f) ? int8_t{1} : int8_t{-1};
-    };
-
-    auto straddlesLine = [&](const Point& a, const Point& b, const Point& c, const Point& d) {
-        return orientSign(a, b, c) * orientSign(a, b, d) < 0;
-    };
-
-    return straddlesLine(p0, p1, p2, p3) && straddlesLine(p2, p3, p0, p1);
-}
-
-// Conservative triangle-fan safety check
-// The fill is emitted as (v0,v1,v2), (v0,v2,v3), (v0,v3,v4), ...
-// Usage:
-// 1. Setup: default-construct `ConvexProbe probe` for one tessellation pass.
-// 2. Feed one contour at a time: call `nextContour()` on MoveTo, then stream
-//    each contour edge with `addEdge(curr - prev)`, and finish with
-//    `addContourClose(first - prev)` on Close. For cubic segments, callers may
-//    pre-reject looping control polygons with `edgesCross(start, ctrl1, ctrl2, end)`.
-// 3. Read `probe.convex` as the result. `true` means the contour stayed within
-//    the cheap triangle-fan fast-path assumptions; `false` means fall back.
-// Cost: O(1) work per edge and O(1) memory.
-struct ConvexProbe
-{
-    bool convex = true;
-    int8_t winding = 0;
-    Point firstEdge = {};
-    Point prevEdge = {};
-    int8_t prevXDir = 0;
-    int8_t prevYDir = 0;
-    uint8_t xDirChanges = 0;
-    uint8_t yDirChanges = 0;
-    uint8_t reversals = 0;
-    bool contourHasEdges = false;
-
-    void nextContour()
-    {
-        if (contourHasEdges) convex = false;
-        resetContour();
-    }
-
-    void addEdge(const Point& edge)
-    {
-        if (zero(edge)) return;
-
-        contourHasEdges = true;
-        if (!convex) return;
-
-        if (zero(firstEdge)) firstEdge = edge;
-
-        updateDir(edge.x, prevXDir, xDirChanges);
-        updateDir(edge.y, prevYDir, yDirChanges);
-        if (!convex) return;
-
-        if (zero(prevEdge)) {
-            prevEdge = edge;
-            return;
-        }
-
-        auto turn = cross(prevEdge, edge);
-        if (zero(turn)) {
-            if (dot(prevEdge, edge) < 0.0f && ++reversals > MaxCollinearReversals) convex = false;
-        } else {
-            auto sign = (turn > 0.0f) ? int8_t{1} : int8_t{-1};
-            if (winding == 0) winding = sign;
-            else if (sign != winding) convex = false;
-        }
-
-        prevEdge = edge;
-    }
-
-    void addContourClose(const Point& edge)
-    {
-        addEdge(edge);
-        if (convex && !zero(firstEdge)) addEdge(firstEdge);
-    }
-
-private:
-    enum : uint8_t
-    {
-        MaxAxisDirChanges = 3,
-        MaxCollinearReversals = 2
-    };
-
-    void resetContour()
-    {
-        firstEdge = {};
-        prevEdge = {};
-        prevXDir = prevYDir = 0;
-        xDirChanges = yDirChanges = 0;
-        reversals = 0;
-        contourHasEdges = false;
-    }
-
-    void updateDir(float value, int8_t& prevDir, uint8_t& changes)
-    {
-        int8_t dir = 0;
-        if (!zero(value)) dir = (value > 0.0f) ? int8_t{1} : int8_t{-1};
-        if (dir == 0 || !convex) return;
-
-        if (prevDir != 0 && prevDir != dir && ++changes > MaxAxisDirChanges) {
-            convex = false;
-            return;
-        }
-        prevDir = dir;
-    }
-};
 
 /************************************************************************/
 /* Interpolation functions                                              */
@@ -594,4 +310,4 @@ uint8_t lerp(const uint8_t &start, const uint8_t &end, float t);
 
 }
 
-#endif  //_TVG_MATH_H_
+#endif //_TVG_MATH_H_
diff --git a/engine/thirdparty/thorvg/src/common/tvgStr.cpp b/engine/thirdparty/thorvg/src/common/tvgStr.cpp
index 8da3aeea..8d52d5df 100644
--- a/engine/thirdparty/thorvg/src/common/tvgStr.cpp
+++ b/engine/thirdparty/thorvg/src/common/tvgStr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,9 @@
 
 #include "config.h"
 #include <cmath>
-#include "tvgCommon.h"
+#include <cstdlib>
+#include <cstring>
+#include <memory.h>
 #include "tvgMath.h"
 #include "tvgStr.h"
 
@@ -55,13 +57,13 @@ namespace tvg {
  * No hexadecimal form supported
  * no sequence supported after NAN
  */
-float toFloat(const char *str, char **end)
+float strToFloat(const char *nPtr, char **endPtr)
 {
-    if (end) *end = (char *) (str);
-    if (!str) return 0.0f;
+    if (endPtr) *endPtr = (char *) (nPtr);
+    if (!nPtr) return 0.0f;
 
-    auto a = str;
-    auto iter = str;
+    auto a = nPtr;
+    auto iter = nPtr;
     auto val = 0.0f;
     unsigned long long integerPart = 0;
     int minus = 1;
@@ -87,7 +89,7 @@ float toFloat(const char *str, char **end)
                 iter += 5;
             else goto error;
         }
-        if (end) *end = (char *) (iter);
+        if (endPtr) *endPtr = (char *) (iter);
         return (minus == -1) ? -INFINITY : INFINITY;
     }
 
@@ -95,7 +97,7 @@ float toFloat(const char *str, char **end)
         if ((tolower(*(iter + 1)) == 'a') && (tolower(*(iter + 2)) == 'n')) iter += 3;
         else goto error;
 
-        if (end) *end = (char *) (iter);
+        if (endPtr) *endPtr = (char *) (iter);
         return (minus == -1) ? -NAN : NAN;
     }
 
@@ -164,7 +166,7 @@ float toFloat(const char *str, char **end)
                 exponentPart = exponentPart * 10U + static_cast<unsigned int>(*iter - '0');
             }
         } else if (!isdigit(*(a - 1))) {
-            a = str;
+            a = nPtr;
             goto success;
         } else if (*iter == 0) {
             goto success;
@@ -190,51 +192,43 @@ float toFloat(const char *str, char **end)
             exponentPart--;
         }
         val = (minus_e == -1) ? (val / scale) : (val * scale);
-    } else if ((iter > str) && !isdigit(*(iter - 1))) {
-        a = str;
+    } else if ((iter > nPtr) && !isdigit(*(iter - 1))) {
+        a = nPtr;
         goto success;
     }
 
 success:
-    if (end) *end = (char *)a;
+    if (endPtr) *endPtr = (char *)(a);
     if (!std::isfinite(val)) return 0.0f;
 
     return minus * val;
 
 error:
-    if (end) *end = (char *)str;
+    if (endPtr) *endPtr = (char *)(nPtr);
     return 0.0f;
 }
 
-// max: maximum number of characters to copy, size: length of the copied string
-char* duplicate(const char* str, size_t max, uint32_t* size)
+char* strDuplicate(const char *str, size_t n)
 {
-    if (!str) {
-        if (size) *size = 0;
-        return nullptr;
-    }
-
     auto len = strlen(str);
-    if (len < max) max = len;
+    if (len < n) n = len;
 
-    auto ret = tvg::malloc<char>(max + 1);
-    ret[max] = '\0';
+    auto ret = (char *) malloc(n + 1);
+    if (!ret) return nullptr;
+    ret[n] = '\0';
 
-    if (size) *size = max;
-
-    return (char*)memcpy(ret, str, max);
+    return (char *) memcpy(ret, str, n);
 }
 
-char* append(char* lhs, const char* rhs, size_t n)
+char* strAppend(char* lhs, const char* rhs, size_t n)
 {
     if (!rhs) return lhs;
-    if (!lhs) return duplicate(rhs, n);
-    lhs = tvg::realloc<char>(lhs, strlen(lhs) + n + 1);
+    if (!lhs) return strDuplicate(rhs, n);
+    lhs = (char*)realloc(lhs, strlen(lhs) + n + 1);
     return strncat(lhs, rhs, n);
 }
 
-
-char* dirname(const char* path)
+char* strDirname(const char* path)
 {
     auto ptr = strrchr(path, '/');
 #ifdef _WIN32
@@ -242,44 +236,7 @@ char* dirname(const char* path)
     if (ptr2) ptr = ptr2;
 #endif
     auto len = ptr ? size_t(ptr - path + 1) : SIZE_MAX;
-    return duplicate(path, len);
-}
-
-
-char* filename(const char* path)
-{
-    const char* ptr = strrchr(path, '/');
-#ifdef _WIN32
-    auto ptr2 = strrchr(ptr ? ptr : path, '\\');
-    if (ptr2) ptr = ptr2;
-#endif
-    if (ptr) ++ptr;
-    else ptr = path;
-    auto dot = fileext(ptr);
-    auto len = (dot > ptr) ? (size_t)(dot - ptr - 1) : strlen(ptr);
-    return duplicate(ptr, len);
-}
-
-
-const char* fileext(const char* path)
-{
-    auto ext = path;
-    while (ext) {
-        auto p = strchr(ext, '.');
-        if (!p) break;
-        ext = p + 1;
-    }
-    return ext;
-}
-
-
-char* concat(const char* a, const char* b)
-{
-    auto len = strlen(a) + strlen(b) + 1;
-    auto ret = tvg::malloc<char>(len * sizeof(char));
-    strcpy(ret, a);
-    strcat(ret, b);
-    return ret;
+    return strDuplicate(path, len);
 }
 
 }
diff --git a/engine/thirdparty/thorvg/src/common/tvgStr.h b/engine/thirdparty/thorvg/src/common/tvgStr.h
index 5f8e9282..6b16b4c7 100644
--- a/engine/thirdparty/thorvg/src/common/tvgStr.h
+++ b/engine/thirdparty/thorvg/src/common/tvgStr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,23 +23,15 @@
 #ifndef _TVG_STR_H_
 #define _TVG_STR_H_
 
-#include "tvgCommon.h"
+#include <cstddef>
 
 namespace tvg
 {
 
-static inline bool equal(const char* a, const char* b)
-{
-    return !strcmp(a, b) && strlen(a) == strlen(b);
-}
-
-char* concat(const char* a, const char* b);
-float toFloat(const char *str, char **end);                    //convert to float
-char* duplicate(const char* str, size_t max = SIZE_MAX, uint32_t* size = nullptr);  // copy the string
-char* append(char* lhs, const char* rhs, size_t n);            //append the rhs to the lhs
-char* dirname(const char* path);                               //return the full directory name
-char* filename(const char* path);                              //return the file name without extension
-const char* fileext(const char* path);                         //return the file extension name
+float strToFloat(const char *nPtr, char **endPtr);  //convert to float
+char* strDuplicate(const char *str, size_t n);      //copy the string
+char* strAppend(char* lhs, const char* rhs, size_t n);  //append the rhs to the lhs
+char* strDirname(const char* path);                 //return the full directory name
 
 }
-#endif  //_TVG_STR_H_
+#endif //_TVG_STR_H_
diff --git a/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp b/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp
index 75505b12..1a4e7506 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
  * SOFTWARE.
  */
 
+#include <memory.h>
 #include <turbojpeg.h>
 #include "tvgJpgLoader.h"
 
@@ -29,12 +30,13 @@
 
 void JpgLoader::clear()
 {
-    if (freeData) tvg::free(data);
+    if (freeData) free(data);
     data = nullptr;
     size = 0;
     freeData = false;
 }
 
+
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
@@ -55,30 +57,57 @@ JpgLoader::~JpgLoader()
 }
 
 
-bool JpgLoader::open(const char* path)
+bool JpgLoader::open(const string& path)
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    if (!(data = (unsigned char*) LoadModule::open(path, size))) return false;
+    auto jpegFile = fopen(path.c_str(), "rb");
+    if (!jpegFile) return false;
+
+    auto ret = false;
+
+    //determine size
+    if (fseek(jpegFile, 0, SEEK_END) < 0) goto finalize;
+    if (((size = ftell(jpegFile)) < 1)) goto finalize;
+    if (fseek(jpegFile, 0, SEEK_SET)) goto finalize;
+
+    data = (unsigned char *) malloc(size);
+    if (!data) goto finalize;
+
+    freeData = true;
+
+    if (fread(data, size, 1, jpegFile) < 1) goto failure;
 
     int width, height, subSample, colorSpace;
-    if (tjDecompressHeader3(jpegDecompressor, data, size, &width, &height, &subSample, &colorSpace) < 0) return false;
+    if (tjDecompressHeader3(jpegDecompressor, data, size, &width, &height, &subSample, &colorSpace) < 0) {
+        TVGERR("JPG LOADER", "%s", tjGetErrorStr());
+        goto failure;
+    }
+
     w = static_cast<float>(width);
     h = static_cast<float>(height);
-    freeData = true;
-    return true;
+    ret = true;
+
+    goto finalize;
+
+failure:
+    clear();
+
+finalize:
+    fclose(jpegFile);
+    return ret;
 #else
     return false;
 #endif
 }
 
 
-bool JpgLoader::open(const char* data, uint32_t size, TVG_UNUSED const char* rpath, bool copy)
+bool JpgLoader::open(const char* data, uint32_t size, bool copy)
 {
     int width, height, subSample, colorSpace;
     if (tjDecompressHeader3(jpegDecompressor, (unsigned char *) data, size, &width, &height, &subSample, &colorSpace) < 0) return false;
 
     if (copy) {
-        this->data = tvg::malloc<unsigned char>(size);
+        this->data = (unsigned char *) malloc(size);
         if (!this->data) return false;
         memcpy((unsigned char *)this->data, data, size);
         freeData = true;
diff --git a/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h b/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h
index c73a1534..348dbbf8 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h
+++ b/engine/thirdparty/thorvg/src/loaders/external_jpg/tvgJpgLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ public:
     JpgLoader();
     ~JpgLoader();
 
-    bool open(const char* path) override;
-    bool open(const char* data, uint32_t size, const char* rpath, bool copy) override;
+    bool open(const string& path) override;
+    bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
 private:
@@ -43,7 +43,7 @@ private:
 
     tjhandle jpegDecompressor;
     unsigned char* data = nullptr;
-    uint32_t size = 0;
+    unsigned long size = 0;
     bool freeData = false;
 };
 
diff --git a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
index c0eb4938..c3624031 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,33 +29,34 @@
 void PngLoader::clear()
 {
     png_image_free(image);
-    tvg::free(image);
+    free(image);
     image = nullptr;
 }
 
+
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
 
 PngLoader::PngLoader() : ImageLoader(FileType::Png)
 {
-    image = tvg::calloc<png_image>(1, sizeof(png_image));
+    image = static_cast<png_imagep>(calloc(1, sizeof(png_image)));
     image->version = PNG_IMAGE_VERSION;
-    image->opaque = nullptr;
+    image->opaque = NULL;
 }
 
 PngLoader::~PngLoader()
 {
     clear();
-    tvg::free(surface.buf32);
+    free((void*)surface.buf32);
 }
 
 
-bool PngLoader::open(const char* path)
+bool PngLoader::open(const string& path)
 {
-    image->opaque = nullptr;
+    image->opaque = NULL;
 
-    if (!png_image_begin_read_from_file(image, path)) return false;
+    if (!png_image_begin_read_from_file(image, path.c_str())) return false;
 
     w = (float)image->width;
     h = (float)image->height;
@@ -64,10 +65,10 @@ bool PngLoader::open(const char* path)
 }
 
 
-bool PngLoader::open(const char* data, uint32_t size, TVG_UNUSED const char* rpath, bool copy)
+bool PngLoader::open(const char* data, uint32_t size, bool copy)
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    image->opaque = nullptr;
+    image->opaque = NULL;
 
     if (!png_image_begin_read_from_memory(image, data, size)) return false;
 
@@ -95,9 +96,9 @@ bool PngLoader::read()
         surface.cs = ColorSpace::ABGR8888S;
     }
 
-    auto buffer = tvg::malloc<png_byte>(PNG_IMAGE_SIZE((*image)));
+    auto buffer = static_cast<png_bytep>(malloc(PNG_IMAGE_SIZE((*image))));
     if (!png_image_finish_read(image, NULL, buffer, 0, NULL)) {
-        tvg::free(buffer);
+        free(buffer);
         return false;
     }
 
diff --git a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.h b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.h
index 689ef2d3..c45544eb 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.h
+++ b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,8 +32,8 @@ public:
     PngLoader();
     ~PngLoader();
 
-    bool open(const char* path) override;
-    bool open(const char* data, uint32_t size, const char* rpath, bool copy) override;
+    bool open(const string& path) override;
+    bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
 private:
diff --git a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
index 10fc6c80..ebf222b1 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
+
 void WebpLoader::run(unsigned tid)
 {
     //TODO: acquire the current colorspace format & pre-multiplied alpha image.
@@ -57,7 +58,7 @@ WebpLoader::~WebpLoader()
 {
     done();
 
-    if (freeData) tvg::free(data);
+    if (freeData) free(data);
     data = nullptr;
     size = 0;
     freeData = false;
@@ -65,27 +66,47 @@ WebpLoader::~WebpLoader()
 }
 
 
-bool WebpLoader::open(const char* path)
+bool WebpLoader::open(const string& path)
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    if (!(data = (unsigned char*)LoadModule::open(path, size))) return false;
+    auto webpFile = fopen(path.c_str(), "rb");
+    if (!webpFile) return false;
+
+    auto ret = false;
+
+    //determine size
+    if (fseek(webpFile, 0, SEEK_END) < 0) goto finalize;
+    if (((size = ftell(webpFile)) < 1)) goto finalize;
+    if (fseek(webpFile, 0, SEEK_SET)) goto finalize;
+
+    data = (unsigned char *) malloc(size);
+    if (!data) goto finalize;
+
+    freeData = true;
+
+    if (fread(data, size, 1, webpFile) < 1) goto finalize;
 
     int width, height;
-    if (!WebPGetInfo(data, size, &width, &height)) return false;
+    if (!WebPGetInfo(data, size, &width, &height)) goto finalize;
+
     w = static_cast<float>(width);
     h = static_cast<float>(height);
-    freeData = true;
-    return true;
+
+    ret = true;
+
+finalize:
+    fclose(webpFile);
+    return ret;
 #else
     return false;
 #endif
 }
 
 
-bool WebpLoader::open(const char* data, uint32_t size, TVG_UNUSED const char* rpath, bool copy)
+bool WebpLoader::open(const char* data, uint32_t size, bool copy)
 {
     if (copy) {
-        this->data = tvg::malloc<unsigned char>(size);
+        this->data = (unsigned char *) malloc(size);
         if (!this->data) return false;
         memcpy((unsigned char *)this->data, data, size);
         freeData = true;
diff --git a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.h b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.h
index fc647388..3d44edac 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.h
+++ b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,8 +32,8 @@ public:
     WebpLoader();
     ~WebpLoader();
 
-    bool open(const char* path) override;
-    bool open(const char* data, uint32_t size, const char* rpath, bool copy) override;
+    bool open(const string& path) override;
+    bool open(const char* data, uint32_t size, bool copy) override;
     bool read() override;
 
     RenderSurface* bitmap() override;
@@ -42,7 +42,7 @@ private:
     void run(unsigned tid) override;
 
     unsigned char* data = nullptr;
-    uint32_t size = 0;
+    unsigned long size = 0;
     bool freeData = false;
 };
 
diff --git a/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.cpp b/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.cpp
index 0e50bc36..b797f982 100644
--- a/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,19 @@
  * SOFTWARE.
  */
 
+#include <fstream>
+#include <string.h>
 #include "tvgLoader.h"
 #include "tvgRawLoader.h"
 
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
 
 RawLoader::RawLoader() : ImageLoader(FileType::Raw)
 {
@@ -31,11 +41,11 @@ RawLoader::RawLoader() : ImageLoader(FileType::Raw)
 
 RawLoader::~RawLoader()
 {
-    if (copy) tvg::free(surface.buf32);
+    if (copy) free(surface.buf32);
 }
 
 
-bool RawLoader::open(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy)
+bool RawLoader::open(const uint32_t* data, uint32_t w, uint32_t h, bool copy)
 {
     if (!LoadModule::read()) return true;
 
@@ -46,7 +56,7 @@ bool RawLoader::open(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs
     this->copy = copy;
 
     if (copy) {
-        surface.buf32 = tvg::malloc<uint32_t>(sizeof(uint32_t) * w * h);
+        surface.buf32 = (uint32_t*)malloc(sizeof(uint32_t) * w * h);
         if (!surface.buf32) return false;
         memcpy((void*)surface.buf32, data, sizeof(uint32_t) * w * h);
     }
@@ -56,9 +66,9 @@ bool RawLoader::open(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs
     surface.stride = w;
     surface.w = w;
     surface.h = h;
-    surface.cs = cs;
+    surface.cs = ColorSpace::ARGB8888;
     surface.channelSize = sizeof(uint32_t);
-    surface.premultiplied = (cs == ColorSpace::ABGR8888 || cs == ColorSpace::ARGB8888) ? true : false;
+    surface.premultiplied = true;
 
     return true;
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.h b/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.h
index 87f08ad8..970cdd9c 100644
--- a/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.h
+++ b/engine/thirdparty/thorvg/src/loaders/raw/tvgRawLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@ public:
     ~RawLoader();
 
     using LoadModule::open;
-    bool open(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy);
+    bool open(const uint32_t* data, uint32_t w, uint32_t h, bool copy);
     bool read() override;
 };
 
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.cpp
index 17eccc4a..1b078c4f 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2022 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,124 +20,161 @@
  * SOFTWARE.
  */
 
-#include "tvgSvgUtil.h"
 #include "tvgSvgCssStyle.h"
 
+#include <cstring>
+
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-static inline bool _isImportanceApplicable(const SvgStyleFlags& toFlagsImportance, SvgStyleFlags fromFlagsImportance, SvgStyleFlags flag)
+static bool _isImportanceApplicable(SvgStyleFlags &toFlagsImportance, SvgStyleFlags fromFlagsImportance, SvgStyleFlags flag)
 {
-    return !(toFlagsImportance & flag) && (fromFlagsImportance & flag);
+    if (!(toFlagsImportance & flag) && (fromFlagsImportance & flag)) {
+        return true;
+    }
+    return false;
 }
 
-
-static void _copyStyle(SvgStyleProperty* to, const SvgStyleProperty* from, bool overwrite)
+static void _copyStyle(SvgStyleProperty* to, const SvgStyleProperty* from)
 {
-    if (!from) return;
-
+    if (from == nullptr) return;
     //Copy the properties of 'from' only if they were explicitly set (not the default ones).
-    if ((from->curColorSet && (overwrite || !(to->flags & SvgStyleFlags::Color))) ||
+    if ((from->curColorSet && !(to->flags & SvgStyleFlags::Color)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::Color)) {
         to->color = from->color;
         to->curColorSet = true;
-        to->flags |= SvgStyleFlags::Color;
-        if (from->flagsImportance & SvgStyleFlags::Color) to->flagsImportance |= SvgStyleFlags::Color;
+        to->flags = (to->flags | SvgStyleFlags::Color);
+        if (from->flagsImportance & SvgStyleFlags::Color) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::Color);
+        }
     }
-    if (((from->flags & SvgStyleFlags::PaintOrder) && (overwrite || !(to->flags & SvgStyleFlags::PaintOrder))) ||
+    if (((from->flags & SvgStyleFlags::PaintOrder) && !(to->flags & SvgStyleFlags::PaintOrder)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::PaintOrder)) {
         to->paintOrder = from->paintOrder;
-        to->flags |= SvgStyleFlags::PaintOrder;
-        if (from->flagsImportance & SvgStyleFlags::PaintOrder) to->flagsImportance |= SvgStyleFlags::PaintOrder;
+        to->flags = (to->flags | SvgStyleFlags::PaintOrder);
+        if (from->flagsImportance & SvgStyleFlags::PaintOrder) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::PaintOrder);
+        }
     }
-    if (((from->flags & SvgStyleFlags::Display) && (overwrite || !(to->flags & SvgStyleFlags::Display))) ||
+    if (((from->flags & SvgStyleFlags::Display) && !(to->flags & SvgStyleFlags::Display)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::Display)) {
         to->display = from->display;
-        to->flags |= SvgStyleFlags::Display;
-        if (from->flagsImportance & SvgStyleFlags::Display) to->flagsImportance |= SvgStyleFlags::Display;
+        to->flags = (to->flags | SvgStyleFlags::Display);
+        if (from->flagsImportance & SvgStyleFlags::Display) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::Display);
+        }
     }
     //Fill
-    if (((from->fill.flags & SvgFillFlags::Paint) && (overwrite || !(to->flags & SvgStyleFlags::Fill))) ||
+    if (((from->fill.flags & SvgFillFlags::Paint) && !(to->flags & SvgStyleFlags::Fill)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::Fill)) {
         to->fill.paint.color = from->fill.paint.color;
         to->fill.paint.none = from->fill.paint.none;
         to->fill.paint.curColor = from->fill.paint.curColor;
-        if (from->fill.paint.url) svgUtilReplace(&to->fill.paint.url, from->fill.paint.url);
-        to->fill.flags |= SvgFillFlags::Paint;
-        to->flags |= SvgStyleFlags::Fill;
-        if (from->flagsImportance & SvgStyleFlags::Fill) to->flagsImportance |= SvgStyleFlags::Fill;
+        if (from->fill.paint.url) {
+            if (to->fill.paint.url) free(to->fill.paint.url);
+            to->fill.paint.url = strdup(from->fill.paint.url);
+        }
+        to->fill.flags = (to->fill.flags | SvgFillFlags::Paint);
+        to->flags = (to->flags | SvgStyleFlags::Fill);
+        if (from->flagsImportance & SvgStyleFlags::Fill) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::Fill);
+        }
     }
-    if (((from->fill.flags & SvgFillFlags::Opacity) && (overwrite || !(to->flags & SvgStyleFlags::FillOpacity))) ||
+    if (((from->fill.flags & SvgFillFlags::Opacity) && !(to->flags & SvgStyleFlags::FillOpacity)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::FillOpacity)) {
         to->fill.opacity = from->fill.opacity;
-        to->fill.flags |= SvgFillFlags::Opacity;
-        to->flags |= SvgStyleFlags::FillOpacity;
-        if (from->flagsImportance & SvgStyleFlags::FillOpacity) to->flagsImportance |= SvgStyleFlags::FillOpacity;
+        to->fill.flags = (to->fill.flags | SvgFillFlags::Opacity);
+        to->flags = (to->flags | SvgStyleFlags::FillOpacity);
+        if (from->flagsImportance & SvgStyleFlags::FillOpacity) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::FillOpacity);
+        }
     }
-    if (((from->fill.flags & SvgFillFlags::FillRule) && (overwrite || !(to->flags & SvgStyleFlags::FillRule))) ||
+    if (((from->fill.flags & SvgFillFlags::FillRule) && !(to->flags & SvgStyleFlags::FillRule)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::FillRule)) {
         to->fill.fillRule = from->fill.fillRule;
-        to->fill.flags |= SvgFillFlags::FillRule;
-        to->flags |= SvgStyleFlags::FillRule;
-        if (from->flagsImportance & SvgStyleFlags::FillRule) to->flagsImportance |= SvgStyleFlags::FillRule;
+        to->fill.flags = (to->fill.flags | SvgFillFlags::FillRule);
+        to->flags = (to->flags | SvgStyleFlags::FillRule);
+        if (from->flagsImportance & SvgStyleFlags::FillRule) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::FillRule);
+        }
     }
     //Stroke
-    if (((from->stroke.flags & SvgStrokeFlags::Paint) && (overwrite || !(to->flags & SvgStyleFlags::Stroke))) ||
+    if (((from->stroke.flags & SvgStrokeFlags::Paint) && !(to->flags & SvgStyleFlags::Stroke)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::Stroke)) {
         to->stroke.paint.color = from->stroke.paint.color;
         to->stroke.paint.none = from->stroke.paint.none;
         to->stroke.paint.curColor = from->stroke.paint.curColor;
-        if (from->stroke.paint.url) svgUtilReplace(&to->stroke.paint.url, from->stroke.paint.url);
-        to->stroke.flags |= SvgStrokeFlags::Paint;
-        to->flags |= SvgStyleFlags::Stroke;
-        if (from->flagsImportance & SvgStyleFlags::Stroke) to->flagsImportance |= SvgStyleFlags::Stroke;
-    }
-    if (((from->stroke.flags & SvgStrokeFlags::Opacity) && (overwrite || !(to->flags & SvgStyleFlags::StrokeOpacity))) ||
-        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeOpacity)) {
-        to->stroke.opacity = from->stroke.opacity;
-        to->stroke.flags |= SvgStrokeFlags::Opacity;
-        to->flags |= SvgStyleFlags::StrokeOpacity;
-        if (from->flagsImportance & SvgStyleFlags::StrokeOpacity) to->flagsImportance |= SvgStyleFlags::StrokeOpacity;
-    }
-    if (((from->stroke.flags & SvgStrokeFlags::Width) && (overwrite || !(to->flags & SvgStyleFlags::StrokeWidth))) ||
-        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeWidth)) {
-        to->stroke.width = from->stroke.width;
-        to->stroke.flags |= SvgStrokeFlags::Width;
-        to->flags |= SvgStyleFlags::StrokeWidth;
-        if (from->flagsImportance & SvgStyleFlags::StrokeWidth) to->flagsImportance |= SvgStyleFlags::StrokeWidth;
-    }
-    if (((from->stroke.flags & SvgStrokeFlags::Dash) && (overwrite || !(to->flags & SvgStyleFlags::StrokeDashArray))) ||
-        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeDashArray)) {
-        if (!from->stroke.dash.array.empty()) {
-            to->stroke.dash.array.clear();
-            to->stroke.dash.array.reserve(from->stroke.dash.array.count);
-            ARRAY_FOREACH(p, from->stroke.dash.array) to->stroke.dash.array.push(*p);
-            to->stroke.flags |= SvgStrokeFlags::Dash;
-            to->flags |= SvgStyleFlags::StrokeDashArray;
-            if (from->flagsImportance & SvgStyleFlags::StrokeDashArray) to->flagsImportance |= SvgStyleFlags::StrokeDashArray;
+        if (from->stroke.paint.url) {
+            if (to->stroke.paint.url) free(to->stroke.paint.url);
+            to->stroke.paint.url = strdup(from->stroke.paint.url);
+        }
+        to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Paint);
+        to->flags = (to->flags | SvgStyleFlags::Stroke);
+        if (from->flagsImportance & SvgStyleFlags::Stroke) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::Stroke);
         }
     }
-    if (((from->stroke.flags & SvgStrokeFlags::Cap) && (overwrite || !(to->flags & SvgStyleFlags::StrokeLineCap))) ||
+    if (((from->stroke.flags & SvgStrokeFlags::Opacity) && !(to->flags & SvgStyleFlags::StrokeOpacity)) ||
+        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeOpacity)) {
+        to->stroke.opacity = from->stroke.opacity;
+        to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Opacity);
+        to->flags = (to->flags | SvgStyleFlags::StrokeOpacity);
+        if (from->flagsImportance & SvgStyleFlags::StrokeOpacity) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::StrokeOpacity);
+        }
+    }
+    if (((from->stroke.flags & SvgStrokeFlags::Width) && !(to->flags & SvgStyleFlags::StrokeWidth)) ||
+        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeWidth)) {
+        to->stroke.width = from->stroke.width;
+        to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Width);
+        to->flags = (to->flags | SvgStyleFlags::StrokeWidth);
+        if (from->flagsImportance & SvgStyleFlags::StrokeWidth) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::StrokeWidth);
+        }
+    }
+    if (((from->stroke.flags & SvgStrokeFlags::Dash) && !(to->flags & SvgStyleFlags::StrokeDashArray)) ||
+        _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeDashArray)) {
+        if (from->stroke.dash.array.count > 0) {
+            to->stroke.dash.array.clear();
+            to->stroke.dash.array.reserve(from->stroke.dash.array.count);
+            for (uint32_t i = 0; i < from->stroke.dash.array.count; ++i) {
+                to->stroke.dash.array.push(from->stroke.dash.array[i]);
+            }
+            to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Dash);
+            to->flags = (to->flags | SvgStyleFlags::StrokeDashArray);
+            if (from->flagsImportance & SvgStyleFlags::StrokeDashArray) {
+                to->flagsImportance = (to->flagsImportance | SvgStyleFlags::StrokeDashArray);
+            }
+        }
+    }
+    if (((from->stroke.flags & SvgStrokeFlags::Cap) && !(to->flags & SvgStyleFlags::StrokeLineCap)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeLineCap)) {
         to->stroke.cap = from->stroke.cap;
-        to->stroke.flags |= SvgStrokeFlags::Cap;
-        to->flags |= SvgStyleFlags::StrokeLineCap;
-        if (from->flagsImportance & SvgStyleFlags::StrokeLineCap) to->flagsImportance |= SvgStyleFlags::StrokeLineCap;
+        to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Cap);
+        to->flags = (to->flags | SvgStyleFlags::StrokeLineCap);
+        if (from->flagsImportance & SvgStyleFlags::StrokeLineCap) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::StrokeLineCap);
+        }
     }
-    if (((from->stroke.flags & SvgStrokeFlags::Join) && (overwrite || !(to->flags & SvgStyleFlags::StrokeLineJoin))) ||
+    if (((from->stroke.flags & SvgStrokeFlags::Join) && !(to->flags & SvgStyleFlags::StrokeLineJoin)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::StrokeLineJoin)) {
         to->stroke.join = from->stroke.join;
-        to->stroke.flags |= SvgStrokeFlags::Join;
-        to->flags |= SvgStyleFlags::StrokeLineJoin;
-        if (from->flagsImportance & SvgStyleFlags::StrokeLineJoin) to->flagsImportance |= SvgStyleFlags::StrokeLineJoin;
+        to->stroke.flags = (to->stroke.flags | SvgStrokeFlags::Join);
+        to->flags = (to->flags | SvgStyleFlags::StrokeLineJoin);
+        if (from->flagsImportance & SvgStyleFlags::StrokeLineJoin) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::StrokeLineJoin);
+        }
     }
     //Opacity
-    if (((from->flags & SvgStyleFlags::Opacity) && (overwrite || !(to->flags & SvgStyleFlags::Opacity))) ||
+    //TODO: it can be set to be 255 and shouldn't be changed by attribute 'opacity'
+    if ((from->opacity < 255 && !(to->flags & SvgStyleFlags::Opacity)) ||
         _isImportanceApplicable(to->flagsImportance, from->flagsImportance, SvgStyleFlags::Opacity)) {
         to->opacity = from->opacity;
-        to->flags |= SvgStyleFlags::Opacity;
-        if (from->flagsImportance & SvgStyleFlags::Opacity) to->flagsImportance |= SvgStyleFlags::Opacity;
+        to->flags = (to->flags | SvgStyleFlags::Opacity);
+        if (from->flagsImportance & SvgStyleFlags::Opacity) {
+            to->flagsImportance = (to->flagsImportance | SvgStyleFlags::Opacity);
+        }
     }
 }
 
@@ -146,29 +183,38 @@ static void _copyStyle(SvgStyleProperty* to, const SvgStyleProperty* from, bool
 /* External Class Implementation                                        */
 /************************************************************************/
 
-
-void cssCopyStyleAttr(SvgNode* to, const SvgNode* from, bool overwrite)
+void cssCopyStyleAttr(SvgNode* to, const SvgNode* from)
 {
     //Copy matrix attribute
-    if (from->transform && (overwrite || !(to->style->flags & SvgStyleFlags::Transform))) {
-        if (!to->transform) to->transform = tvg::malloc<Matrix>(sizeof(Matrix));
-        *to->transform = *from->transform;
-        to->style->flags |= SvgStyleFlags::Transform;
+    if (from->transform && !(to->style->flags & SvgStyleFlags::Transform)) {
+        to->transform = (Matrix*)malloc(sizeof(Matrix));
+        if (to->transform) {
+            *to->transform = *from->transform;
+            to->style->flags = (to->style->flags | SvgStyleFlags::Transform);
+        }
     }
     //Copy style attribute
-    _copyStyle(to->style, from->style, overwrite);
+    _copyStyle(to->style, from->style);
 
-    if (from->style->clipPath.url) svgUtilReplace(&to->style->clipPath.url, from->style->clipPath.url);
-    if (from->style->mask.url) svgUtilReplace(&to->style->mask.url, from->style->mask.url);
+    if (from->style->clipPath.url) {
+        if (to->style->clipPath.url) free(to->style->clipPath.url);
+        to->style->clipPath.url = strdup(from->style->clipPath.url);
+    }
+    if (from->style->mask.url) {
+        if (to->style->mask.url) free(to->style->mask.url);
+        to->style->mask.url = strdup(from->style->mask.url);
+    }
 }
 
 
 SvgNode* cssFindStyleNode(const SvgNode* style, const char* title, SvgNodeType type)
 {
     if (!style) return nullptr;
-    ARRAY_FOREACH(p, style->child) {
-        if ((*p)->type == type) {
-            if ((!title && !(*p)->id) || (title && (*p)->id && STR_AS((*p)->id, title))) return *p;
+
+    auto child = style->child.data;
+    for (uint32_t i = 0; i < style->child.count; ++i, ++child) {
+        if ((*child)->type == type) {
+            if ((!title && !(*child)->id) || (title && (*child)->id && !strcmp((*child)->id, title))) return (*child);
         }
     }
     return nullptr;
@@ -178,9 +224,11 @@ SvgNode* cssFindStyleNode(const SvgNode* style, const char* title, SvgNodeType t
 SvgNode* cssFindStyleNode(const SvgNode* style, const char* title)
 {
     if (!style || !title) return nullptr;
-    ARRAY_FOREACH(p, style->child) {
-        if ((*p)->type == SvgNodeType::CssStyle) {
-            if ((*p)->id && STR_AS((*p)->id, title)) return *p;
+
+    auto child = style->child.data;
+    for (uint32_t i = 0; i < style->child.count; ++i, ++child) {
+        if ((*child)->type == SvgNodeType::CssStyle) {
+            if ((*child)->id && !strcmp((*child)->id, title)) return (*child);
         }
     }
     return nullptr;
@@ -189,10 +237,29 @@ SvgNode* cssFindStyleNode(const SvgNode* style, const char* title)
 
 void cssUpdateStyle(SvgNode* doc, SvgNode* style)
 {
-    ARRAY_FOREACH(p, doc->child) {
-        if (auto cssNode = cssFindStyleNode(style, nullptr, (*p)->type)) {
-            cssCopyStyleAttr(*p, cssNode);
+    if (doc->child.count > 0) {
+        auto child = doc->child.data;
+        for (uint32_t i = 0; i < doc->child.count; ++i, ++child) {
+            if (auto cssNode = cssFindStyleNode(style, nullptr, (*child)->type)) {
+                cssCopyStyleAttr(*child, cssNode);
+            }
+            cssUpdateStyle(*child, style);
+        }
+    }
+}
+
+
+void cssApplyStyleToPostponeds(Array<SvgNodeIdPair>& postponeds, SvgNode* style)
+{
+    for (uint32_t i = 0; i < postponeds.count; ++i) {
+        auto nodeIdPair = postponeds[i];
+
+        //css styling: tag.name has higher priority than .name
+        if (auto cssNode = cssFindStyleNode(style, nodeIdPair.id, nodeIdPair.node->type)) {
+            cssCopyStyleAttr(nodeIdPair.node, cssNode);
+        }
+        if (auto cssNode = cssFindStyleNode(style, nodeIdPair.id)) {
+            cssCopyStyleAttr(nodeIdPair.node, cssNode);
         }
-        cssUpdateStyle(*p, style);
     }
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.h
index e0cbf27f..7d8dcfa9 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgCssStyle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2022 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,10 @@
 
 #include "tvgSvgLoaderCommon.h"
 
+void cssCopyStyleAttr(SvgNode* to, const SvgNode* from);
 SvgNode* cssFindStyleNode(const SvgNode* style, const char* title, SvgNodeType type);
 SvgNode* cssFindStyleNode(const SvgNode* style, const char* title);
 void cssUpdateStyle(SvgNode* doc, SvgNode* style);
-void cssCopyStyleAttr(SvgNode* to, const SvgNode* from, bool overwrite = false);
+void cssApplyStyleToPostponeds(Array<SvgNodeIdPair>& postponeds, SvgNode* style);
 
 #endif //_TVG_SVG_CSS_STYLE_H_
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
index 5e70c33a..12f55eb5 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,44 @@
  * SOFTWARE.
  */
 
-#include "tvgStr.h"
-#include "tvgMath.h"
-#include "tvgColor.h"
+/*
+ * Copyright notice for the EFL:
+
+ * Copyright (C) EFL developers (see AUTHORS)
+
+ * All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <cstring>
+#include <fstream>
+#include <float.h>
 #include "tvgLoader.h"
 #include "tvgXmlParser.h"
 #include "tvgSvgLoader.h"
 #include "tvgSvgSceneBuilder.h"
+#include "tvgStr.h"
 #include "tvgSvgCssStyle.h"
-#include "tvgSvgUtil.h"
+#include "tvgMath.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
@@ -44,36 +73,48 @@
 #define PX_PER_MM 3.779528f //1 in = 25.4 mm -> PX_PER_IN/25.4
 #define PX_PER_CM 37.79528f //1 in = 2.54 cm -> PX_PER_IN/2.54
 
-typedef bool (*parseAttributes)(const char* buf, unsigned bufLength, xmlAttributeCb func, const void* data);
+typedef bool (*parseAttributes)(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data);
 typedef SvgNode* (*FactoryMethod)(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func);
 typedef SvgStyleGradient* (*GradientFactoryMethod)(SvgLoaderData* loader, const char* buf, unsigned bufLength);
-static bool _parseStyleAttr(void* data, const char* key, const char* value);
-static bool _parseStyleAttr(void* data, const char* key, const char* value, bool style);
 
-static void _copyId(char** to, const char* from)
+static char* _skipSpace(const char* str, const char* end)
 {
-    tvg::free(*to);
-    if (from) {
-        if (*from == '\0') *to = nullptr;
-        else *to = duplicate(from);
-    } else {
-        *to = nullptr;
+    while (((end && str < end) || (!end && *str != '\0')) && isspace(*str)) {
+        ++str;
     }
+    return (char*) str;
+}
+
+
+static char* _copyId(const char* str)
+{
+    if (!str) return nullptr;
+    if (strlen(str) == 0) return nullptr;
+
+    return strdup(str);
+}
+
+
+static const char* _skipComma(const char* content)
+{
+    content = _skipSpace(content, nullptr);
+    if (*content == ',') return content + 1;
+    return content;
 }
 
 
 static bool _parseNumber(const char** content, const char** end, float* number)
 {
-    auto _end = end ? *end : nullptr;
+    const char* _end = end ? *end : nullptr;
 
-    *number = toFloat(*content, (char**)&_end);
+    *number = strToFloat(*content, (char**)&_end);
     //If the start of string is not number
     if ((*content) == _end) {
         if (end) *end = _end;
         return false;
     }
     //Skip comma if any
-    *content = svgUtilSkipWhiteSpaceAndComma(_end);
+    *content = _skipComma(_end);
     if (end) *end = _end;
 
     return true;
@@ -99,7 +140,7 @@ static constexpr struct
 
 static void _parseAspectRatio(const char** content, AspectRatioAlign* align, AspectRatioMeetOrSlice* meetOrSlice)
 {
-    if (STR_AS(*content, "none")) {
+    if (!strcmp(*content, "none")) {
         *align = AspectRatioAlign::None;
         return;
     }
@@ -108,23 +149,25 @@ static void _parseAspectRatio(const char** content, AspectRatioAlign* align, Asp
         if (!strncmp(*content, alignTags[i].tag, 8)) {
             *align = alignTags[i].align;
             *content += 8;
-            *content = svgUtilSkipWhiteSpace(*content, nullptr);
+            *content = _skipSpace(*content, nullptr);
             break;
         }
     }
 
-    if (STR_AS(*content, "meet")) {
+    if (!strcmp(*content, "meet")) {
         *meetOrSlice = AspectRatioMeetOrSlice::Meet;
-    } else if (STR_AS(*content, "slice")) {
+    } else if (!strcmp(*content, "slice")) {
         *meetOrSlice = AspectRatioMeetOrSlice::Slice;
     }
 }
 
 
-// According to https://www.w3.org/TR/SVG/coords.html#Units
+/**
+ * According to https://www.w3.org/TR/SVG/coords.html#Units
+ */
 static float _toFloat(const SvgParser* svgParse, const char* str, SvgParserLengthType type)
 {
-    float parsedValue = toFloat(str, nullptr);
+    float parsedValue = strToFloat(str, nullptr);
 
     if (strstr(str, "cm")) parsedValue *= PX_PER_CM;
     else if (strstr(str, "mm")) parsedValue *= PX_PER_MM;
@@ -153,7 +196,7 @@ static float _gradientToFloat(const SvgParser* svgParse, const char* str, bool&
 {
     char* end = nullptr;
 
-    auto parsedValue = toFloat(str, &end);
+    float parsedValue = strToFloat(str, &end);
     isPercentage = false;
 
     if (strstr(str, "%")) {
@@ -176,9 +219,9 @@ static float _toOffset(const char* str)
     char* end = nullptr;
     auto strEnd = str + strlen(str);
 
-    auto parsedValue = toFloat(str, &end);
+    float parsedValue = strToFloat(str, &end);
 
-    end = (char*)svgUtilSkipWhiteSpace(end, nullptr);
+    end = _skipSpace(end, nullptr);
     auto ptr = strstr(str, "%");
 
     if (ptr) {
@@ -193,7 +236,7 @@ static float _toOffset(const char* str)
 static int _toOpacity(const char* str)
 {
     char* end = nullptr;
-    auto opacity = toFloat(str, &end);
+    float opacity = strToFloat(str, &end);
 
     if (end) {
         if (end[0] == '%' && end[1] == '\0') return lrint(opacity * 2.55f);
@@ -205,7 +248,9 @@ static int _toOpacity(const char* str)
 
 static SvgMaskType _toMaskType(const char* str)
 {
-    return STR_AS(str, "Alpha") ? SvgMaskType::Alpha : SvgMaskType::Luminance;
+    if (!strcmp(str, "Alpha")) return SvgMaskType::Alpha;
+
+    return SvgMaskType::Luminance;
 }
 
 
@@ -213,12 +258,12 @@ static SvgMaskType _toMaskType(const char* str)
 //If any is omitted, will be rendered in its default order after the specified ones.
 static bool _toPaintOrder(const char* str)
 {
-    auto position = 1;
-    auto strokePosition = 0;
-    auto fillPosition = 0;
+    uint8_t position = 1;
+    uint8_t strokePosition = 0;
+    uint8_t fillPosition = 0;
 
     while (*str != '\0') {
-        str = svgUtilSkipWhiteSpace(str, nullptr);
+        str = _skipSpace(str, nullptr);
         if (!strncmp(str, "fill", 4)) {
             fillPosition = position++;
             str += 4;
@@ -245,7 +290,7 @@ static bool _toPaintOrder(const char* str)
         unsigned int i;                                                           \
                                                                                   \
         for (i = 0; i < sizeof(Tags_Array) / sizeof(Tags_Array[0]); i++) {        \
-            if (STR_AS(str, Tags_Array[i].tag)) return Tags_Array[i].Name;       \
+            if (!strcmp(str, Tags_Array[i].tag)) return Tags_Array[i].Name;       \
         }                                                                         \
         return Default;                                                           \
     }
@@ -303,7 +348,7 @@ static constexpr struct
 };
 
 
-_PARSE_TAG(FillRule, fillRule, FillRule, fillRuleTags, FillRule::NonZero)
+_PARSE_TAG(FillRule, fillRule, FillRule, fillRuleTags, FillRule::Winding)
 
 
 /* parse the dash pattern used during stroking a path.
@@ -318,22 +363,21 @@ static void _parseDashArray(SvgLoaderData* loader, const char *str, SvgDash* das
     char *end = nullptr;
 
     while (*str) {
-        str = svgUtilSkipWhiteSpaceAndComma(str);
-        auto parsedValue = toFloat(str, &end);
+        str = _skipComma(str);
+        float parsedValue = strToFloat(str, &end);
         if (str == end) break;
-        if (parsedValue < 0.0f) {
-            dash->array.reset();
-            return;
-        }
+        if (parsedValue <= 0.0f) break;
         if (*end == '%') {
             ++end;
             //Refers to the diagonal length of the viewport.
             //https://www.w3.org/TR/SVG2/coords.html#Units
             parsedValue = (sqrtf(powf(loader->svgParse->global.w, 2) + powf(loader->svgParse->global.h, 2)) / sqrtf(2.0f)) * (parsedValue / 100.0f);
         }
-        dash->array.push(parsedValue);
+        (*dash).array.push(parsedValue);
         str = end;
     }
+    //If dash array size is 1, it means that dash and gap size are the same.
+    if ((*dash).array.count == 1) (*dash).array.push((*dash).array[0]);
 }
 
 
@@ -357,7 +401,7 @@ static char* _idFromUrl(const char* url)
         if (*id == ' ' || *id == '\'') return nullptr;
     }
 
-    return duplicate(open, (close - open + 1));
+    return strDuplicate(open, (close - open + 1));
 }
 
 
@@ -384,13 +428,15 @@ static size_t _srcFromUrl(const char* url, char*& src)
 
 static unsigned char _parseColor(const char* value, char** end)
 {
-    auto r = toFloat(value, end);
-    *end = (char*)svgUtilSkipWhiteSpace(*end, nullptr);
+    float r;
+
+    r = strToFloat(value, end);
+    *end = _skipSpace(*end, nullptr);
     if (**end == '%') {
         r = 255 * r / 100;
         (*end)++;
     }
-    *end = (char*)svgUtilSkipWhiteSpace(*end, nullptr);
+    *end = _skipSpace(*end, nullptr);
 
     if (r < 0 || r > 255) {
         *end = nullptr;
@@ -556,9 +602,91 @@ static constexpr struct
 };
 
 
-static bool _toColor(const char* str, uint8_t& r, uint8_t&g, uint8_t& b, char** ref)
+static bool _hslToRgb(float hue, float saturation, float brightness, uint8_t* red, uint8_t* green, uint8_t* blue)
 {
-    auto len = strlen(str);
+    if (!red || !green || !blue) return false;
+
+    float sv, vsf, f, p, q, t, v;
+    float _red = 0, _green = 0, _blue = 0;
+    uint32_t i = 0;
+
+    while (hue < 0) hue += 360.0f;
+    hue = fmod(hue, 360.0f);
+    saturation = saturation > 0 ? std::min(saturation, 1.0f) : 0.0f;
+    brightness = brightness > 0 ? std::min(brightness, 1.0f) : 0.0f;
+
+    if (tvg::zero(saturation))  _red = _green = _blue = brightness;
+    else {
+        if (tvg::equal(hue, 360.0)) hue = 0.0f;
+        hue /= 60.0f;
+
+        v = (brightness <= 0.5f) ? (brightness * (1.0f + saturation)) : (brightness + saturation - (brightness * saturation));
+        p = brightness + brightness - v;
+
+        if (!tvg::zero(v)) sv = (v - p) / v;
+        else sv = 0;
+
+        i = static_cast<uint8_t>(hue);
+        f = hue - i;
+
+        vsf = v * sv * f;
+
+        t = p + vsf;
+        q = v - vsf;
+
+        switch (i) {
+            case 0: {
+                _red = v;
+                _green = t;
+                _blue = p;
+                break;
+            }
+            case 1: {
+                _red = q;
+                _green = v;
+                _blue = p;
+                break;
+            }
+            case 2: {
+                _red = p;
+                _green = v;
+                _blue = t;
+                break;
+            }
+            case 3: {
+                _red = p;
+                _green = q;
+                _blue = v;
+                break;
+            }
+            case 4: {
+                _red = t;
+                _green = p;
+                _blue = v;
+                break;
+            }
+            case 5: {
+                _red = v;
+                _green = p;
+                _blue = q;
+                break;
+            }
+        }
+    }
+
+    *red = (uint8_t)nearbyint(_red * 255.0f);
+    *green = (uint8_t)nearbyint(_green * 255.0f);
+    *blue = (uint8_t)nearbyint(_blue * 255.0f);
+
+    return true;
+}
+
+
+static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** ref)
+{
+    unsigned int len = strlen(str);
+    char *red, *green, *blue;
+    unsigned char tr, tg, tb;
 
     if (len == 4 && str[0] == '#') {
         //Case for "#456" should be interpreted as "#445566"
@@ -566,13 +694,13 @@ static bool _toColor(const char* str, uint8_t& r, uint8_t&g, uint8_t& b, char**
             char tmp[3] = { '\0', '\0', '\0' };
             tmp[0] = str[1];
             tmp[1] = str[1];
-            r = strtol(tmp, nullptr, 16);
+            *r = strtol(tmp, nullptr, 16);
             tmp[0] = str[2];
             tmp[1] = str[2];
-            g = strtol(tmp, nullptr, 16);
+            *g = strtol(tmp, nullptr, 16);
             tmp[0] = str[3];
             tmp[1] = str[3];
-            b = strtol(tmp, nullptr, 16);
+            *b = strtol(tmp, nullptr, 16);
         }
         return true;
     } else if (len == 7 && str[0] == '#') {
@@ -580,55 +708,53 @@ static bool _toColor(const char* str, uint8_t& r, uint8_t&g, uint8_t& b, char**
             char tmp[3] = { '\0', '\0', '\0' };
             tmp[0] = str[1];
             tmp[1] = str[2];
-            r = strtol(tmp, nullptr, 16);
+            *r = strtol(tmp, nullptr, 16);
             tmp[0] = str[3];
             tmp[1] = str[4];
-            g = strtol(tmp, nullptr, 16);
+            *g = strtol(tmp, nullptr, 16);
             tmp[0] = str[5];
             tmp[1] = str[6];
-            b = strtol(tmp, nullptr, 16);
+            *b = strtol(tmp, nullptr, 16);
         }
         return true;
     } else if (len >= 10 && (str[0] == 'r' || str[0] == 'R') && (str[1] == 'g' || str[1] == 'G') && (str[2] == 'b' || str[2] == 'B') && str[3] == '(' && str[len - 1] == ')') {
-        char *red, *green, *blue;
-        auto tr = _parseColor(str + 4, &red);
+        tr = _parseColor(str + 4, &red);
         if (red && *red == ',') {
-            auto tg = _parseColor(red + 1, &green);
+            tg = _parseColor(red + 1, &green);
             if (green && *green == ',') {
-                auto tb = _parseColor(green + 1, &blue);
+                tb = _parseColor(green + 1, &blue);
                 if (blue && blue[0] == ')' && blue[1] == '\0') {
-                    r = tr;
-                    g = tg;
-                    b = tb;
+                    *r = tr;
+                    *g = tg;
+                    *b = tb;
                 }
             }
         }
         return true;
     } else if (ref && len >= 3 && !strncmp(str, "url", 3)) {
-        tvg::free(*ref);
+        if (*ref) free(*ref);
         *ref = _idFromUrl((const char*)(str + 3));
         return true;
     } else if (len >= 10 && (str[0] == 'h' || str[0] == 'H') && (str[1] == 's' || str[1] == 'S') && (str[2] == 'l' || str[2] == 'L') && str[3] == '(' && str[len - 1] == ')') {
-        tvg::HSL hsl;
-        const char* content = svgUtilSkipWhiteSpace(str + 4, nullptr);
+        float th, ts, tb;
+        const char* content = _skipSpace(str + 4, nullptr);
         const char* hue = nullptr;
-        if (_parseNumber(&content, &hue, &hsl.h) && hue) {
+        if (_parseNumber(&content, &hue, &th) && hue) {
             const char* saturation = nullptr;
-            hue = svgUtilSkipWhiteSpace(hue, nullptr);
-            hue = (char*)svgUtilSkipWhiteSpaceAndComma(hue);
-            hue = svgUtilSkipWhiteSpace(hue, nullptr);
-            if (_parseNumber(&hue, &saturation, &hsl.s) && saturation && *saturation == '%') {
+            hue = _skipSpace(hue, nullptr);
+            hue = (char*)_skipComma(hue);
+            hue = _skipSpace(hue, nullptr);
+            if (_parseNumber(&hue, &saturation, &ts) && saturation && *saturation == '%') {
                 const char* brightness = nullptr;
-                hsl.s /= 100.0f;
-                saturation = svgUtilSkipWhiteSpace(saturation + 1, nullptr);
-                saturation = (char*)svgUtilSkipWhiteSpaceAndComma(saturation);
-                saturation = svgUtilSkipWhiteSpace(saturation, nullptr);
-                if (_parseNumber(&saturation, &brightness, &hsl.l) && brightness && *brightness == '%') {
-                    hsl.l /= 100.0f;
-                    brightness = svgUtilSkipWhiteSpace(brightness + 1, nullptr);
+                ts /= 100.0f;
+                saturation = _skipSpace(saturation + 1, nullptr);
+                saturation = (char*)_skipComma(saturation);
+                saturation = _skipSpace(saturation, nullptr);
+                if (_parseNumber(&saturation, &brightness, &tb) && brightness && *brightness == '%') {
+                    tb /= 100.0f;
+                    brightness = _skipSpace(brightness + 1, nullptr);
                     if (brightness && brightness[0] == ')' && brightness[1] == '\0') {
-                       hsl2rgb(hsl.h, tvg::clamp(hsl.s, 0.0f, 1.0f), tvg::clamp(hsl.l, 0.0f, 1.0f), r, g, b);
-                       return true;
+                       return _hslToRgb(th, ts, tb, r, g, b);
                     }
                 }
             }
@@ -637,9 +763,9 @@ static bool _toColor(const char* str, uint8_t& r, uint8_t&g, uint8_t& b, char**
         //Handle named color
         for (unsigned int i = 0; i < (sizeof(colors) / sizeof(colors[0])); i++) {
             if (!strcasecmp(colors[i].name, str)) {
-                r = ((uint8_t*)(&(colors[i].value)))[2];
-                g = ((uint8_t*)(&(colors[i].value)))[1];
-                b = ((uint8_t*)(&(colors[i].value)))[0];
+                *r = (((uint8_t*)(&(colors[i].value)))[2]);
+                *g = (((uint8_t*)(&(colors[i].value)))[1]);
+                *b = (((uint8_t*)(&(colors[i].value)))[0]);
                 return true;
             }
         }
@@ -651,15 +777,16 @@ static bool _toColor(const char* str, uint8_t& r, uint8_t&g, uint8_t& b, char**
 static char* _parseNumbersArray(char* str, float* points, int* ptCount, int len)
 {
     int count = 0;
+    char* end = nullptr;
 
-    str = (char*)svgUtilSkipWhiteSpace(str, nullptr);
+    str = _skipSpace(str, nullptr);
     while ((count < len) && (isdigit(*str) || *str == '-' || *str == '+' || *str == '.')) {
-        char* end = nullptr;
-        points[count++] = toFloat(str, &end);
+        points[count++] = strToFloat(str, &end);
         str = end;
-        str = (char*)svgUtilSkipWhiteSpaceAndComma(str);
+        str = _skipSpace(str, nullptr);
+        if (*str == ',') ++str;
         //Eat the rest of space
-        str = (char*)svgUtilSkipWhiteSpace(str, nullptr);
+        str = _skipSpace(str, nullptr);
     }
     *ptCount = count;
     return str;
@@ -705,13 +832,14 @@ static Matrix* _parseTransformationMatrix(const char* value)
 {
     const int POINT_CNT = 8;
 
-    auto matrix = tvg::malloc<Matrix>(sizeof(Matrix));
-    tvg::identity(matrix);
+    auto matrix = (Matrix*)malloc(sizeof(Matrix));
+    if (!matrix) return nullptr;
+    *matrix = {1, 0, 0, 0, 1, 0, 0, 0, 1};
 
     float points[POINT_CNT];
     int ptCount = 0;
-    auto str = (char*)value;
-    auto end = str + strlen(str);
+    char* str = (char*)value;
+    char* end = str + strlen(str);
 
     while (str < end) {
         auto state = MatrixState::Unknown;
@@ -729,7 +857,7 @@ static Matrix* _parseTransformationMatrix(const char* value)
         }
         if (state == MatrixState::Unknown) goto error;
 
-        str = (char*)svgUtilSkipWhiteSpace(str, end);
+        str = _skipSpace(str, end);
         if (*str != '(') goto error;
         ++str;
         str = _parseNumbersArray(str, points, &ptCount, POINT_CNT);
@@ -788,7 +916,7 @@ static Matrix* _parseTransformationMatrix(const char* value)
     }
     return matrix;
 error:
-    tvg::free(matrix);
+    if (matrix) free(matrix);
     return nullptr;
 }
 
@@ -799,41 +927,45 @@ error:
     }
 
 
+static bool _parseStyleAttr(void* data, const char* key, const char* value);
+static bool _parseStyleAttr(void* data, const char* key, const char* value, bool style);
+
+
 static bool _attrParseSvgNode(void* data, const char* key, const char* value)
 {
     SvgLoaderData* loader = (SvgLoaderData*)data;
     SvgNode* node = loader->svgParse->node;
     SvgDocNode* doc = &(node->node.doc);
 
-    if (STR_AS(key, "width")) {
+    if (!strcmp(key, "width")) {
         doc->w = _toFloat(loader->svgParse, value, SvgParserLengthType::Horizontal);
         if (strstr(value, "%") && !(doc->viewFlag & SvgViewFlag::Viewbox)) {
             doc->viewFlag = (doc->viewFlag | SvgViewFlag::WidthInPercent);
         } else {
             doc->viewFlag = (doc->viewFlag | SvgViewFlag::Width);
         }
-    } else if (STR_AS(key, "height")) {
+    } else if (!strcmp(key, "height")) {
         doc->h = _toFloat(loader->svgParse, value, SvgParserLengthType::Vertical);
         if (strstr(value, "%") && !(doc->viewFlag & SvgViewFlag::Viewbox)) {
             doc->viewFlag = (doc->viewFlag | SvgViewFlag::HeightInPercent);
         } else {
             doc->viewFlag = (doc->viewFlag | SvgViewFlag::Height);
         }
-    } else if (STR_AS(key, "viewBox")) {
-        if (_parseNumber(&value, nullptr, &doc->vbox.x)) {
-            if (_parseNumber(&value, nullptr, &doc->vbox.y)) {
-                if (_parseNumber(&value, nullptr, &doc->vbox.w)) {
-                    if (_parseNumber(&value, nullptr, &doc->vbox.h)) {
+    } else if (!strcmp(key, "viewBox")) {
+        if (_parseNumber(&value, nullptr, &doc->vx)) {
+            if (_parseNumber(&value, nullptr, &doc->vy)) {
+                if (_parseNumber(&value, nullptr, &doc->vw)) {
+                    if (_parseNumber(&value, nullptr, &doc->vh)) {
                         doc->viewFlag = (doc->viewFlag | SvgViewFlag::Viewbox);
-                        loader->svgParse->global.h = doc->vbox.h;
+                        loader->svgParse->global.h = doc->vh;
                     }
-                    loader->svgParse->global.w = doc->vbox.w;
+                    loader->svgParse->global.w = doc->vw;
                 }
-                loader->svgParse->global.y = doc->vbox.y;
+                loader->svgParse->global.y = doc->vy;
             }
-            loader->svgParse->global.x = doc->vbox.x;
+            loader->svgParse->global.x = doc->vx;
         }
-        if ((doc->viewFlag & SvgViewFlag::Viewbox) && (doc->vbox.w < 0.0f || doc->vbox.h < 0.0f)) {
+        if ((doc->viewFlag & SvgViewFlag::Viewbox) && (doc->vw < 0.0f || doc->vh < 0.0f)) {
             doc->viewFlag = (SvgViewFlag)((uint32_t)doc->viewFlag & ~(uint32_t)SvgViewFlag::Viewbox);
             TVGLOG("SVG", "Negative values of the <viewBox> width and/or height - the attribute invalidated.");
         }
@@ -841,12 +973,12 @@ static bool _attrParseSvgNode(void* data, const char* key, const char* value)
             loader->svgParse->global.x = loader->svgParse->global.y = 0.0f;
             loader->svgParse->global.w = loader->svgParse->global.h = 1.0f;
         }
-    } else if (STR_AS(key, "preserveAspectRatio")) {
+    } else if (!strcmp(key, "preserveAspectRatio")) {
         _parseAspectRatio(&value, &doc->align, &doc->meetOrSlice);
-    } else if (STR_AS(key, "style")) {
-        return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
 #ifdef THORVG_LOG_ENABLED
-    } else if ((STR_AS(key, "x") || STR_AS(key, "y")) && fabsf(toFloat(value, nullptr)) > FLOAT_EPSILON) {
+    } else if ((!strcmp(key, "x") || !strcmp(key, "y")) && fabsf(strToFloat(value, nullptr)) > FLOAT_EPSILON) {
         TVGLOG("SVG", "Unsupported attributes used [Elements type: Svg][Attribute: %s][Value: %s]", key, value);
 #endif
     } else {
@@ -859,24 +991,24 @@ static bool _attrParseSvgNode(void* data, const char* key, const char* value)
 //https://www.w3.org/TR/SVGTiny12/painting.html#SpecifyingPaint
 static void _handlePaintAttr(SvgPaint* paint, const char* value)
 {
-    if (STR_AS(value, "none")) {
+    if (!strcmp(value, "none")) {
         //No paint property
         paint->none = true;
         return;
     }
-    if (STR_AS(value, "currentColor")) {
+    if (!strcmp(value, "currentColor")) {
         paint->curColor = true;
         paint->none = false;
         return;
     }
-    if (_toColor(value, paint->color.r, paint->color.g, paint->color.b, &paint->url)) paint->none = false;
+    if (_toColor(value, &paint->color.r, &paint->color.g, &paint->color.b, &paint->url)) paint->none = false;
 }
 
 
 static void _handleColorAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
-    auto style = node->style;
-    if (_toColor(value, style->color.r, style->color.g, style->color.b, nullptr)) {
+    SvgStyleProperty* style = node->style;
+    if (_toColor(value, &style->color.r, &style->color.g, &style->color.b, nullptr)) {
         style->curColorSet = true;
     }
 }
@@ -884,7 +1016,7 @@ static void _handleColorAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, co
 
 static void _handleFillAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
-    auto style = node->style;
+    SvgStyleProperty* style = node->style;
     style->fill.flags = (style->fill.flags | SvgFillFlags::Paint);
     _handlePaintAttr(&style->fill.paint, value);
 }
@@ -892,7 +1024,7 @@ static void _handleFillAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, con
 
 static void _handleStrokeAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
-    auto style = node->style;
+    SvgStyleProperty* style = node->style;
     style->stroke.flags = (style->stroke.flags | SvgStrokeFlags::Paint);
     _handlePaintAttr(&style->stroke.paint, value);
 }
@@ -939,12 +1071,13 @@ static void _handleStrokeLineJoinAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode*
 static void _handleStrokeMiterlimitAttr(SvgLoaderData* loader, SvgNode* node, const char* value)
 {
     char* end = nullptr;
-    const float miterlimit = toFloat(value, &end);
+    const float miterlimit = strToFloat(value, &end);
 
     // https://www.w3.org/TR/SVG2/painting.html#LineJoin
     // - A negative value for stroke-miterlimit must be treated as an illegal value.
     if (miterlimit < 0.0f) {
-        TVGERR("SVG", "A stroke-miterlimit change (%f <- %f) with a negative value is omitted.", node->style->stroke.miterlimit, miterlimit);
+        TVGERR("SVG", "A stroke-miterlimit change (%f <- %f) with a negative value is omitted.",
+            node->style->stroke.miterlimit, miterlimit);
         return;
     }
 
@@ -981,10 +1114,10 @@ static void _handleTransformAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node
 
 static void _handleClipPathAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
-    auto style = node->style;
+    SvgStyleProperty* style = node->style;
     int len = strlen(value);
     if (len >= 3 && !strncmp(value, "url", 3)) {
-        tvg::free(style->clipPath.url);
+        if (style->clipPath.url) free(style->clipPath.url);
         style->clipPath.url = _idFromUrl((const char*)(value + 3));
     }
 }
@@ -992,26 +1125,15 @@ static void _handleClipPathAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node,
 
 static void _handleMaskAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
-    auto style = node->style;
+    SvgStyleProperty* style = node->style;
     int len = strlen(value);
     if (len >= 3 && !strncmp(value, "url", 3)) {
-        tvg::free(style->mask.url);
+        if (style->mask.url) free(style->mask.url);
         style->mask.url = _idFromUrl((const char*)(value + 3));
     }
 }
 
 
-static void _handleFilterAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
-{
-    auto style = node->style;
-    int len = strlen(value);
-    if (len >= 3 && !strncmp(value, "url", 3)) {
-        if (style->filter.url) tvg::free(style->filter.url);
-        style->filter.url = _idFromUrl((const char*)(value + 3));
-    }
-}
-
-
 static void _handleMaskTypeAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
     node->node.mask.type = _toMaskType(value);
@@ -1025,13 +1147,11 @@ static void _handleDisplayAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node,
     //       Depending on the type of node, additional functionality may be required.
     //       refer to https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/display
     node->style->flags = (node->style->flags | SvgStyleFlags::Display);
-    if (STR_AS(value, "none")) node->style->display = false;
+    if (!strcmp(value, "none")) node->style->display = false;
     else node->style->display = true;
 }
 
 
-static bool _cssApplyClass(SvgNode* node, const char* classString, SvgNode* styleRoot);
-
 static void _handlePaintOrderAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
     node->style->flags = (node->style->flags | SvgStyleFlags::PaintOrder);
@@ -1043,11 +1163,22 @@ static void _handleCssClassAttr(SvgLoaderData* loader, SvgNode* node, const char
 {
     auto cssClass = &node->style->cssClass;
 
-    _copyId(cssClass, value);
+    if (*cssClass && value) free(*cssClass);
+    *cssClass = _copyId(value);
 
-    if (!_cssApplyClass(node, *cssClass, loader->cssStyle)) {
-        loader->nodesToStyle.push({node, *cssClass});
+    bool cssClassFound = false;
+
+    //css styling: tag.name has higher priority than .name
+    if (auto cssNode = cssFindStyleNode(loader->cssStyle, *cssClass, node->type)) {
+        cssClassFound = true;
+        cssCopyStyleAttr(node, cssNode);
     }
+    if (auto cssNode = cssFindStyleNode(loader->cssStyle, *cssClass)) {
+        cssClassFound = true;
+        cssCopyStyleAttr(node, cssNode);
+    }
+
+    if (!cssClassFound) loader->nodesToStyle.push({node, *cssClass});
 }
 
 
@@ -1081,36 +1212,22 @@ static constexpr struct
     STYLE_DEF(mask, Mask, SvgStyleFlags::Mask),
     STYLE_DEF(mask-type, MaskType, SvgStyleFlags::MaskType),
     STYLE_DEF(display, Display, SvgStyleFlags::Display),
-    STYLE_DEF(paint-order, PaintOrder, SvgStyleFlags::PaintOrder),
-    STYLE_DEF(filter, Filter, SvgStyleFlags::Filter)
+    STYLE_DEF(paint-order, PaintOrder, SvgStyleFlags::PaintOrder)
 };
 
 
-static SvgXmlSpace _toXmlSpace(const char* str)
-{
-    if (STR_AS(str, "default")) return SvgXmlSpace::Default;
-    if (STR_AS(str, "preserve")) return SvgXmlSpace::Preserve;
-    return SvgXmlSpace::None;
-}
-
-
 static bool _parseStyleAttr(void* data, const char* key, const char* value, bool style)
 {
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    int sz;
     if (!key || !value) return false;
 
     //Trim the white space
-    key = svgUtilSkipWhiteSpace(key, nullptr);
-    value = svgUtilSkipWhiteSpace(value, nullptr);
+    key = _skipSpace(key, nullptr);
+    value = _skipSpace(value, nullptr);
 
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-
-    if (!style && STR_AS(key, "xml:space")) {
-        node->xmlSpace = _toXmlSpace(value);
-        return true;
-    }
-
-    int sz = strlen(key);
+    sz = strlen(key);
     for (unsigned int i = 0; i < sizeof(styleTags) / sizeof(styleTags[0]); i++) {
         if (styleTags[i].sz - 1 == sz && !strncmp(styleTags[i].tag, key, sz)) {
             bool importance = false;
@@ -1119,7 +1236,7 @@ static bool _parseStyleAttr(void* data, const char* key, const char* value, bool
                 while (size > 0 && isspace(value[size - 1])) {
                     size--;
                 }
-                value = duplicate(value, size);
+                value = strDuplicate(value, size);
                 importance = true;
             }
             if (style) {
@@ -1132,7 +1249,7 @@ static bool _parseStyleAttr(void* data, const char* key, const char* value, bool
             }
             if (importance) {
                 node->style->flagsImportance = (node->style->flags | styleTags[i].flag);
-                tvg::free(const_cast<char*>(value));
+                free(const_cast<char*>(value));
             }
             return true;
         }
@@ -1153,18 +1270,25 @@ static bool _parseStyleAttr(void* data, const char* key, const char* value)
  */
 static bool _attrParseGNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-
-    if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "transform")) node->transform = _parseTransformationMatrix(value);
-    else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
 
+    if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "transform")) {
+        node->transform = _parseTransformationMatrix(value);
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1174,20 +1298,21 @@ static bool _attrParseGNode(void* data, const char* key, const char* value)
  */
 static bool _attrParseClipPathNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto clip = &node->node.clip;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgClipNode* clip = &(node->node.clip);
 
-    if (STR_AS(key, "style")) {
-        return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    } else if (STR_AS(key, "transform")) {
+    if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "transform")) {
         node->transform = _parseTransformationMatrix(value);
-    } else if (STR_AS(key, "id")) {
-        _copyId(&node->id, value);
-    } else if (STR_AS(key, "class")) {
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
-    } else if (STR_AS(key, "clipPathUnits")) {
-        if (STR_AS(value, "objectBoundingBox")) clip->userSpace = false;
+    } else if (!strcmp(key, "clipPathUnits")) {
+        if (!strcmp(value, "objectBoundingBox")) clip->userSpace = false;
     } else {
         return _parseStyleAttr(loader, key, value, false);
     }
@@ -1197,21 +1322,22 @@ static bool _attrParseClipPathNode(void* data, const char* key, const char* valu
 
 static bool _attrParseMaskNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto mask = &node->node.mask;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgMaskNode* mask = &(node->node.mask);
 
-    if (STR_AS(key, "style")) {
-        return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    } else if (STR_AS(key, "transform")) {
+    if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "transform")) {
         node->transform = _parseTransformationMatrix(value);
-    } else if (STR_AS(key, "id")) {
-        _copyId(&node->id, value);
-    } else if (STR_AS(key, "class")) {
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
-    } else if (STR_AS(key, "maskContentUnits")) {
-        if (STR_AS(value, "objectBoundingBox")) mask->userSpace = false;
-    } else if (STR_AS(key, "mask-type")) {
+    } else if (!strcmp(key, "maskContentUnits")) {
+        if (!strcmp(value, "objectBoundingBox")) mask->userSpace = false;
+    } else if (!strcmp(key, "mask-type")) {
         mask->type = _toMaskType(value);
     } else {
         return _parseStyleAttr(loader, key, value, false);
@@ -1222,162 +1348,95 @@ static bool _attrParseMaskNode(void* data, const char* key, const char* value)
 
 static bool _attrParseCssStyleNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
 
-    if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
 
 static bool _attrParseSymbolNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto symbol = &node->node.symbol;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgSymbolNode* symbol = &(node->node.symbol);
 
-    if (STR_AS(key, "viewBox")) {
+    if (!strcmp(key, "viewBox")) {
         if (!_parseNumber(&value, nullptr, &symbol->vx) || !_parseNumber(&value, nullptr, &symbol->vy)) return false;
         if (!_parseNumber(&value, nullptr, &symbol->vw) || !_parseNumber(&value, nullptr, &symbol->vh)) return false;
         symbol->hasViewBox = true;
-    } else if (STR_AS(key, "width")) {
+    } else if (!strcmp(key, "width")) {
         symbol->w = _toFloat(loader->svgParse, value, SvgParserLengthType::Horizontal);
         symbol->hasWidth = true;
-    } else if (STR_AS(key, "height")) {
+    } else if (!strcmp(key, "height")) {
         symbol->h = _toFloat(loader->svgParse, value, SvgParserLengthType::Vertical);
         symbol->hasHeight = true;
-    } else if (STR_AS(key, "preserveAspectRatio")) {
+    } else if (!strcmp(key, "preserveAspectRatio")) {
         _parseAspectRatio(&value, &symbol->align, &symbol->meetOrSlice);
-    } else if (STR_AS(key, "overflow")) {
-        if (STR_AS(value, "visible")) symbol->overflowVisible = true;
+    } else if (!strcmp(key, "overflow")) {
+        if (!strcmp(value, "visible")) symbol->overflowVisible = true;
     } else {
         return _attrParseGNode(data, key, value);
     }
-    return true;
-}
 
-
-static constexpr struct
-{
-    const char* tag;
-    SvgParserLengthType type;
-    int sz;
-    size_t offset;
-} boxTags[] = {
-    {"x", SvgParserLengthType::Horizontal, sizeof("x"), offsetof(Box, x)},
-    {"y", SvgParserLengthType::Vertical, sizeof("y"), offsetof(Box, y)},
-    {"width", SvgParserLengthType::Horizontal, sizeof("width"), offsetof(Box, w)},
-    {"height", SvgParserLengthType::Vertical, sizeof("height"), offsetof(Box, h)}
-};
-
-
-static bool _parseBox(const char* key, const char* value, Box* box, bool (&isPercentage)[4])
-{
-    auto array = (unsigned char*)box;
-    int sz = strlen(key);
-    for (unsigned int i = 0; i < sizeof(boxTags) / sizeof(boxTags[0]); i++) {
-        if (boxTags[i].sz - 1 == sz && !strncmp(boxTags[i].tag, key, sz)) {
-            *(float*)(array + boxTags[i].offset) = _gradientToFloat(nullptr, value, isPercentage[i]);
-            return true;
-        }
-    }
-    return false;
-}
-
-
-static void _recalcBox(const SvgLoaderData* loader, Box* box, bool (&isPercentage)[4])
-{
-    auto array = (unsigned char*)box;
-    for (unsigned int i = 0; i < sizeof(boxTags) / sizeof(boxTags[0]); i++) {
-        if (!isPercentage[i]) continue;
-        if (boxTags[i].type == SvgParserLengthType::Horizontal) *(float*)(array + boxTags[i].offset) *= loader->svgParse->global.w;
-        else *(float*)(array + boxTags[i].offset) *= loader->svgParse->global.h;
-    }
-}
-
-
-static bool _attrParseFilterNode(void* data, const char* key, const char* value)
-{
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto filter = &node->node.filter;
-
-    _parseBox(key, value, &filter->box, filter->isPercentage);
-
-    if (STR_AS(key, "id")) {
-        _copyId(&node->id, value);
-    } else if (STR_AS(key, "primitiveUnits")) {
-        if (STR_AS(value, "objectBoundingBox")) filter->primitiveUserSpace = false;
-    } else if (STR_AS(key, "filterUnits")) {
-        if (STR_AS(value, "userSpaceOnUse")) filter->filterUserSpace = true;
-    }
-    return true;
-}
-
-
-static void _parseGaussianBlurStdDeviation(const char** content, float* x, float* y)
-{
-    auto str = *content;
-    char* end = nullptr;
-    float deviation[2] = {0, 0};
-    int n = 0;
-
-    while (*str && n < 2) {
-        str = svgUtilSkipWhiteSpaceAndComma(str);
-        auto parsedValue = toFloat(str, &end);
-        if (parsedValue < 0.0f) break;
-        deviation[n++] = parsedValue;
-        str = end;
-    }
-
-    *x = deviation[0];
-    *y = n == 1 ? deviation[0] : deviation[1];
-}
-
-
-static bool _attrParseGaussianBlurNode(void* data, const char* key, const char* value)
-{
-    SvgLoaderData* loader = (SvgLoaderData*)data;
-    SvgNode* node = loader->svgParse->node;
-    SvgGaussianBlurNode* gaussianBlur = &node->node.gaussianBlur;
-
-    if (_parseBox(key, value, &gaussianBlur->box, gaussianBlur->isPercentage)) gaussianBlur->hasBox = true;
-
-    if (STR_AS(key, "id")) {
-        _copyId(&node->id, value);
-    } else if (STR_AS(key, "stdDeviation")) {
-        _parseGaussianBlurStdDeviation(&value, &gaussianBlur->stdDevX, &gaussianBlur->stdDevY);
-    } else if (STR_AS(key, "edgeMode")) {
-        if (STR_AS(value, "wrap")) gaussianBlur->edgeModeWrap = true;
-    } else return _parseStyleAttr(loader, key, value, false);
     return true;
 }
 
 
 static SvgNode* _createNode(SvgNode* parent, SvgNodeType type)
 {
-    SvgNode* node = tvg::calloc<SvgNode>(1, sizeof(SvgNode));
+    SvgNode* node = (SvgNode*)calloc(1, sizeof(SvgNode));
+
+    if (!node) return nullptr;
 
     //Default fill property
-    node->style = tvg::calloc<SvgStyleProperty>(1, sizeof(SvgStyleProperty));
+    node->style = (SvgStyleProperty*)calloc(1, sizeof(SvgStyleProperty));
 
-    //Set the default values other than 0/false: https://www.w3.org/TR/SVGTiny12/painting.html#SpecifyingPaint
-    node->style->opacity = 255;
+    if (!node->style) {
+        free(node);
+        return nullptr;
+    }
+
+    //Update the default value of stroke and fill
+    //https://www.w3.org/TR/SVGTiny12/painting.html#SpecifyingPaint
+    node->style->fill.paint.none = false;
+    //Default fill opacity is 1
     node->style->fill.opacity = 255;
-    node->style->fill.fillRule = FillRule::NonZero;
+    node->style->opacity = 255;
+    //Default current color is not set
+    node->style->fill.paint.curColor = false;
+    node->style->curColorSet = false;
+    //Default fill rule is nonzero
+    node->style->fill.fillRule = FillRule::Winding;
+
+    //Default stroke is none
     node->style->stroke.paint.none = true;
+    //Default stroke opacity is 1
     node->style->stroke.opacity = 255;
+    //Default stroke current color is not set
+    node->style->stroke.paint.curColor = false;
+    //Default stroke width is 1
     node->style->stroke.width = 1;
+    //Default line cap is butt
     node->style->stroke.cap = StrokeCap::Butt;
+    //Default line join is miter
     node->style->stroke.join = StrokeJoin::Miter;
     node->style->stroke.miterlimit = 4.0f;
     node->style->stroke.scale = 1.0;
+
     node->style->paintOrder = _toPaintOrder("fill stroke");
+
+    //Default display is true("inline").
     node->style->display = true;
+
     node->parent = parent;
     node->type = type;
-    node->xmlSpace = SvgXmlSpace::None;
 
     if (parent) parent->child.push(node);
     return node;
@@ -1387,14 +1446,19 @@ static SvgNode* _createNode(SvgNode* parent, SvgNodeType type)
 static SvgNode* _createDefsNode(TVG_UNUSED SvgLoaderData* loader, TVG_UNUSED SvgNode* parent, const char* buf, unsigned bufLength, TVG_UNUSED parseAttributes func)
 {
     if (loader->def && loader->doc->node.doc.defs) return loader->def;
-    loader->def = loader->doc->node.doc.defs = _createNode(nullptr, SvgNodeType::Defs);
-    return loader->def;
+    SvgNode* node = _createNode(nullptr, SvgNodeType::Defs);
+
+    loader->def = node;
+    loader->doc->node.doc.defs = node;
+    return node;
 }
 
 
 static SvgNode* _createGNode(TVG_UNUSED SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::G);
+    if (!loader->svgParse->node) return nullptr;
+
     func(buf, bufLength, _attrParseGNode, loader);
     return loader->svgParse->node;
 }
@@ -1403,7 +1467,8 @@ static SvgNode* _createGNode(TVG_UNUSED SvgLoaderData* loader, SvgNode* parent,
 static SvgNode* _createSvgNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Doc);
-    auto doc = &loader->svgParse->node->node.doc;
+    if (!loader->svgParse->node) return nullptr;
+    SvgDocNode* doc = &(loader->svgParse->node->node.doc);
 
     loader->svgParse->global.w = 1.0f;
     loader->svgParse->global.h = 1.0f;
@@ -1471,6 +1536,13 @@ static SvgNode* _createSymbolNode(SvgLoaderData* loader, SvgNode* parent, const
 
     loader->svgParse->node->node.symbol.align = AspectRatioAlign::XMidYMid;
     loader->svgParse->node->node.symbol.meetOrSlice = AspectRatioMeetOrSlice::Meet;
+    loader->svgParse->node->node.symbol.overflowVisible = false;
+
+    loader->svgParse->node->node.symbol.hasViewBox = false;
+    loader->svgParse->node->node.symbol.hasWidth = false;
+    loader->svgParse->node->node.symbol.hasHeight = false;
+    loader->svgParse->node->node.symbol.vx = 0.0f;
+    loader->svgParse->node->node.symbol.vy = 0.0f;
 
     func(buf, bufLength, _attrParseSymbolNode, loader);
 
@@ -1478,52 +1550,30 @@ static SvgNode* _createSymbolNode(SvgLoaderData* loader, SvgNode* parent, const
 }
 
 
-static SvgNode* _createGaussianBlurNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
-{
-    loader->svgParse->node = _createNode(parent, SvgNodeType::GaussianBlur);
-    if (!loader->svgParse->node) return nullptr;
-
-    loader->svgParse->node->style->display = false;
-    loader->svgParse->node->node.gaussianBlur.box = {0.0f, 0.0f, 1.0f, 1.0f};
-
-    func(buf, bufLength, _attrParseGaussianBlurNode, loader);
-
-    return loader->svgParse->node;
-}
-
-
-static SvgNode* _createFilterNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
-{
-    loader->svgParse->node = _createNode(parent, SvgNodeType::Filter);
-    if (!loader->svgParse->node) return nullptr;
-    SvgFilterNode& filter = loader->svgParse->node->node.filter;
-
-    loader->svgParse->node->style->display = false;
-    filter.box = {-0.1f, -0.1f, 1.2f, 1.2f};
-    filter.primitiveUserSpace = true;
-
-    func(buf, bufLength, _attrParseFilterNode, loader);
-
-    if (filter.filterUserSpace) _recalcBox(loader, &filter.box, filter.isPercentage);
-
-    return loader->svgParse->node;
-}
-
-
 static bool _attrParsePathNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto path = &node->node.path;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgPathNode* path = &(node->node.path);
 
-    if (STR_AS(key, "d")) _copyId(&path->path, value);  // Temporary: need to copy
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "d")) {
+        if (path->path) free(path->path);
+        //Temporary: need to copy
+        path->path = _copyId(value);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1558,9 +1608,9 @@ static constexpr struct
  */
 static bool _attrParseCircleNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto circle = &node->node.circle;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgCircleNode* circle = &(node->node.circle);
     unsigned char* array;
     int sz = strlen(key);
 
@@ -1572,13 +1622,20 @@ static bool _attrParseCircleNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1627,13 +1684,20 @@ static bool _attrParseEllipseNode(void* data, const char* key, const char* value
         }
     }
 
-    if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1665,21 +1729,29 @@ static bool _attrParsePolygonPoints(const char* str, SvgPolygonNode* polygon)
  */
 static bool _attrParsePolygonNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
     SvgPolygonNode* polygon = nullptr;
 
-    if (node->type == SvgNodeType::Polygon) polygon = &node->node.polygon;
-    else polygon = &node->node.polyline;
+    if (node->type == SvgNodeType::Polygon) polygon = &(node->node.polygon);
+    else polygon = &(node->node.polyline);
 
-    if (STR_AS(key, "points")) return _attrParsePolygonPoints(value, polygon);
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "points")) {
+        return _attrParsePolygonPoints(value, polygon);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1726,9 +1798,9 @@ static constexpr struct
  */
 static bool _attrParseRectNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto rect = &node->node.rect;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgRectNode* rect = &(node->node.rect);
     unsigned char* array;
     bool ret = true;
     int sz = strlen(key);
@@ -1748,13 +1820,20 @@ static bool _attrParseRectNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else if (STR_AS(key, "style")) ret = xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else ret = _parseStyleAttr(loader, key, value, false);
+    if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else if (!strcmp(key, "style")) {
+        ret = simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else {
+        ret = _parseStyleAttr(loader, key, value, false);
+    }
 
     return ret;
 }
@@ -1766,6 +1845,8 @@ static SvgNode* _createRectNode(SvgLoaderData* loader, SvgNode* parent, const ch
 
     if (!loader->svgParse->node) return nullptr;
 
+    loader->svgParse->node->node.rect.hasRx = loader->svgParse->node->node.rect.hasRy = false;
+
     func(buf, bufLength, _attrParseRectNode, loader);
     return loader->svgParse->node;
 }
@@ -1790,9 +1871,9 @@ static constexpr struct
  */
 static bool _attrParseLineNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto line = &node->node.line;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgLineNode* line = &(node->node.line);
     unsigned char* array;
     int sz = strlen(key);
 
@@ -1804,14 +1885,20 @@ static bool _attrParseLineNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
-
+    if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -1829,9 +1916,9 @@ static SvgNode* _createLineNode(SvgLoaderData* loader, SvgNode* parent, const ch
 
 static char* _idFromHref(const char* href)
 {
-    href = svgUtilSkipWhiteSpace(href, nullptr);
+    href = _skipSpace(href, nullptr);
     if ((*href) == '#') href++;
-    return duplicate(href);
+    return strdup(href);
 }
 
 
@@ -1868,18 +1955,25 @@ static bool _attrParseImageNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "href") || STR_AS(key, "xlink:href")) {
-        if (value) tvg::free(image->href);
+    if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) {
+        if (image->href && value) free(image->href);
         image->href = _idFromHref(value);
-    } else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else if (STR_AS(key, "transform")) node->transform = _parseTransformationMatrix(value);
-    else return _parseStyleAttr(loader, key, value);
-
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else if (!strcmp(key, "transform")) {
+        node->transform = _parseTransformationMatrix(value);
+    } else {
+        return _parseStyleAttr(loader, key, value);
+    }
     return true;
 }
 
@@ -1898,8 +1992,8 @@ static SvgNode* _createImageNode(SvgLoaderData* loader, SvgNode* parent, const c
 static char* _unquote(const char* str)
 {
     auto len = str ? strlen(str) : 0;
-    if (len >= 2 && str[0] == '\'' && str[len - 1] == '\'') return duplicate(str + 1, len - 2);
-    return duplicate(str);
+    if (len >= 2 && str[0] == '\'' && str[len - 1] == '\'') return strDuplicate(str + 1, len - 2);
+    return strdup(str);
 }
 
 
@@ -1907,16 +2001,16 @@ static bool _attrParseFontFace(void* data, const char* key, const char* value)
 {
     if (!key || !value) return false;
 
-    key = svgUtilSkipWhiteSpace(key, nullptr);
-    value = svgUtilSkipWhiteSpace(value, nullptr);
+    key = _skipSpace(key, nullptr);
+    value = _skipSpace(value, nullptr);
 
     auto loader = (SvgLoaderData*)data;
     auto& font = loader->fonts.last();
 
-    if (STR_AS(key, "font-family")) {
-        if (font.name) tvg::free(font.name);
+    if (!strcmp(key, "font-family")) {
+        if (font.name) free(font.name);
         font.name = _unquote(value);
-    } else if (STR_AS(key, "src")) {
+    } else if (!strcmp(key, "src")) {
         font.srcLen = _srcFromUrl(value, font.src);
     }
 
@@ -1935,7 +2029,7 @@ static SvgNode* _getDefsNode(SvgNode* node)
 {
     if (!node) return nullptr;
 
-    while (node->parent) {
+    while (node->parent != nullptr) {
         node = node->parent;
     }
 
@@ -1950,14 +2044,17 @@ static SvgNode* _findNodeById(SvgNode *node, const char* id)
 {
     if (!node) return nullptr;
 
-    if (node->id && STR_AS(node->id, id)) return node;
+    SvgNode* result = nullptr;
+    if (node->id && !strcmp(node->id, id)) return node;
 
     if (node->child.count > 0) {
-        ARRAY_FOREACH(p, node->child) {
-            if (auto result = _findNodeById(*p, id)) return result;
+        auto child = node->child.data;
+        for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+            result = _findNodeById(*child, id);
+            if (result) break;
         }
     }
-    return nullptr;
+    return result;
 }
 
 
@@ -1965,7 +2062,7 @@ static SvgNode* _findParentById(SvgNode* node, char* id, SvgNode* doc)
 {
     SvgNode *parent = node->parent;
     while (parent != nullptr && parent != doc) {
-        if (parent->id && STR_AS(parent->id, id)) {
+        if (parent->id && !strcmp(parent->id, id)) {
             return parent;
         }
         parent = parent->parent;
@@ -1983,8 +2080,8 @@ static bool _checkPostponed(SvgNode* node, SvgNode* cloneNode, int depth)
         return false;
     }
 
-    ARRAY_FOREACH(p, node->child) {
-        if (_checkPostponed(*p, cloneNode, depth + 1)) return true;
+    for (uint32_t i = 0; i < node->child.count; ++i) {
+        if (_checkPostponed(node->child[i], cloneNode, depth + 1)) return true;
     }
 
     return false;
@@ -2026,7 +2123,7 @@ static bool _attrParseUseNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "href") || STR_AS(key, "xlink:href")) {
+    if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) {
         id = _idFromHref(value);
         defs = _getDefsNode(node);
         nodeFrom = _findNodeById(defs, id);
@@ -2034,10 +2131,10 @@ static bool _attrParseUseNode(void* data, const char* key, const char* value)
             if (!_findParentById(node, id, loader->doc)) {
                 //Check if none of nodeFrom's children are in the cloneNodes list
                 auto postpone = false;
-                INLIST_FOREACH(loader->cloneNodes, pair) {
+                for (auto pair = loader->cloneNodes.head; pair; pair = pair->next) {
                     if (_checkPostponed(nodeFrom, pair->node, 1)) {
                         postpone = true;
-                        loader->cloneNodes.back(new(tvg::malloc<SvgNodeIdPair>(sizeof(SvgNodeIdPair))) SvgNodeIdPair(node, id));
+                        loader->cloneNodes.back(new((SvgNodeIdPair*)malloc(sizeof(SvgNodeIdPair))) SvgNodeIdPair(node, id));
                         break;
                     }
                 }
@@ -2045,17 +2142,17 @@ static bool _attrParseUseNode(void* data, const char* key, const char* value)
                 if (!postpone) {
                     _cloneNode(nodeFrom, node, 0);
                     if (nodeFrom->type == SvgNodeType::Symbol) use->symbol = nodeFrom;
-                    tvg::free(id);
+                    free(id);
                 }
             } else {
                 TVGLOG("SVG", "%s is ancestor element. This reference is invalid.", id);
-                tvg::free(id);
+                free(id);
             }
         } else {
             //some svg export software include <defs> element at the end of the file
             //if so the 'from' element won't be found now and we have to repeat finding
             //after the whole file is parsed
-            loader->cloneNodes.back(new(tvg::malloc<SvgNodeIdPair>(sizeof(SvgNodeIdPair))) SvgNodeIdPair(node, id));
+            loader->cloneNodes.back(new((SvgNodeIdPair*)malloc(sizeof(SvgNodeIdPair))) SvgNodeIdPair(node, id));
         }
     } else {
         return _attrParseGNode(data, key, value);
@@ -2070,6 +2167,9 @@ static SvgNode* _createUseNode(SvgLoaderData* loader, SvgNode* parent, const cha
 
     if (!loader->svgParse->node) return nullptr;
 
+    loader->svgParse->node->node.use.isWidthSet = false;
+    loader->svgParse->node->node.use.isHeightSet = false;
+
     func(buf, bufLength, _attrParseUseNode, loader);
     return loader->svgParse->node;
 }
@@ -2090,9 +2190,9 @@ static constexpr struct
 
 static bool _attrParseTextNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto node = loader->svgParse->node;
-    auto text = &node->node.text;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+    SvgTextNode* text = &(node->node.text);
 
     unsigned char* array;
     int sz = strlen(key);
@@ -2105,15 +2205,23 @@ static bool _attrParseTextNode(void* data, const char* key, const char* value)
         }
     }
 
-    if (STR_AS(key, "font-family")) svgUtilReplace(&text->fontFamily, value);
-    else if (STR_AS(key, "style")) return xmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
-    else if (STR_AS(key, "clip-path")) _handleClipPathAttr(loader, node, value);
-    else if (STR_AS(key, "mask")) _handleMaskAttr(loader, node, value);
-    else if (STR_AS(key, "filter")) _handleFilterAttr(loader, node, value);
-    else if (STR_AS(key, "id")) _copyId(&node->id, value);
-    else if (STR_AS(key, "class")) _handleCssClassAttr(loader, node, value);
-    else return _parseStyleAttr(loader, key, value, false);
-
+    if (!strcmp(key, "font-family")) {
+        if (text->fontFamily && value) free(text->fontFamily);
+        text->fontFamily = strdup(value);
+    } else if (!strcmp(key, "style")) {
+        return simpleXmlParseW3CAttribute(value, strlen(value), _parseStyleAttr, loader);
+    } else if (!strcmp(key, "clip-path")) {
+        _handleClipPathAttr(loader, node, value);
+    } else if (!strcmp(key, "mask")) {
+        _handleMaskAttr(loader, node, value);
+    } else if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
     return true;
 }
 
@@ -2125,6 +2233,8 @@ static SvgNode* _createTextNode(SvgLoaderData* loader, SvgNode* parent, const ch
 
     //TODO: support the def font and size as used in a system?
     loader->svgParse->node->node.text.fontSize = 10.0f;
+    loader->svgParse->node->node.text.fontFamily = nullptr;
+    loader->svgParse->node->node.text.text = nullptr;
 
     func(buf, bufLength, _attrParseTextNode, loader);
 
@@ -2147,8 +2257,7 @@ static constexpr struct
     {"polyline", sizeof("polyline"), _createPolylineNode},
     {"line", sizeof("line"), _createLineNode},
     {"image", sizeof("image"), _createImageNode},
-    {"text", sizeof("text"), _createTextNode},
-    {"feGaussianBlur", sizeof("feGaussianBlur"), _createGaussianBlurNode}
+    {"text", sizeof("text"), _createTextNode}
 };
 
 
@@ -2164,8 +2273,7 @@ static constexpr struct
     {"mask", sizeof("mask"), _createMaskNode},
     {"clipPath", sizeof("clipPath"), _createClipPathNode},
     {"style", sizeof("style"), _createCssStyleNode},
-    {"symbol", sizeof("symbol"), _createSymbolNode},
-    {"filter", sizeof("filter"), _createFilterNode}
+    {"symbol", sizeof("symbol"), _createSymbolNode}
 };
 
 
@@ -2192,9 +2300,9 @@ FillSpread _parseSpreadValue(const char* value)
 {
     auto spread = FillSpread::Pad;
 
-    if (STR_AS(value, "reflect")) {
+    if (!strcmp(value, "reflect")) {
         spread = FillSpread::Reflect;
-    } else if (STR_AS(value, "repeat")) {
+    } else if (!strcmp(value, "repeat")) {
         spread = FillSpread::Repeat;
     }
 
@@ -2420,9 +2528,9 @@ static constexpr struct
 
 static bool _attrParseRadialGradientNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto grad = loader->svgParse->styleGrad;
-    auto radial = grad->radial;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgStyleGradient* grad = loader->svgParse->styleGrad;
+    SvgRadialGradient* radial = grad->radial;
     int sz = strlen(key);
 
     for (unsigned int i = 0; i < sizeof(radialTags) / sizeof(radialTags[0]); i++) {
@@ -2433,18 +2541,19 @@ static bool _attrParseRadialGradientNode(void* data, const char* key, const char
         }
     }
 
-    if (STR_AS(key, "id")) {
-        _copyId(&grad->id, value);
-    } else if (STR_AS(key, "spreadMethod")) {
+    if (!strcmp(key, "id")) {
+        if (grad->id && value) free(grad->id);
+        grad->id = _copyId(value);
+    } else if (!strcmp(key, "spreadMethod")) {
         grad->spread = _parseSpreadValue(value);
         grad->flags = (grad->flags | SvgGradientFlags::SpreadMethod);
-    } else if (STR_AS(key, "href") || STR_AS(key, "xlink:href")) {
-        if (value) tvg::free(grad->ref);
+    } else if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) {
+        if (grad->ref && value) free(grad->ref);
         grad->ref = _idFromHref(value);
-    } else if (STR_AS(key, "gradientUnits")) {
-        if (STR_AS(value, "userSpaceOnUse")) grad->userSpace = true;
+    } else if (!strcmp(key, "gradientUnits")) {
+        if (!strcmp(value, "userSpaceOnUse")) grad->userSpace = true;
         grad->flags = (grad->flags | SvgGradientFlags::GradientUnits);
-    } else if (STR_AS(key, "gradientTransform")) {
+    } else if (!strcmp(key, "gradientTransform")) {
         grad->transform = _parseTransformationMatrix(value);
     } else {
         return false;
@@ -2456,14 +2565,21 @@ static bool _attrParseRadialGradientNode(void* data, const char* key, const char
 
 static SvgStyleGradient* _createRadialGradient(SvgLoaderData* loader, const char* buf, unsigned bufLength)
 {
-    auto grad = tvg::calloc<SvgStyleGradient>(1, sizeof(SvgStyleGradient));
+    auto grad = (SvgStyleGradient*)(calloc(1, sizeof(SvgStyleGradient)));
     loader->svgParse->styleGrad = grad;
 
     grad->flags = SvgGradientFlags::None;
     grad->type = SvgGradientType::Radial;
-    grad->radial = tvg::calloc<SvgRadialGradient>(1, sizeof(SvgRadialGradient));
-
-    // default values of gradient transformed into global percentage
+    grad->userSpace = false;
+    grad->radial = (SvgRadialGradient*)calloc(1, sizeof(SvgRadialGradient));
+    if (!grad->radial) {
+        grad->clear();
+        free(grad);
+        return nullptr;
+    }
+    /**
+    * Default values of gradient transformed into global percentage
+    */
     grad->radial->cx = 0.5f;
     grad->radial->cy = 0.5f;
     grad->radial->fx = 0.5f;
@@ -2478,7 +2594,7 @@ static SvgStyleGradient* _createRadialGradient(SvgLoaderData* loader, const char
 
     loader->svgParse->gradient.parsedFx = false;
     loader->svgParse->gradient.parsedFy = false;
-    xmlParseAttributes(buf, bufLength,
+    simpleXmlParseAttributes(buf, bufLength,
         _attrParseRadialGradientNode, loader);
 
     for (unsigned int i = 0; i < sizeof(radialTags) / sizeof(radialTags[0]); i++) {
@@ -2506,17 +2622,17 @@ static bool _attrParseStopsStyle(void* data, const char* key, const char* value)
     SvgLoaderData* loader = (SvgLoaderData*)data;
     auto stop = &loader->svgParse->gradStop;
 
-    if (STR_AS(key, "stop-opacity")) {
+    if (!strcmp(key, "stop-opacity")) {
         stop->a = _toOpacity(value);
         loader->svgParse->flags = (loader->svgParse->flags | SvgStopStyleFlags::StopOpacity);
-    } else if (STR_AS(key, "stop-color")) {
-        if (STR_AS(value, "currentColor")) {
+    } else if (!strcmp(key, "stop-color")) {
+        if (!strcmp(value, "currentColor")) {
             if (auto latestColor = _findLatestColor(loader)) {
                 stop->r = latestColor->r;
                 stop->g = latestColor->g;
                 stop->b = latestColor->b;
             }
-        } else if (_toColor(value, stop->r, stop->g, stop->b, nullptr)) {
+        } else if (_toColor(value, &stop->r, &stop->g, &stop->b, nullptr)) {
             loader->svgParse->flags = (loader->svgParse->flags | SvgStopStyleFlags::StopColor);
         }
     } else {
@@ -2532,24 +2648,24 @@ static bool _attrParseStops(void* data, const char* key, const char* value)
     SvgLoaderData* loader = (SvgLoaderData*)data;
     auto stop = &loader->svgParse->gradStop;
 
-    if (STR_AS(key, "offset")) {
+    if (!strcmp(key, "offset")) {
         stop->offset = _toOffset(value);
-    } else if (STR_AS(key, "stop-opacity")) {
+    } else if (!strcmp(key, "stop-opacity")) {
         if (!(loader->svgParse->flags & SvgStopStyleFlags::StopOpacity)) {
             stop->a = _toOpacity(value);
         }
-    } else if (STR_AS(key, "stop-color")) {
-        if (STR_AS(value, "currentColor")) {
+    } else if (!strcmp(key, "stop-color")) {
+        if (!strcmp(value, "currentColor")) {
             if (auto latestColor = _findLatestColor(loader)) {
                 stop->r = latestColor->r;
                 stop->g = latestColor->g;
                 stop->b = latestColor->b;
             }
         } else if (!(loader->svgParse->flags & SvgStopStyleFlags::StopColor)) {
-            _toColor(value, stop->r, stop->g, stop->b, nullptr);
+            _toColor(value, &stop->r, &stop->g, &stop->b, nullptr);
         }
-    } else if (STR_AS(key, "style")) {
-        xmlParseW3CAttribute(value, strlen(value), _attrParseStopsStyle, data);
+    } else if (!strcmp(key, "style")) {
+        simpleXmlParseW3CAttribute(value, strlen(value), _attrParseStopsStyle, data);
     } else {
         return false;
     }
@@ -2704,9 +2820,9 @@ static constexpr struct
 
 static bool _attrParseLinearGradientNode(void* data, const char* key, const char* value)
 {
-    auto loader = (SvgLoaderData*)data;
-    auto grad = loader->svgParse->styleGrad;
-    auto linear = grad->linear;
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgStyleGradient* grad = loader->svgParse->styleGrad;
+    SvgLinearGradient* linear = grad->linear;
     int sz = strlen(key);
 
     for (unsigned int i = 0; i < sizeof(linear_tags) / sizeof(linear_tags[0]); i++) {
@@ -2717,18 +2833,19 @@ static bool _attrParseLinearGradientNode(void* data, const char* key, const char
         }
     }
 
-    if (STR_AS(key, "id")) {
-        _copyId(&grad->id, value);
-    } else if (STR_AS(key, "spreadMethod")) {
+    if (!strcmp(key, "id")) {
+        if (grad->id && value) free(grad->id);
+        grad->id = _copyId(value);
+    } else if (!strcmp(key, "spreadMethod")) {
         grad->spread = _parseSpreadValue(value);
         grad->flags = (grad->flags | SvgGradientFlags::SpreadMethod);
-    } else if (STR_AS(key, "href") || STR_AS(key, "xlink:href")) {
-        if (value) tvg::free(grad->ref);
+    } else if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) {
+        if (grad->ref && value) free(grad->ref);
         grad->ref = _idFromHref(value);
-    } else if (STR_AS(key, "gradientUnits")) {
-        if (STR_AS(value, "userSpaceOnUse")) grad->userSpace = true;
+    } else if (!strcmp(key, "gradientUnits")) {
+        if (!strcmp(value, "userSpaceOnUse")) grad->userSpace = true;
         grad->flags = (grad->flags | SvgGradientFlags::GradientUnits);
-    } else if (STR_AS(key, "gradientTransform")) {
+    } else if (!strcmp(key, "gradientTransform")) {
         grad->transform = _parseTransformationMatrix(value);
     } else {
         return false;
@@ -2740,18 +2857,25 @@ static bool _attrParseLinearGradientNode(void* data, const char* key, const char
 
 static SvgStyleGradient* _createLinearGradient(SvgLoaderData* loader, const char* buf, unsigned bufLength)
 {
-    auto grad = tvg::calloc<SvgStyleGradient>(1, sizeof(SvgStyleGradient));
+    auto grad = (SvgStyleGradient*)(calloc(1, sizeof(SvgStyleGradient)));
     loader->svgParse->styleGrad = grad;
 
     grad->flags = SvgGradientFlags::None;
     grad->type = SvgGradientType::Linear;
-    grad->linear = tvg::calloc<SvgLinearGradient>(1, sizeof(SvgLinearGradient));
-
-    // default value of x2 is 100% - transformed to the global percentage
+    grad->userSpace = false;
+    grad->linear = (SvgLinearGradient*)calloc(1, sizeof(SvgLinearGradient));
+    if (!grad->linear) {
+        grad->clear();
+        free(grad);
+        return nullptr;
+    }
+    /**
+    * Default value of x2 is 100% - transformed to the global percentage
+    */
     grad->linear->x2 = 1.0f;
     grad->linear->isX2Percentage = true;
 
-    xmlParseAttributes(buf, bufLength, _attrParseLinearGradientNode, loader);
+    simpleXmlParseAttributes(buf, bufLength, _attrParseLinearGradientNode, loader);
 
     for (unsigned int i = 0; i < sizeof(linear_tags) / sizeof(linear_tags[0]); i++) {
         linear_tags[i].tagRecalc(loader, grad->linear, grad->userSpace);
@@ -2798,8 +2922,8 @@ static GradientFactoryMethod _findGradientFactory(const char* name)
 
 static void _cloneGradStops(Array<Fill::ColorStop>& dst, const Array<Fill::ColorStop>& src)
 {
-    ARRAY_FOREACH(p, src) {
-        dst.push(*p);
+    for (uint32_t i = 0; i < src.count; ++i) {
+        dst.push(src[i]);
     }
 }
 
@@ -2819,8 +2943,8 @@ static void _inheritGradient(SvgLoaderData* loader, SvgStyleGradient* to, SvgSty
     }
 
     if (!to->transform && from->transform) {
-        to->transform = tvg::malloc<Matrix>(sizeof(Matrix));
-        *to->transform = *from->transform;
+        to->transform = (Matrix*)malloc(sizeof(Matrix));
+        if (to->transform) memcpy(to->transform, from->transform, sizeof(Matrix));
     }
 
     if (to->type == SvgGradientType::Linear) {
@@ -2851,15 +2975,15 @@ static void _inheritGradient(SvgLoaderData* loader, SvgStyleGradient* to, SvgSty
             if (!gradUnitSet && coordSet) {
                 radialTags[i].tagRecalc(loader, to->radial, to->userSpace);
                 //If fx and fy are not set, set cx and cy.
-                if (STR_AS(radialTags[i].tag, "cx") && !(to->flags & SvgGradientFlags::Fx)) to->radial->fx = to->radial->cx;
-                if (STR_AS(radialTags[i].tag, "cy") && !(to->flags & SvgGradientFlags::Fy)) to->radial->fy = to->radial->cy;
+                if (!strcmp(radialTags[i].tag, "cx") && !(to->flags & SvgGradientFlags::Fx)) to->radial->fx = to->radial->cx;
+                if (!strcmp(radialTags[i].tag, "cy") && !(to->flags & SvgGradientFlags::Fy)) to->radial->fy = to->radial->cy;
             }
             //GradUnits set, coord not set directly
             if (to->userSpace == from->userSpace) continue;
             if (gradUnitSet && !coordSet) {
                 //If fx and fx are not set, do not call recalc.
-                if (STR_AS(radialTags[i].tag, "fx") && !(to->flags & SvgGradientFlags::Fx)) continue;
-                if (STR_AS(radialTags[i].tag, "fy") && !(to->flags & SvgGradientFlags::Fy)) continue;
+                if (!strcmp(radialTags[i].tag, "fx") && !(to->flags & SvgGradientFlags::Fx)) continue;
+                if (!strcmp(radialTags[i].tag, "fy") && !(to->flags & SvgGradientFlags::Fy)) continue;
                 radialTags[i].tagInheritedRecalc(loader, to->radial, to->userSpace);
             }
         }
@@ -2873,126 +2997,183 @@ static SvgStyleGradient* _cloneGradient(SvgStyleGradient* from)
 {
     if (!from) return nullptr;
 
-    auto grad = tvg::calloc<SvgStyleGradient>(1, sizeof(SvgStyleGradient));
+    auto grad = (SvgStyleGradient*)(calloc(1, sizeof(SvgStyleGradient)));
+    if (!grad) return nullptr;
+
     grad->type = from->type;
-    _copyId(&grad->id, from->id);
-    _copyId(&grad->ref, from->ref);
+    grad->id = from->id ? _copyId(from->id) : nullptr;
+    grad->ref = from->ref ? _copyId(from->ref) : nullptr;
     grad->spread = from->spread;
     grad->userSpace = from->userSpace;
     grad->flags = from->flags;
 
     if (from->transform) {
-        grad->transform = tvg::calloc<Matrix>(1, sizeof(Matrix));
-        *grad->transform = *from->transform;
+        grad->transform = (Matrix*)calloc(1, sizeof(Matrix));
+        if (grad->transform) memcpy(grad->transform, from->transform, sizeof(Matrix));
     }
 
     if (grad->type == SvgGradientType::Linear) {
-        grad->linear = tvg::calloc<SvgLinearGradient>(1, sizeof(SvgLinearGradient));
+        grad->linear = (SvgLinearGradient*)calloc(1, sizeof(SvgLinearGradient));
+        if (!grad->linear) goto error_grad_alloc;
         memcpy(grad->linear, from->linear, sizeof(SvgLinearGradient));
     } else if (grad->type == SvgGradientType::Radial) {
-        grad->radial = tvg::calloc<SvgRadialGradient>(1, sizeof(SvgRadialGradient));
+        grad->radial = (SvgRadialGradient*)calloc(1, sizeof(SvgRadialGradient));
+        if (!grad->radial) goto error_grad_alloc;
         memcpy(grad->radial, from->radial, sizeof(SvgRadialGradient));
     }
 
     _cloneGradStops(grad->stops, from->stops);
 
     return grad;
+
+    error_grad_alloc:
+    if (grad) {
+        grad->clear();
+        free(grad);
+    }
+    return nullptr;
 }
 
 
 static void _styleInherit(SvgStyleProperty* child, const SvgStyleProperty* parent)
 {
-    if (!parent) return;
-
+    if (parent == nullptr) return;
     //Inherit the property of parent if not present in child.
     if (!child->curColorSet) {
         child->color = parent->color;
         child->curColorSet = parent->curColorSet;
     }
-    if (!(child->flags & SvgStyleFlags::PaintOrder)) child->paintOrder = parent->paintOrder;
-
+    if (!(child->flags & SvgStyleFlags::PaintOrder)) {
+        child->paintOrder = parent->paintOrder;
+    }
     //Fill
     if (!(child->fill.flags & SvgFillFlags::Paint)) {
         child->fill.paint.color = parent->fill.paint.color;
         child->fill.paint.none = parent->fill.paint.none;
         child->fill.paint.curColor = parent->fill.paint.curColor;
-        if (parent->fill.paint.url) _copyId(&child->fill.paint.url, parent->fill.paint.url);
+        if (parent->fill.paint.url) {
+            if (child->fill.paint.url) free(child->fill.paint.url);
+            child->fill.paint.url = _copyId(parent->fill.paint.url);
+        }
+    }
+    if (!(child->fill.flags & SvgFillFlags::Opacity)) {
+        child->fill.opacity = parent->fill.opacity;
+    }
+    if (!(child->fill.flags & SvgFillFlags::FillRule)) {
+        child->fill.fillRule = parent->fill.fillRule;
     }
-    if (!(child->fill.flags & SvgFillFlags::Opacity)) child->fill.opacity = parent->fill.opacity;
-    if (!(child->fill.flags & SvgFillFlags::FillRule)) child->fill.fillRule = parent->fill.fillRule;
-
     //Stroke
     if (!(child->stroke.flags & SvgStrokeFlags::Paint)) {
         child->stroke.paint.color = parent->stroke.paint.color;
         child->stroke.paint.none = parent->stroke.paint.none;
         child->stroke.paint.curColor = parent->stroke.paint.curColor;
-        if (parent->stroke.paint.url) _copyId(&child->stroke.paint.url, parent->stroke.paint.url);
+        if (parent->stroke.paint.url) {
+            if (child->stroke.paint.url) free(child->stroke.paint.url);
+            child->stroke.paint.url = _copyId(parent->stroke.paint.url);
+        }
+    }
+    if (!(child->stroke.flags & SvgStrokeFlags::Opacity)) {
+        child->stroke.opacity = parent->stroke.opacity;
+    }
+    if (!(child->stroke.flags & SvgStrokeFlags::Width)) {
+        child->stroke.width = parent->stroke.width;
     }
-    if (!(child->stroke.flags & SvgStrokeFlags::Opacity)) child->stroke.opacity = parent->stroke.opacity;
-    if (!(child->stroke.flags & SvgStrokeFlags::Width)) child->stroke.width = parent->stroke.width;
     if (!(child->stroke.flags & SvgStrokeFlags::Dash)) {
         if (parent->stroke.dash.array.count > 0) {
             child->stroke.dash.array.clear();
             child->stroke.dash.array.reserve(parent->stroke.dash.array.count);
-            ARRAY_FOREACH(p, parent->stroke.dash.array) {
-                child->stroke.dash.array.push(*p);
+            for (uint32_t i = 0; i < parent->stroke.dash.array.count; ++i) {
+                child->stroke.dash.array.push(parent->stroke.dash.array[i]);
             }
         }
     }
-    if (!(child->stroke.flags & SvgStrokeFlags::DashOffset)) child->stroke.dash.offset = parent->stroke.dash.offset;
-    if (!(child->stroke.flags & SvgStrokeFlags::Cap)) child->stroke.cap = parent->stroke.cap;
-    if (!(child->stroke.flags & SvgStrokeFlags::Join)) child->stroke.join = parent->stroke.join;
-    if (!(child->stroke.flags & SvgStrokeFlags::Miterlimit)) child->stroke.miterlimit = parent->stroke.miterlimit;
+    if (!(child->stroke.flags & SvgStrokeFlags::DashOffset)) {
+        child->stroke.dash.offset = parent->stroke.dash.offset;
+    }
+    if (!(child->stroke.flags & SvgStrokeFlags::Cap)) {
+        child->stroke.cap = parent->stroke.cap;
+    }
+    if (!(child->stroke.flags & SvgStrokeFlags::Join)) {
+        child->stroke.join = parent->stroke.join;
+    }
+    if (!(child->stroke.flags & SvgStrokeFlags::Miterlimit)) {
+        child->stroke.miterlimit = parent->stroke.miterlimit;
+    }
 }
 
 
 static void _styleCopy(SvgStyleProperty* to, const SvgStyleProperty* from)
 {
-    if (!from) return;
-
+    if (from == nullptr) return;
     //Copy the properties of 'from' only if they were explicitly set (not the default ones).
     if (from->curColorSet) {
         to->color = from->color;
         to->curColorSet = true;
     }
-    if (from->flags & SvgStyleFlags::Opacity) to->opacity = from->opacity;
-    if (from->flags & SvgStyleFlags::PaintOrder) to->paintOrder = from->paintOrder;
-    if (from->flags & SvgStyleFlags::Display) to->display = from->display;
-
+    if (from->flags & SvgStyleFlags::Opacity) {
+        to->opacity = from->opacity;
+    }
+    if (from->flags & SvgStyleFlags::PaintOrder) {
+        to->paintOrder = from->paintOrder;
+    }
+    if (from->flags & SvgStyleFlags::Display) {
+        to->display = from->display;
+    }
     //Fill
     to->fill.flags = (to->fill.flags | from->fill.flags);
     if (from->fill.flags & SvgFillFlags::Paint) {
         to->fill.paint.color = from->fill.paint.color;
         to->fill.paint.none = from->fill.paint.none;
         to->fill.paint.curColor = from->fill.paint.curColor;
-        if (from->fill.paint.url) _copyId(&to->fill.paint.url, from->fill.paint.url);
+        if (from->fill.paint.url) {
+            if (to->fill.paint.url) free(to->fill.paint.url);
+            to->fill.paint.url = _copyId(from->fill.paint.url);
+        }
+    }
+    if (from->fill.flags & SvgFillFlags::Opacity) {
+        to->fill.opacity = from->fill.opacity;
+    }
+    if (from->fill.flags & SvgFillFlags::FillRule) {
+        to->fill.fillRule = from->fill.fillRule;
     }
-    if (from->fill.flags & SvgFillFlags::Opacity) to->fill.opacity = from->fill.opacity;
-    if (from->fill.flags & SvgFillFlags::FillRule) to->fill.fillRule = from->fill.fillRule;
-
     //Stroke
     to->stroke.flags = (to->stroke.flags | from->stroke.flags);
     if (from->stroke.flags & SvgStrokeFlags::Paint) {
         to->stroke.paint.color = from->stroke.paint.color;
         to->stroke.paint.none = from->stroke.paint.none;
         to->stroke.paint.curColor = from->stroke.paint.curColor;
-        if (from->stroke.paint.url) _copyId(&to->stroke.paint.url, from->stroke.paint.url);
+        if (from->stroke.paint.url) {
+            if (to->stroke.paint.url) free(to->stroke.paint.url);
+            to->stroke.paint.url = _copyId(from->stroke.paint.url);
+        }
+    }
+    if (from->stroke.flags & SvgStrokeFlags::Opacity) {
+        to->stroke.opacity = from->stroke.opacity;
+    }
+    if (from->stroke.flags & SvgStrokeFlags::Width) {
+        to->stroke.width = from->stroke.width;
     }
-    if (from->stroke.flags & SvgStrokeFlags::Opacity) to->stroke.opacity = from->stroke.opacity;
-    if (from->stroke.flags & SvgStrokeFlags::Width) to->stroke.width = from->stroke.width;
     if (from->stroke.flags & SvgStrokeFlags::Dash) {
         if (from->stroke.dash.array.count > 0) {
             to->stroke.dash.array.clear();
             to->stroke.dash.array.reserve(from->stroke.dash.array.count);
-            ARRAY_FOREACH(p, from->stroke.dash.array) {
-                to->stroke.dash.array.push(*p);
+            for (uint32_t i = 0; i < from->stroke.dash.array.count; ++i) {
+                to->stroke.dash.array.push(from->stroke.dash.array[i]);
             }
         }
     }
-    if (from->stroke.flags & SvgStrokeFlags::DashOffset) to->stroke.dash.offset = from->stroke.dash.offset;
-    if (from->stroke.flags & SvgStrokeFlags::Cap) to->stroke.cap = from->stroke.cap;
-    if (from->stroke.flags & SvgStrokeFlags::Join) to->stroke.join = from->stroke.join;
-    if (from->stroke.flags & SvgStrokeFlags::Miterlimit) to->stroke.miterlimit = from->stroke.miterlimit;
+    if (from->stroke.flags & SvgStrokeFlags::DashOffset) {
+        to->stroke.dash.offset = from->stroke.dash.offset;
+    }
+    if (from->stroke.flags & SvgStrokeFlags::Cap) {
+        to->stroke.cap = from->stroke.cap;
+    }
+    if (from->stroke.flags & SvgStrokeFlags::Join) {
+        to->stroke.join = from->stroke.join;
+    }
+    if (from->stroke.flags & SvgStrokeFlags::Miterlimit) {
+        to->stroke.miterlimit = from->stroke.miterlimit;
+    }
 }
 
 
@@ -3000,36 +3181,59 @@ static void _copyAttr(SvgNode* to, const SvgNode* from)
 {
     //Copy matrix attribute
     if (from->transform) {
-        to->transform = tvg::malloc<Matrix>(sizeof(Matrix));
-        *to->transform = *from->transform;
+        to->transform = (Matrix*)malloc(sizeof(Matrix));
+        if (to->transform) *to->transform = *from->transform;
     }
     //Copy style attribute
     _styleCopy(to->style, from->style);
     to->style->flags = (to->style->flags | from->style->flags);
-    svgUtilReplace(&to->style->clipPath.url, from->style->clipPath.url);
-    svgUtilReplace(&to->style->mask.url, from->style->mask.url);
-    svgUtilReplace(&to->style->filter.url, from->style->filter.url);
+    if (from->style->clipPath.url) {
+        if (to->style->clipPath.url) free(to->style->clipPath.url);
+        to->style->clipPath.url = strdup(from->style->clipPath.url);
+    }
+    if (from->style->mask.url) {
+        if (to->style->mask.url) free(to->style->mask.url);
+        to->style->mask.url = strdup(from->style->mask.url);
+    }
 
     //Copy node attribute
     switch (from->type) {
         case SvgNodeType::Circle: {
-            to->node.circle = from->node.circle;
+            to->node.circle.cx = from->node.circle.cx;
+            to->node.circle.cy = from->node.circle.cy;
+            to->node.circle.r = from->node.circle.r;
             break;
         }
         case SvgNodeType::Ellipse: {
-            to->node.ellipse = from->node.ellipse;
+            to->node.ellipse.cx = from->node.ellipse.cx;
+            to->node.ellipse.cy = from->node.ellipse.cy;
+            to->node.ellipse.rx = from->node.ellipse.rx;
+            to->node.ellipse.ry = from->node.ellipse.ry;
             break;
         }
         case SvgNodeType::Rect: {
-            to->node.rect = from->node.rect;
+            to->node.rect.x = from->node.rect.x;
+            to->node.rect.y = from->node.rect.y;
+            to->node.rect.w = from->node.rect.w;
+            to->node.rect.h = from->node.rect.h;
+            to->node.rect.rx = from->node.rect.rx;
+            to->node.rect.ry = from->node.rect.ry;
+            to->node.rect.hasRx = from->node.rect.hasRx;
+            to->node.rect.hasRy = from->node.rect.hasRy;
             break;
         }
         case SvgNodeType::Line: {
-            to->node.line = from->node.line;
+            to->node.line.x1 = from->node.line.x1;
+            to->node.line.y1 = from->node.line.y1;
+            to->node.line.x2 = from->node.line.x2;
+            to->node.line.y2 = from->node.line.y2;
             break;
         }
         case SvgNodeType::Path: {
-            svgUtilReplace(&to->node.path.path, from->node.path.path);
+            if (from->node.path.path) {
+                if (to->node.path.path) free(to->node.path.path);
+                to->node.path.path = strdup(from->node.path.path);
+            }
             break;
         }
         case SvgNodeType::Polygon: {
@@ -3049,19 +3253,34 @@ static void _copyAttr(SvgNode* to, const SvgNode* from)
             to->node.image.y = from->node.image.y;
             to->node.image.w = from->node.image.w;
             to->node.image.h = from->node.image.h;
-            svgUtilReplace(&to->node.image.href, from->node.image.href);
+            if (from->node.image.href) {
+                if (to->node.image.href) free(to->node.image.href);
+                to->node.image.href = strdup(from->node.image.href);
+            }
             break;
         }
         case SvgNodeType::Use: {
-            to->node.use = from->node.use;
+            to->node.use.x = from->node.use.x;
+            to->node.use.y = from->node.use.y;
+            to->node.use.w = from->node.use.w;
+            to->node.use.h = from->node.use.h;
+            to->node.use.isWidthSet = from->node.use.isWidthSet;
+            to->node.use.isHeightSet = from->node.use.isHeightSet;
+            to->node.use.symbol = from->node.use.symbol;
             break;
         }
         case SvgNodeType::Text: {
             to->node.text.x = from->node.text.x;
             to->node.text.y = from->node.text.y;
             to->node.text.fontSize = from->node.text.fontSize;
-            svgUtilReplace(&to->node.text.text, from->node.text.text);
-            svgUtilReplace(&to->node.text.fontFamily, from->node.text.fontFamily);
+            if (from->node.text.text) {
+                if (to->node.text.text) free(to->node.text.text);
+                to->node.text.text = strdup(from->node.text.text);
+            }
+            if (from->node.text.fontFamily) {
+                if (to->node.text.fontFamily) free(to->node.text.fontFamily);
+                to->node.text.fontFamily = strdup(from->node.text.fontFamily);
+            }
             break;
         }
         default: {
@@ -3089,8 +3308,9 @@ static void _cloneNode(SvgNode* from, SvgNode* parent, int depth)
     _styleInherit(newNode->style, parent->style);
     _copyAttr(newNode, from);
 
-    ARRAY_FOREACH(p, from->child) {
-        _cloneNode(*p, newNode, depth + 1);
+    auto child = from->child.data;
+    for (uint32_t i = 0; i < from->child.count; ++i, ++child) {
+        _cloneNode(*child, newNode, depth + 1);
     }
 }
 
@@ -3105,7 +3325,7 @@ static void _clonePostponedNodes(Inlist<SvgNodeIdPair>* cloneNodes, SvgNode* doc
             auto nodeFrom = _findNodeById(_getDefsNode(nodeIdPair->node), nodeIdPair->id);
             if (!nodeFrom) nodeFrom = _findNodeById(doc, nodeIdPair->id);
             if (nodeFrom) {
-                INLIST_FOREACH((*cloneNodes), pair) {
+                for (auto pair = cloneNodes->head; pair; pair = pair->next) {
                     if (_checkPostponed(nodeFrom, pair->node, 1)) {
                         postpone = true;
                         cloneNodes->back(nodeIdPair);
@@ -3119,13 +3339,13 @@ static void _clonePostponedNodes(Inlist<SvgNodeIdPair>* cloneNodes, SvgNode* doc
                 if (nodeFrom && nodeFrom->type == SvgNodeType::Symbol && nodeIdPair->node->type == SvgNodeType::Use) {
                     nodeIdPair->node->node.use.symbol = nodeFrom;
                 }
-                tvg::free(nodeIdPair->id);
-                tvg::free(nodeIdPair);
+                free(nodeIdPair->id);
+                free(nodeIdPair);
             }
         } else {
             TVGLOG("SVG", "%s is ancestor element. This reference is invalid.", nodeIdPair->id);
-            tvg::free(nodeIdPair->id);
-            tvg::free(nodeIdPair);
+            free(nodeIdPair->id);
+            free(nodeIdPair);
         }
         nodeIdPair = cloneNodes->front();
     }
@@ -3138,7 +3358,7 @@ static void _svgLoaderParserXmlClose(SvgLoaderData* loader, const char* content,
     int sz = length;
     char tagName[20] = "";
 
-    content = svgUtilSkipWhiteSpace(content, nullptr);
+    content = _skipSpace(content, nullptr);
     itr = content;
     while ((itr != nullptr) && *itr != '>') itr++;
 
@@ -3188,7 +3408,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
     GradientFactoryMethod gradientMethod;
     SvgNode *node = nullptr, *parent = nullptr;
     loader->level++;
-    attrs = xmlFindAttributesTag(content, length);
+    attrs = simpleXmlFindAttributesTag(content, length);
 
     if (!attrs) {
         //Parse the empty tag
@@ -3211,24 +3431,24 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
         //Group
         if (empty) return;
         if (!loader->doc) {
-            if (!STR_AS(tagName, "svg")) return; //Not a valid svg document
-            node = method(loader, nullptr, attrs, attrsLength, xmlParseAttributes);
+            if (strcmp(tagName, "svg")) return; //Not a valid svg document
+            node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes);
             loader->doc = node;
         } else {
-            if (STR_AS(tagName, "svg")) return; //Already loaded <svg>(SvgNodeType::Doc) tag
+            if (!strcmp(tagName, "svg")) return; //Already loaded <svg>(SvgNodeType::Doc) tag
             if (loader->stack.count > 0) parent = loader->stack.last();
             else parent = loader->doc;
-            if (STR_AS(tagName, "style")) {
+            if (!strcmp(tagName, "style")) {
                 // TODO: For now only the first style node is saved. After the css id selector
                 // is introduced this if condition shouldn't be necessary any more
                 if (!loader->cssStyle) {
-                    node = method(loader, nullptr, attrs, attrsLength, xmlParseAttributes);
+                    node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes);
                     loader->cssStyle = node;
                     loader->doc->node.doc.style = node;
                     loader->openedTag = OpenedTagType::Style;
                 }
             } else {
-                node = method(loader, parent, attrs, attrsLength, xmlParseAttributes);
+                node = method(loader, parent, attrs, attrsLength, simpleXmlParseAttributes);
             }
         }
 
@@ -3239,9 +3459,9 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
     } else if ((method = _findGraphicsFactory(tagName))) {
         if (loader->stack.count > 0) parent = loader->stack.last();
         else parent = loader->doc;
-        node = method(loader, parent, attrs, attrsLength, xmlParseAttributes);
+        node = method(loader, parent, attrs, attrsLength, simpleXmlParseAttributes);
         if (node && !empty) {
-            if (STR_AS(tagName, "text")) loader->openedTag = OpenedTagType::Text;
+            if (!strcmp(tagName, "text")) loader->openedTag = OpenedTagType::Text;
             auto defs = _createDefsNode(loader, nullptr, nullptr, 0, nullptr);
             loader->stack.push(defs);
             loader->currentGraphicsNode = node;
@@ -3264,7 +3484,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
             }
         }
         if (!empty) loader->gradientStack.push(gradient);
-    } else if (STR_AS(tagName, "stop")) {
+    } else if (!strcmp(tagName, "stop")) {
         if (loader->gradientStack.count == 0) {
             TVGLOG("SVG", "Stop element is used outside of the Gradient element");
             return;
@@ -3272,7 +3492,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
         /* default value for opacity */
         loader->svgParse->gradStop = {0.0f, 0, 0, 0, 255};
         loader->svgParse->flags = SvgStopStyleFlags::StopDefault;
-        xmlParseAttributes(attrs, attrsLength, _attrParseStops, loader);
+        simpleXmlParseAttributes(attrs, attrsLength, _attrParseStops, loader);
         loader->gradientStack.last()->stops.push(loader->svgParse->gradStop);
     } else {
         if (!isIgnoreUnsupportedLogElements(tagName)) TVGLOG("SVG", "Unsupported elements used [Elements: %s]", tagName);
@@ -3282,177 +3502,8 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
 
 static void _svgLoaderParserText(SvgLoaderData* loader, const char* content, unsigned int length)
 {
-    auto& text = loader->svgParse->node->node.text;
-    text.text = append(text.text, content, length);
-}
-
-
-static char* _parseName(char* str, const char* delims, char** saveptr)
-{
-    auto pch = strtok_r(str, delims, saveptr);
-
-    while (pch) {
-        while (*pch && isspace(*pch)) pch++;
-
-        if (*pch == '\0') {
-            pch = strtok_r(nullptr, delims, saveptr);
-            continue;
-        }
-
-        auto end = pch + strlen(pch) - 1;
-        while (end > pch && isspace(*end)) *end-- = '\0';
-
-        if (*pch == '\0') {
-            pch = strtok_r(nullptr, delims, saveptr);
-            continue;
-        }
-        break;
-    }
-    return pch;
-}
-
-
-
-static void _free(SvgStyleProperty* style)
-{
-    if (!style) return;
-
-    //style->clipPath.node/mask.node/filter.node has only the addresses of node. Therefore, node is released from _freeNode.
-    tvg::free(style->clipPath.url);
-    tvg::free(style->mask.url);
-    tvg::free(style->filter.url);
-    tvg::free(style->cssClass);
-
-    if (style->fill.paint.gradient) {
-        style->fill.paint.gradient->clear();
-        tvg::free(style->fill.paint.gradient);
-    }
-    if (style->stroke.paint.gradient) {
-        style->stroke.paint.gradient->clear();
-        tvg::free(style->stroke.paint.gradient);
-    }
-    tvg::free(style->fill.paint.url);
-    tvg::free(style->stroke.paint.url);
-    style->stroke.dash.array.reset();
-    tvg::free(style);
-}
-
-
-static void _free(SvgNode* node)
-{
-    if (!node) return;
-
-    ARRAY_FOREACH(p, node->child) _free(*p);
-    node->child.reset();
-
-    tvg::free(node->id);
-    tvg::free(node->transform);
-    _free(node->style);
-    switch (node->type) {
-         case SvgNodeType::Path: {
-             tvg::free(node->node.path.path);
-             break;
-         }
-         case SvgNodeType::Polygon: {
-             tvg::free(node->node.polygon.pts.data);
-             break;
-         }
-         case SvgNodeType::Polyline: {
-             tvg::free(node->node.polyline.pts.data);
-             break;
-         }
-         case SvgNodeType::Doc: {
-             _free(node->node.doc.defs);
-             _free(node->node.doc.style);
-             break;
-         }
-         case SvgNodeType::Defs: {
-            ARRAY_FOREACH(p, node->node.defs.gradients) {
-                 (*p)->clear();
-                 tvg::free(*p);
-             }
-             node->node.defs.gradients.reset();
-             break;
-         }
-         case SvgNodeType::Image: {
-             tvg::free(node->node.image.href);
-             break;
-         }
-         case SvgNodeType::Text: {
-             tvg::free(node->node.text.text);
-             tvg::free(node->node.text.fontFamily);
-             break;
-         }
-         default: {
-             break;
-         }
-    }
-    tvg::free(node);
-}
-
-
-static bool _cssApplyClass(SvgNode* node, const char* classString, SvgNode* styleRoot)
-{
-    if (!classString || !styleRoot) return false;
-
-    auto classes = duplicate(classString);
-    bool allFound = true;
-
-    auto tempNode = tvg::calloc<SvgNode>(1, sizeof(SvgNode));
-    tempNode->style = tvg::calloc<SvgStyleProperty>(1, sizeof(SvgStyleProperty));
-    tempNode->type = node->type;
-    tempNode->style->opacity = 255;
-    tempNode->style->fill.opacity = 255;
-    tempNode->style->stroke.opacity = 255;
-
-    char* tokPtr = nullptr;
-    auto name = _parseName(classes, " ", &tokPtr);
-    tvg::Array<const char*> applyClasses;
-
-    while (name) {
-        auto isDuplicate = false;
-        ARRAY_FOREACH(p, applyClasses) {
-            if (STR_AS(*p, name)) {
-                isDuplicate = true;
-                break;
-            }
-        }
-        if (isDuplicate) {
-            name = _parseName(nullptr, " ", &tokPtr);
-            continue;
-        }
-        applyClasses.push(name);
-
-        auto found = false;
-        //css styling: tag.name has higher priority than .name
-        if (auto cssNode = cssFindStyleNode(styleRoot, name)) {
-            cssCopyStyleAttr(tempNode, cssNode, true);
-            found = true;
-        }
-        if (auto cssNode = cssFindStyleNode(styleRoot, name, node->type)) {
-            cssCopyStyleAttr(tempNode, cssNode, true);
-            found = true;
-        }
-        if (!found) allFound = false;
-        name = _parseName(nullptr, " ", &tokPtr);
-    }
-
-    tvg::free(classes);
-
-    //Apply the merged style to the node (without overwriting existing styles)
-    cssCopyStyleAttr(node, tempNode);
-    _free(tempNode);
-
-    return allFound;
-}
-
-
-static void _cssApplyStyleToPostponeds(Array<SvgNodeIdPair>& postponeds, SvgNode* style)
-{
-    ARRAY_FOREACH(p, postponeds) {
-        auto nodeIdPair = *p;
-        _cssApplyClass(nodeIdPair.node, nodeIdPair.id, style);
-    }
+    auto text = &loader->svgParse->node->node.text;
+    text->text = strAppend(text->text, content, length);
 }
 
 
@@ -3467,34 +3518,19 @@ static void _svgLoaderParserXmlCssStyle(SvgLoaderData* loader, const char* conte
     GradientFactoryMethod gradientMethod;
     SvgNode *node = nullptr;
 
-    while (auto next = xmlParseCSSAttribute(content, length, &tag, &name, &attrs, &attrsLength)) {
+    while (auto next = simpleXmlParseCSSAttribute(content, length, &tag, &name, &attrs, &attrsLength)) {
         if ((method = _findGroupFactory(tag))) {
-            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, xmlParseW3CAttribute))) _copyId(&node->id, name);
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
         } else if ((method = _findGraphicsFactory(tag))) {
-            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, xmlParseW3CAttribute))) _copyId(&node->id, name);
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
         } else if ((gradientMethod = _findGradientFactory(tag))) {
             TVGLOG("SVG", "Unsupported elements used in the internal CSS style sheets [Elements: %s]", tag);
-        } else if (STR_AS(tag, "stop")) {
+        } else if (!strcmp(tag, "stop")) {
             TVGLOG("SVG", "Unsupported elements used in the internal CSS style sheets [Elements: %s]", tag);
-        } else if (STR_AS(tag, "all")) {
-            char* tokPtr = nullptr;
-            auto id = _parseName(name, ",", &tokPtr);
-
-            while (id) {
-                if (*id == '.') id++;
-
-                if (auto cssNode = cssFindStyleNode(loader->cssStyle, id)) {
-                    auto oldNode = loader->svgParse->node;
-                    loader->svgParse->node = cssNode;
-                    xmlParseW3CAttribute(attrs, attrsLength, _attrParseCssStyleNode, loader);
-                    loader->svgParse->node = oldNode;
-                } else {
-                    if ((node = _createCssStyleNode(loader, loader->cssStyle, attrs, attrsLength, xmlParseW3CAttribute))) _copyId(&node->id, id);
-                }
-                id = _parseName(nullptr, ",", &tokPtr);
-            }
-        } else if (STR_AS(tag, "@font-face")) { //css at-rule specifying font
-            _createFontFace(loader, attrs, attrsLength, xmlParseW3CAttribute);
+        } else if (!strcmp(tag, "all")) {
+            if ((node = _createCssStyleNode(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
+        } else if (!strcmp(tag, "@font-face")) { //css at-rule specifying font
+            _createFontFace(loader, attrs, attrsLength, simpleXmlParseW3CAttribute);
         } else if (!isIgnoreUnsupportedLogElements(tag)) {
             TVGLOG("SVG", "Unsupported elements used in the internal CSS style sheets [Elements: %s]", tag);
         }
@@ -3502,42 +3538,42 @@ static void _svgLoaderParserXmlCssStyle(SvgLoaderData* loader, const char* conte
         length -= next - content;
         content = next;
 
-        tvg::free(tag);
-        tvg::free(name);
+        free(tag);
+        free(name);
     }
     loader->openedTag = OpenedTagType::Other;
 }
 
 
-static bool _svgLoaderParser(void* data, XMLType type, const char* content, unsigned int length)
+static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content, unsigned int length)
 {
     SvgLoaderData* loader = (SvgLoaderData*)data;
 
     switch (type) {
-        case XMLType::Open: {
+        case SimpleXMLType::Open: {
             _svgLoaderParserXmlOpen(loader, content, length, false);
             break;
         }
-        case XMLType::OpenEmpty: {
+        case SimpleXMLType::OpenEmpty: {
             _svgLoaderParserXmlOpen(loader, content, length, true);
             break;
         }
-        case XMLType::Close: {
+        case SimpleXMLType::Close: {
             _svgLoaderParserXmlClose(loader, content, length);
             break;
         }
-        case XMLType::Data:
-        case XMLType::CData: {
+        case SimpleXMLType::Data:
+        case SimpleXMLType::CData: {
             if (loader->openedTag == OpenedTagType::Style) _svgLoaderParserXmlCssStyle(loader, content, length);
             else if (loader->openedTag == OpenedTagType::Text) _svgLoaderParserText(loader, content, length);
             break;
         }
-        case XMLType::DoctypeChild: {
+        case SimpleXMLType::DoctypeChild: {
             break;
         }
-        case XMLType::Ignored:
-        case XMLType::Comment:
-        case XMLType::Doctype: {
+        case SimpleXMLType::Ignored:
+        case SimpleXMLType::Comment:
+        case SimpleXMLType::Doctype: {
             break;
         }
         default: {
@@ -3549,58 +3585,112 @@ static bool _svgLoaderParser(void* data, XMLType type, const char* content, unsi
 }
 
 
+static void _inefficientNodeCheck(TVG_UNUSED SvgNode* node)
+{
+#ifdef THORVG_LOG_ENABLED
+    auto type = simpleXmlNodeTypeToString(node->type);
+
+    if (!node->style->display && node->type != SvgNodeType::ClipPath) TVGLOG("SVG", "Inefficient elements used [Display is none][Node Type : %s]", type);
+    if (node->style->opacity == 0) TVGLOG("SVG", "Inefficient elements used [Opacity is zero][Node Type : %s]", type);
+    if (node->style->fill.opacity == 0 && node->style->stroke.opacity == 0) TVGLOG("SVG", "Inefficient elements used [Fill opacity and stroke opacity are zero][Node Type : %s]", type);
+
+    switch (node->type) {
+        case SvgNodeType::Path: {
+            if (!node->node.path.path) TVGLOG("SVG", "Inefficient elements used [Empty path][Node Type : %s]", type);
+            break;
+        }
+        case SvgNodeType::Ellipse: {
+            if (node->node.ellipse.rx == 0 && node->node.ellipse.ry == 0) TVGLOG("SVG", "Inefficient elements used [Size is zero][Node Type : %s]", type);
+            break;
+        }
+        case SvgNodeType::Polygon:
+        case SvgNodeType::Polyline: {
+            if (node->node.polygon.pts.count < 2) TVGLOG("SVG", "Inefficient elements used [Invalid Polygon][Node Type : %s]", type);
+            break;
+        }
+        case SvgNodeType::Circle: {
+            if (node->node.circle.r == 0) TVGLOG("SVG", "Inefficient elements used [Size is zero][Node Type : %s]", type);
+            break;
+        }
+        case SvgNodeType::Rect: {
+            if (node->node.rect.w == 0 && node->node.rect.h) TVGLOG("SVG", "Inefficient elements used [Size is zero][Node Type : %s]", type);
+            break;
+        }
+        case SvgNodeType::Line: {
+            if (node->node.line.x1 == node->node.line.x2 && node->node.line.y1 == node->node.line.y2) TVGLOG("SVG", "Inefficient elements used [Size is zero][Node Type : %s]", type);
+            break;
+        }
+        default: break;
+    }
+#endif
+}
+
+
 static void _updateStyle(SvgNode* node, SvgStyleProperty* parentStyle)
 {
     _styleInherit(node->style, parentStyle);
-    ARRAY_FOREACH(p, node->child) {
-        _updateStyle(*p, node->style);
+    _inefficientNodeCheck(node);
+
+    auto child = node->child.data;
+    for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+        _updateStyle(*child, node->style);
     }
 }
 
 
+static SvgStyleGradient* _gradientDup(SvgLoaderData* loader, Array<SvgStyleGradient*>* gradients, const char* id)
+{
+    SvgStyleGradient* result = nullptr;
+
+    auto gradList = gradients->data;
+
+    for (uint32_t i = 0; i < gradients->count; ++i) {
+        if ((*gradList)->id && !strcmp((*gradList)->id, id)) {
+            result = _cloneGradient(*gradList);
+            break;
+        }
+        ++gradList;
+    }
+
+    if (result && result->ref) {
+        gradList = gradients->data;
+        for (uint32_t i = 0; i < gradients->count; ++i) {
+            if ((*gradList)->id && !strcmp((*gradList)->id, result->ref)) {
+                _inheritGradient(loader, result, *gradList);
+                break;
+            }
+            ++gradList;
+        }
+    }
+
+    return result;
+}
+
+
 static void _updateGradient(SvgLoaderData* loader, SvgNode* node, Array<SvgStyleGradient*>* gradients)
 {
-    auto duplicate = [&](SvgLoaderData* loader, Array<SvgStyleGradient*>* gradients, const char* id) -> SvgStyleGradient* {
-        SvgStyleGradient* result = nullptr;
-
-        ARRAY_FOREACH(p, *gradients) {
-            if ((*p)->id && STR_AS((*p)->id, id)) {
-                result = _cloneGradient(*p);
-                break;
-            }
-        }
-        if (result && result->ref) {
-            ARRAY_FOREACH(p, *gradients) {
-                if ((*p)->id && STR_AS((*p)->id, result->ref)) {
-                    _inheritGradient(loader, result, *p);
-                    break;
-                }
-            }
-        }
-        return result;
-    };
-
     if (node->child.count > 0) {
-        ARRAY_FOREACH(p, node->child) {
-            _updateGradient(loader, *p, gradients);
+        auto child = node->child.data;
+        for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+            _updateGradient(loader, *child, gradients);
         }
     } else {
         if (node->style->fill.paint.url) {
-            auto newGrad = duplicate(loader, gradients, node->style->fill.paint.url);
+            auto newGrad = _gradientDup(loader, gradients, node->style->fill.paint.url);
             if (newGrad) {
                 if (node->style->fill.paint.gradient) {
                     node->style->fill.paint.gradient->clear();
-                    tvg::free(node->style->fill.paint.gradient);
+                    free(node->style->fill.paint.gradient);
                 }
                 node->style->fill.paint.gradient = newGrad;
             }
         }
         if (node->style->stroke.paint.url) {
-            auto newGrad = duplicate(loader, gradients, node->style->stroke.paint.url);
+            auto newGrad = _gradientDup(loader, gradients, node->style->stroke.paint.url);
             if (newGrad) {
                 if (node->style->stroke.paint.gradient) {
                     node->style->stroke.paint.gradient->clear();
-                    tvg::free(node->style->stroke.paint.gradient);
+                    free(node->style->stroke.paint.gradient);
                 }
                 node->style->stroke.paint.gradient = newGrad;
             }
@@ -3620,21 +3710,93 @@ static void _updateComposite(SvgNode* node, SvgNode* root)
         if (findResult) node->style->mask.node = findResult;
     }
     if (node->child.count > 0) {
-        ARRAY_FOREACH(p, node->child) {
-            _updateComposite(*p, root);
+        auto child = node->child.data;
+        for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+            _updateComposite(*child, root);
         }
     }
 }
 
 
-static void _updateFilter(SvgNode* node, SvgNode* root)
+static void _freeNodeStyle(SvgStyleProperty* style)
 {
-    if (node->style->filter.url && !node->style->filter.node) {
-        node->style->filter.node = _findNodeById(root, node->style->filter.url);
+    if (!style) return;
+
+    //style->clipPath.node and style->mask.node has only the addresses of node. Therefore, node is released from _freeNode.
+    free(style->clipPath.url);
+    free(style->mask.url);
+    free(style->cssClass);
+
+    if (style->fill.paint.gradient) {
+        style->fill.paint.gradient->clear();
+        free(style->fill.paint.gradient);
     }
-    ARRAY_FOREACH(child, node->child) {
-        _updateFilter(*child, root);
+    if (style->stroke.paint.gradient) {
+        style->stroke.paint.gradient->clear();
+        free(style->stroke.paint.gradient);
     }
+    free(style->fill.paint.url);
+    free(style->stroke.paint.url);
+    style->stroke.dash.array.reset();
+    free(style);
+}
+
+
+static void _freeNode(SvgNode* node)
+{
+    if (!node) return;
+
+    auto child = node->child.data;
+    for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+        _freeNode(*child);
+    }
+    node->child.reset();
+
+    free(node->id);
+    free(node->transform);
+    _freeNodeStyle(node->style);
+    switch (node->type) {
+         case SvgNodeType::Path: {
+             free(node->node.path.path);
+             break;
+         }
+         case SvgNodeType::Polygon: {
+             free(node->node.polygon.pts.data);
+             break;
+         }
+         case SvgNodeType::Polyline: {
+             free(node->node.polyline.pts.data);
+             break;
+         }
+         case SvgNodeType::Doc: {
+             _freeNode(node->node.doc.defs);
+             _freeNode(node->node.doc.style);
+             break;
+         }
+         case SvgNodeType::Defs: {
+             auto gradients = node->node.defs.gradients.data;
+             for (size_t i = 0; i < node->node.defs.gradients.count; ++i) {
+                 (*gradients)->clear();
+                 free(*gradients);
+                 ++gradients;
+             }
+             node->node.defs.gradients.reset();
+             break;
+         }
+         case SvgNodeType::Image: {
+             free(node->node.image.href);
+             break;
+         }
+         case SvgNodeType::Text: {
+             free(node->node.text.text);
+             free(node->node.text.fontFamily);
+             break;
+         }
+         default: {
+             break;
+         }
+    }
+    free(node);
 }
 
 
@@ -3647,7 +3809,7 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch
     SvgNode *node = nullptr;
     int attrsLength = 0;
     loader->level++;
-    attrs = xmlFindAttributesTag(content, length);
+    attrs = simpleXmlFindAttributesTag(content, length);
 
     if (!attrs) {
         //Parse the empty tag
@@ -3657,7 +3819,7 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch
 
     if (attrs) {
         sz = attrs - content;
-        while ((sz > 0) && (isspace((unsigned char)content[sz - 1]))) sz--;
+        while ((sz > 0) && (isspace(content[sz - 1]))) sz--;
         if ((unsigned)sz >= sizeof(tagName)) return false;
         strncpy(tagName, content, sz);
         tagName[sz] = '\0';
@@ -3666,8 +3828,8 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch
 
     if ((method = _findGroupFactory(tagName))) {
         if (!loader->doc) {
-            if (!STR_AS(tagName, "svg")) return true; //Not a valid svg document
-            node = method(loader, nullptr, attrs, attrsLength, xmlParseAttributes);
+            if (strcmp(tagName, "svg")) return true; //Not a valid svg document
+            node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes);
             loader->doc = node;
             loader->stack.push(node);
             return false;
@@ -3677,54 +3839,54 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch
 }
 
 
-static bool _svgLoaderParserForValidCheck(void* data, XMLType type, const char* content, unsigned int length)
+static bool _svgLoaderParserForValidCheck(void* data, SimpleXMLType type, const char* content, unsigned int length)
 {
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    bool res = true;;
+
     switch (type) {
-        case XMLType::Open:
-        case XMLType::OpenEmpty: {
+        case SimpleXMLType::Open:
+        case SimpleXMLType::OpenEmpty: {
             //If 'res' is false, it means <svg> tag is found.
-            return _svgLoaderParserForValidCheckXmlOpen(static_cast<SvgLoaderData*>(data), content, length);
+            res = _svgLoaderParserForValidCheckXmlOpen(loader, content, length);
+            break;
+        }
+        default: {
+            break;
         }
-        default: return true;
     }
+
+    return res;
 }
 
 
 void SvgLoader::clear(bool all)
 {
     //flush out the intermediate data
-    tvg::free(loaderData.svgParse);
+    free(loaderData.svgParse);
     loaderData.svgParse = nullptr;
 
-    ARRAY_FOREACH(p, loaderData.gradients) {
-        (*p)->clear();
-        tvg::free(*p);
+    for (auto gradient = loaderData.gradients.begin(); gradient < loaderData.gradients.end(); ++gradient) {
+        (*gradient)->clear();
+        free(*gradient);
     }
     loaderData.gradients.reset();
-    loaderData.gradientStack.reset();
 
-    _free(loaderData.doc);
+    _freeNode(loaderData.doc);
     loaderData.doc = nullptr;
     loaderData.stack.reset();
 
     if (!all) return;
 
-    ARRAY_FOREACH(p, loaderData.images) tvg::free(*p);
+    for (auto p = loaderData.images.begin(); p < loaderData.images.end(); ++p) {
+        free(*p);
+    }
     loaderData.images.reset();
 
-    ARRAY_FOREACH(p, loaderData.fonts) {
-        Text::unload(p->name);
-        tvg::free(p->decoded);
-        tvg::free(p->name);
-    }
-    loaderData.fonts.reset();
+    if (copy) free((char*)content);
 
-    if (copy) tvg::free((char*)content);
-
-    if (root) {
-        root->unref();
-        root = nullptr;
-    }
+    delete(root);
+    root = nullptr;
 
     size = 0;
     content = nullptr;
@@ -3732,52 +3894,6 @@ void SvgLoader::clear(bool all)
 }
 
 
-void SvgLoader::run(unsigned tid)
-{
-    //According to the SVG standard the value of the width/height of the viewbox set to 0 disables rendering
-    if ((viewFlag & SvgViewFlag::Viewbox) && (fabsf(vbox.w) <= FLOAT_EPSILON || fabsf(vbox.h) <= FLOAT_EPSILON)) {
-        TVGLOG("SVG", "The <viewBox> width and/or height set to 0 - rendering disabled.");
-        root = Scene::gen();
-    } else {
-        if (xmlParse(content, size, true, _svgLoaderParser, &(loaderData))) {
-            if (loaderData.doc) {
-                auto defs = loaderData.doc->node.doc.defs;
-
-                if (loaderData.nodesToStyle.count > 0) _cssApplyStyleToPostponeds(loaderData.nodesToStyle, loaderData.cssStyle);
-                if (loaderData.cssStyle) cssUpdateStyle(loaderData.doc, loaderData.cssStyle);
-
-                if (!loaderData.cloneNodes.empty()) _clonePostponedNodes(&loaderData.cloneNodes, loaderData.doc);
-
-                _updateComposite(loaderData.doc, loaderData.doc);
-                if (defs) _updateComposite(loaderData.doc, defs);
-
-                _updateFilter(loaderData.doc, loaderData.doc);
-                if (defs) _updateFilter(loaderData.doc, defs);
-
-                _updateStyle(loaderData.doc, nullptr);
-                if (defs) _updateStyle(defs, nullptr);
-
-                if (loaderData.gradients.count > 0) _updateGradient(&loaderData, loaderData.doc, &loaderData.gradients);
-                if (defs) _updateGradient(&loaderData, loaderData.doc, &defs->node.defs.gradients);
-
-                root = svgSceneBuild(loaderData, vbox, w, h, align, meetOrSlice, svgPath, viewFlag);
-
-                //In case no viewbox and width/height data is provided the completion of loading
-                //has to be forced, in order to establish this data based on the whole picture.
-                if (!(viewFlag & SvgViewFlag::Viewbox)) {
-                    //Override viewbox & size again after svg loading.
-                    vbox = loaderData.doc->node.doc.vbox;
-                    w = loaderData.doc->node.doc.w;
-                    h = loaderData.doc->node.doc.h;
-                }
-            }
-        }
-    }
-    root->ref();
-    clear(false);
-}
-
-
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
@@ -3794,80 +3910,135 @@ SvgLoader::~SvgLoader()
 }
 
 
+void SvgLoader::run(unsigned tid)
+{
+    //According to the SVG standard the value of the width/height of the viewbox set to 0 disables rendering
+    if ((viewFlag & SvgViewFlag::Viewbox) && (fabsf(vw) <= FLOAT_EPSILON || fabsf(vh) <= FLOAT_EPSILON)) {
+        TVGLOG("SVG", "The <viewBox> width and/or height set to 0 - rendering disabled.");
+        root = Scene::gen().release();
+        return;
+    }
+
+    if (!simpleXmlParse(content, size, true, _svgLoaderParser, &(loaderData))) return;
+
+    if (loaderData.doc) {
+        auto defs = loaderData.doc->node.doc.defs;
+
+        if (loaderData.nodesToStyle.count > 0) cssApplyStyleToPostponeds(loaderData.nodesToStyle, loaderData.cssStyle);
+        if (loaderData.cssStyle) cssUpdateStyle(loaderData.doc, loaderData.cssStyle);
+
+        if (!loaderData.cloneNodes.empty()) _clonePostponedNodes(&loaderData.cloneNodes, loaderData.doc);
+
+        _updateComposite(loaderData.doc, loaderData.doc);
+        if (defs) _updateComposite(loaderData.doc, defs);
+
+        _updateStyle(loaderData.doc, nullptr);
+        if (defs) _updateStyle(defs, nullptr);
+
+        if (loaderData.gradients.count > 0) _updateGradient(&loaderData, loaderData.doc, &loaderData.gradients);
+        if (defs) _updateGradient(&loaderData, loaderData.doc, &defs->node.defs.gradients);
+    }
+    root = svgSceneBuild(loaderData, {vx, vy, vw, vh}, w, h, align, meetOrSlice, svgPath, viewFlag);
+
+    //In case no viewbox and width/height data is provided the completion of loading
+    //has to be forced, in order to establish this data based on the whole picture.
+    if (!(viewFlag & SvgViewFlag::Viewbox)) {
+        //Override viewbox & size again after svg loading.
+        vx = loaderData.doc->node.doc.vx;
+        vy = loaderData.doc->node.doc.vy;
+        vw = loaderData.doc->node.doc.vw;
+        vh = loaderData.doc->node.doc.vh;
+        w = loaderData.doc->node.doc.w;
+        h = loaderData.doc->node.doc.h;
+    }
+
+    clear(false);
+}
+
+
 bool SvgLoader::header()
 {
     //For valid check, only <svg> tag is parsed first.
     //If the <svg> tag is found, the loaded file is valid and stores viewbox information.
     //After that, the remaining content data is parsed in order with async.
-    loaderData.svgParse = tvg::malloc<SvgParser>(sizeof(SvgParser));
+    loaderData.svgParse = (SvgParser*)malloc(sizeof(SvgParser));
+    if (!loaderData.svgParse) return false;
+
     loaderData.svgParse->flags = SvgStopStyleFlags::StopDefault;
     viewFlag = SvgViewFlag::None;
 
-    xmlParse(content, size, true, _svgLoaderParserForValidCheck, &(loaderData));
+    simpleXmlParse(content, size, true, _svgLoaderParserForValidCheck, &(loaderData));
 
-    if (!loaderData.doc || loaderData.doc->type != SvgNodeType::Doc) {
-        TVGLOG("SVG", "No SVG File. There is no <svg/>");
-        return false;
+    if (loaderData.doc && loaderData.doc->type == SvgNodeType::Doc) {
+        viewFlag = loaderData.doc->node.doc.viewFlag;
+        align = loaderData.doc->node.doc.align;
+        meetOrSlice = loaderData.doc->node.doc.meetOrSlice;
+
+        if (viewFlag & SvgViewFlag::Viewbox) {
+            vx = loaderData.doc->node.doc.vx;
+            vy = loaderData.doc->node.doc.vy;
+            vw = loaderData.doc->node.doc.vw;
+            vh = loaderData.doc->node.doc.vh;
+
+            if (viewFlag & SvgViewFlag::Width) w = loaderData.doc->node.doc.w;
+            else {
+                w = loaderData.doc->node.doc.vw;
+                if (viewFlag & SvgViewFlag::WidthInPercent) {
+                    w *= loaderData.doc->node.doc.w;
+                    viewFlag = (viewFlag ^ SvgViewFlag::WidthInPercent);
+                }
+                viewFlag = (viewFlag | SvgViewFlag::Width);
+            }
+            if (viewFlag & SvgViewFlag::Height) h = loaderData.doc->node.doc.h;
+            else {
+                h = loaderData.doc->node.doc.vh;
+                if (viewFlag & SvgViewFlag::HeightInPercent) {
+                    h *= loaderData.doc->node.doc.h;
+                    viewFlag = (viewFlag ^ SvgViewFlag::HeightInPercent);
+                }
+                viewFlag = (viewFlag | SvgViewFlag::Height);
+            }
+        //In case no viewbox and width/height data is provided the completion of loading
+        //has to be forced, in order to establish this data based on the whole picture.
+        } else {
+            //Before loading, set default viewbox & size if they are empty
+            vx = vy = 0.0f;
+            if (viewFlag & SvgViewFlag::Width) {
+                vw = w = loaderData.doc->node.doc.w;
+            } else {
+                vw = 1.0f;
+                if (viewFlag & SvgViewFlag::WidthInPercent) {
+                    w = loaderData.doc->node.doc.w;
+                } else w = 1.0f;
+            }
+
+            if (viewFlag & SvgViewFlag::Height) {
+                vh = h = loaderData.doc->node.doc.h;
+            } else {
+                vh = 1.0f;
+                if (viewFlag & SvgViewFlag::HeightInPercent) {
+                    h = loaderData.doc->node.doc.h;
+                } else h = 1.0f;
+            }
+
+            run(0);
+        }
+
+        return true;
     }
 
-    viewFlag = loaderData.doc->node.doc.viewFlag;
-    align = loaderData.doc->node.doc.align;
-    meetOrSlice = loaderData.doc->node.doc.meetOrSlice;
-
-    if (viewFlag & SvgViewFlag::Viewbox) {
-        vbox = loaderData.doc->node.doc.vbox;
-
-        if (viewFlag & SvgViewFlag::Width) w = loaderData.doc->node.doc.w;
-        else {
-            w = loaderData.doc->node.doc.vbox.w;
-            if (viewFlag & SvgViewFlag::WidthInPercent) {
-                w *= loaderData.doc->node.doc.w;
-                viewFlag = (viewFlag ^ SvgViewFlag::WidthInPercent);
-            }
-            viewFlag = (viewFlag | SvgViewFlag::Width);
-        }
-        if (viewFlag & SvgViewFlag::Height) h = loaderData.doc->node.doc.h;
-        else {
-            h = loaderData.doc->node.doc.vbox.h;
-            if (viewFlag & SvgViewFlag::HeightInPercent) {
-                h *= loaderData.doc->node.doc.h;
-                viewFlag = (viewFlag ^ SvgViewFlag::HeightInPercent);
-            }
-            viewFlag = (viewFlag | SvgViewFlag::Height);
-        }
-    //In case no viewbox and width/height data is provided the completion of loading
-    //has to be forced, in order to establish this data based on the whole picture.
-    } else {
-        //Before loading, set default viewbox & size if they are empty
-        vbox.x = vbox.y = 0.0f;
-        if (viewFlag & SvgViewFlag::Width) {
-            vbox.w = w = loaderData.doc->node.doc.w;
-        } else {
-            vbox.w = 1.0f;
-            if (viewFlag & SvgViewFlag::WidthInPercent) {
-                w = loaderData.doc->node.doc.w;
-            } else w = 1.0f;
-        }
-
-        if (viewFlag & SvgViewFlag::Height) {
-            vbox.h = h = loaderData.doc->node.doc.h;
-        } else {
-            vbox.h = 1.0f;
-            if (viewFlag & SvgViewFlag::HeightInPercent) {
-                h = loaderData.doc->node.doc.h;
-            } else h = 1.0f;
-        }
-
-        run(0);
-    }
-    return true;
+    TVGLOG("SVG", "No SVG File. There is no <svg/>");
+    return false;
 }
 
 
-bool SvgLoader::open(const char* data, uint32_t size, TVG_UNUSED const char* rpath, bool copy)
+bool SvgLoader::open(const char* data, uint32_t size, bool copy)
 {
+    clear();
+
     if (copy) {
-        content = tvg::malloc<char>(size + 1);
+        content = (char*)malloc(size + 1);
+        if (!content) return false;
         memcpy((char*)content, data, size);
         content[size] = '\0';
     } else content = (char*)data;
@@ -3879,15 +4050,29 @@ bool SvgLoader::open(const char* data, uint32_t size, TVG_UNUSED const char* rpa
 }
 
 
-bool SvgLoader::open(const char* path)
+bool SvgLoader::open(const string& path)
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    if ((content = LoadModule::open(path, size, true))) {
-        copy = true;
-        return header();
-    }
-#endif
+    clear();
+
+    ifstream f;
+    f.open(path);
+
+    if (!f.is_open()) return false;
+
+    svgPath = path;
+    getline(f, filePath, '\0');
+    f.close();
+
+    if (filePath.empty()) return false;
+
+    content = (char*)filePath.c_str();
+    size = filePath.size();
+
+    return header();
+#else
     return false;
+#endif
 }
 
 
@@ -3908,7 +4093,8 @@ bool SvgLoader::read()
 {
     if (!content || size == 0) return false;
 
-    if (!LoadModule::read() || root) return true;
+    //the loading has been already completed in header()
+    if (root || !LoadModule::read()) return true;
 
     TaskScheduler::request(this);
 
@@ -3928,10 +4114,7 @@ bool SvgLoader::close()
 Paint* SvgLoader::paint()
 {
     this->done();
-    if (root) {
-        //Primary usage: sharing the svg
-        if (root->refCnt() == 1) return root;
-        return root->duplicate();
-    }
-    return nullptr;
+    auto ret = root;
+    root = nullptr;
+    return ret;
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h
index 063b718c..b0e49b13 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,7 @@
 class SvgLoader : public ImageLoader, public Task
 {
 public:
+    string filePath;
     string svgPath = "";
     char* content = nullptr;
     uint32_t size = 0;
@@ -41,8 +42,8 @@ public:
     SvgLoader();
     ~SvgLoader();
 
-    bool open(const char* path) override;
-    bool open(const char* data, uint32_t size, const char* rpath, bool copy) override;
+    bool open(const string& path) override;
+    bool open(const char* data, uint32_t size, bool copy) override;
     bool resize(Paint* paint, float w, float h) override;
     bool read() override;
     bool close() override;
@@ -53,7 +54,10 @@ private:
     SvgViewFlag viewFlag = SvgViewFlag::None;
     AspectRatioAlign align = AspectRatioAlign::XMidYMid;
     AspectRatioMeetOrSlice meetOrSlice = AspectRatioMeetOrSlice::Meet;
-    Box vbox{};
+    float vx = 0;
+    float vy = 0;
+    float vw = 0;
+    float vh = 0;
 
     bool header();
     void clear(bool all = true);
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
index 4ecddde7..77c0abb8 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,32 +26,6 @@
 #include "tvgCommon.h"
 #include "tvgArray.h"
 #include "tvgInlist.h"
-#include "tvgColor.h"
-
-using SvgColor = tvg::RGB;
-
-#define STR_AS(A, B) !strcmp((A), (B))
-
-struct Box
-{
-    float x, y, w, h;
-
-    void intersect(const Box& box)
-    {
-        auto x1 = x + w;
-        auto y1 = y + h;
-        auto x2 = box.x + box.w;
-        auto y2 = box.y + box.h;
-
-        x = x > box.x ? x : box.x;
-        y = y > box.y ? y : box.y;
-        w = (x1 < x2 ? x1 : x2) - x;
-        h = (y1 < y2 ? y1 : y2) - y;
-
-        if (w < 0.0f) w = 0.0f;
-        if (h < 0.0f) h = 0.0f;
-    }
-};
 
 struct SvgNode;
 struct SvgStyleGradient;
@@ -81,8 +55,6 @@ enum class SvgNodeType
     Mask,
     CssStyle,
     Symbol,
-    Filter,
-    GaussianBlur,
     Unknown
 };
 
@@ -109,21 +81,16 @@ enum class SvgFillFlags
     ClipPath = 0x16
 };
 
-constexpr bool operator&(SvgFillFlags a, SvgFillFlags b)
+constexpr bool operator &(SvgFillFlags a, SvgFillFlags b)
 {
     return int(a) & int(b);
 }
 
-constexpr SvgFillFlags operator|(SvgFillFlags a, SvgFillFlags b)
+constexpr SvgFillFlags operator |(SvgFillFlags a, SvgFillFlags b)
 {
     return SvgFillFlags(int(a) | int(b));
 }
 
-constexpr void operator|=(SvgFillFlags& a, const SvgFillFlags b)
-{
-    a = SvgFillFlags(int(a) | int(b));
-}
-
 enum class SvgStrokeFlags
 {
     Paint = 0x1,
@@ -138,20 +105,16 @@ enum class SvgStrokeFlags
     DashOffset = 0x200
 };
 
-constexpr bool operator&(SvgStrokeFlags a, SvgStrokeFlags b)
+constexpr bool operator &(SvgStrokeFlags a, SvgStrokeFlags b)
 {
     return int(a) & int(b);
 }
 
-constexpr SvgStrokeFlags operator|(SvgStrokeFlags a, SvgStrokeFlags b)
+constexpr SvgStrokeFlags operator |(SvgStrokeFlags a, SvgStrokeFlags b)
 {
     return SvgStrokeFlags(int(a) | int(b));
 }
 
-constexpr void operator|=(SvgStrokeFlags& a, const SvgStrokeFlags b)
-{
-    a = SvgStrokeFlags(int(a) | int(b));
-}
 
 enum class SvgGradientType
 {
@@ -180,24 +143,18 @@ enum class SvgStyleFlags
     PaintOrder = 0x10000,
     StrokeMiterlimit = 0x20000,
     StrokeDashOffset = 0x40000,
-    Filter = 0x80000
 };
 
-constexpr bool operator&(SvgStyleFlags a, SvgStyleFlags b)
+constexpr bool operator &(SvgStyleFlags a, SvgStyleFlags b)
 {
     return int(a) & int(b);
 }
 
-constexpr SvgStyleFlags operator|(SvgStyleFlags a, SvgStyleFlags b)
+constexpr SvgStyleFlags operator |(SvgStyleFlags a, SvgStyleFlags b)
 {
     return SvgStyleFlags(int(a) | int(b));
 }
 
-constexpr void operator|=(SvgStyleFlags& a, const SvgStyleFlags b)
-{
-    a = SvgStyleFlags(int(a) | int(b));
-}
-
 enum class SvgStopStyleFlags
 {
     StopDefault = 0x0,
@@ -205,12 +162,12 @@ enum class SvgStopStyleFlags
     StopColor = 0x02
 };
 
-constexpr bool operator&(SvgStopStyleFlags a, SvgStopStyleFlags b)
+constexpr bool operator &(SvgStopStyleFlags a, SvgStopStyleFlags b)
 {
     return int(a) & int(b);
 }
 
-constexpr SvgStopStyleFlags operator|(SvgStopStyleFlags a, SvgStopStyleFlags b)
+constexpr SvgStopStyleFlags operator |(SvgStopStyleFlags a, SvgStopStyleFlags b)
 {
     return SvgStopStyleFlags(int(a) | int(b));
 }
@@ -242,19 +199,18 @@ constexpr SvgGradientFlags operator |(SvgGradientFlags a, SvgGradientFlags b)
     return SvgGradientFlags(int(a) | int(b));
 }
 
+enum class SvgFillRule
+{
+    Winding = 0,
+    OddEven = 1
+};
+
 enum class SvgMaskType
 {
     Luminance = 0,
     Alpha
 };
 
-enum class SvgXmlSpace
-{
-    None,
-    Default,
-    Preserve
-};
-
 //Length type to recalculate %, pt, pc, mm, cm etc
 enum class SvgParserLengthType
 {
@@ -312,8 +268,12 @@ enum class AspectRatioMeetOrSlice
 
 struct SvgDocNode
 {
-    float w, h;   //unit: point or in percentage see: SvgViewFlag
-    Box vbox;
+    float w;       //unit: point or in percentage see: SvgViewFlag
+    float h;       //unit: point or in percentage see: SvgViewFlag
+    float vx;
+    float vy;
+    float vw;
+    float vh;
     SvgViewFlag viewFlag;
     SvgNode* defs;
     SvgNode* style;
@@ -352,23 +312,37 @@ struct SvgUseNode
 
 struct SvgEllipseNode
 {
-    float cx, cy, rx, ry;
+    float cx;
+    float cy;
+    float rx;
+    float ry;
 };
 
 struct SvgCircleNode
 {
-    float cx, cy, r;
+    float cx;
+    float cy;
+    float r;
 };
 
 struct SvgRectNode
 {
-    float x, y, w, h, rx, ry;
-    bool hasRx, hasRy;
+    float x;
+    float y;
+    float w;
+    float h;
+    float rx;
+    float ry;
+    bool hasRx;
+    bool hasRy;
 };
 
 struct SvgLineNode
 {
-    float x1, y1, x2, y2;
+    float x1;
+    float y1;
+    float x2;
+    float y2;
 };
 
 struct SvgImageNode
@@ -410,26 +384,12 @@ struct SvgTextNode
     float fontSize;
 };
 
-struct SvgGaussianBlurNode
-{
-    float stdDevX, stdDevY;
-    Box box;
-    bool isPercentage[4];
-    bool hasBox;
-    bool edgeModeWrap;
-};
-
-struct SvgFilterNode
-{
-    Box box;
-    bool isPercentage[4];
-    bool filterUserSpace;
-    bool primitiveUserSpace;
-};
-
 struct SvgLinearGradient
 {
-    float x1, y1, x2, y2;
+    float x1;
+    float y1;
+    float x2;
+    float y2;
     bool isX1Percentage;
     bool isY1Percentage;
     bool isX2Percentage;
@@ -438,7 +398,12 @@ struct SvgLinearGradient
 
 struct SvgRadialGradient
 {
-    float cx, cy, fx, fy, r, fr;
+    float cx;
+    float cy;
+    float fx;
+    float fy;
+    float r;
+    float fr;
     bool isCxPercentage;
     bool isCyPercentage;
     bool isFxPercentage;
@@ -454,6 +419,13 @@ struct SvgComposite
     bool applying;              //flag for checking circular dependency.
 };
 
+struct SvgColor
+{
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
 struct SvgPaint
 {
     SvgStyleGradient* gradient;
@@ -485,11 +457,11 @@ struct SvgStyleGradient
     void clear()
     {
         stops.reset();
-        tvg::free(transform);
-        tvg::free(radial);
-        tvg::free(linear);
-        tvg::free(ref);
-        tvg::free(id);
+        free(transform);
+        free(radial);
+        free(linear);
+        free(ref);
+        free(id);
     }
 };
 
@@ -515,19 +487,12 @@ struct SvgStyleStroke
     SvgDash dash;
 };
 
-struct SvgFilter
-{
-    char *url;
-    SvgNode* node;
-};
-
 struct SvgStyleProperty
 {
     SvgStyleFill fill;
     SvgStyleStroke stroke;
     SvgComposite clipPath;
     SvgComposite mask;
-    SvgFilter filter;
     int opacity;
     SvgColor color;
     char* cssClass;
@@ -564,10 +529,7 @@ struct SvgNode
         SvgCssStyleNode cssStyle;
         SvgSymbolNode symbol;
         SvgTextNode text;
-        SvgFilterNode filter;
-        SvgGaussianBlurNode gaussianBlur;
     } node;
-    SvgXmlSpace xmlSpace = SvgXmlSpace::None;
     ~SvgNode();
 };
 
@@ -577,7 +539,10 @@ struct SvgParser
     SvgStyleGradient* styleGrad;
     Fill::ColorStop gradStop;
     SvgStopStyleFlags flags;
-    Box global;
+    struct
+    {
+        float x, y, w, h;
+    } global;
     struct
     {
         bool parsedFx;
@@ -627,4 +592,9 @@ struct SvgLoaderData
     SvgNode* currentGraphicsNode = nullptr;
 };
 
+struct Box
+{
+    float x, y, w, h;
+};
+
 #endif
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp
index 422d1cd2..e37e7504 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,43 @@
  * SOFTWARE.
  */
 
+/*
+ * Copyright notice for the EFL:
+
+ * Copyright (C) EFL developers (see AUTHORS)
+
+ * All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #define _USE_MATH_DEFINES       //Math Constants are not defined in Standard C/C++.
 
 #include <cstring>
 #include <ctype.h>
 #include "tvgMath.h"
+#include "tvgShape.h"
 #include "tvgSvgLoaderCommon.h"
 #include "tvgSvgPath.h"
 #include "tvgStr.h"
-#include "tvgSvgUtil.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
@@ -36,7 +64,9 @@
 
 static char* _skipComma(const char* content)
 {
-    content = svgUtilSkipWhiteSpace(content, nullptr);
+    while (*content && isspace(*content)) {
+        content++;
+    }
     if (*content == ',') return (char*)content + 1;
     return (char*)content;
 }
@@ -45,7 +75,7 @@ static char* _skipComma(const char* content)
 static bool _parseNumber(char** content, float* number)
 {
     char* end = NULL;
-    *number = toFloat(*content, &end);
+    *number = strToFloat(*content, &end);
     //If the start of string is not number
     if ((*content) == end) return false;
     //Skip comma if any
@@ -67,70 +97,114 @@ static bool _parseFlag(char** content, int* number)
 }
 
 
-//Some helpful stuff is available here:
-//http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes
-void _pathAppendArcTo(RenderPath& out, Point& cur, Point& curCtl, const Point& next, Point radius, float angle, bool largeArc, bool sweep)
+void _pathAppendArcTo(Array<PathCommand>* cmds, Array<Point>* pts, Point* cur, Point* curCtl, float x, float y, float rx, float ry, float angle, bool largeArc, bool sweep)
 {
-    auto start = cur;
-    auto cosPhi = cosf(angle);
-    auto sinPhi = sinf(angle);
-    auto d2 = (start - next) * 0.5f;
-    auto x1p = cosPhi * d2.x + sinPhi * d2.y;
-    auto y1p = cosPhi * d2.y - sinPhi * d2.x;
-    auto x1p2 = x1p * x1p;
-    auto y1p2 = y1p * y1p;
-    auto radius2 = Point{radius.x * radius.x, radius.y * radius.y};
-    auto lambda = (x1p2 / radius2.x) + (y1p2 / radius2.y);
+    float cxp, cyp, cx, cy;
+    float sx, sy;
+    float cosPhi, sinPhi;
+    float dx2, dy2;
+    float x1p, y1p;
+    float x1p2, y1p2;
+    float rx2, ry2;
+    float lambda;
+    float c;
+    float at;
+    float theta1, deltaTheta;
+    float nat;
+    float delta, bcp;
+    float cosPhiRx, cosPhiRy;
+    float sinPhiRx, sinPhiRy;
+    float cosTheta1, sinTheta1;
+    int segments;
+
+    //Some helpful stuff is available here:
+    //http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes
+    sx = cur->x;
+    sy = cur->y;
+
+    //Correction of out-of-range radii, see F6.6.1 (step 2)
+    rx = fabsf(rx);
+    ry = fabsf(ry);
+
+    angle = deg2rad(angle);
+    cosPhi = cosf(angle);
+    sinPhi = sinf(angle);
+    dx2 = (sx - x) / 2.0f;
+    dy2 = (sy - y) / 2.0f;
+    x1p = cosPhi * dx2 + sinPhi * dy2;
+    y1p = cosPhi * dy2 - sinPhi * dx2;
+    x1p2 = x1p * x1p;
+    y1p2 = y1p * y1p;
+    rx2 = rx * rx;
+    ry2 = ry * ry;
+    lambda = (x1p2 / rx2) + (y1p2 / ry2);
 
     //Correction of out-of-range radii, see F6.6.2 (step 4)
     if (lambda > 1.0f) {
         //See F6.6.3
-        radius *= sqrtf(lambda);
-        radius2 = {radius.x * radius.x, radius.y * radius.y};
+        float lambdaRoot = sqrtf(lambda);
+
+        rx *= lambdaRoot;
+        ry *= lambdaRoot;
+        //Update rx2 and ry2
+        rx2 = rx * rx;
+        ry2 = ry * ry;
     }
 
-    Point cp, center;
-    auto c = (radius2.x * radius2.y) - (radius2.x * y1p2) - (radius2.y * x1p2);
+    c = (rx2 * ry2) - (rx2 * y1p2) - (ry2 * x1p2);
 
     //Check if there is no possible solution
     //(i.e. we can't do a square root of a negative value)
     if (c < 0.0f) {
         //Scale uniformly until we have a single solution
         //(see F6.2) i.e. when c == 0.0
-        radius *= sqrtf(1.0f - c / (radius2.x * radius2.y));
-        radius2 = {radius.x * radius.x, radius.y * radius.y};
+        float scale = sqrtf(1.0f - c / (rx2 * ry2));
+        rx *= scale;
+        ry *= scale;
+        //Update rx2 and ry2
+        rx2 = rx * rx;
+        ry2 = ry * ry;
+
         //Step 2 (F6.5.2) - simplified since c == 0.0
-        cp = {0.0f, 0.0f};
+        cxp = 0.0f;
+        cyp = 0.0f;
         //Step 3 (F6.5.3 first part) - simplified since cxp and cyp == 0.0
-        center = {0.0f, 0.0f};
+        cx = 0.0f;
+        cy = 0.0f;
     } else {
         //Complete c calculation
-        c = sqrtf(c / ((radius2.x * y1p2) + (radius2.y * x1p2)));
+        c = sqrtf(c / ((rx2 * y1p2) + (ry2 * x1p2)));
         //Inverse sign if Fa == Fs
         if (largeArc == sweep) c = -c;
+
         //Step 2 (F6.5.2)
-        cp = c * Point{(radius.x * y1p / radius.y), (-radius.y * x1p / radius.x)};
+        cxp = c * (rx * y1p / ry);
+        cyp = c * (-ry * x1p / rx);
+
         //Step 3 (F6.5.3 first part)
-        center = {cosPhi * cp.x - sinPhi * cp.y, sinPhi * cp.x + cosPhi * cp.y};
+        cx = cosPhi * cxp - sinPhi * cyp;
+        cy = sinPhi * cxp + cosPhi * cyp;
     }
 
     //Step 3 (F6.5.3 second part) we now have the center point of the ellipse
-    center += (start + next) * 0.5f;
+    cx += (sx + x) / 2.0f;
+    cy += (sy + y) / 2.0f;
 
     //Step 4 (F6.5.4)
-    //We don't use arccos (as per w3c doc), see
+    //We dont' use arccos (as per w3c doc), see
     //http://www.euclideanspace.com/maths/algebra/vectors/angleBetween/index.htm
     //Note: atan2 (0.0, 1.0) == 0.0
-    auto at = tvg::atan2(((y1p - cp.y) / radius.y), ((x1p - cp.x) / radius.x));
-    auto theta1 = (at < 0.0f) ? 2.0f * MATH_PI + at : at;
-    auto nat = tvg::atan2(((-y1p - cp.y) / radius.y), ((-x1p - cp.x) / radius.x));
-    auto deltaTheta = (nat < at) ? 2.0f * MATH_PI - at + nat : nat - at;
+    at = tvg::atan2(((y1p - cyp) / ry), ((x1p - cxp) / rx));
+    theta1 = (at < 0.0f) ? 2.0f * MATH_PI + at : at;
+
+    nat = tvg::atan2(((-y1p - cyp) / ry), ((-x1p - cxp) / rx));
+    deltaTheta = (nat < at) ? 2.0f * MATH_PI - at + nat : nat - at;
 
     if (sweep) {
         //Ensure delta theta < 0 or else add 360 degrees
         if (deltaTheta < 0.0f) deltaTheta += 2.0f * MATH_PI;
     } else {
-        //Ensure delta theta > 0 or else subtract 360 degrees
+        //Ensure delta theta > 0 or else substract 360 degrees
         if (deltaTheta > 0.0f) deltaTheta -= 2.0f * MATH_PI;
     }
 
@@ -138,35 +212,52 @@ void _pathAppendArcTo(RenderPath& out, Point& cur, Point& curCtl, const Point& n
     //(smaller than 90 degrees)
     //We add one extra segment because we want something
     //Smaller than 90deg (i.e. not 90 itself)
-    auto segments = int(fabsf(deltaTheta / MATH_PI2) + 1.0f);
-    auto delta = deltaTheta / segments;
+    segments = static_cast<int>(fabsf(deltaTheta / MATH_PI2) + 1.0f);
+    delta = deltaTheta / segments;
 
     //http://www.stillhq.com/ctpfaq/2001/comp.text.pdf-faq-2001-04.txt (section 2.13)
-    auto bcp = 4.0f / 3.0f * (1.0f - cosf(delta / 2.0f)) / sinf(delta / 2.0f);
-    auto cosPhiR = Point{cosPhi * radius.x, cosPhi * radius.y};
-    auto sinPhiR = Point{sinPhi * radius.x, sinPhi * radius.y};
-    auto cosTheta1 = cosf(theta1);
-    auto sinTheta1 = sinf(theta1);
+    bcp = 4.0f / 3.0f * (1.0f - cosf(delta / 2.0f)) / sinf(delta / 2.0f);
+
+    cosPhiRx = cosPhi * rx;
+    cosPhiRy = cosPhi * ry;
+    sinPhiRx = sinPhi * rx;
+    sinPhiRy = sinPhi * ry;
+
+    cosTheta1 = cosf(theta1);
+    sinTheta1 = sinf(theta1);
 
     for (int i = 0; i < segments; ++i) {
         //End angle (for this segment) = current + delta
-        auto theta2 = theta1 + delta;
-        auto cosTheta2 = cosf(theta2);
-        auto sinTheta2 = sinf(theta2);
+        float c1x, c1y, ex, ey, c2x, c2y;
+        float theta2 = theta1 + delta;
+        float cosTheta2 = cosf(theta2);
+        float sinTheta2 = sinf(theta2);
+        Point p[3];
 
         //First control point (based on start point sx,sy)
-        auto c1 = start + Point{-bcp * (cosPhiR.x * sinTheta1 + sinPhiR.y * cosTheta1), bcp * (cosPhiR.y * cosTheta1 - sinPhiR.x * sinTheta1)};
+        c1x = sx - bcp * (cosPhiRx * sinTheta1 + sinPhiRy * cosTheta1);
+        c1y = sy + bcp * (cosPhiRy * cosTheta1 - sinPhiRx * sinTheta1);
 
         //End point (for this segment)
-        auto e = center + Point{cosPhiR.x * cosTheta2 - sinPhiR.y * sinTheta2, sinPhiR.x * cosTheta2 + cosPhiR.y * sinTheta2};
+        ex = cx + (cosPhiRx * cosTheta2 - sinPhiRy * sinTheta2);
+        ey = cy + (sinPhiRx * cosTheta2 + cosPhiRy * sinTheta2);
 
         //Second control point (based on end point ex,ey)
-        curCtl = e + Point{bcp * (cosPhiR.x * sinTheta2 + sinPhiR.y * cosTheta2), bcp * (sinPhiR.x * sinTheta2 - cosPhiR.y * cosTheta2)};
-        cur = e;
-        out.cubicTo(c1, curCtl, cur);
+        c2x = ex + bcp * (cosPhiRx * sinTheta2 + sinPhiRy * cosTheta2);
+        c2y = ey + bcp * (sinPhiRx * sinTheta2 - cosPhiRy * cosTheta2);
+        cmds->push(PathCommand::CubicTo);
+        p[0] = {c1x, c1y};
+        p[1] = {c2x, c2y};
+        p[2] = {ex, ey};
+        pts->push(p[0]);
+        pts->push(p[1]);
+        pts->push(p[2]);
+        *curCtl = p[1];
+        *cur = p[2];
 
         //Next start point is the current end point (same for angle)
-        start = e;
+        sx = ex;
+        sy = ey;
         theta1 = theta2;
         //Avoid recomputations
         cosTheta1 = cosTheta2;
@@ -174,7 +265,6 @@ void _pathAppendArcTo(RenderPath& out, Point& cur, Point& curCtl, const Point& n
     }
 }
 
-
 static int _numberCount(char cmd)
 {
     int count = 0;
@@ -214,13 +304,14 @@ static int _numberCount(char cmd)
             count = 7;
             break;
         }
-        default: break;
+        default:
+            break;
     }
     return count;
 }
 
 
-static bool _processCommand(RenderPath& out, char cmd, float* arr, int count, Point& cur, Point& curCtl, Point& start, bool& quadratic, bool& closed)
+static bool _processCommand(Array<PathCommand>* cmds, Array<Point>* pts, char cmd, float* arr, int count, Point* cur, Point* curCtl, Point* startPoint, bool *isQuadratic, bool* closed)
 {
     switch (cmd) {
         case 'm':
@@ -230,120 +321,169 @@ static bool _processCommand(RenderPath& out, char cmd, float* arr, int count, Po
         case 'q':
         case 't': {
             for (int i = 0; i < count - 1; i += 2) {
-                arr[i] = arr[i] + cur.x;
-                arr[i + 1] = arr[i + 1] + cur.y;
+                arr[i] = arr[i] + cur->x;
+                arr[i + 1] = arr[i + 1] + cur->y;
             }
             break;
         }
         case 'h': {
-            arr[0] = arr[0] + cur.x;
+            arr[0] = arr[0] + cur->x;
             break;
         }
         case 'v': {
-            arr[0] = arr[0] + cur.y;
+            arr[0] = arr[0] + cur->y;
             break;
         }
         case 'a': {
-            arr[5] = arr[5] + cur.x;
-            arr[6] = arr[6] + cur.y;
+            arr[5] = arr[5] + cur->x;
+            arr[6] = arr[6] + cur->y;
+            break;
+        }
+        default: {
             break;
         }
-        default: break;
     }
 
     switch (cmd) {
         case 'm':
         case 'M': {
-            start = cur = {arr[0], arr[1]};
-            out.moveTo(cur);
+            Point p = {arr[0], arr[1]};
+            cmds->push(PathCommand::MoveTo);
+            pts->push(p);
+            *cur = {arr[0], arr[1]};
+            *startPoint = {arr[0], arr[1]};
             break;
         }
         case 'l':
         case 'L': {
-            cur = {arr[0], arr[1]};
-            out.lineTo(cur);
+            Point p = {arr[0], arr[1]};
+            cmds->push(PathCommand::LineTo);
+            pts->push(p);
+            *cur = {arr[0], arr[1]};
             break;
         }
         case 'c':
         case 'C': {
-            curCtl = {arr[2], arr[3]};
-            cur = {arr[4], arr[5]};
-            out.cubicTo({arr[0], arr[1]}, curCtl, cur);
-            quadratic = false;
+            Point p[3];
+            cmds->push(PathCommand::CubicTo);
+            p[0] = {arr[0], arr[1]};
+            p[1] = {arr[2], arr[3]};
+            p[2] = {arr[4], arr[5]};
+            pts->push(p[0]);
+            pts->push(p[1]);
+            pts->push(p[2]);
+            *curCtl = p[1];
+            *cur = p[2];
+            *isQuadratic = false;
             break;
         }
         case 's':
         case 'S': {
-            Point ctrl;
-            if ((out.cmds.count > 1) && (out.cmds.last() == PathCommand::CubicTo) && !quadratic) {
-                ctrl = 2 * cur - curCtl;
+            Point p[3], ctrl;
+            if ((cmds->count > 1) && (cmds->last() == PathCommand::CubicTo) &&
+                !(*isQuadratic)) {
+                ctrl.x = 2 * cur->x - curCtl->x;
+                ctrl.y = 2 * cur->y - curCtl->y;
             } else {
-                ctrl = cur;
+                ctrl = *cur;
             }
-            curCtl = {arr[0], arr[1]};
-            cur = {arr[2], arr[3]};
-            out.cubicTo(ctrl, curCtl, cur);
-            quadratic = false;
+            cmds->push(PathCommand::CubicTo);
+            p[0] = ctrl;
+            p[1] = {arr[0], arr[1]};
+            p[2] = {arr[2], arr[3]};
+            pts->push(p[0]);
+            pts->push(p[1]);
+            pts->push(p[2]);
+            *curCtl = p[1];
+            *cur = p[2];
+            *isQuadratic = false;
             break;
         }
         case 'q':
         case 'Q': {
-            auto ctrl1 = (cur + 2 * Point{arr[0], arr[1]}) * (1.0f / 3.0f);
-            auto ctrl2 = (Point{arr[2], arr[3]} + 2 * Point{arr[0], arr[1]}) * (1.0f / 3.0f);
-            curCtl = {arr[0], arr[1]};
-            cur = {arr[2], arr[3]};
-            out.cubicTo(ctrl1, ctrl2, cur);
-            quadratic = true;
+            Point p[3];
+            float ctrl_x0 = (cur->x + 2 * arr[0]) * (1.0f / 3.0f);
+            float ctrl_y0 = (cur->y + 2 * arr[1]) * (1.0f / 3.0f);
+            float ctrl_x1 = (arr[2] + 2 * arr[0]) * (1.0f / 3.0f);
+            float ctrl_y1 = (arr[3] + 2 * arr[1]) * (1.0f / 3.0f);
+            cmds->push(PathCommand::CubicTo);
+            p[0] = {ctrl_x0, ctrl_y0};
+            p[1] = {ctrl_x1, ctrl_y1};
+            p[2] = {arr[2], arr[3]};
+            pts->push(p[0]);
+            pts->push(p[1]);
+            pts->push(p[2]);
+            *curCtl = {arr[0], arr[1]};
+            *cur = p[2];
+            *isQuadratic = true;
             break;
         }
         case 't':
         case 'T': {
-            Point ctrl;
-            if ((out.cmds.count > 1) && (out.cmds.last() == PathCommand::CubicTo) && quadratic) {
-                ctrl = 2 * cur - curCtl;
+            Point p[3], ctrl;
+            if ((cmds->count > 1) && (cmds->last() == PathCommand::CubicTo) &&
+                *isQuadratic) {
+                ctrl.x = 2 * cur->x - curCtl->x;
+                ctrl.y = 2 * cur->y - curCtl->y;
             } else {
-                ctrl = cur;
+                ctrl = *cur;
             }
-            auto ctrl1 = (cur + 2 * ctrl) * (1.0f / 3.0f);
-            auto ctrl2 = (Point{arr[0], arr[1]} + 2 * ctrl) * (1.0f / 3.0f);
-            curCtl = {ctrl.x, ctrl.y};
-            cur = {arr[0], arr[1]};
-            out.cubicTo(ctrl1, ctrl2, cur);
-            quadratic = true;
+            float ctrl_x0 = (cur->x + 2 * ctrl.x) * (1.0f / 3.0f);
+            float ctrl_y0 = (cur->y + 2 * ctrl.y) * (1.0f / 3.0f);
+            float ctrl_x1 = (arr[0] + 2 * ctrl.x) * (1.0f / 3.0f);
+            float ctrl_y1 = (arr[1] + 2 * ctrl.y) * (1.0f / 3.0f);
+            cmds->push(PathCommand::CubicTo);
+            p[0] = {ctrl_x0, ctrl_y0};
+            p[1] = {ctrl_x1, ctrl_y1};
+            p[2] = {arr[0], arr[1]};
+            pts->push(p[0]);
+            pts->push(p[1]);
+            pts->push(p[2]);
+            *curCtl = {ctrl.x, ctrl.y};
+            *cur = p[2];
+            *isQuadratic = true;
             break;
         }
         case 'h':
         case 'H': {
-            out.lineTo({arr[0], cur.y});
-            cur.x = arr[0];
+            Point p = {arr[0], cur->y};
+            cmds->push(PathCommand::LineTo);
+            pts->push(p);
+            cur->x = arr[0];
             break;
         }
         case 'v':
         case 'V': {
-            out.lineTo({cur.x, arr[0]});
-            cur.y = arr[0];
+            Point p = {cur->x, arr[0]};
+            cmds->push(PathCommand::LineTo);
+            pts->push(p);
+            cur->y = arr[0];
             break;
         }
         case 'z':
         case 'Z': {
-            out.close();
-            cur = start;
-            closed = true;
+            cmds->push(PathCommand::Close);
+            *cur = *startPoint;
+            *closed = true;
             break;
         }
         case 'a':
         case 'A': {
             if (tvg::zero(arr[0]) || tvg::zero(arr[1])) {
-                cur = {arr[5], arr[6]};
-                out.lineTo(cur);
-            } else if (!tvg::equal(cur.x, arr[5]) || !tvg::equal(cur.y, arr[6])) {
-                _pathAppendArcTo(out, cur, curCtl, {arr[5], arr[6]}, {fabsf(arr[0]), fabsf(arr[1])}, deg2rad(arr[2]), arr[3], arr[4]);
-                cur = curCtl = {arr[5], arr[6]};
-                quadratic = false;
+                Point p = {arr[5], arr[6]};
+                cmds->push(PathCommand::LineTo);
+                pts->push(p);
+                *cur = {arr[5], arr[6]};
+            } else if (!tvg::equal(cur->x, arr[5]) || !tvg::equal(cur->y, arr[6])) {
+                _pathAppendArcTo(cmds, pts, cur, curCtl, arr[5], arr[6], fabsf(arr[0]), fabsf(arr[1]), arr[2], arr[3], arr[4]);
+                *cur = *curCtl = {arr[5], arr[6]};
+                *isQuadratic = false;
             }
             break;
         }
-        default: return false;
+        default: {
+            return false;
+        }
     }
     return true;
 }
@@ -385,12 +525,12 @@ static char* _nextCommand(char* path, char* cmd, float* arr, int* count, bool* c
             }
         }
         *count = 0;
-        return nullptr;
+        return NULL;
     }
     for (int i = 0; i < *count; i++) {
         if (!_parseNumber(&path, &arr[i])) {
             *count = 0;
-            return nullptr;
+            return NULL;
         }
         path = _skipComma(path);
     }
@@ -403,26 +543,29 @@ static char* _nextCommand(char* path, char* cmd, float* arr, int* count, bool* c
 /************************************************************************/
 
 
-bool svgPathToShape(const char* svgPath, RenderPath& out)
+bool svgPathToShape(const char* svgPath, Shape* shape)
 {
     float numberArray[7];
     int numberCount = 0;
-    Point cur = {0, 0};
-    Point curCtl = {0, 0};
-    Point start = {0, 0};
+    Point cur = { 0, 0 };
+    Point curCtl = { 0, 0 };
+    Point startPoint = { 0, 0 };
     char cmd = 0;
-    auto path = (char*)svgPath;
-    auto lastCmds = out.cmds.count;
-    auto isQuadratic = false;
-    auto closed = false;
+    bool isQuadratic = false;
+    bool closed = false;
+    char* path = (char*)svgPath;
+
+    auto& pts = P(shape)->rs.path.pts;
+    auto& cmds = P(shape)->rs.path.cmds;
+    auto lastCmds = cmds.count;
 
     while ((path[0] != '\0')) {
         path = _nextCommand(path, &cmd, numberArray, &numberCount, &closed);
         if (!path) break;
         closed = false;
-        if (!_processCommand(out, cmd, numberArray, numberCount, cur, curCtl, start, isQuadratic, closed)) break;
+        if (!_processCommand(&cmds, &pts, cmd, numberArray, numberCount, &cur, &curCtl, &startPoint, &isQuadratic, &closed)) break;
     }
 
-    if (out.cmds.count > lastCmds && out.cmds[lastCmds] != PathCommand::MoveTo) return false;
+    if (cmds.count > lastCmds && cmds[lastCmds] != PathCommand::MoveTo) return false;
     return true;
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.h
index 9b0a9387..b8641dd1 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,8 @@
 #ifndef _TVG_SVG_PATH_H_
 #define _TVG_SVG_PATH_H_
 
-#include "tvgRender.h"
+#include <tvgCommon.h>
 
-bool svgPathToShape(const char* svgPath, RenderPath& out);
+bool svgPathToShape(const char* svgPath, Shape* shape);
 
 #endif //_TVG_SVG_PATH_H_
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
index 50e91ada..668f7aa0 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,11 +21,13 @@
  */
 
 #include "tvgMath.h" /* to include math.h before cstring */
+#include <cstring>
+#include <string>
 #include "tvgShape.h"
 #include "tvgCompressor.h"
+#include "tvgPaint.h"
 #include "tvgFill.h"
 #include "tvgStr.h"
-#include "tvgShape.h"
 #include "tvgSvgLoaderCommon.h"
 #include "tvgSvgSceneBuilder.h"
 #include "tvgSvgPath.h"
@@ -35,23 +37,40 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
+static bool _appendShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath);
 static bool _appendClipShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform);
-static Scene* _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth);
+static unique_ptr<Scene> _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite = nullptr);
 
 
 static inline bool _isGroupType(SvgNodeType type)
 {
-    if (type == SvgNodeType::Doc || type == SvgNodeType::G || type == SvgNodeType::Use || type == SvgNodeType::ClipPath || type == SvgNodeType::Symbol || type == SvgNodeType::Filter) return true;
+    if (type == SvgNodeType::Doc || type == SvgNodeType::G || type == SvgNodeType::Use || type == SvgNodeType::ClipPath || type == SvgNodeType::Symbol) return true;
     return false;
 }
 
 
 //According to: https://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBoxUnits (the last paragraph)
 //a stroke width should be ignored for bounding box calculations
-static Box _bounds(Paint* paint)
+static Box _boundingBox(const Shape* shape)
 {
     float x, y, w, h;
-    paint->bounds(&x, &y, &w, &h);
+    shape->bounds(&x, &y, &w, &h, false);
+
+    if (auto strokeW = shape->strokeWidth()) {
+        x += 0.5f * strokeW;
+        y += 0.5f * strokeW;
+        w -= strokeW;
+        h -= strokeW;
+    }
+
+    return {x, y, w, h};
+}
+
+
+static Box _boundingBox(const Text* text)
+{
+    float x, y, w, h;
+    text->bounds(&x, &y, &w, &h, false);
     return {x, y, w, h};
 }
 
@@ -68,12 +87,14 @@ static void _transformMultiply(const Matrix* mBBox, Matrix* gradTransf)
 }
 
 
-static LinearGradient* _applyLinearGradientProperty(SvgStyleGradient* g, const Box& vBox, int opacity)
+static unique_ptr<LinearGradient> _applyLinearGradientProperty(SvgStyleGradient* g, const Box& vBox, int opacity)
 {
     Fill::ColorStop* stops;
+    int stopCount = 0;
     auto fillGrad = LinearGradient::gen();
-    auto isTransform = (g->transform ? true : false);
-    auto& finalTransform = fillGrad->transform();
+
+    bool isTransform = (g->transform ? true : false);
+    Matrix finalTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     if (isTransform) finalTransform = *g->transform;
 
     if (g->userSpace) {
@@ -84,42 +105,51 @@ static LinearGradient* _applyLinearGradientProperty(SvgStyleGradient* g, const B
     } else {
         Matrix m = {vBox.w, 0, vBox.x, 0, vBox.h, vBox.y, 0, 0, 1};
         if (isTransform) _transformMultiply(&m, &finalTransform);
-        else finalTransform = m;
+        else {
+            finalTransform = m;
+            isTransform = true;
+        }
     }
 
+    if (isTransform) fillGrad->transform(finalTransform);
+
     fillGrad->linear(g->linear->x1, g->linear->y1, g->linear->x2, g->linear->y2);
     fillGrad->spread(g->spread);
 
     //Update the stops
-    if (g->stops.count == 0) return fillGrad;
-
-    stops = tvg::malloc<Fill::ColorStop>(g->stops.count * sizeof(Fill::ColorStop));
-    auto prevOffset = 0.0f;
-    for (uint32_t i = 0; i < g->stops.count; ++i) {
-        auto colorStop = &g->stops[i];
-        //Use premultiplied color
-        stops[i].r = colorStop->r;
-        stops[i].g = colorStop->g;
-        stops[i].b = colorStop->b;
-        stops[i].a = static_cast<uint8_t>((colorStop->a * opacity) / 255);
-        stops[i].offset = colorStop->offset;
-        //check the offset corner cases - refer to: https://svgwg.org/svg2-draft/pservers.html#StopNotes
-        if (colorStop->offset < prevOffset) stops[i].offset = prevOffset;
-        else if (colorStop->offset > 1) stops[i].offset = 1;
-        prevOffset = stops[i].offset;
+    stopCount = g->stops.count;
+    if (stopCount > 0) {
+        stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop));
+        if (!stops) return fillGrad;
+        auto prevOffset = 0.0f;
+        for (uint32_t i = 0; i < g->stops.count; ++i) {
+            auto colorStop = &g->stops[i];
+            //Use premultiplied color
+            stops[i].r = colorStop->r;
+            stops[i].g = colorStop->g;
+            stops[i].b = colorStop->b;
+            stops[i].a = static_cast<uint8_t>((colorStop->a * opacity) / 255);
+            stops[i].offset = colorStop->offset;
+            //check the offset corner cases - refer to: https://svgwg.org/svg2-draft/pservers.html#StopNotes
+            if (colorStop->offset < prevOffset) stops[i].offset = prevOffset;
+            else if (colorStop->offset > 1) stops[i].offset = 1;
+            prevOffset = stops[i].offset;
+        }
+        fillGrad->colorStops(stops, stopCount);
+        free(stops);
     }
-    fillGrad->colorStops(stops, g->stops.count);
-    tvg::free(stops);
     return fillGrad;
 }
 
 
-static RadialGradient* _applyRadialGradientProperty(SvgStyleGradient* g, const Box& vBox, int opacity)
+static unique_ptr<RadialGradient> _applyRadialGradientProperty(SvgStyleGradient* g, const Box& vBox, int opacity)
 {
     Fill::ColorStop *stops;
+    int stopCount = 0;
     auto fillGrad = RadialGradient::gen();
-    auto isTransform = (g->transform ? true : false);
-    auto& finalTransform = fillGrad->transform();
+
+    bool isTransform = (g->transform ? true : false);
+    Matrix finalTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     if (isTransform) finalTransform = *g->transform;
 
     if (g->userSpace) {
@@ -134,100 +164,65 @@ static RadialGradient* _applyRadialGradientProperty(SvgStyleGradient* g, const B
     } else {
         Matrix m = {vBox.w, 0, vBox.x, 0, vBox.h, vBox.y, 0, 0, 1};
         if (isTransform) _transformMultiply(&m, &finalTransform);
-        else finalTransform = m;
+        else {
+            finalTransform = m;
+            isTransform = true;
+        }
     }
 
-    fillGrad->radial(g->radial->cx, g->radial->cy, g->radial->r, g->radial->fx, g->radial->fy, g->radial->fr);
+    if (isTransform) fillGrad->transform(finalTransform);
+
+    P(fillGrad)->radial(g->radial->cx, g->radial->cy, g->radial->r, g->radial->fx, g->radial->fy, g->radial->fr);
     fillGrad->spread(g->spread);
 
     //Update the stops
-    if (g->stops.count == 0) return fillGrad;
-
-    stops = tvg::malloc<Fill::ColorStop>(g->stops.count * sizeof(Fill::ColorStop));
-    auto prevOffset = 0.0f;
-    for (uint32_t i = 0; i < g->stops.count; ++i) {
-        auto colorStop = &g->stops[i];
-        //Use premultiplied color
-        stops[i].r = colorStop->r;
-        stops[i].g = colorStop->g;
-        stops[i].b = colorStop->b;
-        stops[i].a = static_cast<uint8_t>((colorStop->a * opacity) / 255);
-        stops[i].offset = colorStop->offset;
-        //check the offset corner cases - refer to: https://svgwg.org/svg2-draft/pservers.html#StopNotes
-        if (colorStop->offset < prevOffset) stops[i].offset = prevOffset;
-        else if (colorStop->offset > 1) stops[i].offset = 1;
-        prevOffset = stops[i].offset;
+    stopCount = g->stops.count;
+    if (stopCount > 0) {
+        stops = (Fill::ColorStop*)calloc(stopCount, sizeof(Fill::ColorStop));
+        if (!stops) return fillGrad;
+        auto prevOffset = 0.0f;
+        for (uint32_t i = 0; i < g->stops.count; ++i) {
+            auto colorStop = &g->stops[i];
+            //Use premultiplied color
+            stops[i].r = colorStop->r;
+            stops[i].g = colorStop->g;
+            stops[i].b = colorStop->b;
+            stops[i].a = static_cast<uint8_t>((colorStop->a * opacity) / 255);
+            stops[i].offset = colorStop->offset;
+            //check the offset corner cases - refer to: https://svgwg.org/svg2-draft/pservers.html#StopNotes
+            if (colorStop->offset < prevOffset) stops[i].offset = prevOffset;
+            else if (colorStop->offset > 1) stops[i].offset = 1;
+            prevOffset = stops[i].offset;
+        }
+        fillGrad->colorStops(stops, stopCount);
+        free(stops);
     }
-    fillGrad->colorStops(stops, g->stops.count);
-    tvg::free(stops);
     return fillGrad;
 }
 
 
-static void _appendRect(Shape* shape, float x, float y, float w, float h, float rx, float ry)
+//The SVG standard allows only for 'use' nodes that point directly to a basic shape.
+static bool _appendClipUseNode(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath)
 {
-    auto halfW = w * 0.5f;
-    auto halfH = h * 0.5f;
+    if (node->child.count != 1) return false;
+    auto child = *(node->child.data);
 
-    //clamping cornerRadius by minimum size
-    if (rx > halfW) rx = halfW;
-    if (ry > halfH) ry = halfH;
-
-    if (rx == 0 && ry == 0) {
-        to<ShapeImpl>(shape)->grow(5, 4);
-        shape->moveTo(x, y);
-        shape->lineTo(x + w, y);
-        shape->lineTo(x + w, y + h);
-        shape->lineTo(x, y + h);
-        shape->close();
-    } else {
-        auto hrx = rx * PATH_KAPPA;
-        auto hry = ry * PATH_KAPPA;
-
-        to<ShapeImpl>(shape)->grow(10, 17);
-        shape->moveTo(x + rx, y);
-        shape->lineTo(x + w - rx, y);
-        shape->cubicTo(x + w - rx + hrx, y, x + w, y + ry - hry, x + w, y + ry);
-        shape->lineTo(x + w, y + h - ry);
-        shape->cubicTo(x + w, y + h - ry + hry, x + w - rx + hrx, y + h, x + w - rx, y + h);
-        shape->lineTo(x + rx, y + h);
-        shape->cubicTo(x + rx - hrx, y + h, x, y + h - ry + hry, x, y + h - ry);
-        shape->lineTo(x, y + ry);
-        shape->cubicTo(x, y + ry - hry, x + rx - hrx, y, x + rx, y);
-        shape->close();
+    Matrix finalTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
+    if (node->transform) finalTransform = *node->transform;
+    if (node->node.use.x != 0.0f || node->node.use.y != 0.0f) {
+        Matrix m = {1, 0, node->node.use.x, 0, 1, node->node.use.y, 0, 0, 1};
+        finalTransform *= m;
     }
+    if (child->transform) finalTransform *= *child->transform;
+
+    return _appendClipShape(loaderData, child, shape, vBox, svgPath, identity((const Matrix*)(&finalTransform)) ? nullptr : &finalTransform);
 }
 
 
-static void _appendCircle(Shape* shape, float cx, float cy, float rx, float ry)
+static bool _appendClipChild(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, bool clip)
 {
-    auto rxKappa = rx * PATH_KAPPA;
-    auto ryKappa = ry * PATH_KAPPA;
-
-    to<ShapeImpl>(shape)->grow(6, 13);
-    shape->moveTo(cx + rx, cy);
-    shape->cubicTo(cx + rx, cy + ryKappa, cx + rxKappa, cy + ry, cx, cy + ry);
-    shape->cubicTo(cx - rxKappa, cy + ry, cx - rx, cy + ryKappa, cx - rx, cy);
-    shape->cubicTo(cx - rx, cy - ryKappa, cx - rxKappa, cy - ry, cx, cy - ry);
-    shape->cubicTo(cx + rxKappa, cy - ry, cx + rx, cy - ryKappa, cx + rx, cy);
-    shape->close();
-}
-
-
-static bool _appendClipChild(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath)
-{
-    //The SVG standard allows only for 'use' nodes that point directly to a basic shape.
     if (node->type == SvgNodeType::Use) {
-        if (node->child.count != 1) return false;
-        auto child = *(node->child.data);
-        auto finalTransform = tvg::identity();
-        if (node->transform) finalTransform = *node->transform;
-        if (node->node.use.x != 0.0f || node->node.use.y != 0.0f) {
-            finalTransform *= {1, 0, node->node.use.x, 0, 1, node->node.use.y, 0, 0, 1};
-        }
-        if (child->transform) finalTransform *= *child->transform;
-
-        return _appendClipShape(loaderData, child, shape, vBox, svgPath, tvg::identity((const Matrix*)(&finalTransform)) ? nullptr : &finalTransform);
+        return _appendClipUseNode(loaderData, node, shape, vBox, svgPath);
     }
     return _appendClipShape(loaderData, node, shape, vBox, svgPath, nullptr);
 }
@@ -235,7 +230,7 @@ static bool _appendClipChild(SvgLoaderData& loaderData, SvgNode* node, Shape* sh
 
 static Matrix _compositionTransform(Paint* paint, const SvgNode* node, const SvgNode* compNode, SvgNodeType type)
 {
-    auto m = tvg::identity();
+    Matrix m = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     //The initial mask transformation ignored according to the SVG standard.
     if (node->transform && type != SvgNodeType::Mask) {
         m = *node->transform;
@@ -244,159 +239,102 @@ static Matrix _compositionTransform(Paint* paint, const SvgNode* node, const Svg
         m *= *compNode->transform;
     }
     if (!compNode->node.clip.userSpace) {
-        auto bbox = _bounds(paint);
-        m *= {bbox.w, 0, bbox.x, 0, bbox.h, bbox.y, 0, 0, 1};
+        float x, y, w, h;
+        P(paint)->bounds(&x, &y, &w, &h, false, false);
+        Matrix mBBox = {w, 0, x, 0, h, y, 0, 0, 1};
+        m *= mBBox;
     }
     return m;
 }
 
-static bool _applyClip(SvgLoaderData& loaderData, Paint* paint, const SvgNode* node, const SvgNode* clipNode, const Box& vBox, const string& svgPath)
+
+static void _applyComposition(SvgLoaderData& loaderData, Paint* paint, const SvgNode* node, const Box& vBox, const string& svgPath)
 {
-    node->style->clipPath.applying = true;
-
-    auto clipper = Shape::gen();
-    auto valid = false; //Composite only when valid shapes exist
-
-    ARRAY_FOREACH(p, clipNode->child) {
-        if (_appendClipChild(loaderData, *p, clipper, vBox, svgPath)) valid = true;
-    }
-
-    if (valid) {
-        Matrix finalTransform = _compositionTransform(paint, node, clipNode, SvgNodeType::ClipPath);
-        clipper->transform(finalTransform);
-        paint->clip(clipper);
+    /* ClipPath */
+    /* Do not drop in Circular Dependency for ClipPath.
+       Composition can be applied recursively if its children nodes have composition target to this one. */
+    if (node->style->clipPath.applying) {
+        TVGLOG("SVG", "Multiple Composition Tried! Check out Circular dependency?");
     } else {
-        Paint::rel(clipper);
-    }
+        auto compNode = node->style->clipPath.node;
+        if (compNode && compNode->child.count > 0) {
+            node->style->clipPath.applying = true;
 
-    node->style->clipPath.applying = false;
-    return valid;
-}
+            auto comp = Shape::gen();
 
+            auto child = compNode->child.data;
+            auto valid = false; //Composite only when valid shapes exist
 
-static Paint* _applyComposition(SvgLoaderData& loaderData, Paint* paint, const SvgNode* node, const Box& vBox, const string& svgPath)
-{
-    if (node->style->clipPath.applying || node->style->mask.applying) {
-        TVGLOG("SVG", "Multiple composition tried! Check out circular dependency?");
-        return paint;
-    }
+            for (uint32_t i = 0; i < compNode->child.count; ++i, ++child) {
+                if (_appendClipChild(loaderData, *child, comp.get(), vBox, svgPath, compNode->child.count > 1)) valid = true;
+            }
 
-    auto clipNode = node->style->clipPath.node;
-    auto maskNode = node->style->mask.node;
+            if (valid) {
+                Matrix finalTransform = _compositionTransform(paint, node, compNode, SvgNodeType::ClipPath);
+                comp->transform(finalTransform);
+                paint->clip(std::move(comp));
+            }
 
-    if (!clipNode && !maskNode) return paint;
-    if ((clipNode && clipNode->child.empty()) || (maskNode && maskNode->child.empty())) {
-        Paint::rel(paint);
-        return nullptr;
-    }
-
-    auto scene = Scene::gen();
-    scene->add(paint);
-
-    if (clipNode) {
-        if (!_applyClip(loaderData, scene, node, clipNode, vBox, svgPath)) {
-            Paint::rel(scene);
-            return nullptr;
+            node->style->clipPath.applying = false;
         }
     }
 
     /* Mask */
-    if (maskNode) {
-        node->style->mask.applying = true;
+    /* Do not drop in Circular Dependency for Mask.
+       Composition can be applied recursively if its children nodes have composition target to this one. */
+    if (node->style->mask.applying) {
+        TVGLOG("SVG", "Multiple Composition Tried! Check out Circular dependency?");
+    } else {
+        auto compNode = node->style->mask.node;
+        if (compNode && compNode->child.count > 0) {
+            node->style->mask.applying = true;
 
-        if (auto mask = _sceneBuildHelper(loaderData, maskNode, vBox, svgPath, true, 0)) {
-            if (!maskNode->node.mask.userSpace) {
-                Matrix finalTransform = _compositionTransform(paint, node, maskNode, SvgNodeType::Mask);
-                mask->transform(finalTransform);
-            } else if (node->transform) {
-                mask->transform(*node->transform);
-            }
-            scene->mask(mask, maskNode->node.mask.type == SvgMaskType::Luminance ? MaskMethod::Luma: MaskMethod::Alpha);
-        }
-
-        node->style->mask.applying = false;
-    }
-
-    return scene;
-}
-
-
-static Paint* _applyFilter(SvgLoaderData& loaderData, Paint* paint, const SvgNode* node, const Box& vBox, const string& svgPath)
-{
-    auto filterNode = node->style->filter.node;
-    if (!filterNode || filterNode->child.count == 0) return paint;
-    auto& filter = filterNode->node.filter;
-
-    auto scene = Scene::gen();
-
-    auto bbox = _bounds(paint);
-    Box clipBox = filter.filterUserSpace ? filter.box : Box{bbox.x + filter.box.x * bbox.w, bbox.y + filter.box.y * bbox.h, filter.box.w * bbox.w, filter.box.h * bbox.h};
-    auto primitiveUserSpace = filter.primitiveUserSpace;
-    auto sx = paint->transform().e11;
-    auto sy = paint->transform().e22;
-
-    auto child = filterNode->child.data;
-    for (uint32_t i = 0; i < filterNode->child.count; ++i, ++child) {
-        if ((*child)->type == SvgNodeType::GaussianBlur) {
-            auto& gauss = (*child)->node.gaussianBlur;
-
-            auto direction = gauss.stdDevX > 0.0f ? (gauss.stdDevY > 0.0f ? 0 : 1) : (gauss.stdDevY > 0.0f ? 2 : -1);
-            if (direction == -1) continue;
-
-            auto stdDevX = gauss.stdDevX;
-            auto stdDevY = gauss.stdDevY;
-            if (gauss.hasBox) {
-                auto gaussBox = gauss.box;
-                auto isPercent = gauss.isPercentage;
-                if (primitiveUserSpace) {
-                    if (isPercent[0]) gaussBox.x *= loaderData.svgParse->global.w;
-                    if (isPercent[1]) gaussBox.y *= loaderData.svgParse->global.h;
-                    if (isPercent[2]) gaussBox.w *= loaderData.svgParse->global.w;
-                    if (isPercent[3]) gaussBox.h *= loaderData.svgParse->global.h;
+            bool isMaskWhite = true;
+            if (auto comp = _sceneBuildHelper(loaderData, compNode, vBox, svgPath, true, 0, &isMaskWhite)) {
+                if (!compNode->node.mask.userSpace) {
+                    Matrix finalTransform = _compositionTransform(paint, node, compNode, SvgNodeType::Mask);
+                    comp->transform(finalTransform);
                 } else {
-                    stdDevX *= bbox.w;
-                    stdDevY *= bbox.h;
-                    if (isPercent[0]) gaussBox.x = bbox.x + gauss.box.x * bbox.w;
-                    if (isPercent[1]) gaussBox.y = bbox.y + gauss.box.y * bbox.h;
-                    if (isPercent[2]) gaussBox.w *= bbox.w;
-                    if (isPercent[3]) gaussBox.h *= bbox.h;
+                    if (node->transform) comp->transform(*node->transform);
+                }
+
+                if (compNode->node.mask.type == SvgMaskType::Luminance && !isMaskWhite) {
+                    paint->composite(std::move(comp), CompositeMethod::LumaMask);
+                } else {
+                    paint->composite(std::move(comp), CompositeMethod::AlphaMask);
                 }
-                clipBox.intersect(gaussBox);
-            } else if (!primitiveUserSpace) {
-                stdDevX *= bbox.w;
-                stdDevY *= bbox.h;
             }
-            scene->add(SceneEffect::GaussianBlur, (double)(1.25f * (direction == 2 ? stdDevY * sy : stdDevX * sx)), direction, gauss.edgeModeWrap, 55);
+
+            node->style->mask.applying = false;
         }
     }
-
-    scene->add(paint);
-
-    auto clip = Shape::gen();
-    clip->appendRect(clipBox.x, clipBox.y, clipBox.w, clipBox.h);
-    scene->clip(clip);
-
-    return scene;
 }
 
-static Paint* _applyProperty(SvgLoaderData& loaderData, SvgNode* node, Shape* vg, const Box& vBox, const string& svgPath, bool clip)
+
+static void _applyProperty(SvgLoaderData& loaderData, SvgNode* node, Shape* vg, const Box& vBox, const string& svgPath, bool clip)
 {
     SvgStyleProperty* style = node->style;
 
     //Clip transformation is applied directly to the path in the _appendClipShape function
-    if (node->type == SvgNodeType::Doc || !node->style->display) return vg;
+    if (node->transform && !clip) vg->transform(*node->transform);
+    if (node->type == SvgNodeType::Doc || !node->style->display) return;
 
     //If fill property is nullptr then do nothing
     if (style->fill.paint.none) {
         //Do nothing
     } else if (style->fill.paint.gradient) {
-        auto bBox = style->fill.paint.gradient->userSpace ? vBox : _bounds(vg);
+        Box bBox = vBox;
+        if (!style->fill.paint.gradient->userSpace) bBox = _boundingBox(vg);
+
         if (style->fill.paint.gradient->type == SvgGradientType::Linear) {
-            vg->fill(_applyLinearGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity));
+            auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity);
+            vg->fill(std::move(linear));
         } else if (style->fill.paint.gradient->type == SvgGradientType::Radial) {
-            vg->fill(_applyRadialGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity));
+            auto radial = _applyRadialGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity);
+            vg->fill(std::move(radial));
         }
     } else if (style->fill.paint.url) {
+        //TODO: Apply the color pointed by url
         TVGLOG("SVG", "The fill's url not supported.");
     } else if (style->fill.paint.curColor) {
         //Apply the current style color
@@ -406,45 +344,59 @@ static Paint* _applyProperty(SvgLoaderData& loaderData, SvgNode* node, Shape* vg
         vg->fill(style->fill.paint.color.r, style->fill.paint.color.g, style->fill.paint.color.b, style->fill.opacity);
     }
 
-    vg->fillRule(style->fill.fillRule);
+    //Apply the fill rule
+    vg->fill((tvg::FillRule)style->fill.fillRule);
+    //Rendering order
     vg->order(!style->paintOrder);
-    vg->opacity(style->opacity);
 
-    if (node->type == SvgNodeType::G || node->type == SvgNodeType::Use) return vg;
+    //Apply node opacity
+    if (style->opacity < 255) vg->opacity(style->opacity);
+
+    if (node->type == SvgNodeType::G || node->type == SvgNodeType::Use) return;
 
     //Apply the stroke style property
-    vg->strokeWidth(style->stroke.width);
-    vg->strokeCap(style->stroke.cap);
-    vg->strokeJoin(style->stroke.join);
+    vg->stroke(style->stroke.width);
+    vg->stroke(style->stroke.cap);
+    vg->stroke(style->stroke.join);
     vg->strokeMiterlimit(style->stroke.miterlimit);
-    vg->strokeDash(style->stroke.dash.array.data, style->stroke.dash.array.count, style->stroke.dash.offset);
+    if (style->stroke.dash.array.count > 0) {
+        P(vg)->strokeDash(style->stroke.dash.array.data, style->stroke.dash.array.count, style->stroke.dash.offset);
+    }
 
     //If stroke property is nullptr then do nothing
     if (style->stroke.paint.none) {
-        vg->strokeWidth(0.0f);
+        vg->stroke(0.0f);
     } else if (style->stroke.paint.gradient) {
-        auto bBox = style->stroke.paint.gradient->userSpace ? vBox : _bounds(vg);
+        Box bBox = vBox;
+        if (!style->stroke.paint.gradient->userSpace) bBox = _boundingBox(vg);
+
         if (style->stroke.paint.gradient->type == SvgGradientType::Linear) {
-             vg->strokeFill(_applyLinearGradientProperty(style->stroke.paint.gradient, bBox, style->stroke.opacity));
+             auto linear = _applyLinearGradientProperty(style->stroke.paint.gradient, bBox, style->stroke.opacity);
+             vg->stroke(std::move(linear));
         } else if (style->stroke.paint.gradient->type == SvgGradientType::Radial) {
-             vg->strokeFill(_applyRadialGradientProperty(style->stroke.paint.gradient, bBox, style->stroke.opacity));
+             auto radial = _applyRadialGradientProperty(style->stroke.paint.gradient, bBox, style->stroke.opacity);
+             vg->stroke(std::move(radial));
         }
     } else if (style->stroke.paint.url) {
         //TODO: Apply the color pointed by url
         TVGLOG("SVG", "The stroke's url not supported.");
     } else if (style->stroke.paint.curColor) {
         //Apply the current style color
-        vg->strokeFill(style->color.r, style->color.g, style->color.b, style->stroke.opacity);
+        vg->stroke(style->color.r, style->color.g, style->color.b, style->stroke.opacity);
     } else {
         //Apply the stroke color
-        vg->strokeFill(style->stroke.paint.color.r, style->stroke.paint.color.g, style->stroke.paint.color.b, style->stroke.opacity);
+        vg->stroke(style->stroke.paint.color.r, style->stroke.paint.color.g, style->stroke.paint.color.b, style->stroke.opacity);
     }
 
-    //apply transform after the local space shape bbox for gradient acquisition
-    if (node->transform && !clip) vg->transform(*node->transform);
+    _applyComposition(loaderData, vg, node, vBox, svgPath);
+}
 
-    auto p = _applyFilter(loaderData, vg, node, vBox, svgPath);
-    return _applyComposition(loaderData, p, node, vBox, svgPath);
+
+static unique_ptr<Shape> _shapeBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath)
+{
+    auto shape = Shape::gen();
+    if (_appendShape(loaderData, node, shape.get(), vBox, svgPath)) return shape;
+    else return nullptr;
 }
 
 
@@ -453,7 +405,7 @@ static bool _recognizeShape(SvgNode* node, Shape* shape)
     switch (node->type) {
         case SvgNodeType::Path: {
             if (node->node.path.path) {
-                if (!svgPathToShape(node->node.path.path, to<ShapeImpl>(shape)->rs.path)) {
+                if (!svgPathToShape(node->node.path.path, shape)) {
                     TVGERR("SVG", "Invalid path information.");
                     return false;
                 }
@@ -461,7 +413,7 @@ static bool _recognizeShape(SvgNode* node, Shape* shape)
             break;
         }
         case SvgNodeType::Ellipse: {
-            _appendCircle(shape, node->node.ellipse.cx, node->node.ellipse.cy, node->node.ellipse.rx, node->node.ellipse.ry);
+            shape->appendCircle(node->node.ellipse.cx, node->node.ellipse.cy, node->node.ellipse.rx, node->node.ellipse.ry);
             break;
         }
         case SvgNodeType::Polygon: {
@@ -484,11 +436,11 @@ static bool _recognizeShape(SvgNode* node, Shape* shape)
             break;
         }
         case SvgNodeType::Circle: {
-            _appendCircle(shape, node->node.circle.cx, node->node.circle.cy, node->node.circle.r, node->node.circle.r);
+            shape->appendCircle(node->node.circle.cx, node->node.circle.cy, node->node.circle.r, node->node.circle.r);
             break;
         }
         case SvgNodeType::Rect: {
-            _appendRect(shape, node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h, node->node.rect.rx, node->node.rect.ry);
+            shape->appendRect(node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h, node->node.rect.rx, node->node.rect.ry);
             break;
         }
         case SvgNodeType::Line: {
@@ -504,28 +456,32 @@ static bool _recognizeShape(SvgNode* node, Shape* shape)
 }
 
 
-static Paint* _shapeBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath)
+static bool _appendShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath)
 {
-    auto shape = Shape::gen();
-    if (!_recognizeShape(node, shape)) return nullptr;
-    return _applyProperty(loaderData, node, shape, vBox, svgPath, false);
+    if (!_recognizeShape(node, shape)) return false;
+
+    _applyProperty(loaderData, node, shape, vBox, svgPath, false);
+    return true;
 }
 
 
 static bool _appendClipShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform)
 {
-    uint32_t currentPtsCnt;
-    shape->path(nullptr, nullptr, nullptr, &currentPtsCnt);
-
-    if (!_recognizeShape(node, shape)) return false;
-
     //The 'transform' matrix has higher priority than the node->transform, since it already contains it
     auto m = transform ? transform : (node->transform ? node->transform : nullptr);
 
+    uint32_t currentPtsCnt = 0;
     if (m) {
-        const Point *pts;
-        uint32_t ptsCnt;
-        shape->path(nullptr, nullptr, &pts, &ptsCnt);
+        const Point *tmp = nullptr;
+        currentPtsCnt = shape->pathCoords(&tmp);
+    }
+
+    if (!_recognizeShape(node, shape)) return false;
+
+    if (m) {
+        const Point *pts = nullptr;
+        auto ptsCnt = shape->pathCoords(&pts);
+
         auto p = const_cast<Point*>(pts) + currentPtsCnt;
         while (currentPtsCnt++ < ptsCnt) {
             *p *= *m;
@@ -533,16 +489,7 @@ static bool _appendClipShape(SvgLoaderData& loaderData, SvgNode* node, Shape* sh
         }
     }
 
-    //Apply Clip Chaining
-    if (auto clipNode = node->style->clipPath.node) {
-        if (clipNode->child.count == 0) return false;
-        if (node->style->clipPath.applying) {
-            TVGLOG("SVG", "Multiple composition tried! Check out circular dependency?");
-            return false;
-        }
-        return _applyClip(loaderData, shape, node, clipNode, vBox, svgPath);
-    }
-
+    _applyProperty(loaderData, node, shape, vBox, svgPath, true);
     return true;
 }
 
@@ -553,12 +500,10 @@ enum class imageMimeTypeEncoding
     utf8 = 0x2
 };
 
-
 constexpr imageMimeTypeEncoding operator|(imageMimeTypeEncoding a, imageMimeTypeEncoding b) {
     return static_cast<imageMimeTypeEncoding>(static_cast<int>(a) | static_cast<int>(b));
 }
 
-
 constexpr bool operator&(imageMimeTypeEncoding a, imageMimeTypeEncoding b) {
     return (static_cast<int>(a) & static_cast<int>(b));
 }
@@ -585,47 +530,47 @@ static bool _isValidImageMimeTypeAndEncoding(const char** href, const char** mim
     //mediatype  := [ type "/" subtype ] *( ";" parameter )
     //parameter  := attribute "=" value
     for (unsigned int i = 0; i < sizeof(imageMimeTypes) / sizeof(imageMimeTypes[0]); i++) {
-        if (strncmp(*href, imageMimeTypes[i].name, imageMimeTypes[i].sz - 1)) continue;
-        *href += imageMimeTypes[i].sz  - 1;
-        *mimetype = imageMimeTypes[i].name;
+        if (!strncmp(*href, imageMimeTypes[i].name, imageMimeTypes[i].sz - 1)) {
+            *href += imageMimeTypes[i].sz  - 1;
+            *mimetype = imageMimeTypes[i].name;
 
-        while (**href && **href != ',') {
-            while (**href && **href != ';') ++(*href);
-            if (!**href) return false;
-            ++(*href);
+            while (**href && **href != ',') {
+                while (**href && **href != ';') ++(*href);
+                if (!**href) return false;
+                ++(*href);
 
-            if (imageMimeTypes[i].encoding & imageMimeTypeEncoding::base64) {
-                if (!strncmp(*href, "base64,", sizeof("base64,") - 1)) {
-                    *href += sizeof("base64,") - 1;
-                    *encoding = imageMimeTypeEncoding::base64;
-                    return true; //valid base64
+                if (imageMimeTypes[i].encoding & imageMimeTypeEncoding::base64) {
+                    if (!strncmp(*href, "base64,", sizeof("base64,") - 1)) {
+                        *href += sizeof("base64,") - 1;
+                        *encoding = imageMimeTypeEncoding::base64;
+                        return true; //valid base64
+                    }
+                }
+                if (imageMimeTypes[i].encoding & imageMimeTypeEncoding::utf8) {
+                    if (!strncmp(*href, "utf8,", sizeof("utf8,") - 1)) {
+                        *href += sizeof("utf8,") - 1;
+                        *encoding = imageMimeTypeEncoding::utf8;
+                        return true; //valid utf8
+                    }
                 }
             }
-            if (imageMimeTypes[i].encoding & imageMimeTypeEncoding::utf8) {
-                if (!strncmp(*href, "utf8,", sizeof("utf8,") - 1)) {
-                    *href += sizeof("utf8,") - 1;
-                    *encoding = imageMimeTypeEncoding::utf8;
-                    return true; //valid utf8
-                }
+            //no encoding defined
+            if (**href == ',' && (imageMimeTypes[i].encoding & imageMimeTypeEncoding::utf8)) {
+                ++(*href);
+                *encoding = imageMimeTypeEncoding::utf8;
+                return true; //allow no encoding defined if utf8 expected
             }
+            return false;
         }
-        //no encoding defined
-        if (**href == ',' && (imageMimeTypes[i].encoding & imageMimeTypeEncoding::utf8)) {
-            ++(*href);
-            *encoding = imageMimeTypeEncoding::utf8;
-            return true; //allow no encoding defined if utf8 expected
-        }
-        return false;
     }
     return false;
 }
 
 #include "tvgTaskScheduler.h"
 
-static Paint* _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath)
+static unique_ptr<Picture> _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath)
 {
     if (!node->node.image.href || !strlen(node->node.image.href)) return nullptr;
-
     auto picture = Picture::gen();
 
     const char* href = node->node.image.href;
@@ -637,14 +582,14 @@ static Paint* _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const
         char *decoded = nullptr;
         if (encoding == imageMimeTypeEncoding::base64) {
             auto size = b64Decode(href, strlen(href), &decoded);
-            if (picture->load(decoded, size, mimetype) != Result::Success) {
-                tvg::free(decoded);
+            if (picture->load(decoded, size, mimetype, false) != Result::Success) {
+                free(decoded);
                 return nullptr;
             }
         } else {
             auto size = svgUtilURLDecode(href, &decoded);
-            if (picture->load(decoded, size, mimetype) != Result::Success) {
-                tvg::free(decoded);
+            if (picture->load(decoded, size, mimetype, false) != Result::Success) {
+                free(decoded);
                 return nullptr;
             }
         }
@@ -654,7 +599,7 @@ static Paint* _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const
         //TODO: protect against recursive svg image loading
         //Temporarily disable embedded svg:
         const char *dot = strrchr(href, '.');
-        if (dot && STR_AS(dot, ".svg")) {
+        if (dot && !strcmp(dot, ".svg")) {
             TVGLOG("SVG", "Embedded svg file is disabled.");
             return nullptr;
         }
@@ -663,25 +608,24 @@ static Paint* _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const
             auto last = svgPath.find_last_of("/");
             imagePath = svgPath.substr(0, (last == string::npos ? 0 : last + 1)) + imagePath;
         }
-        if (picture->load(imagePath.c_str()) != Result::Success) {
+        if (picture->load(imagePath) != Result::Success) {
             return nullptr;
         }
     }
 
     float w, h;
-    Matrix m;
-    if (picture->size(&w, &h) == Result::Success && w > 0 && h > 0) {
+    Matrix m = {1, 0, 0, 0, 1, 0, 0, 0, 1};
+    if (picture->size(&w, &h) == Result::Success && w  > 0 && h > 0) {
         auto sx = node->node.image.w / w;
         auto sy = node->node.image.h / h;
         m = {sx, 0, node->node.image.x, 0, sy, node->node.image.y, 0, 0, 1};
-    } else {
-        m = tvg::identity();
     }
     if (node->transform) m = *node->transform * m;
     picture->transform(m);
 
-    auto p = _applyFilter(loaderData, picture, node, vBox, svgPath);
-    return _applyComposition(loaderData, p, node, vBox, svgPath);
+    _applyComposition(loaderData, picture.get(), node, vBox, svgPath);
+
+    return picture;
 }
 
 
@@ -692,7 +636,8 @@ static Matrix _calculateAspectRatioMatrix(AspectRatioAlign align, AspectRatioMee
     auto tvx = box.x * sx;
     auto tvy = box.y * sy;
 
-    if (align == AspectRatioAlign::None) return {sx, 0, -tvx, 0, sy, -tvy, 0, 0, 1};
+    if (align == AspectRatioAlign::None)
+        return {sx, 0, -tvx, 0, sy, -tvy, 0, 0, 1};
 
     //Scale
     if (meetOrSlice == AspectRatioMeetOrSlice::Meet) {
@@ -758,12 +703,12 @@ static Matrix _calculateAspectRatioMatrix(AspectRatioAlign align, AspectRatioMee
 }
 
 
-static Scene* _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, int depth)
+static unique_ptr<Scene> _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, int depth, bool* isMaskWhite)
 {
-    auto scene = _sceneBuildHelper(loaderData, node, vBox, svgPath, false, depth + 1);
+    auto scene = _sceneBuildHelper(loaderData, node, vBox, svgPath, false, depth + 1, isMaskWhite);
 
     // mUseTransform = mUseTransform * mTranslate
-    auto mUseTransform = tvg::identity();
+    Matrix mUseTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     if (node->transform) mUseTransform = *node->transform;
     if (node->node.use.x != 0.0f || node->node.use.y != 0.0f) {
         Matrix mTranslate = {1, 0, node->node.use.x, 0, 1, node->node.use.y, 0, 0, 1};
@@ -772,6 +717,7 @@ static Scene* _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, co
 
     if (node->node.use.symbol) {
         auto symbol = node->node.use.symbol->node.symbol;
+
         auto width = (symbol.hasWidth ? symbol.w : vBox.w);
         if (node->node.use.isWidthSet) width = node->node.use.w;
         auto height = (symbol.hasHeight ? symbol.h : vBox.h);;
@@ -779,7 +725,7 @@ static Scene* _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, co
         auto vw = (symbol.hasViewBox ? symbol.vw : width);
         auto vh = (symbol.hasViewBox ? symbol.vh : height);
 
-        auto mViewBox = tvg::identity();
+        Matrix mViewBox = {1, 0, 0, 0, 1, 0, 0, 0, 1};
         if ((!tvg::equal(width, vw) || !tvg::equal(height, vh)) && vw > 0 && vh > 0) {
             Box box = {symbol.vx, symbol.vy, vw, vh};
             mViewBox = _calculateAspectRatioMatrix(symbol.align, symbol.meetOrSlice, width, height, box);
@@ -797,7 +743,7 @@ static Scene* _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, co
 
         if (!node->node.use.symbol->node.symbol.overflowVisible) {
             auto viewBoxClip = Shape::gen();
-            viewBoxClip->appendRect(0, 0, width, height);
+            viewBoxClip->appendRect(0, 0, width, height, 0, 0);
 
             // mClipTransform = mUseTransform * mSymbolTransform
             Matrix mClipTransform = mUseTransform;
@@ -807,18 +753,18 @@ static Scene* _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, co
             viewBoxClip->transform(mClipTransform);
 
             auto clippingLayer = Scene::gen();
-            clippingLayer->clip(viewBoxClip);
-            clippingLayer->add(scene);
+            clippingLayer->clip(std::move(viewBoxClip));
+            clippingLayer->push(std::move(scene));
             return clippingLayer;
         }
         return scene;
     }
 
-    if (auto clipper = PAINT(scene)->clipper) {
-        auto& clipTransform = clipper->transform();
+    if (auto clipper = scene->Paint::pImpl->clipper) {
+        auto clipTransform = clipper->transform();
         Matrix inv;
         if (node->transform && inverse(node->transform, &inv)) clipTransform = inv * clipTransform;
-        clipTransform = mUseTransform * clipTransform ;
+        clipper->transform(mUseTransform * clipTransform);
     }
 
     scene->transform(mUseTransform);
@@ -832,11 +778,15 @@ static void _applyTextFill(SvgStyleProperty* style, Text* text, const Box& vBox)
     if (style->fill.paint.none) {
         //Do nothing
     } else if (style->fill.paint.gradient) {
-        auto bBox = style->fill.paint.gradient->userSpace ? vBox : _bounds(text);
+        Box bBox = vBox;
+        if (!style->fill.paint.gradient->userSpace) bBox = _boundingBox(text);
+
         if (style->fill.paint.gradient->type == SvgGradientType::Linear) {
-            text->fill(_applyLinearGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity));
+            auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity);
+            text->fill(std::move(linear));
         } else if (style->fill.paint.gradient->type == SvgGradientType::Radial) {
-            text->fill(_applyRadialGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity));
+            auto radial = _applyRadialGradientProperty(style->fill.paint.gradient, bBox, style->fill.opacity);
+            text->fill(std::move(radial));
         }
     } else if (style->fill.paint.url) {
         //TODO: Apply the color pointed by url
@@ -853,86 +803,31 @@ static void _applyTextFill(SvgStyleProperty* style, Text* text, const Box& vBox)
 }
 
 
-static char* _processText(const char* text, SvgXmlSpace space)
-{
-    if (!text) return nullptr;
-
-    auto len = strlen(text);
-    auto processed = (char*)tvg::malloc(len + 1);
-    auto dst = processed;
-    auto src = text;
-
-    if (space == SvgXmlSpace::Preserve) {
-        while (*src) {
-            if (*src == '\n' || *src == '\t' || *src == '\r') *dst++ = ' ';
-            else *dst++ = *src;
-            src++;
-        }
-        *dst = '\0';
-    } else {
-        auto spaceFound = false;
-        src = svgUtilSkipWhiteSpace(src, nullptr);
-
-        while (*src) {
-            if (isspace((unsigned char)*src)) {
-                if (!spaceFound) {
-                    *dst++ = ' ';
-                    spaceFound = true;
-                }
-            } else {
-                *dst++ = *src;
-                spaceFound = false;
-            }
-            src++;
-        }
-        dst = (char*)svgUtilUnskipWhiteSpace(dst, processed);
-        *dst = '\0';
-    }
-    return processed;
-}
-
-
-static Paint* _textBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath)
+static unique_ptr<Text> _textBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath)
 {
     auto textNode = &node->node.text;
     if (!textNode->text) return nullptr;
-
     auto text = Text::gen();
 
-    Matrix textTransform;
+    Matrix textTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     if (node->transform) textTransform = *node->transform;
-    else textTransform = tvg::identity();
-
-    translateR(&textTransform, {node->node.text.x, node->node.text.y - textNode->fontSize});
+    translateR(&textTransform, node->node.text.x, node->node.text.y - textNode->fontSize);
     text->transform(textTransform);
 
     //TODO: handle def values of font and size as used in a system?
-    auto size = textNode->fontSize * 0.75f; //1 pt = 1/72; 1 in = 96 px; -> 72/96 = 0.75
-    if (text->font(textNode->fontFamily) != Result::Success) {
-        text->font(nullptr);         //fallback to any available font
-    }
-    text->size(size);
+    const float ptPerPx = 0.75f; //1 pt = 1/72; 1 in = 96 px; -> 72/96 = 0.75
+    auto fontSizePt = textNode->fontSize * ptPerPx;
+    if (textNode->fontFamily) text->font(textNode->fontFamily, fontSizePt);
+    text->text(textNode->text);
 
-    // Handle xml:space
-    auto xmlSpace = node->xmlSpace;
-    auto parent = node->parent;
-    while (xmlSpace == SvgXmlSpace::None && parent) {
-        xmlSpace = parent->xmlSpace;
-        parent = parent->parent;
-    }
-    if (xmlSpace == SvgXmlSpace::None) xmlSpace = SvgXmlSpace::Default;
-    auto processedText = _processText(textNode->text, xmlSpace);
-    text->text(processedText);
-    tvg::free(processedText);
+    _applyTextFill(node->style, text.get(), vBox);
+    _applyComposition(loaderData, text.get(), node, vBox, svgPath);
 
-    _applyTextFill(node->style, text, vBox);
-
-    auto p = _applyFilter(loaderData, text, node, vBox, svgPath);
-    return _applyComposition(loaderData, p, node, vBox, svgPath);
+    return text;
 }
 
 
-static Scene* _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth)
+static unique_ptr<Scene> _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite)
 {
     /* Exception handling: Prevent invalid SVG data input.
        The size is the arbitrary value, we need an experimental size. */
@@ -941,63 +836,70 @@ static Scene* _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node,
         return nullptr;
     }
 
-    if (!_isGroupType(node->type) && !mask) return nullptr;
+    if (_isGroupType(node->type) || mask) {
+        auto scene = Scene::gen();
+        // For a Symbol node, the viewBox transformation has to be applied first - see _useBuildHelper()
+        if (!mask && node->transform && node->type != SvgNodeType::Symbol) scene->transform(*node->transform);
 
-    auto scene = Scene::gen();
-    // For a Symbol node, the viewBox transformation has to be applied first - see _useBuildHelper()
-    if (!mask && node->transform && node->type != SvgNodeType::Symbol && node->type != SvgNodeType::Use) {
-        scene->transform(*node->transform);
-    }
-
-    if (!node->style->display || node->style->opacity == 0) return scene;
-
-    ARRAY_FOREACH(p, node->child) {
-        auto child = *p;
-        if (child->type == SvgNodeType::ClipPath || child->type == SvgNodeType::Filter) continue;
-        if (_isGroupType(child->type)) {
-            Paint* paint = nullptr;
-            if (child->type == SvgNodeType::Use)
-                paint = _useBuildHelper(loaderData, child, vBox, svgPath, depth + 1);
-            else if (!(child->type == SvgNodeType::Symbol && node->type != SvgNodeType::Use))
-                paint = _sceneBuildHelper(loaderData, child, vBox, svgPath, false, depth + 1);
-            if (paint) {
-                if (child->id) paint->id = djb2Encode(child->id);
-                scene->add(paint);
-            }
-        } else {
-            Paint* paint = nullptr;
-            if (child->type == SvgNodeType::Image) paint = _imageBuildHelper(loaderData, child, vBox, svgPath);
-            else if (child->type == SvgNodeType::Text) paint = _textBuildHelper(loaderData, child, vBox, svgPath);
-            else if (child->type != SvgNodeType::Mask) paint = _shapeBuildHelper(loaderData, child, vBox, svgPath);
-            if (paint) {
-                if (child->id) paint->id = djb2Encode(child->id);
-                scene->add(paint);
+        if (node->style->display && node->style->opacity != 0) {
+            auto child = node->child.data;
+            for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
+                if (_isGroupType((*child)->type)) {
+                    if ((*child)->type == SvgNodeType::Use)
+                        scene->push(_useBuildHelper(loaderData, *child, vBox, svgPath, depth + 1, isMaskWhite));
+                    else if (!((*child)->type == SvgNodeType::Symbol && node->type != SvgNodeType::Use))
+                        scene->push(_sceneBuildHelper(loaderData, *child, vBox, svgPath, false, depth + 1, isMaskWhite));
+                } else if ((*child)->type == SvgNodeType::Image) {
+                    auto image = _imageBuildHelper(loaderData, *child, vBox, svgPath);
+                    if (image) {
+                        scene->push(std::move(image));
+                        if (isMaskWhite) *isMaskWhite = false;
+                    }
+                } else if ((*child)->type == SvgNodeType::Text) {
+                    auto text = _textBuildHelper(loaderData, *child, vBox, svgPath);
+                    if (text) scene->push(std::move(text));
+                } else if ((*child)->type != SvgNodeType::Mask) {
+                    auto shape = _shapeBuildHelper(loaderData, *child, vBox, svgPath);
+                    if (shape) {
+                        if (isMaskWhite) {
+                            uint8_t r, g, b;
+                            shape->fillColor(&r, &g, &b);
+                            if (shape->fill() || r < 255 || g < 255 || b < 255 || shape->strokeFill() ||
+                                (shape->strokeColor(&r, &g, &b) == Result::Success && (r < 255 || g < 255 || b < 255))) {
+                                *isMaskWhite = false;
+                            }
+                        }
+                        scene->push(std::move(shape));
+                    }
+                }
             }
+            _applyComposition(loaderData, scene.get(), node, vBox, svgPath);
+            scene->opacity(node->style->opacity);
         }
+        return scene;
     }
-    scene->opacity(node->style->opacity);
-
-    auto p = _applyFilter(loaderData, scene, node, vBox, svgPath);
-    return static_cast<Scene*>(_applyComposition(loaderData, p, node, vBox, svgPath));
+    return nullptr;
 }
 
 
-static void _updateInvalidViewSize(Scene* scene, Box& vBox, float& w, float& h, SvgViewFlag viewFlag)
+static void _updateInvalidViewSize(const Scene* scene, Box& vBox, float& w, float& h, SvgViewFlag viewFlag)
 {
-    auto useW = (viewFlag & SvgViewFlag::Width);
-    auto useH = (viewFlag & SvgViewFlag::Height);
-    auto bbox = _bounds(scene);
+    bool validWidth = (viewFlag & SvgViewFlag::Width);
+    bool validHeight = (viewFlag & SvgViewFlag::Height);
 
-    if (!useW && !useH) {
-        vBox = bbox;
+    float x, y;
+    scene->bounds(&x, &y, &vBox.w, &vBox.h, false);
+    if (!validWidth && !validHeight) {
+        vBox.x = x;
+        vBox.y = y;
     } else {
-        vBox.w = useW ? w : bbox.w;
-        vBox.h = useH ? h : bbox.h;
+        if (validWidth) vBox.w = w;
+        if (validHeight) vBox.h = h;
     }
 
     //the size would have 1x1 or percentage values.
-    if (!useW) w *= vBox.w;
-    if (!useH) h *= vBox.h;
+    if (!validWidth) w *= vBox.w;
+    if (!validHeight) h *= vBox.h;
 }
 
 
@@ -1013,8 +915,8 @@ static void _loadFonts(Array<FontFace>& fonts)
         {"data:application/font-ttf;base64,", sizeof("data:application/font-ttf;base64,") - 1}
     };
 
-
-    ARRAY_FOREACH(p, fonts) {
+    for (uint32_t i = 0; i < fonts.count; ++i) {
+        auto p = &fonts[i];
         if (!p->name) continue;
 
         size_t shift = 0;
@@ -1049,7 +951,7 @@ Scene* svgSceneBuild(SvgLoaderData& loaderData, Box vBox, float w, float h, Aspe
 
     auto docNode = _sceneBuildHelper(loaderData, loaderData.doc, vBox, svgPath, false, 0);
 
-    if (!(viewFlag & SvgViewFlag::Viewbox)) _updateInvalidViewSize(docNode, vBox, w, h, viewFlag);
+    if (!(viewFlag & SvgViewFlag::Viewbox)) _updateInvalidViewSize(docNode.get(), vBox, w, h, viewFlag);
 
     if (!tvg::equal(w, vBox.w) || !tvg::equal(h, vBox.h)) {
         Matrix m = _calculateAspectRatioMatrix(align, meetOrSlice, w, h, vBox);
@@ -1061,16 +963,19 @@ Scene* svgSceneBuild(SvgLoaderData& loaderData, Box vBox, float w, float h, Aspe
     auto viewBoxClip = Shape::gen();
     viewBoxClip->appendRect(0, 0, w, h);
 
-    auto clippingLayer = Scene::gen();
-    clippingLayer->clip(viewBoxClip);
-    clippingLayer->add(docNode);
+    auto compositeLayer = Scene::gen();
+    compositeLayer->clip(std::move(viewBoxClip));
+    compositeLayer->push(std::move(docNode));
 
-    loaderData.doc->node.doc.vbox = vBox;
+    auto root = Scene::gen();
+    root->push(std::move(compositeLayer));
+
+    loaderData.doc->node.doc.vx = vBox.x;
+    loaderData.doc->node.doc.vy = vBox.y;
+    loaderData.doc->node.doc.vw = vBox.w;
+    loaderData.doc->node.doc.vh = vBox.h;
     loaderData.doc->node.doc.w = w;
     loaderData.doc->node.doc.h = h;
 
-    auto root = Scene::gen();
-    root->add(clippingLayer);
-
-    return root;
+    return root.release();
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.h
index 17d08a14..0663a37f 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
index 6540c553..45fdc9cf 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,8 @@
  * SOFTWARE.
  */
 
-#include "tvgStr.h"
+#include <cstdlib>
+#include <cstring>
 #include "tvgSvgUtil.h"
 
 /************************************************************************/
@@ -39,40 +40,6 @@ static uint8_t _hexCharToDec(const char c)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-void svgUtilReplace(char** dst, const char* src)
-{
-    if (!src) return;
-    tvg::free(*dst);
-    *dst = tvg::duplicate(src);
-}
-
-const char* svgUtilSkipWhiteSpace(const char* itr, const char* itrEnd)
-{
-    while ((itrEnd && itr < itrEnd) || (!itrEnd && *itr != '\0')) {
-        if (!isspace((unsigned char)*itr)) break;
-        itr++;
-    }
-    return itr;
-}
-
-
-const char* svgUtilUnskipWhiteSpace(const char* itr, const char* itrStart)
-{
-    for (itr--; itr > itrStart; itr--) {
-        if (!isspace((unsigned char)*itr)) break;
-    }
-    return itr + 1;
-}
-
-
-const char* svgUtilSkipWhiteSpaceAndComma(const char* content)
-{
-    content = svgUtilSkipWhiteSpace(content, nullptr);
-    if (*content == ',') return content + 1;
-    return content;
-}
-
-
 size_t svgUtilURLDecode(const char *src, char** dst)
 {
     if (!src) return 0;
@@ -80,7 +47,7 @@ size_t svgUtilURLDecode(const char *src, char** dst)
     auto length = strlen(src);
     if (length == 0) return 0;
 
-    char* decoded = tvg::malloc<char>(sizeof(char) * length + 1);
+    char* decoded = (char*)malloc(sizeof(char) * length + 1);
 
     char a, b;
     int idx =0;
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h
index 4cd1de35..220a4b3e 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,6 @@
 
 #include "tvgCommon.h"
 
-void svgUtilReplace(char** dst, const char* src);
-const char* svgUtilSkipWhiteSpace(const char* itr, const char* itrEnd);
-const char* svgUtilUnskipWhiteSpace(const char* itr, const char* itrStart);
-const char* svgUtilSkipWhiteSpaceAndComma(const char* content);
 size_t svgUtilURLDecode(const char *src, char** dst);
 
 #endif //_TVG_SVG_UTIL_H_
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
index f67aa0f8..4c0a0f53 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,26 @@
  * SOFTWARE.
  */
 
+#include <cstring>
 #include <ctype.h>
-#include "tvgStr.h"
-#include "tvgXmlParser.h"
-#include "tvgSvgUtil.h"
+#include <string>
 
+#ifdef _WIN32
+    #include <malloc.h>
+#elif defined(__linux__) || defined(__ZEPHYR__)
+    #include <alloca.h>
+#else
+    #include <stdlib.h>
+#endif
+
+#include "tvgXmlParser.h"
+#include "tvgStr.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-bool _unsupported(TVG_UNUSED const char* tagAttribute, TVG_UNUSED const char* tagValue)
+bool _isIgnoreUnsupportedLogAttributes(TVG_UNUSED const char* tagAttribute, TVG_UNUSED const char* tagValue)
 {
 #ifdef THORVG_LOG_ENABLED
     const auto attributesNum = 6;
@@ -49,18 +58,22 @@ bool _unsupported(TVG_UNUSED const char* tagAttribute, TVG_UNUSED const char* ta
     };
 
     for (unsigned int i = 0; i < attributesNum; ++i) {
-        if (tvg::equal(tagAttribute, attributes[i].tag)) {
-            if (!attributes[i].value) return false;
-            if (tvg::equal(tagValue, attributes[i].value)) return false;
+        if (!strncmp(tagAttribute, attributes[i].tag, attributes[i].tagWildcard ? strlen(attributes[i].tag) : strlen(tagAttribute))) {
+            if (attributes[i].value && tagValue) {
+                if (!strncmp(tagValue, attributes[i].value, strlen(tagValue))) {
+                    return true;
+                } else continue;
+            }
+            return true;
         }
     }
-    return true;
-#endif
     return false;
+#endif
+    return true;
 }
 
 
-static const char* _xmlFindWhiteSpace(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindWhiteSpace(const char* itr, const char* itrEnd)
 {
     for (; itr < itrEnd; itr++) {
         if (isspace((unsigned char)*itr)) break;
@@ -69,7 +82,25 @@ static const char* _xmlFindWhiteSpace(const char* itr, const char* itrEnd)
 }
 
 
-static const char* _xmlSkipXmlEntities(const char* itr, const char* itrEnd)
+static const char* _simpleXmlSkipWhiteSpace(const char* itr, const char* itrEnd)
+{
+    for (; itr < itrEnd; itr++) {
+        if (!isspace((unsigned char)*itr)) break;
+    }
+    return itr;
+}
+
+
+static const char* _simpleXmlUnskipWhiteSpace(const char* itr, const char* itrStart)
+{
+    for (itr--; itr > itrStart; itr--) {
+        if (!isspace((unsigned char)*itr)) break;
+    }
+    return itr + 1;
+}
+
+
+static const char* _simpleXmlSkipXmlEntities(const char* itr, const char* itrEnd)
 {
     auto p = itr;
     while (itr < itrEnd && *itr == '&') {
@@ -86,7 +117,7 @@ static const char* _xmlSkipXmlEntities(const char* itr, const char* itrEnd)
 }
 
 
-static const char* _xmlUnskipXmlEntities(const char* itr, const char* itrStart)
+static const char* _simpleXmlUnskipXmlEntities(const char* itr, const char* itrStart)
 {
     auto p = itr;
     while (itr > itrStart && *(itr - 1) == ';') {
@@ -106,12 +137,12 @@ static const char* _xmlUnskipXmlEntities(const char* itr, const char* itrStart)
 
 static const char* _skipWhiteSpacesAndXmlEntities(const char* itr, const char* itrEnd)
 {
-    itr = svgUtilSkipWhiteSpace(itr, itrEnd);
+    itr = _simpleXmlSkipWhiteSpace(itr, itrEnd);
     auto p = itr;
     while (true) {
-        if (p != (itr = _xmlSkipXmlEntities(itr, itrEnd))) p = itr;
+        if (p != (itr = _simpleXmlSkipXmlEntities(itr, itrEnd))) p = itr;
         else break;
-        if (p != (itr = svgUtilSkipWhiteSpace(itr, itrEnd))) p = itr;
+        if (p != (itr = _simpleXmlSkipWhiteSpace(itr, itrEnd))) p = itr;
         else break;
     }
     return itr;
@@ -120,25 +151,25 @@ static const char* _skipWhiteSpacesAndXmlEntities(const char* itr, const char* i
 
 static const char* _unskipWhiteSpacesAndXmlEntities(const char* itr, const char* itrStart)
 {
-    itr = svgUtilUnskipWhiteSpace(itr, itrStart);
+    itr = _simpleXmlUnskipWhiteSpace(itr, itrStart);
     auto p = itr;
     while (true) {
-        if (p != (itr = _xmlUnskipXmlEntities(itr, itrStart))) p = itr;
+        if (p != (itr = _simpleXmlUnskipXmlEntities(itr, itrStart))) p = itr;
         else break;
-        if (p != (itr = svgUtilUnskipWhiteSpace(itr, itrStart))) p = itr;
+        if (p != (itr = _simpleXmlUnskipWhiteSpace(itr, itrStart))) p = itr;
         else break;
     }
     return itr;
 }
 
 
-static const char* _xmlFindStartTag(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindStartTag(const char* itr, const char* itrEnd)
 {
     return (const char*)memchr(itr, '<', itrEnd - itr);
 }
 
 
-static const char* _xmlFindEndTag(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindEndTag(const char* itr, const char* itrEnd)
 {
     bool insideQuote[2] = {false, false}; // 0: ", 1: '
     for (; itr < itrEnd; itr++) {
@@ -153,7 +184,7 @@ static const char* _xmlFindEndTag(const char* itr, const char* itrEnd)
 }
 
 
-static const char* _xmlFindEndCommentTag(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindEndCommentTag(const char* itr, const char* itrEnd)
 {
     for (; itr < itrEnd; itr++) {
         if ((*itr == '-') && ((itr + 1 < itrEnd) && (*(itr + 1) == '-')) && ((itr + 2 < itrEnd) && (*(itr + 2) == '>'))) return itr + 2;
@@ -162,7 +193,7 @@ static const char* _xmlFindEndCommentTag(const char* itr, const char* itrEnd)
 }
 
 
-static const char* _xmlFindEndCdataTag(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindEndCdataTag(const char* itr, const char* itrEnd)
 {
     for (; itr < itrEnd; itr++) {
         if ((*itr == ']') && ((itr + 1 < itrEnd) && (*(itr + 1) == ']')) && ((itr + 2 < itrEnd) && (*(itr + 2) == '>'))) return itr + 2;
@@ -171,7 +202,7 @@ static const char* _xmlFindEndCdataTag(const char* itr, const char* itrEnd)
 }
 
 
-static const char* _xmlFindDoctypeChildEndTag(const char* itr, const char* itrEnd)
+static const char* _simpleXmlFindDoctypeChildEndTag(const char* itr, const char* itrEnd)
 {
     for (; itr < itrEnd; itr++) {
         if (*itr == '>') return itr;
@@ -180,32 +211,32 @@ static const char* _xmlFindDoctypeChildEndTag(const char* itr, const char* itrEn
 }
 
 
-static XMLType _getXMLType(const char* itr, const char* itrEnd, size_t &toff)
+static SimpleXMLType _getXMLType(const char* itr, const char* itrEnd, size_t &toff)
 {
     toff = 0;
     if (itr[1] == '/') {
         toff = 1;
-        return XMLType::Close;
+        return SimpleXMLType::Close;
     } else if (itr[1] == '?') {
         toff = 1;
-        return XMLType::Processing;
+        return SimpleXMLType::Processing;
     } else if (itr[1] == '!') {
         if ((itr + sizeof("<!DOCTYPE>") - 1 < itrEnd) && (!memcmp(itr + 2, "DOCTYPE", sizeof("DOCTYPE") - 1)) && ((itr[2 + sizeof("DOCTYPE") - 1] == '>') || (isspace((unsigned char)itr[2 + sizeof("DOCTYPE") - 1])))) {
             toff = sizeof("!DOCTYPE") - 1;
-            return XMLType::Doctype;
+            return SimpleXMLType::Doctype;
         } else if ((itr + sizeof("<![CDATA[]]>") - 1 < itrEnd) && (!memcmp(itr + 2, "[CDATA[", sizeof("[CDATA[") - 1))) {
             toff = sizeof("![CDATA[") - 1;
-            return XMLType::CData;
+            return SimpleXMLType::CData;
         } else if ((itr + sizeof("<!---->") - 1 < itrEnd) && (!memcmp(itr + 2, "--", sizeof("--") - 1))) {
             toff = sizeof("!--") - 1;
-            return XMLType::Comment;
+            return SimpleXMLType::Comment;
         } else if (itr + sizeof("<!>") - 1 < itrEnd) {
             toff = sizeof("!") - 1;
-            return XMLType::DoctypeChild;
+            return SimpleXMLType::DoctypeChild;
         }
-        return XMLType::Open;
+        return SimpleXMLType::Open;
     }
-    return XMLType::Open;
+    return SimpleXMLType::Open;
 }
 
 
@@ -213,7 +244,7 @@ static XMLType _getXMLType(const char* itr, const char* itrEnd, size_t &toff)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-const char* xmlNodeTypeToString(TVG_UNUSED SvgNodeType type)
+const char* simpleXmlNodeTypeToString(TVG_UNUSED SvgNodeType type)
 {
 #ifdef THORVG_LOG_ENABLED
     static const char* TYPE_NAMES[] = {
@@ -238,8 +269,6 @@ const char* xmlNodeTypeToString(TVG_UNUSED SvgNodeType type)
         "ClipPath",
         "Mask",
         "Symbol",
-        "Filter",
-        "GaussianBlur",
         "Unknown",
     };
     return TYPE_NAMES[(int) type];
@@ -266,10 +295,10 @@ bool isIgnoreUnsupportedLogElements(TVG_UNUSED const char* tagName)
 }
 
 
-bool xmlParseAttributes(const char* buf, unsigned bufLength, xmlAttributeCb func, const void* data)
+bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data)
 {
     const char *itr = buf, *itrEnd = buf + bufLength;
-    char* tmpBuf = tvg::malloc<char>(bufLength + 1);
+    char* tmpBuf = (char*)malloc(bufLength + 1);
 
     if (!buf || !func || !tmpBuf) goto error;
 
@@ -296,7 +325,7 @@ bool xmlParseAttributes(const char* buf, unsigned bufLength, xmlAttributeCb func
             if (!value) goto error;
             value++;
         }
-        keyEnd = _xmlUnskipXmlEntities(keyEnd, key);
+        keyEnd = _simpleXmlUnskipXmlEntities(keyEnd, key);
 
         value = _skipWhiteSpacesAndXmlEntities(value, itrEnd);
         if (value == itrEnd) goto error;
@@ -306,7 +335,7 @@ bool xmlParseAttributes(const char* buf, unsigned bufLength, xmlAttributeCb func
             if (!valueEnd) goto error;
             value++;
         } else {
-            valueEnd = _xmlFindWhiteSpace(value, itrEnd);
+            valueEnd = _simpleXmlFindWhiteSpace(value, itrEnd);
         }
 
         itr = valueEnd + 1;
@@ -320,72 +349,74 @@ bool xmlParseAttributes(const char* buf, unsigned bufLength, xmlAttributeCb func
         tval = tmpBuf + (keyEnd - key) + 1;
         int i = 0;
         while (value < valueEnd) {
-            value = _xmlSkipXmlEntities(value, valueEnd);
+            value = _simpleXmlSkipXmlEntities(value, valueEnd);
             tval[i++] = *value;
             value++;
         }
         tval[i] = '\0';
 
         if (!func((void*)data, tmpBuf, tval)) {
-            if (_unsupported(tmpBuf, tval)) {
-                TVGLOG("SVG", "Unsupported attributes used [Elements type: %s][Id : %s][Attribute: %s][Value: %s]", xmlNodeTypeToString(((SvgLoaderData*)data)->svgParse->node->type), ((SvgLoaderData*)data)->svgParse->node->id ? ((SvgLoaderData*)data)->svgParse->node->id : "NO_ID", tmpBuf, tval ? tval : "NONE");
+            if (!_isIgnoreUnsupportedLogAttributes(tmpBuf, tval)) {
+                TVGLOG("SVG", "Unsupported attributes used [Elements type: %s][Id : %s][Attribute: %s][Value: %s]", simpleXmlNodeTypeToString(((SvgLoaderData*)data)->svgParse->node->type), ((SvgLoaderData*)data)->svgParse->node->id ? ((SvgLoaderData*)data)->svgParse->node->id : "NO_ID", tmpBuf, tval ? tval : "NONE");
             }
         }
     }
 
 success:
-    tvg::free(tmpBuf);
+    free(tmpBuf);
     return true;
 
 error:
-    tvg::free(tmpBuf);
+    free(tmpBuf);
     return false;
 }
 
 
-bool xmlParse(const char* buf, unsigned bufLength, bool strip, xmlCb func, const void* data)
+bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb func, const void* data)
 {
     const char *itr = buf, *itrEnd = buf + bufLength;
 
+    if (!buf || !func) return false;
+
     while (itr < itrEnd) {
         if (itr[0] == '<') {
             //Invalid case
             if (itr + 1 >= itrEnd) return false;
 
             size_t toff = 0;
-            XMLType type = _getXMLType(itr, itrEnd, toff);
+            SimpleXMLType type = _getXMLType(itr, itrEnd, toff);
 
             const char* p;
-            if (type == XMLType::CData) p = _xmlFindEndCdataTag(itr + 1 + toff, itrEnd);
-            else if (type == XMLType::DoctypeChild) p = _xmlFindDoctypeChildEndTag(itr + 1 + toff, itrEnd);
-            else if (type == XMLType::Comment) p = _xmlFindEndCommentTag(itr + 1 + toff, itrEnd);
-            else p = _xmlFindEndTag(itr + 1 + toff, itrEnd);
+            if (type == SimpleXMLType::CData) p = _simpleXmlFindEndCdataTag(itr + 1 + toff, itrEnd);
+            else if (type == SimpleXMLType::DoctypeChild) p = _simpleXmlFindDoctypeChildEndTag(itr + 1 + toff, itrEnd);
+            else if (type == SimpleXMLType::Comment) p = _simpleXmlFindEndCommentTag(itr + 1 + toff, itrEnd);
+            else p = _simpleXmlFindEndTag(itr + 1 + toff, itrEnd);
 
             if (p) {
                 //Invalid case: '<' nested
-                if (*p == '<' && type != XMLType::Doctype) return false;
+                if (*p == '<' && type != SimpleXMLType::Doctype) return false;
                 const char *start, *end;
 
                 start = itr + 1 + toff;
                 end = p;
 
                 switch (type) {
-                    case XMLType::Open: {
+                    case SimpleXMLType::Open: {
                         if (p[-1] == '/') {
-                            type = XMLType::OpenEmpty;
+                            type = SimpleXMLType::OpenEmpty;
                             end--;
                         }
                         break;
                     }
-                    case XMLType::CData: {
+                    case SimpleXMLType::CData: {
                         if (!memcmp(p - 2, "]]", 2)) end -= 2;
                         break;
                     }
-                    case XMLType::Processing: {
+                    case SimpleXMLType::Processing: {
                         if (p[-1] == '?') end--;
                         break;
                     }
-                    case XMLType::Comment: {
+                    case SimpleXMLType::Comment: {
                         if (!memcmp(p - 2, "--", 2)) end -= 2;
                         break;
                     }
@@ -394,7 +425,7 @@ bool xmlParse(const char* buf, unsigned bufLength, bool strip, xmlCb func, const
                     }
                 }
 
-                if (strip && (type != XMLType::CData)) {
+                if (strip && (type != SimpleXMLType::CData)) {
                     start = _skipWhiteSpacesAndXmlEntities(start, end);
                     end = _unskipWhiteSpacesAndXmlEntities(end, start);
                 }
@@ -408,24 +439,24 @@ bool xmlParse(const char* buf, unsigned bufLength, bool strip, xmlCb func, const
         } else {
             const char *p, *end;
 
-            if (strip && ((SvgLoaderData*)data)->openedTag != OpenedTagType::Text) {
+            if (strip) {
                 p = itr;
                 p = _skipWhiteSpacesAndXmlEntities(p, itrEnd);
                 if (p) {
-                    if (!func((void*)data, XMLType::Ignored, itr, (unsigned int)(p - itr))) return false;
+                    if (!func((void*)data, SimpleXMLType::Ignored, itr, (unsigned int)(p - itr))) return false;
                     itr = p;
                 }
             }
 
-            p = _xmlFindStartTag(itr, itrEnd);
+            p = _simpleXmlFindStartTag(itr, itrEnd);
             if (!p) p = itrEnd;
 
             end = p;
-            if (strip && ((SvgLoaderData*)data)->openedTag != OpenedTagType::Text) end = _unskipWhiteSpacesAndXmlEntities(end, itr);
+            if (strip) end = _unskipWhiteSpacesAndXmlEntities(end, itr);
 
-            if (itr != end && !func((void*)data, XMLType::Data, itr, (unsigned int)(end - itr))) return false;
+            if (itr != end && !func((void*)data, SimpleXMLType::Data, itr, (unsigned int)(end - itr))) return false;
 
-            if (strip && (end < p) && !func((void*)data, XMLType::Ignored, end, (unsigned int)(p - end))) return false;
+            if (strip && (end < p) && !func((void*)data, SimpleXMLType::Ignored, end, (unsigned int)(p - end))) return false;
 
             itr = p;
         }
@@ -434,30 +465,43 @@ bool xmlParse(const char* buf, unsigned bufLength, bool strip, xmlCb func, const
 }
 
 
-bool xmlParseW3CAttribute(const char* buf, unsigned bufLength, xmlAttributeCb func, const void* data)
+bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data)
 {
+    const char* end;
+    char* key;
+    char* val;
+    char* next;
+
     if (!buf) return false;
 
-    const auto end = buf + bufLength;
+    end = buf + bufLength;
+
     if (buf == end) return true;
 
-    auto kmem = tvg::malloc<char>(end - buf + 1);
-    auto vmem = tvg::malloc<char>(end - buf + 1);
-    auto key = kmem;
-    auto val = vmem;
+    char* key_buf = (char*)malloc(end - buf + 1);
+    char* val_buf = (char*)malloc(end - buf + 1);
 
+    key = key_buf;
+    val = val_buf;
     do {
-        auto sep = (char*)strchr(buf, ':');
-        auto next = (char*)strchr(buf, ';');
+        char* sep = (char*)strchr(buf, ':');
+        next = (char*)strchr(buf, ';');
 
         if (auto src = strstr(buf, "src")) {//src tag from css font-face contains extra semicolon
             if (src < sep) {
                 if (next + 1 < end) next = (char*)strchr(next + 1, ';');
-                else break;
+                else {
+                    free(key_buf);
+                    free(val_buf);
+                    return true;
+                }
             }
         }
 
-        if (sep >= end) next = sep = nullptr;
+        if (sep >= end) {
+            next = nullptr;
+            sep = nullptr;
+        }
         if (next >= end) next = nullptr;
 
         key[0] = '\0';
@@ -479,24 +523,26 @@ bool xmlParseW3CAttribute(const char* buf, unsigned bufLength, xmlAttributeCb fu
             memcpy(key, buf, next - buf);
             key[next - buf] = '\0';
         }
+
         if (key[0]) {
-            key = const_cast<char*>(svgUtilSkipWhiteSpace(key, key + strlen(key)));
-            key[svgUtilUnskipWhiteSpace(key + strlen(key) , key) - key] = '\0';
-            val = const_cast<char*>(svgUtilSkipWhiteSpace(val, val + strlen(val)));
-            val[svgUtilUnskipWhiteSpace(val + strlen(val) , val) - val] = '\0';
+            key = const_cast<char*>(_simpleXmlSkipWhiteSpace(key, key + strlen(key)));
+            key[_simpleXmlUnskipWhiteSpace(key + strlen(key) , key) - key] = '\0';
+            val = const_cast<char*>(_simpleXmlSkipWhiteSpace(val, val + strlen(val)));
+            val[_simpleXmlUnskipWhiteSpace(val + strlen(val) , val) - val] = '\0';
 
             if (!func((void*)data, key, val)) {
-                if (!_unsupported(key, val)) {
-                    TVGLOG("SVG", "Unsupported attributes used [Elements type: %s][Id : %s][Attribute: %s][Value: %s]", xmlNodeTypeToString(((SvgLoaderData*)data)->svgParse->node->type), ((SvgLoaderData*)data)->svgParse->node->id ? ((SvgLoaderData*)data)->svgParse->node->id : "NO_ID", key, val ? val : "NONE");
+                if (!_isIgnoreUnsupportedLogAttributes(key, val)) {
+                    TVGLOG("SVG", "Unsupported attributes used [Elements type: %s][Id : %s][Attribute: %s][Value: %s]", simpleXmlNodeTypeToString(((SvgLoaderData*)data)->svgParse->node->type), ((SvgLoaderData*)data)->svgParse->node->id ? ((SvgLoaderData*)data)->svgParse->node->id : "NO_ID", key, val ? val : "NONE");
                 }
             }
         }
+
         if (!next) break;
         buf = next + 1;
     } while (true);
 
-    tvg::free(kmem);
-    tvg::free(vmem);
+    free(key_buf);
+    free(val_buf);
 
     return true;
 }
@@ -506,14 +552,14 @@ bool xmlParseW3CAttribute(const char* buf, unsigned bufLength, xmlAttributeCb fu
  * Supported formats:
  * tag {}, .name {}, tag.name{}
  */
-const char* xmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength)
+const char* simpleXmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength)
 {
     if (!buf) return nullptr;
 
     *tag = *name = nullptr;
     *attrsLength = 0;
 
-    auto itr = svgUtilSkipWhiteSpace(buf, buf + bufLength);
+    auto itr = _simpleXmlSkipWhiteSpace(buf, buf + bufLength);
     auto itrEnd = (const char*)memchr(buf, '{', bufLength);
 
     if (!itrEnd || itr == itrEnd) return nullptr;
@@ -526,24 +572,24 @@ const char* xmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag
 
     const char *p;
 
-    itrEnd = svgUtilUnskipWhiteSpace(itrEnd, itr);
+    itrEnd = _simpleXmlUnskipWhiteSpace(itrEnd, itr);
     if (*(itrEnd - 1) == '.') return nullptr;
 
     for (p = itr; p < itrEnd; p++) {
         if (*p == '.') break;
     }
 
-    if (p == itr) *tag = duplicate("all");
-    else *tag = duplicate(itr, p - itr);
+    if (p == itr) *tag = strdup("all");
+    else *tag = strDuplicate(itr, p - itr);
 
     if (p == itrEnd) *name = nullptr;
-    else *name = duplicate(p + 1, itrEnd - p - 1);
+    else *name = strDuplicate(p + 1, itrEnd - p - 1);
 
     return (nextElement ? nextElement + 1 : nullptr);
 }
 
 
-const char* xmlFindAttributesTag(const char* buf, unsigned bufLength)
+const char* simpleXmlFindAttributesTag(const char* buf, unsigned bufLength)
 {
     const char *itr = buf, *itrEnd = buf + bufLength;
 
@@ -552,7 +598,7 @@ const char* xmlFindAttributesTag(const char* buf, unsigned bufLength)
             //User skip tagname and already gave it the attributes.
             if (*itr == '=') return buf;
         } else {
-            itr = _xmlUnskipXmlEntities(itr, buf);
+            itr = _simpleXmlUnskipXmlEntities(itr, buf);
             if (itr == itrEnd) return nullptr;
             return itr;
         }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.h
index c85431be..4151fbcd 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#ifndef _TVG_XML_PARSER_H_
-#define _TVG_XML_PARSER_H_
+#ifndef _TVG_SIMPLE_XML_PARSER_H_
+#define _TVG_SIMPLE_XML_PARSER_H_
 
 #include "tvgSvgLoaderCommon.h"
 
@@ -29,7 +29,7 @@
 const char* const xmlEntity[] = {"&#10;", "&quot;", "&nbsp;", "&apos;", "&amp;", "&lt;", "&gt;", "&#035;", "&#039;"};
 const int xmlEntityLength[] = {5, 6, 6, 6, 5, 4, 4, 6, 6};
 
-enum class XMLType
+enum class SimpleXMLType
 {
     Open = 0,     //!< \<tag attribute="value"\>
     OpenEmpty,    //!< \<tag attribute="value" /\>
@@ -44,15 +44,15 @@ enum class XMLType
     DoctypeChild  //!< \<!doctype_child
 };
 
-typedef bool (*xmlCb)(void* data, XMLType type, const char* content, unsigned int length);
-typedef bool (*xmlAttributeCb)(void* data, const char* key, const char* value);
+typedef bool (*simpleXMLCb)(void* data, SimpleXMLType type, const char* content, unsigned int length);
+typedef bool (*simpleXMLAttributeCb)(void* data, const char* key, const char* value);
 
-bool xmlParseAttributes(const char* buf, unsigned bufLength, xmlAttributeCb func, const void* data);
-bool xmlParse(const char* buf, unsigned bufLength, bool strip, xmlCb func, const void* data);
-bool xmlParseW3CAttribute(const char* buf, unsigned bufLength, xmlAttributeCb func, const void* data);
-const char* xmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength);
-const char* xmlFindAttributesTag(const char* buf, unsigned bufLength);
+bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data);
+bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb func, const void* data);
+bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data);
+const char* simpleXmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength);
+const char* simpleXmlFindAttributesTag(const char* buf, unsigned bufLength);
 bool isIgnoreUnsupportedLogElements(const char* tagName);
-const char* xmlNodeTypeToString(SvgNodeType type);
+const char* simpleXmlNodeTypeToString(SvgNodeType type);
 
-#endif //_TVG_XML_PARSER_H_
+#endif //_TVG_SIMPLE_XML_PARSER_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
index 0875c40b..184c0484 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,8 @@
 #ifndef _TVG_SW_COMMON_H_
 #define _TVG_SW_COMMON_H_
 
-#include <algorithm>
 #include "tvgCommon.h"
 #include "tvgMath.h"
-#include "tvgColor.h"
 #include "tvgRender.h"
 
 #define SW_CURVE_TYPE_POINT 0
@@ -34,23 +32,20 @@
 #define SW_ANGLE_PI (180L << 16)
 #define SW_ANGLE_2PI (SW_ANGLE_PI << 1)
 #define SW_ANGLE_PI2 (SW_ANGLE_PI >> 1)
+
+using SwCoord = signed long;
+using SwFixed = signed long long;
 #define SW_COLOR_TABLE 1024
 
-static inline float TO_FLOAT(int32_t val)
+
+static inline float TO_FLOAT(SwCoord val)
 {
     return static_cast<float>(val) / 64.0f;
 }
 
 struct SwPoint
 {
-    int32_t x, y;
-
-    SwPoint& operator-=(const SwPoint& rhs)
-    {
-        x -= rhs.x;
-        y -= rhs.y;
-        return *this;
-    }
+    SwCoord x, y;
 
     SwPoint& operator+=(const SwPoint& rhs)
     {
@@ -85,7 +80,7 @@ struct SwPoint
         else return false;
     }
 
-    bool tiny() const
+    bool small() const
     {
         //2 is epsilon...
         if (abs(x) < 2 && abs(y) < 2) return true;
@@ -100,7 +95,7 @@ struct SwPoint
 
 struct SwSize
 {
-    int32_t w, h;
+    SwCoord w, h;
 };
 
 struct SwOutline
@@ -117,49 +112,26 @@ struct SwSpan
     uint16_t x, y;
     uint16_t len;
     uint8_t coverage;
-
-    bool fetch(const RenderRegion& bbox, int32_t& x, int32_t& len) const
-    {
-        x = std::max((int32_t)this->x, bbox.min.x);
-        len = std::min((int32_t)(this->x + this->len), bbox.max.x) - x;
-        return (len > 0) ? true : false;
-    }
 };
 
 struct SwRle
 {
-    Array<SwSpan> spans;
+    SwSpan *spans;
+    uint32_t alloc;
+    uint32_t size;
+};
 
-    const SwSpan* fetch(const RenderRegion& bbox, const SwSpan** end) const
+struct SwBBox
+{
+    SwPoint min, max;
+
+    void reset()
     {
-        return fetch(bbox.min.y, bbox.max.y - 1, end);
+        min.x = min.y = max.x = max.y = 0;
     }
 
-    const SwSpan* fetch(int32_t min, uint32_t max, const SwSpan** end) const
-    {
-        const SwSpan* begin;
-
-        if (min <= spans.first().y) {
-            begin = spans.begin();
-        } else {
-            auto comp = [](const SwSpan& span, int y) { return span.y < y; };
-            begin = lower_bound(spans.begin(), spans.end(), min, comp);
-        }
-        if (end) {
-            if (max >= spans.last().y) {
-                *end = spans.end();
-            } else {
-                auto comp = [](int y, const SwSpan& span) { return y < span.y; };
-                *end = upper_bound(spans.begin(), spans.end(), max, comp);
-            }
-        }
-        return begin;
-    }
-
-    bool invalid() const { return spans.empty(); }
-    bool valid() const { return !invalid(); }
-    uint32_t size() const { return spans.count; }
-    SwSpan* data() const { return spans.data; }
+    int32_t w() const { return max.x - min.x; }
+    int32_t h() const { return max.y - min.y; }
 };
 
 using Area = long;
@@ -201,34 +173,35 @@ struct SwFill
 
 struct SwStrokeBorder
 {
-    Array<SwPoint> pts;
-    uint8_t* tags = nullptr;
-    int32_t start = 0;        //index of current sub-path start point
-    bool movable = false;      //true: for ends of lineto borders
-
-    ~SwStrokeBorder()
-    {
-        tvg::free(tags);
-    }
+    uint32_t ptsCnt;
+    uint32_t maxPts;
+    SwPoint* pts;
+    uint8_t* tags;
+    int32_t start;     //index of current sub-path start point
+    bool movable;      //true: for ends of lineto borders
 };
 
 struct SwStroke
 {
-    int64_t angleIn;
-    int64_t angleOut;
+    SwFixed angleIn;
+    SwFixed angleOut;
     SwPoint center;
-    int64_t lineLength;
-    int64_t subPathAngle;
+    SwFixed lineLength;
+    SwFixed subPathAngle;
     SwPoint ptStartSubPath;
-    int64_t subPathLineLength;
-    int64_t width;
-    int64_t miterlimit;
-    SwFill* fill = nullptr;
-    SwStrokeBorder* borders[2];
-    float sx, sy;
+    SwFixed subPathLineLength;
+    SwFixed width;
+    SwFixed miterlimit;
+
     StrokeCap cap;
     StrokeJoin join;
     StrokeJoin joinSaved;
+    SwFill* fill = nullptr;
+
+    SwStrokeBorder borders[2];
+
+    float sx, sy;
+
     bool firstPt;
     bool closedSubPath;
     bool handleWideStrokes;
@@ -249,13 +222,14 @@ struct SwDashStroke
 
 struct SwShape
 {
-    SwOutline* outline = nullptr;
-    SwStroke* stroke = nullptr;
-    SwFill* fill = nullptr;
-    SwRle* rle = nullptr;
-    SwRle* strokeRle = nullptr;
-    RenderRegion bbox;        //Keep it boundary without stroke region. Using for optimal filling.
-    bool fastTrack = false;   //Fast Track: axis-aligned rectangle without any clips?
+    SwOutline*   outline = nullptr;
+    SwStroke*    stroke = nullptr;
+    SwFill*      fill = nullptr;
+    SwRle*   rle = nullptr;
+    SwRle*   strokeRle = nullptr;
+    SwBBox       bbox;           //Keep it boundary without stroke region. Using for optimal filling.
+
+    bool         fastTrack = false;   //Fast Track: axis-aligned rectangle without any clips?
 };
 
 struct SwImage
@@ -271,16 +245,14 @@ struct SwImage
     int32_t      ox = 0;         //offset x
     int32_t      oy = 0;         //offset y
     float        scale;
-
     uint8_t      channelSize;
-    FilterMethod filter;
+
     bool         direct = false;  //draw image directly (with offset)
     bool         scaled = false;  //draw scaled image
 };
 
 typedef uint8_t(*SwMask)(uint8_t s, uint8_t d, uint8_t a);                  //src, dst, alpha
-typedef uint32_t(*SwBlender)(uint32_t s, uint32_t d);                       //src, dst
-typedef uint32_t(*SwBlenderA)(uint32_t s, uint32_t d, uint8_t a);           //src, dst, alpha
+typedef uint32_t(*SwBlender)(uint32_t s, uint32_t d, uint8_t a);            //src, dst, alpha
 typedef uint32_t(*SwJoin)(uint8_t r, uint8_t g, uint8_t b, uint8_t a);      //color channel join
 typedef uint8_t(*SwAlpha)(uint8_t*);                                        //blending alpha
 
@@ -294,9 +266,9 @@ struct SwSurface : RenderSurface
     SwCompositor* compositor = nullptr;   //compositor (optional)
     BlendMethod blendMethod = BlendMethod::Normal;
 
-    SwAlpha alpha(MaskMethod method)
+    SwAlpha alpha(CompositeMethod method)
     {
-        auto idx = (int)(method) - 1;       //-1 for None
+        auto idx = (int)(method) - 2;       //0: None, 1: ClipPath
         return alphas[idx > 3 ? 0 : idx];   //CompositeMethod has only four Matting methods.
     }
 
@@ -319,7 +291,7 @@ struct SwCompositor : RenderCompositor
     SwSurface* recoverSfc;                  //Recover surface when composition is started
     SwCompositor* recoverCmp;               //Recover compositor when composition is done
     SwImage image;
-    RenderRegion bbox;
+    SwBBox bbox;
     bool valid;
 };
 
@@ -330,67 +302,21 @@ struct SwCellPool
     uint32_t size;
     SwCell* buffer;
 
-    SwCellPool() : size(DEFAULT_POOL_SIZE), buffer(tvg::malloc<SwCell>(DEFAULT_POOL_SIZE)) {}
-    ~SwCellPool() { tvg::free(buffer); }
+    SwCellPool() : size(DEFAULT_POOL_SIZE), buffer((SwCell*)malloc(DEFAULT_POOL_SIZE)) {}
+    ~SwCellPool() { free(buffer); }
 };
 
 struct SwMpool
 {
-    SwOutline* outlines;
-    SwStrokeBorder* lBorders;
-    SwStrokeBorder* rBorders;
-    SwCellPool* cellPools;
-
-    SwMpool(uint32_t threads)
-    {
-        auto allocSize = threads + 1;
-        outlines = new SwOutline[allocSize];
-        lBorders = new SwStrokeBorder[allocSize];
-        rBorders = new SwStrokeBorder[allocSize];
-        cellPools = new SwCellPool[allocSize];
-    }
-
-    ~SwMpool()
-    {
-        delete[] (outlines);
-        delete[] (lBorders);
-        delete[] (rBorders);
-        delete[] (cellPools);
-    }
-
-    SwCellPool* cell(unsigned idx)
-    {
-        return &cellPools[idx];
-    }
-
-    SwOutline* outline(unsigned idx)
-    {
-        outlines[idx].pts.clear();
-        outlines[idx].cntrs.clear();
-        outlines[idx].types.clear();
-        outlines[idx].closed.clear();
-
-        return &outlines[idx];
-    }
-
-    SwStrokeBorder* strokeLBorder(unsigned idx)
-    {
-        lBorders[idx].pts.clear();
-        lBorders[idx].start = -1;
-        return &lBorders[idx];
-    }
-
-    SwStrokeBorder* strokeRBorder(unsigned idx)
-    {
-        rBorders[idx].pts.clear();
-        rBorders[idx].start = -1;
-        return &rBorders[idx];
-    }
+    SwOutline* outline;
+    SwOutline* strokeOutline;
+    SwCellPool* cellPool;
+    unsigned allocSize;
 };
 
-static inline int32_t TO_SWCOORD(float val)
+static inline SwCoord TO_SWCOORD(float val)
 {
-    return int32_t(val * 64.0f);
+    return SwCoord(val * 64.0f);
 }
 
 static inline uint32_t JOIN(uint8_t c0, uint8_t c1, uint8_t c2, uint8_t c3)
@@ -414,7 +340,7 @@ static inline uint8_t INTERPOLATE8(uint8_t s, uint8_t d, uint8_t a)
     return (((s) * (a) + 0xff) >> 8) + (((d) * ~(a) + 0xff) >> 8);
 }
 
-static inline int32_t HALF_STROKE(float width)
+static inline SwCoord HALF_STROKE(float width)
 {
     return TO_SWCOORD(width * 0.5f);
 }
@@ -444,29 +370,6 @@ static inline uint8_t C3(uint32_t c)
     return (c);
 }
 
-static inline uint32_t PREMULTIPLY(uint32_t c, uint8_t a)
-{
-    return (c & 0xff000000) + ((((c >> 8) & 0xff) * a) & 0xff00) + ((((c & 0x00ff00ff) * a) >> 8) & 0x00ff00ff);
-}
-
-static inline RenderColor BLEND_UPRE(uint32_t c)
-{
-    RenderColor o = {C1(c), C2(c), C3(c), A(c)};
-    if (o.a > 0 && o.a < 255) {
-        o.r = std::min(o.r * 255u / o.a, 255u);
-        o.g = std::min(o.g * 255u / o.a, 255u);
-        o.b = std::min(o.b * 255u / o.a, 255u);
-    }
-    return o;
-}
-
-static inline uint32_t BLEND_PRE(uint32_t c1, uint32_t c2, uint8_t a)
-{
-    if (a == 255) return c1;
-    else if (a == 0) return c2;
-    return ALPHA_BLEND(c1, a) + ALPHA_BLEND(c2, 255 - a);
-}
-
 static inline uint32_t opBlendInterp(uint32_t s, uint32_t d, uint8_t a)
 {
     return INTERPOLATE(s, d, a);
@@ -488,228 +391,169 @@ static inline uint32_t opBlendSrcOver(uint32_t s, TVG_UNUSED uint32_t d, TVG_UNU
     return s;
 }
 
-static inline uint32_t opBlendDifference(uint32_t s, uint32_t d)
+//TODO: BlendMethod could remove the alpha parameter.
+static inline uint32_t opBlendDifference(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto f = [](uint8_t s, uint8_t d) {
-        return (s > d) ? (s - d) : (d - s);
-    };
-
-    return JOIN(255, f(C1(s), C1(d)), f(C2(s), C2(d)), f(C3(s), C3(d)));
+    //if (s > d) => s - d
+    //else => d - s
+    auto c1 = (C1(s) > C1(d)) ? (C1(s) - C1(d)) : (C1(d) - C1(s));
+    auto c2 = (C2(s) > C2(d)) ? (C2(s) - C2(d)) : (C2(d) - C2(s));
+    auto c3 = (C3(s) > C3(d)) ? (C3(s) - C3(d)) : (C3(d) - C3(s));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendExclusion(uint32_t s, uint32_t d)
+static inline uint32_t opBlendExclusion(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto f = [](uint8_t s, uint8_t d) {
-        return tvg::clamp(s + d - 2 * MULTIPLY(s, d), 0, 255);
-    };
-
-    return JOIN(255, f(C1(s), C1(d)), f(C2(s), C2(d)), f(C3(s), C3(d)));
+    // (s + d) - (2 * s * d)
+    auto c1 = C1(s) + C1(d) - 2 * MULTIPLY(C1(s), C1(d));
+    tvg::clamp(c1, 0, 255);
+    auto c2 = C2(s) + C2(d) - 2 * MULTIPLY(C2(s), C2(d));
+    tvg::clamp(c2, 0, 255);
+    auto c3 = C3(s) + C3(d) - 2 * MULTIPLY(C3(s), C3(d));
+    tvg::clamp(c3, 0, 255);
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendAdd(uint32_t s, uint32_t d)
+static inline uint32_t opBlendAdd(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto f = [](uint8_t s, uint8_t d) {
-        return std::min(s + d, 255);
-    };
-
-    return JOIN(255, f(C1(s), C1(d)), f(C2(s), C2(d)), f(C3(s), C3(d)));
+    // s + d
+    auto c1 = std::min(C1(s) + C1(d), 255);
+    auto c2 = std::min(C2(s) + C2(d), 255);
+    auto c3 = std::min(C3(s) + C3(d), 255);
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendScreen(uint32_t s, uint32_t d)
+static inline uint32_t opBlendScreen(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto f = [](uint8_t s, uint8_t d) {
-        return s + d - MULTIPLY(s, d);
-    };
-
-    return JOIN(255, f(C1(s), C1(d)), f(C2(s), C2(d)), f(C3(s), C3(d)));
+    // s + d - s * d
+    auto c1 = C1(s) + C1(d) - MULTIPLY(C1(s), C1(d));
+    auto c2 = C2(s) + C2(d) - MULTIPLY(C2(s), C2(d));
+    auto c3 = C3(s) + C3(d) - MULTIPLY(C3(s), C3(d));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendMultiply(uint32_t s, uint32_t d)
+static inline uint32_t opBlendMultiply(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return MULTIPLY(s, d);
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    // s * d
+    auto c1 = MULTIPLY(C1(s), C1(d));
+    auto c2 = MULTIPLY(C2(s), C2(d));
+    auto c3 = MULTIPLY(C3(s), C3(d));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendOverlay(uint32_t s, uint32_t d)
+static inline uint32_t opBlendOverlay(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return (d < 128) ? std::min(255, 2 * MULTIPLY(s, d)) : (255 - std::min(255, 2 * MULTIPLY(255 - s, 255 - d)));
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    // if (2 * d < da) => 2 * s * d,
+    // else => 1 - 2 * (1 - s) * (1 - d)
+    auto c1 = (C1(d) < 128) ? std::min(255, 2 * MULTIPLY(C1(s), C1(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C1(s), 255 - C1(d))));
+    auto c2 = (C2(d) < 128) ? std::min(255, 2 * MULTIPLY(C2(s), C2(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C2(s), 255 - C2(d))));
+    auto c3 = (C3(d) < 128) ? std::min(255, 2 * MULTIPLY(C3(s), C3(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C3(s), 255 - C3(d))));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendDarken(uint32_t s, uint32_t d)
+static inline uint32_t opBlendDarken(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return std::min(s, d);
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    // min(s, d)
+    auto c1 = std::min(C1(s), C1(d));
+    auto c2 = std::min(C2(s), C2(d));
+    auto c3 = std::min(C3(s), C3(d));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendLighten(uint32_t s, uint32_t d)
+static inline uint32_t opBlendLighten(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto f = [](uint8_t s, uint8_t d) {
-        return std::max(s, d);
-    };
-
-    return JOIN(255, f(C1(s), C1(d)), f(C2(s), C2(d)), f(C3(s), C3(d)));
+    // max(s, d)
+    auto c1 = std::max(C1(s), C1(d));
+    auto c2 = std::max(C2(s), C2(d));
+    auto c3 = std::max(C3(s), C3(d));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendColorDodge(uint32_t s, uint32_t d)
+static inline uint32_t opBlendColorDodge(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return d == 0 ? 0 : (s == 255 ? 255 : std::min(d * 255 / (255 - s), 255));
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    // d / (1 - s)
+    s = 0xffffffff - s;
+    auto c1 = C1(d) == 0 ? 0 : (C1(s) == 0 ? 255 : std::min(C1(d) * 255 / C1(s), 255));
+    auto c2 = C2(d) == 0 ? 0 : (C2(s) == 0 ? 255 : std::min(C2(d) * 255 / C2(s), 255));
+    auto c3 = C3(d) == 0 ? 0 : (C3(s) == 0 ? 255 : std::min(C3(d) * 255 / C3(s), 255));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendColorBurn(uint32_t s, uint32_t d)
+static inline uint32_t opBlendColorBurn(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
+    // 1 - (1 - d) / s
+    auto id = 0xffffffff - d;
+    auto c1 = C1(d) == 255 ? 255 : (C1(s) == 0 ? 0 : 255 - std::min(C1(id) * 255 / C1(s), 255));
+    auto c2 = C2(d) == 255 ? 255 : (C2(s) == 0 ? 0 : 255 - std::min(C2(id) * 255 / C2(s), 255));
+    auto c3 = C3(d) == 255 ? 255 : (C3(s) == 0 ? 0 : 255 - std::min(C3(id) * 255 / C3(s), 255));
 
-    auto f = [](uint8_t s, uint8_t d) {
-        return d == 255 ? 255 : (s == 0 ? 0 : 255 - std::min((255 - d) * 255 / s, 255));
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendHardLight(uint32_t s, uint32_t d)
+static inline uint32_t opBlendHardLight(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return (s < 128) ? std::min(255, 2 * MULTIPLY(s, d)) : (255 - std::min(255, 2 * MULTIPLY(255 - s, 255 - d)));
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    // if (s < sa), (2 * s * d)
+    // else (sa * da) - 2 * (da - s) * (sa - d)
+    auto c1 = (C1(s) < 128) ? std::min(255, 2 * MULTIPLY(C1(s), C1(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C1(s), 255 - C1(d))));
+    auto c2 = (C2(s) < 128) ? std::min(255, 2 * MULTIPLY(C2(s), C2(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C2(s), 255 - C2(d))));
+    auto c3 = (C3(s) < 128) ? std::min(255, 2 * MULTIPLY(C3(s), C3(d))) : (255 - std::min(255, 2 * MULTIPLY(255 - C3(s), 255 - C3(d))));
+    return JOIN(255, c1, c2, c3);
 }
 
-static inline uint32_t opBlendSoftLight(uint32_t s, uint32_t d)
+static inline uint32_t opBlendSoftLight(uint32_t s, uint32_t d, TVG_UNUSED uint8_t a)
 {
-    auto o = BLEND_UPRE(d);
-
-    auto f = [](uint8_t s, uint8_t d) {
-        return MULTIPLY(255 - std::min(255, 2 * s), MULTIPLY(d, d)) + std::min(255, 2 * MULTIPLY(s, d));
-    };
-
-    return BLEND_PRE(JOIN(255, f(C1(s), o.r), f(C2(s), o.g), f(C3(s), o.b)), s, o.a);
+    //(255 - 2 * s) * (d * d) + (2 * s * b)
+    auto c1 = MULTIPLY(255 - std::min(255, 2 * C1(s)), MULTIPLY(C1(d), C1(d))) + std::min(255, 2 * MULTIPLY(C1(s), C1(d)));
+    auto c2 = MULTIPLY(255 - std::min(255, 2 * C2(s)), MULTIPLY(C2(d), C2(d))) + std::min(255, 2 * MULTIPLY(C2(s), C2(d)));
+    auto c3 = MULTIPLY(255 - std::min(255, 2 * C3(s)), MULTIPLY(C3(d), C3(d))) + std::min(255, 2 * MULTIPLY(C3(s), C3(d)));
+    return JOIN(255, c1, c2, c3);
 }
 
-void rasterRGB2HSL(uint8_t r, uint8_t g, uint8_t b, float* h, float* s, float* l);
-
-static inline uint32_t opBlendHue(uint32_t s, uint32_t d)
-{
-    auto o = BLEND_UPRE(d);
-
-    float sh, ds, dl;
-    rasterRGB2HSL(C1(s), C2(s), C3(s), &sh, 0, 0);
-    rasterRGB2HSL(o.r, o.g, o.b, 0, &ds, &dl);
-
-    uint8_t r, g, b;
-    hsl2rgb(sh, ds, dl, r, g, b);
-
-    return BLEND_PRE(JOIN(255, r, g, b), s, o.a);
-}
-
-static inline uint32_t opBlendSaturation(uint32_t s, uint32_t d)
-{
-    auto o = BLEND_UPRE(d);
-
-    float dh, ss, dl;
-    rasterRGB2HSL(C1(s), C2(s), C3(s), 0, &ss, 0);
-    rasterRGB2HSL(o.r, o.g, o.b, &dh, 0, &dl);
-
-    uint8_t r, g, b;
-    hsl2rgb(dh, ss, dl, r, g, b);
-
-    return BLEND_PRE(JOIN(255, r, g, b), s, o.a);
-}
-
-static inline uint32_t opBlendColor(uint32_t s, uint32_t d)
-{
-    auto o = BLEND_UPRE(d);
-
-    float sh, ss, dl;
-    rasterRGB2HSL(C1(s), C2(s), C3(s), &sh, &ss, 0);
-    rasterRGB2HSL(o.r, o.g, o.b, 0, 0, &dl);
-
-    uint8_t r, g, b;
-    hsl2rgb(sh, ss, dl, r, g, b);
-
-    return BLEND_PRE(JOIN(255, r, g, b), s, o.a);
-}
-
-static inline uint32_t opBlendLuminosity(uint32_t s, uint32_t d)
-{
-    auto o = BLEND_UPRE(d);
-
-    float dh, ds, sl;
-    rasterRGB2HSL(C1(s), C2(s), C3(s), 0, 0, &sl);
-    rasterRGB2HSL(o.r, o.g, o.b, &dh, &ds, 0);
-
-    uint8_t r, g, b;
-    hsl2rgb(dh, ds, sl, r, g, b);
-
-    return BLEND_PRE(JOIN(255, r, g, b), s, o.a);
-}
 
 int64_t mathMultiply(int64_t a, int64_t b);
 int64_t mathDivide(int64_t a, int64_t b);
 int64_t mathMulDiv(int64_t a, int64_t b, int64_t c);
-void mathRotate(SwPoint& pt, int64_t angle);
-int64_t mathTan(int64_t angle);
-int64_t mathAtan(const SwPoint& pt);
-int64_t mathCos(int64_t angle);
-int64_t mathSin(int64_t angle);
+void mathRotate(SwPoint& pt, SwFixed angle);
+SwFixed mathTan(SwFixed angle);
+SwFixed mathAtan(const SwPoint& pt);
+SwFixed mathCos(SwFixed angle);
+SwFixed mathSin(SwFixed angle);
 void mathSplitCubic(SwPoint* base);
 void mathSplitLine(SwPoint* base);
-int64_t mathDiff(int64_t angle1, int64_t angle2);
-int64_t mathLength(const SwPoint& pt);
-int mathCubicAngle(const SwPoint* base, int64_t& angleIn, int64_t& angleMid, int64_t& angleOut);
-int64_t mathMean(int64_t angle1, int64_t angle2);
+SwFixed mathDiff(SwFixed angle1, SwFixed angle2);
+SwFixed mathLength(const SwPoint& pt);
+int mathCubicAngle(const SwPoint* base, SwFixed& angleIn, SwFixed& angleMid, SwFixed& angleOut);
+SwFixed mathMean(SwFixed angle1, SwFixed angle2);
 SwPoint mathTransform(const Point* to, const Matrix& transform);
-bool mathUpdateOutlineBBox(const SwOutline* outline, const RenderRegion& clipBox, RenderRegion& renderBox, bool fastTrack);
+bool mathUpdateOutlineBBox(const SwOutline* outline, const SwBBox& clipRegion, SwBBox& renderRegion, bool fastTrack);
+bool mathClipBBox(const SwBBox& clipper, SwBBox& clippee);
 
-void shapeReset(SwShape& shape);
-bool shapePrepare(SwShape& shape, const RenderShape* rshape, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid, bool hasComposite);
-bool shapeGenRle(SwShape& shape, const RenderRegion& bbox, SwMpool* mpool, unsigned tid, bool antiAlias);
-void shapeDelOutline(SwShape& shape, SwMpool* mpool, uint32_t tid);
-void shapeResetStroke(SwShape& shape, const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid);
-bool shapeGenStrokeRle(SwShape& shape, const RenderShape* rshape, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid);
-void shapeFree(SwShape& shape);
-void shapeDelStroke(SwShape& shape);
-bool shapeGenFillColors(SwShape& shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable);
-bool shapeGenStrokeFillColors(SwShape& shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable);
-void shapeResetFill(SwShape& shape);
-void shapeResetStrokeFill(SwShape& shape);
-bool shapeStrokeBBox(SwShape& shape, const RenderShape* rshape, Point* pt4, const Matrix& m, SwMpool* mpool);
-void shapeDelFill(SwShape& shape);
+void shapeReset(SwShape* shape);
+bool shapePrepare(SwShape* shape, const RenderShape* rshape, const Matrix& transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool hasComposite);
+bool shapePrepared(const SwShape* shape);
+bool shapeGenRle(SwShape* shape, const RenderShape* rshape, SwMpool* mpool, unsigned tid, bool antiAlias);
+void shapeDelOutline(SwShape* shape, SwMpool* mpool, uint32_t tid);
+void shapeResetStroke(SwShape* shape, const RenderShape* rshape, const Matrix& transform);
+bool shapeGenStrokeRle(SwShape* shape, const RenderShape* rshape, const Matrix& transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid);
+void shapeFree(SwShape* shape);
+void shapeDelStroke(SwShape* shape);
+bool shapeGenFillColors(SwShape* shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable);
+bool shapeGenStrokeFillColors(SwShape* shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable);
+void shapeResetFill(SwShape* shape);
+void shapeResetStrokeFill(SwShape* shape);
+void shapeDelFill(SwShape* shape);
+void shapeDelStrokeFill(SwShape* shape);
 
-void strokeReset(SwStroke* stroke, const RenderShape* shape, const Matrix& transform, SwMpool* mpool, unsigned tid);
-bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline, SwMpool* mpool, unsigned tid);
+void strokeReset(SwStroke* stroke, const RenderShape* shape, const Matrix& transform);
+bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline);
 SwOutline* strokeExportOutline(SwStroke* stroke, SwMpool* mpool, unsigned tid);
 void strokeFree(SwStroke* stroke);
 
-bool imagePrepare(SwImage& image, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid);
-bool imageGenRle(SwImage& image, const RenderRegion& bbox, SwMpool* mpool, unsigned tid, bool antiAlias);
-void imageDelOutline(SwImage& image, SwMpool* mpool, uint32_t tid);
-void imageReset(SwImage& image);
-void imageFree(SwImage& image);
+bool imagePrepare(SwImage* image, const Matrix& transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid);
+bool imageGenRle(SwImage* image, const SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool antiAlias);
+void imageDelOutline(SwImage* image, SwMpool* mpool, uint32_t tid);
+void imageReset(SwImage* image);
+void imageFree(SwImage* image);
 
 bool fillGenColorTable(SwFill* fill, const Fill* fdata, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable);
 const Fill::ColorStop* fillFetchSolid(const SwFill* fill, const Fill* fdata);
@@ -719,45 +563,51 @@ void fillFree(SwFill* fill);
 //OPTIMIZE_ME: Skip the function pointer access
 void fillLinear(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32_t len, SwMask maskOp, uint8_t opacity);                                   //composite masking ver.
 void fillLinear(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32_t len, uint8_t* cmp, SwMask maskOp, uint8_t opacity);                     //direct masking ver.
-void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a);                                        //blending ver.
-void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a);                         //blending + BlendingMethod(op2) ver.
+void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a);                                         //blending ver.
+void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a);                          //blending + BlendingMethod(op2) ver.
 void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, uint8_t* cmp, SwAlpha alpha, uint8_t csize, uint8_t opacity);     //matting ver.
 
 void fillRadial(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32_t len, SwMask op, uint8_t a);                                             //composite masking ver.
 void fillRadial(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32_t len, uint8_t* cmp, SwMask op, uint8_t a) ;                              //direct masking ver.
-void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a);                                        //blending ver.
-void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a);                         //blending + BlendingMethod(op2) ver.
+void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a);                                         //blending ver.
+void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a);                          //blending + BlendingMethod(op2) ver.
 void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, uint8_t* cmp, SwAlpha alpha, uint8_t csize, uint8_t opacity);     //matting ver.
 
-SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox, SwMpool* mpool, unsigned tid, bool antiAlias);
-SwRle* rleRender(const RenderRegion* bbox);
+SwRle* rleRender(SwRle* rle, const SwOutline* outline, const SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool antiAlias);
+SwRle* rleRender(const SwBBox* bbox);
 void rleFree(SwRle* rle);
 void rleReset(SwRle* rle);
 void rleMerge(SwRle* rle, SwRle* clip1, SwRle* clip2);
 bool rleClip(SwRle* rle, const SwRle* clip);
-bool rleClip(SwRle* rle, const RenderRegion* clip);
-bool rleIntersect(const SwRle* rle, const RenderRegion& region);
+bool rleClip(SwRle* rle, const SwBBox* clip);
 
-void mpoolInit(uint32_t threads);
-void mpoolTerm();
-SwMpool* mpoolReq();
+SwMpool* mpoolInit(uint32_t threads);
+bool mpoolTerm(SwMpool* mpool);
+bool mpoolClear(SwMpool* mpool);
+SwOutline* mpoolReqOutline(SwMpool* mpool, unsigned idx);
+void mpoolRetOutline(SwMpool* mpool, unsigned idx);
+SwOutline* mpoolReqStrokeOutline(SwMpool* mpool, unsigned idx);
+void mpoolRetStrokeOutline(SwMpool* mpool, unsigned idx);
+SwOutline* mpoolReqDashOutline(SwMpool* mpool, unsigned idx);
+void mpoolRetDashOutline(SwMpool* mpool, unsigned idx);
+SwCellPool* mpoolReqCellPool(SwMpool* mpool, unsigned idx);
 
 bool rasterCompositor(SwSurface* surface);
-bool rasterShape(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, RenderColor& c);
-bool rasterTexmapPolygon(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity);
-bool rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity);
-bool rasterDirectImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity);
-bool rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity);
-bool rasterDirectRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity);
-bool rasterStroke(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, RenderColor& c);
-bool rasterGradientShape(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, const Fill* fdata, uint8_t opacity);
-bool rasterGradientStroke(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, const Fill* fdata, uint8_t opacity);
-bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+bool rasterGradientShape(SwSurface* surface, SwShape* shape, const Fill* fdata, uint8_t opacity);
+bool rasterShape(SwSurface* surface, SwShape* shape, uint8_t r, uint8_t g, uint8_t b, uint8_t a);
+bool rasterTexmapPolygon(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity);
+bool rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity);
+bool rasterDirectImage(SwSurface* surface, const SwImage& image, const SwBBox& bbox, uint8_t opacity);
+bool rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity);
+bool rasterDirectRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity);
+bool rasterStroke(SwSurface* surface, SwShape* shape, uint8_t r, uint8_t g, uint8_t b, uint8_t a);
+bool rasterGradientStroke(SwSurface* surface, SwShape* shape, const Fill* fdata, uint8_t opacity);
+bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_t h, pixel_t val = 0);
 void rasterPixel32(uint32_t *dst, uint32_t val, uint32_t offset, int32_t len);
 void rasterTranslucentPixel32(uint32_t* dst, uint32_t* src, uint32_t len, uint8_t opacity);
 void rasterPixel32(uint32_t* dst, uint32_t* src, uint32_t len, uint8_t opacity);
 void rasterGrayscale8(uint8_t *dst, uint8_t val, uint32_t offset, int32_t len);
-void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32_t h, const RenderRegion& bbox, bool flipped);
+void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32_t h, const SwBBox& bbox, bool flipped);
 void rasterUnpremultiply(RenderSurface* surface);
 void rasterPremultiply(RenderSurface* surface);
 bool rasterConvertCS(RenderSurface* surface, ColorSpace to);
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp
index f2587af1..25d76aa7 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
  * SOFTWARE.
  */
 
+#include "tvgMath.h"
 #include "tvgSwCommon.h"
 #include "tvgFill.h"
 
@@ -64,15 +65,15 @@ static void _calculateCoefficients(const SwFill* fill, uint32_t x, uint32_t y, f
 static uint32_t _estimateAAMargin(const Fill* fdata)
 {
     constexpr float marginScalingFactor = 800.0f;
-
     if (fdata->type() == Type::RadialGradient) {
-        auto radius = CONST_RADIAL(fdata)->r;
+        auto radius = P(static_cast<const RadialGradient*>(fdata))->r;
         return tvg::zero(radius) ? 0 : static_cast<uint32_t>(marginScalingFactor / radius);
-    } else {
-        auto grad = CONST_LINEAR(fdata);
-        auto len = length(grad->p1, grad->p2);
-        return tvg::zero(len) ? 0 : static_cast<uint32_t>(marginScalingFactor / len);
     }
+    auto grad = P(static_cast<const LinearGradient*>(fdata));
+    Point p1 {grad->x1, grad->y1};
+    Point p2 {grad->x2, grad->y2};
+    auto len = length(&p1, &p2);
+    return tvg::zero(len) ? 0 : static_cast<uint32_t>(marginScalingFactor / len);
 }
 
 
@@ -163,10 +164,8 @@ static bool _updateColorTable(SwFill* fill, const Fill* fdata, const SwSurface*
 
         auto curr = colors + j;
         auto next = curr + 1;
-        auto div = next->offset - curr->offset;
-        auto delta = div != 0.0f ? (1.0f / div) : 0.0f;
+        auto delta = 1.0f / (next->offset - curr->offset);
         auto a2 = MULTIPLY(next->a, opacity);
-
         if (!fill->translucent && a2 < 255) fill->translucent = true;
 
         auto rgba2 = surface->join(next->r, next->g, next->b, a2);
@@ -175,8 +174,10 @@ static bool _updateColorTable(SwFill* fill, const Fill* fdata, const SwSurface*
             auto t = (pos - curr->offset) * delta;
             auto dist = static_cast<int32_t>(255 * t);
             auto dist2 = 255 - dist;
+
             auto color = INTERPOLATE(rgba, rgba2, dist2);
             fill->ctable[i] = ALPHA_BLEND((color | 0xff000000), (color >> 24));
+
             ++i;
             pos += inc;
         }
@@ -187,12 +188,11 @@ static bool _updateColorTable(SwFill* fill, const Fill* fdata, const SwSurface*
     }
     rgba = ALPHA_BLEND((rgba | 0xff000000), a);
 
-    for (; i < SW_COLOR_TABLE; ++i) {
+    for (; i < SW_COLOR_TABLE; ++i)
         fill->ctable[i] = rgba;
-    }
 
     //For repeat fill spread apply anti-aliasing between the last and first colors,
-    //otherwise make sure the last color stop is represented at the end of the table.
+    //othewise make sure the last color stop is represented at the end of the table.
     if (repeat) _applyAA(fill, iAABegin, iAAEnd);
     else fill->ctable[SW_COLOR_TABLE - 1] = rgba;
 
@@ -200,10 +200,10 @@ static bool _updateColorTable(SwFill* fill, const Fill* fdata, const SwSurface*
 }
 
 
-bool _prepareLinear(SwFill* fill, const LinearGradient* linear, const Matrix& pTransform)
+bool _prepareLinear(SwFill* fill, const LinearGradient* linear, const Matrix& transform)
 {
     float x1, x2, y1, y2;
-    linear->linear(&x1, &y1, &x2, &y2);
+    if (linear->linear(&x1, &y1, &x2, &y2) != Result::Success) return false;
 
     fill->linear.dx = x2 - x1;
     fill->linear.dy = y2 - y1;
@@ -220,26 +220,44 @@ bool _prepareLinear(SwFill* fill, const LinearGradient* linear, const Matrix& pT
     fill->linear.dy /= len;
     fill->linear.offset = -fill->linear.dx * x1 - fill->linear.dy * y1;
 
-    const auto& transform = pTransform * linear->transform();
+    auto gradTransform = linear->transform();
+    bool isTransformation = !identity((const Matrix*)(&gradTransform));
 
-    Matrix itransform;
-    if (!inverse(&transform, &itransform)) return false;
+    if (isTransformation) {
+        gradTransform = transform * gradTransform;
+    } else {
+        gradTransform = transform;
+        isTransformation = true;
+    }
 
-    fill->linear.offset += fill->linear.dx * itransform.e13 + fill->linear.dy * itransform.e23;
+    if (isTransformation) {
+        Matrix invTransform;
+        if (!inverse(&gradTransform, &invTransform)) return false;
 
-    auto dx = fill->linear.dx;
-    fill->linear.dx = dx * itransform.e11 + fill->linear.dy * itransform.e21;
-    fill->linear.dy = dx * itransform.e12 + fill->linear.dy * itransform.e22;
+        fill->linear.offset += fill->linear.dx * invTransform.e13 + fill->linear.dy * invTransform.e23;
+
+        auto dx = fill->linear.dx;
+        fill->linear.dx = dx * invTransform.e11 + fill->linear.dy * invTransform.e21;
+        fill->linear.dy = dx * invTransform.e12 + fill->linear.dy * invTransform.e22;
+    }
 
     return true;
 }
 
 
-bool _prepareRadial(SwFill* fill, const RadialGradient* radial, const Matrix& pTransform)
+bool _prepareRadial(SwFill* fill, const RadialGradient* radial, const Matrix& transform)
 {
-    float cx, cy, r, fx, fy, fr;
-    radial->radial(&cx, &cy, &r, &fx, &fy, &fr);
-    if ((fill->solid = !CONST_RADIAL(radial)->correct(fx, fy, fr))) return true;
+    auto cx = P(radial)->cx;
+    auto cy = P(radial)->cy;
+    auto r = P(radial)->r;
+    auto fx = P(radial)->fx;
+    auto fy = P(radial)->fy;
+    auto fr = P(radial)->fr;
+
+    if (tvg::zero(r)) {
+        fill->solid = true;
+        return true;
+    }
 
     fill->radial.dr = r - fr;
     fill->radial.dx = cx - fx;
@@ -249,24 +267,51 @@ bool _prepareRadial(SwFill* fill, const RadialGradient* radial, const Matrix& pT
     fill->radial.fy = fy;
     fill->radial.a = fill->radial.dr * fill->radial.dr - fill->radial.dx * fill->radial.dx - fill->radial.dy * fill->radial.dy;
 
-    // relative epsilon
-    auto precision = std::max(1e-5f, std::max(fill->radial.dr * fill->radial.dr, 1.0f) * 1e-4f);
+    //This condition fulfills the SVG 1.1 std:
+    //the focal point, if outside the end circle, is moved to be on the end circle
+    //See: the SVG 2 std requirements: https://www.w3.org/TR/SVG2/pservers.html#RadialGradientNotes
+    constexpr float precision = 0.01f;
+    if (fill->radial.a <= precision) {
+        auto dist = sqrtf(fill->radial.dx * fill->radial.dx + fill->radial.dy * fill->radial.dy);
+        //retract focal point slightly from edge to avoid numerical errors:
+        fill->radial.fx = cx + r * (1.0f - precision) * (fx - cx) / dist;
+        fill->radial.fy = cy + r * (1.0f - precision) * (fy - cy) / dist;
+        fill->radial.dx = cx - fill->radial.fx;
+        fill->radial.dy = cy - fill->radial.fy;
+        // Prevent loss of precision on Apple Silicon when dr=dy and dx=0 due to FMA
+        // https://github.com/thorvg/thorvg/issues/2014
+        auto dr2 = fill->radial.dr * fill->radial.dr;
+        auto dx2 = fill->radial.dx * fill->radial.dx;
+        auto dy2 = fill->radial.dy * fill->radial.dy;
 
-    if (fill->radial.a < precision) fill->radial.a = precision;
-    fill->radial.invA = 1.0f / fill->radial.a;
+        fill->radial.a = dr2 - dx2 - dy2;
+    }
 
-    const auto& transform = pTransform * radial->transform();
+    if (fill->radial.a > 0) fill->radial.invA = 1.0f / fill->radial.a;
 
-    Matrix itransform;
-    if (!inverse(&transform, &itransform)) return false;
+    auto gradTransform = radial->transform();
+    bool isTransformation = !identity((const Matrix*)(&gradTransform));
 
-    fill->radial.a11 = itransform.e11;
-    fill->radial.a12 = itransform.e12;
-    fill->radial.a13 = itransform.e13;
-    fill->radial.a21 = itransform.e21;
-    fill->radial.a22 = itransform.e22;
-    fill->radial.a23 = itransform.e23;
+    if (isTransformation) gradTransform = transform * gradTransform;
+    else {
+        gradTransform = transform;
+        isTransformation = true;
+    }
 
+    if (isTransformation) {
+        Matrix invTransform;
+        if (!inverse(&gradTransform, &invTransform)) return false;
+        fill->radial.a11 = invTransform.e11;
+        fill->radial.a12 = invTransform.e12;
+        fill->radial.a13 = invTransform.e13;
+        fill->radial.a21 = invTransform.e21;
+        fill->radial.a22 = invTransform.e22;
+        fill->radial.a23 = invTransform.e23;
+    } else {
+        fill->radial.a11 = fill->radial.a22 = 1.0f;
+        fill->radial.a12 = fill->radial.a13 = 0.0f;
+        fill->radial.a21 = fill->radial.a23 = 0.0f;
+    }
     return true;
 }
 
@@ -361,7 +406,7 @@ void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
 }
 
 
-void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a)
+void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a)
 {
     if (fill->radial.a < RADIAL_A_THRESHOLD) {
         auto radial = &fill->radial;
@@ -445,7 +490,7 @@ void fillRadial(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32
 }
 
 
-void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a)
+void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a)
 {
     if (fill->radial.a < RADIAL_A_THRESHOLD) {
         auto radial = &fill->radial;
@@ -456,7 +501,7 @@ void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             for (uint32_t i = 0; i < len; ++i, ++dst) {
                 auto x0 = 0.5f * (rx * rx + ry * ry - radial->fr * radial->fr) / (radial->dr * radial->fr + rx * radial->dx + ry * radial->dy);
                 auto tmp = op(_pixel(fill, x0), *dst, 255);
-                *dst = op2(tmp, *dst);
+                *dst = op2(tmp, *dst, 255);
                 rx += radial->a11;
                 ry += radial->a21;
             }
@@ -464,7 +509,7 @@ void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             for (uint32_t i = 0; i < len; ++i, ++dst) {
                 auto x0 = 0.5f * (rx * rx + ry * ry - radial->fr * radial->fr) / (radial->dr * radial->fr + rx * radial->dx + ry * radial->dy);
                 auto tmp = op(_pixel(fill, x0), *dst, 255);
-                auto tmp2 = op2(tmp, *dst);
+                auto tmp2 = op2(tmp, *dst, 255);
                 *dst = INTERPOLATE(tmp2, *dst, a);
                 rx += radial->a11;
                 ry += radial->a21;
@@ -476,7 +521,7 @@ void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
         if (a == 255) {
             for (uint32_t i = 0 ; i < len ; ++i, ++dst) {
                 auto tmp = op(_pixel(fill, sqrtf(det) - b), *dst, 255);
-                *dst = op2(tmp, *dst);
+                *dst = op2(tmp, *dst, 255);
                 det += deltaDet;
                 deltaDet += deltaDeltaDet;
                 b += deltaB;
@@ -484,7 +529,7 @@ void fillRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
         } else {
             for (uint32_t i = 0 ; i < len ; ++i, ++dst) {
                 auto tmp = op(_pixel(fill, sqrtf(det) - b), *dst, 255);
-                auto tmp2 = op2(tmp, *dst);
+                auto tmp2 = op2(tmp, *dst, 255);
                 *dst = INTERPOLATE(tmp2, *dst, a);
                 det += deltaDet;
                 deltaDet += deltaDeltaDet;
@@ -658,7 +703,7 @@ void fillLinear(const SwFill* fill, uint8_t* dst, uint32_t y, uint32_t x, uint32
 }
 
 
-void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a)
+void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a)
 {
     //Rotation
     float rx = x + 0.5f;
@@ -698,7 +743,7 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
 }
 
 
-void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a)
+void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a)
 {
     //Rotation
     float rx = x + 0.5f;
@@ -711,12 +756,12 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
         if (a == 255) {
             for (uint32_t i = 0; i < len; ++i, ++dst) {
                 auto tmp = op(color, *dst, a);
-                *dst = op2(tmp, *dst);
+                *dst = op2(tmp, *dst, 255);
             }
         } else {
             for (uint32_t i = 0; i < len; ++i, ++dst) {
                 auto tmp = op(color, *dst, a);
-                auto tmp2 = op2(tmp, *dst);
+                auto tmp2 = op2(tmp, *dst, 255);
                 *dst = INTERPOLATE(tmp2, *dst, a);
             }
         }
@@ -734,7 +779,7 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             auto inc2 = static_cast<int32_t>(inc * FIXPT_SIZE);
             for (uint32_t j = 0; j < len; ++j, ++dst) {
                 auto tmp = op(_fixedPixel(fill, t2), *dst, 255);
-                *dst = op2(tmp, *dst);
+                *dst = op2(tmp, *dst, 255);
                 t2 += inc2;
             }
         //we have to fallback to float math
@@ -742,7 +787,7 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             uint32_t counter = 0;
             while (counter++ < len) {
                 auto tmp = op(_pixel(fill, t / SW_COLOR_TABLE), *dst, 255);
-                *dst = op2(tmp, *dst);
+                *dst = op2(tmp, *dst, 255);
                 ++dst;
                 t += inc;
             }
@@ -754,7 +799,7 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             auto inc2 = static_cast<int32_t>(inc * FIXPT_SIZE);
             for (uint32_t j = 0; j < len; ++j, ++dst) {
                 auto tmp = op(_fixedPixel(fill, t2), *dst, 255);
-                auto tmp2 = op2(tmp, *dst);
+                auto tmp2 = op2(tmp, *dst, 255);
                 *dst = INTERPOLATE(tmp2, *dst, a);
                 t2 += inc2;
             }
@@ -763,7 +808,7 @@ void fillLinear(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint3
             uint32_t counter = 0;
             while (counter++ < len) {
                 auto tmp = op(_pixel(fill, t / SW_COLOR_TABLE), *dst, 255);
-                auto tmp2 = op2(tmp, *dst);
+                auto tmp2 = op2(tmp, *dst, 255);
                 *dst = INTERPOLATE(tmp2, *dst, a);
                 ++dst;
                 t += inc;
@@ -811,5 +856,5 @@ void fillReset(SwFill* fill)
 
 void fillFree(SwFill* fill)
 {
-    if (fill) tvg::free(fill);
+    if (fill) free(fill);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp
index ffffb342..15ef9683 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,10 +34,10 @@ static inline bool _onlyShifted(const Matrix& m)
 }
 
 
-static bool _genOutline(SwImage& image, const Matrix& transform, SwMpool* mpool, unsigned tid)
+static bool _genOutline(SwImage* image, const Matrix& transform, SwMpool* mpool, unsigned tid)
 {
-    image.outline = mpool->outline(tid);
-    auto outline = image.outline;
+    image->outline = mpoolReqOutline(mpool, tid);
+    auto outline = image->outline;
 
     outline->pts.reserve(5);
     outline->types.reserve(5);
@@ -45,8 +45,8 @@ static bool _genOutline(SwImage& image, const Matrix& transform, SwMpool* mpool,
     outline->closed.reserve(1);
 
     Point to[4];
-    auto w = static_cast<float>(image.w);
-    auto h = static_cast<float>(image.h);
+    auto w = static_cast<float>(image->w);
+    auto h = static_cast<float>(image->h);
     to[0] = {0, 0};
     to[1] = {w, 0};
     to[2] = {w, h};
@@ -62,8 +62,7 @@ static bool _genOutline(SwImage& image, const Matrix& transform, SwMpool* mpool,
     outline->cntrs.push(outline->pts.count - 1);
     outline->closed.push(true);
 
-    image.outline = outline;
-    image.outline->fillRule = FillRule::NonZero;
+    image->outline = outline;
 
     return true;
 }
@@ -73,51 +72,51 @@ static bool _genOutline(SwImage& image, const Matrix& transform, SwMpool* mpool,
 /* External Class Implementation                                        */
 /************************************************************************/
 
-bool imagePrepare(SwImage& image, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid)
+bool imagePrepare(SwImage* image, const Matrix& transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid)
 {
-    image.direct = _onlyShifted(transform);
+    image->direct = _onlyShifted(transform);
 
     //Fast track: Non-transformed image but just shifted.
-    if (image.direct) {
-        image.ox = -static_cast<int32_t>(nearbyint(transform.e13));
-        image.oy = -static_cast<int32_t>(nearbyint(transform.e23));
+    if (image->direct) {
+        image->ox = -static_cast<int32_t>(nearbyint(transform.e13));
+        image->oy = -static_cast<int32_t>(nearbyint(transform.e23));
     //Figure out the scale factor by transform matrix
     } else {
         auto scaleX = sqrtf((transform.e11 * transform.e11) + (transform.e21 * transform.e21));
         auto scaleY = sqrtf((transform.e22 * transform.e22) + (transform.e12 * transform.e12));
-        image.scale = (fabsf(scaleX - scaleY) > 0.01f) ? 1.0f : scaleX;
+        image->scale = (fabsf(scaleX - scaleY) > 0.01f) ? 1.0f : scaleX;
 
-        if (tvg::zero(transform.e12) && tvg::zero(transform.e21)) image.scaled = true;
-        else image.scaled = false;
+        if (tvg::zero(transform.e12) && tvg::zero(transform.e21)) image->scaled = true;
+        else image->scaled = false;
     }
 
     if (!_genOutline(image, transform, mpool, tid)) return false;
-    return mathUpdateOutlineBBox(image.outline, clipBox, renderBox, image.direct);
+    return mathUpdateOutlineBBox(image->outline, clipRegion, renderRegion, image->direct);
 }
 
 
-bool imageGenRle(SwImage& image, const RenderRegion& renderBox, SwMpool* mpool, unsigned tid, bool antiAlias)
+bool imageGenRle(SwImage* image, const SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool antiAlias)
 {
-    if ((image.rle = rleRender(image.rle, image.outline, renderBox, mpool, tid, antiAlias))) return true;
+    if ((image->rle = rleRender(image->rle, image->outline, renderRegion, mpool, tid, antiAlias))) return true;
 
     return false;
 }
 
 
-void imageDelOutline(SwImage& image, SwMpool* mpool, uint32_t tid)
+void imageDelOutline(SwImage* image, SwMpool* mpool, uint32_t tid)
 {
-    image.outline = nullptr;
+    mpoolRetOutline(mpool, tid);
+    image->outline = nullptr;
 }
 
 
-void imageReset(SwImage& image)
+void imageReset(SwImage* image)
 {
-    rleReset(image.rle);
+    rleReset(image->rle);
 }
 
 
-void imageFree(SwImage& image)
+void imageFree(SwImage* image)
 {
-    rleFree(image.rle);
-    image.rle = nullptr;
+    rleFree(image->rle);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
index 8610ef38..328a8afa 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-static float TO_RADIAN(int64_t angle)
+static float TO_RADIAN(SwFixed angle)
 {
     return (float(angle) / 65536.0f) * (MATH_PI / 180.0f);
 }
@@ -38,28 +38,28 @@ static float TO_RADIAN(int64_t angle)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-int64_t mathMean(int64_t angle1, int64_t angle2)
+SwFixed mathMean(SwFixed angle1, SwFixed angle2)
 {
     return angle1 + mathDiff(angle1, angle2) / 2;
 }
 
 
-int mathCubicAngle(const SwPoint* base, int64_t& angleIn, int64_t& angleMid, int64_t& angleOut)
+int mathCubicAngle(const SwPoint* base, SwFixed& angleIn, SwFixed& angleMid, SwFixed& angleOut)
 {
     auto d1 = base[2] - base[3];
     auto d2 = base[1] - base[2];
     auto d3 = base[0] - base[1];
 
-    if (d1.tiny()) {
-        if (d2.tiny()) {
-            if (d3.tiny()) {
+    if (d1.small()) {
+        if (d2.small()) {
+            if (d3.small()) {
                 angleIn = angleMid = angleOut = 0;
                 return -1;  //ignoreable
             } else {
                 angleIn = angleMid = angleOut = mathAtan(d3);
             }
         } else {
-            if (d3.tiny()) {
+            if (d3.small()) {
                 angleIn = angleMid = angleOut = mathAtan(d2);
             } else {
                 angleIn = angleMid = mathAtan(d2);
@@ -67,8 +67,8 @@ int mathCubicAngle(const SwPoint* base, int64_t& angleIn, int64_t& angleMid, int
             }
         }
     } else {
-        if (d2.tiny()) {
-            if (d3.tiny()) {
+        if (d2.small()) {
+            if (d3.small()) {
                 angleIn = angleMid = angleOut = mathAtan(d1);
             } else {
                 angleIn = mathAtan(d1);
@@ -76,7 +76,7 @@ int mathCubicAngle(const SwPoint* base, int64_t& angleIn, int64_t& angleMid, int
                 angleMid = mathMean(angleIn, angleOut);
             }
         } else {
-            if (d3.tiny()) {
+            if (d3.small()) {
                 angleIn = mathAtan(d1);
                 angleMid = angleOut = mathAtan(d2);
             } else {
@@ -154,7 +154,7 @@ int64_t mathMulDiv(int64_t a, int64_t b, int64_t c)
 }
 
 
-void mathRotate(SwPoint& pt, int64_t angle)
+void mathRotate(SwPoint& pt, SwFixed angle)
 {
     if (angle == 0 || pt.zero()) return;
 
@@ -164,39 +164,39 @@ void mathRotate(SwPoint& pt, int64_t angle)
     auto cosv = cosf(radian);
     auto sinv = sinf(radian);
 
-    pt.x = int32_t(nearbyint((v.x * cosv - v.y * sinv) * 64.0f));
-    pt.y = int32_t(nearbyint((v.x * sinv + v.y * cosv) * 64.0f));
+    pt.x = SwCoord(nearbyint((v.x * cosv - v.y * sinv) * 64.0f));
+    pt.y = SwCoord(nearbyint((v.x * sinv + v.y * cosv) * 64.0f));
 }
 
 
-int64_t mathTan(int64_t angle)
+SwFixed mathTan(SwFixed angle)
 {
     if (angle == 0) return 0;
-    return int64_t(tanf(TO_RADIAN(angle)) * 65536.0f);
+    return SwFixed(tanf(TO_RADIAN(angle)) * 65536.0f);
 }
 
 
-int64_t mathAtan(const SwPoint& pt)
+SwFixed mathAtan(const SwPoint& pt)
 {
     if (pt.zero()) return 0;
-    return int64_t(tvg::atan2(TO_FLOAT(pt.y), TO_FLOAT(pt.x)) * (180.0f / MATH_PI) * 65536.0f);
+    return SwFixed(tvg::atan2(TO_FLOAT(pt.y), TO_FLOAT(pt.x)) * (180.0f / MATH_PI) * 65536.0f);
 }
 
 
-int64_t mathSin(int64_t angle)
+SwFixed mathSin(SwFixed angle)
 {
     if (angle == 0) return 0;
     return mathCos(SW_ANGLE_PI2 - angle);
 }
 
 
-int64_t mathCos(int64_t angle)
+SwFixed mathCos(SwFixed angle)
 {
-    return int64_t(cosf(TO_RADIAN(angle)) * 65536.0f);
+    return SwFixed(cosf(TO_RADIAN(angle)) * 65536.0f);
 }
 
 
-int64_t mathLength(const SwPoint& pt)
+SwFixed mathLength(const SwPoint& pt)
 {
     if (pt.zero()) return 0;
 
@@ -205,20 +205,20 @@ int64_t mathLength(const SwPoint& pt)
     if (pt.y == 0) return abs(pt.x);
 
     auto v = pt.toPoint();
-    //return static_cast<int64_t>(sqrtf(v.x * v.x + v.y * v.y) * 65536.0f);
+    //return static_cast<SwFixed>(sqrtf(v.x * v.x + v.y * v.y) * 65536.0f);
 
     /* approximate sqrt(x*x + y*y) using alpha max plus beta min algorithm.
        With alpha = 1, beta = 3/8, giving results with the largest error less
        than 7% compared to the exact value. */
     if (v.x < 0) v.x = -v.x;
     if (v.y < 0) v.y = -v.y;
-    return static_cast<int64_t>((v.x > v.y) ? (v.x + v.y * 0.375f) : (v.y + v.x * 0.375f));
+    return static_cast<SwFixed>((v.x > v.y) ? (v.x + v.y * 0.375f) : (v.y + v.x * 0.375f));
 }
 
 
 void mathSplitCubic(SwPoint* base)
 {
-    int32_t a, b, c, d;
+    SwCoord a, b, c, d;
 
     base[6].x = base[3].x;
     c = base[1].x;
@@ -249,7 +249,7 @@ void mathSplitLine(SwPoint* base)
 }
 
 
-int64_t mathDiff(int64_t angle1, int64_t angle2)
+SwFixed mathDiff(SwFixed angle1, SwFixed angle2)
 {
     auto delta = angle2 - angle1;
 
@@ -270,10 +270,30 @@ SwPoint mathTransform(const Point* to, const Matrix& transform)
 }
 
 
-bool mathUpdateOutlineBBox(const SwOutline* outline, const RenderRegion& clipBox, RenderRegion& renderBox, bool fastTrack)
+bool mathClipBBox(const SwBBox& clipper, SwBBox& clippee)
 {
-    if (!outline || outline->pts.empty() || outline->cntrs.empty()) {
-        renderBox.reset();
+    clippee.max.x = (clippee.max.x < clipper.max.x) ? clippee.max.x : clipper.max.x;
+    clippee.max.y = (clippee.max.y < clipper.max.y) ? clippee.max.y : clipper.max.y;
+    clippee.min.x = (clippee.min.x > clipper.min.x) ? clippee.min.x : clipper.min.x;
+    clippee.min.y = (clippee.min.y > clipper.min.y) ? clippee.min.y : clipper.min.y;
+
+    //Check valid region
+    if (clippee.max.x - clippee.min.x < 1 && clippee.max.y - clippee.min.y < 1) return false;
+
+    //Check boundary
+    if (clippee.min.x >= clipper.max.x || clippee.min.y >= clipper.max.y ||
+        clippee.max.x <= clipper.min.x || clippee.max.y <= clipper.min.y) return false;
+
+    return true;
+}
+
+
+bool mathUpdateOutlineBBox(const SwOutline* outline, const SwBBox& clipRegion, SwBBox& renderRegion, bool fastTrack)
+{
+    if (!outline) return false;
+
+    if (outline->pts.empty() || outline->cntrs.empty()) {
+        renderRegion.reset();
         return false;
     }
 
@@ -292,13 +312,15 @@ bool mathUpdateOutlineBBox(const SwOutline* outline, const RenderRegion& clipBox
     }
 
     if (fastTrack) {
-        renderBox.min = {int32_t(round(xMin / 64.0f)), int32_t(round(yMin / 64.0f))};
-        renderBox.max = {int32_t(round(xMax / 64.0f)), int32_t(round(yMax / 64.0f))};
+        renderRegion.min.x = static_cast<SwCoord>(round(xMin / 64.0f));
+        renderRegion.max.x = static_cast<SwCoord>(round(xMax / 64.0f));
+        renderRegion.min.y = static_cast<SwCoord>(round(yMin / 64.0f));
+        renderRegion.max.y = static_cast<SwCoord>(round(yMax / 64.0f));
     } else {
-        renderBox.min = {xMin >> 6, yMin >> 6};
-        renderBox.max = {(xMax + 63) >> 6, (yMax + 63) >> 6};
+        renderRegion.min.x = xMin >> 6;
+        renderRegion.max.x = (xMax + 63) >> 6;
+        renderRegion.min.y = yMin >> 6;
+        renderRegion.max.y = (yMax + 63) >> 6;
     }
-
-    renderBox.intersect(clipBox);
-    return renderBox.valid();
+    return mathClipBBox(clipRegion, renderRegion);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp
index e90bc4bf..9f52f6a1 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,39 +22,90 @@
 
 #include "tvgSwCommon.h"
 
-/************************************************************************/
-/* Internal Class Implementation                                        */
-/************************************************************************/
-
-static thread_local SwMpool* _pool = nullptr;
-static Array<SwMpool*> _pools;
-static uint32_t _threads = 0;
-static Key _key;
 
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
 
-SwMpool* mpoolReq()
+SwOutline* mpoolReqOutline(SwMpool* mpool, unsigned idx)
 {
-    if (!_pool) {
-        _pool = new SwMpool(_threads);
-        ScopedLock lock(_key);
-        _pools.push(_pool);
-    }
-    return _pool;
+    return &mpool->outline[idx];
 }
 
-void mpoolInit(uint32_t threads)
+
+void mpoolRetOutline(SwMpool* mpool, unsigned idx)
 {
-    _threads = threads;
+    mpool->outline[idx].pts.clear();
+    mpool->outline[idx].cntrs.clear();
+    mpool->outline[idx].types.clear();
+    mpool->outline[idx].closed.clear();
 }
 
-void mpoolTerm()
+
+SwOutline* mpoolReqStrokeOutline(SwMpool* mpool, unsigned idx)
 {
-    for (auto p : _pools) {
-        delete p;
-        _pool = nullptr;
-    }
-    _pools.reset();
+    return &mpool->strokeOutline[idx];
+}
+
+
+void mpoolRetStrokeOutline(SwMpool* mpool, unsigned idx)
+{
+    mpool->strokeOutline[idx].pts.clear();
+    mpool->strokeOutline[idx].cntrs.clear();
+    mpool->strokeOutline[idx].types.clear();
+    mpool->strokeOutline[idx].closed.clear();
+}
+
+
+SwCellPool* mpoolReqCellPool(SwMpool* mpool, unsigned idx)
+{
+    return &mpool->cellPool[idx];
+}
+
+
+SwMpool* mpoolInit(uint32_t threads)
+{
+    auto allocSize = threads + 1;
+
+    auto mpool = static_cast<SwMpool*>(calloc(1, sizeof(SwMpool)));
+    mpool->outline = static_cast<SwOutline*>(calloc(1, sizeof(SwOutline) * allocSize));
+    mpool->strokeOutline = static_cast<SwOutline*>(calloc(1, sizeof(SwOutline) * allocSize));
+    mpool->cellPool = new SwCellPool[allocSize];
+
+    mpool->allocSize = allocSize;
+
+    return mpool;
+}
+
+
+bool mpoolClear(SwMpool* mpool)
+{
+    for (unsigned i = 0; i < mpool->allocSize; ++i) {
+        mpool->outline[i].pts.reset();
+        mpool->outline[i].cntrs.reset();
+        mpool->outline[i].types.reset();
+        mpool->outline[i].closed.reset();
+
+        mpool->strokeOutline[i].pts.reset();
+        mpool->strokeOutline[i].cntrs.reset();
+        mpool->strokeOutline[i].types.reset();
+        mpool->strokeOutline[i].closed.reset();
+    }
+
+    return true;
+}
+
+
+bool mpoolTerm(SwMpool* mpool)
+{
+    if (!mpool) return false;
+
+    mpoolClear(mpool);
+
+    free(mpool->outline);
+    free(mpool->strokeOutline);
+    delete[](mpool->cellPool);
+    free(mpool);
+
+    return true;
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
index e7cc19d0..057a9966 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -61,7 +61,7 @@ static inline int _gaussianRemap(int end, int idx)
 
 //TODO: SIMD OPTIMIZATION?
 template<int border = 0>
-static void _gaussianFilter(uint8_t* dst, uint8_t* src, int32_t stride, int32_t w, int32_t h, const RenderRegion& bbox, int32_t dimension, bool flipped)
+static void _gaussianFilter(uint8_t* dst, uint8_t* src, int32_t stride, int32_t w, int32_t h, const SwBBox& bbox, int32_t dimension, bool flipped)
 {
     if (flipped) {
         src += (bbox.min.x * stride + bbox.min.y) << 2;
@@ -108,7 +108,6 @@ static void _gaussianFilter(uint8_t* dst, uint8_t* src, int32_t stride, int32_t
 }
 
 
-//Fast Almost-Gaussian Filtering Method by Peter Kovesi
 static int _gaussianInit(SwGaussianBlur* data, float sigma, int quality)
 {
     const auto MAX_LEVEL = SwGaussianBlur::MAX_LEVEL;
@@ -136,17 +135,17 @@ static int _gaussianInit(SwGaussianBlur* data, float sigma, int quality)
 
 bool effectGaussianBlurRegion(RenderEffectGaussianBlur* params)
 {
-    //region expansion for feathering
-    auto& bbox = params->extend;
+    //bbox region expansion for feathering
+    auto& region = params->extend;
     auto extra = static_cast<SwGaussianBlur*>(params->rd)->extends;
 
     if (params->direction != 2) {
-        bbox.min.x = -extra;
-        bbox.max.x = extra;
+        region.x = -extra;
+        region.w = extra * 2;
     }
     if (params->direction != 1) {
-        bbox.min.y = -extra;
-        bbox.max.y = extra;
+        region.y = -extra;
+        region.h = extra * 2;
     }
 
     return true;
@@ -155,7 +154,7 @@ bool effectGaussianBlurRegion(RenderEffectGaussianBlur* params)
 
 void effectGaussianBlurUpdate(RenderEffectGaussianBlur* params, const Matrix& transform)
 {
-    if (!params->rd) params->rd = tvg::malloc<SwGaussianBlur>(sizeof(SwGaussianBlur));
+    if (!params->rd) params->rd = (SwGaussianBlur*)malloc(sizeof(SwGaussianBlur));
     auto rd = static_cast<SwGaussianBlur*>(params->rd);
 
     //compute box kernel sizes
@@ -184,7 +183,7 @@ bool effectGaussianBlur(SwCompositor* cmp, SwSurface* surface, const RenderEffec
     auto back = buffer.buf32;
     auto swapped = false;
 
-    TVGLOG("SW_ENGINE", "GaussianFilter region(%d, %d, %d, %d) params(%f %d %d), level(%d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->sigma, params->direction, params->border, data->level);
+    TVGLOG("SW_ENGINE", "GaussianFilter region(%ld, %ld, %ld, %ld) params(%f %d %d), level(%d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->sigma, params->direction, params->border, data->level);
 
     /* It is best to take advantage of the Gaussian blur’s separable property
        by dividing the process into two passes. horizontal and vertical.
@@ -230,7 +229,7 @@ struct SwDropShadow : SwGaussianBlur
 
 
 //TODO: SIMD OPTIMIZATION?
-static void _dropShadowFilter(uint32_t* dst, uint32_t* src, int stride, int w, int h, const RenderRegion& bbox, int32_t dimension, uint32_t color, bool flipped)
+static void _dropShadowFilter(uint32_t* dst, uint32_t* src, int stride, int w, int h, const SwBBox& bbox, int32_t dimension, uint32_t color, bool flipped)
 {
     if (flipped) {
         src += (bbox.min.x * stride + bbox.min.y);
@@ -266,7 +265,8 @@ static void _dropShadowFilter(uint32_t* dst, uint32_t* src, int stride, int w, i
     }
 }
 
-static void _shift(uint32_t** dst, uint32_t** src, int dstride, int sstride, int wmax, int hmax, const RenderRegion& bbox, SwPoint offset, SwSize& size)
+
+static void _shift(uint32_t** dst, uint32_t** src, int dstride, int sstride, int wmax, int hmax, const SwBBox& bbox, SwPoint offset, SwSize& size)
 {
     size.w = bbox.max.x - bbox.min.x;
     size.h = bbox.max.y - bbox.min.y;
@@ -290,7 +290,7 @@ static void _shift(uint32_t** dst, uint32_t** src, int dstride, int sstride, int
 }
 
 
-static void _dropShadowNoFilter(uint32_t* dst, uint32_t* src, int dstride, int sstride, int dw, int dh, const RenderRegion& bbox, const SwPoint& offset, uint32_t color, uint8_t opacity, bool direct)
+static void _dropShadowNoFilter(uint32_t* dst, uint32_t* src, int dstride, int sstride, int dw, int dh, const SwBBox& bbox, const SwPoint& offset, uint32_t color, uint8_t opacity, bool direct)
 {
     src += (bbox.min.y * sstride + bbox.min.x);
     dst += (bbox.min.y * dstride + bbox.min.x);
@@ -312,7 +312,7 @@ static void _dropShadowNoFilter(uint32_t* dst, uint32_t* src, int dstride, int s
 }
 
 
-static void _dropShadowNoFilter(SwImage* dimg, SwImage* simg, const RenderRegion& bbox, const SwPoint& offset, uint32_t color)
+static void _dropShadowNoFilter(SwImage* dimg, SwImage* simg, const SwBBox& bbox, const SwPoint& offset, uint32_t color)
 {
     int dstride = dimg->stride;
     int sstride = simg->stride;
@@ -336,7 +336,7 @@ static void _dropShadowNoFilter(SwImage* dimg, SwImage* simg, const RenderRegion
 }
 
 
-static void _dropShadowShift(uint32_t* dst, uint32_t* src, int dstride, int sstride, int dw, int dh, const RenderRegion& bbox, const SwPoint& offset, uint8_t opacity, bool direct)
+static void _dropShadowShift(uint32_t* dst, uint32_t* src, int dstride, int sstride, int dw, int dh, const SwBBox& bbox, const SwPoint& offset, uint8_t opacity, bool direct)
 {
     src += (bbox.min.y * sstride + bbox.min.x);
     dst += (bbox.min.y * dstride + bbox.min.x);
@@ -355,19 +355,20 @@ static void _dropShadowShift(uint32_t* dst, uint32_t* src, int dstride, int sstr
 
 bool effectDropShadowRegion(RenderEffectDropShadow* params)
 {
-    //region expansion for feathering
-    auto& bbox = params->extend;
+    //bbox region expansion for feathering
+    auto& region = params->extend;
     auto& offset = static_cast<SwDropShadow*>(params->rd)->offset;
     auto extra = static_cast<SwDropShadow*>(params->rd)->extends;
 
-    bbox.min = {-extra, -extra};
-    bbox.max = {extra, extra};
+    region.x = -extra;
+    region.w = extra * 2;
+    region.y = -extra;
+    region.h = extra * 2;
 
-    if (offset.x < 0) bbox.min.x += (int32_t) offset.x;
-    else bbox.max.x += offset.x;
-
-    if (offset.y < 0) bbox.min.y += (int32_t) offset.y;
-    else bbox.max.y += offset.y;
+    region.x = std::min(region.x + (int32_t)offset.x, region.x);
+    region.y = std::min(region.y + (int32_t)offset.y, region.y);
+    region.w += abs(offset.x);
+    region.h += abs(offset.y);
 
     return true;
 }
@@ -375,7 +376,7 @@ bool effectDropShadowRegion(RenderEffectDropShadow* params)
 
 void effectDropShadowUpdate(RenderEffectDropShadow* params, const Matrix& transform)
 {
-    if (!params->rd) params->rd = tvg::malloc<SwDropShadow>(sizeof(SwDropShadow));
+    if (!params->rd) params->rd = (SwDropShadow*)malloc(sizeof(SwDropShadow));
     auto rd = static_cast<SwDropShadow*>(params->rd);
 
     //compute box kernel sizes
@@ -419,7 +420,7 @@ bool effectDropShadow(SwCompositor* cmp, SwSurface* surface[2], const RenderEffe
 
     auto opacity = direct ? MULTIPLY(params->color[3], cmp->opacity) : params->color[3];
 
-    TVGLOG("SW_ENGINE", "DropShadow region(%d, %d, %d, %d) params(%f %f %f), level(%d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->angle, params->distance, params->sigma, data->level);
+    TVGLOG("SW_ENGINE", "DropShadow region(%ld, %ld, %ld, %ld) params(%f %f %f), level(%d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->angle, params->distance, params->sigma, data->level);
 
     //no filter required
     if (data->extends == 0)  {
@@ -500,7 +501,7 @@ bool effectFill(SwCompositor* cmp, const RenderEffectFill* params, bool direct)
     auto h = size_t(bbox.max.y - bbox.min.y);
     auto color = cmp->recoverSfc->join(params->color[0], params->color[1], params->color[2], 255);
 
-    TVGLOG("SW_ENGINE", "Fill region(%d, %d, %d, %d), param(%d %d %d %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->color[0], params->color[1], params->color[2], params->color[3]);
+    TVGLOG("SW_ENGINE", "Fill region(%ld, %ld, %ld, %ld), param(%d %d %d %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->color[0], params->color[1], params->color[2], params->color[3]);
 
     if (direct) {
         auto dbuffer = cmp->recoverSfc->buf32 + (bbox.min.y * cmp->recoverSfc->stride + bbox.min.x);
@@ -537,7 +538,7 @@ bool effectFill(SwCompositor* cmp, const RenderEffectFill* params, bool direct)
 
 void effectTintUpdate(RenderEffectTint* params)
 {
-    params->valid = (params->intensity > 0);
+    params->valid = true;
 }
 
 
@@ -551,7 +552,7 @@ bool effectTint(SwCompositor* cmp, const RenderEffectTint* params, bool direct)
     auto opacity = cmp->opacity;
     auto luma = cmp->recoverSfc->alphas[2];  //luma function
 
-    TVGLOG("SW_ENGINE", "Tint region(%d, %d, %d, %d), param(%d %d %d, %d %d %d, %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->black[0], params->black[1], params->black[2], params->white[0], params->white[1], params->white[2], params->intensity);
+    TVGLOG("SW_ENGINE", "Tint region(%ld, %ld, %ld, %ld), param(%d %d %d, %d %d %d, %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->black[0], params->black[1], params->black[2], params->white[0], params->white[1], params->white[2], params->intensity);
 
     if (direct) {
         auto dbuffer = cmp->recoverSfc->buf32 + (bbox.min.y * cmp->recoverSfc->stride + bbox.min.x);
@@ -560,9 +561,9 @@ bool effectTint(SwCompositor* cmp, const RenderEffectTint* params, bool direct)
             auto dst = dbuffer;
             auto src = sbuffer;
             for (size_t x = 0; x < w; ++x, ++dst, ++src) {
-                auto val = INTERPOLATE(white, black, luma((uint8_t*)src));
-                if (params->intensity < 255) val = INTERPOLATE(val, *src, params->intensity);
-                *dst = INTERPOLATE(val, *dst, MULTIPLY(opacity, A(*src)));
+                auto tmp = rasterUnpremultiply(*src);
+                auto val = INTERPOLATE(INTERPOLATE(black, white, luma((uint8_t*)&tmp)), tmp, params->intensity);
+                *dst = INTERPOLATE(val, *dst, MULTIPLY(opacity, A(tmp)));
             }
             dbuffer += cmp->image.stride;
             sbuffer += cmp->recoverSfc->stride;
@@ -573,9 +574,9 @@ bool effectTint(SwCompositor* cmp, const RenderEffectTint* params, bool direct)
         for (size_t y = 0; y < h; ++y) {
             auto dst = dbuffer;
             for (size_t x = 0; x < w; ++x, ++dst) {
-                auto val = INTERPOLATE(white, black, luma((uint8_t*)&dst));
-                if (params->intensity < 255) val = INTERPOLATE(val, *dst, params->intensity);
-                *dst = ALPHA_BLEND(val, MULTIPLY(opacity, A(*dst)));
+                auto tmp = rasterUnpremultiply(*dst);
+                auto val = INTERPOLATE(INTERPOLATE(black, white, luma((uint8_t*)&tmp)), tmp, params->intensity);
+                *dst = ALPHA_BLEND(val, A(tmp));
             }
             dbuffer += cmp->image.stride;
         }
@@ -603,7 +604,7 @@ static uint32_t _trintone(uint32_t s, uint32_t m, uint32_t h, int l)
 
 void effectTritoneUpdate(RenderEffectTritone* params)
 {
-    params->valid = (params->blender < 255);
+    params->valid = true;
 }
 
 
@@ -618,7 +619,7 @@ bool effectTritone(SwCompositor* cmp, const RenderEffectTritone* params, bool di
     auto opacity = cmp->opacity;
     auto luma = cmp->recoverSfc->alphas[2];  //luma function
 
-    TVGLOG("SW_ENGINE", "Tritone region(%d, %d, %d, %d), param(%d %d %d, %d %d %d, %d %d %d, %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->shadow[0], params->shadow[1], params->shadow[2], params->midtone[0], params->midtone[1], params->midtone[2], params->highlight[0], params->highlight[1], params->highlight[2], params->blender);
+    TVGLOG("SW_ENGINE", "Tritone region(%ld, %ld, %ld, %ld), param(%d %d %d, %d %d %d, %d %d %d)", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y, params->shadow[0], params->shadow[1], params->shadow[2], params->midtone[0], params->midtone[1], params->midtone[2], params->highlight[0], params->highlight[1], params->highlight[2]);
 
     if (direct) {
         auto dbuffer = cmp->recoverSfc->buf32 + (bbox.min.y * cmp->recoverSfc->stride + bbox.min.x);
@@ -626,14 +627,9 @@ bool effectTritone(SwCompositor* cmp, const RenderEffectTritone* params, bool di
         for (size_t y = 0; y < h; ++y) {
             auto dst = dbuffer;
             auto src = sbuffer;
-            if (params->blender == 0) {
-                for (size_t x = 0; x < w; ++x, ++dst, ++src) {
-                    *dst = INTERPOLATE(_trintone(shadow, midtone, highlight, luma((uint8_t*)src)), *dst, MULTIPLY(opacity, A(*src)));
-                }
-            } else {
-                for (size_t x = 0; x < w; ++x, ++dst, ++src) {
-                    *dst = INTERPOLATE(INTERPOLATE(*src, _trintone(shadow, midtone, highlight, luma((uint8_t*)src)), params->blender), *dst, MULTIPLY(opacity, A(*src)));
-                }
+            for (size_t x = 0; x < w; ++x, ++dst, ++src) {
+                auto tmp = rasterUnpremultiply(*src);
+                *dst = INTERPOLATE(_trintone(shadow, midtone, highlight, luma((uint8_t*)&tmp)), *dst, MULTIPLY(opacity, A(tmp)));
             }
             dbuffer += cmp->image.stride;
             sbuffer += cmp->recoverSfc->stride;
@@ -643,14 +639,9 @@ bool effectTritone(SwCompositor* cmp, const RenderEffectTritone* params, bool di
         auto dbuffer = cmp->image.buf32 + (bbox.min.y * cmp->image.stride + bbox.min.x);
         for (size_t y = 0; y < h; ++y) {
             auto dst = dbuffer;
-            if (params->blender == 0) {
-                for (size_t x = 0; x < w; ++x, ++dst) {
-                    *dst = ALPHA_BLEND(_trintone(shadow, midtone, highlight, luma((uint8_t*)dst)), MULTIPLY(A(*dst), opacity));
-                }
-            } else {
-                for (size_t x = 0; x < w; ++x, ++dst) {
-                    *dst = ALPHA_BLEND(INTERPOLATE(*dst, _trintone(shadow, midtone, highlight, luma((uint8_t*)dst)), params->blender), MULTIPLY(A(*dst), opacity));
-                }
+            for (size_t x = 0; x < w; ++x, ++dst) {
+                auto tmp = rasterUnpremultiply(*dst);
+                *dst = ALPHA_BLEND(_trintone(shadow, midtone, highlight, luma((uint8_t*)&tmp)), A(tmp));
             }
             dbuffer += cmp->image.stride;
         }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
index 63c96562..8c6dda67 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,14 @@
  * SOFTWARE.
  */
 
+#ifdef _WIN32
+    #include <malloc.h>
+#elif defined(__linux__) || defined(__ZEPHYR__)
+    #include <alloca.h>
+#else
+    #include <stdlib.h>
+#endif
+
 #include "tvgMath.h"
 #include "tvgRender.h"
 #include "tvgSwCommon.h"
@@ -27,7 +35,6 @@
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
-
 constexpr auto DOWN_SCALE_TOLERANCE = 0.5f;
 
 struct FillLinear
@@ -42,7 +49,7 @@ struct FillLinear
         fillLinear(fill, dst, y, x, len, cmp, op, a);
     }
 
-    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a)
+    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a)
     {
         fillLinear(fill, dst, y, x, len, op, a);
     }
@@ -52,7 +59,7 @@ struct FillLinear
         fillLinear(fill, dst, y, x, len, cmp, alpha, csize, opacity);
     }
 
-    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a)
+    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a)
     {
         fillLinear(fill, dst, y, x, len, op, op2, a);
     }
@@ -71,7 +78,7 @@ struct FillRadial
         fillRadial(fill, dst, y, x, len, cmp, op, a);
     }
 
-    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, uint8_t a)
+    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, uint8_t a)
     {
         fillRadial(fill, dst, y, x, len, op, a);
     }
@@ -81,7 +88,7 @@ struct FillRadial
         fillRadial(fill, dst, y, x, len, cmp, alpha, csize, opacity);
     }
 
-    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlenderA op, SwBlender op2, uint8_t a)
+    void operator()(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len, SwBlender op, SwBlender op2, uint8_t a)
     {
         fillRadial(fill, dst, y, x, len, op, op2, a);
     }
@@ -103,14 +110,14 @@ static inline uint8_t _ialpha(uint8_t* a)
 static inline uint8_t _abgrLuma(uint8_t* c)
 {
     auto v = *(uint32_t*)c;
-    return ((((v&0xff)*54) + (((v>>8)&0xff)*182) + (((v>>16)&0xff)*19))) >> 8; //0.2126*R + 0.7152*G + 0.0722*B
+    return ((((v&0xff)*54) + (((v>>8)&0xff)*183) + (((v>>16)&0xff)*19))) >> 8; //0.2125*R + 0.7154*G + 0.0721*B
 }
 
 
 static inline uint8_t _argbLuma(uint8_t* c)
 {
     auto v = *(uint32_t*)c;
-    return ((((v&0xff)*19) + (((v>>8)&0xff)*182) + (((v>>16)&0xff)*54))) >> 8; //0.0722*B + 0.7152*G + 0.2126*R
+    return ((((v&0xff)*19) + (((v>>8)&0xff)*183) + (((v>>16)&0xff)*54))) >> 8; //0.0721*B + 0.7154*G + 0.2125*R
 }
 
 
@@ -147,14 +154,14 @@ static inline bool _blending(const SwSurface* surface)
    This would help to enhance the performance by avoiding the unnecessary matting from the composition */
 static inline bool _compositing(const SwSurface* surface)
 {
-    if (!surface->compositor || surface->compositor->method == MaskMethod::None) return false;
+    if (!surface->compositor || (int)surface->compositor->method <= (int)CompositeMethod::ClipPath) return false;
     return true;
 }
 
 
 static inline bool _matting(const SwSurface* surface)
 {
-    if ((int)surface->compositor->method < (int)MaskMethod::Add) return true;
+    if ((int)surface->compositor->method < (int)CompositeMethod::AddMask) return true;
     else return false;
 }
 
@@ -199,36 +206,36 @@ static inline uint8_t _opMaskDarken(uint8_t s, uint8_t d, uint8_t a)
 }
 
 
-static inline bool _direct(MaskMethod method)
+static inline bool _direct(CompositeMethod method)
 {
-    if (method == MaskMethod::Subtract || method == MaskMethod::Intersect || method == MaskMethod::Darken) return true;
+    if (method == CompositeMethod::SubtractMask || method == CompositeMethod::IntersectMask || method == CompositeMethod::DarkenMask) return true;
     return false;
 }
 
 
-static inline SwMask _getMaskOp(MaskMethod method)
+static inline SwMask _getMaskOp(CompositeMethod method)
 {
     switch (method) {
-        case MaskMethod::Add: return _opMaskAdd;
-        case MaskMethod::Subtract: return _opMaskSubtract;
-        case MaskMethod::Difference: return _opMaskDifference;
-        case MaskMethod::Intersect: return _opMaskIntersect;
-        case MaskMethod::Lighten: return _opMaskLighten;
-        case MaskMethod::Darken: return _opMaskDarken;
+        case CompositeMethod::AddMask: return _opMaskAdd;
+        case CompositeMethod::SubtractMask: return _opMaskSubtract;
+        case CompositeMethod::DifferenceMask: return _opMaskDifference;
+        case CompositeMethod::IntersectMask: return _opMaskIntersect;
+        case CompositeMethod::LightenMask: return _opMaskLighten;
+        case CompositeMethod::DarkenMask: return _opMaskDarken;
         default: return nullptr;
     }
 }
 
 
-static bool _compositeMaskImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox)
+static bool _compositeMaskImage(SwSurface* surface, const SwImage& image, const SwBBox& region)
 {
-    auto dbuffer = &surface->buf8[bbox.min.y * surface->stride + bbox.min.x];
-    auto sbuffer = image.buf8 + (bbox.min.y + image.oy) * image.stride + (bbox.min.x + image.ox);
+    auto dbuffer = &surface->buf8[region.min.y * surface->stride + region.min.x];
+    auto sbuffer = image.buf8 + (region.min.y + image.oy) * image.stride + (region.min.x + image.ox);
 
-    for (auto y = bbox.min.y; y < bbox.max.y; ++y) {
+    for (auto y = region.min.y; y < region.max.y; ++y) {
         auto dst = dbuffer;
         auto src = sbuffer;
-        for (auto x = bbox.min.x; x < bbox.max.x; x++, dst++, src++) {
+        for (auto x = region.min.x; x < region.max.x; x++, dst++, src++) {
             *dst = *src + MULTIPLY(*dst, ~*src);
         }
         dbuffer += surface->stride;
@@ -252,16 +259,9 @@ static inline uint32_t _sampleSize(float scale)
 }
 
 
-//Nearest Interpolation
-static uint32_t _interpNoScaler(const uint32_t *img, uint32_t stride, TVG_UNUSED uint32_t w, TVG_UNUSED uint32_t h, float sx, float sy, TVG_UNUSED int32_t miny, TVG_UNUSED int32_t maxy, TVG_UNUSED int32_t n)
-{
-    return img[uint32_t(sx) + uint32_t(sy) * stride];
-}
-
-
 //Bilinear Interpolation
 //OPTIMIZE_ME: Skip the function pointer access
-static uint32_t _interpUpScaler(const uint32_t *img, uint32_t stride, uint32_t w, uint32_t h, float sx, float sy, TVG_UNUSED int32_t miny, TVG_UNUSED int32_t maxy, TVG_UNUSED int32_t n)
+static uint32_t _interpUpScaler(const uint32_t *img, TVG_UNUSED uint32_t stride, uint32_t w, uint32_t h, float sx, float sy, TVG_UNUSED int32_t miny, TVG_UNUSED int32_t maxy, TVG_UNUSED int32_t n)
 {
     auto rx = (size_t)(sx);
     auto ry = (size_t)(sy);
@@ -273,10 +273,10 @@ static uint32_t _interpUpScaler(const uint32_t *img, uint32_t stride, uint32_t w
     auto dx = (sx > 0.0f) ? static_cast<uint8_t>((sx - rx) * 255.0f) : 0;
     auto dy = (sy > 0.0f) ? static_cast<uint8_t>((sy - ry) * 255.0f) : 0;
 
-    auto c1 = img[rx + ry * stride];
-    auto c2 = img[rx2 + ry * stride];
-    auto c3 = img[rx + ry2 * stride];
-    auto c4 = img[rx2 + ry2 * stride];
+    auto c1 = img[rx + ry * w];
+    auto c2 = img[rx2 + ry * w];
+    auto c3 = img[rx + ry2 * w];
+    auto c4 = img[rx2 + ry2 * w];
 
     return INTERPOLATE(INTERPOLATE(c4, c3, dx), INTERPOLATE(c2, c1, dx), dy);
 }
@@ -320,29 +320,21 @@ static uint32_t _interpDownScaler(const uint32_t *img, uint32_t stride, uint32_t
 }
 
 
-using ImageScaleFilter = uint32_t (*)(const uint32_t* img, uint32_t stride, uint32_t w, uint32_t h, float sx, float sy, int32_t miny, int32_t maxy, int32_t n);
-
-
-static ImageScaleFilter _scaleMethod(const SwImage& image)
-{
-    if (image.filter == FilterMethod::Bilinear) return image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
-    return _interpNoScaler;
-}
-
-
 /************************************************************************/
 /* Rect                                                                 */
 /************************************************************************/
 
-static bool _rasterCompositeMaskedRect(SwSurface* surface, const RenderRegion& bbox, SwMask maskOp, uint8_t a)
+static bool _rasterCompositeMaskedRect(SwSurface* surface, const SwBBox& region, SwMask maskOp, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
     auto cstride = surface->compositor->image.stride;
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * cstride + bbox.min.x);   //compositor buffer
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * cstride + region.min.x);   //compositor buffer
     auto ialpha = 255 - a;
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
+    for (uint32_t y = 0; y < h; ++y) {
         auto cmp = cbuffer;
-        for (uint32_t x = 0; x < bbox.w(); ++x, ++cmp) {
+        for (uint32_t x = 0; x < w; ++x, ++cmp) {
             *cmp = maskOp(a, *cmp, ialpha);
         }
         cbuffer += cstride;
@@ -351,15 +343,17 @@ static bool _rasterCompositeMaskedRect(SwSurface* surface, const RenderRegion& b
 }
 
 
-static bool _rasterDirectMaskedRect(SwSurface* surface, const RenderRegion& bbox, SwMask maskOp, uint8_t a)
+static bool _rasterDirectMaskedRect(SwSurface* surface, const SwBBox& region, SwMask maskOp, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * surface->compositor->image.stride + bbox.min.x);   //compositor buffer
-    auto dbuffer = surface->buf8 + (bbox.min.y * surface->stride + bbox.min.x);   //destination buffer
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * surface->compositor->image.stride + region.min.x);   //compositor buffer
+    auto dbuffer = surface->buf8 + (region.min.y * surface->stride + region.min.x);   //destination buffer
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
+    for (uint32_t y = 0; y < h; ++y) {
         auto cmp = cbuffer;
         auto dst = dbuffer;
-        for (uint32_t x = 0; x < bbox.w(); ++x, ++cmp, ++dst) {
+        for (uint32_t x = 0; x < w; ++x, ++cmp, ++dst) {
             auto tmp = maskOp(a, *cmp, 0);   //not use alpha.
             *dst = tmp + MULTIPLY(*dst, ~tmp);
         }
@@ -370,48 +364,50 @@ static bool _rasterDirectMaskedRect(SwSurface* surface, const RenderRegion& bbox
 }
 
 
-static bool _rasterMaskedRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterMaskedRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     //8bit masking channels composition
     if (surface->channelSize != sizeof(uint8_t)) return false;
 
-    TVGLOG("SW_ENGINE", "Masked(%d) Rect [Region: %d %d %d %d]", (int)surface->compositor->method, bbox.min.x, bbox.min.y, bbox.max.x - bbox.min.x, bbox.max.y - bbox.min.y);
+    TVGLOG("SW_ENGINE", "Masked(%d) Rect [Region: %lu %lu %lu %lu]", (int)surface->compositor->method, region.min.x, region.min.y, region.max.x - region.min.x, region.max.y - region.min.y);
 
     auto maskOp = _getMaskOp(surface->compositor->method);
-    if (_direct(surface->compositor->method)) return _rasterDirectMaskedRect(surface, bbox, maskOp, c.a);
-    else return _rasterCompositeMaskedRect(surface, bbox, maskOp, c.a);
+    if (_direct(surface->compositor->method)) return _rasterDirectMaskedRect(surface, region, maskOp, r, g, b, a);
+    else return _rasterCompositeMaskedRect(surface, region, maskOp, r, g, b, a);
     return false;
 }
 
 
-static bool _rasterMattedRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterMattedRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
     auto csize = surface->compositor->image.channelSize;
-    auto cbuffer = surface->compositor->image.buf8 + ((bbox.min.y * surface->compositor->image.stride + bbox.min.x) * csize);   //compositor buffer
+    auto cbuffer = surface->compositor->image.buf8 + ((region.min.y * surface->compositor->image.stride + region.min.x) * csize);   //compositor buffer
     auto alpha = surface->alpha(surface->compositor->method);
 
-    TVGLOG("SW_ENGINE", "Matted(%d) Rect [Region: %u %u %u %u]", (int)surface->compositor->method, bbox.x(), bbox.y(), bbox.w(), bbox.h());
+    TVGLOG("SW_ENGINE", "Matted(%d) Rect [Region: %lu %lu %u %u]", (int)surface->compositor->method, region.min.x, region.min.y, w, h);
 
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
+        auto color = surface->join(r, g, b, a);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
             auto cmp = &cbuffer[y * surface->compositor->image.stride * csize];
-            for (uint32_t x = 0; x < bbox.w(); ++x, ++dst, cmp += csize) {
+            for (uint32_t x = 0; x < w; ++x, ++dst, cmp += csize) {
                 auto tmp = ALPHA_BLEND(color, alpha(cmp));
                 *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
             }
         }
     //8bits grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
             auto cmp = &cbuffer[y * surface->compositor->image.stride * csize];
-            for (uint32_t x = 0; x < bbox.w(); ++x, ++dst, cmp += csize) {
-                *dst = INTERPOLATE8(c.a, *dst, alpha(cmp));
+            for (uint32_t x = 0; x < w; ++x, ++dst, cmp += csize) {
+                *dst = INTERPOLATE8(a, *dst, alpha(cmp));
             }
         }
     }
@@ -419,50 +415,55 @@ static bool _rasterMattedRect(SwSurface* surface, const RenderRegion& bbox, cons
 }
 
 
-static bool _rasterBlendingRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterBlendingRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     if (surface->channelSize != sizeof(uint32_t)) return false;
 
-    auto color = surface->join(c.r, c.g, c.b, c.a);
-    auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto color = surface->join(r, g, b, a);
+    auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
+    for (uint32_t y = 0; y < h; ++y) {
         auto dst = &buffer[y * surface->stride];
-        for (uint32_t x = 0; x < bbox.w(); ++x, ++dst) {
-            *dst = surface->blender(color, *dst);
+        for (uint32_t x = 0; x < w; ++x, ++dst) {
+            *dst = surface->blender(color, *dst, 255);
         }
     }
     return true;
 }
 
 
-static bool _rasterTranslucentRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterTranslucentRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
 #if defined(THORVG_AVX_VECTOR_SUPPORT)
-    return avxRasterTranslucentRect(surface, bbox, c);
+    return avxRasterTranslucentRect(surface, region, r, g, b, a);
 #elif defined(THORVG_NEON_VECTOR_SUPPORT)
-    return neonRasterTranslucentRect(surface, bbox, c);
+    return neonRasterTranslucentRect(surface, region, r, g, b, a);
 #else
-    return cRasterTranslucentRect(surface, bbox, c);
+    return cRasterTranslucentRect(surface, region, r, g, b, a);
 #endif
 }
 
 
-static bool _rasterSolidRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterSolidRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b)
 {
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, 255);
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride);
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            rasterPixel32(buffer + y * surface->stride, color, bbox.min.x, bbox.w());
+        auto color = surface->join(r, g, b, 255);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride);
+        for (uint32_t y = 0; y < h; ++y) {
+            rasterPixel32(buffer + y * surface->stride, color, region.min.x, w);
         }
         return true;
     }
     //8bits grayscale
     if (surface->channelSize == sizeof(uint8_t)) {
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            rasterGrayscale8(surface->buf8, 255, (y + bbox.min.y) * surface->stride + bbox.min.x, bbox.w());
+        for (uint32_t y = 0; y < h; ++y) {
+            rasterGrayscale8(surface->buf8, 255, (y + region.min.y) * surface->stride + region.min.x, w);
         }
         return true;
     }
@@ -470,16 +471,16 @@ static bool _rasterSolidRect(SwSurface* surface, const RenderRegion& bbox, const
 }
 
 
-static bool _rasterRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     if (_compositing(surface)) {
-        if (_matting(surface)) return _rasterMattedRect(surface, bbox, c);
-        else return _rasterMaskedRect(surface, bbox, c);
+        if (_matting(surface)) return _rasterMattedRect(surface, region, r, g, b, a);
+        else return _rasterMaskedRect(surface, region, r, g, b, a);
     } else if (_blending(surface)) {
-        return _rasterBlendingRect(surface, bbox, c);
+        return _rasterBlendingRect(surface, region, r, g, b, a);
     } else {
-        if (c.a == 255) return _rasterSolidRect(surface, bbox, c);
-        else return _rasterTranslucentRect(surface, bbox, c);
+        if (a == 255) return _rasterSolidRect(surface, region, r, g, b);
+        else return _rasterTranslucentRect(surface, region, r, g, b, a);
     }
     return false;
 }
@@ -489,21 +490,19 @@ static bool _rasterRect(SwSurface* surface, const RenderRegion& bbox, const Rend
 /* Rle                                                                  */
 /************************************************************************/
 
-static bool _rasterCompositeMaskedRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox, SwMask maskOp, uint8_t a)
+static bool _rasterCompositeMaskedRle(SwSurface* surface, SwRle* rle, SwMask maskOp, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
+    auto span = rle->spans;
     auto cbuffer = surface->compositor->image.buf8;
     auto cstride = surface->compositor->image.stride;
-    const SwSpan* end;
-    int32_t x, len;
     uint8_t src;
 
-    for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto cmp = &cbuffer[span->y * cstride + x];
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+        auto cmp = &cbuffer[span->y * cstride + span->x];
         if (span->coverage == 255) src = a;
         else src = MULTIPLY(a, span->coverage);
         auto ialpha = 255 - src;
-        for (auto x = 0; x < len; ++x, ++cmp) {
+        for (auto x = 0; x < span->len; ++x, ++cmp) {
             *cmp = maskOp(src, *cmp, ialpha);
         }
     }
@@ -511,21 +510,19 @@ static bool _rasterCompositeMaskedRle(SwSurface* surface, SwRle* rle, const Rend
 }
 
 
-static bool _rasterDirectMaskedRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox, SwMask maskOp, uint8_t a)
+static bool _rasterDirectMaskedRle(SwSurface* surface, SwRle* rle, SwMask maskOp, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
+    auto span = rle->spans;
     auto cbuffer = surface->compositor->image.buf8;
     auto cstride = surface->compositor->image.stride;
-    const SwSpan* end;
-    int32_t x, len;
     uint8_t src;
 
-    for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto cmp = &cbuffer[span->y * cstride + x];
-        auto dst = &surface->buf8[span->y * surface->stride + x];
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+        auto cmp = &cbuffer[span->y * cstride + span->x];
+        auto dst = &surface->buf8[span->y * surface->stride + span->x];
         if (span->coverage == 255) src = a;
         else src = MULTIPLY(a, span->coverage);
-        for (auto x = 0; x < len; ++x, ++cmp, ++dst) {
+        for (auto x = 0; x < span->len; ++x, ++cmp, ++dst) {
             auto tmp = maskOp(src, *cmp, 0);     //not use alpha
             *dst = tmp + MULTIPLY(*dst, ~tmp);
         }
@@ -534,7 +531,7 @@ static bool _rasterDirectMaskedRle(SwSurface* surface, SwRle* rle, const RenderR
 }
 
 
-static bool _rasterMaskedRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterMaskedRle(SwSurface* surface, SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     TVGLOG("SW_ENGINE", "Masked(%d) Rle", (int)surface->compositor->method);
 
@@ -542,33 +539,31 @@ static bool _rasterMaskedRle(SwSurface* surface, SwRle* rle, const RenderRegion&
     if (surface->channelSize != sizeof(uint8_t)) return false;
 
     auto maskOp = _getMaskOp(surface->compositor->method);
-    if (_direct(surface->compositor->method)) return _rasterDirectMaskedRle(surface, rle, bbox, maskOp, c.a);
-    else return _rasterCompositeMaskedRle(surface, rle, bbox, maskOp, c.a);
+    if (_direct(surface->compositor->method)) return _rasterDirectMaskedRle(surface, rle, maskOp, r, g, b, a);
+    else return _rasterCompositeMaskedRle(surface, rle, maskOp, r, g, b, a);
     return false;
 }
 
 
-static bool _rasterMattedRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterMattedRle(SwSurface* surface, SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     TVGLOG("SW_ENGINE", "Matted(%d) Rle", (int)surface->compositor->method);
 
+    auto span = rle->spans;
     auto cbuffer = surface->compositor->image.buf8;
     auto csize = surface->compositor->image.channelSize;
     auto alpha = surface->alpha(surface->compositor->method);
-    const SwSpan* end;
-    int32_t x, len;
 
     //32bit channels
     if (surface->channelSize == sizeof(uint32_t)) {
         uint32_t src;
-        auto color = surface->join(c.r, c.g, c.b, c.a);
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf32[span->y * surface->stride + x];
-            auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + x) * csize];
+        auto color = surface->join(r, g, b, a);
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf32[span->y * surface->stride + span->x];
+            auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + span->x) * csize];
             if (span->coverage == 255) src = color;
             else src = ALPHA_BLEND(color, span->coverage);
-            for (auto x = 0; x < len; ++x, ++dst, cmp += csize) {
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, cmp += csize) {
                 auto tmp = ALPHA_BLEND(src, alpha(cmp));
                 *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
             }
@@ -576,13 +571,12 @@ static bool _rasterMattedRle(SwSurface* surface, SwRle* rle, const RenderRegion&
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         uint8_t src;
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf8[span->y * surface->stride + x];
-            auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + x) * csize];
-            if (span->coverage == 255) src = c.a;
-            else src = MULTIPLY(c.a, span->coverage);
-            for (auto x = 0; x < len; ++x, ++dst, cmp += csize) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf8[span->y * surface->stride + span->x];
+            auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + span->x) * csize];
+            if (span->coverage == 255) src = a;
+            else src = MULTIPLY(a, span->coverage);
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, cmp += csize) {
                 *dst = INTERPOLATE8(src, *dst, alpha(cmp));
             }
         }
@@ -591,24 +585,23 @@ static bool _rasterMattedRle(SwSurface* surface, SwRle* rle, const RenderRegion&
 }
 
 
-static bool _rasterBlendingRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterBlendingRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
     if (surface->channelSize != sizeof(uint32_t)) return false;
 
-    auto color = surface->join(c.r, c.g, c.b, c.a);
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = rle->spans;
+    auto color = surface->join(r, g, b, a);
 
-    for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto dst = &surface->buf32[span->y * surface->stride + x];
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+        auto dst = &surface->buf32[span->y * surface->stride + span->x];
         if (span->coverage == 255) {
-            for (auto x = 0; x < len; ++x, ++dst) {
-                *dst = surface->blender(color, *dst);
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
+                *dst = surface->blender(color, *dst, 255);
             }
         } else {
-            for (auto x = 0; x < len; ++x, ++dst) {
-                *dst = INTERPOLATE(surface->blender(color, *dst), *dst, span->coverage);
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
+                auto tmp = surface->blender(color, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, span->coverage);
             }
         }
     }
@@ -616,47 +609,46 @@ static bool _rasterBlendingRle(SwSurface* surface, const SwRle* rle, const Rende
 }
 
 
-static bool _rasterTranslucentRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterTranslucentRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
 #if defined(THORVG_AVX_VECTOR_SUPPORT)
-    return avxRasterTranslucentRle(surface, rle, bbox, c);
+    return avxRasterTranslucentRle(surface, rle, r, g, b, a);
 #elif defined(THORVG_NEON_VECTOR_SUPPORT)
-    return neonRasterTranslucentRle(surface, rle, bbox, c);
+    return neonRasterTranslucentRle(surface, rle, r, g, b, a);
 #else
-    return cRasterTranslucentRle(surface, rle, bbox, c);
+    return cRasterTranslucentRle(surface, rle, r, g, b, a);
 #endif
 }
 
 
-static bool _rasterSolidRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterSolidRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = rle->spans;
 
     //32bit channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, 255);
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            if (span->coverage == 255) rasterPixel32(surface->buf32 + span->y * surface->stride, color, x, len);
-            else {
-                auto dst = &surface->buf32[span->y * surface->stride + x];
+        auto color = surface->join(r, g, b, 255);
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            if (span->coverage == 255) {
+                rasterPixel32(surface->buf32 + span->y * surface->stride, color, span->x, span->len);
+            } else {
+                auto dst = &surface->buf32[span->y * surface->stride + span->x];
                 auto src = ALPHA_BLEND(color, span->coverage);
                 auto ialpha = 255 - span->coverage;
-                for (auto x = 0; x < len; ++x, ++dst) {
+                for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                     *dst = src + ALPHA_BLEND(*dst, ialpha);
                 }
             }
         }
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            if (span->coverage == 255) rasterGrayscale8(surface->buf8, span->coverage, span->y * surface->stride + x, len);
-            else {
-                auto dst = &surface->buf8[span->y * surface->stride + x];
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            if (span->coverage == 255) {
+                rasterGrayscale8(surface->buf8, span->coverage, span->y * surface->stride + span->x, span->len);
+            } else {
+                auto dst = &surface->buf8[span->y * surface->stride + span->x];
                 auto ialpha = 255 - span->coverage;
-                for (auto x = 0; x < len; ++x, ++dst) {
+                for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                     *dst = span->coverage + MULTIPLY(*dst, ialpha);
                 }
             }
@@ -666,18 +658,18 @@ static bool _rasterSolidRle(SwSurface* surface, const SwRle* rle, const RenderRe
 }
 
 
-static bool _rasterRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool _rasterRle(SwSurface* surface, SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    if (!rle || rle->invalid()) return false;
+    if (!rle) return false;
 
     if (_compositing(surface)) {
-        if (_matting(surface)) return _rasterMattedRle(surface, rle, bbox, c);
-        else return _rasterMaskedRle(surface, rle, bbox, c);
+        if (_matting(surface)) return _rasterMattedRle(surface, rle, r, g, b, a);
+        else return _rasterMaskedRle(surface, rle, r, g, b, a);
     } else if (_blending(surface)) {
-        return _rasterBlendingRle(surface, rle, bbox, c);
+        return _rasterBlendingRle(surface, rle, r, g, b, a);
     } else {
-        if (c.a == 255) return _rasterSolidRle(surface, rle, bbox, c);
-        else return _rasterTranslucentRle(surface, rle, bbox, c);
+        if (a == 255) return _rasterSolidRle(surface, rle, r, g, b);
+        else return _rasterTranslucentRle(surface, rle, r, g, b, a);
     }
     return false;
 }
@@ -702,24 +694,25 @@ static bool _rasterRle(SwSurface* surface, SwRle* rle, const RenderRegion& bbox,
     auto sx = (x) * itransform->e11 + itransform->e13 - 0.49f; \
     if (sx <= -0.5f || (uint32_t)(sx + 0.5f) >= image.w) continue; \
 
-static bool _rasterScaledMaskedRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledMaskedRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
     TVGERR("SW_ENGINE", "Not Supported Scaled Masked(%d) Rle Image", (int)surface->compositor->method);
     return false;
 }
 
 
-static bool _rasterScaledMattedRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledMattedRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
     TVGLOG("SW_ENGINE", "Scaled Matted(%d) Rle Image", (int)surface->compositor->method);
 
+    auto span = image.rle->spans;
     auto csize = surface->compositor->image.channelSize;
     auto alpha = surface->alpha(surface->compositor->method);
-    auto scaleMethod = _scaleMethod(image);
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
-    ARRAY_FOREACH(span, image.rle->spans) {
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
         SCALED_IMAGE_RANGE_Y(span->y)
         auto dst = &surface->buf32[span->y * surface->stride + span->x];
         auto cmp = &surface->compositor->image.buf8[(span->y * surface->compositor->image.stride + span->x) * csize];
@@ -735,13 +728,14 @@ static bool _rasterScaledMattedRleImage(SwSurface* surface, const SwImage& image
 }
 
 
-static bool _rasterScaledBlendingRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledBlendingRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
-    auto scaleMethod = _scaleMethod(image);
+    auto span = image.rle->spans;
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
-    ARRAY_FOREACH(span, image.rle->spans) {
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
         SCALED_IMAGE_RANGE_Y(span->y)
         auto dst = &surface->buf32[span->y * surface->stride + span->x];
         auto alpha = MULTIPLY(span->coverage, opacity);
@@ -749,13 +743,15 @@ static bool _rasterScaledBlendingRleImage(SwSurface* surface, const SwImage& ima
             for (uint32_t x = static_cast<uint32_t>(span->x); x < static_cast<uint32_t>(span->x) + span->len; ++x, ++dst) {
                 SCALED_IMAGE_RANGE_X
                 auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
-                *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(src), *dst), *dst, A(src));
+                auto tmp = surface->blender(src, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, A(src));
             }
         } else {
             for (uint32_t x = static_cast<uint32_t>(span->x); x < static_cast<uint32_t>(span->x) + span->len; ++x, ++dst) {
                 SCALED_IMAGE_RANGE_X
                 auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
-                *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(src), *dst), *dst, MULTIPLY(alpha, A(src)));
+                auto tmp = surface->blender(src, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, MULTIPLY(alpha, A(src)));
             }
         }
     }
@@ -763,13 +759,14 @@ static bool _rasterScaledBlendingRleImage(SwSurface* surface, const SwImage& ima
 }
 
 
-static bool _rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
-    auto scaleMethod = _scaleMethod(image);
+    auto span = image.rle->spans;
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
-    ARRAY_FOREACH(span, image.rle->spans) {
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
         SCALED_IMAGE_RANGE_Y(span->y)
         auto dst = &surface->buf32[span->y * surface->stride + span->x];
         auto alpha = MULTIPLY(span->coverage, opacity);
@@ -788,29 +785,27 @@ static bool _rasterScaledRleImage(SwSurface* surface, const SwImage& image, cons
 /* RLE Direct Image                                                     */
 /************************************************************************/
 
-static bool _rasterDirectMattedRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterDirectMattedRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity)
 {
     TVGLOG("SW_ENGINE", "Direct Matted(%d) Rle Image", (int)surface->compositor->method);
 
+    auto span = image.rle->spans;
     auto csize = surface->compositor->image.channelSize;
     auto cbuffer = surface->compositor->image.buf8;
     auto alpha = surface->alpha(surface->compositor->method);
-    const SwSpan* end;
-    int32_t x, len;
 
-    for (auto span = image.rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto dst = &surface->buf32[span->y * surface->stride + x];
-        auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + x) * csize];
-        auto img = image.buf32 + (span->y + image.oy) * image.stride + (x + image.ox);
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
+        auto dst = &surface->buf32[span->y * surface->stride + span->x];
+        auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + span->x) * csize];
+        auto img = image.buf32 + (span->y + image.oy) * image.stride + (span->x + image.ox);
         auto a = MULTIPLY(span->coverage, opacity);
         if (a == 255) {
-            for (auto x = 0; x < len; ++x, ++dst, ++img, cmp += csize) {
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img, cmp += csize) {
                 auto tmp = ALPHA_BLEND(*img, alpha(cmp));
                 *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
             }
         } else {
-            for (auto x = 0; x < len; ++x, ++dst, ++img, cmp += csize) {
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img, cmp += csize) {
                 auto tmp = ALPHA_BLEND(*img, MULTIPLY(a, alpha(cmp)));
                 *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
             }
@@ -820,23 +815,22 @@ static bool _rasterDirectMattedRleImage(SwSurface* surface, const SwImage& image
 }
 
 
-static bool _rasterDirectBlendingRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterDirectBlendingRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = image.rle->spans;
 
-    for (auto span = image.rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto dst = &surface->buf32[span->y * surface->stride + x];
-        auto src = image.buf32 + (span->y + image.oy) * image.stride + (x + image.ox);
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
+        auto dst = &surface->buf32[span->y * surface->stride + span->x];
+        auto img = image.buf32 + (span->y + image.oy) * image.stride + (span->x + image.ox);
         auto alpha = MULTIPLY(span->coverage, opacity);
         if (alpha == 255) {
-            for (auto x = 0; x < len; ++x, ++dst, ++src) {
-                *dst = surface->blender(rasterUnpremultiply(*src), *dst);
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img) {
+                *dst = surface->blender(*img, *dst, 255);
             }
         } else {
-            for (auto x = 0; x < len; ++x, ++dst, ++src) {
-                *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(*src), *dst), *dst, MULTIPLY(alpha, A(*src)));
+            for (uint32_t x = 0; x < span->len; ++x, ++dst, ++img) {
+                auto tmp = surface->blender(*img, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, MULTIPLY(alpha, A(*img)));
             }
         }
     }
@@ -844,23 +838,21 @@ static bool _rasterDirectBlendingRleImage(SwSurface* surface, const SwImage& ima
 }
 
 
-static bool _rasterDirectRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterDirectRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = image.rle->spans;
 
-    for (auto span = image.rle->fetch(bbox, &end); span < end; ++span) {
-        if (!span->fetch(bbox, x, len)) continue;
-        auto dst = &surface->buf32[span->y * surface->stride + x];
-        auto img = image.buf32 + (span->y + image.oy) * image.stride + (x + image.ox);
+    for (uint32_t i = 0; i < image.rle->size; ++i, ++span) {
+        auto dst = &surface->buf32[span->y * surface->stride + span->x];
+        auto img = image.buf32 + (span->y + image.oy) * image.stride + (span->x + image.ox);
         auto alpha = MULTIPLY(span->coverage, opacity);
-        rasterTranslucentPixel32(dst, img, len, alpha);
+        rasterTranslucentPixel32(dst, img, span->len, alpha);
     }
     return true;
 }
 
 
-static bool _rasterDirectMaskedRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterDirectMaskedRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity)
 {
     TVGERR("SW_ENGINE", "Not Supported Direct Masked(%d) Rle Image", (int)surface->compositor->method);
     return false;
@@ -871,36 +863,36 @@ static bool _rasterDirectMaskedRleImage(SwSurface* surface, const SwImage& image
 /*Scaled Image                                                          */
 /************************************************************************/
 
-static bool _rasterScaledMaskedImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledMaskedImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
     TVGERR("SW_ENGINE", "Not Supported Scaled Masked Image!");
     return false;
 }
 
 
-static bool _rasterScaledMattedImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledMattedImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
     if (surface->channelSize == sizeof(uint8_t)) {
         TVGERR("SW_ENGINE", "Not supported grayscale scaled matted image!");
         return false;
     }
 
-    auto dbuffer = surface->buf32 + (bbox.min.y * surface->stride + bbox.min.x);
+    auto dbuffer = surface->buf32 + (region.min.y * surface->stride + region.min.x);
     auto csize = surface->compositor->image.channelSize;
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * surface->compositor->image.stride + bbox.min.x) * csize;
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * surface->compositor->image.stride + region.min.x) * csize;
     auto alpha = surface->alpha(surface->compositor->method);
 
-    TVGLOG("SW_ENGINE", "Scaled Matted(%d) Image [Region: %d %d %d %d]", (int)surface->compositor->method, bbox.min.x, bbox.min.y, bbox.max.x - bbox.min.x, bbox.max.y - bbox.min.y);
+    TVGLOG("SW_ENGINE", "Scaled Matted(%d) Image [Region: %lu %lu %lu %lu]", (int)surface->compositor->method, region.min.x, region.min.y, region.max.x - region.min.x, region.max.y - region.min.y);
 
-    auto scaleMethod = _scaleMethod(image);
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
-    for (auto y = bbox.min.y; y < bbox.max.y; ++y) {
+    for (auto y = region.min.y; y < region.max.y; ++y) {
         SCALED_IMAGE_RANGE_Y(y)
         auto dst = dbuffer;
         auto cmp = cbuffer;
-        for (auto x = bbox.min.x; x < bbox.max.x; ++x, ++dst, cmp += csize) {
+        for (auto x = region.min.x; x < region.max.x; ++x, ++dst, cmp += csize) {
             SCALED_IMAGE_RANGE_X
             auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
             auto tmp = ALPHA_BLEND(src, opacity == 255 ? alpha(cmp) : MULTIPLY(opacity, alpha(cmp)));
@@ -913,44 +905,45 @@ static bool _rasterScaledMattedImage(SwSurface* surface, const SwImage& image, c
 }
 
 
-static bool _rasterScaledBlendingImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledBlendingImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
     if (surface->channelSize == sizeof(uint8_t)) {
         TVGERR("SW_ENGINE", "Not supported grayscale scaled blending image!");
         return false;
     }
 
-    auto dbuffer = surface->buf32 + (bbox.min.y * surface->stride + bbox.min.x);
-    auto scaleMethod = _scaleMethod(image);
+    auto dbuffer = surface->buf32 + (region.min.y * surface->stride + region.min.x);
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
-    for (auto y = bbox.min.y; y < bbox.max.y; ++y, dbuffer += surface->stride) {
+    for (auto y = region.min.y; y < region.max.y; ++y, dbuffer += surface->stride) {
         SCALED_IMAGE_RANGE_Y(y)
         auto dst = dbuffer;
-        for (auto x = bbox.min.x; x < bbox.max.x; ++x, ++dst) {
+        for (auto x = region.min.x; x < region.max.x; ++x, ++dst) {
             SCALED_IMAGE_RANGE_X
             auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
-            *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(src), *dst), *dst, MULTIPLY(opacity, A(src)));
+            auto tmp = surface->blender(src, *dst, 255);
+            *dst = INTERPOLATE(tmp, *dst, MULTIPLY(opacity, A(src)));
         }
     }
     return true;
 }
 
 
-static bool _rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const RenderRegion& bbox, uint8_t opacity)
+static bool _rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix* itransform, const SwBBox& region, uint8_t opacity)
 {
-    auto scaleMethod = _scaleMethod(image);
+    auto scaleMethod = image.scale < DOWN_SCALE_TOLERANCE ? _interpDownScaler : _interpUpScaler;
     auto sampleSize = _sampleSize(image.scale);
     int32_t miny = 0, maxy = 0;
 
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride + bbox.min.x);
-        for (auto y = bbox.min.y; y < bbox.max.y; ++y, buffer += surface->stride) {
+        auto buffer = surface->buf32 + (region.min.y * surface->stride + region.min.x);
+        for (auto y = region.min.y; y < region.max.y; ++y, buffer += surface->stride) {
             SCALED_IMAGE_RANGE_Y(y)
             auto dst = buffer;
-            for (auto x = bbox.min.x; x < bbox.max.x; ++x, ++dst) {
+            for (auto x = region.min.x; x < region.max.x; ++x, ++dst) {
                 SCALED_IMAGE_RANGE_X
                 auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
                 if (opacity < 255) src = ALPHA_BLEND(src, opacity);
@@ -958,11 +951,11 @@ static bool _rasterScaledImage(SwSurface* surface, const SwImage& image, const M
             }
         }
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride + bbox.min.x);
-        for (auto y = bbox.min.y; y < bbox.max.y; ++y, buffer += surface->stride) {
+        auto buffer = surface->buf8 + (region.min.y * surface->stride + region.min.x);
+        for (auto y = region.min.y; y < region.max.y; ++y, buffer += surface->stride) {
             SCALED_IMAGE_RANGE_Y(y)
             auto dst = buffer;
-            for (auto x = bbox.min.x; x < bbox.max.x; ++x, ++dst) {
+            for (auto x = region.min.x; x < region.max.x; ++x, ++dst) {
                 SCALED_IMAGE_RANGE_X
                 auto src = scaleMethod(image.buf32, image.stride, image.w, image.h, sx, sy, miny, maxy, sampleSize);
                 *dst = MULTIPLY(A(src), opacity);
@@ -977,85 +970,129 @@ static bool _rasterScaledImage(SwSurface* surface, const SwImage& image, const M
 /* Direct Image                                                         */
 /************************************************************************/
 
-static bool _rasterDirectMaskedImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int32_t w, int32_t h, uint8_t opacity)
+static bool _rasterDirectMaskedImage(SwSurface* surface, const SwImage& image, const SwBBox& region, uint8_t opacity)
 {
     TVGERR("SW_ENGINE", "Not Supported: Direct Masked Image");
     return false;
 }
 
-static bool _rasterDirectMattedImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int32_t w, int32_t h, uint8_t opacity)
+
+static bool _rasterDirectMattedImage(SwSurface* surface, const SwImage& image, const SwBBox& region, uint8_t opacity)
 {
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
     auto csize = surface->compositor->image.channelSize;
     auto alpha = surface->alpha(surface->compositor->method);
-    auto sbuffer = image.buf32 + (bbox.min.y + image.oy) * image.stride + (bbox.min.x + image.ox);
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * surface->compositor->image.stride + bbox.min.x) * csize; //compositor buffer
+    auto sbuffer = image.buf32 + (region.min.y + image.oy) * image.stride + (region.min.x + image.ox);
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * surface->compositor->image.stride + region.min.x) * csize; //compositor buffer
 
-    TVGLOG("SW_ENGINE", "Direct Matted(%d) Image  [Region: %u %u %u %u]", (int)surface->compositor->method, bbox.x(), bbox.y(), bbox.w(), bbox.h());
+    TVGLOG("SW_ENGINE", "Direct Matted(%d) Image  [Region: %lu %lu %u %u]", (int)surface->compositor->method, region.min.x, region.min.y, w, h);
 
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto dbuffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            auto dst = buffer;
             auto cmp = cbuffer;
             auto src = sbuffer;
             if (opacity == 255) {
-                for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
+                for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
                     auto tmp = ALPHA_BLEND(*src, alpha(cmp));
                     *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
                 }
             } else {
-                for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
+                for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
                     auto tmp = ALPHA_BLEND(*src, MULTIPLY(opacity, alpha(cmp)));
                     *dst = tmp + ALPHA_BLEND(*dst, IA(tmp));
                 }
             }
+            buffer += surface->stride;
             cbuffer += surface->compositor->image.stride * csize;
+            sbuffer += image.stride;
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto dbuffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            auto dst = buffer;
             auto cmp = cbuffer;
             auto src = sbuffer;
             if (opacity == 255) {
-                for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
+                for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
                     auto tmp = MULTIPLY(A(*src), alpha(cmp));
                     *dst = tmp + MULTIPLY(*dst, 255 - tmp);
                 }
             } else {
-                for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
+                for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
                     auto tmp = MULTIPLY(A(*src), MULTIPLY(opacity, alpha(cmp)));
                     *dst = tmp + MULTIPLY(*dst, 255 - tmp);
                 }
             }
+            buffer += surface->stride;
             cbuffer += surface->compositor->image.stride * csize;
+            sbuffer += image.stride;
         }
     }
     return true;
 }
 
-static bool _rasterDirectImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int32_t w, int32_t h, uint8_t opacity)
+
+static bool _rasterDirectBlendingImage(SwSurface* surface, const SwImage& image, const SwBBox& region, uint8_t opacity)
 {
-    auto sbuffer = image.buf32 + (bbox.min.y + image.oy) * image.stride + (bbox.min.x + image.ox);
+    if (surface->channelSize == sizeof(uint8_t)) {
+        TVGERR("SW_ENGINE", "Not supported grayscale image!");
+        return false;
+    }
+
+    auto dbuffer = &surface->buf32[region.min.y * surface->stride + region.min.x];
+    auto sbuffer = image.buf32 + (region.min.y + image.oy) * image.stride + (region.min.x + image.ox);
+
+    for (auto y = region.min.y; y < region.max.y; ++y) {
+        auto dst = dbuffer;
+        auto src = sbuffer;
+        if (opacity == 255) {
+            for (auto x = region.min.x; x < region.max.x; x++, dst++, src++) {
+                auto tmp = surface->blender(*src, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, A(*src));
+            }
+        } else {
+            for (auto x = region.min.x; x < region.max.x; x++, dst++, src++) {
+                auto tmp = surface->blender(*src, *dst, 255);
+                *dst = INTERPOLATE(tmp, *dst, MULTIPLY(opacity, A(*src)));
+            }
+        }
+        dbuffer += surface->stride;
+        sbuffer += image.stride;
+    }
+    return true;
+}
+
+
+static bool _rasterDirectImage(SwSurface* surface, const SwImage& image, const SwBBox& region, uint8_t opacity)
+{
+    auto sbuffer = image.buf32 + (region.min.y + image.oy) * image.stride + (region.min.x + image.ox);
 
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto dbuffer = &surface->buf32[bbox.min.y * surface->stride + bbox.min.x];
-        for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
-            rasterTranslucentPixel32(dbuffer, sbuffer, w, opacity);
+        auto dbuffer = &surface->buf32[region.min.y * surface->stride + region.min.x];
+        for (auto y = region.min.y; y < region.max.y; ++y) {
+            rasterTranslucentPixel32(dbuffer, sbuffer, region.max.x - region.min.x, opacity);
+            dbuffer += surface->stride;
+            sbuffer += image.stride;
         }
     //8bits grayscale
     //32 -> 8 direct converting seems an avoidable stage. maybe draw to a masking image after an intermediate scene. Can get rid of this?
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto dbuffer = &surface->buf8[bbox.min.y * surface->stride + bbox.min.x];
-        for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
+        auto dbuffer = &surface->buf8[region.min.y * surface->stride + region.min.x];
+        for (auto y = region.min.y; y < region.max.y; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
+            auto dst = dbuffer;
             auto src = sbuffer;
             if (opacity == 255) {
-                for (auto dst = dbuffer; dst < dbuffer + w; dst++, src++) {
+                for (auto x = region.min.x; x < region.max.x; ++x, ++dst, ++src) {
                     *dst = A(*src) + MULTIPLY(*dst, IA(*src));
                 }
             } else {
-                for (auto dst = dbuffer; dst < dbuffer + w; dst++, src++) {
+                for (auto x = region.min.x; x < region.max.x; ++x, ++dst, ++src) {
                     *dst = INTERPOLATE8(A(*src), *dst, opacity);
                 }
             }
@@ -1064,81 +1101,59 @@ static bool _rasterDirectImage(SwSurface* surface, const SwImage& image, const R
     return true;
 }
 
-static bool _rasterDirectMattedBlendingImage(SwSurface* surface, const SwImage& image, SwCompositor* compositor, const RenderRegion& bbox, int32_t w, int32_t h, uint8_t opacity)
+
+static bool _rasterDirectMattedBlendingImage(SwSurface* surface, const SwImage& image, const SwBBox& region, uint8_t opacity)
 {
     if (surface->channelSize == sizeof(uint8_t)) {
         TVGERR("SW_ENGINE", "Not supported grayscale image!");
         return false;
     }
 
-    auto csize = compositor->image.channelSize;
-    auto alpha = surface->alpha(compositor->method);
-    auto sbuffer = image.buf32 + (bbox.min.y + image.oy) * image.stride + (bbox.min.x + image.ox);
-    auto cbuffer = compositor->image.buf8 + (bbox.min.y * compositor->image.stride + bbox.min.x) * csize;  // compositor buffer
-    auto dbuffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto csize = surface->compositor->image.channelSize;
+    auto alpha = surface->alpha(surface->compositor->method);
+    auto sbuffer = image.buf32 + (region.min.y + image.oy) * image.stride + (region.min.x + image.ox);
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * surface->compositor->image.stride + region.min.x) * csize; //compositor buffer
+    auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
 
-    for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
+    for (uint32_t y = 0; y < h; ++y) {
+        auto dst = buffer;
         auto cmp = cbuffer;
         auto src = sbuffer;
         if (opacity == 255) {
-            for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
-                *dst = INTERPOLATE(surface->blender(*src, *dst), *dst, MULTIPLY(A(*src), alpha(cmp)));
+            for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
+                auto tmp = ALPHA_BLEND(*src, alpha(cmp));
+                *dst = INTERPOLATE(surface->blender(tmp, *dst, 255), *dst, A(tmp));
             }
         } else {
-            for (auto dst = dbuffer; dst < dbuffer + w; ++dst, ++src, cmp += csize) {
-                *dst = INTERPOLATE(surface->blender(*src, *dst), *dst, MULTIPLY(MULTIPLY(A(*src), alpha(cmp)), opacity));
+            for (uint32_t x = 0; x < w; ++x, ++dst, ++src, cmp += csize) {
+                auto tmp = ALPHA_BLEND(*src, alpha(cmp));
+                *dst = INTERPOLATE(surface->blender(tmp, *dst, 255), *dst, MULTIPLY(opacity, A(tmp)));
             }
         }
-        cbuffer += compositor->image.stride * csize;
+        buffer += surface->stride;
+        cbuffer += surface->compositor->image.stride * csize;
+        sbuffer += image.stride;
     }
     return true;
 }
 
-static bool _rasterDirectBlendingImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int32_t w, int32_t h, uint8_t opacity)
-{
-    if (surface->channelSize == sizeof(uint8_t)) {
-        TVGERR("SW_ENGINE", "Not supported grayscale image!");
-        return false;
-    }
-
-    // fast-track: mix the blending & masking composition
-    auto injecting = [](const SwCompositor* cmp) {
-        return cmp && cmp->recoverCmp && (cmp->recoverCmp->method != MaskMethod::None) && _matting(cmp->recoverSfc) && !_blending(cmp->recoverSfc);
-    };
-
-    if (injecting(surface->compositor)) return _rasterDirectMattedBlendingImage(surface, image, surface->compositor->recoverCmp, bbox, w, h, opacity);
-
-    auto dbuffer = &surface->buf32[bbox.min.y * surface->stride + bbox.min.x];
-    auto sbuffer = image.buf32 + (bbox.min.y + image.oy) * image.stride + (bbox.min.x + image.ox);
-
-    for (auto y = 0; y < h; ++y, dbuffer += surface->stride, sbuffer += image.stride) {
-        auto src = sbuffer;
-        if (opacity == 255) {
-            for (auto dst = dbuffer; dst < dbuffer + w; dst++, src++) {
-                *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(*src), *dst), *dst, A(*src));
-            }
-        } else {
-            for (auto dst = dbuffer; dst < dbuffer + w; dst++, src++) {
-                *dst = INTERPOLATE(surface->blender(rasterUnpremultiply(*src), *dst), *dst, MULTIPLY(opacity, A(*src)));
-            }
-        }
-    }
-
-    return true;
-}
 
 /************************************************************************/
 /* Rect Gradient                                                        */
 /************************************************************************/
 
 template<typename fillMethod>
-static bool _rasterCompositeGradientMaskedRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill, SwMask maskOp)
+static bool _rasterCompositeGradientMaskedRect(SwSurface* surface, const SwBBox& region, const SwFill* fill, SwMask maskOp)
 {
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
     auto cstride = surface->compositor->image.stride;
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * cstride + bbox.min.x);
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * cstride + region.min.x);
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
-        fillMethod()(fill, cbuffer, bbox.min.y + y, bbox.min.x, bbox.w(), maskOp, 255);
+    for (uint32_t y = 0; y < h; ++y) {
+        fillMethod()(fill, cbuffer, region.min.y + y, region.min.x, w, maskOp, 255);
         cbuffer += surface->stride;
     }
     return _compositeMaskImage(surface, surface->compositor->image, surface->compositor->bbox);
@@ -1146,14 +1161,16 @@ static bool _rasterCompositeGradientMaskedRect(SwSurface* surface, const RenderR
 
 
 template<typename fillMethod>
-static bool _rasterDirectGradientMaskedRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill, SwMask maskOp)
+static bool _rasterDirectGradientMaskedRect(SwSurface* surface, const SwBBox& region, const SwFill* fill, SwMask maskOp)
 {
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
     auto cstride = surface->compositor->image.stride;
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * cstride + bbox.min.x);
-    auto dbuffer = surface->buf8 + (bbox.min.y * surface->stride + bbox.min.x);
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * cstride + region.min.x);
+    auto dbuffer = surface->buf8 + (region.min.y * surface->stride + region.min.x);
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
-        fillMethod()(fill, dbuffer, bbox.min.y + y, bbox.min.x, bbox.w(), cbuffer, maskOp, 255);
+    for (uint32_t y = 0; y < h; ++y) {
+        fillMethod()(fill, dbuffer, region.min.y + y, region.min.x, w, cbuffer, maskOp, 255);
         cbuffer += cstride;
         dbuffer += surface->stride;
     }
@@ -1162,33 +1179,35 @@ static bool _rasterDirectGradientMaskedRect(SwSurface* surface, const RenderRegi
 
 
 template<typename fillMethod>
-static bool _rasterGradientMaskedRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterGradientMaskedRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
     auto method = surface->compositor->method;
 
-    TVGLOG("SW_ENGINE", "Masked(%d) Gradient [Region: %d %d %d %d]", (int)method, bbox.min.x, bbox.min.y, bbox.max.x - bbox.min.x, bbox.max.y - bbox.min.y);
+    TVGLOG("SW_ENGINE", "Masked(%d) Gradient [Region: %lu %lu %lu %lu]", (int)method, region.min.x, region.min.y, region.max.x - region.min.x, region.max.y - region.min.y);
 
     auto maskOp = _getMaskOp(method);
 
-    if (_direct(method)) return _rasterDirectGradientMaskedRect<fillMethod>(surface, bbox, fill, maskOp);
-    else return _rasterCompositeGradientMaskedRect<fillMethod>(surface, bbox, fill, maskOp);
+    if (_direct(method)) return _rasterDirectGradientMaskedRect<fillMethod>(surface, region, fill, maskOp);
+    else return _rasterCompositeGradientMaskedRect<fillMethod>(surface, region, fill, maskOp);
 
     return false;
 }
 
 
 template<typename fillMethod>
-static bool _rasterGradientMattedRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterGradientMattedRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
-    auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
+    auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
     auto csize = surface->compositor->image.channelSize;
-    auto cbuffer = surface->compositor->image.buf8 + (bbox.min.y * surface->compositor->image.stride + bbox.min.x) * csize;
+    auto cbuffer = surface->compositor->image.buf8 + (region.min.y * surface->compositor->image.stride + region.min.x) * csize;
     auto alpha = surface->alpha(surface->compositor->method);
 
-    TVGLOG("SW_ENGINE", "Matted(%d) Gradient [Region: %u %u %u %u]", (int)surface->compositor->method, bbox.x(), bbox.y(), bbox.w(), bbox.h());
+    TVGLOG("SW_ENGINE", "Matted(%d) Gradient [Region: %lu %lu %u %u]", (int)surface->compositor->method, region.min.x, region.min.y, w, h);
 
-    for (uint32_t y = 0; y < bbox.h(); ++y) {
-        fillMethod()(fill, buffer, bbox.min.y + y, bbox.min.x, bbox.w(), cbuffer, alpha, csize, 255);
+    for (uint32_t y = 0; y < h; ++y) {
+        fillMethod()(fill, buffer, region.min.y + y, region.min.x, w, cbuffer, alpha, csize, 255);
         buffer += surface->stride;
         cbuffer += surface->stride * csize;
     }
@@ -1197,37 +1216,42 @@ static bool _rasterGradientMattedRect(SwSurface* surface, const RenderRegion& bb
 
 
 template<typename fillMethod>
-static bool _rasterBlendingGradientRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterBlendingGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
-    auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
+    auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
 
     if (fill->translucent) {
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer + y * surface->stride, bbox.min.y + y, bbox.min.x, bbox.w(), opBlendPreNormal, surface->blender, 255);
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer + y * surface->stride, region.min.y + y, region.min.x, w, opBlendPreNormal, surface->blender, 255);
         }
     } else {
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer + y * surface->stride, bbox.min.y + y, bbox.min.x, bbox.w(), opBlendSrcOver, surface->blender, 255);
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer + y * surface->stride, region.min.y + y, region.min.x, w, opBlendSrcOver, surface->blender, 255);
         }
     }
     return true;
 }
 
 template<typename fillMethod>
-static bool _rasterTranslucentGradientRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterTranslucentGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer, bbox.min.y + y, bbox.min.x, bbox.w(), opBlendPreNormal, 255);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer, region.min.y + y, region.min.x, w, opBlendPreNormal, 255);
             buffer += surface->stride;
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer, bbox.min.y + y, bbox.min.x, bbox.w(), _opMaskAdd, 255);
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer, region.min.y + y, region.min.x, w, _opMaskAdd, 255);
             buffer += surface->stride;
         }
     }
@@ -1236,20 +1260,23 @@ static bool _rasterTranslucentGradientRect(SwSurface* surface, const RenderRegio
 
 
 template<typename fillMethod>
-static bool _rasterSolidGradientRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterSolidGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer, bbox.min.y + y, bbox.min.x, bbox.w(), opBlendSrcOver, 255);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer, region.min.y + y, region.min.x, w, opBlendSrcOver, 255);
             buffer += surface->stride;
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
-            fillMethod()(fill, buffer, bbox.min.y + y, bbox.min.x, bbox.w(), _opMaskNone, 255);
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        for (uint32_t y = 0; y < h; ++y) {
+            fillMethod()(fill, buffer, region.min.y + y, region.min.x, w, _opMaskNone, 255);
             buffer += surface->stride;
         }
     }
@@ -1257,31 +1284,31 @@ static bool _rasterSolidGradientRect(SwSurface* surface, const RenderRegion& bbo
 }
 
 
-static bool _rasterLinearGradientRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterLinearGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
     if (_compositing(surface)) {
-        if (_matting(surface)) return _rasterGradientMattedRect<FillLinear>(surface, bbox, fill);
-        else return _rasterGradientMaskedRect<FillLinear>(surface, bbox, fill);
+        if (_matting(surface)) return _rasterGradientMattedRect<FillLinear>(surface, region, fill);
+        else return _rasterGradientMaskedRect<FillLinear>(surface, region, fill);
     } else if (_blending(surface)) {
-        return _rasterBlendingGradientRect<FillLinear>(surface, bbox, fill);
+        return _rasterBlendingGradientRect<FillLinear>(surface, region, fill);
     } else {
-        if (fill->translucent) return _rasterTranslucentGradientRect<FillLinear>(surface, bbox, fill);
-        else _rasterSolidGradientRect<FillLinear>(surface, bbox, fill);
+        if (fill->translucent) return _rasterTranslucentGradientRect<FillLinear>(surface, region, fill);
+        else _rasterSolidGradientRect<FillLinear>(surface, region, fill);
     }
     return false;
 }
 
 
-static bool _rasterRadialGradientRect(SwSurface* surface, const RenderRegion& bbox, const SwFill* fill)
+static bool _rasterRadialGradientRect(SwSurface* surface, const SwBBox& region, const SwFill* fill)
 {
     if (_compositing(surface)) {
-        if (_matting(surface)) return _rasterGradientMattedRect<FillRadial>(surface, bbox, fill);
-        else return _rasterGradientMaskedRect<FillRadial>(surface, bbox, fill);
+        if (_matting(surface)) return _rasterGradientMattedRect<FillRadial>(surface, region, fill);
+        else return _rasterGradientMaskedRect<FillRadial>(surface, region, fill);
     } else if (_blending(surface)) {
-        return _rasterBlendingGradientRect<FillRadial>(surface, bbox, fill);
+        return _rasterBlendingGradientRect<FillRadial>(surface, region, fill);
     } else {
-        if (fill->translucent) return _rasterTranslucentGradientRect<FillRadial>(surface, bbox, fill);
-        else _rasterSolidGradientRect<FillRadial>(surface, bbox, fill);
+        if (fill->translucent) return _rasterTranslucentGradientRect<FillRadial>(surface, region, fill);
+        else _rasterSolidGradientRect<FillRadial>(surface, region, fill);
     }
     return false;
 }
@@ -1294,11 +1321,11 @@ static bool _rasterRadialGradientRect(SwSurface* surface, const RenderRegion& bb
 template<typename fillMethod>
 static bool _rasterCompositeGradientMaskedRle(SwSurface* surface, const SwRle* rle, const SwFill* fill, SwMask maskOp)
 {
-    auto span = rle->data();
+    auto span = rle->spans;
     auto cstride = surface->compositor->image.stride;
     auto cbuffer = surface->compositor->image.buf8;
 
-    for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
         auto cmp = &cbuffer[span->y * cstride + span->x];
         fillMethod()(fill, cmp, span->y, span->x, span->len, maskOp, span->coverage);
     }
@@ -1309,12 +1336,12 @@ static bool _rasterCompositeGradientMaskedRle(SwSurface* surface, const SwRle* r
 template<typename fillMethod>
 static bool _rasterDirectGradientMaskedRle(SwSurface* surface, const SwRle* rle, const SwFill* fill, SwMask maskOp)
 {
-    auto span = rle->data();
+    auto span = rle->spans;
     auto cstride = surface->compositor->image.stride;
     auto cbuffer = surface->compositor->image.buf8;
     auto dbuffer = surface->buf8;
 
-    for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
         auto cmp = &cbuffer[span->y * cstride + span->x];
         auto dst = &dbuffer[span->y * surface->stride + span->x];
         fillMethod()(fill, dst, span->y, span->x, span->len, cmp, maskOp, span->coverage);
@@ -1343,12 +1370,12 @@ static bool _rasterGradientMattedRle(SwSurface* surface, const SwRle* rle, const
 {
     TVGLOG("SW_ENGINE", "Matted(%d) Rle Linear Gradient", (int)surface->compositor->method);
 
-    auto span = rle->data();
+    auto span = rle->spans;
     auto csize = surface->compositor->image.channelSize;
     auto cbuffer = surface->compositor->image.buf8;
     auto alpha = surface->alpha(surface->compositor->method);
 
-    for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
         auto dst = &surface->buf32[span->y * surface->stride + span->x];
         auto cmp = &cbuffer[(span->y * surface->compositor->image.stride + span->x) * csize];
         fillMethod()(fill, dst, span->y, span->x, span->len, cmp, alpha, csize, span->coverage);
@@ -1360,9 +1387,9 @@ static bool _rasterGradientMattedRle(SwSurface* surface, const SwRle* rle, const
 template<typename fillMethod>
 static bool _rasterBlendingGradientRle(SwSurface* surface, const SwRle* rle, const SwFill* fill)
 {
-    auto span = rle->data();
+    auto span = rle->spans;
 
-    for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+    for (uint32_t i = 0; i < rle->size; ++i, ++span) {
         auto dst = &surface->buf32[span->y * surface->stride + span->x];
         fillMethod()(fill, dst, span->y, span->x, span->len, opBlendPreNormal, surface->blender, span->coverage);
     }
@@ -1373,18 +1400,18 @@ static bool _rasterBlendingGradientRle(SwSurface* surface, const SwRle* rle, con
 template<typename fillMethod>
 static bool _rasterTranslucentGradientRle(SwSurface* surface, const SwRle* rle, const SwFill* fill)
 {
-    auto span = rle->data();
+    auto span = rle->spans;
 
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
             auto dst = &surface->buf32[span->y * surface->stride + span->x];
             if (span->coverage == 255) fillMethod()(fill, dst, span->y, span->x, span->len, opBlendPreNormal, 255);
             else fillMethod()(fill, dst, span->y, span->x, span->len, opBlendNormal, span->coverage);
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
             auto dst = &surface->buf8[span->y * surface->stride + span->x];
             fillMethod()(fill, dst, span->y, span->x, span->len, _opMaskAdd, span->coverage);
         }
@@ -1396,18 +1423,18 @@ static bool _rasterTranslucentGradientRle(SwSurface* surface, const SwRle* rle,
 template<typename fillMethod>
 static bool _rasterSolidGradientRle(SwSurface* surface, const SwRle* rle, const SwFill* fill)
 {
-    auto span = rle->data();
+    auto span = rle->spans;
 
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
             auto dst = &surface->buf32[span->y * surface->stride + span->x];
             if (span->coverage == 255) fillMethod()(fill, dst, span->y, span->x, span->len, opBlendSrcOver, 255);
             else fillMethod()(fill, dst, span->y, span->x, span->len, opBlendInterp, span->coverage);
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        for (uint32_t i = 0; i < rle->size(); ++i, ++span) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
             auto dst = &surface->buf8[span->y * surface->stride + span->x];
             if (span->coverage == 255) fillMethod()(fill, dst, span->y, span->x, span->len, _opMaskNone, 255);
             else fillMethod()(fill, dst, span->y, span->x, span->len, _opMaskAdd, span->coverage);
@@ -1420,6 +1447,8 @@ static bool _rasterSolidGradientRle(SwSurface* surface, const SwRle* rle, const
 
 static bool _rasterLinearGradientRle(SwSurface* surface, const SwRle* rle, const SwFill* fill)
 {
+    if (!rle) return false;
+
     if (_compositing(surface)) {
         if (_matting(surface)) return _rasterGradientMattedRle<FillLinear>(surface, rle, fill);
         else return _rasterGradientMaskedRle<FillLinear>(surface, rle, fill);
@@ -1435,6 +1464,8 @@ static bool _rasterLinearGradientRle(SwSurface* surface, const SwRle* rle, const
 
 static bool _rasterRadialGradientRle(SwSurface* surface, const SwRle* rle, const SwFill* fill)
 {
+    if (!rle) return false;
+
     if (_compositing(surface)) {
         if (_matting(surface)) return _rasterGradientMattedRle<FillRadial>(surface, rle, fill);
         else return _rasterGradientMaskedRle<FillRadial>(surface, rle, fill);
@@ -1492,7 +1523,7 @@ void rasterPixel32(uint32_t *dst, uint32_t val, uint32_t offset, int32_t len)
 
 bool rasterCompositor(SwSurface* surface)
 {
-    //See MaskMethod, Alpha:1, InvAlpha:2, Luma:3, InvLuma:4
+    //See CompositeMethod, Alpha:3, InvAlpha:4, Luma:5, InvLuma:6
     surface->alphas[0] = _alpha;
     surface->alphas[1] = _ialpha;
 
@@ -1505,20 +1536,19 @@ bool rasterCompositor(SwSurface* surface)
         surface->alphas[2] = _argbLuma;
         surface->alphas[3] = _argbInvLuma;
     } else {
-        TVGERR("SW_ENGINE", "Unsupported Colorspace(%d) is expected!", (int)surface->cs);
+        TVGERR("SW_ENGINE", "Unsupported Colorspace(%d) is expected!", surface->cs);
         return false;
     }
     return true;
 }
 
 
-bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
+bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_t h, pixel_t val)
 {
     if (!surface || !surface->buf32 || surface->stride == 0 || surface->w == 0 || surface->h == 0) return false;
 
     //32 bits
     if (surface->channelSize == sizeof(uint32_t)) {
-        uint32_t val = 0;
         //full clear
         if (w == surface->stride) {
             rasterPixel32(surface->buf32, val, surface->stride * y, w * h);
@@ -1546,14 +1576,15 @@ bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_
 
 uint32_t rasterUnpremultiply(uint32_t data)
 {
-    auto a = A(data);
+    uint8_t a = data >> 24;
     if (a == 255 || a == 0) return data;
-
-    uint8_t r = std::min(C1(data) * 255u / a, 255u);
-    uint8_t g = std::min(C2(data) * 255u / a, 255u);
-    uint8_t b = std::min(C3(data) * 255u / a, 255u);
-
-    return JOIN(a, r, g, b);
+    uint16_t r = ((data >> 8) & 0xff00) / a;
+    uint16_t g = ((data) & 0xff00) / a;
+    uint16_t b = ((data << 8) & 0xff00) / a;
+    if (r > 0xff) r = 0xff;
+    if (g > 0xff) g = 0xff;
+    if (b > 0xff) b = 0xff;
+    return (a << 24) | (r << 16) | (g << 8) | (b);
 }
 
 
@@ -1588,14 +1619,14 @@ void rasterPremultiply(RenderSurface* surface)
         auto dst = buffer;
         for (uint32_t x = 0; x < surface->w; ++x, ++dst) {
             auto c = *dst;
-            if (A(c) == 255) continue;
-            *dst = PREMULTIPLY(c, A(c));
+            auto a = (c >> 24);
+            *dst = (c & 0xff000000) + ((((c >> 8) & 0xff) * a) & 0xff00) + ((((c & 0x00ff00ff) * a) >> 8) & 0x00ff00ff);
         }
     }
 }
 
 
-bool rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity)
+bool rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity)
 {
     Matrix itransform;
 
@@ -1613,27 +1644,23 @@ bool rasterScaledImage(SwSurface* surface, const SwImage& image, const Matrix& t
 }
 
 
-bool rasterDirectImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+bool rasterDirectImage(SwSurface* surface, const SwImage& image, const SwBBox& bbox, uint8_t opacity)
 {
-    //calculate an actual drawing image size
-    auto w = std::min(bbox.max.x - bbox.min.x, int32_t(image.w) - (bbox.min.x + image.ox));
-    auto h = std::min(bbox.max.y - bbox.min.y, int32_t(image.h) - (bbox.min.y + image.oy));
-
     if (_compositing(surface)) {
         if (_matting(surface)) {
-            if (_blending(surface)) return _rasterDirectMattedBlendingImage(surface, image, surface->compositor, bbox, w, h, opacity);
-            else return _rasterDirectMattedImage(surface, image, bbox, w, h, opacity);
-        } else return _rasterDirectMaskedImage(surface, image, bbox, w, h, opacity);
+            if (_blending(surface)) return _rasterDirectMattedBlendingImage(surface, image, bbox, opacity);
+            else return _rasterDirectMattedImage(surface, image, bbox, opacity);
+        } else return _rasterDirectMaskedImage(surface, image, bbox, opacity);
     } else if (_blending(surface)) {
-        return _rasterDirectBlendingImage(surface, image, bbox, w, h, opacity);
+        return _rasterDirectBlendingImage(surface, image, bbox, opacity);
     } else {
-        return _rasterDirectImage(surface, image, bbox, w, h, opacity);
+        return _rasterDirectImage(surface, image, bbox, opacity);
     }
     return false;
 }
 
 
-bool rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity)
+bool rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity)
 {
     if (surface->channelSize == sizeof(uint8_t)) {
         TVGERR("SW_ENGINE", "Not supported scaled rle image!");
@@ -1656,7 +1683,7 @@ bool rasterScaledRleImage(SwSurface* surface, const SwImage& image, const Matrix
 }
 
 
-bool rasterDirectRleImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, uint8_t opacity)
+bool rasterDirectRleImage(SwSurface* surface, const SwImage& image, uint8_t opacity)
 {
     if (surface->channelSize == sizeof(uint8_t)) {
         TVGERR("SW_ENGINE", "Not supported grayscale rle image!");
@@ -1664,76 +1691,76 @@ bool rasterDirectRleImage(SwSurface* surface, const SwImage& image, const Render
     }
 
     if (_compositing(surface)) {
-        if (_matting(surface)) return _rasterDirectMattedRleImage(surface, image, bbox, opacity);
-        else return _rasterDirectMaskedRleImage(surface, image, bbox, opacity);
+        if (_matting(surface)) return _rasterDirectMattedRleImage(surface, image, opacity);
+        else return _rasterDirectMaskedRleImage(surface, image, opacity);
     } else if (_blending(surface)) {
-        return _rasterDirectBlendingRleImage(surface, image, bbox, opacity);
+        return _rasterDirectBlendingRleImage(surface, image, opacity);
     } else {
-        return _rasterDirectRleImage(surface, image, bbox, opacity);
+        return _rasterDirectRleImage(surface, image, opacity);
     }
     return false;
 }
 
 
-bool rasterGradientShape(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, const Fill* fdata, uint8_t opacity)
+bool rasterGradientShape(SwSurface* surface, SwShape* shape, const Fill* fdata, uint8_t opacity)
 {
     if (!shape->fill) return false;
 
     if (auto color = fillFetchSolid(shape->fill, fdata)) {
         auto a = MULTIPLY(color->a, opacity);
-        RenderColor c = {color->r, color->g, color->b, a};
-        return a > 0 ? rasterShape(surface, shape, bbox, c) : true;
+        return a > 0 ? rasterShape(surface, shape, color->r, color->g, color->b, a) : true;
     }
 
     auto type = fdata->type();
     if (shape->fastTrack) {
-        if (type == Type::LinearGradient) return _rasterLinearGradientRect(surface, bbox, shape->fill);
-        else if (type == Type::RadialGradient)return _rasterRadialGradientRect(surface, bbox, shape->fill);
-    } else if (shape->rle && shape->rle->valid()) {
+        if (type == Type::LinearGradient) return _rasterLinearGradientRect(surface, shape->bbox, shape->fill);
+        else if (type == Type::RadialGradient)return _rasterRadialGradientRect(surface, shape->bbox, shape->fill);
+    } else {
         if (type == Type::LinearGradient) return _rasterLinearGradientRle(surface, shape->rle, shape->fill);
         else if (type == Type::RadialGradient) return _rasterRadialGradientRle(surface, shape->rle, shape->fill);
-    } return false;
+    }
+    return false;
 }
 
 
-bool rasterGradientStroke(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, const Fill* fdata, uint8_t opacity)
+bool rasterGradientStroke(SwSurface* surface, SwShape* shape, const Fill* fdata, uint8_t opacity)
 {
-    if (!shape->stroke || !shape->stroke->fill || !shape->strokeRle || shape->strokeRle->invalid()) return false;
+    if (!shape->stroke || !shape->stroke->fill || !shape->strokeRle) return false;
 
     if (auto color = fillFetchSolid(shape->stroke->fill, fdata)) {
-        RenderColor c = {color->r, color->g, color->b, color->a};
-        c.a = MULTIPLY(c.a, opacity);
-        return c.a > 0 ? rasterStroke(surface, shape, bbox, c) : true;
+        auto a = MULTIPLY(color->a, opacity);
+        return a > 0 ? rasterStroke(surface, shape, color->r, color->g, color->b, a) : true;
     }
 
     auto type = fdata->type();
     if (type == Type::LinearGradient) return _rasterLinearGradientRle(surface, shape->strokeRle, shape->stroke->fill);
     else if (type == Type::RadialGradient) return _rasterRadialGradientRle(surface, shape->strokeRle, shape->stroke->fill);
+
     return false;
 }
 
 
-bool rasterShape(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, RenderColor& c)
+bool rasterShape(SwSurface* surface, SwShape* shape, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    if (c.a < 255) {
-        c.r = MULTIPLY(c.r, c.a);
-        c.g = MULTIPLY(c.g, c.a);
-        c.b = MULTIPLY(c.b, c.a);
+    if (a < 255) {
+        r = MULTIPLY(r, a);
+        g = MULTIPLY(g, a);
+        b = MULTIPLY(b, a);
     }
-    if (shape->fastTrack) return _rasterRect(surface, bbox, c);
-    else return _rasterRle(surface, shape->rle, bbox, c);
+    if (shape->fastTrack) return _rasterRect(surface, shape->bbox, r, g, b, a);
+    else return _rasterRle(surface, shape->rle, r, g, b, a);
 }
 
 
-bool rasterStroke(SwSurface* surface, SwShape* shape, const RenderRegion& bbox, RenderColor& c)
+bool rasterStroke(SwSurface* surface, SwShape* shape, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    if (c.a < 255) {
-        c.r = MULTIPLY(c.r, c.a);
-        c.g = MULTIPLY(c.g, c.a);
-        c.b = MULTIPLY(c.b, c.a);
+    if (a < 255) {
+        r = MULTIPLY(r, a);
+        g = MULTIPLY(g, a);
+        b = MULTIPLY(b, a);
     }
 
-    return _rasterRle(surface, shape->strokeRle, bbox, c);
+    return _rasterRle(surface, shape->strokeRle, r, g, b, a);
 }
 
 
@@ -1758,7 +1785,7 @@ bool rasterConvertCS(RenderSurface* surface, ColorSpace to)
 
 
 //TODO: SIMD OPTIMIZATION?
-void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32_t h, const RenderRegion& bbox, bool flipped)
+void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32_t h, const SwBBox& bbox, bool flipped)
 {
     constexpr int32_t BLOCK = 8;  //experimental decision
 
@@ -1791,39 +1818,3 @@ void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32
         }
     }
 }
-
-
-//TODO: can be moved in tvgColor
-void rasterRGB2HSL(uint8_t r, uint8_t g, uint8_t b, float* h, float* s, float* l)
-{
-    auto rf = r / 255.0f;
-    auto gf = g / 255.0f;
-    auto bf = b / 255.0f;
-    auto maxVal = std::max(std::max(rf, gf), bf);
-    auto minVal = std::min(std::min(rf, gf), bf);
-    auto delta = maxVal - minVal;
-
-    //lightness
-    float t = 0.0f;
-    if (l || s) {
-        t = (maxVal + minVal) * 0.5f;
-        if (l) *l = t;
-    }
-
-    if (tvg::zero(delta)) {
-        if (h) *h = 0.0f;
-        if (s) *s = 0.0f;
-    } else {
-        //saturation
-        if (s) {
-            *s = (t < 0.5f) ? (delta / (maxVal + minVal)) : (delta / (2.0f - maxVal - minVal));
-        }
-        //hue
-        if (h) {
-            if (maxVal == rf) *h = (gf - bf) / delta + (gf < bf ? 6.0f : 0.0f);
-            else if (maxVal == gf) *h = (bf - rf) / delta + 2.0f;
-            else *h = (rf - gf) / delta + 4.0f;
-            *h *= 60.0f; //directly convert to degrees
-        }
-    }
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h
index b5c30ab2..79cab043 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -99,17 +99,17 @@ static void avxRasterPixel32(uint32_t *dst, uint32_t val, uint32_t offset, int32
 }
 
 
-static bool avxRasterTranslucentRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool avxRasterTranslucentRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    auto h = bbox.h();
-    auto w = bbox.w();
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
 
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
+        auto color = surface->join(r, g, b, a);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
 
-        uint32_t ialpha = 255 - c.a;
+        uint32_t ialpha = 255 - a;
 
         auto avxColor = _mm_set1_epi32(color);
         auto avxIalpha = _mm_set1_epi8(ialpha);
@@ -145,12 +145,12 @@ static bool avxRasterTranslucentRect(SwSurface* surface, const RenderRegion& bbo
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         TVGLOG("SW_ENGINE", "Require AVX Optimization, Channel Size = %d", surface->channelSize);
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        auto ialpha = ~c.a;
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        auto ialpha = ~a;
         for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
             for (uint32_t x = 0; x < w; ++x, ++dst) {
-                *dst = c.a + MULTIPLY(*dst, ialpha);
+                *dst = a + MULTIPLY(*dst, ialpha);
             }
         }
     }
@@ -158,67 +158,67 @@ static bool avxRasterTranslucentRect(SwSurface* surface, const RenderRegion& bbo
 }
 
 
-static bool avxRasterTranslucentRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool avxRasterTranslucentRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = rle->spans;
 
     //32bit channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
+        auto color = surface->join(r, g, b, a);
         uint32_t src;
 
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
+        for (uint32_t i = 0; i < rle->size; ++i) {
+            auto dst = &surface->buf32[span->y * surface->stride + span->x];
+
             if (span->coverage < 255) src = ALPHA_BLEND(color, span->coverage);
             else src = color;
 
-            auto dst = &surface->buf32[span->y * surface->stride + x];
-            auto ialpha = IA(src);
+        auto ialpha = IA(src);
 
             //1. fill the not aligned memory (for 128-bit registers a 16-bytes alignment is required)
-            int32_t notAligned = ((uintptr_t)dst & 0xf) / 4;
+            auto notAligned = ((uintptr_t)dst & 0xf) / 4;
             if (notAligned) {
-                notAligned = (N_32BITS_IN_128REG - notAligned > len ? len : N_32BITS_IN_128REG - notAligned);
-                for (auto x = 0; x < notAligned; ++x, ++dst) {
+                notAligned = (N_32BITS_IN_128REG - notAligned > span->len ? span->len : N_32BITS_IN_128REG - notAligned);
+                for (uint32_t x = 0; x < notAligned; ++x, ++dst) {
                     *dst = src + ALPHA_BLEND(*dst, ialpha);
                 }
             }
 
             //2. fill the aligned memory using avx - N_32BITS_IN_128REG pixels processed at once
             //In order to avoid unnecessary avx variables declarations a check is made whether there are any iterations at all
-            int32_t iterations = (len - notAligned) / N_32BITS_IN_128REG;
-            int32_t avxFilled = 0;
+            uint32_t iterations = (span->len - notAligned) / N_32BITS_IN_128REG;
+            uint32_t avxFilled = 0;
             if (iterations > 0) {
                 auto avxSrc = _mm_set1_epi32(src);
                 auto avxIalpha = _mm_set1_epi8(ialpha);
 
                 avxFilled = iterations * N_32BITS_IN_128REG;
                 auto avxDst = (__m128i*)dst;
-                for (auto x = 0; x < iterations; ++x, ++avxDst) {
+                for (uint32_t x = 0; x < iterations; ++x, ++avxDst) {
                     *avxDst = _mm_add_epi32(avxSrc, ALPHA_BLEND(*avxDst, avxIalpha));
                 }
             }
 
             //3. fill the remaining pixels
-            auto leftovers = len - notAligned - avxFilled;
+            int32_t leftovers = span->len - notAligned - avxFilled;
             dst += avxFilled;
             while (leftovers--) {
                 *dst = src + ALPHA_BLEND(*dst, ialpha);
                 dst++;
             }
+
+            ++span;
         }
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         TVGLOG("SW_ENGINE", "Require AVX Optimization, Channel Size = %d", surface->channelSize);
         uint8_t src;
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf8[span->y * surface->stride + x];
-            if (span->coverage < 255) src = MULTIPLY(span->coverage, c.a);
-            else src = c.a;
-            auto ialpha = ~c.a;
-            for (auto x = 0; x < len; ++x, ++dst) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf8[span->y * surface->stride + span->x];
+            if (span->coverage < 255) src = MULTIPLY(span->coverage, a);
+            else src = a;
+            auto ialpha = ~a;
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                 *dst = src + MULTIPLY(*dst, ialpha);
             }
         }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h
index 03146da9..d79da0e4 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -92,35 +92,32 @@ static void inline cRasterPixels(PIXEL_T* dst, PIXEL_T val, uint32_t offset, int
 }
 
 
-static bool inline cRasterTranslucentRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool inline cRasterTranslucentRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = rle->spans;
 
     //32bit channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
+        auto color = surface->join(r, g, b, a);
         uint32_t src;
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf32[span->y * surface->stride + x];
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf32[span->y * surface->stride + span->x];
             if (span->coverage < 255) src = ALPHA_BLEND(color, span->coverage);
             else src = color;
             auto ialpha = IA(src);
-            for (auto x = 0; x < len; ++x, ++dst) {
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                 *dst = src + ALPHA_BLEND(*dst, ialpha);
             }
         }
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         uint8_t src;
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf8[span->y * surface->stride + x];
-            if (span->coverage < 255) src = MULTIPLY(span->coverage, c.a);
-            else src = c.a;
-            auto ialpha = ~c.a;
-            for (auto x = 0; x < len; ++x, ++dst) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf8[span->y * surface->stride + span->x];
+            if (span->coverage < 255) src = MULTIPLY(span->coverage, a);
+            else src = a;
+            auto ialpha = ~a;
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                 *dst = src + MULTIPLY(*dst, ialpha);
             }
         }
@@ -129,27 +126,30 @@ static bool inline cRasterTranslucentRle(SwSurface* surface, const SwRle* rle, c
 }
 
 
-static bool inline cRasterTranslucentRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool inline cRasterTranslucentRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
+
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        auto ialpha = 255 - c.a;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
+        auto color = surface->join(r, g, b, a);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        auto ialpha = 255 - a;
+        for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
-            for (uint32_t x = 0; x < bbox.w(); ++x, ++dst) {
+            for (uint32_t x = 0; x < w; ++x, ++dst) {
                 *dst = color + ALPHA_BLEND(*dst, ialpha);
             }
         }
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        auto ialpha = ~c.a;
-        for (uint32_t y = 0; y < bbox.h(); ++y) {
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        auto ialpha = ~a;
+        for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
-            for (uint32_t x = 0; x < bbox.w(); ++x, ++dst) {
-                *dst = c.a + MULTIPLY(*dst, ialpha);
+            for (uint32_t x = 0; x < w; ++x, ++dst) {
+                *dst = a + MULTIPLY(*dst, ialpha);
             }
         }
     }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h
index 649595f8..fe693b7f 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -89,24 +89,22 @@ static void neonRasterPixel32(uint32_t *dst, uint32_t val, uint32_t offset, int3
 }
 
 
-static bool neonRasterTranslucentRle(SwSurface* surface, const SwRle* rle, const RenderRegion& bbox, const RenderColor& c)
+static bool neonRasterTranslucentRle(SwSurface* surface, const SwRle* rle, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    const SwSpan* end;
-    int32_t x, len;
+    auto span = rle->spans;
 
     //32bit channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
+        auto color = surface->join(r, g, b, a);
         uint32_t src;
         uint8x8_t *vDst = nullptr;
-        int32_t align;
+        uint16_t align;
 
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
+        for (uint32_t i = 0; i < rle->size; ++i) {
             if (span->coverage < 255) src = ALPHA_BLEND(color, span->coverage);
             else src = color;
 
-            auto dst = &surface->buf32[span->y * surface->stride + x];
+            auto dst = &surface->buf32[span->y * surface->stride + span->x];
             auto ialpha = IA(src);
 
             if ((((uintptr_t) dst) & 0x7) != 0) {
@@ -122,23 +120,24 @@ static bool neonRasterTranslucentRle(SwSurface* surface, const SwRle* rle, const
             uint8x8_t vSrc = (uint8x8_t) vdup_n_u32(src);
             uint8x8_t vIalpha = vdup_n_u8((uint8_t) ialpha);
 
-            for (int32_t x = 0; x < (len - align) / 2; ++x)
+            for (uint32_t x = 0; x < (span->len - align) / 2; ++x)
                 vDst[x] = vadd_u8(vSrc, ALPHA_BLEND(vDst[x], vIalpha));
 
-            auto leftovers = (len - align) % 2;
-            if (leftovers > 0) dst[len - 1] = src + ALPHA_BLEND(dst[len - 1], ialpha);
+            auto leftovers = (span->len - align) % 2;
+            if (leftovers > 0) dst[span->len - 1] = src + ALPHA_BLEND(dst[span->len - 1], ialpha);
+
+            ++span;
         }
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         TVGLOG("SW_ENGINE", "Require Neon Optimization, Channel Size = %d", surface->channelSize);
         uint8_t src;
-        for (auto span = rle->fetch(bbox, &end); span < end; ++span) {
-            if (!span->fetch(bbox, x, len)) continue;
-            auto dst = &surface->buf8[span->y * surface->stride + x];
-            if (span->coverage < 255) src = MULTIPLY(span->coverage, c.a);
-            else src = c.a;
-            auto ialpha = ~c.a;
-            for (auto x = 0; x < len; ++x, ++dst) {
+        for (uint32_t i = 0; i < rle->size; ++i, ++span) {
+            auto dst = &surface->buf8[span->y * surface->stride + span->x];
+            if (span->coverage < 255) src = MULTIPLY(span->coverage, a);
+            else src = a;
+            auto ialpha = ~a;
+            for (uint32_t x = 0; x < span->len; ++x, ++dst) {
                 *dst = src + MULTIPLY(*dst, ialpha);
             }
         }
@@ -147,16 +146,16 @@ static bool neonRasterTranslucentRle(SwSurface* surface, const SwRle* rle, const
 }
 
 
-static bool neonRasterTranslucentRect(SwSurface* surface, const RenderRegion& bbox, const RenderColor& c)
+static bool neonRasterTranslucentRect(SwSurface* surface, const SwBBox& region, uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-    auto h = bbox.h();
-    auto w = bbox.w();
+    auto h = static_cast<uint32_t>(region.max.y - region.min.y);
+    auto w = static_cast<uint32_t>(region.max.x - region.min.x);
 
     //32bits channels
     if (surface->channelSize == sizeof(uint32_t)) {
-        auto color = surface->join(c.r, c.g, c.b, c.a);
-        auto buffer = surface->buf32 + (bbox.min.y * surface->stride) + bbox.min.x;
-        auto ialpha = 255 - c.a;
+        auto color = surface->join(r, g, b, a);
+        auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x;
+        auto ialpha = 255 - a;
 
         auto vColor = vdup_n_u32(color);
         auto vIalpha = vdup_n_u8((uint8_t) ialpha);
@@ -186,12 +185,12 @@ static bool neonRasterTranslucentRect(SwSurface* surface, const RenderRegion& bb
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         TVGLOG("SW_ENGINE", "Require Neon Optimization, Channel Size = %d", surface->channelSize);
-        auto buffer = surface->buf8 + (bbox.min.y * surface->stride) + bbox.min.x;
-        auto ialpha = ~c.a;
+        auto buffer = surface->buf8 + (region.min.y * surface->stride) + region.min.x;
+        auto ialpha = ~a;
         for (uint32_t y = 0; y < h; ++y) {
             auto dst = &buffer[y * surface->stride];
             for (uint32_t x = 0; x < w; ++x, ++dst) {
-                *dst = c.a + MULTIPLY(*dst, ialpha);
+                *dst = a + MULTIPLY(*dst, ialpha);
             }
         }
     }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h
index 34332513..956402a3 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,6 @@
  * SOFTWARE.
  */
 
-namespace tvg
-{
-
 struct Vertex
 {
    Point pt;
@@ -34,6 +31,20 @@ struct Polygon
    Vertex vertex[3];
 };
 
+struct AALine
+{
+   int32_t x[2];
+   int32_t coverage[2];
+   int32_t length[2];
+};
+
+struct AASpans
+{
+   AALine *lines;
+   int32_t yStart;
+   int32_t yEnd;
+};
+
 //Careful! Shared resource, No support threading
 static float dudx, dvdx;
 static float dxdya, dxdyb, dudya, dvdya;
@@ -46,46 +57,23 @@ static inline int32_t _modf(float v)
 }
 
 
-static uint8_t _feathering(int iru, int irv, int ar, int ab, int sw, int sh)
-{
-    if (irv == 1) {
-        if (iru == 1) return 255 - MULTIPLY(ar, ab);
-        else if (iru == sw) return MULTIPLY(ar, 255 - ab);
-        return 255 - ab;
-    } else if (irv == sh) {
-        if (iru == 1) return MULTIPLY(255 - ar, ab);
-        else if (iru == sw) return MULTIPLY(ar, ab);
-        return ab;
-    } else {
-        if (iru == 1) return 255 - ar;
-        else if (iru == sw) return ar;
-    }
-    return 255;
-}
-
-
-static bool _rasterMaskedPolygonImageSegment(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int yStart, int yEnd, uint8_t opacity, bool needAA)
+static bool _rasterMaskedPolygonImageSegment(SwSurface* surface, const SwImage& image, const SwBBox& region, int yStart, int yEnd, AASpans* aaSpans, uint8_t opacity, uint8_t dirFlag = 0)
 {
     TVGERR("SW_ENGINE", "TODO: _rasterMaskedPolygonImageSegment()");
     return false;
 }
 
 
-static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int yStart, int yEnd, uint8_t opacity, bool needAA)
+static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage& image, const SwBBox& bbox, int yStart, int yEnd, AASpans* aaSpans, uint8_t opacity)
 {
-    if (surface->channelSize == sizeof(uint8_t)) {
-        TVGERR("SW_ENGINE", "Not supported grayscale Textmap polygon!");
-        return;
-    }
-
-    auto _dudx = dudx, _dvdx = dvdx;
-    auto _dxdya = dxdya, _dxdyb = dxdyb, _dudya = dudya, _dvdya = dvdya;
-    auto _xa = xa, _xb = xb, _ua = ua, _va = va;
+    float _dudx = dudx, _dvdx = dvdx;
+    float _dxdya = dxdya, _dxdyb = dxdyb, _dudya = dudya, _dvdya = dvdya;
+    float _xa = xa, _xb = xb, _ua = ua, _va = va;
     auto sbuf = image.buf32;
     auto dbuf = surface->buf32;
-    auto sw = static_cast<int32_t>(image.w);
-    auto sh = static_cast<int32_t>(image.h);
-    int32_t x1, x2, x, y, ar, ab, iru, irv, px;
+    int32_t sw = static_cast<int32_t>(image.w);
+    int32_t sh = static_cast<int32_t>(image.h);
+    int32_t x1, x2, x, y, ar, ab, iru, irv, px, ay;
     int32_t vv = 0, uu = 0;
     float dx, u, v;
     uint32_t* buf;
@@ -96,8 +84,15 @@ static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage
     y = yStart;
 
     while (y < yEnd) {
-        x1 = std::max((int32_t)_xa, bbox.min.x);
-        x2 = std::min((int32_t)_xb, bbox.max.x);
+        x1 = std::max((SwCoord)_xa, bbox.min.x);
+        x2 = std::min((SwCoord)_xb, bbox.max.x);
+
+        //Anti-Aliasing frames
+        if (aaSpans) {
+            ay = y - aaSpans->yStart;
+            if (aaSpans->lines[ay].x[0] > x1) aaSpans->lines[ay].x[0] = x1;
+            if (aaSpans->lines[ay].x[1] < x2) aaSpans->lines[ay].x[1] = x2;
+        }
 
         //Range allowed
         if ((x2 - x1) >= 1 && (x1 < bbox.max.x) && (x2 > bbox.min.x)) {
@@ -106,7 +101,9 @@ static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage
             dx = 1 - (_xa - x1);
             u = _ua + dx * _dudx;
             v = _va + dx * _dvdx;
+
             buf = dbuf + ((y * surface->stride) + x1);
+
             x = x1;
 
             //Draw horizontal line
@@ -123,31 +120,26 @@ static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage
 
                 px = *(sbuf + (vv * image.stride) + uu);
 
-                if (image.filter == FilterMethod::Bilinear) {
-                    // horizontal interpolate
+                /* horizontal interpolate */
+                if (iru < sw) {
+                    /* right pixel */
+                    int px2 = *(sbuf + (vv * image.stride) + iru);
+                    px = INTERPOLATE(px, px2, ar);
+                }
+                /* vertical interpolate */
+                if (irv < sh) {
+                    /* bottom pixel */
+                    int px2 = *(sbuf + (irv * image.stride) + uu);
+                    /* horizontal interpolate */
                     if (iru < sw) {
-                        int px2 = *(sbuf + (vv * image.stride) + iru);
-                        px = INTERPOLATE(px, px2, ar);
-                    }
-                    // vertical interpolate
-                    if (irv < sh) {
-                        int px2 = *(sbuf + (irv * image.stride) + uu);
-                        // horizontal interpolate
-                        if (iru < sw) {
-                            int px3 = *(sbuf + (irv * image.stride) + iru);
-                            px2 = INTERPOLATE(px2, px3, ar);
-                        }
-                        px = INTERPOLATE(px, px2, ab);
+                        /* bottom right pixel */
+                        int px3 = *(sbuf + (irv * image.stride) + iru);
+                        px2 = INTERPOLATE(px2, px3, ar);
                     }
+                    px = INTERPOLATE(px, px2, ab);
                 }
-
-                // anti-aliasing
-                if (needAA) {
-                    auto feather = _feathering(iru, irv, ar, ab, sw, sh);
-                    if (feather < 255) px = ALPHA_BLEND(px, feather);
-                }
-
-                *buf = INTERPOLATE(surface->blender(rasterUnpremultiply(px), *buf), *buf, MULTIPLY(opacity, A(px)));
+                auto tmp = surface->blender(px, *buf, 255);
+                *buf = INTERPOLATE(tmp, *buf, MULTIPLY(opacity, A(px)));
                 ++buf;
 
                 //Step UV horizontally
@@ -171,20 +163,19 @@ static void _rasterBlendingPolygonImageSegment(SwSurface* surface, const SwImage
 }
 
 
-static void _rasterPolygonImageSegment32(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int yStart, int yEnd, uint8_t opacity, bool matting, bool needAA)
+static void _rasterPolygonImageSegment(SwSurface* surface, const SwImage& image, const SwBBox& bbox, int yStart, int yEnd, AASpans* aaSpans, uint8_t opacity, bool matting)
 {
-    auto _dudx = dudx, _dvdx = dvdx;
-    auto _dxdya = dxdya, _dxdyb = dxdyb, _dudya = dudya, _dvdya = dvdya;
-    auto _xa = xa, _xb = xb, _ua = ua, _va = va;
+    float _dudx = dudx, _dvdx = dvdx;
+    float _dxdya = dxdya, _dxdyb = dxdyb, _dudya = dudya, _dvdya = dvdya;
+    float _xa = xa, _xb = xb, _ua = ua, _va = va;
     auto sbuf = image.buf32;
     auto dbuf = surface->buf32;
-    auto sw = static_cast<int32_t>(image.w);
-    auto sh = static_cast<int32_t>(image.h);
-    int32_t x1, x2, x, y, ar, ab, iru, irv, px;
+    int32_t sw = static_cast<int32_t>(image.w);
+    int32_t sh = static_cast<int32_t>(image.h);
+    int32_t x1, x2, x, y, ar, ab, iru, irv, px, ay;
     int32_t vv = 0, uu = 0;
     float dx, u, v;
     uint32_t* buf;
-    auto fullOpacity = (opacity == 255);
 
     //for matting(composition)
     auto csize = matting ? surface->compositor->image.channelSize: 0;
@@ -197,8 +188,15 @@ static void _rasterPolygonImageSegment32(SwSurface* surface, const SwImage& imag
     y = yStart;
 
     while (y < yEnd) {
-        x1 = std::max((int32_t)_xa, bbox.min.x);
-        x2 = std::min((int32_t)_xb, bbox.max.x);
+        x1 = std::max((SwCoord)_xa, bbox.min.x);
+        x2 = std::min((SwCoord)_xb, bbox.max.x);
+
+        //Anti-Aliasing frames
+        if (aaSpans) {
+            ay = y - aaSpans->yStart;
+            if (aaSpans->lines[ay].x[0] > x1) aaSpans->lines[ay].x[0] = x1;
+            if (aaSpans->lines[ay].x[1] < x2) aaSpans->lines[ay].x[1] = x2;
+        }
 
         //Range allowed
         if ((x2 - x1) >= 1 && (x1 < bbox.max.x) && (x2 > bbox.min.x)) {
@@ -207,64 +205,111 @@ static void _rasterPolygonImageSegment32(SwSurface* surface, const SwImage& imag
             dx = 1 - (_xa - x1);
             u = _ua + dx * _dudx;
             v = _va + dx * _dvdx;
+
             buf = dbuf + ((y * surface->stride) + x1);
+
             x = x1;
 
             if (matting) cmp = &surface->compositor->image.buf8[(y * surface->compositor->image.stride + x1) * csize];
 
-            //Draw horizontal line
-            while (x++ < x2) {
-                uu = (int) u;
-                vv = (int) v;
+            if (opacity == 255) {
+                //Draw horizontal line
+                while (x++ < x2) {
+                    uu = (int) u;
+                    vv = (int) v;
 
-                if ((uint32_t) uu >= image.w || (uint32_t) vv >= image.h) continue;
+                    if ((uint32_t) uu >= image.w || (uint32_t) vv >= image.h) continue;
 
-                ar = _modf(u);
-                ab = _modf(v);
-                iru = uu + 1;
-                irv = vv + 1;
+                    ar = _modf(u);
+                    ab = _modf(v);
 
-                px = *(sbuf + (vv * image.stride) + uu);
+                    iru = uu + 1;
+                    irv = vv + 1;
 
-                if (image.filter == FilterMethod::Bilinear) {
-                    // horizontal interpolate
+                    px = *(sbuf + (vv * image.stride) + uu);
+
+                    /* horizontal interpolate */
                     if (iru < sw) {
+                        /* right pixel */
                         int px2 = *(sbuf + (vv * image.stride) + iru);
                         px = INTERPOLATE(px, px2, ar);
                     }
-                    // vertical interpolate
+                    /* vertical interpolate */
                     if (irv < sh) {
+                        /* bottom pixel */
                         int px2 = *(sbuf + (irv * image.stride) + uu);
-                        // horizontal interpolate
+
+                        /* horizontal interpolate */
                         if (iru < sw) {
+                            /* bottom right pixel */
                             int px3 = *(sbuf + (irv * image.stride) + iru);
                             px2 = INTERPOLATE(px2, px3, ar);
                         }
                         px = INTERPOLATE(px, px2, ab);
                     }
+                    uint32_t src;
+                    if (matting) {
+                        src = ALPHA_BLEND(px, alpha(cmp));
+                        cmp += csize;
+                    } else {
+                        src = px;
+                    }
+                    *buf = src + ALPHA_BLEND(*buf, IA(src));
+                    ++buf;
+
+                    //Step UV horizontally
+                    u += _dudx;
+                    v += _dvdx;
                 }
+            } else {
+                //Draw horizontal line
+                while (x++ < x2) {
+                    uu = (int) u;
+                    vv = (int) v;
 
-                uint32_t src;
-                if (matting) {
-                    auto a = alpha(cmp);
-                    src = fullOpacity ? ALPHA_BLEND(px, a) : ALPHA_BLEND(px, MULTIPLY(opacity, a));
-                    cmp += csize;
-                } else {
-                    src = fullOpacity ? px : ALPHA_BLEND(px, opacity);
+                    if ((uint32_t) uu >= image.w || (uint32_t) vv >= image.h) continue;
+
+                    ar = _modf(u);
+                    ab = _modf(v);
+
+                    iru = uu + 1;
+                    irv = vv + 1;
+
+                    px = *(sbuf + (vv * image.stride) + uu);
+
+                    /* horizontal interpolate */
+                    if (iru < sw) {
+                        /* right pixel */
+                        int px2 = *(sbuf + (vv * image.stride) + iru);
+                        px = INTERPOLATE(px, px2, ar);
+                    }
+                    /* vertical interpolate */
+                    if (irv < sh) {
+                        /* bottom pixel */
+                        int px2 = *(sbuf + (irv * image.stride) + uu);
+
+                        /* horizontal interpolate */
+                        if (iru < sw) {
+                            /* bottom right pixel */
+                            int px3 = *(sbuf + (irv * image.stride) + iru);
+                            px2 = INTERPOLATE(px2, px3, ar);
+                        }
+                        px = INTERPOLATE(px, px2, ab);
+                    }
+                    uint32_t src;
+                    if (matting) {
+                        src = ALPHA_BLEND(px, MULTIPLY(opacity, alpha(cmp)));
+                        cmp += csize;
+                    } else {
+                        src = ALPHA_BLEND(px, opacity);
+                    }
+                    *buf = src + ALPHA_BLEND(*buf, IA(src));
+                    ++buf;
+
+                    //Step UV horizontally
+                    u += _dudx;
+                    v += _dvdx;
                 }
-
-                // anti-aliasing
-                if (needAA) {
-                    auto feather = _feathering(iru, irv, ar, ab, sw, sh);
-                    if (feather < 255) src = ALPHA_BLEND(src, feather);
-                }
-
-                *buf = src + ALPHA_BLEND(*buf, IA(src));
-                ++buf;
-
-                //Step UV horizontally
-                u += _dudx;
-                v += _dvdx;
             }
         }
 
@@ -282,73 +327,9 @@ static void _rasterPolygonImageSegment32(SwSurface* surface, const SwImage& imag
     va = _va;
 }
 
-// no anti-aliasing, no interpolation for the fastest cheap masking
-static void _rasterPolygonImageSegment8(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int yStart, int yEnd, uint8_t opacity, TVG_UNUSED bool needAA)
-{
-    auto _dudx = dudx, _dvdx = dvdx;
-    auto _dxdya = dxdya, _dxdyb = dxdyb, _dudya = dudya, _dvdya = dvdya;
-    auto _xa = xa, _xb = xb, _ua = ua, _va = va;
-    auto sbuf = image.buf32;
-    auto dbuf = surface->buf8;
-    int32_t x1, x2, x, y;
-    float dx, u, v;
-    uint8_t* buf;
-    uint8_t px;
-
-    if (yStart < bbox.min.y) yStart = bbox.min.y;
-    if (yEnd > bbox.max.y) yEnd = bbox.max.y;
-
-    y = yStart;
-
-    while (y < yEnd) {
-        x1 = std::max((int32_t)_xa, bbox.min.x);
-        x2 = std::min((int32_t)_xb, bbox.max.x);
-
-        //Range allowed
-        if ((x2 - x1) >= 1 && (x1 < bbox.max.x) && (x2 > bbox.min.x)) {
-            //Perform subtexel pre-stepping on UV
-            dx = 1 - (_xa - x1);
-            u = _ua + dx * _dudx;
-            v = _va + dx * _dvdx;
-            buf = dbuf + ((y * surface->stride) + x1);
-            x = x1;
-            //Draw horizontal line
-            while (x++ < x2) {
-                auto uu = (int) u;
-                auto vv = (int) v;
-                if ((uint32_t) uu >= image.w || (uint32_t) vv >= image.h) continue;
-
-                px = A(*(sbuf + (vv * image.stride) + uu));
-                *buf = MULTIPLY(px, opacity);
-                ++buf;
-                //Step UV horizontally
-                u += _dudx;
-                v += _dvdx;
-            }
-        }
-        //Step along both edges
-        _xa += _dxdya;
-        _xb += _dxdyb;
-        _ua += _dudya;
-        _va += _dvdya;
-        ++y;
-    }
-    xa = _xa;
-    xb = _xb;
-    ua = _ua;
-    va = _va;
-}
-
-
-static void _rasterPolygonImageSegment(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, int yStart, int yEnd, uint8_t opacity, bool matting, bool needAA)
-{
-    if (surface->channelSize == sizeof(uint32_t)) _rasterPolygonImageSegment32(surface, image, bbox, yStart, yEnd, opacity, matting, needAA);
-    else if (surface->channelSize == sizeof(uint8_t)) _rasterPolygonImageSegment8(surface, image, bbox, yStart, yEnd, opacity, needAA);
-}
-
 
 /* This mapping algorithm is based on Mikael Kalms's. */
-static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const RenderRegion& bbox, Polygon& polygon, uint8_t opacity, bool needAA)
+static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const SwBBox& bbox, Polygon& polygon, AASpans* aaSpans, uint8_t opacity)
 {
     float x[3] = {polygon.vertex[0].pt.x, polygon.vertex[1].pt.x, polygon.vertex[2].pt.x};
     float y[3] = {polygon.vertex[0].pt.y, polygon.vertex[1].pt.y, polygon.vertex[2].pt.y};
@@ -437,12 +418,12 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const
             xb = x[0] + dy * dxdyb + (off_y * dxdyb);
 
             if (compositing) {
-                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, true, needAA);
-                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, needAA);
+                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, true);
+                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, 1);
             } else if (blending) {
-                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, needAA);
+                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity);
             } else {
-                _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, false, needAA);
+                _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, false);
             }
             upper = true;
         }
@@ -458,12 +439,12 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const
             dxdyb = dxdy[2];
             xb = x[1] + (1 - (y[1] - yi[1])) * dxdyb + (off_y * dxdyb);
             if (compositing) {
-                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, true, needAA);
-                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, needAA);
+                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, true);
+                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, 2);
             } else if (blending) {
-                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, needAA);
+                 _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity);
             } else {
-                _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, false, needAA);
+                _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, false);
             }
         }
     //Longer edge is on the right side
@@ -488,12 +469,12 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const
             va = v[0] + dy * dvdya + (off_y * dvdya);
 
             if (compositing) {
-                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, true, needAA);
-                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, needAA);
+                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, true);
+                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, 3);
             } else if (blending) {
-                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, needAA);
+                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity);
             } else {
-                _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], opacity, false, needAA);
+                _rasterPolygonImageSegment(surface, image, bbox, yi[0], yi[1], aaSpans, opacity, false);
             }
             upper = true;
         }
@@ -512,18 +493,286 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const
             va = v[1] + dy * dvdya + (off_y * dvdya);
 
             if (compositing) {
-                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, true, needAA);
-                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, needAA);
+                if (_matting(surface)) _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, true);
+                else _rasterMaskedPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, 4);
             } else if (blending) {
-                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, needAA);
+                _rasterBlendingPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity);
             } else {
-                _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], opacity, false, needAA);
+                _rasterPolygonImageSegment(surface, image, bbox, yi[1], yi[2], aaSpans, opacity, false);
             }
         }
     }
 }
 
-} //namespace
+
+static AASpans* _AASpans(int yStart, int yEnd)
+{
+    auto aaSpans = static_cast<AASpans*>(malloc(sizeof(AASpans)));
+    aaSpans->yStart = yStart;
+    aaSpans->yEnd = yEnd;
+
+    //Initialize X range
+    auto height = yEnd - yStart;
+
+    aaSpans->lines = static_cast<AALine*>(malloc(height * sizeof(AALine)));
+
+    for (int32_t i = 0; i < height; i++) {
+        aaSpans->lines[i].x[0] = INT32_MAX;
+        aaSpans->lines[i].x[1] = 0;
+        aaSpans->lines[i].length[0] = 0;
+        aaSpans->lines[i].length[1] = 0;
+    }
+    return aaSpans;
+}
+
+
+static void _calcIrregularCoverage(AALine* lines, int32_t eidx, int32_t y, int32_t diagonal, int32_t edgeDist, bool reverse)
+{
+    if (eidx == 1) reverse = !reverse;
+    int32_t coverage = (255 / (diagonal + 2));
+    int32_t tmp;
+    for (int32_t ry = 0; ry < (diagonal + 2); ry++) {
+        tmp = y - ry - edgeDist;
+        if (tmp < 0) return;
+        lines[tmp].length[eidx] = 1;
+        if (reverse) lines[tmp].coverage[eidx] = 255 - (coverage * ry);
+        else lines[tmp].coverage[eidx] = (coverage * ry);
+    }
+}
+
+
+static void _calcVertCoverage(AALine *lines, int32_t eidx, int32_t y, int32_t rewind, bool reverse)
+{
+    if (eidx == 1) reverse = !reverse;
+    int32_t coverage = (255 / (rewind + 1));
+    int32_t tmp;
+    for (int ry = 1; ry < (rewind + 1); ry++) {
+        tmp = y - ry;
+        if (tmp < 0) return;
+        lines[tmp].length[eidx] = 1;
+        if (reverse) lines[tmp].coverage[eidx] = (255 - (coverage * ry));
+        else lines[tmp].coverage[eidx] = (coverage * ry);
+    }
+}
+
+
+static void _calcHorizCoverage(AALine *lines, int32_t eidx, int32_t y, int32_t x, int32_t x2)
+{
+    lines[y].length[eidx] = abs(x - x2);
+    lines[y].coverage[eidx] = (255 / (lines[y].length[eidx] + 1));
+}
+
+
+/*
+ * This Anti-Aliasing mechanism is originated from Hermet Park's idea.
+ * To understand this AA logic, you can refer this page:
+ * https://uigraphics.tistory.com/1
+*/
+static void _calcAAEdge(AASpans *aaSpans, int32_t eidx)
+{
+//Previous edge direction:
+#define DirOutHor 0x0011
+#define DirOutVer 0x0001
+#define DirInHor  0x0010
+#define DirInVer  0x0000
+#define DirNone   0x1000
+
+#define PUSH_VERTEX() \
+    do { \
+        pEdge.x = lines[y].x[eidx]; \
+        pEdge.y = y; \
+        ptx[0] = tx[0]; \
+        ptx[1] = tx[1]; \
+    } while (0)
+
+    struct Point
+    {
+        int32_t x, y;
+    };
+
+    int32_t y = 0;
+    Point pEdge = {-1, -1};       //previous edge point
+    Point edgeDiff = {0, 0};      //temporary used for point distance
+
+    /* store bigger to tx[0] between prev and current edge's x positions. */
+    int32_t tx[2] = {0, 0};
+    /* back up prev tx values */
+    int32_t ptx[2] = {0, 0};
+    int32_t diagonal = 0;           //straight diagonal pixels count
+
+    auto yStart = aaSpans->yStart;
+    auto yEnd = aaSpans->yEnd;
+    auto lines = aaSpans->lines;
+
+    int32_t prevDir = DirNone;
+    int32_t curDir = DirNone;
+
+    yEnd -= yStart;
+
+    //Start Edge
+    if (y < yEnd) {
+        pEdge.x = lines[y].x[eidx];
+        pEdge.y = y;
+    }
+
+    //Calculates AA Edges
+    for (y++; y < yEnd; y++) {
+
+        if (lines[y].x[0] == INT32_MAX) continue;
+
+        //Ready tx
+        if (eidx == 0) {
+            tx[0] = pEdge.x;
+            tx[1] = lines[y].x[0];
+        } else {
+            tx[0] = lines[y].x[1];
+            tx[1] = pEdge.x;
+        }
+        edgeDiff.x = (tx[0] - tx[1]);
+        edgeDiff.y = (y - pEdge.y);
+
+        //Confirm current edge direction
+        if (edgeDiff.x > 0) {
+            if (edgeDiff.y == 1) curDir = DirOutHor;
+            else curDir = DirOutVer;
+        } else if (edgeDiff.x < 0) {
+            if (edgeDiff.y == 1) curDir = DirInHor;
+            else curDir = DirInVer;
+        } else curDir = DirNone;
+
+        //straight diagonal increase
+        if ((curDir == prevDir) && (y < yEnd)) {
+            if ((abs(edgeDiff.x) == 1) && (edgeDiff.y == 1)) {
+                ++diagonal;
+                PUSH_VERTEX();
+                continue;
+            }
+        }
+
+        switch (curDir) {
+            case DirOutHor: {
+                _calcHorizCoverage(lines, eidx, y, tx[0], tx[1]);
+                if (diagonal > 0) {
+                    _calcIrregularCoverage(lines, eidx, y, diagonal, 0, true);
+                    diagonal = 0;
+                }
+               /* Increment direction is changed: Outside Vertical -> Outside Horizontal */
+               if (prevDir == DirOutVer) _calcHorizCoverage(lines, eidx, pEdge.y, ptx[0], ptx[1]);
+
+               //Trick, but fine-tunning!
+               if (y == 1) _calcHorizCoverage(lines, eidx, pEdge.y, tx[0], tx[1]);
+               PUSH_VERTEX();
+            }
+            break;
+            case DirOutVer: {
+                _calcVertCoverage(lines, eidx, y, edgeDiff.y, true);
+                if (diagonal > 0) {
+                    _calcIrregularCoverage(lines, eidx, y, diagonal, edgeDiff.y, false);
+                    diagonal = 0;
+                }
+               /* Increment direction is changed: Outside Horizontal -> Outside Vertical */
+               if (prevDir == DirOutHor) _calcHorizCoverage(lines, eidx, pEdge.y, ptx[0], ptx[1]);
+               PUSH_VERTEX();
+            }
+            break;
+            case DirInHor: {
+                _calcHorizCoverage(lines, eidx, (y - 1), tx[0], tx[1]);
+                if (diagonal > 0) {
+                    _calcIrregularCoverage(lines, eidx, y, diagonal, 0, false);
+                    diagonal = 0;
+                }
+                /* Increment direction is changed: Outside Horizontal -> Inside Horizontal */
+               if (prevDir == DirOutHor) _calcHorizCoverage(lines, eidx, pEdge.y, ptx[0], ptx[1]);
+               PUSH_VERTEX();
+            }
+            break;
+            case DirInVer: {
+                _calcVertCoverage(lines, eidx, y, edgeDiff.y, false);
+                if (prevDir == DirOutHor) edgeDiff.y -= 1;      //Weird, fine tuning?????????????????????
+                if (diagonal > 0) {
+                    _calcIrregularCoverage(lines, eidx, y, diagonal, edgeDiff.y, true);
+                    diagonal = 0;
+                }
+                /* Increment direction is changed: Outside Horizontal -> Inside Vertical */
+                if (prevDir == DirOutHor) _calcHorizCoverage(lines, eidx, pEdge.y, ptx[0], ptx[1]);
+                PUSH_VERTEX();
+            }
+            break;
+        }
+        if (curDir != DirNone) prevDir = curDir;
+    }
+
+    //leftovers...?
+    if ((edgeDiff.y == 1) && (edgeDiff.x != 0)) {
+        if (y >= yEnd) y = (yEnd - 1);
+        _calcHorizCoverage(lines, eidx, y - 1, ptx[0], ptx[1]);
+        _calcHorizCoverage(lines, eidx, y, tx[0], tx[1]);
+    } else {
+        ++y;
+        if (y > yEnd) y = yEnd;
+        _calcVertCoverage(lines, eidx, y, (edgeDiff.y + 1), (prevDir & 0x00000001));
+    }
+}
+
+
+static void _apply(SwSurface* surface, AASpans* aaSpans)
+{
+    auto end = surface->buf32 + surface->h * surface->stride;
+    auto y = aaSpans->yStart;
+    uint32_t pixel;
+    uint32_t* dst;
+    int32_t pos;
+
+   //left side
+   _calcAAEdge(aaSpans, 0);
+   //right side
+   _calcAAEdge(aaSpans, 1);
+
+    while (y < aaSpans->yEnd) {
+        auto line = &aaSpans->lines[y - aaSpans->yStart];
+        auto width = line->x[1] - line->x[0];
+        if (width > 0) {
+            auto offset = y * surface->stride;
+
+            //Left edge
+            dst = surface->buf32 + (offset + line->x[0]);
+            if (line->x[0] > 1) pixel = *(dst - 1);
+            else pixel = *dst;
+            pos = 1;
+
+            //exceptional handling. out of memory bound.
+            if (dst + line->length[0] >= end) {
+                pos += static_cast<int32_t>(dst + line->length[0] - end);
+            }
+
+            while (pos <= line->length[0]) {
+                *dst = INTERPOLATE(*dst, pixel, line->coverage[0] * pos);
+                ++dst;
+                ++pos;
+            }
+
+            //Right edge
+            dst = surface->buf32 + offset + line->x[1] - 1;
+
+            if (line->x[1] < (int32_t)(surface->w - 1)) pixel = *(dst + 1);
+            else pixel = *dst;
+            pos = line->length[1];
+
+            //exceptional handling. out of memory bound.
+            if (dst - pos < surface->buf32) pos = static_cast<int32_t>(dst - surface->buf32);
+
+            while (pos > 0) {
+                *dst = INTERPOLATE(*dst, pixel, 255 - (line->coverage[1] * pos));
+                --dst;
+                --pos;
+            }
+        }
+        y++;
+    }
+
+    free(aaSpans->lines);
+    free(aaSpans);
+}
 
 
 /*
@@ -536,8 +785,13 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage& image, const
     | /  |
     3 -- 2
 */
-bool rasterTexmapPolygon(SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity)
+bool rasterTexmapPolygon(SwSurface* surface, const SwImage& image, const Matrix& transform, const SwBBox& bbox, uint8_t opacity)
 {
+    if (surface->channelSize == sizeof(uint8_t)) {
+        TVGERR("SW_ENGINE", "Not supported grayscale Textmap polygon!");
+        return false;
+    }
+
     //Prepare vertices. Shift XY coordinates to match the sub-pixeling technique.
     Vertex vertices[4];
     vertices[0] = {{0.0f, 0.0f}, {0.0f, 0.0f}};
@@ -552,29 +806,31 @@ bool rasterTexmapPolygon(SwSurface* surface, const SwImage& image, const Matrix&
         if (vertices[i].pt.y > ye) ye = vertices[i].pt.y;
     }
 
-    auto needAA = rightAngle(transform) ? false : true;
+    auto yStart = std::max(static_cast<SwCoord>(ys), bbox.min.y);
+    auto yEnd = std::min(static_cast<SwCoord>(ye), bbox.max.y);
+    auto aaSpans = rightAngle(transform) ?  nullptr : _AASpans(yStart, yEnd);
 
-    tvg::Polygon polygon;
+    Polygon polygon;
 
     //Draw the first polygon
     polygon.vertex[0] = vertices[0];
     polygon.vertex[1] = vertices[1];
     polygon.vertex[2] = vertices[3];
 
-    _rasterPolygonImage(surface, image, bbox, polygon, opacity, needAA);
+    _rasterPolygonImage(surface, image, bbox, polygon, aaSpans, opacity);
 
     //Draw the second polygon
     polygon.vertex[0] = vertices[1];
     polygon.vertex[1] = vertices[2];
     polygon.vertex[2] = vertices[3];
 
-    _rasterPolygonImage(surface, image, bbox, polygon, opacity, needAA);
+    _rasterPolygonImage(surface, image, bbox, polygon, aaSpans, opacity);
 
 #if 0
     if (_compositing(surface) && _masking(surface) && !_direct(surface->compositor->method)) {
         _compositeMaskImage(surface, &surface->compositor->image, surface->compositor->bbox);
     }
 #endif
+    if (aaSpans) _apply(surface, aaSpans);
     return true;
 }
-
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
index 8ca9acad..0a9ef380 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,64 +20,51 @@
  * SOFTWARE.
  */
 
+#ifdef THORVG_SW_OPENMP_SUPPORT
+    #include <omp.h>
+#endif
 #include <algorithm>
+#include "tvgMath.h"
 #include "tvgSwCommon.h"
 #include "tvgTaskScheduler.h"
 #include "tvgSwRenderer.h"
 
-#ifdef THORVG_OPENMP_SUPPORT
-    #include <omp.h>
-#endif
-
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
-
-static int32_t _rendererCnt = -1;
-static mutex _rendererMtx;
+static int32_t initEngineCnt = false;
+static int32_t rendererCnt = 0;
+static SwMpool* globalMpool = nullptr;
+static uint32_t threadsCnt = 0;
 
 struct SwTask : Task
 {
     SwSurface* surface = nullptr;
     SwMpool* mpool = nullptr;
-    RenderRegion clipBox;      //clipping region applied to the task, may differ from curBox which is the actual rendering region
-    RenderRegion curBox{};     //current rendering region
-    RenderRegion prvBox{};     //previous rendering region
+    SwBBox bbox;                          //Rendering Region
     Matrix transform;
     Array<RenderData> clips;
-    RenderDirtyRegion* dirtyRegion;
-    RenderUpdateFlag flags[2] = {RenderUpdateFlag::None, RenderUpdateFlag::None};  //cur&prv
+    RenderUpdateFlag flags = RenderUpdateFlag::None;
     uint8_t opacity;
-    bool pushed : 1;                  //Pushed into task list?
-    bool disposed : 1;                //Disposed task?
-    bool nodirty : 1;                 //target for partial rendering?
-    bool valid : 1;
+    bool pushed = false;                  //Pushed into task list?
+    bool disposed = false;                //Disposed task?
 
-    SwTask() : pushed(false), disposed(false) {}
-
-    const RenderRegion& bounds()
+    RenderRegion bounds()
     {
+        //Can we skip the synchronization?
         done();
-        return curBox;
-    }
 
-    void invisible()
-    {
-        curBox.reset();
-        if (!nodirty) dirtyRegion->add(prvBox, curBox);
-    }
+        RenderRegion region;
 
-    bool ready(bool condition)
-    {
-        //invisible
-        if (condition) {
-            if (flags[0] & RenderUpdateFlag::Color) invisible();
-            flags[1] = flags[0]; //backup
-            return true;
-        }
-        flags[0] |= flags[1];  //applied the previous flags if it's skipped before
-        flags[1] = RenderUpdateFlag::None;  //reset
-        return false;
+        //Range over?
+        region.x = bbox.min.x > 0 ? bbox.min.x : 0;
+        region.y = bbox.min.y > 0 ? bbox.min.y : 0;
+        region.w = bbox.max.x - region.x;
+        region.h = bbox.max.y - region.y;
+        if (region.w < 0) region.w = 0;
+        if (region.h < 0) region.h = 0;
+
+        return region;
     }
 
     virtual void dispose() = 0;
@@ -98,91 +85,105 @@ struct SwShapeTask : SwTask
        Additionally, the stroke style should not be dashed. */
     bool antialiasing(float strokeWidth)
     {
-        return strokeWidth < 2.0f || rshape->stroke->dash.count > 0 || rshape->stroke->first || rshape->trimpath() || rshape->stroke->color.a < 255;
+        return strokeWidth < 2.0f || rshape->stroke->dashCnt > 0 || rshape->stroke->strokeFirst || rshape->strokeTrim() || rshape->stroke->color[3] < 255;;
     }
 
-    float validStrokeWidth(bool clipper)
+    float validStrokeWidth()
     {
-        if (!rshape->stroke || tvg::zero(rshape->stroke->width)) return 0.0f;
-        if (!clipper && (!rshape->stroke->fill && (rshape->stroke->color.a == 0))) return 0.0f;
+        if (!rshape->stroke) return 0.0f;
+
+        auto width = rshape->stroke->width;
+        if (tvg::zero(width)) return 0.0f;
+
+        if (!rshape->stroke->fill && (MULTIPLY(rshape->stroke->color[3], opacity) == 0)) return 0.0f;
         if (tvg::zero(rshape->stroke->trim.begin - rshape->stroke->trim.end)) return 0.0f;
-        return (rshape->stroke->width * sqrt(transform.e11 * transform.e11 + transform.e12 * transform.e12));
+
+        return (width * sqrt(transform.e11 * transform.e11 + transform.e12 * transform.e12));
     }
 
     bool clip(SwRle* target) override
     {
-        if (shape.strokeRle) return rleClip(target, shape.strokeRle);
-        if (shape.fastTrack) return rleClip(target, &curBox);
-        if (shape.rle) return rleClip(target, shape.rle);
+        if (shape.fastTrack) return rleClip(target, &bbox);
+        else if (shape.rle) return rleClip(target, shape.rle);
         return false;
     }
 
     void run(unsigned tid) override
     {
-        auto strokeWidth = validStrokeWidth(clipper);
-        auto updateShape = flags[0] & (RenderUpdateFlag::Path | RenderUpdateFlag::Transform | RenderUpdateFlag::Clip);
-        auto updateFill = (flags[0] & (RenderUpdateFlag::Color | RenderUpdateFlag::Gradient));
+        //Invisible
+        if (opacity == 0 && !clipper) {
+            bbox.reset();
+            return;
+        }
+
+        auto strokeWidth = validStrokeWidth();
+        SwBBox renderRegion{};
+        auto updateShape = flags & (RenderUpdateFlag::Path | RenderUpdateFlag::Transform | RenderUpdateFlag::Clip);
+        auto updateFill = false;
 
         //Shape
-        if (updateShape) {
-            shapeReset(shape);
-            if (rshape->fill || rshape->color.a > 0 || clipper) {
-                if (shapePrepare(shape, rshape, transform, clipBox, curBox, mpool, tid, clips.count > 0 ? true : false)) {
-                    if (!shapeGenRle(shape, curBox, mpool, tid, antialiasing(strokeWidth))) goto err;
+        if (updateShape || flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Gradient)) {
+            uint8_t alpha = 0;
+            rshape->fillColor(nullptr, nullptr, nullptr, &alpha);
+            updateFill = (MULTIPLY(alpha, opacity) || rshape->fill);
+            if (updateShape) shapeReset(&shape);
+            if (updateFill || clipper) {
+                if (shapePrepare(&shape, rshape, transform, bbox, renderRegion, mpool, tid, clips.count > 0 ? true : false)) {
+                    if (!shapeGenRle(&shape, rshape, mpool, tid, antialiasing(strokeWidth))) goto err;
                 } else {
                     updateFill = false;
-                    curBox.reset();
+                    renderRegion.reset();
                 }
             }
         }
         //Fill
         if (updateFill) {
             if (auto fill = rshape->fill) {
-                auto ctable = (flags[0] & RenderUpdateFlag::Gradient) ? true : false;
-                if (ctable) shapeResetFill(shape);
-                if (!shapeGenFillColors(shape, fill, transform, surface, opacity, ctable)) goto err;
+                auto ctable = (flags & RenderUpdateFlag::Gradient) ? true : false;
+                if (ctable) shapeResetFill(&shape);
+                if (!shapeGenFillColors(&shape, fill, transform, surface, opacity, ctable)) goto err;
             }
         }
         //Stroke
-        if (updateShape || flags[0] & RenderUpdateFlag::Stroke) {
+        if (updateShape || flags & RenderUpdateFlag::Stroke) {
             if (strokeWidth > 0.0f) {
-                shapeResetStroke(shape, rshape, transform, mpool, tid);
-                if (!shapeGenStrokeRle(shape, rshape, transform, clipBox, curBox, mpool, tid)) goto err;
+                shapeResetStroke(&shape, rshape, transform);
+                if (!shapeGenStrokeRle(&shape, rshape, transform, bbox, renderRegion, mpool, tid)) goto err;
                 if (auto fill = rshape->strokeFill()) {
-                    auto ctable = (flags[0] & RenderUpdateFlag::GradientStroke) ? true : false;
-                    if (ctable) shapeResetStrokeFill(shape);
-                    if (!shapeGenStrokeFillColors(shape, fill, transform, surface, opacity, ctable)) goto err;
+                    auto ctable = (flags & RenderUpdateFlag::GradientStroke) ? true : false;
+                    if (ctable) shapeResetStrokeFill(&shape);
+                    if (!shapeGenStrokeFillColors(&shape, fill, transform, surface, opacity, ctable)) goto err;
                 }
             } else {
-                shapeDelStroke(shape);
+                shapeDelStroke(&shape);
             }
         }
 
         //Clear current task memorypool here if the clippers would use the same memory pool
-        shapeDelOutline(shape, mpool, tid);
+        shapeDelOutline(&shape, mpool, tid);
 
         //Clip Path
-        ARRAY_FOREACH(p, clips) {
-            auto clipper = static_cast<SwTask*>(*p);
+        for (auto clip = clips.begin(); clip < clips.end(); ++clip) {
+            auto clipper = static_cast<SwTask*>(*clip);
             auto clipShapeRle = shape.rle ? clipper->clip(shape.rle) : true;
             auto clipStrokeRle = shape.strokeRle ? clipper->clip(shape.strokeRle) : true;
-            if (!clipShapeRle || !clipStrokeRle) goto err;
+            if (!clipShapeRle && !clipStrokeRle) goto err;
         }
 
-        valid = true;
-        if (!nodirty) dirtyRegion->add(prvBox, curBox);
+        bbox = renderRegion; //sync
+
         return;
 
     err:
-        shapeReset(shape);
+        bbox.reset();
+        shapeReset(&shape);
         rleReset(shape.strokeRle);
-        shapeDelOutline(shape, mpool, tid);
-        invisible();
+        shapeDelOutline(&shape, mpool, tid);
     }
 
     void dispose() override
     {
-       shapeFree(shape);
+       shapeFree(&shape);
     }
 };
 
@@ -200,6 +201,8 @@ struct SwImageTask : SwTask
 
     void run(unsigned tid) override
     {
+        auto clipRegion = bbox;
+
         //Convert colorspace if it's not aligned.
         rasterConvertCS(source, surface->cs);
         rasterPremultiply(source);
@@ -210,45 +213,74 @@ struct SwImageTask : SwTask
         image.stride = source->stride;
         image.channelSize = source->channelSize;
 
-        auto updateImage = flags[0] & (RenderUpdateFlag::Image | RenderUpdateFlag::Clip | RenderUpdateFlag::Transform);
-        auto updateColor = flags[0] & (RenderUpdateFlag::Color);
-
         //Invisible shape turned to visible by alpha.
-        if ((updateImage || updateColor) && (opacity > 0)) {
-            if (updateImage) imageReset(image);
-            if (!image.data || image.w == 0 || image.h == 0) goto err;
-            if (!imagePrepare(image, transform, clipBox, curBox, mpool, tid)) goto err;
-            valid = true;
+        if ((flags & (RenderUpdateFlag::Image | RenderUpdateFlag::Transform | RenderUpdateFlag::Color)) && (opacity > 0)) {
+            imageReset(&image);
+            if (!image.data || image.w == 0 || image.h == 0) goto end;
+
+            if (!imagePrepare(&image, transform, clipRegion, bbox, mpool, tid)) goto end;
+
             if (clips.count > 0) {
-                if (!imageGenRle(image, curBox, mpool, tid, false)) goto err;
+                if (!imageGenRle(&image, bbox, mpool, tid, false)) goto end;
                 if (image.rle) {
                     //Clear current task memorypool here if the clippers would use the same memory pool
-                    imageDelOutline(image, mpool, tid);
-                    ARRAY_FOREACH(p, clips) {
-                        auto clipper = static_cast<SwTask*>(*p);
+                    imageDelOutline(&image, mpool, tid);
+                    for (auto clip = clips.begin(); clip < clips.end(); ++clip) {
+                        auto clipper = static_cast<SwTask*>(*clip);
                         if (!clipper->clip(image.rle)) goto err;
                     }
-                    if (!nodirty) dirtyRegion->add(prvBox, curBox);
                     return;
                 }
-            } else imageFree(image);
+            }
         }
         goto end;
     err:
-        curBox.reset();
-        imageReset(image);
+        rleReset(image.rle);
     end:
-        imageDelOutline(image, mpool, tid);
-        if (!nodirty) dirtyRegion->add(prvBox, curBox);
+        imageDelOutline(&image, mpool, tid);
     }
 
     void dispose() override
     {
-       imageFree(image);
+       imageFree(&image);
     }
 };
 
 
+static void _termEngine()
+{
+    if (rendererCnt > 0) return;
+
+    mpoolTerm(globalMpool);
+    globalMpool = nullptr;
+}
+
+
+static void _renderFill(SwShapeTask* task, SwSurface* surface, uint8_t opacity)
+{
+    uint8_t r, g, b, a;
+    if (auto fill = task->rshape->fill) {
+        rasterGradientShape(surface, &task->shape, fill, opacity);
+    } else {
+        task->rshape->fillColor(&r, &g, &b, &a);
+        a = MULTIPLY(opacity, a);
+        if (a > 0) rasterShape(surface, &task->shape, r, g, b, a);
+    }
+}
+
+static void _renderStroke(SwShapeTask* task, SwSurface* surface, uint8_t opacity)
+{
+    uint8_t r, g, b, a;
+    if (auto strokeFill = task->rshape->strokeFill()) {
+        rasterGradientStroke(surface, &task->shape, strokeFill, opacity);
+    } else {
+        if (task->rshape->strokeColor(&r, &g, &b, &a)) {
+            a = MULTIPLY(opacity, a);
+            if (a > 0) rasterStroke(surface, &task->shape, r, g, b, a);
+        }
+    }
+}
+
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
@@ -259,34 +291,53 @@ SwRenderer::~SwRenderer()
 
     delete(surface);
 
-    _rendererMtx.lock();
-    --_rendererCnt;
-    _rendererMtx.unlock();
+    if (!sharedMpool) mpoolTerm(mpool);
+
+    --rendererCnt;
+
+    if (rendererCnt == 0 && initEngineCnt == 0) _termEngine();
 }
 
 
 bool SwRenderer::clear()
 {
-    if (surface) {
-        fulldraw = true;
-        return rasterClear(surface, 0, 0, surface->w, surface->h);
+    for (auto task = tasks.begin(); task < tasks.end(); ++task) {
+        if ((*task)->disposed) {
+            delete(*task);
+        } else {
+            (*task)->done();
+            (*task)->pushed = false;
+        }
     }
-    return false;
+    tasks.clear();
+
+    if (!sharedMpool) mpoolClear(mpool);
+
+    if (surface) {
+        vport.x = vport.y = 0;
+        vport.w = surface->w;
+        vport.h = surface->h;
+    }
+
+    return true;
 }
 
 
 bool SwRenderer::sync()
 {
-    //clear if the rendering was not triggered.
-    ARRAY_FOREACH(p, tasks) {
-        if ((*p)->disposed) delete(*p);
-        else {
-            (*p)->done();
-            (*p)->pushed = false;
-        }
-    }
-    tasks.clear();
+    return true;
+}
 
+
+RenderRegion SwRenderer::viewport()
+{
+    return vport;
+}
+
+
+bool SwRenderer::viewport(const RenderRegion& vp)
+{
+    vport = vp;
     return true;
 }
 
@@ -307,53 +358,23 @@ bool SwRenderer::target(pixel_t* data, uint32_t stride, uint32_t w, uint32_t h,
     surface->channelSize = CHANNEL_SIZE(cs);
     surface->premultiplied = true;
 
-    dirtyRegion.init(w, h);
-
-    fulldraw = true;  //reset the screen
-
     return rasterCompositor(surface);
 }
 
 
-bool SwRenderer::preUpdate()
-{
-    return surface != nullptr;
-}
-
-
-bool SwRenderer::postUpdate()
-{
-    return true;
-}
-
-
 bool SwRenderer::preRender()
 {
-    if (!surface) return false;
-    if (fulldraw || dirtyRegion.deactivated()) return true;
-
-    ARRAY_FOREACH(p, tasks) (*p)->done();
-
-    dirtyRegion.commit();
-
-    //clear buffer for partial regions
-    for (int idx = 0; idx < RenderDirtyRegion::PARTITIONING; ++idx) {
-        ARRAY_FOREACH(p, dirtyRegion.get(idx)) {
-            rasterClear(surface, p->x(), p->y(), p->w(), p->h());
-        }
-    }
-
-    return true;
+    return rasterClear(surface, 0, 0, surface->w, surface->h);
 }
 
 
 void SwRenderer::clearCompositors()
 {
     //Free Composite Caches
-    ARRAY_FOREACH(p, compositors) {
-        tvg::free((*p)->compositor->image.data);
-        delete((*p)->compositor);
-        delete(*p);
+    for (auto comp = compositors.begin(); comp < compositors.end(); ++comp) {
+        free((*comp)->compositor->image.data);
+        delete((*comp)->compositor);
+        delete(*comp);
     }
     compositors.reset();
 }
@@ -366,78 +387,49 @@ bool SwRenderer::postRender()
         rasterUnpremultiply(surface);
     }
 
-    dirtyRegion.clear();
-    fulldraw = false;
+    for (auto task = tasks.begin(); task < tasks.end(); ++task) {
+        if ((*task)->disposed) delete(*task);
+        else (*task)->pushed = false;
+    }
+    tasks.clear();
 
     return true;
 }
 
 
-void SwRenderer::damage(RenderData rd, const RenderRegion& region)
-{
-    SwTask* task = static_cast<SwTask*>(rd);
-    if (dirtyRegion.deactivated() || (task && task->opacity == 0)) return;
-    dirtyRegion.add(region);
-}
-
-
-bool SwRenderer::partial(bool disable)
-{
-    return dirtyRegion.deactivate(disable);
-}
-
-
 bool SwRenderer::renderImage(RenderData data)
 {
     auto task = static_cast<SwImageTask*>(data);
-    if (!task) return false;
     task->done();
 
-    if (task->valid) {
-        auto raster = [&](SwSurface* surface, const SwImage& image, const Matrix& transform, const RenderRegion& bbox, uint8_t opacity) {
-            if (bbox.invalid() || bbox.x() >= surface->w || bbox.y() >= surface->h) return true;
+    if (task->opacity == 0) return true;
 
-            //RLE Image
-            if (image.rle) {
-                if (image.rle->invalid()) return true;
-                if (image.direct) return rasterDirectRleImage(surface, image, bbox, opacity);
-                else if (image.scaled) return rasterScaledRleImage(surface, image, transform, bbox, opacity);
-                else {
-                    //create a intermediate buffer for rle clipping
-                    auto cmp = request(sizeof(pixel_t), false);
-                    cmp->compositor->method = MaskMethod::None;
-                    cmp->compositor->valid = true;
-                    cmp->compositor->image.rle = image.rle;
-                    rasterClear(cmp, bbox.x(), bbox.y(), bbox.w(), bbox.h());
-                    rasterTexmapPolygon(cmp, image, transform, bbox, 255);
-                    return rasterDirectRleImage(surface, cmp->compositor->image, bbox, opacity);
-                }
-            //Whole Image
-            } else {
-                if (image.direct) return rasterDirectImage(surface, image, bbox, opacity);
-                else if (image.scaled) return rasterScaledImage(surface, image, transform, bbox, opacity);
-                else return rasterTexmapPolygon(surface, image, transform, bbox, opacity);
-            }
-        };
+    //Outside of the viewport, skip the rendering
+    auto& bbox = task->bbox;
+    if (bbox.max.x <= bbox.min.x || bbox.max.y <= bbox.min.y || bbox.min.x >= int32_t(surface->w) || bbox.min.y >= int32_t(surface->h)) return true;
 
-        //full scene or partial rendering
-        if (fulldraw || task->nodirty || task->pushed || dirtyRegion.deactivated()) {
-            raster(surface, task->image, task->transform, task->curBox, task->opacity);
-        } else if (task->curBox.valid()) {
-            for (int idx = 0; idx < RenderDirtyRegion::PARTITIONING; ++idx) {
-                if (!dirtyRegion.partition(idx).intersected(task->curBox)) continue;
-                ARRAY_FOREACH(p, dirtyRegion.get(idx)) {
-                    if (task->curBox.max.x <= p->min.x) break;   //dirtyRegion is sorted in x order
-                    if (task->curBox.intersected(*p)) {
-                        auto bbox = RenderRegion::intersect(task->curBox, *p);
-                        raster(surface, task->image, task->transform, bbox, task->opacity);
-                    }
-                }
-            }
+    auto& image = task->image;
+
+    //RLE Image
+    if (image.rle) {
+        if (image.direct) return rasterDirectRleImage(surface, image, task->opacity);
+        else if (image.scaled) return rasterScaledRleImage(surface, image, task->transform, bbox, task->opacity);
+        else {
+            //create a intermediate buffer for rle clipping
+            auto cmp = request(sizeof(pixel_t), false);
+            cmp->compositor->method = CompositeMethod::None;
+            cmp->compositor->valid = true;
+            cmp->compositor->image.rle = image.rle;
+            rasterClear(cmp, (uint32_t)bbox.min.x, (uint32_t)bbox.min.y, (uint32_t)(bbox.max.x - bbox.min.x), (uint32_t)(bbox.max.y - bbox.min.y), 0);
+            rasterTexmapPolygon(cmp, image, task->transform, bbox, 255);
+            return rasterDirectRleImage(surface, cmp->compositor->image, task->opacity);
         }
+    //Whole Image
+    } else {
+        if (image.direct) return rasterDirectImage(surface, image, bbox, task->opacity);
+        else if (image.scaled) return rasterScaledImage(surface, image, task->transform, bbox, task->opacity);
+        else return rasterTexmapPolygon(surface, image, task->transform, bbox, task->opacity);
     }
-    task->prvBox = task->curBox;
-    return true;
 }
 
 
@@ -445,58 +437,20 @@ bool SwRenderer::renderShape(RenderData data)
 {
     auto task = static_cast<SwShapeTask*>(data);
     if (!task) return false;
+
     task->done();
 
-    if (task->valid) {
-        auto fill = [](SwShapeTask* task, SwSurface* surface, const RenderRegion& bbox) {
-            if (auto fill = task->rshape->fill) {
-                rasterGradientShape(surface, &task->shape, bbox, fill, task->opacity);
-            } else {
-                RenderColor c;
-                task->rshape->fillColor(&c.r, &c.g, &c.b, &c.a);
-                c.a = MULTIPLY(task->opacity, c.a);
-                if (c.a > 0) rasterShape(surface, &task->shape, bbox, c);
-            }
-        };
+    if (task->opacity == 0) return true;
 
-        auto stroke = [](SwShapeTask* task, SwSurface* surface, const RenderRegion& bbox) {
-            if (auto strokeFill = task->rshape->strokeFill()) {
-                rasterGradientStroke(surface, &task->shape, bbox, strokeFill, task->opacity);
-            } else {
-                RenderColor c;
-                if (task->rshape->strokeFill(&c.r, &c.g, &c.b, &c.a)) {
-                    c.a = MULTIPLY(task->opacity, c.a);
-                    if (c.a > 0) rasterStroke(surface, &task->shape, bbox, c);
-                }
-            }
-        };
-
-        //full scene or partial rendering
-        if (fulldraw || task->nodirty || task->pushed || dirtyRegion.deactivated()) {
-            if (task->rshape->strokeFirst()) {
-                stroke(task, surface, task->curBox);
-                fill(task, surface, task->shape.bbox);
-            } else {
-                fill(task, surface, task->shape.bbox);
-                stroke(task, surface, task->curBox);
-            }
-        } else if (task->curBox.valid()) {
-            for (int idx = 0; idx < RenderDirtyRegion::PARTITIONING; ++idx) {
-                if (!dirtyRegion.partition(idx).intersected(task->curBox)) continue;
-                ARRAY_FOREACH(p, dirtyRegion.get(idx)) {
-                    if (task->curBox.max.x <= p->min.x) break;   //dirtyRegion is sorted in x order
-                    if (task->rshape->strokeFirst()) {
-                        if (task->rshape->stroke && task->curBox.intersected(*p)) stroke(task, surface, RenderRegion::intersect(task->curBox, *p));
-                        if (task->shape.bbox.intersected(*p)) fill(task, surface, RenderRegion::intersect(task->shape.bbox, *p));
-                    } else {
-                        if (task->shape.bbox.intersected(*p)) fill(task, surface, RenderRegion::intersect(task->shape.bbox, *p));
-                        if (task->rshape->stroke && task->curBox.intersected(*p)) stroke(task, surface, RenderRegion::intersect(task->curBox, *p));
-                    }
-                }
-            }
-        }
+    //Main raster stage
+    if (task->rshape->stroke && task->rshape->stroke->strokeFirst) {
+        _renderStroke(task, surface, task->opacity);
+        _renderFill(task, surface, task->opacity);
+    } else {
+        _renderFill(task, surface, task->opacity);
+        _renderStroke(task, surface, task->opacity);
     }
-    task->prvBox = task->curBox;
+
     return true;
 }
 
@@ -507,6 +461,9 @@ bool SwRenderer::blend(BlendMethod method)
     surface->blendMethod = method;
 
     switch (method) {
+        case BlendMethod::Normal:
+            surface->blender = nullptr;
+            break;
         case BlendMethod::Multiply:
             surface->blender = opBlendMultiply;
             break;
@@ -540,37 +497,25 @@ bool SwRenderer::blend(BlendMethod method)
         case BlendMethod::Exclusion:
             surface->blender = opBlendExclusion;
             break;
-        case BlendMethod::Hue:
-            surface->blender = opBlendHue;
-            break;
-        case BlendMethod::Saturation:
-            surface->blender = opBlendSaturation;
-            break;
-        case BlendMethod::Color:
-            surface->blender = opBlendColor;
-            break;
-        case BlendMethod::Luminosity:
-            surface->blender = opBlendLuminosity;
-            break;
         case BlendMethod::Add:
             surface->blender = opBlendAdd;
             break;
         default:
+            TVGLOG("SW_ENGINE", "Non supported blending option = %d", (int) method);
             surface->blender = nullptr;
             break;
     }
-    return true;
+    return false;
 }
 
 
 RenderRegion SwRenderer::region(RenderData data)
 {
-    if (data) return static_cast<SwTask*>(data)->bounds();
-    return {};
+    return static_cast<SwTask*>(data)->bounds();
 }
 
 
-bool SwRenderer::beginComposite(RenderCompositor* cmp, MaskMethod method, uint8_t opacity)
+bool SwRenderer::beginComposite(RenderCompositor* cmp, CompositeMethod method, uint8_t opacity)
 {
     if (!cmp) return false;
     auto p = static_cast<SwCompositor*>(cmp);
@@ -579,7 +524,7 @@ bool SwRenderer::beginComposite(RenderCompositor* cmp, MaskMethod method, uint8_
     p->opacity = opacity;
 
     //Current Context?
-    if (p->method != MaskMethod::None) {
+    if (p->method != CompositeMethod::None) {
         surface = p->recoverSfc;
         surface->compositor = p;
     }
@@ -588,6 +533,26 @@ bool SwRenderer::beginComposite(RenderCompositor* cmp, MaskMethod method, uint8_
 }
 
 
+bool SwRenderer::mempool(bool shared)
+{
+    if (shared == sharedMpool) return true;
+
+    if (shared) {
+        if (!sharedMpool) {
+            if (!mpoolTerm(mpool)) return false;
+            mpool = globalMpool;
+        }
+    } else {
+        if (sharedMpool) mpool = mpoolInit(threadsCnt);
+    }
+
+    sharedMpool = shared;
+
+    if (mpool) return true;
+    return false;
+}
+
+
 const RenderSurface* SwRenderer::mainSurface()
 {
     return surface;
@@ -608,7 +573,7 @@ SwSurface* SwRenderer::request(int channelSize, bool square)
     }
 
     //Use cached data
-    ARRAY_FOREACH(p, compositors) {
+    for (auto p = compositors.begin(); p < compositors.end(); ++p) {
         auto cur = *p;
         if (cur->compositor->valid && cur->compositor->image.channelSize == channelSize) {
             if (w == cur->w && h == cur->h) {
@@ -623,7 +588,7 @@ SwSurface* SwRenderer::request(int channelSize, bool square)
         //Inherits attributes from main surface
         cmp = new SwSurface(surface);
         cmp->compositor = new SwCompositor;
-        cmp->compositor->image.data = tvg::malloc<pixel_t>(channelSize * w * h);
+        cmp->compositor->image.data = (pixel_t*)malloc(channelSize * w * h);
         cmp->w = cmp->compositor->image.w = w;
         cmp->h = cmp->compositor->image.h = h;
         cmp->stride = cmp->compositor->image.stride = w;
@@ -643,18 +608,38 @@ SwSurface* SwRenderer::request(int channelSize, bool square)
 
 RenderCompositor* SwRenderer::target(const RenderRegion& region, ColorSpace cs, CompositionFlag flags)
 {
-    auto bbox = RenderRegion::intersect(region, {{0, 0}, {int32_t(surface->w), int32_t(surface->h)}});
-    if (bbox.invalid()) return nullptr;
+    auto x = region.x;
+    auto y = region.y;
+    auto w = region.w;
+    auto h = region.h;
+    auto sw = static_cast<int32_t>(surface->w);
+    auto sh = static_cast<int32_t>(surface->h);
+
+    //Out of boundary
+    if (x >= sw || y >= sh || x + w < 0 || y + h < 0) return nullptr;
 
     auto cmp = request(CHANNEL_SIZE(cs), (flags & CompositionFlag::PostProcessing));
+
+    //Boundary Check
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
+    if (x + w > sw) w = (sw - x);
+    if (y + h > sh) h = (sh - y);
+
+    if (w == 0 || h == 0) return nullptr;
+
     cmp->compositor->recoverSfc = surface;
     cmp->compositor->recoverCmp = surface->compositor;
     cmp->compositor->valid = false;
-    cmp->compositor->bbox = bbox;
+    cmp->compositor->bbox.min.x = x;
+    cmp->compositor->bbox.min.y = y;
+    cmp->compositor->bbox.max.x = x + w;
+    cmp->compositor->bbox.max.y = y + h;
 
     /* TODO: Currently, only blending might work.
        Blending and composition must be handled together. */
-    rasterClear(cmp, bbox.x(), bbox.y(), bbox.w(), bbox.h());
+    auto color = (surface->blender && !surface->compositor) ? 0x00ffffff : 0x00000000;
+    rasterClear(cmp, x, y, w, h, color);
 
     //Switch render target
     surface = cmp;
@@ -678,7 +663,7 @@ bool SwRenderer::endComposite(RenderCompositor* cmp)
     p->valid = true;
 
     //Default is alpha blending
-    if (p->method == MaskMethod::None) {
+    if (p->method == CompositeMethod::None) {
         return rasterDirectImage(surface, p->image, p->bbox, p->opacity);
     }
 
@@ -699,72 +684,6 @@ void SwRenderer::prepare(RenderEffect* effect, const Matrix& transform)
 }
 
 
-bool SwRenderer::bounds(RenderData data, Point* pt4, const Matrix& m)
-{
-    if (!data) return false;
-
-    auto task = static_cast<SwShapeTask*>(data);
-    task->done();
-
-    return shapeStrokeBBox(task->shape, task->rshape, pt4, m, task->mpool);
-}
-
-
-bool SwRenderer::intersectsShape(RenderData data, const RenderRegion& region)
-{
-    auto task = static_cast<SwShapeTask*>(data);
-    task->done();
-
-    if (!task->valid || !task->bounds().intersected(region)) return false;
-    if (rleIntersect(task->shape.strokeRle, region)) return true;
-    return task->shape.rle ? rleIntersect(task->shape.rle, region): task->shape.fastTrack;
-}
-
-
-bool SwRenderer::intersectsImage(RenderData data, const RenderRegion& region)
-{
-    auto task = static_cast<SwImageTask*>(data);
-    task->done();
-
-    if (!task->valid || !task->bounds().intersected(region)) return false;
-
-    //aabb & obb transformed image intersection
-    auto rad = tvg::radian(task->transform);
-    if (rad > 0.0f && rad < MATH_PI) {
-        Point aabb[4];
-        aabb[0] = {(float)region.min.x, (float)region.min.y};
-        aabb[1] = {(float)region.max.x, (float)region.min.y};
-        aabb[2] = {(float)region.max.x, (float)region.max.y};
-        aabb[3] = {(float)region.min.x, (float)region.max.y};
-
-        Point obb[4];
-        obb[0] = Point{0.0f, 0.0f} * task->transform;
-        obb[1] = Point{(float)task->image.w, 0.0f} * task->transform;
-        obb[2] = Point{(float)task->image.w, (float)task->image.h} * task->transform;
-        obb[3] = Point{0.0f, (float)task->image.h} * task->transform;
-
-        auto project = [](const Point* poly, const Point& axis, float& min, float& max) {
-            min = max = dot(poly[0], axis);
-            for (int i = 1; i < 4; ++i) {
-                float projection = dot(poly[i], axis);
-                if (projection < min) min = projection;
-                if (projection > max) max = projection;
-            }
-        };
-
-        for (int i = 0; i < 4; ++i) {
-            auto edge = (i < 2) ? (aabb[(i+1)%4] - aabb[i]) : (obb[(i-2+1)%4] - obb[i-2]);
-            tvg::normalize(edge);
-            float minA, maxA, minB, maxB;
-            project(aabb, edge, minA, maxA);
-            project(obb, edge, minB, maxB);
-            if (maxA < minB || maxB < minA) return false;
-        }
-    }
-    return task->image.rle ? rleIntersect(task->image.rle, region) : true;
-}
-
-
 bool SwRenderer::region(RenderEffect* effect)
 {
     switch (effect->type) {
@@ -814,23 +733,17 @@ bool SwRenderer::render(RenderCompositor* cmp, const RenderEffect* effect, bool
 }
 
 
-void SwRenderer::dispose(RenderEffect* effect) 
-{
-    tvg::free(effect->rd);
-    effect->rd = nullptr;
-}
-
-
 ColorSpace SwRenderer::colorSpace()
 {
     if (surface) return surface->cs;
-    else return ColorSpace::Unknown;
+    else return ColorSpace::Unsupported;
 }
 
 
 void SwRenderer::dispose(RenderData data)
 {
     auto task = static_cast<SwTask*>(data);
+    if (!task) return;
     task->done();
     task->dispose();
 
@@ -839,20 +752,32 @@ void SwRenderer::dispose(RenderData data)
 }
 
 
-SwTask* SwRenderer::prepareCommon(SwTask* task, const Matrix& transform, const Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags, bool ready)
+void* SwRenderer::prepareCommon(SwTask* task, const Matrix& transform, const Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags)
 {
-    if (task->disposed) return task;
+    if (!surface || (transform.e11 == 0.0f && transform.e12 == 0.0f) || (transform.e21 == 0.0f && transform.e22 == 0.0f)) return task;  //invalid
 
+    //TODO: Failed threading them. It would be better if it's possible.
+    //See: https://github.com/thorvg/thorvg/issues/1409
+    //Guarantee composition targets get ready.
+    for (auto clip = clips.begin(); clip < clips.end(); ++clip) {
+        static_cast<SwTask*>(*clip)->done();
+    }
+
+    task->clips = clips;
+    task->transform = transform;
+
+    //zero size?
+    if (task->transform.e11 == 0.0f && task->transform.e12 == 0.0f) return task; //zero width
+    if (task->transform.e21 == 0.0f && task->transform.e22 == 0.0f) return task; //zero height
+
+    task->opacity = opacity;
     task->surface = surface;
     task->mpool = mpool;
-    task->clipBox = RenderRegion::intersect(vport, {{0, 0}, {int32_t(surface->w), int32_t(surface->h)}});
-    task->transform = transform;
-    task->clips = clips;
-    task->dirtyRegion = &dirtyRegion;
-    task->opacity = opacity;
-    task->nodirty = dirtyRegion.deactivated();
-    task->flags[0] = flags;
-    task->valid = false;
+    task->flags = flags;
+    task->bbox.min.x = std::max(static_cast<SwCoord>(0), static_cast<SwCoord>(vport.x));
+    task->bbox.min.y = std::max(static_cast<SwCoord>(0), static_cast<SwCoord>(vport.y));
+    task->bbox.max.x = std::min(static_cast<SwCoord>(surface->w), static_cast<SwCoord>(vport.x + vport.w));
+    task->bbox.max.y = std::min(static_cast<SwCoord>(surface->h), static_cast<SwCoord>(vport.y + vport.h));
 
     if (!task->pushed) {
         task->pushed = true;
@@ -862,20 +787,21 @@ SwTask* SwRenderer::prepareCommon(SwTask* task, const Matrix& transform, const A
     //TODO: Failed threading them. It would be better if it's possible.
     //See: https://github.com/thorvg/thorvg/issues/1409
     //Guarantee composition targets get ready.
-    ARRAY_FOREACH(p, clips) {
-        static_cast<SwTask*>(*p)->done();
+    if (flags & RenderUpdateFlag::Clip) {
+        for (uint32_t i = 0; i < clips.count; ++i) {
+            static_cast<SwTask*>(clips[i])->done();
+        }
     }
 
-    if (task->ready(ready)) return task;
-
     if (flags) TaskScheduler::request(task);
 
     return task;
 }
 
 
-RenderData SwRenderer::prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, FilterMethod filter, RenderUpdateFlag flags)
+RenderData SwRenderer::prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags)
 {
+    //prepare task
     auto task = static_cast<SwImageTask*>(data);
     if (task) task->done();
     else {
@@ -883,12 +809,13 @@ RenderData SwRenderer::prepare(RenderSurface* surface, RenderData data, const Ma
         task->source = surface;
     }
 
-    task->image.filter = filter;
-    return prepareCommon(task, transform, clips, opacity, flags, (opacity == 0));
+    return prepareCommon(task, transform, clips, opacity, flags);
 }
 
+
 RenderData SwRenderer::prepare(const RenderShape& rshape, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags, bool clipper)
 {
+    //prepare task
     auto task = static_cast<SwShapeTask*>(data);
     if (task) task->done();
     else {
@@ -898,41 +825,55 @@ RenderData SwRenderer::prepare(const RenderShape& rshape, RenderData data, const
 
     task->clipper = clipper;
 
-    return prepareCommon(task, transform, clips, opacity, flags, (opacity == 0 && !clipper));
+    return prepareCommon(task, transform, clips, opacity, flags);
 }
 
-bool SwRenderer::term()
+
+SwRenderer::SwRenderer():mpool(globalMpool)
 {
-    _rendererMtx.lock();
-    if (_rendererCnt > 0) {
-        _rendererMtx.unlock();
+}
+
+
+bool SwRenderer::init(uint32_t threads)
+{
+    if ((initEngineCnt++) > 0) return true;
+
+    threadsCnt = threads;
+
+    //Share the memory pool among the renderer
+    globalMpool = mpoolInit(threads);
+    if (!globalMpool) {
+        --initEngineCnt;
         return false;
     }
 
-    mpoolTerm();
-
-    _rendererCnt = -1;
-    _rendererMtx.unlock();
-
     return true;
 }
 
 
-SwRenderer::SwRenderer(uint32_t threads, EngineOption op)
+int32_t SwRenderer::init()
 {
-    //initialize engine
-    _rendererMtx.lock();
-    if (_rendererCnt == -1) {
-#ifdef THORVG_OPENMP_SUPPORT
-        omp_set_num_threads(threads);
+#ifdef THORVG_SW_OPENMP_SUPPORT
+    omp_set_num_threads(TaskScheduler::threads());
 #endif
-        mpoolInit(threads);
-        _rendererCnt = 0;
-    }
-    ++_rendererCnt;
-    _rendererMtx.unlock();
 
-    mpool = mpoolReq();
-
-    if (op == EngineOption::None) dirtyRegion.support = false;
+    return initEngineCnt;
+}
+
+
+bool SwRenderer::term()
+{
+    if ((--initEngineCnt) > 0) return true;
+
+    initEngineCnt = 0;
+
+   _termEngine();
+
+    return true;
+}
+
+SwRenderer* SwRenderer::gen()
+{
+    ++rendererCnt;
+    return new SwRenderer();
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h
index 299a06f5..1910dead 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,60 +33,56 @@ struct SwMpool;
 namespace tvg
 {
 
-struct SwRenderer : RenderMethod
+class SwRenderer : public RenderMethod
 {
-    //main features
-    bool preUpdate() override;
+public:
     RenderData prepare(const RenderShape& rshape, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags, bool clipper) override;
-    RenderData prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, FilterMethod filter, RenderUpdateFlag flags) override;
-    bool postUpdate() override;
+    RenderData prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags) override;
     bool preRender() override;
     bool renderShape(RenderData data) override;
     bool renderImage(RenderData data) override;
     bool postRender() override;
     void dispose(RenderData data) override;
     RenderRegion region(RenderData data) override;
-    bool bounds(RenderData data, Point* pt4, const Matrix& m) override;
+    RenderRegion viewport() override;
+    bool viewport(const RenderRegion& vp) override;
     bool blend(BlendMethod method) override;
     ColorSpace colorSpace() override;
     const RenderSurface* mainSurface() override;
+
     bool clear() override;
     bool sync() override;
-    bool intersectsShape(RenderData data, const RenderRegion& region) override;
-    bool intersectsImage(RenderData data, const RenderRegion& region) override;
     bool target(pixel_t* data, uint32_t stride, uint32_t w, uint32_t h, ColorSpace cs);
+    bool mempool(bool shared);
 
-    //composition
     SwSurface* request(int channelSize, bool square);
+
     RenderCompositor* target(const RenderRegion& region, ColorSpace cs, CompositionFlag flags) override;
-    bool beginComposite(RenderCompositor* cmp, MaskMethod method, uint8_t opacity) override;
+    bool beginComposite(RenderCompositor* cmp, CompositeMethod method, uint8_t opacity) override;
     bool endComposite(RenderCompositor* cmp) override;
     void clearCompositors();
 
-    //post effects
     void prepare(RenderEffect* effect, const Matrix& transform) override;
     bool region(RenderEffect* effect) override;
     bool render(RenderCompositor* cmp, const RenderEffect* effect, bool direct) override;
-    void dispose(RenderEffect* effect) override;
 
-    //partial rendering
-    void damage(RenderData rd, const RenderRegion& region) override;
-    bool partial(bool disable) override;
-
-    SwRenderer(uint32_t threads, EngineOption op);
+    static SwRenderer* gen();
+    static bool init(uint32_t threads);
+    static int32_t init();
     static bool term();
 
 private:
     SwSurface*           surface = nullptr;           //active surface
     Array<SwTask*>       tasks;                       //async task list
     Array<SwSurface*>    compositors;                 //render targets cache list
-    RenderDirtyRegion    dirtyRegion;                 //partial rendering support
-    SwMpool* mpool;                                   // designated memory pool
-    bool                 fulldraw = true;             //buffer is cleared (need to redraw full screen)
+    SwMpool*             mpool;                       //private memory pool
+    RenderRegion         vport;                       //viewport
+    bool                 sharedMpool = true;          //memory-pool behavior policy
 
+    SwRenderer();
     ~SwRenderer();
 
-    SwTask* prepareCommon(SwTask* task, const Matrix& transform, const Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags, bool ready);
+    RenderData prepareCommon(SwTask* task, const Matrix& transform, const Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags);
 };
 
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
index 1aacae96..27a9ba1f 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -189,6 +189,7 @@
 */
 
 #include <limits.h>
+#include <memory.h>
 #include "tvgSwCommon.h"
 
 /************************************************************************/
@@ -196,11 +197,11 @@
 /************************************************************************/
 
 constexpr auto PIXEL_BITS = 8;   //must be at least 6 bits!
-constexpr auto ONE_PIXEL = (1 << PIXEL_BITS);
+constexpr auto ONE_PIXEL = (1L << PIXEL_BITS);
 
 struct Band
 {
-    int32_t min, max;
+    SwCoord min, max;
 };
 
 struct RleWorker
@@ -210,11 +211,11 @@ struct RleWorker
     SwPoint cellPos;
     SwPoint cellMin;
     SwPoint cellMax;
-    int32_t cellXCnt;
-    int32_t cellYCnt;
+    SwCoord cellXCnt;
+    SwCoord cellYCnt;
 
     Area area;
-    int32_t cover;
+    SwCoord cover;
 
     SwCell* cells;
     ptrdiff_t maxCells;
@@ -244,26 +245,31 @@ struct RleWorker
 
 static inline SwPoint UPSCALE(const SwPoint& pt)
 {
-    return {int32_t(((unsigned long) pt.x) << (PIXEL_BITS - 6)), int32_t(((unsigned long) pt.y) << (PIXEL_BITS - 6))};
-}
-
-
-static inline int32_t TRUNC(const int32_t x)
-{
-    return  x >> PIXEL_BITS;
+    return {SwCoord(((unsigned long) pt.x) << (PIXEL_BITS - 6)), SwCoord(((unsigned long) pt.y) << (PIXEL_BITS - 6))};
 }
 
 
 static inline SwPoint TRUNC(const SwPoint& pt)
 {
-    return  {TRUNC(pt.x), TRUNC(pt.y)};
+    return  {pt.x >> PIXEL_BITS, pt.y >> PIXEL_BITS};
 }
 
 
-static inline SwPoint FRACT(const SwPoint& pt)
+static inline SwCoord TRUNC(const SwCoord x)
 {
+    return  x >> PIXEL_BITS;
+}
 
-    return {pt.x & (ONE_PIXEL - 1), pt.y & (ONE_PIXEL - 1)};
+
+static inline SwPoint SUBPIXELS(const SwPoint& pt)
+{
+    return {SwCoord(((unsigned long) pt.x) << PIXEL_BITS), SwCoord(((unsigned long) pt.y) << PIXEL_BITS)};
+}
+
+
+static inline SwCoord SUBPIXELS(const SwCoord x)
+{
+    return SwCoord(((unsigned long) x) << PIXEL_BITS);
 }
 
 
@@ -299,6 +305,7 @@ static void _horizLine(RleWorker& rw, int32_t x, int32_t y, int32_t area, int32_
     /* compute the coverage line's coverage, depending on the outline fill rule */
     /* the coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
     auto coverage = static_cast<int>(area >> (PIXEL_BITS * 2 + 1 - 8));    //range 0 - 255
+
     if (coverage < 0) coverage = -coverage;
 
     if (rw.outline->fillRule == FillRule::EvenOdd) {
@@ -312,8 +319,12 @@ static void _horizLine(RleWorker& rw, int32_t x, int32_t y, int32_t area, int32_
     if (coverage == 0) return;
 
     //span has ushort coordinates. check limit overflow
-    if (x >= SHRT_MAX || y >= SHRT_MAX) {
-        TVGERR("SW_ENGINE", "XY-coordinate overflow!");
+    if (x >= SHRT_MAX) {
+        TVGERR("SW_ENGINE", "X-coordinate overflow!");
+        return;
+    }
+    if (y >= SHRT_MAX) {
+        TVGERR("SW_ENGINE", "Y-coordinate overflow!");
         return;
     }
 
@@ -322,20 +333,31 @@ static void _horizLine(RleWorker& rw, int32_t x, int32_t y, int32_t area, int32_
     if (!rw.antiAlias) coverage = 255;
 
     //see whether we can add this span to the current list
-    if (!rle->spans.empty()) {
-        auto& span = rle->spans.last();
-        if ((span.coverage == coverage) && (span.y == y) && (span.x + span.len == x)) {
+    if (rle->size > 0) {
+        auto span = rle->spans + rle->size - 1;
+        if ((span->coverage == coverage) && (span->y == y) && (span->x + span->len == x)) {
             //Clip x range
-            int32_t xOver = 0;
+            SwCoord xOver = 0;
             if (x + aCount >= rw.cellMax.x) xOver -= (x + aCount - rw.cellMax.x);
             if (x < rw.cellMin.x) xOver -= (rw.cellMin.x - x);
-            span.len += (aCount + xOver);
+
+            //span->len += (aCount + xOver) - 1;
+            span->len += (aCount + xOver);
             return;
         }
     }
 
+    //span pool is full, grow it.
+    if (rle->size >= rle->alloc) {
+        auto newSize = (rle->size > 0) ? (rle->size * 2) : 256;
+        if (rle->alloc < newSize) {
+            rle->alloc = newSize;
+            rle->spans = static_cast<SwSpan*>(realloc(rle->spans, rle->alloc * sizeof(SwSpan)));
+        }
+    }
+
     //Clip x range
-    int32_t xOver = 0;
+    SwCoord xOver = 0;
     if (x + aCount >= rw.cellMax.x) xOver -= (x + aCount - rw.cellMax.x);
     if (x < rw.cellMin.x) {
         xOver -= (rw.cellMin.x - x);
@@ -346,7 +368,12 @@ static void _horizLine(RleWorker& rw, int32_t x, int32_t y, int32_t area, int32_
     if (aCount + xOver <= 0) return;
 
     //add a span to the current list
-    rle->spans.next() = {(uint16_t)x, (uint16_t)y, uint16_t(aCount + xOver), (uint8_t)coverage};
+    auto span = rle->spans + rle->size;
+    span->x = x;
+    span->y = y;
+    span->len = (aCount + xOver);
+    span->coverage = coverage;
+    rle->size++;
 }
 
 
@@ -404,7 +431,9 @@ static bool _recordCell(RleWorker& rw)
 {
     if (rw.area | rw.cover) {
         auto cell = _findCell(rw);
-        if (!cell) return false;
+
+        if (cell == nullptr) return false;
+
         cell->area += rw.area;
         cell->cover += rw.cover;
     }
@@ -427,7 +456,8 @@ static bool _setCell(RleWorker& rw, SwPoint pos)
 
     /* All cells that are on the left of the clipping region go to the
        min_ex - 1 horizontal position. */
-    pos -= rw.cellMin;
+    pos.x -= rw.cellMin.x;
+    pos.y -= rw.cellMin.y;
 
     //exceptions
     if (pos.x < 0) pos.x = -1;
@@ -436,7 +466,9 @@ static bool _setCell(RleWorker& rw, SwPoint pos)
     //Are we moving to a different cell?
     if (pos != rw.cellPos) {
         //Record the current one if it is valid
-        if (!rw.invalid && !_recordCell(rw)) return false;
+        if (!rw.invalid) {
+            if (!_recordCell(rw)) return false;
+        }
         rw.area = rw.cover = 0;
         rw.cellPos = pos;
     }
@@ -463,7 +495,9 @@ static bool _startCell(RleWorker& rw, SwPoint pos)
 static bool _moveTo(RleWorker& rw, const SwPoint& to)
 {
     //record current cell, if any */
-    if (!rw.invalid && !_recordCell(rw)) return false;
+    if (!rw.invalid) {
+        if (!_recordCell(rw)) return false;
+    }
 
     //start to a new position
     if (!_startCell(rw, TRUNC(to))) return false;
@@ -476,6 +510,10 @@ static bool _moveTo(RleWorker& rw, const SwPoint& to)
 
 static bool _lineTo(RleWorker& rw, const SwPoint& to)
 {
+#define SW_UDIV(a, b) \
+    static_cast<SwCoord>(((unsigned long)(a) * (unsigned long)(b)) >> \
+    (sizeof(long) * CHAR_BIT - PIXEL_BITS))
+
     auto e1 = TRUNC(rw.pos);
     auto e2 = TRUNC(to);
 
@@ -499,7 +537,7 @@ static bool _lineTo(RleWorker& rw, const SwPoint& to)
         e1 = TRUNC(line[1]);
         e2 = TRUNC(line[0]);
 
-        auto f1 = FRACT(line[1]);
+        auto f1 = line[1] - SUBPIXELS(e1);
         SwPoint f2;
 
         //inside one cell
@@ -533,25 +571,23 @@ static bool _lineTo(RleWorker& rw, const SwPoint& to)
             }
         //any other line
         } else {
-            #define SW_UDIV(a, b) (int32_t)((uint64_t(a) * uint64_t(b)) >> 32)
-
             Area prod = diff.x * f1.y - diff.y * f1.x;
 
             /* These macros speed up repetitive divisions by replacing them
                with multiplications and right shifts. */
-            auto dxr = (e1.x != e2.x) ? (int64_t)0xffffffff / diff.x : 0;
-            auto dyr = (e1.y != e2.y) ? (int64_t)0xffffffff / diff.y : 0;
-            auto px = diff.x * ONE_PIXEL;
-            auto py = diff.y * ONE_PIXEL;
+            auto dx_r = static_cast<long>(ULONG_MAX >> PIXEL_BITS) / (diff.x);
+            auto dy_r = static_cast<long>(ULONG_MAX >> PIXEL_BITS) / (diff.y);
 
             /* The fundamental value `prod' determines which side and the  */
             /* exact coordinate where the line exits current cell.  It is  */
             /* also easily updated when moving from one cell to the next.  */
-
             do {
+                auto px = diff.x * ONE_PIXEL;
+                auto py = diff.y * ONE_PIXEL;
+
                 //left
                 if (prod <= 0 && prod - px > 0) {
-                    f2 = {0, SW_UDIV(-prod, -dxr)};
+                    f2 = {0, SW_UDIV(-prod, -dx_r)};
                     prod -= py;
                     rw.cover += (f2.y - f1.y);
                     rw.area += (f2.y - f1.y) * (f1.x + f2.x);
@@ -560,7 +596,7 @@ static bool _lineTo(RleWorker& rw, const SwPoint& to)
                 //up
                 } else if (prod - px <= 0 && prod - px + py > 0) {
                     prod -= px;
-                    f2 = {SW_UDIV(-prod, dyr), ONE_PIXEL};
+                    f2 = {SW_UDIV(-prod, dy_r), ONE_PIXEL};
                     rw.cover += (f2.y - f1.y);
                     rw.area += (f2.y - f1.y) * (f1.x + f2.x);
                     f1 = {f2.x, 0};
@@ -568,14 +604,14 @@ static bool _lineTo(RleWorker& rw, const SwPoint& to)
                 //right
                 } else if (prod - px + py <= 0 && prod + py >= 0) {
                     prod += py;
-                    f2 = {ONE_PIXEL, SW_UDIV(prod, dxr)};
+                    f2 = {ONE_PIXEL, SW_UDIV(prod, dx_r)};
                     rw.cover += (f2.y - f1.y);
                     rw.area += (f2.y - f1.y) * (f1.x + f2.x);
                     f1 = {0, f2.y};
                     ++e1.x;
                 //down
                 } else {
-                    f2 = {SW_UDIV(prod, -dyr), 0};
+                    f2 = {SW_UDIV(prod, -dy_r), 0};
                     prod += px;
                     rw.cover += (f2.y - f1.y);
                     rw.area += (f2.y - f1.y) * (f1.x + f2.x);
@@ -588,7 +624,7 @@ static bool _lineTo(RleWorker& rw, const SwPoint& to)
             } while(e1 != e2);
         }
 
-        f2 = FRACT(line[0]);
+        f2 = {line[0].x - SUBPIXELS(e2.x), line[0].y - SUBPIXELS(e2.y)};
         rw.cover += (f2.y - f1.y);
         rw.area += (f2.y - f1.y) * (f1.x + f2.x);
         rw.pos = line[0];
@@ -610,7 +646,7 @@ static bool _cubicTo(RleWorker& rw, const SwPoint& ctrl1, const SwPoint& ctrl2,
     auto min = arc[0].y;
     auto max = arc[0].y;
 
-    int32_t y;
+    SwCoord y;
     for (auto i = 1; i < 4; ++i) {
         y = arc[i].y;
         if (y < min) min = y;
@@ -674,8 +710,8 @@ static bool _decomposeOutline(RleWorker& rw)
     auto outline = rw.outline;
     auto first = 0;  //index of first point in contour
 
-    ARRAY_FOREACH(p, outline->cntrs) {
-        auto last = *p;
+    for (auto cntr = outline->cntrs.begin(); cntr < outline->cntrs.end(); ++cntr) {
+        auto last = *cntr;
         auto limit = outline->pts.data + last;
         auto start = UPSCALE(outline->pts[first]);
         auto pt = outline->pts.data + first;
@@ -696,7 +732,8 @@ static bool _decomposeOutline(RleWorker& rw)
                 types += 3;
                 if (pt <= limit) {
                     if (!_cubicTo(rw, UPSCALE(pt[-2]), UPSCALE(pt[-1]), UPSCALE(pt[0]))) return false;
-                } else if (pt - 1 == limit) {
+                }
+                else if (pt - 1 == limit) {
                     if (!_cubicTo(rw, UPSCALE(pt[-2]), UPSCALE(pt[-1]), start)) return false;
                 }
                 else goto close;
@@ -704,18 +741,119 @@ static bool _decomposeOutline(RleWorker& rw)
         }
     close:
         if (!_lineTo(rw, start)) return false;
-        first = last + 1;
+       first = last + 1;
     }
 
     return true;
 }
 
 
-static bool _genRle(RleWorker& rw)
+static int _genRle(RleWorker& rw)
 {
-    if (!_decomposeOutline(rw)) return false;
-    if (!rw.invalid && !_recordCell(rw)) return false;
-    return true;
+    if (!_decomposeOutline(rw)) return -1;
+    if (!rw.invalid) {
+        if (!_recordCell(rw)) return -1;
+    }
+    return 0;
+}
+
+
+static SwSpan* _intersectSpansRegion(const SwRle *clip, const SwRle *target, SwSpan *outSpans, uint32_t outSpansCnt)
+{
+    auto out = outSpans;
+    auto spans = target->spans;
+    auto end = target->spans + target->size;
+    auto clipSpans = clip->spans;
+    auto clipEnd = clip->spans + clip->size;
+
+    while (spans < end && clipSpans < clipEnd) {
+        //align y-coordinates.
+        if (clipSpans->y > spans->y) {
+            ++spans;
+            continue;
+        }
+        if (spans->y > clipSpans->y) {
+            ++clipSpans;
+            continue;
+        }
+
+        //Try clipping with all clip spans which have a same y-coordinate.
+        auto temp = clipSpans;
+        while(temp < clipEnd && outSpansCnt > 0 && temp->y == clipSpans->y) {
+            auto sx1 = spans->x;
+            auto sx2 = sx1 + spans->len;
+            auto cx1 = temp->x;
+            auto cx2 = cx1 + temp->len;
+
+            //The span must be left(x1) to right(x2) direction. Not intersected.
+            if (cx2 < sx1 || sx2 < cx1) {
+                ++temp;
+                continue;
+            }
+
+            //clip span region.
+            auto x = sx1 > cx1 ? sx1 : cx1;
+            auto len = (sx2 < cx2 ? sx2 : cx2) - x;
+            if (len > 0) {
+                out->x = x;
+                out->y = temp->y;
+                out->len = len;
+                out->coverage = (uint8_t)(((spans->coverage * temp->coverage) + 0xff) >> 8);
+                ++out;
+                --outSpansCnt;
+            }
+            ++temp;
+        }
+        ++spans;
+    }
+    return out;
+}
+
+
+static SwSpan* _intersectSpansRect(const SwBBox *bbox, const SwRle *targetRle, SwSpan *outSpans, uint32_t outSpansCnt)
+{
+    auto out = outSpans;
+    auto spans = targetRle->spans;
+    auto end = targetRle->spans + targetRle->size;
+    auto minx = static_cast<int16_t>(bbox->min.x);
+    auto miny = static_cast<int16_t>(bbox->min.y);
+    auto maxx = minx + static_cast<int16_t>(bbox->max.x - bbox->min.x) - 1;
+    auto maxy = miny + static_cast<int16_t>(bbox->max.y - bbox->min.y) - 1;
+
+    while (outSpansCnt > 0 && spans < end) {
+        if (spans->y > maxy) {
+            spans = end;
+            break;
+        }
+        if (spans->y < miny || spans->x > maxx || spans->x + spans->len <= minx) {
+            ++spans;
+            continue;
+        }
+        if (spans->x < minx) {
+            out->len = (spans->len - (minx - spans->x)) < (maxx - minx + 1) ? (spans->len - (minx - spans->x)) : (maxx - minx + 1);
+            out->x = minx;
+        }
+        else {
+            out->x = spans->x;
+            out->len = spans->len < (maxx - spans->x + 1) ? spans->len : (maxx - spans->x + 1);
+        }
+        if (out->len > 0) {
+            out->y = spans->y;
+            out->coverage = spans->coverage;
+            ++out;
+            --outSpansCnt;
+        }
+        ++spans;
+    }
+    return out;
+}
+
+
+void _replaceClipSpan(SwRle *rle, SwSpan* clippedSpans, uint32_t size)
+{
+    free(rle->spans);
+    rle->spans = clippedSpans;
+    rle->size = rle->alloc = size;
 }
 
 
@@ -723,19 +861,19 @@ static bool _genRle(RleWorker& rw)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox, SwMpool* mpool, unsigned tid, bool antiAlias)
+SwRle* rleRender(SwRle* rle, const SwOutline* outline, const SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool antiAlias)
 {
     if (!outline) return nullptr;
   
     RleWorker rw;
-    auto cellPool = mpool->cell(tid);
-    auto reqSize = uint32_t(std::max(bbox.w(), bbox.h()) * 0.75f) * sizeof(SwCell);  //experimental decision
+    auto cellPool = mpoolReqCellPool(mpool, tid);
+    auto reqSize = uint32_t(std::max(renderRegion.w(), renderRegion.h()) * 0.75f) * sizeof(SwCell);  //experimental decision
 
     // grow by 1.25x and align to multiple of sizeof(SwCell)
     if (reqSize > cellPool->size) {
         cellPool->size = ((reqSize + (reqSize >> 2)) / sizeof(SwCell)) * sizeof(SwCell);
-        tvg::free(cellPool->buffer);
-        cellPool->buffer = tvg::malloc<SwCell>(cellPool->size);
+        free(cellPool->buffer);
+        cellPool->buffer = (SwCell*)malloc(cellPool->size);
     }
 
     //Init Cells
@@ -748,8 +886,8 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
     rw.area = 0;
     rw.cover = 0;
     rw.invalid = true;
-    rw.cellMin = {bbox.min.x, bbox.min.y};
-    rw.cellMax = {bbox.max.x, bbox.max.y};
+    rw.cellMin = renderRegion.min;
+    rw.cellMax = renderRegion.max;
     rw.cellXCnt = rw.cellMax.x - rw.cellMin.x;
     rw.cellYCnt = rw.cellMax.y - rw.cellMin.y;
     rw.outline = const_cast<SwOutline*>(outline);
@@ -757,9 +895,8 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
     rw.bandShoot = 0;
     rw.antiAlias = antiAlias;
 
-    if (!rle) rw.rle = new SwRle;
+    if (!rle) rw.rle = reinterpret_cast<SwRle*>(calloc(1, sizeof(SwRle)));
     else rw.rle = rle;
-    rw.rle->spans.reserve(256);
 
     //Generate RLE
     constexpr auto BAND_SIZE = 40;
@@ -774,7 +911,8 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
 
     auto min = rw.cellMin.y;
     auto yMax = rw.cellMax.y;
-    int32_t max;
+    SwCoord max;
+    int ret;
 
     for (int n = 0; n < bandCnt; ++n, min = max) {
         max = min + rw.bandSize;
@@ -810,10 +948,13 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
             rw.cellMax.y = band->max;
             rw.cellYCnt = band->max - band->min;
 
-            if (_genRle(rw)) {
+            ret = _genRle(rw);
+            if (ret == 0) {
                 _sweep(rw);
                 --band;
                 continue;
+            } else if (ret == 1) {
+                goto error;
             }
 
         reduce_bands:
@@ -824,10 +965,7 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
 
             /* This is too complex for a single scanline; there must
                be some problems */
-            if (middle == bottom) {
-                rleFree(rw.rle);
-                return nullptr;
-            }
+            if (middle == bottom) goto error;
 
             if (bottom - top >= rw.bandSize) ++rw.bandShoot;
 
@@ -838,26 +976,34 @@ SwRle* rleRender(SwRle* rle, const SwOutline* outline, const RenderRegion& bbox,
             ++band;
         }
     }
-    if (rw.bandShoot > 8 && rw.bandSize > 16) {
+
+    if (rw.bandShoot > 8 && rw.bandSize > 16)
         rw.bandSize = (rw.bandSize >> 1);
-    }
+
     return rw.rle;
+
+error:
+    free(rw.rle);
+    return nullptr;
 }
 
 
-SwRle* rleRender(const RenderRegion* bbox)
+SwRle* rleRender(const SwBBox* bbox)
 {
-    auto rle = tvg::calloc<SwRle>(sizeof(SwRle), 1);
-    rle->spans.reserve(bbox->h());
-    rle->spans.count = bbox->h();
+    auto width = static_cast<uint16_t>(bbox->max.x - bbox->min.x);
+    auto height = static_cast<uint16_t>(bbox->max.y - bbox->min.y);
 
-    //cheaper without push()
-    auto x = uint16_t(bbox->min.x);
-    auto y = uint16_t(bbox->min.y);
-    auto len = uint16_t(bbox->w());
+    auto rle = static_cast<SwRle*>(malloc(sizeof(SwRle)));
+    rle->spans = static_cast<SwSpan*>(malloc(sizeof(SwSpan) * height));
+    rle->size = height;
+    rle->alloc = height;
 
-    ARRAY_FOREACH(p, rle->spans) {
-        *p = {x, y++, len, 255};
+    auto span = rle->spans;
+    for (uint16_t i = 0; i < height; ++i, ++span) {
+        span->x = bbox->min.x;
+        span->y = bbox->min.y + i;
+        span->len = width;
+        span->coverage = 255;
     }
 
     return rle;
@@ -866,112 +1012,44 @@ SwRle* rleRender(const RenderRegion* bbox)
 
 void rleReset(SwRle* rle)
 {
-    if (rle) rle->spans.clear();
+    if (!rle) return;
+    rle->size = 0;
 }
 
 
 void rleFree(SwRle* rle)
 {
-    delete(rle);
+    if (!rle) return;
+    if (rle->spans) free(rle->spans);
+    free(rle);
 }
 
 
-bool rleClip(SwRle* rle, const SwRle *clip)
+bool rleClip(SwRle *rle, const SwRle *clip)
 {
-    if (rle->spans.empty() || clip->spans.empty()) return false;
+    if (rle->size == 0 || clip->size == 0) return false;
+    auto spanCnt = 2 * (rle->size > clip->size ? rle->size : clip->size); //factor 2 added for safety (no real cases observed where the factor exceeded 1.4)
+    auto spans = static_cast<SwSpan*>(malloc(sizeof(SwSpan) * (spanCnt)));
+    auto spansEnd = _intersectSpansRegion(clip, rle, spans, spanCnt);
 
-    Array<SwSpan> out;
-    out.reserve(std::max(rle->spans.count, clip->spans.count));
+    _replaceClipSpan(rle, spans, spansEnd - spans);
 
-    const SwSpan *end;
-    auto spans = rle->fetch(clip->spans.first().y, clip->spans.last().y, &end);
+    TVGLOG("SW_ENGINE", "Using Path Clipping!");
 
-    if (spans >= end) {
-        rle->spans.clear();
-        return false;
-    }
-
-    const SwSpan *cend;
-    auto cspans = clip->fetch(spans->y, (end - 1)->y, &cend);
-
-    while (spans < end && cspans < cend) {
-        //align y-coordinates.
-        if (cspans->y > spans->y) {
-            ++spans;
-            continue;
-        }
-        if (spans->y > cspans->y) {
-            ++cspans;
-            continue;
-        }
-        //try clipping with all clip spans which have a same y-coordinate.
-        auto temp = cspans;
-        while(temp < cend && temp->y == cspans->y) {
-            //span must be left(x1) to right(x2) direction. Not intersected.
-            if ((spans->x + spans->len) < spans->x || (temp->x + temp->len) < temp->x) {
-                ++temp;
-                continue;
-            }
-            //clip span region
-            auto x = std::max(spans->x, temp->x);
-            auto len = std::min((spans->x + spans->len), (temp->x + temp->len)) - x;
-            if (len > 0) out.next() = {uint16_t(x), temp->y, uint16_t(len), (uint8_t)(((spans->coverage * temp->coverage) + 0xff) >> 8)};
-            ++temp;
-        }
-        ++spans;
-    }
-    out.move(rle->spans);
     return true;
 }
 
 
-//Need to confirm: dead code?
-bool rleClip(SwRle *rle, const RenderRegion* clip)
+bool rleClip(SwRle *rle, const SwBBox* clip)
 {
-    if (rle->spans.empty() || clip->invalid()) return false;
+    if (rle->size == 0) return false;
+    auto spans = static_cast<SwSpan*>(malloc(sizeof(SwSpan) * (rle->size)));
+    auto spansEnd = _intersectSpansRect(clip, rle, spans, rle->size);
 
-    auto& min = clip->min;
-    auto& max = clip->max;
+    _replaceClipSpan(rle, spans, spansEnd - spans);
 
-    Array<SwSpan> out;
-    out.reserve(rle->spans.count);
-    auto data = out.data;
-    const SwSpan* end;
-    uint16_t x, len;
+    TVGLOG("SW_ENGINE", "Using Box Clipping!");
 
-    for (auto p = rle->fetch(*clip, &end); p < end; ++p) {
-        if (p->y >= max.y) break;
-        if (p->y < min.y || p->x >= max.x || (p->x + p->len) <= min.x) continue;
-        if (p->x < min.x) {
-            x = min.x;
-            len = std::min(uint16_t(p->len - (x - p->x)), uint16_t(max.x - x));
-        } else {
-            x = p->x;
-            len = std::min(p->len, uint16_t(max.x - x));
-        }
-        if (len > 0) {
-            *data = {x, p->y, len, p->coverage};
-            ++data;
-            ++out.count;
-        }
-    }
-    out.move(rle->spans);
     return true;
 }
 
-
-bool rleIntersect(const SwRle* rle, const RenderRegion& region)
-{
-    if (!rle || rle->spans.empty()) return false;
-
-    auto& min = region.min;
-    auto& max = region.max;
-
-    const SwSpan* end;
-    for (auto p = rle->fetch(region, &end); p < end; ++p) {
-        if (p->y >= max.y) break;
-        if (p->y < min.y || p->x >= max.x || (p->x + p->len) <= min.x) continue;
-        return true;
-    }
-    return false;
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
index 268a1d5a..08f3c36d 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,7 @@
  */
 
 #include "tvgSwCommon.h"
+#include "tvgMath.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
@@ -97,17 +98,7 @@ static bool _outlineClose(SwOutline& outline)
 }
 
 
-static void _drawPoint(SwDashStroke& dash, const Point* start, const Matrix& transform)
-{
-    if (dash.move || dash.pattern[dash.curIdx] < FLOAT_EPSILON) {
-        _outlineMoveTo(*dash.outline, start, transform);
-        dash.move = false;
-    }
-    _outlineLineTo(*dash.outline, start, transform);
-}
-
-
-static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& transform, bool validPoint)
+static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& transform)
 {
     Line cur = {dash.ptCur, *to};
     auto len = cur.length();
@@ -138,7 +129,6 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
                     _outlineLineTo(*dash.outline, &left.pt2, transform);
                 }
             } else {
-                if (validPoint && !dash.curOpGap) _drawPoint(dash, &cur.pt1, transform);
                 right = cur;
             }
             dash.curIdx = (dash.curIdx + 1) % dash.cnt;
@@ -168,7 +158,7 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
 }
 
 
-static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ctrl2, const Point* to, const Matrix& transform, bool validPoint)
+static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ctrl2, const Point* to, const Matrix& transform)
 {
     Bezier cur = {dash.ptCur, *ctrl1, *ctrl2, *to};
     auto len = cur.length();
@@ -200,7 +190,6 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
                     _outlineCubicTo(*dash.outline, &left.ctrl1, &left.ctrl2, &left.end, transform);
                 }
             } else {
-                if (validPoint && !dash.curOpGap) _drawPoint(dash, &cur.start, transform);
                 right = cur;
             }
             dash.curIdx = (dash.curIdx + 1) % dash.cnt;
@@ -230,9 +219,17 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
 }
 
 
-static void _dashClose(SwDashStroke& dash, const Matrix& transform, bool validPoint)
+static void _dashClose(SwDashStroke& dash, const Matrix& transform)
 {
-    _dashLineTo(dash, &dash.ptStart, transform, validPoint);
+    _dashLineTo(dash, &dash.ptStart, transform);
+}
+
+
+static void _dashMoveTo(SwDashStroke& dash, const Point* pts)
+{
+    dash.ptCur = *pts;
+    dash.ptStart = *pts;
+    dash.move = true;
 }
 
 
@@ -246,46 +243,123 @@ static void _dashMoveTo(SwDashStroke& dash, uint32_t offIdx, float offset, const
 }
 
 
-static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid, bool trimmed)
+static void _trimPattern(SwDashStroke* dash, const RenderShape* rshape, float length, float trimBegin, float trimEnd)
 {
-    PathCommand *cmds, *trimmedCmds = nullptr;
-    Point *pts, *trimmedPts = nullptr;
-    uint32_t cmdCnt, ptsCnt;
+    auto begin = length * trimBegin;
+    auto end = length * trimEnd;
 
-    if (trimmed) {
-        RenderPath trimmedPath;
-        if (!rshape->stroke->trim.trim(rshape->path, trimmedPath)) return nullptr;
-        cmds = trimmedCmds = trimmedPath.cmds.data;
-        cmdCnt = trimmedPath.cmds.count;
-        pts = trimmedPts = trimmedPath.pts.data;
-        ptsCnt = trimmedPath.pts.count;
+    //default
+    if (end > begin) {
+        if (begin > 0.0f) dash->cnt = 4;
+        else dash->cnt = 2;
+        //looping
+    } else dash->cnt = 3;
 
-        trimmedPath.cmds.data = nullptr;
-        trimmedPath.pts.data = nullptr;
+    if (dash->cnt == 2) {
+        dash->pattern[0] = end - begin;
+        dash->pattern[1] = length - (end - begin);
+    } else if (dash->cnt == 3) {
+        dash->pattern[0] = end;
+        dash->pattern[1] = (begin - end);
+        dash->pattern[2] = length - begin;
     } else {
-        cmds = rshape->path.cmds.data;
-        cmdCnt = rshape->path.cmds.count;
-        pts = rshape->path.pts.data;
-        ptsCnt = rshape->path.pts.count;
+        dash->pattern[0] = 0;     //zero dash to start with a space.
+        dash->pattern[1] = begin;
+        dash->pattern[2] = end - begin;
+        dash->pattern[3] = length - end;
     }
+}
+
+
+static float _outlineLength(const RenderShape* rshape, uint32_t shiftPts, uint32_t shiftCmds, bool subpath)
+{
+    const PathCommand* cmds = rshape->path.cmds.data + shiftCmds;
+    auto cmdCnt = rshape->path.cmds.count - shiftCmds;
+    const Point* pts = rshape->path.pts.data + shiftPts;
+    auto ptsCnt = rshape->path.pts.count - shiftPts;
+
+    //No actual shape data
+    if (cmdCnt <= 0 || ptsCnt <= 0) return 0.0f;
+
+    const Point* close = nullptr;
+    auto len = 0.0f;
+
+    //must begin with moveTo
+    if (cmds[0] == PathCommand::MoveTo) {
+        close = pts;
+        cmds++;
+        pts++;
+        cmdCnt--;
+    }
+
+    while (cmdCnt-- > 0) {
+        switch (*cmds) {
+            case PathCommand::Close: {
+                len += length(pts - 1, close);
+                if (subpath) return len;
+                break;
+            }
+            case PathCommand::MoveTo: {
+                if (subpath) return len;
+                close = pts;
+                ++pts;
+                break;
+            }
+            case PathCommand::LineTo: {
+                len += length(pts - 1, pts);
+                ++pts;
+                break;
+            }
+            case PathCommand::CubicTo: {
+                len += Bezier{*(pts - 1), *pts, *(pts + 1), *(pts + 2)}.length();
+                pts += 3;
+                break;
+            }
+        }
+        ++cmds;
+    }
+    return len;
+}
+
+
+static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix& transform, bool trimmed, SwMpool* mpool, unsigned tid)
+{
+    const PathCommand* cmds = rshape->path.cmds.data;
+    auto cmdCnt = rshape->path.cmds.count;
+    const Point* pts = rshape->path.pts.data;
+    auto ptsCnt = rshape->path.pts.count;
 
     //No actual shape data
     if (cmdCnt == 0 || ptsCnt == 0) return nullptr;
 
+    auto startPts = pts;
+    auto startCmds = cmds;
+
     SwDashStroke dash;
-    dash.pattern = rshape->stroke->dash.pattern;
-    dash.cnt = rshape->stroke->dash.count;
-    auto offset = rshape->stroke->dash.offset;
+    auto offset = 0.0f;
+    dash.cnt = rshape->strokeDash((const float**)&dash.pattern, &offset);
+    auto simultaneous = rshape->stroke->trim.simultaneous;
+    float trimBegin = 0.0f, trimEnd = 1.0f;
+    if (trimmed) rshape->stroke->strokeTrim(trimBegin, trimEnd);
+
+    if (dash.cnt == 0) {
+        if (trimmed) dash.pattern = (float*)malloc(sizeof(float) * 4);
+        else return nullptr;
+    } else {
+        //TODO: handle dash + trim - for now trimming ignoring is forced
+        trimmed = false;
+    }
 
     //offset
+    auto patternLength = 0.0f;
     uint32_t offIdx = 0;
     if (!tvg::zero(offset)) {
-        auto length = rshape->stroke->dash.length;
+        for (size_t i = 0; i < dash.cnt; ++i) patternLength += dash.pattern[i];
         bool isOdd = dash.cnt % 2;
-        if (isOdd) length *= 2;
+        if (isOdd) patternLength *= 2;
 
-        offset = fmodf(offset, length);
-        if (offset < 0) offset += length;
+        offset = fmodf(offset, patternLength);
+        if (offset < 0) offset += patternLength;
 
         for (size_t i = 0; i < dash.cnt * (1 + (size_t)isOdd); ++i, ++offIdx) {
             auto curPattern = dash.pattern[i % dash.cnt];
@@ -294,35 +368,40 @@ static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix& trans
         }
     }
 
-    dash.outline = mpool->outline(tid);
+    mpoolRetOutline(mpool, tid);  //retreive the outline cache and use it for dash outline.
+    dash.outline = mpoolReqOutline(mpool, tid);
 
     //must begin with moveTo
     if (cmds[0] == PathCommand::MoveTo) {
+        if (trimmed) _trimPattern(&dash, rshape, _outlineLength(rshape, 0, 0, simultaneous), trimBegin, trimEnd);
         _dashMoveTo(dash, offIdx, offset, pts);
         cmds++;
         pts++;
     }
 
-    //zero length segment with non-butt cap still should be rendered as a point - only the caps are visible
-    auto validPoint = rshape->stroke->cap != StrokeCap::Butt;
     while (--cmdCnt > 0) {
         switch (*cmds) {
             case PathCommand::Close: {
-                _dashClose(dash, transform, validPoint);
+                _dashClose(dash, transform);
                 break;
             }
             case PathCommand::MoveTo: {
-                _dashMoveTo(dash, offIdx, offset, pts);
+                if (trimmed) {
+                    if (simultaneous) {
+                        _trimPattern(&dash, rshape, _outlineLength(rshape, pts - startPts, cmds - startCmds, true), trimBegin, trimEnd);
+                        _dashMoveTo(dash, offIdx, offset, pts);
+                    } else _dashMoveTo(dash, pts);
+                } else _dashMoveTo(dash, offIdx, offset, pts);
                 ++pts;
                 break;
             }
             case PathCommand::LineTo: {
-                _dashLineTo(dash, pts, transform, validPoint);
+                _dashLineTo(dash, pts, transform);
                 ++pts;
                 break;
             }
             case PathCommand::CubicTo: {
-                _dashCubicTo(dash, pts, pts + 1, pts + 2, transform, validPoint);
+                _dashCubicTo(dash, pts, pts + 1, pts + 2, transform);
                 pts += 3;
                 break;
             }
@@ -332,10 +411,7 @@ static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix& trans
 
     _outlineEnd(*dash.outline);
 
-    dash.outline->fillRule = rshape->rule;
-
-    tvg::free(trimmedCmds);
-    tvg::free(trimmedPts);
+    if (trimmed) free(dash.pattern);
 
     return dash.outline;
 }
@@ -361,33 +437,18 @@ static bool _axisAlignedRect(const SwOutline* outline)
 }
 
 
-static SwOutline* _genOutline(SwShape& shape, const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid, bool hasComposite, bool trimmed = false)
+static bool _genOutline(SwShape* shape, const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid, bool hasComposite)
 {
-    PathCommand *cmds, *trimmedCmds = nullptr;
-    Point *pts, *trimmedPts = nullptr;
-    uint32_t cmdCnt, ptsCnt;
-
-    if (trimmed) {
-        RenderPath trimmedPath;
-        if (!rshape->stroke->trim.trim(rshape->path, trimmedPath)) return nullptr;
-        cmds = trimmedCmds = trimmedPath.cmds.data;
-        cmdCnt = trimmedPath.cmds.count;
-        pts = trimmedPts = trimmedPath.pts.data;
-        ptsCnt = trimmedPath.pts.count;
-
-        trimmedPath.cmds.data = nullptr;
-        trimmedPath.pts.data = nullptr;
-    } else {
-        cmds = rshape->path.cmds.data;
-        cmdCnt = rshape->path.cmds.count;
-        pts = rshape->path.pts.data;
-        ptsCnt = rshape->path.pts.count;
-    }
+    const PathCommand* cmds = rshape->path.cmds.data;
+    auto cmdCnt = rshape->path.cmds.count;
+    const Point* pts = rshape->path.pts.data;
+    auto ptsCnt = rshape->path.pts.count;
 
     //No actual shape data
-    if (cmdCnt == 0 || ptsCnt == 0) return nullptr;
+    if (cmdCnt == 0 || ptsCnt == 0) return false;
 
-    auto outline = mpool->outline(tid);
+    shape->outline = mpoolReqOutline(mpool, tid);
+    auto outline = shape->outline;
     auto closed = false;
 
     //Generate Outlines
@@ -421,12 +482,10 @@ static SwOutline* _genOutline(SwShape& shape, const RenderShape* rshape, const M
     if (!closed) _outlineEnd(*outline);
 
     outline->fillRule = rshape->rule;
+    shape->outline = outline;
 
-    tvg::free(trimmedCmds);
-    tvg::free(trimmedPts);
-
-    shape.fastTrack = (!hasComposite && _axisAlignedRect(outline));
-    return outline;
+    shape->fastTrack = (!hasComposite && _axisAlignedRect(shape->outline));
+    return true;
 }
 
 
@@ -434,173 +493,167 @@ static SwOutline* _genOutline(SwShape& shape, const RenderShape* rshape, const M
 /* External Class Implementation                                        */
 /************************************************************************/
 
-bool shapePrepare(SwShape& shape, const RenderShape* rshape, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid, bool hasComposite)
+bool shapePrepare(SwShape* shape, const RenderShape* rshape, const Matrix& transform,  const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid, bool hasComposite)
 {
-    if ((shape.outline = _genOutline(shape, rshape, transform, mpool, tid, hasComposite, rshape->trimpath()))) {
-        if (mathUpdateOutlineBBox(shape.outline, clipBox, renderBox, shape.fastTrack)) {
-            shape.bbox = renderBox;
-            return true;
-        }
-    }
-    return false;
+    if (!_genOutline(shape, rshape, transform, mpool, tid, hasComposite)) return false;
+    if (!mathUpdateOutlineBBox(shape->outline, clipRegion, renderRegion, shape->fastTrack)) return false;
+
+    shape->bbox = renderRegion;
+
+    //Check valid region
+    if (renderRegion.max.x - renderRegion.min.x < 1 && renderRegion.max.y - renderRegion.min.y < 1) return false;
+
+    //Check boundary
+    if (renderRegion.min.x >= clipRegion.max.x || renderRegion.min.y >= clipRegion.max.y ||
+        renderRegion.max.x <= clipRegion.min.x || renderRegion.max.y <= clipRegion.min.y) return false;
+
+    return true;
 }
 
 
-bool shapeGenRle(SwShape& shape, const RenderRegion& bbox, SwMpool* mpool, unsigned tid, bool antiAlias)
+bool shapePrepared(const SwShape* shape)
 {
+    return shape->rle ? true : false;
+}
+
+
+bool shapeGenRle(SwShape* shape, TVG_UNUSED const RenderShape* rshape, SwMpool* mpool, unsigned tid, bool antiAlias)
+{
+    //FIXME: Should we draw it?
+    //Case: Stroke Line
+    //if (shape.outline->opened) return true;
+
     //Case A: Fast Track Rectangle Drawing
-    if (shape.fastTrack) return true;
+    if (shape->fastTrack) return true;
 
     //Case B: Normal Shape RLE Drawing
-    if ((shape.rle = rleRender(shape.rle, shape.outline, bbox, mpool, tid, antiAlias))) return true;
+    if ((shape->rle = rleRender(shape->rle, shape->outline, shape->bbox, mpool, tid, antiAlias))) return true;
 
     return false;
 }
 
 
-void shapeDelOutline(SwShape& shape, SwMpool* mpool, uint32_t tid)
+void shapeDelOutline(SwShape* shape, SwMpool* mpool, uint32_t tid)
 {
-    shape.outline = nullptr;
+    mpoolRetOutline(mpool, tid);
+    shape->outline = nullptr;
 }
 
 
-void shapeReset(SwShape& shape)
+void shapeReset(SwShape* shape)
 {
-    rleReset(shape.rle);
-    shape.bbox.reset();
-    shape.fastTrack = false;
+    rleReset(shape->rle);
+    shape->fastTrack = false;
+    shape->bbox.reset();
 }
 
 
-void shapeFree(SwShape& shape)
+void shapeFree(SwShape* shape)
 {
-    rleFree(shape.rle);
-    shape.rle = nullptr;
+    rleFree(shape->rle);
+    shape->rle = nullptr;
 
     shapeDelFill(shape);
 
-    if (shape.stroke) {
-        rleFree(shape.strokeRle);
-        shape.strokeRle = nullptr;
-        strokeFree(shape.stroke);
-        shape.stroke = nullptr;
+    if (shape->stroke) {
+        rleFree(shape->strokeRle);
+        shape->strokeRle = nullptr;
+        strokeFree(shape->stroke);
+        shape->stroke = nullptr;
     }
 }
 
 
-void shapeDelStroke(SwShape& shape)
+void shapeDelStroke(SwShape* shape)
 {
-    if (!shape.stroke) return;
-    rleFree(shape.strokeRle);
-    shape.strokeRle = nullptr;
-    strokeFree(shape.stroke);
-    shape.stroke = nullptr;
+    if (!shape->stroke) return;
+    rleFree(shape->strokeRle);
+    shape->strokeRle = nullptr;
+    strokeFree(shape->stroke);
+    shape->stroke = nullptr;
 }
 
 
-void shapeResetStroke(SwShape& shape, const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid)
+void shapeResetStroke(SwShape* shape, const RenderShape* rshape, const Matrix& transform)
 {
-    if (!shape.stroke) shape.stroke = tvg::calloc<SwStroke>(1, sizeof(SwStroke));
-    auto stroke = shape.stroke;
-    strokeReset(stroke, rshape, transform, mpool, tid);
-    rleReset(shape.strokeRle);
+    if (!shape->stroke) shape->stroke = static_cast<SwStroke*>(calloc(1, sizeof(SwStroke)));
+    auto stroke = shape->stroke;
+    if (!stroke) return;
+
+    strokeReset(stroke, rshape, transform);
+    rleReset(shape->strokeRle);
 }
 
 
-bool shapeGenStrokeRle(SwShape& shape, const RenderShape* rshape, const Matrix& transform, const RenderRegion& clipBox, RenderRegion& renderBox, SwMpool* mpool, unsigned tid)
+bool shapeGenStrokeRle(SwShape* shape, const RenderShape* rshape, const Matrix& transform, const SwBBox& clipRegion, SwBBox& renderRegion, SwMpool* mpool, unsigned tid)
 {
     SwOutline* shapeOutline = nullptr;
 
-    //Dash style with/without trimming
-    if (rshape->stroke->dash.length > DASH_PATTERN_THRESHOLD) {
-        shapeOutline = _genDashOutline(rshape, transform, mpool, tid, rshape->trimpath());
+    //Dash style (+trimming)
+    auto trimmed = rshape->strokeTrim();
+    if (rshape->stroke->dashCnt > 0 || trimmed) {
+        shapeOutline = _genDashOutline(rshape, transform, trimmed, mpool, tid);
+        if (!shapeOutline) return false;
     //Trimming & Normal style
     } else {
-        shapeOutline = shape.outline ? shape.outline : _genOutline(shape, rshape, transform, mpool, tid, false, rshape->trimpath());
+        if (!shape->outline) {
+            if (!_genOutline(shape, rshape, transform, mpool, tid, false)) return false;
+        }
+        shapeOutline = shape->outline;
     }
 
-    if (!shapeOutline) return false;
-
-    if (!strokeParseOutline(shape.stroke, *shapeOutline, mpool, tid)) return false;
-
-    auto strokeOutline = strokeExportOutline(shape.stroke, mpool, tid);
-    auto ret = mathUpdateOutlineBBox(strokeOutline, clipBox, renderBox, false);
-    if (ret) shape.strokeRle = rleRender(shape.strokeRle, strokeOutline, renderBox, mpool, tid, true);
-
+    if (!strokeParseOutline(shape->stroke, *shapeOutline)) return false;
+    auto strokeOutline = strokeExportOutline(shape->stroke, mpool, tid);
+    auto ret = mathUpdateOutlineBBox(strokeOutline, clipRegion, renderRegion, false);
+    shape->strokeRle = rleRender(shape->strokeRle, strokeOutline, renderRegion, mpool, tid, true);
+    mpoolRetStrokeOutline(mpool, tid);
     return ret;
 }
 
 
-bool shapeGenFillColors(SwShape& shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable)
+bool shapeGenFillColors(SwShape* shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable)
 {
-    return fillGenColorTable(shape.fill, fill, transform, surface, opacity, ctable);
+    return fillGenColorTable(shape->fill, fill, transform, surface, opacity, ctable);
 }
 
 
-bool shapeGenStrokeFillColors(SwShape& shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable)
+bool shapeGenStrokeFillColors(SwShape* shape, const Fill* fill, const Matrix& transform, SwSurface* surface, uint8_t opacity, bool ctable)
 {
-    return fillGenColorTable(shape.stroke->fill, fill, transform, surface, opacity, ctable);
+    return fillGenColorTable(shape->stroke->fill, fill, transform, surface, opacity, ctable);
 }
 
 
-void shapeResetFill(SwShape& shape)
+void shapeResetFill(SwShape* shape)
 {
-    if (!shape.fill) {
-        shape.fill = tvg::calloc<SwFill>(1, sizeof(SwFill));
-        if (!shape.fill) return;
+    if (!shape->fill) {
+        shape->fill = static_cast<SwFill*>(calloc(1, sizeof(SwFill)));
+        if (!shape->fill) return;
     }
-    fillReset(shape.fill);
+    fillReset(shape->fill);
 }
 
 
-void shapeResetStrokeFill(SwShape& shape)
+void shapeResetStrokeFill(SwShape* shape)
 {
-    if (!shape.stroke->fill) {
-        shape.stroke->fill = tvg::calloc<SwFill>(1, sizeof(SwFill));
-        if (!shape.stroke->fill) return;
+    if (!shape->stroke->fill) {
+        shape->stroke->fill = static_cast<SwFill*>(calloc(1, sizeof(SwFill)));
+        if (!shape->stroke->fill) return;
     }
-    fillReset(shape.stroke->fill);
+    fillReset(shape->stroke->fill);
 }
 
 
-void shapeDelFill(SwShape& shape)
+void shapeDelFill(SwShape* shape)
 {
-    if (!shape.fill) return;
-    fillFree(shape.fill);
-    shape.fill = nullptr;
+    if (!shape->fill) return;
+    fillFree(shape->fill);
+    shape->fill = nullptr;
 }
 
 
-bool shapeStrokeBBox(SwShape& shape, const RenderShape* rshape, Point* pt4, const Matrix& m, SwMpool* mpool)
+void shapeDelStrokeFill(SwShape* shape)
 {
-    auto outline = _genOutline(shape, rshape, m, mpool, 0, false, rshape->trimpath());
-    if (!outline) return false;
-
-    if (rshape->strokeWidth() > 0.0f) {
-        strokeReset(shape.stroke, rshape, m, mpool, 0);
-        strokeParseOutline(shape.stroke, *outline, mpool, 0);
-
-        auto func = [](SwStrokeBorder* border, SwPoint& min, SwPoint& max) {
-            ARRAY_FOREACH(pts, border->pts) {
-                if (pts->x < min.x) min.x = pts->x;
-                if (pts->x > max.x) max.x = pts->x;
-                if (pts->y < min.y) min.y = pts->y;
-                if (pts->y > max.y) max.y = pts->y;
-            }
-        };
-
-        SwPoint min = {INT32_MAX, INT32_MAX};
-        SwPoint max = {-INT32_MAX, -INT32_MAX};
-        func(shape.stroke->borders[0], min, max);
-        func(shape.stroke->borders[1], min, max);
-
-        pt4[0] = min.toPoint();
-        pt4[1] = SwPoint{max.x, min.y}.toPoint();
-        pt4[2] = max.toPoint();
-        pt4[3] = SwPoint{min.x, max.y}.toPoint();
-    }
-
-    shapeDelOutline(shape, mpool, 0);
-
-    return true;
+    if (!shape->stroke->fill) return;
+    fillFree(shape->stroke->fill);
+    shape->stroke->fill = nullptr;
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp
index d7499f9e..fcc78b4b 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,59 +20,73 @@
  * SOFTWARE.
  */
 
+#include <string.h>
+#include <math.h>
 #include "tvgSwCommon.h"
 
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-#define SW_STROKE_TAG_POINT 1
-#define SW_STROKE_TAG_CUBIC 2
-#define SW_STROKE_TAG_BEGIN 4
-#define SW_STROKE_TAG_END 8
+static constexpr auto SW_STROKE_TAG_POINT = 1;
+static constexpr auto SW_STROKE_TAG_CUBIC = 2;
+static constexpr auto SW_STROKE_TAG_BEGIN = 4;
+static constexpr auto SW_STROKE_TAG_END = 8;
 
-static inline int64_t SIDE_TO_ROTATE(const int32_t s)
+static inline SwFixed SIDE_TO_ROTATE(const int32_t s)
 {
-    return (SW_ANGLE_PI2 - static_cast<int64_t>(s) * SW_ANGLE_PI);
+    return (SW_ANGLE_PI2 - static_cast<SwFixed>(s) * SW_ANGLE_PI);
 }
 
 
 static inline void SCALE(const SwStroke& stroke, SwPoint& pt)
 {
-    pt.x = static_cast<int32_t>(pt.x * stroke.sx);
-    pt.y = static_cast<int32_t>(pt.y * stroke.sy);
+    pt.x = static_cast<SwCoord>(pt.x * stroke.sx);
+    pt.y = static_cast<SwCoord>(pt.y * stroke.sy);
 }
 
 
 static void _growBorder(SwStrokeBorder* border, uint32_t newPts)
 {
-    if (border->pts.count + newPts <= border->pts.reserved) return;
-    border->pts.grow(newPts * 20);
-    border->tags = tvg::realloc<uint8_t>(border->tags, border->pts.reserved);      //align the pts / tags memory size
+    auto maxOld = border->maxPts;
+    auto maxNew = border->ptsCnt + newPts;
+
+    if (maxNew <= maxOld) return;
+
+    auto maxCur = maxOld;
+
+    while (maxCur < maxNew)
+        maxCur += (maxCur >> 1) + 16;
+    //OPTIMIZE: use mempool!
+    border->pts = static_cast<SwPoint*>(realloc(border->pts, maxCur * sizeof(SwPoint)));
+    border->tags = static_cast<uint8_t*>(realloc(border->tags, maxCur * sizeof(uint8_t)));
+    border->maxPts = maxCur;
 }
 
 
 static void _borderClose(SwStrokeBorder* border, bool reverse)
 {
     auto start = border->start;
-    auto count = border->pts.count;
+    auto count = border->ptsCnt;
 
     //Don't record empty paths!
     if (count <= start + 1U) {
-        border->pts.count = start;
+        border->ptsCnt = start;
     } else {
         /* Copy the last point to the start of this sub-path,
            since it contains the adjusted starting coordinates */
-        border->pts.count = --count;
+        border->ptsCnt = --count;
         border->pts[start] = border->pts[count];
 
         if (reverse) {
             //reverse the points
-            auto pt1 = border->pts.data + start + 1;
-            auto pt2 = border->pts.data + count - 1;
+            auto pt1 = border->pts + start + 1;
+            auto pt2 = border->pts + count - 1;
 
             while (pt1 < pt2) {
-                std::swap(*pt1, *pt2);
+                auto tmp = *pt1;
+                *pt1 = *pt2;
+                *pt2 = tmp;
                 ++pt1;
                 --pt2;
             }
@@ -82,7 +96,9 @@ static void _borderClose(SwStrokeBorder* border, bool reverse)
             auto tag2 = border->tags + count - 1;
 
             while (tag1 < tag2) {
-                std::swap(*tag1, *tag2);
+                auto tmp = *tag1;
+                *tag1 = *tag2;
+                *tag2 = tmp;
                 ++tag1;
                 --tag2;
             }
@@ -101,24 +117,26 @@ static void _borderCubicTo(SwStrokeBorder* border, const SwPoint& ctrl1, const S
 {
     _growBorder(border, 3);
 
-    auto tag = border->tags + border->pts.count;
+    auto pt = border->pts + border->ptsCnt;
+    auto tag = border->tags + border->ptsCnt;
 
-    border->pts.push(ctrl1);
-    border->pts.push(ctrl2);
-    border->pts.push(to);
+    pt[0] = ctrl1;
+    pt[1] = ctrl2;
+    pt[2] = to;
 
     tag[0] = SW_STROKE_TAG_CUBIC;
     tag[1] = SW_STROKE_TAG_CUBIC;
     tag[2] = SW_STROKE_TAG_POINT;
 
+    border->ptsCnt += 3;
     border->movable = false;
 }
 
 
-static void _borderArcTo(SwStrokeBorder* border, const SwPoint& center, int64_t radius, int64_t angleStart, int64_t angleDiff, SwStroke& stroke)
+static void _borderArcTo(SwStrokeBorder* border, const SwPoint& center, SwFixed radius, SwFixed angleStart, SwFixed angleDiff, SwStroke& stroke)
 {
-    constexpr int64_t ARC_CUBIC_ANGLE = SW_ANGLE_PI / 2;
-    SwPoint a = {static_cast<int32_t>(radius), 0};
+    constexpr SwFixed ARC_CUBIC_ANGLE = SW_ANGLE_PI / 2;
+    SwPoint a = {static_cast<SwCoord>(radius), 0};
     mathRotate(a, angleStart);
     SCALE(stroke, a);
     a += center;
@@ -139,7 +157,7 @@ static void _borderArcTo(SwStrokeBorder* border, const SwPoint& center, int64_t
         theta >>= 1;
 
         //compute end point
-        SwPoint b = {static_cast<int32_t>(radius), 0};
+        SwPoint b = {static_cast<SwCoord>(radius), 0};
         mathRotate(b, next);
         SCALE(stroke, b);
         b += center;
@@ -147,12 +165,12 @@ static void _borderArcTo(SwStrokeBorder* border, const SwPoint& center, int64_t
         //compute first and second control points
         auto length = mathMulDiv(radius, mathSin(theta) * 4, (0x10000L + mathCos(theta)) * 3);
 
-        SwPoint a2 = {static_cast<int32_t>(length), 0};
+        SwPoint a2 = {static_cast<SwCoord>(length), 0};
         mathRotate(a2, angle + rotate);
         SCALE(stroke, a2);
         a2 += a;
 
-        SwPoint b2 = {static_cast<int32_t>(length), 0};
+        SwPoint b2 = {static_cast<SwCoord>(length), 0};
         mathRotate(b2, next - rotate);
         SCALE(stroke, b2);
         b2 += b;
@@ -172,13 +190,15 @@ static void _borderLineTo(SwStrokeBorder* border, const SwPoint& to, bool movabl
 {
     if (border->movable) {
         //move last point
-        border->pts.last() = to;
+        border->pts[border->ptsCnt - 1] = to;
     } else {
         //don't add zero-length line_to
-        if (!border->pts.empty() && (border->pts.last() - to).tiny()) return;
+        if (border->ptsCnt > 0 && (border->pts[border->ptsCnt - 1] - to).small()) return;
+
         _growBorder(border, 1);
-        border->tags[border->pts.count] = SW_STROKE_TAG_POINT;
-        border->pts.push(to);
+        border->pts[border->ptsCnt] = to;
+        border->tags[border->ptsCnt] = SW_STROKE_TAG_POINT;
+        border->ptsCnt += 1;
     }
 
     border->movable = movable;
@@ -190,7 +210,7 @@ static void _borderMoveTo(SwStrokeBorder* border, SwPoint& to)
     //close current open path if any?
     if (border->start >= 0) _borderClose(border, false);
 
-    border->start = border->pts.count;
+    border->start = border->ptsCnt;
     border->movable = false;
 
     _borderLineTo(border, to, false);
@@ -199,7 +219,7 @@ static void _borderMoveTo(SwStrokeBorder* border, SwPoint& to)
 
 static void _arcTo(SwStroke& stroke, int32_t side)
 {
-    auto border = stroke.borders[side];
+    auto border = stroke.borders + side;
     auto rotate = SIDE_TO_ROTATE(side);
     auto total = mathDiff(stroke.angleIn, stroke.angleOut);
     if (total == SW_ANGLE_PI) total = -rotate * 2;
@@ -209,9 +229,9 @@ static void _arcTo(SwStroke& stroke, int32_t side)
 }
 
 
-static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
+static void _outside(SwStroke& stroke, int32_t side, SwFixed lineLength)
 {
-    auto border = stroke.borders[side];
+    auto border = stroke.borders + side;
 
     if (stroke.join == StrokeJoin::Round) {
         _arcTo(stroke, side);
@@ -219,8 +239,8 @@ static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
         //this is a mitered (pointed) or beveled (truncated) corner
         auto rotate = SIDE_TO_ROTATE(side);
         auto bevel = stroke.join == StrokeJoin::Bevel;
-        int64_t phi = 0;
-        int64_t thcos = 0;
+        SwFixed phi = 0;
+        SwFixed thcos = 0;
 
         if (!bevel) {
             auto theta = mathDiff(stroke.angleIn, stroke.angleOut);
@@ -241,7 +261,7 @@ static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
 
         //this is a bevel (broken angle)
         if (bevel) {
-            SwPoint delta = {static_cast<int32_t>(stroke.width), 0};
+            SwPoint delta = {static_cast<SwCoord>(stroke.width), 0};
             mathRotate(delta, stroke.angleOut + rotate);
             SCALE(stroke, delta);
             delta += stroke.center;
@@ -250,7 +270,7 @@ static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
         //this is a miter (intersection)
         } else {
             auto length = mathDivide(stroke.width, thcos);
-            SwPoint delta = {static_cast<int32_t>(length), 0};
+            SwPoint delta = {static_cast<SwCoord>(length), 0};
             mathRotate(delta, phi);
             SCALE(stroke, delta);
             delta += stroke.center;
@@ -259,7 +279,7 @@ static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
             /* Now add and end point
                Only needed if not lineto (lineLength is zero for curves) */
             if (lineLength == 0) {
-                delta = {static_cast<int32_t>(stroke.width), 0};
+                delta = {static_cast<SwCoord>(stroke.width), 0};
                 mathRotate(delta, stroke.angleOut + rotate);
                 SCALE(stroke, delta);
                 delta += stroke.center;
@@ -270,9 +290,9 @@ static void _outside(SwStroke& stroke, int32_t side, int64_t lineLength)
 }
 
 
-static void _inside(SwStroke& stroke, int32_t side, int64_t lineLength)
+static void _inside(SwStroke& stroke, int32_t side, SwFixed lineLength)
 {
-    auto border = stroke.borders[side];
+    auto border = stroke.borders + side;
     auto theta = mathDiff(stroke.angleIn, stroke.angleOut) / 2;
     SwPoint delta;
     bool intersect = false;
@@ -281,14 +301,14 @@ static void _inside(SwStroke& stroke, int32_t side, int64_t lineLength)
        lines are long enough (line length is zero for curves). */
     if (border->movable && lineLength > 0) {
         //compute minimum required length of lines
-        int64_t minLength = abs(mathMultiply(stroke.width, mathTan(theta)));
+        SwFixed minLength = abs(mathMultiply(stroke.width, mathTan(theta)));
         if (stroke.lineLength >= minLength && lineLength >= minLength) intersect = true;
     }
 
     auto rotate = SIDE_TO_ROTATE(side);
 
     if (!intersect) {
-        delta = {static_cast<int32_t>(stroke.width), 0};
+        delta = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta, stroke.angleOut + rotate);
         SCALE(stroke, delta);
         delta += stroke.center;
@@ -297,7 +317,7 @@ static void _inside(SwStroke& stroke, int32_t side, int64_t lineLength)
         //compute median angle
         auto phi = stroke.angleIn + theta;
         auto thcos = mathCos(theta);
-        delta = {static_cast<int32_t>(mathDivide(stroke.width, thcos)), 0};
+        delta = {static_cast<SwCoord>(mathDivide(stroke.width, thcos)), 0};
         mathRotate(delta, phi + rotate);
         SCALE(stroke, delta);
         delta += stroke.center;
@@ -307,7 +327,7 @@ static void _inside(SwStroke& stroke, int32_t side, int64_t lineLength)
 }
 
 
-void _processCorner(SwStroke& stroke, int64_t lineLength)
+void _processCorner(SwStroke& stroke, SwFixed lineLength)
 {
     auto turn = mathDiff(stroke.angleIn, stroke.angleOut);
 
@@ -328,17 +348,19 @@ void _processCorner(SwStroke& stroke, int64_t lineLength)
 }
 
 
-void _firstSubPath(SwStroke& stroke, int64_t startAngle, int64_t lineLength)
+void _firstSubPath(SwStroke& stroke, SwFixed startAngle, SwFixed lineLength)
 {
-    SwPoint delta = {static_cast<int32_t>(stroke.width), 0};
+    SwPoint delta = {static_cast<SwCoord>(stroke.width), 0};
     mathRotate(delta, startAngle + SW_ANGLE_PI2);
     SCALE(stroke, delta);
 
     auto pt = stroke.center + delta;
-    _borderMoveTo(stroke.borders[0], pt);
+    auto border = stroke.borders;
+    _borderMoveTo(border, pt);
 
     pt = stroke.center - delta;
-    _borderMoveTo(stroke.borders[1], pt);
+    ++border;
+    _borderMoveTo(border, pt);
 
     /* Save angle, position and line length for last join
        lineLength is zero for curves */
@@ -363,12 +385,12 @@ static void _lineTo(SwStroke& stroke, const SwPoint& to)
        The scale needs to be reverted since the stroke width has not been scaled.
        An alternative option is to scale the width of the stroke properly by
        calculating the mixture of the sx/sy rating on the stroke direction. */
-    delta.x = static_cast<int32_t>(delta.x / stroke.sx);
-    delta.y = static_cast<int32_t>(delta.y / stroke.sy);
+    delta.x = static_cast<SwCoord>(delta.x / stroke.sx);
+    delta.y = static_cast<SwCoord>(delta.y / stroke.sy);
     auto lineLength = mathLength(delta);
     auto angle = mathAtan(delta);
 
-    delta = {static_cast<int32_t>(stroke.width), 0};
+    delta = {static_cast<SwCoord>(stroke.width), 0};
     mathRotate(delta, angle + SW_ANGLE_PI2);
     SCALE(stroke, delta);
 
@@ -384,11 +406,20 @@ static void _lineTo(SwStroke& stroke, const SwPoint& to)
     }
 
     //now add a line segment to both the inside and outside paths
-    for (int side = 0; side < 2; ++side) {
+    auto border = stroke.borders;
+    auto side = 1;
+
+    while (side >= 0) {
+        auto pt = to + delta;
+
         //the ends of lineto borders are movable
-        _borderLineTo(stroke.borders[side], to + delta, true);
+        _borderLineTo(border, pt, true);
+
         delta.x = -delta.x;
         delta.y = -delta.y;
+
+        --side;
+        ++border;
     }
 
     stroke.angleIn = angle;
@@ -409,7 +440,7 @@ static void _cubicTo(SwStroke& stroke, const SwPoint& ctrl1, const SwPoint& ctrl
     arc[3] = stroke.center;
 
     while (arc >= bezStack) {
-        int64_t angleIn, angleOut, angleMid;
+        SwFixed angleIn, angleOut, angleMid;
 
         //initialize with current direction
         angleIn = angleOut = angleMid = stroke.angleIn;
@@ -462,68 +493,75 @@ static void _cubicTo(SwStroke& stroke, const SwPoint& ctrl1, const SwPoint& ctrl
         auto phi2 = mathMean(angleMid, angleOut);
         auto length1 = mathDivide(stroke.width, mathCos(theta1));
         auto length2 = mathDivide(stroke.width, mathCos(theta2));
-        int64_t alpha0 = 0;
+        SwFixed alpha0 = 0;
 
         //compute direction of original arc
         if (stroke.handleWideStrokes) {
             alpha0 = mathAtan(arc[0] - arc[3]);
         }
 
-        for (int side = 0; side < 2; ++side) {
-            auto border = stroke.borders[side];
+        auto border = stroke.borders;
+        int32_t side = 0;
+
+        while (side < 2) {
             auto rotate = SIDE_TO_ROTATE(side);
 
             //compute control points
-            SwPoint _ctrl1 = {static_cast<int32_t>(length1), 0};
+            SwPoint _ctrl1 = {static_cast<SwCoord>(length1), 0};
             mathRotate(_ctrl1, phi1 + rotate);
             SCALE(stroke, _ctrl1);
             _ctrl1 += arc[2];
 
-            SwPoint _ctrl2 = {static_cast<int32_t>(length2), 0};
+            SwPoint _ctrl2 = {static_cast<SwCoord>(length2), 0};
             mathRotate(_ctrl2, phi2 + rotate);
             SCALE(stroke, _ctrl2);
             _ctrl2 += arc[1];
 
             //compute end point
-            SwPoint end = {static_cast<int32_t>(stroke.width), 0};
-            mathRotate(end, angleOut + rotate);
-            SCALE(stroke, end);
-            end += arc[0];
+            SwPoint _end = {static_cast<SwCoord>(stroke.width), 0};
+            mathRotate(_end, angleOut + rotate);
+            SCALE(stroke, _end);
+            _end += arc[0];
 
             if (stroke.handleWideStrokes) {
                 /* determine whether the border radius is greater than the radius of
                    curvature of the original arc */
-                auto start = border->pts.last();
-                auto alpha1 = mathAtan(end - start);
+                auto _start = border->pts[border->ptsCnt - 1];
+                auto alpha1 = mathAtan(_end - _start);
 
                 //is the direction of the border arc opposite to that of the original arc?
                 if (abs(mathDiff(alpha0, alpha1)) > SW_ANGLE_PI / 2) {
 
                     //use the sine rule to find the intersection point
-                    auto beta = mathAtan(arc[3] - start);
-                    auto gamma = mathAtan(arc[0] - end);
-                    auto bvec = end - start;
+                    auto beta = mathAtan(arc[3] - _start);
+                    auto gamma = mathAtan(arc[0] - _end);
+                    auto bvec = _end - _start;
                     auto blen = mathLength(bvec);
                     auto sinA = abs(mathSin(alpha1 - gamma));
                     auto sinB = abs(mathSin(beta - gamma));
                     auto alen = mathMulDiv(blen, sinA, sinB);
 
-                    SwPoint delta = {static_cast<int32_t>(alen), 0};
+                    SwPoint delta = {static_cast<SwCoord>(alen), 0};
                     mathRotate(delta, beta);
-                    delta += start;
+                    delta += _start;
 
                     //circumnavigate the negative sector backwards
                     border->movable = false;
                     _borderLineTo(border, delta, false);
-                    _borderLineTo(border, end, false);
-                    _borderCubicTo(border, _ctrl2, _ctrl1, start);
+                    _borderLineTo(border, _end, false);
+                    _borderCubicTo(border, _ctrl2, _ctrl1, _start);
 
                     //and then move to the endpoint
-                    _borderLineTo(border, end, false);
+                    _borderLineTo(border, _end, false);
+
+                    ++side;
+                    ++border;
                     continue;
                 }
             }
-            _borderCubicTo(border, _ctrl1, _ctrl2, end);
+            _borderCubicTo(border, _ctrl1, _ctrl2, _end);
+            ++side;
+            ++border;
         }
         arc -= 3;
         stroke.angleIn = angleOut;
@@ -532,49 +570,53 @@ static void _cubicTo(SwStroke& stroke, const SwPoint& ctrl1, const SwPoint& ctrl
 }
 
 
-static void _addCap(SwStroke& stroke, int64_t angle, int32_t side)
+static void _addCap(SwStroke& stroke, SwFixed angle, int32_t side)
 {
     if (stroke.cap == StrokeCap::Square) {
         auto rotate = SIDE_TO_ROTATE(side);
-        auto border = stroke.borders[side];
+        auto border = stroke.borders + side;
 
-        SwPoint delta = {static_cast<int32_t>(stroke.width), 0};
+        SwPoint delta = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta, angle);
         SCALE(stroke, delta);
 
-        SwPoint delta2 = {static_cast<int32_t>(stroke.width), 0};
+        SwPoint delta2 = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta2, angle + rotate);
         SCALE(stroke, delta2);
         delta += stroke.center + delta2;
 
         _borderLineTo(border, delta, false);
 
-        delta = {static_cast<int32_t>(stroke.width), 0};
+        delta = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta, angle);
         SCALE(stroke, delta);
 
-        delta2 = {static_cast<int32_t>(stroke.width), 0};
+        delta2 = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta2, angle - rotate);
         SCALE(stroke, delta2);
         delta += delta2 + stroke.center;
 
         _borderLineTo(border, delta, false);
+
     } else if (stroke.cap == StrokeCap::Round) {
+
         stroke.angleIn = angle;
         stroke.angleOut = angle + SW_ANGLE_PI;
         _arcTo(stroke, side);
+        return;
+
     } else {  //Butt
         auto rotate = SIDE_TO_ROTATE(side);
-        auto border = stroke.borders[side];
+        auto border = stroke.borders + side;
 
-        SwPoint delta = {static_cast<int32_t>(stroke.width), 0};
+        SwPoint delta = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta, angle + rotate);
         SCALE(stroke, delta);
         delta += stroke.center;
 
         _borderLineTo(border, delta, false);
 
-        delta = {static_cast<int32_t>(stroke.width), 0};
+        delta = {static_cast<SwCoord>(stroke.width), 0};
         mathRotate(delta, angle - rotate);
         SCALE(stroke, delta);
         delta += stroke.center;
@@ -586,20 +628,21 @@ static void _addCap(SwStroke& stroke, int64_t angle, int32_t side)
 
 static void _addReverseLeft(SwStroke& stroke, bool opened)
 {
-    auto right = stroke.borders[0];
-    auto left = stroke.borders[1];
-    auto newPts = left->pts.count - left->start;
+    auto right = stroke.borders + 0;
+    auto left = stroke.borders + 1;
+    auto newPts = left->ptsCnt - left->start;
 
     if (newPts <= 0) return;
 
     _growBorder(right, newPts);
 
-    auto dstTag = right->tags + right->pts.count;
-    auto srcPt = left->pts.end() - 1;
-    auto srcTag = left->tags + left->pts.count - 1;
+    auto dstPt = right->pts + right->ptsCnt;
+    auto dstTag = right->tags + right->ptsCnt;
+    auto srcPt = left->pts + left->ptsCnt - 1;
+    auto srcTag = left->tags + left->ptsCnt - 1;
 
-    while (srcPt >= left->pts.data + left->start) {
-        right->pts.push(*srcPt);
+    while (srcPt >= left->pts + left->start) {
+        *dstPt = *srcPt;
         *dstTag = *srcTag;
 
         if (opened) {
@@ -612,10 +655,12 @@ static void _addReverseLeft(SwStroke& stroke, bool opened)
         }
         --srcPt;
         --srcTag;
+        ++dstPt;
         ++dstTag;
     }
 
-    left->pts.count = left->start;
+    left->ptsCnt = left->start;
+    right->ptsCnt += newPts;
     right->movable = false;
     left->movable = false;
 }
@@ -669,10 +714,10 @@ static void _endSubPath(SwStroke& stroke)
             _outside(stroke, 1 - inside, stroke.subPathLineLength);   //outside
         }
 
-        _borderClose(stroke.borders[0], false);
-        _borderClose(stroke.borders[1], true);
+        _borderClose(stroke.borders + 0, false);
+        _borderClose(stroke.borders + 1, true);
     } else {
-        auto right = stroke.borders[0];
+        auto right = stroke.borders;
 
         /* all right, this is an opened path, we need to add a cap between
            right & left, add the reverse of left, then add a final cap
@@ -693,22 +738,66 @@ static void _endSubPath(SwStroke& stroke)
 }
 
 
+static void _getCounts(SwStrokeBorder* border, uint32_t& ptsCnt, uint32_t& cntrsCnt)
+{
+    auto count = border->ptsCnt;
+    auto tags = border->tags;
+    uint32_t _ptsCnt = 0;
+    uint32_t _cntrsCnt = 0;
+    bool inCntr = false;
+
+    while (count > 0) {
+        if (tags[0] & SW_STROKE_TAG_BEGIN) {
+            if (inCntr) goto fail;
+            inCntr = true;
+        } else if (!inCntr) goto fail;
+
+        if (tags[0] & SW_STROKE_TAG_END) {
+            inCntr = false;
+            ++_cntrsCnt;
+        }
+        --count;
+        ++_ptsCnt;
+        ++tags;
+    }
+
+    if (inCntr) goto fail;
+
+    ptsCnt = _ptsCnt;
+    cntrsCnt = _cntrsCnt;
+
+    return;
+
+fail:
+    ptsCnt = 0;
+    cntrsCnt = 0;
+}
+
+
 static void _exportBorderOutline(const SwStroke& stroke, SwOutline* outline, uint32_t side)
 {
-    auto border = stroke.borders[side];
-    if (border->pts.empty()) return;
+    auto border = stroke.borders + side;
+    if (border->ptsCnt == 0) return;
 
+    memcpy(outline->pts.data + outline->pts.count, border->pts, border->ptsCnt * sizeof(SwPoint));
+
+    auto cnt = border->ptsCnt;
     auto src = border->tags;
+    auto tags = outline->types.data + outline->types.count;
     auto idx = outline->pts.count;
 
-    ARRAY_FOREACH(pts, border->pts) {
-        if (*src & SW_STROKE_TAG_POINT) outline->types.push(SW_CURVE_TYPE_POINT);
-        else if (*src & SW_STROKE_TAG_CUBIC) outline->types.push(SW_CURVE_TYPE_CUBIC);
+    while (cnt > 0) {
+        if (*src & SW_STROKE_TAG_POINT) *tags = SW_CURVE_TYPE_POINT;
+        else if (*src & SW_STROKE_TAG_CUBIC) *tags = SW_CURVE_TYPE_CUBIC;
+        else TVGERR("SW_ENGINE", "Invalid stroke tag was given! = %d", *src);
         if (*src & SW_STROKE_TAG_END) outline->cntrs.push(idx);
         ++src;
+        ++tags;
         ++idx;
+        --cnt;
     }
-    outline->pts.push(border->pts);
+    outline->pts.count += border->ptsCnt;
+    outline->types.count += border->ptsCnt;
 }
 
 
@@ -720,38 +809,45 @@ void strokeFree(SwStroke* stroke)
 {
     if (!stroke) return;
 
+    //free borders
+    if (stroke->borders[0].pts) free(stroke->borders[0].pts);
+    if (stroke->borders[0].tags) free(stroke->borders[0].tags);
+    if (stroke->borders[1].pts) free(stroke->borders[1].pts);
+    if (stroke->borders[1].tags) free(stroke->borders[1].tags);
+
     fillFree(stroke->fill);
     stroke->fill = nullptr;
 
-    tvg::free(stroke);
+    free(stroke);
 }
 
 
-void strokeReset(SwStroke* stroke, const RenderShape* rshape, const Matrix& transform, SwMpool* mpool, unsigned tid)
+void strokeReset(SwStroke* stroke, const RenderShape* rshape, const Matrix& transform)
 {
     stroke->sx = sqrtf(powf(transform.e11, 2.0f) + powf(transform.e21, 2.0f));
     stroke->sy = sqrtf(powf(transform.e12, 2.0f) + powf(transform.e22, 2.0f));
     stroke->width = HALF_STROKE(rshape->strokeWidth());
     stroke->cap = rshape->strokeCap();
-    stroke->miterlimit = static_cast<int64_t>(rshape->strokeMiterlimit() * 65536.0f);
+    stroke->miterlimit = static_cast<SwFixed>(rshape->strokeMiterlimit() * 65536.0f);
 
     //Save line join: it can be temporarily changed when stroking curves...
     stroke->joinSaved = stroke->join = rshape->strokeJoin();
 
-    stroke->borders[0] = mpool->strokeLBorder(tid);
-    stroke->borders[1] = mpool->strokeRBorder(tid);
+    stroke->borders[0].ptsCnt = 0;
+    stroke->borders[0].start = -1;
+    stroke->borders[1].ptsCnt = 0;
+    stroke->borders[1].start = -1;
 }
 
 
-bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline, SwMpool* mpool, unsigned tid)
+bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline)
 {
     uint32_t first = 0;
     uint32_t i = 0;
 
-    ARRAY_FOREACH(p, outline.cntrs) {
-        auto last = *p;           //index of last point in contour
+    for (auto cntr = outline.cntrs.begin(); cntr < outline.cntrs.end(); ++cntr, ++i) {
+        auto last = *cntr;           //index of last point in contour
         auto limit = outline.pts.data + last;
-        ++i;
 
         //Skip empty points
         if (last <= first) {
@@ -768,7 +864,7 @@ bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline, SwMpool* mpo
         if (type == SW_CURVE_TYPE_CUBIC) return false;
         ++types;
 
-        auto closed =  outline.closed.data ? outline.closed.data[i - 1]: false;
+        auto closed =  outline.closed.data ? outline.closed.data[i]: false;
 
         _beginSubPath(*stroke, start, closed);
 
@@ -797,11 +893,18 @@ bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline, SwMpool* mpo
 
 SwOutline* strokeExportOutline(SwStroke* stroke, SwMpool* mpool, unsigned tid)
 {
-    auto reserve = stroke->borders[0]->pts.count + stroke->borders[1]->pts.count;
-    auto outline = mpool->outline(tid);
-    outline->pts.reserve(reserve);
-    outline->types.reserve(reserve);
-    outline->fillRule = FillRule::NonZero;
+    uint32_t count1, count2, count3, count4;
+
+    _getCounts(stroke->borders + 0, count1, count2);
+    _getCounts(stroke->borders + 1, count3, count4);
+
+    auto ptsCnt = count1 + count3;
+    auto cntrsCnt = count2 + count4;
+
+    auto outline = mpoolReqStrokeOutline(mpool, tid);
+    outline->pts.reserve(ptsCnt);
+    outline->types.reserve(ptsCnt);
+    outline->cntrs.reserve(cntrsCnt);
 
     _exportBorderOutline(*stroke, outline, 0);  //left
     _exportBorderOutline(*stroke, outline, 1);  //right
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgAccessor.cpp b/engine/thirdparty/thorvg/src/renderer/tvgAccessor.cpp
index fd67d2b4..21caa2c2 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgAccessor.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgAccessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -50,28 +50,34 @@ static bool accessChildren(Iterator* it, function<bool(const Paint* paint, void*
 /* External Class Implementation                                        */
 /************************************************************************/
 
+TVG_DEPRECATED unique_ptr<Picture> Accessor::set(unique_ptr<Picture> picture, function<bool(const Paint* paint)> func) noexcept
+{
+    auto backward = [](const tvg::Paint* paint, void* data) -> bool
+    {
+        auto func = reinterpret_cast<function<bool(const Paint* paint)>*>(data);
+        if (!(*func)(paint)) return false;
+        return true;
+    };
+
+    set(picture.get(), backward, reinterpret_cast<void*>(&func));
+    return picture;
+}
+
+
 Result Accessor::set(Paint* paint, function<bool(const Paint* paint, void* data)> func, void* data) noexcept
 {
     if (!paint || !func) return Result::InvalidArguments;
 
-    //Use the Preorder Tree-Search
-
-    paint->ref();
+    //Use the Preorder Tree-Searc
 
     //Root
-    if (!func(paint, data)) {
-        paint->unref(false);
-        return Result::Success;
-    }
+    if (!func(paint, data)) return Result::Success;
 
     //Children
     if (auto it = IteratorAccessor::iterator(paint)) {
         accessChildren(it, func, data);
         delete(it);
     }
-
-    paint->unref(false);
-
     return Result::Success;
 }
 
@@ -94,7 +100,7 @@ Accessor::Accessor() : pImpl(nullptr)
 }
 
 
-Accessor* Accessor::gen() noexcept
+unique_ptr<Accessor> Accessor::gen() noexcept
 {
-    return new Accessor;
+    return unique_ptr<Accessor>(new Accessor);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgAnimation.cpp b/engine/thirdparty/thorvg/src/renderer/tvgAnimation.cpp
index 62998950..23973bbf 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgAnimation.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgAnimation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,13 @@
 #include "tvgFrameModule.h"
 #include "tvgAnimation.h"
 
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
 
 Animation::~Animation()
 {
@@ -37,15 +44,12 @@ Animation::Animation() : pImpl(new Impl)
 
 Result Animation::frame(float no) noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    auto loader = pImpl->picture->pImpl->loader;
 
     if (!loader) return Result::InsufficientCondition;
     if (!loader->animatable()) return Result::NonSupport;
 
-    if (static_cast<FrameModule*>(loader)->frame(no)) {
-        PAINT(pImpl->picture)->mark(RenderUpdateFlag::All);
-        return Result::Success;
-    }
+    if (static_cast<FrameModule*>(loader)->frame(no)) return Result::Success;
     return Result::InsufficientCondition;
 }
 
@@ -58,7 +62,7 @@ Picture* Animation::picture() const noexcept
 
 float Animation::curFrame() const noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    auto loader = pImpl->picture->pImpl->loader;
 
     if (!loader) return 0;
     if (!loader->animatable()) return 0;
@@ -69,7 +73,7 @@ float Animation::curFrame() const noexcept
 
 float Animation::totalFrame() const noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    auto loader = pImpl->picture->pImpl->loader;
 
     if (!loader) return 0;
     if (!loader->animatable()) return 0;
@@ -80,7 +84,7 @@ float Animation::totalFrame() const noexcept
 
 float Animation::duration() const noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    auto loader = pImpl->picture->pImpl->loader;
 
     if (!loader) return 0;
     if (!loader->animatable()) return 0;
@@ -91,17 +95,21 @@ float Animation::duration() const noexcept
 
 Result Animation::segment(float begin, float end) noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    if (begin < 0.0f || end > 1.0f || begin > end) return Result::InvalidArguments;
+
+    auto loader = pImpl->picture->pImpl->loader;
     if (!loader) return Result::InsufficientCondition;
     if (!loader->animatable()) return Result::NonSupport;
 
-    return static_cast<FrameModule*>(loader)->segment(begin, end);
+    static_cast<FrameModule*>(loader)->segment(begin, end);
+
+    return Result::Success;
 }
 
 
 Result Animation::segment(float *begin, float *end) noexcept
 {
-    auto loader = to<PictureImpl>(pImpl->picture)->loader;
+    auto loader = pImpl->picture->pImpl->loader;
     if (!loader) return Result::InsufficientCondition;
     if (!loader->animatable()) return Result::NonSupport;
     if (!begin && !end) return Result::InvalidArguments;
@@ -112,7 +120,7 @@ Result Animation::segment(float *begin, float *end) noexcept
 }
 
 
-Animation* Animation::gen() noexcept
+unique_ptr<Animation> Animation::gen() noexcept
 {
-    return new Animation;
+    return unique_ptr<Animation>(new Animation);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgAnimation.h b/engine/thirdparty/thorvg/src/renderer/tvgAnimation.h
index 6eb5d495..14212eb6 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgAnimation.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgAnimation.h
@@ -24,6 +24,7 @@
 #define _TVG_ANIMATION_H_
 
 #include "tvgCommon.h"
+#include "tvgPaint.h"
 #include "tvgPicture.h"
 
 struct Animation::Impl
@@ -32,13 +33,15 @@ struct Animation::Impl
 
     Impl()
     {
-        picture = Picture::gen();
-        picture->ref();
+        picture = Picture::gen().release();
+        PP(picture)->ref();
     }
 
     ~Impl()
     {
-        picture->unref();
+        if (PP(picture)->unref() == 0) {
+            delete(picture);
+        }
     }
 };
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgBinaryDesc.h b/engine/thirdparty/thorvg/src/renderer/tvgBinaryDesc.h
new file mode 100644
index 00000000..e40859b6
--- /dev/null
+++ b/engine/thirdparty/thorvg/src/renderer/tvgBinaryDesc.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _TVG_BINARY_DESC_H_
+#define _TVG_BINARY_DESC_H_
+
+/* TODO: Need to consider whether uin8_t is enough size for extension...
+   Rather than optimal data, we can use enough size and data compress? */
+
+using TvgBinByte = uint8_t;
+using TvgBinCounter = uint32_t;
+using TvgBinTag = TvgBinByte;
+using TvgBinFlag = TvgBinByte;
+
+
+//Header
+#define TVG_HEADER_SIZE 33                //TVG_HEADER_SIGNATURE_LENGTH + TVG_HEADER_VERSION_LENGTH + 2*SIZE(float) + TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE
+#define TVG_HEADER_SIGNATURE "ThorVG"
+#define TVG_HEADER_SIGNATURE_LENGTH 6
+#define TVG_HEADER_VERSION "001500"       //Major 00, Minor 15, Micro 00
+#define TVG_HEADER_VERSION_LENGTH 6
+#define TVG_HEADER_RESERVED_LENGTH 1      //Storing flags for extensions
+#define TVG_HEADER_COMPRESS_SIZE 12       //TVG_HEADER_UNCOMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE_BITS
+//Compress Size
+#define TVG_HEADER_UNCOMPRESSED_SIZE 4     //SIZE (TvgBinCounter)
+#define TVG_HEADER_COMPRESSED_SIZE 4       //SIZE (TvgBinCounter)
+#define TVG_HEADER_COMPRESSED_SIZE_BITS 4  //SIZE (TvgBinCounter)
+//Reserved Flag
+#define TVG_HEAD_FLAG_COMPRESSED                    0x01
+
+//Paint Type
+#define TVG_TAG_CLASS_PICTURE                       (TvgBinTag)0xfc
+#define TVG_TAG_CLASS_SHAPE                         (TvgBinTag)0xfd
+#define TVG_TAG_CLASS_SCENE                         (TvgBinTag)0xfe
+
+
+//Paint
+#define TVG_TAG_PAINT_OPACITY                       (TvgBinTag)0x10
+#define TVG_TAG_PAINT_TRANSFORM                     (TvgBinTag)0x11
+#define TVG_TAG_PAINT_CMP_TARGET                    (TvgBinTag)0x01
+#define TVG_TAG_PAINT_CMP_METHOD                    (TvgBinTag)0x20
+
+
+//TODO: Keep this for the compatibility, Remove in TVG 1.0 release
+//Scene
+ #define TVG_TAG_SCENE_RESERVEDCNT                   (TvgBinTag)0x30
+
+
+//Shape
+#define TVG_TAG_SHAPE_PATH                          (TvgBinTag)0x40
+#define TVG_TAG_SHAPE_STROKE                        (TvgBinTag)0x41
+#define TVG_TAG_SHAPE_FILL                          (TvgBinTag)0x42
+#define TVG_TAG_SHAPE_COLOR                         (TvgBinTag)0x43
+#define TVG_TAG_SHAPE_FILLRULE                      (TvgBinTag)0x44
+
+
+//Stroke
+#define TVG_TAG_SHAPE_STROKE_CAP                    (TvgBinTag)0x50
+#define TVG_TAG_SHAPE_STROKE_JOIN                   (TvgBinTag)0x51
+#define TVG_TAG_SHAPE_STROKE_WIDTH                  (TvgBinTag)0x52
+#define TVG_TAG_SHAPE_STROKE_COLOR                  (TvgBinTag)0x53
+#define TVG_TAG_SHAPE_STROKE_FILL                   (TvgBinTag)0x54
+#define TVG_TAG_SHAPE_STROKE_DASHPTRN               (TvgBinTag)0x55
+#define TVG_TAG_SHAPE_STROKE_MITERLIMIT             (TvgBinTag)0x56
+#define TVG_TAG_SHAPE_STROKE_ORDER                  (TvgBinTag)0x57
+#define TVG_TAG_SHAPE_STROKE_DASH_OFFSET            (TvgBinTag)0x58
+
+
+//Fill
+#define TVG_TAG_FILL_LINEAR_GRADIENT                (TvgBinTag)0x60
+#define TVG_TAG_FILL_RADIAL_GRADIENT                (TvgBinTag)0x61
+#define TVG_TAG_FILL_COLORSTOPS                     (TvgBinTag)0x62
+#define TVG_TAG_FILL_FILLSPREAD                     (TvgBinTag)0x63
+#define TVG_TAG_FILL_TRANSFORM                      (TvgBinTag)0x64
+#define TVG_TAG_FILL_RADIAL_GRADIENT_FOCAL          (TvgBinTag)0x65
+
+//Picture
+#define TVG_TAG_PICTURE_RAW_IMAGE                   (TvgBinTag)0x70
+#define TVG_TAG_PICTURE_MESH                        (TvgBinTag)0x71
+
+#endif //_TVG_BINARY_DESC_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgCanvas.cpp b/engine/thirdparty/thorvg/src/renderer/tvgCanvas.cpp
index a2b41958..1a36e41e 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgCanvas.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgCanvas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,27 +21,12 @@
  */
 
 #include "tvgCanvas.h"
-#include "tvgTaskScheduler.h"
-#include "tvgLoadModule.h"
-
-#ifdef THORVG_SW_RASTER_SUPPORT
-    #include "tvgSwRenderer.h"
-#endif
-
-#ifdef THORVG_GL_RASTER_SUPPORT
-    #include "tvgGlRenderer.h"
-#endif
-
-#ifdef THORVG_WG_RASTER_SUPPORT
-    #include "tvgWgRenderer.h"
-#endif
-
 
 /************************************************************************/
-/* Canvas Class Implementation                                          */
+/* External Class Implementation                                        */
 /************************************************************************/
 
-Canvas::Canvas():pImpl(new Impl)
+Canvas::Canvas(RenderMethod *pRenderer):pImpl(new Impl(pRenderer))
 {
 }
 
@@ -52,45 +37,50 @@ Canvas::~Canvas()
 }
 
 
-const list<Paint*>& Canvas::paints() const noexcept
+Result Canvas::reserve(TVG_UNUSED uint32_t n) noexcept
 {
-    return pImpl->scene->paints();
+    return Result::NonSupport;
 }
 
 
-Result Canvas::add(Paint* target, Paint* at) noexcept
+list<Paint*>& Canvas::paints() noexcept
 {
-    if (target) return pImpl->add(target, at);
-    return Result::InvalidArguments;
+    return pImpl->paints;
 }
 
 
-Result Canvas::draw(bool clear) noexcept
+Result Canvas::push(unique_ptr<Paint> paint) noexcept
+{
+    return pImpl->push(std::move(paint));
+}
+
+
+Result Canvas::clear(bool free) noexcept
+{
+    return pImpl->clear(free);
+}
+
+
+Result Canvas::draw() noexcept
 {
     TVGLOG("RENDERER", "Draw S. -------------------------------- Canvas(%p)", this);
-    auto ret = pImpl->draw(clear);
+    auto ret = pImpl->draw();
     TVGLOG("RENDERER", "Draw E. -------------------------------- Canvas(%p)", this);
 
     return ret;
 }
 
 
-Result Canvas::update() noexcept
+Result Canvas::update(Paint* paint) noexcept
 {
     TVGLOG("RENDERER", "Update S. ------------------------------ Canvas(%p)", this);
-    auto ret = pImpl->update();
+    auto ret = pImpl->update(paint, false);
     TVGLOG("RENDERER", "Update E. ------------------------------ Canvas(%p)", this);
 
     return ret;
 }
 
 
-Result Canvas::remove(Paint* paint) noexcept
-{
-    return pImpl->remove(paint);
-}
-
-
 Result Canvas::viewport(int32_t x, int32_t y, int32_t w, int32_t h) noexcept
 {
     return pImpl->viewport(x, y, w, h);
@@ -101,178 +91,3 @@ Result Canvas::sync() noexcept
 {
     return pImpl->sync();
 }
-
-
-/************************************************************************/
-/* SwCanvas Class Implementation                                        */
-/************************************************************************/
-
-SwCanvas::SwCanvas() = default;
-
-SwCanvas::~SwCanvas()
-{
-#ifdef THORVG_SW_RASTER_SUPPORT
-    SwRenderer::term();
-#endif
-}
-
-
-Result SwCanvas::target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h, ColorSpace cs) noexcept
-{
-#ifdef THORVG_SW_RASTER_SUPPORT
-    if (cs == ColorSpace::Unknown) return Result::InvalidArguments;
-    if (cs == ColorSpace::Grayscale8) return Result::NonSupport;
-
-    if (pImpl->status == Status::Updating || pImpl->status == Status::Drawing) {
-        return Result::InsufficientCondition;
-    }
-
-    //We know renderer type, avoid dynamic_cast for performance.
-    auto renderer = static_cast<SwRenderer*>(pImpl->renderer);
-    if (!renderer) return Result::MemoryCorruption;
-
-    if (!renderer->target(buffer, stride, w, h, cs)) return Result::InvalidArguments;
-    pImpl->vport = {{0, 0}, {(int32_t)w, (int32_t)h}};
-    renderer->viewport(pImpl->vport);
-
-    //FIXME: The value must be associated with an individual canvas instance.
-    ImageLoader::cs = static_cast<ColorSpace>(cs);
-
-    //Paints must be updated again with this new target.
-    pImpl->status = Status::Damaged;
-
-    return Result::Success;
-#endif
-    return Result::NonSupport;
-}
-
-
-SwCanvas* SwCanvas::gen(EngineOption op) noexcept
-{
-#ifdef THORVG_SW_RASTER_SUPPORT
-    if (engineInit > 0) {
-        auto renderer = new SwRenderer(TaskScheduler::threads(), op);
-        renderer->ref();
-        auto ret = new SwCanvas;
-        ret->pImpl->renderer = renderer;
-        return ret;
-    }
-#endif
-    return nullptr;
-}
-
-
-/************************************************************************/
-/* GlCanvas Class Implementation                                        */
-/************************************************************************/
-
-GlCanvas::GlCanvas() = default;
-
-GlCanvas::~GlCanvas()
-{
-#ifdef THORVG_GL_RASTER_SUPPORT
-    GlRenderer::term();
-#endif
-}
-
-
-Result GlCanvas::target(void* display, void* surface, void* context, int32_t id, uint32_t w, uint32_t h, ColorSpace cs) noexcept
-{
-#ifdef THORVG_GL_RASTER_SUPPORT
-    if (cs != ColorSpace::ABGR8888S) return Result::NonSupport;
-
-    if (pImpl->status == Status::Updating || pImpl->status == Status::Drawing) {
-        return Result::InsufficientCondition;
-    }
-
-    //We know renderer type, avoid dynamic_cast for performance.
-    auto renderer = static_cast<GlRenderer*>(pImpl->renderer);
-    if (!renderer) return Result::MemoryCorruption;
-
-    if (!renderer->target(display, surface, context, id, w, h, cs)) return Result::Unknown;
-    pImpl->vport = {{0, 0}, {(int32_t)w, (int32_t)h}};
-    renderer->viewport(pImpl->vport);
-
-    //Paints must be updated again with this new target.
-    pImpl->status = Status::Damaged;
-
-    return Result::Success;
-#endif
-    return Result::NonSupport;
-}
-
-
-GlCanvas* GlCanvas::gen(EngineOption op) noexcept
-{
-#ifdef THORVG_GL_RASTER_SUPPORT
-    if (engineInit > 0) {
-        if (op == EngineOption::SmartRender) TVGLOG("RENDERER", "GlCanvas doesn't support Smart Rendering");
-        auto renderer = GlRenderer::gen(TaskScheduler::threads(), op);
-        if (!renderer) return nullptr;
-        renderer->ref();
-        auto ret = new GlCanvas;
-        ret->pImpl->renderer = renderer;
-        return ret;
-    }
-#endif
-    return nullptr;
-}
-
-
-/************************************************************************/
-/* WgCanvas Class Implementation                                        */
-/************************************************************************/
-
-WgCanvas::WgCanvas() = default;
-
-WgCanvas::~WgCanvas()
-{
-#ifdef THORVG_WG_RASTER_SUPPORT
-    auto renderer = static_cast<WgRenderer*>(pImpl->renderer);
-    renderer->target(nullptr, nullptr, nullptr, 0, 0, ColorSpace::Unknown);
-
-    WgRenderer::term();
-#endif
-}
-
-
-Result WgCanvas::target(void* device, void* instance, void* target, uint32_t w, uint32_t h, ColorSpace cs, int type) noexcept
-{
-#ifdef THORVG_WG_RASTER_SUPPORT
-    if (cs != ColorSpace::ABGR8888S) return Result::NonSupport;
-
-    if (pImpl->status == Status::Updating || pImpl->status == Status::Drawing) {
-        return Result::InsufficientCondition;
-    }
-
-    //We know renderer type, avoid dynamic_cast for performance.
-    auto renderer = static_cast<WgRenderer*>(pImpl->renderer);
-    if (!renderer) return Result::MemoryCorruption;
-
-    if (!renderer->target((WGPUDevice)device, (WGPUInstance)instance, target, w, h, cs, type)) return Result::Unknown;
-    pImpl->vport = {{0, 0}, {(int32_t)w, (int32_t)h}};
-    renderer->viewport(pImpl->vport);
-
-    //Paints must be updated again with this new target.
-    pImpl->status = Status::Damaged;
-
-    return Result::Success;
-#endif
-    return Result::NonSupport;
-}
-
-
-WgCanvas* WgCanvas::gen(EngineOption op) noexcept
-{
-#ifdef THORVG_WG_RASTER_SUPPORT
-    if (engineInit > 0) {
-        if (op == EngineOption::SmartRender) TVGLOG("RENDERER", "WgCanvas doesn't support Smart Rendering");
-        auto renderer = new WgRenderer(TaskScheduler::threads(), op);
-        renderer->ref();
-        auto ret = new WgCanvas;
-        ret->pImpl->renderer = renderer;
-        return ret;
-    }
-#endif
-    return nullptr;
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgCanvas.h b/engine/thirdparty/thorvg/src/renderer/tvgCanvas.h
index a86df243..c5d2127f 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgCanvas.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgCanvas.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,124 +25,130 @@
 
 #include "tvgPaint.h"
 
-enum Status : uint8_t {Synced = 0, Painting, Updating, Drawing, Damaged};
+
+enum Status : uint8_t {Synced = 0, Updating, Drawing, Damaged};
 
 struct Canvas::Impl
 {
-    Scene* scene;
+    list<Paint*> paints;
     RenderMethod* renderer;
-    RenderRegion vport = {{0, 0}, {INT32_MAX, INT32_MAX}};
+    RenderRegion vport = {0, 0, INT32_MAX, INT32_MAX};
     Status status = Status::Synced;
 
-    Impl() : scene(Scene::gen())
+    Impl(RenderMethod* pRenderer) : renderer(pRenderer)
     {
-        scene->ref();
+        renderer->ref();
     }
 
     ~Impl()
     {
         //make it sure any deferred jobs
         renderer->sync();
-        scene->unref();
+        renderer->clear();
+
+        clearPaints();
+
         if (renderer->unref() == 0) delete(renderer);
     }
 
-    Result add(Paint* target, Paint* at)
+    void clearPaints()
     {
-        if (PAINT(target)->renderer && PAINT(target)->renderer != renderer) {
-            TVGERR("RENDERER", "Target paint(%p) is already owned by a different renderer.", target);
-            return Result::InsufficientCondition;
+        for (auto paint : paints) {
+            if (P(paint)->unref() == 0) delete(paint);
         }
-
-        //You cannot add paints during rendering.
-        if (status == Status::Drawing) {
-            TVGLOG("RENDERER", "add() was called during drawing.");
-            return Result::InsufficientCondition;
-        }
-        status = Status::Painting;
-        return scene->add(target, at);
+        paints.clear();
     }
 
-    Result remove(Paint* paint)
+    Result push(unique_ptr<Paint> paint)
     {
-        if (status == Status::Drawing) {
-            TVGLOG("RENDERER", "remove() was called during drawing.");
-            return Result::InsufficientCondition;
-        }
-        status = Status::Painting;
-        return scene->remove(paint);
+        //You cannot push paints during rendering.
+        if (status == Status::Drawing) return Result::InsufficientCondition;
+
+        auto p = paint.release();
+        if (!p) return Result::MemoryCorruption;
+        PP(p)->ref();
+        paints.push_back(p);
+
+        return update(p, true);
     }
 
-    Result update()
+    Result clear(bool free)
     {
-        if (status == Status::Updating) return Result::Success;
+        //Clear render target before drawing
+        if (!renderer->clear()) return Result::InsufficientCondition;
 
-        if (status == Status::Drawing) {
-            TVGLOG("RENDERER", "update() was called during drawing.");
-            return Result::InsufficientCondition;
-        }
+        //Free paints
+        if (free) clearPaints();
+
+        status = Status::Synced;
+
+        return Result::Success;
+    }
+
+    Result update(Paint* paint, bool force)
+    {
+        if (paints.empty() || status == Status::Drawing) return Result::InsufficientCondition;
 
         Array<RenderData> clips;
         auto flag = RenderUpdateFlag::None;
+        if (status == Status::Damaged || force) flag = RenderUpdateFlag::All;
 
-        //TODO: All is too harsh, can be optimized.
-        if (status == Status::Damaged) flag = RenderUpdateFlag::All;
-
-        if (!renderer->preUpdate()) return Result::InsufficientCondition;
-
-        auto m = tvg::identity();
-        PAINT(scene)->update(renderer, m, clips, 255, flag);
-
-        if (!renderer->postUpdate()) return Result::InsufficientCondition;
+        auto m = Matrix{1, 0, 0, 0, 1, 0, 0, 0, 1};
 
+        if (paint) {
+            paint->pImpl->update(renderer, m, clips, 255, flag);
+        } else {
+            for (auto paint : paints) {
+                paint->pImpl->update(renderer, m, clips, 255, flag);
+            }
+        }
         status = Status::Updating;
         return Result::Success;
     }
 
-    Result draw(bool clear)
+    Result draw()
     {
-        if (status == Status::Drawing) {
-            TVGLOG("RENDERER", "draw() was called multiple times.");
-            return Result::InsufficientCondition;
+        if (status == Status::Damaged) update(nullptr, false);
+        if (status == Status::Drawing || paints.empty() || !renderer->preRender()) return Result::InsufficientCondition;
+
+        bool rendered = false;
+        for (auto paint : paints) {
+            if (paint->pImpl->render(renderer)) rendered = true;
         }
-        if (status == Status::Painting || status == Status::Damaged) update();
-        if (status != Status::Updating) return Result::InsufficientCondition;
-        if (clear && !renderer->clear()) return Result::InsufficientCondition;
-        if (!renderer->preRender()) return Result::InsufficientCondition;
-        if (!PAINT(scene)->render(renderer) || !renderer->postRender()) return Result::InsufficientCondition;
+
+        if (!rendered || !renderer->postRender()) return Result::InsufficientCondition;
 
         status = Status::Drawing;
-
         return Result::Success;
     }
 
     Result sync()
     {
-        if (status == Status::Synced) return Result::Success;
+        if (status == Status::Synced || status == Status::Damaged) return Result::InsufficientCondition;
+
         if (renderer->sync()) {
             status = Status::Synced;
             return Result::Success;
         }
+
         return Result::Unknown;
     }
 
     Result viewport(int32_t x, int32_t y, int32_t w, int32_t h)
     {
-        if (status == Status::Synced || status == Status::Damaged) {
-            RenderRegion val = {{x, y}, {x + w, y + h}};
-            //intersect if the target buffer is already set.
-            auto surface = renderer->mainSurface();
-            if (surface && surface->w > 0 && surface->h > 0) {
-                val.intersect({{0, 0}, {(int32_t)surface->w, (int32_t)surface->h}});
-            }
-            if (vport == val) return Result::Success;
-            renderer->viewport(val);
-            vport = val;
-            status = Status::Damaged;
-            return Result::Success;
+        if (status != Status::Damaged && status != Status::Synced) return Result::InsufficientCondition;
+
+        RenderRegion val = {x, y, w, h};
+        //intersect if the target buffer is already set.
+        auto surface = renderer->mainSurface();
+        if (surface && surface->w > 0 && surface->h > 0) {
+            val.intersect({0, 0, (int32_t)surface->w, (int32_t)surface->h});
         }
-        TVGLOG("RENDERER", "viewport() is only allowed after sync.");
-        return Result::InsufficientCondition;
+        if (vport == val) return Result::Success;
+        renderer->viewport(val);
+        vport = val;
+        status = Status::Damaged;
+        return Result::Success;
     }
 };
 
diff --git a/engine/thirdparty/thorvg/src/common/tvgCommon.h b/engine/thirdparty/thorvg/src/renderer/tvgCommon.h
similarity index 54%
rename from engine/thirdparty/thorvg/src/common/tvgCommon.h
rename to engine/thirdparty/thorvg/src/renderer/tvgCommon.h
index 386df483..8aed701c 100644
--- a/engine/thirdparty/thorvg/src/common/tvgCommon.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgCommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,19 +23,6 @@
 #ifndef _TVG_COMMON_H_
 #define _TVG_COMMON_H_
 
-#ifdef _WIN32
-    #if defined(WINAPI_ENTRY)
-        #if (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
-            #include <windows.h>
-        #endif
-    #elif !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-        #include <windows.h>
-    #endif
-#endif
-#include <string>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
 #include "config.h"
 #include "thorvg.h"
 
@@ -47,7 +34,6 @@ using namespace tvg;
     #define TVG_UNUSED
     #define strncasecmp _strnicmp
     #define strcasecmp _stricmp
-    #define strtok_r strtok_s
 #else
     #define TVG_UNUSED __attribute__ ((__unused__))
 #endif
@@ -65,37 +51,41 @@ using namespace tvg;
 
 #if defined(_MSC_VER) && defined(__clang__)
     #define strncpy strncpy_s
+    #define strdup _strdup
 #endif
 
-namespace tvg {
+enum class FileType { Png = 0, Jpg, Webp, Tvg, Svg, Lottie, Ttf, Raw, Gif, Unknown };
 
-    enum class FileType { Png = 0, Jpg, Webp, Svg, Lot, Ttf, Raw, Gif, Unknown };
+#ifdef THORVG_LOG_ENABLED
+    constexpr auto ErrorColor = "\033[31m";  //red
+    constexpr auto ErrorBgColor = "\033[41m";//bg red
+    constexpr auto LogColor = "\033[32m";    //green
+    constexpr auto LogBgColor = "\033[42m";  //bg green
+    constexpr auto GreyColor = "\033[90m";   //grey
+    constexpr auto ResetColors = "\033[0m";  //default
+    #define TVGERR(tag, fmt, ...) fprintf(stderr, "%s[E]%s %s" tag "%s (%s %d): %s" fmt "\n", ErrorBgColor, ResetColors, ErrorColor, GreyColor, __FILE__, __LINE__, ResetColors, ##__VA_ARGS__)
+    #define TVGLOG(tag, fmt, ...) fprintf(stdout, "%s[L]%s %s" tag "%s (%s %d): %s" fmt "\n", LogBgColor, ResetColors, LogColor, GreyColor, __FILE__, __LINE__, ResetColors, ##__VA_ARGS__)
+#else
+    #define TVGERR(...) do {} while(0)
+    #define TVGLOG(...) do {} while(0)
+#endif
 
-    #ifdef THORVG_LOG_ENABLED
-        constexpr auto ErrorColor = "\033[31m";  //red
-        constexpr auto ErrorBgColor = "\033[41m";//bg red
-        constexpr auto LogColor = "\033[32m";    //green
-        constexpr auto LogBgColor = "\033[42m";  //bg green
-        constexpr auto GreyColor = "\033[90m";   //grey
-        constexpr auto ResetColors = "\033[0m";  //default
-        #define TVGERR(tag, fmt, ...) fprintf(stderr, "%s[E]%s %s" tag "%s (%s %d): %s" fmt "\n", ErrorBgColor, ResetColors, ErrorColor, GreyColor, __FILE__, __LINE__, ResetColors, ##__VA_ARGS__)
-        #define TVGLOG(tag, fmt, ...) fprintf(stdout, "%s[L]%s %s" tag "%s (%s %d): %s" fmt "\n", LogBgColor, ResetColors, LogColor, GreyColor, __FILE__, __LINE__, ResetColors, ##__VA_ARGS__)
-    #else
-        #define TVGERR(...) do {} while(0)
-        #define TVGLOG(...) do {} while(0)
-    #endif
+uint16_t THORVG_VERSION_NUMBER();
 
-    template<typename T>
-    static inline T* to(const Paint* p)
-    {
-        return static_cast<T*>(const_cast<Paint*>(p));
-    }
 
-    uint16_t THORVG_VERSION_NUMBER();
+#define P(A) ((A)->pImpl)              //Access to pimpl.
+#define PP(A) (((Paint*)(A))->pImpl)   //Access to pimpl.
 
-    extern int engineInit;
+
+//for debugging
+#if 0
+#include <sys/time.h>
+static inline double THORVG_TIMESTAMP()
+{
+   struct timeval tv;
+   gettimeofday(&tv, NULL);
+   return (tv.tv_sec + tv.tv_usec / 1000000.0);
 }
-
-#include "tvgAllocator.h"
+#endif
 
 #endif //_TVG_COMMON_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgFill.cpp b/engine/thirdparty/thorvg/src/renderer/tvgFill.cpp
index ae0a4d7b..19edff5a 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgFill.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgFill.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,23 +22,98 @@
 
 #include "tvgFill.h"
 
-
 /************************************************************************/
-/* Fill Class Implementation                                            */
+/* Internal Class Implementation                                        */
 /************************************************************************/
 
-Fill::Fill() = default;
-Fill::~Fill() = default;
+Fill* RadialGradient::Impl::duplicate()
+{
+    auto ret = RadialGradient::gen();
+    if (!ret) return nullptr;
+
+    ret->pImpl->cx = cx;
+    ret->pImpl->cy = cy;
+    ret->pImpl->r = r;
+    ret->pImpl->fx = fx;
+    ret->pImpl->fy = fy;
+    ret->pImpl->fr = fr;
+
+    return ret.release();
+}
+
+
+Result RadialGradient::Impl::radial(float cx, float cy, float r, float fx, float fy, float fr)
+{
+    if (r < 0 || fr < 0) return Result::InvalidArguments;
+
+    this->cx = cx;
+    this->cy = cy;
+    this->r = r;
+    this->fx = fx;
+    this->fy = fy;
+    this->fr = fr;
+
+    return Result::Success;
+};
+
+
+Fill* LinearGradient::Impl::duplicate()
+{
+    auto ret = LinearGradient::gen();
+    if (!ret) return nullptr;
+
+    ret->pImpl->x1 = x1;
+    ret->pImpl->y1 = y1;
+    ret->pImpl->x2 = x2;
+    ret->pImpl->y2 = y2;
+
+    return ret.release();
+};
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+Fill::Fill():pImpl(new Impl())
+{
+}
+
+
+Fill::~Fill()
+{
+    delete(pImpl);
+}
+
 
 Result Fill::colorStops(const ColorStop* colorStops, uint32_t cnt) noexcept
 {
-    return pImpl->update(colorStops, cnt);
+    if ((!colorStops && cnt > 0) || (colorStops && cnt == 0)) return Result::InvalidArguments;
+
+    if (cnt == 0) {
+        if (pImpl->colorStops) {
+            free(pImpl->colorStops);
+            pImpl->colorStops = nullptr;
+            pImpl->cnt = 0;
+        }
+        return Result::Success;
+    }
+
+    if (pImpl->cnt != cnt) {
+        pImpl->colorStops = static_cast<ColorStop*>(realloc(pImpl->colorStops, cnt * sizeof(ColorStop)));
+    }
+
+    pImpl->cnt = cnt;
+    memcpy(pImpl->colorStops, colorStops, cnt * sizeof(ColorStop));
+
+    return Result::Success;
 }
 
 
 uint32_t Fill::colorStops(const ColorStop** colorStops) const noexcept
 {
     if (colorStops) *colorStops = pImpl->colorStops;
+
     return pImpl->cnt;
 }
 
@@ -46,6 +121,7 @@ uint32_t Fill::colorStops(const ColorStop** colorStops) const noexcept
 Result Fill::spread(FillSpread s) noexcept
 {
     pImpl->spread = s;
+
     return Result::Success;
 }
 
@@ -58,47 +134,70 @@ FillSpread Fill::spread() const noexcept
 
 Result Fill::transform(const Matrix& m) noexcept
 {
-    pImpl->transform = m;
+    if (!pImpl->transform) {
+        pImpl->transform = static_cast<Matrix*>(malloc(sizeof(Matrix)));
+    }
+    *pImpl->transform = m;
     return Result::Success;
 }
 
 
-Matrix& Fill::transform() const noexcept
+Matrix Fill::transform() const noexcept
 {
-    return pImpl->transform;
+    if (pImpl->transform) return *pImpl->transform;
+    return {1, 0, 0, 0, 1, 0, 0, 0, 1};
 }
 
 
 Fill* Fill::duplicate() const noexcept
 {
-    if (type() == Type::LinearGradient) return CONST_LINEAR(this)->duplicate();
-    else if (type() == Type::RadialGradient) return CONST_RADIAL(this)->duplicate();
-    return nullptr;
+    return pImpl->duplicate();
 }
 
 
-/************************************************************************/
-/* RadialGradient Class Implementation                                  */
-/************************************************************************/
-
-RadialGradient::RadialGradient() = default;
-
-
-Result RadialGradient::radial(float cx, float cy, float r, float fx, float fy, float fr) noexcept
+TVG_DEPRECATED uint32_t Fill::identifier() const noexcept
 {
-    return RADIAL(this)->radial(cx, cy, r, fx, fy, fr);
+    return (uint32_t) type();
 }
 
 
-Result RadialGradient::radial(float* cx, float* cy, float* r, float* fx, float* fy, float* fr) const noexcept
+RadialGradient::RadialGradient():pImpl(new Impl())
 {
-    return CONST_RADIAL(this)->radial(cx, cy, r, fx, fy, fr);
+    Fill::pImpl->method(new FillDup<RadialGradient::Impl>(pImpl));
 }
 
 
-RadialGradient* RadialGradient::gen() noexcept
+RadialGradient::~RadialGradient()
 {
-    return new RadialGradientImpl;
+    delete(pImpl);
+}
+
+
+Result RadialGradient::radial(float cx, float cy, float r) noexcept
+{
+    return pImpl->radial(cx, cy, r, cx, cy, 0.0f);
+}
+
+
+Result RadialGradient::radial(float* cx, float* cy, float* r) const noexcept
+{
+    if (cx) *cx = pImpl->cx;
+    if (cy) *cy = pImpl->cy;
+    if (r) *r = pImpl->r;
+
+    return Result::Success;
+}
+
+
+unique_ptr<RadialGradient> RadialGradient::gen() noexcept
+{
+    return unique_ptr<RadialGradient>(new RadialGradient);
+}
+
+
+TVG_DEPRECATED uint32_t RadialGradient::identifier() noexcept
+{
+    return (uint32_t) Type::RadialGradient;
 }
 
 
@@ -108,28 +207,49 @@ Type RadialGradient::type() const noexcept
 }
 
 
-/************************************************************************/
-/* LinearGradient Class Implementation                                  */
-/************************************************************************/
+LinearGradient::LinearGradient():pImpl(new Impl())
+{
+    Fill::pImpl->method(new FillDup<LinearGradient::Impl>(pImpl));
+}
 
-LinearGradient::LinearGradient() = default;
+
+LinearGradient::~LinearGradient()
+{
+    delete(pImpl);
+}
 
 
 Result LinearGradient::linear(float x1, float y1, float x2, float y2) noexcept
 {
-    return LINEAR(this)->linear(x1, y1, x2, y2);
+    pImpl->x1 = x1;
+    pImpl->y1 = y1;
+    pImpl->x2 = x2;
+    pImpl->y2 = y2;
+
+    return Result::Success;
 }
 
 
 Result LinearGradient::linear(float* x1, float* y1, float* x2, float* y2) const noexcept
 {
-    return CONST_LINEAR(this)->linear(x1, y1, x2, y2);
+    if (x1) *x1 = pImpl->x1;
+    if (x2) *x2 = pImpl->x2;
+    if (y1) *y1 = pImpl->y1;
+    if (y2) *y2 = pImpl->y2;
+
+    return Result::Success;
 }
 
 
-LinearGradient* LinearGradient::gen() noexcept
+unique_ptr<LinearGradient> LinearGradient::gen() noexcept
 {
-    return new LinearGradientImpl;
+    return unique_ptr<LinearGradient>(new LinearGradient);
+}
+
+
+TVG_DEPRECATED uint32_t LinearGradient::identifier() noexcept
+{
+    return (uint32_t) Type::LinearGradient;
 }
 
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgFill.h b/engine/thirdparty/thorvg/src/renderer/tvgFill.h
index ae5bff66..83f2a3a4 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgFill.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgFill.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,175 +23,88 @@
 #ifndef _TVG_FILL_H_
 #define _TVG_FILL_H_
 
+#include <cstdlib>
+#include <cstring>
 #include "tvgCommon.h"
-#include "tvgMath.h"
 
-#define LINEAR(A) static_cast<LinearGradientImpl*>(A)
-#define CONST_LINEAR(A) static_cast<const LinearGradientImpl*>(A)
+template<typename T>
+struct DuplicateMethod
+{
+    virtual ~DuplicateMethod() {}
+    virtual T* duplicate() = 0;
+};
 
-#define RADIAL(A) static_cast<RadialGradientImpl*>(A)
-#define CONST_RADIAL(A) static_cast<const RadialGradientImpl*>(A)
+template<class T>
+struct FillDup : DuplicateMethod<Fill>
+{
+    T* inst = nullptr;
+
+    FillDup(T* _inst) : inst(_inst) {}
+    ~FillDup() {}
+
+    Fill* duplicate() override
+    {
+        return inst->duplicate();
+    }
+};
 
 struct Fill::Impl
 {
     ColorStop* colorStops = nullptr;
-    Matrix transform = tvg::identity();
-    uint16_t cnt = 0;
-    FillSpread spread = FillSpread::Pad;
+    Matrix* transform = nullptr;
+    uint32_t cnt = 0;
+    FillSpread spread;
+    DuplicateMethod<Fill>* dup = nullptr;
 
-    virtual ~Impl()
+    ~Impl()
     {
-        tvg::free(colorStops);
+        delete(dup);
+        free(colorStops);
+        free(transform);
     }
 
-    void copy(const Fill::Impl& dup)
+    void method(DuplicateMethod<Fill>* dup)
     {
-        cnt = dup.cnt;
-        spread = dup.spread;
-        colorStops = tvg::malloc<ColorStop>(sizeof(ColorStop) * dup.cnt);
-        if (dup.cnt > 0) memcpy(colorStops, dup.colorStops, sizeof(ColorStop) * dup.cnt);
-        transform = dup.transform;
+        this->dup = dup;
     }
 
-    Result update(const ColorStop* colorStops, uint32_t cnt)
+    Fill* duplicate()
     {
-        if ((!colorStops && cnt > 0) || (colorStops && cnt == 0)) return Result::InvalidArguments;
+        auto ret = dup->duplicate();
+        if (!ret) return nullptr;
 
-        if (cnt == 0) {
-            if (this->colorStops) {
-                tvg::free(this->colorStops);
-                this->colorStops = nullptr;
-                this->cnt = 0;
-            }
-            return Result::Success;
+        ret->pImpl->cnt = cnt;
+        ret->pImpl->spread = spread;
+        ret->pImpl->colorStops = static_cast<ColorStop*>(malloc(sizeof(ColorStop) * cnt));
+        if (cnt > 0) memcpy(ret->pImpl->colorStops, colorStops, sizeof(ColorStop) * cnt);
+        if (transform) {
+            ret->pImpl->transform = static_cast<Matrix*>(malloc(sizeof(Matrix)));
+            *ret->pImpl->transform = *transform;
         }
-
-        if (cnt != this->cnt) {
-            this->colorStops = tvg::realloc<ColorStop>(this->colorStops, cnt * sizeof(ColorStop));
-        }
-
-        this->cnt = cnt;
-        memcpy(this->colorStops, colorStops, cnt * sizeof(ColorStop));
-
-        return Result::Success;
+        return ret;
     }
 };
 
 
-struct RadialGradientImpl : RadialGradient
+struct RadialGradient::Impl
 {
-    Fill::Impl impl;
-    Point center{}, focal{};
+    float cx = 0.0f, cy = 0.0f;
+    float fx = 0.0f, fy = 0.0f;
     float r = 0.0f, fr = 0.0f;
 
-    RadialGradientImpl()
-    {
-        Fill::pImpl = &impl;
-    }
-
-    Fill* duplicate() const
-    {
-        auto ret = RadialGradient::gen();
-        RADIAL(ret)->impl.copy(this->impl);
-        RADIAL(ret)->center = center;
-        RADIAL(ret)->r = r;
-        RADIAL(ret)->focal = focal;
-        RADIAL(ret)->fr = fr;
-
-        return ret;
-    }
-
-    Result radial(float cx, float cy, float r, float fx, float fy, float fr)
-    {
-        if (r < 0 || fr < 0) return Result::InvalidArguments;
-
-        this->center = {cx, cy};
-        this->r = r;
-        this->focal = {fx, fy};
-        this->fr = fr;
-
-        return Result::Success;
-    }
-
-    Result radial(float* cx, float* cy, float* r, float* fx, float* fy, float* fr) const
-    {
-        if (cx) *cx = center.x;
-        if (cy) *cy = center.y;
-        if (r) *r = this->r;
-        if (fx) *fx = focal.x;
-        if (fy) *fy = focal.y;
-        if (fr) *fr = this->fr;
-
-        return Result::Success;
-    }
-
-    //TODO: remove this logic once SVG 2.0 is adopted by sw and wg engines (gl already supports it); lottie-specific handling will then be delegated entirely to the loader
-    //clamp focal point and shrink start circle if needed to avoid invalid gradient setup
-    bool correct(float& fx, float& fy, float& fr) const
-    {
-        constexpr float PRECISION = 0.02f;
-        if (r < PRECISION) return false;  // too small, treated as solid fill
-
-        auto dist = tvg::length(center, focal);
-
-        // clamp focal point to inside end circle if outside
-        if (this->r - dist <  PRECISION) {
-            auto diff = center - focal;
-            if (dist < PRECISION) dist = diff.x = PRECISION;
-            auto scale = this->r * (1.0f - PRECISION) / dist;
-            diff *= scale;
-            dist *= scale;  // update effective dist after scaling
-            fx = center.x - diff.x;
-            fy = center.y - diff.y;
-        } else {
-            fx = focal.x;
-            fy = focal.y;
-        }
-        // ensure start circle radius fr doesn't exceed the difference
-        auto maxFr = (r - dist) * (1.0f - PRECISION);
-        fr = (this->fr > maxFr) ? std::max(0.0f, maxFr) : this->fr;
-        return true;
-    }
+    Fill* duplicate();
+    Result radial(float cx, float cy, float r, float fx, float fy, float fr);
 };
 
 
-struct LinearGradientImpl :  LinearGradient
+struct LinearGradient::Impl
 {
-    Fill::Impl impl;
-    Point p1{}, p2{};
+    float x1 = 0.0f;
+    float y1 = 0.0f;
+    float x2 = 0.0f;
+    float y2 = 0.0f;
 
-    LinearGradientImpl()
-    {
-        Fill::pImpl = &impl;
-    }
-
-    Fill* duplicate() const
-    {
-        auto ret = LinearGradient::gen();
-        LINEAR(ret)->impl.copy(this->impl);
-        LINEAR(ret)->p1 = p1;
-        LINEAR(ret)->p2 = p2;
-
-        return ret;
-    }
-
-    Result linear(float x1, float y1, float x2, float y2) noexcept
-    {
-        p1 = {x1, y1};
-        p2 = {x2, y2};
-
-        return Result::Success;
-    }
-
-    Result linear(float* x1, float* y1, float* x2, float* y2) const noexcept
-    {
-        if (x1) *x1 = p1.x;
-        if (x2) *x2 = p2.x;
-        if (y1) *y1 = p1.y;
-        if (y2) *y2 = p2.y;
-
-        return Result::Success;
-    }
+    Fill* duplicate();
 };
 
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgFrameModule.h b/engine/thirdparty/thorvg/src/renderer/tvgFrameModule.h
index b2acfe16..37d01e05 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgFrameModule.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgFrameModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@ class FrameModule: public ImageLoader
 {
 public:
     float segmentBegin = 0.0f;
-    float segmentEnd;             //Initialize the value with the total frame number
+    float segmentEnd = 1.0f;
 
     FrameModule(FileType type) : ImageLoader(type) {}
     virtual ~FrameModule() {}
@@ -41,7 +41,6 @@ public:
     virtual float totalFrame() = 0;         //return the total frame count
     virtual float curFrame() = 0;           //return the current frame number
     virtual float duration() = 0;           //return the animation duration in seconds
-    virtual Result segment(float begin, float end) = 0;
 
     void segment(float* begin, float* end)
     {
@@ -49,6 +48,12 @@ public:
         if (end) *end = segmentEnd;
     }
 
+    void segment(float begin, float end)
+    {
+        segmentBegin = begin;
+        segmentEnd = end;
+    }
+
     virtual bool animatable() override { return true; }
 };
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp b/engine/thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp
new file mode 100644
index 00000000..24e2fb8b
--- /dev/null
+++ b/engine/thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "tvgCanvas.h"
+
+#ifdef THORVG_GL_RASTER_SUPPORT
+    #include "tvgGlRenderer.h"
+#else
+    class GlRenderer : public RenderMethod
+    {
+        //Non Supported. Dummy Class */
+    };
+#endif
+
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+struct GlCanvas::Impl
+{
+};
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+#ifdef THORVG_GL_RASTER_SUPPORT
+GlCanvas::GlCanvas() : Canvas(GlRenderer::gen()), pImpl(nullptr)
+#else
+GlCanvas::GlCanvas() : Canvas(nullptr), pImpl(nullptr)
+#endif
+{
+}
+
+
+GlCanvas::~GlCanvas()
+{
+    delete(pImpl);
+}
+
+
+Result GlCanvas::target(int32_t id, uint32_t w, uint32_t h) noexcept
+{
+#ifdef THORVG_GL_RASTER_SUPPORT
+    if (Canvas::pImpl->status != Status::Damaged && Canvas::pImpl->status != Status::Synced) {
+        return Result::InsufficientCondition;
+    }
+
+    //We know renderer type, avoid dynamic_cast for performance.
+    auto renderer = static_cast<GlRenderer*>(Canvas::pImpl->renderer);
+    if (!renderer) return Result::MemoryCorruption;
+
+    if (!renderer->target(id, w, h)) return Result::Unknown;
+    Canvas::pImpl->vport = {0, 0, (int32_t)w, (int32_t)h};
+    renderer->viewport(Canvas::pImpl->vport);
+
+    //Paints must be updated again with this new target.
+    Canvas::pImpl->status = Status::Damaged;
+
+    return Result::Success;
+#endif
+    return Result::NonSupport;
+}
+
+
+unique_ptr<GlCanvas> GlCanvas::gen() noexcept
+{
+#ifdef THORVG_GL_RASTER_SUPPORT
+    if (GlRenderer::init() <= 0) return nullptr;
+    return unique_ptr<GlCanvas>(new GlCanvas);
+#endif
+    return nullptr;
+}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgInitializer.cpp b/engine/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
index 6c777788..c57b2077 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgInitializer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,10 @@
 #include "tvgTaskScheduler.h"
 #include "tvgLoader.h"
 
+#ifdef _WIN32
+    #include <cstring>
+#endif
+
 #ifdef THORVG_SW_RASTER_SUPPORT
     #include "tvgSwRenderer.h"
 #endif
@@ -41,12 +45,14 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-namespace tvg {
-    int engineInit = 0;
-}
-
+static int _initCnt = 0;
 static uint16_t _version = 0;
 
+//enum class operation helper
+static constexpr bool operator &(CanvasEngine a, CanvasEngine b)
+{
+    return int(a) & int(b);
+}
 
 static bool _buildVersionInfo(uint32_t* major, uint32_t* minor, uint32_t* micro)
 {
@@ -80,9 +86,35 @@ static bool _buildVersionInfo(uint32_t* major, uint32_t* minor, uint32_t* micro)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-Result Initializer::init(uint32_t threads) noexcept
+Result Initializer::init(CanvasEngine engine, uint32_t threads) noexcept
 {
-    if (engineInit++ > 0) return Result::Success;
+    auto nonSupport = true;
+    if (static_cast<int>(engine) == 0) return Result::InvalidArguments;
+
+    if (engine & CanvasEngine::Sw) {
+        #ifdef THORVG_SW_RASTER_SUPPORT
+            if (!SwRenderer::init(threads)) return Result::FailedAllocation;
+            nonSupport = false;
+        #endif
+    }
+
+    if (engine & CanvasEngine::Gl) {
+        #ifdef THORVG_GL_RASTER_SUPPORT
+            if (!GlRenderer::init(threads)) return Result::FailedAllocation;
+            nonSupport = false;
+        #endif
+    }
+
+    if (engine & CanvasEngine::Wg) {
+        #ifdef THORVG_WG_RASTER_SUPPORT
+            if (!WgRenderer::init(threads)) return Result::FailedAllocation;
+            nonSupport = false;
+        #endif
+    }
+
+    if (nonSupport) return Result::NonSupport;
+
+    if (_initCnt++ > 0) return Result::Success;
 
     if (!_buildVersionInfo(nullptr, nullptr, nullptr)) return Result::Unknown;
 
@@ -94,23 +126,37 @@ Result Initializer::init(uint32_t threads) noexcept
 }
 
 
-Result Initializer::term() noexcept
+Result Initializer::term(CanvasEngine engine) noexcept
 {
-    if (engineInit == 0) return Result::InsufficientCondition;
+    if (_initCnt == 0) return Result::InsufficientCondition;
 
-    if (--engineInit > 0) return Result::Success;
+    auto nonSupport = true;
+    if (static_cast<int>(engine) == 0) return Result::InvalidArguments;
 
-    #ifdef THORVG_SW_RASTER_SUPPORT
-        if (!SwRenderer::term()) return Result::InsufficientCondition;
-    #endif
+    if (engine & CanvasEngine::Sw) {
+        #ifdef THORVG_SW_RASTER_SUPPORT
+            if (!SwRenderer::term()) return Result::InsufficientCondition;
+            nonSupport = false;
+        #endif
+    }
 
-    #ifdef THORVG_GL_RASTER_SUPPORT
-        if (!GlRenderer::term()) return Result::InsufficientCondition;
-    #endif
+    if (engine & CanvasEngine::Gl) {
+        #ifdef THORVG_GL_RASTER_SUPPORT
+            if (!GlRenderer::term()) return Result::InsufficientCondition;
+            nonSupport = false;
+        #endif
+    }
 
-    #ifdef THORVG_WG_RASTER_SUPPORT
-        if (!WgRenderer::term()) return Result::InsufficientCondition;
-    #endif
+    if (engine & CanvasEngine::Wg) {
+        #ifdef THORVG_WG_RASTER_SUPPORT
+            if (!WgRenderer::term()) return Result::InsufficientCondition;
+            nonSupport = false;
+        #endif
+    }
+
+    if (nonSupport) return Result::NonSupport;
+
+    if (--_initCnt > 0) return Result::Success;
 
     TaskScheduler::term();
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h b/engine/thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h
index 01b4fa9c..46e900a5 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ public:
     //Utility Method: Iterator Accessor
     static Iterator* iterator(const Paint* paint)
     {
-        return PAINT(paint)->iterator();
+        return paint->pImpl->iterator();
     }
 };
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h b/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
index d9fe2783..4d2fa1aa 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,49 +29,29 @@
 #include "tvgInlist.h"
 
 
-struct AssetResolver
-{
-    std::function<bool(Paint* paint, const char* src, void* data)> func;
-    void* data;
-};
-
-
-namespace tvg
-{
-
 struct LoadModule
 {
     INLIST_ITEM(LoadModule);
 
     //Use either hashkey(data) or hashpath(path)
-    uintptr_t hashkey = 0;
-    char* hashpath = nullptr;
+    union {
+        uintptr_t hashkey;
+        char* hashpath = nullptr;
+    };
 
     FileType type;                                  //current loader file type
     atomic<uint16_t> sharing{};                     //reference count
     bool readied = false;                           //read done already.
-    bool cached = false;                            //cached for sharing
+    bool pathcache = false;                         //cached by path
 
     LoadModule(FileType type) : type(type) {}
     virtual ~LoadModule()
     {
-        tvg::free(hashpath);
+        if (pathcache) free(hashpath);
     }
 
-    void cache(uintptr_t data)
-    {
-        hashkey = data;
-        cached = true;
-    }
-
-    void cache(char* data)
-    {
-        hashpath = data;
-        cached = true;
-    }
-
-    virtual bool open(const char* path) { return false; }
-    virtual bool open(const char* data, uint32_t size, const char* rpath, bool copy) { return false; }
+    virtual bool open(const string& path) { return false; }
+    virtual bool open(const char* data, uint32_t size, bool copy) { return false; }
     virtual bool resize(Paint* paint, float w, float h) { return false; }
     virtual void sync() {};  //finish immediately if any async update jobs.
 
@@ -82,38 +62,18 @@ struct LoadModule
         return true;
     }
 
+    bool cached()
+    {
+        if (hashkey) return true;
+        return false;
+    }
+
     virtual bool close()
     {
         if (sharing == 0) return true;
         --sharing;
         return false;
     }
-
-    char* open(const char* path, uint32_t& size, bool text = false)
-    {
-#ifdef THORVG_FILE_IO_SUPPORT
-        auto f = fopen(path, text ? "r" : "rb");
-        if (!f) return nullptr;
-
-        fseek(f, 0, SEEK_END);
-
-        size = ftell(f);
-        if (size == 0) {
-            fclose(f);
-            return nullptr;
-        }
-
-        auto content = tvg::malloc<char>(sizeof(char) * (text ? size + 1 : size));
-        fseek(f, 0, SEEK_SET);
-        size = fread(content, sizeof(char), size, f);
-        if (text) content[size] = '\0';
-
-        fclose(f);
-
-        return content;
-#endif
-        return nullptr;
-    }
 };
 
 
@@ -128,7 +88,6 @@ struct ImageLoader : LoadModule
 
     virtual bool animatable() { return false; }  //true if this loader supports animation.
     virtual Paint* paint() { return nullptr; }
-    virtual void set(const AssetResolver* resolver) {}
 
     virtual RenderSurface* bitmap()
     {
@@ -140,40 +99,19 @@ struct ImageLoader : LoadModule
 
 struct FontMetrics
 {
-    Point size;  //text width, height
-    float scale;
-    Point align{}, box{}, spacing{1.0f, 1.0f};
-    float fontSize = 0.0f;
-    uint32_t lines = 1;      //line count
-    TextWrap wrap = TextWrap::None;
-
-    void *engine = nullptr;  //engine extension
-
-    ~FontMetrics()
-    {
-        tvg::free(engine);
-    }
+    //TODO: add necessary metrics
+    float minw;
 };
 
 
 struct FontLoader : LoadModule
 {
-    static constexpr const float DPI = 96.0f / 72.0f;   //dpi base?
-
-    char* name = nullptr;
-
     FontLoader(FileType type) : LoadModule(type) {}
 
     using LoadModule::read;
 
-    virtual bool get(FontMetrics& fm, char* text, uint32_t len, RenderPath& out) = 0;
-    virtual void transform(Paint* paint, FontMetrics& fm, float italicShear) = 0;
-    virtual void release(FontMetrics& fm) = 0;
-    virtual void metrics(const FontMetrics& fm, TextMetrics& out) = 0;
-    virtual bool metrics(const FontMetrics& fm, const char* ch, GlyphMetrics& out) = 0;
-    virtual void copy(const FontMetrics& in, FontMetrics& out) = 0;
+    virtual bool read(Shape* shape, char* text, FontMetrics& out) = 0;
+    virtual float transform(Paint* paint, FontMetrics& mertrics, float fontSize, bool italic) = 0;
 };
 
-}
-
 #endif //_TVG_LOAD_MODULE_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp b/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
index 537990c4..7de6286c 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +20,10 @@
  * SOFTWARE.
  */
 
+#include <string.h>
+
 #include <atomic>
 #include "tvgInlist.h"
-#include "tvgStr.h"
 #include "tvgLoader.h"
 #include "tvgLock.h"
 
@@ -34,6 +35,10 @@
     #include "tvgPngLoader.h"
 #endif
 
+#ifdef THORVG_TVG_LOADER_SUPPORT
+    #include "tvgTvgLoader.h"
+#endif
+
 #ifdef THORVG_JPG_LOADER_SUPPORT
     #include "tvgJpgLoader.h"
 #endif
@@ -66,10 +71,10 @@ uintptr_t HASH_KEY(const char* data)
 atomic<ColorSpace> ImageLoader::cs{ColorSpace::ARGB8888};
 
 static Key _key;
-static Inlist<tvg::LoadModule> _activeLoaders;
+static Inlist<LoadModule> _activeLoaders;
 
 
-static tvg::LoadModule* _find(FileType type)
+static LoadModule* _find(FileType type)
 {
     switch(type) {
         case FileType::Png: {
@@ -87,6 +92,12 @@ static tvg::LoadModule* _find(FileType type)
         case FileType::Webp: {
 #ifdef THORVG_WEBP_LOADER_SUPPORT
             return new WebpLoader;
+#endif
+            break;
+        }
+        case FileType::Tvg: {
+#ifdef THORVG_TVG_LOADER_SUPPORT
+            return new TvgLoader;
 #endif
             break;
         }
@@ -102,7 +113,7 @@ static tvg::LoadModule* _find(FileType type)
 #endif
             break;
         }
-        case FileType::Lot: {
+        case FileType::Lottie: {
 #ifdef THORVG_LOTTIE_LOADER_SUPPORT
             return new LottieLoader;
 #endif
@@ -120,6 +131,10 @@ static tvg::LoadModule* _find(FileType type)
 #ifdef THORVG_LOG_ENABLED
     const char *format;
     switch(type) {
+        case FileType::Tvg: {
+            format = "TVG";
+            break;
+        }
         case FileType::Svg: {
             format = "SVG";
             break;
@@ -128,8 +143,8 @@ static tvg::LoadModule* _find(FileType type)
             format = "TTF";
             break;
         }
-        case FileType::Lot: {
-            format = "LOT";
+        case FileType::Lottie: {
+            format = "lottie(json)";
             break;
         }
         case FileType::Raw: {
@@ -160,75 +175,78 @@ static tvg::LoadModule* _find(FileType type)
 
 
 #ifdef THORVG_FILE_IO_SUPPORT
-static tvg::LoadModule* _findByPath(const char* filename)
+static LoadModule* _findByPath(const string& path)
 {
-    auto ext = fileext(filename);
-    if (!ext) return nullptr;
-
-    if (!strcmp(ext, "svg")) return _find(FileType::Svg);
-    if (!strcmp(ext, "lot") || !strcmp(ext, "json")) return _find(FileType::Lot);
-    if (!strcmp(ext, "png")) return _find(FileType::Png);
-    if (!strcmp(ext, "jpg")) return _find(FileType::Jpg);
-    if (!strcmp(ext, "webp")) return _find(FileType::Webp);
-    if (!strcmp(ext, "ttf") || !strcmp(ext, "ttc")) return _find(FileType::Ttf);
-    if (!strcmp(ext, "otf") || !strcmp(ext, "otc")) return _find(FileType::Ttf);
+    auto ext = path.substr(path.find_last_of(".") + 1);
+    if (!ext.compare("tvg")) return _find(FileType::Tvg);
+    if (!ext.compare("svg")) return _find(FileType::Svg);
+    if (!ext.compare("json")) return _find(FileType::Lottie);
+    if (!ext.compare("png")) return _find(FileType::Png);
+    if (!ext.compare("jpg")) return _find(FileType::Jpg);
+    if (!ext.compare("webp")) return _find(FileType::Webp);
+    if (!ext.compare("ttf") || !ext.compare("ttc")) return _find(FileType::Ttf);
+    if (!ext.compare("otf") || !ext.compare("otc")) return _find(FileType::Ttf);
     return nullptr;
 }
 #endif
 
 
-static FileType _convert(const char* mimeType)
+static FileType _convert(const string& mimeType)
 {
-    if (!mimeType) return FileType::Unknown;
-
     auto type = FileType::Unknown;
 
-    if (!strcmp(mimeType, "svg") || !strcmp(mimeType, "svg+xml")) type = FileType::Svg;
-    else if (!strcmp(mimeType, "ttf") || !strcmp(mimeType, "otf")) type = FileType::Ttf;
-    else if (!strcmp(mimeType, "lot") || !strcmp(mimeType, "lottie+json")) type = FileType::Lot;
-    else if (!strcmp(mimeType, "raw")) type = FileType::Raw;
-    else if (!strcmp(mimeType, "png")) type = FileType::Png;
-    else if (!strcmp(mimeType, "jpg") || !strcmp(mimeType, "jpeg")) type = FileType::Jpg;
-    else if (!strcmp(mimeType, "webp")) type = FileType::Webp;
-    else TVGLOG("RENDERER", "Given mimetype is unknown = \"%s\".", mimeType);
+    if (mimeType == "tvg") type = FileType::Tvg;
+    else if (mimeType == "svg" || mimeType == "svg+xml") type = FileType::Svg;
+    else if (mimeType == "ttf" || mimeType == "otf") type = FileType::Ttf;
+    else if (mimeType == "lottie") type = FileType::Lottie;
+    else if (mimeType == "raw") type = FileType::Raw;
+    else if (mimeType == "png") type = FileType::Png;
+    else if (mimeType == "jpg" || mimeType == "jpeg") type = FileType::Jpg;
+    else if (mimeType == "webp") type = FileType::Webp;
+    else TVGLOG("RENDERER", "Given mimetype is unknown = \"%s\".", mimeType.c_str());
 
     return type;
 }
 
 
-static tvg::LoadModule* _findByType(const char* mimeType)
+static LoadModule* _findByType(const string& mimeType)
 {
     return _find(_convert(mimeType));
 }
 
 
-static tvg::LoadModule* _findFromCache(const char* filename)
+static LoadModule* _findFromCache(const string& path)
 {
     ScopedLock lock(_key);
-    INLIST_FOREACH(_activeLoaders, loader) {
-        if (loader->cached && loader->hashpath && !strcmp(loader->hashpath, filename)) {
+
+    auto loader = _activeLoaders.head;
+
+    while (loader) {
+        if (loader->pathcache && !strcmp(loader->hashpath, path.c_str())) {
             ++loader->sharing;
             return loader;
         }
+        loader = loader->next;
     }
     return nullptr;
 }
 
 
-static tvg::LoadModule* _findFromCache(const char* data, uint32_t size, const char* mimeType)
+static LoadModule* _findFromCache(const char* data, uint32_t size, const string& mimeType)
 {
     auto type = _convert(mimeType);
     if (type == FileType::Unknown) return nullptr;
 
     auto key = HASH_KEY(data);
-
     ScopedLock lock(_key);
 
-    INLIST_FOREACH(_activeLoaders, loader) {
+    auto loader = _activeLoaders.head;
+    while (loader) {
         if (loader->type == type && loader->hashkey == key) {
             ++loader->sharing;
             return loader;
         }
+        loader = loader->next;
     }
     return nullptr;
 }
@@ -247,12 +265,19 @@ bool LoaderMgr::init()
 
 bool LoaderMgr::term()
 {
+    auto loader = _activeLoaders.head;
+
     //clean up the remained font loaders which is globally used.
-    INLIST_SAFE_FOREACH(_activeLoaders, loader) {
-        if (loader->type != FileType::Ttf) continue;
+    while (loader) {
+        if (loader->type != FileType::Ttf) {
+            loader = loader->next;
+            continue;
+        }
         auto ret = loader->close();
-        _activeLoaders.remove(loader);
-        if (ret) delete(loader);
+        auto tmp = loader;
+        loader = loader->next;
+        _activeLoaders.remove(tmp);
+        if (ret) delete(tmp);
     }
     return true;
 }
@@ -263,7 +288,7 @@ bool LoaderMgr::retrieve(LoadModule* loader)
     if (!loader) return false;
 
     if (loader->close()) {
-        if (loader->cached) {
+        if (loader->cached()) {
             _activeLoaders.remove(loader);
         }
         delete(loader);
@@ -272,24 +297,25 @@ bool LoaderMgr::retrieve(LoadModule* loader)
 }
 
 
-tvg::LoadModule* LoaderMgr::loader(const char* filename, bool* invalid)
+LoadModule* LoaderMgr::loader(const string& path, bool* invalid)
 {
 #ifdef THORVG_FILE_IO_SUPPORT
     *invalid = false;
 
-    //TODO: make lottie sharable.
+    //TODO: svg & lottie is not sharable.
     auto allowCache = true;
-    auto ext = fileext(filename);
-    if (ext && (!strcmp(ext, "json") || !strcmp(ext, "lot"))) allowCache = false;
+    auto ext = path.substr(path.find_last_of(".") + 1);
+    if (!ext.compare("svg") || !ext.compare("json")) allowCache = false;
 
     if (allowCache) {
-        if (auto loader = _findFromCache(filename)) return loader;
+        if (auto loader = _findFromCache(path)) return loader;
     }
 
-    if (auto loader = _findByPath(filename)) {
-        if (loader->open(filename)) {
+    if (auto loader = _findByPath(path)) {
+        if (loader->open(path)) {
             if (allowCache) {
-                loader->cache(duplicate(filename));
+                loader->hashpath = strdup(path.c_str());
+                loader->pathcache = true;
                 {
                     ScopedLock lock(_key);
                     _activeLoaders.back(loader);
@@ -302,9 +328,10 @@ tvg::LoadModule* LoaderMgr::loader(const char* filename, bool* invalid)
     //Unknown MimeType. Try with the candidates in the order
     for (int i = 0; i < static_cast<int>(FileType::Raw); i++) {
         if (auto loader = _find(static_cast<FileType>(i))) {
-            if (loader->open(filename)) {
+            if (loader->open(path)) {
                 if (allowCache) {
-                    loader->cache(duplicate(filename));
+                    loader->hashpath = strdup(path.c_str());
+                    loader->pathcache = true;
                     {
                         ScopedLock lock(_key);
                         _activeLoaders.back(loader);
@@ -321,22 +348,37 @@ tvg::LoadModule* LoaderMgr::loader(const char* filename, bool* invalid)
 }
 
 
-bool LoaderMgr::retrieve(const char* filename)
+bool LoaderMgr::retrieve(const string& path)
 {
-    return retrieve(_findFromCache(filename));
+    return retrieve(_findFromCache(path));
 }
 
 
-tvg::LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const char* mimeType, const char* rpath, bool copy)
+LoadModule* LoaderMgr::loader(const char* key)
+{
+    auto loader = _activeLoaders.head;
+
+    while (loader) {
+        if (loader->pathcache && strstr(loader->hashpath, key)) {
+            ++loader->sharing;
+            return loader;
+        }
+        loader = loader->next;
+    }
+    return nullptr;
+}
+
+
+LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const string& mimeType, bool copy)
 {
     //Note that users could use the same data pointer with the different content.
     //Thus caching is only valid for shareable.
     auto allowCache = !copy;
 
-    //TODO: make lottie shareable.
+    //TODO: lottie is not sharable.
     if (allowCache) {
         auto type = _convert(mimeType);
-        if (type == FileType::Lot) allowCache = false;
+        if (type == FileType::Lottie) allowCache = false;
     }
 
     if (allowCache) {
@@ -344,17 +386,17 @@ tvg::LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const char*
     }
 
     //Try with the given MimeType
-    if (mimeType) {
+    if (!mimeType.empty()) {
         if (auto loader = _findByType(mimeType)) {
-            if (loader->open(data, size, rpath, copy)) {
+            if (loader->open(data, size, copy)) {
                 if (allowCache) {
-                    loader->cache(HASH_KEY(data));
+                    loader->hashkey = HASH_KEY(data);
                     ScopedLock lock(_key);
                     _activeLoaders.back(loader);
                 }
                 return loader;
             } else {
-                TVGLOG("LOADER", "Given mimetype \"%s\" seems incorrect or not supported.", mimeType);
+                TVGLOG("LOADER", "Given mimetype \"%s\" seems incorrect or not supported.", mimeType.c_str());
                 delete(loader);
             }
         }
@@ -363,9 +405,9 @@ tvg::LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const char*
     for (int i = 0; i < static_cast<int>(FileType::Raw); i++) {
         auto loader = _find(static_cast<FileType>(i));
         if (loader) {
-            if (loader->open(data, size, rpath, copy)) {
+            if (loader->open(data, size, copy)) {
                 if (allowCache) {
-                    loader->cache(HASH_KEY(data));
+                    loader->hashkey = HASH_KEY(data);
                     ScopedLock lock(_key);
                     _activeLoaders.back(loader);
                 }
@@ -378,7 +420,7 @@ tvg::LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const char*
 }
 
 
-tvg::LoadModule* LoaderMgr::loader(const uint32_t *data, uint32_t w, uint32_t h, ColorSpace cs, bool copy)
+LoadModule* LoaderMgr::loader(const uint32_t *data, uint32_t w, uint32_t h, bool copy)
 {
     //Note that users could use the same data pointer with the different content.
     //Thus caching is only valid for shareable.
@@ -389,9 +431,9 @@ tvg::LoadModule* LoaderMgr::loader(const uint32_t *data, uint32_t w, uint32_t h,
 
     //function is dedicated for raw images only
     auto loader = new RawLoader;
-    if (loader->open(data, w, h, cs, copy)) {
+    if (loader->open(data, w, h, copy)) {
         if (!copy) {
-            loader->cache(HASH_KEY((const char*)data));
+            loader->hashkey = HASH_KEY((const char*)data);
             ScopedLock lock(_key);
             _activeLoaders.back(loader);
         }
@@ -403,17 +445,17 @@ tvg::LoadModule* LoaderMgr::loader(const uint32_t *data, uint32_t w, uint32_t h,
 
 
 //loads fonts from memory - loader is cached (regardless of copy value) in order to access it while setting font
-tvg::LoadModule* LoaderMgr::loader(const char* name, const char* data, uint32_t size, TVG_UNUSED const char* mimeType, bool copy)
+LoadModule* LoaderMgr::loader(const char* name, const char* data, uint32_t size, TVG_UNUSED const string& mimeType, bool copy)
 {
 #ifdef THORVG_TTF_LOADER_SUPPORT
     //TODO: add check for mimetype ?
-    if (auto loader = font(name)) return loader;
+    if (auto loader = _findFromCache(name)) return loader;
 
     //function is dedicated for ttf loader (the only supported font loader)
     auto loader = new TtfLoader;
-    if (loader->open(data, size, "", copy)) {
-        loader->name = duplicate(name);
-        loader->cached = true;  //force it.
+    if (loader->open(data, size, copy)) {
+        loader->hashpath = strdup(name);
+        loader->pathcache = true;
         ScopedLock lock(_key);
         _activeLoaders.back(loader);
         return loader;
@@ -424,30 +466,3 @@ tvg::LoadModule* LoaderMgr::loader(const char* name, const char* data, uint32_t
 #endif
     return nullptr;
 }
-
-
-tvg::LoadModule* LoaderMgr::font(const char* name)
-{
-    ScopedLock lock(_key);
-    INLIST_FOREACH(_activeLoaders, loader) {
-        if (loader->type != FileType::Ttf) continue;
-        if (loader->cached && tvg::equal(name, static_cast<FontLoader*>(loader)->name)) {
-            ++loader->sharing;
-            return loader;
-        }
-    }
-    return nullptr;
-}
-
-
-tvg::LoadModule* LoaderMgr::anyfont()
-{
-    ScopedLock lock(_key);
-    INLIST_FOREACH(_activeLoaders, loader) {
-        if (loader->cached && loader->type == FileType::Ttf) {
-            ++loader->sharing;
-            return loader;
-        }
-    }
-    return nullptr;
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgLoader.h b/engine/thirdparty/thorvg/src/renderer/tvgLoader.h
index 5b345e21..74c4f439 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgLoader.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +25,17 @@
 
 #include "tvgLoadModule.h"
 
-namespace tvg
-{
-
 struct LoaderMgr
 {
     static bool init();
     static bool term();
-    static LoadModule* loader(const char* filename, bool* invalid);
-    static LoadModule* loader(const char* data, uint32_t size, const char* mimeType, const char* rpath, bool copy);
-    static LoadModule* loader(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy);
-    static LoadModule* loader(const char* name, const char* data, uint32_t size, const char* mimeType, bool copy);
-    static LoadModule* font(const char* name);
-    static LoadModule* anyfont();
-    static bool retrieve(const char* filename);
+    static LoadModule* loader(const string& path, bool* invalid);
+    static LoadModule* loader(const char* data, uint32_t size, const string& mimeType, bool copy);
+    static LoadModule* loader(const uint32_t* data, uint32_t w, uint32_t h, bool copy);
+    static LoadModule* loader(const char* name, const char* data, uint32_t size, const string& mimeType, bool copy);
+    static LoadModule* loader(const char* key);
+    static bool retrieve(const string& path);
     static bool retrieve(LoadModule* loader);
 };
 
-}
-
 #endif //_TVG_LOADER_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgPaint.cpp b/engine/thirdparty/thorvg/src/renderer/tvgPaint.cpp
index 14dad43e..ba7ea606 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgPaint.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgPaint.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,10 +33,10 @@
 
 #define PAINT_METHOD(ret, METHOD) \
     switch (paint->type()) { \
-        case Type::Shape: ret = to<ShapeImpl>(paint)->METHOD; break; \
-        case Type::Scene: ret = to<SceneImpl>(paint)->METHOD; break; \
-        case Type::Picture: ret = to<PictureImpl>(paint)->METHOD; break; \
-        case Type::Text: ret = to<TextImpl>(paint)->METHOD; break; \
+        case Type::Shape: ret = P((Shape*)paint)->METHOD; break; \
+        case Type::Scene: ret = P((Scene*)paint)->METHOD; break; \
+        case Type::Picture: ret = P((Picture*)paint)->METHOD; break; \
+        case Type::Text: ret = P((Text*)paint)->METHOD; break; \
         default: ret = {}; \
     }
 
@@ -60,10 +60,10 @@ static bool _clipRect(RenderMethod* renderer, const Point* pts, const Matrix& m,
         return ((b1 == b2) && (b2 == b3) && (b3 == b4));
     };
 
-    if (!pointInConvexQuad({float(before.min.x), float(before.min.y)}, c)) return false;
-    if (!pointInConvexQuad({float(before.max.x), float(before.min.y)}, c)) return false;
-    if (!pointInConvexQuad({float(before.max.x), float(before.max.y)}, c)) return false;
-    if (!pointInConvexQuad({float(before.min.x), float(before.max.y)}, c)) return false;
+    if (!pointInConvexQuad({float(before.x), float(before.y)}, c)) return false;
+    if (!pointInConvexQuad({float(before.x + before.w), float(before.y)}, c)) return false;
+    if (!pointInConvexQuad({float(before.x + before.w), float(before.y + before.h)}, c)) return false;
+    if (!pointInConvexQuad({float(before.x), float(before.y + before.h)}, c)) return false;
 
     //same viewport
     return true;
@@ -76,12 +76,11 @@ static bool _compFastTrack(RenderMethod* renderer, Paint* cmpTarget, const Matri
     auto shape = static_cast<Shape*>(cmpTarget);
 
     //Trimming likely makes the shape non-rectangular
-    if (to<ShapeImpl>(shape)->rs.trimpath()) return false;
+    if (P(shape)->rs.strokeTrim()) return false;
 
     //Rectangle Candidates?
     const Point* pts;
-    uint32_t ptsCnt;
-    shape->path(nullptr, nullptr, &pts, &ptsCnt);
+    auto ptsCnt = shape->pathCoords(&pts);
 
     //No rectangle format
     if (ptsCnt != 4) return false;
@@ -110,13 +109,13 @@ static bool _compFastTrack(RenderMethod* renderer, Paint* cmpTarget, const Matri
             if (v1.x > v2.x) std::swap(v1.x, v2.x);
             if (v1.y > v2.y) std::swap(v1.y, v2.y);
 
-            after.min.x = static_cast<int32_t>(nearbyint(v1.x));
-            after.min.y = static_cast<int32_t>(nearbyint(v1.y));
-            after.max.x = static_cast<int32_t>(nearbyint(v2.x));
-            after.max.y = static_cast<int32_t>(nearbyint(v2.y));
+            after.x = static_cast<int32_t>(nearbyint(v1.x));
+            after.y = static_cast<int32_t>(nearbyint(v1.y));
+            after.w = static_cast<int32_t>(nearbyint(v2.x)) - after.x;
+            after.h = static_cast<int32_t>(nearbyint(v2.y)) - after.y;
 
-            if (after.max.x < after.min.x) after.max.x = after.min.x;
-            if (after.max.y < after.min.y) after.max.y = after.min.y;
+            if (after.w < 0) after.w = 0;
+            if (after.h < 0) after.h = 0;
 
             after.intersect(before);
             renderer->viewport(after);
@@ -127,10 +126,10 @@ static bool _compFastTrack(RenderMethod* renderer, Paint* cmpTarget, const Matri
 }
 
 
-RenderRegion Paint::Impl::bounds()
+RenderRegion Paint::Impl::bounds(RenderMethod* renderer) const
 {
     RenderRegion ret;
-    PAINT_METHOD(ret, bounds());
+    PAINT_METHOD(ret, bounds(renderer));
     return ret;
 }
 
@@ -145,50 +144,83 @@ Iterator* Paint::Impl::iterator()
 
 Paint* Paint::Impl::duplicate(Paint* ret)
 {
-    if (ret) ret->mask(nullptr, MaskMethod::None);
+    if (ret) ret->composite(nullptr, CompositeMethod::None);
 
     PAINT_METHOD(ret, duplicate(ret));
 
-    if (maskData) ret->mask(maskData->target->duplicate(), maskData->method);
-    if (clipper) ret->clip(static_cast<Shape*>(clipper->duplicate()));
-
+    //duplicate Transform
     ret->pImpl->tr = tr;
-    ret->pImpl->blendMethod = blendMethod;
+    ret->pImpl->renderFlag |= RenderUpdateFlag::Transform;
+
     ret->pImpl->opacity = opacity;
-    ret->pImpl->hidden = hidden;
-    ret->pImpl->mark(RenderUpdateFlag::All);
+
+    if (compData) ret->pImpl->composite(ret, compData->target->duplicate(), compData->method);
+    if (clipper) ret->pImpl->clip(clipper->duplicate());
 
     return ret;
 }
 
 
-bool Paint::Impl::render(RenderMethod* renderer, CompositionFlag flag)
+bool Paint::Impl::rotate(float degree)
 {
-    if (hidden || opacity == 0) return true;
+    if (tr.overriding) return false;
+    if (tvg::equal(degree, tr.degree)) return true;
+    tr.degree = degree;
+    renderFlag |= RenderUpdateFlag::Transform;
+
+    return true;
+}
+
+
+bool Paint::Impl::scale(float factor)
+{
+    if (tr.overriding) return false;
+    if (tvg::equal(factor, tr.scale)) return true;
+    tr.scale = factor;
+    renderFlag |= RenderUpdateFlag::Transform;
+
+    return true;
+}
+
+
+bool Paint::Impl::translate(float x, float y)
+{
+    if (tr.overriding) return false;
+    if (tvg::equal(x, tr.m.e13) && tvg::equal(y, tr.m.e23)) return true;
+    tr.m.e13 = x;
+    tr.m.e23 = y;
+    renderFlag |= RenderUpdateFlag::Transform;
+
+    return true;
+}
+
+
+bool Paint::Impl::render(RenderMethod* renderer)
+{
+    if (opacity == 0) return true;
 
     RenderCompositor* cmp = nullptr;
 
-    //OPTIMIZE: bounds(renderer) calls could dismiss the parallelization
-    if (maskData && !(maskData->target->pImpl->ctxFlag & ContextFlag::FastTrack)) {
+    if (compData && !(compData->target->pImpl->ctxFlag & ContextFlag::FastTrack)) {
         RenderRegion region;
-        PAINT_METHOD(region, bounds());
+        PAINT_METHOD(region, bounds(renderer));
 
-        auto mData = maskData;
-        while (mData) {
-            if (MASK_REGION_MERGING(mData->method)) region.add(PAINT(mData->target)->bounds());
-            if (region.invalid()) return true;
-            mData = PAINT(mData->target)->maskData;
+        auto cData = compData;
+        while (cData) {
+            if (MASK_REGION_MERGING(cData->method)) region.add(P(cData->target)->bounds(renderer));
+            if (region.w == 0 || region.h == 0) return true;
+            cData = P(cData->target)->compData;
         }
-        cmp = renderer->target(region, MASK_TO_COLORSPACE(renderer, maskData->method), CompositionFlag::Masking);
-        if (renderer->beginComposite(cmp, MaskMethod::None, 255)) {
-            maskData->target->pImpl->render(renderer);
+        cmp = renderer->target(region, COMPOSITE_TO_COLORSPACE(renderer, compData->method), CompositionFlag::Masking);
+        if (renderer->beginComposite(cmp, CompositeMethod::None, 255)) {
+            compData->target->pImpl->render(renderer);
         }
     }
 
-    if (cmp) renderer->beginComposite(cmp, maskData->method, maskData->target->pImpl->opacity);
+    if (cmp) renderer->beginComposite(cmp, compData->method, compData->target->pImpl->opacity);
 
     bool ret;
-    PAINT_METHOD(ret, render(renderer, flag));
+    PAINT_METHOD(ret, render(renderer));
 
     if (cmp) renderer->endComposite(cmp);
 
@@ -196,15 +228,8 @@ bool Paint::Impl::render(RenderMethod* renderer, CompositionFlag flag)
 }
 
 
-RenderData Paint::Impl::update(RenderMethod* renderer, const Matrix& pm, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, bool clipper)
+RenderData Paint::Impl::update(RenderMethod* renderer, const Matrix& pm, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper)
 {
-    bool ret;
-    PAINT_METHOD(ret, skip((flag | renderFlag)));
-
-    if (ret) return rd;
-
-    cmpFlag = CompositionFlag::Invalid;  //must clear after the rendering
-
     if (this->renderer != renderer) {
         if (this->renderer) TVGERR("RENDERER", "paint's renderer has been changed!");
         renderer->ref();
@@ -218,77 +243,137 @@ RenderData Paint::Impl::update(RenderMethod* renderer, const Matrix& pm, Array<R
     RenderRegion viewport;
     auto compFastTrack = false;
 
-    if (maskData) {
-        auto target = maskData->target;
-        auto method = maskData->method;
-        PAINT(target)->ctxFlag &= ~ContextFlag::FastTrack;   //reset
+    if (compData) {
+        auto target = compData->target;
+        auto method = compData->method;
+        P(target)->ctxFlag &= ~ContextFlag::FastTrack;   //reset
 
-        /* If the transformation has no rotational factors and the Alpha(InvAlpha) Masking involves a simple rectangle,
-           we can optimize by using the viewport instead of the regular Alphaing sequence for improved performance. */
+        /* If the transformation has no rotational factors and the Alpha(InvAlpha)Masking involves a simple rectangle,
+           we can optimize by using the viewport instead of the regular AlphaMasking sequence for improved performance. */
         if (target->type() == Type::Shape) {
             auto shape = static_cast<Shape*>(target);
             uint8_t a;
-            shape->fill(nullptr, nullptr, nullptr, &a);
-            //no gradient fill & no maskings of the masking target.
-            if (!shape->fill() && !(PAINT(shape)->maskData)) {
-                if ((method == MaskMethod::Alpha && a == 255 && PAINT(shape)->opacity == 255) || (method == MaskMethod::InvAlpha && (a == 0 || PAINT(shape)->opacity == 0))) {
+            shape->fillColor(nullptr, nullptr, nullptr, &a);
+            //no gradient fill & no compositions of the composition target.
+            if (!shape->fill() && !(PP(shape)->compData)) {
+                if ((method == CompositeMethod::AlphaMask && a == 255 && PP(shape)->opacity == 255) || (method == CompositeMethod::InvAlphaMask && (a == 0 || PP(shape)->opacity == 0))) {
                     viewport = renderer->viewport();
                     if ((compFastTrack = _compFastTrack(renderer, target, pm, viewport))) {
-                        PAINT(target)->ctxFlag |= ContextFlag::FastTrack;
+                         P(target)->ctxFlag |= ContextFlag::FastTrack;
                     }
                 }
             }
         }
         if (!compFastTrack) {
-            trd = PAINT(target)->update(renderer, pm, clips, 255, flag, false);
+            trd = P(target)->update(renderer, pm, clips, 255, pFlag, false);
         }
     }
 
     /* 2. Clipping */
     if (this->clipper) {
-        auto pclip = PAINT(this->clipper);
+        auto pclip = P(this->clipper);
+        if (pclip->renderFlag  | static_cast<Shape*>(this->clipper)->pImpl->rFlag) renderFlag |= RenderUpdateFlag::Clip;
         pclip->ctxFlag &= ~ContextFlag::FastTrack;   //reset
         viewport = renderer->viewport();
-        if (!pclip->clipper && to<ShapeImpl>(this->clipper)->rs.strokeWidth() == 0.0f && _compFastTrack(renderer, this->clipper, pm, viewport)) {
+        /* TODO: Intersect the clipper's clipper, if both are FastTrack.
+           Update the subsequent clipper first and check its ctxFlag. */
+        if (!pclip->clipper && static_cast<Shape*>(this->clipper)->strokeWidth() == 0.0f && _compFastTrack(renderer, this->clipper, pm, viewport)) {
             pclip->ctxFlag |= ContextFlag::FastTrack;
             compFastTrack = true;
         } else {
-            mark(RenderUpdateFlag::Clip);
-            trd = pclip->update(renderer, pm, clips, 255, flag, true);
+            trd = pclip->update(renderer, pm, clips, 255, pFlag, true);
             clips.push(trd);
         }
     }
 
     /* 3. Main Update */
+    auto newFlag = static_cast<RenderUpdateFlag>(pFlag | renderFlag);
+    renderFlag = RenderUpdateFlag::None;
     opacity = MULTIPLY(opacity, this->opacity);
-    PAINT_METHOD(ret, update(renderer, pm * tr.m, clips, opacity, (flag | renderFlag), clipper));
+
+    RenderData rd = nullptr;
+
+    tr.cm = pm * tr.m;
+    PAINT_METHOD(rd, update(renderer, tr.cm, clips, opacity, newFlag, clipper));
 
     /* 4. Composition Post Processing */
     if (compFastTrack) renderer->viewport(viewport);
     else if (this->clipper) clips.pop();
 
-    renderFlag = RenderUpdateFlag::None;
-
     return rd;
 }
 
 
-bool Paint::Impl::bounds(Point* pt4, const Matrix* pm, bool obb)
+bool Paint::Impl::bounds(float* x, float* y, float* w, float* h, bool transformed, bool stroking, bool origin)
 {
     bool ret;
-    PAINT_METHOD(ret, bounds(pt4, pm * transform(), obb));
+    const auto& m = this->transform(origin);
+
+    //Case: No transformed, quick return!
+    if (!transformed || identity(&m)) {
+        PAINT_METHOD(ret, bounds(x, y, w, h, stroking));
+        return ret;
+    }
+
+    //Case: Transformed
+    auto tx = 0.0f;
+    auto ty = 0.0f;
+    auto tw = 0.0f;
+    auto th = 0.0f;
+
+    PAINT_METHOD(ret, bounds(&tx, &ty, &tw, &th, stroking));
+
+    //Get vertices
+    Point pt[4] = {{tx, ty}, {tx + tw, ty}, {tx + tw, ty + th}, {tx, ty + th}};
+
+    //New bounding box
+    auto x1 = FLT_MAX;
+    auto y1 = FLT_MAX;
+    auto x2 = -FLT_MAX;
+    auto y2 = -FLT_MAX;
+
+    //Compute the AABB after transformation
+    for (int i = 0; i < 4; i++) {
+        pt[i] *= m;
+
+        if (pt[i].x < x1) x1 = pt[i].x;
+        if (pt[i].x > x2) x2 = pt[i].x;
+        if (pt[i].y < y1) y1 = pt[i].y;
+        if (pt[i].y > y2) y2 = pt[i].y;
+    }
+
+    if (x) *x = x1;
+    if (y) *y = y1;
+    if (w) *w = x2 - x1;
+    if (h) *h = y2 - y1;
+
     return ret;
 }
 
 
-bool Paint::Impl::intersects(const RenderRegion& region)
+void Paint::Impl::reset()
 {
-    if (renderer) {
-        bool ret;
-        PAINT_METHOD(ret, intersects(region));
-        return ret;
+    if (clipper) {
+        delete(clipper);
+        clipper = nullptr;
     }
-    return false;
+
+    if (compData) {
+        if (P(compData->target)->unref() == 0) delete(compData->target);
+        free(compData);
+        compData = nullptr;
+    }
+
+    tvg::identity(&tr.m);
+    tr.degree = 0.0f;
+    tr.scale = 1.0f;
+    tr.overriding = false;
+
+    blendMethod = BlendMethod::Normal;
+    renderFlag = RenderUpdateFlag::None;
+    ctxFlag = ContextFlag::Default;
+    opacity = 255;
+    paint->id = 0;
 }
 
 
@@ -296,13 +381,14 @@ bool Paint::Impl::intersects(const RenderRegion& region)
 /* External Class Implementation                                        */
 /************************************************************************/
 
-Paint :: Paint() = default;
-Paint :: ~Paint() = default;
-
-
-void Paint::rel(Paint* paint) noexcept
+Paint :: Paint() : pImpl(new Impl(this))
 {
-    if (paint && paint->refCnt() <= 0) delete(paint);
+}
+
+
+Paint :: ~Paint()
+{
+    delete(pImpl);
 }
 
 
@@ -334,87 +420,81 @@ Result Paint::transform(const Matrix& m) noexcept
 }
 
 
-Matrix& Paint::transform() noexcept
+Matrix Paint::transform() noexcept
 {
     return pImpl->transform();
 }
 
 
-Result Paint::bounds(float* x, float* y, float* w, float* h) noexcept
+TVG_DEPRECATED Result Paint::bounds(float* x, float* y, float* w, float* h) const noexcept
 {
-    Point pt4[4] = {};
-    const auto pm = pImpl->ptransform();
-    if (pImpl->bounds(pt4, &pm, false)) {
-        BBox box = {{FLT_MAX, FLT_MAX}, {-FLT_MAX, -FLT_MAX}};
-        for (int i = 0; i < 4; ++i) {
-            if (pt4[i].x < box.min.x) box.min.x = pt4[i].x;
-            if (pt4[i].x > box.max.x) box.max.x = pt4[i].x;
-            if (pt4[i].y < box.min.y) box.min.y = pt4[i].y;
-            if (pt4[i].y > box.max.y) box.max.y = pt4[i].y;
-        }
-        if (x) *x = box.min.x;
-        if (y) *y = box.min.y;
-        if (w) *w = box.max.x - box.min.x;
-        if (h) *h = box.max.y - box.min.y;
-        return Result::Success;
-    }
-    return Result::InsufficientCondition;
+    return this->bounds(x, y, w, h, false);
 }
 
 
-Result Paint::bounds(Point* pt4) noexcept
+Result Paint::bounds(float* x, float* y, float* w, float* h, bool transformed) const noexcept
 {
-    if (!pt4) return Result::InvalidArguments;
-    auto pm = pImpl->ptransform();
-    if (pImpl->bounds(pt4, &pm, true)) return Result::Success;
+    if (pImpl->bounds(x, y, w, h, transformed, true, transformed)) return Result::Success;
     return Result::InsufficientCondition;
 }
 
 
-bool Paint::intersects(int32_t x, int32_t y, int32_t w, int32_t h) noexcept
-{
-    if (w <= 0 || h <= 0) return false;
-    return pImpl->intersects({{x, y}, {x + w, y + h}});
-}
-
-
 Paint* Paint::duplicate() const noexcept
 {
     return pImpl->duplicate();
 }
 
 
-Result Paint::clip(Shape* clipper) noexcept
+Result Paint::clip(std::unique_ptr<Paint> clipper) noexcept
 {
-    return pImpl->clip(clipper);
+    auto p = clipper.release();
+
+    if (p && p->type() != Type::Shape) {
+        TVGERR("RENDERER", "Clipping only supports the Shape!");
+        return Result::NonSupport;
+    }
+    pImpl->clip(p);
+    return Result::Success;
 }
 
 
-Shape* Paint::clip() const noexcept
+Result Paint::composite(std::unique_ptr<Paint> target, CompositeMethod method) noexcept
 {
-    return pImpl->clipper;
+    //TODO: remove. Keep this for the backward compatibility
+    if (target && method == CompositeMethod::ClipPath) return clip(std::move(target));
+
+    auto p = target.release();
+    if (pImpl->composite(this, p, method)) return Result::Success;
+
+    delete(p);
+    return Result::InvalidArguments;
 }
 
 
-Result Paint::mask(Paint* target, MaskMethod method) noexcept
+CompositeMethod Paint::composite(const Paint** target) const noexcept
 {
-    if (method > MaskMethod::Darken) return Result::InvalidArguments;
-    return pImpl->mask(target, method);
-}
-
-
-MaskMethod Paint::mask(const Paint** target) const noexcept
-{
-    return pImpl->mask(target);
+    if (pImpl->compData) {
+        if (target) *target = pImpl->compData->target;
+        return pImpl->compData->method;
+    } else {
+        //TODO: remove. Keep this for the backward compatibility
+        if (pImpl->clipper) {
+            if (target) *target = pImpl->clipper;
+            return CompositeMethod::ClipPath;
+        }
+        if (target) *target = nullptr;
+        return CompositeMethod::None;
+    }
 }
 
 
 Result Paint::opacity(uint8_t o) noexcept
 {
-    if (pImpl->opacity != o) {
-        pImpl->opacity = o;
-        pImpl->mark(RenderUpdateFlag::Color);
-    }
+    if (pImpl->opacity == o) return Result::Success;
+
+    pImpl->opacity = o;
+    pImpl->renderFlag |= RenderUpdateFlag::Color;
+
     return Result::Success;
 }
 
@@ -425,47 +505,21 @@ uint8_t Paint::opacity() const noexcept
 }
 
 
+TVG_DEPRECATED uint32_t Paint::identifier() const noexcept
+{
+    return (uint32_t) type();
+}
+
+
 Result Paint::blend(BlendMethod method) noexcept
 {
-    if (method <= BlendMethod::Add || method == BlendMethod::Composition) {
-        pImpl->blend(method);
-        return Result::Success;
+    //TODO: Remove later
+    if (method == BlendMethod::Hue || method == BlendMethod::Saturation || method == BlendMethod::Color || method == BlendMethod::Luminosity || method == BlendMethod::HardMix) return Result::NonSupport;
+
+    if (pImpl->blendMethod != method) {
+        pImpl->blendMethod = method;
+        pImpl->renderFlag |= RenderUpdateFlag::Blend;
     }
-    return Result::InvalidArguments;
-}
-
-
-uint16_t Paint::ref() noexcept
-{
-    return pImpl->ref();
-}
-
-
-uint16_t Paint::unref(bool free) noexcept
-{
-    return pImpl->unrefx(free);
-}
-
-
-uint16_t Paint::refCnt() const noexcept
-{
-    return pImpl->refCnt;
-}
-
-
-const Paint* Paint::parent() const noexcept
-{
-    return pImpl->parent;
-}
-
-
-Result Paint::visible(bool on) noexcept
-{
-    return pImpl->visible(!on);
-}
-
-
-bool Paint::visible() const noexcept
-{
-    return !pImpl->hidden;
+
+    return Result::Success;
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgPaint.h b/engine/thirdparty/thorvg/src/renderer/tvgPaint.h
index dac39047..63b64b4d 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgPaint.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgPaint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,298 +23,156 @@
 #ifndef _TVG_PAINT_H_
 #define _TVG_PAINT_H_
 
-#include "tvgCommon.h"
 #include "tvgRender.h"
 #include "tvgMath.h"
 
-
-#define PAINT(A) ((Paint::Impl*)A->pImpl)
-
 namespace tvg
 {
-enum ContextFlag : uint8_t {Default = 0, FastTrack = 1};
+    enum ContextFlag : uint8_t {Default = 0, FastTrack = 1};
 
-struct Iterator
-{
-    virtual ~Iterator() {}
-    virtual const Paint* next() = 0;
-    virtual uint32_t count() = 0;
-    virtual void begin() = 0;
-};
+    struct Iterator
+    {
+        virtual ~Iterator() {}
+        virtual const Paint* next() = 0;
+        virtual uint32_t count() = 0;
+        virtual void begin() = 0;
+    };
 
-struct Mask
-{
-    Paint* target;
-    Paint* source;
-    MaskMethod method;
-};
+    struct Composite
+    {
+        Paint* target;
+        Paint* source;
+        CompositeMethod method;
+    };
 
-struct Paint::Impl
-{
-    Paint* paint = nullptr;
-    Paint* parent = nullptr;
-    Mask* maskData = nullptr;
-    Shape* clipper = nullptr;
-    RenderMethod* renderer = nullptr;
-    RenderData rd = nullptr;
+    struct Paint::Impl
+    {
+        Paint* paint = nullptr;
+        Composite* compData = nullptr;
+        Paint* clipper = nullptr;
+        RenderMethod* renderer = nullptr;
+        struct {
+            Matrix m;                 //input matrix
+            Matrix cm;                //multipled parents matrix
+            float degree;             //rotation degree
+            float scale;              //scale factor
+            bool overriding;          //user transform?
 
-    struct {
-        Matrix m;                 //input matrix
-        float degree;             //rotation degree
-        float scale;              //scale factor
-        bool overriding;          //user transform?
+            void update()
+            {
+                if (overriding) return;
+                m.e11 = 1.0f;
+                m.e12 = 0.0f;
+                m.e21 = 0.0f;
+                m.e22 = 1.0f;
+                m.e31 = 0.0f;
+                m.e32 = 0.0f;
+                m.e33 = 1.0f;
+                tvg::scale(&m, scale, scale);
+                tvg::rotate(&m, degree);
+            }
+        } tr;
+        RenderUpdateFlag renderFlag = RenderUpdateFlag::None;
+        BlendMethod blendMethod;
+        uint16_t refCnt = 0;       //reference count
+        uint8_t ctxFlag;
+        uint8_t opacity;
 
-        void update()
+        Impl(Paint* pnt) : paint(pnt)
         {
-            if (overriding) return;
-            m.e11 = 1.0f;
-            m.e12 = 0.0f;
-            m.e21 = 0.0f;
-            m.e22 = 1.0f;
-            m.e31 = 0.0f;
-            m.e32 = 0.0f;
-            m.e33 = 1.0f;
-            tvg::scale(&m, {scale, scale});
-            tvg::rotate(&m, degree);
-        }
-    } tr;
-    RenderUpdateFlag renderFlag = RenderUpdateFlag::None;
-    CompositionFlag cmpFlag = CompositionFlag::Invalid;
-    BlendMethod blendMethod;
-    uint16_t refCnt = 0;       //reference count
-    uint8_t ctxFlag;           //See enum ContextFlag
-    uint8_t opacity;
-    bool hidden : 1;
-
-    Impl(Paint* pnt) : paint(pnt)
-    {
-        pnt->pImpl = this;
-        hidden = false;
-        reset();
-    }
-
-    virtual ~Impl()
-    {
-        if (maskData) {
-            PAINT(maskData->target)->unref();
-            tvg::free(maskData);
+            reset();
         }
 
-        if (clipper) PAINT(clipper)->unref();
-
-        if (renderer) {
-            if (rd) renderer->dispose(rd);
-            if (renderer->unref() == 0) delete(renderer);
-        }
-    }
-
-    uint16_t ref()
-    {
-        return ++refCnt;
-    }
-
-    uint16_t unref(bool free = true)
-    {
-        parent = nullptr;
-        return unrefx(free);
-    }
-
-    uint16_t unrefx(bool free)
-    {
-        if (refCnt > 0) --refCnt;
-
-        if (free && refCnt == 0) {
-            delete(paint);
-            return 0;
+        ~Impl()
+        {
+            if (compData) {
+                if (P(compData->target)->unref() == 0) delete(compData->target);
+                free(compData);
+            }
+            if (clipper && P(clipper)->unref() == 0) delete(clipper);
+            if (renderer && (renderer->unref() == 0)) delete(renderer);
         }
 
-        return refCnt;
-    }
-
-    void damage(const RenderRegion& vport)
-    {
-        if (renderer) renderer->damage(rd, vport);
-    }
-
-    void damage()
-    {
-        if (renderer) renderer->damage(rd, bounds());
-    }
-
-    void mark(CompositionFlag flag)
-    {
-        cmpFlag = CompositionFlag(uint8_t(cmpFlag) | uint8_t(flag));
-    }
-
-    bool marked(CompositionFlag flag)
-    {
-        return (uint8_t(cmpFlag) & uint8_t(flag));
-    }
-
-    bool marked(RenderUpdateFlag flag)
-    {
-        return (renderFlag & flag);
-    }
-
-    void mark(RenderUpdateFlag flag)
-    {
-        renderFlag |= flag;
-    }
-
-    bool transform(const Matrix& m)
-    {
-        if (&tr.m != &m) tr.m = m;
-        tr.overriding = true;
-        mark(RenderUpdateFlag::Transform);
-
-        return true;
-    }
-
-    Matrix& transform()
-    {
-        //update transform
-        if (renderFlag & RenderUpdateFlag::Transform) tr.update();
-        return tr.m;
-    }
-
-    Matrix ptransform()
-    {
-        auto p = this;
-        auto tm = tvg::identity();
-        while (p->parent) {
-            p = PAINT(p->parent);
-            tm = p->transform() * tm;
-        }
-        return tm;
-    }
-
-    Result clip(Shape* clp)
-    {
-        if (clp && PAINT(clp)->parent) return Result::InsufficientCondition;
-        if (clipper) PAINT(clipper)->unref(clipper != clp);
-        clipper = clp;
-        if (clp) {
-            clp->ref();
-            PAINT(clp)->parent = parent;
-        }
-        return Result::Success;
-    }
-
-    Result mask(Paint* target, MaskMethod method)
-    {
-        if (target && PAINT(target)->parent) return Result::InsufficientCondition;
-
-        if (maskData) {
-            PAINT(maskData->target)->unref(maskData->target != target);
-            tvg::free(maskData);
-            maskData = nullptr;
+        uint8_t ref()
+        {
+            return ++refCnt;
         }
 
-        if (method == MaskMethod::None) return (target ? Result::InvalidArguments : Result::Success);
-
-        maskData = tvg::malloc<Mask>(sizeof(Mask));
-        target->ref();
-        maskData->target = target;
-        PAINT(target)->parent = parent;
-        maskData->source = paint;
-        maskData->method = method;
-        return Result::Success;
-    }
-
-    MaskMethod mask(const Paint** target) const
-    {
-        if (maskData) {
-            if (target) *target = maskData->target;
-            return maskData->method;
-        } else {
-            if (target) *target = nullptr;
-            return MaskMethod::None;
-        }
-    }
-
-    void reset()
-    {
-        if (clipper) {
-            PAINT(clipper)->unref();
-            clipper = nullptr;
+        uint8_t unref()
+        {
+            if (refCnt == 0) TVGERR("RENDERER", "Corrupted reference count!");
+            return --refCnt;
         }
 
-        if (maskData) {
-            PAINT(maskData->target)->unref();
-            tvg::free(maskData);
-            maskData = nullptr;
+        bool transform(const Matrix& m)
+        {
+            if (&tr.m != &m) tr.m = m;
+            tr.overriding = true;
+            renderFlag |= RenderUpdateFlag::Transform;
+
+            return true;
         }
 
-        tvg::identity(&tr.m);
-        tr.degree = 0.0f;
-        tr.scale = 1.0f;
-        tr.overriding = false;
-
-        parent = nullptr;
-        blendMethod = BlendMethod::Normal;
-        renderFlag = RenderUpdateFlag::None;
-        ctxFlag = ContextFlag::Default;
-        opacity = 255;
-        paint->id = 0;
-    }
-
-    bool rotate(float degree)
-    {
-        if (tr.overriding) return false;
-        if (tvg::equal(degree, tr.degree)) return true;
-        tr.degree = degree;
-        mark(RenderUpdateFlag::Transform);
-
-        return true;
-    }
-
-    bool scale(float factor)
-    {
-        if (tr.overriding) return false;
-        if (tvg::equal(factor, tr.scale)) return true;
-        tr.scale = factor;
-        mark(RenderUpdateFlag::Transform);
-
-        return true;
-    }
-
-    bool translate(float x, float y)
-    {
-        if (tr.overriding) return false;
-        if (tvg::equal(x, tr.m.e13) && tvg::equal(y, tr.m.e23)) return true;
-        tr.m.e13 = x;
-        tr.m.e23 = y;
-        mark(RenderUpdateFlag::Transform);
-
-        return true;
-    }
-
-    void blend(BlendMethod method)
-    {
-        if (blendMethod != method) {
-            blendMethod = method;
-            mark(RenderUpdateFlag::Blend);
+        Matrix& transform(bool origin = false)
+        {
+            //update transform
+            if (renderFlag & RenderUpdateFlag::Transform) tr.update();
+            if (origin) return tr.cm;
+            return tr.m;
         }
-    }
 
-    Result visible(bool hidden)
-    {
-        if (this->hidden != hidden) {
-            this->hidden = hidden;
-            damage();
+        void clip(Paint* clp)
+        {
+            if (this->clipper) {
+                P(this->clipper)->unref();
+                if (this->clipper != clp && P(this->clipper)->refCnt == 0) {
+                    delete(this->clipper);
+                }
+            }
+            this->clipper = clp;
+            if (!clp) return;
+
+            P(clipper)->ref();
         }
-        return Result::Success;
-    }
 
-    bool intersects(const RenderRegion& region);
-    RenderRegion bounds();
-    bool bounds(Point* pt4, const Matrix* pm, bool obb);
-    Iterator* iterator();
-    RenderData update(RenderMethod* renderer, const Matrix& pm, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper = false);
-    bool render(RenderMethod* renderer, CompositionFlag flag = CompositionFlag::Invalid);
-    Paint* duplicate(Paint* ret = nullptr);
-};
+        bool composite(Paint* source, Paint* target, CompositeMethod method)
+        {
+            //Invalid case
+            if ((!target && method != CompositeMethod::None) || (target && method == CompositeMethod::None)) return false;
 
+            if (compData) {
+                P(compData->target)->unref();
+                if ((compData->target != target) && P(compData->target)->refCnt == 0) {
+                    delete(compData->target);
+                }
+                //Reset scenario
+                if (!target && method == CompositeMethod::None) {
+                    free(compData);
+                    compData = nullptr;
+                    return true;
+                }
+            } else {
+                if (!target && method == CompositeMethod::None) return true;
+                compData = static_cast<Composite*>(calloc(1, sizeof(Composite)));
+            }
+            P(target)->ref();
+            compData->target = target;
+            compData->source = source;
+            compData->method = method;
+            return true;
+        }
+
+        RenderRegion bounds(RenderMethod* renderer) const;
+        Iterator* iterator();
+        bool rotate(float degree);
+        bool scale(float factor);
+        bool translate(float x, float y);
+        bool bounds(float* x, float* y, float* w, float* h, bool transformed, bool stroking, bool origin = false);
+        RenderData update(RenderMethod* renderer, const Matrix& pm, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper = false);
+        bool render(RenderMethod* renderer);
+        Paint* duplicate(Paint* ret = nullptr);
+        void reset();
+    };
 }
 
 #endif //_TVG_PAINT_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgPicture.cpp b/engine/thirdparty/thorvg/src/renderer/tvgPicture.cpp
index 0d8418db..a268f0ed 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgPicture.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgPicture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,138 @@
 #include "tvgPaint.h"
 #include "tvgPicture.h"
 
-Picture::Picture() = default;
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
 
-
-Picture* Picture::gen() noexcept
+RenderUpdateFlag Picture::Impl::load()
 {
-    return new PictureImpl;
+    if (loader) {
+        if (paint) {
+            loader->sync();
+        } else {
+            paint = loader->paint();
+            if (paint) {
+                if (w != loader->w || h != loader->h) {
+                    if (!resizing) {
+                        w = loader->w;
+                        h = loader->h;
+                    }
+                    loader->resize(paint, w, h);
+                    resizing = false;
+                }
+                return RenderUpdateFlag::None;
+            }
+        }
+        if (!surface) {
+            if ((surface = loader->bitmap())) {
+                return RenderUpdateFlag::Image;
+            }
+        }
+    }
+    return RenderUpdateFlag::None;
+}
+
+
+void Picture::Impl::queryComposition(uint8_t opacity)
+{
+    cFlag = CompositionFlag::Invalid;
+
+    //In this case, paint(scene) would try composition itself.
+    if (opacity < 255) return;
+
+    //Composition test
+    const Paint* target;
+    auto method = picture->composite(&target);
+    if (!target || method == tvg::CompositeMethod::ClipPath) return;
+    if (target->pImpl->opacity == 255 || target->pImpl->opacity == 0) return;
+
+    cFlag = CompositionFlag::Opacity;
+}
+
+
+bool Picture::Impl::render(RenderMethod* renderer)
+{
+    bool ret = false;
+    renderer->blend(PP(picture)->blendMethod);
+
+    if (surface) return renderer->renderImage(rd);
+    else if (paint) {
+        RenderCompositor* cmp = nullptr;
+        if (cFlag) {
+            cmp = renderer->target(bounds(renderer), renderer->colorSpace(), static_cast<CompositionFlag>(cFlag));
+            renderer->beginComposite(cmp, CompositeMethod::None, 255);
+        }
+        ret = paint->pImpl->render(renderer);
+        if (cmp) renderer->endComposite(cmp);
+    }
+    return ret;
+}
+
+
+bool Picture::Impl::size(float w, float h)
+{
+    this->w = w;
+    this->h = h;
+    resizing = true;
+    return true;
+}
+
+
+RenderRegion Picture::Impl::bounds(RenderMethod* renderer)
+{
+    if (rd) return renderer->region(rd);
+    if (paint) return paint->pImpl->bounds(renderer);
+    return {0, 0, 0, 0};
+}
+
+
+Result Picture::Impl::load(ImageLoader* loader)
+{
+    //Same resource has been loaded.
+    if (this->loader == loader) {
+        this->loader->sharing--;  //make it sure the reference counting.
+        return Result::Success;
+    } else if (this->loader) {
+        LoaderMgr::retrieve(this->loader);
+    }
+
+    this->loader = loader;
+
+    if (!loader->read()) return Result::Unknown;
+
+    this->w = loader->w;
+    this->h = loader->h;    
+
+    return Result::Success;
+}
+
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+Picture::Picture() : pImpl(new Impl(this))
+{
+}
+
+
+Picture::~Picture()
+{
+    delete(pImpl);
+}
+
+
+unique_ptr<Picture> Picture::gen() noexcept
+{
+    return unique_ptr<Picture>(new Picture);
+}
+
+
+TVG_DEPRECATED uint32_t Picture::identifier() noexcept
+{
+    return (uint32_t) Type::Picture;
 }
 
 
@@ -38,11 +164,12 @@ Type Picture::type() const noexcept
 }
 
 
-Result Picture::load(const char* filename) noexcept
+Result Picture::load(const std::string& path) noexcept
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    if (!filename) return Result::InvalidArguments;
-    return to<PictureImpl>(this)->load(filename);
+    if (path.empty()) return Result::InvalidArguments;
+
+    return pImpl->load(path);
 #else
     TVGLOG("RENDERER", "FILE IO is disabled!");
     return Result::NonSupport;
@@ -50,49 +177,40 @@ Result Picture::load(const char* filename) noexcept
 }
 
 
-Result Picture::load(const char* data, uint32_t size, const char* mimeType, const char* rpath, bool copy) noexcept
+Result Picture::load(const char* data, uint32_t size, const string& mimeType, bool copy) noexcept
 {
-    return to<PictureImpl>(this)->load(data, size, mimeType, rpath, copy);
+    if (!data || size <= 0) return Result::InvalidArguments;
+
+    return pImpl->load(data, size, mimeType, copy);
 }
 
 
-Result Picture::load(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy) noexcept
+TVG_DEPRECATED Result Picture::load(const char* data, uint32_t size, bool copy) noexcept
 {
-    return to<PictureImpl>(this)->load(data, w, h, cs, copy);
+    return load(data, size, "", copy);
 }
 
 
-Result Picture::resolver(std::function<bool(Paint* paint, const char* src, void* data)> func, void* data) noexcept
+Result Picture::load(uint32_t* data, uint32_t w, uint32_t h, bool copy) noexcept
 {
-    return to<PictureImpl>(this)->set(func, data);
+    if (!data || w <= 0 || h <= 0) return Result::InvalidArguments;
+
+    return pImpl->load(data, w, h, copy);
 }
 
 
 Result Picture::size(float w, float h) noexcept
 {
-    to<PictureImpl>(this)->size(w, h);
-    return Result::Success;
+    if (pImpl->size(w, h)) return Result::Success;
+    return Result::InsufficientCondition;
 }
 
 
 Result Picture::size(float* w, float* h) const noexcept
 {
-    return to<PictureImpl>(this)->size(w, h);
-}
-
-
-Result Picture::origin(float x, float y) noexcept
-{
-    to<PictureImpl>(this)->origin = {x, y};
-    PAINT(this)->mark(RenderUpdateFlag::Transform);
-    return Result::Success;
-}
-
-
-Result Picture::origin(float* x, float* y) const noexcept
-{
-    if (x) *x = to<PictureImpl>(this)->origin.x;
-    if (y) *y = to<PictureImpl>(this)->origin.y;
+    if (!pImpl->loader) return Result::InsufficientCondition;
+    if (w) *w = pImpl->w;
+    if (h) *h = pImpl->h;
     return Result::Success;
 }
 
@@ -115,15 +233,6 @@ const Paint* Picture::paint(uint32_t id) noexcept
         return true;
     };
 
-    auto accessor = tvg::Accessor::gen();
-    accessor->set(this, cb, &value);
-    delete(accessor);
-
+    tvg::Accessor::gen()->set(this, cb, &value);
     return value.ret;
 }
-
-
-Result Picture::filter(FilterMethod method) noexcept
-{
-    return to<PictureImpl>(this)->filterMethod(method);
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgPicture.h b/engine/thirdparty/thorvg/src/renderer/tvgPicture.h
index 44ac81b3..4b75b362 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgPicture.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgPicture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,10 @@
 #ifndef _TVG_PICTURE_H_
 #define _TVG_PICTURE_H_
 
+#include <string>
 #include "tvgPaint.h"
-#include "tvgScene.h"
 #include "tvgLoader.h"
 
-namespace tvg
-{
 
 struct PictureIterator : Iterator
 {
@@ -57,109 +55,79 @@ struct PictureIterator : Iterator
 };
 
 
-struct PictureImpl : Picture
+struct Picture::Impl
 {
-    Paint::Impl impl;
     ImageLoader* loader = nullptr;
-    Paint* vector = nullptr;          //vector picture uses
-    RenderSurface* bitmap = nullptr;  //bitmap picture uses
-    AssetResolver* resolver = nullptr;
-    Point origin = {};
+
+    Paint* paint = nullptr;           //vector picture uses
+    RenderSurface* surface = nullptr; //bitmap picture uses
+    RenderData rd = nullptr;          //engine data
     float w = 0, h = 0;
-    FilterMethod filter = FilterMethod::Bilinear;
+    Picture* picture = nullptr;
+    uint8_t cFlag = CompositionFlag::Invalid;
     bool resizing = false;
 
-    PictureImpl() : impl(Paint::Impl(this))
+    void queryComposition(uint8_t opacity);
+    bool render(RenderMethod* renderer);
+    bool size(float w, float h);
+    RenderRegion bounds(RenderMethod* renderer);
+    Result load(ImageLoader* ploader);
+
+    Impl(Picture* p) : picture(p)
     {
     }
 
-    ~PictureImpl()
+    ~Impl()
     {
         LoaderMgr::retrieve(loader);
-        tvg::free(resolver);
-        if (vector) vector->unref();
+        if (surface) {
+            if (auto renderer = PP(picture)->renderer) {
+                renderer->dispose(rd);
+            }
+        }
+        delete(paint);
     }
 
-    bool skip(RenderUpdateFlag flag)
+    RenderData update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, TVG_UNUSED bool clipper)
     {
-        if (flag == RenderUpdateFlag::None) return true;
-        return false;
-    }
+        auto flag = static_cast<RenderUpdateFlag>(pFlag | load());
 
-    bool update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, TVG_UNUSED bool clipper)
-    {
-        load();
+        if (surface) {
+            if (flag == RenderUpdateFlag::None) return rd;
 
-        auto pivot = Point{-origin.x * float(w), -origin.y * float(h)};
-
-        if (bitmap) {
             //Overriding Transformation by the desired image size
             auto sx = w / loader->w;
             auto sy = h / loader->h;
             auto scale = sx < sy ? sx : sy;
-            auto m = transform * Matrix{scale, 0, pivot.x, 0, scale, pivot.y, 0, 0, 1};
-            impl.rd = renderer->prepare(bitmap, impl.rd, m, clips, opacity, filter, flag);
-        } else if (vector) {
+            auto m = transform * Matrix{scale, 0, 0, 0, scale, 0, 0, 0, 1};
+
+            rd = renderer->prepare(surface, rd, m, clips, opacity, flag);
+        } else if (paint) {
             if (resizing) {
-                loader->resize(vector, w, h);
+                loader->resize(paint, w, h);
                 resizing = false;
             }
-            needComposition(opacity);
-            vector->blend(pImpl->blendMethod); //propagate blend method to nested vector scene
-            translateR(const_cast<Matrix*>(&transform), pivot);
-            return vector->pImpl->update(renderer, transform, clips, opacity, flag, false);
+            queryComposition(opacity);
+            rd = paint->pImpl->update(renderer, transform, clips, opacity, flag, false);
         }
-        return true;
+        return rd;
     }
 
-    void size(float w, float h)
+    bool bounds(float* x, float* y, float* w, float* h, bool stroking)
     {
-        this->w = w;
-        this->h = h;
-        resizing = true;
-    }
-
-    Result filterMethod(FilterMethod method)
-    {
-        if (method != filter) {
-            impl.mark(RenderUpdateFlag::Image);
-            filter = method;
-        }
-        return Result::Success;
-    }
-
-    Result size(float* w, float* h) const
-    {
-        if (!loader) return Result::InsufficientCondition;
+        if (x) *x = 0;
+        if (y) *y = 0;
         if (w) *w = this->w;
         if (h) *h = this->h;
-        return Result::Success;
-    }
-
-    bool intersects(const RenderRegion& region)
-    {
-        if (!impl.renderer) return false;
-        load();
-        if (impl.rd) return impl.renderer->intersectsImage(impl.rd, region);
-        else if (vector) return to<SceneImpl>(vector)->intersects(region);
-        return false;
-    }
-
-    bool bounds(Point* pt4, const Matrix& m, TVG_UNUSED bool obb)
-    {
-        pt4[0] = Point{0.0f, 0.0f} * m;
-        pt4[1] = Point{w, 0.0f} * m;
-        pt4[2] = Point{w, h} * m;
-        pt4[3] = Point{0.0f, h} * m;
         return true;
     }
 
-    Result load(const char* filename)
+    Result load(const string& path)
     {
-        if (vector || bitmap) return Result::InsufficientCondition;
+        if (paint || surface) return Result::InsufficientCondition;
 
         bool invalid;  //Invalid Path
-        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(filename, &invalid));
+        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(path, &invalid));
         if (!loader) {
             if (invalid) return Result::InvalidArguments;
             return Result::NonSupport;
@@ -167,66 +135,44 @@ struct PictureImpl : Picture
         return load(loader);
     }
 
-    Result load(const char* data, uint32_t size, const char* mimeType, const char* rpath, bool copy)
+    Result load(const char* data, uint32_t size, const string& mimeType, bool copy)
     {
-        if (!data || size <= 0) return Result::InvalidArguments;
-        if (vector || bitmap) return Result::InsufficientCondition;
-        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(data, size, mimeType, rpath, copy));
+        if (paint || surface) return Result::InsufficientCondition;
+        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(data, size, mimeType, copy));
         if (!loader) return Result::NonSupport;
         return load(loader);
     }
 
-    Result load(const uint32_t* data, uint32_t w, uint32_t h, ColorSpace cs, bool copy)
+    Result load(uint32_t* data, uint32_t w, uint32_t h, bool copy)
     {
-        if (!data || w <= 0 || h <= 0 || cs == ColorSpace::Unknown)  return Result::InvalidArguments;
-        if (vector || bitmap) return Result::InsufficientCondition;
+        if (paint || surface) return Result::InsufficientCondition;
 
-        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(data, w, h, cs, copy));
+        auto loader = static_cast<ImageLoader*>(LoaderMgr::loader(data, w, h, copy));
         if (!loader) return Result::FailedAllocation;
 
         return load(loader);
     }
 
-    Result set(std::function<bool(Paint* paint, const char* src, void* data)> resolver, void* data)
-    {
-        if (loader) return Result::InsufficientCondition;
-
-        if (!resolver) {
-            tvg::free(this->resolver);
-            this->resolver = nullptr;
-            return Result::Success;
-        }
-
-        if (!this->resolver) this->resolver = tvg::calloc<AssetResolver>(1, sizeof(AssetResolver));
-        *(this->resolver) = {resolver, data};
-        return Result::Success;
-    }
-
     Paint* duplicate(Paint* ret)
     {
         if (ret) TVGERR("RENDERER", "TODO: duplicate()");
 
         load();
 
-        auto picture = Picture::gen();
-        auto dup = to<PictureImpl>(picture);
+        auto picture = Picture::gen().release();
+        auto dup = picture->pImpl;
 
-        if (vector) {
-            dup->vector = vector->duplicate();
-            PAINT(dup->vector)->parent = picture;
-        }
+        if (paint) dup->paint = paint->duplicate();
 
         if (loader) {
             dup->loader = loader;
             ++dup->loader->sharing;
-            PAINT(picture)->mark(RenderUpdateFlag::Image);
+            PP(picture)->renderFlag |= RenderUpdateFlag::Image;
         }
 
-        dup->bitmap = bitmap;
-        dup->origin = origin;
+        dup->surface = surface;
         dup->w = w;
         dup->h = h;
-        dup->filter = filter;
         dup->resizing = resizing;
 
         return picture;
@@ -235,7 +181,7 @@ struct PictureImpl : Picture
     Iterator* iterator()
     {
         load();
-        return new PictureIterator(vector);
+        return new PictureIterator(paint);
     }
 
     uint32_t* data(uint32_t* w, uint32_t* h)
@@ -250,94 +196,11 @@ struct PictureImpl : Picture
             if (w) *w = 0;
             if (h) *h = 0;
         }
-        if (bitmap) return bitmap->buf32;
+        if (surface) return surface->buf32;
         else return nullptr;
     }
 
-    void load()
-    {
-        if (loader) {
-            if (vector) {
-                loader->sync();
-            } else if ((vector = loader->paint())) {
-                vector->ref();
-                PAINT(vector)->parent = this;
-                if (w != loader->w || h != loader->h) {
-                    if (!resizing) {
-                        w = loader->w;
-                        h = loader->h;
-                    }
-                    loader->resize(vector, w, h);
-                    resizing = false;
-                }
-            } else if (!bitmap) {
-                bitmap = loader->bitmap();
-            }
-        }
-    }
-
-    void needComposition(uint8_t opacity)
-    {
-        impl.cmpFlag = CompositionFlag::Invalid;  //must clear after the rendering
-
-        //In this case, paint(scene) would try composition itself.
-        if (opacity < 255) return;
-
-        //Composition test
-        const Paint* target;
-        PAINT(this)->mask(&target);
-        if (!target || target->pImpl->opacity == 255 || target->pImpl->opacity == 0) return;
-        impl.mark(CompositionFlag::Opacity);
-    }
-
-    bool render(RenderMethod* renderer, TVG_UNUSED CompositionFlag flag)
-    {
-        auto ret = true;
-
-        if (bitmap) {
-            renderer->blend(impl.blendMethod);
-            return renderer->renderImage(impl.rd);
-        } else if (vector) {
-            RenderCompositor* cmp = nullptr;
-            if (impl.cmpFlag) {
-                cmp = renderer->target(bounds(), renderer->colorSpace(), impl.cmpFlag);
-                renderer->beginComposite(cmp, MaskMethod::None, 255);
-            }
-            ret = vector->pImpl->render(renderer);
-            if (cmp) renderer->endComposite(cmp);
-        }
-        return ret;
-    }
-
-    RenderRegion bounds()
-    {
-        if (vector) return vector->pImpl->bounds();
-        return impl.renderer->region(impl.rd);
-    }
-
-    Result load(ImageLoader* loader)
-    {
-        //Same resource has been loaded.
-        if (this->loader == loader) {
-            this->loader->sharing--;  //make it sure the reference counting.
-            return Result::Success;
-        } else if (this->loader) {
-            LoaderMgr::retrieve(this->loader);
-        }
-
-        this->loader = loader;
-        loader->set(resolver);
-        if (!loader->read()) return Result::Unknown;
-
-        this->w = loader->w;
-        this->h = loader->h;
-
-        impl.mark(RenderUpdateFlag::All);
-
-        return Result::Success;
-    }
+    RenderUpdateFlag load();
 };
 
-}
-
 #endif //_TVG_PICTURE_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgRender.cpp b/engine/thirdparty/thorvg/src/renderer/tvgRender.cpp
index 0d4f8274..8ee76493 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgRender.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgRender.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,12 @@
 #include "tvgRender.h"
 
 /************************************************************************/
-/* RenderMethod Class Implementation                                    */
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
 /************************************************************************/
 
 uint32_t RenderMethod::ref()
@@ -41,1021 +46,33 @@ uint32_t RenderMethod::unref()
 }
 
 
-RenderRegion RenderMethod::viewport()
-{
-    return vport;
-}
-
-
-bool RenderMethod::viewport(const RenderRegion& vp)
-{
-    vport = vp;
-    return true;
-}
-
-
-/************************************************************************/
-/* RenderPath Class Implementation                                      */
-/************************************************************************/
-
-void RenderPath::addCircle(float cx, float cy, float rx, float ry, bool cw)
-{
-    auto rxKappa = rx * PATH_KAPPA;
-    auto ryKappa = ry * PATH_KAPPA;
-
-    cmds.grow(6);
-    auto cmds = this->cmds.end();
-
-    cmds[0] = PathCommand::MoveTo;
-    cmds[1] = PathCommand::CubicTo;
-    cmds[2] = PathCommand::CubicTo;
-    cmds[3] = PathCommand::CubicTo;
-    cmds[4] = PathCommand::CubicTo;
-    cmds[5] = PathCommand::Close;
-
-    this->cmds.count += 6;
-
-    int table[2][13] = {{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}, {0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 12}};
-    int* idx = cw ? table[0] : table[1];
-
-    pts.grow(13);
-    auto pts = this->pts.end();
-
-    pts[idx[0]] = {cx, cy - ry};  // moveTo
-    pts[idx[1]] = {cx + rxKappa, cy - ry};
-    pts[idx[2]] = {cx + rx, cy - ryKappa};
-    pts[idx[3]] = {cx + rx, cy};  // cubicTo
-    pts[idx[4]] = {cx + rx, cy + ryKappa};
-    pts[idx[5]] = {cx + rxKappa, cy + ry};
-    pts[idx[6]] = {cx, cy + ry};  // cubicTo
-    pts[idx[7]] = {cx - rxKappa, cy + ry};
-    pts[idx[8]] = {cx - rx, cy + ryKappa};
-    pts[idx[9]] = {cx - rx, cy};  // cubicTo
-    pts[idx[10]] = {cx - rx, cy - ryKappa};
-    pts[idx[11]] = {cx - rxKappa, cy - ry};
-    pts[idx[12]] = {cx, cy - ry};  // cubicTo
-
-    this->pts.count += 13;
-}
-
-void RenderPath::addRect(float x, float y, float w, float h, float rx, float ry, bool cw)
-{
-    if (tvg::zero(rx) && tvg::zero(ry)) {  // sharp rect
-        cmds.grow(5);
-        pts.grow(4);
-
-        auto cmds = this->cmds.end();
-        auto pts = this->pts.end();
-
-        cmds[0] = PathCommand::MoveTo;
-        cmds[1] = cmds[2] = cmds[3] = PathCommand::LineTo;
-        cmds[4] = PathCommand::Close;
-
-        pts[0] = {x + w, y};
-        pts[2] = {x, y + h};
-        if (cw) {
-            pts[1] = {x + w, y + h};
-            pts[3] = {x, y};
-        } else {
-            pts[1] = {x, y};
-            pts[3] = {x + w, y + h};
-        }
-
-        this->cmds.count += 5;
-        this->pts.count += 4;
-    } else {  // round rect
-        auto hsize = Point{w * 0.5f, h * 0.5f};
-        rx = (rx > hsize.x) ? hsize.x : rx;
-        ry = (ry > hsize.y) ? hsize.y : ry;
-        auto hr = Point{rx * PATH_KAPPA, ry * PATH_KAPPA};
-
-        cmds.grow(10);
-        pts.grow(17);
-
-        auto cmds = this->cmds.end();
-        auto pts = this->pts.end();
-
-        cmds[0] = PathCommand::MoveTo;
-        cmds[9] = PathCommand::Close;
-        pts[0] = {x + w, y + ry};  // move
-
-        if (cw) {
-            cmds[1] = cmds[3] = cmds[5] = cmds[7] = PathCommand::LineTo;
-            cmds[2] = cmds[4] = cmds[6] = cmds[8] = PathCommand::CubicTo;
-
-            pts[1] = {x + w, y + h - ry};  // line
-            pts[2] = {x + w, y + h - ry + hr.y};
-            pts[3] = {x + w - rx + hr.x, y + h};
-            pts[4] = {x + w - rx, y + h};  // cubic
-            pts[5] = {x + rx, y + h};      // line
-            pts[6] = {x + rx - hr.x, y + h};
-            pts[7] = {x, y + h - ry + hr.y};
-            pts[8] = {x, y + h - ry};  // cubic
-            pts[9] = {x, y + ry};      // line
-            pts[10] = {x, y + ry - hr.y};
-            pts[11] = {x + rx - hr.x, y};
-            pts[12] = {x + rx, y};      // cubic
-            pts[13] = {x + w - rx, y};  // line
-            pts[14] = {x + w - rx + hr.x, y};
-            pts[15] = {x + w, y + ry - hr.y};
-            pts[16] = {x + w, y + ry};  // cubic
-        } else {
-            cmds[1] = cmds[3] = cmds[5] = cmds[7] = PathCommand::CubicTo;
-            cmds[2] = cmds[4] = cmds[6] = cmds[8] = PathCommand::LineTo;
-
-            pts[1] = {x + w, y + ry - hr.y};
-            pts[2] = {x + w - rx + hr.x, y};
-            pts[3] = {x + w - rx, y};  // cubic
-            pts[4] = {x + rx, y};      // line
-            pts[5] = {x + rx - hr.x, y};
-            pts[6] = {x, y + ry - hr.y};
-            pts[7] = {x, y + ry};      // cubic
-            pts[8] = {x, y + h - ry};  // line
-            pts[9] = {x, y + h - ry + hr.y};
-            pts[10] = {x + rx - hr.x, y + h};
-            pts[11] = {x + rx, y + h};      // cubic
-            pts[12] = {x + w - rx, y + h};  // line
-            pts[13] = {x + w - rx + hr.x, y + h};
-            pts[14] = {x + w, y + h - ry + hr.y};
-            pts[15] = {x + w, y + h - ry};  // cubic
-            pts[16] = {x + w, y + ry};      // line
-        }
-
-        this->cmds.count += 10;
-        this->pts.count += 17;
-    }
-}
-
-bool RenderPath::bounds(const Matrix* m, BBox& box)
-{
-    if (cmds.empty() || cmds.first() == PathCommand::CubicTo) return false;
-
-    auto pt = pts.begin();
-    auto cmd = cmds.begin();
-
-    auto assign = [&](const Point& pt, BBox& box) -> void {
-        if (pt.x < box.min.x) box.min.x = pt.x;
-        if (pt.y < box.min.y) box.min.y = pt.y;
-        if (pt.x > box.max.x) box.max.x = pt.x;
-        if (pt.y > box.max.y) box.max.y = pt.y;
-    };
-
-    while (cmd < cmds.end()) {
-        switch (*cmd) {
-            case PathCommand::MoveTo: {
-                //skip the invalid assignments
-                if (cmd + 1 < cmds.end()) {
-                    auto next = *(cmd + 1);
-                    if (next == PathCommand::LineTo || next == PathCommand::CubicTo) {
-                        assign(*pt * m, box);
-                    }
-                }
-                ++pt;
-                break;
-            }
-            case PathCommand::LineTo: {
-                assign(*pt * m, box);
-                ++pt;
-                break;
-            }
-            case PathCommand::CubicTo: {
-                Bezier::bounds(box, pt[-1] * m, pt[0] * m, pt[1] * m, pt[2] * m);
-                pt += 3;
-                break;
-            }
-            default: break;
-        }
-        ++cmd;
-    }
-    return true;
-}
-
-
-void RenderPath::optimize(RenderPath& out, const Matrix& matrix, bool& thin) const
-{
-#if defined(THORVG_GL_RASTER_SUPPORT) || defined (THORVG_WG_RASTER_SUPPORT)
-    static constexpr auto PX_TOLERANCE = 0.25f;
-
-    thin = false;
-    if (empty()) return;
-
-    out.cmds.clear();
-    out.pts.clear();
-    out.cmds.reserve(cmds.count);
-    out.pts.reserve(pts.count);
-
-    auto cmds = this->cmds.data;
-    auto cmdCnt = this->cmds.count;
-    auto pts = this->pts.data;
-
-    Point lastOutT{};   // The suffix "T" indicates that the point is transformed.
-    Point subpathStartT{};
-    Point thinLineStart{};
-    Point thinLineVec{};
-    auto drawableSubpathCnt = 0u;
-    auto thinLineVecLen = 0.0f;
-    auto thinCandidate = true;
-    auto thinLineReady = false;
-    auto subpathOpen = false;
-    auto subpathHasSegment = false;
-
-    auto finalizeSubpath = [&]() {
-        if (!subpathHasSegment) return;
-        ++drawableSubpathCnt;
-        if (drawableSubpathCnt > 1) thinCandidate = false;
-        subpathHasSegment = false;
-    };
-
-    //vecLen is guaranteed to be non-zero since closed points are already merged
-    auto point2Line = [](const Point& point, const Point& start, const Point& vec, float vecLen, float& maxDist, float& minT, float& maxT) {
-        Point offset = point - start;
-        auto dist = fabsf(tvg::cross(vec, offset)) / vecLen;
-        if (dist > maxDist) maxDist = dist;
-        auto t = tvg::dot(offset, vec) / (vecLen * vecLen);
-        if (t < minT) minT = t;
-        if (t > maxT) maxT = t;
-    };
-
-    auto validateCubic = [&point2Line](const Point& start, const Point& ctrl1, const Point& ctrl2, const Point& end, float& maxDist, float& minT, float& maxT, float& vecLen) {
-        auto vec = end - start;
-        vecLen = sqrtf(vec.x * vec.x + vec.y * vec.y);
-        maxDist = 0.0f;
-        minT = FLT_MAX;
-        maxT = FLT_MIN;
-        point2Line(ctrl1, start, vec, vecLen, maxDist, minT, maxT);
-        point2Line(ctrl2, start, vec, vecLen, maxDist, minT, maxT);
-    };
-
-    auto checkThinPoint = [&](const Point& ptT) {
-        if (!thinCandidate || !thinLineReady) return;
-        auto dist = fabsf(tvg::cross(thinLineVec, ptT - thinLineStart)) / thinLineVecLen;
-        if (dist > PX_TOLERANCE) thinCandidate = false;
-    };
-
-    auto collectThinSegment = [&](const Point& startT, const Point& endT) {
-        subpathHasSegment = true;
-        if (!thinCandidate) return;
-
-        if (!thinLineReady) {
-            if (!tvg::closed(startT, endT, PX_TOLERANCE)) {
-                thinLineStart = startT;
-                thinLineVec = endT - startT;
-                thinLineVecLen = sqrtf(thinLineVec.x * thinLineVec.x + thinLineVec.y * thinLineVec.y);
-                if (!tvg::zero(thinLineVecLen)) thinLineReady = true;
-            }
-        } else {
-            checkThinPoint(startT);
-            checkThinPoint(endT);
-        }
-    };
-
-    auto addLineCmd = [&](const Point& startT, const Point& ptT) {
-        out.cmds.push(PathCommand::LineTo);
-        out.pts.push(ptT);
-        lastOutT = ptT;
-        collectThinSegment(startT, ptT);
-    };
-
-    auto processCubicTo = [&](const Point* cubicPts, const Point& startT) {
-        auto ctrl1T = cubicPts[0] * matrix;
-        auto ctrl2T = cubicPts[1] * matrix;
-        auto endT = cubicPts[2] * matrix;
-        if (tvg::closed(startT, endT, PX_TOLERANCE)) return;
-        float maxDist, minT, maxT, vecLen;
-        validateCubic(startT, ctrl1T, ctrl2T, endT, maxDist, minT, maxT, vecLen);
-        auto flat = (maxDist <= PX_TOLERANCE);
-        auto tEps = PX_TOLERANCE / vecLen;
-        auto inSpan = (minT >= -tEps) && (maxT <= 1.0f + tEps);
-        if (flat && inSpan) {
-            addLineCmd(startT, endT);
-        } else {
-            out.cmds.push(PathCommand::CubicTo);
-            out.pts.push(ctrl1T);
-            out.pts.push(ctrl2T);
-            out.pts.push(endT);
-            lastOutT = endT;
-            subpathHasSegment = true;
-            thinCandidate = false;
-        }
-    };
-
-    for (uint32_t i = 0; i < cmdCnt; i++) {
-        switch (cmds[i]) {
-            case PathCommand::MoveTo: {
-                finalizeSubpath();
-                auto ptT = (*pts) * matrix;
-                out.cmds.push(PathCommand::MoveTo);
-                out.pts.push(ptT);
-                lastOutT = ptT;
-                subpathStartT = ptT;
-                subpathOpen = true;
-                pts++;
-                break;
-            }
-            case PathCommand::LineTo: {
-                auto startT = lastOutT;
-                auto ptT = (*pts) * matrix;
-                if (tvg::closed(startT, ptT, PX_TOLERANCE)) {
-                    pts++;
-                    break;
-                }
-                addLineCmd(startT, ptT);
-                pts++;
-                break;
-            }
-            case PathCommand::CubicTo: {
-                processCubicTo(pts, lastOutT);
-                pts += 3;
-                break;
-            }
-            case PathCommand::Close: {
-                if (subpathOpen && !tvg::closed(lastOutT, subpathStartT, PX_TOLERANCE)) collectThinSegment(lastOutT, subpathStartT);
-                out.cmds.push(PathCommand::Close);
-                lastOutT = subpathStartT;
-                break;
-            }
-            default: break;
-        }
-    }
-    finalizeSubpath();
-    thin = thinCandidate && thinLineReady && (drawableSubpathCnt == 1);
-#else
-    thin = false;
-    TVGLOG("RENDERER", "RenderPath transformed optimization is disabled");
-#endif
-}
-
-
-/************************************************************************/
-/* RenderRegion Class Implementation                                    */
-/************************************************************************/
-
-
 void RenderRegion::intersect(const RenderRegion& rhs)
 {
-    if (min.x < rhs.min.x) min.x = rhs.min.x;
-    if (min.y < rhs.min.y) min.y = rhs.min.y;
-    if (max.x > rhs.max.x) max.x = rhs.max.x;
-    if (max.y > rhs.max.y) max.y = rhs.max.y;
+    auto x1 = x + w;
+    auto y1 = y + h;
+    auto x2 = rhs.x + rhs.w;
+    auto y2 = rhs.y + rhs.h;
 
-    // Not intersected: collapse to zero-area region
-    if (max.x < min.x) max.x = min.x;
-    if (max.y < min.y) max.y = min.y;
+    x = (x > rhs.x) ? x : rhs.x;
+    y = (y > rhs.y) ? y : rhs.y;
+    w = ((x1 < x2) ? x1 : x2) - x;
+    h = ((y1 < y2) ? y1 : y2) - y;
+
+    if (w < 0) w = 0;
+    if (h < 0) h = 0;
 }
 
-#ifdef THORVG_PARTIAL_RENDER_SUPPORT
 
-#include <algorithm>
-
-void RenderDirtyRegion::init(uint32_t w, uint32_t h)
+void RenderRegion::add(const RenderRegion& rhs)
 {
-    auto cnt = int(sqrt(PARTITIONING));
-    auto px = int32_t(w / cnt);
-    auto py = int32_t(h / cnt);
-    auto lx = int32_t(w % cnt);
-    auto ly = int32_t(h % cnt);
-
-    //space partitioning
-    for (int y = 0; y < cnt; ++y) {
-        for (int x = 0; x < cnt; ++x) {
-            auto& partition = partitions[y * cnt + x];
-            partition.list[0].reserve(64);
-            auto& region = partition.region;
-            region.min = {x * px, y * py};
-            region.max = {region.min.x + px, region.min.y + py};
-            //leftovers
-            if (x == cnt -1) region.max.x += lx;
-            if (y == cnt -1) region.max.y += ly;
-        }
+    if (rhs.x < x) {
+        w += (x - rhs.x);
+        x = rhs.x;
     }
-}
-
-
-bool RenderDirtyRegion::add(const RenderRegion& bbox)
-{
-    for (int idx = 0; idx < PARTITIONING; ++idx) {
-        auto& partition = partitions[idx];
-        if (bbox.max.y <= partition.region.min.y) break;
-        if (bbox.intersected(partition.region)) {
-            ScopedLock lock(key);
-            partition.list[partition.current].push(RenderRegion::intersect(bbox, partition.region));
-        }
+    if (rhs.y < y) {
+        h += (y - rhs.y);
+        y = rhs.y;
     }
-    return true;
+    if (rhs.x + rhs.w > x + w) w = (rhs.x + rhs.w) - x;
+    if (rhs.y + rhs.h > y + h) h = (rhs.y + rhs.h) - y;
 }
-
-
-bool RenderDirtyRegion::add(const RenderRegion& prv, const RenderRegion& cur)
-{
-    if (prv == cur) return add(prv);
-
-    for (int idx = 0; idx < PARTITIONING; ++idx) {
-        auto& partition = partitions[idx];
-        if (prv.intersected(partition.region)) {
-            ScopedLock lock(key);
-            partition.list[partition.current].push(RenderRegion::intersect(prv, partition.region));
-        }
-        if (cur.intersected(partition.region)) {
-            ScopedLock lock(key);
-            partition.list[partition.current].push(RenderRegion::intersect(cur, partition.region));
-        }
-    }
-    return true;
-}
-
-
-void RenderDirtyRegion::clear()
-{
-    for (int idx = 0; idx < PARTITIONING; ++idx) {
-        partitions[idx].list[0].clear();
-        partitions[idx].list[1].clear();
-    }
-}
-
-
-void RenderDirtyRegion::subdivide(Array<RenderRegion>& targets, uint32_t idx, RenderRegion& lhs, RenderRegion& rhs)
-{
-    RenderRegion temp[3];
-    uint32_t cnt = 0;
-
-    //subtract top
-    if (rhs.min.y < lhs.min.y) {
-        temp[cnt++] = {{rhs.min.x, rhs.min.y}, {rhs.max.x, lhs.min.y}};
-        rhs.min.y = lhs.min.y;
-    }
-    //subtract bottom
-    if (rhs.max.y > lhs.max.y) {
-        temp[cnt++] = {{rhs.min.x, lhs.max.y}, {rhs.max.x, rhs.max.y}};
-        rhs.max.y = lhs.max.y;
-    }
-    //subtract right
-    if (rhs.max.x > lhs.max.x) {
-        temp[cnt++] = {{lhs.max.x, rhs.min.y}, {rhs.max.x, rhs.max.y}};
-    }
-
-    //Please reserve memory enough with targets.reserve()
-    if (targets.count + cnt - 1 >= targets.reserved) {
-        TVGERR("RENDERER", "reserved(%d), required(%d)", targets.reserved, targets.count + cnt - 1);
-        return;
-    }
-
-    /* Shift data. Considered using a list to avoid memory shifting,
-       but ultimately, the array outperformed the list due to better cache locality. */
-    auto src = &targets[idx + 1];
-    auto dst = &targets[idx + cnt];   // <-- shift right by (cnt - 1)
-    auto nmove = targets.count - idx - 1;  // number of tail elements
-    memmove(dst, src, sizeof(RenderRegion) * nmove);
-    memcpy(&targets[idx], temp, sizeof(RenderRegion) * cnt);
-    targets.count += (cnt - 1);
-
-    //sorting by x coord again, only for the updated region
-    while (dst < targets.end() && dst->min.x < rhs.max.x) ++dst;
-    stable_sort(&targets[idx], dst, [](const RenderRegion& a, const RenderRegion& b) -> bool {
-        return a.min.x < b.min.x;
-    });
-}
-
-
-void RenderDirtyRegion::commit()
-{
-    if (disabled) return;
-
-    for (int idx = 0; idx < PARTITIONING; ++idx) {
-        auto current = partitions[idx].current;
-        auto& targets = partitions[idx].list[current];
-        if (targets.empty()) continue;
-
-        current = !current; //swapping buffers
-        auto& output = partitions[idx].list[current];
-
-        targets.reserve(targets.count * 10);  //one intersection can be divided up to 3
-        output.reserve(targets.count);
-
-        partitions[idx].current = current;
-
-        //sorting by x coord. guarantee the stable performance: O(NlogN)
-        stable_sort(targets.begin(), targets.end(), [](const RenderRegion& a, const RenderRegion& b) -> bool {
-            return a.min.x < b.min.x;
-        });
-
-        //Optimized using sweep-line algorithm: O(NlogN)
-        for (uint32_t i = 0; i < targets.count; ++i) {
-            auto& lhs = targets[i];
-            if (lhs.invalid()) continue;
-            auto merged = false;
-
-            for (uint32_t j = i + 1; j < targets.count; ++j) {
-                auto& rhs = targets[j];
-                if (rhs.invalid()) continue;
-                if (lhs.max.x < rhs.min.x) break;   //line sweeping
-
-                //fully overlapped. drop lhs
-                if (rhs.contained(lhs)) {
-                    merged = true;
-                    break;
-                }
-                //fully overlapped. replace the lhs with rhs
-                if (lhs.contained(rhs)) {
-                    rhs = {};
-                    continue;
-                }
-                //just merge & expand on x axis
-                if (lhs.min.y == rhs.min.y && lhs.max.y == rhs.max.y) {
-                    if (lhs.max.x >= rhs.min.x) {
-                        lhs.max.x = rhs.max.x;
-                        rhs = {};
-                        j = i;   //lhs dirty region has been damaged, try again.
-                        continue;
-                    }
-                }
-                //just merge & expand on y axis
-                if (lhs.min.x == rhs.min.x && lhs.max.x == rhs.max.x) {
-                    if (lhs.min.y <= rhs.max.y && rhs.min.y <= lhs.max.y) {
-                        rhs.min.y = std::min(lhs.min.y, rhs.min.y);
-                        rhs.max.y = std::max(lhs.max.y, rhs.max.y);
-                        merged = true;
-                        break;
-                    }
-                }
-                //subdivide regions
-                if (lhs.intersected(rhs)) {
-                    subdivide(targets, j, lhs, rhs);
-                    --j; //rhs dirty region has been damaged, try again.
-                }
-            }
-            if (!merged) output.push(lhs);  //this region is complete isolated
-            lhs = {};
-        }
-    }
-}
-
-#endif
-
-/************************************************************************/
-/* RenderTrimPath Class Implementation                                  */
-/************************************************************************/
-
-#define EPSILON 1e-4f
-
-
-static void _trimAt(const PathCommand* cmds, const Point* pts, Point& moveTo, float at1, float at2, bool start, RenderPath& out)
-{
-    switch (*cmds) {
-        case PathCommand::LineTo: {
-            Line tmp, left, right;
-            Line{*(pts - 1), *pts}.split(at1, left, tmp);
-            tmp.split(at2, left, right);
-            if (start) {
-                out.pts.push(left.pt1);
-                moveTo = left.pt1;
-                out.cmds.push(PathCommand::MoveTo);
-            }
-            out.pts.push(left.pt2);
-            out.cmds.push(PathCommand::LineTo);
-            break;
-        }
-        case PathCommand::CubicTo: {
-            Bezier tmp, left, right;
-            Bezier{*(pts - 1), *pts, *(pts + 1), *(pts + 2)}.split(at1, left, tmp);
-            tmp.split(at2, left, right);
-            if (start) {
-                moveTo = left.start;
-                out.pts.push(left.start);
-                out.cmds.push(PathCommand::MoveTo);
-            }
-            out.pts.push(left.ctrl1);
-            out.pts.push(left.ctrl2);
-            out.pts.push(left.end);
-            out.cmds.push(PathCommand::CubicTo);
-            break;
-        }
-        case PathCommand::Close: {
-            Line tmp, left, right;
-            Line{*(pts - 1), moveTo}.split(at1, left, tmp);
-            tmp.split(at2, left, right);
-            if (start) {
-                moveTo = left.pt1;
-                out.pts.push(left.pt1);
-                out.cmds.push(PathCommand::MoveTo);
-            }
-            out.pts.push(left.pt2);
-            out.cmds.push(PathCommand::LineTo);
-            break;
-        }
-        default: break;
-    }
-}
-
-
-static void _add(const PathCommand* cmds, const Point* pts, const Point& moveTo, bool& start, RenderPath& out)
-{
-    switch (*cmds) {
-        case PathCommand::MoveTo: {
-            out.cmds.push(PathCommand::MoveTo);
-            out.pts.push(*pts);
-            start = false;
-            break;
-        }
-        case PathCommand::LineTo: {
-            if (start) {
-                out.cmds.push(PathCommand::MoveTo);
-                out.pts.push(*(pts - 1));
-            }
-            out.cmds.push(PathCommand::LineTo);
-            out.pts.push(*pts);
-            start = false;
-            break;
-        }
-        case PathCommand::CubicTo: {
-            if (start) {
-                out.cmds.push(PathCommand::MoveTo);
-                out.pts.push(*(pts - 1));
-            }
-            out.cmds.push(PathCommand::CubicTo);
-            out.pts.push(*pts);
-            out.pts.push(*(pts + 1));
-            out.pts.push(*(pts + 2));
-            start = false;
-            break;
-        }
-        case PathCommand::Close: {
-            if (start) {
-                out.cmds.push(PathCommand::MoveTo);
-                out.pts.push(*(pts - 1));
-            }
-            out.cmds.push(PathCommand::LineTo);
-            out.pts.push(moveTo);
-            start = true;
-            break;
-        }
-    }
-}
-
-
-static void _trimPath(const PathCommand* inCmds, uint32_t inCmdsCnt, const Point* inPts, TVG_UNUSED uint32_t inPtsCnt, float trimStart, float trimEnd, RenderPath& out, bool connect = false)
-{
-    auto cmds = const_cast<PathCommand*>(inCmds);
-    auto pts = const_cast<Point*>(inPts);
-    auto moveToTrimmed = *pts;
-    auto moveTo = *pts;
-    auto len = 0.0f;
-
-    auto _length = [&]() -> float {
-        switch (*cmds) {
-            case PathCommand::MoveTo: return 0.0f;
-            case PathCommand::LineTo: return tvg::length(*(pts - 1), *pts);
-            case PathCommand::CubicTo: return Bezier{*(pts - 1), *pts, *(pts + 1), *(pts + 2)}.length();
-            case PathCommand::Close: return tvg::length(*(pts - 1), moveTo);
-        }
-        return 0.0f;
-    };
-
-    auto _shift = [&]() -> void {
-        switch (*cmds) {
-            case PathCommand::MoveTo:
-                moveTo = *pts;
-                moveToTrimmed = *pts;
-                ++pts;
-                break;
-            case PathCommand::LineTo:
-                ++pts;
-                break;
-            case PathCommand::CubicTo:
-                pts += 3;
-                break;
-            case PathCommand::Close:
-                break;
-        }
-        ++cmds;
-    };
-
-    auto start = !connect;
-
-    for (uint32_t i = 0; i < inCmdsCnt; ++i) {
-        auto dLen = _length();
-
-        //very short segments are skipped since due to the finite precision of Bezier curve subdivision and length calculation (1e-2),
-        //trimming may produce very short segments that would effectively have zero length with higher computational accuracy.
-        if (len <= trimStart) {
-            //cut the segment at the beginning and at the end
-            if (len + dLen > trimEnd) {
-                _trimAt(cmds, pts, moveToTrimmed, trimStart - len, trimEnd - trimStart, start, out);
-                start = false;
-                //cut the segment at the beginning
-            } else if (len + dLen > trimStart + EPSILON) {
-                _trimAt(cmds, pts, moveToTrimmed, trimStart - len, len + dLen - trimStart, start, out);
-                start = false;
-            }
-        } else if (len <= trimEnd - EPSILON) {
-            //cut the segment at the end
-            if (len + dLen > trimEnd) {
-                _trimAt(cmds, pts, moveTo, 0.0f, trimEnd - len, start, out);
-                start = true;
-            //add the whole segment
-            } else if (len + dLen > trimStart + EPSILON) _add(cmds, pts, moveTo, start, out);
-        }
-
-        len += dLen;
-        _shift();
-    }
-}
-
-
-static void _trim(const PathCommand* inCmds, uint32_t inCmdsCnt, const Point* inPts, uint32_t inPtsCnt, float begin, float end, bool connect, RenderPath& out)
-{
-    auto totalLength = tvg::length(inCmds, inCmdsCnt, inPts, inPtsCnt);
-    auto trimStart = begin * totalLength;
-    auto trimEnd = end * totalLength;
-
-    if (begin >= end) {
-        _trimPath(inCmds, inCmdsCnt, inPts, inPtsCnt, trimStart, totalLength, out);
-        _trimPath(inCmds, inCmdsCnt, inPts, inPtsCnt, 0.0f, trimEnd, out, connect);
-    } else {
-        _trimPath(inCmds, inCmdsCnt, inPts, inPtsCnt, trimStart, trimEnd, out);
-    }
-}
-
-
-static void _get(float& begin, float& end)
-{
-    auto loop = true;
-
-    if (begin > 1.0f && end > 1.0f) loop = false;
-    if (begin < 0.0f && end < 0.0f) loop = false;
-    if (begin >= 0.0f && begin <= 1.0f && end >= 0.0f  && end <= 1.0f) loop = false;
-
-    if (begin > 1.0f) begin -= 1.0f;
-    if (begin < 0.0f) begin += 1.0f;
-    if (end > 1.0f) end -= 1.0f;
-    if (end < 0.0f) end += 1.0f;
-
-    if ((loop && begin < end) || (!loop && begin > end)) std::swap(begin, end);
-}
-
-
-bool RenderTrimPath::trim(const RenderPath& in, RenderPath& out) const
-{
-    if (in.pts.count < 2 || tvg::zero(begin - end)) return false;
-
-    float begin = this->begin, end = this->end;
-    _get(begin, end);
-
-    out.cmds.reserve(in.cmds.count * 2);
-    out.pts.reserve(in.pts.count * 2);
-
-    auto pts = in.pts.data;
-    auto cmds = in.cmds.data;
-
-    if (simultaneous) {
-        auto startCmds = cmds;
-        auto startPts = pts;
-        uint32_t i = 0;
-        while (i < in.cmds.count) {
-            switch (in.cmds[i]) {
-                case PathCommand::MoveTo: {
-                    if (startCmds != cmds) _trim(startCmds, cmds - startCmds, startPts, pts - startPts, begin, end, *(cmds - 1) == PathCommand::Close, out);
-                    startPts = pts;
-                    startCmds = cmds;
-                    ++pts;
-                    ++cmds;
-                    break;
-                }
-                case PathCommand::LineTo: {
-                    ++pts;
-                    ++cmds;
-                    break;
-                }
-                case PathCommand::CubicTo: {
-                    pts += 3;
-                    ++cmds;
-                    break;
-                }
-                case PathCommand::Close: {
-                    ++cmds;
-                    if (startCmds != cmds) _trim(startCmds, cmds - startCmds, startPts, pts - startPts, begin, end, *(cmds - 1) == PathCommand::Close, out);
-                    startPts = pts;
-                    startCmds = cmds;
-                    break;
-                }
-            }
-            i++;
-        }
-        if (startCmds != cmds) _trim(startCmds, cmds - startCmds, startPts, pts - startPts, begin, end, *(cmds - 1) == PathCommand::Close, out);
-    } else {
-        _trim(in.cmds.data, in.cmds.count, in.pts.data, in.pts.count, begin, end, false, out);
-    }
-
-    return out.pts.count >= 2;
-}
-
-/************************************************************************/
-/* StrokeDashPath Class Implementation                                  */
-/************************************************************************/
-
-//TODO: use this common function from sw engine
-#if defined(THORVG_GL_RASTER_SUPPORT) || defined(THORVG_WG_RASTER_SUPPORT)
-
-struct StrokeDashPath
-{
-public:
-    StrokeDashPath(RenderStroke::Dash dash) : dash(dash) {}
-    bool gen(const RenderPath& in, RenderPath& out, bool drawPoint, const Matrix* transform = nullptr);
-
-private:
-    void lineTo(RenderPath& out, const Point& pt, bool drawPoint);
-    void cubicTo(RenderPath& out, const Point& pt1, const Point& pt2, const Point& pt3, bool drawPoint);
-    void point(RenderPath& out, const Point& p);
-    Point map(const Point& pt) const { return applyTransform ? pt * (*transform) : pt; }
-    template<typename Segment, typename LengthFn, typename SplitFn, typename DrawFn, typename PointFn>
-    void segment(Segment seg, float len, RenderPath& out, bool allowDot, LengthFn lengthFn, SplitFn splitFn, DrawFn drawFn, PointFn getStartPt, const Point& endPos);
-
-    RenderStroke::Dash dash;
-    float curLen = 0.0f;
-    int32_t curIdx = 0;
-    Point curPos{};
-    bool opGap = false;
-    bool move = true;
-    const Matrix* transform = nullptr;
-    bool applyTransform = false;
-};
-
-
-template<typename Segment, typename LengthFn, typename SplitFn, typename DrawFn, typename PointFn>
-void StrokeDashPath::segment(Segment seg, float len, RenderPath& out, bool allowDot, LengthFn lengthFn, SplitFn splitFn, DrawFn drawFn, PointFn getStartPt, const Point& end)
-{
-    #define MIN_CURR_LEN_THRESHOLD 0.1f
-
-    if (tvg::zero(len)) {
-        out.moveTo(map(curPos));
-    } else if (len <= curLen) {
-        curLen -= len;
-        if (!opGap) {
-            if (move) {
-                out.moveTo(map(curPos));
-                move = false;
-            }
-            drawFn(seg);
-        }
-    } else {
-        Segment left, right;
-        while (len - curLen > DASH_PATTERN_THRESHOLD) {
-            if (curLen > 0.0f) {
-                splitFn(seg, curLen, left, right);
-                len -= curLen;
-                if (!opGap) {
-                    if (move || dash.pattern[curIdx] - curLen < FLOAT_EPSILON) {
-                        out.moveTo(map(getStartPt(left)));
-                        move = false;
-                    }
-                    drawFn(left);
-                }
-            } else {
-                if (allowDot && !opGap) point(out, getStartPt(seg));
-                right = seg;
-            }
-
-            curIdx = (curIdx + 1) % dash.count;
-            curLen = dash.pattern[curIdx];
-            opGap = !opGap;
-            seg = right;
-            curPos = getStartPt(seg);
-            move = true;
-        }
-        curLen -= len;
-        if (!opGap) {
-            if (move) {
-                out.moveTo(map(getStartPt(seg)));
-                move = false;
-            }
-            drawFn(seg);
-        }
-        if (curLen < MIN_CURR_LEN_THRESHOLD) {
-            curIdx = (curIdx + 1) % dash.count;
-            curLen = dash.pattern[curIdx];
-            opGap = !opGap;
-        }
-    }
-    curPos = end;
-}
-
-
-//allowDot: zero length segment with non-butt cap still should be rendered as a point - only the caps are visible
-bool StrokeDashPath::gen(const RenderPath& in, RenderPath& out, bool allowDot, const Matrix* transform)
-{
-    this->transform = transform;
-    this->applyTransform = (transform && !tvg::identity(transform));
-
-    int32_t idx = 0;
-    auto offset = dash.offset;
-    auto gap = false;
-    if (!tvg::zero(dash.offset)) {
-        auto length = (dash.count % 2) ? dash.length * 2 : dash.length;
-        offset = fmodf(offset, length);
-        if (offset < 0) offset += length;
-
-        for (uint32_t i = 0; i < dash.count * (dash.count % 2 + 1); ++i, ++idx) {
-            auto curPattern = dash.pattern[i % dash.count];
-            if (offset < curPattern) break;
-            offset -= curPattern;
-            gap = !gap;
-        }
-        idx = idx % dash.count;
-    }
-
-    auto pts = in.pts.data;
-    Point start{};
-
-    ARRAY_FOREACH(cmd, in.cmds) {
-        switch (*cmd) {
-            case PathCommand::Close: {
-                lineTo(out, start, allowDot);
-                break;
-            }
-            case PathCommand::MoveTo: {
-                // reset the dash state
-                curIdx = idx;
-                curLen = dash.pattern[idx] - offset;
-                opGap = gap;
-                move = true;
-                start = curPos = *pts;
-                pts++;
-                break;
-            }
-            case PathCommand::LineTo: {
-                lineTo(out, *pts, allowDot);
-                pts++;
-                break;
-            }
-            case PathCommand::CubicTo: {
-                cubicTo(out, pts[0], pts[1], pts[2], allowDot);
-                pts += 3;
-                break;
-            }
-            default: break;
-        }
-    }
-    return true;
-}
-
-
-void StrokeDashPath::point(RenderPath& out, const Point& p)
-{
-    if (move || dash.pattern[curIdx] < FLOAT_EPSILON) {
-        out.moveTo(map(p));
-        move = false;
-    }
-    out.lineTo(map(p));
-}
-
-
-void StrokeDashPath::lineTo(RenderPath& out, const Point& to, bool allowDot)
-{
-    Line line = {curPos, to};
-    auto len = length(to - curPos);
-    segment<Line>(line, len, out, allowDot,
-        [](const Line& l) { return length(l.pt2 - l.pt1); },
-        [](const Line& l, float len, Line& left, Line& right) { l.split(len, left, right); },
-        [&](const Line& l) { out.lineTo(map(l.pt2)); },
-        [](const Line& l) { return l.pt1; },
-        to
-    );
-}
-
-
-void StrokeDashPath::cubicTo(RenderPath& out, const Point& cnt1, const Point& cnt2, const Point& end, bool allowDot)
-{
-    Bezier curve = {curPos, cnt1, cnt2, end};
-    auto len = curve.length();
-    segment<Bezier>(curve, len, out, allowDot,
-        [](const Bezier& b) { return b.length(); },
-        [](const Bezier& b, float len, Bezier& left, Bezier& right) { b.split(len, left, right); },
-        [&](const Bezier& b) { out.cubicTo(map(b.ctrl1), map(b.ctrl2), map(b.end)); },
-        [](const Bezier& b) { return b.start; },
-        end
-    );
-}
-
-
-bool RenderShape::strokeDash(RenderPath& out, const Matrix* transform) const
-{
-    if (!stroke || stroke->dash.count == 0 || stroke->dash.length < DASH_PATTERN_THRESHOLD) return false;
-
-    out.cmds.reserve(20 * path.cmds.count);
-    out.pts.reserve(20 * path.pts.count);
-
-    StrokeDashPath dash(stroke->dash);
-    auto allowDot = stroke->cap != StrokeCap::Butt;
-
-    if (trimpath()) {
-        RenderPath tpath;
-        if (stroke->trim.trim(path, tpath)) return dash.gen(tpath, out, allowDot, transform);
-        else return false;
-    }
-    return dash.gen(path, out, allowDot, transform);
-}
-#else
-bool RenderShape::strokeDash(RenderPath& out, const Matrix* transform) const
-{
-    return false;
-}
-#endif
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgRender.h b/engine/thirdparty/thorvg/src/renderer/tvgRender.h
index c1c1f582..4e48eed5 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgRender.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgRender.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,19 +28,15 @@
 #include "tvgCommon.h"
 #include "tvgArray.h"
 #include "tvgLock.h"
-#include "tvgColor.h"
-#include "tvgMath.h"
 
 namespace tvg
 {
 
 using RenderData = void*;
-using RenderColor = tvg::RGBA;
 using pixel_t = uint32_t;
 
 #define DASH_PATTERN_THRESHOLD 0.001f
 
-//TODO: Separate Color & Opacity for more detailed conditional check
 enum RenderUpdateFlag : uint16_t {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, Blend = 128, Clip = 256, All = 0xffff};
 enum CompositionFlag : uint8_t {Invalid = 0, Opacity = 1, Blending = 2, Masking = 4, PostProcessing = 8};  //Composition Purpose
 
@@ -49,10 +45,16 @@ static inline void operator|=(RenderUpdateFlag& a, const RenderUpdateFlag b)
     a = RenderUpdateFlag(uint16_t(a) | uint16_t(b));
 }
 
-static inline RenderUpdateFlag operator|(const RenderUpdateFlag a, const RenderUpdateFlag b)
+//TODO: Move this in public header unifying with SwCanvas::Colorspace
+enum ColorSpace : uint8_t
 {
-    return RenderUpdateFlag(uint16_t(a) | uint16_t(b));
-}
+    ABGR8888 = 0,      //The channels are joined in the order: alpha, blue, green, red. Colors are alpha-premultiplied.
+    ARGB8888,          //The channels are joined in the order: alpha, red, green, blue. Colors are alpha-premultiplied.
+    ABGR8888S,         //The channels are joined in the order: alpha, blue, green, red. Colors are un-alpha-premultiplied.
+    ARGB8888S,         //The channels are joined in the order: alpha, red, green, blue. Colors are un-alpha-premultiplied.
+    Grayscale8,        //One single channel data.
+    Unsupported        //TODO: Change to the default, At the moment, we put it in the last to align with SwCanvas::Colorspace.
+};
 
 struct RenderSurface
 {
@@ -64,7 +66,7 @@ struct RenderSurface
     Key key;                        //a reserved lock for the thread safety
     uint32_t stride = 0;
     uint32_t w = 0, h = 0;
-    ColorSpace cs = ColorSpace::Unknown;
+    ColorSpace cs = ColorSpace::Unsupported;
     uint8_t channelSize = 0;
     bool premultiplied = false;         //Alpha-premultiplied
 
@@ -82,313 +84,120 @@ struct RenderSurface
         channelSize = rhs->channelSize;
         premultiplied = rhs->premultiplied;
     }
+
+
 };
 
 struct RenderCompositor
 {
-    MaskMethod method;
+    CompositeMethod method;
     uint8_t opacity;
 };
 
 struct RenderRegion
 {
-    struct {
-        int32_t x, y;
-    } min;
-
-    struct {
-        int32_t x, y;
-    } max;
-
-    static constexpr RenderRegion intersect(const RenderRegion& lhs, const RenderRegion& rhs)
-    {
-        RenderRegion ret = {{std::max(lhs.min.x, rhs.min.x), std::max(lhs.min.y, rhs.min.y)}, {std::min(lhs.max.x, rhs.max.x), std::min(lhs.max.y, rhs.max.y)}};
-        // Not intersected: collapse to zero-area region
-        if (ret.min.x > ret.max.x) ret.max.x = ret.min.x;
-        if (ret.min.y > ret.max.y) ret.max.y = ret.min.y;
-        return ret;
-    }
-
-    static constexpr RenderRegion add(const RenderRegion& lhs, const RenderRegion& rhs)
-    {
-        return {{std::min(lhs.min.x, rhs.min.x), std::min(lhs.min.y, rhs.min.y)}, {std::max(lhs.max.x, rhs.max.x), std::max(lhs.max.y, rhs.max.y)}};
-    }
+    int32_t x, y, w, h;
 
     void intersect(const RenderRegion& rhs);
-
-    void add(const RenderRegion& rhs)
-    {
-        if (rhs.min.x < min.x) min.x = rhs.min.x;
-        if (rhs.min.y < min.y) min.y = rhs.min.y;
-        if (rhs.max.x > max.x) max.x = rhs.max.x;
-        if (rhs.max.y > max.y) max.y = rhs.max.y;
-    }
-
-    bool contained(const RenderRegion& rhs) const
-    {
-        return (min.x <= rhs.min.x && max.x >= rhs.max.x && min.y <= rhs.min.y && max.y >= rhs.max.y);
-    }
-
-    bool intersected(const RenderRegion& rhs) const
-    {
-        return (rhs.min.x < max.x && rhs.max.x > min.x && rhs.min.y < max.y && rhs.max.y > min.y);
-    }
+    void add(const RenderRegion& rhs);
 
     bool operator==(const RenderRegion& rhs) const
     {
-        return (min.x == rhs.min.x && min.y == rhs.min.y && max.x == rhs.max.x && max.y == rhs.max.y);
-    }
-
-    void reset() { min.x = min.y = max.x = max.y = 0; }
-    bool valid() const { return (max.x > min.x && max.y > min.y); }
-    bool invalid() const { return !valid(); }
-
-    int32_t sx() const { return min.x; }
-    int32_t sy() const { return min.y; }
-    int32_t sw() const { return max.x - min.x; }
-    int32_t sh() const { return max.y - min.y; }
-
-    uint32_t x() const { return (uint32_t) sx(); }
-    uint32_t y() const { return (uint32_t) sy(); }
-    uint32_t w() const { return (uint32_t) sw(); }
-    uint32_t h() const { return (uint32_t) sh(); }
-};
-
-
-#ifdef THORVG_PARTIAL_RENDER_SUPPORT
-    struct RenderDirtyRegion
-    {
-    public:
-        static constexpr const int PARTITIONING = 16;   //must be N*N
-        bool support = true;
-
-        void init(uint32_t w, uint32_t h);
-        void commit();
-        bool add(const RenderRegion& bbox);
-        bool add(const RenderRegion& prv, const RenderRegion& cur);  //collect the old and new dirty regions together
-        void clear();
-
-        bool deactivate(bool on)
-        {
-            std::swap(on, disabled);
-            return on;
-        }
-
-        bool deactivated()
-        {
-            return (!support || disabled);
-        }
-
-        const RenderRegion& partition(int idx)
-        {
-            return partitions[idx].region;
-        }
-
-        const Array<RenderRegion>& get(int idx)
-        {
-            return partitions[idx].list[partitions[idx].current];
-        }
-
-    private:
-        void subdivide(Array<RenderRegion>& targets, uint32_t idx, RenderRegion& lhs, RenderRegion& rhs);
-
-        struct Partition
-        {
-            RenderRegion region;
-            Array<RenderRegion> list[2];  //double buffer swapping
-            uint8_t current = 0;  //double buffer swapping list index. 0 or 1
-        };
-
-        Key key;
-        Partition partitions[PARTITIONING];
-        bool disabled = false;
-    };
-#else
-    struct RenderDirtyRegion
-    {
-        static constexpr const int PARTITIONING = 16;   //must be N*N
-        bool support = true;
-
-        void init(uint32_t w, uint32_t h) {}
-        void commit() {}
-        bool add(TVG_UNUSED const RenderRegion& bbox) { return true; }
-        bool add(TVG_UNUSED const RenderRegion& prv, TVG_UNUSED const RenderRegion& cur) { return true; }
-        void clear() {}
-        bool deactivate(TVG_UNUSED bool on) { return true; }
-        bool deactivated() { return true; }
-        const RenderRegion& partition(TVG_UNUSED int idx) { static RenderRegion tmp{}; return tmp; }
-        const Array<RenderRegion>& get(TVG_UNUSED int idx) { static Array<RenderRegion> tmp; return tmp; }
-    };
-#endif
-
-
-struct RenderPath
-{
-    Array<PathCommand> cmds;
-    Array<Point> pts;
-
-    bool empty() const
-    {
-        return pts.empty();
-    }
-
-    void clear()
-    {
-        pts.clear();
-        cmds.clear();
-    }
-
-    void close()
-    {
-        //Don't close multiple times.
-        if (cmds.count > 0 && cmds.last() == PathCommand::Close) return;
-        cmds.push(PathCommand::Close);
-    }
-
-    void moveTo(const Point& pt)
-    {
-        pts.push(pt);
-        cmds.push(PathCommand::MoveTo);
-    }
-
-    void lineTo(const Point& pt)
-    {
-        pts.push(pt);
-        cmds.push(PathCommand::LineTo);
-    }
-
-    void cubicTo(const Point& cnt1, const Point& cnt2, const Point& end)
-    {
-        pts.push(cnt1);
-        pts.push(cnt2);
-        pts.push(end);
-        cmds.push(PathCommand::CubicTo);
-    }
-
-    Point point(float progress)
-    {
-        if (progress <= 0.0f) return pts.first();
-        else if (progress >= 1.0f) return pts.last();
-
-        auto pleng = tvg::length(cmds.data, cmds.count, pts.data, pts.count) * progress;
-        auto cleng = 0.0f;
-        auto p = pts.data;
-        auto c = cmds.data;
-        Point curr{}, start{}, next{};
-
-        while (c < cmds.data + cmds.count) {
-            switch (*c) {
-                case PathCommand::MoveTo: {
-                    curr = start = *p++;
-                    break;
-                }
-                case PathCommand::LineTo: {
-                    next = *p;
-                    auto segLen = tvg::length(curr, next);
-                    if (cleng + segLen >= pleng) return lerp(curr, next, (pleng - cleng) / segLen);
-                    cleng += segLen;
-                    curr = *p++;
-                    break;
-                }
-                case PathCommand::CubicTo: {
-                    Bezier bz = {curr, *p, *(p + 1), *(p + 2)};
-                    auto segLen = bz.length();
-                    if (cleng + segLen >= pleng) return bz.at((pleng - cleng) / segLen);
-                    cleng += segLen;
-                    curr = *(p + 2);
-                    p += 3;
-                    break;
-                }
-                case PathCommand::Close: {
-                    auto segLen = tvg::length(curr, start);
-                    if (cleng + segLen >= pleng) return lerp(curr, start, (pleng - cleng) / segLen);
-                    cleng += segLen;
-                    curr = start;
-                    break;
-                }
-            }
-            ++c;
-        }
-        return curr;
-    }
-
-    /* Optimize path in screen space by collapsing zero length lines
-       and removing unnecessary cubic beziers. */
-    void optimize(RenderPath& out, const Matrix& matrix, bool& thin) const;
-    bool bounds(const Matrix* m, BBox& box);
-    void addCircle(float cx, float cy, float rx, float ry, bool cw);
-    void addRect(float x, float y, float w, float h, float rx, float ry, bool cw);
-};
-
-struct RenderTrimPath
-{
-    float begin = 0.0f;
-    float end = 1.0f;
-    bool simultaneous = true;
-
-    bool valid()
-    {
-        if (begin != 0.0f || end != 1.0f) return true;
+        if (x == rhs.x && y == rhs.y && w == rhs.w && h == rhs.h) return true;
         return false;
     }
-
-    bool trim(const RenderPath& in, RenderPath& out) const;
 };
 
 struct RenderStroke
 {
     float width = 0.0f;
-    RenderColor color{};
+    uint8_t color[4] = {0, 0, 0, 0};
     Fill *fill = nullptr;
-    struct Dash {
-        float* pattern = nullptr;
-        uint32_t count = 0;
-        float offset = 0.0f;
-        float length = 0.0f;
-    } dash;
-    float miterlimit = 4.0f;
-    RenderTrimPath trim;
+    float* dashPattern = nullptr;
+    uint32_t dashCnt = 0;
+    float dashOffset = 0.0f;
     StrokeCap cap = StrokeCap::Square;
     StrokeJoin join = StrokeJoin::Bevel;
-    bool first = false;
+    float miterlimit = 4.0f;
+    bool strokeFirst = false;
+
+    struct {
+        float begin = 0.0f;
+        float end = 1.0f;
+        bool simultaneous = true;
+    } trim;
 
     void operator=(const RenderStroke& rhs)
     {
         width = rhs.width;
-        color = rhs.color;
+
+        memcpy(color, rhs.color, sizeof(color));
 
         delete(fill);
         if (rhs.fill) fill = rhs.fill->duplicate();
         else fill = nullptr;
 
-        tvg::free(dash.pattern);
-        dash = rhs.dash;
-        if (rhs.dash.count > 0) {
-            dash.pattern = tvg::malloc<float>(sizeof(float) * rhs.dash.count);
-            memcpy(dash.pattern, rhs.dash.pattern, sizeof(float) * rhs.dash.count);
+        free(dashPattern);
+        if (rhs.dashCnt > 0) {
+            dashPattern = static_cast<float*>(malloc(sizeof(float) * rhs.dashCnt));
+            memcpy(dashPattern, rhs.dashPattern, sizeof(float) * rhs.dashCnt);
+        } else {
+            dashPattern = nullptr;
         }
-
+        dashCnt = rhs.dashCnt;
+        dashOffset = rhs.dashOffset;
         miterlimit = rhs.miterlimit;
-        trim = rhs.trim;
         cap = rhs.cap;
         join = rhs.join;
-        first = rhs.first;
+        strokeFirst = rhs.strokeFirst;
+        trim = rhs.trim;
+    }
+
+    bool strokeTrim(float& begin, float& end) const
+    {
+        begin = trim.begin;
+        end = trim.end;
+
+        if (fabsf(end - begin) >= 1.0f) {
+            begin = 0.0f;
+            end = 1.0f;
+            return false;
+        }
+
+        auto loop = true;
+
+        if (begin > 1.0f && end > 1.0f) loop = false;
+        if (begin < 0.0f && end < 0.0f) loop = false;
+        if (begin >= 0.0f && begin <= 1.0f && end >= 0.0f  && end <= 1.0f) loop = false;
+
+        if (begin > 1.0f) begin -= 1.0f;
+        if (begin < 0.0f) begin += 1.0f;
+        if (end > 1.0f) end -= 1.0f;
+        if (end < 0.0f) end += 1.0f;
+
+        if ((loop && begin < end) || (!loop && begin > end)) std::swap(begin, end);
+        return true;
     }
 
     ~RenderStroke()
     {
-        tvg::free(dash.pattern);
+        free(dashPattern);
         delete(fill);
     }
 };
 
 struct RenderShape
 {
-    RenderPath path;
+    struct
+    {
+        Array<PathCommand> cmds;
+        Array<Point> pts;
+    } path;
+
     Fill *fill = nullptr;
-    RenderColor color{};
     RenderStroke *stroke = nullptr;
-    FillRule rule = FillRule::NonZero;
+    uint8_t color[4] = {0, 0, 0, 0};    //r, g, b, a
+    FillRule rule = FillRule::Winding;
 
     ~RenderShape()
     {
@@ -398,78 +207,82 @@ struct RenderShape
 
     void fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const
     {
-        if (r) *r = color.r;
-        if (g) *g = color.g;
-        if (b) *b = color.b;
-        if (a) *a = color.a;
-    }
-
-    bool trimpath() const
-    {
-        return stroke ? stroke->trim.valid() : false;
-    }
-
-    bool strokeFirst() const
-    {
-        return (stroke && stroke->first) ? true : false;
+        if (r) *r = color[0];
+        if (g) *g = color[1];
+        if (b) *b = color[2];
+        if (a) *a = color[3];
     }
 
     float strokeWidth() const
     {
-        return stroke ? stroke->width : 0.0f;
+        if (!stroke) return 0;
+        return stroke->width;
     }
 
-    bool strokeFill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const
+    bool strokeTrim() const
+    {
+        if (!stroke) return false;
+        if (stroke->trim.begin == 0.0f && stroke->trim.end == 1.0f) return false;
+        if (fabsf(stroke->trim.end - stroke->trim.begin) >= 1.0f) return false;
+        return true;
+    }
+
+    bool strokeColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const
     {
         if (!stroke) return false;
 
-        if (r) *r = stroke->color.r;
-        if (g) *g = stroke->color.g;
-        if (b) *b = stroke->color.b;
-        if (a) *a = stroke->color.a;
+        if (r) *r = stroke->color[0];
+        if (g) *g = stroke->color[1];
+        if (b) *b = stroke->color[2];
+        if (a) *a = stroke->color[3];
 
         return true;
     }
 
     const Fill* strokeFill() const
     {
-        return stroke ? stroke->fill : nullptr;
+        if (!stroke) return nullptr;
+        return stroke->fill;
     }
 
     uint32_t strokeDash(const float** dashPattern, float* offset) const
     {
         if (!stroke) return 0;
-        if (dashPattern) *dashPattern = stroke->dash.pattern;
-        if (offset) *offset = stroke->dash.offset;
-        return stroke->dash.count;
+        if (dashPattern) *dashPattern = stroke->dashPattern;
+        if (offset) *offset = stroke->dashOffset;
+        return stroke->dashCnt;
     }
 
     StrokeCap strokeCap() const
     {
-        return stroke ? stroke->cap : StrokeCap::Square;
+        if (!stroke) return StrokeCap::Square;
+        return stroke->cap;
     }
 
     StrokeJoin strokeJoin() const
     {
-        return stroke ? stroke->join : StrokeJoin::Bevel;
+        if (!stroke) return StrokeJoin::Bevel;
+        return stroke->join;
     }
 
     float strokeMiterlimit() const
     {
-        return stroke ? stroke->miterlimit : 4.0f;
+        if (!stroke) return 4.0f;
+        return stroke->miterlimit;;
     }
-
-    bool strokeDash(RenderPath& out, const Matrix* transform = nullptr) const;
 };
 
 struct RenderEffect
 {
     RenderData rd = nullptr;
-    RenderRegion extend{};
+    RenderRegion extend = {0, 0, 0, 0};
     SceneEffect type;
     bool valid = false;
 
-    virtual ~RenderEffect() {}
+    virtual ~RenderEffect()
+    {
+        free(rd);
+    }
 };
 
 struct RenderEffectGaussianBlur : RenderEffect
@@ -483,7 +296,7 @@ struct RenderEffectGaussianBlur : RenderEffect
     {
         auto inst = new RenderEffectGaussianBlur;
         inst->sigma = std::max((float) va_arg(args, double), 0.0f);
-        inst->direction = tvg::clamp(va_arg(args, int), 0, 2);
+        inst->direction = std::min(va_arg(args, int), 2);
         inst->border = std::min(va_arg(args, int), 1);
         inst->quality = std::min(va_arg(args, int), 100);
         inst->type = SceneEffect::GaussianBlur;
@@ -546,7 +359,7 @@ struct RenderEffectTint : RenderEffect
         inst->white[0] = va_arg(args, int);
         inst->white[1] = va_arg(args, int);
         inst->white[2] = va_arg(args, int);
-        inst->intensity = (uint8_t)(static_cast<float>(va_arg(args, double)) * 2.55f);
+        inst->intensity = (uint8_t)(va_arg(args, double) * 2.55);
         inst->type = SceneEffect::Tint;
         return inst;
     }
@@ -557,7 +370,6 @@ struct RenderEffectTritone : RenderEffect
     uint8_t shadow[3];       //rgb
     uint8_t midtone[3];      //rgb
     uint8_t highlight[3];    //rgb
-    uint8_t blender = 0;     //0 ~ 255
 
     static RenderEffectTritone* gen(va_list& args)
     {
@@ -571,83 +383,66 @@ struct RenderEffectTritone : RenderEffect
         inst->highlight[0] = va_arg(args, int);
         inst->highlight[1] = va_arg(args, int);
         inst->highlight[2] = va_arg(args, int);
-        inst->blender = va_arg(args, int);
         inst->type = SceneEffect::Tritone;
         return inst;
     }
 };
 
-struct RenderMethod
+class RenderMethod
 {
 private:
-    uint32_t refCnt = 0;
+    uint32_t refCnt = 0;        //reference count
     Key key;
 
-protected:
-    RenderRegion vport;         //viewport
-
 public:
-    //common implementation
     uint32_t ref();
     uint32_t unref();
-    RenderRegion viewport();
-    bool viewport(const RenderRegion& vp);
 
-    //main features
     virtual ~RenderMethod() {}
-    virtual bool preUpdate() = 0;
     virtual RenderData prepare(const RenderShape& rshape, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags, bool clipper) = 0;
-    virtual RenderData prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, FilterMethod filter, RenderUpdateFlag flags) = 0;
-    virtual bool postUpdate() = 0;
+    virtual RenderData prepare(RenderSurface* surface, RenderData data, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flags) = 0;
     virtual bool preRender() = 0;
     virtual bool renderShape(RenderData data) = 0;
     virtual bool renderImage(RenderData data) = 0;
     virtual bool postRender() = 0;
     virtual void dispose(RenderData data) = 0;
     virtual RenderRegion region(RenderData data) = 0;
-    virtual bool bounds(RenderData data, Point* pt4, const Matrix& m) = 0;
+    virtual RenderRegion viewport() = 0;
+    virtual bool viewport(const RenderRegion& vp) = 0;
     virtual bool blend(BlendMethod method) = 0;
     virtual ColorSpace colorSpace() = 0;
     virtual const RenderSurface* mainSurface() = 0;
+
     virtual bool clear() = 0;
     virtual bool sync() = 0;
-    virtual bool intersectsShape(RenderData data, const RenderRegion& region) = 0;
-    virtual bool intersectsImage(RenderData data, const RenderRegion& region) = 0;
 
-    //composition
     virtual RenderCompositor* target(const RenderRegion& region, ColorSpace cs, CompositionFlag flags) = 0;
-    virtual bool beginComposite(RenderCompositor* cmp, MaskMethod method, uint8_t opacity) = 0;
+    virtual bool beginComposite(RenderCompositor* cmp, CompositeMethod method, uint8_t opacity) = 0;
     virtual bool endComposite(RenderCompositor* cmp) = 0;
 
-    //post effects
     virtual void prepare(RenderEffect* effect, const Matrix& transform) = 0;
     virtual bool region(RenderEffect* effect) = 0;
     virtual bool render(RenderCompositor* cmp, const RenderEffect* effect, bool direct) = 0;
-    virtual void dispose(RenderEffect* effect) = 0;
-
-    //partial rendering
-    virtual void damage(RenderData rd, const RenderRegion& region) = 0;
-    virtual bool partial(bool disable) = 0;
 };
 
-static inline bool MASK_REGION_MERGING(MaskMethod method)
+static inline bool MASK_REGION_MERGING(CompositeMethod method)
 {
     switch(method) {
-        case MaskMethod::Alpha:
-        case MaskMethod::InvAlpha:
-        case MaskMethod::Luma:
-        case MaskMethod::InvLuma:
-        case MaskMethod::Subtract:
-        case MaskMethod::Intersect:
+        case CompositeMethod::AlphaMask:
+        case CompositeMethod::InvAlphaMask:
+        case CompositeMethod::LumaMask:
+        case CompositeMethod::InvLumaMask:
+        case CompositeMethod::SubtractMask:
+        case CompositeMethod::IntersectMask:
             return false;
         //these might expand the rendering region
-        case MaskMethod::Add:
-        case MaskMethod::Difference:
-        case MaskMethod::Lighten:
-        case MaskMethod::Darken:
+        case CompositeMethod::AddMask:
+        case CompositeMethod::DifferenceMask:
+        case CompositeMethod::LightenMask:
+        case CompositeMethod::DarkenMask:
             return true;
         default:
-            TVGERR("RENDERER", "Unsupported Masking Method! = %d", (int)method);
+            TVGERR("RENDERER", "Unsupported Composite Method! = %d", (int)method);
             return false;
     }
 }
@@ -662,32 +457,32 @@ static inline uint8_t CHANNEL_SIZE(ColorSpace cs)
             return sizeof(uint32_t);
         case ColorSpace::Grayscale8:
             return sizeof(uint8_t);
-        case ColorSpace::Unknown:
+        case ColorSpace::Unsupported:
         default:
             TVGERR("RENDERER", "Unsupported Channel Size! = %d", (int)cs);
             return 0;
     }
 }
 
-static inline ColorSpace MASK_TO_COLORSPACE(RenderMethod* renderer, MaskMethod method)
+static inline ColorSpace COMPOSITE_TO_COLORSPACE(RenderMethod* renderer, CompositeMethod method)
 {
     switch(method) {
-        case MaskMethod::Alpha:
-        case MaskMethod::InvAlpha:
-        case MaskMethod::Add:
-        case MaskMethod::Difference:
-        case MaskMethod::Subtract:
-        case MaskMethod::Intersect:
-        case MaskMethod::Lighten:
-        case MaskMethod::Darken:
+        case CompositeMethod::AlphaMask:
+        case CompositeMethod::InvAlphaMask:
+        case CompositeMethod::AddMask:
+        case CompositeMethod::DifferenceMask:
+        case CompositeMethod::SubtractMask:
+        case CompositeMethod::IntersectMask:
+        case CompositeMethod::LightenMask:
+        case CompositeMethod::DarkenMask:
             return ColorSpace::Grayscale8;
         //TODO: Optimize Luma/InvLuma colorspace to Grayscale8
-        case MaskMethod::Luma:
-        case MaskMethod::InvLuma:
+        case CompositeMethod::LumaMask:
+        case CompositeMethod::InvLumaMask:
             return renderer->colorSpace();
         default:
-            TVGERR("RENDERER", "Unsupported Masking Size! = %d", (int)method);
-            return ColorSpace::Unknown;
+            TVGERR("RENDERER", "Unsupported Composite Size! = %d", (int)method);
+            return ColorSpace::Unsupported;
     }
 }
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgSaveModule.h b/engine/thirdparty/thorvg/src/renderer/tvgSaveModule.h
index 69be4326..fed05c52 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgSaveModule.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgSaveModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,8 +33,8 @@ class SaveModule
 public:
     virtual ~SaveModule() {}
 
-    virtual bool save(Paint* paint, Paint* bg, const char* filename, uint32_t quality) = 0;
-    virtual bool save(Animation* animation, Paint* bg, const char* filename, uint32_t quality, uint32_t fps) = 0;
+    virtual bool save(Paint* paint, const string& path, bool compress) = 0;
+    virtual bool save(Animation* animation, Paint* bg, const string& path, uint32_t quality, uint32_t fps) = 0;
     virtual bool close() = 0;
 };
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgSaver.cpp b/engine/thirdparty/thorvg/src/renderer/tvgSaver.cpp
index c930edc7..993fe6d8 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgSaver.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgSaver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2021 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,12 @@
 
 #include <cstring>
 #include "tvgCommon.h"
-#include "tvgStr.h"
 #include "tvgSaveModule.h"
+#include "tvgPaint.h"
 
+#ifdef THORVG_TVG_SAVER_SUPPORT
+    #include "tvgTvgSaver.h"
+#endif
 #ifdef THORVG_GIF_SAVER_SUPPORT
     #include "tvgGifSaver.h"
 #endif
@@ -41,7 +44,7 @@ struct Saver::Impl
     ~Impl()
     {
         delete(saveModule);
-        if (bg) bg->unref();
+        delete(bg);
     }
 };
 
@@ -49,6 +52,12 @@ struct Saver::Impl
 static SaveModule* _find(FileType type)
 {
     switch(type) {
+        case FileType::Tvg: {
+#ifdef THORVG_TVG_SAVER_SUPPORT
+            return new TvgSaver;
+#endif
+            break;
+        }
         case FileType::Gif: {
 #ifdef THORVG_GIF_SAVER_SUPPORT
             return new GifSaver;
@@ -63,6 +72,10 @@ static SaveModule* _find(FileType type)
 #ifdef THORVG_LOG_ENABLED
     const char *format;
     switch(type) {
+        case FileType::Tvg: {
+            format = "TVG";
+            break;
+        }
         case FileType::Gif: {
             format = "GIF";
             break;
@@ -78,10 +91,14 @@ static SaveModule* _find(FileType type)
 }
 
 
-static SaveModule* _find(const char* filename)
+static SaveModule* _find(const string& path)
 {
-    auto ext = fileext(filename);
-    if (ext && !strcmp(ext, "gif")) return _find(FileType::Gif);
+    auto ext = path.substr(path.find_last_of(".") + 1);
+    if (!ext.compare("tvg")) {
+        return _find(FileType::Tvg);
+    } else if (!ext.compare("gif")) {
+        return _find(FileType::Gif);
+    }
     return nullptr;
 }
 
@@ -101,72 +118,71 @@ Saver::~Saver()
 }
 
 
-Result Saver::save(Paint* paint, const char* filename, uint32_t quality) noexcept
+Result Saver::save(std::unique_ptr<Paint> paint, const string& path, bool compress) noexcept
 {
-    if (!paint) return Result::InvalidArguments;
+    auto p = paint.release();
+    if (!p) return Result::MemoryCorruption;
 
     //Already on saving another resource.
     if (pImpl->saveModule) {
-        Paint::rel(paint);
+        if (P(p)->refCnt == 0) delete(p);
         return Result::InsufficientCondition;
     }
 
-    if (auto saveModule = _find(filename)) {
-        if (saveModule->save(paint, pImpl->bg, filename, quality)) {
+    if (auto saveModule = _find(path)) {
+        if (saveModule->save(p, path, compress)) {
             pImpl->saveModule = saveModule;
             return Result::Success;
         } else {
-            Paint::rel(paint);
+            if (P(p)->refCnt == 0) delete(p);
             delete(saveModule);
             return Result::Unknown;
         }
     }
-    Paint::rel(paint);
+    if (P(p)->refCnt == 0) delete(p);
     return Result::NonSupport;
 }
 
 
-Result Saver::background(Paint* paint) noexcept
+Result Saver::background(unique_ptr<Paint> paint) noexcept
 {
-    if (!paint) return Result::InvalidArguments;
-
-    if (pImpl->bg) pImpl->bg->unref();
-    paint->ref();
-    pImpl->bg = paint;
+    delete(pImpl->bg);
+    pImpl->bg = paint.release();
 
     return Result::Success;
 }
 
 
-Result Saver::save(Animation* animation, const char* filename, uint32_t quality, uint32_t fps) noexcept
+Result Saver::save(unique_ptr<Animation> animation, const string& path, uint32_t quality, uint32_t fps) noexcept
 {
-    if (!animation) return Result::InvalidArguments;
+    auto a = animation.release();
+    if (!a) return Result::MemoryCorruption;
 
     //animation holds the picture, it must be 1 at the bottom.
-    auto remove = animation->picture()->refCnt() <= 1 ? true : false;
+    auto remove = PP(a->picture())->refCnt <= 1 ? true : false;
 
-    if (tvg::zero(animation->totalFrame())) {
-        if (remove) delete(animation);
+    if (tvg::zero(a->totalFrame())) {
+        if (remove) delete(a);
         return Result::InsufficientCondition;
     }
 
     //Already on saving another resource.
     if (pImpl->saveModule) {
-        if (remove) delete(animation);
+        if (remove) delete(a);
         return Result::InsufficientCondition;
     }
 
-    if (auto saveModule = _find(filename)) {
-        if (saveModule->save(animation, pImpl->bg, filename, quality, fps)) {
+    if (auto saveModule = _find(path)) {
+        if (saveModule->save(a, pImpl->bg, path, quality, fps)) {
             pImpl->saveModule = saveModule;
             return Result::Success;
         } else {
-            if (remove) delete(animation);
+            if (remove) delete(a);
             delete(saveModule);
             return Result::Unknown;
         }
     }
-    if (remove) delete(animation);
+    if (remove) delete(a);
     return Result::NonSupport;
 }
 
@@ -182,7 +198,7 @@ Result Saver::sync() noexcept
 }
 
 
-Saver* Saver::gen() noexcept
+unique_ptr<Saver> Saver::gen() noexcept
 {
-    return new Saver;
+    return unique_ptr<Saver>(new Saver);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgScene.cpp b/engine/thirdparty/thorvg/src/renderer/tvgScene.cpp
index 86acc117..9e9c3421 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgScene.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgScene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,50 @@
  * SOFTWARE.
  */
 
+#include <cstdarg>
 #include "tvgScene.h"
 
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
 
-Scene::Scene() = default;
-
-
-Scene* Scene::gen() noexcept
+Result Scene::Impl::resetEffects()
 {
-    return new SceneImpl;
+    if (effects) {
+        for (auto e = effects->begin(); e < effects->end(); ++e) {
+            delete(*e);
+        }
+        delete(effects);
+        effects = nullptr;
+    }
+    return Result::Success;
+}
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+Scene::Scene() : pImpl(new Impl(this))
+{
+}
+
+
+Scene::~Scene()
+{
+    delete(pImpl);
+}
+
+
+unique_ptr<Scene> Scene::gen() noexcept
+{
+    return unique_ptr<Scene>(new Scene);
+}
+
+
+TVG_DEPRECATED uint32_t Scene::identifier() noexcept
+{
+    return (uint32_t) Type::Scene;
 }
 
 
@@ -38,30 +73,79 @@ Type Scene::type() const noexcept
 }
 
 
-Result Scene::add(Paint* target, Paint* at) noexcept
+Result Scene::push(unique_ptr<Paint> paint) noexcept
 {
-    return to<SceneImpl>(this)->insert(target, at);
+    auto p = paint.release();
+    if (!p) return Result::MemoryCorruption;
+    P(p)->ref();
+
+    //Relocated the paint to the current scene space
+    P(p)->renderFlag |= RenderUpdateFlag::Transform;
+
+    pImpl->paints.push_back(p);
+
+    return Result::Success;
 }
 
 
-Result Scene::remove(Paint* paint) noexcept
+Result Scene::reserve(TVG_UNUSED uint32_t size) noexcept
 {
-    if (paint) return to<SceneImpl>(this)->remove(paint);
-    else return to<SceneImpl>(this)->clearPaints();
+    return Result::NonSupport;
 }
 
 
-const list<Paint*>& Scene::paints() const noexcept
+Result Scene::clear(bool free) noexcept
 {
-    return to<SceneImpl>(this)->paints;
+    pImpl->clear(free);
+
+    return Result::Success;
 }
 
 
-Result Scene::add(SceneEffect effect, ...) noexcept
+list<Paint*>& Scene::paints() noexcept
 {
+    return pImpl->paints;
+}
+
+
+Result Scene::push(SceneEffect effect, ...) noexcept
+{
+    if (effect == SceneEffect::ClearAll) return pImpl->resetEffects();
+
+    if (!pImpl->effects) pImpl->effects = new Array<RenderEffect*>;
+
     va_list args;
     va_start(args, effect);
-    auto ret = to<SceneImpl>(this)->add(effect, args);
-    va_end(args);
-    return ret;
+
+    RenderEffect* re = nullptr;
+
+    switch (effect) {
+        case SceneEffect::GaussianBlur: {
+            re = RenderEffectGaussianBlur::gen(args);
+            break;
+        }
+        case SceneEffect::DropShadow: {
+            re = RenderEffectDropShadow::gen(args);
+            break;
+        }
+        case SceneEffect::Fill: {
+            re = RenderEffectFill::gen(args);
+            break;
+        }
+        case SceneEffect::Tint: {
+            re = RenderEffectTint::gen(args);
+            break;
+        }
+        case SceneEffect::Tritone: {
+            re = RenderEffectTritone::gen(args);
+            break;
+        }
+        default: break;
+    }
+
+    if (!re) return Result::InvalidArguments;
+
+    pImpl->effects->push(re);
+
+    return Result::Success;
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgScene.h b/engine/thirdparty/thorvg/src/renderer/tvgScene.h
index 1c9ba37d..516148aa 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgScene.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgScene.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,9 @@
 #ifndef _TVG_SCENE_H_
 #define _TVG_SCENE_H_
 
-#include <algorithm>
 #include "tvgMath.h"
 #include "tvgPaint.h"
 
-
 struct SceneIterator : Iterator
 {
     list<Paint*>* paints;
@@ -57,64 +55,62 @@ struct SceneIterator : Iterator
     }
 };
 
-struct SceneImpl : Scene
+struct Scene::Impl
 {
-    Paint::Impl impl;
-    list<Paint*> paints;     //children list
-    RenderRegion vport = {};
+    list<Paint*> paints;
+    RenderData rd = nullptr;
+    Scene* scene = nullptr;
+    RenderRegion vport = {0, 0, INT32_MAX, INT32_MAX};
     Array<RenderEffect*>* effects = nullptr;
-    Point fsize;          //fixed scene size
-    bool fixed = false;   //true: fixed scene size, false: dynamic size
-    bool vdirty = false;
-    uint8_t opacity;      //for composition
+    uint8_t compFlag = CompositionFlag::Invalid;
+    uint8_t opacity;         //for composition
 
-    SceneImpl() : impl(Paint::Impl(this))
+    Impl(Scene* s) : scene(s)
     {
     }
 
-    ~SceneImpl()
+    ~Impl()
     {
-        clearPaints();
-        resetEffects(false);
-    }
+        resetEffects();
 
-    void size(const Point& size)
-    {
-        this->fsize = size;
-        fixed = (size.x > 0 && size.y > 0) ? true : false;
+        for (auto paint : paints) {
+            if (P(paint)->unref() == 0) delete(paint);
+        }
+
+        if (auto renderer = PP(scene)->renderer) {
+            renderer->dispose(rd);
+        }
     }
 
     uint8_t needComposition(uint8_t opacity)
     {
+        compFlag = CompositionFlag::Invalid;
+
         if (opacity == 0 || paints.empty()) return 0;
 
         //post effects, masking, blending may require composition
-        if (effects) impl.mark(CompositionFlag::PostProcessing);
-        if (PAINT(this)->mask(nullptr) != MaskMethod::None) impl.mark(CompositionFlag::Masking);
-        if (impl.blendMethod != BlendMethod::Normal) impl.mark(CompositionFlag::Blending);
+        if (effects) compFlag |= CompositionFlag::PostProcessing;
+        auto compMethod = scene->composite(nullptr);
+        if (compMethod != CompositeMethod::None && compMethod != CompositeMethod::ClipPath) compFlag |= CompositionFlag::Masking;
+        if (PP(scene)->blendMethod != BlendMethod::Normal) compFlag |= CompositionFlag::Blending;
 
         //Half translucent requires intermediate composition.
-        if (opacity == 255) return impl.cmpFlag;
+        if (opacity == 255) return compFlag;
 
         //Only shape or picture may not require composition.
         if (paints.size() == 1) {
             auto type = paints.front()->type();
-            if (type == Type::Shape || type == Type::Picture) return impl.cmpFlag;
+            if (type == Type::Shape || type == Type::Picture) return compFlag;
         }
 
-        impl.mark(CompositionFlag::Opacity);
+        compFlag |= CompositionFlag::Opacity;
 
         return 1;
     }
 
-    bool skip(RenderUpdateFlag flag)
+    RenderData update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, TVG_UNUSED bool clipper)
     {
-        return false;
-    }
-
-    bool update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, TVG_UNUSED bool clipper)
-    {
-        if (paints.empty()) return true;
+        this->vport = renderer->viewport();
 
         if (needComposition(opacity)) {
             /* Overriding opacity value. If this scene is half-translucent,
@@ -122,67 +118,42 @@ struct SceneImpl : Scene
             this->opacity = opacity;
             opacity = 255;
         }
-
-        //allow partial rendering?
-        auto recover = fixed ? renderer->partial(true) : false;
-
         for (auto paint : paints) {
-            PAINT(paint)->update(renderer, transform, clips, opacity, flag, false);
+            paint->pImpl->update(renderer, transform, clips, opacity, flag, false);
         }
 
-        //recover the condition
-        if (fixed) renderer->partial(recover);
-
         if (effects) {
-            ARRAY_FOREACH(p, *effects) {
-                renderer->prepare(*p, transform);
+            for (auto e = effects->begin(); e < effects->end(); ++e) {
+                renderer->prepare(*e, transform);
             }
         }
 
-        //this viewport update is more performant than in bounds(). No idea.
-        vport = renderer->viewport();
-
-        if (fixed) {
-            auto pt = fsize * transform;
-            vport.intersect({{int32_t(round(transform.e13)), int32_t(round(transform.e23))}, {int32_t(round(pt.x)), int32_t(round(pt.y))}});
-        } else {
-            vdirty = true;
-        }
-
-        //bounds(renderer) here hinders parallelization
-        //TODO: we can bring the precise effects region here
-        if (fixed || effects) impl.damage(vport);
-
-        return true;
+        return nullptr;
     }
 
-    bool render(RenderMethod* renderer, CompositionFlag flag)
+    bool render(RenderMethod* renderer)
     {
-        if (paints.empty()) return true;
-
         RenderCompositor* cmp = nullptr;
-        // its parent is already in composition mode, maybe parasitize its surface
-        auto incomposite = (uint8_t(CompositionFlag::PostProcessing) & uint8_t(flag)) && !effects;
         auto ret = true;
 
-        renderer->blend(impl.blendMethod);
+        renderer->blend(PP(scene)->blendMethod);
 
-        if (!incomposite && impl.cmpFlag) {
-            cmp = renderer->target(bounds(), renderer->colorSpace(), impl.cmpFlag);
-            renderer->beginComposite(cmp, MaskMethod::None, opacity);
+        if (compFlag) {
+            cmp = renderer->target(bounds(renderer), renderer->colorSpace(), static_cast<CompositionFlag>(compFlag));
+            renderer->beginComposite(cmp, CompositeMethod::None, opacity);
         }
 
         for (auto paint : paints) {
-            ret &= paint->pImpl->render(renderer, impl.cmpFlag);
+            ret &= paint->pImpl->render(renderer);
         }
 
         if (cmp) {
             //Apply post effects if any.
             if (effects) {
-                //Notify the possibility of the direct composition of the effect result to the origin surface.
-                auto direct = (effects->count == 1) & (impl.marked(CompositionFlag::PostProcessing));
-                ARRAY_FOREACH(p, *effects) {
-                    if ((*p)->valid) renderer->render(cmp, *p, direct);
+                //Notify the possiblity of the direct composition of the effect result to the origin surface.
+                auto direct = (effects->count == 1) & (compFlag == CompositionFlag::PostProcessing);
+                for (auto e = effects->begin(); e < effects->end(); ++e) {
+                    if ((*e)->valid) renderer->render(cmp, *e, direct);
                 }
             }
             renderer->endComposite(cmp);
@@ -191,106 +162,92 @@ struct SceneImpl : Scene
         return ret;
     }
 
-    RenderRegion bounds()
+    RenderRegion bounds(RenderMethod* renderer) const
     {
-        if (paints.empty()) return {};
-        if (!vdirty) return vport;
-        vdirty = false;
+        if (paints.empty()) return {0, 0, 0, 0};
+
+        int32_t x1 = INT32_MAX;
+        int32_t y1 = INT32_MAX;
+        int32_t x2 = 0;
+        int32_t y2 = 0;
 
-        //Merge regions
-        RenderRegion pRegion = {{INT32_MAX, INT32_MAX}, {0, 0}};
         for (auto paint : paints) {
-            auto region = paint->pImpl->bounds();
-            if (region.min.x < pRegion.min.x) pRegion.min.x = region.min.x;
-            if (pRegion.max.x < region.max.x) pRegion.max.x = region.max.x;
-            if (region.min.y < pRegion.min.y) pRegion.min.y = region.min.y;
-            if (pRegion.max.y < region.max.y) pRegion.max.y = region.max.y;
+            auto region = paint->pImpl->bounds(renderer);
+
+            //Merge regions
+            if (region.x < x1) x1 = region.x;
+            if (x2 < region.x + region.w) x2 = (region.x + region.w);
+            if (region.y < y1) y1 = region.y;
+            if (y2 < region.y + region.h) y2 = (region.y + region.h);
         }
 
         //Extends the render region if post effects require
-        RenderRegion eRegion{};
+        int32_t ex = 0, ey = 0, ew = 0, eh = 0;
         if (effects) {
-            ARRAY_FOREACH(p, *effects) {
-                auto effect = *p;
-                if (effect->valid && impl.renderer->region(effect)) eRegion.add(effect->extend);
+            for (auto e = effects->begin(); e < effects->end(); ++e) {
+                auto effect = *e;
+                if (effect->valid && renderer->region(effect)) {
+                    ex = std::min(ex, effect->extend.x);
+                    ey = std::min(ey, effect->extend.y);
+                    ew = std::max(ew, effect->extend.w);
+                    eh = std::max(eh, effect->extend.h);
+                }
             }
         }
 
-        pRegion.min.x += eRegion.min.x;
-        pRegion.min.y += eRegion.min.y;
-        pRegion.max.x += eRegion.max.x;
-        pRegion.max.y += eRegion.max.y;
-
-        vport = RenderRegion::intersect(vport, pRegion);
-        return vport;
-    }
-
-    bool bounds(Point* pt4, const Matrix& m, bool obb)
-    {
-        if (paints.empty()) return false;
-
-        Point min = {FLT_MAX, FLT_MAX};
-        Point max = {-FLT_MAX, -FLT_MAX};
-        auto ret = false;
-
-        for (auto paint : paints) {
-            Point tmp[4];
-            if (!PAINT(paint)->bounds(tmp, obb ? nullptr : &m, false)) continue;
-            //Merge regions
-            for (int i = 0; i < 4; ++i) {
-                if (tmp[i].x < min.x) min.x = tmp[i].x;
-                if (tmp[i].x > max.x) max.x = tmp[i].x;
-                if (tmp[i].y < min.y) min.y = tmp[i].y;
-                if (tmp[i].y > max.y) max.y = tmp[i].y;
-            }
-            ret = true;
-        }
-        pt4[0] = min;
-        pt4[1] = Point{max.x, min.y};
-        pt4[2] = max;
-        pt4[3] = Point{min.x, max.y};
-
-        if (obb) {
-            pt4[0] *= m;
-            pt4[1] *= m;
-            pt4[2] *= m;
-            pt4[3] *= m;
-        }
-
+        auto ret = RenderRegion{x1 + ex, y1 + ey, (x2 - x1) + ew, (y2 - y1) + eh};
+        ret.intersect(this->vport);
         return ret;
     }
 
-
-    bool intersects(const RenderRegion& region)
+    bool bounds(float* px, float* py, float* pw, float* ph, bool stroking)
     {
-        if (!impl.renderer) return false;
+        if (paints.empty()) return false;
 
-        if (this->bounds().intersected(region)) {
-            for (auto paint : paints) {
-                if (PAINT(paint)->intersects(region)) return true;
-            }
+        auto x1 = FLT_MAX;
+        auto y1 = FLT_MAX;
+        auto x2 = -FLT_MAX;
+        auto y2 = -FLT_MAX;
+
+        for (auto paint : paints) {
+            auto x = FLT_MAX;
+            auto y = FLT_MAX;
+            auto w = 0.0f;
+            auto h = 0.0f;
+
+            if (!P(paint)->bounds(&x, &y, &w, &h, true, stroking)) continue;
+
+            //Merge regions
+            if (x < x1) x1 = x;
+            if (x2 < x + w) x2 = (x + w);
+            if (y < y1) y1 = y;
+            if (y2 < y + h) y2 = (y + h);
         }
 
-        return false;
+        if (px) *px = x1;
+        if (py) *py = y1;
+        if (pw) *pw = (x2 - x1);
+        if (ph) *ph = (y2 - y1);
+
+        return true;
     }
 
     Paint* duplicate(Paint* ret)
     {
         if (ret) TVGERR("RENDERER", "TODO: duplicate()");
 
-        auto scene = Scene::gen();
-        auto dup = to<SceneImpl>(scene);
+        auto scene = Scene::gen().release();
+        auto dup = scene->pImpl;
 
         for (auto paint : paints) {
             auto cdup = paint->duplicate();
-            PAINT(cdup)->parent = scene;
-            cdup->ref();
+            P(cdup)->ref();
             dup->paints.push_back(cdup);
         }
 
         if (effects) {
             dup->effects = new Array<RenderEffect*>;
-            ARRAY_FOREACH(p, *effects) {
+            for (auto p = effects->begin(); p < effects->end(); ++p) {
                 RenderEffect* ret = nullptr;
                 switch ((*p)->type) {
                     case SceneEffect::GaussianBlur: {
@@ -323,70 +280,15 @@ struct SceneImpl : Scene
             }
         }
 
-        if (fixed) dup->size(fsize);
-
         return scene;
     }
 
-    Result clearPaints()
+    void clear(bool free)
     {
-        if (paints.empty()) return Result::Success;
-
-        //Don't need to damage for children
-        auto recover = (fixed && impl.renderer) ? impl.renderer->partial(true) : false;
-        auto partialDmg = !(effects || fixed || recover);
-
-        auto itr = paints.begin();
-        while (itr != paints.end()) {
-            auto paint = PAINT((*itr));
-            //when the paint is destroyed damage will be triggered
-            if (paint->refCnt > 1 && partialDmg) paint->damage();
-            paint->unref();
-            paints.erase(itr++);
+        for (auto paint : paints) {
+            if (P(paint)->unref() == 0 && free) delete(paint);
         }
-        if (fixed && impl.renderer) impl.renderer->partial(recover);
-        if (effects || fixed) impl.damage(vport);  //redraw scene full region
-
-        return Result::Success;
-    }
-
-    Result remove(Paint* paint)
-    {
-        if (PAINT(paint)->parent != this) return Result::InsufficientCondition;
-        //when the paint is destroyed damage will be triggered
-        if (PAINT(paint)->refCnt > 1) PAINT(paint)->damage();
-        PAINT(paint)->unref();
-        paints.remove(paint);
-        return Result::Success;
-    }
-
-    Result insert(Paint* target, Paint* at)
-    {
-        if (!target) return Result::InvalidArguments;
-        auto timpl = PAINT(target);
-
-        if (timpl->parent) {
-            TVGERR("RENDERER", "Target paint(%p) is already owned by a parent(%p)", target, timpl->parent);
-            return Result::InsufficientCondition;
-        }
-
-        target->ref();
-
-        //Relocated the paint to the current scene space
-        timpl->mark(RenderUpdateFlag::Transform);
-
-        if (!at) {
-            paints.push_back(target);
-        } else {
-            //OPTIMIZE: Remove searching?
-            auto itr = find_if(paints.begin(), paints.end(),[&at](const Paint* paint){ return at == paint; });
-            if (itr == paints.end()) return Result::InvalidArguments;
-            paints.insert(itr, target);
-        }
-        timpl->parent = this;
-        if (timpl->clipper) PAINT(timpl->clipper)->parent = this;
-        if (timpl->maskData) PAINT(timpl->maskData->target)->parent = this;
-        return Result::Success;
+        paints.clear();
     }
 
     Iterator* iterator()
@@ -394,58 +296,7 @@ struct SceneImpl : Scene
         return new SceneIterator(&paints);
     }
 
-    Result resetEffects(bool damage = true)
-    {
-        if (effects) {
-            ARRAY_FOREACH(p, *effects) {
-                if (impl.renderer) impl.renderer->dispose(*p);
-                delete(*p);
-            }
-            delete(effects);
-            effects = nullptr;
-            if (damage) impl.damage(vport);
-        }
-        return Result::Success;
-    }
-
-    Result add(SceneEffect effect, va_list& args)
-    {
-        if (effect == SceneEffect::Clear) return resetEffects();
-
-        if (!this->effects) this->effects = new Array<RenderEffect*>;
-
-        RenderEffect* re = nullptr;
-
-        switch (effect) {
-            case SceneEffect::GaussianBlur: {
-                re = RenderEffectGaussianBlur::gen(args);
-                break;
-            }
-            case SceneEffect::DropShadow: {
-                re = RenderEffectDropShadow::gen(args);
-                break;
-            }
-            case SceneEffect::Fill: {
-                re = RenderEffectFill::gen(args);
-                break;
-            }
-            case SceneEffect::Tint: {
-                re = RenderEffectTint::gen(args);
-                break;
-            }
-            case SceneEffect::Tritone: {
-                re = RenderEffectTritone::gen(args);
-                break;
-            }
-            default: break;
-        }
-
-        if (!re) return Result::InvalidArguments;
-
-        this->effects->push(re);
-
-        return Result::Success;
-    }
+    Result resetEffects();
 };
 
 #endif //_TVG_SCENE_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgShape.cpp b/engine/thirdparty/thorvg/src/renderer/tvgShape.cpp
index 7e02cd47..f3091337 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgShape.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgShape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,35 @@
 #include "tvgMath.h"
 #include "tvgShape.h"
 
-
-Shape :: Shape() = default;
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
 
 
-Shape* Shape::gen() noexcept
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+Shape :: Shape() : pImpl(new Impl(this))
 {
-    return new ShapeImpl;
+}
+
+
+Shape :: ~Shape()
+{
+    delete(pImpl);
+}
+
+
+unique_ptr<Shape> Shape::gen() noexcept
+{
+    return unique_ptr<Shape>(new Shape);
+}
+
+
+uint32_t Shape::identifier() noexcept
+{
+    return (uint32_t) Type::Shape;
 }
 
 
@@ -41,212 +63,366 @@ Type Shape::type() const noexcept
 
 Result Shape::reset() noexcept
 {
-    to<ShapeImpl>(this)->resetPath();
+    pImpl->rs.path.cmds.clear();
+    pImpl->rs.path.pts.clear();
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
-Result Shape::path(const PathCommand** cmds, uint32_t* cmdsCnt, const Point** pts, uint32_t* ptsCnt) const noexcept
+uint32_t Shape::pathCommands(const PathCommand** cmds) const noexcept
 {
-    if (cmds) *cmds = to<ShapeImpl>(this)->rs.path.cmds.data;
-    if (cmdsCnt) *cmdsCnt = to<ShapeImpl>(this)->rs.path.cmds.count;
+    if (cmds) *cmds = pImpl->rs.path.cmds.data;
+    return pImpl->rs.path.cmds.count;
+}
 
-    if (pts) *pts = to<ShapeImpl>(this)->rs.path.pts.data;
-    if (ptsCnt) *ptsCnt = to<ShapeImpl>(this)->rs.path.pts.count;
 
-    return Result::Success;
+uint32_t Shape::pathCoords(const Point** pts) const noexcept
+{
+    if (pts) *pts = pImpl->rs.path.pts.data;
+    return pImpl->rs.path.pts.count;
 }
 
 
 Result Shape::appendPath(const PathCommand *cmds, uint32_t cmdCnt, const Point* pts, uint32_t ptsCnt) noexcept
 {
-    return to<ShapeImpl>(this)->addPath(cmds, cmdCnt, pts, ptsCnt);
+    if (cmdCnt == 0 || ptsCnt == 0 || !cmds || !pts) return Result::InvalidArguments;
+
+    pImpl->grow(cmdCnt, ptsCnt);
+    pImpl->append(cmds, cmdCnt, pts, ptsCnt);
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
+    return Result::Success;
 }
 
 
 Result Shape::moveTo(float x, float y) noexcept
 {
-    to<ShapeImpl>(this)->rs.path.moveTo({x, y});
+    pImpl->moveTo(x, y);
+
     return Result::Success;
 }
 
 
 Result Shape::lineTo(float x, float y) noexcept
 {
-    to<ShapeImpl>(this)->rs.path.lineTo({x, y});
-    to<ShapeImpl>(this)->impl.mark(RenderUpdateFlag::Path);
+    pImpl->lineTo(x, y);
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
 Result Shape::cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y) noexcept
 {
-    to<ShapeImpl>(this)->rs.path.cubicTo({cx1, cy1}, {cx2, cy2}, {x, y});
-    to<ShapeImpl>(this)->impl.mark(RenderUpdateFlag::Path);
+    pImpl->cubicTo(cx1, cy1, cx2, cy2, x, y);
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
 Result Shape::close() noexcept
 {
-    to<ShapeImpl>(this)->rs.path.close();
-    to<ShapeImpl>(this)->impl.mark(RenderUpdateFlag::Path);
+    pImpl->close();
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
-Result Shape::appendCircle(float cx, float cy, float rx, float ry, bool cw) noexcept
+Result Shape::appendCircle(float cx, float cy, float rx, float ry) noexcept
 {
-    to<ShapeImpl>(this)->addCircle(cx, cy, rx, ry, cw);
+    auto rxKappa = rx * PATH_KAPPA;
+    auto ryKappa = ry * PATH_KAPPA;
+
+    pImpl->grow(6, 13);
+    pImpl->moveTo(cx + rx, cy);
+    pImpl->cubicTo(cx + rx, cy + ryKappa, cx + rxKappa, cy + ry, cx, cy + ry);
+    pImpl->cubicTo(cx - rxKappa, cy + ry, cx - rx, cy + ryKappa, cx - rx, cy);
+    pImpl->cubicTo(cx - rx, cy - ryKappa, cx - rxKappa, cy - ry, cx, cy - ry);
+    pImpl->cubicTo(cx + rxKappa, cy - ry, cx + rx, cy - ryKappa, cx + rx, cy);
+    pImpl->close();
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
-Result Shape::appendRect(float x, float y, float w, float h, float rx, float ry, bool cw) noexcept
+TVG_DEPRECATED Result Shape::appendArc(float cx, float cy, float radius, float startAngle, float sweep, bool pie) noexcept
 {
-    to<ShapeImpl>(this)->addRect(x, y, w, h, rx, ry, cw);
+    //just circle
+    if (sweep >= 360.0f || sweep <= -360.0f) return appendCircle(cx, cy, radius, radius);
+
+    const float arcPrecision = 1e-5f;
+    startAngle = deg2rad(startAngle);
+    sweep = deg2rad(sweep);
+
+    auto nCurves = static_cast<int>(fabsf(sweep / MATH_PI2));
+    if (fabsf(sweep / MATH_PI2) - nCurves > arcPrecision) ++nCurves;
+    auto sweepSign = (sweep < 0 ? -1 : 1);
+    auto fract = fmodf(sweep, MATH_PI2);
+    fract = (fabsf(fract) < arcPrecision) ? MATH_PI2 * sweepSign : fract;
+
+    //Start from here
+    Point start = {radius * cosf(startAngle), radius * sinf(startAngle)};
+
+    if (pie) {
+        pImpl->moveTo(cx, cy);
+        pImpl->lineTo(start.x + cx, start.y + cy);
+    } else {
+        pImpl->moveTo(start.x + cx, start.y + cy);
+    }
+
+    for (int i = 0; i < nCurves; ++i) {
+        auto endAngle = startAngle + ((i != nCurves - 1) ? MATH_PI2 * sweepSign : fract);
+        Point end = {radius * cosf(endAngle), radius * sinf(endAngle)};
+
+        //variables needed to calculate bezier control points
+
+        //get bezier control points using article:
+        //(http://itc.ktu.lt/index.php/ITC/article/view/11812/6479)
+        auto ax = start.x;
+        auto ay = start.y;
+        auto bx = end.x;
+        auto by = end.y;
+        auto q1 = ax * ax + ay * ay;
+        auto q2 = ax * bx + ay * by + q1;
+        auto k2 = (4.0f/3.0f) * ((sqrtf(2 * q1 * q2) - q2) / (ax * by - ay * bx));
+
+        start = end; //Next start point is the current end point
+
+        end.x += cx;
+        end.y += cy;
+
+        Point ctrl1 = {ax - k2 * ay + cx, ay + k2 * ax + cy};
+        Point ctrl2 = {bx + k2 * by + cx, by - k2 * bx + cy};
+
+        pImpl->cubicTo(ctrl1.x, ctrl1.y, ctrl2.x, ctrl2.y, end.x, end.y);
+
+        startAngle = endAngle;
+    }
+
+    if (pie) pImpl->close();
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
+    return Result::Success;
+}
+
+
+Result Shape::appendRect(float x, float y, float w, float h, float rx, float ry) noexcept
+{
+    auto halfW = w * 0.5f;
+    auto halfH = h * 0.5f;
+
+    //clamping cornerRadius by minimum size
+    if (rx > halfW) rx = halfW;
+    if (ry > halfH) ry = halfH;
+
+    //rectangle
+    if (rx == 0 && ry == 0) {
+        pImpl->grow(5, 4);
+        pImpl->moveTo(x, y);
+        pImpl->lineTo(x + w, y);
+        pImpl->lineTo(x + w, y + h);
+        pImpl->lineTo(x, y + h);
+        pImpl->close();
+    //rounded rectangle or circle
+    } else {
+        auto hrx = rx * PATH_KAPPA;
+        auto hry = ry * PATH_KAPPA;
+        pImpl->grow(10, 17);
+        pImpl->moveTo(x + rx, y);
+        pImpl->lineTo(x + w - rx, y);
+        pImpl->cubicTo(x + w - rx + hrx, y, x + w, y + ry - hry, x + w, y + ry);
+        pImpl->lineTo(x + w, y + h - ry);
+        pImpl->cubicTo(x + w, y + h - ry + hry, x + w - rx + hrx, y + h, x + w - rx, y + h);
+        pImpl->lineTo(x + rx, y + h);
+        pImpl->cubicTo(x + rx - hrx, y + h, x, y + h - ry + hry, x, y + h - ry);
+        pImpl->lineTo(x, y + ry);
+        pImpl->cubicTo(x, y + ry - hry, x + rx - hrx, y, x + rx, y);
+        pImpl->close();
+    }
+
+    pImpl->rFlag |= RenderUpdateFlag::Path;
+
     return Result::Success;
 }
 
 
 Result Shape::fill(uint8_t r, uint8_t g, uint8_t b, uint8_t a) noexcept
 {
-    to<ShapeImpl>(this)->fill(r, g, b, a);
+    if (pImpl->rs.fill) {
+        delete(pImpl->rs.fill);
+        pImpl->rs.fill = nullptr;
+        pImpl->rFlag |= RenderUpdateFlag::Gradient;
+    }
+
+    if (r == pImpl->rs.color[0] && g == pImpl->rs.color[1] && b == pImpl->rs.color[2] && a == pImpl->rs.color[3]) return Result::Success;
+
+    pImpl->rs.color[0] = r;
+    pImpl->rs.color[1] = g;
+    pImpl->rs.color[2] = b;
+    pImpl->rs.color[3] = a;
+    pImpl->rFlag |= RenderUpdateFlag::Color;
+
     return Result::Success;
 }
 
 
-Result Shape::fill(Fill* f) noexcept
+Result Shape::fill(unique_ptr<Fill> f) noexcept
 {
-    return to<ShapeImpl>(this)->fill(f);
+    auto p = f.release();
+    if (!p) return Result::MemoryCorruption;
+
+    if (pImpl->rs.fill && pImpl->rs.fill != p) delete(pImpl->rs.fill);
+    pImpl->rs.fill = p;
+    pImpl->rFlag |= RenderUpdateFlag::Gradient;
+
+    return Result::Success;
 }
 
 
-Result Shape::fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept
+Result Shape::fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept
 {
-    to<ShapeImpl>(this)->rs.fillColor(r, g, b, a);
+    pImpl->rs.fillColor(r, g, b, a);
+
     return Result::Success;
 }
 
 
 const Fill* Shape::fill() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.fill;
+    return pImpl->rs.fill;
 }
 
 
 Result Shape::order(bool strokeFirst) noexcept
 {
-    to<ShapeImpl>(this)->strokeFirst(strokeFirst);
+    pImpl->strokeFirst(strokeFirst);
     return Result::Success;
 }
 
 
-Result Shape::strokeWidth(float width) noexcept
+Result Shape::stroke(float width) noexcept
 {
-    if (width < 0.0f) width = 0.0f;
-    to<ShapeImpl>(this)->strokeWidth(width);
+    pImpl->strokeWidth(width);
     return Result::Success;
 }
 
 
 float Shape::strokeWidth() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeWidth();
+    return pImpl->rs.strokeWidth();
 }
 
 
-Result Shape::strokeFill(uint8_t r, uint8_t g, uint8_t b, uint8_t a) noexcept
+Result Shape::stroke(uint8_t r, uint8_t g, uint8_t b, uint8_t a) noexcept
 {
-    to<ShapeImpl>(this)->strokeFill(r, g, b, a);
+    pImpl->strokeColor(r, g, b, a);
     return Result::Success;
 }
 
 
-Result Shape::strokeFill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept
+Result Shape::strokeColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept
 {
-    if (!to<ShapeImpl>(this)->rs.strokeFill(r, g, b, a)) return Result::InsufficientCondition;
+    if (!pImpl->rs.strokeColor(r, g, b, a)) return Result::InsufficientCondition;
+
     return Result::Success;
 }
 
 
-Result Shape::strokeFill(Fill* f) noexcept
+Result Shape::stroke(unique_ptr<Fill> f) noexcept
 {
-    return to<ShapeImpl>(this)->strokeFill(f);
+    return pImpl->strokeFill(std::move(f));
 }
 
 
 const Fill* Shape::strokeFill() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeFill();
+    return pImpl->rs.strokeFill();
 }
 
 
-Result Shape::strokeDash(const float* dashPattern, uint32_t cnt, float offset) noexcept
+Result Shape::stroke(const float* dashPattern, uint32_t cnt) noexcept
 {
-    return to<ShapeImpl>(this)->strokeDash(dashPattern, cnt, offset);
+    return pImpl->strokeDash(dashPattern, cnt, 0);
 }
 
 
-uint32_t Shape::strokeDash(const float** dashPattern, float* offset) const noexcept
+uint32_t Shape::strokeDash(const float** dashPattern) const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeDash(dashPattern, offset);
+    return pImpl->rs.strokeDash(dashPattern, nullptr);
 }
 
 
-Result Shape::strokeCap(StrokeCap cap) noexcept
+Result Shape::stroke(StrokeCap cap) noexcept
 {
-    to<ShapeImpl>(this)->strokeCap(cap);
+    pImpl->strokeCap(cap);
     return Result::Success;
 }
 
 
-Result Shape::strokeJoin(StrokeJoin join) noexcept
+Result Shape::stroke(StrokeJoin join) noexcept
 {
-    to<ShapeImpl>(this)->strokeJoin(join);
+    pImpl->strokeJoin(join);
     return Result::Success;
 }
 
 
 Result Shape::strokeMiterlimit(float miterlimit) noexcept
 {
-    return to<ShapeImpl>(this)->strokeMiterlimit(miterlimit);
+    // https://www.w3.org/TR/SVG2/painting.html#LineJoin
+    // - A negative value for stroke-miterlimit must be treated as an illegal value.
+    if (miterlimit < 0.0f) return Result::InvalidArguments;
+    // TODO Find out a reasonable max value.
+    pImpl->strokeMiterlimit(miterlimit);
+    return Result::Success;
 }
 
 
 StrokeCap Shape::strokeCap() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeCap();
+    return pImpl->rs.strokeCap();
 }
 
 
 StrokeJoin Shape::strokeJoin() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeJoin();
+    return pImpl->rs.strokeJoin();
 }
 
 
 float Shape::strokeMiterlimit() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.strokeMiterlimit();
+    return pImpl->rs.strokeMiterlimit();
 }
 
 
-Result Shape::trimpath(float begin, float end, bool simultaneous) noexcept
+Result Shape::strokeTrim(float begin, float end, bool simultaneous) noexcept
 {
-    to<ShapeImpl>(this)->trimpath({begin, end, simultaneous});
+    pImpl->strokeTrim(begin, end, simultaneous);
     return Result::Success;
 }
 
 
-Result Shape::fillRule(FillRule r) noexcept
+Result Shape::fill(FillRule r) noexcept
 {
-    to<ShapeImpl>(this)->rs.rule = r;
+    pImpl->rs.rule = r;
+
     return Result::Success;
 }
 
 
 FillRule Shape::fillRule() const noexcept
 {
-    return to<ShapeImpl>(this)->rs.rule;
+    return pImpl->rs.rule;
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgShape.h b/engine/thirdparty/thorvg/src/renderer/tvgShape.h
index be3009e1..d1932764 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgShape.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgShape.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,85 +23,92 @@
 #ifndef _TVG_SHAPE_H_
 #define _TVG_SHAPE_H_
 
-#include "tvgCommon.h"
+#include <memory.h>
 #include "tvgMath.h"
 #include "tvgPaint.h"
 
-namespace tvg
-{
 
-struct ShapeImpl : Shape
+struct Shape::Impl
 {
-    Paint::Impl impl;
-    RenderShape rs;
-    uint8_t opacity;    //for composition
+    RenderShape rs;                     //shape data
+    RenderData rd = nullptr;            //engine data
+    Shape* shape;
+    RenderUpdateFlag rFlag = RenderUpdateFlag::None;
+    uint8_t cFlag = CompositionFlag::Invalid;
+    uint8_t opacity;                    //for composition
 
-    ShapeImpl() : impl(Paint::Impl(this))
+    Impl(Shape* s) : shape(s)
     {
     }
 
-    bool render(RenderMethod* renderer, TVG_UNUSED CompositionFlag flag)
+    ~Impl()
     {
-        if (!impl.rd) return false;
+        if (auto renderer = PP(shape)->renderer) {
+            renderer->dispose(rd);
+        }
+    }
+
+    bool render(RenderMethod* renderer)
+    {
+        if (!rd) return false;
 
         RenderCompositor* cmp = nullptr;
 
-        renderer->blend(impl.blendMethod);
+        renderer->blend(PP(shape)->blendMethod);
 
-        if (impl.cmpFlag) {
-            cmp = renderer->target(bounds(), renderer->colorSpace(), impl.cmpFlag);
-            renderer->beginComposite(cmp, MaskMethod::None, opacity);
+        if (cFlag) {
+            cmp = renderer->target(bounds(renderer), renderer->colorSpace(), static_cast<CompositionFlag>(cFlag));
+            renderer->beginComposite(cmp, CompositeMethod::None, opacity);
         }
 
-        auto ret = renderer->renderShape(impl.rd);
+        auto ret = renderer->renderShape(rd);
         if (cmp) renderer->endComposite(cmp);
         return ret;
     }
 
     bool needComposition(uint8_t opacity)
     {
+        cFlag = CompositionFlag::Invalid;
+
         if (opacity == 0) return false;
 
         //Shape composition is only necessary when stroking & fill are valid.
-        if (!rs.stroke || rs.stroke->width < FLOAT_EPSILON || (!rs.stroke->fill && rs.stroke->color.a == 0)) return false;
-        if (!rs.fill && rs.color.a == 0) return false;
+        if (!rs.stroke || rs.stroke->width < FLOAT_EPSILON || (!rs.stroke->fill && rs.stroke->color[3] == 0)) return false;
+        if (!rs.fill && rs.color[3] == 0) return false;
 
         //translucent fill & stroke
         if (opacity < 255) {
-            impl.mark(CompositionFlag::Opacity);
+            cFlag = CompositionFlag::Opacity;
             return true;
         }
 
         //Composition test
         const Paint* target;
-        auto method = PAINT(this)->mask(&target);
-        if (!target) return false;
-
-        if ((target->pImpl->opacity == 255 || target->pImpl->opacity == 0) && target->type() == tvg::Type::Shape) {
-            auto shape = static_cast<const Shape*>(target);
-            if (!shape->fill()) {
-                uint8_t r, g, b, a;
-                shape->fill(&r, &g, &b, &a);
-                if (a == 0 || a == 255) {
-                    if (method == MaskMethod::Luma || method == MaskMethod::InvLuma) {
-                        if ((r == 255 && g == 255 && b == 255) || (r == 0 && g == 0 && b == 0)) return false;
-                    } else return false;
+        auto method = shape->composite(&target);
+        if (!target || method == CompositeMethod::ClipPath) return false;
+        if (target->pImpl->opacity == 255 || target->pImpl->opacity == 0) {
+            if (target->type() == Type::Shape) {
+                auto shape = static_cast<const Shape*>(target);
+                if (!shape->fill()) {
+                    uint8_t r, g, b, a;
+                    shape->fillColor(&r, &g, &b, &a);
+                    if (a == 0 || a == 255) {
+                        if (method == CompositeMethod::LumaMask || method == CompositeMethod::InvLumaMask) {
+                            if ((r == 255 && g == 255 && b == 255) || (r == 0 && g == 0 && b == 0)) return false;
+                        } else return false;
+                    }
                 }
             }
         }
 
-        impl.mark(CompositionFlag::Masking);
+        cFlag = CompositionFlag::Masking;
         return true;
     }
 
-    bool skip(RenderUpdateFlag flag)
+    RenderData update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper)
     {
-        if (flag == RenderUpdateFlag::None) return true;
-        return false;
-    }
+        if (static_cast<RenderUpdateFlag>(pFlag | rFlag) == RenderUpdateFlag::None) return rd;
 
-    bool update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, bool clipper)
-    {
         if (needComposition(opacity)) {
             /* Overriding opacity value. If this scene is half-translucent,
                It must do intermediate composition with that opacity value. */ 
@@ -109,53 +116,46 @@ struct ShapeImpl : Shape
             opacity = 255;
         }
 
-        impl.rd = renderer->prepare(rs, impl.rd, transform, clips, opacity, flag, clipper);
-        return true;
+        rd = renderer->prepare(rs, rd, transform, clips, opacity, static_cast<RenderUpdateFlag>(pFlag | rFlag), clipper);
+        rFlag = RenderUpdateFlag::None;
+        return rd;
     }
 
-    RenderRegion bounds()
+    RenderRegion bounds(RenderMethod* renderer)
     {
-        return impl.renderer->region(impl.rd);
+        if (!rd) return {0, 0, 0, 0};
+        return renderer->region(rd);
     }
 
-    bool bounds(Point* pt4, const Matrix& m, bool obb)
+    bool bounds(float* x, float* y, float* w, float* h, bool stroking)
     {
-        auto fallback = true;  //TODO: remove this when all backend engines support bounds()
+        //Path bounding size
+        if (rs.path.pts.count > 0 ) {
+            auto pts = rs.path.pts.begin();
+            Point min = { pts->x, pts->y };
+            Point max = { pts->x, pts->y };
 
-        if (impl.renderer && rs.strokeWidth() > 0.0f) {
-            if (impl.renderer->bounds(impl.rd, pt4, obb ? tvg::identity() : m)) {
-                fallback = false;
+            for (auto pts2 = pts + 1; pts2 < rs.path.pts.end(); ++pts2) {
+                if (pts2->x < min.x) min.x = pts2->x;
+                if (pts2->y < min.y) min.y = pts2->y;
+                if (pts2->x > max.x) max.x = pts2->x;
+                if (pts2->y > max.y) max.y = pts2->y;
             }
-        }
-        //Keep this for legacy. loaders still depend on this logic, remove it if possible.
-        if (fallback) {
-            BBox box = {{FLT_MAX, FLT_MAX}, {-FLT_MAX, -FLT_MAX}};
-            if (!rs.path.bounds(obb ? nullptr : &m, box)) return false;
-            if (rs.stroke) {
-                //Use geometric mean for feathering.
-                //Join, Cap wouldn't be considered. Generate stroke outline and compute bbox for accurate size?
-                auto sx = sqrt(m.e11 * m.e11 + m.e21 * m.e21);
-                auto sy = sqrt(m.e12 * m.e12 + m.e22 * m.e22);
-                auto feather = rs.stroke->width * sqrt(sx * sy);
-                box.min.x -= feather * 0.5f;
-                box.min.y -= feather * 0.5f;
-                box.max.x += feather * 0.5f;
-                box.max.y += feather * 0.5f;
-            }
-            pt4[0] = box.min;
-            pt4[1] = {box.max.x, box.min.y};
-            pt4[2] = box.max;
-            pt4[3] = {box.min.x, box.max.y};
+
+            if (x) *x = min.x;
+            if (y) *y = min.y;
+            if (w) *w = max.x - min.x;
+            if (h) *h = max.y - min.y;
         }
 
-        if (obb) {
-            pt4[0] *= m;
-            pt4[1] *= m;
-            pt4[2] *= m;
-            pt4[3] *= m;
+        //Stroke feathering
+        if (stroking && rs.stroke) {
+            if (x) *x -= rs.stroke->width * 0.5f;
+            if (y) *y -= rs.stroke->width * 0.5f;
+            if (w) *w += rs.stroke->width;
+            if (h) *h += rs.stroke->width;
         }
-
-        return true;
+        return rs.path.pts.count > 0 ? true : false;
     }
 
     void reserveCmd(uint32_t cmdCnt)
@@ -182,27 +182,58 @@ struct ShapeImpl : Shape
         rs.path.pts.count += ptsCnt;
     }
 
+    void moveTo(float x, float y)
+    {
+        rs.path.cmds.push(PathCommand::MoveTo);
+        rs.path.pts.push({x, y});
+    }
+
+    void lineTo(float x, float y)
+    {
+        rs.path.cmds.push(PathCommand::LineTo);
+        rs.path.pts.push({x, y});
+    }
+
+    void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y)
+    {
+        rs.path.cmds.push(PathCommand::CubicTo);
+        rs.path.pts.push({cx1, cy1});
+        rs.path.pts.push({cx2, cy2});
+        rs.path.pts.push({x, y});
+    }
+
+    void close()
+    {
+        //Don't close multiple times.
+        if (rs.path.cmds.count > 0 && rs.path.cmds.last() == PathCommand::Close) return;
+
+        rs.path.cmds.push(PathCommand::Close);
+    }
+
     void strokeWidth(float width)
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
         rs.stroke->width = width;
-        impl.mark(RenderUpdateFlag::Stroke);
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    void trimpath(const RenderTrimPath& trim)
+    void strokeTrim(float begin, float end, bool simultaneous)
     {
         if (!rs.stroke) {
-            if (trim.begin == 0.0f && trim.end == 1.0f) return;
+            if (begin == 0.0f && end == 1.0f) return;
             rs.stroke = new RenderStroke();
         }
 
-        if (tvg::equal(rs.stroke->trim.begin, trim.begin) && tvg::equal(rs.stroke->trim.end, trim.end) && rs.stroke->trim.simultaneous == trim.simultaneous) return;
+        if (tvg::equal(rs.stroke->trim.begin, begin) && tvg::equal(rs.stroke->trim.end, end) &&
+            rs.stroke->trim.simultaneous == simultaneous) return;
 
-        rs.stroke->trim = trim;
-        impl.mark(RenderUpdateFlag::Path);
+        rs.stroke->trim.begin = begin;
+        rs.stroke->trim.end = end;
+        rs.stroke->trim.simultaneous = simultaneous;
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    bool trimpath(float* begin, float* end)
+    bool strokeTrim(float* begin, float* end)
     {
         if (rs.stroke) {
             if (begin) *begin = rs.stroke->trim.begin;
@@ -219,83 +250,87 @@ struct ShapeImpl : Shape
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
         rs.stroke->cap = cap;
-        impl.mark(RenderUpdateFlag::Stroke);
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
     void strokeJoin(StrokeJoin join)
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
         rs.stroke->join = join;
-        impl.mark(RenderUpdateFlag::Stroke);
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    Result strokeMiterlimit(float miterlimit)
+    void strokeMiterlimit(float miterlimit)
     {
-        // https://www.w3.org/TR/SVG2/painting.html#LineJoin
-        // - A negative value for stroke-miterlimit must be treated as an illegal value.
-        if (miterlimit < 0.0f) return Result::InvalidArguments;
         if (!rs.stroke) rs.stroke = new RenderStroke();
         rs.stroke->miterlimit = miterlimit;
-        impl.mark(RenderUpdateFlag::Stroke);
-
-        return Result::Success;
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    bool intersects(const RenderRegion& region)
-    {
-        if (!impl.rd || !impl.renderer) return false;
-        return impl.renderer->intersectsShape(impl.rd, region);
-    }
-
-    void strokeFill(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+    void strokeColor(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
         if (rs.stroke->fill) {
             delete(rs.stroke->fill);
             rs.stroke->fill = nullptr;
-            impl.mark(RenderUpdateFlag::GradientStroke);
+            rFlag |= RenderUpdateFlag::GradientStroke;
         }
 
-        rs.stroke->color = {r, g, b, a};
+        rs.stroke->color[0] = r;
+        rs.stroke->color[1] = g;
+        rs.stroke->color[2] = b;
+        rs.stroke->color[3] = a;
 
-        impl.mark(RenderUpdateFlag::Stroke);
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    Result strokeFill(Fill* f)
+    Result strokeFill(unique_ptr<Fill> f)
     {
-        if (!f) return Result::InvalidArguments;
+        auto p = f.release();
+        if (!p) return Result::MemoryCorruption;
 
         if (!rs.stroke) rs.stroke = new RenderStroke();
-        if (rs.stroke->fill && rs.stroke->fill != f) delete(rs.stroke->fill);
-        rs.stroke->fill = f;
-        rs.stroke->color.a = 0;
+        if (rs.stroke->fill && rs.stroke->fill != p) delete(rs.stroke->fill);
+        rs.stroke->fill = p;
+        rs.stroke->color[3] = 0;
 
-        impl.mark(RenderUpdateFlag::Stroke | RenderUpdateFlag::GradientStroke);
+        rFlag |= RenderUpdateFlag::Stroke;
+        rFlag |= RenderUpdateFlag::GradientStroke;
 
         return Result::Success;
     }
 
     Result strokeDash(const float* pattern, uint32_t cnt, float offset)
     {
-        if ((!pattern && cnt > 0) || (pattern && cnt == 0)) return Result::InvalidArguments;
-        if (!rs.stroke) rs.stroke = new RenderStroke;
-        //Reset dash
-        auto& dash = rs.stroke->dash;
-        if (dash.count != cnt) {
-            tvg::free(dash.pattern);
-            dash.pattern = nullptr;
+        if ((cnt == 1) || (!pattern && cnt > 0) || (pattern && cnt == 0)) {
+            return Result::InvalidArguments;
         }
-        if (cnt > 0) {
-            if (!dash.pattern) dash.pattern = tvg::malloc<float>(sizeof(float) * cnt);
-            dash.length = 0.0f;
+
+        for (uint32_t i = 0; i < cnt; i++) {
+            if (pattern[i] < FLOAT_EPSILON) return Result::InvalidArguments;
+        }
+
+        //Reset dash
+        if (!pattern && cnt == 0) {
+            free(rs.stroke->dashPattern);
+            rs.stroke->dashPattern = nullptr;
+        } else {
+            if (!rs.stroke) rs.stroke = new RenderStroke();
+            if (rs.stroke->dashCnt != cnt) {
+                free(rs.stroke->dashPattern);
+                rs.stroke->dashPattern = nullptr;
+            }
+            if (!rs.stroke->dashPattern) {
+                rs.stroke->dashPattern = static_cast<float*>(malloc(sizeof(float) * cnt));
+                if (!rs.stroke->dashPattern) return Result::FailedAllocation;
+            }
             for (uint32_t i = 0; i < cnt; ++i) {
-                dash.pattern[i] = pattern[i] < 0.0f ? 0.0f : pattern[i];
-                dash.length += dash.pattern[i];
+                rs.stroke->dashPattern[i] = pattern[i];
             }
         }
-        rs.stroke->dash.count = cnt;
-        rs.stroke->dash.offset = offset;
-        impl.mark(RenderUpdateFlag::Stroke);
+        rs.stroke->dashCnt = cnt;
+        rs.stroke->dashOffset = offset;
+        rFlag |= RenderUpdateFlag::Stroke;
 
         return Result::Success;
     }
@@ -303,87 +338,41 @@ struct ShapeImpl : Shape
     bool strokeFirst()
     {
         if (!rs.stroke) return true;
-        return rs.stroke->first;
+        return rs.stroke->strokeFirst;
     }
 
-    void strokeFirst(bool first)
+    void strokeFirst(bool strokeFirst)
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
-        rs.stroke->first = first;
-        impl.mark(RenderUpdateFlag::Stroke);
+        rs.stroke->strokeFirst = strokeFirst;
+        rFlag |= RenderUpdateFlag::Stroke;
     }
 
-    Result fill(Fill* f)
+    void update(RenderUpdateFlag flag)
     {
-        if (!f) return Result::InvalidArguments;
-
-        if (rs.fill && rs.fill != f) delete(rs.fill);
-        rs.fill = f;
-        impl.mark(RenderUpdateFlag::Gradient);
-
-        return Result::Success;
-    }
-
-    void fill(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
-    {
-        if (rs.fill) {
-            delete(rs.fill);
-            rs.fill = nullptr;
-            impl.mark(RenderUpdateFlag::Gradient);
-        }
-
-        if (r == rs.color.r && g == rs.color.g && b == rs.color.b && a == rs.color.a) return;
-
-        rs.color = {r, g, b, a};
-        impl.mark(RenderUpdateFlag::Color);
-    }
-
-    void resetPath()
-    {
-        rs.path.cmds.clear();
-        rs.path.pts.clear();
-        impl.mark(RenderUpdateFlag::Path);
-    }
-
-    Result addPath(const PathCommand* cmds, uint32_t cmdCnt, const Point* pts, uint32_t ptsCnt)
-    {
-        if (cmdCnt == 0 || ptsCnt == 0 || !cmds || !pts) return Result::InvalidArguments;
-
-        grow(cmdCnt, ptsCnt);
-        append(cmds, cmdCnt, pts, ptsCnt);
-        impl.mark(RenderUpdateFlag::Path);
-
-        return Result::Success;
-    }
-
-    void addCircle(float cx, float cy, float rx, float ry, bool cw)
-    {
-        rs.path.addCircle(cx, cy, rx, ry, cw);
-        impl.mark(RenderUpdateFlag::Path);
-    }
-
-    void addRect(float x, float y, float w, float h, float rx, float ry, bool cw)
-    {
-        rs.path.addRect(x, y, w, h, rx, ry, cw);
-        impl.mark(RenderUpdateFlag::Path);
+        rFlag |= flag;
     }
 
     Paint* duplicate(Paint* ret)
     {
         auto shape = static_cast<Shape*>(ret);
-        if (!shape) shape = Shape::gen();
-        auto dup = to<ShapeImpl>(shape);
+        if (shape) shape->reset();
+        else shape = Shape::gen().release();
+
+        auto dup = shape->pImpl;
+        delete(dup->rs.fill);
+
+        //Default Properties
+        dup->rFlag = RenderUpdateFlag::All;
+        dup->rs.rule = rs.rule;
+
+        //Color
+        memcpy(dup->rs.color, rs.color, sizeof(rs.color));
 
         //Path
-        dup->rs.path.clear();
         dup->rs.path.cmds.push(rs.path.cmds);
         dup->rs.path.pts.push(rs.path.pts);
 
-        //Fill
-        delete(dup->rs.fill);
-        if (rs.fill) dup->rs.fill = rs.fill->duplicate();
-        else dup->rs.fill = nullptr;
-
         //Stroke
         if (rs.stroke) {
             if (!dup->rs.stroke) dup->rs.stroke = new RenderStroke;
@@ -393,20 +382,21 @@ struct ShapeImpl : Shape
             dup->rs.stroke = nullptr;
         }
 
-        dup->rs.color = rs.color;
-        dup->rs.rule = rs.rule;
+        //Fill
+        if (rs.fill) dup->rs.fill = rs.fill->duplicate();
+        else dup->rs.fill = nullptr;
 
         return shape;
     }
 
     void reset()
     {
-        PAINT(this)->reset();
+        PP(shape)->reset();
         rs.path.cmds.clear();
         rs.path.pts.clear();
 
-        rs.color.a = 0;
-        rs.rule = FillRule::NonZero;
+        rs.color[3] = 0;
+        rs.rule = FillRule::Winding;
 
         delete(rs.stroke);
         rs.stroke = nullptr;
@@ -421,6 +411,4 @@ struct ShapeImpl : Shape
     }
 };
 
-}
-
 #endif //_TVG_SHAPE_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp b/engine/thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp
new file mode 100644
index 00000000..6c4b6da1
--- /dev/null
+++ b/engine/thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "tvgCanvas.h"
+#include "tvgLoadModule.h"
+
+#ifdef THORVG_SW_RASTER_SUPPORT
+    #include "tvgSwRenderer.h"
+#else
+    class SwRenderer : public RenderMethod
+    {
+        //Non Supported. Dummy Class */
+    };
+#endif
+
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+struct SwCanvas::Impl
+{
+};
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+#ifdef THORVG_SW_RASTER_SUPPORT
+SwCanvas::SwCanvas() : Canvas(SwRenderer::gen()), pImpl(nullptr)
+#else
+SwCanvas::SwCanvas() : Canvas(nullptr), pImpl(nullptr)
+#endif
+{
+}
+
+
+SwCanvas::~SwCanvas()
+{
+    delete(pImpl);
+}
+
+
+Result SwCanvas::mempool(MempoolPolicy policy) noexcept
+{
+#ifdef THORVG_SW_RASTER_SUPPORT
+    //We know renderer type, avoid dynamic_cast for performance.
+    auto renderer = static_cast<SwRenderer*>(Canvas::pImpl->renderer);
+    if (!renderer) return Result::MemoryCorruption;
+
+    //It can't change the policy during the running.
+    if (!Canvas::pImpl->paints.empty()) return Result::InsufficientCondition;
+
+    if (policy == MempoolPolicy::Individual) renderer->mempool(false);
+    else renderer->mempool(true);
+
+    return Result::Success;
+#endif
+    return Result::NonSupport;
+}
+
+
+Result SwCanvas::target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h, Colorspace cs) noexcept
+{
+#ifdef THORVG_SW_RASTER_SUPPORT
+    if (Canvas::pImpl->status != Status::Damaged && Canvas::pImpl->status != Status::Synced) {
+        return Result::InsufficientCondition;
+    }
+
+    //We know renderer type, avoid dynamic_cast for performance.
+    auto renderer = static_cast<SwRenderer*>(Canvas::pImpl->renderer);
+    if (!renderer) return Result::MemoryCorruption;
+
+    if (!renderer->target(buffer, stride, w, h, static_cast<ColorSpace>(cs))) return Result::InvalidArguments;
+    Canvas::pImpl->vport = {0, 0, (int32_t)w, (int32_t)h};
+    renderer->viewport(Canvas::pImpl->vport);
+
+    //FIXME: The value must be associated with an individual canvas instance.
+    ImageLoader::cs = static_cast<ColorSpace>(cs);
+
+    //Paints must be updated again with this new target.
+    Canvas::pImpl->status = Status::Damaged;
+
+    return Result::Success;
+#endif
+    return Result::NonSupport;
+}
+
+
+unique_ptr<SwCanvas> SwCanvas::gen() noexcept
+{
+#ifdef THORVG_SW_RASTER_SUPPORT
+    if (SwRenderer::init() <= 0) return nullptr;
+    return unique_ptr<SwCanvas>(new SwCanvas);
+#endif
+    return nullptr;
+}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
index db303d47..069bdf2f 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +20,24 @@
  * SOFTWARE.
  */
 
-
 #include "tvgArray.h"
 #include "tvgInlist.h"
 #include "tvgTaskScheduler.h"
 
+#ifdef THORVG_THREAD_SUPPORT
+    #include <thread>
+    #include <atomic>
+#endif
+
 /************************************************************************/
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
 namespace tvg {
 
+struct TaskSchedulerImpl;
+static TaskSchedulerImpl* inst = nullptr;
+
 #ifdef THORVG_THREAD_SUPPORT
 
 struct TaskQueue {
@@ -114,15 +121,15 @@ struct TaskSchedulerImpl
 
     ~TaskSchedulerImpl()
     {
-        ARRAY_FOREACH(p, taskQueues) {
-            (*p)->complete();
+        for (auto tq = taskQueues.begin(); tq < taskQueues.end(); ++tq) {
+            (*tq)->complete();
         }
-        ARRAY_FOREACH(p, threads) {
-            (*p)->join();
-            delete(*p);
+        for (auto thread = threads.begin(); thread < threads.end(); ++thread) {
+            (*thread)->join();
+            delete(*thread);
         }
-        ARRAY_FOREACH(p, taskQueues) {
-            delete(*p);
+        for (auto tq = taskQueues.begin(); tq < taskQueues.end(); ++tq) {
+            delete(*tq);
         }
     }
 
@@ -178,54 +185,34 @@ struct TaskSchedulerImpl
 
 #endif //THORVG_THREAD_SUPPORT
 
-
 } //namespace
 
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
 
-static TaskSchedulerImpl* _inst = nullptr;
-static ThreadID _tid;   //dominant thread id
-
 void TaskScheduler::init(uint32_t threads)
 {
-    if (_inst) return;
-    _inst = new TaskSchedulerImpl(threads);
-    _tid = tid();
+    if (inst) return;
+    inst = new TaskSchedulerImpl(threads);
 }
 
 
 void TaskScheduler::term()
 {
-    delete(_inst);
-    _inst = nullptr;
+    delete(inst);
+    inst = nullptr;
 }
 
 
 void TaskScheduler::request(Task* task)
 {
-    if (_inst) _inst->request(task);
+    if (inst) inst->request(task);
 }
 
 
 uint32_t TaskScheduler::threads()
 {
-    return _inst ? _inst->threadCnt() : 0;
-}
-
-
-bool TaskScheduler::onthread()
-{
-    return _tid != tid();
-}
-
-
-ThreadID TaskScheduler::tid()
-{
-#ifdef THORVG_THREAD_SUPPORT
-    return std::this_thread::get_id();
-#else
+    if (inst) return inst->threadCnt();
     return 0;
-#endif
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
index 19ddb168..78120dfe 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2020 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,23 +23,16 @@
 #ifndef _TVG_TASK_SCHEDULER_H_
 #define _TVG_TASK_SCHEDULER_H_
 
+#include <mutex>
+#include <condition_variable>
+
 #include "tvgCommon.h"
 #include "tvgInlist.h"
 
-#ifdef THORVG_THREAD_SUPPORT
-    #include <atomic>
-    #include <thread>
-    #include <mutex>
-    #include <condition_variable>
-#endif
-
 namespace tvg {
 
-
 #ifdef THORVG_THREAD_SUPPORT
 
-using ThreadID = std::thread::id;
-
 struct Task
 {
 private:
@@ -86,8 +79,6 @@ private:
 
 #else  //THORVG_THREAD_SUPPORT
 
-using ThreadID = uint8_t;
-
 struct Task
 {
 public:
@@ -112,8 +103,6 @@ struct TaskScheduler
     static void init(uint32_t threads);
     static void term();
     static void request(Task* task);
-    static bool onthread();  //figure out whether on worker thread or not
-    static ThreadID tid();
 };
 
 }  //namespace
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgText.cpp b/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
index f1007a0f..2b2aea31 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,32 +24,45 @@
 #include "tvgText.h"
 
 
-Text::Text() = default;
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+
+Text::Text() : pImpl(new Impl(this))
+{
+}
+
+
+Text::~Text()
+{
+    delete(pImpl);
+}
 
 
 Result Text::text(const char* text) noexcept
 {
-    return to<TextImpl>(this)->text(text);
+    return pImpl->text(text);
 }
 
 
-Result Text::font(const char* name) noexcept
+Result Text::font(const char* name, float size, const char* style) noexcept
 {
-    return to<TextImpl>(this)->font(name);
+    return pImpl->font(name, size, style);
 }
 
 
-Result Text::size(float size) noexcept
-{
-    return to<TextImpl>(this)->size(size);
-}
-
-
-Result Text::load(const char* filename) noexcept
+Result Text::load(const std::string& path) noexcept
 {
 #ifdef THORVG_FILE_IO_SUPPORT
     bool invalid; //invalid path
-    auto loader = LoaderMgr::loader(filename, &invalid);
+    auto loader = LoaderMgr::loader(path, &invalid);
     if (loader) {
         if (loader->sharing > 0) --loader->sharing;   //font loading doesn't mean sharing.
         return Result::Success;
@@ -57,6 +70,7 @@ Result Text::load(const char* filename) noexcept
         if (invalid) return Result::InvalidArguments;
         else return Result::NonSupport;
     }
+    return Result::Success;
 #else
     TVGLOG("RENDERER", "FILE IO is disabled!");
     return Result::NonSupport;
@@ -64,13 +78,13 @@ Result Text::load(const char* filename) noexcept
 }
 
 
-Result Text::load(const char* name, const char* data, uint32_t size, const char* mimeType, bool copy) noexcept
+Result Text::load(const char* name, const char* data, uint32_t size, const string& mimeType, bool copy) noexcept
 {
     if (!name || (size == 0 && data)) return Result::InvalidArguments;
 
     //unload font
     if (!data) {
-        if (LoaderMgr::retrieve(LoaderMgr::font(name))) return Result::Success;
+        if (LoaderMgr::retrieve(name)) return Result::Success;
         return Result::InsufficientCondition;
     }
 
@@ -79,10 +93,10 @@ Result Text::load(const char* name, const char* data, uint32_t size, const char*
 }
 
 
-Result Text::unload(const char* filename) noexcept
+Result Text::unload(const std::string& path) noexcept
 {
 #ifdef THORVG_FILE_IO_SUPPORT
-    if (LoaderMgr::retrieve(filename)) return Result::Success;
+    if (LoaderMgr::retrieve(path)) return Result::Success;
     return Result::InsufficientCondition;
 #else
     TVGLOG("RENDERER", "FILE IO is disabled!");
@@ -91,92 +105,21 @@ Result Text::unload(const char* filename) noexcept
 }
 
 
-Result Text::align(float x, float y) noexcept
-{
-    to<TextImpl>(this)->fm.align = {x, y};
-    PAINT(this)->mark(RenderUpdateFlag::Transform);
-    return Result::Success;
-}
-
-
-Result Text::layout(float w, float h) noexcept
-{
-    to<TextImpl>(this)->layout(w, h);
-    return Result::Success;
-}
-
-
 Result Text::fill(uint8_t r, uint8_t g, uint8_t b) noexcept
 {
-    return to<TextImpl>(this)->shape->fill(r, g, b);
+    return pImpl->shape->fill(r, g, b);
 }
 
 
-Result Text::outline(float width, uint8_t r, uint8_t g, uint8_t b) noexcept
+Result Text::fill(unique_ptr<Fill> f) noexcept
 {
-    to<TextImpl>(this)->outlineWidth = width;
-    to<TextImpl>(this)->shape->strokeFill(r, g, b);
-    PAINT(this)->mark(RenderUpdateFlag::Stroke);
-    return Result::Success;
+    return pImpl->shape->fill(std::move(f));
 }
 
 
-Result Text::fill(Fill* f) noexcept
+unique_ptr<Text> Text::gen() noexcept
 {
-    return to<TextImpl>(this)->shape->fill(f);
-}
-
-
-Result Text::italic(float shear) noexcept
-{
-    if (shear < 0.0f) shear = 0.0f;
-    else if (shear > 0.5f) shear = 0.5f;
-    to<TextImpl>(this)->italicShear = shear;
-    to<TextImpl>(this)->updated = true;
-    return Result::Success;
-}
-
-
-Result Text::spacing(float letter, float line) noexcept
-{
-    return to<TextImpl>(this)->spacing(letter, line);
-}
-
-
-Result Text::wrap(TextWrap mode) noexcept
-{
-    to<TextImpl>(this)->wrapping(mode);
-    return Result::Success;
-}
-
-
-uint32_t Text::lines() noexcept
-{
-    return to<TextImpl>(this)->lines();
-}
-
-
-Result Text::metrics(TextMetrics& metrics) const noexcept
-{
-    return to<TextImpl>(this)->metrics(metrics);
-}
-
-
-Result Text::metrics(const char* ch, GlyphMetrics& metrics) const noexcept
-{
-    return to<TextImpl>(this)->metrics(ch, metrics);
-}
-
-
-const char* Text::text() const noexcept
-{
-    return to<TextImpl>(this)->utf8;
-}
-
-
-Text* Text::gen() noexcept
-{
-    return new TextImpl;
+    return unique_ptr<Text>(new Text);
 }
 
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgText.h b/engine/thirdparty/thorvg/src/renderer/tvgText.h
index ea1ab3ab..c84615d7 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgText.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgText.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 - 2026 ThorVG project. All rights reserved.
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,219 +23,139 @@
 #ifndef _TVG_TEXT_H
 #define _TVG_TEXT_H
 
-#include "tvgStr.h"
+#include <cstring>
 #include "tvgMath.h"
 #include "tvgShape.h"
 #include "tvgFill.h"
 #include "tvgLoader.h"
 
-namespace tvg
+struct Text::Impl
 {
-
-struct TextImpl : Text
-{
-    Paint::Impl impl;
-    Shape* shape;   //text shape
     FontLoader* loader = nullptr;
-    FontMetrics fm;
+    Text* paint;
+    Shape* shape;
+    FontMetrics metrics;
     char* utf8 = nullptr;
-    uint32_t utf8len = 0;
-    float outlineWidth = 0.0f;
-    float italicShear = 0.0f;
-    bool updated = false;
+    float fontSize;
+    bool italic = false;
+    bool changed = false;
 
-    TextImpl() : impl(Paint::Impl(this)), shape(Shape::gen())
-    {
-        PAINT(shape)->parent = this;
-        shape->strokeJoin(StrokeJoin::Round);
-    }
+    Impl(Text* p) : paint(p), shape(Shape::gen().release()) {}
 
-    ~TextImpl()
+    ~Impl()
     {
-        tvg::free(utf8);
-        if (loader) {
-            loader->release(fm);
-            LoaderMgr::retrieve(loader);
-        }
-        Paint::rel(shape);
+        free(utf8);
+        LoaderMgr::retrieve(loader);
+        delete(shape);
     }
 
     Result text(const char* utf8)
     {
-        tvg::free(this->utf8);
-        this->utf8 = tvg::duplicate(utf8, SIZE_MAX, &utf8len);
-        updated = true;
-        impl.mark(RenderUpdateFlag::Path);
+        free(this->utf8);
+        if (utf8) this->utf8 = strdup(utf8);
+        else this->utf8 = nullptr;
+        changed = true;
 
         return Result::Success;
     }
 
-    Result font(const char* name)
+    Result font(const char* name, float size, const char* style)
     {
-        auto loader = static_cast<FontLoader*>(name ? LoaderMgr::font(name) : LoaderMgr::anyfont());
+        auto loader = LoaderMgr::loader(name);
         if (!loader) return Result::InsufficientCondition;
 
+        if (style && strstr(style, "italic")) italic = true;
+        else italic = false;
+
+        fontSize = size;
+
         //Same resource has been loaded.
         if (this->loader == loader) {
             this->loader->sharing--;  //make it sure the reference counting.
             return Result::Success;
         } else if (this->loader) {
-            this->loader->release(fm);
             LoaderMgr::retrieve(this->loader);
         }
-        this->loader = loader;
-        updated = true;
+        this->loader = static_cast<FontLoader*>(loader);
 
+        changed = true;
         return Result::Success;
     }
 
-    Result size(float fontSize)
+    RenderRegion bounds(RenderMethod* renderer)
     {
-        if (fontSize > 0.0f) {
-            if (fm.fontSize != fontSize) {
-                fm.fontSize = fontSize;
-                updated = true;
-            }
-            return Result::Success;
+        return P(shape)->bounds(renderer);
+    }
+
+    bool render(RenderMethod* renderer)
+    {
+        if (!loader) return true;
+        renderer->blend(PP(paint)->blendMethod);
+        return PP(shape)->render(renderer);
+    }
+
+    float load()
+    {
+        if (!loader) return 0.0f;
+
+        //reload
+        if (changed) {
+            loader->read(shape, utf8, metrics);
+            changed = false;
         }
-        return Result::InvalidArguments;
+        return loader->transform(shape, metrics, fontSize, italic);
     }
 
-    RenderRegion bounds()
+    RenderData update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, TVG_UNUSED bool clipper)
     {
-        if (!load()) return {};
-        return to<ShapeImpl>(shape)->bounds();
-    }
-
-    bool render(RenderMethod* renderer, TVG_UNUSED CompositionFlag flag)
-    {
-        if (!loader || !fm.engine) return true;
-        renderer->blend(impl.blendMethod);
-        return PAINT(shape)->render(renderer);
-    }
-
-    bool load()
-    {
-        if (!loader) return false;
-        if (updated) {
-            if (loader->get(fm, utf8, utf8len, to<ShapeImpl>(shape)->rs.path)) {
-                loader->transform(shape, fm, italicShear);
-            }
-            updated = false;
-        }
-        return true;
-    }
-
-    Result metrics(TextMetrics& metrics)
-    {
-        if (!loader || fm.fontSize <= 0.0f) return Result::InsufficientCondition;
-        loader->metrics(fm, metrics);
-        return Result::Success;
-    }
-
-    Result metrics(const char* ch, GlyphMetrics& metrics)
-    {
-        if (!loader || fm.fontSize <= 0.0f) return Result::InsufficientCondition;
-        if (ch && loader->metrics(fm, ch, metrics)) return Result::Success;
-        return Result::InvalidArguments;
-    }
-
-    bool skip(RenderUpdateFlag flag)
-    {
-        if (flag == RenderUpdateFlag::None) return true;
-        return false;
-    }
-
-    void wrapping(TextWrap mode)
-    {
-        if (fm.wrap == mode) return;
-        fm.wrap = mode;
-        updated = true;
-        impl.mark(RenderUpdateFlag::Path);
-    }
-
-    uint32_t lines()
-    {
-        if (load()) return fm.lines;
-        return 0;
-    }
-
-    void layout(float w, float h)
-    {
-        fm.box = {w, h};
-        updated = true;
-    }
-
-    Result spacing(float letter, float line)
-    {
-        if (letter < 0.0f || line < 0.0f) return Result::InvalidArguments;
-
-        fm.spacing = {letter, line};
-        updated = true;
-
-        return Result::Success;
-    }
-
-    bool update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag flag, TVG_UNUSED bool clipper)
-    {
-        if (!load()) return true;
-
-        auto scale = fm.scale;
+        auto scale = 1.0f / load();
+        if (tvg::zero(scale)) return nullptr;
 
         //transform the gradient coordinates based on the final scaled font.
-        auto fill = to<ShapeImpl>(shape)->rs.fill;
-        if (fill && to<ShapeImpl>(shape)->impl.marked(RenderUpdateFlag::Gradient)) {
+        auto fill = P(shape)->rs.fill;
+        if (fill && P(shape)->rFlag & RenderUpdateFlag::Gradient) {
             if (fill->type() == Type::LinearGradient) {
-                LINEAR(fill)->p1 *= scale;
-                LINEAR(fill)->p2 *= scale;
+                P(static_cast<LinearGradient*>(fill))->x1 *= scale;
+                P(static_cast<LinearGradient*>(fill))->y1 *= scale;
+                P(static_cast<LinearGradient*>(fill))->x2 *= scale;
+                P(static_cast<LinearGradient*>(fill))->y2 *= scale;
             } else {
-                RADIAL(fill)->center *= scale;
-                RADIAL(fill)->r *= scale;
-                RADIAL(fill)->focal *= scale;
-                RADIAL(fill)->fr *= scale;
+                P(static_cast<RadialGradient*>(fill))->cx *= scale;
+                P(static_cast<RadialGradient*>(fill))->cy *= scale;
+                P(static_cast<RadialGradient*>(fill))->r *= scale;
+                P(static_cast<RadialGradient*>(fill))->fx *= scale;
+                P(static_cast<RadialGradient*>(fill))->fy *= scale;
+                P(static_cast<RadialGradient*>(fill))->fr *= scale;
             }
         }
+        return PP(shape)->update(renderer, transform, clips, opacity, pFlag, false);
+    }
 
-        if (outlineWidth > 0.0f && impl.marked(RenderUpdateFlag::Stroke)) shape->strokeWidth(outlineWidth * scale);
-
-        PAINT(shape)->update(renderer, transform, clips, opacity, flag, false);
+    bool bounds(float* x, float* y, float* w, float* h, TVG_UNUSED bool stroking)
+    {
+        if (load() == 0.0f) return false;
+        PP(shape)->bounds(x, y, w, h, true, true, false);
         return true;
     }
 
-    bool intersects(const RenderRegion& region)
-    {
-        if (!load()) return false;
-        return to<ShapeImpl>(shape)->intersects(region);
-    }
-
-    bool bounds(Point* pt4, const Matrix& m, bool obb)
-    {
-        if (!load()) return true;
-        return PAINT(shape)->bounds(pt4, &const_cast<Matrix&>(m), obb);
-    }
-
     Paint* duplicate(Paint* ret)
     {
         if (ret) TVGERR("RENDERER", "TODO: duplicate()");
 
         load();
 
-        auto text = Text::gen();
-        auto dup = to<TextImpl>(text);
-
-        to<ShapeImpl>(shape)->duplicate(dup->shape);
+        auto text = Text::gen().release();
+        auto dup = text->pImpl;
+        P(shape)->duplicate(dup->shape);
 
         if (loader) {
             dup->loader = loader;
             ++dup->loader->sharing;
-            loader->copy(fm, dup->fm);
         }
 
-        dup->utf8 = tvg::duplicate(utf8);
-        dup->utf8len = utf8len;
-        dup->italicShear = italicShear;
-        dup->outlineWidth = outlineWidth;
-        dup->updated = true;
+        dup->utf8 = strdup(utf8);
+        dup->italic = italic;
+        dup->fontSize = fontSize;
 
         return text;
     }
@@ -246,6 +166,6 @@ struct TextImpl : Text
     }
 };
 
-}
+
 
 #endif //_TVG_TEXT_H
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgWgCanvas.cpp b/engine/thirdparty/thorvg/src/renderer/tvgWgCanvas.cpp
new file mode 100644
index 00000000..991f73fc
--- /dev/null
+++ b/engine/thirdparty/thorvg/src/renderer/tvgWgCanvas.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2023 - 2024 the ThorVG project. All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "tvgCanvas.h"
+
+#ifdef THORVG_WG_RASTER_SUPPORT
+    #include "tvgWgRenderer.h"
+#endif
+
+/************************************************************************/
+/* Internal Class Implementation                                        */
+/************************************************************************/
+
+struct WgCanvas::Impl
+{
+};
+
+
+/************************************************************************/
+/* External Class Implementation                                        */
+/************************************************************************/
+
+#ifdef THORVG_WG_RASTER_SUPPORT
+WgCanvas::WgCanvas() : Canvas(WgRenderer::gen()), pImpl(nullptr)
+#else
+WgCanvas::WgCanvas() : Canvas(nullptr), pImpl(nullptr)
+#endif
+{
+}
+
+
+WgCanvas::~WgCanvas()
+{
+#ifdef THORVG_WG_RASTER_SUPPORT
+    auto renderer = static_cast<WgRenderer*>(Canvas::pImpl->renderer);
+    renderer->target(nullptr, 0, 0);
+#endif
+}
+
+
+Result WgCanvas::target(void* instance, void* surface, uint32_t w, uint32_t h, void* device) noexcept
+{
+#ifdef THORVG_WG_RASTER_SUPPORT
+    if (Canvas::pImpl->status != Status::Damaged && Canvas::pImpl->status != Status::Synced) {
+        return Result::InsufficientCondition;
+    }
+
+    if (!instance || !surface || (w == 0) || (h == 0)) return Result::InvalidArguments;
+
+    //We know renderer type, avoid dynamic_cast for performance.
+    auto renderer = static_cast<WgRenderer*>(Canvas::pImpl->renderer);
+    if (!renderer) return Result::MemoryCorruption;
+
+    if (!renderer->target((WGPUInstance)instance, (WGPUSurface)surface, w, h, (WGPUDevice)device)) return Result::Unknown;
+    Canvas::pImpl->vport = {0, 0, (int32_t)w, (int32_t)h};
+    renderer->viewport(Canvas::pImpl->vport);
+
+    //Paints must be updated again with this new target.
+    Canvas::pImpl->status = Status::Damaged;
+
+    return Result::Success;
+#endif
+    return Result::NonSupport;
+}
+
+
+unique_ptr<WgCanvas> WgCanvas::gen() noexcept
+{
+#ifdef THORVG_WG_RASTER_SUPPORT
+    return unique_ptr<WgCanvas>(new WgCanvas);
+#endif
+    return nullptr;
+}
diff --git a/engine/thirdparty/thorvg/update-thorvg.sh b/engine/thirdparty/thorvg/update-thorvg.sh
index d32ddb1e..8e319355 100755
--- a/engine/thirdparty/thorvg/update-thorvg.sh
+++ b/engine/thirdparty/thorvg/update-thorvg.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
-VERSION=1.0.3
+VERSION=0.15.16
 # Uncomment and set a git hash to use specific commit instead of tag.
 #GIT_COMMIT=
 
 pushd "$(dirname "$0")"
-rm -rf CONTRIBUTORS.md LICENSE inc/ src/ *.zip *.tar.gz tmp/
+rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/
 
 mkdir tmp/ && pushd tmp/
 
@@ -24,7 +24,7 @@ rm *.tar.gz
 # Install from local git checkout "thorvg-git" in the same directory
 # as godot git checkout.
 #d="../../../../thorvg-git"
-#cp -r ${d}/CONTRIBUTORS.md ${d}/inc ${d}/LICENSE ${d}/src .
+#cp -r ${d}/AUTHORS ${d}/inc ${d}/LICENSE ${d}/src .
 
 find . -type f -name 'meson.build' -delete
 
@@ -33,7 +33,7 @@ for source in $(find ./ -type f \( -iname \*.h -o -iname \*.cpp \)); do
     sed -i -e '$a\' $source
 done
 
-cp -v CONTRIBUTORS.md LICENSE ..
+cp -v AUTHORS LICENSE ..
 cp -rv inc ../
 
 cat << EOF > ../inc/config.h
diff --git a/engine/thirdparty/ufbx/ufbx.c b/engine/thirdparty/ufbx/ufbx.c
index 3b67f3d7..cd7273d8 100644
--- a/engine/thirdparty/ufbx/ufbx.c
+++ b/engine/thirdparty/ufbx/ufbx.c
@@ -40,6 +40,7 @@
 //   UFBX_STATIC_ANALYSIS      Enable static analysis augmentation
 //   UFBX_DEBUG_BINARY_SEARCH  Force using binary search for debugging
 //   UFBX_EXTENSIVE_THREADING  Use threads for small inputs
+//   UFBX_POINTER_SIZE         Allow specifying sizeof(void*) as a preprocessor constant
 //   UFBX_MAXIMUM_ALIGNMENT    Maximum alignment used for allocation
 
 #if defined(UFBX_CONFIG_SOURCE)
@@ -542,8 +543,7 @@ extern "C" {
 		#pragma GCC diagnostic ignored "-Wfloat-conversion"
 	#endif
 	// `-Warray-bounds` results in warnings if UBsan is enabled and pre-GCC-14 has no way of detecting it..
-	// The workaround for this uses an assert, but if the user has both UBsan and asserts disabled we need to silence the warning.
-	#if (UFBXI_GNUC_VERSION >= ufbx_pack_version(4, 3, 0) && UFBXI_GNUC_VERSION < ufbx_pack_version(14, 0, 0)) || defined(NDEBUG)
+	#if UFBXI_GNUC_VERSION >= ufbx_pack_version(4, 3, 0) && UFBXI_GNUC_VERSION < ufbx_pack_version(14, 0, 0)
 		#pragma GCC diagnostic ignored "-Warray-bounds"
 	#endif
 #endif
@@ -859,22 +859,22 @@ ufbx_static_assert(sizeof_f64, sizeof(double) == 8);
 enum { UFBX_MAXIMUM_ALIGNMENT = sizeof(void*) > 8 ? sizeof(void*) : 8 };
 #endif
 
-#if !defined(UFBXI_UINTPTR_SIZE) && !defined(__CHERI__) // CHERI lies about UINTPTR_MAX
-	#if UINTPTR_MAX == UINT64_MAX
-		#define UFBXI_UINTPTR_SIZE 8
-	#elif UINTPTR_MAX == UINT32_MAX
-		#define UFBXI_UINTPTR_SIZE 4
+#if !defined(UFBX_POINTER_SIZE) && !defined(UFBX_STANDARD_C)
+	#if (defined(_M_X64) || defined(__x86_64__) || defined(_M_ARM64) || defined(__aarch64__)) && !defined(__CHERI__)
+		#define UFBX_POINTER_SIZE 8
+	#elif defined(__wasm__) || defined(__EMSCRIPTEN__)
+		#define UFBX_POINTER_SIZE 4
 	#endif
 #endif
-#if defined(UFBXI_UINTPTR_SIZE)
-	ufbx_static_assert(pointer_size, UFBXI_UINTPTR_SIZE == sizeof(uintptr_t));
+#if defined(UFBX_POINTER_SIZE)
+	ufbx_static_assert(pointer_size, UFBX_POINTER_SIZE == sizeof(void*));
 #else
-	#define UFBXI_UINTPTR_SIZE 0
+	#define UFBX_POINTER_SIZE 0
 #endif
 
 // -- Version
 
-#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 21, 2)
+#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 20, 0)
 ufbx_abi_data_def const uint32_t ufbx_source_version = UFBX_SOURCE_VERSION;
 
 ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEADER_VERSION/1000u);
@@ -1082,7 +1082,7 @@ ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEAD
 // -- Utility
 
 #if defined(UFBX_UBSAN)
-	static void ufbxi_assert_zero(size_t offset) { (void)offset; ufbx_assert(offset == 0); }
+	static void ufbxi_assert_zero(size_t offset) { ufbx_assert(offset == 0); }
 	#define ufbxi_add_ptr(ptr, offset) ((ptr) ? (ptr) + (offset) : (ufbxi_assert_zero((size_t)(offset)), (ptr)))
 	#define ufbxi_sub_ptr(ptr, offset) ((ptr) ? (ptr) - (offset) : (ufbxi_assert_zero((size_t)(offset)), (ptr)))
 #else
@@ -1884,9 +1884,6 @@ static const uint8_t ufbxi_deflate_code_length_permutation[] = {
 
 #define UFBXI_HUFF_MAX_EXTRA_SYMS 32
 
-#define UFBXI_HUFF_CODELEN_SYMS 19
-#define UFBXI_HUFF_MAX_COMBINED_SYMS 320
-
 typedef struct {
 
 	// Number of bytes left to read from `read_fn()`
@@ -2215,11 +2212,6 @@ ufbxi_bit_copy_bytes(void *dst, ufbxi_bit_stream *s, size_t len)
 		s->left -= 8;
 	}
 
-	// Copied fully from buffer
-	if (len == 0) {
-		return 1;
-	}
-
 	// We need to clear the top bits as there may be data
 	// read ahead past `s->left` in some cases
 	s->bits = 0;
@@ -2537,21 +2529,34 @@ static ufbxi_noinline void ufbxi_init_static_huff(ufbxi_trees *trees, const ufbx
 	ufbx_assert(err == 0);
 }
 
-static ufbxi_noinline ptrdiff_t ufbxi_decode_dynamic_huff_bits(ufbxi_deflate_context *dc, const ufbxi_huff_tree *huff_code_length, uint8_t *code_lengths, uint32_t num_symbols)
+// 0: Success
+// -1: Huffman Overfull
+// -2: Huffman Underfull
+// -3: Code 16 repeat overflow
+// -4: Code 17 repeat overflow
+// -5: Code 18 repeat overflow
+// -6: Bad length code
+// -7: Cancelled
+static ufbxi_noinline ptrdiff_t ufbxi_init_dynamic_huff_tree(ufbxi_deflate_context *dc, const ufbxi_huff_tree *huff_code_length, ufbxi_huff_tree *tree,
+	uint32_t num_symbols, const uint32_t *sym_extra, uint32_t sym_extra_offset, uint32_t fast_bits)
 {
+	uint8_t code_lengths[UFBXI_HUFF_MAX_VALUE]; // ufbxi_uninit
+	ufbx_assert(num_symbols <= UFBXI_HUFF_MAX_VALUE);
+
 	uint64_t bits = dc->stream.bits;
 	size_t left = dc->stream.left;
 	const char *data = dc->stream.chunk_ptr;
+	uint32_t bits_counts[UFBXI_HUFF_MAX_BITS]; // ufbxi_uninit
+	memset(bits_counts, 0, sizeof(bits_counts));
 
 	uint32_t symbol_index = 0;
 	uint8_t prev = 0;
 	while (symbol_index < num_symbols) {
 		ufbxi_bit_refill(&bits, &left, &data, &dc->stream);
-		if (dc->stream.cancelled) return -28;
+		if (dc->stream.cancelled) return -7;
 
 		ufbxi_huff_sym sym = ufbxi_huff_decode_bits(huff_code_length, bits, UFBXI_HUFF_CODELEN_FAST_BITS, UFBXI_HUFF_CODELEN_FAST_MASK);
 		ufbxi_regression_assert(sym != UFBXI_HUFF_UNINITIALIZED_SYM);
-		if (sym == UFBXI_HUFF_ERROR_SYM) return -21;
 
 		uint32_t inst = ufbxi_huff_sym_value(sym);
 		uint32_t sym_len = ufbxi_huff_sym_total_bits(sym);
@@ -2563,37 +2568,44 @@ static ufbxi_noinline ptrdiff_t ufbxi_decode_dynamic_huff_bits(ufbxi_deflate_con
 			// "0 - 15: Represent code lengths of 0 - 15"
 			prev = (uint8_t)inst;
 			code_lengths[symbol_index++] = (uint8_t)inst;
+			bits_counts[(int32_t)inst]++;
 		} else if (inst == 16) {
 			// "16: Copy the previous code length 3 - 6 times. The next 2 bits indicate repeat length."
 			uint32_t num = 3 + ((uint32_t)bits & 0x3);
 			bits >>= 2;
 			left -= 2;
-			if (symbol_index + num > num_symbols) return -18;
+			if (symbol_index + num > num_symbols) return -3;
 			memset(code_lengths + symbol_index, prev, num);
 			symbol_index += num;
+			bits_counts[(int32_t)prev] += num;
 		} else if (inst == 17) {
 			// "17: Repeat a code length of 0 for 3 - 10 times. (3 bits of length)"
 			uint32_t num = 3 + ((uint32_t)bits & 0x7);
 			bits >>= 3;
 			left -= 3;
-			if (symbol_index + num > num_symbols) return -19;
+			if (symbol_index + num > num_symbols) return -4;
 			memset(code_lengths + symbol_index, 0, num);
 			symbol_index += num;
 			prev = 0;
+			bits_counts[0] += num;
 		} else if (inst == 18) {
 			// "18: Repeat a code length of 0 for 11 - 138 times (7 bits of length)"
 			uint32_t num = 11 + ((uint32_t)bits & 0x7f);
 			bits >>= 7;
 			left -= 7;
-			if (symbol_index + num > num_symbols) return -20;
+			if (symbol_index + num > num_symbols) return -5;
 			memset(code_lengths + symbol_index, 0, num);
 			symbol_index += num;
 			prev = 0;
+			bits_counts[0] += num;
 		} else {
 			return -6;
 		}
 	}
 
+	ptrdiff_t err = ufbxi_huff_build_imp(tree, code_lengths, num_symbols, sym_extra, sym_extra_offset, fast_bits, bits_counts);
+	if (err != 0) return err;
+
 	dc->stream.bits = bits;
 	dc->stream.left = left;
 	dc->stream.chunk_ptr = data;
@@ -2619,13 +2631,11 @@ ufbxi_init_dynamic_huff(ufbxi_deflate_context *dc, ufbxi_trees *trees)
 	bits >>= 14;
 	left -= 14;
 
-	uint8_t code_lengths[UFBXI_HUFF_MAX_COMBINED_SYMS]; // ufbxi_uninit
-
 	// Code lengths for the "code length" Huffman tree are represented literally
 	// 3 bits in order of: 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 up to
 	// `num_code_lengths`, rest of the code lengths are 0 (unused)
-	memset(code_lengths, 0, UFBXI_HUFF_CODELEN_SYMS);
-
+	uint8_t code_lengths[19]; // ufbxi_uninit
+	memset(code_lengths, 0, sizeof(code_lengths));
 	for (size_t len_i = 0; len_i < num_code_lengths; len_i++) {
 		if (len_i == 14) {
 			ufbxi_bit_refill(&bits, &left, &data, &dc->stream);
@@ -2646,16 +2656,11 @@ ufbxi_init_dynamic_huff(ufbxi_deflate_context *dc, ufbxi_trees *trees)
 	// Build the temporary "code length" Huffman tree used to encode the actual
 	// trees used to compress the data. Use that to build the literal/length and
 	// distance trees.
-	err = ufbxi_huff_build(&huff_code_length, code_lengths, UFBXI_HUFF_CODELEN_SYMS, NULL, INT32_MAX, UFBXI_HUFF_CODELEN_FAST_BITS);
+	err = ufbxi_huff_build(&huff_code_length, code_lengths, ufbxi_arraycount(code_lengths), NULL, INT32_MAX, UFBXI_HUFF_CODELEN_FAST_BITS);
 	if (err) return -14 + 1 + err;
-
-	err = ufbxi_decode_dynamic_huff_bits(dc, &huff_code_length, code_lengths, num_lit_lengths + num_dists);
-	if (err) return err;
-
-	err = ufbxi_huff_build(&trees->lit_length, code_lengths, num_lit_lengths, ufbxi_deflate_length_lut, 256, dc->fast_bits);
+	err = ufbxi_init_dynamic_huff_tree(dc, &huff_code_length, &trees->lit_length, num_lit_lengths, ufbxi_deflate_length_lut, 256, dc->fast_bits);
 	if (err) return err == -7 ? -28 : -16 + 1 + err;
-
-	err = ufbxi_huff_build(&trees->dist, code_lengths + num_lit_lengths, num_dists, ufbxi_deflate_dist_lut, 0, dc->fast_bits);
+	err = ufbxi_init_dynamic_huff_tree(dc, &huff_code_length, &trees->dist, num_dists, ufbxi_deflate_dist_lut, 0, dc->fast_bits);
 	if (err) return err == -7 ? -28 : -22 + 1 + err;
 
 	return 0;
@@ -3117,17 +3122,10 @@ static void ufbxi_inflate_init_retain(ufbx_inflate_retain *retain)
 // -13: Bad lit/length code
 // -14: Codelen Huffman Overfull
 // -15: Codelen Huffman Underfull
-// -16: Litlen Huffman Overfull
-// -17: Litlen Huffman Underfull
-// -18: Repeat 16 overflow
-// -19: Repeat 17 overflow
-// -20: Repeat 18 overflow
-// -21: Bad codelen code
-// -22: Distance Huffman: Overfull
-// -23: Distance Huffman: Underfull
+// -16 - -21: Litlen Huffman: Overfull / Underfull / Repeat 16/17/18 overflow / Bad length code
+// -22 - -27: Distance Huffman: Overfull / Underfull / Repeat 16/17/18 overflow / Bad length code
 // -28: Cancelled
 // -29: Invalid ufbx_inflate_input.internal_fast_bits value
-// -30: Bad window size (ZLIB header)
 ufbxi_extern_c ptrdiff_t ufbx_inflate(void *dst, size_t dst_size, const ufbx_inflate_input *input, ufbx_inflate_retain *retain)
 {
 	ufbxi_inflate_retain_imp *ret_imp = (ufbxi_inflate_retain_imp*)retain;
@@ -3163,7 +3161,6 @@ ufbxi_extern_c ptrdiff_t ufbx_inflate(void *dst, size_t dst_size, const ufbx_inf
 		if ((cmf & 0xf) != 0x8) return -1;
 		if ((flg & 0x20) != 0) return -2;
 		if ((cmf << 8 | flg) % 31u != 0) return -3;
-		if ((cmf >> 4) > 7) return -30;
 	}
 
 	for (;;) {
@@ -4800,9 +4797,9 @@ static ufbxi_unused ufbxi_forceinline uint32_t ufbxi_hash64(uint64_t x)
 
 static ufbxi_forceinline uint32_t ufbxi_hash_uptr(uintptr_t ptr)
 {
-#if UFBXI_UINTPTR_SIZE == 8
+#if UFBX_POINTER_SIZE == 8
 	return ufbxi_hash64((uint64_t)ptr);
-#elif UFBXI_UINTPTR_SIZE == 4
+#elif UFBX_POINTER_SIZE == 4
 	return ufbxi_hash32((uint32_t)ptr);
 #else
 	if (sizeof(ptr) == 8) return ufbxi_hash64((uint64_t)ptr);
@@ -15369,7 +15366,7 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_take_anim_channel(ufbxi_con
 				// automatic tangents for now as they're the least likely to break with
 				// objectionable artifacts. We need to defer the automatic tangent resolve
 				// until we have read the next time/value.
-				// TODO: Solve what this is more thoroughly
+				// TODO: Solve what this is more throroughly
 				auto_slope = true;
 				if (uc->version == 5000) {
 					num_weights = 0;
@@ -24913,7 +24910,7 @@ static ufbxi_forceinline double ufbxi_find_cubic_bezier_t(double p1, double p2,
 	double t = x0;
 	double x1, t2, t3;
 
-	// Manually unroll three iterations of Newton-Raphson, this is enough
+	// Manually unroll three iterations of Newton-Rhapson, this is enough
 	// for most tangents
 	t2 = t*t; t3 = t2*t; x1 = a*t3 + b*t2 + c*t - x0;
 	t -= x1 / (a_3*t2 + b_2*t + c);
@@ -25724,7 +25721,7 @@ static ufbxi_noinline void ufbxi_evaluate_connected_prop(ufbx_prop *prop, const
 
 	// Found a non-cyclic connection
 	if (conn && !ufbxi_find_prop_connection(conn->src, conn->src_prop.data)) {
-		ufbx_prop ep = ufbx_evaluate_prop_flags_len(anim, conn->src, conn->src_prop.data, conn->src_prop.length, time, flags);
+		ufbx_prop ep = ufbx_evaluate_prop_len_flags(anim, conn->src, conn->src_prop.data, conn->src_prop.length, time, flags);
 		prop->value_vec4 = ep.value_vec4;
 		prop->value_int = ep.value_int;
 		prop->value_str = ep.value_str;
@@ -27416,7 +27413,7 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_bake_anim_prop(ufbxi_bake_contex
 	for (size_t i = 0; i < times.count; i++) {
 		ufbxi_bake_time bake_time = times.data[i];
 		double eval_time = ufbxi_bake_time_sample_time(bake_time);
-		ufbx_prop prop = ufbx_evaluate_prop_flags_len(bc->anim, element, name.data, name.length, eval_time, bc->opts.evaluate_flags);
+		ufbx_prop prop = ufbx_evaluate_prop_len_flags(bc->anim, element, name.data, name.length, eval_time, bc->opts.evaluate_flags);
 		keys.data[i].time = bake_time.time;
 		keys.data[i].value = prop.value_vec3;
 		keys.data[i].flags = (ufbx_baked_key_flags)bake_time.flags;
@@ -30841,10 +30838,10 @@ ufbx_abi ufbxi_noinline ufbx_vec3 ufbx_evaluate_anim_value_vec3_flags(const ufbx
 
 ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time)
 {
-	return ufbx_evaluate_prop_flags_len(anim, element, name, name_len, time, 0);
+	return ufbx_evaluate_prop_len_flags(anim, element, name, name_len, time, 0);
 }
 
-ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_flags_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags)
+ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_len_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags)
 {
 	ufbx_prop result;
 
@@ -33044,7 +33041,7 @@ ufbx_abi ufbx_anim_stack *ufbx_find_anim_stack(const ufbx_scene *scene, const ch
 ufbx_abi ufbx_material *ufbx_find_material(const ufbx_scene *scene, const char *name) { return ufbx_find_material_len(scene, name, strlen(name)); }
 ufbx_abi ufbx_anim_prop *ufbx_find_anim_prop(const ufbx_anim_layer *layer, const ufbx_element *element, const char *prop) { return ufbx_find_anim_prop_len(layer, element, prop, strlen(prop)); }
 ufbx_abi ufbx_prop ufbx_evaluate_prop(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time) { return ufbx_evaluate_prop_len(anim, element, name, strlen(name), time); }
-ufbx_abi ufbx_prop ufbx_evaluate_prop_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags) { return ufbx_evaluate_prop_flags_len(anim, element, name, strlen(name), time, flags); }
+ufbx_abi ufbx_prop ufbx_evaluate_prop_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags) { return ufbx_evaluate_prop_len_flags(anim, element, name, strlen(name), time, flags); }
 ufbx_abi ufbx_texture *ufbx_find_prop_texture(const ufbx_material *material, const char *name) { return ufbx_find_prop_texture_len(material, name, strlen(name)); }
 ufbx_abi ufbx_string ufbx_find_shader_prop(const ufbx_shader *shader, const char *name) { return ufbx_find_shader_prop_len(shader, name, strlen(name)); }
 ufbx_abi ufbx_shader_prop_binding_list ufbx_find_shader_prop_bindings(const ufbx_shader *shader, const char *name) { return ufbx_find_shader_prop_bindings_len(shader, name, strlen(name)); }
diff --git a/engine/thirdparty/ufbx/ufbx.h b/engine/thirdparty/ufbx/ufbx.h
index 939952f5..9078a960 100644
--- a/engine/thirdparty/ufbx/ufbx.h
+++ b/engine/thirdparty/ufbx/ufbx.h
@@ -267,7 +267,7 @@ struct ufbx_converter { };
 // `ufbx_source_version` contains the version of the corresponding source file.
 // HINT: The version can be compared numerically to the result of `ufbx_pack_version()`,
 // for example `#if UFBX_VERSION >= ufbx_pack_version(0, 12, 0)`.
-#define UFBX_HEADER_VERSION ufbx_pack_version(0, 21, 2)
+#define UFBX_HEADER_VERSION ufbx_pack_version(0, 20, 0)
 #define UFBX_VERSION UFBX_HEADER_VERSION
 
 // -- Basic types
@@ -1584,7 +1584,7 @@ struct ufbx_camera {
 	ufbx_vec2 field_of_view_deg;
 
 	// Component-wise `tan(field_of_view_deg)`, also represents the size of the
-	// frustum slice at distance of 1.
+	// proection frustum slice at distance of 1.
 	// Valid if `projection_mode == UFBX_PROJECTION_MODE_PERSPECTIVE`.
 	ufbx_vec2 field_of_view_tan;
 
@@ -5427,7 +5427,7 @@ ufbx_abi ufbx_vec3 ufbx_evaluate_anim_value_vec3_flags(const ufbx_anim_value *an
 // NOTE: If the property is not found it will have the flag `UFBX_PROP_FLAG_NOT_FOUND`.
 ufbx_abi ufbx_prop ufbx_evaluate_prop_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time);
 ufbx_abi ufbx_prop ufbx_evaluate_prop(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time);
-ufbx_abi ufbx_prop ufbx_evaluate_prop_flags_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags);
+ufbx_abi ufbx_prop ufbx_evaluate_prop_len_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags);
 ufbx_abi ufbx_prop ufbx_evaluate_prop_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags);
 
 // Evaluate all _animated_ properties of `element`.
diff --git a/engine/thirdparty/volk/LICENSE.md b/engine/thirdparty/volk/LICENSE.md
index 782051ab..5a717f26 100644
--- a/engine/thirdparty/volk/LICENSE.md
+++ b/engine/thirdparty/volk/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2025 Arseny Kapoulkine
+Copyright (c) 2018-2024 Arseny Kapoulkine
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/engine/thirdparty/volk/volk.c b/engine/thirdparty/volk/volk.c
index e4959392..b0bc01be 100644
--- a/engine/thirdparty/volk/volk.c
+++ b/engine/thirdparty/volk/volk.c
@@ -21,26 +21,14 @@
 #	include <stdlib.h>
 #endif
 
-#include <string.h>
-
-#ifdef _WIN32
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#ifdef _WIN32
 __declspec(dllimport) HMODULE __stdcall LoadLibraryA(LPCSTR);
 __declspec(dllimport) FARPROC __stdcall GetProcAddress(HMODULE, LPCSTR);
 __declspec(dllimport) int __stdcall FreeLibrary(HMODULE);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#ifdef __cplusplus
-#ifdef VOLK_NAMESPACE
-namespace volk {
-#else
-extern "C" {
-#endif
 #endif
 
 #if defined(__GNUC__)
@@ -60,7 +48,6 @@ static VkDevice loadedDevice = VK_NULL_HANDLE;
 
 static void volkGenLoadLoader(void* context, PFN_vkVoidFunction (*load)(void*, const char*));
 static void volkGenLoadInstance(void* context, PFN_vkVoidFunction (*load)(void*, const char*));
-static void volkGenLoadInstanceTable(struct VolkInstanceTable* table, void* context, PFN_vkVoidFunction (*load)(void*, const char*));
 static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, const char*));
 static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context, PFN_vkVoidFunction (*load)(void*, const char*));
 
@@ -94,18 +81,18 @@ VkResult volkInitialize(void)
 	void* module = dlopen("libvulkan.dylib", RTLD_NOW | RTLD_LOCAL);
 	if (!module)
 		module = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL);
+	if (!module)
+		module = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
+    // Add support for using Vulkan and MoltenVK in a Framework. App store rules for iOS
+    // strictly enforce no .dylib's. If they aren't found it just falls through
+    if (!module)
+        module = dlopen("vulkan.framework/vulkan", RTLD_NOW | RTLD_LOCAL);
+    if (!module)
+        module = dlopen("MoltenVK.framework/MoltenVK", RTLD_NOW | RTLD_LOCAL);
 	// modern versions of macOS don't search /usr/local/lib automatically contrary to what man dlopen says
 	// Vulkan SDK uses this as the system-wide installation location, so we're going to fallback to this if all else fails
 	if (!module && getenv("DYLD_FALLBACK_LIBRARY_PATH") == NULL)
 		module = dlopen("/usr/local/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL);
-	if (!module)
-		module = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
-	// Add support for using Vulkan and MoltenVK in a Framework. App store rules for iOS
-	// strictly enforce no .dylib's. If they aren't found it just falls through
-	if (!module)
-		module = dlopen("vulkan.framework/vulkan", RTLD_NOW | RTLD_LOCAL);
-	if (!module)
-		module = dlopen("MoltenVK.framework/MoltenVK", RTLD_NOW | RTLD_LOCAL);
 	if (!module)
 		return VK_ERROR_INITIALIZATION_FAILED;
 
@@ -199,18 +186,8 @@ VkDevice volkGetLoadedDevice(void)
 	return loadedDevice;
 }
 
-void volkLoadInstanceTable(struct VolkInstanceTable* table, VkInstance instance)
-{
-	/* vkGetDeviceProcAddr is used by volkLoadDeviceTable; for now we load this global pointer even though it might be instance-specific */
-	vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vkGetInstanceProcAddr(instance, "vkGetDeviceProcAddr");
-
-	memset(table, 0, sizeof(*table));
-	volkGenLoadInstanceTable(table, instance, vkGetInstanceProcAddrStub);
-}
-
 void volkLoadDeviceTable(struct VolkDeviceTable* table, VkDevice device)
 {
-	memset(table, 0, sizeof(*table));
 	volkGenLoadDeviceTable(table, device, vkGetDeviceProcAddrStub);
 }
 
@@ -262,16 +239,6 @@ static void volkGenLoadInstance(void* context, PFN_vkVoidFunction (*load)(void*,
 #if defined(VK_VERSION_1_3)
 	vkGetPhysicalDeviceToolProperties = (PFN_vkGetPhysicalDeviceToolProperties)load(context, "vkGetPhysicalDeviceToolProperties");
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_ARM_data_graph)
-	vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM)load(context, "vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM");
-	vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM)load(context, "vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM");
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_performance_counters_by_region)
-	vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = (PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM)load(context, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM");
-#endif /* defined(VK_ARM_performance_counters_by_region) */
-#if defined(VK_ARM_tensors)
-	vkGetPhysicalDeviceExternalTensorPropertiesARM = (PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM)load(context, "vkGetPhysicalDeviceExternalTensorPropertiesARM");
-#endif /* defined(VK_ARM_tensors) */
 #if defined(VK_EXT_acquire_drm_display)
 	vkAcquireDrmDisplayEXT = (PFN_vkAcquireDrmDisplayEXT)load(context, "vkAcquireDrmDisplayEXT");
 	vkGetDrmDisplayEXT = (PFN_vkGetDrmDisplayEXT)load(context, "vkGetDrmDisplayEXT");
@@ -434,12 +401,6 @@ static void volkGenLoadInstance(void* context, PFN_vkVoidFunction (*load)(void*,
 #if defined(VK_NV_cooperative_matrix)
 	vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV");
 #endif /* defined(VK_NV_cooperative_matrix) */
-#if defined(VK_NV_cooperative_matrix2)
-	vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV");
-#endif /* defined(VK_NV_cooperative_matrix2) */
-#if defined(VK_NV_cooperative_vector)
-	vkGetPhysicalDeviceCooperativeVectorPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeVectorPropertiesNV");
-#endif /* defined(VK_NV_cooperative_vector) */
 #if defined(VK_NV_coverage_reduction_mode)
 	vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = (PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV)load(context, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV");
 #endif /* defined(VK_NV_coverage_reduction_mode) */
@@ -449,9 +410,6 @@ static void volkGenLoadInstance(void* context, PFN_vkVoidFunction (*load)(void*,
 #if defined(VK_NV_optical_flow)
 	vkGetPhysicalDeviceOpticalFlowImageFormatsNV = (PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)load(context, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV");
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_OHOS_surface)
-	vkCreateSurfaceOHOS = (PFN_vkCreateSurfaceOHOS)load(context, "vkCreateSurfaceOHOS");
-#endif /* defined(VK_OHOS_surface) */
 #if defined(VK_QNX_screen_surface)
 	vkCreateScreenSurfaceQNX = (PFN_vkCreateScreenSurfaceQNX)load(context, "vkCreateScreenSurfaceQNX");
 	vkGetPhysicalDeviceScreenPresentationSupportQNX = (PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX)load(context, "vkGetPhysicalDeviceScreenPresentationSupportQNX");
@@ -658,27 +616,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkQueueSubmit2 = (PFN_vkQueueSubmit2)load(context, "vkQueueSubmit2");
 	vkSetPrivateData = (PFN_vkSetPrivateData)load(context, "vkSetPrivateData");
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_VERSION_1_4)
-	vkCmdBindDescriptorSets2 = (PFN_vkCmdBindDescriptorSets2)load(context, "vkCmdBindDescriptorSets2");
-	vkCmdBindIndexBuffer2 = (PFN_vkCmdBindIndexBuffer2)load(context, "vkCmdBindIndexBuffer2");
-	vkCmdPushConstants2 = (PFN_vkCmdPushConstants2)load(context, "vkCmdPushConstants2");
-	vkCmdPushDescriptorSet = (PFN_vkCmdPushDescriptorSet)load(context, "vkCmdPushDescriptorSet");
-	vkCmdPushDescriptorSet2 = (PFN_vkCmdPushDescriptorSet2)load(context, "vkCmdPushDescriptorSet2");
-	vkCmdPushDescriptorSetWithTemplate = (PFN_vkCmdPushDescriptorSetWithTemplate)load(context, "vkCmdPushDescriptorSetWithTemplate");
-	vkCmdPushDescriptorSetWithTemplate2 = (PFN_vkCmdPushDescriptorSetWithTemplate2)load(context, "vkCmdPushDescriptorSetWithTemplate2");
-	vkCmdSetLineStipple = (PFN_vkCmdSetLineStipple)load(context, "vkCmdSetLineStipple");
-	vkCmdSetRenderingAttachmentLocations = (PFN_vkCmdSetRenderingAttachmentLocations)load(context, "vkCmdSetRenderingAttachmentLocations");
-	vkCmdSetRenderingInputAttachmentIndices = (PFN_vkCmdSetRenderingInputAttachmentIndices)load(context, "vkCmdSetRenderingInputAttachmentIndices");
-	vkCopyImageToImage = (PFN_vkCopyImageToImage)load(context, "vkCopyImageToImage");
-	vkCopyImageToMemory = (PFN_vkCopyImageToMemory)load(context, "vkCopyImageToMemory");
-	vkCopyMemoryToImage = (PFN_vkCopyMemoryToImage)load(context, "vkCopyMemoryToImage");
-	vkGetDeviceImageSubresourceLayout = (PFN_vkGetDeviceImageSubresourceLayout)load(context, "vkGetDeviceImageSubresourceLayout");
-	vkGetImageSubresourceLayout2 = (PFN_vkGetImageSubresourceLayout2)load(context, "vkGetImageSubresourceLayout2");
-	vkGetRenderingAreaGranularity = (PFN_vkGetRenderingAreaGranularity)load(context, "vkGetRenderingAreaGranularity");
-	vkMapMemory2 = (PFN_vkMapMemory2)load(context, "vkMapMemory2");
-	vkTransitionImageLayout = (PFN_vkTransitionImageLayout)load(context, "vkTransitionImageLayout");
-	vkUnmapMemory2 = (PFN_vkUnmapMemory2)load(context, "vkUnmapMemory2");
-#endif /* defined(VK_VERSION_1_4) */
 #if defined(VK_AMDX_shader_enqueue)
 	vkCmdDispatchGraphAMDX = (PFN_vkCmdDispatchGraphAMDX)load(context, "vkCmdDispatchGraphAMDX");
 	vkCmdDispatchGraphIndirectAMDX = (PFN_vkCmdDispatchGraphIndirectAMDX)load(context, "vkCmdDispatchGraphIndirectAMDX");
@@ -688,15 +625,9 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkGetExecutionGraphPipelineNodeIndexAMDX = (PFN_vkGetExecutionGraphPipelineNodeIndexAMDX)load(context, "vkGetExecutionGraphPipelineNodeIndexAMDX");
 	vkGetExecutionGraphPipelineScratchSizeAMDX = (PFN_vkGetExecutionGraphPipelineScratchSizeAMDX)load(context, "vkGetExecutionGraphPipelineScratchSizeAMDX");
 #endif /* defined(VK_AMDX_shader_enqueue) */
-#if defined(VK_AMD_anti_lag)
-	vkAntiLagUpdateAMD = (PFN_vkAntiLagUpdateAMD)load(context, "vkAntiLagUpdateAMD");
-#endif /* defined(VK_AMD_anti_lag) */
 #if defined(VK_AMD_buffer_marker)
 	vkCmdWriteBufferMarkerAMD = (PFN_vkCmdWriteBufferMarkerAMD)load(context, "vkCmdWriteBufferMarkerAMD");
 #endif /* defined(VK_AMD_buffer_marker) */
-#if defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	vkCmdWriteBufferMarker2AMD = (PFN_vkCmdWriteBufferMarker2AMD)load(context, "vkCmdWriteBufferMarker2AMD");
-#endif /* defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_AMD_display_native_hdr)
 	vkSetLocalDimmingAMD = (PFN_vkSetLocalDimmingAMD)load(context, "vkSetLocalDimmingAMD");
 #endif /* defined(VK_AMD_display_native_hdr) */
@@ -711,31 +642,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkGetAndroidHardwareBufferPropertiesANDROID = (PFN_vkGetAndroidHardwareBufferPropertiesANDROID)load(context, "vkGetAndroidHardwareBufferPropertiesANDROID");
 	vkGetMemoryAndroidHardwareBufferANDROID = (PFN_vkGetMemoryAndroidHardwareBufferANDROID)load(context, "vkGetMemoryAndroidHardwareBufferANDROID");
 #endif /* defined(VK_ANDROID_external_memory_android_hardware_buffer) */
-#if defined(VK_ARM_data_graph)
-	vkBindDataGraphPipelineSessionMemoryARM = (PFN_vkBindDataGraphPipelineSessionMemoryARM)load(context, "vkBindDataGraphPipelineSessionMemoryARM");
-	vkCmdDispatchDataGraphARM = (PFN_vkCmdDispatchDataGraphARM)load(context, "vkCmdDispatchDataGraphARM");
-	vkCreateDataGraphPipelineSessionARM = (PFN_vkCreateDataGraphPipelineSessionARM)load(context, "vkCreateDataGraphPipelineSessionARM");
-	vkCreateDataGraphPipelinesARM = (PFN_vkCreateDataGraphPipelinesARM)load(context, "vkCreateDataGraphPipelinesARM");
-	vkDestroyDataGraphPipelineSessionARM = (PFN_vkDestroyDataGraphPipelineSessionARM)load(context, "vkDestroyDataGraphPipelineSessionARM");
-	vkGetDataGraphPipelineAvailablePropertiesARM = (PFN_vkGetDataGraphPipelineAvailablePropertiesARM)load(context, "vkGetDataGraphPipelineAvailablePropertiesARM");
-	vkGetDataGraphPipelinePropertiesARM = (PFN_vkGetDataGraphPipelinePropertiesARM)load(context, "vkGetDataGraphPipelinePropertiesARM");
-	vkGetDataGraphPipelineSessionBindPointRequirementsARM = (PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM)load(context, "vkGetDataGraphPipelineSessionBindPointRequirementsARM");
-	vkGetDataGraphPipelineSessionMemoryRequirementsARM = (PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM)load(context, "vkGetDataGraphPipelineSessionMemoryRequirementsARM");
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_tensors)
-	vkBindTensorMemoryARM = (PFN_vkBindTensorMemoryARM)load(context, "vkBindTensorMemoryARM");
-	vkCmdCopyTensorARM = (PFN_vkCmdCopyTensorARM)load(context, "vkCmdCopyTensorARM");
-	vkCreateTensorARM = (PFN_vkCreateTensorARM)load(context, "vkCreateTensorARM");
-	vkCreateTensorViewARM = (PFN_vkCreateTensorViewARM)load(context, "vkCreateTensorViewARM");
-	vkDestroyTensorARM = (PFN_vkDestroyTensorARM)load(context, "vkDestroyTensorARM");
-	vkDestroyTensorViewARM = (PFN_vkDestroyTensorViewARM)load(context, "vkDestroyTensorViewARM");
-	vkGetDeviceTensorMemoryRequirementsARM = (PFN_vkGetDeviceTensorMemoryRequirementsARM)load(context, "vkGetDeviceTensorMemoryRequirementsARM");
-	vkGetTensorMemoryRequirementsARM = (PFN_vkGetTensorMemoryRequirementsARM)load(context, "vkGetTensorMemoryRequirementsARM");
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer)
-	vkGetTensorOpaqueCaptureDescriptorDataARM = (PFN_vkGetTensorOpaqueCaptureDescriptorDataARM)load(context, "vkGetTensorOpaqueCaptureDescriptorDataARM");
-	vkGetTensorViewOpaqueCaptureDescriptorDataARM = (PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM)load(context, "vkGetTensorViewOpaqueCaptureDescriptorDataARM");
-#endif /* defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_EXT_attachment_feedback_loop_dynamic_state)
 	vkCmdSetAttachmentFeedbackLoopEnableEXT = (PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT)load(context, "vkCmdSetAttachmentFeedbackLoopEnableEXT");
 #endif /* defined(VK_EXT_attachment_feedback_loop_dynamic_state) */
@@ -752,9 +658,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdBeginConditionalRenderingEXT = (PFN_vkCmdBeginConditionalRenderingEXT)load(context, "vkCmdBeginConditionalRenderingEXT");
 	vkCmdEndConditionalRenderingEXT = (PFN_vkCmdEndConditionalRenderingEXT)load(context, "vkCmdEndConditionalRenderingEXT");
 #endif /* defined(VK_EXT_conditional_rendering) */
-#if defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3))
-	vkCmdBeginCustomResolveEXT = (PFN_vkCmdBeginCustomResolveEXT)load(context, "vkCmdBeginCustomResolveEXT");
-#endif /* defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3)) */
 #if defined(VK_EXT_debug_marker)
 	vkCmdDebugMarkerBeginEXT = (PFN_vkCmdDebugMarkerBeginEXT)load(context, "vkCmdDebugMarkerBeginEXT");
 	vkCmdDebugMarkerEndEXT = (PFN_vkCmdDebugMarkerEndEXT)load(context, "vkCmdDebugMarkerEndEXT");
@@ -783,17 +686,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_EXT_device_fault)
 	vkGetDeviceFaultInfoEXT = (PFN_vkGetDeviceFaultInfoEXT)load(context, "vkGetDeviceFaultInfoEXT");
 #endif /* defined(VK_EXT_device_fault) */
-#if defined(VK_EXT_device_generated_commands)
-	vkCmdExecuteGeneratedCommandsEXT = (PFN_vkCmdExecuteGeneratedCommandsEXT)load(context, "vkCmdExecuteGeneratedCommandsEXT");
-	vkCmdPreprocessGeneratedCommandsEXT = (PFN_vkCmdPreprocessGeneratedCommandsEXT)load(context, "vkCmdPreprocessGeneratedCommandsEXT");
-	vkCreateIndirectCommandsLayoutEXT = (PFN_vkCreateIndirectCommandsLayoutEXT)load(context, "vkCreateIndirectCommandsLayoutEXT");
-	vkCreateIndirectExecutionSetEXT = (PFN_vkCreateIndirectExecutionSetEXT)load(context, "vkCreateIndirectExecutionSetEXT");
-	vkDestroyIndirectCommandsLayoutEXT = (PFN_vkDestroyIndirectCommandsLayoutEXT)load(context, "vkDestroyIndirectCommandsLayoutEXT");
-	vkDestroyIndirectExecutionSetEXT = (PFN_vkDestroyIndirectExecutionSetEXT)load(context, "vkDestroyIndirectExecutionSetEXT");
-	vkGetGeneratedCommandsMemoryRequirementsEXT = (PFN_vkGetGeneratedCommandsMemoryRequirementsEXT)load(context, "vkGetGeneratedCommandsMemoryRequirementsEXT");
-	vkUpdateIndirectExecutionSetPipelineEXT = (PFN_vkUpdateIndirectExecutionSetPipelineEXT)load(context, "vkUpdateIndirectExecutionSetPipelineEXT");
-	vkUpdateIndirectExecutionSetShaderEXT = (PFN_vkUpdateIndirectExecutionSetShaderEXT)load(context, "vkUpdateIndirectExecutionSetShaderEXT");
-#endif /* defined(VK_EXT_device_generated_commands) */
 #if defined(VK_EXT_discard_rectangles)
 	vkCmdSetDiscardRectangleEXT = (PFN_vkCmdSetDiscardRectangleEXT)load(context, "vkCmdSetDiscardRectangleEXT");
 #endif /* defined(VK_EXT_discard_rectangles) */
@@ -810,20 +702,10 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_EXT_external_memory_host)
 	vkGetMemoryHostPointerPropertiesEXT = (PFN_vkGetMemoryHostPointerPropertiesEXT)load(context, "vkGetMemoryHostPointerPropertiesEXT");
 #endif /* defined(VK_EXT_external_memory_host) */
-#if defined(VK_EXT_external_memory_metal)
-	vkGetMemoryMetalHandleEXT = (PFN_vkGetMemoryMetalHandleEXT)load(context, "vkGetMemoryMetalHandleEXT");
-	vkGetMemoryMetalHandlePropertiesEXT = (PFN_vkGetMemoryMetalHandlePropertiesEXT)load(context, "vkGetMemoryMetalHandlePropertiesEXT");
-#endif /* defined(VK_EXT_external_memory_metal) */
-#if defined(VK_EXT_fragment_density_map_offset)
-	vkCmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)load(context, "vkCmdEndRendering2EXT");
-#endif /* defined(VK_EXT_fragment_density_map_offset) */
 #if defined(VK_EXT_full_screen_exclusive)
 	vkAcquireFullScreenExclusiveModeEXT = (PFN_vkAcquireFullScreenExclusiveModeEXT)load(context, "vkAcquireFullScreenExclusiveModeEXT");
 	vkReleaseFullScreenExclusiveModeEXT = (PFN_vkReleaseFullScreenExclusiveModeEXT)load(context, "vkReleaseFullScreenExclusiveModeEXT");
 #endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1))
-	vkGetDeviceGroupSurfacePresentModes2EXT = (PFN_vkGetDeviceGroupSurfacePresentModes2EXT)load(context, "vkGetDeviceGroupSurfacePresentModes2EXT");
-#endif /* defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1)) */
 #if defined(VK_EXT_hdr_metadata)
 	vkSetHdrMetadataEXT = (PFN_vkSetHdrMetadataEXT)load(context, "vkSetHdrMetadataEXT");
 #endif /* defined(VK_EXT_hdr_metadata) */
@@ -842,17 +724,11 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_EXT_line_rasterization)
 	vkCmdSetLineStippleEXT = (PFN_vkCmdSetLineStippleEXT)load(context, "vkCmdSetLineStippleEXT");
 #endif /* defined(VK_EXT_line_rasterization) */
-#if defined(VK_EXT_memory_decompression)
-	vkCmdDecompressMemoryEXT = (PFN_vkCmdDecompressMemoryEXT)load(context, "vkCmdDecompressMemoryEXT");
-	vkCmdDecompressMemoryIndirectCountEXT = (PFN_vkCmdDecompressMemoryIndirectCountEXT)load(context, "vkCmdDecompressMemoryIndirectCountEXT");
-#endif /* defined(VK_EXT_memory_decompression) */
 #if defined(VK_EXT_mesh_shader)
 	vkCmdDrawMeshTasksEXT = (PFN_vkCmdDrawMeshTasksEXT)load(context, "vkCmdDrawMeshTasksEXT");
+	vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
 	vkCmdDrawMeshTasksIndirectEXT = (PFN_vkCmdDrawMeshTasksIndirectEXT)load(context, "vkCmdDrawMeshTasksIndirectEXT");
 #endif /* defined(VK_EXT_mesh_shader) */
-#if defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-	vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
-#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_EXT_metal_objects)
 	vkExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)load(context, "vkExportMetalObjectsEXT");
 #endif /* defined(VK_EXT_metal_objects) */
@@ -882,12 +758,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_EXT_pipeline_properties)
 	vkGetPipelinePropertiesEXT = (PFN_vkGetPipelinePropertiesEXT)load(context, "vkGetPipelinePropertiesEXT");
 #endif /* defined(VK_EXT_pipeline_properties) */
-#if defined(VK_EXT_present_timing)
-	vkGetPastPresentationTimingEXT = (PFN_vkGetPastPresentationTimingEXT)load(context, "vkGetPastPresentationTimingEXT");
-	vkGetSwapchainTimeDomainPropertiesEXT = (PFN_vkGetSwapchainTimeDomainPropertiesEXT)load(context, "vkGetSwapchainTimeDomainPropertiesEXT");
-	vkGetSwapchainTimingPropertiesEXT = (PFN_vkGetSwapchainTimingPropertiesEXT)load(context, "vkGetSwapchainTimingPropertiesEXT");
-	vkSetSwapchainPresentTimingQueueSizeEXT = (PFN_vkSetSwapchainPresentTimingQueueSizeEXT)load(context, "vkSetSwapchainPresentTimingQueueSizeEXT");
-#endif /* defined(VK_EXT_present_timing) */
 #if defined(VK_EXT_private_data)
 	vkCreatePrivateDataSlotEXT = (PFN_vkCreatePrivateDataSlotEXT)load(context, "vkCreatePrivateDataSlotEXT");
 	vkDestroyPrivateDataSlotEXT = (PFN_vkDestroyPrivateDataSlotEXT)load(context, "vkDestroyPrivateDataSlotEXT");
@@ -950,11 +820,9 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_HUAWEI_invocation_mask)
 	vkCmdBindInvocationMaskHUAWEI = (PFN_vkCmdBindInvocationMaskHUAWEI)load(context, "vkCmdBindInvocationMaskHUAWEI");
 #endif /* defined(VK_HUAWEI_invocation_mask) */
-#if defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2
-	vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = (PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)load(context, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI");
-#endif /* defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2 */
 #if defined(VK_HUAWEI_subpass_shading)
 	vkCmdSubpassShadingHUAWEI = (PFN_vkCmdSubpassShadingHUAWEI)load(context, "vkCmdSubpassShadingHUAWEI");
+	vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = (PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)load(context, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI");
 #endif /* defined(VK_HUAWEI_subpass_shading) */
 #if defined(VK_INTEL_performance_query)
 	vkAcquirePerformanceConfigurationINTEL = (PFN_vkAcquirePerformanceConfigurationINTEL)load(context, "vkAcquirePerformanceConfigurationINTEL");
@@ -1005,10 +873,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdCopyImageToBuffer2KHR = (PFN_vkCmdCopyImageToBuffer2KHR)load(context, "vkCmdCopyImageToBuffer2KHR");
 	vkCmdResolveImage2KHR = (PFN_vkCmdResolveImage2KHR)load(context, "vkCmdResolveImage2KHR");
 #endif /* defined(VK_KHR_copy_commands2) */
-#if defined(VK_KHR_copy_memory_indirect)
-	vkCmdCopyMemoryIndirectKHR = (PFN_vkCmdCopyMemoryIndirectKHR)load(context, "vkCmdCopyMemoryIndirectKHR");
-	vkCmdCopyMemoryToImageIndirectKHR = (PFN_vkCmdCopyMemoryToImageIndirectKHR)load(context, "vkCmdCopyMemoryToImageIndirectKHR");
-#endif /* defined(VK_KHR_copy_memory_indirect) */
 #if defined(VK_KHR_create_renderpass2)
 	vkCmdBeginRenderPass2KHR = (PFN_vkCmdBeginRenderPass2KHR)load(context, "vkCmdBeginRenderPass2KHR");
 	vkCmdEndRenderPass2KHR = (PFN_vkCmdEndRenderPass2KHR)load(context, "vkCmdEndRenderPass2KHR");
@@ -1085,9 +949,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_KHR_maintenance1)
 	vkTrimCommandPoolKHR = (PFN_vkTrimCommandPoolKHR)load(context, "vkTrimCommandPoolKHR");
 #endif /* defined(VK_KHR_maintenance1) */
-#if defined(VK_KHR_maintenance10)
-	vkCmdEndRendering2KHR = (PFN_vkCmdEndRendering2KHR)load(context, "vkCmdEndRendering2KHR");
-#endif /* defined(VK_KHR_maintenance10) */
 #if defined(VK_KHR_maintenance3)
 	vkGetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR)load(context, "vkGetDescriptorSetLayoutSupportKHR");
 #endif /* defined(VK_KHR_maintenance3) */
@@ -1122,13 +983,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkAcquireProfilingLockKHR = (PFN_vkAcquireProfilingLockKHR)load(context, "vkAcquireProfilingLockKHR");
 	vkReleaseProfilingLockKHR = (PFN_vkReleaseProfilingLockKHR)load(context, "vkReleaseProfilingLockKHR");
 #endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_pipeline_binary)
-	vkCreatePipelineBinariesKHR = (PFN_vkCreatePipelineBinariesKHR)load(context, "vkCreatePipelineBinariesKHR");
-	vkDestroyPipelineBinaryKHR = (PFN_vkDestroyPipelineBinaryKHR)load(context, "vkDestroyPipelineBinaryKHR");
-	vkGetPipelineBinaryDataKHR = (PFN_vkGetPipelineBinaryDataKHR)load(context, "vkGetPipelineBinaryDataKHR");
-	vkGetPipelineKeyKHR = (PFN_vkGetPipelineKeyKHR)load(context, "vkGetPipelineKeyKHR");
-	vkReleaseCapturedPipelineDataKHR = (PFN_vkReleaseCapturedPipelineDataKHR)load(context, "vkReleaseCapturedPipelineDataKHR");
-#endif /* defined(VK_KHR_pipeline_binary) */
 #if defined(VK_KHR_pipeline_executable_properties)
 	vkGetPipelineExecutableInternalRepresentationsKHR = (PFN_vkGetPipelineExecutableInternalRepresentationsKHR)load(context, "vkGetPipelineExecutableInternalRepresentationsKHR");
 	vkGetPipelineExecutablePropertiesKHR = (PFN_vkGetPipelineExecutablePropertiesKHR)load(context, "vkGetPipelineExecutablePropertiesKHR");
@@ -1137,9 +991,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if defined(VK_KHR_present_wait)
 	vkWaitForPresentKHR = (PFN_vkWaitForPresentKHR)load(context, "vkWaitForPresentKHR");
 #endif /* defined(VK_KHR_present_wait) */
-#if defined(VK_KHR_present_wait2)
-	vkWaitForPresent2KHR = (PFN_vkWaitForPresent2KHR)load(context, "vkWaitForPresent2KHR");
-#endif /* defined(VK_KHR_present_wait2) */
 #if defined(VK_KHR_push_descriptor)
 	vkCmdPushDescriptorSetKHR = (PFN_vkCmdPushDescriptorSetKHR)load(context, "vkCmdPushDescriptorSetKHR");
 #endif /* defined(VK_KHR_push_descriptor) */
@@ -1169,9 +1020,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkGetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR)load(context, "vkGetSwapchainImagesKHR");
 	vkQueuePresentKHR = (PFN_vkQueuePresentKHR)load(context, "vkQueuePresentKHR");
 #endif /* defined(VK_KHR_swapchain) */
-#if defined(VK_KHR_swapchain_maintenance1)
-	vkReleaseSwapchainImagesKHR = (PFN_vkReleaseSwapchainImagesKHR)load(context, "vkReleaseSwapchainImagesKHR");
-#endif /* defined(VK_KHR_swapchain_maintenance1) */
 #if defined(VK_KHR_synchronization2)
 	vkCmdPipelineBarrier2KHR = (PFN_vkCmdPipelineBarrier2KHR)load(context, "vkCmdPipelineBarrier2KHR");
 	vkCmdResetEvent2KHR = (PFN_vkCmdResetEvent2KHR)load(context, "vkCmdResetEvent2KHR");
@@ -1180,6 +1028,12 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdWriteTimestamp2KHR = (PFN_vkCmdWriteTimestamp2KHR)load(context, "vkCmdWriteTimestamp2KHR");
 	vkQueueSubmit2KHR = (PFN_vkQueueSubmit2KHR)load(context, "vkQueueSubmit2KHR");
 #endif /* defined(VK_KHR_synchronization2) */
+#if defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker)
+	vkCmdWriteBufferMarker2AMD = (PFN_vkCmdWriteBufferMarker2AMD)load(context, "vkCmdWriteBufferMarker2AMD");
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker) */
+#if defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints)
+	vkGetQueueCheckpointData2NV = (PFN_vkGetQueueCheckpointData2NV)load(context, "vkGetQueueCheckpointData2NV");
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints) */
 #if defined(VK_KHR_timeline_semaphore)
 	vkGetSemaphoreCounterValueKHR = (PFN_vkGetSemaphoreCounterValueKHR)load(context, "vkGetSemaphoreCounterValueKHR");
 	vkSignalSemaphoreKHR = (PFN_vkSignalSemaphoreKHR)load(context, "vkSignalSemaphoreKHR");
@@ -1212,25 +1066,12 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkDestroyCuModuleNVX = (PFN_vkDestroyCuModuleNVX)load(context, "vkDestroyCuModuleNVX");
 #endif /* defined(VK_NVX_binary_import) */
 #if defined(VK_NVX_image_view_handle)
+	vkGetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)load(context, "vkGetImageViewAddressNVX");
 	vkGetImageViewHandleNVX = (PFN_vkGetImageViewHandleNVX)load(context, "vkGetImageViewHandleNVX");
 #endif /* defined(VK_NVX_image_view_handle) */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3
-	vkGetImageViewHandle64NVX = (PFN_vkGetImageViewHandle64NVX)load(context, "vkGetImageViewHandle64NVX");
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3 */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2
-	vkGetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)load(context, "vkGetImageViewAddressNVX");
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2 */
 #if defined(VK_NV_clip_space_w_scaling)
 	vkCmdSetViewportWScalingNV = (PFN_vkCmdSetViewportWScalingNV)load(context, "vkCmdSetViewportWScalingNV");
 #endif /* defined(VK_NV_clip_space_w_scaling) */
-#if defined(VK_NV_cluster_acceleration_structure)
-	vkCmdBuildClusterAccelerationStructureIndirectNV = (PFN_vkCmdBuildClusterAccelerationStructureIndirectNV)load(context, "vkCmdBuildClusterAccelerationStructureIndirectNV");
-	vkGetClusterAccelerationStructureBuildSizesNV = (PFN_vkGetClusterAccelerationStructureBuildSizesNV)load(context, "vkGetClusterAccelerationStructureBuildSizesNV");
-#endif /* defined(VK_NV_cluster_acceleration_structure) */
-#if defined(VK_NV_cooperative_vector)
-	vkCmdConvertCooperativeVectorMatrixNV = (PFN_vkCmdConvertCooperativeVectorMatrixNV)load(context, "vkCmdConvertCooperativeVectorMatrixNV");
-	vkConvertCooperativeVectorMatrixNV = (PFN_vkConvertCooperativeVectorMatrixNV)load(context, "vkConvertCooperativeVectorMatrixNV");
-#endif /* defined(VK_NV_cooperative_vector) */
 #if defined(VK_NV_copy_memory_indirect)
 	vkCmdCopyMemoryIndirectNV = (PFN_vkCmdCopyMemoryIndirectNV)load(context, "vkCmdCopyMemoryIndirectNV");
 	vkCmdCopyMemoryToImageIndirectNV = (PFN_vkCmdCopyMemoryToImageIndirectNV)load(context, "vkCmdCopyMemoryToImageIndirectNV");
@@ -1247,9 +1088,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdSetCheckpointNV = (PFN_vkCmdSetCheckpointNV)load(context, "vkCmdSetCheckpointNV");
 	vkGetQueueCheckpointDataNV = (PFN_vkGetQueueCheckpointDataNV)load(context, "vkGetQueueCheckpointDataNV");
 #endif /* defined(VK_NV_device_diagnostic_checkpoints) */
-#if defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	vkGetQueueCheckpointData2NV = (PFN_vkGetQueueCheckpointData2NV)load(context, "vkGetQueueCheckpointData2NV");
-#endif /* defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_NV_device_generated_commands)
 	vkCmdBindPipelineShaderGroupNV = (PFN_vkCmdBindPipelineShaderGroupNV)load(context, "vkCmdBindPipelineShaderGroupNV");
 	vkCmdExecuteGeneratedCommandsNV = (PFN_vkCmdExecuteGeneratedCommandsNV)load(context, "vkCmdExecuteGeneratedCommandsNV");
@@ -1263,11 +1101,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkGetPipelineIndirectDeviceAddressNV = (PFN_vkGetPipelineIndirectDeviceAddressNV)load(context, "vkGetPipelineIndirectDeviceAddressNV");
 	vkGetPipelineIndirectMemoryRequirementsNV = (PFN_vkGetPipelineIndirectMemoryRequirementsNV)load(context, "vkGetPipelineIndirectMemoryRequirementsNV");
 #endif /* defined(VK_NV_device_generated_commands_compute) */
-#if defined(VK_NV_external_compute_queue)
-	vkCreateExternalComputeQueueNV = (PFN_vkCreateExternalComputeQueueNV)load(context, "vkCreateExternalComputeQueueNV");
-	vkDestroyExternalComputeQueueNV = (PFN_vkDestroyExternalComputeQueueNV)load(context, "vkDestroyExternalComputeQueueNV");
-	vkGetExternalComputeQueueDataNV = (PFN_vkGetExternalComputeQueueDataNV)load(context, "vkGetExternalComputeQueueDataNV");
-#endif /* defined(VK_NV_external_compute_queue) */
 #if defined(VK_NV_external_memory_rdma)
 	vkGetMemoryRemoteAddressNV = (PFN_vkGetMemoryRemoteAddressNV)load(context, "vkGetMemoryRemoteAddressNV");
 #endif /* defined(VK_NV_external_memory_rdma) */
@@ -1289,22 +1122,16 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdDecompressMemoryNV = (PFN_vkCmdDecompressMemoryNV)load(context, "vkCmdDecompressMemoryNV");
 #endif /* defined(VK_NV_memory_decompression) */
 #if defined(VK_NV_mesh_shader)
+	vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
 	vkCmdDrawMeshTasksIndirectNV = (PFN_vkCmdDrawMeshTasksIndirectNV)load(context, "vkCmdDrawMeshTasksIndirectNV");
 	vkCmdDrawMeshTasksNV = (PFN_vkCmdDrawMeshTasksNV)load(context, "vkCmdDrawMeshTasksNV");
 #endif /* defined(VK_NV_mesh_shader) */
-#if defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-	vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
-#endif /* defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_NV_optical_flow)
 	vkBindOpticalFlowSessionImageNV = (PFN_vkBindOpticalFlowSessionImageNV)load(context, "vkBindOpticalFlowSessionImageNV");
 	vkCmdOpticalFlowExecuteNV = (PFN_vkCmdOpticalFlowExecuteNV)load(context, "vkCmdOpticalFlowExecuteNV");
 	vkCreateOpticalFlowSessionNV = (PFN_vkCreateOpticalFlowSessionNV)load(context, "vkCreateOpticalFlowSessionNV");
 	vkDestroyOpticalFlowSessionNV = (PFN_vkDestroyOpticalFlowSessionNV)load(context, "vkDestroyOpticalFlowSessionNV");
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_NV_partitioned_acceleration_structure)
-	vkCmdBuildPartitionedAccelerationStructuresNV = (PFN_vkCmdBuildPartitionedAccelerationStructuresNV)load(context, "vkCmdBuildPartitionedAccelerationStructuresNV");
-	vkGetPartitionedAccelerationStructuresBuildSizesNV = (PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV)load(context, "vkGetPartitionedAccelerationStructuresBuildSizesNV");
-#endif /* defined(VK_NV_partitioned_acceleration_structure) */
 #if defined(VK_NV_ray_tracing)
 	vkBindAccelerationStructureMemoryNV = (PFN_vkBindAccelerationStructureMemoryNV)load(context, "vkBindAccelerationStructureMemoryNV");
 	vkCmdBuildAccelerationStructureNV = (PFN_vkCmdBuildAccelerationStructureNV)load(context, "vkCmdBuildAccelerationStructureNV");
@@ -1330,27 +1157,10 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkCmdSetCoarseSampleOrderNV = (PFN_vkCmdSetCoarseSampleOrderNV)load(context, "vkCmdSetCoarseSampleOrderNV");
 	vkCmdSetViewportShadingRatePaletteNV = (PFN_vkCmdSetViewportShadingRatePaletteNV)load(context, "vkCmdSetViewportShadingRatePaletteNV");
 #endif /* defined(VK_NV_shading_rate_image) */
-#if defined(VK_OHOS_external_memory)
-	vkGetMemoryNativeBufferOHOS = (PFN_vkGetMemoryNativeBufferOHOS)load(context, "vkGetMemoryNativeBufferOHOS");
-	vkGetNativeBufferPropertiesOHOS = (PFN_vkGetNativeBufferPropertiesOHOS)load(context, "vkGetNativeBufferPropertiesOHOS");
-#endif /* defined(VK_OHOS_external_memory) */
-#if defined(VK_OHOS_native_buffer)
-	vkAcquireImageOHOS = (PFN_vkAcquireImageOHOS)load(context, "vkAcquireImageOHOS");
-	vkGetSwapchainGrallocUsageOHOS = (PFN_vkGetSwapchainGrallocUsageOHOS)load(context, "vkGetSwapchainGrallocUsageOHOS");
-	vkQueueSignalReleaseImageOHOS = (PFN_vkQueueSignalReleaseImageOHOS)load(context, "vkQueueSignalReleaseImageOHOS");
-#endif /* defined(VK_OHOS_native_buffer) */
-#if defined(VK_QCOM_tile_memory_heap)
-	vkCmdBindTileMemoryQCOM = (PFN_vkCmdBindTileMemoryQCOM)load(context, "vkCmdBindTileMemoryQCOM");
-#endif /* defined(VK_QCOM_tile_memory_heap) */
 #if defined(VK_QCOM_tile_properties)
 	vkGetDynamicRenderingTilePropertiesQCOM = (PFN_vkGetDynamicRenderingTilePropertiesQCOM)load(context, "vkGetDynamicRenderingTilePropertiesQCOM");
 	vkGetFramebufferTilePropertiesQCOM = (PFN_vkGetFramebufferTilePropertiesQCOM)load(context, "vkGetFramebufferTilePropertiesQCOM");
 #endif /* defined(VK_QCOM_tile_properties) */
-#if defined(VK_QCOM_tile_shading)
-	vkCmdBeginPerTileExecutionQCOM = (PFN_vkCmdBeginPerTileExecutionQCOM)load(context, "vkCmdBeginPerTileExecutionQCOM");
-	vkCmdDispatchTileQCOM = (PFN_vkCmdDispatchTileQCOM)load(context, "vkCmdDispatchTileQCOM");
-	vkCmdEndPerTileExecutionQCOM = (PFN_vkCmdEndPerTileExecutionQCOM)load(context, "vkCmdEndPerTileExecutionQCOM");
-#endif /* defined(VK_QCOM_tile_shading) */
 #if defined(VK_QNX_external_memory_screen_buffer)
 	vkGetScreenBufferPropertiesQNX = (PFN_vkGetScreenBufferPropertiesQNX)load(context, "vkGetScreenBufferPropertiesQNX");
 #endif /* defined(VK_QNX_external_memory_screen_buffer) */
@@ -1358,9 +1168,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	vkGetDescriptorSetHostMappingVALVE = (PFN_vkGetDescriptorSetHostMappingVALVE)load(context, "vkGetDescriptorSetHostMappingVALVE");
 	vkGetDescriptorSetLayoutHostMappingInfoVALVE = (PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE)load(context, "vkGetDescriptorSetLayoutHostMappingInfoVALVE");
 #endif /* defined(VK_VALVE_descriptor_set_host_mapping) */
-#if (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control))
-	vkCmdSetDepthClampRangeEXT = (PFN_vkCmdSetDepthClampRangeEXT)load(context, "vkCmdSetDepthClampRangeEXT");
-#endif /* (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control)) */
 #if (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object))
 	vkCmdBindVertexBuffers2EXT = (PFN_vkCmdBindVertexBuffers2EXT)load(context, "vkCmdBindVertexBuffers2EXT");
 	vkCmdSetCullModeEXT = (PFN_vkCmdSetCullModeEXT)load(context, "vkCmdSetCullModeEXT");
@@ -1447,15 +1254,18 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode))
 	vkCmdSetCoverageReductionModeNV = (PFN_vkCmdSetCoverageReductionModeNV)load(context, "vkCmdSetCoverageReductionModeNV");
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode)) */
+#if (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1))
+	vkGetDeviceGroupSurfacePresentModes2EXT = (PFN_vkGetDeviceGroupSurfacePresentModes2EXT)load(context, "vkGetDeviceGroupSurfacePresentModes2EXT");
+#endif /* (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control))
 	vkGetImageSubresourceLayout2EXT = (PFN_vkGetImageSubresourceLayout2EXT)load(context, "vkGetImageSubresourceLayout2EXT");
 #endif /* (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control)) */
 #if (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state))
 	vkCmdSetVertexInputEXT = (PFN_vkCmdSetVertexInputEXT)load(context, "vkCmdSetVertexInputEXT");
 #endif /* (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state)) */
-#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template)))
+#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template))
 	vkCmdPushDescriptorSetWithTemplateKHR = (PFN_vkCmdPushDescriptorSetWithTemplateKHR)load(context, "vkCmdPushDescriptorSetWithTemplateKHR");
-#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template))) */
+#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 	vkGetDeviceGroupPresentCapabilitiesKHR = (PFN_vkGetDeviceGroupPresentCapabilitiesKHR)load(context, "vkGetDeviceGroupPresentCapabilitiesKHR");
 	vkGetDeviceGroupSurfacePresentModesKHR = (PFN_vkGetDeviceGroupSurfacePresentModesKHR)load(context, "vkGetDeviceGroupSurfacePresentModesKHR");
@@ -1466,240 +1276,6 @@ static void volkGenLoadDevice(void* context, PFN_vkVoidFunction (*load)(void*, c
 	/* VOLK_GENERATE_LOAD_DEVICE */
 }
 
-static void volkGenLoadInstanceTable(struct VolkInstanceTable* table, void* context, PFN_vkVoidFunction (*load)(void*, const char*))
-{
-	/* VOLK_GENERATE_LOAD_INSTANCE_TABLE */
-#if defined(VK_VERSION_1_0)
-	table->vkCreateDevice = (PFN_vkCreateDevice)load(context, "vkCreateDevice");
-	table->vkDestroyInstance = (PFN_vkDestroyInstance)load(context, "vkDestroyInstance");
-	table->vkEnumerateDeviceExtensionProperties = (PFN_vkEnumerateDeviceExtensionProperties)load(context, "vkEnumerateDeviceExtensionProperties");
-	table->vkEnumerateDeviceLayerProperties = (PFN_vkEnumerateDeviceLayerProperties)load(context, "vkEnumerateDeviceLayerProperties");
-	table->vkEnumeratePhysicalDevices = (PFN_vkEnumeratePhysicalDevices)load(context, "vkEnumeratePhysicalDevices");
-	table->vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)load(context, "vkGetDeviceProcAddr");
-	table->vkGetPhysicalDeviceFeatures = (PFN_vkGetPhysicalDeviceFeatures)load(context, "vkGetPhysicalDeviceFeatures");
-	table->vkGetPhysicalDeviceFormatProperties = (PFN_vkGetPhysicalDeviceFormatProperties)load(context, "vkGetPhysicalDeviceFormatProperties");
-	table->vkGetPhysicalDeviceImageFormatProperties = (PFN_vkGetPhysicalDeviceImageFormatProperties)load(context, "vkGetPhysicalDeviceImageFormatProperties");
-	table->vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)load(context, "vkGetPhysicalDeviceMemoryProperties");
-	table->vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)load(context, "vkGetPhysicalDeviceProperties");
-	table->vkGetPhysicalDeviceQueueFamilyProperties = (PFN_vkGetPhysicalDeviceQueueFamilyProperties)load(context, "vkGetPhysicalDeviceQueueFamilyProperties");
-	table->vkGetPhysicalDeviceSparseImageFormatProperties = (PFN_vkGetPhysicalDeviceSparseImageFormatProperties)load(context, "vkGetPhysicalDeviceSparseImageFormatProperties");
-#endif /* defined(VK_VERSION_1_0) */
-#if defined(VK_VERSION_1_1)
-	table->vkEnumeratePhysicalDeviceGroups = (PFN_vkEnumeratePhysicalDeviceGroups)load(context, "vkEnumeratePhysicalDeviceGroups");
-	table->vkGetPhysicalDeviceExternalBufferProperties = (PFN_vkGetPhysicalDeviceExternalBufferProperties)load(context, "vkGetPhysicalDeviceExternalBufferProperties");
-	table->vkGetPhysicalDeviceExternalFenceProperties = (PFN_vkGetPhysicalDeviceExternalFenceProperties)load(context, "vkGetPhysicalDeviceExternalFenceProperties");
-	table->vkGetPhysicalDeviceExternalSemaphoreProperties = (PFN_vkGetPhysicalDeviceExternalSemaphoreProperties)load(context, "vkGetPhysicalDeviceExternalSemaphoreProperties");
-	table->vkGetPhysicalDeviceFeatures2 = (PFN_vkGetPhysicalDeviceFeatures2)load(context, "vkGetPhysicalDeviceFeatures2");
-	table->vkGetPhysicalDeviceFormatProperties2 = (PFN_vkGetPhysicalDeviceFormatProperties2)load(context, "vkGetPhysicalDeviceFormatProperties2");
-	table->vkGetPhysicalDeviceImageFormatProperties2 = (PFN_vkGetPhysicalDeviceImageFormatProperties2)load(context, "vkGetPhysicalDeviceImageFormatProperties2");
-	table->vkGetPhysicalDeviceMemoryProperties2 = (PFN_vkGetPhysicalDeviceMemoryProperties2)load(context, "vkGetPhysicalDeviceMemoryProperties2");
-	table->vkGetPhysicalDeviceProperties2 = (PFN_vkGetPhysicalDeviceProperties2)load(context, "vkGetPhysicalDeviceProperties2");
-	table->vkGetPhysicalDeviceQueueFamilyProperties2 = (PFN_vkGetPhysicalDeviceQueueFamilyProperties2)load(context, "vkGetPhysicalDeviceQueueFamilyProperties2");
-	table->vkGetPhysicalDeviceSparseImageFormatProperties2 = (PFN_vkGetPhysicalDeviceSparseImageFormatProperties2)load(context, "vkGetPhysicalDeviceSparseImageFormatProperties2");
-#endif /* defined(VK_VERSION_1_1) */
-#if defined(VK_VERSION_1_3)
-	table->vkGetPhysicalDeviceToolProperties = (PFN_vkGetPhysicalDeviceToolProperties)load(context, "vkGetPhysicalDeviceToolProperties");
-#endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_ARM_data_graph)
-	table->vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM)load(context, "vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM");
-	table->vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM)load(context, "vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM");
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_performance_counters_by_region)
-	table->vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = (PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM)load(context, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM");
-#endif /* defined(VK_ARM_performance_counters_by_region) */
-#if defined(VK_ARM_tensors)
-	table->vkGetPhysicalDeviceExternalTensorPropertiesARM = (PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM)load(context, "vkGetPhysicalDeviceExternalTensorPropertiesARM");
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_EXT_acquire_drm_display)
-	table->vkAcquireDrmDisplayEXT = (PFN_vkAcquireDrmDisplayEXT)load(context, "vkAcquireDrmDisplayEXT");
-	table->vkGetDrmDisplayEXT = (PFN_vkGetDrmDisplayEXT)load(context, "vkGetDrmDisplayEXT");
-#endif /* defined(VK_EXT_acquire_drm_display) */
-#if defined(VK_EXT_acquire_xlib_display)
-	table->vkAcquireXlibDisplayEXT = (PFN_vkAcquireXlibDisplayEXT)load(context, "vkAcquireXlibDisplayEXT");
-	table->vkGetRandROutputDisplayEXT = (PFN_vkGetRandROutputDisplayEXT)load(context, "vkGetRandROutputDisplayEXT");
-#endif /* defined(VK_EXT_acquire_xlib_display) */
-#if defined(VK_EXT_calibrated_timestamps)
-	table->vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = (PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)load(context, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT");
-#endif /* defined(VK_EXT_calibrated_timestamps) */
-#if defined(VK_EXT_debug_report)
-	table->vkCreateDebugReportCallbackEXT = (PFN_vkCreateDebugReportCallbackEXT)load(context, "vkCreateDebugReportCallbackEXT");
-	table->vkDebugReportMessageEXT = (PFN_vkDebugReportMessageEXT)load(context, "vkDebugReportMessageEXT");
-	table->vkDestroyDebugReportCallbackEXT = (PFN_vkDestroyDebugReportCallbackEXT)load(context, "vkDestroyDebugReportCallbackEXT");
-#endif /* defined(VK_EXT_debug_report) */
-#if defined(VK_EXT_debug_utils)
-	table->vkCmdBeginDebugUtilsLabelEXT = (PFN_vkCmdBeginDebugUtilsLabelEXT)load(context, "vkCmdBeginDebugUtilsLabelEXT");
-	table->vkCmdEndDebugUtilsLabelEXT = (PFN_vkCmdEndDebugUtilsLabelEXT)load(context, "vkCmdEndDebugUtilsLabelEXT");
-	table->vkCmdInsertDebugUtilsLabelEXT = (PFN_vkCmdInsertDebugUtilsLabelEXT)load(context, "vkCmdInsertDebugUtilsLabelEXT");
-	table->vkCreateDebugUtilsMessengerEXT = (PFN_vkCreateDebugUtilsMessengerEXT)load(context, "vkCreateDebugUtilsMessengerEXT");
-	table->vkDestroyDebugUtilsMessengerEXT = (PFN_vkDestroyDebugUtilsMessengerEXT)load(context, "vkDestroyDebugUtilsMessengerEXT");
-	table->vkQueueBeginDebugUtilsLabelEXT = (PFN_vkQueueBeginDebugUtilsLabelEXT)load(context, "vkQueueBeginDebugUtilsLabelEXT");
-	table->vkQueueEndDebugUtilsLabelEXT = (PFN_vkQueueEndDebugUtilsLabelEXT)load(context, "vkQueueEndDebugUtilsLabelEXT");
-	table->vkQueueInsertDebugUtilsLabelEXT = (PFN_vkQueueInsertDebugUtilsLabelEXT)load(context, "vkQueueInsertDebugUtilsLabelEXT");
-	table->vkSetDebugUtilsObjectNameEXT = (PFN_vkSetDebugUtilsObjectNameEXT)load(context, "vkSetDebugUtilsObjectNameEXT");
-	table->vkSetDebugUtilsObjectTagEXT = (PFN_vkSetDebugUtilsObjectTagEXT)load(context, "vkSetDebugUtilsObjectTagEXT");
-	table->vkSubmitDebugUtilsMessageEXT = (PFN_vkSubmitDebugUtilsMessageEXT)load(context, "vkSubmitDebugUtilsMessageEXT");
-#endif /* defined(VK_EXT_debug_utils) */
-#if defined(VK_EXT_direct_mode_display)
-	table->vkReleaseDisplayEXT = (PFN_vkReleaseDisplayEXT)load(context, "vkReleaseDisplayEXT");
-#endif /* defined(VK_EXT_direct_mode_display) */
-#if defined(VK_EXT_directfb_surface)
-	table->vkCreateDirectFBSurfaceEXT = (PFN_vkCreateDirectFBSurfaceEXT)load(context, "vkCreateDirectFBSurfaceEXT");
-	table->vkGetPhysicalDeviceDirectFBPresentationSupportEXT = (PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT)load(context, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT");
-#endif /* defined(VK_EXT_directfb_surface) */
-#if defined(VK_EXT_display_surface_counter)
-	table->vkGetPhysicalDeviceSurfaceCapabilities2EXT = (PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT)load(context, "vkGetPhysicalDeviceSurfaceCapabilities2EXT");
-#endif /* defined(VK_EXT_display_surface_counter) */
-#if defined(VK_EXT_full_screen_exclusive)
-	table->vkGetPhysicalDeviceSurfacePresentModes2EXT = (PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT)load(context, "vkGetPhysicalDeviceSurfacePresentModes2EXT");
-#endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_headless_surface)
-	table->vkCreateHeadlessSurfaceEXT = (PFN_vkCreateHeadlessSurfaceEXT)load(context, "vkCreateHeadlessSurfaceEXT");
-#endif /* defined(VK_EXT_headless_surface) */
-#if defined(VK_EXT_metal_surface)
-	table->vkCreateMetalSurfaceEXT = (PFN_vkCreateMetalSurfaceEXT)load(context, "vkCreateMetalSurfaceEXT");
-#endif /* defined(VK_EXT_metal_surface) */
-#if defined(VK_EXT_sample_locations)
-	table->vkGetPhysicalDeviceMultisamplePropertiesEXT = (PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT)load(context, "vkGetPhysicalDeviceMultisamplePropertiesEXT");
-#endif /* defined(VK_EXT_sample_locations) */
-#if defined(VK_EXT_tooling_info)
-	table->vkGetPhysicalDeviceToolPropertiesEXT = (PFN_vkGetPhysicalDeviceToolPropertiesEXT)load(context, "vkGetPhysicalDeviceToolPropertiesEXT");
-#endif /* defined(VK_EXT_tooling_info) */
-#if defined(VK_FUCHSIA_imagepipe_surface)
-	table->vkCreateImagePipeSurfaceFUCHSIA = (PFN_vkCreateImagePipeSurfaceFUCHSIA)load(context, "vkCreateImagePipeSurfaceFUCHSIA");
-#endif /* defined(VK_FUCHSIA_imagepipe_surface) */
-#if defined(VK_GGP_stream_descriptor_surface)
-	table->vkCreateStreamDescriptorSurfaceGGP = (PFN_vkCreateStreamDescriptorSurfaceGGP)load(context, "vkCreateStreamDescriptorSurfaceGGP");
-#endif /* defined(VK_GGP_stream_descriptor_surface) */
-#if defined(VK_KHR_android_surface)
-	table->vkCreateAndroidSurfaceKHR = (PFN_vkCreateAndroidSurfaceKHR)load(context, "vkCreateAndroidSurfaceKHR");
-#endif /* defined(VK_KHR_android_surface) */
-#if defined(VK_KHR_calibrated_timestamps)
-	table->vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = (PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR)load(context, "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR");
-#endif /* defined(VK_KHR_calibrated_timestamps) */
-#if defined(VK_KHR_cooperative_matrix)
-	table->vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = (PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR)load(context, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR");
-#endif /* defined(VK_KHR_cooperative_matrix) */
-#if defined(VK_KHR_device_group_creation)
-	table->vkEnumeratePhysicalDeviceGroupsKHR = (PFN_vkEnumeratePhysicalDeviceGroupsKHR)load(context, "vkEnumeratePhysicalDeviceGroupsKHR");
-#endif /* defined(VK_KHR_device_group_creation) */
-#if defined(VK_KHR_display)
-	table->vkCreateDisplayModeKHR = (PFN_vkCreateDisplayModeKHR)load(context, "vkCreateDisplayModeKHR");
-	table->vkCreateDisplayPlaneSurfaceKHR = (PFN_vkCreateDisplayPlaneSurfaceKHR)load(context, "vkCreateDisplayPlaneSurfaceKHR");
-	table->vkGetDisplayModePropertiesKHR = (PFN_vkGetDisplayModePropertiesKHR)load(context, "vkGetDisplayModePropertiesKHR");
-	table->vkGetDisplayPlaneCapabilitiesKHR = (PFN_vkGetDisplayPlaneCapabilitiesKHR)load(context, "vkGetDisplayPlaneCapabilitiesKHR");
-	table->vkGetDisplayPlaneSupportedDisplaysKHR = (PFN_vkGetDisplayPlaneSupportedDisplaysKHR)load(context, "vkGetDisplayPlaneSupportedDisplaysKHR");
-	table->vkGetPhysicalDeviceDisplayPlanePropertiesKHR = (PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)load(context, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR");
-	table->vkGetPhysicalDeviceDisplayPropertiesKHR = (PFN_vkGetPhysicalDeviceDisplayPropertiesKHR)load(context, "vkGetPhysicalDeviceDisplayPropertiesKHR");
-#endif /* defined(VK_KHR_display) */
-#if defined(VK_KHR_external_fence_capabilities)
-	table->vkGetPhysicalDeviceExternalFencePropertiesKHR = (PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR)load(context, "vkGetPhysicalDeviceExternalFencePropertiesKHR");
-#endif /* defined(VK_KHR_external_fence_capabilities) */
-#if defined(VK_KHR_external_memory_capabilities)
-	table->vkGetPhysicalDeviceExternalBufferPropertiesKHR = (PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR)load(context, "vkGetPhysicalDeviceExternalBufferPropertiesKHR");
-#endif /* defined(VK_KHR_external_memory_capabilities) */
-#if defined(VK_KHR_external_semaphore_capabilities)
-	table->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = (PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR)load(context, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR");
-#endif /* defined(VK_KHR_external_semaphore_capabilities) */
-#if defined(VK_KHR_fragment_shading_rate)
-	table->vkGetPhysicalDeviceFragmentShadingRatesKHR = (PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR)load(context, "vkGetPhysicalDeviceFragmentShadingRatesKHR");
-#endif /* defined(VK_KHR_fragment_shading_rate) */
-#if defined(VK_KHR_get_display_properties2)
-	table->vkGetDisplayModeProperties2KHR = (PFN_vkGetDisplayModeProperties2KHR)load(context, "vkGetDisplayModeProperties2KHR");
-	table->vkGetDisplayPlaneCapabilities2KHR = (PFN_vkGetDisplayPlaneCapabilities2KHR)load(context, "vkGetDisplayPlaneCapabilities2KHR");
-	table->vkGetPhysicalDeviceDisplayPlaneProperties2KHR = (PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR)load(context, "vkGetPhysicalDeviceDisplayPlaneProperties2KHR");
-	table->vkGetPhysicalDeviceDisplayProperties2KHR = (PFN_vkGetPhysicalDeviceDisplayProperties2KHR)load(context, "vkGetPhysicalDeviceDisplayProperties2KHR");
-#endif /* defined(VK_KHR_get_display_properties2) */
-#if defined(VK_KHR_get_physical_device_properties2)
-	table->vkGetPhysicalDeviceFeatures2KHR = (PFN_vkGetPhysicalDeviceFeatures2KHR)load(context, "vkGetPhysicalDeviceFeatures2KHR");
-	table->vkGetPhysicalDeviceFormatProperties2KHR = (PFN_vkGetPhysicalDeviceFormatProperties2KHR)load(context, "vkGetPhysicalDeviceFormatProperties2KHR");
-	table->vkGetPhysicalDeviceImageFormatProperties2KHR = (PFN_vkGetPhysicalDeviceImageFormatProperties2KHR)load(context, "vkGetPhysicalDeviceImageFormatProperties2KHR");
-	table->vkGetPhysicalDeviceMemoryProperties2KHR = (PFN_vkGetPhysicalDeviceMemoryProperties2KHR)load(context, "vkGetPhysicalDeviceMemoryProperties2KHR");
-	table->vkGetPhysicalDeviceProperties2KHR = (PFN_vkGetPhysicalDeviceProperties2KHR)load(context, "vkGetPhysicalDeviceProperties2KHR");
-	table->vkGetPhysicalDeviceQueueFamilyProperties2KHR = (PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR)load(context, "vkGetPhysicalDeviceQueueFamilyProperties2KHR");
-	table->vkGetPhysicalDeviceSparseImageFormatProperties2KHR = (PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)load(context, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR");
-#endif /* defined(VK_KHR_get_physical_device_properties2) */
-#if defined(VK_KHR_get_surface_capabilities2)
-	table->vkGetPhysicalDeviceSurfaceCapabilities2KHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR)load(context, "vkGetPhysicalDeviceSurfaceCapabilities2KHR");
-	table->vkGetPhysicalDeviceSurfaceFormats2KHR = (PFN_vkGetPhysicalDeviceSurfaceFormats2KHR)load(context, "vkGetPhysicalDeviceSurfaceFormats2KHR");
-#endif /* defined(VK_KHR_get_surface_capabilities2) */
-#if defined(VK_KHR_performance_query)
-	table->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = (PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR)load(context, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR");
-	table->vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = (PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR)load(context, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR");
-#endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_surface)
-	table->vkDestroySurfaceKHR = (PFN_vkDestroySurfaceKHR)load(context, "vkDestroySurfaceKHR");
-	table->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)load(context, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
-	table->vkGetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)load(context, "vkGetPhysicalDeviceSurfaceFormatsKHR");
-	table->vkGetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)load(context, "vkGetPhysicalDeviceSurfacePresentModesKHR");
-	table->vkGetPhysicalDeviceSurfaceSupportKHR = (PFN_vkGetPhysicalDeviceSurfaceSupportKHR)load(context, "vkGetPhysicalDeviceSurfaceSupportKHR");
-#endif /* defined(VK_KHR_surface) */
-#if defined(VK_KHR_video_encode_queue)
-	table->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = (PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR)load(context, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR");
-#endif /* defined(VK_KHR_video_encode_queue) */
-#if defined(VK_KHR_video_queue)
-	table->vkGetPhysicalDeviceVideoCapabilitiesKHR = (PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR)load(context, "vkGetPhysicalDeviceVideoCapabilitiesKHR");
-	table->vkGetPhysicalDeviceVideoFormatPropertiesKHR = (PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR)load(context, "vkGetPhysicalDeviceVideoFormatPropertiesKHR");
-#endif /* defined(VK_KHR_video_queue) */
-#if defined(VK_KHR_wayland_surface)
-	table->vkCreateWaylandSurfaceKHR = (PFN_vkCreateWaylandSurfaceKHR)load(context, "vkCreateWaylandSurfaceKHR");
-	table->vkGetPhysicalDeviceWaylandPresentationSupportKHR = (PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)load(context, "vkGetPhysicalDeviceWaylandPresentationSupportKHR");
-#endif /* defined(VK_KHR_wayland_surface) */
-#if defined(VK_KHR_win32_surface)
-	table->vkCreateWin32SurfaceKHR = (PFN_vkCreateWin32SurfaceKHR)load(context, "vkCreateWin32SurfaceKHR");
-	table->vkGetPhysicalDeviceWin32PresentationSupportKHR = (PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)load(context, "vkGetPhysicalDeviceWin32PresentationSupportKHR");
-#endif /* defined(VK_KHR_win32_surface) */
-#if defined(VK_KHR_xcb_surface)
-	table->vkCreateXcbSurfaceKHR = (PFN_vkCreateXcbSurfaceKHR)load(context, "vkCreateXcbSurfaceKHR");
-	table->vkGetPhysicalDeviceXcbPresentationSupportKHR = (PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)load(context, "vkGetPhysicalDeviceXcbPresentationSupportKHR");
-#endif /* defined(VK_KHR_xcb_surface) */
-#if defined(VK_KHR_xlib_surface)
-	table->vkCreateXlibSurfaceKHR = (PFN_vkCreateXlibSurfaceKHR)load(context, "vkCreateXlibSurfaceKHR");
-	table->vkGetPhysicalDeviceXlibPresentationSupportKHR = (PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR)load(context, "vkGetPhysicalDeviceXlibPresentationSupportKHR");
-#endif /* defined(VK_KHR_xlib_surface) */
-#if defined(VK_MVK_ios_surface)
-	table->vkCreateIOSSurfaceMVK = (PFN_vkCreateIOSSurfaceMVK)load(context, "vkCreateIOSSurfaceMVK");
-#endif /* defined(VK_MVK_ios_surface) */
-#if defined(VK_MVK_macos_surface)
-	table->vkCreateMacOSSurfaceMVK = (PFN_vkCreateMacOSSurfaceMVK)load(context, "vkCreateMacOSSurfaceMVK");
-#endif /* defined(VK_MVK_macos_surface) */
-#if defined(VK_NN_vi_surface)
-	table->vkCreateViSurfaceNN = (PFN_vkCreateViSurfaceNN)load(context, "vkCreateViSurfaceNN");
-#endif /* defined(VK_NN_vi_surface) */
-#if defined(VK_NV_acquire_winrt_display)
-	table->vkAcquireWinrtDisplayNV = (PFN_vkAcquireWinrtDisplayNV)load(context, "vkAcquireWinrtDisplayNV");
-	table->vkGetWinrtDisplayNV = (PFN_vkGetWinrtDisplayNV)load(context, "vkGetWinrtDisplayNV");
-#endif /* defined(VK_NV_acquire_winrt_display) */
-#if defined(VK_NV_cooperative_matrix)
-	table->vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV");
-#endif /* defined(VK_NV_cooperative_matrix) */
-#if defined(VK_NV_cooperative_matrix2)
-	table->vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV");
-#endif /* defined(VK_NV_cooperative_matrix2) */
-#if defined(VK_NV_cooperative_vector)
-	table->vkGetPhysicalDeviceCooperativeVectorPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV)load(context, "vkGetPhysicalDeviceCooperativeVectorPropertiesNV");
-#endif /* defined(VK_NV_cooperative_vector) */
-#if defined(VK_NV_coverage_reduction_mode)
-	table->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = (PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV)load(context, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV");
-#endif /* defined(VK_NV_coverage_reduction_mode) */
-#if defined(VK_NV_external_memory_capabilities)
-	table->vkGetPhysicalDeviceExternalImageFormatPropertiesNV = (PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV)load(context, "vkGetPhysicalDeviceExternalImageFormatPropertiesNV");
-#endif /* defined(VK_NV_external_memory_capabilities) */
-#if defined(VK_NV_optical_flow)
-	table->vkGetPhysicalDeviceOpticalFlowImageFormatsNV = (PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)load(context, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV");
-#endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_OHOS_surface)
-	table->vkCreateSurfaceOHOS = (PFN_vkCreateSurfaceOHOS)load(context, "vkCreateSurfaceOHOS");
-#endif /* defined(VK_OHOS_surface) */
-#if defined(VK_QNX_screen_surface)
-	table->vkCreateScreenSurfaceQNX = (PFN_vkCreateScreenSurfaceQNX)load(context, "vkCreateScreenSurfaceQNX");
-	table->vkGetPhysicalDeviceScreenPresentationSupportQNX = (PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX)load(context, "vkGetPhysicalDeviceScreenPresentationSupportQNX");
-#endif /* defined(VK_QNX_screen_surface) */
-#if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
-	table->vkGetPhysicalDevicePresentRectanglesKHR = (PFN_vkGetPhysicalDevicePresentRectanglesKHR)load(context, "vkGetPhysicalDevicePresentRectanglesKHR");
-#endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
-	/* VOLK_GENERATE_LOAD_INSTANCE_TABLE */
-}
-
 static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context, PFN_vkVoidFunction (*load)(void*, const char*))
 {
 	/* VOLK_GENERATE_LOAD_DEVICE_TABLE */
@@ -1896,27 +1472,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkQueueSubmit2 = (PFN_vkQueueSubmit2)load(context, "vkQueueSubmit2");
 	table->vkSetPrivateData = (PFN_vkSetPrivateData)load(context, "vkSetPrivateData");
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_VERSION_1_4)
-	table->vkCmdBindDescriptorSets2 = (PFN_vkCmdBindDescriptorSets2)load(context, "vkCmdBindDescriptorSets2");
-	table->vkCmdBindIndexBuffer2 = (PFN_vkCmdBindIndexBuffer2)load(context, "vkCmdBindIndexBuffer2");
-	table->vkCmdPushConstants2 = (PFN_vkCmdPushConstants2)load(context, "vkCmdPushConstants2");
-	table->vkCmdPushDescriptorSet = (PFN_vkCmdPushDescriptorSet)load(context, "vkCmdPushDescriptorSet");
-	table->vkCmdPushDescriptorSet2 = (PFN_vkCmdPushDescriptorSet2)load(context, "vkCmdPushDescriptorSet2");
-	table->vkCmdPushDescriptorSetWithTemplate = (PFN_vkCmdPushDescriptorSetWithTemplate)load(context, "vkCmdPushDescriptorSetWithTemplate");
-	table->vkCmdPushDescriptorSetWithTemplate2 = (PFN_vkCmdPushDescriptorSetWithTemplate2)load(context, "vkCmdPushDescriptorSetWithTemplate2");
-	table->vkCmdSetLineStipple = (PFN_vkCmdSetLineStipple)load(context, "vkCmdSetLineStipple");
-	table->vkCmdSetRenderingAttachmentLocations = (PFN_vkCmdSetRenderingAttachmentLocations)load(context, "vkCmdSetRenderingAttachmentLocations");
-	table->vkCmdSetRenderingInputAttachmentIndices = (PFN_vkCmdSetRenderingInputAttachmentIndices)load(context, "vkCmdSetRenderingInputAttachmentIndices");
-	table->vkCopyImageToImage = (PFN_vkCopyImageToImage)load(context, "vkCopyImageToImage");
-	table->vkCopyImageToMemory = (PFN_vkCopyImageToMemory)load(context, "vkCopyImageToMemory");
-	table->vkCopyMemoryToImage = (PFN_vkCopyMemoryToImage)load(context, "vkCopyMemoryToImage");
-	table->vkGetDeviceImageSubresourceLayout = (PFN_vkGetDeviceImageSubresourceLayout)load(context, "vkGetDeviceImageSubresourceLayout");
-	table->vkGetImageSubresourceLayout2 = (PFN_vkGetImageSubresourceLayout2)load(context, "vkGetImageSubresourceLayout2");
-	table->vkGetRenderingAreaGranularity = (PFN_vkGetRenderingAreaGranularity)load(context, "vkGetRenderingAreaGranularity");
-	table->vkMapMemory2 = (PFN_vkMapMemory2)load(context, "vkMapMemory2");
-	table->vkTransitionImageLayout = (PFN_vkTransitionImageLayout)load(context, "vkTransitionImageLayout");
-	table->vkUnmapMemory2 = (PFN_vkUnmapMemory2)load(context, "vkUnmapMemory2");
-#endif /* defined(VK_VERSION_1_4) */
 #if defined(VK_AMDX_shader_enqueue)
 	table->vkCmdDispatchGraphAMDX = (PFN_vkCmdDispatchGraphAMDX)load(context, "vkCmdDispatchGraphAMDX");
 	table->vkCmdDispatchGraphIndirectAMDX = (PFN_vkCmdDispatchGraphIndirectAMDX)load(context, "vkCmdDispatchGraphIndirectAMDX");
@@ -1926,15 +1481,9 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkGetExecutionGraphPipelineNodeIndexAMDX = (PFN_vkGetExecutionGraphPipelineNodeIndexAMDX)load(context, "vkGetExecutionGraphPipelineNodeIndexAMDX");
 	table->vkGetExecutionGraphPipelineScratchSizeAMDX = (PFN_vkGetExecutionGraphPipelineScratchSizeAMDX)load(context, "vkGetExecutionGraphPipelineScratchSizeAMDX");
 #endif /* defined(VK_AMDX_shader_enqueue) */
-#if defined(VK_AMD_anti_lag)
-	table->vkAntiLagUpdateAMD = (PFN_vkAntiLagUpdateAMD)load(context, "vkAntiLagUpdateAMD");
-#endif /* defined(VK_AMD_anti_lag) */
 #if defined(VK_AMD_buffer_marker)
 	table->vkCmdWriteBufferMarkerAMD = (PFN_vkCmdWriteBufferMarkerAMD)load(context, "vkCmdWriteBufferMarkerAMD");
 #endif /* defined(VK_AMD_buffer_marker) */
-#if defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	table->vkCmdWriteBufferMarker2AMD = (PFN_vkCmdWriteBufferMarker2AMD)load(context, "vkCmdWriteBufferMarker2AMD");
-#endif /* defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_AMD_display_native_hdr)
 	table->vkSetLocalDimmingAMD = (PFN_vkSetLocalDimmingAMD)load(context, "vkSetLocalDimmingAMD");
 #endif /* defined(VK_AMD_display_native_hdr) */
@@ -1949,31 +1498,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkGetAndroidHardwareBufferPropertiesANDROID = (PFN_vkGetAndroidHardwareBufferPropertiesANDROID)load(context, "vkGetAndroidHardwareBufferPropertiesANDROID");
 	table->vkGetMemoryAndroidHardwareBufferANDROID = (PFN_vkGetMemoryAndroidHardwareBufferANDROID)load(context, "vkGetMemoryAndroidHardwareBufferANDROID");
 #endif /* defined(VK_ANDROID_external_memory_android_hardware_buffer) */
-#if defined(VK_ARM_data_graph)
-	table->vkBindDataGraphPipelineSessionMemoryARM = (PFN_vkBindDataGraphPipelineSessionMemoryARM)load(context, "vkBindDataGraphPipelineSessionMemoryARM");
-	table->vkCmdDispatchDataGraphARM = (PFN_vkCmdDispatchDataGraphARM)load(context, "vkCmdDispatchDataGraphARM");
-	table->vkCreateDataGraphPipelineSessionARM = (PFN_vkCreateDataGraphPipelineSessionARM)load(context, "vkCreateDataGraphPipelineSessionARM");
-	table->vkCreateDataGraphPipelinesARM = (PFN_vkCreateDataGraphPipelinesARM)load(context, "vkCreateDataGraphPipelinesARM");
-	table->vkDestroyDataGraphPipelineSessionARM = (PFN_vkDestroyDataGraphPipelineSessionARM)load(context, "vkDestroyDataGraphPipelineSessionARM");
-	table->vkGetDataGraphPipelineAvailablePropertiesARM = (PFN_vkGetDataGraphPipelineAvailablePropertiesARM)load(context, "vkGetDataGraphPipelineAvailablePropertiesARM");
-	table->vkGetDataGraphPipelinePropertiesARM = (PFN_vkGetDataGraphPipelinePropertiesARM)load(context, "vkGetDataGraphPipelinePropertiesARM");
-	table->vkGetDataGraphPipelineSessionBindPointRequirementsARM = (PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM)load(context, "vkGetDataGraphPipelineSessionBindPointRequirementsARM");
-	table->vkGetDataGraphPipelineSessionMemoryRequirementsARM = (PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM)load(context, "vkGetDataGraphPipelineSessionMemoryRequirementsARM");
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_tensors)
-	table->vkBindTensorMemoryARM = (PFN_vkBindTensorMemoryARM)load(context, "vkBindTensorMemoryARM");
-	table->vkCmdCopyTensorARM = (PFN_vkCmdCopyTensorARM)load(context, "vkCmdCopyTensorARM");
-	table->vkCreateTensorARM = (PFN_vkCreateTensorARM)load(context, "vkCreateTensorARM");
-	table->vkCreateTensorViewARM = (PFN_vkCreateTensorViewARM)load(context, "vkCreateTensorViewARM");
-	table->vkDestroyTensorARM = (PFN_vkDestroyTensorARM)load(context, "vkDestroyTensorARM");
-	table->vkDestroyTensorViewARM = (PFN_vkDestroyTensorViewARM)load(context, "vkDestroyTensorViewARM");
-	table->vkGetDeviceTensorMemoryRequirementsARM = (PFN_vkGetDeviceTensorMemoryRequirementsARM)load(context, "vkGetDeviceTensorMemoryRequirementsARM");
-	table->vkGetTensorMemoryRequirementsARM = (PFN_vkGetTensorMemoryRequirementsARM)load(context, "vkGetTensorMemoryRequirementsARM");
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer)
-	table->vkGetTensorOpaqueCaptureDescriptorDataARM = (PFN_vkGetTensorOpaqueCaptureDescriptorDataARM)load(context, "vkGetTensorOpaqueCaptureDescriptorDataARM");
-	table->vkGetTensorViewOpaqueCaptureDescriptorDataARM = (PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM)load(context, "vkGetTensorViewOpaqueCaptureDescriptorDataARM");
-#endif /* defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_EXT_attachment_feedback_loop_dynamic_state)
 	table->vkCmdSetAttachmentFeedbackLoopEnableEXT = (PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT)load(context, "vkCmdSetAttachmentFeedbackLoopEnableEXT");
 #endif /* defined(VK_EXT_attachment_feedback_loop_dynamic_state) */
@@ -1990,9 +1514,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdBeginConditionalRenderingEXT = (PFN_vkCmdBeginConditionalRenderingEXT)load(context, "vkCmdBeginConditionalRenderingEXT");
 	table->vkCmdEndConditionalRenderingEXT = (PFN_vkCmdEndConditionalRenderingEXT)load(context, "vkCmdEndConditionalRenderingEXT");
 #endif /* defined(VK_EXT_conditional_rendering) */
-#if defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3))
-	table->vkCmdBeginCustomResolveEXT = (PFN_vkCmdBeginCustomResolveEXT)load(context, "vkCmdBeginCustomResolveEXT");
-#endif /* defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3)) */
 #if defined(VK_EXT_debug_marker)
 	table->vkCmdDebugMarkerBeginEXT = (PFN_vkCmdDebugMarkerBeginEXT)load(context, "vkCmdDebugMarkerBeginEXT");
 	table->vkCmdDebugMarkerEndEXT = (PFN_vkCmdDebugMarkerEndEXT)load(context, "vkCmdDebugMarkerEndEXT");
@@ -2021,17 +1542,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_EXT_device_fault)
 	table->vkGetDeviceFaultInfoEXT = (PFN_vkGetDeviceFaultInfoEXT)load(context, "vkGetDeviceFaultInfoEXT");
 #endif /* defined(VK_EXT_device_fault) */
-#if defined(VK_EXT_device_generated_commands)
-	table->vkCmdExecuteGeneratedCommandsEXT = (PFN_vkCmdExecuteGeneratedCommandsEXT)load(context, "vkCmdExecuteGeneratedCommandsEXT");
-	table->vkCmdPreprocessGeneratedCommandsEXT = (PFN_vkCmdPreprocessGeneratedCommandsEXT)load(context, "vkCmdPreprocessGeneratedCommandsEXT");
-	table->vkCreateIndirectCommandsLayoutEXT = (PFN_vkCreateIndirectCommandsLayoutEXT)load(context, "vkCreateIndirectCommandsLayoutEXT");
-	table->vkCreateIndirectExecutionSetEXT = (PFN_vkCreateIndirectExecutionSetEXT)load(context, "vkCreateIndirectExecutionSetEXT");
-	table->vkDestroyIndirectCommandsLayoutEXT = (PFN_vkDestroyIndirectCommandsLayoutEXT)load(context, "vkDestroyIndirectCommandsLayoutEXT");
-	table->vkDestroyIndirectExecutionSetEXT = (PFN_vkDestroyIndirectExecutionSetEXT)load(context, "vkDestroyIndirectExecutionSetEXT");
-	table->vkGetGeneratedCommandsMemoryRequirementsEXT = (PFN_vkGetGeneratedCommandsMemoryRequirementsEXT)load(context, "vkGetGeneratedCommandsMemoryRequirementsEXT");
-	table->vkUpdateIndirectExecutionSetPipelineEXT = (PFN_vkUpdateIndirectExecutionSetPipelineEXT)load(context, "vkUpdateIndirectExecutionSetPipelineEXT");
-	table->vkUpdateIndirectExecutionSetShaderEXT = (PFN_vkUpdateIndirectExecutionSetShaderEXT)load(context, "vkUpdateIndirectExecutionSetShaderEXT");
-#endif /* defined(VK_EXT_device_generated_commands) */
 #if defined(VK_EXT_discard_rectangles)
 	table->vkCmdSetDiscardRectangleEXT = (PFN_vkCmdSetDiscardRectangleEXT)load(context, "vkCmdSetDiscardRectangleEXT");
 #endif /* defined(VK_EXT_discard_rectangles) */
@@ -2048,20 +1558,10 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_EXT_external_memory_host)
 	table->vkGetMemoryHostPointerPropertiesEXT = (PFN_vkGetMemoryHostPointerPropertiesEXT)load(context, "vkGetMemoryHostPointerPropertiesEXT");
 #endif /* defined(VK_EXT_external_memory_host) */
-#if defined(VK_EXT_external_memory_metal)
-	table->vkGetMemoryMetalHandleEXT = (PFN_vkGetMemoryMetalHandleEXT)load(context, "vkGetMemoryMetalHandleEXT");
-	table->vkGetMemoryMetalHandlePropertiesEXT = (PFN_vkGetMemoryMetalHandlePropertiesEXT)load(context, "vkGetMemoryMetalHandlePropertiesEXT");
-#endif /* defined(VK_EXT_external_memory_metal) */
-#if defined(VK_EXT_fragment_density_map_offset)
-	table->vkCmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)load(context, "vkCmdEndRendering2EXT");
-#endif /* defined(VK_EXT_fragment_density_map_offset) */
 #if defined(VK_EXT_full_screen_exclusive)
 	table->vkAcquireFullScreenExclusiveModeEXT = (PFN_vkAcquireFullScreenExclusiveModeEXT)load(context, "vkAcquireFullScreenExclusiveModeEXT");
 	table->vkReleaseFullScreenExclusiveModeEXT = (PFN_vkReleaseFullScreenExclusiveModeEXT)load(context, "vkReleaseFullScreenExclusiveModeEXT");
 #endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1))
-	table->vkGetDeviceGroupSurfacePresentModes2EXT = (PFN_vkGetDeviceGroupSurfacePresentModes2EXT)load(context, "vkGetDeviceGroupSurfacePresentModes2EXT");
-#endif /* defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1)) */
 #if defined(VK_EXT_hdr_metadata)
 	table->vkSetHdrMetadataEXT = (PFN_vkSetHdrMetadataEXT)load(context, "vkSetHdrMetadataEXT");
 #endif /* defined(VK_EXT_hdr_metadata) */
@@ -2080,17 +1580,11 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_EXT_line_rasterization)
 	table->vkCmdSetLineStippleEXT = (PFN_vkCmdSetLineStippleEXT)load(context, "vkCmdSetLineStippleEXT");
 #endif /* defined(VK_EXT_line_rasterization) */
-#if defined(VK_EXT_memory_decompression)
-	table->vkCmdDecompressMemoryEXT = (PFN_vkCmdDecompressMemoryEXT)load(context, "vkCmdDecompressMemoryEXT");
-	table->vkCmdDecompressMemoryIndirectCountEXT = (PFN_vkCmdDecompressMemoryIndirectCountEXT)load(context, "vkCmdDecompressMemoryIndirectCountEXT");
-#endif /* defined(VK_EXT_memory_decompression) */
 #if defined(VK_EXT_mesh_shader)
 	table->vkCmdDrawMeshTasksEXT = (PFN_vkCmdDrawMeshTasksEXT)load(context, "vkCmdDrawMeshTasksEXT");
+	table->vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
 	table->vkCmdDrawMeshTasksIndirectEXT = (PFN_vkCmdDrawMeshTasksIndirectEXT)load(context, "vkCmdDrawMeshTasksIndirectEXT");
 #endif /* defined(VK_EXT_mesh_shader) */
-#if defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-	table->vkCmdDrawMeshTasksIndirectCountEXT = (PFN_vkCmdDrawMeshTasksIndirectCountEXT)load(context, "vkCmdDrawMeshTasksIndirectCountEXT");
-#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_EXT_metal_objects)
 	table->vkExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)load(context, "vkExportMetalObjectsEXT");
 #endif /* defined(VK_EXT_metal_objects) */
@@ -2120,12 +1614,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_EXT_pipeline_properties)
 	table->vkGetPipelinePropertiesEXT = (PFN_vkGetPipelinePropertiesEXT)load(context, "vkGetPipelinePropertiesEXT");
 #endif /* defined(VK_EXT_pipeline_properties) */
-#if defined(VK_EXT_present_timing)
-	table->vkGetPastPresentationTimingEXT = (PFN_vkGetPastPresentationTimingEXT)load(context, "vkGetPastPresentationTimingEXT");
-	table->vkGetSwapchainTimeDomainPropertiesEXT = (PFN_vkGetSwapchainTimeDomainPropertiesEXT)load(context, "vkGetSwapchainTimeDomainPropertiesEXT");
-	table->vkGetSwapchainTimingPropertiesEXT = (PFN_vkGetSwapchainTimingPropertiesEXT)load(context, "vkGetSwapchainTimingPropertiesEXT");
-	table->vkSetSwapchainPresentTimingQueueSizeEXT = (PFN_vkSetSwapchainPresentTimingQueueSizeEXT)load(context, "vkSetSwapchainPresentTimingQueueSizeEXT");
-#endif /* defined(VK_EXT_present_timing) */
 #if defined(VK_EXT_private_data)
 	table->vkCreatePrivateDataSlotEXT = (PFN_vkCreatePrivateDataSlotEXT)load(context, "vkCreatePrivateDataSlotEXT");
 	table->vkDestroyPrivateDataSlotEXT = (PFN_vkDestroyPrivateDataSlotEXT)load(context, "vkDestroyPrivateDataSlotEXT");
@@ -2188,11 +1676,9 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_HUAWEI_invocation_mask)
 	table->vkCmdBindInvocationMaskHUAWEI = (PFN_vkCmdBindInvocationMaskHUAWEI)load(context, "vkCmdBindInvocationMaskHUAWEI");
 #endif /* defined(VK_HUAWEI_invocation_mask) */
-#if defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2
-	table->vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = (PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)load(context, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI");
-#endif /* defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2 */
 #if defined(VK_HUAWEI_subpass_shading)
 	table->vkCmdSubpassShadingHUAWEI = (PFN_vkCmdSubpassShadingHUAWEI)load(context, "vkCmdSubpassShadingHUAWEI");
+	table->vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = (PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)load(context, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI");
 #endif /* defined(VK_HUAWEI_subpass_shading) */
 #if defined(VK_INTEL_performance_query)
 	table->vkAcquirePerformanceConfigurationINTEL = (PFN_vkAcquirePerformanceConfigurationINTEL)load(context, "vkAcquirePerformanceConfigurationINTEL");
@@ -2243,10 +1729,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdCopyImageToBuffer2KHR = (PFN_vkCmdCopyImageToBuffer2KHR)load(context, "vkCmdCopyImageToBuffer2KHR");
 	table->vkCmdResolveImage2KHR = (PFN_vkCmdResolveImage2KHR)load(context, "vkCmdResolveImage2KHR");
 #endif /* defined(VK_KHR_copy_commands2) */
-#if defined(VK_KHR_copy_memory_indirect)
-	table->vkCmdCopyMemoryIndirectKHR = (PFN_vkCmdCopyMemoryIndirectKHR)load(context, "vkCmdCopyMemoryIndirectKHR");
-	table->vkCmdCopyMemoryToImageIndirectKHR = (PFN_vkCmdCopyMemoryToImageIndirectKHR)load(context, "vkCmdCopyMemoryToImageIndirectKHR");
-#endif /* defined(VK_KHR_copy_memory_indirect) */
 #if defined(VK_KHR_create_renderpass2)
 	table->vkCmdBeginRenderPass2KHR = (PFN_vkCmdBeginRenderPass2KHR)load(context, "vkCmdBeginRenderPass2KHR");
 	table->vkCmdEndRenderPass2KHR = (PFN_vkCmdEndRenderPass2KHR)load(context, "vkCmdEndRenderPass2KHR");
@@ -2323,9 +1805,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_KHR_maintenance1)
 	table->vkTrimCommandPoolKHR = (PFN_vkTrimCommandPoolKHR)load(context, "vkTrimCommandPoolKHR");
 #endif /* defined(VK_KHR_maintenance1) */
-#if defined(VK_KHR_maintenance10)
-	table->vkCmdEndRendering2KHR = (PFN_vkCmdEndRendering2KHR)load(context, "vkCmdEndRendering2KHR");
-#endif /* defined(VK_KHR_maintenance10) */
 #if defined(VK_KHR_maintenance3)
 	table->vkGetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR)load(context, "vkGetDescriptorSetLayoutSupportKHR");
 #endif /* defined(VK_KHR_maintenance3) */
@@ -2360,13 +1839,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkAcquireProfilingLockKHR = (PFN_vkAcquireProfilingLockKHR)load(context, "vkAcquireProfilingLockKHR");
 	table->vkReleaseProfilingLockKHR = (PFN_vkReleaseProfilingLockKHR)load(context, "vkReleaseProfilingLockKHR");
 #endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_pipeline_binary)
-	table->vkCreatePipelineBinariesKHR = (PFN_vkCreatePipelineBinariesKHR)load(context, "vkCreatePipelineBinariesKHR");
-	table->vkDestroyPipelineBinaryKHR = (PFN_vkDestroyPipelineBinaryKHR)load(context, "vkDestroyPipelineBinaryKHR");
-	table->vkGetPipelineBinaryDataKHR = (PFN_vkGetPipelineBinaryDataKHR)load(context, "vkGetPipelineBinaryDataKHR");
-	table->vkGetPipelineKeyKHR = (PFN_vkGetPipelineKeyKHR)load(context, "vkGetPipelineKeyKHR");
-	table->vkReleaseCapturedPipelineDataKHR = (PFN_vkReleaseCapturedPipelineDataKHR)load(context, "vkReleaseCapturedPipelineDataKHR");
-#endif /* defined(VK_KHR_pipeline_binary) */
 #if defined(VK_KHR_pipeline_executable_properties)
 	table->vkGetPipelineExecutableInternalRepresentationsKHR = (PFN_vkGetPipelineExecutableInternalRepresentationsKHR)load(context, "vkGetPipelineExecutableInternalRepresentationsKHR");
 	table->vkGetPipelineExecutablePropertiesKHR = (PFN_vkGetPipelineExecutablePropertiesKHR)load(context, "vkGetPipelineExecutablePropertiesKHR");
@@ -2375,9 +1847,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if defined(VK_KHR_present_wait)
 	table->vkWaitForPresentKHR = (PFN_vkWaitForPresentKHR)load(context, "vkWaitForPresentKHR");
 #endif /* defined(VK_KHR_present_wait) */
-#if defined(VK_KHR_present_wait2)
-	table->vkWaitForPresent2KHR = (PFN_vkWaitForPresent2KHR)load(context, "vkWaitForPresent2KHR");
-#endif /* defined(VK_KHR_present_wait2) */
 #if defined(VK_KHR_push_descriptor)
 	table->vkCmdPushDescriptorSetKHR = (PFN_vkCmdPushDescriptorSetKHR)load(context, "vkCmdPushDescriptorSetKHR");
 #endif /* defined(VK_KHR_push_descriptor) */
@@ -2407,9 +1876,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkGetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR)load(context, "vkGetSwapchainImagesKHR");
 	table->vkQueuePresentKHR = (PFN_vkQueuePresentKHR)load(context, "vkQueuePresentKHR");
 #endif /* defined(VK_KHR_swapchain) */
-#if defined(VK_KHR_swapchain_maintenance1)
-	table->vkReleaseSwapchainImagesKHR = (PFN_vkReleaseSwapchainImagesKHR)load(context, "vkReleaseSwapchainImagesKHR");
-#endif /* defined(VK_KHR_swapchain_maintenance1) */
 #if defined(VK_KHR_synchronization2)
 	table->vkCmdPipelineBarrier2KHR = (PFN_vkCmdPipelineBarrier2KHR)load(context, "vkCmdPipelineBarrier2KHR");
 	table->vkCmdResetEvent2KHR = (PFN_vkCmdResetEvent2KHR)load(context, "vkCmdResetEvent2KHR");
@@ -2418,6 +1884,12 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdWriteTimestamp2KHR = (PFN_vkCmdWriteTimestamp2KHR)load(context, "vkCmdWriteTimestamp2KHR");
 	table->vkQueueSubmit2KHR = (PFN_vkQueueSubmit2KHR)load(context, "vkQueueSubmit2KHR");
 #endif /* defined(VK_KHR_synchronization2) */
+#if defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker)
+	table->vkCmdWriteBufferMarker2AMD = (PFN_vkCmdWriteBufferMarker2AMD)load(context, "vkCmdWriteBufferMarker2AMD");
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker) */
+#if defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints)
+	table->vkGetQueueCheckpointData2NV = (PFN_vkGetQueueCheckpointData2NV)load(context, "vkGetQueueCheckpointData2NV");
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints) */
 #if defined(VK_KHR_timeline_semaphore)
 	table->vkGetSemaphoreCounterValueKHR = (PFN_vkGetSemaphoreCounterValueKHR)load(context, "vkGetSemaphoreCounterValueKHR");
 	table->vkSignalSemaphoreKHR = (PFN_vkSignalSemaphoreKHR)load(context, "vkSignalSemaphoreKHR");
@@ -2450,25 +1922,12 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkDestroyCuModuleNVX = (PFN_vkDestroyCuModuleNVX)load(context, "vkDestroyCuModuleNVX");
 #endif /* defined(VK_NVX_binary_import) */
 #if defined(VK_NVX_image_view_handle)
+	table->vkGetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)load(context, "vkGetImageViewAddressNVX");
 	table->vkGetImageViewHandleNVX = (PFN_vkGetImageViewHandleNVX)load(context, "vkGetImageViewHandleNVX");
 #endif /* defined(VK_NVX_image_view_handle) */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3
-	table->vkGetImageViewHandle64NVX = (PFN_vkGetImageViewHandle64NVX)load(context, "vkGetImageViewHandle64NVX");
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3 */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2
-	table->vkGetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)load(context, "vkGetImageViewAddressNVX");
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2 */
 #if defined(VK_NV_clip_space_w_scaling)
 	table->vkCmdSetViewportWScalingNV = (PFN_vkCmdSetViewportWScalingNV)load(context, "vkCmdSetViewportWScalingNV");
 #endif /* defined(VK_NV_clip_space_w_scaling) */
-#if defined(VK_NV_cluster_acceleration_structure)
-	table->vkCmdBuildClusterAccelerationStructureIndirectNV = (PFN_vkCmdBuildClusterAccelerationStructureIndirectNV)load(context, "vkCmdBuildClusterAccelerationStructureIndirectNV");
-	table->vkGetClusterAccelerationStructureBuildSizesNV = (PFN_vkGetClusterAccelerationStructureBuildSizesNV)load(context, "vkGetClusterAccelerationStructureBuildSizesNV");
-#endif /* defined(VK_NV_cluster_acceleration_structure) */
-#if defined(VK_NV_cooperative_vector)
-	table->vkCmdConvertCooperativeVectorMatrixNV = (PFN_vkCmdConvertCooperativeVectorMatrixNV)load(context, "vkCmdConvertCooperativeVectorMatrixNV");
-	table->vkConvertCooperativeVectorMatrixNV = (PFN_vkConvertCooperativeVectorMatrixNV)load(context, "vkConvertCooperativeVectorMatrixNV");
-#endif /* defined(VK_NV_cooperative_vector) */
 #if defined(VK_NV_copy_memory_indirect)
 	table->vkCmdCopyMemoryIndirectNV = (PFN_vkCmdCopyMemoryIndirectNV)load(context, "vkCmdCopyMemoryIndirectNV");
 	table->vkCmdCopyMemoryToImageIndirectNV = (PFN_vkCmdCopyMemoryToImageIndirectNV)load(context, "vkCmdCopyMemoryToImageIndirectNV");
@@ -2485,9 +1944,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdSetCheckpointNV = (PFN_vkCmdSetCheckpointNV)load(context, "vkCmdSetCheckpointNV");
 	table->vkGetQueueCheckpointDataNV = (PFN_vkGetQueueCheckpointDataNV)load(context, "vkGetQueueCheckpointDataNV");
 #endif /* defined(VK_NV_device_diagnostic_checkpoints) */
-#if defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	table->vkGetQueueCheckpointData2NV = (PFN_vkGetQueueCheckpointData2NV)load(context, "vkGetQueueCheckpointData2NV");
-#endif /* defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_NV_device_generated_commands)
 	table->vkCmdBindPipelineShaderGroupNV = (PFN_vkCmdBindPipelineShaderGroupNV)load(context, "vkCmdBindPipelineShaderGroupNV");
 	table->vkCmdExecuteGeneratedCommandsNV = (PFN_vkCmdExecuteGeneratedCommandsNV)load(context, "vkCmdExecuteGeneratedCommandsNV");
@@ -2501,11 +1957,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkGetPipelineIndirectDeviceAddressNV = (PFN_vkGetPipelineIndirectDeviceAddressNV)load(context, "vkGetPipelineIndirectDeviceAddressNV");
 	table->vkGetPipelineIndirectMemoryRequirementsNV = (PFN_vkGetPipelineIndirectMemoryRequirementsNV)load(context, "vkGetPipelineIndirectMemoryRequirementsNV");
 #endif /* defined(VK_NV_device_generated_commands_compute) */
-#if defined(VK_NV_external_compute_queue)
-	table->vkCreateExternalComputeQueueNV = (PFN_vkCreateExternalComputeQueueNV)load(context, "vkCreateExternalComputeQueueNV");
-	table->vkDestroyExternalComputeQueueNV = (PFN_vkDestroyExternalComputeQueueNV)load(context, "vkDestroyExternalComputeQueueNV");
-	table->vkGetExternalComputeQueueDataNV = (PFN_vkGetExternalComputeQueueDataNV)load(context, "vkGetExternalComputeQueueDataNV");
-#endif /* defined(VK_NV_external_compute_queue) */
 #if defined(VK_NV_external_memory_rdma)
 	table->vkGetMemoryRemoteAddressNV = (PFN_vkGetMemoryRemoteAddressNV)load(context, "vkGetMemoryRemoteAddressNV");
 #endif /* defined(VK_NV_external_memory_rdma) */
@@ -2527,22 +1978,16 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdDecompressMemoryNV = (PFN_vkCmdDecompressMemoryNV)load(context, "vkCmdDecompressMemoryNV");
 #endif /* defined(VK_NV_memory_decompression) */
 #if defined(VK_NV_mesh_shader)
+	table->vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
 	table->vkCmdDrawMeshTasksIndirectNV = (PFN_vkCmdDrawMeshTasksIndirectNV)load(context, "vkCmdDrawMeshTasksIndirectNV");
 	table->vkCmdDrawMeshTasksNV = (PFN_vkCmdDrawMeshTasksNV)load(context, "vkCmdDrawMeshTasksNV");
 #endif /* defined(VK_NV_mesh_shader) */
-#if defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-	table->vkCmdDrawMeshTasksIndirectCountNV = (PFN_vkCmdDrawMeshTasksIndirectCountNV)load(context, "vkCmdDrawMeshTasksIndirectCountNV");
-#endif /* defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_NV_optical_flow)
 	table->vkBindOpticalFlowSessionImageNV = (PFN_vkBindOpticalFlowSessionImageNV)load(context, "vkBindOpticalFlowSessionImageNV");
 	table->vkCmdOpticalFlowExecuteNV = (PFN_vkCmdOpticalFlowExecuteNV)load(context, "vkCmdOpticalFlowExecuteNV");
 	table->vkCreateOpticalFlowSessionNV = (PFN_vkCreateOpticalFlowSessionNV)load(context, "vkCreateOpticalFlowSessionNV");
 	table->vkDestroyOpticalFlowSessionNV = (PFN_vkDestroyOpticalFlowSessionNV)load(context, "vkDestroyOpticalFlowSessionNV");
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_NV_partitioned_acceleration_structure)
-	table->vkCmdBuildPartitionedAccelerationStructuresNV = (PFN_vkCmdBuildPartitionedAccelerationStructuresNV)load(context, "vkCmdBuildPartitionedAccelerationStructuresNV");
-	table->vkGetPartitionedAccelerationStructuresBuildSizesNV = (PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV)load(context, "vkGetPartitionedAccelerationStructuresBuildSizesNV");
-#endif /* defined(VK_NV_partitioned_acceleration_structure) */
 #if defined(VK_NV_ray_tracing)
 	table->vkBindAccelerationStructureMemoryNV = (PFN_vkBindAccelerationStructureMemoryNV)load(context, "vkBindAccelerationStructureMemoryNV");
 	table->vkCmdBuildAccelerationStructureNV = (PFN_vkCmdBuildAccelerationStructureNV)load(context, "vkCmdBuildAccelerationStructureNV");
@@ -2568,27 +2013,10 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkCmdSetCoarseSampleOrderNV = (PFN_vkCmdSetCoarseSampleOrderNV)load(context, "vkCmdSetCoarseSampleOrderNV");
 	table->vkCmdSetViewportShadingRatePaletteNV = (PFN_vkCmdSetViewportShadingRatePaletteNV)load(context, "vkCmdSetViewportShadingRatePaletteNV");
 #endif /* defined(VK_NV_shading_rate_image) */
-#if defined(VK_OHOS_external_memory)
-	table->vkGetMemoryNativeBufferOHOS = (PFN_vkGetMemoryNativeBufferOHOS)load(context, "vkGetMemoryNativeBufferOHOS");
-	table->vkGetNativeBufferPropertiesOHOS = (PFN_vkGetNativeBufferPropertiesOHOS)load(context, "vkGetNativeBufferPropertiesOHOS");
-#endif /* defined(VK_OHOS_external_memory) */
-#if defined(VK_OHOS_native_buffer)
-	table->vkAcquireImageOHOS = (PFN_vkAcquireImageOHOS)load(context, "vkAcquireImageOHOS");
-	table->vkGetSwapchainGrallocUsageOHOS = (PFN_vkGetSwapchainGrallocUsageOHOS)load(context, "vkGetSwapchainGrallocUsageOHOS");
-	table->vkQueueSignalReleaseImageOHOS = (PFN_vkQueueSignalReleaseImageOHOS)load(context, "vkQueueSignalReleaseImageOHOS");
-#endif /* defined(VK_OHOS_native_buffer) */
-#if defined(VK_QCOM_tile_memory_heap)
-	table->vkCmdBindTileMemoryQCOM = (PFN_vkCmdBindTileMemoryQCOM)load(context, "vkCmdBindTileMemoryQCOM");
-#endif /* defined(VK_QCOM_tile_memory_heap) */
 #if defined(VK_QCOM_tile_properties)
 	table->vkGetDynamicRenderingTilePropertiesQCOM = (PFN_vkGetDynamicRenderingTilePropertiesQCOM)load(context, "vkGetDynamicRenderingTilePropertiesQCOM");
 	table->vkGetFramebufferTilePropertiesQCOM = (PFN_vkGetFramebufferTilePropertiesQCOM)load(context, "vkGetFramebufferTilePropertiesQCOM");
 #endif /* defined(VK_QCOM_tile_properties) */
-#if defined(VK_QCOM_tile_shading)
-	table->vkCmdBeginPerTileExecutionQCOM = (PFN_vkCmdBeginPerTileExecutionQCOM)load(context, "vkCmdBeginPerTileExecutionQCOM");
-	table->vkCmdDispatchTileQCOM = (PFN_vkCmdDispatchTileQCOM)load(context, "vkCmdDispatchTileQCOM");
-	table->vkCmdEndPerTileExecutionQCOM = (PFN_vkCmdEndPerTileExecutionQCOM)load(context, "vkCmdEndPerTileExecutionQCOM");
-#endif /* defined(VK_QCOM_tile_shading) */
 #if defined(VK_QNX_external_memory_screen_buffer)
 	table->vkGetScreenBufferPropertiesQNX = (PFN_vkGetScreenBufferPropertiesQNX)load(context, "vkGetScreenBufferPropertiesQNX");
 #endif /* defined(VK_QNX_external_memory_screen_buffer) */
@@ -2596,9 +2024,6 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 	table->vkGetDescriptorSetHostMappingVALVE = (PFN_vkGetDescriptorSetHostMappingVALVE)load(context, "vkGetDescriptorSetHostMappingVALVE");
 	table->vkGetDescriptorSetLayoutHostMappingInfoVALVE = (PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE)load(context, "vkGetDescriptorSetLayoutHostMappingInfoVALVE");
 #endif /* defined(VK_VALVE_descriptor_set_host_mapping) */
-#if (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control))
-	table->vkCmdSetDepthClampRangeEXT = (PFN_vkCmdSetDepthClampRangeEXT)load(context, "vkCmdSetDepthClampRangeEXT");
-#endif /* (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control)) */
 #if (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object))
 	table->vkCmdBindVertexBuffers2EXT = (PFN_vkCmdBindVertexBuffers2EXT)load(context, "vkCmdBindVertexBuffers2EXT");
 	table->vkCmdSetCullModeEXT = (PFN_vkCmdSetCullModeEXT)load(context, "vkCmdSetCullModeEXT");
@@ -2685,15 +2110,18 @@ static void volkGenLoadDeviceTable(struct VolkDeviceTable* table, void* context,
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode))
 	table->vkCmdSetCoverageReductionModeNV = (PFN_vkCmdSetCoverageReductionModeNV)load(context, "vkCmdSetCoverageReductionModeNV");
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode)) */
+#if (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1))
+	table->vkGetDeviceGroupSurfacePresentModes2EXT = (PFN_vkGetDeviceGroupSurfacePresentModes2EXT)load(context, "vkGetDeviceGroupSurfacePresentModes2EXT");
+#endif /* (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control))
 	table->vkGetImageSubresourceLayout2EXT = (PFN_vkGetImageSubresourceLayout2EXT)load(context, "vkGetImageSubresourceLayout2EXT");
 #endif /* (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control)) */
 #if (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state))
 	table->vkCmdSetVertexInputEXT = (PFN_vkCmdSetVertexInputEXT)load(context, "vkCmdSetVertexInputEXT");
 #endif /* (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state)) */
-#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template)))
+#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template))
 	table->vkCmdPushDescriptorSetWithTemplateKHR = (PFN_vkCmdPushDescriptorSetWithTemplateKHR)load(context, "vkCmdPushDescriptorSetWithTemplateKHR");
-#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template))) */
+#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 	table->vkGetDeviceGroupPresentCapabilitiesKHR = (PFN_vkGetDeviceGroupPresentCapabilitiesKHR)load(context, "vkGetDeviceGroupPresentCapabilitiesKHR");
 	table->vkGetDeviceGroupSurfacePresentModesKHR = (PFN_vkGetDeviceGroupSurfacePresentModesKHR)load(context, "vkGetDeviceGroupSurfacePresentModesKHR");
@@ -2936,27 +2364,6 @@ PFN_vkGetPrivateData vkGetPrivateData;
 PFN_vkQueueSubmit2 vkQueueSubmit2;
 PFN_vkSetPrivateData vkSetPrivateData;
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_VERSION_1_4)
-PFN_vkCmdBindDescriptorSets2 vkCmdBindDescriptorSets2;
-PFN_vkCmdBindIndexBuffer2 vkCmdBindIndexBuffer2;
-PFN_vkCmdPushConstants2 vkCmdPushConstants2;
-PFN_vkCmdPushDescriptorSet vkCmdPushDescriptorSet;
-PFN_vkCmdPushDescriptorSet2 vkCmdPushDescriptorSet2;
-PFN_vkCmdPushDescriptorSetWithTemplate vkCmdPushDescriptorSetWithTemplate;
-PFN_vkCmdPushDescriptorSetWithTemplate2 vkCmdPushDescriptorSetWithTemplate2;
-PFN_vkCmdSetLineStipple vkCmdSetLineStipple;
-PFN_vkCmdSetRenderingAttachmentLocations vkCmdSetRenderingAttachmentLocations;
-PFN_vkCmdSetRenderingInputAttachmentIndices vkCmdSetRenderingInputAttachmentIndices;
-PFN_vkCopyImageToImage vkCopyImageToImage;
-PFN_vkCopyImageToMemory vkCopyImageToMemory;
-PFN_vkCopyMemoryToImage vkCopyMemoryToImage;
-PFN_vkGetDeviceImageSubresourceLayout vkGetDeviceImageSubresourceLayout;
-PFN_vkGetImageSubresourceLayout2 vkGetImageSubresourceLayout2;
-PFN_vkGetRenderingAreaGranularity vkGetRenderingAreaGranularity;
-PFN_vkMapMemory2 vkMapMemory2;
-PFN_vkTransitionImageLayout vkTransitionImageLayout;
-PFN_vkUnmapMemory2 vkUnmapMemory2;
-#endif /* defined(VK_VERSION_1_4) */
 #if defined(VK_AMDX_shader_enqueue)
 PFN_vkCmdDispatchGraphAMDX vkCmdDispatchGraphAMDX;
 PFN_vkCmdDispatchGraphIndirectAMDX vkCmdDispatchGraphIndirectAMDX;
@@ -2966,15 +2373,9 @@ PFN_vkCreateExecutionGraphPipelinesAMDX vkCreateExecutionGraphPipelinesAMDX;
 PFN_vkGetExecutionGraphPipelineNodeIndexAMDX vkGetExecutionGraphPipelineNodeIndexAMDX;
 PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX;
 #endif /* defined(VK_AMDX_shader_enqueue) */
-#if defined(VK_AMD_anti_lag)
-PFN_vkAntiLagUpdateAMD vkAntiLagUpdateAMD;
-#endif /* defined(VK_AMD_anti_lag) */
 #if defined(VK_AMD_buffer_marker)
 PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD;
 #endif /* defined(VK_AMD_buffer_marker) */
-#if defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
-#endif /* defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_AMD_display_native_hdr)
 PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD;
 #endif /* defined(VK_AMD_display_native_hdr) */
@@ -2989,37 +2390,6 @@ PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD;
 PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID;
 PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID;
 #endif /* defined(VK_ANDROID_external_memory_android_hardware_buffer) */
-#if defined(VK_ARM_data_graph)
-PFN_vkBindDataGraphPipelineSessionMemoryARM vkBindDataGraphPipelineSessionMemoryARM;
-PFN_vkCmdDispatchDataGraphARM vkCmdDispatchDataGraphARM;
-PFN_vkCreateDataGraphPipelineSessionARM vkCreateDataGraphPipelineSessionARM;
-PFN_vkCreateDataGraphPipelinesARM vkCreateDataGraphPipelinesARM;
-PFN_vkDestroyDataGraphPipelineSessionARM vkDestroyDataGraphPipelineSessionARM;
-PFN_vkGetDataGraphPipelineAvailablePropertiesARM vkGetDataGraphPipelineAvailablePropertiesARM;
-PFN_vkGetDataGraphPipelinePropertiesARM vkGetDataGraphPipelinePropertiesARM;
-PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM vkGetDataGraphPipelineSessionBindPointRequirementsARM;
-PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM vkGetDataGraphPipelineSessionMemoryRequirementsARM;
-PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;
-PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_performance_counters_by_region)
-PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM;
-#endif /* defined(VK_ARM_performance_counters_by_region) */
-#if defined(VK_ARM_tensors)
-PFN_vkBindTensorMemoryARM vkBindTensorMemoryARM;
-PFN_vkCmdCopyTensorARM vkCmdCopyTensorARM;
-PFN_vkCreateTensorARM vkCreateTensorARM;
-PFN_vkCreateTensorViewARM vkCreateTensorViewARM;
-PFN_vkDestroyTensorARM vkDestroyTensorARM;
-PFN_vkDestroyTensorViewARM vkDestroyTensorViewARM;
-PFN_vkGetDeviceTensorMemoryRequirementsARM vkGetDeviceTensorMemoryRequirementsARM;
-PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM vkGetPhysicalDeviceExternalTensorPropertiesARM;
-PFN_vkGetTensorMemoryRequirementsARM vkGetTensorMemoryRequirementsARM;
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer)
-PFN_vkGetTensorOpaqueCaptureDescriptorDataARM vkGetTensorOpaqueCaptureDescriptorDataARM;
-PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM vkGetTensorViewOpaqueCaptureDescriptorDataARM;
-#endif /* defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_EXT_acquire_drm_display)
 PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT;
 PFN_vkGetDrmDisplayEXT vkGetDrmDisplayEXT;
@@ -3045,9 +2415,6 @@ PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT;
 PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT;
 PFN_vkCmdEndConditionalRenderingEXT vkCmdEndConditionalRenderingEXT;
 #endif /* defined(VK_EXT_conditional_rendering) */
-#if defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3))
-PFN_vkCmdBeginCustomResolveEXT vkCmdBeginCustomResolveEXT;
-#endif /* defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3)) */
 #if defined(VK_EXT_debug_marker)
 PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
 PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
@@ -3094,17 +2461,6 @@ PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationSt
 #if defined(VK_EXT_device_fault)
 PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT;
 #endif /* defined(VK_EXT_device_fault) */
-#if defined(VK_EXT_device_generated_commands)
-PFN_vkCmdExecuteGeneratedCommandsEXT vkCmdExecuteGeneratedCommandsEXT;
-PFN_vkCmdPreprocessGeneratedCommandsEXT vkCmdPreprocessGeneratedCommandsEXT;
-PFN_vkCreateIndirectCommandsLayoutEXT vkCreateIndirectCommandsLayoutEXT;
-PFN_vkCreateIndirectExecutionSetEXT vkCreateIndirectExecutionSetEXT;
-PFN_vkDestroyIndirectCommandsLayoutEXT vkDestroyIndirectCommandsLayoutEXT;
-PFN_vkDestroyIndirectExecutionSetEXT vkDestroyIndirectExecutionSetEXT;
-PFN_vkGetGeneratedCommandsMemoryRequirementsEXT vkGetGeneratedCommandsMemoryRequirementsEXT;
-PFN_vkUpdateIndirectExecutionSetPipelineEXT vkUpdateIndirectExecutionSetPipelineEXT;
-PFN_vkUpdateIndirectExecutionSetShaderEXT vkUpdateIndirectExecutionSetShaderEXT;
-#endif /* defined(VK_EXT_device_generated_commands) */
 #if defined(VK_EXT_direct_mode_display)
 PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT;
 #endif /* defined(VK_EXT_direct_mode_display) */
@@ -3131,21 +2487,11 @@ PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabil
 #if defined(VK_EXT_external_memory_host)
 PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT;
 #endif /* defined(VK_EXT_external_memory_host) */
-#if defined(VK_EXT_external_memory_metal)
-PFN_vkGetMemoryMetalHandleEXT vkGetMemoryMetalHandleEXT;
-PFN_vkGetMemoryMetalHandlePropertiesEXT vkGetMemoryMetalHandlePropertiesEXT;
-#endif /* defined(VK_EXT_external_memory_metal) */
-#if defined(VK_EXT_fragment_density_map_offset)
-PFN_vkCmdEndRendering2EXT vkCmdEndRendering2EXT;
-#endif /* defined(VK_EXT_fragment_density_map_offset) */
 #if defined(VK_EXT_full_screen_exclusive)
 PFN_vkAcquireFullScreenExclusiveModeEXT vkAcquireFullScreenExclusiveModeEXT;
 PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT;
 PFN_vkReleaseFullScreenExclusiveModeEXT vkReleaseFullScreenExclusiveModeEXT;
 #endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1))
-PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
-#endif /* defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1)) */
 #if defined(VK_EXT_hdr_metadata)
 PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT;
 #endif /* defined(VK_EXT_hdr_metadata) */
@@ -3167,17 +2513,11 @@ PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierProperti
 #if defined(VK_EXT_line_rasterization)
 PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT;
 #endif /* defined(VK_EXT_line_rasterization) */
-#if defined(VK_EXT_memory_decompression)
-PFN_vkCmdDecompressMemoryEXT vkCmdDecompressMemoryEXT;
-PFN_vkCmdDecompressMemoryIndirectCountEXT vkCmdDecompressMemoryIndirectCountEXT;
-#endif /* defined(VK_EXT_memory_decompression) */
 #if defined(VK_EXT_mesh_shader)
 PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
+PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
 PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
 #endif /* defined(VK_EXT_mesh_shader) */
-#if defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
-#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_EXT_metal_objects)
 PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
 #endif /* defined(VK_EXT_metal_objects) */
@@ -3210,12 +2550,6 @@ PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT;
 #if defined(VK_EXT_pipeline_properties)
 PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT;
 #endif /* defined(VK_EXT_pipeline_properties) */
-#if defined(VK_EXT_present_timing)
-PFN_vkGetPastPresentationTimingEXT vkGetPastPresentationTimingEXT;
-PFN_vkGetSwapchainTimeDomainPropertiesEXT vkGetSwapchainTimeDomainPropertiesEXT;
-PFN_vkGetSwapchainTimingPropertiesEXT vkGetSwapchainTimingPropertiesEXT;
-PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT;
-#endif /* defined(VK_EXT_present_timing) */
 #if defined(VK_EXT_private_data)
 PFN_vkCreatePrivateDataSlotEXT vkCreatePrivateDataSlotEXT;
 PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT;
@@ -3288,11 +2622,9 @@ PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
 #if defined(VK_HUAWEI_invocation_mask)
 PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
 #endif /* defined(VK_HUAWEI_invocation_mask) */
-#if defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2
-PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
-#endif /* defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2 */
 #if defined(VK_HUAWEI_subpass_shading)
 PFN_vkCmdSubpassShadingHUAWEI vkCmdSubpassShadingHUAWEI;
+PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
 #endif /* defined(VK_HUAWEI_subpass_shading) */
 #if defined(VK_INTEL_performance_query)
 PFN_vkAcquirePerformanceConfigurationINTEL vkAcquirePerformanceConfigurationINTEL;
@@ -3350,10 +2682,6 @@ PFN_vkCmdCopyImage2KHR vkCmdCopyImage2KHR;
 PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR;
 PFN_vkCmdResolveImage2KHR vkCmdResolveImage2KHR;
 #endif /* defined(VK_KHR_copy_commands2) */
-#if defined(VK_KHR_copy_memory_indirect)
-PFN_vkCmdCopyMemoryIndirectKHR vkCmdCopyMemoryIndirectKHR;
-PFN_vkCmdCopyMemoryToImageIndirectKHR vkCmdCopyMemoryToImageIndirectKHR;
-#endif /* defined(VK_KHR_copy_memory_indirect) */
 #if defined(VK_KHR_create_renderpass2)
 PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR;
 PFN_vkCmdEndRenderPass2KHR vkCmdEndRenderPass2KHR;
@@ -3471,9 +2799,6 @@ PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR;
 #if defined(VK_KHR_maintenance1)
 PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR;
 #endif /* defined(VK_KHR_maintenance1) */
-#if defined(VK_KHR_maintenance10)
-PFN_vkCmdEndRendering2KHR vkCmdEndRendering2KHR;
-#endif /* defined(VK_KHR_maintenance10) */
 #if defined(VK_KHR_maintenance3)
 PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR;
 #endif /* defined(VK_KHR_maintenance3) */
@@ -3510,13 +2835,6 @@ PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumerateP
 PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR;
 PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR;
 #endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_pipeline_binary)
-PFN_vkCreatePipelineBinariesKHR vkCreatePipelineBinariesKHR;
-PFN_vkDestroyPipelineBinaryKHR vkDestroyPipelineBinaryKHR;
-PFN_vkGetPipelineBinaryDataKHR vkGetPipelineBinaryDataKHR;
-PFN_vkGetPipelineKeyKHR vkGetPipelineKeyKHR;
-PFN_vkReleaseCapturedPipelineDataKHR vkReleaseCapturedPipelineDataKHR;
-#endif /* defined(VK_KHR_pipeline_binary) */
 #if defined(VK_KHR_pipeline_executable_properties)
 PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR;
 PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR;
@@ -3525,9 +2843,6 @@ PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR;
 #if defined(VK_KHR_present_wait)
 PFN_vkWaitForPresentKHR vkWaitForPresentKHR;
 #endif /* defined(VK_KHR_present_wait) */
-#if defined(VK_KHR_present_wait2)
-PFN_vkWaitForPresent2KHR vkWaitForPresent2KHR;
-#endif /* defined(VK_KHR_present_wait2) */
 #if defined(VK_KHR_push_descriptor)
 PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR;
 #endif /* defined(VK_KHR_push_descriptor) */
@@ -3564,9 +2879,6 @@ PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
 PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
 PFN_vkQueuePresentKHR vkQueuePresentKHR;
 #endif /* defined(VK_KHR_swapchain) */
-#if defined(VK_KHR_swapchain_maintenance1)
-PFN_vkReleaseSwapchainImagesKHR vkReleaseSwapchainImagesKHR;
-#endif /* defined(VK_KHR_swapchain_maintenance1) */
 #if defined(VK_KHR_synchronization2)
 PFN_vkCmdPipelineBarrier2KHR vkCmdPipelineBarrier2KHR;
 PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR;
@@ -3575,6 +2887,12 @@ PFN_vkCmdWaitEvents2KHR vkCmdWaitEvents2KHR;
 PFN_vkCmdWriteTimestamp2KHR vkCmdWriteTimestamp2KHR;
 PFN_vkQueueSubmit2KHR vkQueueSubmit2KHR;
 #endif /* defined(VK_KHR_synchronization2) */
+#if defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker)
+PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker) */
+#if defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints)
+PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints) */
 #if defined(VK_KHR_timeline_semaphore)
 PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR;
 PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR;
@@ -3635,14 +2953,9 @@ PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX;
 PFN_vkDestroyCuModuleNVX vkDestroyCuModuleNVX;
 #endif /* defined(VK_NVX_binary_import) */
 #if defined(VK_NVX_image_view_handle)
+PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
 PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX;
 #endif /* defined(VK_NVX_image_view_handle) */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3
-PFN_vkGetImageViewHandle64NVX vkGetImageViewHandle64NVX;
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3 */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2
-PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2 */
 #if defined(VK_NV_acquire_winrt_display)
 PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
 PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
@@ -3650,21 +2963,9 @@ PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
 #if defined(VK_NV_clip_space_w_scaling)
 PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV;
 #endif /* defined(VK_NV_clip_space_w_scaling) */
-#if defined(VK_NV_cluster_acceleration_structure)
-PFN_vkCmdBuildClusterAccelerationStructureIndirectNV vkCmdBuildClusterAccelerationStructureIndirectNV;
-PFN_vkGetClusterAccelerationStructureBuildSizesNV vkGetClusterAccelerationStructureBuildSizesNV;
-#endif /* defined(VK_NV_cluster_acceleration_structure) */
 #if defined(VK_NV_cooperative_matrix)
 PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV;
 #endif /* defined(VK_NV_cooperative_matrix) */
-#if defined(VK_NV_cooperative_matrix2)
-PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV;
-#endif /* defined(VK_NV_cooperative_matrix2) */
-#if defined(VK_NV_cooperative_vector)
-PFN_vkCmdConvertCooperativeVectorMatrixNV vkCmdConvertCooperativeVectorMatrixNV;
-PFN_vkConvertCooperativeVectorMatrixNV vkConvertCooperativeVectorMatrixNV;
-PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV vkGetPhysicalDeviceCooperativeVectorPropertiesNV;
-#endif /* defined(VK_NV_cooperative_vector) */
 #if defined(VK_NV_copy_memory_indirect)
 PFN_vkCmdCopyMemoryIndirectNV vkCmdCopyMemoryIndirectNV;
 PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV;
@@ -3684,9 +2985,6 @@ PFN_vkGetCudaModuleCacheNV vkGetCudaModuleCacheNV;
 PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV;
 PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV;
 #endif /* defined(VK_NV_device_diagnostic_checkpoints) */
-#if defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
-#endif /* defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_NV_device_generated_commands)
 PFN_vkCmdBindPipelineShaderGroupNV vkCmdBindPipelineShaderGroupNV;
 PFN_vkCmdExecuteGeneratedCommandsNV vkCmdExecuteGeneratedCommandsNV;
@@ -3700,11 +2998,6 @@ PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBufferNV;
 PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV;
 PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV;
 #endif /* defined(VK_NV_device_generated_commands_compute) */
-#if defined(VK_NV_external_compute_queue)
-PFN_vkCreateExternalComputeQueueNV vkCreateExternalComputeQueueNV;
-PFN_vkDestroyExternalComputeQueueNV vkDestroyExternalComputeQueueNV;
-PFN_vkGetExternalComputeQueueDataNV vkGetExternalComputeQueueDataNV;
-#endif /* defined(VK_NV_external_compute_queue) */
 #if defined(VK_NV_external_memory_capabilities)
 PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
 #endif /* defined(VK_NV_external_memory_capabilities) */
@@ -3729,12 +3022,10 @@ PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV;
 PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
 #endif /* defined(VK_NV_memory_decompression) */
 #if defined(VK_NV_mesh_shader)
+PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
 PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
 PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
 #endif /* defined(VK_NV_mesh_shader) */
-#if defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
-#endif /* defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_NV_optical_flow)
 PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
 PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;
@@ -3742,10 +3033,6 @@ PFN_vkCreateOpticalFlowSessionNV vkCreateOpticalFlowSessionNV;
 PFN_vkDestroyOpticalFlowSessionNV vkDestroyOpticalFlowSessionNV;
 PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV;
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_NV_partitioned_acceleration_structure)
-PFN_vkCmdBuildPartitionedAccelerationStructuresNV vkCmdBuildPartitionedAccelerationStructuresNV;
-PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV vkGetPartitionedAccelerationStructuresBuildSizesNV;
-#endif /* defined(VK_NV_partitioned_acceleration_structure) */
 #if defined(VK_NV_ray_tracing)
 PFN_vkBindAccelerationStructureMemoryNV vkBindAccelerationStructureMemoryNV;
 PFN_vkCmdBuildAccelerationStructureNV vkCmdBuildAccelerationStructureNV;
@@ -3771,30 +3058,10 @@ PFN_vkCmdBindShadingRateImageNV vkCmdBindShadingRateImageNV;
 PFN_vkCmdSetCoarseSampleOrderNV vkCmdSetCoarseSampleOrderNV;
 PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV;
 #endif /* defined(VK_NV_shading_rate_image) */
-#if defined(VK_OHOS_external_memory)
-PFN_vkGetMemoryNativeBufferOHOS vkGetMemoryNativeBufferOHOS;
-PFN_vkGetNativeBufferPropertiesOHOS vkGetNativeBufferPropertiesOHOS;
-#endif /* defined(VK_OHOS_external_memory) */
-#if defined(VK_OHOS_native_buffer)
-PFN_vkAcquireImageOHOS vkAcquireImageOHOS;
-PFN_vkGetSwapchainGrallocUsageOHOS vkGetSwapchainGrallocUsageOHOS;
-PFN_vkQueueSignalReleaseImageOHOS vkQueueSignalReleaseImageOHOS;
-#endif /* defined(VK_OHOS_native_buffer) */
-#if defined(VK_OHOS_surface)
-PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS;
-#endif /* defined(VK_OHOS_surface) */
-#if defined(VK_QCOM_tile_memory_heap)
-PFN_vkCmdBindTileMemoryQCOM vkCmdBindTileMemoryQCOM;
-#endif /* defined(VK_QCOM_tile_memory_heap) */
 #if defined(VK_QCOM_tile_properties)
 PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM;
 PFN_vkGetFramebufferTilePropertiesQCOM vkGetFramebufferTilePropertiesQCOM;
 #endif /* defined(VK_QCOM_tile_properties) */
-#if defined(VK_QCOM_tile_shading)
-PFN_vkCmdBeginPerTileExecutionQCOM vkCmdBeginPerTileExecutionQCOM;
-PFN_vkCmdDispatchTileQCOM vkCmdDispatchTileQCOM;
-PFN_vkCmdEndPerTileExecutionQCOM vkCmdEndPerTileExecutionQCOM;
-#endif /* defined(VK_QCOM_tile_shading) */
 #if defined(VK_QNX_external_memory_screen_buffer)
 PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX;
 #endif /* defined(VK_QNX_external_memory_screen_buffer) */
@@ -3806,9 +3073,6 @@ PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPre
 PFN_vkGetDescriptorSetHostMappingVALVE vkGetDescriptorSetHostMappingVALVE;
 PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE;
 #endif /* defined(VK_VALVE_descriptor_set_host_mapping) */
-#if (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control))
-PFN_vkCmdSetDepthClampRangeEXT vkCmdSetDepthClampRangeEXT;
-#endif /* (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control)) */
 #if (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object))
 PFN_vkCmdBindVertexBuffers2EXT vkCmdBindVertexBuffers2EXT;
 PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT;
@@ -3895,15 +3159,18 @@ PFN_vkCmdSetRepresentativeFragmentTestEnableNV vkCmdSetRepresentativeFragmentTes
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode))
 PFN_vkCmdSetCoverageReductionModeNV vkCmdSetCoverageReductionModeNV;
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode)) */
+#if (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1))
+PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
+#endif /* (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control))
 PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT;
 #endif /* (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control)) */
 #if (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state))
 PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT;
 #endif /* (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state)) */
-#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template)))
+#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template))
 PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR;
-#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template))) */
+#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR;
 PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR;
@@ -3919,6 +3186,6 @@ PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 #endif
 
 #ifdef __cplusplus
-} // extern "C" / namespace volk
+}
 #endif
 /* clang-format on */
diff --git a/engine/thirdparty/volk/volk.h b/engine/thirdparty/volk/volk.h
index 4a641ab8..17326c64 100644
--- a/engine/thirdparty/volk/volk.h
+++ b/engine/thirdparty/volk/volk.h
@@ -1,7 +1,7 @@
 /**
  * volk
  *
- * Copyright (C) 2018-2025, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2018-2024, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
  * Report bugs and download new versions at https://github.com/zeux/volk
  *
  * This library is distributed under the MIT License. See notice at the end of this file.
@@ -10,16 +10,12 @@
 #ifndef VOLK_H_
 #define VOLK_H_
 
-#if defined(VOLK_NAMESPACE) && !defined(__cplusplus)
-#error VOLK_NAMESPACE is only supported in C++
-#endif
-
 #if defined(VULKAN_H_) && !defined(VK_NO_PROTOTYPES)
 #	error To use volk, you need to define VK_NO_PROTOTYPES before including vulkan.h
 #endif
 
 /* VOLK_GENERATE_VERSION_DEFINE */
-#define VOLK_HEADER_VERSION 335
+#define VOLK_HEADER_VERSION 283
 /* VOLK_GENERATE_VERSION_DEFINE */
 
 #ifndef VK_NO_PROTOTYPES
@@ -29,21 +25,44 @@
 #ifndef VULKAN_H_
 #	ifdef VOLK_VULKAN_H_PATH
 #		include VOLK_VULKAN_H_PATH
-#	else /* Platform headers included below */
+#	elif defined(VK_USE_PLATFORM_WIN32_KHR)
 #		include <vulkan/vk_platform.h>
 #		include <vulkan/vulkan_core.h>
+
+		/* When VK_USE_PLATFORM_WIN32_KHR is defined, instead of including vulkan.h directly, we include individual parts of the SDK
+		 * This is necessary to avoid including <windows.h> which is very heavy - it takes 200ms to parse without WIN32_LEAN_AND_MEAN
+		 * and 100ms to parse with it. vulkan_win32.h only needs a few symbols that are easy to redefine ourselves.
+		 */
+		typedef unsigned long DWORD;
+		typedef const wchar_t* LPCWSTR;
+		typedef void* HANDLE;
+		typedef struct HINSTANCE__* HINSTANCE;
+		typedef struct HWND__* HWND;
+		typedef struct HMONITOR__* HMONITOR;
+		typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
+
+#		include <vulkan/vulkan_win32.h>
+
+#		ifdef VK_ENABLE_BETA_EXTENSIONS
+#			include <vulkan/vulkan_beta.h>
+#		endif
+#	else
+#		include <vulkan/vulkan.h>
 #	endif
 #endif
 
-#ifdef __cplusplus
-#ifdef VOLK_NAMESPACE
-namespace volk {
-#else
-extern "C" {
+/* Disable several extensions on earlier SDKs because later SDKs introduce a backwards incompatible change to function signatures */
+#if VK_HEADER_VERSION < 140
+#	undef VK_NVX_image_view_handle
 #endif
+#if VK_HEADER_VERSION < 184
+#	undef VK_HUAWEI_subpass_shading
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-struct VolkInstanceTable;
 struct VolkDeviceTable;
 
 /**
@@ -107,469 +126,12 @@ VkInstance volkGetLoadedInstance(void);
  */
 VkDevice volkGetLoadedDevice(void);
 
-/**
- * Load function pointers using application-created VkInstance into a table.
- * Application should use function pointers from that table instead of using global function pointers.
- */
-void volkLoadInstanceTable(struct VolkInstanceTable* table, VkInstance instance);
-
 /**
  * Load function pointers using application-created VkDevice into a table.
  * Application should use function pointers from that table instead of using global function pointers.
  */
 void volkLoadDeviceTable(struct VolkDeviceTable* table, VkDevice device);
 
-#ifdef __cplusplus
-} // extern "C" / namespace volk
-#endif
-
-/* Instead of directly including vulkan.h, we include platform-specific parts of the SDK manually
- * This is necessary to avoid including platform headers in some cases (which vulkan.h does unconditionally)
- * and replace them with forward declarations, which makes build times faster and avoids macro conflicts.
- *
- * Note that we only replace platform-specific headers when the headers are known to be problematic: very large
- * or slow to compile (Windows), or introducing unprefixed macros which can cause conflicts (Windows, Xlib).
- */
-#if !defined(VULKAN_H_) && !defined(VOLK_VULKAN_H_PATH)
-
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-#include <vulkan/vulkan_android.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-#include <zircon/types.h>
-#include <vulkan/vulkan_fuchsia.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_IOS_MVK
-#include <vulkan/vulkan_ios.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-#include <vulkan/vulkan_macos.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_METAL_EXT
-#include <vulkan/vulkan_metal.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_VI_NN
-#include <vulkan/vulkan_vi.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-#include <vulkan/vulkan_wayland.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-typedef unsigned long DWORD;
-typedef const wchar_t* LPCWSTR;
-typedef void* HANDLE;
-typedef struct HINSTANCE__* HINSTANCE;
-typedef struct HWND__* HWND;
-typedef struct HMONITOR__* HMONITOR;
-typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
-#include <vulkan/vulkan_win32.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
-#include <xcb/xcb.h>
-#include <vulkan/vulkan_xcb.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-typedef struct _XDisplay Display;
-typedef unsigned long Window;
-typedef unsigned long VisualID;
-#include <vulkan/vulkan_xlib.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
-#include <directfb.h>
-#include <vulkan/vulkan_directfb.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
-typedef struct _XDisplay Display;
-typedef unsigned long RROutput;
-#include <vulkan/vulkan_xlib_xrandr.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_GGP
-#include <ggp_c/vulkan_types.h>
-#include <vulkan/vulkan_ggp.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_SCREEN_QNX
-#include <screen/screen.h>
-#include <vulkan/vulkan_screen.h>
-#endif
-
-#ifdef VK_USE_PLATFORM_SCI
-#include <nvscisync.h>
-#include <nvscibuf.h>
-#include <vulkan/vulkan_sci.h>
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#include <vulkan/vulkan_beta.h>
-#endif
-
-#endif
-
-#ifdef __cplusplus
-#ifdef VOLK_NAMESPACE
-namespace volk {
-#else
-extern "C" {
-#endif
-#endif
-
-/**
- * Instance-specific function pointer table
- */
-struct VolkInstanceTable
-{
-	/* VOLK_GENERATE_INSTANCE_TABLE */
-#if defined(VK_VERSION_1_0)
-	PFN_vkCreateDevice vkCreateDevice;
-	PFN_vkDestroyInstance vkDestroyInstance;
-	PFN_vkEnumerateDeviceExtensionProperties vkEnumerateDeviceExtensionProperties;
-	PFN_vkEnumerateDeviceLayerProperties vkEnumerateDeviceLayerProperties;
-	PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
-	PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr;
-	PFN_vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFeatures;
-	PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
-	PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
-	PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
-	PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
-	PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties;
-	PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties;
-#else
-	PFN_vkVoidFunction padding_f34b07f4[13];
-#endif /* defined(VK_VERSION_1_0) */
-#if defined(VK_VERSION_1_1)
-	PFN_vkEnumeratePhysicalDeviceGroups vkEnumeratePhysicalDeviceGroups;
-	PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBufferProperties;
-	PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties;
-	PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties;
-	PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
-	PFN_vkGetPhysicalDeviceFormatProperties2 vkGetPhysicalDeviceFormatProperties2;
-	PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2;
-	PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;
-	PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2;
-	PFN_vkGetPhysicalDeviceQueueFamilyProperties2 vkGetPhysicalDeviceQueueFamilyProperties2;
-	PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2;
-#else
-	PFN_vkVoidFunction padding_73de037b[11];
-#endif /* defined(VK_VERSION_1_1) */
-#if defined(VK_VERSION_1_3)
-	PFN_vkGetPhysicalDeviceToolProperties vkGetPhysicalDeviceToolProperties;
-#else
-	PFN_vkVoidFunction padding_60958868[1];
-#endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_ARM_data_graph)
-	PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;
-	PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
-#else
-	PFN_vkVoidFunction padding_15920a35[2];
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_performance_counters_by_region)
-	PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM;
-#else
-	PFN_vkVoidFunction padding_4fd09193[1];
-#endif /* defined(VK_ARM_performance_counters_by_region) */
-#if defined(VK_ARM_tensors)
-	PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM vkGetPhysicalDeviceExternalTensorPropertiesARM;
-#else
-	PFN_vkVoidFunction padding_4622403f[1];
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_EXT_acquire_drm_display)
-	PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT;
-	PFN_vkGetDrmDisplayEXT vkGetDrmDisplayEXT;
-#else
-	PFN_vkVoidFunction padding_8e427d62[2];
-#endif /* defined(VK_EXT_acquire_drm_display) */
-#if defined(VK_EXT_acquire_xlib_display)
-	PFN_vkAcquireXlibDisplayEXT vkAcquireXlibDisplayEXT;
-	PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT;
-#else
-	PFN_vkVoidFunction padding_6e6f0a05[2];
-#endif /* defined(VK_EXT_acquire_xlib_display) */
-#if defined(VK_EXT_calibrated_timestamps)
-	PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
-#else
-	PFN_vkVoidFunction padding_61710136[1];
-#endif /* defined(VK_EXT_calibrated_timestamps) */
-#if defined(VK_EXT_debug_report)
-	PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
-	PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
-	PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
-#else
-	PFN_vkVoidFunction padding_250c28de[3];
-#endif /* defined(VK_EXT_debug_report) */
-#if defined(VK_EXT_debug_utils)
-	PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT;
-	PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT;
-	PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT;
-	PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
-	PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
-	PFN_vkQueueBeginDebugUtilsLabelEXT vkQueueBeginDebugUtilsLabelEXT;
-	PFN_vkQueueEndDebugUtilsLabelEXT vkQueueEndDebugUtilsLabelEXT;
-	PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT;
-	PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
-	PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
-	PFN_vkSubmitDebugUtilsMessageEXT vkSubmitDebugUtilsMessageEXT;
-#else
-	PFN_vkVoidFunction padding_3e2e81f7[11];
-#endif /* defined(VK_EXT_debug_utils) */
-#if defined(VK_EXT_direct_mode_display)
-	PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT;
-#else
-	PFN_vkVoidFunction padding_899830c3[1];
-#endif /* defined(VK_EXT_direct_mode_display) */
-#if defined(VK_EXT_directfb_surface)
-	PFN_vkCreateDirectFBSurfaceEXT vkCreateDirectFBSurfaceEXT;
-	PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT;
-#else
-	PFN_vkVoidFunction padding_f7e0f7b1[2];
-#endif /* defined(VK_EXT_directfb_surface) */
-#if defined(VK_EXT_display_surface_counter)
-	PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT;
-#else
-	PFN_vkVoidFunction padding_8bff43f7[1];
-#endif /* defined(VK_EXT_display_surface_counter) */
-#if defined(VK_EXT_full_screen_exclusive)
-	PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT;
-#else
-	PFN_vkVoidFunction padding_ff6b086[1];
-#endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_headless_surface)
-	PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT;
-#else
-	PFN_vkVoidFunction padding_f8cab9e0[1];
-#endif /* defined(VK_EXT_headless_surface) */
-#if defined(VK_EXT_metal_surface)
-	PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT;
-#else
-	PFN_vkVoidFunction padding_1c6d079a[1];
-#endif /* defined(VK_EXT_metal_surface) */
-#if defined(VK_EXT_sample_locations)
-	PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_fd7ffce7[1];
-#endif /* defined(VK_EXT_sample_locations) */
-#if defined(VK_EXT_tooling_info)
-	PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_99aa5ee9[1];
-#endif /* defined(VK_EXT_tooling_info) */
-#if defined(VK_FUCHSIA_imagepipe_surface)
-	PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA;
-#else
-	PFN_vkVoidFunction padding_6db35e8f[1];
-#endif /* defined(VK_FUCHSIA_imagepipe_surface) */
-#if defined(VK_GGP_stream_descriptor_surface)
-	PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP;
-#else
-	PFN_vkVoidFunction padding_cc96d0ec[1];
-#endif /* defined(VK_GGP_stream_descriptor_surface) */
-#if defined(VK_KHR_android_surface)
-	PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
-#else
-	PFN_vkVoidFunction padding_ab4fe82c[1];
-#endif /* defined(VK_KHR_android_surface) */
-#if defined(VK_KHR_calibrated_timestamps)
-	PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR;
-#else
-	PFN_vkVoidFunction padding_663b2fa0[1];
-#endif /* defined(VK_KHR_calibrated_timestamps) */
-#if defined(VK_KHR_cooperative_matrix)
-	PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_59e376cc[1];
-#endif /* defined(VK_KHR_cooperative_matrix) */
-#if defined(VK_KHR_device_group_creation)
-	PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
-#else
-	PFN_vkVoidFunction padding_6db81211[1];
-#endif /* defined(VK_KHR_device_group_creation) */
-#if defined(VK_KHR_display)
-	PFN_vkCreateDisplayModeKHR vkCreateDisplayModeKHR;
-	PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
-	PFN_vkGetDisplayModePropertiesKHR vkGetDisplayModePropertiesKHR;
-	PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
-	PFN_vkGetDisplayPlaneSupportedDisplaysKHR vkGetDisplayPlaneSupportedDisplaysKHR;
-	PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
-	PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vkGetPhysicalDeviceDisplayPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_cce37eaf[7];
-#endif /* defined(VK_KHR_display) */
-#if defined(VK_KHR_external_fence_capabilities)
-	PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_b2076412[1];
-#endif /* defined(VK_KHR_external_fence_capabilities) */
-#if defined(VK_KHR_external_memory_capabilities)
-	PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_f167e378[1];
-#endif /* defined(VK_KHR_external_memory_capabilities) */
-#if defined(VK_KHR_external_semaphore_capabilities)
-	PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_acdaf099[1];
-#endif /* defined(VK_KHR_external_semaphore_capabilities) */
-#if defined(VK_KHR_fragment_shading_rate)
-	PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR;
-#else
-	PFN_vkVoidFunction padding_d59cae82[1];
-#endif /* defined(VK_KHR_fragment_shading_rate) */
-#if defined(VK_KHR_get_display_properties2)
-	PFN_vkGetDisplayModeProperties2KHR vkGetDisplayModeProperties2KHR;
-	PFN_vkGetDisplayPlaneCapabilities2KHR vkGetDisplayPlaneCapabilities2KHR;
-	PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR;
-	PFN_vkGetPhysicalDeviceDisplayProperties2KHR vkGetPhysicalDeviceDisplayProperties2KHR;
-#else
-	PFN_vkVoidFunction padding_46c0938b[4];
-#endif /* defined(VK_KHR_get_display_properties2) */
-#if defined(VK_KHR_get_physical_device_properties2)
-	PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
-	PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
-	PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2KHR;
-	PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
-	PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
-	PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR vkGetPhysicalDeviceQueueFamilyProperties2KHR;
-	PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
-#else
-	PFN_vkVoidFunction padding_5fac460e[7];
-#endif /* defined(VK_KHR_get_physical_device_properties2) */
-#if defined(VK_KHR_get_surface_capabilities2)
-	PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR;
-	PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR;
-#else
-	PFN_vkVoidFunction padding_3baff606[2];
-#endif /* defined(VK_KHR_get_surface_capabilities2) */
-#if defined(VK_KHR_performance_query)
-	PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR;
-	PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR;
-#else
-	PFN_vkVoidFunction padding_1b45ef8f[2];
-#endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_surface)
-	PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
-	PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
-	PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfaceFormatsKHR;
-	PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR;
-	PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
-#else
-	PFN_vkVoidFunction padding_8f1ea665[5];
-#endif /* defined(VK_KHR_surface) */
-#if defined(VK_KHR_video_encode_queue)
-	PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_f0a3114[1];
-#endif /* defined(VK_KHR_video_encode_queue) */
-#if defined(VK_KHR_video_queue)
-	PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
-	PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_12d937aa[2];
-#endif /* defined(VK_KHR_video_queue) */
-#if defined(VK_KHR_wayland_surface)
-	PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
-	PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
-#else
-	PFN_vkVoidFunction padding_92436324[2];
-#endif /* defined(VK_KHR_wayland_surface) */
-#if defined(VK_KHR_win32_surface)
-	PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
-	PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
-#else
-	PFN_vkVoidFunction padding_b8dcaf56[2];
-#endif /* defined(VK_KHR_win32_surface) */
-#if defined(VK_KHR_xcb_surface)
-	PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
-	PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
-#else
-	PFN_vkVoidFunction padding_b6b79326[2];
-#endif /* defined(VK_KHR_xcb_surface) */
-#if defined(VK_KHR_xlib_surface)
-	PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
-	PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
-#else
-	PFN_vkVoidFunction padding_c5e2b5db[2];
-#endif /* defined(VK_KHR_xlib_surface) */
-#if defined(VK_MVK_ios_surface)
-	PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK;
-#else
-	PFN_vkVoidFunction padding_52f99096[1];
-#endif /* defined(VK_MVK_ios_surface) */
-#if defined(VK_MVK_macos_surface)
-	PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
-#else
-	PFN_vkVoidFunction padding_1d7ced9a[1];
-#endif /* defined(VK_MVK_macos_surface) */
-#if defined(VK_NN_vi_surface)
-	PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN;
-#else
-	PFN_vkVoidFunction padding_d9ec3901[1];
-#endif /* defined(VK_NN_vi_surface) */
-#if defined(VK_NV_acquire_winrt_display)
-	PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
-	PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
-#else
-	PFN_vkVoidFunction padding_41c66e6[2];
-#endif /* defined(VK_NV_acquire_winrt_display) */
-#if defined(VK_NV_cooperative_matrix)
-	PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV;
-#else
-	PFN_vkVoidFunction padding_ee7fcfc8[1];
-#endif /* defined(VK_NV_cooperative_matrix) */
-#if defined(VK_NV_cooperative_matrix2)
-	PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV;
-#else
-	PFN_vkVoidFunction padding_2ec091f4[1];
-#endif /* defined(VK_NV_cooperative_matrix2) */
-#if defined(VK_NV_cooperative_vector)
-	PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV vkGetPhysicalDeviceCooperativeVectorPropertiesNV;
-#else
-	PFN_vkVoidFunction padding_50d51145[1];
-#endif /* defined(VK_NV_cooperative_vector) */
-#if defined(VK_NV_coverage_reduction_mode)
-	PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV;
-#else
-	PFN_vkVoidFunction padding_9a9f15ac[1];
-#endif /* defined(VK_NV_coverage_reduction_mode) */
-#if defined(VK_NV_external_memory_capabilities)
-	PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
-#else
-	PFN_vkVoidFunction padding_988145[1];
-#endif /* defined(VK_NV_external_memory_capabilities) */
-#if defined(VK_NV_optical_flow)
-	PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV;
-#else
-	PFN_vkVoidFunction padding_46a4b95[1];
-#endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_OHOS_surface)
-	PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS;
-#else
-	PFN_vkVoidFunction padding_b94570ee[1];
-#endif /* defined(VK_OHOS_surface) */
-#if defined(VK_QNX_screen_surface)
-	PFN_vkCreateScreenSurfaceQNX vkCreateScreenSurfaceQNX;
-	PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX;
-#else
-	PFN_vkVoidFunction padding_9b43b57c[2];
-#endif /* defined(VK_QNX_screen_surface) */
-#if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
-	PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR;
-#else
-	PFN_vkVoidFunction padding_a8092b55[1];
-#endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
-	/* VOLK_GENERATE_INSTANCE_TABLE */
-};
-
 /**
  * Device-specific function pointer table
  */
@@ -697,8 +259,6 @@ struct VolkDeviceTable
 	PFN_vkUnmapMemory vkUnmapMemory;
 	PFN_vkUpdateDescriptorSets vkUpdateDescriptorSets;
 	PFN_vkWaitForFences vkWaitForFences;
-#else
-	PFN_vkVoidFunction padding_6ce80d51[120];
 #endif /* defined(VK_VERSION_1_0) */
 #if defined(VK_VERSION_1_1)
 	PFN_vkBindBufferMemory2 vkBindBufferMemory2;
@@ -717,8 +277,6 @@ struct VolkDeviceTable
 	PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2;
 	PFN_vkTrimCommandPool vkTrimCommandPool;
 	PFN_vkUpdateDescriptorSetWithTemplate vkUpdateDescriptorSetWithTemplate;
-#else
-	PFN_vkVoidFunction padding_1ec56847[16];
 #endif /* defined(VK_VERSION_1_1) */
 #if defined(VK_VERSION_1_2)
 	PFN_vkCmdBeginRenderPass2 vkCmdBeginRenderPass2;
@@ -734,8 +292,6 @@ struct VolkDeviceTable
 	PFN_vkResetQueryPool vkResetQueryPool;
 	PFN_vkSignalSemaphore vkSignalSemaphore;
 	PFN_vkWaitSemaphores vkWaitSemaphores;
-#else
-	PFN_vkVoidFunction padding_a3e00662[13];
 #endif /* defined(VK_VERSION_1_2) */
 #if defined(VK_VERSION_1_3)
 	PFN_vkCmdBeginRendering vkCmdBeginRendering;
@@ -774,32 +330,7 @@ struct VolkDeviceTable
 	PFN_vkGetPrivateData vkGetPrivateData;
 	PFN_vkQueueSubmit2 vkQueueSubmit2;
 	PFN_vkSetPrivateData vkSetPrivateData;
-#else
-	PFN_vkVoidFunction padding_ee798a88[36];
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_VERSION_1_4)
-	PFN_vkCmdBindDescriptorSets2 vkCmdBindDescriptorSets2;
-	PFN_vkCmdBindIndexBuffer2 vkCmdBindIndexBuffer2;
-	PFN_vkCmdPushConstants2 vkCmdPushConstants2;
-	PFN_vkCmdPushDescriptorSet vkCmdPushDescriptorSet;
-	PFN_vkCmdPushDescriptorSet2 vkCmdPushDescriptorSet2;
-	PFN_vkCmdPushDescriptorSetWithTemplate vkCmdPushDescriptorSetWithTemplate;
-	PFN_vkCmdPushDescriptorSetWithTemplate2 vkCmdPushDescriptorSetWithTemplate2;
-	PFN_vkCmdSetLineStipple vkCmdSetLineStipple;
-	PFN_vkCmdSetRenderingAttachmentLocations vkCmdSetRenderingAttachmentLocations;
-	PFN_vkCmdSetRenderingInputAttachmentIndices vkCmdSetRenderingInputAttachmentIndices;
-	PFN_vkCopyImageToImage vkCopyImageToImage;
-	PFN_vkCopyImageToMemory vkCopyImageToMemory;
-	PFN_vkCopyMemoryToImage vkCopyMemoryToImage;
-	PFN_vkGetDeviceImageSubresourceLayout vkGetDeviceImageSubresourceLayout;
-	PFN_vkGetImageSubresourceLayout2 vkGetImageSubresourceLayout2;
-	PFN_vkGetRenderingAreaGranularity vkGetRenderingAreaGranularity;
-	PFN_vkMapMemory2 vkMapMemory2;
-	PFN_vkTransitionImageLayout vkTransitionImageLayout;
-	PFN_vkUnmapMemory2 vkUnmapMemory2;
-#else
-	PFN_vkVoidFunction padding_82585fa3[19];
-#endif /* defined(VK_VERSION_1_4) */
 #if defined(VK_AMDX_shader_enqueue)
 	PFN_vkCmdDispatchGraphAMDX vkCmdDispatchGraphAMDX;
 	PFN_vkCmdDispatchGraphIndirectAMDX vkCmdDispatchGraphIndirectAMDX;
@@ -808,121 +339,49 @@ struct VolkDeviceTable
 	PFN_vkCreateExecutionGraphPipelinesAMDX vkCreateExecutionGraphPipelinesAMDX;
 	PFN_vkGetExecutionGraphPipelineNodeIndexAMDX vkGetExecutionGraphPipelineNodeIndexAMDX;
 	PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX;
-#else
-	PFN_vkVoidFunction padding_9d3e2bba[7];
 #endif /* defined(VK_AMDX_shader_enqueue) */
-#if defined(VK_AMD_anti_lag)
-	PFN_vkAntiLagUpdateAMD vkAntiLagUpdateAMD;
-#else
-	PFN_vkVoidFunction padding_cf792fb4[1];
-#endif /* defined(VK_AMD_anti_lag) */
 #if defined(VK_AMD_buffer_marker)
 	PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD;
-#else
-	PFN_vkVoidFunction padding_7836e92f[1];
 #endif /* defined(VK_AMD_buffer_marker) */
-#if defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
-#else
-	PFN_vkVoidFunction padding_bbf9b7bb[1];
-#endif /* defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_AMD_display_native_hdr)
 	PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD;
-#else
-	PFN_vkVoidFunction padding_6b81b2fb[1];
 #endif /* defined(VK_AMD_display_native_hdr) */
 #if defined(VK_AMD_draw_indirect_count)
 	PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD;
 	PFN_vkCmdDrawIndirectCountAMD vkCmdDrawIndirectCountAMD;
-#else
-	PFN_vkVoidFunction padding_fbfa9964[2];
 #endif /* defined(VK_AMD_draw_indirect_count) */
 #if defined(VK_AMD_shader_info)
 	PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD;
-#else
-	PFN_vkVoidFunction padding_bfb754b[1];
 #endif /* defined(VK_AMD_shader_info) */
 #if defined(VK_ANDROID_external_memory_android_hardware_buffer)
 	PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID;
 	PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID;
-#else
-	PFN_vkVoidFunction padding_c67b1beb[2];
 #endif /* defined(VK_ANDROID_external_memory_android_hardware_buffer) */
-#if defined(VK_ARM_data_graph)
-	PFN_vkBindDataGraphPipelineSessionMemoryARM vkBindDataGraphPipelineSessionMemoryARM;
-	PFN_vkCmdDispatchDataGraphARM vkCmdDispatchDataGraphARM;
-	PFN_vkCreateDataGraphPipelineSessionARM vkCreateDataGraphPipelineSessionARM;
-	PFN_vkCreateDataGraphPipelinesARM vkCreateDataGraphPipelinesARM;
-	PFN_vkDestroyDataGraphPipelineSessionARM vkDestroyDataGraphPipelineSessionARM;
-	PFN_vkGetDataGraphPipelineAvailablePropertiesARM vkGetDataGraphPipelineAvailablePropertiesARM;
-	PFN_vkGetDataGraphPipelinePropertiesARM vkGetDataGraphPipelinePropertiesARM;
-	PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM vkGetDataGraphPipelineSessionBindPointRequirementsARM;
-	PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM vkGetDataGraphPipelineSessionMemoryRequirementsARM;
-#else
-	PFN_vkVoidFunction padding_894d85d8[9];
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_tensors)
-	PFN_vkBindTensorMemoryARM vkBindTensorMemoryARM;
-	PFN_vkCmdCopyTensorARM vkCmdCopyTensorARM;
-	PFN_vkCreateTensorARM vkCreateTensorARM;
-	PFN_vkCreateTensorViewARM vkCreateTensorViewARM;
-	PFN_vkDestroyTensorARM vkDestroyTensorARM;
-	PFN_vkDestroyTensorViewARM vkDestroyTensorViewARM;
-	PFN_vkGetDeviceTensorMemoryRequirementsARM vkGetDeviceTensorMemoryRequirementsARM;
-	PFN_vkGetTensorMemoryRequirementsARM vkGetTensorMemoryRequirementsARM;
-#else
-	PFN_vkVoidFunction padding_df67a729[8];
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer)
-	PFN_vkGetTensorOpaqueCaptureDescriptorDataARM vkGetTensorOpaqueCaptureDescriptorDataARM;
-	PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM vkGetTensorViewOpaqueCaptureDescriptorDataARM;
-#else
-	PFN_vkVoidFunction padding_9483bf7e[2];
-#endif /* defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_EXT_attachment_feedback_loop_dynamic_state)
 	PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT;
-#else
-	PFN_vkVoidFunction padding_760a41f5[1];
 #endif /* defined(VK_EXT_attachment_feedback_loop_dynamic_state) */
 #if defined(VK_EXT_buffer_device_address)
 	PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT;
-#else
-	PFN_vkVoidFunction padding_3b69d885[1];
 #endif /* defined(VK_EXT_buffer_device_address) */
 #if defined(VK_EXT_calibrated_timestamps)
 	PFN_vkGetCalibratedTimestampsEXT vkGetCalibratedTimestampsEXT;
-#else
-	PFN_vkVoidFunction padding_d0981c89[1];
 #endif /* defined(VK_EXT_calibrated_timestamps) */
 #if defined(VK_EXT_color_write_enable)
 	PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT;
-#else
-	PFN_vkVoidFunction padding_d301ecc3[1];
 #endif /* defined(VK_EXT_color_write_enable) */
 #if defined(VK_EXT_conditional_rendering)
 	PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT;
 	PFN_vkCmdEndConditionalRenderingEXT vkCmdEndConditionalRenderingEXT;
-#else
-	PFN_vkVoidFunction padding_ab532c18[2];
 #endif /* defined(VK_EXT_conditional_rendering) */
-#if defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3))
-	PFN_vkCmdBeginCustomResolveEXT vkCmdBeginCustomResolveEXT;
-#else
-	PFN_vkVoidFunction padding_962e418a[1];
-#endif /* defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3)) */
 #if defined(VK_EXT_debug_marker)
 	PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
 	PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
 	PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT;
 	PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT;
 	PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT;
-#else
-	PFN_vkVoidFunction padding_89986968[5];
 #endif /* defined(VK_EXT_debug_marker) */
 #if defined(VK_EXT_depth_bias_control)
 	PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT;
-#else
-	PFN_vkVoidFunction padding_bcddab4d[1];
 #endif /* defined(VK_EXT_depth_bias_control) */
 #if defined(VK_EXT_descriptor_buffer)
 	PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT vkCmdBindDescriptorBufferEmbeddedSamplersEXT;
@@ -935,133 +394,62 @@ struct VolkDeviceTable
 	PFN_vkGetImageOpaqueCaptureDescriptorDataEXT vkGetImageOpaqueCaptureDescriptorDataEXT;
 	PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT vkGetImageViewOpaqueCaptureDescriptorDataEXT;
 	PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT vkGetSamplerOpaqueCaptureDescriptorDataEXT;
-#else
-	PFN_vkVoidFunction padding_80aa973c[10];
 #endif /* defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_EXT_descriptor_buffer) && (defined(VK_KHR_acceleration_structure) || defined(VK_NV_ray_tracing))
 	PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT;
-#else
-	PFN_vkVoidFunction padding_98d0fb33[1];
 #endif /* defined(VK_EXT_descriptor_buffer) && (defined(VK_KHR_acceleration_structure) || defined(VK_NV_ray_tracing)) */
 #if defined(VK_EXT_device_fault)
 	PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT;
-#else
-	PFN_vkVoidFunction padding_55095419[1];
 #endif /* defined(VK_EXT_device_fault) */
-#if defined(VK_EXT_device_generated_commands)
-	PFN_vkCmdExecuteGeneratedCommandsEXT vkCmdExecuteGeneratedCommandsEXT;
-	PFN_vkCmdPreprocessGeneratedCommandsEXT vkCmdPreprocessGeneratedCommandsEXT;
-	PFN_vkCreateIndirectCommandsLayoutEXT vkCreateIndirectCommandsLayoutEXT;
-	PFN_vkCreateIndirectExecutionSetEXT vkCreateIndirectExecutionSetEXT;
-	PFN_vkDestroyIndirectCommandsLayoutEXT vkDestroyIndirectCommandsLayoutEXT;
-	PFN_vkDestroyIndirectExecutionSetEXT vkDestroyIndirectExecutionSetEXT;
-	PFN_vkGetGeneratedCommandsMemoryRequirementsEXT vkGetGeneratedCommandsMemoryRequirementsEXT;
-	PFN_vkUpdateIndirectExecutionSetPipelineEXT vkUpdateIndirectExecutionSetPipelineEXT;
-	PFN_vkUpdateIndirectExecutionSetShaderEXT vkUpdateIndirectExecutionSetShaderEXT;
-#else
-	PFN_vkVoidFunction padding_7ba7ebaa[9];
-#endif /* defined(VK_EXT_device_generated_commands) */
 #if defined(VK_EXT_discard_rectangles)
 	PFN_vkCmdSetDiscardRectangleEXT vkCmdSetDiscardRectangleEXT;
-#else
-	PFN_vkVoidFunction padding_d6355c2[1];
 #endif /* defined(VK_EXT_discard_rectangles) */
 #if defined(VK_EXT_discard_rectangles) && VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION >= 2
 	PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT;
 	PFN_vkCmdSetDiscardRectangleModeEXT vkCmdSetDiscardRectangleModeEXT;
-#else
-	PFN_vkVoidFunction padding_7bb44f77[2];
 #endif /* defined(VK_EXT_discard_rectangles) && VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION >= 2 */
 #if defined(VK_EXT_display_control)
 	PFN_vkDisplayPowerControlEXT vkDisplayPowerControlEXT;
 	PFN_vkGetSwapchainCounterEXT vkGetSwapchainCounterEXT;
 	PFN_vkRegisterDeviceEventEXT vkRegisterDeviceEventEXT;
 	PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT;
-#else
-	PFN_vkVoidFunction padding_d30dfaaf[4];
 #endif /* defined(VK_EXT_display_control) */
 #if defined(VK_EXT_external_memory_host)
 	PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_357656e9[1];
 #endif /* defined(VK_EXT_external_memory_host) */
-#if defined(VK_EXT_external_memory_metal)
-	PFN_vkGetMemoryMetalHandleEXT vkGetMemoryMetalHandleEXT;
-	PFN_vkGetMemoryMetalHandlePropertiesEXT vkGetMemoryMetalHandlePropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_37d43fb[2];
-#endif /* defined(VK_EXT_external_memory_metal) */
-#if defined(VK_EXT_fragment_density_map_offset)
-	PFN_vkCmdEndRendering2EXT vkCmdEndRendering2EXT;
-#else
-	PFN_vkVoidFunction padding_9c90cf11[1];
-#endif /* defined(VK_EXT_fragment_density_map_offset) */
 #if defined(VK_EXT_full_screen_exclusive)
 	PFN_vkAcquireFullScreenExclusiveModeEXT vkAcquireFullScreenExclusiveModeEXT;
 	PFN_vkReleaseFullScreenExclusiveModeEXT vkReleaseFullScreenExclusiveModeEXT;
-#else
-	PFN_vkVoidFunction padding_3859df46[2];
 #endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1))
-	PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
-#else
-	PFN_vkVoidFunction padding_e5b48b5b[1];
-#endif /* defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1)) */
 #if defined(VK_EXT_hdr_metadata)
 	PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT;
-#else
-	PFN_vkVoidFunction padding_ca6d733c[1];
 #endif /* defined(VK_EXT_hdr_metadata) */
 #if defined(VK_EXT_host_image_copy)
 	PFN_vkCopyImageToImageEXT vkCopyImageToImageEXT;
 	PFN_vkCopyImageToMemoryEXT vkCopyImageToMemoryEXT;
 	PFN_vkCopyMemoryToImageEXT vkCopyMemoryToImageEXT;
 	PFN_vkTransitionImageLayoutEXT vkTransitionImageLayoutEXT;
-#else
-	PFN_vkVoidFunction padding_dd6d9b61[4];
 #endif /* defined(VK_EXT_host_image_copy) */
 #if defined(VK_EXT_host_query_reset)
 	PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT;
-#else
-	PFN_vkVoidFunction padding_34e58bd3[1];
 #endif /* defined(VK_EXT_host_query_reset) */
 #if defined(VK_EXT_image_drm_format_modifier)
 	PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_eb50dc14[1];
 #endif /* defined(VK_EXT_image_drm_format_modifier) */
 #if defined(VK_EXT_line_rasterization)
 	PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT;
-#else
-	PFN_vkVoidFunction padding_8a212c37[1];
 #endif /* defined(VK_EXT_line_rasterization) */
-#if defined(VK_EXT_memory_decompression)
-	PFN_vkCmdDecompressMemoryEXT vkCmdDecompressMemoryEXT;
-	PFN_vkCmdDecompressMemoryIndirectCountEXT vkCmdDecompressMemoryIndirectCountEXT;
-#else
-	PFN_vkVoidFunction padding_c3b649ee[2];
-#endif /* defined(VK_EXT_memory_decompression) */
 #if defined(VK_EXT_mesh_shader)
 	PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
-	PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
-#else
-	PFN_vkVoidFunction padding_f65e838[2];
-#endif /* defined(VK_EXT_mesh_shader) */
-#if defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
 	PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
-#else
-	PFN_vkVoidFunction padding_dcbaac2f[1];
-#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
+	PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
+#endif /* defined(VK_EXT_mesh_shader) */
 #if defined(VK_EXT_metal_objects)
 	PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
-#else
-	PFN_vkVoidFunction padding_df21f735[1];
 #endif /* defined(VK_EXT_metal_objects) */
 #if defined(VK_EXT_multi_draw)
 	PFN_vkCmdDrawMultiEXT vkCmdDrawMultiEXT;
 	PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT;
-#else
-	PFN_vkVoidFunction padding_ce8b93b6[2];
 #endif /* defined(VK_EXT_multi_draw) */
 #if defined(VK_EXT_opacity_micromap)
 	PFN_vkBuildMicromapsEXT vkBuildMicromapsEXT;
@@ -1078,58 +466,34 @@ struct VolkDeviceTable
 	PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT;
 	PFN_vkGetMicromapBuildSizesEXT vkGetMicromapBuildSizesEXT;
 	PFN_vkWriteMicromapsPropertiesEXT vkWriteMicromapsPropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_fa41e53c[14];
 #endif /* defined(VK_EXT_opacity_micromap) */
 #if defined(VK_EXT_pageable_device_local_memory)
 	PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT;
-#else
-	PFN_vkVoidFunction padding_b2d2c2d7[1];
 #endif /* defined(VK_EXT_pageable_device_local_memory) */
 #if defined(VK_EXT_pipeline_properties)
 	PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT;
-#else
-	PFN_vkVoidFunction padding_11313020[1];
 #endif /* defined(VK_EXT_pipeline_properties) */
-#if defined(VK_EXT_present_timing)
-	PFN_vkGetPastPresentationTimingEXT vkGetPastPresentationTimingEXT;
-	PFN_vkGetSwapchainTimeDomainPropertiesEXT vkGetSwapchainTimeDomainPropertiesEXT;
-	PFN_vkGetSwapchainTimingPropertiesEXT vkGetSwapchainTimingPropertiesEXT;
-	PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT;
-#else
-	PFN_vkVoidFunction padding_8751feb5[4];
-#endif /* defined(VK_EXT_present_timing) */
 #if defined(VK_EXT_private_data)
 	PFN_vkCreatePrivateDataSlotEXT vkCreatePrivateDataSlotEXT;
 	PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT;
 	PFN_vkGetPrivateDataEXT vkGetPrivateDataEXT;
 	PFN_vkSetPrivateDataEXT vkSetPrivateDataEXT;
-#else
-	PFN_vkVoidFunction padding_108010f[4];
 #endif /* defined(VK_EXT_private_data) */
 #if defined(VK_EXT_sample_locations)
 	PFN_vkCmdSetSampleLocationsEXT vkCmdSetSampleLocationsEXT;
-#else
-	PFN_vkVoidFunction padding_26f9079f[1];
 #endif /* defined(VK_EXT_sample_locations) */
 #if defined(VK_EXT_shader_module_identifier)
 	PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT;
 	PFN_vkGetShaderModuleIdentifierEXT vkGetShaderModuleIdentifierEXT;
-#else
-	PFN_vkVoidFunction padding_e10c8f86[2];
 #endif /* defined(VK_EXT_shader_module_identifier) */
 #if defined(VK_EXT_shader_object)
 	PFN_vkCmdBindShadersEXT vkCmdBindShadersEXT;
 	PFN_vkCreateShadersEXT vkCreateShadersEXT;
 	PFN_vkDestroyShaderEXT vkDestroyShaderEXT;
 	PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT;
-#else
-	PFN_vkVoidFunction padding_374f3e18[4];
 #endif /* defined(VK_EXT_shader_object) */
 #if defined(VK_EXT_swapchain_maintenance1)
 	PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
-#else
-	PFN_vkVoidFunction padding_ea55bf74[1];
 #endif /* defined(VK_EXT_swapchain_maintenance1) */
 #if defined(VK_EXT_transform_feedback)
 	PFN_vkCmdBeginQueryIndexedEXT vkCmdBeginQueryIndexedEXT;
@@ -1138,16 +502,12 @@ struct VolkDeviceTable
 	PFN_vkCmdDrawIndirectByteCountEXT vkCmdDrawIndirectByteCountEXT;
 	PFN_vkCmdEndQueryIndexedEXT vkCmdEndQueryIndexedEXT;
 	PFN_vkCmdEndTransformFeedbackEXT vkCmdEndTransformFeedbackEXT;
-#else
-	PFN_vkVoidFunction padding_36980658[6];
 #endif /* defined(VK_EXT_transform_feedback) */
 #if defined(VK_EXT_validation_cache)
 	PFN_vkCreateValidationCacheEXT vkCreateValidationCacheEXT;
 	PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT;
 	PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT;
 	PFN_vkMergeValidationCachesEXT vkMergeValidationCachesEXT;
-#else
-	PFN_vkVoidFunction padding_b4f2df29[4];
 #endif /* defined(VK_EXT_validation_cache) */
 #if defined(VK_FUCHSIA_buffer_collection)
 	PFN_vkCreateBufferCollectionFUCHSIA vkCreateBufferCollectionFUCHSIA;
@@ -1155,47 +515,29 @@ struct VolkDeviceTable
 	PFN_vkGetBufferCollectionPropertiesFUCHSIA vkGetBufferCollectionPropertiesFUCHSIA;
 	PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA vkSetBufferCollectionBufferConstraintsFUCHSIA;
 	PFN_vkSetBufferCollectionImageConstraintsFUCHSIA vkSetBufferCollectionImageConstraintsFUCHSIA;
-#else
-	PFN_vkVoidFunction padding_8eaa27bc[5];
 #endif /* defined(VK_FUCHSIA_buffer_collection) */
 #if defined(VK_FUCHSIA_external_memory)
 	PFN_vkGetMemoryZirconHandleFUCHSIA vkGetMemoryZirconHandleFUCHSIA;
 	PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePropertiesFUCHSIA;
-#else
-	PFN_vkVoidFunction padding_e3cb8a67[2];
 #endif /* defined(VK_FUCHSIA_external_memory) */
 #if defined(VK_FUCHSIA_external_semaphore)
 	PFN_vkGetSemaphoreZirconHandleFUCHSIA vkGetSemaphoreZirconHandleFUCHSIA;
 	PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA;
-#else
-	PFN_vkVoidFunction padding_3df6f656[2];
 #endif /* defined(VK_FUCHSIA_external_semaphore) */
 #if defined(VK_GOOGLE_display_timing)
 	PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
 	PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
-#else
-	PFN_vkVoidFunction padding_2a6f50cd[2];
 #endif /* defined(VK_GOOGLE_display_timing) */
 #if defined(VK_HUAWEI_cluster_culling_shader)
 	PFN_vkCmdDrawClusterHUAWEI vkCmdDrawClusterHUAWEI;
 	PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
-#else
-	PFN_vkVoidFunction padding_75b97be6[2];
 #endif /* defined(VK_HUAWEI_cluster_culling_shader) */
 #if defined(VK_HUAWEI_invocation_mask)
 	PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
-#else
-	PFN_vkVoidFunction padding_c3a4569f[1];
 #endif /* defined(VK_HUAWEI_invocation_mask) */
-#if defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2
-	PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
-#else
-	PFN_vkVoidFunction padding_2e923f32[1];
-#endif /* defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2 */
 #if defined(VK_HUAWEI_subpass_shading)
 	PFN_vkCmdSubpassShadingHUAWEI vkCmdSubpassShadingHUAWEI;
-#else
-	PFN_vkVoidFunction padding_f766fdf5[1];
+	PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
 #endif /* defined(VK_HUAWEI_subpass_shading) */
 #if defined(VK_INTEL_performance_query)
 	PFN_vkAcquirePerformanceConfigurationINTEL vkAcquirePerformanceConfigurationINTEL;
@@ -1207,8 +549,6 @@ struct VolkDeviceTable
 	PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL;
 	PFN_vkReleasePerformanceConfigurationINTEL vkReleasePerformanceConfigurationINTEL;
 	PFN_vkUninitializePerformanceApiINTEL vkUninitializePerformanceApiINTEL;
-#else
-	PFN_vkVoidFunction padding_495a0a0b[9];
 #endif /* defined(VK_INTEL_performance_query) */
 #if defined(VK_KHR_acceleration_structure)
 	PFN_vkBuildAccelerationStructuresKHR vkBuildAccelerationStructuresKHR;
@@ -1227,26 +567,18 @@ struct VolkDeviceTable
 	PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR;
 	PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR;
 	PFN_vkWriteAccelerationStructuresPropertiesKHR vkWriteAccelerationStructuresPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_5a999b78[16];
 #endif /* defined(VK_KHR_acceleration_structure) */
 #if defined(VK_KHR_bind_memory2)
 	PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR;
 	PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR;
-#else
-	PFN_vkVoidFunction padding_ed8481f5[2];
 #endif /* defined(VK_KHR_bind_memory2) */
 #if defined(VK_KHR_buffer_device_address)
 	PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR;
 	PFN_vkGetBufferOpaqueCaptureAddressKHR vkGetBufferOpaqueCaptureAddressKHR;
 	PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR;
-#else
-	PFN_vkVoidFunction padding_178fdf81[3];
 #endif /* defined(VK_KHR_buffer_device_address) */
 #if defined(VK_KHR_calibrated_timestamps)
 	PFN_vkGetCalibratedTimestampsKHR vkGetCalibratedTimestampsKHR;
-#else
-	PFN_vkVoidFunction padding_8fd6f40d[1];
 #endif /* defined(VK_KHR_calibrated_timestamps) */
 #if defined(VK_KHR_copy_commands2)
 	PFN_vkCmdBlitImage2KHR vkCmdBlitImage2KHR;
@@ -1255,22 +587,12 @@ struct VolkDeviceTable
 	PFN_vkCmdCopyImage2KHR vkCmdCopyImage2KHR;
 	PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR;
 	PFN_vkCmdResolveImage2KHR vkCmdResolveImage2KHR;
-#else
-	PFN_vkVoidFunction padding_4c841ff2[6];
 #endif /* defined(VK_KHR_copy_commands2) */
-#if defined(VK_KHR_copy_memory_indirect)
-	PFN_vkCmdCopyMemoryIndirectKHR vkCmdCopyMemoryIndirectKHR;
-	PFN_vkCmdCopyMemoryToImageIndirectKHR vkCmdCopyMemoryToImageIndirectKHR;
-#else
-	PFN_vkVoidFunction padding_95995957[2];
-#endif /* defined(VK_KHR_copy_memory_indirect) */
 #if defined(VK_KHR_create_renderpass2)
 	PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR;
 	PFN_vkCmdEndRenderPass2KHR vkCmdEndRenderPass2KHR;
 	PFN_vkCmdNextSubpass2KHR vkCmdNextSubpass2KHR;
 	PFN_vkCreateRenderPass2KHR vkCreateRenderPass2KHR;
-#else
-	PFN_vkVoidFunction padding_2a0a8727[4];
 #endif /* defined(VK_KHR_create_renderpass2) */
 #if defined(VK_KHR_deferred_host_operations)
 	PFN_vkCreateDeferredOperationKHR vkCreateDeferredOperationKHR;
@@ -1278,194 +600,117 @@ struct VolkDeviceTable
 	PFN_vkDestroyDeferredOperationKHR vkDestroyDeferredOperationKHR;
 	PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR;
 	PFN_vkGetDeferredOperationResultKHR vkGetDeferredOperationResultKHR;
-#else
-	PFN_vkVoidFunction padding_346287bb[5];
 #endif /* defined(VK_KHR_deferred_host_operations) */
 #if defined(VK_KHR_descriptor_update_template)
 	PFN_vkCreateDescriptorUpdateTemplateKHR vkCreateDescriptorUpdateTemplateKHR;
 	PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR;
 	PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR;
-#else
-	PFN_vkVoidFunction padding_3d63aec0[3];
 #endif /* defined(VK_KHR_descriptor_update_template) */
 #if defined(VK_KHR_device_group)
 	PFN_vkCmdDispatchBaseKHR vkCmdDispatchBaseKHR;
 	PFN_vkCmdSetDeviceMaskKHR vkCmdSetDeviceMaskKHR;
 	PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR;
-#else
-	PFN_vkVoidFunction padding_5ebe16bd[3];
 #endif /* defined(VK_KHR_device_group) */
 #if defined(VK_KHR_display_swapchain)
 	PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
-#else
-	PFN_vkVoidFunction padding_12099367[1];
 #endif /* defined(VK_KHR_display_swapchain) */
 #if defined(VK_KHR_draw_indirect_count)
 	PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR;
 	PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR;
-#else
-	PFN_vkVoidFunction padding_7b5bc4c1[2];
 #endif /* defined(VK_KHR_draw_indirect_count) */
 #if defined(VK_KHR_dynamic_rendering)
 	PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR;
 	PFN_vkCmdEndRenderingKHR vkCmdEndRenderingKHR;
-#else
-	PFN_vkVoidFunction padding_b80f75a5[2];
 #endif /* defined(VK_KHR_dynamic_rendering) */
 #if defined(VK_KHR_dynamic_rendering_local_read)
 	PFN_vkCmdSetRenderingAttachmentLocationsKHR vkCmdSetRenderingAttachmentLocationsKHR;
 	PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR;
-#else
-	PFN_vkVoidFunction padding_b1510532[2];
 #endif /* defined(VK_KHR_dynamic_rendering_local_read) */
 #if defined(VK_KHR_external_fence_fd)
 	PFN_vkGetFenceFdKHR vkGetFenceFdKHR;
 	PFN_vkImportFenceFdKHR vkImportFenceFdKHR;
-#else
-	PFN_vkVoidFunction padding_a2c787d5[2];
 #endif /* defined(VK_KHR_external_fence_fd) */
 #if defined(VK_KHR_external_fence_win32)
 	PFN_vkGetFenceWin32HandleKHR vkGetFenceWin32HandleKHR;
 	PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR;
-#else
-	PFN_vkVoidFunction padding_55d8e6a9[2];
 #endif /* defined(VK_KHR_external_fence_win32) */
 #if defined(VK_KHR_external_memory_fd)
 	PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
 	PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_982d9e19[2];
 #endif /* defined(VK_KHR_external_memory_fd) */
 #if defined(VK_KHR_external_memory_win32)
 	PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
 	PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR;
-#else
-	PFN_vkVoidFunction padding_4af9e25a[2];
 #endif /* defined(VK_KHR_external_memory_win32) */
 #if defined(VK_KHR_external_semaphore_fd)
 	PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR;
 	PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR;
-#else
-	PFN_vkVoidFunction padding_2237b7cf[2];
 #endif /* defined(VK_KHR_external_semaphore_fd) */
 #if defined(VK_KHR_external_semaphore_win32)
 	PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR;
 	PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR;
-#else
-	PFN_vkVoidFunction padding_c18dea52[2];
 #endif /* defined(VK_KHR_external_semaphore_win32) */
 #if defined(VK_KHR_fragment_shading_rate)
 	PFN_vkCmdSetFragmentShadingRateKHR vkCmdSetFragmentShadingRateKHR;
-#else
-	PFN_vkVoidFunction padding_f91b0a90[1];
 #endif /* defined(VK_KHR_fragment_shading_rate) */
 #if defined(VK_KHR_get_memory_requirements2)
 	PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
 	PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
 	PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR;
-#else
-	PFN_vkVoidFunction padding_79d9c5c4[3];
 #endif /* defined(VK_KHR_get_memory_requirements2) */
 #if defined(VK_KHR_line_rasterization)
 	PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR;
-#else
-	PFN_vkVoidFunction padding_83c2939[1];
 #endif /* defined(VK_KHR_line_rasterization) */
 #if defined(VK_KHR_maintenance1)
 	PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR;
-#else
-	PFN_vkVoidFunction padding_4b372c56[1];
 #endif /* defined(VK_KHR_maintenance1) */
-#if defined(VK_KHR_maintenance10)
-	PFN_vkCmdEndRendering2KHR vkCmdEndRendering2KHR;
-#else
-	PFN_vkVoidFunction padding_c866e6ce[1];
-#endif /* defined(VK_KHR_maintenance10) */
 #if defined(VK_KHR_maintenance3)
 	PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR;
-#else
-	PFN_vkVoidFunction padding_5ea7858d[1];
 #endif /* defined(VK_KHR_maintenance3) */
 #if defined(VK_KHR_maintenance4)
 	PFN_vkGetDeviceBufferMemoryRequirementsKHR vkGetDeviceBufferMemoryRequirementsKHR;
 	PFN_vkGetDeviceImageMemoryRequirementsKHR vkGetDeviceImageMemoryRequirementsKHR;
 	PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR;
-#else
-	PFN_vkVoidFunction padding_8e2d4198[3];
 #endif /* defined(VK_KHR_maintenance4) */
 #if defined(VK_KHR_maintenance5)
 	PFN_vkCmdBindIndexBuffer2KHR vkCmdBindIndexBuffer2KHR;
 	PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR;
 	PFN_vkGetImageSubresourceLayout2KHR vkGetImageSubresourceLayout2KHR;
 	PFN_vkGetRenderingAreaGranularityKHR vkGetRenderingAreaGranularityKHR;
-#else
-	PFN_vkVoidFunction padding_37040339[4];
 #endif /* defined(VK_KHR_maintenance5) */
 #if defined(VK_KHR_maintenance6)
 	PFN_vkCmdBindDescriptorSets2KHR vkCmdBindDescriptorSets2KHR;
 	PFN_vkCmdPushConstants2KHR vkCmdPushConstants2KHR;
-#else
-	PFN_vkVoidFunction padding_442955d8[2];
 #endif /* defined(VK_KHR_maintenance6) */
 #if defined(VK_KHR_maintenance6) && defined(VK_KHR_push_descriptor)
 	PFN_vkCmdPushDescriptorSet2KHR vkCmdPushDescriptorSet2KHR;
 	PFN_vkCmdPushDescriptorSetWithTemplate2KHR vkCmdPushDescriptorSetWithTemplate2KHR;
-#else
-	PFN_vkVoidFunction padding_80e8513f[2];
 #endif /* defined(VK_KHR_maintenance6) && defined(VK_KHR_push_descriptor) */
 #if defined(VK_KHR_maintenance6) && defined(VK_EXT_descriptor_buffer)
 	PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT vkCmdBindDescriptorBufferEmbeddedSamplers2EXT;
 	PFN_vkCmdSetDescriptorBufferOffsets2EXT vkCmdSetDescriptorBufferOffsets2EXT;
-#else
-	PFN_vkVoidFunction padding_2816b9cd[2];
 #endif /* defined(VK_KHR_maintenance6) && defined(VK_EXT_descriptor_buffer) */
 #if defined(VK_KHR_map_memory2)
 	PFN_vkMapMemory2KHR vkMapMemory2KHR;
 	PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR;
-#else
-	PFN_vkVoidFunction padding_5a6d8986[2];
 #endif /* defined(VK_KHR_map_memory2) */
 #if defined(VK_KHR_performance_query)
 	PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR;
 	PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR;
-#else
-	PFN_vkVoidFunction padding_76f2673b[2];
 #endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_pipeline_binary)
-	PFN_vkCreatePipelineBinariesKHR vkCreatePipelineBinariesKHR;
-	PFN_vkDestroyPipelineBinaryKHR vkDestroyPipelineBinaryKHR;
-	PFN_vkGetPipelineBinaryDataKHR vkGetPipelineBinaryDataKHR;
-	PFN_vkGetPipelineKeyKHR vkGetPipelineKeyKHR;
-	PFN_vkReleaseCapturedPipelineDataKHR vkReleaseCapturedPipelineDataKHR;
-#else
-	PFN_vkVoidFunction padding_65232810[5];
-#endif /* defined(VK_KHR_pipeline_binary) */
 #if defined(VK_KHR_pipeline_executable_properties)
 	PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR;
 	PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR;
 	PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR;
-#else
-	PFN_vkVoidFunction padding_f7629b1e[3];
 #endif /* defined(VK_KHR_pipeline_executable_properties) */
 #if defined(VK_KHR_present_wait)
 	PFN_vkWaitForPresentKHR vkWaitForPresentKHR;
-#else
-	PFN_vkVoidFunction padding_b16cbe03[1];
 #endif /* defined(VK_KHR_present_wait) */
-#if defined(VK_KHR_present_wait2)
-	PFN_vkWaitForPresent2KHR vkWaitForPresent2KHR;
-#else
-	PFN_vkVoidFunction padding_7401483a[1];
-#endif /* defined(VK_KHR_present_wait2) */
 #if defined(VK_KHR_push_descriptor)
 	PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR;
-#else
-	PFN_vkVoidFunction padding_8f7712ad[1];
 #endif /* defined(VK_KHR_push_descriptor) */
 #if defined(VK_KHR_ray_tracing_maintenance1) && defined(VK_KHR_ray_tracing_pipeline)
 	PFN_vkCmdTraceRaysIndirect2KHR vkCmdTraceRaysIndirect2KHR;
-#else
-	PFN_vkVoidFunction padding_dd5f9b4a[1];
 #endif /* defined(VK_KHR_ray_tracing_maintenance1) && defined(VK_KHR_ray_tracing_pipeline) */
 #if defined(VK_KHR_ray_tracing_pipeline)
 	PFN_vkCmdSetRayTracingPipelineStackSizeKHR vkCmdSetRayTracingPipelineStackSizeKHR;
@@ -1475,19 +720,13 @@ struct VolkDeviceTable
 	PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR;
 	PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR;
 	PFN_vkGetRayTracingShaderGroupStackSizeKHR vkGetRayTracingShaderGroupStackSizeKHR;
-#else
-	PFN_vkVoidFunction padding_af99aedc[7];
 #endif /* defined(VK_KHR_ray_tracing_pipeline) */
 #if defined(VK_KHR_sampler_ycbcr_conversion)
 	PFN_vkCreateSamplerYcbcrConversionKHR vkCreateSamplerYcbcrConversionKHR;
 	PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR;
-#else
-	PFN_vkVoidFunction padding_88e61b30[2];
 #endif /* defined(VK_KHR_sampler_ycbcr_conversion) */
 #if defined(VK_KHR_shared_presentable_image)
 	PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR;
-#else
-	PFN_vkVoidFunction padding_1ff3379[1];
 #endif /* defined(VK_KHR_shared_presentable_image) */
 #if defined(VK_KHR_swapchain)
 	PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR;
@@ -1495,14 +734,7 @@ struct VolkDeviceTable
 	PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
 	PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
 	PFN_vkQueuePresentKHR vkQueuePresentKHR;
-#else
-	PFN_vkVoidFunction padding_a1de893b[5];
 #endif /* defined(VK_KHR_swapchain) */
-#if defined(VK_KHR_swapchain_maintenance1)
-	PFN_vkReleaseSwapchainImagesKHR vkReleaseSwapchainImagesKHR;
-#else
-	PFN_vkVoidFunction padding_e032d5c4[1];
-#endif /* defined(VK_KHR_swapchain_maintenance1) */
 #if defined(VK_KHR_synchronization2)
 	PFN_vkCmdPipelineBarrier2KHR vkCmdPipelineBarrier2KHR;
 	PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR;
@@ -1510,26 +742,24 @@ struct VolkDeviceTable
 	PFN_vkCmdWaitEvents2KHR vkCmdWaitEvents2KHR;
 	PFN_vkCmdWriteTimestamp2KHR vkCmdWriteTimestamp2KHR;
 	PFN_vkQueueSubmit2KHR vkQueueSubmit2KHR;
-#else
-	PFN_vkVoidFunction padding_e85bf128[6];
 #endif /* defined(VK_KHR_synchronization2) */
+#if defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker)
+	PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker) */
+#if defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints)
+	PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints) */
 #if defined(VK_KHR_timeline_semaphore)
 	PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR;
 	PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR;
 	PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR;
-#else
-	PFN_vkVoidFunction padding_c799d931[3];
 #endif /* defined(VK_KHR_timeline_semaphore) */
 #if defined(VK_KHR_video_decode_queue)
 	PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
-#else
-	PFN_vkVoidFunction padding_7a7cc7ad[1];
 #endif /* defined(VK_KHR_video_decode_queue) */
 #if defined(VK_KHR_video_encode_queue)
 	PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR;
 	PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR;
-#else
-	PFN_vkVoidFunction padding_f2997fb4[2];
 #endif /* defined(VK_KHR_video_encode_queue) */
 #if defined(VK_KHR_video_queue)
 	PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
@@ -1542,8 +772,6 @@ struct VolkDeviceTable
 	PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
 	PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
 	PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
-#else
-	PFN_vkVoidFunction padding_98fb7016[10];
 #endif /* defined(VK_KHR_video_queue) */
 #if defined(VK_NVX_binary_import)
 	PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX;
@@ -1551,46 +779,17 @@ struct VolkDeviceTable
 	PFN_vkCreateCuModuleNVX vkCreateCuModuleNVX;
 	PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX;
 	PFN_vkDestroyCuModuleNVX vkDestroyCuModuleNVX;
-#else
-	PFN_vkVoidFunction padding_eb54309b[5];
 #endif /* defined(VK_NVX_binary_import) */
 #if defined(VK_NVX_image_view_handle)
-	PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX;
-#else
-	PFN_vkVoidFunction padding_887f6736[1];
-#endif /* defined(VK_NVX_image_view_handle) */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3
-	PFN_vkGetImageViewHandle64NVX vkGetImageViewHandle64NVX;
-#else
-	PFN_vkVoidFunction padding_64ad40e2[1];
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3 */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2
 	PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
-#else
-	PFN_vkVoidFunction padding_d290479a[1];
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2 */
+	PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX;
+#endif /* defined(VK_NVX_image_view_handle) */
 #if defined(VK_NV_clip_space_w_scaling)
 	PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV;
-#else
-	PFN_vkVoidFunction padding_88d7eb2e[1];
 #endif /* defined(VK_NV_clip_space_w_scaling) */
-#if defined(VK_NV_cluster_acceleration_structure)
-	PFN_vkCmdBuildClusterAccelerationStructureIndirectNV vkCmdBuildClusterAccelerationStructureIndirectNV;
-	PFN_vkGetClusterAccelerationStructureBuildSizesNV vkGetClusterAccelerationStructureBuildSizesNV;
-#else
-	PFN_vkVoidFunction padding_60e35395[2];
-#endif /* defined(VK_NV_cluster_acceleration_structure) */
-#if defined(VK_NV_cooperative_vector)
-	PFN_vkCmdConvertCooperativeVectorMatrixNV vkCmdConvertCooperativeVectorMatrixNV;
-	PFN_vkConvertCooperativeVectorMatrixNV vkConvertCooperativeVectorMatrixNV;
-#else
-	PFN_vkVoidFunction padding_f4a887d0[2];
-#endif /* defined(VK_NV_cooperative_vector) */
 #if defined(VK_NV_copy_memory_indirect)
 	PFN_vkCmdCopyMemoryIndirectNV vkCmdCopyMemoryIndirectNV;
 	PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV;
-#else
-	PFN_vkVoidFunction padding_9536230e[2];
 #endif /* defined(VK_NV_copy_memory_indirect) */
 #if defined(VK_NV_cuda_kernel_launch)
 	PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV;
@@ -1599,20 +798,11 @@ struct VolkDeviceTable
 	PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV;
 	PFN_vkDestroyCudaModuleNV vkDestroyCudaModuleNV;
 	PFN_vkGetCudaModuleCacheNV vkGetCudaModuleCacheNV;
-#else
-	PFN_vkVoidFunction padding_2eabdf3b[6];
 #endif /* defined(VK_NV_cuda_kernel_launch) */
 #if defined(VK_NV_device_diagnostic_checkpoints)
 	PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV;
 	PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV;
-#else
-	PFN_vkVoidFunction padding_adaa5a21[2];
 #endif /* defined(VK_NV_device_diagnostic_checkpoints) */
-#if defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-	PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
-#else
-	PFN_vkVoidFunction padding_c776633d[1];
-#endif /* defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_NV_device_generated_commands)
 	PFN_vkCmdBindPipelineShaderGroupNV vkCmdBindPipelineShaderGroupNV;
 	PFN_vkCmdExecuteGeneratedCommandsNV vkCmdExecuteGeneratedCommandsNV;
@@ -1620,37 +810,20 @@ struct VolkDeviceTable
 	PFN_vkCreateIndirectCommandsLayoutNV vkCreateIndirectCommandsLayoutNV;
 	PFN_vkDestroyIndirectCommandsLayoutNV vkDestroyIndirectCommandsLayoutNV;
 	PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV;
-#else
-	PFN_vkVoidFunction padding_4c7e4395[6];
 #endif /* defined(VK_NV_device_generated_commands) */
 #if defined(VK_NV_device_generated_commands_compute)
 	PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBufferNV;
 	PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV;
 	PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV;
-#else
-	PFN_vkVoidFunction padding_5195094c[3];
 #endif /* defined(VK_NV_device_generated_commands_compute) */
-#if defined(VK_NV_external_compute_queue)
-	PFN_vkCreateExternalComputeQueueNV vkCreateExternalComputeQueueNV;
-	PFN_vkDestroyExternalComputeQueueNV vkDestroyExternalComputeQueueNV;
-	PFN_vkGetExternalComputeQueueDataNV vkGetExternalComputeQueueDataNV;
-#else
-	PFN_vkVoidFunction padding_4f947e0b[3];
-#endif /* defined(VK_NV_external_compute_queue) */
 #if defined(VK_NV_external_memory_rdma)
 	PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV;
-#else
-	PFN_vkVoidFunction padding_920e405[1];
 #endif /* defined(VK_NV_external_memory_rdma) */
 #if defined(VK_NV_external_memory_win32)
 	PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV;
-#else
-	PFN_vkVoidFunction padding_c13d6f3a[1];
 #endif /* defined(VK_NV_external_memory_win32) */
 #if defined(VK_NV_fragment_shading_rate_enums)
 	PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV;
-#else
-	PFN_vkVoidFunction padding_4979ca14[1];
 #endif /* defined(VK_NV_fragment_shading_rate_enums) */
 #if defined(VK_NV_low_latency2)
 	PFN_vkGetLatencyTimingsNV vkGetLatencyTimingsNV;
@@ -1658,40 +831,22 @@ struct VolkDeviceTable
 	PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV;
 	PFN_vkSetLatencyMarkerNV vkSetLatencyMarkerNV;
 	PFN_vkSetLatencySleepModeNV vkSetLatencySleepModeNV;
-#else
-	PFN_vkVoidFunction padding_fabf8b19[5];
 #endif /* defined(VK_NV_low_latency2) */
 #if defined(VK_NV_memory_decompression)
 	PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV;
 	PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
-#else
-	PFN_vkVoidFunction padding_706009[2];
 #endif /* defined(VK_NV_memory_decompression) */
 #if defined(VK_NV_mesh_shader)
+	PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
 	PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
 	PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
-#else
-	PFN_vkVoidFunction padding_ac232758[2];
 #endif /* defined(VK_NV_mesh_shader) */
-#if defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-	PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
-#else
-	PFN_vkVoidFunction padding_53495be7[1];
-#endif /* defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_NV_optical_flow)
 	PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
 	PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;
 	PFN_vkCreateOpticalFlowSessionNV vkCreateOpticalFlowSessionNV;
 	PFN_vkDestroyOpticalFlowSessionNV vkDestroyOpticalFlowSessionNV;
-#else
-	PFN_vkVoidFunction padding_f67571eb[4];
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_NV_partitioned_acceleration_structure)
-	PFN_vkCmdBuildPartitionedAccelerationStructuresNV vkCmdBuildPartitionedAccelerationStructuresNV;
-	PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV vkGetPartitionedAccelerationStructuresBuildSizesNV;
-#else
-	PFN_vkVoidFunction padding_d27c8c6d[2];
-#endif /* defined(VK_NV_partitioned_acceleration_structure) */
 #if defined(VK_NV_ray_tracing)
 	PFN_vkBindAccelerationStructureMemoryNV vkBindAccelerationStructureMemoryNV;
 	PFN_vkCmdBuildAccelerationStructureNV vkCmdBuildAccelerationStructureNV;
@@ -1705,73 +860,29 @@ struct VolkDeviceTable
 	PFN_vkGetAccelerationStructureHandleNV vkGetAccelerationStructureHandleNV;
 	PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV;
 	PFN_vkGetRayTracingShaderGroupHandlesNV vkGetRayTracingShaderGroupHandlesNV;
-#else
-	PFN_vkVoidFunction padding_feefbeac[12];
 #endif /* defined(VK_NV_ray_tracing) */
 #if defined(VK_NV_scissor_exclusive) && VK_NV_SCISSOR_EXCLUSIVE_SPEC_VERSION >= 2
 	PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV;
-#else
-	PFN_vkVoidFunction padding_e3c24f80[1];
 #endif /* defined(VK_NV_scissor_exclusive) && VK_NV_SCISSOR_EXCLUSIVE_SPEC_VERSION >= 2 */
 #if defined(VK_NV_scissor_exclusive)
 	PFN_vkCmdSetExclusiveScissorNV vkCmdSetExclusiveScissorNV;
-#else
-	PFN_vkVoidFunction padding_8e88d86c[1];
 #endif /* defined(VK_NV_scissor_exclusive) */
 #if defined(VK_NV_shading_rate_image)
 	PFN_vkCmdBindShadingRateImageNV vkCmdBindShadingRateImageNV;
 	PFN_vkCmdSetCoarseSampleOrderNV vkCmdSetCoarseSampleOrderNV;
 	PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV;
-#else
-	PFN_vkVoidFunction padding_92a0767f[3];
 #endif /* defined(VK_NV_shading_rate_image) */
-#if defined(VK_OHOS_external_memory)
-	PFN_vkGetMemoryNativeBufferOHOS vkGetMemoryNativeBufferOHOS;
-	PFN_vkGetNativeBufferPropertiesOHOS vkGetNativeBufferPropertiesOHOS;
-#else
-	PFN_vkVoidFunction padding_9c703846[2];
-#endif /* defined(VK_OHOS_external_memory) */
-#if defined(VK_OHOS_native_buffer)
-	PFN_vkAcquireImageOHOS vkAcquireImageOHOS;
-	PFN_vkGetSwapchainGrallocUsageOHOS vkGetSwapchainGrallocUsageOHOS;
-	PFN_vkQueueSignalReleaseImageOHOS vkQueueSignalReleaseImageOHOS;
-#else
-	PFN_vkVoidFunction padding_a26c9a3d[3];
-#endif /* defined(VK_OHOS_native_buffer) */
-#if defined(VK_QCOM_tile_memory_heap)
-	PFN_vkCmdBindTileMemoryQCOM vkCmdBindTileMemoryQCOM;
-#else
-	PFN_vkVoidFunction padding_e2d55d04[1];
-#endif /* defined(VK_QCOM_tile_memory_heap) */
 #if defined(VK_QCOM_tile_properties)
 	PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM;
 	PFN_vkGetFramebufferTilePropertiesQCOM vkGetFramebufferTilePropertiesQCOM;
-#else
-	PFN_vkVoidFunction padding_be12e32[2];
 #endif /* defined(VK_QCOM_tile_properties) */
-#if defined(VK_QCOM_tile_shading)
-	PFN_vkCmdBeginPerTileExecutionQCOM vkCmdBeginPerTileExecutionQCOM;
-	PFN_vkCmdDispatchTileQCOM vkCmdDispatchTileQCOM;
-	PFN_vkCmdEndPerTileExecutionQCOM vkCmdEndPerTileExecutionQCOM;
-#else
-	PFN_vkVoidFunction padding_fcd9e1df[3];
-#endif /* defined(VK_QCOM_tile_shading) */
 #if defined(VK_QNX_external_memory_screen_buffer)
 	PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX;
-#else
-	PFN_vkVoidFunction padding_1c27735d[1];
 #endif /* defined(VK_QNX_external_memory_screen_buffer) */
 #if defined(VK_VALVE_descriptor_set_host_mapping)
 	PFN_vkGetDescriptorSetHostMappingVALVE vkGetDescriptorSetHostMappingVALVE;
 	PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE;
-#else
-	PFN_vkVoidFunction padding_fd71e4c6[2];
 #endif /* defined(VK_VALVE_descriptor_set_host_mapping) */
-#if (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control))
-	PFN_vkCmdSetDepthClampRangeEXT vkCmdSetDepthClampRangeEXT;
-#else
-	PFN_vkVoidFunction padding_faa18a61[1];
-#endif /* (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control)) */
 #if (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object))
 	PFN_vkCmdBindVertexBuffers2EXT vkCmdBindVertexBuffers2EXT;
 	PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT;
@@ -1785,8 +896,6 @@ struct VolkDeviceTable
 	PFN_vkCmdSetStencilOpEXT vkCmdSetStencilOpEXT;
 	PFN_vkCmdSetStencilTestEnableEXT vkCmdSetStencilTestEnableEXT;
 	PFN_vkCmdSetViewportWithCountEXT vkCmdSetViewportWithCountEXT;
-#else
-	PFN_vkVoidFunction padding_3e8c720f[12];
 #endif /* (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object)) */
 #if (defined(VK_EXT_extended_dynamic_state2)) || (defined(VK_EXT_shader_object))
 	PFN_vkCmdSetDepthBiasEnableEXT vkCmdSetDepthBiasEnableEXT;
@@ -1794,8 +903,6 @@ struct VolkDeviceTable
 	PFN_vkCmdSetPatchControlPointsEXT vkCmdSetPatchControlPointsEXT;
 	PFN_vkCmdSetPrimitiveRestartEnableEXT vkCmdSetPrimitiveRestartEnableEXT;
 	PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT;
-#else
-	PFN_vkVoidFunction padding_b93e02a6[5];
 #endif /* (defined(VK_EXT_extended_dynamic_state2)) || (defined(VK_EXT_shader_object)) */
 #if (defined(VK_EXT_extended_dynamic_state3)) || (defined(VK_EXT_shader_object))
 	PFN_vkCmdSetAlphaToCoverageEnableEXT vkCmdSetAlphaToCoverageEnableEXT;
@@ -1808,362 +915,84 @@ struct VolkDeviceTable
 	PFN_vkCmdSetPolygonModeEXT vkCmdSetPolygonModeEXT;
 	PFN_vkCmdSetRasterizationSamplesEXT vkCmdSetRasterizationSamplesEXT;
 	PFN_vkCmdSetSampleMaskEXT vkCmdSetSampleMaskEXT;
-#else
-	PFN_vkVoidFunction padding_ab566e7e[10];
 #endif /* (defined(VK_EXT_extended_dynamic_state3)) || (defined(VK_EXT_shader_object)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && (defined(VK_KHR_maintenance2) || defined(VK_VERSION_1_1))) || (defined(VK_EXT_shader_object))
 	PFN_vkCmdSetTessellationDomainOriginEXT vkCmdSetTessellationDomainOriginEXT;
-#else
-	PFN_vkVoidFunction padding_6730ed0c[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && (defined(VK_KHR_maintenance2) || defined(VK_VERSION_1_1))) || (defined(VK_EXT_shader_object)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_transform_feedback)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_transform_feedback))
 	PFN_vkCmdSetRasterizationStreamEXT vkCmdSetRasterizationStreamEXT;
-#else
-	PFN_vkVoidFunction padding_d3ebb335[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_transform_feedback)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_transform_feedback)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_conservative_rasterization)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_conservative_rasterization))
 	PFN_vkCmdSetConservativeRasterizationModeEXT vkCmdSetConservativeRasterizationModeEXT;
 	PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT vkCmdSetExtraPrimitiveOverestimationSizeEXT;
-#else
-	PFN_vkVoidFunction padding_a21758f4[2];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_conservative_rasterization)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_conservative_rasterization)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_depth_clip_enable)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clip_enable))
 	PFN_vkCmdSetDepthClipEnableEXT vkCmdSetDepthClipEnableEXT;
-#else
-	PFN_vkVoidFunction padding_a498a838[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_depth_clip_enable)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clip_enable)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_sample_locations)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_sample_locations))
 	PFN_vkCmdSetSampleLocationsEnableEXT vkCmdSetSampleLocationsEnableEXT;
-#else
-	PFN_vkVoidFunction padding_67db38de[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_sample_locations)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_sample_locations)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_blend_operation_advanced)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_blend_operation_advanced))
 	PFN_vkCmdSetColorBlendAdvancedEXT vkCmdSetColorBlendAdvancedEXT;
-#else
-	PFN_vkVoidFunction padding_fbea7481[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_blend_operation_advanced)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_blend_operation_advanced)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_provoking_vertex)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_provoking_vertex))
 	PFN_vkCmdSetProvokingVertexModeEXT vkCmdSetProvokingVertexModeEXT;
-#else
-	PFN_vkVoidFunction padding_3a8ec90e[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_provoking_vertex)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_provoking_vertex)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_line_rasterization)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_line_rasterization))
 	PFN_vkCmdSetLineRasterizationModeEXT vkCmdSetLineRasterizationModeEXT;
 	PFN_vkCmdSetLineStippleEnableEXT vkCmdSetLineStippleEnableEXT;
-#else
-	PFN_vkVoidFunction padding_29cdb756[2];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_line_rasterization)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_line_rasterization)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_depth_clip_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clip_control))
 	PFN_vkCmdSetDepthClipNegativeOneToOneEXT vkCmdSetDepthClipNegativeOneToOneEXT;
-#else
-	PFN_vkVoidFunction padding_815a7240[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_EXT_depth_clip_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clip_control)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_clip_space_w_scaling)) || (defined(VK_EXT_shader_object) && defined(VK_NV_clip_space_w_scaling))
 	PFN_vkCmdSetViewportWScalingEnableNV vkCmdSetViewportWScalingEnableNV;
-#else
-	PFN_vkVoidFunction padding_d1f00511[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_clip_space_w_scaling)) || (defined(VK_EXT_shader_object) && defined(VK_NV_clip_space_w_scaling)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_viewport_swizzle)) || (defined(VK_EXT_shader_object) && defined(VK_NV_viewport_swizzle))
 	PFN_vkCmdSetViewportSwizzleNV vkCmdSetViewportSwizzleNV;
-#else
-	PFN_vkVoidFunction padding_7a73d553[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_viewport_swizzle)) || (defined(VK_EXT_shader_object) && defined(VK_NV_viewport_swizzle)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_fragment_coverage_to_color)) || (defined(VK_EXT_shader_object) && defined(VK_NV_fragment_coverage_to_color))
 	PFN_vkCmdSetCoverageToColorEnableNV vkCmdSetCoverageToColorEnableNV;
 	PFN_vkCmdSetCoverageToColorLocationNV vkCmdSetCoverageToColorLocationNV;
-#else
-	PFN_vkVoidFunction padding_6045fb8c[2];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_fragment_coverage_to_color)) || (defined(VK_EXT_shader_object) && defined(VK_NV_fragment_coverage_to_color)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_framebuffer_mixed_samples)) || (defined(VK_EXT_shader_object) && defined(VK_NV_framebuffer_mixed_samples))
 	PFN_vkCmdSetCoverageModulationModeNV vkCmdSetCoverageModulationModeNV;
 	PFN_vkCmdSetCoverageModulationTableEnableNV vkCmdSetCoverageModulationTableEnableNV;
 	PFN_vkCmdSetCoverageModulationTableNV vkCmdSetCoverageModulationTableNV;
-#else
-	PFN_vkVoidFunction padding_bdc35c80[3];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_framebuffer_mixed_samples)) || (defined(VK_EXT_shader_object) && defined(VK_NV_framebuffer_mixed_samples)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_shading_rate_image)) || (defined(VK_EXT_shader_object) && defined(VK_NV_shading_rate_image))
 	PFN_vkCmdSetShadingRateImageEnableNV vkCmdSetShadingRateImageEnableNV;
-#else
-	PFN_vkVoidFunction padding_9a5cd6e8[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_shading_rate_image)) || (defined(VK_EXT_shader_object) && defined(VK_NV_shading_rate_image)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_representative_fragment_test)) || (defined(VK_EXT_shader_object) && defined(VK_NV_representative_fragment_test))
 	PFN_vkCmdSetRepresentativeFragmentTestEnableNV vkCmdSetRepresentativeFragmentTestEnableNV;
-#else
-	PFN_vkVoidFunction padding_3ee17e96[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_representative_fragment_test)) || (defined(VK_EXT_shader_object) && defined(VK_NV_representative_fragment_test)) */
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode))
 	PFN_vkCmdSetCoverageReductionModeNV vkCmdSetCoverageReductionModeNV;
-#else
-	PFN_vkVoidFunction padding_263d525a[1];
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode)) */
+#if (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1))
+	PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
+#endif /* (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control))
 	PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT;
-#else
-	PFN_vkVoidFunction padding_ecddace1[1];
 #endif /* (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control)) */
 #if (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state))
 	PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT;
-#else
-	PFN_vkVoidFunction padding_d83e1de1[1];
 #endif /* (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state)) */
-#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template)))
+#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template))
 	PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR;
-#else
-	PFN_vkVoidFunction padding_60f8358a[1];
-#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template))) */
+#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 	PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR;
 	PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR;
-#else
-	PFN_vkVoidFunction padding_460290c6[2];
 #endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_swapchain)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 	PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
-#else
-	PFN_vkVoidFunction padding_cffc198[1];
 #endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_swapchain)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
 	/* VOLK_GENERATE_DEVICE_TABLE */
 };
 
 /* VOLK_GENERATE_PROTOTYPES_H */
 #if defined(VK_VERSION_1_0)
-extern PFN_vkCreateDevice vkCreateDevice;
-extern PFN_vkCreateInstance vkCreateInstance;
-extern PFN_vkDestroyInstance vkDestroyInstance;
-extern PFN_vkEnumerateDeviceExtensionProperties vkEnumerateDeviceExtensionProperties;
-extern PFN_vkEnumerateDeviceLayerProperties vkEnumerateDeviceLayerProperties;
-extern PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties;
-extern PFN_vkEnumerateInstanceLayerProperties vkEnumerateInstanceLayerProperties;
-extern PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
-extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr;
-extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;
-extern PFN_vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFeatures;
-extern PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
-extern PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
-extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
-extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
-extern PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties;
-extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties;
-#endif /* defined(VK_VERSION_1_0) */
-#if defined(VK_VERSION_1_1)
-extern PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion;
-extern PFN_vkEnumeratePhysicalDeviceGroups vkEnumeratePhysicalDeviceGroups;
-extern PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBufferProperties;
-extern PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties;
-extern PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties;
-extern PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
-extern PFN_vkGetPhysicalDeviceFormatProperties2 vkGetPhysicalDeviceFormatProperties2;
-extern PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2;
-extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;
-extern PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2;
-extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2 vkGetPhysicalDeviceQueueFamilyProperties2;
-extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2;
-#endif /* defined(VK_VERSION_1_1) */
-#if defined(VK_VERSION_1_3)
-extern PFN_vkGetPhysicalDeviceToolProperties vkGetPhysicalDeviceToolProperties;
-#endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_ARM_data_graph)
-extern PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;
-extern PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_performance_counters_by_region)
-extern PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM;
-#endif /* defined(VK_ARM_performance_counters_by_region) */
-#if defined(VK_ARM_tensors)
-extern PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM vkGetPhysicalDeviceExternalTensorPropertiesARM;
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_EXT_acquire_drm_display)
-extern PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT;
-extern PFN_vkGetDrmDisplayEXT vkGetDrmDisplayEXT;
-#endif /* defined(VK_EXT_acquire_drm_display) */
-#if defined(VK_EXT_acquire_xlib_display)
-extern PFN_vkAcquireXlibDisplayEXT vkAcquireXlibDisplayEXT;
-extern PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT;
-#endif /* defined(VK_EXT_acquire_xlib_display) */
-#if defined(VK_EXT_calibrated_timestamps)
-extern PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
-#endif /* defined(VK_EXT_calibrated_timestamps) */
-#if defined(VK_EXT_debug_report)
-extern PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
-extern PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
-extern PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
-#endif /* defined(VK_EXT_debug_report) */
-#if defined(VK_EXT_debug_utils)
-extern PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT;
-extern PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT;
-extern PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT;
-extern PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
-extern PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
-extern PFN_vkQueueBeginDebugUtilsLabelEXT vkQueueBeginDebugUtilsLabelEXT;
-extern PFN_vkQueueEndDebugUtilsLabelEXT vkQueueEndDebugUtilsLabelEXT;
-extern PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT;
-extern PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
-extern PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
-extern PFN_vkSubmitDebugUtilsMessageEXT vkSubmitDebugUtilsMessageEXT;
-#endif /* defined(VK_EXT_debug_utils) */
-#if defined(VK_EXT_direct_mode_display)
-extern PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT;
-#endif /* defined(VK_EXT_direct_mode_display) */
-#if defined(VK_EXT_directfb_surface)
-extern PFN_vkCreateDirectFBSurfaceEXT vkCreateDirectFBSurfaceEXT;
-extern PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT;
-#endif /* defined(VK_EXT_directfb_surface) */
-#if defined(VK_EXT_display_surface_counter)
-extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT;
-#endif /* defined(VK_EXT_display_surface_counter) */
-#if defined(VK_EXT_full_screen_exclusive)
-extern PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT;
-#endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_headless_surface)
-extern PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT;
-#endif /* defined(VK_EXT_headless_surface) */
-#if defined(VK_EXT_metal_surface)
-extern PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT;
-#endif /* defined(VK_EXT_metal_surface) */
-#if defined(VK_EXT_sample_locations)
-extern PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT;
-#endif /* defined(VK_EXT_sample_locations) */
-#if defined(VK_EXT_tooling_info)
-extern PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT;
-#endif /* defined(VK_EXT_tooling_info) */
-#if defined(VK_FUCHSIA_imagepipe_surface)
-extern PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA;
-#endif /* defined(VK_FUCHSIA_imagepipe_surface) */
-#if defined(VK_GGP_stream_descriptor_surface)
-extern PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP;
-#endif /* defined(VK_GGP_stream_descriptor_surface) */
-#if defined(VK_KHR_android_surface)
-extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
-#endif /* defined(VK_KHR_android_surface) */
-#if defined(VK_KHR_calibrated_timestamps)
-extern PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR;
-#endif /* defined(VK_KHR_calibrated_timestamps) */
-#if defined(VK_KHR_cooperative_matrix)
-extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
-#endif /* defined(VK_KHR_cooperative_matrix) */
-#if defined(VK_KHR_device_group_creation)
-extern PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
-#endif /* defined(VK_KHR_device_group_creation) */
-#if defined(VK_KHR_display)
-extern PFN_vkCreateDisplayModeKHR vkCreateDisplayModeKHR;
-extern PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
-extern PFN_vkGetDisplayModePropertiesKHR vkGetDisplayModePropertiesKHR;
-extern PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
-extern PFN_vkGetDisplayPlaneSupportedDisplaysKHR vkGetDisplayPlaneSupportedDisplaysKHR;
-extern PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
-extern PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vkGetPhysicalDeviceDisplayPropertiesKHR;
-#endif /* defined(VK_KHR_display) */
-#if defined(VK_KHR_external_fence_capabilities)
-extern PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
-#endif /* defined(VK_KHR_external_fence_capabilities) */
-#if defined(VK_KHR_external_memory_capabilities)
-extern PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
-#endif /* defined(VK_KHR_external_memory_capabilities) */
-#if defined(VK_KHR_external_semaphore_capabilities)
-extern PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
-#endif /* defined(VK_KHR_external_semaphore_capabilities) */
-#if defined(VK_KHR_fragment_shading_rate)
-extern PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR;
-#endif /* defined(VK_KHR_fragment_shading_rate) */
-#if defined(VK_KHR_get_display_properties2)
-extern PFN_vkGetDisplayModeProperties2KHR vkGetDisplayModeProperties2KHR;
-extern PFN_vkGetDisplayPlaneCapabilities2KHR vkGetDisplayPlaneCapabilities2KHR;
-extern PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR;
-extern PFN_vkGetPhysicalDeviceDisplayProperties2KHR vkGetPhysicalDeviceDisplayProperties2KHR;
-#endif /* defined(VK_KHR_get_display_properties2) */
-#if defined(VK_KHR_get_physical_device_properties2)
-extern PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
-extern PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
-extern PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2KHR;
-extern PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
-extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
-extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR vkGetPhysicalDeviceQueueFamilyProperties2KHR;
-extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
-#endif /* defined(VK_KHR_get_physical_device_properties2) */
-#if defined(VK_KHR_get_surface_capabilities2)
-extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR;
-extern PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR;
-#endif /* defined(VK_KHR_get_surface_capabilities2) */
-#if defined(VK_KHR_performance_query)
-extern PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR;
-extern PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR;
-#endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_surface)
-extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
-extern PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
-extern PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfaceFormatsKHR;
-extern PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR;
-extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
-#endif /* defined(VK_KHR_surface) */
-#if defined(VK_KHR_video_encode_queue)
-extern PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
-#endif /* defined(VK_KHR_video_encode_queue) */
-#if defined(VK_KHR_video_queue)
-extern PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
-extern PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
-#endif /* defined(VK_KHR_video_queue) */
-#if defined(VK_KHR_wayland_surface)
-extern PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
-#endif /* defined(VK_KHR_wayland_surface) */
-#if defined(VK_KHR_win32_surface)
-extern PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
-extern PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
-#endif /* defined(VK_KHR_win32_surface) */
-#if defined(VK_KHR_xcb_surface)
-extern PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
-#endif /* defined(VK_KHR_xcb_surface) */
-#if defined(VK_KHR_xlib_surface)
-extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
-#endif /* defined(VK_KHR_xlib_surface) */
-#if defined(VK_MVK_ios_surface)
-extern PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK;
-#endif /* defined(VK_MVK_ios_surface) */
-#if defined(VK_MVK_macos_surface)
-extern PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
-#endif /* defined(VK_MVK_macos_surface) */
-#if defined(VK_NN_vi_surface)
-extern PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN;
-#endif /* defined(VK_NN_vi_surface) */
-#if defined(VK_NV_acquire_winrt_display)
-extern PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
-extern PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
-#endif /* defined(VK_NV_acquire_winrt_display) */
-#if defined(VK_NV_cooperative_matrix)
-extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV;
-#endif /* defined(VK_NV_cooperative_matrix) */
-#if defined(VK_NV_cooperative_matrix2)
-extern PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV;
-#endif /* defined(VK_NV_cooperative_matrix2) */
-#if defined(VK_NV_cooperative_vector)
-extern PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV vkGetPhysicalDeviceCooperativeVectorPropertiesNV;
-#endif /* defined(VK_NV_cooperative_vector) */
-#if defined(VK_NV_coverage_reduction_mode)
-extern PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV;
-#endif /* defined(VK_NV_coverage_reduction_mode) */
-#if defined(VK_NV_external_memory_capabilities)
-extern PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
-#endif /* defined(VK_NV_external_memory_capabilities) */
-#if defined(VK_NV_optical_flow)
-extern PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV;
-#endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_OHOS_surface)
-extern PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS;
-#endif /* defined(VK_OHOS_surface) */
-#if defined(VK_QNX_screen_surface)
-extern PFN_vkCreateScreenSurfaceQNX vkCreateScreenSurfaceQNX;
-extern PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX;
-#endif /* defined(VK_QNX_screen_surface) */
-#if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
-extern PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR;
-#endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
-/* VOLK_GENERATE_PROTOTYPES_H */
-
-#ifndef VOLK_NO_DEVICE_PROTOTYPES
-/* VOLK_GENERATE_PROTOTYPES_H_DEVICE */
-#if defined(VK_VERSION_1_0)
 extern PFN_vkAllocateCommandBuffers vkAllocateCommandBuffers;
 extern PFN_vkAllocateDescriptorSets vkAllocateDescriptorSets;
 extern PFN_vkAllocateMemory vkAllocateMemory;
@@ -2220,12 +1049,14 @@ extern PFN_vkCreateCommandPool vkCreateCommandPool;
 extern PFN_vkCreateComputePipelines vkCreateComputePipelines;
 extern PFN_vkCreateDescriptorPool vkCreateDescriptorPool;
 extern PFN_vkCreateDescriptorSetLayout vkCreateDescriptorSetLayout;
+extern PFN_vkCreateDevice vkCreateDevice;
 extern PFN_vkCreateEvent vkCreateEvent;
 extern PFN_vkCreateFence vkCreateFence;
 extern PFN_vkCreateFramebuffer vkCreateFramebuffer;
 extern PFN_vkCreateGraphicsPipelines vkCreateGraphicsPipelines;
 extern PFN_vkCreateImage vkCreateImage;
 extern PFN_vkCreateImageView vkCreateImageView;
+extern PFN_vkCreateInstance vkCreateInstance;
 extern PFN_vkCreatePipelineCache vkCreatePipelineCache;
 extern PFN_vkCreatePipelineLayout vkCreatePipelineLayout;
 extern PFN_vkCreateQueryPool vkCreateQueryPool;
@@ -2244,6 +1075,7 @@ extern PFN_vkDestroyFence vkDestroyFence;
 extern PFN_vkDestroyFramebuffer vkDestroyFramebuffer;
 extern PFN_vkDestroyImage vkDestroyImage;
 extern PFN_vkDestroyImageView vkDestroyImageView;
+extern PFN_vkDestroyInstance vkDestroyInstance;
 extern PFN_vkDestroyPipeline vkDestroyPipeline;
 extern PFN_vkDestroyPipelineCache vkDestroyPipelineCache;
 extern PFN_vkDestroyPipelineLayout vkDestroyPipelineLayout;
@@ -2254,18 +1086,32 @@ extern PFN_vkDestroySemaphore vkDestroySemaphore;
 extern PFN_vkDestroyShaderModule vkDestroyShaderModule;
 extern PFN_vkDeviceWaitIdle vkDeviceWaitIdle;
 extern PFN_vkEndCommandBuffer vkEndCommandBuffer;
+extern PFN_vkEnumerateDeviceExtensionProperties vkEnumerateDeviceExtensionProperties;
+extern PFN_vkEnumerateDeviceLayerProperties vkEnumerateDeviceLayerProperties;
+extern PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties;
+extern PFN_vkEnumerateInstanceLayerProperties vkEnumerateInstanceLayerProperties;
+extern PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
 extern PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges;
 extern PFN_vkFreeCommandBuffers vkFreeCommandBuffers;
 extern PFN_vkFreeDescriptorSets vkFreeDescriptorSets;
 extern PFN_vkFreeMemory vkFreeMemory;
 extern PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements;
 extern PFN_vkGetDeviceMemoryCommitment vkGetDeviceMemoryCommitment;
+extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr;
 extern PFN_vkGetDeviceQueue vkGetDeviceQueue;
 extern PFN_vkGetEventStatus vkGetEventStatus;
 extern PFN_vkGetFenceStatus vkGetFenceStatus;
 extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;
 extern PFN_vkGetImageSparseMemoryRequirements vkGetImageSparseMemoryRequirements;
 extern PFN_vkGetImageSubresourceLayout vkGetImageSubresourceLayout;
+extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;
+extern PFN_vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFeatures;
+extern PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
+extern PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
+extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
+extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
+extern PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties;
+extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties;
 extern PFN_vkGetPipelineCacheData vkGetPipelineCacheData;
 extern PFN_vkGetQueryPoolResults vkGetQueryPoolResults;
 extern PFN_vkGetRenderAreaGranularity vkGetRenderAreaGranularity;
@@ -2294,12 +1140,24 @@ extern PFN_vkCreateDescriptorUpdateTemplate vkCreateDescriptorUpdateTemplate;
 extern PFN_vkCreateSamplerYcbcrConversion vkCreateSamplerYcbcrConversion;
 extern PFN_vkDestroyDescriptorUpdateTemplate vkDestroyDescriptorUpdateTemplate;
 extern PFN_vkDestroySamplerYcbcrConversion vkDestroySamplerYcbcrConversion;
+extern PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion;
+extern PFN_vkEnumeratePhysicalDeviceGroups vkEnumeratePhysicalDeviceGroups;
 extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2;
 extern PFN_vkGetDescriptorSetLayoutSupport vkGetDescriptorSetLayoutSupport;
 extern PFN_vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupPeerMemoryFeatures;
 extern PFN_vkGetDeviceQueue2 vkGetDeviceQueue2;
 extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2;
 extern PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2;
+extern PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBufferProperties;
+extern PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties;
+extern PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties;
+extern PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
+extern PFN_vkGetPhysicalDeviceFormatProperties2 vkGetPhysicalDeviceFormatProperties2;
+extern PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2;
+extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;
+extern PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2;
+extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2 vkGetPhysicalDeviceQueueFamilyProperties2;
+extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2;
 extern PFN_vkTrimCommandPool vkTrimCommandPool;
 extern PFN_vkUpdateDescriptorSetWithTemplate vkUpdateDescriptorSetWithTemplate;
 #endif /* defined(VK_VERSION_1_1) */
@@ -2352,31 +1210,11 @@ extern PFN_vkDestroyPrivateDataSlot vkDestroyPrivateDataSlot;
 extern PFN_vkGetDeviceBufferMemoryRequirements vkGetDeviceBufferMemoryRequirements;
 extern PFN_vkGetDeviceImageMemoryRequirements vkGetDeviceImageMemoryRequirements;
 extern PFN_vkGetDeviceImageSparseMemoryRequirements vkGetDeviceImageSparseMemoryRequirements;
+extern PFN_vkGetPhysicalDeviceToolProperties vkGetPhysicalDeviceToolProperties;
 extern PFN_vkGetPrivateData vkGetPrivateData;
 extern PFN_vkQueueSubmit2 vkQueueSubmit2;
 extern PFN_vkSetPrivateData vkSetPrivateData;
 #endif /* defined(VK_VERSION_1_3) */
-#if defined(VK_VERSION_1_4)
-extern PFN_vkCmdBindDescriptorSets2 vkCmdBindDescriptorSets2;
-extern PFN_vkCmdBindIndexBuffer2 vkCmdBindIndexBuffer2;
-extern PFN_vkCmdPushConstants2 vkCmdPushConstants2;
-extern PFN_vkCmdPushDescriptorSet vkCmdPushDescriptorSet;
-extern PFN_vkCmdPushDescriptorSet2 vkCmdPushDescriptorSet2;
-extern PFN_vkCmdPushDescriptorSetWithTemplate vkCmdPushDescriptorSetWithTemplate;
-extern PFN_vkCmdPushDescriptorSetWithTemplate2 vkCmdPushDescriptorSetWithTemplate2;
-extern PFN_vkCmdSetLineStipple vkCmdSetLineStipple;
-extern PFN_vkCmdSetRenderingAttachmentLocations vkCmdSetRenderingAttachmentLocations;
-extern PFN_vkCmdSetRenderingInputAttachmentIndices vkCmdSetRenderingInputAttachmentIndices;
-extern PFN_vkCopyImageToImage vkCopyImageToImage;
-extern PFN_vkCopyImageToMemory vkCopyImageToMemory;
-extern PFN_vkCopyMemoryToImage vkCopyMemoryToImage;
-extern PFN_vkGetDeviceImageSubresourceLayout vkGetDeviceImageSubresourceLayout;
-extern PFN_vkGetImageSubresourceLayout2 vkGetImageSubresourceLayout2;
-extern PFN_vkGetRenderingAreaGranularity vkGetRenderingAreaGranularity;
-extern PFN_vkMapMemory2 vkMapMemory2;
-extern PFN_vkTransitionImageLayout vkTransitionImageLayout;
-extern PFN_vkUnmapMemory2 vkUnmapMemory2;
-#endif /* defined(VK_VERSION_1_4) */
 #if defined(VK_AMDX_shader_enqueue)
 extern PFN_vkCmdDispatchGraphAMDX vkCmdDispatchGraphAMDX;
 extern PFN_vkCmdDispatchGraphIndirectAMDX vkCmdDispatchGraphIndirectAMDX;
@@ -2386,15 +1224,9 @@ extern PFN_vkCreateExecutionGraphPipelinesAMDX vkCreateExecutionGraphPipelinesAM
 extern PFN_vkGetExecutionGraphPipelineNodeIndexAMDX vkGetExecutionGraphPipelineNodeIndexAMDX;
 extern PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX;
 #endif /* defined(VK_AMDX_shader_enqueue) */
-#if defined(VK_AMD_anti_lag)
-extern PFN_vkAntiLagUpdateAMD vkAntiLagUpdateAMD;
-#endif /* defined(VK_AMD_anti_lag) */
 #if defined(VK_AMD_buffer_marker)
 extern PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD;
 #endif /* defined(VK_AMD_buffer_marker) */
-#if defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-extern PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
-#endif /* defined(VK_AMD_buffer_marker) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_AMD_display_native_hdr)
 extern PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD;
 #endif /* defined(VK_AMD_display_native_hdr) */
@@ -2409,31 +1241,14 @@ extern PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD;
 extern PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID;
 extern PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID;
 #endif /* defined(VK_ANDROID_external_memory_android_hardware_buffer) */
-#if defined(VK_ARM_data_graph)
-extern PFN_vkBindDataGraphPipelineSessionMemoryARM vkBindDataGraphPipelineSessionMemoryARM;
-extern PFN_vkCmdDispatchDataGraphARM vkCmdDispatchDataGraphARM;
-extern PFN_vkCreateDataGraphPipelineSessionARM vkCreateDataGraphPipelineSessionARM;
-extern PFN_vkCreateDataGraphPipelinesARM vkCreateDataGraphPipelinesARM;
-extern PFN_vkDestroyDataGraphPipelineSessionARM vkDestroyDataGraphPipelineSessionARM;
-extern PFN_vkGetDataGraphPipelineAvailablePropertiesARM vkGetDataGraphPipelineAvailablePropertiesARM;
-extern PFN_vkGetDataGraphPipelinePropertiesARM vkGetDataGraphPipelinePropertiesARM;
-extern PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM vkGetDataGraphPipelineSessionBindPointRequirementsARM;
-extern PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM vkGetDataGraphPipelineSessionMemoryRequirementsARM;
-#endif /* defined(VK_ARM_data_graph) */
-#if defined(VK_ARM_tensors)
-extern PFN_vkBindTensorMemoryARM vkBindTensorMemoryARM;
-extern PFN_vkCmdCopyTensorARM vkCmdCopyTensorARM;
-extern PFN_vkCreateTensorARM vkCreateTensorARM;
-extern PFN_vkCreateTensorViewARM vkCreateTensorViewARM;
-extern PFN_vkDestroyTensorARM vkDestroyTensorARM;
-extern PFN_vkDestroyTensorViewARM vkDestroyTensorViewARM;
-extern PFN_vkGetDeviceTensorMemoryRequirementsARM vkGetDeviceTensorMemoryRequirementsARM;
-extern PFN_vkGetTensorMemoryRequirementsARM vkGetTensorMemoryRequirementsARM;
-#endif /* defined(VK_ARM_tensors) */
-#if defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer)
-extern PFN_vkGetTensorOpaqueCaptureDescriptorDataARM vkGetTensorOpaqueCaptureDescriptorDataARM;
-extern PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM vkGetTensorViewOpaqueCaptureDescriptorDataARM;
-#endif /* defined(VK_ARM_tensors) && defined(VK_EXT_descriptor_buffer) */
+#if defined(VK_EXT_acquire_drm_display)
+extern PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT;
+extern PFN_vkGetDrmDisplayEXT vkGetDrmDisplayEXT;
+#endif /* defined(VK_EXT_acquire_drm_display) */
+#if defined(VK_EXT_acquire_xlib_display)
+extern PFN_vkAcquireXlibDisplayEXT vkAcquireXlibDisplayEXT;
+extern PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT;
+#endif /* defined(VK_EXT_acquire_xlib_display) */
 #if defined(VK_EXT_attachment_feedback_loop_dynamic_state)
 extern PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT;
 #endif /* defined(VK_EXT_attachment_feedback_loop_dynamic_state) */
@@ -2442,6 +1257,7 @@ extern PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT;
 #endif /* defined(VK_EXT_buffer_device_address) */
 #if defined(VK_EXT_calibrated_timestamps)
 extern PFN_vkGetCalibratedTimestampsEXT vkGetCalibratedTimestampsEXT;
+extern PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
 #endif /* defined(VK_EXT_calibrated_timestamps) */
 #if defined(VK_EXT_color_write_enable)
 extern PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT;
@@ -2450,9 +1266,6 @@ extern PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT;
 extern PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT;
 extern PFN_vkCmdEndConditionalRenderingEXT vkCmdEndConditionalRenderingEXT;
 #endif /* defined(VK_EXT_conditional_rendering) */
-#if defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3))
-extern PFN_vkCmdBeginCustomResolveEXT vkCmdBeginCustomResolveEXT;
-#endif /* defined(VK_EXT_custom_resolve) && (defined(VK_KHR_dynamic_rendering) || defined(VK_VERSION_1_3)) */
 #if defined(VK_EXT_debug_marker)
 extern PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
 extern PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
@@ -2460,6 +1273,24 @@ extern PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT;
 extern PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT;
 extern PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT;
 #endif /* defined(VK_EXT_debug_marker) */
+#if defined(VK_EXT_debug_report)
+extern PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
+extern PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
+extern PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
+#endif /* defined(VK_EXT_debug_report) */
+#if defined(VK_EXT_debug_utils)
+extern PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT;
+extern PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT;
+extern PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT;
+extern PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
+extern PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
+extern PFN_vkQueueBeginDebugUtilsLabelEXT vkQueueBeginDebugUtilsLabelEXT;
+extern PFN_vkQueueEndDebugUtilsLabelEXT vkQueueEndDebugUtilsLabelEXT;
+extern PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT;
+extern PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
+extern PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
+extern PFN_vkSubmitDebugUtilsMessageEXT vkSubmitDebugUtilsMessageEXT;
+#endif /* defined(VK_EXT_debug_utils) */
 #if defined(VK_EXT_depth_bias_control)
 extern PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT;
 #endif /* defined(VK_EXT_depth_bias_control) */
@@ -2481,17 +1312,13 @@ extern PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAcceler
 #if defined(VK_EXT_device_fault)
 extern PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT;
 #endif /* defined(VK_EXT_device_fault) */
-#if defined(VK_EXT_device_generated_commands)
-extern PFN_vkCmdExecuteGeneratedCommandsEXT vkCmdExecuteGeneratedCommandsEXT;
-extern PFN_vkCmdPreprocessGeneratedCommandsEXT vkCmdPreprocessGeneratedCommandsEXT;
-extern PFN_vkCreateIndirectCommandsLayoutEXT vkCreateIndirectCommandsLayoutEXT;
-extern PFN_vkCreateIndirectExecutionSetEXT vkCreateIndirectExecutionSetEXT;
-extern PFN_vkDestroyIndirectCommandsLayoutEXT vkDestroyIndirectCommandsLayoutEXT;
-extern PFN_vkDestroyIndirectExecutionSetEXT vkDestroyIndirectExecutionSetEXT;
-extern PFN_vkGetGeneratedCommandsMemoryRequirementsEXT vkGetGeneratedCommandsMemoryRequirementsEXT;
-extern PFN_vkUpdateIndirectExecutionSetPipelineEXT vkUpdateIndirectExecutionSetPipelineEXT;
-extern PFN_vkUpdateIndirectExecutionSetShaderEXT vkUpdateIndirectExecutionSetShaderEXT;
-#endif /* defined(VK_EXT_device_generated_commands) */
+#if defined(VK_EXT_direct_mode_display)
+extern PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT;
+#endif /* defined(VK_EXT_direct_mode_display) */
+#if defined(VK_EXT_directfb_surface)
+extern PFN_vkCreateDirectFBSurfaceEXT vkCreateDirectFBSurfaceEXT;
+extern PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT;
+#endif /* defined(VK_EXT_directfb_surface) */
 #if defined(VK_EXT_discard_rectangles)
 extern PFN_vkCmdSetDiscardRectangleEXT vkCmdSetDiscardRectangleEXT;
 #endif /* defined(VK_EXT_discard_rectangles) */
@@ -2505,26 +1332,23 @@ extern PFN_vkGetSwapchainCounterEXT vkGetSwapchainCounterEXT;
 extern PFN_vkRegisterDeviceEventEXT vkRegisterDeviceEventEXT;
 extern PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT;
 #endif /* defined(VK_EXT_display_control) */
+#if defined(VK_EXT_display_surface_counter)
+extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT;
+#endif /* defined(VK_EXT_display_surface_counter) */
 #if defined(VK_EXT_external_memory_host)
 extern PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT;
 #endif /* defined(VK_EXT_external_memory_host) */
-#if defined(VK_EXT_external_memory_metal)
-extern PFN_vkGetMemoryMetalHandleEXT vkGetMemoryMetalHandleEXT;
-extern PFN_vkGetMemoryMetalHandlePropertiesEXT vkGetMemoryMetalHandlePropertiesEXT;
-#endif /* defined(VK_EXT_external_memory_metal) */
-#if defined(VK_EXT_fragment_density_map_offset)
-extern PFN_vkCmdEndRendering2EXT vkCmdEndRendering2EXT;
-#endif /* defined(VK_EXT_fragment_density_map_offset) */
 #if defined(VK_EXT_full_screen_exclusive)
 extern PFN_vkAcquireFullScreenExclusiveModeEXT vkAcquireFullScreenExclusiveModeEXT;
+extern PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT;
 extern PFN_vkReleaseFullScreenExclusiveModeEXT vkReleaseFullScreenExclusiveModeEXT;
 #endif /* defined(VK_EXT_full_screen_exclusive) */
-#if defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1))
-extern PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
-#endif /* defined(VK_EXT_full_screen_exclusive) && (defined(VK_KHR_device_group) || defined(VK_VERSION_1_1)) */
 #if defined(VK_EXT_hdr_metadata)
 extern PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT;
 #endif /* defined(VK_EXT_hdr_metadata) */
+#if defined(VK_EXT_headless_surface)
+extern PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT;
+#endif /* defined(VK_EXT_headless_surface) */
 #if defined(VK_EXT_host_image_copy)
 extern PFN_vkCopyImageToImageEXT vkCopyImageToImageEXT;
 extern PFN_vkCopyImageToMemoryEXT vkCopyImageToMemoryEXT;
@@ -2540,20 +1364,17 @@ extern PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierP
 #if defined(VK_EXT_line_rasterization)
 extern PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT;
 #endif /* defined(VK_EXT_line_rasterization) */
-#if defined(VK_EXT_memory_decompression)
-extern PFN_vkCmdDecompressMemoryEXT vkCmdDecompressMemoryEXT;
-extern PFN_vkCmdDecompressMemoryIndirectCountEXT vkCmdDecompressMemoryIndirectCountEXT;
-#endif /* defined(VK_EXT_memory_decompression) */
 #if defined(VK_EXT_mesh_shader)
 extern PFN_vkCmdDrawMeshTasksEXT vkCmdDrawMeshTasksEXT;
+extern PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
 extern PFN_vkCmdDrawMeshTasksIndirectEXT vkCmdDrawMeshTasksIndirectEXT;
 #endif /* defined(VK_EXT_mesh_shader) */
-#if defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-extern PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT;
-#endif /* defined(VK_EXT_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_EXT_metal_objects)
 extern PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT;
 #endif /* defined(VK_EXT_metal_objects) */
+#if defined(VK_EXT_metal_surface)
+extern PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT;
+#endif /* defined(VK_EXT_metal_surface) */
 #if defined(VK_EXT_multi_draw)
 extern PFN_vkCmdDrawMultiEXT vkCmdDrawMultiEXT;
 extern PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT;
@@ -2580,12 +1401,6 @@ extern PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT;
 #if defined(VK_EXT_pipeline_properties)
 extern PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT;
 #endif /* defined(VK_EXT_pipeline_properties) */
-#if defined(VK_EXT_present_timing)
-extern PFN_vkGetPastPresentationTimingEXT vkGetPastPresentationTimingEXT;
-extern PFN_vkGetSwapchainTimeDomainPropertiesEXT vkGetSwapchainTimeDomainPropertiesEXT;
-extern PFN_vkGetSwapchainTimingPropertiesEXT vkGetSwapchainTimingPropertiesEXT;
-extern PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT;
-#endif /* defined(VK_EXT_present_timing) */
 #if defined(VK_EXT_private_data)
 extern PFN_vkCreatePrivateDataSlotEXT vkCreatePrivateDataSlotEXT;
 extern PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT;
@@ -2594,6 +1409,7 @@ extern PFN_vkSetPrivateDataEXT vkSetPrivateDataEXT;
 #endif /* defined(VK_EXT_private_data) */
 #if defined(VK_EXT_sample_locations)
 extern PFN_vkCmdSetSampleLocationsEXT vkCmdSetSampleLocationsEXT;
+extern PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT;
 #endif /* defined(VK_EXT_sample_locations) */
 #if defined(VK_EXT_shader_module_identifier)
 extern PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT;
@@ -2608,6 +1424,9 @@ extern PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT;
 #if defined(VK_EXT_swapchain_maintenance1)
 extern PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT;
 #endif /* defined(VK_EXT_swapchain_maintenance1) */
+#if defined(VK_EXT_tooling_info)
+extern PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT;
+#endif /* defined(VK_EXT_tooling_info) */
 #if defined(VK_EXT_transform_feedback)
 extern PFN_vkCmdBeginQueryIndexedEXT vkCmdBeginQueryIndexedEXT;
 extern PFN_vkCmdBeginTransformFeedbackEXT vkCmdBeginTransformFeedbackEXT;
@@ -2637,6 +1456,12 @@ extern PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePrope
 extern PFN_vkGetSemaphoreZirconHandleFUCHSIA vkGetSemaphoreZirconHandleFUCHSIA;
 extern PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA;
 #endif /* defined(VK_FUCHSIA_external_semaphore) */
+#if defined(VK_FUCHSIA_imagepipe_surface)
+extern PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA;
+#endif /* defined(VK_FUCHSIA_imagepipe_surface) */
+#if defined(VK_GGP_stream_descriptor_surface)
+extern PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP;
+#endif /* defined(VK_GGP_stream_descriptor_surface) */
 #if defined(VK_GOOGLE_display_timing)
 extern PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
 extern PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
@@ -2648,11 +1473,9 @@ extern PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI;
 #if defined(VK_HUAWEI_invocation_mask)
 extern PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI;
 #endif /* defined(VK_HUAWEI_invocation_mask) */
-#if defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2
-extern PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
-#endif /* defined(VK_HUAWEI_subpass_shading) && VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION >= 2 */
 #if defined(VK_HUAWEI_subpass_shading)
 extern PFN_vkCmdSubpassShadingHUAWEI vkCmdSubpassShadingHUAWEI;
+extern PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
 #endif /* defined(VK_HUAWEI_subpass_shading) */
 #if defined(VK_INTEL_performance_query)
 extern PFN_vkAcquirePerformanceConfigurationINTEL vkAcquirePerformanceConfigurationINTEL;
@@ -2683,6 +1506,9 @@ extern PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructure
 extern PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR;
 extern PFN_vkWriteAccelerationStructuresPropertiesKHR vkWriteAccelerationStructuresPropertiesKHR;
 #endif /* defined(VK_KHR_acceleration_structure) */
+#if defined(VK_KHR_android_surface)
+extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
+#endif /* defined(VK_KHR_android_surface) */
 #if defined(VK_KHR_bind_memory2)
 extern PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR;
 extern PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR;
@@ -2694,7 +1520,11 @@ extern PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptu
 #endif /* defined(VK_KHR_buffer_device_address) */
 #if defined(VK_KHR_calibrated_timestamps)
 extern PFN_vkGetCalibratedTimestampsKHR vkGetCalibratedTimestampsKHR;
+extern PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR;
 #endif /* defined(VK_KHR_calibrated_timestamps) */
+#if defined(VK_KHR_cooperative_matrix)
+extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
+#endif /* defined(VK_KHR_cooperative_matrix) */
 #if defined(VK_KHR_copy_commands2)
 extern PFN_vkCmdBlitImage2KHR vkCmdBlitImage2KHR;
 extern PFN_vkCmdCopyBuffer2KHR vkCmdCopyBuffer2KHR;
@@ -2703,10 +1533,6 @@ extern PFN_vkCmdCopyImage2KHR vkCmdCopyImage2KHR;
 extern PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR;
 extern PFN_vkCmdResolveImage2KHR vkCmdResolveImage2KHR;
 #endif /* defined(VK_KHR_copy_commands2) */
-#if defined(VK_KHR_copy_memory_indirect)
-extern PFN_vkCmdCopyMemoryIndirectKHR vkCmdCopyMemoryIndirectKHR;
-extern PFN_vkCmdCopyMemoryToImageIndirectKHR vkCmdCopyMemoryToImageIndirectKHR;
-#endif /* defined(VK_KHR_copy_memory_indirect) */
 #if defined(VK_KHR_create_renderpass2)
 extern PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR;
 extern PFN_vkCmdEndRenderPass2KHR vkCmdEndRenderPass2KHR;
@@ -2730,6 +1556,18 @@ extern PFN_vkCmdDispatchBaseKHR vkCmdDispatchBaseKHR;
 extern PFN_vkCmdSetDeviceMaskKHR vkCmdSetDeviceMaskKHR;
 extern PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR;
 #endif /* defined(VK_KHR_device_group) */
+#if defined(VK_KHR_device_group_creation)
+extern PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
+#endif /* defined(VK_KHR_device_group_creation) */
+#if defined(VK_KHR_display)
+extern PFN_vkCreateDisplayModeKHR vkCreateDisplayModeKHR;
+extern PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
+extern PFN_vkGetDisplayModePropertiesKHR vkGetDisplayModePropertiesKHR;
+extern PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
+extern PFN_vkGetDisplayPlaneSupportedDisplaysKHR vkGetDisplayPlaneSupportedDisplaysKHR;
+extern PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
+extern PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vkGetPhysicalDeviceDisplayPropertiesKHR;
+#endif /* defined(VK_KHR_display) */
 #if defined(VK_KHR_display_swapchain)
 extern PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
 #endif /* defined(VK_KHR_display_swapchain) */
@@ -2745,6 +1583,9 @@ extern PFN_vkCmdEndRenderingKHR vkCmdEndRenderingKHR;
 extern PFN_vkCmdSetRenderingAttachmentLocationsKHR vkCmdSetRenderingAttachmentLocationsKHR;
 extern PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR;
 #endif /* defined(VK_KHR_dynamic_rendering_local_read) */
+#if defined(VK_KHR_external_fence_capabilities)
+extern PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
+#endif /* defined(VK_KHR_external_fence_capabilities) */
 #if defined(VK_KHR_external_fence_fd)
 extern PFN_vkGetFenceFdKHR vkGetFenceFdKHR;
 extern PFN_vkImportFenceFdKHR vkImportFenceFdKHR;
@@ -2753,6 +1594,9 @@ extern PFN_vkImportFenceFdKHR vkImportFenceFdKHR;
 extern PFN_vkGetFenceWin32HandleKHR vkGetFenceWin32HandleKHR;
 extern PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR;
 #endif /* defined(VK_KHR_external_fence_win32) */
+#if defined(VK_KHR_external_memory_capabilities)
+extern PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
+#endif /* defined(VK_KHR_external_memory_capabilities) */
 #if defined(VK_KHR_external_memory_fd)
 extern PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
 extern PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
@@ -2761,6 +1605,9 @@ extern PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
 extern PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
 extern PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR;
 #endif /* defined(VK_KHR_external_memory_win32) */
+#if defined(VK_KHR_external_semaphore_capabilities)
+extern PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
+#endif /* defined(VK_KHR_external_semaphore_capabilities) */
 #if defined(VK_KHR_external_semaphore_fd)
 extern PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR;
 extern PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR;
@@ -2771,21 +1618,38 @@ extern PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR;
 #endif /* defined(VK_KHR_external_semaphore_win32) */
 #if defined(VK_KHR_fragment_shading_rate)
 extern PFN_vkCmdSetFragmentShadingRateKHR vkCmdSetFragmentShadingRateKHR;
+extern PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR;
 #endif /* defined(VK_KHR_fragment_shading_rate) */
+#if defined(VK_KHR_get_display_properties2)
+extern PFN_vkGetDisplayModeProperties2KHR vkGetDisplayModeProperties2KHR;
+extern PFN_vkGetDisplayPlaneCapabilities2KHR vkGetDisplayPlaneCapabilities2KHR;
+extern PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR;
+extern PFN_vkGetPhysicalDeviceDisplayProperties2KHR vkGetPhysicalDeviceDisplayProperties2KHR;
+#endif /* defined(VK_KHR_get_display_properties2) */
 #if defined(VK_KHR_get_memory_requirements2)
 extern PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
 extern PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
 extern PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR;
 #endif /* defined(VK_KHR_get_memory_requirements2) */
+#if defined(VK_KHR_get_physical_device_properties2)
+extern PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
+extern PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
+extern PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2KHR;
+extern PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
+extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
+extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR vkGetPhysicalDeviceQueueFamilyProperties2KHR;
+extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
+#endif /* defined(VK_KHR_get_physical_device_properties2) */
+#if defined(VK_KHR_get_surface_capabilities2)
+extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR;
+extern PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR;
+#endif /* defined(VK_KHR_get_surface_capabilities2) */
 #if defined(VK_KHR_line_rasterization)
 extern PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR;
 #endif /* defined(VK_KHR_line_rasterization) */
 #if defined(VK_KHR_maintenance1)
 extern PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR;
 #endif /* defined(VK_KHR_maintenance1) */
-#if defined(VK_KHR_maintenance10)
-extern PFN_vkCmdEndRendering2KHR vkCmdEndRendering2KHR;
-#endif /* defined(VK_KHR_maintenance10) */
 #if defined(VK_KHR_maintenance3)
 extern PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR;
 #endif /* defined(VK_KHR_maintenance3) */
@@ -2818,15 +1682,10 @@ extern PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR;
 #endif /* defined(VK_KHR_map_memory2) */
 #if defined(VK_KHR_performance_query)
 extern PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR;
+extern PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR;
+extern PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR;
 extern PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR;
 #endif /* defined(VK_KHR_performance_query) */
-#if defined(VK_KHR_pipeline_binary)
-extern PFN_vkCreatePipelineBinariesKHR vkCreatePipelineBinariesKHR;
-extern PFN_vkDestroyPipelineBinaryKHR vkDestroyPipelineBinaryKHR;
-extern PFN_vkGetPipelineBinaryDataKHR vkGetPipelineBinaryDataKHR;
-extern PFN_vkGetPipelineKeyKHR vkGetPipelineKeyKHR;
-extern PFN_vkReleaseCapturedPipelineDataKHR vkReleaseCapturedPipelineDataKHR;
-#endif /* defined(VK_KHR_pipeline_binary) */
 #if defined(VK_KHR_pipeline_executable_properties)
 extern PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR;
 extern PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR;
@@ -2835,9 +1694,6 @@ extern PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatistic
 #if defined(VK_KHR_present_wait)
 extern PFN_vkWaitForPresentKHR vkWaitForPresentKHR;
 #endif /* defined(VK_KHR_present_wait) */
-#if defined(VK_KHR_present_wait2)
-extern PFN_vkWaitForPresent2KHR vkWaitForPresent2KHR;
-#endif /* defined(VK_KHR_present_wait2) */
 #if defined(VK_KHR_push_descriptor)
 extern PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR;
 #endif /* defined(VK_KHR_push_descriptor) */
@@ -2860,6 +1716,13 @@ extern PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR
 #if defined(VK_KHR_shared_presentable_image)
 extern PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR;
 #endif /* defined(VK_KHR_shared_presentable_image) */
+#if defined(VK_KHR_surface)
+extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
+extern PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
+extern PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfaceFormatsKHR;
+extern PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR;
+extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
+#endif /* defined(VK_KHR_surface) */
 #if defined(VK_KHR_swapchain)
 extern PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR;
 extern PFN_vkCreateSwapchainKHR vkCreateSwapchainKHR;
@@ -2867,9 +1730,6 @@ extern PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
 extern PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
 extern PFN_vkQueuePresentKHR vkQueuePresentKHR;
 #endif /* defined(VK_KHR_swapchain) */
-#if defined(VK_KHR_swapchain_maintenance1)
-extern PFN_vkReleaseSwapchainImagesKHR vkReleaseSwapchainImagesKHR;
-#endif /* defined(VK_KHR_swapchain_maintenance1) */
 #if defined(VK_KHR_synchronization2)
 extern PFN_vkCmdPipelineBarrier2KHR vkCmdPipelineBarrier2KHR;
 extern PFN_vkCmdResetEvent2KHR vkCmdResetEvent2KHR;
@@ -2878,6 +1738,12 @@ extern PFN_vkCmdWaitEvents2KHR vkCmdWaitEvents2KHR;
 extern PFN_vkCmdWriteTimestamp2KHR vkCmdWriteTimestamp2KHR;
 extern PFN_vkQueueSubmit2KHR vkQueueSubmit2KHR;
 #endif /* defined(VK_KHR_synchronization2) */
+#if defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker)
+extern PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_AMD_buffer_marker) */
+#if defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints)
+extern PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
+#endif /* defined(VK_KHR_synchronization2) && defined(VK_NV_device_diagnostic_checkpoints) */
 #if defined(VK_KHR_timeline_semaphore)
 extern PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR;
 extern PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR;
@@ -2889,6 +1755,7 @@ extern PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
 #if defined(VK_KHR_video_encode_queue)
 extern PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR;
 extern PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR;
+extern PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
 #endif /* defined(VK_KHR_video_encode_queue) */
 #if defined(VK_KHR_video_queue)
 extern PFN_vkBindVideoSessionMemoryKHR vkBindVideoSessionMemoryKHR;
@@ -2899,9 +1766,36 @@ extern PFN_vkCreateVideoSessionKHR vkCreateVideoSessionKHR;
 extern PFN_vkCreateVideoSessionParametersKHR vkCreateVideoSessionParametersKHR;
 extern PFN_vkDestroyVideoSessionKHR vkDestroyVideoSessionKHR;
 extern PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParametersKHR;
+extern PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR vkGetPhysicalDeviceVideoCapabilitiesKHR;
+extern PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR;
 extern PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR;
 extern PFN_vkUpdateVideoSessionParametersKHR vkUpdateVideoSessionParametersKHR;
 #endif /* defined(VK_KHR_video_queue) */
+#if defined(VK_KHR_wayland_surface)
+extern PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
+#endif /* defined(VK_KHR_wayland_surface) */
+#if defined(VK_KHR_win32_surface)
+extern PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
+extern PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
+#endif /* defined(VK_KHR_win32_surface) */
+#if defined(VK_KHR_xcb_surface)
+extern PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
+#endif /* defined(VK_KHR_xcb_surface) */
+#if defined(VK_KHR_xlib_surface)
+extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
+#endif /* defined(VK_KHR_xlib_surface) */
+#if defined(VK_MVK_ios_surface)
+extern PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK;
+#endif /* defined(VK_MVK_ios_surface) */
+#if defined(VK_MVK_macos_surface)
+extern PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
+#endif /* defined(VK_MVK_macos_surface) */
+#if defined(VK_NN_vi_surface)
+extern PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN;
+#endif /* defined(VK_NN_vi_surface) */
 #if defined(VK_NVX_binary_import)
 extern PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX;
 extern PFN_vkCreateCuFunctionNVX vkCreateCuFunctionNVX;
@@ -2910,29 +1804,26 @@ extern PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX;
 extern PFN_vkDestroyCuModuleNVX vkDestroyCuModuleNVX;
 #endif /* defined(VK_NVX_binary_import) */
 #if defined(VK_NVX_image_view_handle)
+extern PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
 extern PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX;
 #endif /* defined(VK_NVX_image_view_handle) */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3
-extern PFN_vkGetImageViewHandle64NVX vkGetImageViewHandle64NVX;
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 3 */
-#if defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2
-extern PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
-#endif /* defined(VK_NVX_image_view_handle) && VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION >= 2 */
+#if defined(VK_NV_acquire_winrt_display)
+extern PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV;
+extern PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV;
+#endif /* defined(VK_NV_acquire_winrt_display) */
 #if defined(VK_NV_clip_space_w_scaling)
 extern PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV;
 #endif /* defined(VK_NV_clip_space_w_scaling) */
-#if defined(VK_NV_cluster_acceleration_structure)
-extern PFN_vkCmdBuildClusterAccelerationStructureIndirectNV vkCmdBuildClusterAccelerationStructureIndirectNV;
-extern PFN_vkGetClusterAccelerationStructureBuildSizesNV vkGetClusterAccelerationStructureBuildSizesNV;
-#endif /* defined(VK_NV_cluster_acceleration_structure) */
-#if defined(VK_NV_cooperative_vector)
-extern PFN_vkCmdConvertCooperativeVectorMatrixNV vkCmdConvertCooperativeVectorMatrixNV;
-extern PFN_vkConvertCooperativeVectorMatrixNV vkConvertCooperativeVectorMatrixNV;
-#endif /* defined(VK_NV_cooperative_vector) */
+#if defined(VK_NV_cooperative_matrix)
+extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV;
+#endif /* defined(VK_NV_cooperative_matrix) */
 #if defined(VK_NV_copy_memory_indirect)
 extern PFN_vkCmdCopyMemoryIndirectNV vkCmdCopyMemoryIndirectNV;
 extern PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV;
 #endif /* defined(VK_NV_copy_memory_indirect) */
+#if defined(VK_NV_coverage_reduction_mode)
+extern PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV;
+#endif /* defined(VK_NV_coverage_reduction_mode) */
 #if defined(VK_NV_cuda_kernel_launch)
 extern PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV;
 extern PFN_vkCreateCudaFunctionNV vkCreateCudaFunctionNV;
@@ -2945,9 +1836,6 @@ extern PFN_vkGetCudaModuleCacheNV vkGetCudaModuleCacheNV;
 extern PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV;
 extern PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV;
 #endif /* defined(VK_NV_device_diagnostic_checkpoints) */
-#if defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2))
-extern PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV;
-#endif /* defined(VK_NV_device_diagnostic_checkpoints) && (defined(VK_VERSION_1_3) || defined(VK_KHR_synchronization2)) */
 #if defined(VK_NV_device_generated_commands)
 extern PFN_vkCmdBindPipelineShaderGroupNV vkCmdBindPipelineShaderGroupNV;
 extern PFN_vkCmdExecuteGeneratedCommandsNV vkCmdExecuteGeneratedCommandsNV;
@@ -2961,11 +1849,9 @@ extern PFN_vkCmdUpdatePipelineIndirectBufferNV vkCmdUpdatePipelineIndirectBuffer
 extern PFN_vkGetPipelineIndirectDeviceAddressNV vkGetPipelineIndirectDeviceAddressNV;
 extern PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV;
 #endif /* defined(VK_NV_device_generated_commands_compute) */
-#if defined(VK_NV_external_compute_queue)
-extern PFN_vkCreateExternalComputeQueueNV vkCreateExternalComputeQueueNV;
-extern PFN_vkDestroyExternalComputeQueueNV vkDestroyExternalComputeQueueNV;
-extern PFN_vkGetExternalComputeQueueDataNV vkGetExternalComputeQueueDataNV;
-#endif /* defined(VK_NV_external_compute_queue) */
+#if defined(VK_NV_external_memory_capabilities)
+extern PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
+#endif /* defined(VK_NV_external_memory_capabilities) */
 #if defined(VK_NV_external_memory_rdma)
 extern PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV;
 #endif /* defined(VK_NV_external_memory_rdma) */
@@ -2987,22 +1873,17 @@ extern PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCou
 extern PFN_vkCmdDecompressMemoryNV vkCmdDecompressMemoryNV;
 #endif /* defined(VK_NV_memory_decompression) */
 #if defined(VK_NV_mesh_shader)
+extern PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
 extern PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV;
 extern PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV;
 #endif /* defined(VK_NV_mesh_shader) */
-#if defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count))
-extern PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV;
-#endif /* defined(VK_NV_mesh_shader) && (defined(VK_VERSION_1_2) || defined(VK_KHR_draw_indirect_count) || defined(VK_AMD_draw_indirect_count)) */
 #if defined(VK_NV_optical_flow)
 extern PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV;
 extern PFN_vkCmdOpticalFlowExecuteNV vkCmdOpticalFlowExecuteNV;
 extern PFN_vkCreateOpticalFlowSessionNV vkCreateOpticalFlowSessionNV;
 extern PFN_vkDestroyOpticalFlowSessionNV vkDestroyOpticalFlowSessionNV;
+extern PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV;
 #endif /* defined(VK_NV_optical_flow) */
-#if defined(VK_NV_partitioned_acceleration_structure)
-extern PFN_vkCmdBuildPartitionedAccelerationStructuresNV vkCmdBuildPartitionedAccelerationStructuresNV;
-extern PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV vkGetPartitionedAccelerationStructuresBuildSizesNV;
-#endif /* defined(VK_NV_partitioned_acceleration_structure) */
 #if defined(VK_NV_ray_tracing)
 extern PFN_vkBindAccelerationStructureMemoryNV vkBindAccelerationStructureMemoryNV;
 extern PFN_vkCmdBuildAccelerationStructureNV vkCmdBuildAccelerationStructureNV;
@@ -3028,37 +1909,21 @@ extern PFN_vkCmdBindShadingRateImageNV vkCmdBindShadingRateImageNV;
 extern PFN_vkCmdSetCoarseSampleOrderNV vkCmdSetCoarseSampleOrderNV;
 extern PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV;
 #endif /* defined(VK_NV_shading_rate_image) */
-#if defined(VK_OHOS_external_memory)
-extern PFN_vkGetMemoryNativeBufferOHOS vkGetMemoryNativeBufferOHOS;
-extern PFN_vkGetNativeBufferPropertiesOHOS vkGetNativeBufferPropertiesOHOS;
-#endif /* defined(VK_OHOS_external_memory) */
-#if defined(VK_OHOS_native_buffer)
-extern PFN_vkAcquireImageOHOS vkAcquireImageOHOS;
-extern PFN_vkGetSwapchainGrallocUsageOHOS vkGetSwapchainGrallocUsageOHOS;
-extern PFN_vkQueueSignalReleaseImageOHOS vkQueueSignalReleaseImageOHOS;
-#endif /* defined(VK_OHOS_native_buffer) */
-#if defined(VK_QCOM_tile_memory_heap)
-extern PFN_vkCmdBindTileMemoryQCOM vkCmdBindTileMemoryQCOM;
-#endif /* defined(VK_QCOM_tile_memory_heap) */
 #if defined(VK_QCOM_tile_properties)
 extern PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM;
 extern PFN_vkGetFramebufferTilePropertiesQCOM vkGetFramebufferTilePropertiesQCOM;
 #endif /* defined(VK_QCOM_tile_properties) */
-#if defined(VK_QCOM_tile_shading)
-extern PFN_vkCmdBeginPerTileExecutionQCOM vkCmdBeginPerTileExecutionQCOM;
-extern PFN_vkCmdDispatchTileQCOM vkCmdDispatchTileQCOM;
-extern PFN_vkCmdEndPerTileExecutionQCOM vkCmdEndPerTileExecutionQCOM;
-#endif /* defined(VK_QCOM_tile_shading) */
 #if defined(VK_QNX_external_memory_screen_buffer)
 extern PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX;
 #endif /* defined(VK_QNX_external_memory_screen_buffer) */
+#if defined(VK_QNX_screen_surface)
+extern PFN_vkCreateScreenSurfaceQNX vkCreateScreenSurfaceQNX;
+extern PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX;
+#endif /* defined(VK_QNX_screen_surface) */
 #if defined(VK_VALVE_descriptor_set_host_mapping)
 extern PFN_vkGetDescriptorSetHostMappingVALVE vkGetDescriptorSetHostMappingVALVE;
 extern PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE;
 #endif /* defined(VK_VALVE_descriptor_set_host_mapping) */
-#if (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control))
-extern PFN_vkCmdSetDepthClampRangeEXT vkCmdSetDepthClampRangeEXT;
-#endif /* (defined(VK_EXT_depth_clamp_control)) || (defined(VK_EXT_shader_object) && defined(VK_EXT_depth_clamp_control)) */
 #if (defined(VK_EXT_extended_dynamic_state)) || (defined(VK_EXT_shader_object))
 extern PFN_vkCmdBindVertexBuffers2EXT vkCmdBindVertexBuffers2EXT;
 extern PFN_vkCmdSetCullModeEXT vkCmdSetCullModeEXT;
@@ -3145,35 +2010,34 @@ extern PFN_vkCmdSetRepresentativeFragmentTestEnableNV vkCmdSetRepresentativeFrag
 #if (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode))
 extern PFN_vkCmdSetCoverageReductionModeNV vkCmdSetCoverageReductionModeNV;
 #endif /* (defined(VK_EXT_extended_dynamic_state3) && defined(VK_NV_coverage_reduction_mode)) || (defined(VK_EXT_shader_object) && defined(VK_NV_coverage_reduction_mode)) */
+#if (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1))
+extern PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT;
+#endif /* (defined(VK_EXT_full_screen_exclusive) && defined(VK_KHR_device_group)) || (defined(VK_EXT_full_screen_exclusive) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control))
 extern PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT;
 #endif /* (defined(VK_EXT_host_image_copy)) || (defined(VK_EXT_image_compression_control)) */
 #if (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state))
 extern PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT;
 #endif /* (defined(VK_EXT_shader_object)) || (defined(VK_EXT_vertex_input_dynamic_state)) */
-#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template)))
+#if (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template))
 extern PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR;
-#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && (defined(VK_VERSION_1_1) || defined(VK_KHR_descriptor_update_template))) */
+#endif /* (defined(VK_KHR_descriptor_update_template) && defined(VK_KHR_push_descriptor)) || (defined(VK_KHR_push_descriptor) && defined(VK_VERSION_1_1)) || (defined(VK_KHR_push_descriptor) && defined(VK_KHR_descriptor_update_template)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 extern PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR;
 extern PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR;
+extern PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR;
 #endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_surface)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
 #if (defined(VK_KHR_device_group) && defined(VK_KHR_swapchain)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1))
 extern PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 #endif /* (defined(VK_KHR_device_group) && defined(VK_KHR_swapchain)) || (defined(VK_KHR_swapchain) && defined(VK_VERSION_1_1)) */
-/* VOLK_GENERATE_PROTOTYPES_H_DEVICE */
-#endif
+/* VOLK_GENERATE_PROTOTYPES_H */
 
 #ifdef __cplusplus
-} // extern "C" / namespace volk
+}
 #endif
 
-#ifdef VOLK_NAMESPACE
-using namespace volk;
 #endif
 
-#endif // VOLK_H
-
 #ifdef VOLK_IMPLEMENTATION
 #undef VOLK_IMPLEMENTATION
 /* Prevent tools like dependency checkers from detecting a cyclic dependency */
@@ -3182,7 +2046,7 @@ using namespace volk;
 #endif
 
 /**
- * Copyright (c) 2018-2025 Arseny Kapoulkine
+ * Copyright (c) 2018-2024 Arseny Kapoulkine
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std.h
index 932d0f66..8ce283e8 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -22,27 +22,27 @@ extern "C" {
 // vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_av1std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_AV1_NUM_REF_FRAMES      8U
-#define STD_VIDEO_AV1_REFS_PER_FRAME      7U
-#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8U
-#define STD_VIDEO_AV1_MAX_TILE_COLS       64U
-#define STD_VIDEO_AV1_MAX_TILE_ROWS       64U
-#define STD_VIDEO_AV1_MAX_SEGMENTS        8U
-#define STD_VIDEO_AV1_SEG_LVL_MAX         8U
-#define STD_VIDEO_AV1_PRIMARY_REF_NONE    7U
-#define STD_VIDEO_AV1_SELECT_INTEGER_MV   2U
-#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2U
-#define STD_VIDEO_AV1_SKIP_MODE_FRAMES    2U
-#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4U
-#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2U
-#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8U
-#define STD_VIDEO_AV1_MAX_NUM_PLANES      3U
-#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6U
-#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS    14U
-#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS   10U
-#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS   10U
-#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA    24U
-#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA  25U
+#define STD_VIDEO_AV1_NUM_REF_FRAMES      8
+#define STD_VIDEO_AV1_REFS_PER_FRAME      7
+#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8
+#define STD_VIDEO_AV1_MAX_TILE_COLS       64
+#define STD_VIDEO_AV1_MAX_TILE_ROWS       64
+#define STD_VIDEO_AV1_MAX_SEGMENTS        8
+#define STD_VIDEO_AV1_SEG_LVL_MAX         8
+#define STD_VIDEO_AV1_PRIMARY_REF_NONE    7
+#define STD_VIDEO_AV1_SELECT_INTEGER_MV   2
+#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2
+#define STD_VIDEO_AV1_SKIP_MODE_FRAMES    2
+#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4
+#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2
+#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8
+#define STD_VIDEO_AV1_MAX_NUM_PLANES      3
+#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6
+#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS    14
+#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS   10
+#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS   10
+#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA    24
+#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA  25
 
 typedef enum StdVideoAV1Profile {
     STD_VIDEO_AV1_PROFILE_MAIN = 0,
@@ -132,7 +132,7 @@ typedef enum StdVideoAV1FrameRestorationType {
 
 typedef enum StdVideoAV1ColorPrimaries {
     STD_VIDEO_AV1_COLOR_PRIMARIES_BT_709 = 1,
-    STD_VIDEO_AV1_COLOR_PRIMARIES_UNSPECIFIED = 2,
+    STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = 2,
     STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_M = 4,
     STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_B_G = 5,
     STD_VIDEO_AV1_COLOR_PRIMARIES_BT_601 = 6,
@@ -144,8 +144,6 @@ typedef enum StdVideoAV1ColorPrimaries {
     STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432 = 12,
     STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213 = 22,
     STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID = 0x7FFFFFFF,
-  // STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED is a legacy alias
-    STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = STD_VIDEO_AV1_COLOR_PRIMARIES_UNSPECIFIED,
     STD_VIDEO_AV1_COLOR_PRIMARIES_MAX_ENUM = 0x7FFFFFFF
 } StdVideoAV1ColorPrimaries;
 
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h
index 522628e8..6b8130cd 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h
deleted file mode 100644
index ca5f6f47..00000000
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#ifndef VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_
-#define VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ 1
-
-/*
-** Copyright 2015-2025 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-/*
-** This header is generated from the Khronos Vulkan XML API Registry.
-**
-*/
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-// vulkan_video_codec_av1std_encode is a preprocessor guard. Do not pass it to API calls.
-#define vulkan_video_codec_av1std_encode 1
-#include "vulkan_video_codec_av1std.h"
-
-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_ENCODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)
-
-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_ENCODE_API_VERSION_1_0_0
-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_ENCODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_encode"
-typedef struct StdVideoEncodeAV1DecoderModelInfo {
-    uint8_t     buffer_delay_length_minus_1;
-    uint8_t     buffer_removal_time_length_minus_1;
-    uint8_t     frame_presentation_time_length_minus_1;
-    uint8_t     reserved1;
-    uint32_t    num_units_in_decoding_tick;
-} StdVideoEncodeAV1DecoderModelInfo;
-
-typedef struct StdVideoEncodeAV1ExtensionHeader {
-    uint8_t    temporal_id;
-    uint8_t    spatial_id;
-} StdVideoEncodeAV1ExtensionHeader;
-
-typedef struct StdVideoEncodeAV1OperatingPointInfoFlags {
-    uint32_t    decoder_model_present_for_this_op : 1;
-    uint32_t    low_delay_mode_flag : 1;
-    uint32_t    initial_display_delay_present_for_this_op : 1;
-    uint32_t    reserved : 29;
-} StdVideoEncodeAV1OperatingPointInfoFlags;
-
-typedef struct StdVideoEncodeAV1OperatingPointInfo {
-    StdVideoEncodeAV1OperatingPointInfoFlags    flags;
-    uint16_t                                    operating_point_idc;
-    uint8_t                                     seq_level_idx;
-    uint8_t                                     seq_tier;
-    uint32_t                                    decoder_buffer_delay;
-    uint32_t                                    encoder_buffer_delay;
-    uint8_t                                     initial_display_delay_minus_1;
-} StdVideoEncodeAV1OperatingPointInfo;
-
-typedef struct StdVideoEncodeAV1PictureInfoFlags {
-    uint32_t    error_resilient_mode : 1;
-    uint32_t    disable_cdf_update : 1;
-    uint32_t    use_superres : 1;
-    uint32_t    render_and_frame_size_different : 1;
-    uint32_t    allow_screen_content_tools : 1;
-    uint32_t    is_filter_switchable : 1;
-    uint32_t    force_integer_mv : 1;
-    uint32_t    frame_size_override_flag : 1;
-    uint32_t    buffer_removal_time_present_flag : 1;
-    uint32_t    allow_intrabc : 1;
-    uint32_t    frame_refs_short_signaling : 1;
-    uint32_t    allow_high_precision_mv : 1;
-    uint32_t    is_motion_mode_switchable : 1;
-    uint32_t    use_ref_frame_mvs : 1;
-    uint32_t    disable_frame_end_update_cdf : 1;
-    uint32_t    allow_warped_motion : 1;
-    uint32_t    reduced_tx_set : 1;
-    uint32_t    skip_mode_present : 1;
-    uint32_t    delta_q_present : 1;
-    uint32_t    delta_lf_present : 1;
-    uint32_t    delta_lf_multi : 1;
-    uint32_t    segmentation_enabled : 1;
-    uint32_t    segmentation_update_map : 1;
-    uint32_t    segmentation_temporal_update : 1;
-    uint32_t    segmentation_update_data : 1;
-    uint32_t    UsesLr : 1;
-    uint32_t    usesChromaLr : 1;
-    uint32_t    show_frame : 1;
-    uint32_t    showable_frame : 1;
-    uint32_t    reserved : 3;
-} StdVideoEncodeAV1PictureInfoFlags;
-
-typedef struct StdVideoEncodeAV1PictureInfo {
-    StdVideoEncodeAV1PictureInfoFlags          flags;
-    StdVideoAV1FrameType                       frame_type;
-    uint32_t                                   frame_presentation_time;
-    uint32_t                                   current_frame_id;
-    uint8_t                                    order_hint;
-    uint8_t                                    primary_ref_frame;
-    uint8_t                                    refresh_frame_flags;
-    uint8_t                                    coded_denom;
-    uint16_t                                   render_width_minus_1;
-    uint16_t                                   render_height_minus_1;
-    StdVideoAV1InterpolationFilter             interpolation_filter;
-    StdVideoAV1TxMode                          TxMode;
-    uint8_t                                    delta_q_res;
-    uint8_t                                    delta_lf_res;
-    uint8_t                                    ref_order_hint[STD_VIDEO_AV1_NUM_REF_FRAMES];
-    int8_t                                     ref_frame_idx[STD_VIDEO_AV1_REFS_PER_FRAME];
-    uint8_t                                    reserved1[3];
-    uint32_t                                   delta_frame_id_minus_1[STD_VIDEO_AV1_REFS_PER_FRAME];
-    const StdVideoAV1TileInfo*                 pTileInfo;
-    const StdVideoAV1Quantization*             pQuantization;
-    const StdVideoAV1Segmentation*             pSegmentation;
-    const StdVideoAV1LoopFilter*               pLoopFilter;
-    const StdVideoAV1CDEF*                     pCDEF;
-    const StdVideoAV1LoopRestoration*          pLoopRestoration;
-    const StdVideoAV1GlobalMotion*             pGlobalMotion;
-    const StdVideoEncodeAV1ExtensionHeader*    pExtensionHeader;
-    const uint32_t*                            pBufferRemovalTimes;
-} StdVideoEncodeAV1PictureInfo;
-
-typedef struct StdVideoEncodeAV1ReferenceInfoFlags {
-    uint32_t    disable_frame_end_update_cdf : 1;
-    uint32_t    segmentation_enabled : 1;
-    uint32_t    reserved : 30;
-} StdVideoEncodeAV1ReferenceInfoFlags;
-
-typedef struct StdVideoEncodeAV1ReferenceInfo {
-    StdVideoEncodeAV1ReferenceInfoFlags        flags;
-    uint32_t                                   RefFrameId;
-    StdVideoAV1FrameType                       frame_type;
-    uint8_t                                    OrderHint;
-    uint8_t                                    reserved1[3];
-    const StdVideoEncodeAV1ExtensionHeader*    pExtensionHeader;
-} StdVideoEncodeAV1ReferenceInfo;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h
index 7e8da7d2..6d27af37 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H264STD_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -22,14 +22,14 @@ extern "C" {
 // vulkan_video_codec_h264std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_h264std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE  32U
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6U
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16U
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6U
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64U
-#define STD_VIDEO_H264_MAX_NUM_LIST_REF   32U
-#define STD_VIDEO_H264_MAX_CHROMA_PLANES  2U
-#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFFU
+#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE  32
+#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6
+#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16
+#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6
+#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64
+#define STD_VIDEO_H264_MAX_NUM_LIST_REF   32
+#define STD_VIDEO_H264_MAX_CHROMA_PLANES  2
+#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFF
 
 typedef enum StdVideoH264ChromaFormatIdc {
     STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0,
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
index 01facd73..439cb885 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -27,7 +27,7 @@ extern "C" {
 
 #define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_1_0_0
 #define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_decode"
-#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2U
+#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2
 
 typedef enum StdVideoDecodeH264FieldOrderCount {
     STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP = 0,
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
index 410b1b25..9e24aa5d 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std.h
index 20e97e39..d0a1bacb 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H265STD_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -22,29 +22,29 @@ extern "C" {
 // vulkan_video_codec_h265std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_h265std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE  32U
-#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7U
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16U
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2U
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21U
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3U
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128U
-#define STD_VIDEO_H265_MAX_NUM_LIST_REF   15U
-#define STD_VIDEO_H265_MAX_CHROMA_PLANES  2U
-#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64U
-#define STD_VIDEO_H265_MAX_DPB_SIZE       16U
-#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32U
-#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16U
-#define STD_VIDEO_H265_MAX_DELTA_POC      48U
-#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFFU
+#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE  32
+#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7
+#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16
+#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2
+#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21
+#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3
+#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128
+#define STD_VIDEO_H265_MAX_NUM_LIST_REF   15
+#define STD_VIDEO_H265_MAX_CHROMA_PLANES  2
+#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64
+#define STD_VIDEO_H265_MAX_DPB_SIZE       16
+#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32
+#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16
+#define STD_VIDEO_H265_MAX_DELTA_POC      48
+#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFF
 
 typedef enum StdVideoH265ChromaFormatIdc {
     STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME = 0,
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
index a2ddcaa4..0178793e 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -27,7 +27,7 @@ extern "C" {
 
 #define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_API_VERSION_1_0_0
 #define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265_decode"
-#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8U
+#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8
 typedef struct StdVideoDecodeH265PictureInfoFlags {
     uint32_t    IrapPicFlag : 1;
     uint32_t    IdrPicFlag  : 1;
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
index fe2f28d5..ee34491f 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std.h
deleted file mode 100644
index 3d10e39d..00000000
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#ifndef VULKAN_VIDEO_CODEC_VP9STD_H_
-#define VULKAN_VIDEO_CODEC_VP9STD_H_ 1
-
-/*
-** Copyright 2015-2025 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-/*
-** This header is generated from the Khronos Vulkan XML API Registry.
-**
-*/
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-// vulkan_video_codec_vp9std is a preprocessor guard. Do not pass it to API calls.
-#define vulkan_video_codec_vp9std 1
-#include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_VP9_NUM_REF_FRAMES      8U
-#define STD_VIDEO_VP9_REFS_PER_FRAME      3U
-#define STD_VIDEO_VP9_MAX_REF_FRAMES      4U
-#define STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS 2U
-#define STD_VIDEO_VP9_MAX_SEGMENTS        8U
-#define STD_VIDEO_VP9_SEG_LVL_MAX         4U
-#define STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS 7U
-#define STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB 3U
-
-typedef enum StdVideoVP9Profile {
-    STD_VIDEO_VP9_PROFILE_0 = 0,
-    STD_VIDEO_VP9_PROFILE_1 = 1,
-    STD_VIDEO_VP9_PROFILE_2 = 2,
-    STD_VIDEO_VP9_PROFILE_3 = 3,
-    STD_VIDEO_VP9_PROFILE_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_PROFILE_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9Profile;
-
-typedef enum StdVideoVP9Level {
-    STD_VIDEO_VP9_LEVEL_1_0 = 0,
-    STD_VIDEO_VP9_LEVEL_1_1 = 1,
-    STD_VIDEO_VP9_LEVEL_2_0 = 2,
-    STD_VIDEO_VP9_LEVEL_2_1 = 3,
-    STD_VIDEO_VP9_LEVEL_3_0 = 4,
-    STD_VIDEO_VP9_LEVEL_3_1 = 5,
-    STD_VIDEO_VP9_LEVEL_4_0 = 6,
-    STD_VIDEO_VP9_LEVEL_4_1 = 7,
-    STD_VIDEO_VP9_LEVEL_5_0 = 8,
-    STD_VIDEO_VP9_LEVEL_5_1 = 9,
-    STD_VIDEO_VP9_LEVEL_5_2 = 10,
-    STD_VIDEO_VP9_LEVEL_6_0 = 11,
-    STD_VIDEO_VP9_LEVEL_6_1 = 12,
-    STD_VIDEO_VP9_LEVEL_6_2 = 13,
-    STD_VIDEO_VP9_LEVEL_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_LEVEL_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9Level;
-
-typedef enum StdVideoVP9FrameType {
-    STD_VIDEO_VP9_FRAME_TYPE_KEY = 0,
-    STD_VIDEO_VP9_FRAME_TYPE_NON_KEY = 1,
-    STD_VIDEO_VP9_FRAME_TYPE_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_FRAME_TYPE_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9FrameType;
-
-typedef enum StdVideoVP9ReferenceName {
-    STD_VIDEO_VP9_REFERENCE_NAME_INTRA_FRAME = 0,
-    STD_VIDEO_VP9_REFERENCE_NAME_LAST_FRAME = 1,
-    STD_VIDEO_VP9_REFERENCE_NAME_GOLDEN_FRAME = 2,
-    STD_VIDEO_VP9_REFERENCE_NAME_ALTREF_FRAME = 3,
-    STD_VIDEO_VP9_REFERENCE_NAME_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_REFERENCE_NAME_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9ReferenceName;
-
-typedef enum StdVideoVP9InterpolationFilter {
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP = 0,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP = 2,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_BILINEAR = 3,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_SWITCHABLE = 4,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_INTERPOLATION_FILTER_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9InterpolationFilter;
-
-typedef enum StdVideoVP9ColorSpace {
-    STD_VIDEO_VP9_COLOR_SPACE_UNKNOWN = 0,
-    STD_VIDEO_VP9_COLOR_SPACE_BT_601 = 1,
-    STD_VIDEO_VP9_COLOR_SPACE_BT_709 = 2,
-    STD_VIDEO_VP9_COLOR_SPACE_SMPTE_170 = 3,
-    STD_VIDEO_VP9_COLOR_SPACE_SMPTE_240 = 4,
-    STD_VIDEO_VP9_COLOR_SPACE_BT_2020 = 5,
-    STD_VIDEO_VP9_COLOR_SPACE_RESERVED = 6,
-    STD_VIDEO_VP9_COLOR_SPACE_RGB = 7,
-    STD_VIDEO_VP9_COLOR_SPACE_INVALID = 0x7FFFFFFF,
-    STD_VIDEO_VP9_COLOR_SPACE_MAX_ENUM = 0x7FFFFFFF
-} StdVideoVP9ColorSpace;
-typedef struct StdVideoVP9ColorConfigFlags {
-    uint32_t    color_range : 1;
-    uint32_t    reserved : 31;
-} StdVideoVP9ColorConfigFlags;
-
-typedef struct StdVideoVP9ColorConfig {
-    StdVideoVP9ColorConfigFlags    flags;
-    uint8_t                        BitDepth;
-    uint8_t                        subsampling_x;
-    uint8_t                        subsampling_y;
-    uint8_t                        reserved1;
-    StdVideoVP9ColorSpace          color_space;
-} StdVideoVP9ColorConfig;
-
-typedef struct StdVideoVP9LoopFilterFlags {
-    uint32_t    loop_filter_delta_enabled : 1;
-    uint32_t    loop_filter_delta_update : 1;
-    uint32_t    reserved : 30;
-} StdVideoVP9LoopFilterFlags;
-
-typedef struct StdVideoVP9LoopFilter {
-    StdVideoVP9LoopFilterFlags    flags;
-    uint8_t                       loop_filter_level;
-    uint8_t                       loop_filter_sharpness;
-    uint8_t                       update_ref_delta;
-    int8_t                        loop_filter_ref_deltas[STD_VIDEO_VP9_MAX_REF_FRAMES];
-    uint8_t                       update_mode_delta;
-    int8_t                        loop_filter_mode_deltas[STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS];
-} StdVideoVP9LoopFilter;
-
-typedef struct StdVideoVP9SegmentationFlags {
-    uint32_t    segmentation_update_map : 1;
-    uint32_t    segmentation_temporal_update : 1;
-    uint32_t    segmentation_update_data : 1;
-    uint32_t    segmentation_abs_or_delta_update : 1;
-    uint32_t    reserved : 28;
-} StdVideoVP9SegmentationFlags;
-
-typedef struct StdVideoVP9Segmentation {
-    StdVideoVP9SegmentationFlags    flags;
-    uint8_t                         segmentation_tree_probs[STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS];
-    uint8_t                         segmentation_pred_prob[STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB];
-    uint8_t                         FeatureEnabled[STD_VIDEO_VP9_MAX_SEGMENTS];
-    int16_t                         FeatureData[STD_VIDEO_VP9_MAX_SEGMENTS][STD_VIDEO_VP9_SEG_LVL_MAX];
-} StdVideoVP9Segmentation;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h
deleted file mode 100644
index 42b9bd3f..00000000
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_
-#define VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ 1
-
-/*
-** Copyright 2015-2025 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-/*
-** This header is generated from the Khronos Vulkan XML API Registry.
-**
-*/
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-// vulkan_video_codec_vp9std_decode is a preprocessor guard. Do not pass it to API calls.
-#define vulkan_video_codec_vp9std_decode 1
-#include "vulkan_video_codec_vp9std.h"
-
-#define VK_STD_VULKAN_VIDEO_CODEC_VP9_DECODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)
-
-#define VK_STD_VULKAN_VIDEO_CODEC_VP9_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_VP9_DECODE_API_VERSION_1_0_0
-#define VK_STD_VULKAN_VIDEO_CODEC_VP9_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_vp9_decode"
-typedef struct StdVideoDecodeVP9PictureInfoFlags {
-    uint32_t    error_resilient_mode : 1;
-    uint32_t    intra_only : 1;
-    uint32_t    allow_high_precision_mv : 1;
-    uint32_t    refresh_frame_context : 1;
-    uint32_t    frame_parallel_decoding_mode : 1;
-    uint32_t    segmentation_enabled : 1;
-    uint32_t    show_frame : 1;
-    uint32_t    UsePrevFrameMvs : 1;
-    uint32_t    reserved : 24;
-} StdVideoDecodeVP9PictureInfoFlags;
-
-typedef struct StdVideoDecodeVP9PictureInfo {
-    StdVideoDecodeVP9PictureInfoFlags    flags;
-    StdVideoVP9Profile                   profile;
-    StdVideoVP9FrameType                 frame_type;
-    uint8_t                              frame_context_idx;
-    uint8_t                              reset_frame_context;
-    uint8_t                              refresh_frame_flags;
-    uint8_t                              ref_frame_sign_bias_mask;
-    StdVideoVP9InterpolationFilter       interpolation_filter;
-    uint8_t                              base_q_idx;
-    int8_t                               delta_q_y_dc;
-    int8_t                               delta_q_uv_dc;
-    int8_t                               delta_q_uv_ac;
-    uint8_t                              tile_cols_log2;
-    uint8_t                              tile_rows_log2;
-    uint16_t                             reserved1[3];
-    const StdVideoVP9ColorConfig*        pColorConfig;
-    const StdVideoVP9LoopFilter*         pLoopFilter;
-    const StdVideoVP9Segmentation*       pSegmentation;
-} StdVideoDecodeVP9PictureInfo;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h
index a5f0f3d9..5e6ef1db 100644
--- a/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h
+++ b/engine/thirdparty/vulkan/include/vk_video/vulkan_video_codecs_common.h
@@ -2,7 +2,7 @@
 #define VULKAN_VIDEO_CODECS_COMMON_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
diff --git a/engine/thirdparty/vulkan/include/vulkan/vk_platform.h b/engine/thirdparty/vulkan/include/vulkan/vk_platform.h
index 18e5ca34..0ecd4f64 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vk_platform.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vk_platform.h
@@ -2,7 +2,7 @@
 // File: vk_platform.h
 //
 /*
-** Copyright 2014-2025 The Khronos Group Inc.
+** Copyright 2014-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan.cppm b/engine/thirdparty/vulkan/include/vulkan/vulkan.cppm
index 7680392a..6d7c8a67 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan.cppm
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan.cppm
@@ -1,25 +1,15 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
 
 // This header is generated from the Khronos Vulkan XML API Registry.
 
+// Note: This module is still in an experimental state.
+// Any feedback is welcome on https://github.com/KhronosGroup/Vulkan-Hpp/issues.
+
 module;
 
-#define VULKAN_HPP_CXX_MODULE 1
-
-#include <vulkan/vulkan_hpp_macros.hpp>
-
-#if !defined( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
-#  define VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING \
-    "\n\tThe Vulkan-Hpp C++ named module is experimental. It is subject to change without prior notice.\n" \
-  "\tTo silence this warning, define the VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING macro.\n" \
-  "\tFor feedback, go to: https://github.com/KhronosGroup/Vulkan-Hpp/issues"
-
-VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
-#endif
-
 #include <vulkan/vulkan.hpp>
 #include <vulkan/vulkan_extension_inspection.hpp>
 #include <vulkan/vulkan_format_traits.hpp>
@@ -27,9 +17,7 @@ VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
 #include <vulkan/vulkan_raii.hpp>
 #include <vulkan/vulkan_shared.hpp>
 
-export module vulkan;
-export import :video;
-export import std;
+export module vulkan_hpp;
 
 export namespace VULKAN_HPP_NAMESPACE
 {
@@ -38,46 +26,19 @@ export namespace VULKAN_HPP_NAMESPACE
   //=====================================
   using VULKAN_HPP_NAMESPACE::ArrayWrapper1D;
   using VULKAN_HPP_NAMESPACE::ArrayWrapper2D;
+  using VULKAN_HPP_NAMESPACE::DispatchLoaderBase;
+  using VULKAN_HPP_NAMESPACE::DispatchLoaderDynamic;
   using VULKAN_HPP_NAMESPACE::Flags;
   using VULKAN_HPP_NAMESPACE::FlagTraits;
 
-  namespace detail
-  {
-    using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderBase;
-    using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic;
-#if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
-    using VULKAN_HPP_NAMESPACE::detail::defaultDispatchLoaderDynamic;
-#endif
 #if !defined( VK_NO_PROTOTYPES )
-    using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic;
-    using VULKAN_HPP_NAMESPACE::detail::getDispatchLoaderStatic;
+  using VULKAN_HPP_NAMESPACE::DispatchLoaderStatic;
 #endif /*VK_NO_PROTOTYPES*/
-    using VULKAN_HPP_NAMESPACE::detail::createResultValueType;
-    using VULKAN_HPP_NAMESPACE::detail::isDispatchLoader;
-    using VULKAN_HPP_NAMESPACE::detail::resultCheck;
-  }  // namespace detail
-#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-  namespace VULKAN_HPP_RAII_NAMESPACE
-  {
-    using VULKAN_HPP_RAII_NAMESPACE::operator==;
-    using VULKAN_HPP_RAII_NAMESPACE::operator!=;
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    using VULKAN_HPP_RAII_NAMESPACE::operator<=>;
-#  else
-    using VULKAN_HPP_RAII_NAMESPACE::operator<;
-#  endif
-  }  // namespace VULKAN_HPP_RAII_NAMESPACE
-#endif
+
   using VULKAN_HPP_NAMESPACE::operator&;
   using VULKAN_HPP_NAMESPACE::operator|;
   using VULKAN_HPP_NAMESPACE::operator^;
   using VULKAN_HPP_NAMESPACE::operator~;
-  using VULKAN_HPP_NAMESPACE::operator<;
-  using VULKAN_HPP_NAMESPACE::operator<=;
-  using VULKAN_HPP_NAMESPACE::operator>;
-  using VULKAN_HPP_NAMESPACE::operator>=;
-  using VULKAN_HPP_NAMESPACE::operator==;
-  using VULKAN_HPP_NAMESPACE::operator!=;
   using VULKAN_HPP_DEFAULT_DISPATCHER_TYPE;
 
 #if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
@@ -89,24 +50,18 @@ export namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
-  namespace detail
-  {
-    using VULKAN_HPP_NAMESPACE::detail::ObjectDestroy;
-    using VULKAN_HPP_NAMESPACE::detail::ObjectDestroyShared;
-    using VULKAN_HPP_NAMESPACE::detail::ObjectFree;
-    using VULKAN_HPP_NAMESPACE::detail::ObjectFreeShared;
-    using VULKAN_HPP_NAMESPACE::detail::ObjectRelease;
-    using VULKAN_HPP_NAMESPACE::detail::ObjectReleaseShared;
-    using VULKAN_HPP_NAMESPACE::detail::PoolFree;
-    using VULKAN_HPP_NAMESPACE::detail::PoolFreeShared;
-  }  // namespace detail
-
+  using VULKAN_HPP_NAMESPACE::ObjectDestroy;
+  using VULKAN_HPP_NAMESPACE::ObjectDestroyShared;
+  using VULKAN_HPP_NAMESPACE::ObjectFree;
+  using VULKAN_HPP_NAMESPACE::ObjectFreeShared;
+  using VULKAN_HPP_NAMESPACE::ObjectRelease;
+  using VULKAN_HPP_NAMESPACE::ObjectReleaseShared;
+  using VULKAN_HPP_NAMESPACE::PoolFree;
+  using VULKAN_HPP_NAMESPACE::PoolFreeShared;
   using VULKAN_HPP_NAMESPACE::SharedHandle;
   using VULKAN_HPP_NAMESPACE::UniqueHandle;
 #endif /*VULKAN_HPP_NO_SMART_HANDLE*/
 
-  using VULKAN_HPP_NAMESPACE::exchange;
-
   //==================
   //=== BASE TYPEs ===
   //==================
@@ -281,48 +236,37 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ChromaLocationKHR;
   using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlagBits;
   using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags;
-  using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlagsKHR;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlagBits;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags;
-  using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlagsKHR;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateTypeKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags;
-  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBits;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlags;
-  using VULKAN_HPP_NAMESPACE::FenceImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBits;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlags;
-  using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags;
-  using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PointClippingBehavior;
   using VULKAN_HPP_NAMESPACE::PointClippingBehaviorKHR;
   using VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion;
@@ -332,7 +276,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlags;
-  using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags;
   using VULKAN_HPP_NAMESPACE::TessellationDomainOrigin;
@@ -342,13 +285,11 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBits;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlags;
-  using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagsEXT;
   using VULKAN_HPP_NAMESPACE::DriverId;
   using VULKAN_HPP_NAMESPACE::DriverIdKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBits;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlags;
-  using VULKAN_HPP_NAMESPACE::ResolveModeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SamplerReductionMode;
   using VULKAN_HPP_NAMESPACE::SamplerReductionModeEXT;
   using VULKAN_HPP_NAMESPACE::SemaphoreType;
@@ -356,7 +297,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags;
-  using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependenceKHR;
 
@@ -364,63 +304,27 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2;
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::AccessFlags2;
-  using VULKAN_HPP_NAMESPACE::AccessFlags2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2;
-  using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBits;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags;
-  using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlags2;
-  using VULKAN_HPP_NAMESPACE::PipelineStageFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBits;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags;
-  using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagsEXT;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBits;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::RenderingFlags;
-  using VULKAN_HPP_NAMESPACE::RenderingFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBits;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlags;
-  using VULKAN_HPP_NAMESPACE::SubmitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBits;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlags;
-  using VULKAN_HPP_NAMESPACE::ToolPurposeFlagsEXT;
-
-  //=== VK_VERSION_1_4 ===
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlagBits2;
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlagBits2KHR;
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2;
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyFlagBits;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyFlags;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::LineRasterizationMode;
-  using VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT;
-  using VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlagBits;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlags;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlagBits2;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlagBits2KHR;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehavior;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehavior;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT;
-  using VULKAN_HPP_NAMESPACE::QueueGlobalPriority;
-  using VULKAN_HPP_NAMESPACE::QueueGlobalPriorityEXT;
-  using VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR;
 
   //=== VK_KHR_surface ===
   using VULKAN_HPP_NAMESPACE::ColorSpaceKHR;
@@ -563,6 +467,10 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ViSurfaceCreateFlagsNN;
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
+  //=== VK_EXT_pipeline_robustness ===
+  using VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT;
+  using VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT;
+
   //=== VK_EXT_conditional_rendering ===
   using VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagsEXT;
@@ -643,18 +551,15 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR;
   using VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR;
   using VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeNV;
   using VULKAN_HPP_NAMESPACE::GeometryFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::GeometryFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::GeometryFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::GeometryFlagsNV;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsNV;
   using VULKAN_HPP_NAMESPACE::GeometryTypeKHR;
   using VULKAN_HPP_NAMESPACE::GeometryTypeNV;
 
@@ -684,17 +589,13 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagBitsAMD;
   using VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagsAMD;
 
+  //=== VK_KHR_global_priority ===
+  using VULKAN_HPP_NAMESPACE::QueueGlobalPriorityEXT;
+  using VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR;
+
   //=== VK_AMD_memory_overallocation_behavior ===
   using VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD;
 
-  //=== VK_EXT_present_timing ===
-  using VULKAN_HPP_NAMESPACE::PastPresentationTimingFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::PastPresentationTimingFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentStageFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentStageFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentTimingInfoFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentTimingInfoFlagsEXT;
-
   //=== VK_INTEL_performance_query ===
   using VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL;
   using VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL;
@@ -745,6 +646,20 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_KHR_pipeline_executable_properties ===
   using VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR;
 
+  //=== VK_EXT_host_image_copy ===
+  using VULKAN_HPP_NAMESPACE::HostImageCopyFlagBitsEXT;
+  using VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT;
+
+  //=== VK_KHR_map_memory2 ===
+  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlagBitsKHR;
+  using VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR;
+
+  //=== VK_EXT_surface_maintenance1 ===
+  using VULKAN_HPP_NAMESPACE::PresentGravityFlagBitsEXT;
+  using VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT;
+  using VULKAN_HPP_NAMESPACE::PresentScalingFlagBitsEXT;
+  using VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT;
+
   //=== VK_NV_device_generated_commands ===
   using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV;
@@ -781,10 +696,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagsNV;
 
-  //=== VK_QCOM_tile_shading ===
-  using VULKAN_HPP_NAMESPACE::TileShadingRenderPassFlagBitsQCOM;
-  using VULKAN_HPP_NAMESPACE::TileShadingRenderPassFlagsQCOM;
-
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_objects ===
   using VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT;
@@ -845,14 +756,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateFlagsQNX;
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbChromaOffsetFlagBitsVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbChromaOffsetFlagsVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbModelConversionFlagBitsVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbModelConversionFlagsVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbRangeCompressionFlagBitsVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbRangeCompressionFlagsVALVE;
-
   //=== VK_EXT_opacity_micromap ===
   using VULKAN_HPP_NAMESPACE::BuildMicromapFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT;
@@ -873,9 +776,9 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagBitsARM;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagsARM;
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  using VULKAN_HPP_NAMESPACE::RayTracingLssIndexingModeNV;
-  using VULKAN_HPP_NAMESPACE::RayTracingLssPrimitiveEndCapsModeNV;
+  //=== VK_NV_memory_decompression ===
+  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagBitsNV;
+  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV;
 
   //=== VK_EXT_subpass_merge_feedback ===
   using VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT;
@@ -885,15 +788,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG;
   using VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::TensorCreateFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::TensorCreateFlagsARM;
-  using VULKAN_HPP_NAMESPACE::TensorTilingARM;
-  using VULKAN_HPP_NAMESPACE::TensorUsageFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::TensorUsageFlagsARM;
-  using VULKAN_HPP_NAMESPACE::TensorViewCreateFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::TensorViewCreateFlagsARM;
-
   //=== VK_NV_optical_flow ===
   using VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV;
@@ -906,34 +800,19 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagsNV;
 
-  //=== VK_AMD_anti_lag ===
-  using VULKAN_HPP_NAMESPACE::AntiLagModeAMD;
-  using VULKAN_HPP_NAMESPACE::AntiLagStageAMD;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  using VULKAN_HPP_NAMESPACE::CompressedTriangleFormatAMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+  //=== VK_KHR_maintenance5 ===
+  using VULKAN_HPP_NAMESPACE::BufferUsageFlagBits2KHR;
+  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR;
+  using VULKAN_HPP_NAMESPACE::PipelineCreateFlagBits2KHR;
+  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR;
 
   //=== VK_EXT_shader_object ===
   using VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT;
   using VULKAN_HPP_NAMESPACE::ShaderCreateFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT;
 
-  //=== VK_KHR_surface_maintenance1 ===
-  using VULKAN_HPP_NAMESPACE::PresentGravityFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentGravityFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentGravityFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::PresentScalingFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentScalingFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::PresentScalingFlagsKHR;
-
-  //=== VK_NV_cooperative_vector ===
-  using VULKAN_HPP_NAMESPACE::ComponentTypeKHR;
-  using VULKAN_HPP_NAMESPACE::ComponentTypeNV;
-  using VULKAN_HPP_NAMESPACE::CooperativeVectorMatrixLayoutNV;
+  //=== VK_NV_ray_tracing_invocation_reorder ===
+  using VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV;
 
   //=== VK_EXT_layer_settings ===
   using VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT;
@@ -943,32 +822,11 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV;
 
   //=== VK_KHR_cooperative_matrix ===
+  using VULKAN_HPP_NAMESPACE::ComponentTypeKHR;
+  using VULKAN_HPP_NAMESPACE::ComponentTypeNV;
   using VULKAN_HPP_NAMESPACE::ScopeKHR;
   using VULKAN_HPP_NAMESPACE::ScopeNV;
 
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchFlagsARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointTypeARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateFlagsARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationTypeARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineTypeARM;
-
-  //=== VK_KHR_video_encode_av1 ===
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilityFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilityFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1PredictionModeKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlGroupKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1StdFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1StdFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1SuperblockSizeFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1SuperblockSizeFlagsKHR;
-
   //=== VK_QCOM_image_processing2 ===
   using VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM;
 
@@ -978,95 +836,14 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_MSFT_layered_driver ===
   using VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT;
 
+  //=== VK_KHR_line_rasterization ===
+  using VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT;
+  using VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR;
+
   //=== VK_KHR_calibrated_timestamps ===
   using VULKAN_HPP_NAMESPACE::TimeDomainEXT;
   using VULKAN_HPP_NAMESPACE::TimeDomainKHR;
 
-  //=== VK_KHR_copy_memory_indirect ===
-  using VULKAN_HPP_NAMESPACE::AddressCopyFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::AddressCopyFlagsKHR;
-
-  //=== VK_EXT_memory_decompression ===
-  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV;
-
-  //=== VK_NV_display_stereo ===
-  using VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoTypeNV;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  using VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshModeFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshModeFlagsKHR;
-
-  //=== VK_KHR_maintenance7 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiKHR;
-
-  //=== VK_NV_cluster_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureAddressResolutionFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureAddressResolutionFlagsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClusterFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClusterFlagsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryFlagsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureIndexFormatFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureIndexFormatFlagsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpModeNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpTypeNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTypeNV;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstanceFlagBitsNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstanceFlagsNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureOpTypeNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsInputModeFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsInputModeFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagBitsEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoTypeEXT;
-
-  //=== VK_KHR_maintenance8 ===
-  using VULKAN_HPP_NAMESPACE::AccessFlagBits3KHR;
-  using VULKAN_HPP_NAMESPACE::AccessFlags3KHR;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  using VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeEXT;
-  using VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV;
-
-  //=== VK_EXT_depth_clamp_control ===
-  using VULKAN_HPP_NAMESPACE::DepthClampModeEXT;
-
-  //=== VK_KHR_maintenance9 ===
-  using VULKAN_HPP_NAMESPACE::DefaultVertexAttributeValueKHR;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  using VULKAN_HPP_NAMESPACE::SurfaceCreateFlagBitsOHOS;
-  using VULKAN_HPP_NAMESPACE::SurfaceCreateFlagsOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  using VULKAN_HPP_NAMESPACE::SwapchainImageUsageFlagBitsOHOS;
-  using VULKAN_HPP_NAMESPACE::SwapchainImageUsageFlagsOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-  using VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagBitsARM;
-  using VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagsARM;
-
-  //=== VK_QCOM_data_graph_model ===
-  using VULKAN_HPP_NAMESPACE::DataGraphModelCacheTypeQCOM;
-
-  //=== VK_KHR_maintenance10 ===
-  using VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsKHR;
-  using VULKAN_HPP_NAMESPACE::ResolveImageFlagBitsKHR;
-  using VULKAN_HPP_NAMESPACE::ResolveImageFlagsKHR;
-
   //=========================
   //=== Index Type Traits ===
   //=========================
@@ -1107,17 +884,16 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::make_error_condition;
   using VULKAN_HPP_NAMESPACE::MemoryMapFailedError;
   using VULKAN_HPP_NAMESPACE::NativeWindowInUseKHRError;
-  using VULKAN_HPP_NAMESPACE::NotPermittedError;
+  using VULKAN_HPP_NAMESPACE::NotPermittedKHRError;
   using VULKAN_HPP_NAMESPACE::OutOfDateKHRError;
   using VULKAN_HPP_NAMESPACE::OutOfDeviceMemoryError;
   using VULKAN_HPP_NAMESPACE::OutOfHostMemoryError;
   using VULKAN_HPP_NAMESPACE::OutOfPoolMemoryError;
-  using VULKAN_HPP_NAMESPACE::PresentTimingQueueFullEXTError;
   using VULKAN_HPP_NAMESPACE::SurfaceLostKHRError;
   using VULKAN_HPP_NAMESPACE::SystemError;
   using VULKAN_HPP_NAMESPACE::TooManyObjectsError;
   using VULKAN_HPP_NAMESPACE::UnknownError;
-  using VULKAN_HPP_NAMESPACE::ValidationFailedError;
+  using VULKAN_HPP_NAMESPACE::ValidationFailedEXTError;
   using VULKAN_HPP_NAMESPACE::VideoPictureLayoutNotSupportedKHRError;
   using VULKAN_HPP_NAMESPACE::VideoProfileCodecNotSupportedKHRError;
   using VULKAN_HPP_NAMESPACE::VideoProfileFormatNotSupportedKHRError;
@@ -1130,11 +906,13 @@ export namespace VULKAN_HPP_NAMESPACE
 
   using VULKAN_HPP_NAMESPACE::CompressionExhaustedEXTError;
   using VULKAN_HPP_NAMESPACE::InvalidVideoStdParametersKHRError;
-  using VULKAN_HPP_NAMESPACE::NotEnoughSpaceKHRError;
 #endif /*VULKAN_HPP_NO_EXCEPTIONS*/
 
   using VULKAN_HPP_NAMESPACE::ResultValue;
   using VULKAN_HPP_NAMESPACE::ResultValueType;
+  using VULKAN_HPP_NAMESPACE::detail::createResultValueType;
+  using VULKAN_HPP_NAMESPACE::detail::ignore;
+  using VULKAN_HPP_NAMESPACE::detail::resultCheck;
 
   //===========================
   //=== CONSTEXPR CONSTANTs ===
@@ -1166,9 +944,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::MaxDriverInfoSize;
   using VULKAN_HPP_NAMESPACE::MaxDriverNameSize;
 
-  //=== VK_VERSION_1_4 ===
-  using VULKAN_HPP_NAMESPACE::MaxGlobalPrioritySize;
-
   //=== VK_KHR_surface ===
   using VULKAN_HPP_NAMESPACE::KHRSurfaceExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRSurfaceSpecVersion;
@@ -1670,10 +1445,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::EXTShaderStencilExportExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTShaderStencilExportSpecVersion;
 
-  //=== VK_KHR_shader_bfloat16 ===
-  using VULKAN_HPP_NAMESPACE::KHRShaderBfloat16ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRShaderBfloat16SpecVersion;
-
   //=== VK_EXT_sample_locations ===
   using VULKAN_HPP_NAMESPACE::EXTSampleLocationsExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTSampleLocationsSpecVersion;
@@ -1903,10 +1674,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRTimelineSemaphoreExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRTimelineSemaphoreSpecVersion;
 
-  //=== VK_EXT_present_timing ===
-  using VULKAN_HPP_NAMESPACE::EXTPresentTimingExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTPresentTimingSpecVersion;
-
   //=== VK_INTEL_shader_integer_functions2 ===
   using VULKAN_HPP_NAMESPACE::INTELShaderIntegerFunctions2ExtensionName;
   using VULKAN_HPP_NAMESPACE::INTELShaderIntegerFunctions2SpecVersion;
@@ -2211,10 +1978,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::NVCudaKernelLaunchSpecVersion;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-  using VULKAN_HPP_NAMESPACE::QCOMTileShadingExtensionName;
-  using VULKAN_HPP_NAMESPACE::QCOMTileShadingSpecVersion;
-
   //=== VK_NV_low_latency ===
   using VULKAN_HPP_NAMESPACE::NVLowLatencyExtensionName;
   using VULKAN_HPP_NAMESPACE::NVLowLatencySpecVersion;
@@ -2353,10 +2116,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRFormatFeatureFlags2ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRFormatFeatureFlags2SpecVersion;
 
-  //=== VK_EXT_present_mode_fifo_latest_ready ===
-  using VULKAN_HPP_NAMESPACE::EXTPresentModeFifoLatestReadyExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTPresentModeFifoLatestReadySpecVersion;
-
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_external_memory ===
   using VULKAN_HPP_NAMESPACE::FUCHSIAExternalMemoryExtensionName;
@@ -2421,19 +2180,11 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRRayTracingMaintenance1ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRRayTracingMaintenance1SpecVersion;
 
-  //=== VK_KHR_shader_untyped_pointers ===
-  using VULKAN_HPP_NAMESPACE::KHRShaderUntypedPointersExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRShaderUntypedPointersSpecVersion;
-
   //=== VK_EXT_global_priority_query ===
   using VULKAN_HPP_NAMESPACE::EXTGlobalPriorityQueryExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTGlobalPriorityQuerySpecVersion;
   using VULKAN_HPP_NAMESPACE::MaxGlobalPrioritySizeEXT;
 
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  using VULKAN_HPP_NAMESPACE::VALVEVideoEncodeRgbConversionExtensionName;
-  using VULKAN_HPP_NAMESPACE::VALVEVideoEncodeRgbConversionSpecVersion;
-
   //=== VK_EXT_image_view_min_lod ===
   using VULKAN_HPP_NAMESPACE::EXTImageViewMinLodExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTImageViewMinLodSpecVersion;
@@ -2533,10 +2284,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::NVDeviceGeneratedCommandsComputeExtensionName;
   using VULKAN_HPP_NAMESPACE::NVDeviceGeneratedCommandsComputeSpecVersion;
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  using VULKAN_HPP_NAMESPACE::NVRayTracingLinearSweptSpheresExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVRayTracingLinearSweptSpheresSpecVersion;
-
   //=== VK_NV_linear_color_attachment ===
   using VULKAN_HPP_NAMESPACE::NVLinearColorAttachmentExtensionName;
   using VULKAN_HPP_NAMESPACE::NVLinearColorAttachmentSpecVersion;
@@ -2561,12 +2308,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::EXTNestedCommandBufferExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTNestedCommandBufferSpecVersion;
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  using VULKAN_HPP_NAMESPACE::OHOSExternalMemoryExtensionName;
-  using VULKAN_HPP_NAMESPACE::OHOSExternalMemorySpecVersion;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_external_memory_acquire_unmodified ===
   using VULKAN_HPP_NAMESPACE::EXTExternalMemoryAcquireUnmodifiedExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTExternalMemoryAcquireUnmodifiedSpecVersion;
@@ -2583,10 +2324,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::LUNARGDirectDriverLoadingExtensionName;
   using VULKAN_HPP_NAMESPACE::LUNARGDirectDriverLoadingSpecVersion;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::ARMTensorsExtensionName;
-  using VULKAN_HPP_NAMESPACE::ARMTensorsSpecVersion;
-
   //=== VK_EXT_shader_module_identifier ===
   using VULKAN_HPP_NAMESPACE::EXTShaderModuleIdentifierExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTShaderModuleIdentifierSpecVersion;
@@ -2618,26 +2355,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRMaintenance5ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRMaintenance5SpecVersion;
 
-  //=== VK_AMD_anti_lag ===
-  using VULKAN_HPP_NAMESPACE::AMDAntiLagExtensionName;
-  using VULKAN_HPP_NAMESPACE::AMDAntiLagSpecVersion;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  using VULKAN_HPP_NAMESPACE::AMDXDenseGeometryFormatExtensionName;
-  using VULKAN_HPP_NAMESPACE::AMDXDenseGeometryFormatSpecVersion;
-  using VULKAN_HPP_NAMESPACE::CompressedTriangleFormatDgf1ByteAlignmentAMDX;
-  using VULKAN_HPP_NAMESPACE::CompressedTriangleFormatDgf1ByteStrideAMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  using VULKAN_HPP_NAMESPACE::KHRPresentId2ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRPresentId2SpecVersion;
-
-  //=== VK_KHR_present_wait2 ===
-  using VULKAN_HPP_NAMESPACE::KHRPresentWait2ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRPresentWait2SpecVersion;
-
   //=== VK_KHR_ray_tracing_position_fetch ===
   using VULKAN_HPP_NAMESPACE::KHRRayTracingPositionFetchExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRRayTracingPositionFetchSpecVersion;
@@ -2646,11 +2363,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::EXTShaderObjectExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTShaderObjectSpecVersion;
 
-  //=== VK_KHR_pipeline_binary ===
-  using VULKAN_HPP_NAMESPACE::KHRPipelineBinaryExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRPipelineBinarySpecVersion;
-  using VULKAN_HPP_NAMESPACE::MaxPipelineBinaryKeySizeKHR;
-
   //=== VK_QCOM_tile_properties ===
   using VULKAN_HPP_NAMESPACE::QCOMTilePropertiesExtensionName;
   using VULKAN_HPP_NAMESPACE::QCOMTilePropertiesSpecVersion;
@@ -2659,14 +2371,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SECAmigoProfilingExtensionName;
   using VULKAN_HPP_NAMESPACE::SECAmigoProfilingSpecVersion;
 
-  //=== VK_KHR_surface_maintenance1 ===
-  using VULKAN_HPP_NAMESPACE::KHRSurfaceMaintenance1ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRSurfaceMaintenance1SpecVersion;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  using VULKAN_HPP_NAMESPACE::KHRSwapchainMaintenance1ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRSwapchainMaintenance1SpecVersion;
-
   //=== VK_QCOM_multiview_per_view_viewports ===
   using VULKAN_HPP_NAMESPACE::QCOMMultiviewPerViewViewportsExtensionName;
   using VULKAN_HPP_NAMESPACE::QCOMMultiviewPerViewViewportsSpecVersion;
@@ -2675,10 +2379,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::NVRayTracingInvocationReorderExtensionName;
   using VULKAN_HPP_NAMESPACE::NVRayTracingInvocationReorderSpecVersion;
 
-  //=== VK_NV_cooperative_vector ===
-  using VULKAN_HPP_NAMESPACE::NVCooperativeVectorExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVCooperativeVectorSpecVersion;
-
   //=== VK_NV_extended_sparse_address_space ===
   using VULKAN_HPP_NAMESPACE::NVExtendedSparseAddressSpaceExtensionName;
   using VULKAN_HPP_NAMESPACE::NVExtendedSparseAddressSpaceSpecVersion;
@@ -2687,10 +2387,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::EXTMutableDescriptorTypeExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTMutableDescriptorTypeSpecVersion;
 
-  //=== VK_EXT_legacy_vertex_attributes ===
-  using VULKAN_HPP_NAMESPACE::EXTLegacyVertexAttributesExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTLegacyVertexAttributesSpecVersion;
-
   //=== VK_EXT_layer_settings ===
   using VULKAN_HPP_NAMESPACE::EXTLayerSettingsExtensionName;
   using VULKAN_HPP_NAMESPACE::EXTLayerSettingsSpecVersion;
@@ -2715,33 +2411,15 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRCooperativeMatrixExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRCooperativeMatrixSpecVersion;
 
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::ARMDataGraphExtensionName;
-  using VULKAN_HPP_NAMESPACE::ARMDataGraphSpecVersion;
-  using VULKAN_HPP_NAMESPACE::MaxPhysicalDeviceDataGraphOperationSetNameSizeARM;
-
   //=== VK_QCOM_multiview_per_view_render_areas ===
   using VULKAN_HPP_NAMESPACE::QCOMMultiviewPerViewRenderAreasExtensionName;
   using VULKAN_HPP_NAMESPACE::QCOMMultiviewPerViewRenderAreasSpecVersion;
 
-  //=== VK_KHR_compute_shader_derivatives ===
-  using VULKAN_HPP_NAMESPACE::KHRComputeShaderDerivativesExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRComputeShaderDerivativesSpecVersion;
-
   //=== VK_KHR_video_decode_av1 ===
   using VULKAN_HPP_NAMESPACE::KHRVideoDecodeAv1ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRVideoDecodeAv1SpecVersion;
   using VULKAN_HPP_NAMESPACE::MaxVideoAv1ReferencesPerFrameKHR;
 
-  //=== VK_KHR_video_encode_av1 ===
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeAv1ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeAv1SpecVersion;
-
-  //=== VK_KHR_video_decode_vp9 ===
-  using VULKAN_HPP_NAMESPACE::KHRVideoDecodeVp9ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRVideoDecodeVp9SpecVersion;
-  using VULKAN_HPP_NAMESPACE::MaxVideoVp9ReferencesPerFrameKHR;
-
   //=== VK_KHR_video_maintenance1 ===
   using VULKAN_HPP_NAMESPACE::KHRVideoMaintenance1ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRVideoMaintenance1SpecVersion;
@@ -2778,10 +2456,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::KHRLoadStoreOpNoneExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRLoadStoreOpNoneSpecVersion;
 
-  //=== VK_KHR_unified_image_layouts ===
-  using VULKAN_HPP_NAMESPACE::KHRUnifiedImageLayoutsExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRUnifiedImageLayoutsSpecVersion;
-
   //=== VK_KHR_shader_float_controls2 ===
   using VULKAN_HPP_NAMESPACE::KHRShaderFloatControls2ExtensionName;
   using VULKAN_HPP_NAMESPACE::KHRShaderFloatControls2SpecVersion;
@@ -2820,209 +2494,22 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::NVDescriptorPoolOverallocationExtensionName;
   using VULKAN_HPP_NAMESPACE::NVDescriptorPoolOverallocationSpecVersion;
 
-  //=== VK_QCOM_tile_memory_heap ===
-  using VULKAN_HPP_NAMESPACE::QCOMTileMemoryHeapExtensionName;
-  using VULKAN_HPP_NAMESPACE::QCOMTileMemoryHeapSpecVersion;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  using VULKAN_HPP_NAMESPACE::KHRCopyMemoryIndirectExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRCopyMemoryIndirectSpecVersion;
-
-  //=== VK_EXT_memory_decompression ===
-  using VULKAN_HPP_NAMESPACE::EXTMemoryDecompressionExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTMemoryDecompressionSpecVersion;
-
-  //=== VK_NV_display_stereo ===
-  using VULKAN_HPP_NAMESPACE::NVDisplayStereoExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVDisplayStereoSpecVersion;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeIntraRefreshExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeIntraRefreshSpecVersion;
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeQuantizationMapExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRVideoEncodeQuantizationMapSpecVersion;
-
   //=== VK_NV_raw_access_chains ===
   using VULKAN_HPP_NAMESPACE::NVRawAccessChainsExtensionName;
   using VULKAN_HPP_NAMESPACE::NVRawAccessChainsSpecVersion;
 
-  //=== VK_NV_external_compute_queue ===
-  using VULKAN_HPP_NAMESPACE::NVExternalComputeQueueExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVExternalComputeQueueSpecVersion;
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  using VULKAN_HPP_NAMESPACE::KHRShaderRelaxedExtendedInstructionExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRShaderRelaxedExtendedInstructionSpecVersion;
-
-  //=== VK_NV_command_buffer_inheritance ===
-  using VULKAN_HPP_NAMESPACE::NVCommandBufferInheritanceExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVCommandBufferInheritanceSpecVersion;
-
-  //=== VK_KHR_maintenance7 ===
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance7ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance7SpecVersion;
-
   //=== VK_NV_shader_atomic_float16_vector ===
   using VULKAN_HPP_NAMESPACE::NVShaderAtomicFloat16VectorExtensionName;
   using VULKAN_HPP_NAMESPACE::NVShaderAtomicFloat16VectorSpecVersion;
 
-  //=== VK_EXT_shader_replicated_composites ===
-  using VULKAN_HPP_NAMESPACE::EXTShaderReplicatedCompositesExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTShaderReplicatedCompositesSpecVersion;
-
-  //=== VK_EXT_shader_float8 ===
-  using VULKAN_HPP_NAMESPACE::EXTShaderFloat8ExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTShaderFloat8SpecVersion;
-
   //=== VK_NV_ray_tracing_validation ===
   using VULKAN_HPP_NAMESPACE::NVRayTracingValidationExtensionName;
   using VULKAN_HPP_NAMESPACE::NVRayTracingValidationSpecVersion;
 
-  //=== VK_NV_cluster_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::NVClusterAccelerationStructureExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVClusterAccelerationStructureSpecVersion;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::NVPartitionedAccelerationStructureExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVPartitionedAccelerationStructureSpecVersion;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructurePartitionIndexGlobalNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  using VULKAN_HPP_NAMESPACE::EXTDeviceGeneratedCommandsExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTDeviceGeneratedCommandsSpecVersion;
-
-  //=== VK_KHR_maintenance8 ===
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance8ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance8SpecVersion;
-
-  //=== VK_MESA_image_alignment_control ===
-  using VULKAN_HPP_NAMESPACE::MESAImageAlignmentControlExtensionName;
-  using VULKAN_HPP_NAMESPACE::MESAImageAlignmentControlSpecVersion;
-
-  //=== VK_KHR_shader_fma ===
-  using VULKAN_HPP_NAMESPACE::KHRShaderFmaExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRShaderFmaSpecVersion;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  using VULKAN_HPP_NAMESPACE::EXTRayTracingInvocationReorderExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTRayTracingInvocationReorderSpecVersion;
-
-  //=== VK_EXT_depth_clamp_control ===
-  using VULKAN_HPP_NAMESPACE::EXTDepthClampControlExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTDepthClampControlSpecVersion;
-
-  //=== VK_KHR_maintenance9 ===
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance9ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance9SpecVersion;
-
-  //=== VK_KHR_video_maintenance2 ===
-  using VULKAN_HPP_NAMESPACE::KHRVideoMaintenance2ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRVideoMaintenance2SpecVersion;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  using VULKAN_HPP_NAMESPACE::OHOSSurfaceExtensionName;
-  using VULKAN_HPP_NAMESPACE::OHOSSurfaceSpecVersion;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  using VULKAN_HPP_NAMESPACE::OHOSNativeBufferExtensionName;
-  using VULKAN_HPP_NAMESPACE::OHOSNativeBufferSpecVersion;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  using VULKAN_HPP_NAMESPACE::HUAWEIHdrVividExtensionName;
-  using VULKAN_HPP_NAMESPACE::HUAWEIHdrVividSpecVersion;
-
-  //=== VK_NV_cooperative_matrix2 ===
-  using VULKAN_HPP_NAMESPACE::NVCooperativeMatrix2ExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVCooperativeMatrix2SpecVersion;
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  using VULKAN_HPP_NAMESPACE::ARMPipelineOpacityMicromapExtensionName;
-  using VULKAN_HPP_NAMESPACE::ARMPipelineOpacityMicromapSpecVersion;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  using VULKAN_HPP_NAMESPACE::EXTExternalMemoryMetalExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTExternalMemoryMetalSpecVersion;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  using VULKAN_HPP_NAMESPACE::KHRDepthClampZeroOneExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRDepthClampZeroOneSpecVersion;
-
-  //=== VK_ARM_performance_counters_by_region ===
-  using VULKAN_HPP_NAMESPACE::ARMPerformanceCountersByRegionExtensionName;
-  using VULKAN_HPP_NAMESPACE::ARMPerformanceCountersByRegionSpecVersion;
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  using VULKAN_HPP_NAMESPACE::EXTVertexAttributeRobustnessExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTVertexAttributeRobustnessSpecVersion;
-
-  //=== VK_ARM_format_pack ===
-  using VULKAN_HPP_NAMESPACE::ARMFormatPackExtensionName;
-  using VULKAN_HPP_NAMESPACE::ARMFormatPackSpecVersion;
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  using VULKAN_HPP_NAMESPACE::VALVEFragmentDensityMapLayeredExtensionName;
-  using VULKAN_HPP_NAMESPACE::VALVEFragmentDensityMapLayeredSpecVersion;
-
-  //=== VK_KHR_robustness2 ===
-  using VULKAN_HPP_NAMESPACE::KHRRobustness2ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRRobustness2SpecVersion;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  using VULKAN_HPP_NAMESPACE::NVPresentMeteringExtensionName;
-  using VULKAN_HPP_NAMESPACE::NVPresentMeteringSpecVersion;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  using VULKAN_HPP_NAMESPACE::EXTFragmentDensityMapOffsetExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTFragmentDensityMapOffsetSpecVersion;
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  using VULKAN_HPP_NAMESPACE::EXTZeroInitializeDeviceMemoryExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTZeroInitializeDeviceMemorySpecVersion;
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  using VULKAN_HPP_NAMESPACE::KHRPresentModeFifoLatestReadyExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRPresentModeFifoLatestReadySpecVersion;
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  using VULKAN_HPP_NAMESPACE::EXTShader64BitIndexingExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTShader64BitIndexingSpecVersion;
-
-  //=== VK_EXT_custom_resolve ===
-  using VULKAN_HPP_NAMESPACE::EXTCustomResolveExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTCustomResolveSpecVersion;
-
-  //=== VK_QCOM_data_graph_model ===
-  using VULKAN_HPP_NAMESPACE::DataGraphModelToolchainVersionLengthQCOM;
-  using VULKAN_HPP_NAMESPACE::QCOMDataGraphModelExtensionName;
-  using VULKAN_HPP_NAMESPACE::QCOMDataGraphModelSpecVersion;
-
-  //=== VK_KHR_maintenance10 ===
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance10ExtensionName;
-  using VULKAN_HPP_NAMESPACE::KHRMaintenance10SpecVersion;
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  using VULKAN_HPP_NAMESPACE::SECPipelineCacheIncrementalModeExtensionName;
-  using VULKAN_HPP_NAMESPACE::SECPipelineCacheIncrementalModeSpecVersion;
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  using VULKAN_HPP_NAMESPACE::EXTShaderUniformBufferUnsizedArrayExtensionName;
-  using VULKAN_HPP_NAMESPACE::EXTShaderUniformBufferUnsizedArraySpecVersion;
-
   //========================
   //=== CONSTEXPR VALUEs ===
   //========================
   using VULKAN_HPP_NAMESPACE::HeaderVersion;
-  using VULKAN_HPP_NAMESPACE::Use64BitPtrDefines;
 
   //=========================
   //=== CONSTEXPR CALLEEs ===
@@ -3045,33 +2532,8 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ApiVersion11;
   using VULKAN_HPP_NAMESPACE::ApiVersion12;
   using VULKAN_HPP_NAMESPACE::ApiVersion13;
-  using VULKAN_HPP_NAMESPACE::ApiVersion14;
   using VULKAN_HPP_NAMESPACE::HeaderVersionComplete;
 
-  //====================
-  //=== FUNCPOINTERs ===
-  //====================
-
-  //=== VK_VERSION_1_0 ===
-  using VULKAN_HPP_NAMESPACE::PFN_AllocationFunction;
-  using VULKAN_HPP_NAMESPACE::PFN_FreeFunction;
-  using VULKAN_HPP_NAMESPACE::PFN_InternalAllocationNotification;
-  using VULKAN_HPP_NAMESPACE::PFN_InternalFreeNotification;
-  using VULKAN_HPP_NAMESPACE::PFN_ReallocationFunction;
-  using VULKAN_HPP_NAMESPACE::PFN_VoidFunction;
-
-  //=== VK_EXT_debug_report ===
-  using VULKAN_HPP_NAMESPACE::PFN_DebugReportCallbackEXT;
-
-  //=== VK_EXT_debug_utils ===
-  using VULKAN_HPP_NAMESPACE::PFN_DebugUtilsMessengerCallbackEXT;
-
-  //=== VK_EXT_device_memory_report ===
-  using VULKAN_HPP_NAMESPACE::PFN_DeviceMemoryReportCallbackEXT;
-
-  //=== VK_LUNARG_direct_driver_loading ===
-  using VULKAN_HPP_NAMESPACE::PFN_GetInstanceProcAddrLUNARG;
-
   //===============
   //=== STRUCTs ===
   //===============
@@ -3532,120 +2994,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::WriteDescriptorSetInlineUniformBlock;
   using VULKAN_HPP_NAMESPACE::WriteDescriptorSetInlineUniformBlockEXT;
 
-  //=== VK_VERSION_1_4 ===
-  using VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo;
-  using VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR;
-  using VULKAN_HPP_NAMESPACE::BindMemoryStatus;
-  using VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR;
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo;
-  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::CopyImageToImageInfo;
-  using VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT;
-  using VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo;
-  using VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT;
-  using VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo;
-  using VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR;
-  using VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo;
-  using VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery;
-  using VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT;
-  using VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo;
-  using VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT;
-  using VULKAN_HPP_NAMESPACE::ImageSubresource2;
-  using VULKAN_HPP_NAMESPACE::ImageSubresource2EXT;
-  using VULKAN_HPP_NAMESPACE::ImageSubresource2KHR;
-  using VULKAN_HPP_NAMESPACE::ImageToMemoryCopy;
-  using VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryMapInfo;
-  using VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR;
-  using VULKAN_HPP_NAMESPACE::MemoryToImageCopy;
-  using VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapInfo;
-  using VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo;
-  using VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo;
-  using VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo;
-  using VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PushConstantsInfo;
-  using VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo;
-  using VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo;
-  using VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingAreaInfo;
-  using VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo;
-  using VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo;
-  using VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR;
-  using VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize;
-  using VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT;
-  using VULKAN_HPP_NAMESPACE::SubresourceLayout2;
-  using VULKAN_HPP_NAMESPACE::SubresourceLayout2EXT;
-  using VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR;
-  using VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription;
-  using VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionEXT;
-  using VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR;
-
   //=== VK_KHR_surface ===
   using VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR;
   using VULKAN_HPP_NAMESPACE::SurfaceFormatKHR;
@@ -3746,7 +3094,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX;
   using VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX;
   using VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX;
-  using VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX;
 
   //=== VK_NVX_image_view_handle ===
   using VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX;
@@ -3803,6 +3150,13 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD;
   using VULKAN_HPP_NAMESPACE::ShaderStatisticsInfoAMD;
 
+  //=== VK_KHR_dynamic_rendering ===
+  using VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD;
+  using VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoNV;
+  using VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX;
+  using VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT;
+  using VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR;
+
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_stream_descriptor_surface ===
   using VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP;
@@ -3841,6 +3195,11 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ImageViewASTCDecodeModeEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceASTCDecodeFeaturesEXT;
 
+  //=== VK_EXT_pipeline_robustness ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT;
+  using VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT;
+
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
   using VULKAN_HPP_NAMESPACE::ExportMemoryWin32HandleInfoKHR;
@@ -3871,6 +3230,9 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR;
 
+  //=== VK_KHR_push_descriptor ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR;
+
   //=== VK_EXT_conditional_rendering ===
   using VULKAN_HPP_NAMESPACE::CommandBufferInheritanceConditionalRenderingInfoEXT;
   using VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT;
@@ -3901,7 +3263,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE;
 
   //=== VK_NVX_multiview_per_view_attributes ===
-  using VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
 
   //=== VK_NV_viewport_swizzle ===
@@ -4003,13 +3364,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_AMD_mixed_attachment_samples ===
-  using VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD;
-  using VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoNV;
-
-  //=== VK_KHR_shader_bfloat16 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR;
-
   //=== VK_EXT_sample_locations ===
   using VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT;
   using VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT;
@@ -4147,6 +3501,14 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR;
   using VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersCreateInfoKHR;
 
+  //=== VK_KHR_global_priority ===
+  using VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoEXT;
+  using VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesEXT;
+  using VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR;
+
   //=== VK_AMD_memory_overallocation_behavior ===
   using VULKAN_HPP_NAMESPACE::DeviceMemoryOverallocationCreateInfoAMD;
 
@@ -4158,6 +3520,9 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PresentFrameTokenGGP;
 #endif /*VK_USE_PLATFORM_GGP*/
 
+  //=== VK_NV_compute_shader_derivatives ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV;
+
   //=== VK_NV_mesh_shader ===
   using VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandNV;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesNV;
@@ -4171,24 +3536,9 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PipelineViewportExclusiveScissorStateCreateInfoNV;
 
   //=== VK_NV_device_diagnostic_checkpoints ===
-  using VULKAN_HPP_NAMESPACE::CheckpointData2NV;
   using VULKAN_HPP_NAMESPACE::CheckpointDataNV;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV;
   using VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointPropertiesNV;
 
-  //=== VK_EXT_present_timing ===
-  using VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT;
-  using VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PresentStageTimeEXT;
-  using VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT;
-
   //=== VK_INTEL_shader_integer_functions2 ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
 
@@ -4223,7 +3573,6 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_fragment_density_map ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapFeaturesEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT;
   using VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapCreateInfoEXT;
 
   //=== VK_KHR_fragment_shading_rate ===
@@ -4232,7 +3581,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRatePropertiesKHR;
   using VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateStateCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR;
 
   //=== VK_AMD_shader_core_properties2 ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreProperties2AMD;
@@ -4240,6 +3588,11 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_AMD_device_coherent_memory ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCoherentMemoryFeaturesAMD;
 
+  //=== VK_KHR_dynamic_rendering_local_read ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR;
+  using VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR;
+
   //=== VK_EXT_shader_image_atomic_int64 ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
 
@@ -4317,6 +3670,22 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PipelineInfoEXT;
   using VULKAN_HPP_NAMESPACE::PipelineInfoKHR;
 
+  //=== VK_EXT_host_image_copy ===
+  using VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT;
+  using VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT;
+  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT;
+  using VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT;
+  using VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT;
+  using VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT;
+  using VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT;
+  using VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT;
+
+  //=== VK_KHR_map_memory2 ===
+  using VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR;
+  using VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR;
+
   //=== VK_EXT_map_memory_placed ===
   using VULKAN_HPP_NAMESPACE::MemoryMapPlacedInfoEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedFeaturesEXT;
@@ -4325,6 +3694,19 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_shader_atomic_float2 ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat2FeaturesEXT;
 
+  //=== VK_EXT_surface_maintenance1 ===
+  using VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT;
+  using VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT;
+  using VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT;
+
+  //=== VK_EXT_swapchain_maintenance1 ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT;
+  using VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT;
+  using VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT;
+  using VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT;
+  using VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT;
+
   //=== VK_NV_device_generated_commands ===
   using VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandNV;
   using VULKAN_HPP_NAMESPACE::BindShaderGroupIndirectCommandNV;
@@ -4361,6 +3743,10 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DeviceMemoryReportCallbackDataEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceMemoryReportFeaturesEXT;
 
+  //=== VK_EXT_robustness2 ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT;
+
   //=== VK_EXT_custom_border_color ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorFeaturesEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorPropertiesEXT;
@@ -4404,14 +3790,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCudaKernelLaunchPropertiesNV;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-  using VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM;
-  using VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM;
-  using VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM;
-  using VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM;
-
   //=== VK_NV_low_latency ===
   using VULKAN_HPP_NAMESPACE::QueryLowLatencySupportNV;
 
@@ -4431,6 +3809,10 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ImportMetalTextureInfoEXT;
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
+  //=== VK_KHR_synchronization2 ===
+  using VULKAN_HPP_NAMESPACE::CheckpointData2NV;
+  using VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV;
+
   //=== VK_EXT_descriptor_buffer ===
   using VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT;
   using VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT;
@@ -4613,15 +3995,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMaintenance1FeaturesKHR;
   using VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommand2KHR;
 
-  //=== VK_KHR_shader_untyped_pointers ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE;
-
   //=== VK_EXT_image_view_min_lod ===
   using VULKAN_HPP_NAMESPACE::ImageViewMinLodCreateInfoEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewMinLodFeaturesEXT;
@@ -4675,6 +4048,9 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_ARM_shader_core_properties ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesARM;
 
+  //=== VK_KHR_shader_subgroup_rotate ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR;
+
   //=== VK_ARM_scheduling_controls ===
   using VULKAN_HPP_NAMESPACE::DeviceQueueShaderCoreControlCreateInfoARM;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFeaturesARM;
@@ -4689,6 +4065,9 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
 
+  //=== VK_EXT_depth_clamp_zero_one ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT;
+
   //=== VK_EXT_non_seamless_cube_map ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
 
@@ -4699,11 +4078,21 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM;
   using VULKAN_HPP_NAMESPACE::RenderPassStripeSubmitInfoARM;
 
+  //=== VK_QCOM_fragment_density_map_offset ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
+  using VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM;
+
   //=== VK_NV_copy_memory_indirect ===
+  using VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV;
+  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV;
 
   //=== VK_NV_memory_decompression ===
   using VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV;
 
   //=== VK_NV_device_generated_commands_compute ===
   using VULKAN_HPP_NAMESPACE::BindPipelineIndirectCommandNV;
@@ -4711,11 +4100,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
   using VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV;
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  using VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryLinearSweptSpheresDataNV;
-  using VULKAN_HPP_NAMESPACE::AccelerationStructureGeometrySpheresDataNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-
   //=== VK_NV_linear_color_attachment ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceLinearColorAttachmentFeaturesNV;
 
@@ -4734,16 +4118,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferFeaturesEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferPropertiesEXT;
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  using VULKAN_HPP_NAMESPACE::ExternalFormatOHOS;
-  using VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS;
-  using VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS;
-  using VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS;
-  using VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS;
-  using VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_external_memory_acquire_unmodified ===
   using VULKAN_HPP_NAMESPACE::ExternalMemoryAcquireUnmodifiedEXT;
 
@@ -4765,32 +4139,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG;
   using VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM;
-  using VULKAN_HPP_NAMESPACE::CopyTensorInfoARM;
-  using VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM;
-  using VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM;
-  using VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM;
-  using VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM;
-  using VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM;
-  using VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM;
-  using VULKAN_HPP_NAMESPACE::TensorCopyARM;
-  using VULKAN_HPP_NAMESPACE::TensorCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM;
-  using VULKAN_HPP_NAMESPACE::TensorDescriptionARM;
-  using VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM;
-  using VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM;
-  using VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM;
-  using VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM;
-  using VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM;
-
   //=== VK_EXT_shader_module_identifier ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierFeaturesEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierPropertiesEXT;
@@ -4813,6 +4161,9 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_legacy_dithering ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT;
 
+  //=== VK_EXT_pipeline_protected_access ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT;
+
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_ANDROID_external_format_resolve ===
   using VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatResolvePropertiesANDROID;
@@ -4820,26 +4171,17 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFormatResolvePropertiesANDROID;
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  //=== VK_AMD_anti_lag ===
-  using VULKAN_HPP_NAMESPACE::AntiLagDataAMD;
-  using VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  using VULKAN_HPP_NAMESPACE::AccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PresentId2KHR;
-  using VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR;
-
-  //=== VK_KHR_present_wait2 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR;
-  using VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR;
+  //=== VK_KHR_maintenance5 ===
+  using VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR;
+  using VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR;
+  using VULKAN_HPP_NAMESPACE::ImageSubresource2EXT;
+  using VULKAN_HPP_NAMESPACE::ImageSubresource2KHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR;
+  using VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR;
+  using VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR;
+  using VULKAN_HPP_NAMESPACE::SubresourceLayout2EXT;
+  using VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR;
 
   //=== VK_KHR_ray_tracing_position_fetch ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPositionFetchFeaturesKHR;
@@ -4849,20 +4191,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectPropertiesEXT;
   using VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT;
 
-  //=== VK_KHR_pipeline_binary ===
-  using VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR;
-  using VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR;
-
   //=== VK_QCOM_tile_properties ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceTilePropertiesFeaturesQCOM;
   using VULKAN_HPP_NAMESPACE::TilePropertiesQCOM;
@@ -4871,28 +4199,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::AmigoProfilingSubmitInfoSEC;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceAmigoProfilingFeaturesSEC;
 
-  //=== VK_KHR_surface_maintenance1 ===
-  using VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT;
-  using VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR;
-  using VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT;
-  using VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR;
-  using VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT;
-  using VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT;
-  using VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR;
-
   //=== VK_QCOM_multiview_per_view_viewports ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
 
@@ -4900,12 +4206,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesNV;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesNV;
 
-  //=== VK_NV_cooperative_vector ===
-  using VULKAN_HPP_NAMESPACE::ConvertCooperativeVectorMatrixInfoNV;
-  using VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV;
-
   //=== VK_NV_extended_sparse_address_space ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
@@ -4918,10 +4218,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMutableDescriptorTypeFeaturesEXT;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMutableDescriptorTypeFeaturesVALVE;
 
-  //=== VK_EXT_legacy_vertex_attributes ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-
   //=== VK_EXT_layer_settings ===
   using VULKAN_HPP_NAMESPACE::LayerSettingEXT;
   using VULKAN_HPP_NAMESPACE::LayerSettingsCreateInfoEXT;
@@ -4952,39 +4248,10 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesKHR;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesKHR;
 
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM;
-
   //=== VK_QCOM_multiview_per_view_render_areas ===
   using VULKAN_HPP_NAMESPACE::MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
 
-  //=== VK_KHR_compute_shader_derivatives ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-
   //=== VK_KHR_video_decode_av1 ===
   using VULKAN_HPP_NAMESPACE::VideoDecodeAV1CapabilitiesKHR;
   using VULKAN_HPP_NAMESPACE::VideoDecodeAV1DpbSlotInfoKHR;
@@ -4992,27 +4259,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::VideoDecodeAV1ProfileInfoKHR;
   using VULKAN_HPP_NAMESPACE::VideoDecodeAV1SessionParametersCreateInfoKHR;
 
-  //=== VK_KHR_video_encode_av1 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR;
-
-  //=== VK_KHR_video_decode_vp9 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR;
-
   //=== VK_KHR_video_maintenance1 ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance1FeaturesKHR;
   using VULKAN_HPP_NAMESPACE::VideoInlineQueryInfoKHR;
@@ -5040,9 +4286,17 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
 
-  //=== VK_KHR_unified_image_layouts ===
-  using VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
+  //=== VK_KHR_vertex_attribute_divisor ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR;
+  using VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoEXT;
+  using VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR;
+  using VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionEXT;
+  using VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR;
+
+  //=== VK_KHR_shader_float_controls2 ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR;
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_external_memory_screen_buffer ===
@@ -5056,296 +4310,48 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_MSFT_layered_driver ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT;
 
+  //=== VK_KHR_index_type_uint8 ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR;
+
+  //=== VK_KHR_line_rasterization ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesEXT;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR;
+  using VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoEXT;
+  using VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR;
+
   //=== VK_KHR_calibrated_timestamps ===
   using VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoEXT;
   using VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR;
 
+  //=== VK_KHR_shader_expect_assume ===
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR;
+
   //=== VK_KHR_maintenance6 ===
   using VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT;
+  using VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR;
+  using VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR;
+  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR;
+  using VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR;
+  using VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR;
+  using VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR;
   using VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT;
 
   //=== VK_NV_descriptor_pool_overallocation ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
 
-  //=== VK_QCOM_tile_memory_heap ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM;
-  using VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM;
-  using VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM;
-  using VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  using VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV;
-  using VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV;
-  using VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR;
-
-  //=== VK_EXT_memory_decompression ===
-  using VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT;
-  using VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV;
-
-  //=== VK_NV_display_stereo ===
-  using VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV;
-  using VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR;
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR;
-
   //=== VK_NV_raw_access_chains ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRawAccessChainsFeaturesNV;
 
-  //=== VK_NV_external_compute_queue ===
-  using VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV;
-  using VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV;
-  using VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV;
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-
-  //=== VK_NV_command_buffer_inheritance ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV;
-
-  //=== VK_KHR_maintenance7 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR;
-
   //=== VK_NV_shader_atomic_float16_vector ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
 
-  //=== VK_EXT_shader_replicated_composites ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-
-  //=== VK_EXT_shader_float8 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT;
-
   //=== VK_NV_ray_tracing_validation ===
   using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingValidationFeaturesNV;
 
-  //=== VK_NV_cluster_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureCommandsInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInputInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpInputNV;
-  using VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV;
-  using VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-  using VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  using VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV;
-  using VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV;
-  using VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-  using VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  using VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT;
-  using VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT;
-  using VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT;
-  using VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT;
-  using VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT;
-  using VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT;
-  using VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsTokenDataEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT;
-  using VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT;
-
-  //=== VK_KHR_maintenance8 ===
-  using VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR;
-
-  //=== VK_MESA_image_alignment_control ===
-  using VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA;
-
-  //=== VK_KHR_shader_fma ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-
-  //=== VK_EXT_depth_clamp_control ===
-  using VULKAN_HPP_NAMESPACE::DepthClampRangeEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT;
-
-  //=== VK_KHR_maintenance9 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR;
-
-  //=== VK_KHR_video_maintenance2 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR;
-  using VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  using VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  using VULKAN_HPP_NAMESPACE::NativeBufferOHOS;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS;
-  using VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  using VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI;
-
-  //=== VK_NV_cooperative_matrix2 ===
-  using VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV;
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  using VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT;
-  using VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-  //=== VK_ARM_performance_counters_by_region ===
-  using VULKAN_HPP_NAMESPACE::PerformanceCounterARM;
-  using VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM;
-  using VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM;
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
-
-  //=== VK_ARM_format_pack ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM;
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-  using VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE;
-
-  //=== VK_KHR_robustness2 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV;
-  using VULKAN_HPP_NAMESPACE::SetPresentConfigNV;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
-  using VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT;
-  using VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM;
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT;
-
-  //=== VK_EXT_custom_resolve ===
-  using VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT;
-  using VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT;
-
-  //=== VK_QCOM_data_graph_model ===
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM;
-  using VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM;
-
-  //=== VK_KHR_maintenance10 ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR;
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR;
-  using VULKAN_HPP_NAMESPACE::RenderingEndInfoEXT;
-  using VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR;
-  using VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR;
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-
   //===============
   //=== HANDLEs ===
   //===============
@@ -5442,29 +4448,12 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_opacity_micromap ===
   using VULKAN_HPP_NAMESPACE::MicromapEXT;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::TensorARM;
-  using VULKAN_HPP_NAMESPACE::TensorViewARM;
-
   //=== VK_NV_optical_flow ===
   using VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV;
 
   //=== VK_EXT_shader_object ===
   using VULKAN_HPP_NAMESPACE::ShaderEXT;
 
-  //=== VK_KHR_pipeline_binary ===
-  using VULKAN_HPP_NAMESPACE::PipelineBinaryKHR;
-
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM;
-
-  //=== VK_NV_external_compute_queue ===
-  using VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  using VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT;
-  using VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT;
-
   //======================
   //=== UNIQUE HANDLEs ===
   //======================
@@ -5558,29 +4547,12 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_opacity_micromap ===
   using VULKAN_HPP_NAMESPACE::UniqueMicromapEXT;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::UniqueTensorARM;
-  using VULKAN_HPP_NAMESPACE::UniqueTensorViewARM;
-
   //=== VK_NV_optical_flow ===
   using VULKAN_HPP_NAMESPACE::UniqueOpticalFlowSessionNV;
 
   //=== VK_EXT_shader_object ===
-  using VULKAN_HPP_NAMESPACE::UniqueShaderEXT;
-
-  //=== VK_KHR_pipeline_binary ===
-  using VULKAN_HPP_NAMESPACE::UniquePipelineBinaryKHR;
-
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::UniqueDataGraphPipelineSessionARM;
-
-  //=== VK_NV_external_compute_queue ===
-  using VULKAN_HPP_NAMESPACE::UniqueExternalComputeQueueNV;
-
-  //=== VK_EXT_device_generated_commands ===
   using VULKAN_HPP_NAMESPACE::UniqueHandleTraits;
-  using VULKAN_HPP_NAMESPACE::UniqueIndirectCommandsLayoutEXT;
-  using VULKAN_HPP_NAMESPACE::UniqueIndirectExecutionSetEXT;
+  using VULKAN_HPP_NAMESPACE::UniqueShaderEXT;
 #endif /*VULKAN_HPP_NO_SMART_HANDLE*/
 
   //======================
@@ -5679,32 +4651,12 @@ export namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_opacity_micromap ===
   using VULKAN_HPP_NAMESPACE::SharedMicromapEXT;
 
-  //=== VK_ARM_tensors ===
-  using VULKAN_HPP_NAMESPACE::SharedTensorARM;
-  using VULKAN_HPP_NAMESPACE::SharedTensorViewARM;
-
   //=== VK_NV_optical_flow ===
   using VULKAN_HPP_NAMESPACE::SharedOpticalFlowSessionNV;
 
   //=== VK_EXT_shader_object ===
-  using VULKAN_HPP_NAMESPACE::SharedShaderEXT;
-
-  //=== VK_KHR_pipeline_binary ===
-  using VULKAN_HPP_NAMESPACE::SharedPipelineBinaryKHR;
-
-  //=== VK_ARM_data_graph ===
-  using VULKAN_HPP_NAMESPACE::SharedDataGraphPipelineSessionARM;
-
-  //=== VK_NV_external_compute_queue ===
-  using VULKAN_HPP_NAMESPACE::SharedExternalComputeQueueNV;
-
-  //=== VK_EXT_device_generated_commands ===
   using VULKAN_HPP_NAMESPACE::SharedHandleTraits;
-  using VULKAN_HPP_NAMESPACE::SharedIndirectCommandsLayoutEXT;
-  using VULKAN_HPP_NAMESPACE::SharedIndirectExecutionSetEXT;
-
-  //=== VK_KHR_swapchain enum ===
-  using VULKAN_HPP_NAMESPACE::SwapchainOwns;
+  using VULKAN_HPP_NAMESPACE::SharedShaderEXT;
 #endif /*VULKAN_HPP_NO_SMART_HANDLE*/
 
   //===========================
@@ -5723,11 +4675,8 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::StructExtends;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-  namespace detail
-  {
-    using VULKAN_HPP_NAMESPACE::detail::DynamicLoader;
-  }  // namespace detail
+#if defined( VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL )
+  using VULKAN_HPP_NAMESPACE::DynamicLoader;
 #endif /*VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL*/
 
   //=====================
@@ -5743,11 +4692,6 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::componentPlaneIndex;
   using VULKAN_HPP_NAMESPACE::componentsAreCompressed;
   using VULKAN_HPP_NAMESPACE::compressionScheme;
-  using VULKAN_HPP_NAMESPACE::getDepthFormats;
-  using VULKAN_HPP_NAMESPACE::getDepthStencilFormats;
-  using VULKAN_HPP_NAMESPACE::getStencilFormats;
-  using VULKAN_HPP_NAMESPACE::hasDepthComponent;
-  using VULKAN_HPP_NAMESPACE::hasStencilComponent;
   using VULKAN_HPP_NAMESPACE::isCompressed;
   using VULKAN_HPP_NAMESPACE::packed;
   using VULKAN_HPP_NAMESPACE::planeCompatibleFormat;
@@ -5782,14 +4726,10 @@ export namespace VULKAN_HPP_NAMESPACE
     //======================
 
     using VULKAN_HPP_RAII_NAMESPACE::Context;
-    using VULKAN_HPP_RAII_NAMESPACE::isVulkanRAIIHandleType;
-
-    namespace detail
-    {
-      using VULKAN_HPP_RAII_NAMESPACE::detail::ContextDispatcher;
-      using VULKAN_HPP_RAII_NAMESPACE::detail::DeviceDispatcher;
-      using VULKAN_HPP_RAII_NAMESPACE::detail::InstanceDispatcher;
-    }  // namespace detail
+    using VULKAN_HPP_RAII_NAMESPACE::ContextDispatcher;
+    using VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher;
+    using VULKAN_HPP_RAII_NAMESPACE::exchange;
+    using VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher;
 
     //====================
     //=== RAII HANDLEs ===
@@ -5891,10 +4831,6 @@ export namespace VULKAN_HPP_NAMESPACE
     //=== VK_EXT_opacity_micromap ===
     using VULKAN_HPP_RAII_NAMESPACE::MicromapEXT;
 
-    //=== VK_ARM_tensors ===
-    using VULKAN_HPP_RAII_NAMESPACE::TensorARM;
-    using VULKAN_HPP_RAII_NAMESPACE::TensorViewARM;
-
     //=== VK_NV_optical_flow ===
     using VULKAN_HPP_RAII_NAMESPACE::OpticalFlowSessionNV;
 
@@ -5902,4774 +4838,6 @@ export namespace VULKAN_HPP_NAMESPACE
     using VULKAN_HPP_RAII_NAMESPACE::ShaderEXT;
     using VULKAN_HPP_RAII_NAMESPACE::ShaderEXTs;
 
-    //=== VK_KHR_pipeline_binary ===
-    using VULKAN_HPP_RAII_NAMESPACE::PipelineBinaryKHR;
-    using VULKAN_HPP_RAII_NAMESPACE::PipelineBinaryKHRs;
-
-    //=== VK_ARM_data_graph ===
-    using VULKAN_HPP_RAII_NAMESPACE::DataGraphPipelineSessionARM;
-
-    //=== VK_NV_external_compute_queue ===
-    using VULKAN_HPP_RAII_NAMESPACE::ExternalComputeQueueNV;
-
-    //=== VK_EXT_device_generated_commands ===
-    using VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutEXT;
-    using VULKAN_HPP_RAII_NAMESPACE::IndirectExecutionSetEXT;
-
   }  // namespace VULKAN_HPP_RAII_NAMESPACE
 #endif
 }  // namespace VULKAN_HPP_NAMESPACE
-
-export namespace std
-{
-
-  //=======================================
-  //=== HASH specialization for Flags types ===
-  //=======================================
-
-  template <typename BitType>
-  struct hash<VULKAN_HPP_NAMESPACE::Flags<BitType>>;
-
-  //========================================
-  //=== HASH specializations for handles ===
-  //========================================
-
-  //=== VK_VERSION_1_0 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Instance>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevice>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Device>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Queue>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceMemory>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Fence>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Semaphore>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryPool>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Buffer>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Image>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageView>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandPool>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBuffer>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Event>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferView>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderModule>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCache>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Pipeline>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineLayout>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Sampler>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorPool>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSet>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Framebuffer>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPass>;
-
-  //=== VK_VERSION_1_1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>;
-
-  //=== VK_VERSION_1_3 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PrivateDataSlot>;
-
-  //=== VK_KHR_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceKHR>;
-
-  //=== VK_KHR_swapchain ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainKHR>;
-
-  //=== VK_KHR_display ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeKHR>;
-
-  //=== VK_EXT_debug_report ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>;
-
-  //=== VK_KHR_video_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>;
-
-  //=== VK_NVX_binary_import ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuModuleNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuFunctionNVX>;
-
-  //=== VK_EXT_debug_utils ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>;
-
-  //=== VK_KHR_acceleration_structure ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>;
-
-  //=== VK_EXT_validation_cache ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>;
-
-  //=== VK_NV_ray_tracing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>;
-
-  //=== VK_INTEL_performance_query ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>;
-
-  //=== VK_KHR_deferred_host_operations ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>;
-
-  //=== VK_NV_device_generated_commands ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_cuda_kernel_launch ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CudaModuleNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CudaFunctionNV>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_buffer_collection ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-  //=== VK_EXT_opacity_micromap ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapEXT>;
-
-  //=== VK_ARM_tensors ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewARM>;
-
-  //=== VK_NV_optical_flow ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>;
-
-  //=== VK_EXT_shader_object ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderEXT>;
-
-  //=== VK_KHR_pipeline_binary ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKHR>;
-
-  //=== VK_ARM_data_graph ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM>;
-
-  //=== VK_NV_external_compute_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV>;
-
-  //=== VK_EXT_device_generated_commands ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT>;
-
-  //========================================
-  //=== HASH specializations for structs ===
-  //========================================
-
-  //=== VK_VERSION_1_0 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Extent2D>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Extent3D>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Offset2D>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Offset3D>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Rect2D>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BaseInStructure>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BaseOutStructure>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferMemoryBarrier>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryBarrier>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AllocationCallbacks>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ApplicationInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FormatProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageFormatProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::InstanceCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryHeap>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryType>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExtensionProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LayerProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MappedMemoryRange>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryRequirements>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindSparseInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresource>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageMemoryBind>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseMemoryBind>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FenceCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubresourceLayout>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ComponentMapping>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresourceRange>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCopy>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferImageCopy>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCopy>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::EventCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SpecializationInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SpecializationMapEntry>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushConstantRange>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyDescriptorSet>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorImageInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSet>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClearColorValue>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawIndirectCommand>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StencilOpState>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDescription>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Viewport>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentDescription>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentReference>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FramebufferCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassDependency>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassDescription>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClearAttachment>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClearDepthStencilValue>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClearRect>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClearValue>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageBlit>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageResolve>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassBeginInfo>;
-
-  //=== VK_VERSION_1_1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindImageMemoryInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedRequirements>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupCommandBufferBeginInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupSubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupBindSparseInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindBufferMemoryDeviceGroupInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindImageMemoryDeviceGroupInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupDeviceCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryRequirements2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FormatProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewUsageCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ProtectedSubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindImagePlaneMemoryInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImagePlaneMemoryRequirementsInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalImageFormatInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalImageFormatProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalBufferProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceIDProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryImageCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryBufferCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMemoryAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalFenceProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportFenceCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportSemaphoreCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance3Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDrawParametersFeatures>;
-
-  //=== VK_VERSION_1_2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan11Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan11Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan12Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan12Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageFormatListCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ConformanceVersion>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDriverProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostQueryResetFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTimelineSemaphoreFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTimelineSemaphoreProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreTypeCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TimelineSemaphoreSubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceBufferDeviceAddressFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferOpaqueCaptureAddressCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryOpaqueCaptureAddressAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentDescription2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentReference2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassDescription2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassDependency2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassBeginInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassEndInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout>;
-
-  //=== VK_VERSION_1_3 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePrivateDataFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DevicePrivateDataCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryBarrier2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DependencyInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubmitInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSynchronization2Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyBufferInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCopy2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCopy2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferImageCopy2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FormatProperties3>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupSizeControlFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupSizeControlProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineShaderStageRequiredSubgroupSizeCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceInlineUniformBlockFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceInlineUniformBlockProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetInlineUniformBlock>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorPoolInlineUniformBlockCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BlitImageInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageBlit2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ResolveImageInfo2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageResolve2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRenderingCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceRenderingInfo>;
-
-  //=== VK_VERSION_1_4 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryMapInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryUnmapInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresource2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubresourceLayout2>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindMemoryStatus>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryToImageCopy>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageToMemoryCopy>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToImageInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushConstantsInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAreaInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo>;
-
-  //=== VK_KHR_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>;
-
-  //=== VK_KHR_swapchain ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSwapchainCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindImageMemorySwapchainInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupPresentInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupSwapchainCreateInfoKHR>;
-
-  //=== VK_KHR_display ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR>;
-
-  //=== VK_KHR_display_swapchain ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPresentInfoKHR>;
-
-#if defined( VK_USE_PLATFORM_XLIB_KHR )
-  //=== VK_KHR_xlib_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR>;
-#endif /*VK_USE_PLATFORM_XLIB_KHR*/
-
-#if defined( VK_USE_PLATFORM_XCB_KHR )
-  //=== VK_KHR_xcb_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR>;
-#endif /*VK_USE_PLATFORM_XCB_KHR*/
-
-#if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-  //=== VK_KHR_wayland_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR>;
-#endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  //=== VK_KHR_android_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR>;
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_win32_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_EXT_debug_report ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT>;
-
-  //=== VK_AMD_rasterization_order ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateRasterizationOrderAMD>;
-
-  //=== VK_EXT_debug_marker ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT>;
-
-  //=== VK_KHR_video_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyQueryResultStatusPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyVideoPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoProfileListInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR>;
-
-  //=== VK_KHR_video_decode_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeUsageInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR>;
-
-  //=== VK_NV_dedicated_allocation ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DedicatedAllocationImageCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DedicatedAllocationBufferCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DedicatedAllocationMemoryAllocateInfoNV>;
-
-  //=== VK_EXT_transform_feedback ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTransformFeedbackFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTransformFeedbackPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateInfoEXT>;
-
-  //=== VK_NVX_binary_import ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX>;
-
-  //=== VK_NVX_image_view_handle ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX>;
-
-  //=== VK_KHR_video_encode_h264 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264QualityLevelPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersGetInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersFeedbackInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264DpbSlotInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlLayerInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264GopRemainingFrameInfoKHR>;
-
-  //=== VK_KHR_video_encode_h265 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265QualityLevelPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersGetInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersFeedbackInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265DpbSlotInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlLayerInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265GopRemainingFrameInfoKHR>;
-
-  //=== VK_KHR_video_decode_h264 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264DpbSlotInfoKHR>;
-
-  //=== VK_AMD_texture_gather_bias_lod ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TextureLODGatherFormatPropertiesAMD>;
-
-  //=== VK_AMD_shader_info ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderStatisticsInfoAMD>;
-
-#if defined( VK_USE_PLATFORM_GGP )
-  //=== VK_GGP_stream_descriptor_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP>;
-#endif /*VK_USE_PLATFORM_GGP*/
-
-  //=== VK_NV_corner_sampled_image ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCornerSampledImageFeaturesNV>;
-
-  //=== VK_NV_external_memory_capabilities ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV>;
-
-  //=== VK_NV_external_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryImageCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMemoryAllocateInfoNV>;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_NV_external_memory_win32 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryWin32HandleInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMemoryWin32HandleInfoNV>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_NV_win32_keyed_mutex ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Win32KeyedMutexAcquireReleaseInfoNV>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_device_group ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSwapchainCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindImageMemorySwapchainInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupPresentInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceGroupSwapchainCreateInfoKHR>;
-
-  //=== VK_EXT_validation_flags ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ValidationFlagsEXT>;
-
-#if defined( VK_USE_PLATFORM_VI_NN )
-  //=== VK_NN_vi_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN>;
-#endif /*VK_USE_PLATFORM_VI_NN*/
-
-  //=== VK_EXT_astc_decode_mode ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewASTCDecodeModeEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceASTCDecodeFeaturesEXT>;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_memory_win32 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMemoryWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_memory_fd ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryFdInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR>;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_win32_keyed_mutex ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Win32KeyedMutexAcquireReleaseInfoKHR>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_semaphore_win32 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportSemaphoreWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::D3D12FenceSubmitInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_semaphore_fd ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR>;
-
-  //=== VK_EXT_conditional_rendering ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceConditionalRenderingFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceConditionalRenderingInfoEXT>;
-
-  //=== VK_KHR_incremental_present ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentRegionsKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentRegionKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RectLayerKHR>;
-
-  //=== VK_NV_clip_space_w_scaling ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ViewportWScalingNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportWScalingStateCreateInfoNV>;
-
-  //=== VK_EXT_display_surface_counter ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT>;
-
-  //=== VK_EXT_display_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainCounterCreateInfoEXT>;
-
-  //=== VK_GOOGLE_display_timing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimesInfoGOOGLE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE>;
-
-  //=== VK_NVX_multiview_per_view_attributes ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX>;
-
-  //=== VK_NV_viewport_swizzle ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ViewportSwizzleNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateInfoNV>;
-
-  //=== VK_EXT_discard_rectangles ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDiscardRectanglePropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateInfoEXT>;
-
-  //=== VK_EXT_conservative_rasterization ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceConservativeRasterizationPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateInfoEXT>;
-
-  //=== VK_EXT_depth_clip_enable ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClipEnableFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateInfoEXT>;
-
-  //=== VK_EXT_hdr_metadata ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HdrMetadataEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::XYColorEXT>;
-
-  //=== VK_IMG_relaxed_line_rasterization ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRelaxedLineRasterizationFeaturesIMG>;
-
-  //=== VK_KHR_shared_presentable_image ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SharedPresentSurfaceCapabilitiesKHR>;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_fence_win32 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportFenceWin32HandleInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_fence_fd ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR>;
-
-  //=== VK_KHR_performance_query ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceQueryFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceQueryPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterResultKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceQuerySubmitInfoKHR>;
-
-  //=== VK_KHR_get_surface_capabilities2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>;
-
-  //=== VK_KHR_get_display_properties2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR>;
-
-#if defined( VK_USE_PLATFORM_IOS_MVK )
-  //=== VK_MVK_ios_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK>;
-#endif /*VK_USE_PLATFORM_IOS_MVK*/
-
-#if defined( VK_USE_PLATFORM_MACOS_MVK )
-  //=== VK_MVK_macos_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK>;
-#endif /*VK_USE_PLATFORM_MACOS_MVK*/
-
-  //=== VK_EXT_debug_utils ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT>;
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferUsageANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatPropertiesANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportAndroidHardwareBufferInfoANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalFormatANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatProperties2ANDROID>;
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_shader_enqueue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEnqueueFeaturesAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEnqueuePropertiesAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DispatchGraphInfoAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_AMD_mixed_attachment_samples ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD>;
-
-  //=== VK_KHR_shader_bfloat16 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR>;
-
-  //=== VK_EXT_sample_locations ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SampleLocationEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassSampleLocationsBeginInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineSampleLocationsStateCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSampleLocationsPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT>;
-
-  //=== VK_EXT_blend_operation_advanced ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceBlendOperationAdvancedFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceBlendOperationAdvancedPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineColorBlendAdvancedStateCreateInfoEXT>;
-
-  //=== VK_NV_fragment_coverage_to_color ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateInfoNV>;
-
-  //=== VK_KHR_acceleration_structure ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AabbPositionsKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryTrianglesDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TransformMatrixKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryAabbsDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureInstanceKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryInstancesDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAccelerationStructureFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAccelerationStructurePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR>;
-
-  //=== VK_KHR_ray_tracing_pipeline ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPipelineFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPipelinePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommandKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR>;
-
-  //=== VK_KHR_ray_query ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayQueryFeaturesKHR>;
-
-  //=== VK_NV_framebuffer_mixed_samples ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateInfoNV>;
-
-  //=== VK_NV_shader_sm_builtins ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSMBuiltinsPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSMBuiltinsFeaturesNV>;
-
-  //=== VK_EXT_image_drm_format_modifier ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesListEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageDrmFormatModifierInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierListCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierExplicitCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesList2EXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT>;
-
-  //=== VK_EXT_validation_cache ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderModuleValidationCacheCreateInfoEXT>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_KHR_portability_subset ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePortabilitySubsetFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePortabilitySubsetPropertiesKHR>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_NV_shading_rate_image ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportShadingRateImageStateCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShadingRateImageFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShadingRateImagePropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportCoarseSampleOrderStateCreateInfoNV>;
-
-  //=== VK_NV_ray_tracing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeometryTrianglesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeometryAABBNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeometryDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeometryNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPropertiesNV>;
-
-  //=== VK_NV_representative_fragment_test ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRepresentativeFragmentTestFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRepresentativeFragmentTestStateCreateInfoNV>;
-
-  //=== VK_EXT_filter_cubic ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewImageFormatInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FilterCubicImageViewImageFormatPropertiesEXT>;
-
-  //=== VK_EXT_external_memory_host ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryHostPointerInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryHostPropertiesEXT>;
-
-  //=== VK_KHR_shader_clock ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderClockFeaturesKHR>;
-
-  //=== VK_AMD_pipeline_compiler_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCompilerControlCreateInfoAMD>;
-
-  //=== VK_AMD_shader_core_properties ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesAMD>;
-
-  //=== VK_KHR_video_decode_h265 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265DpbSlotInfoKHR>;
-
-  //=== VK_AMD_memory_overallocation_behavior ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceMemoryOverallocationCreateInfoAMD>;
-
-  //=== VK_EXT_vertex_attribute_divisor ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesEXT>;
-
-#if defined( VK_USE_PLATFORM_GGP )
-  //=== VK_GGP_frame_token ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentFrameTokenGGP>;
-#endif /*VK_USE_PLATFORM_GGP*/
-
-  //=== VK_NV_mesh_shader ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandNV>;
-
-  //=== VK_NV_shader_image_footprint ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageFootprintFeaturesNV>;
-
-  //=== VK_NV_scissor_exclusive ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportExclusiveScissorStateCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExclusiveScissorFeaturesNV>;
-
-  //=== VK_NV_device_diagnostic_checkpoints ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CheckpointDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CheckpointData2NV>;
-
-  //=== VK_EXT_present_timing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentStageTimeEXT>;
-
-  //=== VK_INTEL_shader_integer_functions2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL>;
-
-  //=== VK_INTEL_performance_query ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceValueINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryPoolPerformanceQueryCreateInfoINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL>;
-
-  //=== VK_EXT_pci_bus_info ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePCIBusInfoPropertiesEXT>;
-
-  //=== VK_AMD_display_native_hdr ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayNativeHdrSurfaceCapabilitiesAMD>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainDisplayNativeHdrCreateInfoAMD>;
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_imagepipe_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA>;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_metal_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT>;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_EXT_fragment_density_map ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT>;
-
-  //=== VK_KHR_fragment_shading_rate ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FragmentShadingRateAttachmentInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateStateCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRatePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR>;
-
-  //=== VK_AMD_shader_core_properties2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreProperties2AMD>;
-
-  //=== VK_AMD_device_coherent_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCoherentMemoryFeaturesAMD>;
-
-  //=== VK_EXT_shader_image_atomic_int64 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageAtomicInt64FeaturesEXT>;
-
-  //=== VK_KHR_shader_quad_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderQuadControlFeaturesKHR>;
-
-  //=== VK_EXT_memory_budget ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryBudgetPropertiesEXT>;
-
-  //=== VK_EXT_memory_priority ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryPriorityFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryPriorityAllocateInfoEXT>;
-
-  //=== VK_KHR_surface_protected_capabilities ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceProtectedCapabilitiesKHR>;
-
-  //=== VK_NV_dedicated_allocation_image_aliasing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV>;
-
-  //=== VK_EXT_buffer_device_address ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceBufferDeviceAddressFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferDeviceAddressCreateInfoEXT>;
-
-  //=== VK_EXT_validation_features ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ValidationFeaturesEXT>;
-
-  //=== VK_KHR_present_wait ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWaitFeaturesKHR>;
-
-  //=== VK_NV_cooperative_matrix ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesNV>;
-
-  //=== VK_NV_coverage_reduction_mode ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCoverageReductionModeFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>;
-
-  //=== VK_EXT_fragment_shader_interlock ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderInterlockFeaturesEXT>;
-
-  //=== VK_EXT_ycbcr_image_arrays ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcrImageArraysFeaturesEXT>;
-
-  //=== VK_EXT_provoking_vertex ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProvokingVertexFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProvokingVertexPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationProvokingVertexStateCreateInfoEXT>;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_EXT_full_screen_exclusive ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceFullScreenExclusiveInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesFullScreenExclusiveEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceFullScreenExclusiveWin32InfoEXT>;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_EXT_headless_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT>;
-
-  //=== VK_EXT_shader_atomic_float ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloatFeaturesEXT>;
-
-  //=== VK_EXT_extended_dynamic_state ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicStateFeaturesEXT>;
-
-  //=== VK_KHR_pipeline_executable_properties ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineExecutablePropertiesFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticValueKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>;
-
-  //=== VK_EXT_map_memory_placed ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryMapPlacedInfoEXT>;
-
-  //=== VK_EXT_shader_atomic_float2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat2FeaturesEXT>;
-
-  //=== VK_NV_device_generated_commands ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GraphicsPipelineShaderGroupsCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindShaderGroupIndirectCommandNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SetStateFlagsIndirectCommandNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV>;
-
-  //=== VK_NV_inherited_viewport_scissor ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceInheritedViewportScissorFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceViewportScissorInfoNV>;
-
-  //=== VK_EXT_texel_buffer_alignment ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentFeaturesEXT>;
-
-  //=== VK_QCOM_render_pass_transform ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassTransformBeginInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceRenderPassTransformInfoQCOM>;
-
-  //=== VK_EXT_depth_bias_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthBiasControlFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DepthBiasRepresentationInfoEXT>;
-
-  //=== VK_EXT_device_memory_report ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceMemoryReportFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceDeviceMemoryReportCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceMemoryReportCallbackDataEXT>;
-
-  //=== VK_EXT_custom_border_color ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerCustomBorderColorCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorFeaturesEXT>;
-
-  //=== VK_KHR_pipeline_library ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR>;
-
-  //=== VK_NV_present_barrier ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentBarrierFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentBarrierNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentBarrierCreateInfoNV>;
-
-  //=== VK_KHR_present_id ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentIdKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentIdFeaturesKHR>;
-
-  //=== VK_KHR_video_encode_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryPoolVideoEncodeFeedbackCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeUsageInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeRateControlInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR>;
-
-  //=== VK_NV_device_diagnostics_config ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDiagnosticsConfigFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigCreateInfoNV>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_cuda_kernel_launch ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCudaKernelLaunchFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCudaKernelLaunchPropertiesNV>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_QCOM_tile_shading ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM>;
-
-  //=== VK_NV_low_latency ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueryLowLatencySupportNV>;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_metal_objects ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalObjectCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalDeviceInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalCommandQueueInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalBufferInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMetalBufferInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalTextureInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMetalTextureInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalIOSurfaceInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMetalIOSurfaceInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExportMetalSharedEventInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMetalSharedEventInfoEXT>;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_EXT_descriptor_buffer ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorBufferBindingPushDescriptorBufferHandleEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorDataEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpaqueCaptureDescriptorDataCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT>;
-
-  //=== VK_EXT_graphics_pipeline_library ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryCreateInfoEXT>;
-
-  //=== VK_AMD_shader_early_and_late_fragment_tests ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD>;
-
-  //=== VK_KHR_fragment_shader_barycentric ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderBarycentricFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderBarycentricPropertiesKHR>;
-
-  //=== VK_KHR_shader_subgroup_uniform_control_flow ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR>;
-
-  //=== VK_NV_fragment_shading_rate_enums ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateEnumsFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateEnumsPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateEnumStateCreateInfoNV>;
-
-  //=== VK_NV_ray_tracing_motion_blur ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryMotionTrianglesDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureMatrixMotionInstanceNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureSRTMotionInstanceNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SRTDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMotionBlurFeaturesNV>;
-
-  //=== VK_EXT_mesh_shader ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandEXT>;
-
-  //=== VK_EXT_ycbcr_2plane_444_formats ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT>;
-
-  //=== VK_EXT_fragment_density_map2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMap2FeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMap2PropertiesEXT>;
-
-  //=== VK_QCOM_rotated_copy_commands ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyCommandTransformInfoQCOM>;
-
-  //=== VK_KHR_workgroup_memory_explicit_layout ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR>;
-
-  //=== VK_EXT_image_compression_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageCompressionControlFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCompressionControlEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageCompressionPropertiesEXT>;
-
-  //=== VK_EXT_attachment_feedback_loop_layout ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT>;
-
-  //=== VK_EXT_4444_formats ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevice4444FormatsFeaturesEXT>;
-
-  //=== VK_EXT_device_fault ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFaultFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionOneEXT>;
-
-  //=== VK_EXT_rgba10x6_formats ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRGBA10X6FormatsFeaturesEXT>;
-
-#if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-  //=== VK_EXT_directfb_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT>;
-#endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-
-  //=== VK_EXT_vertex_input_dynamic_state ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexInputDynamicStateFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT>;
-
-  //=== VK_EXT_physical_device_drm ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDrmPropertiesEXT>;
-
-  //=== VK_EXT_device_address_binding_report ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAddressBindingReportFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceAddressBindingCallbackDataEXT>;
-
-  //=== VK_EXT_depth_clip_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClipControlFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClipControlCreateInfoEXT>;
-
-  //=== VK_EXT_primitive_topology_list_restart ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>;
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_external_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryZirconHandleInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA>;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_external_semaphore ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA>;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_buffer_collection ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryBufferCollectionFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionImageCreateInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionBufferCreateInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA>;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-  //=== VK_HUAWEI_subpass_shading ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassShadingPipelineCreateInfoHUAWEI>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassShadingFeaturesHUAWEI>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassShadingPropertiesHUAWEI>;
-
-  //=== VK_HUAWEI_invocation_mask ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceInvocationMaskFeaturesHUAWEI>;
-
-  //=== VK_NV_external_memory_rdma ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryRDMAFeaturesNV>;
-
-  //=== VK_EXT_pipeline_properties ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelinePropertiesIdentifierEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelinePropertiesFeaturesEXT>;
-
-  //=== VK_EXT_frame_boundary ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFrameBoundaryFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FrameBoundaryEXT>;
-
-  //=== VK_EXT_multisampled_render_to_single_sampled ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubpassResolvePerformanceQueryEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultisampledRenderToSingleSampledInfoEXT>;
-
-  //=== VK_EXT_extended_dynamic_state2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState2FeaturesEXT>;
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  //=== VK_QNX_screen_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX>;
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-  //=== VK_EXT_color_write_enable ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceColorWriteEnableFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineColorWriteCreateInfoEXT>;
-
-  //=== VK_EXT_primitives_generated_query ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT>;
-
-  //=== VK_KHR_ray_tracing_maintenance1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMaintenance1FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommand2KHR>;
-
-  //=== VK_KHR_shader_untyped_pointers ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR>;
-
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE>;
-
-  //=== VK_EXT_image_view_min_lod ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewMinLodFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewMinLodCreateInfoEXT>;
-
-  //=== VK_EXT_multi_draw ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiDrawFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiDrawPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT>;
-
-  //=== VK_EXT_image_2d_view_of_3d ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImage2DViewOf3DFeaturesEXT>;
-
-  //=== VK_EXT_shader_tile_image ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTileImageFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTileImagePropertiesEXT>;
-
-  //=== VK_EXT_opacity_micromap ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapUsageEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureTrianglesOpacityMicromapEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MicromapTriangleEXT>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_displacement_micromap ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDisplacementMicromapFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDisplacementMicromapPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureTrianglesDisplacementMicromapNV>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_HUAWEI_cluster_culling_shader ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderFeaturesHUAWEI>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderPropertiesHUAWEI>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI>;
-
-  //=== VK_EXT_border_color_swizzle ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceBorderColorSwizzleFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerBorderColorComponentMappingCreateInfoEXT>;
-
-  //=== VK_EXT_pageable_device_local_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT>;
-
-  //=== VK_ARM_shader_core_properties ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesARM>;
-
-  //=== VK_ARM_scheduling_controls ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueShaderCoreControlCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsPropertiesARM>;
-
-  //=== VK_EXT_image_sliced_view_of_3d ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageSlicedViewOf3DFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewSlicedCreateInfoEXT>;
-
-  //=== VK_VALVE_descriptor_set_host_mapping ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE>;
-
-  //=== VK_EXT_non_seamless_cube_map ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceNonSeamlessCubeMapFeaturesEXT>;
-
-  //=== VK_ARM_render_pass_striped ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRenderPassStripedFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRenderPassStripedPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassStripeBeginInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassStripeSubmitInfoARM>;
-
-  //=== VK_NV_copy_memory_indirect ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV>;
-
-  //=== VK_NV_memory_decompression ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV>;
-
-  //=== VK_NV_device_generated_commands_compute ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ComputePipelineIndirectBufferInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindPipelineIndirectCommandNV>;
-
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryLinearSweptSpheresDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometrySpheresDataNV>;
-
-  //=== VK_NV_linear_color_attachment ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLinearColorAttachmentFeaturesNV>;
-
-  //=== VK_KHR_shader_maximal_reconvergence ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR>;
-
-  //=== VK_EXT_image_compression_control_swapchain ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT>;
-
-  //=== VK_QCOM_image_processing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageViewSampleWeightCreateInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessingFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessingPropertiesQCOM>;
-
-  //=== VK_EXT_nested_command_buffer ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferPropertiesEXT>;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalFormatOHOS>;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_EXT_external_memory_acquire_unmodified ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryAcquireUnmodifiedEXT>;
-
-  //=== VK_EXT_extended_dynamic_state3 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState3FeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState3PropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT>;
-
-  //=== VK_EXT_subpass_merge_feedback ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassMergeFeedbackFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassCreationControlEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackCreateInfoEXT>;
-
-  //=== VK_LUNARG_direct_driver_loading ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG>;
-
-  //=== VK_ARM_tensors ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorDescriptionARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyTensorInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCopyARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM>;
-
-  //=== VK_EXT_shader_module_identifier ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineShaderStageModuleIdentifierCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT>;
-
-  //=== VK_EXT_rasterization_order_attachment_access ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT>;
-
-  //=== VK_NV_optical_flow ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreatePrivateDataInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV>;
-
-  //=== VK_EXT_legacy_dithering ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT>;
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  //=== VK_ANDROID_external_format_resolve ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFormatResolveFeaturesANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFormatResolvePropertiesANDROID>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatResolvePropertiesANDROID>;
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-  //=== VK_AMD_anti_lag ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AntiLagDataAMD>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AccelerationStructureDenseGeometryFormatTrianglesDataAMDX>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentId2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR>;
-
-  //=== VK_KHR_present_wait2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR>;
-
-  //=== VK_KHR_ray_tracing_position_fetch ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPositionFetchFeaturesKHR>;
-
-  //=== VK_EXT_shader_object ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT>;
-
-  //=== VK_KHR_pipeline_binary ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR>;
-
-  //=== VK_QCOM_tile_properties ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTilePropertiesFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>;
-
-  //=== VK_SEC_amigo_profiling ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAmigoProfilingFeaturesSEC>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AmigoProfilingSubmitInfoSEC>;
-
-  //=== VK_KHR_surface_maintenance1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR>;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR>;
-
-  //=== VK_QCOM_multiview_per_view_viewports ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>;
-
-  //=== VK_NV_ray_tracing_invocation_reorder ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesNV>;
-
-  //=== VK_NV_cooperative_vector ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ConvertCooperativeVectorMatrixInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR>;
-
-  //=== VK_NV_extended_sparse_address_space ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpacePropertiesNV>;
-
-  //=== VK_EXT_mutable_descriptor_type ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMutableDescriptorTypeFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MutableDescriptorTypeCreateInfoEXT>;
-
-  //=== VK_EXT_legacy_vertex_attributes ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT>;
-
-  //=== VK_EXT_layer_settings ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LayerSettingsCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LayerSettingEXT>;
-
-  //=== VK_ARM_shader_core_builtins ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreBuiltinsFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreBuiltinsPropertiesARM>;
-
-  //=== VK_EXT_pipeline_library_group_handles ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT>;
-
-  //=== VK_EXT_dynamic_rendering_unused_attachments ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT>;
-
-  //=== VK_NV_low_latency2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LatencySleepInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LatencySubmissionPresentIdNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainLatencyCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::LatencySurfaceCapabilitiesNV>;
-
-  //=== VK_KHR_cooperative_matrix ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesKHR>;
-
-  //=== VK_ARM_data_graph ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>;
-
-  //=== VK_QCOM_multiview_per_view_render_areas ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM>;
-
-  //=== VK_KHR_compute_shader_derivatives ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR>;
-
-  //=== VK_KHR_video_decode_av1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1DpbSlotInfoKHR>;
-
-  //=== VK_KHR_video_encode_av1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR>;
-
-  //=== VK_KHR_video_decode_vp9 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR>;
-
-  //=== VK_KHR_video_maintenance1 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance1FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoInlineQueryInfoKHR>;
-
-  //=== VK_NV_per_stage_descriptor_set ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerStageDescriptorSetFeaturesNV>;
-
-  //=== VK_QCOM_image_processing2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessing2FeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessing2PropertiesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerBlockMatchWindowCreateInfoQCOM>;
-
-  //=== VK_QCOM_filter_cubic_weights ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCubicWeightsFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerCubicWeightsCreateInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BlitImageCubicWeightsInfoQCOM>;
-
-  //=== VK_QCOM_ycbcr_degamma ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcrDegammaFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM>;
-
-  //=== VK_QCOM_filter_cubic_clamp ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCubicClampFeaturesQCOM>;
-
-  //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT>;
-
-  //=== VK_KHR_unified_image_layouts ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT>;
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  //=== VK_QNX_external_memory_screen_buffer ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ScreenBufferFormatPropertiesQNX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportScreenBufferInfoQNX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalFormatQNX>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX>;
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-  //=== VK_MSFT_layered_driver ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT>;
-
-  //=== VK_KHR_calibrated_timestamps ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR>;
-
-  //=== VK_KHR_maintenance6 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT>;
-
-  //=== VK_NV_descriptor_pool_overallocation ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorPoolOverallocationFeaturesNV>;
-
-  //=== VK_QCOM_tile_memory_heap ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM>;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR>;
-
-  //=== VK_EXT_memory_decompression ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT>;
-
-  //=== VK_NV_display_stereo ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV>;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>;
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR>;
-
-  //=== VK_NV_raw_access_chains ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRawAccessChainsFeaturesNV>;
-
-  //=== VK_NV_external_compute_queue ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV>;
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>;
-
-  //=== VK_NV_command_buffer_inheritance ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV>;
-
-  //=== VK_KHR_maintenance7 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR>;
-
-  //=== VK_NV_shader_atomic_float16_vector ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>;
-
-  //=== VK_EXT_shader_replicated_composites ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT>;
-
-  //=== VK_EXT_shader_float8 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT>;
-
-  //=== VK_NV_ray_tracing_validation ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingValidationFeaturesNV>;
-
-  //=== VK_NV_cluster_acceleration_structure ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpInputNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInputInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureCommandsInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV>;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV>;
-
-  //=== VK_EXT_device_generated_commands ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsTokenDataEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT>;
-
-  //=== VK_KHR_maintenance8 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR>;
-
-  //=== VK_MESA_image_alignment_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA>;
-
-  //=== VK_KHR_shader_fma ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR>;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT>;
-
-  //=== VK_EXT_depth_clamp_control ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DepthClampRangeEXT>;
-
-  //=== VK_KHR_maintenance9 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR>;
-
-  //=== VK_KHR_video_maintenance2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR>;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS>;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS>;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI>;
-
-  //=== VK_NV_cooperative_matrix2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV>;
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM>;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT>;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR>;
-
-  //=== VK_ARM_performance_counters_by_region ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM>;
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT>;
-
-  //=== VK_ARM_format_pack ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM>;
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE>;
-
-  //=== VK_KHR_robustness2 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR>;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SetPresentConfigNV>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV>;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT>;
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>;
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>;
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT>;
-
-  //=== VK_EXT_custom_resolve ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT>;
-
-  //=== VK_QCOM_data_graph_model ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM>;
-
-  //=== VK_KHR_maintenance10 ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR>;
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR>;
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>;
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>;
-
-  //=================================================================
-  //=== Required exports for VULKAN_HPP_NAMESPACE::StructureChain ===
-  //=================================================================
-
-#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-  using std::tuple_element;
-  using std::tuple_size;
-#endif
-}  // namespace std
-
-export
-{
-  // This VkFlags type is used as part of a bitfield in some structures.
-  // As it can't be mimicked by vk-data types, we need to export just that.
-  using ::VkGeometryInstanceFlagsKHR;
-
-  //==================
-  //=== PFN TYPEs ===
-  //==================
-
-  //=== VK_VERSION_1_0 ===
-  using ::PFN_vkAllocateCommandBuffers;
-  using ::PFN_vkAllocateDescriptorSets;
-  using ::PFN_vkAllocateMemory;
-  using ::PFN_vkBeginCommandBuffer;
-  using ::PFN_vkBindBufferMemory;
-  using ::PFN_vkBindImageMemory;
-  using ::PFN_vkCmdBeginQuery;
-  using ::PFN_vkCmdBeginRenderPass;
-  using ::PFN_vkCmdBindDescriptorSets;
-  using ::PFN_vkCmdBindIndexBuffer;
-  using ::PFN_vkCmdBindPipeline;
-  using ::PFN_vkCmdBindVertexBuffers;
-  using ::PFN_vkCmdBlitImage;
-  using ::PFN_vkCmdClearAttachments;
-  using ::PFN_vkCmdClearColorImage;
-  using ::PFN_vkCmdClearDepthStencilImage;
-  using ::PFN_vkCmdCopyBuffer;
-  using ::PFN_vkCmdCopyBufferToImage;
-  using ::PFN_vkCmdCopyImage;
-  using ::PFN_vkCmdCopyImageToBuffer;
-  using ::PFN_vkCmdCopyQueryPoolResults;
-  using ::PFN_vkCmdDispatch;
-  using ::PFN_vkCmdDispatchIndirect;
-  using ::PFN_vkCmdDraw;
-  using ::PFN_vkCmdDrawIndexed;
-  using ::PFN_vkCmdDrawIndexedIndirect;
-  using ::PFN_vkCmdDrawIndirect;
-  using ::PFN_vkCmdEndQuery;
-  using ::PFN_vkCmdEndRenderPass;
-  using ::PFN_vkCmdExecuteCommands;
-  using ::PFN_vkCmdFillBuffer;
-  using ::PFN_vkCmdNextSubpass;
-  using ::PFN_vkCmdPipelineBarrier;
-  using ::PFN_vkCmdPushConstants;
-  using ::PFN_vkCmdResetEvent;
-  using ::PFN_vkCmdResetQueryPool;
-  using ::PFN_vkCmdResolveImage;
-  using ::PFN_vkCmdSetBlendConstants;
-  using ::PFN_vkCmdSetDepthBias;
-  using ::PFN_vkCmdSetDepthBounds;
-  using ::PFN_vkCmdSetEvent;
-  using ::PFN_vkCmdSetLineWidth;
-  using ::PFN_vkCmdSetScissor;
-  using ::PFN_vkCmdSetStencilCompareMask;
-  using ::PFN_vkCmdSetStencilReference;
-  using ::PFN_vkCmdSetStencilWriteMask;
-  using ::PFN_vkCmdSetViewport;
-  using ::PFN_vkCmdUpdateBuffer;
-  using ::PFN_vkCmdWaitEvents;
-  using ::PFN_vkCmdWriteTimestamp;
-  using ::PFN_vkCreateBuffer;
-  using ::PFN_vkCreateBufferView;
-  using ::PFN_vkCreateCommandPool;
-  using ::PFN_vkCreateComputePipelines;
-  using ::PFN_vkCreateDescriptorPool;
-  using ::PFN_vkCreateDescriptorSetLayout;
-  using ::PFN_vkCreateDevice;
-  using ::PFN_vkCreateEvent;
-  using ::PFN_vkCreateFence;
-  using ::PFN_vkCreateFramebuffer;
-  using ::PFN_vkCreateGraphicsPipelines;
-  using ::PFN_vkCreateImage;
-  using ::PFN_vkCreateImageView;
-  using ::PFN_vkCreateInstance;
-  using ::PFN_vkCreatePipelineCache;
-  using ::PFN_vkCreatePipelineLayout;
-  using ::PFN_vkCreateQueryPool;
-  using ::PFN_vkCreateRenderPass;
-  using ::PFN_vkCreateSampler;
-  using ::PFN_vkCreateSemaphore;
-  using ::PFN_vkCreateShaderModule;
-  using ::PFN_vkDestroyBuffer;
-  using ::PFN_vkDestroyBufferView;
-  using ::PFN_vkDestroyCommandPool;
-  using ::PFN_vkDestroyDescriptorPool;
-  using ::PFN_vkDestroyDescriptorSetLayout;
-  using ::PFN_vkDestroyDevice;
-  using ::PFN_vkDestroyEvent;
-  using ::PFN_vkDestroyFence;
-  using ::PFN_vkDestroyFramebuffer;
-  using ::PFN_vkDestroyImage;
-  using ::PFN_vkDestroyImageView;
-  using ::PFN_vkDestroyInstance;
-  using ::PFN_vkDestroyPipeline;
-  using ::PFN_vkDestroyPipelineCache;
-  using ::PFN_vkDestroyPipelineLayout;
-  using ::PFN_vkDestroyQueryPool;
-  using ::PFN_vkDestroyRenderPass;
-  using ::PFN_vkDestroySampler;
-  using ::PFN_vkDestroySemaphore;
-  using ::PFN_vkDestroyShaderModule;
-  using ::PFN_vkDeviceWaitIdle;
-  using ::PFN_vkEndCommandBuffer;
-  using ::PFN_vkEnumerateDeviceExtensionProperties;
-  using ::PFN_vkEnumerateDeviceLayerProperties;
-  using ::PFN_vkEnumerateInstanceExtensionProperties;
-  using ::PFN_vkEnumerateInstanceLayerProperties;
-  using ::PFN_vkEnumeratePhysicalDevices;
-  using ::PFN_vkFlushMappedMemoryRanges;
-  using ::PFN_vkFreeCommandBuffers;
-  using ::PFN_vkFreeDescriptorSets;
-  using ::PFN_vkFreeMemory;
-  using ::PFN_vkGetBufferMemoryRequirements;
-  using ::PFN_vkGetDeviceMemoryCommitment;
-  using ::PFN_vkGetDeviceProcAddr;
-  using ::PFN_vkGetDeviceQueue;
-  using ::PFN_vkGetEventStatus;
-  using ::PFN_vkGetFenceStatus;
-  using ::PFN_vkGetImageMemoryRequirements;
-  using ::PFN_vkGetImageSparseMemoryRequirements;
-  using ::PFN_vkGetImageSubresourceLayout;
-  using ::PFN_vkGetInstanceProcAddr;
-  using ::PFN_vkGetPhysicalDeviceFeatures;
-  using ::PFN_vkGetPhysicalDeviceFormatProperties;
-  using ::PFN_vkGetPhysicalDeviceImageFormatProperties;
-  using ::PFN_vkGetPhysicalDeviceMemoryProperties;
-  using ::PFN_vkGetPhysicalDeviceProperties;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyProperties;
-  using ::PFN_vkGetPhysicalDeviceSparseImageFormatProperties;
-  using ::PFN_vkGetPipelineCacheData;
-  using ::PFN_vkGetQueryPoolResults;
-  using ::PFN_vkGetRenderAreaGranularity;
-  using ::PFN_vkInvalidateMappedMemoryRanges;
-  using ::PFN_vkMapMemory;
-  using ::PFN_vkMergePipelineCaches;
-  using ::PFN_vkQueueBindSparse;
-  using ::PFN_vkQueueSubmit;
-  using ::PFN_vkQueueWaitIdle;
-  using ::PFN_vkResetCommandBuffer;
-  using ::PFN_vkResetCommandPool;
-  using ::PFN_vkResetDescriptorPool;
-  using ::PFN_vkResetEvent;
-  using ::PFN_vkResetFences;
-  using ::PFN_vkSetEvent;
-  using ::PFN_vkUnmapMemory;
-  using ::PFN_vkUpdateDescriptorSets;
-  using ::PFN_vkWaitForFences;
-
-  //=== VK_VERSION_1_1 ===
-  using ::PFN_vkBindBufferMemory2;
-  using ::PFN_vkBindImageMemory2;
-  using ::PFN_vkCmdDispatchBase;
-  using ::PFN_vkCmdSetDeviceMask;
-  using ::PFN_vkCreateDescriptorUpdateTemplate;
-  using ::PFN_vkCreateSamplerYcbcrConversion;
-  using ::PFN_vkDestroyDescriptorUpdateTemplate;
-  using ::PFN_vkDestroySamplerYcbcrConversion;
-  using ::PFN_vkEnumerateInstanceVersion;
-  using ::PFN_vkEnumeratePhysicalDeviceGroups;
-  using ::PFN_vkGetBufferMemoryRequirements2;
-  using ::PFN_vkGetDescriptorSetLayoutSupport;
-  using ::PFN_vkGetDeviceGroupPeerMemoryFeatures;
-  using ::PFN_vkGetDeviceQueue2;
-  using ::PFN_vkGetImageMemoryRequirements2;
-  using ::PFN_vkGetImageSparseMemoryRequirements2;
-  using ::PFN_vkGetPhysicalDeviceExternalBufferProperties;
-  using ::PFN_vkGetPhysicalDeviceExternalFenceProperties;
-  using ::PFN_vkGetPhysicalDeviceExternalSemaphoreProperties;
-  using ::PFN_vkGetPhysicalDeviceFeatures2;
-  using ::PFN_vkGetPhysicalDeviceFormatProperties2;
-  using ::PFN_vkGetPhysicalDeviceImageFormatProperties2;
-  using ::PFN_vkGetPhysicalDeviceMemoryProperties2;
-  using ::PFN_vkGetPhysicalDeviceProperties2;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyProperties2;
-  using ::PFN_vkGetPhysicalDeviceSparseImageFormatProperties2;
-  using ::PFN_vkTrimCommandPool;
-  using ::PFN_vkUpdateDescriptorSetWithTemplate;
-
-  //=== VK_VERSION_1_2 ===
-  using ::PFN_vkCmdBeginRenderPass2;
-  using ::PFN_vkCmdDrawIndexedIndirectCount;
-  using ::PFN_vkCmdDrawIndirectCount;
-  using ::PFN_vkCmdEndRenderPass2;
-  using ::PFN_vkCmdNextSubpass2;
-  using ::PFN_vkCreateRenderPass2;
-  using ::PFN_vkGetBufferDeviceAddress;
-  using ::PFN_vkGetBufferOpaqueCaptureAddress;
-  using ::PFN_vkGetDeviceMemoryOpaqueCaptureAddress;
-  using ::PFN_vkGetSemaphoreCounterValue;
-  using ::PFN_vkResetQueryPool;
-  using ::PFN_vkSignalSemaphore;
-  using ::PFN_vkWaitSemaphores;
-
-  //=== VK_VERSION_1_3 ===
-  using ::PFN_vkCmdBeginRendering;
-  using ::PFN_vkCmdBindVertexBuffers2;
-  using ::PFN_vkCmdBlitImage2;
-  using ::PFN_vkCmdCopyBuffer2;
-  using ::PFN_vkCmdCopyBufferToImage2;
-  using ::PFN_vkCmdCopyImage2;
-  using ::PFN_vkCmdCopyImageToBuffer2;
-  using ::PFN_vkCmdEndRendering;
-  using ::PFN_vkCmdPipelineBarrier2;
-  using ::PFN_vkCmdResetEvent2;
-  using ::PFN_vkCmdResolveImage2;
-  using ::PFN_vkCmdSetCullMode;
-  using ::PFN_vkCmdSetDepthBiasEnable;
-  using ::PFN_vkCmdSetDepthBoundsTestEnable;
-  using ::PFN_vkCmdSetDepthCompareOp;
-  using ::PFN_vkCmdSetDepthTestEnable;
-  using ::PFN_vkCmdSetDepthWriteEnable;
-  using ::PFN_vkCmdSetEvent2;
-  using ::PFN_vkCmdSetFrontFace;
-  using ::PFN_vkCmdSetPrimitiveRestartEnable;
-  using ::PFN_vkCmdSetPrimitiveTopology;
-  using ::PFN_vkCmdSetRasterizerDiscardEnable;
-  using ::PFN_vkCmdSetScissorWithCount;
-  using ::PFN_vkCmdSetStencilOp;
-  using ::PFN_vkCmdSetStencilTestEnable;
-  using ::PFN_vkCmdSetViewportWithCount;
-  using ::PFN_vkCmdWaitEvents2;
-  using ::PFN_vkCmdWriteTimestamp2;
-  using ::PFN_vkCreatePrivateDataSlot;
-  using ::PFN_vkDestroyPrivateDataSlot;
-  using ::PFN_vkGetDeviceBufferMemoryRequirements;
-  using ::PFN_vkGetDeviceImageMemoryRequirements;
-  using ::PFN_vkGetDeviceImageSparseMemoryRequirements;
-  using ::PFN_vkGetPhysicalDeviceToolProperties;
-  using ::PFN_vkGetPrivateData;
-  using ::PFN_vkQueueSubmit2;
-  using ::PFN_vkSetPrivateData;
-
-  //=== VK_VERSION_1_4 ===
-  using ::PFN_vkCmdBindDescriptorSets2;
-  using ::PFN_vkCmdBindIndexBuffer2;
-  using ::PFN_vkCmdPushConstants2;
-  using ::PFN_vkCmdPushDescriptorSet;
-  using ::PFN_vkCmdPushDescriptorSet2;
-  using ::PFN_vkCmdPushDescriptorSetWithTemplate;
-  using ::PFN_vkCmdPushDescriptorSetWithTemplate2;
-  using ::PFN_vkCmdSetLineStipple;
-  using ::PFN_vkCmdSetRenderingAttachmentLocations;
-  using ::PFN_vkCmdSetRenderingInputAttachmentIndices;
-  using ::PFN_vkCopyImageToImage;
-  using ::PFN_vkCopyImageToMemory;
-  using ::PFN_vkCopyMemoryToImage;
-  using ::PFN_vkGetDeviceImageSubresourceLayout;
-  using ::PFN_vkGetImageSubresourceLayout2;
-  using ::PFN_vkGetRenderingAreaGranularity;
-  using ::PFN_vkMapMemory2;
-  using ::PFN_vkTransitionImageLayout;
-  using ::PFN_vkUnmapMemory2;
-
-  //=== VK_KHR_surface ===
-  using ::PFN_vkDestroySurfaceKHR;
-  using ::PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
-  using ::PFN_vkGetPhysicalDeviceSurfaceFormatsKHR;
-  using ::PFN_vkGetPhysicalDeviceSurfacePresentModesKHR;
-  using ::PFN_vkGetPhysicalDeviceSurfaceSupportKHR;
-
-  //=== VK_KHR_swapchain ===
-  using ::PFN_vkAcquireNextImage2KHR;
-  using ::PFN_vkAcquireNextImageKHR;
-  using ::PFN_vkCreateSwapchainKHR;
-  using ::PFN_vkDestroySwapchainKHR;
-  using ::PFN_vkGetDeviceGroupPresentCapabilitiesKHR;
-  using ::PFN_vkGetDeviceGroupSurfacePresentModesKHR;
-  using ::PFN_vkGetPhysicalDevicePresentRectanglesKHR;
-  using ::PFN_vkGetSwapchainImagesKHR;
-  using ::PFN_vkQueuePresentKHR;
-
-  //=== VK_KHR_display ===
-  using ::PFN_vkCreateDisplayModeKHR;
-  using ::PFN_vkCreateDisplayPlaneSurfaceKHR;
-  using ::PFN_vkGetDisplayModePropertiesKHR;
-  using ::PFN_vkGetDisplayPlaneCapabilitiesKHR;
-  using ::PFN_vkGetDisplayPlaneSupportedDisplaysKHR;
-  using ::PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
-  using ::PFN_vkGetPhysicalDeviceDisplayPropertiesKHR;
-
-  //=== VK_KHR_display_swapchain ===
-  using ::PFN_vkCreateSharedSwapchainsKHR;
-
-#if defined( VK_USE_PLATFORM_XLIB_KHR )
-  //=== VK_KHR_xlib_surface ===
-  using ::PFN_vkCreateXlibSurfaceKHR;
-  using ::PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR;
-#endif /*VK_USE_PLATFORM_XLIB_KHR*/
-
-#if defined( VK_USE_PLATFORM_XCB_KHR )
-  //=== VK_KHR_xcb_surface ===
-  using ::PFN_vkCreateXcbSurfaceKHR;
-  using ::PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR;
-#endif /*VK_USE_PLATFORM_XCB_KHR*/
-
-#if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-  //=== VK_KHR_wayland_surface ===
-  using ::PFN_vkCreateWaylandSurfaceKHR;
-  using ::PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR;
-#endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  //=== VK_KHR_android_surface ===
-  using ::PFN_vkCreateAndroidSurfaceKHR;
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_win32_surface ===
-  using ::PFN_vkCreateWin32SurfaceKHR;
-  using ::PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_EXT_debug_report ===
-  using ::PFN_vkCreateDebugReportCallbackEXT;
-  using ::PFN_vkDebugReportMessageEXT;
-  using ::PFN_vkDestroyDebugReportCallbackEXT;
-
-  //=== VK_EXT_debug_marker ===
-  using ::PFN_vkCmdDebugMarkerBeginEXT;
-  using ::PFN_vkCmdDebugMarkerEndEXT;
-  using ::PFN_vkCmdDebugMarkerInsertEXT;
-  using ::PFN_vkDebugMarkerSetObjectNameEXT;
-  using ::PFN_vkDebugMarkerSetObjectTagEXT;
-
-  //=== VK_KHR_video_queue ===
-  using ::PFN_vkBindVideoSessionMemoryKHR;
-  using ::PFN_vkCmdBeginVideoCodingKHR;
-  using ::PFN_vkCmdControlVideoCodingKHR;
-  using ::PFN_vkCmdEndVideoCodingKHR;
-  using ::PFN_vkCreateVideoSessionKHR;
-  using ::PFN_vkCreateVideoSessionParametersKHR;
-  using ::PFN_vkDestroyVideoSessionKHR;
-  using ::PFN_vkDestroyVideoSessionParametersKHR;
-  using ::PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR;
-  using ::PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR;
-  using ::PFN_vkGetVideoSessionMemoryRequirementsKHR;
-  using ::PFN_vkUpdateVideoSessionParametersKHR;
-
-  //=== VK_KHR_video_decode_queue ===
-  using ::PFN_vkCmdDecodeVideoKHR;
-
-  //=== VK_EXT_transform_feedback ===
-  using ::PFN_vkCmdBeginQueryIndexedEXT;
-  using ::PFN_vkCmdBeginTransformFeedbackEXT;
-  using ::PFN_vkCmdBindTransformFeedbackBuffersEXT;
-  using ::PFN_vkCmdDrawIndirectByteCountEXT;
-  using ::PFN_vkCmdEndQueryIndexedEXT;
-  using ::PFN_vkCmdEndTransformFeedbackEXT;
-
-  //=== VK_NVX_binary_import ===
-  using ::PFN_vkCmdCuLaunchKernelNVX;
-  using ::PFN_vkCreateCuFunctionNVX;
-  using ::PFN_vkCreateCuModuleNVX;
-  using ::PFN_vkDestroyCuFunctionNVX;
-  using ::PFN_vkDestroyCuModuleNVX;
-
-  //=== VK_NVX_image_view_handle ===
-  using ::PFN_vkGetImageViewAddressNVX;
-  using ::PFN_vkGetImageViewHandle64NVX;
-  using ::PFN_vkGetImageViewHandleNVX;
-
-  //=== VK_AMD_draw_indirect_count ===
-  using ::PFN_vkCmdDrawIndexedIndirectCountAMD;
-  using ::PFN_vkCmdDrawIndirectCountAMD;
-
-  //=== VK_AMD_shader_info ===
-  using ::PFN_vkGetShaderInfoAMD;
-
-  //=== VK_KHR_dynamic_rendering ===
-  using ::PFN_vkCmdBeginRenderingKHR;
-  using ::PFN_vkCmdEndRenderingKHR;
-
-#if defined( VK_USE_PLATFORM_GGP )
-  //=== VK_GGP_stream_descriptor_surface ===
-  using ::PFN_vkCreateStreamDescriptorSurfaceGGP;
-#endif /*VK_USE_PLATFORM_GGP*/
-
-  //=== VK_NV_external_memory_capabilities ===
-  using ::PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_NV_external_memory_win32 ===
-  using ::PFN_vkGetMemoryWin32HandleNV;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_get_physical_device_properties2 ===
-  using ::PFN_vkGetPhysicalDeviceFeatures2KHR;
-  using ::PFN_vkGetPhysicalDeviceFormatProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceImageFormatProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceMemoryProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
-
-  //=== VK_KHR_device_group ===
-  using ::PFN_vkCmdDispatchBaseKHR;
-  using ::PFN_vkCmdSetDeviceMaskKHR;
-  using ::PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR;
-
-#if defined( VK_USE_PLATFORM_VI_NN )
-  //=== VK_NN_vi_surface ===
-  using ::PFN_vkCreateViSurfaceNN;
-#endif /*VK_USE_PLATFORM_VI_NN*/
-
-  //=== VK_KHR_maintenance1 ===
-  using ::PFN_vkTrimCommandPoolKHR;
-
-  //=== VK_KHR_device_group_creation ===
-  using ::PFN_vkEnumeratePhysicalDeviceGroupsKHR;
-
-  //=== VK_KHR_external_memory_capabilities ===
-  using ::PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_memory_win32 ===
-  using ::PFN_vkGetMemoryWin32HandleKHR;
-  using ::PFN_vkGetMemoryWin32HandlePropertiesKHR;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_memory_fd ===
-  using ::PFN_vkGetMemoryFdKHR;
-  using ::PFN_vkGetMemoryFdPropertiesKHR;
-
-  //=== VK_KHR_external_semaphore_capabilities ===
-  using ::PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_semaphore_win32 ===
-  using ::PFN_vkGetSemaphoreWin32HandleKHR;
-  using ::PFN_vkImportSemaphoreWin32HandleKHR;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_semaphore_fd ===
-  using ::PFN_vkGetSemaphoreFdKHR;
-  using ::PFN_vkImportSemaphoreFdKHR;
-
-  //=== VK_KHR_push_descriptor ===
-  using ::PFN_vkCmdPushDescriptorSetKHR;
-  using ::PFN_vkCmdPushDescriptorSetWithTemplateKHR;
-
-  //=== VK_EXT_conditional_rendering ===
-  using ::PFN_vkCmdBeginConditionalRenderingEXT;
-  using ::PFN_vkCmdEndConditionalRenderingEXT;
-
-  //=== VK_KHR_descriptor_update_template ===
-  using ::PFN_vkCreateDescriptorUpdateTemplateKHR;
-  using ::PFN_vkDestroyDescriptorUpdateTemplateKHR;
-  using ::PFN_vkUpdateDescriptorSetWithTemplateKHR;
-
-  //=== VK_NV_clip_space_w_scaling ===
-  using ::PFN_vkCmdSetViewportWScalingNV;
-
-  //=== VK_EXT_direct_mode_display ===
-  using ::PFN_vkReleaseDisplayEXT;
-
-#if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-  //=== VK_EXT_acquire_xlib_display ===
-  using ::PFN_vkAcquireXlibDisplayEXT;
-  using ::PFN_vkGetRandROutputDisplayEXT;
-#endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
-
-  //=== VK_EXT_display_surface_counter ===
-  using ::PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT;
-
-  //=== VK_EXT_display_control ===
-  using ::PFN_vkDisplayPowerControlEXT;
-  using ::PFN_vkGetSwapchainCounterEXT;
-  using ::PFN_vkRegisterDeviceEventEXT;
-  using ::PFN_vkRegisterDisplayEventEXT;
-
-  //=== VK_GOOGLE_display_timing ===
-  using ::PFN_vkGetPastPresentationTimingGOOGLE;
-  using ::PFN_vkGetRefreshCycleDurationGOOGLE;
-
-  //=== VK_EXT_discard_rectangles ===
-  using ::PFN_vkCmdSetDiscardRectangleEnableEXT;
-  using ::PFN_vkCmdSetDiscardRectangleEXT;
-  using ::PFN_vkCmdSetDiscardRectangleModeEXT;
-
-  //=== VK_EXT_hdr_metadata ===
-  using ::PFN_vkSetHdrMetadataEXT;
-
-  //=== VK_KHR_create_renderpass2 ===
-  using ::PFN_vkCmdBeginRenderPass2KHR;
-  using ::PFN_vkCmdEndRenderPass2KHR;
-  using ::PFN_vkCmdNextSubpass2KHR;
-  using ::PFN_vkCreateRenderPass2KHR;
-
-  //=== VK_KHR_shared_presentable_image ===
-  using ::PFN_vkGetSwapchainStatusKHR;
-
-  //=== VK_KHR_external_fence_capabilities ===
-  using ::PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_KHR_external_fence_win32 ===
-  using ::PFN_vkGetFenceWin32HandleKHR;
-  using ::PFN_vkImportFenceWin32HandleKHR;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_KHR_external_fence_fd ===
-  using ::PFN_vkGetFenceFdKHR;
-  using ::PFN_vkImportFenceFdKHR;
-
-  //=== VK_KHR_performance_query ===
-  using ::PFN_vkAcquireProfilingLockKHR;
-  using ::PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR;
-  using ::PFN_vkReleaseProfilingLockKHR;
-
-  //=== VK_KHR_get_surface_capabilities2 ===
-  using ::PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR;
-  using ::PFN_vkGetPhysicalDeviceSurfaceFormats2KHR;
-
-  //=== VK_KHR_get_display_properties2 ===
-  using ::PFN_vkGetDisplayModeProperties2KHR;
-  using ::PFN_vkGetDisplayPlaneCapabilities2KHR;
-  using ::PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR;
-  using ::PFN_vkGetPhysicalDeviceDisplayProperties2KHR;
-
-#if defined( VK_USE_PLATFORM_IOS_MVK )
-  //=== VK_MVK_ios_surface ===
-  using ::PFN_vkCreateIOSSurfaceMVK;
-#endif /*VK_USE_PLATFORM_IOS_MVK*/
-
-#if defined( VK_USE_PLATFORM_MACOS_MVK )
-  //=== VK_MVK_macos_surface ===
-  using ::PFN_vkCreateMacOSSurfaceMVK;
-#endif /*VK_USE_PLATFORM_MACOS_MVK*/
-
-  //=== VK_EXT_debug_utils ===
-  using ::PFN_vkCmdBeginDebugUtilsLabelEXT;
-  using ::PFN_vkCmdEndDebugUtilsLabelEXT;
-  using ::PFN_vkCmdInsertDebugUtilsLabelEXT;
-  using ::PFN_vkCreateDebugUtilsMessengerEXT;
-  using ::PFN_vkDestroyDebugUtilsMessengerEXT;
-  using ::PFN_vkQueueBeginDebugUtilsLabelEXT;
-  using ::PFN_vkQueueEndDebugUtilsLabelEXT;
-  using ::PFN_vkQueueInsertDebugUtilsLabelEXT;
-  using ::PFN_vkSetDebugUtilsObjectNameEXT;
-  using ::PFN_vkSetDebugUtilsObjectTagEXT;
-  using ::PFN_vkSubmitDebugUtilsMessageEXT;
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-  using ::PFN_vkGetAndroidHardwareBufferPropertiesANDROID;
-  using ::PFN_vkGetMemoryAndroidHardwareBufferANDROID;
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_shader_enqueue ===
-  using ::PFN_vkCmdDispatchGraphAMDX;
-  using ::PFN_vkCmdDispatchGraphIndirectAMDX;
-  using ::PFN_vkCmdDispatchGraphIndirectCountAMDX;
-  using ::PFN_vkCmdInitializeGraphScratchMemoryAMDX;
-  using ::PFN_vkCreateExecutionGraphPipelinesAMDX;
-  using ::PFN_vkGetExecutionGraphPipelineNodeIndexAMDX;
-  using ::PFN_vkGetExecutionGraphPipelineScratchSizeAMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_sample_locations ===
-  using ::PFN_vkCmdSetSampleLocationsEXT;
-  using ::PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT;
-
-  //=== VK_KHR_get_memory_requirements2 ===
-  using ::PFN_vkGetBufferMemoryRequirements2KHR;
-  using ::PFN_vkGetImageMemoryRequirements2KHR;
-  using ::PFN_vkGetImageSparseMemoryRequirements2KHR;
-
-  //=== VK_KHR_acceleration_structure ===
-  using ::PFN_vkBuildAccelerationStructuresKHR;
-  using ::PFN_vkCmdBuildAccelerationStructuresIndirectKHR;
-  using ::PFN_vkCmdBuildAccelerationStructuresKHR;
-  using ::PFN_vkCmdCopyAccelerationStructureKHR;
-  using ::PFN_vkCmdCopyAccelerationStructureToMemoryKHR;
-  using ::PFN_vkCmdCopyMemoryToAccelerationStructureKHR;
-  using ::PFN_vkCmdWriteAccelerationStructuresPropertiesKHR;
-  using ::PFN_vkCopyAccelerationStructureKHR;
-  using ::PFN_vkCopyAccelerationStructureToMemoryKHR;
-  using ::PFN_vkCopyMemoryToAccelerationStructureKHR;
-  using ::PFN_vkCreateAccelerationStructureKHR;
-  using ::PFN_vkDestroyAccelerationStructureKHR;
-  using ::PFN_vkGetAccelerationStructureBuildSizesKHR;
-  using ::PFN_vkGetAccelerationStructureDeviceAddressKHR;
-  using ::PFN_vkGetDeviceAccelerationStructureCompatibilityKHR;
-  using ::PFN_vkWriteAccelerationStructuresPropertiesKHR;
-
-  //=== VK_KHR_ray_tracing_pipeline ===
-  using ::PFN_vkCmdSetRayTracingPipelineStackSizeKHR;
-  using ::PFN_vkCmdTraceRaysIndirectKHR;
-  using ::PFN_vkCmdTraceRaysKHR;
-  using ::PFN_vkCreateRayTracingPipelinesKHR;
-  using ::PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR;
-  using ::PFN_vkGetRayTracingShaderGroupHandlesKHR;
-  using ::PFN_vkGetRayTracingShaderGroupStackSizeKHR;
-
-  //=== VK_KHR_sampler_ycbcr_conversion ===
-  using ::PFN_vkCreateSamplerYcbcrConversionKHR;
-  using ::PFN_vkDestroySamplerYcbcrConversionKHR;
-
-  //=== VK_KHR_bind_memory2 ===
-  using ::PFN_vkBindBufferMemory2KHR;
-  using ::PFN_vkBindImageMemory2KHR;
-
-  //=== VK_EXT_image_drm_format_modifier ===
-  using ::PFN_vkGetImageDrmFormatModifierPropertiesEXT;
-
-  //=== VK_EXT_validation_cache ===
-  using ::PFN_vkCreateValidationCacheEXT;
-  using ::PFN_vkDestroyValidationCacheEXT;
-  using ::PFN_vkGetValidationCacheDataEXT;
-  using ::PFN_vkMergeValidationCachesEXT;
-
-  //=== VK_NV_shading_rate_image ===
-  using ::PFN_vkCmdBindShadingRateImageNV;
-  using ::PFN_vkCmdSetCoarseSampleOrderNV;
-  using ::PFN_vkCmdSetViewportShadingRatePaletteNV;
-
-  //=== VK_NV_ray_tracing ===
-  using ::PFN_vkBindAccelerationStructureMemoryNV;
-  using ::PFN_vkCmdBuildAccelerationStructureNV;
-  using ::PFN_vkCmdCopyAccelerationStructureNV;
-  using ::PFN_vkCmdTraceRaysNV;
-  using ::PFN_vkCmdWriteAccelerationStructuresPropertiesNV;
-  using ::PFN_vkCompileDeferredNV;
-  using ::PFN_vkCreateAccelerationStructureNV;
-  using ::PFN_vkCreateRayTracingPipelinesNV;
-  using ::PFN_vkDestroyAccelerationStructureNV;
-  using ::PFN_vkGetAccelerationStructureHandleNV;
-  using ::PFN_vkGetAccelerationStructureMemoryRequirementsNV;
-  using ::PFN_vkGetRayTracingShaderGroupHandlesNV;
-
-  //=== VK_KHR_maintenance3 ===
-  using ::PFN_vkGetDescriptorSetLayoutSupportKHR;
-
-  //=== VK_KHR_draw_indirect_count ===
-  using ::PFN_vkCmdDrawIndexedIndirectCountKHR;
-  using ::PFN_vkCmdDrawIndirectCountKHR;
-
-  //=== VK_EXT_external_memory_host ===
-  using ::PFN_vkGetMemoryHostPointerPropertiesEXT;
-
-  //=== VK_AMD_buffer_marker ===
-  using ::PFN_vkCmdWriteBufferMarker2AMD;
-  using ::PFN_vkCmdWriteBufferMarkerAMD;
-
-  //=== VK_EXT_calibrated_timestamps ===
-  using ::PFN_vkGetCalibratedTimestampsEXT;
-  using ::PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
-
-  //=== VK_NV_mesh_shader ===
-  using ::PFN_vkCmdDrawMeshTasksIndirectCountNV;
-  using ::PFN_vkCmdDrawMeshTasksIndirectNV;
-  using ::PFN_vkCmdDrawMeshTasksNV;
-
-  //=== VK_NV_scissor_exclusive ===
-  using ::PFN_vkCmdSetExclusiveScissorEnableNV;
-  using ::PFN_vkCmdSetExclusiveScissorNV;
-
-  //=== VK_NV_device_diagnostic_checkpoints ===
-  using ::PFN_vkCmdSetCheckpointNV;
-  using ::PFN_vkGetQueueCheckpointData2NV;
-  using ::PFN_vkGetQueueCheckpointDataNV;
-
-  //=== VK_KHR_timeline_semaphore ===
-  using ::PFN_vkGetSemaphoreCounterValueKHR;
-  using ::PFN_vkSignalSemaphoreKHR;
-  using ::PFN_vkWaitSemaphoresKHR;
-
-  //=== VK_EXT_present_timing ===
-  using ::PFN_vkGetPastPresentationTimingEXT;
-  using ::PFN_vkGetSwapchainTimeDomainPropertiesEXT;
-  using ::PFN_vkGetSwapchainTimingPropertiesEXT;
-  using ::PFN_vkSetSwapchainPresentTimingQueueSizeEXT;
-
-  //=== VK_INTEL_performance_query ===
-  using ::PFN_vkAcquirePerformanceConfigurationINTEL;
-  using ::PFN_vkCmdSetPerformanceMarkerINTEL;
-  using ::PFN_vkCmdSetPerformanceOverrideINTEL;
-  using ::PFN_vkCmdSetPerformanceStreamMarkerINTEL;
-  using ::PFN_vkGetPerformanceParameterINTEL;
-  using ::PFN_vkInitializePerformanceApiINTEL;
-  using ::PFN_vkQueueSetPerformanceConfigurationINTEL;
-  using ::PFN_vkReleasePerformanceConfigurationINTEL;
-  using ::PFN_vkUninitializePerformanceApiINTEL;
-
-  //=== VK_AMD_display_native_hdr ===
-  using ::PFN_vkSetLocalDimmingAMD;
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_imagepipe_surface ===
-  using ::PFN_vkCreateImagePipeSurfaceFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_metal_surface ===
-  using ::PFN_vkCreateMetalSurfaceEXT;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_fragment_shading_rate ===
-  using ::PFN_vkCmdSetFragmentShadingRateKHR;
-  using ::PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR;
-
-  //=== VK_KHR_dynamic_rendering_local_read ===
-  using ::PFN_vkCmdSetRenderingAttachmentLocationsKHR;
-  using ::PFN_vkCmdSetRenderingInputAttachmentIndicesKHR;
-
-  //=== VK_EXT_buffer_device_address ===
-  using ::PFN_vkGetBufferDeviceAddressEXT;
-
-  //=== VK_EXT_tooling_info ===
-  using ::PFN_vkGetPhysicalDeviceToolPropertiesEXT;
-
-  //=== VK_KHR_present_wait ===
-  using ::PFN_vkWaitForPresentKHR;
-
-  //=== VK_NV_cooperative_matrix ===
-  using ::PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV;
-
-  //=== VK_NV_coverage_reduction_mode ===
-  using ::PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_EXT_full_screen_exclusive ===
-  using ::PFN_vkAcquireFullScreenExclusiveModeEXT;
-  using ::PFN_vkGetDeviceGroupSurfacePresentModes2EXT;
-  using ::PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT;
-  using ::PFN_vkReleaseFullScreenExclusiveModeEXT;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-  //=== VK_EXT_headless_surface ===
-  using ::PFN_vkCreateHeadlessSurfaceEXT;
-
-  //=== VK_KHR_buffer_device_address ===
-  using ::PFN_vkGetBufferDeviceAddressKHR;
-  using ::PFN_vkGetBufferOpaqueCaptureAddressKHR;
-  using ::PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR;
-
-  //=== VK_EXT_line_rasterization ===
-  using ::PFN_vkCmdSetLineStippleEXT;
-
-  //=== VK_EXT_host_query_reset ===
-  using ::PFN_vkResetQueryPoolEXT;
-
-  //=== VK_EXT_extended_dynamic_state ===
-  using ::PFN_vkCmdBindVertexBuffers2EXT;
-  using ::PFN_vkCmdSetCullModeEXT;
-  using ::PFN_vkCmdSetDepthBoundsTestEnableEXT;
-  using ::PFN_vkCmdSetDepthCompareOpEXT;
-  using ::PFN_vkCmdSetDepthTestEnableEXT;
-  using ::PFN_vkCmdSetDepthWriteEnableEXT;
-  using ::PFN_vkCmdSetFrontFaceEXT;
-  using ::PFN_vkCmdSetPrimitiveTopologyEXT;
-  using ::PFN_vkCmdSetScissorWithCountEXT;
-  using ::PFN_vkCmdSetStencilOpEXT;
-  using ::PFN_vkCmdSetStencilTestEnableEXT;
-  using ::PFN_vkCmdSetViewportWithCountEXT;
-
-  //=== VK_KHR_deferred_host_operations ===
-  using ::PFN_vkCreateDeferredOperationKHR;
-  using ::PFN_vkDeferredOperationJoinKHR;
-  using ::PFN_vkDestroyDeferredOperationKHR;
-  using ::PFN_vkGetDeferredOperationMaxConcurrencyKHR;
-  using ::PFN_vkGetDeferredOperationResultKHR;
-
-  //=== VK_KHR_pipeline_executable_properties ===
-  using ::PFN_vkGetPipelineExecutableInternalRepresentationsKHR;
-  using ::PFN_vkGetPipelineExecutablePropertiesKHR;
-  using ::PFN_vkGetPipelineExecutableStatisticsKHR;
-
-  //=== VK_EXT_host_image_copy ===
-  using ::PFN_vkCopyImageToImageEXT;
-  using ::PFN_vkCopyImageToMemoryEXT;
-  using ::PFN_vkCopyMemoryToImageEXT;
-  using ::PFN_vkGetImageSubresourceLayout2EXT;
-  using ::PFN_vkTransitionImageLayoutEXT;
-
-  //=== VK_KHR_map_memory2 ===
-  using ::PFN_vkMapMemory2KHR;
-  using ::PFN_vkUnmapMemory2KHR;
-
-  //=== VK_EXT_swapchain_maintenance1 ===
-  using ::PFN_vkReleaseSwapchainImagesEXT;
-
-  //=== VK_NV_device_generated_commands ===
-  using ::PFN_vkCmdBindPipelineShaderGroupNV;
-  using ::PFN_vkCmdExecuteGeneratedCommandsNV;
-  using ::PFN_vkCmdPreprocessGeneratedCommandsNV;
-  using ::PFN_vkCreateIndirectCommandsLayoutNV;
-  using ::PFN_vkDestroyIndirectCommandsLayoutNV;
-  using ::PFN_vkGetGeneratedCommandsMemoryRequirementsNV;
-
-  //=== VK_EXT_depth_bias_control ===
-  using ::PFN_vkCmdSetDepthBias2EXT;
-
-  //=== VK_EXT_acquire_drm_display ===
-  using ::PFN_vkAcquireDrmDisplayEXT;
-  using ::PFN_vkGetDrmDisplayEXT;
-
-  //=== VK_EXT_private_data ===
-  using ::PFN_vkCreatePrivateDataSlotEXT;
-  using ::PFN_vkDestroyPrivateDataSlotEXT;
-  using ::PFN_vkGetPrivateDataEXT;
-  using ::PFN_vkSetPrivateDataEXT;
-
-  //=== VK_KHR_video_encode_queue ===
-  using ::PFN_vkCmdEncodeVideoKHR;
-  using ::PFN_vkGetEncodedVideoSessionParametersKHR;
-  using ::PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_cuda_kernel_launch ===
-  using ::PFN_vkCmdCudaLaunchKernelNV;
-  using ::PFN_vkCreateCudaFunctionNV;
-  using ::PFN_vkCreateCudaModuleNV;
-  using ::PFN_vkDestroyCudaFunctionNV;
-  using ::PFN_vkDestroyCudaModuleNV;
-  using ::PFN_vkGetCudaModuleCacheNV;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_QCOM_tile_shading ===
-  using ::PFN_vkCmdBeginPerTileExecutionQCOM;
-  using ::PFN_vkCmdDispatchTileQCOM;
-  using ::PFN_vkCmdEndPerTileExecutionQCOM;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_metal_objects ===
-  using ::PFN_vkExportMetalObjectsEXT;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_synchronization2 ===
-  using ::PFN_vkCmdPipelineBarrier2KHR;
-  using ::PFN_vkCmdResetEvent2KHR;
-  using ::PFN_vkCmdSetEvent2KHR;
-  using ::PFN_vkCmdWaitEvents2KHR;
-  using ::PFN_vkCmdWriteTimestamp2KHR;
-  using ::PFN_vkQueueSubmit2KHR;
-
-  //=== VK_EXT_descriptor_buffer ===
-  using ::PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT;
-  using ::PFN_vkCmdBindDescriptorBuffersEXT;
-  using ::PFN_vkCmdSetDescriptorBufferOffsetsEXT;
-  using ::PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT;
-  using ::PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT;
-  using ::PFN_vkGetDescriptorEXT;
-  using ::PFN_vkGetDescriptorSetLayoutBindingOffsetEXT;
-  using ::PFN_vkGetDescriptorSetLayoutSizeEXT;
-  using ::PFN_vkGetImageOpaqueCaptureDescriptorDataEXT;
-  using ::PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT;
-  using ::PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT;
-
-  //=== VK_NV_fragment_shading_rate_enums ===
-  using ::PFN_vkCmdSetFragmentShadingRateEnumNV;
-
-  //=== VK_EXT_mesh_shader ===
-  using ::PFN_vkCmdDrawMeshTasksEXT;
-  using ::PFN_vkCmdDrawMeshTasksIndirectCountEXT;
-  using ::PFN_vkCmdDrawMeshTasksIndirectEXT;
-
-  //=== VK_KHR_copy_commands2 ===
-  using ::PFN_vkCmdBlitImage2KHR;
-  using ::PFN_vkCmdCopyBuffer2KHR;
-  using ::PFN_vkCmdCopyBufferToImage2KHR;
-  using ::PFN_vkCmdCopyImage2KHR;
-  using ::PFN_vkCmdCopyImageToBuffer2KHR;
-  using ::PFN_vkCmdResolveImage2KHR;
-
-  //=== VK_EXT_device_fault ===
-  using ::PFN_vkGetDeviceFaultInfoEXT;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-  //=== VK_NV_acquire_winrt_display ===
-  using ::PFN_vkAcquireWinrtDisplayNV;
-  using ::PFN_vkGetWinrtDisplayNV;
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-#if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-  //=== VK_EXT_directfb_surface ===
-  using ::PFN_vkCreateDirectFBSurfaceEXT;
-  using ::PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT;
-#endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-
-  //=== VK_EXT_vertex_input_dynamic_state ===
-  using ::PFN_vkCmdSetVertexInputEXT;
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_external_memory ===
-  using ::PFN_vkGetMemoryZirconHandleFUCHSIA;
-  using ::PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_external_semaphore ===
-  using ::PFN_vkGetSemaphoreZirconHandleFUCHSIA;
-  using ::PFN_vkImportSemaphoreZirconHandleFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-  //=== VK_FUCHSIA_buffer_collection ===
-  using ::PFN_vkCreateBufferCollectionFUCHSIA;
-  using ::PFN_vkDestroyBufferCollectionFUCHSIA;
-  using ::PFN_vkGetBufferCollectionPropertiesFUCHSIA;
-  using ::PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA;
-  using ::PFN_vkSetBufferCollectionImageConstraintsFUCHSIA;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-  //=== VK_HUAWEI_subpass_shading ===
-  using ::PFN_vkCmdSubpassShadingHUAWEI;
-  using ::PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI;
-
-  //=== VK_HUAWEI_invocation_mask ===
-  using ::PFN_vkCmdBindInvocationMaskHUAWEI;
-
-  //=== VK_NV_external_memory_rdma ===
-  using ::PFN_vkGetMemoryRemoteAddressNV;
-
-  //=== VK_EXT_pipeline_properties ===
-  using ::PFN_vkGetPipelinePropertiesEXT;
-
-  //=== VK_EXT_extended_dynamic_state2 ===
-  using ::PFN_vkCmdSetDepthBiasEnableEXT;
-  using ::PFN_vkCmdSetLogicOpEXT;
-  using ::PFN_vkCmdSetPatchControlPointsEXT;
-  using ::PFN_vkCmdSetPrimitiveRestartEnableEXT;
-  using ::PFN_vkCmdSetRasterizerDiscardEnableEXT;
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  //=== VK_QNX_screen_surface ===
-  using ::PFN_vkCreateScreenSurfaceQNX;
-  using ::PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX;
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-  //=== VK_EXT_color_write_enable ===
-  using ::PFN_vkCmdSetColorWriteEnableEXT;
-
-  //=== VK_KHR_ray_tracing_maintenance1 ===
-  using ::PFN_vkCmdTraceRaysIndirect2KHR;
-
-  //=== VK_EXT_multi_draw ===
-  using ::PFN_vkCmdDrawMultiEXT;
-  using ::PFN_vkCmdDrawMultiIndexedEXT;
-
-  //=== VK_EXT_opacity_micromap ===
-  using ::PFN_vkBuildMicromapsEXT;
-  using ::PFN_vkCmdBuildMicromapsEXT;
-  using ::PFN_vkCmdCopyMemoryToMicromapEXT;
-  using ::PFN_vkCmdCopyMicromapEXT;
-  using ::PFN_vkCmdCopyMicromapToMemoryEXT;
-  using ::PFN_vkCmdWriteMicromapsPropertiesEXT;
-  using ::PFN_vkCopyMemoryToMicromapEXT;
-  using ::PFN_vkCopyMicromapEXT;
-  using ::PFN_vkCopyMicromapToMemoryEXT;
-  using ::PFN_vkCreateMicromapEXT;
-  using ::PFN_vkDestroyMicromapEXT;
-  using ::PFN_vkGetDeviceMicromapCompatibilityEXT;
-  using ::PFN_vkGetMicromapBuildSizesEXT;
-  using ::PFN_vkWriteMicromapsPropertiesEXT;
-
-  //=== VK_HUAWEI_cluster_culling_shader ===
-  using ::PFN_vkCmdDrawClusterHUAWEI;
-  using ::PFN_vkCmdDrawClusterIndirectHUAWEI;
-
-  //=== VK_EXT_pageable_device_local_memory ===
-  using ::PFN_vkSetDeviceMemoryPriorityEXT;
-
-  //=== VK_KHR_maintenance4 ===
-  using ::PFN_vkGetDeviceBufferMemoryRequirementsKHR;
-  using ::PFN_vkGetDeviceImageMemoryRequirementsKHR;
-  using ::PFN_vkGetDeviceImageSparseMemoryRequirementsKHR;
-
-  //=== VK_VALVE_descriptor_set_host_mapping ===
-  using ::PFN_vkGetDescriptorSetHostMappingVALVE;
-  using ::PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE;
-
-  //=== VK_NV_copy_memory_indirect ===
-  using ::PFN_vkCmdCopyMemoryIndirectNV;
-  using ::PFN_vkCmdCopyMemoryToImageIndirectNV;
-
-  //=== VK_NV_memory_decompression ===
-  using ::PFN_vkCmdDecompressMemoryIndirectCountNV;
-  using ::PFN_vkCmdDecompressMemoryNV;
-
-  //=== VK_NV_device_generated_commands_compute ===
-  using ::PFN_vkCmdUpdatePipelineIndirectBufferNV;
-  using ::PFN_vkGetPipelineIndirectDeviceAddressNV;
-  using ::PFN_vkGetPipelineIndirectMemoryRequirementsNV;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  using ::PFN_vkGetMemoryNativeBufferOHOS;
-  using ::PFN_vkGetNativeBufferPropertiesOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_EXT_extended_dynamic_state3 ===
-  using ::PFN_vkCmdSetAlphaToCoverageEnableEXT;
-  using ::PFN_vkCmdSetAlphaToOneEnableEXT;
-  using ::PFN_vkCmdSetColorBlendAdvancedEXT;
-  using ::PFN_vkCmdSetColorBlendEnableEXT;
-  using ::PFN_vkCmdSetColorBlendEquationEXT;
-  using ::PFN_vkCmdSetColorWriteMaskEXT;
-  using ::PFN_vkCmdSetConservativeRasterizationModeEXT;
-  using ::PFN_vkCmdSetCoverageModulationModeNV;
-  using ::PFN_vkCmdSetCoverageModulationTableEnableNV;
-  using ::PFN_vkCmdSetCoverageModulationTableNV;
-  using ::PFN_vkCmdSetCoverageReductionModeNV;
-  using ::PFN_vkCmdSetCoverageToColorEnableNV;
-  using ::PFN_vkCmdSetCoverageToColorLocationNV;
-  using ::PFN_vkCmdSetDepthClampEnableEXT;
-  using ::PFN_vkCmdSetDepthClipEnableEXT;
-  using ::PFN_vkCmdSetDepthClipNegativeOneToOneEXT;
-  using ::PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT;
-  using ::PFN_vkCmdSetLineRasterizationModeEXT;
-  using ::PFN_vkCmdSetLineStippleEnableEXT;
-  using ::PFN_vkCmdSetLogicOpEnableEXT;
-  using ::PFN_vkCmdSetPolygonModeEXT;
-  using ::PFN_vkCmdSetProvokingVertexModeEXT;
-  using ::PFN_vkCmdSetRasterizationSamplesEXT;
-  using ::PFN_vkCmdSetRasterizationStreamEXT;
-  using ::PFN_vkCmdSetRepresentativeFragmentTestEnableNV;
-  using ::PFN_vkCmdSetSampleLocationsEnableEXT;
-  using ::PFN_vkCmdSetSampleMaskEXT;
-  using ::PFN_vkCmdSetShadingRateImageEnableNV;
-  using ::PFN_vkCmdSetTessellationDomainOriginEXT;
-  using ::PFN_vkCmdSetViewportSwizzleNV;
-  using ::PFN_vkCmdSetViewportWScalingEnableNV;
-
-  //=== VK_ARM_tensors ===
-  using ::PFN_vkBindTensorMemoryARM;
-  using ::PFN_vkCmdCopyTensorARM;
-  using ::PFN_vkCreateTensorARM;
-  using ::PFN_vkCreateTensorViewARM;
-  using ::PFN_vkDestroyTensorARM;
-  using ::PFN_vkDestroyTensorViewARM;
-  using ::PFN_vkGetDeviceTensorMemoryRequirementsARM;
-  using ::PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM;
-  using ::PFN_vkGetTensorMemoryRequirementsARM;
-  using ::PFN_vkGetTensorOpaqueCaptureDescriptorDataARM;
-  using ::PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM;
-
-  //=== VK_EXT_shader_module_identifier ===
-  using ::PFN_vkGetShaderModuleCreateInfoIdentifierEXT;
-  using ::PFN_vkGetShaderModuleIdentifierEXT;
-
-  //=== VK_NV_optical_flow ===
-  using ::PFN_vkBindOpticalFlowSessionImageNV;
-  using ::PFN_vkCmdOpticalFlowExecuteNV;
-  using ::PFN_vkCreateOpticalFlowSessionNV;
-  using ::PFN_vkDestroyOpticalFlowSessionNV;
-  using ::PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV;
-
-  //=== VK_KHR_maintenance5 ===
-  using ::PFN_vkCmdBindIndexBuffer2KHR;
-  using ::PFN_vkGetDeviceImageSubresourceLayoutKHR;
-  using ::PFN_vkGetImageSubresourceLayout2KHR;
-  using ::PFN_vkGetRenderingAreaGranularityKHR;
-
-  //=== VK_AMD_anti_lag ===
-  using ::PFN_vkAntiLagUpdateAMD;
-
-  //=== VK_KHR_present_wait2 ===
-  using ::PFN_vkWaitForPresent2KHR;
-
-  //=== VK_EXT_shader_object ===
-  using ::PFN_vkCmdBindShadersEXT;
-  using ::PFN_vkCmdSetDepthClampRangeEXT;
-  using ::PFN_vkCreateShadersEXT;
-  using ::PFN_vkDestroyShaderEXT;
-  using ::PFN_vkGetShaderBinaryDataEXT;
-
-  //=== VK_KHR_pipeline_binary ===
-  using ::PFN_vkCreatePipelineBinariesKHR;
-  using ::PFN_vkDestroyPipelineBinaryKHR;
-  using ::PFN_vkGetPipelineBinaryDataKHR;
-  using ::PFN_vkGetPipelineKeyKHR;
-  using ::PFN_vkReleaseCapturedPipelineDataKHR;
-
-  //=== VK_QCOM_tile_properties ===
-  using ::PFN_vkGetDynamicRenderingTilePropertiesQCOM;
-  using ::PFN_vkGetFramebufferTilePropertiesQCOM;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  using ::PFN_vkReleaseSwapchainImagesKHR;
-
-  //=== VK_NV_cooperative_vector ===
-  using ::PFN_vkCmdConvertCooperativeVectorMatrixNV;
-  using ::PFN_vkConvertCooperativeVectorMatrixNV;
-  using ::PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV;
-
-  //=== VK_NV_low_latency2 ===
-  using ::PFN_vkGetLatencyTimingsNV;
-  using ::PFN_vkLatencySleepNV;
-  using ::PFN_vkQueueNotifyOutOfBandNV;
-  using ::PFN_vkSetLatencyMarkerNV;
-  using ::PFN_vkSetLatencySleepModeNV;
-
-  //=== VK_KHR_cooperative_matrix ===
-  using ::PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
-
-  //=== VK_ARM_data_graph ===
-  using ::PFN_vkBindDataGraphPipelineSessionMemoryARM;
-  using ::PFN_vkCmdDispatchDataGraphARM;
-  using ::PFN_vkCreateDataGraphPipelinesARM;
-  using ::PFN_vkCreateDataGraphPipelineSessionARM;
-  using ::PFN_vkDestroyDataGraphPipelineSessionARM;
-  using ::PFN_vkGetDataGraphPipelineAvailablePropertiesARM;
-  using ::PFN_vkGetDataGraphPipelinePropertiesARM;
-  using ::PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM;
-  using ::PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;
-  using ::PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
-
-  //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-  using ::PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT;
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  //=== VK_QNX_external_memory_screen_buffer ===
-  using ::PFN_vkGetScreenBufferPropertiesQNX;
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-  //=== VK_KHR_line_rasterization ===
-  using ::PFN_vkCmdSetLineStippleKHR;
-
-  //=== VK_KHR_calibrated_timestamps ===
-  using ::PFN_vkGetCalibratedTimestampsKHR;
-  using ::PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR;
-
-  //=== VK_KHR_maintenance6 ===
-  using ::PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT;
-  using ::PFN_vkCmdBindDescriptorSets2KHR;
-  using ::PFN_vkCmdPushConstants2KHR;
-  using ::PFN_vkCmdPushDescriptorSet2KHR;
-  using ::PFN_vkCmdPushDescriptorSetWithTemplate2KHR;
-  using ::PFN_vkCmdSetDescriptorBufferOffsets2EXT;
-
-  //=== VK_QCOM_tile_memory_heap ===
-  using ::PFN_vkCmdBindTileMemoryQCOM;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  using ::PFN_vkCmdCopyMemoryIndirectKHR;
-  using ::PFN_vkCmdCopyMemoryToImageIndirectKHR;
-
-  //=== VK_EXT_memory_decompression ===
-  using ::PFN_vkCmdDecompressMemoryEXT;
-  using ::PFN_vkCmdDecompressMemoryIndirectCountEXT;
-
-  //=== VK_NV_external_compute_queue ===
-  using ::PFN_vkCreateExternalComputeQueueNV;
-  using ::PFN_vkDestroyExternalComputeQueueNV;
-  using ::PFN_vkGetExternalComputeQueueDataNV;
-
-  //=== VK_NV_cluster_acceleration_structure ===
-  using ::PFN_vkCmdBuildClusterAccelerationStructureIndirectNV;
-  using ::PFN_vkGetClusterAccelerationStructureBuildSizesNV;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  using ::PFN_vkCmdBuildPartitionedAccelerationStructuresNV;
-  using ::PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  using ::PFN_vkCmdExecuteGeneratedCommandsEXT;
-  using ::PFN_vkCmdPreprocessGeneratedCommandsEXT;
-  using ::PFN_vkCreateIndirectCommandsLayoutEXT;
-  using ::PFN_vkCreateIndirectExecutionSetEXT;
-  using ::PFN_vkDestroyIndirectCommandsLayoutEXT;
-  using ::PFN_vkDestroyIndirectExecutionSetEXT;
-  using ::PFN_vkGetGeneratedCommandsMemoryRequirementsEXT;
-  using ::PFN_vkUpdateIndirectExecutionSetPipelineEXT;
-  using ::PFN_vkUpdateIndirectExecutionSetShaderEXT;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  using ::PFN_vkCreateSurfaceOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  using ::PFN_vkAcquireImageOHOS;
-  using ::PFN_vkGetSwapchainGrallocUsageOHOS;
-  using ::PFN_vkQueueSignalReleaseImageOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_NV_cooperative_matrix2 ===
-  using ::PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  using ::PFN_vkGetMemoryMetalHandleEXT;
-  using ::PFN_vkGetMemoryMetalHandlePropertiesEXT;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-  using ::PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM;
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  using ::PFN_vkCmdEndRendering2EXT;
-
-  //=== VK_EXT_custom_resolve ===
-  using ::PFN_vkCmdBeginCustomResolveEXT;
-
-  //=== VK_KHR_maintenance10 ===
-  using ::PFN_vkCmdEndRendering2KHR;
-}
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan.h b/engine/thirdparty/vulkan/include/vulkan/vulkan.h
index 9457a520..ef94006b 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan.h
@@ -2,7 +2,7 @@
 #define VULKAN_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -96,8 +96,4 @@
 #include "vulkan_beta.h"
 #endif
 
-#ifdef VK_USE_PLATFORM_OHOS
-#include "vulkan_ohos.h"
-#endif
-
 #endif // VULKAN_H_
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan.hpp
index 6c89bea5..eae7cc33 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,37 +8,28 @@
 #ifndef VULKAN_HPP
 #define VULKAN_HPP
 
+#include <algorithm>
+#include <array>     // ArrayWrapperND
+#include <string.h>  // strnlen
+#include <string>    // std::string
 #include <vulkan/vulkan.h>
-#if !defined( VULKAN_HPP_CXX_MODULE )
-// clang-format off
-#  include <vulkan/vulkan_hpp_macros.hpp>
-// clang-format on
-#  include <algorithm>
-#  include <array>  // ArrayWrapperND
+#include <vulkan/vulkan_hpp_macros.hpp>
+
+#if 17 <= VULKAN_HPP_CPP_VERSION
+#  include <string_view>
+#endif
+
+#if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+#  include <tuple>   // std::tie
+#  include <vector>  // std::vector
+#endif
+
+#if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  include <system_error>  // std::is_error_code_enum
+#endif
+
+#if ( VULKAN_HPP_ASSERT == assert )
 #  include <cassert>
-#  include <string.h>  // strnlen
-#  include <string>    // std::string
-#  include <utility>   // std::exchange
-#  if 17 <= VULKAN_HPP_CPP_VERSION
-#    include <string_view>
-#  endif
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-#    include <tuple>   // std::tie
-#    include <vector>  // std::vector
-#  endif
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-#    include <compare>
-#  endif
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-#    include <system_error>  // std::is_error_code_enum
-#  endif
-#  if defined( VULKAN_HPP_SUPPORT_SPAN )
-#    include <span>
-#  endif
-#else
-#  include <cassert>
-#  include <cstring>
-import std;
 #endif
 
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
@@ -47,7 +38,7 @@ import std;
 #  elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
 using HINSTANCE = struct HINSTANCE__ *;
 #    if defined( _WIN64 )
-using FARPROC = int64_t( __stdcall * )();
+using FARPROC   = int64_t( __stdcall * )();
 #    else
 using FARPROC = int( __stdcall * )();
 #    endif
@@ -57,7 +48,15 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
 #  endif
 #endif
 
-VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 335, "Wrong VK_HEADER_VERSION!" );
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+#  include <compare>
+#endif
+
+#if defined( VULKAN_HPP_SUPPORT_SPAN )
+#  include <span>
+#endif
+
+static_assert( VK_HEADER_VERSION == 283, "Wrong VK_HEADER_VERSION!" );
 
 // <tuple> includes <sys/sysmacros.h> through some other header
 // this results in major(x) being resolved to gnu_dev_major(x)
@@ -75,7 +74,7 @@ VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 335, "Wrong VK_HEADER_VERSION!" )
 #  undef MemoryBarrier
 #endif
 
-// XLib.h defines True/False, which collides with our VULKAN_HPP_NAMESPACE::True/VULKAN_HPP_NAMESPACE::False
+// XLib.h defines True/False, which collides with our vk::True/vk::False
 // ->  undef them and provide some namepace-secure constexpr
 #if defined( True )
 #  undef True
@@ -147,72 +146,66 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #endif
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    std::strong_ordering operator<=>( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) <=> *static_cast<std::array<char, N> const *>( &rhs );
+    }
+#else
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator<( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) < *static_cast<std::array<char, N> const *>( &rhs );
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator<=( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) <= *static_cast<std::array<char, N> const *>( &rhs );
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator>( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) > *static_cast<std::array<char, N> const *>( &rhs );
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator>=( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) >= *static_cast<std::array<char, N> const *>( &rhs );
+    }
+#endif
+
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator==( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) == *static_cast<std::array<char, N> const *>( &rhs );
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
+    bool operator!=( ArrayWrapper1D<char, N> const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return *static_cast<std::array<char, N> const *>( this ) != *static_cast<std::array<char, N> const *>( &rhs );
+    }
+
   private:
     VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT
     {
-      size_t n = ( std::min )( N - 1, len );
+      size_t n = std::min( N, len );
       for ( size_t i = 0; i < n; ++i )
       {
         ( *this )[i] = data[i];
       }
-      ( *this )[n] = 0;
+      for ( size_t i = n; i < N; ++i )
+      {
+        ( *this )[i] = 0;
+      }
     }
   };
 
-// relational operators between ArrayWrapper1D of chars with potentially different sizes
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-  template <size_t N, size_t M>
-  std::strong_ordering operator<=>( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    int result = strcmp( lhs.data(), rhs.data() );
-    return ( result < 0 ) ? std::strong_ordering::less : ( ( result > 0 ) ? std::strong_ordering::greater : std::strong_ordering::equal );
-  }
-#else
-  template <size_t N, size_t M>
-  bool operator<( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) < 0;
-  }
-
-  template <size_t N, size_t M>
-  bool operator<=( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) <= 0;
-  }
-
-  template <size_t N, size_t M>
-  bool operator>( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) > 0;
-  }
-
-  template <size_t N, size_t M>
-  bool operator>=( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) >= 0;
-  }
-#endif
-
-  template <size_t N, size_t M>
-  bool operator==( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) == 0;
-  }
-
-  template <size_t N, size_t M>
-  bool operator!=( ArrayWrapper1D<char, N> const & lhs, ArrayWrapper1D<char, M> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return strcmp( lhs.data(), rhs.data() ) != 0;
-  }
-
-// specialization of relational operators between std::string and arrays of chars
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-  template <size_t N>
-  std::strong_ordering operator<=>( std::string const & lhs, ArrayWrapper1D<char, N> const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs <=> rhs.data();
-  }
-#else
+  // specialization of relational operators between std::string and arrays of chars
   template <size_t N>
   bool operator<( std::string const & lhs, ArrayWrapper1D<char, N> const & rhs ) VULKAN_HPP_NOEXCEPT
   {
@@ -236,7 +229,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
     return lhs >= rhs.data();
   }
-#endif
 
   template <size_t N>
   bool operator==( std::string const & lhs, ArrayWrapper1D<char, N> const & rhs ) VULKAN_HPP_NOEXCEPT
@@ -250,50 +242,6 @@ namespace VULKAN_HPP_NAMESPACE
     return lhs != rhs.data();
   }
 
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-  template <size_t N>
-  std::strong_ordering operator<=>( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() <=> rhs;
-  }
-#else
-  template <size_t N>
-  bool operator<( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() < rhs;
-  }
-
-  template <size_t N>
-  bool operator<=( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() <= rhs;
-  }
-
-  template <size_t N>
-  bool operator>( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() > rhs;
-  }
-
-  template <size_t N>
-  bool operator>=( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() >= rhs;
-  }
-#endif
-
-  template <size_t N>
-  bool operator==( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() == rhs;
-  }
-
-  template <size_t N>
-  bool operator!=( ArrayWrapper1D<char, N> const & lhs, std::string const & rhs ) VULKAN_HPP_NOEXCEPT
-  {
-    return lhs.data() != rhs;
-  }
-
   template <typename T, size_t N, size_t M>
   class ArrayWrapper2D : public std::array<ArrayWrapper1D<T, M>, N>
   {
@@ -433,19 +381,38 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
-    template <typename B = T, typename std::enable_if<std::is_convertible<B, T>::value && std::is_lvalue_reference<B>::value, int>::type = 0>
-    ArrayProxyNoTemporaries( B && value ) VULKAN_HPP_NOEXCEPT
+    ArrayProxyNoTemporaries( T & value ) VULKAN_HPP_NOEXCEPT
       : m_count( 1 )
       , m_ptr( &value )
     {
     }
 
+    template <typename V>
+    ArrayProxyNoTemporaries( V && value ) = delete;
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( typename std::remove_const<T>::type & value ) VULKAN_HPP_NOEXCEPT
+      : m_count( 1 )
+      , m_ptr( &value )
+    {
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( typename std::remove_const<T>::type && value ) = delete;
+
     ArrayProxyNoTemporaries( uint32_t count, T * ptr ) VULKAN_HPP_NOEXCEPT
       : m_count( count )
       , m_ptr( ptr )
     {
     }
 
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( uint32_t count, typename std::remove_const<T>::type * ptr ) VULKAN_HPP_NOEXCEPT
+      : m_count( count )
+      , m_ptr( ptr )
+    {
+    }
+
     template <std::size_t C>
     ArrayProxyNoTemporaries( T ( &ptr )[C] ) VULKAN_HPP_NOEXCEPT
       : m_count( C )
@@ -456,26 +423,59 @@ namespace VULKAN_HPP_NAMESPACE
     template <std::size_t C>
     ArrayProxyNoTemporaries( T ( &&ptr )[C] ) = delete;
 
-    // Any l-value reference with a .data() return type implicitly convertible to T*, and a .size() return type implicitly convertible to size_t.
-    template <typename V,
-              typename std::enable_if<!std::is_convertible<decltype( std::declval<V>().begin() ), T *>::value &&
-                                        std::is_convertible<decltype( std::declval<V>().data() ), T *>::value &&
-                                        std::is_convertible<decltype( std::declval<V>().size() ), std::size_t>::value && std::is_lvalue_reference<V>::value,
-                                      int>::type = 0>
-    ArrayProxyNoTemporaries( V && v ) VULKAN_HPP_NOEXCEPT
-      : m_count( static_cast<uint32_t>( v.size() ) )
-      , m_ptr( v.data() )
+    template <std::size_t C, typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( typename std::remove_const<T>::type ( &ptr )[C] ) VULKAN_HPP_NOEXCEPT
+      : m_count( C )
+      , m_ptr( ptr )
     {
     }
 
-    // Any l-value reference with a .begin() return type implicitly convertible to T*, and a .size() return type implicitly convertible to size_t.
+    template <std::size_t C, typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( typename std::remove_const<T>::type ( &&ptr )[C] ) = delete;
+
+    ArrayProxyNoTemporaries( std::initializer_list<T> const & list ) VULKAN_HPP_NOEXCEPT
+      : m_count( static_cast<uint32_t>( list.size() ) )
+      , m_ptr( list.begin() )
+    {
+    }
+
+    ArrayProxyNoTemporaries( std::initializer_list<T> const && list ) = delete;
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( std::initializer_list<typename std::remove_const<T>::type> const & list ) VULKAN_HPP_NOEXCEPT
+      : m_count( static_cast<uint32_t>( list.size() ) )
+      , m_ptr( list.begin() )
+    {
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( std::initializer_list<typename std::remove_const<T>::type> const && list ) = delete;
+
+    ArrayProxyNoTemporaries( std::initializer_list<T> & list ) VULKAN_HPP_NOEXCEPT
+      : m_count( static_cast<uint32_t>( list.size() ) )
+      , m_ptr( list.begin() )
+    {
+    }
+
+    ArrayProxyNoTemporaries( std::initializer_list<T> && list ) = delete;
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( std::initializer_list<typename std::remove_const<T>::type> & list ) VULKAN_HPP_NOEXCEPT
+      : m_count( static_cast<uint32_t>( list.size() ) )
+      , m_ptr( list.begin() )
+    {
+    }
+
+    template <typename B = T, typename std::enable_if<std::is_const<B>::value, int>::type = 0>
+    ArrayProxyNoTemporaries( std::initializer_list<typename std::remove_const<T>::type> && list ) = delete;
+
+    // Any type with a .data() return type implicitly convertible to T*, and a .size() return type implicitly convertible to size_t.
     template <typename V,
-              typename std::enable_if<std::is_convertible<decltype( std::declval<V>().begin() ), T *>::value &&
-                                        std::is_convertible<decltype( std::declval<V>().size() ), std::size_t>::value && std::is_lvalue_reference<V>::value,
-                                      int>::type = 0>
-    ArrayProxyNoTemporaries( V && v ) VULKAN_HPP_NOEXCEPT
+              typename std::enable_if<std::is_convertible<decltype( std::declval<V>().data() ), T *>::value &&
+                                      std::is_convertible<decltype( std::declval<V>().size() ), std::size_t>::value>::type * = nullptr>
+    ArrayProxyNoTemporaries( V & v ) VULKAN_HPP_NOEXCEPT
       : m_count( static_cast<uint32_t>( v.size() ) )
-      , m_ptr( v.begin() )
+      , m_ptr( v.data() )
     {
     }
 
@@ -591,11 +591,6 @@ namespace VULKAN_HPP_NAMESPACE
       return m_ptr;
     }
 
-    RefType const * get() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_ptr;
-    }
-
     explicit operator bool() const VULKAN_HPP_NOEXCEPT
     {
       return !!m_ptr;
@@ -657,18 +652,25 @@ namespace VULKAN_HPP_NAMESPACE
   template <typename... ChainElements>
   class StructureChain : public std::tuple<ChainElements...>
   {
-    // Note: StructureChain has no move constructor or move assignment operator, as it is not supposed to contain movable containers.
-    //       In order to get a copy-operation on a move-operations, those functions are neither deleted nor defaulted.
   public:
     StructureChain() VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_STATIC_ASSERT( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
+      static_assert( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
       link<sizeof...( ChainElements ) - 1>();
     }
 
     StructureChain( StructureChain const & rhs ) VULKAN_HPP_NOEXCEPT : std::tuple<ChainElements...>( rhs )
     {
-      VULKAN_HPP_STATIC_ASSERT( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
+      static_assert( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
+      link( &std::get<0>( *this ),
+            &std::get<0>( rhs ),
+            reinterpret_cast<VkBaseOutStructure *>( &std::get<0>( *this ) ),
+            reinterpret_cast<VkBaseInStructure const *>( &std::get<0>( rhs ) ) );
+    }
+
+    StructureChain( StructureChain && rhs ) VULKAN_HPP_NOEXCEPT : std::tuple<ChainElements...>( std::forward<std::tuple<ChainElements...>>( rhs ) )
+    {
+      static_assert( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
       link( &std::get<0>( *this ),
             &std::get<0>( rhs ),
             reinterpret_cast<VkBaseOutStructure *>( &std::get<0>( *this ) ),
@@ -677,7 +679,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     StructureChain( ChainElements const &... elems ) VULKAN_HPP_NOEXCEPT : std::tuple<ChainElements...>( elems... )
     {
-      VULKAN_HPP_STATIC_ASSERT( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
+      static_assert( StructureChainValidation<sizeof...( ChainElements ) - 1, ChainElements...>::valid, "The structure chain is not valid!" );
       link<sizeof...( ChainElements ) - 1>();
     }
 
@@ -691,6 +693,8 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+    StructureChain & operator=( StructureChain && rhs ) = delete;
+
     template <typename T = typename std::tuple_element<0, std::tuple<ChainElements...>>::type, size_t Which = 0>
     T & get() VULKAN_HPP_NOEXCEPT
     {
@@ -737,7 +741,7 @@ namespace VULKAN_HPP_NAMESPACE
     typename std::enable_if<!std::is_same<ClassType, typename std::tuple_element<0, std::tuple<ChainElements...>>::type>::value || ( Which != 0 ), bool>::type
       isLinked() const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_STATIC_ASSERT( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't unlink Structure that's not part of this StructureChain!" );
+      static_assert( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't unlink Structure that's not part of this StructureChain!" );
       return isLinked( reinterpret_cast<VkBaseInStructure const *>( &get<ClassType, Which>() ) );
     }
 
@@ -745,7 +749,7 @@ namespace VULKAN_HPP_NAMESPACE
     typename std::enable_if<!std::is_same<ClassType, typename std::tuple_element<0, std::tuple<ChainElements...>>::type>::value || ( Which != 0 ), void>::type
       relink() VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_STATIC_ASSERT( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't relink Structure that's not part of this StructureChain!" );
+      static_assert( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't relink Structure that's not part of this StructureChain!" );
       auto pNext = reinterpret_cast<VkBaseInStructure *>( &get<ClassType, Which>() );
       VULKAN_HPP_ASSERT( !isLinked( pNext ) );
       auto & headElement = std::get<0>( static_cast<std::tuple<ChainElements...> &>( *this ) );
@@ -757,7 +761,7 @@ namespace VULKAN_HPP_NAMESPACE
     typename std::enable_if<!std::is_same<ClassType, typename std::tuple_element<0, std::tuple<ChainElements...>>::type>::value || ( Which != 0 ), void>::type
       unlink() VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_STATIC_ASSERT( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't unlink Structure that's not part of this StructureChain!" );
+      static_assert( IsPartOfStructureChain<ClassType, ChainElements...>::valid, "Can't unlink Structure that's not part of this StructureChain!" );
       unlink( reinterpret_cast<VkBaseOutStructure const *>( &get<ClassType, Which>() ) );
     }
 
@@ -997,5886 +1001,5137 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 #endif  // VULKAN_HPP_DISABLE_ENHANCED_MODE
 
-  namespace detail
+  class DispatchLoaderBase
   {
-    class DispatchLoaderBase
-    {
-    public:
-      DispatchLoaderBase() = default;
-      DispatchLoaderBase( std::nullptr_t )
+  public:
+    DispatchLoaderBase() = default;
+    DispatchLoaderBase( std::nullptr_t )
 #if !defined( NDEBUG )
-        : m_valid( false )
+      : m_valid( false )
 #endif
-      {
-      }
+    {
+    }
 
 #if !defined( NDEBUG )
-      size_t getVkHeaderVersion() const
-      {
-        VULKAN_HPP_ASSERT( m_valid );
-        return vkHeaderVersion;
-      }
+    size_t getVkHeaderVersion() const
+    {
+      VULKAN_HPP_ASSERT( m_valid );
+      return vkHeaderVersion;
+    }
 
-    private:
-      size_t vkHeaderVersion = VK_HEADER_VERSION;
-      bool   m_valid         = true;
+  private:
+    size_t vkHeaderVersion = VK_HEADER_VERSION;
+    bool   m_valid         = true;
 #endif
-    };
+  };
 
-    template <typename Type>
-    struct isDispatchLoader
+#if !defined( VK_NO_PROTOTYPES )
+  class DispatchLoaderStatic : public DispatchLoaderBase
+  {
+  public:
+    //=== VK_VERSION_1_0 ===
+
+    VkResult
+      vkCreateInstance( const VkInstanceCreateInfo * pCreateInfo, const VkAllocationCallbacks * pAllocator, VkInstance * pInstance ) const VULKAN_HPP_NOEXCEPT
     {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = false;
-    };
+      return ::vkCreateInstance( pCreateInfo, pAllocator, pInstance );
+    }
 
-#if !defined( VK_NO_PROTOTYPES ) || ( defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC ) && ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 0 ) )
-    class DispatchLoaderStatic : public DispatchLoaderBase
+    void vkDestroyInstance( VkInstance instance, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      //=== VK_VERSION_1_0 ===
+      return ::vkDestroyInstance( instance, pAllocator );
+    }
 
-      VkResult
-        vkCreateInstance( const VkInstanceCreateInfo * pCreateInfo, const VkAllocationCallbacks * pAllocator, VkInstance * pInstance ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateInstance( pCreateInfo, pAllocator, pInstance );
-      }
+    VkResult vkEnumeratePhysicalDevices( VkInstance instance, uint32_t * pPhysicalDeviceCount, VkPhysicalDevice * pPhysicalDevices ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumeratePhysicalDevices( instance, pPhysicalDeviceCount, pPhysicalDevices );
+    }
 
-      void vkDestroyInstance( VkInstance instance, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyInstance( instance, pAllocator );
-      }
+    void vkGetPhysicalDeviceFeatures( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures * pFeatures ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFeatures( physicalDevice, pFeatures );
+    }
 
-      VkResult vkEnumeratePhysicalDevices( VkInstance instance, uint32_t * pPhysicalDeviceCount, VkPhysicalDevice * pPhysicalDevices ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumeratePhysicalDevices( instance, pPhysicalDeviceCount, pPhysicalDevices );
-      }
+    void
+      vkGetPhysicalDeviceFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFormatProperties( physicalDevice, format, pFormatProperties );
+    }
 
-      void vkGetPhysicalDeviceFeatures( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures * pFeatures ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFeatures( physicalDevice, pFeatures );
-      }
+    VkResult vkGetPhysicalDeviceImageFormatProperties( VkPhysicalDevice          physicalDevice,
+                                                       VkFormat                  format,
+                                                       VkImageType               type,
+                                                       VkImageTiling             tiling,
+                                                       VkImageUsageFlags         usage,
+                                                       VkImageCreateFlags        flags,
+                                                       VkImageFormatProperties * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceImageFormatProperties( physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties );
+    }
 
-      void vkGetPhysicalDeviceFormatProperties( VkPhysicalDevice     physicalDevice,
-                                                VkFormat             format,
-                                                VkFormatProperties * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFormatProperties( physicalDevice, format, pFormatProperties );
-      }
+    void vkGetPhysicalDeviceProperties( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceProperties( physicalDevice, pProperties );
+    }
 
-      VkResult vkGetPhysicalDeviceImageFormatProperties( VkPhysicalDevice          physicalDevice,
-                                                         VkFormat                  format,
-                                                         VkImageType               type,
-                                                         VkImageTiling             tiling,
-                                                         VkImageUsageFlags         usage,
-                                                         VkImageCreateFlags        flags,
-                                                         VkImageFormatProperties * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceImageFormatProperties( physicalDevice, format, type, tiling, usage, flags, pImageFormatProperties );
-      }
+    void vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice          physicalDevice,
+                                                   uint32_t *                pQueueFamilyPropertyCount,
+                                                   VkQueueFamilyProperties * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceQueueFamilyProperties( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
+    }
 
-      void vkGetPhysicalDeviceProperties( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceProperties( physicalDevice, pProperties );
-      }
+    void vkGetPhysicalDeviceMemoryProperties( VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceMemoryProperties( physicalDevice, pMemoryProperties );
+    }
 
-      void vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice          physicalDevice,
-                                                     uint32_t *                pQueueFamilyPropertyCount,
-                                                     VkQueueFamilyProperties * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyProperties( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
-      }
+    PFN_vkVoidFunction vkGetInstanceProcAddr( VkInstance instance, const char * pName ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetInstanceProcAddr( instance, pName );
+    }
 
-      void vkGetPhysicalDeviceMemoryProperties( VkPhysicalDevice                   physicalDevice,
-                                                VkPhysicalDeviceMemoryProperties * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceMemoryProperties( physicalDevice, pMemoryProperties );
-      }
+    PFN_vkVoidFunction vkGetDeviceProcAddr( VkDevice device, const char * pName ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceProcAddr( device, pName );
+    }
 
-      PFN_vkVoidFunction vkGetInstanceProcAddr( VkInstance instance, const char * pName ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetInstanceProcAddr( instance, pName );
-      }
+    VkResult vkCreateDevice( VkPhysicalDevice              physicalDevice,
+                             const VkDeviceCreateInfo *    pCreateInfo,
+                             const VkAllocationCallbacks * pAllocator,
+                             VkDevice *                    pDevice ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDevice( physicalDevice, pCreateInfo, pAllocator, pDevice );
+    }
 
-      PFN_vkVoidFunction vkGetDeviceProcAddr( VkDevice device, const char * pName ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceProcAddr( device, pName );
-      }
+    void vkDestroyDevice( VkDevice device, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDevice( device, pAllocator );
+    }
 
-      VkResult vkCreateDevice( VkPhysicalDevice              physicalDevice,
-                               const VkDeviceCreateInfo *    pCreateInfo,
-                               const VkAllocationCallbacks * pAllocator,
-                               VkDevice *                    pDevice ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDevice( physicalDevice, pCreateInfo, pAllocator, pDevice );
-      }
-
-      void vkDestroyDevice( VkDevice device, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDevice( device, pAllocator );
-      }
-
-      VkResult vkEnumerateInstanceExtensionProperties( const char *            pLayerName,
-                                                       uint32_t *              pPropertyCount,
-                                                       VkExtensionProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumerateInstanceExtensionProperties( pLayerName, pPropertyCount, pProperties );
-      }
-
-      VkResult vkEnumerateDeviceExtensionProperties( VkPhysicalDevice        physicalDevice,
-                                                     const char *            pLayerName,
+    VkResult vkEnumerateInstanceExtensionProperties( const char *            pLayerName,
                                                      uint32_t *              pPropertyCount,
                                                      VkExtensionProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumerateDeviceExtensionProperties( physicalDevice, pLayerName, pPropertyCount, pProperties );
-      }
+    {
+      return ::vkEnumerateInstanceExtensionProperties( pLayerName, pPropertyCount, pProperties );
+    }
 
-      VkResult vkEnumerateInstanceLayerProperties( uint32_t * pPropertyCount, VkLayerProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumerateInstanceLayerProperties( pPropertyCount, pProperties );
-      }
+    VkResult vkEnumerateDeviceExtensionProperties( VkPhysicalDevice        physicalDevice,
+                                                   const char *            pLayerName,
+                                                   uint32_t *              pPropertyCount,
+                                                   VkExtensionProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumerateDeviceExtensionProperties( physicalDevice, pLayerName, pPropertyCount, pProperties );
+    }
 
-      VkResult vkEnumerateDeviceLayerProperties( VkPhysicalDevice    physicalDevice,
-                                                 uint32_t *          pPropertyCount,
-                                                 VkLayerProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumerateDeviceLayerProperties( physicalDevice, pPropertyCount, pProperties );
-      }
+    VkResult vkEnumerateInstanceLayerProperties( uint32_t * pPropertyCount, VkLayerProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumerateInstanceLayerProperties( pPropertyCount, pProperties );
+    }
 
-      void vkGetDeviceQueue( VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue * pQueue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceQueue( device, queueFamilyIndex, queueIndex, pQueue );
-      }
+    VkResult
+      vkEnumerateDeviceLayerProperties( VkPhysicalDevice physicalDevice, uint32_t * pPropertyCount, VkLayerProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumerateDeviceLayerProperties( physicalDevice, pPropertyCount, pProperties );
+    }
 
-      VkResult vkQueueSubmit( VkQueue queue, uint32_t submitCount, const VkSubmitInfo * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueSubmit( queue, submitCount, pSubmits, fence );
-      }
+    void vkGetDeviceQueue( VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue * pQueue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceQueue( device, queueFamilyIndex, queueIndex, pQueue );
+    }
 
-      VkResult vkQueueWaitIdle( VkQueue queue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueWaitIdle( queue );
-      }
+    VkResult vkQueueSubmit( VkQueue queue, uint32_t submitCount, const VkSubmitInfo * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueSubmit( queue, submitCount, pSubmits, fence );
+    }
 
-      VkResult vkDeviceWaitIdle( VkDevice device ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDeviceWaitIdle( device );
-      }
+    VkResult vkQueueWaitIdle( VkQueue queue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueWaitIdle( queue );
+    }
 
-      VkResult vkAllocateMemory( VkDevice                      device,
-                                 const VkMemoryAllocateInfo *  pAllocateInfo,
-                                 const VkAllocationCallbacks * pAllocator,
-                                 VkDeviceMemory *              pMemory ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAllocateMemory( device, pAllocateInfo, pAllocator, pMemory );
-      }
+    VkResult vkDeviceWaitIdle( VkDevice device ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDeviceWaitIdle( device );
+    }
 
-      void vkFreeMemory( VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkFreeMemory( device, memory, pAllocator );
-      }
-
-      VkResult vkMapMemory( VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void ** ppData ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkMapMemory( device, memory, offset, size, flags, ppData );
-      }
-
-      void vkUnmapMemory( VkDevice device, VkDeviceMemory memory ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUnmapMemory( device, memory );
-      }
-
-      VkResult vkFlushMappedMemoryRanges( VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange * pMemoryRanges ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkFlushMappedMemoryRanges( device, memoryRangeCount, pMemoryRanges );
-      }
-
-      VkResult vkInvalidateMappedMemoryRanges( VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange * pMemoryRanges ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkInvalidateMappedMemoryRanges( device, memoryRangeCount, pMemoryRanges );
-      }
-
-      void vkGetDeviceMemoryCommitment( VkDevice device, VkDeviceMemory memory, VkDeviceSize * pCommittedMemoryInBytes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceMemoryCommitment( device, memory, pCommittedMemoryInBytes );
-      }
-
-      VkResult vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindBufferMemory( device, buffer, memory, memoryOffset );
-      }
-
-      VkResult vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindImageMemory( device, image, memory, memoryOffset );
-      }
-
-      void vkGetBufferMemoryRequirements( VkDevice device, VkBuffer buffer, VkMemoryRequirements * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferMemoryRequirements( device, buffer, pMemoryRequirements );
-      }
-
-      void vkGetImageMemoryRequirements( VkDevice device, VkImage image, VkMemoryRequirements * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageMemoryRequirements( device, image, pMemoryRequirements );
-      }
-
-      void vkGetImageSparseMemoryRequirements( VkDevice                          device,
-                                               VkImage                           image,
-                                               uint32_t *                        pSparseMemoryRequirementCount,
-                                               VkSparseImageMemoryRequirements * pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSparseMemoryRequirements( device, image, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
-      }
-
-      void vkGetPhysicalDeviceSparseImageFormatProperties( VkPhysicalDevice                physicalDevice,
-                                                           VkFormat                        format,
-                                                           VkImageType                     type,
-                                                           VkSampleCountFlagBits           samples,
-                                                           VkImageUsageFlags               usage,
-                                                           VkImageTiling                   tiling,
-                                                           uint32_t *                      pPropertyCount,
-                                                           VkSparseImageFormatProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSparseImageFormatProperties( physicalDevice, format, type, samples, usage, tiling, pPropertyCount, pProperties );
-      }
-
-      VkResult vkQueueBindSparse( VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo * pBindInfo, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueBindSparse( queue, bindInfoCount, pBindInfo, fence );
-      }
-
-      VkResult vkCreateFence( VkDevice                      device,
-                              const VkFenceCreateInfo *     pCreateInfo,
-                              const VkAllocationCallbacks * pAllocator,
-                              VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateFence( device, pCreateInfo, pAllocator, pFence );
-      }
-
-      void vkDestroyFence( VkDevice device, VkFence fence, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyFence( device, fence, pAllocator );
-      }
-
-      VkResult vkResetFences( VkDevice device, uint32_t fenceCount, const VkFence * pFences ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetFences( device, fenceCount, pFences );
-      }
-
-      VkResult vkGetFenceStatus( VkDevice device, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetFenceStatus( device, fence );
-      }
-
-      VkResult vkWaitForFences( VkDevice device, uint32_t fenceCount, const VkFence * pFences, VkBool32 waitAll, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWaitForFences( device, fenceCount, pFences, waitAll, timeout );
-      }
-
-      VkResult vkCreateSemaphore( VkDevice                      device,
-                                  const VkSemaphoreCreateInfo * pCreateInfo,
-                                  const VkAllocationCallbacks * pAllocator,
-                                  VkSemaphore *                 pSemaphore ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSemaphore( device, pCreateInfo, pAllocator, pSemaphore );
-      }
-
-      void vkDestroySemaphore( VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySemaphore( device, semaphore, pAllocator );
-      }
-
-      VkResult vkCreateQueryPool( VkDevice                      device,
-                                  const VkQueryPoolCreateInfo * pCreateInfo,
-                                  const VkAllocationCallbacks * pAllocator,
-                                  VkQueryPool *                 pQueryPool ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateQueryPool( device, pCreateInfo, pAllocator, pQueryPool );
-      }
-
-      void vkDestroyQueryPool( VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyQueryPool( device, queryPool, pAllocator );
-      }
-
-      VkResult vkGetQueryPoolResults( VkDevice           device,
-                                      VkQueryPool        queryPool,
-                                      uint32_t           firstQuery,
-                                      uint32_t           queryCount,
-                                      size_t             dataSize,
-                                      void *             pData,
-                                      VkDeviceSize       stride,
-                                      VkQueryResultFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetQueryPoolResults( device, queryPool, firstQuery, queryCount, dataSize, pData, stride, flags );
-      }
-
-      VkResult vkCreateBuffer( VkDevice                      device,
-                               const VkBufferCreateInfo *    pCreateInfo,
+    VkResult vkAllocateMemory( VkDevice                      device,
+                               const VkMemoryAllocateInfo *  pAllocateInfo,
                                const VkAllocationCallbacks * pAllocator,
-                               VkBuffer *                    pBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateBuffer( device, pCreateInfo, pAllocator, pBuffer );
-      }
+                               VkDeviceMemory *              pMemory ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAllocateMemory( device, pAllocateInfo, pAllocator, pMemory );
+    }
 
-      void vkDestroyBuffer( VkDevice device, VkBuffer buffer, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyBuffer( device, buffer, pAllocator );
-      }
+    void vkFreeMemory( VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkFreeMemory( device, memory, pAllocator );
+    }
 
-      VkResult vkCreateImage( VkDevice                      device,
-                              const VkImageCreateInfo *     pCreateInfo,
-                              const VkAllocationCallbacks * pAllocator,
-                              VkImage *                     pImage ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateImage( device, pCreateInfo, pAllocator, pImage );
-      }
+    VkResult vkMapMemory( VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void ** ppData ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkMapMemory( device, memory, offset, size, flags, ppData );
+    }
 
-      void vkDestroyImage( VkDevice device, VkImage image, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyImage( device, image, pAllocator );
-      }
+    void vkUnmapMemory( VkDevice device, VkDeviceMemory memory ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUnmapMemory( device, memory );
+    }
 
-      void vkGetImageSubresourceLayout( VkDevice                   device,
-                                        VkImage                    image,
-                                        const VkImageSubresource * pSubresource,
-                                        VkSubresourceLayout *      pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSubresourceLayout( device, image, pSubresource, pLayout );
-      }
+    VkResult vkFlushMappedMemoryRanges( VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange * pMemoryRanges ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkFlushMappedMemoryRanges( device, memoryRangeCount, pMemoryRanges );
+    }
 
-      VkResult vkCreateImageView( VkDevice                      device,
-                                  const VkImageViewCreateInfo * pCreateInfo,
-                                  const VkAllocationCallbacks * pAllocator,
-                                  VkImageView *                 pView ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateImageView( device, pCreateInfo, pAllocator, pView );
-      }
+    VkResult vkInvalidateMappedMemoryRanges( VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange * pMemoryRanges ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkInvalidateMappedMemoryRanges( device, memoryRangeCount, pMemoryRanges );
+    }
 
-      void vkDestroyImageView( VkDevice device, VkImageView imageView, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyImageView( device, imageView, pAllocator );
-      }
+    void vkGetDeviceMemoryCommitment( VkDevice device, VkDeviceMemory memory, VkDeviceSize * pCommittedMemoryInBytes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceMemoryCommitment( device, memory, pCommittedMemoryInBytes );
+    }
 
-      VkResult vkCreateCommandPool( VkDevice                        device,
-                                    const VkCommandPoolCreateInfo * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkCommandPool *                 pCommandPool ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateCommandPool( device, pCreateInfo, pAllocator, pCommandPool );
-      }
+    VkResult vkBindBufferMemory( VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindBufferMemory( device, buffer, memory, memoryOffset );
+    }
 
-      void vkDestroyCommandPool( VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyCommandPool( device, commandPool, pAllocator );
-      }
+    VkResult vkBindImageMemory( VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindImageMemory( device, image, memory, memoryOffset );
+    }
 
-      VkResult vkResetCommandPool( VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetCommandPool( device, commandPool, flags );
-      }
+    void vkGetBufferMemoryRequirements( VkDevice device, VkBuffer buffer, VkMemoryRequirements * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferMemoryRequirements( device, buffer, pMemoryRequirements );
+    }
 
-      VkResult vkAllocateCommandBuffers( VkDevice                            device,
-                                         const VkCommandBufferAllocateInfo * pAllocateInfo,
-                                         VkCommandBuffer *                   pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAllocateCommandBuffers( device, pAllocateInfo, pCommandBuffers );
-      }
+    void vkGetImageMemoryRequirements( VkDevice device, VkImage image, VkMemoryRequirements * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageMemoryRequirements( device, image, pMemoryRequirements );
+    }
 
-      void vkFreeCommandBuffers( VkDevice                device,
-                                 VkCommandPool           commandPool,
-                                 uint32_t                commandBufferCount,
-                                 const VkCommandBuffer * pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkFreeCommandBuffers( device, commandPool, commandBufferCount, pCommandBuffers );
-      }
+    void vkGetImageSparseMemoryRequirements( VkDevice                          device,
+                                             VkImage                           image,
+                                             uint32_t *                        pSparseMemoryRequirementCount,
+                                             VkSparseImageMemoryRequirements * pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSparseMemoryRequirements( device, image, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
+    }
 
-      VkResult vkBeginCommandBuffer( VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo * pBeginInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBeginCommandBuffer( commandBuffer, pBeginInfo );
-      }
+    void vkGetPhysicalDeviceSparseImageFormatProperties( VkPhysicalDevice                physicalDevice,
+                                                         VkFormat                        format,
+                                                         VkImageType                     type,
+                                                         VkSampleCountFlagBits           samples,
+                                                         VkImageUsageFlags               usage,
+                                                         VkImageTiling                   tiling,
+                                                         uint32_t *                      pPropertyCount,
+                                                         VkSparseImageFormatProperties * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSparseImageFormatProperties( physicalDevice, format, type, samples, usage, tiling, pPropertyCount, pProperties );
+    }
 
-      VkResult vkEndCommandBuffer( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEndCommandBuffer( commandBuffer );
-      }
+    VkResult vkQueueBindSparse( VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo * pBindInfo, VkFence fence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueBindSparse( queue, bindInfoCount, pBindInfo, fence );
+    }
 
-      VkResult vkResetCommandBuffer( VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetCommandBuffer( commandBuffer, flags );
-      }
+    VkResult vkCreateFence( VkDevice                      device,
+                            const VkFenceCreateInfo *     pCreateInfo,
+                            const VkAllocationCallbacks * pAllocator,
+                            VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateFence( device, pCreateInfo, pAllocator, pFence );
+    }
 
-      void vkCmdCopyBuffer( VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy * pRegions ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBuffer( commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions );
-      }
+    void vkDestroyFence( VkDevice device, VkFence fence, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyFence( device, fence, pAllocator );
+    }
 
-      void vkCmdCopyImage( VkCommandBuffer     commandBuffer,
-                           VkImage             srcImage,
-                           VkImageLayout       srcImageLayout,
-                           VkImage             dstImage,
-                           VkImageLayout       dstImageLayout,
-                           uint32_t            regionCount,
-                           const VkImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
-      }
+    VkResult vkResetFences( VkDevice device, uint32_t fenceCount, const VkFence * pFences ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetFences( device, fenceCount, pFences );
+    }
 
-      void vkCmdCopyBufferToImage( VkCommandBuffer           commandBuffer,
-                                   VkBuffer                  srcBuffer,
-                                   VkImage                   dstImage,
-                                   VkImageLayout             dstImageLayout,
-                                   uint32_t                  regionCount,
-                                   const VkBufferImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBufferToImage( commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions );
-      }
+    VkResult vkGetFenceStatus( VkDevice device, VkFence fence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetFenceStatus( device, fence );
+    }
 
-      void vkCmdCopyImageToBuffer( VkCommandBuffer           commandBuffer,
-                                   VkImage                   srcImage,
-                                   VkImageLayout             srcImageLayout,
-                                   VkBuffer                  dstBuffer,
-                                   uint32_t                  regionCount,
-                                   const VkBufferImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImageToBuffer( commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions );
-      }
+    VkResult vkWaitForFences( VkDevice device, uint32_t fenceCount, const VkFence * pFences, VkBool32 waitAll, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWaitForFences( device, fenceCount, pFences, waitAll, timeout );
+    }
 
-      void vkCmdUpdateBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void * pData ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdUpdateBuffer( commandBuffer, dstBuffer, dstOffset, dataSize, pData );
-      }
-
-      void
-        vkCmdFillBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdFillBuffer( commandBuffer, dstBuffer, dstOffset, size, data );
-      }
-
-      void vkCmdPipelineBarrier( VkCommandBuffer               commandBuffer,
-                                 VkPipelineStageFlags          srcStageMask,
-                                 VkPipelineStageFlags          dstStageMask,
-                                 VkDependencyFlags             dependencyFlags,
-                                 uint32_t                      memoryBarrierCount,
-                                 const VkMemoryBarrier *       pMemoryBarriers,
-                                 uint32_t                      bufferMemoryBarrierCount,
-                                 const VkBufferMemoryBarrier * pBufferMemoryBarriers,
-                                 uint32_t                      imageMemoryBarrierCount,
-                                 const VkImageMemoryBarrier *  pImageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPipelineBarrier( commandBuffer,
-                                       srcStageMask,
-                                       dstStageMask,
-                                       dependencyFlags,
-                                       memoryBarrierCount,
-                                       pMemoryBarriers,
-                                       bufferMemoryBarrierCount,
-                                       pBufferMemoryBarriers,
-                                       imageMemoryBarrierCount,
-                                       pImageMemoryBarriers );
-      }
-
-      void vkCmdBeginQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginQuery( commandBuffer, queryPool, query, flags );
-      }
-
-      void vkCmdEndQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndQuery( commandBuffer, queryPool, query );
-      }
-
-      void vkCmdResetQueryPool( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResetQueryPool( commandBuffer, queryPool, firstQuery, queryCount );
-      }
-
-      void vkCmdWriteTimestamp( VkCommandBuffer         commandBuffer,
-                                VkPipelineStageFlagBits pipelineStage,
-                                VkQueryPool             queryPool,
-                                uint32_t                query ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteTimestamp( commandBuffer, pipelineStage, queryPool, query );
-      }
-
-      void vkCmdCopyQueryPoolResults( VkCommandBuffer    commandBuffer,
-                                      VkQueryPool        queryPool,
-                                      uint32_t           firstQuery,
-                                      uint32_t           queryCount,
-                                      VkBuffer           dstBuffer,
-                                      VkDeviceSize       dstOffset,
-                                      VkDeviceSize       stride,
-                                      VkQueryResultFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyQueryPoolResults( commandBuffer, queryPool, firstQuery, queryCount, dstBuffer, dstOffset, stride, flags );
-      }
-
-      void vkCmdExecuteCommands( VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer * pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdExecuteCommands( commandBuffer, commandBufferCount, pCommandBuffers );
-      }
-
-      VkResult vkCreateEvent( VkDevice                      device,
-                              const VkEventCreateInfo *     pCreateInfo,
-                              const VkAllocationCallbacks * pAllocator,
-                              VkEvent *                     pEvent ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateEvent( device, pCreateInfo, pAllocator, pEvent );
-      }
-
-      void vkDestroyEvent( VkDevice device, VkEvent event, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyEvent( device, event, pAllocator );
-      }
-
-      VkResult vkGetEventStatus( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetEventStatus( device, event );
-      }
-
-      VkResult vkSetEvent( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetEvent( device, event );
-      }
-
-      VkResult vkResetEvent( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetEvent( device, event );
-      }
-
-      VkResult vkCreateBufferView( VkDevice                       device,
-                                   const VkBufferViewCreateInfo * pCreateInfo,
-                                   const VkAllocationCallbacks *  pAllocator,
-                                   VkBufferView *                 pView ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateBufferView( device, pCreateInfo, pAllocator, pView );
-      }
-
-      void vkDestroyBufferView( VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyBufferView( device, bufferView, pAllocator );
-      }
-
-      VkResult vkCreateShaderModule( VkDevice                         device,
-                                     const VkShaderModuleCreateInfo * pCreateInfo,
-                                     const VkAllocationCallbacks *    pAllocator,
-                                     VkShaderModule *                 pShaderModule ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateShaderModule( device, pCreateInfo, pAllocator, pShaderModule );
-      }
-
-      void vkDestroyShaderModule( VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyShaderModule( device, shaderModule, pAllocator );
-      }
-
-      VkResult vkCreatePipelineCache( VkDevice                          device,
-                                      const VkPipelineCacheCreateInfo * pCreateInfo,
-                                      const VkAllocationCallbacks *     pAllocator,
-                                      VkPipelineCache *                 pPipelineCache ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreatePipelineCache( device, pCreateInfo, pAllocator, pPipelineCache );
-      }
-
-      void vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPipelineCache( device, pipelineCache, pAllocator );
-      }
-
-      VkResult vkGetPipelineCacheData( VkDevice device, VkPipelineCache pipelineCache, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineCacheData( device, pipelineCache, pDataSize, pData );
-      }
-
-      VkResult
-        vkMergePipelineCaches( VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache * pSrcCaches ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkMergePipelineCaches( device, dstCache, srcCacheCount, pSrcCaches );
-      }
-
-      VkResult vkCreateComputePipelines( VkDevice                            device,
-                                         VkPipelineCache                     pipelineCache,
-                                         uint32_t                            createInfoCount,
-                                         const VkComputePipelineCreateInfo * pCreateInfos,
-                                         const VkAllocationCallbacks *       pAllocator,
-                                         VkPipeline *                        pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateComputePipelines( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
-
-      void vkDestroyPipeline( VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPipeline( device, pipeline, pAllocator );
-      }
-
-      VkResult vkCreatePipelineLayout( VkDevice                           device,
-                                       const VkPipelineLayoutCreateInfo * pCreateInfo,
-                                       const VkAllocationCallbacks *      pAllocator,
-                                       VkPipelineLayout *                 pPipelineLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreatePipelineLayout( device, pCreateInfo, pAllocator, pPipelineLayout );
-      }
-
-      void vkDestroyPipelineLayout( VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPipelineLayout( device, pipelineLayout, pAllocator );
-      }
-
-      VkResult vkCreateSampler( VkDevice                      device,
-                                const VkSamplerCreateInfo *   pCreateInfo,
+    VkResult vkCreateSemaphore( VkDevice                      device,
+                                const VkSemaphoreCreateInfo * pCreateInfo,
                                 const VkAllocationCallbacks * pAllocator,
-                                VkSampler *                   pSampler ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSampler( device, pCreateInfo, pAllocator, pSampler );
-      }
-
-      void vkDestroySampler( VkDevice device, VkSampler sampler, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySampler( device, sampler, pAllocator );
-      }
-
-      VkResult vkCreateDescriptorSetLayout( VkDevice                                device,
-                                            const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
-                                            const VkAllocationCallbacks *           pAllocator,
-                                            VkDescriptorSetLayout *                 pSetLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDescriptorSetLayout( device, pCreateInfo, pAllocator, pSetLayout );
-      }
-
-      void vkDestroyDescriptorSetLayout( VkDevice                      device,
-                                         VkDescriptorSetLayout         descriptorSetLayout,
-                                         const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDescriptorSetLayout( device, descriptorSetLayout, pAllocator );
-      }
-
-      VkResult vkCreateDescriptorPool( VkDevice                           device,
-                                       const VkDescriptorPoolCreateInfo * pCreateInfo,
-                                       const VkAllocationCallbacks *      pAllocator,
-                                       VkDescriptorPool *                 pDescriptorPool ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDescriptorPool( device, pCreateInfo, pAllocator, pDescriptorPool );
-      }
-
-      void vkDestroyDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDescriptorPool( device, descriptorPool, pAllocator );
-      }
-
-      VkResult vkResetDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetDescriptorPool( device, descriptorPool, flags );
-      }
-
-      VkResult vkAllocateDescriptorSets( VkDevice                            device,
-                                         const VkDescriptorSetAllocateInfo * pAllocateInfo,
-                                         VkDescriptorSet *                   pDescriptorSets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAllocateDescriptorSets( device, pAllocateInfo, pDescriptorSets );
-      }
-
-      VkResult vkFreeDescriptorSets( VkDevice                device,
-                                     VkDescriptorPool        descriptorPool,
-                                     uint32_t                descriptorSetCount,
-                                     const VkDescriptorSet * pDescriptorSets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkFreeDescriptorSets( device, descriptorPool, descriptorSetCount, pDescriptorSets );
-      }
-
-      void vkUpdateDescriptorSets( VkDevice                     device,
-                                   uint32_t                     descriptorWriteCount,
-                                   const VkWriteDescriptorSet * pDescriptorWrites,
-                                   uint32_t                     descriptorCopyCount,
-                                   const VkCopyDescriptorSet *  pDescriptorCopies ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateDescriptorSets( device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies );
-      }
-
-      void vkCmdBindPipeline( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindPipeline( commandBuffer, pipelineBindPoint, pipeline );
-      }
-
-      void vkCmdBindDescriptorSets( VkCommandBuffer         commandBuffer,
-                                    VkPipelineBindPoint     pipelineBindPoint,
-                                    VkPipelineLayout        layout,
-                                    uint32_t                firstSet,
-                                    uint32_t                descriptorSetCount,
-                                    const VkDescriptorSet * pDescriptorSets,
-                                    uint32_t                dynamicOffsetCount,
-                                    const uint32_t *        pDynamicOffsets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorSets(
-          commandBuffer, pipelineBindPoint, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets );
-      }
-
-      void vkCmdClearColorImage( VkCommandBuffer                 commandBuffer,
-                                 VkImage                         image,
-                                 VkImageLayout                   imageLayout,
-                                 const VkClearColorValue *       pColor,
-                                 uint32_t                        rangeCount,
-                                 const VkImageSubresourceRange * pRanges ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdClearColorImage( commandBuffer, image, imageLayout, pColor, rangeCount, pRanges );
-      }
-
-      void vkCmdDispatch( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatch( commandBuffer, groupCountX, groupCountY, groupCountZ );
-      }
-
-      void vkCmdDispatchIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchIndirect( commandBuffer, buffer, offset );
-      }
-
-      void vkCmdSetEvent( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetEvent( commandBuffer, event, stageMask );
-      }
-
-      void vkCmdResetEvent( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResetEvent( commandBuffer, event, stageMask );
-      }
-
-      void vkCmdWaitEvents( VkCommandBuffer               commandBuffer,
-                            uint32_t                      eventCount,
-                            const VkEvent *               pEvents,
-                            VkPipelineStageFlags          srcStageMask,
-                            VkPipelineStageFlags          dstStageMask,
-                            uint32_t                      memoryBarrierCount,
-                            const VkMemoryBarrier *       pMemoryBarriers,
-                            uint32_t                      bufferMemoryBarrierCount,
-                            const VkBufferMemoryBarrier * pBufferMemoryBarriers,
-                            uint32_t                      imageMemoryBarrierCount,
-                            const VkImageMemoryBarrier *  pImageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWaitEvents( commandBuffer,
-                                  eventCount,
-                                  pEvents,
-                                  srcStageMask,
-                                  dstStageMask,
-                                  memoryBarrierCount,
-                                  pMemoryBarriers,
-                                  bufferMemoryBarrierCount,
-                                  pBufferMemoryBarriers,
-                                  imageMemoryBarrierCount,
-                                  pImageMemoryBarriers );
-      }
-
-      void vkCmdPushConstants( VkCommandBuffer    commandBuffer,
-                               VkPipelineLayout   layout,
-                               VkShaderStageFlags stageFlags,
-                               uint32_t           offset,
-                               uint32_t           size,
-                               const void *       pValues ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushConstants( commandBuffer, layout, stageFlags, offset, size, pValues );
-      }
-
-      VkResult vkCreateGraphicsPipelines( VkDevice                             device,
-                                          VkPipelineCache                      pipelineCache,
-                                          uint32_t                             createInfoCount,
-                                          const VkGraphicsPipelineCreateInfo * pCreateInfos,
-                                          const VkAllocationCallbacks *        pAllocator,
-                                          VkPipeline *                         pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateGraphicsPipelines( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
-
-      VkResult vkCreateFramebuffer( VkDevice                        device,
-                                    const VkFramebufferCreateInfo * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkFramebuffer *                 pFramebuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateFramebuffer( device, pCreateInfo, pAllocator, pFramebuffer );
-      }
-
-      void vkDestroyFramebuffer( VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyFramebuffer( device, framebuffer, pAllocator );
-      }
-
-      VkResult vkCreateRenderPass( VkDevice                       device,
-                                   const VkRenderPassCreateInfo * pCreateInfo,
-                                   const VkAllocationCallbacks *  pAllocator,
-                                   VkRenderPass *                 pRenderPass ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateRenderPass( device, pCreateInfo, pAllocator, pRenderPass );
-      }
-
-      void vkDestroyRenderPass( VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyRenderPass( device, renderPass, pAllocator );
-      }
-
-      void vkGetRenderAreaGranularity( VkDevice device, VkRenderPass renderPass, VkExtent2D * pGranularity ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRenderAreaGranularity( device, renderPass, pGranularity );
-      }
-
-      void vkCmdSetViewport( VkCommandBuffer    commandBuffer,
-                             uint32_t           firstViewport,
-                             uint32_t           viewportCount,
-                             const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewport( commandBuffer, firstViewport, viewportCount, pViewports );
-      }
-
-      void vkCmdSetScissor( VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetScissor( commandBuffer, firstScissor, scissorCount, pScissors );
-      }
-
-      void vkCmdSetLineWidth( VkCommandBuffer commandBuffer, float lineWidth ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineWidth( commandBuffer, lineWidth );
-      }
-
-      void vkCmdSetDepthBias( VkCommandBuffer commandBuffer,
-                              float           depthBiasConstantFactor,
-                              float           depthBiasClamp,
-                              float           depthBiasSlopeFactor ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBias( commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
-      }
-
-      void vkCmdSetBlendConstants( VkCommandBuffer commandBuffer, const float blendConstants[4] ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetBlendConstants( commandBuffer, blendConstants );
-      }
-
-      void vkCmdSetDepthBounds( VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBounds( commandBuffer, minDepthBounds, maxDepthBounds );
-      }
-
-      void vkCmdSetStencilCompareMask( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilCompareMask( commandBuffer, faceMask, compareMask );
-      }
-
-      void vkCmdSetStencilWriteMask( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilWriteMask( commandBuffer, faceMask, writeMask );
-      }
-
-      void vkCmdSetStencilReference( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilReference( commandBuffer, faceMask, reference );
-      }
-
-      void vkCmdBindIndexBuffer( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindIndexBuffer( commandBuffer, buffer, offset, indexType );
-      }
-
-      void vkCmdBindVertexBuffers( VkCommandBuffer      commandBuffer,
-                                   uint32_t             firstBinding,
-                                   uint32_t             bindingCount,
-                                   const VkBuffer *     pBuffers,
-                                   const VkDeviceSize * pOffsets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindVertexBuffers( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets );
-      }
-
-      void vkCmdDraw( VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDraw( commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance );
-      }
-
-      void vkCmdDrawIndexed( VkCommandBuffer commandBuffer,
-                             uint32_t        indexCount,
-                             uint32_t        instanceCount,
-                             uint32_t        firstIndex,
-                             int32_t         vertexOffset,
-                             uint32_t        firstInstance ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndexed( commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
-      }
-
-      void
-        vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndirect( commandBuffer, buffer, offset, drawCount, stride );
-      }
-
-      void vkCmdDrawIndexedIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndexedIndirect( commandBuffer, buffer, offset, drawCount, stride );
-      }
-
-      void vkCmdBlitImage( VkCommandBuffer     commandBuffer,
-                           VkImage             srcImage,
-                           VkImageLayout       srcImageLayout,
-                           VkImage             dstImage,
-                           VkImageLayout       dstImageLayout,
-                           uint32_t            regionCount,
-                           const VkImageBlit * pRegions,
-                           VkFilter            filter ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBlitImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter );
-      }
-
-      void vkCmdClearDepthStencilImage( VkCommandBuffer                  commandBuffer,
-                                        VkImage                          image,
-                                        VkImageLayout                    imageLayout,
-                                        const VkClearDepthStencilValue * pDepthStencil,
-                                        uint32_t                         rangeCount,
-                                        const VkImageSubresourceRange *  pRanges ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdClearDepthStencilImage( commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges );
-      }
-
-      void vkCmdClearAttachments( VkCommandBuffer           commandBuffer,
-                                  uint32_t                  attachmentCount,
-                                  const VkClearAttachment * pAttachments,
-                                  uint32_t                  rectCount,
-                                  const VkClearRect *       pRects ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdClearAttachments( commandBuffer, attachmentCount, pAttachments, rectCount, pRects );
-      }
-
-      void vkCmdResolveImage( VkCommandBuffer        commandBuffer,
-                              VkImage                srcImage,
-                              VkImageLayout          srcImageLayout,
-                              VkImage                dstImage,
-                              VkImageLayout          dstImageLayout,
-                              uint32_t               regionCount,
-                              const VkImageResolve * pRegions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResolveImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
-      }
-
-      void vkCmdBeginRenderPass( VkCommandBuffer               commandBuffer,
-                                 const VkRenderPassBeginInfo * pRenderPassBegin,
-                                 VkSubpassContents             contents ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginRenderPass( commandBuffer, pRenderPassBegin, contents );
-      }
-
-      void vkCmdNextSubpass( VkCommandBuffer commandBuffer, VkSubpassContents contents ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdNextSubpass( commandBuffer, contents );
-      }
-
-      void vkCmdEndRenderPass( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRenderPass( commandBuffer );
-      }
-
-      //=== VK_VERSION_1_1 ===
-
-      VkResult vkEnumerateInstanceVersion( uint32_t * pApiVersion ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumerateInstanceVersion( pApiVersion );
-      }
-
-      VkResult vkBindBufferMemory2( VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindBufferMemory2( device, bindInfoCount, pBindInfos );
-      }
-
-      VkResult vkBindImageMemory2( VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindImageMemory2( device, bindInfoCount, pBindInfos );
-      }
-
-      void vkGetDeviceGroupPeerMemoryFeatures( VkDevice                   device,
-                                               uint32_t                   heapIndex,
-                                               uint32_t                   localDeviceIndex,
-                                               uint32_t                   remoteDeviceIndex,
-                                               VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceGroupPeerMemoryFeatures( device, heapIndex, localDeviceIndex, remoteDeviceIndex, pPeerMemoryFeatures );
-      }
-
-      void vkCmdSetDeviceMask( VkCommandBuffer commandBuffer, uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDeviceMask( commandBuffer, deviceMask );
-      }
-
-      VkResult vkEnumeratePhysicalDeviceGroups( VkInstance                        instance,
-                                                uint32_t *                        pPhysicalDeviceGroupCount,
-                                                VkPhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumeratePhysicalDeviceGroups( instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties );
-      }
-
-      void vkGetImageMemoryRequirements2( VkDevice                               device,
-                                          const VkImageMemoryRequirementsInfo2 * pInfo,
-                                          VkMemoryRequirements2 *                pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageMemoryRequirements2( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetBufferMemoryRequirements2( VkDevice                                device,
-                                           const VkBufferMemoryRequirementsInfo2 * pInfo,
-                                           VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferMemoryRequirements2( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetImageSparseMemoryRequirements2( VkDevice                                     device,
-                                                const VkImageSparseMemoryRequirementsInfo2 * pInfo,
-                                                uint32_t *                                   pSparseMemoryRequirementCount,
-                                                VkSparseImageMemoryRequirements2 *           pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSparseMemoryRequirements2( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
-      }
-
-      void vkGetPhysicalDeviceFeatures2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 * pFeatures ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFeatures2( physicalDevice, pFeatures );
-      }
-
-      void vkGetPhysicalDeviceProperties2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceProperties2( physicalDevice, pProperties );
-      }
-
-      void vkGetPhysicalDeviceFormatProperties2( VkPhysicalDevice      physicalDevice,
-                                                 VkFormat              format,
-                                                 VkFormatProperties2 * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFormatProperties2( physicalDevice, format, pFormatProperties );
-      }
-
-      VkResult vkGetPhysicalDeviceImageFormatProperties2( VkPhysicalDevice                         physicalDevice,
-                                                          const VkPhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                          VkImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceImageFormatProperties2( physicalDevice, pImageFormatInfo, pImageFormatProperties );
-      }
-
-      void vkGetPhysicalDeviceQueueFamilyProperties2( VkPhysicalDevice           physicalDevice,
-                                                      uint32_t *                 pQueueFamilyPropertyCount,
-                                                      VkQueueFamilyProperties2 * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyProperties2( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
-      }
-
-      void vkGetPhysicalDeviceMemoryProperties2( VkPhysicalDevice                    physicalDevice,
-                                                 VkPhysicalDeviceMemoryProperties2 * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceMemoryProperties2( physicalDevice, pMemoryProperties );
-      }
-
-      void vkGetPhysicalDeviceSparseImageFormatProperties2( VkPhysicalDevice                               physicalDevice,
-                                                            const VkPhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                                            uint32_t *                                     pPropertyCount,
-                                                            VkSparseImageFormatProperties2 *               pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSparseImageFormatProperties2( physicalDevice, pFormatInfo, pPropertyCount, pProperties );
-      }
-
-      void vkTrimCommandPool( VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkTrimCommandPool( device, commandPool, flags );
-      }
-
-      void vkGetDeviceQueue2( VkDevice device, const VkDeviceQueueInfo2 * pQueueInfo, VkQueue * pQueue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceQueue2( device, pQueueInfo, pQueue );
-      }
-
-      void vkGetPhysicalDeviceExternalBufferProperties( VkPhysicalDevice                           physicalDevice,
-                                                        const VkPhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                                        VkExternalBufferProperties *               pExternalBufferProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalBufferProperties( physicalDevice, pExternalBufferInfo, pExternalBufferProperties );
-      }
-
-      void vkGetPhysicalDeviceExternalFenceProperties( VkPhysicalDevice                          physicalDevice,
-                                                       const VkPhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                                       VkExternalFenceProperties *               pExternalFenceProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalFenceProperties( physicalDevice, pExternalFenceInfo, pExternalFenceProperties );
-      }
-
-      void vkGetPhysicalDeviceExternalSemaphoreProperties( VkPhysicalDevice                              physicalDevice,
-                                                           const VkPhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                                           VkExternalSemaphoreProperties * pExternalSemaphoreProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalSemaphoreProperties( physicalDevice, pExternalSemaphoreInfo, pExternalSemaphoreProperties );
-      }
-
-      void vkCmdDispatchBase( VkCommandBuffer commandBuffer,
-                              uint32_t        baseGroupX,
-                              uint32_t        baseGroupY,
-                              uint32_t        baseGroupZ,
-                              uint32_t        groupCountX,
-                              uint32_t        groupCountY,
-                              uint32_t        groupCountZ ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchBase( commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
-      }
-
-      VkResult vkCreateDescriptorUpdateTemplate( VkDevice                                     device,
-                                                 const VkDescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                 const VkAllocationCallbacks *                pAllocator,
-                                                 VkDescriptorUpdateTemplate *                 pDescriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDescriptorUpdateTemplate( device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate );
-      }
-
-      void vkDestroyDescriptorUpdateTemplate( VkDevice                      device,
-                                              VkDescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                              const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDescriptorUpdateTemplate( device, descriptorUpdateTemplate, pAllocator );
-      }
-
-      void vkUpdateDescriptorSetWithTemplate( VkDevice                   device,
-                                              VkDescriptorSet            descriptorSet,
-                                              VkDescriptorUpdateTemplate descriptorUpdateTemplate,
-                                              const void *               pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateDescriptorSetWithTemplate( device, descriptorSet, descriptorUpdateTemplate, pData );
-      }
-
-      void vkGetDescriptorSetLayoutSupport( VkDevice                                device,
-                                            const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
-                                            VkDescriptorSetLayoutSupport *          pSupport ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetLayoutSupport( device, pCreateInfo, pSupport );
-      }
-
-      VkResult vkCreateSamplerYcbcrConversion( VkDevice                                   device,
-                                               const VkSamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                               const VkAllocationCallbacks *              pAllocator,
-                                               VkSamplerYcbcrConversion *                 pYcbcrConversion ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSamplerYcbcrConversion( device, pCreateInfo, pAllocator, pYcbcrConversion );
-      }
-
-      void vkDestroySamplerYcbcrConversion( VkDevice                      device,
-                                            VkSamplerYcbcrConversion      ycbcrConversion,
+                                VkSemaphore *                 pSemaphore ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSemaphore( device, pCreateInfo, pAllocator, pSemaphore );
+    }
+
+    void vkDestroySemaphore( VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroySemaphore( device, semaphore, pAllocator );
+    }
+
+    VkResult vkCreateEvent( VkDevice                      device,
+                            const VkEventCreateInfo *     pCreateInfo,
+                            const VkAllocationCallbacks * pAllocator,
+                            VkEvent *                     pEvent ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateEvent( device, pCreateInfo, pAllocator, pEvent );
+    }
+
+    void vkDestroyEvent( VkDevice device, VkEvent event, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyEvent( device, event, pAllocator );
+    }
+
+    VkResult vkGetEventStatus( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetEventStatus( device, event );
+    }
+
+    VkResult vkSetEvent( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetEvent( device, event );
+    }
+
+    VkResult vkResetEvent( VkDevice device, VkEvent event ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetEvent( device, event );
+    }
+
+    VkResult vkCreateQueryPool( VkDevice                      device,
+                                const VkQueryPoolCreateInfo * pCreateInfo,
+                                const VkAllocationCallbacks * pAllocator,
+                                VkQueryPool *                 pQueryPool ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateQueryPool( device, pCreateInfo, pAllocator, pQueryPool );
+    }
+
+    void vkDestroyQueryPool( VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyQueryPool( device, queryPool, pAllocator );
+    }
+
+    VkResult vkGetQueryPoolResults( VkDevice           device,
+                                    VkQueryPool        queryPool,
+                                    uint32_t           firstQuery,
+                                    uint32_t           queryCount,
+                                    size_t             dataSize,
+                                    void *             pData,
+                                    VkDeviceSize       stride,
+                                    VkQueryResultFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetQueryPoolResults( device, queryPool, firstQuery, queryCount, dataSize, pData, stride, flags );
+    }
+
+    VkResult vkCreateBuffer( VkDevice                      device,
+                             const VkBufferCreateInfo *    pCreateInfo,
+                             const VkAllocationCallbacks * pAllocator,
+                             VkBuffer *                    pBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateBuffer( device, pCreateInfo, pAllocator, pBuffer );
+    }
+
+    void vkDestroyBuffer( VkDevice device, VkBuffer buffer, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyBuffer( device, buffer, pAllocator );
+    }
+
+    VkResult vkCreateBufferView( VkDevice                       device,
+                                 const VkBufferViewCreateInfo * pCreateInfo,
+                                 const VkAllocationCallbacks *  pAllocator,
+                                 VkBufferView *                 pView ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateBufferView( device, pCreateInfo, pAllocator, pView );
+    }
+
+    void vkDestroyBufferView( VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyBufferView( device, bufferView, pAllocator );
+    }
+
+    VkResult vkCreateImage( VkDevice                      device,
+                            const VkImageCreateInfo *     pCreateInfo,
+                            const VkAllocationCallbacks * pAllocator,
+                            VkImage *                     pImage ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateImage( device, pCreateInfo, pAllocator, pImage );
+    }
+
+    void vkDestroyImage( VkDevice device, VkImage image, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyImage( device, image, pAllocator );
+    }
+
+    void vkGetImageSubresourceLayout( VkDevice                   device,
+                                      VkImage                    image,
+                                      const VkImageSubresource * pSubresource,
+                                      VkSubresourceLayout *      pLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSubresourceLayout( device, image, pSubresource, pLayout );
+    }
+
+    VkResult vkCreateImageView( VkDevice                      device,
+                                const VkImageViewCreateInfo * pCreateInfo,
+                                const VkAllocationCallbacks * pAllocator,
+                                VkImageView *                 pView ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateImageView( device, pCreateInfo, pAllocator, pView );
+    }
+
+    void vkDestroyImageView( VkDevice device, VkImageView imageView, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyImageView( device, imageView, pAllocator );
+    }
+
+    VkResult vkCreateShaderModule( VkDevice                         device,
+                                   const VkShaderModuleCreateInfo * pCreateInfo,
+                                   const VkAllocationCallbacks *    pAllocator,
+                                   VkShaderModule *                 pShaderModule ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateShaderModule( device, pCreateInfo, pAllocator, pShaderModule );
+    }
+
+    void vkDestroyShaderModule( VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyShaderModule( device, shaderModule, pAllocator );
+    }
+
+    VkResult vkCreatePipelineCache( VkDevice                          device,
+                                    const VkPipelineCacheCreateInfo * pCreateInfo,
+                                    const VkAllocationCallbacks *     pAllocator,
+                                    VkPipelineCache *                 pPipelineCache ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreatePipelineCache( device, pCreateInfo, pAllocator, pPipelineCache );
+    }
+
+    void vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyPipelineCache( device, pipelineCache, pAllocator );
+    }
+
+    VkResult vkGetPipelineCacheData( VkDevice device, VkPipelineCache pipelineCache, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineCacheData( device, pipelineCache, pDataSize, pData );
+    }
+
+    VkResult
+      vkMergePipelineCaches( VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache * pSrcCaches ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkMergePipelineCaches( device, dstCache, srcCacheCount, pSrcCaches );
+    }
+
+    VkResult vkCreateGraphicsPipelines( VkDevice                             device,
+                                        VkPipelineCache                      pipelineCache,
+                                        uint32_t                             createInfoCount,
+                                        const VkGraphicsPipelineCreateInfo * pCreateInfos,
+                                        const VkAllocationCallbacks *        pAllocator,
+                                        VkPipeline *                         pPipelines ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateGraphicsPipelines( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
+    }
+
+    VkResult vkCreateComputePipelines( VkDevice                            device,
+                                       VkPipelineCache                     pipelineCache,
+                                       uint32_t                            createInfoCount,
+                                       const VkComputePipelineCreateInfo * pCreateInfos,
+                                       const VkAllocationCallbacks *       pAllocator,
+                                       VkPipeline *                        pPipelines ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateComputePipelines( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
+    }
+
+    void vkDestroyPipeline( VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyPipeline( device, pipeline, pAllocator );
+    }
+
+    VkResult vkCreatePipelineLayout( VkDevice                           device,
+                                     const VkPipelineLayoutCreateInfo * pCreateInfo,
+                                     const VkAllocationCallbacks *      pAllocator,
+                                     VkPipelineLayout *                 pPipelineLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreatePipelineLayout( device, pCreateInfo, pAllocator, pPipelineLayout );
+    }
+
+    void vkDestroyPipelineLayout( VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyPipelineLayout( device, pipelineLayout, pAllocator );
+    }
+
+    VkResult vkCreateSampler( VkDevice                      device,
+                              const VkSamplerCreateInfo *   pCreateInfo,
+                              const VkAllocationCallbacks * pAllocator,
+                              VkSampler *                   pSampler ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSampler( device, pCreateInfo, pAllocator, pSampler );
+    }
+
+    void vkDestroySampler( VkDevice device, VkSampler sampler, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroySampler( device, sampler, pAllocator );
+    }
+
+    VkResult vkCreateDescriptorSetLayout( VkDevice                                device,
+                                          const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
+                                          const VkAllocationCallbacks *           pAllocator,
+                                          VkDescriptorSetLayout *                 pSetLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDescriptorSetLayout( device, pCreateInfo, pAllocator, pSetLayout );
+    }
+
+    void vkDestroyDescriptorSetLayout( VkDevice                      device,
+                                       VkDescriptorSetLayout         descriptorSetLayout,
+                                       const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDescriptorSetLayout( device, descriptorSetLayout, pAllocator );
+    }
+
+    VkResult vkCreateDescriptorPool( VkDevice                           device,
+                                     const VkDescriptorPoolCreateInfo * pCreateInfo,
+                                     const VkAllocationCallbacks *      pAllocator,
+                                     VkDescriptorPool *                 pDescriptorPool ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDescriptorPool( device, pCreateInfo, pAllocator, pDescriptorPool );
+    }
+
+    void vkDestroyDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDescriptorPool( device, descriptorPool, pAllocator );
+    }
+
+    VkResult vkResetDescriptorPool( VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetDescriptorPool( device, descriptorPool, flags );
+    }
+
+    VkResult vkAllocateDescriptorSets( VkDevice                            device,
+                                       const VkDescriptorSetAllocateInfo * pAllocateInfo,
+                                       VkDescriptorSet *                   pDescriptorSets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAllocateDescriptorSets( device, pAllocateInfo, pDescriptorSets );
+    }
+
+    VkResult vkFreeDescriptorSets( VkDevice                device,
+                                   VkDescriptorPool        descriptorPool,
+                                   uint32_t                descriptorSetCount,
+                                   const VkDescriptorSet * pDescriptorSets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkFreeDescriptorSets( device, descriptorPool, descriptorSetCount, pDescriptorSets );
+    }
+
+    void vkUpdateDescriptorSets( VkDevice                     device,
+                                 uint32_t                     descriptorWriteCount,
+                                 const VkWriteDescriptorSet * pDescriptorWrites,
+                                 uint32_t                     descriptorCopyCount,
+                                 const VkCopyDescriptorSet *  pDescriptorCopies ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUpdateDescriptorSets( device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies );
+    }
+
+    VkResult vkCreateFramebuffer( VkDevice                        device,
+                                  const VkFramebufferCreateInfo * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkFramebuffer *                 pFramebuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateFramebuffer( device, pCreateInfo, pAllocator, pFramebuffer );
+    }
+
+    void vkDestroyFramebuffer( VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyFramebuffer( device, framebuffer, pAllocator );
+    }
+
+    VkResult vkCreateRenderPass( VkDevice                       device,
+                                 const VkRenderPassCreateInfo * pCreateInfo,
+                                 const VkAllocationCallbacks *  pAllocator,
+                                 VkRenderPass *                 pRenderPass ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateRenderPass( device, pCreateInfo, pAllocator, pRenderPass );
+    }
+
+    void vkDestroyRenderPass( VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyRenderPass( device, renderPass, pAllocator );
+    }
+
+    void vkGetRenderAreaGranularity( VkDevice device, VkRenderPass renderPass, VkExtent2D * pGranularity ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRenderAreaGranularity( device, renderPass, pGranularity );
+    }
+
+    VkResult vkCreateCommandPool( VkDevice                        device,
+                                  const VkCommandPoolCreateInfo * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkCommandPool *                 pCommandPool ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateCommandPool( device, pCreateInfo, pAllocator, pCommandPool );
+    }
+
+    void vkDestroyCommandPool( VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyCommandPool( device, commandPool, pAllocator );
+    }
+
+    VkResult vkResetCommandPool( VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetCommandPool( device, commandPool, flags );
+    }
+
+    VkResult vkAllocateCommandBuffers( VkDevice                            device,
+                                       const VkCommandBufferAllocateInfo * pAllocateInfo,
+                                       VkCommandBuffer *                   pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAllocateCommandBuffers( device, pAllocateInfo, pCommandBuffers );
+    }
+
+    void vkFreeCommandBuffers( VkDevice                device,
+                               VkCommandPool           commandPool,
+                               uint32_t                commandBufferCount,
+                               const VkCommandBuffer * pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkFreeCommandBuffers( device, commandPool, commandBufferCount, pCommandBuffers );
+    }
+
+    VkResult vkBeginCommandBuffer( VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo * pBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBeginCommandBuffer( commandBuffer, pBeginInfo );
+    }
+
+    VkResult vkEndCommandBuffer( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEndCommandBuffer( commandBuffer );
+    }
+
+    VkResult vkResetCommandBuffer( VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetCommandBuffer( commandBuffer, flags );
+    }
+
+    void vkCmdBindPipeline( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindPipeline( commandBuffer, pipelineBindPoint, pipeline );
+    }
+
+    void
+      vkCmdSetViewport( VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewport( commandBuffer, firstViewport, viewportCount, pViewports );
+    }
+
+    void vkCmdSetScissor( VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetScissor( commandBuffer, firstScissor, scissorCount, pScissors );
+    }
+
+    void vkCmdSetLineWidth( VkCommandBuffer commandBuffer, float lineWidth ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLineWidth( commandBuffer, lineWidth );
+    }
+
+    void vkCmdSetDepthBias( VkCommandBuffer commandBuffer,
+                            float           depthBiasConstantFactor,
+                            float           depthBiasClamp,
+                            float           depthBiasSlopeFactor ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBias( commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
+    }
+
+    void vkCmdSetBlendConstants( VkCommandBuffer commandBuffer, const float blendConstants[4] ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetBlendConstants( commandBuffer, blendConstants );
+    }
+
+    void vkCmdSetDepthBounds( VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBounds( commandBuffer, minDepthBounds, maxDepthBounds );
+    }
+
+    void vkCmdSetStencilCompareMask( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilCompareMask( commandBuffer, faceMask, compareMask );
+    }
+
+    void vkCmdSetStencilWriteMask( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilWriteMask( commandBuffer, faceMask, writeMask );
+    }
+
+    void vkCmdSetStencilReference( VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilReference( commandBuffer, faceMask, reference );
+    }
+
+    void vkCmdBindDescriptorSets( VkCommandBuffer         commandBuffer,
+                                  VkPipelineBindPoint     pipelineBindPoint,
+                                  VkPipelineLayout        layout,
+                                  uint32_t                firstSet,
+                                  uint32_t                descriptorSetCount,
+                                  const VkDescriptorSet * pDescriptorSets,
+                                  uint32_t                dynamicOffsetCount,
+                                  const uint32_t *        pDynamicOffsets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindDescriptorSets(
+        commandBuffer, pipelineBindPoint, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets );
+    }
+
+    void vkCmdBindIndexBuffer( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindIndexBuffer( commandBuffer, buffer, offset, indexType );
+    }
+
+    void vkCmdBindVertexBuffers( VkCommandBuffer      commandBuffer,
+                                 uint32_t             firstBinding,
+                                 uint32_t             bindingCount,
+                                 const VkBuffer *     pBuffers,
+                                 const VkDeviceSize * pOffsets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindVertexBuffers( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets );
+    }
+
+    void vkCmdDraw( VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDraw( commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance );
+    }
+
+    void vkCmdDrawIndexed( VkCommandBuffer commandBuffer,
+                           uint32_t        indexCount,
+                           uint32_t        instanceCount,
+                           uint32_t        firstIndex,
+                           int32_t         vertexOffset,
+                           uint32_t        firstInstance ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndexed( commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
+    }
+
+    void vkCmdDrawIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndirect( commandBuffer, buffer, offset, drawCount, stride );
+    }
+
+    void vkCmdDrawIndexedIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndexedIndirect( commandBuffer, buffer, offset, drawCount, stride );
+    }
+
+    void vkCmdDispatch( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatch( commandBuffer, groupCountX, groupCountY, groupCountZ );
+    }
+
+    void vkCmdDispatchIndirect( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchIndirect( commandBuffer, buffer, offset );
+    }
+
+    void vkCmdCopyBuffer( VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy * pRegions ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBuffer( commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions );
+    }
+
+    void vkCmdCopyImage( VkCommandBuffer     commandBuffer,
+                         VkImage             srcImage,
+                         VkImageLayout       srcImageLayout,
+                         VkImage             dstImage,
+                         VkImageLayout       dstImageLayout,
+                         uint32_t            regionCount,
+                         const VkImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
+    }
+
+    void vkCmdBlitImage( VkCommandBuffer     commandBuffer,
+                         VkImage             srcImage,
+                         VkImageLayout       srcImageLayout,
+                         VkImage             dstImage,
+                         VkImageLayout       dstImageLayout,
+                         uint32_t            regionCount,
+                         const VkImageBlit * pRegions,
+                         VkFilter            filter ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBlitImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter );
+    }
+
+    void vkCmdCopyBufferToImage( VkCommandBuffer           commandBuffer,
+                                 VkBuffer                  srcBuffer,
+                                 VkImage                   dstImage,
+                                 VkImageLayout             dstImageLayout,
+                                 uint32_t                  regionCount,
+                                 const VkBufferImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBufferToImage( commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions );
+    }
+
+    void vkCmdCopyImageToBuffer( VkCommandBuffer           commandBuffer,
+                                 VkImage                   srcImage,
+                                 VkImageLayout             srcImageLayout,
+                                 VkBuffer                  dstBuffer,
+                                 uint32_t                  regionCount,
+                                 const VkBufferImageCopy * pRegions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImageToBuffer( commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions );
+    }
+
+    void vkCmdUpdateBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void * pData ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdUpdateBuffer( commandBuffer, dstBuffer, dstOffset, dataSize, pData );
+    }
+
+    void
+      vkCmdFillBuffer( VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdFillBuffer( commandBuffer, dstBuffer, dstOffset, size, data );
+    }
+
+    void vkCmdClearColorImage( VkCommandBuffer                 commandBuffer,
+                               VkImage                         image,
+                               VkImageLayout                   imageLayout,
+                               const VkClearColorValue *       pColor,
+                               uint32_t                        rangeCount,
+                               const VkImageSubresourceRange * pRanges ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdClearColorImage( commandBuffer, image, imageLayout, pColor, rangeCount, pRanges );
+    }
+
+    void vkCmdClearDepthStencilImage( VkCommandBuffer                  commandBuffer,
+                                      VkImage                          image,
+                                      VkImageLayout                    imageLayout,
+                                      const VkClearDepthStencilValue * pDepthStencil,
+                                      uint32_t                         rangeCount,
+                                      const VkImageSubresourceRange *  pRanges ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdClearDepthStencilImage( commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges );
+    }
+
+    void vkCmdClearAttachments( VkCommandBuffer           commandBuffer,
+                                uint32_t                  attachmentCount,
+                                const VkClearAttachment * pAttachments,
+                                uint32_t                  rectCount,
+                                const VkClearRect *       pRects ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdClearAttachments( commandBuffer, attachmentCount, pAttachments, rectCount, pRects );
+    }
+
+    void vkCmdResolveImage( VkCommandBuffer        commandBuffer,
+                            VkImage                srcImage,
+                            VkImageLayout          srcImageLayout,
+                            VkImage                dstImage,
+                            VkImageLayout          dstImageLayout,
+                            uint32_t               regionCount,
+                            const VkImageResolve * pRegions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResolveImage( commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
+    }
+
+    void vkCmdSetEvent( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetEvent( commandBuffer, event, stageMask );
+    }
+
+    void vkCmdResetEvent( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResetEvent( commandBuffer, event, stageMask );
+    }
+
+    void vkCmdWaitEvents( VkCommandBuffer               commandBuffer,
+                          uint32_t                      eventCount,
+                          const VkEvent *               pEvents,
+                          VkPipelineStageFlags          srcStageMask,
+                          VkPipelineStageFlags          dstStageMask,
+                          uint32_t                      memoryBarrierCount,
+                          const VkMemoryBarrier *       pMemoryBarriers,
+                          uint32_t                      bufferMemoryBarrierCount,
+                          const VkBufferMemoryBarrier * pBufferMemoryBarriers,
+                          uint32_t                      imageMemoryBarrierCount,
+                          const VkImageMemoryBarrier *  pImageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWaitEvents( commandBuffer,
+                                eventCount,
+                                pEvents,
+                                srcStageMask,
+                                dstStageMask,
+                                memoryBarrierCount,
+                                pMemoryBarriers,
+                                bufferMemoryBarrierCount,
+                                pBufferMemoryBarriers,
+                                imageMemoryBarrierCount,
+                                pImageMemoryBarriers );
+    }
+
+    void vkCmdPipelineBarrier( VkCommandBuffer               commandBuffer,
+                               VkPipelineStageFlags          srcStageMask,
+                               VkPipelineStageFlags          dstStageMask,
+                               VkDependencyFlags             dependencyFlags,
+                               uint32_t                      memoryBarrierCount,
+                               const VkMemoryBarrier *       pMemoryBarriers,
+                               uint32_t                      bufferMemoryBarrierCount,
+                               const VkBufferMemoryBarrier * pBufferMemoryBarriers,
+                               uint32_t                      imageMemoryBarrierCount,
+                               const VkImageMemoryBarrier *  pImageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPipelineBarrier( commandBuffer,
+                                     srcStageMask,
+                                     dstStageMask,
+                                     dependencyFlags,
+                                     memoryBarrierCount,
+                                     pMemoryBarriers,
+                                     bufferMemoryBarrierCount,
+                                     pBufferMemoryBarriers,
+                                     imageMemoryBarrierCount,
+                                     pImageMemoryBarriers );
+    }
+
+    void vkCmdBeginQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginQuery( commandBuffer, queryPool, query, flags );
+    }
+
+    void vkCmdEndQuery( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndQuery( commandBuffer, queryPool, query );
+    }
+
+    void vkCmdResetQueryPool( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResetQueryPool( commandBuffer, queryPool, firstQuery, queryCount );
+    }
+
+    void vkCmdWriteTimestamp( VkCommandBuffer         commandBuffer,
+                              VkPipelineStageFlagBits pipelineStage,
+                              VkQueryPool             queryPool,
+                              uint32_t                query ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteTimestamp( commandBuffer, pipelineStage, queryPool, query );
+    }
+
+    void vkCmdCopyQueryPoolResults( VkCommandBuffer    commandBuffer,
+                                    VkQueryPool        queryPool,
+                                    uint32_t           firstQuery,
+                                    uint32_t           queryCount,
+                                    VkBuffer           dstBuffer,
+                                    VkDeviceSize       dstOffset,
+                                    VkDeviceSize       stride,
+                                    VkQueryResultFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyQueryPoolResults( commandBuffer, queryPool, firstQuery, queryCount, dstBuffer, dstOffset, stride, flags );
+    }
+
+    void vkCmdPushConstants( VkCommandBuffer    commandBuffer,
+                             VkPipelineLayout   layout,
+                             VkShaderStageFlags stageFlags,
+                             uint32_t           offset,
+                             uint32_t           size,
+                             const void *       pValues ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushConstants( commandBuffer, layout, stageFlags, offset, size, pValues );
+    }
+
+    void vkCmdBeginRenderPass( VkCommandBuffer               commandBuffer,
+                               const VkRenderPassBeginInfo * pRenderPassBegin,
+                               VkSubpassContents             contents ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginRenderPass( commandBuffer, pRenderPassBegin, contents );
+    }
+
+    void vkCmdNextSubpass( VkCommandBuffer commandBuffer, VkSubpassContents contents ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdNextSubpass( commandBuffer, contents );
+    }
+
+    void vkCmdEndRenderPass( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndRenderPass( commandBuffer );
+    }
+
+    void vkCmdExecuteCommands( VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer * pCommandBuffers ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdExecuteCommands( commandBuffer, commandBufferCount, pCommandBuffers );
+    }
+
+    //=== VK_VERSION_1_1 ===
+
+    VkResult vkEnumerateInstanceVersion( uint32_t * pApiVersion ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumerateInstanceVersion( pApiVersion );
+    }
+
+    VkResult vkBindBufferMemory2( VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindBufferMemory2( device, bindInfoCount, pBindInfos );
+    }
+
+    VkResult vkBindImageMemory2( VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindImageMemory2( device, bindInfoCount, pBindInfos );
+    }
+
+    void vkGetDeviceGroupPeerMemoryFeatures( VkDevice                   device,
+                                             uint32_t                   heapIndex,
+                                             uint32_t                   localDeviceIndex,
+                                             uint32_t                   remoteDeviceIndex,
+                                             VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceGroupPeerMemoryFeatures( device, heapIndex, localDeviceIndex, remoteDeviceIndex, pPeerMemoryFeatures );
+    }
+
+    void vkCmdSetDeviceMask( VkCommandBuffer commandBuffer, uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDeviceMask( commandBuffer, deviceMask );
+    }
+
+    void vkCmdDispatchBase( VkCommandBuffer commandBuffer,
+                            uint32_t        baseGroupX,
+                            uint32_t        baseGroupY,
+                            uint32_t        baseGroupZ,
+                            uint32_t        groupCountX,
+                            uint32_t        groupCountY,
+                            uint32_t        groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchBase( commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
+    }
+
+    VkResult vkEnumeratePhysicalDeviceGroups( VkInstance                        instance,
+                                              uint32_t *                        pPhysicalDeviceGroupCount,
+                                              VkPhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumeratePhysicalDeviceGroups( instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties );
+    }
+
+    void vkGetImageMemoryRequirements2( VkDevice                               device,
+                                        const VkImageMemoryRequirementsInfo2 * pInfo,
+                                        VkMemoryRequirements2 *                pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageMemoryRequirements2( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetBufferMemoryRequirements2( VkDevice                                device,
+                                         const VkBufferMemoryRequirementsInfo2 * pInfo,
+                                         VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferMemoryRequirements2( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetImageSparseMemoryRequirements2( VkDevice                                     device,
+                                              const VkImageSparseMemoryRequirementsInfo2 * pInfo,
+                                              uint32_t *                                   pSparseMemoryRequirementCount,
+                                              VkSparseImageMemoryRequirements2 *           pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSparseMemoryRequirements2( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
+    }
+
+    void vkGetPhysicalDeviceFeatures2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 * pFeatures ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFeatures2( physicalDevice, pFeatures );
+    }
+
+    void vkGetPhysicalDeviceProperties2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceProperties2( physicalDevice, pProperties );
+    }
+
+    void vkGetPhysicalDeviceFormatProperties2( VkPhysicalDevice      physicalDevice,
+                                               VkFormat              format,
+                                               VkFormatProperties2 * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFormatProperties2( physicalDevice, format, pFormatProperties );
+    }
+
+    VkResult vkGetPhysicalDeviceImageFormatProperties2( VkPhysicalDevice                         physicalDevice,
+                                                        const VkPhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                                        VkImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceImageFormatProperties2( physicalDevice, pImageFormatInfo, pImageFormatProperties );
+    }
+
+    void vkGetPhysicalDeviceQueueFamilyProperties2( VkPhysicalDevice           physicalDevice,
+                                                    uint32_t *                 pQueueFamilyPropertyCount,
+                                                    VkQueueFamilyProperties2 * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceQueueFamilyProperties2( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
+    }
+
+    void vkGetPhysicalDeviceMemoryProperties2( VkPhysicalDevice                    physicalDevice,
+                                               VkPhysicalDeviceMemoryProperties2 * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceMemoryProperties2( physicalDevice, pMemoryProperties );
+    }
+
+    void vkGetPhysicalDeviceSparseImageFormatProperties2( VkPhysicalDevice                               physicalDevice,
+                                                          const VkPhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                                          uint32_t *                                     pPropertyCount,
+                                                          VkSparseImageFormatProperties2 *               pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSparseImageFormatProperties2( physicalDevice, pFormatInfo, pPropertyCount, pProperties );
+    }
+
+    void vkTrimCommandPool( VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkTrimCommandPool( device, commandPool, flags );
+    }
+
+    void vkGetDeviceQueue2( VkDevice device, const VkDeviceQueueInfo2 * pQueueInfo, VkQueue * pQueue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceQueue2( device, pQueueInfo, pQueue );
+    }
+
+    VkResult vkCreateSamplerYcbcrConversion( VkDevice                                   device,
+                                             const VkSamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                             const VkAllocationCallbacks *              pAllocator,
+                                             VkSamplerYcbcrConversion *                 pYcbcrConversion ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSamplerYcbcrConversion( device, pCreateInfo, pAllocator, pYcbcrConversion );
+    }
+
+    void vkDestroySamplerYcbcrConversion( VkDevice                      device,
+                                          VkSamplerYcbcrConversion      ycbcrConversion,
+                                          const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroySamplerYcbcrConversion( device, ycbcrConversion, pAllocator );
+    }
+
+    VkResult vkCreateDescriptorUpdateTemplate( VkDevice                                     device,
+                                               const VkDescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                               const VkAllocationCallbacks *                pAllocator,
+                                               VkDescriptorUpdateTemplate *                 pDescriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDescriptorUpdateTemplate( device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate );
+    }
+
+    void vkDestroyDescriptorUpdateTemplate( VkDevice                      device,
+                                            VkDescriptorUpdateTemplate    descriptorUpdateTemplate,
                                             const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySamplerYcbcrConversion( device, ycbcrConversion, pAllocator );
-      }
-
-      //=== VK_VERSION_1_2 ===
-
-      void vkResetQueryPool( VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetQueryPool( device, queryPool, firstQuery, queryCount );
-      }
-
-      VkResult vkGetSemaphoreCounterValue( VkDevice device, VkSemaphore semaphore, uint64_t * pValue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSemaphoreCounterValue( device, semaphore, pValue );
-      }
-
-      VkResult vkWaitSemaphores( VkDevice device, const VkSemaphoreWaitInfo * pWaitInfo, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWaitSemaphores( device, pWaitInfo, timeout );
-      }
-
-      VkResult vkSignalSemaphore( VkDevice device, const VkSemaphoreSignalInfo * pSignalInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSignalSemaphore( device, pSignalInfo );
-      }
-
-      VkDeviceAddress vkGetBufferDeviceAddress( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferDeviceAddress( device, pInfo );
-      }
-
-      uint64_t vkGetBufferOpaqueCaptureAddress( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferOpaqueCaptureAddress( device, pInfo );
-      }
-
-      uint64_t vkGetDeviceMemoryOpaqueCaptureAddress( VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceMemoryOpaqueCaptureAddress( device, pInfo );
-      }
-
-      void vkCmdDrawIndirectCount( VkCommandBuffer commandBuffer,
-                                   VkBuffer        buffer,
-                                   VkDeviceSize    offset,
-                                   VkBuffer        countBuffer,
-                                   VkDeviceSize    countBufferOffset,
-                                   uint32_t        maxDrawCount,
-                                   uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndirectCount( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
-
-      void vkCmdDrawIndexedIndirectCount( VkCommandBuffer commandBuffer,
-                                          VkBuffer        buffer,
-                                          VkDeviceSize    offset,
-                                          VkBuffer        countBuffer,
-                                          VkDeviceSize    countBufferOffset,
-                                          uint32_t        maxDrawCount,
-                                          uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndexedIndirectCount( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
-
-      VkResult vkCreateRenderPass2( VkDevice                        device,
-                                    const VkRenderPassCreateInfo2 * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkRenderPass *                  pRenderPass ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateRenderPass2( device, pCreateInfo, pAllocator, pRenderPass );
-      }
-
-      void vkCmdBeginRenderPass2( VkCommandBuffer               commandBuffer,
-                                  const VkRenderPassBeginInfo * pRenderPassBegin,
-                                  const VkSubpassBeginInfo *    pSubpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginRenderPass2( commandBuffer, pRenderPassBegin, pSubpassBeginInfo );
-      }
-
-      void vkCmdNextSubpass2( VkCommandBuffer            commandBuffer,
-                              const VkSubpassBeginInfo * pSubpassBeginInfo,
-                              const VkSubpassEndInfo *   pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdNextSubpass2( commandBuffer, pSubpassBeginInfo, pSubpassEndInfo );
-      }
-
-      void vkCmdEndRenderPass2( VkCommandBuffer commandBuffer, const VkSubpassEndInfo * pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRenderPass2( commandBuffer, pSubpassEndInfo );
-      }
-
-      //=== VK_VERSION_1_3 ===
-
-      VkResult vkGetPhysicalDeviceToolProperties( VkPhysicalDevice                 physicalDevice,
-                                                  uint32_t *                       pToolCount,
-                                                  VkPhysicalDeviceToolProperties * pToolProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceToolProperties( physicalDevice, pToolCount, pToolProperties );
-      }
-
-      VkResult vkCreatePrivateDataSlot( VkDevice                            device,
-                                        const VkPrivateDataSlotCreateInfo * pCreateInfo,
-                                        const VkAllocationCallbacks *       pAllocator,
-                                        VkPrivateDataSlot *                 pPrivateDataSlot ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreatePrivateDataSlot( device, pCreateInfo, pAllocator, pPrivateDataSlot );
-      }
-
-      void vkDestroyPrivateDataSlot( VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPrivateDataSlot( device, privateDataSlot, pAllocator );
-      }
-
-      VkResult vkSetPrivateData( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetPrivateData( device, objectType, objectHandle, privateDataSlot, data );
-      }
-
-      void vkGetPrivateData( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t * pData ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPrivateData( device, objectType, objectHandle, privateDataSlot, pData );
-      }
-
-      void vkCmdPipelineBarrier2( VkCommandBuffer commandBuffer, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPipelineBarrier2( commandBuffer, pDependencyInfo );
-      }
-
-      void vkCmdWriteTimestamp2( VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteTimestamp2( commandBuffer, stage, queryPool, query );
-      }
-
-      VkResult vkQueueSubmit2( VkQueue queue, uint32_t submitCount, const VkSubmitInfo2 * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueSubmit2( queue, submitCount, pSubmits, fence );
-      }
-
-      void vkCmdCopyBuffer2( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 * pCopyBufferInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBuffer2( commandBuffer, pCopyBufferInfo );
-      }
-
-      void vkCmdCopyImage2( VkCommandBuffer commandBuffer, const VkCopyImageInfo2 * pCopyImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImage2( commandBuffer, pCopyImageInfo );
-      }
-
-      void vkCmdCopyBufferToImage2( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 * pCopyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBufferToImage2( commandBuffer, pCopyBufferToImageInfo );
-      }
-
-      void vkCmdCopyImageToBuffer2( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 * pCopyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImageToBuffer2( commandBuffer, pCopyImageToBufferInfo );
-      }
-
-      void vkGetDeviceBufferMemoryRequirements( VkDevice                                 device,
-                                                const VkDeviceBufferMemoryRequirements * pInfo,
-                                                VkMemoryRequirements2 *                  pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceBufferMemoryRequirements( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetDeviceImageMemoryRequirements( VkDevice                                device,
-                                               const VkDeviceImageMemoryRequirements * pInfo,
-                                               VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageMemoryRequirements( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetDeviceImageSparseMemoryRequirements( VkDevice                                device,
-                                                     const VkDeviceImageMemoryRequirements * pInfo,
-                                                     uint32_t *                              pSparseMemoryRequirementCount,
-                                                     VkSparseImageMemoryRequirements2 *      pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageSparseMemoryRequirements( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
-      }
-
-      void vkCmdSetEvent2( VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetEvent2( commandBuffer, event, pDependencyInfo );
-      }
-
-      void vkCmdResetEvent2( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResetEvent2( commandBuffer, event, stageMask );
-      }
-
-      void vkCmdWaitEvents2( VkCommandBuffer          commandBuffer,
-                             uint32_t                 eventCount,
-                             const VkEvent *          pEvents,
-                             const VkDependencyInfo * pDependencyInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWaitEvents2( commandBuffer, eventCount, pEvents, pDependencyInfos );
-      }
-
-      void vkCmdBlitImage2( VkCommandBuffer commandBuffer, const VkBlitImageInfo2 * pBlitImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBlitImage2( commandBuffer, pBlitImageInfo );
-      }
-
-      void vkCmdResolveImage2( VkCommandBuffer commandBuffer, const VkResolveImageInfo2 * pResolveImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResolveImage2( commandBuffer, pResolveImageInfo );
-      }
-
-      void vkCmdBeginRendering( VkCommandBuffer commandBuffer, const VkRenderingInfo * pRenderingInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginRendering( commandBuffer, pRenderingInfo );
-      }
-
-      void vkCmdEndRendering( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRendering( commandBuffer );
-      }
-
-      void vkCmdSetCullMode( VkCommandBuffer commandBuffer, VkCullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCullMode( commandBuffer, cullMode );
-      }
-
-      void vkCmdSetFrontFace( VkCommandBuffer commandBuffer, VkFrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetFrontFace( commandBuffer, frontFace );
-      }
-
-      void vkCmdSetPrimitiveTopology( VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPrimitiveTopology( commandBuffer, primitiveTopology );
-      }
-
-      void vkCmdSetViewportWithCount( VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportWithCount( commandBuffer, viewportCount, pViewports );
-      }
-
-      void vkCmdSetScissorWithCount( VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetScissorWithCount( commandBuffer, scissorCount, pScissors );
-      }
-
-      void vkCmdBindVertexBuffers2( VkCommandBuffer      commandBuffer,
-                                    uint32_t             firstBinding,
-                                    uint32_t             bindingCount,
-                                    const VkBuffer *     pBuffers,
-                                    const VkDeviceSize * pOffsets,
-                                    const VkDeviceSize * pSizes,
-                                    const VkDeviceSize * pStrides ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindVertexBuffers2( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes, pStrides );
-      }
-
-      void vkCmdSetDepthTestEnable( VkCommandBuffer commandBuffer, VkBool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthTestEnable( commandBuffer, depthTestEnable );
-      }
-
-      void vkCmdSetDepthWriteEnable( VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthWriteEnable( commandBuffer, depthWriteEnable );
-      }
-
-      void vkCmdSetDepthCompareOp( VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthCompareOp( commandBuffer, depthCompareOp );
-      }
-
-      void vkCmdSetDepthBoundsTestEnable( VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBoundsTestEnable( commandBuffer, depthBoundsTestEnable );
-      }
-
-      void vkCmdSetStencilTestEnable( VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilTestEnable( commandBuffer, stencilTestEnable );
-      }
-
-      void vkCmdSetStencilOp( VkCommandBuffer    commandBuffer,
-                              VkStencilFaceFlags faceMask,
-                              VkStencilOp        failOp,
-                              VkStencilOp        passOp,
-                              VkStencilOp        depthFailOp,
-                              VkCompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilOp( commandBuffer, faceMask, failOp, passOp, depthFailOp, compareOp );
-      }
-
-      void vkCmdSetRasterizerDiscardEnable( VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRasterizerDiscardEnable( commandBuffer, rasterizerDiscardEnable );
-      }
-
-      void vkCmdSetDepthBiasEnable( VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBiasEnable( commandBuffer, depthBiasEnable );
-      }
-
-      void vkCmdSetPrimitiveRestartEnable( VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPrimitiveRestartEnable( commandBuffer, primitiveRestartEnable );
-      }
-
-      //=== VK_VERSION_1_4 ===
-
-      VkResult vkMapMemory2( VkDevice device, const VkMemoryMapInfo * pMemoryMapInfo, void ** ppData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkMapMemory2( device, pMemoryMapInfo, ppData );
-      }
-
-      VkResult vkUnmapMemory2( VkDevice device, const VkMemoryUnmapInfo * pMemoryUnmapInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUnmapMemory2( device, pMemoryUnmapInfo );
-      }
-
-      void vkGetDeviceImageSubresourceLayout( VkDevice                             device,
-                                              const VkDeviceImageSubresourceInfo * pInfo,
-                                              VkSubresourceLayout2 *               pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageSubresourceLayout( device, pInfo, pLayout );
-      }
-
-      void vkGetImageSubresourceLayout2( VkDevice                    device,
-                                         VkImage                     image,
-                                         const VkImageSubresource2 * pSubresource,
-                                         VkSubresourceLayout2 *      pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSubresourceLayout2( device, image, pSubresource, pLayout );
-      }
-
-      VkResult vkCopyMemoryToImage( VkDevice device, const VkCopyMemoryToImageInfo * pCopyMemoryToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMemoryToImage( device, pCopyMemoryToImageInfo );
-      }
-
-      VkResult vkCopyImageToMemory( VkDevice device, const VkCopyImageToMemoryInfo * pCopyImageToMemoryInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyImageToMemory( device, pCopyImageToMemoryInfo );
-      }
-
-      VkResult vkCopyImageToImage( VkDevice device, const VkCopyImageToImageInfo * pCopyImageToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyImageToImage( device, pCopyImageToImageInfo );
-      }
-
-      VkResult
-        vkTransitionImageLayout( VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo * pTransitions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkTransitionImageLayout( device, transitionCount, pTransitions );
-      }
-
-      void vkCmdPushDescriptorSet( VkCommandBuffer              commandBuffer,
-                                   VkPipelineBindPoint          pipelineBindPoint,
-                                   VkPipelineLayout             layout,
-                                   uint32_t                     set,
-                                   uint32_t                     descriptorWriteCount,
-                                   const VkWriteDescriptorSet * pDescriptorWrites ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSet( commandBuffer, pipelineBindPoint, layout, set, descriptorWriteCount, pDescriptorWrites );
-      }
-
-      void vkCmdPushDescriptorSetWithTemplate( VkCommandBuffer            commandBuffer,
-                                               VkDescriptorUpdateTemplate descriptorUpdateTemplate,
-                                               VkPipelineLayout           layout,
-                                               uint32_t                   set,
-                                               const void *               pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSetWithTemplate( commandBuffer, descriptorUpdateTemplate, layout, set, pData );
-      }
-
-      void vkCmdBindDescriptorSets2( VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo * pBindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorSets2( commandBuffer, pBindDescriptorSetsInfo );
-      }
-
-      void vkCmdPushConstants2( VkCommandBuffer commandBuffer, const VkPushConstantsInfo * pPushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushConstants2( commandBuffer, pPushConstantsInfo );
-      }
-
-      void vkCmdPushDescriptorSet2( VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo * pPushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSet2( commandBuffer, pPushDescriptorSetInfo );
-      }
-
-      void vkCmdPushDescriptorSetWithTemplate2( VkCommandBuffer                             commandBuffer,
-                                                const VkPushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSetWithTemplate2( commandBuffer, pPushDescriptorSetWithTemplateInfo );
-      }
-
-      void vkCmdSetLineStipple( VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineStipple( commandBuffer, lineStippleFactor, lineStipplePattern );
-      }
-
-      void vkCmdBindIndexBuffer2( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, VkIndexType indexType ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindIndexBuffer2( commandBuffer, buffer, offset, size, indexType );
-      }
-
-      void vkGetRenderingAreaGranularity( VkDevice device, const VkRenderingAreaInfo * pRenderingAreaInfo, VkExtent2D * pGranularity ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRenderingAreaGranularity( device, pRenderingAreaInfo, pGranularity );
-      }
-
-      void vkCmdSetRenderingAttachmentLocations( VkCommandBuffer                           commandBuffer,
-                                                 const VkRenderingAttachmentLocationInfo * pLocationInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRenderingAttachmentLocations( commandBuffer, pLocationInfo );
-      }
-
-      void vkCmdSetRenderingInputAttachmentIndices( VkCommandBuffer                             commandBuffer,
-                                                    const VkRenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRenderingInputAttachmentIndices( commandBuffer, pInputAttachmentIndexInfo );
-      }
-
-      //=== VK_KHR_surface ===
-
-      void vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySurfaceKHR( instance, surface, pAllocator );
-      }
-
-      VkResult vkGetPhysicalDeviceSurfaceSupportKHR( VkPhysicalDevice physicalDevice,
-                                                     uint32_t         queueFamilyIndex,
-                                                     VkSurfaceKHR     surface,
-                                                     VkBool32 *       pSupported ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queueFamilyIndex, surface, pSupported );
-      }
-
-      VkResult vkGetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice           physicalDevice,
-                                                          VkSurfaceKHR               surface,
-                                                          VkSurfaceCapabilitiesKHR * pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceCapabilitiesKHR( physicalDevice, surface, pSurfaceCapabilities );
-      }
-
-      VkResult vkGetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice     physicalDevice,
-                                                     VkSurfaceKHR         surface,
-                                                     uint32_t *           pSurfaceFormatCount,
-                                                     VkSurfaceFormatKHR * pSurfaceFormats ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceFormatsKHR( physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats );
-      }
-
-      VkResult vkGetPhysicalDeviceSurfacePresentModesKHR( VkPhysicalDevice   physicalDevice,
-                                                          VkSurfaceKHR       surface,
-                                                          uint32_t *         pPresentModeCount,
-                                                          VkPresentModeKHR * pPresentModes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfacePresentModesKHR( physicalDevice, surface, pPresentModeCount, pPresentModes );
-      }
-
-      //=== VK_KHR_swapchain ===
-
-      VkResult vkCreateSwapchainKHR( VkDevice                         device,
-                                     const VkSwapchainCreateInfoKHR * pCreateInfo,
-                                     const VkAllocationCallbacks *    pAllocator,
-                                     VkSwapchainKHR *                 pSwapchain ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSwapchainKHR( device, pCreateInfo, pAllocator, pSwapchain );
-      }
-
-      void vkDestroySwapchainKHR( VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySwapchainKHR( device, swapchain, pAllocator );
-      }
-
-      VkResult vkGetSwapchainImagesKHR( VkDevice       device,
-                                        VkSwapchainKHR swapchain,
-                                        uint32_t *     pSwapchainImageCount,
-                                        VkImage *      pSwapchainImages ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainImagesKHR( device, swapchain, pSwapchainImageCount, pSwapchainImages );
-      }
-
-      VkResult vkAcquireNextImageKHR(
-        VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t * pImageIndex ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireNextImageKHR( device, swapchain, timeout, semaphore, fence, pImageIndex );
-      }
-
-      VkResult vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR * pPresentInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueuePresentKHR( queue, pPresentInfo );
-      }
-
-      VkResult vkGetDeviceGroupPresentCapabilitiesKHR( VkDevice                              device,
-                                                       VkDeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceGroupPresentCapabilitiesKHR( device, pDeviceGroupPresentCapabilities );
-      }
-
-      VkResult
-        vkGetDeviceGroupSurfacePresentModesKHR( VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR * pModes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceGroupSurfacePresentModesKHR( device, surface, pModes );
-      }
-
-      VkResult vkGetPhysicalDevicePresentRectanglesKHR( VkPhysicalDevice physicalDevice,
-                                                        VkSurfaceKHR     surface,
-                                                        uint32_t *       pRectCount,
-                                                        VkRect2D *       pRects ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDevicePresentRectanglesKHR( physicalDevice, surface, pRectCount, pRects );
-      }
-
-      VkResult vkAcquireNextImage2KHR( VkDevice device, const VkAcquireNextImageInfoKHR * pAcquireInfo, uint32_t * pImageIndex ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireNextImage2KHR( device, pAcquireInfo, pImageIndex );
-      }
-
-      //=== VK_KHR_display ===
-
-      VkResult vkGetPhysicalDeviceDisplayPropertiesKHR( VkPhysicalDevice         physicalDevice,
-                                                        uint32_t *               pPropertyCount,
-                                                        VkDisplayPropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceDisplayPropertiesKHR( physicalDevice, pPropertyCount, pProperties );
-      }
-
-      VkResult vkGetPhysicalDeviceDisplayPlanePropertiesKHR( VkPhysicalDevice              physicalDevice,
-                                                             uint32_t *                    pPropertyCount,
-                                                             VkDisplayPlanePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceDisplayPlanePropertiesKHR( physicalDevice, pPropertyCount, pProperties );
-      }
-
-      VkResult vkGetDisplayPlaneSupportedDisplaysKHR( VkPhysicalDevice physicalDevice,
-                                                      uint32_t         planeIndex,
-                                                      uint32_t *       pDisplayCount,
-                                                      VkDisplayKHR *   pDisplays ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDisplayPlaneSupportedDisplaysKHR( physicalDevice, planeIndex, pDisplayCount, pDisplays );
-      }
-
-      VkResult vkGetDisplayModePropertiesKHR( VkPhysicalDevice             physicalDevice,
-                                              VkDisplayKHR                 display,
-                                              uint32_t *                   pPropertyCount,
-                                              VkDisplayModePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDisplayModePropertiesKHR( physicalDevice, display, pPropertyCount, pProperties );
-      }
-
-      VkResult vkCreateDisplayModeKHR( VkPhysicalDevice                   physicalDevice,
-                                       VkDisplayKHR                       display,
-                                       const VkDisplayModeCreateInfoKHR * pCreateInfo,
-                                       const VkAllocationCallbacks *      pAllocator,
-                                       VkDisplayModeKHR *                 pMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDisplayModeKHR( physicalDevice, display, pCreateInfo, pAllocator, pMode );
-      }
-
-      VkResult vkGetDisplayPlaneCapabilitiesKHR( VkPhysicalDevice                physicalDevice,
-                                                 VkDisplayModeKHR                mode,
-                                                 uint32_t                        planeIndex,
-                                                 VkDisplayPlaneCapabilitiesKHR * pCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDisplayPlaneCapabilitiesKHR( physicalDevice, mode, planeIndex, pCapabilities );
-      }
-
-      VkResult vkCreateDisplayPlaneSurfaceKHR( VkInstance                            instance,
-                                               const VkDisplaySurfaceCreateInfoKHR * pCreateInfo,
-                                               const VkAllocationCallbacks *         pAllocator,
-                                               VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDisplayPlaneSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
-
-      //=== VK_KHR_display_swapchain ===
-
-      VkResult vkCreateSharedSwapchainsKHR( VkDevice                         device,
-                                            uint32_t                         swapchainCount,
-                                            const VkSwapchainCreateInfoKHR * pCreateInfos,
-                                            const VkAllocationCallbacks *    pAllocator,
-                                            VkSwapchainKHR *                 pSwapchains ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSharedSwapchainsKHR( device, swapchainCount, pCreateInfos, pAllocator, pSwapchains );
-      }
+    {
+      return ::vkDestroyDescriptorUpdateTemplate( device, descriptorUpdateTemplate, pAllocator );
+    }
+
+    void vkUpdateDescriptorSetWithTemplate( VkDevice                   device,
+                                            VkDescriptorSet            descriptorSet,
+                                            VkDescriptorUpdateTemplate descriptorUpdateTemplate,
+                                            const void *               pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUpdateDescriptorSetWithTemplate( device, descriptorSet, descriptorUpdateTemplate, pData );
+    }
+
+    void vkGetPhysicalDeviceExternalBufferProperties( VkPhysicalDevice                           physicalDevice,
+                                                      const VkPhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                                      VkExternalBufferProperties *               pExternalBufferProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalBufferProperties( physicalDevice, pExternalBufferInfo, pExternalBufferProperties );
+    }
+
+    void vkGetPhysicalDeviceExternalFenceProperties( VkPhysicalDevice                          physicalDevice,
+                                                     const VkPhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                                     VkExternalFenceProperties *               pExternalFenceProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalFenceProperties( physicalDevice, pExternalFenceInfo, pExternalFenceProperties );
+    }
+
+    void vkGetPhysicalDeviceExternalSemaphoreProperties( VkPhysicalDevice                              physicalDevice,
+                                                         const VkPhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                                         VkExternalSemaphoreProperties *               pExternalSemaphoreProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalSemaphoreProperties( physicalDevice, pExternalSemaphoreInfo, pExternalSemaphoreProperties );
+    }
+
+    void vkGetDescriptorSetLayoutSupport( VkDevice                                device,
+                                          const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
+                                          VkDescriptorSetLayoutSupport *          pSupport ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetLayoutSupport( device, pCreateInfo, pSupport );
+    }
+
+    //=== VK_VERSION_1_2 ===
+
+    void vkCmdDrawIndirectCount( VkCommandBuffer commandBuffer,
+                                 VkBuffer        buffer,
+                                 VkDeviceSize    offset,
+                                 VkBuffer        countBuffer,
+                                 VkDeviceSize    countBufferOffset,
+                                 uint32_t        maxDrawCount,
+                                 uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndirectCount( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
+
+    void vkCmdDrawIndexedIndirectCount( VkCommandBuffer commandBuffer,
+                                        VkBuffer        buffer,
+                                        VkDeviceSize    offset,
+                                        VkBuffer        countBuffer,
+                                        VkDeviceSize    countBufferOffset,
+                                        uint32_t        maxDrawCount,
+                                        uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndexedIndirectCount( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
+
+    VkResult vkCreateRenderPass2( VkDevice                        device,
+                                  const VkRenderPassCreateInfo2 * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkRenderPass *                  pRenderPass ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateRenderPass2( device, pCreateInfo, pAllocator, pRenderPass );
+    }
+
+    void vkCmdBeginRenderPass2( VkCommandBuffer               commandBuffer,
+                                const VkRenderPassBeginInfo * pRenderPassBegin,
+                                const VkSubpassBeginInfo *    pSubpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginRenderPass2( commandBuffer, pRenderPassBegin, pSubpassBeginInfo );
+    }
+
+    void vkCmdNextSubpass2( VkCommandBuffer            commandBuffer,
+                            const VkSubpassBeginInfo * pSubpassBeginInfo,
+                            const VkSubpassEndInfo *   pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdNextSubpass2( commandBuffer, pSubpassBeginInfo, pSubpassEndInfo );
+    }
+
+    void vkCmdEndRenderPass2( VkCommandBuffer commandBuffer, const VkSubpassEndInfo * pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndRenderPass2( commandBuffer, pSubpassEndInfo );
+    }
+
+    void vkResetQueryPool( VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetQueryPool( device, queryPool, firstQuery, queryCount );
+    }
+
+    VkResult vkGetSemaphoreCounterValue( VkDevice device, VkSemaphore semaphore, uint64_t * pValue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSemaphoreCounterValue( device, semaphore, pValue );
+    }
+
+    VkResult vkWaitSemaphores( VkDevice device, const VkSemaphoreWaitInfo * pWaitInfo, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWaitSemaphores( device, pWaitInfo, timeout );
+    }
+
+    VkResult vkSignalSemaphore( VkDevice device, const VkSemaphoreSignalInfo * pSignalInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSignalSemaphore( device, pSignalInfo );
+    }
+
+    VkDeviceAddress vkGetBufferDeviceAddress( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferDeviceAddress( device, pInfo );
+    }
+
+    uint64_t vkGetBufferOpaqueCaptureAddress( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferOpaqueCaptureAddress( device, pInfo );
+    }
+
+    uint64_t vkGetDeviceMemoryOpaqueCaptureAddress( VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceMemoryOpaqueCaptureAddress( device, pInfo );
+    }
+
+    //=== VK_VERSION_1_3 ===
+
+    VkResult vkGetPhysicalDeviceToolProperties( VkPhysicalDevice                 physicalDevice,
+                                                uint32_t *                       pToolCount,
+                                                VkPhysicalDeviceToolProperties * pToolProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceToolProperties( physicalDevice, pToolCount, pToolProperties );
+    }
+
+    VkResult vkCreatePrivateDataSlot( VkDevice                            device,
+                                      const VkPrivateDataSlotCreateInfo * pCreateInfo,
+                                      const VkAllocationCallbacks *       pAllocator,
+                                      VkPrivateDataSlot *                 pPrivateDataSlot ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreatePrivateDataSlot( device, pCreateInfo, pAllocator, pPrivateDataSlot );
+    }
+
+    void vkDestroyPrivateDataSlot( VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyPrivateDataSlot( device, privateDataSlot, pAllocator );
+    }
+
+    VkResult vkSetPrivateData( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetPrivateData( device, objectType, objectHandle, privateDataSlot, data );
+    }
+
+    void vkGetPrivateData( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t * pData ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPrivateData( device, objectType, objectHandle, privateDataSlot, pData );
+    }
+
+    void vkCmdSetEvent2( VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetEvent2( commandBuffer, event, pDependencyInfo );
+    }
+
+    void vkCmdResetEvent2( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResetEvent2( commandBuffer, event, stageMask );
+    }
+
+    void vkCmdWaitEvents2( VkCommandBuffer          commandBuffer,
+                           uint32_t                 eventCount,
+                           const VkEvent *          pEvents,
+                           const VkDependencyInfo * pDependencyInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWaitEvents2( commandBuffer, eventCount, pEvents, pDependencyInfos );
+    }
+
+    void vkCmdPipelineBarrier2( VkCommandBuffer commandBuffer, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPipelineBarrier2( commandBuffer, pDependencyInfo );
+    }
+
+    void vkCmdWriteTimestamp2( VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteTimestamp2( commandBuffer, stage, queryPool, query );
+    }
+
+    VkResult vkQueueSubmit2( VkQueue queue, uint32_t submitCount, const VkSubmitInfo2 * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueSubmit2( queue, submitCount, pSubmits, fence );
+    }
+
+    void vkCmdCopyBuffer2( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 * pCopyBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBuffer2( commandBuffer, pCopyBufferInfo );
+    }
+
+    void vkCmdCopyImage2( VkCommandBuffer commandBuffer, const VkCopyImageInfo2 * pCopyImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImage2( commandBuffer, pCopyImageInfo );
+    }
+
+    void vkCmdCopyBufferToImage2( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 * pCopyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBufferToImage2( commandBuffer, pCopyBufferToImageInfo );
+    }
+
+    void vkCmdCopyImageToBuffer2( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 * pCopyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImageToBuffer2( commandBuffer, pCopyImageToBufferInfo );
+    }
+
+    void vkCmdBlitImage2( VkCommandBuffer commandBuffer, const VkBlitImageInfo2 * pBlitImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBlitImage2( commandBuffer, pBlitImageInfo );
+    }
+
+    void vkCmdResolveImage2( VkCommandBuffer commandBuffer, const VkResolveImageInfo2 * pResolveImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResolveImage2( commandBuffer, pResolveImageInfo );
+    }
+
+    void vkCmdBeginRendering( VkCommandBuffer commandBuffer, const VkRenderingInfo * pRenderingInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginRendering( commandBuffer, pRenderingInfo );
+    }
+
+    void vkCmdEndRendering( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndRendering( commandBuffer );
+    }
+
+    void vkCmdSetCullMode( VkCommandBuffer commandBuffer, VkCullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCullMode( commandBuffer, cullMode );
+    }
+
+    void vkCmdSetFrontFace( VkCommandBuffer commandBuffer, VkFrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetFrontFace( commandBuffer, frontFace );
+    }
+
+    void vkCmdSetPrimitiveTopology( VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPrimitiveTopology( commandBuffer, primitiveTopology );
+    }
+
+    void vkCmdSetViewportWithCount( VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportWithCount( commandBuffer, viewportCount, pViewports );
+    }
+
+    void vkCmdSetScissorWithCount( VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetScissorWithCount( commandBuffer, scissorCount, pScissors );
+    }
+
+    void vkCmdBindVertexBuffers2( VkCommandBuffer      commandBuffer,
+                                  uint32_t             firstBinding,
+                                  uint32_t             bindingCount,
+                                  const VkBuffer *     pBuffers,
+                                  const VkDeviceSize * pOffsets,
+                                  const VkDeviceSize * pSizes,
+                                  const VkDeviceSize * pStrides ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindVertexBuffers2( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes, pStrides );
+    }
+
+    void vkCmdSetDepthTestEnable( VkCommandBuffer commandBuffer, VkBool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthTestEnable( commandBuffer, depthTestEnable );
+    }
+
+    void vkCmdSetDepthWriteEnable( VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthWriteEnable( commandBuffer, depthWriteEnable );
+    }
+
+    void vkCmdSetDepthCompareOp( VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthCompareOp( commandBuffer, depthCompareOp );
+    }
+
+    void vkCmdSetDepthBoundsTestEnable( VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBoundsTestEnable( commandBuffer, depthBoundsTestEnable );
+    }
+
+    void vkCmdSetStencilTestEnable( VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilTestEnable( commandBuffer, stencilTestEnable );
+    }
+
+    void vkCmdSetStencilOp( VkCommandBuffer    commandBuffer,
+                            VkStencilFaceFlags faceMask,
+                            VkStencilOp        failOp,
+                            VkStencilOp        passOp,
+                            VkStencilOp        depthFailOp,
+                            VkCompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilOp( commandBuffer, faceMask, failOp, passOp, depthFailOp, compareOp );
+    }
+
+    void vkCmdSetRasterizerDiscardEnable( VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRasterizerDiscardEnable( commandBuffer, rasterizerDiscardEnable );
+    }
+
+    void vkCmdSetDepthBiasEnable( VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBiasEnable( commandBuffer, depthBiasEnable );
+    }
+
+    void vkCmdSetPrimitiveRestartEnable( VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPrimitiveRestartEnable( commandBuffer, primitiveRestartEnable );
+    }
+
+    void vkGetDeviceBufferMemoryRequirements( VkDevice                                 device,
+                                              const VkDeviceBufferMemoryRequirements * pInfo,
+                                              VkMemoryRequirements2 *                  pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceBufferMemoryRequirements( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetDeviceImageMemoryRequirements( VkDevice                                device,
+                                             const VkDeviceImageMemoryRequirements * pInfo,
+                                             VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceImageMemoryRequirements( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetDeviceImageSparseMemoryRequirements( VkDevice                                device,
+                                                   const VkDeviceImageMemoryRequirements * pInfo,
+                                                   uint32_t *                              pSparseMemoryRequirementCount,
+                                                   VkSparseImageMemoryRequirements2 *      pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceImageSparseMemoryRequirements( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
+    }
+
+    //=== VK_KHR_surface ===
+
+    void vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroySurfaceKHR( instance, surface, pAllocator );
+    }
+
+    VkResult vkGetPhysicalDeviceSurfaceSupportKHR( VkPhysicalDevice physicalDevice,
+                                                   uint32_t         queueFamilyIndex,
+                                                   VkSurfaceKHR     surface,
+                                                   VkBool32 *       pSupported ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queueFamilyIndex, surface, pSupported );
+    }
+
+    VkResult vkGetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice           physicalDevice,
+                                                        VkSurfaceKHR               surface,
+                                                        VkSurfaceCapabilitiesKHR * pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceCapabilitiesKHR( physicalDevice, surface, pSurfaceCapabilities );
+    }
+
+    VkResult vkGetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice     physicalDevice,
+                                                   VkSurfaceKHR         surface,
+                                                   uint32_t *           pSurfaceFormatCount,
+                                                   VkSurfaceFormatKHR * pSurfaceFormats ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceFormatsKHR( physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats );
+    }
+
+    VkResult vkGetPhysicalDeviceSurfacePresentModesKHR( VkPhysicalDevice   physicalDevice,
+                                                        VkSurfaceKHR       surface,
+                                                        uint32_t *         pPresentModeCount,
+                                                        VkPresentModeKHR * pPresentModes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfacePresentModesKHR( physicalDevice, surface, pPresentModeCount, pPresentModes );
+    }
+
+    //=== VK_KHR_swapchain ===
+
+    VkResult vkCreateSwapchainKHR( VkDevice                         device,
+                                   const VkSwapchainCreateInfoKHR * pCreateInfo,
+                                   const VkAllocationCallbacks *    pAllocator,
+                                   VkSwapchainKHR *                 pSwapchain ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSwapchainKHR( device, pCreateInfo, pAllocator, pSwapchain );
+    }
+
+    void vkDestroySwapchainKHR( VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroySwapchainKHR( device, swapchain, pAllocator );
+    }
+
+    VkResult vkGetSwapchainImagesKHR( VkDevice       device,
+                                      VkSwapchainKHR swapchain,
+                                      uint32_t *     pSwapchainImageCount,
+                                      VkImage *      pSwapchainImages ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSwapchainImagesKHR( device, swapchain, pSwapchainImageCount, pSwapchainImages );
+    }
+
+    VkResult vkAcquireNextImageKHR(
+      VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t * pImageIndex ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireNextImageKHR( device, swapchain, timeout, semaphore, fence, pImageIndex );
+    }
+
+    VkResult vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR * pPresentInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueuePresentKHR( queue, pPresentInfo );
+    }
+
+    VkResult vkGetDeviceGroupPresentCapabilitiesKHR( VkDevice                              device,
+                                                     VkDeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceGroupPresentCapabilitiesKHR( device, pDeviceGroupPresentCapabilities );
+    }
+
+    VkResult
+      vkGetDeviceGroupSurfacePresentModesKHR( VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR * pModes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceGroupSurfacePresentModesKHR( device, surface, pModes );
+    }
+
+    VkResult vkGetPhysicalDevicePresentRectanglesKHR( VkPhysicalDevice physicalDevice,
+                                                      VkSurfaceKHR     surface,
+                                                      uint32_t *       pRectCount,
+                                                      VkRect2D *       pRects ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDevicePresentRectanglesKHR( physicalDevice, surface, pRectCount, pRects );
+    }
+
+    VkResult vkAcquireNextImage2KHR( VkDevice device, const VkAcquireNextImageInfoKHR * pAcquireInfo, uint32_t * pImageIndex ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireNextImage2KHR( device, pAcquireInfo, pImageIndex );
+    }
+
+    //=== VK_KHR_display ===
+
+    VkResult vkGetPhysicalDeviceDisplayPropertiesKHR( VkPhysicalDevice         physicalDevice,
+                                                      uint32_t *               pPropertyCount,
+                                                      VkDisplayPropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceDisplayPropertiesKHR( physicalDevice, pPropertyCount, pProperties );
+    }
+
+    VkResult vkGetPhysicalDeviceDisplayPlanePropertiesKHR( VkPhysicalDevice              physicalDevice,
+                                                           uint32_t *                    pPropertyCount,
+                                                           VkDisplayPlanePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceDisplayPlanePropertiesKHR( physicalDevice, pPropertyCount, pProperties );
+    }
+
+    VkResult vkGetDisplayPlaneSupportedDisplaysKHR( VkPhysicalDevice physicalDevice,
+                                                    uint32_t         planeIndex,
+                                                    uint32_t *       pDisplayCount,
+                                                    VkDisplayKHR *   pDisplays ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDisplayPlaneSupportedDisplaysKHR( physicalDevice, planeIndex, pDisplayCount, pDisplays );
+    }
+
+    VkResult vkGetDisplayModePropertiesKHR( VkPhysicalDevice             physicalDevice,
+                                            VkDisplayKHR                 display,
+                                            uint32_t *                   pPropertyCount,
+                                            VkDisplayModePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDisplayModePropertiesKHR( physicalDevice, display, pPropertyCount, pProperties );
+    }
+
+    VkResult vkCreateDisplayModeKHR( VkPhysicalDevice                   physicalDevice,
+                                     VkDisplayKHR                       display,
+                                     const VkDisplayModeCreateInfoKHR * pCreateInfo,
+                                     const VkAllocationCallbacks *      pAllocator,
+                                     VkDisplayModeKHR *                 pMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDisplayModeKHR( physicalDevice, display, pCreateInfo, pAllocator, pMode );
+    }
+
+    VkResult vkGetDisplayPlaneCapabilitiesKHR( VkPhysicalDevice                physicalDevice,
+                                               VkDisplayModeKHR                mode,
+                                               uint32_t                        planeIndex,
+                                               VkDisplayPlaneCapabilitiesKHR * pCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDisplayPlaneCapabilitiesKHR( physicalDevice, mode, planeIndex, pCapabilities );
+    }
+
+    VkResult vkCreateDisplayPlaneSurfaceKHR( VkInstance                            instance,
+                                             const VkDisplaySurfaceCreateInfoKHR * pCreateInfo,
+                                             const VkAllocationCallbacks *         pAllocator,
+                                             VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDisplayPlaneSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
+
+    //=== VK_KHR_display_swapchain ===
+
+    VkResult vkCreateSharedSwapchainsKHR( VkDevice                         device,
+                                          uint32_t                         swapchainCount,
+                                          const VkSwapchainCreateInfoKHR * pCreateInfos,
+                                          const VkAllocationCallbacks *    pAllocator,
+                                          VkSwapchainKHR *                 pSwapchains ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSharedSwapchainsKHR( device, swapchainCount, pCreateInfos, pAllocator, pSwapchains );
+    }
 
 #  if defined( VK_USE_PLATFORM_XLIB_KHR )
-      //=== VK_KHR_xlib_surface ===
+    //=== VK_KHR_xlib_surface ===
 
-      VkResult vkCreateXlibSurfaceKHR( VkInstance                         instance,
-                                       const VkXlibSurfaceCreateInfoKHR * pCreateInfo,
-                                       const VkAllocationCallbacks *      pAllocator,
-                                       VkSurfaceKHR *                     pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateXlibSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateXlibSurfaceKHR( VkInstance                         instance,
+                                     const VkXlibSurfaceCreateInfoKHR * pCreateInfo,
+                                     const VkAllocationCallbacks *      pAllocator,
+                                     VkSurfaceKHR *                     pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateXlibSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
 
-      VkBool32 vkGetPhysicalDeviceXlibPresentationSupportKHR( VkPhysicalDevice physicalDevice,
-                                                              uint32_t         queueFamilyIndex,
-                                                              Display *        dpy,
-                                                              VisualID         visualID ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceXlibPresentationSupportKHR( physicalDevice, queueFamilyIndex, dpy, visualID );
-      }
+    VkBool32 vkGetPhysicalDeviceXlibPresentationSupportKHR( VkPhysicalDevice physicalDevice,
+                                                            uint32_t         queueFamilyIndex,
+                                                            Display *        dpy,
+                                                            VisualID         visualID ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceXlibPresentationSupportKHR( physicalDevice, queueFamilyIndex, dpy, visualID );
+    }
 #  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
-      //=== VK_KHR_xcb_surface ===
+    //=== VK_KHR_xcb_surface ===
 
-      VkResult vkCreateXcbSurfaceKHR( VkInstance                        instance,
-                                      const VkXcbSurfaceCreateInfoKHR * pCreateInfo,
-                                      const VkAllocationCallbacks *     pAllocator,
-                                      VkSurfaceKHR *                    pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateXcbSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateXcbSurfaceKHR( VkInstance                        instance,
+                                    const VkXcbSurfaceCreateInfoKHR * pCreateInfo,
+                                    const VkAllocationCallbacks *     pAllocator,
+                                    VkSurfaceKHR *                    pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateXcbSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
 
-      VkBool32 vkGetPhysicalDeviceXcbPresentationSupportKHR( VkPhysicalDevice   physicalDevice,
-                                                             uint32_t           queueFamilyIndex,
-                                                             xcb_connection_t * connection,
-                                                             xcb_visualid_t     visual_id ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceXcbPresentationSupportKHR( physicalDevice, queueFamilyIndex, connection, visual_id );
-      }
+    VkBool32 vkGetPhysicalDeviceXcbPresentationSupportKHR( VkPhysicalDevice   physicalDevice,
+                                                           uint32_t           queueFamilyIndex,
+                                                           xcb_connection_t * connection,
+                                                           xcb_visualid_t     visual_id ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceXcbPresentationSupportKHR( physicalDevice, queueFamilyIndex, connection, visual_id );
+    }
 #  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-      //=== VK_KHR_wayland_surface ===
+    //=== VK_KHR_wayland_surface ===
 
-      VkResult vkCreateWaylandSurfaceKHR( VkInstance                            instance,
-                                          const VkWaylandSurfaceCreateInfoKHR * pCreateInfo,
-                                          const VkAllocationCallbacks *         pAllocator,
-                                          VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateWaylandSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateWaylandSurfaceKHR( VkInstance                            instance,
+                                        const VkWaylandSurfaceCreateInfoKHR * pCreateInfo,
+                                        const VkAllocationCallbacks *         pAllocator,
+                                        VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateWaylandSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
 
-      VkBool32 vkGetPhysicalDeviceWaylandPresentationSupportKHR( VkPhysicalDevice    physicalDevice,
-                                                                 uint32_t            queueFamilyIndex,
-                                                                 struct wl_display * display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceWaylandPresentationSupportKHR( physicalDevice, queueFamilyIndex, display );
-      }
+    VkBool32 vkGetPhysicalDeviceWaylandPresentationSupportKHR( VkPhysicalDevice    physicalDevice,
+                                                               uint32_t            queueFamilyIndex,
+                                                               struct wl_display * display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceWaylandPresentationSupportKHR( physicalDevice, queueFamilyIndex, display );
+    }
 #  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      //=== VK_KHR_android_surface ===
+    //=== VK_KHR_android_surface ===
 
-      VkResult vkCreateAndroidSurfaceKHR( VkInstance                            instance,
-                                          const VkAndroidSurfaceCreateInfoKHR * pCreateInfo,
-                                          const VkAllocationCallbacks *         pAllocator,
-                                          VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateAndroidSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateAndroidSurfaceKHR( VkInstance                            instance,
+                                        const VkAndroidSurfaceCreateInfoKHR * pCreateInfo,
+                                        const VkAllocationCallbacks *         pAllocator,
+                                        VkSurfaceKHR *                        pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateAndroidSurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_KHR_win32_surface ===
+    //=== VK_KHR_win32_surface ===
 
-      VkResult vkCreateWin32SurfaceKHR( VkInstance                          instance,
-                                        const VkWin32SurfaceCreateInfoKHR * pCreateInfo,
-                                        const VkAllocationCallbacks *       pAllocator,
-                                        VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateWin32SurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateWin32SurfaceKHR( VkInstance                          instance,
+                                      const VkWin32SurfaceCreateInfoKHR * pCreateInfo,
+                                      const VkAllocationCallbacks *       pAllocator,
+                                      VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateWin32SurfaceKHR( instance, pCreateInfo, pAllocator, pSurface );
+    }
 
-      VkBool32 vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceWin32PresentationSupportKHR( physicalDevice, queueFamilyIndex );
-      }
+    VkBool32 vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceWin32PresentationSupportKHR( physicalDevice, queueFamilyIndex );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_EXT_debug_report ===
+    //=== VK_EXT_debug_report ===
 
-      VkResult vkCreateDebugReportCallbackEXT( VkInstance                                 instance,
-                                               const VkDebugReportCallbackCreateInfoEXT * pCreateInfo,
-                                               const VkAllocationCallbacks *              pAllocator,
-                                               VkDebugReportCallbackEXT *                 pCallback ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDebugReportCallbackEXT( instance, pCreateInfo, pAllocator, pCallback );
-      }
+    VkResult vkCreateDebugReportCallbackEXT( VkInstance                                 instance,
+                                             const VkDebugReportCallbackCreateInfoEXT * pCreateInfo,
+                                             const VkAllocationCallbacks *              pAllocator,
+                                             VkDebugReportCallbackEXT *                 pCallback ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDebugReportCallbackEXT( instance, pCreateInfo, pAllocator, pCallback );
+    }
 
-      void vkDestroyDebugReportCallbackEXT( VkInstance                    instance,
-                                            VkDebugReportCallbackEXT      callback,
-                                            const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDebugReportCallbackEXT( instance, callback, pAllocator );
-      }
+    void vkDestroyDebugReportCallbackEXT( VkInstance                    instance,
+                                          VkDebugReportCallbackEXT      callback,
+                                          const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDebugReportCallbackEXT( instance, callback, pAllocator );
+    }
 
-      void vkDebugReportMessageEXT( VkInstance                 instance,
-                                    VkDebugReportFlagsEXT      flags,
-                                    VkDebugReportObjectTypeEXT objectType,
-                                    uint64_t                   object,
-                                    size_t                     location,
-                                    int32_t                    messageCode,
-                                    const char *               pLayerPrefix,
-                                    const char *               pMessage ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDebugReportMessageEXT( instance, flags, objectType, object, location, messageCode, pLayerPrefix, pMessage );
-      }
+    void vkDebugReportMessageEXT( VkInstance                 instance,
+                                  VkDebugReportFlagsEXT      flags,
+                                  VkDebugReportObjectTypeEXT objectType,
+                                  uint64_t                   object,
+                                  size_t                     location,
+                                  int32_t                    messageCode,
+                                  const char *               pLayerPrefix,
+                                  const char *               pMessage ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDebugReportMessageEXT( instance, flags, objectType, object, location, messageCode, pLayerPrefix, pMessage );
+    }
 
-      //=== VK_EXT_debug_marker ===
+    //=== VK_EXT_debug_marker ===
 
-      VkResult vkDebugMarkerSetObjectTagEXT( VkDevice device, const VkDebugMarkerObjectTagInfoEXT * pTagInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDebugMarkerSetObjectTagEXT( device, pTagInfo );
-      }
+    VkResult vkDebugMarkerSetObjectTagEXT( VkDevice device, const VkDebugMarkerObjectTagInfoEXT * pTagInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDebugMarkerSetObjectTagEXT( device, pTagInfo );
+    }
 
-      VkResult vkDebugMarkerSetObjectNameEXT( VkDevice device, const VkDebugMarkerObjectNameInfoEXT * pNameInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDebugMarkerSetObjectNameEXT( device, pNameInfo );
-      }
+    VkResult vkDebugMarkerSetObjectNameEXT( VkDevice device, const VkDebugMarkerObjectNameInfoEXT * pNameInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDebugMarkerSetObjectNameEXT( device, pNameInfo );
+    }
 
-      void vkCmdDebugMarkerBeginEXT( VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDebugMarkerBeginEXT( commandBuffer, pMarkerInfo );
-      }
+    void vkCmdDebugMarkerBeginEXT( VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDebugMarkerBeginEXT( commandBuffer, pMarkerInfo );
+    }
 
-      void vkCmdDebugMarkerEndEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDebugMarkerEndEXT( commandBuffer );
-      }
+    void vkCmdDebugMarkerEndEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDebugMarkerEndEXT( commandBuffer );
+    }
 
-      void vkCmdDebugMarkerInsertEXT( VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDebugMarkerInsertEXT( commandBuffer, pMarkerInfo );
-      }
+    void vkCmdDebugMarkerInsertEXT( VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDebugMarkerInsertEXT( commandBuffer, pMarkerInfo );
+    }
 
-      //=== VK_KHR_video_queue ===
+    //=== VK_KHR_video_queue ===
 
-      VkResult vkGetPhysicalDeviceVideoCapabilitiesKHR( VkPhysicalDevice              physicalDevice,
-                                                        const VkVideoProfileInfoKHR * pVideoProfile,
-                                                        VkVideoCapabilitiesKHR *      pCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceVideoCapabilitiesKHR( physicalDevice, pVideoProfile, pCapabilities );
-      }
+    VkResult vkGetPhysicalDeviceVideoCapabilitiesKHR( VkPhysicalDevice              physicalDevice,
+                                                      const VkVideoProfileInfoKHR * pVideoProfile,
+                                                      VkVideoCapabilitiesKHR *      pCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceVideoCapabilitiesKHR( physicalDevice, pVideoProfile, pCapabilities );
+    }
 
-      VkResult vkGetPhysicalDeviceVideoFormatPropertiesKHR( VkPhysicalDevice                           physicalDevice,
-                                                            const VkPhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
-                                                            uint32_t *                                 pVideoFormatPropertyCount,
-                                                            VkVideoFormatPropertiesKHR *               pVideoFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceVideoFormatPropertiesKHR( physicalDevice, pVideoFormatInfo, pVideoFormatPropertyCount, pVideoFormatProperties );
-      }
+    VkResult vkGetPhysicalDeviceVideoFormatPropertiesKHR( VkPhysicalDevice                           physicalDevice,
+                                                          const VkPhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
+                                                          uint32_t *                                 pVideoFormatPropertyCount,
+                                                          VkVideoFormatPropertiesKHR *               pVideoFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceVideoFormatPropertiesKHR( physicalDevice, pVideoFormatInfo, pVideoFormatPropertyCount, pVideoFormatProperties );
+    }
 
-      VkResult vkCreateVideoSessionKHR( VkDevice                            device,
-                                        const VkVideoSessionCreateInfoKHR * pCreateInfo,
-                                        const VkAllocationCallbacks *       pAllocator,
-                                        VkVideoSessionKHR *                 pVideoSession ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateVideoSessionKHR( device, pCreateInfo, pAllocator, pVideoSession );
-      }
+    VkResult vkCreateVideoSessionKHR( VkDevice                            device,
+                                      const VkVideoSessionCreateInfoKHR * pCreateInfo,
+                                      const VkAllocationCallbacks *       pAllocator,
+                                      VkVideoSessionKHR *                 pVideoSession ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateVideoSessionKHR( device, pCreateInfo, pAllocator, pVideoSession );
+    }
 
-      void vkDestroyVideoSessionKHR( VkDevice device, VkVideoSessionKHR videoSession, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyVideoSessionKHR( device, videoSession, pAllocator );
-      }
+    void vkDestroyVideoSessionKHR( VkDevice device, VkVideoSessionKHR videoSession, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyVideoSessionKHR( device, videoSession, pAllocator );
+    }
 
-      VkResult vkGetVideoSessionMemoryRequirementsKHR( VkDevice                              device,
-                                                       VkVideoSessionKHR                     videoSession,
-                                                       uint32_t *                            pMemoryRequirementsCount,
-                                                       VkVideoSessionMemoryRequirementsKHR * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetVideoSessionMemoryRequirementsKHR( device, videoSession, pMemoryRequirementsCount, pMemoryRequirements );
-      }
+    VkResult vkGetVideoSessionMemoryRequirementsKHR( VkDevice                              device,
+                                                     VkVideoSessionKHR                     videoSession,
+                                                     uint32_t *                            pMemoryRequirementsCount,
+                                                     VkVideoSessionMemoryRequirementsKHR * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetVideoSessionMemoryRequirementsKHR( device, videoSession, pMemoryRequirementsCount, pMemoryRequirements );
+    }
 
-      VkResult vkBindVideoSessionMemoryKHR( VkDevice                                device,
-                                            VkVideoSessionKHR                       videoSession,
-                                            uint32_t                                bindSessionMemoryInfoCount,
-                                            const VkBindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindVideoSessionMemoryKHR( device, videoSession, bindSessionMemoryInfoCount, pBindSessionMemoryInfos );
-      }
+    VkResult vkBindVideoSessionMemoryKHR( VkDevice                                device,
+                                          VkVideoSessionKHR                       videoSession,
+                                          uint32_t                                bindSessionMemoryInfoCount,
+                                          const VkBindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindVideoSessionMemoryKHR( device, videoSession, bindSessionMemoryInfoCount, pBindSessionMemoryInfos );
+    }
 
-      VkResult vkCreateVideoSessionParametersKHR( VkDevice                                      device,
-                                                  const VkVideoSessionParametersCreateInfoKHR * pCreateInfo,
-                                                  const VkAllocationCallbacks *                 pAllocator,
-                                                  VkVideoSessionParametersKHR *                 pVideoSessionParameters ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateVideoSessionParametersKHR( device, pCreateInfo, pAllocator, pVideoSessionParameters );
-      }
+    VkResult vkCreateVideoSessionParametersKHR( VkDevice                                      device,
+                                                const VkVideoSessionParametersCreateInfoKHR * pCreateInfo,
+                                                const VkAllocationCallbacks *                 pAllocator,
+                                                VkVideoSessionParametersKHR *                 pVideoSessionParameters ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateVideoSessionParametersKHR( device, pCreateInfo, pAllocator, pVideoSessionParameters );
+    }
 
-      VkResult vkUpdateVideoSessionParametersKHR( VkDevice                                      device,
-                                                  VkVideoSessionParametersKHR                   videoSessionParameters,
-                                                  const VkVideoSessionParametersUpdateInfoKHR * pUpdateInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateVideoSessionParametersKHR( device, videoSessionParameters, pUpdateInfo );
-      }
+    VkResult vkUpdateVideoSessionParametersKHR( VkDevice                                      device,
+                                                VkVideoSessionParametersKHR                   videoSessionParameters,
+                                                const VkVideoSessionParametersUpdateInfoKHR * pUpdateInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUpdateVideoSessionParametersKHR( device, videoSessionParameters, pUpdateInfo );
+    }
 
-      void vkDestroyVideoSessionParametersKHR( VkDevice                      device,
-                                               VkVideoSessionParametersKHR   videoSessionParameters,
-                                               const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyVideoSessionParametersKHR( device, videoSessionParameters, pAllocator );
-      }
+    void vkDestroyVideoSessionParametersKHR( VkDevice                      device,
+                                             VkVideoSessionParametersKHR   videoSessionParameters,
+                                             const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyVideoSessionParametersKHR( device, videoSessionParameters, pAllocator );
+    }
 
-      void vkCmdBeginVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoBeginCodingInfoKHR * pBeginInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginVideoCodingKHR( commandBuffer, pBeginInfo );
-      }
+    void vkCmdBeginVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoBeginCodingInfoKHR * pBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginVideoCodingKHR( commandBuffer, pBeginInfo );
+    }
 
-      void vkCmdEndVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoEndCodingInfoKHR * pEndCodingInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndVideoCodingKHR( commandBuffer, pEndCodingInfo );
-      }
+    void vkCmdEndVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoEndCodingInfoKHR * pEndCodingInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndVideoCodingKHR( commandBuffer, pEndCodingInfo );
+    }
 
-      void vkCmdControlVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoCodingControlInfoKHR * pCodingControlInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdControlVideoCodingKHR( commandBuffer, pCodingControlInfo );
-      }
+    void vkCmdControlVideoCodingKHR( VkCommandBuffer commandBuffer, const VkVideoCodingControlInfoKHR * pCodingControlInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdControlVideoCodingKHR( commandBuffer, pCodingControlInfo );
+    }
 
-      //=== VK_KHR_video_decode_queue ===
+    //=== VK_KHR_video_decode_queue ===
 
-      void vkCmdDecodeVideoKHR( VkCommandBuffer commandBuffer, const VkVideoDecodeInfoKHR * pDecodeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDecodeVideoKHR( commandBuffer, pDecodeInfo );
-      }
+    void vkCmdDecodeVideoKHR( VkCommandBuffer commandBuffer, const VkVideoDecodeInfoKHR * pDecodeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDecodeVideoKHR( commandBuffer, pDecodeInfo );
+    }
 
-      //=== VK_EXT_transform_feedback ===
+    //=== VK_EXT_transform_feedback ===
 
-      void vkCmdBindTransformFeedbackBuffersEXT( VkCommandBuffer      commandBuffer,
-                                                 uint32_t             firstBinding,
-                                                 uint32_t             bindingCount,
-                                                 const VkBuffer *     pBuffers,
-                                                 const VkDeviceSize * pOffsets,
-                                                 const VkDeviceSize * pSizes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindTransformFeedbackBuffersEXT( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes );
-      }
+    void vkCmdBindTransformFeedbackBuffersEXT( VkCommandBuffer      commandBuffer,
+                                               uint32_t             firstBinding,
+                                               uint32_t             bindingCount,
+                                               const VkBuffer *     pBuffers,
+                                               const VkDeviceSize * pOffsets,
+                                               const VkDeviceSize * pSizes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindTransformFeedbackBuffersEXT( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes );
+    }
 
-      void vkCmdBeginTransformFeedbackEXT( VkCommandBuffer      commandBuffer,
-                                           uint32_t             firstCounterBuffer,
-                                           uint32_t             counterBufferCount,
-                                           const VkBuffer *     pCounterBuffers,
-                                           const VkDeviceSize * pCounterBufferOffsets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginTransformFeedbackEXT( commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets );
-      }
-
-      void vkCmdEndTransformFeedbackEXT( VkCommandBuffer      commandBuffer,
+    void vkCmdBeginTransformFeedbackEXT( VkCommandBuffer      commandBuffer,
                                          uint32_t             firstCounterBuffer,
                                          uint32_t             counterBufferCount,
                                          const VkBuffer *     pCounterBuffers,
                                          const VkDeviceSize * pCounterBufferOffsets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndTransformFeedbackEXT( commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets );
-      }
+    {
+      return ::vkCmdBeginTransformFeedbackEXT( commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets );
+    }
 
-      void vkCmdBeginQueryIndexedEXT( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginQueryIndexedEXT( commandBuffer, queryPool, query, flags, index );
-      }
+    void vkCmdEndTransformFeedbackEXT( VkCommandBuffer      commandBuffer,
+                                       uint32_t             firstCounterBuffer,
+                                       uint32_t             counterBufferCount,
+                                       const VkBuffer *     pCounterBuffers,
+                                       const VkDeviceSize * pCounterBufferOffsets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndTransformFeedbackEXT( commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets );
+    }
 
-      void vkCmdEndQueryIndexedEXT( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndQueryIndexedEXT( commandBuffer, queryPool, query, index );
-      }
+    void vkCmdBeginQueryIndexedEXT( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginQueryIndexedEXT( commandBuffer, queryPool, query, flags, index );
+    }
 
-      void vkCmdDrawIndirectByteCountEXT( VkCommandBuffer commandBuffer,
-                                          uint32_t        instanceCount,
-                                          uint32_t        firstInstance,
-                                          VkBuffer        counterBuffer,
-                                          VkDeviceSize    counterBufferOffset,
-                                          uint32_t        counterOffset,
-                                          uint32_t        vertexStride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndirectByteCountEXT( commandBuffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride );
-      }
+    void vkCmdEndQueryIndexedEXT( VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndQueryIndexedEXT( commandBuffer, queryPool, query, index );
+    }
 
-      //=== VK_NVX_binary_import ===
+    void vkCmdDrawIndirectByteCountEXT( VkCommandBuffer commandBuffer,
+                                        uint32_t        instanceCount,
+                                        uint32_t        firstInstance,
+                                        VkBuffer        counterBuffer,
+                                        VkDeviceSize    counterBufferOffset,
+                                        uint32_t        counterOffset,
+                                        uint32_t        vertexStride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndirectByteCountEXT( commandBuffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride );
+    }
 
-      VkResult vkCreateCuModuleNVX( VkDevice                        device,
-                                    const VkCuModuleCreateInfoNVX * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkCuModuleNVX *                 pModule ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateCuModuleNVX( device, pCreateInfo, pAllocator, pModule );
-      }
+    //=== VK_NVX_binary_import ===
 
-      VkResult vkCreateCuFunctionNVX( VkDevice                          device,
-                                      const VkCuFunctionCreateInfoNVX * pCreateInfo,
-                                      const VkAllocationCallbacks *     pAllocator,
-                                      VkCuFunctionNVX *                 pFunction ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateCuFunctionNVX( device, pCreateInfo, pAllocator, pFunction );
-      }
+    VkResult vkCreateCuModuleNVX( VkDevice                        device,
+                                  const VkCuModuleCreateInfoNVX * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkCuModuleNVX *                 pModule ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateCuModuleNVX( device, pCreateInfo, pAllocator, pModule );
+    }
 
-      void vkDestroyCuModuleNVX( VkDevice device, VkCuModuleNVX module, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyCuModuleNVX( device, module, pAllocator );
-      }
+    VkResult vkCreateCuFunctionNVX( VkDevice                          device,
+                                    const VkCuFunctionCreateInfoNVX * pCreateInfo,
+                                    const VkAllocationCallbacks *     pAllocator,
+                                    VkCuFunctionNVX *                 pFunction ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateCuFunctionNVX( device, pCreateInfo, pAllocator, pFunction );
+    }
 
-      void vkDestroyCuFunctionNVX( VkDevice device, VkCuFunctionNVX function, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyCuFunctionNVX( device, function, pAllocator );
-      }
+    void vkDestroyCuModuleNVX( VkDevice device, VkCuModuleNVX module, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyCuModuleNVX( device, module, pAllocator );
+    }
 
-      void vkCmdCuLaunchKernelNVX( VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX * pLaunchInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCuLaunchKernelNVX( commandBuffer, pLaunchInfo );
-      }
+    void vkDestroyCuFunctionNVX( VkDevice device, VkCuFunctionNVX function, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyCuFunctionNVX( device, function, pAllocator );
+    }
 
-      //=== VK_NVX_image_view_handle ===
+    void vkCmdCuLaunchKernelNVX( VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX * pLaunchInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCuLaunchKernelNVX( commandBuffer, pLaunchInfo );
+    }
 
-      uint32_t vkGetImageViewHandleNVX( VkDevice device, const VkImageViewHandleInfoNVX * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageViewHandleNVX( device, pInfo );
-      }
+    //=== VK_NVX_image_view_handle ===
 
-      uint64_t vkGetImageViewHandle64NVX( VkDevice device, const VkImageViewHandleInfoNVX * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageViewHandle64NVX( device, pInfo );
-      }
+    uint32_t vkGetImageViewHandleNVX( VkDevice device, const VkImageViewHandleInfoNVX * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageViewHandleNVX( device, pInfo );
+    }
 
-      VkResult vkGetImageViewAddressNVX( VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageViewAddressNVX( device, imageView, pProperties );
-      }
+    VkResult vkGetImageViewAddressNVX( VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageViewAddressNVX( device, imageView, pProperties );
+    }
 
-      //=== VK_AMD_draw_indirect_count ===
+    //=== VK_AMD_draw_indirect_count ===
 
-      void vkCmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer,
-                                      VkBuffer        buffer,
-                                      VkDeviceSize    offset,
-                                      VkBuffer        countBuffer,
-                                      VkDeviceSize    countBufferOffset,
-                                      uint32_t        maxDrawCount,
-                                      uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndirectCountAMD( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
+    void vkCmdDrawIndirectCountAMD( VkCommandBuffer commandBuffer,
+                                    VkBuffer        buffer,
+                                    VkDeviceSize    offset,
+                                    VkBuffer        countBuffer,
+                                    VkDeviceSize    countBufferOffset,
+                                    uint32_t        maxDrawCount,
+                                    uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndirectCountAMD( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
 
-      void vkCmdDrawIndexedIndirectCountAMD( VkCommandBuffer commandBuffer,
-                                             VkBuffer        buffer,
-                                             VkDeviceSize    offset,
-                                             VkBuffer        countBuffer,
-                                             VkDeviceSize    countBufferOffset,
-                                             uint32_t        maxDrawCount,
-                                             uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndexedIndirectCountAMD( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
+    void vkCmdDrawIndexedIndirectCountAMD( VkCommandBuffer commandBuffer,
+                                           VkBuffer        buffer,
+                                           VkDeviceSize    offset,
+                                           VkBuffer        countBuffer,
+                                           VkDeviceSize    countBufferOffset,
+                                           uint32_t        maxDrawCount,
+                                           uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndexedIndirectCountAMD( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
 
-      //=== VK_AMD_shader_info ===
+    //=== VK_AMD_shader_info ===
 
-      VkResult vkGetShaderInfoAMD( VkDevice              device,
-                                   VkPipeline            pipeline,
-                                   VkShaderStageFlagBits shaderStage,
-                                   VkShaderInfoTypeAMD   infoType,
-                                   size_t *              pInfoSize,
-                                   void *                pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetShaderInfoAMD( device, pipeline, shaderStage, infoType, pInfoSize, pInfo );
-      }
+    VkResult vkGetShaderInfoAMD( VkDevice              device,
+                                 VkPipeline            pipeline,
+                                 VkShaderStageFlagBits shaderStage,
+                                 VkShaderInfoTypeAMD   infoType,
+                                 size_t *              pInfoSize,
+                                 void *                pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetShaderInfoAMD( device, pipeline, shaderStage, infoType, pInfoSize, pInfo );
+    }
 
-      //=== VK_KHR_dynamic_rendering ===
+    //=== VK_KHR_dynamic_rendering ===
 
-      void vkCmdBeginRenderingKHR( VkCommandBuffer commandBuffer, const VkRenderingInfo * pRenderingInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginRenderingKHR( commandBuffer, pRenderingInfo );
-      }
+    void vkCmdBeginRenderingKHR( VkCommandBuffer commandBuffer, const VkRenderingInfo * pRenderingInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginRenderingKHR( commandBuffer, pRenderingInfo );
+    }
 
-      void vkCmdEndRenderingKHR( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRenderingKHR( commandBuffer );
-      }
+    void vkCmdEndRenderingKHR( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndRenderingKHR( commandBuffer );
+    }
 
 #  if defined( VK_USE_PLATFORM_GGP )
-      //=== VK_GGP_stream_descriptor_surface ===
+    //=== VK_GGP_stream_descriptor_surface ===
 
-      VkResult vkCreateStreamDescriptorSurfaceGGP( VkInstance                                     instance,
-                                                   const VkStreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
-                                                   const VkAllocationCallbacks *                  pAllocator,
-                                                   VkSurfaceKHR *                                 pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateStreamDescriptorSurfaceGGP( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateStreamDescriptorSurfaceGGP( VkInstance                                     instance,
+                                                 const VkStreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
+                                                 const VkAllocationCallbacks *                  pAllocator,
+                                                 VkSurfaceKHR *                                 pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateStreamDescriptorSurfaceGGP( instance, pCreateInfo, pAllocator, pSurface );
+    }
 #  endif /*VK_USE_PLATFORM_GGP*/
 
-      //=== VK_NV_external_memory_capabilities ===
+    //=== VK_NV_external_memory_capabilities ===
 
-      VkResult
-        vkGetPhysicalDeviceExternalImageFormatPropertiesNV( VkPhysicalDevice                    physicalDevice,
-                                                            VkFormat                            format,
-                                                            VkImageType                         type,
-                                                            VkImageTiling                       tiling,
-                                                            VkImageUsageFlags                   usage,
-                                                            VkImageCreateFlags                  flags,
-                                                            VkExternalMemoryHandleTypeFlagsNV   externalHandleType,
-                                                            VkExternalImageFormatPropertiesNV * pExternalImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
-          physicalDevice, format, type, tiling, usage, flags, externalHandleType, pExternalImageFormatProperties );
-      }
+    VkResult vkGetPhysicalDeviceExternalImageFormatPropertiesNV( VkPhysicalDevice                    physicalDevice,
+                                                                 VkFormat                            format,
+                                                                 VkImageType                         type,
+                                                                 VkImageTiling                       tiling,
+                                                                 VkImageUsageFlags                   usage,
+                                                                 VkImageCreateFlags                  flags,
+                                                                 VkExternalMemoryHandleTypeFlagsNV   externalHandleType,
+                                                                 VkExternalImageFormatPropertiesNV * pExternalImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
+        physicalDevice, format, type, tiling, usage, flags, externalHandleType, pExternalImageFormatProperties );
+    }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_NV_external_memory_win32 ===
+    //=== VK_NV_external_memory_win32 ===
 
-      VkResult vkGetMemoryWin32HandleNV( VkDevice                          device,
-                                         VkDeviceMemory                    memory,
-                                         VkExternalMemoryHandleTypeFlagsNV handleType,
-                                         HANDLE *                          pHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryWin32HandleNV( device, memory, handleType, pHandle );
-      }
+    VkResult vkGetMemoryWin32HandleNV( VkDevice                          device,
+                                       VkDeviceMemory                    memory,
+                                       VkExternalMemoryHandleTypeFlagsNV handleType,
+                                       HANDLE *                          pHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryWin32HandleNV( device, memory, handleType, pHandle );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_KHR_get_physical_device_properties2 ===
+    //=== VK_KHR_get_physical_device_properties2 ===
 
-      void vkGetPhysicalDeviceFeatures2KHR( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 * pFeatures ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFeatures2KHR( physicalDevice, pFeatures );
-      }
+    void vkGetPhysicalDeviceFeatures2KHR( VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 * pFeatures ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFeatures2KHR( physicalDevice, pFeatures );
+    }
 
-      void vkGetPhysicalDeviceProperties2KHR( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceProperties2KHR( physicalDevice, pProperties );
-      }
+    void vkGetPhysicalDeviceProperties2KHR( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceProperties2KHR( physicalDevice, pProperties );
+    }
 
-      void vkGetPhysicalDeviceFormatProperties2KHR( VkPhysicalDevice      physicalDevice,
-                                                    VkFormat              format,
-                                                    VkFormatProperties2 * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFormatProperties2KHR( physicalDevice, format, pFormatProperties );
-      }
+    void vkGetPhysicalDeviceFormatProperties2KHR( VkPhysicalDevice      physicalDevice,
+                                                  VkFormat              format,
+                                                  VkFormatProperties2 * pFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFormatProperties2KHR( physicalDevice, format, pFormatProperties );
+    }
 
-      VkResult vkGetPhysicalDeviceImageFormatProperties2KHR( VkPhysicalDevice                         physicalDevice,
-                                                             const VkPhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                             VkImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceImageFormatProperties2KHR( physicalDevice, pImageFormatInfo, pImageFormatProperties );
-      }
+    VkResult vkGetPhysicalDeviceImageFormatProperties2KHR( VkPhysicalDevice                         physicalDevice,
+                                                           const VkPhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                                           VkImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceImageFormatProperties2KHR( physicalDevice, pImageFormatInfo, pImageFormatProperties );
+    }
 
-      void vkGetPhysicalDeviceQueueFamilyProperties2KHR( VkPhysicalDevice           physicalDevice,
-                                                         uint32_t *                 pQueueFamilyPropertyCount,
-                                                         VkQueueFamilyProperties2 * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyProperties2KHR( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
-      }
+    void vkGetPhysicalDeviceQueueFamilyProperties2KHR( VkPhysicalDevice           physicalDevice,
+                                                       uint32_t *                 pQueueFamilyPropertyCount,
+                                                       VkQueueFamilyProperties2 * pQueueFamilyProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceQueueFamilyProperties2KHR( physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties );
+    }
 
-      void vkGetPhysicalDeviceMemoryProperties2KHR( VkPhysicalDevice                    physicalDevice,
-                                                    VkPhysicalDeviceMemoryProperties2 * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceMemoryProperties2KHR( physicalDevice, pMemoryProperties );
-      }
+    void vkGetPhysicalDeviceMemoryProperties2KHR( VkPhysicalDevice                    physicalDevice,
+                                                  VkPhysicalDeviceMemoryProperties2 * pMemoryProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceMemoryProperties2KHR( physicalDevice, pMemoryProperties );
+    }
 
-      void vkGetPhysicalDeviceSparseImageFormatProperties2KHR( VkPhysicalDevice                               physicalDevice,
-                                                               const VkPhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                                               uint32_t *                                     pPropertyCount,
-                                                               VkSparseImageFormatProperties2 *               pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSparseImageFormatProperties2KHR( physicalDevice, pFormatInfo, pPropertyCount, pProperties );
-      }
+    void vkGetPhysicalDeviceSparseImageFormatProperties2KHR( VkPhysicalDevice                               physicalDevice,
+                                                             const VkPhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                                             uint32_t *                                     pPropertyCount,
+                                                             VkSparseImageFormatProperties2 *               pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSparseImageFormatProperties2KHR( physicalDevice, pFormatInfo, pPropertyCount, pProperties );
+    }
 
-      //=== VK_KHR_device_group ===
+    //=== VK_KHR_device_group ===
 
-      void vkGetDeviceGroupPeerMemoryFeaturesKHR( VkDevice                   device,
-                                                  uint32_t                   heapIndex,
-                                                  uint32_t                   localDeviceIndex,
-                                                  uint32_t                   remoteDeviceIndex,
-                                                  VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceGroupPeerMemoryFeaturesKHR( device, heapIndex, localDeviceIndex, remoteDeviceIndex, pPeerMemoryFeatures );
-      }
+    void vkGetDeviceGroupPeerMemoryFeaturesKHR( VkDevice                   device,
+                                                uint32_t                   heapIndex,
+                                                uint32_t                   localDeviceIndex,
+                                                uint32_t                   remoteDeviceIndex,
+                                                VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceGroupPeerMemoryFeaturesKHR( device, heapIndex, localDeviceIndex, remoteDeviceIndex, pPeerMemoryFeatures );
+    }
 
-      void vkCmdSetDeviceMaskKHR( VkCommandBuffer commandBuffer, uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDeviceMaskKHR( commandBuffer, deviceMask );
-      }
+    void vkCmdSetDeviceMaskKHR( VkCommandBuffer commandBuffer, uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDeviceMaskKHR( commandBuffer, deviceMask );
+    }
 
-      void vkCmdDispatchBaseKHR( VkCommandBuffer commandBuffer,
-                                 uint32_t        baseGroupX,
-                                 uint32_t        baseGroupY,
-                                 uint32_t        baseGroupZ,
-                                 uint32_t        groupCountX,
-                                 uint32_t        groupCountY,
-                                 uint32_t        groupCountZ ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchBaseKHR( commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
-      }
+    void vkCmdDispatchBaseKHR( VkCommandBuffer commandBuffer,
+                               uint32_t        baseGroupX,
+                               uint32_t        baseGroupY,
+                               uint32_t        baseGroupZ,
+                               uint32_t        groupCountX,
+                               uint32_t        groupCountY,
+                               uint32_t        groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchBaseKHR( commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
+    }
 
 #  if defined( VK_USE_PLATFORM_VI_NN )
-      //=== VK_NN_vi_surface ===
+    //=== VK_NN_vi_surface ===
 
-      VkResult vkCreateViSurfaceNN( VkInstance                      instance,
-                                    const VkViSurfaceCreateInfoNN * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkSurfaceKHR *                  pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateViSurfaceNN( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateViSurfaceNN( VkInstance                      instance,
+                                  const VkViSurfaceCreateInfoNN * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkSurfaceKHR *                  pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateViSurfaceNN( instance, pCreateInfo, pAllocator, pSurface );
+    }
 #  endif /*VK_USE_PLATFORM_VI_NN*/
 
-      //=== VK_KHR_maintenance1 ===
+    //=== VK_KHR_maintenance1 ===
 
-      void vkTrimCommandPoolKHR( VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkTrimCommandPoolKHR( device, commandPool, flags );
-      }
+    void vkTrimCommandPoolKHR( VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkTrimCommandPoolKHR( device, commandPool, flags );
+    }
 
-      //=== VK_KHR_device_group_creation ===
+    //=== VK_KHR_device_group_creation ===
 
-      VkResult vkEnumeratePhysicalDeviceGroupsKHR( VkInstance                        instance,
-                                                   uint32_t *                        pPhysicalDeviceGroupCount,
-                                                   VkPhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumeratePhysicalDeviceGroupsKHR( instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties );
-      }
+    VkResult vkEnumeratePhysicalDeviceGroupsKHR( VkInstance                        instance,
+                                                 uint32_t *                        pPhysicalDeviceGroupCount,
+                                                 VkPhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumeratePhysicalDeviceGroupsKHR( instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties );
+    }
 
-      //=== VK_KHR_external_memory_capabilities ===
+    //=== VK_KHR_external_memory_capabilities ===
 
-      void vkGetPhysicalDeviceExternalBufferPropertiesKHR( VkPhysicalDevice                           physicalDevice,
-                                                           const VkPhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                                           VkExternalBufferProperties *               pExternalBufferProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalBufferPropertiesKHR( physicalDevice, pExternalBufferInfo, pExternalBufferProperties );
-      }
+    void vkGetPhysicalDeviceExternalBufferPropertiesKHR( VkPhysicalDevice                           physicalDevice,
+                                                         const VkPhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                                         VkExternalBufferProperties *               pExternalBufferProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalBufferPropertiesKHR( physicalDevice, pExternalBufferInfo, pExternalBufferProperties );
+    }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_KHR_external_memory_win32 ===
+    //=== VK_KHR_external_memory_win32 ===
 
-      VkResult
-        vkGetMemoryWin32HandleKHR( VkDevice device, const VkMemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
-      }
+    VkResult vkGetMemoryWin32HandleKHR( VkDevice device, const VkMemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
+    }
 
-      VkResult vkGetMemoryWin32HandlePropertiesKHR( VkDevice                           device,
-                                                    VkExternalMemoryHandleTypeFlagBits handleType,
-                                                    HANDLE                             handle,
-                                                    VkMemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryWin32HandlePropertiesKHR( device, handleType, handle, pMemoryWin32HandleProperties );
-      }
+    VkResult vkGetMemoryWin32HandlePropertiesKHR( VkDevice                           device,
+                                                  VkExternalMemoryHandleTypeFlagBits handleType,
+                                                  HANDLE                             handle,
+                                                  VkMemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryWin32HandlePropertiesKHR( device, handleType, handle, pMemoryWin32HandleProperties );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_KHR_external_memory_fd ===
+    //=== VK_KHR_external_memory_fd ===
 
-      VkResult vkGetMemoryFdKHR( VkDevice device, const VkMemoryGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryFdKHR( device, pGetFdInfo, pFd );
-      }
+    VkResult vkGetMemoryFdKHR( VkDevice device, const VkMemoryGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryFdKHR( device, pGetFdInfo, pFd );
+    }
 
-      VkResult vkGetMemoryFdPropertiesKHR( VkDevice                           device,
-                                           VkExternalMemoryHandleTypeFlagBits handleType,
-                                           int                                fd,
-                                           VkMemoryFdPropertiesKHR *          pMemoryFdProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties );
-      }
+    VkResult vkGetMemoryFdPropertiesKHR( VkDevice                           device,
+                                         VkExternalMemoryHandleTypeFlagBits handleType,
+                                         int                                fd,
+                                         VkMemoryFdPropertiesKHR *          pMemoryFdProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties );
+    }
 
-      //=== VK_KHR_external_semaphore_capabilities ===
+    //=== VK_KHR_external_semaphore_capabilities ===
 
-      void vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( VkPhysicalDevice                              physicalDevice,
-                                                              const VkPhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                                              VkExternalSemaphoreProperties * pExternalSemaphoreProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( physicalDevice, pExternalSemaphoreInfo, pExternalSemaphoreProperties );
-      }
+    void vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( VkPhysicalDevice                              physicalDevice,
+                                                            const VkPhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                                            VkExternalSemaphoreProperties * pExternalSemaphoreProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( physicalDevice, pExternalSemaphoreInfo, pExternalSemaphoreProperties );
+    }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_KHR_external_semaphore_win32 ===
+    //=== VK_KHR_external_semaphore_win32 ===
 
-      VkResult vkImportSemaphoreWin32HandleKHR( VkDevice                                    device,
-                                                const VkImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkImportSemaphoreWin32HandleKHR( device, pImportSemaphoreWin32HandleInfo );
-      }
+    VkResult vkImportSemaphoreWin32HandleKHR( VkDevice                                    device,
+                                              const VkImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkImportSemaphoreWin32HandleKHR( device, pImportSemaphoreWin32HandleInfo );
+    }
 
-      VkResult vkGetSemaphoreWin32HandleKHR( VkDevice                                 device,
-                                             const VkSemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                             HANDLE *                                 pHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSemaphoreWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
-      }
+    VkResult
+      vkGetSemaphoreWin32HandleKHR( VkDevice device, const VkSemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSemaphoreWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_KHR_external_semaphore_fd ===
+    //=== VK_KHR_external_semaphore_fd ===
 
-      VkResult vkImportSemaphoreFdKHR( VkDevice device, const VkImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo );
-      }
+    VkResult vkImportSemaphoreFdKHR( VkDevice device, const VkImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo );
+    }
 
-      VkResult vkGetSemaphoreFdKHR( VkDevice device, const VkSemaphoreGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSemaphoreFdKHR( device, pGetFdInfo, pFd );
-      }
+    VkResult vkGetSemaphoreFdKHR( VkDevice device, const VkSemaphoreGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSemaphoreFdKHR( device, pGetFdInfo, pFd );
+    }
 
-      //=== VK_KHR_push_descriptor ===
+    //=== VK_KHR_push_descriptor ===
 
-      void vkCmdPushDescriptorSetKHR( VkCommandBuffer              commandBuffer,
-                                      VkPipelineBindPoint          pipelineBindPoint,
-                                      VkPipelineLayout             layout,
-                                      uint32_t                     set,
-                                      uint32_t                     descriptorWriteCount,
-                                      const VkWriteDescriptorSet * pDescriptorWrites ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSetKHR( commandBuffer, pipelineBindPoint, layout, set, descriptorWriteCount, pDescriptorWrites );
-      }
+    void vkCmdPushDescriptorSetKHR( VkCommandBuffer              commandBuffer,
+                                    VkPipelineBindPoint          pipelineBindPoint,
+                                    VkPipelineLayout             layout,
+                                    uint32_t                     set,
+                                    uint32_t                     descriptorWriteCount,
+                                    const VkWriteDescriptorSet * pDescriptorWrites ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushDescriptorSetKHR( commandBuffer, pipelineBindPoint, layout, set, descriptorWriteCount, pDescriptorWrites );
+    }
 
-      void vkCmdPushDescriptorSetWithTemplateKHR( VkCommandBuffer            commandBuffer,
-                                                  VkDescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                  VkPipelineLayout           layout,
-                                                  uint32_t                   set,
-                                                  const void *               pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSetWithTemplateKHR( commandBuffer, descriptorUpdateTemplate, layout, set, pData );
-      }
+    void vkCmdPushDescriptorSetWithTemplateKHR( VkCommandBuffer            commandBuffer,
+                                                VkDescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                VkPipelineLayout           layout,
+                                                uint32_t                   set,
+                                                const void *               pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushDescriptorSetWithTemplateKHR( commandBuffer, descriptorUpdateTemplate, layout, set, pData );
+    }
 
-      //=== VK_EXT_conditional_rendering ===
+    //=== VK_EXT_conditional_rendering ===
 
-      void vkCmdBeginConditionalRenderingEXT( VkCommandBuffer                            commandBuffer,
-                                              const VkConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginConditionalRenderingEXT( commandBuffer, pConditionalRenderingBegin );
-      }
+    void vkCmdBeginConditionalRenderingEXT( VkCommandBuffer                            commandBuffer,
+                                            const VkConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginConditionalRenderingEXT( commandBuffer, pConditionalRenderingBegin );
+    }
 
-      void vkCmdEndConditionalRenderingEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndConditionalRenderingEXT( commandBuffer );
-      }
+    void vkCmdEndConditionalRenderingEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndConditionalRenderingEXT( commandBuffer );
+    }
 
-      //=== VK_KHR_descriptor_update_template ===
+    //=== VK_KHR_descriptor_update_template ===
 
-      VkResult vkCreateDescriptorUpdateTemplateKHR( VkDevice                                     device,
-                                                    const VkDescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                    const VkAllocationCallbacks *                pAllocator,
-                                                    VkDescriptorUpdateTemplate *                 pDescriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDescriptorUpdateTemplateKHR( device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate );
-      }
+    VkResult vkCreateDescriptorUpdateTemplateKHR( VkDevice                                     device,
+                                                  const VkDescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                                  const VkAllocationCallbacks *                pAllocator,
+                                                  VkDescriptorUpdateTemplate *                 pDescriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDescriptorUpdateTemplateKHR( device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate );
+    }
 
-      void vkDestroyDescriptorUpdateTemplateKHR( VkDevice                      device,
-                                                 VkDescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                                 const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDescriptorUpdateTemplateKHR( device, descriptorUpdateTemplate, pAllocator );
-      }
+    void vkDestroyDescriptorUpdateTemplateKHR( VkDevice                      device,
+                                               VkDescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                               const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDescriptorUpdateTemplateKHR( device, descriptorUpdateTemplate, pAllocator );
+    }
 
-      void vkUpdateDescriptorSetWithTemplateKHR( VkDevice                   device,
-                                                 VkDescriptorSet            descriptorSet,
-                                                 VkDescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                 const void *               pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateDescriptorSetWithTemplateKHR( device, descriptorSet, descriptorUpdateTemplate, pData );
-      }
+    void vkUpdateDescriptorSetWithTemplateKHR( VkDevice                   device,
+                                               VkDescriptorSet            descriptorSet,
+                                               VkDescriptorUpdateTemplate descriptorUpdateTemplate,
+                                               const void *               pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUpdateDescriptorSetWithTemplateKHR( device, descriptorSet, descriptorUpdateTemplate, pData );
+    }
 
-      //=== VK_NV_clip_space_w_scaling ===
+    //=== VK_NV_clip_space_w_scaling ===
 
-      void vkCmdSetViewportWScalingNV( VkCommandBuffer              commandBuffer,
-                                       uint32_t                     firstViewport,
-                                       uint32_t                     viewportCount,
-                                       const VkViewportWScalingNV * pViewportWScalings ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportWScalingNV( commandBuffer, firstViewport, viewportCount, pViewportWScalings );
-      }
+    void vkCmdSetViewportWScalingNV( VkCommandBuffer              commandBuffer,
+                                     uint32_t                     firstViewport,
+                                     uint32_t                     viewportCount,
+                                     const VkViewportWScalingNV * pViewportWScalings ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportWScalingNV( commandBuffer, firstViewport, viewportCount, pViewportWScalings );
+    }
 
-      //=== VK_EXT_direct_mode_display ===
+    //=== VK_EXT_direct_mode_display ===
 
-      VkResult vkReleaseDisplayEXT( VkPhysicalDevice physicalDevice, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseDisplayEXT( physicalDevice, display );
-      }
+    VkResult vkReleaseDisplayEXT( VkPhysicalDevice physicalDevice, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkReleaseDisplayEXT( physicalDevice, display );
+    }
 
 #  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-      //=== VK_EXT_acquire_xlib_display ===
+    //=== VK_EXT_acquire_xlib_display ===
 
-      VkResult vkAcquireXlibDisplayEXT( VkPhysicalDevice physicalDevice, Display * dpy, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireXlibDisplayEXT( physicalDevice, dpy, display );
-      }
+    VkResult vkAcquireXlibDisplayEXT( VkPhysicalDevice physicalDevice, Display * dpy, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireXlibDisplayEXT( physicalDevice, dpy, display );
+    }
 
-      VkResult
-        vkGetRandROutputDisplayEXT( VkPhysicalDevice physicalDevice, Display * dpy, RROutput rrOutput, VkDisplayKHR * pDisplay ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRandROutputDisplayEXT( physicalDevice, dpy, rrOutput, pDisplay );
-      }
+    VkResult vkGetRandROutputDisplayEXT( VkPhysicalDevice physicalDevice, Display * dpy, RROutput rrOutput, VkDisplayKHR * pDisplay ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRandROutputDisplayEXT( physicalDevice, dpy, rrOutput, pDisplay );
+    }
 #  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
-      //=== VK_EXT_display_surface_counter ===
+    //=== VK_EXT_display_surface_counter ===
 
-      VkResult vkGetPhysicalDeviceSurfaceCapabilities2EXT( VkPhysicalDevice            physicalDevice,
-                                                           VkSurfaceKHR                surface,
-                                                           VkSurfaceCapabilities2EXT * pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceCapabilities2EXT( physicalDevice, surface, pSurfaceCapabilities );
-      }
+    VkResult vkGetPhysicalDeviceSurfaceCapabilities2EXT( VkPhysicalDevice            physicalDevice,
+                                                         VkSurfaceKHR                surface,
+                                                         VkSurfaceCapabilities2EXT * pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceCapabilities2EXT( physicalDevice, surface, pSurfaceCapabilities );
+    }
 
-      //=== VK_EXT_display_control ===
+    //=== VK_EXT_display_control ===
 
-      VkResult vkDisplayPowerControlEXT( VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT * pDisplayPowerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDisplayPowerControlEXT( device, display, pDisplayPowerInfo );
-      }
+    VkResult vkDisplayPowerControlEXT( VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT * pDisplayPowerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDisplayPowerControlEXT( device, display, pDisplayPowerInfo );
+    }
 
-      VkResult vkRegisterDeviceEventEXT( VkDevice                      device,
-                                         const VkDeviceEventInfoEXT *  pDeviceEventInfo,
-                                         const VkAllocationCallbacks * pAllocator,
-                                         VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkRegisterDeviceEventEXT( device, pDeviceEventInfo, pAllocator, pFence );
-      }
+    VkResult vkRegisterDeviceEventEXT( VkDevice                      device,
+                                       const VkDeviceEventInfoEXT *  pDeviceEventInfo,
+                                       const VkAllocationCallbacks * pAllocator,
+                                       VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkRegisterDeviceEventEXT( device, pDeviceEventInfo, pAllocator, pFence );
+    }
 
-      VkResult vkRegisterDisplayEventEXT( VkDevice                      device,
-                                          VkDisplayKHR                  display,
-                                          const VkDisplayEventInfoEXT * pDisplayEventInfo,
-                                          const VkAllocationCallbacks * pAllocator,
-                                          VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkRegisterDisplayEventEXT( device, display, pDisplayEventInfo, pAllocator, pFence );
-      }
+    VkResult vkRegisterDisplayEventEXT( VkDevice                      device,
+                                        VkDisplayKHR                  display,
+                                        const VkDisplayEventInfoEXT * pDisplayEventInfo,
+                                        const VkAllocationCallbacks * pAllocator,
+                                        VkFence *                     pFence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkRegisterDisplayEventEXT( device, display, pDisplayEventInfo, pAllocator, pFence );
+    }
 
-      VkResult vkGetSwapchainCounterEXT( VkDevice                    device,
-                                         VkSwapchainKHR              swapchain,
-                                         VkSurfaceCounterFlagBitsEXT counter,
-                                         uint64_t *                  pCounterValue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainCounterEXT( device, swapchain, counter, pCounterValue );
-      }
+    VkResult vkGetSwapchainCounterEXT( VkDevice                    device,
+                                       VkSwapchainKHR              swapchain,
+                                       VkSurfaceCounterFlagBitsEXT counter,
+                                       uint64_t *                  pCounterValue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSwapchainCounterEXT( device, swapchain, counter, pCounterValue );
+    }
 
-      //=== VK_GOOGLE_display_timing ===
+    //=== VK_GOOGLE_display_timing ===
 
-      VkResult vkGetRefreshCycleDurationGOOGLE( VkDevice                       device,
-                                                VkSwapchainKHR                 swapchain,
-                                                VkRefreshCycleDurationGOOGLE * pDisplayTimingProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRefreshCycleDurationGOOGLE( device, swapchain, pDisplayTimingProperties );
-      }
+    VkResult vkGetRefreshCycleDurationGOOGLE( VkDevice                       device,
+                                              VkSwapchainKHR                 swapchain,
+                                              VkRefreshCycleDurationGOOGLE * pDisplayTimingProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRefreshCycleDurationGOOGLE( device, swapchain, pDisplayTimingProperties );
+    }
 
-      VkResult vkGetPastPresentationTimingGOOGLE( VkDevice                         device,
-                                                  VkSwapchainKHR                   swapchain,
-                                                  uint32_t *                       pPresentationTimingCount,
-                                                  VkPastPresentationTimingGOOGLE * pPresentationTimings ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPastPresentationTimingGOOGLE( device, swapchain, pPresentationTimingCount, pPresentationTimings );
-      }
+    VkResult vkGetPastPresentationTimingGOOGLE( VkDevice                         device,
+                                                VkSwapchainKHR                   swapchain,
+                                                uint32_t *                       pPresentationTimingCount,
+                                                VkPastPresentationTimingGOOGLE * pPresentationTimings ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPastPresentationTimingGOOGLE( device, swapchain, pPresentationTimingCount, pPresentationTimings );
+    }
 
-      //=== VK_EXT_discard_rectangles ===
+    //=== VK_EXT_discard_rectangles ===
 
-      void vkCmdSetDiscardRectangleEXT( VkCommandBuffer  commandBuffer,
-                                        uint32_t         firstDiscardRectangle,
-                                        uint32_t         discardRectangleCount,
-                                        const VkRect2D * pDiscardRectangles ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDiscardRectangleEXT( commandBuffer, firstDiscardRectangle, discardRectangleCount, pDiscardRectangles );
-      }
+    void vkCmdSetDiscardRectangleEXT( VkCommandBuffer  commandBuffer,
+                                      uint32_t         firstDiscardRectangle,
+                                      uint32_t         discardRectangleCount,
+                                      const VkRect2D * pDiscardRectangles ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDiscardRectangleEXT( commandBuffer, firstDiscardRectangle, discardRectangleCount, pDiscardRectangles );
+    }
 
-      void vkCmdSetDiscardRectangleEnableEXT( VkCommandBuffer commandBuffer, VkBool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDiscardRectangleEnableEXT( commandBuffer, discardRectangleEnable );
-      }
+    void vkCmdSetDiscardRectangleEnableEXT( VkCommandBuffer commandBuffer, VkBool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDiscardRectangleEnableEXT( commandBuffer, discardRectangleEnable );
+    }
 
-      void vkCmdSetDiscardRectangleModeEXT( VkCommandBuffer commandBuffer, VkDiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDiscardRectangleModeEXT( commandBuffer, discardRectangleMode );
-      }
+    void vkCmdSetDiscardRectangleModeEXT( VkCommandBuffer commandBuffer, VkDiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDiscardRectangleModeEXT( commandBuffer, discardRectangleMode );
+    }
 
-      //=== VK_EXT_hdr_metadata ===
+    //=== VK_EXT_hdr_metadata ===
 
-      void vkSetHdrMetadataEXT( VkDevice                 device,
-                                uint32_t                 swapchainCount,
-                                const VkSwapchainKHR *   pSwapchains,
-                                const VkHdrMetadataEXT * pMetadata ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetHdrMetadataEXT( device, swapchainCount, pSwapchains, pMetadata );
-      }
+    void vkSetHdrMetadataEXT( VkDevice                 device,
+                              uint32_t                 swapchainCount,
+                              const VkSwapchainKHR *   pSwapchains,
+                              const VkHdrMetadataEXT * pMetadata ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetHdrMetadataEXT( device, swapchainCount, pSwapchains, pMetadata );
+    }
 
-      //=== VK_KHR_create_renderpass2 ===
+    //=== VK_KHR_create_renderpass2 ===
 
-      VkResult vkCreateRenderPass2KHR( VkDevice                        device,
-                                       const VkRenderPassCreateInfo2 * pCreateInfo,
-                                       const VkAllocationCallbacks *   pAllocator,
-                                       VkRenderPass *                  pRenderPass ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateRenderPass2KHR( device, pCreateInfo, pAllocator, pRenderPass );
-      }
+    VkResult vkCreateRenderPass2KHR( VkDevice                        device,
+                                     const VkRenderPassCreateInfo2 * pCreateInfo,
+                                     const VkAllocationCallbacks *   pAllocator,
+                                     VkRenderPass *                  pRenderPass ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateRenderPass2KHR( device, pCreateInfo, pAllocator, pRenderPass );
+    }
 
-      void vkCmdBeginRenderPass2KHR( VkCommandBuffer               commandBuffer,
-                                     const VkRenderPassBeginInfo * pRenderPassBegin,
-                                     const VkSubpassBeginInfo *    pSubpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginRenderPass2KHR( commandBuffer, pRenderPassBegin, pSubpassBeginInfo );
-      }
+    void vkCmdBeginRenderPass2KHR( VkCommandBuffer               commandBuffer,
+                                   const VkRenderPassBeginInfo * pRenderPassBegin,
+                                   const VkSubpassBeginInfo *    pSubpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginRenderPass2KHR( commandBuffer, pRenderPassBegin, pSubpassBeginInfo );
+    }
 
-      void vkCmdNextSubpass2KHR( VkCommandBuffer            commandBuffer,
-                                 const VkSubpassBeginInfo * pSubpassBeginInfo,
-                                 const VkSubpassEndInfo *   pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdNextSubpass2KHR( commandBuffer, pSubpassBeginInfo, pSubpassEndInfo );
-      }
+    void vkCmdNextSubpass2KHR( VkCommandBuffer            commandBuffer,
+                               const VkSubpassBeginInfo * pSubpassBeginInfo,
+                               const VkSubpassEndInfo *   pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdNextSubpass2KHR( commandBuffer, pSubpassBeginInfo, pSubpassEndInfo );
+    }
 
-      void vkCmdEndRenderPass2KHR( VkCommandBuffer commandBuffer, const VkSubpassEndInfo * pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRenderPass2KHR( commandBuffer, pSubpassEndInfo );
-      }
+    void vkCmdEndRenderPass2KHR( VkCommandBuffer commandBuffer, const VkSubpassEndInfo * pSubpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndRenderPass2KHR( commandBuffer, pSubpassEndInfo );
+    }
 
-      //=== VK_KHR_shared_presentable_image ===
+    //=== VK_KHR_shared_presentable_image ===
 
-      VkResult vkGetSwapchainStatusKHR( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainStatusKHR( device, swapchain );
-      }
+    VkResult vkGetSwapchainStatusKHR( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSwapchainStatusKHR( device, swapchain );
+    }
 
-      //=== VK_KHR_external_fence_capabilities ===
+    //=== VK_KHR_external_fence_capabilities ===
 
-      void vkGetPhysicalDeviceExternalFencePropertiesKHR( VkPhysicalDevice                          physicalDevice,
-                                                          const VkPhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                                          VkExternalFenceProperties *               pExternalFenceProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalFencePropertiesKHR( physicalDevice, pExternalFenceInfo, pExternalFenceProperties );
-      }
+    void vkGetPhysicalDeviceExternalFencePropertiesKHR( VkPhysicalDevice                          physicalDevice,
+                                                        const VkPhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                                        VkExternalFenceProperties *               pExternalFenceProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceExternalFencePropertiesKHR( physicalDevice, pExternalFenceInfo, pExternalFenceProperties );
+    }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_KHR_external_fence_win32 ===
+    //=== VK_KHR_external_fence_win32 ===
 
-      VkResult vkImportFenceWin32HandleKHR( VkDevice device, const VkImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkImportFenceWin32HandleKHR( device, pImportFenceWin32HandleInfo );
-      }
+    VkResult vkImportFenceWin32HandleKHR( VkDevice device, const VkImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkImportFenceWin32HandleKHR( device, pImportFenceWin32HandleInfo );
+    }
 
-      VkResult vkGetFenceWin32HandleKHR( VkDevice device, const VkFenceGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetFenceWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
-      }
+    VkResult vkGetFenceWin32HandleKHR( VkDevice device, const VkFenceGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetFenceWin32HandleKHR( device, pGetWin32HandleInfo, pHandle );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_KHR_external_fence_fd ===
+    //=== VK_KHR_external_fence_fd ===
 
-      VkResult vkImportFenceFdKHR( VkDevice device, const VkImportFenceFdInfoKHR * pImportFenceFdInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkImportFenceFdKHR( device, pImportFenceFdInfo );
-      }
+    VkResult vkImportFenceFdKHR( VkDevice device, const VkImportFenceFdInfoKHR * pImportFenceFdInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkImportFenceFdKHR( device, pImportFenceFdInfo );
+    }
 
-      VkResult vkGetFenceFdKHR( VkDevice device, const VkFenceGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetFenceFdKHR( device, pGetFdInfo, pFd );
-      }
+    VkResult vkGetFenceFdKHR( VkDevice device, const VkFenceGetFdInfoKHR * pGetFdInfo, int * pFd ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetFenceFdKHR( device, pGetFdInfo, pFd );
+    }
 
-      //=== VK_KHR_performance_query ===
+    //=== VK_KHR_performance_query ===
 
-      VkResult
-        vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( VkPhysicalDevice                     physicalDevice,
-                                                                         uint32_t                             queueFamilyIndex,
-                                                                         uint32_t *                           pCounterCount,
-                                                                         VkPerformanceCounterKHR *            pCounters,
-                                                                         VkPerformanceCounterDescriptionKHR * pCounterDescriptions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
-          physicalDevice, queueFamilyIndex, pCounterCount, pCounters, pCounterDescriptions );
-      }
+    VkResult
+      vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( VkPhysicalDevice                     physicalDevice,
+                                                                       uint32_t                             queueFamilyIndex,
+                                                                       uint32_t *                           pCounterCount,
+                                                                       VkPerformanceCounterKHR *            pCounters,
+                                                                       VkPerformanceCounterDescriptionKHR * pCounterDescriptions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+        physicalDevice, queueFamilyIndex, pCounterCount, pCounters, pCounterDescriptions );
+    }
 
-      void vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( VkPhysicalDevice                            physicalDevice,
-                                                                    const VkQueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
-                                                                    uint32_t *                                  pNumPasses ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( physicalDevice, pPerformanceQueryCreateInfo, pNumPasses );
-      }
+    void vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( VkPhysicalDevice                            physicalDevice,
+                                                                  const VkQueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
+                                                                  uint32_t *                                  pNumPasses ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( physicalDevice, pPerformanceQueryCreateInfo, pNumPasses );
+    }
 
-      VkResult vkAcquireProfilingLockKHR( VkDevice device, const VkAcquireProfilingLockInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireProfilingLockKHR( device, pInfo );
-      }
+    VkResult vkAcquireProfilingLockKHR( VkDevice device, const VkAcquireProfilingLockInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireProfilingLockKHR( device, pInfo );
+    }
 
-      void vkReleaseProfilingLockKHR( VkDevice device ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseProfilingLockKHR( device );
-      }
+    void vkReleaseProfilingLockKHR( VkDevice device ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkReleaseProfilingLockKHR( device );
+    }
 
-      //=== VK_KHR_get_surface_capabilities2 ===
+    //=== VK_KHR_get_surface_capabilities2 ===
 
-      VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR( VkPhysicalDevice                        physicalDevice,
-                                                           const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                           VkSurfaceCapabilities2KHR *             pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceCapabilities2KHR( physicalDevice, pSurfaceInfo, pSurfaceCapabilities );
-      }
+    VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR( VkPhysicalDevice                        physicalDevice,
+                                                         const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                         VkSurfaceCapabilities2KHR *             pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceCapabilities2KHR( physicalDevice, pSurfaceInfo, pSurfaceCapabilities );
+    }
 
-      VkResult vkGetPhysicalDeviceSurfaceFormats2KHR( VkPhysicalDevice                        physicalDevice,
-                                                      const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                      uint32_t *                              pSurfaceFormatCount,
-                                                      VkSurfaceFormat2KHR *                   pSurfaceFormats ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfaceFormats2KHR( physicalDevice, pSurfaceInfo, pSurfaceFormatCount, pSurfaceFormats );
-      }
+    VkResult vkGetPhysicalDeviceSurfaceFormats2KHR( VkPhysicalDevice                        physicalDevice,
+                                                    const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                    uint32_t *                              pSurfaceFormatCount,
+                                                    VkSurfaceFormat2KHR *                   pSurfaceFormats ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfaceFormats2KHR( physicalDevice, pSurfaceInfo, pSurfaceFormatCount, pSurfaceFormats );
+    }
 
-      //=== VK_KHR_get_display_properties2 ===
+    //=== VK_KHR_get_display_properties2 ===
 
-      VkResult vkGetPhysicalDeviceDisplayProperties2KHR( VkPhysicalDevice          physicalDevice,
-                                                         uint32_t *                pPropertyCount,
-                                                         VkDisplayProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceDisplayProperties2KHR( physicalDevice, pPropertyCount, pProperties );
-      }
+    VkResult vkGetPhysicalDeviceDisplayProperties2KHR( VkPhysicalDevice          physicalDevice,
+                                                       uint32_t *                pPropertyCount,
+                                                       VkDisplayProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceDisplayProperties2KHR( physicalDevice, pPropertyCount, pProperties );
+    }
 
-      VkResult vkGetPhysicalDeviceDisplayPlaneProperties2KHR( VkPhysicalDevice               physicalDevice,
-                                                              uint32_t *                     pPropertyCount,
-                                                              VkDisplayPlaneProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceDisplayPlaneProperties2KHR( physicalDevice, pPropertyCount, pProperties );
-      }
+    VkResult vkGetPhysicalDeviceDisplayPlaneProperties2KHR( VkPhysicalDevice               physicalDevice,
+                                                            uint32_t *                     pPropertyCount,
+                                                            VkDisplayPlaneProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceDisplayPlaneProperties2KHR( physicalDevice, pPropertyCount, pProperties );
+    }
 
-      VkResult vkGetDisplayModeProperties2KHR( VkPhysicalDevice              physicalDevice,
-                                               VkDisplayKHR                  display,
-                                               uint32_t *                    pPropertyCount,
-                                               VkDisplayModeProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDisplayModeProperties2KHR( physicalDevice, display, pPropertyCount, pProperties );
-      }
+    VkResult vkGetDisplayModeProperties2KHR( VkPhysicalDevice              physicalDevice,
+                                             VkDisplayKHR                  display,
+                                             uint32_t *                    pPropertyCount,
+                                             VkDisplayModeProperties2KHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDisplayModeProperties2KHR( physicalDevice, display, pPropertyCount, pProperties );
+    }
 
-      VkResult vkGetDisplayPlaneCapabilities2KHR( VkPhysicalDevice                 physicalDevice,
-                                                  const VkDisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
-                                                  VkDisplayPlaneCapabilities2KHR * pCapabilities ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDisplayPlaneCapabilities2KHR( physicalDevice, pDisplayPlaneInfo, pCapabilities );
-      }
+    VkResult vkGetDisplayPlaneCapabilities2KHR( VkPhysicalDevice                 physicalDevice,
+                                                const VkDisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
+                                                VkDisplayPlaneCapabilities2KHR * pCapabilities ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDisplayPlaneCapabilities2KHR( physicalDevice, pDisplayPlaneInfo, pCapabilities );
+    }
 
 #  if defined( VK_USE_PLATFORM_IOS_MVK )
-      //=== VK_MVK_ios_surface ===
+    //=== VK_MVK_ios_surface ===
 
-      VkResult vkCreateIOSSurfaceMVK( VkInstance                        instance,
-                                      const VkIOSSurfaceCreateInfoMVK * pCreateInfo,
-                                      const VkAllocationCallbacks *     pAllocator,
-                                      VkSurfaceKHR *                    pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateIOSSurfaceMVK( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateIOSSurfaceMVK( VkInstance                        instance,
+                                    const VkIOSSurfaceCreateInfoMVK * pCreateInfo,
+                                    const VkAllocationCallbacks *     pAllocator,
+                                    VkSurfaceKHR *                    pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateIOSSurfaceMVK( instance, pCreateInfo, pAllocator, pSurface );
+    }
 #  endif /*VK_USE_PLATFORM_IOS_MVK*/
 
 #  if defined( VK_USE_PLATFORM_MACOS_MVK )
-      //=== VK_MVK_macos_surface ===
+    //=== VK_MVK_macos_surface ===
 
-      VkResult vkCreateMacOSSurfaceMVK( VkInstance                          instance,
-                                        const VkMacOSSurfaceCreateInfoMVK * pCreateInfo,
-                                        const VkAllocationCallbacks *       pAllocator,
-                                        VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateMacOSSurfaceMVK( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateMacOSSurfaceMVK( VkInstance                          instance,
+                                      const VkMacOSSurfaceCreateInfoMVK * pCreateInfo,
+                                      const VkAllocationCallbacks *       pAllocator,
+                                      VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateMacOSSurfaceMVK( instance, pCreateInfo, pAllocator, pSurface );
+    }
 #  endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
-      //=== VK_EXT_debug_utils ===
+    //=== VK_EXT_debug_utils ===
 
-      VkResult vkSetDebugUtilsObjectNameEXT( VkDevice device, const VkDebugUtilsObjectNameInfoEXT * pNameInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetDebugUtilsObjectNameEXT( device, pNameInfo );
-      }
+    VkResult vkSetDebugUtilsObjectNameEXT( VkDevice device, const VkDebugUtilsObjectNameInfoEXT * pNameInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetDebugUtilsObjectNameEXT( device, pNameInfo );
+    }
 
-      VkResult vkSetDebugUtilsObjectTagEXT( VkDevice device, const VkDebugUtilsObjectTagInfoEXT * pTagInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetDebugUtilsObjectTagEXT( device, pTagInfo );
-      }
+    VkResult vkSetDebugUtilsObjectTagEXT( VkDevice device, const VkDebugUtilsObjectTagInfoEXT * pTagInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetDebugUtilsObjectTagEXT( device, pTagInfo );
+    }
 
-      void vkQueueBeginDebugUtilsLabelEXT( VkQueue queue, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueBeginDebugUtilsLabelEXT( queue, pLabelInfo );
-      }
+    void vkQueueBeginDebugUtilsLabelEXT( VkQueue queue, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueBeginDebugUtilsLabelEXT( queue, pLabelInfo );
+    }
 
-      void vkQueueEndDebugUtilsLabelEXT( VkQueue queue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueEndDebugUtilsLabelEXT( queue );
-      }
+    void vkQueueEndDebugUtilsLabelEXT( VkQueue queue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueEndDebugUtilsLabelEXT( queue );
+    }
 
-      void vkQueueInsertDebugUtilsLabelEXT( VkQueue queue, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueInsertDebugUtilsLabelEXT( queue, pLabelInfo );
-      }
+    void vkQueueInsertDebugUtilsLabelEXT( VkQueue queue, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueInsertDebugUtilsLabelEXT( queue, pLabelInfo );
+    }
 
-      void vkCmdBeginDebugUtilsLabelEXT( VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginDebugUtilsLabelEXT( commandBuffer, pLabelInfo );
-      }
+    void vkCmdBeginDebugUtilsLabelEXT( VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBeginDebugUtilsLabelEXT( commandBuffer, pLabelInfo );
+    }
 
-      void vkCmdEndDebugUtilsLabelEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndDebugUtilsLabelEXT( commandBuffer );
-      }
+    void vkCmdEndDebugUtilsLabelEXT( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEndDebugUtilsLabelEXT( commandBuffer );
+    }
 
-      void vkCmdInsertDebugUtilsLabelEXT( VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdInsertDebugUtilsLabelEXT( commandBuffer, pLabelInfo );
-      }
+    void vkCmdInsertDebugUtilsLabelEXT( VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT * pLabelInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdInsertDebugUtilsLabelEXT( commandBuffer, pLabelInfo );
+    }
 
-      VkResult vkCreateDebugUtilsMessengerEXT( VkInstance                                 instance,
-                                               const VkDebugUtilsMessengerCreateInfoEXT * pCreateInfo,
-                                               const VkAllocationCallbacks *              pAllocator,
-                                               VkDebugUtilsMessengerEXT *                 pMessenger ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDebugUtilsMessengerEXT( instance, pCreateInfo, pAllocator, pMessenger );
-      }
+    VkResult vkCreateDebugUtilsMessengerEXT( VkInstance                                 instance,
+                                             const VkDebugUtilsMessengerCreateInfoEXT * pCreateInfo,
+                                             const VkAllocationCallbacks *              pAllocator,
+                                             VkDebugUtilsMessengerEXT *                 pMessenger ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDebugUtilsMessengerEXT( instance, pCreateInfo, pAllocator, pMessenger );
+    }
 
-      void vkDestroyDebugUtilsMessengerEXT( VkInstance                    instance,
-                                            VkDebugUtilsMessengerEXT      messenger,
-                                            const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDebugUtilsMessengerEXT( instance, messenger, pAllocator );
-      }
+    void vkDestroyDebugUtilsMessengerEXT( VkInstance                    instance,
+                                          VkDebugUtilsMessengerEXT      messenger,
+                                          const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDebugUtilsMessengerEXT( instance, messenger, pAllocator );
+    }
 
-      void vkSubmitDebugUtilsMessageEXT( VkInstance                                   instance,
-                                         VkDebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                         VkDebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                         const VkDebugUtilsMessengerCallbackDataEXT * pCallbackData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSubmitDebugUtilsMessageEXT( instance, messageSeverity, messageTypes, pCallbackData );
-      }
+    void vkSubmitDebugUtilsMessageEXT( VkInstance                                   instance,
+                                       VkDebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                       VkDebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                       const VkDebugUtilsMessengerCallbackDataEXT * pCallbackData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSubmitDebugUtilsMessageEXT( instance, messageSeverity, messageTypes, pCallbackData );
+    }
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      //=== VK_ANDROID_external_memory_android_hardware_buffer ===
+    //=== VK_ANDROID_external_memory_android_hardware_buffer ===
 
-      VkResult vkGetAndroidHardwareBufferPropertiesANDROID( VkDevice                                   device,
-                                                            const struct AHardwareBuffer *             buffer,
-                                                            VkAndroidHardwareBufferPropertiesANDROID * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAndroidHardwareBufferPropertiesANDROID( device, buffer, pProperties );
-      }
+    VkResult vkGetAndroidHardwareBufferPropertiesANDROID( VkDevice                                   device,
+                                                          const struct AHardwareBuffer *             buffer,
+                                                          VkAndroidHardwareBufferPropertiesANDROID * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAndroidHardwareBufferPropertiesANDROID( device, buffer, pProperties );
+    }
 
-      VkResult vkGetMemoryAndroidHardwareBufferANDROID( VkDevice                                            device,
-                                                        const VkMemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
-                                                        struct AHardwareBuffer **                           pBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryAndroidHardwareBufferANDROID( device, pInfo, pBuffer );
-      }
+    VkResult vkGetMemoryAndroidHardwareBufferANDROID( VkDevice                                            device,
+                                                      const VkMemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
+                                                      struct AHardwareBuffer **                           pBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryAndroidHardwareBufferANDROID( device, pInfo, pBuffer );
+    }
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
-      //=== VK_AMDX_shader_enqueue ===
+    //=== VK_AMDX_shader_enqueue ===
 
-      VkResult vkCreateExecutionGraphPipelinesAMDX( VkDevice                                       device,
-                                                    VkPipelineCache                                pipelineCache,
-                                                    uint32_t                                       createInfoCount,
-                                                    const VkExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
-                                                    const VkAllocationCallbacks *                  pAllocator,
-                                                    VkPipeline *                                   pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateExecutionGraphPipelinesAMDX( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
+    VkResult vkCreateExecutionGraphPipelinesAMDX( VkDevice                                       device,
+                                                  VkPipelineCache                                pipelineCache,
+                                                  uint32_t                                       createInfoCount,
+                                                  const VkExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
+                                                  const VkAllocationCallbacks *                  pAllocator,
+                                                  VkPipeline *                                   pPipelines ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateExecutionGraphPipelinesAMDX( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
+    }
 
-      VkResult vkGetExecutionGraphPipelineScratchSizeAMDX( VkDevice                                  device,
-                                                           VkPipeline                                executionGraph,
-                                                           VkExecutionGraphPipelineScratchSizeAMDX * pSizeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetExecutionGraphPipelineScratchSizeAMDX( device, executionGraph, pSizeInfo );
-      }
+    VkResult vkGetExecutionGraphPipelineScratchSizeAMDX( VkDevice                                  device,
+                                                         VkPipeline                                executionGraph,
+                                                         VkExecutionGraphPipelineScratchSizeAMDX * pSizeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetExecutionGraphPipelineScratchSizeAMDX( device, executionGraph, pSizeInfo );
+    }
 
-      VkResult vkGetExecutionGraphPipelineNodeIndexAMDX( VkDevice                                        device,
-                                                         VkPipeline                                      executionGraph,
-                                                         const VkPipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
-                                                         uint32_t *                                      pNodeIndex ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetExecutionGraphPipelineNodeIndexAMDX( device, executionGraph, pNodeInfo, pNodeIndex );
-      }
+    VkResult vkGetExecutionGraphPipelineNodeIndexAMDX( VkDevice                                        device,
+                                                       VkPipeline                                      executionGraph,
+                                                       const VkPipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
+                                                       uint32_t *                                      pNodeIndex ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetExecutionGraphPipelineNodeIndexAMDX( device, executionGraph, pNodeInfo, pNodeIndex );
+    }
 
-      void vkCmdInitializeGraphScratchMemoryAMDX( VkCommandBuffer commandBuffer,
-                                                  VkPipeline      executionGraph,
-                                                  VkDeviceAddress scratch,
-                                                  VkDeviceSize    scratchSize ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdInitializeGraphScratchMemoryAMDX( commandBuffer, executionGraph, scratch, scratchSize );
-      }
+    void vkCmdInitializeGraphScratchMemoryAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdInitializeGraphScratchMemoryAMDX( commandBuffer, scratch );
+    }
 
-      void vkCmdDispatchGraphAMDX( VkCommandBuffer                      commandBuffer,
-                                   VkDeviceAddress                      scratch,
-                                   VkDeviceSize                         scratchSize,
-                                   const VkDispatchGraphCountInfoAMDX * pCountInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchGraphAMDX( commandBuffer, scratch, scratchSize, pCountInfo );
-      }
+    void vkCmdDispatchGraphAMDX( VkCommandBuffer                      commandBuffer,
+                                 VkDeviceAddress                      scratch,
+                                 const VkDispatchGraphCountInfoAMDX * pCountInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchGraphAMDX( commandBuffer, scratch, pCountInfo );
+    }
 
-      void vkCmdDispatchGraphIndirectAMDX( VkCommandBuffer                      commandBuffer,
-                                           VkDeviceAddress                      scratch,
-                                           VkDeviceSize                         scratchSize,
-                                           const VkDispatchGraphCountInfoAMDX * pCountInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchGraphIndirectAMDX( commandBuffer, scratch, scratchSize, pCountInfo );
-      }
+    void vkCmdDispatchGraphIndirectAMDX( VkCommandBuffer                      commandBuffer,
+                                         VkDeviceAddress                      scratch,
+                                         const VkDispatchGraphCountInfoAMDX * pCountInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchGraphIndirectAMDX( commandBuffer, scratch, pCountInfo );
+    }
 
-      void vkCmdDispatchGraphIndirectCountAMDX( VkCommandBuffer commandBuffer,
-                                                VkDeviceAddress scratch,
-                                                VkDeviceSize    scratchSize,
-                                                VkDeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchGraphIndirectCountAMDX( commandBuffer, scratch, scratchSize, countInfo );
-      }
+    void vkCmdDispatchGraphIndirectCountAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDispatchGraphIndirectCountAMDX( commandBuffer, scratch, countInfo );
+    }
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-      //=== VK_EXT_sample_locations ===
+    //=== VK_EXT_sample_locations ===
 
-      void vkCmdSetSampleLocationsEXT( VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT * pSampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetSampleLocationsEXT( commandBuffer, pSampleLocationsInfo );
-      }
+    void vkCmdSetSampleLocationsEXT( VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT * pSampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetSampleLocationsEXT( commandBuffer, pSampleLocationsInfo );
+    }
 
-      void vkGetPhysicalDeviceMultisamplePropertiesEXT( VkPhysicalDevice             physicalDevice,
-                                                        VkSampleCountFlagBits        samples,
-                                                        VkMultisamplePropertiesEXT * pMultisampleProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceMultisamplePropertiesEXT( physicalDevice, samples, pMultisampleProperties );
-      }
+    void vkGetPhysicalDeviceMultisamplePropertiesEXT( VkPhysicalDevice             physicalDevice,
+                                                      VkSampleCountFlagBits        samples,
+                                                      VkMultisamplePropertiesEXT * pMultisampleProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceMultisamplePropertiesEXT( physicalDevice, samples, pMultisampleProperties );
+    }
 
-      //=== VK_KHR_get_memory_requirements2 ===
+    //=== VK_KHR_get_memory_requirements2 ===
 
-      void vkGetImageMemoryRequirements2KHR( VkDevice                               device,
-                                             const VkImageMemoryRequirementsInfo2 * pInfo,
-                                             VkMemoryRequirements2 *                pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageMemoryRequirements2KHR( device, pInfo, pMemoryRequirements );
-      }
+    void vkGetImageMemoryRequirements2KHR( VkDevice                               device,
+                                           const VkImageMemoryRequirementsInfo2 * pInfo,
+                                           VkMemoryRequirements2 *                pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageMemoryRequirements2KHR( device, pInfo, pMemoryRequirements );
+    }
 
-      void vkGetBufferMemoryRequirements2KHR( VkDevice                                device,
-                                              const VkBufferMemoryRequirementsInfo2 * pInfo,
-                                              VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferMemoryRequirements2KHR( device, pInfo, pMemoryRequirements );
-      }
+    void vkGetBufferMemoryRequirements2KHR( VkDevice                                device,
+                                            const VkBufferMemoryRequirementsInfo2 * pInfo,
+                                            VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferMemoryRequirements2KHR( device, pInfo, pMemoryRequirements );
+    }
 
-      void vkGetImageSparseMemoryRequirements2KHR( VkDevice                                     device,
-                                                   const VkImageSparseMemoryRequirementsInfo2 * pInfo,
-                                                   uint32_t *                                   pSparseMemoryRequirementCount,
-                                                   VkSparseImageMemoryRequirements2 *           pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSparseMemoryRequirements2KHR( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
-      }
+    void vkGetImageSparseMemoryRequirements2KHR( VkDevice                                     device,
+                                                 const VkImageSparseMemoryRequirementsInfo2 * pInfo,
+                                                 uint32_t *                                   pSparseMemoryRequirementCount,
+                                                 VkSparseImageMemoryRequirements2 *           pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSparseMemoryRequirements2KHR( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
+    }
 
-      //=== VK_KHR_acceleration_structure ===
+    //=== VK_KHR_acceleration_structure ===
 
-      VkResult vkCreateAccelerationStructureKHR( VkDevice                                     device,
-                                                 const VkAccelerationStructureCreateInfoKHR * pCreateInfo,
-                                                 const VkAllocationCallbacks *                pAllocator,
-                                                 VkAccelerationStructureKHR *                 pAccelerationStructure ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateAccelerationStructureKHR( device, pCreateInfo, pAllocator, pAccelerationStructure );
-      }
+    VkResult vkCreateAccelerationStructureKHR( VkDevice                                     device,
+                                               const VkAccelerationStructureCreateInfoKHR * pCreateInfo,
+                                               const VkAllocationCallbacks *                pAllocator,
+                                               VkAccelerationStructureKHR *                 pAccelerationStructure ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateAccelerationStructureKHR( device, pCreateInfo, pAllocator, pAccelerationStructure );
+    }
 
-      void vkDestroyAccelerationStructureKHR( VkDevice                      device,
-                                              VkAccelerationStructureKHR    accelerationStructure,
-                                              const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyAccelerationStructureKHR( device, accelerationStructure, pAllocator );
-      }
+    void vkDestroyAccelerationStructureKHR( VkDevice                      device,
+                                            VkAccelerationStructureKHR    accelerationStructure,
+                                            const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyAccelerationStructureKHR( device, accelerationStructure, pAllocator );
+    }
 
-      void vkCmdBuildAccelerationStructuresKHR( VkCommandBuffer                                          commandBuffer,
-                                                uint32_t                                                 infoCount,
-                                                const VkAccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                                const VkAccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildAccelerationStructuresKHR( commandBuffer, infoCount, pInfos, ppBuildRangeInfos );
-      }
+    void vkCmdBuildAccelerationStructuresKHR( VkCommandBuffer                                          commandBuffer,
+                                              uint32_t                                                 infoCount,
+                                              const VkAccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                              const VkAccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBuildAccelerationStructuresKHR( commandBuffer, infoCount, pInfos, ppBuildRangeInfos );
+    }
 
-      void vkCmdBuildAccelerationStructuresIndirectKHR( VkCommandBuffer                                     commandBuffer,
-                                                        uint32_t                                            infoCount,
-                                                        const VkAccelerationStructureBuildGeometryInfoKHR * pInfos,
-                                                        const VkDeviceAddress *                             pIndirectDeviceAddresses,
-                                                        const uint32_t *                                    pIndirectStrides,
-                                                        const uint32_t * const *                            ppMaxPrimitiveCounts ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildAccelerationStructuresIndirectKHR(
-          commandBuffer, infoCount, pInfos, pIndirectDeviceAddresses, pIndirectStrides, ppMaxPrimitiveCounts );
-      }
+    void vkCmdBuildAccelerationStructuresIndirectKHR( VkCommandBuffer                                     commandBuffer,
+                                                      uint32_t                                            infoCount,
+                                                      const VkAccelerationStructureBuildGeometryInfoKHR * pInfos,
+                                                      const VkDeviceAddress *                             pIndirectDeviceAddresses,
+                                                      const uint32_t *                                    pIndirectStrides,
+                                                      const uint32_t * const *                            ppMaxPrimitiveCounts ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBuildAccelerationStructuresIndirectKHR(
+        commandBuffer, infoCount, pInfos, pIndirectDeviceAddresses, pIndirectStrides, ppMaxPrimitiveCounts );
+    }
 
-      VkResult vkBuildAccelerationStructuresKHR( VkDevice                                                 device,
-                                                 VkDeferredOperationKHR                                   deferredOperation,
-                                                 uint32_t                                                 infoCount,
-                                                 const VkAccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                                 const VkAccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBuildAccelerationStructuresKHR( device, deferredOperation, infoCount, pInfos, ppBuildRangeInfos );
-      }
+    VkResult vkBuildAccelerationStructuresKHR( VkDevice                                                 device,
+                                               VkDeferredOperationKHR                                   deferredOperation,
+                                               uint32_t                                                 infoCount,
+                                               const VkAccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                               const VkAccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBuildAccelerationStructuresKHR( device, deferredOperation, infoCount, pInfos, ppBuildRangeInfos );
+    }
 
-      VkResult vkCopyAccelerationStructureKHR( VkDevice                                   device,
-                                               VkDeferredOperationKHR                     deferredOperation,
-                                               const VkCopyAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyAccelerationStructureKHR( device, deferredOperation, pInfo );
-      }
+    VkResult vkCopyAccelerationStructureKHR( VkDevice                                   device,
+                                             VkDeferredOperationKHR                     deferredOperation,
+                                             const VkCopyAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyAccelerationStructureKHR( device, deferredOperation, pInfo );
+    }
 
-      VkResult vkCopyAccelerationStructureToMemoryKHR( VkDevice                                           device,
-                                                       VkDeferredOperationKHR                             deferredOperation,
-                                                       const VkCopyAccelerationStructureToMemoryInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyAccelerationStructureToMemoryKHR( device, deferredOperation, pInfo );
-      }
+    VkResult vkCopyAccelerationStructureToMemoryKHR( VkDevice                                           device,
+                                                     VkDeferredOperationKHR                             deferredOperation,
+                                                     const VkCopyAccelerationStructureToMemoryInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyAccelerationStructureToMemoryKHR( device, deferredOperation, pInfo );
+    }
 
-      VkResult vkCopyMemoryToAccelerationStructureKHR( VkDevice                                           device,
-                                                       VkDeferredOperationKHR                             deferredOperation,
-                                                       const VkCopyMemoryToAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMemoryToAccelerationStructureKHR( device, deferredOperation, pInfo );
-      }
+    VkResult vkCopyMemoryToAccelerationStructureKHR( VkDevice                                           device,
+                                                     VkDeferredOperationKHR                             deferredOperation,
+                                                     const VkCopyMemoryToAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyMemoryToAccelerationStructureKHR( device, deferredOperation, pInfo );
+    }
 
-      VkResult vkWriteAccelerationStructuresPropertiesKHR( VkDevice                           device,
-                                                           uint32_t                           accelerationStructureCount,
-                                                           const VkAccelerationStructureKHR * pAccelerationStructures,
-                                                           VkQueryType                        queryType,
-                                                           size_t                             dataSize,
-                                                           void *                             pData,
-                                                           size_t                             stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWriteAccelerationStructuresPropertiesKHR( device, accelerationStructureCount, pAccelerationStructures, queryType, dataSize, pData, stride );
-      }
+    VkResult vkWriteAccelerationStructuresPropertiesKHR( VkDevice                           device,
+                                                         uint32_t                           accelerationStructureCount,
+                                                         const VkAccelerationStructureKHR * pAccelerationStructures,
+                                                         VkQueryType                        queryType,
+                                                         size_t                             dataSize,
+                                                         void *                             pData,
+                                                         size_t                             stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWriteAccelerationStructuresPropertiesKHR( device, accelerationStructureCount, pAccelerationStructures, queryType, dataSize, pData, stride );
+    }
 
-      void vkCmdCopyAccelerationStructureKHR( VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyAccelerationStructureKHR( commandBuffer, pInfo );
-      }
+    void vkCmdCopyAccelerationStructureKHR( VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyAccelerationStructureKHR( commandBuffer, pInfo );
+    }
 
-      void vkCmdCopyAccelerationStructureToMemoryKHR( VkCommandBuffer                                    commandBuffer,
-                                                      const VkCopyAccelerationStructureToMemoryInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyAccelerationStructureToMemoryKHR( commandBuffer, pInfo );
-      }
+    void vkCmdCopyAccelerationStructureToMemoryKHR( VkCommandBuffer                                    commandBuffer,
+                                                    const VkCopyAccelerationStructureToMemoryInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyAccelerationStructureToMemoryKHR( commandBuffer, pInfo );
+    }
 
-      void vkCmdCopyMemoryToAccelerationStructureKHR( VkCommandBuffer                                    commandBuffer,
-                                                      const VkCopyMemoryToAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryToAccelerationStructureKHR( commandBuffer, pInfo );
-      }
+    void vkCmdCopyMemoryToAccelerationStructureKHR( VkCommandBuffer                                    commandBuffer,
+                                                    const VkCopyMemoryToAccelerationStructureInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMemoryToAccelerationStructureKHR( commandBuffer, pInfo );
+    }
 
-      VkDeviceAddress vkGetAccelerationStructureDeviceAddressKHR( VkDevice                                            device,
-                                                                  const VkAccelerationStructureDeviceAddressInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAccelerationStructureDeviceAddressKHR( device, pInfo );
-      }
+    VkDeviceAddress vkGetAccelerationStructureDeviceAddressKHR( VkDevice                                            device,
+                                                                const VkAccelerationStructureDeviceAddressInfoKHR * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAccelerationStructureDeviceAddressKHR( device, pInfo );
+    }
 
-      void vkCmdWriteAccelerationStructuresPropertiesKHR( VkCommandBuffer                    commandBuffer,
-                                                          uint32_t                           accelerationStructureCount,
-                                                          const VkAccelerationStructureKHR * pAccelerationStructures,
-                                                          VkQueryType                        queryType,
-                                                          VkQueryPool                        queryPool,
-                                                          uint32_t                           firstQuery ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteAccelerationStructuresPropertiesKHR(
-          commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery );
-      }
+    void vkCmdWriteAccelerationStructuresPropertiesKHR( VkCommandBuffer                    commandBuffer,
+                                                        uint32_t                           accelerationStructureCount,
+                                                        const VkAccelerationStructureKHR * pAccelerationStructures,
+                                                        VkQueryType                        queryType,
+                                                        VkQueryPool                        queryPool,
+                                                        uint32_t                           firstQuery ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteAccelerationStructuresPropertiesKHR(
+        commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery );
+    }
 
-      void vkGetDeviceAccelerationStructureCompatibilityKHR( VkDevice                                      device,
-                                                             const VkAccelerationStructureVersionInfoKHR * pVersionInfo,
-                                                             VkAccelerationStructureCompatibilityKHR *     pCompatibility ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceAccelerationStructureCompatibilityKHR( device, pVersionInfo, pCompatibility );
-      }
+    void vkGetDeviceAccelerationStructureCompatibilityKHR( VkDevice                                      device,
+                                                           const VkAccelerationStructureVersionInfoKHR * pVersionInfo,
+                                                           VkAccelerationStructureCompatibilityKHR *     pCompatibility ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceAccelerationStructureCompatibilityKHR( device, pVersionInfo, pCompatibility );
+    }
 
-      void vkGetAccelerationStructureBuildSizesKHR( VkDevice                                            device,
-                                                    VkAccelerationStructureBuildTypeKHR                 buildType,
-                                                    const VkAccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
-                                                    const uint32_t *                                    pMaxPrimitiveCounts,
-                                                    VkAccelerationStructureBuildSizesInfoKHR *          pSizeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAccelerationStructureBuildSizesKHR( device, buildType, pBuildInfo, pMaxPrimitiveCounts, pSizeInfo );
-      }
+    void vkGetAccelerationStructureBuildSizesKHR( VkDevice                                            device,
+                                                  VkAccelerationStructureBuildTypeKHR                 buildType,
+                                                  const VkAccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
+                                                  const uint32_t *                                    pMaxPrimitiveCounts,
+                                                  VkAccelerationStructureBuildSizesInfoKHR *          pSizeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAccelerationStructureBuildSizesKHR( device, buildType, pBuildInfo, pMaxPrimitiveCounts, pSizeInfo );
+    }
 
-      //=== VK_KHR_ray_tracing_pipeline ===
+    //=== VK_KHR_ray_tracing_pipeline ===
 
-      void vkCmdTraceRaysKHR( VkCommandBuffer                         commandBuffer,
-                              const VkStridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                              const VkStridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                              const VkStridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                              const VkStridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                              uint32_t                                width,
-                              uint32_t                                height,
-                              uint32_t                                depth ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdTraceRaysKHR(
-          commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, width, height, depth );
-      }
+    void vkCmdTraceRaysKHR( VkCommandBuffer                         commandBuffer,
+                            const VkStridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                            const VkStridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                            const VkStridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                            const VkStridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                            uint32_t                                width,
+                            uint32_t                                height,
+                            uint32_t                                depth ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdTraceRaysKHR(
+        commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, width, height, depth );
+    }
 
-      VkResult vkCreateRayTracingPipelinesKHR( VkDevice                                  device,
-                                               VkDeferredOperationKHR                    deferredOperation,
-                                               VkPipelineCache                           pipelineCache,
-                                               uint32_t                                  createInfoCount,
-                                               const VkRayTracingPipelineCreateInfoKHR * pCreateInfos,
-                                               const VkAllocationCallbacks *             pAllocator,
-                                               VkPipeline *                              pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateRayTracingPipelinesKHR( device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
+    VkResult vkCreateRayTracingPipelinesKHR( VkDevice                                  device,
+                                             VkDeferredOperationKHR                    deferredOperation,
+                                             VkPipelineCache                           pipelineCache,
+                                             uint32_t                                  createInfoCount,
+                                             const VkRayTracingPipelineCreateInfoKHR * pCreateInfos,
+                                             const VkAllocationCallbacks *             pAllocator,
+                                             VkPipeline *                              pPipelines ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateRayTracingPipelinesKHR( device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
+    }
 
-      VkResult vkGetRayTracingShaderGroupHandlesKHR(
-        VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRayTracingShaderGroupHandlesKHR( device, pipeline, firstGroup, groupCount, dataSize, pData );
-      }
+    VkResult vkGetRayTracingShaderGroupHandlesKHR(
+      VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRayTracingShaderGroupHandlesKHR( device, pipeline, firstGroup, groupCount, dataSize, pData );
+    }
 
-      VkResult vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
-        VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( device, pipeline, firstGroup, groupCount, dataSize, pData );
-      }
+    VkResult vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
+      VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( device, pipeline, firstGroup, groupCount, dataSize, pData );
+    }
 
-      void vkCmdTraceRaysIndirectKHR( VkCommandBuffer                         commandBuffer,
-                                      const VkStridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                                      const VkStridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                                      const VkStridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                                      const VkStridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                                      VkDeviceAddress                         indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdTraceRaysIndirectKHR(
-          commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, indirectDeviceAddress );
-      }
+    void vkCmdTraceRaysIndirectKHR( VkCommandBuffer                         commandBuffer,
+                                    const VkStridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                                    const VkStridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                                    const VkStridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                                    const VkStridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                                    VkDeviceAddress                         indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdTraceRaysIndirectKHR(
+        commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, indirectDeviceAddress );
+    }
 
-      VkDeviceSize vkGetRayTracingShaderGroupStackSizeKHR( VkDevice               device,
-                                                           VkPipeline             pipeline,
-                                                           uint32_t               group,
-                                                           VkShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRayTracingShaderGroupStackSizeKHR( device, pipeline, group, groupShader );
-      }
+    VkDeviceSize vkGetRayTracingShaderGroupStackSizeKHR( VkDevice               device,
+                                                         VkPipeline             pipeline,
+                                                         uint32_t               group,
+                                                         VkShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRayTracingShaderGroupStackSizeKHR( device, pipeline, group, groupShader );
+    }
 
-      void vkCmdSetRayTracingPipelineStackSizeKHR( VkCommandBuffer commandBuffer, uint32_t pipelineStackSize ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRayTracingPipelineStackSizeKHR( commandBuffer, pipelineStackSize );
-      }
+    void vkCmdSetRayTracingPipelineStackSizeKHR( VkCommandBuffer commandBuffer, uint32_t pipelineStackSize ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRayTracingPipelineStackSizeKHR( commandBuffer, pipelineStackSize );
+    }
 
-      //=== VK_KHR_sampler_ycbcr_conversion ===
+    //=== VK_KHR_sampler_ycbcr_conversion ===
 
-      VkResult vkCreateSamplerYcbcrConversionKHR( VkDevice                                   device,
-                                                  const VkSamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                                  const VkAllocationCallbacks *              pAllocator,
-                                                  VkSamplerYcbcrConversion *                 pYcbcrConversion ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSamplerYcbcrConversionKHR( device, pCreateInfo, pAllocator, pYcbcrConversion );
-      }
+    VkResult vkCreateSamplerYcbcrConversionKHR( VkDevice                                   device,
+                                                const VkSamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                                const VkAllocationCallbacks *              pAllocator,
+                                                VkSamplerYcbcrConversion *                 pYcbcrConversion ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateSamplerYcbcrConversionKHR( device, pCreateInfo, pAllocator, pYcbcrConversion );
+    }
 
-      void vkDestroySamplerYcbcrConversionKHR( VkDevice                      device,
-                                               VkSamplerYcbcrConversion      ycbcrConversion,
-                                               const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroySamplerYcbcrConversionKHR( device, ycbcrConversion, pAllocator );
-      }
-
-      //=== VK_KHR_bind_memory2 ===
-
-      VkResult vkBindBufferMemory2KHR( VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindBufferMemory2KHR( device, bindInfoCount, pBindInfos );
-      }
-
-      VkResult vkBindImageMemory2KHR( VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindImageMemory2KHR( device, bindInfoCount, pBindInfos );
-      }
-
-      //=== VK_EXT_image_drm_format_modifier ===
-
-      VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice                                device,
-                                                         VkImage                                 image,
-                                                         VkImageDrmFormatModifierPropertiesEXT * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageDrmFormatModifierPropertiesEXT( device, image, pProperties );
-      }
-
-      //=== VK_EXT_validation_cache ===
-
-      VkResult vkCreateValidationCacheEXT( VkDevice                               device,
-                                           const VkValidationCacheCreateInfoEXT * pCreateInfo,
-                                           const VkAllocationCallbacks *          pAllocator,
-                                           VkValidationCacheEXT *                 pValidationCache ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateValidationCacheEXT( device, pCreateInfo, pAllocator, pValidationCache );
-      }
-
-      void
-        vkDestroyValidationCacheEXT( VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyValidationCacheEXT( device, validationCache, pAllocator );
-      }
-
-      VkResult vkMergeValidationCachesEXT( VkDevice                     device,
-                                           VkValidationCacheEXT         dstCache,
-                                           uint32_t                     srcCacheCount,
-                                           const VkValidationCacheEXT * pSrcCaches ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkMergeValidationCachesEXT( device, dstCache, srcCacheCount, pSrcCaches );
-      }
-
-      VkResult vkGetValidationCacheDataEXT( VkDevice device, VkValidationCacheEXT validationCache, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetValidationCacheDataEXT( device, validationCache, pDataSize, pData );
-      }
-
-      //=== VK_NV_shading_rate_image ===
-
-      void vkCmdBindShadingRateImageNV( VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindShadingRateImageNV( commandBuffer, imageView, imageLayout );
-      }
-
-      void vkCmdSetViewportShadingRatePaletteNV( VkCommandBuffer                commandBuffer,
-                                                 uint32_t                       firstViewport,
-                                                 uint32_t                       viewportCount,
-                                                 const VkShadingRatePaletteNV * pShadingRatePalettes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportShadingRatePaletteNV( commandBuffer, firstViewport, viewportCount, pShadingRatePalettes );
-      }
-
-      void vkCmdSetCoarseSampleOrderNV( VkCommandBuffer                     commandBuffer,
-                                        VkCoarseSampleOrderTypeNV           sampleOrderType,
-                                        uint32_t                            customSampleOrderCount,
-                                        const VkCoarseSampleOrderCustomNV * pCustomSampleOrders ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoarseSampleOrderNV( commandBuffer, sampleOrderType, customSampleOrderCount, pCustomSampleOrders );
-      }
-
-      //=== VK_NV_ray_tracing ===
-
-      VkResult vkCreateAccelerationStructureNV( VkDevice                                    device,
-                                                const VkAccelerationStructureCreateInfoNV * pCreateInfo,
-                                                const VkAllocationCallbacks *               pAllocator,
-                                                VkAccelerationStructureNV *                 pAccelerationStructure ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateAccelerationStructureNV( device, pCreateInfo, pAllocator, pAccelerationStructure );
-      }
-
-      void vkDestroyAccelerationStructureNV( VkDevice                      device,
-                                             VkAccelerationStructureNV     accelerationStructure,
+    void vkDestroySamplerYcbcrConversionKHR( VkDevice                      device,
+                                             VkSamplerYcbcrConversion      ycbcrConversion,
                                              const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyAccelerationStructureNV( device, accelerationStructure, pAllocator );
-      }
+    {
+      return ::vkDestroySamplerYcbcrConversionKHR( device, ycbcrConversion, pAllocator );
+    }
 
-      void vkGetAccelerationStructureMemoryRequirementsNV( VkDevice                                                device,
-                                                           const VkAccelerationStructureMemoryRequirementsInfoNV * pInfo,
-                                                           VkMemoryRequirements2KHR * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAccelerationStructureMemoryRequirementsNV( device, pInfo, pMemoryRequirements );
-      }
+    //=== VK_KHR_bind_memory2 ===
 
-      VkResult vkBindAccelerationStructureMemoryNV( VkDevice                                        device,
-                                                    uint32_t                                        bindInfoCount,
-                                                    const VkBindAccelerationStructureMemoryInfoNV * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindAccelerationStructureMemoryNV( device, bindInfoCount, pBindInfos );
-      }
+    VkResult vkBindBufferMemory2KHR( VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindBufferMemory2KHR( device, bindInfoCount, pBindInfos );
+    }
 
-      void vkCmdBuildAccelerationStructureNV( VkCommandBuffer                       commandBuffer,
-                                              const VkAccelerationStructureInfoNV * pInfo,
-                                              VkBuffer                              instanceData,
-                                              VkDeviceSize                          instanceOffset,
-                                              VkBool32                              update,
-                                              VkAccelerationStructureNV             dst,
-                                              VkAccelerationStructureNV             src,
-                                              VkBuffer                              scratch,
-                                              VkDeviceSize                          scratchOffset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildAccelerationStructureNV( commandBuffer, pInfo, instanceData, instanceOffset, update, dst, src, scratch, scratchOffset );
-      }
+    VkResult vkBindImageMemory2KHR( VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo * pBindInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindImageMemory2KHR( device, bindInfoCount, pBindInfos );
+    }
 
-      void vkCmdCopyAccelerationStructureNV( VkCommandBuffer                    commandBuffer,
-                                             VkAccelerationStructureNV          dst,
-                                             VkAccelerationStructureNV          src,
-                                             VkCopyAccelerationStructureModeKHR mode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyAccelerationStructureNV( commandBuffer, dst, src, mode );
-      }
+    //=== VK_EXT_image_drm_format_modifier ===
 
-      void vkCmdTraceRaysNV( VkCommandBuffer commandBuffer,
-                             VkBuffer        raygenShaderBindingTableBuffer,
-                             VkDeviceSize    raygenShaderBindingOffset,
-                             VkBuffer        missShaderBindingTableBuffer,
-                             VkDeviceSize    missShaderBindingOffset,
-                             VkDeviceSize    missShaderBindingStride,
-                             VkBuffer        hitShaderBindingTableBuffer,
-                             VkDeviceSize    hitShaderBindingOffset,
-                             VkDeviceSize    hitShaderBindingStride,
-                             VkBuffer        callableShaderBindingTableBuffer,
-                             VkDeviceSize    callableShaderBindingOffset,
-                             VkDeviceSize    callableShaderBindingStride,
-                             uint32_t        width,
-                             uint32_t        height,
-                             uint32_t        depth ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdTraceRaysNV( commandBuffer,
-                                   raygenShaderBindingTableBuffer,
-                                   raygenShaderBindingOffset,
-                                   missShaderBindingTableBuffer,
-                                   missShaderBindingOffset,
-                                   missShaderBindingStride,
-                                   hitShaderBindingTableBuffer,
-                                   hitShaderBindingOffset,
-                                   hitShaderBindingStride,
-                                   callableShaderBindingTableBuffer,
-                                   callableShaderBindingOffset,
-                                   callableShaderBindingStride,
-                                   width,
-                                   height,
-                                   depth );
-      }
+    VkResult
+      vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageDrmFormatModifierPropertiesEXT( device, image, pProperties );
+    }
 
-      VkResult vkCreateRayTracingPipelinesNV( VkDevice                                 device,
-                                              VkPipelineCache                          pipelineCache,
-                                              uint32_t                                 createInfoCount,
-                                              const VkRayTracingPipelineCreateInfoNV * pCreateInfos,
-                                              const VkAllocationCallbacks *            pAllocator,
-                                              VkPipeline *                             pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateRayTracingPipelinesNV( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
+    //=== VK_EXT_validation_cache ===
 
-      VkResult vkGetRayTracingShaderGroupHandlesNV(
-        VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRayTracingShaderGroupHandlesNV( device, pipeline, firstGroup, groupCount, dataSize, pData );
-      }
+    VkResult vkCreateValidationCacheEXT( VkDevice                               device,
+                                         const VkValidationCacheCreateInfoEXT * pCreateInfo,
+                                         const VkAllocationCallbacks *          pAllocator,
+                                         VkValidationCacheEXT *                 pValidationCache ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateValidationCacheEXT( device, pCreateInfo, pAllocator, pValidationCache );
+    }
 
-      VkResult vkGetAccelerationStructureHandleNV( VkDevice                  device,
-                                                   VkAccelerationStructureNV accelerationStructure,
-                                                   size_t                    dataSize,
-                                                   void *                    pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAccelerationStructureHandleNV( device, accelerationStructure, dataSize, pData );
-      }
+    void
+      vkDestroyValidationCacheEXT( VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyValidationCacheEXT( device, validationCache, pAllocator );
+    }
 
-      void vkCmdWriteAccelerationStructuresPropertiesNV( VkCommandBuffer                   commandBuffer,
-                                                         uint32_t                          accelerationStructureCount,
-                                                         const VkAccelerationStructureNV * pAccelerationStructures,
-                                                         VkQueryType                       queryType,
-                                                         VkQueryPool                       queryPool,
-                                                         uint32_t                          firstQuery ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteAccelerationStructuresPropertiesNV(
-          commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery );
-      }
+    VkResult vkMergeValidationCachesEXT( VkDevice                     device,
+                                         VkValidationCacheEXT         dstCache,
+                                         uint32_t                     srcCacheCount,
+                                         const VkValidationCacheEXT * pSrcCaches ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkMergeValidationCachesEXT( device, dstCache, srcCacheCount, pSrcCaches );
+    }
 
-      VkResult vkCompileDeferredNV( VkDevice device, VkPipeline pipeline, uint32_t shader ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCompileDeferredNV( device, pipeline, shader );
-      }
+    VkResult vkGetValidationCacheDataEXT( VkDevice device, VkValidationCacheEXT validationCache, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetValidationCacheDataEXT( device, validationCache, pDataSize, pData );
+    }
 
-      //=== VK_KHR_maintenance3 ===
+    //=== VK_NV_shading_rate_image ===
 
-      void vkGetDescriptorSetLayoutSupportKHR( VkDevice                                device,
-                                               const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
-                                               VkDescriptorSetLayoutSupport *          pSupport ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetLayoutSupportKHR( device, pCreateInfo, pSupport );
-      }
+    void vkCmdBindShadingRateImageNV( VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindShadingRateImageNV( commandBuffer, imageView, imageLayout );
+    }
 
-      //=== VK_KHR_draw_indirect_count ===
+    void vkCmdSetViewportShadingRatePaletteNV( VkCommandBuffer                commandBuffer,
+                                               uint32_t                       firstViewport,
+                                               uint32_t                       viewportCount,
+                                               const VkShadingRatePaletteNV * pShadingRatePalettes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportShadingRatePaletteNV( commandBuffer, firstViewport, viewportCount, pShadingRatePalettes );
+    }
 
-      void vkCmdDrawIndirectCountKHR( VkCommandBuffer commandBuffer,
-                                      VkBuffer        buffer,
-                                      VkDeviceSize    offset,
-                                      VkBuffer        countBuffer,
-                                      VkDeviceSize    countBufferOffset,
-                                      uint32_t        maxDrawCount,
-                                      uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndirectCountKHR( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
+    void vkCmdSetCoarseSampleOrderNV( VkCommandBuffer                     commandBuffer,
+                                      VkCoarseSampleOrderTypeNV           sampleOrderType,
+                                      uint32_t                            customSampleOrderCount,
+                                      const VkCoarseSampleOrderCustomNV * pCustomSampleOrders ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoarseSampleOrderNV( commandBuffer, sampleOrderType, customSampleOrderCount, pCustomSampleOrders );
+    }
 
-      void vkCmdDrawIndexedIndirectCountKHR( VkCommandBuffer commandBuffer,
+    //=== VK_NV_ray_tracing ===
+
+    VkResult vkCreateAccelerationStructureNV( VkDevice                                    device,
+                                              const VkAccelerationStructureCreateInfoNV * pCreateInfo,
+                                              const VkAllocationCallbacks *               pAllocator,
+                                              VkAccelerationStructureNV *                 pAccelerationStructure ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateAccelerationStructureNV( device, pCreateInfo, pAllocator, pAccelerationStructure );
+    }
+
+    void vkDestroyAccelerationStructureNV( VkDevice                      device,
+                                           VkAccelerationStructureNV     accelerationStructure,
+                                           const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyAccelerationStructureNV( device, accelerationStructure, pAllocator );
+    }
+
+    void vkGetAccelerationStructureMemoryRequirementsNV( VkDevice                                                device,
+                                                         const VkAccelerationStructureMemoryRequirementsInfoNV * pInfo,
+                                                         VkMemoryRequirements2KHR *                              pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAccelerationStructureMemoryRequirementsNV( device, pInfo, pMemoryRequirements );
+    }
+
+    VkResult vkBindAccelerationStructureMemoryNV( VkDevice                                        device,
+                                                  uint32_t                                        bindInfoCount,
+                                                  const VkBindAccelerationStructureMemoryInfoNV * pBindInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindAccelerationStructureMemoryNV( device, bindInfoCount, pBindInfos );
+    }
+
+    void vkCmdBuildAccelerationStructureNV( VkCommandBuffer                       commandBuffer,
+                                            const VkAccelerationStructureInfoNV * pInfo,
+                                            VkBuffer                              instanceData,
+                                            VkDeviceSize                          instanceOffset,
+                                            VkBool32                              update,
+                                            VkAccelerationStructureNV             dst,
+                                            VkAccelerationStructureNV             src,
+                                            VkBuffer                              scratch,
+                                            VkDeviceSize                          scratchOffset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBuildAccelerationStructureNV( commandBuffer, pInfo, instanceData, instanceOffset, update, dst, src, scratch, scratchOffset );
+    }
+
+    void vkCmdCopyAccelerationStructureNV( VkCommandBuffer                    commandBuffer,
+                                           VkAccelerationStructureNV          dst,
+                                           VkAccelerationStructureNV          src,
+                                           VkCopyAccelerationStructureModeKHR mode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyAccelerationStructureNV( commandBuffer, dst, src, mode );
+    }
+
+    void vkCmdTraceRaysNV( VkCommandBuffer commandBuffer,
+                           VkBuffer        raygenShaderBindingTableBuffer,
+                           VkDeviceSize    raygenShaderBindingOffset,
+                           VkBuffer        missShaderBindingTableBuffer,
+                           VkDeviceSize    missShaderBindingOffset,
+                           VkDeviceSize    missShaderBindingStride,
+                           VkBuffer        hitShaderBindingTableBuffer,
+                           VkDeviceSize    hitShaderBindingOffset,
+                           VkDeviceSize    hitShaderBindingStride,
+                           VkBuffer        callableShaderBindingTableBuffer,
+                           VkDeviceSize    callableShaderBindingOffset,
+                           VkDeviceSize    callableShaderBindingStride,
+                           uint32_t        width,
+                           uint32_t        height,
+                           uint32_t        depth ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdTraceRaysNV( commandBuffer,
+                                 raygenShaderBindingTableBuffer,
+                                 raygenShaderBindingOffset,
+                                 missShaderBindingTableBuffer,
+                                 missShaderBindingOffset,
+                                 missShaderBindingStride,
+                                 hitShaderBindingTableBuffer,
+                                 hitShaderBindingOffset,
+                                 hitShaderBindingStride,
+                                 callableShaderBindingTableBuffer,
+                                 callableShaderBindingOffset,
+                                 callableShaderBindingStride,
+                                 width,
+                                 height,
+                                 depth );
+    }
+
+    VkResult vkCreateRayTracingPipelinesNV( VkDevice                                 device,
+                                            VkPipelineCache                          pipelineCache,
+                                            uint32_t                                 createInfoCount,
+                                            const VkRayTracingPipelineCreateInfoNV * pCreateInfos,
+                                            const VkAllocationCallbacks *            pAllocator,
+                                            VkPipeline *                             pPipelines ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateRayTracingPipelinesNV( device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
+    }
+
+    VkResult vkGetRayTracingShaderGroupHandlesNV(
+      VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRayTracingShaderGroupHandlesNV( device, pipeline, firstGroup, groupCount, dataSize, pData );
+    }
+
+    VkResult vkGetAccelerationStructureHandleNV( VkDevice                  device,
+                                                 VkAccelerationStructureNV accelerationStructure,
+                                                 size_t                    dataSize,
+                                                 void *                    pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAccelerationStructureHandleNV( device, accelerationStructure, dataSize, pData );
+    }
+
+    void vkCmdWriteAccelerationStructuresPropertiesNV( VkCommandBuffer                   commandBuffer,
+                                                       uint32_t                          accelerationStructureCount,
+                                                       const VkAccelerationStructureNV * pAccelerationStructures,
+                                                       VkQueryType                       queryType,
+                                                       VkQueryPool                       queryPool,
+                                                       uint32_t                          firstQuery ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteAccelerationStructuresPropertiesNV(
+        commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery );
+    }
+
+    VkResult vkCompileDeferredNV( VkDevice device, VkPipeline pipeline, uint32_t shader ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCompileDeferredNV( device, pipeline, shader );
+    }
+
+    //=== VK_KHR_maintenance3 ===
+
+    void vkGetDescriptorSetLayoutSupportKHR( VkDevice                                device,
+                                             const VkDescriptorSetLayoutCreateInfo * pCreateInfo,
+                                             VkDescriptorSetLayoutSupport *          pSupport ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetLayoutSupportKHR( device, pCreateInfo, pSupport );
+    }
+
+    //=== VK_KHR_draw_indirect_count ===
+
+    void vkCmdDrawIndirectCountKHR( VkCommandBuffer commandBuffer,
+                                    VkBuffer        buffer,
+                                    VkDeviceSize    offset,
+                                    VkBuffer        countBuffer,
+                                    VkDeviceSize    countBufferOffset,
+                                    uint32_t        maxDrawCount,
+                                    uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndirectCountKHR( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
+
+    void vkCmdDrawIndexedIndirectCountKHR( VkCommandBuffer commandBuffer,
+                                           VkBuffer        buffer,
+                                           VkDeviceSize    offset,
+                                           VkBuffer        countBuffer,
+                                           VkDeviceSize    countBufferOffset,
+                                           uint32_t        maxDrawCount,
+                                           uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawIndexedIndirectCountKHR( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
+
+    //=== VK_EXT_external_memory_host ===
+
+    VkResult vkGetMemoryHostPointerPropertiesEXT( VkDevice                           device,
+                                                  VkExternalMemoryHandleTypeFlagBits handleType,
+                                                  const void *                       pHostPointer,
+                                                  VkMemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryHostPointerPropertiesEXT( device, handleType, pHostPointer, pMemoryHostPointerProperties );
+    }
+
+    //=== VK_AMD_buffer_marker ===
+
+    void vkCmdWriteBufferMarkerAMD( VkCommandBuffer         commandBuffer,
+                                    VkPipelineStageFlagBits pipelineStage,
+                                    VkBuffer                dstBuffer,
+                                    VkDeviceSize            dstOffset,
+                                    uint32_t                marker ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteBufferMarkerAMD( commandBuffer, pipelineStage, dstBuffer, dstOffset, marker );
+    }
+
+    //=== VK_EXT_calibrated_timestamps ===
+
+    VkResult vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( VkPhysicalDevice  physicalDevice,
+                                                             uint32_t *        pTimeDomainCount,
+                                                             VkTimeDomainKHR * pTimeDomains ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( physicalDevice, pTimeDomainCount, pTimeDomains );
+    }
+
+    VkResult vkGetCalibratedTimestampsEXT( VkDevice                             device,
+                                           uint32_t                             timestampCount,
+                                           const VkCalibratedTimestampInfoKHR * pTimestampInfos,
+                                           uint64_t *                           pTimestamps,
+                                           uint64_t *                           pMaxDeviation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetCalibratedTimestampsEXT( device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation );
+    }
+
+    //=== VK_NV_mesh_shader ===
+
+    void vkCmdDrawMeshTasksNV( VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMeshTasksNV( commandBuffer, taskCount, firstTask );
+    }
+
+    void vkCmdDrawMeshTasksIndirectNV( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMeshTasksIndirectNV( commandBuffer, buffer, offset, drawCount, stride );
+    }
+
+    void vkCmdDrawMeshTasksIndirectCountNV( VkCommandBuffer commandBuffer,
+                                            VkBuffer        buffer,
+                                            VkDeviceSize    offset,
+                                            VkBuffer        countBuffer,
+                                            VkDeviceSize    countBufferOffset,
+                                            uint32_t        maxDrawCount,
+                                            uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMeshTasksIndirectCountNV( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
+
+    //=== VK_NV_scissor_exclusive ===
+
+    void vkCmdSetExclusiveScissorEnableNV( VkCommandBuffer  commandBuffer,
+                                           uint32_t         firstExclusiveScissor,
+                                           uint32_t         exclusiveScissorCount,
+                                           const VkBool32 * pExclusiveScissorEnables ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetExclusiveScissorEnableNV( commandBuffer, firstExclusiveScissor, exclusiveScissorCount, pExclusiveScissorEnables );
+    }
+
+    void vkCmdSetExclusiveScissorNV( VkCommandBuffer  commandBuffer,
+                                     uint32_t         firstExclusiveScissor,
+                                     uint32_t         exclusiveScissorCount,
+                                     const VkRect2D * pExclusiveScissors ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetExclusiveScissorNV( commandBuffer, firstExclusiveScissor, exclusiveScissorCount, pExclusiveScissors );
+    }
+
+    //=== VK_NV_device_diagnostic_checkpoints ===
+
+    void vkCmdSetCheckpointNV( VkCommandBuffer commandBuffer, const void * pCheckpointMarker ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCheckpointNV( commandBuffer, pCheckpointMarker );
+    }
+
+    void vkGetQueueCheckpointDataNV( VkQueue queue, uint32_t * pCheckpointDataCount, VkCheckpointDataNV * pCheckpointData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetQueueCheckpointDataNV( queue, pCheckpointDataCount, pCheckpointData );
+    }
+
+    //=== VK_KHR_timeline_semaphore ===
+
+    VkResult vkGetSemaphoreCounterValueKHR( VkDevice device, VkSemaphore semaphore, uint64_t * pValue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSemaphoreCounterValueKHR( device, semaphore, pValue );
+    }
+
+    VkResult vkWaitSemaphoresKHR( VkDevice device, const VkSemaphoreWaitInfo * pWaitInfo, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWaitSemaphoresKHR( device, pWaitInfo, timeout );
+    }
+
+    VkResult vkSignalSemaphoreKHR( VkDevice device, const VkSemaphoreSignalInfo * pSignalInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSignalSemaphoreKHR( device, pSignalInfo );
+    }
+
+    //=== VK_INTEL_performance_query ===
+
+    VkResult vkInitializePerformanceApiINTEL( VkDevice device, const VkInitializePerformanceApiInfoINTEL * pInitializeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkInitializePerformanceApiINTEL( device, pInitializeInfo );
+    }
+
+    void vkUninitializePerformanceApiINTEL( VkDevice device ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUninitializePerformanceApiINTEL( device );
+    }
+
+    VkResult vkCmdSetPerformanceMarkerINTEL( VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPerformanceMarkerINTEL( commandBuffer, pMarkerInfo );
+    }
+
+    VkResult vkCmdSetPerformanceStreamMarkerINTEL( VkCommandBuffer                            commandBuffer,
+                                                   const VkPerformanceStreamMarkerInfoINTEL * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPerformanceStreamMarkerINTEL( commandBuffer, pMarkerInfo );
+    }
+
+    VkResult vkCmdSetPerformanceOverrideINTEL( VkCommandBuffer commandBuffer, const VkPerformanceOverrideInfoINTEL * pOverrideInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPerformanceOverrideINTEL( commandBuffer, pOverrideInfo );
+    }
+
+    VkResult vkAcquirePerformanceConfigurationINTEL( VkDevice                                           device,
+                                                     const VkPerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
+                                                     VkPerformanceConfigurationINTEL *                  pConfiguration ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquirePerformanceConfigurationINTEL( device, pAcquireInfo, pConfiguration );
+    }
+
+    VkResult vkReleasePerformanceConfigurationINTEL( VkDevice device, VkPerformanceConfigurationINTEL configuration ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkReleasePerformanceConfigurationINTEL( device, configuration );
+    }
+
+    VkResult vkQueueSetPerformanceConfigurationINTEL( VkQueue queue, VkPerformanceConfigurationINTEL configuration ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueSetPerformanceConfigurationINTEL( queue, configuration );
+    }
+
+    VkResult
+      vkGetPerformanceParameterINTEL( VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL * pValue ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPerformanceParameterINTEL( device, parameter, pValue );
+    }
+
+    //=== VK_AMD_display_native_hdr ===
+
+    void vkSetLocalDimmingAMD( VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetLocalDimmingAMD( device, swapChain, localDimmingEnable );
+    }
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_imagepipe_surface ===
+
+    VkResult vkCreateImagePipeSurfaceFUCHSIA( VkInstance                                  instance,
+                                              const VkImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
+                                              const VkAllocationCallbacks *               pAllocator,
+                                              VkSurfaceKHR *                              pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateImagePipeSurfaceFUCHSIA( instance, pCreateInfo, pAllocator, pSurface );
+    }
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#  if defined( VK_USE_PLATFORM_METAL_EXT )
+    //=== VK_EXT_metal_surface ===
+
+    VkResult vkCreateMetalSurfaceEXT( VkInstance                          instance,
+                                      const VkMetalSurfaceCreateInfoEXT * pCreateInfo,
+                                      const VkAllocationCallbacks *       pAllocator,
+                                      VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateMetalSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
+    }
+#  endif /*VK_USE_PLATFORM_METAL_EXT*/
+
+    //=== VK_KHR_fragment_shading_rate ===
+
+    VkResult vkGetPhysicalDeviceFragmentShadingRatesKHR( VkPhysicalDevice                         physicalDevice,
+                                                         uint32_t *                               pFragmentShadingRateCount,
+                                                         VkPhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceFragmentShadingRatesKHR( physicalDevice, pFragmentShadingRateCount, pFragmentShadingRates );
+    }
+
+    void vkCmdSetFragmentShadingRateKHR( VkCommandBuffer                          commandBuffer,
+                                         const VkExtent2D *                       pFragmentSize,
+                                         const VkFragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetFragmentShadingRateKHR( commandBuffer, pFragmentSize, combinerOps );
+    }
+
+    //=== VK_KHR_dynamic_rendering_local_read ===
+
+    void vkCmdSetRenderingAttachmentLocationsKHR( VkCommandBuffer                              commandBuffer,
+                                                  const VkRenderingAttachmentLocationInfoKHR * pLocationInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRenderingAttachmentLocationsKHR( commandBuffer, pLocationInfo );
+    }
+
+    void vkCmdSetRenderingInputAttachmentIndicesKHR( VkCommandBuffer                                commandBuffer,
+                                                     const VkRenderingInputAttachmentIndexInfoKHR * pLocationInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRenderingInputAttachmentIndicesKHR( commandBuffer, pLocationInfo );
+    }
+
+    //=== VK_EXT_buffer_device_address ===
+
+    VkDeviceAddress vkGetBufferDeviceAddressEXT( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferDeviceAddressEXT( device, pInfo );
+    }
+
+    //=== VK_EXT_tooling_info ===
+
+    VkResult vkGetPhysicalDeviceToolPropertiesEXT( VkPhysicalDevice                 physicalDevice,
+                                                   uint32_t *                       pToolCount,
+                                                   VkPhysicalDeviceToolProperties * pToolProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceToolPropertiesEXT( physicalDevice, pToolCount, pToolProperties );
+    }
+
+    //=== VK_KHR_present_wait ===
+
+    VkResult vkWaitForPresentKHR( VkDevice device, VkSwapchainKHR swapchain, uint64_t presentId, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWaitForPresentKHR( device, swapchain, presentId, timeout );
+    }
+
+    //=== VK_NV_cooperative_matrix ===
+
+    VkResult vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( VkPhysicalDevice                  physicalDevice,
+                                                               uint32_t *                        pPropertyCount,
+                                                               VkCooperativeMatrixPropertiesNV * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( physicalDevice, pPropertyCount, pProperties );
+    }
+
+    //=== VK_NV_coverage_reduction_mode ===
+
+    VkResult vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+      VkPhysicalDevice physicalDevice, uint32_t * pCombinationCount, VkFramebufferMixedSamplesCombinationNV * pCombinations ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( physicalDevice, pCombinationCount, pCombinations );
+    }
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_EXT_full_screen_exclusive ===
+
+    VkResult vkGetPhysicalDeviceSurfacePresentModes2EXT( VkPhysicalDevice                        physicalDevice,
+                                                         const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                         uint32_t *                              pPresentModeCount,
+                                                         VkPresentModeKHR *                      pPresentModes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceSurfacePresentModes2EXT( physicalDevice, pSurfaceInfo, pPresentModeCount, pPresentModes );
+    }
+
+    VkResult vkAcquireFullScreenExclusiveModeEXT( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireFullScreenExclusiveModeEXT( device, swapchain );
+    }
+
+    VkResult vkReleaseFullScreenExclusiveModeEXT( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkReleaseFullScreenExclusiveModeEXT( device, swapchain );
+    }
+
+    VkResult vkGetDeviceGroupSurfacePresentModes2EXT( VkDevice                                device,
+                                                      const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                      VkDeviceGroupPresentModeFlagsKHR *      pModes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceGroupSurfacePresentModes2EXT( device, pSurfaceInfo, pModes );
+    }
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_EXT_headless_surface ===
+
+    VkResult vkCreateHeadlessSurfaceEXT( VkInstance                             instance,
+                                         const VkHeadlessSurfaceCreateInfoEXT * pCreateInfo,
+                                         const VkAllocationCallbacks *          pAllocator,
+                                         VkSurfaceKHR *                         pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateHeadlessSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
+    }
+
+    //=== VK_KHR_buffer_device_address ===
+
+    VkDeviceAddress vkGetBufferDeviceAddressKHR( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferDeviceAddressKHR( device, pInfo );
+    }
+
+    uint64_t vkGetBufferOpaqueCaptureAddressKHR( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferOpaqueCaptureAddressKHR( device, pInfo );
+    }
+
+    uint64_t vkGetDeviceMemoryOpaqueCaptureAddressKHR( VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceMemoryOpaqueCaptureAddressKHR( device, pInfo );
+    }
+
+    //=== VK_EXT_line_rasterization ===
+
+    void vkCmdSetLineStippleEXT( VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLineStippleEXT( commandBuffer, lineStippleFactor, lineStipplePattern );
+    }
+
+    //=== VK_EXT_host_query_reset ===
+
+    void vkResetQueryPoolEXT( VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkResetQueryPoolEXT( device, queryPool, firstQuery, queryCount );
+    }
+
+    //=== VK_EXT_extended_dynamic_state ===
+
+    void vkCmdSetCullModeEXT( VkCommandBuffer commandBuffer, VkCullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCullModeEXT( commandBuffer, cullMode );
+    }
+
+    void vkCmdSetFrontFaceEXT( VkCommandBuffer commandBuffer, VkFrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetFrontFaceEXT( commandBuffer, frontFace );
+    }
+
+    void vkCmdSetPrimitiveTopologyEXT( VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPrimitiveTopologyEXT( commandBuffer, primitiveTopology );
+    }
+
+    void vkCmdSetViewportWithCountEXT( VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportWithCountEXT( commandBuffer, viewportCount, pViewports );
+    }
+
+    void vkCmdSetScissorWithCountEXT( VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetScissorWithCountEXT( commandBuffer, scissorCount, pScissors );
+    }
+
+    void vkCmdBindVertexBuffers2EXT( VkCommandBuffer      commandBuffer,
+                                     uint32_t             firstBinding,
+                                     uint32_t             bindingCount,
+                                     const VkBuffer *     pBuffers,
+                                     const VkDeviceSize * pOffsets,
+                                     const VkDeviceSize * pSizes,
+                                     const VkDeviceSize * pStrides ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindVertexBuffers2EXT( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes, pStrides );
+    }
+
+    void vkCmdSetDepthTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthTestEnableEXT( commandBuffer, depthTestEnable );
+    }
+
+    void vkCmdSetDepthWriteEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthWriteEnableEXT( commandBuffer, depthWriteEnable );
+    }
+
+    void vkCmdSetDepthCompareOpEXT( VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthCompareOpEXT( commandBuffer, depthCompareOp );
+    }
+
+    void vkCmdSetDepthBoundsTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBoundsTestEnableEXT( commandBuffer, depthBoundsTestEnable );
+    }
+
+    void vkCmdSetStencilTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilTestEnableEXT( commandBuffer, stencilTestEnable );
+    }
+
+    void vkCmdSetStencilOpEXT( VkCommandBuffer    commandBuffer,
+                               VkStencilFaceFlags faceMask,
+                               VkStencilOp        failOp,
+                               VkStencilOp        passOp,
+                               VkStencilOp        depthFailOp,
+                               VkCompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetStencilOpEXT( commandBuffer, faceMask, failOp, passOp, depthFailOp, compareOp );
+    }
+
+    //=== VK_KHR_deferred_host_operations ===
+
+    VkResult vkCreateDeferredOperationKHR( VkDevice                      device,
+                                           const VkAllocationCallbacks * pAllocator,
+                                           VkDeferredOperationKHR *      pDeferredOperation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDeferredOperationKHR( device, pAllocator, pDeferredOperation );
+    }
+
+    void vkDestroyDeferredOperationKHR( VkDevice device, VkDeferredOperationKHR operation, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyDeferredOperationKHR( device, operation, pAllocator );
+    }
+
+    uint32_t vkGetDeferredOperationMaxConcurrencyKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeferredOperationMaxConcurrencyKHR( device, operation );
+    }
+
+    VkResult vkGetDeferredOperationResultKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeferredOperationResultKHR( device, operation );
+    }
+
+    VkResult vkDeferredOperationJoinKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDeferredOperationJoinKHR( device, operation );
+    }
+
+    //=== VK_KHR_pipeline_executable_properties ===
+
+    VkResult vkGetPipelineExecutablePropertiesKHR( VkDevice                            device,
+                                                   const VkPipelineInfoKHR *           pPipelineInfo,
+                                                   uint32_t *                          pExecutableCount,
+                                                   VkPipelineExecutablePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineExecutablePropertiesKHR( device, pPipelineInfo, pExecutableCount, pProperties );
+    }
+
+    VkResult vkGetPipelineExecutableStatisticsKHR( VkDevice                            device,
+                                                   const VkPipelineExecutableInfoKHR * pExecutableInfo,
+                                                   uint32_t *                          pStatisticCount,
+                                                   VkPipelineExecutableStatisticKHR *  pStatistics ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineExecutableStatisticsKHR( device, pExecutableInfo, pStatisticCount, pStatistics );
+    }
+
+    VkResult
+      vkGetPipelineExecutableInternalRepresentationsKHR( VkDevice                                        device,
+                                                         const VkPipelineExecutableInfoKHR *             pExecutableInfo,
+                                                         uint32_t *                                      pInternalRepresentationCount,
+                                                         VkPipelineExecutableInternalRepresentationKHR * pInternalRepresentations ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineExecutableInternalRepresentationsKHR( device, pExecutableInfo, pInternalRepresentationCount, pInternalRepresentations );
+    }
+
+    //=== VK_EXT_host_image_copy ===
+
+    VkResult vkCopyMemoryToImageEXT( VkDevice device, const VkCopyMemoryToImageInfoEXT * pCopyMemoryToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyMemoryToImageEXT( device, pCopyMemoryToImageInfo );
+    }
+
+    VkResult vkCopyImageToMemoryEXT( VkDevice device, const VkCopyImageToMemoryInfoEXT * pCopyImageToMemoryInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyImageToMemoryEXT( device, pCopyImageToMemoryInfo );
+    }
+
+    VkResult vkCopyImageToImageEXT( VkDevice device, const VkCopyImageToImageInfoEXT * pCopyImageToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyImageToImageEXT( device, pCopyImageToImageInfo );
+    }
+
+    VkResult
+      vkTransitionImageLayoutEXT( VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfoEXT * pTransitions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkTransitionImageLayoutEXT( device, transitionCount, pTransitions );
+    }
+
+    void vkGetImageSubresourceLayout2EXT( VkDevice                       device,
+                                          VkImage                        image,
+                                          const VkImageSubresource2KHR * pSubresource,
+                                          VkSubresourceLayout2KHR *      pLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSubresourceLayout2EXT( device, image, pSubresource, pLayout );
+    }
+
+    //=== VK_KHR_map_memory2 ===
+
+    VkResult vkMapMemory2KHR( VkDevice device, const VkMemoryMapInfoKHR * pMemoryMapInfo, void ** ppData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkMapMemory2KHR( device, pMemoryMapInfo, ppData );
+    }
+
+    VkResult vkUnmapMemory2KHR( VkDevice device, const VkMemoryUnmapInfoKHR * pMemoryUnmapInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkUnmapMemory2KHR( device, pMemoryUnmapInfo );
+    }
+
+    //=== VK_EXT_swapchain_maintenance1 ===
+
+    VkResult vkReleaseSwapchainImagesEXT( VkDevice device, const VkReleaseSwapchainImagesInfoEXT * pReleaseInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkReleaseSwapchainImagesEXT( device, pReleaseInfo );
+    }
+
+    //=== VK_NV_device_generated_commands ===
+
+    void vkGetGeneratedCommandsMemoryRequirementsNV( VkDevice                                            device,
+                                                     const VkGeneratedCommandsMemoryRequirementsInfoNV * pInfo,
+                                                     VkMemoryRequirements2 *                             pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetGeneratedCommandsMemoryRequirementsNV( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkCmdPreprocessGeneratedCommandsNV( VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV * pGeneratedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPreprocessGeneratedCommandsNV( commandBuffer, pGeneratedCommandsInfo );
+    }
+
+    void vkCmdExecuteGeneratedCommandsNV( VkCommandBuffer                   commandBuffer,
+                                          VkBool32                          isPreprocessed,
+                                          const VkGeneratedCommandsInfoNV * pGeneratedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdExecuteGeneratedCommandsNV( commandBuffer, isPreprocessed, pGeneratedCommandsInfo );
+    }
+
+    void vkCmdBindPipelineShaderGroupNV( VkCommandBuffer     commandBuffer,
+                                         VkPipelineBindPoint pipelineBindPoint,
+                                         VkPipeline          pipeline,
+                                         uint32_t            groupIndex ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindPipelineShaderGroupNV( commandBuffer, pipelineBindPoint, pipeline, groupIndex );
+    }
+
+    VkResult vkCreateIndirectCommandsLayoutNV( VkDevice                                     device,
+                                               const VkIndirectCommandsLayoutCreateInfoNV * pCreateInfo,
+                                               const VkAllocationCallbacks *                pAllocator,
+                                               VkIndirectCommandsLayoutNV *                 pIndirectCommandsLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateIndirectCommandsLayoutNV( device, pCreateInfo, pAllocator, pIndirectCommandsLayout );
+    }
+
+    void vkDestroyIndirectCommandsLayoutNV( VkDevice                      device,
+                                            VkIndirectCommandsLayoutNV    indirectCommandsLayout,
+                                            const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyIndirectCommandsLayoutNV( device, indirectCommandsLayout, pAllocator );
+    }
+
+    //=== VK_EXT_depth_bias_control ===
+
+    void vkCmdSetDepthBias2EXT( VkCommandBuffer commandBuffer, const VkDepthBiasInfoEXT * pDepthBiasInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBias2EXT( commandBuffer, pDepthBiasInfo );
+    }
+
+    //=== VK_EXT_acquire_drm_display ===
+
+    VkResult vkAcquireDrmDisplayEXT( VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireDrmDisplayEXT( physicalDevice, drmFd, display );
+    }
+
+    VkResult vkGetDrmDisplayEXT( VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR * display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDrmDisplayEXT( physicalDevice, drmFd, connectorId, display );
+    }
+
+    //=== VK_EXT_private_data ===
+
+    VkResult vkCreatePrivateDataSlotEXT( VkDevice                            device,
+                                         const VkPrivateDataSlotCreateInfo * pCreateInfo,
+                                         const VkAllocationCallbacks *       pAllocator,
+                                         VkPrivateDataSlot *                 pPrivateDataSlot ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreatePrivateDataSlotEXT( device, pCreateInfo, pAllocator, pPrivateDataSlot );
+    }
+
+    void vkDestroyPrivateDataSlotEXT( VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyPrivateDataSlotEXT( device, privateDataSlot, pAllocator );
+    }
+
+    VkResult vkSetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetPrivateDataEXT( device, objectType, objectHandle, privateDataSlot, data );
+    }
+
+    void vkGetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t * pData ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPrivateDataEXT( device, objectType, objectHandle, privateDataSlot, pData );
+    }
+
+    //=== VK_KHR_video_encode_queue ===
+
+    VkResult
+      vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( VkPhysicalDevice                                       physicalDevice,
+                                                               const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
+                                                               VkVideoEncodeQualityLevelPropertiesKHR * pQualityLevelProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( physicalDevice, pQualityLevelInfo, pQualityLevelProperties );
+    }
+
+    VkResult vkGetEncodedVideoSessionParametersKHR( VkDevice                                         device,
+                                                    const VkVideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
+                                                    VkVideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
+                                                    size_t *                                         pDataSize,
+                                                    void *                                           pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetEncodedVideoSessionParametersKHR( device, pVideoSessionParametersInfo, pFeedbackInfo, pDataSize, pData );
+    }
+
+    void vkCmdEncodeVideoKHR( VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR * pEncodeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdEncodeVideoKHR( commandBuffer, pEncodeInfo );
+    }
+
+#  if defined( VK_ENABLE_BETA_EXTENSIONS )
+    //=== VK_NV_cuda_kernel_launch ===
+
+    VkResult vkCreateCudaModuleNV( VkDevice                         device,
+                                   const VkCudaModuleCreateInfoNV * pCreateInfo,
+                                   const VkAllocationCallbacks *    pAllocator,
+                                   VkCudaModuleNV *                 pModule ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateCudaModuleNV( device, pCreateInfo, pAllocator, pModule );
+    }
+
+    VkResult vkGetCudaModuleCacheNV( VkDevice device, VkCudaModuleNV module, size_t * pCacheSize, void * pCacheData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetCudaModuleCacheNV( device, module, pCacheSize, pCacheData );
+    }
+
+    VkResult vkCreateCudaFunctionNV( VkDevice                           device,
+                                     const VkCudaFunctionCreateInfoNV * pCreateInfo,
+                                     const VkAllocationCallbacks *      pAllocator,
+                                     VkCudaFunctionNV *                 pFunction ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateCudaFunctionNV( device, pCreateInfo, pAllocator, pFunction );
+    }
+
+    void vkDestroyCudaModuleNV( VkDevice device, VkCudaModuleNV module, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyCudaModuleNV( device, module, pAllocator );
+    }
+
+    void vkDestroyCudaFunctionNV( VkDevice device, VkCudaFunctionNV function, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyCudaFunctionNV( device, function, pAllocator );
+    }
+
+    void vkCmdCudaLaunchKernelNV( VkCommandBuffer commandBuffer, const VkCudaLaunchInfoNV * pLaunchInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCudaLaunchKernelNV( commandBuffer, pLaunchInfo );
+    }
+#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+#  if defined( VK_USE_PLATFORM_METAL_EXT )
+    //=== VK_EXT_metal_objects ===
+
+    void vkExportMetalObjectsEXT( VkDevice device, VkExportMetalObjectsInfoEXT * pMetalObjectsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkExportMetalObjectsEXT( device, pMetalObjectsInfo );
+    }
+#  endif /*VK_USE_PLATFORM_METAL_EXT*/
+
+    //=== VK_KHR_synchronization2 ===
+
+    void vkCmdSetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetEvent2KHR( commandBuffer, event, pDependencyInfo );
+    }
+
+    void vkCmdResetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResetEvent2KHR( commandBuffer, event, stageMask );
+    }
+
+    void vkCmdWaitEvents2KHR( VkCommandBuffer          commandBuffer,
+                              uint32_t                 eventCount,
+                              const VkEvent *          pEvents,
+                              const VkDependencyInfo * pDependencyInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWaitEvents2KHR( commandBuffer, eventCount, pEvents, pDependencyInfos );
+    }
+
+    void vkCmdPipelineBarrier2KHR( VkCommandBuffer commandBuffer, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPipelineBarrier2KHR( commandBuffer, pDependencyInfo );
+    }
+
+    void vkCmdWriteTimestamp2KHR( VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteTimestamp2KHR( commandBuffer, stage, queryPool, query );
+    }
+
+    VkResult vkQueueSubmit2KHR( VkQueue queue, uint32_t submitCount, const VkSubmitInfo2 * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueSubmit2KHR( queue, submitCount, pSubmits, fence );
+    }
+
+    void vkCmdWriteBufferMarker2AMD(
+      VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteBufferMarker2AMD( commandBuffer, stage, dstBuffer, dstOffset, marker );
+    }
+
+    void vkGetQueueCheckpointData2NV( VkQueue queue, uint32_t * pCheckpointDataCount, VkCheckpointData2NV * pCheckpointData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetQueueCheckpointData2NV( queue, pCheckpointDataCount, pCheckpointData );
+    }
+
+    //=== VK_EXT_descriptor_buffer ===
+
+    void vkGetDescriptorSetLayoutSizeEXT( VkDevice device, VkDescriptorSetLayout layout, VkDeviceSize * pLayoutSizeInBytes ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetLayoutSizeEXT( device, layout, pLayoutSizeInBytes );
+    }
+
+    void vkGetDescriptorSetLayoutBindingOffsetEXT( VkDevice              device,
+                                                   VkDescriptorSetLayout layout,
+                                                   uint32_t              binding,
+                                                   VkDeviceSize *        pOffset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetLayoutBindingOffsetEXT( device, layout, binding, pOffset );
+    }
+
+    void vkGetDescriptorEXT( VkDevice device, const VkDescriptorGetInfoEXT * pDescriptorInfo, size_t dataSize, void * pDescriptor ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorEXT( device, pDescriptorInfo, dataSize, pDescriptor );
+    }
+
+    void vkCmdBindDescriptorBuffersEXT( VkCommandBuffer                          commandBuffer,
+                                        uint32_t                                 bufferCount,
+                                        const VkDescriptorBufferBindingInfoEXT * pBindingInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindDescriptorBuffersEXT( commandBuffer, bufferCount, pBindingInfos );
+    }
+
+    void vkCmdSetDescriptorBufferOffsetsEXT( VkCommandBuffer      commandBuffer,
+                                             VkPipelineBindPoint  pipelineBindPoint,
+                                             VkPipelineLayout     layout,
+                                             uint32_t             firstSet,
+                                             uint32_t             setCount,
+                                             const uint32_t *     pBufferIndices,
+                                             const VkDeviceSize * pOffsets ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDescriptorBufferOffsetsEXT( commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pBufferIndices, pOffsets );
+    }
+
+    void vkCmdBindDescriptorBufferEmbeddedSamplersEXT( VkCommandBuffer     commandBuffer,
+                                                       VkPipelineBindPoint pipelineBindPoint,
+                                                       VkPipelineLayout    layout,
+                                                       uint32_t            set ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindDescriptorBufferEmbeddedSamplersEXT( commandBuffer, pipelineBindPoint, layout, set );
+    }
+
+    VkResult
+      vkGetBufferOpaqueCaptureDescriptorDataEXT( VkDevice device, const VkBufferCaptureDescriptorDataInfoEXT * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
+    }
+
+    VkResult
+      vkGetImageOpaqueCaptureDescriptorDataEXT( VkDevice device, const VkImageCaptureDescriptorDataInfoEXT * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
+    }
+
+    VkResult vkGetImageViewOpaqueCaptureDescriptorDataEXT( VkDevice                                        device,
+                                                           const VkImageViewCaptureDescriptorDataInfoEXT * pInfo,
+                                                           void *                                          pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageViewOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
+    }
+
+    VkResult
+      vkGetSamplerOpaqueCaptureDescriptorDataEXT( VkDevice device, const VkSamplerCaptureDescriptorDataInfoEXT * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSamplerOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
+    }
+
+    VkResult vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT( VkDevice                                                    device,
+                                                                       const VkAccelerationStructureCaptureDescriptorDataInfoEXT * pInfo,
+                                                                       void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
+    }
+
+    //=== VK_NV_fragment_shading_rate_enums ===
+
+    void vkCmdSetFragmentShadingRateEnumNV( VkCommandBuffer                          commandBuffer,
+                                            VkFragmentShadingRateNV                  shadingRate,
+                                            const VkFragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetFragmentShadingRateEnumNV( commandBuffer, shadingRate, combinerOps );
+    }
+
+    //=== VK_EXT_mesh_shader ===
+
+    void vkCmdDrawMeshTasksEXT( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMeshTasksEXT( commandBuffer, groupCountX, groupCountY, groupCountZ );
+    }
+
+    void vkCmdDrawMeshTasksIndirectEXT( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMeshTasksIndirectEXT( commandBuffer, buffer, offset, drawCount, stride );
+    }
+
+    void vkCmdDrawMeshTasksIndirectCountEXT( VkCommandBuffer commandBuffer,
                                              VkBuffer        buffer,
                                              VkDeviceSize    offset,
                                              VkBuffer        countBuffer,
                                              VkDeviceSize    countBufferOffset,
                                              uint32_t        maxDrawCount,
                                              uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawIndexedIndirectCountKHR( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
+    {
+      return ::vkCmdDrawMeshTasksIndirectCountEXT( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
+    }
 
-      //=== VK_EXT_external_memory_host ===
+    //=== VK_KHR_copy_commands2 ===
 
-      VkResult vkGetMemoryHostPointerPropertiesEXT( VkDevice                           device,
-                                                    VkExternalMemoryHandleTypeFlagBits handleType,
-                                                    const void *                       pHostPointer,
-                                                    VkMemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryHostPointerPropertiesEXT( device, handleType, pHostPointer, pMemoryHostPointerProperties );
-      }
+    void vkCmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 * pCopyBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBuffer2KHR( commandBuffer, pCopyBufferInfo );
+    }
 
-      //=== VK_AMD_buffer_marker ===
+    void vkCmdCopyImage2KHR( VkCommandBuffer commandBuffer, const VkCopyImageInfo2 * pCopyImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImage2KHR( commandBuffer, pCopyImageInfo );
+    }
 
-      void vkCmdWriteBufferMarkerAMD( VkCommandBuffer         commandBuffer,
-                                      VkPipelineStageFlagBits pipelineStage,
-                                      VkBuffer                dstBuffer,
-                                      VkDeviceSize            dstOffset,
-                                      uint32_t                marker ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteBufferMarkerAMD( commandBuffer, pipelineStage, dstBuffer, dstOffset, marker );
-      }
+    void vkCmdCopyBufferToImage2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 * pCopyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyBufferToImage2KHR( commandBuffer, pCopyBufferToImageInfo );
+    }
 
-      void vkCmdWriteBufferMarker2AMD(
-        VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteBufferMarker2AMD( commandBuffer, stage, dstBuffer, dstOffset, marker );
-      }
+    void vkCmdCopyImageToBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 * pCopyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyImageToBuffer2KHR( commandBuffer, pCopyImageToBufferInfo );
+    }
 
-      //=== VK_EXT_calibrated_timestamps ===
+    void vkCmdBlitImage2KHR( VkCommandBuffer commandBuffer, const VkBlitImageInfo2 * pBlitImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBlitImage2KHR( commandBuffer, pBlitImageInfo );
+    }
 
-      VkResult vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( VkPhysicalDevice  physicalDevice,
-                                                               uint32_t *        pTimeDomainCount,
-                                                               VkTimeDomainKHR * pTimeDomains ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( physicalDevice, pTimeDomainCount, pTimeDomains );
-      }
+    void vkCmdResolveImage2KHR( VkCommandBuffer commandBuffer, const VkResolveImageInfo2 * pResolveImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdResolveImage2KHR( commandBuffer, pResolveImageInfo );
+    }
 
-      VkResult vkGetCalibratedTimestampsEXT( VkDevice                             device,
-                                             uint32_t                             timestampCount,
-                                             const VkCalibratedTimestampInfoKHR * pTimestampInfos,
-                                             uint64_t *                           pTimestamps,
-                                             uint64_t *                           pMaxDeviation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetCalibratedTimestampsEXT( device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation );
-      }
+    //=== VK_EXT_device_fault ===
 
-      //=== VK_NV_mesh_shader ===
-
-      void vkCmdDrawMeshTasksNV( VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksNV( commandBuffer, taskCount, firstTask );
-      }
-
-      void vkCmdDrawMeshTasksIndirectNV( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksIndirectNV( commandBuffer, buffer, offset, drawCount, stride );
-      }
-
-      void vkCmdDrawMeshTasksIndirectCountNV( VkCommandBuffer commandBuffer,
-                                              VkBuffer        buffer,
-                                              VkDeviceSize    offset,
-                                              VkBuffer        countBuffer,
-                                              VkDeviceSize    countBufferOffset,
-                                              uint32_t        maxDrawCount,
-                                              uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksIndirectCountNV( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
-
-      //=== VK_NV_scissor_exclusive ===
-
-      void vkCmdSetExclusiveScissorEnableNV( VkCommandBuffer  commandBuffer,
-                                             uint32_t         firstExclusiveScissor,
-                                             uint32_t         exclusiveScissorCount,
-                                             const VkBool32 * pExclusiveScissorEnables ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetExclusiveScissorEnableNV( commandBuffer, firstExclusiveScissor, exclusiveScissorCount, pExclusiveScissorEnables );
-      }
-
-      void vkCmdSetExclusiveScissorNV( VkCommandBuffer  commandBuffer,
-                                       uint32_t         firstExclusiveScissor,
-                                       uint32_t         exclusiveScissorCount,
-                                       const VkRect2D * pExclusiveScissors ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetExclusiveScissorNV( commandBuffer, firstExclusiveScissor, exclusiveScissorCount, pExclusiveScissors );
-      }
-
-      //=== VK_NV_device_diagnostic_checkpoints ===
-
-      void vkCmdSetCheckpointNV( VkCommandBuffer commandBuffer, const void * pCheckpointMarker ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCheckpointNV( commandBuffer, pCheckpointMarker );
-      }
-
-      void vkGetQueueCheckpointDataNV( VkQueue queue, uint32_t * pCheckpointDataCount, VkCheckpointDataNV * pCheckpointData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetQueueCheckpointDataNV( queue, pCheckpointDataCount, pCheckpointData );
-      }
-
-      void vkGetQueueCheckpointData2NV( VkQueue queue, uint32_t * pCheckpointDataCount, VkCheckpointData2NV * pCheckpointData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetQueueCheckpointData2NV( queue, pCheckpointDataCount, pCheckpointData );
-      }
-
-      //=== VK_KHR_timeline_semaphore ===
-
-      VkResult vkGetSemaphoreCounterValueKHR( VkDevice device, VkSemaphore semaphore, uint64_t * pValue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSemaphoreCounterValueKHR( device, semaphore, pValue );
-      }
-
-      VkResult vkWaitSemaphoresKHR( VkDevice device, const VkSemaphoreWaitInfo * pWaitInfo, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWaitSemaphoresKHR( device, pWaitInfo, timeout );
-      }
-
-      VkResult vkSignalSemaphoreKHR( VkDevice device, const VkSemaphoreSignalInfo * pSignalInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSignalSemaphoreKHR( device, pSignalInfo );
-      }
-
-      //=== VK_EXT_present_timing ===
-
-      VkResult vkSetSwapchainPresentTimingQueueSizeEXT( VkDevice device, VkSwapchainKHR swapchain, uint32_t size ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetSwapchainPresentTimingQueueSizeEXT( device, swapchain, size );
-      }
-
-      VkResult vkGetSwapchainTimingPropertiesEXT( VkDevice                         device,
-                                                  VkSwapchainKHR                   swapchain,
-                                                  VkSwapchainTimingPropertiesEXT * pSwapchainTimingProperties,
-                                                  uint64_t *                       pSwapchainTimingPropertiesCounter ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainTimingPropertiesEXT( device, swapchain, pSwapchainTimingProperties, pSwapchainTimingPropertiesCounter );
-      }
-
-      VkResult vkGetSwapchainTimeDomainPropertiesEXT( VkDevice                             device,
-                                                      VkSwapchainKHR                       swapchain,
-                                                      VkSwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
-                                                      uint64_t *                           pTimeDomainsCounter ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainTimeDomainPropertiesEXT( device, swapchain, pSwapchainTimeDomainProperties, pTimeDomainsCounter );
-      }
-
-      VkResult vkGetPastPresentationTimingEXT( VkDevice                                device,
-                                               const VkPastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
-                                               VkPastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPastPresentationTimingEXT( device, pPastPresentationTimingInfo, pPastPresentationTimingProperties );
-      }
-
-      //=== VK_INTEL_performance_query ===
-
-      VkResult vkInitializePerformanceApiINTEL( VkDevice device, const VkInitializePerformanceApiInfoINTEL * pInitializeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkInitializePerformanceApiINTEL( device, pInitializeInfo );
-      }
-
-      void vkUninitializePerformanceApiINTEL( VkDevice device ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUninitializePerformanceApiINTEL( device );
-      }
-
-      VkResult vkCmdSetPerformanceMarkerINTEL( VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPerformanceMarkerINTEL( commandBuffer, pMarkerInfo );
-      }
-
-      VkResult vkCmdSetPerformanceStreamMarkerINTEL( VkCommandBuffer                            commandBuffer,
-                                                     const VkPerformanceStreamMarkerInfoINTEL * pMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPerformanceStreamMarkerINTEL( commandBuffer, pMarkerInfo );
-      }
-
-      VkResult vkCmdSetPerformanceOverrideINTEL( VkCommandBuffer commandBuffer, const VkPerformanceOverrideInfoINTEL * pOverrideInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPerformanceOverrideINTEL( commandBuffer, pOverrideInfo );
-      }
-
-      VkResult vkAcquirePerformanceConfigurationINTEL( VkDevice                                           device,
-                                                       const VkPerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
-                                                       VkPerformanceConfigurationINTEL *                  pConfiguration ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquirePerformanceConfigurationINTEL( device, pAcquireInfo, pConfiguration );
-      }
-
-      VkResult vkReleasePerformanceConfigurationINTEL( VkDevice device, VkPerformanceConfigurationINTEL configuration ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleasePerformanceConfigurationINTEL( device, configuration );
-      }
-
-      VkResult vkQueueSetPerformanceConfigurationINTEL( VkQueue queue, VkPerformanceConfigurationINTEL configuration ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueSetPerformanceConfigurationINTEL( queue, configuration );
-      }
-
-      VkResult
-        vkGetPerformanceParameterINTEL( VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL * pValue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPerformanceParameterINTEL( device, parameter, pValue );
-      }
-
-      //=== VK_AMD_display_native_hdr ===
-
-      void vkSetLocalDimmingAMD( VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetLocalDimmingAMD( device, swapChain, localDimmingEnable );
-      }
-
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-      //=== VK_FUCHSIA_imagepipe_surface ===
-
-      VkResult vkCreateImagePipeSurfaceFUCHSIA( VkInstance                                  instance,
-                                                const VkImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
-                                                const VkAllocationCallbacks *               pAllocator,
-                                                VkSurfaceKHR *                              pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateImagePipeSurfaceFUCHSIA( instance, pCreateInfo, pAllocator, pSurface );
-      }
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-      //=== VK_EXT_metal_surface ===
-
-      VkResult vkCreateMetalSurfaceEXT( VkInstance                          instance,
-                                        const VkMetalSurfaceCreateInfoEXT * pCreateInfo,
-                                        const VkAllocationCallbacks *       pAllocator,
-                                        VkSurfaceKHR *                      pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateMetalSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
-      }
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-      //=== VK_KHR_fragment_shading_rate ===
-
-      VkResult vkGetPhysicalDeviceFragmentShadingRatesKHR( VkPhysicalDevice                         physicalDevice,
-                                                           uint32_t *                               pFragmentShadingRateCount,
-                                                           VkPhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceFragmentShadingRatesKHR( physicalDevice, pFragmentShadingRateCount, pFragmentShadingRates );
-      }
-
-      void vkCmdSetFragmentShadingRateKHR( VkCommandBuffer                          commandBuffer,
-                                           const VkExtent2D *                       pFragmentSize,
-                                           const VkFragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetFragmentShadingRateKHR( commandBuffer, pFragmentSize, combinerOps );
-      }
-
-      //=== VK_KHR_dynamic_rendering_local_read ===
-
-      void vkCmdSetRenderingAttachmentLocationsKHR( VkCommandBuffer                           commandBuffer,
-                                                    const VkRenderingAttachmentLocationInfo * pLocationInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRenderingAttachmentLocationsKHR( commandBuffer, pLocationInfo );
-      }
-
-      void vkCmdSetRenderingInputAttachmentIndicesKHR( VkCommandBuffer                             commandBuffer,
-                                                       const VkRenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRenderingInputAttachmentIndicesKHR( commandBuffer, pInputAttachmentIndexInfo );
-      }
-
-      //=== VK_EXT_buffer_device_address ===
-
-      VkDeviceAddress vkGetBufferDeviceAddressEXT( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferDeviceAddressEXT( device, pInfo );
-      }
-
-      //=== VK_EXT_tooling_info ===
-
-      VkResult vkGetPhysicalDeviceToolPropertiesEXT( VkPhysicalDevice                 physicalDevice,
-                                                     uint32_t *                       pToolCount,
-                                                     VkPhysicalDeviceToolProperties * pToolProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceToolPropertiesEXT( physicalDevice, pToolCount, pToolProperties );
-      }
-
-      //=== VK_KHR_present_wait ===
-
-      VkResult vkWaitForPresentKHR( VkDevice device, VkSwapchainKHR swapchain, uint64_t presentId, uint64_t timeout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWaitForPresentKHR( device, swapchain, presentId, timeout );
-      }
-
-      //=== VK_NV_cooperative_matrix ===
-
-      VkResult vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( VkPhysicalDevice                  physicalDevice,
-                                                                 uint32_t *                        pPropertyCount,
-                                                                 VkCooperativeMatrixPropertiesNV * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( physicalDevice, pPropertyCount, pProperties );
-      }
-
-      //=== VK_NV_coverage_reduction_mode ===
-
-      VkResult vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
-        VkPhysicalDevice physicalDevice, uint32_t * pCombinationCount, VkFramebufferMixedSamplesCombinationNV * pCombinations ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( physicalDevice, pCombinationCount, pCombinations );
-      }
+    VkResult vkGetDeviceFaultInfoEXT( VkDevice device, VkDeviceFaultCountsEXT * pFaultCounts, VkDeviceFaultInfoEXT * pFaultInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceFaultInfoEXT( device, pFaultCounts, pFaultInfo );
+    }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_EXT_full_screen_exclusive ===
+    //=== VK_NV_acquire_winrt_display ===
 
-      VkResult vkGetPhysicalDeviceSurfacePresentModes2EXT( VkPhysicalDevice                        physicalDevice,
-                                                           const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                           uint32_t *                              pPresentModeCount,
-                                                           VkPresentModeKHR *                      pPresentModes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceSurfacePresentModes2EXT( physicalDevice, pSurfaceInfo, pPresentModeCount, pPresentModes );
-      }
+    VkResult vkAcquireWinrtDisplayNV( VkPhysicalDevice physicalDevice, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkAcquireWinrtDisplayNV( physicalDevice, display );
+    }
 
-      VkResult vkAcquireFullScreenExclusiveModeEXT( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireFullScreenExclusiveModeEXT( device, swapchain );
-      }
-
-      VkResult vkReleaseFullScreenExclusiveModeEXT( VkDevice device, VkSwapchainKHR swapchain ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseFullScreenExclusiveModeEXT( device, swapchain );
-      }
-
-      VkResult vkGetDeviceGroupSurfacePresentModes2EXT( VkDevice                                device,
-                                                        const VkPhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                        VkDeviceGroupPresentModeFlagsKHR *      pModes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceGroupSurfacePresentModes2EXT( device, pSurfaceInfo, pModes );
-      }
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-      //=== VK_EXT_headless_surface ===
-
-      VkResult vkCreateHeadlessSurfaceEXT( VkInstance                             instance,
-                                           const VkHeadlessSurfaceCreateInfoEXT * pCreateInfo,
-                                           const VkAllocationCallbacks *          pAllocator,
-                                           VkSurfaceKHR *                         pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateHeadlessSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
-      }
-
-      //=== VK_KHR_buffer_device_address ===
-
-      VkDeviceAddress vkGetBufferDeviceAddressKHR( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferDeviceAddressKHR( device, pInfo );
-      }
-
-      uint64_t vkGetBufferOpaqueCaptureAddressKHR( VkDevice device, const VkBufferDeviceAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferOpaqueCaptureAddressKHR( device, pInfo );
-      }
-
-      uint64_t vkGetDeviceMemoryOpaqueCaptureAddressKHR( VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceMemoryOpaqueCaptureAddressKHR( device, pInfo );
-      }
-
-      //=== VK_EXT_line_rasterization ===
-
-      void vkCmdSetLineStippleEXT( VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineStippleEXT( commandBuffer, lineStippleFactor, lineStipplePattern );
-      }
-
-      //=== VK_EXT_host_query_reset ===
-
-      void vkResetQueryPoolEXT( VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkResetQueryPoolEXT( device, queryPool, firstQuery, queryCount );
-      }
-
-      //=== VK_EXT_extended_dynamic_state ===
-
-      void vkCmdSetCullModeEXT( VkCommandBuffer commandBuffer, VkCullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCullModeEXT( commandBuffer, cullMode );
-      }
-
-      void vkCmdSetFrontFaceEXT( VkCommandBuffer commandBuffer, VkFrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetFrontFaceEXT( commandBuffer, frontFace );
-      }
-
-      void vkCmdSetPrimitiveTopologyEXT( VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPrimitiveTopologyEXT( commandBuffer, primitiveTopology );
-      }
-
-      void vkCmdSetViewportWithCountEXT( VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport * pViewports ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportWithCountEXT( commandBuffer, viewportCount, pViewports );
-      }
-
-      void vkCmdSetScissorWithCountEXT( VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D * pScissors ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetScissorWithCountEXT( commandBuffer, scissorCount, pScissors );
-      }
-
-      void vkCmdBindVertexBuffers2EXT( VkCommandBuffer      commandBuffer,
-                                       uint32_t             firstBinding,
-                                       uint32_t             bindingCount,
-                                       const VkBuffer *     pBuffers,
-                                       const VkDeviceSize * pOffsets,
-                                       const VkDeviceSize * pSizes,
-                                       const VkDeviceSize * pStrides ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindVertexBuffers2EXT( commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes, pStrides );
-      }
-
-      void vkCmdSetDepthTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthTestEnableEXT( commandBuffer, depthTestEnable );
-      }
-
-      void vkCmdSetDepthWriteEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthWriteEnableEXT( commandBuffer, depthWriteEnable );
-      }
-
-      void vkCmdSetDepthCompareOpEXT( VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthCompareOpEXT( commandBuffer, depthCompareOp );
-      }
-
-      void vkCmdSetDepthBoundsTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBoundsTestEnableEXT( commandBuffer, depthBoundsTestEnable );
-      }
-
-      void vkCmdSetStencilTestEnableEXT( VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilTestEnableEXT( commandBuffer, stencilTestEnable );
-      }
-
-      void vkCmdSetStencilOpEXT( VkCommandBuffer    commandBuffer,
-                                 VkStencilFaceFlags faceMask,
-                                 VkStencilOp        failOp,
-                                 VkStencilOp        passOp,
-                                 VkStencilOp        depthFailOp,
-                                 VkCompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetStencilOpEXT( commandBuffer, faceMask, failOp, passOp, depthFailOp, compareOp );
-      }
-
-      //=== VK_KHR_deferred_host_operations ===
-
-      VkResult vkCreateDeferredOperationKHR( VkDevice                      device,
-                                             const VkAllocationCallbacks * pAllocator,
-                                             VkDeferredOperationKHR *      pDeferredOperation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDeferredOperationKHR( device, pAllocator, pDeferredOperation );
-      }
-
-      void
-        vkDestroyDeferredOperationKHR( VkDevice device, VkDeferredOperationKHR operation, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDeferredOperationKHR( device, operation, pAllocator );
-      }
-
-      uint32_t vkGetDeferredOperationMaxConcurrencyKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeferredOperationMaxConcurrencyKHR( device, operation );
-      }
-
-      VkResult vkGetDeferredOperationResultKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeferredOperationResultKHR( device, operation );
-      }
-
-      VkResult vkDeferredOperationJoinKHR( VkDevice device, VkDeferredOperationKHR operation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDeferredOperationJoinKHR( device, operation );
-      }
-
-      //=== VK_KHR_pipeline_executable_properties ===
-
-      VkResult vkGetPipelineExecutablePropertiesKHR( VkDevice                            device,
-                                                     const VkPipelineInfoKHR *           pPipelineInfo,
-                                                     uint32_t *                          pExecutableCount,
-                                                     VkPipelineExecutablePropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineExecutablePropertiesKHR( device, pPipelineInfo, pExecutableCount, pProperties );
-      }
-
-      VkResult vkGetPipelineExecutableStatisticsKHR( VkDevice                            device,
-                                                     const VkPipelineExecutableInfoKHR * pExecutableInfo,
-                                                     uint32_t *                          pStatisticCount,
-                                                     VkPipelineExecutableStatisticKHR *  pStatistics ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineExecutableStatisticsKHR( device, pExecutableInfo, pStatisticCount, pStatistics );
-      }
-
-      VkResult
-        vkGetPipelineExecutableInternalRepresentationsKHR( VkDevice                                        device,
-                                                           const VkPipelineExecutableInfoKHR *             pExecutableInfo,
-                                                           uint32_t *                                      pInternalRepresentationCount,
-                                                           VkPipelineExecutableInternalRepresentationKHR * pInternalRepresentations ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineExecutableInternalRepresentationsKHR( device, pExecutableInfo, pInternalRepresentationCount, pInternalRepresentations );
-      }
-
-      //=== VK_EXT_host_image_copy ===
-
-      VkResult vkCopyMemoryToImageEXT( VkDevice device, const VkCopyMemoryToImageInfo * pCopyMemoryToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMemoryToImageEXT( device, pCopyMemoryToImageInfo );
-      }
-
-      VkResult vkCopyImageToMemoryEXT( VkDevice device, const VkCopyImageToMemoryInfo * pCopyImageToMemoryInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyImageToMemoryEXT( device, pCopyImageToMemoryInfo );
-      }
-
-      VkResult vkCopyImageToImageEXT( VkDevice device, const VkCopyImageToImageInfo * pCopyImageToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyImageToImageEXT( device, pCopyImageToImageInfo );
-      }
-
-      VkResult
-        vkTransitionImageLayoutEXT( VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo * pTransitions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkTransitionImageLayoutEXT( device, transitionCount, pTransitions );
-      }
-
-      void vkGetImageSubresourceLayout2EXT( VkDevice                    device,
-                                            VkImage                     image,
-                                            const VkImageSubresource2 * pSubresource,
-                                            VkSubresourceLayout2 *      pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSubresourceLayout2EXT( device, image, pSubresource, pLayout );
-      }
-
-      //=== VK_KHR_map_memory2 ===
-
-      VkResult vkMapMemory2KHR( VkDevice device, const VkMemoryMapInfo * pMemoryMapInfo, void ** ppData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkMapMemory2KHR( device, pMemoryMapInfo, ppData );
-      }
-
-      VkResult vkUnmapMemory2KHR( VkDevice device, const VkMemoryUnmapInfo * pMemoryUnmapInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUnmapMemory2KHR( device, pMemoryUnmapInfo );
-      }
-
-      //=== VK_EXT_swapchain_maintenance1 ===
-
-      VkResult vkReleaseSwapchainImagesEXT( VkDevice device, const VkReleaseSwapchainImagesInfoKHR * pReleaseInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseSwapchainImagesEXT( device, pReleaseInfo );
-      }
-
-      //=== VK_NV_device_generated_commands ===
-
-      void vkGetGeneratedCommandsMemoryRequirementsNV( VkDevice                                            device,
-                                                       const VkGeneratedCommandsMemoryRequirementsInfoNV * pInfo,
-                                                       VkMemoryRequirements2 *                             pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetGeneratedCommandsMemoryRequirementsNV( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkCmdPreprocessGeneratedCommandsNV( VkCommandBuffer                   commandBuffer,
-                                               const VkGeneratedCommandsInfoNV * pGeneratedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPreprocessGeneratedCommandsNV( commandBuffer, pGeneratedCommandsInfo );
-      }
-
-      void vkCmdExecuteGeneratedCommandsNV( VkCommandBuffer                   commandBuffer,
-                                            VkBool32                          isPreprocessed,
-                                            const VkGeneratedCommandsInfoNV * pGeneratedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdExecuteGeneratedCommandsNV( commandBuffer, isPreprocessed, pGeneratedCommandsInfo );
-      }
-
-      void vkCmdBindPipelineShaderGroupNV( VkCommandBuffer     commandBuffer,
-                                           VkPipelineBindPoint pipelineBindPoint,
-                                           VkPipeline          pipeline,
-                                           uint32_t            groupIndex ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindPipelineShaderGroupNV( commandBuffer, pipelineBindPoint, pipeline, groupIndex );
-      }
-
-      VkResult vkCreateIndirectCommandsLayoutNV( VkDevice                                     device,
-                                                 const VkIndirectCommandsLayoutCreateInfoNV * pCreateInfo,
-                                                 const VkAllocationCallbacks *                pAllocator,
-                                                 VkIndirectCommandsLayoutNV *                 pIndirectCommandsLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateIndirectCommandsLayoutNV( device, pCreateInfo, pAllocator, pIndirectCommandsLayout );
-      }
-
-      void vkDestroyIndirectCommandsLayoutNV( VkDevice                      device,
-                                              VkIndirectCommandsLayoutNV    indirectCommandsLayout,
-                                              const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyIndirectCommandsLayoutNV( device, indirectCommandsLayout, pAllocator );
-      }
-
-      //=== VK_EXT_depth_bias_control ===
-
-      void vkCmdSetDepthBias2EXT( VkCommandBuffer commandBuffer, const VkDepthBiasInfoEXT * pDepthBiasInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBias2EXT( commandBuffer, pDepthBiasInfo );
-      }
-
-      //=== VK_EXT_acquire_drm_display ===
-
-      VkResult vkAcquireDrmDisplayEXT( VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireDrmDisplayEXT( physicalDevice, drmFd, display );
-      }
-
-      VkResult vkGetDrmDisplayEXT( VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR * display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDrmDisplayEXT( physicalDevice, drmFd, connectorId, display );
-      }
-
-      //=== VK_EXT_private_data ===
-
-      VkResult vkCreatePrivateDataSlotEXT( VkDevice                            device,
-                                           const VkPrivateDataSlotCreateInfo * pCreateInfo,
-                                           const VkAllocationCallbacks *       pAllocator,
-                                           VkPrivateDataSlot *                 pPrivateDataSlot ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreatePrivateDataSlotEXT( device, pCreateInfo, pAllocator, pPrivateDataSlot );
-      }
-
-      void vkDestroyPrivateDataSlotEXT( VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPrivateDataSlotEXT( device, privateDataSlot, pAllocator );
-      }
-
-      VkResult vkSetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetPrivateDataEXT( device, objectType, objectHandle, privateDataSlot, data );
-      }
-
-      void vkGetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t * pData ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPrivateDataEXT( device, objectType, objectHandle, privateDataSlot, pData );
-      }
-
-      //=== VK_KHR_video_encode_queue ===
-
-      VkResult
-        vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( VkPhysicalDevice                                       physicalDevice,
-                                                                 const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
-                                                                 VkVideoEncodeQualityLevelPropertiesKHR * pQualityLevelProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( physicalDevice, pQualityLevelInfo, pQualityLevelProperties );
-      }
-
-      VkResult vkGetEncodedVideoSessionParametersKHR( VkDevice                                         device,
-                                                      const VkVideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
-                                                      VkVideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
-                                                      size_t *                                         pDataSize,
-                                                      void *                                           pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetEncodedVideoSessionParametersKHR( device, pVideoSessionParametersInfo, pFeedbackInfo, pDataSize, pData );
-      }
-
-      void vkCmdEncodeVideoKHR( VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR * pEncodeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEncodeVideoKHR( commandBuffer, pEncodeInfo );
-      }
-
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-      //=== VK_NV_cuda_kernel_launch ===
-
-      VkResult vkCreateCudaModuleNV( VkDevice                         device,
-                                     const VkCudaModuleCreateInfoNV * pCreateInfo,
-                                     const VkAllocationCallbacks *    pAllocator,
-                                     VkCudaModuleNV *                 pModule ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateCudaModuleNV( device, pCreateInfo, pAllocator, pModule );
-      }
-
-      VkResult vkGetCudaModuleCacheNV( VkDevice device, VkCudaModuleNV module, size_t * pCacheSize, void * pCacheData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetCudaModuleCacheNV( device, module, pCacheSize, pCacheData );
-      }
-
-      VkResult vkCreateCudaFunctionNV( VkDevice                           device,
-                                       const VkCudaFunctionCreateInfoNV * pCreateInfo,
-                                       const VkAllocationCallbacks *      pAllocator,
-                                       VkCudaFunctionNV *                 pFunction ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateCudaFunctionNV( device, pCreateInfo, pAllocator, pFunction );
-      }
-
-      void vkDestroyCudaModuleNV( VkDevice device, VkCudaModuleNV module, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyCudaModuleNV( device, module, pAllocator );
-      }
-
-      void vkDestroyCudaFunctionNV( VkDevice device, VkCudaFunctionNV function, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyCudaFunctionNV( device, function, pAllocator );
-      }
-
-      void vkCmdCudaLaunchKernelNV( VkCommandBuffer commandBuffer, const VkCudaLaunchInfoNV * pLaunchInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCudaLaunchKernelNV( commandBuffer, pLaunchInfo );
-      }
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-      //=== VK_QCOM_tile_shading ===
-
-      void vkCmdDispatchTileQCOM( VkCommandBuffer commandBuffer, const VkDispatchTileInfoQCOM * pDispatchTileInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchTileQCOM( commandBuffer, pDispatchTileInfo );
-      }
-
-      void vkCmdBeginPerTileExecutionQCOM( VkCommandBuffer commandBuffer, const VkPerTileBeginInfoQCOM * pPerTileBeginInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginPerTileExecutionQCOM( commandBuffer, pPerTileBeginInfo );
-      }
-
-      void vkCmdEndPerTileExecutionQCOM( VkCommandBuffer commandBuffer, const VkPerTileEndInfoQCOM * pPerTileEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndPerTileExecutionQCOM( commandBuffer, pPerTileEndInfo );
-      }
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-      //=== VK_EXT_metal_objects ===
-
-      void vkExportMetalObjectsEXT( VkDevice device, VkExportMetalObjectsInfoEXT * pMetalObjectsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkExportMetalObjectsEXT( device, pMetalObjectsInfo );
-      }
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-      //=== VK_KHR_synchronization2 ===
-
-      void vkCmdSetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetEvent2KHR( commandBuffer, event, pDependencyInfo );
-      }
-
-      void vkCmdResetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResetEvent2KHR( commandBuffer, event, stageMask );
-      }
-
-      void vkCmdWaitEvents2KHR( VkCommandBuffer          commandBuffer,
-                                uint32_t                 eventCount,
-                                const VkEvent *          pEvents,
-                                const VkDependencyInfo * pDependencyInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWaitEvents2KHR( commandBuffer, eventCount, pEvents, pDependencyInfos );
-      }
-
-      void vkCmdPipelineBarrier2KHR( VkCommandBuffer commandBuffer, const VkDependencyInfo * pDependencyInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPipelineBarrier2KHR( commandBuffer, pDependencyInfo );
-      }
-
-      void
-        vkCmdWriteTimestamp2KHR( VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteTimestamp2KHR( commandBuffer, stage, queryPool, query );
-      }
-
-      VkResult vkQueueSubmit2KHR( VkQueue queue, uint32_t submitCount, const VkSubmitInfo2 * pSubmits, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueSubmit2KHR( queue, submitCount, pSubmits, fence );
-      }
-
-      //=== VK_EXT_descriptor_buffer ===
-
-      void vkGetDescriptorSetLayoutSizeEXT( VkDevice device, VkDescriptorSetLayout layout, VkDeviceSize * pLayoutSizeInBytes ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetLayoutSizeEXT( device, layout, pLayoutSizeInBytes );
-      }
-
-      void vkGetDescriptorSetLayoutBindingOffsetEXT( VkDevice              device,
-                                                     VkDescriptorSetLayout layout,
-                                                     uint32_t              binding,
-                                                     VkDeviceSize *        pOffset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetLayoutBindingOffsetEXT( device, layout, binding, pOffset );
-      }
-
-      void vkGetDescriptorEXT( VkDevice device, const VkDescriptorGetInfoEXT * pDescriptorInfo, size_t dataSize, void * pDescriptor ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorEXT( device, pDescriptorInfo, dataSize, pDescriptor );
-      }
-
-      void vkCmdBindDescriptorBuffersEXT( VkCommandBuffer                          commandBuffer,
-                                          uint32_t                                 bufferCount,
-                                          const VkDescriptorBufferBindingInfoEXT * pBindingInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorBuffersEXT( commandBuffer, bufferCount, pBindingInfos );
-      }
-
-      void vkCmdSetDescriptorBufferOffsetsEXT( VkCommandBuffer      commandBuffer,
-                                               VkPipelineBindPoint  pipelineBindPoint,
-                                               VkPipelineLayout     layout,
-                                               uint32_t             firstSet,
-                                               uint32_t             setCount,
-                                               const uint32_t *     pBufferIndices,
-                                               const VkDeviceSize * pOffsets ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDescriptorBufferOffsetsEXT( commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pBufferIndices, pOffsets );
-      }
-
-      void vkCmdBindDescriptorBufferEmbeddedSamplersEXT( VkCommandBuffer     commandBuffer,
-                                                         VkPipelineBindPoint pipelineBindPoint,
-                                                         VkPipelineLayout    layout,
-                                                         uint32_t            set ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorBufferEmbeddedSamplersEXT( commandBuffer, pipelineBindPoint, layout, set );
-      }
-
-      VkResult
-        vkGetBufferOpaqueCaptureDescriptorDataEXT( VkDevice device, const VkBufferCaptureDescriptorDataInfoEXT * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
-      }
-
-      VkResult
-        vkGetImageOpaqueCaptureDescriptorDataEXT( VkDevice device, const VkImageCaptureDescriptorDataInfoEXT * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
-      }
-
-      VkResult vkGetImageViewOpaqueCaptureDescriptorDataEXT( VkDevice                                        device,
-                                                             const VkImageViewCaptureDescriptorDataInfoEXT * pInfo,
-                                                             void *                                          pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageViewOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
-      }
-
-      VkResult vkGetSamplerOpaqueCaptureDescriptorDataEXT( VkDevice                                      device,
-                                                           const VkSamplerCaptureDescriptorDataInfoEXT * pInfo,
-                                                           void *                                        pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSamplerOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
-      }
-
-      VkResult vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT( VkDevice                                                    device,
-                                                                         const VkAccelerationStructureCaptureDescriptorDataInfoEXT * pInfo,
-                                                                         void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT( device, pInfo, pData );
-      }
-
-      //=== VK_NV_fragment_shading_rate_enums ===
-
-      void vkCmdSetFragmentShadingRateEnumNV( VkCommandBuffer                          commandBuffer,
-                                              VkFragmentShadingRateNV                  shadingRate,
-                                              const VkFragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetFragmentShadingRateEnumNV( commandBuffer, shadingRate, combinerOps );
-      }
-
-      //=== VK_EXT_mesh_shader ===
-
-      void vkCmdDrawMeshTasksEXT( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksEXT( commandBuffer, groupCountX, groupCountY, groupCountZ );
-      }
-
-      void vkCmdDrawMeshTasksIndirectEXT( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksIndirectEXT( commandBuffer, buffer, offset, drawCount, stride );
-      }
-
-      void vkCmdDrawMeshTasksIndirectCountEXT( VkCommandBuffer commandBuffer,
-                                               VkBuffer        buffer,
-                                               VkDeviceSize    offset,
-                                               VkBuffer        countBuffer,
-                                               VkDeviceSize    countBufferOffset,
-                                               uint32_t        maxDrawCount,
-                                               uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMeshTasksIndirectCountEXT( commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride );
-      }
-
-      //=== VK_KHR_copy_commands2 ===
-
-      void vkCmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 * pCopyBufferInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBuffer2KHR( commandBuffer, pCopyBufferInfo );
-      }
-
-      void vkCmdCopyImage2KHR( VkCommandBuffer commandBuffer, const VkCopyImageInfo2 * pCopyImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImage2KHR( commandBuffer, pCopyImageInfo );
-      }
-
-      void vkCmdCopyBufferToImage2KHR( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 * pCopyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyBufferToImage2KHR( commandBuffer, pCopyBufferToImageInfo );
-      }
-
-      void vkCmdCopyImageToBuffer2KHR( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 * pCopyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyImageToBuffer2KHR( commandBuffer, pCopyImageToBufferInfo );
-      }
-
-      void vkCmdBlitImage2KHR( VkCommandBuffer commandBuffer, const VkBlitImageInfo2 * pBlitImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBlitImage2KHR( commandBuffer, pBlitImageInfo );
-      }
-
-      void vkCmdResolveImage2KHR( VkCommandBuffer commandBuffer, const VkResolveImageInfo2 * pResolveImageInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdResolveImage2KHR( commandBuffer, pResolveImageInfo );
-      }
-
-      //=== VK_EXT_device_fault ===
-
-      VkResult vkGetDeviceFaultInfoEXT( VkDevice device, VkDeviceFaultCountsEXT * pFaultCounts, VkDeviceFaultInfoEXT * pFaultInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceFaultInfoEXT( device, pFaultCounts, pFaultInfo );
-      }
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-      //=== VK_NV_acquire_winrt_display ===
-
-      VkResult vkAcquireWinrtDisplayNV( VkPhysicalDevice physicalDevice, VkDisplayKHR display ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireWinrtDisplayNV( physicalDevice, display );
-      }
-
-      VkResult vkGetWinrtDisplayNV( VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR * pDisplay ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetWinrtDisplayNV( physicalDevice, deviceRelativeId, pDisplay );
-      }
+    VkResult vkGetWinrtDisplayNV( VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR * pDisplay ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetWinrtDisplayNV( physicalDevice, deviceRelativeId, pDisplay );
+    }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-      //=== VK_EXT_directfb_surface ===
+    //=== VK_EXT_directfb_surface ===
 
-      VkResult vkCreateDirectFBSurfaceEXT( VkInstance                             instance,
-                                           const VkDirectFBSurfaceCreateInfoEXT * pCreateInfo,
-                                           const VkAllocationCallbacks *          pAllocator,
-                                           VkSurfaceKHR *                         pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDirectFBSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
-      }
+    VkResult vkCreateDirectFBSurfaceEXT( VkInstance                             instance,
+                                         const VkDirectFBSurfaceCreateInfoEXT * pCreateInfo,
+                                         const VkAllocationCallbacks *          pAllocator,
+                                         VkSurfaceKHR *                         pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateDirectFBSurfaceEXT( instance, pCreateInfo, pAllocator, pSurface );
+    }
 
-      VkBool32 vkGetPhysicalDeviceDirectFBPresentationSupportEXT( VkPhysicalDevice physicalDevice,
-                                                                  uint32_t         queueFamilyIndex,
-                                                                  IDirectFB *      dfb ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceDirectFBPresentationSupportEXT( physicalDevice, queueFamilyIndex, dfb );
-      }
+    VkBool32
+      vkGetPhysicalDeviceDirectFBPresentationSupportEXT( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, IDirectFB * dfb ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceDirectFBPresentationSupportEXT( physicalDevice, queueFamilyIndex, dfb );
+    }
 #  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
-      //=== VK_EXT_vertex_input_dynamic_state ===
+    //=== VK_EXT_vertex_input_dynamic_state ===
 
-      void vkCmdSetVertexInputEXT( VkCommandBuffer                               commandBuffer,
-                                   uint32_t                                      vertexBindingDescriptionCount,
-                                   const VkVertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
-                                   uint32_t                                      vertexAttributeDescriptionCount,
-                                   const VkVertexInputAttributeDescription2EXT * pVertexAttributeDescriptions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetVertexInputEXT(
-          commandBuffer, vertexBindingDescriptionCount, pVertexBindingDescriptions, vertexAttributeDescriptionCount, pVertexAttributeDescriptions );
-      }
-
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-      //=== VK_FUCHSIA_external_memory ===
-
-      VkResult vkGetMemoryZirconHandleFUCHSIA( VkDevice                                   device,
-                                               const VkMemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                               zx_handle_t *                              pZirconHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryZirconHandleFUCHSIA( device, pGetZirconHandleInfo, pZirconHandle );
-      }
-
-      VkResult vkGetMemoryZirconHandlePropertiesFUCHSIA( VkDevice                                device,
-                                                         VkExternalMemoryHandleTypeFlagBits      handleType,
-                                                         zx_handle_t                             zirconHandle,
-                                                         VkMemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryZirconHandlePropertiesFUCHSIA( device, handleType, zirconHandle, pMemoryZirconHandleProperties );
-      }
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-      //=== VK_FUCHSIA_external_semaphore ===
-
-      VkResult
-        vkImportSemaphoreZirconHandleFUCHSIA( VkDevice                                         device,
-                                              const VkImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkImportSemaphoreZirconHandleFUCHSIA( device, pImportSemaphoreZirconHandleInfo );
-      }
-
-      VkResult vkGetSemaphoreZirconHandleFUCHSIA( VkDevice                                      device,
-                                                  const VkSemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                                  zx_handle_t *                                 pZirconHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSemaphoreZirconHandleFUCHSIA( device, pGetZirconHandleInfo, pZirconHandle );
-      }
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-      //=== VK_FUCHSIA_buffer_collection ===
-
-      VkResult vkCreateBufferCollectionFUCHSIA( VkDevice                                    device,
-                                                const VkBufferCollectionCreateInfoFUCHSIA * pCreateInfo,
-                                                const VkAllocationCallbacks *               pAllocator,
-                                                VkBufferCollectionFUCHSIA *                 pCollection ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateBufferCollectionFUCHSIA( device, pCreateInfo, pAllocator, pCollection );
-      }
-
-      VkResult vkSetBufferCollectionImageConstraintsFUCHSIA( VkDevice                              device,
-                                                             VkBufferCollectionFUCHSIA             collection,
-                                                             const VkImageConstraintsInfoFUCHSIA * pImageConstraintsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetBufferCollectionImageConstraintsFUCHSIA( device, collection, pImageConstraintsInfo );
-      }
-
-      VkResult vkSetBufferCollectionBufferConstraintsFUCHSIA( VkDevice                               device,
-                                                              VkBufferCollectionFUCHSIA              collection,
-                                                              const VkBufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetBufferCollectionBufferConstraintsFUCHSIA( device, collection, pBufferConstraintsInfo );
-      }
-
-      void vkDestroyBufferCollectionFUCHSIA( VkDevice                      device,
-                                             VkBufferCollectionFUCHSIA     collection,
-                                             const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyBufferCollectionFUCHSIA( device, collection, pAllocator );
-      }
-
-      VkResult vkGetBufferCollectionPropertiesFUCHSIA( VkDevice                              device,
-                                                       VkBufferCollectionFUCHSIA             collection,
-                                                       VkBufferCollectionPropertiesFUCHSIA * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetBufferCollectionPropertiesFUCHSIA( device, collection, pProperties );
-      }
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-      //=== VK_HUAWEI_subpass_shading ===
-
-      VkResult
-        vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( VkDevice device, VkRenderPass renderpass, VkExtent2D * pMaxWorkgroupSize ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( device, renderpass, pMaxWorkgroupSize );
-      }
-
-      void vkCmdSubpassShadingHUAWEI( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSubpassShadingHUAWEI( commandBuffer );
-      }
-
-      //=== VK_HUAWEI_invocation_mask ===
-
-      void vkCmdBindInvocationMaskHUAWEI( VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindInvocationMaskHUAWEI( commandBuffer, imageView, imageLayout );
-      }
-
-      //=== VK_NV_external_memory_rdma ===
-
-      VkResult vkGetMemoryRemoteAddressNV( VkDevice                               device,
-                                           const VkMemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
-                                           VkRemoteAddressNV *                    pAddress ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryRemoteAddressNV( device, pMemoryGetRemoteAddressInfo, pAddress );
-      }
-
-      //=== VK_EXT_pipeline_properties ===
-
-      VkResult vkGetPipelinePropertiesEXT( VkDevice                  device,
-                                           const VkPipelineInfoEXT * pPipelineInfo,
-                                           VkBaseOutStructure *      pPipelineProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelinePropertiesEXT( device, pPipelineInfo, pPipelineProperties );
-      }
-
-      //=== VK_EXT_extended_dynamic_state2 ===
-
-      void vkCmdSetPatchControlPointsEXT( VkCommandBuffer commandBuffer, uint32_t patchControlPoints ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPatchControlPointsEXT( commandBuffer, patchControlPoints );
-      }
-
-      void vkCmdSetRasterizerDiscardEnableEXT( VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRasterizerDiscardEnableEXT( commandBuffer, rasterizerDiscardEnable );
-      }
-
-      void vkCmdSetDepthBiasEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthBiasEnableEXT( commandBuffer, depthBiasEnable );
-      }
-
-      void vkCmdSetLogicOpEXT( VkCommandBuffer commandBuffer, VkLogicOp logicOp ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLogicOpEXT( commandBuffer, logicOp );
-      }
-
-      void vkCmdSetPrimitiveRestartEnableEXT( VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPrimitiveRestartEnableEXT( commandBuffer, primitiveRestartEnable );
-      }
-
-#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      //=== VK_QNX_screen_surface ===
-
-      VkResult vkCreateScreenSurfaceQNX( VkInstance                           instance,
-                                         const VkScreenSurfaceCreateInfoQNX * pCreateInfo,
-                                         const VkAllocationCallbacks *        pAllocator,
-                                         VkSurfaceKHR *                       pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateScreenSurfaceQNX( instance, pCreateInfo, pAllocator, pSurface );
-      }
-
-      VkBool32 vkGetPhysicalDeviceScreenPresentationSupportQNX( VkPhysicalDevice        physicalDevice,
-                                                                uint32_t                queueFamilyIndex,
-                                                                struct _screen_window * window ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceScreenPresentationSupportQNX( physicalDevice, queueFamilyIndex, window );
-      }
-#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-      //=== VK_EXT_color_write_enable ===
-
-      void vkCmdSetColorWriteEnableEXT( VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32 * pColorWriteEnables ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetColorWriteEnableEXT( commandBuffer, attachmentCount, pColorWriteEnables );
-      }
-
-      //=== VK_KHR_ray_tracing_maintenance1 ===
-
-      void vkCmdTraceRaysIndirect2KHR( VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdTraceRaysIndirect2KHR( commandBuffer, indirectDeviceAddress );
-      }
-
-      //=== VK_EXT_multi_draw ===
-
-      void vkCmdDrawMultiEXT( VkCommandBuffer            commandBuffer,
-                              uint32_t                   drawCount,
-                              const VkMultiDrawInfoEXT * pVertexInfo,
-                              uint32_t                   instanceCount,
-                              uint32_t                   firstInstance,
-                              uint32_t                   stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMultiEXT( commandBuffer, drawCount, pVertexInfo, instanceCount, firstInstance, stride );
-      }
-
-      void vkCmdDrawMultiIndexedEXT( VkCommandBuffer                   commandBuffer,
-                                     uint32_t                          drawCount,
-                                     const VkMultiDrawIndexedInfoEXT * pIndexInfo,
-                                     uint32_t                          instanceCount,
-                                     uint32_t                          firstInstance,
-                                     uint32_t                          stride,
-                                     const int32_t *                   pVertexOffset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawMultiIndexedEXT( commandBuffer, drawCount, pIndexInfo, instanceCount, firstInstance, stride, pVertexOffset );
-      }
-
-      //=== VK_EXT_opacity_micromap ===
-
-      VkResult vkCreateMicromapEXT( VkDevice                        device,
-                                    const VkMicromapCreateInfoEXT * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkMicromapEXT *                 pMicromap ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateMicromapEXT( device, pCreateInfo, pAllocator, pMicromap );
-      }
-
-      void vkDestroyMicromapEXT( VkDevice device, VkMicromapEXT micromap, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyMicromapEXT( device, micromap, pAllocator );
-      }
-
-      void vkCmdBuildMicromapsEXT( VkCommandBuffer commandBuffer, uint32_t infoCount, const VkMicromapBuildInfoEXT * pInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildMicromapsEXT( commandBuffer, infoCount, pInfos );
-      }
-
-      VkResult vkBuildMicromapsEXT( VkDevice                       device,
-                                    VkDeferredOperationKHR         deferredOperation,
-                                    uint32_t                       infoCount,
-                                    const VkMicromapBuildInfoEXT * pInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBuildMicromapsEXT( device, deferredOperation, infoCount, pInfos );
-      }
-
-      VkResult vkCopyMicromapEXT( VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMicromapEXT( device, deferredOperation, pInfo );
-      }
-
-      VkResult vkCopyMicromapToMemoryEXT( VkDevice                              device,
-                                          VkDeferredOperationKHR                deferredOperation,
-                                          const VkCopyMicromapToMemoryInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMicromapToMemoryEXT( device, deferredOperation, pInfo );
-      }
-
-      VkResult vkCopyMemoryToMicromapEXT( VkDevice                              device,
-                                          VkDeferredOperationKHR                deferredOperation,
-                                          const VkCopyMemoryToMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCopyMemoryToMicromapEXT( device, deferredOperation, pInfo );
-      }
-
-      VkResult vkWriteMicromapsPropertiesEXT( VkDevice              device,
-                                              uint32_t              micromapCount,
-                                              const VkMicromapEXT * pMicromaps,
-                                              VkQueryType           queryType,
-                                              size_t                dataSize,
-                                              void *                pData,
-                                              size_t                stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWriteMicromapsPropertiesEXT( device, micromapCount, pMicromaps, queryType, dataSize, pData, stride );
-      }
-
-      void vkCmdCopyMicromapEXT( VkCommandBuffer commandBuffer, const VkCopyMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMicromapEXT( commandBuffer, pInfo );
-      }
-
-      void vkCmdCopyMicromapToMemoryEXT( VkCommandBuffer commandBuffer, const VkCopyMicromapToMemoryInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMicromapToMemoryEXT( commandBuffer, pInfo );
-      }
-
-      void vkCmdCopyMemoryToMicromapEXT( VkCommandBuffer commandBuffer, const VkCopyMemoryToMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryToMicromapEXT( commandBuffer, pInfo );
-      }
-
-      void vkCmdWriteMicromapsPropertiesEXT( VkCommandBuffer       commandBuffer,
-                                             uint32_t              micromapCount,
-                                             const VkMicromapEXT * pMicromaps,
-                                             VkQueryType           queryType,
-                                             VkQueryPool           queryPool,
-                                             uint32_t              firstQuery ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdWriteMicromapsPropertiesEXT( commandBuffer, micromapCount, pMicromaps, queryType, queryPool, firstQuery );
-      }
-
-      void vkGetDeviceMicromapCompatibilityEXT( VkDevice                                  device,
-                                                const VkMicromapVersionInfoEXT *          pVersionInfo,
-                                                VkAccelerationStructureCompatibilityKHR * pCompatibility ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceMicromapCompatibilityEXT( device, pVersionInfo, pCompatibility );
-      }
-
-      void vkGetMicromapBuildSizesEXT( VkDevice                            device,
-                                       VkAccelerationStructureBuildTypeKHR buildType,
-                                       const VkMicromapBuildInfoEXT *      pBuildInfo,
-                                       VkMicromapBuildSizesInfoEXT *       pSizeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMicromapBuildSizesEXT( device, buildType, pBuildInfo, pSizeInfo );
-      }
-
-      //=== VK_HUAWEI_cluster_culling_shader ===
-
-      void vkCmdDrawClusterHUAWEI( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawClusterHUAWEI( commandBuffer, groupCountX, groupCountY, groupCountZ );
-      }
-
-      void vkCmdDrawClusterIndirectHUAWEI( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDrawClusterIndirectHUAWEI( commandBuffer, buffer, offset );
-      }
-
-      //=== VK_EXT_pageable_device_local_memory ===
-
-      void vkSetDeviceMemoryPriorityEXT( VkDevice device, VkDeviceMemory memory, float priority ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetDeviceMemoryPriorityEXT( device, memory, priority );
-      }
-
-      //=== VK_KHR_maintenance4 ===
-
-      void vkGetDeviceBufferMemoryRequirementsKHR( VkDevice                                 device,
-                                                   const VkDeviceBufferMemoryRequirements * pInfo,
-                                                   VkMemoryRequirements2 *                  pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceBufferMemoryRequirementsKHR( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetDeviceImageMemoryRequirementsKHR( VkDevice                                device,
-                                                  const VkDeviceImageMemoryRequirements * pInfo,
-                                                  VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageMemoryRequirementsKHR( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkGetDeviceImageSparseMemoryRequirementsKHR( VkDevice                                device,
-                                                        const VkDeviceImageMemoryRequirements * pInfo,
-                                                        uint32_t *                              pSparseMemoryRequirementCount,
-                                                        VkSparseImageMemoryRequirements2 *      pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageSparseMemoryRequirementsKHR( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
-      }
-
-      //=== VK_VALVE_descriptor_set_host_mapping ===
-
-      void vkGetDescriptorSetLayoutHostMappingInfoVALVE( VkDevice                                     device,
-                                                         const VkDescriptorSetBindingReferenceVALVE * pBindingReference,
-                                                         VkDescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetLayoutHostMappingInfoVALVE( device, pBindingReference, pHostMapping );
-      }
-
-      void vkGetDescriptorSetHostMappingVALVE( VkDevice device, VkDescriptorSet descriptorSet, void ** ppData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDescriptorSetHostMappingVALVE( device, descriptorSet, ppData );
-      }
-
-      //=== VK_NV_copy_memory_indirect ===
-
-      void vkCmdCopyMemoryIndirectNV( VkCommandBuffer commandBuffer,
-                                      VkDeviceAddress copyBufferAddress,
-                                      uint32_t        copyCount,
-                                      uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryIndirectNV( commandBuffer, copyBufferAddress, copyCount, stride );
-      }
-
-      void vkCmdCopyMemoryToImageIndirectNV( VkCommandBuffer                  commandBuffer,
-                                             VkDeviceAddress                  copyBufferAddress,
-                                             uint32_t                         copyCount,
-                                             uint32_t                         stride,
-                                             VkImage                          dstImage,
-                                             VkImageLayout                    dstImageLayout,
-                                             const VkImageSubresourceLayers * pImageSubresources ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryToImageIndirectNV( commandBuffer, copyBufferAddress, copyCount, stride, dstImage, dstImageLayout, pImageSubresources );
-      }
-
-      //=== VK_NV_memory_decompression ===
-
-      void vkCmdDecompressMemoryNV( VkCommandBuffer                    commandBuffer,
-                                    uint32_t                           decompressRegionCount,
-                                    const VkDecompressMemoryRegionNV * pDecompressMemoryRegions ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDecompressMemoryNV( commandBuffer, decompressRegionCount, pDecompressMemoryRegions );
-      }
-
-      void vkCmdDecompressMemoryIndirectCountNV( VkCommandBuffer commandBuffer,
-                                                 VkDeviceAddress indirectCommandsAddress,
-                                                 VkDeviceAddress indirectCommandsCountAddress,
-                                                 uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDecompressMemoryIndirectCountNV( commandBuffer, indirectCommandsAddress, indirectCommandsCountAddress, stride );
-      }
-
-      //=== VK_NV_device_generated_commands_compute ===
-
-      void vkGetPipelineIndirectMemoryRequirementsNV( VkDevice                            device,
-                                                      const VkComputePipelineCreateInfo * pCreateInfo,
-                                                      VkMemoryRequirements2 *             pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineIndirectMemoryRequirementsNV( device, pCreateInfo, pMemoryRequirements );
-      }
-
-      void vkCmdUpdatePipelineIndirectBufferNV( VkCommandBuffer     commandBuffer,
-                                                VkPipelineBindPoint pipelineBindPoint,
-                                                VkPipeline          pipeline ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdUpdatePipelineIndirectBufferNV( commandBuffer, pipelineBindPoint, pipeline );
-      }
-
-      VkDeviceAddress vkGetPipelineIndirectDeviceAddressNV( VkDevice device, const VkPipelineIndirectDeviceAddressInfoNV * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineIndirectDeviceAddressNV( device, pInfo );
-      }
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_external_memory ===
-
-      VkResult vkGetNativeBufferPropertiesOHOS( VkDevice                       device,
-                                                const struct OH_NativeBuffer * buffer,
-                                                VkNativeBufferPropertiesOHOS * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetNativeBufferPropertiesOHOS( device, buffer, pProperties );
-      }
-
-      VkResult vkGetMemoryNativeBufferOHOS( VkDevice                                device,
-                                            const VkMemoryGetNativeBufferInfoOHOS * pInfo,
-                                            struct OH_NativeBuffer **               pBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryNativeBufferOHOS( device, pInfo, pBuffer );
-      }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-      //=== VK_EXT_extended_dynamic_state3 ===
-
-      void vkCmdSetDepthClampEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthClampEnableEXT( commandBuffer, depthClampEnable );
-      }
-
-      void vkCmdSetPolygonModeEXT( VkCommandBuffer commandBuffer, VkPolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetPolygonModeEXT( commandBuffer, polygonMode );
-      }
-
-      void vkCmdSetRasterizationSamplesEXT( VkCommandBuffer commandBuffer, VkSampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRasterizationSamplesEXT( commandBuffer, rasterizationSamples );
-      }
-
-      void vkCmdSetSampleMaskEXT( VkCommandBuffer commandBuffer, VkSampleCountFlagBits samples, const VkSampleMask * pSampleMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetSampleMaskEXT( commandBuffer, samples, pSampleMask );
-      }
-
-      void vkCmdSetAlphaToCoverageEnableEXT( VkCommandBuffer commandBuffer, VkBool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetAlphaToCoverageEnableEXT( commandBuffer, alphaToCoverageEnable );
-      }
-
-      void vkCmdSetAlphaToOneEnableEXT( VkCommandBuffer commandBuffer, VkBool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetAlphaToOneEnableEXT( commandBuffer, alphaToOneEnable );
-      }
-
-      void vkCmdSetLogicOpEnableEXT( VkCommandBuffer commandBuffer, VkBool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLogicOpEnableEXT( commandBuffer, logicOpEnable );
-      }
-
-      void vkCmdSetColorBlendEnableEXT( VkCommandBuffer  commandBuffer,
-                                        uint32_t         firstAttachment,
-                                        uint32_t         attachmentCount,
-                                        const VkBool32 * pColorBlendEnables ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetColorBlendEnableEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendEnables );
-      }
-
-      void vkCmdSetColorBlendEquationEXT( VkCommandBuffer                 commandBuffer,
-                                          uint32_t                        firstAttachment,
-                                          uint32_t                        attachmentCount,
-                                          const VkColorBlendEquationEXT * pColorBlendEquations ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetColorBlendEquationEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendEquations );
-      }
-
-      void vkCmdSetColorWriteMaskEXT( VkCommandBuffer               commandBuffer,
-                                      uint32_t                      firstAttachment,
-                                      uint32_t                      attachmentCount,
-                                      const VkColorComponentFlags * pColorWriteMasks ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetColorWriteMaskEXT( commandBuffer, firstAttachment, attachmentCount, pColorWriteMasks );
-      }
-
-      void vkCmdSetTessellationDomainOriginEXT( VkCommandBuffer commandBuffer, VkTessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetTessellationDomainOriginEXT( commandBuffer, domainOrigin );
-      }
-
-      void vkCmdSetRasterizationStreamEXT( VkCommandBuffer commandBuffer, uint32_t rasterizationStream ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRasterizationStreamEXT( commandBuffer, rasterizationStream );
-      }
-
-      void vkCmdSetConservativeRasterizationModeEXT( VkCommandBuffer                    commandBuffer,
-                                                     VkConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetConservativeRasterizationModeEXT( commandBuffer, conservativeRasterizationMode );
-      }
-
-      void vkCmdSetExtraPrimitiveOverestimationSizeEXT( VkCommandBuffer commandBuffer, float extraPrimitiveOverestimationSize ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetExtraPrimitiveOverestimationSizeEXT( commandBuffer, extraPrimitiveOverestimationSize );
-      }
-
-      void vkCmdSetDepthClipEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthClipEnableEXT( commandBuffer, depthClipEnable );
-      }
-
-      void vkCmdSetSampleLocationsEnableEXT( VkCommandBuffer commandBuffer, VkBool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetSampleLocationsEnableEXT( commandBuffer, sampleLocationsEnable );
-      }
-
-      void vkCmdSetColorBlendAdvancedEXT( VkCommandBuffer                 commandBuffer,
-                                          uint32_t                        firstAttachment,
-                                          uint32_t                        attachmentCount,
-                                          const VkColorBlendAdvancedEXT * pColorBlendAdvanced ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetColorBlendAdvancedEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendAdvanced );
-      }
-
-      void vkCmdSetProvokingVertexModeEXT( VkCommandBuffer commandBuffer, VkProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetProvokingVertexModeEXT( commandBuffer, provokingVertexMode );
-      }
-
-      void vkCmdSetLineRasterizationModeEXT( VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineRasterizationModeEXT( commandBuffer, lineRasterizationMode );
-      }
-
-      void vkCmdSetLineStippleEnableEXT( VkCommandBuffer commandBuffer, VkBool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineStippleEnableEXT( commandBuffer, stippledLineEnable );
-      }
-
-      void vkCmdSetDepthClipNegativeOneToOneEXT( VkCommandBuffer commandBuffer, VkBool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthClipNegativeOneToOneEXT( commandBuffer, negativeOneToOne );
-      }
-
-      void vkCmdSetViewportWScalingEnableNV( VkCommandBuffer commandBuffer, VkBool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportWScalingEnableNV( commandBuffer, viewportWScalingEnable );
-      }
-
-      void vkCmdSetViewportSwizzleNV( VkCommandBuffer             commandBuffer,
-                                      uint32_t                    firstViewport,
-                                      uint32_t                    viewportCount,
-                                      const VkViewportSwizzleNV * pViewportSwizzles ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetViewportSwizzleNV( commandBuffer, firstViewport, viewportCount, pViewportSwizzles );
-      }
-
-      void vkCmdSetCoverageToColorEnableNV( VkCommandBuffer commandBuffer, VkBool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageToColorEnableNV( commandBuffer, coverageToColorEnable );
-      }
-
-      void vkCmdSetCoverageToColorLocationNV( VkCommandBuffer commandBuffer, uint32_t coverageToColorLocation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageToColorLocationNV( commandBuffer, coverageToColorLocation );
-      }
-
-      void vkCmdSetCoverageModulationModeNV( VkCommandBuffer commandBuffer, VkCoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageModulationModeNV( commandBuffer, coverageModulationMode );
-      }
-
-      void vkCmdSetCoverageModulationTableEnableNV( VkCommandBuffer commandBuffer, VkBool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageModulationTableEnableNV( commandBuffer, coverageModulationTableEnable );
-      }
-
-      void vkCmdSetCoverageModulationTableNV( VkCommandBuffer commandBuffer,
-                                              uint32_t        coverageModulationTableCount,
-                                              const float *   pCoverageModulationTable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageModulationTableNV( commandBuffer, coverageModulationTableCount, pCoverageModulationTable );
-      }
-
-      void vkCmdSetShadingRateImageEnableNV( VkCommandBuffer commandBuffer, VkBool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetShadingRateImageEnableNV( commandBuffer, shadingRateImageEnable );
-      }
-
-      void vkCmdSetRepresentativeFragmentTestEnableNV( VkCommandBuffer commandBuffer, VkBool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetRepresentativeFragmentTestEnableNV( commandBuffer, representativeFragmentTestEnable );
-      }
-
-      void vkCmdSetCoverageReductionModeNV( VkCommandBuffer commandBuffer, VkCoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetCoverageReductionModeNV( commandBuffer, coverageReductionMode );
-      }
-
-      //=== VK_ARM_tensors ===
-
-      VkResult vkCreateTensorARM( VkDevice                      device,
-                                  const VkTensorCreateInfoARM * pCreateInfo,
-                                  const VkAllocationCallbacks * pAllocator,
-                                  VkTensorARM *                 pTensor ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateTensorARM( device, pCreateInfo, pAllocator, pTensor );
-      }
-
-      void vkDestroyTensorARM( VkDevice device, VkTensorARM tensor, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyTensorARM( device, tensor, pAllocator );
-      }
-
-      VkResult vkCreateTensorViewARM( VkDevice                          device,
-                                      const VkTensorViewCreateInfoARM * pCreateInfo,
-                                      const VkAllocationCallbacks *     pAllocator,
-                                      VkTensorViewARM *                 pView ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateTensorViewARM( device, pCreateInfo, pAllocator, pView );
-      }
-
-      void vkDestroyTensorViewARM( VkDevice device, VkTensorViewARM tensorView, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyTensorViewARM( device, tensorView, pAllocator );
-      }
-
-      void vkGetTensorMemoryRequirementsARM( VkDevice                                  device,
-                                             const VkTensorMemoryRequirementsInfoARM * pInfo,
-                                             VkMemoryRequirements2 *                   pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetTensorMemoryRequirementsARM( device, pInfo, pMemoryRequirements );
-      }
-
-      VkResult vkBindTensorMemoryARM( VkDevice device, uint32_t bindInfoCount, const VkBindTensorMemoryInfoARM * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindTensorMemoryARM( device, bindInfoCount, pBindInfos );
-      }
-
-      void vkGetDeviceTensorMemoryRequirementsARM( VkDevice                                    device,
-                                                   const VkDeviceTensorMemoryRequirementsARM * pInfo,
-                                                   VkMemoryRequirements2 *                     pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceTensorMemoryRequirementsARM( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkCmdCopyTensorARM( VkCommandBuffer commandBuffer, const VkCopyTensorInfoARM * pCopyTensorInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyTensorARM( commandBuffer, pCopyTensorInfo );
-      }
-
-      void vkGetPhysicalDeviceExternalTensorPropertiesARM( VkPhysicalDevice                              physicalDevice,
-                                                           const VkPhysicalDeviceExternalTensorInfoARM * pExternalTensorInfo,
-                                                           VkExternalTensorPropertiesARM *               pExternalTensorProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceExternalTensorPropertiesARM( physicalDevice, pExternalTensorInfo, pExternalTensorProperties );
-      }
-
-      VkResult
-        vkGetTensorOpaqueCaptureDescriptorDataARM( VkDevice device, const VkTensorCaptureDescriptorDataInfoARM * pInfo, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetTensorOpaqueCaptureDescriptorDataARM( device, pInfo, pData );
-      }
-
-      VkResult vkGetTensorViewOpaqueCaptureDescriptorDataARM( VkDevice                                         device,
-                                                              const VkTensorViewCaptureDescriptorDataInfoARM * pInfo,
-                                                              void *                                           pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetTensorViewOpaqueCaptureDescriptorDataARM( device, pInfo, pData );
-      }
-
-      //=== VK_EXT_shader_module_identifier ===
-
-      void vkGetShaderModuleIdentifierEXT( VkDevice device, VkShaderModule shaderModule, VkShaderModuleIdentifierEXT * pIdentifier ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetShaderModuleIdentifierEXT( device, shaderModule, pIdentifier );
-      }
-
-      void vkGetShaderModuleCreateInfoIdentifierEXT( VkDevice                         device,
-                                                     const VkShaderModuleCreateInfo * pCreateInfo,
-                                                     VkShaderModuleIdentifierEXT *    pIdentifier ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetShaderModuleCreateInfoIdentifierEXT( device, pCreateInfo, pIdentifier );
-      }
-
-      //=== VK_NV_optical_flow ===
-
-      VkResult vkGetPhysicalDeviceOpticalFlowImageFormatsNV( VkPhysicalDevice                       physicalDevice,
-                                                             const VkOpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
-                                                             uint32_t *                             pFormatCount,
-                                                             VkOpticalFlowImageFormatPropertiesNV * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceOpticalFlowImageFormatsNV( physicalDevice, pOpticalFlowImageFormatInfo, pFormatCount, pImageFormatProperties );
-      }
-
-      VkResult vkCreateOpticalFlowSessionNV( VkDevice                                 device,
-                                             const VkOpticalFlowSessionCreateInfoNV * pCreateInfo,
-                                             const VkAllocationCallbacks *            pAllocator,
-                                             VkOpticalFlowSessionNV *                 pSession ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateOpticalFlowSessionNV( device, pCreateInfo, pAllocator, pSession );
-      }
-
-      void vkDestroyOpticalFlowSessionNV( VkDevice device, VkOpticalFlowSessionNV session, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyOpticalFlowSessionNV( device, session, pAllocator );
-      }
-
-      VkResult vkBindOpticalFlowSessionImageNV( VkDevice                           device,
-                                                VkOpticalFlowSessionNV             session,
-                                                VkOpticalFlowSessionBindingPointNV bindingPoint,
-                                                VkImageView                        view,
-                                                VkImageLayout                      layout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindOpticalFlowSessionImageNV( device, session, bindingPoint, view, layout );
-      }
-
-      void vkCmdOpticalFlowExecuteNV( VkCommandBuffer                    commandBuffer,
-                                      VkOpticalFlowSessionNV             session,
-                                      const VkOpticalFlowExecuteInfoNV * pExecuteInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdOpticalFlowExecuteNV( commandBuffer, session, pExecuteInfo );
-      }
-
-      //=== VK_KHR_maintenance5 ===
-
-      void vkCmdBindIndexBuffer2KHR( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, VkIndexType indexType ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindIndexBuffer2KHR( commandBuffer, buffer, offset, size, indexType );
-      }
-
-      void
-        vkGetRenderingAreaGranularityKHR( VkDevice device, const VkRenderingAreaInfo * pRenderingAreaInfo, VkExtent2D * pGranularity ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetRenderingAreaGranularityKHR( device, pRenderingAreaInfo, pGranularity );
-      }
-
-      void vkGetDeviceImageSubresourceLayoutKHR( VkDevice                             device,
-                                                 const VkDeviceImageSubresourceInfo * pInfo,
-                                                 VkSubresourceLayout2 *               pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDeviceImageSubresourceLayoutKHR( device, pInfo, pLayout );
-      }
-
-      void vkGetImageSubresourceLayout2KHR( VkDevice                    device,
-                                            VkImage                     image,
-                                            const VkImageSubresource2 * pSubresource,
-                                            VkSubresourceLayout2 *      pLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetImageSubresourceLayout2KHR( device, image, pSubresource, pLayout );
-      }
-
-      //=== VK_AMD_anti_lag ===
-
-      void vkAntiLagUpdateAMD( VkDevice device, const VkAntiLagDataAMD * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAntiLagUpdateAMD( device, pData );
-      }
-
-      //=== VK_KHR_present_wait2 ===
-
-      VkResult vkWaitForPresent2KHR( VkDevice device, VkSwapchainKHR swapchain, const VkPresentWait2InfoKHR * pPresentWait2Info ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkWaitForPresent2KHR( device, swapchain, pPresentWait2Info );
-      }
-
-      //=== VK_EXT_shader_object ===
-
-      VkResult vkCreateShadersEXT( VkDevice                      device,
-                                   uint32_t                      createInfoCount,
-                                   const VkShaderCreateInfoEXT * pCreateInfos,
-                                   const VkAllocationCallbacks * pAllocator,
-                                   VkShaderEXT *                 pShaders ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateShadersEXT( device, createInfoCount, pCreateInfos, pAllocator, pShaders );
-      }
-
-      void vkDestroyShaderEXT( VkDevice device, VkShaderEXT shader, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyShaderEXT( device, shader, pAllocator );
-      }
-
-      VkResult vkGetShaderBinaryDataEXT( VkDevice device, VkShaderEXT shader, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetShaderBinaryDataEXT( device, shader, pDataSize, pData );
-      }
-
-      void vkCmdBindShadersEXT( VkCommandBuffer               commandBuffer,
-                                uint32_t                      stageCount,
-                                const VkShaderStageFlagBits * pStages,
-                                const VkShaderEXT *           pShaders ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindShadersEXT( commandBuffer, stageCount, pStages, pShaders );
-      }
-
-      void vkCmdSetDepthClampRangeEXT( VkCommandBuffer              commandBuffer,
-                                       VkDepthClampModeEXT          depthClampMode,
-                                       const VkDepthClampRangeEXT * pDepthClampRange ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDepthClampRangeEXT( commandBuffer, depthClampMode, pDepthClampRange );
-      }
-
-      //=== VK_KHR_pipeline_binary ===
-
-      VkResult vkCreatePipelineBinariesKHR( VkDevice                              device,
-                                            const VkPipelineBinaryCreateInfoKHR * pCreateInfo,
-                                            const VkAllocationCallbacks *         pAllocator,
-                                            VkPipelineBinaryHandlesInfoKHR *      pBinaries ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreatePipelineBinariesKHR( device, pCreateInfo, pAllocator, pBinaries );
-      }
-
-      void vkDestroyPipelineBinaryKHR( VkDevice device, VkPipelineBinaryKHR pipelineBinary, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyPipelineBinaryKHR( device, pipelineBinary, pAllocator );
-      }
-
-      VkResult vkGetPipelineKeyKHR( VkDevice                        device,
-                                    const VkPipelineCreateInfoKHR * pPipelineCreateInfo,
-                                    VkPipelineBinaryKeyKHR *        pPipelineKey ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineKeyKHR( device, pPipelineCreateInfo, pPipelineKey );
-      }
-
-      VkResult vkGetPipelineBinaryDataKHR( VkDevice                            device,
-                                           const VkPipelineBinaryDataInfoKHR * pInfo,
-                                           VkPipelineBinaryKeyKHR *            pPipelineBinaryKey,
-                                           size_t *                            pPipelineBinaryDataSize,
-                                           void *                              pPipelineBinaryData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPipelineBinaryDataKHR( device, pInfo, pPipelineBinaryKey, pPipelineBinaryDataSize, pPipelineBinaryData );
-      }
-
-      VkResult vkReleaseCapturedPipelineDataKHR( VkDevice                                     device,
-                                                 const VkReleaseCapturedPipelineDataInfoKHR * pInfo,
-                                                 const VkAllocationCallbacks *                pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseCapturedPipelineDataKHR( device, pInfo, pAllocator );
-      }
-
-      //=== VK_QCOM_tile_properties ===
-
-      VkResult vkGetFramebufferTilePropertiesQCOM( VkDevice               device,
-                                                   VkFramebuffer          framebuffer,
-                                                   uint32_t *             pPropertiesCount,
-                                                   VkTilePropertiesQCOM * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetFramebufferTilePropertiesQCOM( device, framebuffer, pPropertiesCount, pProperties );
-      }
-
-      VkResult vkGetDynamicRenderingTilePropertiesQCOM( VkDevice                device,
-                                                        const VkRenderingInfo * pRenderingInfo,
-                                                        VkTilePropertiesQCOM *  pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDynamicRenderingTilePropertiesQCOM( device, pRenderingInfo, pProperties );
-      }
-
-      //=== VK_KHR_swapchain_maintenance1 ===
-
-      VkResult vkReleaseSwapchainImagesKHR( VkDevice device, const VkReleaseSwapchainImagesInfoKHR * pReleaseInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkReleaseSwapchainImagesKHR( device, pReleaseInfo );
-      }
-
-      //=== VK_NV_cooperative_vector ===
-
-      VkResult vkGetPhysicalDeviceCooperativeVectorPropertiesNV( VkPhysicalDevice                  physicalDevice,
-                                                                 uint32_t *                        pPropertyCount,
-                                                                 VkCooperativeVectorPropertiesNV * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCooperativeVectorPropertiesNV( physicalDevice, pPropertyCount, pProperties );
-      }
-
-      VkResult vkConvertCooperativeVectorMatrixNV( VkDevice device, const VkConvertCooperativeVectorMatrixInfoNV * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkConvertCooperativeVectorMatrixNV( device, pInfo );
-      }
-
-      void vkCmdConvertCooperativeVectorMatrixNV( VkCommandBuffer                                commandBuffer,
-                                                  uint32_t                                       infoCount,
-                                                  const VkConvertCooperativeVectorMatrixInfoNV * pInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdConvertCooperativeVectorMatrixNV( commandBuffer, infoCount, pInfos );
-      }
-
-      //=== VK_NV_low_latency2 ===
-
-      VkResult vkSetLatencySleepModeNV( VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepModeInfoNV * pSleepModeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetLatencySleepModeNV( device, swapchain, pSleepModeInfo );
-      }
-
-      VkResult vkLatencySleepNV( VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepInfoNV * pSleepInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkLatencySleepNV( device, swapchain, pSleepInfo );
-      }
-
-      void vkSetLatencyMarkerNV( VkDevice device, VkSwapchainKHR swapchain, const VkSetLatencyMarkerInfoNV * pLatencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkSetLatencyMarkerNV( device, swapchain, pLatencyMarkerInfo );
-      }
-
-      void vkGetLatencyTimingsNV( VkDevice device, VkSwapchainKHR swapchain, VkGetLatencyMarkerInfoNV * pLatencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetLatencyTimingsNV( device, swapchain, pLatencyMarkerInfo );
-      }
-
-      void vkQueueNotifyOutOfBandNV( VkQueue queue, const VkOutOfBandQueueTypeInfoNV * pQueueTypeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueNotifyOutOfBandNV( queue, pQueueTypeInfo );
-      }
-
-      //=== VK_KHR_cooperative_matrix ===
-
-      VkResult vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( VkPhysicalDevice                   physicalDevice,
-                                                                  uint32_t *                         pPropertyCount,
-                                                                  VkCooperativeMatrixPropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( physicalDevice, pPropertyCount, pProperties );
-      }
-
-      //=== VK_ARM_data_graph ===
-
-      VkResult vkCreateDataGraphPipelinesARM( VkDevice                                 device,
-                                              VkDeferredOperationKHR                   deferredOperation,
-                                              VkPipelineCache                          pipelineCache,
-                                              uint32_t                                 createInfoCount,
-                                              const VkDataGraphPipelineCreateInfoARM * pCreateInfos,
-                                              const VkAllocationCallbacks *            pAllocator,
-                                              VkPipeline *                             pPipelines ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDataGraphPipelinesARM( device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines );
-      }
-
-      VkResult vkCreateDataGraphPipelineSessionARM( VkDevice                                        device,
-                                                    const VkDataGraphPipelineSessionCreateInfoARM * pCreateInfo,
-                                                    const VkAllocationCallbacks *                   pAllocator,
-                                                    VkDataGraphPipelineSessionARM *                 pSession ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateDataGraphPipelineSessionARM( device, pCreateInfo, pAllocator, pSession );
-      }
-
-      VkResult vkGetDataGraphPipelineSessionBindPointRequirementsARM( VkDevice                                                       device,
-                                                                      const VkDataGraphPipelineSessionBindPointRequirementsInfoARM * pInfo,
-                                                                      uint32_t *                                                     pBindPointRequirementCount,
-                                                                      VkDataGraphPipelineSessionBindPointRequirementARM * pBindPointRequirements ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDataGraphPipelineSessionBindPointRequirementsARM( device, pInfo, pBindPointRequirementCount, pBindPointRequirements );
-      }
-
-      void vkGetDataGraphPipelineSessionMemoryRequirementsARM( VkDevice                                                    device,
-                                                               const VkDataGraphPipelineSessionMemoryRequirementsInfoARM * pInfo,
-                                                               VkMemoryRequirements2 * pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDataGraphPipelineSessionMemoryRequirementsARM( device, pInfo, pMemoryRequirements );
-      }
-
-      VkResult vkBindDataGraphPipelineSessionMemoryARM( VkDevice                                            device,
-                                                        uint32_t                                            bindInfoCount,
-                                                        const VkBindDataGraphPipelineSessionMemoryInfoARM * pBindInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkBindDataGraphPipelineSessionMemoryARM( device, bindInfoCount, pBindInfos );
-      }
-
-      void vkDestroyDataGraphPipelineSessionARM( VkDevice                      device,
-                                                 VkDataGraphPipelineSessionARM session,
-                                                 const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyDataGraphPipelineSessionARM( device, session, pAllocator );
-      }
-
-      void vkCmdDispatchDataGraphARM( VkCommandBuffer                            commandBuffer,
-                                      VkDataGraphPipelineSessionARM              session,
-                                      const VkDataGraphPipelineDispatchInfoARM * pInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDispatchDataGraphARM( commandBuffer, session, pInfo );
-      }
-
-      VkResult vkGetDataGraphPipelineAvailablePropertiesARM( VkDevice                           device,
-                                                             const VkDataGraphPipelineInfoARM * pPipelineInfo,
-                                                             uint32_t *                         pPropertiesCount,
-                                                             VkDataGraphPipelinePropertyARM *   pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDataGraphPipelineAvailablePropertiesARM( device, pPipelineInfo, pPropertiesCount, pProperties );
-      }
-
-      VkResult vkGetDataGraphPipelinePropertiesARM( VkDevice                                    device,
-                                                    const VkDataGraphPipelineInfoARM *          pPipelineInfo,
-                                                    uint32_t                                    propertiesCount,
-                                                    VkDataGraphPipelinePropertyQueryResultARM * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetDataGraphPipelinePropertiesARM( device, pPipelineInfo, propertiesCount, pProperties );
-      }
-
-      VkResult
-        vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM( VkPhysicalDevice                      physicalDevice,
-                                                              uint32_t                              queueFamilyIndex,
-                                                              uint32_t *                            pQueueFamilyDataGraphPropertyCount,
-                                                              VkQueueFamilyDataGraphPropertiesARM * pQueueFamilyDataGraphProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-          physicalDevice, queueFamilyIndex, pQueueFamilyDataGraphPropertyCount, pQueueFamilyDataGraphProperties );
-      }
-
-      void vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-        VkPhysicalDevice                                                    physicalDevice,
-        const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM * pQueueFamilyDataGraphProcessingEngineInfo,
-        VkQueueFamilyDataGraphProcessingEnginePropertiesARM *               pQueueFamilyDataGraphProcessingEngineProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-          physicalDevice, pQueueFamilyDataGraphProcessingEngineInfo, pQueueFamilyDataGraphProcessingEngineProperties );
-      }
-
-      //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-
-      void vkCmdSetAttachmentFeedbackLoopEnableEXT( VkCommandBuffer commandBuffer, VkImageAspectFlags aspectMask ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetAttachmentFeedbackLoopEnableEXT( commandBuffer, aspectMask );
-      }
-
-#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      //=== VK_QNX_external_memory_screen_buffer ===
-
-      VkResult vkGetScreenBufferPropertiesQNX( VkDevice                      device,
-                                               const struct _screen_buffer * buffer,
-                                               VkScreenBufferPropertiesQNX * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetScreenBufferPropertiesQNX( device, buffer, pProperties );
-      }
-#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-      //=== VK_KHR_line_rasterization ===
-
-      void vkCmdSetLineStippleKHR( VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetLineStippleKHR( commandBuffer, lineStippleFactor, lineStipplePattern );
-      }
-
-      //=== VK_KHR_calibrated_timestamps ===
-
-      VkResult vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( VkPhysicalDevice  physicalDevice,
-                                                               uint32_t *        pTimeDomainCount,
-                                                               VkTimeDomainKHR * pTimeDomains ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( physicalDevice, pTimeDomainCount, pTimeDomains );
-      }
-
-      VkResult vkGetCalibratedTimestampsKHR( VkDevice                             device,
-                                             uint32_t                             timestampCount,
-                                             const VkCalibratedTimestampInfoKHR * pTimestampInfos,
-                                             uint64_t *                           pTimestamps,
-                                             uint64_t *                           pMaxDeviation ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetCalibratedTimestampsKHR( device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation );
-      }
-
-      //=== VK_KHR_maintenance6 ===
-
-      void vkCmdBindDescriptorSets2KHR( VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo * pBindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorSets2KHR( commandBuffer, pBindDescriptorSetsInfo );
-      }
-
-      void vkCmdPushConstants2KHR( VkCommandBuffer commandBuffer, const VkPushConstantsInfo * pPushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushConstants2KHR( commandBuffer, pPushConstantsInfo );
-      }
-
-      void vkCmdPushDescriptorSet2KHR( VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo * pPushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSet2KHR( commandBuffer, pPushDescriptorSetInfo );
-      }
-
-      void vkCmdPushDescriptorSetWithTemplate2KHR( VkCommandBuffer                             commandBuffer,
-                                                   const VkPushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPushDescriptorSetWithTemplate2KHR( commandBuffer, pPushDescriptorSetWithTemplateInfo );
-      }
-
-      void vkCmdSetDescriptorBufferOffsets2EXT( VkCommandBuffer                             commandBuffer,
-                                                const VkSetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdSetDescriptorBufferOffsets2EXT( commandBuffer, pSetDescriptorBufferOffsetsInfo );
-      }
-
-      void vkCmdBindDescriptorBufferEmbeddedSamplers2EXT(
-        VkCommandBuffer                                       commandBuffer,
-        const VkBindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( commandBuffer, pBindDescriptorBufferEmbeddedSamplersInfo );
-      }
-
-      //=== VK_QCOM_tile_memory_heap ===
-
-      void vkCmdBindTileMemoryQCOM( VkCommandBuffer commandBuffer, const VkTileMemoryBindInfoQCOM * pTileMemoryBindInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBindTileMemoryQCOM( commandBuffer, pTileMemoryBindInfo );
-      }
-
-      //=== VK_KHR_copy_memory_indirect ===
-
-      void vkCmdCopyMemoryIndirectKHR( VkCommandBuffer commandBuffer, const VkCopyMemoryIndirectInfoKHR * pCopyMemoryIndirectInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryIndirectKHR( commandBuffer, pCopyMemoryIndirectInfo );
-      }
-
-      void vkCmdCopyMemoryToImageIndirectKHR( VkCommandBuffer                            commandBuffer,
-                                              const VkCopyMemoryToImageIndirectInfoKHR * pCopyMemoryToImageIndirectInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdCopyMemoryToImageIndirectKHR( commandBuffer, pCopyMemoryToImageIndirectInfo );
-      }
-
-      //=== VK_EXT_memory_decompression ===
-
-      void vkCmdDecompressMemoryEXT( VkCommandBuffer commandBuffer, const VkDecompressMemoryInfoEXT * pDecompressMemoryInfoEXT ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDecompressMemoryEXT( commandBuffer, pDecompressMemoryInfoEXT );
-      }
-
-      void vkCmdDecompressMemoryIndirectCountEXT( VkCommandBuffer                     commandBuffer,
-                                                  VkMemoryDecompressionMethodFlagsEXT decompressionMethod,
-                                                  VkDeviceAddress                     indirectCommandsAddress,
-                                                  VkDeviceAddress                     indirectCommandsCountAddress,
-                                                  uint32_t                            maxDecompressionCount,
-                                                  uint32_t                            stride ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdDecompressMemoryIndirectCountEXT(
-          commandBuffer, decompressionMethod, indirectCommandsAddress, indirectCommandsCountAddress, maxDecompressionCount, stride );
-      }
-
-      //=== VK_NV_external_compute_queue ===
-
-      VkResult vkCreateExternalComputeQueueNV( VkDevice                                   device,
-                                               const VkExternalComputeQueueCreateInfoNV * pCreateInfo,
-                                               const VkAllocationCallbacks *              pAllocator,
-                                               VkExternalComputeQueueNV *                 pExternalQueue ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateExternalComputeQueueNV( device, pCreateInfo, pAllocator, pExternalQueue );
-      }
-
-      void vkDestroyExternalComputeQueueNV( VkDevice                      device,
-                                            VkExternalComputeQueueNV      externalQueue,
-                                            const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyExternalComputeQueueNV( device, externalQueue, pAllocator );
-      }
-
-      void vkGetExternalComputeQueueDataNV( VkExternalComputeQueueNV             externalQueue,
-                                            VkExternalComputeQueueDataParamsNV * params,
-                                            void *                               pData ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetExternalComputeQueueDataNV( externalQueue, params, pData );
-      }
-
-      //=== VK_NV_cluster_acceleration_structure ===
-
-      void vkGetClusterAccelerationStructureBuildSizesNV( VkDevice                                          device,
-                                                          const VkClusterAccelerationStructureInputInfoNV * pInfo,
-                                                          VkAccelerationStructureBuildSizesInfoKHR *        pSizeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetClusterAccelerationStructureBuildSizesNV( device, pInfo, pSizeInfo );
-      }
-
-      void vkCmdBuildClusterAccelerationStructureIndirectNV( VkCommandBuffer                                      commandBuffer,
-                                                             const VkClusterAccelerationStructureCommandsInfoNV * pCommandInfos ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildClusterAccelerationStructureIndirectNV( commandBuffer, pCommandInfos );
-      }
-
-      //=== VK_NV_partitioned_acceleration_structure ===
-
-      void vkGetPartitionedAccelerationStructuresBuildSizesNV( VkDevice                                                   device,
-                                                               const VkPartitionedAccelerationStructureInstancesInputNV * pInfo,
-                                                               VkAccelerationStructureBuildSizesInfoKHR *                 pSizeInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPartitionedAccelerationStructuresBuildSizesNV( device, pInfo, pSizeInfo );
-      }
-
-      void vkCmdBuildPartitionedAccelerationStructuresNV( VkCommandBuffer                                       commandBuffer,
-                                                          const VkBuildPartitionedAccelerationStructureInfoNV * pBuildInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBuildPartitionedAccelerationStructuresNV( commandBuffer, pBuildInfo );
-      }
-
-      //=== VK_EXT_device_generated_commands ===
-
-      void vkGetGeneratedCommandsMemoryRequirementsEXT( VkDevice                                             device,
-                                                        const VkGeneratedCommandsMemoryRequirementsInfoEXT * pInfo,
-                                                        VkMemoryRequirements2 *                              pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetGeneratedCommandsMemoryRequirementsEXT( device, pInfo, pMemoryRequirements );
-      }
-
-      void vkCmdPreprocessGeneratedCommandsEXT( VkCommandBuffer                    commandBuffer,
-                                                const VkGeneratedCommandsInfoEXT * pGeneratedCommandsInfo,
-                                                VkCommandBuffer                    stateCommandBuffer ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdPreprocessGeneratedCommandsEXT( commandBuffer, pGeneratedCommandsInfo, stateCommandBuffer );
-      }
-
-      void vkCmdExecuteGeneratedCommandsEXT( VkCommandBuffer                    commandBuffer,
-                                             VkBool32                           isPreprocessed,
-                                             const VkGeneratedCommandsInfoEXT * pGeneratedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdExecuteGeneratedCommandsEXT( commandBuffer, isPreprocessed, pGeneratedCommandsInfo );
-      }
-
-      VkResult vkCreateIndirectCommandsLayoutEXT( VkDevice                                      device,
-                                                  const VkIndirectCommandsLayoutCreateInfoEXT * pCreateInfo,
-                                                  const VkAllocationCallbacks *                 pAllocator,
-                                                  VkIndirectCommandsLayoutEXT *                 pIndirectCommandsLayout ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateIndirectCommandsLayoutEXT( device, pCreateInfo, pAllocator, pIndirectCommandsLayout );
-      }
-
-      void vkDestroyIndirectCommandsLayoutEXT( VkDevice                      device,
-                                               VkIndirectCommandsLayoutEXT   indirectCommandsLayout,
-                                               const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyIndirectCommandsLayoutEXT( device, indirectCommandsLayout, pAllocator );
-      }
-
-      VkResult vkCreateIndirectExecutionSetEXT( VkDevice                                    device,
-                                                const VkIndirectExecutionSetCreateInfoEXT * pCreateInfo,
-                                                const VkAllocationCallbacks *               pAllocator,
-                                                VkIndirectExecutionSetEXT *                 pIndirectExecutionSet ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateIndirectExecutionSetEXT( device, pCreateInfo, pAllocator, pIndirectExecutionSet );
-      }
-
-      void vkDestroyIndirectExecutionSetEXT( VkDevice                      device,
-                                             VkIndirectExecutionSetEXT     indirectExecutionSet,
-                                             const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkDestroyIndirectExecutionSetEXT( device, indirectExecutionSet, pAllocator );
-      }
-
-      void vkUpdateIndirectExecutionSetPipelineEXT( VkDevice                                       device,
-                                                    VkIndirectExecutionSetEXT                      indirectExecutionSet,
-                                                    uint32_t                                       executionSetWriteCount,
-                                                    const VkWriteIndirectExecutionSetPipelineEXT * pExecutionSetWrites ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateIndirectExecutionSetPipelineEXT( device, indirectExecutionSet, executionSetWriteCount, pExecutionSetWrites );
-      }
-
-      void vkUpdateIndirectExecutionSetShaderEXT( VkDevice                                     device,
-                                                  VkIndirectExecutionSetEXT                    indirectExecutionSet,
-                                                  uint32_t                                     executionSetWriteCount,
-                                                  const VkWriteIndirectExecutionSetShaderEXT * pExecutionSetWrites ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkUpdateIndirectExecutionSetShaderEXT( device, indirectExecutionSet, executionSetWriteCount, pExecutionSetWrites );
-      }
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_surface ===
-
-      VkResult vkCreateSurfaceOHOS( VkInstance                      instance,
-                                    const VkSurfaceCreateInfoOHOS * pCreateInfo,
-                                    const VkAllocationCallbacks *   pAllocator,
-                                    VkSurfaceKHR *                  pSurface ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCreateSurfaceOHOS( instance, pCreateInfo, pAllocator, pSurface );
-      }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_native_buffer ===
-
-      VkResult
-        vkGetSwapchainGrallocUsageOHOS( VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, uint64_t * grallocUsage ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetSwapchainGrallocUsageOHOS( device, format, imageUsage, grallocUsage );
-      }
-
-      VkResult vkAcquireImageOHOS( VkDevice device, VkImage image, int32_t nativeFenceFd, VkSemaphore semaphore, VkFence fence ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkAcquireImageOHOS( device, image, nativeFenceFd, semaphore, fence );
-      }
-
-      VkResult vkQueueSignalReleaseImageOHOS(
-        VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore * pWaitSemaphores, VkImage image, int32_t * pNativeFenceFd ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkQueueSignalReleaseImageOHOS( queue, waitSemaphoreCount, pWaitSemaphores, image, pNativeFenceFd );
-      }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-      //=== VK_NV_cooperative_matrix2 ===
-
-      VkResult vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-        VkPhysicalDevice physicalDevice, uint32_t * pPropertyCount, VkCooperativeMatrixFlexibleDimensionsPropertiesNV * pProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV( physicalDevice, pPropertyCount, pProperties );
-      }
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-      //=== VK_EXT_external_memory_metal ===
-
-      VkResult
-        vkGetMemoryMetalHandleEXT( VkDevice device, const VkMemoryGetMetalHandleInfoEXT * pGetMetalHandleInfo, void ** pHandle ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryMetalHandleEXT( device, pGetMetalHandleInfo, pHandle );
-      }
-
-      VkResult vkGetMemoryMetalHandlePropertiesEXT( VkDevice                           device,
-                                                    VkExternalMemoryHandleTypeFlagBits handleType,
-                                                    const void *                       pHandle,
-                                                    VkMemoryMetalHandlePropertiesEXT * pMemoryMetalHandleProperties ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkGetMemoryMetalHandlePropertiesEXT( device, handleType, pHandle, pMemoryMetalHandleProperties );
-      }
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-      //=== VK_ARM_performance_counters_by_region ===
-
-      VkResult vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM( VkPhysicalDevice                     physicalDevice,
-                                                                                   uint32_t                             queueFamilyIndex,
-                                                                                   uint32_t *                           pCounterCount,
-                                                                                   VkPerformanceCounterARM *            pCounters,
-                                                                                   VkPerformanceCounterDescriptionARM * pCounterDescriptions ) const
-        VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-          physicalDevice, queueFamilyIndex, pCounterCount, pCounters, pCounterDescriptions );
-      }
-
-      //=== VK_EXT_fragment_density_map_offset ===
-
-      void vkCmdEndRendering2EXT( VkCommandBuffer commandBuffer, const VkRenderingEndInfoKHR * pRenderingEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRendering2EXT( commandBuffer, pRenderingEndInfo );
-      }
-
-      //=== VK_EXT_custom_resolve ===
-
-      void vkCmdBeginCustomResolveEXT( VkCommandBuffer commandBuffer, const VkBeginCustomResolveInfoEXT * pBeginCustomResolveInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdBeginCustomResolveEXT( commandBuffer, pBeginCustomResolveInfo );
-      }
-
-      //=== VK_KHR_maintenance10 ===
-
-      void vkCmdEndRendering2KHR( VkCommandBuffer commandBuffer, const VkRenderingEndInfoKHR * pRenderingEndInfo ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ::vkCmdEndRendering2KHR( commandBuffer, pRenderingEndInfo );
-      }
-    };
-
-    template <>
-    struct isDispatchLoader<DispatchLoaderStatic>
+    void vkCmdSetVertexInputEXT( VkCommandBuffer                               commandBuffer,
+                                 uint32_t                                      vertexBindingDescriptionCount,
+                                 const VkVertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
+                                 uint32_t                                      vertexAttributeDescriptionCount,
+                                 const VkVertexInputAttributeDescription2EXT * pVertexAttributeDescriptions ) const VULKAN_HPP_NOEXCEPT
     {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    inline DispatchLoaderStatic & getDispatchLoaderStatic()
-    {
-      static DispatchLoaderStatic dls;
-      return dls;
+      return ::vkCmdSetVertexInputEXT(
+        commandBuffer, vertexBindingDescriptionCount, pVertexBindingDescriptions, vertexAttributeDescriptionCount, pVertexAttributeDescriptions );
     }
-#endif
 
-  }  // namespace detail
-#if ( 14 <= VULKAN_HPP_CPP_VERSION )
-  using std::exchange;
-#else
-  template <class T, class U = T>
-  VULKAN_HPP_CONSTEXPR_14 VULKAN_HPP_INLINE T exchange( T & obj, U && newValue )
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_external_memory ===
+
+    VkResult vkGetMemoryZirconHandleFUCHSIA( VkDevice                                   device,
+                                             const VkMemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                             zx_handle_t *                              pZirconHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryZirconHandleFUCHSIA( device, pGetZirconHandleInfo, pZirconHandle );
+    }
+
+    VkResult vkGetMemoryZirconHandlePropertiesFUCHSIA( VkDevice                                device,
+                                                       VkExternalMemoryHandleTypeFlagBits      handleType,
+                                                       zx_handle_t                             zirconHandle,
+                                                       VkMemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryZirconHandlePropertiesFUCHSIA( device, handleType, zirconHandle, pMemoryZirconHandleProperties );
+    }
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_external_semaphore ===
+
+    VkResult vkImportSemaphoreZirconHandleFUCHSIA( VkDevice                                         device,
+                                                   const VkImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkImportSemaphoreZirconHandleFUCHSIA( device, pImportSemaphoreZirconHandleInfo );
+    }
+
+    VkResult vkGetSemaphoreZirconHandleFUCHSIA( VkDevice                                      device,
+                                                const VkSemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                                zx_handle_t *                                 pZirconHandle ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetSemaphoreZirconHandleFUCHSIA( device, pGetZirconHandleInfo, pZirconHandle );
+    }
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_buffer_collection ===
+
+    VkResult vkCreateBufferCollectionFUCHSIA( VkDevice                                    device,
+                                              const VkBufferCollectionCreateInfoFUCHSIA * pCreateInfo,
+                                              const VkAllocationCallbacks *               pAllocator,
+                                              VkBufferCollectionFUCHSIA *                 pCollection ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateBufferCollectionFUCHSIA( device, pCreateInfo, pAllocator, pCollection );
+    }
+
+    VkResult vkSetBufferCollectionImageConstraintsFUCHSIA( VkDevice                              device,
+                                                           VkBufferCollectionFUCHSIA             collection,
+                                                           const VkImageConstraintsInfoFUCHSIA * pImageConstraintsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetBufferCollectionImageConstraintsFUCHSIA( device, collection, pImageConstraintsInfo );
+    }
+
+    VkResult vkSetBufferCollectionBufferConstraintsFUCHSIA( VkDevice                               device,
+                                                            VkBufferCollectionFUCHSIA              collection,
+                                                            const VkBufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetBufferCollectionBufferConstraintsFUCHSIA( device, collection, pBufferConstraintsInfo );
+    }
+
+    void vkDestroyBufferCollectionFUCHSIA( VkDevice                      device,
+                                           VkBufferCollectionFUCHSIA     collection,
+                                           const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyBufferCollectionFUCHSIA( device, collection, pAllocator );
+    }
+
+    VkResult vkGetBufferCollectionPropertiesFUCHSIA( VkDevice                              device,
+                                                     VkBufferCollectionFUCHSIA             collection,
+                                                     VkBufferCollectionPropertiesFUCHSIA * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetBufferCollectionPropertiesFUCHSIA( device, collection, pProperties );
+    }
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+    //=== VK_HUAWEI_subpass_shading ===
+
+    VkResult
+      vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( VkDevice device, VkRenderPass renderpass, VkExtent2D * pMaxWorkgroupSize ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( device, renderpass, pMaxWorkgroupSize );
+    }
+
+    void vkCmdSubpassShadingHUAWEI( VkCommandBuffer commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSubpassShadingHUAWEI( commandBuffer );
+    }
+
+    //=== VK_HUAWEI_invocation_mask ===
+
+    void vkCmdBindInvocationMaskHUAWEI( VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindInvocationMaskHUAWEI( commandBuffer, imageView, imageLayout );
+    }
+
+    //=== VK_NV_external_memory_rdma ===
+
+    VkResult vkGetMemoryRemoteAddressNV( VkDevice                               device,
+                                         const VkMemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
+                                         VkRemoteAddressNV *                    pAddress ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMemoryRemoteAddressNV( device, pMemoryGetRemoteAddressInfo, pAddress );
+    }
+
+    //=== VK_EXT_pipeline_properties ===
+
+    VkResult
+      vkGetPipelinePropertiesEXT( VkDevice device, const VkPipelineInfoEXT * pPipelineInfo, VkBaseOutStructure * pPipelineProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelinePropertiesEXT( device, pPipelineInfo, pPipelineProperties );
+    }
+
+    //=== VK_EXT_extended_dynamic_state2 ===
+
+    void vkCmdSetPatchControlPointsEXT( VkCommandBuffer commandBuffer, uint32_t patchControlPoints ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPatchControlPointsEXT( commandBuffer, patchControlPoints );
+    }
+
+    void vkCmdSetRasterizerDiscardEnableEXT( VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRasterizerDiscardEnableEXT( commandBuffer, rasterizerDiscardEnable );
+    }
+
+    void vkCmdSetDepthBiasEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthBiasEnableEXT( commandBuffer, depthBiasEnable );
+    }
+
+    void vkCmdSetLogicOpEXT( VkCommandBuffer commandBuffer, VkLogicOp logicOp ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLogicOpEXT( commandBuffer, logicOp );
+    }
+
+    void vkCmdSetPrimitiveRestartEnableEXT( VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPrimitiveRestartEnableEXT( commandBuffer, primitiveRestartEnable );
+    }
+
+#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
+    //=== VK_QNX_screen_surface ===
+
+    VkResult vkCreateScreenSurfaceQNX( VkInstance                           instance,
+                                       const VkScreenSurfaceCreateInfoQNX * pCreateInfo,
+                                       const VkAllocationCallbacks *        pAllocator,
+                                       VkSurfaceKHR *                       pSurface ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateScreenSurfaceQNX( instance, pCreateInfo, pAllocator, pSurface );
+    }
+
+    VkBool32 vkGetPhysicalDeviceScreenPresentationSupportQNX( VkPhysicalDevice        physicalDevice,
+                                                              uint32_t                queueFamilyIndex,
+                                                              struct _screen_window * window ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceScreenPresentationSupportQNX( physicalDevice, queueFamilyIndex, window );
+    }
+#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+    //=== VK_EXT_color_write_enable ===
+
+    void vkCmdSetColorWriteEnableEXT( VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32 * pColorWriteEnables ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetColorWriteEnableEXT( commandBuffer, attachmentCount, pColorWriteEnables );
+    }
+
+    //=== VK_KHR_ray_tracing_maintenance1 ===
+
+    void vkCmdTraceRaysIndirect2KHR( VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdTraceRaysIndirect2KHR( commandBuffer, indirectDeviceAddress );
+    }
+
+    //=== VK_EXT_multi_draw ===
+
+    void vkCmdDrawMultiEXT( VkCommandBuffer            commandBuffer,
+                            uint32_t                   drawCount,
+                            const VkMultiDrawInfoEXT * pVertexInfo,
+                            uint32_t                   instanceCount,
+                            uint32_t                   firstInstance,
+                            uint32_t                   stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMultiEXT( commandBuffer, drawCount, pVertexInfo, instanceCount, firstInstance, stride );
+    }
+
+    void vkCmdDrawMultiIndexedEXT( VkCommandBuffer                   commandBuffer,
+                                   uint32_t                          drawCount,
+                                   const VkMultiDrawIndexedInfoEXT * pIndexInfo,
+                                   uint32_t                          instanceCount,
+                                   uint32_t                          firstInstance,
+                                   uint32_t                          stride,
+                                   const int32_t *                   pVertexOffset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawMultiIndexedEXT( commandBuffer, drawCount, pIndexInfo, instanceCount, firstInstance, stride, pVertexOffset );
+    }
+
+    //=== VK_EXT_opacity_micromap ===
+
+    VkResult vkCreateMicromapEXT( VkDevice                        device,
+                                  const VkMicromapCreateInfoEXT * pCreateInfo,
+                                  const VkAllocationCallbacks *   pAllocator,
+                                  VkMicromapEXT *                 pMicromap ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateMicromapEXT( device, pCreateInfo, pAllocator, pMicromap );
+    }
+
+    void vkDestroyMicromapEXT( VkDevice device, VkMicromapEXT micromap, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyMicromapEXT( device, micromap, pAllocator );
+    }
+
+    void vkCmdBuildMicromapsEXT( VkCommandBuffer commandBuffer, uint32_t infoCount, const VkMicromapBuildInfoEXT * pInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBuildMicromapsEXT( commandBuffer, infoCount, pInfos );
+    }
+
+    VkResult vkBuildMicromapsEXT( VkDevice                       device,
+                                  VkDeferredOperationKHR         deferredOperation,
+                                  uint32_t                       infoCount,
+                                  const VkMicromapBuildInfoEXT * pInfos ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBuildMicromapsEXT( device, deferredOperation, infoCount, pInfos );
+    }
+
+    VkResult vkCopyMicromapEXT( VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyMicromapEXT( device, deferredOperation, pInfo );
+    }
+
+    VkResult vkCopyMicromapToMemoryEXT( VkDevice                              device,
+                                        VkDeferredOperationKHR                deferredOperation,
+                                        const VkCopyMicromapToMemoryInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyMicromapToMemoryEXT( device, deferredOperation, pInfo );
+    }
+
+    VkResult vkCopyMemoryToMicromapEXT( VkDevice                              device,
+                                        VkDeferredOperationKHR                deferredOperation,
+                                        const VkCopyMemoryToMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCopyMemoryToMicromapEXT( device, deferredOperation, pInfo );
+    }
+
+    VkResult vkWriteMicromapsPropertiesEXT( VkDevice              device,
+                                            uint32_t              micromapCount,
+                                            const VkMicromapEXT * pMicromaps,
+                                            VkQueryType           queryType,
+                                            size_t                dataSize,
+                                            void *                pData,
+                                            size_t                stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkWriteMicromapsPropertiesEXT( device, micromapCount, pMicromaps, queryType, dataSize, pData, stride );
+    }
+
+    void vkCmdCopyMicromapEXT( VkCommandBuffer commandBuffer, const VkCopyMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMicromapEXT( commandBuffer, pInfo );
+    }
+
+    void vkCmdCopyMicromapToMemoryEXT( VkCommandBuffer commandBuffer, const VkCopyMicromapToMemoryInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMicromapToMemoryEXT( commandBuffer, pInfo );
+    }
+
+    void vkCmdCopyMemoryToMicromapEXT( VkCommandBuffer commandBuffer, const VkCopyMemoryToMicromapInfoEXT * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMemoryToMicromapEXT( commandBuffer, pInfo );
+    }
+
+    void vkCmdWriteMicromapsPropertiesEXT( VkCommandBuffer       commandBuffer,
+                                           uint32_t              micromapCount,
+                                           const VkMicromapEXT * pMicromaps,
+                                           VkQueryType           queryType,
+                                           VkQueryPool           queryPool,
+                                           uint32_t              firstQuery ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdWriteMicromapsPropertiesEXT( commandBuffer, micromapCount, pMicromaps, queryType, queryPool, firstQuery );
+    }
+
+    void vkGetDeviceMicromapCompatibilityEXT( VkDevice                                  device,
+                                              const VkMicromapVersionInfoEXT *          pVersionInfo,
+                                              VkAccelerationStructureCompatibilityKHR * pCompatibility ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceMicromapCompatibilityEXT( device, pVersionInfo, pCompatibility );
+    }
+
+    void vkGetMicromapBuildSizesEXT( VkDevice                            device,
+                                     VkAccelerationStructureBuildTypeKHR buildType,
+                                     const VkMicromapBuildInfoEXT *      pBuildInfo,
+                                     VkMicromapBuildSizesInfoEXT *       pSizeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetMicromapBuildSizesEXT( device, buildType, pBuildInfo, pSizeInfo );
+    }
+
+    //=== VK_HUAWEI_cluster_culling_shader ===
+
+    void vkCmdDrawClusterHUAWEI( VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawClusterHUAWEI( commandBuffer, groupCountX, groupCountY, groupCountZ );
+    }
+
+    void vkCmdDrawClusterIndirectHUAWEI( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDrawClusterIndirectHUAWEI( commandBuffer, buffer, offset );
+    }
+
+    //=== VK_EXT_pageable_device_local_memory ===
+
+    void vkSetDeviceMemoryPriorityEXT( VkDevice device, VkDeviceMemory memory, float priority ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetDeviceMemoryPriorityEXT( device, memory, priority );
+    }
+
+    //=== VK_KHR_maintenance4 ===
+
+    void vkGetDeviceBufferMemoryRequirementsKHR( VkDevice                                 device,
+                                                 const VkDeviceBufferMemoryRequirements * pInfo,
+                                                 VkMemoryRequirements2 *                  pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceBufferMemoryRequirementsKHR( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetDeviceImageMemoryRequirementsKHR( VkDevice                                device,
+                                                const VkDeviceImageMemoryRequirements * pInfo,
+                                                VkMemoryRequirements2 *                 pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceImageMemoryRequirementsKHR( device, pInfo, pMemoryRequirements );
+    }
+
+    void vkGetDeviceImageSparseMemoryRequirementsKHR( VkDevice                                device,
+                                                      const VkDeviceImageMemoryRequirements * pInfo,
+                                                      uint32_t *                              pSparseMemoryRequirementCount,
+                                                      VkSparseImageMemoryRequirements2 *      pSparseMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceImageSparseMemoryRequirementsKHR( device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements );
+    }
+
+    //=== VK_VALVE_descriptor_set_host_mapping ===
+
+    void vkGetDescriptorSetLayoutHostMappingInfoVALVE( VkDevice                                     device,
+                                                       const VkDescriptorSetBindingReferenceVALVE * pBindingReference,
+                                                       VkDescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetLayoutHostMappingInfoVALVE( device, pBindingReference, pHostMapping );
+    }
+
+    void vkGetDescriptorSetHostMappingVALVE( VkDevice device, VkDescriptorSet descriptorSet, void ** ppData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDescriptorSetHostMappingVALVE( device, descriptorSet, ppData );
+    }
+
+    //=== VK_NV_copy_memory_indirect ===
+
+    void vkCmdCopyMemoryIndirectNV( VkCommandBuffer commandBuffer,
+                                    VkDeviceAddress copyBufferAddress,
+                                    uint32_t        copyCount,
+                                    uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMemoryIndirectNV( commandBuffer, copyBufferAddress, copyCount, stride );
+    }
+
+    void vkCmdCopyMemoryToImageIndirectNV( VkCommandBuffer                  commandBuffer,
+                                           VkDeviceAddress                  copyBufferAddress,
+                                           uint32_t                         copyCount,
+                                           uint32_t                         stride,
+                                           VkImage                          dstImage,
+                                           VkImageLayout                    dstImageLayout,
+                                           const VkImageSubresourceLayers * pImageSubresources ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdCopyMemoryToImageIndirectNV( commandBuffer, copyBufferAddress, copyCount, stride, dstImage, dstImageLayout, pImageSubresources );
+    }
+
+    //=== VK_NV_memory_decompression ===
+
+    void vkCmdDecompressMemoryNV( VkCommandBuffer                    commandBuffer,
+                                  uint32_t                           decompressRegionCount,
+                                  const VkDecompressMemoryRegionNV * pDecompressMemoryRegions ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDecompressMemoryNV( commandBuffer, decompressRegionCount, pDecompressMemoryRegions );
+    }
+
+    void vkCmdDecompressMemoryIndirectCountNV( VkCommandBuffer commandBuffer,
+                                               VkDeviceAddress indirectCommandsAddress,
+                                               VkDeviceAddress indirectCommandsCountAddress,
+                                               uint32_t        stride ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdDecompressMemoryIndirectCountNV( commandBuffer, indirectCommandsAddress, indirectCommandsCountAddress, stride );
+    }
+
+    //=== VK_NV_device_generated_commands_compute ===
+
+    void vkGetPipelineIndirectMemoryRequirementsNV( VkDevice                            device,
+                                                    const VkComputePipelineCreateInfo * pCreateInfo,
+                                                    VkMemoryRequirements2 *             pMemoryRequirements ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineIndirectMemoryRequirementsNV( device, pCreateInfo, pMemoryRequirements );
+    }
+
+    void
+      vkCmdUpdatePipelineIndirectBufferNV( VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdUpdatePipelineIndirectBufferNV( commandBuffer, pipelineBindPoint, pipeline );
+    }
+
+    VkDeviceAddress vkGetPipelineIndirectDeviceAddressNV( VkDevice device, const VkPipelineIndirectDeviceAddressInfoNV * pInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPipelineIndirectDeviceAddressNV( device, pInfo );
+    }
+
+    //=== VK_EXT_extended_dynamic_state3 ===
+
+    void vkCmdSetDepthClampEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthClampEnableEXT( commandBuffer, depthClampEnable );
+    }
+
+    void vkCmdSetPolygonModeEXT( VkCommandBuffer commandBuffer, VkPolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetPolygonModeEXT( commandBuffer, polygonMode );
+    }
+
+    void vkCmdSetRasterizationSamplesEXT( VkCommandBuffer commandBuffer, VkSampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRasterizationSamplesEXT( commandBuffer, rasterizationSamples );
+    }
+
+    void vkCmdSetSampleMaskEXT( VkCommandBuffer commandBuffer, VkSampleCountFlagBits samples, const VkSampleMask * pSampleMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetSampleMaskEXT( commandBuffer, samples, pSampleMask );
+    }
+
+    void vkCmdSetAlphaToCoverageEnableEXT( VkCommandBuffer commandBuffer, VkBool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetAlphaToCoverageEnableEXT( commandBuffer, alphaToCoverageEnable );
+    }
+
+    void vkCmdSetAlphaToOneEnableEXT( VkCommandBuffer commandBuffer, VkBool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetAlphaToOneEnableEXT( commandBuffer, alphaToOneEnable );
+    }
+
+    void vkCmdSetLogicOpEnableEXT( VkCommandBuffer commandBuffer, VkBool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLogicOpEnableEXT( commandBuffer, logicOpEnable );
+    }
+
+    void vkCmdSetColorBlendEnableEXT( VkCommandBuffer  commandBuffer,
+                                      uint32_t         firstAttachment,
+                                      uint32_t         attachmentCount,
+                                      const VkBool32 * pColorBlendEnables ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetColorBlendEnableEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendEnables );
+    }
+
+    void vkCmdSetColorBlendEquationEXT( VkCommandBuffer                 commandBuffer,
+                                        uint32_t                        firstAttachment,
+                                        uint32_t                        attachmentCount,
+                                        const VkColorBlendEquationEXT * pColorBlendEquations ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetColorBlendEquationEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendEquations );
+    }
+
+    void vkCmdSetColorWriteMaskEXT( VkCommandBuffer               commandBuffer,
+                                    uint32_t                      firstAttachment,
+                                    uint32_t                      attachmentCount,
+                                    const VkColorComponentFlags * pColorWriteMasks ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetColorWriteMaskEXT( commandBuffer, firstAttachment, attachmentCount, pColorWriteMasks );
+    }
+
+    void vkCmdSetTessellationDomainOriginEXT( VkCommandBuffer commandBuffer, VkTessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetTessellationDomainOriginEXT( commandBuffer, domainOrigin );
+    }
+
+    void vkCmdSetRasterizationStreamEXT( VkCommandBuffer commandBuffer, uint32_t rasterizationStream ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRasterizationStreamEXT( commandBuffer, rasterizationStream );
+    }
+
+    void vkCmdSetConservativeRasterizationModeEXT( VkCommandBuffer                    commandBuffer,
+                                                   VkConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetConservativeRasterizationModeEXT( commandBuffer, conservativeRasterizationMode );
+    }
+
+    void vkCmdSetExtraPrimitiveOverestimationSizeEXT( VkCommandBuffer commandBuffer, float extraPrimitiveOverestimationSize ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetExtraPrimitiveOverestimationSizeEXT( commandBuffer, extraPrimitiveOverestimationSize );
+    }
+
+    void vkCmdSetDepthClipEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthClipEnableEXT( commandBuffer, depthClipEnable );
+    }
+
+    void vkCmdSetSampleLocationsEnableEXT( VkCommandBuffer commandBuffer, VkBool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetSampleLocationsEnableEXT( commandBuffer, sampleLocationsEnable );
+    }
+
+    void vkCmdSetColorBlendAdvancedEXT( VkCommandBuffer                 commandBuffer,
+                                        uint32_t                        firstAttachment,
+                                        uint32_t                        attachmentCount,
+                                        const VkColorBlendAdvancedEXT * pColorBlendAdvanced ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetColorBlendAdvancedEXT( commandBuffer, firstAttachment, attachmentCount, pColorBlendAdvanced );
+    }
+
+    void vkCmdSetProvokingVertexModeEXT( VkCommandBuffer commandBuffer, VkProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetProvokingVertexModeEXT( commandBuffer, provokingVertexMode );
+    }
+
+    void vkCmdSetLineRasterizationModeEXT( VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLineRasterizationModeEXT( commandBuffer, lineRasterizationMode );
+    }
+
+    void vkCmdSetLineStippleEnableEXT( VkCommandBuffer commandBuffer, VkBool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLineStippleEnableEXT( commandBuffer, stippledLineEnable );
+    }
+
+    void vkCmdSetDepthClipNegativeOneToOneEXT( VkCommandBuffer commandBuffer, VkBool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDepthClipNegativeOneToOneEXT( commandBuffer, negativeOneToOne );
+    }
+
+    void vkCmdSetViewportWScalingEnableNV( VkCommandBuffer commandBuffer, VkBool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportWScalingEnableNV( commandBuffer, viewportWScalingEnable );
+    }
+
+    void vkCmdSetViewportSwizzleNV( VkCommandBuffer             commandBuffer,
+                                    uint32_t                    firstViewport,
+                                    uint32_t                    viewportCount,
+                                    const VkViewportSwizzleNV * pViewportSwizzles ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetViewportSwizzleNV( commandBuffer, firstViewport, viewportCount, pViewportSwizzles );
+    }
+
+    void vkCmdSetCoverageToColorEnableNV( VkCommandBuffer commandBuffer, VkBool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageToColorEnableNV( commandBuffer, coverageToColorEnable );
+    }
+
+    void vkCmdSetCoverageToColorLocationNV( VkCommandBuffer commandBuffer, uint32_t coverageToColorLocation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageToColorLocationNV( commandBuffer, coverageToColorLocation );
+    }
+
+    void vkCmdSetCoverageModulationModeNV( VkCommandBuffer commandBuffer, VkCoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageModulationModeNV( commandBuffer, coverageModulationMode );
+    }
+
+    void vkCmdSetCoverageModulationTableEnableNV( VkCommandBuffer commandBuffer, VkBool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageModulationTableEnableNV( commandBuffer, coverageModulationTableEnable );
+    }
+
+    void vkCmdSetCoverageModulationTableNV( VkCommandBuffer commandBuffer,
+                                            uint32_t        coverageModulationTableCount,
+                                            const float *   pCoverageModulationTable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageModulationTableNV( commandBuffer, coverageModulationTableCount, pCoverageModulationTable );
+    }
+
+    void vkCmdSetShadingRateImageEnableNV( VkCommandBuffer commandBuffer, VkBool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetShadingRateImageEnableNV( commandBuffer, shadingRateImageEnable );
+    }
+
+    void vkCmdSetRepresentativeFragmentTestEnableNV( VkCommandBuffer commandBuffer, VkBool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetRepresentativeFragmentTestEnableNV( commandBuffer, representativeFragmentTestEnable );
+    }
+
+    void vkCmdSetCoverageReductionModeNV( VkCommandBuffer commandBuffer, VkCoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetCoverageReductionModeNV( commandBuffer, coverageReductionMode );
+    }
+
+    //=== VK_EXT_shader_module_identifier ===
+
+    void vkGetShaderModuleIdentifierEXT( VkDevice device, VkShaderModule shaderModule, VkShaderModuleIdentifierEXT * pIdentifier ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetShaderModuleIdentifierEXT( device, shaderModule, pIdentifier );
+    }
+
+    void vkGetShaderModuleCreateInfoIdentifierEXT( VkDevice                         device,
+                                                   const VkShaderModuleCreateInfo * pCreateInfo,
+                                                   VkShaderModuleIdentifierEXT *    pIdentifier ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetShaderModuleCreateInfoIdentifierEXT( device, pCreateInfo, pIdentifier );
+    }
+
+    //=== VK_NV_optical_flow ===
+
+    VkResult vkGetPhysicalDeviceOpticalFlowImageFormatsNV( VkPhysicalDevice                       physicalDevice,
+                                                           const VkOpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
+                                                           uint32_t *                             pFormatCount,
+                                                           VkOpticalFlowImageFormatPropertiesNV * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceOpticalFlowImageFormatsNV( physicalDevice, pOpticalFlowImageFormatInfo, pFormatCount, pImageFormatProperties );
+    }
+
+    VkResult vkCreateOpticalFlowSessionNV( VkDevice                                 device,
+                                           const VkOpticalFlowSessionCreateInfoNV * pCreateInfo,
+                                           const VkAllocationCallbacks *            pAllocator,
+                                           VkOpticalFlowSessionNV *                 pSession ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateOpticalFlowSessionNV( device, pCreateInfo, pAllocator, pSession );
+    }
+
+    void vkDestroyOpticalFlowSessionNV( VkDevice device, VkOpticalFlowSessionNV session, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyOpticalFlowSessionNV( device, session, pAllocator );
+    }
+
+    VkResult vkBindOpticalFlowSessionImageNV( VkDevice                           device,
+                                              VkOpticalFlowSessionNV             session,
+                                              VkOpticalFlowSessionBindingPointNV bindingPoint,
+                                              VkImageView                        view,
+                                              VkImageLayout                      layout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkBindOpticalFlowSessionImageNV( device, session, bindingPoint, view, layout );
+    }
+
+    void vkCmdOpticalFlowExecuteNV( VkCommandBuffer                    commandBuffer,
+                                    VkOpticalFlowSessionNV             session,
+                                    const VkOpticalFlowExecuteInfoNV * pExecuteInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdOpticalFlowExecuteNV( commandBuffer, session, pExecuteInfo );
+    }
+
+    //=== VK_KHR_maintenance5 ===
+
+    void vkCmdBindIndexBuffer2KHR( VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, VkIndexType indexType ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindIndexBuffer2KHR( commandBuffer, buffer, offset, size, indexType );
+    }
+
+    void vkGetRenderingAreaGranularityKHR( VkDevice                       device,
+                                           const VkRenderingAreaInfoKHR * pRenderingAreaInfo,
+                                           VkExtent2D *                   pGranularity ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetRenderingAreaGranularityKHR( device, pRenderingAreaInfo, pGranularity );
+    }
+
+    void vkGetDeviceImageSubresourceLayoutKHR( VkDevice                                device,
+                                               const VkDeviceImageSubresourceInfoKHR * pInfo,
+                                               VkSubresourceLayout2KHR *               pLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDeviceImageSubresourceLayoutKHR( device, pInfo, pLayout );
+    }
+
+    void vkGetImageSubresourceLayout2KHR( VkDevice                       device,
+                                          VkImage                        image,
+                                          const VkImageSubresource2KHR * pSubresource,
+                                          VkSubresourceLayout2KHR *      pLayout ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetImageSubresourceLayout2KHR( device, image, pSubresource, pLayout );
+    }
+
+    //=== VK_EXT_shader_object ===
+
+    VkResult vkCreateShadersEXT( VkDevice                      device,
+                                 uint32_t                      createInfoCount,
+                                 const VkShaderCreateInfoEXT * pCreateInfos,
+                                 const VkAllocationCallbacks * pAllocator,
+                                 VkShaderEXT *                 pShaders ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCreateShadersEXT( device, createInfoCount, pCreateInfos, pAllocator, pShaders );
+    }
+
+    void vkDestroyShaderEXT( VkDevice device, VkShaderEXT shader, const VkAllocationCallbacks * pAllocator ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkDestroyShaderEXT( device, shader, pAllocator );
+    }
+
+    VkResult vkGetShaderBinaryDataEXT( VkDevice device, VkShaderEXT shader, size_t * pDataSize, void * pData ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetShaderBinaryDataEXT( device, shader, pDataSize, pData );
+    }
+
+    void vkCmdBindShadersEXT( VkCommandBuffer               commandBuffer,
+                              uint32_t                      stageCount,
+                              const VkShaderStageFlagBits * pStages,
+                              const VkShaderEXT *           pShaders ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindShadersEXT( commandBuffer, stageCount, pStages, pShaders );
+    }
+
+    //=== VK_QCOM_tile_properties ===
+
+    VkResult vkGetFramebufferTilePropertiesQCOM( VkDevice               device,
+                                                 VkFramebuffer          framebuffer,
+                                                 uint32_t *             pPropertiesCount,
+                                                 VkTilePropertiesQCOM * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetFramebufferTilePropertiesQCOM( device, framebuffer, pPropertiesCount, pProperties );
+    }
+
+    VkResult vkGetDynamicRenderingTilePropertiesQCOM( VkDevice                device,
+                                                      const VkRenderingInfo * pRenderingInfo,
+                                                      VkTilePropertiesQCOM *  pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetDynamicRenderingTilePropertiesQCOM( device, pRenderingInfo, pProperties );
+    }
+
+    //=== VK_NV_low_latency2 ===
+
+    VkResult vkSetLatencySleepModeNV( VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepModeInfoNV * pSleepModeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetLatencySleepModeNV( device, swapchain, pSleepModeInfo );
+    }
+
+    VkResult vkLatencySleepNV( VkDevice device, VkSwapchainKHR swapchain, const VkLatencySleepInfoNV * pSleepInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkLatencySleepNV( device, swapchain, pSleepInfo );
+    }
+
+    void vkSetLatencyMarkerNV( VkDevice device, VkSwapchainKHR swapchain, const VkSetLatencyMarkerInfoNV * pLatencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkSetLatencyMarkerNV( device, swapchain, pLatencyMarkerInfo );
+    }
+
+    void vkGetLatencyTimingsNV( VkDevice device, VkSwapchainKHR swapchain, VkGetLatencyMarkerInfoNV * pLatencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetLatencyTimingsNV( device, swapchain, pLatencyMarkerInfo );
+    }
+
+    void vkQueueNotifyOutOfBandNV( VkQueue queue, const VkOutOfBandQueueTypeInfoNV * pQueueTypeInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkQueueNotifyOutOfBandNV( queue, pQueueTypeInfo );
+    }
+
+    //=== VK_KHR_cooperative_matrix ===
+
+    VkResult vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( VkPhysicalDevice                   physicalDevice,
+                                                                uint32_t *                         pPropertyCount,
+                                                                VkCooperativeMatrixPropertiesKHR * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( physicalDevice, pPropertyCount, pProperties );
+    }
+
+    //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
+
+    void vkCmdSetAttachmentFeedbackLoopEnableEXT( VkCommandBuffer commandBuffer, VkImageAspectFlags aspectMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetAttachmentFeedbackLoopEnableEXT( commandBuffer, aspectMask );
+    }
+
+#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
+    //=== VK_QNX_external_memory_screen_buffer ===
+
+    VkResult vkGetScreenBufferPropertiesQNX( VkDevice                      device,
+                                             const struct _screen_buffer * buffer,
+                                             VkScreenBufferPropertiesQNX * pProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetScreenBufferPropertiesQNX( device, buffer, pProperties );
+    }
+#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+    //=== VK_KHR_line_rasterization ===
+
+    void vkCmdSetLineStippleKHR( VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetLineStippleKHR( commandBuffer, lineStippleFactor, lineStipplePattern );
+    }
+
+    //=== VK_KHR_calibrated_timestamps ===
+
+    VkResult vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( VkPhysicalDevice  physicalDevice,
+                                                             uint32_t *        pTimeDomainCount,
+                                                             VkTimeDomainKHR * pTimeDomains ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( physicalDevice, pTimeDomainCount, pTimeDomains );
+    }
+
+    VkResult vkGetCalibratedTimestampsKHR( VkDevice                             device,
+                                           uint32_t                             timestampCount,
+                                           const VkCalibratedTimestampInfoKHR * pTimestampInfos,
+                                           uint64_t *                           pTimestamps,
+                                           uint64_t *                           pMaxDeviation ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkGetCalibratedTimestampsKHR( device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation );
+    }
+
+    //=== VK_KHR_maintenance6 ===
+
+    void vkCmdBindDescriptorSets2KHR( VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR * pBindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindDescriptorSets2KHR( commandBuffer, pBindDescriptorSetsInfo );
+    }
+
+    void vkCmdPushConstants2KHR( VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR * pPushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushConstants2KHR( commandBuffer, pPushConstantsInfo );
+    }
+
+    void vkCmdPushDescriptorSet2KHR( VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR * pPushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushDescriptorSet2KHR( commandBuffer, pPushDescriptorSetInfo );
+    }
+
+    void vkCmdPushDescriptorSetWithTemplate2KHR( VkCommandBuffer                                commandBuffer,
+                                                 const VkPushDescriptorSetWithTemplateInfoKHR * pPushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdPushDescriptorSetWithTemplate2KHR( commandBuffer, pPushDescriptorSetWithTemplateInfo );
+    }
+
+    void vkCmdSetDescriptorBufferOffsets2EXT( VkCommandBuffer                             commandBuffer,
+                                              const VkSetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdSetDescriptorBufferOffsets2EXT( commandBuffer, pSetDescriptorBufferOffsetsInfo );
+    }
+
+    void vkCmdBindDescriptorBufferEmbeddedSamplers2EXT(
+      VkCommandBuffer commandBuffer, const VkBindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ::vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( commandBuffer, pBindDescriptorBufferEmbeddedSamplersInfo );
+    }
+  };
+
+  inline ::VULKAN_HPP_NAMESPACE::DispatchLoaderStatic & getDispatchLoaderStatic()
   {
-    T oldValue = std::move( obj );
-    obj        = std::forward<U>( newValue );
-    return oldValue;
+    static ::VULKAN_HPP_NAMESPACE::DispatchLoaderStatic dls;
+    return dls;
   }
 #endif
 
 #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
   struct AllocationCallbacks;
 
-  namespace detail
+  template <typename OwnerType, typename Dispatch>
+  class ObjectDestroy
   {
-    template <typename OwnerType, typename Dispatch>
-    class ObjectDestroy
+  public:
+    ObjectDestroy() = default;
+
+    ObjectDestroy( OwnerType                                               owner,
+                   Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                   Dispatch const & dispatch                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
+      : m_owner( owner )
+      , m_allocationCallbacks( allocationCallbacks )
+      , m_dispatch( &dispatch )
     {
-    public:
-      ObjectDestroy() = default;
+    }
 
-      ObjectDestroy( OwnerType                                               owner,
-                     Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                     Dispatch const & dispatch                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-        : m_owner( owner )
-        , m_allocationCallbacks( allocationCallbacks )
-        , m_dispatch( &dispatch )
-      {
-      }
-
-      OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_owner;
-      }
-
-      Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_allocationCallbacks;
-      }
-
-      Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
-      {
-        return *m_dispatch;
-      }
-
-    protected:
-      template <typename T>
-      void destroy( T t ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_owner && m_dispatch );
-        m_owner.destroy( t, m_allocationCallbacks, *m_dispatch );
-      }
-
-    private:
-      OwnerType                           m_owner               = {};
-      Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
-      Dispatch const *                    m_dispatch            = nullptr;
-    };
-
-    class NoParent;
-
-    template <typename Dispatch>
-    class ObjectDestroy<NoParent, Dispatch>
+    OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      ObjectDestroy() = default;
+      return m_owner;
+    }
 
-      ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks,
-                     Dispatch const & dispatch           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-        : m_allocationCallbacks( allocationCallbacks )
-        , m_dispatch( &dispatch )
-      {
-      }
-
-      Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_allocationCallbacks;
-      }
-
-      Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
-      {
-        return *m_dispatch;
-      }
-
-    protected:
-      template <typename T>
-      void destroy( T t ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_dispatch );
-        t.destroy( m_allocationCallbacks, *m_dispatch );
-      }
-
-    private:
-      Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
-      Dispatch const *                    m_dispatch            = nullptr;
-    };
-
-    template <typename OwnerType, typename Dispatch>
-    class ObjectFree
+    Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      ObjectFree() = default;
+      return m_allocationCallbacks;
+    }
 
-      ObjectFree( OwnerType                                               owner,
-                  Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & dispatch                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-        : m_owner( owner )
-        , m_allocationCallbacks( allocationCallbacks )
-        , m_dispatch( &dispatch )
-      {
-      }
-
-      OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_owner;
-      }
-
-      Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_allocationCallbacks;
-      }
-
-      Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
-      {
-        return *m_dispatch;
-      }
-
-    protected:
-      template <typename T>
-      void destroy( T t ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_owner && m_dispatch );
-        ( m_owner.free )( t, m_allocationCallbacks, *m_dispatch );
-      }
-
-    private:
-      OwnerType                           m_owner               = {};
-      Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
-      Dispatch const *                    m_dispatch            = nullptr;
-    };
-
-    template <typename OwnerType, typename Dispatch>
-    class ObjectRelease
+    Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      ObjectRelease() = default;
+      return *m_dispatch;
+    }
 
-      ObjectRelease( OwnerType owner, Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-        : m_owner( owner )
-        , m_dispatch( &dispatch )
-      {
-      }
-
-      OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_owner;
-      }
-
-      Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
-      {
-        return *m_dispatch;
-      }
-
-    protected:
-      template <typename T>
-      void destroy( T t ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_owner && m_dispatch );
-        m_owner.release( t, *m_dispatch );
-      }
-
-    private:
-      OwnerType        m_owner    = {};
-      Dispatch const * m_dispatch = nullptr;
-    };
-
-    template <typename OwnerType, typename PoolType, typename Dispatch>
-    class PoolFree
+  protected:
+    template <typename T>
+    void destroy( T t ) VULKAN_HPP_NOEXCEPT
     {
-    public:
-      PoolFree() = default;
+      VULKAN_HPP_ASSERT( m_owner && m_dispatch );
+      m_owner.destroy( t, m_allocationCallbacks, *m_dispatch );
+    }
 
-      PoolFree( OwnerType owner, PoolType pool, Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-        : m_owner( owner )
-        , m_pool( pool )
-        , m_dispatch( &dispatch )
-      {
-      }
+  private:
+    OwnerType                           m_owner               = {};
+    Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
+    Dispatch const *                    m_dispatch            = nullptr;
+  };
 
-      OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_owner;
-      }
+  class NoParent;
 
-      PoolType getPool() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_pool;
-      }
+  template <typename Dispatch>
+  class ObjectDestroy<NoParent, Dispatch>
+  {
+  public:
+    ObjectDestroy() = default;
 
-      Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
-      {
-        return *m_dispatch;
-      }
+    ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks,
+                   Dispatch const & dispatch           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
+      : m_allocationCallbacks( allocationCallbacks )
+      , m_dispatch( &dispatch )
+    {
+    }
 
-    protected:
-      template <typename T>
-      void destroy( T t ) VULKAN_HPP_NOEXCEPT
-      {
-        ( m_owner.free )( m_pool, t, *m_dispatch );
-      }
+    Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_allocationCallbacks;
+    }
 
-    private:
-      OwnerType        m_owner    = OwnerType();
-      PoolType         m_pool     = PoolType();
-      Dispatch const * m_dispatch = nullptr;
-    };
+    Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
+    {
+      return *m_dispatch;
+    }
+
+  protected:
+    template <typename T>
+    void destroy( T t ) VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_dispatch );
+      t.destroy( m_allocationCallbacks, *m_dispatch );
+    }
+
+  private:
+    Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
+    Dispatch const *                    m_dispatch            = nullptr;
+  };
+
+  template <typename OwnerType, typename Dispatch>
+  class ObjectFree
+  {
+  public:
+    ObjectFree() = default;
+
+    ObjectFree( OwnerType                                               owner,
+                Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                Dispatch const & dispatch                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
+      : m_owner( owner )
+      , m_allocationCallbacks( allocationCallbacks )
+      , m_dispatch( &dispatch )
+    {
+    }
+
+    OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_owner;
+    }
+
+    Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_allocationCallbacks;
+    }
+
+    Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
+    {
+      return *m_dispatch;
+    }
+
+  protected:
+    template <typename T>
+    void destroy( T t ) VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_owner && m_dispatch );
+      ( m_owner.free )( t, m_allocationCallbacks, *m_dispatch );
+    }
+
+  private:
+    OwnerType                           m_owner               = {};
+    Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
+    Dispatch const *                    m_dispatch            = nullptr;
+  };
+
+  template <typename OwnerType, typename Dispatch>
+  class ObjectRelease
+  {
+  public:
+    ObjectRelease() = default;
+
+    ObjectRelease( OwnerType owner, Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
+      : m_owner( owner )
+      , m_dispatch( &dispatch )
+    {
+    }
+
+    OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_owner;
+    }
+
+    Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
+    {
+      return *m_dispatch;
+    }
+
+  protected:
+    template <typename T>
+    void destroy( T t ) VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_owner && m_dispatch );
+      m_owner.release( t, *m_dispatch );
+    }
+
+  private:
+    OwnerType        m_owner    = {};
+    Dispatch const * m_dispatch = nullptr;
+  };
+
+  template <typename OwnerType, typename PoolType, typename Dispatch>
+  class PoolFree
+  {
+  public:
+    PoolFree() = default;
+
+    PoolFree( OwnerType owner, PoolType pool, Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
+      : m_owner( owner )
+      , m_pool( pool )
+      , m_dispatch( &dispatch )
+    {
+    }
+
+    OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_owner;
+    }
+
+    PoolType getPool() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pool;
+    }
+
+    Dispatch const & getDispatch() const VULKAN_HPP_NOEXCEPT
+    {
+      return *m_dispatch;
+    }
+
+  protected:
+    template <typename T>
+    void destroy( T t ) VULKAN_HPP_NOEXCEPT
+    {
+      ( m_owner.free )( m_pool, t, *m_dispatch );
+    }
+
+  private:
+    OwnerType        m_owner    = OwnerType();
+    PoolType         m_pool     = PoolType();
+    Dispatch const * m_dispatch = nullptr;
+  };
 
-  }  // namespace detail
 #endif  // !VULKAN_HPP_NO_SMART_HANDLE
 
   //==================
@@ -6889,7 +6144,7 @@ namespace VULKAN_HPP_NAMESPACE
   using RemoteAddressNV = void *;
   using SampleMask      = uint32_t;
 
-  template <typename Type, Type value = Type{}>
+  template <typename Type, Type value = 0>
   struct CppType
   {
   };
@@ -6926,7 +6181,7 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VULKAN_HPP_NO_TO_STRING )
       return std::to_string( ev );
 #  else
-      return to_string( static_cast<Result>( ev ) );
+      return VULKAN_HPP_NAMESPACE::to_string( static_cast<VULKAN_HPP_NAMESPACE::Result>( ev ) );
 #  endif
     }
   };
@@ -7099,14 +6354,6 @@ namespace VULKAN_HPP_NAMESPACE
     UnknownError( char const * message ) : SystemError( make_error_code( Result::eErrorUnknown ), message ) {}
   };
 
-  class ValidationFailedError : public SystemError
-  {
-  public:
-    ValidationFailedError( std::string const & message ) : SystemError( make_error_code( Result::eErrorValidationFailed ), message ) {}
-
-    ValidationFailedError( char const * message ) : SystemError( make_error_code( Result::eErrorValidationFailed ), message ) {}
-  };
-
   class OutOfPoolMemoryError : public SystemError
   {
   public:
@@ -7123,14 +6370,6 @@ namespace VULKAN_HPP_NAMESPACE
     InvalidExternalHandleError( char const * message ) : SystemError( make_error_code( Result::eErrorInvalidExternalHandle ), message ) {}
   };
 
-  class InvalidOpaqueCaptureAddressError : public SystemError
-  {
-  public:
-    InvalidOpaqueCaptureAddressError( std::string const & message ) : SystemError( make_error_code( Result::eErrorInvalidOpaqueCaptureAddress ), message ) {}
-
-    InvalidOpaqueCaptureAddressError( char const * message ) : SystemError( make_error_code( Result::eErrorInvalidOpaqueCaptureAddress ), message ) {}
-  };
-
   class FragmentationError : public SystemError
   {
   public:
@@ -7139,12 +6378,12 @@ namespace VULKAN_HPP_NAMESPACE
     FragmentationError( char const * message ) : SystemError( make_error_code( Result::eErrorFragmentation ), message ) {}
   };
 
-  class NotPermittedError : public SystemError
+  class InvalidOpaqueCaptureAddressError : public SystemError
   {
   public:
-    NotPermittedError( std::string const & message ) : SystemError( make_error_code( Result::eErrorNotPermitted ), message ) {}
+    InvalidOpaqueCaptureAddressError( std::string const & message ) : SystemError( make_error_code( Result::eErrorInvalidOpaqueCaptureAddress ), message ) {}
 
-    NotPermittedError( char const * message ) : SystemError( make_error_code( Result::eErrorNotPermitted ), message ) {}
+    InvalidOpaqueCaptureAddressError( char const * message ) : SystemError( make_error_code( Result::eErrorInvalidOpaqueCaptureAddress ), message ) {}
   };
 
   class SurfaceLostKHRError : public SystemError
@@ -7179,6 +6418,14 @@ namespace VULKAN_HPP_NAMESPACE
     IncompatibleDisplayKHRError( char const * message ) : SystemError( make_error_code( Result::eErrorIncompatibleDisplayKHR ), message ) {}
   };
 
+  class ValidationFailedEXTError : public SystemError
+  {
+  public:
+    ValidationFailedEXTError( std::string const & message ) : SystemError( make_error_code( Result::eErrorValidationFailedEXT ), message ) {}
+
+    ValidationFailedEXTError( char const * message ) : SystemError( make_error_code( Result::eErrorValidationFailedEXT ), message ) {}
+  };
+
   class InvalidShaderNVError : public SystemError
   {
   public:
@@ -7270,12 +6517,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
   };
 
-  class PresentTimingQueueFullEXTError : public SystemError
+  class NotPermittedKHRError : public SystemError
   {
   public:
-    PresentTimingQueueFullEXTError( std::string const & message ) : SystemError( make_error_code( Result::eErrorPresentTimingQueueFullEXT ), message ) {}
+    NotPermittedKHRError( std::string const & message ) : SystemError( make_error_code( Result::eErrorNotPermittedKHR ), message ) {}
 
-    PresentTimingQueueFullEXTError( char const * message ) : SystemError( make_error_code( Result::eErrorPresentTimingQueueFullEXT ), message ) {}
+    NotPermittedKHRError( char const * message ) : SystemError( make_error_code( Result::eErrorNotPermittedKHR ), message ) {}
   };
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
@@ -7306,59 +6553,49 @@ namespace VULKAN_HPP_NAMESPACE
     CompressionExhaustedEXTError( char const * message ) : SystemError( make_error_code( Result::eErrorCompressionExhaustedEXT ), message ) {}
   };
 
-  class NotEnoughSpaceKHRError : public SystemError
-  {
-  public:
-    NotEnoughSpaceKHRError( std::string const & message ) : SystemError( make_error_code( Result::eErrorNotEnoughSpaceKHR ), message ) {}
-
-    NotEnoughSpaceKHRError( char const * message ) : SystemError( make_error_code( Result::eErrorNotEnoughSpaceKHR ), message ) {}
-  };
-
   namespace detail
   {
     [[noreturn]] VULKAN_HPP_INLINE void throwResultException( Result result, char const * message )
     {
       switch ( result )
       {
-        case Result::eErrorOutOfHostMemory                       : throw OutOfHostMemoryError( message );
-        case Result::eErrorOutOfDeviceMemory                     : throw OutOfDeviceMemoryError( message );
-        case Result::eErrorInitializationFailed                  : throw InitializationFailedError( message );
-        case Result::eErrorDeviceLost                            : throw DeviceLostError( message );
-        case Result::eErrorMemoryMapFailed                       : throw MemoryMapFailedError( message );
-        case Result::eErrorLayerNotPresent                       : throw LayerNotPresentError( message );
-        case Result::eErrorExtensionNotPresent                   : throw ExtensionNotPresentError( message );
-        case Result::eErrorFeatureNotPresent                     : throw FeatureNotPresentError( message );
-        case Result::eErrorIncompatibleDriver                    : throw IncompatibleDriverError( message );
-        case Result::eErrorTooManyObjects                        : throw TooManyObjectsError( message );
-        case Result::eErrorFormatNotSupported                    : throw FormatNotSupportedError( message );
-        case Result::eErrorFragmentedPool                        : throw FragmentedPoolError( message );
-        case Result::eErrorUnknown                               : throw UnknownError( message );
-        case Result::eErrorValidationFailed                      : throw ValidationFailedError( message );
-        case Result::eErrorOutOfPoolMemory                       : throw OutOfPoolMemoryError( message );
-        case Result::eErrorInvalidExternalHandle                 : throw InvalidExternalHandleError( message );
-        case Result::eErrorInvalidOpaqueCaptureAddress           : throw InvalidOpaqueCaptureAddressError( message );
-        case Result::eErrorFragmentation                         : throw FragmentationError( message );
-        case Result::eErrorNotPermitted                          : throw NotPermittedError( message );
-        case Result::eErrorSurfaceLostKHR                        : throw SurfaceLostKHRError( message );
-        case Result::eErrorNativeWindowInUseKHR                  : throw NativeWindowInUseKHRError( message );
-        case Result::eErrorOutOfDateKHR                          : throw OutOfDateKHRError( message );
-        case Result::eErrorIncompatibleDisplayKHR                : throw IncompatibleDisplayKHRError( message );
-        case Result::eErrorInvalidShaderNV                       : throw InvalidShaderNVError( message );
-        case Result::eErrorImageUsageNotSupportedKHR             : throw ImageUsageNotSupportedKHRError( message );
-        case Result::eErrorVideoPictureLayoutNotSupportedKHR     : throw VideoPictureLayoutNotSupportedKHRError( message );
-        case Result::eErrorVideoProfileOperationNotSupportedKHR  : throw VideoProfileOperationNotSupportedKHRError( message );
-        case Result::eErrorVideoProfileFormatNotSupportedKHR     : throw VideoProfileFormatNotSupportedKHRError( message );
-        case Result::eErrorVideoProfileCodecNotSupportedKHR      : throw VideoProfileCodecNotSupportedKHRError( message );
-        case Result::eErrorVideoStdVersionNotSupportedKHR        : throw VideoStdVersionNotSupportedKHRError( message );
+        case Result::eErrorOutOfHostMemory: throw OutOfHostMemoryError( message );
+        case Result::eErrorOutOfDeviceMemory: throw OutOfDeviceMemoryError( message );
+        case Result::eErrorInitializationFailed: throw InitializationFailedError( message );
+        case Result::eErrorDeviceLost: throw DeviceLostError( message );
+        case Result::eErrorMemoryMapFailed: throw MemoryMapFailedError( message );
+        case Result::eErrorLayerNotPresent: throw LayerNotPresentError( message );
+        case Result::eErrorExtensionNotPresent: throw ExtensionNotPresentError( message );
+        case Result::eErrorFeatureNotPresent: throw FeatureNotPresentError( message );
+        case Result::eErrorIncompatibleDriver: throw IncompatibleDriverError( message );
+        case Result::eErrorTooManyObjects: throw TooManyObjectsError( message );
+        case Result::eErrorFormatNotSupported: throw FormatNotSupportedError( message );
+        case Result::eErrorFragmentedPool: throw FragmentedPoolError( message );
+        case Result::eErrorUnknown: throw UnknownError( message );
+        case Result::eErrorOutOfPoolMemory: throw OutOfPoolMemoryError( message );
+        case Result::eErrorInvalidExternalHandle: throw InvalidExternalHandleError( message );
+        case Result::eErrorFragmentation: throw FragmentationError( message );
+        case Result::eErrorInvalidOpaqueCaptureAddress: throw InvalidOpaqueCaptureAddressError( message );
+        case Result::eErrorSurfaceLostKHR: throw SurfaceLostKHRError( message );
+        case Result::eErrorNativeWindowInUseKHR: throw NativeWindowInUseKHRError( message );
+        case Result::eErrorOutOfDateKHR: throw OutOfDateKHRError( message );
+        case Result::eErrorIncompatibleDisplayKHR: throw IncompatibleDisplayKHRError( message );
+        case Result::eErrorValidationFailedEXT: throw ValidationFailedEXTError( message );
+        case Result::eErrorInvalidShaderNV: throw InvalidShaderNVError( message );
+        case Result::eErrorImageUsageNotSupportedKHR: throw ImageUsageNotSupportedKHRError( message );
+        case Result::eErrorVideoPictureLayoutNotSupportedKHR: throw VideoPictureLayoutNotSupportedKHRError( message );
+        case Result::eErrorVideoProfileOperationNotSupportedKHR: throw VideoProfileOperationNotSupportedKHRError( message );
+        case Result::eErrorVideoProfileFormatNotSupportedKHR: throw VideoProfileFormatNotSupportedKHRError( message );
+        case Result::eErrorVideoProfileCodecNotSupportedKHR: throw VideoProfileCodecNotSupportedKHRError( message );
+        case Result::eErrorVideoStdVersionNotSupportedKHR: throw VideoStdVersionNotSupportedKHRError( message );
         case Result::eErrorInvalidDrmFormatModifierPlaneLayoutEXT: throw InvalidDrmFormatModifierPlaneLayoutEXTError( message );
-        case Result::eErrorPresentTimingQueueFullEXT             : throw PresentTimingQueueFullEXTError( message );
+        case Result::eErrorNotPermittedKHR: throw NotPermittedKHRError( message );
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         case Result::eErrorFullScreenExclusiveModeLostEXT: throw FullScreenExclusiveModeLostEXTError( message );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
         case Result::eErrorInvalidVideoStdParametersKHR: throw InvalidVideoStdParametersKHRError( message );
-        case Result::eErrorCompressionExhaustedEXT     : throw CompressionExhaustedEXTError( message );
-        case Result::eErrorNotEnoughSpaceKHR           : throw NotEnoughSpaceKHRError( message );
-        default                                        : throw SystemError( make_error_code( result ), message );
+        case Result::eErrorCompressionExhaustedEXT: throw CompressionExhaustedEXTError( message );
+        default: throw SystemError( make_error_code( result ), message );
       }
     }
   }  // namespace detail
@@ -7392,36 +6629,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return std::tuple<Result &, T &>( result, value );
     }
-
-    // std::expected-look alike
-    bool has_value() const VULKAN_HPP_NOEXCEPT
-    {
-      return result == vk::Result::eSuccess;
-    }
-
-    T const * operator->() const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( has_value() );
-      return &value;
-    }
-
-    T * operator->() VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( has_value() );
-      return &value;
-    }
-
-    T const & operator*() const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( has_value() );
-      return value;
-    }
-
-    T & operator*() VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( has_value() );
-      return value;
-    }
   };
 
 #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
@@ -7509,38 +6716,37 @@ namespace VULKAN_HPP_NAMESPACE
   namespace detail
   {
     template <typename T>
-    VULKAN_HPP_CONSTEXPR bool ignore( T const & ) VULKAN_HPP_NOEXCEPT
+    void ignore( T const & ) VULKAN_HPP_NOEXCEPT
     {
-      return true;
     }
 
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type createResultValueType( Result result )
+    VULKAN_HPP_INLINE typename VULKAN_HPP_NAMESPACE::ResultValueType<void>::type createResultValueType( VULKAN_HPP_NAMESPACE::Result result )
     {
-#if defined( VULKAN_HPP_NO_EXCEPTIONS )
+#ifdef VULKAN_HPP_NO_EXCEPTIONS
       return result;
 #else
-      ignore( result );
+      VULKAN_HPP_NAMESPACE::detail::ignore( result );
 #endif
     }
 
     template <typename T>
-    VULKAN_HPP_INLINE typename ResultValueType<T>::type createResultValueType( Result result, T & data )
+    VULKAN_HPP_INLINE typename VULKAN_HPP_NAMESPACE::ResultValueType<T>::type createResultValueType( VULKAN_HPP_NAMESPACE::Result result, T & data )
     {
-#if defined( VULKAN_HPP_NO_EXCEPTIONS )
+#ifdef VULKAN_HPP_NO_EXCEPTIONS
       return ResultValue<T>( result, data );
 #else
-      ignore( result );
+      VULKAN_HPP_NAMESPACE::detail::ignore( result );
       return data;
 #endif
     }
 
     template <typename T>
-    VULKAN_HPP_INLINE typename ResultValueType<T>::type createResultValueType( Result result, T && data )
+    VULKAN_HPP_INLINE typename VULKAN_HPP_NAMESPACE::ResultValueType<T>::type createResultValueType( VULKAN_HPP_NAMESPACE::Result result, T && data )
     {
-#if defined( VULKAN_HPP_NO_EXCEPTIONS )
+#ifdef VULKAN_HPP_NO_EXCEPTIONS
       return ResultValue<T>( result, std::move( data ) );
 #else
-      ignore( result );
+      VULKAN_HPP_NAMESPACE::detail::ignore( result );
       return std::move( data );
 #endif
     }
@@ -7551,13 +6757,13 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_INLINE void resultCheck( Result result, char const * message )
     {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
-      ignore( result );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
-      ignore( message );
+      VULKAN_HPP_NAMESPACE::detail::ignore( result );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
+      VULKAN_HPP_NAMESPACE::detail::ignore( message );
       VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
 #else
       if ( result != Result::eSuccess )
       {
-        throwResultException( result, message );
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, message );
       }
 #endif
     }
@@ -7565,14 +6771,14 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_INLINE void resultCheck( Result result, char const * message, std::initializer_list<Result> successCodes )
     {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
-      ignore( result );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
-      ignore( message );
-      ignore( successCodes );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
+      VULKAN_HPP_NAMESPACE::detail::ignore( result );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
+      VULKAN_HPP_NAMESPACE::detail::ignore( message );
+      VULKAN_HPP_NAMESPACE::detail::ignore( successCodes );  // just in case VULKAN_HPP_ASSERT_ON_RESULT is empty
       VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
 #else
       if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
       {
-        throwResultException( result, message );
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, message );
       }
 #endif
     }
@@ -7583,11 +6789,13 @@ namespace VULKAN_HPP_NAMESPACE
   //===========================
 
   //=== VK_VERSION_1_0 ===
+  VULKAN_HPP_CONSTEXPR_INLINE uint32_t AttachmentUnused          = VK_ATTACHMENT_UNUSED;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t False                     = VK_FALSE;
   VULKAN_HPP_CONSTEXPR_INLINE float    LodClampNone              = VK_LOD_CLAMP_NONE;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t QueueFamilyIgnored        = VK_QUEUE_FAMILY_IGNORED;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t RemainingArrayLayers      = VK_REMAINING_ARRAY_LAYERS;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t RemainingMipLevels        = VK_REMAINING_MIP_LEVELS;
+  VULKAN_HPP_CONSTEXPR_INLINE uint32_t SubpassExternal           = VK_SUBPASS_EXTERNAL;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t True                      = VK_TRUE;
   VULKAN_HPP_CONSTEXPR_INLINE uint64_t WholeSize                 = VK_WHOLE_SIZE;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxMemoryTypes            = VK_MAX_MEMORY_TYPES;
@@ -7596,8 +6804,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxExtensionNameSize      = VK_MAX_EXTENSION_NAME_SIZE;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxDescriptionSize        = VK_MAX_DESCRIPTION_SIZE;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxMemoryHeaps            = VK_MAX_MEMORY_HEAPS;
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t AttachmentUnused          = VK_ATTACHMENT_UNUSED;
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t SubpassExternal           = VK_SUBPASS_EXTERNAL;
 
   //=== VK_VERSION_1_1 ===
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxDeviceGroupSize  = VK_MAX_DEVICE_GROUP_SIZE;
@@ -7608,9 +6814,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxDriverNameSize = VK_MAX_DRIVER_NAME_SIZE;
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxDriverInfoSize = VK_MAX_DRIVER_INFO_SIZE;
 
-  //=== VK_VERSION_1_4 ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxGlobalPrioritySize = VK_MAX_GLOBAL_PRIORITY_SIZE;
-
   //=== VK_KHR_device_group_creation ===
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxDeviceGroupSizeKHR = VK_MAX_DEVICE_GROUP_SIZE_KHR;
 
@@ -7650,35 +6853,13 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_shader_module_identifier ===
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxShaderModuleIdentifierSizeEXT = VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT;
 
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t CompressedTriangleFormatDgf1ByteAlignmentAMDX = VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_ALIGNMENT_AMDX;
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t CompressedTriangleFormatDgf1ByteStrideAMDX    = VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_STRIDE_AMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_pipeline_binary ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxPipelineBinaryKeySizeKHR = VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR;
-
-  //=== VK_ARM_data_graph ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxPhysicalDeviceDataGraphOperationSetNameSizeARM = VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM;
-
   //=== VK_KHR_video_decode_av1 ===
   VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxVideoAv1ReferencesPerFrameKHR = VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR;
 
-  //=== VK_KHR_video_decode_vp9 ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t MaxVideoVp9ReferencesPerFrameKHR = VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t PartitionedAccelerationStructurePartitionIndexGlobalNV = VK_PARTITIONED_ACCELERATION_STRUCTURE_PARTITION_INDEX_GLOBAL_NV;
-
-  //=== VK_QCOM_data_graph_model ===
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t DataGraphModelToolchainVersionLengthQCOM = VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM;
-
   //========================
   //=== CONSTEXPR VALUEs ===
   //========================
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t HeaderVersion      = VK_HEADER_VERSION;
-  VULKAN_HPP_CONSTEXPR_INLINE uint32_t Use64BitPtrDefines = VK_USE_64_BIT_PTR_DEFINES;
+  VULKAN_HPP_CONSTEXPR_INLINE uint32_t HeaderVersion = VK_HEADER_VERSION;
 
   //=========================
   //=== CONSTEXPR CALLEEs ===
@@ -7698,7 +6879,7 @@ namespace VULKAN_HPP_NAMESPACE
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
   VULKAN_HPP_CONSTEXPR uint32_t apiVersionPatch( T const version )
   {
-    return ( (uint32_t)( version ) & 0xFFFU );
+    return ( (uint32_t)(version)&0xFFFU );
   }
 
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
@@ -7714,27 +6895,31 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
+  VULKAN_HPP_DEPRECATED( "This define is deprecated. VK_MAKE_API_VERSION should be used instead." )
   VULKAN_HPP_CONSTEXPR uint32_t makeVersion( T const major, T const minor, T const patch )
   {
     return ( ( ( (uint32_t)( major ) ) << 22U ) | ( ( (uint32_t)( minor ) ) << 12U ) | ( (uint32_t)( patch ) ) );
   }
 
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
+  VULKAN_HPP_DEPRECATED( "This define is deprecated. VK_API_VERSION_MAJOR should be used instead." )
   VULKAN_HPP_CONSTEXPR uint32_t versionMajor( T const version )
   {
     return ( (uint32_t)( version ) >> 22U );
   }
 
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
+  VULKAN_HPP_DEPRECATED( "This define is deprecated. VK_API_VERSION_MINOR should be used instead." )
   VULKAN_HPP_CONSTEXPR uint32_t versionMinor( T const version )
   {
     return ( ( (uint32_t)( version ) >> 12U ) & 0x3FFU );
   }
 
   template <typename T, typename = typename std::enable_if<std::is_integral<T>::value>::type>
+  VULKAN_HPP_DEPRECATED( "This define is deprecated. VK_API_VERSION_PATCH should be used instead." )
   VULKAN_HPP_CONSTEXPR uint32_t versionPatch( T const version )
   {
-    return ( (uint32_t)( version ) & 0xFFFU );
+    return ( (uint32_t)(version)&0xFFFU );
   }
 
   //=========================
@@ -7745,8 +6930,7 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto ApiVersion11          = makeApiVersion( 0, 1, 1, 0 );
   VULKAN_HPP_CONSTEXPR_INLINE auto ApiVersion12          = makeApiVersion( 0, 1, 2, 0 );
   VULKAN_HPP_CONSTEXPR_INLINE auto ApiVersion13          = makeApiVersion( 0, 1, 3, 0 );
-  VULKAN_HPP_CONSTEXPR_INLINE auto ApiVersion14          = makeApiVersion( 0, 1, 4, 0 );
-  VULKAN_HPP_CONSTEXPR_INLINE auto HeaderVersionComplete = makeApiVersion( 0, 1, 4, VK_HEADER_VERSION );
+  VULKAN_HPP_CONSTEXPR_INLINE auto HeaderVersionComplete = makeApiVersion( 0, 1, 3, VK_HEADER_VERSION );
 
   //=================================
   //=== CONSTEXPR EXTENSION NAMEs ===
@@ -7815,8 +6999,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDepthRangeUnrestrictedSpecVersion   = VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION;
 
   //=== VK_KHR_sampler_mirror_clamp_to_edge ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_sampler_mirror_clamp_to_edge extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerMirrorClampToEdgeExtensionName = VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerMirrorClampToEdgeSpecVersion   = VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_sampler_mirror_clamp_to_edge extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerMirrorClampToEdgeSpecVersion = VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION;
 
   //=== VK_IMG_filter_cubic ===
   VULKAN_HPP_CONSTEXPR_INLINE auto IMGFilterCubicExtensionName = VK_IMG_FILTER_CUBIC_EXTENSION_NAME;
@@ -7835,8 +7021,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDShaderExplicitVertexParameterSpecVersion   = VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION;
 
   //=== VK_EXT_debug_marker ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_debug_marker extension has been promoted to VK_EXT_debug_utils." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDebugMarkerExtensionName = VK_EXT_DEBUG_MARKER_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDebugMarkerSpecVersion   = VK_EXT_DEBUG_MARKER_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_debug_marker extension has been promoted to VK_EXT_debug_utils." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDebugMarkerSpecVersion = VK_EXT_DEBUG_MARKER_SPEC_VERSION;
 
   //=== VK_KHR_video_queue ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoQueueExtensionName = VK_KHR_VIDEO_QUEUE_EXTENSION_NAME;
@@ -7869,8 +7057,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVXImageViewHandleSpecVersion   = VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION;
 
   //=== VK_AMD_draw_indirect_count ===
+  VULKAN_HPP_DEPRECATED( "The VK_AMD_draw_indirect_count extension has been promoted to VK_KHR_draw_indirect_count." )
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDDrawIndirectCountExtensionName = VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto AMDDrawIndirectCountSpecVersion   = VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_AMD_draw_indirect_count extension has been promoted to VK_KHR_draw_indirect_count." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto AMDDrawIndirectCountSpecVersion = VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION;
 
   //=== VK_AMD_negative_viewport_height ===
   VULKAN_HPP_DEPRECATED( "The VK_AMD_negative_viewport_height extension has been obsoleted by VK_KHR_maintenance1." )
@@ -7909,8 +7099,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDShaderInfoSpecVersion   = VK_AMD_SHADER_INFO_SPEC_VERSION;
 
   //=== VK_KHR_dynamic_rendering ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_dynamic_rendering extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDynamicRenderingExtensionName = VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDynamicRenderingSpecVersion   = VK_KHR_DYNAMIC_RENDERING_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_dynamic_rendering extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDynamicRenderingSpecVersion = VK_KHR_DYNAMIC_RENDERING_SPEC_VERSION;
 
   //=== VK_AMD_shader_image_load_store_lod ===
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDShaderImageLoadStoreLodExtensionName = VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_EXTENSION_NAME;
@@ -7927,8 +7119,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVCornerSampledImageSpecVersion   = VK_NV_CORNER_SAMPLED_IMAGE_SPEC_VERSION;
 
   //=== VK_KHR_multiview ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_multiview extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMultiviewExtensionName = VK_KHR_MULTIVIEW_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMultiviewSpecVersion   = VK_KHR_MULTIVIEW_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_multiview extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMultiviewSpecVersion = VK_KHR_MULTIVIEW_SPEC_VERSION;
 
   //=== VK_IMG_format_pvrtc ===
   VULKAN_HPP_DEPRECATED( "The VK_IMG_format_pvrtc extension has been deprecated." )
@@ -7958,17 +7152,23 @@ namespace VULKAN_HPP_NAMESPACE
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_NV_win32_keyed_mutex ===
+  VULKAN_HPP_DEPRECATED( "The VK_NV_win32_keyed_mutex extension has been promoted to VK_KHR_win32_keyed_mutex." )
   VULKAN_HPP_CONSTEXPR_INLINE auto NVWin32KeyedMutexExtensionName = VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVWin32KeyedMutexSpecVersion   = VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_NV_win32_keyed_mutex extension has been promoted to VK_KHR_win32_keyed_mutex." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto NVWin32KeyedMutexSpecVersion = VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION;
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_get_physical_device_properties2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_get_physical_device_properties2 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetPhysicalDeviceProperties2ExtensionName = VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetPhysicalDeviceProperties2SpecVersion   = VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_get_physical_device_properties2 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetPhysicalDeviceProperties2SpecVersion = VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION;
 
   //=== VK_KHR_device_group ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_device_group extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupExtensionName = VK_KHR_DEVICE_GROUP_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupSpecVersion   = VK_KHR_DEVICE_GROUP_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_device_group extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupSpecVersion = VK_KHR_DEVICE_GROUP_SPEC_VERSION;
 
   //=== VK_EXT_validation_flags ===
   VULKAN_HPP_DEPRECATED( "The VK_EXT_validation_flags extension has been deprecated by VK_EXT_layer_settings." )
@@ -7983,8 +7183,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
   //=== VK_KHR_shader_draw_parameters ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_draw_parameters extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderDrawParametersExtensionName = VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderDrawParametersSpecVersion   = VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_draw_parameters extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderDrawParametersSpecVersion = VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION;
 
   //=== VK_EXT_shader_subgroup_ballot ===
   VULKAN_HPP_DEPRECATED( "The VK_EXT_shader_subgroup_ballot extension has been deprecated by VK_VERSION_1_2." )
@@ -7999,8 +7201,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderSubgroupVoteSpecVersion = VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION;
 
   //=== VK_EXT_texture_compression_astc_hdr ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_texture_compression_astc_hdr extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTTextureCompressionAstcHdrExtensionName = VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTTextureCompressionAstcHdrSpecVersion   = VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_texture_compression_astc_hdr extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTTextureCompressionAstcHdrSpecVersion = VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_SPEC_VERSION;
 
   //=== VK_EXT_astc_decode_mode ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTAstcDecodeModeExtensionName = VK_EXT_ASTC_DECODE_MODE_EXTENSION_NAME;
@@ -8011,20 +7215,28 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineRobustnessSpecVersion   = VK_EXT_PIPELINE_ROBUSTNESS_SPEC_VERSION;
 
   //=== VK_KHR_maintenance1 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance1 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance1ExtensionName = VK_KHR_MAINTENANCE_1_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance1SpecVersion   = VK_KHR_MAINTENANCE_1_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance1 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance1SpecVersion = VK_KHR_MAINTENANCE_1_SPEC_VERSION;
 
   //=== VK_KHR_device_group_creation ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_device_group_creation extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupCreationExtensionName = VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupCreationSpecVersion   = VK_KHR_DEVICE_GROUP_CREATION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_device_group_creation extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeviceGroupCreationSpecVersion = VK_KHR_DEVICE_GROUP_CREATION_SPEC_VERSION;
 
   //=== VK_KHR_external_memory_capabilities ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_memory_capabilities extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemoryCapabilitiesExtensionName = VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemoryCapabilitiesSpecVersion   = VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_memory_capabilities extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemoryCapabilitiesSpecVersion = VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION;
 
   //=== VK_KHR_external_memory ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_memory extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemoryExtensionName = VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemorySpecVersion   = VK_KHR_EXTERNAL_MEMORY_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_memory extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalMemorySpecVersion = VK_KHR_EXTERNAL_MEMORY_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
@@ -8043,12 +7255,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_semaphore_capabilities ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_semaphore_capabilities extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreCapabilitiesExtensionName = VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreCapabilitiesSpecVersion   = VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_semaphore_capabilities extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreCapabilitiesSpecVersion = VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION;
 
   //=== VK_KHR_external_semaphore ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_semaphore extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreExtensionName = VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreSpecVersion   = VK_KHR_EXTERNAL_SEMAPHORE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_semaphore extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalSemaphoreSpecVersion = VK_KHR_EXTERNAL_SEMAPHORE_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_semaphore_win32 ===
@@ -8069,20 +7285,26 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTConditionalRenderingSpecVersion   = VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION;
 
   //=== VK_KHR_shader_float16_int8 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_float16_int8 extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloat16Int8ExtensionName = VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloat16Int8SpecVersion   = VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_float16_int8 extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloat16Int8SpecVersion = VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION;
 
   //=== VK_KHR_16bit_storage ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_16bit_storage extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHR16BitStorageExtensionName = VK_KHR_16BIT_STORAGE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHR16BitStorageSpecVersion   = VK_KHR_16BIT_STORAGE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_16bit_storage extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHR16BitStorageSpecVersion = VK_KHR_16BIT_STORAGE_SPEC_VERSION;
 
   //=== VK_KHR_incremental_present ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRIncrementalPresentExtensionName = VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRIncrementalPresentSpecVersion   = VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION;
 
   //=== VK_KHR_descriptor_update_template ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_descriptor_update_template extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDescriptorUpdateTemplateExtensionName = VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDescriptorUpdateTemplateSpecVersion   = VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_descriptor_update_template extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDescriptorUpdateTemplateSpecVersion = VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION;
 
   //=== VK_NV_clip_space_w_scaling ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVClipSpaceWScalingExtensionName = VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME;
@@ -8151,12 +7373,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTHdrMetadataSpecVersion   = VK_EXT_HDR_METADATA_SPEC_VERSION;
 
   //=== VK_KHR_imageless_framebuffer ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_imageless_framebuffer extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRImagelessFramebufferExtensionName = VK_KHR_IMAGELESS_FRAMEBUFFER_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRImagelessFramebufferSpecVersion   = VK_KHR_IMAGELESS_FRAMEBUFFER_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_imageless_framebuffer extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRImagelessFramebufferSpecVersion = VK_KHR_IMAGELESS_FRAMEBUFFER_SPEC_VERSION;
 
   //=== VK_KHR_create_renderpass2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_create_renderpass2 extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRCreateRenderpass2ExtensionName = VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCreateRenderpass2SpecVersion   = VK_KHR_CREATE_RENDERPASS_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_create_renderpass2 extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCreateRenderpass2SpecVersion = VK_KHR_CREATE_RENDERPASS_2_SPEC_VERSION;
 
   //=== VK_IMG_relaxed_line_rasterization ===
   VULKAN_HPP_CONSTEXPR_INLINE auto IMGRelaxedLineRasterizationExtensionName = VK_IMG_RELAXED_LINE_RASTERIZATION_EXTENSION_NAME;
@@ -8167,12 +7393,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSharedPresentableImageSpecVersion   = VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION;
 
   //=== VK_KHR_external_fence_capabilities ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_fence_capabilities extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceCapabilitiesExtensionName = VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceCapabilitiesSpecVersion   = VK_KHR_EXTERNAL_FENCE_CAPABILITIES_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_fence_capabilities extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceCapabilitiesSpecVersion = VK_KHR_EXTERNAL_FENCE_CAPABILITIES_SPEC_VERSION;
 
   //=== VK_KHR_external_fence ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_fence extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceExtensionName = VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceSpecVersion   = VK_KHR_EXTERNAL_FENCE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_external_fence extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRExternalFenceSpecVersion = VK_KHR_EXTERNAL_FENCE_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_fence_win32 ===
@@ -8189,16 +7419,20 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRPerformanceQuerySpecVersion   = VK_KHR_PERFORMANCE_QUERY_SPEC_VERSION;
 
   //=== VK_KHR_maintenance2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance2 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance2ExtensionName = VK_KHR_MAINTENANCE_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance2SpecVersion   = VK_KHR_MAINTENANCE_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance2 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance2SpecVersion = VK_KHR_MAINTENANCE_2_SPEC_VERSION;
 
   //=== VK_KHR_get_surface_capabilities2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetSurfaceCapabilities2ExtensionName = VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetSurfaceCapabilities2SpecVersion   = VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION;
 
   //=== VK_KHR_variable_pointers ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_variable_pointers extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVariablePointersExtensionName = VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVariablePointersSpecVersion   = VK_KHR_VARIABLE_POINTERS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_variable_pointers extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVariablePointersSpecVersion = VK_KHR_VARIABLE_POINTERS_SPEC_VERSION;
 
   //=== VK_KHR_get_display_properties2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetDisplayProperties2ExtensionName = VK_KHR_GET_DISPLAY_PROPERTIES_2_EXTENSION_NAME;
@@ -8229,8 +7463,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTQueueFamilyForeignSpecVersion   = VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION;
 
   //=== VK_KHR_dedicated_allocation ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_dedicated_allocation extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDedicatedAllocationExtensionName = VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDedicatedAllocationSpecVersion   = VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_dedicated_allocation extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDedicatedAllocationSpecVersion = VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION;
 
   //=== VK_EXT_debug_utils ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDebugUtilsExtensionName = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
@@ -8243,12 +7479,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
   //=== VK_EXT_sampler_filter_minmax ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_sampler_filter_minmax extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSamplerFilterMinmaxExtensionName = VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSamplerFilterMinmaxSpecVersion   = VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_sampler_filter_minmax extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSamplerFilterMinmaxSpecVersion = VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION;
 
   //=== VK_KHR_storage_buffer_storage_class ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_storage_buffer_storage_class extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRStorageBufferStorageClassExtensionName = VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRStorageBufferStorageClassSpecVersion   = VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_storage_buffer_storage_class extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRStorageBufferStorageClassSpecVersion = VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_SPEC_VERSION;
 
   //=== VK_AMD_gpu_shader_int16 ===
   VULKAN_HPP_DEPRECATED( "The VK_AMD_gpu_shader_int16 extension has been deprecated by VK_KHR_shader_float16_int8." )
@@ -8271,32 +7511,36 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDShaderFragmentMaskSpecVersion   = VK_AMD_SHADER_FRAGMENT_MASK_SPEC_VERSION;
 
   //=== VK_EXT_inline_uniform_block ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_inline_uniform_block extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTInlineUniformBlockExtensionName = VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTInlineUniformBlockSpecVersion   = VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_inline_uniform_block extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTInlineUniformBlockSpecVersion = VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION;
 
   //=== VK_EXT_shader_stencil_export ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderStencilExportExtensionName = VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderStencilExportSpecVersion   = VK_EXT_SHADER_STENCIL_EXPORT_SPEC_VERSION;
 
-  //=== VK_KHR_shader_bfloat16 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderBfloat16ExtensionName = VK_KHR_SHADER_BFLOAT16_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderBfloat16SpecVersion   = VK_KHR_SHADER_BFLOAT16_SPEC_VERSION;
-
   //=== VK_EXT_sample_locations ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSampleLocationsExtensionName = VK_EXT_SAMPLE_LOCATIONS_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSampleLocationsSpecVersion   = VK_EXT_SAMPLE_LOCATIONS_SPEC_VERSION;
 
   //=== VK_KHR_relaxed_block_layout ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_relaxed_block_layout extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRRelaxedBlockLayoutExtensionName = VK_KHR_RELAXED_BLOCK_LAYOUT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRRelaxedBlockLayoutSpecVersion   = VK_KHR_RELAXED_BLOCK_LAYOUT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_relaxed_block_layout extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRRelaxedBlockLayoutSpecVersion = VK_KHR_RELAXED_BLOCK_LAYOUT_SPEC_VERSION;
 
   //=== VK_KHR_get_memory_requirements2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_get_memory_requirements2 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetMemoryRequirements2ExtensionName = VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetMemoryRequirements2SpecVersion   = VK_KHR_GET_MEMORY_REQUIREMENTS_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_get_memory_requirements2 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRGetMemoryRequirements2SpecVersion = VK_KHR_GET_MEMORY_REQUIREMENTS_2_SPEC_VERSION;
 
   //=== VK_KHR_image_format_list ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_image_format_list extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRImageFormatListExtensionName = VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRImageFormatListSpecVersion   = VK_KHR_IMAGE_FORMAT_LIST_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_image_format_list extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRImageFormatListSpecVersion = VK_KHR_IMAGE_FORMAT_LIST_SPEC_VERSION;
 
   //=== VK_EXT_blend_operation_advanced ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTBlendOperationAdvancedExtensionName = VK_EXT_BLEND_OPERATION_ADVANCED_EXTENSION_NAME;
@@ -8335,12 +7579,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPostDepthCoverageSpecVersion   = VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION;
 
   //=== VK_KHR_sampler_ycbcr_conversion ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_sampler_ycbcr_conversion extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerYcbcrConversionExtensionName = VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerYcbcrConversionSpecVersion   = VK_KHR_SAMPLER_YCBCR_CONVERSION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_sampler_ycbcr_conversion extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSamplerYcbcrConversionSpecVersion = VK_KHR_SAMPLER_YCBCR_CONVERSION_SPEC_VERSION;
 
   //=== VK_KHR_bind_memory2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_bind_memory2 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRBindMemory2ExtensionName = VK_KHR_BIND_MEMORY_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRBindMemory2SpecVersion   = VK_KHR_BIND_MEMORY_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_bind_memory2 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRBindMemory2SpecVersion = VK_KHR_BIND_MEMORY_2_SPEC_VERSION;
 
   //=== VK_EXT_image_drm_format_modifier ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageDrmFormatModifierExtensionName = VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME;
@@ -8351,12 +7599,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTValidationCacheSpecVersion   = VK_EXT_VALIDATION_CACHE_SPEC_VERSION;
 
   //=== VK_EXT_descriptor_indexing ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_descriptor_indexing extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDescriptorIndexingExtensionName = VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDescriptorIndexingSpecVersion   = VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_descriptor_indexing extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDescriptorIndexingSpecVersion = VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION;
 
   //=== VK_EXT_shader_viewport_index_layer ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_shader_viewport_index_layer extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderViewportIndexLayerExtensionName = VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderViewportIndexLayerSpecVersion   = VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_shader_viewport_index_layer extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderViewportIndexLayerSpecVersion = VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_SPEC_VERSION;
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_KHR_portability_subset ===
@@ -8369,22 +7621,24 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShadingRateImageSpecVersion   = VK_NV_SHADING_RATE_IMAGE_SPEC_VERSION;
 
   //=== VK_NV_ray_tracing ===
-  VULKAN_HPP_DEPRECATED( "The VK_NV_ray_tracing extension has been deprecated by VK_KHR_ray_tracing_pipeline." )
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingExtensionName = VK_NV_RAY_TRACING_EXTENSION_NAME;
-  VULKAN_HPP_DEPRECATED( "The VK_NV_ray_tracing extension has been deprecated by VK_KHR_ray_tracing_pipeline." )
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingSpecVersion = VK_NV_RAY_TRACING_SPEC_VERSION;
+  VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingSpecVersion   = VK_NV_RAY_TRACING_SPEC_VERSION;
 
   //=== VK_NV_representative_fragment_test ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRepresentativeFragmentTestExtensionName = VK_NV_REPRESENTATIVE_FRAGMENT_TEST_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRepresentativeFragmentTestSpecVersion   = VK_NV_REPRESENTATIVE_FRAGMENT_TEST_SPEC_VERSION;
 
   //=== VK_KHR_maintenance3 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance3 extension has been promoted to core in version 1.1." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance3ExtensionName = VK_KHR_MAINTENANCE_3_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance3SpecVersion   = VK_KHR_MAINTENANCE_3_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance3 extension has been promoted to core in version 1.1." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance3SpecVersion = VK_KHR_MAINTENANCE_3_SPEC_VERSION;
 
   //=== VK_KHR_draw_indirect_count ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_draw_indirect_count extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDrawIndirectCountExtensionName = VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDrawIndirectCountSpecVersion   = VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_draw_indirect_count extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDrawIndirectCountSpecVersion = VK_KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION;
 
   //=== VK_EXT_filter_cubic ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTFilterCubicExtensionName = VK_EXT_FILTER_CUBIC_EXTENSION_NAME;
@@ -8395,16 +7649,22 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMRenderPassShaderResolveSpecVersion   = VK_QCOM_RENDER_PASS_SHADER_RESOLVE_SPEC_VERSION;
 
   //=== VK_EXT_global_priority ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_global_priority extension has been promoted to VK_KHR_global_priority." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPriorityExtensionName = VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPrioritySpecVersion   = VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_global_priority extension has been promoted to VK_KHR_global_priority." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPrioritySpecVersion = VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION;
 
   //=== VK_KHR_shader_subgroup_extended_types ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_subgroup_extended_types extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderSubgroupExtendedTypesExtensionName = VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderSubgroupExtendedTypesSpecVersion   = VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_subgroup_extended_types extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderSubgroupExtendedTypesSpecVersion = VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_SPEC_VERSION;
 
   //=== VK_KHR_8bit_storage ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_8bit_storage extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHR8BitStorageExtensionName = VK_KHR_8BIT_STORAGE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHR8BitStorageSpecVersion   = VK_KHR_8BIT_STORAGE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_8bit_storage extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHR8BitStorageSpecVersion = VK_KHR_8BIT_STORAGE_SPEC_VERSION;
 
   //=== VK_EXT_external_memory_host ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTExternalMemoryHostExtensionName = VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME;
@@ -8415,8 +7675,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDBufferMarkerSpecVersion   = VK_AMD_BUFFER_MARKER_SPEC_VERSION;
 
   //=== VK_KHR_shader_atomic_int64 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_atomic_int64 extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderAtomicInt64ExtensionName = VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderAtomicInt64SpecVersion   = VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_atomic_int64 extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderAtomicInt64SpecVersion = VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION;
 
   //=== VK_KHR_shader_clock ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderClockExtensionName = VK_KHR_SHADER_CLOCK_EXTENSION_NAME;
@@ -8427,8 +7689,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDPipelineCompilerControlSpecVersion   = VK_AMD_PIPELINE_COMPILER_CONTROL_SPEC_VERSION;
 
   //=== VK_EXT_calibrated_timestamps ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_calibrated_timestamps extension has been promoted to VK_KHR_calibrated_timestamps." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTCalibratedTimestampsExtensionName = VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTCalibratedTimestampsSpecVersion   = VK_EXT_CALIBRATED_TIMESTAMPS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_calibrated_timestamps extension has been promoted to VK_KHR_calibrated_timestamps." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTCalibratedTimestampsSpecVersion = VK_EXT_CALIBRATED_TIMESTAMPS_SPEC_VERSION;
 
   //=== VK_AMD_shader_core_properties ===
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDShaderCorePropertiesExtensionName = VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME;
@@ -8447,8 +7711,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto AMDMemoryOverallocationBehaviorSpecVersion   = VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_SPEC_VERSION;
 
   //=== VK_EXT_vertex_attribute_divisor ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_vertex_attribute_divisor extension has been promoted to VK_KHR_vertex_attribute_divisor." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexAttributeDivisorExtensionName = VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexAttributeDivisorSpecVersion   = VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_vertex_attribute_divisor extension has been promoted to VK_KHR_vertex_attribute_divisor." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexAttributeDivisorSpecVersion = VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_frame_token ===
@@ -8457,24 +7723,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_GGP*/
 
   //=== VK_EXT_pipeline_creation_feedback ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_pipeline_creation_feedback extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationFeedbackExtensionName = VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationFeedbackSpecVersion   = VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_pipeline_creation_feedback extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationFeedbackSpecVersion = VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION;
 
   //=== VK_KHR_driver_properties ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_driver_properties extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDriverPropertiesExtensionName = VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDriverPropertiesSpecVersion   = VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_driver_properties extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDriverPropertiesSpecVersion = VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION;
 
   //=== VK_KHR_shader_float_controls ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_float_controls extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloatControlsExtensionName = VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloatControlsSpecVersion   = VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_float_controls extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloatControlsSpecVersion = VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION;
 
   //=== VK_NV_shader_subgroup_partitioned ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShaderSubgroupPartitionedExtensionName = VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShaderSubgroupPartitionedSpecVersion   = VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION;
 
   //=== VK_KHR_depth_stencil_resolve ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_depth_stencil_resolve extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDepthStencilResolveExtensionName = VK_KHR_DEPTH_STENCIL_RESOLVE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDepthStencilResolveSpecVersion   = VK_KHR_DEPTH_STENCIL_RESOLVE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_depth_stencil_resolve extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDepthStencilResolveSpecVersion = VK_KHR_DEPTH_STENCIL_RESOLVE_SPEC_VERSION;
 
   //=== VK_KHR_swapchain_mutable_format ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSwapchainMutableFormatExtensionName = VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME;
@@ -8489,8 +7763,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVMeshShaderSpecVersion   = VK_NV_MESH_SHADER_SPEC_VERSION;
 
   //=== VK_NV_fragment_shader_barycentric ===
+  VULKAN_HPP_DEPRECATED( "The VK_NV_fragment_shader_barycentric extension has been promoted to VK_KHR_fragment_shader_barycentric." )
   VULKAN_HPP_CONSTEXPR_INLINE auto NVFragmentShaderBarycentricExtensionName = VK_NV_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVFragmentShaderBarycentricSpecVersion   = VK_NV_FRAGMENT_SHADER_BARYCENTRIC_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_NV_fragment_shader_barycentric extension has been promoted to VK_KHR_fragment_shader_barycentric." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto NVFragmentShaderBarycentricSpecVersion = VK_NV_FRAGMENT_SHADER_BARYCENTRIC_SPEC_VERSION;
 
   //=== VK_NV_shader_image_footprint ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShaderImageFootprintExtensionName = VK_NV_SHADER_IMAGE_FOOTPRINT_EXTENSION_NAME;
@@ -8505,12 +7781,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDeviceDiagnosticCheckpointsSpecVersion   = VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_SPEC_VERSION;
 
   //=== VK_KHR_timeline_semaphore ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_timeline_semaphore extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRTimelineSemaphoreExtensionName = VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRTimelineSemaphoreSpecVersion   = VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION;
-
-  //=== VK_EXT_present_timing ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingExtensionName = VK_EXT_PRESENT_TIMING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingSpecVersion   = VK_EXT_PRESENT_TIMING_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_timeline_semaphore extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRTimelineSemaphoreSpecVersion = VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION;
 
   //=== VK_INTEL_shader_integer_functions2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto INTELShaderIntegerFunctions2ExtensionName = VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_EXTENSION_NAME;
@@ -8521,8 +7795,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto INTELPerformanceQuerySpecVersion   = VK_INTEL_PERFORMANCE_QUERY_SPEC_VERSION;
 
   //=== VK_KHR_vulkan_memory_model ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_vulkan_memory_model extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVulkanMemoryModelExtensionName = VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVulkanMemoryModelSpecVersion   = VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_vulkan_memory_model extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVulkanMemoryModelSpecVersion = VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION;
 
   //=== VK_EXT_pci_bus_info ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPciBusInfoExtensionName = VK_EXT_PCI_BUS_INFO_EXTENSION_NAME;
@@ -8539,8 +7815,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
   //=== VK_KHR_shader_terminate_invocation ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_terminate_invocation extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderTerminateInvocationExtensionName = VK_KHR_SHADER_TERMINATE_INVOCATION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderTerminateInvocationSpecVersion   = VK_KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_terminate_invocation extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderTerminateInvocationSpecVersion = VK_KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_surface ===
@@ -8553,8 +7831,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTFragmentDensityMapSpecVersion   = VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION;
 
   //=== VK_EXT_scalar_block_layout ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_scalar_block_layout extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTScalarBlockLayoutExtensionName = VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTScalarBlockLayoutSpecVersion   = VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_scalar_block_layout extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTScalarBlockLayoutSpecVersion = VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION;
 
   //=== VK_GOOGLE_hlsl_functionality1 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto GOOGLEHlslFunctionality1ExtensionName = VK_GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME;
@@ -8565,8 +7845,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto GOOGLEDecorateStringSpecVersion   = VK_GOOGLE_DECORATE_STRING_SPEC_VERSION;
 
   //=== VK_EXT_subgroup_size_control ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_subgroup_size_control extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSubgroupSizeControlExtensionName = VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSubgroupSizeControlSpecVersion   = VK_EXT_SUBGROUP_SIZE_CONTROL_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_subgroup_size_control extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSubgroupSizeControlSpecVersion = VK_EXT_SUBGROUP_SIZE_CONTROL_SPEC_VERSION;
 
   //=== VK_KHR_fragment_shading_rate ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRFragmentShadingRateExtensionName = VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME;
@@ -8593,8 +7875,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderQuadControlSpecVersion   = VK_KHR_SHADER_QUAD_CONTROL_SPEC_VERSION;
 
   //=== VK_KHR_spirv_1_4 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_spirv_1_4 extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSpirv14ExtensionName = VK_KHR_SPIRV_1_4_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSpirv14SpecVersion   = VK_KHR_SPIRV_1_4_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_spirv_1_4 extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSpirv14SpecVersion = VK_KHR_SPIRV_1_4_SPEC_VERSION;
 
   //=== VK_EXT_memory_budget ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTMemoryBudgetExtensionName = VK_EXT_MEMORY_BUDGET_EXTENSION_NAME;
@@ -8613,8 +7897,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDedicatedAllocationImageAliasingSpecVersion   = VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_SPEC_VERSION;
 
   //=== VK_KHR_separate_depth_stencil_layouts ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_separate_depth_stencil_layouts extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSeparateDepthStencilLayoutsExtensionName = VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSeparateDepthStencilLayoutsSpecVersion   = VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_separate_depth_stencil_layouts extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSeparateDepthStencilLayoutsSpecVersion = VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_SPEC_VERSION;
 
   //=== VK_EXT_buffer_device_address ===
   VULKAN_HPP_DEPRECATED( "The VK_EXT_buffer_device_address extension has been deprecated by VK_KHR_buffer_device_address." )
@@ -8623,12 +7909,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTBufferDeviceAddressSpecVersion = VK_EXT_BUFFER_DEVICE_ADDRESS_SPEC_VERSION;
 
   //=== VK_EXT_tooling_info ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_tooling_info extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTToolingInfoExtensionName = VK_EXT_TOOLING_INFO_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTToolingInfoSpecVersion   = VK_EXT_TOOLING_INFO_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_tooling_info extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTToolingInfoSpecVersion = VK_EXT_TOOLING_INFO_SPEC_VERSION;
 
   //=== VK_EXT_separate_stencil_usage ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_separate_stencil_usage extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSeparateStencilUsageExtensionName = VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSeparateStencilUsageSpecVersion   = VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_separate_stencil_usage extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTSeparateStencilUsageSpecVersion = VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION;
 
   //=== VK_EXT_validation_features ===
   VULKAN_HPP_DEPRECATED( "The VK_EXT_validation_features extension has been deprecated by VK_EXT_layer_settings." )
@@ -8657,8 +7947,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTYcbcrImageArraysSpecVersion   = VK_EXT_YCBCR_IMAGE_ARRAYS_SPEC_VERSION;
 
   //=== VK_KHR_uniform_buffer_standard_layout ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_uniform_buffer_standard_layout extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRUniformBufferStandardLayoutExtensionName = VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRUniformBufferStandardLayoutSpecVersion   = VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_uniform_buffer_standard_layout extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRUniformBufferStandardLayoutSpecVersion = VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_SPEC_VERSION;
 
   //=== VK_EXT_provoking_vertex ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTProvokingVertexExtensionName = VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME;
@@ -8675,28 +7967,38 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTHeadlessSurfaceSpecVersion   = VK_EXT_HEADLESS_SURFACE_SPEC_VERSION;
 
   //=== VK_KHR_buffer_device_address ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_buffer_device_address extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRBufferDeviceAddressExtensionName = VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRBufferDeviceAddressSpecVersion   = VK_KHR_BUFFER_DEVICE_ADDRESS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_buffer_device_address extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRBufferDeviceAddressSpecVersion = VK_KHR_BUFFER_DEVICE_ADDRESS_SPEC_VERSION;
 
   //=== VK_EXT_line_rasterization ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_line_rasterization extension has been promoted to VK_KHR_line_rasterization." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTLineRasterizationExtensionName = VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLineRasterizationSpecVersion   = VK_EXT_LINE_RASTERIZATION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_line_rasterization extension has been promoted to VK_KHR_line_rasterization." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLineRasterizationSpecVersion = VK_EXT_LINE_RASTERIZATION_SPEC_VERSION;
 
   //=== VK_EXT_shader_atomic_float ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderAtomicFloatExtensionName = VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderAtomicFloatSpecVersion   = VK_EXT_SHADER_ATOMIC_FLOAT_SPEC_VERSION;
 
   //=== VK_EXT_host_query_reset ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_host_query_reset extension has been promoted to core in version 1.2." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTHostQueryResetExtensionName = VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTHostQueryResetSpecVersion   = VK_EXT_HOST_QUERY_RESET_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_host_query_reset extension has been promoted to core in version 1.2." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTHostQueryResetSpecVersion = VK_EXT_HOST_QUERY_RESET_SPEC_VERSION;
 
   //=== VK_EXT_index_type_uint8 ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_index_type_uint8 extension has been promoted to VK_KHR_index_type_uint8." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTIndexTypeUint8ExtensionName = VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTIndexTypeUint8SpecVersion   = VK_EXT_INDEX_TYPE_UINT8_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_index_type_uint8 extension has been promoted to VK_KHR_index_type_uint8." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTIndexTypeUint8SpecVersion = VK_EXT_INDEX_TYPE_UINT8_SPEC_VERSION;
 
   //=== VK_EXT_extended_dynamic_state ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_extended_dynamic_state extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicStateExtensionName = VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicStateSpecVersion   = VK_EXT_EXTENDED_DYNAMIC_STATE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_extended_dynamic_state extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicStateSpecVersion = VK_EXT_EXTENDED_DYNAMIC_STATE_SPEC_VERSION;
 
   //=== VK_KHR_deferred_host_operations ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRDeferredHostOperationsExtensionName = VK_KHR_DEFERRED_HOST_OPERATIONS_EXTENSION_NAME;
@@ -8731,8 +8033,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTSwapchainMaintenance1SpecVersion   = VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION;
 
   //=== VK_EXT_shader_demote_to_helper_invocation ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_shader_demote_to_helper_invocation extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderDemoteToHelperInvocationExtensionName = VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderDemoteToHelperInvocationSpecVersion   = VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_shader_demote_to_helper_invocation extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderDemoteToHelperInvocationSpecVersion = VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_SPEC_VERSION;
 
   //=== VK_NV_device_generated_commands ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDeviceGeneratedCommandsExtensionName = VK_NV_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME;
@@ -8743,12 +8047,16 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVInheritedViewportScissorSpecVersion   = VK_NV_INHERITED_VIEWPORT_SCISSOR_SPEC_VERSION;
 
   //=== VK_KHR_shader_integer_dot_product ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_integer_dot_product extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderIntegerDotProductExtensionName = VK_KHR_SHADER_INTEGER_DOT_PRODUCT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderIntegerDotProductSpecVersion   = VK_KHR_SHADER_INTEGER_DOT_PRODUCT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_integer_dot_product extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderIntegerDotProductSpecVersion = VK_KHR_SHADER_INTEGER_DOT_PRODUCT_SPEC_VERSION;
 
   //=== VK_EXT_texel_buffer_alignment ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_texel_buffer_alignment extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTTexelBufferAlignmentExtensionName = VK_EXT_TEXEL_BUFFER_ALIGNMENT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTTexelBufferAlignmentSpecVersion   = VK_EXT_TEXEL_BUFFER_ALIGNMENT_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_texel_buffer_alignment extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTTexelBufferAlignmentSpecVersion = VK_EXT_TEXEL_BUFFER_ALIGNMENT_SPEC_VERSION;
 
   //=== VK_QCOM_render_pass_transform ===
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMRenderPassTransformExtensionName = VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME;
@@ -8787,20 +8095,26 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVPresentBarrierSpecVersion   = VK_NV_PRESENT_BARRIER_SPEC_VERSION;
 
   //=== VK_KHR_shader_non_semantic_info ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_non_semantic_info extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderNonSemanticInfoExtensionName = VK_KHR_SHADER_NON_SEMANTIC_INFO_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderNonSemanticInfoSpecVersion   = VK_KHR_SHADER_NON_SEMANTIC_INFO_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_shader_non_semantic_info extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderNonSemanticInfoSpecVersion = VK_KHR_SHADER_NON_SEMANTIC_INFO_SPEC_VERSION;
 
   //=== VK_KHR_present_id ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentIdExtensionName = VK_KHR_PRESENT_ID_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentIdSpecVersion   = VK_KHR_PRESENT_ID_SPEC_VERSION;
 
   //=== VK_EXT_private_data ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_private_data extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPrivateDataExtensionName = VK_EXT_PRIVATE_DATA_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPrivateDataSpecVersion   = VK_EXT_PRIVATE_DATA_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_private_data extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPrivateDataSpecVersion = VK_EXT_PRIVATE_DATA_SPEC_VERSION;
 
   //=== VK_EXT_pipeline_creation_cache_control ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_pipeline_creation_cache_control extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationCacheControlExtensionName = VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationCacheControlSpecVersion   = VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_pipeline_creation_cache_control extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPipelineCreationCacheControlSpecVersion = VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_SPEC_VERSION;
 
   //=== VK_KHR_video_encode_queue ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeQueueExtensionName = VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME;
@@ -8820,10 +8134,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVCudaKernelLaunchSpecVersion   = VK_NV_CUDA_KERNEL_LAUNCH_SPEC_VERSION;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTileShadingExtensionName = VK_QCOM_TILE_SHADING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTileShadingSpecVersion   = VK_QCOM_TILE_SHADING_SPEC_VERSION;
-
   //=== VK_NV_low_latency ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVLowLatencyExtensionName = VK_NV_LOW_LATENCY_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVLowLatencySpecVersion   = VK_NV_LOW_LATENCY_SPEC_VERSION;
@@ -8835,8 +8145,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
   //=== VK_KHR_synchronization2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_synchronization2 extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRSynchronization2ExtensionName = VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSynchronization2SpecVersion   = VK_KHR_SYNCHRONIZATION_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_synchronization2 extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSynchronization2SpecVersion = VK_KHR_SYNCHRONIZATION_2_SPEC_VERSION;
 
   //=== VK_EXT_descriptor_buffer ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDescriptorBufferExtensionName = VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME;
@@ -8859,8 +8171,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderSubgroupUniformControlFlowSpecVersion   = VK_KHR_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_SPEC_VERSION;
 
   //=== VK_KHR_zero_initialize_workgroup_memory ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_zero_initialize_workgroup_memory extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRZeroInitializeWorkgroupMemoryExtensionName = VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRZeroInitializeWorkgroupMemorySpecVersion   = VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_zero_initialize_workgroup_memory extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRZeroInitializeWorkgroupMemorySpecVersion = VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION;
 
   //=== VK_NV_fragment_shading_rate_enums ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVFragmentShadingRateEnumsExtensionName = VK_NV_FRAGMENT_SHADING_RATE_ENUMS_EXTENSION_NAME;
@@ -8875,8 +8189,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTMeshShaderSpecVersion   = VK_EXT_MESH_SHADER_SPEC_VERSION;
 
   //=== VK_EXT_ycbcr_2plane_444_formats ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_ycbcr_2plane_444_formats extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTYcbcr2Plane444FormatsExtensionName = VK_EXT_YCBCR_2PLANE_444_FORMATS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTYcbcr2Plane444FormatsSpecVersion   = VK_EXT_YCBCR_2PLANE_444_FORMATS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_ycbcr_2plane_444_formats extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTYcbcr2Plane444FormatsSpecVersion = VK_EXT_YCBCR_2PLANE_444_FORMATS_SPEC_VERSION;
 
   //=== VK_EXT_fragment_density_map2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTFragmentDensityMap2ExtensionName = VK_EXT_FRAGMENT_DENSITY_MAP_2_EXTENSION_NAME;
@@ -8887,16 +8203,20 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMRotatedCopyCommandsSpecVersion   = VK_QCOM_ROTATED_COPY_COMMANDS_SPEC_VERSION;
 
   //=== VK_EXT_image_robustness ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_image_robustness extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageRobustnessExtensionName = VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageRobustnessSpecVersion   = VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_image_robustness extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageRobustnessSpecVersion = VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION;
 
   //=== VK_KHR_workgroup_memory_explicit_layout ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRWorkgroupMemoryExplicitLayoutExtensionName = VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRWorkgroupMemoryExplicitLayoutSpecVersion   = VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_SPEC_VERSION;
 
   //=== VK_KHR_copy_commands2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_copy_commands2 extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRCopyCommands2ExtensionName = VK_KHR_COPY_COMMANDS_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCopyCommands2SpecVersion   = VK_KHR_COPY_COMMANDS_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_copy_commands2 extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCopyCommands2SpecVersion = VK_KHR_COPY_COMMANDS_2_SPEC_VERSION;
 
   //=== VK_EXT_image_compression_control ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageCompressionControlExtensionName = VK_EXT_IMAGE_COMPRESSION_CONTROL_EXTENSION_NAME;
@@ -8907,16 +8227,20 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTAttachmentFeedbackLoopLayoutSpecVersion   = VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_SPEC_VERSION;
 
   //=== VK_EXT_4444_formats ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_4444_formats extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXT4444FormatsExtensionName = VK_EXT_4444_FORMATS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXT4444FormatsSpecVersion   = VK_EXT_4444_FORMATS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_4444_formats extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXT4444FormatsSpecVersion = VK_EXT_4444_FORMATS_SPEC_VERSION;
 
   //=== VK_EXT_device_fault ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDeviceFaultExtensionName = VK_EXT_DEVICE_FAULT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTDeviceFaultSpecVersion   = VK_EXT_DEVICE_FAULT_SPEC_VERSION;
 
   //=== VK_ARM_rasterization_order_attachment_access ===
+  VULKAN_HPP_DEPRECATED( "The VK_ARM_rasterization_order_attachment_access extension has been promoted to VK_EXT_rasterization_order_attachment_access." )
   VULKAN_HPP_CONSTEXPR_INLINE auto ARMRasterizationOrderAttachmentAccessExtensionName = VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMRasterizationOrderAttachmentAccessSpecVersion   = VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_ARM_rasterization_order_attachment_access extension has been promoted to VK_EXT_rasterization_order_attachment_access." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto ARMRasterizationOrderAttachmentAccessSpecVersion = VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_SPEC_VERSION;
 
   //=== VK_EXT_rgba10x6_formats ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTRgba10X6FormatsExtensionName = VK_EXT_RGBA10X6_FORMATS_EXTENSION_NAME;
@@ -8935,8 +8259,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
   //=== VK_VALVE_mutable_descriptor_type ===
+  VULKAN_HPP_DEPRECATED( "The VK_VALVE_mutable_descriptor_type extension has been promoted to VK_EXT_mutable_descriptor_type." )
   VULKAN_HPP_CONSTEXPR_INLINE auto VALVEMutableDescriptorTypeExtensionName = VK_VALVE_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEMutableDescriptorTypeSpecVersion   = VK_VALVE_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_VALVE_mutable_descriptor_type extension has been promoted to VK_EXT_mutable_descriptor_type." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEMutableDescriptorTypeSpecVersion = VK_VALVE_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION;
 
   //=== VK_EXT_vertex_input_dynamic_state ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexInputDynamicStateExtensionName = VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME;
@@ -8959,12 +8285,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPrimitiveTopologyListRestartSpecVersion   = VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_SPEC_VERSION;
 
   //=== VK_KHR_format_feature_flags2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_format_feature_flags2 extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRFormatFeatureFlags2ExtensionName = VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRFormatFeatureFlags2SpecVersion   = VK_KHR_FORMAT_FEATURE_FLAGS_2_SPEC_VERSION;
-
-  //=== VK_EXT_present_mode_fifo_latest_ready ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentModeFifoLatestReadyExtensionName = VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentModeFifoLatestReadySpecVersion   = VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_format_feature_flags2 extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRFormatFeatureFlags2SpecVersion = VK_KHR_FORMAT_FEATURE_FLAGS_2_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_external_memory ===
@@ -9009,8 +8333,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTMultisampledRenderToSingleSampledSpecVersion   = VK_EXT_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_SPEC_VERSION;
 
   //=== VK_EXT_extended_dynamic_state2 ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_extended_dynamic_state2 extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicState2ExtensionName = VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicState2SpecVersion   = VK_EXT_EXTENDED_DYNAMIC_STATE_2_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_extended_dynamic_state2 extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExtendedDynamicState2SpecVersion = VK_EXT_EXTENDED_DYNAMIC_STATE_2_SPEC_VERSION;
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_screen_surface ===
@@ -9030,17 +8356,11 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRRayTracingMaintenance1ExtensionName = VK_KHR_RAY_TRACING_MAINTENANCE_1_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRRayTracingMaintenance1SpecVersion   = VK_KHR_RAY_TRACING_MAINTENANCE_1_SPEC_VERSION;
 
-  //=== VK_KHR_shader_untyped_pointers ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderUntypedPointersExtensionName = VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderUntypedPointersSpecVersion   = VK_KHR_SHADER_UNTYPED_POINTERS_SPEC_VERSION;
-
   //=== VK_EXT_global_priority_query ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_global_priority_query extension has been promoted to VK_KHR_global_priority." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPriorityQueryExtensionName = VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPriorityQuerySpecVersion   = VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION;
-
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEVideoEncodeRgbConversionExtensionName = VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEVideoEncodeRgbConversionSpecVersion   = VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_global_priority_query extension has been promoted to VK_KHR_global_priority." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTGlobalPriorityQuerySpecVersion = VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION;
 
   //=== VK_EXT_image_view_min_lod ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTImageViewMinLodExtensionName = VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME;
@@ -9068,15 +8388,15 @@ namespace VULKAN_HPP_NAMESPACE
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_NV_displacement_micromap ===
-  VULKAN_HPP_DEPRECATED( "The VK_NV_displacement_micromap extension has been deprecated by VK_NV_cluster_acceleration_structure." )
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDisplacementMicromapExtensionName = VK_NV_DISPLACEMENT_MICROMAP_EXTENSION_NAME;
-  VULKAN_HPP_DEPRECATED( "The VK_NV_displacement_micromap extension has been deprecated by VK_NV_cluster_acceleration_structure." )
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVDisplacementMicromapSpecVersion = VK_NV_DISPLACEMENT_MICROMAP_SPEC_VERSION;
+  VULKAN_HPP_CONSTEXPR_INLINE auto NVDisplacementMicromapSpecVersion   = VK_NV_DISPLACEMENT_MICROMAP_SPEC_VERSION;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_EXT_load_store_op_none ===
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_load_store_op_none extension has been promoted to VK_KHR_load_store_op_none." )
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTLoadStoreOpNoneExtensionName = VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLoadStoreOpNoneSpecVersion   = VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_EXT_load_store_op_none extension has been promoted to VK_KHR_load_store_op_none." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLoadStoreOpNoneSpecVersion = VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION;
 
   //=== VK_HUAWEI_cluster_culling_shader ===
   VULKAN_HPP_CONSTEXPR_INLINE auto HUAWEIClusterCullingShaderExtensionName = VK_HUAWEI_CLUSTER_CULLING_SHADER_EXTENSION_NAME;
@@ -9091,8 +8411,10 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPageableDeviceLocalMemorySpecVersion   = VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_SPEC_VERSION;
 
   //=== VK_KHR_maintenance4 ===
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance4 extension has been promoted to core in version 1.3." )
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance4ExtensionName = VK_KHR_MAINTENANCE_4_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance4SpecVersion   = VK_KHR_MAINTENANCE_4_SPEC_VERSION;
+  VULKAN_HPP_DEPRECATED( "The VK_KHR_maintenance4 extension has been promoted to core in version 1.3." )
+  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance4SpecVersion = VK_KHR_MAINTENANCE_4_SPEC_VERSION;
 
   //=== VK_ARM_shader_core_properties ===
   VULKAN_HPP_CONSTEXPR_INLINE auto ARMShaderCorePropertiesExtensionName = VK_ARM_SHADER_CORE_PROPERTIES_EXTENSION_NAME;
@@ -9142,10 +8464,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDeviceGeneratedCommandsComputeExtensionName = VK_NV_DEVICE_GENERATED_COMMANDS_COMPUTE_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDeviceGeneratedCommandsComputeSpecVersion   = VK_NV_DEVICE_GENERATED_COMMANDS_COMPUTE_SPEC_VERSION;
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingLinearSweptSpheresExtensionName = VK_NV_RAY_TRACING_LINEAR_SWEPT_SPHERES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingLinearSweptSpheresSpecVersion   = VK_NV_RAY_TRACING_LINEAR_SWEPT_SPHERES_SPEC_VERSION;
-
   //=== VK_NV_linear_color_attachment ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVLinearColorAttachmentExtensionName = VK_NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVLinearColorAttachmentSpecVersion   = VK_NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION;
@@ -9170,12 +8488,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTNestedCommandBufferExtensionName = VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTNestedCommandBufferSpecVersion   = VK_EXT_NESTED_COMMAND_BUFFER_SPEC_VERSION;
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSExternalMemoryExtensionName = VK_OHOS_EXTERNAL_MEMORY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSExternalMemorySpecVersion   = VK_OHOS_EXTERNAL_MEMORY_SPEC_VERSION;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_external_memory_acquire_unmodified ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTExternalMemoryAcquireUnmodifiedExtensionName = VK_EXT_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTExternalMemoryAcquireUnmodifiedSpecVersion   = VK_EXT_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_SPEC_VERSION;
@@ -9192,10 +8504,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto LUNARGDirectDriverLoadingExtensionName = VK_LUNARG_DIRECT_DRIVER_LOADING_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto LUNARGDirectDriverLoadingSpecVersion   = VK_LUNARG_DIRECT_DRIVER_LOADING_SPEC_VERSION;
 
-  //=== VK_ARM_tensors ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMTensorsExtensionName = VK_ARM_TENSORS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMTensorsSpecVersion   = VK_ARM_TENSORS_SPEC_VERSION;
-
   //=== VK_EXT_shader_module_identifier ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderModuleIdentifierExtensionName = VK_EXT_SHADER_MODULE_IDENTIFIER_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderModuleIdentifierSpecVersion   = VK_EXT_SHADER_MODULE_IDENTIFIER_SPEC_VERSION;
@@ -9226,24 +8534,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance5ExtensionName = VK_KHR_MAINTENANCE_5_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance5SpecVersion   = VK_KHR_MAINTENANCE_5_SPEC_VERSION;
 
-  //=== VK_AMD_anti_lag ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto AMDAntiLagExtensionName = VK_AMD_ANTI_LAG_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto AMDAntiLagSpecVersion   = VK_AMD_ANTI_LAG_SPEC_VERSION;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto AMDXDenseGeometryFormatExtensionName = VK_AMDX_DENSE_GEOMETRY_FORMAT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto AMDXDenseGeometryFormatSpecVersion   = VK_AMDX_DENSE_GEOMETRY_FORMAT_SPEC_VERSION;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentId2ExtensionName = VK_KHR_PRESENT_ID_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentId2SpecVersion   = VK_KHR_PRESENT_ID_2_SPEC_VERSION;
-
-  //=== VK_KHR_present_wait2 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentWait2ExtensionName = VK_KHR_PRESENT_WAIT_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentWait2SpecVersion   = VK_KHR_PRESENT_WAIT_2_SPEC_VERSION;
-
   //=== VK_KHR_ray_tracing_position_fetch ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRRayTracingPositionFetchExtensionName = VK_KHR_RAY_TRACING_POSITION_FETCH_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRRayTracingPositionFetchSpecVersion   = VK_KHR_RAY_TRACING_POSITION_FETCH_SPEC_VERSION;
@@ -9252,10 +8542,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderObjectExtensionName = VK_EXT_SHADER_OBJECT_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderObjectSpecVersion   = VK_EXT_SHADER_OBJECT_SPEC_VERSION;
 
-  //=== VK_KHR_pipeline_binary ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPipelineBinaryExtensionName = VK_KHR_PIPELINE_BINARY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPipelineBinarySpecVersion   = VK_KHR_PIPELINE_BINARY_SPEC_VERSION;
-
   //=== VK_QCOM_tile_properties ===
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTilePropertiesExtensionName = VK_QCOM_TILE_PROPERTIES_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTilePropertiesSpecVersion   = VK_QCOM_TILE_PROPERTIES_SPEC_VERSION;
@@ -9264,14 +8550,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto SECAmigoProfilingExtensionName = VK_SEC_AMIGO_PROFILING_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto SECAmigoProfilingSpecVersion   = VK_SEC_AMIGO_PROFILING_SPEC_VERSION;
 
-  //=== VK_KHR_surface_maintenance1 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSurfaceMaintenance1ExtensionName = VK_KHR_SURFACE_MAINTENANCE_1_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSurfaceMaintenance1SpecVersion   = VK_KHR_SURFACE_MAINTENANCE_1_SPEC_VERSION;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSwapchainMaintenance1ExtensionName = VK_KHR_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRSwapchainMaintenance1SpecVersion   = VK_KHR_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION;
-
   //=== VK_QCOM_multiview_per_view_viewports ===
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMMultiviewPerViewViewportsExtensionName = VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMMultiviewPerViewViewportsSpecVersion   = VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_SPEC_VERSION;
@@ -9280,10 +8558,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingInvocationReorderExtensionName = VK_NV_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingInvocationReorderSpecVersion   = VK_NV_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION;
 
-  //=== VK_NV_cooperative_vector ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCooperativeVectorExtensionName = VK_NV_COOPERATIVE_VECTOR_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCooperativeVectorSpecVersion   = VK_NV_COOPERATIVE_VECTOR_SPEC_VERSION;
-
   //=== VK_NV_extended_sparse_address_space ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVExtendedSparseAddressSpaceExtensionName = VK_NV_EXTENDED_SPARSE_ADDRESS_SPACE_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVExtendedSparseAddressSpaceSpecVersion   = VK_NV_EXTENDED_SPARSE_ADDRESS_SPACE_SPEC_VERSION;
@@ -9292,10 +8566,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTMutableDescriptorTypeExtensionName = VK_EXT_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTMutableDescriptorTypeSpecVersion   = VK_EXT_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION;
 
-  //=== VK_EXT_legacy_vertex_attributes ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLegacyVertexAttributesExtensionName = VK_EXT_LEGACY_VERTEX_ATTRIBUTES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTLegacyVertexAttributesSpecVersion   = VK_EXT_LEGACY_VERTEX_ATTRIBUTES_SPEC_VERSION;
-
   //=== VK_EXT_layer_settings ===
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTLayerSettingsExtensionName = VK_EXT_LAYER_SETTINGS_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTLayerSettingsSpecVersion   = VK_EXT_LAYER_SETTINGS_SPEC_VERSION;
@@ -9320,30 +8590,14 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRCooperativeMatrixExtensionName = VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRCooperativeMatrixSpecVersion   = VK_KHR_COOPERATIVE_MATRIX_SPEC_VERSION;
 
-  //=== VK_ARM_data_graph ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMDataGraphExtensionName = VK_ARM_DATA_GRAPH_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMDataGraphSpecVersion   = VK_ARM_DATA_GRAPH_SPEC_VERSION;
-
   //=== VK_QCOM_multiview_per_view_render_areas ===
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMMultiviewPerViewRenderAreasExtensionName = VK_QCOM_MULTIVIEW_PER_VIEW_RENDER_AREAS_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto QCOMMultiviewPerViewRenderAreasSpecVersion   = VK_QCOM_MULTIVIEW_PER_VIEW_RENDER_AREAS_SPEC_VERSION;
 
-  //=== VK_KHR_compute_shader_derivatives ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRComputeShaderDerivativesExtensionName = VK_KHR_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRComputeShaderDerivativesSpecVersion   = VK_KHR_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION;
-
   //=== VK_KHR_video_decode_av1 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoDecodeAv1ExtensionName = VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoDecodeAv1SpecVersion   = VK_KHR_VIDEO_DECODE_AV1_SPEC_VERSION;
 
-  //=== VK_KHR_video_encode_av1 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeAv1ExtensionName = VK_KHR_VIDEO_ENCODE_AV1_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeAv1SpecVersion   = VK_KHR_VIDEO_ENCODE_AV1_SPEC_VERSION;
-
-  //=== VK_KHR_video_decode_vp9 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoDecodeVp9ExtensionName = VK_KHR_VIDEO_DECODE_VP9_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoDecodeVp9SpecVersion   = VK_KHR_VIDEO_DECODE_VP9_SPEC_VERSION;
-
   //=== VK_KHR_video_maintenance1 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoMaintenance1ExtensionName = VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoMaintenance1SpecVersion   = VK_KHR_VIDEO_MAINTENANCE_1_SPEC_VERSION;
@@ -9380,10 +8634,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRLoadStoreOpNoneExtensionName = VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRLoadStoreOpNoneSpecVersion   = VK_KHR_LOAD_STORE_OP_NONE_SPEC_VERSION;
 
-  //=== VK_KHR_unified_image_layouts ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRUnifiedImageLayoutsExtensionName = VK_KHR_UNIFIED_IMAGE_LAYOUTS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRUnifiedImageLayoutsSpecVersion   = VK_KHR_UNIFIED_IMAGE_LAYOUTS_SPEC_VERSION;
-
   //=== VK_KHR_shader_float_controls2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloatControls2ExtensionName = VK_KHR_SHADER_FLOAT_CONTROLS_2_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFloatControls2SpecVersion   = VK_KHR_SHADER_FLOAT_CONTROLS_2_SPEC_VERSION;
@@ -9422,208 +8672,25 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDescriptorPoolOverallocationExtensionName = VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVDescriptorPoolOverallocationSpecVersion   = VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_SPEC_VERSION;
 
-  //=== VK_QCOM_tile_memory_heap ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTileMemoryHeapExtensionName = VK_QCOM_TILE_MEMORY_HEAP_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMTileMemoryHeapSpecVersion   = VK_QCOM_TILE_MEMORY_HEAP_SPEC_VERSION;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCopyMemoryIndirectExtensionName = VK_KHR_COPY_MEMORY_INDIRECT_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRCopyMemoryIndirectSpecVersion   = VK_KHR_COPY_MEMORY_INDIRECT_SPEC_VERSION;
-
-  //=== VK_EXT_memory_decompression ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTMemoryDecompressionExtensionName = VK_EXT_MEMORY_DECOMPRESSION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTMemoryDecompressionSpecVersion   = VK_EXT_MEMORY_DECOMPRESSION_SPEC_VERSION;
-
-  //=== VK_NV_display_stereo ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVDisplayStereoExtensionName = VK_NV_DISPLAY_STEREO_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVDisplayStereoSpecVersion   = VK_NV_DISPLAY_STEREO_SPEC_VERSION;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeIntraRefreshExtensionName = VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeIntraRefreshSpecVersion   = VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_SPEC_VERSION;
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeQuantizationMapExtensionName = VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoEncodeQuantizationMapSpecVersion   = VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_SPEC_VERSION;
-
   //=== VK_NV_raw_access_chains ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRawAccessChainsExtensionName = VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRawAccessChainsSpecVersion   = VK_NV_RAW_ACCESS_CHAINS_SPEC_VERSION;
 
-  //=== VK_NV_external_compute_queue ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVExternalComputeQueueExtensionName = VK_NV_EXTERNAL_COMPUTE_QUEUE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVExternalComputeQueueSpecVersion   = VK_NV_EXTERNAL_COMPUTE_QUEUE_SPEC_VERSION;
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderRelaxedExtendedInstructionExtensionName = VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderRelaxedExtendedInstructionSpecVersion   = VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_SPEC_VERSION;
-
-  //=== VK_NV_command_buffer_inheritance ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCommandBufferInheritanceExtensionName = VK_NV_COMMAND_BUFFER_INHERITANCE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCommandBufferInheritanceSpecVersion   = VK_NV_COMMAND_BUFFER_INHERITANCE_SPEC_VERSION;
-
-  //=== VK_KHR_maintenance7 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance7ExtensionName = VK_KHR_MAINTENANCE_7_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance7SpecVersion   = VK_KHR_MAINTENANCE_7_SPEC_VERSION;
-
   //=== VK_NV_shader_atomic_float16_vector ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShaderAtomicFloat16VectorExtensionName = VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVShaderAtomicFloat16VectorSpecVersion   = VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION;
 
-  //=== VK_EXT_shader_replicated_composites ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderReplicatedCompositesExtensionName = VK_EXT_SHADER_REPLICATED_COMPOSITES_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderReplicatedCompositesSpecVersion   = VK_EXT_SHADER_REPLICATED_COMPOSITES_SPEC_VERSION;
-
-  //=== VK_EXT_shader_float8 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderFloat8ExtensionName = VK_EXT_SHADER_FLOAT8_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderFloat8SpecVersion   = VK_EXT_SHADER_FLOAT8_SPEC_VERSION;
-
   //=== VK_NV_ray_tracing_validation ===
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingValidationExtensionName = VK_NV_RAY_TRACING_VALIDATION_EXTENSION_NAME;
   VULKAN_HPP_CONSTEXPR_INLINE auto NVRayTracingValidationSpecVersion   = VK_NV_RAY_TRACING_VALIDATION_SPEC_VERSION;
 
-  //=== VK_NV_cluster_acceleration_structure ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVClusterAccelerationStructureExtensionName = VK_NV_CLUSTER_ACCELERATION_STRUCTURE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVClusterAccelerationStructureSpecVersion   = VK_NV_CLUSTER_ACCELERATION_STRUCTURE_SPEC_VERSION;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVPartitionedAccelerationStructureExtensionName = VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVPartitionedAccelerationStructureSpecVersion   = VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_SPEC_VERSION;
-
-  //=== VK_EXT_device_generated_commands ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDeviceGeneratedCommandsExtensionName = VK_EXT_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDeviceGeneratedCommandsSpecVersion   = VK_EXT_DEVICE_GENERATED_COMMANDS_SPEC_VERSION;
-
-  //=== VK_KHR_maintenance8 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance8ExtensionName = VK_KHR_MAINTENANCE_8_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance8SpecVersion   = VK_KHR_MAINTENANCE_8_SPEC_VERSION;
-
-  //=== VK_MESA_image_alignment_control ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto MESAImageAlignmentControlExtensionName = VK_MESA_IMAGE_ALIGNMENT_CONTROL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto MESAImageAlignmentControlSpecVersion   = VK_MESA_IMAGE_ALIGNMENT_CONTROL_SPEC_VERSION;
-
-  //=== VK_KHR_shader_fma ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFmaExtensionName = VK_KHR_SHADER_FMA_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRShaderFmaSpecVersion   = VK_KHR_SHADER_FMA_SPEC_VERSION;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTRayTracingInvocationReorderExtensionName = VK_EXT_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTRayTracingInvocationReorderSpecVersion   = VK_EXT_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION;
-
-  //=== VK_EXT_depth_clamp_control ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDepthClampControlExtensionName = VK_EXT_DEPTH_CLAMP_CONTROL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTDepthClampControlSpecVersion   = VK_EXT_DEPTH_CLAMP_CONTROL_SPEC_VERSION;
-
-  //=== VK_KHR_maintenance9 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance9ExtensionName = VK_KHR_MAINTENANCE_9_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance9SpecVersion   = VK_KHR_MAINTENANCE_9_SPEC_VERSION;
-
-  //=== VK_KHR_video_maintenance2 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoMaintenance2ExtensionName = VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRVideoMaintenance2SpecVersion   = VK_KHR_VIDEO_MAINTENANCE_2_SPEC_VERSION;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSSurfaceExtensionName = VK_OHOS_SURFACE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSSurfaceSpecVersion   = VK_OHOS_SURFACE_SPEC_VERSION;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSNativeBufferExtensionName = VK_OHOS_NATIVE_BUFFER_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto OHOSNativeBufferSpecVersion   = VK_OHOS_NATIVE_BUFFER_SPEC_VERSION;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto HUAWEIHdrVividExtensionName = VK_HUAWEI_HDR_VIVID_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto HUAWEIHdrVividSpecVersion   = VK_HUAWEI_HDR_VIVID_SPEC_VERSION;
-
-  //=== VK_NV_cooperative_matrix2 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCooperativeMatrix2ExtensionName = VK_NV_COOPERATIVE_MATRIX_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVCooperativeMatrix2SpecVersion   = VK_NV_COOPERATIVE_MATRIX_2_SPEC_VERSION;
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMPipelineOpacityMicromapExtensionName = VK_ARM_PIPELINE_OPACITY_MICROMAP_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMPipelineOpacityMicromapSpecVersion   = VK_ARM_PIPELINE_OPACITY_MICROMAP_SPEC_VERSION;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExternalMemoryMetalExtensionName = VK_EXT_EXTERNAL_MEMORY_METAL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTExternalMemoryMetalSpecVersion   = VK_EXT_EXTERNAL_MEMORY_METAL_SPEC_VERSION;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDepthClampZeroOneExtensionName = VK_KHR_DEPTH_CLAMP_ZERO_ONE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRDepthClampZeroOneSpecVersion   = VK_KHR_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION;
-
-  //=== VK_ARM_performance_counters_by_region ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMPerformanceCountersByRegionExtensionName = VK_ARM_PERFORMANCE_COUNTERS_BY_REGION_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMPerformanceCountersByRegionSpecVersion   = VK_ARM_PERFORMANCE_COUNTERS_BY_REGION_SPEC_VERSION;
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexAttributeRobustnessExtensionName = VK_EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTVertexAttributeRobustnessSpecVersion   = VK_EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_SPEC_VERSION;
-
-  //=== VK_ARM_format_pack ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMFormatPackExtensionName = VK_ARM_FORMAT_PACK_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto ARMFormatPackSpecVersion   = VK_ARM_FORMAT_PACK_SPEC_VERSION;
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEFragmentDensityMapLayeredExtensionName = VK_VALVE_FRAGMENT_DENSITY_MAP_LAYERED_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto VALVEFragmentDensityMapLayeredSpecVersion   = VK_VALVE_FRAGMENT_DENSITY_MAP_LAYERED_SPEC_VERSION;
-
-  //=== VK_KHR_robustness2 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRRobustness2ExtensionName = VK_KHR_ROBUSTNESS_2_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRRobustness2SpecVersion   = VK_KHR_ROBUSTNESS_2_SPEC_VERSION;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVPresentMeteringExtensionName = VK_NV_PRESENT_METERING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto NVPresentMeteringSpecVersion   = VK_NV_PRESENT_METERING_SPEC_VERSION;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTFragmentDensityMapOffsetExtensionName = VK_EXT_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTFragmentDensityMapOffsetSpecVersion   = VK_EXT_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION;
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTZeroInitializeDeviceMemoryExtensionName = VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTZeroInitializeDeviceMemorySpecVersion   = VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_SPEC_VERSION;
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentModeFifoLatestReadyExtensionName = VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRPresentModeFifoLatestReadySpecVersion   = VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION;
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShader64BitIndexingExtensionName = VK_EXT_SHADER_64BIT_INDEXING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShader64BitIndexingSpecVersion   = VK_EXT_SHADER_64BIT_INDEXING_SPEC_VERSION;
-
-  //=== VK_EXT_custom_resolve ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTCustomResolveExtensionName = VK_EXT_CUSTOM_RESOLVE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTCustomResolveSpecVersion   = VK_EXT_CUSTOM_RESOLVE_SPEC_VERSION;
-
-  //=== VK_QCOM_data_graph_model ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMDataGraphModelExtensionName = VK_QCOM_DATA_GRAPH_MODEL_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto QCOMDataGraphModelSpecVersion   = VK_QCOM_DATA_GRAPH_MODEL_SPEC_VERSION;
-
-  //=== VK_KHR_maintenance10 ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance10ExtensionName = VK_KHR_MAINTENANCE_10_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto KHRMaintenance10SpecVersion   = VK_KHR_MAINTENANCE_10_SPEC_VERSION;
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto SECPipelineCacheIncrementalModeExtensionName = VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto SECPipelineCacheIncrementalModeSpecVersion   = VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION;
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderUniformBufferUnsizedArrayExtensionName = VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTShaderUniformBufferUnsizedArraySpecVersion   = VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION;
-
 }  // namespace VULKAN_HPP_NAMESPACE
 
 // clang-format off
 #include <vulkan/vulkan_handles.hpp>
 #include <vulkan/vulkan_structs.hpp>
 #include <vulkan/vulkan_funcs.hpp>
+
 // clang-format on
 
 namespace VULKAN_HPP_NAMESPACE
@@ -9645,7 +8712,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<ShaderModuleCreateInfo, DataGraphPipelineCreateInfoARM>
+  struct StructExtends<PipelineLayoutCreateInfo, BindDescriptorSetsInfoKHR>
   {
     enum
     {
@@ -9654,7 +8721,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PipelineLayoutCreateInfo, BindDescriptorSetsInfo>
+  struct StructExtends<PipelineLayoutCreateInfo, PushConstantsInfoKHR>
   {
     enum
     {
@@ -9663,7 +8730,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PipelineLayoutCreateInfo, PushConstantsInfo>
+  struct StructExtends<PipelineLayoutCreateInfo, PushDescriptorSetInfoKHR>
   {
     enum
     {
@@ -9672,16 +8739,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PipelineLayoutCreateInfo, PushDescriptorSetInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineLayoutCreateInfo, PushDescriptorSetWithTemplateInfo>
+  struct StructExtends<PipelineLayoutCreateInfo, PushDescriptorSetWithTemplateInfoKHR>
   {
     enum
     {
@@ -9707,8 +8765,27 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_VERSION_1_1 ===
   template <>
-  struct StructExtends<PipelineLayoutCreateInfo, IndirectCommandsLayoutCreateInfoEXT>
+  struct StructExtends<PhysicalDeviceSubgroupProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevice16BitStorageFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevice16BitStorageFeatures, DeviceCreateInfo>
   {
     enum
     {
@@ -9716,7 +8793,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_VERSION_1_1 ===
   template <>
   struct StructExtends<MemoryDedicatedRequirements, MemoryRequirements2>
   {
@@ -9744,6 +8820,24 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<DeviceGroupRenderPassBeginInfo, RenderPassBeginInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<DeviceGroupRenderPassBeginInfo, RenderingInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<DeviceGroupCommandBufferBeginInfo, CommandBufferBeginInfo>
   {
@@ -9807,6 +8901,24 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDevicePointClippingProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderPassInputAttachmentAspectCreateInfo, RenderPassCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<ImageViewUsageCreateInfo, ImageViewCreateInfo>
   {
@@ -9816,6 +8928,69 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PipelineTessellationDomainOriginStateCreateInfo, PipelineTessellationStateCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderPassMultiviewCreateInfo, RenderPassCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMultiviewFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMultiviewFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMultiviewProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceVariablePointersFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceVariablePointersFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceProtectedMemoryFeatures, PhysicalDeviceFeatures2>
   {
@@ -9852,6 +9027,24 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<SamplerYcbcrConversionInfo, SamplerCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SamplerYcbcrConversionInfo, ImageViewCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<BindImagePlaneMemoryInfo, BindImageMemoryInfo>
   {
@@ -9870,6 +9063,33 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDeviceSamplerYcbcrConversionFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSamplerYcbcrConversionFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SamplerYcbcrConversionImageFormatProperties, ImageFormatProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceExternalImageFormatInfo, PhysicalDeviceImageFormatInfo2>
   {
@@ -9942,51 +9162,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<PhysicalDeviceSubgroupProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevice16BitStorageFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevice16BitStorageFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVariablePointersFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVariablePointersFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   template <>
   struct StructExtends<PhysicalDeviceMaintenance3Properties, PhysicalDeviceProperties2>
   {
@@ -9996,132 +9171,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<SamplerYcbcrConversionInfo, SamplerCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SamplerYcbcrConversionInfo, ImageViewCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSamplerYcbcrConversionFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSamplerYcbcrConversionFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SamplerYcbcrConversionImageFormatProperties, ImageFormatProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DeviceGroupRenderPassBeginInfo, RenderPassBeginInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DeviceGroupRenderPassBeginInfo, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePointClippingProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassInputAttachmentAspectCreateInfo, RenderPassCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineTessellationDomainOriginStateCreateInfo, PipelineTessellationStateCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassMultiviewCreateInfo, RenderPassCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMultiviewFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMultiviewFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMultiviewProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   template <>
   struct StructExtends<PhysicalDeviceShaderDrawParametersFeatures, PhysicalDeviceFeatures2>
   {
@@ -10222,6 +9271,24 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDevice8BitStorageFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevice8BitStorageFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceDriverProperties, PhysicalDeviceProperties2>
   {
@@ -10231,6 +9298,177 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDeviceShaderAtomicInt64Features, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderAtomicInt64Features, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderFloat16Int8Features, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderFloat16Int8Features, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceFloatControlsProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<DescriptorSetLayoutBindingFlagsCreateInfo, DescriptorSetLayoutCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDescriptorIndexingFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDescriptorIndexingFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDescriptorIndexingProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<DescriptorSetVariableDescriptorCountAllocateInfo, DescriptorSetAllocateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<DescriptorSetVariableDescriptorCountLayoutSupport, DescriptorSetLayoutSupport>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SubpassDescriptionDepthStencilResolve, SubpassDescription2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDepthStencilResolveProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceScalarBlockLayoutFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceScalarBlockLayoutFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<ImageStencilUsageCreateInfo, ImageCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<ImageStencilUsageCreateInfo, PhysicalDeviceImageFormatInfo2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SamplerReductionModeCreateInfo, SamplerCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSamplerFilterMinmaxProperties, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceVulkanMemoryModelFeatures, PhysicalDeviceFeatures2>
   {
@@ -10249,6 +9487,114 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDeviceImagelessFramebufferFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceImagelessFramebufferFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<FramebufferAttachmentsCreateInfo, FramebufferCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderPassAttachmentBeginInfo, RenderPassBeginInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceUniformBufferStandardLayoutFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceUniformBufferStandardLayoutFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderSubgroupExtendedTypesFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderSubgroupExtendedTypesFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSeparateDepthStencilLayoutsFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSeparateDepthStencilLayoutsFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<AttachmentReferenceStencilLayout, AttachmentReference2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<AttachmentDescriptionStencilLayout, AttachmentDescription2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceHostQueryResetFeatures, PhysicalDeviceFeatures2>
   {
@@ -10366,303 +9712,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<PhysicalDevice8BitStorageFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevice8BitStorageFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderAtomicInt64Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderAtomicInt64Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloat16Int8Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloat16Int8Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFloatControlsProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DescriptorSetLayoutBindingFlagsCreateInfo, DescriptorSetLayoutCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorIndexingFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorIndexingFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorIndexingProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DescriptorSetVariableDescriptorCountAllocateInfo, DescriptorSetAllocateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DescriptorSetVariableDescriptorCountLayoutSupport, DescriptorSetLayoutSupport>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceScalarBlockLayoutFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceScalarBlockLayoutFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SamplerReductionModeCreateInfo, SamplerCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSamplerFilterMinmaxProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceUniformBufferStandardLayoutFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceUniformBufferStandardLayoutFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderSubgroupExtendedTypesFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderSubgroupExtendedTypesFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SubpassDescriptionDepthStencilResolve, SubpassDescription2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDepthStencilResolveProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ImageStencilUsageCreateInfo, ImageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ImageStencilUsageCreateInfo, PhysicalDeviceImageFormatInfo2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceImagelessFramebufferFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceImagelessFramebufferFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FramebufferAttachmentsCreateInfo, FramebufferCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassAttachmentBeginInfo, RenderPassBeginInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSeparateDepthStencilLayoutsFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSeparateDepthStencilLayoutsFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<AttachmentReferenceStencilLayout, AttachmentReference2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<AttachmentDescriptionStencilLayout, AttachmentDescription2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_VERSION_1_3 ===
   template <>
   struct StructExtends<PhysicalDeviceVulkan13Features, PhysicalDeviceFeatures2>
@@ -10691,114 +9740,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<PhysicalDevicePrivateDataFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePrivateDataFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DevicePrivateDataCreateInfo, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MemoryBarrier2, SubpassDependency2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSynchronization2Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSynchronization2Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTextureCompressionASTCHDRFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTextureCompressionASTCHDRFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FormatProperties3, FormatProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance4Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance4Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance4Properties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   template <>
   struct StructExtends<PipelineCreationFeedbackCreateInfo, GraphicsPipelineCreateInfo>
   {
@@ -10844,15 +9785,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-  template <>
-  struct StructExtends<PipelineCreationFeedbackCreateInfo, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   template <>
   struct StructExtends<PhysicalDeviceShaderTerminateInvocationFeatures, PhysicalDeviceFeatures2>
   {
@@ -10889,6 +9821,33 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDevicePrivateDataFeatures, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevicePrivateDataFeatures, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<DevicePrivateDataCreateInfo, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDevicePipelineCreationCacheControlFeatures, PhysicalDeviceFeatures2>
   {
@@ -10907,6 +9866,33 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<MemoryBarrier2, SubpassDependency2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSynchronization2Features, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSynchronization2Features, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   template <>
   struct StructExtends<PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures, PhysicalDeviceFeatures2>
   {
@@ -11034,7 +10020,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceShaderIntegerDotProductFeatures, PhysicalDeviceFeatures2>
+  struct StructExtends<PhysicalDeviceTextureCompressionASTCHDRFeatures, PhysicalDeviceFeatures2>
   {
     enum
     {
@@ -11043,25 +10029,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceShaderIntegerDotProductFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderIntegerDotProductProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTexelBufferAlignmentProperties, PhysicalDeviceProperties2>
+  struct StructExtends<PhysicalDeviceTextureCompressionASTCHDRFeatures, DeviceCreateInfo>
   {
     enum
     {
@@ -11105,9 +10073,8 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_VERSION_1_4 ===
   template <>
-  struct StructExtends<PhysicalDeviceVulkan14Features, PhysicalDeviceFeatures2>
+  struct StructExtends<PhysicalDeviceShaderIntegerDotProductFeatures, PhysicalDeviceFeatures2>
   {
     enum
     {
@@ -11116,7 +10083,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceVulkan14Features, DeviceCreateInfo>
+  struct StructExtends<PhysicalDeviceShaderIntegerDotProductFeatures, DeviceCreateInfo>
   {
     enum
     {
@@ -11125,7 +10092,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceVulkan14Properties, PhysicalDeviceProperties2>
+  struct StructExtends<PhysicalDeviceShaderIntegerDotProductProperties, PhysicalDeviceProperties2>
   {
     enum
     {
@@ -11134,7 +10101,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<DeviceQueueGlobalPriorityCreateInfo, DeviceQueueCreateInfo>
+  struct StructExtends<PhysicalDeviceTexelBufferAlignmentProperties, PhysicalDeviceProperties2>
   {
     enum
     {
@@ -11143,7 +10110,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceGlobalPriorityQueryFeatures, PhysicalDeviceFeatures2>
+  struct StructExtends<FormatProperties3, FormatProperties2>
   {
     enum
     {
@@ -11152,7 +10119,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceGlobalPriorityQueryFeatures, DeviceCreateInfo>
+  struct StructExtends<PhysicalDeviceMaintenance4Features, PhysicalDeviceFeatures2>
   {
     enum
     {
@@ -11161,7 +10128,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<QueueFamilyGlobalPriorityProperties, QueueFamilyProperties2>
+  struct StructExtends<PhysicalDeviceMaintenance4Features, DeviceCreateInfo>
   {
     enum
     {
@@ -11170,475 +10137,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceIndexTypeUint8Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceIndexTypeUint8Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance5Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance5Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance5Properties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BufferUsageFlags2CreateInfo, BufferViewCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BufferUsageFlags2CreateInfo, BufferCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BufferUsageFlags2CreateInfo, PhysicalDeviceExternalBufferInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BufferUsageFlags2CreateInfo, DescriptorBufferBindingInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance6Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance6Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance6Properties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BindMemoryStatus, BindBufferMemoryInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<BindMemoryStatus, BindImageMemoryInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceHostImageCopyFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceHostImageCopyFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceHostImageCopyProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SubresourceHostMemcpySize, SubresourceLayout2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<HostImageCopyDevicePerformanceQuery, ImageFormatProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderSubgroupRotateFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderSubgroupRotateFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloatControls2Features, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloatControls2Features, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderExpectAssumeFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderExpectAssumeFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineCreateFlags2CreateInfo, ComputePipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineCreateFlags2CreateInfo, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineCreateFlags2CreateInfo, RayTracingPipelineCreateInfoNV>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineCreateFlags2CreateInfo, RayTracingPipelineCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePushDescriptorProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineProtectedAccessFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineProtectedAccessFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineRobustnessFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineRobustnessFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineRobustnessProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineRobustnessCreateInfo, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineRobustnessCreateInfo, ComputePipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineRobustnessCreateInfo, PipelineShaderStageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineRobustnessCreateInfo, RayTracingPipelineCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLineRasterizationFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLineRasterizationFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLineRasterizationProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineRasterizationLineStateCreateInfo, PipelineRasterizationStateCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVertexAttributeDivisorProperties, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineVertexInputDivisorStateCreateInfo, PipelineVertexInputStateCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVertexAttributeDivisorFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVertexAttributeDivisorFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDynamicRenderingLocalReadFeatures, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDynamicRenderingLocalReadFeatures, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderingAttachmentLocationInfo, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderingAttachmentLocationInfo, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderingInputAttachmentIndexInfo, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderingInputAttachmentIndexInfo, CommandBufferInheritanceInfo>
+  struct StructExtends<PhysicalDeviceMaintenance4Properties, PhysicalDeviceProperties2>
   {
     enum
     {
@@ -11870,16 +10369,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_NVX_binary_import ===
-  template <>
-  struct StructExtends<CuModuleTexturingModeCreateInfoNVX, CuModuleCreateInfoNVX>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_KHR_video_encode_h264 ===
   template <>
   struct StructExtends<VideoEncodeH264CapabilitiesKHR, VideoCapabilitiesKHR>
@@ -12226,6 +10715,70 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_KHR_dynamic_rendering ===
+  template <>
+  struct StructExtends<RenderingFragmentShadingRateAttachmentInfoKHR, RenderingInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderingFragmentDensityMapAttachmentInfoEXT, RenderingInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<AttachmentSampleCountInfoAMD, CommandBufferInheritanceInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<AttachmentSampleCountInfoAMD, GraphicsPipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<MultiviewPerViewAttributesInfoNVX, CommandBufferInheritanceInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<MultiviewPerViewAttributesInfoNVX, GraphicsPipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<MultiviewPerViewAttributesInfoNVX, RenderingInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_corner_sampled_image ===
   template <>
   struct StructExtends<PhysicalDeviceCornerSampledImageFeaturesNV, PhysicalDeviceFeatures2>
@@ -12344,6 +10897,70 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_pipeline_robustness ===
+  template <>
+  struct StructExtends<PhysicalDevicePipelineRobustnessFeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevicePipelineRobustnessFeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevicePipelineRobustnessPropertiesEXT, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PipelineRobustnessCreateInfoEXT, GraphicsPipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PipelineRobustnessCreateInfoEXT, ComputePipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PipelineRobustnessCreateInfoEXT, PipelineShaderStageCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PipelineRobustnessCreateInfoEXT, RayTracingPipelineCreateInfoKHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
   template <>
@@ -12417,6 +11034,16 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
+  //=== VK_KHR_push_descriptor ===
+  template <>
+  struct StructExtends<PhysicalDevicePushDescriptorPropertiesKHR, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_conditional_rendering ===
   template <>
   struct StructExtends<PhysicalDeviceConditionalRenderingFeaturesEXT, PhysicalDeviceFeatures2>
@@ -12495,33 +11122,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<MultiviewPerViewAttributesInfoNVX, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MultiviewPerViewAttributesInfoNVX, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MultiviewPerViewAttributesInfoNVX, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_viewport_swizzle ===
   template <>
   struct StructExtends<PipelineViewportSwizzleStateCreateInfoNV, PipelineViewportStateCreateInfo>
@@ -12836,44 +11436,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_AMD_mixed_attachment_samples ===
-  template <>
-  struct StructExtends<AttachmentSampleCountInfoAMD, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<AttachmentSampleCountInfoAMD, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_shader_bfloat16 ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderBfloat16FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderBfloat16FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_sample_locations ===
   template <>
   struct StructExtends<SampleLocationsInfoEXT, ImageMemoryBarrier>
@@ -13437,6 +11999,43 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_KHR_global_priority ===
+  template <>
+  struct StructExtends<DeviceQueueGlobalPriorityCreateInfoKHR, DeviceQueueCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceGlobalPriorityQueryFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceGlobalPriorityQueryFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<QueueFamilyGlobalPriorityPropertiesKHR, QueueFamilyProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_AMD_memory_overallocation_behavior ===
   template <>
   struct StructExtends<DeviceMemoryOverallocationCreateInfoAMD, DeviceCreateInfo>
@@ -13469,6 +12068,25 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_USE_PLATFORM_GGP*/
 
+  //=== VK_NV_compute_shader_derivatives ===
+  template <>
+  struct StructExtends<PhysicalDeviceComputeShaderDerivativesFeaturesNV, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceComputeShaderDerivativesFeaturesNV, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_mesh_shader ===
   template <>
   struct StructExtends<PhysicalDeviceMeshShaderFeaturesNV, PhysicalDeviceFeatures2>
@@ -13554,61 +12172,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<QueueFamilyCheckpointProperties2NV, QueueFamilyProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_present_timing ===
-  template <>
-  struct StructExtends<PhysicalDevicePresentTimingFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePresentTimingFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PresentTimingSurfaceCapabilitiesEXT, SurfaceCapabilities2KHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainCalibratedTimestampInfoEXT, CalibratedTimestampInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PresentTimingsInfoEXT, PresentInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_INTEL_shader_integer_functions2 ===
   template <>
   struct StructExtends<PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL, PhysicalDeviceFeatures2>
@@ -13713,15 +12276,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<RenderingFragmentDensityMapAttachmentInfoEXT, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_KHR_fragment_shading_rate ===
   template <>
   struct StructExtends<FragmentShadingRateAttachmentInfoKHR, SubpassDescription2>
@@ -13768,15 +12322,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<RenderingFragmentShadingRateAttachmentInfoKHR, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_AMD_shader_core_properties2 ===
   template <>
   struct StructExtends<PhysicalDeviceShaderCoreProperties2AMD, PhysicalDeviceProperties2>
@@ -13806,6 +12351,61 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_KHR_dynamic_rendering_local_read ===
+  template <>
+  struct StructExtends<PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderingAttachmentLocationInfoKHR, GraphicsPipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderingAttachmentLocationInfoKHR, CommandBufferInheritanceInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderingInputAttachmentIndexInfoKHR, GraphicsPipelineCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<RenderingInputAttachmentIndexInfoKHR, CommandBufferInheritanceInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_shader_image_atomic_int64 ===
   template <>
   struct StructExtends<PhysicalDeviceShaderImageAtomicInt64FeaturesEXT, PhysicalDeviceFeatures2>
@@ -13949,24 +12549,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<ValidationFeaturesEXT, ShaderModuleCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ValidationFeaturesEXT, ShaderCreateInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_KHR_present_wait ===
   template <>
   struct StructExtends<PhysicalDevicePresentWaitFeaturesKHR, PhysicalDeviceFeatures2>
@@ -14222,6 +12804,52 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_host_image_copy ===
+  template <>
+  struct StructExtends<PhysicalDeviceHostImageCopyFeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceHostImageCopyFeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceHostImageCopyPropertiesEXT, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SubresourceHostMemcpySizeEXT, SubresourceLayout2KHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<HostImageCopyDevicePerformanceQueryEXT, ImageFormatProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_map_memory_placed ===
   template <>
   struct StructExtends<PhysicalDeviceMapMemoryPlacedFeaturesEXT, PhysicalDeviceFeatures2>
@@ -14251,7 +12879,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<MemoryMapPlacedInfoEXT, MemoryMapInfo>
+  struct StructExtends<MemoryMapPlacedInfoEXT, MemoryMapInfoKHR>
   {
     enum
     {
@@ -14278,6 +12906,89 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_surface_maintenance1 ===
+  template <>
+  struct StructExtends<SurfacePresentModeEXT, PhysicalDeviceSurfaceInfo2KHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SurfacePresentScalingCapabilitiesEXT, SurfaceCapabilities2KHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SurfacePresentModeCompatibilityEXT, SurfaceCapabilities2KHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_EXT_swapchain_maintenance1 ===
+  template <>
+  struct StructExtends<PhysicalDeviceSwapchainMaintenance1FeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceSwapchainMaintenance1FeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SwapchainPresentFenceInfoEXT, PresentInfoKHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SwapchainPresentModesCreateInfoEXT, SwapchainCreateInfoKHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SwapchainPresentModeInfoEXT, PresentInfoKHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SwapchainPresentScalingCreateInfoEXT, SwapchainCreateInfoKHR>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_device_generated_commands ===
   template <>
   struct StructExtends<PhysicalDeviceDeviceGeneratedCommandsPropertiesNV, PhysicalDeviceProperties2>
@@ -14446,6 +13157,34 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_robustness2 ===
+  template <>
+  struct StructExtends<PhysicalDeviceRobustness2FeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceRobustness2FeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceRobustness2PropertiesEXT, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_custom_border_color ===
   template <>
   struct StructExtends<SamplerCustomBorderColorCreateInfoEXT, SamplerCreateInfo>
@@ -14689,70 +13428,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-  template <>
-  struct StructExtends<PhysicalDeviceTileShadingFeaturesQCOM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTileShadingFeaturesQCOM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTileShadingPropertiesQCOM, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassTileShadingCreateInfoQCOM, RenderPassCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassTileShadingCreateInfoQCOM, RenderPassCreateInfo2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassTileShadingCreateInfoQCOM, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassTileShadingCreateInfoQCOM, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_low_latency ===
   template <>
   struct StructExtends<QueryLowLatencySupportNV, SemaphoreCreateInfo>
@@ -14928,6 +13603,16 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
+  //=== VK_KHR_synchronization2 ===
+  template <>
+  struct StructExtends<QueueFamilyCheckpointProperties2NV, QueueFamilyProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_descriptor_buffer ===
   template <>
   struct StructExtends<PhysicalDeviceDescriptorBufferPropertiesEXT, PhysicalDeviceProperties2>
@@ -15028,24 +13713,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  template <>
-  struct StructExtends<OpaqueCaptureDescriptorDataCreateInfoEXT, TensorCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<OpaqueCaptureDescriptorDataCreateInfoEXT, TensorViewCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_graphics_pipeline_library ===
   template <>
   struct StructExtends<PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT, PhysicalDeviceFeatures2>
@@ -15401,7 +14068,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<ImageCompressionPropertiesEXT, SubresourceLayout2>
+  struct StructExtends<ImageCompressionPropertiesEXT, SubresourceLayout2KHR>
   {
     enum
     {
@@ -15911,71 +14578,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_shader_untyped_pointers ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderUntypedPointersFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderUntypedPointersFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeRgbConversionCapabilitiesVALVE, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeProfileRgbConversionInfoVALVE, VideoProfileInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeSessionRgbConversionCreateInfoVALVE, VideoSessionCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_image_view_min_lod ===
   template <>
   struct StructExtends<PhysicalDeviceImageViewMinLodFeaturesEXT, PhysicalDeviceFeatures2>
@@ -16115,16 +14717,6 @@ namespace VULKAN_HPP_NAMESPACE
       value = true
     };
   };
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  template <>
-  struct StructExtends<AccelerationStructureTrianglesOpacityMicromapEXT, AccelerationStructureDenseGeometryFormatTrianglesDataAMDX>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_NV_displacement_micromap ===
@@ -16259,6 +14851,25 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_KHR_shader_subgroup_rotate ===
+  template <>
+  struct StructExtends<PhysicalDeviceShaderSubgroupRotateFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderSubgroupRotateFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_ARM_scheduling_controls ===
   template <>
   struct StructExtends<DeviceQueueShaderCoreControlCreateInfoARM, DeviceQueueCreateInfo>
@@ -16352,6 +14963,25 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_depth_clamp_zero_one ===
+  template <>
+  struct StructExtends<PhysicalDeviceDepthClampZeroOneFeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceDepthClampZeroOneFeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_EXT_non_seamless_cube_map ===
   template <>
   struct StructExtends<PhysicalDeviceNonSeamlessCubeMapFeaturesEXT, PhysicalDeviceFeatures2>
@@ -16426,6 +15056,43 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_QCOM_fragment_density_map_offset ===
+  template <>
+  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<SubpassFragmentDensityMapOffsetEndInfoQCOM, SubpassEndInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_copy_memory_indirect ===
   template <>
   struct StructExtends<PhysicalDeviceCopyMemoryIndirectFeaturesNV, PhysicalDeviceFeatures2>
@@ -16445,6 +15112,43 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  template <>
+  struct StructExtends<PhysicalDeviceCopyMemoryIndirectPropertiesNV, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_NV_memory_decompression ===
+  template <>
+  struct StructExtends<PhysicalDeviceMemoryDecompressionFeaturesNV, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMemoryDecompressionFeaturesNV, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMemoryDecompressionPropertiesNV, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_device_generated_commands_compute ===
   template <>
   struct StructExtends<PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV, PhysicalDeviceFeatures2>
@@ -16473,43 +15177,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  template <>
-  struct StructExtends<PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<AccelerationStructureGeometryLinearSweptSpheresDataNV, AccelerationStructureGeometryKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<AccelerationStructureGeometrySpheresDataNV, AccelerationStructureGeometryKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_linear_color_attachment ===
   template <>
   struct StructExtends<PhysicalDeviceLinearColorAttachmentFeaturesNV, PhysicalDeviceFeatures2>
@@ -16632,81 +15299,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  template <>
-  struct StructExtends<NativeBufferUsageOHOS, ImageFormatProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<NativeBufferFormatPropertiesOHOS, NativeBufferPropertiesOHOS>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ImportNativeBufferInfoOHOS, MemoryAllocateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalFormatOHOS, ImageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalFormatOHOS, SamplerYcbcrConversionCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalFormatOHOS, AttachmentDescription2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalFormatOHOS, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalFormatOHOS, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_external_memory_acquire_unmodified ===
   template <>
   struct StructExtends<ExternalMemoryAcquireUnmodifiedEXT, BufferMemoryBarrier>
@@ -16837,178 +15429,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_ARM_tensors ===
-  template <>
-  struct StructExtends<TensorDescriptionARM, DataGraphPipelineResourceInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TensorDescriptionARM, DataGraphPipelineConstantARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<WriteDescriptorSetTensorARM, WriteDescriptorSet>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TensorFormatPropertiesARM, FormatProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTensorPropertiesARM, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TensorMemoryBarrierARM, DependencyInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TensorDependencyInfoARM, DependencyInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTensorFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTensorFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MemoryDedicatedAllocateInfoTensorARM, MemoryAllocateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ExternalMemoryTensorCreateInfoARM, TensorCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorBufferTensorFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorBufferTensorFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDescriptorBufferTensorPropertiesARM, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DescriptorGetTensorInfoARM, DescriptorGetInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FrameBoundaryTensorsARM, SubmitInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FrameBoundaryTensorsARM, SubmitInfo2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FrameBoundaryTensorsARM, PresentInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<FrameBoundaryTensorsARM, BindSparseInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_shader_module_identifier ===
   template <>
   struct StructExtends<PhysicalDeviceShaderModuleIdentifierFeaturesEXT, PhysicalDeviceFeatures2>
@@ -17139,6 +15559,25 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_EXT_pipeline_protected_access ===
+  template <>
+  struct StructExtends<PhysicalDevicePipelineProtectedAccessFeaturesEXT, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDevicePipelineProtectedAccessFeaturesEXT, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_ANDROID_external_format_resolve ===
   template <>
@@ -17178,9 +15617,9 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  //=== VK_AMD_anti_lag ===
+  //=== VK_KHR_maintenance5 ===
   template <>
-  struct StructExtends<PhysicalDeviceAntiLagFeaturesAMD, PhysicalDeviceFeatures2>
+  struct StructExtends<PhysicalDeviceMaintenance5FeaturesKHR, PhysicalDeviceFeatures2>
   {
     enum
     {
@@ -17189,18 +15628,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceAntiLagFeaturesAMD, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  template <>
-  struct StructExtends<PhysicalDeviceDenseGeometryFormatFeaturesAMDX, PhysicalDeviceFeatures2>
+  struct StructExtends<PhysicalDeviceMaintenance5FeaturesKHR, DeviceCreateInfo>
   {
     enum
     {
@@ -17209,7 +15637,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceDenseGeometryFormatFeaturesAMDX, DeviceCreateInfo>
+  struct StructExtends<PhysicalDeviceMaintenance5PropertiesKHR, PhysicalDeviceProperties2>
   {
     enum
     {
@@ -17218,18 +15646,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<AccelerationStructureDenseGeometryFormatTrianglesDataAMDX, AccelerationStructureGeometryKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  template <>
-  struct StructExtends<SurfaceCapabilitiesPresentId2KHR, SurfaceCapabilities2KHR>
+  struct StructExtends<PipelineCreateFlags2CreateInfoKHR, ComputePipelineCreateInfo>
   {
     enum
     {
@@ -17238,7 +15655,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PresentId2KHR, PresentInfoKHR>
+  struct StructExtends<PipelineCreateFlags2CreateInfoKHR, GraphicsPipelineCreateInfo>
   {
     enum
     {
@@ -17247,7 +15664,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDevicePresentId2FeaturesKHR, PhysicalDeviceFeatures2>
+  struct StructExtends<PipelineCreateFlags2CreateInfoKHR, RayTracingPipelineCreateInfoNV>
   {
     enum
     {
@@ -17256,17 +15673,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDevicePresentId2FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_present_wait2 ===
-  template <>
-  struct StructExtends<SurfaceCapabilitiesPresentWait2KHR, SurfaceCapabilities2KHR>
+  struct StructExtends<PipelineCreateFlags2CreateInfoKHR, RayTracingPipelineCreateInfoKHR>
   {
     enum
     {
@@ -17275,7 +15682,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDevicePresentWait2FeaturesKHR, PhysicalDeviceFeatures2>
+  struct StructExtends<BufferUsageFlags2CreateInfoKHR, BufferViewCreateInfo>
   {
     enum
     {
@@ -17284,7 +15691,25 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDevicePresentWait2FeaturesKHR, DeviceCreateInfo>
+  struct StructExtends<BufferUsageFlags2CreateInfoKHR, BufferCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<BufferUsageFlags2CreateInfoKHR, PhysicalDeviceExternalBufferInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<BufferUsageFlags2CreateInfoKHR, DescriptorBufferBindingInfoEXT>
   {
     enum
     {
@@ -17339,70 +15764,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_pipeline_binary ===
-  template <>
-  struct StructExtends<PhysicalDevicePipelineBinaryFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineBinaryFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineBinaryPropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DevicePipelineBinaryInternalCacheControlKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineBinaryInfoKHR, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineBinaryInfoKHR, ComputePipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineBinaryInfoKHR, RayTracingPipelineCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_QCOM_tile_properties ===
   template <>
   struct StructExtends<PhysicalDeviceTilePropertiesFeaturesQCOM, PhysicalDeviceFeatures2>
@@ -17450,89 +15811,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_surface_maintenance1 ===
-  template <>
-  struct StructExtends<SurfacePresentModeKHR, PhysicalDeviceSurfaceInfo2KHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SurfacePresentScalingCapabilitiesKHR, SurfaceCapabilities2KHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SurfacePresentModeCompatibilityKHR, SurfaceCapabilities2KHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  template <>
-  struct StructExtends<PhysicalDeviceSwapchainMaintenance1FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceSwapchainMaintenance1FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainPresentFenceInfoKHR, PresentInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainPresentModesCreateInfoKHR, SwapchainCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainPresentModeInfoKHR, PresentInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainPresentScalingCreateInfoKHR, SwapchainCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_QCOM_multiview_per_view_viewports ===
   template <>
   struct StructExtends<PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, PhysicalDeviceFeatures2>
@@ -17580,34 +15858,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_NV_cooperative_vector ===
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeVectorPropertiesNV, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeVectorFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeVectorFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_extended_sparse_address_space ===
   template <>
   struct StructExtends<PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV, PhysicalDeviceFeatures2>
@@ -17673,34 +15923,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_EXT_legacy_vertex_attributes ===
-  template <>
-  struct StructExtends<PhysicalDeviceLegacyVertexAttributesFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLegacyVertexAttributesFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLegacyVertexAttributesPropertiesEXT, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_EXT_layer_settings ===
   template <>
   struct StructExtends<LayerSettingsCreateInfoEXT, InstanceCreateInfo>
@@ -17842,88 +16064,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_ARM_data_graph ===
-  template <>
-  struct StructExtends<PhysicalDeviceDataGraphFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDataGraphFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphPipelineCompilerControlCreateInfoARM, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphPipelineShaderModuleCreateInfoARM, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphPipelineIdentifierCreateInfoARM, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphProcessingEngineCreateInfoARM, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphProcessingEngineCreateInfoARM, DescriptorPoolCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphProcessingEngineCreateInfoARM, CommandPoolCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM, DataGraphPipelineConstantARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_QCOM_multiview_per_view_render_areas ===
   template <>
   struct StructExtends<PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM, PhysicalDeviceFeatures2>
@@ -17961,34 +16101,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_compute_shader_derivatives ===
-  template <>
-  struct StructExtends<PhysicalDeviceComputeShaderDerivativesFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceComputeShaderDerivativesFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceComputeShaderDerivativesPropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_KHR_video_decode_av1 ===
   template <>
   struct StructExtends<VideoDecodeAV1ProfileInfoKHR, VideoProfileInfoKHR>
@@ -18044,188 +16156,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_video_encode_av1 ===
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeAV1FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeAV1FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1CapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1QualityLevelPropertiesKHR, VideoEncodeQualityLevelPropertiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1SessionCreateInfoKHR, VideoSessionCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1SessionParametersCreateInfoKHR, VideoSessionParametersCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1PictureInfoKHR, VideoEncodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1DpbSlotInfoKHR, VideoReferenceSlotInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1ProfileInfoKHR, VideoProfileInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1ProfileInfoKHR, QueryPoolCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1GopRemainingFrameInfoKHR, VideoBeginCodingInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1RateControlInfoKHR, VideoCodingControlInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1RateControlInfoKHR, VideoBeginCodingInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1RateControlLayerInfoKHR, VideoEncodeRateControlLayerInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_video_decode_vp9 ===
-  template <>
-  struct StructExtends<PhysicalDeviceVideoDecodeVP9FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoDecodeVP9FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeVP9ProfileInfoKHR, VideoProfileInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeVP9ProfileInfoKHR, QueryPoolCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeVP9CapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeVP9PictureInfoKHR, VideoDecodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_KHR_video_maintenance1 ===
   template <>
   struct StructExtends<PhysicalDeviceVideoMaintenance1FeaturesKHR, PhysicalDeviceFeatures2>
@@ -18422,9 +16352,9 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_KHR_unified_image_layouts ===
+  //=== VK_KHR_vertex_attribute_divisor ===
   template <>
-  struct StructExtends<PhysicalDeviceUnifiedImageLayoutsFeaturesKHR, PhysicalDeviceFeatures2>
+  struct StructExtends<PhysicalDeviceVertexAttributeDivisorPropertiesKHR, PhysicalDeviceProperties2>
   {
     enum
     {
@@ -18433,7 +16363,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<PhysicalDeviceUnifiedImageLayoutsFeaturesKHR, DeviceCreateInfo>
+  struct StructExtends<PipelineVertexInputDivisorStateCreateInfoKHR, PipelineVertexInputStateCreateInfo>
   {
     enum
     {
@@ -18442,7 +16372,35 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct StructExtends<AttachmentFeedbackLoopInfoEXT, RenderingAttachmentInfo>
+  struct StructExtends<PhysicalDeviceVertexAttributeDivisorFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceVertexAttributeDivisorFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_KHR_shader_float_controls2 ===
+  template <>
+  struct StructExtends<PhysicalDeviceShaderFloatControls2FeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderFloatControls2FeaturesKHR, DeviceCreateInfo>
   {
     enum
     {
@@ -18517,6 +16475,127 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
+  //=== VK_KHR_index_type_uint8 ===
+  template <>
+  struct StructExtends<PhysicalDeviceIndexTypeUint8FeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceIndexTypeUint8FeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_KHR_line_rasterization ===
+  template <>
+  struct StructExtends<PhysicalDeviceLineRasterizationFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceLineRasterizationFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceLineRasterizationPropertiesKHR, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PipelineRasterizationLineStateCreateInfoKHR, PipelineRasterizationStateCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_KHR_shader_expect_assume ===
+  template <>
+  struct StructExtends<PhysicalDeviceShaderExpectAssumeFeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceShaderExpectAssumeFeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  //=== VK_KHR_maintenance6 ===
+  template <>
+  struct StructExtends<PhysicalDeviceMaintenance6FeaturesKHR, PhysicalDeviceFeatures2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMaintenance6FeaturesKHR, DeviceCreateInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<PhysicalDeviceMaintenance6PropertiesKHR, PhysicalDeviceProperties2>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<BindMemoryStatusKHR, BindBufferMemoryInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
+  template <>
+  struct StructExtends<BindMemoryStatusKHR, BindImageMemoryInfo>
+  {
+    enum
+    {
+      value = true
+    };
+  };
+
   //=== VK_NV_descriptor_pool_overallocation ===
   template <>
   struct StructExtends<PhysicalDeviceDescriptorPoolOverallocationFeaturesNV, PhysicalDeviceFeatures2>
@@ -18536,309 +16615,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_QCOM_tile_memory_heap ===
-  template <>
-  struct StructExtends<PhysicalDeviceTileMemoryHeapFeaturesQCOM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTileMemoryHeapFeaturesQCOM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceTileMemoryHeapPropertiesQCOM, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TileMemoryRequirementsQCOM, MemoryRequirements2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TileMemoryBindInfoQCOM, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TileMemorySizeInfoQCOM, RenderPassCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TileMemorySizeInfoQCOM, RenderPassCreateInfo2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<TileMemorySizeInfoQCOM, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_copy_memory_indirect ===
-  template <>
-  struct StructExtends<PhysicalDeviceCopyMemoryIndirectFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCopyMemoryIndirectFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCopyMemoryIndirectPropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_memory_decompression ===
-  template <>
-  struct StructExtends<PhysicalDeviceMemoryDecompressionFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMemoryDecompressionFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMemoryDecompressionPropertiesEXT, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_NV_display_stereo ===
-  template <>
-  struct StructExtends<DisplaySurfaceStereoCreateInfoNV, DisplaySurfaceCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<DisplayModeStereoPropertiesNV, DisplayModeProperties2KHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  template <>
-  struct StructExtends<VideoEncodeIntraRefreshCapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeSessionIntraRefreshCreateInfoKHR, VideoSessionCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeIntraRefreshInfoKHR, VideoEncodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoReferenceIntraRefreshInfoKHR, VideoReferenceSlotInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  template <>
-  struct StructExtends<VideoEncodeQuantizationMapCapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoFormatQuantizationMapPropertiesKHR, VideoFormatPropertiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeQuantizationMapInfoKHR, VideoEncodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeQuantizationMapSessionParametersCreateInfoKHR, VideoSessionParametersCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeH264QuantizationMapCapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeH265QuantizationMapCapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoFormatH265QuantizationMapPropertiesKHR, VideoFormatPropertiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoEncodeAV1QuantizationMapCapabilitiesKHR, VideoCapabilitiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoFormatAV1QuantizationMapPropertiesKHR, VideoFormatPropertiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_raw_access_chains ===
   template <>
   struct StructExtends<PhysicalDeviceRawAccessChainsFeaturesNV, PhysicalDeviceFeatures2>
@@ -18858,109 +16634,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_NV_external_compute_queue ===
-  template <>
-  struct StructExtends<ExternalComputeQueueDeviceCreateInfoNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceExternalComputeQueuePropertiesNV, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_NV_command_buffer_inheritance ===
-  template <>
-  struct StructExtends<PhysicalDeviceCommandBufferInheritanceFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCommandBufferInheritanceFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_maintenance7 ===
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance7FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance7FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance7PropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLayeredApiPropertiesListKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceLayeredApiVulkanPropertiesKHR, PhysicalDeviceLayeredApiPropertiesKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_shader_atomic_float16_vector ===
   template <>
   struct StructExtends<PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV, PhysicalDeviceFeatures2>
@@ -18980,44 +16653,6 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_EXT_shader_replicated_composites ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderReplicatedCompositesFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderReplicatedCompositesFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_shader_float8 ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloat8FeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFloat8FeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
   //=== VK_NV_ray_tracing_validation ===
   template <>
   struct StructExtends<PhysicalDeviceRayTracingValidationFeaturesNV, PhysicalDeviceFeatures2>
@@ -19037,5348 +16672,3715 @@ namespace VULKAN_HPP_NAMESPACE
     };
   };
 
-  //=== VK_NV_cluster_acceleration_structure ===
-  template <>
-  struct StructExtends<PhysicalDeviceClusterAccelerationStructureFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceClusterAccelerationStructureFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceClusterAccelerationStructurePropertiesNV, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RayTracingPipelineClusterAccelerationStructureCreateInfoNV, RayTracingPipelineCreateInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  template <>
-  struct StructExtends<PhysicalDevicePartitionedAccelerationStructureFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePartitionedAccelerationStructureFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePartitionedAccelerationStructurePropertiesNV, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PartitionedAccelerationStructureFlagsNV, PartitionedAccelerationStructureInstancesInputNV>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<WriteDescriptorSetPartitionedAccelerationStructureNV, WriteDescriptorSet>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_device_generated_commands ===
-  template <>
-  struct StructExtends<PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<GeneratedCommandsPipelineInfoEXT, GeneratedCommandsInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<GeneratedCommandsPipelineInfoEXT, GeneratedCommandsMemoryRequirementsInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<GeneratedCommandsShaderInfoEXT, GeneratedCommandsInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<GeneratedCommandsShaderInfoEXT, GeneratedCommandsMemoryRequirementsInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_maintenance8 ===
-  template <>
-  struct StructExtends<MemoryBarrierAccessFlags3KHR, SubpassDependency2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MemoryBarrierAccessFlags3KHR, BufferMemoryBarrier2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<MemoryBarrierAccessFlags3KHR, ImageMemoryBarrier2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance8FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance8FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_MESA_image_alignment_control ===
-  template <>
-  struct StructExtends<PhysicalDeviceImageAlignmentControlFeaturesMESA, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceImageAlignmentControlFeaturesMESA, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceImageAlignmentControlPropertiesMESA, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ImageAlignmentControlCreateInfoMESA, ImageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_shader_fma ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFmaFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderFmaFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  template <>
-  struct StructExtends<PhysicalDeviceRayTracingInvocationReorderPropertiesEXT, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceRayTracingInvocationReorderFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceRayTracingInvocationReorderFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_depth_clamp_control ===
-  template <>
-  struct StructExtends<PhysicalDeviceDepthClampControlFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDepthClampControlFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineViewportDepthClampControlCreateInfoEXT, PipelineViewportStateCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_maintenance9 ===
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance9FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance9FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance9PropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<QueueFamilyOwnershipTransferPropertiesKHR, QueueFamilyProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_video_maintenance2 ===
-  template <>
-  struct StructExtends<PhysicalDeviceVideoMaintenance2FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVideoMaintenance2FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeH264InlineSessionParametersInfoKHR, VideoDecodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeH265InlineSessionParametersInfoKHR, VideoDecodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<VideoDecodeAV1InlineSessionParametersInfoKHR, VideoDecodeInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  template <>
-  struct StructExtends<NativeBufferOHOS, ImageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<NativeBufferOHOS, BindImageMemoryInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<SwapchainImageCreateInfoOHOS, ImageCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePresentationPropertiesOHOS, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  template <>
-  struct StructExtends<PhysicalDeviceHdrVividFeaturesHUAWEI, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceHdrVividFeaturesHUAWEI, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<HdrVividDynamicMetadataHUAWEI, HdrMetadataEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_NV_cooperative_matrix2 ===
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeMatrix2FeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeMatrix2FeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCooperativeMatrix2PropertiesNV, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  template <>
-  struct StructExtends<PhysicalDevicePipelineOpacityMicromapFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineOpacityMicromapFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  template <>
-  struct StructExtends<ImportMemoryMetalHandleInfoEXT, MemoryAllocateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  template <>
-  struct StructExtends<PhysicalDeviceDepthClampZeroOneFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDepthClampZeroOneFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_ARM_performance_counters_by_region ===
-  template <>
-  struct StructExtends<PhysicalDevicePerformanceCountersByRegionFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePerformanceCountersByRegionFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePerformanceCountersByRegionPropertiesARM, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassPerformanceCountersByRegionBeginInfoARM, RenderPassBeginInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassPerformanceCountersByRegionBeginInfoARM, RenderingInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  template <>
-  struct StructExtends<PhysicalDeviceVertexAttributeRobustnessFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceVertexAttributeRobustnessFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_ARM_format_pack ===
-  template <>
-  struct StructExtends<PhysicalDeviceFormatPackFeaturesARM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFormatPackFeaturesARM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PipelineFragmentDensityMapLayeredCreateInfoVALVE, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_robustness2 ===
-  template <>
-  struct StructExtends<PhysicalDeviceRobustness2FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceRobustness2FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceRobustness2PropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  template <>
-  struct StructExtends<SetPresentConfigNV, PresentInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePresentMeteringFeaturesNV, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePresentMeteringFeaturesNV, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassFragmentDensityMapOffsetEndInfoEXT, SubpassEndInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderPassFragmentDensityMapOffsetEndInfoEXT, RenderingEndInfoKHR>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  template <>
-  struct StructExtends<PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  template <>
-  struct StructExtends<PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  template <>
-  struct StructExtends<PhysicalDeviceShader64BitIndexingFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShader64BitIndexingFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_custom_resolve ===
-  template <>
-  struct StructExtends<PhysicalDeviceCustomResolveFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceCustomResolveFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<CustomResolveCreateInfoEXT, GraphicsPipelineCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<CustomResolveCreateInfoEXT, CommandBufferInheritanceInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<CustomResolveCreateInfoEXT, ShaderCreateInfoEXT>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_QCOM_data_graph_model ===
-  template <>
-  struct StructExtends<DataGraphPipelineBuiltinModelCreateInfoQCOM, DataGraphPipelineCreateInfoARM>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDataGraphModelFeaturesQCOM, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceDataGraphModelFeaturesQCOM, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_KHR_maintenance10 ===
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance10FeaturesKHR, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance10FeaturesKHR, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceMaintenance10PropertiesKHR, PhysicalDeviceProperties2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<RenderingAttachmentFlagsInfoKHR, RenderingAttachmentInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<ResolveImageModeInfoKHR, ResolveImageInfo2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  template <>
-  struct StructExtends<PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  template <>
-  struct StructExtends<PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT, PhysicalDeviceFeatures2>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
-  template <>
-  struct StructExtends<PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT, DeviceCreateInfo>
-  {
-    enum
-    {
-      value = true
-    };
-  };
-
 #endif  // VULKAN_HPP_DISABLE_ENHANCED_MODE
 
-  namespace detail
-  {
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-    class DynamicLoader
-    {
-    public:
+  class DynamicLoader
+  {
+  public:
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
-      DynamicLoader( std::string const & vulkanLibraryName = {} ) VULKAN_HPP_NOEXCEPT
+    DynamicLoader( std::string const & vulkanLibraryName = {} ) VULKAN_HPP_NOEXCEPT
 #  else
-      DynamicLoader( std::string const & vulkanLibraryName = {} )
+    DynamicLoader( std::string const & vulkanLibraryName = {} )
 #  endif
+    {
+      if ( !vulkanLibraryName.empty() )
       {
-        if ( !vulkanLibraryName.empty() )
-        {
-#  if defined( _WIN32 )
-          m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
-#  elif defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
-          m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
+#  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
+        m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
+#  elif defined( _WIN32 )
+        m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
 #  else
 #    error unsupported platform
 #  endif
-        }
-        else
+      }
+      else
+      {
+#  if defined( __unix__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
+        m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
+        if ( m_library == nullptr )
         {
-#  if defined( _WIN32 )
-          m_library = ::LoadLibraryA( "vulkan-1.dll" );
+          m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL );
+        }
 #  elif defined( __APPLE__ )
-          m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
-          if ( !m_library )
-          {
-            m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
-          }
-          // modern versions of macOS don't search /usr/local/lib automatically contrary to what man dlopen says
-          // Vulkan SDK uses this as the system-wide installation location, so we're going to fallback to this if all else fails
-          if ( !m_library && ( getenv( "DYLD_FALLBACK_LIBRARY_PATH" ) == NULL ) )
-          {
-            m_library = dlopen( "/usr/local/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
-          }
-          if ( !m_library )
-          {
-            m_library = dlopen( "libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL );
-          }
-          // Add support for using Vulkan and MoltenVK in a Framework. App store rules for iOS
-          // strictly enforce no .dylib's. If they aren't found it just falls through
-          if ( !m_library )
-          {
-            m_library = dlopen( "vulkan.framework/vulkan", RTLD_NOW | RTLD_LOCAL );
-          }
-          if ( !m_library )
-          {
-            m_library = dlopen( "MoltenVK.framework/MoltenVK", RTLD_NOW | RTLD_LOCAL );
-          }
-#  elif defined( __unix__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
-          m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
-          if ( !m_library )
-          {
-            m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL );
-          }
+        m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
+        if ( m_library == nullptr )
+        {
+          m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
+        }
+#  elif defined( _WIN32 )
+        m_library = ::LoadLibraryA( "vulkan-1.dll" );
 #  else
 #    error unsupported platform
 #  endif
-        }
+      }
 
 #  ifndef VULKAN_HPP_NO_EXCEPTIONS
-        if ( !m_library )
-        {
-          // NOTE there should be an InitializationFailedError, but msvc insists on the symbol does not exist within the scope of this function.
-          throw std::runtime_error( "Failed to load vulkan library!" );
-        }
+      if ( m_library == nullptr )
+      {
+        // NOTE there should be an InitializationFailedError, but msvc insists on the symbol does not exist within the scope of this function.
+        throw std::runtime_error( "Failed to load vulkan library!" );
+      }
 #  endif
-      }
+    }
 
-      DynamicLoader( DynamicLoader const & ) = delete;
+    DynamicLoader( DynamicLoader const & ) = delete;
 
-      DynamicLoader( DynamicLoader && other ) VULKAN_HPP_NOEXCEPT : m_library( other.m_library )
-      {
-        other.m_library = nullptr;
-      }
+    DynamicLoader( DynamicLoader && other ) VULKAN_HPP_NOEXCEPT : m_library( other.m_library )
+    {
+      other.m_library = nullptr;
+    }
 
-      DynamicLoader & operator=( DynamicLoader const & ) = delete;
+    DynamicLoader & operator=( DynamicLoader const & ) = delete;
 
-      DynamicLoader & operator=( DynamicLoader && other ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_library, other.m_library );
-        return *this;
-      }
+    DynamicLoader & operator=( DynamicLoader && other ) VULKAN_HPP_NOEXCEPT
+    {
+      std::swap( m_library, other.m_library );
+      return *this;
+    }
 
-      ~DynamicLoader() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_library )
-        {
-#  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
-          dlclose( m_library );
-#  elif defined( _WIN32 )
-          ::FreeLibrary( m_library );
-#  else
-#    error unsupported platform
-#  endif
-        }
-      }
-
-      template <typename T>
-      T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
+    ~DynamicLoader() VULKAN_HPP_NOEXCEPT
+    {
+      if ( m_library )
       {
 #  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
-        return (T)(void *)dlsym( m_library, function );
+        dlclose( m_library );
 #  elif defined( _WIN32 )
-        return (T)(void *)::GetProcAddress( m_library, function );
+        ::FreeLibrary( m_library );
 #  else
 #    error unsupported platform
 #  endif
       }
+    }
 
-      bool success() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_library != nullptr;
-      }
-
-    private:
+    template <typename T>
+    T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
+    {
 #  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
-      void * m_library;
+      return (T)dlsym( m_library, function );
 #  elif defined( _WIN32 )
-      ::HINSTANCE m_library;
+      return ( T )::GetProcAddress( m_library, function );
 #  else
 #    error unsupported platform
 #  endif
-    };
+    }
+
+    bool success() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_library != nullptr;
+    }
+
+  private:
+#  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
+    void * m_library;
+#  elif defined( _WIN32 )
+    ::HINSTANCE m_library;
+#  else
+#    error unsupported platform
+#  endif
+  };
 #endif
 
-    using PFN_dummy = void ( * )();
+  using PFN_dummy = void ( * )();
 
-    class DispatchLoaderDynamic : public DispatchLoaderBase
+  class DispatchLoaderDynamic : public DispatchLoaderBase
+  {
+  public:
+    //=== VK_VERSION_1_0 ===
+    PFN_vkCreateInstance                               vkCreateInstance                               = 0;
+    PFN_vkDestroyInstance                              vkDestroyInstance                              = 0;
+    PFN_vkEnumeratePhysicalDevices                     vkEnumeratePhysicalDevices                     = 0;
+    PFN_vkGetPhysicalDeviceFeatures                    vkGetPhysicalDeviceFeatures                    = 0;
+    PFN_vkGetPhysicalDeviceFormatProperties            vkGetPhysicalDeviceFormatProperties            = 0;
+    PFN_vkGetPhysicalDeviceImageFormatProperties       vkGetPhysicalDeviceImageFormatProperties       = 0;
+    PFN_vkGetPhysicalDeviceProperties                  vkGetPhysicalDeviceProperties                  = 0;
+    PFN_vkGetPhysicalDeviceQueueFamilyProperties       vkGetPhysicalDeviceQueueFamilyProperties       = 0;
+    PFN_vkGetPhysicalDeviceMemoryProperties            vkGetPhysicalDeviceMemoryProperties            = 0;
+    PFN_vkGetInstanceProcAddr                          vkGetInstanceProcAddr                          = 0;
+    PFN_vkGetDeviceProcAddr                            vkGetDeviceProcAddr                            = 0;
+    PFN_vkCreateDevice                                 vkCreateDevice                                 = 0;
+    PFN_vkDestroyDevice                                vkDestroyDevice                                = 0;
+    PFN_vkEnumerateInstanceExtensionProperties         vkEnumerateInstanceExtensionProperties         = 0;
+    PFN_vkEnumerateDeviceExtensionProperties           vkEnumerateDeviceExtensionProperties           = 0;
+    PFN_vkEnumerateInstanceLayerProperties             vkEnumerateInstanceLayerProperties             = 0;
+    PFN_vkEnumerateDeviceLayerProperties               vkEnumerateDeviceLayerProperties               = 0;
+    PFN_vkGetDeviceQueue                               vkGetDeviceQueue                               = 0;
+    PFN_vkQueueSubmit                                  vkQueueSubmit                                  = 0;
+    PFN_vkQueueWaitIdle                                vkQueueWaitIdle                                = 0;
+    PFN_vkDeviceWaitIdle                               vkDeviceWaitIdle                               = 0;
+    PFN_vkAllocateMemory                               vkAllocateMemory                               = 0;
+    PFN_vkFreeMemory                                   vkFreeMemory                                   = 0;
+    PFN_vkMapMemory                                    vkMapMemory                                    = 0;
+    PFN_vkUnmapMemory                                  vkUnmapMemory                                  = 0;
+    PFN_vkFlushMappedMemoryRanges                      vkFlushMappedMemoryRanges                      = 0;
+    PFN_vkInvalidateMappedMemoryRanges                 vkInvalidateMappedMemoryRanges                 = 0;
+    PFN_vkGetDeviceMemoryCommitment                    vkGetDeviceMemoryCommitment                    = 0;
+    PFN_vkBindBufferMemory                             vkBindBufferMemory                             = 0;
+    PFN_vkBindImageMemory                              vkBindImageMemory                              = 0;
+    PFN_vkGetBufferMemoryRequirements                  vkGetBufferMemoryRequirements                  = 0;
+    PFN_vkGetImageMemoryRequirements                   vkGetImageMemoryRequirements                   = 0;
+    PFN_vkGetImageSparseMemoryRequirements             vkGetImageSparseMemoryRequirements             = 0;
+    PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties = 0;
+    PFN_vkQueueBindSparse                              vkQueueBindSparse                              = 0;
+    PFN_vkCreateFence                                  vkCreateFence                                  = 0;
+    PFN_vkDestroyFence                                 vkDestroyFence                                 = 0;
+    PFN_vkResetFences                                  vkResetFences                                  = 0;
+    PFN_vkGetFenceStatus                               vkGetFenceStatus                               = 0;
+    PFN_vkWaitForFences                                vkWaitForFences                                = 0;
+    PFN_vkCreateSemaphore                              vkCreateSemaphore                              = 0;
+    PFN_vkDestroySemaphore                             vkDestroySemaphore                             = 0;
+    PFN_vkCreateEvent                                  vkCreateEvent                                  = 0;
+    PFN_vkDestroyEvent                                 vkDestroyEvent                                 = 0;
+    PFN_vkGetEventStatus                               vkGetEventStatus                               = 0;
+    PFN_vkSetEvent                                     vkSetEvent                                     = 0;
+    PFN_vkResetEvent                                   vkResetEvent                                   = 0;
+    PFN_vkCreateQueryPool                              vkCreateQueryPool                              = 0;
+    PFN_vkDestroyQueryPool                             vkDestroyQueryPool                             = 0;
+    PFN_vkGetQueryPoolResults                          vkGetQueryPoolResults                          = 0;
+    PFN_vkCreateBuffer                                 vkCreateBuffer                                 = 0;
+    PFN_vkDestroyBuffer                                vkDestroyBuffer                                = 0;
+    PFN_vkCreateBufferView                             vkCreateBufferView                             = 0;
+    PFN_vkDestroyBufferView                            vkDestroyBufferView                            = 0;
+    PFN_vkCreateImage                                  vkCreateImage                                  = 0;
+    PFN_vkDestroyImage                                 vkDestroyImage                                 = 0;
+    PFN_vkGetImageSubresourceLayout                    vkGetImageSubresourceLayout                    = 0;
+    PFN_vkCreateImageView                              vkCreateImageView                              = 0;
+    PFN_vkDestroyImageView                             vkDestroyImageView                             = 0;
+    PFN_vkCreateShaderModule                           vkCreateShaderModule                           = 0;
+    PFN_vkDestroyShaderModule                          vkDestroyShaderModule                          = 0;
+    PFN_vkCreatePipelineCache                          vkCreatePipelineCache                          = 0;
+    PFN_vkDestroyPipelineCache                         vkDestroyPipelineCache                         = 0;
+    PFN_vkGetPipelineCacheData                         vkGetPipelineCacheData                         = 0;
+    PFN_vkMergePipelineCaches                          vkMergePipelineCaches                          = 0;
+    PFN_vkCreateGraphicsPipelines                      vkCreateGraphicsPipelines                      = 0;
+    PFN_vkCreateComputePipelines                       vkCreateComputePipelines                       = 0;
+    PFN_vkDestroyPipeline                              vkDestroyPipeline                              = 0;
+    PFN_vkCreatePipelineLayout                         vkCreatePipelineLayout                         = 0;
+    PFN_vkDestroyPipelineLayout                        vkDestroyPipelineLayout                        = 0;
+    PFN_vkCreateSampler                                vkCreateSampler                                = 0;
+    PFN_vkDestroySampler                               vkDestroySampler                               = 0;
+    PFN_vkCreateDescriptorSetLayout                    vkCreateDescriptorSetLayout                    = 0;
+    PFN_vkDestroyDescriptorSetLayout                   vkDestroyDescriptorSetLayout                   = 0;
+    PFN_vkCreateDescriptorPool                         vkCreateDescriptorPool                         = 0;
+    PFN_vkDestroyDescriptorPool                        vkDestroyDescriptorPool                        = 0;
+    PFN_vkResetDescriptorPool                          vkResetDescriptorPool                          = 0;
+    PFN_vkAllocateDescriptorSets                       vkAllocateDescriptorSets                       = 0;
+    PFN_vkFreeDescriptorSets                           vkFreeDescriptorSets                           = 0;
+    PFN_vkUpdateDescriptorSets                         vkUpdateDescriptorSets                         = 0;
+    PFN_vkCreateFramebuffer                            vkCreateFramebuffer                            = 0;
+    PFN_vkDestroyFramebuffer                           vkDestroyFramebuffer                           = 0;
+    PFN_vkCreateRenderPass                             vkCreateRenderPass                             = 0;
+    PFN_vkDestroyRenderPass                            vkDestroyRenderPass                            = 0;
+    PFN_vkGetRenderAreaGranularity                     vkGetRenderAreaGranularity                     = 0;
+    PFN_vkCreateCommandPool                            vkCreateCommandPool                            = 0;
+    PFN_vkDestroyCommandPool                           vkDestroyCommandPool                           = 0;
+    PFN_vkResetCommandPool                             vkResetCommandPool                             = 0;
+    PFN_vkAllocateCommandBuffers                       vkAllocateCommandBuffers                       = 0;
+    PFN_vkFreeCommandBuffers                           vkFreeCommandBuffers                           = 0;
+    PFN_vkBeginCommandBuffer                           vkBeginCommandBuffer                           = 0;
+    PFN_vkEndCommandBuffer                             vkEndCommandBuffer                             = 0;
+    PFN_vkResetCommandBuffer                           vkResetCommandBuffer                           = 0;
+    PFN_vkCmdBindPipeline                              vkCmdBindPipeline                              = 0;
+    PFN_vkCmdSetViewport                               vkCmdSetViewport                               = 0;
+    PFN_vkCmdSetScissor                                vkCmdSetScissor                                = 0;
+    PFN_vkCmdSetLineWidth                              vkCmdSetLineWidth                              = 0;
+    PFN_vkCmdSetDepthBias                              vkCmdSetDepthBias                              = 0;
+    PFN_vkCmdSetBlendConstants                         vkCmdSetBlendConstants                         = 0;
+    PFN_vkCmdSetDepthBounds                            vkCmdSetDepthBounds                            = 0;
+    PFN_vkCmdSetStencilCompareMask                     vkCmdSetStencilCompareMask                     = 0;
+    PFN_vkCmdSetStencilWriteMask                       vkCmdSetStencilWriteMask                       = 0;
+    PFN_vkCmdSetStencilReference                       vkCmdSetStencilReference                       = 0;
+    PFN_vkCmdBindDescriptorSets                        vkCmdBindDescriptorSets                        = 0;
+    PFN_vkCmdBindIndexBuffer                           vkCmdBindIndexBuffer                           = 0;
+    PFN_vkCmdBindVertexBuffers                         vkCmdBindVertexBuffers                         = 0;
+    PFN_vkCmdDraw                                      vkCmdDraw                                      = 0;
+    PFN_vkCmdDrawIndexed                               vkCmdDrawIndexed                               = 0;
+    PFN_vkCmdDrawIndirect                              vkCmdDrawIndirect                              = 0;
+    PFN_vkCmdDrawIndexedIndirect                       vkCmdDrawIndexedIndirect                       = 0;
+    PFN_vkCmdDispatch                                  vkCmdDispatch                                  = 0;
+    PFN_vkCmdDispatchIndirect                          vkCmdDispatchIndirect                          = 0;
+    PFN_vkCmdCopyBuffer                                vkCmdCopyBuffer                                = 0;
+    PFN_vkCmdCopyImage                                 vkCmdCopyImage                                 = 0;
+    PFN_vkCmdBlitImage                                 vkCmdBlitImage                                 = 0;
+    PFN_vkCmdCopyBufferToImage                         vkCmdCopyBufferToImage                         = 0;
+    PFN_vkCmdCopyImageToBuffer                         vkCmdCopyImageToBuffer                         = 0;
+    PFN_vkCmdUpdateBuffer                              vkCmdUpdateBuffer                              = 0;
+    PFN_vkCmdFillBuffer                                vkCmdFillBuffer                                = 0;
+    PFN_vkCmdClearColorImage                           vkCmdClearColorImage                           = 0;
+    PFN_vkCmdClearDepthStencilImage                    vkCmdClearDepthStencilImage                    = 0;
+    PFN_vkCmdClearAttachments                          vkCmdClearAttachments                          = 0;
+    PFN_vkCmdResolveImage                              vkCmdResolveImage                              = 0;
+    PFN_vkCmdSetEvent                                  vkCmdSetEvent                                  = 0;
+    PFN_vkCmdResetEvent                                vkCmdResetEvent                                = 0;
+    PFN_vkCmdWaitEvents                                vkCmdWaitEvents                                = 0;
+    PFN_vkCmdPipelineBarrier                           vkCmdPipelineBarrier                           = 0;
+    PFN_vkCmdBeginQuery                                vkCmdBeginQuery                                = 0;
+    PFN_vkCmdEndQuery                                  vkCmdEndQuery                                  = 0;
+    PFN_vkCmdResetQueryPool                            vkCmdResetQueryPool                            = 0;
+    PFN_vkCmdWriteTimestamp                            vkCmdWriteTimestamp                            = 0;
+    PFN_vkCmdCopyQueryPoolResults                      vkCmdCopyQueryPoolResults                      = 0;
+    PFN_vkCmdPushConstants                             vkCmdPushConstants                             = 0;
+    PFN_vkCmdBeginRenderPass                           vkCmdBeginRenderPass                           = 0;
+    PFN_vkCmdNextSubpass                               vkCmdNextSubpass                               = 0;
+    PFN_vkCmdEndRenderPass                             vkCmdEndRenderPass                             = 0;
+    PFN_vkCmdExecuteCommands                           vkCmdExecuteCommands                           = 0;
+
+    //=== VK_VERSION_1_1 ===
+    PFN_vkEnumerateInstanceVersion                      vkEnumerateInstanceVersion                      = 0;
+    PFN_vkBindBufferMemory2                             vkBindBufferMemory2                             = 0;
+    PFN_vkBindImageMemory2                              vkBindImageMemory2                              = 0;
+    PFN_vkGetDeviceGroupPeerMemoryFeatures              vkGetDeviceGroupPeerMemoryFeatures              = 0;
+    PFN_vkCmdSetDeviceMask                              vkCmdSetDeviceMask                              = 0;
+    PFN_vkCmdDispatchBase                               vkCmdDispatchBase                               = 0;
+    PFN_vkEnumeratePhysicalDeviceGroups                 vkEnumeratePhysicalDeviceGroups                 = 0;
+    PFN_vkGetImageMemoryRequirements2                   vkGetImageMemoryRequirements2                   = 0;
+    PFN_vkGetBufferMemoryRequirements2                  vkGetBufferMemoryRequirements2                  = 0;
+    PFN_vkGetImageSparseMemoryRequirements2             vkGetImageSparseMemoryRequirements2             = 0;
+    PFN_vkGetPhysicalDeviceFeatures2                    vkGetPhysicalDeviceFeatures2                    = 0;
+    PFN_vkGetPhysicalDeviceProperties2                  vkGetPhysicalDeviceProperties2                  = 0;
+    PFN_vkGetPhysicalDeviceFormatProperties2            vkGetPhysicalDeviceFormatProperties2            = 0;
+    PFN_vkGetPhysicalDeviceImageFormatProperties2       vkGetPhysicalDeviceImageFormatProperties2       = 0;
+    PFN_vkGetPhysicalDeviceQueueFamilyProperties2       vkGetPhysicalDeviceQueueFamilyProperties2       = 0;
+    PFN_vkGetPhysicalDeviceMemoryProperties2            vkGetPhysicalDeviceMemoryProperties2            = 0;
+    PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2 = 0;
+    PFN_vkTrimCommandPool                               vkTrimCommandPool                               = 0;
+    PFN_vkGetDeviceQueue2                               vkGetDeviceQueue2                               = 0;
+    PFN_vkCreateSamplerYcbcrConversion                  vkCreateSamplerYcbcrConversion                  = 0;
+    PFN_vkDestroySamplerYcbcrConversion                 vkDestroySamplerYcbcrConversion                 = 0;
+    PFN_vkCreateDescriptorUpdateTemplate                vkCreateDescriptorUpdateTemplate                = 0;
+    PFN_vkDestroyDescriptorUpdateTemplate               vkDestroyDescriptorUpdateTemplate               = 0;
+    PFN_vkUpdateDescriptorSetWithTemplate               vkUpdateDescriptorSetWithTemplate               = 0;
+    PFN_vkGetPhysicalDeviceExternalBufferProperties     vkGetPhysicalDeviceExternalBufferProperties     = 0;
+    PFN_vkGetPhysicalDeviceExternalFenceProperties      vkGetPhysicalDeviceExternalFenceProperties      = 0;
+    PFN_vkGetPhysicalDeviceExternalSemaphoreProperties  vkGetPhysicalDeviceExternalSemaphoreProperties  = 0;
+    PFN_vkGetDescriptorSetLayoutSupport                 vkGetDescriptorSetLayoutSupport                 = 0;
+
+    //=== VK_VERSION_1_2 ===
+    PFN_vkCmdDrawIndirectCount                vkCmdDrawIndirectCount                = 0;
+    PFN_vkCmdDrawIndexedIndirectCount         vkCmdDrawIndexedIndirectCount         = 0;
+    PFN_vkCreateRenderPass2                   vkCreateRenderPass2                   = 0;
+    PFN_vkCmdBeginRenderPass2                 vkCmdBeginRenderPass2                 = 0;
+    PFN_vkCmdNextSubpass2                     vkCmdNextSubpass2                     = 0;
+    PFN_vkCmdEndRenderPass2                   vkCmdEndRenderPass2                   = 0;
+    PFN_vkResetQueryPool                      vkResetQueryPool                      = 0;
+    PFN_vkGetSemaphoreCounterValue            vkGetSemaphoreCounterValue            = 0;
+    PFN_vkWaitSemaphores                      vkWaitSemaphores                      = 0;
+    PFN_vkSignalSemaphore                     vkSignalSemaphore                     = 0;
+    PFN_vkGetBufferDeviceAddress              vkGetBufferDeviceAddress              = 0;
+    PFN_vkGetBufferOpaqueCaptureAddress       vkGetBufferOpaqueCaptureAddress       = 0;
+    PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress = 0;
+
+    //=== VK_VERSION_1_3 ===
+    PFN_vkGetPhysicalDeviceToolProperties        vkGetPhysicalDeviceToolProperties        = 0;
+    PFN_vkCreatePrivateDataSlot                  vkCreatePrivateDataSlot                  = 0;
+    PFN_vkDestroyPrivateDataSlot                 vkDestroyPrivateDataSlot                 = 0;
+    PFN_vkSetPrivateData                         vkSetPrivateData                         = 0;
+    PFN_vkGetPrivateData                         vkGetPrivateData                         = 0;
+    PFN_vkCmdSetEvent2                           vkCmdSetEvent2                           = 0;
+    PFN_vkCmdResetEvent2                         vkCmdResetEvent2                         = 0;
+    PFN_vkCmdWaitEvents2                         vkCmdWaitEvents2                         = 0;
+    PFN_vkCmdPipelineBarrier2                    vkCmdPipelineBarrier2                    = 0;
+    PFN_vkCmdWriteTimestamp2                     vkCmdWriteTimestamp2                     = 0;
+    PFN_vkQueueSubmit2                           vkQueueSubmit2                           = 0;
+    PFN_vkCmdCopyBuffer2                         vkCmdCopyBuffer2                         = 0;
+    PFN_vkCmdCopyImage2                          vkCmdCopyImage2                          = 0;
+    PFN_vkCmdCopyBufferToImage2                  vkCmdCopyBufferToImage2                  = 0;
+    PFN_vkCmdCopyImageToBuffer2                  vkCmdCopyImageToBuffer2                  = 0;
+    PFN_vkCmdBlitImage2                          vkCmdBlitImage2                          = 0;
+    PFN_vkCmdResolveImage2                       vkCmdResolveImage2                       = 0;
+    PFN_vkCmdBeginRendering                      vkCmdBeginRendering                      = 0;
+    PFN_vkCmdEndRendering                        vkCmdEndRendering                        = 0;
+    PFN_vkCmdSetCullMode                         vkCmdSetCullMode                         = 0;
+    PFN_vkCmdSetFrontFace                        vkCmdSetFrontFace                        = 0;
+    PFN_vkCmdSetPrimitiveTopology                vkCmdSetPrimitiveTopology                = 0;
+    PFN_vkCmdSetViewportWithCount                vkCmdSetViewportWithCount                = 0;
+    PFN_vkCmdSetScissorWithCount                 vkCmdSetScissorWithCount                 = 0;
+    PFN_vkCmdBindVertexBuffers2                  vkCmdBindVertexBuffers2                  = 0;
+    PFN_vkCmdSetDepthTestEnable                  vkCmdSetDepthTestEnable                  = 0;
+    PFN_vkCmdSetDepthWriteEnable                 vkCmdSetDepthWriteEnable                 = 0;
+    PFN_vkCmdSetDepthCompareOp                   vkCmdSetDepthCompareOp                   = 0;
+    PFN_vkCmdSetDepthBoundsTestEnable            vkCmdSetDepthBoundsTestEnable            = 0;
+    PFN_vkCmdSetStencilTestEnable                vkCmdSetStencilTestEnable                = 0;
+    PFN_vkCmdSetStencilOp                        vkCmdSetStencilOp                        = 0;
+    PFN_vkCmdSetRasterizerDiscardEnable          vkCmdSetRasterizerDiscardEnable          = 0;
+    PFN_vkCmdSetDepthBiasEnable                  vkCmdSetDepthBiasEnable                  = 0;
+    PFN_vkCmdSetPrimitiveRestartEnable           vkCmdSetPrimitiveRestartEnable           = 0;
+    PFN_vkGetDeviceBufferMemoryRequirements      vkGetDeviceBufferMemoryRequirements      = 0;
+    PFN_vkGetDeviceImageMemoryRequirements       vkGetDeviceImageMemoryRequirements       = 0;
+    PFN_vkGetDeviceImageSparseMemoryRequirements vkGetDeviceImageSparseMemoryRequirements = 0;
+
+    //=== VK_KHR_surface ===
+    PFN_vkDestroySurfaceKHR                       vkDestroySurfaceKHR                       = 0;
+    PFN_vkGetPhysicalDeviceSurfaceSupportKHR      vkGetPhysicalDeviceSurfaceSupportKHR      = 0;
+    PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR = 0;
+    PFN_vkGetPhysicalDeviceSurfaceFormatsKHR      vkGetPhysicalDeviceSurfaceFormatsKHR      = 0;
+    PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR = 0;
+
+    //=== VK_KHR_swapchain ===
+    PFN_vkCreateSwapchainKHR                    vkCreateSwapchainKHR                    = 0;
+    PFN_vkDestroySwapchainKHR                   vkDestroySwapchainKHR                   = 0;
+    PFN_vkGetSwapchainImagesKHR                 vkGetSwapchainImagesKHR                 = 0;
+    PFN_vkAcquireNextImageKHR                   vkAcquireNextImageKHR                   = 0;
+    PFN_vkQueuePresentKHR                       vkQueuePresentKHR                       = 0;
+    PFN_vkGetDeviceGroupPresentCapabilitiesKHR  vkGetDeviceGroupPresentCapabilitiesKHR  = 0;
+    PFN_vkGetDeviceGroupSurfacePresentModesKHR  vkGetDeviceGroupSurfacePresentModesKHR  = 0;
+    PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR = 0;
+    PFN_vkAcquireNextImage2KHR                  vkAcquireNextImage2KHR                  = 0;
+
+    //=== VK_KHR_display ===
+    PFN_vkGetPhysicalDeviceDisplayPropertiesKHR      vkGetPhysicalDeviceDisplayPropertiesKHR      = 0;
+    PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR = 0;
+    PFN_vkGetDisplayPlaneSupportedDisplaysKHR        vkGetDisplayPlaneSupportedDisplaysKHR        = 0;
+    PFN_vkGetDisplayModePropertiesKHR                vkGetDisplayModePropertiesKHR                = 0;
+    PFN_vkCreateDisplayModeKHR                       vkCreateDisplayModeKHR                       = 0;
+    PFN_vkGetDisplayPlaneCapabilitiesKHR             vkGetDisplayPlaneCapabilitiesKHR             = 0;
+    PFN_vkCreateDisplayPlaneSurfaceKHR               vkCreateDisplayPlaneSurfaceKHR               = 0;
+
+    //=== VK_KHR_display_swapchain ===
+    PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR = 0;
+
+#if defined( VK_USE_PLATFORM_XLIB_KHR )
+    //=== VK_KHR_xlib_surface ===
+    PFN_vkCreateXlibSurfaceKHR                        vkCreateXlibSurfaceKHR                        = 0;
+    PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR = 0;
+#else
+    PFN_dummy vkCreateXlibSurfaceKHR_placeholder                            = 0;
+    PFN_dummy vkGetPhysicalDeviceXlibPresentationSupportKHR_placeholder     = 0;
+#endif /*VK_USE_PLATFORM_XLIB_KHR*/
+
+#if defined( VK_USE_PLATFORM_XCB_KHR )
+    //=== VK_KHR_xcb_surface ===
+    PFN_vkCreateXcbSurfaceKHR                        vkCreateXcbSurfaceKHR                        = 0;
+    PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR = 0;
+#else
+    PFN_dummy vkCreateXcbSurfaceKHR_placeholder                             = 0;
+    PFN_dummy vkGetPhysicalDeviceXcbPresentationSupportKHR_placeholder      = 0;
+#endif /*VK_USE_PLATFORM_XCB_KHR*/
+
+#if defined( VK_USE_PLATFORM_WAYLAND_KHR )
+    //=== VK_KHR_wayland_surface ===
+    PFN_vkCreateWaylandSurfaceKHR                        vkCreateWaylandSurfaceKHR                        = 0;
+    PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR = 0;
+#else
+    PFN_dummy vkCreateWaylandSurfaceKHR_placeholder                         = 0;
+    PFN_dummy vkGetPhysicalDeviceWaylandPresentationSupportKHR_placeholder  = 0;
+#endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
+
+#if defined( VK_USE_PLATFORM_ANDROID_KHR )
+    //=== VK_KHR_android_surface ===
+    PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR = 0;
+#else
+    PFN_dummy vkCreateAndroidSurfaceKHR_placeholder                         = 0;
+#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_KHR_win32_surface ===
+    PFN_vkCreateWin32SurfaceKHR                        vkCreateWin32SurfaceKHR                        = 0;
+    PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR = 0;
+#else
+    PFN_dummy vkCreateWin32SurfaceKHR_placeholder                           = 0;
+    PFN_dummy vkGetPhysicalDeviceWin32PresentationSupportKHR_placeholder    = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_EXT_debug_report ===
+    PFN_vkCreateDebugReportCallbackEXT  vkCreateDebugReportCallbackEXT  = 0;
+    PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = 0;
+    PFN_vkDebugReportMessageEXT         vkDebugReportMessageEXT         = 0;
+
+    //=== VK_EXT_debug_marker ===
+    PFN_vkDebugMarkerSetObjectTagEXT  vkDebugMarkerSetObjectTagEXT  = 0;
+    PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT = 0;
+    PFN_vkCmdDebugMarkerBeginEXT      vkCmdDebugMarkerBeginEXT      = 0;
+    PFN_vkCmdDebugMarkerEndEXT        vkCmdDebugMarkerEndEXT        = 0;
+    PFN_vkCmdDebugMarkerInsertEXT     vkCmdDebugMarkerInsertEXT     = 0;
+
+    //=== VK_KHR_video_queue ===
+    PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR     vkGetPhysicalDeviceVideoCapabilitiesKHR     = 0;
+    PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR = 0;
+    PFN_vkCreateVideoSessionKHR                     vkCreateVideoSessionKHR                     = 0;
+    PFN_vkDestroyVideoSessionKHR                    vkDestroyVideoSessionKHR                    = 0;
+    PFN_vkGetVideoSessionMemoryRequirementsKHR      vkGetVideoSessionMemoryRequirementsKHR      = 0;
+    PFN_vkBindVideoSessionMemoryKHR                 vkBindVideoSessionMemoryKHR                 = 0;
+    PFN_vkCreateVideoSessionParametersKHR           vkCreateVideoSessionParametersKHR           = 0;
+    PFN_vkUpdateVideoSessionParametersKHR           vkUpdateVideoSessionParametersKHR           = 0;
+    PFN_vkDestroyVideoSessionParametersKHR          vkDestroyVideoSessionParametersKHR          = 0;
+    PFN_vkCmdBeginVideoCodingKHR                    vkCmdBeginVideoCodingKHR                    = 0;
+    PFN_vkCmdEndVideoCodingKHR                      vkCmdEndVideoCodingKHR                      = 0;
+    PFN_vkCmdControlVideoCodingKHR                  vkCmdControlVideoCodingKHR                  = 0;
+
+    //=== VK_KHR_video_decode_queue ===
+    PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR = 0;
+
+    //=== VK_EXT_transform_feedback ===
+    PFN_vkCmdBindTransformFeedbackBuffersEXT vkCmdBindTransformFeedbackBuffersEXT = 0;
+    PFN_vkCmdBeginTransformFeedbackEXT       vkCmdBeginTransformFeedbackEXT       = 0;
+    PFN_vkCmdEndTransformFeedbackEXT         vkCmdEndTransformFeedbackEXT         = 0;
+    PFN_vkCmdBeginQueryIndexedEXT            vkCmdBeginQueryIndexedEXT            = 0;
+    PFN_vkCmdEndQueryIndexedEXT              vkCmdEndQueryIndexedEXT              = 0;
+    PFN_vkCmdDrawIndirectByteCountEXT        vkCmdDrawIndirectByteCountEXT        = 0;
+
+    //=== VK_NVX_binary_import ===
+    PFN_vkCreateCuModuleNVX    vkCreateCuModuleNVX    = 0;
+    PFN_vkCreateCuFunctionNVX  vkCreateCuFunctionNVX  = 0;
+    PFN_vkDestroyCuModuleNVX   vkDestroyCuModuleNVX   = 0;
+    PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX = 0;
+    PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX = 0;
+
+    //=== VK_NVX_image_view_handle ===
+    PFN_vkGetImageViewHandleNVX  vkGetImageViewHandleNVX  = 0;
+    PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX = 0;
+
+    //=== VK_AMD_draw_indirect_count ===
+    PFN_vkCmdDrawIndirectCountAMD        vkCmdDrawIndirectCountAMD        = 0;
+    PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD = 0;
+
+    //=== VK_AMD_shader_info ===
+    PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = 0;
+
+    //=== VK_KHR_dynamic_rendering ===
+    PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR = 0;
+    PFN_vkCmdEndRenderingKHR   vkCmdEndRenderingKHR   = 0;
+
+#if defined( VK_USE_PLATFORM_GGP )
+    //=== VK_GGP_stream_descriptor_surface ===
+    PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP = 0;
+#else
+    PFN_dummy vkCreateStreamDescriptorSurfaceGGP_placeholder                = 0;
+#endif /*VK_USE_PLATFORM_GGP*/
+
+    //=== VK_NV_external_memory_capabilities ===
+    PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_NV_external_memory_win32 ===
+    PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV = 0;
+#else
+    PFN_dummy vkGetMemoryWin32HandleNV_placeholder                          = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_KHR_get_physical_device_properties2 ===
+    PFN_vkGetPhysicalDeviceFeatures2KHR                    vkGetPhysicalDeviceFeatures2KHR                    = 0;
+    PFN_vkGetPhysicalDeviceProperties2KHR                  vkGetPhysicalDeviceProperties2KHR                  = 0;
+    PFN_vkGetPhysicalDeviceFormatProperties2KHR            vkGetPhysicalDeviceFormatProperties2KHR            = 0;
+    PFN_vkGetPhysicalDeviceImageFormatProperties2KHR       vkGetPhysicalDeviceImageFormatProperties2KHR       = 0;
+    PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR       vkGetPhysicalDeviceQueueFamilyProperties2KHR       = 0;
+    PFN_vkGetPhysicalDeviceMemoryProperties2KHR            vkGetPhysicalDeviceMemoryProperties2KHR            = 0;
+    PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR = 0;
+
+    //=== VK_KHR_device_group ===
+    PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR = 0;
+    PFN_vkCmdSetDeviceMaskKHR                 vkCmdSetDeviceMaskKHR                 = 0;
+    PFN_vkCmdDispatchBaseKHR                  vkCmdDispatchBaseKHR                  = 0;
+
+#if defined( VK_USE_PLATFORM_VI_NN )
+    //=== VK_NN_vi_surface ===
+    PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN = 0;
+#else
+    PFN_dummy vkCreateViSurfaceNN_placeholder                               = 0;
+#endif /*VK_USE_PLATFORM_VI_NN*/
+
+    //=== VK_KHR_maintenance1 ===
+    PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR = 0;
+
+    //=== VK_KHR_device_group_creation ===
+    PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR = 0;
+
+    //=== VK_KHR_external_memory_capabilities ===
+    PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_KHR_external_memory_win32 ===
+    PFN_vkGetMemoryWin32HandleKHR           vkGetMemoryWin32HandleKHR           = 0;
+    PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR = 0;
+#else
+    PFN_dummy vkGetMemoryWin32HandleKHR_placeholder                         = 0;
+    PFN_dummy vkGetMemoryWin32HandlePropertiesKHR_placeholder               = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_KHR_external_memory_fd ===
+    PFN_vkGetMemoryFdKHR           vkGetMemoryFdKHR           = 0;
+    PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR = 0;
+
+    //=== VK_KHR_external_semaphore_capabilities ===
+    PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_KHR_external_semaphore_win32 ===
+    PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR = 0;
+    PFN_vkGetSemaphoreWin32HandleKHR    vkGetSemaphoreWin32HandleKHR    = 0;
+#else
+    PFN_dummy vkImportSemaphoreWin32HandleKHR_placeholder                   = 0;
+    PFN_dummy vkGetSemaphoreWin32HandleKHR_placeholder                      = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_KHR_external_semaphore_fd ===
+    PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR = 0;
+    PFN_vkGetSemaphoreFdKHR    vkGetSemaphoreFdKHR    = 0;
+
+    //=== VK_KHR_push_descriptor ===
+    PFN_vkCmdPushDescriptorSetKHR             vkCmdPushDescriptorSetKHR             = 0;
+    PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR = 0;
+
+    //=== VK_EXT_conditional_rendering ===
+    PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT = 0;
+    PFN_vkCmdEndConditionalRenderingEXT   vkCmdEndConditionalRenderingEXT   = 0;
+
+    //=== VK_KHR_descriptor_update_template ===
+    PFN_vkCreateDescriptorUpdateTemplateKHR  vkCreateDescriptorUpdateTemplateKHR  = 0;
+    PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR = 0;
+    PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR = 0;
+
+    //=== VK_NV_clip_space_w_scaling ===
+    PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV = 0;
+
+    //=== VK_EXT_direct_mode_display ===
+    PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT = 0;
+
+#if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
+    //=== VK_EXT_acquire_xlib_display ===
+    PFN_vkAcquireXlibDisplayEXT    vkAcquireXlibDisplayEXT    = 0;
+    PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT = 0;
+#else
+    PFN_dummy vkAcquireXlibDisplayEXT_placeholder                           = 0;
+    PFN_dummy vkGetRandROutputDisplayEXT_placeholder                        = 0;
+#endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
+
+    //=== VK_EXT_display_surface_counter ===
+    PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT = 0;
+
+    //=== VK_EXT_display_control ===
+    PFN_vkDisplayPowerControlEXT  vkDisplayPowerControlEXT  = 0;
+    PFN_vkRegisterDeviceEventEXT  vkRegisterDeviceEventEXT  = 0;
+    PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT = 0;
+    PFN_vkGetSwapchainCounterEXT  vkGetSwapchainCounterEXT  = 0;
+
+    //=== VK_GOOGLE_display_timing ===
+    PFN_vkGetRefreshCycleDurationGOOGLE   vkGetRefreshCycleDurationGOOGLE   = 0;
+    PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE = 0;
+
+    //=== VK_EXT_discard_rectangles ===
+    PFN_vkCmdSetDiscardRectangleEXT       vkCmdSetDiscardRectangleEXT       = 0;
+    PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT = 0;
+    PFN_vkCmdSetDiscardRectangleModeEXT   vkCmdSetDiscardRectangleModeEXT   = 0;
+
+    //=== VK_EXT_hdr_metadata ===
+    PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT = 0;
+
+    //=== VK_KHR_create_renderpass2 ===
+    PFN_vkCreateRenderPass2KHR   vkCreateRenderPass2KHR   = 0;
+    PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR = 0;
+    PFN_vkCmdNextSubpass2KHR     vkCmdNextSubpass2KHR     = 0;
+    PFN_vkCmdEndRenderPass2KHR   vkCmdEndRenderPass2KHR   = 0;
+
+    //=== VK_KHR_shared_presentable_image ===
+    PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR = 0;
+
+    //=== VK_KHR_external_fence_capabilities ===
+    PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_KHR_external_fence_win32 ===
+    PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR = 0;
+    PFN_vkGetFenceWin32HandleKHR    vkGetFenceWin32HandleKHR    = 0;
+#else
+    PFN_dummy vkImportFenceWin32HandleKHR_placeholder                       = 0;
+    PFN_dummy vkGetFenceWin32HandleKHR_placeholder                          = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_KHR_external_fence_fd ===
+    PFN_vkImportFenceFdKHR vkImportFenceFdKHR = 0;
+    PFN_vkGetFenceFdKHR    vkGetFenceFdKHR    = 0;
+
+    //=== VK_KHR_performance_query ===
+    PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = 0;
+    PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         = 0;
+    PFN_vkAcquireProfilingLockKHR                                       vkAcquireProfilingLockKHR                                       = 0;
+    PFN_vkReleaseProfilingLockKHR                                       vkReleaseProfilingLockKHR                                       = 0;
+
+    //=== VK_KHR_get_surface_capabilities2 ===
+    PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR = 0;
+    PFN_vkGetPhysicalDeviceSurfaceFormats2KHR      vkGetPhysicalDeviceSurfaceFormats2KHR      = 0;
+
+    //=== VK_KHR_get_display_properties2 ===
+    PFN_vkGetPhysicalDeviceDisplayProperties2KHR      vkGetPhysicalDeviceDisplayProperties2KHR      = 0;
+    PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR = 0;
+    PFN_vkGetDisplayModeProperties2KHR                vkGetDisplayModeProperties2KHR                = 0;
+    PFN_vkGetDisplayPlaneCapabilities2KHR             vkGetDisplayPlaneCapabilities2KHR             = 0;
+
+#if defined( VK_USE_PLATFORM_IOS_MVK )
+    //=== VK_MVK_ios_surface ===
+    PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK = 0;
+#else
+    PFN_dummy vkCreateIOSSurfaceMVK_placeholder                             = 0;
+#endif /*VK_USE_PLATFORM_IOS_MVK*/
+
+#if defined( VK_USE_PLATFORM_MACOS_MVK )
+    //=== VK_MVK_macos_surface ===
+    PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK = 0;
+#else
+    PFN_dummy vkCreateMacOSSurfaceMVK_placeholder                           = 0;
+#endif /*VK_USE_PLATFORM_MACOS_MVK*/
+
+    //=== VK_EXT_debug_utils ===
+    PFN_vkSetDebugUtilsObjectNameEXT    vkSetDebugUtilsObjectNameEXT    = 0;
+    PFN_vkSetDebugUtilsObjectTagEXT     vkSetDebugUtilsObjectTagEXT     = 0;
+    PFN_vkQueueBeginDebugUtilsLabelEXT  vkQueueBeginDebugUtilsLabelEXT  = 0;
+    PFN_vkQueueEndDebugUtilsLabelEXT    vkQueueEndDebugUtilsLabelEXT    = 0;
+    PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT = 0;
+    PFN_vkCmdBeginDebugUtilsLabelEXT    vkCmdBeginDebugUtilsLabelEXT    = 0;
+    PFN_vkCmdEndDebugUtilsLabelEXT      vkCmdEndDebugUtilsLabelEXT      = 0;
+    PFN_vkCmdInsertDebugUtilsLabelEXT   vkCmdInsertDebugUtilsLabelEXT   = 0;
+    PFN_vkCreateDebugUtilsMessengerEXT  vkCreateDebugUtilsMessengerEXT  = 0;
+    PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = 0;
+    PFN_vkSubmitDebugUtilsMessageEXT    vkSubmitDebugUtilsMessageEXT    = 0;
+
+#if defined( VK_USE_PLATFORM_ANDROID_KHR )
+    //=== VK_ANDROID_external_memory_android_hardware_buffer ===
+    PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID = 0;
+    PFN_vkGetMemoryAndroidHardwareBufferANDROID     vkGetMemoryAndroidHardwareBufferANDROID     = 0;
+#else
+    PFN_dummy vkGetAndroidHardwareBufferPropertiesANDROID_placeholder       = 0;
+    PFN_dummy vkGetMemoryAndroidHardwareBufferANDROID_placeholder           = 0;
+#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
+
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    //=== VK_AMDX_shader_enqueue ===
+    PFN_vkCreateExecutionGraphPipelinesAMDX        vkCreateExecutionGraphPipelinesAMDX        = 0;
+    PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX = 0;
+    PFN_vkGetExecutionGraphPipelineNodeIndexAMDX   vkGetExecutionGraphPipelineNodeIndexAMDX   = 0;
+    PFN_vkCmdInitializeGraphScratchMemoryAMDX      vkCmdInitializeGraphScratchMemoryAMDX      = 0;
+    PFN_vkCmdDispatchGraphAMDX                     vkCmdDispatchGraphAMDX                     = 0;
+    PFN_vkCmdDispatchGraphIndirectAMDX             vkCmdDispatchGraphIndirectAMDX             = 0;
+    PFN_vkCmdDispatchGraphIndirectCountAMDX        vkCmdDispatchGraphIndirectCountAMDX        = 0;
+#else
+    PFN_dummy vkCreateExecutionGraphPipelinesAMDX_placeholder               = 0;
+    PFN_dummy vkGetExecutionGraphPipelineScratchSizeAMDX_placeholder        = 0;
+    PFN_dummy vkGetExecutionGraphPipelineNodeIndexAMDX_placeholder          = 0;
+    PFN_dummy vkCmdInitializeGraphScratchMemoryAMDX_placeholder             = 0;
+    PFN_dummy vkCmdDispatchGraphAMDX_placeholder                            = 0;
+    PFN_dummy vkCmdDispatchGraphIndirectAMDX_placeholder                    = 0;
+    PFN_dummy vkCmdDispatchGraphIndirectCountAMDX_placeholder               = 0;
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+    //=== VK_EXT_sample_locations ===
+    PFN_vkCmdSetSampleLocationsEXT                  vkCmdSetSampleLocationsEXT                  = 0;
+    PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT = 0;
+
+    //=== VK_KHR_get_memory_requirements2 ===
+    PFN_vkGetImageMemoryRequirements2KHR       vkGetImageMemoryRequirements2KHR       = 0;
+    PFN_vkGetBufferMemoryRequirements2KHR      vkGetBufferMemoryRequirements2KHR      = 0;
+    PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR = 0;
+
+    //=== VK_KHR_acceleration_structure ===
+    PFN_vkCreateAccelerationStructureKHR                 vkCreateAccelerationStructureKHR                 = 0;
+    PFN_vkDestroyAccelerationStructureKHR                vkDestroyAccelerationStructureKHR                = 0;
+    PFN_vkCmdBuildAccelerationStructuresKHR              vkCmdBuildAccelerationStructuresKHR              = 0;
+    PFN_vkCmdBuildAccelerationStructuresIndirectKHR      vkCmdBuildAccelerationStructuresIndirectKHR      = 0;
+    PFN_vkBuildAccelerationStructuresKHR                 vkBuildAccelerationStructuresKHR                 = 0;
+    PFN_vkCopyAccelerationStructureKHR                   vkCopyAccelerationStructureKHR                   = 0;
+    PFN_vkCopyAccelerationStructureToMemoryKHR           vkCopyAccelerationStructureToMemoryKHR           = 0;
+    PFN_vkCopyMemoryToAccelerationStructureKHR           vkCopyMemoryToAccelerationStructureKHR           = 0;
+    PFN_vkWriteAccelerationStructuresPropertiesKHR       vkWriteAccelerationStructuresPropertiesKHR       = 0;
+    PFN_vkCmdCopyAccelerationStructureKHR                vkCmdCopyAccelerationStructureKHR                = 0;
+    PFN_vkCmdCopyAccelerationStructureToMemoryKHR        vkCmdCopyAccelerationStructureToMemoryKHR        = 0;
+    PFN_vkCmdCopyMemoryToAccelerationStructureKHR        vkCmdCopyMemoryToAccelerationStructureKHR        = 0;
+    PFN_vkGetAccelerationStructureDeviceAddressKHR       vkGetAccelerationStructureDeviceAddressKHR       = 0;
+    PFN_vkCmdWriteAccelerationStructuresPropertiesKHR    vkCmdWriteAccelerationStructuresPropertiesKHR    = 0;
+    PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR = 0;
+    PFN_vkGetAccelerationStructureBuildSizesKHR          vkGetAccelerationStructureBuildSizesKHR          = 0;
+
+    //=== VK_KHR_ray_tracing_pipeline ===
+    PFN_vkCmdTraceRaysKHR                                 vkCmdTraceRaysKHR                                 = 0;
+    PFN_vkCreateRayTracingPipelinesKHR                    vkCreateRayTracingPipelinesKHR                    = 0;
+    PFN_vkGetRayTracingShaderGroupHandlesKHR              vkGetRayTracingShaderGroupHandlesKHR              = 0;
+    PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR = 0;
+    PFN_vkCmdTraceRaysIndirectKHR                         vkCmdTraceRaysIndirectKHR                         = 0;
+    PFN_vkGetRayTracingShaderGroupStackSizeKHR            vkGetRayTracingShaderGroupStackSizeKHR            = 0;
+    PFN_vkCmdSetRayTracingPipelineStackSizeKHR            vkCmdSetRayTracingPipelineStackSizeKHR            = 0;
+
+    //=== VK_KHR_sampler_ycbcr_conversion ===
+    PFN_vkCreateSamplerYcbcrConversionKHR  vkCreateSamplerYcbcrConversionKHR  = 0;
+    PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR = 0;
+
+    //=== VK_KHR_bind_memory2 ===
+    PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR = 0;
+    PFN_vkBindImageMemory2KHR  vkBindImageMemory2KHR  = 0;
+
+    //=== VK_EXT_image_drm_format_modifier ===
+    PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT = 0;
+
+    //=== VK_EXT_validation_cache ===
+    PFN_vkCreateValidationCacheEXT  vkCreateValidationCacheEXT  = 0;
+    PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT = 0;
+    PFN_vkMergeValidationCachesEXT  vkMergeValidationCachesEXT  = 0;
+    PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT = 0;
+
+    //=== VK_NV_shading_rate_image ===
+    PFN_vkCmdBindShadingRateImageNV          vkCmdBindShadingRateImageNV          = 0;
+    PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV = 0;
+    PFN_vkCmdSetCoarseSampleOrderNV          vkCmdSetCoarseSampleOrderNV          = 0;
+
+    //=== VK_NV_ray_tracing ===
+    PFN_vkCreateAccelerationStructureNV                vkCreateAccelerationStructureNV                = 0;
+    PFN_vkDestroyAccelerationStructureNV               vkDestroyAccelerationStructureNV               = 0;
+    PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV = 0;
+    PFN_vkBindAccelerationStructureMemoryNV            vkBindAccelerationStructureMemoryNV            = 0;
+    PFN_vkCmdBuildAccelerationStructureNV              vkCmdBuildAccelerationStructureNV              = 0;
+    PFN_vkCmdCopyAccelerationStructureNV               vkCmdCopyAccelerationStructureNV               = 0;
+    PFN_vkCmdTraceRaysNV                               vkCmdTraceRaysNV                               = 0;
+    PFN_vkCreateRayTracingPipelinesNV                  vkCreateRayTracingPipelinesNV                  = 0;
+    PFN_vkGetRayTracingShaderGroupHandlesNV            vkGetRayTracingShaderGroupHandlesNV            = 0;
+    PFN_vkGetAccelerationStructureHandleNV             vkGetAccelerationStructureHandleNV             = 0;
+    PFN_vkCmdWriteAccelerationStructuresPropertiesNV   vkCmdWriteAccelerationStructuresPropertiesNV   = 0;
+    PFN_vkCompileDeferredNV                            vkCompileDeferredNV                            = 0;
+
+    //=== VK_KHR_maintenance3 ===
+    PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR = 0;
+
+    //=== VK_KHR_draw_indirect_count ===
+    PFN_vkCmdDrawIndirectCountKHR        vkCmdDrawIndirectCountKHR        = 0;
+    PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR = 0;
+
+    //=== VK_EXT_external_memory_host ===
+    PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT = 0;
+
+    //=== VK_AMD_buffer_marker ===
+    PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD = 0;
+
+    //=== VK_EXT_calibrated_timestamps ===
+    PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = 0;
+    PFN_vkGetCalibratedTimestampsEXT                   vkGetCalibratedTimestampsEXT                   = 0;
+
+    //=== VK_NV_mesh_shader ===
+    PFN_vkCmdDrawMeshTasksNV              vkCmdDrawMeshTasksNV              = 0;
+    PFN_vkCmdDrawMeshTasksIndirectNV      vkCmdDrawMeshTasksIndirectNV      = 0;
+    PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV = 0;
+
+    //=== VK_NV_scissor_exclusive ===
+    PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV = 0;
+    PFN_vkCmdSetExclusiveScissorNV       vkCmdSetExclusiveScissorNV       = 0;
+
+    //=== VK_NV_device_diagnostic_checkpoints ===
+    PFN_vkCmdSetCheckpointNV       vkCmdSetCheckpointNV       = 0;
+    PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV = 0;
+
+    //=== VK_KHR_timeline_semaphore ===
+    PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR = 0;
+    PFN_vkWaitSemaphoresKHR           vkWaitSemaphoresKHR           = 0;
+    PFN_vkSignalSemaphoreKHR          vkSignalSemaphoreKHR          = 0;
+
+    //=== VK_INTEL_performance_query ===
+    PFN_vkInitializePerformanceApiINTEL         vkInitializePerformanceApiINTEL         = 0;
+    PFN_vkUninitializePerformanceApiINTEL       vkUninitializePerformanceApiINTEL       = 0;
+    PFN_vkCmdSetPerformanceMarkerINTEL          vkCmdSetPerformanceMarkerINTEL          = 0;
+    PFN_vkCmdSetPerformanceStreamMarkerINTEL    vkCmdSetPerformanceStreamMarkerINTEL    = 0;
+    PFN_vkCmdSetPerformanceOverrideINTEL        vkCmdSetPerformanceOverrideINTEL        = 0;
+    PFN_vkAcquirePerformanceConfigurationINTEL  vkAcquirePerformanceConfigurationINTEL  = 0;
+    PFN_vkReleasePerformanceConfigurationINTEL  vkReleasePerformanceConfigurationINTEL  = 0;
+    PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL = 0;
+    PFN_vkGetPerformanceParameterINTEL          vkGetPerformanceParameterINTEL          = 0;
+
+    //=== VK_AMD_display_native_hdr ===
+    PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD = 0;
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_imagepipe_surface ===
+    PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA = 0;
+#else
+    PFN_dummy vkCreateImagePipeSurfaceFUCHSIA_placeholder                   = 0;
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#if defined( VK_USE_PLATFORM_METAL_EXT )
+    //=== VK_EXT_metal_surface ===
+    PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT = 0;
+#else
+    PFN_dummy vkCreateMetalSurfaceEXT_placeholder                           = 0;
+#endif /*VK_USE_PLATFORM_METAL_EXT*/
+
+    //=== VK_KHR_fragment_shading_rate ===
+    PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR = 0;
+    PFN_vkCmdSetFragmentShadingRateKHR             vkCmdSetFragmentShadingRateKHR             = 0;
+
+    //=== VK_KHR_dynamic_rendering_local_read ===
+    PFN_vkCmdSetRenderingAttachmentLocationsKHR    vkCmdSetRenderingAttachmentLocationsKHR    = 0;
+    PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR = 0;
+
+    //=== VK_EXT_buffer_device_address ===
+    PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT = 0;
+
+    //=== VK_EXT_tooling_info ===
+    PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT = 0;
+
+    //=== VK_KHR_present_wait ===
+    PFN_vkWaitForPresentKHR vkWaitForPresentKHR = 0;
+
+    //=== VK_NV_cooperative_matrix ===
+    PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = 0;
+
+    //=== VK_NV_coverage_reduction_mode ===
+    PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_EXT_full_screen_exclusive ===
+    PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT = 0;
+    PFN_vkAcquireFullScreenExclusiveModeEXT        vkAcquireFullScreenExclusiveModeEXT        = 0;
+    PFN_vkReleaseFullScreenExclusiveModeEXT        vkReleaseFullScreenExclusiveModeEXT        = 0;
+    PFN_vkGetDeviceGroupSurfacePresentModes2EXT    vkGetDeviceGroupSurfacePresentModes2EXT    = 0;
+#else
+    PFN_dummy vkGetPhysicalDeviceSurfacePresentModes2EXT_placeholder        = 0;
+    PFN_dummy vkAcquireFullScreenExclusiveModeEXT_placeholder               = 0;
+    PFN_dummy vkReleaseFullScreenExclusiveModeEXT_placeholder               = 0;
+    PFN_dummy vkGetDeviceGroupSurfacePresentModes2EXT_placeholder           = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+    //=== VK_EXT_headless_surface ===
+    PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT = 0;
+
+    //=== VK_KHR_buffer_device_address ===
+    PFN_vkGetBufferDeviceAddressKHR              vkGetBufferDeviceAddressKHR              = 0;
+    PFN_vkGetBufferOpaqueCaptureAddressKHR       vkGetBufferOpaqueCaptureAddressKHR       = 0;
+    PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR = 0;
+
+    //=== VK_EXT_line_rasterization ===
+    PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT = 0;
+
+    //=== VK_EXT_host_query_reset ===
+    PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT = 0;
+
+    //=== VK_EXT_extended_dynamic_state ===
+    PFN_vkCmdSetCullModeEXT              vkCmdSetCullModeEXT              = 0;
+    PFN_vkCmdSetFrontFaceEXT             vkCmdSetFrontFaceEXT             = 0;
+    PFN_vkCmdSetPrimitiveTopologyEXT     vkCmdSetPrimitiveTopologyEXT     = 0;
+    PFN_vkCmdSetViewportWithCountEXT     vkCmdSetViewportWithCountEXT     = 0;
+    PFN_vkCmdSetScissorWithCountEXT      vkCmdSetScissorWithCountEXT      = 0;
+    PFN_vkCmdBindVertexBuffers2EXT       vkCmdBindVertexBuffers2EXT       = 0;
+    PFN_vkCmdSetDepthTestEnableEXT       vkCmdSetDepthTestEnableEXT       = 0;
+    PFN_vkCmdSetDepthWriteEnableEXT      vkCmdSetDepthWriteEnableEXT      = 0;
+    PFN_vkCmdSetDepthCompareOpEXT        vkCmdSetDepthCompareOpEXT        = 0;
+    PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT = 0;
+    PFN_vkCmdSetStencilTestEnableEXT     vkCmdSetStencilTestEnableEXT     = 0;
+    PFN_vkCmdSetStencilOpEXT             vkCmdSetStencilOpEXT             = 0;
+
+    //=== VK_KHR_deferred_host_operations ===
+    PFN_vkCreateDeferredOperationKHR            vkCreateDeferredOperationKHR            = 0;
+    PFN_vkDestroyDeferredOperationKHR           vkDestroyDeferredOperationKHR           = 0;
+    PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR = 0;
+    PFN_vkGetDeferredOperationResultKHR         vkGetDeferredOperationResultKHR         = 0;
+    PFN_vkDeferredOperationJoinKHR              vkDeferredOperationJoinKHR              = 0;
+
+    //=== VK_KHR_pipeline_executable_properties ===
+    PFN_vkGetPipelineExecutablePropertiesKHR              vkGetPipelineExecutablePropertiesKHR              = 0;
+    PFN_vkGetPipelineExecutableStatisticsKHR              vkGetPipelineExecutableStatisticsKHR              = 0;
+    PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR = 0;
+
+    //=== VK_EXT_host_image_copy ===
+    PFN_vkCopyMemoryToImageEXT          vkCopyMemoryToImageEXT          = 0;
+    PFN_vkCopyImageToMemoryEXT          vkCopyImageToMemoryEXT          = 0;
+    PFN_vkCopyImageToImageEXT           vkCopyImageToImageEXT           = 0;
+    PFN_vkTransitionImageLayoutEXT      vkTransitionImageLayoutEXT      = 0;
+    PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT = 0;
+
+    //=== VK_KHR_map_memory2 ===
+    PFN_vkMapMemory2KHR   vkMapMemory2KHR   = 0;
+    PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR = 0;
+
+    //=== VK_EXT_swapchain_maintenance1 ===
+    PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT = 0;
+
+    //=== VK_NV_device_generated_commands ===
+    PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV = 0;
+    PFN_vkCmdPreprocessGeneratedCommandsNV         vkCmdPreprocessGeneratedCommandsNV         = 0;
+    PFN_vkCmdExecuteGeneratedCommandsNV            vkCmdExecuteGeneratedCommandsNV            = 0;
+    PFN_vkCmdBindPipelineShaderGroupNV             vkCmdBindPipelineShaderGroupNV             = 0;
+    PFN_vkCreateIndirectCommandsLayoutNV           vkCreateIndirectCommandsLayoutNV           = 0;
+    PFN_vkDestroyIndirectCommandsLayoutNV          vkDestroyIndirectCommandsLayoutNV          = 0;
+
+    //=== VK_EXT_depth_bias_control ===
+    PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT = 0;
+
+    //=== VK_EXT_acquire_drm_display ===
+    PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT = 0;
+    PFN_vkGetDrmDisplayEXT     vkGetDrmDisplayEXT     = 0;
+
+    //=== VK_EXT_private_data ===
+    PFN_vkCreatePrivateDataSlotEXT  vkCreatePrivateDataSlotEXT  = 0;
+    PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT = 0;
+    PFN_vkSetPrivateDataEXT         vkSetPrivateDataEXT         = 0;
+    PFN_vkGetPrivateDataEXT         vkGetPrivateDataEXT         = 0;
+
+    //=== VK_KHR_video_encode_queue ===
+    PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = 0;
+    PFN_vkGetEncodedVideoSessionParametersKHR                   vkGetEncodedVideoSessionParametersKHR                   = 0;
+    PFN_vkCmdEncodeVideoKHR                                     vkCmdEncodeVideoKHR                                     = 0;
+
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    //=== VK_NV_cuda_kernel_launch ===
+    PFN_vkCreateCudaModuleNV    vkCreateCudaModuleNV    = 0;
+    PFN_vkGetCudaModuleCacheNV  vkGetCudaModuleCacheNV  = 0;
+    PFN_vkCreateCudaFunctionNV  vkCreateCudaFunctionNV  = 0;
+    PFN_vkDestroyCudaModuleNV   vkDestroyCudaModuleNV   = 0;
+    PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV = 0;
+    PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV = 0;
+#else
+    PFN_dummy vkCreateCudaModuleNV_placeholder                              = 0;
+    PFN_dummy vkGetCudaModuleCacheNV_placeholder                            = 0;
+    PFN_dummy vkCreateCudaFunctionNV_placeholder                            = 0;
+    PFN_dummy vkDestroyCudaModuleNV_placeholder                             = 0;
+    PFN_dummy vkDestroyCudaFunctionNV_placeholder                           = 0;
+    PFN_dummy vkCmdCudaLaunchKernelNV_placeholder                           = 0;
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+#if defined( VK_USE_PLATFORM_METAL_EXT )
+    //=== VK_EXT_metal_objects ===
+    PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT = 0;
+#else
+    PFN_dummy vkExportMetalObjectsEXT_placeholder                           = 0;
+#endif /*VK_USE_PLATFORM_METAL_EXT*/
+
+    //=== VK_KHR_synchronization2 ===
+    PFN_vkCmdSetEvent2KHR           vkCmdSetEvent2KHR           = 0;
+    PFN_vkCmdResetEvent2KHR         vkCmdResetEvent2KHR         = 0;
+    PFN_vkCmdWaitEvents2KHR         vkCmdWaitEvents2KHR         = 0;
+    PFN_vkCmdPipelineBarrier2KHR    vkCmdPipelineBarrier2KHR    = 0;
+    PFN_vkCmdWriteTimestamp2KHR     vkCmdWriteTimestamp2KHR     = 0;
+    PFN_vkQueueSubmit2KHR           vkQueueSubmit2KHR           = 0;
+    PFN_vkCmdWriteBufferMarker2AMD  vkCmdWriteBufferMarker2AMD  = 0;
+    PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV = 0;
+
+    //=== VK_EXT_descriptor_buffer ===
+    PFN_vkGetDescriptorSetLayoutSizeEXT                          vkGetDescriptorSetLayoutSizeEXT                          = 0;
+    PFN_vkGetDescriptorSetLayoutBindingOffsetEXT                 vkGetDescriptorSetLayoutBindingOffsetEXT                 = 0;
+    PFN_vkGetDescriptorEXT                                       vkGetDescriptorEXT                                       = 0;
+    PFN_vkCmdBindDescriptorBuffersEXT                            vkCmdBindDescriptorBuffersEXT                            = 0;
+    PFN_vkCmdSetDescriptorBufferOffsetsEXT                       vkCmdSetDescriptorBufferOffsetsEXT                       = 0;
+    PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT             vkCmdBindDescriptorBufferEmbeddedSamplersEXT             = 0;
+    PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT                vkGetBufferOpaqueCaptureDescriptorDataEXT                = 0;
+    PFN_vkGetImageOpaqueCaptureDescriptorDataEXT                 vkGetImageOpaqueCaptureDescriptorDataEXT                 = 0;
+    PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT             vkGetImageViewOpaqueCaptureDescriptorDataEXT             = 0;
+    PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT               vkGetSamplerOpaqueCaptureDescriptorDataEXT               = 0;
+    PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = 0;
+
+    //=== VK_NV_fragment_shading_rate_enums ===
+    PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV = 0;
+
+    //=== VK_EXT_mesh_shader ===
+    PFN_vkCmdDrawMeshTasksEXT              vkCmdDrawMeshTasksEXT              = 0;
+    PFN_vkCmdDrawMeshTasksIndirectEXT      vkCmdDrawMeshTasksIndirectEXT      = 0;
+    PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT = 0;
+
+    //=== VK_KHR_copy_commands2 ===
+    PFN_vkCmdCopyBuffer2KHR        vkCmdCopyBuffer2KHR        = 0;
+    PFN_vkCmdCopyImage2KHR         vkCmdCopyImage2KHR         = 0;
+    PFN_vkCmdCopyBufferToImage2KHR vkCmdCopyBufferToImage2KHR = 0;
+    PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR = 0;
+    PFN_vkCmdBlitImage2KHR         vkCmdBlitImage2KHR         = 0;
+    PFN_vkCmdResolveImage2KHR      vkCmdResolveImage2KHR      = 0;
+
+    //=== VK_EXT_device_fault ===
+    PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT = 0;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+    //=== VK_NV_acquire_winrt_display ===
+    PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV = 0;
+    PFN_vkGetWinrtDisplayNV     vkGetWinrtDisplayNV     = 0;
+#else
+    PFN_dummy vkAcquireWinrtDisplayNV_placeholder                           = 0;
+    PFN_dummy vkGetWinrtDisplayNV_placeholder                               = 0;
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+#if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
+    //=== VK_EXT_directfb_surface ===
+    PFN_vkCreateDirectFBSurfaceEXT                        vkCreateDirectFBSurfaceEXT                        = 0;
+    PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT = 0;
+#else
+    PFN_dummy vkCreateDirectFBSurfaceEXT_placeholder                        = 0;
+    PFN_dummy vkGetPhysicalDeviceDirectFBPresentationSupportEXT_placeholder = 0;
+#endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
+
+    //=== VK_EXT_vertex_input_dynamic_state ===
+    PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT = 0;
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_external_memory ===
+    PFN_vkGetMemoryZirconHandleFUCHSIA           vkGetMemoryZirconHandleFUCHSIA           = 0;
+    PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePropertiesFUCHSIA = 0;
+#else
+    PFN_dummy vkGetMemoryZirconHandleFUCHSIA_placeholder                    = 0;
+    PFN_dummy vkGetMemoryZirconHandlePropertiesFUCHSIA_placeholder          = 0;
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_external_semaphore ===
+    PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA = 0;
+    PFN_vkGetSemaphoreZirconHandleFUCHSIA    vkGetSemaphoreZirconHandleFUCHSIA    = 0;
+#else
+    PFN_dummy vkImportSemaphoreZirconHandleFUCHSIA_placeholder              = 0;
+    PFN_dummy vkGetSemaphoreZirconHandleFUCHSIA_placeholder                 = 0;
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+    //=== VK_FUCHSIA_buffer_collection ===
+    PFN_vkCreateBufferCollectionFUCHSIA               vkCreateBufferCollectionFUCHSIA               = 0;
+    PFN_vkSetBufferCollectionImageConstraintsFUCHSIA  vkSetBufferCollectionImageConstraintsFUCHSIA  = 0;
+    PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA vkSetBufferCollectionBufferConstraintsFUCHSIA = 0;
+    PFN_vkDestroyBufferCollectionFUCHSIA              vkDestroyBufferCollectionFUCHSIA              = 0;
+    PFN_vkGetBufferCollectionPropertiesFUCHSIA        vkGetBufferCollectionPropertiesFUCHSIA        = 0;
+#else
+    PFN_dummy vkCreateBufferCollectionFUCHSIA_placeholder                   = 0;
+    PFN_dummy vkSetBufferCollectionImageConstraintsFUCHSIA_placeholder      = 0;
+    PFN_dummy vkSetBufferCollectionBufferConstraintsFUCHSIA_placeholder     = 0;
+    PFN_dummy vkDestroyBufferCollectionFUCHSIA_placeholder                  = 0;
+    PFN_dummy vkGetBufferCollectionPropertiesFUCHSIA_placeholder            = 0;
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+    //=== VK_HUAWEI_subpass_shading ===
+    PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = 0;
+    PFN_vkCmdSubpassShadingHUAWEI                       vkCmdSubpassShadingHUAWEI                       = 0;
+
+    //=== VK_HUAWEI_invocation_mask ===
+    PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI = 0;
+
+    //=== VK_NV_external_memory_rdma ===
+    PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV = 0;
+
+    //=== VK_EXT_pipeline_properties ===
+    PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT = 0;
+
+    //=== VK_EXT_extended_dynamic_state2 ===
+    PFN_vkCmdSetPatchControlPointsEXT      vkCmdSetPatchControlPointsEXT      = 0;
+    PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT = 0;
+    PFN_vkCmdSetDepthBiasEnableEXT         vkCmdSetDepthBiasEnableEXT         = 0;
+    PFN_vkCmdSetLogicOpEXT                 vkCmdSetLogicOpEXT                 = 0;
+    PFN_vkCmdSetPrimitiveRestartEnableEXT  vkCmdSetPrimitiveRestartEnableEXT  = 0;
+
+#if defined( VK_USE_PLATFORM_SCREEN_QNX )
+    //=== VK_QNX_screen_surface ===
+    PFN_vkCreateScreenSurfaceQNX                        vkCreateScreenSurfaceQNX                        = 0;
+    PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX = 0;
+#else
+    PFN_dummy vkCreateScreenSurfaceQNX_placeholder                          = 0;
+    PFN_dummy vkGetPhysicalDeviceScreenPresentationSupportQNX_placeholder   = 0;
+#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+    //=== VK_EXT_color_write_enable ===
+    PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT = 0;
+
+    //=== VK_KHR_ray_tracing_maintenance1 ===
+    PFN_vkCmdTraceRaysIndirect2KHR vkCmdTraceRaysIndirect2KHR = 0;
+
+    //=== VK_EXT_multi_draw ===
+    PFN_vkCmdDrawMultiEXT        vkCmdDrawMultiEXT        = 0;
+    PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT = 0;
+
+    //=== VK_EXT_opacity_micromap ===
+    PFN_vkCreateMicromapEXT                 vkCreateMicromapEXT                 = 0;
+    PFN_vkDestroyMicromapEXT                vkDestroyMicromapEXT                = 0;
+    PFN_vkCmdBuildMicromapsEXT              vkCmdBuildMicromapsEXT              = 0;
+    PFN_vkBuildMicromapsEXT                 vkBuildMicromapsEXT                 = 0;
+    PFN_vkCopyMicromapEXT                   vkCopyMicromapEXT                   = 0;
+    PFN_vkCopyMicromapToMemoryEXT           vkCopyMicromapToMemoryEXT           = 0;
+    PFN_vkCopyMemoryToMicromapEXT           vkCopyMemoryToMicromapEXT           = 0;
+    PFN_vkWriteMicromapsPropertiesEXT       vkWriteMicromapsPropertiesEXT       = 0;
+    PFN_vkCmdCopyMicromapEXT                vkCmdCopyMicromapEXT                = 0;
+    PFN_vkCmdCopyMicromapToMemoryEXT        vkCmdCopyMicromapToMemoryEXT        = 0;
+    PFN_vkCmdCopyMemoryToMicromapEXT        vkCmdCopyMemoryToMicromapEXT        = 0;
+    PFN_vkCmdWriteMicromapsPropertiesEXT    vkCmdWriteMicromapsPropertiesEXT    = 0;
+    PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT = 0;
+    PFN_vkGetMicromapBuildSizesEXT          vkGetMicromapBuildSizesEXT          = 0;
+
+    //=== VK_HUAWEI_cluster_culling_shader ===
+    PFN_vkCmdDrawClusterHUAWEI         vkCmdDrawClusterHUAWEI         = 0;
+    PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI = 0;
+
+    //=== VK_EXT_pageable_device_local_memory ===
+    PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT = 0;
+
+    //=== VK_KHR_maintenance4 ===
+    PFN_vkGetDeviceBufferMemoryRequirementsKHR      vkGetDeviceBufferMemoryRequirementsKHR      = 0;
+    PFN_vkGetDeviceImageMemoryRequirementsKHR       vkGetDeviceImageMemoryRequirementsKHR       = 0;
+    PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR = 0;
+
+    //=== VK_VALVE_descriptor_set_host_mapping ===
+    PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE = 0;
+    PFN_vkGetDescriptorSetHostMappingVALVE           vkGetDescriptorSetHostMappingVALVE           = 0;
+
+    //=== VK_NV_copy_memory_indirect ===
+    PFN_vkCmdCopyMemoryIndirectNV        vkCmdCopyMemoryIndirectNV        = 0;
+    PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV = 0;
+
+    //=== VK_NV_memory_decompression ===
+    PFN_vkCmdDecompressMemoryNV              vkCmdDecompressMemoryNV              = 0;
+    PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV = 0;
+
+    //=== VK_NV_device_generated_commands_compute ===
+    PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0;
+    PFN_vkCmdUpdatePipelineIndirectBufferNV       vkCmdUpdatePipelineIndirectBufferNV       = 0;
+    PFN_vkGetPipelineIndirectDeviceAddressNV      vkGetPipelineIndirectDeviceAddressNV      = 0;
+
+    //=== VK_EXT_extended_dynamic_state3 ===
+    PFN_vkCmdSetDepthClampEnableEXT                 vkCmdSetDepthClampEnableEXT                 = 0;
+    PFN_vkCmdSetPolygonModeEXT                      vkCmdSetPolygonModeEXT                      = 0;
+    PFN_vkCmdSetRasterizationSamplesEXT             vkCmdSetRasterizationSamplesEXT             = 0;
+    PFN_vkCmdSetSampleMaskEXT                       vkCmdSetSampleMaskEXT                       = 0;
+    PFN_vkCmdSetAlphaToCoverageEnableEXT            vkCmdSetAlphaToCoverageEnableEXT            = 0;
+    PFN_vkCmdSetAlphaToOneEnableEXT                 vkCmdSetAlphaToOneEnableEXT                 = 0;
+    PFN_vkCmdSetLogicOpEnableEXT                    vkCmdSetLogicOpEnableEXT                    = 0;
+    PFN_vkCmdSetColorBlendEnableEXT                 vkCmdSetColorBlendEnableEXT                 = 0;
+    PFN_vkCmdSetColorBlendEquationEXT               vkCmdSetColorBlendEquationEXT               = 0;
+    PFN_vkCmdSetColorWriteMaskEXT                   vkCmdSetColorWriteMaskEXT                   = 0;
+    PFN_vkCmdSetTessellationDomainOriginEXT         vkCmdSetTessellationDomainOriginEXT         = 0;
+    PFN_vkCmdSetRasterizationStreamEXT              vkCmdSetRasterizationStreamEXT              = 0;
+    PFN_vkCmdSetConservativeRasterizationModeEXT    vkCmdSetConservativeRasterizationModeEXT    = 0;
+    PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT vkCmdSetExtraPrimitiveOverestimationSizeEXT = 0;
+    PFN_vkCmdSetDepthClipEnableEXT                  vkCmdSetDepthClipEnableEXT                  = 0;
+    PFN_vkCmdSetSampleLocationsEnableEXT            vkCmdSetSampleLocationsEnableEXT            = 0;
+    PFN_vkCmdSetColorBlendAdvancedEXT               vkCmdSetColorBlendAdvancedEXT               = 0;
+    PFN_vkCmdSetProvokingVertexModeEXT              vkCmdSetProvokingVertexModeEXT              = 0;
+    PFN_vkCmdSetLineRasterizationModeEXT            vkCmdSetLineRasterizationModeEXT            = 0;
+    PFN_vkCmdSetLineStippleEnableEXT                vkCmdSetLineStippleEnableEXT                = 0;
+    PFN_vkCmdSetDepthClipNegativeOneToOneEXT        vkCmdSetDepthClipNegativeOneToOneEXT        = 0;
+    PFN_vkCmdSetViewportWScalingEnableNV            vkCmdSetViewportWScalingEnableNV            = 0;
+    PFN_vkCmdSetViewportSwizzleNV                   vkCmdSetViewportSwizzleNV                   = 0;
+    PFN_vkCmdSetCoverageToColorEnableNV             vkCmdSetCoverageToColorEnableNV             = 0;
+    PFN_vkCmdSetCoverageToColorLocationNV           vkCmdSetCoverageToColorLocationNV           = 0;
+    PFN_vkCmdSetCoverageModulationModeNV            vkCmdSetCoverageModulationModeNV            = 0;
+    PFN_vkCmdSetCoverageModulationTableEnableNV     vkCmdSetCoverageModulationTableEnableNV     = 0;
+    PFN_vkCmdSetCoverageModulationTableNV           vkCmdSetCoverageModulationTableNV           = 0;
+    PFN_vkCmdSetShadingRateImageEnableNV            vkCmdSetShadingRateImageEnableNV            = 0;
+    PFN_vkCmdSetRepresentativeFragmentTestEnableNV  vkCmdSetRepresentativeFragmentTestEnableNV  = 0;
+    PFN_vkCmdSetCoverageReductionModeNV             vkCmdSetCoverageReductionModeNV             = 0;
+
+    //=== VK_EXT_shader_module_identifier ===
+    PFN_vkGetShaderModuleIdentifierEXT           vkGetShaderModuleIdentifierEXT           = 0;
+    PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT = 0;
+
+    //=== VK_NV_optical_flow ===
+    PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV = 0;
+    PFN_vkCreateOpticalFlowSessionNV                 vkCreateOpticalFlowSessionNV                 = 0;
+    PFN_vkDestroyOpticalFlowSessionNV                vkDestroyOpticalFlowSessionNV                = 0;
+    PFN_vkBindOpticalFlowSessionImageNV              vkBindOpticalFlowSessionImageNV              = 0;
+    PFN_vkCmdOpticalFlowExecuteNV                    vkCmdOpticalFlowExecuteNV                    = 0;
+
+    //=== VK_KHR_maintenance5 ===
+    PFN_vkCmdBindIndexBuffer2KHR             vkCmdBindIndexBuffer2KHR             = 0;
+    PFN_vkGetRenderingAreaGranularityKHR     vkGetRenderingAreaGranularityKHR     = 0;
+    PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR = 0;
+    PFN_vkGetImageSubresourceLayout2KHR      vkGetImageSubresourceLayout2KHR      = 0;
+
+    //=== VK_EXT_shader_object ===
+    PFN_vkCreateShadersEXT       vkCreateShadersEXT       = 0;
+    PFN_vkDestroyShaderEXT       vkDestroyShaderEXT       = 0;
+    PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT = 0;
+    PFN_vkCmdBindShadersEXT      vkCmdBindShadersEXT      = 0;
+
+    //=== VK_QCOM_tile_properties ===
+    PFN_vkGetFramebufferTilePropertiesQCOM      vkGetFramebufferTilePropertiesQCOM      = 0;
+    PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM = 0;
+
+    //=== VK_NV_low_latency2 ===
+    PFN_vkSetLatencySleepModeNV  vkSetLatencySleepModeNV  = 0;
+    PFN_vkLatencySleepNV         vkLatencySleepNV         = 0;
+    PFN_vkSetLatencyMarkerNV     vkSetLatencyMarkerNV     = 0;
+    PFN_vkGetLatencyTimingsNV    vkGetLatencyTimingsNV    = 0;
+    PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV = 0;
+
+    //=== VK_KHR_cooperative_matrix ===
+    PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = 0;
+
+    //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
+    PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT = 0;
+
+#if defined( VK_USE_PLATFORM_SCREEN_QNX )
+    //=== VK_QNX_external_memory_screen_buffer ===
+    PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX = 0;
+#else
+    PFN_dummy vkGetScreenBufferPropertiesQNX_placeholder                    = 0;
+#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+    //=== VK_KHR_line_rasterization ===
+    PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR = 0;
+
+    //=== VK_KHR_calibrated_timestamps ===
+    PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = 0;
+    PFN_vkGetCalibratedTimestampsKHR                   vkGetCalibratedTimestampsKHR                   = 0;
+
+    //=== VK_KHR_maintenance6 ===
+    PFN_vkCmdBindDescriptorSets2KHR                   vkCmdBindDescriptorSets2KHR                   = 0;
+    PFN_vkCmdPushConstants2KHR                        vkCmdPushConstants2KHR                        = 0;
+    PFN_vkCmdPushDescriptorSet2KHR                    vkCmdPushDescriptorSet2KHR                    = 0;
+    PFN_vkCmdPushDescriptorSetWithTemplate2KHR        vkCmdPushDescriptorSetWithTemplate2KHR        = 0;
+    PFN_vkCmdSetDescriptorBufferOffsets2EXT           vkCmdSetDescriptorBufferOffsets2EXT           = 0;
+    PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT vkCmdBindDescriptorBufferEmbeddedSamplers2EXT = 0;
+
+  public:
+    DispatchLoaderDynamic() VULKAN_HPP_NOEXCEPT                                    = default;
+    DispatchLoaderDynamic( DispatchLoaderDynamic const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    DispatchLoaderDynamic( PFN_vkGetInstanceProcAddr getInstanceProcAddr ) VULKAN_HPP_NOEXCEPT
     {
-    public:
+      init( getInstanceProcAddr );
+    }
+
+    // This interface does not require a linked vulkan library.
+    DispatchLoaderDynamic( VkInstance                instance,
+                           PFN_vkGetInstanceProcAddr getInstanceProcAddr,
+                           VkDevice                  device            = {},
+                           PFN_vkGetDeviceProcAddr   getDeviceProcAddr = nullptr ) VULKAN_HPP_NOEXCEPT
+    {
+      init( instance, getInstanceProcAddr, device, getDeviceProcAddr );
+    }
+
+    template <typename DynamicLoader
+#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
+              = VULKAN_HPP_NAMESPACE::DynamicLoader
+#endif
+              >
+    void init()
+    {
+      static DynamicLoader dl;
+      init( dl );
+    }
+
+    template <typename DynamicLoader>
+    void init( DynamicLoader const & dl ) VULKAN_HPP_NOEXCEPT
+    {
+      PFN_vkGetInstanceProcAddr getInstanceProcAddr = dl.template getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" );
+      init( getInstanceProcAddr );
+    }
+
+    void init( PFN_vkGetInstanceProcAddr getInstanceProcAddr ) VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getInstanceProcAddr );
+
+      vkGetInstanceProcAddr = getInstanceProcAddr;
+
       //=== VK_VERSION_1_0 ===
-      PFN_vkCreateInstance                               vkCreateInstance                               = 0;
-      PFN_vkDestroyInstance                              vkDestroyInstance                              = 0;
-      PFN_vkEnumeratePhysicalDevices                     vkEnumeratePhysicalDevices                     = 0;
-      PFN_vkGetPhysicalDeviceFeatures                    vkGetPhysicalDeviceFeatures                    = 0;
-      PFN_vkGetPhysicalDeviceFormatProperties            vkGetPhysicalDeviceFormatProperties            = 0;
-      PFN_vkGetPhysicalDeviceImageFormatProperties       vkGetPhysicalDeviceImageFormatProperties       = 0;
-      PFN_vkGetPhysicalDeviceProperties                  vkGetPhysicalDeviceProperties                  = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyProperties       vkGetPhysicalDeviceQueueFamilyProperties       = 0;
-      PFN_vkGetPhysicalDeviceMemoryProperties            vkGetPhysicalDeviceMemoryProperties            = 0;
-      PFN_vkGetInstanceProcAddr                          vkGetInstanceProcAddr                          = 0;
-      PFN_vkGetDeviceProcAddr                            vkGetDeviceProcAddr                            = 0;
-      PFN_vkCreateDevice                                 vkCreateDevice                                 = 0;
-      PFN_vkDestroyDevice                                vkDestroyDevice                                = 0;
-      PFN_vkEnumerateInstanceExtensionProperties         vkEnumerateInstanceExtensionProperties         = 0;
-      PFN_vkEnumerateDeviceExtensionProperties           vkEnumerateDeviceExtensionProperties           = 0;
-      PFN_vkEnumerateInstanceLayerProperties             vkEnumerateInstanceLayerProperties             = 0;
-      PFN_vkEnumerateDeviceLayerProperties               vkEnumerateDeviceLayerProperties               = 0;
-      PFN_vkGetDeviceQueue                               vkGetDeviceQueue                               = 0;
-      PFN_vkQueueSubmit                                  vkQueueSubmit                                  = 0;
-      PFN_vkQueueWaitIdle                                vkQueueWaitIdle                                = 0;
-      PFN_vkDeviceWaitIdle                               vkDeviceWaitIdle                               = 0;
-      PFN_vkAllocateMemory                               vkAllocateMemory                               = 0;
-      PFN_vkFreeMemory                                   vkFreeMemory                                   = 0;
-      PFN_vkMapMemory                                    vkMapMemory                                    = 0;
-      PFN_vkUnmapMemory                                  vkUnmapMemory                                  = 0;
-      PFN_vkFlushMappedMemoryRanges                      vkFlushMappedMemoryRanges                      = 0;
-      PFN_vkInvalidateMappedMemoryRanges                 vkInvalidateMappedMemoryRanges                 = 0;
-      PFN_vkGetDeviceMemoryCommitment                    vkGetDeviceMemoryCommitment                    = 0;
-      PFN_vkBindBufferMemory                             vkBindBufferMemory                             = 0;
-      PFN_vkBindImageMemory                              vkBindImageMemory                              = 0;
-      PFN_vkGetBufferMemoryRequirements                  vkGetBufferMemoryRequirements                  = 0;
-      PFN_vkGetImageMemoryRequirements                   vkGetImageMemoryRequirements                   = 0;
-      PFN_vkGetImageSparseMemoryRequirements             vkGetImageSparseMemoryRequirements             = 0;
-      PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties = 0;
-      PFN_vkQueueBindSparse                              vkQueueBindSparse                              = 0;
-      PFN_vkCreateFence                                  vkCreateFence                                  = 0;
-      PFN_vkDestroyFence                                 vkDestroyFence                                 = 0;
-      PFN_vkResetFences                                  vkResetFences                                  = 0;
-      PFN_vkGetFenceStatus                               vkGetFenceStatus                               = 0;
-      PFN_vkWaitForFences                                vkWaitForFences                                = 0;
-      PFN_vkCreateSemaphore                              vkCreateSemaphore                              = 0;
-      PFN_vkDestroySemaphore                             vkDestroySemaphore                             = 0;
-      PFN_vkCreateQueryPool                              vkCreateQueryPool                              = 0;
-      PFN_vkDestroyQueryPool                             vkDestroyQueryPool                             = 0;
-      PFN_vkGetQueryPoolResults                          vkGetQueryPoolResults                          = 0;
-      PFN_vkCreateBuffer                                 vkCreateBuffer                                 = 0;
-      PFN_vkDestroyBuffer                                vkDestroyBuffer                                = 0;
-      PFN_vkCreateImage                                  vkCreateImage                                  = 0;
-      PFN_vkDestroyImage                                 vkDestroyImage                                 = 0;
-      PFN_vkGetImageSubresourceLayout                    vkGetImageSubresourceLayout                    = 0;
-      PFN_vkCreateImageView                              vkCreateImageView                              = 0;
-      PFN_vkDestroyImageView                             vkDestroyImageView                             = 0;
-      PFN_vkCreateCommandPool                            vkCreateCommandPool                            = 0;
-      PFN_vkDestroyCommandPool                           vkDestroyCommandPool                           = 0;
-      PFN_vkResetCommandPool                             vkResetCommandPool                             = 0;
-      PFN_vkAllocateCommandBuffers                       vkAllocateCommandBuffers                       = 0;
-      PFN_vkFreeCommandBuffers                           vkFreeCommandBuffers                           = 0;
-      PFN_vkBeginCommandBuffer                           vkBeginCommandBuffer                           = 0;
-      PFN_vkEndCommandBuffer                             vkEndCommandBuffer                             = 0;
-      PFN_vkResetCommandBuffer                           vkResetCommandBuffer                           = 0;
-      PFN_vkCmdCopyBuffer                                vkCmdCopyBuffer                                = 0;
-      PFN_vkCmdCopyImage                                 vkCmdCopyImage                                 = 0;
-      PFN_vkCmdCopyBufferToImage                         vkCmdCopyBufferToImage                         = 0;
-      PFN_vkCmdCopyImageToBuffer                         vkCmdCopyImageToBuffer                         = 0;
-      PFN_vkCmdUpdateBuffer                              vkCmdUpdateBuffer                              = 0;
-      PFN_vkCmdFillBuffer                                vkCmdFillBuffer                                = 0;
-      PFN_vkCmdPipelineBarrier                           vkCmdPipelineBarrier                           = 0;
-      PFN_vkCmdBeginQuery                                vkCmdBeginQuery                                = 0;
-      PFN_vkCmdEndQuery                                  vkCmdEndQuery                                  = 0;
-      PFN_vkCmdResetQueryPool                            vkCmdResetQueryPool                            = 0;
-      PFN_vkCmdWriteTimestamp                            vkCmdWriteTimestamp                            = 0;
-      PFN_vkCmdCopyQueryPoolResults                      vkCmdCopyQueryPoolResults                      = 0;
-      PFN_vkCmdExecuteCommands                           vkCmdExecuteCommands                           = 0;
-      PFN_vkCreateEvent                                  vkCreateEvent                                  = 0;
-      PFN_vkDestroyEvent                                 vkDestroyEvent                                 = 0;
-      PFN_vkGetEventStatus                               vkGetEventStatus                               = 0;
-      PFN_vkSetEvent                                     vkSetEvent                                     = 0;
-      PFN_vkResetEvent                                   vkResetEvent                                   = 0;
-      PFN_vkCreateBufferView                             vkCreateBufferView                             = 0;
-      PFN_vkDestroyBufferView                            vkDestroyBufferView                            = 0;
-      PFN_vkCreateShaderModule                           vkCreateShaderModule                           = 0;
-      PFN_vkDestroyShaderModule                          vkDestroyShaderModule                          = 0;
-      PFN_vkCreatePipelineCache                          vkCreatePipelineCache                          = 0;
-      PFN_vkDestroyPipelineCache                         vkDestroyPipelineCache                         = 0;
-      PFN_vkGetPipelineCacheData                         vkGetPipelineCacheData                         = 0;
-      PFN_vkMergePipelineCaches                          vkMergePipelineCaches                          = 0;
-      PFN_vkCreateComputePipelines                       vkCreateComputePipelines                       = 0;
-      PFN_vkDestroyPipeline                              vkDestroyPipeline                              = 0;
-      PFN_vkCreatePipelineLayout                         vkCreatePipelineLayout                         = 0;
-      PFN_vkDestroyPipelineLayout                        vkDestroyPipelineLayout                        = 0;
-      PFN_vkCreateSampler                                vkCreateSampler                                = 0;
-      PFN_vkDestroySampler                               vkDestroySampler                               = 0;
-      PFN_vkCreateDescriptorSetLayout                    vkCreateDescriptorSetLayout                    = 0;
-      PFN_vkDestroyDescriptorSetLayout                   vkDestroyDescriptorSetLayout                   = 0;
-      PFN_vkCreateDescriptorPool                         vkCreateDescriptorPool                         = 0;
-      PFN_vkDestroyDescriptorPool                        vkDestroyDescriptorPool                        = 0;
-      PFN_vkResetDescriptorPool                          vkResetDescriptorPool                          = 0;
-      PFN_vkAllocateDescriptorSets                       vkAllocateDescriptorSets                       = 0;
-      PFN_vkFreeDescriptorSets                           vkFreeDescriptorSets                           = 0;
-      PFN_vkUpdateDescriptorSets                         vkUpdateDescriptorSets                         = 0;
-      PFN_vkCmdBindPipeline                              vkCmdBindPipeline                              = 0;
-      PFN_vkCmdBindDescriptorSets                        vkCmdBindDescriptorSets                        = 0;
-      PFN_vkCmdClearColorImage                           vkCmdClearColorImage                           = 0;
-      PFN_vkCmdDispatch                                  vkCmdDispatch                                  = 0;
-      PFN_vkCmdDispatchIndirect                          vkCmdDispatchIndirect                          = 0;
-      PFN_vkCmdSetEvent                                  vkCmdSetEvent                                  = 0;
-      PFN_vkCmdResetEvent                                vkCmdResetEvent                                = 0;
-      PFN_vkCmdWaitEvents                                vkCmdWaitEvents                                = 0;
-      PFN_vkCmdPushConstants                             vkCmdPushConstants                             = 0;
-      PFN_vkCreateGraphicsPipelines                      vkCreateGraphicsPipelines                      = 0;
-      PFN_vkCreateFramebuffer                            vkCreateFramebuffer                            = 0;
-      PFN_vkDestroyFramebuffer                           vkDestroyFramebuffer                           = 0;
-      PFN_vkCreateRenderPass                             vkCreateRenderPass                             = 0;
-      PFN_vkDestroyRenderPass                            vkDestroyRenderPass                            = 0;
-      PFN_vkGetRenderAreaGranularity                     vkGetRenderAreaGranularity                     = 0;
-      PFN_vkCmdSetViewport                               vkCmdSetViewport                               = 0;
-      PFN_vkCmdSetScissor                                vkCmdSetScissor                                = 0;
-      PFN_vkCmdSetLineWidth                              vkCmdSetLineWidth                              = 0;
-      PFN_vkCmdSetDepthBias                              vkCmdSetDepthBias                              = 0;
-      PFN_vkCmdSetBlendConstants                         vkCmdSetBlendConstants                         = 0;
-      PFN_vkCmdSetDepthBounds                            vkCmdSetDepthBounds                            = 0;
-      PFN_vkCmdSetStencilCompareMask                     vkCmdSetStencilCompareMask                     = 0;
-      PFN_vkCmdSetStencilWriteMask                       vkCmdSetStencilWriteMask                       = 0;
-      PFN_vkCmdSetStencilReference                       vkCmdSetStencilReference                       = 0;
-      PFN_vkCmdBindIndexBuffer                           vkCmdBindIndexBuffer                           = 0;
-      PFN_vkCmdBindVertexBuffers                         vkCmdBindVertexBuffers                         = 0;
-      PFN_vkCmdDraw                                      vkCmdDraw                                      = 0;
-      PFN_vkCmdDrawIndexed                               vkCmdDrawIndexed                               = 0;
-      PFN_vkCmdDrawIndirect                              vkCmdDrawIndirect                              = 0;
-      PFN_vkCmdDrawIndexedIndirect                       vkCmdDrawIndexedIndirect                       = 0;
-      PFN_vkCmdBlitImage                                 vkCmdBlitImage                                 = 0;
-      PFN_vkCmdClearDepthStencilImage                    vkCmdClearDepthStencilImage                    = 0;
-      PFN_vkCmdClearAttachments                          vkCmdClearAttachments                          = 0;
-      PFN_vkCmdResolveImage                              vkCmdResolveImage                              = 0;
-      PFN_vkCmdBeginRenderPass                           vkCmdBeginRenderPass                           = 0;
-      PFN_vkCmdNextSubpass                               vkCmdNextSubpass                               = 0;
-      PFN_vkCmdEndRenderPass                             vkCmdEndRenderPass                             = 0;
+      vkCreateInstance = PFN_vkCreateInstance( vkGetInstanceProcAddr( NULL, "vkCreateInstance" ) );
+      vkEnumerateInstanceExtensionProperties =
+        PFN_vkEnumerateInstanceExtensionProperties( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceExtensionProperties" ) );
+      vkEnumerateInstanceLayerProperties = PFN_vkEnumerateInstanceLayerProperties( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceLayerProperties" ) );
 
       //=== VK_VERSION_1_1 ===
-      PFN_vkEnumerateInstanceVersion                      vkEnumerateInstanceVersion                      = 0;
-      PFN_vkBindBufferMemory2                             vkBindBufferMemory2                             = 0;
-      PFN_vkBindImageMemory2                              vkBindImageMemory2                              = 0;
-      PFN_vkGetDeviceGroupPeerMemoryFeatures              vkGetDeviceGroupPeerMemoryFeatures              = 0;
-      PFN_vkCmdSetDeviceMask                              vkCmdSetDeviceMask                              = 0;
-      PFN_vkEnumeratePhysicalDeviceGroups                 vkEnumeratePhysicalDeviceGroups                 = 0;
-      PFN_vkGetImageMemoryRequirements2                   vkGetImageMemoryRequirements2                   = 0;
-      PFN_vkGetBufferMemoryRequirements2                  vkGetBufferMemoryRequirements2                  = 0;
-      PFN_vkGetImageSparseMemoryRequirements2             vkGetImageSparseMemoryRequirements2             = 0;
-      PFN_vkGetPhysicalDeviceFeatures2                    vkGetPhysicalDeviceFeatures2                    = 0;
-      PFN_vkGetPhysicalDeviceProperties2                  vkGetPhysicalDeviceProperties2                  = 0;
-      PFN_vkGetPhysicalDeviceFormatProperties2            vkGetPhysicalDeviceFormatProperties2            = 0;
-      PFN_vkGetPhysicalDeviceImageFormatProperties2       vkGetPhysicalDeviceImageFormatProperties2       = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyProperties2       vkGetPhysicalDeviceQueueFamilyProperties2       = 0;
-      PFN_vkGetPhysicalDeviceMemoryProperties2            vkGetPhysicalDeviceMemoryProperties2            = 0;
-      PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2 = 0;
-      PFN_vkTrimCommandPool                               vkTrimCommandPool                               = 0;
-      PFN_vkGetDeviceQueue2                               vkGetDeviceQueue2                               = 0;
-      PFN_vkGetPhysicalDeviceExternalBufferProperties     vkGetPhysicalDeviceExternalBufferProperties     = 0;
-      PFN_vkGetPhysicalDeviceExternalFenceProperties      vkGetPhysicalDeviceExternalFenceProperties      = 0;
-      PFN_vkGetPhysicalDeviceExternalSemaphoreProperties  vkGetPhysicalDeviceExternalSemaphoreProperties  = 0;
-      PFN_vkCmdDispatchBase                               vkCmdDispatchBase                               = 0;
-      PFN_vkCreateDescriptorUpdateTemplate                vkCreateDescriptorUpdateTemplate                = 0;
-      PFN_vkDestroyDescriptorUpdateTemplate               vkDestroyDescriptorUpdateTemplate               = 0;
-      PFN_vkUpdateDescriptorSetWithTemplate               vkUpdateDescriptorSetWithTemplate               = 0;
-      PFN_vkGetDescriptorSetLayoutSupport                 vkGetDescriptorSetLayoutSupport                 = 0;
-      PFN_vkCreateSamplerYcbcrConversion                  vkCreateSamplerYcbcrConversion                  = 0;
-      PFN_vkDestroySamplerYcbcrConversion                 vkDestroySamplerYcbcrConversion                 = 0;
+      vkEnumerateInstanceVersion = PFN_vkEnumerateInstanceVersion( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceVersion" ) );
+    }
+
+    // This interface does not require a linked vulkan library.
+    void init( VkInstance                instance,
+               PFN_vkGetInstanceProcAddr getInstanceProcAddr,
+               VkDevice                  device              = {},
+               PFN_vkGetDeviceProcAddr /*getDeviceProcAddr*/ = nullptr ) VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( instance && getInstanceProcAddr );
+      vkGetInstanceProcAddr = getInstanceProcAddr;
+      init( VULKAN_HPP_NAMESPACE::Instance( instance ) );
+      if ( device )
+      {
+        init( VULKAN_HPP_NAMESPACE::Device( device ) );
+      }
+    }
+
+    void init( VULKAN_HPP_NAMESPACE::Instance instanceCpp ) VULKAN_HPP_NOEXCEPT
+    {
+      VkInstance instance = static_cast<VkInstance>( instanceCpp );
+
+      //=== VK_VERSION_1_0 ===
+      vkDestroyInstance                   = PFN_vkDestroyInstance( vkGetInstanceProcAddr( instance, "vkDestroyInstance" ) );
+      vkEnumeratePhysicalDevices          = PFN_vkEnumeratePhysicalDevices( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDevices" ) );
+      vkGetPhysicalDeviceFeatures         = PFN_vkGetPhysicalDeviceFeatures( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures" ) );
+      vkGetPhysicalDeviceFormatProperties = PFN_vkGetPhysicalDeviceFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties" ) );
+      vkGetPhysicalDeviceImageFormatProperties =
+        PFN_vkGetPhysicalDeviceImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties" ) );
+      vkGetPhysicalDeviceProperties = PFN_vkGetPhysicalDeviceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties" ) );
+      vkGetPhysicalDeviceQueueFamilyProperties =
+        PFN_vkGetPhysicalDeviceQueueFamilyProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) );
+      vkGetPhysicalDeviceMemoryProperties = PFN_vkGetPhysicalDeviceMemoryProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) );
+      vkGetDeviceProcAddr                 = PFN_vkGetDeviceProcAddr( vkGetInstanceProcAddr( instance, "vkGetDeviceProcAddr" ) );
+      vkCreateDevice                      = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
+      vkDestroyDevice                     = PFN_vkDestroyDevice( vkGetInstanceProcAddr( instance, "vkDestroyDevice" ) );
+      vkEnumerateDeviceExtensionProperties =
+        PFN_vkEnumerateDeviceExtensionProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) );
+      vkEnumerateDeviceLayerProperties   = PFN_vkEnumerateDeviceLayerProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceLayerProperties" ) );
+      vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetInstanceProcAddr( instance, "vkGetDeviceQueue" ) );
+      vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetInstanceProcAddr( instance, "vkQueueSubmit" ) );
+      vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetInstanceProcAddr( instance, "vkQueueWaitIdle" ) );
+      vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetInstanceProcAddr( instance, "vkDeviceWaitIdle" ) );
+      vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetInstanceProcAddr( instance, "vkAllocateMemory" ) );
+      vkFreeMemory                       = PFN_vkFreeMemory( vkGetInstanceProcAddr( instance, "vkFreeMemory" ) );
+      vkMapMemory                        = PFN_vkMapMemory( vkGetInstanceProcAddr( instance, "vkMapMemory" ) );
+      vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetInstanceProcAddr( instance, "vkUnmapMemory" ) );
+      vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetInstanceProcAddr( instance, "vkFlushMappedMemoryRanges" ) );
+      vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetInstanceProcAddr( instance, "vkInvalidateMappedMemoryRanges" ) );
+      vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryCommitment" ) );
+      vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetInstanceProcAddr( instance, "vkBindBufferMemory" ) );
+      vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetInstanceProcAddr( instance, "vkBindImageMemory" ) );
+      vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements" ) );
+      vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements" ) );
+      vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements" ) );
+      vkGetPhysicalDeviceSparseImageFormatProperties =
+        PFN_vkGetPhysicalDeviceSparseImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties" ) );
+      vkQueueBindSparse            = PFN_vkQueueBindSparse( vkGetInstanceProcAddr( instance, "vkQueueBindSparse" ) );
+      vkCreateFence                = PFN_vkCreateFence( vkGetInstanceProcAddr( instance, "vkCreateFence" ) );
+      vkDestroyFence               = PFN_vkDestroyFence( vkGetInstanceProcAddr( instance, "vkDestroyFence" ) );
+      vkResetFences                = PFN_vkResetFences( vkGetInstanceProcAddr( instance, "vkResetFences" ) );
+      vkGetFenceStatus             = PFN_vkGetFenceStatus( vkGetInstanceProcAddr( instance, "vkGetFenceStatus" ) );
+      vkWaitForFences              = PFN_vkWaitForFences( vkGetInstanceProcAddr( instance, "vkWaitForFences" ) );
+      vkCreateSemaphore            = PFN_vkCreateSemaphore( vkGetInstanceProcAddr( instance, "vkCreateSemaphore" ) );
+      vkDestroySemaphore           = PFN_vkDestroySemaphore( vkGetInstanceProcAddr( instance, "vkDestroySemaphore" ) );
+      vkCreateEvent                = PFN_vkCreateEvent( vkGetInstanceProcAddr( instance, "vkCreateEvent" ) );
+      vkDestroyEvent               = PFN_vkDestroyEvent( vkGetInstanceProcAddr( instance, "vkDestroyEvent" ) );
+      vkGetEventStatus             = PFN_vkGetEventStatus( vkGetInstanceProcAddr( instance, "vkGetEventStatus" ) );
+      vkSetEvent                   = PFN_vkSetEvent( vkGetInstanceProcAddr( instance, "vkSetEvent" ) );
+      vkResetEvent                 = PFN_vkResetEvent( vkGetInstanceProcAddr( instance, "vkResetEvent" ) );
+      vkCreateQueryPool            = PFN_vkCreateQueryPool( vkGetInstanceProcAddr( instance, "vkCreateQueryPool" ) );
+      vkDestroyQueryPool           = PFN_vkDestroyQueryPool( vkGetInstanceProcAddr( instance, "vkDestroyQueryPool" ) );
+      vkGetQueryPoolResults        = PFN_vkGetQueryPoolResults( vkGetInstanceProcAddr( instance, "vkGetQueryPoolResults" ) );
+      vkCreateBuffer               = PFN_vkCreateBuffer( vkGetInstanceProcAddr( instance, "vkCreateBuffer" ) );
+      vkDestroyBuffer              = PFN_vkDestroyBuffer( vkGetInstanceProcAddr( instance, "vkDestroyBuffer" ) );
+      vkCreateBufferView           = PFN_vkCreateBufferView( vkGetInstanceProcAddr( instance, "vkCreateBufferView" ) );
+      vkDestroyBufferView          = PFN_vkDestroyBufferView( vkGetInstanceProcAddr( instance, "vkDestroyBufferView" ) );
+      vkCreateImage                = PFN_vkCreateImage( vkGetInstanceProcAddr( instance, "vkCreateImage" ) );
+      vkDestroyImage               = PFN_vkDestroyImage( vkGetInstanceProcAddr( instance, "vkDestroyImage" ) );
+      vkGetImageSubresourceLayout  = PFN_vkGetImageSubresourceLayout( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout" ) );
+      vkCreateImageView            = PFN_vkCreateImageView( vkGetInstanceProcAddr( instance, "vkCreateImageView" ) );
+      vkDestroyImageView           = PFN_vkDestroyImageView( vkGetInstanceProcAddr( instance, "vkDestroyImageView" ) );
+      vkCreateShaderModule         = PFN_vkCreateShaderModule( vkGetInstanceProcAddr( instance, "vkCreateShaderModule" ) );
+      vkDestroyShaderModule        = PFN_vkDestroyShaderModule( vkGetInstanceProcAddr( instance, "vkDestroyShaderModule" ) );
+      vkCreatePipelineCache        = PFN_vkCreatePipelineCache( vkGetInstanceProcAddr( instance, "vkCreatePipelineCache" ) );
+      vkDestroyPipelineCache       = PFN_vkDestroyPipelineCache( vkGetInstanceProcAddr( instance, "vkDestroyPipelineCache" ) );
+      vkGetPipelineCacheData       = PFN_vkGetPipelineCacheData( vkGetInstanceProcAddr( instance, "vkGetPipelineCacheData" ) );
+      vkMergePipelineCaches        = PFN_vkMergePipelineCaches( vkGetInstanceProcAddr( instance, "vkMergePipelineCaches" ) );
+      vkCreateGraphicsPipelines    = PFN_vkCreateGraphicsPipelines( vkGetInstanceProcAddr( instance, "vkCreateGraphicsPipelines" ) );
+      vkCreateComputePipelines     = PFN_vkCreateComputePipelines( vkGetInstanceProcAddr( instance, "vkCreateComputePipelines" ) );
+      vkDestroyPipeline            = PFN_vkDestroyPipeline( vkGetInstanceProcAddr( instance, "vkDestroyPipeline" ) );
+      vkCreatePipelineLayout       = PFN_vkCreatePipelineLayout( vkGetInstanceProcAddr( instance, "vkCreatePipelineLayout" ) );
+      vkDestroyPipelineLayout      = PFN_vkDestroyPipelineLayout( vkGetInstanceProcAddr( instance, "vkDestroyPipelineLayout" ) );
+      vkCreateSampler              = PFN_vkCreateSampler( vkGetInstanceProcAddr( instance, "vkCreateSampler" ) );
+      vkDestroySampler             = PFN_vkDestroySampler( vkGetInstanceProcAddr( instance, "vkDestroySampler" ) );
+      vkCreateDescriptorSetLayout  = PFN_vkCreateDescriptorSetLayout( vkGetInstanceProcAddr( instance, "vkCreateDescriptorSetLayout" ) );
+      vkDestroyDescriptorSetLayout = PFN_vkDestroyDescriptorSetLayout( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorSetLayout" ) );
+      vkCreateDescriptorPool       = PFN_vkCreateDescriptorPool( vkGetInstanceProcAddr( instance, "vkCreateDescriptorPool" ) );
+      vkDestroyDescriptorPool      = PFN_vkDestroyDescriptorPool( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorPool" ) );
+      vkResetDescriptorPool        = PFN_vkResetDescriptorPool( vkGetInstanceProcAddr( instance, "vkResetDescriptorPool" ) );
+      vkAllocateDescriptorSets     = PFN_vkAllocateDescriptorSets( vkGetInstanceProcAddr( instance, "vkAllocateDescriptorSets" ) );
+      vkFreeDescriptorSets         = PFN_vkFreeDescriptorSets( vkGetInstanceProcAddr( instance, "vkFreeDescriptorSets" ) );
+      vkUpdateDescriptorSets       = PFN_vkUpdateDescriptorSets( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSets" ) );
+      vkCreateFramebuffer          = PFN_vkCreateFramebuffer( vkGetInstanceProcAddr( instance, "vkCreateFramebuffer" ) );
+      vkDestroyFramebuffer         = PFN_vkDestroyFramebuffer( vkGetInstanceProcAddr( instance, "vkDestroyFramebuffer" ) );
+      vkCreateRenderPass           = PFN_vkCreateRenderPass( vkGetInstanceProcAddr( instance, "vkCreateRenderPass" ) );
+      vkDestroyRenderPass          = PFN_vkDestroyRenderPass( vkGetInstanceProcAddr( instance, "vkDestroyRenderPass" ) );
+      vkGetRenderAreaGranularity   = PFN_vkGetRenderAreaGranularity( vkGetInstanceProcAddr( instance, "vkGetRenderAreaGranularity" ) );
+      vkCreateCommandPool          = PFN_vkCreateCommandPool( vkGetInstanceProcAddr( instance, "vkCreateCommandPool" ) );
+      vkDestroyCommandPool         = PFN_vkDestroyCommandPool( vkGetInstanceProcAddr( instance, "vkDestroyCommandPool" ) );
+      vkResetCommandPool           = PFN_vkResetCommandPool( vkGetInstanceProcAddr( instance, "vkResetCommandPool" ) );
+      vkAllocateCommandBuffers     = PFN_vkAllocateCommandBuffers( vkGetInstanceProcAddr( instance, "vkAllocateCommandBuffers" ) );
+      vkFreeCommandBuffers         = PFN_vkFreeCommandBuffers( vkGetInstanceProcAddr( instance, "vkFreeCommandBuffers" ) );
+      vkBeginCommandBuffer         = PFN_vkBeginCommandBuffer( vkGetInstanceProcAddr( instance, "vkBeginCommandBuffer" ) );
+      vkEndCommandBuffer           = PFN_vkEndCommandBuffer( vkGetInstanceProcAddr( instance, "vkEndCommandBuffer" ) );
+      vkResetCommandBuffer         = PFN_vkResetCommandBuffer( vkGetInstanceProcAddr( instance, "vkResetCommandBuffer" ) );
+      vkCmdBindPipeline            = PFN_vkCmdBindPipeline( vkGetInstanceProcAddr( instance, "vkCmdBindPipeline" ) );
+      vkCmdSetViewport             = PFN_vkCmdSetViewport( vkGetInstanceProcAddr( instance, "vkCmdSetViewport" ) );
+      vkCmdSetScissor              = PFN_vkCmdSetScissor( vkGetInstanceProcAddr( instance, "vkCmdSetScissor" ) );
+      vkCmdSetLineWidth            = PFN_vkCmdSetLineWidth( vkGetInstanceProcAddr( instance, "vkCmdSetLineWidth" ) );
+      vkCmdSetDepthBias            = PFN_vkCmdSetDepthBias( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBias" ) );
+      vkCmdSetBlendConstants       = PFN_vkCmdSetBlendConstants( vkGetInstanceProcAddr( instance, "vkCmdSetBlendConstants" ) );
+      vkCmdSetDepthBounds          = PFN_vkCmdSetDepthBounds( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBounds" ) );
+      vkCmdSetStencilCompareMask   = PFN_vkCmdSetStencilCompareMask( vkGetInstanceProcAddr( instance, "vkCmdSetStencilCompareMask" ) );
+      vkCmdSetStencilWriteMask     = PFN_vkCmdSetStencilWriteMask( vkGetInstanceProcAddr( instance, "vkCmdSetStencilWriteMask" ) );
+      vkCmdSetStencilReference     = PFN_vkCmdSetStencilReference( vkGetInstanceProcAddr( instance, "vkCmdSetStencilReference" ) );
+      vkCmdBindDescriptorSets      = PFN_vkCmdBindDescriptorSets( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorSets" ) );
+      vkCmdBindIndexBuffer         = PFN_vkCmdBindIndexBuffer( vkGetInstanceProcAddr( instance, "vkCmdBindIndexBuffer" ) );
+      vkCmdBindVertexBuffers       = PFN_vkCmdBindVertexBuffers( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers" ) );
+      vkCmdDraw                    = PFN_vkCmdDraw( vkGetInstanceProcAddr( instance, "vkCmdDraw" ) );
+      vkCmdDrawIndexed             = PFN_vkCmdDrawIndexed( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexed" ) );
+      vkCmdDrawIndirect            = PFN_vkCmdDrawIndirect( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirect" ) );
+      vkCmdDrawIndexedIndirect     = PFN_vkCmdDrawIndexedIndirect( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirect" ) );
+      vkCmdDispatch                = PFN_vkCmdDispatch( vkGetInstanceProcAddr( instance, "vkCmdDispatch" ) );
+      vkCmdDispatchIndirect        = PFN_vkCmdDispatchIndirect( vkGetInstanceProcAddr( instance, "vkCmdDispatchIndirect" ) );
+      vkCmdCopyBuffer              = PFN_vkCmdCopyBuffer( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer" ) );
+      vkCmdCopyImage               = PFN_vkCmdCopyImage( vkGetInstanceProcAddr( instance, "vkCmdCopyImage" ) );
+      vkCmdBlitImage               = PFN_vkCmdBlitImage( vkGetInstanceProcAddr( instance, "vkCmdBlitImage" ) );
+      vkCmdCopyBufferToImage       = PFN_vkCmdCopyBufferToImage( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage" ) );
+      vkCmdCopyImageToBuffer       = PFN_vkCmdCopyImageToBuffer( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer" ) );
+      vkCmdUpdateBuffer            = PFN_vkCmdUpdateBuffer( vkGetInstanceProcAddr( instance, "vkCmdUpdateBuffer" ) );
+      vkCmdFillBuffer              = PFN_vkCmdFillBuffer( vkGetInstanceProcAddr( instance, "vkCmdFillBuffer" ) );
+      vkCmdClearColorImage         = PFN_vkCmdClearColorImage( vkGetInstanceProcAddr( instance, "vkCmdClearColorImage" ) );
+      vkCmdClearDepthStencilImage  = PFN_vkCmdClearDepthStencilImage( vkGetInstanceProcAddr( instance, "vkCmdClearDepthStencilImage" ) );
+      vkCmdClearAttachments        = PFN_vkCmdClearAttachments( vkGetInstanceProcAddr( instance, "vkCmdClearAttachments" ) );
+      vkCmdResolveImage            = PFN_vkCmdResolveImage( vkGetInstanceProcAddr( instance, "vkCmdResolveImage" ) );
+      vkCmdSetEvent                = PFN_vkCmdSetEvent( vkGetInstanceProcAddr( instance, "vkCmdSetEvent" ) );
+      vkCmdResetEvent              = PFN_vkCmdResetEvent( vkGetInstanceProcAddr( instance, "vkCmdResetEvent" ) );
+      vkCmdWaitEvents              = PFN_vkCmdWaitEvents( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents" ) );
+      vkCmdPipelineBarrier         = PFN_vkCmdPipelineBarrier( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier" ) );
+      vkCmdBeginQuery              = PFN_vkCmdBeginQuery( vkGetInstanceProcAddr( instance, "vkCmdBeginQuery" ) );
+      vkCmdEndQuery                = PFN_vkCmdEndQuery( vkGetInstanceProcAddr( instance, "vkCmdEndQuery" ) );
+      vkCmdResetQueryPool          = PFN_vkCmdResetQueryPool( vkGetInstanceProcAddr( instance, "vkCmdResetQueryPool" ) );
+      vkCmdWriteTimestamp          = PFN_vkCmdWriteTimestamp( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp" ) );
+      vkCmdCopyQueryPoolResults    = PFN_vkCmdCopyQueryPoolResults( vkGetInstanceProcAddr( instance, "vkCmdCopyQueryPoolResults" ) );
+      vkCmdPushConstants           = PFN_vkCmdPushConstants( vkGetInstanceProcAddr( instance, "vkCmdPushConstants" ) );
+      vkCmdBeginRenderPass         = PFN_vkCmdBeginRenderPass( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass" ) );
+      vkCmdNextSubpass             = PFN_vkCmdNextSubpass( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass" ) );
+      vkCmdEndRenderPass           = PFN_vkCmdEndRenderPass( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass" ) );
+      vkCmdExecuteCommands         = PFN_vkCmdExecuteCommands( vkGetInstanceProcAddr( instance, "vkCmdExecuteCommands" ) );
+
+      //=== VK_VERSION_1_1 ===
+      vkBindBufferMemory2                 = PFN_vkBindBufferMemory2( vkGetInstanceProcAddr( instance, "vkBindBufferMemory2" ) );
+      vkBindImageMemory2                  = PFN_vkBindImageMemory2( vkGetInstanceProcAddr( instance, "vkBindImageMemory2" ) );
+      vkGetDeviceGroupPeerMemoryFeatures  = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPeerMemoryFeatures" ) );
+      vkCmdSetDeviceMask                  = PFN_vkCmdSetDeviceMask( vkGetInstanceProcAddr( instance, "vkCmdSetDeviceMask" ) );
+      vkCmdDispatchBase                   = PFN_vkCmdDispatchBase( vkGetInstanceProcAddr( instance, "vkCmdDispatchBase" ) );
+      vkEnumeratePhysicalDeviceGroups     = PFN_vkEnumeratePhysicalDeviceGroups( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroups" ) );
+      vkGetImageMemoryRequirements2       = PFN_vkGetImageMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements2" ) );
+      vkGetBufferMemoryRequirements2      = PFN_vkGetBufferMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements2" ) );
+      vkGetImageSparseMemoryRequirements2 = PFN_vkGetImageSparseMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements2" ) );
+      vkGetPhysicalDeviceFeatures2        = PFN_vkGetPhysicalDeviceFeatures2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2" ) );
+      vkGetPhysicalDeviceProperties2      = PFN_vkGetPhysicalDeviceProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2" ) );
+      vkGetPhysicalDeviceFormatProperties2 =
+        PFN_vkGetPhysicalDeviceFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2" ) );
+      vkGetPhysicalDeviceImageFormatProperties2 =
+        PFN_vkGetPhysicalDeviceImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2" ) );
+      vkGetPhysicalDeviceQueueFamilyProperties2 =
+        PFN_vkGetPhysicalDeviceQueueFamilyProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2" ) );
+      vkGetPhysicalDeviceMemoryProperties2 =
+        PFN_vkGetPhysicalDeviceMemoryProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2" ) );
+      vkGetPhysicalDeviceSparseImageFormatProperties2 =
+        PFN_vkGetPhysicalDeviceSparseImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2" ) );
+      vkTrimCommandPool                 = PFN_vkTrimCommandPool( vkGetInstanceProcAddr( instance, "vkTrimCommandPool" ) );
+      vkGetDeviceQueue2                 = PFN_vkGetDeviceQueue2( vkGetInstanceProcAddr( instance, "vkGetDeviceQueue2" ) );
+      vkCreateSamplerYcbcrConversion    = PFN_vkCreateSamplerYcbcrConversion( vkGetInstanceProcAddr( instance, "vkCreateSamplerYcbcrConversion" ) );
+      vkDestroySamplerYcbcrConversion   = PFN_vkDestroySamplerYcbcrConversion( vkGetInstanceProcAddr( instance, "vkDestroySamplerYcbcrConversion" ) );
+      vkCreateDescriptorUpdateTemplate  = PFN_vkCreateDescriptorUpdateTemplate( vkGetInstanceProcAddr( instance, "vkCreateDescriptorUpdateTemplate" ) );
+      vkDestroyDescriptorUpdateTemplate = PFN_vkDestroyDescriptorUpdateTemplate( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorUpdateTemplate" ) );
+      vkUpdateDescriptorSetWithTemplate = PFN_vkUpdateDescriptorSetWithTemplate( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSetWithTemplate" ) );
+      vkGetPhysicalDeviceExternalBufferProperties =
+        PFN_vkGetPhysicalDeviceExternalBufferProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferProperties" ) );
+      vkGetPhysicalDeviceExternalFenceProperties =
+        PFN_vkGetPhysicalDeviceExternalFenceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFenceProperties" ) );
+      vkGetPhysicalDeviceExternalSemaphoreProperties =
+        PFN_vkGetPhysicalDeviceExternalSemaphoreProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphoreProperties" ) );
+      vkGetDescriptorSetLayoutSupport = PFN_vkGetDescriptorSetLayoutSupport( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSupport" ) );
 
       //=== VK_VERSION_1_2 ===
-      PFN_vkResetQueryPool                      vkResetQueryPool                      = 0;
-      PFN_vkGetSemaphoreCounterValue            vkGetSemaphoreCounterValue            = 0;
-      PFN_vkWaitSemaphores                      vkWaitSemaphores                      = 0;
-      PFN_vkSignalSemaphore                     vkSignalSemaphore                     = 0;
-      PFN_vkGetBufferDeviceAddress              vkGetBufferDeviceAddress              = 0;
-      PFN_vkGetBufferOpaqueCaptureAddress       vkGetBufferOpaqueCaptureAddress       = 0;
-      PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress = 0;
-      PFN_vkCmdDrawIndirectCount                vkCmdDrawIndirectCount                = 0;
-      PFN_vkCmdDrawIndexedIndirectCount         vkCmdDrawIndexedIndirectCount         = 0;
-      PFN_vkCreateRenderPass2                   vkCreateRenderPass2                   = 0;
-      PFN_vkCmdBeginRenderPass2                 vkCmdBeginRenderPass2                 = 0;
-      PFN_vkCmdNextSubpass2                     vkCmdNextSubpass2                     = 0;
-      PFN_vkCmdEndRenderPass2                   vkCmdEndRenderPass2                   = 0;
+      vkCmdDrawIndirectCount          = PFN_vkCmdDrawIndirectCount( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCount" ) );
+      vkCmdDrawIndexedIndirectCount   = PFN_vkCmdDrawIndexedIndirectCount( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCount" ) );
+      vkCreateRenderPass2             = PFN_vkCreateRenderPass2( vkGetInstanceProcAddr( instance, "vkCreateRenderPass2" ) );
+      vkCmdBeginRenderPass2           = PFN_vkCmdBeginRenderPass2( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass2" ) );
+      vkCmdNextSubpass2               = PFN_vkCmdNextSubpass2( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass2" ) );
+      vkCmdEndRenderPass2             = PFN_vkCmdEndRenderPass2( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass2" ) );
+      vkResetQueryPool                = PFN_vkResetQueryPool( vkGetInstanceProcAddr( instance, "vkResetQueryPool" ) );
+      vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetInstanceProcAddr( instance, "vkGetSemaphoreCounterValue" ) );
+      vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetInstanceProcAddr( instance, "vkWaitSemaphores" ) );
+      vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetInstanceProcAddr( instance, "vkSignalSemaphore" ) );
+      vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddress" ) );
+      vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureAddress" ) );
+      vkGetDeviceMemoryOpaqueCaptureAddress =
+        PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
 
       //=== VK_VERSION_1_3 ===
-      PFN_vkGetPhysicalDeviceToolProperties        vkGetPhysicalDeviceToolProperties        = 0;
-      PFN_vkCreatePrivateDataSlot                  vkCreatePrivateDataSlot                  = 0;
-      PFN_vkDestroyPrivateDataSlot                 vkDestroyPrivateDataSlot                 = 0;
-      PFN_vkSetPrivateData                         vkSetPrivateData                         = 0;
-      PFN_vkGetPrivateData                         vkGetPrivateData                         = 0;
-      PFN_vkCmdPipelineBarrier2                    vkCmdPipelineBarrier2                    = 0;
-      PFN_vkCmdWriteTimestamp2                     vkCmdWriteTimestamp2                     = 0;
-      PFN_vkQueueSubmit2                           vkQueueSubmit2                           = 0;
-      PFN_vkCmdCopyBuffer2                         vkCmdCopyBuffer2                         = 0;
-      PFN_vkCmdCopyImage2                          vkCmdCopyImage2                          = 0;
-      PFN_vkCmdCopyBufferToImage2                  vkCmdCopyBufferToImage2                  = 0;
-      PFN_vkCmdCopyImageToBuffer2                  vkCmdCopyImageToBuffer2                  = 0;
-      PFN_vkGetDeviceBufferMemoryRequirements      vkGetDeviceBufferMemoryRequirements      = 0;
-      PFN_vkGetDeviceImageMemoryRequirements       vkGetDeviceImageMemoryRequirements       = 0;
-      PFN_vkGetDeviceImageSparseMemoryRequirements vkGetDeviceImageSparseMemoryRequirements = 0;
-      PFN_vkCmdSetEvent2                           vkCmdSetEvent2                           = 0;
-      PFN_vkCmdResetEvent2                         vkCmdResetEvent2                         = 0;
-      PFN_vkCmdWaitEvents2                         vkCmdWaitEvents2                         = 0;
-      PFN_vkCmdBlitImage2                          vkCmdBlitImage2                          = 0;
-      PFN_vkCmdResolveImage2                       vkCmdResolveImage2                       = 0;
-      PFN_vkCmdBeginRendering                      vkCmdBeginRendering                      = 0;
-      PFN_vkCmdEndRendering                        vkCmdEndRendering                        = 0;
-      PFN_vkCmdSetCullMode                         vkCmdSetCullMode                         = 0;
-      PFN_vkCmdSetFrontFace                        vkCmdSetFrontFace                        = 0;
-      PFN_vkCmdSetPrimitiveTopology                vkCmdSetPrimitiveTopology                = 0;
-      PFN_vkCmdSetViewportWithCount                vkCmdSetViewportWithCount                = 0;
-      PFN_vkCmdSetScissorWithCount                 vkCmdSetScissorWithCount                 = 0;
-      PFN_vkCmdBindVertexBuffers2                  vkCmdBindVertexBuffers2                  = 0;
-      PFN_vkCmdSetDepthTestEnable                  vkCmdSetDepthTestEnable                  = 0;
-      PFN_vkCmdSetDepthWriteEnable                 vkCmdSetDepthWriteEnable                 = 0;
-      PFN_vkCmdSetDepthCompareOp                   vkCmdSetDepthCompareOp                   = 0;
-      PFN_vkCmdSetDepthBoundsTestEnable            vkCmdSetDepthBoundsTestEnable            = 0;
-      PFN_vkCmdSetStencilTestEnable                vkCmdSetStencilTestEnable                = 0;
-      PFN_vkCmdSetStencilOp                        vkCmdSetStencilOp                        = 0;
-      PFN_vkCmdSetRasterizerDiscardEnable          vkCmdSetRasterizerDiscardEnable          = 0;
-      PFN_vkCmdSetDepthBiasEnable                  vkCmdSetDepthBiasEnable                  = 0;
-      PFN_vkCmdSetPrimitiveRestartEnable           vkCmdSetPrimitiveRestartEnable           = 0;
-
-      //=== VK_VERSION_1_4 ===
-      PFN_vkMapMemory2                            vkMapMemory2                            = 0;
-      PFN_vkUnmapMemory2                          vkUnmapMemory2                          = 0;
-      PFN_vkGetDeviceImageSubresourceLayout       vkGetDeviceImageSubresourceLayout       = 0;
-      PFN_vkGetImageSubresourceLayout2            vkGetImageSubresourceLayout2            = 0;
-      PFN_vkCopyMemoryToImage                     vkCopyMemoryToImage                     = 0;
-      PFN_vkCopyImageToMemory                     vkCopyImageToMemory                     = 0;
-      PFN_vkCopyImageToImage                      vkCopyImageToImage                      = 0;
-      PFN_vkTransitionImageLayout                 vkTransitionImageLayout                 = 0;
-      PFN_vkCmdPushDescriptorSet                  vkCmdPushDescriptorSet                  = 0;
-      PFN_vkCmdPushDescriptorSetWithTemplate      vkCmdPushDescriptorSetWithTemplate      = 0;
-      PFN_vkCmdBindDescriptorSets2                vkCmdBindDescriptorSets2                = 0;
-      PFN_vkCmdPushConstants2                     vkCmdPushConstants2                     = 0;
-      PFN_vkCmdPushDescriptorSet2                 vkCmdPushDescriptorSet2                 = 0;
-      PFN_vkCmdPushDescriptorSetWithTemplate2     vkCmdPushDescriptorSetWithTemplate2     = 0;
-      PFN_vkCmdSetLineStipple                     vkCmdSetLineStipple                     = 0;
-      PFN_vkCmdBindIndexBuffer2                   vkCmdBindIndexBuffer2                   = 0;
-      PFN_vkGetRenderingAreaGranularity           vkGetRenderingAreaGranularity           = 0;
-      PFN_vkCmdSetRenderingAttachmentLocations    vkCmdSetRenderingAttachmentLocations    = 0;
-      PFN_vkCmdSetRenderingInputAttachmentIndices vkCmdSetRenderingInputAttachmentIndices = 0;
+      vkGetPhysicalDeviceToolProperties   = PFN_vkGetPhysicalDeviceToolProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolProperties" ) );
+      vkCreatePrivateDataSlot             = PFN_vkCreatePrivateDataSlot( vkGetInstanceProcAddr( instance, "vkCreatePrivateDataSlot" ) );
+      vkDestroyPrivateDataSlot            = PFN_vkDestroyPrivateDataSlot( vkGetInstanceProcAddr( instance, "vkDestroyPrivateDataSlot" ) );
+      vkSetPrivateData                    = PFN_vkSetPrivateData( vkGetInstanceProcAddr( instance, "vkSetPrivateData" ) );
+      vkGetPrivateData                    = PFN_vkGetPrivateData( vkGetInstanceProcAddr( instance, "vkGetPrivateData" ) );
+      vkCmdSetEvent2                      = PFN_vkCmdSetEvent2( vkGetInstanceProcAddr( instance, "vkCmdSetEvent2" ) );
+      vkCmdResetEvent2                    = PFN_vkCmdResetEvent2( vkGetInstanceProcAddr( instance, "vkCmdResetEvent2" ) );
+      vkCmdWaitEvents2                    = PFN_vkCmdWaitEvents2( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents2" ) );
+      vkCmdPipelineBarrier2               = PFN_vkCmdPipelineBarrier2( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier2" ) );
+      vkCmdWriteTimestamp2                = PFN_vkCmdWriteTimestamp2( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp2" ) );
+      vkQueueSubmit2                      = PFN_vkQueueSubmit2( vkGetInstanceProcAddr( instance, "vkQueueSubmit2" ) );
+      vkCmdCopyBuffer2                    = PFN_vkCmdCopyBuffer2( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer2" ) );
+      vkCmdCopyImage2                     = PFN_vkCmdCopyImage2( vkGetInstanceProcAddr( instance, "vkCmdCopyImage2" ) );
+      vkCmdCopyBufferToImage2             = PFN_vkCmdCopyBufferToImage2( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage2" ) );
+      vkCmdCopyImageToBuffer2             = PFN_vkCmdCopyImageToBuffer2( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer2" ) );
+      vkCmdBlitImage2                     = PFN_vkCmdBlitImage2( vkGetInstanceProcAddr( instance, "vkCmdBlitImage2" ) );
+      vkCmdResolveImage2                  = PFN_vkCmdResolveImage2( vkGetInstanceProcAddr( instance, "vkCmdResolveImage2" ) );
+      vkCmdBeginRendering                 = PFN_vkCmdBeginRendering( vkGetInstanceProcAddr( instance, "vkCmdBeginRendering" ) );
+      vkCmdEndRendering                   = PFN_vkCmdEndRendering( vkGetInstanceProcAddr( instance, "vkCmdEndRendering" ) );
+      vkCmdSetCullMode                    = PFN_vkCmdSetCullMode( vkGetInstanceProcAddr( instance, "vkCmdSetCullMode" ) );
+      vkCmdSetFrontFace                   = PFN_vkCmdSetFrontFace( vkGetInstanceProcAddr( instance, "vkCmdSetFrontFace" ) );
+      vkCmdSetPrimitiveTopology           = PFN_vkCmdSetPrimitiveTopology( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveTopology" ) );
+      vkCmdSetViewportWithCount           = PFN_vkCmdSetViewportWithCount( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWithCount" ) );
+      vkCmdSetScissorWithCount            = PFN_vkCmdSetScissorWithCount( vkGetInstanceProcAddr( instance, "vkCmdSetScissorWithCount" ) );
+      vkCmdBindVertexBuffers2             = PFN_vkCmdBindVertexBuffers2( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers2" ) );
+      vkCmdSetDepthTestEnable             = PFN_vkCmdSetDepthTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthTestEnable" ) );
+      vkCmdSetDepthWriteEnable            = PFN_vkCmdSetDepthWriteEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthWriteEnable" ) );
+      vkCmdSetDepthCompareOp              = PFN_vkCmdSetDepthCompareOp( vkGetInstanceProcAddr( instance, "vkCmdSetDepthCompareOp" ) );
+      vkCmdSetDepthBoundsTestEnable       = PFN_vkCmdSetDepthBoundsTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBoundsTestEnable" ) );
+      vkCmdSetStencilTestEnable           = PFN_vkCmdSetStencilTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetStencilTestEnable" ) );
+      vkCmdSetStencilOp                   = PFN_vkCmdSetStencilOp( vkGetInstanceProcAddr( instance, "vkCmdSetStencilOp" ) );
+      vkCmdSetRasterizerDiscardEnable     = PFN_vkCmdSetRasterizerDiscardEnable( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizerDiscardEnable" ) );
+      vkCmdSetDepthBiasEnable             = PFN_vkCmdSetDepthBiasEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBiasEnable" ) );
+      vkCmdSetPrimitiveRestartEnable      = PFN_vkCmdSetPrimitiveRestartEnable( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveRestartEnable" ) );
+      vkGetDeviceBufferMemoryRequirements = PFN_vkGetDeviceBufferMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceBufferMemoryRequirements" ) );
+      vkGetDeviceImageMemoryRequirements  = PFN_vkGetDeviceImageMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceImageMemoryRequirements" ) );
+      vkGetDeviceImageSparseMemoryRequirements =
+        PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSparseMemoryRequirements" ) );
 
       //=== VK_KHR_surface ===
-      PFN_vkDestroySurfaceKHR                       vkDestroySurfaceKHR                       = 0;
-      PFN_vkGetPhysicalDeviceSurfaceSupportKHR      vkGetPhysicalDeviceSurfaceSupportKHR      = 0;
-      PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR = 0;
-      PFN_vkGetPhysicalDeviceSurfaceFormatsKHR      vkGetPhysicalDeviceSurfaceFormatsKHR      = 0;
-      PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR = 0;
+      vkDestroySurfaceKHR = PFN_vkDestroySurfaceKHR( vkGetInstanceProcAddr( instance, "vkDestroySurfaceKHR" ) );
+      vkGetPhysicalDeviceSurfaceSupportKHR =
+        PFN_vkGetPhysicalDeviceSurfaceSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceSupportKHR" ) );
+      vkGetPhysicalDeviceSurfaceCapabilitiesKHR =
+        PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" ) );
+      vkGetPhysicalDeviceSurfaceFormatsKHR =
+        PFN_vkGetPhysicalDeviceSurfaceFormatsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormatsKHR" ) );
+      vkGetPhysicalDeviceSurfacePresentModesKHR =
+        PFN_vkGetPhysicalDeviceSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModesKHR" ) );
 
       //=== VK_KHR_swapchain ===
-      PFN_vkCreateSwapchainKHR                    vkCreateSwapchainKHR                    = 0;
-      PFN_vkDestroySwapchainKHR                   vkDestroySwapchainKHR                   = 0;
-      PFN_vkGetSwapchainImagesKHR                 vkGetSwapchainImagesKHR                 = 0;
-      PFN_vkAcquireNextImageKHR                   vkAcquireNextImageKHR                   = 0;
-      PFN_vkQueuePresentKHR                       vkQueuePresentKHR                       = 0;
-      PFN_vkGetDeviceGroupPresentCapabilitiesKHR  vkGetDeviceGroupPresentCapabilitiesKHR  = 0;
-      PFN_vkGetDeviceGroupSurfacePresentModesKHR  vkGetDeviceGroupSurfacePresentModesKHR  = 0;
-      PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR = 0;
-      PFN_vkAcquireNextImage2KHR                  vkAcquireNextImage2KHR                  = 0;
+      vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetInstanceProcAddr( instance, "vkCreateSwapchainKHR" ) );
+      vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetInstanceProcAddr( instance, "vkDestroySwapchainKHR" ) );
+      vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetInstanceProcAddr( instance, "vkGetSwapchainImagesKHR" ) );
+      vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetInstanceProcAddr( instance, "vkAcquireNextImageKHR" ) );
+      vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetInstanceProcAddr( instance, "vkQueuePresentKHR" ) );
+      vkGetDeviceGroupPresentCapabilitiesKHR =
+        PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
+      vkGetDeviceGroupSurfacePresentModesKHR =
+        PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
+      vkGetPhysicalDevicePresentRectanglesKHR =
+        PFN_vkGetPhysicalDevicePresentRectanglesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDevicePresentRectanglesKHR" ) );
+      vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetInstanceProcAddr( instance, "vkAcquireNextImage2KHR" ) );
 
       //=== VK_KHR_display ===
-      PFN_vkGetPhysicalDeviceDisplayPropertiesKHR      vkGetPhysicalDeviceDisplayPropertiesKHR      = 0;
-      PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR = 0;
-      PFN_vkGetDisplayPlaneSupportedDisplaysKHR        vkGetDisplayPlaneSupportedDisplaysKHR        = 0;
-      PFN_vkGetDisplayModePropertiesKHR                vkGetDisplayModePropertiesKHR                = 0;
-      PFN_vkCreateDisplayModeKHR                       vkCreateDisplayModeKHR                       = 0;
-      PFN_vkGetDisplayPlaneCapabilitiesKHR             vkGetDisplayPlaneCapabilitiesKHR             = 0;
-      PFN_vkCreateDisplayPlaneSurfaceKHR               vkCreateDisplayPlaneSurfaceKHR               = 0;
+      vkGetPhysicalDeviceDisplayPropertiesKHR =
+        PFN_vkGetPhysicalDeviceDisplayPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPropertiesKHR" ) );
+      vkGetPhysicalDeviceDisplayPlanePropertiesKHR =
+        PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR" ) );
+      vkGetDisplayPlaneSupportedDisplaysKHR =
+        PFN_vkGetDisplayPlaneSupportedDisplaysKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneSupportedDisplaysKHR" ) );
+      vkGetDisplayModePropertiesKHR    = PFN_vkGetDisplayModePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModePropertiesKHR" ) );
+      vkCreateDisplayModeKHR           = PFN_vkCreateDisplayModeKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayModeKHR" ) );
+      vkGetDisplayPlaneCapabilitiesKHR = PFN_vkGetDisplayPlaneCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilitiesKHR" ) );
+      vkCreateDisplayPlaneSurfaceKHR   = PFN_vkCreateDisplayPlaneSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayPlaneSurfaceKHR" ) );
 
       //=== VK_KHR_display_swapchain ===
-      PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR = 0;
+      vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetInstanceProcAddr( instance, "vkCreateSharedSwapchainsKHR" ) );
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
       //=== VK_KHR_xlib_surface ===
-      PFN_vkCreateXlibSurfaceKHR                        vkCreateXlibSurfaceKHR                        = 0;
-      PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR = 0;
-#else
-      PFN_dummy vkCreateXlibSurfaceKHR_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceXlibPresentationSupportKHR_placeholder = 0;
+      vkCreateXlibSurfaceKHR = PFN_vkCreateXlibSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXlibSurfaceKHR" ) );
+      vkGetPhysicalDeviceXlibPresentationSupportKHR =
+        PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXlibPresentationSupportKHR" ) );
 #endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XCB_KHR )
       //=== VK_KHR_xcb_surface ===
-      PFN_vkCreateXcbSurfaceKHR                        vkCreateXcbSurfaceKHR                        = 0;
-      PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR = 0;
-#else
-      PFN_dummy vkCreateXcbSurfaceKHR_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceXcbPresentationSupportKHR_placeholder = 0;
+      vkCreateXcbSurfaceKHR = PFN_vkCreateXcbSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXcbSurfaceKHR" ) );
+      vkGetPhysicalDeviceXcbPresentationSupportKHR =
+        PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXcbPresentationSupportKHR" ) );
 #endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
       //=== VK_KHR_wayland_surface ===
-      PFN_vkCreateWaylandSurfaceKHR                        vkCreateWaylandSurfaceKHR                        = 0;
-      PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR = 0;
-#else
-      PFN_dummy vkCreateWaylandSurfaceKHR_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceWaylandPresentationSupportKHR_placeholder = 0;
+      vkCreateWaylandSurfaceKHR = PFN_vkCreateWaylandSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWaylandSurfaceKHR" ) );
+      vkGetPhysicalDeviceWaylandPresentationSupportKHR =
+        PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWaylandPresentationSupportKHR" ) );
 #endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
       //=== VK_KHR_android_surface ===
-      PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR = 0;
-#else
-      PFN_dummy vkCreateAndroidSurfaceKHR_placeholder = 0;
+      vkCreateAndroidSurfaceKHR = PFN_vkCreateAndroidSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateAndroidSurfaceKHR" ) );
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_win32_surface ===
-      PFN_vkCreateWin32SurfaceKHR                        vkCreateWin32SurfaceKHR                        = 0;
-      PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR = 0;
-#else
-      PFN_dummy vkCreateWin32SurfaceKHR_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceWin32PresentationSupportKHR_placeholder = 0;
+      vkCreateWin32SurfaceKHR = PFN_vkCreateWin32SurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWin32SurfaceKHR" ) );
+      vkGetPhysicalDeviceWin32PresentationSupportKHR =
+        PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWin32PresentationSupportKHR" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_EXT_debug_report ===
-      PFN_vkCreateDebugReportCallbackEXT  vkCreateDebugReportCallbackEXT  = 0;
-      PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = 0;
-      PFN_vkDebugReportMessageEXT         vkDebugReportMessageEXT         = 0;
+      vkCreateDebugReportCallbackEXT  = PFN_vkCreateDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugReportCallbackEXT" ) );
+      vkDestroyDebugReportCallbackEXT = PFN_vkDestroyDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugReportCallbackEXT" ) );
+      vkDebugReportMessageEXT         = PFN_vkDebugReportMessageEXT( vkGetInstanceProcAddr( instance, "vkDebugReportMessageEXT" ) );
 
       //=== VK_EXT_debug_marker ===
-      PFN_vkDebugMarkerSetObjectTagEXT  vkDebugMarkerSetObjectTagEXT  = 0;
-      PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT = 0;
-      PFN_vkCmdDebugMarkerBeginEXT      vkCmdDebugMarkerBeginEXT      = 0;
-      PFN_vkCmdDebugMarkerEndEXT        vkCmdDebugMarkerEndEXT        = 0;
-      PFN_vkCmdDebugMarkerInsertEXT     vkCmdDebugMarkerInsertEXT     = 0;
+      vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetInstanceProcAddr( instance, "vkDebugMarkerSetObjectTagEXT" ) );
+      vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetInstanceProcAddr( instance, "vkDebugMarkerSetObjectNameEXT" ) );
+      vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerBeginEXT" ) );
+      vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerEndEXT" ) );
+      vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerInsertEXT" ) );
 
       //=== VK_KHR_video_queue ===
-      PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR     vkGetPhysicalDeviceVideoCapabilitiesKHR     = 0;
-      PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR = 0;
-      PFN_vkCreateVideoSessionKHR                     vkCreateVideoSessionKHR                     = 0;
-      PFN_vkDestroyVideoSessionKHR                    vkDestroyVideoSessionKHR                    = 0;
-      PFN_vkGetVideoSessionMemoryRequirementsKHR      vkGetVideoSessionMemoryRequirementsKHR      = 0;
-      PFN_vkBindVideoSessionMemoryKHR                 vkBindVideoSessionMemoryKHR                 = 0;
-      PFN_vkCreateVideoSessionParametersKHR           vkCreateVideoSessionParametersKHR           = 0;
-      PFN_vkUpdateVideoSessionParametersKHR           vkUpdateVideoSessionParametersKHR           = 0;
-      PFN_vkDestroyVideoSessionParametersKHR          vkDestroyVideoSessionParametersKHR          = 0;
-      PFN_vkCmdBeginVideoCodingKHR                    vkCmdBeginVideoCodingKHR                    = 0;
-      PFN_vkCmdEndVideoCodingKHR                      vkCmdEndVideoCodingKHR                      = 0;
-      PFN_vkCmdControlVideoCodingKHR                  vkCmdControlVideoCodingKHR                  = 0;
+      vkGetPhysicalDeviceVideoCapabilitiesKHR =
+        PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR" ) );
+      vkGetPhysicalDeviceVideoFormatPropertiesKHR =
+        PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoFormatPropertiesKHR" ) );
+      vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetInstanceProcAddr( instance, "vkCreateVideoSessionKHR" ) );
+      vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetInstanceProcAddr( instance, "vkDestroyVideoSessionKHR" ) );
+      vkGetVideoSessionMemoryRequirementsKHR =
+        PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetVideoSessionMemoryRequirementsKHR" ) );
+      vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetInstanceProcAddr( instance, "vkBindVideoSessionMemoryKHR" ) );
+      vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkCreateVideoSessionParametersKHR" ) );
+      vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkUpdateVideoSessionParametersKHR" ) );
+      vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkDestroyVideoSessionParametersKHR" ) );
+      vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdBeginVideoCodingKHR" ) );
+      vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdEndVideoCodingKHR" ) );
+      vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdControlVideoCodingKHR" ) );
 
       //=== VK_KHR_video_decode_queue ===
-      PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR = 0;
+      vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetInstanceProcAddr( instance, "vkCmdDecodeVideoKHR" ) );
 
       //=== VK_EXT_transform_feedback ===
-      PFN_vkCmdBindTransformFeedbackBuffersEXT vkCmdBindTransformFeedbackBuffersEXT = 0;
-      PFN_vkCmdBeginTransformFeedbackEXT       vkCmdBeginTransformFeedbackEXT       = 0;
-      PFN_vkCmdEndTransformFeedbackEXT         vkCmdEndTransformFeedbackEXT         = 0;
-      PFN_vkCmdBeginQueryIndexedEXT            vkCmdBeginQueryIndexedEXT            = 0;
-      PFN_vkCmdEndQueryIndexedEXT              vkCmdEndQueryIndexedEXT              = 0;
-      PFN_vkCmdDrawIndirectByteCountEXT        vkCmdDrawIndirectByteCountEXT        = 0;
+      vkCmdBindTransformFeedbackBuffersEXT =
+        PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindTransformFeedbackBuffersEXT" ) );
+      vkCmdBeginTransformFeedbackEXT = PFN_vkCmdBeginTransformFeedbackEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginTransformFeedbackEXT" ) );
+      vkCmdEndTransformFeedbackEXT   = PFN_vkCmdEndTransformFeedbackEXT( vkGetInstanceProcAddr( instance, "vkCmdEndTransformFeedbackEXT" ) );
+      vkCmdBeginQueryIndexedEXT      = PFN_vkCmdBeginQueryIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginQueryIndexedEXT" ) );
+      vkCmdEndQueryIndexedEXT        = PFN_vkCmdEndQueryIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdEndQueryIndexedEXT" ) );
+      vkCmdDrawIndirectByteCountEXT  = PFN_vkCmdDrawIndirectByteCountEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectByteCountEXT" ) );
 
       //=== VK_NVX_binary_import ===
-      PFN_vkCreateCuModuleNVX    vkCreateCuModuleNVX    = 0;
-      PFN_vkCreateCuFunctionNVX  vkCreateCuFunctionNVX  = 0;
-      PFN_vkDestroyCuModuleNVX   vkDestroyCuModuleNVX   = 0;
-      PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX = 0;
-      PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX = 0;
+      vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetInstanceProcAddr( instance, "vkCreateCuModuleNVX" ) );
+      vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetInstanceProcAddr( instance, "vkCreateCuFunctionNVX" ) );
+      vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetInstanceProcAddr( instance, "vkDestroyCuModuleNVX" ) );
+      vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetInstanceProcAddr( instance, "vkDestroyCuFunctionNVX" ) );
+      vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetInstanceProcAddr( instance, "vkCmdCuLaunchKernelNVX" ) );
 
       //=== VK_NVX_image_view_handle ===
-      PFN_vkGetImageViewHandleNVX   vkGetImageViewHandleNVX   = 0;
-      PFN_vkGetImageViewHandle64NVX vkGetImageViewHandle64NVX = 0;
-      PFN_vkGetImageViewAddressNVX  vkGetImageViewAddressNVX  = 0;
+      vkGetImageViewHandleNVX  = PFN_vkGetImageViewHandleNVX( vkGetInstanceProcAddr( instance, "vkGetImageViewHandleNVX" ) );
+      vkGetImageViewAddressNVX = PFN_vkGetImageViewAddressNVX( vkGetInstanceProcAddr( instance, "vkGetImageViewAddressNVX" ) );
 
       //=== VK_AMD_draw_indirect_count ===
-      PFN_vkCmdDrawIndirectCountAMD        vkCmdDrawIndirectCountAMD        = 0;
-      PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD = 0;
+      vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCountAMD" ) );
+      if ( !vkCmdDrawIndirectCount )
+        vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
+      vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCountAMD" ) );
+      if ( !vkCmdDrawIndexedIndirectCount )
+        vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
 
       //=== VK_AMD_shader_info ===
-      PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = 0;
+      vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetInstanceProcAddr( instance, "vkGetShaderInfoAMD" ) );
 
       //=== VK_KHR_dynamic_rendering ===
-      PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR = 0;
-      PFN_vkCmdEndRenderingKHR   vkCmdEndRenderingKHR   = 0;
+      vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderingKHR" ) );
+      if ( !vkCmdBeginRendering )
+        vkCmdBeginRendering = vkCmdBeginRenderingKHR;
+      vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetInstanceProcAddr( instance, "vkCmdEndRenderingKHR" ) );
+      if ( !vkCmdEndRendering )
+        vkCmdEndRendering = vkCmdEndRenderingKHR;
 
 #if defined( VK_USE_PLATFORM_GGP )
       //=== VK_GGP_stream_descriptor_surface ===
-      PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP = 0;
-#else
-      PFN_dummy vkCreateStreamDescriptorSurfaceGGP_placeholder = 0;
+      vkCreateStreamDescriptorSurfaceGGP = PFN_vkCreateStreamDescriptorSurfaceGGP( vkGetInstanceProcAddr( instance, "vkCreateStreamDescriptorSurfaceGGP" ) );
 #endif /*VK_USE_PLATFORM_GGP*/
 
       //=== VK_NV_external_memory_capabilities ===
-      PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV = 0;
+      vkGetPhysicalDeviceExternalImageFormatPropertiesNV =
+        PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalImageFormatPropertiesNV" ) );
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_NV_external_memory_win32 ===
-      PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV = 0;
-#else
-      PFN_dummy vkGetMemoryWin32HandleNV_placeholder = 0;
+      vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandleNV" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_get_physical_device_properties2 ===
-      PFN_vkGetPhysicalDeviceFeatures2KHR                    vkGetPhysicalDeviceFeatures2KHR                    = 0;
-      PFN_vkGetPhysicalDeviceProperties2KHR                  vkGetPhysicalDeviceProperties2KHR                  = 0;
-      PFN_vkGetPhysicalDeviceFormatProperties2KHR            vkGetPhysicalDeviceFormatProperties2KHR            = 0;
-      PFN_vkGetPhysicalDeviceImageFormatProperties2KHR       vkGetPhysicalDeviceImageFormatProperties2KHR       = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR       vkGetPhysicalDeviceQueueFamilyProperties2KHR       = 0;
-      PFN_vkGetPhysicalDeviceMemoryProperties2KHR            vkGetPhysicalDeviceMemoryProperties2KHR            = 0;
-      PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR = 0;
+      vkGetPhysicalDeviceFeatures2KHR = PFN_vkGetPhysicalDeviceFeatures2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2KHR" ) );
+      if ( !vkGetPhysicalDeviceFeatures2 )
+        vkGetPhysicalDeviceFeatures2 = vkGetPhysicalDeviceFeatures2KHR;
+      vkGetPhysicalDeviceProperties2KHR = PFN_vkGetPhysicalDeviceProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceProperties2 )
+        vkGetPhysicalDeviceProperties2 = vkGetPhysicalDeviceProperties2KHR;
+      vkGetPhysicalDeviceFormatProperties2KHR =
+        PFN_vkGetPhysicalDeviceFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceFormatProperties2 )
+        vkGetPhysicalDeviceFormatProperties2 = vkGetPhysicalDeviceFormatProperties2KHR;
+      vkGetPhysicalDeviceImageFormatProperties2KHR =
+        PFN_vkGetPhysicalDeviceImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceImageFormatProperties2 )
+        vkGetPhysicalDeviceImageFormatProperties2 = vkGetPhysicalDeviceImageFormatProperties2KHR;
+      vkGetPhysicalDeviceQueueFamilyProperties2KHR =
+        PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceQueueFamilyProperties2 )
+        vkGetPhysicalDeviceQueueFamilyProperties2 = vkGetPhysicalDeviceQueueFamilyProperties2KHR;
+      vkGetPhysicalDeviceMemoryProperties2KHR =
+        PFN_vkGetPhysicalDeviceMemoryProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceMemoryProperties2 )
+        vkGetPhysicalDeviceMemoryProperties2 = vkGetPhysicalDeviceMemoryProperties2KHR;
+      vkGetPhysicalDeviceSparseImageFormatProperties2KHR =
+        PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR" ) );
+      if ( !vkGetPhysicalDeviceSparseImageFormatProperties2 )
+        vkGetPhysicalDeviceSparseImageFormatProperties2 = vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
 
       //=== VK_KHR_device_group ===
-      PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR = 0;
-      PFN_vkCmdSetDeviceMaskKHR                 vkCmdSetDeviceMaskKHR                 = 0;
-      PFN_vkCmdDispatchBaseKHR                  vkCmdDispatchBaseKHR                  = 0;
+      vkGetDeviceGroupPeerMemoryFeaturesKHR =
+        PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
+      if ( !vkGetDeviceGroupPeerMemoryFeatures )
+        vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
+      vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetInstanceProcAddr( instance, "vkCmdSetDeviceMaskKHR" ) );
+      if ( !vkCmdSetDeviceMask )
+        vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
+      vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetInstanceProcAddr( instance, "vkCmdDispatchBaseKHR" ) );
+      if ( !vkCmdDispatchBase )
+        vkCmdDispatchBase = vkCmdDispatchBaseKHR;
 
 #if defined( VK_USE_PLATFORM_VI_NN )
       //=== VK_NN_vi_surface ===
-      PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN = 0;
-#else
-      PFN_dummy vkCreateViSurfaceNN_placeholder = 0;
+      vkCreateViSurfaceNN = PFN_vkCreateViSurfaceNN( vkGetInstanceProcAddr( instance, "vkCreateViSurfaceNN" ) );
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
       //=== VK_KHR_maintenance1 ===
-      PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR = 0;
+      vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetInstanceProcAddr( instance, "vkTrimCommandPoolKHR" ) );
+      if ( !vkTrimCommandPool )
+        vkTrimCommandPool = vkTrimCommandPoolKHR;
 
       //=== VK_KHR_device_group_creation ===
-      PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR = 0;
+      vkEnumeratePhysicalDeviceGroupsKHR = PFN_vkEnumeratePhysicalDeviceGroupsKHR( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroupsKHR" ) );
+      if ( !vkEnumeratePhysicalDeviceGroups )
+        vkEnumeratePhysicalDeviceGroups = vkEnumeratePhysicalDeviceGroupsKHR;
 
       //=== VK_KHR_external_memory_capabilities ===
-      PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR = 0;
+      vkGetPhysicalDeviceExternalBufferPropertiesKHR =
+        PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferPropertiesKHR" ) );
+      if ( !vkGetPhysicalDeviceExternalBufferProperties )
+        vkGetPhysicalDeviceExternalBufferProperties = vkGetPhysicalDeviceExternalBufferPropertiesKHR;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_memory_win32 ===
-      PFN_vkGetMemoryWin32HandleKHR           vkGetMemoryWin32HandleKHR           = 0;
-      PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR = 0;
-#else
-      PFN_dummy vkGetMemoryWin32HandleKHR_placeholder           = 0;
-      PFN_dummy vkGetMemoryWin32HandlePropertiesKHR_placeholder = 0;
+      vkGetMemoryWin32HandleKHR           = PFN_vkGetMemoryWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandleKHR" ) );
+      vkGetMemoryWin32HandlePropertiesKHR = PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandlePropertiesKHR" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_memory_fd ===
-      PFN_vkGetMemoryFdKHR           vkGetMemoryFdKHR           = 0;
-      PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR = 0;
+      vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryFdKHR" ) );
+      vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryFdPropertiesKHR" ) );
 
       //=== VK_KHR_external_semaphore_capabilities ===
-      PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = 0;
+      vkGetPhysicalDeviceExternalSemaphorePropertiesKHR =
+        PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" ) );
+      if ( !vkGetPhysicalDeviceExternalSemaphoreProperties )
+        vkGetPhysicalDeviceExternalSemaphoreProperties = vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_semaphore_win32 ===
-      PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR = 0;
-      PFN_vkGetSemaphoreWin32HandleKHR    vkGetSemaphoreWin32HandleKHR    = 0;
-#else
-      PFN_dummy vkImportSemaphoreWin32HandleKHR_placeholder = 0;
-      PFN_dummy vkGetSemaphoreWin32HandleKHR_placeholder    = 0;
+      vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkImportSemaphoreWin32HandleKHR" ) );
+      vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreWin32HandleKHR" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_semaphore_fd ===
-      PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR = 0;
-      PFN_vkGetSemaphoreFdKHR    vkGetSemaphoreFdKHR    = 0;
+      vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetInstanceProcAddr( instance, "vkImportSemaphoreFdKHR" ) );
+      vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreFdKHR" ) );
 
       //=== VK_KHR_push_descriptor ===
-      PFN_vkCmdPushDescriptorSetKHR             vkCmdPushDescriptorSetKHR             = 0;
-      PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR = 0;
+      vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetKHR" ) );
+      vkCmdPushDescriptorSetWithTemplateKHR =
+        PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
 
       //=== VK_EXT_conditional_rendering ===
-      PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT = 0;
-      PFN_vkCmdEndConditionalRenderingEXT   vkCmdEndConditionalRenderingEXT   = 0;
+      vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginConditionalRenderingEXT" ) );
+      vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetInstanceProcAddr( instance, "vkCmdEndConditionalRenderingEXT" ) );
 
       //=== VK_KHR_descriptor_update_template ===
-      PFN_vkCreateDescriptorUpdateTemplateKHR  vkCreateDescriptorUpdateTemplateKHR  = 0;
-      PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR = 0;
-      PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR = 0;
+      vkCreateDescriptorUpdateTemplateKHR = PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetInstanceProcAddr( instance, "vkCreateDescriptorUpdateTemplateKHR" ) );
+      if ( !vkCreateDescriptorUpdateTemplate )
+        vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
+      vkDestroyDescriptorUpdateTemplateKHR =
+        PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorUpdateTemplateKHR" ) );
+      if ( !vkDestroyDescriptorUpdateTemplate )
+        vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
+      vkUpdateDescriptorSetWithTemplateKHR =
+        PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSetWithTemplateKHR" ) );
+      if ( !vkUpdateDescriptorSetWithTemplate )
+        vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
 
       //=== VK_NV_clip_space_w_scaling ===
-      PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV = 0;
+      vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWScalingNV" ) );
 
       //=== VK_EXT_direct_mode_display ===
-      PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT = 0;
+      vkReleaseDisplayEXT = PFN_vkReleaseDisplayEXT( vkGetInstanceProcAddr( instance, "vkReleaseDisplayEXT" ) );
 
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
       //=== VK_EXT_acquire_xlib_display ===
-      PFN_vkAcquireXlibDisplayEXT    vkAcquireXlibDisplayEXT    = 0;
-      PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT = 0;
-#else
-      PFN_dummy vkAcquireXlibDisplayEXT_placeholder    = 0;
-      PFN_dummy vkGetRandROutputDisplayEXT_placeholder = 0;
+      vkAcquireXlibDisplayEXT    = PFN_vkAcquireXlibDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireXlibDisplayEXT" ) );
+      vkGetRandROutputDisplayEXT = PFN_vkGetRandROutputDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetRandROutputDisplayEXT" ) );
 #endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
       //=== VK_EXT_display_surface_counter ===
-      PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT = 0;
+      vkGetPhysicalDeviceSurfaceCapabilities2EXT =
+        PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2EXT" ) );
 
       //=== VK_EXT_display_control ===
-      PFN_vkDisplayPowerControlEXT  vkDisplayPowerControlEXT  = 0;
-      PFN_vkRegisterDeviceEventEXT  vkRegisterDeviceEventEXT  = 0;
-      PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT = 0;
-      PFN_vkGetSwapchainCounterEXT  vkGetSwapchainCounterEXT  = 0;
+      vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetInstanceProcAddr( instance, "vkDisplayPowerControlEXT" ) );
+      vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetInstanceProcAddr( instance, "vkRegisterDeviceEventEXT" ) );
+      vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetInstanceProcAddr( instance, "vkRegisterDisplayEventEXT" ) );
+      vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainCounterEXT" ) );
 
       //=== VK_GOOGLE_display_timing ===
-      PFN_vkGetRefreshCycleDurationGOOGLE   vkGetRefreshCycleDurationGOOGLE   = 0;
-      PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE = 0;
+      vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetInstanceProcAddr( instance, "vkGetRefreshCycleDurationGOOGLE" ) );
+      vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetInstanceProcAddr( instance, "vkGetPastPresentationTimingGOOGLE" ) );
 
       //=== VK_EXT_discard_rectangles ===
-      PFN_vkCmdSetDiscardRectangleEXT       vkCmdSetDiscardRectangleEXT       = 0;
-      PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT = 0;
-      PFN_vkCmdSetDiscardRectangleModeEXT   vkCmdSetDiscardRectangleModeEXT   = 0;
+      vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleEXT" ) );
+      vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleEnableEXT" ) );
+      vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleModeEXT" ) );
 
       //=== VK_EXT_hdr_metadata ===
-      PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT = 0;
+      vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetInstanceProcAddr( instance, "vkSetHdrMetadataEXT" ) );
 
       //=== VK_KHR_create_renderpass2 ===
-      PFN_vkCreateRenderPass2KHR   vkCreateRenderPass2KHR   = 0;
-      PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR = 0;
-      PFN_vkCmdNextSubpass2KHR     vkCmdNextSubpass2KHR     = 0;
-      PFN_vkCmdEndRenderPass2KHR   vkCmdEndRenderPass2KHR   = 0;
+      vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCreateRenderPass2KHR" ) );
+      if ( !vkCreateRenderPass2 )
+        vkCreateRenderPass2 = vkCreateRenderPass2KHR;
+      vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass2KHR" ) );
+      if ( !vkCmdBeginRenderPass2 )
+        vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
+      vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass2KHR" ) );
+      if ( !vkCmdNextSubpass2 )
+        vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
+      vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass2KHR" ) );
+      if ( !vkCmdEndRenderPass2 )
+        vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
 
       //=== VK_KHR_shared_presentable_image ===
-      PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR = 0;
+      vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetInstanceProcAddr( instance, "vkGetSwapchainStatusKHR" ) );
 
       //=== VK_KHR_external_fence_capabilities ===
-      PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR = 0;
+      vkGetPhysicalDeviceExternalFencePropertiesKHR =
+        PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFencePropertiesKHR" ) );
+      if ( !vkGetPhysicalDeviceExternalFenceProperties )
+        vkGetPhysicalDeviceExternalFenceProperties = vkGetPhysicalDeviceExternalFencePropertiesKHR;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_fence_win32 ===
-      PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR = 0;
-      PFN_vkGetFenceWin32HandleKHR    vkGetFenceWin32HandleKHR    = 0;
-#else
-      PFN_dummy vkImportFenceWin32HandleKHR_placeholder = 0;
-      PFN_dummy vkGetFenceWin32HandleKHR_placeholder    = 0;
+      vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkImportFenceWin32HandleKHR" ) );
+      vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetFenceWin32HandleKHR" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_fence_fd ===
-      PFN_vkImportFenceFdKHR vkImportFenceFdKHR = 0;
-      PFN_vkGetFenceFdKHR    vkGetFenceFdKHR    = 0;
+      vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetInstanceProcAddr( instance, "vkImportFenceFdKHR" ) );
+      vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetInstanceProcAddr( instance, "vkGetFenceFdKHR" ) );
 
       //=== VK_KHR_performance_query ===
-      PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         = 0;
-      PFN_vkAcquireProfilingLockKHR                                       vkAcquireProfilingLockKHR                                       = 0;
-      PFN_vkReleaseProfilingLockKHR                                       vkReleaseProfilingLockKHR                                       = 0;
+      vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+        vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR" ) );
+      vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
+        vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR" ) );
+      vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetInstanceProcAddr( instance, "vkAcquireProfilingLockKHR" ) );
+      vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetInstanceProcAddr( instance, "vkReleaseProfilingLockKHR" ) );
 
       //=== VK_KHR_get_surface_capabilities2 ===
-      PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR = 0;
-      PFN_vkGetPhysicalDeviceSurfaceFormats2KHR      vkGetPhysicalDeviceSurfaceFormats2KHR      = 0;
+      vkGetPhysicalDeviceSurfaceCapabilities2KHR =
+        PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2KHR" ) );
+      vkGetPhysicalDeviceSurfaceFormats2KHR =
+        PFN_vkGetPhysicalDeviceSurfaceFormats2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormats2KHR" ) );
 
       //=== VK_KHR_get_display_properties2 ===
-      PFN_vkGetPhysicalDeviceDisplayProperties2KHR      vkGetPhysicalDeviceDisplayProperties2KHR      = 0;
-      PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR = 0;
-      PFN_vkGetDisplayModeProperties2KHR                vkGetDisplayModeProperties2KHR                = 0;
-      PFN_vkGetDisplayPlaneCapabilities2KHR             vkGetDisplayPlaneCapabilities2KHR             = 0;
+      vkGetPhysicalDeviceDisplayProperties2KHR =
+        PFN_vkGetPhysicalDeviceDisplayProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayProperties2KHR" ) );
+      vkGetPhysicalDeviceDisplayPlaneProperties2KHR =
+        PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlaneProperties2KHR" ) );
+      vkGetDisplayModeProperties2KHR    = PFN_vkGetDisplayModeProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModeProperties2KHR" ) );
+      vkGetDisplayPlaneCapabilities2KHR = PFN_vkGetDisplayPlaneCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilities2KHR" ) );
 
 #if defined( VK_USE_PLATFORM_IOS_MVK )
       //=== VK_MVK_ios_surface ===
-      PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK = 0;
-#else
-      PFN_dummy vkCreateIOSSurfaceMVK_placeholder = 0;
+      vkCreateIOSSurfaceMVK = PFN_vkCreateIOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateIOSSurfaceMVK" ) );
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
       //=== VK_MVK_macos_surface ===
-      PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK = 0;
-#else
-      PFN_dummy vkCreateMacOSSurfaceMVK_placeholder = 0;
+      vkCreateMacOSSurfaceMVK = PFN_vkCreateMacOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateMacOSSurfaceMVK" ) );
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
       //=== VK_EXT_debug_utils ===
-      PFN_vkSetDebugUtilsObjectNameEXT    vkSetDebugUtilsObjectNameEXT    = 0;
-      PFN_vkSetDebugUtilsObjectTagEXT     vkSetDebugUtilsObjectTagEXT     = 0;
-      PFN_vkQueueBeginDebugUtilsLabelEXT  vkQueueBeginDebugUtilsLabelEXT  = 0;
-      PFN_vkQueueEndDebugUtilsLabelEXT    vkQueueEndDebugUtilsLabelEXT    = 0;
-      PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT = 0;
-      PFN_vkCmdBeginDebugUtilsLabelEXT    vkCmdBeginDebugUtilsLabelEXT    = 0;
-      PFN_vkCmdEndDebugUtilsLabelEXT      vkCmdEndDebugUtilsLabelEXT      = 0;
-      PFN_vkCmdInsertDebugUtilsLabelEXT   vkCmdInsertDebugUtilsLabelEXT   = 0;
-      PFN_vkCreateDebugUtilsMessengerEXT  vkCreateDebugUtilsMessengerEXT  = 0;
-      PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = 0;
-      PFN_vkSubmitDebugUtilsMessageEXT    vkSubmitDebugUtilsMessageEXT    = 0;
+      vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetInstanceProcAddr( instance, "vkSetDebugUtilsObjectNameEXT" ) );
+      vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetInstanceProcAddr( instance, "vkSetDebugUtilsObjectTagEXT" ) );
+      vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueBeginDebugUtilsLabelEXT" ) );
+      vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueEndDebugUtilsLabelEXT" ) );
+      vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueInsertDebugUtilsLabelEXT" ) );
+      vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginDebugUtilsLabelEXT" ) );
+      vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdEndDebugUtilsLabelEXT" ) );
+      vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdInsertDebugUtilsLabelEXT" ) );
+      vkCreateDebugUtilsMessengerEXT  = PFN_vkCreateDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugUtilsMessengerEXT" ) );
+      vkDestroyDebugUtilsMessengerEXT = PFN_vkDestroyDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugUtilsMessengerEXT" ) );
+      vkSubmitDebugUtilsMessageEXT    = PFN_vkSubmitDebugUtilsMessageEXT( vkGetInstanceProcAddr( instance, "vkSubmitDebugUtilsMessageEXT" ) );
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
       //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-      PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID = 0;
-      PFN_vkGetMemoryAndroidHardwareBufferANDROID     vkGetMemoryAndroidHardwareBufferANDROID     = 0;
-#else
-      PFN_dummy vkGetAndroidHardwareBufferPropertiesANDROID_placeholder = 0;
-      PFN_dummy vkGetMemoryAndroidHardwareBufferANDROID_placeholder     = 0;
+      vkGetAndroidHardwareBufferPropertiesANDROID =
+        PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetInstanceProcAddr( instance, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
+      vkGetMemoryAndroidHardwareBufferANDROID =
+        PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetInstanceProcAddr( instance, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_AMDX_shader_enqueue ===
-      PFN_vkCreateExecutionGraphPipelinesAMDX        vkCreateExecutionGraphPipelinesAMDX        = 0;
-      PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX = 0;
-      PFN_vkGetExecutionGraphPipelineNodeIndexAMDX   vkGetExecutionGraphPipelineNodeIndexAMDX   = 0;
-      PFN_vkCmdInitializeGraphScratchMemoryAMDX      vkCmdInitializeGraphScratchMemoryAMDX      = 0;
-      PFN_vkCmdDispatchGraphAMDX                     vkCmdDispatchGraphAMDX                     = 0;
-      PFN_vkCmdDispatchGraphIndirectAMDX             vkCmdDispatchGraphIndirectAMDX             = 0;
-      PFN_vkCmdDispatchGraphIndirectCountAMDX        vkCmdDispatchGraphIndirectCountAMDX        = 0;
-#else
-      PFN_dummy vkCreateExecutionGraphPipelinesAMDX_placeholder        = 0;
-      PFN_dummy vkGetExecutionGraphPipelineScratchSizeAMDX_placeholder = 0;
-      PFN_dummy vkGetExecutionGraphPipelineNodeIndexAMDX_placeholder   = 0;
-      PFN_dummy vkCmdInitializeGraphScratchMemoryAMDX_placeholder      = 0;
-      PFN_dummy vkCmdDispatchGraphAMDX_placeholder                     = 0;
-      PFN_dummy vkCmdDispatchGraphIndirectAMDX_placeholder             = 0;
-      PFN_dummy vkCmdDispatchGraphIndirectCountAMDX_placeholder        = 0;
+      vkCreateExecutionGraphPipelinesAMDX = PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetInstanceProcAddr( instance, "vkCreateExecutionGraphPipelinesAMDX" ) );
+      vkGetExecutionGraphPipelineScratchSizeAMDX =
+        PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetInstanceProcAddr( instance, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
+      vkGetExecutionGraphPipelineNodeIndexAMDX =
+        PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetInstanceProcAddr( instance, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
+      vkCmdInitializeGraphScratchMemoryAMDX =
+        PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetInstanceProcAddr( instance, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
+      vkCmdDispatchGraphAMDX              = PFN_vkCmdDispatchGraphAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphAMDX" ) );
+      vkCmdDispatchGraphIndirectAMDX      = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphIndirectAMDX" ) );
+      vkCmdDispatchGraphIndirectCountAMDX = PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphIndirectCountAMDX" ) );
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
       //=== VK_EXT_sample_locations ===
-      PFN_vkCmdSetSampleLocationsEXT                  vkCmdSetSampleLocationsEXT                  = 0;
-      PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT = 0;
+      vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleLocationsEXT" ) );
+      vkGetPhysicalDeviceMultisamplePropertiesEXT =
+        PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT" ) );
 
       //=== VK_KHR_get_memory_requirements2 ===
-      PFN_vkGetImageMemoryRequirements2KHR       vkGetImageMemoryRequirements2KHR       = 0;
-      PFN_vkGetBufferMemoryRequirements2KHR      vkGetBufferMemoryRequirements2KHR      = 0;
-      PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR = 0;
+      vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements2KHR" ) );
+      if ( !vkGetImageMemoryRequirements2 )
+        vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
+      vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements2KHR" ) );
+      if ( !vkGetBufferMemoryRequirements2 )
+        vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
+      vkGetImageSparseMemoryRequirements2KHR =
+        PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements2KHR" ) );
+      if ( !vkGetImageSparseMemoryRequirements2 )
+        vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
 
       //=== VK_KHR_acceleration_structure ===
-      PFN_vkCreateAccelerationStructureKHR                 vkCreateAccelerationStructureKHR                 = 0;
-      PFN_vkDestroyAccelerationStructureKHR                vkDestroyAccelerationStructureKHR                = 0;
-      PFN_vkCmdBuildAccelerationStructuresKHR              vkCmdBuildAccelerationStructuresKHR              = 0;
-      PFN_vkCmdBuildAccelerationStructuresIndirectKHR      vkCmdBuildAccelerationStructuresIndirectKHR      = 0;
-      PFN_vkBuildAccelerationStructuresKHR                 vkBuildAccelerationStructuresKHR                 = 0;
-      PFN_vkCopyAccelerationStructureKHR                   vkCopyAccelerationStructureKHR                   = 0;
-      PFN_vkCopyAccelerationStructureToMemoryKHR           vkCopyAccelerationStructureToMemoryKHR           = 0;
-      PFN_vkCopyMemoryToAccelerationStructureKHR           vkCopyMemoryToAccelerationStructureKHR           = 0;
-      PFN_vkWriteAccelerationStructuresPropertiesKHR       vkWriteAccelerationStructuresPropertiesKHR       = 0;
-      PFN_vkCmdCopyAccelerationStructureKHR                vkCmdCopyAccelerationStructureKHR                = 0;
-      PFN_vkCmdCopyAccelerationStructureToMemoryKHR        vkCmdCopyAccelerationStructureToMemoryKHR        = 0;
-      PFN_vkCmdCopyMemoryToAccelerationStructureKHR        vkCmdCopyMemoryToAccelerationStructureKHR        = 0;
-      PFN_vkGetAccelerationStructureDeviceAddressKHR       vkGetAccelerationStructureDeviceAddressKHR       = 0;
-      PFN_vkCmdWriteAccelerationStructuresPropertiesKHR    vkCmdWriteAccelerationStructuresPropertiesKHR    = 0;
-      PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR = 0;
-      PFN_vkGetAccelerationStructureBuildSizesKHR          vkGetAccelerationStructureBuildSizesKHR          = 0;
+      vkCreateAccelerationStructureKHR    = PFN_vkCreateAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCreateAccelerationStructureKHR" ) );
+      vkDestroyAccelerationStructureKHR   = PFN_vkDestroyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkDestroyAccelerationStructureKHR" ) );
+      vkCmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructuresKHR" ) );
+      vkCmdBuildAccelerationStructuresIndirectKHR =
+        PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
+      vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetInstanceProcAddr( instance, "vkBuildAccelerationStructuresKHR" ) );
+      vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCopyAccelerationStructureKHR" ) );
+      vkCopyAccelerationStructureToMemoryKHR =
+        PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetInstanceProcAddr( instance, "vkCopyAccelerationStructureToMemoryKHR" ) );
+      vkCopyMemoryToAccelerationStructureKHR =
+        PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCopyMemoryToAccelerationStructureKHR" ) );
+      vkWriteAccelerationStructuresPropertiesKHR =
+        PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetInstanceProcAddr( instance, "vkWriteAccelerationStructuresPropertiesKHR" ) );
+      vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureKHR" ) );
+      vkCmdCopyAccelerationStructureToMemoryKHR =
+        PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
+      vkCmdCopyMemoryToAccelerationStructureKHR =
+        PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
+      vkGetAccelerationStructureDeviceAddressKHR =
+        PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureDeviceAddressKHR" ) );
+      vkCmdWriteAccelerationStructuresPropertiesKHR =
+        PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetInstanceProcAddr( instance, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
+      vkGetDeviceAccelerationStructureCompatibilityKHR =
+        PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
+      vkGetAccelerationStructureBuildSizesKHR =
+        PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureBuildSizesKHR" ) );
 
       //=== VK_KHR_ray_tracing_pipeline ===
-      PFN_vkCmdTraceRaysKHR                                 vkCmdTraceRaysKHR                                 = 0;
-      PFN_vkCreateRayTracingPipelinesKHR                    vkCreateRayTracingPipelinesKHR                    = 0;
-      PFN_vkGetRayTracingShaderGroupHandlesKHR              vkGetRayTracingShaderGroupHandlesKHR              = 0;
-      PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR = 0;
-      PFN_vkCmdTraceRaysIndirectKHR                         vkCmdTraceRaysIndirectKHR                         = 0;
-      PFN_vkGetRayTracingShaderGroupStackSizeKHR            vkGetRayTracingShaderGroupStackSizeKHR            = 0;
-      PFN_vkCmdSetRayTracingPipelineStackSizeKHR            vkCmdSetRayTracingPipelineStackSizeKHR            = 0;
+      vkCmdTraceRaysKHR              = PFN_vkCmdTraceRaysKHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysKHR" ) );
+      vkCreateRayTracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR( vkGetInstanceProcAddr( instance, "vkCreateRayTracingPipelinesKHR" ) );
+      vkGetRayTracingShaderGroupHandlesKHR =
+        PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupHandlesKHR" ) );
+      vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
+        PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
+      vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysIndirectKHR" ) );
+      vkGetRayTracingShaderGroupStackSizeKHR =
+        PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
+      vkCmdSetRayTracingPipelineStackSizeKHR =
+        PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
 
       //=== VK_KHR_sampler_ycbcr_conversion ===
-      PFN_vkCreateSamplerYcbcrConversionKHR  vkCreateSamplerYcbcrConversionKHR  = 0;
-      PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR = 0;
+      vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetInstanceProcAddr( instance, "vkCreateSamplerYcbcrConversionKHR" ) );
+      if ( !vkCreateSamplerYcbcrConversion )
+        vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
+      vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetInstanceProcAddr( instance, "vkDestroySamplerYcbcrConversionKHR" ) );
+      if ( !vkDestroySamplerYcbcrConversion )
+        vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
 
       //=== VK_KHR_bind_memory2 ===
-      PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR = 0;
-      PFN_vkBindImageMemory2KHR  vkBindImageMemory2KHR  = 0;
+      vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetInstanceProcAddr( instance, "vkBindBufferMemory2KHR" ) );
+      if ( !vkBindBufferMemory2 )
+        vkBindBufferMemory2 = vkBindBufferMemory2KHR;
+      vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetInstanceProcAddr( instance, "vkBindImageMemory2KHR" ) );
+      if ( !vkBindImageMemory2 )
+        vkBindImageMemory2 = vkBindImageMemory2KHR;
 
       //=== VK_EXT_image_drm_format_modifier ===
-      PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT = 0;
+      vkGetImageDrmFormatModifierPropertiesEXT =
+        PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
 
       //=== VK_EXT_validation_cache ===
-      PFN_vkCreateValidationCacheEXT  vkCreateValidationCacheEXT  = 0;
-      PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT = 0;
-      PFN_vkMergeValidationCachesEXT  vkMergeValidationCachesEXT  = 0;
-      PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT = 0;
+      vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetInstanceProcAddr( instance, "vkCreateValidationCacheEXT" ) );
+      vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetInstanceProcAddr( instance, "vkDestroyValidationCacheEXT" ) );
+      vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetInstanceProcAddr( instance, "vkMergeValidationCachesEXT" ) );
+      vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetInstanceProcAddr( instance, "vkGetValidationCacheDataEXT" ) );
 
       //=== VK_NV_shading_rate_image ===
-      PFN_vkCmdBindShadingRateImageNV          vkCmdBindShadingRateImageNV          = 0;
-      PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV = 0;
-      PFN_vkCmdSetCoarseSampleOrderNV          vkCmdSetCoarseSampleOrderNV          = 0;
+      vkCmdBindShadingRateImageNV = PFN_vkCmdBindShadingRateImageNV( vkGetInstanceProcAddr( instance, "vkCmdBindShadingRateImageNV" ) );
+      vkCmdSetViewportShadingRatePaletteNV =
+        PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportShadingRatePaletteNV" ) );
+      vkCmdSetCoarseSampleOrderNV = PFN_vkCmdSetCoarseSampleOrderNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoarseSampleOrderNV" ) );
 
       //=== VK_NV_ray_tracing ===
-      PFN_vkCreateAccelerationStructureNV                vkCreateAccelerationStructureNV                = 0;
-      PFN_vkDestroyAccelerationStructureNV               vkDestroyAccelerationStructureNV               = 0;
-      PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV = 0;
-      PFN_vkBindAccelerationStructureMemoryNV            vkBindAccelerationStructureMemoryNV            = 0;
-      PFN_vkCmdBuildAccelerationStructureNV              vkCmdBuildAccelerationStructureNV              = 0;
-      PFN_vkCmdCopyAccelerationStructureNV               vkCmdCopyAccelerationStructureNV               = 0;
-      PFN_vkCmdTraceRaysNV                               vkCmdTraceRaysNV                               = 0;
-      PFN_vkCreateRayTracingPipelinesNV                  vkCreateRayTracingPipelinesNV                  = 0;
-      PFN_vkGetRayTracingShaderGroupHandlesNV            vkGetRayTracingShaderGroupHandlesNV            = 0;
-      PFN_vkGetAccelerationStructureHandleNV             vkGetAccelerationStructureHandleNV             = 0;
-      PFN_vkCmdWriteAccelerationStructuresPropertiesNV   vkCmdWriteAccelerationStructuresPropertiesNV   = 0;
-      PFN_vkCompileDeferredNV                            vkCompileDeferredNV                            = 0;
+      vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCreateAccelerationStructureNV" ) );
+      vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkDestroyAccelerationStructureNV" ) );
+      vkGetAccelerationStructureMemoryRequirementsNV =
+        PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
+      vkBindAccelerationStructureMemoryNV = PFN_vkBindAccelerationStructureMemoryNV( vkGetInstanceProcAddr( instance, "vkBindAccelerationStructureMemoryNV" ) );
+      vkCmdBuildAccelerationStructureNV   = PFN_vkCmdBuildAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructureNV" ) );
+      vkCmdCopyAccelerationStructureNV    = PFN_vkCmdCopyAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureNV" ) );
+      vkCmdTraceRaysNV                    = PFN_vkCmdTraceRaysNV( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysNV" ) );
+      vkCreateRayTracingPipelinesNV       = PFN_vkCreateRayTracingPipelinesNV( vkGetInstanceProcAddr( instance, "vkCreateRayTracingPipelinesNV" ) );
+      vkGetRayTracingShaderGroupHandlesNV = PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupHandlesNV" ) );
+      if ( !vkGetRayTracingShaderGroupHandlesKHR )
+        vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
+      vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureHandleNV" ) );
+      vkCmdWriteAccelerationStructuresPropertiesNV =
+        PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetInstanceProcAddr( instance, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
+      vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetInstanceProcAddr( instance, "vkCompileDeferredNV" ) );
 
       //=== VK_KHR_maintenance3 ===
-      PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR = 0;
+      vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSupportKHR" ) );
+      if ( !vkGetDescriptorSetLayoutSupport )
+        vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
 
       //=== VK_KHR_draw_indirect_count ===
-      PFN_vkCmdDrawIndirectCountKHR        vkCmdDrawIndirectCountKHR        = 0;
-      PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR = 0;
+      vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCountKHR" ) );
+      if ( !vkCmdDrawIndirectCount )
+        vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
+      vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCountKHR" ) );
+      if ( !vkCmdDrawIndexedIndirectCount )
+        vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
 
       //=== VK_EXT_external_memory_host ===
-      PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT = 0;
+      vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetMemoryHostPointerPropertiesEXT" ) );
 
       //=== VK_AMD_buffer_marker ===
-      PFN_vkCmdWriteBufferMarkerAMD  vkCmdWriteBufferMarkerAMD  = 0;
-      PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD = 0;
+      vkCmdWriteBufferMarkerAMD = PFN_vkCmdWriteBufferMarkerAMD( vkGetInstanceProcAddr( instance, "vkCmdWriteBufferMarkerAMD" ) );
 
       //=== VK_EXT_calibrated_timestamps ===
-      PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = 0;
-      PFN_vkGetCalibratedTimestampsEXT                   vkGetCalibratedTimestampsEXT                   = 0;
+      vkGetPhysicalDeviceCalibrateableTimeDomainsEXT =
+        PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" ) );
+      if ( !vkGetPhysicalDeviceCalibrateableTimeDomainsKHR )
+        vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
+      vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetInstanceProcAddr( instance, "vkGetCalibratedTimestampsEXT" ) );
+      if ( !vkGetCalibratedTimestampsKHR )
+        vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
 
       //=== VK_NV_mesh_shader ===
-      PFN_vkCmdDrawMeshTasksNV              vkCmdDrawMeshTasksNV              = 0;
-      PFN_vkCmdDrawMeshTasksIndirectNV      vkCmdDrawMeshTasksIndirectNV      = 0;
-      PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV = 0;
+      vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksNV" ) );
+      vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectNV" ) );
+      vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectCountNV" ) );
 
       //=== VK_NV_scissor_exclusive ===
-      PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV = 0;
-      PFN_vkCmdSetExclusiveScissorNV       vkCmdSetExclusiveScissorNV       = 0;
+      vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetExclusiveScissorEnableNV" ) );
+      vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetInstanceProcAddr( instance, "vkCmdSetExclusiveScissorNV" ) );
 
       //=== VK_NV_device_diagnostic_checkpoints ===
-      PFN_vkCmdSetCheckpointNV        vkCmdSetCheckpointNV        = 0;
-      PFN_vkGetQueueCheckpointDataNV  vkGetQueueCheckpointDataNV  = 0;
-      PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV = 0;
+      vkCmdSetCheckpointNV       = PFN_vkCmdSetCheckpointNV( vkGetInstanceProcAddr( instance, "vkCmdSetCheckpointNV" ) );
+      vkGetQueueCheckpointDataNV = PFN_vkGetQueueCheckpointDataNV( vkGetInstanceProcAddr( instance, "vkGetQueueCheckpointDataNV" ) );
 
       //=== VK_KHR_timeline_semaphore ===
-      PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR = 0;
-      PFN_vkWaitSemaphoresKHR           vkWaitSemaphoresKHR           = 0;
-      PFN_vkSignalSemaphoreKHR          vkSignalSemaphoreKHR          = 0;
-
-      //=== VK_EXT_present_timing ===
-      PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT = 0;
-      PFN_vkGetSwapchainTimingPropertiesEXT       vkGetSwapchainTimingPropertiesEXT       = 0;
-      PFN_vkGetSwapchainTimeDomainPropertiesEXT   vkGetSwapchainTimeDomainPropertiesEXT   = 0;
-      PFN_vkGetPastPresentationTimingEXT          vkGetPastPresentationTimingEXT          = 0;
+      vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreCounterValueKHR" ) );
+      if ( !vkGetSemaphoreCounterValue )
+        vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
+      vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetInstanceProcAddr( instance, "vkWaitSemaphoresKHR" ) );
+      if ( !vkWaitSemaphores )
+        vkWaitSemaphores = vkWaitSemaphoresKHR;
+      vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetInstanceProcAddr( instance, "vkSignalSemaphoreKHR" ) );
+      if ( !vkSignalSemaphore )
+        vkSignalSemaphore = vkSignalSemaphoreKHR;
 
       //=== VK_INTEL_performance_query ===
-      PFN_vkInitializePerformanceApiINTEL         vkInitializePerformanceApiINTEL         = 0;
-      PFN_vkUninitializePerformanceApiINTEL       vkUninitializePerformanceApiINTEL       = 0;
-      PFN_vkCmdSetPerformanceMarkerINTEL          vkCmdSetPerformanceMarkerINTEL          = 0;
-      PFN_vkCmdSetPerformanceStreamMarkerINTEL    vkCmdSetPerformanceStreamMarkerINTEL    = 0;
-      PFN_vkCmdSetPerformanceOverrideINTEL        vkCmdSetPerformanceOverrideINTEL        = 0;
-      PFN_vkAcquirePerformanceConfigurationINTEL  vkAcquirePerformanceConfigurationINTEL  = 0;
-      PFN_vkReleasePerformanceConfigurationINTEL  vkReleasePerformanceConfigurationINTEL  = 0;
-      PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL = 0;
-      PFN_vkGetPerformanceParameterINTEL          vkGetPerformanceParameterINTEL          = 0;
+      vkInitializePerformanceApiINTEL   = PFN_vkInitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkInitializePerformanceApiINTEL" ) );
+      vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkUninitializePerformanceApiINTEL" ) );
+      vkCmdSetPerformanceMarkerINTEL    = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceMarkerINTEL" ) );
+      vkCmdSetPerformanceStreamMarkerINTEL =
+        PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
+      vkCmdSetPerformanceOverrideINTEL = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceOverrideINTEL" ) );
+      vkAcquirePerformanceConfigurationINTEL =
+        PFN_vkAcquirePerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkAcquirePerformanceConfigurationINTEL" ) );
+      vkReleasePerformanceConfigurationINTEL =
+        PFN_vkReleasePerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkReleasePerformanceConfigurationINTEL" ) );
+      vkQueueSetPerformanceConfigurationINTEL =
+        PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkQueueSetPerformanceConfigurationINTEL" ) );
+      vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetInstanceProcAddr( instance, "vkGetPerformanceParameterINTEL" ) );
 
       //=== VK_AMD_display_native_hdr ===
-      PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD = 0;
+      vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetInstanceProcAddr( instance, "vkSetLocalDimmingAMD" ) );
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_imagepipe_surface ===
-      PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA = 0;
-#else
-      PFN_dummy vkCreateImagePipeSurfaceFUCHSIA_placeholder = 0;
+      vkCreateImagePipeSurfaceFUCHSIA = PFN_vkCreateImagePipeSurfaceFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateImagePipeSurfaceFUCHSIA" ) );
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
       //=== VK_EXT_metal_surface ===
-      PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT = 0;
-#else
-      PFN_dummy vkCreateMetalSurfaceEXT_placeholder = 0;
+      vkCreateMetalSurfaceEXT = PFN_vkCreateMetalSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateMetalSurfaceEXT" ) );
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
       //=== VK_KHR_fragment_shading_rate ===
-      PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR = 0;
-      PFN_vkCmdSetFragmentShadingRateKHR             vkCmdSetFragmentShadingRateKHR             = 0;
+      vkGetPhysicalDeviceFragmentShadingRatesKHR =
+        PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFragmentShadingRatesKHR" ) );
+      vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetInstanceProcAddr( instance, "vkCmdSetFragmentShadingRateKHR" ) );
 
       //=== VK_KHR_dynamic_rendering_local_read ===
-      PFN_vkCmdSetRenderingAttachmentLocationsKHR    vkCmdSetRenderingAttachmentLocationsKHR    = 0;
-      PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR = 0;
+      vkCmdSetRenderingAttachmentLocationsKHR =
+        PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
+      vkCmdSetRenderingInputAttachmentIndicesKHR =
+        PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
 
       //=== VK_EXT_buffer_device_address ===
-      PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT = 0;
+      vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddressEXT" ) );
+      if ( !vkGetBufferDeviceAddress )
+        vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
 
       //=== VK_EXT_tooling_info ===
-      PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT = 0;
+      vkGetPhysicalDeviceToolPropertiesEXT =
+        PFN_vkGetPhysicalDeviceToolPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolPropertiesEXT" ) );
+      if ( !vkGetPhysicalDeviceToolProperties )
+        vkGetPhysicalDeviceToolProperties = vkGetPhysicalDeviceToolPropertiesEXT;
 
       //=== VK_KHR_present_wait ===
-      PFN_vkWaitForPresentKHR vkWaitForPresentKHR = 0;
+      vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetInstanceProcAddr( instance, "vkWaitForPresentKHR" ) );
 
       //=== VK_NV_cooperative_matrix ===
-      PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = 0;
+      vkGetPhysicalDeviceCooperativeMatrixPropertiesNV =
+        PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV" ) );
 
       //=== VK_NV_coverage_reduction_mode ===
-      PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = 0;
+      vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+        vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV" ) );
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_EXT_full_screen_exclusive ===
-      PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT = 0;
-      PFN_vkAcquireFullScreenExclusiveModeEXT        vkAcquireFullScreenExclusiveModeEXT        = 0;
-      PFN_vkReleaseFullScreenExclusiveModeEXT        vkReleaseFullScreenExclusiveModeEXT        = 0;
-      PFN_vkGetDeviceGroupSurfacePresentModes2EXT    vkGetDeviceGroupSurfacePresentModes2EXT    = 0;
-#else
-      PFN_dummy vkGetPhysicalDeviceSurfacePresentModes2EXT_placeholder = 0;
-      PFN_dummy vkAcquireFullScreenExclusiveModeEXT_placeholder        = 0;
-      PFN_dummy vkReleaseFullScreenExclusiveModeEXT_placeholder        = 0;
-      PFN_dummy vkGetDeviceGroupSurfacePresentModes2EXT_placeholder    = 0;
+      vkGetPhysicalDeviceSurfacePresentModes2EXT =
+        PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT" ) );
+      vkAcquireFullScreenExclusiveModeEXT = PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetInstanceProcAddr( instance, "vkAcquireFullScreenExclusiveModeEXT" ) );
+      vkReleaseFullScreenExclusiveModeEXT = PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetInstanceProcAddr( instance, "vkReleaseFullScreenExclusiveModeEXT" ) );
+      vkGetDeviceGroupSurfacePresentModes2EXT =
+        PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_EXT_headless_surface ===
-      PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT = 0;
+      vkCreateHeadlessSurfaceEXT = PFN_vkCreateHeadlessSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateHeadlessSurfaceEXT" ) );
 
       //=== VK_KHR_buffer_device_address ===
-      PFN_vkGetBufferDeviceAddressKHR              vkGetBufferDeviceAddressKHR              = 0;
-      PFN_vkGetBufferOpaqueCaptureAddressKHR       vkGetBufferOpaqueCaptureAddressKHR       = 0;
-      PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR = 0;
+      vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddressKHR" ) );
+      if ( !vkGetBufferDeviceAddress )
+        vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
+      vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureAddressKHR" ) );
+      if ( !vkGetBufferOpaqueCaptureAddress )
+        vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
+      vkGetDeviceMemoryOpaqueCaptureAddressKHR =
+        PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
+      if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
+        vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
 
       //=== VK_EXT_line_rasterization ===
-      PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT = 0;
+      vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleEXT" ) );
+      if ( !vkCmdSetLineStippleKHR )
+        vkCmdSetLineStippleKHR = vkCmdSetLineStippleEXT;
 
       //=== VK_EXT_host_query_reset ===
-      PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT = 0;
+      vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetInstanceProcAddr( instance, "vkResetQueryPoolEXT" ) );
+      if ( !vkResetQueryPool )
+        vkResetQueryPool = vkResetQueryPoolEXT;
 
       //=== VK_EXT_extended_dynamic_state ===
-      PFN_vkCmdSetCullModeEXT              vkCmdSetCullModeEXT              = 0;
-      PFN_vkCmdSetFrontFaceEXT             vkCmdSetFrontFaceEXT             = 0;
-      PFN_vkCmdSetPrimitiveTopologyEXT     vkCmdSetPrimitiveTopologyEXT     = 0;
-      PFN_vkCmdSetViewportWithCountEXT     vkCmdSetViewportWithCountEXT     = 0;
-      PFN_vkCmdSetScissorWithCountEXT      vkCmdSetScissorWithCountEXT      = 0;
-      PFN_vkCmdBindVertexBuffers2EXT       vkCmdBindVertexBuffers2EXT       = 0;
-      PFN_vkCmdSetDepthTestEnableEXT       vkCmdSetDepthTestEnableEXT       = 0;
-      PFN_vkCmdSetDepthWriteEnableEXT      vkCmdSetDepthWriteEnableEXT      = 0;
-      PFN_vkCmdSetDepthCompareOpEXT        vkCmdSetDepthCompareOpEXT        = 0;
-      PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT = 0;
-      PFN_vkCmdSetStencilTestEnableEXT     vkCmdSetStencilTestEnableEXT     = 0;
-      PFN_vkCmdSetStencilOpEXT             vkCmdSetStencilOpEXT             = 0;
+      vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetCullModeEXT" ) );
+      if ( !vkCmdSetCullMode )
+        vkCmdSetCullMode = vkCmdSetCullModeEXT;
+      vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetInstanceProcAddr( instance, "vkCmdSetFrontFaceEXT" ) );
+      if ( !vkCmdSetFrontFace )
+        vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
+      vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveTopologyEXT" ) );
+      if ( !vkCmdSetPrimitiveTopology )
+        vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
+      vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWithCountEXT" ) );
+      if ( !vkCmdSetViewportWithCount )
+        vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
+      vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetInstanceProcAddr( instance, "vkCmdSetScissorWithCountEXT" ) );
+      if ( !vkCmdSetScissorWithCount )
+        vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
+      vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers2EXT" ) );
+      if ( !vkCmdBindVertexBuffers2 )
+        vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
+      vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthTestEnableEXT" ) );
+      if ( !vkCmdSetDepthTestEnable )
+        vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
+      vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthWriteEnableEXT" ) );
+      if ( !vkCmdSetDepthWriteEnable )
+        vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
+      vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthCompareOpEXT" ) );
+      if ( !vkCmdSetDepthCompareOp )
+        vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
+      vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBoundsTestEnableEXT" ) );
+      if ( !vkCmdSetDepthBoundsTestEnable )
+        vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
+      vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetStencilTestEnableEXT" ) );
+      if ( !vkCmdSetStencilTestEnable )
+        vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
+      vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetStencilOpEXT" ) );
+      if ( !vkCmdSetStencilOp )
+        vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
 
       //=== VK_KHR_deferred_host_operations ===
-      PFN_vkCreateDeferredOperationKHR            vkCreateDeferredOperationKHR            = 0;
-      PFN_vkDestroyDeferredOperationKHR           vkDestroyDeferredOperationKHR           = 0;
-      PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR = 0;
-      PFN_vkGetDeferredOperationResultKHR         vkGetDeferredOperationResultKHR         = 0;
-      PFN_vkDeferredOperationJoinKHR              vkDeferredOperationJoinKHR              = 0;
+      vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetInstanceProcAddr( instance, "vkCreateDeferredOperationKHR" ) );
+      vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetInstanceProcAddr( instance, "vkDestroyDeferredOperationKHR" ) );
+      vkGetDeferredOperationMaxConcurrencyKHR =
+        PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetInstanceProcAddr( instance, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
+      vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetInstanceProcAddr( instance, "vkGetDeferredOperationResultKHR" ) );
+      vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetInstanceProcAddr( instance, "vkDeferredOperationJoinKHR" ) );
 
       //=== VK_KHR_pipeline_executable_properties ===
-      PFN_vkGetPipelineExecutablePropertiesKHR              vkGetPipelineExecutablePropertiesKHR              = 0;
-      PFN_vkGetPipelineExecutableStatisticsKHR              vkGetPipelineExecutableStatisticsKHR              = 0;
-      PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR = 0;
+      vkGetPipelineExecutablePropertiesKHR =
+        PFN_vkGetPipelineExecutablePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutablePropertiesKHR" ) );
+      vkGetPipelineExecutableStatisticsKHR =
+        PFN_vkGetPipelineExecutableStatisticsKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutableStatisticsKHR" ) );
+      vkGetPipelineExecutableInternalRepresentationsKHR =
+        PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
 
       //=== VK_EXT_host_image_copy ===
-      PFN_vkCopyMemoryToImageEXT          vkCopyMemoryToImageEXT          = 0;
-      PFN_vkCopyImageToMemoryEXT          vkCopyImageToMemoryEXT          = 0;
-      PFN_vkCopyImageToImageEXT           vkCopyImageToImageEXT           = 0;
-      PFN_vkTransitionImageLayoutEXT      vkTransitionImageLayoutEXT      = 0;
-      PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT = 0;
+      vkCopyMemoryToImageEXT          = PFN_vkCopyMemoryToImageEXT( vkGetInstanceProcAddr( instance, "vkCopyMemoryToImageEXT" ) );
+      vkCopyImageToMemoryEXT          = PFN_vkCopyImageToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCopyImageToMemoryEXT" ) );
+      vkCopyImageToImageEXT           = PFN_vkCopyImageToImageEXT( vkGetInstanceProcAddr( instance, "vkCopyImageToImageEXT" ) );
+      vkTransitionImageLayoutEXT      = PFN_vkTransitionImageLayoutEXT( vkGetInstanceProcAddr( instance, "vkTransitionImageLayoutEXT" ) );
+      vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout2EXT" ) );
+      if ( !vkGetImageSubresourceLayout2KHR )
+        vkGetImageSubresourceLayout2KHR = vkGetImageSubresourceLayout2EXT;
 
       //=== VK_KHR_map_memory2 ===
-      PFN_vkMapMemory2KHR   vkMapMemory2KHR   = 0;
-      PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR = 0;
+      vkMapMemory2KHR   = PFN_vkMapMemory2KHR( vkGetInstanceProcAddr( instance, "vkMapMemory2KHR" ) );
+      vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetInstanceProcAddr( instance, "vkUnmapMemory2KHR" ) );
 
       //=== VK_EXT_swapchain_maintenance1 ===
-      PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT = 0;
+      vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetInstanceProcAddr( instance, "vkReleaseSwapchainImagesEXT" ) );
 
       //=== VK_NV_device_generated_commands ===
-      PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV = 0;
-      PFN_vkCmdPreprocessGeneratedCommandsNV         vkCmdPreprocessGeneratedCommandsNV         = 0;
-      PFN_vkCmdExecuteGeneratedCommandsNV            vkCmdExecuteGeneratedCommandsNV            = 0;
-      PFN_vkCmdBindPipelineShaderGroupNV             vkCmdBindPipelineShaderGroupNV             = 0;
-      PFN_vkCreateIndirectCommandsLayoutNV           vkCreateIndirectCommandsLayoutNV           = 0;
-      PFN_vkDestroyIndirectCommandsLayoutNV          vkDestroyIndirectCommandsLayoutNV          = 0;
+      vkGetGeneratedCommandsMemoryRequirementsNV =
+        PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
+      vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetInstanceProcAddr( instance, "vkCmdPreprocessGeneratedCommandsNV" ) );
+      vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetInstanceProcAddr( instance, "vkCmdExecuteGeneratedCommandsNV" ) );
+      vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetInstanceProcAddr( instance, "vkCmdBindPipelineShaderGroupNV" ) );
+      vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetInstanceProcAddr( instance, "vkCreateIndirectCommandsLayoutNV" ) );
+      vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetInstanceProcAddr( instance, "vkDestroyIndirectCommandsLayoutNV" ) );
 
       //=== VK_EXT_depth_bias_control ===
-      PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT = 0;
+      vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBias2EXT" ) );
 
       //=== VK_EXT_acquire_drm_display ===
-      PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT = 0;
-      PFN_vkGetDrmDisplayEXT     vkGetDrmDisplayEXT     = 0;
+      vkAcquireDrmDisplayEXT = PFN_vkAcquireDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireDrmDisplayEXT" ) );
+      vkGetDrmDisplayEXT     = PFN_vkGetDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetDrmDisplayEXT" ) );
 
       //=== VK_EXT_private_data ===
-      PFN_vkCreatePrivateDataSlotEXT  vkCreatePrivateDataSlotEXT  = 0;
-      PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT = 0;
-      PFN_vkSetPrivateDataEXT         vkSetPrivateDataEXT         = 0;
-      PFN_vkGetPrivateDataEXT         vkGetPrivateDataEXT         = 0;
+      vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetInstanceProcAddr( instance, "vkCreatePrivateDataSlotEXT" ) );
+      if ( !vkCreatePrivateDataSlot )
+        vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
+      vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetInstanceProcAddr( instance, "vkDestroyPrivateDataSlotEXT" ) );
+      if ( !vkDestroyPrivateDataSlot )
+        vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
+      vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetInstanceProcAddr( instance, "vkSetPrivateDataEXT" ) );
+      if ( !vkSetPrivateData )
+        vkSetPrivateData = vkSetPrivateDataEXT;
+      vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetInstanceProcAddr( instance, "vkGetPrivateDataEXT" ) );
+      if ( !vkGetPrivateData )
+        vkGetPrivateData = vkGetPrivateDataEXT;
 
       //=== VK_KHR_video_encode_queue ===
-      PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = 0;
-      PFN_vkGetEncodedVideoSessionParametersKHR                   vkGetEncodedVideoSessionParametersKHR                   = 0;
-      PFN_vkCmdEncodeVideoKHR                                     vkCmdEncodeVideoKHR                                     = 0;
+      vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+        vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR" ) );
+      vkGetEncodedVideoSessionParametersKHR =
+        PFN_vkGetEncodedVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkGetEncodedVideoSessionParametersKHR" ) );
+      vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetInstanceProcAddr( instance, "vkCmdEncodeVideoKHR" ) );
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_NV_cuda_kernel_launch ===
-      PFN_vkCreateCudaModuleNV    vkCreateCudaModuleNV    = 0;
-      PFN_vkGetCudaModuleCacheNV  vkGetCudaModuleCacheNV  = 0;
-      PFN_vkCreateCudaFunctionNV  vkCreateCudaFunctionNV  = 0;
-      PFN_vkDestroyCudaModuleNV   vkDestroyCudaModuleNV   = 0;
-      PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV = 0;
-      PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV = 0;
-#else
-      PFN_dummy vkCreateCudaModuleNV_placeholder    = 0;
-      PFN_dummy vkGetCudaModuleCacheNV_placeholder  = 0;
-      PFN_dummy vkCreateCudaFunctionNV_placeholder  = 0;
-      PFN_dummy vkDestroyCudaModuleNV_placeholder   = 0;
-      PFN_dummy vkDestroyCudaFunctionNV_placeholder = 0;
-      PFN_dummy vkCmdCudaLaunchKernelNV_placeholder = 0;
+      vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetInstanceProcAddr( instance, "vkCreateCudaModuleNV" ) );
+      vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetInstanceProcAddr( instance, "vkGetCudaModuleCacheNV" ) );
+      vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetInstanceProcAddr( instance, "vkCreateCudaFunctionNV" ) );
+      vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetInstanceProcAddr( instance, "vkDestroyCudaModuleNV" ) );
+      vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetInstanceProcAddr( instance, "vkDestroyCudaFunctionNV" ) );
+      vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetInstanceProcAddr( instance, "vkCmdCudaLaunchKernelNV" ) );
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-      //=== VK_QCOM_tile_shading ===
-      PFN_vkCmdDispatchTileQCOM          vkCmdDispatchTileQCOM          = 0;
-      PFN_vkCmdBeginPerTileExecutionQCOM vkCmdBeginPerTileExecutionQCOM = 0;
-      PFN_vkCmdEndPerTileExecutionQCOM   vkCmdEndPerTileExecutionQCOM   = 0;
-
 #if defined( VK_USE_PLATFORM_METAL_EXT )
       //=== VK_EXT_metal_objects ===
-      PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT = 0;
-#else
-      PFN_dummy vkExportMetalObjectsEXT_placeholder = 0;
+      vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetInstanceProcAddr( instance, "vkExportMetalObjectsEXT" ) );
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
       //=== VK_KHR_synchronization2 ===
-      PFN_vkCmdSetEvent2KHR        vkCmdSetEvent2KHR        = 0;
-      PFN_vkCmdResetEvent2KHR      vkCmdResetEvent2KHR      = 0;
-      PFN_vkCmdWaitEvents2KHR      vkCmdWaitEvents2KHR      = 0;
-      PFN_vkCmdPipelineBarrier2KHR vkCmdPipelineBarrier2KHR = 0;
-      PFN_vkCmdWriteTimestamp2KHR  vkCmdWriteTimestamp2KHR  = 0;
-      PFN_vkQueueSubmit2KHR        vkQueueSubmit2KHR        = 0;
+      vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetInstanceProcAddr( instance, "vkCmdSetEvent2KHR" ) );
+      if ( !vkCmdSetEvent2 )
+        vkCmdSetEvent2 = vkCmdSetEvent2KHR;
+      vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetInstanceProcAddr( instance, "vkCmdResetEvent2KHR" ) );
+      if ( !vkCmdResetEvent2 )
+        vkCmdResetEvent2 = vkCmdResetEvent2KHR;
+      vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents2KHR" ) );
+      if ( !vkCmdWaitEvents2 )
+        vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
+      vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier2KHR" ) );
+      if ( !vkCmdPipelineBarrier2 )
+        vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
+      vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp2KHR" ) );
+      if ( !vkCmdWriteTimestamp2 )
+        vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
+      vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetInstanceProcAddr( instance, "vkQueueSubmit2KHR" ) );
+      if ( !vkQueueSubmit2 )
+        vkQueueSubmit2 = vkQueueSubmit2KHR;
+      vkCmdWriteBufferMarker2AMD  = PFN_vkCmdWriteBufferMarker2AMD( vkGetInstanceProcAddr( instance, "vkCmdWriteBufferMarker2AMD" ) );
+      vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetInstanceProcAddr( instance, "vkGetQueueCheckpointData2NV" ) );
 
       //=== VK_EXT_descriptor_buffer ===
-      PFN_vkGetDescriptorSetLayoutSizeEXT                          vkGetDescriptorSetLayoutSizeEXT                          = 0;
-      PFN_vkGetDescriptorSetLayoutBindingOffsetEXT                 vkGetDescriptorSetLayoutBindingOffsetEXT                 = 0;
-      PFN_vkGetDescriptorEXT                                       vkGetDescriptorEXT                                       = 0;
-      PFN_vkCmdBindDescriptorBuffersEXT                            vkCmdBindDescriptorBuffersEXT                            = 0;
-      PFN_vkCmdSetDescriptorBufferOffsetsEXT                       vkCmdSetDescriptorBufferOffsetsEXT                       = 0;
-      PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT             vkCmdBindDescriptorBufferEmbeddedSamplersEXT             = 0;
-      PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT                vkGetBufferOpaqueCaptureDescriptorDataEXT                = 0;
-      PFN_vkGetImageOpaqueCaptureDescriptorDataEXT                 vkGetImageOpaqueCaptureDescriptorDataEXT                 = 0;
-      PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT             vkGetImageViewOpaqueCaptureDescriptorDataEXT             = 0;
-      PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT               vkGetSamplerOpaqueCaptureDescriptorDataEXT               = 0;
-      PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = 0;
+      vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSizeEXT" ) );
+      vkGetDescriptorSetLayoutBindingOffsetEXT =
+        PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
+      vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorEXT" ) );
+      vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBuffersEXT" ) );
+      vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
+      vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
+        PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
+      vkGetBufferOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetImageOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetImageViewOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetSamplerOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+        vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
 
       //=== VK_NV_fragment_shading_rate_enums ===
-      PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV = 0;
+      vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetInstanceProcAddr( instance, "vkCmdSetFragmentShadingRateEnumNV" ) );
 
       //=== VK_EXT_mesh_shader ===
-      PFN_vkCmdDrawMeshTasksEXT              vkCmdDrawMeshTasksEXT              = 0;
-      PFN_vkCmdDrawMeshTasksIndirectEXT      vkCmdDrawMeshTasksIndirectEXT      = 0;
-      PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT = 0;
+      vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksEXT" ) );
+      vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectEXT" ) );
+      vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
 
       //=== VK_KHR_copy_commands2 ===
-      PFN_vkCmdCopyBuffer2KHR        vkCmdCopyBuffer2KHR        = 0;
-      PFN_vkCmdCopyImage2KHR         vkCmdCopyImage2KHR         = 0;
-      PFN_vkCmdCopyBufferToImage2KHR vkCmdCopyBufferToImage2KHR = 0;
-      PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR = 0;
-      PFN_vkCmdBlitImage2KHR         vkCmdBlitImage2KHR         = 0;
-      PFN_vkCmdResolveImage2KHR      vkCmdResolveImage2KHR      = 0;
+      vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer2KHR" ) );
+      if ( !vkCmdCopyBuffer2 )
+        vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
+      vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyImage2KHR" ) );
+      if ( !vkCmdCopyImage2 )
+        vkCmdCopyImage2 = vkCmdCopyImage2KHR;
+      vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage2KHR" ) );
+      if ( !vkCmdCopyBufferToImage2 )
+        vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
+      vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer2KHR" ) );
+      if ( !vkCmdCopyImageToBuffer2 )
+        vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
+      vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdBlitImage2KHR" ) );
+      if ( !vkCmdBlitImage2 )
+        vkCmdBlitImage2 = vkCmdBlitImage2KHR;
+      vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdResolveImage2KHR" ) );
+      if ( !vkCmdResolveImage2 )
+        vkCmdResolveImage2 = vkCmdResolveImage2KHR;
 
       //=== VK_EXT_device_fault ===
-      PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT = 0;
+      vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetInstanceProcAddr( instance, "vkGetDeviceFaultInfoEXT" ) );
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_NV_acquire_winrt_display ===
-      PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV = 0;
-      PFN_vkGetWinrtDisplayNV     vkGetWinrtDisplayNV     = 0;
-#else
-      PFN_dummy vkAcquireWinrtDisplayNV_placeholder = 0;
-      PFN_dummy vkGetWinrtDisplayNV_placeholder     = 0;
+      vkAcquireWinrtDisplayNV = PFN_vkAcquireWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkAcquireWinrtDisplayNV" ) );
+      vkGetWinrtDisplayNV     = PFN_vkGetWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkGetWinrtDisplayNV" ) );
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
       //=== VK_EXT_directfb_surface ===
-      PFN_vkCreateDirectFBSurfaceEXT                        vkCreateDirectFBSurfaceEXT                        = 0;
-      PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT = 0;
-#else
-      PFN_dummy vkCreateDirectFBSurfaceEXT_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceDirectFBPresentationSupportEXT_placeholder = 0;
+      vkCreateDirectFBSurfaceEXT = PFN_vkCreateDirectFBSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateDirectFBSurfaceEXT" ) );
+      vkGetPhysicalDeviceDirectFBPresentationSupportEXT =
+        PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT" ) );
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
       //=== VK_EXT_vertex_input_dynamic_state ===
-      PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT = 0;
+      vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetInstanceProcAddr( instance, "vkCmdSetVertexInputEXT" ) );
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_external_memory ===
-      PFN_vkGetMemoryZirconHandleFUCHSIA           vkGetMemoryZirconHandleFUCHSIA           = 0;
-      PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePropertiesFUCHSIA = 0;
-#else
-      PFN_dummy vkGetMemoryZirconHandleFUCHSIA_placeholder           = 0;
-      PFN_dummy vkGetMemoryZirconHandlePropertiesFUCHSIA_placeholder = 0;
+      vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetMemoryZirconHandleFUCHSIA" ) );
+      vkGetMemoryZirconHandlePropertiesFUCHSIA =
+        PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_external_semaphore ===
-      PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA = 0;
-      PFN_vkGetSemaphoreZirconHandleFUCHSIA    vkGetSemaphoreZirconHandleFUCHSIA    = 0;
-#else
-      PFN_dummy vkImportSemaphoreZirconHandleFUCHSIA_placeholder = 0;
-      PFN_dummy vkGetSemaphoreZirconHandleFUCHSIA_placeholder    = 0;
+      vkImportSemaphoreZirconHandleFUCHSIA =
+        PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
+      vkGetSemaphoreZirconHandleFUCHSIA = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_buffer_collection ===
-      PFN_vkCreateBufferCollectionFUCHSIA               vkCreateBufferCollectionFUCHSIA               = 0;
-      PFN_vkSetBufferCollectionImageConstraintsFUCHSIA  vkSetBufferCollectionImageConstraintsFUCHSIA  = 0;
-      PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA vkSetBufferCollectionBufferConstraintsFUCHSIA = 0;
-      PFN_vkDestroyBufferCollectionFUCHSIA              vkDestroyBufferCollectionFUCHSIA              = 0;
-      PFN_vkGetBufferCollectionPropertiesFUCHSIA        vkGetBufferCollectionPropertiesFUCHSIA        = 0;
-#else
-      PFN_dummy vkCreateBufferCollectionFUCHSIA_placeholder               = 0;
-      PFN_dummy vkSetBufferCollectionImageConstraintsFUCHSIA_placeholder  = 0;
-      PFN_dummy vkSetBufferCollectionBufferConstraintsFUCHSIA_placeholder = 0;
-      PFN_dummy vkDestroyBufferCollectionFUCHSIA_placeholder              = 0;
-      PFN_dummy vkGetBufferCollectionPropertiesFUCHSIA_placeholder        = 0;
+      vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateBufferCollectionFUCHSIA" ) );
+      vkSetBufferCollectionImageConstraintsFUCHSIA =
+        PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetInstanceProcAddr( instance, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
+      vkSetBufferCollectionBufferConstraintsFUCHSIA =
+        PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetInstanceProcAddr( instance, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
+      vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetInstanceProcAddr( instance, "vkDestroyBufferCollectionFUCHSIA" ) );
+      vkGetBufferCollectionPropertiesFUCHSIA =
+        PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
       //=== VK_HUAWEI_subpass_shading ===
-      PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = 0;
-      PFN_vkCmdSubpassShadingHUAWEI                       vkCmdSubpassShadingHUAWEI                       = 0;
+      vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
+        PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetInstanceProcAddr( instance, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
+      vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdSubpassShadingHUAWEI" ) );
 
       //=== VK_HUAWEI_invocation_mask ===
-      PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI = 0;
+      vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdBindInvocationMaskHUAWEI" ) );
 
       //=== VK_NV_external_memory_rdma ===
-      PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV = 0;
+      vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetInstanceProcAddr( instance, "vkGetMemoryRemoteAddressNV" ) );
 
       //=== VK_EXT_pipeline_properties ===
-      PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT = 0;
+      vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPipelinePropertiesEXT" ) );
 
       //=== VK_EXT_extended_dynamic_state2 ===
-      PFN_vkCmdSetPatchControlPointsEXT      vkCmdSetPatchControlPointsEXT      = 0;
-      PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT = 0;
-      PFN_vkCmdSetDepthBiasEnableEXT         vkCmdSetDepthBiasEnableEXT         = 0;
-      PFN_vkCmdSetLogicOpEXT                 vkCmdSetLogicOpEXT                 = 0;
-      PFN_vkCmdSetPrimitiveRestartEnableEXT  vkCmdSetPrimitiveRestartEnableEXT  = 0;
+      vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPatchControlPointsEXT" ) );
+      vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizerDiscardEnableEXT" ) );
+      if ( !vkCmdSetRasterizerDiscardEnable )
+        vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
+      vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBiasEnableEXT" ) );
+      if ( !vkCmdSetDepthBiasEnable )
+        vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
+      vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLogicOpEXT" ) );
+      vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveRestartEnableEXT" ) );
+      if ( !vkCmdSetPrimitiveRestartEnable )
+        vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
       //=== VK_QNX_screen_surface ===
-      PFN_vkCreateScreenSurfaceQNX                        vkCreateScreenSurfaceQNX                        = 0;
-      PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX = 0;
-#else
-      PFN_dummy vkCreateScreenSurfaceQNX_placeholder                        = 0;
-      PFN_dummy vkGetPhysicalDeviceScreenPresentationSupportQNX_placeholder = 0;
+      vkCreateScreenSurfaceQNX = PFN_vkCreateScreenSurfaceQNX( vkGetInstanceProcAddr( instance, "vkCreateScreenSurfaceQNX" ) );
+      vkGetPhysicalDeviceScreenPresentationSupportQNX =
+        PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceScreenPresentationSupportQNX" ) );
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
       //=== VK_EXT_color_write_enable ===
-      PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT = 0;
+      vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorWriteEnableEXT" ) );
 
       //=== VK_KHR_ray_tracing_maintenance1 ===
-      PFN_vkCmdTraceRaysIndirect2KHR vkCmdTraceRaysIndirect2KHR = 0;
+      vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysIndirect2KHR" ) );
 
       //=== VK_EXT_multi_draw ===
-      PFN_vkCmdDrawMultiEXT        vkCmdDrawMultiEXT        = 0;
-      PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT = 0;
+      vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMultiEXT" ) );
+      vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMultiIndexedEXT" ) );
 
       //=== VK_EXT_opacity_micromap ===
-      PFN_vkCreateMicromapEXT                 vkCreateMicromapEXT                 = 0;
-      PFN_vkDestroyMicromapEXT                vkDestroyMicromapEXT                = 0;
-      PFN_vkCmdBuildMicromapsEXT              vkCmdBuildMicromapsEXT              = 0;
-      PFN_vkBuildMicromapsEXT                 vkBuildMicromapsEXT                 = 0;
-      PFN_vkCopyMicromapEXT                   vkCopyMicromapEXT                   = 0;
-      PFN_vkCopyMicromapToMemoryEXT           vkCopyMicromapToMemoryEXT           = 0;
-      PFN_vkCopyMemoryToMicromapEXT           vkCopyMemoryToMicromapEXT           = 0;
-      PFN_vkWriteMicromapsPropertiesEXT       vkWriteMicromapsPropertiesEXT       = 0;
-      PFN_vkCmdCopyMicromapEXT                vkCmdCopyMicromapEXT                = 0;
-      PFN_vkCmdCopyMicromapToMemoryEXT        vkCmdCopyMicromapToMemoryEXT        = 0;
-      PFN_vkCmdCopyMemoryToMicromapEXT        vkCmdCopyMemoryToMicromapEXT        = 0;
-      PFN_vkCmdWriteMicromapsPropertiesEXT    vkCmdWriteMicromapsPropertiesEXT    = 0;
-      PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT = 0;
-      PFN_vkGetMicromapBuildSizesEXT          vkGetMicromapBuildSizesEXT          = 0;
+      vkCreateMicromapEXT                 = PFN_vkCreateMicromapEXT( vkGetInstanceProcAddr( instance, "vkCreateMicromapEXT" ) );
+      vkDestroyMicromapEXT                = PFN_vkDestroyMicromapEXT( vkGetInstanceProcAddr( instance, "vkDestroyMicromapEXT" ) );
+      vkCmdBuildMicromapsEXT              = PFN_vkCmdBuildMicromapsEXT( vkGetInstanceProcAddr( instance, "vkCmdBuildMicromapsEXT" ) );
+      vkBuildMicromapsEXT                 = PFN_vkBuildMicromapsEXT( vkGetInstanceProcAddr( instance, "vkBuildMicromapsEXT" ) );
+      vkCopyMicromapEXT                   = PFN_vkCopyMicromapEXT( vkGetInstanceProcAddr( instance, "vkCopyMicromapEXT" ) );
+      vkCopyMicromapToMemoryEXT           = PFN_vkCopyMicromapToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCopyMicromapToMemoryEXT" ) );
+      vkCopyMemoryToMicromapEXT           = PFN_vkCopyMemoryToMicromapEXT( vkGetInstanceProcAddr( instance, "vkCopyMemoryToMicromapEXT" ) );
+      vkWriteMicromapsPropertiesEXT       = PFN_vkWriteMicromapsPropertiesEXT( vkGetInstanceProcAddr( instance, "vkWriteMicromapsPropertiesEXT" ) );
+      vkCmdCopyMicromapEXT                = PFN_vkCmdCopyMicromapEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMicromapEXT" ) );
+      vkCmdCopyMicromapToMemoryEXT        = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMicromapToMemoryEXT" ) );
+      vkCmdCopyMemoryToMicromapEXT        = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToMicromapEXT" ) );
+      vkCmdWriteMicromapsPropertiesEXT    = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetInstanceProcAddr( instance, "vkCmdWriteMicromapsPropertiesEXT" ) );
+      vkGetDeviceMicromapCompatibilityEXT = PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetInstanceProcAddr( instance, "vkGetDeviceMicromapCompatibilityEXT" ) );
+      vkGetMicromapBuildSizesEXT          = PFN_vkGetMicromapBuildSizesEXT( vkGetInstanceProcAddr( instance, "vkGetMicromapBuildSizesEXT" ) );
 
       //=== VK_HUAWEI_cluster_culling_shader ===
-      PFN_vkCmdDrawClusterHUAWEI         vkCmdDrawClusterHUAWEI         = 0;
-      PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI = 0;
+      vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdDrawClusterHUAWEI" ) );
+      vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdDrawClusterIndirectHUAWEI" ) );
 
       //=== VK_EXT_pageable_device_local_memory ===
-      PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT = 0;
+      vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetInstanceProcAddr( instance, "vkSetDeviceMemoryPriorityEXT" ) );
 
       //=== VK_KHR_maintenance4 ===
-      PFN_vkGetDeviceBufferMemoryRequirementsKHR      vkGetDeviceBufferMemoryRequirementsKHR      = 0;
-      PFN_vkGetDeviceImageMemoryRequirementsKHR       vkGetDeviceImageMemoryRequirementsKHR       = 0;
-      PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR = 0;
+      vkGetDeviceBufferMemoryRequirementsKHR =
+        PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceBufferMemoryRequirements )
+        vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
+      vkGetDeviceImageMemoryRequirementsKHR =
+        PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceImageMemoryRequirements )
+        vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
+      vkGetDeviceImageSparseMemoryRequirementsKHR =
+        PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceImageSparseMemoryRequirements )
+        vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
 
       //=== VK_VALVE_descriptor_set_host_mapping ===
-      PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE = 0;
-      PFN_vkGetDescriptorSetHostMappingVALVE           vkGetDescriptorSetHostMappingVALVE           = 0;
+      vkGetDescriptorSetLayoutHostMappingInfoVALVE =
+        PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
+      vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetHostMappingVALVE" ) );
 
       //=== VK_NV_copy_memory_indirect ===
-      PFN_vkCmdCopyMemoryIndirectNV        vkCmdCopyMemoryIndirectNV        = 0;
-      PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV = 0;
+      vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryIndirectNV" ) );
+      vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToImageIndirectNV" ) );
 
       //=== VK_NV_memory_decompression ===
-      PFN_vkCmdDecompressMemoryNV              vkCmdDecompressMemoryNV              = 0;
-      PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV = 0;
+      vkCmdDecompressMemoryNV = PFN_vkCmdDecompressMemoryNV( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryNV" ) );
+      vkCmdDecompressMemoryIndirectCountNV =
+        PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryIndirectCountNV" ) );
 
       //=== VK_NV_device_generated_commands_compute ===
-      PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0;
-      PFN_vkCmdUpdatePipelineIndirectBufferNV       vkCmdUpdatePipelineIndirectBufferNV       = 0;
-      PFN_vkGetPipelineIndirectDeviceAddressNV      vkGetPipelineIndirectDeviceAddressNV      = 0;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_external_memory ===
-      PFN_vkGetNativeBufferPropertiesOHOS vkGetNativeBufferPropertiesOHOS = 0;
-      PFN_vkGetMemoryNativeBufferOHOS     vkGetMemoryNativeBufferOHOS     = 0;
-#else
-      PFN_dummy vkGetNativeBufferPropertiesOHOS_placeholder = 0;
-      PFN_dummy vkGetMemoryNativeBufferOHOS_placeholder     = 0;
-#endif /*VK_USE_PLATFORM_OHOS*/
+      vkGetPipelineIndirectMemoryRequirementsNV =
+        PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
+      vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetInstanceProcAddr( instance, "vkCmdUpdatePipelineIndirectBufferNV" ) );
+      vkGetPipelineIndirectDeviceAddressNV =
+        PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectDeviceAddressNV" ) );
 
       //=== VK_EXT_extended_dynamic_state3 ===
-      PFN_vkCmdSetDepthClampEnableEXT                 vkCmdSetDepthClampEnableEXT                 = 0;
-      PFN_vkCmdSetPolygonModeEXT                      vkCmdSetPolygonModeEXT                      = 0;
-      PFN_vkCmdSetRasterizationSamplesEXT             vkCmdSetRasterizationSamplesEXT             = 0;
-      PFN_vkCmdSetSampleMaskEXT                       vkCmdSetSampleMaskEXT                       = 0;
-      PFN_vkCmdSetAlphaToCoverageEnableEXT            vkCmdSetAlphaToCoverageEnableEXT            = 0;
-      PFN_vkCmdSetAlphaToOneEnableEXT                 vkCmdSetAlphaToOneEnableEXT                 = 0;
-      PFN_vkCmdSetLogicOpEnableEXT                    vkCmdSetLogicOpEnableEXT                    = 0;
-      PFN_vkCmdSetColorBlendEnableEXT                 vkCmdSetColorBlendEnableEXT                 = 0;
-      PFN_vkCmdSetColorBlendEquationEXT               vkCmdSetColorBlendEquationEXT               = 0;
-      PFN_vkCmdSetColorWriteMaskEXT                   vkCmdSetColorWriteMaskEXT                   = 0;
-      PFN_vkCmdSetTessellationDomainOriginEXT         vkCmdSetTessellationDomainOriginEXT         = 0;
-      PFN_vkCmdSetRasterizationStreamEXT              vkCmdSetRasterizationStreamEXT              = 0;
-      PFN_vkCmdSetConservativeRasterizationModeEXT    vkCmdSetConservativeRasterizationModeEXT    = 0;
-      PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT vkCmdSetExtraPrimitiveOverestimationSizeEXT = 0;
-      PFN_vkCmdSetDepthClipEnableEXT                  vkCmdSetDepthClipEnableEXT                  = 0;
-      PFN_vkCmdSetSampleLocationsEnableEXT            vkCmdSetSampleLocationsEnableEXT            = 0;
-      PFN_vkCmdSetColorBlendAdvancedEXT               vkCmdSetColorBlendAdvancedEXT               = 0;
-      PFN_vkCmdSetProvokingVertexModeEXT              vkCmdSetProvokingVertexModeEXT              = 0;
-      PFN_vkCmdSetLineRasterizationModeEXT            vkCmdSetLineRasterizationModeEXT            = 0;
-      PFN_vkCmdSetLineStippleEnableEXT                vkCmdSetLineStippleEnableEXT                = 0;
-      PFN_vkCmdSetDepthClipNegativeOneToOneEXT        vkCmdSetDepthClipNegativeOneToOneEXT        = 0;
-      PFN_vkCmdSetViewportWScalingEnableNV            vkCmdSetViewportWScalingEnableNV            = 0;
-      PFN_vkCmdSetViewportSwizzleNV                   vkCmdSetViewportSwizzleNV                   = 0;
-      PFN_vkCmdSetCoverageToColorEnableNV             vkCmdSetCoverageToColorEnableNV             = 0;
-      PFN_vkCmdSetCoverageToColorLocationNV           vkCmdSetCoverageToColorLocationNV           = 0;
-      PFN_vkCmdSetCoverageModulationModeNV            vkCmdSetCoverageModulationModeNV            = 0;
-      PFN_vkCmdSetCoverageModulationTableEnableNV     vkCmdSetCoverageModulationTableEnableNV     = 0;
-      PFN_vkCmdSetCoverageModulationTableNV           vkCmdSetCoverageModulationTableNV           = 0;
-      PFN_vkCmdSetShadingRateImageEnableNV            vkCmdSetShadingRateImageEnableNV            = 0;
-      PFN_vkCmdSetRepresentativeFragmentTestEnableNV  vkCmdSetRepresentativeFragmentTestEnableNV  = 0;
-      PFN_vkCmdSetCoverageReductionModeNV             vkCmdSetCoverageReductionModeNV             = 0;
-
-      //=== VK_ARM_tensors ===
-      PFN_vkCreateTensorARM                              vkCreateTensorARM                              = 0;
-      PFN_vkDestroyTensorARM                             vkDestroyTensorARM                             = 0;
-      PFN_vkCreateTensorViewARM                          vkCreateTensorViewARM                          = 0;
-      PFN_vkDestroyTensorViewARM                         vkDestroyTensorViewARM                         = 0;
-      PFN_vkGetTensorMemoryRequirementsARM               vkGetTensorMemoryRequirementsARM               = 0;
-      PFN_vkBindTensorMemoryARM                          vkBindTensorMemoryARM                          = 0;
-      PFN_vkGetDeviceTensorMemoryRequirementsARM         vkGetDeviceTensorMemoryRequirementsARM         = 0;
-      PFN_vkCmdCopyTensorARM                             vkCmdCopyTensorARM                             = 0;
-      PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM vkGetPhysicalDeviceExternalTensorPropertiesARM = 0;
-      PFN_vkGetTensorOpaqueCaptureDescriptorDataARM      vkGetTensorOpaqueCaptureDescriptorDataARM      = 0;
-      PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM  vkGetTensorViewOpaqueCaptureDescriptorDataARM  = 0;
+      vkCmdSetDepthClampEnableEXT         = PFN_vkCmdSetDepthClampEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClampEnableEXT" ) );
+      vkCmdSetPolygonModeEXT              = PFN_vkCmdSetPolygonModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPolygonModeEXT" ) );
+      vkCmdSetRasterizationSamplesEXT     = PFN_vkCmdSetRasterizationSamplesEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizationSamplesEXT" ) );
+      vkCmdSetSampleMaskEXT               = PFN_vkCmdSetSampleMaskEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleMaskEXT" ) );
+      vkCmdSetAlphaToCoverageEnableEXT    = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAlphaToCoverageEnableEXT" ) );
+      vkCmdSetAlphaToOneEnableEXT         = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAlphaToOneEnableEXT" ) );
+      vkCmdSetLogicOpEnableEXT            = PFN_vkCmdSetLogicOpEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLogicOpEnableEXT" ) );
+      vkCmdSetColorBlendEnableEXT         = PFN_vkCmdSetColorBlendEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendEnableEXT" ) );
+      vkCmdSetColorBlendEquationEXT       = PFN_vkCmdSetColorBlendEquationEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendEquationEXT" ) );
+      vkCmdSetColorWriteMaskEXT           = PFN_vkCmdSetColorWriteMaskEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorWriteMaskEXT" ) );
+      vkCmdSetTessellationDomainOriginEXT = PFN_vkCmdSetTessellationDomainOriginEXT( vkGetInstanceProcAddr( instance, "vkCmdSetTessellationDomainOriginEXT" ) );
+      vkCmdSetRasterizationStreamEXT      = PFN_vkCmdSetRasterizationStreamEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizationStreamEXT" ) );
+      vkCmdSetConservativeRasterizationModeEXT =
+        PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetConservativeRasterizationModeEXT" ) );
+      vkCmdSetExtraPrimitiveOverestimationSizeEXT =
+        PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
+      vkCmdSetDepthClipEnableEXT       = PFN_vkCmdSetDepthClipEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClipEnableEXT" ) );
+      vkCmdSetSampleLocationsEnableEXT = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleLocationsEnableEXT" ) );
+      vkCmdSetColorBlendAdvancedEXT    = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendAdvancedEXT" ) );
+      vkCmdSetProvokingVertexModeEXT   = PFN_vkCmdSetProvokingVertexModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetProvokingVertexModeEXT" ) );
+      vkCmdSetLineRasterizationModeEXT = PFN_vkCmdSetLineRasterizationModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineRasterizationModeEXT" ) );
+      vkCmdSetLineStippleEnableEXT     = PFN_vkCmdSetLineStippleEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleEnableEXT" ) );
+      vkCmdSetDepthClipNegativeOneToOneEXT =
+        PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
+      vkCmdSetViewportWScalingEnableNV  = PFN_vkCmdSetViewportWScalingEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWScalingEnableNV" ) );
+      vkCmdSetViewportSwizzleNV         = PFN_vkCmdSetViewportSwizzleNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportSwizzleNV" ) );
+      vkCmdSetCoverageToColorEnableNV   = PFN_vkCmdSetCoverageToColorEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageToColorEnableNV" ) );
+      vkCmdSetCoverageToColorLocationNV = PFN_vkCmdSetCoverageToColorLocationNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageToColorLocationNV" ) );
+      vkCmdSetCoverageModulationModeNV  = PFN_vkCmdSetCoverageModulationModeNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationModeNV" ) );
+      vkCmdSetCoverageModulationTableEnableNV =
+        PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationTableEnableNV" ) );
+      vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationTableNV" ) );
+      vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetShadingRateImageEnableNV" ) );
+      vkCmdSetRepresentativeFragmentTestEnableNV =
+        PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
+      vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageReductionModeNV" ) );
 
       //=== VK_EXT_shader_module_identifier ===
-      PFN_vkGetShaderModuleIdentifierEXT           vkGetShaderModuleIdentifierEXT           = 0;
-      PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT = 0;
+      vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetInstanceProcAddr( instance, "vkGetShaderModuleIdentifierEXT" ) );
+      vkGetShaderModuleCreateInfoIdentifierEXT =
+        PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetInstanceProcAddr( instance, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
 
       //=== VK_NV_optical_flow ===
-      PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV = 0;
-      PFN_vkCreateOpticalFlowSessionNV                 vkCreateOpticalFlowSessionNV                 = 0;
-      PFN_vkDestroyOpticalFlowSessionNV                vkDestroyOpticalFlowSessionNV                = 0;
-      PFN_vkBindOpticalFlowSessionImageNV              vkBindOpticalFlowSessionImageNV              = 0;
-      PFN_vkCmdOpticalFlowExecuteNV                    vkCmdOpticalFlowExecuteNV                    = 0;
+      vkGetPhysicalDeviceOpticalFlowImageFormatsNV =
+        PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV" ) );
+      vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetInstanceProcAddr( instance, "vkCreateOpticalFlowSessionNV" ) );
+      vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetInstanceProcAddr( instance, "vkDestroyOpticalFlowSessionNV" ) );
+      vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetInstanceProcAddr( instance, "vkBindOpticalFlowSessionImageNV" ) );
+      vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetInstanceProcAddr( instance, "vkCmdOpticalFlowExecuteNV" ) );
 
       //=== VK_KHR_maintenance5 ===
-      PFN_vkCmdBindIndexBuffer2KHR             vkCmdBindIndexBuffer2KHR             = 0;
-      PFN_vkGetRenderingAreaGranularityKHR     vkGetRenderingAreaGranularityKHR     = 0;
-      PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR = 0;
-      PFN_vkGetImageSubresourceLayout2KHR      vkGetImageSubresourceLayout2KHR      = 0;
-
-      //=== VK_AMD_anti_lag ===
-      PFN_vkAntiLagUpdateAMD vkAntiLagUpdateAMD = 0;
-
-      //=== VK_KHR_present_wait2 ===
-      PFN_vkWaitForPresent2KHR vkWaitForPresent2KHR = 0;
+      vkCmdBindIndexBuffer2KHR         = PFN_vkCmdBindIndexBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdBindIndexBuffer2KHR" ) );
+      vkGetRenderingAreaGranularityKHR = PFN_vkGetRenderingAreaGranularityKHR( vkGetInstanceProcAddr( instance, "vkGetRenderingAreaGranularityKHR" ) );
+      vkGetDeviceImageSubresourceLayoutKHR =
+        PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSubresourceLayoutKHR" ) );
+      vkGetImageSubresourceLayout2KHR = PFN_vkGetImageSubresourceLayout2KHR( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout2KHR" ) );
 
       //=== VK_EXT_shader_object ===
-      PFN_vkCreateShadersEXT         vkCreateShadersEXT         = 0;
-      PFN_vkDestroyShaderEXT         vkDestroyShaderEXT         = 0;
-      PFN_vkGetShaderBinaryDataEXT   vkGetShaderBinaryDataEXT   = 0;
-      PFN_vkCmdBindShadersEXT        vkCmdBindShadersEXT        = 0;
-      PFN_vkCmdSetDepthClampRangeEXT vkCmdSetDepthClampRangeEXT = 0;
-
-      //=== VK_KHR_pipeline_binary ===
-      PFN_vkCreatePipelineBinariesKHR      vkCreatePipelineBinariesKHR      = 0;
-      PFN_vkDestroyPipelineBinaryKHR       vkDestroyPipelineBinaryKHR       = 0;
-      PFN_vkGetPipelineKeyKHR              vkGetPipelineKeyKHR              = 0;
-      PFN_vkGetPipelineBinaryDataKHR       vkGetPipelineBinaryDataKHR       = 0;
-      PFN_vkReleaseCapturedPipelineDataKHR vkReleaseCapturedPipelineDataKHR = 0;
+      vkCreateShadersEXT       = PFN_vkCreateShadersEXT( vkGetInstanceProcAddr( instance, "vkCreateShadersEXT" ) );
+      vkDestroyShaderEXT       = PFN_vkDestroyShaderEXT( vkGetInstanceProcAddr( instance, "vkDestroyShaderEXT" ) );
+      vkGetShaderBinaryDataEXT = PFN_vkGetShaderBinaryDataEXT( vkGetInstanceProcAddr( instance, "vkGetShaderBinaryDataEXT" ) );
+      vkCmdBindShadersEXT      = PFN_vkCmdBindShadersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindShadersEXT" ) );
 
       //=== VK_QCOM_tile_properties ===
-      PFN_vkGetFramebufferTilePropertiesQCOM      vkGetFramebufferTilePropertiesQCOM      = 0;
-      PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM = 0;
-
-      //=== VK_KHR_swapchain_maintenance1 ===
-      PFN_vkReleaseSwapchainImagesKHR vkReleaseSwapchainImagesKHR = 0;
-
-      //=== VK_NV_cooperative_vector ===
-      PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV vkGetPhysicalDeviceCooperativeVectorPropertiesNV = 0;
-      PFN_vkConvertCooperativeVectorMatrixNV               vkConvertCooperativeVectorMatrixNV               = 0;
-      PFN_vkCmdConvertCooperativeVectorMatrixNV            vkCmdConvertCooperativeVectorMatrixNV            = 0;
+      vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetInstanceProcAddr( instance, "vkGetFramebufferTilePropertiesQCOM" ) );
+      vkGetDynamicRenderingTilePropertiesQCOM =
+        PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetInstanceProcAddr( instance, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
 
       //=== VK_NV_low_latency2 ===
-      PFN_vkSetLatencySleepModeNV  vkSetLatencySleepModeNV  = 0;
-      PFN_vkLatencySleepNV         vkLatencySleepNV         = 0;
-      PFN_vkSetLatencyMarkerNV     vkSetLatencyMarkerNV     = 0;
-      PFN_vkGetLatencyTimingsNV    vkGetLatencyTimingsNV    = 0;
-      PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV = 0;
+      vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetInstanceProcAddr( instance, "vkSetLatencySleepModeNV" ) );
+      vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetInstanceProcAddr( instance, "vkLatencySleepNV" ) );
+      vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetInstanceProcAddr( instance, "vkSetLatencyMarkerNV" ) );
+      vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetInstanceProcAddr( instance, "vkGetLatencyTimingsNV" ) );
+      vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetInstanceProcAddr( instance, "vkQueueNotifyOutOfBandNV" ) );
 
       //=== VK_KHR_cooperative_matrix ===
-      PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = 0;
-
-      //=== VK_ARM_data_graph ===
-      PFN_vkCreateDataGraphPipelinesARM                                        vkCreateDataGraphPipelinesARM                                        = 0;
-      PFN_vkCreateDataGraphPipelineSessionARM                                  vkCreateDataGraphPipelineSessionARM                                  = 0;
-      PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM                vkGetDataGraphPipelineSessionBindPointRequirementsARM                = 0;
-      PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM                   vkGetDataGraphPipelineSessionMemoryRequirementsARM                   = 0;
-      PFN_vkBindDataGraphPipelineSessionMemoryARM                              vkBindDataGraphPipelineSessionMemoryARM                              = 0;
-      PFN_vkDestroyDataGraphPipelineSessionARM                                 vkDestroyDataGraphPipelineSessionARM                                 = 0;
-      PFN_vkCmdDispatchDataGraphARM                                            vkCmdDispatchDataGraphARM                                            = 0;
-      PFN_vkGetDataGraphPipelineAvailablePropertiesARM                         vkGetDataGraphPipelineAvailablePropertiesARM                         = 0;
-      PFN_vkGetDataGraphPipelinePropertiesARM                                  vkGetDataGraphPipelinePropertiesARM                                  = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM                 vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM                 = 0;
-      PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = 0;
+      vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR =
+        PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR" ) );
 
       //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-      PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT = 0;
+      vkCmdSetAttachmentFeedbackLoopEnableEXT =
+        PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
       //=== VK_QNX_external_memory_screen_buffer ===
-      PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX = 0;
-#else
-      PFN_dummy vkGetScreenBufferPropertiesQNX_placeholder = 0;
+      vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetInstanceProcAddr( instance, "vkGetScreenBufferPropertiesQNX" ) );
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
       //=== VK_KHR_line_rasterization ===
-      PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR = 0;
+      vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleKHR" ) );
 
       //=== VK_KHR_calibrated_timestamps ===
-      PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = 0;
-      PFN_vkGetCalibratedTimestampsKHR                   vkGetCalibratedTimestampsKHR                   = 0;
+      vkGetPhysicalDeviceCalibrateableTimeDomainsKHR =
+        PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR" ) );
+      vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetInstanceProcAddr( instance, "vkGetCalibratedTimestampsKHR" ) );
 
       //=== VK_KHR_maintenance6 ===
-      PFN_vkCmdBindDescriptorSets2KHR                   vkCmdBindDescriptorSets2KHR                   = 0;
-      PFN_vkCmdPushConstants2KHR                        vkCmdPushConstants2KHR                        = 0;
-      PFN_vkCmdPushDescriptorSet2KHR                    vkCmdPushDescriptorSet2KHR                    = 0;
-      PFN_vkCmdPushDescriptorSetWithTemplate2KHR        vkCmdPushDescriptorSetWithTemplate2KHR        = 0;
-      PFN_vkCmdSetDescriptorBufferOffsets2EXT           vkCmdSetDescriptorBufferOffsets2EXT           = 0;
-      PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT vkCmdBindDescriptorBufferEmbeddedSamplers2EXT = 0;
-
-      //=== VK_QCOM_tile_memory_heap ===
-      PFN_vkCmdBindTileMemoryQCOM vkCmdBindTileMemoryQCOM = 0;
-
-      //=== VK_KHR_copy_memory_indirect ===
-      PFN_vkCmdCopyMemoryIndirectKHR        vkCmdCopyMemoryIndirectKHR        = 0;
-      PFN_vkCmdCopyMemoryToImageIndirectKHR vkCmdCopyMemoryToImageIndirectKHR = 0;
-
-      //=== VK_EXT_memory_decompression ===
-      PFN_vkCmdDecompressMemoryEXT              vkCmdDecompressMemoryEXT              = 0;
-      PFN_vkCmdDecompressMemoryIndirectCountEXT vkCmdDecompressMemoryIndirectCountEXT = 0;
-
-      //=== VK_NV_external_compute_queue ===
-      PFN_vkCreateExternalComputeQueueNV  vkCreateExternalComputeQueueNV  = 0;
-      PFN_vkDestroyExternalComputeQueueNV vkDestroyExternalComputeQueueNV = 0;
-      PFN_vkGetExternalComputeQueueDataNV vkGetExternalComputeQueueDataNV = 0;
-
-      //=== VK_NV_cluster_acceleration_structure ===
-      PFN_vkGetClusterAccelerationStructureBuildSizesNV    vkGetClusterAccelerationStructureBuildSizesNV    = 0;
-      PFN_vkCmdBuildClusterAccelerationStructureIndirectNV vkCmdBuildClusterAccelerationStructureIndirectNV = 0;
-
-      //=== VK_NV_partitioned_acceleration_structure ===
-      PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV vkGetPartitionedAccelerationStructuresBuildSizesNV = 0;
-      PFN_vkCmdBuildPartitionedAccelerationStructuresNV      vkCmdBuildPartitionedAccelerationStructuresNV      = 0;
-
-      //=== VK_EXT_device_generated_commands ===
-      PFN_vkGetGeneratedCommandsMemoryRequirementsEXT vkGetGeneratedCommandsMemoryRequirementsEXT = 0;
-      PFN_vkCmdPreprocessGeneratedCommandsEXT         vkCmdPreprocessGeneratedCommandsEXT         = 0;
-      PFN_vkCmdExecuteGeneratedCommandsEXT            vkCmdExecuteGeneratedCommandsEXT            = 0;
-      PFN_vkCreateIndirectCommandsLayoutEXT           vkCreateIndirectCommandsLayoutEXT           = 0;
-      PFN_vkDestroyIndirectCommandsLayoutEXT          vkDestroyIndirectCommandsLayoutEXT          = 0;
-      PFN_vkCreateIndirectExecutionSetEXT             vkCreateIndirectExecutionSetEXT             = 0;
-      PFN_vkDestroyIndirectExecutionSetEXT            vkDestroyIndirectExecutionSetEXT            = 0;
-      PFN_vkUpdateIndirectExecutionSetPipelineEXT     vkUpdateIndirectExecutionSetPipelineEXT     = 0;
-      PFN_vkUpdateIndirectExecutionSetShaderEXT       vkUpdateIndirectExecutionSetShaderEXT       = 0;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_surface ===
-      PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS = 0;
-#else
-      PFN_dummy vkCreateSurfaceOHOS_placeholder = 0;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_native_buffer ===
-      PFN_vkGetSwapchainGrallocUsageOHOS vkGetSwapchainGrallocUsageOHOS = 0;
-      PFN_vkAcquireImageOHOS             vkAcquireImageOHOS             = 0;
-      PFN_vkQueueSignalReleaseImageOHOS  vkQueueSignalReleaseImageOHOS  = 0;
-#else
-      PFN_dummy vkGetSwapchainGrallocUsageOHOS_placeholder = 0;
-      PFN_dummy vkAcquireImageOHOS_placeholder             = 0;
-      PFN_dummy vkQueueSignalReleaseImageOHOS_placeholder  = 0;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-      //=== VK_NV_cooperative_matrix2 ===
-      PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = 0;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-      //=== VK_EXT_external_memory_metal ===
-      PFN_vkGetMemoryMetalHandleEXT           vkGetMemoryMetalHandleEXT           = 0;
-      PFN_vkGetMemoryMetalHandlePropertiesEXT vkGetMemoryMetalHandlePropertiesEXT = 0;
-#else
-      PFN_dummy vkGetMemoryMetalHandleEXT_placeholder           = 0;
-      PFN_dummy vkGetMemoryMetalHandlePropertiesEXT_placeholder = 0;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-      //=== VK_ARM_performance_counters_by_region ===
-      PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = 0;
-
-      //=== VK_EXT_fragment_density_map_offset ===
-      PFN_vkCmdEndRendering2EXT vkCmdEndRendering2EXT = 0;
-
-      //=== VK_EXT_custom_resolve ===
-      PFN_vkCmdBeginCustomResolveEXT vkCmdBeginCustomResolveEXT = 0;
-
-      //=== VK_KHR_maintenance10 ===
-      PFN_vkCmdEndRendering2KHR vkCmdEndRendering2KHR = 0;
-
-    public:
-      DispatchLoaderDynamic() VULKAN_HPP_NOEXCEPT                                    = default;
-      DispatchLoaderDynamic( DispatchLoaderDynamic const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-      DispatchLoaderDynamic( PFN_vkGetInstanceProcAddr getInstanceProcAddr ) VULKAN_HPP_NOEXCEPT
-      {
-        init( getInstanceProcAddr );
-      }
-
-      // This interface does not require a linked vulkan library.
-      DispatchLoaderDynamic( VkInstance                instance,
-                             PFN_vkGetInstanceProcAddr getInstanceProcAddr,
-                             VkDevice                  device            = {},
-                             PFN_vkGetDeviceProcAddr   getDeviceProcAddr = nullptr ) VULKAN_HPP_NOEXCEPT
-      {
-        init( instance, getInstanceProcAddr, device, getDeviceProcAddr );
-      }
-
-      template <typename DynamicLoader
-#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-                = VULKAN_HPP_NAMESPACE::detail::DynamicLoader
-#endif
-                >
-      void init()
-      {
-        static DynamicLoader dl;
-        init( dl );
-      }
-
-      template <typename DynamicLoader>
-      void init( DynamicLoader const & dl ) VULKAN_HPP_NOEXCEPT
-      {
-        PFN_vkGetInstanceProcAddr getInstanceProcAddr = dl.template getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" );
-        init( getInstanceProcAddr );
-      }
-
-      void init( PFN_vkGetInstanceProcAddr getInstanceProcAddr ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( getInstanceProcAddr );
-
-        vkGetInstanceProcAddr = getInstanceProcAddr;
-
-        //=== VK_VERSION_1_0 ===
-        vkCreateInstance = PFN_vkCreateInstance( vkGetInstanceProcAddr( NULL, "vkCreateInstance" ) );
-        vkEnumerateInstanceExtensionProperties =
-          PFN_vkEnumerateInstanceExtensionProperties( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceExtensionProperties" ) );
-        vkEnumerateInstanceLayerProperties = PFN_vkEnumerateInstanceLayerProperties( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceLayerProperties" ) );
-
-        //=== VK_VERSION_1_1 ===
-        vkEnumerateInstanceVersion = PFN_vkEnumerateInstanceVersion( vkGetInstanceProcAddr( NULL, "vkEnumerateInstanceVersion" ) );
-      }
-
-      // This interface does not require a linked vulkan library.
-      void init( VkInstance                instance,
-                 PFN_vkGetInstanceProcAddr getInstanceProcAddr,
-                 VkDevice                  device              = {},
-                 PFN_vkGetDeviceProcAddr /*getDeviceProcAddr*/ = nullptr ) VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( instance && getInstanceProcAddr );
-        vkGetInstanceProcAddr = getInstanceProcAddr;
-        init( Instance( instance ) );
-        if ( device )
-        {
-          init( Device( device ) );
-        }
-      }
-
-      void init( Instance instanceCpp ) VULKAN_HPP_NOEXCEPT
-      {
-        VkInstance instance = static_cast<VkInstance>( instanceCpp );
-
-        //=== VK_VERSION_1_0 ===
-        vkDestroyInstance           = PFN_vkDestroyInstance( vkGetInstanceProcAddr( instance, "vkDestroyInstance" ) );
-        vkEnumeratePhysicalDevices  = PFN_vkEnumeratePhysicalDevices( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDevices" ) );
-        vkGetPhysicalDeviceFeatures = PFN_vkGetPhysicalDeviceFeatures( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures" ) );
-        vkGetPhysicalDeviceFormatProperties =
-          PFN_vkGetPhysicalDeviceFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties" ) );
-        vkGetPhysicalDeviceImageFormatProperties =
-          PFN_vkGetPhysicalDeviceImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties" ) );
-        vkGetPhysicalDeviceProperties = PFN_vkGetPhysicalDeviceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties" ) );
-        vkGetPhysicalDeviceQueueFamilyProperties =
-          PFN_vkGetPhysicalDeviceQueueFamilyProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) );
-        vkGetPhysicalDeviceMemoryProperties =
-          PFN_vkGetPhysicalDeviceMemoryProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) );
-        vkGetDeviceProcAddr = PFN_vkGetDeviceProcAddr( vkGetInstanceProcAddr( instance, "vkGetDeviceProcAddr" ) );
-        vkCreateDevice      = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
-        vkDestroyDevice     = PFN_vkDestroyDevice( vkGetInstanceProcAddr( instance, "vkDestroyDevice" ) );
-        vkEnumerateDeviceExtensionProperties =
-          PFN_vkEnumerateDeviceExtensionProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) );
-        vkEnumerateDeviceLayerProperties   = PFN_vkEnumerateDeviceLayerProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceLayerProperties" ) );
-        vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetInstanceProcAddr( instance, "vkGetDeviceQueue" ) );
-        vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetInstanceProcAddr( instance, "vkQueueSubmit" ) );
-        vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetInstanceProcAddr( instance, "vkQueueWaitIdle" ) );
-        vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetInstanceProcAddr( instance, "vkDeviceWaitIdle" ) );
-        vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetInstanceProcAddr( instance, "vkAllocateMemory" ) );
-        vkFreeMemory                       = PFN_vkFreeMemory( vkGetInstanceProcAddr( instance, "vkFreeMemory" ) );
-        vkMapMemory                        = PFN_vkMapMemory( vkGetInstanceProcAddr( instance, "vkMapMemory" ) );
-        vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetInstanceProcAddr( instance, "vkUnmapMemory" ) );
-        vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetInstanceProcAddr( instance, "vkFlushMappedMemoryRanges" ) );
-        vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetInstanceProcAddr( instance, "vkInvalidateMappedMemoryRanges" ) );
-        vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryCommitment" ) );
-        vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetInstanceProcAddr( instance, "vkBindBufferMemory" ) );
-        vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetInstanceProcAddr( instance, "vkBindImageMemory" ) );
-        vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements" ) );
-        vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements" ) );
-        vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements" ) );
-        vkGetPhysicalDeviceSparseImageFormatProperties =
-          PFN_vkGetPhysicalDeviceSparseImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties" ) );
-        vkQueueBindSparse            = PFN_vkQueueBindSparse( vkGetInstanceProcAddr( instance, "vkQueueBindSparse" ) );
-        vkCreateFence                = PFN_vkCreateFence( vkGetInstanceProcAddr( instance, "vkCreateFence" ) );
-        vkDestroyFence               = PFN_vkDestroyFence( vkGetInstanceProcAddr( instance, "vkDestroyFence" ) );
-        vkResetFences                = PFN_vkResetFences( vkGetInstanceProcAddr( instance, "vkResetFences" ) );
-        vkGetFenceStatus             = PFN_vkGetFenceStatus( vkGetInstanceProcAddr( instance, "vkGetFenceStatus" ) );
-        vkWaitForFences              = PFN_vkWaitForFences( vkGetInstanceProcAddr( instance, "vkWaitForFences" ) );
-        vkCreateSemaphore            = PFN_vkCreateSemaphore( vkGetInstanceProcAddr( instance, "vkCreateSemaphore" ) );
-        vkDestroySemaphore           = PFN_vkDestroySemaphore( vkGetInstanceProcAddr( instance, "vkDestroySemaphore" ) );
-        vkCreateQueryPool            = PFN_vkCreateQueryPool( vkGetInstanceProcAddr( instance, "vkCreateQueryPool" ) );
-        vkDestroyQueryPool           = PFN_vkDestroyQueryPool( vkGetInstanceProcAddr( instance, "vkDestroyQueryPool" ) );
-        vkGetQueryPoolResults        = PFN_vkGetQueryPoolResults( vkGetInstanceProcAddr( instance, "vkGetQueryPoolResults" ) );
-        vkCreateBuffer               = PFN_vkCreateBuffer( vkGetInstanceProcAddr( instance, "vkCreateBuffer" ) );
-        vkDestroyBuffer              = PFN_vkDestroyBuffer( vkGetInstanceProcAddr( instance, "vkDestroyBuffer" ) );
-        vkCreateImage                = PFN_vkCreateImage( vkGetInstanceProcAddr( instance, "vkCreateImage" ) );
-        vkDestroyImage               = PFN_vkDestroyImage( vkGetInstanceProcAddr( instance, "vkDestroyImage" ) );
-        vkGetImageSubresourceLayout  = PFN_vkGetImageSubresourceLayout( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout" ) );
-        vkCreateImageView            = PFN_vkCreateImageView( vkGetInstanceProcAddr( instance, "vkCreateImageView" ) );
-        vkDestroyImageView           = PFN_vkDestroyImageView( vkGetInstanceProcAddr( instance, "vkDestroyImageView" ) );
-        vkCreateCommandPool          = PFN_vkCreateCommandPool( vkGetInstanceProcAddr( instance, "vkCreateCommandPool" ) );
-        vkDestroyCommandPool         = PFN_vkDestroyCommandPool( vkGetInstanceProcAddr( instance, "vkDestroyCommandPool" ) );
-        vkResetCommandPool           = PFN_vkResetCommandPool( vkGetInstanceProcAddr( instance, "vkResetCommandPool" ) );
-        vkAllocateCommandBuffers     = PFN_vkAllocateCommandBuffers( vkGetInstanceProcAddr( instance, "vkAllocateCommandBuffers" ) );
-        vkFreeCommandBuffers         = PFN_vkFreeCommandBuffers( vkGetInstanceProcAddr( instance, "vkFreeCommandBuffers" ) );
-        vkBeginCommandBuffer         = PFN_vkBeginCommandBuffer( vkGetInstanceProcAddr( instance, "vkBeginCommandBuffer" ) );
-        vkEndCommandBuffer           = PFN_vkEndCommandBuffer( vkGetInstanceProcAddr( instance, "vkEndCommandBuffer" ) );
-        vkResetCommandBuffer         = PFN_vkResetCommandBuffer( vkGetInstanceProcAddr( instance, "vkResetCommandBuffer" ) );
-        vkCmdCopyBuffer              = PFN_vkCmdCopyBuffer( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer" ) );
-        vkCmdCopyImage               = PFN_vkCmdCopyImage( vkGetInstanceProcAddr( instance, "vkCmdCopyImage" ) );
-        vkCmdCopyBufferToImage       = PFN_vkCmdCopyBufferToImage( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage" ) );
-        vkCmdCopyImageToBuffer       = PFN_vkCmdCopyImageToBuffer( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer" ) );
-        vkCmdUpdateBuffer            = PFN_vkCmdUpdateBuffer( vkGetInstanceProcAddr( instance, "vkCmdUpdateBuffer" ) );
-        vkCmdFillBuffer              = PFN_vkCmdFillBuffer( vkGetInstanceProcAddr( instance, "vkCmdFillBuffer" ) );
-        vkCmdPipelineBarrier         = PFN_vkCmdPipelineBarrier( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier" ) );
-        vkCmdBeginQuery              = PFN_vkCmdBeginQuery( vkGetInstanceProcAddr( instance, "vkCmdBeginQuery" ) );
-        vkCmdEndQuery                = PFN_vkCmdEndQuery( vkGetInstanceProcAddr( instance, "vkCmdEndQuery" ) );
-        vkCmdResetQueryPool          = PFN_vkCmdResetQueryPool( vkGetInstanceProcAddr( instance, "vkCmdResetQueryPool" ) );
-        vkCmdWriteTimestamp          = PFN_vkCmdWriteTimestamp( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp" ) );
-        vkCmdCopyQueryPoolResults    = PFN_vkCmdCopyQueryPoolResults( vkGetInstanceProcAddr( instance, "vkCmdCopyQueryPoolResults" ) );
-        vkCmdExecuteCommands         = PFN_vkCmdExecuteCommands( vkGetInstanceProcAddr( instance, "vkCmdExecuteCommands" ) );
-        vkCreateEvent                = PFN_vkCreateEvent( vkGetInstanceProcAddr( instance, "vkCreateEvent" ) );
-        vkDestroyEvent               = PFN_vkDestroyEvent( vkGetInstanceProcAddr( instance, "vkDestroyEvent" ) );
-        vkGetEventStatus             = PFN_vkGetEventStatus( vkGetInstanceProcAddr( instance, "vkGetEventStatus" ) );
-        vkSetEvent                   = PFN_vkSetEvent( vkGetInstanceProcAddr( instance, "vkSetEvent" ) );
-        vkResetEvent                 = PFN_vkResetEvent( vkGetInstanceProcAddr( instance, "vkResetEvent" ) );
-        vkCreateBufferView           = PFN_vkCreateBufferView( vkGetInstanceProcAddr( instance, "vkCreateBufferView" ) );
-        vkDestroyBufferView          = PFN_vkDestroyBufferView( vkGetInstanceProcAddr( instance, "vkDestroyBufferView" ) );
-        vkCreateShaderModule         = PFN_vkCreateShaderModule( vkGetInstanceProcAddr( instance, "vkCreateShaderModule" ) );
-        vkDestroyShaderModule        = PFN_vkDestroyShaderModule( vkGetInstanceProcAddr( instance, "vkDestroyShaderModule" ) );
-        vkCreatePipelineCache        = PFN_vkCreatePipelineCache( vkGetInstanceProcAddr( instance, "vkCreatePipelineCache" ) );
-        vkDestroyPipelineCache       = PFN_vkDestroyPipelineCache( vkGetInstanceProcAddr( instance, "vkDestroyPipelineCache" ) );
-        vkGetPipelineCacheData       = PFN_vkGetPipelineCacheData( vkGetInstanceProcAddr( instance, "vkGetPipelineCacheData" ) );
-        vkMergePipelineCaches        = PFN_vkMergePipelineCaches( vkGetInstanceProcAddr( instance, "vkMergePipelineCaches" ) );
-        vkCreateComputePipelines     = PFN_vkCreateComputePipelines( vkGetInstanceProcAddr( instance, "vkCreateComputePipelines" ) );
-        vkDestroyPipeline            = PFN_vkDestroyPipeline( vkGetInstanceProcAddr( instance, "vkDestroyPipeline" ) );
-        vkCreatePipelineLayout       = PFN_vkCreatePipelineLayout( vkGetInstanceProcAddr( instance, "vkCreatePipelineLayout" ) );
-        vkDestroyPipelineLayout      = PFN_vkDestroyPipelineLayout( vkGetInstanceProcAddr( instance, "vkDestroyPipelineLayout" ) );
-        vkCreateSampler              = PFN_vkCreateSampler( vkGetInstanceProcAddr( instance, "vkCreateSampler" ) );
-        vkDestroySampler             = PFN_vkDestroySampler( vkGetInstanceProcAddr( instance, "vkDestroySampler" ) );
-        vkCreateDescriptorSetLayout  = PFN_vkCreateDescriptorSetLayout( vkGetInstanceProcAddr( instance, "vkCreateDescriptorSetLayout" ) );
-        vkDestroyDescriptorSetLayout = PFN_vkDestroyDescriptorSetLayout( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorSetLayout" ) );
-        vkCreateDescriptorPool       = PFN_vkCreateDescriptorPool( vkGetInstanceProcAddr( instance, "vkCreateDescriptorPool" ) );
-        vkDestroyDescriptorPool      = PFN_vkDestroyDescriptorPool( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorPool" ) );
-        vkResetDescriptorPool        = PFN_vkResetDescriptorPool( vkGetInstanceProcAddr( instance, "vkResetDescriptorPool" ) );
-        vkAllocateDescriptorSets     = PFN_vkAllocateDescriptorSets( vkGetInstanceProcAddr( instance, "vkAllocateDescriptorSets" ) );
-        vkFreeDescriptorSets         = PFN_vkFreeDescriptorSets( vkGetInstanceProcAddr( instance, "vkFreeDescriptorSets" ) );
-        vkUpdateDescriptorSets       = PFN_vkUpdateDescriptorSets( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSets" ) );
-        vkCmdBindPipeline            = PFN_vkCmdBindPipeline( vkGetInstanceProcAddr( instance, "vkCmdBindPipeline" ) );
-        vkCmdBindDescriptorSets      = PFN_vkCmdBindDescriptorSets( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorSets" ) );
-        vkCmdClearColorImage         = PFN_vkCmdClearColorImage( vkGetInstanceProcAddr( instance, "vkCmdClearColorImage" ) );
-        vkCmdDispatch                = PFN_vkCmdDispatch( vkGetInstanceProcAddr( instance, "vkCmdDispatch" ) );
-        vkCmdDispatchIndirect        = PFN_vkCmdDispatchIndirect( vkGetInstanceProcAddr( instance, "vkCmdDispatchIndirect" ) );
-        vkCmdSetEvent                = PFN_vkCmdSetEvent( vkGetInstanceProcAddr( instance, "vkCmdSetEvent" ) );
-        vkCmdResetEvent              = PFN_vkCmdResetEvent( vkGetInstanceProcAddr( instance, "vkCmdResetEvent" ) );
-        vkCmdWaitEvents              = PFN_vkCmdWaitEvents( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents" ) );
-        vkCmdPushConstants           = PFN_vkCmdPushConstants( vkGetInstanceProcAddr( instance, "vkCmdPushConstants" ) );
-        vkCreateGraphicsPipelines    = PFN_vkCreateGraphicsPipelines( vkGetInstanceProcAddr( instance, "vkCreateGraphicsPipelines" ) );
-        vkCreateFramebuffer          = PFN_vkCreateFramebuffer( vkGetInstanceProcAddr( instance, "vkCreateFramebuffer" ) );
-        vkDestroyFramebuffer         = PFN_vkDestroyFramebuffer( vkGetInstanceProcAddr( instance, "vkDestroyFramebuffer" ) );
-        vkCreateRenderPass           = PFN_vkCreateRenderPass( vkGetInstanceProcAddr( instance, "vkCreateRenderPass" ) );
-        vkDestroyRenderPass          = PFN_vkDestroyRenderPass( vkGetInstanceProcAddr( instance, "vkDestroyRenderPass" ) );
-        vkGetRenderAreaGranularity   = PFN_vkGetRenderAreaGranularity( vkGetInstanceProcAddr( instance, "vkGetRenderAreaGranularity" ) );
-        vkCmdSetViewport             = PFN_vkCmdSetViewport( vkGetInstanceProcAddr( instance, "vkCmdSetViewport" ) );
-        vkCmdSetScissor              = PFN_vkCmdSetScissor( vkGetInstanceProcAddr( instance, "vkCmdSetScissor" ) );
-        vkCmdSetLineWidth            = PFN_vkCmdSetLineWidth( vkGetInstanceProcAddr( instance, "vkCmdSetLineWidth" ) );
-        vkCmdSetDepthBias            = PFN_vkCmdSetDepthBias( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBias" ) );
-        vkCmdSetBlendConstants       = PFN_vkCmdSetBlendConstants( vkGetInstanceProcAddr( instance, "vkCmdSetBlendConstants" ) );
-        vkCmdSetDepthBounds          = PFN_vkCmdSetDepthBounds( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBounds" ) );
-        vkCmdSetStencilCompareMask   = PFN_vkCmdSetStencilCompareMask( vkGetInstanceProcAddr( instance, "vkCmdSetStencilCompareMask" ) );
-        vkCmdSetStencilWriteMask     = PFN_vkCmdSetStencilWriteMask( vkGetInstanceProcAddr( instance, "vkCmdSetStencilWriteMask" ) );
-        vkCmdSetStencilReference     = PFN_vkCmdSetStencilReference( vkGetInstanceProcAddr( instance, "vkCmdSetStencilReference" ) );
-        vkCmdBindIndexBuffer         = PFN_vkCmdBindIndexBuffer( vkGetInstanceProcAddr( instance, "vkCmdBindIndexBuffer" ) );
-        vkCmdBindVertexBuffers       = PFN_vkCmdBindVertexBuffers( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers" ) );
-        vkCmdDraw                    = PFN_vkCmdDraw( vkGetInstanceProcAddr( instance, "vkCmdDraw" ) );
-        vkCmdDrawIndexed             = PFN_vkCmdDrawIndexed( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexed" ) );
-        vkCmdDrawIndirect            = PFN_vkCmdDrawIndirect( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirect" ) );
-        vkCmdDrawIndexedIndirect     = PFN_vkCmdDrawIndexedIndirect( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirect" ) );
-        vkCmdBlitImage               = PFN_vkCmdBlitImage( vkGetInstanceProcAddr( instance, "vkCmdBlitImage" ) );
-        vkCmdClearDepthStencilImage  = PFN_vkCmdClearDepthStencilImage( vkGetInstanceProcAddr( instance, "vkCmdClearDepthStencilImage" ) );
-        vkCmdClearAttachments        = PFN_vkCmdClearAttachments( vkGetInstanceProcAddr( instance, "vkCmdClearAttachments" ) );
-        vkCmdResolveImage            = PFN_vkCmdResolveImage( vkGetInstanceProcAddr( instance, "vkCmdResolveImage" ) );
-        vkCmdBeginRenderPass         = PFN_vkCmdBeginRenderPass( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass" ) );
-        vkCmdNextSubpass             = PFN_vkCmdNextSubpass( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass" ) );
-        vkCmdEndRenderPass           = PFN_vkCmdEndRenderPass( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass" ) );
-
-        //=== VK_VERSION_1_1 ===
-        vkBindBufferMemory2                = PFN_vkBindBufferMemory2( vkGetInstanceProcAddr( instance, "vkBindBufferMemory2" ) );
-        vkBindImageMemory2                 = PFN_vkBindImageMemory2( vkGetInstanceProcAddr( instance, "vkBindImageMemory2" ) );
-        vkGetDeviceGroupPeerMemoryFeatures = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPeerMemoryFeatures" ) );
-        vkCmdSetDeviceMask                 = PFN_vkCmdSetDeviceMask( vkGetInstanceProcAddr( instance, "vkCmdSetDeviceMask" ) );
-        vkEnumeratePhysicalDeviceGroups    = PFN_vkEnumeratePhysicalDeviceGroups( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroups" ) );
-        vkGetImageMemoryRequirements2      = PFN_vkGetImageMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements2" ) );
-        vkGetBufferMemoryRequirements2     = PFN_vkGetBufferMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements2" ) );
-        vkGetImageSparseMemoryRequirements2 =
-          PFN_vkGetImageSparseMemoryRequirements2( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements2" ) );
-        vkGetPhysicalDeviceFeatures2   = PFN_vkGetPhysicalDeviceFeatures2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2" ) );
-        vkGetPhysicalDeviceProperties2 = PFN_vkGetPhysicalDeviceProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2" ) );
-        vkGetPhysicalDeviceFormatProperties2 =
-          PFN_vkGetPhysicalDeviceFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2" ) );
-        vkGetPhysicalDeviceImageFormatProperties2 =
-          PFN_vkGetPhysicalDeviceImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2" ) );
-        vkGetPhysicalDeviceQueueFamilyProperties2 =
-          PFN_vkGetPhysicalDeviceQueueFamilyProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2" ) );
-        vkGetPhysicalDeviceMemoryProperties2 =
-          PFN_vkGetPhysicalDeviceMemoryProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2" ) );
-        vkGetPhysicalDeviceSparseImageFormatProperties2 =
-          PFN_vkGetPhysicalDeviceSparseImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2" ) );
-        vkTrimCommandPool = PFN_vkTrimCommandPool( vkGetInstanceProcAddr( instance, "vkTrimCommandPool" ) );
-        vkGetDeviceQueue2 = PFN_vkGetDeviceQueue2( vkGetInstanceProcAddr( instance, "vkGetDeviceQueue2" ) );
-        vkGetPhysicalDeviceExternalBufferProperties =
-          PFN_vkGetPhysicalDeviceExternalBufferProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferProperties" ) );
-        vkGetPhysicalDeviceExternalFenceProperties =
-          PFN_vkGetPhysicalDeviceExternalFenceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFenceProperties" ) );
-        vkGetPhysicalDeviceExternalSemaphoreProperties =
-          PFN_vkGetPhysicalDeviceExternalSemaphoreProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphoreProperties" ) );
-        vkCmdDispatchBase                 = PFN_vkCmdDispatchBase( vkGetInstanceProcAddr( instance, "vkCmdDispatchBase" ) );
-        vkCreateDescriptorUpdateTemplate  = PFN_vkCreateDescriptorUpdateTemplate( vkGetInstanceProcAddr( instance, "vkCreateDescriptorUpdateTemplate" ) );
-        vkDestroyDescriptorUpdateTemplate = PFN_vkDestroyDescriptorUpdateTemplate( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorUpdateTemplate" ) );
-        vkUpdateDescriptorSetWithTemplate = PFN_vkUpdateDescriptorSetWithTemplate( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSetWithTemplate" ) );
-        vkGetDescriptorSetLayoutSupport   = PFN_vkGetDescriptorSetLayoutSupport( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSupport" ) );
-        vkCreateSamplerYcbcrConversion    = PFN_vkCreateSamplerYcbcrConversion( vkGetInstanceProcAddr( instance, "vkCreateSamplerYcbcrConversion" ) );
-        vkDestroySamplerYcbcrConversion   = PFN_vkDestroySamplerYcbcrConversion( vkGetInstanceProcAddr( instance, "vkDestroySamplerYcbcrConversion" ) );
-
-        //=== VK_VERSION_1_2 ===
-        vkResetQueryPool                = PFN_vkResetQueryPool( vkGetInstanceProcAddr( instance, "vkResetQueryPool" ) );
-        vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetInstanceProcAddr( instance, "vkGetSemaphoreCounterValue" ) );
-        vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetInstanceProcAddr( instance, "vkWaitSemaphores" ) );
-        vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetInstanceProcAddr( instance, "vkSignalSemaphore" ) );
-        vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddress" ) );
-        vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureAddress" ) );
-        vkGetDeviceMemoryOpaqueCaptureAddress =
-          PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
-        vkCmdDrawIndirectCount        = PFN_vkCmdDrawIndirectCount( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCount" ) );
-        vkCmdDrawIndexedIndirectCount = PFN_vkCmdDrawIndexedIndirectCount( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCount" ) );
-        vkCreateRenderPass2           = PFN_vkCreateRenderPass2( vkGetInstanceProcAddr( instance, "vkCreateRenderPass2" ) );
-        vkCmdBeginRenderPass2         = PFN_vkCmdBeginRenderPass2( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass2" ) );
-        vkCmdNextSubpass2             = PFN_vkCmdNextSubpass2( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass2" ) );
-        vkCmdEndRenderPass2           = PFN_vkCmdEndRenderPass2( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass2" ) );
-
-        //=== VK_VERSION_1_3 ===
-        vkGetPhysicalDeviceToolProperties = PFN_vkGetPhysicalDeviceToolProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolProperties" ) );
-        vkCreatePrivateDataSlot           = PFN_vkCreatePrivateDataSlot( vkGetInstanceProcAddr( instance, "vkCreatePrivateDataSlot" ) );
-        vkDestroyPrivateDataSlot          = PFN_vkDestroyPrivateDataSlot( vkGetInstanceProcAddr( instance, "vkDestroyPrivateDataSlot" ) );
-        vkSetPrivateData                  = PFN_vkSetPrivateData( vkGetInstanceProcAddr( instance, "vkSetPrivateData" ) );
-        vkGetPrivateData                  = PFN_vkGetPrivateData( vkGetInstanceProcAddr( instance, "vkGetPrivateData" ) );
-        vkCmdPipelineBarrier2             = PFN_vkCmdPipelineBarrier2( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier2" ) );
-        vkCmdWriteTimestamp2              = PFN_vkCmdWriteTimestamp2( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp2" ) );
-        vkQueueSubmit2                    = PFN_vkQueueSubmit2( vkGetInstanceProcAddr( instance, "vkQueueSubmit2" ) );
-        vkCmdCopyBuffer2                  = PFN_vkCmdCopyBuffer2( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer2" ) );
-        vkCmdCopyImage2                   = PFN_vkCmdCopyImage2( vkGetInstanceProcAddr( instance, "vkCmdCopyImage2" ) );
-        vkCmdCopyBufferToImage2           = PFN_vkCmdCopyBufferToImage2( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage2" ) );
-        vkCmdCopyImageToBuffer2           = PFN_vkCmdCopyImageToBuffer2( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer2" ) );
-        vkGetDeviceBufferMemoryRequirements =
-          PFN_vkGetDeviceBufferMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceBufferMemoryRequirements" ) );
-        vkGetDeviceImageMemoryRequirements = PFN_vkGetDeviceImageMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceImageMemoryRequirements" ) );
-        vkGetDeviceImageSparseMemoryRequirements =
-          PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSparseMemoryRequirements" ) );
-        vkCmdSetEvent2                  = PFN_vkCmdSetEvent2( vkGetInstanceProcAddr( instance, "vkCmdSetEvent2" ) );
-        vkCmdResetEvent2                = PFN_vkCmdResetEvent2( vkGetInstanceProcAddr( instance, "vkCmdResetEvent2" ) );
-        vkCmdWaitEvents2                = PFN_vkCmdWaitEvents2( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents2" ) );
-        vkCmdBlitImage2                 = PFN_vkCmdBlitImage2( vkGetInstanceProcAddr( instance, "vkCmdBlitImage2" ) );
-        vkCmdResolveImage2              = PFN_vkCmdResolveImage2( vkGetInstanceProcAddr( instance, "vkCmdResolveImage2" ) );
-        vkCmdBeginRendering             = PFN_vkCmdBeginRendering( vkGetInstanceProcAddr( instance, "vkCmdBeginRendering" ) );
-        vkCmdEndRendering               = PFN_vkCmdEndRendering( vkGetInstanceProcAddr( instance, "vkCmdEndRendering" ) );
-        vkCmdSetCullMode                = PFN_vkCmdSetCullMode( vkGetInstanceProcAddr( instance, "vkCmdSetCullMode" ) );
-        vkCmdSetFrontFace               = PFN_vkCmdSetFrontFace( vkGetInstanceProcAddr( instance, "vkCmdSetFrontFace" ) );
-        vkCmdSetPrimitiveTopology       = PFN_vkCmdSetPrimitiveTopology( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveTopology" ) );
-        vkCmdSetViewportWithCount       = PFN_vkCmdSetViewportWithCount( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWithCount" ) );
-        vkCmdSetScissorWithCount        = PFN_vkCmdSetScissorWithCount( vkGetInstanceProcAddr( instance, "vkCmdSetScissorWithCount" ) );
-        vkCmdBindVertexBuffers2         = PFN_vkCmdBindVertexBuffers2( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers2" ) );
-        vkCmdSetDepthTestEnable         = PFN_vkCmdSetDepthTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthTestEnable" ) );
-        vkCmdSetDepthWriteEnable        = PFN_vkCmdSetDepthWriteEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthWriteEnable" ) );
-        vkCmdSetDepthCompareOp          = PFN_vkCmdSetDepthCompareOp( vkGetInstanceProcAddr( instance, "vkCmdSetDepthCompareOp" ) );
-        vkCmdSetDepthBoundsTestEnable   = PFN_vkCmdSetDepthBoundsTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBoundsTestEnable" ) );
-        vkCmdSetStencilTestEnable       = PFN_vkCmdSetStencilTestEnable( vkGetInstanceProcAddr( instance, "vkCmdSetStencilTestEnable" ) );
-        vkCmdSetStencilOp               = PFN_vkCmdSetStencilOp( vkGetInstanceProcAddr( instance, "vkCmdSetStencilOp" ) );
-        vkCmdSetRasterizerDiscardEnable = PFN_vkCmdSetRasterizerDiscardEnable( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizerDiscardEnable" ) );
-        vkCmdSetDepthBiasEnable         = PFN_vkCmdSetDepthBiasEnable( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBiasEnable" ) );
-        vkCmdSetPrimitiveRestartEnable  = PFN_vkCmdSetPrimitiveRestartEnable( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveRestartEnable" ) );
-
-        //=== VK_VERSION_1_4 ===
-        vkMapMemory2                       = PFN_vkMapMemory2( vkGetInstanceProcAddr( instance, "vkMapMemory2" ) );
-        vkUnmapMemory2                     = PFN_vkUnmapMemory2( vkGetInstanceProcAddr( instance, "vkUnmapMemory2" ) );
-        vkGetDeviceImageSubresourceLayout  = PFN_vkGetDeviceImageSubresourceLayout( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSubresourceLayout" ) );
-        vkGetImageSubresourceLayout2       = PFN_vkGetImageSubresourceLayout2( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout2" ) );
-        vkCopyMemoryToImage                = PFN_vkCopyMemoryToImage( vkGetInstanceProcAddr( instance, "vkCopyMemoryToImage" ) );
-        vkCopyImageToMemory                = PFN_vkCopyImageToMemory( vkGetInstanceProcAddr( instance, "vkCopyImageToMemory" ) );
-        vkCopyImageToImage                 = PFN_vkCopyImageToImage( vkGetInstanceProcAddr( instance, "vkCopyImageToImage" ) );
-        vkTransitionImageLayout            = PFN_vkTransitionImageLayout( vkGetInstanceProcAddr( instance, "vkTransitionImageLayout" ) );
-        vkCmdPushDescriptorSet             = PFN_vkCmdPushDescriptorSet( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSet" ) );
-        vkCmdPushDescriptorSetWithTemplate = PFN_vkCmdPushDescriptorSetWithTemplate( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplate" ) );
-        vkCmdBindDescriptorSets2           = PFN_vkCmdBindDescriptorSets2( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorSets2" ) );
-        vkCmdPushConstants2                = PFN_vkCmdPushConstants2( vkGetInstanceProcAddr( instance, "vkCmdPushConstants2" ) );
-        vkCmdPushDescriptorSet2            = PFN_vkCmdPushDescriptorSet2( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSet2" ) );
-        vkCmdPushDescriptorSetWithTemplate2 =
-          PFN_vkCmdPushDescriptorSetWithTemplate2( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplate2" ) );
-        vkCmdSetLineStipple           = PFN_vkCmdSetLineStipple( vkGetInstanceProcAddr( instance, "vkCmdSetLineStipple" ) );
-        vkCmdBindIndexBuffer2         = PFN_vkCmdBindIndexBuffer2( vkGetInstanceProcAddr( instance, "vkCmdBindIndexBuffer2" ) );
-        vkGetRenderingAreaGranularity = PFN_vkGetRenderingAreaGranularity( vkGetInstanceProcAddr( instance, "vkGetRenderingAreaGranularity" ) );
-        vkCmdSetRenderingAttachmentLocations =
-          PFN_vkCmdSetRenderingAttachmentLocations( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingAttachmentLocations" ) );
-        vkCmdSetRenderingInputAttachmentIndices =
-          PFN_vkCmdSetRenderingInputAttachmentIndices( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingInputAttachmentIndices" ) );
-
-        //=== VK_KHR_surface ===
-        vkDestroySurfaceKHR = PFN_vkDestroySurfaceKHR( vkGetInstanceProcAddr( instance, "vkDestroySurfaceKHR" ) );
-        vkGetPhysicalDeviceSurfaceSupportKHR =
-          PFN_vkGetPhysicalDeviceSurfaceSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceSupportKHR" ) );
-        vkGetPhysicalDeviceSurfaceCapabilitiesKHR =
-          PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" ) );
-        vkGetPhysicalDeviceSurfaceFormatsKHR =
-          PFN_vkGetPhysicalDeviceSurfaceFormatsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormatsKHR" ) );
-        vkGetPhysicalDeviceSurfacePresentModesKHR =
-          PFN_vkGetPhysicalDeviceSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModesKHR" ) );
-
-        //=== VK_KHR_swapchain ===
-        vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetInstanceProcAddr( instance, "vkCreateSwapchainKHR" ) );
-        vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetInstanceProcAddr( instance, "vkDestroySwapchainKHR" ) );
-        vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetInstanceProcAddr( instance, "vkGetSwapchainImagesKHR" ) );
-        vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetInstanceProcAddr( instance, "vkAcquireNextImageKHR" ) );
-        vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetInstanceProcAddr( instance, "vkQueuePresentKHR" ) );
-        vkGetDeviceGroupPresentCapabilitiesKHR =
-          PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
-        vkGetDeviceGroupSurfacePresentModesKHR =
-          PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
-        vkGetPhysicalDevicePresentRectanglesKHR =
-          PFN_vkGetPhysicalDevicePresentRectanglesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDevicePresentRectanglesKHR" ) );
-        vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetInstanceProcAddr( instance, "vkAcquireNextImage2KHR" ) );
-
-        //=== VK_KHR_display ===
-        vkGetPhysicalDeviceDisplayPropertiesKHR =
-          PFN_vkGetPhysicalDeviceDisplayPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPropertiesKHR" ) );
-        vkGetPhysicalDeviceDisplayPlanePropertiesKHR =
-          PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR" ) );
-        vkGetDisplayPlaneSupportedDisplaysKHR =
-          PFN_vkGetDisplayPlaneSupportedDisplaysKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneSupportedDisplaysKHR" ) );
-        vkGetDisplayModePropertiesKHR    = PFN_vkGetDisplayModePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModePropertiesKHR" ) );
-        vkCreateDisplayModeKHR           = PFN_vkCreateDisplayModeKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayModeKHR" ) );
-        vkGetDisplayPlaneCapabilitiesKHR = PFN_vkGetDisplayPlaneCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilitiesKHR" ) );
-        vkCreateDisplayPlaneSurfaceKHR   = PFN_vkCreateDisplayPlaneSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayPlaneSurfaceKHR" ) );
-
-        //=== VK_KHR_display_swapchain ===
-        vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetInstanceProcAddr( instance, "vkCreateSharedSwapchainsKHR" ) );
-
-#if defined( VK_USE_PLATFORM_XLIB_KHR )
-        //=== VK_KHR_xlib_surface ===
-        vkCreateXlibSurfaceKHR = PFN_vkCreateXlibSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXlibSurfaceKHR" ) );
-        vkGetPhysicalDeviceXlibPresentationSupportKHR =
-          PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXlibPresentationSupportKHR" ) );
-#endif /*VK_USE_PLATFORM_XLIB_KHR*/
-
-#if defined( VK_USE_PLATFORM_XCB_KHR )
-        //=== VK_KHR_xcb_surface ===
-        vkCreateXcbSurfaceKHR = PFN_vkCreateXcbSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXcbSurfaceKHR" ) );
-        vkGetPhysicalDeviceXcbPresentationSupportKHR =
-          PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXcbPresentationSupportKHR" ) );
-#endif /*VK_USE_PLATFORM_XCB_KHR*/
-
-#if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-        //=== VK_KHR_wayland_surface ===
-        vkCreateWaylandSurfaceKHR = PFN_vkCreateWaylandSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWaylandSurfaceKHR" ) );
-        vkGetPhysicalDeviceWaylandPresentationSupportKHR =
-          PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWaylandPresentationSupportKHR" ) );
-#endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-        //=== VK_KHR_android_surface ===
-        vkCreateAndroidSurfaceKHR = PFN_vkCreateAndroidSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateAndroidSurfaceKHR" ) );
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_win32_surface ===
-        vkCreateWin32SurfaceKHR = PFN_vkCreateWin32SurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWin32SurfaceKHR" ) );
-        vkGetPhysicalDeviceWin32PresentationSupportKHR =
-          PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWin32PresentationSupportKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_EXT_debug_report ===
-        vkCreateDebugReportCallbackEXT  = PFN_vkCreateDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugReportCallbackEXT" ) );
-        vkDestroyDebugReportCallbackEXT = PFN_vkDestroyDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugReportCallbackEXT" ) );
-        vkDebugReportMessageEXT         = PFN_vkDebugReportMessageEXT( vkGetInstanceProcAddr( instance, "vkDebugReportMessageEXT" ) );
-
-        //=== VK_EXT_debug_marker ===
-        vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetInstanceProcAddr( instance, "vkDebugMarkerSetObjectTagEXT" ) );
-        vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetInstanceProcAddr( instance, "vkDebugMarkerSetObjectNameEXT" ) );
-        vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerBeginEXT" ) );
-        vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerEndEXT" ) );
-        vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetInstanceProcAddr( instance, "vkCmdDebugMarkerInsertEXT" ) );
-
-        //=== VK_KHR_video_queue ===
-        vkGetPhysicalDeviceVideoCapabilitiesKHR =
-          PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR" ) );
-        vkGetPhysicalDeviceVideoFormatPropertiesKHR =
-          PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoFormatPropertiesKHR" ) );
-        vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetInstanceProcAddr( instance, "vkCreateVideoSessionKHR" ) );
-        vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetInstanceProcAddr( instance, "vkDestroyVideoSessionKHR" ) );
-        vkGetVideoSessionMemoryRequirementsKHR =
-          PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetVideoSessionMemoryRequirementsKHR" ) );
-        vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetInstanceProcAddr( instance, "vkBindVideoSessionMemoryKHR" ) );
-        vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkCreateVideoSessionParametersKHR" ) );
-        vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkUpdateVideoSessionParametersKHR" ) );
-        vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkDestroyVideoSessionParametersKHR" ) );
-        vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdBeginVideoCodingKHR" ) );
-        vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdEndVideoCodingKHR" ) );
-        vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetInstanceProcAddr( instance, "vkCmdControlVideoCodingKHR" ) );
-
-        //=== VK_KHR_video_decode_queue ===
-        vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetInstanceProcAddr( instance, "vkCmdDecodeVideoKHR" ) );
-
-        //=== VK_EXT_transform_feedback ===
-        vkCmdBindTransformFeedbackBuffersEXT =
-          PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindTransformFeedbackBuffersEXT" ) );
-        vkCmdBeginTransformFeedbackEXT = PFN_vkCmdBeginTransformFeedbackEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginTransformFeedbackEXT" ) );
-        vkCmdEndTransformFeedbackEXT   = PFN_vkCmdEndTransformFeedbackEXT( vkGetInstanceProcAddr( instance, "vkCmdEndTransformFeedbackEXT" ) );
-        vkCmdBeginQueryIndexedEXT      = PFN_vkCmdBeginQueryIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginQueryIndexedEXT" ) );
-        vkCmdEndQueryIndexedEXT        = PFN_vkCmdEndQueryIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdEndQueryIndexedEXT" ) );
-        vkCmdDrawIndirectByteCountEXT  = PFN_vkCmdDrawIndirectByteCountEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectByteCountEXT" ) );
-
-        //=== VK_NVX_binary_import ===
-        vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetInstanceProcAddr( instance, "vkCreateCuModuleNVX" ) );
-        vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetInstanceProcAddr( instance, "vkCreateCuFunctionNVX" ) );
-        vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetInstanceProcAddr( instance, "vkDestroyCuModuleNVX" ) );
-        vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetInstanceProcAddr( instance, "vkDestroyCuFunctionNVX" ) );
-        vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetInstanceProcAddr( instance, "vkCmdCuLaunchKernelNVX" ) );
-
-        //=== VK_NVX_image_view_handle ===
-        vkGetImageViewHandleNVX   = PFN_vkGetImageViewHandleNVX( vkGetInstanceProcAddr( instance, "vkGetImageViewHandleNVX" ) );
-        vkGetImageViewHandle64NVX = PFN_vkGetImageViewHandle64NVX( vkGetInstanceProcAddr( instance, "vkGetImageViewHandle64NVX" ) );
-        vkGetImageViewAddressNVX  = PFN_vkGetImageViewAddressNVX( vkGetInstanceProcAddr( instance, "vkGetImageViewAddressNVX" ) );
-
-        //=== VK_AMD_draw_indirect_count ===
-        vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCountAMD" ) );
-        if ( !vkCmdDrawIndirectCount )
-          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
-        vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCountAMD" ) );
-        if ( !vkCmdDrawIndexedIndirectCount )
-          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
-
-        //=== VK_AMD_shader_info ===
-        vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetInstanceProcAddr( instance, "vkGetShaderInfoAMD" ) );
-
-        //=== VK_KHR_dynamic_rendering ===
-        vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderingKHR" ) );
-        if ( !vkCmdBeginRendering )
-          vkCmdBeginRendering = vkCmdBeginRenderingKHR;
-        vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetInstanceProcAddr( instance, "vkCmdEndRenderingKHR" ) );
-        if ( !vkCmdEndRendering )
-          vkCmdEndRendering = vkCmdEndRenderingKHR;
-
-#if defined( VK_USE_PLATFORM_GGP )
-        //=== VK_GGP_stream_descriptor_surface ===
-        vkCreateStreamDescriptorSurfaceGGP = PFN_vkCreateStreamDescriptorSurfaceGGP( vkGetInstanceProcAddr( instance, "vkCreateStreamDescriptorSurfaceGGP" ) );
-#endif /*VK_USE_PLATFORM_GGP*/
-
-        //=== VK_NV_external_memory_capabilities ===
-        vkGetPhysicalDeviceExternalImageFormatPropertiesNV =
-          PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalImageFormatPropertiesNV" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_NV_external_memory_win32 ===
-        vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandleNV" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_get_physical_device_properties2 ===
-        vkGetPhysicalDeviceFeatures2KHR = PFN_vkGetPhysicalDeviceFeatures2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2KHR" ) );
-        if ( !vkGetPhysicalDeviceFeatures2 )
-          vkGetPhysicalDeviceFeatures2 = vkGetPhysicalDeviceFeatures2KHR;
-        vkGetPhysicalDeviceProperties2KHR = PFN_vkGetPhysicalDeviceProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceProperties2 )
-          vkGetPhysicalDeviceProperties2 = vkGetPhysicalDeviceProperties2KHR;
-        vkGetPhysicalDeviceFormatProperties2KHR =
-          PFN_vkGetPhysicalDeviceFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceFormatProperties2 )
-          vkGetPhysicalDeviceFormatProperties2 = vkGetPhysicalDeviceFormatProperties2KHR;
-        vkGetPhysicalDeviceImageFormatProperties2KHR =
-          PFN_vkGetPhysicalDeviceImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceImageFormatProperties2 )
-          vkGetPhysicalDeviceImageFormatProperties2 = vkGetPhysicalDeviceImageFormatProperties2KHR;
-        vkGetPhysicalDeviceQueueFamilyProperties2KHR =
-          PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceQueueFamilyProperties2 )
-          vkGetPhysicalDeviceQueueFamilyProperties2 = vkGetPhysicalDeviceQueueFamilyProperties2KHR;
-        vkGetPhysicalDeviceMemoryProperties2KHR =
-          PFN_vkGetPhysicalDeviceMemoryProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceMemoryProperties2 )
-          vkGetPhysicalDeviceMemoryProperties2 = vkGetPhysicalDeviceMemoryProperties2KHR;
-        vkGetPhysicalDeviceSparseImageFormatProperties2KHR =
-          PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR" ) );
-        if ( !vkGetPhysicalDeviceSparseImageFormatProperties2 )
-          vkGetPhysicalDeviceSparseImageFormatProperties2 = vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
-
-        //=== VK_KHR_device_group ===
-        vkGetDeviceGroupPeerMemoryFeaturesKHR =
-          PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
-        if ( !vkGetDeviceGroupPeerMemoryFeatures )
-          vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
-        vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetInstanceProcAddr( instance, "vkCmdSetDeviceMaskKHR" ) );
-        if ( !vkCmdSetDeviceMask )
-          vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
-        vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetInstanceProcAddr( instance, "vkCmdDispatchBaseKHR" ) );
-        if ( !vkCmdDispatchBase )
-          vkCmdDispatchBase = vkCmdDispatchBaseKHR;
-
-#if defined( VK_USE_PLATFORM_VI_NN )
-        //=== VK_NN_vi_surface ===
-        vkCreateViSurfaceNN = PFN_vkCreateViSurfaceNN( vkGetInstanceProcAddr( instance, "vkCreateViSurfaceNN" ) );
-#endif /*VK_USE_PLATFORM_VI_NN*/
-
-        //=== VK_KHR_maintenance1 ===
-        vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetInstanceProcAddr( instance, "vkTrimCommandPoolKHR" ) );
-        if ( !vkTrimCommandPool )
-          vkTrimCommandPool = vkTrimCommandPoolKHR;
-
-        //=== VK_KHR_device_group_creation ===
-        vkEnumeratePhysicalDeviceGroupsKHR = PFN_vkEnumeratePhysicalDeviceGroupsKHR( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroupsKHR" ) );
-        if ( !vkEnumeratePhysicalDeviceGroups )
-          vkEnumeratePhysicalDeviceGroups = vkEnumeratePhysicalDeviceGroupsKHR;
-
-        //=== VK_KHR_external_memory_capabilities ===
-        vkGetPhysicalDeviceExternalBufferPropertiesKHR =
-          PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferPropertiesKHR" ) );
-        if ( !vkGetPhysicalDeviceExternalBufferProperties )
-          vkGetPhysicalDeviceExternalBufferProperties = vkGetPhysicalDeviceExternalBufferPropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_memory_win32 ===
-        vkGetMemoryWin32HandleKHR = PFN_vkGetMemoryWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandleKHR" ) );
-        vkGetMemoryWin32HandlePropertiesKHR =
-          PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryWin32HandlePropertiesKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_memory_fd ===
-        vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryFdKHR" ) );
-        vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetMemoryFdPropertiesKHR" ) );
-
-        //=== VK_KHR_external_semaphore_capabilities ===
-        vkGetPhysicalDeviceExternalSemaphorePropertiesKHR =
-          PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" ) );
-        if ( !vkGetPhysicalDeviceExternalSemaphoreProperties )
-          vkGetPhysicalDeviceExternalSemaphoreProperties = vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_semaphore_win32 ===
-        vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkImportSemaphoreWin32HandleKHR" ) );
-        vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreWin32HandleKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_semaphore_fd ===
-        vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetInstanceProcAddr( instance, "vkImportSemaphoreFdKHR" ) );
-        vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreFdKHR" ) );
-
-        //=== VK_KHR_push_descriptor ===
-        vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetKHR" ) );
-        if ( !vkCmdPushDescriptorSet )
-          vkCmdPushDescriptorSet = vkCmdPushDescriptorSetKHR;
-        vkCmdPushDescriptorSetWithTemplateKHR =
-          PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
-        if ( !vkCmdPushDescriptorSetWithTemplate )
-          vkCmdPushDescriptorSetWithTemplate = vkCmdPushDescriptorSetWithTemplateKHR;
-
-        //=== VK_EXT_conditional_rendering ===
-        vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginConditionalRenderingEXT" ) );
-        vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetInstanceProcAddr( instance, "vkCmdEndConditionalRenderingEXT" ) );
-
-        //=== VK_KHR_descriptor_update_template ===
-        vkCreateDescriptorUpdateTemplateKHR =
-          PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetInstanceProcAddr( instance, "vkCreateDescriptorUpdateTemplateKHR" ) );
-        if ( !vkCreateDescriptorUpdateTemplate )
-          vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
-        vkDestroyDescriptorUpdateTemplateKHR =
-          PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetInstanceProcAddr( instance, "vkDestroyDescriptorUpdateTemplateKHR" ) );
-        if ( !vkDestroyDescriptorUpdateTemplate )
-          vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
-        vkUpdateDescriptorSetWithTemplateKHR =
-          PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetInstanceProcAddr( instance, "vkUpdateDescriptorSetWithTemplateKHR" ) );
-        if ( !vkUpdateDescriptorSetWithTemplate )
-          vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
-
-        //=== VK_NV_clip_space_w_scaling ===
-        vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWScalingNV" ) );
-
-        //=== VK_EXT_direct_mode_display ===
-        vkReleaseDisplayEXT = PFN_vkReleaseDisplayEXT( vkGetInstanceProcAddr( instance, "vkReleaseDisplayEXT" ) );
-
-#if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-        //=== VK_EXT_acquire_xlib_display ===
-        vkAcquireXlibDisplayEXT    = PFN_vkAcquireXlibDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireXlibDisplayEXT" ) );
-        vkGetRandROutputDisplayEXT = PFN_vkGetRandROutputDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetRandROutputDisplayEXT" ) );
-#endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
-
-        //=== VK_EXT_display_surface_counter ===
-        vkGetPhysicalDeviceSurfaceCapabilities2EXT =
-          PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2EXT" ) );
-
-        //=== VK_EXT_display_control ===
-        vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetInstanceProcAddr( instance, "vkDisplayPowerControlEXT" ) );
-        vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetInstanceProcAddr( instance, "vkRegisterDeviceEventEXT" ) );
-        vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetInstanceProcAddr( instance, "vkRegisterDisplayEventEXT" ) );
-        vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainCounterEXT" ) );
-
-        //=== VK_GOOGLE_display_timing ===
-        vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetInstanceProcAddr( instance, "vkGetRefreshCycleDurationGOOGLE" ) );
-        vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetInstanceProcAddr( instance, "vkGetPastPresentationTimingGOOGLE" ) );
-
-        //=== VK_EXT_discard_rectangles ===
-        vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleEXT" ) );
-        vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleEnableEXT" ) );
-        vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDiscardRectangleModeEXT" ) );
-
-        //=== VK_EXT_hdr_metadata ===
-        vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetInstanceProcAddr( instance, "vkSetHdrMetadataEXT" ) );
-
-        //=== VK_KHR_create_renderpass2 ===
-        vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCreateRenderPass2KHR" ) );
-        if ( !vkCreateRenderPass2 )
-          vkCreateRenderPass2 = vkCreateRenderPass2KHR;
-        vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCmdBeginRenderPass2KHR" ) );
-        if ( !vkCmdBeginRenderPass2 )
-          vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
-        vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetInstanceProcAddr( instance, "vkCmdNextSubpass2KHR" ) );
-        if ( !vkCmdNextSubpass2 )
-          vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
-        vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetInstanceProcAddr( instance, "vkCmdEndRenderPass2KHR" ) );
-        if ( !vkCmdEndRenderPass2 )
-          vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
-
-        //=== VK_KHR_shared_presentable_image ===
-        vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetInstanceProcAddr( instance, "vkGetSwapchainStatusKHR" ) );
-
-        //=== VK_KHR_external_fence_capabilities ===
-        vkGetPhysicalDeviceExternalFencePropertiesKHR =
-          PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFencePropertiesKHR" ) );
-        if ( !vkGetPhysicalDeviceExternalFenceProperties )
-          vkGetPhysicalDeviceExternalFenceProperties = vkGetPhysicalDeviceExternalFencePropertiesKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_fence_win32 ===
-        vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkImportFenceWin32HandleKHR" ) );
-        vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetInstanceProcAddr( instance, "vkGetFenceWin32HandleKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_fence_fd ===
-        vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetInstanceProcAddr( instance, "vkImportFenceFdKHR" ) );
-        vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetInstanceProcAddr( instance, "vkGetFenceFdKHR" ) );
-
-        //=== VK_KHR_performance_query ===
-        vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
-          vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR" ) );
-        vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
-          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR" ) );
-        vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetInstanceProcAddr( instance, "vkAcquireProfilingLockKHR" ) );
-        vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetInstanceProcAddr( instance, "vkReleaseProfilingLockKHR" ) );
-
-        //=== VK_KHR_get_surface_capabilities2 ===
-        vkGetPhysicalDeviceSurfaceCapabilities2KHR =
-          PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2KHR" ) );
-        vkGetPhysicalDeviceSurfaceFormats2KHR =
-          PFN_vkGetPhysicalDeviceSurfaceFormats2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormats2KHR" ) );
-
-        //=== VK_KHR_get_display_properties2 ===
-        vkGetPhysicalDeviceDisplayProperties2KHR =
-          PFN_vkGetPhysicalDeviceDisplayProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayProperties2KHR" ) );
-        vkGetPhysicalDeviceDisplayPlaneProperties2KHR =
-          PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlaneProperties2KHR" ) );
-        vkGetDisplayModeProperties2KHR    = PFN_vkGetDisplayModeProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModeProperties2KHR" ) );
-        vkGetDisplayPlaneCapabilities2KHR = PFN_vkGetDisplayPlaneCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilities2KHR" ) );
-
-#if defined( VK_USE_PLATFORM_IOS_MVK )
-        //=== VK_MVK_ios_surface ===
-        vkCreateIOSSurfaceMVK = PFN_vkCreateIOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateIOSSurfaceMVK" ) );
-#endif /*VK_USE_PLATFORM_IOS_MVK*/
-
-#if defined( VK_USE_PLATFORM_MACOS_MVK )
-        //=== VK_MVK_macos_surface ===
-        vkCreateMacOSSurfaceMVK = PFN_vkCreateMacOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateMacOSSurfaceMVK" ) );
-#endif /*VK_USE_PLATFORM_MACOS_MVK*/
-
-        //=== VK_EXT_debug_utils ===
-        vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetInstanceProcAddr( instance, "vkSetDebugUtilsObjectNameEXT" ) );
-        vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetInstanceProcAddr( instance, "vkSetDebugUtilsObjectTagEXT" ) );
-        vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueBeginDebugUtilsLabelEXT" ) );
-        vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueEndDebugUtilsLabelEXT" ) );
-        vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkQueueInsertDebugUtilsLabelEXT" ) );
-        vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginDebugUtilsLabelEXT" ) );
-        vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdEndDebugUtilsLabelEXT" ) );
-        vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetInstanceProcAddr( instance, "vkCmdInsertDebugUtilsLabelEXT" ) );
-        vkCreateDebugUtilsMessengerEXT  = PFN_vkCreateDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugUtilsMessengerEXT" ) );
-        vkDestroyDebugUtilsMessengerEXT = PFN_vkDestroyDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugUtilsMessengerEXT" ) );
-        vkSubmitDebugUtilsMessageEXT    = PFN_vkSubmitDebugUtilsMessageEXT( vkGetInstanceProcAddr( instance, "vkSubmitDebugUtilsMessageEXT" ) );
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-        //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-        vkGetAndroidHardwareBufferPropertiesANDROID =
-          PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetInstanceProcAddr( instance, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
-        vkGetMemoryAndroidHardwareBufferANDROID =
-          PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetInstanceProcAddr( instance, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        //=== VK_AMDX_shader_enqueue ===
-        vkCreateExecutionGraphPipelinesAMDX =
-          PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetInstanceProcAddr( instance, "vkCreateExecutionGraphPipelinesAMDX" ) );
-        vkGetExecutionGraphPipelineScratchSizeAMDX =
-          PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetInstanceProcAddr( instance, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
-        vkGetExecutionGraphPipelineNodeIndexAMDX =
-          PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetInstanceProcAddr( instance, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
-        vkCmdInitializeGraphScratchMemoryAMDX =
-          PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetInstanceProcAddr( instance, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
-        vkCmdDispatchGraphAMDX         = PFN_vkCmdDispatchGraphAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphAMDX" ) );
-        vkCmdDispatchGraphIndirectAMDX = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphIndirectAMDX" ) );
-        vkCmdDispatchGraphIndirectCountAMDX =
-          PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetInstanceProcAddr( instance, "vkCmdDispatchGraphIndirectCountAMDX" ) );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-        //=== VK_EXT_sample_locations ===
-        vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleLocationsEXT" ) );
-        vkGetPhysicalDeviceMultisamplePropertiesEXT =
-          PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT" ) );
-
-        //=== VK_KHR_get_memory_requirements2 ===
-        vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetImageMemoryRequirements2KHR" ) );
-        if ( !vkGetImageMemoryRequirements2 )
-          vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
-        vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetBufferMemoryRequirements2KHR" ) );
-        if ( !vkGetBufferMemoryRequirements2 )
-          vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
-        vkGetImageSparseMemoryRequirements2KHR =
-          PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetInstanceProcAddr( instance, "vkGetImageSparseMemoryRequirements2KHR" ) );
-        if ( !vkGetImageSparseMemoryRequirements2 )
-          vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
-
-        //=== VK_KHR_acceleration_structure ===
-        vkCreateAccelerationStructureKHR  = PFN_vkCreateAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCreateAccelerationStructureKHR" ) );
-        vkDestroyAccelerationStructureKHR = PFN_vkDestroyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkDestroyAccelerationStructureKHR" ) );
-        vkCmdBuildAccelerationStructuresKHR =
-          PFN_vkCmdBuildAccelerationStructuresKHR( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructuresKHR" ) );
-        vkCmdBuildAccelerationStructuresIndirectKHR =
-          PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
-        vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetInstanceProcAddr( instance, "vkBuildAccelerationStructuresKHR" ) );
-        vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCopyAccelerationStructureKHR" ) );
-        vkCopyAccelerationStructureToMemoryKHR =
-          PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetInstanceProcAddr( instance, "vkCopyAccelerationStructureToMemoryKHR" ) );
-        vkCopyMemoryToAccelerationStructureKHR =
-          PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCopyMemoryToAccelerationStructureKHR" ) );
-        vkWriteAccelerationStructuresPropertiesKHR =
-          PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetInstanceProcAddr( instance, "vkWriteAccelerationStructuresPropertiesKHR" ) );
-        vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureKHR" ) );
-        vkCmdCopyAccelerationStructureToMemoryKHR =
-          PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
-        vkCmdCopyMemoryToAccelerationStructureKHR =
-          PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
-        vkGetAccelerationStructureDeviceAddressKHR =
-          PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureDeviceAddressKHR" ) );
-        vkCmdWriteAccelerationStructuresPropertiesKHR =
-          PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetInstanceProcAddr( instance, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
-        vkGetDeviceAccelerationStructureCompatibilityKHR =
-          PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
-        vkGetAccelerationStructureBuildSizesKHR =
-          PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureBuildSizesKHR" ) );
-
-        //=== VK_KHR_ray_tracing_pipeline ===
-        vkCmdTraceRaysKHR              = PFN_vkCmdTraceRaysKHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysKHR" ) );
-        vkCreateRayTracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR( vkGetInstanceProcAddr( instance, "vkCreateRayTracingPipelinesKHR" ) );
-        vkGetRayTracingShaderGroupHandlesKHR =
-          PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupHandlesKHR" ) );
-        vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
-          PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
-        vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysIndirectKHR" ) );
-        vkGetRayTracingShaderGroupStackSizeKHR =
-          PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
-        vkCmdSetRayTracingPipelineStackSizeKHR =
-          PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
-
-        //=== VK_KHR_sampler_ycbcr_conversion ===
-        vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetInstanceProcAddr( instance, "vkCreateSamplerYcbcrConversionKHR" ) );
-        if ( !vkCreateSamplerYcbcrConversion )
-          vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
-        vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetInstanceProcAddr( instance, "vkDestroySamplerYcbcrConversionKHR" ) );
-        if ( !vkDestroySamplerYcbcrConversion )
-          vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
-
-        //=== VK_KHR_bind_memory2 ===
-        vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetInstanceProcAddr( instance, "vkBindBufferMemory2KHR" ) );
-        if ( !vkBindBufferMemory2 )
-          vkBindBufferMemory2 = vkBindBufferMemory2KHR;
-        vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetInstanceProcAddr( instance, "vkBindImageMemory2KHR" ) );
-        if ( !vkBindImageMemory2 )
-          vkBindImageMemory2 = vkBindImageMemory2KHR;
-
-        //=== VK_EXT_image_drm_format_modifier ===
-        vkGetImageDrmFormatModifierPropertiesEXT =
-          PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
-
-        //=== VK_EXT_validation_cache ===
-        vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetInstanceProcAddr( instance, "vkCreateValidationCacheEXT" ) );
-        vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetInstanceProcAddr( instance, "vkDestroyValidationCacheEXT" ) );
-        vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetInstanceProcAddr( instance, "vkMergeValidationCachesEXT" ) );
-        vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetInstanceProcAddr( instance, "vkGetValidationCacheDataEXT" ) );
-
-        //=== VK_NV_shading_rate_image ===
-        vkCmdBindShadingRateImageNV = PFN_vkCmdBindShadingRateImageNV( vkGetInstanceProcAddr( instance, "vkCmdBindShadingRateImageNV" ) );
-        vkCmdSetViewportShadingRatePaletteNV =
-          PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportShadingRatePaletteNV" ) );
-        vkCmdSetCoarseSampleOrderNV = PFN_vkCmdSetCoarseSampleOrderNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoarseSampleOrderNV" ) );
-
-        //=== VK_NV_ray_tracing ===
-        vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCreateAccelerationStructureNV" ) );
-        vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkDestroyAccelerationStructureNV" ) );
-        vkGetAccelerationStructureMemoryRequirementsNV =
-          PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
-        vkBindAccelerationStructureMemoryNV =
-          PFN_vkBindAccelerationStructureMemoryNV( vkGetInstanceProcAddr( instance, "vkBindAccelerationStructureMemoryNV" ) );
-        vkCmdBuildAccelerationStructureNV = PFN_vkCmdBuildAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCmdBuildAccelerationStructureNV" ) );
-        vkCmdCopyAccelerationStructureNV  = PFN_vkCmdCopyAccelerationStructureNV( vkGetInstanceProcAddr( instance, "vkCmdCopyAccelerationStructureNV" ) );
-        vkCmdTraceRaysNV                  = PFN_vkCmdTraceRaysNV( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysNV" ) );
-        vkCreateRayTracingPipelinesNV     = PFN_vkCreateRayTracingPipelinesNV( vkGetInstanceProcAddr( instance, "vkCreateRayTracingPipelinesNV" ) );
-        vkGetRayTracingShaderGroupHandlesNV =
-          PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetInstanceProcAddr( instance, "vkGetRayTracingShaderGroupHandlesNV" ) );
-        if ( !vkGetRayTracingShaderGroupHandlesKHR )
-          vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
-        vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureHandleNV" ) );
-        vkCmdWriteAccelerationStructuresPropertiesNV =
-          PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetInstanceProcAddr( instance, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
-        vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetInstanceProcAddr( instance, "vkCompileDeferredNV" ) );
-
-        //=== VK_KHR_maintenance3 ===
-        vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSupportKHR" ) );
-        if ( !vkGetDescriptorSetLayoutSupport )
-          vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
-
-        //=== VK_KHR_draw_indirect_count ===
-        vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetInstanceProcAddr( instance, "vkCmdDrawIndirectCountKHR" ) );
-        if ( !vkCmdDrawIndirectCount )
-          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
-        vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetInstanceProcAddr( instance, "vkCmdDrawIndexedIndirectCountKHR" ) );
-        if ( !vkCmdDrawIndexedIndirectCount )
-          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
-
-        //=== VK_EXT_external_memory_host ===
-        vkGetMemoryHostPointerPropertiesEXT =
-          PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetMemoryHostPointerPropertiesEXT" ) );
-
-        //=== VK_AMD_buffer_marker ===
-        vkCmdWriteBufferMarkerAMD  = PFN_vkCmdWriteBufferMarkerAMD( vkGetInstanceProcAddr( instance, "vkCmdWriteBufferMarkerAMD" ) );
-        vkCmdWriteBufferMarker2AMD = PFN_vkCmdWriteBufferMarker2AMD( vkGetInstanceProcAddr( instance, "vkCmdWriteBufferMarker2AMD" ) );
-
-        //=== VK_EXT_calibrated_timestamps ===
-        vkGetPhysicalDeviceCalibrateableTimeDomainsEXT =
-          PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" ) );
-        if ( !vkGetPhysicalDeviceCalibrateableTimeDomainsKHR )
-          vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
-        vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetInstanceProcAddr( instance, "vkGetCalibratedTimestampsEXT" ) );
-        if ( !vkGetCalibratedTimestampsKHR )
-          vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
-
-        //=== VK_NV_mesh_shader ===
-        vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksNV" ) );
-        vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectNV" ) );
-        vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectCountNV" ) );
-
-        //=== VK_NV_scissor_exclusive ===
-        vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetExclusiveScissorEnableNV" ) );
-        vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetInstanceProcAddr( instance, "vkCmdSetExclusiveScissorNV" ) );
-
-        //=== VK_NV_device_diagnostic_checkpoints ===
-        vkCmdSetCheckpointNV        = PFN_vkCmdSetCheckpointNV( vkGetInstanceProcAddr( instance, "vkCmdSetCheckpointNV" ) );
-        vkGetQueueCheckpointDataNV  = PFN_vkGetQueueCheckpointDataNV( vkGetInstanceProcAddr( instance, "vkGetQueueCheckpointDataNV" ) );
-        vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetInstanceProcAddr( instance, "vkGetQueueCheckpointData2NV" ) );
-
-        //=== VK_KHR_timeline_semaphore ===
-        vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetInstanceProcAddr( instance, "vkGetSemaphoreCounterValueKHR" ) );
-        if ( !vkGetSemaphoreCounterValue )
-          vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
-        vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetInstanceProcAddr( instance, "vkWaitSemaphoresKHR" ) );
-        if ( !vkWaitSemaphores )
-          vkWaitSemaphores = vkWaitSemaphoresKHR;
-        vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetInstanceProcAddr( instance, "vkSignalSemaphoreKHR" ) );
-        if ( !vkSignalSemaphore )
-          vkSignalSemaphore = vkSignalSemaphoreKHR;
-
-        //=== VK_EXT_present_timing ===
-        vkSetSwapchainPresentTimingQueueSizeEXT =
-          PFN_vkSetSwapchainPresentTimingQueueSizeEXT( vkGetInstanceProcAddr( instance, "vkSetSwapchainPresentTimingQueueSizeEXT" ) );
-        vkGetSwapchainTimingPropertiesEXT = PFN_vkGetSwapchainTimingPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainTimingPropertiesEXT" ) );
-        vkGetSwapchainTimeDomainPropertiesEXT =
-          PFN_vkGetSwapchainTimeDomainPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainTimeDomainPropertiesEXT" ) );
-        vkGetPastPresentationTimingEXT = PFN_vkGetPastPresentationTimingEXT( vkGetInstanceProcAddr( instance, "vkGetPastPresentationTimingEXT" ) );
-
-        //=== VK_INTEL_performance_query ===
-        vkInitializePerformanceApiINTEL   = PFN_vkInitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkInitializePerformanceApiINTEL" ) );
-        vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkUninitializePerformanceApiINTEL" ) );
-        vkCmdSetPerformanceMarkerINTEL    = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceMarkerINTEL" ) );
-        vkCmdSetPerformanceStreamMarkerINTEL =
-          PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
-        vkCmdSetPerformanceOverrideINTEL = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetInstanceProcAddr( instance, "vkCmdSetPerformanceOverrideINTEL" ) );
-        vkAcquirePerformanceConfigurationINTEL =
-          PFN_vkAcquirePerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkAcquirePerformanceConfigurationINTEL" ) );
-        vkReleasePerformanceConfigurationINTEL =
-          PFN_vkReleasePerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkReleasePerformanceConfigurationINTEL" ) );
-        vkQueueSetPerformanceConfigurationINTEL =
-          PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetInstanceProcAddr( instance, "vkQueueSetPerformanceConfigurationINTEL" ) );
-        vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetInstanceProcAddr( instance, "vkGetPerformanceParameterINTEL" ) );
-
-        //=== VK_AMD_display_native_hdr ===
-        vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetInstanceProcAddr( instance, "vkSetLocalDimmingAMD" ) );
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_imagepipe_surface ===
-        vkCreateImagePipeSurfaceFUCHSIA = PFN_vkCreateImagePipeSurfaceFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateImagePipeSurfaceFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_metal_surface ===
-        vkCreateMetalSurfaceEXT = PFN_vkCreateMetalSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateMetalSurfaceEXT" ) );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-        //=== VK_KHR_fragment_shading_rate ===
-        vkGetPhysicalDeviceFragmentShadingRatesKHR =
-          PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFragmentShadingRatesKHR" ) );
-        vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetInstanceProcAddr( instance, "vkCmdSetFragmentShadingRateKHR" ) );
-
-        //=== VK_KHR_dynamic_rendering_local_read ===
-        vkCmdSetRenderingAttachmentLocationsKHR =
-          PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
-        if ( !vkCmdSetRenderingAttachmentLocations )
-          vkCmdSetRenderingAttachmentLocations = vkCmdSetRenderingAttachmentLocationsKHR;
-        vkCmdSetRenderingInputAttachmentIndicesKHR =
-          PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetInstanceProcAddr( instance, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
-        if ( !vkCmdSetRenderingInputAttachmentIndices )
-          vkCmdSetRenderingInputAttachmentIndices = vkCmdSetRenderingInputAttachmentIndicesKHR;
-
-        //=== VK_EXT_buffer_device_address ===
-        vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddressEXT" ) );
-        if ( !vkGetBufferDeviceAddress )
-          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
-
-        //=== VK_EXT_tooling_info ===
-        vkGetPhysicalDeviceToolPropertiesEXT =
-          PFN_vkGetPhysicalDeviceToolPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolPropertiesEXT" ) );
-        if ( !vkGetPhysicalDeviceToolProperties )
-          vkGetPhysicalDeviceToolProperties = vkGetPhysicalDeviceToolPropertiesEXT;
-
-        //=== VK_KHR_present_wait ===
-        vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetInstanceProcAddr( instance, "vkWaitForPresentKHR" ) );
-
-        //=== VK_NV_cooperative_matrix ===
-        vkGetPhysicalDeviceCooperativeMatrixPropertiesNV =
-          PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV" ) );
-
-        //=== VK_NV_coverage_reduction_mode ===
-        vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
-          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_EXT_full_screen_exclusive ===
-        vkGetPhysicalDeviceSurfacePresentModes2EXT =
-          PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT" ) );
-        vkAcquireFullScreenExclusiveModeEXT =
-          PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetInstanceProcAddr( instance, "vkAcquireFullScreenExclusiveModeEXT" ) );
-        vkReleaseFullScreenExclusiveModeEXT =
-          PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetInstanceProcAddr( instance, "vkReleaseFullScreenExclusiveModeEXT" ) );
-        vkGetDeviceGroupSurfacePresentModes2EXT =
-          PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_EXT_headless_surface ===
-        vkCreateHeadlessSurfaceEXT = PFN_vkCreateHeadlessSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateHeadlessSurfaceEXT" ) );
-
-        //=== VK_KHR_buffer_device_address ===
-        vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetInstanceProcAddr( instance, "vkGetBufferDeviceAddressKHR" ) );
-        if ( !vkGetBufferDeviceAddress )
-          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
-        vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureAddressKHR" ) );
-        if ( !vkGetBufferOpaqueCaptureAddress )
-          vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
-        vkGetDeviceMemoryOpaqueCaptureAddressKHR =
-          PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
-        if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
-          vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
-
-        //=== VK_EXT_line_rasterization ===
-        vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleEXT" ) );
-        if ( !vkCmdSetLineStipple )
-          vkCmdSetLineStipple = vkCmdSetLineStippleEXT;
-
-        //=== VK_EXT_host_query_reset ===
-        vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetInstanceProcAddr( instance, "vkResetQueryPoolEXT" ) );
-        if ( !vkResetQueryPool )
-          vkResetQueryPool = vkResetQueryPoolEXT;
-
-        //=== VK_EXT_extended_dynamic_state ===
-        vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetCullModeEXT" ) );
-        if ( !vkCmdSetCullMode )
-          vkCmdSetCullMode = vkCmdSetCullModeEXT;
-        vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetInstanceProcAddr( instance, "vkCmdSetFrontFaceEXT" ) );
-        if ( !vkCmdSetFrontFace )
-          vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
-        vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveTopologyEXT" ) );
-        if ( !vkCmdSetPrimitiveTopology )
-          vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
-        vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWithCountEXT" ) );
-        if ( !vkCmdSetViewportWithCount )
-          vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
-        vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetInstanceProcAddr( instance, "vkCmdSetScissorWithCountEXT" ) );
-        if ( !vkCmdSetScissorWithCount )
-          vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
-        vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetInstanceProcAddr( instance, "vkCmdBindVertexBuffers2EXT" ) );
-        if ( !vkCmdBindVertexBuffers2 )
-          vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
-        vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthTestEnableEXT" ) );
-        if ( !vkCmdSetDepthTestEnable )
-          vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
-        vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthWriteEnableEXT" ) );
-        if ( !vkCmdSetDepthWriteEnable )
-          vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
-        vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthCompareOpEXT" ) );
-        if ( !vkCmdSetDepthCompareOp )
-          vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
-        vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBoundsTestEnableEXT" ) );
-        if ( !vkCmdSetDepthBoundsTestEnable )
-          vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
-        vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetStencilTestEnableEXT" ) );
-        if ( !vkCmdSetStencilTestEnable )
-          vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
-        vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetStencilOpEXT" ) );
-        if ( !vkCmdSetStencilOp )
-          vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
-
-        //=== VK_KHR_deferred_host_operations ===
-        vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetInstanceProcAddr( instance, "vkCreateDeferredOperationKHR" ) );
-        vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetInstanceProcAddr( instance, "vkDestroyDeferredOperationKHR" ) );
-        vkGetDeferredOperationMaxConcurrencyKHR =
-          PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetInstanceProcAddr( instance, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
-        vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetInstanceProcAddr( instance, "vkGetDeferredOperationResultKHR" ) );
-        vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetInstanceProcAddr( instance, "vkDeferredOperationJoinKHR" ) );
-
-        //=== VK_KHR_pipeline_executable_properties ===
-        vkGetPipelineExecutablePropertiesKHR =
-          PFN_vkGetPipelineExecutablePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutablePropertiesKHR" ) );
-        vkGetPipelineExecutableStatisticsKHR =
-          PFN_vkGetPipelineExecutableStatisticsKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutableStatisticsKHR" ) );
-        vkGetPipelineExecutableInternalRepresentationsKHR =
-          PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
-
-        //=== VK_EXT_host_image_copy ===
-        vkCopyMemoryToImageEXT = PFN_vkCopyMemoryToImageEXT( vkGetInstanceProcAddr( instance, "vkCopyMemoryToImageEXT" ) );
-        if ( !vkCopyMemoryToImage )
-          vkCopyMemoryToImage = vkCopyMemoryToImageEXT;
-        vkCopyImageToMemoryEXT = PFN_vkCopyImageToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCopyImageToMemoryEXT" ) );
-        if ( !vkCopyImageToMemory )
-          vkCopyImageToMemory = vkCopyImageToMemoryEXT;
-        vkCopyImageToImageEXT = PFN_vkCopyImageToImageEXT( vkGetInstanceProcAddr( instance, "vkCopyImageToImageEXT" ) );
-        if ( !vkCopyImageToImage )
-          vkCopyImageToImage = vkCopyImageToImageEXT;
-        vkTransitionImageLayoutEXT = PFN_vkTransitionImageLayoutEXT( vkGetInstanceProcAddr( instance, "vkTransitionImageLayoutEXT" ) );
-        if ( !vkTransitionImageLayout )
-          vkTransitionImageLayout = vkTransitionImageLayoutEXT;
-        vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout2EXT" ) );
-        if ( !vkGetImageSubresourceLayout2 )
-          vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2EXT;
-
-        //=== VK_KHR_map_memory2 ===
-        vkMapMemory2KHR = PFN_vkMapMemory2KHR( vkGetInstanceProcAddr( instance, "vkMapMemory2KHR" ) );
-        if ( !vkMapMemory2 )
-          vkMapMemory2 = vkMapMemory2KHR;
-        vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetInstanceProcAddr( instance, "vkUnmapMemory2KHR" ) );
-        if ( !vkUnmapMemory2 )
-          vkUnmapMemory2 = vkUnmapMemory2KHR;
-
-        //=== VK_EXT_swapchain_maintenance1 ===
-        vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetInstanceProcAddr( instance, "vkReleaseSwapchainImagesEXT" ) );
-        if ( !vkReleaseSwapchainImagesKHR )
-          vkReleaseSwapchainImagesKHR = vkReleaseSwapchainImagesEXT;
-
-        //=== VK_NV_device_generated_commands ===
-        vkGetGeneratedCommandsMemoryRequirementsNV =
-          PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
-        vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetInstanceProcAddr( instance, "vkCmdPreprocessGeneratedCommandsNV" ) );
-        vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetInstanceProcAddr( instance, "vkCmdExecuteGeneratedCommandsNV" ) );
-        vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetInstanceProcAddr( instance, "vkCmdBindPipelineShaderGroupNV" ) );
-        vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetInstanceProcAddr( instance, "vkCreateIndirectCommandsLayoutNV" ) );
-        vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetInstanceProcAddr( instance, "vkDestroyIndirectCommandsLayoutNV" ) );
-
-        //=== VK_EXT_depth_bias_control ===
-        vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBias2EXT" ) );
-
-        //=== VK_EXT_acquire_drm_display ===
-        vkAcquireDrmDisplayEXT = PFN_vkAcquireDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireDrmDisplayEXT" ) );
-        vkGetDrmDisplayEXT     = PFN_vkGetDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetDrmDisplayEXT" ) );
-
-        //=== VK_EXT_private_data ===
-        vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetInstanceProcAddr( instance, "vkCreatePrivateDataSlotEXT" ) );
-        if ( !vkCreatePrivateDataSlot )
-          vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
-        vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetInstanceProcAddr( instance, "vkDestroyPrivateDataSlotEXT" ) );
-        if ( !vkDestroyPrivateDataSlot )
-          vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
-        vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetInstanceProcAddr( instance, "vkSetPrivateDataEXT" ) );
-        if ( !vkSetPrivateData )
-          vkSetPrivateData = vkSetPrivateDataEXT;
-        vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetInstanceProcAddr( instance, "vkGetPrivateDataEXT" ) );
-        if ( !vkGetPrivateData )
-          vkGetPrivateData = vkGetPrivateDataEXT;
-
-        //=== VK_KHR_video_encode_queue ===
-        vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
-          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR" ) );
-        vkGetEncodedVideoSessionParametersKHR =
-          PFN_vkGetEncodedVideoSessionParametersKHR( vkGetInstanceProcAddr( instance, "vkGetEncodedVideoSessionParametersKHR" ) );
-        vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetInstanceProcAddr( instance, "vkCmdEncodeVideoKHR" ) );
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        //=== VK_NV_cuda_kernel_launch ===
-        vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetInstanceProcAddr( instance, "vkCreateCudaModuleNV" ) );
-        vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetInstanceProcAddr( instance, "vkGetCudaModuleCacheNV" ) );
-        vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetInstanceProcAddr( instance, "vkCreateCudaFunctionNV" ) );
-        vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetInstanceProcAddr( instance, "vkDestroyCudaModuleNV" ) );
-        vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetInstanceProcAddr( instance, "vkDestroyCudaFunctionNV" ) );
-        vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetInstanceProcAddr( instance, "vkCmdCudaLaunchKernelNV" ) );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-        //=== VK_QCOM_tile_shading ===
-        vkCmdDispatchTileQCOM          = PFN_vkCmdDispatchTileQCOM( vkGetInstanceProcAddr( instance, "vkCmdDispatchTileQCOM" ) );
-        vkCmdBeginPerTileExecutionQCOM = PFN_vkCmdBeginPerTileExecutionQCOM( vkGetInstanceProcAddr( instance, "vkCmdBeginPerTileExecutionQCOM" ) );
-        vkCmdEndPerTileExecutionQCOM   = PFN_vkCmdEndPerTileExecutionQCOM( vkGetInstanceProcAddr( instance, "vkCmdEndPerTileExecutionQCOM" ) );
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_metal_objects ===
-        vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetInstanceProcAddr( instance, "vkExportMetalObjectsEXT" ) );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-        //=== VK_KHR_synchronization2 ===
-        vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetInstanceProcAddr( instance, "vkCmdSetEvent2KHR" ) );
-        if ( !vkCmdSetEvent2 )
-          vkCmdSetEvent2 = vkCmdSetEvent2KHR;
-        vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetInstanceProcAddr( instance, "vkCmdResetEvent2KHR" ) );
-        if ( !vkCmdResetEvent2 )
-          vkCmdResetEvent2 = vkCmdResetEvent2KHR;
-        vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetInstanceProcAddr( instance, "vkCmdWaitEvents2KHR" ) );
-        if ( !vkCmdWaitEvents2 )
-          vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
-        vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetInstanceProcAddr( instance, "vkCmdPipelineBarrier2KHR" ) );
-        if ( !vkCmdPipelineBarrier2 )
-          vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
-        vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetInstanceProcAddr( instance, "vkCmdWriteTimestamp2KHR" ) );
-        if ( !vkCmdWriteTimestamp2 )
-          vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
-        vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetInstanceProcAddr( instance, "vkQueueSubmit2KHR" ) );
-        if ( !vkQueueSubmit2 )
-          vkQueueSubmit2 = vkQueueSubmit2KHR;
-
-        //=== VK_EXT_descriptor_buffer ===
-        vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutSizeEXT" ) );
-        vkGetDescriptorSetLayoutBindingOffsetEXT =
-          PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
-        vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetInstanceProcAddr( instance, "vkGetDescriptorEXT" ) );
-        vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBuffersEXT" ) );
-        vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
-        vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
-          PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
-        vkGetBufferOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetImageOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetImageViewOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetSamplerOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetInstanceProcAddr( instance, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-          vkGetInstanceProcAddr( instance, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
-
-        //=== VK_NV_fragment_shading_rate_enums ===
-        vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetInstanceProcAddr( instance, "vkCmdSetFragmentShadingRateEnumNV" ) );
-
-        //=== VK_EXT_mesh_shader ===
-        vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksEXT" ) );
-        vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectEXT" ) );
-        vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
-
-        //=== VK_KHR_copy_commands2 ===
-        vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyBuffer2KHR" ) );
-        if ( !vkCmdCopyBuffer2 )
-          vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
-        vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyImage2KHR" ) );
-        if ( !vkCmdCopyImage2 )
-          vkCmdCopyImage2 = vkCmdCopyImage2KHR;
-        vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyBufferToImage2KHR" ) );
-        if ( !vkCmdCopyBufferToImage2 )
-          vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
-        vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdCopyImageToBuffer2KHR" ) );
-        if ( !vkCmdCopyImageToBuffer2 )
-          vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
-        vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdBlitImage2KHR" ) );
-        if ( !vkCmdBlitImage2 )
-          vkCmdBlitImage2 = vkCmdBlitImage2KHR;
-        vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetInstanceProcAddr( instance, "vkCmdResolveImage2KHR" ) );
-        if ( !vkCmdResolveImage2 )
-          vkCmdResolveImage2 = vkCmdResolveImage2KHR;
-
-        //=== VK_EXT_device_fault ===
-        vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetInstanceProcAddr( instance, "vkGetDeviceFaultInfoEXT" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_NV_acquire_winrt_display ===
-        vkAcquireWinrtDisplayNV = PFN_vkAcquireWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkAcquireWinrtDisplayNV" ) );
-        vkGetWinrtDisplayNV     = PFN_vkGetWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkGetWinrtDisplayNV" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-#if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-        //=== VK_EXT_directfb_surface ===
-        vkCreateDirectFBSurfaceEXT = PFN_vkCreateDirectFBSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateDirectFBSurfaceEXT" ) );
-        vkGetPhysicalDeviceDirectFBPresentationSupportEXT =
-          PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT" ) );
-#endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-
-        //=== VK_EXT_vertex_input_dynamic_state ===
-        vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetInstanceProcAddr( instance, "vkCmdSetVertexInputEXT" ) );
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_external_memory ===
-        vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetMemoryZirconHandleFUCHSIA" ) );
-        vkGetMemoryZirconHandlePropertiesFUCHSIA =
-          PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_external_semaphore ===
-        vkImportSemaphoreZirconHandleFUCHSIA =
-          PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
-        vkGetSemaphoreZirconHandleFUCHSIA = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_buffer_collection ===
-        vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateBufferCollectionFUCHSIA" ) );
-        vkSetBufferCollectionImageConstraintsFUCHSIA =
-          PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetInstanceProcAddr( instance, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
-        vkSetBufferCollectionBufferConstraintsFUCHSIA =
-          PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetInstanceProcAddr( instance, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
-        vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetInstanceProcAddr( instance, "vkDestroyBufferCollectionFUCHSIA" ) );
-        vkGetBufferCollectionPropertiesFUCHSIA =
-          PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetInstanceProcAddr( instance, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-        //=== VK_HUAWEI_subpass_shading ===
-        vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
-          PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetInstanceProcAddr( instance, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
-        vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdSubpassShadingHUAWEI" ) );
-
-        //=== VK_HUAWEI_invocation_mask ===
-        vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdBindInvocationMaskHUAWEI" ) );
-
-        //=== VK_NV_external_memory_rdma ===
-        vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetInstanceProcAddr( instance, "vkGetMemoryRemoteAddressNV" ) );
-
-        //=== VK_EXT_pipeline_properties ===
-        vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPipelinePropertiesEXT" ) );
-
-        //=== VK_EXT_extended_dynamic_state2 ===
-        vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPatchControlPointsEXT" ) );
-        vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizerDiscardEnableEXT" ) );
-        if ( !vkCmdSetRasterizerDiscardEnable )
-          vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
-        vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthBiasEnableEXT" ) );
-        if ( !vkCmdSetDepthBiasEnable )
-          vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
-        vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLogicOpEXT" ) );
-        vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPrimitiveRestartEnableEXT" ) );
-        if ( !vkCmdSetPrimitiveRestartEnable )
-          vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-        //=== VK_QNX_screen_surface ===
-        vkCreateScreenSurfaceQNX = PFN_vkCreateScreenSurfaceQNX( vkGetInstanceProcAddr( instance, "vkCreateScreenSurfaceQNX" ) );
-        vkGetPhysicalDeviceScreenPresentationSupportQNX =
-          PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceScreenPresentationSupportQNX" ) );
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-        //=== VK_EXT_color_write_enable ===
-        vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorWriteEnableEXT" ) );
-
-        //=== VK_KHR_ray_tracing_maintenance1 ===
-        vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetInstanceProcAddr( instance, "vkCmdTraceRaysIndirect2KHR" ) );
-
-        //=== VK_EXT_multi_draw ===
-        vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMultiEXT" ) );
-        vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetInstanceProcAddr( instance, "vkCmdDrawMultiIndexedEXT" ) );
-
-        //=== VK_EXT_opacity_micromap ===
-        vkCreateMicromapEXT              = PFN_vkCreateMicromapEXT( vkGetInstanceProcAddr( instance, "vkCreateMicromapEXT" ) );
-        vkDestroyMicromapEXT             = PFN_vkDestroyMicromapEXT( vkGetInstanceProcAddr( instance, "vkDestroyMicromapEXT" ) );
-        vkCmdBuildMicromapsEXT           = PFN_vkCmdBuildMicromapsEXT( vkGetInstanceProcAddr( instance, "vkCmdBuildMicromapsEXT" ) );
-        vkBuildMicromapsEXT              = PFN_vkBuildMicromapsEXT( vkGetInstanceProcAddr( instance, "vkBuildMicromapsEXT" ) );
-        vkCopyMicromapEXT                = PFN_vkCopyMicromapEXT( vkGetInstanceProcAddr( instance, "vkCopyMicromapEXT" ) );
-        vkCopyMicromapToMemoryEXT        = PFN_vkCopyMicromapToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCopyMicromapToMemoryEXT" ) );
-        vkCopyMemoryToMicromapEXT        = PFN_vkCopyMemoryToMicromapEXT( vkGetInstanceProcAddr( instance, "vkCopyMemoryToMicromapEXT" ) );
-        vkWriteMicromapsPropertiesEXT    = PFN_vkWriteMicromapsPropertiesEXT( vkGetInstanceProcAddr( instance, "vkWriteMicromapsPropertiesEXT" ) );
-        vkCmdCopyMicromapEXT             = PFN_vkCmdCopyMicromapEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMicromapEXT" ) );
-        vkCmdCopyMicromapToMemoryEXT     = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMicromapToMemoryEXT" ) );
-        vkCmdCopyMemoryToMicromapEXT     = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToMicromapEXT" ) );
-        vkCmdWriteMicromapsPropertiesEXT = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetInstanceProcAddr( instance, "vkCmdWriteMicromapsPropertiesEXT" ) );
-        vkGetDeviceMicromapCompatibilityEXT =
-          PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetInstanceProcAddr( instance, "vkGetDeviceMicromapCompatibilityEXT" ) );
-        vkGetMicromapBuildSizesEXT = PFN_vkGetMicromapBuildSizesEXT( vkGetInstanceProcAddr( instance, "vkGetMicromapBuildSizesEXT" ) );
-
-        //=== VK_HUAWEI_cluster_culling_shader ===
-        vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdDrawClusterHUAWEI" ) );
-        vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetInstanceProcAddr( instance, "vkCmdDrawClusterIndirectHUAWEI" ) );
-
-        //=== VK_EXT_pageable_device_local_memory ===
-        vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetInstanceProcAddr( instance, "vkSetDeviceMemoryPriorityEXT" ) );
-
-        //=== VK_KHR_maintenance4 ===
-        vkGetDeviceBufferMemoryRequirementsKHR =
-          PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceBufferMemoryRequirements )
-          vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
-        vkGetDeviceImageMemoryRequirementsKHR =
-          PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceImageMemoryRequirements )
-          vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
-        vkGetDeviceImageSparseMemoryRequirementsKHR =
-          PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceImageSparseMemoryRequirements )
-          vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
-
-        //=== VK_VALVE_descriptor_set_host_mapping ===
-        vkGetDescriptorSetLayoutHostMappingInfoVALVE =
-          PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
-        vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetInstanceProcAddr( instance, "vkGetDescriptorSetHostMappingVALVE" ) );
-
-        //=== VK_NV_copy_memory_indirect ===
-        vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryIndirectNV" ) );
-        vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToImageIndirectNV" ) );
-
-        //=== VK_NV_memory_decompression ===
-        vkCmdDecompressMemoryNV = PFN_vkCmdDecompressMemoryNV( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryNV" ) );
-        vkCmdDecompressMemoryIndirectCountNV =
-          PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryIndirectCountNV" ) );
-
-        //=== VK_NV_device_generated_commands_compute ===
-        vkGetPipelineIndirectMemoryRequirementsNV =
-          PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
-        vkCmdUpdatePipelineIndirectBufferNV =
-          PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetInstanceProcAddr( instance, "vkCmdUpdatePipelineIndirectBufferNV" ) );
-        vkGetPipelineIndirectDeviceAddressNV =
-          PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetInstanceProcAddr( instance, "vkGetPipelineIndirectDeviceAddressNV" ) );
-
-#if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_external_memory ===
-        vkGetNativeBufferPropertiesOHOS = PFN_vkGetNativeBufferPropertiesOHOS( vkGetInstanceProcAddr( instance, "vkGetNativeBufferPropertiesOHOS" ) );
-        vkGetMemoryNativeBufferOHOS     = PFN_vkGetMemoryNativeBufferOHOS( vkGetInstanceProcAddr( instance, "vkGetMemoryNativeBufferOHOS" ) );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-        //=== VK_EXT_extended_dynamic_state3 ===
-        vkCmdSetDepthClampEnableEXT      = PFN_vkCmdSetDepthClampEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClampEnableEXT" ) );
-        vkCmdSetPolygonModeEXT           = PFN_vkCmdSetPolygonModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetPolygonModeEXT" ) );
-        vkCmdSetRasterizationSamplesEXT  = PFN_vkCmdSetRasterizationSamplesEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizationSamplesEXT" ) );
-        vkCmdSetSampleMaskEXT            = PFN_vkCmdSetSampleMaskEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleMaskEXT" ) );
-        vkCmdSetAlphaToCoverageEnableEXT = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAlphaToCoverageEnableEXT" ) );
-        vkCmdSetAlphaToOneEnableEXT      = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAlphaToOneEnableEXT" ) );
-        vkCmdSetLogicOpEnableEXT         = PFN_vkCmdSetLogicOpEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLogicOpEnableEXT" ) );
-        vkCmdSetColorBlendEnableEXT      = PFN_vkCmdSetColorBlendEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendEnableEXT" ) );
-        vkCmdSetColorBlendEquationEXT    = PFN_vkCmdSetColorBlendEquationEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendEquationEXT" ) );
-        vkCmdSetColorWriteMaskEXT        = PFN_vkCmdSetColorWriteMaskEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorWriteMaskEXT" ) );
-        vkCmdSetTessellationDomainOriginEXT =
-          PFN_vkCmdSetTessellationDomainOriginEXT( vkGetInstanceProcAddr( instance, "vkCmdSetTessellationDomainOriginEXT" ) );
-        vkCmdSetRasterizationStreamEXT = PFN_vkCmdSetRasterizationStreamEXT( vkGetInstanceProcAddr( instance, "vkCmdSetRasterizationStreamEXT" ) );
-        vkCmdSetConservativeRasterizationModeEXT =
-          PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetConservativeRasterizationModeEXT" ) );
-        vkCmdSetExtraPrimitiveOverestimationSizeEXT =
-          PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
-        vkCmdSetDepthClipEnableEXT       = PFN_vkCmdSetDepthClipEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClipEnableEXT" ) );
-        vkCmdSetSampleLocationsEnableEXT = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetSampleLocationsEnableEXT" ) );
-        vkCmdSetColorBlendAdvancedEXT    = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetInstanceProcAddr( instance, "vkCmdSetColorBlendAdvancedEXT" ) );
-        vkCmdSetProvokingVertexModeEXT   = PFN_vkCmdSetProvokingVertexModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetProvokingVertexModeEXT" ) );
-        vkCmdSetLineRasterizationModeEXT = PFN_vkCmdSetLineRasterizationModeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineRasterizationModeEXT" ) );
-        vkCmdSetLineStippleEnableEXT     = PFN_vkCmdSetLineStippleEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleEnableEXT" ) );
-        vkCmdSetDepthClipNegativeOneToOneEXT =
-          PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
-        vkCmdSetViewportWScalingEnableNV  = PFN_vkCmdSetViewportWScalingEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportWScalingEnableNV" ) );
-        vkCmdSetViewportSwizzleNV         = PFN_vkCmdSetViewportSwizzleNV( vkGetInstanceProcAddr( instance, "vkCmdSetViewportSwizzleNV" ) );
-        vkCmdSetCoverageToColorEnableNV   = PFN_vkCmdSetCoverageToColorEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageToColorEnableNV" ) );
-        vkCmdSetCoverageToColorLocationNV = PFN_vkCmdSetCoverageToColorLocationNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageToColorLocationNV" ) );
-        vkCmdSetCoverageModulationModeNV  = PFN_vkCmdSetCoverageModulationModeNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationModeNV" ) );
-        vkCmdSetCoverageModulationTableEnableNV =
-          PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationTableEnableNV" ) );
-        vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageModulationTableNV" ) );
-        vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetShadingRateImageEnableNV" ) );
-        vkCmdSetRepresentativeFragmentTestEnableNV =
-          PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetInstanceProcAddr( instance, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
-        vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetInstanceProcAddr( instance, "vkCmdSetCoverageReductionModeNV" ) );
-
-        //=== VK_ARM_tensors ===
-        vkCreateTensorARM                = PFN_vkCreateTensorARM( vkGetInstanceProcAddr( instance, "vkCreateTensorARM" ) );
-        vkDestroyTensorARM               = PFN_vkDestroyTensorARM( vkGetInstanceProcAddr( instance, "vkDestroyTensorARM" ) );
-        vkCreateTensorViewARM            = PFN_vkCreateTensorViewARM( vkGetInstanceProcAddr( instance, "vkCreateTensorViewARM" ) );
-        vkDestroyTensorViewARM           = PFN_vkDestroyTensorViewARM( vkGetInstanceProcAddr( instance, "vkDestroyTensorViewARM" ) );
-        vkGetTensorMemoryRequirementsARM = PFN_vkGetTensorMemoryRequirementsARM( vkGetInstanceProcAddr( instance, "vkGetTensorMemoryRequirementsARM" ) );
-        vkBindTensorMemoryARM            = PFN_vkBindTensorMemoryARM( vkGetInstanceProcAddr( instance, "vkBindTensorMemoryARM" ) );
-        vkGetDeviceTensorMemoryRequirementsARM =
-          PFN_vkGetDeviceTensorMemoryRequirementsARM( vkGetInstanceProcAddr( instance, "vkGetDeviceTensorMemoryRequirementsARM" ) );
-        vkCmdCopyTensorARM = PFN_vkCmdCopyTensorARM( vkGetInstanceProcAddr( instance, "vkCmdCopyTensorARM" ) );
-        vkGetPhysicalDeviceExternalTensorPropertiesARM =
-          PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalTensorPropertiesARM" ) );
-        vkGetTensorOpaqueCaptureDescriptorDataARM =
-          PFN_vkGetTensorOpaqueCaptureDescriptorDataARM( vkGetInstanceProcAddr( instance, "vkGetTensorOpaqueCaptureDescriptorDataARM" ) );
-        vkGetTensorViewOpaqueCaptureDescriptorDataARM =
-          PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM( vkGetInstanceProcAddr( instance, "vkGetTensorViewOpaqueCaptureDescriptorDataARM" ) );
-
-        //=== VK_EXT_shader_module_identifier ===
-        vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetInstanceProcAddr( instance, "vkGetShaderModuleIdentifierEXT" ) );
-        vkGetShaderModuleCreateInfoIdentifierEXT =
-          PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetInstanceProcAddr( instance, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
-
-        //=== VK_NV_optical_flow ===
-        vkGetPhysicalDeviceOpticalFlowImageFormatsNV =
-          PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV" ) );
-        vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetInstanceProcAddr( instance, "vkCreateOpticalFlowSessionNV" ) );
-        vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetInstanceProcAddr( instance, "vkDestroyOpticalFlowSessionNV" ) );
-        vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetInstanceProcAddr( instance, "vkBindOpticalFlowSessionImageNV" ) );
-        vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetInstanceProcAddr( instance, "vkCmdOpticalFlowExecuteNV" ) );
-
-        //=== VK_KHR_maintenance5 ===
-        vkCmdBindIndexBuffer2KHR = PFN_vkCmdBindIndexBuffer2KHR( vkGetInstanceProcAddr( instance, "vkCmdBindIndexBuffer2KHR" ) );
-        if ( !vkCmdBindIndexBuffer2 )
-          vkCmdBindIndexBuffer2 = vkCmdBindIndexBuffer2KHR;
-        vkGetRenderingAreaGranularityKHR = PFN_vkGetRenderingAreaGranularityKHR( vkGetInstanceProcAddr( instance, "vkGetRenderingAreaGranularityKHR" ) );
-        if ( !vkGetRenderingAreaGranularity )
-          vkGetRenderingAreaGranularity = vkGetRenderingAreaGranularityKHR;
-        vkGetDeviceImageSubresourceLayoutKHR =
-          PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetInstanceProcAddr( instance, "vkGetDeviceImageSubresourceLayoutKHR" ) );
-        if ( !vkGetDeviceImageSubresourceLayout )
-          vkGetDeviceImageSubresourceLayout = vkGetDeviceImageSubresourceLayoutKHR;
-        vkGetImageSubresourceLayout2KHR = PFN_vkGetImageSubresourceLayout2KHR( vkGetInstanceProcAddr( instance, "vkGetImageSubresourceLayout2KHR" ) );
-        if ( !vkGetImageSubresourceLayout2 )
-          vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2KHR;
-
-        //=== VK_AMD_anti_lag ===
-        vkAntiLagUpdateAMD = PFN_vkAntiLagUpdateAMD( vkGetInstanceProcAddr( instance, "vkAntiLagUpdateAMD" ) );
-
-        //=== VK_KHR_present_wait2 ===
-        vkWaitForPresent2KHR = PFN_vkWaitForPresent2KHR( vkGetInstanceProcAddr( instance, "vkWaitForPresent2KHR" ) );
-
-        //=== VK_EXT_shader_object ===
-        vkCreateShadersEXT         = PFN_vkCreateShadersEXT( vkGetInstanceProcAddr( instance, "vkCreateShadersEXT" ) );
-        vkDestroyShaderEXT         = PFN_vkDestroyShaderEXT( vkGetInstanceProcAddr( instance, "vkDestroyShaderEXT" ) );
-        vkGetShaderBinaryDataEXT   = PFN_vkGetShaderBinaryDataEXT( vkGetInstanceProcAddr( instance, "vkGetShaderBinaryDataEXT" ) );
-        vkCmdBindShadersEXT        = PFN_vkCmdBindShadersEXT( vkGetInstanceProcAddr( instance, "vkCmdBindShadersEXT" ) );
-        vkCmdSetDepthClampRangeEXT = PFN_vkCmdSetDepthClampRangeEXT( vkGetInstanceProcAddr( instance, "vkCmdSetDepthClampRangeEXT" ) );
-
-        //=== VK_KHR_pipeline_binary ===
-        vkCreatePipelineBinariesKHR      = PFN_vkCreatePipelineBinariesKHR( vkGetInstanceProcAddr( instance, "vkCreatePipelineBinariesKHR" ) );
-        vkDestroyPipelineBinaryKHR       = PFN_vkDestroyPipelineBinaryKHR( vkGetInstanceProcAddr( instance, "vkDestroyPipelineBinaryKHR" ) );
-        vkGetPipelineKeyKHR              = PFN_vkGetPipelineKeyKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineKeyKHR" ) );
-        vkGetPipelineBinaryDataKHR       = PFN_vkGetPipelineBinaryDataKHR( vkGetInstanceProcAddr( instance, "vkGetPipelineBinaryDataKHR" ) );
-        vkReleaseCapturedPipelineDataKHR = PFN_vkReleaseCapturedPipelineDataKHR( vkGetInstanceProcAddr( instance, "vkReleaseCapturedPipelineDataKHR" ) );
-
-        //=== VK_QCOM_tile_properties ===
-        vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetInstanceProcAddr( instance, "vkGetFramebufferTilePropertiesQCOM" ) );
-        vkGetDynamicRenderingTilePropertiesQCOM =
-          PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetInstanceProcAddr( instance, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
-
-        //=== VK_KHR_swapchain_maintenance1 ===
-        vkReleaseSwapchainImagesKHR = PFN_vkReleaseSwapchainImagesKHR( vkGetInstanceProcAddr( instance, "vkReleaseSwapchainImagesKHR" ) );
-
-        //=== VK_NV_cooperative_vector ===
-        vkGetPhysicalDeviceCooperativeVectorPropertiesNV =
-          PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeVectorPropertiesNV" ) );
-        vkConvertCooperativeVectorMatrixNV = PFN_vkConvertCooperativeVectorMatrixNV( vkGetInstanceProcAddr( instance, "vkConvertCooperativeVectorMatrixNV" ) );
-        vkCmdConvertCooperativeVectorMatrixNV =
-          PFN_vkCmdConvertCooperativeVectorMatrixNV( vkGetInstanceProcAddr( instance, "vkCmdConvertCooperativeVectorMatrixNV" ) );
-
-        //=== VK_NV_low_latency2 ===
-        vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetInstanceProcAddr( instance, "vkSetLatencySleepModeNV" ) );
-        vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetInstanceProcAddr( instance, "vkLatencySleepNV" ) );
-        vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetInstanceProcAddr( instance, "vkSetLatencyMarkerNV" ) );
-        vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetInstanceProcAddr( instance, "vkGetLatencyTimingsNV" ) );
-        vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetInstanceProcAddr( instance, "vkQueueNotifyOutOfBandNV" ) );
-
-        //=== VK_KHR_cooperative_matrix ===
-        vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR =
-          PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR" ) );
-
-        //=== VK_ARM_data_graph ===
-        vkCreateDataGraphPipelinesARM = PFN_vkCreateDataGraphPipelinesARM( vkGetInstanceProcAddr( instance, "vkCreateDataGraphPipelinesARM" ) );
-        vkCreateDataGraphPipelineSessionARM =
-          PFN_vkCreateDataGraphPipelineSessionARM( vkGetInstanceProcAddr( instance, "vkCreateDataGraphPipelineSessionARM" ) );
-        vkGetDataGraphPipelineSessionBindPointRequirementsARM = PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-          vkGetInstanceProcAddr( instance, "vkGetDataGraphPipelineSessionBindPointRequirementsARM" ) );
-        vkGetDataGraphPipelineSessionMemoryRequirementsARM =
-          PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM( vkGetInstanceProcAddr( instance, "vkGetDataGraphPipelineSessionMemoryRequirementsARM" ) );
-        vkBindDataGraphPipelineSessionMemoryARM =
-          PFN_vkBindDataGraphPipelineSessionMemoryARM( vkGetInstanceProcAddr( instance, "vkBindDataGraphPipelineSessionMemoryARM" ) );
-        vkDestroyDataGraphPipelineSessionARM =
-          PFN_vkDestroyDataGraphPipelineSessionARM( vkGetInstanceProcAddr( instance, "vkDestroyDataGraphPipelineSessionARM" ) );
-        vkCmdDispatchDataGraphARM = PFN_vkCmdDispatchDataGraphARM( vkGetInstanceProcAddr( instance, "vkCmdDispatchDataGraphARM" ) );
-        vkGetDataGraphPipelineAvailablePropertiesARM =
-          PFN_vkGetDataGraphPipelineAvailablePropertiesARM( vkGetInstanceProcAddr( instance, "vkGetDataGraphPipelineAvailablePropertiesARM" ) );
-        vkGetDataGraphPipelinePropertiesARM =
-          PFN_vkGetDataGraphPipelinePropertiesARM( vkGetInstanceProcAddr( instance, "vkGetDataGraphPipelinePropertiesARM" ) );
-        vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM =
-          PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM" ) );
-        vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM" ) );
-
-        //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-        vkCmdSetAttachmentFeedbackLoopEnableEXT =
-          PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetInstanceProcAddr( instance, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-        //=== VK_QNX_external_memory_screen_buffer ===
-        vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetInstanceProcAddr( instance, "vkGetScreenBufferPropertiesQNX" ) );
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-        //=== VK_KHR_line_rasterization ===
-        vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetInstanceProcAddr( instance, "vkCmdSetLineStippleKHR" ) );
-        if ( !vkCmdSetLineStipple )
-          vkCmdSetLineStipple = vkCmdSetLineStippleKHR;
-
-        //=== VK_KHR_calibrated_timestamps ===
-        vkGetPhysicalDeviceCalibrateableTimeDomainsKHR =
-          PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR" ) );
-        vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetInstanceProcAddr( instance, "vkGetCalibratedTimestampsKHR" ) );
-
-        //=== VK_KHR_maintenance6 ===
-        vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorSets2KHR" ) );
-        if ( !vkCmdBindDescriptorSets2 )
-          vkCmdBindDescriptorSets2 = vkCmdBindDescriptorSets2KHR;
-        vkCmdPushConstants2KHR = PFN_vkCmdPushConstants2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushConstants2KHR" ) );
-        if ( !vkCmdPushConstants2 )
-          vkCmdPushConstants2 = vkCmdPushConstants2KHR;
-        vkCmdPushDescriptorSet2KHR = PFN_vkCmdPushDescriptorSet2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSet2KHR" ) );
-        if ( !vkCmdPushDescriptorSet2 )
-          vkCmdPushDescriptorSet2 = vkCmdPushDescriptorSet2KHR;
-        vkCmdPushDescriptorSetWithTemplate2KHR =
-          PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
-        if ( !vkCmdPushDescriptorSetWithTemplate2 )
-          vkCmdPushDescriptorSetWithTemplate2 = vkCmdPushDescriptorSetWithTemplate2KHR;
-        vkCmdSetDescriptorBufferOffsets2EXT =
-          PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetInstanceProcAddr( instance, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
-        vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
-          PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
-
-        //=== VK_QCOM_tile_memory_heap ===
-        vkCmdBindTileMemoryQCOM = PFN_vkCmdBindTileMemoryQCOM( vkGetInstanceProcAddr( instance, "vkCmdBindTileMemoryQCOM" ) );
-
-        //=== VK_KHR_copy_memory_indirect ===
-        vkCmdCopyMemoryIndirectKHR        = PFN_vkCmdCopyMemoryIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryIndirectKHR" ) );
-        vkCmdCopyMemoryToImageIndirectKHR = PFN_vkCmdCopyMemoryToImageIndirectKHR( vkGetInstanceProcAddr( instance, "vkCmdCopyMemoryToImageIndirectKHR" ) );
-
-        //=== VK_EXT_memory_decompression ===
-        vkCmdDecompressMemoryEXT = PFN_vkCmdDecompressMemoryEXT( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryEXT" ) );
-        vkCmdDecompressMemoryIndirectCountEXT =
-          PFN_vkCmdDecompressMemoryIndirectCountEXT( vkGetInstanceProcAddr( instance, "vkCmdDecompressMemoryIndirectCountEXT" ) );
-
-        //=== VK_NV_external_compute_queue ===
-        vkCreateExternalComputeQueueNV  = PFN_vkCreateExternalComputeQueueNV( vkGetInstanceProcAddr( instance, "vkCreateExternalComputeQueueNV" ) );
-        vkDestroyExternalComputeQueueNV = PFN_vkDestroyExternalComputeQueueNV( vkGetInstanceProcAddr( instance, "vkDestroyExternalComputeQueueNV" ) );
-        vkGetExternalComputeQueueDataNV = PFN_vkGetExternalComputeQueueDataNV( vkGetInstanceProcAddr( instance, "vkGetExternalComputeQueueDataNV" ) );
-
-        //=== VK_NV_cluster_acceleration_structure ===
-        vkGetClusterAccelerationStructureBuildSizesNV =
-          PFN_vkGetClusterAccelerationStructureBuildSizesNV( vkGetInstanceProcAddr( instance, "vkGetClusterAccelerationStructureBuildSizesNV" ) );
-        vkCmdBuildClusterAccelerationStructureIndirectNV =
-          PFN_vkCmdBuildClusterAccelerationStructureIndirectNV( vkGetInstanceProcAddr( instance, "vkCmdBuildClusterAccelerationStructureIndirectNV" ) );
-
-        //=== VK_NV_partitioned_acceleration_structure ===
-        vkGetPartitionedAccelerationStructuresBuildSizesNV =
-          PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV( vkGetInstanceProcAddr( instance, "vkGetPartitionedAccelerationStructuresBuildSizesNV" ) );
-        vkCmdBuildPartitionedAccelerationStructuresNV =
-          PFN_vkCmdBuildPartitionedAccelerationStructuresNV( vkGetInstanceProcAddr( instance, "vkCmdBuildPartitionedAccelerationStructuresNV" ) );
-
-        //=== VK_EXT_device_generated_commands ===
-        vkGetGeneratedCommandsMemoryRequirementsEXT =
-          PFN_vkGetGeneratedCommandsMemoryRequirementsEXT( vkGetInstanceProcAddr( instance, "vkGetGeneratedCommandsMemoryRequirementsEXT" ) );
-        vkCmdPreprocessGeneratedCommandsEXT =
-          PFN_vkCmdPreprocessGeneratedCommandsEXT( vkGetInstanceProcAddr( instance, "vkCmdPreprocessGeneratedCommandsEXT" ) );
-        vkCmdExecuteGeneratedCommandsEXT   = PFN_vkCmdExecuteGeneratedCommandsEXT( vkGetInstanceProcAddr( instance, "vkCmdExecuteGeneratedCommandsEXT" ) );
-        vkCreateIndirectCommandsLayoutEXT  = PFN_vkCreateIndirectCommandsLayoutEXT( vkGetInstanceProcAddr( instance, "vkCreateIndirectCommandsLayoutEXT" ) );
-        vkDestroyIndirectCommandsLayoutEXT = PFN_vkDestroyIndirectCommandsLayoutEXT( vkGetInstanceProcAddr( instance, "vkDestroyIndirectCommandsLayoutEXT" ) );
-        vkCreateIndirectExecutionSetEXT    = PFN_vkCreateIndirectExecutionSetEXT( vkGetInstanceProcAddr( instance, "vkCreateIndirectExecutionSetEXT" ) );
-        vkDestroyIndirectExecutionSetEXT   = PFN_vkDestroyIndirectExecutionSetEXT( vkGetInstanceProcAddr( instance, "vkDestroyIndirectExecutionSetEXT" ) );
-        vkUpdateIndirectExecutionSetPipelineEXT =
-          PFN_vkUpdateIndirectExecutionSetPipelineEXT( vkGetInstanceProcAddr( instance, "vkUpdateIndirectExecutionSetPipelineEXT" ) );
-        vkUpdateIndirectExecutionSetShaderEXT =
-          PFN_vkUpdateIndirectExecutionSetShaderEXT( vkGetInstanceProcAddr( instance, "vkUpdateIndirectExecutionSetShaderEXT" ) );
-
-#if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_surface ===
-        vkCreateSurfaceOHOS = PFN_vkCreateSurfaceOHOS( vkGetInstanceProcAddr( instance, "vkCreateSurfaceOHOS" ) );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_native_buffer ===
-        vkGetSwapchainGrallocUsageOHOS = PFN_vkGetSwapchainGrallocUsageOHOS( vkGetInstanceProcAddr( instance, "vkGetSwapchainGrallocUsageOHOS" ) );
-        vkAcquireImageOHOS             = PFN_vkAcquireImageOHOS( vkGetInstanceProcAddr( instance, "vkAcquireImageOHOS" ) );
-        vkQueueSignalReleaseImageOHOS  = PFN_vkQueueSignalReleaseImageOHOS( vkGetInstanceProcAddr( instance, "vkQueueSignalReleaseImageOHOS" ) );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-        //=== VK_NV_cooperative_matrix2 ===
-        vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV" ) );
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_external_memory_metal ===
-        vkGetMemoryMetalHandleEXT = PFN_vkGetMemoryMetalHandleEXT( vkGetInstanceProcAddr( instance, "vkGetMemoryMetalHandleEXT" ) );
-        vkGetMemoryMetalHandlePropertiesEXT =
-          PFN_vkGetMemoryMetalHandlePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetMemoryMetalHandlePropertiesEXT" ) );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-        //=== VK_ARM_performance_counters_by_region ===
-        vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-          vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM" ) );
-
-        //=== VK_EXT_fragment_density_map_offset ===
-        vkCmdEndRendering2EXT = PFN_vkCmdEndRendering2EXT( vkGetInstanceProcAddr( instance, "vkCmdEndRendering2EXT" ) );
-        if ( !vkCmdEndRendering2KHR )
-          vkCmdEndRendering2KHR = vkCmdEndRendering2EXT;
-
-        //=== VK_EXT_custom_resolve ===
-        vkCmdBeginCustomResolveEXT = PFN_vkCmdBeginCustomResolveEXT( vkGetInstanceProcAddr( instance, "vkCmdBeginCustomResolveEXT" ) );
-
-        //=== VK_KHR_maintenance10 ===
-        vkCmdEndRendering2KHR = PFN_vkCmdEndRendering2KHR( vkGetInstanceProcAddr( instance, "vkCmdEndRendering2KHR" ) );
-      }
-
-      void init( Device deviceCpp ) VULKAN_HPP_NOEXCEPT
-      {
-        VkDevice device = static_cast<VkDevice>( deviceCpp );
-
-        //=== VK_VERSION_1_0 ===
-        vkGetDeviceProcAddr                = PFN_vkGetDeviceProcAddr( vkGetDeviceProcAddr( device, "vkGetDeviceProcAddr" ) );
-        vkDestroyDevice                    = PFN_vkDestroyDevice( vkGetDeviceProcAddr( device, "vkDestroyDevice" ) );
-        vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetDeviceProcAddr( device, "vkGetDeviceQueue" ) );
-        vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetDeviceProcAddr( device, "vkQueueSubmit" ) );
-        vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetDeviceProcAddr( device, "vkQueueWaitIdle" ) );
-        vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetDeviceProcAddr( device, "vkDeviceWaitIdle" ) );
-        vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetDeviceProcAddr( device, "vkAllocateMemory" ) );
-        vkFreeMemory                       = PFN_vkFreeMemory( vkGetDeviceProcAddr( device, "vkFreeMemory" ) );
-        vkMapMemory                        = PFN_vkMapMemory( vkGetDeviceProcAddr( device, "vkMapMemory" ) );
-        vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetDeviceProcAddr( device, "vkUnmapMemory" ) );
-        vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkFlushMappedMemoryRanges" ) );
-        vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkInvalidateMappedMemoryRanges" ) );
-        vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryCommitment" ) );
-        vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetDeviceProcAddr( device, "vkBindBufferMemory" ) );
-        vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetDeviceProcAddr( device, "vkBindImageMemory" ) );
-        vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements" ) );
-        vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements" ) );
-        vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements" ) );
-        vkQueueBindSparse                  = PFN_vkQueueBindSparse( vkGetDeviceProcAddr( device, "vkQueueBindSparse" ) );
-        vkCreateFence                      = PFN_vkCreateFence( vkGetDeviceProcAddr( device, "vkCreateFence" ) );
-        vkDestroyFence                     = PFN_vkDestroyFence( vkGetDeviceProcAddr( device, "vkDestroyFence" ) );
-        vkResetFences                      = PFN_vkResetFences( vkGetDeviceProcAddr( device, "vkResetFences" ) );
-        vkGetFenceStatus                   = PFN_vkGetFenceStatus( vkGetDeviceProcAddr( device, "vkGetFenceStatus" ) );
-        vkWaitForFences                    = PFN_vkWaitForFences( vkGetDeviceProcAddr( device, "vkWaitForFences" ) );
-        vkCreateSemaphore                  = PFN_vkCreateSemaphore( vkGetDeviceProcAddr( device, "vkCreateSemaphore" ) );
-        vkDestroySemaphore                 = PFN_vkDestroySemaphore( vkGetDeviceProcAddr( device, "vkDestroySemaphore" ) );
-        vkCreateQueryPool                  = PFN_vkCreateQueryPool( vkGetDeviceProcAddr( device, "vkCreateQueryPool" ) );
-        vkDestroyQueryPool                 = PFN_vkDestroyQueryPool( vkGetDeviceProcAddr( device, "vkDestroyQueryPool" ) );
-        vkGetQueryPoolResults              = PFN_vkGetQueryPoolResults( vkGetDeviceProcAddr( device, "vkGetQueryPoolResults" ) );
-        vkCreateBuffer                     = PFN_vkCreateBuffer( vkGetDeviceProcAddr( device, "vkCreateBuffer" ) );
-        vkDestroyBuffer                    = PFN_vkDestroyBuffer( vkGetDeviceProcAddr( device, "vkDestroyBuffer" ) );
-        vkCreateImage                      = PFN_vkCreateImage( vkGetDeviceProcAddr( device, "vkCreateImage" ) );
-        vkDestroyImage                     = PFN_vkDestroyImage( vkGetDeviceProcAddr( device, "vkDestroyImage" ) );
-        vkGetImageSubresourceLayout        = PFN_vkGetImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout" ) );
-        vkCreateImageView                  = PFN_vkCreateImageView( vkGetDeviceProcAddr( device, "vkCreateImageView" ) );
-        vkDestroyImageView                 = PFN_vkDestroyImageView( vkGetDeviceProcAddr( device, "vkDestroyImageView" ) );
-        vkCreateCommandPool                = PFN_vkCreateCommandPool( vkGetDeviceProcAddr( device, "vkCreateCommandPool" ) );
-        vkDestroyCommandPool               = PFN_vkDestroyCommandPool( vkGetDeviceProcAddr( device, "vkDestroyCommandPool" ) );
-        vkResetCommandPool                 = PFN_vkResetCommandPool( vkGetDeviceProcAddr( device, "vkResetCommandPool" ) );
-        vkAllocateCommandBuffers           = PFN_vkAllocateCommandBuffers( vkGetDeviceProcAddr( device, "vkAllocateCommandBuffers" ) );
-        vkFreeCommandBuffers               = PFN_vkFreeCommandBuffers( vkGetDeviceProcAddr( device, "vkFreeCommandBuffers" ) );
-        vkBeginCommandBuffer               = PFN_vkBeginCommandBuffer( vkGetDeviceProcAddr( device, "vkBeginCommandBuffer" ) );
-        vkEndCommandBuffer                 = PFN_vkEndCommandBuffer( vkGetDeviceProcAddr( device, "vkEndCommandBuffer" ) );
-        vkResetCommandBuffer               = PFN_vkResetCommandBuffer( vkGetDeviceProcAddr( device, "vkResetCommandBuffer" ) );
-        vkCmdCopyBuffer                    = PFN_vkCmdCopyBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer" ) );
-        vkCmdCopyImage                     = PFN_vkCmdCopyImage( vkGetDeviceProcAddr( device, "vkCmdCopyImage" ) );
-        vkCmdCopyBufferToImage             = PFN_vkCmdCopyBufferToImage( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage" ) );
-        vkCmdCopyImageToBuffer             = PFN_vkCmdCopyImageToBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer" ) );
-        vkCmdUpdateBuffer                  = PFN_vkCmdUpdateBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdateBuffer" ) );
-        vkCmdFillBuffer                    = PFN_vkCmdFillBuffer( vkGetDeviceProcAddr( device, "vkCmdFillBuffer" ) );
-        vkCmdPipelineBarrier               = PFN_vkCmdPipelineBarrier( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier" ) );
-        vkCmdBeginQuery                    = PFN_vkCmdBeginQuery( vkGetDeviceProcAddr( device, "vkCmdBeginQuery" ) );
-        vkCmdEndQuery                      = PFN_vkCmdEndQuery( vkGetDeviceProcAddr( device, "vkCmdEndQuery" ) );
-        vkCmdResetQueryPool                = PFN_vkCmdResetQueryPool( vkGetDeviceProcAddr( device, "vkCmdResetQueryPool" ) );
-        vkCmdWriteTimestamp                = PFN_vkCmdWriteTimestamp( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp" ) );
-        vkCmdCopyQueryPoolResults          = PFN_vkCmdCopyQueryPoolResults( vkGetDeviceProcAddr( device, "vkCmdCopyQueryPoolResults" ) );
-        vkCmdExecuteCommands               = PFN_vkCmdExecuteCommands( vkGetDeviceProcAddr( device, "vkCmdExecuteCommands" ) );
-        vkCreateEvent                      = PFN_vkCreateEvent( vkGetDeviceProcAddr( device, "vkCreateEvent" ) );
-        vkDestroyEvent                     = PFN_vkDestroyEvent( vkGetDeviceProcAddr( device, "vkDestroyEvent" ) );
-        vkGetEventStatus                   = PFN_vkGetEventStatus( vkGetDeviceProcAddr( device, "vkGetEventStatus" ) );
-        vkSetEvent                         = PFN_vkSetEvent( vkGetDeviceProcAddr( device, "vkSetEvent" ) );
-        vkResetEvent                       = PFN_vkResetEvent( vkGetDeviceProcAddr( device, "vkResetEvent" ) );
-        vkCreateBufferView                 = PFN_vkCreateBufferView( vkGetDeviceProcAddr( device, "vkCreateBufferView" ) );
-        vkDestroyBufferView                = PFN_vkDestroyBufferView( vkGetDeviceProcAddr( device, "vkDestroyBufferView" ) );
-        vkCreateShaderModule               = PFN_vkCreateShaderModule( vkGetDeviceProcAddr( device, "vkCreateShaderModule" ) );
-        vkDestroyShaderModule              = PFN_vkDestroyShaderModule( vkGetDeviceProcAddr( device, "vkDestroyShaderModule" ) );
-        vkCreatePipelineCache              = PFN_vkCreatePipelineCache( vkGetDeviceProcAddr( device, "vkCreatePipelineCache" ) );
-        vkDestroyPipelineCache             = PFN_vkDestroyPipelineCache( vkGetDeviceProcAddr( device, "vkDestroyPipelineCache" ) );
-        vkGetPipelineCacheData             = PFN_vkGetPipelineCacheData( vkGetDeviceProcAddr( device, "vkGetPipelineCacheData" ) );
-        vkMergePipelineCaches              = PFN_vkMergePipelineCaches( vkGetDeviceProcAddr( device, "vkMergePipelineCaches" ) );
-        vkCreateComputePipelines           = PFN_vkCreateComputePipelines( vkGetDeviceProcAddr( device, "vkCreateComputePipelines" ) );
-        vkDestroyPipeline                  = PFN_vkDestroyPipeline( vkGetDeviceProcAddr( device, "vkDestroyPipeline" ) );
-        vkCreatePipelineLayout             = PFN_vkCreatePipelineLayout( vkGetDeviceProcAddr( device, "vkCreatePipelineLayout" ) );
-        vkDestroyPipelineLayout            = PFN_vkDestroyPipelineLayout( vkGetDeviceProcAddr( device, "vkDestroyPipelineLayout" ) );
-        vkCreateSampler                    = PFN_vkCreateSampler( vkGetDeviceProcAddr( device, "vkCreateSampler" ) );
-        vkDestroySampler                   = PFN_vkDestroySampler( vkGetDeviceProcAddr( device, "vkDestroySampler" ) );
-        vkCreateDescriptorSetLayout        = PFN_vkCreateDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkCreateDescriptorSetLayout" ) );
-        vkDestroyDescriptorSetLayout       = PFN_vkDestroyDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkDestroyDescriptorSetLayout" ) );
-        vkCreateDescriptorPool             = PFN_vkCreateDescriptorPool( vkGetDeviceProcAddr( device, "vkCreateDescriptorPool" ) );
-        vkDestroyDescriptorPool            = PFN_vkDestroyDescriptorPool( vkGetDeviceProcAddr( device, "vkDestroyDescriptorPool" ) );
-        vkResetDescriptorPool              = PFN_vkResetDescriptorPool( vkGetDeviceProcAddr( device, "vkResetDescriptorPool" ) );
-        vkAllocateDescriptorSets           = PFN_vkAllocateDescriptorSets( vkGetDeviceProcAddr( device, "vkAllocateDescriptorSets" ) );
-        vkFreeDescriptorSets               = PFN_vkFreeDescriptorSets( vkGetDeviceProcAddr( device, "vkFreeDescriptorSets" ) );
-        vkUpdateDescriptorSets             = PFN_vkUpdateDescriptorSets( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSets" ) );
-        vkCmdBindPipeline                  = PFN_vkCmdBindPipeline( vkGetDeviceProcAddr( device, "vkCmdBindPipeline" ) );
-        vkCmdBindDescriptorSets            = PFN_vkCmdBindDescriptorSets( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets" ) );
-        vkCmdClearColorImage               = PFN_vkCmdClearColorImage( vkGetDeviceProcAddr( device, "vkCmdClearColorImage" ) );
-        vkCmdDispatch                      = PFN_vkCmdDispatch( vkGetDeviceProcAddr( device, "vkCmdDispatch" ) );
-        vkCmdDispatchIndirect              = PFN_vkCmdDispatchIndirect( vkGetDeviceProcAddr( device, "vkCmdDispatchIndirect" ) );
-        vkCmdSetEvent                      = PFN_vkCmdSetEvent( vkGetDeviceProcAddr( device, "vkCmdSetEvent" ) );
-        vkCmdResetEvent                    = PFN_vkCmdResetEvent( vkGetDeviceProcAddr( device, "vkCmdResetEvent" ) );
-        vkCmdWaitEvents                    = PFN_vkCmdWaitEvents( vkGetDeviceProcAddr( device, "vkCmdWaitEvents" ) );
-        vkCmdPushConstants                 = PFN_vkCmdPushConstants( vkGetDeviceProcAddr( device, "vkCmdPushConstants" ) );
-        vkCreateGraphicsPipelines          = PFN_vkCreateGraphicsPipelines( vkGetDeviceProcAddr( device, "vkCreateGraphicsPipelines" ) );
-        vkCreateFramebuffer                = PFN_vkCreateFramebuffer( vkGetDeviceProcAddr( device, "vkCreateFramebuffer" ) );
-        vkDestroyFramebuffer               = PFN_vkDestroyFramebuffer( vkGetDeviceProcAddr( device, "vkDestroyFramebuffer" ) );
-        vkCreateRenderPass                 = PFN_vkCreateRenderPass( vkGetDeviceProcAddr( device, "vkCreateRenderPass" ) );
-        vkDestroyRenderPass                = PFN_vkDestroyRenderPass( vkGetDeviceProcAddr( device, "vkDestroyRenderPass" ) );
-        vkGetRenderAreaGranularity         = PFN_vkGetRenderAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderAreaGranularity" ) );
-        vkCmdSetViewport                   = PFN_vkCmdSetViewport( vkGetDeviceProcAddr( device, "vkCmdSetViewport" ) );
-        vkCmdSetScissor                    = PFN_vkCmdSetScissor( vkGetDeviceProcAddr( device, "vkCmdSetScissor" ) );
-        vkCmdSetLineWidth                  = PFN_vkCmdSetLineWidth( vkGetDeviceProcAddr( device, "vkCmdSetLineWidth" ) );
-        vkCmdSetDepthBias                  = PFN_vkCmdSetDepthBias( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias" ) );
-        vkCmdSetBlendConstants             = PFN_vkCmdSetBlendConstants( vkGetDeviceProcAddr( device, "vkCmdSetBlendConstants" ) );
-        vkCmdSetDepthBounds                = PFN_vkCmdSetDepthBounds( vkGetDeviceProcAddr( device, "vkCmdSetDepthBounds" ) );
-        vkCmdSetStencilCompareMask         = PFN_vkCmdSetStencilCompareMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilCompareMask" ) );
-        vkCmdSetStencilWriteMask           = PFN_vkCmdSetStencilWriteMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilWriteMask" ) );
-        vkCmdSetStencilReference           = PFN_vkCmdSetStencilReference( vkGetDeviceProcAddr( device, "vkCmdSetStencilReference" ) );
-        vkCmdBindIndexBuffer               = PFN_vkCmdBindIndexBuffer( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer" ) );
-        vkCmdBindVertexBuffers             = PFN_vkCmdBindVertexBuffers( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers" ) );
-        vkCmdDraw                          = PFN_vkCmdDraw( vkGetDeviceProcAddr( device, "vkCmdDraw" ) );
-        vkCmdDrawIndexed                   = PFN_vkCmdDrawIndexed( vkGetDeviceProcAddr( device, "vkCmdDrawIndexed" ) );
-        vkCmdDrawIndirect                  = PFN_vkCmdDrawIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndirect" ) );
-        vkCmdDrawIndexedIndirect           = PFN_vkCmdDrawIndexedIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirect" ) );
-        vkCmdBlitImage                     = PFN_vkCmdBlitImage( vkGetDeviceProcAddr( device, "vkCmdBlitImage" ) );
-        vkCmdClearDepthStencilImage        = PFN_vkCmdClearDepthStencilImage( vkGetDeviceProcAddr( device, "vkCmdClearDepthStencilImage" ) );
-        vkCmdClearAttachments              = PFN_vkCmdClearAttachments( vkGetDeviceProcAddr( device, "vkCmdClearAttachments" ) );
-        vkCmdResolveImage                  = PFN_vkCmdResolveImage( vkGetDeviceProcAddr( device, "vkCmdResolveImage" ) );
-        vkCmdBeginRenderPass               = PFN_vkCmdBeginRenderPass( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass" ) );
-        vkCmdNextSubpass                   = PFN_vkCmdNextSubpass( vkGetDeviceProcAddr( device, "vkCmdNextSubpass" ) );
-        vkCmdEndRenderPass                 = PFN_vkCmdEndRenderPass( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass" ) );
-
-        //=== VK_VERSION_1_1 ===
-        vkBindBufferMemory2                 = PFN_vkBindBufferMemory2( vkGetDeviceProcAddr( device, "vkBindBufferMemory2" ) );
-        vkBindImageMemory2                  = PFN_vkBindImageMemory2( vkGetDeviceProcAddr( device, "vkBindImageMemory2" ) );
-        vkGetDeviceGroupPeerMemoryFeatures  = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeatures" ) );
-        vkCmdSetDeviceMask                  = PFN_vkCmdSetDeviceMask( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMask" ) );
-        vkGetImageMemoryRequirements2       = PFN_vkGetImageMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2" ) );
-        vkGetBufferMemoryRequirements2      = PFN_vkGetBufferMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2" ) );
-        vkGetImageSparseMemoryRequirements2 = PFN_vkGetImageSparseMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2" ) );
-        vkTrimCommandPool                   = PFN_vkTrimCommandPool( vkGetDeviceProcAddr( device, "vkTrimCommandPool" ) );
-        vkGetDeviceQueue2                   = PFN_vkGetDeviceQueue2( vkGetDeviceProcAddr( device, "vkGetDeviceQueue2" ) );
-        vkCmdDispatchBase                   = PFN_vkCmdDispatchBase( vkGetDeviceProcAddr( device, "vkCmdDispatchBase" ) );
-        vkCreateDescriptorUpdateTemplate    = PFN_vkCreateDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplate" ) );
-        vkDestroyDescriptorUpdateTemplate   = PFN_vkDestroyDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplate" ) );
-        vkUpdateDescriptorSetWithTemplate   = PFN_vkUpdateDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplate" ) );
-        vkGetDescriptorSetLayoutSupport     = PFN_vkGetDescriptorSetLayoutSupport( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupport" ) );
-        vkCreateSamplerYcbcrConversion      = PFN_vkCreateSamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversion" ) );
-        vkDestroySamplerYcbcrConversion     = PFN_vkDestroySamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversion" ) );
-
-        //=== VK_VERSION_1_2 ===
-        vkResetQueryPool                = PFN_vkResetQueryPool( vkGetDeviceProcAddr( device, "vkResetQueryPool" ) );
-        vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValue" ) );
-        vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetDeviceProcAddr( device, "vkWaitSemaphores" ) );
-        vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetDeviceProcAddr( device, "vkSignalSemaphore" ) );
-        vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddress" ) );
-        vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddress" ) );
-        vkGetDeviceMemoryOpaqueCaptureAddress =
-          PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
-        vkCmdDrawIndirectCount        = PFN_vkCmdDrawIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCount" ) );
-        vkCmdDrawIndexedIndirectCount = PFN_vkCmdDrawIndexedIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCount" ) );
-        vkCreateRenderPass2           = PFN_vkCreateRenderPass2( vkGetDeviceProcAddr( device, "vkCreateRenderPass2" ) );
-        vkCmdBeginRenderPass2         = PFN_vkCmdBeginRenderPass2( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2" ) );
-        vkCmdNextSubpass2             = PFN_vkCmdNextSubpass2( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2" ) );
-        vkCmdEndRenderPass2           = PFN_vkCmdEndRenderPass2( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2" ) );
-
-        //=== VK_VERSION_1_3 ===
-        vkCreatePrivateDataSlot             = PFN_vkCreatePrivateDataSlot( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlot" ) );
-        vkDestroyPrivateDataSlot            = PFN_vkDestroyPrivateDataSlot( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlot" ) );
-        vkSetPrivateData                    = PFN_vkSetPrivateData( vkGetDeviceProcAddr( device, "vkSetPrivateData" ) );
-        vkGetPrivateData                    = PFN_vkGetPrivateData( vkGetDeviceProcAddr( device, "vkGetPrivateData" ) );
-        vkCmdPipelineBarrier2               = PFN_vkCmdPipelineBarrier2( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2" ) );
-        vkCmdWriteTimestamp2                = PFN_vkCmdWriteTimestamp2( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2" ) );
-        vkQueueSubmit2                      = PFN_vkQueueSubmit2( vkGetDeviceProcAddr( device, "vkQueueSubmit2" ) );
-        vkCmdCopyBuffer2                    = PFN_vkCmdCopyBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2" ) );
-        vkCmdCopyImage2                     = PFN_vkCmdCopyImage2( vkGetDeviceProcAddr( device, "vkCmdCopyImage2" ) );
-        vkCmdCopyBufferToImage2             = PFN_vkCmdCopyBufferToImage2( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2" ) );
-        vkCmdCopyImageToBuffer2             = PFN_vkCmdCopyImageToBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2" ) );
-        vkGetDeviceBufferMemoryRequirements = PFN_vkGetDeviceBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirements" ) );
-        vkGetDeviceImageMemoryRequirements  = PFN_vkGetDeviceImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirements" ) );
-        vkGetDeviceImageSparseMemoryRequirements =
-          PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirements" ) );
-        vkCmdSetEvent2                  = PFN_vkCmdSetEvent2( vkGetDeviceProcAddr( device, "vkCmdSetEvent2" ) );
-        vkCmdResetEvent2                = PFN_vkCmdResetEvent2( vkGetDeviceProcAddr( device, "vkCmdResetEvent2" ) );
-        vkCmdWaitEvents2                = PFN_vkCmdWaitEvents2( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2" ) );
-        vkCmdBlitImage2                 = PFN_vkCmdBlitImage2( vkGetDeviceProcAddr( device, "vkCmdBlitImage2" ) );
-        vkCmdResolveImage2              = PFN_vkCmdResolveImage2( vkGetDeviceProcAddr( device, "vkCmdResolveImage2" ) );
-        vkCmdBeginRendering             = PFN_vkCmdBeginRendering( vkGetDeviceProcAddr( device, "vkCmdBeginRendering" ) );
-        vkCmdEndRendering               = PFN_vkCmdEndRendering( vkGetDeviceProcAddr( device, "vkCmdEndRendering" ) );
-        vkCmdSetCullMode                = PFN_vkCmdSetCullMode( vkGetDeviceProcAddr( device, "vkCmdSetCullMode" ) );
-        vkCmdSetFrontFace               = PFN_vkCmdSetFrontFace( vkGetDeviceProcAddr( device, "vkCmdSetFrontFace" ) );
-        vkCmdSetPrimitiveTopology       = PFN_vkCmdSetPrimitiveTopology( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopology" ) );
-        vkCmdSetViewportWithCount       = PFN_vkCmdSetViewportWithCount( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCount" ) );
-        vkCmdSetScissorWithCount        = PFN_vkCmdSetScissorWithCount( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCount" ) );
-        vkCmdBindVertexBuffers2         = PFN_vkCmdBindVertexBuffers2( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2" ) );
-        vkCmdSetDepthTestEnable         = PFN_vkCmdSetDepthTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnable" ) );
-        vkCmdSetDepthWriteEnable        = PFN_vkCmdSetDepthWriteEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnable" ) );
-        vkCmdSetDepthCompareOp          = PFN_vkCmdSetDepthCompareOp( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOp" ) );
-        vkCmdSetDepthBoundsTestEnable   = PFN_vkCmdSetDepthBoundsTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnable" ) );
-        vkCmdSetStencilTestEnable       = PFN_vkCmdSetStencilTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnable" ) );
-        vkCmdSetStencilOp               = PFN_vkCmdSetStencilOp( vkGetDeviceProcAddr( device, "vkCmdSetStencilOp" ) );
-        vkCmdSetRasterizerDiscardEnable = PFN_vkCmdSetRasterizerDiscardEnable( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnable" ) );
-        vkCmdSetDepthBiasEnable         = PFN_vkCmdSetDepthBiasEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnable" ) );
-        vkCmdSetPrimitiveRestartEnable  = PFN_vkCmdSetPrimitiveRestartEnable( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnable" ) );
-
-        //=== VK_VERSION_1_4 ===
-        vkMapMemory2                        = PFN_vkMapMemory2( vkGetDeviceProcAddr( device, "vkMapMemory2" ) );
-        vkUnmapMemory2                      = PFN_vkUnmapMemory2( vkGetDeviceProcAddr( device, "vkUnmapMemory2" ) );
-        vkGetDeviceImageSubresourceLayout   = PFN_vkGetDeviceImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayout" ) );
-        vkGetImageSubresourceLayout2        = PFN_vkGetImageSubresourceLayout2( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2" ) );
-        vkCopyMemoryToImage                 = PFN_vkCopyMemoryToImage( vkGetDeviceProcAddr( device, "vkCopyMemoryToImage" ) );
-        vkCopyImageToMemory                 = PFN_vkCopyImageToMemory( vkGetDeviceProcAddr( device, "vkCopyImageToMemory" ) );
-        vkCopyImageToImage                  = PFN_vkCopyImageToImage( vkGetDeviceProcAddr( device, "vkCopyImageToImage" ) );
-        vkTransitionImageLayout             = PFN_vkTransitionImageLayout( vkGetDeviceProcAddr( device, "vkTransitionImageLayout" ) );
-        vkCmdPushDescriptorSet              = PFN_vkCmdPushDescriptorSet( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet" ) );
-        vkCmdPushDescriptorSetWithTemplate  = PFN_vkCmdPushDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate" ) );
-        vkCmdBindDescriptorSets2            = PFN_vkCmdBindDescriptorSets2( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2" ) );
-        vkCmdPushConstants2                 = PFN_vkCmdPushConstants2( vkGetDeviceProcAddr( device, "vkCmdPushConstants2" ) );
-        vkCmdPushDescriptorSet2             = PFN_vkCmdPushDescriptorSet2( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2" ) );
-        vkCmdPushDescriptorSetWithTemplate2 = PFN_vkCmdPushDescriptorSetWithTemplate2( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2" ) );
-        vkCmdSetLineStipple                 = PFN_vkCmdSetLineStipple( vkGetDeviceProcAddr( device, "vkCmdSetLineStipple" ) );
-        vkCmdBindIndexBuffer2               = PFN_vkCmdBindIndexBuffer2( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2" ) );
-        vkGetRenderingAreaGranularity       = PFN_vkGetRenderingAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularity" ) );
-        vkCmdSetRenderingAttachmentLocations =
-          PFN_vkCmdSetRenderingAttachmentLocations( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocations" ) );
-        vkCmdSetRenderingInputAttachmentIndices =
-          PFN_vkCmdSetRenderingInputAttachmentIndices( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndices" ) );
-
-        //=== VK_KHR_swapchain ===
-        vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetDeviceProcAddr( device, "vkCreateSwapchainKHR" ) );
-        vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetDeviceProcAddr( device, "vkDestroySwapchainKHR" ) );
-        vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainImagesKHR" ) );
-        vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetDeviceProcAddr( device, "vkAcquireNextImageKHR" ) );
-        vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetDeviceProcAddr( device, "vkQueuePresentKHR" ) );
-        vkGetDeviceGroupPresentCapabilitiesKHR =
-          PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
-        vkGetDeviceGroupSurfacePresentModesKHR =
-          PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
-        vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetDeviceProcAddr( device, "vkAcquireNextImage2KHR" ) );
-
-        //=== VK_KHR_display_swapchain ===
-        vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetDeviceProcAddr( device, "vkCreateSharedSwapchainsKHR" ) );
-
-        //=== VK_EXT_debug_marker ===
-        vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectTagEXT" ) );
-        vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectNameEXT" ) );
-        vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerBeginEXT" ) );
-        vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerEndEXT" ) );
-        vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerInsertEXT" ) );
-
-        //=== VK_KHR_video_queue ===
-        vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionKHR" ) );
-        vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionKHR" ) );
-        vkGetVideoSessionMemoryRequirementsKHR =
-          PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetVideoSessionMemoryRequirementsKHR" ) );
-        vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetDeviceProcAddr( device, "vkBindVideoSessionMemoryKHR" ) );
-        vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionParametersKHR" ) );
-        vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkUpdateVideoSessionParametersKHR" ) );
-        vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionParametersKHR" ) );
-        vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginVideoCodingKHR" ) );
-        vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdEndVideoCodingKHR" ) );
-        vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdControlVideoCodingKHR" ) );
-
-        //=== VK_KHR_video_decode_queue ===
-        vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdDecodeVideoKHR" ) );
-
-        //=== VK_EXT_transform_feedback ===
-        vkCmdBindTransformFeedbackBuffersEXT =
-          PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindTransformFeedbackBuffersEXT" ) );
-        vkCmdBeginTransformFeedbackEXT = PFN_vkCmdBeginTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdBeginTransformFeedbackEXT" ) );
-        vkCmdEndTransformFeedbackEXT   = PFN_vkCmdEndTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdEndTransformFeedbackEXT" ) );
-        vkCmdBeginQueryIndexedEXT      = PFN_vkCmdBeginQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdBeginQueryIndexedEXT" ) );
-        vkCmdEndQueryIndexedEXT        = PFN_vkCmdEndQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdEndQueryIndexedEXT" ) );
-        vkCmdDrawIndirectByteCountEXT  = PFN_vkCmdDrawIndirectByteCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectByteCountEXT" ) );
-
-        //=== VK_NVX_binary_import ===
-        vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetDeviceProcAddr( device, "vkCreateCuModuleNVX" ) );
-        vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetDeviceProcAddr( device, "vkCreateCuFunctionNVX" ) );
-        vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetDeviceProcAddr( device, "vkDestroyCuModuleNVX" ) );
-        vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetDeviceProcAddr( device, "vkDestroyCuFunctionNVX" ) );
-        vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetDeviceProcAddr( device, "vkCmdCuLaunchKernelNVX" ) );
-
-        //=== VK_NVX_image_view_handle ===
-        vkGetImageViewHandleNVX   = PFN_vkGetImageViewHandleNVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandleNVX" ) );
-        vkGetImageViewHandle64NVX = PFN_vkGetImageViewHandle64NVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandle64NVX" ) );
-        vkGetImageViewAddressNVX  = PFN_vkGetImageViewAddressNVX( vkGetDeviceProcAddr( device, "vkGetImageViewAddressNVX" ) );
-
-        //=== VK_AMD_draw_indirect_count ===
-        vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountAMD" ) );
-        if ( !vkCmdDrawIndirectCount )
-          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
-        vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountAMD" ) );
-        if ( !vkCmdDrawIndexedIndirectCount )
-          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
-
-        //=== VK_AMD_shader_info ===
-        vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetDeviceProcAddr( device, "vkGetShaderInfoAMD" ) );
-
-        //=== VK_KHR_dynamic_rendering ===
-        vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderingKHR" ) );
-        if ( !vkCmdBeginRendering )
-          vkCmdBeginRendering = vkCmdBeginRenderingKHR;
-        vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderingKHR" ) );
-        if ( !vkCmdEndRendering )
-          vkCmdEndRendering = vkCmdEndRenderingKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_NV_external_memory_win32 ===
-        vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleNV" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_device_group ===
-        vkGetDeviceGroupPeerMemoryFeaturesKHR =
-          PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
-        if ( !vkGetDeviceGroupPeerMemoryFeatures )
-          vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
-        vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMaskKHR" ) );
-        if ( !vkCmdSetDeviceMask )
-          vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
-        vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetDeviceProcAddr( device, "vkCmdDispatchBaseKHR" ) );
-        if ( !vkCmdDispatchBase )
-          vkCmdDispatchBase = vkCmdDispatchBaseKHR;
-
-        //=== VK_KHR_maintenance1 ===
-        vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetDeviceProcAddr( device, "vkTrimCommandPoolKHR" ) );
-        if ( !vkTrimCommandPool )
-          vkTrimCommandPool = vkTrimCommandPoolKHR;
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_memory_win32 ===
-        vkGetMemoryWin32HandleKHR           = PFN_vkGetMemoryWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleKHR" ) );
-        vkGetMemoryWin32HandlePropertiesKHR = PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandlePropertiesKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_memory_fd ===
-        vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdKHR" ) );
-        vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdPropertiesKHR" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_semaphore_win32 ===
-        vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreWin32HandleKHR" ) );
-        vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreWin32HandleKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_semaphore_fd ===
-        vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreFdKHR" ) );
-        vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreFdKHR" ) );
-
-        //=== VK_KHR_push_descriptor ===
-        vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetKHR" ) );
-        if ( !vkCmdPushDescriptorSet )
-          vkCmdPushDescriptorSet = vkCmdPushDescriptorSetKHR;
-        vkCmdPushDescriptorSetWithTemplateKHR =
-          PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
-        if ( !vkCmdPushDescriptorSetWithTemplate )
-          vkCmdPushDescriptorSetWithTemplate = vkCmdPushDescriptorSetWithTemplateKHR;
-
-        //=== VK_EXT_conditional_rendering ===
-        vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdBeginConditionalRenderingEXT" ) );
-        vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdEndConditionalRenderingEXT" ) );
-
-        //=== VK_KHR_descriptor_update_template ===
-        vkCreateDescriptorUpdateTemplateKHR = PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplateKHR" ) );
-        if ( !vkCreateDescriptorUpdateTemplate )
-          vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
-        vkDestroyDescriptorUpdateTemplateKHR =
-          PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplateKHR" ) );
-        if ( !vkDestroyDescriptorUpdateTemplate )
-          vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
-        vkUpdateDescriptorSetWithTemplateKHR =
-          PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplateKHR" ) );
-        if ( !vkUpdateDescriptorSetWithTemplate )
-          vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
-
-        //=== VK_NV_clip_space_w_scaling ===
-        vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingNV" ) );
-
-        //=== VK_EXT_display_control ===
-        vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetDeviceProcAddr( device, "vkDisplayPowerControlEXT" ) );
-        vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDeviceEventEXT" ) );
-        vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDisplayEventEXT" ) );
-        vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainCounterEXT" ) );
-
-        //=== VK_GOOGLE_display_timing ===
-        vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetDeviceProcAddr( device, "vkGetRefreshCycleDurationGOOGLE" ) );
-        vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingGOOGLE" ) );
-
-        //=== VK_EXT_discard_rectangles ===
-        vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEXT" ) );
-        vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEnableEXT" ) );
-        vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleModeEXT" ) );
-
-        //=== VK_EXT_hdr_metadata ===
-        vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetDeviceProcAddr( device, "vkSetHdrMetadataEXT" ) );
-
-        //=== VK_KHR_create_renderpass2 ===
-        vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCreateRenderPass2KHR" ) );
-        if ( !vkCreateRenderPass2 )
-          vkCreateRenderPass2 = vkCreateRenderPass2KHR;
-        vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2KHR" ) );
-        if ( !vkCmdBeginRenderPass2 )
-          vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
-        vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2KHR" ) );
-        if ( !vkCmdNextSubpass2 )
-          vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
-        vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2KHR" ) );
-        if ( !vkCmdEndRenderPass2 )
-          vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
-
-        //=== VK_KHR_shared_presentable_image ===
-        vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainStatusKHR" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_KHR_external_fence_win32 ===
-        vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportFenceWin32HandleKHR" ) );
-        vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetFenceWin32HandleKHR" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_external_fence_fd ===
-        vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetDeviceProcAddr( device, "vkImportFenceFdKHR" ) );
-        vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetDeviceProcAddr( device, "vkGetFenceFdKHR" ) );
-
-        //=== VK_KHR_performance_query ===
-        vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetDeviceProcAddr( device, "vkAcquireProfilingLockKHR" ) );
-        vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetDeviceProcAddr( device, "vkReleaseProfilingLockKHR" ) );
-
-        //=== VK_EXT_debug_utils ===
-        vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectNameEXT" ) );
-        vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectTagEXT" ) );
-        vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueBeginDebugUtilsLabelEXT" ) );
-        vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueEndDebugUtilsLabelEXT" ) );
-        vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueInsertDebugUtilsLabelEXT" ) );
-        vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdBeginDebugUtilsLabelEXT" ) );
-        vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdEndDebugUtilsLabelEXT" ) );
-        vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdInsertDebugUtilsLabelEXT" ) );
-
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-        //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-        vkGetAndroidHardwareBufferPropertiesANDROID =
-          PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetDeviceProcAddr( device, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
-        vkGetMemoryAndroidHardwareBufferANDROID =
-          PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetDeviceProcAddr( device, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        //=== VK_AMDX_shader_enqueue ===
-        vkCreateExecutionGraphPipelinesAMDX = PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetDeviceProcAddr( device, "vkCreateExecutionGraphPipelinesAMDX" ) );
-        vkGetExecutionGraphPipelineScratchSizeAMDX =
-          PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
-        vkGetExecutionGraphPipelineNodeIndexAMDX =
-          PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
-        vkCmdInitializeGraphScratchMemoryAMDX =
-          PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetDeviceProcAddr( device, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
-        vkCmdDispatchGraphAMDX              = PFN_vkCmdDispatchGraphAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphAMDX" ) );
-        vkCmdDispatchGraphIndirectAMDX      = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectAMDX" ) );
-        vkCmdDispatchGraphIndirectCountAMDX = PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectCountAMDX" ) );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-        //=== VK_EXT_sample_locations ===
-        vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEXT" ) );
-
-        //=== VK_KHR_get_memory_requirements2 ===
-        vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2KHR" ) );
-        if ( !vkGetImageMemoryRequirements2 )
-          vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
-        vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2KHR" ) );
-        if ( !vkGetBufferMemoryRequirements2 )
-          vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
-        vkGetImageSparseMemoryRequirements2KHR =
-          PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2KHR" ) );
-        if ( !vkGetImageSparseMemoryRequirements2 )
-          vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
-
-        //=== VK_KHR_acceleration_structure ===
-        vkCreateAccelerationStructureKHR    = PFN_vkCreateAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureKHR" ) );
-        vkDestroyAccelerationStructureKHR   = PFN_vkDestroyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureKHR" ) );
-        vkCmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresKHR" ) );
-        vkCmdBuildAccelerationStructuresIndirectKHR =
-          PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
-        vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkBuildAccelerationStructuresKHR" ) );
-        vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureKHR" ) );
-        vkCopyAccelerationStructureToMemoryKHR =
-          PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureToMemoryKHR" ) );
-        vkCopyMemoryToAccelerationStructureKHR =
-          PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyMemoryToAccelerationStructureKHR" ) );
-        vkWriteAccelerationStructuresPropertiesKHR =
-          PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkWriteAccelerationStructuresPropertiesKHR" ) );
-        vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureKHR" ) );
-        vkCmdCopyAccelerationStructureToMemoryKHR =
-          PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
-        vkCmdCopyMemoryToAccelerationStructureKHR =
-          PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
-        vkGetAccelerationStructureDeviceAddressKHR =
-          PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureDeviceAddressKHR" ) );
-        vkCmdWriteAccelerationStructuresPropertiesKHR =
-          PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
-        vkGetDeviceAccelerationStructureCompatibilityKHR =
-          PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetDeviceProcAddr( device, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
-        vkGetAccelerationStructureBuildSizesKHR =
-          PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureBuildSizesKHR" ) );
-
-        //=== VK_KHR_ray_tracing_pipeline ===
-        vkCmdTraceRaysKHR              = PFN_vkCmdTraceRaysKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysKHR" ) );
-        vkCreateRayTracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesKHR" ) );
-        vkGetRayTracingShaderGroupHandlesKHR =
-          PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesKHR" ) );
-        vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
-          PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
-        vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirectKHR" ) );
-        vkGetRayTracingShaderGroupStackSizeKHR =
-          PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
-        vkCmdSetRayTracingPipelineStackSizeKHR =
-          PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetDeviceProcAddr( device, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
-
-        //=== VK_KHR_sampler_ycbcr_conversion ===
-        vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversionKHR" ) );
-        if ( !vkCreateSamplerYcbcrConversion )
-          vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
-        vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversionKHR" ) );
-        if ( !vkDestroySamplerYcbcrConversion )
-          vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
-
-        //=== VK_KHR_bind_memory2 ===
-        vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetDeviceProcAddr( device, "vkBindBufferMemory2KHR" ) );
-        if ( !vkBindBufferMemory2 )
-          vkBindBufferMemory2 = vkBindBufferMemory2KHR;
-        vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetDeviceProcAddr( device, "vkBindImageMemory2KHR" ) );
-        if ( !vkBindImageMemory2 )
-          vkBindImageMemory2 = vkBindImageMemory2KHR;
-
-        //=== VK_EXT_image_drm_format_modifier ===
-        vkGetImageDrmFormatModifierPropertiesEXT =
-          PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
-
-        //=== VK_EXT_validation_cache ===
-        vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetDeviceProcAddr( device, "vkCreateValidationCacheEXT" ) );
-        vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetDeviceProcAddr( device, "vkDestroyValidationCacheEXT" ) );
-        vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetDeviceProcAddr( device, "vkMergeValidationCachesEXT" ) );
-        vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetDeviceProcAddr( device, "vkGetValidationCacheDataEXT" ) );
-
-        //=== VK_NV_shading_rate_image ===
-        vkCmdBindShadingRateImageNV = PFN_vkCmdBindShadingRateImageNV( vkGetDeviceProcAddr( device, "vkCmdBindShadingRateImageNV" ) );
-        vkCmdSetViewportShadingRatePaletteNV =
-          PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportShadingRatePaletteNV" ) );
-        vkCmdSetCoarseSampleOrderNV = PFN_vkCmdSetCoarseSampleOrderNV( vkGetDeviceProcAddr( device, "vkCmdSetCoarseSampleOrderNV" ) );
-
-        //=== VK_NV_ray_tracing ===
-        vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureNV" ) );
-        vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureNV" ) );
-        vkGetAccelerationStructureMemoryRequirementsNV =
-          PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
-        vkBindAccelerationStructureMemoryNV = PFN_vkBindAccelerationStructureMemoryNV( vkGetDeviceProcAddr( device, "vkBindAccelerationStructureMemoryNV" ) );
-        vkCmdBuildAccelerationStructureNV   = PFN_vkCmdBuildAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructureNV" ) );
-        vkCmdCopyAccelerationStructureNV    = PFN_vkCmdCopyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureNV" ) );
-        vkCmdTraceRaysNV                    = PFN_vkCmdTraceRaysNV( vkGetDeviceProcAddr( device, "vkCmdTraceRaysNV" ) );
-        vkCreateRayTracingPipelinesNV       = PFN_vkCreateRayTracingPipelinesNV( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesNV" ) );
-        vkGetRayTracingShaderGroupHandlesNV = PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesNV" ) );
-        if ( !vkGetRayTracingShaderGroupHandlesKHR )
-          vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
-        vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureHandleNV" ) );
-        vkCmdWriteAccelerationStructuresPropertiesNV =
-          PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
-        vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetDeviceProcAddr( device, "vkCompileDeferredNV" ) );
-
-        //=== VK_KHR_maintenance3 ===
-        vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupportKHR" ) );
-        if ( !vkGetDescriptorSetLayoutSupport )
-          vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
-
-        //=== VK_KHR_draw_indirect_count ===
-        vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountKHR" ) );
-        if ( !vkCmdDrawIndirectCount )
-          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
-        vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountKHR" ) );
-        if ( !vkCmdDrawIndexedIndirectCount )
-          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
-
-        //=== VK_EXT_external_memory_host ===
-        vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryHostPointerPropertiesEXT" ) );
-
-        //=== VK_AMD_buffer_marker ===
-        vkCmdWriteBufferMarkerAMD  = PFN_vkCmdWriteBufferMarkerAMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarkerAMD" ) );
-        vkCmdWriteBufferMarker2AMD = PFN_vkCmdWriteBufferMarker2AMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarker2AMD" ) );
-
-        //=== VK_EXT_calibrated_timestamps ===
-        vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsEXT" ) );
-        if ( !vkGetCalibratedTimestampsKHR )
-          vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
-
-        //=== VK_NV_mesh_shader ===
-        vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksNV" ) );
-        vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectNV" ) );
-        vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountNV" ) );
-
-        //=== VK_NV_scissor_exclusive ===
-        vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorEnableNV" ) );
-        vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorNV" ) );
-
-        //=== VK_NV_device_diagnostic_checkpoints ===
-        vkCmdSetCheckpointNV        = PFN_vkCmdSetCheckpointNV( vkGetDeviceProcAddr( device, "vkCmdSetCheckpointNV" ) );
-        vkGetQueueCheckpointDataNV  = PFN_vkGetQueueCheckpointDataNV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointDataNV" ) );
-        vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointData2NV" ) );
-
-        //=== VK_KHR_timeline_semaphore ===
-        vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValueKHR" ) );
-        if ( !vkGetSemaphoreCounterValue )
-          vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
-        vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetDeviceProcAddr( device, "vkWaitSemaphoresKHR" ) );
-        if ( !vkWaitSemaphores )
-          vkWaitSemaphores = vkWaitSemaphoresKHR;
-        vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetDeviceProcAddr( device, "vkSignalSemaphoreKHR" ) );
-        if ( !vkSignalSemaphore )
-          vkSignalSemaphore = vkSignalSemaphoreKHR;
-
-        //=== VK_EXT_present_timing ===
-        vkSetSwapchainPresentTimingQueueSizeEXT =
-          PFN_vkSetSwapchainPresentTimingQueueSizeEXT( vkGetDeviceProcAddr( device, "vkSetSwapchainPresentTimingQueueSizeEXT" ) );
-        vkGetSwapchainTimingPropertiesEXT = PFN_vkGetSwapchainTimingPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimingPropertiesEXT" ) );
-        vkGetSwapchainTimeDomainPropertiesEXT =
-          PFN_vkGetSwapchainTimeDomainPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimeDomainPropertiesEXT" ) );
-        vkGetPastPresentationTimingEXT = PFN_vkGetPastPresentationTimingEXT( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingEXT" ) );
-
-        //=== VK_INTEL_performance_query ===
-        vkInitializePerformanceApiINTEL   = PFN_vkInitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkInitializePerformanceApiINTEL" ) );
-        vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkUninitializePerformanceApiINTEL" ) );
-        vkCmdSetPerformanceMarkerINTEL    = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceMarkerINTEL" ) );
-        vkCmdSetPerformanceStreamMarkerINTEL =
-          PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
-        vkCmdSetPerformanceOverrideINTEL = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceOverrideINTEL" ) );
-        vkAcquirePerformanceConfigurationINTEL =
-          PFN_vkAcquirePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkAcquirePerformanceConfigurationINTEL" ) );
-        vkReleasePerformanceConfigurationINTEL =
-          PFN_vkReleasePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkReleasePerformanceConfigurationINTEL" ) );
-        vkQueueSetPerformanceConfigurationINTEL =
-          PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkQueueSetPerformanceConfigurationINTEL" ) );
-        vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetDeviceProcAddr( device, "vkGetPerformanceParameterINTEL" ) );
-
-        //=== VK_AMD_display_native_hdr ===
-        vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetDeviceProcAddr( device, "vkSetLocalDimmingAMD" ) );
-
-        //=== VK_KHR_fragment_shading_rate ===
-        vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateKHR" ) );
-
-        //=== VK_KHR_dynamic_rendering_local_read ===
-        vkCmdSetRenderingAttachmentLocationsKHR =
-          PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
-        if ( !vkCmdSetRenderingAttachmentLocations )
-          vkCmdSetRenderingAttachmentLocations = vkCmdSetRenderingAttachmentLocationsKHR;
-        vkCmdSetRenderingInputAttachmentIndicesKHR =
-          PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
-        if ( !vkCmdSetRenderingInputAttachmentIndices )
-          vkCmdSetRenderingInputAttachmentIndices = vkCmdSetRenderingInputAttachmentIndicesKHR;
-
-        //=== VK_EXT_buffer_device_address ===
-        vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressEXT" ) );
-        if ( !vkGetBufferDeviceAddress )
-          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
-
-        //=== VK_KHR_present_wait ===
-        vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetDeviceProcAddr( device, "vkWaitForPresentKHR" ) );
-
-#if defined( VK_USE_PLATFORM_WIN32_KHR )
-        //=== VK_EXT_full_screen_exclusive ===
-        vkAcquireFullScreenExclusiveModeEXT = PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkAcquireFullScreenExclusiveModeEXT" ) );
-        vkReleaseFullScreenExclusiveModeEXT = PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkReleaseFullScreenExclusiveModeEXT" ) );
-        vkGetDeviceGroupSurfacePresentModes2EXT =
-          PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
-#endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-        //=== VK_KHR_buffer_device_address ===
-        vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressKHR" ) );
-        if ( !vkGetBufferDeviceAddress )
-          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
-        vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddressKHR" ) );
-        if ( !vkGetBufferOpaqueCaptureAddress )
-          vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
-        vkGetDeviceMemoryOpaqueCaptureAddressKHR =
-          PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
-        if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
-          vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
-
-        //=== VK_EXT_line_rasterization ===
-        vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEXT" ) );
-        if ( !vkCmdSetLineStipple )
-          vkCmdSetLineStipple = vkCmdSetLineStippleEXT;
-
-        //=== VK_EXT_host_query_reset ===
-        vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetDeviceProcAddr( device, "vkResetQueryPoolEXT" ) );
-        if ( !vkResetQueryPool )
-          vkResetQueryPool = vkResetQueryPoolEXT;
-
-        //=== VK_EXT_extended_dynamic_state ===
-        vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetCullModeEXT" ) );
-        if ( !vkCmdSetCullMode )
-          vkCmdSetCullMode = vkCmdSetCullModeEXT;
-        vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetDeviceProcAddr( device, "vkCmdSetFrontFaceEXT" ) );
-        if ( !vkCmdSetFrontFace )
-          vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
-        vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopologyEXT" ) );
-        if ( !vkCmdSetPrimitiveTopology )
-          vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
-        vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCountEXT" ) );
-        if ( !vkCmdSetViewportWithCount )
-          vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
-        vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCountEXT" ) );
-        if ( !vkCmdSetScissorWithCount )
-          vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
-        vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2EXT" ) );
-        if ( !vkCmdBindVertexBuffers2 )
-          vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
-        vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnableEXT" ) );
-        if ( !vkCmdSetDepthTestEnable )
-          vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
-        vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnableEXT" ) );
-        if ( !vkCmdSetDepthWriteEnable )
-          vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
-        vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOpEXT" ) );
-        if ( !vkCmdSetDepthCompareOp )
-          vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
-        vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnableEXT" ) );
-        if ( !vkCmdSetDepthBoundsTestEnable )
-          vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
-        vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnableEXT" ) );
-        if ( !vkCmdSetStencilTestEnable )
-          vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
-        vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilOpEXT" ) );
-        if ( !vkCmdSetStencilOp )
-          vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
-
-        //=== VK_KHR_deferred_host_operations ===
-        vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkCreateDeferredOperationKHR" ) );
-        vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkDestroyDeferredOperationKHR" ) );
-        vkGetDeferredOperationMaxConcurrencyKHR =
-          PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
-        vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationResultKHR" ) );
-        vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetDeviceProcAddr( device, "vkDeferredOperationJoinKHR" ) );
-
-        //=== VK_KHR_pipeline_executable_properties ===
-        vkGetPipelineExecutablePropertiesKHR =
-          PFN_vkGetPipelineExecutablePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutablePropertiesKHR" ) );
-        vkGetPipelineExecutableStatisticsKHR =
-          PFN_vkGetPipelineExecutableStatisticsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableStatisticsKHR" ) );
-        vkGetPipelineExecutableInternalRepresentationsKHR =
-          PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
-
-        //=== VK_EXT_host_image_copy ===
-        vkCopyMemoryToImageEXT = PFN_vkCopyMemoryToImageEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToImageEXT" ) );
-        if ( !vkCopyMemoryToImage )
-          vkCopyMemoryToImage = vkCopyMemoryToImageEXT;
-        vkCopyImageToMemoryEXT = PFN_vkCopyImageToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyImageToMemoryEXT" ) );
-        if ( !vkCopyImageToMemory )
-          vkCopyImageToMemory = vkCopyImageToMemoryEXT;
-        vkCopyImageToImageEXT = PFN_vkCopyImageToImageEXT( vkGetDeviceProcAddr( device, "vkCopyImageToImageEXT" ) );
-        if ( !vkCopyImageToImage )
-          vkCopyImageToImage = vkCopyImageToImageEXT;
-        vkTransitionImageLayoutEXT = PFN_vkTransitionImageLayoutEXT( vkGetDeviceProcAddr( device, "vkTransitionImageLayoutEXT" ) );
-        if ( !vkTransitionImageLayout )
-          vkTransitionImageLayout = vkTransitionImageLayoutEXT;
-        vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2EXT" ) );
-        if ( !vkGetImageSubresourceLayout2 )
-          vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2EXT;
-
-        //=== VK_KHR_map_memory2 ===
-        vkMapMemory2KHR = PFN_vkMapMemory2KHR( vkGetDeviceProcAddr( device, "vkMapMemory2KHR" ) );
-        if ( !vkMapMemory2 )
-          vkMapMemory2 = vkMapMemory2KHR;
-        vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetDeviceProcAddr( device, "vkUnmapMemory2KHR" ) );
-        if ( !vkUnmapMemory2 )
-          vkUnmapMemory2 = vkUnmapMemory2KHR;
-
-        //=== VK_EXT_swapchain_maintenance1 ===
-        vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesEXT" ) );
-        if ( !vkReleaseSwapchainImagesKHR )
-          vkReleaseSwapchainImagesKHR = vkReleaseSwapchainImagesEXT;
-
-        //=== VK_NV_device_generated_commands ===
-        vkGetGeneratedCommandsMemoryRequirementsNV =
-          PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
-        vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsNV" ) );
-        vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsNV" ) );
-        vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetDeviceProcAddr( device, "vkCmdBindPipelineShaderGroupNV" ) );
-        vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutNV" ) );
-        vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutNV" ) );
-
-        //=== VK_EXT_depth_bias_control ===
-        vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias2EXT" ) );
-
-        //=== VK_EXT_private_data ===
-        vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlotEXT" ) );
-        if ( !vkCreatePrivateDataSlot )
-          vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
-        vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlotEXT" ) );
-        if ( !vkDestroyPrivateDataSlot )
-          vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
-        vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkSetPrivateDataEXT" ) );
-        if ( !vkSetPrivateData )
-          vkSetPrivateData = vkSetPrivateDataEXT;
-        vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkGetPrivateDataEXT" ) );
-        if ( !vkGetPrivateData )
-          vkGetPrivateData = vkGetPrivateDataEXT;
-
-        //=== VK_KHR_video_encode_queue ===
-        vkGetEncodedVideoSessionParametersKHR =
-          PFN_vkGetEncodedVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkGetEncodedVideoSessionParametersKHR" ) );
-        vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdEncodeVideoKHR" ) );
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        //=== VK_NV_cuda_kernel_launch ===
-        vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetDeviceProcAddr( device, "vkCreateCudaModuleNV" ) );
-        vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetDeviceProcAddr( device, "vkGetCudaModuleCacheNV" ) );
-        vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetDeviceProcAddr( device, "vkCreateCudaFunctionNV" ) );
-        vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetDeviceProcAddr( device, "vkDestroyCudaModuleNV" ) );
-        vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetDeviceProcAddr( device, "vkDestroyCudaFunctionNV" ) );
-        vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetDeviceProcAddr( device, "vkCmdCudaLaunchKernelNV" ) );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-        //=== VK_QCOM_tile_shading ===
-        vkCmdDispatchTileQCOM          = PFN_vkCmdDispatchTileQCOM( vkGetDeviceProcAddr( device, "vkCmdDispatchTileQCOM" ) );
-        vkCmdBeginPerTileExecutionQCOM = PFN_vkCmdBeginPerTileExecutionQCOM( vkGetDeviceProcAddr( device, "vkCmdBeginPerTileExecutionQCOM" ) );
-        vkCmdEndPerTileExecutionQCOM   = PFN_vkCmdEndPerTileExecutionQCOM( vkGetDeviceProcAddr( device, "vkCmdEndPerTileExecutionQCOM" ) );
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_metal_objects ===
-        vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetDeviceProcAddr( device, "vkExportMetalObjectsEXT" ) );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-        //=== VK_KHR_synchronization2 ===
-        vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdSetEvent2KHR" ) );
-        if ( !vkCmdSetEvent2 )
-          vkCmdSetEvent2 = vkCmdSetEvent2KHR;
-        vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdResetEvent2KHR" ) );
-        if ( !vkCmdResetEvent2 )
-          vkCmdResetEvent2 = vkCmdResetEvent2KHR;
-        vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2KHR" ) );
-        if ( !vkCmdWaitEvents2 )
-          vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
-        vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2KHR" ) );
-        if ( !vkCmdPipelineBarrier2 )
-          vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
-        vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2KHR" ) );
-        if ( !vkCmdWriteTimestamp2 )
-          vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
-        vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetDeviceProcAddr( device, "vkQueueSubmit2KHR" ) );
-        if ( !vkQueueSubmit2 )
-          vkQueueSubmit2 = vkQueueSubmit2KHR;
-
-        //=== VK_EXT_descriptor_buffer ===
-        vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSizeEXT" ) );
-        vkGetDescriptorSetLayoutBindingOffsetEXT =
-          PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
-        vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorEXT" ) );
-        vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBuffersEXT" ) );
-        vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
-        vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
-          PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
-        vkGetBufferOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetImageOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetImageViewOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetSamplerOpaqueCaptureDescriptorDataEXT =
-          PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
-        vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-          vkGetDeviceProcAddr( device, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
-
-        //=== VK_NV_fragment_shading_rate_enums ===
-        vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateEnumNV" ) );
-
-        //=== VK_EXT_mesh_shader ===
-        vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksEXT" ) );
-        vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectEXT" ) );
-        vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
-
-        //=== VK_KHR_copy_commands2 ===
-        vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2KHR" ) );
-        if ( !vkCmdCopyBuffer2 )
-          vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
-        vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImage2KHR" ) );
-        if ( !vkCmdCopyImage2 )
-          vkCmdCopyImage2 = vkCmdCopyImage2KHR;
-        vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2KHR" ) );
-        if ( !vkCmdCopyBufferToImage2 )
-          vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
-        vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2KHR" ) );
-        if ( !vkCmdCopyImageToBuffer2 )
-          vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
-        vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetDeviceProcAddr( device, "vkCmdBlitImage2KHR" ) );
-        if ( !vkCmdBlitImage2 )
-          vkCmdBlitImage2 = vkCmdBlitImage2KHR;
-        vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetDeviceProcAddr( device, "vkCmdResolveImage2KHR" ) );
-        if ( !vkCmdResolveImage2 )
-          vkCmdResolveImage2 = vkCmdResolveImage2KHR;
-
-        //=== VK_EXT_device_fault ===
-        vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetDeviceProcAddr( device, "vkGetDeviceFaultInfoEXT" ) );
-
-        //=== VK_EXT_vertex_input_dynamic_state ===
-        vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetDeviceProcAddr( device, "vkCmdSetVertexInputEXT" ) );
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_external_memory ===
-        vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandleFUCHSIA" ) );
-        vkGetMemoryZirconHandlePropertiesFUCHSIA =
-          PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_external_semaphore ===
-        vkImportSemaphoreZirconHandleFUCHSIA =
-          PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
-        vkGetSemaphoreZirconHandleFUCHSIA = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-        //=== VK_FUCHSIA_buffer_collection ===
-        vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkCreateBufferCollectionFUCHSIA" ) );
-        vkSetBufferCollectionImageConstraintsFUCHSIA =
-          PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
-        vkSetBufferCollectionBufferConstraintsFUCHSIA =
-          PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
-        vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkDestroyBufferCollectionFUCHSIA" ) );
-        vkGetBufferCollectionPropertiesFUCHSIA =
-          PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-        //=== VK_HUAWEI_subpass_shading ===
-        vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
-          PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetDeviceProcAddr( device, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
-        vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetDeviceProcAddr( device, "vkCmdSubpassShadingHUAWEI" ) );
-
-        //=== VK_HUAWEI_invocation_mask ===
-        vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetDeviceProcAddr( device, "vkCmdBindInvocationMaskHUAWEI" ) );
-
-        //=== VK_NV_external_memory_rdma ===
-        vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetDeviceProcAddr( device, "vkGetMemoryRemoteAddressNV" ) );
-
-        //=== VK_EXT_pipeline_properties ===
-        vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetPipelinePropertiesEXT" ) );
-
-        //=== VK_EXT_extended_dynamic_state2 ===
-        vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetDeviceProcAddr( device, "vkCmdSetPatchControlPointsEXT" ) );
-        vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnableEXT" ) );
-        if ( !vkCmdSetRasterizerDiscardEnable )
-          vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
-        vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnableEXT" ) );
-        if ( !vkCmdSetDepthBiasEnable )
-          vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
-        vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEXT" ) );
-        vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnableEXT" ) );
-        if ( !vkCmdSetPrimitiveRestartEnable )
-          vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
-
-        //=== VK_EXT_color_write_enable ===
-        vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteEnableEXT" ) );
-
-        //=== VK_KHR_ray_tracing_maintenance1 ===
-        vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirect2KHR" ) );
-
-        //=== VK_EXT_multi_draw ===
-        vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiEXT" ) );
-        vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiIndexedEXT" ) );
-
-        //=== VK_EXT_opacity_micromap ===
-        vkCreateMicromapEXT                 = PFN_vkCreateMicromapEXT( vkGetDeviceProcAddr( device, "vkCreateMicromapEXT" ) );
-        vkDestroyMicromapEXT                = PFN_vkDestroyMicromapEXT( vkGetDeviceProcAddr( device, "vkDestroyMicromapEXT" ) );
-        vkCmdBuildMicromapsEXT              = PFN_vkCmdBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkCmdBuildMicromapsEXT" ) );
-        vkBuildMicromapsEXT                 = PFN_vkBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkBuildMicromapsEXT" ) );
-        vkCopyMicromapEXT                   = PFN_vkCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapEXT" ) );
-        vkCopyMicromapToMemoryEXT           = PFN_vkCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapToMemoryEXT" ) );
-        vkCopyMemoryToMicromapEXT           = PFN_vkCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToMicromapEXT" ) );
-        vkWriteMicromapsPropertiesEXT       = PFN_vkWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkWriteMicromapsPropertiesEXT" ) );
-        vkCmdCopyMicromapEXT                = PFN_vkCmdCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapEXT" ) );
-        vkCmdCopyMicromapToMemoryEXT        = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapToMemoryEXT" ) );
-        vkCmdCopyMemoryToMicromapEXT        = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToMicromapEXT" ) );
-        vkCmdWriteMicromapsPropertiesEXT    = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkCmdWriteMicromapsPropertiesEXT" ) );
-        vkGetDeviceMicromapCompatibilityEXT = PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetDeviceProcAddr( device, "vkGetDeviceMicromapCompatibilityEXT" ) );
-        vkGetMicromapBuildSizesEXT          = PFN_vkGetMicromapBuildSizesEXT( vkGetDeviceProcAddr( device, "vkGetMicromapBuildSizesEXT" ) );
-
-        //=== VK_HUAWEI_cluster_culling_shader ===
-        vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterHUAWEI" ) );
-        vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterIndirectHUAWEI" ) );
-
-        //=== VK_EXT_pageable_device_local_memory ===
-        vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetDeviceProcAddr( device, "vkSetDeviceMemoryPriorityEXT" ) );
-
-        //=== VK_KHR_maintenance4 ===
-        vkGetDeviceBufferMemoryRequirementsKHR =
-          PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceBufferMemoryRequirements )
-          vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
-        vkGetDeviceImageMemoryRequirementsKHR =
-          PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceImageMemoryRequirements )
-          vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
-        vkGetDeviceImageSparseMemoryRequirementsKHR =
-          PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
-        if ( !vkGetDeviceImageSparseMemoryRequirements )
-          vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
-
-        //=== VK_VALVE_descriptor_set_host_mapping ===
-        vkGetDescriptorSetLayoutHostMappingInfoVALVE =
-          PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
-        vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetHostMappingVALVE" ) );
-
-        //=== VK_NV_copy_memory_indirect ===
-        vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectNV" ) );
-        vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectNV" ) );
-
-        //=== VK_NV_memory_decompression ===
-        vkCmdDecompressMemoryNV = PFN_vkCmdDecompressMemoryNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryNV" ) );
-        vkCmdDecompressMemoryIndirectCountNV =
-          PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountNV" ) );
-
-        //=== VK_NV_device_generated_commands_compute ===
-        vkGetPipelineIndirectMemoryRequirementsNV =
-          PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
-        vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) );
-        vkGetPipelineIndirectDeviceAddressNV =
-          PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) );
-
-#if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_external_memory ===
-        vkGetNativeBufferPropertiesOHOS = PFN_vkGetNativeBufferPropertiesOHOS( vkGetDeviceProcAddr( device, "vkGetNativeBufferPropertiesOHOS" ) );
-        vkGetMemoryNativeBufferOHOS     = PFN_vkGetMemoryNativeBufferOHOS( vkGetDeviceProcAddr( device, "vkGetMemoryNativeBufferOHOS" ) );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-        //=== VK_EXT_extended_dynamic_state3 ===
-        vkCmdSetDepthClampEnableEXT         = PFN_vkCmdSetDepthClampEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampEnableEXT" ) );
-        vkCmdSetPolygonModeEXT              = PFN_vkCmdSetPolygonModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetPolygonModeEXT" ) );
-        vkCmdSetRasterizationSamplesEXT     = PFN_vkCmdSetRasterizationSamplesEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationSamplesEXT" ) );
-        vkCmdSetSampleMaskEXT               = PFN_vkCmdSetSampleMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleMaskEXT" ) );
-        vkCmdSetAlphaToCoverageEnableEXT    = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToCoverageEnableEXT" ) );
-        vkCmdSetAlphaToOneEnableEXT         = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToOneEnableEXT" ) );
-        vkCmdSetLogicOpEnableEXT            = PFN_vkCmdSetLogicOpEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEnableEXT" ) );
-        vkCmdSetColorBlendEnableEXT         = PFN_vkCmdSetColorBlendEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEnableEXT" ) );
-        vkCmdSetColorBlendEquationEXT       = PFN_vkCmdSetColorBlendEquationEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEquationEXT" ) );
-        vkCmdSetColorWriteMaskEXT           = PFN_vkCmdSetColorWriteMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteMaskEXT" ) );
-        vkCmdSetTessellationDomainOriginEXT = PFN_vkCmdSetTessellationDomainOriginEXT( vkGetDeviceProcAddr( device, "vkCmdSetTessellationDomainOriginEXT" ) );
-        vkCmdSetRasterizationStreamEXT      = PFN_vkCmdSetRasterizationStreamEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationStreamEXT" ) );
-        vkCmdSetConservativeRasterizationModeEXT =
-          PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetConservativeRasterizationModeEXT" ) );
-        vkCmdSetExtraPrimitiveOverestimationSizeEXT =
-          PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetDeviceProcAddr( device, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
-        vkCmdSetDepthClipEnableEXT       = PFN_vkCmdSetDepthClipEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipEnableEXT" ) );
-        vkCmdSetSampleLocationsEnableEXT = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEnableEXT" ) );
-        vkCmdSetColorBlendAdvancedEXT    = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendAdvancedEXT" ) );
-        vkCmdSetProvokingVertexModeEXT   = PFN_vkCmdSetProvokingVertexModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetProvokingVertexModeEXT" ) );
-        vkCmdSetLineRasterizationModeEXT = PFN_vkCmdSetLineRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineRasterizationModeEXT" ) );
-        vkCmdSetLineStippleEnableEXT     = PFN_vkCmdSetLineStippleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEnableEXT" ) );
-        vkCmdSetDepthClipNegativeOneToOneEXT =
-          PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
-        vkCmdSetViewportWScalingEnableNV  = PFN_vkCmdSetViewportWScalingEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingEnableNV" ) );
-        vkCmdSetViewportSwizzleNV         = PFN_vkCmdSetViewportSwizzleNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportSwizzleNV" ) );
-        vkCmdSetCoverageToColorEnableNV   = PFN_vkCmdSetCoverageToColorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorEnableNV" ) );
-        vkCmdSetCoverageToColorLocationNV = PFN_vkCmdSetCoverageToColorLocationNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorLocationNV" ) );
-        vkCmdSetCoverageModulationModeNV  = PFN_vkCmdSetCoverageModulationModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationModeNV" ) );
-        vkCmdSetCoverageModulationTableEnableNV =
-          PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableEnableNV" ) );
-        vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableNV" ) );
-        vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetShadingRateImageEnableNV" ) );
-        vkCmdSetRepresentativeFragmentTestEnableNV =
-          PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
-        vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageReductionModeNV" ) );
-
-        //=== VK_ARM_tensors ===
-        vkCreateTensorARM                = PFN_vkCreateTensorARM( vkGetDeviceProcAddr( device, "vkCreateTensorARM" ) );
-        vkDestroyTensorARM               = PFN_vkDestroyTensorARM( vkGetDeviceProcAddr( device, "vkDestroyTensorARM" ) );
-        vkCreateTensorViewARM            = PFN_vkCreateTensorViewARM( vkGetDeviceProcAddr( device, "vkCreateTensorViewARM" ) );
-        vkDestroyTensorViewARM           = PFN_vkDestroyTensorViewARM( vkGetDeviceProcAddr( device, "vkDestroyTensorViewARM" ) );
-        vkGetTensorMemoryRequirementsARM = PFN_vkGetTensorMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetTensorMemoryRequirementsARM" ) );
-        vkBindTensorMemoryARM            = PFN_vkBindTensorMemoryARM( vkGetDeviceProcAddr( device, "vkBindTensorMemoryARM" ) );
-        vkGetDeviceTensorMemoryRequirementsARM =
-          PFN_vkGetDeviceTensorMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDeviceTensorMemoryRequirementsARM" ) );
-        vkCmdCopyTensorARM = PFN_vkCmdCopyTensorARM( vkGetDeviceProcAddr( device, "vkCmdCopyTensorARM" ) );
-        vkGetTensorOpaqueCaptureDescriptorDataARM =
-          PFN_vkGetTensorOpaqueCaptureDescriptorDataARM( vkGetDeviceProcAddr( device, "vkGetTensorOpaqueCaptureDescriptorDataARM" ) );
-        vkGetTensorViewOpaqueCaptureDescriptorDataARM =
-          PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM( vkGetDeviceProcAddr( device, "vkGetTensorViewOpaqueCaptureDescriptorDataARM" ) );
-
-        //=== VK_EXT_shader_module_identifier ===
-        vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleIdentifierEXT" ) );
-        vkGetShaderModuleCreateInfoIdentifierEXT =
-          PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
-
-        //=== VK_NV_optical_flow ===
-        vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkCreateOpticalFlowSessionNV" ) );
-        vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkDestroyOpticalFlowSessionNV" ) );
-        vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetDeviceProcAddr( device, "vkBindOpticalFlowSessionImageNV" ) );
-        vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetDeviceProcAddr( device, "vkCmdOpticalFlowExecuteNV" ) );
-
-        //=== VK_KHR_maintenance5 ===
-        vkCmdBindIndexBuffer2KHR = PFN_vkCmdBindIndexBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2KHR" ) );
-        if ( !vkCmdBindIndexBuffer2 )
-          vkCmdBindIndexBuffer2 = vkCmdBindIndexBuffer2KHR;
-        vkGetRenderingAreaGranularityKHR = PFN_vkGetRenderingAreaGranularityKHR( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularityKHR" ) );
-        if ( !vkGetRenderingAreaGranularity )
-          vkGetRenderingAreaGranularity = vkGetRenderingAreaGranularityKHR;
-        vkGetDeviceImageSubresourceLayoutKHR =
-          PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayoutKHR" ) );
-        if ( !vkGetDeviceImageSubresourceLayout )
-          vkGetDeviceImageSubresourceLayout = vkGetDeviceImageSubresourceLayoutKHR;
-        vkGetImageSubresourceLayout2KHR = PFN_vkGetImageSubresourceLayout2KHR( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2KHR" ) );
-        if ( !vkGetImageSubresourceLayout2 )
-          vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2KHR;
-
-        //=== VK_AMD_anti_lag ===
-        vkAntiLagUpdateAMD = PFN_vkAntiLagUpdateAMD( vkGetDeviceProcAddr( device, "vkAntiLagUpdateAMD" ) );
-
-        //=== VK_KHR_present_wait2 ===
-        vkWaitForPresent2KHR = PFN_vkWaitForPresent2KHR( vkGetDeviceProcAddr( device, "vkWaitForPresent2KHR" ) );
-
-        //=== VK_EXT_shader_object ===
-        vkCreateShadersEXT         = PFN_vkCreateShadersEXT( vkGetDeviceProcAddr( device, "vkCreateShadersEXT" ) );
-        vkDestroyShaderEXT         = PFN_vkDestroyShaderEXT( vkGetDeviceProcAddr( device, "vkDestroyShaderEXT" ) );
-        vkGetShaderBinaryDataEXT   = PFN_vkGetShaderBinaryDataEXT( vkGetDeviceProcAddr( device, "vkGetShaderBinaryDataEXT" ) );
-        vkCmdBindShadersEXT        = PFN_vkCmdBindShadersEXT( vkGetDeviceProcAddr( device, "vkCmdBindShadersEXT" ) );
-        vkCmdSetDepthClampRangeEXT = PFN_vkCmdSetDepthClampRangeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampRangeEXT" ) );
-
-        //=== VK_KHR_pipeline_binary ===
-        vkCreatePipelineBinariesKHR      = PFN_vkCreatePipelineBinariesKHR( vkGetDeviceProcAddr( device, "vkCreatePipelineBinariesKHR" ) );
-        vkDestroyPipelineBinaryKHR       = PFN_vkDestroyPipelineBinaryKHR( vkGetDeviceProcAddr( device, "vkDestroyPipelineBinaryKHR" ) );
-        vkGetPipelineKeyKHR              = PFN_vkGetPipelineKeyKHR( vkGetDeviceProcAddr( device, "vkGetPipelineKeyKHR" ) );
-        vkGetPipelineBinaryDataKHR       = PFN_vkGetPipelineBinaryDataKHR( vkGetDeviceProcAddr( device, "vkGetPipelineBinaryDataKHR" ) );
-        vkReleaseCapturedPipelineDataKHR = PFN_vkReleaseCapturedPipelineDataKHR( vkGetDeviceProcAddr( device, "vkReleaseCapturedPipelineDataKHR" ) );
-
-        //=== VK_QCOM_tile_properties ===
-        vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetFramebufferTilePropertiesQCOM" ) );
-        vkGetDynamicRenderingTilePropertiesQCOM =
-          PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
-
-        //=== VK_KHR_swapchain_maintenance1 ===
-        vkReleaseSwapchainImagesKHR = PFN_vkReleaseSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesKHR" ) );
-
-        //=== VK_NV_cooperative_vector ===
-        vkConvertCooperativeVectorMatrixNV = PFN_vkConvertCooperativeVectorMatrixNV( vkGetDeviceProcAddr( device, "vkConvertCooperativeVectorMatrixNV" ) );
-        vkCmdConvertCooperativeVectorMatrixNV =
-          PFN_vkCmdConvertCooperativeVectorMatrixNV( vkGetDeviceProcAddr( device, "vkCmdConvertCooperativeVectorMatrixNV" ) );
-
-        //=== VK_NV_low_latency2 ===
-        vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetDeviceProcAddr( device, "vkSetLatencySleepModeNV" ) );
-        vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetDeviceProcAddr( device, "vkLatencySleepNV" ) );
-        vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetDeviceProcAddr( device, "vkSetLatencyMarkerNV" ) );
-        vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetDeviceProcAddr( device, "vkGetLatencyTimingsNV" ) );
-        vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetDeviceProcAddr( device, "vkQueueNotifyOutOfBandNV" ) );
-
-        //=== VK_ARM_data_graph ===
-        vkCreateDataGraphPipelinesARM       = PFN_vkCreateDataGraphPipelinesARM( vkGetDeviceProcAddr( device, "vkCreateDataGraphPipelinesARM" ) );
-        vkCreateDataGraphPipelineSessionARM = PFN_vkCreateDataGraphPipelineSessionARM( vkGetDeviceProcAddr( device, "vkCreateDataGraphPipelineSessionARM" ) );
-        vkGetDataGraphPipelineSessionBindPointRequirementsARM =
-          PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineSessionBindPointRequirementsARM" ) );
-        vkGetDataGraphPipelineSessionMemoryRequirementsARM =
-          PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineSessionMemoryRequirementsARM" ) );
-        vkBindDataGraphPipelineSessionMemoryARM =
-          PFN_vkBindDataGraphPipelineSessionMemoryARM( vkGetDeviceProcAddr( device, "vkBindDataGraphPipelineSessionMemoryARM" ) );
-        vkDestroyDataGraphPipelineSessionARM =
-          PFN_vkDestroyDataGraphPipelineSessionARM( vkGetDeviceProcAddr( device, "vkDestroyDataGraphPipelineSessionARM" ) );
-        vkCmdDispatchDataGraphARM = PFN_vkCmdDispatchDataGraphARM( vkGetDeviceProcAddr( device, "vkCmdDispatchDataGraphARM" ) );
-        vkGetDataGraphPipelineAvailablePropertiesARM =
-          PFN_vkGetDataGraphPipelineAvailablePropertiesARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineAvailablePropertiesARM" ) );
-        vkGetDataGraphPipelinePropertiesARM = PFN_vkGetDataGraphPipelinePropertiesARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelinePropertiesARM" ) );
-
-        //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-        vkCmdSetAttachmentFeedbackLoopEnableEXT =
-          PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
-
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-        //=== VK_QNX_external_memory_screen_buffer ===
-        vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetDeviceProcAddr( device, "vkGetScreenBufferPropertiesQNX" ) );
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-        //=== VK_KHR_line_rasterization ===
-        vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleKHR" ) );
-        if ( !vkCmdSetLineStipple )
-          vkCmdSetLineStipple = vkCmdSetLineStippleKHR;
-
-        //=== VK_KHR_calibrated_timestamps ===
-        vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsKHR" ) );
-
-        //=== VK_KHR_maintenance6 ===
-        vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2KHR" ) );
-        if ( !vkCmdBindDescriptorSets2 )
-          vkCmdBindDescriptorSets2 = vkCmdBindDescriptorSets2KHR;
-        vkCmdPushConstants2KHR = PFN_vkCmdPushConstants2KHR( vkGetDeviceProcAddr( device, "vkCmdPushConstants2KHR" ) );
-        if ( !vkCmdPushConstants2 )
-          vkCmdPushConstants2 = vkCmdPushConstants2KHR;
-        vkCmdPushDescriptorSet2KHR = PFN_vkCmdPushDescriptorSet2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2KHR" ) );
-        if ( !vkCmdPushDescriptorSet2 )
-          vkCmdPushDescriptorSet2 = vkCmdPushDescriptorSet2KHR;
-        vkCmdPushDescriptorSetWithTemplate2KHR =
-          PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
-        if ( !vkCmdPushDescriptorSetWithTemplate2 )
-          vkCmdPushDescriptorSetWithTemplate2 = vkCmdPushDescriptorSetWithTemplate2KHR;
-        vkCmdSetDescriptorBufferOffsets2EXT = PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
-        vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
-          PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
-
-        //=== VK_QCOM_tile_memory_heap ===
-        vkCmdBindTileMemoryQCOM = PFN_vkCmdBindTileMemoryQCOM( vkGetDeviceProcAddr( device, "vkCmdBindTileMemoryQCOM" ) );
-
-        //=== VK_KHR_copy_memory_indirect ===
-        vkCmdCopyMemoryIndirectKHR        = PFN_vkCmdCopyMemoryIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectKHR" ) );
-        vkCmdCopyMemoryToImageIndirectKHR = PFN_vkCmdCopyMemoryToImageIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectKHR" ) );
-
-        //=== VK_EXT_memory_decompression ===
-        vkCmdDecompressMemoryEXT = PFN_vkCmdDecompressMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryEXT" ) );
-        vkCmdDecompressMemoryIndirectCountEXT =
-          PFN_vkCmdDecompressMemoryIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountEXT" ) );
-
-        //=== VK_NV_external_compute_queue ===
-        vkCreateExternalComputeQueueNV  = PFN_vkCreateExternalComputeQueueNV( vkGetDeviceProcAddr( device, "vkCreateExternalComputeQueueNV" ) );
-        vkDestroyExternalComputeQueueNV = PFN_vkDestroyExternalComputeQueueNV( vkGetDeviceProcAddr( device, "vkDestroyExternalComputeQueueNV" ) );
-        vkGetExternalComputeQueueDataNV = PFN_vkGetExternalComputeQueueDataNV( vkGetDeviceProcAddr( device, "vkGetExternalComputeQueueDataNV" ) );
-
-        //=== VK_NV_cluster_acceleration_structure ===
-        vkGetClusterAccelerationStructureBuildSizesNV =
-          PFN_vkGetClusterAccelerationStructureBuildSizesNV( vkGetDeviceProcAddr( device, "vkGetClusterAccelerationStructureBuildSizesNV" ) );
-        vkCmdBuildClusterAccelerationStructureIndirectNV =
-          PFN_vkCmdBuildClusterAccelerationStructureIndirectNV( vkGetDeviceProcAddr( device, "vkCmdBuildClusterAccelerationStructureIndirectNV" ) );
-
-        //=== VK_NV_partitioned_acceleration_structure ===
-        vkGetPartitionedAccelerationStructuresBuildSizesNV =
-          PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV( vkGetDeviceProcAddr( device, "vkGetPartitionedAccelerationStructuresBuildSizesNV" ) );
-        vkCmdBuildPartitionedAccelerationStructuresNV =
-          PFN_vkCmdBuildPartitionedAccelerationStructuresNV( vkGetDeviceProcAddr( device, "vkCmdBuildPartitionedAccelerationStructuresNV" ) );
-
-        //=== VK_EXT_device_generated_commands ===
-        vkGetGeneratedCommandsMemoryRequirementsEXT =
-          PFN_vkGetGeneratedCommandsMemoryRequirementsEXT( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsEXT" ) );
-        vkCmdPreprocessGeneratedCommandsEXT = PFN_vkCmdPreprocessGeneratedCommandsEXT( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsEXT" ) );
-        vkCmdExecuteGeneratedCommandsEXT    = PFN_vkCmdExecuteGeneratedCommandsEXT( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsEXT" ) );
-        vkCreateIndirectCommandsLayoutEXT   = PFN_vkCreateIndirectCommandsLayoutEXT( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutEXT" ) );
-        vkDestroyIndirectCommandsLayoutEXT  = PFN_vkDestroyIndirectCommandsLayoutEXT( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutEXT" ) );
-        vkCreateIndirectExecutionSetEXT     = PFN_vkCreateIndirectExecutionSetEXT( vkGetDeviceProcAddr( device, "vkCreateIndirectExecutionSetEXT" ) );
-        vkDestroyIndirectExecutionSetEXT    = PFN_vkDestroyIndirectExecutionSetEXT( vkGetDeviceProcAddr( device, "vkDestroyIndirectExecutionSetEXT" ) );
-        vkUpdateIndirectExecutionSetPipelineEXT =
-          PFN_vkUpdateIndirectExecutionSetPipelineEXT( vkGetDeviceProcAddr( device, "vkUpdateIndirectExecutionSetPipelineEXT" ) );
-        vkUpdateIndirectExecutionSetShaderEXT =
-          PFN_vkUpdateIndirectExecutionSetShaderEXT( vkGetDeviceProcAddr( device, "vkUpdateIndirectExecutionSetShaderEXT" ) );
-
-#if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_native_buffer ===
-        vkGetSwapchainGrallocUsageOHOS = PFN_vkGetSwapchainGrallocUsageOHOS( vkGetDeviceProcAddr( device, "vkGetSwapchainGrallocUsageOHOS" ) );
-        vkAcquireImageOHOS             = PFN_vkAcquireImageOHOS( vkGetDeviceProcAddr( device, "vkAcquireImageOHOS" ) );
-        vkQueueSignalReleaseImageOHOS  = PFN_vkQueueSignalReleaseImageOHOS( vkGetDeviceProcAddr( device, "vkQueueSignalReleaseImageOHOS" ) );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_external_memory_metal ===
-        vkGetMemoryMetalHandleEXT           = PFN_vkGetMemoryMetalHandleEXT( vkGetDeviceProcAddr( device, "vkGetMemoryMetalHandleEXT" ) );
-        vkGetMemoryMetalHandlePropertiesEXT = PFN_vkGetMemoryMetalHandlePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryMetalHandlePropertiesEXT" ) );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-        //=== VK_EXT_fragment_density_map_offset ===
-        vkCmdEndRendering2EXT = PFN_vkCmdEndRendering2EXT( vkGetDeviceProcAddr( device, "vkCmdEndRendering2EXT" ) );
-        if ( !vkCmdEndRendering2KHR )
-          vkCmdEndRendering2KHR = vkCmdEndRendering2EXT;
-
-        //=== VK_EXT_custom_resolve ===
-        vkCmdBeginCustomResolveEXT = PFN_vkCmdBeginCustomResolveEXT( vkGetDeviceProcAddr( device, "vkCmdBeginCustomResolveEXT" ) );
-
-        //=== VK_KHR_maintenance10 ===
-        vkCmdEndRendering2KHR = PFN_vkCmdEndRendering2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRendering2KHR" ) );
-      }
-
-      template <typename DynamicLoader>
-      void init( Instance const & instance, Device const & device, DynamicLoader const & dl ) VULKAN_HPP_NOEXCEPT
-      {
-        PFN_vkGetInstanceProcAddr getInstanceProcAddr = dl.template getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" );
-        PFN_vkGetDeviceProcAddr   getDeviceProcAddr   = dl.template getProcAddress<PFN_vkGetDeviceProcAddr>( "vkGetDeviceProcAddr" );
-        init( static_cast<VkInstance>( instance ), getInstanceProcAddr, static_cast<VkDevice>( device ), device ? getDeviceProcAddr : nullptr );
-      }
-
-      template <typename DynamicLoader
-#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-                = VULKAN_HPP_NAMESPACE::detail::DynamicLoader
-#endif
-                >
-      void init( Instance const & instance, Device const & device ) VULKAN_HPP_NOEXCEPT
-      {
-        static DynamicLoader dl;
-        init( instance, device, dl );
-      }
-    };
-
-    template <>
-    struct isDispatchLoader<DispatchLoaderDynamic>
+      vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorSets2KHR" ) );
+      vkCmdPushConstants2KHR      = PFN_vkCmdPushConstants2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushConstants2KHR" ) );
+      vkCmdPushDescriptorSet2KHR  = PFN_vkCmdPushDescriptorSet2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSet2KHR" ) );
+      vkCmdPushDescriptorSetWithTemplate2KHR =
+        PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetInstanceProcAddr( instance, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
+      vkCmdSetDescriptorBufferOffsets2EXT = PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetInstanceProcAddr( instance, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
+      vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
+        PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetInstanceProcAddr( instance, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
+    }
+
+    void init( VULKAN_HPP_NAMESPACE::Device deviceCpp ) VULKAN_HPP_NOEXCEPT
     {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
+      VkDevice device = static_cast<VkDevice>( deviceCpp );
 
-  }  // namespace detail
+      //=== VK_VERSION_1_0 ===
+      vkGetDeviceProcAddr                = PFN_vkGetDeviceProcAddr( vkGetDeviceProcAddr( device, "vkGetDeviceProcAddr" ) );
+      vkDestroyDevice                    = PFN_vkDestroyDevice( vkGetDeviceProcAddr( device, "vkDestroyDevice" ) );
+      vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetDeviceProcAddr( device, "vkGetDeviceQueue" ) );
+      vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetDeviceProcAddr( device, "vkQueueSubmit" ) );
+      vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetDeviceProcAddr( device, "vkQueueWaitIdle" ) );
+      vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetDeviceProcAddr( device, "vkDeviceWaitIdle" ) );
+      vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetDeviceProcAddr( device, "vkAllocateMemory" ) );
+      vkFreeMemory                       = PFN_vkFreeMemory( vkGetDeviceProcAddr( device, "vkFreeMemory" ) );
+      vkMapMemory                        = PFN_vkMapMemory( vkGetDeviceProcAddr( device, "vkMapMemory" ) );
+      vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetDeviceProcAddr( device, "vkUnmapMemory" ) );
+      vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkFlushMappedMemoryRanges" ) );
+      vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkInvalidateMappedMemoryRanges" ) );
+      vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryCommitment" ) );
+      vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetDeviceProcAddr( device, "vkBindBufferMemory" ) );
+      vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetDeviceProcAddr( device, "vkBindImageMemory" ) );
+      vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements" ) );
+      vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements" ) );
+      vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements" ) );
+      vkQueueBindSparse                  = PFN_vkQueueBindSparse( vkGetDeviceProcAddr( device, "vkQueueBindSparse" ) );
+      vkCreateFence                      = PFN_vkCreateFence( vkGetDeviceProcAddr( device, "vkCreateFence" ) );
+      vkDestroyFence                     = PFN_vkDestroyFence( vkGetDeviceProcAddr( device, "vkDestroyFence" ) );
+      vkResetFences                      = PFN_vkResetFences( vkGetDeviceProcAddr( device, "vkResetFences" ) );
+      vkGetFenceStatus                   = PFN_vkGetFenceStatus( vkGetDeviceProcAddr( device, "vkGetFenceStatus" ) );
+      vkWaitForFences                    = PFN_vkWaitForFences( vkGetDeviceProcAddr( device, "vkWaitForFences" ) );
+      vkCreateSemaphore                  = PFN_vkCreateSemaphore( vkGetDeviceProcAddr( device, "vkCreateSemaphore" ) );
+      vkDestroySemaphore                 = PFN_vkDestroySemaphore( vkGetDeviceProcAddr( device, "vkDestroySemaphore" ) );
+      vkCreateEvent                      = PFN_vkCreateEvent( vkGetDeviceProcAddr( device, "vkCreateEvent" ) );
+      vkDestroyEvent                     = PFN_vkDestroyEvent( vkGetDeviceProcAddr( device, "vkDestroyEvent" ) );
+      vkGetEventStatus                   = PFN_vkGetEventStatus( vkGetDeviceProcAddr( device, "vkGetEventStatus" ) );
+      vkSetEvent                         = PFN_vkSetEvent( vkGetDeviceProcAddr( device, "vkSetEvent" ) );
+      vkResetEvent                       = PFN_vkResetEvent( vkGetDeviceProcAddr( device, "vkResetEvent" ) );
+      vkCreateQueryPool                  = PFN_vkCreateQueryPool( vkGetDeviceProcAddr( device, "vkCreateQueryPool" ) );
+      vkDestroyQueryPool                 = PFN_vkDestroyQueryPool( vkGetDeviceProcAddr( device, "vkDestroyQueryPool" ) );
+      vkGetQueryPoolResults              = PFN_vkGetQueryPoolResults( vkGetDeviceProcAddr( device, "vkGetQueryPoolResults" ) );
+      vkCreateBuffer                     = PFN_vkCreateBuffer( vkGetDeviceProcAddr( device, "vkCreateBuffer" ) );
+      vkDestroyBuffer                    = PFN_vkDestroyBuffer( vkGetDeviceProcAddr( device, "vkDestroyBuffer" ) );
+      vkCreateBufferView                 = PFN_vkCreateBufferView( vkGetDeviceProcAddr( device, "vkCreateBufferView" ) );
+      vkDestroyBufferView                = PFN_vkDestroyBufferView( vkGetDeviceProcAddr( device, "vkDestroyBufferView" ) );
+      vkCreateImage                      = PFN_vkCreateImage( vkGetDeviceProcAddr( device, "vkCreateImage" ) );
+      vkDestroyImage                     = PFN_vkDestroyImage( vkGetDeviceProcAddr( device, "vkDestroyImage" ) );
+      vkGetImageSubresourceLayout        = PFN_vkGetImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout" ) );
+      vkCreateImageView                  = PFN_vkCreateImageView( vkGetDeviceProcAddr( device, "vkCreateImageView" ) );
+      vkDestroyImageView                 = PFN_vkDestroyImageView( vkGetDeviceProcAddr( device, "vkDestroyImageView" ) );
+      vkCreateShaderModule               = PFN_vkCreateShaderModule( vkGetDeviceProcAddr( device, "vkCreateShaderModule" ) );
+      vkDestroyShaderModule              = PFN_vkDestroyShaderModule( vkGetDeviceProcAddr( device, "vkDestroyShaderModule" ) );
+      vkCreatePipelineCache              = PFN_vkCreatePipelineCache( vkGetDeviceProcAddr( device, "vkCreatePipelineCache" ) );
+      vkDestroyPipelineCache             = PFN_vkDestroyPipelineCache( vkGetDeviceProcAddr( device, "vkDestroyPipelineCache" ) );
+      vkGetPipelineCacheData             = PFN_vkGetPipelineCacheData( vkGetDeviceProcAddr( device, "vkGetPipelineCacheData" ) );
+      vkMergePipelineCaches              = PFN_vkMergePipelineCaches( vkGetDeviceProcAddr( device, "vkMergePipelineCaches" ) );
+      vkCreateGraphicsPipelines          = PFN_vkCreateGraphicsPipelines( vkGetDeviceProcAddr( device, "vkCreateGraphicsPipelines" ) );
+      vkCreateComputePipelines           = PFN_vkCreateComputePipelines( vkGetDeviceProcAddr( device, "vkCreateComputePipelines" ) );
+      vkDestroyPipeline                  = PFN_vkDestroyPipeline( vkGetDeviceProcAddr( device, "vkDestroyPipeline" ) );
+      vkCreatePipelineLayout             = PFN_vkCreatePipelineLayout( vkGetDeviceProcAddr( device, "vkCreatePipelineLayout" ) );
+      vkDestroyPipelineLayout            = PFN_vkDestroyPipelineLayout( vkGetDeviceProcAddr( device, "vkDestroyPipelineLayout" ) );
+      vkCreateSampler                    = PFN_vkCreateSampler( vkGetDeviceProcAddr( device, "vkCreateSampler" ) );
+      vkDestroySampler                   = PFN_vkDestroySampler( vkGetDeviceProcAddr( device, "vkDestroySampler" ) );
+      vkCreateDescriptorSetLayout        = PFN_vkCreateDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkCreateDescriptorSetLayout" ) );
+      vkDestroyDescriptorSetLayout       = PFN_vkDestroyDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkDestroyDescriptorSetLayout" ) );
+      vkCreateDescriptorPool             = PFN_vkCreateDescriptorPool( vkGetDeviceProcAddr( device, "vkCreateDescriptorPool" ) );
+      vkDestroyDescriptorPool            = PFN_vkDestroyDescriptorPool( vkGetDeviceProcAddr( device, "vkDestroyDescriptorPool" ) );
+      vkResetDescriptorPool              = PFN_vkResetDescriptorPool( vkGetDeviceProcAddr( device, "vkResetDescriptorPool" ) );
+      vkAllocateDescriptorSets           = PFN_vkAllocateDescriptorSets( vkGetDeviceProcAddr( device, "vkAllocateDescriptorSets" ) );
+      vkFreeDescriptorSets               = PFN_vkFreeDescriptorSets( vkGetDeviceProcAddr( device, "vkFreeDescriptorSets" ) );
+      vkUpdateDescriptorSets             = PFN_vkUpdateDescriptorSets( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSets" ) );
+      vkCreateFramebuffer                = PFN_vkCreateFramebuffer( vkGetDeviceProcAddr( device, "vkCreateFramebuffer" ) );
+      vkDestroyFramebuffer               = PFN_vkDestroyFramebuffer( vkGetDeviceProcAddr( device, "vkDestroyFramebuffer" ) );
+      vkCreateRenderPass                 = PFN_vkCreateRenderPass( vkGetDeviceProcAddr( device, "vkCreateRenderPass" ) );
+      vkDestroyRenderPass                = PFN_vkDestroyRenderPass( vkGetDeviceProcAddr( device, "vkDestroyRenderPass" ) );
+      vkGetRenderAreaGranularity         = PFN_vkGetRenderAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderAreaGranularity" ) );
+      vkCreateCommandPool                = PFN_vkCreateCommandPool( vkGetDeviceProcAddr( device, "vkCreateCommandPool" ) );
+      vkDestroyCommandPool               = PFN_vkDestroyCommandPool( vkGetDeviceProcAddr( device, "vkDestroyCommandPool" ) );
+      vkResetCommandPool                 = PFN_vkResetCommandPool( vkGetDeviceProcAddr( device, "vkResetCommandPool" ) );
+      vkAllocateCommandBuffers           = PFN_vkAllocateCommandBuffers( vkGetDeviceProcAddr( device, "vkAllocateCommandBuffers" ) );
+      vkFreeCommandBuffers               = PFN_vkFreeCommandBuffers( vkGetDeviceProcAddr( device, "vkFreeCommandBuffers" ) );
+      vkBeginCommandBuffer               = PFN_vkBeginCommandBuffer( vkGetDeviceProcAddr( device, "vkBeginCommandBuffer" ) );
+      vkEndCommandBuffer                 = PFN_vkEndCommandBuffer( vkGetDeviceProcAddr( device, "vkEndCommandBuffer" ) );
+      vkResetCommandBuffer               = PFN_vkResetCommandBuffer( vkGetDeviceProcAddr( device, "vkResetCommandBuffer" ) );
+      vkCmdBindPipeline                  = PFN_vkCmdBindPipeline( vkGetDeviceProcAddr( device, "vkCmdBindPipeline" ) );
+      vkCmdSetViewport                   = PFN_vkCmdSetViewport( vkGetDeviceProcAddr( device, "vkCmdSetViewport" ) );
+      vkCmdSetScissor                    = PFN_vkCmdSetScissor( vkGetDeviceProcAddr( device, "vkCmdSetScissor" ) );
+      vkCmdSetLineWidth                  = PFN_vkCmdSetLineWidth( vkGetDeviceProcAddr( device, "vkCmdSetLineWidth" ) );
+      vkCmdSetDepthBias                  = PFN_vkCmdSetDepthBias( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias" ) );
+      vkCmdSetBlendConstants             = PFN_vkCmdSetBlendConstants( vkGetDeviceProcAddr( device, "vkCmdSetBlendConstants" ) );
+      vkCmdSetDepthBounds                = PFN_vkCmdSetDepthBounds( vkGetDeviceProcAddr( device, "vkCmdSetDepthBounds" ) );
+      vkCmdSetStencilCompareMask         = PFN_vkCmdSetStencilCompareMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilCompareMask" ) );
+      vkCmdSetStencilWriteMask           = PFN_vkCmdSetStencilWriteMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilWriteMask" ) );
+      vkCmdSetStencilReference           = PFN_vkCmdSetStencilReference( vkGetDeviceProcAddr( device, "vkCmdSetStencilReference" ) );
+      vkCmdBindDescriptorSets            = PFN_vkCmdBindDescriptorSets( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets" ) );
+      vkCmdBindIndexBuffer               = PFN_vkCmdBindIndexBuffer( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer" ) );
+      vkCmdBindVertexBuffers             = PFN_vkCmdBindVertexBuffers( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers" ) );
+      vkCmdDraw                          = PFN_vkCmdDraw( vkGetDeviceProcAddr( device, "vkCmdDraw" ) );
+      vkCmdDrawIndexed                   = PFN_vkCmdDrawIndexed( vkGetDeviceProcAddr( device, "vkCmdDrawIndexed" ) );
+      vkCmdDrawIndirect                  = PFN_vkCmdDrawIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndirect" ) );
+      vkCmdDrawIndexedIndirect           = PFN_vkCmdDrawIndexedIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirect" ) );
+      vkCmdDispatch                      = PFN_vkCmdDispatch( vkGetDeviceProcAddr( device, "vkCmdDispatch" ) );
+      vkCmdDispatchIndirect              = PFN_vkCmdDispatchIndirect( vkGetDeviceProcAddr( device, "vkCmdDispatchIndirect" ) );
+      vkCmdCopyBuffer                    = PFN_vkCmdCopyBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer" ) );
+      vkCmdCopyImage                     = PFN_vkCmdCopyImage( vkGetDeviceProcAddr( device, "vkCmdCopyImage" ) );
+      vkCmdBlitImage                     = PFN_vkCmdBlitImage( vkGetDeviceProcAddr( device, "vkCmdBlitImage" ) );
+      vkCmdCopyBufferToImage             = PFN_vkCmdCopyBufferToImage( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage" ) );
+      vkCmdCopyImageToBuffer             = PFN_vkCmdCopyImageToBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer" ) );
+      vkCmdUpdateBuffer                  = PFN_vkCmdUpdateBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdateBuffer" ) );
+      vkCmdFillBuffer                    = PFN_vkCmdFillBuffer( vkGetDeviceProcAddr( device, "vkCmdFillBuffer" ) );
+      vkCmdClearColorImage               = PFN_vkCmdClearColorImage( vkGetDeviceProcAddr( device, "vkCmdClearColorImage" ) );
+      vkCmdClearDepthStencilImage        = PFN_vkCmdClearDepthStencilImage( vkGetDeviceProcAddr( device, "vkCmdClearDepthStencilImage" ) );
+      vkCmdClearAttachments              = PFN_vkCmdClearAttachments( vkGetDeviceProcAddr( device, "vkCmdClearAttachments" ) );
+      vkCmdResolveImage                  = PFN_vkCmdResolveImage( vkGetDeviceProcAddr( device, "vkCmdResolveImage" ) );
+      vkCmdSetEvent                      = PFN_vkCmdSetEvent( vkGetDeviceProcAddr( device, "vkCmdSetEvent" ) );
+      vkCmdResetEvent                    = PFN_vkCmdResetEvent( vkGetDeviceProcAddr( device, "vkCmdResetEvent" ) );
+      vkCmdWaitEvents                    = PFN_vkCmdWaitEvents( vkGetDeviceProcAddr( device, "vkCmdWaitEvents" ) );
+      vkCmdPipelineBarrier               = PFN_vkCmdPipelineBarrier( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier" ) );
+      vkCmdBeginQuery                    = PFN_vkCmdBeginQuery( vkGetDeviceProcAddr( device, "vkCmdBeginQuery" ) );
+      vkCmdEndQuery                      = PFN_vkCmdEndQuery( vkGetDeviceProcAddr( device, "vkCmdEndQuery" ) );
+      vkCmdResetQueryPool                = PFN_vkCmdResetQueryPool( vkGetDeviceProcAddr( device, "vkCmdResetQueryPool" ) );
+      vkCmdWriteTimestamp                = PFN_vkCmdWriteTimestamp( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp" ) );
+      vkCmdCopyQueryPoolResults          = PFN_vkCmdCopyQueryPoolResults( vkGetDeviceProcAddr( device, "vkCmdCopyQueryPoolResults" ) );
+      vkCmdPushConstants                 = PFN_vkCmdPushConstants( vkGetDeviceProcAddr( device, "vkCmdPushConstants" ) );
+      vkCmdBeginRenderPass               = PFN_vkCmdBeginRenderPass( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass" ) );
+      vkCmdNextSubpass                   = PFN_vkCmdNextSubpass( vkGetDeviceProcAddr( device, "vkCmdNextSubpass" ) );
+      vkCmdEndRenderPass                 = PFN_vkCmdEndRenderPass( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass" ) );
+      vkCmdExecuteCommands               = PFN_vkCmdExecuteCommands( vkGetDeviceProcAddr( device, "vkCmdExecuteCommands" ) );
+
+      //=== VK_VERSION_1_1 ===
+      vkBindBufferMemory2                 = PFN_vkBindBufferMemory2( vkGetDeviceProcAddr( device, "vkBindBufferMemory2" ) );
+      vkBindImageMemory2                  = PFN_vkBindImageMemory2( vkGetDeviceProcAddr( device, "vkBindImageMemory2" ) );
+      vkGetDeviceGroupPeerMemoryFeatures  = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeatures" ) );
+      vkCmdSetDeviceMask                  = PFN_vkCmdSetDeviceMask( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMask" ) );
+      vkCmdDispatchBase                   = PFN_vkCmdDispatchBase( vkGetDeviceProcAddr( device, "vkCmdDispatchBase" ) );
+      vkGetImageMemoryRequirements2       = PFN_vkGetImageMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2" ) );
+      vkGetBufferMemoryRequirements2      = PFN_vkGetBufferMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2" ) );
+      vkGetImageSparseMemoryRequirements2 = PFN_vkGetImageSparseMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2" ) );
+      vkTrimCommandPool                   = PFN_vkTrimCommandPool( vkGetDeviceProcAddr( device, "vkTrimCommandPool" ) );
+      vkGetDeviceQueue2                   = PFN_vkGetDeviceQueue2( vkGetDeviceProcAddr( device, "vkGetDeviceQueue2" ) );
+      vkCreateSamplerYcbcrConversion      = PFN_vkCreateSamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversion" ) );
+      vkDestroySamplerYcbcrConversion     = PFN_vkDestroySamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversion" ) );
+      vkCreateDescriptorUpdateTemplate    = PFN_vkCreateDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplate" ) );
+      vkDestroyDescriptorUpdateTemplate   = PFN_vkDestroyDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplate" ) );
+      vkUpdateDescriptorSetWithTemplate   = PFN_vkUpdateDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplate" ) );
+      vkGetDescriptorSetLayoutSupport     = PFN_vkGetDescriptorSetLayoutSupport( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupport" ) );
+
+      //=== VK_VERSION_1_2 ===
+      vkCmdDrawIndirectCount          = PFN_vkCmdDrawIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCount" ) );
+      vkCmdDrawIndexedIndirectCount   = PFN_vkCmdDrawIndexedIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCount" ) );
+      vkCreateRenderPass2             = PFN_vkCreateRenderPass2( vkGetDeviceProcAddr( device, "vkCreateRenderPass2" ) );
+      vkCmdBeginRenderPass2           = PFN_vkCmdBeginRenderPass2( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2" ) );
+      vkCmdNextSubpass2               = PFN_vkCmdNextSubpass2( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2" ) );
+      vkCmdEndRenderPass2             = PFN_vkCmdEndRenderPass2( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2" ) );
+      vkResetQueryPool                = PFN_vkResetQueryPool( vkGetDeviceProcAddr( device, "vkResetQueryPool" ) );
+      vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValue" ) );
+      vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetDeviceProcAddr( device, "vkWaitSemaphores" ) );
+      vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetDeviceProcAddr( device, "vkSignalSemaphore" ) );
+      vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddress" ) );
+      vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddress" ) );
+      vkGetDeviceMemoryOpaqueCaptureAddress =
+        PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
+
+      //=== VK_VERSION_1_3 ===
+      vkCreatePrivateDataSlot             = PFN_vkCreatePrivateDataSlot( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlot" ) );
+      vkDestroyPrivateDataSlot            = PFN_vkDestroyPrivateDataSlot( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlot" ) );
+      vkSetPrivateData                    = PFN_vkSetPrivateData( vkGetDeviceProcAddr( device, "vkSetPrivateData" ) );
+      vkGetPrivateData                    = PFN_vkGetPrivateData( vkGetDeviceProcAddr( device, "vkGetPrivateData" ) );
+      vkCmdSetEvent2                      = PFN_vkCmdSetEvent2( vkGetDeviceProcAddr( device, "vkCmdSetEvent2" ) );
+      vkCmdResetEvent2                    = PFN_vkCmdResetEvent2( vkGetDeviceProcAddr( device, "vkCmdResetEvent2" ) );
+      vkCmdWaitEvents2                    = PFN_vkCmdWaitEvents2( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2" ) );
+      vkCmdPipelineBarrier2               = PFN_vkCmdPipelineBarrier2( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2" ) );
+      vkCmdWriteTimestamp2                = PFN_vkCmdWriteTimestamp2( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2" ) );
+      vkQueueSubmit2                      = PFN_vkQueueSubmit2( vkGetDeviceProcAddr( device, "vkQueueSubmit2" ) );
+      vkCmdCopyBuffer2                    = PFN_vkCmdCopyBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2" ) );
+      vkCmdCopyImage2                     = PFN_vkCmdCopyImage2( vkGetDeviceProcAddr( device, "vkCmdCopyImage2" ) );
+      vkCmdCopyBufferToImage2             = PFN_vkCmdCopyBufferToImage2( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2" ) );
+      vkCmdCopyImageToBuffer2             = PFN_vkCmdCopyImageToBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2" ) );
+      vkCmdBlitImage2                     = PFN_vkCmdBlitImage2( vkGetDeviceProcAddr( device, "vkCmdBlitImage2" ) );
+      vkCmdResolveImage2                  = PFN_vkCmdResolveImage2( vkGetDeviceProcAddr( device, "vkCmdResolveImage2" ) );
+      vkCmdBeginRendering                 = PFN_vkCmdBeginRendering( vkGetDeviceProcAddr( device, "vkCmdBeginRendering" ) );
+      vkCmdEndRendering                   = PFN_vkCmdEndRendering( vkGetDeviceProcAddr( device, "vkCmdEndRendering" ) );
+      vkCmdSetCullMode                    = PFN_vkCmdSetCullMode( vkGetDeviceProcAddr( device, "vkCmdSetCullMode" ) );
+      vkCmdSetFrontFace                   = PFN_vkCmdSetFrontFace( vkGetDeviceProcAddr( device, "vkCmdSetFrontFace" ) );
+      vkCmdSetPrimitiveTopology           = PFN_vkCmdSetPrimitiveTopology( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopology" ) );
+      vkCmdSetViewportWithCount           = PFN_vkCmdSetViewportWithCount( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCount" ) );
+      vkCmdSetScissorWithCount            = PFN_vkCmdSetScissorWithCount( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCount" ) );
+      vkCmdBindVertexBuffers2             = PFN_vkCmdBindVertexBuffers2( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2" ) );
+      vkCmdSetDepthTestEnable             = PFN_vkCmdSetDepthTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnable" ) );
+      vkCmdSetDepthWriteEnable            = PFN_vkCmdSetDepthWriteEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnable" ) );
+      vkCmdSetDepthCompareOp              = PFN_vkCmdSetDepthCompareOp( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOp" ) );
+      vkCmdSetDepthBoundsTestEnable       = PFN_vkCmdSetDepthBoundsTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnable" ) );
+      vkCmdSetStencilTestEnable           = PFN_vkCmdSetStencilTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnable" ) );
+      vkCmdSetStencilOp                   = PFN_vkCmdSetStencilOp( vkGetDeviceProcAddr( device, "vkCmdSetStencilOp" ) );
+      vkCmdSetRasterizerDiscardEnable     = PFN_vkCmdSetRasterizerDiscardEnable( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnable" ) );
+      vkCmdSetDepthBiasEnable             = PFN_vkCmdSetDepthBiasEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnable" ) );
+      vkCmdSetPrimitiveRestartEnable      = PFN_vkCmdSetPrimitiveRestartEnable( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnable" ) );
+      vkGetDeviceBufferMemoryRequirements = PFN_vkGetDeviceBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirements" ) );
+      vkGetDeviceImageMemoryRequirements  = PFN_vkGetDeviceImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirements" ) );
+      vkGetDeviceImageSparseMemoryRequirements =
+        PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirements" ) );
+
+      //=== VK_KHR_swapchain ===
+      vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetDeviceProcAddr( device, "vkCreateSwapchainKHR" ) );
+      vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetDeviceProcAddr( device, "vkDestroySwapchainKHR" ) );
+      vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainImagesKHR" ) );
+      vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetDeviceProcAddr( device, "vkAcquireNextImageKHR" ) );
+      vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetDeviceProcAddr( device, "vkQueuePresentKHR" ) );
+      vkGetDeviceGroupPresentCapabilitiesKHR =
+        PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
+      vkGetDeviceGroupSurfacePresentModesKHR =
+        PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
+      vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetDeviceProcAddr( device, "vkAcquireNextImage2KHR" ) );
+
+      //=== VK_KHR_display_swapchain ===
+      vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetDeviceProcAddr( device, "vkCreateSharedSwapchainsKHR" ) );
+
+      //=== VK_EXT_debug_marker ===
+      vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectTagEXT" ) );
+      vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectNameEXT" ) );
+      vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerBeginEXT" ) );
+      vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerEndEXT" ) );
+      vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerInsertEXT" ) );
+
+      //=== VK_KHR_video_queue ===
+      vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionKHR" ) );
+      vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionKHR" ) );
+      vkGetVideoSessionMemoryRequirementsKHR =
+        PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetVideoSessionMemoryRequirementsKHR" ) );
+      vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetDeviceProcAddr( device, "vkBindVideoSessionMemoryKHR" ) );
+      vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionParametersKHR" ) );
+      vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkUpdateVideoSessionParametersKHR" ) );
+      vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionParametersKHR" ) );
+      vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginVideoCodingKHR" ) );
+      vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdEndVideoCodingKHR" ) );
+      vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdControlVideoCodingKHR" ) );
+
+      //=== VK_KHR_video_decode_queue ===
+      vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdDecodeVideoKHR" ) );
+
+      //=== VK_EXT_transform_feedback ===
+      vkCmdBindTransformFeedbackBuffersEXT = PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindTransformFeedbackBuffersEXT" ) );
+      vkCmdBeginTransformFeedbackEXT       = PFN_vkCmdBeginTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdBeginTransformFeedbackEXT" ) );
+      vkCmdEndTransformFeedbackEXT         = PFN_vkCmdEndTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdEndTransformFeedbackEXT" ) );
+      vkCmdBeginQueryIndexedEXT            = PFN_vkCmdBeginQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdBeginQueryIndexedEXT" ) );
+      vkCmdEndQueryIndexedEXT              = PFN_vkCmdEndQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdEndQueryIndexedEXT" ) );
+      vkCmdDrawIndirectByteCountEXT        = PFN_vkCmdDrawIndirectByteCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectByteCountEXT" ) );
+
+      //=== VK_NVX_binary_import ===
+      vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetDeviceProcAddr( device, "vkCreateCuModuleNVX" ) );
+      vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetDeviceProcAddr( device, "vkCreateCuFunctionNVX" ) );
+      vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetDeviceProcAddr( device, "vkDestroyCuModuleNVX" ) );
+      vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetDeviceProcAddr( device, "vkDestroyCuFunctionNVX" ) );
+      vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetDeviceProcAddr( device, "vkCmdCuLaunchKernelNVX" ) );
+
+      //=== VK_NVX_image_view_handle ===
+      vkGetImageViewHandleNVX  = PFN_vkGetImageViewHandleNVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandleNVX" ) );
+      vkGetImageViewAddressNVX = PFN_vkGetImageViewAddressNVX( vkGetDeviceProcAddr( device, "vkGetImageViewAddressNVX" ) );
+
+      //=== VK_AMD_draw_indirect_count ===
+      vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountAMD" ) );
+      if ( !vkCmdDrawIndirectCount )
+        vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
+      vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountAMD" ) );
+      if ( !vkCmdDrawIndexedIndirectCount )
+        vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
+
+      //=== VK_AMD_shader_info ===
+      vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetDeviceProcAddr( device, "vkGetShaderInfoAMD" ) );
+
+      //=== VK_KHR_dynamic_rendering ===
+      vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderingKHR" ) );
+      if ( !vkCmdBeginRendering )
+        vkCmdBeginRendering = vkCmdBeginRenderingKHR;
+      vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderingKHR" ) );
+      if ( !vkCmdEndRendering )
+        vkCmdEndRendering = vkCmdEndRenderingKHR;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_NV_external_memory_win32 ===
+      vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleNV" ) );
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_device_group ===
+      vkGetDeviceGroupPeerMemoryFeaturesKHR =
+        PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
+      if ( !vkGetDeviceGroupPeerMemoryFeatures )
+        vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
+      vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMaskKHR" ) );
+      if ( !vkCmdSetDeviceMask )
+        vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
+      vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetDeviceProcAddr( device, "vkCmdDispatchBaseKHR" ) );
+      if ( !vkCmdDispatchBase )
+        vkCmdDispatchBase = vkCmdDispatchBaseKHR;
+
+      //=== VK_KHR_maintenance1 ===
+      vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetDeviceProcAddr( device, "vkTrimCommandPoolKHR" ) );
+      if ( !vkTrimCommandPool )
+        vkTrimCommandPool = vkTrimCommandPoolKHR;
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_memory_win32 ===
+      vkGetMemoryWin32HandleKHR           = PFN_vkGetMemoryWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleKHR" ) );
+      vkGetMemoryWin32HandlePropertiesKHR = PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandlePropertiesKHR" ) );
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_memory_fd ===
+      vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdKHR" ) );
+      vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdPropertiesKHR" ) );
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_semaphore_win32 ===
+      vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreWin32HandleKHR" ) );
+      vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreWin32HandleKHR" ) );
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_semaphore_fd ===
+      vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreFdKHR" ) );
+      vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreFdKHR" ) );
+
+      //=== VK_KHR_push_descriptor ===
+      vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetKHR" ) );
+      vkCmdPushDescriptorSetWithTemplateKHR =
+        PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
+
+      //=== VK_EXT_conditional_rendering ===
+      vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdBeginConditionalRenderingEXT" ) );
+      vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdEndConditionalRenderingEXT" ) );
+
+      //=== VK_KHR_descriptor_update_template ===
+      vkCreateDescriptorUpdateTemplateKHR = PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplateKHR" ) );
+      if ( !vkCreateDescriptorUpdateTemplate )
+        vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
+      vkDestroyDescriptorUpdateTemplateKHR = PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplateKHR" ) );
+      if ( !vkDestroyDescriptorUpdateTemplate )
+        vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
+      vkUpdateDescriptorSetWithTemplateKHR = PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplateKHR" ) );
+      if ( !vkUpdateDescriptorSetWithTemplate )
+        vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
+
+      //=== VK_NV_clip_space_w_scaling ===
+      vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingNV" ) );
+
+      //=== VK_EXT_display_control ===
+      vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetDeviceProcAddr( device, "vkDisplayPowerControlEXT" ) );
+      vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDeviceEventEXT" ) );
+      vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDisplayEventEXT" ) );
+      vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainCounterEXT" ) );
+
+      //=== VK_GOOGLE_display_timing ===
+      vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetDeviceProcAddr( device, "vkGetRefreshCycleDurationGOOGLE" ) );
+      vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingGOOGLE" ) );
+
+      //=== VK_EXT_discard_rectangles ===
+      vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEXT" ) );
+      vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEnableEXT" ) );
+      vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleModeEXT" ) );
+
+      //=== VK_EXT_hdr_metadata ===
+      vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetDeviceProcAddr( device, "vkSetHdrMetadataEXT" ) );
+
+      //=== VK_KHR_create_renderpass2 ===
+      vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCreateRenderPass2KHR" ) );
+      if ( !vkCreateRenderPass2 )
+        vkCreateRenderPass2 = vkCreateRenderPass2KHR;
+      vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2KHR" ) );
+      if ( !vkCmdBeginRenderPass2 )
+        vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
+      vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2KHR" ) );
+      if ( !vkCmdNextSubpass2 )
+        vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
+      vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2KHR" ) );
+      if ( !vkCmdEndRenderPass2 )
+        vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
+
+      //=== VK_KHR_shared_presentable_image ===
+      vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainStatusKHR" ) );
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_fence_win32 ===
+      vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportFenceWin32HandleKHR" ) );
+      vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetFenceWin32HandleKHR" ) );
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_fence_fd ===
+      vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetDeviceProcAddr( device, "vkImportFenceFdKHR" ) );
+      vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetDeviceProcAddr( device, "vkGetFenceFdKHR" ) );
+
+      //=== VK_KHR_performance_query ===
+      vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetDeviceProcAddr( device, "vkAcquireProfilingLockKHR" ) );
+      vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetDeviceProcAddr( device, "vkReleaseProfilingLockKHR" ) );
+
+      //=== VK_EXT_debug_utils ===
+      vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectNameEXT" ) );
+      vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectTagEXT" ) );
+      vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueBeginDebugUtilsLabelEXT" ) );
+      vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueEndDebugUtilsLabelEXT" ) );
+      vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueInsertDebugUtilsLabelEXT" ) );
+      vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdBeginDebugUtilsLabelEXT" ) );
+      vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdEndDebugUtilsLabelEXT" ) );
+      vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdInsertDebugUtilsLabelEXT" ) );
+
+#if defined( VK_USE_PLATFORM_ANDROID_KHR )
+      //=== VK_ANDROID_external_memory_android_hardware_buffer ===
+      vkGetAndroidHardwareBufferPropertiesANDROID =
+        PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetDeviceProcAddr( device, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
+      vkGetMemoryAndroidHardwareBufferANDROID =
+        PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetDeviceProcAddr( device, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
+#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
+
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      //=== VK_AMDX_shader_enqueue ===
+      vkCreateExecutionGraphPipelinesAMDX = PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetDeviceProcAddr( device, "vkCreateExecutionGraphPipelinesAMDX" ) );
+      vkGetExecutionGraphPipelineScratchSizeAMDX =
+        PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
+      vkGetExecutionGraphPipelineNodeIndexAMDX =
+        PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
+      vkCmdInitializeGraphScratchMemoryAMDX =
+        PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetDeviceProcAddr( device, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
+      vkCmdDispatchGraphAMDX              = PFN_vkCmdDispatchGraphAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphAMDX" ) );
+      vkCmdDispatchGraphIndirectAMDX      = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectAMDX" ) );
+      vkCmdDispatchGraphIndirectCountAMDX = PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectCountAMDX" ) );
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+      //=== VK_EXT_sample_locations ===
+      vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEXT" ) );
+
+      //=== VK_KHR_get_memory_requirements2 ===
+      vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2KHR" ) );
+      if ( !vkGetImageMemoryRequirements2 )
+        vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
+      vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2KHR" ) );
+      if ( !vkGetBufferMemoryRequirements2 )
+        vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
+      vkGetImageSparseMemoryRequirements2KHR =
+        PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2KHR" ) );
+      if ( !vkGetImageSparseMemoryRequirements2 )
+        vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
+
+      //=== VK_KHR_acceleration_structure ===
+      vkCreateAccelerationStructureKHR    = PFN_vkCreateAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureKHR" ) );
+      vkDestroyAccelerationStructureKHR   = PFN_vkDestroyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureKHR" ) );
+      vkCmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresKHR" ) );
+      vkCmdBuildAccelerationStructuresIndirectKHR =
+        PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
+      vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkBuildAccelerationStructuresKHR" ) );
+      vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureKHR" ) );
+      vkCopyAccelerationStructureToMemoryKHR =
+        PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureToMemoryKHR" ) );
+      vkCopyMemoryToAccelerationStructureKHR =
+        PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyMemoryToAccelerationStructureKHR" ) );
+      vkWriteAccelerationStructuresPropertiesKHR =
+        PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkWriteAccelerationStructuresPropertiesKHR" ) );
+      vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureKHR" ) );
+      vkCmdCopyAccelerationStructureToMemoryKHR =
+        PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
+      vkCmdCopyMemoryToAccelerationStructureKHR =
+        PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
+      vkGetAccelerationStructureDeviceAddressKHR =
+        PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureDeviceAddressKHR" ) );
+      vkCmdWriteAccelerationStructuresPropertiesKHR =
+        PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
+      vkGetDeviceAccelerationStructureCompatibilityKHR =
+        PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetDeviceProcAddr( device, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
+      vkGetAccelerationStructureBuildSizesKHR =
+        PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureBuildSizesKHR" ) );
+
+      //=== VK_KHR_ray_tracing_pipeline ===
+      vkCmdTraceRaysKHR                    = PFN_vkCmdTraceRaysKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysKHR" ) );
+      vkCreateRayTracingPipelinesKHR       = PFN_vkCreateRayTracingPipelinesKHR( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesKHR" ) );
+      vkGetRayTracingShaderGroupHandlesKHR = PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesKHR" ) );
+      vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
+        PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
+      vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirectKHR" ) );
+      vkGetRayTracingShaderGroupStackSizeKHR =
+        PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
+      vkCmdSetRayTracingPipelineStackSizeKHR =
+        PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetDeviceProcAddr( device, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
+
+      //=== VK_KHR_sampler_ycbcr_conversion ===
+      vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversionKHR" ) );
+      if ( !vkCreateSamplerYcbcrConversion )
+        vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
+      vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversionKHR" ) );
+      if ( !vkDestroySamplerYcbcrConversion )
+        vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
+
+      //=== VK_KHR_bind_memory2 ===
+      vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetDeviceProcAddr( device, "vkBindBufferMemory2KHR" ) );
+      if ( !vkBindBufferMemory2 )
+        vkBindBufferMemory2 = vkBindBufferMemory2KHR;
+      vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetDeviceProcAddr( device, "vkBindImageMemory2KHR" ) );
+      if ( !vkBindImageMemory2 )
+        vkBindImageMemory2 = vkBindImageMemory2KHR;
+
+      //=== VK_EXT_image_drm_format_modifier ===
+      vkGetImageDrmFormatModifierPropertiesEXT =
+        PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
+
+      //=== VK_EXT_validation_cache ===
+      vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetDeviceProcAddr( device, "vkCreateValidationCacheEXT" ) );
+      vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetDeviceProcAddr( device, "vkDestroyValidationCacheEXT" ) );
+      vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetDeviceProcAddr( device, "vkMergeValidationCachesEXT" ) );
+      vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetDeviceProcAddr( device, "vkGetValidationCacheDataEXT" ) );
+
+      //=== VK_NV_shading_rate_image ===
+      vkCmdBindShadingRateImageNV          = PFN_vkCmdBindShadingRateImageNV( vkGetDeviceProcAddr( device, "vkCmdBindShadingRateImageNV" ) );
+      vkCmdSetViewportShadingRatePaletteNV = PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportShadingRatePaletteNV" ) );
+      vkCmdSetCoarseSampleOrderNV          = PFN_vkCmdSetCoarseSampleOrderNV( vkGetDeviceProcAddr( device, "vkCmdSetCoarseSampleOrderNV" ) );
+
+      //=== VK_NV_ray_tracing ===
+      vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureNV" ) );
+      vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureNV" ) );
+      vkGetAccelerationStructureMemoryRequirementsNV =
+        PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
+      vkBindAccelerationStructureMemoryNV = PFN_vkBindAccelerationStructureMemoryNV( vkGetDeviceProcAddr( device, "vkBindAccelerationStructureMemoryNV" ) );
+      vkCmdBuildAccelerationStructureNV   = PFN_vkCmdBuildAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructureNV" ) );
+      vkCmdCopyAccelerationStructureNV    = PFN_vkCmdCopyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureNV" ) );
+      vkCmdTraceRaysNV                    = PFN_vkCmdTraceRaysNV( vkGetDeviceProcAddr( device, "vkCmdTraceRaysNV" ) );
+      vkCreateRayTracingPipelinesNV       = PFN_vkCreateRayTracingPipelinesNV( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesNV" ) );
+      vkGetRayTracingShaderGroupHandlesNV = PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesNV" ) );
+      if ( !vkGetRayTracingShaderGroupHandlesKHR )
+        vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
+      vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureHandleNV" ) );
+      vkCmdWriteAccelerationStructuresPropertiesNV =
+        PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
+      vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetDeviceProcAddr( device, "vkCompileDeferredNV" ) );
+
+      //=== VK_KHR_maintenance3 ===
+      vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupportKHR" ) );
+      if ( !vkGetDescriptorSetLayoutSupport )
+        vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
+
+      //=== VK_KHR_draw_indirect_count ===
+      vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountKHR" ) );
+      if ( !vkCmdDrawIndirectCount )
+        vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
+      vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountKHR" ) );
+      if ( !vkCmdDrawIndexedIndirectCount )
+        vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
+
+      //=== VK_EXT_external_memory_host ===
+      vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryHostPointerPropertiesEXT" ) );
+
+      //=== VK_AMD_buffer_marker ===
+      vkCmdWriteBufferMarkerAMD = PFN_vkCmdWriteBufferMarkerAMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarkerAMD" ) );
+
+      //=== VK_EXT_calibrated_timestamps ===
+      vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsEXT" ) );
+      if ( !vkGetCalibratedTimestampsKHR )
+        vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
+
+      //=== VK_NV_mesh_shader ===
+      vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksNV" ) );
+      vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectNV" ) );
+      vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountNV" ) );
+
+      //=== VK_NV_scissor_exclusive ===
+      vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorEnableNV" ) );
+      vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorNV" ) );
+
+      //=== VK_NV_device_diagnostic_checkpoints ===
+      vkCmdSetCheckpointNV       = PFN_vkCmdSetCheckpointNV( vkGetDeviceProcAddr( device, "vkCmdSetCheckpointNV" ) );
+      vkGetQueueCheckpointDataNV = PFN_vkGetQueueCheckpointDataNV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointDataNV" ) );
+
+      //=== VK_KHR_timeline_semaphore ===
+      vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValueKHR" ) );
+      if ( !vkGetSemaphoreCounterValue )
+        vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
+      vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetDeviceProcAddr( device, "vkWaitSemaphoresKHR" ) );
+      if ( !vkWaitSemaphores )
+        vkWaitSemaphores = vkWaitSemaphoresKHR;
+      vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetDeviceProcAddr( device, "vkSignalSemaphoreKHR" ) );
+      if ( !vkSignalSemaphore )
+        vkSignalSemaphore = vkSignalSemaphoreKHR;
+
+      //=== VK_INTEL_performance_query ===
+      vkInitializePerformanceApiINTEL      = PFN_vkInitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkInitializePerformanceApiINTEL" ) );
+      vkUninitializePerformanceApiINTEL    = PFN_vkUninitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkUninitializePerformanceApiINTEL" ) );
+      vkCmdSetPerformanceMarkerINTEL       = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceMarkerINTEL" ) );
+      vkCmdSetPerformanceStreamMarkerINTEL = PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
+      vkCmdSetPerformanceOverrideINTEL     = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceOverrideINTEL" ) );
+      vkAcquirePerformanceConfigurationINTEL =
+        PFN_vkAcquirePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkAcquirePerformanceConfigurationINTEL" ) );
+      vkReleasePerformanceConfigurationINTEL =
+        PFN_vkReleasePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkReleasePerformanceConfigurationINTEL" ) );
+      vkQueueSetPerformanceConfigurationINTEL =
+        PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkQueueSetPerformanceConfigurationINTEL" ) );
+      vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetDeviceProcAddr( device, "vkGetPerformanceParameterINTEL" ) );
+
+      //=== VK_AMD_display_native_hdr ===
+      vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetDeviceProcAddr( device, "vkSetLocalDimmingAMD" ) );
+
+      //=== VK_KHR_fragment_shading_rate ===
+      vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateKHR" ) );
+
+      //=== VK_KHR_dynamic_rendering_local_read ===
+      vkCmdSetRenderingAttachmentLocationsKHR =
+        PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
+      vkCmdSetRenderingInputAttachmentIndicesKHR =
+        PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
+
+      //=== VK_EXT_buffer_device_address ===
+      vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressEXT" ) );
+      if ( !vkGetBufferDeviceAddress )
+        vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
+
+      //=== VK_KHR_present_wait ===
+      vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetDeviceProcAddr( device, "vkWaitForPresentKHR" ) );
+
+#if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_EXT_full_screen_exclusive ===
+      vkAcquireFullScreenExclusiveModeEXT = PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkAcquireFullScreenExclusiveModeEXT" ) );
+      vkReleaseFullScreenExclusiveModeEXT = PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkReleaseFullScreenExclusiveModeEXT" ) );
+      vkGetDeviceGroupSurfacePresentModes2EXT =
+        PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
+#endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_buffer_device_address ===
+      vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressKHR" ) );
+      if ( !vkGetBufferDeviceAddress )
+        vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
+      vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddressKHR" ) );
+      if ( !vkGetBufferOpaqueCaptureAddress )
+        vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
+      vkGetDeviceMemoryOpaqueCaptureAddressKHR =
+        PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
+      if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
+        vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
+
+      //=== VK_EXT_line_rasterization ===
+      vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEXT" ) );
+      if ( !vkCmdSetLineStippleKHR )
+        vkCmdSetLineStippleKHR = vkCmdSetLineStippleEXT;
+
+      //=== VK_EXT_host_query_reset ===
+      vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetDeviceProcAddr( device, "vkResetQueryPoolEXT" ) );
+      if ( !vkResetQueryPool )
+        vkResetQueryPool = vkResetQueryPoolEXT;
+
+      //=== VK_EXT_extended_dynamic_state ===
+      vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetCullModeEXT" ) );
+      if ( !vkCmdSetCullMode )
+        vkCmdSetCullMode = vkCmdSetCullModeEXT;
+      vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetDeviceProcAddr( device, "vkCmdSetFrontFaceEXT" ) );
+      if ( !vkCmdSetFrontFace )
+        vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
+      vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopologyEXT" ) );
+      if ( !vkCmdSetPrimitiveTopology )
+        vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
+      vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCountEXT" ) );
+      if ( !vkCmdSetViewportWithCount )
+        vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
+      vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCountEXT" ) );
+      if ( !vkCmdSetScissorWithCount )
+        vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
+      vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2EXT" ) );
+      if ( !vkCmdBindVertexBuffers2 )
+        vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
+      vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnableEXT" ) );
+      if ( !vkCmdSetDepthTestEnable )
+        vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
+      vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnableEXT" ) );
+      if ( !vkCmdSetDepthWriteEnable )
+        vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
+      vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOpEXT" ) );
+      if ( !vkCmdSetDepthCompareOp )
+        vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
+      vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnableEXT" ) );
+      if ( !vkCmdSetDepthBoundsTestEnable )
+        vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
+      vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnableEXT" ) );
+      if ( !vkCmdSetStencilTestEnable )
+        vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
+      vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilOpEXT" ) );
+      if ( !vkCmdSetStencilOp )
+        vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
+
+      //=== VK_KHR_deferred_host_operations ===
+      vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkCreateDeferredOperationKHR" ) );
+      vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkDestroyDeferredOperationKHR" ) );
+      vkGetDeferredOperationMaxConcurrencyKHR =
+        PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
+      vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationResultKHR" ) );
+      vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetDeviceProcAddr( device, "vkDeferredOperationJoinKHR" ) );
+
+      //=== VK_KHR_pipeline_executable_properties ===
+      vkGetPipelineExecutablePropertiesKHR = PFN_vkGetPipelineExecutablePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutablePropertiesKHR" ) );
+      vkGetPipelineExecutableStatisticsKHR = PFN_vkGetPipelineExecutableStatisticsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableStatisticsKHR" ) );
+      vkGetPipelineExecutableInternalRepresentationsKHR =
+        PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
+
+      //=== VK_EXT_host_image_copy ===
+      vkCopyMemoryToImageEXT          = PFN_vkCopyMemoryToImageEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToImageEXT" ) );
+      vkCopyImageToMemoryEXT          = PFN_vkCopyImageToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyImageToMemoryEXT" ) );
+      vkCopyImageToImageEXT           = PFN_vkCopyImageToImageEXT( vkGetDeviceProcAddr( device, "vkCopyImageToImageEXT" ) );
+      vkTransitionImageLayoutEXT      = PFN_vkTransitionImageLayoutEXT( vkGetDeviceProcAddr( device, "vkTransitionImageLayoutEXT" ) );
+      vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2EXT" ) );
+      if ( !vkGetImageSubresourceLayout2KHR )
+        vkGetImageSubresourceLayout2KHR = vkGetImageSubresourceLayout2EXT;
+
+      //=== VK_KHR_map_memory2 ===
+      vkMapMemory2KHR   = PFN_vkMapMemory2KHR( vkGetDeviceProcAddr( device, "vkMapMemory2KHR" ) );
+      vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetDeviceProcAddr( device, "vkUnmapMemory2KHR" ) );
+
+      //=== VK_EXT_swapchain_maintenance1 ===
+      vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesEXT" ) );
+
+      //=== VK_NV_device_generated_commands ===
+      vkGetGeneratedCommandsMemoryRequirementsNV =
+        PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
+      vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsNV" ) );
+      vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsNV" ) );
+      vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetDeviceProcAddr( device, "vkCmdBindPipelineShaderGroupNV" ) );
+      vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutNV" ) );
+      vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutNV" ) );
+
+      //=== VK_EXT_depth_bias_control ===
+      vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias2EXT" ) );
+
+      //=== VK_EXT_private_data ===
+      vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlotEXT" ) );
+      if ( !vkCreatePrivateDataSlot )
+        vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
+      vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlotEXT" ) );
+      if ( !vkDestroyPrivateDataSlot )
+        vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
+      vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkSetPrivateDataEXT" ) );
+      if ( !vkSetPrivateData )
+        vkSetPrivateData = vkSetPrivateDataEXT;
+      vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkGetPrivateDataEXT" ) );
+      if ( !vkGetPrivateData )
+        vkGetPrivateData = vkGetPrivateDataEXT;
+
+      //=== VK_KHR_video_encode_queue ===
+      vkGetEncodedVideoSessionParametersKHR =
+        PFN_vkGetEncodedVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkGetEncodedVideoSessionParametersKHR" ) );
+      vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdEncodeVideoKHR" ) );
+
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      //=== VK_NV_cuda_kernel_launch ===
+      vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetDeviceProcAddr( device, "vkCreateCudaModuleNV" ) );
+      vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetDeviceProcAddr( device, "vkGetCudaModuleCacheNV" ) );
+      vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetDeviceProcAddr( device, "vkCreateCudaFunctionNV" ) );
+      vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetDeviceProcAddr( device, "vkDestroyCudaModuleNV" ) );
+      vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetDeviceProcAddr( device, "vkDestroyCudaFunctionNV" ) );
+      vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetDeviceProcAddr( device, "vkCmdCudaLaunchKernelNV" ) );
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+#if defined( VK_USE_PLATFORM_METAL_EXT )
+      //=== VK_EXT_metal_objects ===
+      vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetDeviceProcAddr( device, "vkExportMetalObjectsEXT" ) );
+#endif /*VK_USE_PLATFORM_METAL_EXT*/
+
+      //=== VK_KHR_synchronization2 ===
+      vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdSetEvent2KHR" ) );
+      if ( !vkCmdSetEvent2 )
+        vkCmdSetEvent2 = vkCmdSetEvent2KHR;
+      vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdResetEvent2KHR" ) );
+      if ( !vkCmdResetEvent2 )
+        vkCmdResetEvent2 = vkCmdResetEvent2KHR;
+      vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2KHR" ) );
+      if ( !vkCmdWaitEvents2 )
+        vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
+      vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2KHR" ) );
+      if ( !vkCmdPipelineBarrier2 )
+        vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
+      vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2KHR" ) );
+      if ( !vkCmdWriteTimestamp2 )
+        vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
+      vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetDeviceProcAddr( device, "vkQueueSubmit2KHR" ) );
+      if ( !vkQueueSubmit2 )
+        vkQueueSubmit2 = vkQueueSubmit2KHR;
+      vkCmdWriteBufferMarker2AMD  = PFN_vkCmdWriteBufferMarker2AMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarker2AMD" ) );
+      vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointData2NV" ) );
+
+      //=== VK_EXT_descriptor_buffer ===
+      vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSizeEXT" ) );
+      vkGetDescriptorSetLayoutBindingOffsetEXT =
+        PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
+      vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorEXT" ) );
+      vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBuffersEXT" ) );
+      vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
+      vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
+        PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
+      vkGetBufferOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetImageOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetImageViewOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetSamplerOpaqueCaptureDescriptorDataEXT =
+        PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
+      vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+        vkGetDeviceProcAddr( device, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
+
+      //=== VK_NV_fragment_shading_rate_enums ===
+      vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateEnumNV" ) );
+
+      //=== VK_EXT_mesh_shader ===
+      vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksEXT" ) );
+      vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectEXT" ) );
+      vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
+
+      //=== VK_KHR_copy_commands2 ===
+      vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2KHR" ) );
+      if ( !vkCmdCopyBuffer2 )
+        vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
+      vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImage2KHR" ) );
+      if ( !vkCmdCopyImage2 )
+        vkCmdCopyImage2 = vkCmdCopyImage2KHR;
+      vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2KHR" ) );
+      if ( !vkCmdCopyBufferToImage2 )
+        vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
+      vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2KHR" ) );
+      if ( !vkCmdCopyImageToBuffer2 )
+        vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
+      vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetDeviceProcAddr( device, "vkCmdBlitImage2KHR" ) );
+      if ( !vkCmdBlitImage2 )
+        vkCmdBlitImage2 = vkCmdBlitImage2KHR;
+      vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetDeviceProcAddr( device, "vkCmdResolveImage2KHR" ) );
+      if ( !vkCmdResolveImage2 )
+        vkCmdResolveImage2 = vkCmdResolveImage2KHR;
+
+      //=== VK_EXT_device_fault ===
+      vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetDeviceProcAddr( device, "vkGetDeviceFaultInfoEXT" ) );
+
+      //=== VK_EXT_vertex_input_dynamic_state ===
+      vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetDeviceProcAddr( device, "vkCmdSetVertexInputEXT" ) );
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_external_memory ===
+      vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandleFUCHSIA" ) );
+      vkGetMemoryZirconHandlePropertiesFUCHSIA =
+        PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_external_semaphore ===
+      vkImportSemaphoreZirconHandleFUCHSIA = PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
+      vkGetSemaphoreZirconHandleFUCHSIA    = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_buffer_collection ===
+      vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkCreateBufferCollectionFUCHSIA" ) );
+      vkSetBufferCollectionImageConstraintsFUCHSIA =
+        PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
+      vkSetBufferCollectionBufferConstraintsFUCHSIA =
+        PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
+      vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkDestroyBufferCollectionFUCHSIA" ) );
+      vkGetBufferCollectionPropertiesFUCHSIA =
+        PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+      //=== VK_HUAWEI_subpass_shading ===
+      vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
+        PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetDeviceProcAddr( device, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
+      vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetDeviceProcAddr( device, "vkCmdSubpassShadingHUAWEI" ) );
+
+      //=== VK_HUAWEI_invocation_mask ===
+      vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetDeviceProcAddr( device, "vkCmdBindInvocationMaskHUAWEI" ) );
+
+      //=== VK_NV_external_memory_rdma ===
+      vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetDeviceProcAddr( device, "vkGetMemoryRemoteAddressNV" ) );
+
+      //=== VK_EXT_pipeline_properties ===
+      vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetPipelinePropertiesEXT" ) );
+
+      //=== VK_EXT_extended_dynamic_state2 ===
+      vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetDeviceProcAddr( device, "vkCmdSetPatchControlPointsEXT" ) );
+      vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnableEXT" ) );
+      if ( !vkCmdSetRasterizerDiscardEnable )
+        vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
+      vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnableEXT" ) );
+      if ( !vkCmdSetDepthBiasEnable )
+        vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
+      vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEXT" ) );
+      vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnableEXT" ) );
+      if ( !vkCmdSetPrimitiveRestartEnable )
+        vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
+
+      //=== VK_EXT_color_write_enable ===
+      vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteEnableEXT" ) );
+
+      //=== VK_KHR_ray_tracing_maintenance1 ===
+      vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirect2KHR" ) );
+
+      //=== VK_EXT_multi_draw ===
+      vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiEXT" ) );
+      vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiIndexedEXT" ) );
+
+      //=== VK_EXT_opacity_micromap ===
+      vkCreateMicromapEXT                 = PFN_vkCreateMicromapEXT( vkGetDeviceProcAddr( device, "vkCreateMicromapEXT" ) );
+      vkDestroyMicromapEXT                = PFN_vkDestroyMicromapEXT( vkGetDeviceProcAddr( device, "vkDestroyMicromapEXT" ) );
+      vkCmdBuildMicromapsEXT              = PFN_vkCmdBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkCmdBuildMicromapsEXT" ) );
+      vkBuildMicromapsEXT                 = PFN_vkBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkBuildMicromapsEXT" ) );
+      vkCopyMicromapEXT                   = PFN_vkCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapEXT" ) );
+      vkCopyMicromapToMemoryEXT           = PFN_vkCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapToMemoryEXT" ) );
+      vkCopyMemoryToMicromapEXT           = PFN_vkCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToMicromapEXT" ) );
+      vkWriteMicromapsPropertiesEXT       = PFN_vkWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkWriteMicromapsPropertiesEXT" ) );
+      vkCmdCopyMicromapEXT                = PFN_vkCmdCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapEXT" ) );
+      vkCmdCopyMicromapToMemoryEXT        = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapToMemoryEXT" ) );
+      vkCmdCopyMemoryToMicromapEXT        = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToMicromapEXT" ) );
+      vkCmdWriteMicromapsPropertiesEXT    = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkCmdWriteMicromapsPropertiesEXT" ) );
+      vkGetDeviceMicromapCompatibilityEXT = PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetDeviceProcAddr( device, "vkGetDeviceMicromapCompatibilityEXT" ) );
+      vkGetMicromapBuildSizesEXT          = PFN_vkGetMicromapBuildSizesEXT( vkGetDeviceProcAddr( device, "vkGetMicromapBuildSizesEXT" ) );
+
+      //=== VK_HUAWEI_cluster_culling_shader ===
+      vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterHUAWEI" ) );
+      vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterIndirectHUAWEI" ) );
+
+      //=== VK_EXT_pageable_device_local_memory ===
+      vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetDeviceProcAddr( device, "vkSetDeviceMemoryPriorityEXT" ) );
+
+      //=== VK_KHR_maintenance4 ===
+      vkGetDeviceBufferMemoryRequirementsKHR =
+        PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceBufferMemoryRequirements )
+        vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
+      vkGetDeviceImageMemoryRequirementsKHR =
+        PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceImageMemoryRequirements )
+        vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
+      vkGetDeviceImageSparseMemoryRequirementsKHR =
+        PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
+      if ( !vkGetDeviceImageSparseMemoryRequirements )
+        vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
+
+      //=== VK_VALVE_descriptor_set_host_mapping ===
+      vkGetDescriptorSetLayoutHostMappingInfoVALVE =
+        PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
+      vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetHostMappingVALVE" ) );
+
+      //=== VK_NV_copy_memory_indirect ===
+      vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectNV" ) );
+      vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectNV" ) );
+
+      //=== VK_NV_memory_decompression ===
+      vkCmdDecompressMemoryNV              = PFN_vkCmdDecompressMemoryNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryNV" ) );
+      vkCmdDecompressMemoryIndirectCountNV = PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountNV" ) );
+
+      //=== VK_NV_device_generated_commands_compute ===
+      vkGetPipelineIndirectMemoryRequirementsNV =
+        PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
+      vkCmdUpdatePipelineIndirectBufferNV  = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) );
+      vkGetPipelineIndirectDeviceAddressNV = PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) );
+
+      //=== VK_EXT_extended_dynamic_state3 ===
+      vkCmdSetDepthClampEnableEXT         = PFN_vkCmdSetDepthClampEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampEnableEXT" ) );
+      vkCmdSetPolygonModeEXT              = PFN_vkCmdSetPolygonModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetPolygonModeEXT" ) );
+      vkCmdSetRasterizationSamplesEXT     = PFN_vkCmdSetRasterizationSamplesEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationSamplesEXT" ) );
+      vkCmdSetSampleMaskEXT               = PFN_vkCmdSetSampleMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleMaskEXT" ) );
+      vkCmdSetAlphaToCoverageEnableEXT    = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToCoverageEnableEXT" ) );
+      vkCmdSetAlphaToOneEnableEXT         = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToOneEnableEXT" ) );
+      vkCmdSetLogicOpEnableEXT            = PFN_vkCmdSetLogicOpEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEnableEXT" ) );
+      vkCmdSetColorBlendEnableEXT         = PFN_vkCmdSetColorBlendEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEnableEXT" ) );
+      vkCmdSetColorBlendEquationEXT       = PFN_vkCmdSetColorBlendEquationEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEquationEXT" ) );
+      vkCmdSetColorWriteMaskEXT           = PFN_vkCmdSetColorWriteMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteMaskEXT" ) );
+      vkCmdSetTessellationDomainOriginEXT = PFN_vkCmdSetTessellationDomainOriginEXT( vkGetDeviceProcAddr( device, "vkCmdSetTessellationDomainOriginEXT" ) );
+      vkCmdSetRasterizationStreamEXT      = PFN_vkCmdSetRasterizationStreamEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationStreamEXT" ) );
+      vkCmdSetConservativeRasterizationModeEXT =
+        PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetConservativeRasterizationModeEXT" ) );
+      vkCmdSetExtraPrimitiveOverestimationSizeEXT =
+        PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetDeviceProcAddr( device, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
+      vkCmdSetDepthClipEnableEXT           = PFN_vkCmdSetDepthClipEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipEnableEXT" ) );
+      vkCmdSetSampleLocationsEnableEXT     = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEnableEXT" ) );
+      vkCmdSetColorBlendAdvancedEXT        = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendAdvancedEXT" ) );
+      vkCmdSetProvokingVertexModeEXT       = PFN_vkCmdSetProvokingVertexModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetProvokingVertexModeEXT" ) );
+      vkCmdSetLineRasterizationModeEXT     = PFN_vkCmdSetLineRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineRasterizationModeEXT" ) );
+      vkCmdSetLineStippleEnableEXT         = PFN_vkCmdSetLineStippleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEnableEXT" ) );
+      vkCmdSetDepthClipNegativeOneToOneEXT = PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
+      vkCmdSetViewportWScalingEnableNV     = PFN_vkCmdSetViewportWScalingEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingEnableNV" ) );
+      vkCmdSetViewportSwizzleNV            = PFN_vkCmdSetViewportSwizzleNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportSwizzleNV" ) );
+      vkCmdSetCoverageToColorEnableNV      = PFN_vkCmdSetCoverageToColorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorEnableNV" ) );
+      vkCmdSetCoverageToColorLocationNV    = PFN_vkCmdSetCoverageToColorLocationNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorLocationNV" ) );
+      vkCmdSetCoverageModulationModeNV     = PFN_vkCmdSetCoverageModulationModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationModeNV" ) );
+      vkCmdSetCoverageModulationTableEnableNV =
+        PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableEnableNV" ) );
+      vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableNV" ) );
+      vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetShadingRateImageEnableNV" ) );
+      vkCmdSetRepresentativeFragmentTestEnableNV =
+        PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
+      vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageReductionModeNV" ) );
+
+      //=== VK_EXT_shader_module_identifier ===
+      vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleIdentifierEXT" ) );
+      vkGetShaderModuleCreateInfoIdentifierEXT =
+        PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
+
+      //=== VK_NV_optical_flow ===
+      vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkCreateOpticalFlowSessionNV" ) );
+      vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkDestroyOpticalFlowSessionNV" ) );
+      vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetDeviceProcAddr( device, "vkBindOpticalFlowSessionImageNV" ) );
+      vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetDeviceProcAddr( device, "vkCmdOpticalFlowExecuteNV" ) );
+
+      //=== VK_KHR_maintenance5 ===
+      vkCmdBindIndexBuffer2KHR             = PFN_vkCmdBindIndexBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2KHR" ) );
+      vkGetRenderingAreaGranularityKHR     = PFN_vkGetRenderingAreaGranularityKHR( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularityKHR" ) );
+      vkGetDeviceImageSubresourceLayoutKHR = PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayoutKHR" ) );
+      vkGetImageSubresourceLayout2KHR      = PFN_vkGetImageSubresourceLayout2KHR( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2KHR" ) );
+
+      //=== VK_EXT_shader_object ===
+      vkCreateShadersEXT       = PFN_vkCreateShadersEXT( vkGetDeviceProcAddr( device, "vkCreateShadersEXT" ) );
+      vkDestroyShaderEXT       = PFN_vkDestroyShaderEXT( vkGetDeviceProcAddr( device, "vkDestroyShaderEXT" ) );
+      vkGetShaderBinaryDataEXT = PFN_vkGetShaderBinaryDataEXT( vkGetDeviceProcAddr( device, "vkGetShaderBinaryDataEXT" ) );
+      vkCmdBindShadersEXT      = PFN_vkCmdBindShadersEXT( vkGetDeviceProcAddr( device, "vkCmdBindShadersEXT" ) );
+
+      //=== VK_QCOM_tile_properties ===
+      vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetFramebufferTilePropertiesQCOM" ) );
+      vkGetDynamicRenderingTilePropertiesQCOM =
+        PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
+
+      //=== VK_NV_low_latency2 ===
+      vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetDeviceProcAddr( device, "vkSetLatencySleepModeNV" ) );
+      vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetDeviceProcAddr( device, "vkLatencySleepNV" ) );
+      vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetDeviceProcAddr( device, "vkSetLatencyMarkerNV" ) );
+      vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetDeviceProcAddr( device, "vkGetLatencyTimingsNV" ) );
+      vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetDeviceProcAddr( device, "vkQueueNotifyOutOfBandNV" ) );
+
+      //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
+      vkCmdSetAttachmentFeedbackLoopEnableEXT =
+        PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
+
+#if defined( VK_USE_PLATFORM_SCREEN_QNX )
+      //=== VK_QNX_external_memory_screen_buffer ===
+      vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetDeviceProcAddr( device, "vkGetScreenBufferPropertiesQNX" ) );
+#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+      //=== VK_KHR_line_rasterization ===
+      vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleKHR" ) );
+
+      //=== VK_KHR_calibrated_timestamps ===
+      vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsKHR" ) );
+
+      //=== VK_KHR_maintenance6 ===
+      vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2KHR" ) );
+      vkCmdPushConstants2KHR      = PFN_vkCmdPushConstants2KHR( vkGetDeviceProcAddr( device, "vkCmdPushConstants2KHR" ) );
+      vkCmdPushDescriptorSet2KHR  = PFN_vkCmdPushDescriptorSet2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2KHR" ) );
+      vkCmdPushDescriptorSetWithTemplate2KHR =
+        PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
+      vkCmdSetDescriptorBufferOffsets2EXT = PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
+      vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
+        PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
+    }
+
+    template <typename DynamicLoader>
+    void init( VULKAN_HPP_NAMESPACE::Instance const & instance, VULKAN_HPP_NAMESPACE::Device const & device, DynamicLoader const & dl ) VULKAN_HPP_NOEXCEPT
+    {
+      PFN_vkGetInstanceProcAddr getInstanceProcAddr = dl.template getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" );
+      PFN_vkGetDeviceProcAddr   getDeviceProcAddr   = dl.template getProcAddress<PFN_vkGetDeviceProcAddr>( "vkGetDeviceProcAddr" );
+      init( static_cast<VkInstance>( instance ), getInstanceProcAddr, static_cast<VkDevice>( device ), device ? getDeviceProcAddr : nullptr );
+    }
+
+    template <typename DynamicLoader
+#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
+              = VULKAN_HPP_NAMESPACE::DynamicLoader
+#endif
+              >
+    void init( VULKAN_HPP_NAMESPACE::Instance const & instance, VULKAN_HPP_NAMESPACE::Device const & device ) VULKAN_HPP_NOEXCEPT
+    {
+      static DynamicLoader dl;
+      init( instance, device, dl );
+    }
+  };
 }  // namespace VULKAN_HPP_NAMESPACE
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_android.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_android.h
index 9b1e493b..61ff40ba 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_android.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_android.h
@@ -2,7 +2,7 @@
 #define VULKAN_ANDROID_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -35,14 +35,12 @@ typedef struct VkAndroidSurfaceCreateInfoKHR {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateAndroidSurfaceKHR)(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
     VkInstance                                  instance,
     const VkAndroidSurfaceCreateInfoKHR*        pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_ANDROID_external_memory_android_hardware_buffer is a preprocessor guard. Do not pass it to API calls.
@@ -111,20 +109,16 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetAndroidHardwareBufferPropertiesANDROID)(Vk
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryAndroidHardwareBufferANDROID)(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetAndroidHardwareBufferPropertiesANDROID(
     VkDevice                                    device,
     const struct AHardwareBuffer*               buffer,
     VkAndroidHardwareBufferPropertiesANDROID*   pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryAndroidHardwareBufferANDROID(
     VkDevice                                    device,
     const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo,
     struct AHardwareBuffer**                    pBuffer);
 #endif
-#endif
 
 
 // VK_ANDROID_external_format_resolve is a preprocessor guard. Do not pass it to API calls.
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_beta.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_beta.h
index 0f48f876..df18b404 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_beta.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_beta.h
@@ -2,7 +2,7 @@
 #define VULKAN_BETA_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -53,14 +53,13 @@ typedef struct VkPhysicalDevicePortabilitySubsetPropertiesKHR {
 
 // VK_AMDX_shader_enqueue is a preprocessor guard. Do not pass it to API calls.
 #define VK_AMDX_shader_enqueue 1
-#define VK_AMDX_SHADER_ENQUEUE_SPEC_VERSION 2
+#define VK_AMDX_SHADER_ENQUEUE_SPEC_VERSION 1
 #define VK_AMDX_SHADER_ENQUEUE_EXTENSION_NAME "VK_AMDX_shader_enqueue"
 #define VK_SHADER_INDEX_UNUSED_AMDX       (~0U)
 typedef struct VkPhysicalDeviceShaderEnqueueFeaturesAMDX {
     VkStructureType    sType;
     void*              pNext;
     VkBool32           shaderEnqueue;
-    VkBool32           shaderMeshEnqueue;
 } VkPhysicalDeviceShaderEnqueueFeaturesAMDX;
 
 typedef struct VkPhysicalDeviceShaderEnqueuePropertiesAMDX {
@@ -71,16 +70,12 @@ typedef struct VkPhysicalDeviceShaderEnqueuePropertiesAMDX {
     uint32_t           maxExecutionGraphShaderPayloadSize;
     uint32_t           maxExecutionGraphShaderPayloadCount;
     uint32_t           executionGraphDispatchAddressAlignment;
-    uint32_t           maxExecutionGraphWorkgroupCount[3];
-    uint32_t           maxExecutionGraphWorkgroups;
 } VkPhysicalDeviceShaderEnqueuePropertiesAMDX;
 
 typedef struct VkExecutionGraphPipelineScratchSizeAMDX {
     VkStructureType    sType;
     void*              pNext;
-    VkDeviceSize       minSize;
-    VkDeviceSize       maxSize;
-    VkDeviceSize       sizeGranularity;
+    VkDeviceSize       size;
 } VkExecutionGraphPipelineScratchSizeAMDX;
 
 typedef struct VkExecutionGraphPipelineCreateInfoAMDX {
@@ -120,16 +115,15 @@ typedef struct VkPipelineShaderStageNodeCreateInfoAMDX {
     uint32_t             index;
 } VkPipelineShaderStageNodeCreateInfoAMDX;
 
-typedef VkResult (VKAPI_PTR *PFN_vkCreateExecutionGraphPipelinesAMDX)(VkDevice                                        device, VkPipelineCache pipelineCache, uint32_t                                        createInfoCount, const VkExecutionGraphPipelineCreateInfoAMDX* pCreateInfos, const VkAllocationCallbacks*    pAllocator, VkPipeline*               pPipelines);
-typedef VkResult (VKAPI_PTR *PFN_vkGetExecutionGraphPipelineScratchSizeAMDX)(VkDevice                                        device, VkPipeline                                      executionGraph, VkExecutionGraphPipelineScratchSizeAMDX*        pSizeInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkGetExecutionGraphPipelineNodeIndexAMDX)(VkDevice                                        device, VkPipeline                                      executionGraph, const VkPipelineShaderStageNodeCreateInfoAMDX*  pNodeInfo, uint32_t*                                       pNodeIndex);
-typedef void (VKAPI_PTR *PFN_vkCmdInitializeGraphScratchMemoryAMDX)(VkCommandBuffer                                 commandBuffer, VkPipeline                                      executionGraph, VkDeviceAddress                                 scratch, VkDeviceSize                                    scratchSize);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, VkDeviceSize                                    scratchSize, const VkDispatchGraphCountInfoAMDX*             pCountInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphIndirectAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, VkDeviceSize                                    scratchSize, const VkDispatchGraphCountInfoAMDX*             pCountInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphIndirectCountAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, VkDeviceSize                                    scratchSize, VkDeviceAddress                                 countInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateExecutionGraphPipelinesAMDX)(VkDevice                                        device, VkPipelineCache                 pipelineCache, uint32_t                                        createInfoCount, const VkExecutionGraphPipelineCreateInfoAMDX* pCreateInfos, const VkAllocationCallbacks*    pAllocator, VkPipeline*               pPipelines);
+typedef VkResult (VKAPI_PTR *PFN_vkGetExecutionGraphPipelineScratchSizeAMDX)(VkDevice                                        device, VkPipeline                                      executionGraph, VkExecutionGraphPipelineScratchSizeAMDX*         pSizeInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkGetExecutionGraphPipelineNodeIndexAMDX)(VkDevice                                        device, VkPipeline                                      executionGraph, const VkPipelineShaderStageNodeCreateInfoAMDX*   pNodeInfo, uint32_t*                                       pNodeIndex);
+typedef void (VKAPI_PTR *PFN_vkCmdInitializeGraphScratchMemoryAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, const VkDispatchGraphCountInfoAMDX*              pCountInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphIndirectAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, const VkDispatchGraphCountInfoAMDX*              pCountInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatchGraphIndirectCountAMDX)(VkCommandBuffer                                 commandBuffer, VkDeviceAddress                                 scratch, VkDeviceAddress                                 countInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateExecutionGraphPipelinesAMDX(
     VkDevice                                    device,
     VkPipelineCache                             pipelineCache,
@@ -137,159 +131,37 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateExecutionGraphPipelinesAMDX(
     const VkExecutionGraphPipelineCreateInfoAMDX* pCreateInfos,
     const VkAllocationCallbacks*                pAllocator,
     VkPipeline*                                 pPipelines);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetExecutionGraphPipelineScratchSizeAMDX(
     VkDevice                                    device,
     VkPipeline                                  executionGraph,
     VkExecutionGraphPipelineScratchSizeAMDX*    pSizeInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetExecutionGraphPipelineNodeIndexAMDX(
     VkDevice                                    device,
     VkPipeline                                  executionGraph,
     const VkPipelineShaderStageNodeCreateInfoAMDX* pNodeInfo,
     uint32_t*                                   pNodeIndex);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdInitializeGraphScratchMemoryAMDX(
     VkCommandBuffer                             commandBuffer,
-    VkPipeline                                  executionGraph,
-    VkDeviceAddress                             scratch,
-    VkDeviceSize                                scratchSize);
-#endif
+    VkDeviceAddress                             scratch);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDispatchGraphAMDX(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             scratch,
-    VkDeviceSize                                scratchSize,
     const VkDispatchGraphCountInfoAMDX*         pCountInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDispatchGraphIndirectAMDX(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             scratch,
-    VkDeviceSize                                scratchSize,
     const VkDispatchGraphCountInfoAMDX*         pCountInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDispatchGraphIndirectCountAMDX(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             scratch,
-    VkDeviceSize                                scratchSize,
     VkDeviceAddress                             countInfo);
 #endif
-#endif
-
-
-// VK_NV_cuda_kernel_launch is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_cuda_kernel_launch 1
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaModuleNV)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaFunctionNV)
-#define VK_NV_CUDA_KERNEL_LAUNCH_SPEC_VERSION 2
-#define VK_NV_CUDA_KERNEL_LAUNCH_EXTENSION_NAME "VK_NV_cuda_kernel_launch"
-typedef struct VkCudaModuleCreateInfoNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    size_t             dataSize;
-    const void*        pData;
-} VkCudaModuleCreateInfoNV;
-
-typedef struct VkCudaFunctionCreateInfoNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkCudaModuleNV     module;
-    const char*        pName;
-} VkCudaFunctionCreateInfoNV;
-
-typedef struct VkCudaLaunchInfoNV {
-    VkStructureType        sType;
-    const void*            pNext;
-    VkCudaFunctionNV       function;
-    uint32_t               gridDimX;
-    uint32_t               gridDimY;
-    uint32_t               gridDimZ;
-    uint32_t               blockDimX;
-    uint32_t               blockDimY;
-    uint32_t               blockDimZ;
-    uint32_t               sharedMemBytes;
-    size_t                 paramCount;
-    const void* const *    pParams;
-    size_t                 extraCount;
-    const void* const *    pExtras;
-} VkCudaLaunchInfoNV;
-
-typedef struct VkPhysicalDeviceCudaKernelLaunchFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           cudaKernelLaunchFeatures;
-} VkPhysicalDeviceCudaKernelLaunchFeaturesNV;
-
-typedef struct VkPhysicalDeviceCudaKernelLaunchPropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           computeCapabilityMinor;
-    uint32_t           computeCapabilityMajor;
-} VkPhysicalDeviceCudaKernelLaunchPropertiesNV;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaModuleNV)(VkDevice device, const VkCudaModuleCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaModuleNV* pModule);
-typedef VkResult (VKAPI_PTR *PFN_vkGetCudaModuleCacheNV)(VkDevice device, VkCudaModuleNV module, size_t* pCacheSize, void* pCacheData);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaFunctionNV)(VkDevice device, const VkCudaFunctionCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaFunctionNV* pFunction);
-typedef void (VKAPI_PTR *PFN_vkDestroyCudaModuleNV)(VkDevice device, VkCudaModuleNV module, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkDestroyCudaFunctionNV)(VkDevice device, VkCudaFunctionNV function, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkCmdCudaLaunchKernelNV)(VkCommandBuffer commandBuffer, const VkCudaLaunchInfoNV* pLaunchInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaModuleNV(
-    VkDevice                                    device,
-    const VkCudaModuleCreateInfoNV*             pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkCudaModuleNV*                             pModule);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetCudaModuleCacheNV(
-    VkDevice                                    device,
-    VkCudaModuleNV                              module,
-    size_t*                                     pCacheSize,
-    void*                                       pCacheData);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaFunctionNV(
-    VkDevice                                    device,
-    const VkCudaFunctionCreateInfoNV*           pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkCudaFunctionNV*                           pFunction);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyCudaModuleNV(
-    VkDevice                                    device,
-    VkCudaModuleNV                              module,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyCudaFunctionNV(
-    VkDevice                                    device,
-    VkCudaFunctionNV                            function,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCudaLaunchKernelNV(
-    VkCommandBuffer                             commandBuffer,
-    const VkCudaLaunchInfoNV*                   pLaunchInfo);
-#endif
-#endif
 
 
 // VK_NV_displacement_micromap is a preprocessor guard. Do not pass it to API calls.
@@ -337,37 +209,6 @@ typedef struct VkAccelerationStructureTrianglesDisplacementMicromapNV {
 } VkAccelerationStructureTrianglesDisplacementMicromapNV;
 
 
-
-// VK_AMDX_dense_geometry_format is a preprocessor guard. Do not pass it to API calls.
-#define VK_AMDX_dense_geometry_format 1
-#define VK_AMDX_DENSE_GEOMETRY_FORMAT_SPEC_VERSION 1
-#define VK_AMDX_DENSE_GEOMETRY_FORMAT_EXTENSION_NAME "VK_AMDX_dense_geometry_format"
-#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_ALIGNMENT_AMDX 128U
-#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_STRIDE_AMDX 128U
-
-typedef enum VkCompressedTriangleFormatAMDX {
-    VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX = 0,
-    VK_COMPRESSED_TRIANGLE_FORMAT_MAX_ENUM_AMDX = 0x7FFFFFFF
-} VkCompressedTriangleFormatAMDX;
-typedef struct VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           denseGeometryFormat;
-} VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-
-typedef struct VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkDeviceOrHostAddressConstKHR     compressedData;
-    VkDeviceSize                      dataSize;
-    uint32_t                          numTriangles;
-    uint32_t                          numVertices;
-    uint32_t                          maxPrimitiveIndex;
-    uint32_t                          maxGeometryIndex;
-    VkCompressedTriangleFormatAMDX    format;
-} VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_core.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_core.h
index 70f9e861..114c0950 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_core.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_core.h
@@ -2,7 +2,7 @@
 #define VULKAN_CORE_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -62,35 +62,35 @@ extern "C" {
 #define VK_MAKE_API_VERSION(variant, major, minor, patch) \
     ((((uint32_t)(variant)) << 29U) | (((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch)))
 
-
+// DEPRECATED: This define has been removed. Specific version defines (e.g. VK_API_VERSION_1_0), or the VK_MAKE_VERSION macro, should be used instead.
 //#define VK_API_VERSION VK_MAKE_API_VERSION(0, 1, 0, 0) // Patch version should always be set to 0
 
+// Vulkan 1.0 version number
+#define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
+
 // Version of this file
-#define VK_HEADER_VERSION 335
+#define VK_HEADER_VERSION 283
 
 // Complete version of this file
-#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
-
+#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
 
+// DEPRECATED: This define is deprecated. VK_MAKE_API_VERSION should be used instead.
 #define VK_MAKE_VERSION(major, minor, patch) \
     ((((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch)))
 
-
+// DEPRECATED: This define is deprecated. VK_API_VERSION_MAJOR should be used instead.
 #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22U)
 
-
+// DEPRECATED: This define is deprecated. VK_API_VERSION_MINOR should be used instead.
 #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU)
 
-
+// DEPRECATED: This define is deprecated. VK_API_VERSION_PATCH should be used instead.
 #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU)
 
 #define VK_API_VERSION_VARIANT(version) ((uint32_t)(version) >> 29U)
 #define VK_API_VERSION_MAJOR(version) (((uint32_t)(version) >> 22U) & 0x7FU)
 #define VK_API_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU)
 #define VK_API_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU)
-// Vulkan 1.0 version number
-#define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
-
 typedef uint32_t VkBool32;
 typedef uint64_t VkDeviceAddress;
 typedef uint64_t VkDeviceSize;
@@ -106,26 +106,28 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSemaphore)
 VK_DEFINE_HANDLE(VkCommandBuffer)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFence)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDeviceMemory)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkQueryPool)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkImageView)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCommandPool)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkRenderPass)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFramebuffer)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkEvent)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkQueryPool)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBufferView)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkImageView)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkShaderModule)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipelineCache)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipelineLayout)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipeline)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkRenderPass)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSetLayout)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSampler)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorSet)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorPool)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFramebuffer)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCommandPool)
+#define VK_ATTACHMENT_UNUSED              (~0U)
 #define VK_FALSE                          0U
 #define VK_LOD_CLAMP_NONE                 1000.0F
 #define VK_QUEUE_FAMILY_IGNORED           (~0U)
 #define VK_REMAINING_ARRAY_LAYERS         (~0U)
 #define VK_REMAINING_MIP_LEVELS           (~0U)
+#define VK_SUBPASS_EXTERNAL               (~0U)
 #define VK_TRUE                           1U
 #define VK_WHOLE_SIZE                     (~0ULL)
 #define VK_MAX_MEMORY_TYPES               32U
@@ -134,8 +136,6 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorPool)
 #define VK_MAX_EXTENSION_NAME_SIZE        256U
 #define VK_MAX_DESCRIPTION_SIZE           256U
 #define VK_MAX_MEMORY_HEAPS               16U
-#define VK_ATTACHMENT_UNUSED              (~0U)
-#define VK_SUBPASS_EXTERNAL               (~0U)
 
 typedef enum VkResult {
     VK_SUCCESS = 0,
@@ -157,18 +157,17 @@ typedef enum VkResult {
     VK_ERROR_FORMAT_NOT_SUPPORTED = -11,
     VK_ERROR_FRAGMENTED_POOL = -12,
     VK_ERROR_UNKNOWN = -13,
-    VK_ERROR_VALIDATION_FAILED = -1000011001,
     VK_ERROR_OUT_OF_POOL_MEMORY = -1000069000,
     VK_ERROR_INVALID_EXTERNAL_HANDLE = -1000072003,
-    VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000,
     VK_ERROR_FRAGMENTATION = -1000161000,
+    VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000,
     VK_PIPELINE_COMPILE_REQUIRED = 1000297000,
-    VK_ERROR_NOT_PERMITTED = -1000174001,
     VK_ERROR_SURFACE_LOST_KHR = -1000000000,
     VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001,
     VK_SUBOPTIMAL_KHR = 1000001003,
     VK_ERROR_OUT_OF_DATE_KHR = -1000001004,
     VK_ERROR_INCOMPATIBLE_DISPLAY_KHR = -1000003001,
+    VK_ERROR_VALIDATION_FAILED_EXT = -1000011001,
     VK_ERROR_INVALID_SHADER_NV = -1000012000,
     VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR = -1000023000,
     VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR = -1000023001,
@@ -177,7 +176,7 @@ typedef enum VkResult {
     VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR = -1000023004,
     VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR = -1000023005,
     VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT = -1000158000,
-    VK_ERROR_PRESENT_TIMING_QUEUE_FULL_EXT = -1000208000,
+    VK_ERROR_NOT_PERMITTED_KHR = -1000174001,
     VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000,
     VK_THREAD_IDLE_KHR = 1000268000,
     VK_THREAD_DONE_KHR = 1000268001,
@@ -186,19 +185,14 @@ typedef enum VkResult {
     VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR = -1000299000,
     VK_ERROR_COMPRESSION_EXHAUSTED_EXT = -1000338000,
     VK_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000,
-    VK_PIPELINE_BINARY_MISSING_KHR = 1000483000,
-    VK_ERROR_NOT_ENOUGH_SPACE_KHR = -1000483000,
-    VK_ERROR_VALIDATION_FAILED_EXT = VK_ERROR_VALIDATION_FAILED,
     VK_ERROR_OUT_OF_POOL_MEMORY_KHR = VK_ERROR_OUT_OF_POOL_MEMORY,
     VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = VK_ERROR_INVALID_EXTERNAL_HANDLE,
     VK_ERROR_FRAGMENTATION_EXT = VK_ERROR_FRAGMENTATION,
-    VK_ERROR_NOT_PERMITTED_EXT = VK_ERROR_NOT_PERMITTED,
-    VK_ERROR_NOT_PERMITTED_KHR = VK_ERROR_NOT_PERMITTED,
+    VK_ERROR_NOT_PERMITTED_EXT = VK_ERROR_NOT_PERMITTED_KHR,
     VK_ERROR_INVALID_DEVICE_ADDRESS_EXT = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS,
     VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS,
     VK_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED,
     VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED,
-  // VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT is a legacy alias
     VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT = VK_INCOMPATIBLE_SHADER_BINARY_EXT,
     VK_RESULT_MAX_ENUM = 0x7FFFFFFF
 } VkResult;
@@ -253,11 +247,14 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_MEMORY_BARRIER = 46,
     VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO = 47,
     VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO = 48,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES = 1000094000,
     VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO = 1000157000,
     VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO = 1000157001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000,
     VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS = 1000127000,
     VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO = 1000127001,
     VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO = 1000060000,
+    VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO = 1000060003,
     VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO = 1000060004,
     VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO = 1000060005,
     VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO = 1000060006,
@@ -279,11 +276,25 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2 = 1000059006,
     VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2 = 1000059007,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2 = 1000059008,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES = 1000117000,
+    VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001,
     VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO = 1000117002,
+    VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO = 1000117003,
+    VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES = 1000053001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES = 1000053002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES = 1000120000,
     VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO = 1000145000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES = 1000145001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES = 1000145002,
     VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2 = 1000145003,
+    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO = 1000156000,
+    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO = 1000156001,
+    VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO = 1000156002,
+    VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO = 1000156003,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES = 1000156004,
+    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES = 1000156005,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO = 1000071000,
     VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES = 1000071001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO = 1000071002,
@@ -298,33 +309,47 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO = 1000077000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO = 1000076000,
     VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES = 1000076001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES = 1000094000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES = 1000120000,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES = 1000168000,
     VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT = 1000168001,
-    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO = 1000156000,
-    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO = 1000156001,
-    VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO = 1000156002,
-    VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO = 1000156003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES = 1000156004,
-    VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES = 1000156005,
-    VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO = 1000060003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES = 1000117000,
-    VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001,
-    VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO = 1000117003,
-    VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES = 1000053001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES = 1000053002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES = 1000063000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES = 49,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES = 50,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES = 51,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES = 52,
     VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO = 1000147000,
+    VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2 = 1000109000,
+    VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2 = 1000109001,
+    VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2 = 1000109002,
+    VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2 = 1000109003,
+    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2 = 1000109004,
+    VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO = 1000109005,
+    VK_STRUCTURE_TYPE_SUBPASS_END_INFO = 1000109006,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES = 1000177000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES = 1000196000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES = 1000180000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES = 1000082000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES = 1000197000,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO = 1000161000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES = 1000161001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES = 1000161002,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO = 1000161003,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT = 1000161004,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES = 1000199000,
+    VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE = 1000199001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES = 1000221000,
+    VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO = 1000246000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES = 1000130000,
+    VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO = 1000130001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES = 1000211000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES = 1000108000,
+    VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO = 1000108001,
+    VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO = 1000108002,
+    VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO = 1000108003,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES = 1000175000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES = 1000241000,
+    VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT = 1000241001,
+    VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT = 1000241002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES = 1000261000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES = 1000207000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES = 1000207001,
@@ -337,43 +362,16 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002,
     VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003,
     VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO = 1000257004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES = 1000177000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES = 1000180000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES = 1000082000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES = 1000197000,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO = 1000161000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES = 1000161001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES = 1000161002,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO = 1000161003,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT = 1000161004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES = 1000221000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES = 1000130000,
-    VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO = 1000130001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES = 1000175000,
-    VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2 = 1000109000,
-    VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2 = 1000109001,
-    VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2 = 1000109002,
-    VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2 = 1000109003,
-    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2 = 1000109004,
-    VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO = 1000109005,
-    VK_STRUCTURE_TYPE_SUBPASS_END_INFO = 1000109006,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES = 1000199000,
-    VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE = 1000199001,
-    VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO = 1000246000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES = 1000108000,
-    VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO = 1000108001,
-    VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO = 1000108002,
-    VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO = 1000108003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES = 1000241000,
-    VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT = 1000241001,
-    VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT = 1000241002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES = 53,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES = 54,
+    VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO = 1000192000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES = 1000215000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES = 1000245000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES = 1000276000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES = 1000295000,
     VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO = 1000295001,
     VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO = 1000295002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES = 1000297000,
     VK_STRUCTURE_TYPE_MEMORY_BARRIER_2 = 1000314000,
     VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2 = 1000314001,
     VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 = 1000314002,
@@ -382,25 +380,19 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO = 1000314005,
     VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO = 1000314006,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES = 1000314007,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES = 1000335000,
     VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2 = 1000337000,
     VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2 = 1000337001,
     VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2 = 1000337002,
     VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2 = 1000337003,
+    VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2 = 1000337004,
+    VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2 = 1000337005,
     VK_STRUCTURE_TYPE_BUFFER_COPY_2 = 1000337006,
     VK_STRUCTURE_TYPE_IMAGE_COPY_2 = 1000337007,
+    VK_STRUCTURE_TYPE_IMAGE_BLIT_2 = 1000337008,
     VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2 = 1000337009,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES = 1000066000,
-    VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3 = 1000360000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES = 1000413000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES = 1000413001,
-    VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS = 1000413002,
-    VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS = 1000413003,
-    VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO = 1000192000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES = 1000215000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES = 1000276000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES = 1000297000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES = 1000335000,
+    VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2 = 1000337010,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES = 1000225000,
     VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO = 1000225001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES = 1000225002,
@@ -408,68 +400,20 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES = 1000138001,
     VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK = 1000138002,
     VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO = 1000138003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES = 1000280000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES = 1000280001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES = 1000281001,
-    VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2 = 1000337004,
-    VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2 = 1000337005,
-    VK_STRUCTURE_TYPE_IMAGE_BLIT_2 = 1000337008,
-    VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2 = 1000337010,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES = 1000066000,
     VK_STRUCTURE_TYPE_RENDERING_INFO = 1000044000,
     VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO = 1000044001,
     VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO = 1000044002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES = 1000044003,
     VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO = 1000044004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES = 55,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES = 56,
-    VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO = 1000174000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES = 1000388000,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES = 1000388001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES = 1000265000,
-    VK_STRUCTURE_TYPE_MEMORY_MAP_INFO = 1000271000,
-    VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO = 1000271001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES = 1000470000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES = 1000470001,
-    VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO = 1000470004,
-    VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2 = 1000338002,
-    VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2 = 1000338003,
-    VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO = 1000470006,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES = 1000545000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES = 1000545001,
-    VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS = 1000545002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES = 1000270000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES = 1000270001,
-    VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY = 1000270002,
-    VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY = 1000270003,
-    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO = 1000270004,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO = 1000270005,
-    VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO = 1000270006,
-    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO = 1000270007,
-    VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE = 1000270008,
-    VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY = 1000270009,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES = 1000416000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES = 1000528000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES = 1000544000,
-    VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO = 1000470005,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES = 1000080000,
-    VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO = 1000545003,
-    VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO = 1000545004,
-    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO = 1000545005,
-    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO = 1000545006,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES = 1000466000,
-    VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO = 1000068000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES = 1000068001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES = 1000068002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES = 1000259000,
-    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO = 1000259001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES = 1000259002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES = 1000525000,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO = 1000190001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES = 1000190002,
-    VK_STRUCTURE_TYPE_RENDERING_AREA_INFO = 1000470003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES = 1000232000,
-    VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO = 1000232001,
-    VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO = 1000232002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES = 1000280000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES = 1000280001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES = 1000281001,
+    VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3 = 1000360000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES = 1000413000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES = 1000413001,
+    VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS = 1000413002,
+    VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS = 1000413003,
     VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR = 1000001000,
     VK_STRUCTURE_TYPE_PRESENT_INFO_KHR = 1000001001,
     VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR = 1000060007,
@@ -520,7 +464,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX = 1000029000,
     VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX = 1000029001,
     VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX = 1000029002,
-    VK_STRUCTURE_TYPE_CU_MODULE_TEXTURING_MODE_CREATE_INFO_NVX = 1000029004,
     VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX = 1000030000,
     VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX = 1000030001,
     VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR = 1000038000,
@@ -558,6 +501,10 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR = 1000040005,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR = 1000040006,
     VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000,
+    VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000044006,
+    VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT = 1000044007,
+    VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD = 1000044008,
+    VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX = 1000044009,
     VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP = 1000049000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV = 1000050000,
     VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000,
@@ -569,6 +516,9 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN = 1000062000,
     VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT = 1000067000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT = 1000067001,
+    VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT = 1000068000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT = 1000068001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT = 1000068002,
     VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073000,
     VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073001,
     VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHR = 1000073002,
@@ -583,6 +533,7 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR = 1000078003,
     VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR = 1000079000,
     VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR = 1000079001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000,
     VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001,
     VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002,
@@ -595,7 +546,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT = 1000091003,
     VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE = 1000092000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX = 1000097000,
-    VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX = 1000044009,
     VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000,
     VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001,
@@ -655,8 +605,6 @@ typedef enum VkStructureType {
 #ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX = 1000134004,
 #endif
-    VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD = 1000044008,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR = 1000141000,
     VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT = 1000143000,
     VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001,
     VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002,
@@ -735,9 +683,13 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR = 1000187003,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR = 1000187004,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR = 1000187005,
+    VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR = 1000174000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR = 1000388000,
+    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = 1000388001,
     VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,
     VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP = 1000191000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV = 1000204000,
@@ -745,18 +697,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV = 1000205002,
     VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV = 1000206000,
     VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008,
-    VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV = 1000314009,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT = 1000208000,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT = 1000208001,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT = 1000208002,
-    VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT = 1000208003,
-    VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT = 1000208004,
-    VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT = 1000208005,
-    VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT = 1000208006,
-    VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT = 1000208007,
-    VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT = 1000208008,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT = 1000208009,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL = 1000209000,
     VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL = 1000210000,
     VK_STRUCTURE_TYPE_INITIALIZE_PERFORMANCE_API_INFO_INTEL = 1000210001,
@@ -772,15 +712,16 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001,
     VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002,
-    VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT = 1000044007,
     VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000226000,
     VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR = 1000226001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR = 1000226002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR = 1000226003,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR = 1000226004,
-    VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000044006,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR = 1000232000,
+    VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR = 1000232001,
+    VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR = 1000232002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR = 1000235000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000,
@@ -815,10 +756,31 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR = 1000269003,
     VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR = 1000269004,
     VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR = 1000269005,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT = 1000270000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT = 1000270001,
+    VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT = 1000270002,
+    VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT = 1000270003,
+    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT = 1000270004,
+    VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT = 1000270005,
+    VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT = 1000270006,
+    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT = 1000270007,
+    VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT = 1000270008,
+    VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT = 1000270009,
+    VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR = 1000271000,
+    VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR = 1000271001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT = 1000272000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT = 1000272001,
     VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT = 1000272002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = 1000274000,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = 1000274001,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT = 1000274002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT = 1000275000,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT = 1000275001,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT = 1000275002,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT = 1000275003,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT = 1000275004,
+    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT = 1000275005,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000,
     VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001,
     VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002,
@@ -838,6 +800,8 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT = 1000284000,
     VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT = 1000284001,
     VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT = 1000284002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = 1000286000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = 1000286001,
     VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT = 1000287000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT = 1000287001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT = 1000287002,
@@ -860,27 +824,11 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR = 1000299010,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000,
     VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV = 1000307000,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV = 1000307001,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV = 1000307002,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV = 1000307003,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV = 1000307004,
-#endif
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM = 1000309000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM = 1000309001,
-    VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM = 1000309002,
-    VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM = 1000309003,
-    VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM = 1000309004,
-    VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM = 1000309005,
     VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV = 1000310000,
     VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT = 1000311000,
     VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECTS_INFO_EXT = 1000311001,
@@ -894,6 +842,8 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_IMPORT_METAL_IO_SURFACE_INFO_EXT = 1000311009,
     VK_STRUCTURE_TYPE_EXPORT_METAL_SHARED_EVENT_INFO_EXT = 1000311010,
     VK_STRUCTURE_TYPE_IMPORT_METAL_SHARED_EVENT_INFO_EXT = 1000311011,
+    VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008,
+    VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV = 1000314009,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT = 1000316000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT = 1000316001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT = 1000316002,
@@ -980,11 +930,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT = 1000382000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR = 1000386000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR = 1000387000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE = 1000390000,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE = 1000390001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE = 1000390002,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE = 1000390003,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT = 1000391000,
     VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000,
@@ -1018,6 +963,7 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM = 1000415000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR = 1000416000,
     VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM = 1000417000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM = 1000417001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM = 1000417002,
@@ -1026,19 +972,23 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE = 1000420000,
     VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE = 1000420001,
     VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE = 1000420002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT = 1000421000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT = 1000422000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM = 1000424000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM = 1000424001,
     VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM = 1000424002,
     VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM = 1000424003,
     VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM = 1000424004,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001,
+    VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV = 1000426000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV = 1000426001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV = 1000427000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV = 1000427001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV = 1000428000,
     VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV = 1000428001,
     VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV = 1000428002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_LINEAR_SWEPT_SPHERES_FEATURES_NV = 1000429008,
-    VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV = 1000429009,
-    VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV = 1000429010,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR = 1000434000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT = 1000437000,
@@ -1047,12 +997,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_IMAGE_VIEW_SAMPLE_WEIGHT_CREATE_INFO_QCOM = 1000440002,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT = 1000451000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT = 1000451001,
-    VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS = 1000452000,
-    VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS = 1000452001,
-    VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS = 1000452002,
-    VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS = 1000452003,
-    VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS = 1000452004,
-    VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS = 1000452005,
     VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT = 1000453000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT = 1000455000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_PROPERTIES_EXT = 1000455001,
@@ -1062,30 +1006,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT = 1000458003,
     VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG = 1000459000,
     VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG = 1000459001,
-    VK_STRUCTURE_TYPE_TENSOR_CREATE_INFO_ARM = 1000460000,
-    VK_STRUCTURE_TYPE_TENSOR_VIEW_CREATE_INFO_ARM = 1000460001,
-    VK_STRUCTURE_TYPE_BIND_TENSOR_MEMORY_INFO_ARM = 1000460002,
-    VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_TENSOR_ARM = 1000460003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_PROPERTIES_ARM = 1000460004,
-    VK_STRUCTURE_TYPE_TENSOR_FORMAT_PROPERTIES_ARM = 1000460005,
-    VK_STRUCTURE_TYPE_TENSOR_DESCRIPTION_ARM = 1000460006,
-    VK_STRUCTURE_TYPE_TENSOR_MEMORY_REQUIREMENTS_INFO_ARM = 1000460007,
-    VK_STRUCTURE_TYPE_TENSOR_MEMORY_BARRIER_ARM = 1000460008,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_FEATURES_ARM = 1000460009,
-    VK_STRUCTURE_TYPE_DEVICE_TENSOR_MEMORY_REQUIREMENTS_ARM = 1000460010,
-    VK_STRUCTURE_TYPE_COPY_TENSOR_INFO_ARM = 1000460011,
-    VK_STRUCTURE_TYPE_TENSOR_COPY_ARM = 1000460012,
-    VK_STRUCTURE_TYPE_TENSOR_DEPENDENCY_INFO_ARM = 1000460013,
-    VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_TENSOR_ARM = 1000460014,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_TENSOR_INFO_ARM = 1000460015,
-    VK_STRUCTURE_TYPE_EXTERNAL_TENSOR_PROPERTIES_ARM = 1000460016,
-    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_TENSOR_CREATE_INFO_ARM = 1000460017,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_FEATURES_ARM = 1000460018,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_PROPERTIES_ARM = 1000460019,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_GET_TENSOR_INFO_ARM = 1000460020,
-    VK_STRUCTURE_TYPE_TENSOR_CAPTURE_DESCRIPTOR_DATA_INFO_ARM = 1000460021,
-    VK_STRUCTURE_TYPE_TENSOR_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_ARM = 1000460022,
-    VK_STRUCTURE_TYPE_FRAME_BOUNDARY_TENSORS_ARM = 1000460023,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT = 1000462000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT = 1000462001,
     VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT = 1000462002,
@@ -1099,64 +1019,33 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_OPTICAL_FLOW_EXECUTE_INFO_NV = 1000464005,
     VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_PRIVATE_DATA_INFO_NV = 1000464010,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT = 1000465000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT = 1000466000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID = 1000468000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID = 1000468001,
     VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID = 1000468002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD = 1000476000,
-    VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD = 1000476001,
-    VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD = 1000476002,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX = 1000478000,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX = 1000478001,
-#endif
-    VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR = 1000479000,
-    VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR = 1000479001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR = 1000479002,
-    VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_WAIT_2_KHR = 1000480000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_2_FEATURES_KHR = 1000480001,
-    VK_STRUCTURE_TYPE_PRESENT_WAIT_2_INFO_KHR = 1000480002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR = 1000470000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR = 1000470001,
+    VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR = 1000470003,
+    VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR = 1000470004,
+    VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR = 1000338002,
+    VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR = 1000338003,
+    VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR = 1000470005,
+    VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR = 1000470006,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR = 1000481000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT = 1000482000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT = 1000482001,
     VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT = 1000482002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR = 1000483000,
-    VK_STRUCTURE_TYPE_PIPELINE_BINARY_CREATE_INFO_KHR = 1000483001,
-    VK_STRUCTURE_TYPE_PIPELINE_BINARY_INFO_KHR = 1000483002,
-    VK_STRUCTURE_TYPE_PIPELINE_BINARY_KEY_KHR = 1000483003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR = 1000483004,
-    VK_STRUCTURE_TYPE_RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR = 1000483005,
-    VK_STRUCTURE_TYPE_PIPELINE_BINARY_DATA_INFO_KHR = 1000483006,
-    VK_STRUCTURE_TYPE_PIPELINE_CREATE_INFO_KHR = 1000483007,
-    VK_STRUCTURE_TYPE_DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR = 1000483008,
-    VK_STRUCTURE_TYPE_PIPELINE_BINARY_HANDLES_INFO_KHR = 1000483009,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM = 1000484000,
     VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM = 1000484001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC = 1000485000,
     VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC = 1000485001,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR = 1000274000,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR = 1000274001,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR = 1000274002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR = 1000275000,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR = 1000275001,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR = 1000275002,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR = 1000275003,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR = 1000275004,
-    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR = 1000275005,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM = 1000488000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV = 1000490000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV = 1000490001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_FEATURES_NV = 1000491000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV = 1000491001,
-    VK_STRUCTURE_TYPE_COOPERATIVE_VECTOR_PROPERTIES_NV = 1000491002,
-    VK_STRUCTURE_TYPE_CONVERT_COOPERATIVE_VECTOR_MATRIX_INFO_NV = 1000491004,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV = 1000492000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV = 1000492001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT = 1000351000,
     VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT = 1000351002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT = 1000495000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT = 1000495001,
     VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT = 1000496000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM = 1000497000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM = 1000497001,
@@ -1174,50 +1063,13 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR = 1000506000,
     VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR = 1000506001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR = 1000506002,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM = 1000507000,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_CREATE_INFO_ARM = 1000507001,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_RESOURCE_INFO_ARM = 1000507002,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_ARM = 1000507003,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_MEMORY_REQUIREMENTS_INFO_ARM = 1000507004,
-    VK_STRUCTURE_TYPE_BIND_DATA_GRAPH_PIPELINE_SESSION_MEMORY_INFO_ARM = 1000507005,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_FEATURES_ARM = 1000507006,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SHADER_MODULE_CREATE_INFO_ARM = 1000507007,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_PROPERTY_QUERY_RESULT_ARM = 1000507008,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_INFO_ARM = 1000507009,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_COMPILER_CONTROL_CREATE_INFO_ARM = 1000507010,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENTS_INFO_ARM = 1000507011,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENT_ARM = 1000507012,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_IDENTIFIER_CREATE_INFO_ARM = 1000507013,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_DISPATCH_INFO_ARM = 1000507014,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PROCESSING_ENGINE_CREATE_INFO_ARM = 1000507016,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM = 1000507017,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM = 1000507018,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_INFO_ARM = 1000507019,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_TENSOR_SEMI_STRUCTURED_SPARSITY_INFO_ARM = 1000507015,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM = 1000510000,
     VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM = 1000510001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR = 1000201000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR = 1000511000,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR = 1000512000,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR = 1000512001,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR = 1000512003,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000512004,
     VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR = 1000512005,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR = 1000513000,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000513001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PICTURE_INFO_KHR = 1000513002,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_DPB_SLOT_INFO_KHR = 1000513003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_AV1_FEATURES_KHR = 1000513004,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PROFILE_INFO_KHR = 1000513005,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_INFO_KHR = 1000513006,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_LAYER_INFO_KHR = 1000513007,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUALITY_LEVEL_PROPERTIES_KHR = 1000513008,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_CREATE_INFO_KHR = 1000513009,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_GOP_REMAINING_FRAME_INFO_KHR = 1000513010,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_DECODE_VP9_FEATURES_KHR = 1000514000,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_CAPABILITIES_KHR = 1000514001,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PICTURE_INFO_KHR = 1000514002,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PROFILE_INFO_KHR = 1000514003,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR = 1000515000,
     VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR = 1000515001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV = 1000516000,
@@ -1231,167 +1083,44 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM = 1000520001,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM = 1000521000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT = 1000524000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR = 1000527000,
-    VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT = 1000527001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR = 1000525000,
+    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR = 1000190001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR = 1000190002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR = 1000528000,
     VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX = 1000529000,
     VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX = 1000529001,
     VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX = 1000529002,
     VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX = 1000529003,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX = 1000529004,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT = 1000530000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR = 1000265000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR = 1000259000,
+    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR = 1000259001,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR = 1000259002,
     VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR = 1000184000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR = 1000544000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR = 1000545000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR = 1000545001,
+    VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR = 1000545002,
+    VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR = 1000545003,
+    VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR = 1000545004,
+    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR = 1000545005,
+    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR = 1000545006,
     VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT = 1000545007,
     VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT = 1000545008,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV = 1000546000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM = 1000547000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM = 1000547001,
-    VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM = 1000547002,
-    VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM = 1000547003,
-    VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM = 1000547004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR = 1000549000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR = 1000426001,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR = 1000549002,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR = 1000549003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT = 1000427000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT = 1000427001,
-    VK_STRUCTURE_TYPE_DECOMPRESS_MEMORY_INFO_EXT = 1000550002,
-    VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV = 1000551000,
-    VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV = 1000551001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR = 1000552000,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR = 1000552001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR = 1000552002,
-    VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR = 1000552003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR = 1000552004,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR = 1000553000,
-    VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR = 1000553001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR = 1000553002,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000553005,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUANTIZATION_MAP_FEATURES_KHR = 1000553009,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUANTIZATION_MAP_CAPABILITIES_KHR = 1000553003,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUANTIZATION_MAP_CAPABILITIES_KHR = 1000553004,
-    VK_STRUCTURE_TYPE_VIDEO_FORMAT_H265_QUANTIZATION_MAP_PROPERTIES_KHR = 1000553006,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUANTIZATION_MAP_CAPABILITIES_KHR = 1000553007,
-    VK_STRUCTURE_TYPE_VIDEO_FORMAT_AV1_QUANTIZATION_MAP_PROPERTIES_KHR = 1000553008,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV = 1000555000,
-    VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV = 1000556000,
-    VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV = 1000556001,
-    VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV = 1000556002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV = 1000556003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR = 1000558000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV = 1000559000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR = 1000562000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR = 1000562001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR = 1000562002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_KHR = 1000562003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR = 1000562004,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV = 1000563000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT = 1000564000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT = 1000567000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV = 1000568000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_FEATURES_NV = 1000569000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_PROPERTIES_NV = 1000569001,
-    VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV = 1000569002,
-    VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_TRIANGLE_CLUSTER_INPUT_NV = 1000569003,
-    VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_MOVE_OBJECTS_INPUT_NV = 1000569004,
-    VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV = 1000569005,
-    VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV = 1000569006,
-    VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CLUSTER_ACCELERATION_STRUCTURE_CREATE_INFO_NV = 1000569007,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_FEATURES_NV = 1000570000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_PROPERTIES_NV = 1000570001,
-    VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_PARTITIONED_ACCELERATION_STRUCTURE_NV = 1000570002,
-    VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCES_INPUT_NV = 1000570003,
-    VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV = 1000570004,
-    VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_FLAGS_NV = 1000570005,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_EXT = 1000572000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT = 1000572001,
-    VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_EXT = 1000572002,
-    VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_CREATE_INFO_EXT = 1000572003,
-    VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_EXT = 1000572004,
-    VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_EXT = 1000572006,
-    VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_EXT = 1000572007,
-    VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_PIPELINE_EXT = 1000572008,
-    VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_SHADER_EXT = 1000572009,
-    VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_PIPELINE_INFO_EXT = 1000572010,
-    VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_INFO_EXT = 1000572011,
-    VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_LAYOUT_INFO_EXT = 1000572012,
-    VK_STRUCTURE_TYPE_GENERATED_COMMANDS_PIPELINE_INFO_EXT = 1000572013,
-    VK_STRUCTURE_TYPE_GENERATED_COMMANDS_SHADER_INFO_EXT = 1000572014,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR = 1000574000,
-    VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR = 1000574002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA = 1000575000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA = 1000575001,
-    VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA = 1000575002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR = 1000579000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT = 1000581000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT = 1000581001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT = 1000582000,
-    VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT = 1000582001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR = 1000584000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR = 1000584001,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR = 1000584002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_2_FEATURES_KHR = 1000586000,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586001,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586002,
-    VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586003,
-    VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS = 1000685000,
-    VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS = 1000453001,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS = 1000453002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS = 1000453003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI = 1000590000,
-    VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI = 1000590001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV = 1000593000,
-    VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_FLEXIBLE_DIMENSIONS_PROPERTIES_NV = 1000593001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_PROPERTIES_NV = 1000593002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_OPACITY_MICROMAP_FEATURES_ARM = 1000596000,
-    VK_STRUCTURE_TYPE_IMPORT_MEMORY_METAL_HANDLE_INFO_EXT = 1000602000,
-    VK_STRUCTURE_TYPE_MEMORY_METAL_HANDLE_PROPERTIES_EXT = 1000602001,
-    VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EXT = 1000602002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR = 1000421000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM = 1000605000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM = 1000605001,
-    VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM = 1000605002,
-    VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM = 1000605003,
-    VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM = 1000605004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT = 1000608000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FORMAT_PACK_FEATURES_ARM = 1000609000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE = 1000611000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE = 1000611001,
-    VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE = 1000611002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR = 1000286000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR = 1000286001,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV = 1000613000,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV = 1000613001,
-#endif
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT = 1000425000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT = 1000425001,
-    VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT = 1000425002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT = 1000620000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR = 1000361000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_INDEXING_FEATURES_EXT = 1000627000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT = 1000628000,
-    VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT = 1000628001,
-    VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT = 1000628002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_QCOM = 1000629000,
-    VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM = 1000629001,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_FEATURES_KHR = 1000630000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_PROPERTIES_KHR = 1000630001,
-    VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_FLAGS_INFO_KHR = 1000630002,
-    VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR = 1000619003,
-    VK_STRUCTURE_TYPE_RESOLVE_IMAGE_MODE_INFO_KHR = 1000630004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC = 1000637000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_FEATURES_EXT = 1000642000,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES,
-  // VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT is a legacy alias
     VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT,
     VK_STRUCTURE_TYPE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_INFO,
     VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO,
     VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES,
     VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO,
+    VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD,
     VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,
@@ -1412,9 +1141,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO,
     VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES,
-    VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES,
     VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
@@ -1428,12 +1154,10 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO,
     VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES,
     VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES,
     VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO,
-  // VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT is a legacy alias
     VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES,
     VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO,
@@ -1469,7 +1193,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
     VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR = VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2,
     VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO,
-    VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD,
     VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
     VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
     VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO_KHR = VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO,
@@ -1485,22 +1208,18 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES,
     VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT,
-    VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO,
+    VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES,
     VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR,
-    VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES,
+    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR,
     VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES,
     VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES,
@@ -1508,7 +1227,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO,
     VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO,
     VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO,
-  // VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL is a legacy alias
     VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES,
@@ -1516,9 +1234,6 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES,
     VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES,
-    VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO,
-    VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES,
     VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT,
     VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT,
@@ -1532,38 +1247,15 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO,
     VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO,
     VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES,
-    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR,
+    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES,
-    VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY,
-    VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT = VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY,
-    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO,
-    VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO,
-    VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO,
-    VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT = VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE,
-    VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY,
-    VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO,
-    VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR,
-    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES,
     VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO,
     VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO,
@@ -1589,58 +1281,28 @@ typedef enum VkStructureType {
     VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR = VK_STRUCTURE_TYPE_IMAGE_BLIT_2,
     VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2,
     VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2,
-    VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2,
-    VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2,
+    VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR,
+    VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_EXT,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT,
     VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT,
     VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR,
     VK_STRUCTURE_TYPE_PIPELINE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES,
-    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR,
+    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES,
     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES,
     VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS,
     VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT,
-    VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES,
-    VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_AREA_INFO,
-    VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO,
-    VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2,
-    VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2,
-    VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO,
-    VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO,
     VK_STRUCTURE_TYPE_SHADER_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES,
-    VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES,
-    VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR = VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS,
-    VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO,
-    VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
-    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO,
-    VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO,
-    VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT = VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR,
     VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkStructureType;
 
+typedef enum VkPipelineCacheHeaderVersion {
+    VK_PIPELINE_CACHE_HEADER_VERSION_ONE = 1,
+    VK_PIPELINE_CACHE_HEADER_VERSION_MAX_ENUM = 0x7FFFFFFF
+} VkPipelineCacheHeaderVersion;
+
 typedef enum VkImageLayout {
     VK_IMAGE_LAYOUT_UNDEFINED = 0,
     VK_IMAGE_LAYOUT_GENERAL = 1,
@@ -1659,7 +1321,6 @@ typedef enum VkImageLayout {
     VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL = 1000241003,
     VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL = 1000314000,
     VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL = 1000314001,
-    VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ = 1000232000,
     VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,
     VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR = 1000024000,
     VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR = 1000024001,
@@ -1667,17 +1328,14 @@ typedef enum VkImageLayout {
     VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000,
     VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT = 1000218000,
     VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR = 1000164003,
+    VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR = 1000232000,
     VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR = 1000299000,
     VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR = 1000299001,
     VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR = 1000299002,
     VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT = 1000339000,
-    VK_IMAGE_LAYOUT_TENSOR_ALIASING_ARM = 1000460000,
-    VK_IMAGE_LAYOUT_VIDEO_ENCODE_QUANTIZATION_MAP_KHR = 1000553000,
-    VK_IMAGE_LAYOUT_ZERO_INITIALIZED_EXT = 1000620000,
     VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL,
     VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL,
     VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR,
-    VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ,
     VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL,
     VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL,
     VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL,
@@ -1714,8 +1372,8 @@ typedef enum VkObjectType {
     VK_OBJECT_TYPE_DESCRIPTOR_SET = 23,
     VK_OBJECT_TYPE_FRAMEBUFFER = 24,
     VK_OBJECT_TYPE_COMMAND_POOL = 25,
-    VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE = 1000085000,
     VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION = 1000156000,
+    VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE = 1000085000,
     VK_OBJECT_TYPE_PRIVATE_DATA_SLOT = 1000295000,
     VK_OBJECT_TYPE_SURFACE_KHR = 1000000000,
     VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000,
@@ -1733,23 +1391,12 @@ typedef enum VkObjectType {
     VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL = 1000210000,
     VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR = 1000268000,
     VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV = 1000277000,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_OBJECT_TYPE_CUDA_MODULE_NV = 1000307000,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_OBJECT_TYPE_CUDA_FUNCTION_NV = 1000307001,
-#endif
     VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA = 1000366000,
     VK_OBJECT_TYPE_MICROMAP_EXT = 1000396000,
-    VK_OBJECT_TYPE_TENSOR_ARM = 1000460000,
-    VK_OBJECT_TYPE_TENSOR_VIEW_ARM = 1000460001,
     VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV = 1000464000,
     VK_OBJECT_TYPE_SHADER_EXT = 1000482000,
-    VK_OBJECT_TYPE_PIPELINE_BINARY_KHR = 1000483000,
-    VK_OBJECT_TYPE_DATA_GRAPH_PIPELINE_SESSION_ARM = 1000507000,
-    VK_OBJECT_TYPE_EXTERNAL_COMPUTE_QUEUE_NV = 1000556000,
-    VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_EXT = 1000572000,
-    VK_OBJECT_TYPE_INDIRECT_EXECUTION_SET_EXT = 1000572001,
     VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE,
     VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION,
     VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT = VK_OBJECT_TYPE_PRIVATE_DATA_SLOT,
@@ -1757,7 +1404,6 @@ typedef enum VkObjectType {
 } VkObjectType;
 
 typedef enum VkVendorId {
-    VK_VENDOR_ID_KHRONOS = 0x10000,
     VK_VENDOR_ID_VIV = 0x10001,
     VK_VENDOR_ID_VSI = 0x10002,
     VK_VENDOR_ID_KAZAN = 0x10003,
@@ -2022,8 +1668,6 @@ typedef enum VkFormat {
     VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK = 1000066011,
     VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK = 1000066012,
     VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK = 1000066013,
-    VK_FORMAT_A1B5G5R5_UNORM_PACK16 = 1000470000,
-    VK_FORMAT_A8_UNORM = 1000470001,
     VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG = 1000054000,
     VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG = 1000054001,
     VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG = 1000054002,
@@ -2032,22 +1676,9 @@ typedef enum VkFormat {
     VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG = 1000054005,
     VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG = 1000054006,
     VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG = 1000054007,
-    VK_FORMAT_R8_BOOL_ARM = 1000460000,
     VK_FORMAT_R16G16_SFIXED5_NV = 1000464000,
-    VK_FORMAT_R10X6_UINT_PACK16_ARM = 1000609000,
-    VK_FORMAT_R10X6G10X6_UINT_2PACK16_ARM = 1000609001,
-    VK_FORMAT_R10X6G10X6B10X6A10X6_UINT_4PACK16_ARM = 1000609002,
-    VK_FORMAT_R12X4_UINT_PACK16_ARM = 1000609003,
-    VK_FORMAT_R12X4G12X4_UINT_2PACK16_ARM = 1000609004,
-    VK_FORMAT_R12X4G12X4B12X4A12X4_UINT_4PACK16_ARM = 1000609005,
-    VK_FORMAT_R14X2_UINT_PACK16_ARM = 1000609006,
-    VK_FORMAT_R14X2G14X2_UINT_2PACK16_ARM = 1000609007,
-    VK_FORMAT_R14X2G14X2B14X2A14X2_UINT_4PACK16_ARM = 1000609008,
-    VK_FORMAT_R14X2_UNORM_PACK16_ARM = 1000609009,
-    VK_FORMAT_R14X2G14X2_UNORM_2PACK16_ARM = 1000609010,
-    VK_FORMAT_R14X2G14X2B14X2A14X2_UNORM_4PACK16_ARM = 1000609011,
-    VK_FORMAT_G14X2_B14X2R14X2_2PLANE_420_UNORM_3PACK16_ARM = 1000609012,
-    VK_FORMAT_G14X2_B14X2R14X2_2PLANE_422_UNORM_3PACK16_ARM = 1000609013,
+    VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR = 1000470000,
+    VK_FORMAT_A8_UNORM_KHR = 1000470001,
     VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK,
     VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK,
     VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK,
@@ -2102,10 +1733,7 @@ typedef enum VkFormat {
     VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT = VK_FORMAT_G16_B16R16_2PLANE_444_UNORM,
     VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT = VK_FORMAT_A4R4G4B4_UNORM_PACK16,
     VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT = VK_FORMAT_A4B4G4R4_UNORM_PACK16,
-  // VK_FORMAT_R16G16_S10_5_NV is a legacy alias
     VK_FORMAT_R16G16_S10_5_NV = VK_FORMAT_R16G16_SFIXED5_NV,
-    VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR = VK_FORMAT_A1B5G5R5_UNORM_PACK16,
-    VK_FORMAT_A8_UNORM_KHR = VK_FORMAT_A8_UNORM,
     VK_FORMAT_MAX_ENUM = 0x7FFFFFFF
 } VkFormat;
 
@@ -2181,116 +1809,6 @@ typedef enum VkImageViewType {
     VK_IMAGE_VIEW_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkImageViewType;
 
-typedef enum VkCommandBufferLevel {
-    VK_COMMAND_BUFFER_LEVEL_PRIMARY = 0,
-    VK_COMMAND_BUFFER_LEVEL_SECONDARY = 1,
-    VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7FFFFFFF
-} VkCommandBufferLevel;
-
-typedef enum VkIndexType {
-    VK_INDEX_TYPE_UINT16 = 0,
-    VK_INDEX_TYPE_UINT32 = 1,
-    VK_INDEX_TYPE_UINT8 = 1000265000,
-    VK_INDEX_TYPE_NONE_KHR = 1000165000,
-    VK_INDEX_TYPE_NONE_NV = VK_INDEX_TYPE_NONE_KHR,
-    VK_INDEX_TYPE_UINT8_EXT = VK_INDEX_TYPE_UINT8,
-    VK_INDEX_TYPE_UINT8_KHR = VK_INDEX_TYPE_UINT8,
-    VK_INDEX_TYPE_MAX_ENUM = 0x7FFFFFFF
-} VkIndexType;
-
-typedef enum VkPipelineCacheHeaderVersion {
-    VK_PIPELINE_CACHE_HEADER_VERSION_ONE = 1,
-    VK_PIPELINE_CACHE_HEADER_VERSION_DATA_GRAPH_QCOM = 1000629000,
-    VK_PIPELINE_CACHE_HEADER_VERSION_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineCacheHeaderVersion;
-
-typedef enum VkBorderColor {
-    VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK = 0,
-    VK_BORDER_COLOR_INT_TRANSPARENT_BLACK = 1,
-    VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK = 2,
-    VK_BORDER_COLOR_INT_OPAQUE_BLACK = 3,
-    VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE = 4,
-    VK_BORDER_COLOR_INT_OPAQUE_WHITE = 5,
-    VK_BORDER_COLOR_FLOAT_CUSTOM_EXT = 1000287003,
-    VK_BORDER_COLOR_INT_CUSTOM_EXT = 1000287004,
-    VK_BORDER_COLOR_MAX_ENUM = 0x7FFFFFFF
-} VkBorderColor;
-
-typedef enum VkFilter {
-    VK_FILTER_NEAREST = 0,
-    VK_FILTER_LINEAR = 1,
-    VK_FILTER_CUBIC_EXT = 1000015000,
-    VK_FILTER_CUBIC_IMG = VK_FILTER_CUBIC_EXT,
-    VK_FILTER_MAX_ENUM = 0x7FFFFFFF
-} VkFilter;
-
-typedef enum VkSamplerAddressMode {
-    VK_SAMPLER_ADDRESS_MODE_REPEAT = 0,
-    VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT = 1,
-    VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE = 2,
-    VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER = 3,
-    VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE = 4,
-  // VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE_KHR is a legacy alias
-    VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE_KHR = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE,
-    VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
-} VkSamplerAddressMode;
-
-typedef enum VkSamplerMipmapMode {
-    VK_SAMPLER_MIPMAP_MODE_NEAREST = 0,
-    VK_SAMPLER_MIPMAP_MODE_LINEAR = 1,
-    VK_SAMPLER_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
-} VkSamplerMipmapMode;
-
-typedef enum VkCompareOp {
-    VK_COMPARE_OP_NEVER = 0,
-    VK_COMPARE_OP_LESS = 1,
-    VK_COMPARE_OP_EQUAL = 2,
-    VK_COMPARE_OP_LESS_OR_EQUAL = 3,
-    VK_COMPARE_OP_GREATER = 4,
-    VK_COMPARE_OP_NOT_EQUAL = 5,
-    VK_COMPARE_OP_GREATER_OR_EQUAL = 6,
-    VK_COMPARE_OP_ALWAYS = 7,
-    VK_COMPARE_OP_MAX_ENUM = 0x7FFFFFFF
-} VkCompareOp;
-
-typedef enum VkDescriptorType {
-    VK_DESCRIPTOR_TYPE_SAMPLER = 0,
-    VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER = 1,
-    VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE = 2,
-    VK_DESCRIPTOR_TYPE_STORAGE_IMAGE = 3,
-    VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER = 4,
-    VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER = 5,
-    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER = 6,
-    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER = 7,
-    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8,
-    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9,
-    VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10,
-    VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK = 1000138000,
-    VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR = 1000150000,
-    VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000,
-    VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM = 1000440000,
-    VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM = 1000440001,
-    VK_DESCRIPTOR_TYPE_TENSOR_ARM = 1000460000,
-    VK_DESCRIPTOR_TYPE_MUTABLE_EXT = 1000351000,
-    VK_DESCRIPTOR_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_NV = 1000570000,
-    VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK,
-    VK_DESCRIPTOR_TYPE_MUTABLE_VALVE = VK_DESCRIPTOR_TYPE_MUTABLE_EXT,
-    VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7FFFFFFF
-} VkDescriptorType;
-
-typedef enum VkPipelineBindPoint {
-    VK_PIPELINE_BIND_POINT_GRAPHICS = 0,
-    VK_PIPELINE_BIND_POINT_COMPUTE = 1,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX = 1000134000,
-#endif
-    VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR = 1000165000,
-    VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI = 1000369003,
-    VK_PIPELINE_BIND_POINT_DATA_GRAPH_ARM = 1000507000,
-    VK_PIPELINE_BIND_POINT_RAY_TRACING_NV = VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
-    VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineBindPoint;
-
 typedef enum VkBlendFactor {
     VK_BLEND_FACTOR_ZERO = 0,
     VK_BLEND_FACTOR_ONE = 1,
@@ -2369,6 +1887,18 @@ typedef enum VkBlendOp {
     VK_BLEND_OP_MAX_ENUM = 0x7FFFFFFF
 } VkBlendOp;
 
+typedef enum VkCompareOp {
+    VK_COMPARE_OP_NEVER = 0,
+    VK_COMPARE_OP_LESS = 1,
+    VK_COMPARE_OP_EQUAL = 2,
+    VK_COMPARE_OP_LESS_OR_EQUAL = 3,
+    VK_COMPARE_OP_GREATER = 4,
+    VK_COMPARE_OP_NOT_EQUAL = 5,
+    VK_COMPARE_OP_GREATER_OR_EQUAL = 6,
+    VK_COMPARE_OP_ALWAYS = 7,
+    VK_COMPARE_OP_MAX_ENUM = 0x7FFFFFFF
+} VkCompareOp;
+
 typedef enum VkDynamicState {
     VK_DYNAMIC_STATE_VIEWPORT = 0,
     VK_DYNAMIC_STATE_SCISSOR = 1,
@@ -2394,7 +1924,6 @@ typedef enum VkDynamicState {
     VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE = 1000377001,
     VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE = 1000377002,
     VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE = 1000377004,
-    VK_DYNAMIC_STATE_LINE_STIPPLE = 1000259000,
     VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV = 1000087000,
     VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT = 1000099000,
     VK_DYNAMIC_STATE_DISCARD_RECTANGLE_ENABLE_EXT = 1000099001,
@@ -2442,8 +1971,8 @@ typedef enum VkDynamicState {
     VK_DYNAMIC_STATE_REPRESENTATIVE_FRAGMENT_TEST_ENABLE_NV = 1000455031,
     VK_DYNAMIC_STATE_COVERAGE_REDUCTION_MODE_NV = 1000455032,
     VK_DYNAMIC_STATE_ATTACHMENT_FEEDBACK_LOOP_ENABLE_EXT = 1000524000,
-    VK_DYNAMIC_STATE_DEPTH_CLAMP_RANGE_EXT = 1000582000,
-    VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = VK_DYNAMIC_STATE_LINE_STIPPLE,
+    VK_DYNAMIC_STATE_LINE_STIPPLE_KHR = 1000259000,
+    VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = VK_DYNAMIC_STATE_LINE_STIPPLE_KHR,
     VK_DYNAMIC_STATE_CULL_MODE_EXT = VK_DYNAMIC_STATE_CULL_MODE,
     VK_DYNAMIC_STATE_FRONT_FACE_EXT = VK_DYNAMIC_STATE_FRONT_FACE,
     VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY,
@@ -2459,7 +1988,6 @@ typedef enum VkDynamicState {
     VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT = VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE,
     VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE,
     VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE,
-    VK_DYNAMIC_STATE_LINE_STIPPLE_KHR = VK_DYNAMIC_STATE_LINE_STIPPLE,
     VK_DYNAMIC_STATE_MAX_ENUM = 0x7FFFFFFF
 } VkDynamicState;
 
@@ -2530,13 +2058,71 @@ typedef enum VkLogicOp {
     VK_LOGIC_OP_MAX_ENUM = 0x7FFFFFFF
 } VkLogicOp;
 
+typedef enum VkBorderColor {
+    VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK = 0,
+    VK_BORDER_COLOR_INT_TRANSPARENT_BLACK = 1,
+    VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK = 2,
+    VK_BORDER_COLOR_INT_OPAQUE_BLACK = 3,
+    VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE = 4,
+    VK_BORDER_COLOR_INT_OPAQUE_WHITE = 5,
+    VK_BORDER_COLOR_FLOAT_CUSTOM_EXT = 1000287003,
+    VK_BORDER_COLOR_INT_CUSTOM_EXT = 1000287004,
+    VK_BORDER_COLOR_MAX_ENUM = 0x7FFFFFFF
+} VkBorderColor;
+
+typedef enum VkFilter {
+    VK_FILTER_NEAREST = 0,
+    VK_FILTER_LINEAR = 1,
+    VK_FILTER_CUBIC_EXT = 1000015000,
+    VK_FILTER_CUBIC_IMG = VK_FILTER_CUBIC_EXT,
+    VK_FILTER_MAX_ENUM = 0x7FFFFFFF
+} VkFilter;
+
+typedef enum VkSamplerAddressMode {
+    VK_SAMPLER_ADDRESS_MODE_REPEAT = 0,
+    VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT = 1,
+    VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE = 2,
+    VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER = 3,
+    VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE = 4,
+    VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE_KHR = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE,
+    VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
+} VkSamplerAddressMode;
+
+typedef enum VkSamplerMipmapMode {
+    VK_SAMPLER_MIPMAP_MODE_NEAREST = 0,
+    VK_SAMPLER_MIPMAP_MODE_LINEAR = 1,
+    VK_SAMPLER_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
+} VkSamplerMipmapMode;
+
+typedef enum VkDescriptorType {
+    VK_DESCRIPTOR_TYPE_SAMPLER = 0,
+    VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER = 1,
+    VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE = 2,
+    VK_DESCRIPTOR_TYPE_STORAGE_IMAGE = 3,
+    VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER = 4,
+    VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER = 5,
+    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER = 6,
+    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER = 7,
+    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8,
+    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9,
+    VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10,
+    VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK = 1000138000,
+    VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR = 1000150000,
+    VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000,
+    VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM = 1000440000,
+    VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM = 1000440001,
+    VK_DESCRIPTOR_TYPE_MUTABLE_EXT = 1000351000,
+    VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK,
+    VK_DESCRIPTOR_TYPE_MUTABLE_VALVE = VK_DESCRIPTOR_TYPE_MUTABLE_EXT,
+    VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7FFFFFFF
+} VkDescriptorType;
+
 typedef enum VkAttachmentLoadOp {
     VK_ATTACHMENT_LOAD_OP_LOAD = 0,
     VK_ATTACHMENT_LOAD_OP_CLEAR = 1,
     VK_ATTACHMENT_LOAD_OP_DONT_CARE = 2,
-    VK_ATTACHMENT_LOAD_OP_NONE = 1000400000,
-    VK_ATTACHMENT_LOAD_OP_NONE_EXT = VK_ATTACHMENT_LOAD_OP_NONE,
-    VK_ATTACHMENT_LOAD_OP_NONE_KHR = VK_ATTACHMENT_LOAD_OP_NONE,
+    VK_ATTACHMENT_LOAD_OP_NONE_KHR = 1000400000,
+    VK_ATTACHMENT_LOAD_OP_NONE_EXT = VK_ATTACHMENT_LOAD_OP_NONE_KHR,
     VK_ATTACHMENT_LOAD_OP_MAX_ENUM = 0x7FFFFFFF
 } VkAttachmentLoadOp;
 
@@ -2550,11 +2136,38 @@ typedef enum VkAttachmentStoreOp {
     VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7FFFFFFF
 } VkAttachmentStoreOp;
 
+typedef enum VkPipelineBindPoint {
+    VK_PIPELINE_BIND_POINT_GRAPHICS = 0,
+    VK_PIPELINE_BIND_POINT_COMPUTE = 1,
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+    VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX = 1000134000,
+#endif
+    VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR = 1000165000,
+    VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI = 1000369003,
+    VK_PIPELINE_BIND_POINT_RAY_TRACING_NV = VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
+    VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF
+} VkPipelineBindPoint;
+
+typedef enum VkCommandBufferLevel {
+    VK_COMMAND_BUFFER_LEVEL_PRIMARY = 0,
+    VK_COMMAND_BUFFER_LEVEL_SECONDARY = 1,
+    VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7FFFFFFF
+} VkCommandBufferLevel;
+
+typedef enum VkIndexType {
+    VK_INDEX_TYPE_UINT16 = 0,
+    VK_INDEX_TYPE_UINT32 = 1,
+    VK_INDEX_TYPE_NONE_KHR = 1000165000,
+    VK_INDEX_TYPE_UINT8_KHR = 1000265000,
+    VK_INDEX_TYPE_NONE_NV = VK_INDEX_TYPE_NONE_KHR,
+    VK_INDEX_TYPE_UINT8_EXT = VK_INDEX_TYPE_UINT8_KHR,
+    VK_INDEX_TYPE_MAX_ENUM = 0x7FFFFFFF
+} VkIndexType;
+
 typedef enum VkSubpassContents {
     VK_SUBPASS_CONTENTS_INLINE = 0,
     VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS = 1,
-    VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR = 1000451000,
-    VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT = VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR,
+    VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT = 1000451000,
     VK_SUBPASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF
 } VkSubpassContents;
 
@@ -2586,13 +2199,11 @@ typedef enum VkAccessFlagBits {
     VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR = 0x00400000,
     VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000,
     VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000,
-    VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT = 0x00020000,
-    VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT = 0x00040000,
+    VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000,
+    VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000,
     VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR,
     VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR,
     VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR,
-    VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV = VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT,
-    VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV = VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT,
     VK_ACCESS_NONE_KHR = VK_ACCESS_NONE,
     VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkAccessFlagBits;
@@ -2685,15 +2296,14 @@ typedef enum VkImageCreateFlagBits {
     VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT = 0x00010000,
     VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT = 0x00040000,
     VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT = 0x00020000,
+    VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000,
     VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR = 0x00100000,
-    VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_EXT = 0x00008000,
     VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT,
     VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT,
     VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT,
     VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR = VK_IMAGE_CREATE_EXTENDED_USAGE_BIT,
     VK_IMAGE_CREATE_DISJOINT_BIT_KHR = VK_IMAGE_CREATE_DISJOINT_BIT,
     VK_IMAGE_CREATE_ALIAS_BIT_KHR = VK_IMAGE_CREATE_ALIAS_BIT,
-    VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_EXT,
     VK_IMAGE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkImageCreateFlagBits;
 typedef VkFlags VkImageCreateFlags;
@@ -2719,12 +2329,12 @@ typedef enum VkImageUsageFlagBits {
     VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000020,
     VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT = 0x00000040,
     VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT = 0x00000080,
-    VK_IMAGE_USAGE_HOST_TRANSFER_BIT = 0x00400000,
     VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR = 0x00000400,
     VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR = 0x00000800,
     VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR = 0x00001000,
     VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x00000200,
     VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00000100,
+    VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT = 0x00400000,
     VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR = 0x00002000,
     VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR = 0x00004000,
     VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR = 0x00008000,
@@ -2732,12 +2342,7 @@ typedef enum VkImageUsageFlagBits {
     VK_IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI = 0x00040000,
     VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM = 0x00100000,
     VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM = 0x00200000,
-    VK_IMAGE_USAGE_TENSOR_ALIASING_BIT_ARM = 0x00800000,
-    VK_IMAGE_USAGE_TILE_MEMORY_BIT_QCOM = 0x08000000,
-    VK_IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x02000000,
-    VK_IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR = 0x04000000,
     VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
-    VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT = VK_IMAGE_USAGE_HOST_TRANSFER_BIT,
     VK_IMAGE_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkImageUsageFlagBits;
 typedef VkFlags VkImageUsageFlags;
@@ -2751,7 +2356,6 @@ typedef VkFlags VkInstanceCreateFlags;
 typedef enum VkMemoryHeapFlagBits {
     VK_MEMORY_HEAP_DEVICE_LOCAL_BIT = 0x00000001,
     VK_MEMORY_HEAP_MULTI_INSTANCE_BIT = 0x00000002,
-    VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM = 0x00000008,
     VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHR = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT,
     VK_MEMORY_HEAP_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkMemoryHeapFlagBits;
@@ -2780,7 +2384,6 @@ typedef enum VkQueueFlagBits {
     VK_QUEUE_VIDEO_DECODE_BIT_KHR = 0x00000020,
     VK_QUEUE_VIDEO_ENCODE_BIT_KHR = 0x00000040,
     VK_QUEUE_OPTICAL_FLOW_BIT_NV = 0x00000100,
-    VK_QUEUE_DATA_GRAPH_BIT_ARM = 0x00000400,
     VK_QUEUE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkQueueFlagBits;
 typedef VkFlags VkQueueFlags;
@@ -2817,15 +2420,14 @@ typedef enum VkPipelineStageFlagBits {
     VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR = 0x00200000,
     VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000,
     VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000,
+    VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV = 0x00020000,
     VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT = 0x00080000,
     VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT = 0x00100000,
-    VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT = 0x00020000,
     VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
     VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_NV = VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR,
     VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR,
     VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT,
     VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT,
-    VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV = VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT,
     VK_PIPELINE_STAGE_NONE_KHR = VK_PIPELINE_STAGE_NONE,
     VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkPipelineStageFlagBits;
@@ -2858,11 +2460,12 @@ typedef enum VkFenceCreateFlagBits {
 typedef VkFlags VkFenceCreateFlags;
 typedef VkFlags VkSemaphoreCreateFlags;
 
-typedef enum VkQueryPoolCreateFlagBits {
-    VK_QUERY_POOL_CREATE_RESET_BIT_KHR = 0x00000001,
-    VK_QUERY_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkQueryPoolCreateFlagBits;
-typedef VkFlags VkQueryPoolCreateFlags;
+typedef enum VkEventCreateFlagBits {
+    VK_EVENT_CREATE_DEVICE_ONLY_BIT = 0x00000001,
+    VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT,
+    VK_EVENT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkEventCreateFlagBits;
+typedef VkFlags VkEventCreateFlags;
 
 typedef enum VkQueryPipelineStatisticFlagBits {
     VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT = 0x00000001,
@@ -2882,6 +2485,7 @@ typedef enum VkQueryPipelineStatisticFlagBits {
     VK_QUERY_PIPELINE_STATISTIC_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkQueryPipelineStatisticFlagBits;
 typedef VkFlags VkQueryPipelineStatisticFlags;
+typedef VkFlags VkQueryPoolCreateFlags;
 
 typedef enum VkQueryResultFlagBits {
     VK_QUERY_RESULT_64_BIT = 0x00000001,
@@ -2936,13 +2540,13 @@ typedef enum VkBufferUsageFlagBits {
     VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT = 0x04000000,
     VK_BUFFER_USAGE_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT = 0x00800000,
     VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT = 0x01000000,
-    VK_BUFFER_USAGE_TILE_MEMORY_BIT_QCOM = 0x08000000,
     VK_BUFFER_USAGE_RAY_TRACING_BIT_NV = VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR,
     VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
     VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
     VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkBufferUsageFlagBits;
 typedef VkFlags VkBufferUsageFlags;
+typedef VkFlags VkBufferViewCreateFlags;
 
 typedef enum VkImageViewCreateFlagBits {
     VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DYNAMIC_BIT_EXT = 0x00000001,
@@ -2951,81 +2555,34 @@ typedef enum VkImageViewCreateFlagBits {
     VK_IMAGE_VIEW_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkImageViewCreateFlagBits;
 typedef VkFlags VkImageViewCreateFlags;
-
-typedef enum VkDependencyFlagBits {
-    VK_DEPENDENCY_BY_REGION_BIT = 0x00000001,
-    VK_DEPENDENCY_DEVICE_GROUP_BIT = 0x00000004,
-    VK_DEPENDENCY_VIEW_LOCAL_BIT = 0x00000002,
-    VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT = 0x00000008,
-    VK_DEPENDENCY_QUEUE_FAMILY_OWNERSHIP_TRANSFER_USE_ALL_STAGES_BIT_KHR = 0x00000020,
-    VK_DEPENDENCY_ASYMMETRIC_EVENT_BIT_KHR = 0x00000040,
-    VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR = VK_DEPENDENCY_VIEW_LOCAL_BIT,
-    VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR = VK_DEPENDENCY_DEVICE_GROUP_BIT,
-    VK_DEPENDENCY_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkDependencyFlagBits;
-typedef VkFlags VkDependencyFlags;
-
-typedef enum VkCommandPoolCreateFlagBits {
-    VK_COMMAND_POOL_CREATE_TRANSIENT_BIT = 0x00000001,
-    VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT = 0x00000002,
-    VK_COMMAND_POOL_CREATE_PROTECTED_BIT = 0x00000004,
-    VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkCommandPoolCreateFlagBits;
-typedef VkFlags VkCommandPoolCreateFlags;
-
-typedef enum VkCommandPoolResetFlagBits {
-    VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
-    VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkCommandPoolResetFlagBits;
-typedef VkFlags VkCommandPoolResetFlags;
-
-typedef enum VkCommandBufferUsageFlagBits {
-    VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001,
-    VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT = 0x00000002,
-    VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT = 0x00000004,
-    VK_COMMAND_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkCommandBufferUsageFlagBits;
-typedef VkFlags VkCommandBufferUsageFlags;
-
-typedef enum VkQueryControlFlagBits {
-    VK_QUERY_CONTROL_PRECISE_BIT = 0x00000001,
-    VK_QUERY_CONTROL_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkQueryControlFlagBits;
-typedef VkFlags VkQueryControlFlags;
-
-typedef enum VkCommandBufferResetFlagBits {
-    VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
-    VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkCommandBufferResetFlagBits;
-typedef VkFlags VkCommandBufferResetFlags;
-
-typedef enum VkEventCreateFlagBits {
-    VK_EVENT_CREATE_DEVICE_ONLY_BIT = 0x00000001,
-    VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT,
-    VK_EVENT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkEventCreateFlagBits;
-typedef VkFlags VkEventCreateFlags;
-typedef VkFlags VkBufferViewCreateFlags;
 typedef VkFlags VkShaderModuleCreateFlags;
 
 typedef enum VkPipelineCacheCreateFlagBits {
     VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001,
-    VK_PIPELINE_CACHE_CREATE_INTERNALLY_SYNCHRONIZED_MERGE_BIT_KHR = 0x00000008,
     VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT,
     VK_PIPELINE_CACHE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkPipelineCacheCreateFlagBits;
 typedef VkFlags VkPipelineCacheCreateFlags;
 
+typedef enum VkColorComponentFlagBits {
+    VK_COLOR_COMPONENT_R_BIT = 0x00000001,
+    VK_COLOR_COMPONENT_G_BIT = 0x00000002,
+    VK_COLOR_COMPONENT_B_BIT = 0x00000004,
+    VK_COLOR_COMPONENT_A_BIT = 0x00000008,
+    VK_COLOR_COMPONENT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkColorComponentFlagBits;
+typedef VkFlags VkColorComponentFlags;
+
 typedef enum VkPipelineCreateFlagBits {
     VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT = 0x00000001,
     VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT = 0x00000002,
     VK_PIPELINE_CREATE_DERIVATIVE_BIT = 0x00000004,
-    VK_PIPELINE_CREATE_DISPATCH_BASE_BIT = 0x00000010,
     VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT = 0x00000008,
+    VK_PIPELINE_CREATE_DISPATCH_BASE_BIT = 0x00000010,
     VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT = 0x00000100,
     VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT = 0x00000200,
-    VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT = 0x08000000,
-    VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT = 0x40000000,
+    VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000,
+    VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000,
     VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 0x00004000,
     VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 0x00008000,
     VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 0x00010000,
@@ -3034,8 +2591,6 @@ typedef enum VkPipelineCreateFlagBits {
     VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR = 0x00002000,
     VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR = 0x00080000,
     VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV = 0x00000020,
-    VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000,
-    VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000,
     VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR = 0x00000040,
     VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR = 0x00000080,
     VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00040000,
@@ -3050,20 +2605,15 @@ typedef enum VkPipelineCreateFlagBits {
 #ifdef VK_ENABLE_BETA_EXTENSIONS
     VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV = 0x10000000,
 #endif
-  // VK_PIPELINE_CREATE_DISPATCH_BASE is a legacy alias
+    VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT = 0x08000000,
+    VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT = 0x40000000,
     VK_PIPELINE_CREATE_DISPATCH_BASE = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT,
-    VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT,
-    VK_PIPELINE_CREATE_DISPATCH_BASE_BIT_KHR = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT,
-  // VK_PIPELINE_CREATE_DISPATCH_BASE_KHR is a legacy alias
-    VK_PIPELINE_CREATE_DISPATCH_BASE_KHR = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT,
-  // VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT is a legacy alias
-    VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
-  // VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR is a legacy alias
     VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
+    VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT,
+    VK_PIPELINE_CREATE_DISPATCH_BASE_KHR = VK_PIPELINE_CREATE_DISPATCH_BASE,
     VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT,
     VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT,
-    VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT,
-    VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT,
     VK_PIPELINE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkPipelineCreateFlagBits;
 typedef VkFlags VkPipelineCreateFlags;
@@ -3107,60 +2657,6 @@ typedef enum VkShaderStageFlagBits {
     VK_SHADER_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkShaderStageFlagBits;
 
-typedef enum VkPipelineLayoutCreateFlagBits {
-    VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT = 0x00000002,
-    VK_PIPELINE_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineLayoutCreateFlagBits;
-typedef VkFlags VkPipelineLayoutCreateFlags;
-typedef VkFlags VkShaderStageFlags;
-
-typedef enum VkSamplerCreateFlagBits {
-    VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001,
-    VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002,
-    VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT = 0x00000008,
-    VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT = 0x00000004,
-    VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM = 0x00000010,
-    VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkSamplerCreateFlagBits;
-typedef VkFlags VkSamplerCreateFlags;
-
-typedef enum VkDescriptorPoolCreateFlagBits {
-    VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT = 0x00000001,
-    VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT = 0x00000002,
-    VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT = 0x00000004,
-    VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV = 0x00000008,
-    VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV = 0x00000010,
-    VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
-    VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT,
-    VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkDescriptorPoolCreateFlagBits;
-typedef VkFlags VkDescriptorPoolCreateFlags;
-typedef VkFlags VkDescriptorPoolResetFlags;
-
-typedef enum VkDescriptorSetLayoutCreateFlagBits {
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT = 0x00000002,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT = 0x00000001,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT = 0x00000010,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT = 0x00000020,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00000080,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT = 0x00000004,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV = 0x00000040,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT,
-    VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkDescriptorSetLayoutCreateFlagBits;
-typedef VkFlags VkDescriptorSetLayoutCreateFlags;
-
-typedef enum VkColorComponentFlagBits {
-    VK_COLOR_COMPONENT_R_BIT = 0x00000001,
-    VK_COLOR_COMPONENT_G_BIT = 0x00000002,
-    VK_COLOR_COMPONENT_B_BIT = 0x00000004,
-    VK_COLOR_COMPONENT_A_BIT = 0x00000008,
-    VK_COLOR_COMPONENT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkColorComponentFlagBits;
-typedef VkFlags VkColorComponentFlags;
-
 typedef enum VkCullModeFlagBits {
     VK_CULL_MODE_NONE = 0,
     VK_CULL_MODE_FRONT_BIT = 0x00000001,
@@ -3193,14 +2689,67 @@ typedef enum VkPipelineColorBlendStateCreateFlagBits {
 typedef VkFlags VkPipelineColorBlendStateCreateFlags;
 typedef VkFlags VkPipelineDynamicStateCreateFlags;
 
+typedef enum VkPipelineLayoutCreateFlagBits {
+    VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT = 0x00000002,
+    VK_PIPELINE_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkPipelineLayoutCreateFlagBits;
+typedef VkFlags VkPipelineLayoutCreateFlags;
+typedef VkFlags VkShaderStageFlags;
+
+typedef enum VkSamplerCreateFlagBits {
+    VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001,
+    VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002,
+    VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT = 0x00000008,
+    VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT = 0x00000004,
+    VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM = 0x00000010,
+    VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkSamplerCreateFlagBits;
+typedef VkFlags VkSamplerCreateFlags;
+
+typedef enum VkDescriptorPoolCreateFlagBits {
+    VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT = 0x00000001,
+    VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT = 0x00000002,
+    VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT = 0x00000004,
+    VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV = 0x00000008,
+    VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV = 0x00000010,
+    VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
+    VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT,
+    VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkDescriptorPoolCreateFlagBits;
+typedef VkFlags VkDescriptorPoolCreateFlags;
+typedef VkFlags VkDescriptorPoolResetFlags;
+
+typedef enum VkDescriptorSetLayoutCreateFlagBits {
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT = 0x00000002,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR = 0x00000001,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT = 0x00000010,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT = 0x00000020,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00000080,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT = 0x00000004,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV = 0x00000040,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT,
+    VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkDescriptorSetLayoutCreateFlagBits;
+typedef VkFlags VkDescriptorSetLayoutCreateFlags;
+
 typedef enum VkAttachmentDescriptionFlagBits {
     VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT = 0x00000001,
-    VK_ATTACHMENT_DESCRIPTION_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR = 0x00000002,
-    VK_ATTACHMENT_DESCRIPTION_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR = 0x00000004,
     VK_ATTACHMENT_DESCRIPTION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkAttachmentDescriptionFlagBits;
 typedef VkFlags VkAttachmentDescriptionFlags;
 
+typedef enum VkDependencyFlagBits {
+    VK_DEPENDENCY_BY_REGION_BIT = 0x00000001,
+    VK_DEPENDENCY_DEVICE_GROUP_BIT = 0x00000004,
+    VK_DEPENDENCY_VIEW_LOCAL_BIT = 0x00000002,
+    VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT = 0x00000008,
+    VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR = VK_DEPENDENCY_VIEW_LOCAL_BIT,
+    VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR = VK_DEPENDENCY_DEVICE_GROUP_BIT,
+    VK_DEPENDENCY_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkDependencyFlagBits;
+typedef VkFlags VkDependencyFlags;
+
 typedef enum VkFramebufferCreateFlagBits {
     VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT = 0x00000001,
     VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT,
@@ -3210,7 +2759,6 @@ typedef VkFlags VkFramebufferCreateFlags;
 
 typedef enum VkRenderPassCreateFlagBits {
     VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM = 0x00000002,
-    VK_RENDER_PASS_CREATE_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE = 0x00000004,
     VK_RENDER_PASS_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkRenderPassCreateFlagBits;
 typedef VkFlags VkRenderPassCreateFlags;
@@ -3218,15 +2766,12 @@ typedef VkFlags VkRenderPassCreateFlags;
 typedef enum VkSubpassDescriptionFlagBits {
     VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX = 0x00000001,
     VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX = 0x00000002,
-    VK_SUBPASS_DESCRIPTION_TILE_SHADING_APRON_BIT_QCOM = 0x00000100,
+    VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = 0x00000004,
+    VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = 0x00000008,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT = 0x00000010,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT = 0x00000020,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT = 0x00000040,
     VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x00000080,
-    VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_EXT = 0x00000004,
-    VK_SUBPASS_DESCRIPTION_CUSTOM_RESOLVE_BIT_EXT = 0x00000008,
-    VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_EXT,
-    VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = VK_SUBPASS_DESCRIPTION_CUSTOM_RESOLVE_BIT_EXT,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT,
     VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT,
@@ -3234,11 +2779,44 @@ typedef enum VkSubpassDescriptionFlagBits {
 } VkSubpassDescriptionFlagBits;
 typedef VkFlags VkSubpassDescriptionFlags;
 
+typedef enum VkCommandPoolCreateFlagBits {
+    VK_COMMAND_POOL_CREATE_TRANSIENT_BIT = 0x00000001,
+    VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT = 0x00000002,
+    VK_COMMAND_POOL_CREATE_PROTECTED_BIT = 0x00000004,
+    VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkCommandPoolCreateFlagBits;
+typedef VkFlags VkCommandPoolCreateFlags;
+
+typedef enum VkCommandPoolResetFlagBits {
+    VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
+    VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkCommandPoolResetFlagBits;
+typedef VkFlags VkCommandPoolResetFlags;
+
+typedef enum VkCommandBufferUsageFlagBits {
+    VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001,
+    VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT = 0x00000002,
+    VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT = 0x00000004,
+    VK_COMMAND_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkCommandBufferUsageFlagBits;
+typedef VkFlags VkCommandBufferUsageFlags;
+
+typedef enum VkQueryControlFlagBits {
+    VK_QUERY_CONTROL_PRECISE_BIT = 0x00000001,
+    VK_QUERY_CONTROL_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkQueryControlFlagBits;
+typedef VkFlags VkQueryControlFlags;
+
+typedef enum VkCommandBufferResetFlagBits {
+    VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
+    VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkCommandBufferResetFlagBits;
+typedef VkFlags VkCommandBufferResetFlags;
+
 typedef enum VkStencilFaceFlagBits {
     VK_STENCIL_FACE_FRONT_BIT = 0x00000001,
     VK_STENCIL_FACE_BACK_BIT = 0x00000002,
     VK_STENCIL_FACE_FRONT_AND_BACK = 0x00000003,
-  // VK_STENCIL_FRONT_AND_BACK is a legacy alias
     VK_STENCIL_FRONT_AND_BACK = VK_STENCIL_FACE_FRONT_AND_BACK,
     VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkStencilFaceFlagBits;
@@ -3292,6 +2870,27 @@ typedef struct VkBufferMemoryBarrier {
     VkDeviceSize       size;
 } VkBufferMemoryBarrier;
 
+typedef struct VkDispatchIndirectCommand {
+    uint32_t    x;
+    uint32_t    y;
+    uint32_t    z;
+} VkDispatchIndirectCommand;
+
+typedef struct VkDrawIndexedIndirectCommand {
+    uint32_t    indexCount;
+    uint32_t    instanceCount;
+    uint32_t    firstIndex;
+    int32_t     vertexOffset;
+    uint32_t    firstInstance;
+} VkDrawIndexedIndirectCommand;
+
+typedef struct VkDrawIndirectCommand {
+    uint32_t    vertexCount;
+    uint32_t    instanceCount;
+    uint32_t    firstVertex;
+    uint32_t    firstInstance;
+} VkDrawIndirectCommand;
+
 typedef struct VkImageSubresourceRange {
     VkImageAspectFlags    aspectMask;
     uint32_t              baseMipLevel;
@@ -3320,6 +2919,14 @@ typedef struct VkMemoryBarrier {
     VkAccessFlags      dstAccessMask;
 } VkMemoryBarrier;
 
+typedef struct VkPipelineCacheHeaderVersionOne {
+    uint32_t                        headerSize;
+    VkPipelineCacheHeaderVersion    headerVersion;
+    uint32_t                        vendorID;
+    uint32_t                        deviceID;
+    uint8_t                         pipelineCacheUUID[VK_UUID_SIZE];
+} VkPipelineCacheHeaderVersionOne;
+
 typedef void* (VKAPI_PTR *PFN_vkAllocationFunction)(
     void*                                       pUserData,
     size_t                                      size,
@@ -3620,9 +3227,7 @@ typedef struct VkDeviceCreateInfo {
     VkDeviceCreateFlags                flags;
     uint32_t                           queueCreateInfoCount;
     const VkDeviceQueueCreateInfo*     pQueueCreateInfos;
-    // enabledLayerCount is legacy and should not be used
     uint32_t                           enabledLayerCount;
-    // ppEnabledLayerNames is legacy and should not be used
     const char* const*                 ppEnabledLayerNames;
     uint32_t                           enabledExtensionCount;
     const char* const*                 ppEnabledExtensionNames;
@@ -3756,6 +3361,12 @@ typedef struct VkSemaphoreCreateInfo {
     VkSemaphoreCreateFlags    flags;
 } VkSemaphoreCreateInfo;
 
+typedef struct VkEventCreateInfo {
+    VkStructureType       sType;
+    const void*           pNext;
+    VkEventCreateFlags    flags;
+} VkEventCreateInfo;
+
 typedef struct VkQueryPoolCreateInfo {
     VkStructureType                  sType;
     const void*                      pNext;
@@ -3776,6 +3387,16 @@ typedef struct VkBufferCreateInfo {
     const uint32_t*        pQueueFamilyIndices;
 } VkBufferCreateInfo;
 
+typedef struct VkBufferViewCreateInfo {
+    VkStructureType            sType;
+    const void*                pNext;
+    VkBufferViewCreateFlags    flags;
+    VkBuffer                   buffer;
+    VkFormat                   format;
+    VkDeviceSize               offset;
+    VkDeviceSize               range;
+} VkBufferViewCreateInfo;
+
 typedef struct VkImageCreateInfo {
     VkStructureType          sType;
     const void*              pNext;
@@ -3820,99 +3441,6 @@ typedef struct VkImageViewCreateInfo {
     VkImageSubresourceRange    subresourceRange;
 } VkImageViewCreateInfo;
 
-typedef struct VkCommandPoolCreateInfo {
-    VkStructureType             sType;
-    const void*                 pNext;
-    VkCommandPoolCreateFlags    flags;
-    uint32_t                    queueFamilyIndex;
-} VkCommandPoolCreateInfo;
-
-typedef struct VkCommandBufferAllocateInfo {
-    VkStructureType         sType;
-    const void*             pNext;
-    VkCommandPool           commandPool;
-    VkCommandBufferLevel    level;
-    uint32_t                commandBufferCount;
-} VkCommandBufferAllocateInfo;
-
-typedef struct VkCommandBufferInheritanceInfo {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkRenderPass                     renderPass;
-    uint32_t                         subpass;
-    VkFramebuffer                    framebuffer;
-    VkBool32                         occlusionQueryEnable;
-    VkQueryControlFlags              queryFlags;
-    VkQueryPipelineStatisticFlags    pipelineStatistics;
-} VkCommandBufferInheritanceInfo;
-
-typedef struct VkCommandBufferBeginInfo {
-    VkStructureType                          sType;
-    const void*                              pNext;
-    VkCommandBufferUsageFlags                flags;
-    const VkCommandBufferInheritanceInfo*    pInheritanceInfo;
-} VkCommandBufferBeginInfo;
-
-typedef struct VkBufferCopy {
-    VkDeviceSize    srcOffset;
-    VkDeviceSize    dstOffset;
-    VkDeviceSize    size;
-} VkBufferCopy;
-
-typedef struct VkImageSubresourceLayers {
-    VkImageAspectFlags    aspectMask;
-    uint32_t              mipLevel;
-    uint32_t              baseArrayLayer;
-    uint32_t              layerCount;
-} VkImageSubresourceLayers;
-
-typedef struct VkBufferImageCopy {
-    VkDeviceSize                bufferOffset;
-    uint32_t                    bufferRowLength;
-    uint32_t                    bufferImageHeight;
-    VkImageSubresourceLayers    imageSubresource;
-    VkOffset3D                  imageOffset;
-    VkExtent3D                  imageExtent;
-} VkBufferImageCopy;
-
-typedef struct VkImageCopy {
-    VkImageSubresourceLayers    srcSubresource;
-    VkOffset3D                  srcOffset;
-    VkImageSubresourceLayers    dstSubresource;
-    VkOffset3D                  dstOffset;
-    VkExtent3D                  extent;
-} VkImageCopy;
-
-typedef struct VkDispatchIndirectCommand {
-    uint32_t    x;
-    uint32_t    y;
-    uint32_t    z;
-} VkDispatchIndirectCommand;
-
-typedef struct VkPipelineCacheHeaderVersionOne {
-    uint32_t                        headerSize;
-    VkPipelineCacheHeaderVersion    headerVersion;
-    uint32_t                        vendorID;
-    uint32_t                        deviceID;
-    uint8_t                         pipelineCacheUUID[VK_UUID_SIZE];
-} VkPipelineCacheHeaderVersionOne;
-
-typedef struct VkEventCreateInfo {
-    VkStructureType       sType;
-    const void*           pNext;
-    VkEventCreateFlags    flags;
-} VkEventCreateInfo;
-
-typedef struct VkBufferViewCreateInfo {
-    VkStructureType            sType;
-    const void*                pNext;
-    VkBufferViewCreateFlags    flags;
-    VkBuffer                   buffer;
-    VkFormat                   format;
-    VkDeviceSize               offset;
-    VkDeviceSize               range;
-} VkBufferViewCreateInfo;
-
 typedef struct VkShaderModuleCreateInfo {
     VkStructureType              sType;
     const void*                  pNext;
@@ -3962,139 +3490,6 @@ typedef struct VkComputePipelineCreateInfo {
     int32_t                            basePipelineIndex;
 } VkComputePipelineCreateInfo;
 
-typedef struct VkPushConstantRange {
-    VkShaderStageFlags    stageFlags;
-    uint32_t              offset;
-    uint32_t              size;
-} VkPushConstantRange;
-
-typedef struct VkPipelineLayoutCreateInfo {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    VkPipelineLayoutCreateFlags     flags;
-    uint32_t                        setLayoutCount;
-    const VkDescriptorSetLayout*    pSetLayouts;
-    uint32_t                        pushConstantRangeCount;
-    const VkPushConstantRange*      pPushConstantRanges;
-} VkPipelineLayoutCreateInfo;
-
-typedef struct VkSamplerCreateInfo {
-    VkStructureType         sType;
-    const void*             pNext;
-    VkSamplerCreateFlags    flags;
-    VkFilter                magFilter;
-    VkFilter                minFilter;
-    VkSamplerMipmapMode     mipmapMode;
-    VkSamplerAddressMode    addressModeU;
-    VkSamplerAddressMode    addressModeV;
-    VkSamplerAddressMode    addressModeW;
-    float                   mipLodBias;
-    VkBool32                anisotropyEnable;
-    float                   maxAnisotropy;
-    VkBool32                compareEnable;
-    VkCompareOp             compareOp;
-    float                   minLod;
-    float                   maxLod;
-    VkBorderColor           borderColor;
-    VkBool32                unnormalizedCoordinates;
-} VkSamplerCreateInfo;
-
-typedef struct VkCopyDescriptorSet {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkDescriptorSet    srcSet;
-    uint32_t           srcBinding;
-    uint32_t           srcArrayElement;
-    VkDescriptorSet    dstSet;
-    uint32_t           dstBinding;
-    uint32_t           dstArrayElement;
-    uint32_t           descriptorCount;
-} VkCopyDescriptorSet;
-
-typedef struct VkDescriptorBufferInfo {
-    VkBuffer        buffer;
-    VkDeviceSize    offset;
-    VkDeviceSize    range;
-} VkDescriptorBufferInfo;
-
-typedef struct VkDescriptorImageInfo {
-    VkSampler        sampler;
-    VkImageView      imageView;
-    VkImageLayout    imageLayout;
-} VkDescriptorImageInfo;
-
-typedef struct VkDescriptorPoolSize {
-    VkDescriptorType    type;
-    uint32_t            descriptorCount;
-} VkDescriptorPoolSize;
-
-typedef struct VkDescriptorPoolCreateInfo {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkDescriptorPoolCreateFlags    flags;
-    uint32_t                       maxSets;
-    uint32_t                       poolSizeCount;
-    const VkDescriptorPoolSize*    pPoolSizes;
-} VkDescriptorPoolCreateInfo;
-
-typedef struct VkDescriptorSetAllocateInfo {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    VkDescriptorPool                descriptorPool;
-    uint32_t                        descriptorSetCount;
-    const VkDescriptorSetLayout*    pSetLayouts;
-} VkDescriptorSetAllocateInfo;
-
-typedef struct VkDescriptorSetLayoutBinding {
-    uint32_t              binding;
-    VkDescriptorType      descriptorType;
-    uint32_t              descriptorCount;
-    VkShaderStageFlags    stageFlags;
-    const VkSampler*      pImmutableSamplers;
-} VkDescriptorSetLayoutBinding;
-
-typedef struct VkDescriptorSetLayoutCreateInfo {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    VkDescriptorSetLayoutCreateFlags       flags;
-    uint32_t                               bindingCount;
-    const VkDescriptorSetLayoutBinding*    pBindings;
-} VkDescriptorSetLayoutCreateInfo;
-
-typedef struct VkWriteDescriptorSet {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkDescriptorSet                  dstSet;
-    uint32_t                         dstBinding;
-    uint32_t                         dstArrayElement;
-    uint32_t                         descriptorCount;
-    VkDescriptorType                 descriptorType;
-    const VkDescriptorImageInfo*     pImageInfo;
-    const VkDescriptorBufferInfo*    pBufferInfo;
-    const VkBufferView*              pTexelBufferView;
-} VkWriteDescriptorSet;
-
-typedef union VkClearColorValue {
-    float       float32[4];
-    int32_t     int32[4];
-    uint32_t    uint32[4];
-} VkClearColorValue;
-
-typedef struct VkDrawIndexedIndirectCommand {
-    uint32_t    indexCount;
-    uint32_t    instanceCount;
-    uint32_t    firstIndex;
-    int32_t     vertexOffset;
-    uint32_t    firstInstance;
-} VkDrawIndexedIndirectCommand;
-
-typedef struct VkDrawIndirectCommand {
-    uint32_t    vertexCount;
-    uint32_t    instanceCount;
-    uint32_t    firstVertex;
-    uint32_t    firstInstance;
-} VkDrawIndirectCommand;
-
 typedef struct VkVertexInputBindingDescription {
     uint32_t             binding;
     uint32_t             stride;
@@ -4257,6 +3652,118 @@ typedef struct VkGraphicsPipelineCreateInfo {
     int32_t                                          basePipelineIndex;
 } VkGraphicsPipelineCreateInfo;
 
+typedef struct VkPushConstantRange {
+    VkShaderStageFlags    stageFlags;
+    uint32_t              offset;
+    uint32_t              size;
+} VkPushConstantRange;
+
+typedef struct VkPipelineLayoutCreateInfo {
+    VkStructureType                 sType;
+    const void*                     pNext;
+    VkPipelineLayoutCreateFlags     flags;
+    uint32_t                        setLayoutCount;
+    const VkDescriptorSetLayout*    pSetLayouts;
+    uint32_t                        pushConstantRangeCount;
+    const VkPushConstantRange*      pPushConstantRanges;
+} VkPipelineLayoutCreateInfo;
+
+typedef struct VkSamplerCreateInfo {
+    VkStructureType         sType;
+    const void*             pNext;
+    VkSamplerCreateFlags    flags;
+    VkFilter                magFilter;
+    VkFilter                minFilter;
+    VkSamplerMipmapMode     mipmapMode;
+    VkSamplerAddressMode    addressModeU;
+    VkSamplerAddressMode    addressModeV;
+    VkSamplerAddressMode    addressModeW;
+    float                   mipLodBias;
+    VkBool32                anisotropyEnable;
+    float                   maxAnisotropy;
+    VkBool32                compareEnable;
+    VkCompareOp             compareOp;
+    float                   minLod;
+    float                   maxLod;
+    VkBorderColor           borderColor;
+    VkBool32                unnormalizedCoordinates;
+} VkSamplerCreateInfo;
+
+typedef struct VkCopyDescriptorSet {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkDescriptorSet    srcSet;
+    uint32_t           srcBinding;
+    uint32_t           srcArrayElement;
+    VkDescriptorSet    dstSet;
+    uint32_t           dstBinding;
+    uint32_t           dstArrayElement;
+    uint32_t           descriptorCount;
+} VkCopyDescriptorSet;
+
+typedef struct VkDescriptorBufferInfo {
+    VkBuffer        buffer;
+    VkDeviceSize    offset;
+    VkDeviceSize    range;
+} VkDescriptorBufferInfo;
+
+typedef struct VkDescriptorImageInfo {
+    VkSampler        sampler;
+    VkImageView      imageView;
+    VkImageLayout    imageLayout;
+} VkDescriptorImageInfo;
+
+typedef struct VkDescriptorPoolSize {
+    VkDescriptorType    type;
+    uint32_t            descriptorCount;
+} VkDescriptorPoolSize;
+
+typedef struct VkDescriptorPoolCreateInfo {
+    VkStructureType                sType;
+    const void*                    pNext;
+    VkDescriptorPoolCreateFlags    flags;
+    uint32_t                       maxSets;
+    uint32_t                       poolSizeCount;
+    const VkDescriptorPoolSize*    pPoolSizes;
+} VkDescriptorPoolCreateInfo;
+
+typedef struct VkDescriptorSetAllocateInfo {
+    VkStructureType                 sType;
+    const void*                     pNext;
+    VkDescriptorPool                descriptorPool;
+    uint32_t                        descriptorSetCount;
+    const VkDescriptorSetLayout*    pSetLayouts;
+} VkDescriptorSetAllocateInfo;
+
+typedef struct VkDescriptorSetLayoutBinding {
+    uint32_t              binding;
+    VkDescriptorType      descriptorType;
+    uint32_t              descriptorCount;
+    VkShaderStageFlags    stageFlags;
+    const VkSampler*      pImmutableSamplers;
+} VkDescriptorSetLayoutBinding;
+
+typedef struct VkDescriptorSetLayoutCreateInfo {
+    VkStructureType                        sType;
+    const void*                            pNext;
+    VkDescriptorSetLayoutCreateFlags       flags;
+    uint32_t                               bindingCount;
+    const VkDescriptorSetLayoutBinding*    pBindings;
+} VkDescriptorSetLayoutCreateInfo;
+
+typedef struct VkWriteDescriptorSet {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkDescriptorSet                  dstSet;
+    uint32_t                         dstBinding;
+    uint32_t                         dstArrayElement;
+    uint32_t                         descriptorCount;
+    VkDescriptorType                 descriptorType;
+    const VkDescriptorImageInfo*     pImageInfo;
+    const VkDescriptorBufferInfo*    pBufferInfo;
+    const VkBufferView*              pTexelBufferView;
+} VkWriteDescriptorSet;
+
 typedef struct VkAttachmentDescription {
     VkAttachmentDescriptionFlags    flags;
     VkFormat                        format;
@@ -4321,6 +3828,67 @@ typedef struct VkRenderPassCreateInfo {
     const VkSubpassDependency*        pDependencies;
 } VkRenderPassCreateInfo;
 
+typedef struct VkCommandPoolCreateInfo {
+    VkStructureType             sType;
+    const void*                 pNext;
+    VkCommandPoolCreateFlags    flags;
+    uint32_t                    queueFamilyIndex;
+} VkCommandPoolCreateInfo;
+
+typedef struct VkCommandBufferAllocateInfo {
+    VkStructureType         sType;
+    const void*             pNext;
+    VkCommandPool           commandPool;
+    VkCommandBufferLevel    level;
+    uint32_t                commandBufferCount;
+} VkCommandBufferAllocateInfo;
+
+typedef struct VkCommandBufferInheritanceInfo {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkRenderPass                     renderPass;
+    uint32_t                         subpass;
+    VkFramebuffer                    framebuffer;
+    VkBool32                         occlusionQueryEnable;
+    VkQueryControlFlags              queryFlags;
+    VkQueryPipelineStatisticFlags    pipelineStatistics;
+} VkCommandBufferInheritanceInfo;
+
+typedef struct VkCommandBufferBeginInfo {
+    VkStructureType                          sType;
+    const void*                              pNext;
+    VkCommandBufferUsageFlags                flags;
+    const VkCommandBufferInheritanceInfo*    pInheritanceInfo;
+} VkCommandBufferBeginInfo;
+
+typedef struct VkBufferCopy {
+    VkDeviceSize    srcOffset;
+    VkDeviceSize    dstOffset;
+    VkDeviceSize    size;
+} VkBufferCopy;
+
+typedef struct VkImageSubresourceLayers {
+    VkImageAspectFlags    aspectMask;
+    uint32_t              mipLevel;
+    uint32_t              baseArrayLayer;
+    uint32_t              layerCount;
+} VkImageSubresourceLayers;
+
+typedef struct VkBufferImageCopy {
+    VkDeviceSize                bufferOffset;
+    uint32_t                    bufferRowLength;
+    uint32_t                    bufferImageHeight;
+    VkImageSubresourceLayers    imageSubresource;
+    VkOffset3D                  imageOffset;
+    VkExtent3D                  imageExtent;
+} VkBufferImageCopy;
+
+typedef union VkClearColorValue {
+    float       float32[4];
+    int32_t     int32[4];
+    uint32_t    uint32[4];
+} VkClearColorValue;
+
 typedef struct VkClearDepthStencilValue {
     float       depth;
     uint32_t    stencil;
@@ -4350,6 +3918,14 @@ typedef struct VkImageBlit {
     VkOffset3D                  dstOffsets[2];
 } VkImageBlit;
 
+typedef struct VkImageCopy {
+    VkImageSubresourceLayers    srcSubresource;
+    VkOffset3D                  srcOffset;
+    VkImageSubresourceLayers    dstSubresource;
+    VkOffset3D                  dstOffset;
+    VkExtent3D                  extent;
+} VkImageCopy;
+
 typedef struct VkImageResolve {
     VkImageSubresourceLayers    srcSubresource;
     VkOffset3D                  srcOffset;
@@ -4410,50 +3986,30 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetFenceStatus)(VkDevice device, VkFence fenc
 typedef VkResult (VKAPI_PTR *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore);
 typedef void (VKAPI_PTR *PFN_vkDestroySemaphore)(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateQueryPool)(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool);
-typedef void (VKAPI_PTR *PFN_vkDestroyQueryPool)(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkGetQueryPoolResults)(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer);
-typedef void (VKAPI_PTR *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage);
-typedef void (VKAPI_PTR *PFN_vkDestroyImage)(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView);
-typedef void (VKAPI_PTR *PFN_vkDestroyImageView)(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateCommandPool)(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool);
-typedef void (VKAPI_PTR *PFN_vkDestroyCommandPool)(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkResetCommandPool)(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags);
-typedef VkResult (VKAPI_PTR *PFN_vkAllocateCommandBuffers)(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);
-typedef void (VKAPI_PTR *PFN_vkFreeCommandBuffers)(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
-typedef VkResult (VKAPI_PTR *PFN_vkBeginCommandBuffer)(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkEndCommandBuffer)(VkCommandBuffer commandBuffer);
-typedef VkResult (VKAPI_PTR *PFN_vkResetCommandBuffer)(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
-typedef void (VKAPI_PTR *PFN_vkCmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData);
-typedef void (VKAPI_PTR *PFN_vkCmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);
-typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier)(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
-typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
-typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query);
-typedef void (VKAPI_PTR *PFN_vkCmdResetQueryPool)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
-typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags);
-typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateEvent)(VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent);
 typedef void (VKAPI_PTR *PFN_vkDestroyEvent)(VkDevice device, VkEvent event, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkGetEventStatus)(VkDevice device, VkEvent event);
 typedef VkResult (VKAPI_PTR *PFN_vkSetEvent)(VkDevice device, VkEvent event);
 typedef VkResult (VKAPI_PTR *PFN_vkResetEvent)(VkDevice device, VkEvent event);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateQueryPool)(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool);
+typedef void (VKAPI_PTR *PFN_vkDestroyQueryPool)(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator);
+typedef VkResult (VKAPI_PTR *PFN_vkGetQueryPoolResults)(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer);
+typedef void (VKAPI_PTR *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView);
 typedef void (VKAPI_PTR *PFN_vkDestroyBufferView)(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks* pAllocator);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage);
+typedef void (VKAPI_PTR *PFN_vkDestroyImage)(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator);
+typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView);
+typedef void (VKAPI_PTR *PFN_vkDestroyImageView)(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateShaderModule)(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule);
 typedef void (VKAPI_PTR *PFN_vkDestroyShaderModule)(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineCache)(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache);
 typedef void (VKAPI_PTR *PFN_vkDestroyPipelineCache)(VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineCacheData)(VkDevice device, VkPipelineCache pipelineCache, size_t* pDataSize, void* pData);
 typedef VkResult (VKAPI_PTR *PFN_vkMergePipelineCaches)(VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateComputePipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
 typedef void (VKAPI_PTR *PFN_vkDestroyPipeline)(VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineLayout)(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout);
@@ -4468,21 +4024,20 @@ typedef VkResult (VKAPI_PTR *PFN_vkResetDescriptorPool)(VkDevice device, VkDescr
 typedef VkResult (VKAPI_PTR *PFN_vkAllocateDescriptorSets)(VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets);
 typedef VkResult (VKAPI_PTR *PFN_vkFreeDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets);
 typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies);
-typedef void (VKAPI_PTR *PFN_vkCmdBindPipeline)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline);
-typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets);
-typedef void (VKAPI_PTR *PFN_vkCmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatch)(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);
-typedef void (VKAPI_PTR *PFN_vkCmdSetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
-typedef void (VKAPI_PTR *PFN_vkCmdResetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
-typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
-typedef void (VKAPI_PTR *PFN_vkCmdPushConstants)(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer);
 typedef void (VKAPI_PTR *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
 typedef void (VKAPI_PTR *PFN_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator);
 typedef void (VKAPI_PTR *PFN_vkGetRenderAreaGranularity)(VkDevice device, VkRenderPass renderPass, VkExtent2D* pGranularity);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateCommandPool)(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool);
+typedef void (VKAPI_PTR *PFN_vkDestroyCommandPool)(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator);
+typedef VkResult (VKAPI_PTR *PFN_vkResetCommandPool)(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags);
+typedef VkResult (VKAPI_PTR *PFN_vkAllocateCommandBuffers)(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);
+typedef void (VKAPI_PTR *PFN_vkFreeCommandBuffers)(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
+typedef VkResult (VKAPI_PTR *PFN_vkBeginCommandBuffer)(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkEndCommandBuffer)(VkCommandBuffer commandBuffer);
+typedef VkResult (VKAPI_PTR *PFN_vkResetCommandBuffer)(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags);
+typedef void (VKAPI_PTR *PFN_vkCmdBindPipeline)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline);
 typedef void (VKAPI_PTR *PFN_vkCmdSetViewport)(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports);
 typedef void (VKAPI_PTR *PFN_vkCmdSetScissor)(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors);
 typedef void (VKAPI_PTR *PFN_vkCmdSetLineWidth)(VkCommandBuffer commandBuffer, float lineWidth);
@@ -4492,19 +4047,40 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBounds)(VkCommandBuffer commandBuffer,
 typedef void (VKAPI_PTR *PFN_vkCmdSetStencilCompareMask)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask);
 typedef void (VKAPI_PTR *PFN_vkCmdSetStencilWriteMask)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask);
 typedef void (VKAPI_PTR *PFN_vkCmdSetStencilReference)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference);
+typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets);
 typedef void (VKAPI_PTR *PFN_vkCmdBindIndexBuffer)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType);
 typedef void (VKAPI_PTR *PFN_vkCmdBindVertexBuffers)(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets);
 typedef void (VKAPI_PTR *PFN_vkCmdDraw)(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance);
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexed)(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance);
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatch)(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatchIndirect)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);
+typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);
+typedef void (VKAPI_PTR *PFN_vkCmdCopyImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
 typedef void (VKAPI_PTR *PFN_vkCmdBlitImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter);
+typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage)(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);
+typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
+typedef void (VKAPI_PTR *PFN_vkCmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData);
+typedef void (VKAPI_PTR *PFN_vkCmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);
+typedef void (VKAPI_PTR *PFN_vkCmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
 typedef void (VKAPI_PTR *PFN_vkCmdClearDepthStencilImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
 typedef void (VKAPI_PTR *PFN_vkCmdClearAttachments)(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects);
 typedef void (VKAPI_PTR *PFN_vkCmdResolveImage)(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions);
+typedef void (VKAPI_PTR *PFN_vkCmdSetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
+typedef void (VKAPI_PTR *PFN_vkCmdResetEvent)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
+typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
+typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier)(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
+typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
+typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query);
+typedef void (VKAPI_PTR *PFN_vkCmdResetQueryPool)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
+typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query);
+typedef void (VKAPI_PTR *PFN_vkCmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags);
+typedef void (VKAPI_PTR *PFN_vkCmdPushConstants)(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues);
 typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents);
 typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer commandBuffer, VkSubpassContents contents);
 typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass)(VkCommandBuffer commandBuffer);
+typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
 
 #ifndef VK_NO_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(
@@ -4728,6 +4304,29 @@ VKAPI_ATTR void VKAPI_CALL vkDestroySemaphore(
     VkSemaphore                                 semaphore,
     const VkAllocationCallbacks*                pAllocator);
 
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateEvent(
+    VkDevice                                    device,
+    const VkEventCreateInfo*                    pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkEvent*                                    pEvent);
+
+VKAPI_ATTR void VKAPI_CALL vkDestroyEvent(
+    VkDevice                                    device,
+    VkEvent                                     event,
+    const VkAllocationCallbacks*                pAllocator);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkGetEventStatus(
+    VkDevice                                    device,
+    VkEvent                                     event);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkSetEvent(
+    VkDevice                                    device,
+    VkEvent                                     event);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkResetEvent(
+    VkDevice                                    device,
+    VkEvent                                     event);
+
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateQueryPool(
     VkDevice                                    device,
     const VkQueryPoolCreateInfo*                pCreateInfo,
@@ -4760,6 +4359,17 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyBuffer(
     VkBuffer                                    buffer,
     const VkAllocationCallbacks*                pAllocator);
 
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateBufferView(
+    VkDevice                                    device,
+    const VkBufferViewCreateInfo*               pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkBufferView*                               pView);
+
+VKAPI_ATTR void VKAPI_CALL vkDestroyBufferView(
+    VkDevice                                    device,
+    VkBufferView                                bufferView,
+    const VkAllocationCallbacks*                pAllocator);
+
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(
     VkDevice                                    device,
     const VkImageCreateInfo*                    pCreateInfo,
@@ -4788,174 +4398,6 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyImageView(
     VkImageView                                 imageView,
     const VkAllocationCallbacks*                pAllocator);
 
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateCommandPool(
-    VkDevice                                    device,
-    const VkCommandPoolCreateInfo*              pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkCommandPool*                              pCommandPool);
-
-VKAPI_ATTR void VKAPI_CALL vkDestroyCommandPool(
-    VkDevice                                    device,
-    VkCommandPool                               commandPool,
-    const VkAllocationCallbacks*                pAllocator);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandPool(
-    VkDevice                                    device,
-    VkCommandPool                               commandPool,
-    VkCommandPoolResetFlags                     flags);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkAllocateCommandBuffers(
-    VkDevice                                    device,
-    const VkCommandBufferAllocateInfo*          pAllocateInfo,
-    VkCommandBuffer*                            pCommandBuffers);
-
-VKAPI_ATTR void VKAPI_CALL vkFreeCommandBuffers(
-    VkDevice                                    device,
-    VkCommandPool                               commandPool,
-    uint32_t                                    commandBufferCount,
-    const VkCommandBuffer*                      pCommandBuffers);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(
-    VkCommandBuffer                             commandBuffer,
-    const VkCommandBufferBeginInfo*             pBeginInfo);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkEndCommandBuffer(
-    VkCommandBuffer                             commandBuffer);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkCommandBufferResetFlags                   flags);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    srcBuffer,
-    VkBuffer                                    dstBuffer,
-    uint32_t                                    regionCount,
-    const VkBufferCopy*                         pRegions);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkImageCopy*                          pRegions);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    srcBuffer,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkBufferImageCopy*                    pRegions);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkBuffer                                    dstBuffer,
-    uint32_t                                    regionCount,
-    const VkBufferImageCopy*                    pRegions);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdUpdateBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    dstBuffer,
-    VkDeviceSize                                dstOffset,
-    VkDeviceSize                                dataSize,
-    const void*                                 pData);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdFillBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    dstBuffer,
-    VkDeviceSize                                dstOffset,
-    VkDeviceSize                                size,
-    uint32_t                                    data);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineStageFlags                        srcStageMask,
-    VkPipelineStageFlags                        dstStageMask,
-    VkDependencyFlags                           dependencyFlags,
-    uint32_t                                    memoryBarrierCount,
-    const VkMemoryBarrier*                      pMemoryBarriers,
-    uint32_t                                    bufferMemoryBarrierCount,
-    const VkBufferMemoryBarrier*                pBufferMemoryBarriers,
-    uint32_t                                    imageMemoryBarrierCount,
-    const VkImageMemoryBarrier*                 pImageMemoryBarriers);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery(
-    VkCommandBuffer                             commandBuffer,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    query,
-    VkQueryControlFlags                         flags);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery(
-    VkCommandBuffer                             commandBuffer,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    query);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool(
-    VkCommandBuffer                             commandBuffer,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    firstQuery,
-    uint32_t                                    queryCount);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineStageFlagBits                     pipelineStage,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    query);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults(
-    VkCommandBuffer                             commandBuffer,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    firstQuery,
-    uint32_t                                    queryCount,
-    VkBuffer                                    dstBuffer,
-    VkDeviceSize                                dstOffset,
-    VkDeviceSize                                stride,
-    VkQueryResultFlags                          flags);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    commandBufferCount,
-    const VkCommandBuffer*                      pCommandBuffers);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateEvent(
-    VkDevice                                    device,
-    const VkEventCreateInfo*                    pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkEvent*                                    pEvent);
-
-VKAPI_ATTR void VKAPI_CALL vkDestroyEvent(
-    VkDevice                                    device,
-    VkEvent                                     event,
-    const VkAllocationCallbacks*                pAllocator);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetEventStatus(
-    VkDevice                                    device,
-    VkEvent                                     event);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkSetEvent(
-    VkDevice                                    device,
-    VkEvent                                     event);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkResetEvent(
-    VkDevice                                    device,
-    VkEvent                                     event);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateBufferView(
-    VkDevice                                    device,
-    const VkBufferViewCreateInfo*               pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkBufferView*                               pView);
-
-VKAPI_ATTR void VKAPI_CALL vkDestroyBufferView(
-    VkDevice                                    device,
-    VkBufferView                                bufferView,
-    const VkAllocationCallbacks*                pAllocator);
-
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateShaderModule(
     VkDevice                                    device,
     const VkShaderModuleCreateInfo*             pCreateInfo,
@@ -4990,6 +4432,14 @@ VKAPI_ATTR VkResult VKAPI_CALL vkMergePipelineCaches(
     uint32_t                                    srcCacheCount,
     const VkPipelineCache*                      pSrcCaches);
 
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateGraphicsPipelines(
+    VkDevice                                    device,
+    VkPipelineCache                             pipelineCache,
+    uint32_t                                    createInfoCount,
+    const VkGraphicsPipelineCreateInfo*         pCreateInfos,
+    const VkAllocationCallbacks*                pAllocator,
+    VkPipeline*                                 pPipelines);
+
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateComputePipelines(
     VkDevice                                    device,
     VkPipelineCache                             pipelineCache,
@@ -5070,79 +4520,6 @@ VKAPI_ATTR void VKAPI_CALL vkUpdateDescriptorSets(
     uint32_t                                    descriptorCopyCount,
     const VkCopyDescriptorSet*                  pDescriptorCopies);
 
-VKAPI_ATTR void VKAPI_CALL vkCmdBindPipeline(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    VkPipeline                                  pipeline);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    VkPipelineLayout                            layout,
-    uint32_t                                    firstSet,
-    uint32_t                                    descriptorSetCount,
-    const VkDescriptorSet*                      pDescriptorSets,
-    uint32_t                                    dynamicOffsetCount,
-    const uint32_t*                             pDynamicOffsets);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdClearColorImage(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     image,
-    VkImageLayout                               imageLayout,
-    const VkClearColorValue*                    pColor,
-    uint32_t                                    rangeCount,
-    const VkImageSubresourceRange*              pRanges);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdDispatch(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    groupCountX,
-    uint32_t                                    groupCountY,
-    uint32_t                                    groupCountZ);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdDispatchIndirect(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    buffer,
-    VkDeviceSize                                offset);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent(
-    VkCommandBuffer                             commandBuffer,
-    VkEvent                                     event,
-    VkPipelineStageFlags                        stageMask);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent(
-    VkCommandBuffer                             commandBuffer,
-    VkEvent                                     event,
-    VkPipelineStageFlags                        stageMask);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    eventCount,
-    const VkEvent*                              pEvents,
-    VkPipelineStageFlags                        srcStageMask,
-    VkPipelineStageFlags                        dstStageMask,
-    uint32_t                                    memoryBarrierCount,
-    const VkMemoryBarrier*                      pMemoryBarriers,
-    uint32_t                                    bufferMemoryBarrierCount,
-    const VkBufferMemoryBarrier*                pBufferMemoryBarriers,
-    uint32_t                                    imageMemoryBarrierCount,
-    const VkImageMemoryBarrier*                 pImageMemoryBarriers);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushConstants(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineLayout                            layout,
-    VkShaderStageFlags                          stageFlags,
-    uint32_t                                    offset,
-    uint32_t                                    size,
-    const void*                                 pValues);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateGraphicsPipelines(
-    VkDevice                                    device,
-    VkPipelineCache                             pipelineCache,
-    uint32_t                                    createInfoCount,
-    const VkGraphicsPipelineCreateInfo*         pCreateInfos,
-    const VkAllocationCallbacks*                pAllocator,
-    VkPipeline*                                 pPipelines);
-
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateFramebuffer(
     VkDevice                                    device,
     const VkFramebufferCreateInfo*              pCreateInfo,
@@ -5170,6 +4547,49 @@ VKAPI_ATTR void VKAPI_CALL vkGetRenderAreaGranularity(
     VkRenderPass                                renderPass,
     VkExtent2D*                                 pGranularity);
 
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateCommandPool(
+    VkDevice                                    device,
+    const VkCommandPoolCreateInfo*              pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkCommandPool*                              pCommandPool);
+
+VKAPI_ATTR void VKAPI_CALL vkDestroyCommandPool(
+    VkDevice                                    device,
+    VkCommandPool                               commandPool,
+    const VkAllocationCallbacks*                pAllocator);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandPool(
+    VkDevice                                    device,
+    VkCommandPool                               commandPool,
+    VkCommandPoolResetFlags                     flags);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkAllocateCommandBuffers(
+    VkDevice                                    device,
+    const VkCommandBufferAllocateInfo*          pAllocateInfo,
+    VkCommandBuffer*                            pCommandBuffers);
+
+VKAPI_ATTR void VKAPI_CALL vkFreeCommandBuffers(
+    VkDevice                                    device,
+    VkCommandPool                               commandPool,
+    uint32_t                                    commandBufferCount,
+    const VkCommandBuffer*                      pCommandBuffers);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(
+    VkCommandBuffer                             commandBuffer,
+    const VkCommandBufferBeginInfo*             pBeginInfo);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkEndCommandBuffer(
+    VkCommandBuffer                             commandBuffer);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandBuffer(
+    VkCommandBuffer                             commandBuffer,
+    VkCommandBufferResetFlags                   flags);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdBindPipeline(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineBindPoint                         pipelineBindPoint,
+    VkPipeline                                  pipeline);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewport(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstViewport,
@@ -5216,6 +4636,16 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilReference(
     VkStencilFaceFlags                          faceMask,
     uint32_t                                    reference);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineBindPoint                         pipelineBindPoint,
+    VkPipelineLayout                            layout,
+    uint32_t                                    firstSet,
+    uint32_t                                    descriptorSetCount,
+    const VkDescriptorSet*                      pDescriptorSets,
+    uint32_t                                    dynamicOffsetCount,
+    const uint32_t*                             pDynamicOffsets);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdBindIndexBuffer(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -5258,6 +4688,33 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirect(
     uint32_t                                    drawCount,
     uint32_t                                    stride);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdDispatch(
+    VkCommandBuffer                             commandBuffer,
+    uint32_t                                    groupCountX,
+    uint32_t                                    groupCountY,
+    uint32_t                                    groupCountZ);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdDispatchIndirect(
+    VkCommandBuffer                             commandBuffer,
+    VkBuffer                                    buffer,
+    VkDeviceSize                                offset);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer(
+    VkCommandBuffer                             commandBuffer,
+    VkBuffer                                    srcBuffer,
+    VkBuffer                                    dstBuffer,
+    uint32_t                                    regionCount,
+    const VkBufferCopy*                         pRegions);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage(
+    VkCommandBuffer                             commandBuffer,
+    VkImage                                     srcImage,
+    VkImageLayout                               srcImageLayout,
+    VkImage                                     dstImage,
+    VkImageLayout                               dstImageLayout,
+    uint32_t                                    regionCount,
+    const VkImageCopy*                          pRegions);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage(
     VkCommandBuffer                             commandBuffer,
     VkImage                                     srcImage,
@@ -5268,6 +4725,44 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage(
     const VkImageBlit*                          pRegions,
     VkFilter                                    filter);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage(
+    VkCommandBuffer                             commandBuffer,
+    VkBuffer                                    srcBuffer,
+    VkImage                                     dstImage,
+    VkImageLayout                               dstImageLayout,
+    uint32_t                                    regionCount,
+    const VkBufferImageCopy*                    pRegions);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer(
+    VkCommandBuffer                             commandBuffer,
+    VkImage                                     srcImage,
+    VkImageLayout                               srcImageLayout,
+    VkBuffer                                    dstBuffer,
+    uint32_t                                    regionCount,
+    const VkBufferImageCopy*                    pRegions);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdUpdateBuffer(
+    VkCommandBuffer                             commandBuffer,
+    VkBuffer                                    dstBuffer,
+    VkDeviceSize                                dstOffset,
+    VkDeviceSize                                dataSize,
+    const void*                                 pData);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdFillBuffer(
+    VkCommandBuffer                             commandBuffer,
+    VkBuffer                                    dstBuffer,
+    VkDeviceSize                                dstOffset,
+    VkDeviceSize                                size,
+    uint32_t                                    data);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdClearColorImage(
+    VkCommandBuffer                             commandBuffer,
+    VkImage                                     image,
+    VkImageLayout                               imageLayout,
+    const VkClearColorValue*                    pColor,
+    uint32_t                                    rangeCount,
+    const VkImageSubresourceRange*              pRanges);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdClearDepthStencilImage(
     VkCommandBuffer                             commandBuffer,
     VkImage                                     image,
@@ -5292,6 +4787,82 @@ VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage(
     uint32_t                                    regionCount,
     const VkImageResolve*                       pRegions);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent(
+    VkCommandBuffer                             commandBuffer,
+    VkEvent                                     event,
+    VkPipelineStageFlags                        stageMask);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent(
+    VkCommandBuffer                             commandBuffer,
+    VkEvent                                     event,
+    VkPipelineStageFlags                        stageMask);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents(
+    VkCommandBuffer                             commandBuffer,
+    uint32_t                                    eventCount,
+    const VkEvent*                              pEvents,
+    VkPipelineStageFlags                        srcStageMask,
+    VkPipelineStageFlags                        dstStageMask,
+    uint32_t                                    memoryBarrierCount,
+    const VkMemoryBarrier*                      pMemoryBarriers,
+    uint32_t                                    bufferMemoryBarrierCount,
+    const VkBufferMemoryBarrier*                pBufferMemoryBarriers,
+    uint32_t                                    imageMemoryBarrierCount,
+    const VkImageMemoryBarrier*                 pImageMemoryBarriers);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineStageFlags                        srcStageMask,
+    VkPipelineStageFlags                        dstStageMask,
+    VkDependencyFlags                           dependencyFlags,
+    uint32_t                                    memoryBarrierCount,
+    const VkMemoryBarrier*                      pMemoryBarriers,
+    uint32_t                                    bufferMemoryBarrierCount,
+    const VkBufferMemoryBarrier*                pBufferMemoryBarriers,
+    uint32_t                                    imageMemoryBarrierCount,
+    const VkImageMemoryBarrier*                 pImageMemoryBarriers);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery(
+    VkCommandBuffer                             commandBuffer,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    query,
+    VkQueryControlFlags                         flags);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery(
+    VkCommandBuffer                             commandBuffer,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    query);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool(
+    VkCommandBuffer                             commandBuffer,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    firstQuery,
+    uint32_t                                    queryCount);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineStageFlagBits                     pipelineStage,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    query);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults(
+    VkCommandBuffer                             commandBuffer,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    firstQuery,
+    uint32_t                                    queryCount,
+    VkBuffer                                    dstBuffer,
+    VkDeviceSize                                dstOffset,
+    VkDeviceSize                                stride,
+    VkQueryResultFlags                          flags);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdPushConstants(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineLayout                            layout,
+    VkShaderStageFlags                          stageFlags,
+    uint32_t                                    offset,
+    uint32_t                                    size,
+    const void*                                 pValues);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderPass(
     VkCommandBuffer                             commandBuffer,
     const VkRenderPassBeginInfo*                pRenderPassBegin,
@@ -5303,6 +4874,11 @@ VKAPI_ATTR void VKAPI_CALL vkCmdNextSubpass(
 
 VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass(
     VkCommandBuffer                             commandBuffer);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands(
+    VkCommandBuffer                             commandBuffer,
+    uint32_t                                    commandBufferCount,
+    const VkCommandBuffer*                      pCommandBuffers);
 #endif
 
 
@@ -5311,19 +4887,27 @@ VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass(
 // Vulkan 1.1 version number
 #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0)// Patch version should always be set to 0
 
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplate)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSamplerYcbcrConversion)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDescriptorUpdateTemplate)
 #define VK_MAX_DEVICE_GROUP_SIZE          32U
 #define VK_LUID_SIZE                      8U
 #define VK_QUEUE_FAMILY_EXTERNAL          (~1U)
 
-typedef enum VkDescriptorUpdateTemplateType {
-    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET = 0,
-    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS = 1,
-    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS,
-    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET,
-    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7FFFFFFF
-} VkDescriptorUpdateTemplateType;
+typedef enum VkPointClippingBehavior {
+    VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES = 0,
+    VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY = 1,
+    VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES_KHR = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES,
+    VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY_KHR = VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY,
+    VK_POINT_CLIPPING_BEHAVIOR_MAX_ENUM = 0x7FFFFFFF
+} VkPointClippingBehavior;
+
+typedef enum VkTessellationDomainOrigin {
+    VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT = 0,
+    VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT = 1,
+    VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT_KHR = VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT,
+    VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT_KHR = VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT,
+    VK_TESSELLATION_DOMAIN_ORIGIN_MAX_ENUM = 0x7FFFFFFF
+} VkTessellationDomainOrigin;
 
 typedef enum VkSamplerYcbcrModelConversion {
     VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY = 0,
@@ -5355,21 +4939,28 @@ typedef enum VkChromaLocation {
     VK_CHROMA_LOCATION_MAX_ENUM = 0x7FFFFFFF
 } VkChromaLocation;
 
-typedef enum VkPointClippingBehavior {
-    VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES = 0,
-    VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY = 1,
-    VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES_KHR = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES,
-    VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY_KHR = VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY,
-    VK_POINT_CLIPPING_BEHAVIOR_MAX_ENUM = 0x7FFFFFFF
-} VkPointClippingBehavior;
+typedef enum VkDescriptorUpdateTemplateType {
+    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET = 0,
+    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1,
+    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET,
+    VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7FFFFFFF
+} VkDescriptorUpdateTemplateType;
 
-typedef enum VkTessellationDomainOrigin {
-    VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT = 0,
-    VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT = 1,
-    VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT_KHR = VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT,
-    VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT_KHR = VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT,
-    VK_TESSELLATION_DOMAIN_ORIGIN_MAX_ENUM = 0x7FFFFFFF
-} VkTessellationDomainOrigin;
+typedef enum VkSubgroupFeatureFlagBits {
+    VK_SUBGROUP_FEATURE_BASIC_BIT = 0x00000001,
+    VK_SUBGROUP_FEATURE_VOTE_BIT = 0x00000002,
+    VK_SUBGROUP_FEATURE_ARITHMETIC_BIT = 0x00000004,
+    VK_SUBGROUP_FEATURE_BALLOT_BIT = 0x00000008,
+    VK_SUBGROUP_FEATURE_SHUFFLE_BIT = 0x00000010,
+    VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT = 0x00000020,
+    VK_SUBGROUP_FEATURE_CLUSTERED_BIT = 0x00000040,
+    VK_SUBGROUP_FEATURE_QUAD_BIT = 0x00000080,
+    VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV = 0x00000100,
+    VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR = 0x00000200,
+    VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR = 0x00000400,
+    VK_SUBGROUP_FEATURE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkSubgroupFeatureFlagBits;
+typedef VkFlags VkSubgroupFeatureFlags;
 
 typedef enum VkPeerMemoryFeatureFlagBits {
     VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT = 0x00000001,
@@ -5388,7 +4979,6 @@ typedef enum VkMemoryAllocateFlagBits {
     VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT = 0x00000001,
     VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT = 0x00000002,
     VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT = 0x00000004,
-    VK_MEMORY_ALLOCATE_ZERO_INITIALIZE_BIT_EXT = 0x00000008,
     VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHR = VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT,
     VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT,
     VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT,
@@ -5396,6 +4986,7 @@ typedef enum VkMemoryAllocateFlagBits {
 } VkMemoryAllocateFlagBits;
 typedef VkFlags VkMemoryAllocateFlags;
 typedef VkFlags VkCommandPoolTrimFlags;
+typedef VkFlags VkDescriptorUpdateTemplateCreateFlags;
 
 typedef enum VkExternalMemoryHandleTypeFlagBits {
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT = 0x00000001,
@@ -5411,11 +5002,7 @@ typedef enum VkExternalMemoryHandleTypeFlagBits {
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA = 0x00000800,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_RDMA_ADDRESS_BIT_NV = 0x00001000,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OH_NATIVE_BUFFER_BIT_OHOS = 0x00008000,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX = 0x00004000,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT = 0x00010000,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT = 0x00020000,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT = 0x00040000,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT,
     VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT,
@@ -5499,25 +5086,15 @@ typedef enum VkExternalSemaphoreFeatureFlagBits {
     VK_EXTERNAL_SEMAPHORE_FEATURE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkExternalSemaphoreFeatureFlagBits;
 typedef VkFlags VkExternalSemaphoreFeatureFlags;
+typedef struct VkPhysicalDeviceSubgroupProperties {
+    VkStructureType           sType;
+    void*                     pNext;
+    uint32_t                  subgroupSize;
+    VkShaderStageFlags        supportedStages;
+    VkSubgroupFeatureFlags    supportedOperations;
+    VkBool32                  quadOperationsInAllStages;
+} VkPhysicalDeviceSubgroupProperties;
 
-typedef enum VkSubgroupFeatureFlagBits {
-    VK_SUBGROUP_FEATURE_BASIC_BIT = 0x00000001,
-    VK_SUBGROUP_FEATURE_VOTE_BIT = 0x00000002,
-    VK_SUBGROUP_FEATURE_ARITHMETIC_BIT = 0x00000004,
-    VK_SUBGROUP_FEATURE_BALLOT_BIT = 0x00000008,
-    VK_SUBGROUP_FEATURE_SHUFFLE_BIT = 0x00000010,
-    VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT = 0x00000020,
-    VK_SUBGROUP_FEATURE_CLUSTERED_BIT = 0x00000040,
-    VK_SUBGROUP_FEATURE_QUAD_BIT = 0x00000080,
-    VK_SUBGROUP_FEATURE_ROTATE_BIT = 0x00000200,
-    VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT = 0x00000400,
-    VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV = 0x00000100,
-    VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR = VK_SUBGROUP_FEATURE_ROTATE_BIT,
-    VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR = VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT,
-    VK_SUBGROUP_FEATURE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkSubgroupFeatureFlagBits;
-typedef VkFlags VkSubgroupFeatureFlags;
-typedef VkFlags VkDescriptorUpdateTemplateCreateFlags;
 typedef struct VkBindBufferMemoryInfo {
     VkStructureType    sType;
     const void*        pNext;
@@ -5534,6 +5111,15 @@ typedef struct VkBindImageMemoryInfo {
     VkDeviceSize       memoryOffset;
 } VkBindImageMemoryInfo;
 
+typedef struct VkPhysicalDevice16BitStorageFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           storageBuffer16BitAccess;
+    VkBool32           uniformAndStorageBuffer16BitAccess;
+    VkBool32           storagePushConstant16;
+    VkBool32           storageInputOutput16;
+} VkPhysicalDevice16BitStorageFeatures;
+
 typedef struct VkMemoryDedicatedRequirements {
     VkStructureType    sType;
     void*              pNext;
@@ -5555,6 +5141,14 @@ typedef struct VkMemoryAllocateFlagsInfo {
     uint32_t                 deviceMask;
 } VkMemoryAllocateFlagsInfo;
 
+typedef struct VkDeviceGroupRenderPassBeginInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           deviceMask;
+    uint32_t           deviceRenderAreaCount;
+    const VkRect2D*    pDeviceRenderAreas;
+} VkDeviceGroupRenderPassBeginInfo;
+
 typedef struct VkDeviceGroupCommandBufferBeginInfo {
     VkStructureType    sType;
     const void*        pNext;
@@ -5702,12 +5296,72 @@ typedef struct VkPhysicalDeviceSparseImageFormatInfo2 {
     VkImageTiling            tiling;
 } VkPhysicalDeviceSparseImageFormatInfo2;
 
+typedef struct VkPhysicalDevicePointClippingProperties {
+    VkStructureType            sType;
+    void*                      pNext;
+    VkPointClippingBehavior    pointClippingBehavior;
+} VkPhysicalDevicePointClippingProperties;
+
+typedef struct VkInputAttachmentAspectReference {
+    uint32_t              subpass;
+    uint32_t              inputAttachmentIndex;
+    VkImageAspectFlags    aspectMask;
+} VkInputAttachmentAspectReference;
+
+typedef struct VkRenderPassInputAttachmentAspectCreateInfo {
+    VkStructureType                            sType;
+    const void*                                pNext;
+    uint32_t                                   aspectReferenceCount;
+    const VkInputAttachmentAspectReference*    pAspectReferences;
+} VkRenderPassInputAttachmentAspectCreateInfo;
+
 typedef struct VkImageViewUsageCreateInfo {
     VkStructureType      sType;
     const void*          pNext;
     VkImageUsageFlags    usage;
 } VkImageViewUsageCreateInfo;
 
+typedef struct VkPipelineTessellationDomainOriginStateCreateInfo {
+    VkStructureType               sType;
+    const void*                   pNext;
+    VkTessellationDomainOrigin    domainOrigin;
+} VkPipelineTessellationDomainOriginStateCreateInfo;
+
+typedef struct VkRenderPassMultiviewCreateInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           subpassCount;
+    const uint32_t*    pViewMasks;
+    uint32_t           dependencyCount;
+    const int32_t*     pViewOffsets;
+    uint32_t           correlationMaskCount;
+    const uint32_t*    pCorrelationMasks;
+} VkRenderPassMultiviewCreateInfo;
+
+typedef struct VkPhysicalDeviceMultiviewFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           multiview;
+    VkBool32           multiviewGeometryShader;
+    VkBool32           multiviewTessellationShader;
+} VkPhysicalDeviceMultiviewFeatures;
+
+typedef struct VkPhysicalDeviceMultiviewProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           maxMultiviewViewCount;
+    uint32_t           maxMultiviewInstanceIndex;
+} VkPhysicalDeviceMultiviewProperties;
+
+typedef struct VkPhysicalDeviceVariablePointersFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           variablePointersStorageBuffer;
+    VkBool32           variablePointers;
+} VkPhysicalDeviceVariablePointersFeatures;
+
+typedef VkPhysicalDeviceVariablePointersFeatures VkPhysicalDeviceVariablePointerFeatures;
+
 typedef struct VkPhysicalDeviceProtectedMemoryFeatures {
     VkStructureType    sType;
     void*              pNext;
@@ -5734,6 +5388,25 @@ typedef struct VkProtectedSubmitInfo {
     VkBool32           protectedSubmit;
 } VkProtectedSubmitInfo;
 
+typedef struct VkSamplerYcbcrConversionCreateInfo {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkFormat                         format;
+    VkSamplerYcbcrModelConversion    ycbcrModel;
+    VkSamplerYcbcrRange              ycbcrRange;
+    VkComponentMapping               components;
+    VkChromaLocation                 xChromaOffset;
+    VkChromaLocation                 yChromaOffset;
+    VkFilter                         chromaFilter;
+    VkBool32                         forceExplicitReconstruction;
+} VkSamplerYcbcrConversionCreateInfo;
+
+typedef struct VkSamplerYcbcrConversionInfo {
+    VkStructureType             sType;
+    const void*                 pNext;
+    VkSamplerYcbcrConversion    conversion;
+} VkSamplerYcbcrConversionInfo;
+
 typedef struct VkBindImagePlaneMemoryInfo {
     VkStructureType          sType;
     const void*              pNext;
@@ -5746,6 +5419,40 @@ typedef struct VkImagePlaneMemoryRequirementsInfo {
     VkImageAspectFlagBits    planeAspect;
 } VkImagePlaneMemoryRequirementsInfo;
 
+typedef struct VkPhysicalDeviceSamplerYcbcrConversionFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           samplerYcbcrConversion;
+} VkPhysicalDeviceSamplerYcbcrConversionFeatures;
+
+typedef struct VkSamplerYcbcrConversionImageFormatProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           combinedImageSamplerDescriptorCount;
+} VkSamplerYcbcrConversionImageFormatProperties;
+
+typedef struct VkDescriptorUpdateTemplateEntry {
+    uint32_t            dstBinding;
+    uint32_t            dstArrayElement;
+    uint32_t            descriptorCount;
+    VkDescriptorType    descriptorType;
+    size_t              offset;
+    size_t              stride;
+} VkDescriptorUpdateTemplateEntry;
+
+typedef struct VkDescriptorUpdateTemplateCreateInfo {
+    VkStructureType                           sType;
+    const void*                               pNext;
+    VkDescriptorUpdateTemplateCreateFlags     flags;
+    uint32_t                                  descriptorUpdateEntryCount;
+    const VkDescriptorUpdateTemplateEntry*    pDescriptorUpdateEntries;
+    VkDescriptorUpdateTemplateType            templateType;
+    VkDescriptorSetLayout                     descriptorSetLayout;
+    VkPipelineBindPoint                       pipelineBindPoint;
+    VkPipelineLayout                          pipelineLayout;
+    uint32_t                                  set;
+} VkDescriptorUpdateTemplateCreateInfo;
+
 typedef struct VkExternalMemoryProperties {
     VkExternalMemoryFeatureFlags       externalMemoryFeatures;
     VkExternalMemoryHandleTypeFlags    exportFromImportedHandleTypes;
@@ -5846,55 +5553,6 @@ typedef struct VkExternalSemaphoreProperties {
     VkExternalSemaphoreFeatureFlags       externalSemaphoreFeatures;
 } VkExternalSemaphoreProperties;
 
-typedef struct VkPhysicalDeviceSubgroupProperties {
-    VkStructureType           sType;
-    void*                     pNext;
-    uint32_t                  subgroupSize;
-    VkShaderStageFlags        supportedStages;
-    VkSubgroupFeatureFlags    supportedOperations;
-    VkBool32                  quadOperationsInAllStages;
-} VkPhysicalDeviceSubgroupProperties;
-
-typedef struct VkPhysicalDevice16BitStorageFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           storageBuffer16BitAccess;
-    VkBool32           uniformAndStorageBuffer16BitAccess;
-    VkBool32           storagePushConstant16;
-    VkBool32           storageInputOutput16;
-} VkPhysicalDevice16BitStorageFeatures;
-
-typedef struct VkPhysicalDeviceVariablePointersFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           variablePointersStorageBuffer;
-    VkBool32           variablePointers;
-} VkPhysicalDeviceVariablePointersFeatures;
-
-typedef VkPhysicalDeviceVariablePointersFeatures VkPhysicalDeviceVariablePointerFeatures;
-
-typedef struct VkDescriptorUpdateTemplateEntry {
-    uint32_t            dstBinding;
-    uint32_t            dstArrayElement;
-    uint32_t            descriptorCount;
-    VkDescriptorType    descriptorType;
-    size_t              offset;
-    size_t              stride;
-} VkDescriptorUpdateTemplateEntry;
-
-typedef struct VkDescriptorUpdateTemplateCreateInfo {
-    VkStructureType                           sType;
-    const void*                               pNext;
-    VkDescriptorUpdateTemplateCreateFlags     flags;
-    uint32_t                                  descriptorUpdateEntryCount;
-    const VkDescriptorUpdateTemplateEntry*    pDescriptorUpdateEntries;
-    VkDescriptorUpdateTemplateType            templateType;
-    VkDescriptorSetLayout                     descriptorSetLayout;
-    VkPipelineBindPoint                       pipelineBindPoint;
-    VkPipelineLayout                          pipelineLayout;
-    uint32_t                                  set;
-} VkDescriptorUpdateTemplateCreateInfo;
-
 typedef struct VkPhysicalDeviceMaintenance3Properties {
     VkStructureType    sType;
     void*              pNext;
@@ -5908,96 +5566,6 @@ typedef struct VkDescriptorSetLayoutSupport {
     VkBool32           supported;
 } VkDescriptorSetLayoutSupport;
 
-typedef struct VkSamplerYcbcrConversionCreateInfo {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkFormat                         format;
-    VkSamplerYcbcrModelConversion    ycbcrModel;
-    VkSamplerYcbcrRange              ycbcrRange;
-    VkComponentMapping               components;
-    VkChromaLocation                 xChromaOffset;
-    VkChromaLocation                 yChromaOffset;
-    VkFilter                         chromaFilter;
-    VkBool32                         forceExplicitReconstruction;
-} VkSamplerYcbcrConversionCreateInfo;
-
-typedef struct VkSamplerYcbcrConversionInfo {
-    VkStructureType             sType;
-    const void*                 pNext;
-    VkSamplerYcbcrConversion    conversion;
-} VkSamplerYcbcrConversionInfo;
-
-typedef struct VkPhysicalDeviceSamplerYcbcrConversionFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           samplerYcbcrConversion;
-} VkPhysicalDeviceSamplerYcbcrConversionFeatures;
-
-typedef struct VkSamplerYcbcrConversionImageFormatProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           combinedImageSamplerDescriptorCount;
-} VkSamplerYcbcrConversionImageFormatProperties;
-
-typedef struct VkDeviceGroupRenderPassBeginInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           deviceMask;
-    uint32_t           deviceRenderAreaCount;
-    const VkRect2D*    pDeviceRenderAreas;
-} VkDeviceGroupRenderPassBeginInfo;
-
-typedef struct VkPhysicalDevicePointClippingProperties {
-    VkStructureType            sType;
-    void*                      pNext;
-    VkPointClippingBehavior    pointClippingBehavior;
-} VkPhysicalDevicePointClippingProperties;
-
-typedef struct VkInputAttachmentAspectReference {
-    uint32_t              subpass;
-    uint32_t              inputAttachmentIndex;
-    VkImageAspectFlags    aspectMask;
-} VkInputAttachmentAspectReference;
-
-typedef struct VkRenderPassInputAttachmentAspectCreateInfo {
-    VkStructureType                            sType;
-    const void*                                pNext;
-    uint32_t                                   aspectReferenceCount;
-    const VkInputAttachmentAspectReference*    pAspectReferences;
-} VkRenderPassInputAttachmentAspectCreateInfo;
-
-typedef struct VkPipelineTessellationDomainOriginStateCreateInfo {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkTessellationDomainOrigin    domainOrigin;
-} VkPipelineTessellationDomainOriginStateCreateInfo;
-
-typedef struct VkRenderPassMultiviewCreateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           subpassCount;
-    const uint32_t*    pViewMasks;
-    uint32_t           dependencyCount;
-    const int32_t*     pViewOffsets;
-    uint32_t           correlationMaskCount;
-    const uint32_t*    pCorrelationMasks;
-} VkRenderPassMultiviewCreateInfo;
-
-typedef struct VkPhysicalDeviceMultiviewFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           multiview;
-    VkBool32           multiviewGeometryShader;
-    VkBool32           multiviewTessellationShader;
-} VkPhysicalDeviceMultiviewFeatures;
-
-typedef struct VkPhysicalDeviceMultiviewProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxMultiviewViewCount;
-    uint32_t           maxMultiviewInstanceIndex;
-} VkPhysicalDeviceMultiviewProperties;
-
 typedef struct VkPhysicalDeviceShaderDrawParametersFeatures {
     VkStructureType    sType;
     void*              pNext;
@@ -6011,6 +5579,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory2)(VkDevice device, uint32_t
 typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory2)(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
 typedef void (VKAPI_PTR *PFN_vkGetDeviceGroupPeerMemoryFeatures)(VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures);
 typedef void (VKAPI_PTR *PFN_vkCmdSetDeviceMask)(VkCommandBuffer commandBuffer, uint32_t deviceMask);
+typedef void (VKAPI_PTR *PFN_vkCmdDispatchBase)(VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
 typedef VkResult (VKAPI_PTR *PFN_vkEnumeratePhysicalDeviceGroups)(VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
 typedef void (VKAPI_PTR *PFN_vkGetImageMemoryRequirements2)(VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
 typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements2)(VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
@@ -6024,16 +5593,15 @@ typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties2)(VkPhysicalDev
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceSparseImageFormatProperties2)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
 typedef void (VKAPI_PTR *PFN_vkTrimCommandPool)(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags);
 typedef void (VKAPI_PTR *PFN_vkGetDeviceQueue2)(VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue);
-typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties);
-typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalFenceProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);
-typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalSemaphoreProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchBase)(VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateSamplerYcbcrConversion)(VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion);
+typedef void (VKAPI_PTR *PFN_vkDestroySamplerYcbcrConversion)(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkCreateDescriptorUpdateTemplate)(VkDevice device, const VkDescriptorUpdateTemplateCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorUpdateTemplate* pDescriptorUpdateTemplate);
 typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorUpdateTemplate)(VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks* pAllocator);
 typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSetWithTemplate)(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void* pData);
+typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties);
+typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalFenceProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);
+typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalSemaphoreProperties)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);
 typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetLayoutSupport)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateSamplerYcbcrConversion)(VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion);
-typedef void (VKAPI_PTR *PFN_vkDestroySamplerYcbcrConversion)(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks* pAllocator);
 
 #ifndef VK_NO_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceVersion(
@@ -6060,6 +5628,15 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDeviceMask(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    deviceMask);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBase(
+    VkCommandBuffer                             commandBuffer,
+    uint32_t                                    baseGroupX,
+    uint32_t                                    baseGroupY,
+    uint32_t                                    baseGroupZ,
+    uint32_t                                    groupCountX,
+    uint32_t                                    groupCountY,
+    uint32_t                                    groupCountZ);
+
 VKAPI_ATTR VkResult VKAPI_CALL vkEnumeratePhysicalDeviceGroups(
     VkInstance                                  instance,
     uint32_t*                                   pPhysicalDeviceGroupCount,
@@ -6124,29 +5701,16 @@ VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue2(
     const VkDeviceQueueInfo2*                   pQueueInfo,
     VkQueue*                                    pQueue);
 
-VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalBufferProperties(
-    VkPhysicalDevice                            physicalDevice,
-    const VkPhysicalDeviceExternalBufferInfo*   pExternalBufferInfo,
-    VkExternalBufferProperties*                 pExternalBufferProperties);
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateSamplerYcbcrConversion(
+    VkDevice                                    device,
+    const VkSamplerYcbcrConversionCreateInfo*   pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkSamplerYcbcrConversion*                   pYcbcrConversion);
 
-VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalFenceProperties(
-    VkPhysicalDevice                            physicalDevice,
-    const VkPhysicalDeviceExternalFenceInfo*    pExternalFenceInfo,
-    VkExternalFenceProperties*                  pExternalFenceProperties);
-
-VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalSemaphoreProperties(
-    VkPhysicalDevice                            physicalDevice,
-    const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo,
-    VkExternalSemaphoreProperties*              pExternalSemaphoreProperties);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBase(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    baseGroupX,
-    uint32_t                                    baseGroupY,
-    uint32_t                                    baseGroupZ,
-    uint32_t                                    groupCountX,
-    uint32_t                                    groupCountY,
-    uint32_t                                    groupCountZ);
+VKAPI_ATTR void VKAPI_CALL vkDestroySamplerYcbcrConversion(
+    VkDevice                                    device,
+    VkSamplerYcbcrConversion                    ycbcrConversion,
+    const VkAllocationCallbacks*                pAllocator);
 
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDescriptorUpdateTemplate(
     VkDevice                                    device,
@@ -6165,21 +5729,25 @@ VKAPI_ATTR void VKAPI_CALL vkUpdateDescriptorSetWithTemplate(
     VkDescriptorUpdateTemplate                  descriptorUpdateTemplate,
     const void*                                 pData);
 
+VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalBufferProperties(
+    VkPhysicalDevice                            physicalDevice,
+    const VkPhysicalDeviceExternalBufferInfo*   pExternalBufferInfo,
+    VkExternalBufferProperties*                 pExternalBufferProperties);
+
+VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalFenceProperties(
+    VkPhysicalDevice                            physicalDevice,
+    const VkPhysicalDeviceExternalFenceInfo*    pExternalFenceInfo,
+    VkExternalFenceProperties*                  pExternalFenceProperties);
+
+VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalSemaphoreProperties(
+    VkPhysicalDevice                            physicalDevice,
+    const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo,
+    VkExternalSemaphoreProperties*              pExternalSemaphoreProperties);
+
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutSupport(
     VkDevice                                    device,
     const VkDescriptorSetLayoutCreateInfo*      pCreateInfo,
     VkDescriptorSetLayoutSupport*               pSupport);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateSamplerYcbcrConversion(
-    VkDevice                                    device,
-    const VkSamplerYcbcrConversionCreateInfo*   pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkSamplerYcbcrConversion*                   pYcbcrConversion);
-
-VKAPI_ATTR void VKAPI_CALL vkDestroySamplerYcbcrConversion(
-    VkDevice                                    device,
-    VkSamplerYcbcrConversion                    ycbcrConversion,
-    const VkAllocationCallbacks*                pAllocator);
 #endif
 
 
@@ -6217,9 +5785,7 @@ typedef enum VkDriverId {
     VK_DRIVER_ID_MESA_DOZEN = 23,
     VK_DRIVER_ID_MESA_NVK = 24,
     VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA = 25,
-    VK_DRIVER_ID_MESA_HONEYKRISP = 26,
-    VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN = 27,
-    VK_DRIVER_ID_MESA_KOSMICKRISP = 28,
+    VK_DRIVER_ID_MESA_AGXV = 26,
     VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
     VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
     VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,
@@ -6245,14 +5811,6 @@ typedef enum VkShaderFloatControlsIndependence {
     VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_MAX_ENUM = 0x7FFFFFFF
 } VkShaderFloatControlsIndependence;
 
-typedef enum VkSemaphoreType {
-    VK_SEMAPHORE_TYPE_BINARY = 0,
-    VK_SEMAPHORE_TYPE_TIMELINE = 1,
-    VK_SEMAPHORE_TYPE_BINARY_KHR = VK_SEMAPHORE_TYPE_BINARY,
-    VK_SEMAPHORE_TYPE_TIMELINE_KHR = VK_SEMAPHORE_TYPE_TIMELINE,
-    VK_SEMAPHORE_TYPE_MAX_ENUM = 0x7FFFFFFF
-} VkSemaphoreType;
-
 typedef enum VkSamplerReductionMode {
     VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE = 0,
     VK_SAMPLER_REDUCTION_MODE_MIN = 1,
@@ -6264,32 +5822,30 @@ typedef enum VkSamplerReductionMode {
     VK_SAMPLER_REDUCTION_MODE_MAX_ENUM = 0x7FFFFFFF
 } VkSamplerReductionMode;
 
+typedef enum VkSemaphoreType {
+    VK_SEMAPHORE_TYPE_BINARY = 0,
+    VK_SEMAPHORE_TYPE_TIMELINE = 1,
+    VK_SEMAPHORE_TYPE_BINARY_KHR = VK_SEMAPHORE_TYPE_BINARY,
+    VK_SEMAPHORE_TYPE_TIMELINE_KHR = VK_SEMAPHORE_TYPE_TIMELINE,
+    VK_SEMAPHORE_TYPE_MAX_ENUM = 0x7FFFFFFF
+} VkSemaphoreType;
+
 typedef enum VkResolveModeFlagBits {
     VK_RESOLVE_MODE_NONE = 0,
     VK_RESOLVE_MODE_SAMPLE_ZERO_BIT = 0x00000001,
     VK_RESOLVE_MODE_AVERAGE_BIT = 0x00000002,
     VK_RESOLVE_MODE_MIN_BIT = 0x00000004,
     VK_RESOLVE_MODE_MAX_BIT = 0x00000008,
-    VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID = 0x00000010,
-    VK_RESOLVE_MODE_CUSTOM_BIT_EXT = 0x00000020,
+    VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID = 0x00000010,
     VK_RESOLVE_MODE_NONE_KHR = VK_RESOLVE_MODE_NONE,
     VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT,
     VK_RESOLVE_MODE_AVERAGE_BIT_KHR = VK_RESOLVE_MODE_AVERAGE_BIT,
     VK_RESOLVE_MODE_MIN_BIT_KHR = VK_RESOLVE_MODE_MIN_BIT,
     VK_RESOLVE_MODE_MAX_BIT_KHR = VK_RESOLVE_MODE_MAX_BIT,
-  // VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID is a legacy alias
-    VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID,
     VK_RESOLVE_MODE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkResolveModeFlagBits;
 typedef VkFlags VkResolveModeFlags;
 
-typedef enum VkSemaphoreWaitFlagBits {
-    VK_SEMAPHORE_WAIT_ANY_BIT = 0x00000001,
-    VK_SEMAPHORE_WAIT_ANY_BIT_KHR = VK_SEMAPHORE_WAIT_ANY_BIT,
-    VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkSemaphoreWaitFlagBits;
-typedef VkFlags VkSemaphoreWaitFlags;
-
 typedef enum VkDescriptorBindingFlagBits {
     VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT = 0x00000001,
     VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT = 0x00000002,
@@ -6302,6 +5858,13 @@ typedef enum VkDescriptorBindingFlagBits {
     VK_DESCRIPTOR_BINDING_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkDescriptorBindingFlagBits;
 typedef VkFlags VkDescriptorBindingFlags;
+
+typedef enum VkSemaphoreWaitFlagBits {
+    VK_SEMAPHORE_WAIT_ANY_BIT = 0x00000001,
+    VK_SEMAPHORE_WAIT_ANY_BIT_KHR = VK_SEMAPHORE_WAIT_ANY_BIT,
+    VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkSemaphoreWaitFlagBits;
+typedef VkFlags VkSemaphoreWaitFlags;
 typedef struct VkPhysicalDeviceVulkan11Features {
     VkStructureType    sType;
     void*              pNext;
@@ -6462,104 +6025,81 @@ typedef struct VkImageFormatListCreateInfo {
     const VkFormat*    pViewFormats;
 } VkImageFormatListCreateInfo;
 
-typedef struct VkPhysicalDeviceDriverProperties {
-    VkStructureType         sType;
-    void*                   pNext;
-    VkDriverId              driverID;
-    char                    driverName[VK_MAX_DRIVER_NAME_SIZE];
-    char                    driverInfo[VK_MAX_DRIVER_INFO_SIZE];
-    VkConformanceVersion    conformanceVersion;
-} VkPhysicalDeviceDriverProperties;
+typedef struct VkAttachmentDescription2 {
+    VkStructureType                 sType;
+    const void*                     pNext;
+    VkAttachmentDescriptionFlags    flags;
+    VkFormat                        format;
+    VkSampleCountFlagBits           samples;
+    VkAttachmentLoadOp              loadOp;
+    VkAttachmentStoreOp             storeOp;
+    VkAttachmentLoadOp              stencilLoadOp;
+    VkAttachmentStoreOp             stencilStoreOp;
+    VkImageLayout                   initialLayout;
+    VkImageLayout                   finalLayout;
+} VkAttachmentDescription2;
 
-typedef struct VkPhysicalDeviceVulkanMemoryModelFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           vulkanMemoryModel;
-    VkBool32           vulkanMemoryModelDeviceScope;
-    VkBool32           vulkanMemoryModelAvailabilityVisibilityChains;
-} VkPhysicalDeviceVulkanMemoryModelFeatures;
+typedef struct VkAttachmentReference2 {
+    VkStructureType       sType;
+    const void*           pNext;
+    uint32_t              attachment;
+    VkImageLayout         layout;
+    VkImageAspectFlags    aspectMask;
+} VkAttachmentReference2;
 
-typedef struct VkPhysicalDeviceHostQueryResetFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           hostQueryReset;
-} VkPhysicalDeviceHostQueryResetFeatures;
+typedef struct VkSubpassDescription2 {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkSubpassDescriptionFlags        flags;
+    VkPipelineBindPoint              pipelineBindPoint;
+    uint32_t                         viewMask;
+    uint32_t                         inputAttachmentCount;
+    const VkAttachmentReference2*    pInputAttachments;
+    uint32_t                         colorAttachmentCount;
+    const VkAttachmentReference2*    pColorAttachments;
+    const VkAttachmentReference2*    pResolveAttachments;
+    const VkAttachmentReference2*    pDepthStencilAttachment;
+    uint32_t                         preserveAttachmentCount;
+    const uint32_t*                  pPreserveAttachments;
+} VkSubpassDescription2;
 
-typedef struct VkPhysicalDeviceTimelineSemaphoreFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           timelineSemaphore;
-} VkPhysicalDeviceTimelineSemaphoreFeatures;
-
-typedef struct VkPhysicalDeviceTimelineSemaphoreProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint64_t           maxTimelineSemaphoreValueDifference;
-} VkPhysicalDeviceTimelineSemaphoreProperties;
-
-typedef struct VkSemaphoreTypeCreateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkSemaphoreType    semaphoreType;
-    uint64_t           initialValue;
-} VkSemaphoreTypeCreateInfo;
-
-typedef struct VkTimelineSemaphoreSubmitInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           waitSemaphoreValueCount;
-    const uint64_t*    pWaitSemaphoreValues;
-    uint32_t           signalSemaphoreValueCount;
-    const uint64_t*    pSignalSemaphoreValues;
-} VkTimelineSemaphoreSubmitInfo;
-
-typedef struct VkSemaphoreWaitInfo {
+typedef struct VkSubpassDependency2 {
     VkStructureType         sType;
     const void*             pNext;
-    VkSemaphoreWaitFlags    flags;
-    uint32_t                semaphoreCount;
-    const VkSemaphore*      pSemaphores;
-    const uint64_t*         pValues;
-} VkSemaphoreWaitInfo;
+    uint32_t                srcSubpass;
+    uint32_t                dstSubpass;
+    VkPipelineStageFlags    srcStageMask;
+    VkPipelineStageFlags    dstStageMask;
+    VkAccessFlags           srcAccessMask;
+    VkAccessFlags           dstAccessMask;
+    VkDependencyFlags       dependencyFlags;
+    int32_t                 viewOffset;
+} VkSubpassDependency2;
 
-typedef struct VkSemaphoreSignalInfo {
+typedef struct VkRenderPassCreateInfo2 {
+    VkStructureType                    sType;
+    const void*                        pNext;
+    VkRenderPassCreateFlags            flags;
+    uint32_t                           attachmentCount;
+    const VkAttachmentDescription2*    pAttachments;
+    uint32_t                           subpassCount;
+    const VkSubpassDescription2*       pSubpasses;
+    uint32_t                           dependencyCount;
+    const VkSubpassDependency2*        pDependencies;
+    uint32_t                           correlatedViewMaskCount;
+    const uint32_t*                    pCorrelatedViewMasks;
+} VkRenderPassCreateInfo2;
+
+typedef struct VkSubpassBeginInfo {
+    VkStructureType      sType;
+    const void*          pNext;
+    VkSubpassContents    contents;
+} VkSubpassBeginInfo;
+
+typedef struct VkSubpassEndInfo {
     VkStructureType    sType;
     const void*        pNext;
-    VkSemaphore        semaphore;
-    uint64_t           value;
-} VkSemaphoreSignalInfo;
-
-typedef struct VkPhysicalDeviceBufferDeviceAddressFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           bufferDeviceAddress;
-    VkBool32           bufferDeviceAddressCaptureReplay;
-    VkBool32           bufferDeviceAddressMultiDevice;
-} VkPhysicalDeviceBufferDeviceAddressFeatures;
-
-typedef struct VkBufferDeviceAddressInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBuffer           buffer;
-} VkBufferDeviceAddressInfo;
-
-typedef struct VkBufferOpaqueCaptureAddressCreateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint64_t           opaqueCaptureAddress;
-} VkBufferOpaqueCaptureAddressCreateInfo;
-
-typedef struct VkMemoryOpaqueCaptureAddressAllocateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint64_t           opaqueCaptureAddress;
-} VkMemoryOpaqueCaptureAddressAllocateInfo;
-
-typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkDeviceMemory     memory;
-} VkDeviceMemoryOpaqueCaptureAddressInfo;
+} VkSubpassEndInfo;
 
 typedef struct VkPhysicalDevice8BitStorageFeatures {
     VkStructureType    sType;
@@ -6569,6 +6109,15 @@ typedef struct VkPhysicalDevice8BitStorageFeatures {
     VkBool32           storagePushConstant8;
 } VkPhysicalDevice8BitStorageFeatures;
 
+typedef struct VkPhysicalDeviceDriverProperties {
+    VkStructureType         sType;
+    void*                   pNext;
+    VkDriverId              driverID;
+    char                    driverName[VK_MAX_DRIVER_NAME_SIZE];
+    char                    driverInfo[VK_MAX_DRIVER_INFO_SIZE];
+    VkConformanceVersion    conformanceVersion;
+} VkPhysicalDeviceDriverProperties;
+
 typedef struct VkPhysicalDeviceShaderAtomicInt64Features {
     VkStructureType    sType;
     void*              pNext;
@@ -6678,113 +6227,6 @@ typedef struct VkDescriptorSetVariableDescriptorCountLayoutSupport {
     uint32_t           maxVariableDescriptorCount;
 } VkDescriptorSetVariableDescriptorCountLayoutSupport;
 
-typedef struct VkPhysicalDeviceScalarBlockLayoutFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           scalarBlockLayout;
-} VkPhysicalDeviceScalarBlockLayoutFeatures;
-
-typedef struct VkSamplerReductionModeCreateInfo {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkSamplerReductionMode    reductionMode;
-} VkSamplerReductionModeCreateInfo;
-
-typedef struct VkPhysicalDeviceSamplerFilterMinmaxProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           filterMinmaxSingleComponentFormats;
-    VkBool32           filterMinmaxImageComponentMapping;
-} VkPhysicalDeviceSamplerFilterMinmaxProperties;
-
-typedef struct VkPhysicalDeviceUniformBufferStandardLayoutFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           uniformBufferStandardLayout;
-} VkPhysicalDeviceUniformBufferStandardLayoutFeatures;
-
-typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderSubgroupExtendedTypes;
-} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures;
-
-typedef struct VkAttachmentDescription2 {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    VkAttachmentDescriptionFlags    flags;
-    VkFormat                        format;
-    VkSampleCountFlagBits           samples;
-    VkAttachmentLoadOp              loadOp;
-    VkAttachmentStoreOp             storeOp;
-    VkAttachmentLoadOp              stencilLoadOp;
-    VkAttachmentStoreOp             stencilStoreOp;
-    VkImageLayout                   initialLayout;
-    VkImageLayout                   finalLayout;
-} VkAttachmentDescription2;
-
-typedef struct VkAttachmentReference2 {
-    VkStructureType       sType;
-    const void*           pNext;
-    uint32_t              attachment;
-    VkImageLayout         layout;
-    VkImageAspectFlags    aspectMask;
-} VkAttachmentReference2;
-
-typedef struct VkSubpassDescription2 {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkSubpassDescriptionFlags        flags;
-    VkPipelineBindPoint              pipelineBindPoint;
-    uint32_t                         viewMask;
-    uint32_t                         inputAttachmentCount;
-    const VkAttachmentReference2*    pInputAttachments;
-    uint32_t                         colorAttachmentCount;
-    const VkAttachmentReference2*    pColorAttachments;
-    const VkAttachmentReference2*    pResolveAttachments;
-    const VkAttachmentReference2*    pDepthStencilAttachment;
-    uint32_t                         preserveAttachmentCount;
-    const uint32_t*                  pPreserveAttachments;
-} VkSubpassDescription2;
-
-typedef struct VkSubpassDependency2 {
-    VkStructureType         sType;
-    const void*             pNext;
-    uint32_t                srcSubpass;
-    uint32_t                dstSubpass;
-    VkPipelineStageFlags    srcStageMask;
-    VkPipelineStageFlags    dstStageMask;
-    VkAccessFlags           srcAccessMask;
-    VkAccessFlags           dstAccessMask;
-    VkDependencyFlags       dependencyFlags;
-    int32_t                 viewOffset;
-} VkSubpassDependency2;
-
-typedef struct VkRenderPassCreateInfo2 {
-    VkStructureType                    sType;
-    const void*                        pNext;
-    VkRenderPassCreateFlags            flags;
-    uint32_t                           attachmentCount;
-    const VkAttachmentDescription2*    pAttachments;
-    uint32_t                           subpassCount;
-    const VkSubpassDescription2*       pSubpasses;
-    uint32_t                           dependencyCount;
-    const VkSubpassDependency2*        pDependencies;
-    uint32_t                           correlatedViewMaskCount;
-    const uint32_t*                    pCorrelatedViewMasks;
-} VkRenderPassCreateInfo2;
-
-typedef struct VkSubpassBeginInfo {
-    VkStructureType      sType;
-    const void*          pNext;
-    VkSubpassContents    contents;
-} VkSubpassBeginInfo;
-
-typedef struct VkSubpassEndInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-} VkSubpassEndInfo;
-
 typedef struct VkSubpassDescriptionDepthStencilResolve {
     VkStructureType                  sType;
     const void*                      pNext;
@@ -6802,12 +6244,39 @@ typedef struct VkPhysicalDeviceDepthStencilResolveProperties {
     VkBool32              independentResolve;
 } VkPhysicalDeviceDepthStencilResolveProperties;
 
+typedef struct VkPhysicalDeviceScalarBlockLayoutFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           scalarBlockLayout;
+} VkPhysicalDeviceScalarBlockLayoutFeatures;
+
 typedef struct VkImageStencilUsageCreateInfo {
     VkStructureType      sType;
     const void*          pNext;
     VkImageUsageFlags    stencilUsage;
 } VkImageStencilUsageCreateInfo;
 
+typedef struct VkSamplerReductionModeCreateInfo {
+    VkStructureType           sType;
+    const void*               pNext;
+    VkSamplerReductionMode    reductionMode;
+} VkSamplerReductionModeCreateInfo;
+
+typedef struct VkPhysicalDeviceSamplerFilterMinmaxProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           filterMinmaxSingleComponentFormats;
+    VkBool32           filterMinmaxImageComponentMapping;
+} VkPhysicalDeviceSamplerFilterMinmaxProperties;
+
+typedef struct VkPhysicalDeviceVulkanMemoryModelFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           vulkanMemoryModel;
+    VkBool32           vulkanMemoryModelDeviceScope;
+    VkBool32           vulkanMemoryModelAvailabilityVisibilityChains;
+} VkPhysicalDeviceVulkanMemoryModelFeatures;
+
 typedef struct VkPhysicalDeviceImagelessFramebufferFeatures {
     VkStructureType    sType;
     void*              pNext;
@@ -6840,6 +6309,18 @@ typedef struct VkRenderPassAttachmentBeginInfo {
     const VkImageView*    pAttachments;
 } VkRenderPassAttachmentBeginInfo;
 
+typedef struct VkPhysicalDeviceUniformBufferStandardLayoutFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           uniformBufferStandardLayout;
+} VkPhysicalDeviceUniformBufferStandardLayoutFeatures;
+
+typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderSubgroupExtendedTypes;
+} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures;
+
 typedef struct VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures {
     VkStructureType    sType;
     void*              pNext;
@@ -6859,6 +6340,94 @@ typedef struct VkAttachmentDescriptionStencilLayout {
     VkImageLayout      stencilFinalLayout;
 } VkAttachmentDescriptionStencilLayout;
 
+typedef struct VkPhysicalDeviceHostQueryResetFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           hostQueryReset;
+} VkPhysicalDeviceHostQueryResetFeatures;
+
+typedef struct VkPhysicalDeviceTimelineSemaphoreFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           timelineSemaphore;
+} VkPhysicalDeviceTimelineSemaphoreFeatures;
+
+typedef struct VkPhysicalDeviceTimelineSemaphoreProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    uint64_t           maxTimelineSemaphoreValueDifference;
+} VkPhysicalDeviceTimelineSemaphoreProperties;
+
+typedef struct VkSemaphoreTypeCreateInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkSemaphoreType    semaphoreType;
+    uint64_t           initialValue;
+} VkSemaphoreTypeCreateInfo;
+
+typedef struct VkTimelineSemaphoreSubmitInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           waitSemaphoreValueCount;
+    const uint64_t*    pWaitSemaphoreValues;
+    uint32_t           signalSemaphoreValueCount;
+    const uint64_t*    pSignalSemaphoreValues;
+} VkTimelineSemaphoreSubmitInfo;
+
+typedef struct VkSemaphoreWaitInfo {
+    VkStructureType         sType;
+    const void*             pNext;
+    VkSemaphoreWaitFlags    flags;
+    uint32_t                semaphoreCount;
+    const VkSemaphore*      pSemaphores;
+    const uint64_t*         pValues;
+} VkSemaphoreWaitInfo;
+
+typedef struct VkSemaphoreSignalInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkSemaphore        semaphore;
+    uint64_t           value;
+} VkSemaphoreSignalInfo;
+
+typedef struct VkPhysicalDeviceBufferDeviceAddressFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           bufferDeviceAddress;
+    VkBool32           bufferDeviceAddressCaptureReplay;
+    VkBool32           bufferDeviceAddressMultiDevice;
+} VkPhysicalDeviceBufferDeviceAddressFeatures;
+
+typedef struct VkBufferDeviceAddressInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkBuffer           buffer;
+} VkBufferDeviceAddressInfo;
+
+typedef struct VkBufferOpaqueCaptureAddressCreateInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint64_t           opaqueCaptureAddress;
+} VkBufferOpaqueCaptureAddressCreateInfo;
+
+typedef struct VkMemoryOpaqueCaptureAddressAllocateInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint64_t           opaqueCaptureAddress;
+} VkMemoryOpaqueCaptureAddressAllocateInfo;
+
+typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkDeviceMemory     memory;
+} VkDeviceMemoryOpaqueCaptureAddressInfo;
+
+typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCount)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCount)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass2)(VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
+typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass2)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo*      pRenderPassBegin, const VkSubpassBeginInfo*      pSubpassBeginInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass2)(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo*      pSubpassBeginInfo, const VkSubpassEndInfo*        pSubpassEndInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass2)(VkCommandBuffer commandBuffer, const VkSubpassEndInfo*        pSubpassEndInfo);
 typedef void (VKAPI_PTR *PFN_vkResetQueryPool)(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
 typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreCounterValue)(VkDevice device, VkSemaphore semaphore, uint64_t* pValue);
 typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphores)(VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout);
@@ -6866,46 +6435,8 @@ typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphore)(VkDevice device, const VkSem
 typedef VkDeviceAddress (VKAPI_PTR *PFN_vkGetBufferDeviceAddress)(VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 typedef uint64_t (VKAPI_PTR *PFN_vkGetBufferOpaqueCaptureAddress)(VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 typedef uint64_t (VKAPI_PTR *PFN_vkGetDeviceMemoryOpaqueCaptureAddress)(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCount)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
-typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCount)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass2)(VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
-typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass2)(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo*      pRenderPassBegin, const VkSubpassBeginInfo*      pSubpassBeginInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass2)(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo*      pSubpassBeginInfo, const VkSubpassEndInfo*        pSubpassEndInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass2)(VkCommandBuffer commandBuffer, const VkSubpassEndInfo*        pSubpassEndInfo);
 
 #ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkResetQueryPool(
-    VkDevice                                    device,
-    VkQueryPool                                 queryPool,
-    uint32_t                                    firstQuery,
-    uint32_t                                    queryCount);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValue(
-    VkDevice                                    device,
-    VkSemaphore                                 semaphore,
-    uint64_t*                                   pValue);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphores(
-    VkDevice                                    device,
-    const VkSemaphoreWaitInfo*                  pWaitInfo,
-    uint64_t                                    timeout);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphore(
-    VkDevice                                    device,
-    const VkSemaphoreSignalInfo*                pSignalInfo);
-
-VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddress(
-    VkDevice                                    device,
-    const VkBufferDeviceAddressInfo*            pInfo);
-
-VKAPI_ATTR uint64_t VKAPI_CALL vkGetBufferOpaqueCaptureAddress(
-    VkDevice                                    device,
-    const VkBufferDeviceAddressInfo*            pInfo);
-
-VKAPI_ATTR uint64_t VKAPI_CALL vkGetDeviceMemoryOpaqueCaptureAddress(
-    VkDevice                                    device,
-    const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
-
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCount(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -6943,6 +6474,38 @@ VKAPI_ATTR void VKAPI_CALL vkCmdNextSubpass2(
 VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass2(
     VkCommandBuffer                             commandBuffer,
     const VkSubpassEndInfo*                     pSubpassEndInfo);
+
+VKAPI_ATTR void VKAPI_CALL vkResetQueryPool(
+    VkDevice                                    device,
+    VkQueryPool                                 queryPool,
+    uint32_t                                    firstQuery,
+    uint32_t                                    queryCount);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValue(
+    VkDevice                                    device,
+    VkSemaphore                                 semaphore,
+    uint64_t*                                   pValue);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphores(
+    VkDevice                                    device,
+    const VkSemaphoreWaitInfo*                  pWaitInfo,
+    uint64_t                                    timeout);
+
+VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphore(
+    VkDevice                                    device,
+    const VkSemaphoreSignalInfo*                pSignalInfo);
+
+VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddress(
+    VkDevice                                    device,
+    const VkBufferDeviceAddressInfo*            pInfo);
+
+VKAPI_ATTR uint64_t VKAPI_CALL vkGetBufferOpaqueCaptureAddress(
+    VkDevice                                    device,
+    const VkBufferDeviceAddressInfo*            pInfo);
+
+VKAPI_ATTR uint64_t VKAPI_CALL vkGetDeviceMemoryOpaqueCaptureAddress(
+    VkDevice                                    device,
+    const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
 #endif
 
 
@@ -6954,6 +6517,17 @@ VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass2(
 typedef uint64_t VkFlags64;
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlot)
 
+typedef enum VkPipelineCreationFeedbackFlagBits {
+    VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT = 0x00000001,
+    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT = 0x00000002,
+    VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT = 0x00000004,
+    VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT,
+    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT,
+    VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT,
+    VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkPipelineCreationFeedbackFlagBits;
+typedef VkFlags VkPipelineCreationFeedbackFlags;
+
 typedef enum VkToolPurposeFlagBits {
     VK_TOOL_PURPOSE_VALIDATION_BIT = 0x00000001,
     VK_TOOL_PURPOSE_PROFILING_BIT = 0x00000002,
@@ -6976,63 +6550,62 @@ typedef VkFlags64 VkPipelineStageFlags2;
 // Flag bits for VkPipelineStageFlagBits2
 typedef VkFlags64 VkPipelineStageFlagBits2;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE = 0ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT = 0x00000001ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT = 0x00000002ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT = 0x00000004ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT = 0x00000008ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT = 0x00000010ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT = 0x00000020ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT = 0x00000040ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT = 0x00000080ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT = 0x00000100ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT = 0x00000200ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT = 0x00000400ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT = 0x00000800ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT = 0x00001000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT = 0x00001000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT = 0x00002000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT = 0x00004000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT = 0x00008000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT = 0x00010000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT = 0x100000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT = 0x200000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT = 0x400000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT = 0x800000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT = 0x1000000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT = 0x2000000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT = 0x4000000000ULL;
+static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_EXT = 0x00020000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV = 0x00400000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000ULL;
@@ -7045,78 +6618,69 @@ static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV = 0
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_EXT = 0x00080000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_EXT = 0x00100000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SUBPASS_SHADER_BIT_HUAWEI = 0x8000000000ULL;
-// VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI is a legacy alias
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI = 0x8000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI = 0x10000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_COPY_BIT_KHR = 0x10000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MICROMAP_BUILD_BIT_EXT = 0x40000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER_BIT_HUAWEI = 0x20000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV = 0x20000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV = 0x100000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM = 0x40000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR = 0x400000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MEMORY_DECOMPRESSION_BIT_EXT = 0x200000000000ULL;
 
 typedef VkFlags64 VkAccessFlags2;
 
 // Flag bits for VkAccessFlagBits2
 typedef VkFlags64 VkAccessFlagBits2;
 static const VkAccessFlagBits2 VK_ACCESS_2_NONE = 0ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_NONE_KHR = 0ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT = 0x00000001ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT = 0x00000002ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT = 0x00000004ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT = 0x00000008ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT = 0x00000010ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT = 0x00000020ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT = 0x00000040ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT = 0x00000080ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT = 0x00000100ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT = 0x00000200ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT = 0x00000400ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT = 0x00000800ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT = 0x00001000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT = 0x00002000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT = 0x00004000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT = 0x00008000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT = 0x00010000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT = 0x100000000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT = 0x200000000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT = 0x400000000ULL;
+static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_TILE_ATTACHMENT_READ_BIT_QCOM = 0x8000000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_TILE_ATTACHMENT_WRITE_BIT_QCOM = 0x10000000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_NONE_KHR = 0ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_EXT = 0x00020000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_EXT = 0x00040000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR = 0x00200000ULL;
@@ -7132,10 +6696,6 @@ static const VkAccessFlagBits2 VK_ACCESS_2_MICROMAP_READ_BIT_EXT = 0x10000000000
 static const VkAccessFlagBits2 VK_ACCESS_2_MICROMAP_WRITE_BIT_EXT = 0x200000000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_OPTICAL_FLOW_READ_BIT_NV = 0x40000000000ULL;
 static const VkAccessFlagBits2 VK_ACCESS_2_OPTICAL_FLOW_WRITE_BIT_NV = 0x80000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_DATA_GRAPH_READ_BIT_ARM = 0x800000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_DATA_GRAPH_WRITE_BIT_ARM = 0x1000000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_DECOMPRESSION_READ_BIT_EXT = 0x80000000000000ULL;
-static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_DECOMPRESSION_WRITE_BIT_EXT = 0x100000000000000ULL;
 
 
 typedef enum VkSubmitFlagBits {
@@ -7144,38 +6704,77 @@ typedef enum VkSubmitFlagBits {
     VK_SUBMIT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VkSubmitFlagBits;
 typedef VkFlags VkSubmitFlags;
+
+typedef enum VkRenderingFlagBits {
+    VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT = 0x00000001,
+    VK_RENDERING_SUSPENDING_BIT = 0x00000002,
+    VK_RENDERING_RESUMING_BIT = 0x00000004,
+    VK_RENDERING_CONTENTS_INLINE_BIT_EXT = 0x00000010,
+    VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x00000008,
+    VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT,
+    VK_RENDERING_SUSPENDING_BIT_KHR = VK_RENDERING_SUSPENDING_BIT,
+    VK_RENDERING_RESUMING_BIT_KHR = VK_RENDERING_RESUMING_BIT,
+    VK_RENDERING_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VkRenderingFlagBits;
+typedef VkFlags VkRenderingFlags;
 typedef VkFlags64 VkFormatFeatureFlags2;
 
 // Flag bits for VkFormatFeatureFlagBits2
 typedef VkFlags64 VkFormatFeatureFlagBits2;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT = 0x00000001ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR = 0x00000001ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT = 0x00000002ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR = 0x00000002ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT = 0x00000004ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR = 0x00000004ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT = 0x00000008ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT = 0x00000010ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000010ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT = 0x00000020ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR = 0x00000020ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT = 0x00000040ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR = 0x00000040ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT = 0x00000080ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR = 0x00000080ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR = 0x00000100ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR = 0x00000200ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT = 0x00000400ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR = 0x00000400ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT = 0x00000800ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR = 0x00000800ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT = 0x00004000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT = 0x00008000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT = 0x00010000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT = 0x00020000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT = 0x00040000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT = 0x00080000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT = 0x00100000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT = 0x00200000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT = 0x00400000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT = 0x00800000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT = 0x80000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT = 0x100000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT = 0x200000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR = 0x00001000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT = 0x00002000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT = 0x400000000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT = 0x00004000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR = 0x00004000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT = 0x00008000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR = 0x00008000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT = 0x00010000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR = 0x00010000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT = 0x00020000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = 0x00020000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT = 0x00040000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR = 0x00040000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT = 0x00080000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR = 0x00080000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT = 0x00100000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR = 0x00100000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT = 0x00200000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR = 0x00200000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT = 0x00400000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR = 0x00400000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT = 0x00800000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR = 0x00800000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT = 0x80000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT = 0x100000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT = 0x200000000ULL;
+static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR = 0x02000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR = 0x04000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR = 0x20000000ULL;
@@ -7184,82 +6783,15 @@ static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT = 0x400000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR = 0x00000001ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR = 0x00000002ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR = 0x00000004ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000010ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR = 0x00000020ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR = 0x00000040ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR = 0x00000080ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR = 0x00000100ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR = 0x00000200ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR = 0x00000400ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR = 0x00000800ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR = 0x00001000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR = 0x00004000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR = 0x00008000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = 0x00020000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR = 0x00040000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR = 0x00080000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR = 0x00100000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR = 0x00200000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR = 0x00400000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR = 0x00800000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR = 0x00010000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_RADIUS_BUFFER_BIT_NV = 0x8000000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV = 0x4000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM = 0x400000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM = 0x800000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM = 0x1000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM = 0x2000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TENSOR_SHADER_BIT_ARM = 0x8000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TENSOR_IMAGE_ALIASING_BIT_ARM = 0x80000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV = 0x10000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV = 0x20000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV = 0x40000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TENSOR_DATA_GRAPH_BIT_ARM = 0x1000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COPY_IMAGE_INDIRECT_DST_BIT_KHR = 0x800000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x2000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR = 0x4000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_COMPUTE_QUEUE_BIT_KHR = 0x10000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_TRANSFER_QUEUE_BIT_KHR = 0x20000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_COMPUTE_QUEUE_BIT_KHR = 0x40000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_TRANSFER_QUEUE_BIT_KHR = 0x80000000000000ULL;
 
-
-typedef enum VkPipelineCreationFeedbackFlagBits {
-    VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT = 0x00000001,
-    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT = 0x00000002,
-    VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT = 0x00000004,
-    VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT,
-    VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT,
-    VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT,
-    VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineCreationFeedbackFlagBits;
-typedef VkFlags VkPipelineCreationFeedbackFlags;
-
-typedef enum VkRenderingFlagBits {
-    VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT = 0x00000001,
-    VK_RENDERING_SUSPENDING_BIT = 0x00000002,
-    VK_RENDERING_RESUMING_BIT = 0x00000004,
-    VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x00000008,
-    VK_RENDERING_CONTENTS_INLINE_BIT_KHR = 0x00000010,
-    VK_RENDERING_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE = 0x00000020,
-    VK_RENDERING_FRAGMENT_REGION_BIT_EXT = 0x00000040,
-    VK_RENDERING_CUSTOM_RESOLVE_BIT_EXT = 0x00000080,
-    VK_RENDERING_LOCAL_READ_CONCURRENT_ACCESS_CONTROL_BIT_KHR = 0x00000100,
-    VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT,
-    VK_RENDERING_SUSPENDING_BIT_KHR = VK_RENDERING_SUSPENDING_BIT,
-    VK_RENDERING_RESUMING_BIT_KHR = VK_RENDERING_RESUMING_BIT,
-    VK_RENDERING_CONTENTS_INLINE_BIT_EXT = VK_RENDERING_CONTENTS_INLINE_BIT_KHR,
-    VK_RENDERING_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkRenderingFlagBits;
-typedef VkFlags VkRenderingFlags;
 typedef struct VkPhysicalDeviceVulkan13Features {
     VkStructureType    sType;
     void*              pNext;
@@ -7330,6 +6862,25 @@ typedef struct VkPhysicalDeviceVulkan13Properties {
     VkDeviceSize          maxBufferSize;
 } VkPhysicalDeviceVulkan13Properties;
 
+typedef struct VkPipelineCreationFeedback {
+    VkPipelineCreationFeedbackFlags    flags;
+    uint64_t                           duration;
+} VkPipelineCreationFeedback;
+
+typedef struct VkPipelineCreationFeedbackCreateInfo {
+    VkStructureType                sType;
+    const void*                    pNext;
+    VkPipelineCreationFeedback*    pPipelineCreationFeedback;
+    uint32_t                       pipelineStageCreationFeedbackCount;
+    VkPipelineCreationFeedback*    pPipelineStageCreationFeedbacks;
+} VkPipelineCreationFeedbackCreateInfo;
+
+typedef struct VkPhysicalDeviceShaderTerminateInvocationFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderTerminateInvocation;
+} VkPhysicalDeviceShaderTerminateInvocationFeatures;
+
 typedef struct VkPhysicalDeviceToolProperties {
     VkStructureType       sType;
     void*                 pNext;
@@ -7340,6 +6891,12 @@ typedef struct VkPhysicalDeviceToolProperties {
     char                  layer[VK_MAX_EXTENSION_NAME_SIZE];
 } VkPhysicalDeviceToolProperties;
 
+typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderDemoteToHelperInvocation;
+} VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures;
+
 typedef struct VkPhysicalDevicePrivateDataFeatures {
     VkStructureType    sType;
     void*              pNext;
@@ -7358,6 +6915,12 @@ typedef struct VkPrivateDataSlotCreateInfo {
     VkPrivateDataSlotCreateFlags    flags;
 } VkPrivateDataSlotCreateInfo;
 
+typedef struct VkPhysicalDevicePipelineCreationCacheControlFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           pipelineCreationCacheControl;
+} VkPhysicalDevicePipelineCreationCacheControlFeatures;
+
 typedef struct VkMemoryBarrier2 {
     VkStructureType          sType;
     const void*              pNext;
@@ -7442,6 +7005,18 @@ typedef struct VkPhysicalDeviceSynchronization2Features {
     VkBool32           synchronization2;
 } VkPhysicalDeviceSynchronization2Features;
 
+typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderZeroInitializeWorkgroupMemory;
+} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
+
+typedef struct VkPhysicalDeviceImageRobustnessFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           robustImageAccess;
+} VkPhysicalDeviceImageRobustnessFeatures;
+
 typedef struct VkBufferCopy2 {
     VkStructureType    sType;
     const void*        pNext;
@@ -7511,190 +7086,6 @@ typedef struct VkCopyImageToBufferInfo2 {
     const VkBufferImageCopy2*    pRegions;
 } VkCopyImageToBufferInfo2;
 
-typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           textureCompressionASTC_HDR;
-} VkPhysicalDeviceTextureCompressionASTCHDRFeatures;
-
-typedef struct VkFormatProperties3 {
-    VkStructureType          sType;
-    void*                    pNext;
-    VkFormatFeatureFlags2    linearTilingFeatures;
-    VkFormatFeatureFlags2    optimalTilingFeatures;
-    VkFormatFeatureFlags2    bufferFeatures;
-} VkFormatProperties3;
-
-typedef struct VkPhysicalDeviceMaintenance4Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance4;
-} VkPhysicalDeviceMaintenance4Features;
-
-typedef struct VkPhysicalDeviceMaintenance4Properties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       maxBufferSize;
-} VkPhysicalDeviceMaintenance4Properties;
-
-typedef struct VkDeviceBufferMemoryRequirements {
-    VkStructureType              sType;
-    const void*                  pNext;
-    const VkBufferCreateInfo*    pCreateInfo;
-} VkDeviceBufferMemoryRequirements;
-
-typedef struct VkDeviceImageMemoryRequirements {
-    VkStructureType             sType;
-    const void*                 pNext;
-    const VkImageCreateInfo*    pCreateInfo;
-    VkImageAspectFlagBits       planeAspect;
-} VkDeviceImageMemoryRequirements;
-
-typedef struct VkPipelineCreationFeedback {
-    VkPipelineCreationFeedbackFlags    flags;
-    uint64_t                           duration;
-} VkPipelineCreationFeedback;
-
-typedef struct VkPipelineCreationFeedbackCreateInfo {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkPipelineCreationFeedback*    pPipelineCreationFeedback;
-    uint32_t                       pipelineStageCreationFeedbackCount;
-    VkPipelineCreationFeedback*    pPipelineStageCreationFeedbacks;
-} VkPipelineCreationFeedbackCreateInfo;
-
-typedef struct VkPhysicalDeviceShaderTerminateInvocationFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderTerminateInvocation;
-} VkPhysicalDeviceShaderTerminateInvocationFeatures;
-
-typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderDemoteToHelperInvocation;
-} VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures;
-
-typedef struct VkPhysicalDevicePipelineCreationCacheControlFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineCreationCacheControl;
-} VkPhysicalDevicePipelineCreationCacheControlFeatures;
-
-typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderZeroInitializeWorkgroupMemory;
-} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
-
-typedef struct VkPhysicalDeviceImageRobustnessFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           robustImageAccess;
-} VkPhysicalDeviceImageRobustnessFeatures;
-
-typedef struct VkPhysicalDeviceSubgroupSizeControlFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           subgroupSizeControl;
-    VkBool32           computeFullSubgroups;
-} VkPhysicalDeviceSubgroupSizeControlFeatures;
-
-typedef struct VkPhysicalDeviceSubgroupSizeControlProperties {
-    VkStructureType       sType;
-    void*                 pNext;
-    uint32_t              minSubgroupSize;
-    uint32_t              maxSubgroupSize;
-    uint32_t              maxComputeWorkgroupSubgroups;
-    VkShaderStageFlags    requiredSubgroupSizeStages;
-} VkPhysicalDeviceSubgroupSizeControlProperties;
-
-typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           requiredSubgroupSize;
-} VkPipelineShaderStageRequiredSubgroupSizeCreateInfo;
-
-typedef struct VkPhysicalDeviceInlineUniformBlockFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           inlineUniformBlock;
-    VkBool32           descriptorBindingInlineUniformBlockUpdateAfterBind;
-} VkPhysicalDeviceInlineUniformBlockFeatures;
-
-typedef struct VkPhysicalDeviceInlineUniformBlockProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxInlineUniformBlockSize;
-    uint32_t           maxPerStageDescriptorInlineUniformBlocks;
-    uint32_t           maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
-    uint32_t           maxDescriptorSetInlineUniformBlocks;
-    uint32_t           maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
-} VkPhysicalDeviceInlineUniformBlockProperties;
-
-typedef struct VkWriteDescriptorSetInlineUniformBlock {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           dataSize;
-    const void*        pData;
-} VkWriteDescriptorSetInlineUniformBlock;
-
-typedef struct VkDescriptorPoolInlineUniformBlockCreateInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           maxInlineUniformBlockBindings;
-} VkDescriptorPoolInlineUniformBlockCreateInfo;
-
-typedef struct VkPhysicalDeviceShaderIntegerDotProductFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderIntegerDotProduct;
-} VkPhysicalDeviceShaderIntegerDotProductFeatures;
-
-typedef struct VkPhysicalDeviceShaderIntegerDotProductProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           integerDotProduct8BitUnsignedAccelerated;
-    VkBool32           integerDotProduct8BitSignedAccelerated;
-    VkBool32           integerDotProduct8BitMixedSignednessAccelerated;
-    VkBool32           integerDotProduct4x8BitPackedUnsignedAccelerated;
-    VkBool32           integerDotProduct4x8BitPackedSignedAccelerated;
-    VkBool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated;
-    VkBool32           integerDotProduct16BitUnsignedAccelerated;
-    VkBool32           integerDotProduct16BitSignedAccelerated;
-    VkBool32           integerDotProduct16BitMixedSignednessAccelerated;
-    VkBool32           integerDotProduct32BitUnsignedAccelerated;
-    VkBool32           integerDotProduct32BitSignedAccelerated;
-    VkBool32           integerDotProduct32BitMixedSignednessAccelerated;
-    VkBool32           integerDotProduct64BitUnsignedAccelerated;
-    VkBool32           integerDotProduct64BitSignedAccelerated;
-    VkBool32           integerDotProduct64BitMixedSignednessAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating16BitUnsignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating16BitSignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating32BitUnsignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating32BitSignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating64BitUnsignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating64BitSignedAccelerated;
-    VkBool32           integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated;
-} VkPhysicalDeviceShaderIntegerDotProductProperties;
-
-typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       storageTexelBufferOffsetAlignmentBytes;
-    VkBool32           storageTexelBufferOffsetSingleTexelAlignment;
-    VkDeviceSize       uniformTexelBufferOffsetAlignmentBytes;
-    VkBool32           uniformTexelBufferOffsetSingleTexelAlignment;
-} VkPhysicalDeviceTexelBufferAlignmentProperties;
-
 typedef struct VkImageBlit2 {
     VkStructureType             sType;
     const void*                 pNext;
@@ -7737,6 +7128,64 @@ typedef struct VkResolveImageInfo2 {
     const VkImageResolve2*    pRegions;
 } VkResolveImageInfo2;
 
+typedef struct VkPhysicalDeviceSubgroupSizeControlFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           subgroupSizeControl;
+    VkBool32           computeFullSubgroups;
+} VkPhysicalDeviceSubgroupSizeControlFeatures;
+
+typedef struct VkPhysicalDeviceSubgroupSizeControlProperties {
+    VkStructureType       sType;
+    void*                 pNext;
+    uint32_t              minSubgroupSize;
+    uint32_t              maxSubgroupSize;
+    uint32_t              maxComputeWorkgroupSubgroups;
+    VkShaderStageFlags    requiredSubgroupSizeStages;
+} VkPhysicalDeviceSubgroupSizeControlProperties;
+
+typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           requiredSubgroupSize;
+} VkPipelineShaderStageRequiredSubgroupSizeCreateInfo;
+
+typedef struct VkPhysicalDeviceInlineUniformBlockFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           inlineUniformBlock;
+    VkBool32           descriptorBindingInlineUniformBlockUpdateAfterBind;
+} VkPhysicalDeviceInlineUniformBlockFeatures;
+
+typedef struct VkPhysicalDeviceInlineUniformBlockProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           maxInlineUniformBlockSize;
+    uint32_t           maxPerStageDescriptorInlineUniformBlocks;
+    uint32_t           maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
+    uint32_t           maxDescriptorSetInlineUniformBlocks;
+    uint32_t           maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
+} VkPhysicalDeviceInlineUniformBlockProperties;
+
+typedef struct VkWriteDescriptorSetInlineUniformBlock {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           dataSize;
+    const void*        pData;
+} VkWriteDescriptorSetInlineUniformBlock;
+
+typedef struct VkDescriptorPoolInlineUniformBlockCreateInfo {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           maxInlineUniformBlockBindings;
+} VkDescriptorPoolInlineUniformBlockCreateInfo;
+
+typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           textureCompressionASTC_HDR;
+} VkPhysicalDeviceTextureCompressionASTCHDRFeatures;
+
 typedef struct VkRenderingAttachmentInfo {
     VkStructureType          sType;
     const void*              pNext;
@@ -7791,11 +7240,97 @@ typedef struct VkCommandBufferInheritanceRenderingInfo {
     VkSampleCountFlagBits    rasterizationSamples;
 } VkCommandBufferInheritanceRenderingInfo;
 
+typedef struct VkPhysicalDeviceShaderIntegerDotProductFeatures {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderIntegerDotProduct;
+} VkPhysicalDeviceShaderIntegerDotProductFeatures;
+
+typedef struct VkPhysicalDeviceShaderIntegerDotProductProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           integerDotProduct8BitUnsignedAccelerated;
+    VkBool32           integerDotProduct8BitSignedAccelerated;
+    VkBool32           integerDotProduct8BitMixedSignednessAccelerated;
+    VkBool32           integerDotProduct4x8BitPackedUnsignedAccelerated;
+    VkBool32           integerDotProduct4x8BitPackedSignedAccelerated;
+    VkBool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated;
+    VkBool32           integerDotProduct16BitUnsignedAccelerated;
+    VkBool32           integerDotProduct16BitSignedAccelerated;
+    VkBool32           integerDotProduct16BitMixedSignednessAccelerated;
+    VkBool32           integerDotProduct32BitUnsignedAccelerated;
+    VkBool32           integerDotProduct32BitSignedAccelerated;
+    VkBool32           integerDotProduct32BitMixedSignednessAccelerated;
+    VkBool32           integerDotProduct64BitUnsignedAccelerated;
+    VkBool32           integerDotProduct64BitSignedAccelerated;
+    VkBool32           integerDotProduct64BitMixedSignednessAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating16BitUnsignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating16BitSignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating32BitUnsignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating32BitSignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating64BitUnsignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating64BitSignedAccelerated;
+    VkBool32           integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated;
+} VkPhysicalDeviceShaderIntegerDotProductProperties;
+
+typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties {
+    VkStructureType    sType;
+    void*              pNext;
+    VkDeviceSize       storageTexelBufferOffsetAlignmentBytes;
+    VkBool32           storageTexelBufferOffsetSingleTexelAlignment;
+    VkDeviceSize       uniformTexelBufferOffsetAlignmentBytes;
+    VkBool32           uniformTexelBufferOffsetSingleTexelAlignment;
+} VkPhysicalDeviceTexelBufferAlignmentProperties;
+
+typedef struct VkFormatProperties3 {
+    VkStructureType          sType;
+    void*                    pNext;
+    VkFormatFeatureFlags2    linearTilingFeatures;
+    VkFormatFeatureFlags2    optimalTilingFeatures;
+    VkFormatFeatureFlags2    bufferFeatures;
+} VkFormatProperties3;
+
+typedef struct VkPhysicalDeviceMaintenance4Features {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           maintenance4;
+} VkPhysicalDeviceMaintenance4Features;
+
+typedef struct VkPhysicalDeviceMaintenance4Properties {
+    VkStructureType    sType;
+    void*              pNext;
+    VkDeviceSize       maxBufferSize;
+} VkPhysicalDeviceMaintenance4Properties;
+
+typedef struct VkDeviceBufferMemoryRequirements {
+    VkStructureType              sType;
+    const void*                  pNext;
+    const VkBufferCreateInfo*    pCreateInfo;
+} VkDeviceBufferMemoryRequirements;
+
+typedef struct VkDeviceImageMemoryRequirements {
+    VkStructureType             sType;
+    const void*                 pNext;
+    const VkImageCreateInfo*    pCreateInfo;
+    VkImageAspectFlagBits       planeAspect;
+} VkDeviceImageMemoryRequirements;
+
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolProperties)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties);
 typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlot)(VkDevice device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlot* pPrivateDataSlot);
 typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlot)(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data);
 typedef void (VKAPI_PTR *PFN_vkGetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData);
+typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, const VkDependencyInfo*                             pDependencyInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, VkPipelineStageFlags2               stageMask);
+typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2)(VkCommandBuffer                   commandBuffer, uint32_t                                            eventCount, const VkEvent*                     pEvents, const VkDependencyInfo*            pDependencyInfos);
 typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2)(VkCommandBuffer                   commandBuffer, const VkDependencyInfo*                             pDependencyInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2)(VkCommandBuffer                   commandBuffer, VkPipelineStageFlags2               stage, VkQueryPool                                         queryPool, uint32_t                                            query);
 typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2)(VkQueue                           queue, uint32_t                            submitCount, const VkSubmitInfo2*              pSubmits, VkFence           fence);
@@ -7803,12 +7338,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2)(VkCommandBuffer commandBuffer, co
 typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2* pCopyImageInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirements)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
-typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, const VkDependencyInfo*                             pDependencyInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, VkPipelineStageFlags2               stageMask);
-typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2)(VkCommandBuffer                   commandBuffer, uint32_t                                            eventCount, const VkEvent*                     pEvents, const VkDependencyInfo*            pDependencyInfos);
 typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2* pBlitImageInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdBeginRendering)(VkCommandBuffer                   commandBuffer, const VkRenderingInfo*                              pRenderingInfo);
@@ -7828,6 +7357,9 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetStencilOp)(VkCommandBuffer commandBuffer, V
 typedef void (VKAPI_PTR *PFN_vkCmdSetRasterizerDiscardEnable)(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable);
 typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBiasEnable)(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable);
 typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveRestartEnable)(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable);
+typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirements)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements);
+typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements);
+typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
 
 #ifndef VK_NO_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolProperties(
@@ -7860,6 +7392,22 @@ VKAPI_ATTR void VKAPI_CALL vkGetPrivateData(
     VkPrivateDataSlot                           privateDataSlot,
     uint64_t*                                   pData);
 
+VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2(
+    VkCommandBuffer                             commandBuffer,
+    VkEvent                                     event,
+    const VkDependencyInfo*                     pDependencyInfo);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2(
+    VkCommandBuffer                             commandBuffer,
+    VkEvent                                     event,
+    VkPipelineStageFlags2                       stageMask);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2(
+    VkCommandBuffer                             commandBuffer,
+    uint32_t                                    eventCount,
+    const VkEvent*                              pEvents,
+    const VkDependencyInfo*                     pDependencyInfos);
+
 VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2(
     VkCommandBuffer                             commandBuffer,
     const VkDependencyInfo*                     pDependencyInfo);
@@ -7892,38 +7440,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2(
     VkCommandBuffer                             commandBuffer,
     const VkCopyImageToBufferInfo2*             pCopyImageToBufferInfo);
 
-VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirements(
-    VkDevice                                    device,
-    const VkDeviceBufferMemoryRequirements*     pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-
-VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirements(
-    VkDevice                                    device,
-    const VkDeviceImageMemoryRequirements*      pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-
-VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirements(
-    VkDevice                                    device,
-    const VkDeviceImageMemoryRequirements*      pInfo,
-    uint32_t*                                   pSparseMemoryRequirementCount,
-    VkSparseImageMemoryRequirements2*           pSparseMemoryRequirements);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2(
-    VkCommandBuffer                             commandBuffer,
-    VkEvent                                     event,
-    const VkDependencyInfo*                     pDependencyInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2(
-    VkCommandBuffer                             commandBuffer,
-    VkEvent                                     event,
-    VkPipelineStageFlags2                       stageMask);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    eventCount,
-    const VkEvent*                              pEvents,
-    const VkDependencyInfo*                     pDependencyInfos);
-
 VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2(
     VkCommandBuffer                             commandBuffer,
     const VkBlitImageInfo2*                     pBlitImageInfo);
@@ -8009,746 +7525,22 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBiasEnable(
 VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveRestartEnable(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    primitiveRestartEnable);
-#endif
 
-
-// VK_VERSION_1_4 is a preprocessor guard. Do not pass it to API calls.
-#define VK_VERSION_1_4 1
-// Vulkan 1.4 version number
-#define VK_API_VERSION_1_4 VK_MAKE_API_VERSION(0, 1, 4, 0)// Patch version should always be set to 0
-
-#define VK_MAX_GLOBAL_PRIORITY_SIZE       16U
-
-typedef enum VkPipelineRobustnessBufferBehavior {
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT = 0,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED = 1,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS = 2,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2 = 3,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2,
-    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineRobustnessBufferBehavior;
-
-typedef enum VkPipelineRobustnessImageBehavior {
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT = 0,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED = 1,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS = 2,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2 = 3,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED_EXT = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2,
-    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_MAX_ENUM = 0x7FFFFFFF
-} VkPipelineRobustnessImageBehavior;
-
-typedef enum VkQueueGlobalPriority {
-    VK_QUEUE_GLOBAL_PRIORITY_LOW = 128,
-    VK_QUEUE_GLOBAL_PRIORITY_MEDIUM = 256,
-    VK_QUEUE_GLOBAL_PRIORITY_HIGH = 512,
-    VK_QUEUE_GLOBAL_PRIORITY_REALTIME = 1024,
-    VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = VK_QUEUE_GLOBAL_PRIORITY_LOW,
-    VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM,
-    VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = VK_QUEUE_GLOBAL_PRIORITY_HIGH,
-    VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = VK_QUEUE_GLOBAL_PRIORITY_REALTIME,
-    VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR = VK_QUEUE_GLOBAL_PRIORITY_LOW,
-    VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM,
-    VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR = VK_QUEUE_GLOBAL_PRIORITY_HIGH,
-    VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR = VK_QUEUE_GLOBAL_PRIORITY_REALTIME,
-    VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM = 0x7FFFFFFF
-} VkQueueGlobalPriority;
-
-typedef enum VkLineRasterizationMode {
-    VK_LINE_RASTERIZATION_MODE_DEFAULT = 0,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR = 1,
-    VK_LINE_RASTERIZATION_MODE_BRESENHAM = 2,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH = 3,
-    VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT = VK_LINE_RASTERIZATION_MODE_DEFAULT,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR,
-    VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT = VK_LINE_RASTERIZATION_MODE_BRESENHAM,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH,
-    VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR = VK_LINE_RASTERIZATION_MODE_DEFAULT,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR = VK_LINE_RASTERIZATION_MODE_RECTANGULAR,
-    VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR = VK_LINE_RASTERIZATION_MODE_BRESENHAM,
-    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH,
-    VK_LINE_RASTERIZATION_MODE_MAX_ENUM = 0x7FFFFFFF
-} VkLineRasterizationMode;
-
-typedef enum VkMemoryUnmapFlagBits {
-    VK_MEMORY_UNMAP_RESERVE_BIT_EXT = 0x00000001,
-    VK_MEMORY_UNMAP_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkMemoryUnmapFlagBits;
-typedef VkFlags VkMemoryUnmapFlags;
-typedef VkFlags64 VkBufferUsageFlags2;
-
-// Flag bits for VkBufferUsageFlagBits2
-typedef VkFlags64 VkBufferUsageFlagBits2;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT = 0x00000001ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFER_DST_BIT = 0x00000002ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT = 0x00000004ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT = 0x00000008ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT = 0x00000010ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT = 0x00000020ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT = 0x00000040ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT = 0x00000080ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT = 0x00000100ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT = 0x00020000ULL;
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX = 0x02000000ULL;
-#endif
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR = 0x00000001ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFER_DST_BIT_KHR = 0x00000002ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000004ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR = 0x00000010ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR = 0x00000020ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR = 0x00000040ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR = 0x00000080ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR = 0x00000100ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00000200ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR = 0x00000400ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_RAY_TRACING_BIT_NV = 0x00000400ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR = 0x00002000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR = 0x00004000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR = 0x00008000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR = 0x00010000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR = 0x00020000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR = 0x00080000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR = 0x00100000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT = 0x00200000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT = 0x00400000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT = 0x04000000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT = 0x00800000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT = 0x01000000ULL;
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_COMPRESSED_DATA_DGF1_BIT_AMDX = 0x200000000ULL;
-#endif
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_DATA_GRAPH_FOREIGN_DESCRIPTOR_BIT_ARM = 0x20000000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TILE_MEMORY_BIT_QCOM = 0x08000000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_MEMORY_DECOMPRESSION_BIT_EXT = 0x100000000ULL;
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT = 0x80000000ULL;
-
-
-typedef enum VkHostImageCopyFlagBits {
-    VK_HOST_IMAGE_COPY_MEMCPY_BIT = 0x00000001,
-  // VK_HOST_IMAGE_COPY_MEMCPY is a legacy alias
-    VK_HOST_IMAGE_COPY_MEMCPY = VK_HOST_IMAGE_COPY_MEMCPY_BIT,
-    VK_HOST_IMAGE_COPY_MEMCPY_BIT_EXT = VK_HOST_IMAGE_COPY_MEMCPY_BIT,
-  // VK_HOST_IMAGE_COPY_MEMCPY_EXT is a legacy alias
-    VK_HOST_IMAGE_COPY_MEMCPY_EXT = VK_HOST_IMAGE_COPY_MEMCPY_BIT,
-    VK_HOST_IMAGE_COPY_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
-} VkHostImageCopyFlagBits;
-typedef VkFlags VkHostImageCopyFlags;
-typedef VkFlags64 VkPipelineCreateFlags2;
-
-// Flag bits for VkPipelineCreateFlagBits2
-typedef VkFlags64 VkPipelineCreateFlagBits2;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT = 0x00000001ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT = 0x00000002ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DERIVATIVE_BIT = 0x00000004ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT = 0x00000008ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT = 0x00000010ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT = 0x00000100ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT = 0x00000200ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT = 0x08000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT = 0x40000000ULL;
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX = 0x100000000ULL;
-#endif
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_BUILT_IN_PRIMITIVES_BIT_KHR = 0x00001000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_SPHERES_AND_LINEAR_SWEPT_SPHERES_BIT_NV = 0x200000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x400000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR = 0x00000001ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR = 0x00000002ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR = 0x00000004ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = 0x00000008ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR = 0x00000010ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV = 0x00000020ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR = 0x00000040ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR = 0x00000080ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR = 0x00000100ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR = 0x00000200ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT = 0x00000400ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT = 0x00800000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR = 0x00000800ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR = 0x00001000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR = 0x00002000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 0x00004000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 0x00008000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 0x00010000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR = 0x00020000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR = 0x00080000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV = 0x00040000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV = 0x00100000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT = 0x01000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 0x02000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 0x04000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT = 0x08000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT = 0x40000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV = 0x10000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT = 0x20000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM = 0x2000000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR = 0x80000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT = 0x4000000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE = 0x10000000000ULL;
-static const VkPipelineCreateFlagBits2 VK_PIPELINE_CREATE_2_64_BIT_INDEXING_BIT_EXT = 0x80000000000ULL;
-
-typedef struct VkPhysicalDeviceVulkan14Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           globalPriorityQuery;
-    VkBool32           shaderSubgroupRotate;
-    VkBool32           shaderSubgroupRotateClustered;
-    VkBool32           shaderFloatControls2;
-    VkBool32           shaderExpectAssume;
-    VkBool32           rectangularLines;
-    VkBool32           bresenhamLines;
-    VkBool32           smoothLines;
-    VkBool32           stippledRectangularLines;
-    VkBool32           stippledBresenhamLines;
-    VkBool32           stippledSmoothLines;
-    VkBool32           vertexAttributeInstanceRateDivisor;
-    VkBool32           vertexAttributeInstanceRateZeroDivisor;
-    VkBool32           indexTypeUint8;
-    VkBool32           dynamicRenderingLocalRead;
-    VkBool32           maintenance5;
-    VkBool32           maintenance6;
-    VkBool32           pipelineProtectedAccess;
-    VkBool32           pipelineRobustness;
-    VkBool32           hostImageCopy;
-    VkBool32           pushDescriptor;
-} VkPhysicalDeviceVulkan14Features;
-
-typedef struct VkPhysicalDeviceVulkan14Properties {
-    VkStructureType                       sType;
-    void*                                 pNext;
-    uint32_t                              lineSubPixelPrecisionBits;
-    uint32_t                              maxVertexAttribDivisor;
-    VkBool32                              supportsNonZeroFirstInstance;
-    uint32_t                              maxPushDescriptors;
-    VkBool32                              dynamicRenderingLocalReadDepthStencilAttachments;
-    VkBool32                              dynamicRenderingLocalReadMultisampledAttachments;
-    VkBool32                              earlyFragmentMultisampleCoverageAfterSampleCounting;
-    VkBool32                              earlyFragmentSampleMaskTestBeforeSampleCounting;
-    VkBool32                              depthStencilSwizzleOneSupport;
-    VkBool32                              polygonModePointSize;
-    VkBool32                              nonStrictSinglePixelWideLinesUseParallelogram;
-    VkBool32                              nonStrictWideLinesUseParallelogram;
-    VkBool32                              blockTexelViewCompatibleMultipleLayers;
-    uint32_t                              maxCombinedImageSamplerDescriptorCount;
-    VkBool32                              fragmentShadingRateClampCombinerInputs;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessStorageBuffers;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessUniformBuffers;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessVertexInputs;
-    VkPipelineRobustnessImageBehavior     defaultRobustnessImages;
-    uint32_t                              copySrcLayoutCount;
-    VkImageLayout*                        pCopySrcLayouts;
-    uint32_t                              copyDstLayoutCount;
-    VkImageLayout*                        pCopyDstLayouts;
-    uint8_t                               optimalTilingLayoutUUID[VK_UUID_SIZE];
-    VkBool32                              identicalMemoryTypeRequirements;
-} VkPhysicalDeviceVulkan14Properties;
-
-typedef struct VkDeviceQueueGlobalPriorityCreateInfo {
-    VkStructureType          sType;
-    const void*              pNext;
-    VkQueueGlobalPriority    globalPriority;
-} VkDeviceQueueGlobalPriorityCreateInfo;
-
-typedef struct VkPhysicalDeviceGlobalPriorityQueryFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           globalPriorityQuery;
-} VkPhysicalDeviceGlobalPriorityQueryFeatures;
-
-typedef struct VkQueueFamilyGlobalPriorityProperties {
-    VkStructureType          sType;
-    void*                    pNext;
-    uint32_t                 priorityCount;
-    VkQueueGlobalPriority    priorities[VK_MAX_GLOBAL_PRIORITY_SIZE];
-} VkQueueFamilyGlobalPriorityProperties;
-
-typedef struct VkPhysicalDeviceIndexTypeUint8Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           indexTypeUint8;
-} VkPhysicalDeviceIndexTypeUint8Features;
-
-typedef struct VkMemoryMapInfo {
-    VkStructureType     sType;
-    const void*         pNext;
-    VkMemoryMapFlags    flags;
-    VkDeviceMemory      memory;
-    VkDeviceSize        offset;
-    VkDeviceSize        size;
-} VkMemoryMapInfo;
-
-typedef struct VkMemoryUnmapInfo {
-    VkStructureType       sType;
-    const void*           pNext;
-    VkMemoryUnmapFlags    flags;
-    VkDeviceMemory        memory;
-} VkMemoryUnmapInfo;
-
-typedef struct VkPhysicalDeviceMaintenance5Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance5;
-} VkPhysicalDeviceMaintenance5Features;
-
-typedef struct VkPhysicalDeviceMaintenance5Properties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           earlyFragmentMultisampleCoverageAfterSampleCounting;
-    VkBool32           earlyFragmentSampleMaskTestBeforeSampleCounting;
-    VkBool32           depthStencilSwizzleOneSupport;
-    VkBool32           polygonModePointSize;
-    VkBool32           nonStrictSinglePixelWideLinesUseParallelogram;
-    VkBool32           nonStrictWideLinesUseParallelogram;
-} VkPhysicalDeviceMaintenance5Properties;
-
-typedef struct VkImageSubresource2 {
-    VkStructureType       sType;
-    void*                 pNext;
-    VkImageSubresource    imageSubresource;
-} VkImageSubresource2;
-
-typedef struct VkDeviceImageSubresourceInfo {
-    VkStructureType               sType;
-    const void*                   pNext;
-    const VkImageCreateInfo*      pCreateInfo;
-    const VkImageSubresource2*    pSubresource;
-} VkDeviceImageSubresourceInfo;
-
-typedef struct VkSubresourceLayout2 {
-    VkStructureType        sType;
-    void*                  pNext;
-    VkSubresourceLayout    subresourceLayout;
-} VkSubresourceLayout2;
-
-typedef struct VkBufferUsageFlags2CreateInfo {
-    VkStructureType        sType;
-    const void*            pNext;
-    VkBufferUsageFlags2    usage;
-} VkBufferUsageFlags2CreateInfo;
-
-typedef struct VkPhysicalDeviceMaintenance6Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance6;
-} VkPhysicalDeviceMaintenance6Features;
-
-typedef struct VkPhysicalDeviceMaintenance6Properties {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           blockTexelViewCompatibleMultipleLayers;
-    uint32_t           maxCombinedImageSamplerDescriptorCount;
-    VkBool32           fragmentShadingRateClampCombinerInputs;
-} VkPhysicalDeviceMaintenance6Properties;
-
-typedef struct VkBindMemoryStatus {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkResult*          pResult;
-} VkBindMemoryStatus;
-
-typedef struct VkPhysicalDeviceHostImageCopyFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           hostImageCopy;
-} VkPhysicalDeviceHostImageCopyFeatures;
-
-typedef struct VkPhysicalDeviceHostImageCopyProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           copySrcLayoutCount;
-    VkImageLayout*     pCopySrcLayouts;
-    uint32_t           copyDstLayoutCount;
-    VkImageLayout*     pCopyDstLayouts;
-    uint8_t            optimalTilingLayoutUUID[VK_UUID_SIZE];
-    VkBool32           identicalMemoryTypeRequirements;
-} VkPhysicalDeviceHostImageCopyProperties;
-
-typedef struct VkMemoryToImageCopy {
-    VkStructureType             sType;
-    const void*                 pNext;
-    const void*                 pHostPointer;
-    uint32_t                    memoryRowLength;
-    uint32_t                    memoryImageHeight;
-    VkImageSubresourceLayers    imageSubresource;
-    VkOffset3D                  imageOffset;
-    VkExtent3D                  imageExtent;
-} VkMemoryToImageCopy;
-
-typedef struct VkImageToMemoryCopy {
-    VkStructureType             sType;
-    const void*                 pNext;
-    void*                       pHostPointer;
-    uint32_t                    memoryRowLength;
-    uint32_t                    memoryImageHeight;
-    VkImageSubresourceLayers    imageSubresource;
-    VkOffset3D                  imageOffset;
-    VkExtent3D                  imageExtent;
-} VkImageToMemoryCopy;
-
-typedef struct VkCopyMemoryToImageInfo {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkHostImageCopyFlags          flags;
-    VkImage                       dstImage;
-    VkImageLayout                 dstImageLayout;
-    uint32_t                      regionCount;
-    const VkMemoryToImageCopy*    pRegions;
-} VkCopyMemoryToImageInfo;
-
-typedef struct VkCopyImageToMemoryInfo {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkHostImageCopyFlags          flags;
-    VkImage                       srcImage;
-    VkImageLayout                 srcImageLayout;
-    uint32_t                      regionCount;
-    const VkImageToMemoryCopy*    pRegions;
-} VkCopyImageToMemoryInfo;
-
-typedef struct VkCopyImageToImageInfo {
-    VkStructureType         sType;
-    const void*             pNext;
-    VkHostImageCopyFlags    flags;
-    VkImage                 srcImage;
-    VkImageLayout           srcImageLayout;
-    VkImage                 dstImage;
-    VkImageLayout           dstImageLayout;
-    uint32_t                regionCount;
-    const VkImageCopy2*     pRegions;
-} VkCopyImageToImageInfo;
-
-typedef struct VkHostImageLayoutTransitionInfo {
-    VkStructureType            sType;
-    const void*                pNext;
-    VkImage                    image;
-    VkImageLayout              oldLayout;
-    VkImageLayout              newLayout;
-    VkImageSubresourceRange    subresourceRange;
-} VkHostImageLayoutTransitionInfo;
-
-typedef struct VkSubresourceHostMemcpySize {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       size;
-} VkSubresourceHostMemcpySize;
-
-typedef struct VkHostImageCopyDevicePerformanceQuery {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           optimalDeviceAccess;
-    VkBool32           identicalMemoryLayout;
-} VkHostImageCopyDevicePerformanceQuery;
-
-typedef struct VkPhysicalDeviceShaderSubgroupRotateFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderSubgroupRotate;
-    VkBool32           shaderSubgroupRotateClustered;
-} VkPhysicalDeviceShaderSubgroupRotateFeatures;
-
-typedef struct VkPhysicalDeviceShaderFloatControls2Features {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderFloatControls2;
-} VkPhysicalDeviceShaderFloatControls2Features;
-
-typedef struct VkPhysicalDeviceShaderExpectAssumeFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderExpectAssume;
-} VkPhysicalDeviceShaderExpectAssumeFeatures;
-
-typedef struct VkPipelineCreateFlags2CreateInfo {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkPipelineCreateFlags2    flags;
-} VkPipelineCreateFlags2CreateInfo;
-
-typedef struct VkPhysicalDevicePushDescriptorProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxPushDescriptors;
-} VkPhysicalDevicePushDescriptorProperties;
-
-typedef struct VkBindDescriptorSetsInfo {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkShaderStageFlags        stageFlags;
-    VkPipelineLayout          layout;
-    uint32_t                  firstSet;
-    uint32_t                  descriptorSetCount;
-    const VkDescriptorSet*    pDescriptorSets;
-    uint32_t                  dynamicOffsetCount;
-    const uint32_t*           pDynamicOffsets;
-} VkBindDescriptorSetsInfo;
-
-typedef struct VkPushConstantsInfo {
-    VkStructureType       sType;
-    const void*           pNext;
-    VkPipelineLayout      layout;
-    VkShaderStageFlags    stageFlags;
-    uint32_t              offset;
-    uint32_t              size;
-    const void*           pValues;
-} VkPushConstantsInfo;
-
-typedef struct VkPushDescriptorSetInfo {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkShaderStageFlags             stageFlags;
-    VkPipelineLayout               layout;
-    uint32_t                       set;
-    uint32_t                       descriptorWriteCount;
-    const VkWriteDescriptorSet*    pDescriptorWrites;
-} VkPushDescriptorSetInfo;
-
-typedef struct VkPushDescriptorSetWithTemplateInfo {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkDescriptorUpdateTemplate    descriptorUpdateTemplate;
-    VkPipelineLayout              layout;
-    uint32_t                      set;
-    const void*                   pData;
-} VkPushDescriptorSetWithTemplateInfo;
-
-typedef struct VkPhysicalDevicePipelineProtectedAccessFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineProtectedAccess;
-} VkPhysicalDevicePipelineProtectedAccessFeatures;
-
-typedef struct VkPhysicalDevicePipelineRobustnessFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineRobustness;
-} VkPhysicalDevicePipelineRobustnessFeatures;
-
-typedef struct VkPhysicalDevicePipelineRobustnessProperties {
-    VkStructureType                       sType;
-    void*                                 pNext;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessStorageBuffers;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessUniformBuffers;
-    VkPipelineRobustnessBufferBehavior    defaultRobustnessVertexInputs;
-    VkPipelineRobustnessImageBehavior     defaultRobustnessImages;
-} VkPhysicalDevicePipelineRobustnessProperties;
-
-typedef struct VkPipelineRobustnessCreateInfo {
-    VkStructureType                       sType;
-    const void*                           pNext;
-    VkPipelineRobustnessBufferBehavior    storageBuffers;
-    VkPipelineRobustnessBufferBehavior    uniformBuffers;
-    VkPipelineRobustnessBufferBehavior    vertexInputs;
-    VkPipelineRobustnessImageBehavior     images;
-} VkPipelineRobustnessCreateInfo;
-
-typedef struct VkPhysicalDeviceLineRasterizationFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           rectangularLines;
-    VkBool32           bresenhamLines;
-    VkBool32           smoothLines;
-    VkBool32           stippledRectangularLines;
-    VkBool32           stippledBresenhamLines;
-    VkBool32           stippledSmoothLines;
-} VkPhysicalDeviceLineRasterizationFeatures;
-
-typedef struct VkPhysicalDeviceLineRasterizationProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           lineSubPixelPrecisionBits;
-} VkPhysicalDeviceLineRasterizationProperties;
-
-typedef struct VkPipelineRasterizationLineStateCreateInfo {
-    VkStructureType            sType;
-    const void*                pNext;
-    VkLineRasterizationMode    lineRasterizationMode;
-    VkBool32                   stippledLineEnable;
-    uint32_t                   lineStippleFactor;
-    uint16_t                   lineStipplePattern;
-} VkPipelineRasterizationLineStateCreateInfo;
-
-typedef struct VkPhysicalDeviceVertexAttributeDivisorProperties {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxVertexAttribDivisor;
-    VkBool32           supportsNonZeroFirstInstance;
-} VkPhysicalDeviceVertexAttributeDivisorProperties;
-
-typedef struct VkVertexInputBindingDivisorDescription {
-    uint32_t    binding;
-    uint32_t    divisor;
-} VkVertexInputBindingDivisorDescription;
-
-typedef struct VkPipelineVertexInputDivisorStateCreateInfo {
-    VkStructureType                                  sType;
-    const void*                                      pNext;
-    uint32_t                                         vertexBindingDivisorCount;
-    const VkVertexInputBindingDivisorDescription*    pVertexBindingDivisors;
-} VkPipelineVertexInputDivisorStateCreateInfo;
-
-typedef struct VkPhysicalDeviceVertexAttributeDivisorFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           vertexAttributeInstanceRateDivisor;
-    VkBool32           vertexAttributeInstanceRateZeroDivisor;
-} VkPhysicalDeviceVertexAttributeDivisorFeatures;
-
-typedef struct VkRenderingAreaInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           viewMask;
-    uint32_t           colorAttachmentCount;
-    const VkFormat*    pColorAttachmentFormats;
-    VkFormat           depthAttachmentFormat;
-    VkFormat           stencilAttachmentFormat;
-} VkRenderingAreaInfo;
-
-typedef struct VkPhysicalDeviceDynamicRenderingLocalReadFeatures {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           dynamicRenderingLocalRead;
-} VkPhysicalDeviceDynamicRenderingLocalReadFeatures;
-
-typedef struct VkRenderingAttachmentLocationInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           colorAttachmentCount;
-    const uint32_t*    pColorAttachmentLocations;
-} VkRenderingAttachmentLocationInfo;
-
-typedef struct VkRenderingInputAttachmentIndexInfo {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           colorAttachmentCount;
-    const uint32_t*    pColorAttachmentInputIndices;
-    const uint32_t*    pDepthInputAttachmentIndex;
-    const uint32_t*    pStencilInputAttachmentIndex;
-} VkRenderingInputAttachmentIndexInfo;
-
-typedef VkResult (VKAPI_PTR *PFN_vkMapMemory2)(VkDevice device, const VkMemoryMapInfo* pMemoryMapInfo, void** ppData);
-typedef VkResult (VKAPI_PTR *PFN_vkUnmapMemory2)(VkDevice device, const VkMemoryUnmapInfo* pMemoryUnmapInfo);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSubresourceLayout)(VkDevice device, const VkDeviceImageSubresourceInfo* pInfo, VkSubresourceLayout2* pLayout);
-typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout2)(VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout);
-typedef VkResult (VKAPI_PTR *PFN_vkCopyMemoryToImage)(VkDevice device, const VkCopyMemoryToImageInfo*    pCopyMemoryToImageInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToMemory)(VkDevice device, const VkCopyImageToMemoryInfo*    pCopyImageToMemoryInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToImage)(VkDevice device, const VkCopyImageToImageInfo*    pCopyImageToImageInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkTransitionImageLayout)(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo*    pTransitions);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSet)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplate)(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData);
-typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets2)(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo*   pBindDescriptorSetsInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushConstants2)(VkCommandBuffer commandBuffer, const VkPushConstantsInfo*        pPushConstantsInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSet2)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo*    pPushDescriptorSetInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplate2)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo* pPushDescriptorSetWithTemplateInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdSetLineStipple)(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern);
-typedef void (VKAPI_PTR *PFN_vkCmdBindIndexBuffer2)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, VkIndexType indexType);
-typedef void (VKAPI_PTR *PFN_vkGetRenderingAreaGranularity)(VkDevice device, const VkRenderingAreaInfo* pRenderingAreaInfo, VkExtent2D* pGranularity);
-typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingAttachmentLocations)(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfo* pLocationInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingInputAttachmentIndices)(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfo* pInputAttachmentIndexInfo);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory2(
+VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirements(
     VkDevice                                    device,
-    const VkMemoryMapInfo*                      pMemoryMapInfo,
-    void**                                      ppData);
+    const VkDeviceBufferMemoryRequirements*     pInfo,
+    VkMemoryRequirements2*                      pMemoryRequirements);
 
-VKAPI_ATTR VkResult VKAPI_CALL vkUnmapMemory2(
+VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirements(
     VkDevice                                    device,
-    const VkMemoryUnmapInfo*                    pMemoryUnmapInfo);
+    const VkDeviceImageMemoryRequirements*      pInfo,
+    VkMemoryRequirements2*                      pMemoryRequirements);
 
-VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSubresourceLayout(
+VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirements(
     VkDevice                                    device,
-    const VkDeviceImageSubresourceInfo*         pInfo,
-    VkSubresourceLayout2*                       pLayout);
-
-VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout2(
-    VkDevice                                    device,
-    VkImage                                     image,
-    const VkImageSubresource2*                  pSubresource,
-    VkSubresourceLayout2*                       pLayout);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCopyMemoryToImage(
-    VkDevice                                    device,
-    const VkCopyMemoryToImageInfo*              pCopyMemoryToImageInfo);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCopyImageToMemory(
-    VkDevice                                    device,
-    const VkCopyImageToMemoryInfo*              pCopyImageToMemoryInfo);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkCopyImageToImage(
-    VkDevice                                    device,
-    const VkCopyImageToImageInfo*               pCopyImageToImageInfo);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkTransitionImageLayout(
-    VkDevice                                    device,
-    uint32_t                                    transitionCount,
-    const VkHostImageLayoutTransitionInfo*      pTransitions);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSet(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    VkPipelineLayout                            layout,
-    uint32_t                                    set,
-    uint32_t                                    descriptorWriteCount,
-    const VkWriteDescriptorSet*                 pDescriptorWrites);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplate(
-    VkCommandBuffer                             commandBuffer,
-    VkDescriptorUpdateTemplate                  descriptorUpdateTemplate,
-    VkPipelineLayout                            layout,
-    uint32_t                                    set,
-    const void*                                 pData);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets2(
-    VkCommandBuffer                             commandBuffer,
-    const VkBindDescriptorSetsInfo*             pBindDescriptorSetsInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushConstants2(
-    VkCommandBuffer                             commandBuffer,
-    const VkPushConstantsInfo*                  pPushConstantsInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSet2(
-    VkCommandBuffer                             commandBuffer,
-    const VkPushDescriptorSetInfo*              pPushDescriptorSetInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplate2(
-    VkCommandBuffer                             commandBuffer,
-    const VkPushDescriptorSetWithTemplateInfo*  pPushDescriptorSetWithTemplateInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdSetLineStipple(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    lineStippleFactor,
-    uint16_t                                    lineStipplePattern);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdBindIndexBuffer2(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    buffer,
-    VkDeviceSize                                offset,
-    VkDeviceSize                                size,
-    VkIndexType                                 indexType);
-
-VKAPI_ATTR void VKAPI_CALL vkGetRenderingAreaGranularity(
-    VkDevice                                    device,
-    const VkRenderingAreaInfo*                  pRenderingAreaInfo,
-    VkExtent2D*                                 pGranularity);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingAttachmentLocations(
-    VkCommandBuffer                             commandBuffer,
-    const VkRenderingAttachmentLocationInfo*    pLocationInfo);
-
-VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingInputAttachmentIndices(
-    VkCommandBuffer                             commandBuffer,
-    const VkRenderingInputAttachmentIndexInfo*  pInputAttachmentIndexInfo);
+    const VkDeviceImageMemoryRequirements*      pInfo,
+    uint32_t*                                   pSparseMemoryRequirementCount,
+    VkSparseImageMemoryRequirements2*           pSparseMemoryRequirements);
 #endif
 
 
@@ -8765,8 +7557,6 @@ typedef enum VkPresentModeKHR {
     VK_PRESENT_MODE_FIFO_RELAXED_KHR = 3,
     VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR = 1000111000,
     VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR = 1000111001,
-    VK_PRESENT_MODE_FIFO_LATEST_READY_KHR = 1000361000,
-    VK_PRESENT_MODE_FIFO_LATEST_READY_EXT = VK_PRESENT_MODE_FIFO_LATEST_READY_KHR,
     VK_PRESENT_MODE_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkPresentModeKHR;
 
@@ -8780,7 +7570,6 @@ typedef enum VkColorSpaceKHR {
     VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104006,
     VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104007,
     VK_COLOR_SPACE_HDR10_ST2084_EXT = 1000104008,
-  // VK_COLOR_SPACE_DOLBYVISION_EXT is legacy, but no reason was given in the API XML
     VK_COLOR_SPACE_DOLBYVISION_EXT = 1000104009,
     VK_COLOR_SPACE_HDR10_HLG_EXT = 1000104010,
     VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011,
@@ -8788,9 +7577,7 @@ typedef enum VkColorSpaceKHR {
     VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013,
     VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT = 1000104014,
     VK_COLOR_SPACE_DISPLAY_NATIVE_AMD = 1000213000,
-  // VK_COLORSPACE_SRGB_NONLINEAR_KHR is a legacy alias
     VK_COLORSPACE_SRGB_NONLINEAR_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
-  // VK_COLOR_SPACE_DCI_P3_LINEAR_EXT is a legacy alias
     VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT,
     VK_COLOR_SPACE_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkColorSpaceKHR;
@@ -8842,44 +7629,34 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysica
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(
     VkInstance                                  instance,
     VkSurfaceKHR                                surface,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     VkSurfaceKHR                                surface,
     VkBool32*                                   pSupported);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
     VkPhysicalDevice                            physicalDevice,
     VkSurfaceKHR                                surface,
     VkSurfaceCapabilitiesKHR*                   pSurfaceCapabilities);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
     VkPhysicalDevice                            physicalDevice,
     VkSurfaceKHR                                surface,
     uint32_t*                                   pSurfaceFormatCount,
     VkSurfaceFormatKHR*                         pSurfaceFormats);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
     VkPhysicalDevice                            physicalDevice,
     VkSurfaceKHR                                surface,
     uint32_t*                                   pPresentModeCount,
     VkPresentModeKHR*                           pPresentModes);
 #endif
-#endif
 
 
 // VK_KHR_swapchain is a preprocessor guard. Do not pass it to API calls.
@@ -8892,11 +7669,7 @@ typedef enum VkSwapchainCreateFlagBitsKHR {
     VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = 0x00000001,
     VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR = 0x00000002,
     VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR = 0x00000004,
-    VK_SWAPCHAIN_CREATE_PRESENT_TIMING_BIT_EXT = 0x00000200,
-    VK_SWAPCHAIN_CREATE_PRESENT_ID_2_BIT_KHR = 0x00000040,
-    VK_SWAPCHAIN_CREATE_PRESENT_WAIT_2_BIT_KHR = 0x00000080,
-    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR = 0x00000008,
-    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT = VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR,
+    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT = 0x00000008,
     VK_SWAPCHAIN_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkSwapchainCreateFlagBitsKHR;
 typedef VkFlags VkSwapchainCreateFlagsKHR;
@@ -8996,30 +7769,23 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDevicePresentRectanglesKHR)(VkPhys
 typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImage2KHR)(VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
     VkDevice                                    device,
     const VkSwapchainCreateInfoKHR*             pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSwapchainKHR*                             pSwapchain);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     uint32_t*                                   pSwapchainImageCount,
     VkImage*                                    pSwapchainImages);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
@@ -9027,42 +7793,31 @@ VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(
     VkSemaphore                                 semaphore,
     VkFence                                     fence,
     uint32_t*                                   pImageIndex);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR(
     VkQueue                                     queue,
     const VkPresentInfoKHR*                     pPresentInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupPresentCapabilitiesKHR(
     VkDevice                                    device,
     VkDeviceGroupPresentCapabilitiesKHR*        pDeviceGroupPresentCapabilities);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(
     VkDevice                                    device,
     VkSurfaceKHR                                surface,
     VkDeviceGroupPresentModeFlagsKHR*           pModes);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHR(
     VkPhysicalDevice                            physicalDevice,
     VkSurfaceKHR                                surface,
     uint32_t*                                   pRectCount,
     VkRect2D*                                   pRects);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImage2KHR(
     VkDevice                                    device,
     const VkAcquireNextImageInfoKHR*            pAcquireInfo,
     uint32_t*                                   pImageIndex);
 #endif
-#endif
 
 
 // VK_KHR_display is a preprocessor guard. Do not pass it to API calls.
@@ -9148,61 +7903,47 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneCapabilitiesKHR)(VkPhysicalDev
 typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayPlaneSurfaceKHR)(VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkDisplayPropertiesKHR*                     pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkDisplayPlanePropertiesKHR*                pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayPlaneSupportedDisplaysKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    planeIndex,
     uint32_t*                                   pDisplayCount,
     VkDisplayKHR*                               pDisplays);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayModePropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayKHR                                display,
     uint32_t*                                   pPropertyCount,
     VkDisplayModePropertiesKHR*                 pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayModeKHR(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayKHR                                display,
     const VkDisplayModeCreateInfoKHR*           pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkDisplayModeKHR*                           pMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayPlaneCapabilitiesKHR(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayModeKHR                            mode,
     uint32_t                                    planeIndex,
     VkDisplayPlaneCapabilitiesKHR*              pCapabilities);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDisplayPlaneSurfaceKHR(
     VkInstance                                  instance,
     const VkDisplaySurfaceCreateInfoKHR*        pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_KHR_display_swapchain is a preprocessor guard. Do not pass it to API calls.
@@ -9220,7 +7961,6 @@ typedef struct VkDisplayPresentInfoKHR {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateSharedSwapchainsKHR)(VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateSharedSwapchainsKHR(
     VkDevice                                    device,
     uint32_t                                    swapchainCount,
@@ -9228,7 +7968,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSharedSwapchainsKHR(
     const VkAllocationCallbacks*                pAllocator,
     VkSwapchainKHR*                             pSwapchains);
 #endif
-#endif
 
 
 // VK_KHR_sampler_mirror_clamp_to_edge is a preprocessor guard. Do not pass it to API calls.
@@ -9259,8 +7998,6 @@ typedef enum VkVideoCodecOperationFlagBitsKHR {
     VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR = 0x00000001,
     VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR = 0x00000002,
     VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR = 0x00000004,
-    VK_VIDEO_CODEC_OPERATION_ENCODE_AV1_BIT_KHR = 0x00040000,
-    VK_VIDEO_CODEC_OPERATION_DECODE_VP9_BIT_KHR = 0x00000008,
     VK_VIDEO_CODEC_OPERATION_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoCodecOperationFlagBitsKHR;
 typedef VkFlags VkVideoCodecOperationFlagsKHR;
@@ -9295,17 +8032,9 @@ typedef enum VkVideoSessionCreateFlagBitsKHR {
     VK_VIDEO_SESSION_CREATE_PROTECTED_CONTENT_BIT_KHR = 0x00000001,
     VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR = 0x00000002,
     VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR = 0x00000004,
-    VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x00000008,
-    VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_EMPHASIS_MAP_BIT_KHR = 0x00000010,
-    VK_VIDEO_SESSION_CREATE_INLINE_SESSION_PARAMETERS_BIT_KHR = 0x00000020,
     VK_VIDEO_SESSION_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoSessionCreateFlagBitsKHR;
 typedef VkFlags VkVideoSessionCreateFlagsKHR;
-
-typedef enum VkVideoSessionParametersCreateFlagBitsKHR {
-    VK_VIDEO_SESSION_PARAMETERS_CREATE_QUANTIZATION_MAP_COMPATIBLE_BIT_KHR = 0x00000001,
-    VK_VIDEO_SESSION_PARAMETERS_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoSessionParametersCreateFlagBitsKHR;
 typedef VkFlags VkVideoSessionParametersCreateFlagsKHR;
 typedef VkFlags VkVideoBeginCodingFlagsKHR;
 typedef VkFlags VkVideoEndCodingFlagsKHR;
@@ -9472,92 +8201,68 @@ typedef void (VKAPI_PTR *PFN_vkCmdEndVideoCodingKHR)(VkCommandBuffer commandBuff
 typedef void (VKAPI_PTR *PFN_vkCmdControlVideoCodingKHR)(VkCommandBuffer commandBuffer, const VkVideoCodingControlInfoKHR* pCodingControlInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceVideoCapabilitiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkVideoProfileInfoKHR*                pVideoProfile,
     VkVideoCapabilitiesKHR*                     pCapabilities);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceVideoFormatPropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceVideoFormatInfoKHR*   pVideoFormatInfo,
     uint32_t*                                   pVideoFormatPropertyCount,
     VkVideoFormatPropertiesKHR*                 pVideoFormatProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateVideoSessionKHR(
     VkDevice                                    device,
     const VkVideoSessionCreateInfoKHR*          pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkVideoSessionKHR*                          pVideoSession);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyVideoSessionKHR(
     VkDevice                                    device,
     VkVideoSessionKHR                           videoSession,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetVideoSessionMemoryRequirementsKHR(
     VkDevice                                    device,
     VkVideoSessionKHR                           videoSession,
     uint32_t*                                   pMemoryRequirementsCount,
     VkVideoSessionMemoryRequirementsKHR*        pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBindVideoSessionMemoryKHR(
     VkDevice                                    device,
     VkVideoSessionKHR                           videoSession,
     uint32_t                                    bindSessionMemoryInfoCount,
     const VkBindVideoSessionMemoryInfoKHR*      pBindSessionMemoryInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateVideoSessionParametersKHR(
     VkDevice                                    device,
     const VkVideoSessionParametersCreateInfoKHR* pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkVideoSessionParametersKHR*                pVideoSessionParameters);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkUpdateVideoSessionParametersKHR(
     VkDevice                                    device,
     VkVideoSessionParametersKHR                 videoSessionParameters,
     const VkVideoSessionParametersUpdateInfoKHR* pUpdateInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyVideoSessionParametersKHR(
     VkDevice                                    device,
     VkVideoSessionParametersKHR                 videoSessionParameters,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginVideoCodingKHR(
     VkCommandBuffer                             commandBuffer,
     const VkVideoBeginCodingInfoKHR*            pBeginInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndVideoCodingKHR(
     VkCommandBuffer                             commandBuffer,
     const VkVideoEndCodingInfoKHR*              pEndCodingInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdControlVideoCodingKHR(
     VkCommandBuffer                             commandBuffer,
     const VkVideoCodingControlInfoKHR*          pCodingControlInfo);
 #endif
-#endif
 
 
 // VK_KHR_video_decode_queue is a preprocessor guard. Do not pass it to API calls.
@@ -9609,12 +8314,10 @@ typedef struct VkVideoDecodeInfoKHR {
 typedef void (VKAPI_PTR *PFN_vkCmdDecodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoDecodeInfoKHR* pDecodeInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDecodeVideoKHR(
     VkCommandBuffer                             commandBuffer,
     const VkVideoDecodeInfoKHR*                 pDecodeInfo);
 #endif
-#endif
 
 
 // VK_KHR_video_encode_h264 is a preprocessor guard. Do not pass it to API calls.
@@ -9634,8 +8337,6 @@ typedef enum VkVideoEncodeH264CapabilityFlagBitsKHR {
     VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR = 0x00000040,
     VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR = 0x00000080,
     VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR = 0x00000100,
-    VK_VIDEO_ENCODE_H264_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR = 0x00000400,
-    VK_VIDEO_ENCODE_H264_CAPABILITY_MB_QP_DIFF_WRAPAROUND_BIT_KHR = 0x00000200,
     VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeH264CapabilityFlagBitsKHR;
 typedef VkFlags VkVideoEncodeH264CapabilityFlagsKHR;
@@ -9836,8 +8537,6 @@ typedef enum VkVideoEncodeH265CapabilityFlagBitsKHR {
     VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_KHR = 0x00000080,
     VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR = 0x00000100,
     VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR = 0x00000200,
-    VK_VIDEO_ENCODE_H265_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR = 0x00000800,
-    VK_VIDEO_ENCODE_H265_CAPABILITY_CU_QP_DIFF_WRAPAROUND_BIT_KHR = 0x00000400,
     VK_VIDEO_ENCODE_H265_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeH265CapabilityFlagBitsKHR;
 typedef VkFlags VkVideoEncodeH265CapabilityFlagsKHR;
@@ -10123,21 +8822,49 @@ typedef VkPhysicalDeviceDynamicRenderingFeatures VkPhysicalDeviceDynamicRenderin
 
 typedef VkCommandBufferInheritanceRenderingInfo VkCommandBufferInheritanceRenderingInfoKHR;
 
+typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkImageView        imageView;
+    VkImageLayout      imageLayout;
+    VkExtent2D         shadingRateAttachmentTexelSize;
+} VkRenderingFragmentShadingRateAttachmentInfoKHR;
+
+typedef struct VkRenderingFragmentDensityMapAttachmentInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkImageView        imageView;
+    VkImageLayout      imageLayout;
+} VkRenderingFragmentDensityMapAttachmentInfoEXT;
+
+typedef struct VkAttachmentSampleCountInfoAMD {
+    VkStructureType                 sType;
+    const void*                     pNext;
+    uint32_t                        colorAttachmentCount;
+    const VkSampleCountFlagBits*    pColorAttachmentSamples;
+    VkSampleCountFlagBits           depthStencilAttachmentSamples;
+} VkAttachmentSampleCountInfoAMD;
+
+typedef VkAttachmentSampleCountInfoAMD VkAttachmentSampleCountInfoNV;
+
+typedef struct VkMultiviewPerViewAttributesInfoNVX {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkBool32           perViewAttributes;
+    VkBool32           perViewAttributesPositionXOnly;
+} VkMultiviewPerViewAttributesInfoNVX;
+
 typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderingKHR)(VkCommandBuffer                   commandBuffer, const VkRenderingInfo*                              pRenderingInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdEndRenderingKHR)(VkCommandBuffer                   commandBuffer);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderingKHR(
     VkCommandBuffer                             commandBuffer,
     const VkRenderingInfo*                      pRenderingInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderingKHR(
     VkCommandBuffer                             commandBuffer);
 #endif
-#endif
 
 
 // VK_KHR_multiview is a preprocessor guard. Do not pass it to API calls.
@@ -10183,53 +8910,39 @@ typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMemoryProperties2KHR)(VkPhysical
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFeatures2KHR(
     VkPhysicalDevice                            physicalDevice,
     VkPhysicalDeviceFeatures2*                  pFeatures);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     VkPhysicalDeviceProperties2*                pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceFormatProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     VkFormat                                    format,
     VkFormatProperties2*                        pFormatProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceImageFormatInfo2*     pImageFormatInfo,
     VkImageFormatProperties2*                   pImageFormatProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pQueueFamilyPropertyCount,
     VkQueueFamilyProperties2*                   pQueueFamilyProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     VkPhysicalDeviceMemoryProperties2*          pMemoryProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo,
     uint32_t*                                   pPropertyCount,
     VkSparseImageFormatProperties2*             pProperties);
 #endif
-#endif
 
 
 // VK_KHR_device_group is a preprocessor guard. Do not pass it to API calls.
@@ -10263,22 +8976,17 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetDeviceMaskKHR)(VkCommandBuffer commandBuffe
 typedef void (VKAPI_PTR *PFN_vkCmdDispatchBaseKHR)(VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceGroupPeerMemoryFeaturesKHR(
     VkDevice                                    device,
     uint32_t                                    heapIndex,
     uint32_t                                    localDeviceIndex,
     uint32_t                                    remoteDeviceIndex,
     VkPeerMemoryFeatureFlags*                   pPeerMemoryFeatures);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDeviceMaskKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    deviceMask);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBaseKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    baseGroupX,
@@ -10288,7 +8996,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBaseKHR(
     uint32_t                                    groupCountY,
     uint32_t                                    groupCountZ);
 #endif
-#endif
 
 
 // VK_KHR_shader_draw_parameters is a preprocessor guard. Do not pass it to API calls.
@@ -10301,22 +9008,18 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBaseKHR(
 #define VK_KHR_maintenance1 1
 #define VK_KHR_MAINTENANCE_1_SPEC_VERSION 2
 #define VK_KHR_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_maintenance1"
-// VK_KHR_MAINTENANCE1_SPEC_VERSION is a legacy alias
 #define VK_KHR_MAINTENANCE1_SPEC_VERSION  VK_KHR_MAINTENANCE_1_SPEC_VERSION
-// VK_KHR_MAINTENANCE1_EXTENSION_NAME is a legacy alias
 #define VK_KHR_MAINTENANCE1_EXTENSION_NAME VK_KHR_MAINTENANCE_1_EXTENSION_NAME
 typedef VkCommandPoolTrimFlags VkCommandPoolTrimFlagsKHR;
 
 typedef void (VKAPI_PTR *PFN_vkTrimCommandPoolKHR)(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkTrimCommandPoolKHR(
     VkDevice                                    device,
     VkCommandPool                               commandPool,
     VkCommandPoolTrimFlags                      flags);
 #endif
-#endif
 
 
 // VK_KHR_device_group_creation is a preprocessor guard. Do not pass it to API calls.
@@ -10331,13 +9034,11 @@ typedef VkDeviceGroupDeviceCreateInfo VkDeviceGroupDeviceCreateInfoKHR;
 typedef VkResult (VKAPI_PTR *PFN_vkEnumeratePhysicalDeviceGroupsKHR)(VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkEnumeratePhysicalDeviceGroupsKHR(
     VkInstance                                  instance,
     uint32_t*                                   pPhysicalDeviceGroupCount,
     VkPhysicalDeviceGroupProperties*            pPhysicalDeviceGroupProperties);
 #endif
-#endif
 
 
 // VK_KHR_external_memory_capabilities is a preprocessor guard. Do not pass it to API calls.
@@ -10368,13 +9069,11 @@ typedef VkPhysicalDeviceIDProperties VkPhysicalDeviceIDPropertiesKHR;
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalBufferPropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceExternalBufferInfo*   pExternalBufferInfo,
     VkExternalBufferProperties*                 pExternalBufferProperties);
 #endif
-#endif
 
 
 // VK_KHR_external_memory is a preprocessor guard. Do not pass it to API calls.
@@ -10418,21 +9117,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryFdKHR)(VkDevice device, const VkMemo
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryFdPropertiesKHR)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR* pMemoryFdProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFdKHR(
     VkDevice                                    device,
     const VkMemoryGetFdInfoKHR*                 pGetFdInfo,
     int*                                        pFd);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFdPropertiesKHR(
     VkDevice                                    device,
     VkExternalMemoryHandleTypeFlagBits          handleType,
     int                                         fd,
     VkMemoryFdPropertiesKHR*                    pMemoryFdProperties);
 #endif
-#endif
 
 
 // VK_KHR_external_semaphore_capabilities is a preprocessor guard. Do not pass it to API calls.
@@ -10454,13 +9149,11 @@ typedef VkExternalSemaphoreProperties VkExternalSemaphorePropertiesKHR;
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo,
     VkExternalSemaphoreProperties*              pExternalSemaphoreProperties);
 #endif
-#endif
 
 
 // VK_KHR_external_semaphore is a preprocessor guard. Do not pass it to API calls.
@@ -10499,32 +9192,31 @@ typedef VkResult (VKAPI_PTR *PFN_vkImportSemaphoreFdKHR)(VkDevice device, const
 typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreFdKHR)(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, int* pFd);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreFdKHR(
     VkDevice                                    device,
     const VkImportSemaphoreFdInfoKHR*           pImportSemaphoreFdInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreFdKHR(
     VkDevice                                    device,
     const VkSemaphoreGetFdInfoKHR*              pGetFdInfo,
     int*                                        pFd);
 #endif
-#endif
 
 
 // VK_KHR_push_descriptor is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_push_descriptor 1
 #define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 2
 #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor"
-typedef VkPhysicalDevicePushDescriptorProperties VkPhysicalDevicePushDescriptorPropertiesKHR;
+typedef struct VkPhysicalDevicePushDescriptorPropertiesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           maxPushDescriptors;
+} VkPhysicalDevicePushDescriptorPropertiesKHR;
 
 typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetKHR)(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites);
 typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplateKHR)(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetKHR(
     VkCommandBuffer                             commandBuffer,
     VkPipelineBindPoint                         pipelineBindPoint,
@@ -10532,9 +9224,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetKHR(
     uint32_t                                    set,
     uint32_t                                    descriptorWriteCount,
     const VkWriteDescriptorSet*                 pDescriptorWrites);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(
     VkCommandBuffer                             commandBuffer,
     VkDescriptorUpdateTemplate                  descriptorUpdateTemplate,
@@ -10542,7 +9232,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(
     uint32_t                                    set,
     const void*                                 pData);
 #endif
-#endif
 
 
 // VK_KHR_shader_float16_int8 is a preprocessor guard. Do not pass it to API calls.
@@ -10606,29 +9295,23 @@ typedef void (VKAPI_PTR *PFN_vkDestroyDescriptorUpdateTemplateKHR)(VkDevice devi
 typedef void (VKAPI_PTR *PFN_vkUpdateDescriptorSetWithTemplateKHR)(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void* pData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDescriptorUpdateTemplateKHR(
     VkDevice                                    device,
     const VkDescriptorUpdateTemplateCreateInfo* pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkDescriptorUpdateTemplate*                 pDescriptorUpdateTemplate);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyDescriptorUpdateTemplateKHR(
     VkDevice                                    device,
     VkDescriptorUpdateTemplate                  descriptorUpdateTemplate,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkUpdateDescriptorSetWithTemplateKHR(
     VkDevice                                    device,
     VkDescriptorSet                             descriptorSet,
     VkDescriptorUpdateTemplate                  descriptorUpdateTemplate,
     const void*                                 pData);
 #endif
-#endif
 
 
 // VK_KHR_imageless_framebuffer is a preprocessor guard. Do not pass it to API calls.
@@ -10669,34 +9352,26 @@ typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass2KHR)(VkCommandBuffer commandBuffer
 typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass2KHR)(VkCommandBuffer commandBuffer, const VkSubpassEndInfo*        pSubpassEndInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateRenderPass2KHR(
     VkDevice                                    device,
     const VkRenderPassCreateInfo2*              pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkRenderPass*                               pRenderPass);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderPass2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkRenderPassBeginInfo*                pRenderPassBegin,
     const VkSubpassBeginInfo*                   pSubpassBeginInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdNextSubpass2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkSubpassBeginInfo*                   pSubpassBeginInfo,
     const VkSubpassEndInfo*                     pSubpassEndInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkSubpassEndInfo*                     pSubpassEndInfo);
 #endif
-#endif
 
 
 // VK_KHR_shared_presentable_image is a preprocessor guard. Do not pass it to API calls.
@@ -10712,12 +9387,10 @@ typedef struct VkSharedPresentSurfaceCapabilitiesKHR {
 typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainStatusKHR)(VkDevice device, VkSwapchainKHR swapchain);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainStatusKHR(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain);
 #endif
-#endif
 
 
 // VK_KHR_external_fence_capabilities is a preprocessor guard. Do not pass it to API calls.
@@ -10739,13 +9412,11 @@ typedef VkExternalFenceProperties VkExternalFencePropertiesKHR;
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalFencePropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceExternalFenceInfo*    pExternalFenceInfo,
     VkExternalFenceProperties*                  pExternalFenceProperties);
 #endif
-#endif
 
 
 // VK_KHR_external_fence is a preprocessor guard. Do not pass it to API calls.
@@ -10784,19 +9455,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkImportFenceFdKHR)(VkDevice device, const VkIm
 typedef VkResult (VKAPI_PTR *PFN_vkGetFenceFdKHR)(VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportFenceFdKHR(
     VkDevice                                    device,
     const VkImportFenceFdInfoKHR*               pImportFenceFdInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetFenceFdKHR(
     VkDevice                                    device,
     const VkFenceGetFdInfoKHR*                  pGetFdInfo,
     int*                                        pFd);
 #endif
-#endif
 
 
 // VK_KHR_performance_query is a preprocessor guard. Do not pass it to API calls.
@@ -10823,11 +9490,8 @@ typedef enum VkPerformanceCounterScopeKHR {
     VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR = 0,
     VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR = 1,
     VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR = 2,
-  // VK_QUERY_SCOPE_COMMAND_BUFFER_KHR is a legacy alias
     VK_QUERY_SCOPE_COMMAND_BUFFER_KHR = VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR,
-  // VK_QUERY_SCOPE_RENDER_PASS_KHR is a legacy alias
     VK_QUERY_SCOPE_RENDER_PASS_KHR = VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR,
-  // VK_QUERY_SCOPE_COMMAND_KHR is a legacy alias
     VK_QUERY_SCOPE_COMMAND_KHR = VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR,
     VK_PERFORMANCE_COUNTER_SCOPE_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkPerformanceCounterScopeKHR;
@@ -10845,9 +9509,7 @@ typedef enum VkPerformanceCounterStorageKHR {
 typedef enum VkPerformanceCounterDescriptionFlagBitsKHR {
     VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_BIT_KHR = 0x00000001,
     VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_BIT_KHR = 0x00000002,
-  // VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_KHR is a legacy alias
     VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_KHR = VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_BIT_KHR,
-  // VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR is a legacy alias
     VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR = VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_BIT_KHR,
     VK_PERFORMANCE_COUNTER_DESCRIPTION_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkPerformanceCounterDescriptionFlagBitsKHR;
@@ -10924,42 +9586,32 @@ typedef VkResult (VKAPI_PTR *PFN_vkAcquireProfilingLockKHR)(VkDevice device, con
 typedef void (VKAPI_PTR *PFN_vkReleaseProfilingLockKHR)(VkDevice device);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     uint32_t*                                   pCounterCount,
     VkPerformanceCounterKHR*                    pCounters,
     VkPerformanceCounterDescriptionKHR*         pCounterDescriptions);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkQueryPoolPerformanceCreateInfoKHR*  pPerformanceQueryCreateInfo,
     uint32_t*                                   pNumPasses);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireProfilingLockKHR(
     VkDevice                                    device,
     const VkAcquireProfilingLockInfoKHR*        pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkReleaseProfilingLockKHR(
     VkDevice                                    device);
 #endif
-#endif
 
 
 // VK_KHR_maintenance2 is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_maintenance2 1
 #define VK_KHR_MAINTENANCE_2_SPEC_VERSION 1
 #define VK_KHR_MAINTENANCE_2_EXTENSION_NAME "VK_KHR_maintenance2"
-// VK_KHR_MAINTENANCE2_SPEC_VERSION is a legacy alias
 #define VK_KHR_MAINTENANCE2_SPEC_VERSION  VK_KHR_MAINTENANCE_2_SPEC_VERSION
-// VK_KHR_MAINTENANCE2_EXTENSION_NAME is a legacy alias
 #define VK_KHR_MAINTENANCE2_EXTENSION_NAME VK_KHR_MAINTENANCE_2_EXTENSION_NAME
 typedef VkPointClippingBehavior VkPointClippingBehaviorKHR;
 
@@ -11003,21 +9655,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkP
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2KHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,
     VkSurfaceCapabilities2KHR*                  pSurfaceCapabilities);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,
     uint32_t*                                   pSurfaceFormatCount,
     VkSurfaceFormat2KHR*                        pSurfaceFormats);
 #endif
-#endif
 
 
 // VK_KHR_variable_pointers is a preprocessor guard. Do not pass it to API calls.
@@ -11071,35 +9719,27 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayModeProperties2KHR)(VkPhysicalDevic
 typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneCapabilities2KHR)(VkPhysicalDevice physicalDevice, const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR* pCapabilities);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkDisplayProperties2KHR*                    pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkDisplayPlaneProperties2KHR*               pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayModeProperties2KHR(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayKHR                                display,
     uint32_t*                                   pPropertyCount,
     VkDisplayModeProperties2KHR*                pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayPlaneCapabilities2KHR(
     VkPhysicalDevice                            physicalDevice,
     const VkDisplayPlaneInfo2KHR*               pDisplayPlaneInfo,
     VkDisplayPlaneCapabilities2KHR*             pCapabilities);
 #endif
-#endif
 
 
 // VK_KHR_dedicated_allocation is a preprocessor guard. Do not pass it to API calls.
@@ -11118,20 +9758,6 @@ typedef VkMemoryDedicatedAllocateInfo VkMemoryDedicatedAllocateInfoKHR;
 #define VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME "VK_KHR_storage_buffer_storage_class"
 
 
-// VK_KHR_shader_bfloat16 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_bfloat16 1
-#define VK_KHR_SHADER_BFLOAT16_SPEC_VERSION 1
-#define VK_KHR_SHADER_BFLOAT16_EXTENSION_NAME "VK_KHR_shader_bfloat16"
-typedef struct VkPhysicalDeviceShaderBfloat16FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderBFloat16Type;
-    VkBool32           shaderBFloat16DotProduct;
-    VkBool32           shaderBFloat16CooperativeMatrix;
-} VkPhysicalDeviceShaderBfloat16FeaturesKHR;
-
-
-
 // VK_KHR_relaxed_block_layout is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_relaxed_block_layout 1
 #define VK_KHR_RELAXED_BLOCK_LAYOUT_SPEC_VERSION 1
@@ -11157,28 +9783,22 @@ typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements2KHR)(VkDevice device,
 typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2KHR)(VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetImageMemoryRequirements2KHR(
     VkDevice                                    device,
     const VkImageMemoryRequirementsInfo2*       pInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetBufferMemoryRequirements2KHR(
     VkDevice                                    device,
     const VkBufferMemoryRequirementsInfo2*      pInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetImageSparseMemoryRequirements2KHR(
     VkDevice                                    device,
     const VkImageSparseMemoryRequirementsInfo2* pInfo,
     uint32_t*                                   pSparseMemoryRequirementCount,
     VkSparseImageMemoryRequirements2*           pSparseMemoryRequirements);
 #endif
-#endif
 
 
 // VK_KHR_image_format_list is a preprocessor guard. Do not pass it to API calls.
@@ -11217,21 +9837,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateSamplerYcbcrConversionKHR)(VkDevice dev
 typedef void (VKAPI_PTR *PFN_vkDestroySamplerYcbcrConversionKHR)(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks* pAllocator);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateSamplerYcbcrConversionKHR(
     VkDevice                                    device,
     const VkSamplerYcbcrConversionCreateInfo*   pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSamplerYcbcrConversion*                   pYcbcrConversion);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroySamplerYcbcrConversionKHR(
     VkDevice                                    device,
     VkSamplerYcbcrConversion                    ycbcrConversion,
     const VkAllocationCallbacks*                pAllocator);
 #endif
-#endif
 
 
 // VK_KHR_bind_memory2 is a preprocessor guard. Do not pass it to API calls.
@@ -11246,29 +9862,23 @@ typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory2KHR)(VkDevice device, uint32
 typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory2KHR)(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBindBufferMemory2KHR(
     VkDevice                                    device,
     uint32_t                                    bindInfoCount,
     const VkBindBufferMemoryInfo*               pBindInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory2KHR(
     VkDevice                                    device,
     uint32_t                                    bindInfoCount,
     const VkBindImageMemoryInfo*                pBindInfos);
 #endif
-#endif
 
 
 // VK_KHR_maintenance3 is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_maintenance3 1
 #define VK_KHR_MAINTENANCE_3_SPEC_VERSION 1
 #define VK_KHR_MAINTENANCE_3_EXTENSION_NAME "VK_KHR_maintenance3"
-// VK_KHR_MAINTENANCE3_SPEC_VERSION is a legacy alias
 #define VK_KHR_MAINTENANCE3_SPEC_VERSION  VK_KHR_MAINTENANCE_3_SPEC_VERSION
-// VK_KHR_MAINTENANCE3_EXTENSION_NAME is a legacy alias
 #define VK_KHR_MAINTENANCE3_EXTENSION_NAME VK_KHR_MAINTENANCE_3_EXTENSION_NAME
 typedef VkPhysicalDeviceMaintenance3Properties VkPhysicalDeviceMaintenance3PropertiesKHR;
 
@@ -11277,13 +9887,11 @@ typedef VkDescriptorSetLayoutSupport VkDescriptorSetLayoutSupportKHR;
 typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetLayoutSupportKHR)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutSupportKHR(
     VkDevice                                    device,
     const VkDescriptorSetLayoutCreateInfo*      pCreateInfo,
     VkDescriptorSetLayoutSupport*               pSupport);
 #endif
-#endif
 
 
 // VK_KHR_draw_indirect_count is a preprocessor guard. Do not pass it to API calls.
@@ -11294,7 +9902,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountKHR)(VkCommandBuffer commandB
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountKHR(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -11303,9 +9910,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountKHR(
     VkDeviceSize                                countBufferOffset,
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountKHR(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -11315,7 +9920,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountKHR(
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
 #endif
-#endif
 
 
 // VK_KHR_shader_subgroup_extended_types is a preprocessor guard. Do not pass it to API calls.
@@ -11410,16 +10014,39 @@ typedef struct VkVideoDecodeH265DpbSlotInfoKHR {
 
 // VK_KHR_global_priority is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_global_priority 1
+#define VK_MAX_GLOBAL_PRIORITY_SIZE_KHR   16U
 #define VK_KHR_GLOBAL_PRIORITY_SPEC_VERSION 1
 #define VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME "VK_KHR_global_priority"
-#define VK_MAX_GLOBAL_PRIORITY_SIZE_KHR   VK_MAX_GLOBAL_PRIORITY_SIZE
-typedef VkQueueGlobalPriority VkQueueGlobalPriorityKHR;
 
-typedef VkDeviceQueueGlobalPriorityCreateInfo VkDeviceQueueGlobalPriorityCreateInfoKHR;
+typedef enum VkQueueGlobalPriorityKHR {
+    VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR = 128,
+    VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR = 256,
+    VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR = 512,
+    VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR = 1024,
+    VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR,
+    VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR,
+    VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR,
+    VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR,
+    VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_KHR = 0x7FFFFFFF
+} VkQueueGlobalPriorityKHR;
+typedef struct VkDeviceQueueGlobalPriorityCreateInfoKHR {
+    VkStructureType             sType;
+    const void*                 pNext;
+    VkQueueGlobalPriorityKHR    globalPriority;
+} VkDeviceQueueGlobalPriorityCreateInfoKHR;
 
-typedef VkPhysicalDeviceGlobalPriorityQueryFeatures VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR;
+typedef struct VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           globalPriorityQuery;
+} VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR;
 
-typedef VkQueueFamilyGlobalPriorityProperties VkQueueFamilyGlobalPriorityPropertiesKHR;
+typedef struct VkQueueFamilyGlobalPriorityPropertiesKHR {
+    VkStructureType             sType;
+    void*                       pNext;
+    uint32_t                    priorityCount;
+    VkQueueGlobalPriorityKHR    priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_KHR];
+} VkQueueFamilyGlobalPriorityPropertiesKHR;
 
 
 
@@ -11494,26 +10121,20 @@ typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphoresKHR)(VkDevice device, const VkS
 typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphoreKHR)(VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValueKHR(
     VkDevice                                    device,
     VkSemaphore                                 semaphore,
     uint64_t*                                   pValue);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphoresKHR(
     VkDevice                                    device,
     const VkSemaphoreWaitInfo*                  pWaitInfo,
     uint64_t                                    timeout);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphoreKHR(
     VkDevice                                    device,
     const VkSemaphoreSignalInfo*                pSignalInfo);
 #endif
-#endif
 
 
 // VK_KHR_vulkan_memory_model is a preprocessor guard. Do not pass it to API calls.
@@ -11596,59 +10217,59 @@ typedef struct VkPhysicalDeviceFragmentShadingRateKHR {
     VkExtent2D            fragmentSize;
 } VkPhysicalDeviceFragmentShadingRateKHR;
 
-typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkImageView        imageView;
-    VkImageLayout      imageLayout;
-    VkExtent2D         shadingRateAttachmentTexelSize;
-} VkRenderingFragmentShadingRateAttachmentInfoKHR;
-
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR)(VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates);
 typedef void (VKAPI_PTR *PFN_vkCmdSetFragmentShadingRateKHR)(VkCommandBuffer           commandBuffer, const VkExtent2D*                           pFragmentSize, const VkFragmentShadingRateCombinerOpKHR    combinerOps[2]);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceFragmentShadingRatesKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pFragmentShadingRateCount,
     VkPhysicalDeviceFragmentShadingRateKHR*     pFragmentShadingRates);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetFragmentShadingRateKHR(
     VkCommandBuffer                             commandBuffer,
     const VkExtent2D*                           pFragmentSize,
     const VkFragmentShadingRateCombinerOpKHR    combinerOps[2]);
 #endif
-#endif
 
 
 // VK_KHR_dynamic_rendering_local_read is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_dynamic_rendering_local_read 1
 #define VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_SPEC_VERSION 1
 #define VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_EXTENSION_NAME "VK_KHR_dynamic_rendering_local_read"
-typedef VkPhysicalDeviceDynamicRenderingLocalReadFeatures VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
+typedef struct VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           dynamicRenderingLocalRead;
+} VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
 
-typedef VkRenderingAttachmentLocationInfo VkRenderingAttachmentLocationInfoKHR;
+typedef struct VkRenderingAttachmentLocationInfoKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           colorAttachmentCount;
+    const uint32_t*    pColorAttachmentLocations;
+} VkRenderingAttachmentLocationInfoKHR;
 
-typedef VkRenderingInputAttachmentIndexInfo VkRenderingInputAttachmentIndexInfoKHR;
+typedef struct VkRenderingInputAttachmentIndexInfoKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           colorAttachmentCount;
+    const uint32_t*    pColorAttachmentInputIndices;
+    const uint32_t*    pDepthInputAttachmentIndex;
+    const uint32_t*    pStencilInputAttachmentIndex;
+} VkRenderingInputAttachmentIndexInfoKHR;
 
-typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingAttachmentLocationsKHR)(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfo* pLocationInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingInputAttachmentIndicesKHR)(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfo* pInputAttachmentIndexInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingAttachmentLocationsKHR)(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfoKHR* pLocationInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdSetRenderingInputAttachmentIndicesKHR)(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingAttachmentLocationsKHR(
     VkCommandBuffer                             commandBuffer,
-    const VkRenderingAttachmentLocationInfo*    pLocationInfo);
-#endif
+    const VkRenderingAttachmentLocationInfoKHR* pLocationInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRenderingInputAttachmentIndicesKHR(
     VkCommandBuffer                             commandBuffer,
-    const VkRenderingInputAttachmentIndexInfo*  pInputAttachmentIndexInfo);
-#endif
+    const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo);
 #endif
 
 
@@ -11676,7 +10297,7 @@ typedef struct VkPhysicalDeviceShaderQuadControlFeaturesKHR {
 #define VK_KHR_SURFACE_PROTECTED_CAPABILITIES_EXTENSION_NAME "VK_KHR_surface_protected_capabilities"
 typedef struct VkSurfaceProtectedCapabilitiesKHR {
     VkStructureType    sType;
-    void*              pNext;
+    const void*        pNext;
     VkBool32           supportsProtected;
 } VkSurfaceProtectedCapabilitiesKHR;
 
@@ -11707,14 +10328,12 @@ typedef struct VkPhysicalDevicePresentWaitFeaturesKHR {
 typedef VkResult (VKAPI_PTR *PFN_vkWaitForPresentKHR)(VkDevice device, VkSwapchainKHR swapchain, uint64_t presentId, uint64_t timeout);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkWaitForPresentKHR(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     uint64_t                                    presentId,
     uint64_t                                    timeout);
 #endif
-#endif
 
 
 // VK_KHR_uniform_buffer_standard_layout is a preprocessor guard. Do not pass it to API calls.
@@ -11744,24 +10363,18 @@ typedef uint64_t (VKAPI_PTR *PFN_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice de
 typedef uint64_t (VKAPI_PTR *PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddressKHR(
     VkDevice                                    device,
     const VkBufferDeviceAddressInfo*            pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR uint64_t VKAPI_CALL vkGetBufferOpaqueCaptureAddressKHR(
     VkDevice                                    device,
     const VkBufferDeviceAddressInfo*            pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR uint64_t VKAPI_CALL vkGetDeviceMemoryOpaqueCaptureAddressKHR(
     VkDevice                                    device,
     const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
 #endif
-#endif
 
 
 // VK_KHR_deferred_host_operations is a preprocessor guard. Do not pass it to API calls.
@@ -11776,38 +10389,28 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDeferredOperationResultKHR)(VkDevice devic
 typedef VkResult (VKAPI_PTR *PFN_vkDeferredOperationJoinKHR)(VkDevice device, VkDeferredOperationKHR operation);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDeferredOperationKHR(
     VkDevice                                    device,
     const VkAllocationCallbacks*                pAllocator,
     VkDeferredOperationKHR*                     pDeferredOperation);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyDeferredOperationKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      operation,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR uint32_t VKAPI_CALL vkGetDeferredOperationMaxConcurrencyKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      operation);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeferredOperationResultKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      operation);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkDeferredOperationJoinKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      operation);
 #endif
-#endif
 
 
 // VK_KHR_pipeline_executable_properties is a preprocessor guard. Do not pass it to API calls.
@@ -11881,60 +10484,64 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineExecutableStatisticsKHR)(VkDevice
 typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineExecutableInternalRepresentationsKHR)(VkDevice                        device, const VkPipelineExecutableInfoKHR*  pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutablePropertiesKHR(
     VkDevice                                    device,
     const VkPipelineInfoKHR*                    pPipelineInfo,
     uint32_t*                                   pExecutableCount,
     VkPipelineExecutablePropertiesKHR*          pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableStatisticsKHR(
     VkDevice                                    device,
     const VkPipelineExecutableInfoKHR*          pExecutableInfo,
     uint32_t*                                   pStatisticCount,
     VkPipelineExecutableStatisticKHR*           pStatistics);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR(
     VkDevice                                    device,
     const VkPipelineExecutableInfoKHR*          pExecutableInfo,
     uint32_t*                                   pInternalRepresentationCount,
     VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
 #endif
-#endif
 
 
 // VK_KHR_map_memory2 is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_map_memory2 1
 #define VK_KHR_MAP_MEMORY_2_SPEC_VERSION  1
 #define VK_KHR_MAP_MEMORY_2_EXTENSION_NAME "VK_KHR_map_memory2"
-typedef VkMemoryUnmapFlagBits VkMemoryUnmapFlagBitsKHR;
 
-typedef VkMemoryUnmapFlags VkMemoryUnmapFlagsKHR;
+typedef enum VkMemoryUnmapFlagBitsKHR {
+    VK_MEMORY_UNMAP_RESERVE_BIT_EXT = 0x00000001,
+    VK_MEMORY_UNMAP_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
+} VkMemoryUnmapFlagBitsKHR;
+typedef VkFlags VkMemoryUnmapFlagsKHR;
+typedef struct VkMemoryMapInfoKHR {
+    VkStructureType     sType;
+    const void*         pNext;
+    VkMemoryMapFlags    flags;
+    VkDeviceMemory      memory;
+    VkDeviceSize        offset;
+    VkDeviceSize        size;
+} VkMemoryMapInfoKHR;
 
-typedef VkMemoryMapInfo VkMemoryMapInfoKHR;
+typedef struct VkMemoryUnmapInfoKHR {
+    VkStructureType          sType;
+    const void*              pNext;
+    VkMemoryUnmapFlagsKHR    flags;
+    VkDeviceMemory           memory;
+} VkMemoryUnmapInfoKHR;
 
-typedef VkMemoryUnmapInfo VkMemoryUnmapInfoKHR;
-
-typedef VkResult (VKAPI_PTR *PFN_vkMapMemory2KHR)(VkDevice device, const VkMemoryMapInfo* pMemoryMapInfo, void** ppData);
-typedef VkResult (VKAPI_PTR *PFN_vkUnmapMemory2KHR)(VkDevice device, const VkMemoryUnmapInfo* pMemoryUnmapInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkMapMemory2KHR)(VkDevice device, const VkMemoryMapInfoKHR* pMemoryMapInfo, void** ppData);
+typedef VkResult (VKAPI_PTR *PFN_vkUnmapMemory2KHR)(VkDevice device, const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory2KHR(
     VkDevice                                    device,
-    const VkMemoryMapInfo*                      pMemoryMapInfo,
+    const VkMemoryMapInfoKHR*                   pMemoryMapInfo,
     void**                                      ppData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkUnmapMemory2KHR(
     VkDevice                                    device,
-    const VkMemoryUnmapInfo*                    pMemoryUnmapInfo);
-#endif
+    const VkMemoryUnmapInfoKHR*                 pMemoryUnmapInfo);
 #endif
 
 
@@ -12001,9 +10608,6 @@ typedef enum VkVideoEncodeTuningModeKHR {
 } VkVideoEncodeTuningModeKHR;
 
 typedef enum VkVideoEncodeFlagBitsKHR {
-    VK_VIDEO_ENCODE_INTRA_REFRESH_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_WITH_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_WITH_EMPHASIS_MAP_BIT_KHR = 0x00000002,
     VK_VIDEO_ENCODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeFlagBitsKHR;
 typedef VkFlags VkVideoEncodeFlagsKHR;
@@ -12011,8 +10615,6 @@ typedef VkFlags VkVideoEncodeFlagsKHR;
 typedef enum VkVideoEncodeCapabilityFlagBitsKHR {
     VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR = 0x00000001,
     VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_CAPABILITY_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_CAPABILITY_EMPHASIS_MAP_BIT_KHR = 0x00000008,
     VK_VIDEO_ENCODE_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeCapabilityFlagBitsKHR;
 typedef VkFlags VkVideoEncodeCapabilityFlagsKHR;
@@ -12150,28 +10752,22 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetEncodedVideoSessionParametersKHR)(VkDevice
 typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR* pQualityLevelInfo,
     VkVideoEncodeQualityLevelPropertiesKHR*     pQualityLevelProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetEncodedVideoSessionParametersKHR(
     VkDevice                                    device,
     const VkVideoEncodeSessionParametersGetInfoKHR* pVideoSessionParametersInfo,
     VkVideoEncodeSessionParametersFeedbackInfoKHR* pFeedbackInfo,
     size_t*                                     pDataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEncodeVideoKHR(
     VkCommandBuffer                             commandBuffer,
     const VkVideoEncodeInfoKHR*                 pEncodeInfo);
 #endif
-#endif
 
 
 // VK_KHR_synchronization2 is a preprocessor guard. Do not pass it to API calls.
@@ -12206,57 +10802,72 @@ typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfoKHR;
 
 typedef VkPhysicalDeviceSynchronization2Features VkPhysicalDeviceSynchronization2FeaturesKHR;
 
+typedef struct VkQueueFamilyCheckpointProperties2NV {
+    VkStructureType          sType;
+    void*                    pNext;
+    VkPipelineStageFlags2    checkpointExecutionStageMask;
+} VkQueueFamilyCheckpointProperties2NV;
+
+typedef struct VkCheckpointData2NV {
+    VkStructureType          sType;
+    void*                    pNext;
+    VkPipelineStageFlags2    stage;
+    void*                    pCheckpointMarker;
+} VkCheckpointData2NV;
+
 typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2KHR)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, const VkDependencyInfo*                             pDependencyInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2KHR)(VkCommandBuffer                   commandBuffer, VkEvent                                             event, VkPipelineStageFlags2               stageMask);
 typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2KHR)(VkCommandBuffer                   commandBuffer, uint32_t                                            eventCount, const VkEvent*                     pEvents, const VkDependencyInfo*            pDependencyInfos);
 typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2KHR)(VkCommandBuffer                   commandBuffer, const VkDependencyInfo*                             pDependencyInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2KHR)(VkCommandBuffer                   commandBuffer, VkPipelineStageFlags2               stage, VkQueryPool                                         queryPool, uint32_t                                            query);
 typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2KHR)(VkQueue                           queue, uint32_t                            submitCount, const VkSubmitInfo2*              pSubmits, VkFence           fence);
+typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer                   commandBuffer, VkPipelineStageFlags2               stage, VkBuffer                                            dstBuffer, VkDeviceSize                                        dstOffset, uint32_t                                            marker);
+typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointData2NV)(VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2KHR(
     VkCommandBuffer                             commandBuffer,
     VkEvent                                     event,
     const VkDependencyInfo*                     pDependencyInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2KHR(
     VkCommandBuffer                             commandBuffer,
     VkEvent                                     event,
     VkPipelineStageFlags2                       stageMask);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2KHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    eventCount,
     const VkEvent*                              pEvents,
     const VkDependencyInfo*                     pDependencyInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkDependencyInfo*                     pDependencyInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp2KHR(
     VkCommandBuffer                             commandBuffer,
     VkPipelineStageFlags2                       stage,
     VkQueryPool                                 queryPool,
     uint32_t                                    query);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2KHR(
     VkQueue                                     queue,
     uint32_t                                    submitCount,
     const VkSubmitInfo2*                        pSubmits,
     VkFence                                     fence);
-#endif
+
+VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarker2AMD(
+    VkCommandBuffer                             commandBuffer,
+    VkPipelineStageFlags2                       stage,
+    VkBuffer                                    dstBuffer,
+    VkDeviceSize                                dstOffset,
+    uint32_t                                    marker);
+
+VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointData2NV(
+    VkQueue                                     queue,
+    uint32_t*                                   pCheckpointDataCount,
+    VkCheckpointData2NV*                        pCheckpointData);
 #endif
 
 
@@ -12347,42 +10958,30 @@ typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2KHR)(VkCommandBuffer commandBuffer,
 typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2KHR)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyBufferInfo2*                    pCopyBufferInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyImageInfo2*                     pCopyImageInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyBufferToImageInfo2*             pCopyBufferToImageInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyImageToBufferInfo2*             pCopyImageToBufferInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkBlitImageInfo2*                     pBlitImageInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkResolveImageInfo2*                  pResolveImageInfo);
 #endif
-#endif
 
 
 // VK_KHR_format_feature_flags2 is a preprocessor guard. Do not pass it to API calls.
@@ -12428,24 +11027,10 @@ typedef struct VkTraceRaysIndirectCommand2KHR {
 typedef void (VKAPI_PTR *PFN_vkCmdTraceRaysIndirect2KHR)(VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysIndirect2KHR(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             indirectDeviceAddress);
 #endif
-#endif
-
-
-// VK_KHR_shader_untyped_pointers is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_untyped_pointers 1
-#define VK_KHR_SHADER_UNTYPED_POINTERS_SPEC_VERSION 1
-#define VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME "VK_KHR_shader_untyped_pointers"
-typedef struct VkPhysicalDeviceShaderUntypedPointersFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderUntypedPointers;
-} VkPhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
 
 
 // VK_KHR_portability_enumeration is a preprocessor guard. Do not pass it to API calls.
@@ -12471,35 +11056,34 @@ typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice dev
 typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirementsKHR(
     VkDevice                                    device,
     const VkDeviceBufferMemoryRequirements*     pInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirementsKHR(
     VkDevice                                    device,
     const VkDeviceImageMemoryRequirements*      pInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR(
     VkDevice                                    device,
     const VkDeviceImageMemoryRequirements*      pInfo,
     uint32_t*                                   pSparseMemoryRequirementCount,
     VkSparseImageMemoryRequirements2*           pSparseMemoryRequirements);
 #endif
-#endif
 
 
 // VK_KHR_shader_subgroup_rotate is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_shader_subgroup_rotate 1
 #define VK_KHR_SHADER_SUBGROUP_ROTATE_SPEC_VERSION 2
 #define VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME "VK_KHR_shader_subgroup_rotate"
-typedef VkPhysicalDeviceShaderSubgroupRotateFeatures VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR;
+typedef struct VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderSubgroupRotate;
+    VkBool32           shaderSubgroupRotateClustered;
+} VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR;
 
 
 
@@ -12519,126 +11103,161 @@ typedef struct VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR {
 #define VK_KHR_maintenance5 1
 #define VK_KHR_MAINTENANCE_5_SPEC_VERSION 1
 #define VK_KHR_MAINTENANCE_5_EXTENSION_NAME "VK_KHR_maintenance5"
-typedef VkPipelineCreateFlags2 VkPipelineCreateFlags2KHR;
+typedef VkFlags64 VkPipelineCreateFlags2KHR;
 
-typedef VkPipelineCreateFlagBits2 VkPipelineCreateFlagBits2KHR;
+// Flag bits for VkPipelineCreateFlagBits2KHR
+typedef VkFlags64 VkPipelineCreateFlagBits2KHR;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR = 0x00000001ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR = 0x00000002ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR = 0x00000004ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT = 0x400000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = 0x00000008ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR = 0x00000010ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV = 0x00000020ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR = 0x00000040ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR = 0x00000080ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR = 0x00000100ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR = 0x00000200ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT = 0x00000400ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT = 0x00800000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR = 0x00000800ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR = 0x00001000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR = 0x00002000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 0x00004000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 0x00008000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 0x00010000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR = 0x00020000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR = 0x00080000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV = 0x00040000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV = 0x00100000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT = 0x01000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 0x02000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT = 0x04000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT = 0x08000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT = 0x40000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV = 0x10000000ULL;
+static const VkPipelineCreateFlagBits2KHR VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT = 0x20000000ULL;
 
-typedef VkBufferUsageFlags2 VkBufferUsageFlags2KHR;
+typedef VkFlags64 VkBufferUsageFlags2KHR;
 
-typedef VkBufferUsageFlagBits2 VkBufferUsageFlagBits2KHR;
+// Flag bits for VkBufferUsageFlagBits2KHR
+typedef VkFlags64 VkBufferUsageFlagBits2KHR;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR = 0x00000001ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_TRANSFER_DST_BIT_KHR = 0x00000002ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000004ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR = 0x00000010ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR = 0x00000020ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR = 0x00000040ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR = 0x00000080ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR = 0x00000100ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX = 0x02000000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00000200ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR = 0x00000400ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_RAY_TRACING_BIT_NV = 0x00000400ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR = 0x00002000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR = 0x00004000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR = 0x00008000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR = 0x00010000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR = 0x00020000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR = 0x00080000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR = 0x00100000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT = 0x00200000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT = 0x00400000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT = 0x04000000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT = 0x00800000ULL;
+static const VkBufferUsageFlagBits2KHR VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT = 0x01000000ULL;
 
-typedef VkPhysicalDeviceMaintenance5Features VkPhysicalDeviceMaintenance5FeaturesKHR;
+typedef struct VkPhysicalDeviceMaintenance5FeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           maintenance5;
+} VkPhysicalDeviceMaintenance5FeaturesKHR;
 
-typedef VkPhysicalDeviceMaintenance5Properties VkPhysicalDeviceMaintenance5PropertiesKHR;
+typedef struct VkPhysicalDeviceMaintenance5PropertiesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           earlyFragmentMultisampleCoverageAfterSampleCounting;
+    VkBool32           earlyFragmentSampleMaskTestBeforeSampleCounting;
+    VkBool32           depthStencilSwizzleOneSupport;
+    VkBool32           polygonModePointSize;
+    VkBool32           nonStrictSinglePixelWideLinesUseParallelogram;
+    VkBool32           nonStrictWideLinesUseParallelogram;
+} VkPhysicalDeviceMaintenance5PropertiesKHR;
 
-typedef VkRenderingAreaInfo VkRenderingAreaInfoKHR;
+typedef struct VkRenderingAreaInfoKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           viewMask;
+    uint32_t           colorAttachmentCount;
+    const VkFormat*    pColorAttachmentFormats;
+    VkFormat           depthAttachmentFormat;
+    VkFormat           stencilAttachmentFormat;
+} VkRenderingAreaInfoKHR;
 
-typedef VkDeviceImageSubresourceInfo VkDeviceImageSubresourceInfoKHR;
+typedef struct VkImageSubresource2KHR {
+    VkStructureType       sType;
+    void*                 pNext;
+    VkImageSubresource    imageSubresource;
+} VkImageSubresource2KHR;
 
-typedef VkImageSubresource2 VkImageSubresource2KHR;
+typedef struct VkDeviceImageSubresourceInfoKHR {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    const VkImageCreateInfo*         pCreateInfo;
+    const VkImageSubresource2KHR*    pSubresource;
+} VkDeviceImageSubresourceInfoKHR;
 
-typedef VkSubresourceLayout2 VkSubresourceLayout2KHR;
+typedef struct VkSubresourceLayout2KHR {
+    VkStructureType        sType;
+    void*                  pNext;
+    VkSubresourceLayout    subresourceLayout;
+} VkSubresourceLayout2KHR;
 
-typedef VkPipelineCreateFlags2CreateInfo VkPipelineCreateFlags2CreateInfoKHR;
+typedef struct VkPipelineCreateFlags2CreateInfoKHR {
+    VkStructureType              sType;
+    const void*                  pNext;
+    VkPipelineCreateFlags2KHR    flags;
+} VkPipelineCreateFlags2CreateInfoKHR;
 
-typedef VkBufferUsageFlags2CreateInfo VkBufferUsageFlags2CreateInfoKHR;
+typedef struct VkBufferUsageFlags2CreateInfoKHR {
+    VkStructureType           sType;
+    const void*               pNext;
+    VkBufferUsageFlags2KHR    usage;
+} VkBufferUsageFlags2CreateInfoKHR;
 
 typedef void (VKAPI_PTR *PFN_vkCmdBindIndexBuffer2KHR)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, VkIndexType indexType);
-typedef void (VKAPI_PTR *PFN_vkGetRenderingAreaGranularityKHR)(VkDevice device, const VkRenderingAreaInfo* pRenderingAreaInfo, VkExtent2D* pGranularity);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSubresourceLayoutKHR)(VkDevice device, const VkDeviceImageSubresourceInfo* pInfo, VkSubresourceLayout2* pLayout);
-typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout2KHR)(VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout);
+typedef void (VKAPI_PTR *PFN_vkGetRenderingAreaGranularityKHR)(VkDevice device, const VkRenderingAreaInfoKHR* pRenderingAreaInfo, VkExtent2D* pGranularity);
+typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSubresourceLayoutKHR)(VkDevice device, const VkDeviceImageSubresourceInfoKHR* pInfo, VkSubresourceLayout2KHR* pLayout);
+typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout2KHR)(VkDevice device, VkImage image, const VkImageSubresource2KHR* pSubresource, VkSubresourceLayout2KHR* pLayout);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindIndexBuffer2KHR(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
     VkDeviceSize                                offset,
     VkDeviceSize                                size,
     VkIndexType                                 indexType);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetRenderingAreaGranularityKHR(
     VkDevice                                    device,
-    const VkRenderingAreaInfo*                  pRenderingAreaInfo,
+    const VkRenderingAreaInfoKHR*               pRenderingAreaInfo,
     VkExtent2D*                                 pGranularity);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSubresourceLayoutKHR(
     VkDevice                                    device,
-    const VkDeviceImageSubresourceInfo*         pInfo,
-    VkSubresourceLayout2*                       pLayout);
-#endif
+    const VkDeviceImageSubresourceInfoKHR*      pInfo,
+    VkSubresourceLayout2KHR*                    pLayout);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout2KHR(
     VkDevice                                    device,
     VkImage                                     image,
-    const VkImageSubresource2*                  pSubresource,
-    VkSubresourceLayout2*                       pLayout);
-#endif
-#endif
-
-
-// VK_KHR_present_id2 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_present_id2 1
-#define VK_KHR_PRESENT_ID_2_SPEC_VERSION  1
-#define VK_KHR_PRESENT_ID_2_EXTENSION_NAME "VK_KHR_present_id2"
-typedef struct VkSurfaceCapabilitiesPresentId2KHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentId2Supported;
-} VkSurfaceCapabilitiesPresentId2KHR;
-
-typedef struct VkPresentId2KHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           swapchainCount;
-    const uint64_t*    pPresentIds;
-} VkPresentId2KHR;
-
-typedef struct VkPhysicalDevicePresentId2FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentId2;
-} VkPhysicalDevicePresentId2FeaturesKHR;
-
-
-
-// VK_KHR_present_wait2 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_present_wait2 1
-#define VK_KHR_PRESENT_WAIT_2_SPEC_VERSION 1
-#define VK_KHR_PRESENT_WAIT_2_EXTENSION_NAME "VK_KHR_present_wait2"
-typedef struct VkSurfaceCapabilitiesPresentWait2KHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentWait2Supported;
-} VkSurfaceCapabilitiesPresentWait2KHR;
-
-typedef struct VkPhysicalDevicePresentWait2FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentWait2;
-} VkPhysicalDevicePresentWait2FeaturesKHR;
-
-typedef struct VkPresentWait2InfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint64_t           presentId;
-    uint64_t           timeout;
-} VkPresentWait2InfoKHR;
-
-typedef VkResult (VKAPI_PTR *PFN_vkWaitForPresent2KHR)(VkDevice device, VkSwapchainKHR swapchain, const VkPresentWait2InfoKHR* pPresentWait2Info);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkWaitForPresent2KHR(
-    VkDevice                                    device,
-    VkSwapchainKHR                              swapchain,
-    const VkPresentWait2InfoKHR*                pPresentWait2Info);
-#endif
+    const VkImageSubresource2KHR*               pSubresource,
+    VkSubresourceLayout2KHR*                    pLayout);
 #endif
 
 
@@ -12654,247 +11273,6 @@ typedef struct VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR {
 
 
 
-// VK_KHR_pipeline_binary is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_pipeline_binary 1
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPipelineBinaryKHR)
-#define VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR 32U
-#define VK_KHR_PIPELINE_BINARY_SPEC_VERSION 1
-#define VK_KHR_PIPELINE_BINARY_EXTENSION_NAME "VK_KHR_pipeline_binary"
-typedef struct VkPhysicalDevicePipelineBinaryFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineBinaries;
-} VkPhysicalDevicePipelineBinaryFeaturesKHR;
-
-typedef struct VkPhysicalDevicePipelineBinaryPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineBinaryInternalCache;
-    VkBool32           pipelineBinaryInternalCacheControl;
-    VkBool32           pipelineBinaryPrefersInternalCache;
-    VkBool32           pipelineBinaryPrecompiledInternalCache;
-    VkBool32           pipelineBinaryCompressedData;
-} VkPhysicalDevicePipelineBinaryPropertiesKHR;
-
-typedef struct VkDevicePipelineBinaryInternalCacheControlKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           disableInternalCache;
-} VkDevicePipelineBinaryInternalCacheControlKHR;
-
-typedef struct VkPipelineBinaryKeyKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           keySize;
-    uint8_t            key[VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR];
-} VkPipelineBinaryKeyKHR;
-
-typedef struct VkPipelineBinaryDataKHR {
-    size_t    dataSize;
-    void*     pData;
-} VkPipelineBinaryDataKHR;
-
-typedef struct VkPipelineBinaryKeysAndDataKHR {
-    uint32_t                          binaryCount;
-    const VkPipelineBinaryKeyKHR*     pPipelineBinaryKeys;
-    const VkPipelineBinaryDataKHR*    pPipelineBinaryData;
-} VkPipelineBinaryKeysAndDataKHR;
-
-typedef struct VkPipelineCreateInfoKHR {
-    VkStructureType    sType;
-    void*              pNext;
-} VkPipelineCreateInfoKHR;
-
-typedef struct VkPipelineBinaryCreateInfoKHR {
-    VkStructureType                          sType;
-    const void*                              pNext;
-    const VkPipelineBinaryKeysAndDataKHR*    pKeysAndDataInfo;
-    VkPipeline                               pipeline;
-    const VkPipelineCreateInfoKHR*           pPipelineCreateInfo;
-} VkPipelineBinaryCreateInfoKHR;
-
-typedef struct VkPipelineBinaryInfoKHR {
-    VkStructureType               sType;
-    const void*                   pNext;
-    uint32_t                      binaryCount;
-    const VkPipelineBinaryKHR*    pPipelineBinaries;
-} VkPipelineBinaryInfoKHR;
-
-typedef struct VkReleaseCapturedPipelineDataInfoKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkPipeline         pipeline;
-} VkReleaseCapturedPipelineDataInfoKHR;
-
-typedef struct VkPipelineBinaryDataInfoKHR {
-    VkStructureType        sType;
-    void*                  pNext;
-    VkPipelineBinaryKHR    pipelineBinary;
-} VkPipelineBinaryDataInfoKHR;
-
-typedef struct VkPipelineBinaryHandlesInfoKHR {
-    VkStructureType         sType;
-    const void*             pNext;
-    uint32_t                pipelineBinaryCount;
-    VkPipelineBinaryKHR*    pPipelineBinaries;
-} VkPipelineBinaryHandlesInfoKHR;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineBinariesKHR)(VkDevice device, const VkPipelineBinaryCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineBinaryHandlesInfoKHR* pBinaries);
-typedef void (VKAPI_PTR *PFN_vkDestroyPipelineBinaryKHR)(VkDevice device, VkPipelineBinaryKHR pipelineBinary, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineKeyKHR)(VkDevice device, const VkPipelineCreateInfoKHR* pPipelineCreateInfo, VkPipelineBinaryKeyKHR* pPipelineKey);
-typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineBinaryDataKHR)(VkDevice device, const VkPipelineBinaryDataInfoKHR* pInfo, VkPipelineBinaryKeyKHR* pPipelineBinaryKey, size_t* pPipelineBinaryDataSize, void* pPipelineBinaryData);
-typedef VkResult (VKAPI_PTR *PFN_vkReleaseCapturedPipelineDataKHR)(VkDevice device, const VkReleaseCapturedPipelineDataInfoKHR* pInfo, const VkAllocationCallbacks* pAllocator);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreatePipelineBinariesKHR(
-    VkDevice                                    device,
-    const VkPipelineBinaryCreateInfoKHR*        pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkPipelineBinaryHandlesInfoKHR*             pBinaries);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyPipelineBinaryKHR(
-    VkDevice                                    device,
-    VkPipelineBinaryKHR                         pipelineBinary,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineKeyKHR(
-    VkDevice                                    device,
-    const VkPipelineCreateInfoKHR*              pPipelineCreateInfo,
-    VkPipelineBinaryKeyKHR*                     pPipelineKey);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineBinaryDataKHR(
-    VkDevice                                    device,
-    const VkPipelineBinaryDataInfoKHR*          pInfo,
-    VkPipelineBinaryKeyKHR*                     pPipelineBinaryKey,
-    size_t*                                     pPipelineBinaryDataSize,
-    void*                                       pPipelineBinaryData);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkReleaseCapturedPipelineDataKHR(
-    VkDevice                                    device,
-    const VkReleaseCapturedPipelineDataInfoKHR* pInfo,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-#endif
-
-
-// VK_KHR_surface_maintenance1 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_surface_maintenance1 1
-#define VK_KHR_SURFACE_MAINTENANCE_1_SPEC_VERSION 1
-#define VK_KHR_SURFACE_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_surface_maintenance1"
-
-typedef enum VkPresentScalingFlagBitsKHR {
-    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR = 0x00000001,
-    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR = 0x00000002,
-    VK_PRESENT_SCALING_STRETCH_BIT_KHR = 0x00000004,
-    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT = VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR,
-    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT = VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR,
-    VK_PRESENT_SCALING_STRETCH_BIT_EXT = VK_PRESENT_SCALING_STRETCH_BIT_KHR,
-    VK_PRESENT_SCALING_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkPresentScalingFlagBitsKHR;
-typedef VkFlags VkPresentScalingFlagsKHR;
-
-typedef enum VkPresentGravityFlagBitsKHR {
-    VK_PRESENT_GRAVITY_MIN_BIT_KHR = 0x00000001,
-    VK_PRESENT_GRAVITY_MAX_BIT_KHR = 0x00000002,
-    VK_PRESENT_GRAVITY_CENTERED_BIT_KHR = 0x00000004,
-    VK_PRESENT_GRAVITY_MIN_BIT_EXT = VK_PRESENT_GRAVITY_MIN_BIT_KHR,
-    VK_PRESENT_GRAVITY_MAX_BIT_EXT = VK_PRESENT_GRAVITY_MAX_BIT_KHR,
-    VK_PRESENT_GRAVITY_CENTERED_BIT_EXT = VK_PRESENT_GRAVITY_CENTERED_BIT_KHR,
-    VK_PRESENT_GRAVITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkPresentGravityFlagBitsKHR;
-typedef VkFlags VkPresentGravityFlagsKHR;
-typedef struct VkSurfacePresentModeKHR {
-    VkStructureType     sType;
-    void*               pNext;
-    VkPresentModeKHR    presentMode;
-} VkSurfacePresentModeKHR;
-
-typedef struct VkSurfacePresentScalingCapabilitiesKHR {
-    VkStructureType             sType;
-    void*                       pNext;
-    VkPresentScalingFlagsKHR    supportedPresentScaling;
-    VkPresentGravityFlagsKHR    supportedPresentGravityX;
-    VkPresentGravityFlagsKHR    supportedPresentGravityY;
-    VkExtent2D                  minScaledImageExtent;
-    VkExtent2D                  maxScaledImageExtent;
-} VkSurfacePresentScalingCapabilitiesKHR;
-
-typedef struct VkSurfacePresentModeCompatibilityKHR {
-    VkStructureType      sType;
-    void*                pNext;
-    uint32_t             presentModeCount;
-    VkPresentModeKHR*    pPresentModes;
-} VkSurfacePresentModeCompatibilityKHR;
-
-
-
-// VK_KHR_swapchain_maintenance1 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_swapchain_maintenance1 1
-#define VK_KHR_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION 1
-#define VK_KHR_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_swapchain_maintenance1"
-typedef struct VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           swapchainMaintenance1;
-} VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-
-typedef struct VkSwapchainPresentFenceInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           swapchainCount;
-    const VkFence*     pFences;
-} VkSwapchainPresentFenceInfoKHR;
-
-typedef struct VkSwapchainPresentModesCreateInfoKHR {
-    VkStructureType            sType;
-    const void*                pNext;
-    uint32_t                   presentModeCount;
-    const VkPresentModeKHR*    pPresentModes;
-} VkSwapchainPresentModesCreateInfoKHR;
-
-typedef struct VkSwapchainPresentModeInfoKHR {
-    VkStructureType            sType;
-    const void*                pNext;
-    uint32_t                   swapchainCount;
-    const VkPresentModeKHR*    pPresentModes;
-} VkSwapchainPresentModeInfoKHR;
-
-typedef struct VkSwapchainPresentScalingCreateInfoKHR {
-    VkStructureType             sType;
-    const void*                 pNext;
-    VkPresentScalingFlagsKHR    scalingBehavior;
-    VkPresentGravityFlagsKHR    presentGravityX;
-    VkPresentGravityFlagsKHR    presentGravityY;
-} VkSwapchainPresentScalingCreateInfoKHR;
-
-typedef struct VkReleaseSwapchainImagesInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkSwapchainKHR     swapchain;
-    uint32_t           imageIndexCount;
-    const uint32_t*    pImageIndices;
-} VkReleaseSwapchainImagesInfoKHR;
-
-typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesKHR)(VkDevice device, const VkReleaseSwapchainImagesInfoKHR* pReleaseInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkReleaseSwapchainImagesKHR(
-    VkDevice                                    device,
-    const VkReleaseSwapchainImagesInfoKHR*      pReleaseInfo);
-#endif
-#endif
-
-
 // VK_KHR_cooperative_matrix is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_cooperative_matrix 1
 #define VK_KHR_COOPERATIVE_MATRIX_SPEC_VERSION 2
@@ -12912,11 +11290,6 @@ typedef enum VkComponentTypeKHR {
     VK_COMPONENT_TYPE_UINT16_KHR = 8,
     VK_COMPONENT_TYPE_UINT32_KHR = 9,
     VK_COMPONENT_TYPE_UINT64_KHR = 10,
-    VK_COMPONENT_TYPE_BFLOAT16_KHR = 1000141000,
-    VK_COMPONENT_TYPE_SINT8_PACKED_NV = 1000491000,
-    VK_COMPONENT_TYPE_UINT8_PACKED_NV = 1000491001,
-    VK_COMPONENT_TYPE_FLOAT8_E4M3_EXT = 1000491002,
-    VK_COMPONENT_TYPE_FLOAT8_E5M2_EXT = 1000491003,
     VK_COMPONENT_TYPE_FLOAT16_NV = VK_COMPONENT_TYPE_FLOAT16_KHR,
     VK_COMPONENT_TYPE_FLOAT32_NV = VK_COMPONENT_TYPE_FLOAT32_KHR,
     VK_COMPONENT_TYPE_FLOAT64_NV = VK_COMPONENT_TYPE_FLOAT64_KHR,
@@ -12928,8 +11301,6 @@ typedef enum VkComponentTypeKHR {
     VK_COMPONENT_TYPE_UINT16_NV = VK_COMPONENT_TYPE_UINT16_KHR,
     VK_COMPONENT_TYPE_UINT32_NV = VK_COMPONENT_TYPE_UINT32_KHR,
     VK_COMPONENT_TYPE_UINT64_NV = VK_COMPONENT_TYPE_UINT64_KHR,
-    VK_COMPONENT_TYPE_FLOAT_E4M3_NV = VK_COMPONENT_TYPE_FLOAT8_E4M3_EXT,
-    VK_COMPONENT_TYPE_FLOAT_E5M2_NV = VK_COMPONENT_TYPE_FLOAT8_E5M2_EXT,
     VK_COMPONENT_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkComponentTypeKHR;
 
@@ -12974,32 +11345,11 @@ typedef struct VkPhysicalDeviceCooperativeMatrixPropertiesKHR {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesKHR* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkCooperativeMatrixPropertiesKHR*           pProperties);
 #endif
-#endif
-
-
-// VK_KHR_compute_shader_derivatives is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_compute_shader_derivatives 1
-#define VK_KHR_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION 1
-#define VK_KHR_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME "VK_KHR_compute_shader_derivatives"
-typedef struct VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           computeDerivativeGroupQuads;
-    VkBool32           computeDerivativeGroupLinear;
-} VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-
-typedef struct VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           meshAndTaskShaderDerivatives;
-} VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-
 
 
 // VK_KHR_video_decode_av1 is a preprocessor guard. Do not pass it to API calls.
@@ -13047,238 +11397,6 @@ typedef struct VkVideoDecodeAV1DpbSlotInfoKHR {
 
 
 
-// VK_KHR_video_encode_av1 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_encode_av1 1
-#include "vk_video/vulkan_video_codec_av1std_encode.h"
-#define VK_KHR_VIDEO_ENCODE_AV1_SPEC_VERSION 1
-#define VK_KHR_VIDEO_ENCODE_AV1_EXTENSION_NAME "VK_KHR_video_encode_av1"
-
-typedef enum VkVideoEncodeAV1PredictionModeKHR {
-    VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_INTRA_ONLY_KHR = 0,
-    VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_SINGLE_REFERENCE_KHR = 1,
-    VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_UNIDIRECTIONAL_COMPOUND_KHR = 2,
-    VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_BIDIRECTIONAL_COMPOUND_KHR = 3,
-    VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1PredictionModeKHR;
-
-typedef enum VkVideoEncodeAV1RateControlGroupKHR {
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_INTRA_KHR = 0,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_PREDICTIVE_KHR = 1,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_BIPREDICTIVE_KHR = 2,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1RateControlGroupKHR;
-
-typedef enum VkVideoEncodeAV1CapabilityFlagBitsKHR {
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_PER_RATE_CONTROL_GROUP_MIN_MAX_Q_INDEX_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_GENERATE_OBU_EXTENSION_HEADER_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_PRIMARY_REFERENCE_CDF_ONLY_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_FRAME_SIZE_OVERRIDE_BIT_KHR = 0x00000008,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_MOTION_VECTOR_SCALING_BIT_KHR = 0x00000010,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_COMPOUND_PREDICTION_INTRA_REFRESH_BIT_KHR = 0x00000020,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1CapabilityFlagBitsKHR;
-typedef VkFlags VkVideoEncodeAV1CapabilityFlagsKHR;
-
-typedef enum VkVideoEncodeAV1StdFlagBitsKHR {
-    VK_VIDEO_ENCODE_AV1_STD_UNIFORM_TILE_SPACING_FLAG_SET_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_AV1_STD_SKIP_MODE_PRESENT_UNSET_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_AV1_STD_PRIMARY_REF_FRAME_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_AV1_STD_DELTA_Q_BIT_KHR = 0x00000008,
-    VK_VIDEO_ENCODE_AV1_STD_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1StdFlagBitsKHR;
-typedef VkFlags VkVideoEncodeAV1StdFlagsKHR;
-
-typedef enum VkVideoEncodeAV1SuperblockSizeFlagBitsKHR {
-    VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_64_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_128_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1SuperblockSizeFlagBitsKHR;
-typedef VkFlags VkVideoEncodeAV1SuperblockSizeFlagsKHR;
-
-typedef enum VkVideoEncodeAV1RateControlFlagBitsKHR {
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REGULAR_GOP_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR = 0x00000008,
-    VK_VIDEO_ENCODE_AV1_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeAV1RateControlFlagBitsKHR;
-typedef VkFlags VkVideoEncodeAV1RateControlFlagsKHR;
-typedef struct VkPhysicalDeviceVideoEncodeAV1FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeAV1;
-} VkPhysicalDeviceVideoEncodeAV1FeaturesKHR;
-
-typedef struct VkVideoEncodeAV1CapabilitiesKHR {
-    VkStructureType                           sType;
-    void*                                     pNext;
-    VkVideoEncodeAV1CapabilityFlagsKHR        flags;
-    StdVideoAV1Level                          maxLevel;
-    VkExtent2D                                codedPictureAlignment;
-    VkExtent2D                                maxTiles;
-    VkExtent2D                                minTileSize;
-    VkExtent2D                                maxTileSize;
-    VkVideoEncodeAV1SuperblockSizeFlagsKHR    superblockSizes;
-    uint32_t                                  maxSingleReferenceCount;
-    uint32_t                                  singleReferenceNameMask;
-    uint32_t                                  maxUnidirectionalCompoundReferenceCount;
-    uint32_t                                  maxUnidirectionalCompoundGroup1ReferenceCount;
-    uint32_t                                  unidirectionalCompoundReferenceNameMask;
-    uint32_t                                  maxBidirectionalCompoundReferenceCount;
-    uint32_t                                  maxBidirectionalCompoundGroup1ReferenceCount;
-    uint32_t                                  maxBidirectionalCompoundGroup2ReferenceCount;
-    uint32_t                                  bidirectionalCompoundReferenceNameMask;
-    uint32_t                                  maxTemporalLayerCount;
-    uint32_t                                  maxSpatialLayerCount;
-    uint32_t                                  maxOperatingPoints;
-    uint32_t                                  minQIndex;
-    uint32_t                                  maxQIndex;
-    VkBool32                                  prefersGopRemainingFrames;
-    VkBool32                                  requiresGopRemainingFrames;
-    VkVideoEncodeAV1StdFlagsKHR               stdSyntaxFlags;
-} VkVideoEncodeAV1CapabilitiesKHR;
-
-typedef struct VkVideoEncodeAV1QIndexKHR {
-    uint32_t    intraQIndex;
-    uint32_t    predictiveQIndex;
-    uint32_t    bipredictiveQIndex;
-} VkVideoEncodeAV1QIndexKHR;
-
-typedef struct VkVideoEncodeAV1QualityLevelPropertiesKHR {
-    VkStructureType                        sType;
-    void*                                  pNext;
-    VkVideoEncodeAV1RateControlFlagsKHR    preferredRateControlFlags;
-    uint32_t                               preferredGopFrameCount;
-    uint32_t                               preferredKeyFramePeriod;
-    uint32_t                               preferredConsecutiveBipredictiveFrameCount;
-    uint32_t                               preferredTemporalLayerCount;
-    VkVideoEncodeAV1QIndexKHR              preferredConstantQIndex;
-    uint32_t                               preferredMaxSingleReferenceCount;
-    uint32_t                               preferredSingleReferenceNameMask;
-    uint32_t                               preferredMaxUnidirectionalCompoundReferenceCount;
-    uint32_t                               preferredMaxUnidirectionalCompoundGroup1ReferenceCount;
-    uint32_t                               preferredUnidirectionalCompoundReferenceNameMask;
-    uint32_t                               preferredMaxBidirectionalCompoundReferenceCount;
-    uint32_t                               preferredMaxBidirectionalCompoundGroup1ReferenceCount;
-    uint32_t                               preferredMaxBidirectionalCompoundGroup2ReferenceCount;
-    uint32_t                               preferredBidirectionalCompoundReferenceNameMask;
-} VkVideoEncodeAV1QualityLevelPropertiesKHR;
-
-typedef struct VkVideoEncodeAV1SessionCreateInfoKHR {
-    VkStructureType     sType;
-    const void*         pNext;
-    VkBool32            useMaxLevel;
-    StdVideoAV1Level    maxLevel;
-} VkVideoEncodeAV1SessionCreateInfoKHR;
-
-typedef struct VkVideoEncodeAV1SessionParametersCreateInfoKHR {
-    VkStructureType                               sType;
-    const void*                                   pNext;
-    const StdVideoAV1SequenceHeader*              pStdSequenceHeader;
-    const StdVideoEncodeAV1DecoderModelInfo*      pStdDecoderModelInfo;
-    uint32_t                                      stdOperatingPointCount;
-    const StdVideoEncodeAV1OperatingPointInfo*    pStdOperatingPoints;
-} VkVideoEncodeAV1SessionParametersCreateInfoKHR;
-
-typedef struct VkVideoEncodeAV1PictureInfoKHR {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    VkVideoEncodeAV1PredictionModeKHR      predictionMode;
-    VkVideoEncodeAV1RateControlGroupKHR    rateControlGroup;
-    uint32_t                               constantQIndex;
-    const StdVideoEncodeAV1PictureInfo*    pStdPictureInfo;
-    int32_t                                referenceNameSlotIndices[VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR];
-    VkBool32                               primaryReferenceCdfOnly;
-    VkBool32                               generateObuExtensionHeader;
-} VkVideoEncodeAV1PictureInfoKHR;
-
-typedef struct VkVideoEncodeAV1DpbSlotInfoKHR {
-    VkStructureType                          sType;
-    const void*                              pNext;
-    const StdVideoEncodeAV1ReferenceInfo*    pStdReferenceInfo;
-} VkVideoEncodeAV1DpbSlotInfoKHR;
-
-typedef struct VkVideoEncodeAV1ProfileInfoKHR {
-    VkStructureType       sType;
-    const void*           pNext;
-    StdVideoAV1Profile    stdProfile;
-} VkVideoEncodeAV1ProfileInfoKHR;
-
-typedef struct VkVideoEncodeAV1FrameSizeKHR {
-    uint32_t    intraFrameSize;
-    uint32_t    predictiveFrameSize;
-    uint32_t    bipredictiveFrameSize;
-} VkVideoEncodeAV1FrameSizeKHR;
-
-typedef struct VkVideoEncodeAV1GopRemainingFrameInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           useGopRemainingFrames;
-    uint32_t           gopRemainingIntra;
-    uint32_t           gopRemainingPredictive;
-    uint32_t           gopRemainingBipredictive;
-} VkVideoEncodeAV1GopRemainingFrameInfoKHR;
-
-typedef struct VkVideoEncodeAV1RateControlInfoKHR {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    VkVideoEncodeAV1RateControlFlagsKHR    flags;
-    uint32_t                               gopFrameCount;
-    uint32_t                               keyFramePeriod;
-    uint32_t                               consecutiveBipredictiveFrameCount;
-    uint32_t                               temporalLayerCount;
-} VkVideoEncodeAV1RateControlInfoKHR;
-
-typedef struct VkVideoEncodeAV1RateControlLayerInfoKHR {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    VkBool32                        useMinQIndex;
-    VkVideoEncodeAV1QIndexKHR       minQIndex;
-    VkBool32                        useMaxQIndex;
-    VkVideoEncodeAV1QIndexKHR       maxQIndex;
-    VkBool32                        useMaxFrameSize;
-    VkVideoEncodeAV1FrameSizeKHR    maxFrameSize;
-} VkVideoEncodeAV1RateControlLayerInfoKHR;
-
-
-
-// VK_KHR_video_decode_vp9 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_decode_vp9 1
-#include "vk_video/vulkan_video_codec_vp9std.h"
-#include "vk_video/vulkan_video_codec_vp9std_decode.h"
-#define VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR 3U
-#define VK_KHR_VIDEO_DECODE_VP9_SPEC_VERSION 1
-#define VK_KHR_VIDEO_DECODE_VP9_EXTENSION_NAME "VK_KHR_video_decode_vp9"
-typedef struct VkPhysicalDeviceVideoDecodeVP9FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoDecodeVP9;
-} VkPhysicalDeviceVideoDecodeVP9FeaturesKHR;
-
-typedef struct VkVideoDecodeVP9ProfileInfoKHR {
-    VkStructureType       sType;
-    const void*           pNext;
-    StdVideoVP9Profile    stdProfile;
-} VkVideoDecodeVP9ProfileInfoKHR;
-
-typedef struct VkVideoDecodeVP9CapabilitiesKHR {
-    VkStructureType     sType;
-    void*               pNext;
-    StdVideoVP9Level    maxLevel;
-} VkVideoDecodeVP9CapabilitiesKHR;
-
-typedef struct VkVideoDecodeVP9PictureInfoKHR {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    const StdVideoDecodeVP9PictureInfo*    pStdPictureInfo;
-    int32_t                                referenceNameSlotIndices[VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR];
-    uint32_t                               uncompressedHeaderOffset;
-    uint32_t                               compressedHeaderOffset;
-    uint32_t                               tilesOffset;
-} VkVideoDecodeVP9PictureInfoKHR;
-
-
-
 // VK_KHR_video_maintenance1 is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_video_maintenance1 1
 #define VK_KHR_VIDEO_MAINTENANCE_1_SPEC_VERSION 1
@@ -13303,13 +11421,31 @@ typedef struct VkVideoInlineQueryInfoKHR {
 #define VK_KHR_vertex_attribute_divisor 1
 #define VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 1
 #define VK_KHR_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_KHR_vertex_attribute_divisor"
-typedef VkPhysicalDeviceVertexAttributeDivisorProperties VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR;
+typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           maxVertexAttribDivisor;
+    VkBool32           supportsNonZeroFirstInstance;
+} VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR;
 
-typedef VkVertexInputBindingDivisorDescription VkVertexInputBindingDivisorDescriptionKHR;
+typedef struct VkVertexInputBindingDivisorDescriptionKHR {
+    uint32_t    binding;
+    uint32_t    divisor;
+} VkVertexInputBindingDivisorDescriptionKHR;
 
-typedef VkPipelineVertexInputDivisorStateCreateInfo VkPipelineVertexInputDivisorStateCreateInfoKHR;
+typedef struct VkPipelineVertexInputDivisorStateCreateInfoKHR {
+    VkStructureType                                     sType;
+    const void*                                         pNext;
+    uint32_t                                            vertexBindingDivisorCount;
+    const VkVertexInputBindingDivisorDescriptionKHR*    pVertexBindingDivisors;
+} VkPipelineVertexInputDivisorStateCreateInfoKHR;
 
-typedef VkPhysicalDeviceVertexAttributeDivisorFeatures VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR;
+typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           vertexAttributeInstanceRateDivisor;
+    VkBool32           vertexAttributeInstanceRateZeroDivisor;
+} VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR;
 
 
 
@@ -13319,30 +11455,15 @@ typedef VkPhysicalDeviceVertexAttributeDivisorFeatures VkPhysicalDeviceVertexAtt
 #define VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_KHR_load_store_op_none"
 
 
-// VK_KHR_unified_image_layouts is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_unified_image_layouts 1
-#define VK_KHR_UNIFIED_IMAGE_LAYOUTS_SPEC_VERSION 1
-#define VK_KHR_UNIFIED_IMAGE_LAYOUTS_EXTENSION_NAME "VK_KHR_unified_image_layouts"
-typedef struct VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           unifiedImageLayouts;
-    VkBool32           unifiedImageLayoutsVideo;
-} VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-
-typedef struct VkAttachmentFeedbackLoopInfoEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           feedbackLoopEnable;
-} VkAttachmentFeedbackLoopInfoEXT;
-
-
-
 // VK_KHR_shader_float_controls2 is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_shader_float_controls2 1
 #define VK_KHR_SHADER_FLOAT_CONTROLS_2_SPEC_VERSION 1
 #define VK_KHR_SHADER_FLOAT_CONTROLS_2_EXTENSION_NAME "VK_KHR_shader_float_controls2"
-typedef VkPhysicalDeviceShaderFloatControls2Features VkPhysicalDeviceShaderFloatControls2FeaturesKHR;
+typedef struct VkPhysicalDeviceShaderFloatControls2FeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderFloatControls2;
+} VkPhysicalDeviceShaderFloatControls2FeaturesKHR;
 
 
 
@@ -13350,7 +11471,11 @@ typedef VkPhysicalDeviceShaderFloatControls2Features VkPhysicalDeviceShaderFloat
 #define VK_KHR_index_type_uint8 1
 #define VK_KHR_INDEX_TYPE_UINT8_SPEC_VERSION 1
 #define VK_KHR_INDEX_TYPE_UINT8_EXTENSION_NAME "VK_KHR_index_type_uint8"
-typedef VkPhysicalDeviceIndexTypeUint8Features VkPhysicalDeviceIndexTypeUint8FeaturesKHR;
+typedef struct VkPhysicalDeviceIndexTypeUint8FeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           indexTypeUint8;
+} VkPhysicalDeviceIndexTypeUint8FeaturesKHR;
 
 
 
@@ -13358,24 +11483,52 @@ typedef VkPhysicalDeviceIndexTypeUint8Features VkPhysicalDeviceIndexTypeUint8Fea
 #define VK_KHR_line_rasterization 1
 #define VK_KHR_LINE_RASTERIZATION_SPEC_VERSION 1
 #define VK_KHR_LINE_RASTERIZATION_EXTENSION_NAME "VK_KHR_line_rasterization"
-typedef VkLineRasterizationMode VkLineRasterizationModeKHR;
 
-typedef VkPhysicalDeviceLineRasterizationFeatures VkPhysicalDeviceLineRasterizationFeaturesKHR;
+typedef enum VkLineRasterizationModeKHR {
+    VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR = 0,
+    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR = 1,
+    VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR = 2,
+    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR = 3,
+    VK_LINE_RASTERIZATION_MODE_DEFAULT_EXT = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR,
+    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR,
+    VK_LINE_RASTERIZATION_MODE_BRESENHAM_EXT = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR,
+    VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_EXT = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR,
+    VK_LINE_RASTERIZATION_MODE_MAX_ENUM_KHR = 0x7FFFFFFF
+} VkLineRasterizationModeKHR;
+typedef struct VkPhysicalDeviceLineRasterizationFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           rectangularLines;
+    VkBool32           bresenhamLines;
+    VkBool32           smoothLines;
+    VkBool32           stippledRectangularLines;
+    VkBool32           stippledBresenhamLines;
+    VkBool32           stippledSmoothLines;
+} VkPhysicalDeviceLineRasterizationFeaturesKHR;
 
-typedef VkPhysicalDeviceLineRasterizationProperties VkPhysicalDeviceLineRasterizationPropertiesKHR;
+typedef struct VkPhysicalDeviceLineRasterizationPropertiesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           lineSubPixelPrecisionBits;
+} VkPhysicalDeviceLineRasterizationPropertiesKHR;
 
-typedef VkPipelineRasterizationLineStateCreateInfo VkPipelineRasterizationLineStateCreateInfoKHR;
+typedef struct VkPipelineRasterizationLineStateCreateInfoKHR {
+    VkStructureType               sType;
+    const void*                   pNext;
+    VkLineRasterizationModeKHR    lineRasterizationMode;
+    VkBool32                      stippledLineEnable;
+    uint32_t                      lineStippleFactor;
+    uint16_t                      lineStipplePattern;
+} VkPipelineRasterizationLineStateCreateInfoKHR;
 
 typedef void (VKAPI_PTR *PFN_vkCmdSetLineStippleKHR)(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLineStippleKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    lineStippleFactor,
     uint16_t                                    lineStipplePattern);
 #endif
-#endif
 
 
 // VK_KHR_calibrated_timestamps is a preprocessor guard. Do not pass it to API calls.
@@ -13388,8 +11541,6 @@ typedef enum VkTimeDomainKHR {
     VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR = 1,
     VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR = 2,
     VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR = 3,
-    VK_TIME_DOMAIN_PRESENT_STAGE_LOCAL_EXT = 1000208000,
-    VK_TIME_DOMAIN_SWAPCHAIN_LOCAL_EXT = 1000208001,
     VK_TIME_DOMAIN_DEVICE_EXT = VK_TIME_DOMAIN_DEVICE_KHR,
     VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT = VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR,
     VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT = VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR,
@@ -13406,14 +11557,11 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR)
 typedef VkResult (VKAPI_PTR *PFN_vkGetCalibratedTimestampsKHR)(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoKHR* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pTimeDomainCount,
     VkTimeDomainKHR*                            pTimeDomains);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsKHR(
     VkDevice                                    device,
     uint32_t                                    timestampCount,
@@ -13421,14 +11569,17 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsKHR(
     uint64_t*                                   pTimestamps,
     uint64_t*                                   pMaxDeviation);
 #endif
-#endif
 
 
 // VK_KHR_shader_expect_assume is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_shader_expect_assume 1
 #define VK_KHR_SHADER_EXPECT_ASSUME_SPEC_VERSION 1
 #define VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME "VK_KHR_shader_expect_assume"
-typedef VkPhysicalDeviceShaderExpectAssumeFeatures VkPhysicalDeviceShaderExpectAssumeFeaturesKHR;
+typedef struct VkPhysicalDeviceShaderExpectAssumeFeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           shaderExpectAssume;
+} VkPhysicalDeviceShaderExpectAssumeFeaturesKHR;
 
 
 
@@ -13436,19 +11587,66 @@ typedef VkPhysicalDeviceShaderExpectAssumeFeatures VkPhysicalDeviceShaderExpectA
 #define VK_KHR_maintenance6 1
 #define VK_KHR_MAINTENANCE_6_SPEC_VERSION 1
 #define VK_KHR_MAINTENANCE_6_EXTENSION_NAME "VK_KHR_maintenance6"
-typedef VkPhysicalDeviceMaintenance6Features VkPhysicalDeviceMaintenance6FeaturesKHR;
+typedef struct VkPhysicalDeviceMaintenance6FeaturesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           maintenance6;
+} VkPhysicalDeviceMaintenance6FeaturesKHR;
 
-typedef VkPhysicalDeviceMaintenance6Properties VkPhysicalDeviceMaintenance6PropertiesKHR;
+typedef struct VkPhysicalDeviceMaintenance6PropertiesKHR {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           blockTexelViewCompatibleMultipleLayers;
+    uint32_t           maxCombinedImageSamplerDescriptorCount;
+    VkBool32           fragmentShadingRateClampCombinerInputs;
+} VkPhysicalDeviceMaintenance6PropertiesKHR;
 
-typedef VkBindMemoryStatus VkBindMemoryStatusKHR;
+typedef struct VkBindMemoryStatusKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkResult*          pResult;
+} VkBindMemoryStatusKHR;
 
-typedef VkBindDescriptorSetsInfo VkBindDescriptorSetsInfoKHR;
+typedef struct VkBindDescriptorSetsInfoKHR {
+    VkStructureType           sType;
+    const void*               pNext;
+    VkShaderStageFlags        stageFlags;
+    VkPipelineLayout          layout;
+    uint32_t                  firstSet;
+    uint32_t                  descriptorSetCount;
+    const VkDescriptorSet*    pDescriptorSets;
+    uint32_t                  dynamicOffsetCount;
+    const uint32_t*           pDynamicOffsets;
+} VkBindDescriptorSetsInfoKHR;
 
-typedef VkPushConstantsInfo VkPushConstantsInfoKHR;
+typedef struct VkPushConstantsInfoKHR {
+    VkStructureType       sType;
+    const void*           pNext;
+    VkPipelineLayout      layout;
+    VkShaderStageFlags    stageFlags;
+    uint32_t              offset;
+    uint32_t              size;
+    const void*           pValues;
+} VkPushConstantsInfoKHR;
 
-typedef VkPushDescriptorSetInfo VkPushDescriptorSetInfoKHR;
+typedef struct VkPushDescriptorSetInfoKHR {
+    VkStructureType                sType;
+    const void*                    pNext;
+    VkShaderStageFlags             stageFlags;
+    VkPipelineLayout               layout;
+    uint32_t                       set;
+    uint32_t                       descriptorWriteCount;
+    const VkWriteDescriptorSet*    pDescriptorWrites;
+} VkPushDescriptorSetInfoKHR;
 
-typedef VkPushDescriptorSetWithTemplateInfo VkPushDescriptorSetWithTemplateInfoKHR;
+typedef struct VkPushDescriptorSetWithTemplateInfoKHR {
+    VkStructureType               sType;
+    const void*                   pNext;
+    VkDescriptorUpdateTemplate    descriptorUpdateTemplate;
+    VkPipelineLayout              layout;
+    uint32_t                      set;
+    const void*                   pData;
+} VkPushDescriptorSetWithTemplateInfoKHR;
 
 typedef struct VkSetDescriptorBufferOffsetsInfoEXT {
     VkStructureType        sType;
@@ -13469,534 +11667,38 @@ typedef struct VkBindDescriptorBufferEmbeddedSamplersInfoEXT {
     uint32_t              set;
 } VkBindDescriptorBufferEmbeddedSamplersInfoEXT;
 
-typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets2KHR)(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo*   pBindDescriptorSetsInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushConstants2KHR)(VkCommandBuffer commandBuffer, const VkPushConstantsInfo*        pPushConstantsInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSet2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo*    pPushDescriptorSetInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplate2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo* pPushDescriptorSetWithTemplateInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets2KHR)(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdPushConstants2KHR)(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSet2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo);
+typedef void (VKAPI_PTR *PFN_vkCmdPushDescriptorSetWithTemplate2KHR)(VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdSetDescriptorBufferOffsets2EXT)(VkCommandBuffer commandBuffer, const VkSetDescriptorBufferOffsetsInfoEXT* pSetDescriptorBufferOffsetsInfo);
 typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT)(VkCommandBuffer commandBuffer, const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets2KHR(
     VkCommandBuffer                             commandBuffer,
-    const VkBindDescriptorSetsInfo*             pBindDescriptorSetsInfo);
-#endif
+    const VkBindDescriptorSetsInfoKHR*          pBindDescriptorSetsInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPushConstants2KHR(
     VkCommandBuffer                             commandBuffer,
-    const VkPushConstantsInfo*                  pPushConstantsInfo);
-#endif
+    const VkPushConstantsInfoKHR*               pPushConstantsInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSet2KHR(
     VkCommandBuffer                             commandBuffer,
-    const VkPushDescriptorSetInfo*              pPushDescriptorSetInfo);
-#endif
+    const VkPushDescriptorSetInfoKHR*           pPushDescriptorSetInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplate2KHR(
     VkCommandBuffer                             commandBuffer,
-    const VkPushDescriptorSetWithTemplateInfo*  pPushDescriptorSetWithTemplateInfo);
-#endif
+    const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDescriptorBufferOffsets2EXT(
     VkCommandBuffer                             commandBuffer,
     const VkSetDescriptorBufferOffsetsInfoEXT*  pSetDescriptorBufferOffsetsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorBufferEmbeddedSamplers2EXT(
     VkCommandBuffer                             commandBuffer,
     const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo);
 #endif
-#endif
-
-
-// VK_KHR_copy_memory_indirect is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_copy_memory_indirect 1
-#define VK_KHR_COPY_MEMORY_INDIRECT_SPEC_VERSION 1
-#define VK_KHR_COPY_MEMORY_INDIRECT_EXTENSION_NAME "VK_KHR_copy_memory_indirect"
-
-typedef enum VkAddressCopyFlagBitsKHR {
-    VK_ADDRESS_COPY_DEVICE_LOCAL_BIT_KHR = 0x00000001,
-    VK_ADDRESS_COPY_SPARSE_BIT_KHR = 0x00000002,
-    VK_ADDRESS_COPY_PROTECTED_BIT_KHR = 0x00000004,
-    VK_ADDRESS_COPY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkAddressCopyFlagBitsKHR;
-typedef VkFlags VkAddressCopyFlagsKHR;
-typedef struct VkStridedDeviceAddressRangeKHR {
-    VkDeviceAddress    address;
-    VkDeviceSize       size;
-    VkDeviceSize       stride;
-} VkStridedDeviceAddressRangeKHR;
-
-typedef struct VkCopyMemoryIndirectCommandKHR {
-    VkDeviceAddress    srcAddress;
-    VkDeviceAddress    dstAddress;
-    VkDeviceSize       size;
-} VkCopyMemoryIndirectCommandKHR;
-
-typedef struct VkCopyMemoryIndirectInfoKHR {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkAddressCopyFlagsKHR             srcCopyFlags;
-    VkAddressCopyFlagsKHR             dstCopyFlags;
-    uint32_t                          copyCount;
-    VkStridedDeviceAddressRangeKHR    copyAddressRange;
-} VkCopyMemoryIndirectInfoKHR;
-
-typedef struct VkCopyMemoryToImageIndirectCommandKHR {
-    VkDeviceAddress             srcAddress;
-    uint32_t                    bufferRowLength;
-    uint32_t                    bufferImageHeight;
-    VkImageSubresourceLayers    imageSubresource;
-    VkOffset3D                  imageOffset;
-    VkExtent3D                  imageExtent;
-} VkCopyMemoryToImageIndirectCommandKHR;
-
-typedef struct VkCopyMemoryToImageIndirectInfoKHR {
-    VkStructureType                    sType;
-    const void*                        pNext;
-    VkAddressCopyFlagsKHR              srcCopyFlags;
-    uint32_t                           copyCount;
-    VkStridedDeviceAddressRangeKHR     copyAddressRange;
-    VkImage                            dstImage;
-    VkImageLayout                      dstImageLayout;
-    const VkImageSubresourceLayers*    pImageSubresources;
-} VkCopyMemoryToImageIndirectInfoKHR;
-
-typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           indirectMemoryCopy;
-    VkBool32           indirectMemoryToImageCopy;
-} VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-
-typedef struct VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkQueueFlags       supportedQueues;
-} VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-
-typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryIndirectKHR)(VkCommandBuffer commandBuffer, const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryToImageIndirectKHR)(VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryIndirectKHR(
-    VkCommandBuffer                             commandBuffer,
-    const VkCopyMemoryIndirectInfoKHR*          pCopyMemoryIndirectInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToImageIndirectKHR(
-    VkCommandBuffer                             commandBuffer,
-    const VkCopyMemoryToImageIndirectInfoKHR*   pCopyMemoryToImageIndirectInfo);
-#endif
-#endif
-
-
-// VK_KHR_video_encode_intra_refresh is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_encode_intra_refresh 1
-#define VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_SPEC_VERSION 1
-#define VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_EXTENSION_NAME "VK_KHR_video_encode_intra_refresh"
-
-typedef enum VkVideoEncodeIntraRefreshModeFlagBitsKHR {
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_NONE_KHR = 0,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_PER_PICTURE_PARTITION_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_BASED_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_ROW_BASED_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_COLUMN_BASED_BIT_KHR = 0x00000008,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeIntraRefreshModeFlagBitsKHR;
-typedef VkFlags VkVideoEncodeIntraRefreshModeFlagsKHR;
-typedef struct VkVideoEncodeIntraRefreshCapabilitiesKHR {
-    VkStructureType                          sType;
-    void*                                    pNext;
-    VkVideoEncodeIntraRefreshModeFlagsKHR    intraRefreshModes;
-    uint32_t                                 maxIntraRefreshCycleDuration;
-    uint32_t                                 maxIntraRefreshActiveReferencePictures;
-    VkBool32                                 partitionIndependentIntraRefreshRegions;
-    VkBool32                                 nonRectangularIntraRefreshRegions;
-} VkVideoEncodeIntraRefreshCapabilitiesKHR;
-
-typedef struct VkVideoEncodeSessionIntraRefreshCreateInfoKHR {
-    VkStructureType                             sType;
-    const void*                                 pNext;
-    VkVideoEncodeIntraRefreshModeFlagBitsKHR    intraRefreshMode;
-} VkVideoEncodeSessionIntraRefreshCreateInfoKHR;
-
-typedef struct VkVideoEncodeIntraRefreshInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           intraRefreshCycleDuration;
-    uint32_t           intraRefreshIndex;
-} VkVideoEncodeIntraRefreshInfoKHR;
-
-typedef struct VkVideoReferenceIntraRefreshInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           dirtyIntraRefreshRegions;
-} VkVideoReferenceIntraRefreshInfoKHR;
-
-typedef struct VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeIntraRefresh;
-} VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-
-
-
-// VK_KHR_video_encode_quantization_map is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_encode_quantization_map 1
-#define VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_SPEC_VERSION 2
-#define VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_EXTENSION_NAME "VK_KHR_video_encode_quantization_map"
-typedef struct VkVideoEncodeQuantizationMapCapabilitiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkExtent2D         maxQuantizationMapExtent;
-} VkVideoEncodeQuantizationMapCapabilitiesKHR;
-
-typedef struct VkVideoFormatQuantizationMapPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkExtent2D         quantizationMapTexelSize;
-} VkVideoFormatQuantizationMapPropertiesKHR;
-
-typedef struct VkVideoEncodeQuantizationMapInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkImageView        quantizationMap;
-    VkExtent2D         quantizationMapExtent;
-} VkVideoEncodeQuantizationMapInfoKHR;
-
-typedef struct VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkExtent2D         quantizationMapTexelSize;
-} VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-
-typedef struct VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeQuantizationMap;
-} VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-
-typedef struct VkVideoEncodeH264QuantizationMapCapabilitiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    int32_t            minQpDelta;
-    int32_t            maxQpDelta;
-} VkVideoEncodeH264QuantizationMapCapabilitiesKHR;
-
-typedef struct VkVideoEncodeH265QuantizationMapCapabilitiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    int32_t            minQpDelta;
-    int32_t            maxQpDelta;
-} VkVideoEncodeH265QuantizationMapCapabilitiesKHR;
-
-typedef struct VkVideoFormatH265QuantizationMapPropertiesKHR {
-    VkStructureType                     sType;
-    void*                               pNext;
-    VkVideoEncodeH265CtbSizeFlagsKHR    compatibleCtbSizes;
-} VkVideoFormatH265QuantizationMapPropertiesKHR;
-
-typedef struct VkVideoEncodeAV1QuantizationMapCapabilitiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    int32_t            minQIndexDelta;
-    int32_t            maxQIndexDelta;
-} VkVideoEncodeAV1QuantizationMapCapabilitiesKHR;
-
-typedef struct VkVideoFormatAV1QuantizationMapPropertiesKHR {
-    VkStructureType                           sType;
-    void*                                     pNext;
-    VkVideoEncodeAV1SuperblockSizeFlagsKHR    compatibleSuperblockSizes;
-} VkVideoFormatAV1QuantizationMapPropertiesKHR;
-
-
-
-// VK_KHR_shader_relaxed_extended_instruction is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_relaxed_extended_instruction 1
-#define VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_SPEC_VERSION 1
-#define VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME "VK_KHR_shader_relaxed_extended_instruction"
-typedef struct VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderRelaxedExtendedInstruction;
-} VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-
-
-
-// VK_KHR_maintenance7 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_maintenance7 1
-#define VK_KHR_MAINTENANCE_7_SPEC_VERSION 1
-#define VK_KHR_MAINTENANCE_7_EXTENSION_NAME "VK_KHR_maintenance7"
-
-typedef enum VkPhysicalDeviceLayeredApiKHR {
-    VK_PHYSICAL_DEVICE_LAYERED_API_VULKAN_KHR = 0,
-    VK_PHYSICAL_DEVICE_LAYERED_API_D3D12_KHR = 1,
-    VK_PHYSICAL_DEVICE_LAYERED_API_METAL_KHR = 2,
-    VK_PHYSICAL_DEVICE_LAYERED_API_OPENGL_KHR = 3,
-    VK_PHYSICAL_DEVICE_LAYERED_API_OPENGLES_KHR = 4,
-    VK_PHYSICAL_DEVICE_LAYERED_API_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkPhysicalDeviceLayeredApiKHR;
-typedef struct VkPhysicalDeviceMaintenance7FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance7;
-} VkPhysicalDeviceMaintenance7FeaturesKHR;
-
-typedef struct VkPhysicalDeviceMaintenance7PropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           robustFragmentShadingRateAttachmentAccess;
-    VkBool32           separateDepthStencilAttachmentAccess;
-    uint32_t           maxDescriptorSetTotalUniformBuffersDynamic;
-    uint32_t           maxDescriptorSetTotalStorageBuffersDynamic;
-    uint32_t           maxDescriptorSetTotalBuffersDynamic;
-    uint32_t           maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic;
-    uint32_t           maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic;
-    uint32_t           maxDescriptorSetUpdateAfterBindTotalBuffersDynamic;
-} VkPhysicalDeviceMaintenance7PropertiesKHR;
-
-typedef struct VkPhysicalDeviceLayeredApiPropertiesKHR {
-    VkStructureType                  sType;
-    void*                            pNext;
-    uint32_t                         vendorID;
-    uint32_t                         deviceID;
-    VkPhysicalDeviceLayeredApiKHR    layeredAPI;
-    char                             deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE];
-} VkPhysicalDeviceLayeredApiPropertiesKHR;
-
-typedef struct VkPhysicalDeviceLayeredApiPropertiesListKHR {
-    VkStructureType                             sType;
-    void*                                       pNext;
-    uint32_t                                    layeredApiCount;
-    VkPhysicalDeviceLayeredApiPropertiesKHR*    pLayeredApis;
-} VkPhysicalDeviceLayeredApiPropertiesListKHR;
-
-typedef struct VkPhysicalDeviceLayeredApiVulkanPropertiesKHR {
-    VkStructureType                sType;
-    void*                          pNext;
-    VkPhysicalDeviceProperties2    properties;
-} VkPhysicalDeviceLayeredApiVulkanPropertiesKHR;
-
-
-
-// VK_KHR_maintenance8 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_maintenance8 1
-#define VK_KHR_MAINTENANCE_8_SPEC_VERSION 1
-#define VK_KHR_MAINTENANCE_8_EXTENSION_NAME "VK_KHR_maintenance8"
-typedef VkFlags64 VkAccessFlags3KHR;
-
-// Flag bits for VkAccessFlagBits3KHR
-typedef VkFlags64 VkAccessFlagBits3KHR;
-static const VkAccessFlagBits3KHR VK_ACCESS_3_NONE_KHR = 0ULL;
-
-typedef struct VkMemoryBarrierAccessFlags3KHR {
-    VkStructureType      sType;
-    const void*          pNext;
-    VkAccessFlags3KHR    srcAccessMask3;
-    VkAccessFlags3KHR    dstAccessMask3;
-} VkMemoryBarrierAccessFlags3KHR;
-
-typedef struct VkPhysicalDeviceMaintenance8FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance8;
-} VkPhysicalDeviceMaintenance8FeaturesKHR;
-
-
-
-// VK_KHR_shader_fma is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_fma 1
-#define VK_KHR_SHADER_FMA_SPEC_VERSION    1
-#define VK_KHR_SHADER_FMA_EXTENSION_NAME  "VK_KHR_shader_fma"
-typedef struct VkPhysicalDeviceShaderFmaFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderFmaFloat16;
-    VkBool32           shaderFmaFloat32;
-    VkBool32           shaderFmaFloat64;
-} VkPhysicalDeviceShaderFmaFeaturesKHR;
-
-
-
-// VK_KHR_maintenance9 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_maintenance9 1
-#define VK_KHR_MAINTENANCE_9_SPEC_VERSION 1
-#define VK_KHR_MAINTENANCE_9_EXTENSION_NAME "VK_KHR_maintenance9"
-
-typedef enum VkDefaultVertexAttributeValueKHR {
-    VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ZERO_KHR = 0,
-    VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ONE_KHR = 1,
-    VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkDefaultVertexAttributeValueKHR;
-typedef struct VkPhysicalDeviceMaintenance9FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance9;
-} VkPhysicalDeviceMaintenance9FeaturesKHR;
-
-typedef struct VkPhysicalDeviceMaintenance9PropertiesKHR {
-    VkStructureType                     sType;
-    void*                               pNext;
-    VkBool32                            image2DViewOf3DSparse;
-    VkDefaultVertexAttributeValueKHR    defaultVertexAttributeValue;
-} VkPhysicalDeviceMaintenance9PropertiesKHR;
-
-typedef struct VkQueueFamilyOwnershipTransferPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           optimalImageTransferToQueueFamilies;
-} VkQueueFamilyOwnershipTransferPropertiesKHR;
-
-
-
-// VK_KHR_video_maintenance2 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_maintenance2 1
-#define VK_KHR_VIDEO_MAINTENANCE_2_SPEC_VERSION 1
-#define VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME "VK_KHR_video_maintenance2"
-typedef struct VkPhysicalDeviceVideoMaintenance2FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoMaintenance2;
-} VkPhysicalDeviceVideoMaintenance2FeaturesKHR;
-
-typedef struct VkVideoDecodeH264InlineSessionParametersInfoKHR {
-    VkStructureType                            sType;
-    const void*                                pNext;
-    const StdVideoH264SequenceParameterSet*    pStdSPS;
-    const StdVideoH264PictureParameterSet*     pStdPPS;
-} VkVideoDecodeH264InlineSessionParametersInfoKHR;
-
-typedef struct VkVideoDecodeH265InlineSessionParametersInfoKHR {
-    VkStructureType                            sType;
-    const void*                                pNext;
-    const StdVideoH265VideoParameterSet*       pStdVPS;
-    const StdVideoH265SequenceParameterSet*    pStdSPS;
-    const StdVideoH265PictureParameterSet*     pStdPPS;
-} VkVideoDecodeH265InlineSessionParametersInfoKHR;
-
-typedef struct VkVideoDecodeAV1InlineSessionParametersInfoKHR {
-    VkStructureType                     sType;
-    const void*                         pNext;
-    const StdVideoAV1SequenceHeader*    pStdSequenceHeader;
-} VkVideoDecodeAV1InlineSessionParametersInfoKHR;
-
-
-
-// VK_KHR_depth_clamp_zero_one is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_depth_clamp_zero_one 1
-#define VK_KHR_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION 1
-#define VK_KHR_DEPTH_CLAMP_ZERO_ONE_EXTENSION_NAME "VK_KHR_depth_clamp_zero_one"
-typedef struct VkPhysicalDeviceDepthClampZeroOneFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           depthClampZeroOne;
-} VkPhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-
-
-// VK_KHR_robustness2 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_robustness2 1
-#define VK_KHR_ROBUSTNESS_2_SPEC_VERSION  1
-#define VK_KHR_ROBUSTNESS_2_EXTENSION_NAME "VK_KHR_robustness2"
-typedef struct VkPhysicalDeviceRobustness2FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           robustBufferAccess2;
-    VkBool32           robustImageAccess2;
-    VkBool32           nullDescriptor;
-} VkPhysicalDeviceRobustness2FeaturesKHR;
-
-typedef struct VkPhysicalDeviceRobustness2PropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       robustStorageBufferAccessSizeAlignment;
-    VkDeviceSize       robustUniformBufferAccessSizeAlignment;
-} VkPhysicalDeviceRobustness2PropertiesKHR;
-
-
-
-// VK_KHR_present_mode_fifo_latest_ready is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_present_mode_fifo_latest_ready 1
-#define VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION 1
-#define VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME "VK_KHR_present_mode_fifo_latest_ready"
-typedef struct VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentModeFifoLatestReady;
-} VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-
-
-// VK_KHR_maintenance10 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_maintenance10 1
-#define VK_KHR_MAINTENANCE_10_SPEC_VERSION 1
-#define VK_KHR_MAINTENANCE_10_EXTENSION_NAME "VK_KHR_maintenance10"
-
-typedef enum VkRenderingAttachmentFlagBitsKHR {
-    VK_RENDERING_ATTACHMENT_INPUT_ATTACHMENT_FEEDBACK_BIT_KHR = 0x00000001,
-    VK_RENDERING_ATTACHMENT_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR = 0x00000002,
-    VK_RENDERING_ATTACHMENT_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR = 0x00000004,
-    VK_RENDERING_ATTACHMENT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkRenderingAttachmentFlagBitsKHR;
-typedef VkFlags VkRenderingAttachmentFlagsKHR;
-
-typedef enum VkResolveImageFlagBitsKHR {
-    VK_RESOLVE_IMAGE_SKIP_TRANSFER_FUNCTION_BIT_KHR = 0x00000001,
-    VK_RESOLVE_IMAGE_ENABLE_TRANSFER_FUNCTION_BIT_KHR = 0x00000002,
-    VK_RESOLVE_IMAGE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkResolveImageFlagBitsKHR;
-typedef VkFlags VkResolveImageFlagsKHR;
-typedef struct VkPhysicalDeviceMaintenance10FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           maintenance10;
-} VkPhysicalDeviceMaintenance10FeaturesKHR;
-
-typedef struct VkPhysicalDeviceMaintenance10PropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           rgba4OpaqueBlackSwizzled;
-    VkBool32           resolveSrgbFormatAppliesTransferFunction;
-    VkBool32           resolveSrgbFormatSupportsTransferFunctionControl;
-} VkPhysicalDeviceMaintenance10PropertiesKHR;
-
-typedef struct VkRenderingEndInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-} VkRenderingEndInfoKHR;
-
-typedef struct VkRenderingAttachmentFlagsInfoKHR {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkRenderingAttachmentFlagsKHR    flags;
-} VkRenderingAttachmentFlagsInfoKHR;
-
-typedef struct VkResolveImageModeInfoKHR {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkResolveImageFlagsKHR    flags;
-    VkResolveModeFlagBits     resolveMode;
-    VkResolveModeFlagBits     stencilResolveMode;
-} VkResolveImageModeInfoKHR;
-
-typedef void (VKAPI_PTR *PFN_vkCmdEndRendering2KHR)(VkCommandBuffer                   commandBuffer, const VkRenderingEndInfoKHR*        pRenderingEndInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdEndRendering2KHR(
-    VkCommandBuffer                             commandBuffer,
-    const VkRenderingEndInfoKHR*                pRenderingEndInfo);
-#endif
-#endif
 
 
 // VK_EXT_debug_report is a preprocessor guard. Do not pass it to API calls.
@@ -14047,9 +11749,7 @@ typedef enum VkDebugReportObjectTypeEXT {
     VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT = 1000307000,
     VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT = 1000307001,
     VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT = 1000366000,
-  // VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT is a legacy alias
     VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT,
-  // VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT is a legacy alias
     VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT,
     VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT,
     VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT,
@@ -14088,22 +11788,17 @@ typedef void (VKAPI_PTR *PFN_vkDestroyDebugReportCallbackEXT)(VkInstance instanc
 typedef void (VKAPI_PTR *PFN_vkDebugReportMessageEXT)(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDebugReportCallbackEXT(
     VkInstance                                  instance,
     const VkDebugReportCallbackCreateInfoEXT*   pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkDebugReportCallbackEXT*                   pCallback);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyDebugReportCallbackEXT(
     VkInstance                                  instance,
     VkDebugReportCallbackEXT                    callback,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
     VkInstance                                  instance,
     VkDebugReportFlagsEXT                       flags,
@@ -14114,7 +11809,6 @@ VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
     const char*                                 pLayerPrefix,
     const char*                                 pMessage);
 #endif
-#endif
 
 
 // VK_NV_glsl_shader is a preprocessor guard. Do not pass it to API calls.
@@ -14201,35 +11895,25 @@ typedef void (VKAPI_PTR *PFN_vkCmdDebugMarkerEndEXT)(VkCommandBuffer commandBuff
 typedef void (VKAPI_PTR *PFN_vkCmdDebugMarkerInsertEXT)(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkDebugMarkerSetObjectTagEXT(
     VkDevice                                    device,
     const VkDebugMarkerObjectTagInfoEXT*        pTagInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkDebugMarkerSetObjectNameEXT(
     VkDevice                                    device,
     const VkDebugMarkerObjectNameInfoEXT*       pNameInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDebugMarkerBeginEXT(
     VkCommandBuffer                             commandBuffer,
     const VkDebugMarkerMarkerInfoEXT*           pMarkerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDebugMarkerEndEXT(
     VkCommandBuffer                             commandBuffer);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDebugMarkerInsertEXT(
     VkCommandBuffer                             commandBuffer,
     const VkDebugMarkerMarkerInfoEXT*           pMarkerInfo);
 #endif
-#endif
 
 
 // VK_AMD_gcn_shader is a preprocessor guard. Do not pass it to API calls.
@@ -14305,7 +11989,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdEndQueryIndexedEXT)(VkCommandBuffer commandBuf
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectByteCountEXT)(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindTransformFeedbackBuffersEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstBinding,
@@ -14313,44 +11996,34 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBindTransformFeedbackBuffersEXT(
     const VkBuffer*                             pBuffers,
     const VkDeviceSize*                         pOffsets,
     const VkDeviceSize*                         pSizes);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginTransformFeedbackEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstCounterBuffer,
     uint32_t                                    counterBufferCount,
     const VkBuffer*                             pCounterBuffers,
     const VkDeviceSize*                         pCounterBufferOffsets);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndTransformFeedbackEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstCounterBuffer,
     uint32_t                                    counterBufferCount,
     const VkBuffer*                             pCounterBuffers,
     const VkDeviceSize*                         pCounterBufferOffsets);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginQueryIndexedEXT(
     VkCommandBuffer                             commandBuffer,
     VkQueryPool                                 queryPool,
     uint32_t                                    query,
     VkQueryControlFlags                         flags,
     uint32_t                                    index);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndQueryIndexedEXT(
     VkCommandBuffer                             commandBuffer,
     VkQueryPool                                 queryPool,
     uint32_t                                    query,
     uint32_t                                    index);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectByteCountEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    instanceCount,
@@ -14360,14 +12033,13 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectByteCountEXT(
     uint32_t                                    counterOffset,
     uint32_t                                    vertexStride);
 #endif
-#endif
 
 
 // VK_NVX_binary_import is a preprocessor guard. Do not pass it to API calls.
 #define VK_NVX_binary_import 1
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCuModuleNVX)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCuFunctionNVX)
-#define VK_NVX_BINARY_IMPORT_SPEC_VERSION 2
+#define VK_NVX_BINARY_IMPORT_SPEC_VERSION 1
 #define VK_NVX_BINARY_IMPORT_EXTENSION_NAME "VK_NVX_binary_import"
 typedef struct VkCuModuleCreateInfoNVX {
     VkStructureType    sType;
@@ -14376,12 +12048,6 @@ typedef struct VkCuModuleCreateInfoNVX {
     const void*        pData;
 } VkCuModuleCreateInfoNVX;
 
-typedef struct VkCuModuleTexturingModeCreateInfoNVX {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           use64bitTexturing;
-} VkCuModuleTexturingModeCreateInfoNVX;
-
 typedef struct VkCuFunctionCreateInfoNVX {
     VkStructureType    sType;
     const void*        pNext;
@@ -14413,47 +12079,37 @@ typedef void (VKAPI_PTR *PFN_vkDestroyCuFunctionNVX)(VkDevice device, VkCuFuncti
 typedef void (VKAPI_PTR *PFN_vkCmdCuLaunchKernelNVX)(VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX* pLaunchInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateCuModuleNVX(
     VkDevice                                    device,
     const VkCuModuleCreateInfoNVX*              pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkCuModuleNVX*                              pModule);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateCuFunctionNVX(
     VkDevice                                    device,
     const VkCuFunctionCreateInfoNVX*            pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkCuFunctionNVX*                            pFunction);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyCuModuleNVX(
     VkDevice                                    device,
     VkCuModuleNVX                               module,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyCuFunctionNVX(
     VkDevice                                    device,
     VkCuFunctionNVX                             function,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCuLaunchKernelNVX(
     VkCommandBuffer                             commandBuffer,
     const VkCuLaunchInfoNVX*                    pLaunchInfo);
 #endif
-#endif
 
 
 // VK_NVX_image_view_handle is a preprocessor guard. Do not pass it to API calls.
 #define VK_NVX_image_view_handle 1
-#define VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION 3
+#define VK_NVX_IMAGE_VIEW_HANDLE_SPEC_VERSION 2
 #define VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME "VK_NVX_image_view_handle"
 typedef struct VkImageViewHandleInfoNVX {
     VkStructureType     sType;
@@ -14471,29 +12127,18 @@ typedef struct VkImageViewAddressPropertiesNVX {
 } VkImageViewAddressPropertiesNVX;
 
 typedef uint32_t (VKAPI_PTR *PFN_vkGetImageViewHandleNVX)(VkDevice device, const VkImageViewHandleInfoNVX* pInfo);
-typedef uint64_t (VKAPI_PTR *PFN_vkGetImageViewHandle64NVX)(VkDevice device, const VkImageViewHandleInfoNVX* pInfo);
 typedef VkResult (VKAPI_PTR *PFN_vkGetImageViewAddressNVX)(VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR uint32_t VKAPI_CALL vkGetImageViewHandleNVX(
     VkDevice                                    device,
     const VkImageViewHandleInfoNVX*             pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR uint64_t VKAPI_CALL vkGetImageViewHandle64NVX(
-    VkDevice                                    device,
-    const VkImageViewHandleInfoNVX*             pInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetImageViewAddressNVX(
     VkDevice                                    device,
     VkImageView                                 imageView,
     VkImageViewAddressPropertiesNVX*            pProperties);
 #endif
-#endif
 
 
 // VK_AMD_draw_indirect_count is a preprocessor guard. Do not pass it to API calls.
@@ -14504,7 +12149,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountAMD)(VkCommandBuffer commandB
 typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountAMD(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -14513,9 +12157,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirectCountAMD(
     VkDeviceSize                                countBufferOffset,
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountAMD(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -14525,7 +12167,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirectCountAMD(
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
 #endif
-#endif
 
 
 // VK_AMD_negative_viewport_height is a preprocessor guard. Do not pass it to API calls.
@@ -14590,7 +12231,6 @@ typedef struct VkShaderStatisticsInfoAMD {
 typedef VkResult (VKAPI_PTR *PFN_vkGetShaderInfoAMD)(VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, size_t* pInfoSize, void* pInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetShaderInfoAMD(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
@@ -14599,7 +12239,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetShaderInfoAMD(
     size_t*                                     pInfoSize,
     void*                                       pInfo);
 #endif
-#endif
 
 
 // VK_AMD_shader_image_load_store_lod is a preprocessor guard. Do not pass it to API calls.
@@ -14657,7 +12296,6 @@ typedef struct VkExternalImageFormatPropertiesNV {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkExternalMemoryHandleTypeFlagsNV externalHandleType, VkExternalImageFormatPropertiesNV* pExternalImageFormatProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
     VkPhysicalDevice                            physicalDevice,
     VkFormat                                    format,
@@ -14668,7 +12306,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceExternalImageFormatPropertiesN
     VkExternalMemoryHandleTypeFlagsNV           externalHandleType,
     VkExternalImageFormatPropertiesNV*          pExternalImageFormatProperties);
 #endif
-#endif
 
 
 // VK_NV_external_memory is a preprocessor guard. Do not pass it to API calls.
@@ -14750,15 +12387,45 @@ typedef struct VkPhysicalDeviceASTCDecodeFeaturesEXT {
 #define VK_EXT_pipeline_robustness 1
 #define VK_EXT_PIPELINE_ROBUSTNESS_SPEC_VERSION 1
 #define VK_EXT_PIPELINE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_pipeline_robustness"
-typedef VkPipelineRobustnessBufferBehavior VkPipelineRobustnessBufferBehaviorEXT;
 
-typedef VkPipelineRobustnessImageBehavior VkPipelineRobustnessImageBehaviorEXT;
+typedef enum VkPipelineRobustnessBufferBehaviorEXT {
+    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT = 0,
+    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT = 1,
+    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT = 2,
+    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT = 3,
+    VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPipelineRobustnessBufferBehaviorEXT;
 
-typedef VkPhysicalDevicePipelineRobustnessFeatures VkPhysicalDevicePipelineRobustnessFeaturesEXT;
+typedef enum VkPipelineRobustnessImageBehaviorEXT {
+    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT = 0,
+    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED_EXT = 1,
+    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT = 2,
+    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT = 3,
+    VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPipelineRobustnessImageBehaviorEXT;
+typedef struct VkPhysicalDevicePipelineRobustnessFeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           pipelineRobustness;
+} VkPhysicalDevicePipelineRobustnessFeaturesEXT;
 
-typedef VkPhysicalDevicePipelineRobustnessProperties VkPhysicalDevicePipelineRobustnessPropertiesEXT;
+typedef struct VkPhysicalDevicePipelineRobustnessPropertiesEXT {
+    VkStructureType                          sType;
+    void*                                    pNext;
+    VkPipelineRobustnessBufferBehaviorEXT    defaultRobustnessStorageBuffers;
+    VkPipelineRobustnessBufferBehaviorEXT    defaultRobustnessUniformBuffers;
+    VkPipelineRobustnessBufferBehaviorEXT    defaultRobustnessVertexInputs;
+    VkPipelineRobustnessImageBehaviorEXT     defaultRobustnessImages;
+} VkPhysicalDevicePipelineRobustnessPropertiesEXT;
 
-typedef VkPipelineRobustnessCreateInfo VkPipelineRobustnessCreateInfoEXT;
+typedef struct VkPipelineRobustnessCreateInfoEXT {
+    VkStructureType                          sType;
+    const void*                              pNext;
+    VkPipelineRobustnessBufferBehaviorEXT    storageBuffers;
+    VkPipelineRobustnessBufferBehaviorEXT    uniformBuffers;
+    VkPipelineRobustnessBufferBehaviorEXT    vertexInputs;
+    VkPipelineRobustnessImageBehaviorEXT     images;
+} VkPipelineRobustnessCreateInfoEXT;
 
 
 
@@ -14797,17 +12464,13 @@ typedef void (VKAPI_PTR *PFN_vkCmdBeginConditionalRenderingEXT)(VkCommandBuffer
 typedef void (VKAPI_PTR *PFN_vkCmdEndConditionalRenderingEXT)(VkCommandBuffer commandBuffer);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginConditionalRenderingEXT(
     VkCommandBuffer                             commandBuffer,
     const VkConditionalRenderingBeginInfoEXT*   pConditionalRenderingBegin);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndConditionalRenderingEXT(
     VkCommandBuffer                             commandBuffer);
 #endif
-#endif
 
 
 // VK_NV_clip_space_w_scaling is a preprocessor guard. Do not pass it to API calls.
@@ -14830,14 +12493,12 @@ typedef struct VkPipelineViewportWScalingStateCreateInfoNV {
 typedef void (VKAPI_PTR *PFN_vkCmdSetViewportWScalingNV)(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWScalingNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstViewport,
     uint32_t                                    viewportCount,
     const VkViewportWScalingNV*                 pViewportWScalings);
 #endif
-#endif
 
 
 // VK_EXT_direct_mode_display is a preprocessor guard. Do not pass it to API calls.
@@ -14847,12 +12508,10 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWScalingNV(
 typedef VkResult (VKAPI_PTR *PFN_vkReleaseDisplayEXT)(VkPhysicalDevice physicalDevice, VkDisplayKHR display);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkReleaseDisplayEXT(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayKHR                                display);
 #endif
-#endif
 
 
 // VK_EXT_display_surface_counter is a preprocessor guard. Do not pass it to API calls.
@@ -14862,7 +12521,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkReleaseDisplayEXT(
 
 typedef enum VkSurfaceCounterFlagBitsEXT {
     VK_SURFACE_COUNTER_VBLANK_BIT_EXT = 0x00000001,
-  // VK_SURFACE_COUNTER_VBLANK_EXT is a legacy alias
     VK_SURFACE_COUNTER_VBLANK_EXT = VK_SURFACE_COUNTER_VBLANK_BIT_EXT,
     VK_SURFACE_COUNTER_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkSurfaceCounterFlagBitsEXT;
@@ -14886,13 +12544,11 @@ typedef struct VkSurfaceCapabilities2EXT {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT)(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilities2EXT* pSurfaceCapabilities);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2EXT(
     VkPhysicalDevice                            physicalDevice,
     VkSurfaceKHR                                surface,
     VkSurfaceCapabilities2EXT*                  pSurfaceCapabilities);
 #endif
-#endif
 
 
 // VK_EXT_display_control is a preprocessor guard. Do not pass it to API calls.
@@ -14946,38 +12602,30 @@ typedef VkResult (VKAPI_PTR *PFN_vkRegisterDisplayEventEXT)(VkDevice device, VkD
 typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainCounterEXT)(VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* pCounterValue);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkDisplayPowerControlEXT(
     VkDevice                                    device,
     VkDisplayKHR                                display,
     const VkDisplayPowerInfoEXT*                pDisplayPowerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkRegisterDeviceEventEXT(
     VkDevice                                    device,
     const VkDeviceEventInfoEXT*                 pDeviceEventInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkFence*                                    pFence);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkRegisterDisplayEventEXT(
     VkDevice                                    device,
     VkDisplayKHR                                display,
     const VkDisplayEventInfoEXT*                pDisplayEventInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkFence*                                    pFence);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainCounterEXT(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     VkSurfaceCounterFlagBitsEXT                 counter,
     uint64_t*                                   pCounterValue);
 #endif
-#endif
 
 
 // VK_GOOGLE_display_timing is a preprocessor guard. Do not pass it to API calls.
@@ -15012,21 +12660,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetRefreshCycleDurationGOOGLE)(VkDevice devic
 typedef VkResult (VKAPI_PTR *PFN_vkGetPastPresentationTimingGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetRefreshCycleDurationGOOGLE(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     VkRefreshCycleDurationGOOGLE*               pDisplayTimingProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     uint32_t*                                   pPresentationTimingCount,
     VkPastPresentationTimingGOOGLE*             pPresentationTimings);
 #endif
-#endif
 
 
 // VK_NV_sample_mask_override_coverage is a preprocessor guard. Do not pass it to API calls.
@@ -15045,9 +12689,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE(
 #define VK_NV_viewport_array2 1
 #define VK_NV_VIEWPORT_ARRAY_2_SPEC_VERSION 1
 #define VK_NV_VIEWPORT_ARRAY_2_EXTENSION_NAME "VK_NV_viewport_array2"
-// VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION is a legacy alias
 #define VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION VK_NV_VIEWPORT_ARRAY_2_SPEC_VERSION
-// VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME is a legacy alias
 #define VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME VK_NV_VIEWPORT_ARRAY_2_EXTENSION_NAME
 
 
@@ -15061,13 +12703,6 @@ typedef struct VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX {
     VkBool32           perViewPositionAllComponents;
 } VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
 
-typedef struct VkMultiviewPerViewAttributesInfoNVX {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           perViewAttributes;
-    VkBool32           perViewAttributesPositionXOnly;
-} VkMultiviewPerViewAttributesInfoNVX;
-
 
 
 // VK_NV_viewport_swizzle is a preprocessor guard. Do not pass it to API calls.
@@ -15135,26 +12770,20 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetDiscardRectangleEnableEXT)(VkCommandBuffer
 typedef void (VKAPI_PTR *PFN_vkCmdSetDiscardRectangleModeEXT)(VkCommandBuffer commandBuffer, VkDiscardRectangleModeEXT discardRectangleMode);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstDiscardRectangle,
     uint32_t                                    discardRectangleCount,
     const VkRect2D*                             pDiscardRectangles);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    discardRectangleEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkDiscardRectangleModeEXT                   discardRectangleMode);
 #endif
-#endif
 
 
 // VK_EXT_conservative_rasterization is a preprocessor guard. Do not pass it to API calls.
@@ -15215,13 +12844,13 @@ typedef struct VkPipelineRasterizationDepthClipStateCreateInfoEXT {
 
 // VK_EXT_swapchain_colorspace is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_swapchain_colorspace 1
-#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 5
+#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 4
 #define VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace"
 
 
 // VK_EXT_hdr_metadata is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_hdr_metadata 1
-#define VK_EXT_HDR_METADATA_SPEC_VERSION  3
+#define VK_EXT_HDR_METADATA_SPEC_VERSION  2
 #define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"
 typedef struct VkXYColorEXT {
     float    x;
@@ -15244,14 +12873,12 @@ typedef struct VkHdrMetadataEXT {
 typedef void (VKAPI_PTR *PFN_vkSetHdrMetadataEXT)(VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkSetHdrMetadataEXT(
     VkDevice                                    device,
     uint32_t                                    swapchainCount,
     const VkSwapchainKHR*                       pSwapchains,
     const VkHdrMetadataEXT*                     pMetadata);
 #endif
-#endif
 
 
 // VK_IMG_relaxed_line_rasterization is a preprocessor guard. Do not pass it to API calls.
@@ -15373,75 +13000,53 @@ typedef void (VKAPI_PTR *PFN_vkDestroyDebugUtilsMessengerEXT)(VkInstance instanc
 typedef void (VKAPI_PTR *PFN_vkSubmitDebugUtilsMessageEXT)(VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetDebugUtilsObjectNameEXT(
     VkDevice                                    device,
     const VkDebugUtilsObjectNameInfoEXT*        pNameInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetDebugUtilsObjectTagEXT(
     VkDevice                                    device,
     const VkDebugUtilsObjectTagInfoEXT*         pTagInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkQueueBeginDebugUtilsLabelEXT(
     VkQueue                                     queue,
     const VkDebugUtilsLabelEXT*                 pLabelInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkQueueEndDebugUtilsLabelEXT(
     VkQueue                                     queue);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkQueueInsertDebugUtilsLabelEXT(
     VkQueue                                     queue,
     const VkDebugUtilsLabelEXT*                 pLabelInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBeginDebugUtilsLabelEXT(
     VkCommandBuffer                             commandBuffer,
     const VkDebugUtilsLabelEXT*                 pLabelInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdEndDebugUtilsLabelEXT(
     VkCommandBuffer                             commandBuffer);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdInsertDebugUtilsLabelEXT(
     VkCommandBuffer                             commandBuffer,
     const VkDebugUtilsLabelEXT*                 pLabelInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDebugUtilsMessengerEXT(
     VkInstance                                  instance,
     const VkDebugUtilsMessengerCreateInfoEXT*   pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkDebugUtilsMessengerEXT*                   pMessenger);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyDebugUtilsMessengerEXT(
     VkInstance                                  instance,
     VkDebugUtilsMessengerEXT                    messenger,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkSubmitDebugUtilsMessageEXT(
     VkInstance                                  instance,
     VkDebugUtilsMessageSeverityFlagBitsEXT      messageSeverity,
     VkDebugUtilsMessageTypeFlagsEXT             messageTypes,
     const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData);
 #endif
-#endif
 
 
 // VK_EXT_sampler_filter_minmax is a preprocessor guard. Do not pass it to API calls.
@@ -15466,14 +13071,6 @@ typedef VkPhysicalDeviceSamplerFilterMinmaxProperties VkPhysicalDeviceSamplerFil
 #define VK_AMD_mixed_attachment_samples 1
 #define VK_AMD_MIXED_ATTACHMENT_SAMPLES_SPEC_VERSION 1
 #define VK_AMD_MIXED_ATTACHMENT_SAMPLES_EXTENSION_NAME "VK_AMD_mixed_attachment_samples"
-typedef struct VkAttachmentSampleCountInfoAMD {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    uint32_t                        colorAttachmentCount;
-    const VkSampleCountFlagBits*    pColorAttachmentSamples;
-    VkSampleCountFlagBits           depthStencilAttachmentSamples;
-} VkAttachmentSampleCountInfoAMD;
-
 
 
 // VK_AMD_shader_fragment_mask is a preprocessor guard. Do not pass it to API calls.
@@ -15566,19 +13163,15 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetSampleLocationsEXT)(VkCommandBuffer command
 typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT)(VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT* pMultisampleProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetSampleLocationsEXT(
     VkCommandBuffer                             commandBuffer,
     const VkSampleLocationsInfoEXT*             pSampleLocationsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMultisamplePropertiesEXT(
     VkPhysicalDevice                            physicalDevice,
     VkSampleCountFlagBits                       samples,
     VkMultisamplePropertiesEXT*                 pMultisampleProperties);
 #endif
-#endif
 
 
 // VK_EXT_blend_operation_advanced is a preprocessor guard. Do not pass it to API calls.
@@ -15657,8 +13250,6 @@ typedef struct VkPipelineCoverageModulationStateCreateInfoNV {
     const float*                                      pCoverageModulationTable;
 } VkPipelineCoverageModulationStateCreateInfoNV;
 
-typedef VkAttachmentSampleCountInfoAMD VkAttachmentSampleCountInfoNV;
-
 
 
 // VK_NV_fill_rectangle is a preprocessor guard. Do not pass it to API calls.
@@ -15755,13 +13346,11 @@ typedef struct VkDrmFormatModifierPropertiesList2EXT {
 typedef VkResult (VKAPI_PTR *PFN_vkGetImageDrmFormatModifierPropertiesEXT)(VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetImageDrmFormatModifierPropertiesEXT(
     VkDevice                                    device,
     VkImage                                     image,
     VkImageDrmFormatModifierPropertiesEXT*      pProperties);
 #endif
-#endif
 
 
 // VK_EXT_validation_cache is a preprocessor guard. Do not pass it to API calls.
@@ -15795,37 +13384,29 @@ typedef VkResult (VKAPI_PTR *PFN_vkMergeValidationCachesEXT)(VkDevice device, Vk
 typedef VkResult (VKAPI_PTR *PFN_vkGetValidationCacheDataEXT)(VkDevice device, VkValidationCacheEXT validationCache, size_t* pDataSize, void* pData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateValidationCacheEXT(
     VkDevice                                    device,
     const VkValidationCacheCreateInfoEXT*       pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkValidationCacheEXT*                       pValidationCache);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyValidationCacheEXT(
     VkDevice                                    device,
     VkValidationCacheEXT                        validationCache,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkMergeValidationCachesEXT(
     VkDevice                                    device,
     VkValidationCacheEXT                        dstCache,
     uint32_t                                    srcCacheCount,
     const VkValidationCacheEXT*                 pSrcCaches);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetValidationCacheDataEXT(
     VkDevice                                    device,
     VkValidationCacheEXT                        validationCache,
     size_t*                                     pDataSize,
     void*                                       pData);
 #endif
-#endif
 
 
 // VK_EXT_descriptor_indexing is a preprocessor guard. Do not pass it to API calls.
@@ -15936,29 +13517,23 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetViewportShadingRatePaletteNV)(VkCommandBuff
 typedef void (VKAPI_PTR *PFN_vkCmdSetCoarseSampleOrderNV)(VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindShadingRateImageNV(
     VkCommandBuffer                             commandBuffer,
     VkImageView                                 imageView,
     VkImageLayout                               imageLayout);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportShadingRatePaletteNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstViewport,
     uint32_t                                    viewportCount,
     const VkShadingRatePaletteNV*               pShadingRatePalettes);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoarseSampleOrderNV(
     VkCommandBuffer                             commandBuffer,
     VkCoarseSampleOrderTypeNV                   sampleOrderType,
     uint32_t                                    customSampleOrderCount,
     const VkCoarseSampleOrderCustomNV*          pCustomSampleOrders);
 #endif
-#endif
 
 
 // VK_NV_ray_tracing is a preprocessor guard. Do not pass it to API calls.
@@ -15985,11 +13560,6 @@ typedef enum VkGeometryTypeKHR {
     VK_GEOMETRY_TYPE_TRIANGLES_KHR = 0,
     VK_GEOMETRY_TYPE_AABBS_KHR = 1,
     VK_GEOMETRY_TYPE_INSTANCES_KHR = 2,
-    VK_GEOMETRY_TYPE_SPHERES_NV = 1000429004,
-    VK_GEOMETRY_TYPE_LINEAR_SWEPT_SPHERES_NV = 1000429005,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_GEOMETRY_TYPE_DENSE_GEOMETRY_FORMAT_TRIANGLES_AMDX = 1000478000,
-#endif
     VK_GEOMETRY_TYPE_TRIANGLES_NV = VK_GEOMETRY_TYPE_TRIANGLES_KHR,
     VK_GEOMETRY_TYPE_AABBS_NV = VK_GEOMETRY_TYPE_AABBS_KHR,
     VK_GEOMETRY_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF
@@ -16045,17 +13615,13 @@ typedef enum VkGeometryInstanceFlagBitsKHR {
     VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR = 0x00000002,
     VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR = 0x00000004,
     VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR = 0x00000008,
-    VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_BIT_EXT = 0x00000010,
-    VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_BIT_EXT = 0x00000020,
+    VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT = 0x00000010,
+    VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT = 0x00000020,
     VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR = VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR,
     VK_GEOMETRY_INSTANCE_TRIANGLE_CULL_DISABLE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR,
     VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR,
     VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_NV = VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR,
     VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_NV = VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR,
-  // VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT is a legacy alias
-    VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT = VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_BIT_EXT,
-  // VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT is a legacy alias
-    VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT = VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_BIT_EXT,
     VK_GEOMETRY_INSTANCE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkGeometryInstanceFlagBitsKHR;
 typedef VkFlags VkGeometryInstanceFlagsKHR;
@@ -16071,31 +13637,18 @@ typedef enum VkBuildAccelerationStructureFlagBitsKHR {
     VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_KHR = 0x00000008,
     VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_KHR = 0x00000010,
     VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV = 0x00000020,
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_BIT_EXT = 0x00000040,
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_BIT_EXT = 0x00000080,
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT_EXT = 0x00000100,
+    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT = 0x00000040,
+    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT = 0x00000080,
+    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT = 0x00000100,
 #ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV = 0x00000200,
+    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV = 0x00000200,
 #endif
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR = 0x00000800,
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_CLUSTER_OPACITY_MICROMAPS_BIT_NV = 0x00001000,
+    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR = 0x00000800,
     VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_KHR,
     VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_KHR,
     VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_KHR,
     VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_KHR,
     VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_KHR,
-  // VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT is a legacy alias
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_BIT_EXT,
-  // VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT is a legacy alias
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_BIT_EXT,
-  // VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT is a legacy alias
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT_EXT,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-  // VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV is a legacy alias
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV,
-#endif
-  // VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR is a legacy alias
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR,
     VK_BUILD_ACCELERATION_STRUCTURE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkBuildAccelerationStructureFlagBitsKHR;
 typedef VkFlags VkBuildAccelerationStructureFlagsKHR;
@@ -16262,36 +13815,27 @@ typedef void (VKAPI_PTR *PFN_vkCmdWriteAccelerationStructuresPropertiesNV)(VkCom
 typedef VkResult (VKAPI_PTR *PFN_vkCompileDeferredNV)(VkDevice device, VkPipeline pipeline, uint32_t shader);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateAccelerationStructureNV(
     VkDevice                                    device,
     const VkAccelerationStructureCreateInfoNV*  pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkAccelerationStructureNV*                  pAccelerationStructure);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyAccelerationStructureNV(
     VkDevice                                    device,
     VkAccelerationStructureNV                   accelerationStructure,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetAccelerationStructureMemoryRequirementsNV(
     VkDevice                                    device,
     const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo,
     VkMemoryRequirements2KHR*                   pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBindAccelerationStructureMemoryNV(
     VkDevice                                    device,
     uint32_t                                    bindInfoCount,
     const VkBindAccelerationStructureMemoryInfoNV* pBindInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBuildAccelerationStructureNV(
     VkCommandBuffer                             commandBuffer,
     const VkAccelerationStructureInfoNV*        pInfo,
@@ -16302,17 +13846,13 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBuildAccelerationStructureNV(
     VkAccelerationStructureNV                   src,
     VkBuffer                                    scratch,
     VkDeviceSize                                scratchOffset);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyAccelerationStructureNV(
     VkCommandBuffer                             commandBuffer,
     VkAccelerationStructureNV                   dst,
     VkAccelerationStructureNV                   src,
     VkCopyAccelerationStructureModeKHR          mode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysNV(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    raygenShaderBindingTableBuffer,
@@ -16329,9 +13869,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysNV(
     uint32_t                                    width,
     uint32_t                                    height,
     uint32_t                                    depth);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateRayTracingPipelinesNV(
     VkDevice                                    device,
     VkPipelineCache                             pipelineCache,
@@ -16339,9 +13877,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateRayTracingPipelinesNV(
     const VkRayTracingPipelineCreateInfoNV*     pCreateInfos,
     const VkAllocationCallbacks*                pAllocator,
     VkPipeline*                                 pPipelines);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingShaderGroupHandlesKHR(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
@@ -16349,9 +13885,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingShaderGroupHandlesKHR(
     uint32_t                                    groupCount,
     size_t                                      dataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingShaderGroupHandlesNV(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
@@ -16359,17 +13893,13 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingShaderGroupHandlesNV(
     uint32_t                                    groupCount,
     size_t                                      dataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetAccelerationStructureHandleNV(
     VkDevice                                    device,
     VkAccelerationStructureNV                   accelerationStructure,
     size_t                                      dataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWriteAccelerationStructuresPropertiesNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    accelerationStructureCount,
@@ -16377,15 +13907,12 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteAccelerationStructuresPropertiesNV(
     VkQueryType                                 queryType,
     VkQueryPool                                 queryPool,
     uint32_t                                    firstQuery);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCompileDeferredNV(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
     uint32_t                                    shader);
 #endif
-#endif
 
 
 // VK_NV_representative_fragment_test is a preprocessor guard. Do not pass it to API calls.
@@ -16435,9 +13962,9 @@ typedef struct VkFilterCubicImageViewImageFormatPropertiesEXT {
 #define VK_EXT_global_priority 1
 #define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2
 #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority"
-typedef VkQueueGlobalPriority VkQueueGlobalPriorityEXT;
+typedef VkQueueGlobalPriorityKHR VkQueueGlobalPriorityEXT;
 
-typedef VkDeviceQueueGlobalPriorityCreateInfo VkDeviceQueueGlobalPriorityCreateInfoEXT;
+typedef VkDeviceQueueGlobalPriorityCreateInfoKHR VkDeviceQueueGlobalPriorityCreateInfoEXT;
 
 
 
@@ -16467,14 +13994,12 @@ typedef struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT {
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryHostPointerPropertiesEXT)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHostPointer, VkMemoryHostPointerPropertiesEXT* pMemoryHostPointerProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryHostPointerPropertiesEXT(
     VkDevice                                    device,
     VkExternalMemoryHandleTypeFlagBits          handleType,
     const void*                                 pHostPointer,
     VkMemoryHostPointerPropertiesEXT*           pMemoryHostPointerProperties);
 #endif
-#endif
 
 
 // VK_AMD_buffer_marker is a preprocessor guard. Do not pass it to API calls.
@@ -16482,10 +14007,8 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryHostPointerPropertiesEXT(
 #define VK_AMD_BUFFER_MARKER_SPEC_VERSION 1
 #define VK_AMD_BUFFER_MARKER_EXTENSION_NAME "VK_AMD_buffer_marker"
 typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarkerAMD)(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker);
-typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer                   commandBuffer, VkPipelineStageFlags2               stage, VkBuffer                                            dstBuffer, VkDeviceSize                                        dstOffset, uint32_t                                            marker);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarkerAMD(
     VkCommandBuffer                             commandBuffer,
     VkPipelineStageFlagBits                     pipelineStage,
@@ -16494,16 +14017,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarkerAMD(
     uint32_t                                    marker);
 #endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarker2AMD(
-    VkCommandBuffer                             commandBuffer,
-    VkPipelineStageFlags2                       stage,
-    VkBuffer                                    dstBuffer,
-    VkDeviceSize                                dstOffset,
-    uint32_t                                    marker);
-#endif
-#endif
-
 
 // VK_AMD_pipeline_compiler_control is a preprocessor guard. Do not pass it to API calls.
 #define VK_AMD_pipeline_compiler_control 1
@@ -16534,14 +14047,11 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)
 typedef VkResult (VKAPI_PTR *PFN_vkGetCalibratedTimestampsEXT)(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoKHR* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pTimeDomainCount,
     VkTimeDomainKHR*                            pTimeDomains);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsEXT(
     VkDevice                                    device,
     uint32_t                                    timestampCount,
@@ -16549,7 +14059,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetCalibratedTimestampsEXT(
     uint64_t*                                   pTimestamps,
     uint64_t*                                   pMaxDeviation);
 #endif
-#endif
 
 
 // VK_AMD_shader_core_properties is a preprocessor guard. Do not pass it to API calls.
@@ -16606,11 +14115,11 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT {
     uint32_t           maxVertexAttribDivisor;
 } VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT;
 
-typedef VkVertexInputBindingDivisorDescription VkVertexInputBindingDivisorDescriptionEXT;
+typedef VkVertexInputBindingDivisorDescriptionKHR VkVertexInputBindingDivisorDescriptionEXT;
 
-typedef VkPipelineVertexInputDivisorStateCreateInfo VkPipelineVertexInputDivisorStateCreateInfoEXT;
+typedef VkPipelineVertexInputDivisorStateCreateInfoKHR VkPipelineVertexInputDivisorStateCreateInfoEXT;
 
-typedef VkPhysicalDeviceVertexAttributeDivisorFeatures VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT;
+typedef VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT;
 
 
 
@@ -16638,7 +14147,12 @@ typedef VkPipelineCreationFeedback VkPipelineCreationFeedbackEXT;
 #define VK_NV_compute_shader_derivatives 1
 #define VK_NV_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION 1
 #define VK_NV_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME "VK_NV_compute_shader_derivatives"
-typedef VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR VkPhysicalDeviceComputeShaderDerivativesFeaturesNV;
+typedef struct VkPhysicalDeviceComputeShaderDerivativesFeaturesNV {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           computeDerivativeGroupQuads;
+    VkBool32           computeDerivativeGroupLinear;
+} VkPhysicalDeviceComputeShaderDerivativesFeaturesNV;
 
 
 
@@ -16681,23 +14195,18 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectNV)(VkCommandBuffer comma
 typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectCountNV)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    taskCount,
     uint32_t                                    firstTask);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectNV(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
     VkDeviceSize                                offset,
     uint32_t                                    drawCount,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountNV(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -16707,7 +14216,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountNV(
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
 #endif
-#endif
 
 
 // VK_NV_fragment_shader_barycentric is a preprocessor guard. Do not pass it to API calls.
@@ -16751,22 +14259,18 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetExclusiveScissorEnableNV)(VkCommandBuffer c
 typedef void (VKAPI_PTR *PFN_vkCmdSetExclusiveScissorNV)(VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetExclusiveScissorEnableNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstExclusiveScissor,
     uint32_t                                    exclusiveScissorCount,
     const VkBool32*                             pExclusiveScissorEnables);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetExclusiveScissorNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstExclusiveScissor,
     uint32_t                                    exclusiveScissorCount,
     const VkRect2D*                             pExclusiveScissors);
 #endif
-#endif
 
 
 // VK_NV_device_diagnostic_checkpoints is a preprocessor guard. Do not pass it to API calls.
@@ -16786,200 +14290,20 @@ typedef struct VkCheckpointDataNV {
     void*                      pCheckpointMarker;
 } VkCheckpointDataNV;
 
-typedef struct VkQueueFamilyCheckpointProperties2NV {
-    VkStructureType          sType;
-    void*                    pNext;
-    VkPipelineStageFlags2    checkpointExecutionStageMask;
-} VkQueueFamilyCheckpointProperties2NV;
-
-typedef struct VkCheckpointData2NV {
-    VkStructureType          sType;
-    void*                    pNext;
-    VkPipelineStageFlags2    stage;
-    void*                    pCheckpointMarker;
-} VkCheckpointData2NV;
-
 typedef void (VKAPI_PTR *PFN_vkCmdSetCheckpointNV)(VkCommandBuffer commandBuffer, const void* pCheckpointMarker);
 typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointDataNV)(VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData);
-typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointData2NV)(VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCheckpointNV(
     VkCommandBuffer                             commandBuffer,
     const void*                                 pCheckpointMarker);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointDataNV(
     VkQueue                                     queue,
     uint32_t*                                   pCheckpointDataCount,
     VkCheckpointDataNV*                         pCheckpointData);
 #endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointData2NV(
-    VkQueue                                     queue,
-    uint32_t*                                   pCheckpointDataCount,
-    VkCheckpointData2NV*                        pCheckpointData);
-#endif
-#endif
-
-
-// VK_EXT_present_timing is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_present_timing 1
-#define VK_EXT_PRESENT_TIMING_SPEC_VERSION 3
-#define VK_EXT_PRESENT_TIMING_EXTENSION_NAME "VK_EXT_present_timing"
-typedef VkFlags VkPresentStageFlagsEXT;
-
-typedef enum VkPresentStageFlagBitsEXT {
-    VK_PRESENT_STAGE_QUEUE_OPERATIONS_END_BIT_EXT = 0x00000001,
-    VK_PRESENT_STAGE_REQUEST_DEQUEUED_BIT_EXT = 0x00000002,
-    VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_OUT_BIT_EXT = 0x00000004,
-    VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_VISIBLE_BIT_EXT = 0x00000008,
-    VK_PRESENT_STAGE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkPresentStageFlagBitsEXT;
-typedef VkFlags VkPastPresentationTimingFlagsEXT;
-
-typedef enum VkPastPresentationTimingFlagBitsEXT {
-    VK_PAST_PRESENTATION_TIMING_ALLOW_PARTIAL_RESULTS_BIT_EXT = 0x00000001,
-    VK_PAST_PRESENTATION_TIMING_ALLOW_OUT_OF_ORDER_RESULTS_BIT_EXT = 0x00000002,
-    VK_PAST_PRESENTATION_TIMING_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkPastPresentationTimingFlagBitsEXT;
-typedef VkFlags VkPresentTimingInfoFlagsEXT;
-
-typedef enum VkPresentTimingInfoFlagBitsEXT {
-    VK_PRESENT_TIMING_INFO_PRESENT_AT_RELATIVE_TIME_BIT_EXT = 0x00000001,
-    VK_PRESENT_TIMING_INFO_PRESENT_AT_NEAREST_REFRESH_CYCLE_BIT_EXT = 0x00000002,
-    VK_PRESENT_TIMING_INFO_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkPresentTimingInfoFlagBitsEXT;
-typedef struct VkPhysicalDevicePresentTimingFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentTiming;
-    VkBool32           presentAtAbsoluteTime;
-    VkBool32           presentAtRelativeTime;
-} VkPhysicalDevicePresentTimingFeaturesEXT;
-
-typedef struct VkPresentTimingSurfaceCapabilitiesEXT {
-    VkStructureType           sType;
-    void*                     pNext;
-    VkBool32                  presentTimingSupported;
-    VkBool32                  presentAtAbsoluteTimeSupported;
-    VkBool32                  presentAtRelativeTimeSupported;
-    VkPresentStageFlagsEXT    presentStageQueries;
-} VkPresentTimingSurfaceCapabilitiesEXT;
-
-typedef struct VkSwapchainCalibratedTimestampInfoEXT {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkSwapchainKHR            swapchain;
-    VkPresentStageFlagsEXT    presentStage;
-    uint64_t                  timeDomainId;
-} VkSwapchainCalibratedTimestampInfoEXT;
-
-typedef struct VkSwapchainTimingPropertiesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    uint64_t           refreshDuration;
-    uint64_t           refreshInterval;
-} VkSwapchainTimingPropertiesEXT;
-
-typedef struct VkSwapchainTimeDomainPropertiesEXT {
-    VkStructureType     sType;
-    void*               pNext;
-    uint32_t            timeDomainCount;
-    VkTimeDomainKHR*    pTimeDomains;
-    uint64_t*           pTimeDomainIds;
-} VkSwapchainTimeDomainPropertiesEXT;
-
-typedef struct VkPastPresentationTimingInfoEXT {
-    VkStructureType                     sType;
-    const void*                         pNext;
-    VkPastPresentationTimingFlagsEXT    flags;
-    VkSwapchainKHR                      swapchain;
-} VkPastPresentationTimingInfoEXT;
-
-typedef struct VkPresentStageTimeEXT {
-    VkPresentStageFlagsEXT    stage;
-    uint64_t                  time;
-} VkPresentStageTimeEXT;
-
-typedef struct VkPastPresentationTimingEXT {
-    VkStructureType           sType;
-    void*                     pNext;
-    uint64_t                  presentId;
-    uint64_t                  targetTime;
-    uint32_t                  presentStageCount;
-    VkPresentStageTimeEXT*    pPresentStages;
-    VkTimeDomainKHR           timeDomain;
-    uint64_t                  timeDomainId;
-    VkBool32                  reportComplete;
-} VkPastPresentationTimingEXT;
-
-typedef struct VkPastPresentationTimingPropertiesEXT {
-    VkStructureType                 sType;
-    void*                           pNext;
-    uint64_t                        timingPropertiesCounter;
-    uint64_t                        timeDomainsCounter;
-    uint32_t                        presentationTimingCount;
-    VkPastPresentationTimingEXT*    pPresentationTimings;
-} VkPastPresentationTimingPropertiesEXT;
-
-typedef struct VkPresentTimingInfoEXT {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkPresentTimingInfoFlagsEXT    flags;
-    uint64_t                       targetTime;
-    uint64_t                       timeDomainId;
-    VkPresentStageFlagsEXT         presentStageQueries;
-    VkPresentStageFlagsEXT         targetTimeDomainPresentStage;
-} VkPresentTimingInfoEXT;
-
-typedef struct VkPresentTimingsInfoEXT {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    uint32_t                         swapchainCount;
-    const VkPresentTimingInfoEXT*    pTimingInfos;
-} VkPresentTimingsInfoEXT;
-
-typedef VkResult (VKAPI_PTR *PFN_vkSetSwapchainPresentTimingQueueSizeEXT)(VkDevice device, VkSwapchainKHR swapchain, uint32_t size);
-typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainTimingPropertiesEXT)(VkDevice device, VkSwapchainKHR swapchain, VkSwapchainTimingPropertiesEXT* pSwapchainTimingProperties, uint64_t* pSwapchainTimingPropertiesCounter);
-typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainTimeDomainPropertiesEXT)(VkDevice device, VkSwapchainKHR swapchain, VkSwapchainTimeDomainPropertiesEXT* pSwapchainTimeDomainProperties, uint64_t* pTimeDomainsCounter);
-typedef VkResult (VKAPI_PTR *PFN_vkGetPastPresentationTimingEXT)(VkDevice device, const VkPastPresentationTimingInfoEXT* pPastPresentationTimingInfo, VkPastPresentationTimingPropertiesEXT* pPastPresentationTimingProperties);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkSetSwapchainPresentTimingQueueSizeEXT(
-    VkDevice                                    device,
-    VkSwapchainKHR                              swapchain,
-    uint32_t                                    size);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainTimingPropertiesEXT(
-    VkDevice                                    device,
-    VkSwapchainKHR                              swapchain,
-    VkSwapchainTimingPropertiesEXT*             pSwapchainTimingProperties,
-    uint64_t*                                   pSwapchainTimingPropertiesCounter);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainTimeDomainPropertiesEXT(
-    VkDevice                                    device,
-    VkSwapchainKHR                              swapchain,
-    VkSwapchainTimeDomainPropertiesEXT*         pSwapchainTimeDomainProperties,
-    uint64_t*                                   pTimeDomainsCounter);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingEXT(
-    VkDevice                                    device,
-    const VkPastPresentationTimingInfoEXT*      pPastPresentationTimingInfo,
-    VkPastPresentationTimingPropertiesEXT*      pPastPresentationTimingProperties);
-#endif
-#endif
-
 
 // VK_INTEL_shader_integer_functions2 is a preprocessor guard. Do not pass it to API calls.
 #define VK_INTEL_shader_integer_functions2 1
@@ -17093,61 +14417,43 @@ typedef VkResult (VKAPI_PTR *PFN_vkQueueSetPerformanceConfigurationINTEL)(VkQueu
 typedef VkResult (VKAPI_PTR *PFN_vkGetPerformanceParameterINTEL)(VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL* pValue);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkInitializePerformanceApiINTEL(
     VkDevice                                    device,
     const VkInitializePerformanceApiInfoINTEL*  pInitializeInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkUninitializePerformanceApiINTEL(
     VkDevice                                    device);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCmdSetPerformanceMarkerINTEL(
     VkCommandBuffer                             commandBuffer,
     const VkPerformanceMarkerInfoINTEL*         pMarkerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCmdSetPerformanceStreamMarkerINTEL(
     VkCommandBuffer                             commandBuffer,
     const VkPerformanceStreamMarkerInfoINTEL*   pMarkerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCmdSetPerformanceOverrideINTEL(
     VkCommandBuffer                             commandBuffer,
     const VkPerformanceOverrideInfoINTEL*       pOverrideInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquirePerformanceConfigurationINTEL(
     VkDevice                                    device,
     const VkPerformanceConfigurationAcquireInfoINTEL* pAcquireInfo,
     VkPerformanceConfigurationINTEL*            pConfiguration);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkReleasePerformanceConfigurationINTEL(
     VkDevice                                    device,
     VkPerformanceConfigurationINTEL             configuration);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkQueueSetPerformanceConfigurationINTEL(
     VkQueue                                     queue,
     VkPerformanceConfigurationINTEL             configuration);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPerformanceParameterINTEL(
     VkDevice                                    device,
     VkPerformanceParameterTypeINTEL             parameter,
     VkPerformanceValueINTEL*                    pValue);
 #endif
-#endif
 
 
 // VK_EXT_pci_bus_info is a preprocessor guard. Do not pass it to API calls.
@@ -17184,13 +14490,11 @@ typedef struct VkSwapchainDisplayNativeHdrCreateInfoAMD {
 typedef void (VKAPI_PTR *PFN_vkSetLocalDimmingAMD)(VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkSetLocalDimmingAMD(
     VkDevice                                    device,
     VkSwapchainKHR                              swapChain,
     VkBool32                                    localDimmingEnable);
 #endif
-#endif
 
 
 // VK_EXT_fragment_density_map is a preprocessor guard. Do not pass it to API calls.
@@ -17219,13 +14523,6 @@ typedef struct VkRenderPassFragmentDensityMapCreateInfoEXT {
     VkAttachmentReference    fragmentDensityMapAttachment;
 } VkRenderPassFragmentDensityMapCreateInfoEXT;
 
-typedef struct VkRenderingFragmentDensityMapAttachmentInfoEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkImageView        imageView;
-    VkImageLayout      imageLayout;
-} VkRenderingFragmentDensityMapAttachmentInfoEXT;
-
 
 
 // VK_EXT_scalar_block_layout is a preprocessor guard. Do not pass it to API calls.
@@ -17240,9 +14537,7 @@ typedef VkPhysicalDeviceScalarBlockLayoutFeatures VkPhysicalDeviceScalarBlockLay
 #define VK_GOOGLE_hlsl_functionality1 1
 #define VK_GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION 1
 #define VK_GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"
-// VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION is a legacy alias
 #define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION VK_GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION
-// VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME is a legacy alias
 #define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME VK_GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME
 
 
@@ -17375,12 +14670,10 @@ typedef struct VkBufferDeviceAddressCreateInfoEXT {
 typedef VkDeviceAddress (VKAPI_PTR *PFN_vkGetBufferDeviceAddressEXT)(VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddressEXT(
     VkDevice                                    device,
     const VkBufferDeviceAddressInfo*            pInfo);
 #endif
-#endif
 
 
 // VK_EXT_tooling_info is a preprocessor guard. Do not pass it to API calls.
@@ -17396,13 +14689,11 @@ typedef VkPhysicalDeviceToolProperties VkPhysicalDeviceToolPropertiesEXT;
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolPropertiesEXT(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pToolCount,
     VkPhysicalDeviceToolProperties*             pToolProperties);
 #endif
-#endif
 
 
 // VK_EXT_separate_stencil_usage is a preprocessor guard. Do not pass it to API calls.
@@ -17486,13 +14777,11 @@ typedef struct VkPhysicalDeviceCooperativeMatrixPropertiesNV {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pPropertyCount,
     VkCooperativeMatrixPropertiesNV*            pProperties);
 #endif
-#endif
 
 
 // VK_NV_coverage_reduction_mode is a preprocessor guard. Do not pass it to API calls.
@@ -17531,13 +14820,11 @@ typedef struct VkFramebufferMixedSamplesCombinationNV {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV)(VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
     VkPhysicalDevice                            physicalDevice,
     uint32_t*                                   pCombinationCount,
     VkFramebufferMixedSamplesCombinationNV*     pCombinations);
 #endif
-#endif
 
 
 // VK_EXT_fragment_shader_interlock is a preprocessor guard. Do not pass it to API calls.
@@ -17612,38 +14899,34 @@ typedef struct VkHeadlessSurfaceCreateInfoEXT {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateHeadlessSurfaceEXT)(VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateHeadlessSurfaceEXT(
     VkInstance                                  instance,
     const VkHeadlessSurfaceCreateInfoEXT*       pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_EXT_line_rasterization is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_line_rasterization 1
 #define VK_EXT_LINE_RASTERIZATION_SPEC_VERSION 1
 #define VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME "VK_EXT_line_rasterization"
-typedef VkLineRasterizationMode VkLineRasterizationModeEXT;
+typedef VkLineRasterizationModeKHR VkLineRasterizationModeEXT;
 
-typedef VkPhysicalDeviceLineRasterizationFeatures VkPhysicalDeviceLineRasterizationFeaturesEXT;
+typedef VkPhysicalDeviceLineRasterizationFeaturesKHR VkPhysicalDeviceLineRasterizationFeaturesEXT;
 
-typedef VkPhysicalDeviceLineRasterizationProperties VkPhysicalDeviceLineRasterizationPropertiesEXT;
+typedef VkPhysicalDeviceLineRasterizationPropertiesKHR VkPhysicalDeviceLineRasterizationPropertiesEXT;
 
-typedef VkPipelineRasterizationLineStateCreateInfo VkPipelineRasterizationLineStateCreateInfoEXT;
+typedef VkPipelineRasterizationLineStateCreateInfoKHR VkPipelineRasterizationLineStateCreateInfoEXT;
 
 typedef void (VKAPI_PTR *PFN_vkCmdSetLineStippleEXT)(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLineStippleEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    lineStippleFactor,
     uint16_t                                    lineStipplePattern);
 #endif
-#endif
 
 
 // VK_EXT_shader_atomic_float is a preprocessor guard. Do not pass it to API calls.
@@ -17678,21 +14961,19 @@ typedef VkPhysicalDeviceHostQueryResetFeatures VkPhysicalDeviceHostQueryResetFea
 typedef void (VKAPI_PTR *PFN_vkResetQueryPoolEXT)(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkResetQueryPoolEXT(
     VkDevice                                    device,
     VkQueryPool                                 queryPool,
     uint32_t                                    firstQuery,
     uint32_t                                    queryCount);
 #endif
-#endif
 
 
 // VK_EXT_index_type_uint8 is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_index_type_uint8 1
 #define VK_EXT_INDEX_TYPE_UINT8_SPEC_VERSION 1
 #define VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME "VK_EXT_index_type_uint8"
-typedef VkPhysicalDeviceIndexTypeUint8Features VkPhysicalDeviceIndexTypeUint8FeaturesEXT;
+typedef VkPhysicalDeviceIndexTypeUint8FeaturesKHR VkPhysicalDeviceIndexTypeUint8FeaturesEXT;
 
 
 
@@ -17720,39 +15001,28 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetStencilTestEnableEXT)(VkCommandBuffer comma
 typedef void (VKAPI_PTR *PFN_vkCmdSetStencilOpEXT)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCullModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkCullModeFlags                             cullMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetFrontFaceEXT(
     VkCommandBuffer                             commandBuffer,
     VkFrontFace                                 frontFace);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveTopologyEXT(
     VkCommandBuffer                             commandBuffer,
     VkPrimitiveTopology                         primitiveTopology);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWithCountEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    viewportCount,
     const VkViewport*                           pViewports);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetScissorWithCountEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    scissorCount,
     const VkRect2D*                             pScissors);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers2EXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstBinding,
@@ -17761,39 +15031,27 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers2EXT(
     const VkDeviceSize*                         pOffsets,
     const VkDeviceSize*                         pSizes,
     const VkDeviceSize*                         pStrides);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthTestEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthTestEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthWriteEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthWriteEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthCompareOpEXT(
     VkCommandBuffer                             commandBuffer,
     VkCompareOp                                 depthCompareOp);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBoundsTestEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthBoundsTestEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilTestEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    stencilTestEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilOpEXT(
     VkCommandBuffer                             commandBuffer,
     VkStencilFaceFlags                          faceMask,
@@ -17802,80 +15060,144 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilOpEXT(
     VkStencilOp                                 depthFailOp,
     VkCompareOp                                 compareOp);
 #endif
-#endif
 
 
 // VK_EXT_host_image_copy is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_host_image_copy 1
 #define VK_EXT_HOST_IMAGE_COPY_SPEC_VERSION 1
 #define VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME "VK_EXT_host_image_copy"
-typedef VkHostImageCopyFlagBits VkHostImageCopyFlagBitsEXT;
 
-typedef VkHostImageCopyFlags VkHostImageCopyFlagsEXT;
+typedef enum VkHostImageCopyFlagBitsEXT {
+    VK_HOST_IMAGE_COPY_MEMCPY_EXT = 0x00000001,
+    VK_HOST_IMAGE_COPY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkHostImageCopyFlagBitsEXT;
+typedef VkFlags VkHostImageCopyFlagsEXT;
+typedef struct VkPhysicalDeviceHostImageCopyFeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           hostImageCopy;
+} VkPhysicalDeviceHostImageCopyFeaturesEXT;
 
-typedef VkPhysicalDeviceHostImageCopyFeatures VkPhysicalDeviceHostImageCopyFeaturesEXT;
+typedef struct VkPhysicalDeviceHostImageCopyPropertiesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    uint32_t           copySrcLayoutCount;
+    VkImageLayout*     pCopySrcLayouts;
+    uint32_t           copyDstLayoutCount;
+    VkImageLayout*     pCopyDstLayouts;
+    uint8_t            optimalTilingLayoutUUID[VK_UUID_SIZE];
+    VkBool32           identicalMemoryTypeRequirements;
+} VkPhysicalDeviceHostImageCopyPropertiesEXT;
 
-typedef VkPhysicalDeviceHostImageCopyProperties VkPhysicalDeviceHostImageCopyPropertiesEXT;
+typedef struct VkMemoryToImageCopyEXT {
+    VkStructureType             sType;
+    const void*                 pNext;
+    const void*                 pHostPointer;
+    uint32_t                    memoryRowLength;
+    uint32_t                    memoryImageHeight;
+    VkImageSubresourceLayers    imageSubresource;
+    VkOffset3D                  imageOffset;
+    VkExtent3D                  imageExtent;
+} VkMemoryToImageCopyEXT;
 
-typedef VkMemoryToImageCopy VkMemoryToImageCopyEXT;
+typedef struct VkImageToMemoryCopyEXT {
+    VkStructureType             sType;
+    const void*                 pNext;
+    void*                       pHostPointer;
+    uint32_t                    memoryRowLength;
+    uint32_t                    memoryImageHeight;
+    VkImageSubresourceLayers    imageSubresource;
+    VkOffset3D                  imageOffset;
+    VkExtent3D                  imageExtent;
+} VkImageToMemoryCopyEXT;
 
-typedef VkImageToMemoryCopy VkImageToMemoryCopyEXT;
+typedef struct VkCopyMemoryToImageInfoEXT {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkHostImageCopyFlagsEXT          flags;
+    VkImage                          dstImage;
+    VkImageLayout                    dstImageLayout;
+    uint32_t                         regionCount;
+    const VkMemoryToImageCopyEXT*    pRegions;
+} VkCopyMemoryToImageInfoEXT;
 
-typedef VkCopyMemoryToImageInfo VkCopyMemoryToImageInfoEXT;
+typedef struct VkCopyImageToMemoryInfoEXT {
+    VkStructureType                  sType;
+    const void*                      pNext;
+    VkHostImageCopyFlagsEXT          flags;
+    VkImage                          srcImage;
+    VkImageLayout                    srcImageLayout;
+    uint32_t                         regionCount;
+    const VkImageToMemoryCopyEXT*    pRegions;
+} VkCopyImageToMemoryInfoEXT;
 
-typedef VkCopyImageToMemoryInfo VkCopyImageToMemoryInfoEXT;
+typedef struct VkCopyImageToImageInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    VkHostImageCopyFlagsEXT    flags;
+    VkImage                    srcImage;
+    VkImageLayout              srcImageLayout;
+    VkImage                    dstImage;
+    VkImageLayout              dstImageLayout;
+    uint32_t                   regionCount;
+    const VkImageCopy2*        pRegions;
+} VkCopyImageToImageInfoEXT;
 
-typedef VkCopyImageToImageInfo VkCopyImageToImageInfoEXT;
+typedef struct VkHostImageLayoutTransitionInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    VkImage                    image;
+    VkImageLayout              oldLayout;
+    VkImageLayout              newLayout;
+    VkImageSubresourceRange    subresourceRange;
+} VkHostImageLayoutTransitionInfoEXT;
 
-typedef VkHostImageLayoutTransitionInfo VkHostImageLayoutTransitionInfoEXT;
+typedef struct VkSubresourceHostMemcpySizeEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkDeviceSize       size;
+} VkSubresourceHostMemcpySizeEXT;
 
-typedef VkSubresourceHostMemcpySize VkSubresourceHostMemcpySizeEXT;
+typedef struct VkHostImageCopyDevicePerformanceQueryEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           optimalDeviceAccess;
+    VkBool32           identicalMemoryLayout;
+} VkHostImageCopyDevicePerformanceQueryEXT;
 
-typedef VkHostImageCopyDevicePerformanceQuery VkHostImageCopyDevicePerformanceQueryEXT;
+typedef VkSubresourceLayout2KHR VkSubresourceLayout2EXT;
 
-typedef VkSubresourceLayout2 VkSubresourceLayout2EXT;
+typedef VkImageSubresource2KHR VkImageSubresource2EXT;
 
-typedef VkImageSubresource2 VkImageSubresource2EXT;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCopyMemoryToImageEXT)(VkDevice device, const VkCopyMemoryToImageInfo*    pCopyMemoryToImageInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToMemoryEXT)(VkDevice device, const VkCopyImageToMemoryInfo*    pCopyImageToMemoryInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToImageEXT)(VkDevice device, const VkCopyImageToImageInfo*    pCopyImageToImageInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkTransitionImageLayoutEXT)(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfo*    pTransitions);
-typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout2EXT)(VkDevice device, VkImage image, const VkImageSubresource2* pSubresource, VkSubresourceLayout2* pLayout);
+typedef VkResult (VKAPI_PTR *PFN_vkCopyMemoryToImageEXT)(VkDevice device, const VkCopyMemoryToImageInfoEXT* pCopyMemoryToImageInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToMemoryEXT)(VkDevice device, const VkCopyImageToMemoryInfoEXT* pCopyImageToMemoryInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkCopyImageToImageEXT)(VkDevice device, const VkCopyImageToImageInfoEXT* pCopyImageToImageInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkTransitionImageLayoutEXT)(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfoEXT* pTransitions);
+typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout2EXT)(VkDevice device, VkImage image, const VkImageSubresource2KHR* pSubresource, VkSubresourceLayout2KHR* pLayout);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyMemoryToImageEXT(
     VkDevice                                    device,
-    const VkCopyMemoryToImageInfo*              pCopyMemoryToImageInfo);
-#endif
+    const VkCopyMemoryToImageInfoEXT*           pCopyMemoryToImageInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyImageToMemoryEXT(
     VkDevice                                    device,
-    const VkCopyImageToMemoryInfo*              pCopyImageToMemoryInfo);
-#endif
+    const VkCopyImageToMemoryInfoEXT*           pCopyImageToMemoryInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyImageToImageEXT(
     VkDevice                                    device,
-    const VkCopyImageToImageInfo*               pCopyImageToImageInfo);
-#endif
+    const VkCopyImageToImageInfoEXT*            pCopyImageToImageInfo);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkTransitionImageLayoutEXT(
     VkDevice                                    device,
     uint32_t                                    transitionCount,
-    const VkHostImageLayoutTransitionInfo*      pTransitions);
-#endif
+    const VkHostImageLayoutTransitionInfoEXT*   pTransitions);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout2EXT(
     VkDevice                                    device,
     VkImage                                     image,
-    const VkImageSubresource2*                  pSubresource,
-    VkSubresourceLayout2*                       pLayout);
-#endif
+    const VkImageSubresource2KHR*               pSubresource,
+    VkSubresourceLayout2KHR*                    pLayout);
 #endif
 
 
@@ -17932,19 +15254,44 @@ typedef struct VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT {
 #define VK_EXT_surface_maintenance1 1
 #define VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION 1
 #define VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME "VK_EXT_surface_maintenance1"
-typedef VkPresentScalingFlagBitsKHR VkPresentScalingFlagBitsEXT;
 
-typedef VkPresentScalingFlagsKHR VkPresentScalingFlagsEXT;
+typedef enum VkPresentScalingFlagBitsEXT {
+    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT = 0x00000001,
+    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT = 0x00000002,
+    VK_PRESENT_SCALING_STRETCH_BIT_EXT = 0x00000004,
+    VK_PRESENT_SCALING_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPresentScalingFlagBitsEXT;
+typedef VkFlags VkPresentScalingFlagsEXT;
 
-typedef VkPresentGravityFlagBitsKHR VkPresentGravityFlagBitsEXT;
+typedef enum VkPresentGravityFlagBitsEXT {
+    VK_PRESENT_GRAVITY_MIN_BIT_EXT = 0x00000001,
+    VK_PRESENT_GRAVITY_MAX_BIT_EXT = 0x00000002,
+    VK_PRESENT_GRAVITY_CENTERED_BIT_EXT = 0x00000004,
+    VK_PRESENT_GRAVITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPresentGravityFlagBitsEXT;
+typedef VkFlags VkPresentGravityFlagsEXT;
+typedef struct VkSurfacePresentModeEXT {
+    VkStructureType     sType;
+    void*               pNext;
+    VkPresentModeKHR    presentMode;
+} VkSurfacePresentModeEXT;
 
-typedef VkPresentGravityFlagsKHR VkPresentGravityFlagsEXT;
+typedef struct VkSurfacePresentScalingCapabilitiesEXT {
+    VkStructureType             sType;
+    void*                       pNext;
+    VkPresentScalingFlagsEXT    supportedPresentScaling;
+    VkPresentGravityFlagsEXT    supportedPresentGravityX;
+    VkPresentGravityFlagsEXT    supportedPresentGravityY;
+    VkExtent2D                  minScaledImageExtent;
+    VkExtent2D                  maxScaledImageExtent;
+} VkSurfacePresentScalingCapabilitiesEXT;
 
-typedef VkSurfacePresentModeKHR VkSurfacePresentModeEXT;
-
-typedef VkSurfacePresentScalingCapabilitiesKHR VkSurfacePresentScalingCapabilitiesEXT;
-
-typedef VkSurfacePresentModeCompatibilityKHR VkSurfacePresentModeCompatibilityEXT;
+typedef struct VkSurfacePresentModeCompatibilityEXT {
+    VkStructureType      sType;
+    void*                pNext;
+    uint32_t             presentModeCount;
+    VkPresentModeKHR*    pPresentModes;
+} VkSurfacePresentModeCompatibilityEXT;
 
 
 
@@ -17952,26 +15299,55 @@ typedef VkSurfacePresentModeCompatibilityKHR VkSurfacePresentModeCompatibilityEX
 #define VK_EXT_swapchain_maintenance1 1
 #define VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION 1
 #define VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME "VK_EXT_swapchain_maintenance1"
-typedef VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT;
+typedef struct VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           swapchainMaintenance1;
+} VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT;
 
-typedef VkSwapchainPresentFenceInfoKHR VkSwapchainPresentFenceInfoEXT;
+typedef struct VkSwapchainPresentFenceInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           swapchainCount;
+    const VkFence*     pFences;
+} VkSwapchainPresentFenceInfoEXT;
 
-typedef VkSwapchainPresentModesCreateInfoKHR VkSwapchainPresentModesCreateInfoEXT;
+typedef struct VkSwapchainPresentModesCreateInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    uint32_t                   presentModeCount;
+    const VkPresentModeKHR*    pPresentModes;
+} VkSwapchainPresentModesCreateInfoEXT;
 
-typedef VkSwapchainPresentModeInfoKHR VkSwapchainPresentModeInfoEXT;
+typedef struct VkSwapchainPresentModeInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    uint32_t                   swapchainCount;
+    const VkPresentModeKHR*    pPresentModes;
+} VkSwapchainPresentModeInfoEXT;
 
-typedef VkSwapchainPresentScalingCreateInfoKHR VkSwapchainPresentScalingCreateInfoEXT;
+typedef struct VkSwapchainPresentScalingCreateInfoEXT {
+    VkStructureType             sType;
+    const void*                 pNext;
+    VkPresentScalingFlagsEXT    scalingBehavior;
+    VkPresentGravityFlagsEXT    presentGravityX;
+    VkPresentGravityFlagsEXT    presentGravityY;
+} VkSwapchainPresentScalingCreateInfoEXT;
 
-typedef VkReleaseSwapchainImagesInfoKHR VkReleaseSwapchainImagesInfoEXT;
+typedef struct VkReleaseSwapchainImagesInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkSwapchainKHR     swapchain;
+    uint32_t           imageIndexCount;
+    const uint32_t*    pImageIndices;
+} VkReleaseSwapchainImagesInfoEXT;
 
-typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesEXT)(VkDevice device, const VkReleaseSwapchainImagesInfoKHR* pReleaseInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesEXT)(VkDevice device, const VkReleaseSwapchainImagesInfoEXT* pReleaseInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkReleaseSwapchainImagesEXT(
     VkDevice                                    device,
-    const VkReleaseSwapchainImagesInfoKHR*      pReleaseInfo);
-#endif
+    const VkReleaseSwapchainImagesInfoEXT*      pReleaseInfo);
 #endif
 
 
@@ -18144,49 +15520,37 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateIndirectCommandsLayoutNV)(VkDevice devi
 typedef void (VKAPI_PTR *PFN_vkDestroyIndirectCommandsLayoutNV)(VkDevice device, VkIndirectCommandsLayoutNV indirectCommandsLayout, const VkAllocationCallbacks* pAllocator);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetGeneratedCommandsMemoryRequirementsNV(
     VkDevice                                    device,
     const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdPreprocessGeneratedCommandsNV(
     VkCommandBuffer                             commandBuffer,
     const VkGeneratedCommandsInfoNV*            pGeneratedCommandsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdExecuteGeneratedCommandsNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    isPreprocessed,
     const VkGeneratedCommandsInfoNV*            pGeneratedCommandsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindPipelineShaderGroupNV(
     VkCommandBuffer                             commandBuffer,
     VkPipelineBindPoint                         pipelineBindPoint,
     VkPipeline                                  pipeline,
     uint32_t                                    groupIndex);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateIndirectCommandsLayoutNV(
     VkDevice                                    device,
     const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkIndirectCommandsLayoutNV*                 pIndirectCommandsLayout);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyIndirectCommandsLayoutNV(
     VkDevice                                    device,
     VkIndirectCommandsLayoutNV                  indirectCommandsLayout,
     const VkAllocationCallbacks*                pAllocator);
 #endif
-#endif
 
 
 // VK_NV_inherited_viewport_scissor is a preprocessor guard. Do not pass it to API calls.
@@ -18225,17 +15589,17 @@ typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBuff
 
 // VK_QCOM_render_pass_transform is a preprocessor guard. Do not pass it to API calls.
 #define VK_QCOM_render_pass_transform 1
-#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 5
+#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 4
 #define VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME "VK_QCOM_render_pass_transform"
 typedef struct VkRenderPassTransformBeginInfoQCOM {
     VkStructureType                  sType;
-    const void*                      pNext;
+    void*                            pNext;
     VkSurfaceTransformFlagBitsKHR    transform;
 } VkRenderPassTransformBeginInfoQCOM;
 
 typedef struct VkCommandBufferInheritanceRenderPassTransformInfoQCOM {
     VkStructureType                  sType;
-    const void*                      pNext;
+    void*                            pNext;
     VkSurfaceTransformFlagBitsKHR    transform;
     VkRect2D                         renderArea;
 } VkCommandBufferInheritanceRenderPassTransformInfoQCOM;
@@ -18280,12 +15644,10 @@ typedef struct VkDepthBiasRepresentationInfoEXT {
 typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBias2EXT)(VkCommandBuffer commandBuffer, const VkDepthBiasInfoEXT*         pDepthBiasInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBias2EXT(
     VkCommandBuffer                             commandBuffer,
     const VkDepthBiasInfoEXT*                   pDepthBiasInfo);
 #endif
-#endif
 
 
 // VK_EXT_device_memory_report is a preprocessor guard. Do not pass it to API calls.
@@ -18342,30 +15704,37 @@ typedef VkResult (VKAPI_PTR *PFN_vkAcquireDrmDisplayEXT)(VkPhysicalDevice physic
 typedef VkResult (VKAPI_PTR *PFN_vkGetDrmDisplayEXT)(VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireDrmDisplayEXT(
     VkPhysicalDevice                            physicalDevice,
     int32_t                                     drmFd,
     VkDisplayKHR                                display);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDrmDisplayEXT(
     VkPhysicalDevice                            physicalDevice,
     int32_t                                     drmFd,
     uint32_t                                    connectorId,
     VkDisplayKHR*                               display);
 #endif
-#endif
 
 
 // VK_EXT_robustness2 is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_robustness2 1
 #define VK_EXT_ROBUSTNESS_2_SPEC_VERSION  1
 #define VK_EXT_ROBUSTNESS_2_EXTENSION_NAME "VK_EXT_robustness2"
-typedef VkPhysicalDeviceRobustness2FeaturesKHR VkPhysicalDeviceRobustness2FeaturesEXT;
+typedef struct VkPhysicalDeviceRobustness2FeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           robustBufferAccess2;
+    VkBool32           robustImageAccess2;
+    VkBool32           nullDescriptor;
+} VkPhysicalDeviceRobustness2FeaturesEXT;
 
-typedef VkPhysicalDeviceRobustness2PropertiesKHR VkPhysicalDeviceRobustness2PropertiesEXT;
+typedef struct VkPhysicalDeviceRobustness2PropertiesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkDeviceSize       robustStorageBufferAccessSizeAlignment;
+    VkDeviceSize       robustUniformBufferAccessSizeAlignment;
+} VkPhysicalDeviceRobustness2PropertiesEXT;
 
 
 
@@ -18445,31 +15814,24 @@ typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateDataEXT)(VkDevice device, VkObjectT
 typedef void (VKAPI_PTR *PFN_vkGetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreatePrivateDataSlotEXT(
     VkDevice                                    device,
     const VkPrivateDataSlotCreateInfo*          pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkPrivateDataSlot*                          pPrivateDataSlot);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyPrivateDataSlotEXT(
     VkDevice                                    device,
     VkPrivateDataSlot                           privateDataSlot,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetPrivateDataEXT(
     VkDevice                                    device,
     VkObjectType                                objectType,
     uint64_t                                    objectHandle,
     VkPrivateDataSlot                           privateDataSlot,
     uint64_t                                    data);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT(
     VkDevice                                    device,
     VkObjectType                                objectType,
@@ -18477,7 +15839,6 @@ VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT(
     VkPrivateDataSlot                           privateDataSlot,
     uint64_t*                                   pData);
 #endif
-#endif
 
 
 // VK_EXT_pipeline_creation_cache_control is a preprocessor guard. Do not pass it to API calls.
@@ -18521,89 +15882,95 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV {
 #define VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME "VK_QCOM_render_pass_store_ops"
 
 
-// VK_QCOM_tile_shading is a preprocessor guard. Do not pass it to API calls.
-#define VK_QCOM_tile_shading 1
-#define VK_QCOM_TILE_SHADING_SPEC_VERSION 2
-#define VK_QCOM_TILE_SHADING_EXTENSION_NAME "VK_QCOM_tile_shading"
+// VK_NV_cuda_kernel_launch is a preprocessor guard. Do not pass it to API calls.
+#define VK_NV_cuda_kernel_launch 1
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaModuleNV)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCudaFunctionNV)
+#define VK_NV_CUDA_KERNEL_LAUNCH_SPEC_VERSION 2
+#define VK_NV_CUDA_KERNEL_LAUNCH_EXTENSION_NAME "VK_NV_cuda_kernel_launch"
+typedef struct VkCudaModuleCreateInfoNV {
+    VkStructureType    sType;
+    const void*        pNext;
+    size_t             dataSize;
+    const void*        pData;
+} VkCudaModuleCreateInfoNV;
 
-typedef enum VkTileShadingRenderPassFlagBitsQCOM {
-    VK_TILE_SHADING_RENDER_PASS_ENABLE_BIT_QCOM = 0x00000001,
-    VK_TILE_SHADING_RENDER_PASS_PER_TILE_EXECUTION_BIT_QCOM = 0x00000002,
-    VK_TILE_SHADING_RENDER_PASS_FLAG_BITS_MAX_ENUM_QCOM = 0x7FFFFFFF
-} VkTileShadingRenderPassFlagBitsQCOM;
-typedef VkFlags VkTileShadingRenderPassFlagsQCOM;
-typedef struct VkPhysicalDeviceTileShadingFeaturesQCOM {
+typedef struct VkCudaFunctionCreateInfoNV {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkCudaModuleNV     module;
+    const char*        pName;
+} VkCudaFunctionCreateInfoNV;
+
+typedef struct VkCudaLaunchInfoNV {
+    VkStructureType        sType;
+    const void*            pNext;
+    VkCudaFunctionNV       function;
+    uint32_t               gridDimX;
+    uint32_t               gridDimY;
+    uint32_t               gridDimZ;
+    uint32_t               blockDimX;
+    uint32_t               blockDimY;
+    uint32_t               blockDimZ;
+    uint32_t               sharedMemBytes;
+    size_t                 paramCount;
+    const void* const *    pParams;
+    size_t                 extraCount;
+    const void* const *    pExtras;
+} VkCudaLaunchInfoNV;
+
+typedef struct VkPhysicalDeviceCudaKernelLaunchFeaturesNV {
     VkStructureType    sType;
     void*              pNext;
-    VkBool32           tileShading;
-    VkBool32           tileShadingFragmentStage;
-    VkBool32           tileShadingColorAttachments;
-    VkBool32           tileShadingDepthAttachments;
-    VkBool32           tileShadingStencilAttachments;
-    VkBool32           tileShadingInputAttachments;
-    VkBool32           tileShadingSampledAttachments;
-    VkBool32           tileShadingPerTileDraw;
-    VkBool32           tileShadingPerTileDispatch;
-    VkBool32           tileShadingDispatchTile;
-    VkBool32           tileShadingApron;
-    VkBool32           tileShadingAnisotropicApron;
-    VkBool32           tileShadingAtomicOps;
-    VkBool32           tileShadingImageProcessing;
-} VkPhysicalDeviceTileShadingFeaturesQCOM;
+    VkBool32           cudaKernelLaunchFeatures;
+} VkPhysicalDeviceCudaKernelLaunchFeaturesNV;
 
-typedef struct VkPhysicalDeviceTileShadingPropertiesQCOM {
+typedef struct VkPhysicalDeviceCudaKernelLaunchPropertiesNV {
     VkStructureType    sType;
     void*              pNext;
-    uint32_t           maxApronSize;
-    VkBool32           preferNonCoherent;
-    VkExtent2D         tileGranularity;
-    VkExtent2D         maxTileShadingRate;
-} VkPhysicalDeviceTileShadingPropertiesQCOM;
+    uint32_t           computeCapabilityMinor;
+    uint32_t           computeCapabilityMajor;
+} VkPhysicalDeviceCudaKernelLaunchPropertiesNV;
 
-typedef struct VkRenderPassTileShadingCreateInfoQCOM {
-    VkStructureType                     sType;
-    const void*                         pNext;
-    VkTileShadingRenderPassFlagsQCOM    flags;
-    VkExtent2D                          tileApronSize;
-} VkRenderPassTileShadingCreateInfoQCOM;
-
-typedef struct VkPerTileBeginInfoQCOM {
-    VkStructureType    sType;
-    const void*        pNext;
-} VkPerTileBeginInfoQCOM;
-
-typedef struct VkPerTileEndInfoQCOM {
-    VkStructureType    sType;
-    const void*        pNext;
-} VkPerTileEndInfoQCOM;
-
-typedef struct VkDispatchTileInfoQCOM {
-    VkStructureType    sType;
-    const void*        pNext;
-} VkDispatchTileInfoQCOM;
-
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchTileQCOM)(VkCommandBuffer commandBuffer, const VkDispatchTileInfoQCOM* pDispatchTileInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdBeginPerTileExecutionQCOM)(VkCommandBuffer commandBuffer, const VkPerTileBeginInfoQCOM* pPerTileBeginInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdEndPerTileExecutionQCOM)(VkCommandBuffer commandBuffer, const VkPerTileEndInfoQCOM* pPerTileEndInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaModuleNV)(VkDevice device, const VkCudaModuleCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaModuleNV* pModule);
+typedef VkResult (VKAPI_PTR *PFN_vkGetCudaModuleCacheNV)(VkDevice device, VkCudaModuleNV module, size_t* pCacheSize, void* pCacheData);
+typedef VkResult (VKAPI_PTR *PFN_vkCreateCudaFunctionNV)(VkDevice device, const VkCudaFunctionCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCudaFunctionNV* pFunction);
+typedef void (VKAPI_PTR *PFN_vkDestroyCudaModuleNV)(VkDevice device, VkCudaModuleNV module, const VkAllocationCallbacks* pAllocator);
+typedef void (VKAPI_PTR *PFN_vkDestroyCudaFunctionNV)(VkDevice device, VkCudaFunctionNV function, const VkAllocationCallbacks* pAllocator);
+typedef void (VKAPI_PTR *PFN_vkCmdCudaLaunchKernelNV)(VkCommandBuffer commandBuffer, const VkCudaLaunchInfoNV* pLaunchInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdDispatchTileQCOM(
-    VkCommandBuffer                             commandBuffer,
-    const VkDispatchTileInfoQCOM*               pDispatchTileInfo);
-#endif
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaModuleNV(
+    VkDevice                                    device,
+    const VkCudaModuleCreateInfoNV*             pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkCudaModuleNV*                             pModule);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdBeginPerTileExecutionQCOM(
-    VkCommandBuffer                             commandBuffer,
-    const VkPerTileBeginInfoQCOM*               pPerTileBeginInfo);
-#endif
+VKAPI_ATTR VkResult VKAPI_CALL vkGetCudaModuleCacheNV(
+    VkDevice                                    device,
+    VkCudaModuleNV                              module,
+    size_t*                                     pCacheSize,
+    void*                                       pCacheData);
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdEndPerTileExecutionQCOM(
+VKAPI_ATTR VkResult VKAPI_CALL vkCreateCudaFunctionNV(
+    VkDevice                                    device,
+    const VkCudaFunctionCreateInfoNV*           pCreateInfo,
+    const VkAllocationCallbacks*                pAllocator,
+    VkCudaFunctionNV*                           pFunction);
+
+VKAPI_ATTR void VKAPI_CALL vkDestroyCudaModuleNV(
+    VkDevice                                    device,
+    VkCudaModuleNV                              module,
+    const VkAllocationCallbacks*                pAllocator);
+
+VKAPI_ATTR void VKAPI_CALL vkDestroyCudaFunctionNV(
+    VkDevice                                    device,
+    VkCudaFunctionNV                            function,
+    const VkAllocationCallbacks*                pAllocator);
+
+VKAPI_ATTR void VKAPI_CALL vkCmdCudaLaunchKernelNV(
     VkCommandBuffer                             commandBuffer,
-    const VkPerTileEndInfoQCOM*                 pPerTileEndInfo);
-#endif
+    const VkCudaLaunchInfoNV*                   pLaunchInfo);
 #endif
 
 
@@ -18687,14 +16054,14 @@ typedef struct VkDescriptorAddressInfoEXT {
 
 typedef struct VkDescriptorBufferBindingInfoEXT {
     VkStructureType       sType;
-    const void*           pNext;
+    void*                 pNext;
     VkDeviceAddress       address;
     VkBufferUsageFlags    usage;
 } VkDescriptorBufferBindingInfoEXT;
 
 typedef struct VkDescriptorBufferBindingPushDescriptorBufferHandleEXT {
     VkStructureType    sType;
-    const void*        pNext;
+    void*              pNext;
     VkBuffer           buffer;
 } VkDescriptorBufferBindingPushDescriptorBufferHandleEXT;
 
@@ -18768,37 +16135,28 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT)(VkD
 typedef VkResult (VKAPI_PTR *PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT)(VkDevice device, const VkAccelerationStructureCaptureDescriptorDataInfoEXT* pInfo, void* pData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutSizeEXT(
     VkDevice                                    device,
     VkDescriptorSetLayout                       layout,
     VkDeviceSize*                               pLayoutSizeInBytes);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutBindingOffsetEXT(
     VkDevice                                    device,
     VkDescriptorSetLayout                       layout,
     uint32_t                                    binding,
     VkDeviceSize*                               pOffset);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorEXT(
     VkDevice                                    device,
     const VkDescriptorGetInfoEXT*               pDescriptorInfo,
     size_t                                      dataSize,
     void*                                       pDescriptor);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorBuffersEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    bufferCount,
     const VkDescriptorBufferBindingInfoEXT*     pBindingInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDescriptorBufferOffsetsEXT(
     VkCommandBuffer                             commandBuffer,
     VkPipelineBindPoint                         pipelineBindPoint,
@@ -18807,51 +16165,38 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDescriptorBufferOffsetsEXT(
     uint32_t                                    setCount,
     const uint32_t*                             pBufferIndices,
     const VkDeviceSize*                         pOffsets);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorBufferEmbeddedSamplersEXT(
     VkCommandBuffer                             commandBuffer,
     VkPipelineBindPoint                         pipelineBindPoint,
     VkPipelineLayout                            layout,
     uint32_t                                    set);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetBufferOpaqueCaptureDescriptorDataEXT(
     VkDevice                                    device,
     const VkBufferCaptureDescriptorDataInfoEXT* pInfo,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetImageOpaqueCaptureDescriptorDataEXT(
     VkDevice                                    device,
     const VkImageCaptureDescriptorDataInfoEXT*  pInfo,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetImageViewOpaqueCaptureDescriptorDataEXT(
     VkDevice                                    device,
     const VkImageViewCaptureDescriptorDataInfoEXT* pInfo,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSamplerOpaqueCaptureDescriptorDataEXT(
     VkDevice                                    device,
     const VkSamplerCaptureDescriptorDataInfoEXT* pInfo,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
     VkDevice                                    device,
     const VkAccelerationStructureCaptureDescriptorDataInfoEXT* pInfo,
     void*                                       pData);
 #endif
-#endif
 
 
 // VK_EXT_graphics_pipeline_library is a preprocessor guard. Do not pass it to API calls.
@@ -18951,13 +16296,11 @@ typedef struct VkPipelineFragmentShadingRateEnumStateCreateInfoNV {
 typedef void (VKAPI_PTR *PFN_vkCmdSetFragmentShadingRateEnumNV)(VkCommandBuffer           commandBuffer, VkFragmentShadingRateNV                     shadingRate, const VkFragmentShadingRateCombinerOpKHR    combinerOps[2]);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetFragmentShadingRateEnumNV(
     VkCommandBuffer                             commandBuffer,
     VkFragmentShadingRateNV                     shadingRate,
     const VkFragmentShadingRateCombinerOpKHR    combinerOps[2]);
 #endif
-#endif
 
 
 // VK_NV_ray_tracing_motion_blur is a preprocessor guard. Do not pass it to API calls.
@@ -19268,13 +16611,11 @@ typedef struct VkDeviceFaultVendorBinaryHeaderVersionOneEXT {
 typedef VkResult (VKAPI_PTR *PFN_vkGetDeviceFaultInfoEXT)(VkDevice device, VkDeviceFaultCountsEXT* pFaultCounts, VkDeviceFaultInfoEXT* pFaultInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceFaultInfoEXT(
     VkDevice                                    device,
     VkDeviceFaultCountsEXT*                     pFaultCounts,
     VkDeviceFaultInfoEXT*                       pFaultInfo);
 #endif
-#endif
 
 
 // VK_ARM_rasterization_order_attachment_access is a preprocessor guard. Do not pass it to API calls.
@@ -19366,7 +16707,6 @@ typedef struct VkVertexInputAttributeDescription2EXT {
 typedef void (VKAPI_PTR *PFN_vkCmdSetVertexInputEXT)(VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetVertexInputEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    vertexBindingDescriptionCount,
@@ -19374,7 +16714,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetVertexInputEXT(
     uint32_t                                    vertexAttributeDescriptionCount,
     const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions);
 #endif
-#endif
 
 
 // VK_EXT_physical_device_drm is a preprocessor guard. Do not pass it to API calls.
@@ -19458,14 +16797,6 @@ typedef struct VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT {
 
 
 
-// VK_EXT_present_mode_fifo_latest_ready is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_present_mode_fifo_latest_ready 1
-#define VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION 1
-#define VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME "VK_EXT_present_mode_fifo_latest_ready"
-typedef VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT;
-
-
-
 // VK_HUAWEI_subpass_shading is a preprocessor guard. Do not pass it to API calls.
 #define VK_HUAWEI_subpass_shading 1
 #define VK_HUAWEI_SUBPASS_SHADING_SPEC_VERSION 3
@@ -19493,18 +16824,14 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI
 typedef void (VKAPI_PTR *PFN_vkCmdSubpassShadingHUAWEI)(VkCommandBuffer commandBuffer);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
     VkDevice                                    device,
     VkRenderPass                                renderpass,
     VkExtent2D*                                 pMaxWorkgroupSize);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSubpassShadingHUAWEI(
     VkCommandBuffer                             commandBuffer);
 #endif
-#endif
 
 
 // VK_HUAWEI_invocation_mask is a preprocessor guard. Do not pass it to API calls.
@@ -19520,13 +16847,11 @@ typedef struct VkPhysicalDeviceInvocationMaskFeaturesHUAWEI {
 typedef void (VKAPI_PTR *PFN_vkCmdBindInvocationMaskHUAWEI)(VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindInvocationMaskHUAWEI(
     VkCommandBuffer                             commandBuffer,
     VkImageView                                 imageView,
     VkImageLayout                               imageLayout);
 #endif
-#endif
 
 
 // VK_NV_external_memory_rdma is a preprocessor guard. Do not pass it to API calls.
@@ -19550,13 +16875,11 @@ typedef struct VkPhysicalDeviceExternalMemoryRDMAFeaturesNV {
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryRemoteAddressNV)(VkDevice device, const VkMemoryGetRemoteAddressInfoNV* pMemoryGetRemoteAddressInfo, VkRemoteAddressNV* pAddress);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryRemoteAddressNV(
     VkDevice                                    device,
     const VkMemoryGetRemoteAddressInfoNV*       pMemoryGetRemoteAddressInfo,
     VkRemoteAddressNV*                          pAddress);
 #endif
-#endif
 
 
 // VK_EXT_pipeline_properties is a preprocessor guard. Do not pass it to API calls.
@@ -19580,13 +16903,11 @@ typedef struct VkPhysicalDevicePipelinePropertiesFeaturesEXT {
 typedef VkResult (VKAPI_PTR *PFN_vkGetPipelinePropertiesEXT)(VkDevice device, const VkPipelineInfoEXT* pPipelineInfo, VkBaseOutStructure* pPipelineProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelinePropertiesEXT(
     VkDevice                                    device,
     const VkPipelineInfoEXT*                    pPipelineInfo,
     VkBaseOutStructure*                         pPipelineProperties);
 #endif
-#endif
 
 
 // VK_EXT_frame_boundary is a preprocessor guard. Do not pass it to API calls.
@@ -19665,36 +16986,26 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetLogicOpEXT)(VkCommandBuffer commandBuffer,
 typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveRestartEnableEXT)(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetPatchControlPointsEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    patchControlPoints);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizerDiscardEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    rasterizerDiscardEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBiasEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthBiasEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLogicOpEXT(
     VkCommandBuffer                             commandBuffer,
     VkLogicOp                                   logicOp);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveRestartEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    primitiveRestartEnable);
 #endif
-#endif
 
 
 // VK_EXT_color_write_enable is a preprocessor guard. Do not pass it to API calls.
@@ -19717,13 +17028,11 @@ typedef struct VkPipelineColorWriteCreateInfoEXT {
 typedef void                                    (VKAPI_PTR *PFN_vkCmdSetColorWriteEnableEXT)(VkCommandBuffer       commandBuffer, uint32_t                                attachmentCount, const VkBool32*   pColorWriteEnables);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void                                    VKAPI_CALL vkCmdSetColorWriteEnableEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    attachmentCount,
     const VkBool32*                             pColorWriteEnables);
 #endif
-#endif
 
 
 // VK_EXT_primitives_generated_query is a preprocessor guard. Do not pass it to API calls.
@@ -19744,70 +17053,10 @@ typedef struct VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT {
 #define VK_EXT_global_priority_query 1
 #define VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION 1
 #define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query"
-#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT   VK_MAX_GLOBAL_PRIORITY_SIZE
-typedef VkPhysicalDeviceGlobalPriorityQueryFeatures VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT;
+#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT   VK_MAX_GLOBAL_PRIORITY_SIZE_KHR
+typedef VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT;
 
-typedef VkQueueFamilyGlobalPriorityProperties VkQueueFamilyGlobalPriorityPropertiesEXT;
-
-
-
-// VK_VALVE_video_encode_rgb_conversion is a preprocessor guard. Do not pass it to API calls.
-#define VK_VALVE_video_encode_rgb_conversion 1
-#define VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_SPEC_VERSION 1
-#define VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME "VK_VALVE_video_encode_rgb_conversion"
-
-typedef enum VkVideoEncodeRgbModelConversionFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_RGB_IDENTITY_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_IDENTITY_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_709_BIT_VALVE = 0x00000004,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_601_BIT_VALVE = 0x00000008,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_2020_BIT_VALVE = 0x00000010,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbModelConversionFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbModelConversionFlagsVALVE;
-
-typedef enum VkVideoEncodeRgbRangeCompressionFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FULL_RANGE_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_NARROW_RANGE_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbRangeCompressionFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbRangeCompressionFlagsVALVE;
-
-typedef enum VkVideoEncodeRgbChromaOffsetFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_COSITED_EVEN_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_MIDPOINT_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbChromaOffsetFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbChromaOffsetFlagsVALVE;
-typedef struct VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeRgbConversion;
-} VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-
-typedef struct VkVideoEncodeRgbConversionCapabilitiesVALVE {
-    VkStructureType                               sType;
-    void*                                         pNext;
-    VkVideoEncodeRgbModelConversionFlagsVALVE     rgbModels;
-    VkVideoEncodeRgbRangeCompressionFlagsVALVE    rgbRanges;
-    VkVideoEncodeRgbChromaOffsetFlagsVALVE        xChromaOffsets;
-    VkVideoEncodeRgbChromaOffsetFlagsVALVE        yChromaOffsets;
-} VkVideoEncodeRgbConversionCapabilitiesVALVE;
-
-typedef struct VkVideoEncodeProfileRgbConversionInfoVALVE {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           performEncodeRgbConversion;
-} VkVideoEncodeProfileRgbConversionInfoVALVE;
-
-typedef struct VkVideoEncodeSessionRgbConversionCreateInfoVALVE {
-    VkStructureType                                  sType;
-    const void*                                      pNext;
-    VkVideoEncodeRgbModelConversionFlagBitsVALVE     rgbModel;
-    VkVideoEncodeRgbRangeCompressionFlagBitsVALVE    rgbRange;
-    VkVideoEncodeRgbChromaOffsetFlagBitsVALVE        xChromaOffset;
-    VkVideoEncodeRgbChromaOffsetFlagBitsVALVE        yChromaOffset;
-} VkVideoEncodeSessionRgbConversionCreateInfoVALVE;
+typedef VkQueueFamilyGlobalPriorityPropertiesKHR VkQueueFamilyGlobalPriorityPropertiesEXT;
 
 
 
@@ -19860,7 +17109,6 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawMultiEXT)(VkCommandBuffer commandBuffer, u
 typedef void (VKAPI_PTR *PFN_vkCmdDrawMultiIndexedEXT)(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMultiEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    drawCount,
@@ -19868,9 +17116,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMultiEXT(
     uint32_t                                    instanceCount,
     uint32_t                                    firstInstance,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMultiIndexedEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    drawCount,
@@ -19880,7 +17126,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMultiIndexedEXT(
     uint32_t                                    stride,
     const int32_t*                              pVertexOffset);
 #endif
-#endif
 
 
 // VK_EXT_image_2d_view_of_3d is a preprocessor guard. Do not pass it to API calls.
@@ -19956,7 +17201,6 @@ typedef enum VkOpacityMicromapSpecialIndexEXT {
     VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_OPAQUE_EXT = -2,
     VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_TRANSPARENT_EXT = -3,
     VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_OPAQUE_EXT = -4,
-    VK_OPACITY_MICROMAP_SPECIAL_INDEX_CLUSTER_GEOMETRY_DISABLE_OPACITY_MICROMAP_NV = -5,
     VK_OPACITY_MICROMAP_SPECIAL_INDEX_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkOpacityMicromapSpecialIndexEXT;
 
@@ -20112,58 +17356,43 @@ typedef void (VKAPI_PTR *PFN_vkGetDeviceMicromapCompatibilityEXT)(VkDevice devic
 typedef void (VKAPI_PTR *PFN_vkGetMicromapBuildSizesEXT)(VkDevice                                            device, VkAccelerationStructureBuildTypeKHR                 buildType, const VkMicromapBuildInfoEXT*  pBuildInfo, VkMicromapBuildSizesInfoEXT*           pSizeInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateMicromapEXT(
     VkDevice                                    device,
     const VkMicromapCreateInfoEXT*              pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkMicromapEXT*                              pMicromap);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyMicromapEXT(
     VkDevice                                    device,
     VkMicromapEXT                               micromap,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBuildMicromapsEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    infoCount,
     const VkMicromapBuildInfoEXT*               pInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBuildMicromapsEXT(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     uint32_t                                    infoCount,
     const VkMicromapBuildInfoEXT*               pInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyMicromapEXT(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyMicromapInfoEXT*                pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyMicromapToMemoryEXT(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyMicromapToMemoryInfoEXT*        pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyMemoryToMicromapEXT(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyMemoryToMicromapInfoEXT*        pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkWriteMicromapsPropertiesEXT(
     VkDevice                                    device,
     uint32_t                                    micromapCount,
@@ -20172,27 +17401,19 @@ VKAPI_ATTR VkResult VKAPI_CALL vkWriteMicromapsPropertiesEXT(
     size_t                                      dataSize,
     void*                                       pData,
     size_t                                      stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMicromapEXT(
     VkCommandBuffer                             commandBuffer,
     const VkCopyMicromapInfoEXT*                pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMicromapToMemoryEXT(
     VkCommandBuffer                             commandBuffer,
     const VkCopyMicromapToMemoryInfoEXT*        pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToMicromapEXT(
     VkCommandBuffer                             commandBuffer,
     const VkCopyMemoryToMicromapInfoEXT*        pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWriteMicromapsPropertiesEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    micromapCount,
@@ -20200,23 +17421,18 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteMicromapsPropertiesEXT(
     VkQueryType                                 queryType,
     VkQueryPool                                 queryPool,
     uint32_t                                    firstQuery);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceMicromapCompatibilityEXT(
     VkDevice                                    device,
     const VkMicromapVersionInfoEXT*             pVersionInfo,
     VkAccelerationStructureCompatibilityKHR*    pCompatibility);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetMicromapBuildSizesEXT(
     VkDevice                                    device,
     VkAccelerationStructureBuildTypeKHR         buildType,
     const VkMicromapBuildInfoEXT*               pBuildInfo,
     VkMicromapBuildSizesInfoEXT*                pSizeInfo);
 #endif
-#endif
 
 
 // VK_EXT_load_store_op_none is a preprocessor guard. Do not pass it to API calls.
@@ -20255,21 +17471,17 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawClusterHUAWEI)(VkCommandBuffer commandBuff
 typedef void (VKAPI_PTR *PFN_vkCmdDrawClusterIndirectHUAWEI)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawClusterHUAWEI(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    groupCountX,
     uint32_t                                    groupCountY,
     uint32_t                                    groupCountZ);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawClusterIndirectHUAWEI(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
     VkDeviceSize                                offset);
 #endif
-#endif
 
 
 // VK_EXT_border_color_swizzle is a preprocessor guard. Do not pass it to API calls.
@@ -20305,13 +17517,11 @@ typedef struct VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT {
 typedef void (VKAPI_PTR *PFN_vkSetDeviceMemoryPriorityEXT)(VkDevice       device, VkDeviceMemory memory, float          priority);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkSetDeviceMemoryPriorityEXT(
     VkDevice                                    device,
     VkDeviceMemory                              memory,
     float                                       priority);
 #endif
-#endif
 
 
 // VK_ARM_shader_core_properties is a preprocessor guard. Do not pass it to API calls.
@@ -20406,27 +17616,27 @@ typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE)(VkDev
 typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetHostMappingVALVE)(VkDevice device, VkDescriptorSet descriptorSet, void** ppData);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutHostMappingInfoVALVE(
     VkDevice                                    device,
     const VkDescriptorSetBindingReferenceVALVE* pBindingReference,
     VkDescriptorSetLayoutHostMappingInfoVALVE*  pHostMapping);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetHostMappingVALVE(
     VkDevice                                    device,
     VkDescriptorSet                             descriptorSet,
     void**                                      ppData);
 #endif
-#endif
 
 
 // VK_EXT_depth_clamp_zero_one is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_depth_clamp_zero_one 1
 #define VK_EXT_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION 1
 #define VK_EXT_DEPTH_CLAMP_ZERO_ONE_EXTENSION_NAME "VK_EXT_depth_clamp_zero_one"
-typedef VkPhysicalDeviceDepthClampZeroOneFeaturesKHR VkPhysicalDeviceDepthClampZeroOneFeaturesEXT;
+typedef struct VkPhysicalDeviceDepthClampZeroOneFeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           depthClampZeroOne;
+} VkPhysicalDeviceDepthClampZeroOneFeaturesEXT;
 
 
 
@@ -20483,32 +17693,26 @@ typedef struct VkRenderPassStripeSubmitInfoARM {
 
 // VK_QCOM_fragment_density_map_offset is a preprocessor guard. Do not pass it to API calls.
 #define VK_QCOM_fragment_density_map_offset 1
-#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 3
+#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1
 #define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_QCOM_fragment_density_map_offset"
-typedef struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT {
+typedef struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM {
     VkStructureType    sType;
     void*              pNext;
     VkBool32           fragmentDensityMapOffset;
-} VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
+} VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
 
-typedef VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
-
-typedef struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT {
+typedef struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM {
     VkStructureType    sType;
     void*              pNext;
     VkExtent2D         fragmentDensityOffsetGranularity;
-} VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
+} VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
 
-typedef VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
-
-typedef struct VkRenderPassFragmentDensityMapOffsetEndInfoEXT {
+typedef struct VkSubpassFragmentDensityMapOffsetEndInfoQCOM {
     VkStructureType      sType;
     const void*          pNext;
     uint32_t             fragmentDensityOffsetCount;
     const VkOffset2D*    pFragmentDensityOffsets;
-} VkRenderPassFragmentDensityMapOffsetEndInfoEXT;
-
-typedef VkRenderPassFragmentDensityMapOffsetEndInfoEXT VkSubpassFragmentDensityMapOffsetEndInfoQCOM;
+} VkSubpassFragmentDensityMapOffsetEndInfoQCOM;
 
 
 
@@ -20516,9 +17720,20 @@ typedef VkRenderPassFragmentDensityMapOffsetEndInfoEXT VkSubpassFragmentDensityM
 #define VK_NV_copy_memory_indirect 1
 #define VK_NV_COPY_MEMORY_INDIRECT_SPEC_VERSION 1
 #define VK_NV_COPY_MEMORY_INDIRECT_EXTENSION_NAME "VK_NV_copy_memory_indirect"
-typedef VkCopyMemoryIndirectCommandKHR VkCopyMemoryIndirectCommandNV;
+typedef struct VkCopyMemoryIndirectCommandNV {
+    VkDeviceAddress    srcAddress;
+    VkDeviceAddress    dstAddress;
+    VkDeviceSize       size;
+} VkCopyMemoryIndirectCommandNV;
 
-typedef VkCopyMemoryToImageIndirectCommandKHR VkCopyMemoryToImageIndirectCommandNV;
+typedef struct VkCopyMemoryToImageIndirectCommandNV {
+    VkDeviceAddress             srcAddress;
+    uint32_t                    bufferRowLength;
+    uint32_t                    bufferImageHeight;
+    VkImageSubresourceLayers    imageSubresource;
+    VkOffset3D                  imageOffset;
+    VkExtent3D                  imageExtent;
+} VkCopyMemoryToImageIndirectCommandNV;
 
 typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesNV {
     VkStructureType    sType;
@@ -20526,21 +17741,22 @@ typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesNV {
     VkBool32           indirectCopy;
 } VkPhysicalDeviceCopyMemoryIndirectFeaturesNV;
 
-typedef VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR VkPhysicalDeviceCopyMemoryIndirectPropertiesNV;
+typedef struct VkPhysicalDeviceCopyMemoryIndirectPropertiesNV {
+    VkStructureType    sType;
+    void*              pNext;
+    VkQueueFlags       supportedQueues;
+} VkPhysicalDeviceCopyMemoryIndirectPropertiesNV;
 
 typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryIndirectNV)(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride);
 typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryToImageIndirectNV)(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride, VkImage dstImage, VkImageLayout dstImageLayout, const VkImageSubresourceLayers* pImageSubresources);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryIndirectNV(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             copyBufferAddress,
     uint32_t                                    copyCount,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToImageIndirectNV(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             copyBufferAddress,
@@ -20550,7 +17766,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToImageIndirectNV(
     VkImageLayout                               dstImageLayout,
     const VkImageSubresourceLayers*             pImageSubresources);
 #endif
-#endif
 
 
 // VK_NV_memory_decompression is a preprocessor guard. Do not pass it to API calls.
@@ -20558,16 +17773,11 @@ VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToImageIndirectNV(
 #define VK_NV_MEMORY_DECOMPRESSION_SPEC_VERSION 1
 #define VK_NV_MEMORY_DECOMPRESSION_EXTENSION_NAME "VK_NV_memory_decompression"
 
-// Flag bits for VkMemoryDecompressionMethodFlagBitsEXT
-typedef VkFlags64 VkMemoryDecompressionMethodFlagBitsEXT;
-static const VkMemoryDecompressionMethodFlagBitsEXT VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_EXT = 0x00000001ULL;
-static const VkMemoryDecompressionMethodFlagBitsEXT VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_NV = 0x00000001ULL;
-
-typedef VkMemoryDecompressionMethodFlagBitsEXT VkMemoryDecompressionMethodFlagBitsNV;
-
-typedef VkFlags64 VkMemoryDecompressionMethodFlagsEXT;
-typedef VkMemoryDecompressionMethodFlagsEXT VkMemoryDecompressionMethodFlagsNV;
+// Flag bits for VkMemoryDecompressionMethodFlagBitsNV
+typedef VkFlags64 VkMemoryDecompressionMethodFlagBitsNV;
+static const VkMemoryDecompressionMethodFlagBitsNV VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_NV = 0x00000001ULL;
 
+typedef VkFlags64 VkMemoryDecompressionMethodFlagsNV;
 typedef struct VkDecompressMemoryRegionNV {
     VkDeviceAddress                       srcAddress;
     VkDeviceAddress                       dstAddress;
@@ -20576,42 +17786,34 @@ typedef struct VkDecompressMemoryRegionNV {
     VkMemoryDecompressionMethodFlagsNV    decompressionMethod;
 } VkDecompressMemoryRegionNV;
 
-typedef struct VkPhysicalDeviceMemoryDecompressionFeaturesEXT {
+typedef struct VkPhysicalDeviceMemoryDecompressionFeaturesNV {
     VkStructureType    sType;
     void*              pNext;
     VkBool32           memoryDecompression;
-} VkPhysicalDeviceMemoryDecompressionFeaturesEXT;
+} VkPhysicalDeviceMemoryDecompressionFeaturesNV;
 
-typedef VkPhysicalDeviceMemoryDecompressionFeaturesEXT VkPhysicalDeviceMemoryDecompressionFeaturesNV;
-
-typedef struct VkPhysicalDeviceMemoryDecompressionPropertiesEXT {
-    VkStructureType                        sType;
-    void*                                  pNext;
-    VkMemoryDecompressionMethodFlagsEXT    decompressionMethods;
-    uint64_t                               maxDecompressionIndirectCount;
-} VkPhysicalDeviceMemoryDecompressionPropertiesEXT;
-
-typedef VkPhysicalDeviceMemoryDecompressionPropertiesEXT VkPhysicalDeviceMemoryDecompressionPropertiesNV;
+typedef struct VkPhysicalDeviceMemoryDecompressionPropertiesNV {
+    VkStructureType                       sType;
+    void*                                 pNext;
+    VkMemoryDecompressionMethodFlagsNV    decompressionMethods;
+    uint64_t                              maxDecompressionIndirectCount;
+} VkPhysicalDeviceMemoryDecompressionPropertiesNV;
 
 typedef void (VKAPI_PTR *PFN_vkCmdDecompressMemoryNV)(VkCommandBuffer commandBuffer, uint32_t decompressRegionCount, const VkDecompressMemoryRegionNV* pDecompressMemoryRegions);
 typedef void (VKAPI_PTR *PFN_vkCmdDecompressMemoryIndirectCountNV)(VkCommandBuffer commandBuffer, VkDeviceAddress indirectCommandsAddress, VkDeviceAddress indirectCommandsCountAddress, uint32_t stride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDecompressMemoryNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    decompressRegionCount,
     const VkDecompressMemoryRegionNV*           pDecompressMemoryRegions);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDecompressMemoryIndirectCountNV(
     VkCommandBuffer                             commandBuffer,
     VkDeviceAddress                             indirectCommandsAddress,
     VkDeviceAddress                             indirectCommandsCountAddress,
     uint32_t                                    stride);
 #endif
-#endif
 
 
 // VK_NV_device_generated_commands_compute is a preprocessor guard. Do not pass it to API calls.
@@ -20650,81 +17852,20 @@ typedef void (VKAPI_PTR *PFN_vkCmdUpdatePipelineIndirectBufferNV)(VkCommandBuffe
 typedef VkDeviceAddress (VKAPI_PTR *PFN_vkGetPipelineIndirectDeviceAddressNV)(VkDevice device, const VkPipelineIndirectDeviceAddressInfoNV* pInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetPipelineIndirectMemoryRequirementsNV(
     VkDevice                                    device,
     const VkComputePipelineCreateInfo*          pCreateInfo,
     VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdUpdatePipelineIndirectBufferNV(
     VkCommandBuffer                             commandBuffer,
     VkPipelineBindPoint                         pipelineBindPoint,
     VkPipeline                                  pipeline);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetPipelineIndirectDeviceAddressNV(
     VkDevice                                    device,
     const VkPipelineIndirectDeviceAddressInfoNV* pInfo);
 #endif
-#endif
-
-
-// VK_NV_ray_tracing_linear_swept_spheres is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_ray_tracing_linear_swept_spheres 1
-#define VK_NV_RAY_TRACING_LINEAR_SWEPT_SPHERES_SPEC_VERSION 1
-#define VK_NV_RAY_TRACING_LINEAR_SWEPT_SPHERES_EXTENSION_NAME "VK_NV_ray_tracing_linear_swept_spheres"
-
-typedef enum VkRayTracingLssIndexingModeNV {
-    VK_RAY_TRACING_LSS_INDEXING_MODE_LIST_NV = 0,
-    VK_RAY_TRACING_LSS_INDEXING_MODE_SUCCESSIVE_NV = 1,
-    VK_RAY_TRACING_LSS_INDEXING_MODE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkRayTracingLssIndexingModeNV;
-
-typedef enum VkRayTracingLssPrimitiveEndCapsModeNV {
-    VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_NONE_NV = 0,
-    VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_CHAINED_NV = 1,
-    VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkRayTracingLssPrimitiveEndCapsModeNV;
-typedef struct VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           spheres;
-    VkBool32           linearSweptSpheres;
-} VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-
-typedef struct VkAccelerationStructureGeometryLinearSweptSpheresDataNV {
-    VkStructureType                          sType;
-    const void*                              pNext;
-    VkFormat                                 vertexFormat;
-    VkDeviceOrHostAddressConstKHR            vertexData;
-    VkDeviceSize                             vertexStride;
-    VkFormat                                 radiusFormat;
-    VkDeviceOrHostAddressConstKHR            radiusData;
-    VkDeviceSize                             radiusStride;
-    VkIndexType                              indexType;
-    VkDeviceOrHostAddressConstKHR            indexData;
-    VkDeviceSize                             indexStride;
-    VkRayTracingLssIndexingModeNV            indexingMode;
-    VkRayTracingLssPrimitiveEndCapsModeNV    endCapsMode;
-} VkAccelerationStructureGeometryLinearSweptSpheresDataNV;
-
-typedef struct VkAccelerationStructureGeometrySpheresDataNV {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkFormat                         vertexFormat;
-    VkDeviceOrHostAddressConstKHR    vertexData;
-    VkDeviceSize                     vertexStride;
-    VkFormat                         radiusFormat;
-    VkDeviceOrHostAddressConstKHR    radiusData;
-    VkDeviceSize                     radiusStride;
-    VkIndexType                      indexType;
-    VkDeviceOrHostAddressConstKHR    indexData;
-    VkDeviceSize                     indexStride;
-} VkAccelerationStructureGeometrySpheresDataNV;
-
 
 
 // VK_NV_linear_color_attachment is a preprocessor guard. Do not pass it to API calls.
@@ -20916,204 +18057,142 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetRepresentativeFragmentTestEnableNV)(VkComma
 typedef void (VKAPI_PTR *PFN_vkCmdSetCoverageReductionModeNV)(VkCommandBuffer commandBuffer, VkCoverageReductionModeNV coverageReductionMode);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthClampEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthClampEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetPolygonModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkPolygonMode                               polygonMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizationSamplesEXT(
     VkCommandBuffer                             commandBuffer,
     VkSampleCountFlagBits                       rasterizationSamples);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetSampleMaskEXT(
     VkCommandBuffer                             commandBuffer,
     VkSampleCountFlagBits                       samples,
     const VkSampleMask*                         pSampleMask);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetAlphaToCoverageEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    alphaToCoverageEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetAlphaToOneEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    alphaToOneEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLogicOpEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    logicOpEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetColorBlendEnableEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstAttachment,
     uint32_t                                    attachmentCount,
     const VkBool32*                             pColorBlendEnables);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetColorBlendEquationEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstAttachment,
     uint32_t                                    attachmentCount,
     const VkColorBlendEquationEXT*              pColorBlendEquations);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetColorWriteMaskEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstAttachment,
     uint32_t                                    attachmentCount,
     const VkColorComponentFlags*                pColorWriteMasks);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetTessellationDomainOriginEXT(
     VkCommandBuffer                             commandBuffer,
     VkTessellationDomainOrigin                  domainOrigin);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizationStreamEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    rasterizationStream);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetConservativeRasterizationModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkConservativeRasterizationModeEXT          conservativeRasterizationMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetExtraPrimitiveOverestimationSizeEXT(
     VkCommandBuffer                             commandBuffer,
     float                                       extraPrimitiveOverestimationSize);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthClipEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    depthClipEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetSampleLocationsEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    sampleLocationsEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetColorBlendAdvancedEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstAttachment,
     uint32_t                                    attachmentCount,
     const VkColorBlendAdvancedEXT*              pColorBlendAdvanced);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetProvokingVertexModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkProvokingVertexModeEXT                    provokingVertexMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLineRasterizationModeEXT(
     VkCommandBuffer                             commandBuffer,
     VkLineRasterizationModeEXT                  lineRasterizationMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetLineStippleEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    stippledLineEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthClipNegativeOneToOneEXT(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    negativeOneToOne);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWScalingEnableNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    viewportWScalingEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportSwizzleNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    firstViewport,
     uint32_t                                    viewportCount,
     const VkViewportSwizzleNV*                  pViewportSwizzles);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageToColorEnableNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    coverageToColorEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageToColorLocationNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    coverageToColorLocation);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageModulationModeNV(
     VkCommandBuffer                             commandBuffer,
     VkCoverageModulationModeNV                  coverageModulationMode);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageModulationTableEnableNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    coverageModulationTableEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageModulationTableNV(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    coverageModulationTableCount,
     const float*                                pCoverageModulationTable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetShadingRateImageEnableNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    shadingRateImageEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRepresentativeFragmentTestEnableNV(
     VkCommandBuffer                             commandBuffer,
     VkBool32                                    representativeFragmentTestEnable);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetCoverageReductionModeNV(
     VkCommandBuffer                             commandBuffer,
     VkCoverageReductionModeNV                   coverageReductionMode);
 #endif
-#endif
 
 
 // VK_EXT_subpass_merge_feedback is a preprocessor guard. Do not pass it to API calls.
@@ -21205,329 +18284,6 @@ typedef struct VkDirectDriverLoadingListLUNARG {
 
 
 
-// VK_ARM_tensors is a preprocessor guard. Do not pass it to API calls.
-#define VK_ARM_tensors 1
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkTensorARM)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkTensorViewARM)
-#define VK_ARM_TENSORS_SPEC_VERSION       1
-#define VK_ARM_TENSORS_EXTENSION_NAME     "VK_ARM_tensors"
-
-typedef enum VkTensorTilingARM {
-    VK_TENSOR_TILING_OPTIMAL_ARM = 0,
-    VK_TENSOR_TILING_LINEAR_ARM = 1,
-    VK_TENSOR_TILING_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkTensorTilingARM;
-typedef VkFlags64 VkTensorCreateFlagsARM;
-
-// Flag bits for VkTensorCreateFlagBitsARM
-typedef VkFlags64 VkTensorCreateFlagBitsARM;
-static const VkTensorCreateFlagBitsARM VK_TENSOR_CREATE_MUTABLE_FORMAT_BIT_ARM = 0x00000001ULL;
-static const VkTensorCreateFlagBitsARM VK_TENSOR_CREATE_PROTECTED_BIT_ARM = 0x00000002ULL;
-static const VkTensorCreateFlagBitsARM VK_TENSOR_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM = 0x00000004ULL;
-
-typedef VkFlags64 VkTensorViewCreateFlagsARM;
-
-// Flag bits for VkTensorViewCreateFlagBitsARM
-typedef VkFlags64 VkTensorViewCreateFlagBitsARM;
-static const VkTensorViewCreateFlagBitsARM VK_TENSOR_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM = 0x00000001ULL;
-
-typedef VkFlags64 VkTensorUsageFlagsARM;
-
-// Flag bits for VkTensorUsageFlagBitsARM
-typedef VkFlags64 VkTensorUsageFlagBitsARM;
-static const VkTensorUsageFlagBitsARM VK_TENSOR_USAGE_SHADER_BIT_ARM = 0x00000002ULL;
-static const VkTensorUsageFlagBitsARM VK_TENSOR_USAGE_TRANSFER_SRC_BIT_ARM = 0x00000004ULL;
-static const VkTensorUsageFlagBitsARM VK_TENSOR_USAGE_TRANSFER_DST_BIT_ARM = 0x00000008ULL;
-static const VkTensorUsageFlagBitsARM VK_TENSOR_USAGE_IMAGE_ALIASING_BIT_ARM = 0x00000010ULL;
-static const VkTensorUsageFlagBitsARM VK_TENSOR_USAGE_DATA_GRAPH_BIT_ARM = 0x00000020ULL;
-
-typedef struct VkTensorDescriptionARM {
-    VkStructureType          sType;
-    const void*              pNext;
-    VkTensorTilingARM        tiling;
-    VkFormat                 format;
-    uint32_t                 dimensionCount;
-    const int64_t*           pDimensions;
-    const int64_t*           pStrides;
-    VkTensorUsageFlagsARM    usage;
-} VkTensorDescriptionARM;
-
-typedef struct VkTensorCreateInfoARM {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkTensorCreateFlagsARM           flags;
-    const VkTensorDescriptionARM*    pDescription;
-    VkSharingMode                    sharingMode;
-    uint32_t                         queueFamilyIndexCount;
-    const uint32_t*                  pQueueFamilyIndices;
-} VkTensorCreateInfoARM;
-
-typedef struct VkTensorViewCreateInfoARM {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkTensorViewCreateFlagsARM    flags;
-    VkTensorARM                   tensor;
-    VkFormat                      format;
-} VkTensorViewCreateInfoARM;
-
-typedef struct VkTensorMemoryRequirementsInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorARM        tensor;
-} VkTensorMemoryRequirementsInfoARM;
-
-typedef struct VkBindTensorMemoryInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorARM        tensor;
-    VkDeviceMemory     memory;
-    VkDeviceSize       memoryOffset;
-} VkBindTensorMemoryInfoARM;
-
-typedef struct VkWriteDescriptorSetTensorARM {
-    VkStructureType           sType;
-    const void*               pNext;
-    uint32_t                  tensorViewCount;
-    const VkTensorViewARM*    pTensorViews;
-} VkWriteDescriptorSetTensorARM;
-
-typedef struct VkTensorFormatPropertiesARM {
-    VkStructureType          sType;
-    void*                    pNext;
-    VkFormatFeatureFlags2    optimalTilingTensorFeatures;
-    VkFormatFeatureFlags2    linearTilingTensorFeatures;
-} VkTensorFormatPropertiesARM;
-
-typedef struct VkPhysicalDeviceTensorPropertiesARM {
-    VkStructureType       sType;
-    void*                 pNext;
-    uint32_t              maxTensorDimensionCount;
-    uint64_t              maxTensorElements;
-    uint64_t              maxPerDimensionTensorElements;
-    int64_t               maxTensorStride;
-    uint64_t              maxTensorSize;
-    uint32_t              maxTensorShaderAccessArrayLength;
-    uint32_t              maxTensorShaderAccessSize;
-    uint32_t              maxDescriptorSetStorageTensors;
-    uint32_t              maxPerStageDescriptorSetStorageTensors;
-    uint32_t              maxDescriptorSetUpdateAfterBindStorageTensors;
-    uint32_t              maxPerStageDescriptorUpdateAfterBindStorageTensors;
-    VkBool32              shaderStorageTensorArrayNonUniformIndexingNative;
-    VkShaderStageFlags    shaderTensorSupportedStages;
-} VkPhysicalDeviceTensorPropertiesARM;
-
-typedef struct VkTensorMemoryBarrierARM {
-    VkStructureType          sType;
-    const void*              pNext;
-    VkPipelineStageFlags2    srcStageMask;
-    VkAccessFlags2           srcAccessMask;
-    VkPipelineStageFlags2    dstStageMask;
-    VkAccessFlags2           dstAccessMask;
-    uint32_t                 srcQueueFamilyIndex;
-    uint32_t                 dstQueueFamilyIndex;
-    VkTensorARM              tensor;
-} VkTensorMemoryBarrierARM;
-
-typedef struct VkTensorDependencyInfoARM {
-    VkStructureType                    sType;
-    const void*                        pNext;
-    uint32_t                           tensorMemoryBarrierCount;
-    const VkTensorMemoryBarrierARM*    pTensorMemoryBarriers;
-} VkTensorDependencyInfoARM;
-
-typedef struct VkPhysicalDeviceTensorFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           tensorNonPacked;
-    VkBool32           shaderTensorAccess;
-    VkBool32           shaderStorageTensorArrayDynamicIndexing;
-    VkBool32           shaderStorageTensorArrayNonUniformIndexing;
-    VkBool32           descriptorBindingStorageTensorUpdateAfterBind;
-    VkBool32           tensors;
-} VkPhysicalDeviceTensorFeaturesARM;
-
-typedef struct VkDeviceTensorMemoryRequirementsARM {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    const VkTensorCreateInfoARM*    pCreateInfo;
-} VkDeviceTensorMemoryRequirementsARM;
-
-typedef struct VkTensorCopyARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           dimensionCount;
-    const uint64_t*    pSrcOffset;
-    const uint64_t*    pDstOffset;
-    const uint64_t*    pExtent;
-} VkTensorCopyARM;
-
-typedef struct VkCopyTensorInfoARM {
-    VkStructureType           sType;
-    const void*               pNext;
-    VkTensorARM               srcTensor;
-    VkTensorARM               dstTensor;
-    uint32_t                  regionCount;
-    const VkTensorCopyARM*    pRegions;
-} VkCopyTensorInfoARM;
-
-typedef struct VkMemoryDedicatedAllocateInfoTensorARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorARM        tensor;
-} VkMemoryDedicatedAllocateInfoTensorARM;
-
-typedef struct VkPhysicalDeviceExternalTensorInfoARM {
-    VkStructureType                       sType;
-    const void*                           pNext;
-    VkTensorCreateFlagsARM                flags;
-    const VkTensorDescriptionARM*         pDescription;
-    VkExternalMemoryHandleTypeFlagBits    handleType;
-} VkPhysicalDeviceExternalTensorInfoARM;
-
-typedef struct VkExternalTensorPropertiesARM {
-    VkStructureType               sType;
-    const void*                   pNext;
-    VkExternalMemoryProperties    externalMemoryProperties;
-} VkExternalTensorPropertiesARM;
-
-typedef struct VkExternalMemoryTensorCreateInfoARM {
-    VkStructureType                    sType;
-    const void*                        pNext;
-    VkExternalMemoryHandleTypeFlags    handleTypes;
-} VkExternalMemoryTensorCreateInfoARM;
-
-typedef struct VkPhysicalDeviceDescriptorBufferTensorFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           descriptorBufferTensorDescriptors;
-} VkPhysicalDeviceDescriptorBufferTensorFeaturesARM;
-
-typedef struct VkPhysicalDeviceDescriptorBufferTensorPropertiesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    size_t             tensorCaptureReplayDescriptorDataSize;
-    size_t             tensorViewCaptureReplayDescriptorDataSize;
-    size_t             tensorDescriptorSize;
-} VkPhysicalDeviceDescriptorBufferTensorPropertiesARM;
-
-typedef struct VkDescriptorGetTensorInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorViewARM    tensorView;
-} VkDescriptorGetTensorInfoARM;
-
-typedef struct VkTensorCaptureDescriptorDataInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorARM        tensor;
-} VkTensorCaptureDescriptorDataInfoARM;
-
-typedef struct VkTensorViewCaptureDescriptorDataInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkTensorViewARM    tensorView;
-} VkTensorViewCaptureDescriptorDataInfoARM;
-
-typedef struct VkFrameBoundaryTensorsARM {
-    VkStructureType       sType;
-    const void*           pNext;
-    uint32_t              tensorCount;
-    const VkTensorARM*    pTensors;
-} VkFrameBoundaryTensorsARM;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreateTensorARM)(VkDevice device, const VkTensorCreateInfoARM* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkTensorARM* pTensor);
-typedef void (VKAPI_PTR *PFN_vkDestroyTensorARM)(VkDevice device, VkTensorARM tensor, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateTensorViewARM)(VkDevice device, const VkTensorViewCreateInfoARM* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkTensorViewARM* pView);
-typedef void (VKAPI_PTR *PFN_vkDestroyTensorViewARM)(VkDevice device, VkTensorViewARM tensorView, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkGetTensorMemoryRequirementsARM)(VkDevice device, const VkTensorMemoryRequirementsInfoARM* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef VkResult (VKAPI_PTR *PFN_vkBindTensorMemoryARM)(VkDevice device, uint32_t bindInfoCount, const VkBindTensorMemoryInfoARM* pBindInfos);
-typedef void (VKAPI_PTR *PFN_vkGetDeviceTensorMemoryRequirementsARM)(VkDevice device, const VkDeviceTensorMemoryRequirementsARM* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyTensorARM)(VkCommandBuffer commandBuffer, const VkCopyTensorInfoARM* pCopyTensorInfo);
-typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM)(VkPhysicalDevice                             physicalDevice, const VkPhysicalDeviceExternalTensorInfoARM* pExternalTensorInfo, VkExternalTensorPropertiesARM*               pExternalTensorProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkGetTensorOpaqueCaptureDescriptorDataARM)(VkDevice                                    device, const VkTensorCaptureDescriptorDataInfoARM* pInfo, void*                                       pData);
-typedef VkResult (VKAPI_PTR *PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM)(VkDevice                                        device, const VkTensorViewCaptureDescriptorDataInfoARM* pInfo, void*                                           pData);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateTensorARM(
-    VkDevice                                    device,
-    const VkTensorCreateInfoARM*                pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkTensorARM*                                pTensor);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyTensorARM(
-    VkDevice                                    device,
-    VkTensorARM                                 tensor,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateTensorViewARM(
-    VkDevice                                    device,
-    const VkTensorViewCreateInfoARM*            pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkTensorViewARM*                            pView);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyTensorViewARM(
-    VkDevice                                    device,
-    VkTensorViewARM                             tensorView,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetTensorMemoryRequirementsARM(
-    VkDevice                                    device,
-    const VkTensorMemoryRequirementsInfoARM*    pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkBindTensorMemoryARM(
-    VkDevice                                    device,
-    uint32_t                                    bindInfoCount,
-    const VkBindTensorMemoryInfoARM*            pBindInfos);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetDeviceTensorMemoryRequirementsARM(
-    VkDevice                                    device,
-    const VkDeviceTensorMemoryRequirementsARM*  pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyTensorARM(
-    VkCommandBuffer                             commandBuffer,
-    const VkCopyTensorInfoARM*                  pCopyTensorInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalTensorPropertiesARM(
-    VkPhysicalDevice                            physicalDevice,
-    const VkPhysicalDeviceExternalTensorInfoARM* pExternalTensorInfo,
-    VkExternalTensorPropertiesARM*              pExternalTensorProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetTensorOpaqueCaptureDescriptorDataARM(
-    VkDevice                                    device,
-    const VkTensorCaptureDescriptorDataInfoARM* pInfo,
-    void*                                       pData);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetTensorViewOpaqueCaptureDescriptorDataARM(
-    VkDevice                                    device,
-    const VkTensorViewCaptureDescriptorDataInfoARM* pInfo,
-    void*                                       pData);
-#endif
-#endif
-
-
 // VK_EXT_shader_module_identifier is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_shader_module_identifier 1
 #define VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT 32U
@@ -21563,20 +18319,16 @@ typedef void (VKAPI_PTR *PFN_vkGetShaderModuleIdentifierEXT)(VkDevice device, Vk
 typedef void (VKAPI_PTR *PFN_vkGetShaderModuleCreateInfoIdentifierEXT)(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, VkShaderModuleIdentifierEXT* pIdentifier);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetShaderModuleIdentifierEXT(
     VkDevice                                    device,
     VkShaderModule                              shaderModule,
     VkShaderModuleIdentifierEXT*                pIdentifier);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetShaderModuleCreateInfoIdentifierEXT(
     VkDevice                                    device,
     const VkShaderModuleCreateInfo*             pCreateInfo,
     VkShaderModuleIdentifierEXT*                pIdentifier);
 #endif
-#endif
 
 
 // VK_EXT_rasterization_order_attachment_access is a preprocessor guard. Do not pass it to API calls.
@@ -21678,7 +18430,7 @@ typedef struct VkOpticalFlowImageFormatInfoNV {
 
 typedef struct VkOpticalFlowImageFormatPropertiesNV {
     VkStructureType    sType;
-    void*              pNext;
+    const void*        pNext;
     VkFormat           format;
 } VkOpticalFlowImageFormatPropertiesNV;
 
@@ -21719,45 +18471,35 @@ typedef VkResult (VKAPI_PTR *PFN_vkBindOpticalFlowSessionImageNV)(VkDevice devic
 typedef void (VKAPI_PTR *PFN_vkCmdOpticalFlowExecuteNV)(VkCommandBuffer commandBuffer, VkOpticalFlowSessionNV session, const VkOpticalFlowExecuteInfoNV* pExecuteInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
     VkPhysicalDevice                            physicalDevice,
     const VkOpticalFlowImageFormatInfoNV*       pOpticalFlowImageFormatInfo,
     uint32_t*                                   pFormatCount,
     VkOpticalFlowImageFormatPropertiesNV*       pImageFormatProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateOpticalFlowSessionNV(
     VkDevice                                    device,
     const VkOpticalFlowSessionCreateInfoNV*     pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkOpticalFlowSessionNV*                     pSession);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyOpticalFlowSessionNV(
     VkDevice                                    device,
     VkOpticalFlowSessionNV                      session,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBindOpticalFlowSessionImageNV(
     VkDevice                                    device,
     VkOpticalFlowSessionNV                      session,
     VkOpticalFlowSessionBindingPointNV          bindingPoint,
     VkImageView                                 view,
     VkImageLayout                               layout);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdOpticalFlowExecuteNV(
     VkCommandBuffer                             commandBuffer,
     VkOpticalFlowSessionNV                      session,
     const VkOpticalFlowExecuteInfoNV*           pExecuteInfo);
 #endif
-#endif
 
 
 // VK_EXT_legacy_dithering is a preprocessor guard. Do not pass it to API calls.
@@ -21776,57 +18518,12 @@ typedef struct VkPhysicalDeviceLegacyDitheringFeaturesEXT {
 #define VK_EXT_pipeline_protected_access 1
 #define VK_EXT_PIPELINE_PROTECTED_ACCESS_SPEC_VERSION 1
 #define VK_EXT_PIPELINE_PROTECTED_ACCESS_EXTENSION_NAME "VK_EXT_pipeline_protected_access"
-typedef VkPhysicalDevicePipelineProtectedAccessFeatures VkPhysicalDevicePipelineProtectedAccessFeaturesEXT;
-
-
-
-// VK_AMD_anti_lag is a preprocessor guard. Do not pass it to API calls.
-#define VK_AMD_anti_lag 1
-#define VK_AMD_ANTI_LAG_SPEC_VERSION      1
-#define VK_AMD_ANTI_LAG_EXTENSION_NAME    "VK_AMD_anti_lag"
-
-typedef enum VkAntiLagModeAMD {
-    VK_ANTI_LAG_MODE_DRIVER_CONTROL_AMD = 0,
-    VK_ANTI_LAG_MODE_ON_AMD = 1,
-    VK_ANTI_LAG_MODE_OFF_AMD = 2,
-    VK_ANTI_LAG_MODE_MAX_ENUM_AMD = 0x7FFFFFFF
-} VkAntiLagModeAMD;
-
-typedef enum VkAntiLagStageAMD {
-    VK_ANTI_LAG_STAGE_INPUT_AMD = 0,
-    VK_ANTI_LAG_STAGE_PRESENT_AMD = 1,
-    VK_ANTI_LAG_STAGE_MAX_ENUM_AMD = 0x7FFFFFFF
-} VkAntiLagStageAMD;
-typedef struct VkPhysicalDeviceAntiLagFeaturesAMD {
+typedef struct VkPhysicalDevicePipelineProtectedAccessFeaturesEXT {
     VkStructureType    sType;
     void*              pNext;
-    VkBool32           antiLag;
-} VkPhysicalDeviceAntiLagFeaturesAMD;
+    VkBool32           pipelineProtectedAccess;
+} VkPhysicalDevicePipelineProtectedAccessFeaturesEXT;
 
-typedef struct VkAntiLagPresentationInfoAMD {
-    VkStructureType      sType;
-    void*                pNext;
-    VkAntiLagStageAMD    stage;
-    uint64_t             frameIndex;
-} VkAntiLagPresentationInfoAMD;
-
-typedef struct VkAntiLagDataAMD {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    VkAntiLagModeAMD                       mode;
-    uint32_t                               maxFPS;
-    const VkAntiLagPresentationInfoAMD*    pPresentationInfo;
-} VkAntiLagDataAMD;
-
-typedef void (VKAPI_PTR *PFN_vkAntiLagUpdateAMD)(VkDevice device, const VkAntiLagDataAMD* pData);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkAntiLagUpdateAMD(
-    VkDevice                                    device,
-    const VkAntiLagDataAMD*                     pData);
-#endif
-#endif
 
 
 // VK_EXT_shader_object is a preprocessor guard. Do not pass it to API calls.
@@ -21841,12 +18538,6 @@ typedef enum VkShaderCodeTypeEXT {
     VK_SHADER_CODE_TYPE_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkShaderCodeTypeEXT;
 
-typedef enum VkDepthClampModeEXT {
-    VK_DEPTH_CLAMP_MODE_VIEWPORT_RANGE_EXT = 0,
-    VK_DEPTH_CLAMP_MODE_USER_DEFINED_RANGE_EXT = 1,
-    VK_DEPTH_CLAMP_MODE_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkDepthClampModeEXT;
-
 typedef enum VkShaderCreateFlagBitsEXT {
     VK_SHADER_CREATE_LINK_STAGE_BIT_EXT = 0x00000001,
     VK_SHADER_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT = 0x00000002,
@@ -21855,8 +18546,6 @@ typedef enum VkShaderCreateFlagBitsEXT {
     VK_SHADER_CREATE_DISPATCH_BASE_BIT_EXT = 0x00000010,
     VK_SHADER_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_EXT = 0x00000020,
     VK_SHADER_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00000040,
-    VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT = 0x00000080,
-    VK_SHADER_CREATE_64_BIT_INDEXING_BIT_EXT = 0x00008000,
     VK_SHADER_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkShaderCreateFlagBitsEXT;
 typedef VkFlags VkShaderCreateFlagsEXT;
@@ -21892,43 +18581,30 @@ typedef struct VkShaderCreateInfoEXT {
 
 typedef VkPipelineShaderStageRequiredSubgroupSizeCreateInfo VkShaderRequiredSubgroupSizeCreateInfoEXT;
 
-typedef struct VkDepthClampRangeEXT {
-    float    minDepthClamp;
-    float    maxDepthClamp;
-} VkDepthClampRangeEXT;
-
 typedef VkResult (VKAPI_PTR *PFN_vkCreateShadersEXT)(VkDevice device, uint32_t createInfoCount, const VkShaderCreateInfoEXT* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkShaderEXT* pShaders);
 typedef void (VKAPI_PTR *PFN_vkDestroyShaderEXT)(VkDevice device, VkShaderEXT shader, const VkAllocationCallbacks* pAllocator);
 typedef VkResult (VKAPI_PTR *PFN_vkGetShaderBinaryDataEXT)(VkDevice device, VkShaderEXT shader, size_t* pDataSize, void* pData);
 typedef void (VKAPI_PTR *PFN_vkCmdBindShadersEXT)(VkCommandBuffer commandBuffer, uint32_t stageCount, const VkShaderStageFlagBits* pStages, const VkShaderEXT* pShaders);
-typedef void (VKAPI_PTR *PFN_vkCmdSetDepthClampRangeEXT)(VkCommandBuffer commandBuffer, VkDepthClampModeEXT depthClampMode, const VkDepthClampRangeEXT* pDepthClampRange);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateShadersEXT(
     VkDevice                                    device,
     uint32_t                                    createInfoCount,
     const VkShaderCreateInfoEXT*                pCreateInfos,
     const VkAllocationCallbacks*                pAllocator,
     VkShaderEXT*                                pShaders);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyShaderEXT(
     VkDevice                                    device,
     VkShaderEXT                                 shader,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetShaderBinaryDataEXT(
     VkDevice                                    device,
     VkShaderEXT                                 shader,
     size_t*                                     pDataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBindShadersEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    stageCount,
@@ -21936,14 +18612,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBindShadersEXT(
     const VkShaderEXT*                          pShaders);
 #endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthClampRangeEXT(
-    VkCommandBuffer                             commandBuffer,
-    VkDepthClampModeEXT                         depthClampMode,
-    const VkDepthClampRangeEXT*                 pDepthClampRange);
-#endif
-#endif
-
 
 // VK_QCOM_tile_properties is a preprocessor guard. Do not pass it to API calls.
 #define VK_QCOM_tile_properties 1
@@ -21967,21 +18635,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetFramebufferTilePropertiesQCOM)(VkDevice de
 typedef VkResult (VKAPI_PTR *PFN_vkGetDynamicRenderingTilePropertiesQCOM)(VkDevice device, const VkRenderingInfo* pRenderingInfo, VkTilePropertiesQCOM* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetFramebufferTilePropertiesQCOM(
     VkDevice                                    device,
     VkFramebuffer                               framebuffer,
     uint32_t*                                   pPropertiesCount,
     VkTilePropertiesQCOM*                       pProperties);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDynamicRenderingTilePropertiesQCOM(
     VkDevice                                    device,
     const VkRenderingInfo*                      pRenderingInfo,
     VkTilePropertiesQCOM*                       pProperties);
 #endif
-#endif
 
 
 // VK_SEC_amigo_profiling is a preprocessor guard. Do not pass it to API calls.
@@ -22020,19 +18684,15 @@ typedef struct VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM {
 #define VK_NV_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION 1
 #define VK_NV_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME "VK_NV_ray_tracing_invocation_reorder"
 
-typedef enum VkRayTracingInvocationReorderModeEXT {
-    VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_EXT = 0,
-    VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_EXT = 1,
-    VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV = VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_EXT,
-    VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV = VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_EXT,
-    VK_RAY_TRACING_INVOCATION_REORDER_MODE_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkRayTracingInvocationReorderModeEXT;
-typedef VkRayTracingInvocationReorderModeEXT VkRayTracingInvocationReorderModeNV;
-
+typedef enum VkRayTracingInvocationReorderModeNV {
+    VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV = 0,
+    VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV = 1,
+    VK_RAY_TRACING_INVOCATION_REORDER_MODE_MAX_ENUM_NV = 0x7FFFFFFF
+} VkRayTracingInvocationReorderModeNV;
 typedef struct VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV {
-    VkStructureType                         sType;
-    void*                                   pNext;
-    VkRayTracingInvocationReorderModeEXT    rayTracingInvocationReorderReorderingHint;
+    VkStructureType                        sType;
+    void*                                  pNext;
+    VkRayTracingInvocationReorderModeNV    rayTracingInvocationReorderReorderingHint;
 } VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV;
 
 typedef struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV {
@@ -22043,89 +18703,6 @@ typedef struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV {
 
 
 
-// VK_NV_cooperative_vector is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_cooperative_vector 1
-#define VK_NV_COOPERATIVE_VECTOR_SPEC_VERSION 4
-#define VK_NV_COOPERATIVE_VECTOR_EXTENSION_NAME "VK_NV_cooperative_vector"
-
-typedef enum VkCooperativeVectorMatrixLayoutNV {
-    VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_ROW_MAJOR_NV = 0,
-    VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_COLUMN_MAJOR_NV = 1,
-    VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_INFERENCING_OPTIMAL_NV = 2,
-    VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_TRAINING_OPTIMAL_NV = 3,
-    VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_MAX_ENUM_NV = 0x7FFFFFFF
-} VkCooperativeVectorMatrixLayoutNV;
-typedef struct VkPhysicalDeviceCooperativeVectorPropertiesNV {
-    VkStructureType       sType;
-    void*                 pNext;
-    VkShaderStageFlags    cooperativeVectorSupportedStages;
-    VkBool32              cooperativeVectorTrainingFloat16Accumulation;
-    VkBool32              cooperativeVectorTrainingFloat32Accumulation;
-    uint32_t              maxCooperativeVectorComponents;
-} VkPhysicalDeviceCooperativeVectorPropertiesNV;
-
-typedef struct VkPhysicalDeviceCooperativeVectorFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           cooperativeVector;
-    VkBool32           cooperativeVectorTraining;
-} VkPhysicalDeviceCooperativeVectorFeaturesNV;
-
-typedef struct VkCooperativeVectorPropertiesNV {
-    VkStructureType       sType;
-    void*                 pNext;
-    VkComponentTypeKHR    inputType;
-    VkComponentTypeKHR    inputInterpretation;
-    VkComponentTypeKHR    matrixInterpretation;
-    VkComponentTypeKHR    biasInterpretation;
-    VkComponentTypeKHR    resultType;
-    VkBool32              transpose;
-} VkCooperativeVectorPropertiesNV;
-
-typedef struct VkConvertCooperativeVectorMatrixInfoNV {
-    VkStructureType                      sType;
-    const void*                          pNext;
-    size_t                               srcSize;
-    VkDeviceOrHostAddressConstKHR        srcData;
-    size_t*                              pDstSize;
-    VkDeviceOrHostAddressKHR             dstData;
-    VkComponentTypeKHR                   srcComponentType;
-    VkComponentTypeKHR                   dstComponentType;
-    uint32_t                             numRows;
-    uint32_t                             numColumns;
-    VkCooperativeVectorMatrixLayoutNV    srcLayout;
-    size_t                               srcStride;
-    VkCooperativeVectorMatrixLayoutNV    dstLayout;
-    size_t                               dstStride;
-} VkConvertCooperativeVectorMatrixInfoNV;
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeVectorPropertiesNV* pProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkConvertCooperativeVectorMatrixNV)(VkDevice device, const VkConvertCooperativeVectorMatrixInfoNV* pInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdConvertCooperativeVectorMatrixNV)(VkCommandBuffer commandBuffer, uint32_t infoCount, const VkConvertCooperativeVectorMatrixInfoNV* pInfos);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCooperativeVectorPropertiesNV(
-    VkPhysicalDevice                            physicalDevice,
-    uint32_t*                                   pPropertyCount,
-    VkCooperativeVectorPropertiesNV*            pProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkConvertCooperativeVectorMatrixNV(
-    VkDevice                                    device,
-    const VkConvertCooperativeVectorMatrixInfoNV* pInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdConvertCooperativeVectorMatrixNV(
-    VkCommandBuffer                             commandBuffer,
-    uint32_t                                    infoCount,
-    const VkConvertCooperativeVectorMatrixInfoNV* pInfos);
-#endif
-#endif
-
-
 // VK_NV_extended_sparse_address_space is a preprocessor guard. Do not pass it to API calls.
 #define VK_NV_extended_sparse_address_space 1
 #define VK_NV_EXTENDED_SPARSE_ADDRESS_SPACE_SPEC_VERSION 1
@@ -22152,24 +18729,6 @@ typedef struct VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV {
 #define VK_EXT_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME "VK_EXT_mutable_descriptor_type"
 
 
-// VK_EXT_legacy_vertex_attributes is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_legacy_vertex_attributes 1
-#define VK_EXT_LEGACY_VERTEX_ATTRIBUTES_SPEC_VERSION 1
-#define VK_EXT_LEGACY_VERTEX_ATTRIBUTES_EXTENSION_NAME "VK_EXT_legacy_vertex_attributes"
-typedef struct VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           legacyVertexAttributes;
-} VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-
-typedef struct VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           nativeUnalignedPerformance;
-} VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-
-
-
 // VK_EXT_layer_settings is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_layer_settings 1
 #define VK_EXT_LAYER_SETTINGS_SPEC_VERSION 2
@@ -22297,7 +18856,7 @@ typedef struct VkSetLatencyMarkerInfoNV {
 
 typedef struct VkLatencyTimingsFrameReportNV {
     VkStructureType    sType;
-    void*              pNext;
+    const void*        pNext;
     uint64_t           presentID;
     uint64_t           inputSampleTimeUs;
     uint64_t           simStartTimeUs;
@@ -22353,352 +18912,30 @@ typedef void (VKAPI_PTR *PFN_vkGetLatencyTimingsNV)(VkDevice device, VkSwapchain
 typedef void (VKAPI_PTR *PFN_vkQueueNotifyOutOfBandNV)(VkQueue queue, const VkOutOfBandQueueTypeInfoNV* pQueueTypeInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetLatencySleepModeNV(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     const VkLatencySleepModeInfoNV*             pSleepModeInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkLatencySleepNV(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     const VkLatencySleepInfoNV*                 pSleepInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkSetLatencyMarkerNV(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     const VkSetLatencyMarkerInfoNV*             pLatencyMarkerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetLatencyTimingsNV(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain,
     VkGetLatencyMarkerInfoNV*                   pLatencyMarkerInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkQueueNotifyOutOfBandNV(
     VkQueue                                     queue,
     const VkOutOfBandQueueTypeInfoNV*           pQueueTypeInfo);
 #endif
-#endif
-
-
-// VK_ARM_data_graph is a preprocessor guard. Do not pass it to API calls.
-#define VK_ARM_data_graph 1
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDataGraphPipelineSessionARM)
-#define VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM 128U
-#define VK_ARM_DATA_GRAPH_SPEC_VERSION    1
-#define VK_ARM_DATA_GRAPH_EXTENSION_NAME  "VK_ARM_data_graph"
-
-typedef enum VkDataGraphPipelineSessionBindPointARM {
-    VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TRANSIENT_ARM = 0,
-    VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkDataGraphPipelineSessionBindPointARM;
-
-typedef enum VkDataGraphPipelineSessionBindPointTypeARM {
-    VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TYPE_MEMORY_ARM = 0,
-    VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TYPE_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkDataGraphPipelineSessionBindPointTypeARM;
-
-typedef enum VkDataGraphPipelinePropertyARM {
-    VK_DATA_GRAPH_PIPELINE_PROPERTY_CREATION_LOG_ARM = 0,
-    VK_DATA_GRAPH_PIPELINE_PROPERTY_IDENTIFIER_ARM = 1,
-    VK_DATA_GRAPH_PIPELINE_PROPERTY_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkDataGraphPipelinePropertyARM;
-
-typedef enum VkPhysicalDeviceDataGraphProcessingEngineTypeARM {
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_DEFAULT_ARM = 0,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_NEURAL_QCOM = 1000629000,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_COMPUTE_QCOM = 1000629001,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkPhysicalDeviceDataGraphProcessingEngineTypeARM;
-
-typedef enum VkPhysicalDeviceDataGraphOperationTypeARM {
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_SPIRV_EXTENDED_INSTRUCTION_SET_ARM = 0,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_NEURAL_MODEL_QCOM = 1000629000,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_BUILTIN_MODEL_QCOM = 1000629001,
-    VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_MAX_ENUM_ARM = 0x7FFFFFFF
-} VkPhysicalDeviceDataGraphOperationTypeARM;
-typedef VkFlags64 VkDataGraphPipelineSessionCreateFlagsARM;
-
-// Flag bits for VkDataGraphPipelineSessionCreateFlagBitsARM
-typedef VkFlags64 VkDataGraphPipelineSessionCreateFlagBitsARM;
-static const VkDataGraphPipelineSessionCreateFlagBitsARM VK_DATA_GRAPH_PIPELINE_SESSION_CREATE_PROTECTED_BIT_ARM = 0x00000001ULL;
-
-typedef VkFlags64 VkDataGraphPipelineDispatchFlagsARM;
-
-// Flag bits for VkDataGraphPipelineDispatchFlagBitsARM
-typedef VkFlags64 VkDataGraphPipelineDispatchFlagBitsARM;
-
-typedef struct VkPhysicalDeviceDataGraphFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           dataGraph;
-    VkBool32           dataGraphUpdateAfterBind;
-    VkBool32           dataGraphSpecializationConstants;
-    VkBool32           dataGraphDescriptorBuffer;
-    VkBool32           dataGraphShaderModule;
-} VkPhysicalDeviceDataGraphFeaturesARM;
-
-typedef struct VkDataGraphPipelineConstantARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           id;
-    const void*        pConstantData;
-} VkDataGraphPipelineConstantARM;
-
-typedef struct VkDataGraphPipelineResourceInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           descriptorSet;
-    uint32_t           binding;
-    uint32_t           arrayElement;
-} VkDataGraphPipelineResourceInfoARM;
-
-typedef struct VkDataGraphPipelineCompilerControlCreateInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    const char*        pVendorOptions;
-} VkDataGraphPipelineCompilerControlCreateInfoARM;
-
-typedef struct VkDataGraphPipelineCreateInfoARM {
-    VkStructureType                              sType;
-    const void*                                  pNext;
-    VkPipelineCreateFlags2KHR                    flags;
-    VkPipelineLayout                             layout;
-    uint32_t                                     resourceInfoCount;
-    const VkDataGraphPipelineResourceInfoARM*    pResourceInfos;
-} VkDataGraphPipelineCreateInfoARM;
-
-typedef struct VkDataGraphPipelineShaderModuleCreateInfoARM {
-    VkStructureType                          sType;
-    const void*                              pNext;
-    VkShaderModule                           module;
-    const char*                              pName;
-    const VkSpecializationInfo*              pSpecializationInfo;
-    uint32_t                                 constantCount;
-    const VkDataGraphPipelineConstantARM*    pConstants;
-} VkDataGraphPipelineShaderModuleCreateInfoARM;
-
-typedef struct VkDataGraphPipelineSessionCreateInfoARM {
-    VkStructureType                             sType;
-    const void*                                 pNext;
-    VkDataGraphPipelineSessionCreateFlagsARM    flags;
-    VkPipeline                                  dataGraphPipeline;
-} VkDataGraphPipelineSessionCreateInfoARM;
-
-typedef struct VkDataGraphPipelineSessionBindPointRequirementsInfoARM {
-    VkStructureType                  sType;
-    const void*                      pNext;
-    VkDataGraphPipelineSessionARM    session;
-} VkDataGraphPipelineSessionBindPointRequirementsInfoARM;
-
-typedef struct VkDataGraphPipelineSessionBindPointRequirementARM {
-    VkStructureType                               sType;
-    const void*                                   pNext;
-    VkDataGraphPipelineSessionBindPointARM        bindPoint;
-    VkDataGraphPipelineSessionBindPointTypeARM    bindPointType;
-    uint32_t                                      numObjects;
-} VkDataGraphPipelineSessionBindPointRequirementARM;
-
-typedef struct VkDataGraphPipelineSessionMemoryRequirementsInfoARM {
-    VkStructureType                           sType;
-    const void*                               pNext;
-    VkDataGraphPipelineSessionARM             session;
-    VkDataGraphPipelineSessionBindPointARM    bindPoint;
-    uint32_t                                  objectIndex;
-} VkDataGraphPipelineSessionMemoryRequirementsInfoARM;
-
-typedef struct VkBindDataGraphPipelineSessionMemoryInfoARM {
-    VkStructureType                           sType;
-    const void*                               pNext;
-    VkDataGraphPipelineSessionARM             session;
-    VkDataGraphPipelineSessionBindPointARM    bindPoint;
-    uint32_t                                  objectIndex;
-    VkDeviceMemory                            memory;
-    VkDeviceSize                              memoryOffset;
-} VkBindDataGraphPipelineSessionMemoryInfoARM;
-
-typedef struct VkDataGraphPipelineInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkPipeline         dataGraphPipeline;
-} VkDataGraphPipelineInfoARM;
-
-typedef struct VkDataGraphPipelinePropertyQueryResultARM {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkDataGraphPipelinePropertyARM    property;
-    VkBool32                          isText;
-    size_t                            dataSize;
-    void*                             pData;
-} VkDataGraphPipelinePropertyQueryResultARM;
-
-typedef struct VkDataGraphPipelineIdentifierCreateInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           identifierSize;
-    const uint8_t*     pIdentifier;
-} VkDataGraphPipelineIdentifierCreateInfoARM;
-
-typedef struct VkDataGraphPipelineDispatchInfoARM {
-    VkStructureType                        sType;
-    void*                                  pNext;
-    VkDataGraphPipelineDispatchFlagsARM    flags;
-} VkDataGraphPipelineDispatchInfoARM;
-
-typedef struct VkPhysicalDeviceDataGraphProcessingEngineARM {
-    VkPhysicalDeviceDataGraphProcessingEngineTypeARM    type;
-    VkBool32                                            isForeign;
-} VkPhysicalDeviceDataGraphProcessingEngineARM;
-
-typedef struct VkPhysicalDeviceDataGraphOperationSupportARM {
-    VkPhysicalDeviceDataGraphOperationTypeARM    operationType;
-    char                                         name[VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM];
-    uint32_t                                     version;
-} VkPhysicalDeviceDataGraphOperationSupportARM;
-
-typedef struct VkQueueFamilyDataGraphPropertiesARM {
-    VkStructureType                                 sType;
-    const void*                                     pNext;
-    VkPhysicalDeviceDataGraphProcessingEngineARM    engine;
-    VkPhysicalDeviceDataGraphOperationSupportARM    operation;
-} VkQueueFamilyDataGraphPropertiesARM;
-
-typedef struct VkDataGraphProcessingEngineCreateInfoARM {
-    VkStructureType                                  sType;
-    const void*                                      pNext;
-    uint32_t                                         processingEngineCount;
-    VkPhysicalDeviceDataGraphProcessingEngineARM*    pProcessingEngines;
-} VkDataGraphProcessingEngineCreateInfoARM;
-
-typedef struct VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM {
-    VkStructureType                                     sType;
-    const void*                                         pNext;
-    uint32_t                                            queueFamilyIndex;
-    VkPhysicalDeviceDataGraphProcessingEngineTypeARM    engineType;
-} VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-
-typedef struct VkQueueFamilyDataGraphProcessingEnginePropertiesARM {
-    VkStructureType                       sType;
-    const void*                           pNext;
-    VkExternalSemaphoreHandleTypeFlags    foreignSemaphoreHandleTypes;
-    VkExternalMemoryHandleTypeFlags       foreignMemoryHandleTypes;
-} VkQueueFamilyDataGraphProcessingEnginePropertiesARM;
-
-typedef struct VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           dimension;
-    uint32_t           zeroCount;
-    uint32_t           groupSize;
-} VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreateDataGraphPipelinesARM)(VkDevice               device, VkDeferredOperationKHR deferredOperation, VkPipelineCache        pipelineCache, uint32_t               createInfoCount, const VkDataGraphPipelineCreateInfoARM* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline*     pPipelines);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateDataGraphPipelineSessionARM)(VkDevice                                     device, const VkDataGraphPipelineSessionCreateInfoARM*   pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDataGraphPipelineSessionARM*                   pSession);
-typedef VkResult (VKAPI_PTR *PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM)(VkDevice device, const VkDataGraphPipelineSessionBindPointRequirementsInfoARM* pInfo, uint32_t* pBindPointRequirementCount, VkDataGraphPipelineSessionBindPointRequirementARM* pBindPointRequirements);
-typedef void (VKAPI_PTR *PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM)(VkDevice device, const VkDataGraphPipelineSessionMemoryRequirementsInfoARM* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef VkResult (VKAPI_PTR *PFN_vkBindDataGraphPipelineSessionMemoryARM)(VkDevice device, uint32_t bindInfoCount, const VkBindDataGraphPipelineSessionMemoryInfoARM* pBindInfos);
-typedef void (VKAPI_PTR *PFN_vkDestroyDataGraphPipelineSessionARM)(VkDevice device, VkDataGraphPipelineSessionARM session, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkCmdDispatchDataGraphARM)(VkCommandBuffer commandBuffer, VkDataGraphPipelineSessionARM session, const VkDataGraphPipelineDispatchInfoARM* pInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkGetDataGraphPipelineAvailablePropertiesARM)(VkDevice device, const VkDataGraphPipelineInfoARM* pPipelineInfo, uint32_t* pPropertiesCount, VkDataGraphPipelinePropertyARM* pProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkGetDataGraphPipelinePropertiesARM)(VkDevice                          device, const VkDataGraphPipelineInfoARM* pPipelineInfo, uint32_t                          propertiesCount, VkDataGraphPipelinePropertyQueryResultARM* pProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM)(VkPhysicalDevice                     physicalDevice, uint32_t                             queueFamilyIndex, uint32_t*                            pQueueFamilyDataGraphPropertyCount, VkQueueFamilyDataGraphPropertiesARM* pQueueFamilyDataGraphProperties);
-typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM)(VkPhysicalDevice                                 physicalDevice, const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM* pQueueFamilyDataGraphProcessingEngineInfo, VkQueueFamilyDataGraphProcessingEnginePropertiesARM*               pQueueFamilyDataGraphProcessingEngineProperties);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateDataGraphPipelinesARM(
-    VkDevice                                    device,
-    VkDeferredOperationKHR                      deferredOperation,
-    VkPipelineCache                             pipelineCache,
-    uint32_t                                    createInfoCount,
-    const VkDataGraphPipelineCreateInfoARM*     pCreateInfos,
-    const VkAllocationCallbacks*                pAllocator,
-    VkPipeline*                                 pPipelines);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateDataGraphPipelineSessionARM(
-    VkDevice                                    device,
-    const VkDataGraphPipelineSessionCreateInfoARM* pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkDataGraphPipelineSessionARM*              pSession);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-    VkDevice                                    device,
-    const VkDataGraphPipelineSessionBindPointRequirementsInfoARM* pInfo,
-    uint32_t*                                   pBindPointRequirementCount,
-    VkDataGraphPipelineSessionBindPointRequirementARM* pBindPointRequirements);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetDataGraphPipelineSessionMemoryRequirementsARM(
-    VkDevice                                    device,
-    const VkDataGraphPipelineSessionMemoryRequirementsInfoARM* pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkBindDataGraphPipelineSessionMemoryARM(
-    VkDevice                                    device,
-    uint32_t                                    bindInfoCount,
-    const VkBindDataGraphPipelineSessionMemoryInfoARM* pBindInfos);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyDataGraphPipelineSessionARM(
-    VkDevice                                    device,
-    VkDataGraphPipelineSessionARM               session,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdDispatchDataGraphARM(
-    VkCommandBuffer                             commandBuffer,
-    VkDataGraphPipelineSessionARM               session,
-    const VkDataGraphPipelineDispatchInfoARM*   pInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetDataGraphPipelineAvailablePropertiesARM(
-    VkDevice                                    device,
-    const VkDataGraphPipelineInfoARM*           pPipelineInfo,
-    uint32_t*                                   pPropertiesCount,
-    VkDataGraphPipelinePropertyARM*             pProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetDataGraphPipelinePropertiesARM(
-    VkDevice                                    device,
-    const VkDataGraphPipelineInfoARM*           pPipelineInfo,
-    uint32_t                                    propertiesCount,
-    VkDataGraphPipelinePropertyQueryResultARM*  pProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-    VkPhysicalDevice                            physicalDevice,
-    uint32_t                                    queueFamilyIndex,
-    uint32_t*                                   pQueueFamilyDataGraphPropertyCount,
-    VkQueueFamilyDataGraphPropertiesARM*        pQueueFamilyDataGraphProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-    VkPhysicalDevice                            physicalDevice,
-    const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM* pQueueFamilyDataGraphProcessingEngineInfo,
-    VkQueueFamilyDataGraphProcessingEnginePropertiesARM* pQueueFamilyDataGraphProcessingEngineProperties);
-#endif
-#endif
 
 
 // VK_QCOM_multiview_per_view_render_areas is a preprocessor guard. Do not pass it to API calls.
@@ -22840,12 +19077,10 @@ typedef struct VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT {
 typedef void (VKAPI_PTR *PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT)(VkCommandBuffer commandBuffer, VkImageAspectFlags aspectMask);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetAttachmentFeedbackLoopEnableEXT(
     VkCommandBuffer                             commandBuffer,
     VkImageAspectFlags                          aspectMask);
 #endif
-#endif
 
 
 // VK_MSFT_layered_driver is a preprocessor guard. Do not pass it to API calls.
@@ -22878,120 +19113,6 @@ typedef struct VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV {
 
 
 
-// VK_QCOM_tile_memory_heap is a preprocessor guard. Do not pass it to API calls.
-#define VK_QCOM_tile_memory_heap 1
-#define VK_QCOM_TILE_MEMORY_HEAP_SPEC_VERSION 1
-#define VK_QCOM_TILE_MEMORY_HEAP_EXTENSION_NAME "VK_QCOM_tile_memory_heap"
-typedef struct VkPhysicalDeviceTileMemoryHeapFeaturesQCOM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           tileMemoryHeap;
-} VkPhysicalDeviceTileMemoryHeapFeaturesQCOM;
-
-typedef struct VkPhysicalDeviceTileMemoryHeapPropertiesQCOM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           queueSubmitBoundary;
-    VkBool32           tileBufferTransfers;
-} VkPhysicalDeviceTileMemoryHeapPropertiesQCOM;
-
-typedef struct VkTileMemoryRequirementsQCOM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       size;
-    VkDeviceSize       alignment;
-} VkTileMemoryRequirementsQCOM;
-
-typedef struct VkTileMemoryBindInfoQCOM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkDeviceMemory     memory;
-} VkTileMemoryBindInfoQCOM;
-
-typedef struct VkTileMemorySizeInfoQCOM {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkDeviceSize       size;
-} VkTileMemorySizeInfoQCOM;
-
-typedef void (VKAPI_PTR *PFN_vkCmdBindTileMemoryQCOM)(VkCommandBuffer commandBuffer, const VkTileMemoryBindInfoQCOM* pTileMemoryBindInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdBindTileMemoryQCOM(
-    VkCommandBuffer                             commandBuffer,
-    const VkTileMemoryBindInfoQCOM*             pTileMemoryBindInfo);
-#endif
-#endif
-
-
-// VK_EXT_memory_decompression is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_memory_decompression 1
-#define VK_EXT_MEMORY_DECOMPRESSION_SPEC_VERSION 1
-#define VK_EXT_MEMORY_DECOMPRESSION_EXTENSION_NAME "VK_EXT_memory_decompression"
-typedef struct VkDecompressMemoryRegionEXT {
-    VkDeviceAddress    srcAddress;
-    VkDeviceAddress    dstAddress;
-    VkDeviceSize       compressedSize;
-    VkDeviceSize       decompressedSize;
-} VkDecompressMemoryRegionEXT;
-
-typedef struct VkDecompressMemoryInfoEXT {
-    VkStructureType                        sType;
-    const void*                            pNext;
-    VkMemoryDecompressionMethodFlagsEXT    decompressionMethod;
-    uint32_t                               regionCount;
-    const VkDecompressMemoryRegionEXT*     pRegions;
-} VkDecompressMemoryInfoEXT;
-
-typedef void (VKAPI_PTR *PFN_vkCmdDecompressMemoryEXT)(VkCommandBuffer commandBuffer, const VkDecompressMemoryInfoEXT* pDecompressMemoryInfoEXT);
-typedef void (VKAPI_PTR *PFN_vkCmdDecompressMemoryIndirectCountEXT)(VkCommandBuffer commandBuffer, VkMemoryDecompressionMethodFlagsEXT decompressionMethod, VkDeviceAddress indirectCommandsAddress, VkDeviceAddress indirectCommandsCountAddress, uint32_t maxDecompressionCount, uint32_t stride);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdDecompressMemoryEXT(
-    VkCommandBuffer                             commandBuffer,
-    const VkDecompressMemoryInfoEXT*            pDecompressMemoryInfoEXT);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdDecompressMemoryIndirectCountEXT(
-    VkCommandBuffer                             commandBuffer,
-    VkMemoryDecompressionMethodFlagsEXT         decompressionMethod,
-    VkDeviceAddress                             indirectCommandsAddress,
-    VkDeviceAddress                             indirectCommandsCountAddress,
-    uint32_t                                    maxDecompressionCount,
-    uint32_t                                    stride);
-#endif
-#endif
-
-
-// VK_NV_display_stereo is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_display_stereo 1
-#define VK_NV_DISPLAY_STEREO_SPEC_VERSION 1
-#define VK_NV_DISPLAY_STEREO_EXTENSION_NAME "VK_NV_display_stereo"
-
-typedef enum VkDisplaySurfaceStereoTypeNV {
-    VK_DISPLAY_SURFACE_STEREO_TYPE_NONE_NV = 0,
-    VK_DISPLAY_SURFACE_STEREO_TYPE_ONBOARD_DIN_NV = 1,
-    VK_DISPLAY_SURFACE_STEREO_TYPE_HDMI_3D_NV = 2,
-    VK_DISPLAY_SURFACE_STEREO_TYPE_INBAND_DISPLAYPORT_NV = 3,
-    VK_DISPLAY_SURFACE_STEREO_TYPE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkDisplaySurfaceStereoTypeNV;
-typedef struct VkDisplaySurfaceStereoCreateInfoNV {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    VkDisplaySurfaceStereoTypeNV    stereoType;
-} VkDisplaySurfaceStereoCreateInfoNV;
-
-typedef struct VkDisplayModeStereoPropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           hdmi3DSupported;
-} VkDisplayModeStereoPropertiesNV;
-
-
-
 // VK_NV_raw_access_chains is a preprocessor guard. Do not pass it to API calls.
 #define VK_NV_raw_access_chains 1
 #define VK_NV_RAW_ACCESS_CHAINS_SPEC_VERSION 1
@@ -23004,77 +19125,6 @@ typedef struct VkPhysicalDeviceRawAccessChainsFeaturesNV {
 
 
 
-// VK_NV_external_compute_queue is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_external_compute_queue 1
-VK_DEFINE_HANDLE(VkExternalComputeQueueNV)
-#define VK_NV_EXTERNAL_COMPUTE_QUEUE_SPEC_VERSION 1
-#define VK_NV_EXTERNAL_COMPUTE_QUEUE_EXTENSION_NAME "VK_NV_external_compute_queue"
-typedef struct VkExternalComputeQueueDeviceCreateInfoNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           reservedExternalQueues;
-} VkExternalComputeQueueDeviceCreateInfoNV;
-
-typedef struct VkExternalComputeQueueCreateInfoNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkQueue            preferredQueue;
-} VkExternalComputeQueueCreateInfoNV;
-
-typedef struct VkExternalComputeQueueDataParamsNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           deviceIndex;
-} VkExternalComputeQueueDataParamsNV;
-
-typedef struct VkPhysicalDeviceExternalComputeQueuePropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           externalDataSize;
-    uint32_t           maxExternalQueues;
-} VkPhysicalDeviceExternalComputeQueuePropertiesNV;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreateExternalComputeQueueNV)(VkDevice device, const VkExternalComputeQueueCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkExternalComputeQueueNV* pExternalQueue);
-typedef void (VKAPI_PTR *PFN_vkDestroyExternalComputeQueueNV)(VkDevice device, VkExternalComputeQueueNV externalQueue, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkGetExternalComputeQueueDataNV)(VkExternalComputeQueueNV externalQueue, VkExternalComputeQueueDataParamsNV* params, void* pData);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateExternalComputeQueueNV(
-    VkDevice                                    device,
-    const VkExternalComputeQueueCreateInfoNV*   pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkExternalComputeQueueNV*                   pExternalQueue);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyExternalComputeQueueNV(
-    VkDevice                                    device,
-    VkExternalComputeQueueNV                    externalQueue,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetExternalComputeQueueDataNV(
-    VkExternalComputeQueueNV                    externalQueue,
-    VkExternalComputeQueueDataParamsNV*         params,
-    void*                                       pData);
-#endif
-#endif
-
-
-// VK_NV_command_buffer_inheritance is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_command_buffer_inheritance 1
-#define VK_NV_COMMAND_BUFFER_INHERITANCE_SPEC_VERSION 1
-#define VK_NV_COMMAND_BUFFER_INHERITANCE_EXTENSION_NAME "VK_NV_command_buffer_inheritance"
-typedef struct VkPhysicalDeviceCommandBufferInheritanceFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           commandBufferInheritance;
-} VkPhysicalDeviceCommandBufferInheritanceFeaturesNV;
-
-
-
 // VK_NV_shader_atomic_float16_vector is a preprocessor guard. Do not pass it to API calls.
 #define VK_NV_shader_atomic_float16_vector 1
 #define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION 1
@@ -23087,31 +19137,6 @@ typedef struct VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV {
 
 
 
-// VK_EXT_shader_replicated_composites is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_shader_replicated_composites 1
-#define VK_EXT_SHADER_REPLICATED_COMPOSITES_SPEC_VERSION 1
-#define VK_EXT_SHADER_REPLICATED_COMPOSITES_EXTENSION_NAME "VK_EXT_shader_replicated_composites"
-typedef struct VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderReplicatedComposites;
-} VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-
-
-
-// VK_EXT_shader_float8 is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_shader_float8 1
-#define VK_EXT_SHADER_FLOAT8_SPEC_VERSION 1
-#define VK_EXT_SHADER_FLOAT8_EXTENSION_NAME "VK_EXT_shader_float8"
-typedef struct VkPhysicalDeviceShaderFloat8FeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderFloat8;
-    VkBool32           shaderFloat8CooperativeMatrix;
-} VkPhysicalDeviceShaderFloat8FeaturesEXT;
-
-
-
 // VK_NV_ray_tracing_validation is a preprocessor guard. Do not pass it to API calls.
 #define VK_NV_ray_tracing_validation 1
 #define VK_NV_RAY_TRACING_VALIDATION_SPEC_VERSION 1
@@ -23124,1073 +19149,6 @@ typedef struct VkPhysicalDeviceRayTracingValidationFeaturesNV {
 
 
 
-// VK_NV_cluster_acceleration_structure is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_cluster_acceleration_structure 1
-#define VK_NV_CLUSTER_ACCELERATION_STRUCTURE_SPEC_VERSION 4
-#define VK_NV_CLUSTER_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_NV_cluster_acceleration_structure"
-
-typedef enum VkClusterAccelerationStructureTypeNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_CLUSTERS_BOTTOM_LEVEL_NV = 0,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_NV = 1,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_TEMPLATE_NV = 2,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureTypeNV;
-
-typedef enum VkClusterAccelerationStructureOpTypeNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_MOVE_OBJECTS_NV = 0,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_CLUSTERS_BOTTOM_LEVEL_NV = 1,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_NV = 2,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_TEMPLATE_NV = 3,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_INSTANTIATE_TRIANGLE_CLUSTER_NV = 4,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_GET_CLUSTER_TEMPLATE_INDICES_NV = 5,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureOpTypeNV;
-
-typedef enum VkClusterAccelerationStructureOpModeNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_IMPLICIT_DESTINATIONS_NV = 0,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_EXPLICIT_DESTINATIONS_NV = 1,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_COMPUTE_SIZES_NV = 2,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureOpModeNV;
-
-typedef enum VkClusterAccelerationStructureAddressResolutionFlagBitsNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_NONE_NV = 0,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_IMPLICIT_DATA_BIT_NV = 0x00000001,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SCRATCH_DATA_BIT_NV = 0x00000002,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_ADDRESS_ARRAY_BIT_NV = 0x00000004,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_SIZES_ARRAY_BIT_NV = 0x00000008,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_ARRAY_BIT_NV = 0x00000010,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_COUNT_BIT_NV = 0x00000020,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureAddressResolutionFlagBitsNV;
-typedef VkFlags VkClusterAccelerationStructureAddressResolutionFlagsNV;
-
-typedef enum VkClusterAccelerationStructureClusterFlagBitsNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_CLUSTER_ALLOW_DISABLE_OPACITY_MICROMAPS_NV = 0x00000001,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_CLUSTER_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureClusterFlagBitsNV;
-typedef VkFlags VkClusterAccelerationStructureClusterFlagsNV;
-
-typedef enum VkClusterAccelerationStructureGeometryFlagBitsNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_CULL_DISABLE_BIT_NV = 0x00000001,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANYHIT_INVOCATION_BIT_NV = 0x00000002,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT_NV = 0x00000004,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureGeometryFlagBitsNV;
-typedef VkFlags VkClusterAccelerationStructureGeometryFlagsNV;
-
-typedef enum VkClusterAccelerationStructureIndexFormatFlagBitsNV {
-    VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_8BIT_NV = 0x00000001,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_16BIT_NV = 0x00000002,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_32BIT_NV = 0x00000004,
-    VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF
-} VkClusterAccelerationStructureIndexFormatFlagBitsNV;
-typedef VkFlags VkClusterAccelerationStructureIndexFormatFlagsNV;
-typedef struct VkPhysicalDeviceClusterAccelerationStructureFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           clusterAccelerationStructure;
-} VkPhysicalDeviceClusterAccelerationStructureFeaturesNV;
-
-typedef struct VkPhysicalDeviceClusterAccelerationStructurePropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxVerticesPerCluster;
-    uint32_t           maxTrianglesPerCluster;
-    uint32_t           clusterScratchByteAlignment;
-    uint32_t           clusterByteAlignment;
-    uint32_t           clusterTemplateByteAlignment;
-    uint32_t           clusterBottomLevelByteAlignment;
-    uint32_t           clusterTemplateBoundsByteAlignment;
-    uint32_t           maxClusterGeometryIndex;
-} VkPhysicalDeviceClusterAccelerationStructurePropertiesNV;
-
-typedef struct VkClusterAccelerationStructureClustersBottomLevelInputNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxTotalClusterCount;
-    uint32_t           maxClusterCountPerAccelerationStructure;
-} VkClusterAccelerationStructureClustersBottomLevelInputNV;
-
-typedef struct VkClusterAccelerationStructureTriangleClusterInputNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkFormat           vertexFormat;
-    uint32_t           maxGeometryIndexValue;
-    uint32_t           maxClusterUniqueGeometryCount;
-    uint32_t           maxClusterTriangleCount;
-    uint32_t           maxClusterVertexCount;
-    uint32_t           maxTotalTriangleCount;
-    uint32_t           maxTotalVertexCount;
-    uint32_t           minPositionTruncateBitCount;
-} VkClusterAccelerationStructureTriangleClusterInputNV;
-
-typedef struct VkClusterAccelerationStructureMoveObjectsInputNV {
-    VkStructureType                         sType;
-    void*                                   pNext;
-    VkClusterAccelerationStructureTypeNV    type;
-    VkBool32                                noMoveOverlap;
-    VkDeviceSize                            maxMovedBytes;
-} VkClusterAccelerationStructureMoveObjectsInputNV;
-
-typedef union VkClusterAccelerationStructureOpInputNV {
-    VkClusterAccelerationStructureClustersBottomLevelInputNV*    pClustersBottomLevel;
-    VkClusterAccelerationStructureTriangleClusterInputNV*        pTriangleClusters;
-    VkClusterAccelerationStructureMoveObjectsInputNV*            pMoveObjects;
-} VkClusterAccelerationStructureOpInputNV;
-
-typedef struct VkClusterAccelerationStructureInputInfoNV {
-    VkStructureType                            sType;
-    void*                                      pNext;
-    uint32_t                                   maxAccelerationStructureCount;
-    VkBuildAccelerationStructureFlagsKHR       flags;
-    VkClusterAccelerationStructureOpTypeNV     opType;
-    VkClusterAccelerationStructureOpModeNV     opMode;
-    VkClusterAccelerationStructureOpInputNV    opInput;
-} VkClusterAccelerationStructureInputInfoNV;
-
-typedef struct VkStridedDeviceAddressRegionKHR {
-    VkDeviceAddress    deviceAddress;
-    VkDeviceSize       stride;
-    VkDeviceSize       size;
-} VkStridedDeviceAddressRegionKHR;
-
-typedef struct VkClusterAccelerationStructureCommandsInfoNV {
-    VkStructureType                                           sType;
-    void*                                                     pNext;
-    VkClusterAccelerationStructureInputInfoNV                 input;
-    VkDeviceAddress                                           dstImplicitData;
-    VkDeviceAddress                                           scratchData;
-    VkStridedDeviceAddressRegionKHR                           dstAddressesArray;
-    VkStridedDeviceAddressRegionKHR                           dstSizesArray;
-    VkStridedDeviceAddressRegionKHR                           srcInfosArray;
-    VkDeviceAddress                                           srcInfosCount;
-    VkClusterAccelerationStructureAddressResolutionFlagsNV    addressResolutionFlags;
-} VkClusterAccelerationStructureCommandsInfoNV;
-
-typedef struct VkStridedDeviceAddressNV {
-    VkDeviceAddress    startAddress;
-    VkDeviceSize       strideInBytes;
-} VkStridedDeviceAddressNV;
-
-typedef struct VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV {
-    uint32_t    geometryIndex:24;
-    uint32_t    reserved:5;
-    uint32_t    geometryFlags:3;
-} VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV;
-
-typedef struct VkClusterAccelerationStructureMoveObjectsInfoNV {
-    VkDeviceAddress    srcAccelerationStructure;
-} VkClusterAccelerationStructureMoveObjectsInfoNV;
-
-typedef struct VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV {
-    uint32_t           clusterReferencesCount;
-    uint32_t           clusterReferencesStride;
-    VkDeviceAddress    clusterReferences;
-} VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV;
-
-typedef struct VkClusterAccelerationStructureBuildTriangleClusterInfoNV {
-    uint32_t                                                         clusterID;
-    VkClusterAccelerationStructureClusterFlagsNV                     clusterFlags;
-    uint32_t                                                         triangleCount:9;
-    uint32_t                                                         vertexCount:9;
-    uint32_t                                                         positionTruncateBitCount:6;
-    uint32_t                                                         indexType:4;
-    uint32_t                                                         opacityMicromapIndexType:4;
-    VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV    baseGeometryIndexAndGeometryFlags;
-    uint16_t                                                         indexBufferStride;
-    uint16_t                                                         vertexBufferStride;
-    uint16_t                                                         geometryIndexAndFlagsBufferStride;
-    uint16_t                                                         opacityMicromapIndexBufferStride;
-    VkDeviceAddress                                                  indexBuffer;
-    VkDeviceAddress                                                  vertexBuffer;
-    VkDeviceAddress                                                  geometryIndexAndFlagsBuffer;
-    VkDeviceAddress                                                  opacityMicromapArray;
-    VkDeviceAddress                                                  opacityMicromapIndexBuffer;
-} VkClusterAccelerationStructureBuildTriangleClusterInfoNV;
-
-typedef struct VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV {
-    uint32_t                                                         clusterID;
-    VkClusterAccelerationStructureClusterFlagsNV                     clusterFlags;
-    uint32_t                                                         triangleCount:9;
-    uint32_t                                                         vertexCount:9;
-    uint32_t                                                         positionTruncateBitCount:6;
-    uint32_t                                                         indexType:4;
-    uint32_t                                                         opacityMicromapIndexType:4;
-    VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV    baseGeometryIndexAndGeometryFlags;
-    uint16_t                                                         indexBufferStride;
-    uint16_t                                                         vertexBufferStride;
-    uint16_t                                                         geometryIndexAndFlagsBufferStride;
-    uint16_t                                                         opacityMicromapIndexBufferStride;
-    VkDeviceAddress                                                  indexBuffer;
-    VkDeviceAddress                                                  vertexBuffer;
-    VkDeviceAddress                                                  geometryIndexAndFlagsBuffer;
-    VkDeviceAddress                                                  opacityMicromapArray;
-    VkDeviceAddress                                                  opacityMicromapIndexBuffer;
-    VkDeviceAddress                                                  instantiationBoundingBoxLimit;
-} VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV;
-
-typedef struct VkClusterAccelerationStructureInstantiateClusterInfoNV {
-    uint32_t                    clusterIdOffset;
-    uint32_t                    geometryIndexOffset:24;
-    uint32_t                    reserved:8;
-    VkDeviceAddress             clusterTemplateAddress;
-    VkStridedDeviceAddressNV    vertexBuffer;
-} VkClusterAccelerationStructureInstantiateClusterInfoNV;
-
-typedef struct VkClusterAccelerationStructureGetTemplateIndicesInfoNV {
-    VkDeviceAddress    clusterTemplateAddress;
-} VkClusterAccelerationStructureGetTemplateIndicesInfoNV;
-
-typedef struct VkAccelerationStructureBuildSizesInfoKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       accelerationStructureSize;
-    VkDeviceSize       updateScratchSize;
-    VkDeviceSize       buildScratchSize;
-} VkAccelerationStructureBuildSizesInfoKHR;
-
-typedef struct VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           allowClusterAccelerationStructure;
-} VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-
-typedef void (VKAPI_PTR *PFN_vkGetClusterAccelerationStructureBuildSizesNV)(VkDevice device, const VkClusterAccelerationStructureInputInfoNV* pInfo, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdBuildClusterAccelerationStructureIndirectNV)(VkCommandBuffer                     commandBuffer, const VkClusterAccelerationStructureCommandsInfoNV*  pCommandInfos);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetClusterAccelerationStructureBuildSizesNV(
-    VkDevice                                    device,
-    const VkClusterAccelerationStructureInputInfoNV* pInfo,
-    VkAccelerationStructureBuildSizesInfoKHR*   pSizeInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdBuildClusterAccelerationStructureIndirectNV(
-    VkCommandBuffer                             commandBuffer,
-    const VkClusterAccelerationStructureCommandsInfoNV* pCommandInfos);
-#endif
-#endif
-
-
-// VK_NV_partitioned_acceleration_structure is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_partitioned_acceleration_structure 1
-#define VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_SPEC_VERSION 1
-#define VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_NV_partitioned_acceleration_structure"
-#define VK_PARTITIONED_ACCELERATION_STRUCTURE_PARTITION_INDEX_GLOBAL_NV (~0U)
-
-typedef enum VkPartitionedAccelerationStructureOpTypeNV {
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_INSTANCE_NV = 0,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_UPDATE_INSTANCE_NV = 1,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_PARTITION_TRANSLATION_NV = 2,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_MAX_ENUM_NV = 0x7FFFFFFF
-} VkPartitionedAccelerationStructureOpTypeNV;
-
-typedef enum VkPartitionedAccelerationStructureInstanceFlagBitsNV {
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FACING_CULL_DISABLE_BIT_NV = 0x00000001,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FLIP_FACING_BIT_NV = 0x00000002,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_OPAQUE_BIT_NV = 0x00000004,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_NO_OPAQUE_BIT_NV = 0x00000008,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_ENABLE_EXPLICIT_BOUNDING_BOX_NV = 0x00000010,
-    VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF
-} VkPartitionedAccelerationStructureInstanceFlagBitsNV;
-typedef VkFlags VkPartitionedAccelerationStructureInstanceFlagsNV;
-typedef struct VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           partitionedAccelerationStructure;
-} VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-
-typedef struct VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxPartitionCount;
-} VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-
-typedef struct VkPartitionedAccelerationStructureFlagsNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           enablePartitionTranslation;
-} VkPartitionedAccelerationStructureFlagsNV;
-
-typedef struct VkBuildPartitionedAccelerationStructureIndirectCommandNV {
-    VkPartitionedAccelerationStructureOpTypeNV    opType;
-    uint32_t                                      argCount;
-    VkStridedDeviceAddressNV                      argData;
-} VkBuildPartitionedAccelerationStructureIndirectCommandNV;
-
-typedef struct VkPartitionedAccelerationStructureWriteInstanceDataNV {
-    VkTransformMatrixKHR                                 transform;
-    float                                                explicitAABB[6];
-    uint32_t                                             instanceID;
-    uint32_t                                             instanceMask;
-    uint32_t                                             instanceContributionToHitGroupIndex;
-    VkPartitionedAccelerationStructureInstanceFlagsNV    instanceFlags;
-    uint32_t                                             instanceIndex;
-    uint32_t                                             partitionIndex;
-    VkDeviceAddress                                      accelerationStructure;
-} VkPartitionedAccelerationStructureWriteInstanceDataNV;
-
-typedef struct VkPartitionedAccelerationStructureUpdateInstanceDataNV {
-    uint32_t           instanceIndex;
-    uint32_t           instanceContributionToHitGroupIndex;
-    VkDeviceAddress    accelerationStructure;
-} VkPartitionedAccelerationStructureUpdateInstanceDataNV;
-
-typedef struct VkPartitionedAccelerationStructureWritePartitionTranslationDataNV {
-    uint32_t    partitionIndex;
-    float       partitionTranslation[3];
-} VkPartitionedAccelerationStructureWritePartitionTranslationDataNV;
-
-typedef struct VkWriteDescriptorSetPartitionedAccelerationStructureNV {
-    VkStructureType           sType;
-    void*                     pNext;
-    uint32_t                  accelerationStructureCount;
-    const VkDeviceAddress*    pAccelerationStructures;
-} VkWriteDescriptorSetPartitionedAccelerationStructureNV;
-
-typedef struct VkPartitionedAccelerationStructureInstancesInputNV {
-    VkStructureType                         sType;
-    void*                                   pNext;
-    VkBuildAccelerationStructureFlagsKHR    flags;
-    uint32_t                                instanceCount;
-    uint32_t                                maxInstancePerPartitionCount;
-    uint32_t                                partitionCount;
-    uint32_t                                maxInstanceInGlobalPartitionCount;
-} VkPartitionedAccelerationStructureInstancesInputNV;
-
-typedef struct VkBuildPartitionedAccelerationStructureInfoNV {
-    VkStructureType                                       sType;
-    void*                                                 pNext;
-    VkPartitionedAccelerationStructureInstancesInputNV    input;
-    VkDeviceAddress                                       srcAccelerationStructureData;
-    VkDeviceAddress                                       dstAccelerationStructureData;
-    VkDeviceAddress                                       scratchData;
-    VkDeviceAddress                                       srcInfos;
-    VkDeviceAddress                                       srcInfosCount;
-} VkBuildPartitionedAccelerationStructureInfoNV;
-
-typedef void (VKAPI_PTR *PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV)(VkDevice device, const VkPartitionedAccelerationStructureInstancesInputNV* pInfo, VkAccelerationStructureBuildSizesInfoKHR*                  pSizeInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdBuildPartitionedAccelerationStructuresNV)(VkCommandBuffer                     commandBuffer, const VkBuildPartitionedAccelerationStructureInfoNV*  pBuildInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetPartitionedAccelerationStructuresBuildSizesNV(
-    VkDevice                                    device,
-    const VkPartitionedAccelerationStructureInstancesInputNV* pInfo,
-    VkAccelerationStructureBuildSizesInfoKHR*   pSizeInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdBuildPartitionedAccelerationStructuresNV(
-    VkCommandBuffer                             commandBuffer,
-    const VkBuildPartitionedAccelerationStructureInfoNV* pBuildInfo);
-#endif
-#endif
-
-
-// VK_EXT_device_generated_commands is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_device_generated_commands 1
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkIndirectExecutionSetEXT)
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkIndirectCommandsLayoutEXT)
-#define VK_EXT_DEVICE_GENERATED_COMMANDS_SPEC_VERSION 1
-#define VK_EXT_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME "VK_EXT_device_generated_commands"
-
-typedef enum VkIndirectExecutionSetInfoTypeEXT {
-    VK_INDIRECT_EXECUTION_SET_INFO_TYPE_PIPELINES_EXT = 0,
-    VK_INDIRECT_EXECUTION_SET_INFO_TYPE_SHADER_OBJECTS_EXT = 1,
-    VK_INDIRECT_EXECUTION_SET_INFO_TYPE_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkIndirectExecutionSetInfoTypeEXT;
-
-typedef enum VkIndirectCommandsTokenTypeEXT {
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_EXECUTION_SET_EXT = 0,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_EXT = 1,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_SEQUENCE_INDEX_EXT = 2,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_EXT = 3,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_EXT = 4,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_EXT = 5,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_EXT = 6,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_COUNT_EXT = 7,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_COUNT_EXT = 8,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_EXT = 9,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV_EXT = 1000202002,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_NV_EXT = 1000202003,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_EXT = 1000328000,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_EXT = 1000328001,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_TRACE_RAYS2_EXT = 1000386004,
-    VK_INDIRECT_COMMANDS_TOKEN_TYPE_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkIndirectCommandsTokenTypeEXT;
-
-typedef enum VkIndirectCommandsInputModeFlagBitsEXT {
-    VK_INDIRECT_COMMANDS_INPUT_MODE_VULKAN_INDEX_BUFFER_EXT = 0x00000001,
-    VK_INDIRECT_COMMANDS_INPUT_MODE_DXGI_INDEX_BUFFER_EXT = 0x00000002,
-    VK_INDIRECT_COMMANDS_INPUT_MODE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkIndirectCommandsInputModeFlagBitsEXT;
-typedef VkFlags VkIndirectCommandsInputModeFlagsEXT;
-
-typedef enum VkIndirectCommandsLayoutUsageFlagBitsEXT {
-    VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EXPLICIT_PREPROCESS_BIT_EXT = 0x00000001,
-    VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_EXT = 0x00000002,
-    VK_INDIRECT_COMMANDS_LAYOUT_USAGE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
-} VkIndirectCommandsLayoutUsageFlagBitsEXT;
-typedef VkFlags VkIndirectCommandsLayoutUsageFlagsEXT;
-typedef struct VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           deviceGeneratedCommands;
-    VkBool32           dynamicGeneratedPipelineLayout;
-} VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-
-typedef struct VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT {
-    VkStructureType                        sType;
-    void*                                  pNext;
-    uint32_t                               maxIndirectPipelineCount;
-    uint32_t                               maxIndirectShaderObjectCount;
-    uint32_t                               maxIndirectSequenceCount;
-    uint32_t                               maxIndirectCommandsTokenCount;
-    uint32_t                               maxIndirectCommandsTokenOffset;
-    uint32_t                               maxIndirectCommandsIndirectStride;
-    VkIndirectCommandsInputModeFlagsEXT    supportedIndirectCommandsInputModes;
-    VkShaderStageFlags                     supportedIndirectCommandsShaderStages;
-    VkShaderStageFlags                     supportedIndirectCommandsShaderStagesPipelineBinding;
-    VkShaderStageFlags                     supportedIndirectCommandsShaderStagesShaderBinding;
-    VkBool32                               deviceGeneratedCommandsTransformFeedback;
-    VkBool32                               deviceGeneratedCommandsMultiDrawIndirectCount;
-} VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-
-typedef struct VkGeneratedCommandsMemoryRequirementsInfoEXT {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkIndirectExecutionSetEXT      indirectExecutionSet;
-    VkIndirectCommandsLayoutEXT    indirectCommandsLayout;
-    uint32_t                       maxSequenceCount;
-    uint32_t                       maxDrawCount;
-} VkGeneratedCommandsMemoryRequirementsInfoEXT;
-
-typedef struct VkIndirectExecutionSetPipelineInfoEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkPipeline         initialPipeline;
-    uint32_t           maxPipelineCount;
-} VkIndirectExecutionSetPipelineInfoEXT;
-
-typedef struct VkIndirectExecutionSetShaderLayoutInfoEXT {
-    VkStructureType                 sType;
-    const void*                     pNext;
-    uint32_t                        setLayoutCount;
-    const VkDescriptorSetLayout*    pSetLayouts;
-} VkIndirectExecutionSetShaderLayoutInfoEXT;
-
-typedef struct VkIndirectExecutionSetShaderInfoEXT {
-    VkStructureType                                     sType;
-    const void*                                         pNext;
-    uint32_t                                            shaderCount;
-    const VkShaderEXT*                                  pInitialShaders;
-    const VkIndirectExecutionSetShaderLayoutInfoEXT*    pSetLayoutInfos;
-    uint32_t                                            maxShaderCount;
-    uint32_t                                            pushConstantRangeCount;
-    const VkPushConstantRange*                          pPushConstantRanges;
-} VkIndirectExecutionSetShaderInfoEXT;
-
-typedef union VkIndirectExecutionSetInfoEXT {
-    const VkIndirectExecutionSetPipelineInfoEXT*    pPipelineInfo;
-    const VkIndirectExecutionSetShaderInfoEXT*      pShaderInfo;
-} VkIndirectExecutionSetInfoEXT;
-
-typedef struct VkIndirectExecutionSetCreateInfoEXT {
-    VkStructureType                      sType;
-    const void*                          pNext;
-    VkIndirectExecutionSetInfoTypeEXT    type;
-    VkIndirectExecutionSetInfoEXT        info;
-} VkIndirectExecutionSetCreateInfoEXT;
-
-typedef struct VkGeneratedCommandsInfoEXT {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkShaderStageFlags             shaderStages;
-    VkIndirectExecutionSetEXT      indirectExecutionSet;
-    VkIndirectCommandsLayoutEXT    indirectCommandsLayout;
-    VkDeviceAddress                indirectAddress;
-    VkDeviceSize                   indirectAddressSize;
-    VkDeviceAddress                preprocessAddress;
-    VkDeviceSize                   preprocessSize;
-    uint32_t                       maxSequenceCount;
-    VkDeviceAddress                sequenceCountAddress;
-    uint32_t                       maxDrawCount;
-} VkGeneratedCommandsInfoEXT;
-
-typedef struct VkWriteIndirectExecutionSetPipelineEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           index;
-    VkPipeline         pipeline;
-} VkWriteIndirectExecutionSetPipelineEXT;
-
-typedef struct VkIndirectCommandsPushConstantTokenEXT {
-    VkPushConstantRange    updateRange;
-} VkIndirectCommandsPushConstantTokenEXT;
-
-typedef struct VkIndirectCommandsVertexBufferTokenEXT {
-    uint32_t    vertexBindingUnit;
-} VkIndirectCommandsVertexBufferTokenEXT;
-
-typedef struct VkIndirectCommandsIndexBufferTokenEXT {
-    VkIndirectCommandsInputModeFlagBitsEXT    mode;
-} VkIndirectCommandsIndexBufferTokenEXT;
-
-typedef struct VkIndirectCommandsExecutionSetTokenEXT {
-    VkIndirectExecutionSetInfoTypeEXT    type;
-    VkShaderStageFlags                   shaderStages;
-} VkIndirectCommandsExecutionSetTokenEXT;
-
-typedef union VkIndirectCommandsTokenDataEXT {
-    const VkIndirectCommandsPushConstantTokenEXT*    pPushConstant;
-    const VkIndirectCommandsVertexBufferTokenEXT*    pVertexBuffer;
-    const VkIndirectCommandsIndexBufferTokenEXT*     pIndexBuffer;
-    const VkIndirectCommandsExecutionSetTokenEXT*    pExecutionSet;
-} VkIndirectCommandsTokenDataEXT;
-
-typedef struct VkIndirectCommandsLayoutTokenEXT {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkIndirectCommandsTokenTypeEXT    type;
-    VkIndirectCommandsTokenDataEXT    data;
-    uint32_t                          offset;
-} VkIndirectCommandsLayoutTokenEXT;
-
-typedef struct VkIndirectCommandsLayoutCreateInfoEXT {
-    VkStructureType                            sType;
-    const void*                                pNext;
-    VkIndirectCommandsLayoutUsageFlagsEXT      flags;
-    VkShaderStageFlags                         shaderStages;
-    uint32_t                                   indirectStride;
-    VkPipelineLayout                           pipelineLayout;
-    uint32_t                                   tokenCount;
-    const VkIndirectCommandsLayoutTokenEXT*    pTokens;
-} VkIndirectCommandsLayoutCreateInfoEXT;
-
-typedef struct VkDrawIndirectCountIndirectCommandEXT {
-    VkDeviceAddress    bufferAddress;
-    uint32_t           stride;
-    uint32_t           commandCount;
-} VkDrawIndirectCountIndirectCommandEXT;
-
-typedef struct VkBindVertexBufferIndirectCommandEXT {
-    VkDeviceAddress    bufferAddress;
-    uint32_t           size;
-    uint32_t           stride;
-} VkBindVertexBufferIndirectCommandEXT;
-
-typedef struct VkBindIndexBufferIndirectCommandEXT {
-    VkDeviceAddress    bufferAddress;
-    uint32_t           size;
-    VkIndexType        indexType;
-} VkBindIndexBufferIndirectCommandEXT;
-
-typedef struct VkGeneratedCommandsPipelineInfoEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkPipeline         pipeline;
-} VkGeneratedCommandsPipelineInfoEXT;
-
-typedef struct VkGeneratedCommandsShaderInfoEXT {
-    VkStructureType       sType;
-    void*                 pNext;
-    uint32_t              shaderCount;
-    const VkShaderEXT*    pShaders;
-} VkGeneratedCommandsShaderInfoEXT;
-
-typedef struct VkWriteIndirectExecutionSetShaderEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           index;
-    VkShaderEXT        shader;
-} VkWriteIndirectExecutionSetShaderEXT;
-
-typedef void (VKAPI_PTR *PFN_vkGetGeneratedCommandsMemoryRequirementsEXT)(VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoEXT* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef void (VKAPI_PTR *PFN_vkCmdPreprocessGeneratedCommandsEXT)(VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoEXT* pGeneratedCommandsInfo, VkCommandBuffer stateCommandBuffer);
-typedef void (VKAPI_PTR *PFN_vkCmdExecuteGeneratedCommandsEXT)(VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoEXT* pGeneratedCommandsInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateIndirectCommandsLayoutEXT)(VkDevice device, const VkIndirectCommandsLayoutCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkIndirectCommandsLayoutEXT* pIndirectCommandsLayout);
-typedef void (VKAPI_PTR *PFN_vkDestroyIndirectCommandsLayoutEXT)(VkDevice device, VkIndirectCommandsLayoutEXT indirectCommandsLayout, const VkAllocationCallbacks* pAllocator);
-typedef VkResult (VKAPI_PTR *PFN_vkCreateIndirectExecutionSetEXT)(VkDevice device, const VkIndirectExecutionSetCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkIndirectExecutionSetEXT* pIndirectExecutionSet);
-typedef void (VKAPI_PTR *PFN_vkDestroyIndirectExecutionSetEXT)(VkDevice device, VkIndirectExecutionSetEXT indirectExecutionSet, const VkAllocationCallbacks* pAllocator);
-typedef void (VKAPI_PTR *PFN_vkUpdateIndirectExecutionSetPipelineEXT)(VkDevice device, VkIndirectExecutionSetEXT indirectExecutionSet, uint32_t executionSetWriteCount, const VkWriteIndirectExecutionSetPipelineEXT* pExecutionSetWrites);
-typedef void (VKAPI_PTR *PFN_vkUpdateIndirectExecutionSetShaderEXT)(VkDevice device, VkIndirectExecutionSetEXT indirectExecutionSet, uint32_t executionSetWriteCount, const VkWriteIndirectExecutionSetShaderEXT* pExecutionSetWrites);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkGetGeneratedCommandsMemoryRequirementsEXT(
-    VkDevice                                    device,
-    const VkGeneratedCommandsMemoryRequirementsInfoEXT* pInfo,
-    VkMemoryRequirements2*                      pMemoryRequirements);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdPreprocessGeneratedCommandsEXT(
-    VkCommandBuffer                             commandBuffer,
-    const VkGeneratedCommandsInfoEXT*           pGeneratedCommandsInfo,
-    VkCommandBuffer                             stateCommandBuffer);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdExecuteGeneratedCommandsEXT(
-    VkCommandBuffer                             commandBuffer,
-    VkBool32                                    isPreprocessed,
-    const VkGeneratedCommandsInfoEXT*           pGeneratedCommandsInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateIndirectCommandsLayoutEXT(
-    VkDevice                                    device,
-    const VkIndirectCommandsLayoutCreateInfoEXT* pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkIndirectCommandsLayoutEXT*                pIndirectCommandsLayout);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyIndirectCommandsLayoutEXT(
-    VkDevice                                    device,
-    VkIndirectCommandsLayoutEXT                 indirectCommandsLayout,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateIndirectExecutionSetEXT(
-    VkDevice                                    device,
-    const VkIndirectExecutionSetCreateInfoEXT*  pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkIndirectExecutionSetEXT*                  pIndirectExecutionSet);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkDestroyIndirectExecutionSetEXT(
-    VkDevice                                    device,
-    VkIndirectExecutionSetEXT                   indirectExecutionSet,
-    const VkAllocationCallbacks*                pAllocator);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkUpdateIndirectExecutionSetPipelineEXT(
-    VkDevice                                    device,
-    VkIndirectExecutionSetEXT                   indirectExecutionSet,
-    uint32_t                                    executionSetWriteCount,
-    const VkWriteIndirectExecutionSetPipelineEXT* pExecutionSetWrites);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkUpdateIndirectExecutionSetShaderEXT(
-    VkDevice                                    device,
-    VkIndirectExecutionSetEXT                   indirectExecutionSet,
-    uint32_t                                    executionSetWriteCount,
-    const VkWriteIndirectExecutionSetShaderEXT* pExecutionSetWrites);
-#endif
-#endif
-
-
-// VK_MESA_image_alignment_control is a preprocessor guard. Do not pass it to API calls.
-#define VK_MESA_image_alignment_control 1
-#define VK_MESA_IMAGE_ALIGNMENT_CONTROL_SPEC_VERSION 1
-#define VK_MESA_IMAGE_ALIGNMENT_CONTROL_EXTENSION_NAME "VK_MESA_image_alignment_control"
-typedef struct VkPhysicalDeviceImageAlignmentControlFeaturesMESA {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           imageAlignmentControl;
-} VkPhysicalDeviceImageAlignmentControlFeaturesMESA;
-
-typedef struct VkPhysicalDeviceImageAlignmentControlPropertiesMESA {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           supportedImageAlignmentMask;
-} VkPhysicalDeviceImageAlignmentControlPropertiesMESA;
-
-typedef struct VkImageAlignmentControlCreateInfoMESA {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           maximumRequestedAlignment;
-} VkImageAlignmentControlCreateInfoMESA;
-
-
-
-// VK_EXT_ray_tracing_invocation_reorder is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_ray_tracing_invocation_reorder 1
-#define VK_EXT_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION 1
-#define VK_EXT_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME "VK_EXT_ray_tracing_invocation_reorder"
-typedef struct VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT {
-    VkStructureType                         sType;
-    void*                                   pNext;
-    VkRayTracingInvocationReorderModeEXT    rayTracingInvocationReorderReorderingHint;
-    uint32_t                                maxShaderBindingTableRecordIndex;
-} VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-
-typedef struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           rayTracingInvocationReorder;
-} VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-
-
-
-// VK_EXT_depth_clamp_control is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_depth_clamp_control 1
-#define VK_EXT_DEPTH_CLAMP_CONTROL_SPEC_VERSION 1
-#define VK_EXT_DEPTH_CLAMP_CONTROL_EXTENSION_NAME "VK_EXT_depth_clamp_control"
-typedef struct VkPhysicalDeviceDepthClampControlFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           depthClampControl;
-} VkPhysicalDeviceDepthClampControlFeaturesEXT;
-
-typedef struct VkPipelineViewportDepthClampControlCreateInfoEXT {
-    VkStructureType                sType;
-    const void*                    pNext;
-    VkDepthClampModeEXT            depthClampMode;
-    const VkDepthClampRangeEXT*    pDepthClampRange;
-} VkPipelineViewportDepthClampControlCreateInfoEXT;
-
-
-
-// VK_HUAWEI_hdr_vivid is a preprocessor guard. Do not pass it to API calls.
-#define VK_HUAWEI_hdr_vivid 1
-#define VK_HUAWEI_HDR_VIVID_SPEC_VERSION  1
-#define VK_HUAWEI_HDR_VIVID_EXTENSION_NAME "VK_HUAWEI_hdr_vivid"
-typedef struct VkPhysicalDeviceHdrVividFeaturesHUAWEI {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           hdrVivid;
-} VkPhysicalDeviceHdrVividFeaturesHUAWEI;
-
-typedef struct VkHdrVividDynamicMetadataHUAWEI {
-    VkStructureType    sType;
-    const void*        pNext;
-    size_t             dynamicMetadataSize;
-    const void*        pDynamicMetadata;
-} VkHdrVividDynamicMetadataHUAWEI;
-
-
-
-// VK_NV_cooperative_matrix2 is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_cooperative_matrix2 1
-#define VK_NV_COOPERATIVE_MATRIX_2_SPEC_VERSION 1
-#define VK_NV_COOPERATIVE_MATRIX_2_EXTENSION_NAME "VK_NV_cooperative_matrix2"
-typedef struct VkCooperativeMatrixFlexibleDimensionsPropertiesNV {
-    VkStructureType       sType;
-    void*                 pNext;
-    uint32_t              MGranularity;
-    uint32_t              NGranularity;
-    uint32_t              KGranularity;
-    VkComponentTypeKHR    AType;
-    VkComponentTypeKHR    BType;
-    VkComponentTypeKHR    CType;
-    VkComponentTypeKHR    ResultType;
-    VkBool32              saturatingAccumulation;
-    VkScopeKHR            scope;
-    uint32_t              workgroupInvocations;
-} VkCooperativeMatrixFlexibleDimensionsPropertiesNV;
-
-typedef struct VkPhysicalDeviceCooperativeMatrix2FeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           cooperativeMatrixWorkgroupScope;
-    VkBool32           cooperativeMatrixFlexibleDimensions;
-    VkBool32           cooperativeMatrixReductions;
-    VkBool32           cooperativeMatrixConversions;
-    VkBool32           cooperativeMatrixPerElementOperations;
-    VkBool32           cooperativeMatrixTensorAddressing;
-    VkBool32           cooperativeMatrixBlockLoads;
-} VkPhysicalDeviceCooperativeMatrix2FeaturesNV;
-
-typedef struct VkPhysicalDeviceCooperativeMatrix2PropertiesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           cooperativeMatrixWorkgroupScopeMaxWorkgroupSize;
-    uint32_t           cooperativeMatrixFlexibleDimensionsMaxDimension;
-    uint32_t           cooperativeMatrixWorkgroupScopeReservedSharedMemory;
-} VkPhysicalDeviceCooperativeMatrix2PropertiesNV;
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixFlexibleDimensionsPropertiesNV* pProperties);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-    VkPhysicalDevice                            physicalDevice,
-    uint32_t*                                   pPropertyCount,
-    VkCooperativeMatrixFlexibleDimensionsPropertiesNV* pProperties);
-#endif
-#endif
-
-
-// VK_ARM_pipeline_opacity_micromap is a preprocessor guard. Do not pass it to API calls.
-#define VK_ARM_pipeline_opacity_micromap 1
-#define VK_ARM_PIPELINE_OPACITY_MICROMAP_SPEC_VERSION 1
-#define VK_ARM_PIPELINE_OPACITY_MICROMAP_EXTENSION_NAME "VK_ARM_pipeline_opacity_micromap"
-typedef struct VkPhysicalDevicePipelineOpacityMicromapFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineOpacityMicromap;
-} VkPhysicalDevicePipelineOpacityMicromapFeaturesARM;
-
-
-
-// VK_ARM_performance_counters_by_region is a preprocessor guard. Do not pass it to API calls.
-#define VK_ARM_performance_counters_by_region 1
-#define VK_ARM_PERFORMANCE_COUNTERS_BY_REGION_SPEC_VERSION 1
-#define VK_ARM_PERFORMANCE_COUNTERS_BY_REGION_EXTENSION_NAME "VK_ARM_performance_counters_by_region"
-typedef VkFlags VkPerformanceCounterDescriptionFlagsARM;
-typedef struct VkPhysicalDevicePerformanceCountersByRegionFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           performanceCountersByRegion;
-} VkPhysicalDevicePerformanceCountersByRegionFeaturesARM;
-
-typedef struct VkPhysicalDevicePerformanceCountersByRegionPropertiesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxPerRegionPerformanceCounters;
-    VkExtent2D         performanceCounterRegionSize;
-    uint32_t           rowStrideAlignment;
-    uint32_t           regionAlignment;
-    VkBool32           identityTransformOrder;
-} VkPhysicalDevicePerformanceCountersByRegionPropertiesARM;
-
-typedef struct VkPerformanceCounterARM {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           counterID;
-} VkPerformanceCounterARM;
-
-typedef struct VkPerformanceCounterDescriptionARM {
-    VkStructureType                            sType;
-    void*                                      pNext;
-    VkPerformanceCounterDescriptionFlagsARM    flags;
-    char                                       name[VK_MAX_DESCRIPTION_SIZE];
-} VkPerformanceCounterDescriptionARM;
-
-typedef struct VkRenderPassPerformanceCountersByRegionBeginInfoARM {
-    VkStructureType           sType;
-    void*                     pNext;
-    uint32_t                  counterAddressCount;
-    const VkDeviceAddress*    pCounterAddresses;
-    VkBool32                  serializeRegions;
-    uint32_t                  counterIndexCount;
-    uint32_t*                 pCounterIndices;
-} VkRenderPassPerformanceCountersByRegionBeginInfoARM;
-
-typedef VkResult (VKAPI_PTR *PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterARM* pCounters, VkPerformanceCounterDescriptionARM* pCounterDescriptions);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-    VkPhysicalDevice                            physicalDevice,
-    uint32_t                                    queueFamilyIndex,
-    uint32_t*                                   pCounterCount,
-    VkPerformanceCounterARM*                    pCounters,
-    VkPerformanceCounterDescriptionARM*         pCounterDescriptions);
-#endif
-#endif
-
-
-// VK_EXT_vertex_attribute_robustness is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_vertex_attribute_robustness 1
-#define VK_EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_SPEC_VERSION 1
-#define VK_EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_vertex_attribute_robustness"
-typedef struct VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           vertexAttributeRobustness;
-} VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
-
-
-
-// VK_ARM_format_pack is a preprocessor guard. Do not pass it to API calls.
-#define VK_ARM_format_pack 1
-#define VK_ARM_FORMAT_PACK_SPEC_VERSION   1
-#define VK_ARM_FORMAT_PACK_EXTENSION_NAME "VK_ARM_format_pack"
-typedef struct VkPhysicalDeviceFormatPackFeaturesARM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           formatPack;
-} VkPhysicalDeviceFormatPackFeaturesARM;
-
-
-
-// VK_VALVE_fragment_density_map_layered is a preprocessor guard. Do not pass it to API calls.
-#define VK_VALVE_fragment_density_map_layered 1
-#define VK_VALVE_FRAGMENT_DENSITY_MAP_LAYERED_SPEC_VERSION 1
-#define VK_VALVE_FRAGMENT_DENSITY_MAP_LAYERED_EXTENSION_NAME "VK_VALVE_fragment_density_map_layered"
-typedef struct VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           fragmentDensityMapLayered;
-} VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-
-typedef struct VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           maxFragmentDensityMapLayers;
-} VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-
-typedef struct VkPipelineFragmentDensityMapLayeredCreateInfoVALVE {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           maxFragmentDensityMapLayers;
-} VkPipelineFragmentDensityMapLayeredCreateInfoVALVE;
-
-
-
-// VK_NV_present_metering is a preprocessor guard. Do not pass it to API calls.
-#define VK_NV_present_metering 1
-#define VK_NV_PRESENT_METERING_SPEC_VERSION 1
-#define VK_NV_PRESENT_METERING_EXTENSION_NAME "VK_NV_present_metering"
-typedef struct VkSetPresentConfigNV {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           numFramesPerBatch;
-    uint32_t           presentConfigFeedback;
-} VkSetPresentConfigNV;
-
-typedef struct VkPhysicalDevicePresentMeteringFeaturesNV {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentMetering;
-} VkPhysicalDevicePresentMeteringFeaturesNV;
-
-
-
-// VK_EXT_fragment_density_map_offset is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_fragment_density_map_offset 1
-#define VK_EXT_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1
-#define VK_EXT_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_EXT_fragment_density_map_offset"
-typedef VkRenderingEndInfoKHR VkRenderingEndInfoEXT;
-
-typedef void (VKAPI_PTR *PFN_vkCmdEndRendering2EXT)(VkCommandBuffer                   commandBuffer, const VkRenderingEndInfoKHR*        pRenderingEndInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdEndRendering2EXT(
-    VkCommandBuffer                             commandBuffer,
-    const VkRenderingEndInfoKHR*                pRenderingEndInfo);
-#endif
-#endif
-
-
-// VK_EXT_zero_initialize_device_memory is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_zero_initialize_device_memory 1
-#define VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_SPEC_VERSION 1
-#define VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_EXTENSION_NAME "VK_EXT_zero_initialize_device_memory"
-typedef struct VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           zeroInitializeDeviceMemory;
-} VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-
-
-
-// VK_EXT_shader_64bit_indexing is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_shader_64bit_indexing 1
-#define VK_EXT_SHADER_64BIT_INDEXING_SPEC_VERSION 1
-#define VK_EXT_SHADER_64BIT_INDEXING_EXTENSION_NAME "VK_EXT_shader_64bit_indexing"
-typedef struct VkPhysicalDeviceShader64BitIndexingFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shader64BitIndexing;
-} VkPhysicalDeviceShader64BitIndexingFeaturesEXT;
-
-
-
-// VK_EXT_custom_resolve is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_custom_resolve 1
-#define VK_EXT_CUSTOM_RESOLVE_SPEC_VERSION 1
-#define VK_EXT_CUSTOM_RESOLVE_EXTENSION_NAME "VK_EXT_custom_resolve"
-typedef struct VkPhysicalDeviceCustomResolveFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           customResolve;
-} VkPhysicalDeviceCustomResolveFeaturesEXT;
-
-typedef struct VkBeginCustomResolveInfoEXT {
-    VkStructureType    sType;
-    void*              pNext;
-} VkBeginCustomResolveInfoEXT;
-
-typedef struct VkCustomResolveCreateInfoEXT {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           customResolve;
-    uint32_t           colorAttachmentCount;
-    const VkFormat*    pColorAttachmentFormats;
-    VkFormat           depthAttachmentFormat;
-    VkFormat           stencilAttachmentFormat;
-} VkCustomResolveCreateInfoEXT;
-
-typedef void (VKAPI_PTR *PFN_vkCmdBeginCustomResolveEXT)(VkCommandBuffer commandBuffer, const VkBeginCustomResolveInfoEXT* pBeginCustomResolveInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdBeginCustomResolveEXT(
-    VkCommandBuffer                             commandBuffer,
-    const VkBeginCustomResolveInfoEXT*          pBeginCustomResolveInfo);
-#endif
-#endif
-
-
-// VK_QCOM_data_graph_model is a preprocessor guard. Do not pass it to API calls.
-#define VK_QCOM_data_graph_model 1
-#define VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM 3U
-#define VK_QCOM_DATA_GRAPH_MODEL_SPEC_VERSION 1
-#define VK_QCOM_DATA_GRAPH_MODEL_EXTENSION_NAME "VK_QCOM_data_graph_model"
-
-typedef enum VkDataGraphModelCacheTypeQCOM {
-    VK_DATA_GRAPH_MODEL_CACHE_TYPE_GENERIC_BINARY_QCOM = 0,
-    VK_DATA_GRAPH_MODEL_CACHE_TYPE_MAX_ENUM_QCOM = 0x7FFFFFFF
-} VkDataGraphModelCacheTypeQCOM;
-typedef struct VkPipelineCacheHeaderVersionDataGraphQCOM {
-    uint32_t                         headerSize;
-    VkPipelineCacheHeaderVersion     headerVersion;
-    VkDataGraphModelCacheTypeQCOM    cacheType;
-    uint32_t                         cacheVersion;
-    uint32_t                         toolchainVersion[VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM];
-} VkPipelineCacheHeaderVersionDataGraphQCOM;
-
-typedef struct VkDataGraphPipelineBuiltinModelCreateInfoQCOM {
-    VkStructureType                                        sType;
-    const void*                                            pNext;
-    const VkPhysicalDeviceDataGraphOperationSupportARM*    pOperation;
-} VkDataGraphPipelineBuiltinModelCreateInfoQCOM;
-
-typedef struct VkPhysicalDeviceDataGraphModelFeaturesQCOM {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           dataGraphModel;
-} VkPhysicalDeviceDataGraphModelFeaturesQCOM;
-
-
-
-// VK_SEC_pipeline_cache_incremental_mode is a preprocessor guard. Do not pass it to API calls.
-#define VK_SEC_pipeline_cache_incremental_mode 1
-#define VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION 1
-#define VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_EXTENSION_NAME "VK_SEC_pipeline_cache_incremental_mode"
-typedef struct VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineCacheIncrementalMode;
-} VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-
-
-// VK_EXT_shader_uniform_buffer_unsized_array is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_shader_uniform_buffer_unsized_array 1
-#define VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION 1
-#define VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_EXTENSION_NAME "VK_EXT_shader_uniform_buffer_unsized_array"
-typedef struct VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderUniformBufferUnsizedArray;
-} VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-
-
-
 // VK_KHR_acceleration_structure is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_acceleration_structure 1
 #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13
@@ -24347,6 +19305,14 @@ typedef struct VkCopyAccelerationStructureInfoKHR {
     VkCopyAccelerationStructureModeKHR    mode;
 } VkCopyAccelerationStructureInfoKHR;
 
+typedef struct VkAccelerationStructureBuildSizesInfoKHR {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkDeviceSize       accelerationStructureSize;
+    VkDeviceSize       updateScratchSize;
+    VkDeviceSize       buildScratchSize;
+} VkAccelerationStructureBuildSizesInfoKHR;
+
 typedef VkResult (VKAPI_PTR *PFN_vkCreateAccelerationStructureKHR)(VkDevice                                           device, const VkAccelerationStructureCreateInfoKHR*        pCreateInfo, const VkAllocationCallbacks*       pAllocator, VkAccelerationStructureKHR*                        pAccelerationStructure);
 typedef void (VKAPI_PTR *PFN_vkDestroyAccelerationStructureKHR)(VkDevice device, VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator);
 typedef void (VKAPI_PTR *PFN_vkCmdBuildAccelerationStructuresKHR)(VkCommandBuffer                                    commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
@@ -24365,30 +19331,23 @@ typedef void (VKAPI_PTR *PFN_vkGetDeviceAccelerationStructureCompatibilityKHR)(V
 typedef void (VKAPI_PTR *PFN_vkGetAccelerationStructureBuildSizesKHR)(VkDevice                                            device, VkAccelerationStructureBuildTypeKHR                 buildType, const VkAccelerationStructureBuildGeometryInfoKHR*  pBuildInfo, const uint32_t*  pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR*           pSizeInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateAccelerationStructureKHR(
     VkDevice                                    device,
     const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkAccelerationStructureKHR*                 pAccelerationStructure);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyAccelerationStructureKHR(
     VkDevice                                    device,
     VkAccelerationStructureKHR                  accelerationStructure,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBuildAccelerationStructuresKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    infoCount,
     const VkAccelerationStructureBuildGeometryInfoKHR* pInfos,
     const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdBuildAccelerationStructuresIndirectKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    infoCount,
@@ -24396,39 +19355,29 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBuildAccelerationStructuresIndirectKHR(
     const VkDeviceAddress*                      pIndirectDeviceAddresses,
     const uint32_t*                             pIndirectStrides,
     const uint32_t* const*                      ppMaxPrimitiveCounts);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkBuildAccelerationStructuresKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     uint32_t                                    infoCount,
     const VkAccelerationStructureBuildGeometryInfoKHR* pInfos,
     const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyAccelerationStructureKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyAccelerationStructureInfoKHR*   pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyAccelerationStructureToMemoryKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCopyMemoryToAccelerationStructureKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
     const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkWriteAccelerationStructuresPropertiesKHR(
     VkDevice                                    device,
     uint32_t                                    accelerationStructureCount,
@@ -24437,33 +19386,23 @@ VKAPI_ATTR VkResult VKAPI_CALL vkWriteAccelerationStructuresPropertiesKHR(
     size_t                                      dataSize,
     void*                                       pData,
     size_t                                      stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyAccelerationStructureKHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyAccelerationStructureInfoKHR*   pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyAccelerationStructureToMemoryKHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToAccelerationStructureKHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetAccelerationStructureDeviceAddressKHR(
     VkDevice                                    device,
     const VkAccelerationStructureDeviceAddressInfoKHR* pInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdWriteAccelerationStructuresPropertiesKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    accelerationStructureCount,
@@ -24471,16 +19410,12 @@ VKAPI_ATTR void VKAPI_CALL vkCmdWriteAccelerationStructuresPropertiesKHR(
     VkQueryType                                 queryType,
     VkQueryPool                                 queryPool,
     uint32_t                                    firstQuery);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceAccelerationStructureCompatibilityKHR(
     VkDevice                                    device,
     const VkAccelerationStructureVersionInfoKHR* pVersionInfo,
     VkAccelerationStructureCompatibilityKHR*    pCompatibility);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkGetAccelerationStructureBuildSizesKHR(
     VkDevice                                    device,
     VkAccelerationStructureBuildTypeKHR         buildType,
@@ -24488,7 +19423,6 @@ VKAPI_ATTR void VKAPI_CALL vkGetAccelerationStructureBuildSizesKHR(
     const uint32_t*                             pMaxPrimitiveCounts,
     VkAccelerationStructureBuildSizesInfoKHR*   pSizeInfo);
 #endif
-#endif
 
 
 // VK_KHR_ray_tracing_pipeline is a preprocessor guard. Do not pass it to API calls.
@@ -24561,6 +19495,12 @@ typedef struct VkPhysicalDeviceRayTracingPipelinePropertiesKHR {
     uint32_t           maxRayHitAttributeSize;
 } VkPhysicalDeviceRayTracingPipelinePropertiesKHR;
 
+typedef struct VkStridedDeviceAddressRegionKHR {
+    VkDeviceAddress    deviceAddress;
+    VkDeviceSize       stride;
+    VkDeviceSize       size;
+} VkStridedDeviceAddressRegionKHR;
+
 typedef struct VkTraceRaysIndirectCommandKHR {
     uint32_t    width;
     uint32_t    height;
@@ -24575,7 +19515,6 @@ typedef VkDeviceSize (VKAPI_PTR *PFN_vkGetRayTracingShaderGroupStackSizeKHR)(VkD
 typedef void (VKAPI_PTR *PFN_vkCmdSetRayTracingPipelineStackSizeKHR)(VkCommandBuffer commandBuffer, uint32_t pipelineStackSize);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysKHR(
     VkCommandBuffer                             commandBuffer,
     const VkStridedDeviceAddressRegionKHR*      pRaygenShaderBindingTable,
@@ -24585,9 +19524,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysKHR(
     uint32_t                                    width,
     uint32_t                                    height,
     uint32_t                                    depth);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateRayTracingPipelinesKHR(
     VkDevice                                    device,
     VkDeferredOperationKHR                      deferredOperation,
@@ -24596,9 +19533,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateRayTracingPipelinesKHR(
     const VkRayTracingPipelineCreateInfoKHR*    pCreateInfos,
     const VkAllocationCallbacks*                pAllocator,
     VkPipeline*                                 pPipelines);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
@@ -24606,9 +19541,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetRayTracingCaptureReplayShaderGroupHandlesKHR
     uint32_t                                    groupCount,
     size_t                                      dataSize,
     void*                                       pData);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysIndirectKHR(
     VkCommandBuffer                             commandBuffer,
     const VkStridedDeviceAddressRegionKHR*      pRaygenShaderBindingTable,
@@ -24616,22 +19549,17 @@ VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysIndirectKHR(
     const VkStridedDeviceAddressRegionKHR*      pHitShaderBindingTable,
     const VkStridedDeviceAddressRegionKHR*      pCallableShaderBindingTable,
     VkDeviceAddress                             indirectDeviceAddress);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkDeviceSize VKAPI_CALL vkGetRayTracingShaderGroupStackSizeKHR(
     VkDevice                                    device,
     VkPipeline                                  pipeline,
     uint32_t                                    group,
     VkShaderGroupShaderKHR                      groupShader);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdSetRayTracingPipelineStackSizeKHR(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    pipelineStackSize);
 #endif
-#endif
 
 
 // VK_KHR_ray_query is a preprocessor guard. Do not pass it to API calls.
@@ -24704,24 +19632,19 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectEXT)(VkCommandBuffer comm
 typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectCountEXT)(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksEXT(
     VkCommandBuffer                             commandBuffer,
     uint32_t                                    groupCountX,
     uint32_t                                    groupCountY,
     uint32_t                                    groupCountZ);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectEXT(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
     VkDeviceSize                                offset,
     uint32_t                                    drawCount,
     uint32_t                                    stride);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountEXT(
     VkCommandBuffer                             commandBuffer,
     VkBuffer                                    buffer,
@@ -24731,7 +19654,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountEXT(
     uint32_t                                    maxDrawCount,
     uint32_t                                    stride);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_directfb.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_directfb.h
index bb156769..f06f80b7 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_directfb.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_directfb.h
@@ -2,7 +2,7 @@
 #define VULKAN_DIRECTFB_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,21 +36,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateDirectFBSurfaceEXT)(VkInstance instance
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, IDirectFB* dfb);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateDirectFBSurfaceEXT(
     VkInstance                                  instance,
     const VkDirectFBSurfaceCreateInfoEXT*       pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceDirectFBPresentationSupportEXT(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     IDirectFB*                                  dfb);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_enums.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_enums.hpp
index acaeb282..2aaf68c7 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_enums.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_enums.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,13 +8,6 @@
 #ifndef VULKAN_ENUMS_HPP
 #define VULKAN_ENUMS_HPP
 
-// include-what-you-use: make sure, vulkan.hpp is used by code-completers
-// IWYU pragma: private, include "vulkan/vulkan.hpp"
-
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <type_traits>  // for std::underlying_type
-#endif
-
 namespace VULKAN_HPP_NAMESPACE
 {
   template <typename FlagBitsType>
@@ -27,7 +20,6 @@ namespace VULKAN_HPP_NAMESPACE
   class Flags
   {
   public:
-    using BitsType = BitType;
     using MaskType = typename std::underlying_type<BitType>::type;
 
     // constructors
@@ -230,7 +222,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_VERSION_1_0 ===
 
-  // wrapper class for enum VkResult, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResult.html
   enum class Result
   {
     eSuccess                                     = VK_SUCCESS,
@@ -252,28 +243,24 @@ namespace VULKAN_HPP_NAMESPACE
     eErrorFormatNotSupported                     = VK_ERROR_FORMAT_NOT_SUPPORTED,
     eErrorFragmentedPool                         = VK_ERROR_FRAGMENTED_POOL,
     eErrorUnknown                                = VK_ERROR_UNKNOWN,
-    eErrorValidationFailed                       = VK_ERROR_VALIDATION_FAILED,
-    eErrorValidationFailedEXT                    = VK_ERROR_VALIDATION_FAILED_EXT,
     eErrorOutOfPoolMemory                        = VK_ERROR_OUT_OF_POOL_MEMORY,
     eErrorOutOfPoolMemoryKHR                     = VK_ERROR_OUT_OF_POOL_MEMORY_KHR,
     eErrorInvalidExternalHandle                  = VK_ERROR_INVALID_EXTERNAL_HANDLE,
     eErrorInvalidExternalHandleKHR               = VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR,
+    eErrorFragmentation                          = VK_ERROR_FRAGMENTATION,
+    eErrorFragmentationEXT                       = VK_ERROR_FRAGMENTATION_EXT,
     eErrorInvalidOpaqueCaptureAddress            = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS,
     eErrorInvalidDeviceAddressEXT                = VK_ERROR_INVALID_DEVICE_ADDRESS_EXT,
     eErrorInvalidOpaqueCaptureAddressKHR         = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR,
-    eErrorFragmentation                          = VK_ERROR_FRAGMENTATION,
-    eErrorFragmentationEXT                       = VK_ERROR_FRAGMENTATION_EXT,
     ePipelineCompileRequired                     = VK_PIPELINE_COMPILE_REQUIRED,
-    ePipelineCompileRequiredEXT                  = VK_PIPELINE_COMPILE_REQUIRED_EXT,
     eErrorPipelineCompileRequiredEXT             = VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT,
-    eErrorNotPermitted                           = VK_ERROR_NOT_PERMITTED,
-    eErrorNotPermittedEXT                        = VK_ERROR_NOT_PERMITTED_EXT,
-    eErrorNotPermittedKHR                        = VK_ERROR_NOT_PERMITTED_KHR,
+    ePipelineCompileRequiredEXT                  = VK_PIPELINE_COMPILE_REQUIRED_EXT,
     eErrorSurfaceLostKHR                         = VK_ERROR_SURFACE_LOST_KHR,
     eErrorNativeWindowInUseKHR                   = VK_ERROR_NATIVE_WINDOW_IN_USE_KHR,
     eSuboptimalKHR                               = VK_SUBOPTIMAL_KHR,
     eErrorOutOfDateKHR                           = VK_ERROR_OUT_OF_DATE_KHR,
     eErrorIncompatibleDisplayKHR                 = VK_ERROR_INCOMPATIBLE_DISPLAY_KHR,
+    eErrorValidationFailedEXT                    = VK_ERROR_VALIDATION_FAILED_EXT,
     eErrorInvalidShaderNV                        = VK_ERROR_INVALID_SHADER_NV,
     eErrorImageUsageNotSupportedKHR              = VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR,
     eErrorVideoPictureLayoutNotSupportedKHR      = VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR,
@@ -282,7 +269,8 @@ namespace VULKAN_HPP_NAMESPACE
     eErrorVideoProfileCodecNotSupportedKHR       = VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR,
     eErrorVideoStdVersionNotSupportedKHR         = VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR,
     eErrorInvalidDrmFormatModifierPlaneLayoutEXT = VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT,
-    eErrorPresentTimingQueueFullEXT              = VK_ERROR_PRESENT_TIMING_QUEUE_FULL_EXT,
+    eErrorNotPermittedKHR                        = VK_ERROR_NOT_PERMITTED_KHR,
+    eErrorNotPermittedEXT                        = VK_ERROR_NOT_PERMITTED_EXT,
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     eErrorFullScreenExclusiveModeLostEXT = VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT,
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
@@ -293,12 +281,9 @@ namespace VULKAN_HPP_NAMESPACE
     eErrorInvalidVideoStdParametersKHR = VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR,
     eErrorCompressionExhaustedEXT      = VK_ERROR_COMPRESSION_EXHAUSTED_EXT,
     eIncompatibleShaderBinaryEXT       = VK_INCOMPATIBLE_SHADER_BINARY_EXT,
-    eErrorIncompatibleShaderBinaryEXT  = VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT,
-    ePipelineBinaryMissingKHR          = VK_PIPELINE_BINARY_MISSING_KHR,
-    eErrorNotEnoughSpaceKHR            = VK_ERROR_NOT_ENOUGH_SPACE_KHR
+    eErrorIncompatibleShaderBinaryEXT  = VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT
   };
 
-  // wrapper class for enum VkStructureType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStructureType.html
   enum class StructureType
   {
     eApplicationInfo                                         = VK_STRUCTURE_TYPE_APPLICATION_INFO,
@@ -350,16 +335,21 @@ namespace VULKAN_HPP_NAMESPACE
     eMemoryBarrier                                           = VK_STRUCTURE_TYPE_MEMORY_BARRIER,
     eLoaderInstanceCreateInfo                                = VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO,
     eLoaderDeviceCreateInfo                                  = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO,
+    ePhysicalDeviceSubgroupProperties                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES,
     eBindBufferMemoryInfo                                    = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO,
     eBindBufferMemoryInfoKHR                                 = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR,
     eBindImageMemoryInfo                                     = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO,
     eBindImageMemoryInfoKHR                                  = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR,
+    ePhysicalDevice16BitStorageFeatures                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES,
+    ePhysicalDevice16BitStorageFeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR,
     eMemoryDedicatedRequirements                             = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS,
     eMemoryDedicatedRequirementsKHR                          = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR,
     eMemoryDedicatedAllocateInfo                             = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
     eMemoryDedicatedAllocateInfoKHR                          = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR,
     eMemoryAllocateFlagsInfo                                 = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO,
     eMemoryAllocateFlagsInfoKHR                              = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR,
+    eDeviceGroupRenderPassBeginInfo                          = VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO,
+    eDeviceGroupRenderPassBeginInfoKHR                       = VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHR,
     eDeviceGroupCommandBufferBeginInfo                       = VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO,
     eDeviceGroupCommandBufferBeginInfoKHR                    = VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHR,
     eDeviceGroupSubmitInfo                                   = VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO,
@@ -402,12 +392,42 @@ namespace VULKAN_HPP_NAMESPACE
     eSparseImageFormatProperties2KHR                         = VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR,
     ePhysicalDeviceSparseImageFormatInfo2                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2,
     ePhysicalDeviceSparseImageFormatInfo2KHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR,
+    ePhysicalDevicePointClippingProperties                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES,
+    ePhysicalDevicePointClippingPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR,
+    eRenderPassInputAttachmentAspectCreateInfo               = VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO,
+    eRenderPassInputAttachmentAspectCreateInfoKHR            = VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR,
     eImageViewUsageCreateInfo                                = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO,
     eImageViewUsageCreateInfoKHR                             = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR,
+    ePipelineTessellationDomainOriginStateCreateInfo         = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO,
+    ePipelineTessellationDomainOriginStateCreateInfoKHR      = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR,
+    eRenderPassMultiviewCreateInfo                           = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
+    eRenderPassMultiviewCreateInfoKHR                        = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,
+    ePhysicalDeviceMultiviewFeatures                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
+    ePhysicalDeviceMultiviewFeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR,
+    ePhysicalDeviceMultiviewProperties                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,
+    ePhysicalDeviceMultiviewPropertiesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR,
+    ePhysicalDeviceVariablePointersFeatures                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES,
+    ePhysicalDeviceVariablePointersFeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR,
+    ePhysicalDeviceVariablePointerFeatures                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES,
+    ePhysicalDeviceVariablePointerFeaturesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR,
     eProtectedSubmitInfo                                     = VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO,
     ePhysicalDeviceProtectedMemoryFeatures                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES,
     ePhysicalDeviceProtectedMemoryProperties                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES,
     eDeviceQueueInfo2                                        = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2,
+    eSamplerYcbcrConversionCreateInfo                        = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
+    eSamplerYcbcrConversionCreateInfoKHR                     = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR,
+    eSamplerYcbcrConversionInfo                              = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
+    eSamplerYcbcrConversionInfoKHR                           = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR,
+    eBindImagePlaneMemoryInfo                                = VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO,
+    eBindImagePlaneMemoryInfoKHR                             = VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO_KHR,
+    eImagePlaneMemoryRequirementsInfo                        = VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO,
+    eImagePlaneMemoryRequirementsInfoKHR                     = VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR,
+    ePhysicalDeviceSamplerYcbcrConversionFeatures            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES,
+    ePhysicalDeviceSamplerYcbcrConversionFeaturesKHR         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
+    eSamplerYcbcrConversionImageFormatProperties             = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES,
+    eSamplerYcbcrConversionImageFormatPropertiesKHR          = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR,
+    eDescriptorUpdateTemplateCreateInfo                      = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO,
+    eDescriptorUpdateTemplateCreateInfoKHR                   = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR,
     ePhysicalDeviceExternalImageFormatInfo                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
     ePhysicalDeviceExternalImageFormatInfoKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR,
     eExternalImageFormatProperties                           = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
@@ -436,45 +456,10 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceExternalSemaphoreInfoKHR                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR,
     eExternalSemaphoreProperties                             = VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES,
     eExternalSemaphorePropertiesKHR                          = VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHR,
-    ePhysicalDeviceSubgroupProperties                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES,
-    ePhysicalDevice16BitStorageFeatures                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES,
-    ePhysicalDevice16BitStorageFeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR,
-    ePhysicalDeviceVariablePointersFeatures                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES,
-    ePhysicalDeviceVariablePointerFeatures                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES,
-    ePhysicalDeviceVariablePointersFeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR,
-    ePhysicalDeviceVariablePointerFeaturesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR,
-    eDescriptorUpdateTemplateCreateInfo                      = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO,
-    eDescriptorUpdateTemplateCreateInfoKHR                   = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR,
     ePhysicalDeviceMaintenance3Properties                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES,
     ePhysicalDeviceMaintenance3PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR,
     eDescriptorSetLayoutSupport                              = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT,
     eDescriptorSetLayoutSupportKHR                           = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR,
-    eSamplerYcbcrConversionCreateInfo                        = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
-    eSamplerYcbcrConversionCreateInfoKHR                     = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR,
-    eSamplerYcbcrConversionInfo                              = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
-    eSamplerYcbcrConversionInfoKHR                           = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR,
-    eBindImagePlaneMemoryInfo                                = VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO,
-    eBindImagePlaneMemoryInfoKHR                             = VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO_KHR,
-    eImagePlaneMemoryRequirementsInfo                        = VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO,
-    eImagePlaneMemoryRequirementsInfoKHR                     = VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR,
-    ePhysicalDeviceSamplerYcbcrConversionFeatures            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES,
-    ePhysicalDeviceSamplerYcbcrConversionFeaturesKHR         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
-    eSamplerYcbcrConversionImageFormatProperties             = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES,
-    eSamplerYcbcrConversionImageFormatPropertiesKHR          = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR,
-    eDeviceGroupRenderPassBeginInfo                          = VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO,
-    eDeviceGroupRenderPassBeginInfoKHR                       = VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHR,
-    ePhysicalDevicePointClippingProperties                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES,
-    ePhysicalDevicePointClippingPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR,
-    eRenderPassInputAttachmentAspectCreateInfo               = VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO,
-    eRenderPassInputAttachmentAspectCreateInfoKHR            = VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR,
-    ePipelineTessellationDomainOriginStateCreateInfo         = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO,
-    ePipelineTessellationDomainOriginStateCreateInfoKHR      = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR,
-    eRenderPassMultiviewCreateInfo                           = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,
-    eRenderPassMultiviewCreateInfoKHR                        = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,
-    ePhysicalDeviceMultiviewFeatures                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES,
-    ePhysicalDeviceMultiviewFeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR,
-    ePhysicalDeviceMultiviewProperties                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,
-    ePhysicalDeviceMultiviewPropertiesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR,
     ePhysicalDeviceShaderDrawParametersFeatures              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES,
     ePhysicalDeviceShaderDrawParameterFeatures               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES,
     ePhysicalDeviceVulkan11Features                          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES,
@@ -483,10 +468,73 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceVulkan12Properties                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES,
     eImageFormatListCreateInfo                               = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO,
     eImageFormatListCreateInfoKHR                            = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR,
+    eAttachmentDescription2                                  = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2,
+    eAttachmentDescription2KHR                               = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2_KHR,
+    eAttachmentReference2                                    = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2,
+    eAttachmentReference2KHR                                 = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR,
+    eSubpassDescription2                                     = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2,
+    eSubpassDescription2KHR                                  = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR,
+    eSubpassDependency2                                      = VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2,
+    eSubpassDependency2KHR                                   = VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR,
+    eRenderPassCreateInfo2                                   = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2,
+    eRenderPassCreateInfo2KHR                                = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR,
+    eSubpassBeginInfo                                        = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO,
+    eSubpassBeginInfoKHR                                     = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR,
+    eSubpassEndInfo                                          = VK_STRUCTURE_TYPE_SUBPASS_END_INFO,
+    eSubpassEndInfoKHR                                       = VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR,
+    ePhysicalDevice8BitStorageFeatures                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES,
+    ePhysicalDevice8BitStorageFeaturesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR,
     ePhysicalDeviceDriverProperties                          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES,
     ePhysicalDeviceDriverPropertiesKHR                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR,
+    ePhysicalDeviceShaderAtomicInt64Features                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES,
+    ePhysicalDeviceShaderAtomicInt64FeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR,
+    ePhysicalDeviceShaderFloat16Int8Features                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
+    ePhysicalDeviceFloat16Int8FeaturesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR,
+    ePhysicalDeviceShaderFloat16Int8FeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR,
+    ePhysicalDeviceFloatControlsProperties                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES,
+    ePhysicalDeviceFloatControlsPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR,
+    eDescriptorSetLayoutBindingFlagsCreateInfo               = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
+    eDescriptorSetLayoutBindingFlagsCreateInfoEXT            = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT,
+    ePhysicalDeviceDescriptorIndexingFeatures                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES,
+    ePhysicalDeviceDescriptorIndexingFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT,
+    ePhysicalDeviceDescriptorIndexingProperties              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES,
+    ePhysicalDeviceDescriptorIndexingPropertiesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT,
+    eDescriptorSetVariableDescriptorCountAllocateInfo        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO,
+    eDescriptorSetVariableDescriptorCountAllocateInfoEXT     = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT,
+    eDescriptorSetVariableDescriptorCountLayoutSupport       = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT,
+    eDescriptorSetVariableDescriptorCountLayoutSupportEXT    = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT,
+    ePhysicalDeviceDepthStencilResolveProperties             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES,
+    ePhysicalDeviceDepthStencilResolvePropertiesKHR          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR,
+    eSubpassDescriptionDepthStencilResolve                   = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE,
+    eSubpassDescriptionDepthStencilResolveKHR                = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR,
+    ePhysicalDeviceScalarBlockLayoutFeatures                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES,
+    ePhysicalDeviceScalarBlockLayoutFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT,
+    eImageStencilUsageCreateInfo                             = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO,
+    eImageStencilUsageCreateInfoEXT                          = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT,
+    ePhysicalDeviceSamplerFilterMinmaxProperties             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES,
+    ePhysicalDeviceSamplerFilterMinmaxPropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT,
+    eSamplerReductionModeCreateInfo                          = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO,
+    eSamplerReductionModeCreateInfoEXT                       = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT,
     ePhysicalDeviceVulkanMemoryModelFeatures                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES,
     ePhysicalDeviceVulkanMemoryModelFeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR,
+    ePhysicalDeviceImagelessFramebufferFeatures              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES,
+    ePhysicalDeviceImagelessFramebufferFeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR,
+    eFramebufferAttachmentsCreateInfo                        = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO,
+    eFramebufferAttachmentsCreateInfoKHR                     = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR,
+    eFramebufferAttachmentImageInfo                          = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
+    eFramebufferAttachmentImageInfoKHR                       = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR,
+    eRenderPassAttachmentBeginInfo                           = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO,
+    eRenderPassAttachmentBeginInfoKHR                        = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR,
+    ePhysicalDeviceUniformBufferStandardLayoutFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES,
+    ePhysicalDeviceUniformBufferStandardLayoutFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR,
+    ePhysicalDeviceShaderSubgroupExtendedTypesFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES,
+    ePhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR,
+    ePhysicalDeviceSeparateDepthStencilLayoutsFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES,
+    ePhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR,
+    eAttachmentReferenceStencilLayout                        = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT,
+    eAttachmentReferenceStencilLayoutKHR                     = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR,
+    eAttachmentDescriptionStencilLayout                      = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT,
+    eAttachmentDescriptionStencilLayoutKHR                   = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR,
     ePhysicalDeviceHostQueryResetFeatures                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES,
     ePhysicalDeviceHostQueryResetFeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT,
     ePhysicalDeviceTimelineSemaphoreFeatures                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES,
@@ -512,79 +560,24 @@ namespace VULKAN_HPP_NAMESPACE
     eMemoryOpaqueCaptureAddressAllocateInfoKHR               = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR,
     eDeviceMemoryOpaqueCaptureAddressInfo                    = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO,
     eDeviceMemoryOpaqueCaptureAddressInfoKHR                 = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR,
-    ePhysicalDevice8BitStorageFeatures                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES,
-    ePhysicalDevice8BitStorageFeaturesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR,
-    ePhysicalDeviceShaderAtomicInt64Features                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES,
-    ePhysicalDeviceShaderAtomicInt64FeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR,
-    ePhysicalDeviceShaderFloat16Int8Features                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
-    ePhysicalDeviceShaderFloat16Int8FeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR,
-    ePhysicalDeviceFloat16Int8FeaturesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR,
-    ePhysicalDeviceFloatControlsProperties                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES,
-    ePhysicalDeviceFloatControlsPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR,
-    eDescriptorSetLayoutBindingFlagsCreateInfo               = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
-    eDescriptorSetLayoutBindingFlagsCreateInfoEXT            = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT,
-    ePhysicalDeviceDescriptorIndexingFeatures                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES,
-    ePhysicalDeviceDescriptorIndexingFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT,
-    ePhysicalDeviceDescriptorIndexingProperties              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES,
-    ePhysicalDeviceDescriptorIndexingPropertiesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT,
-    eDescriptorSetVariableDescriptorCountAllocateInfo        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO,
-    eDescriptorSetVariableDescriptorCountAllocateInfoEXT     = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT,
-    eDescriptorSetVariableDescriptorCountLayoutSupport       = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT,
-    eDescriptorSetVariableDescriptorCountLayoutSupportEXT    = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT,
-    ePhysicalDeviceScalarBlockLayoutFeatures                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES,
-    ePhysicalDeviceScalarBlockLayoutFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT,
-    ePhysicalDeviceSamplerFilterMinmaxProperties             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES,
-    ePhysicalDeviceSamplerFilterMinmaxPropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT,
-    eSamplerReductionModeCreateInfo                          = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO,
-    eSamplerReductionModeCreateInfoEXT                       = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT,
-    ePhysicalDeviceUniformBufferStandardLayoutFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES,
-    ePhysicalDeviceUniformBufferStandardLayoutFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR,
-    ePhysicalDeviceShaderSubgroupExtendedTypesFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES,
-    ePhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR,
-    eAttachmentDescription2                                  = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2,
-    eAttachmentDescription2KHR                               = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2_KHR,
-    eAttachmentReference2                                    = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2,
-    eAttachmentReference2KHR                                 = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR,
-    eSubpassDescription2                                     = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2,
-    eSubpassDescription2KHR                                  = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR,
-    eSubpassDependency2                                      = VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2,
-    eSubpassDependency2KHR                                   = VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR,
-    eRenderPassCreateInfo2                                   = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2,
-    eRenderPassCreateInfo2KHR                                = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR,
-    eSubpassBeginInfo                                        = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO,
-    eSubpassBeginInfoKHR                                     = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR,
-    eSubpassEndInfo                                          = VK_STRUCTURE_TYPE_SUBPASS_END_INFO,
-    eSubpassEndInfoKHR                                       = VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR,
-    ePhysicalDeviceDepthStencilResolveProperties             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES,
-    ePhysicalDeviceDepthStencilResolvePropertiesKHR          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR,
-    eSubpassDescriptionDepthStencilResolve                   = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE,
-    eSubpassDescriptionDepthStencilResolveKHR                = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR,
-    eImageStencilUsageCreateInfo                             = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO,
-    eImageStencilUsageCreateInfoEXT                          = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT,
-    ePhysicalDeviceImagelessFramebufferFeatures              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES,
-    ePhysicalDeviceImagelessFramebufferFeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR,
-    eFramebufferAttachmentsCreateInfo                        = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO,
-    eFramebufferAttachmentsCreateInfoKHR                     = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR,
-    eFramebufferAttachmentImageInfo                          = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
-    eFramebufferAttachmentImageInfoKHR                       = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR,
-    eRenderPassAttachmentBeginInfo                           = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO,
-    eRenderPassAttachmentBeginInfoKHR                        = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR,
-    ePhysicalDeviceSeparateDepthStencilLayoutsFeatures       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES,
-    ePhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR,
-    eAttachmentReferenceStencilLayout                        = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT,
-    eAttachmentReferenceStencilLayoutKHR                     = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR,
-    eAttachmentDescriptionStencilLayout                      = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT,
-    eAttachmentDescriptionStencilLayoutKHR                   = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR,
     ePhysicalDeviceVulkan13Features                          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES,
     ePhysicalDeviceVulkan13Properties                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES,
+    ePipelineCreationFeedbackCreateInfo                      = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO,
+    ePipelineCreationFeedbackCreateInfoEXT                   = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT,
+    ePhysicalDeviceShaderTerminateInvocationFeatures         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES,
+    ePhysicalDeviceShaderTerminateInvocationFeaturesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR,
     ePhysicalDeviceToolProperties                            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES,
     ePhysicalDeviceToolPropertiesEXT                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT,
+    ePhysicalDeviceShaderDemoteToHelperInvocationFeatures    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES,
+    ePhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT,
     ePhysicalDevicePrivateDataFeatures                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES,
     ePhysicalDevicePrivateDataFeaturesEXT                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT,
     eDevicePrivateDataCreateInfo                             = VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO,
     eDevicePrivateDataCreateInfoEXT                          = VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT,
     ePrivateDataSlotCreateInfo                               = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO,
     ePrivateDataSlotCreateInfoEXT                            = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT,
+    ePhysicalDevicePipelineCreationCacheControlFeatures      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES,
+    ePhysicalDevicePipelineCreationCacheControlFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT,
     eMemoryBarrier2                                          = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2,
     eMemoryBarrier2KHR                                       = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR,
     eBufferMemoryBarrier2                                    = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2,
@@ -601,6 +594,10 @@ namespace VULKAN_HPP_NAMESPACE
     eCommandBufferSubmitInfoKHR                              = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR,
     ePhysicalDeviceSynchronization2Features                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES,
     ePhysicalDeviceSynchronization2FeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR,
+    ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES,
+    ePhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR,
+    ePhysicalDeviceImageRobustnessFeatures                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES,
+    ePhysicalDeviceImageRobustnessFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT,
     eCopyBufferInfo2                                         = VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2,
     eCopyBufferInfo2KHR                                      = VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR,
     eCopyImageInfo2                                          = VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2,
@@ -609,36 +606,20 @@ namespace VULKAN_HPP_NAMESPACE
     eCopyBufferToImageInfo2KHR                               = VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR,
     eCopyImageToBufferInfo2                                  = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2,
     eCopyImageToBufferInfo2KHR                               = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR,
+    eBlitImageInfo2                                          = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2,
+    eBlitImageInfo2KHR                                       = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR,
+    eResolveImageInfo2                                       = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2,
+    eResolveImageInfo2KHR                                    = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR,
     eBufferCopy2                                             = VK_STRUCTURE_TYPE_BUFFER_COPY_2,
     eBufferCopy2KHR                                          = VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR,
     eImageCopy2                                              = VK_STRUCTURE_TYPE_IMAGE_COPY_2,
     eImageCopy2KHR                                           = VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR,
+    eImageBlit2                                              = VK_STRUCTURE_TYPE_IMAGE_BLIT_2,
+    eImageBlit2KHR                                           = VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR,
     eBufferImageCopy2                                        = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2,
     eBufferImageCopy2KHR                                     = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR,
-    ePhysicalDeviceTextureCompressionAstcHdrFeatures         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES,
-    ePhysicalDeviceTextureCompressionAstcHdrFeaturesEXT      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT,
-    eFormatProperties3                                       = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3,
-    eFormatProperties3KHR                                    = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR,
-    ePhysicalDeviceMaintenance4Features                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES,
-    ePhysicalDeviceMaintenance4FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR,
-    ePhysicalDeviceMaintenance4Properties                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES,
-    ePhysicalDeviceMaintenance4PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR,
-    eDeviceBufferMemoryRequirements                          = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS,
-    eDeviceBufferMemoryRequirementsKHR                       = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR,
-    eDeviceImageMemoryRequirements                           = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS,
-    eDeviceImageMemoryRequirementsKHR                        = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR,
-    ePipelineCreationFeedbackCreateInfo                      = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO,
-    ePipelineCreationFeedbackCreateInfoEXT                   = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT,
-    ePhysicalDeviceShaderTerminateInvocationFeatures         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES,
-    ePhysicalDeviceShaderTerminateInvocationFeaturesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR,
-    ePhysicalDeviceShaderDemoteToHelperInvocationFeatures    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES,
-    ePhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT,
-    ePhysicalDevicePipelineCreationCacheControlFeatures      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES,
-    ePhysicalDevicePipelineCreationCacheControlFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT,
-    ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES,
-    ePhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR,
-    ePhysicalDeviceImageRobustnessFeatures                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES,
-    ePhysicalDeviceImageRobustnessFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT,
+    eImageResolve2                                           = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2,
+    eImageResolve2KHR                                        = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR,
     ePhysicalDeviceSubgroupSizeControlProperties             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES,
     ePhysicalDeviceSubgroupSizeControlPropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT,
     ePipelineShaderStageRequiredSubgroupSizeCreateInfo       = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO,
@@ -654,20 +635,8 @@ namespace VULKAN_HPP_NAMESPACE
     eWriteDescriptorSetInlineUniformBlockEXT                 = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT,
     eDescriptorPoolInlineUniformBlockCreateInfo              = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO,
     eDescriptorPoolInlineUniformBlockCreateInfoEXT           = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT,
-    ePhysicalDeviceShaderIntegerDotProductFeatures           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES,
-    ePhysicalDeviceShaderIntegerDotProductFeaturesKHR        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR,
-    ePhysicalDeviceShaderIntegerDotProductProperties         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES,
-    ePhysicalDeviceShaderIntegerDotProductPropertiesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR,
-    ePhysicalDeviceTexelBufferAlignmentProperties            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES,
-    ePhysicalDeviceTexelBufferAlignmentPropertiesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT,
-    eBlitImageInfo2                                          = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2,
-    eBlitImageInfo2KHR                                       = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR,
-    eResolveImageInfo2                                       = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2,
-    eResolveImageInfo2KHR                                    = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR,
-    eImageBlit2                                              = VK_STRUCTURE_TYPE_IMAGE_BLIT_2,
-    eImageBlit2KHR                                           = VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR,
-    eImageResolve2                                           = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2,
-    eImageResolve2KHR                                        = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR,
+    ePhysicalDeviceTextureCompressionAstcHdrFeatures         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES,
+    ePhysicalDeviceTextureCompressionAstcHdrFeaturesEXT      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT,
     eRenderingInfo                                           = VK_STRUCTURE_TYPE_RENDERING_INFO,
     eRenderingInfoKHR                                        = VK_STRUCTURE_TYPE_RENDERING_INFO_KHR,
     eRenderingAttachmentInfo                                 = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO,
@@ -678,115 +647,22 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceDynamicRenderingFeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR,
     eCommandBufferInheritanceRenderingInfo                   = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO,
     eCommandBufferInheritanceRenderingInfoKHR                = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR,
-    ePhysicalDeviceVulkan14Features                          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES,
-    ePhysicalDeviceVulkan14Properties                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES,
-    eDeviceQueueGlobalPriorityCreateInfo                     = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO,
-    eDeviceQueueGlobalPriorityCreateInfoEXT                  = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT,
-    eDeviceQueueGlobalPriorityCreateInfoKHR                  = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR,
-    ePhysicalDeviceGlobalPriorityQueryFeatures               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES,
-    ePhysicalDeviceGlobalPriorityQueryFeaturesKHR            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR,
-    ePhysicalDeviceGlobalPriorityQueryFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT,
-    eQueueFamilyGlobalPriorityProperties                     = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,
-    eQueueFamilyGlobalPriorityPropertiesKHR                  = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR,
-    eQueueFamilyGlobalPriorityPropertiesEXT                  = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT,
-    ePhysicalDeviceIndexTypeUint8Features                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES,
-    ePhysicalDeviceIndexTypeUint8FeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT,
-    ePhysicalDeviceIndexTypeUint8FeaturesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR,
-    eMemoryMapInfo                                           = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO,
-    eMemoryMapInfoKHR                                        = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR,
-    eMemoryUnmapInfo                                         = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO,
-    eMemoryUnmapInfoKHR                                      = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR,
-    ePhysicalDeviceMaintenance5Features                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES,
-    ePhysicalDeviceMaintenance5FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR,
-    ePhysicalDeviceMaintenance5Properties                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES,
-    ePhysicalDeviceMaintenance5PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR,
-    eDeviceImageSubresourceInfo                              = VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO,
-    eDeviceImageSubresourceInfoKHR                           = VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR,
-    eSubresourceLayout2                                      = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2,
-    eSubresourceLayout2EXT                                   = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT,
-    eSubresourceLayout2KHR                                   = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR,
-    eImageSubresource2                                       = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2,
-    eImageSubresource2EXT                                    = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT,
-    eImageSubresource2KHR                                    = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR,
-    eBufferUsageFlags2CreateInfo                             = VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO,
-    eBufferUsageFlags2CreateInfoKHR                          = VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR,
-    ePhysicalDeviceMaintenance6Features                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES,
-    ePhysicalDeviceMaintenance6FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR,
-    ePhysicalDeviceMaintenance6Properties                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES,
-    ePhysicalDeviceMaintenance6PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR,
-    eBindMemoryStatus                                        = VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS,
-    eBindMemoryStatusKHR                                     = VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR,
-    ePhysicalDeviceHostImageCopyFeatures                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES,
-    ePhysicalDeviceHostImageCopyFeaturesEXT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT,
-    ePhysicalDeviceHostImageCopyProperties                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES,
-    ePhysicalDeviceHostImageCopyPropertiesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT,
-    eMemoryToImageCopy                                       = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY,
-    eMemoryToImageCopyEXT                                    = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT,
-    eImageToMemoryCopy                                       = VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY,
-    eImageToMemoryCopyEXT                                    = VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT,
-    eCopyImageToMemoryInfo                                   = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO,
-    eCopyImageToMemoryInfoEXT                                = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT,
-    eCopyMemoryToImageInfo                                   = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO,
-    eCopyMemoryToImageInfoEXT                                = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT,
-    eHostImageLayoutTransitionInfo                           = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO,
-    eHostImageLayoutTransitionInfoEXT                        = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT,
-    eCopyImageToImageInfo                                    = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO,
-    eCopyImageToImageInfoEXT                                 = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT,
-    eSubresourceHostMemcpySize                               = VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE,
-    eSubresourceHostMemcpySizeEXT                            = VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT,
-    eHostImageCopyDevicePerformanceQuery                     = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY,
-    eHostImageCopyDevicePerformanceQueryEXT                  = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT,
-    ePhysicalDeviceShaderSubgroupRotateFeatures              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES,
-    ePhysicalDeviceShaderSubgroupRotateFeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR,
-    ePhysicalDeviceShaderFloatControls2Features              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES,
-    ePhysicalDeviceShaderFloatControls2FeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR,
-    ePhysicalDeviceShaderExpectAssumeFeatures                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES,
-    ePhysicalDeviceShaderExpectAssumeFeaturesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR,
-    ePipelineCreateFlags2CreateInfo                          = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO,
-    ePipelineCreateFlags2CreateInfoKHR                       = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR,
-    ePhysicalDevicePushDescriptorProperties                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES,
-    ePhysicalDevicePushDescriptorPropertiesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR,
-    eBindDescriptorSetsInfo                                  = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO,
-    eBindDescriptorSetsInfoKHR                               = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR,
-    ePushConstantsInfo                                       = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
-    ePushConstantsInfoKHR                                    = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
-    ePushDescriptorSetInfo                                   = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO,
-    ePushDescriptorSetInfoKHR                                = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR,
-    ePushDescriptorSetWithTemplateInfo                       = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO,
-    ePushDescriptorSetWithTemplateInfoKHR                    = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR,
-    ePhysicalDevicePipelineProtectedAccessFeatures           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES,
-    ePhysicalDevicePipelineProtectedAccessFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT,
-    ePipelineRobustnessCreateInfo                            = VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO,
-    ePipelineRobustnessCreateInfoEXT                         = VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT,
-    ePhysicalDevicePipelineRobustnessFeatures                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES,
-    ePhysicalDevicePipelineRobustnessFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT,
-    ePhysicalDevicePipelineRobustnessProperties              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES,
-    ePhysicalDevicePipelineRobustnessPropertiesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT,
-    ePhysicalDeviceLineRasterizationFeatures                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES,
-    ePhysicalDeviceLineRasterizationFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT,
-    ePhysicalDeviceLineRasterizationFeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR,
-    ePipelineRasterizationLineStateCreateInfo                = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO,
-    ePipelineRasterizationLineStateCreateInfoEXT             = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT,
-    ePipelineRasterizationLineStateCreateInfoKHR             = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR,
-    ePhysicalDeviceLineRasterizationProperties               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES,
-    ePhysicalDeviceLineRasterizationPropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT,
-    ePhysicalDeviceLineRasterizationPropertiesKHR            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR,
-    ePhysicalDeviceVertexAttributeDivisorProperties          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES,
-    ePhysicalDeviceVertexAttributeDivisorPropertiesKHR       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR,
-    ePipelineVertexInputDivisorStateCreateInfo               = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO,
-    ePipelineVertexInputDivisorStateCreateInfoEXT            = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT,
-    ePipelineVertexInputDivisorStateCreateInfoKHR            = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR,
-    ePhysicalDeviceVertexAttributeDivisorFeatures            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES,
-    ePhysicalDeviceVertexAttributeDivisorFeaturesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT,
-    ePhysicalDeviceVertexAttributeDivisorFeaturesKHR         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR,
-    eRenderingAreaInfo                                       = VK_STRUCTURE_TYPE_RENDERING_AREA_INFO,
-    eRenderingAreaInfoKHR                                    = VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR,
-    ePhysicalDeviceDynamicRenderingLocalReadFeatures         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES,
-    ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR,
-    eRenderingAttachmentLocationInfo                         = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO,
-    eRenderingAttachmentLocationInfoKHR                      = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR,
-    eRenderingInputAttachmentIndexInfo                       = VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO,
-    eRenderingInputAttachmentIndexInfoKHR                    = VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR,
+    ePhysicalDeviceShaderIntegerDotProductFeatures           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES,
+    ePhysicalDeviceShaderIntegerDotProductFeaturesKHR        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR,
+    ePhysicalDeviceShaderIntegerDotProductProperties         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES,
+    ePhysicalDeviceShaderIntegerDotProductPropertiesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR,
+    ePhysicalDeviceTexelBufferAlignmentProperties            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES,
+    ePhysicalDeviceTexelBufferAlignmentPropertiesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT,
+    eFormatProperties3                                       = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3,
+    eFormatProperties3KHR                                    = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR,
+    ePhysicalDeviceMaintenance4Features                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES,
+    ePhysicalDeviceMaintenance4FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR,
+    ePhysicalDeviceMaintenance4Properties                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES,
+    ePhysicalDeviceMaintenance4PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR,
+    eDeviceBufferMemoryRequirements                          = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS,
+    eDeviceBufferMemoryRequirementsKHR                       = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR,
+    eDeviceImageMemoryRequirements                           = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS,
+    eDeviceImageMemoryRequirementsKHR                        = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR,
     eSwapchainCreateInfoKHR                                  = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR,
     ePresentInfoKHR                                          = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
     eDeviceGroupPresentCapabilitiesKHR                       = VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR,
@@ -848,7 +724,6 @@ namespace VULKAN_HPP_NAMESPACE
     eCuModuleCreateInfoNVX                           = VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX,
     eCuFunctionCreateInfoNVX                         = VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX,
     eCuLaunchInfoNVX                                 = VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX,
-    eCuModuleTexturingModeCreateInfoNVX              = VK_STRUCTURE_TYPE_CU_MODULE_TEXTURING_MODE_CREATE_INFO_NVX,
     eImageViewHandleInfoNVX                          = VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX,
     eImageViewAddressPropertiesNVX                   = VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX,
     eVideoEncodeH264CapabilitiesKHR                  = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR,
@@ -886,6 +761,11 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoDecodeH264SessionParametersAddInfoKHR      = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR,
     eVideoDecodeH264DpbSlotInfoKHR                   = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR,
     eTextureLodGatherFormatPropertiesAMD             = VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD,
+    eRenderingFragmentShadingRateAttachmentInfoKHR   = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR,
+    eRenderingFragmentDensityMapAttachmentInfoEXT    = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT,
+    eAttachmentSampleCountInfoAMD                    = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD,
+    eAttachmentSampleCountInfoNV                     = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV,
+    eMultiviewPerViewAttributesInfoNVX               = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX,
 #if defined( VK_USE_PLATFORM_GGP )
     eStreamDescriptorSurfaceCreateInfoGGP = VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP,
 #endif /*VK_USE_PLATFORM_GGP*/
@@ -901,8 +781,11 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_VI_NN )
     eViSurfaceCreateInfoNN = VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN,
 #endif /*VK_USE_PLATFORM_VI_NN*/
-    eImageViewAstcDecodeModeEXT          = VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT,
-    ePhysicalDeviceAstcDecodeFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT,
+    eImageViewAstcDecodeModeEXT                    = VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT,
+    ePhysicalDeviceAstcDecodeFeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT,
+    ePipelineRobustnessCreateInfoEXT               = VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT,
+    ePhysicalDevicePipelineRobustnessFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT,
+    ePhysicalDevicePipelineRobustnessPropertiesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT,
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     eImportMemoryWin32HandleInfoKHR = VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR,
     eExportMemoryWin32HandleInfoKHR = VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR,
@@ -921,6 +804,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
     eImportSemaphoreFdInfoKHR                              = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
     eSemaphoreGetFdInfoKHR                                 = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR,
+    ePhysicalDevicePushDescriptorPropertiesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR,
     eCommandBufferInheritanceConditionalRenderingInfoEXT   = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT,
     ePhysicalDeviceConditionalRenderingFeaturesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT,
     eConditionalRenderingBeginInfoEXT                      = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT,
@@ -933,7 +817,6 @@ namespace VULKAN_HPP_NAMESPACE
     eSwapchainCounterCreateInfoEXT                         = VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT,
     ePresentTimesInfoGOOGLE                                = VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE,
     ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX,
-    eMultiviewPerViewAttributesInfoNVX                     = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX,
     ePipelineViewportSwizzleStateCreateInfoNV              = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV,
     ePhysicalDeviceDiscardRectanglePropertiesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT,
     ePipelineDiscardRectangleStateCreateInfoEXT            = VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT,
@@ -993,9 +876,6 @@ namespace VULKAN_HPP_NAMESPACE
     eExecutionGraphPipelineCreateInfoAMDX      = VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX,
     ePipelineShaderStageNodeCreateInfoAMDX     = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX,
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eAttachmentSampleCountInfoAMD                      = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD,
-    eAttachmentSampleCountInfoNV                       = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV,
-    ePhysicalDeviceShaderBfloat16FeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR,
     eSampleLocationsInfoEXT                            = VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT,
     eRenderPassSampleLocationsBeginInfoEXT             = VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT,
     ePipelineSampleLocationsStateCreateInfoEXT         = VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT,
@@ -1072,11 +952,18 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoDecodeH265ProfileInfoKHR                       = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR,
     eVideoDecodeH265PictureInfoKHR                       = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR,
     eVideoDecodeH265DpbSlotInfoKHR                       = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR,
+    eDeviceQueueGlobalPriorityCreateInfoKHR              = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR,
+    eDeviceQueueGlobalPriorityCreateInfoEXT              = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT,
+    ePhysicalDeviceGlobalPriorityQueryFeaturesKHR        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR,
+    ePhysicalDeviceGlobalPriorityQueryFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT,
+    eQueueFamilyGlobalPriorityPropertiesKHR              = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR,
+    eQueueFamilyGlobalPriorityPropertiesEXT              = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT,
     eDeviceMemoryOverallocationCreateInfoAMD             = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD,
     ePhysicalDeviceVertexAttributeDivisorPropertiesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT,
 #if defined( VK_USE_PLATFORM_GGP )
     ePresentFrameTokenGGP = VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP,
 #endif /*VK_USE_PLATFORM_GGP*/
+    ePhysicalDeviceComputeShaderDerivativesFeaturesNV   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV,
     ePhysicalDeviceMeshShaderFeaturesNV                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV,
     ePhysicalDeviceMeshShaderPropertiesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV,
     ePhysicalDeviceShaderImageFootprintFeaturesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV,
@@ -1084,18 +971,6 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceExclusiveScissorFeaturesNV           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV,
     eCheckpointDataNV                                   = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV,
     eQueueFamilyCheckpointPropertiesNV                  = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV,
-    eQueueFamilyCheckpointProperties2NV                 = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV,
-    eCheckpointData2NV                                  = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV,
-    ePhysicalDevicePresentTimingFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT,
-    eSwapchainTimingPropertiesEXT                       = VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT,
-    eSwapchainTimeDomainPropertiesEXT                   = VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT,
-    ePresentTimingsInfoEXT                              = VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT,
-    ePresentTimingInfoEXT                               = VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT,
-    ePastPresentationTimingInfoEXT                      = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT,
-    ePastPresentationTimingPropertiesEXT                = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT,
-    ePastPresentationTimingEXT                          = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT,
-    ePresentTimingSurfaceCapabilitiesEXT                = VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT,
-    eSwapchainCalibratedTimestampInfoEXT                = VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT,
     ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL,
     eQueryPoolPerformanceQueryCreateInfoINTEL           = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL,
     eQueryPoolCreateInfoINTEL                           = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL,
@@ -1116,15 +991,16 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceFragmentDensityMapFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT,
     ePhysicalDeviceFragmentDensityMapPropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT,
     eRenderPassFragmentDensityMapCreateInfoEXT                = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT,
-    eRenderingFragmentDensityMapAttachmentInfoEXT             = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT,
     eFragmentShadingRateAttachmentInfoKHR                     = VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR,
     ePipelineFragmentShadingRateStateCreateInfoKHR            = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR,
     ePhysicalDeviceFragmentShadingRatePropertiesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR,
     ePhysicalDeviceFragmentShadingRateFeaturesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR,
     ePhysicalDeviceFragmentShadingRateKHR                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR,
-    eRenderingFragmentShadingRateAttachmentInfoKHR            = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR,
     ePhysicalDeviceShaderCoreProperties2AMD                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD,
     ePhysicalDeviceCoherentMemoryFeaturesAMD                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD,
+    ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR,
+    eRenderingAttachmentLocationInfoKHR                       = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR,
+    eRenderingInputAttachmentIndexInfoKHR                     = VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR,
     ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT,
     ePhysicalDeviceShaderQuadControlFeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR,
     ePhysicalDeviceMemoryBudgetPropertiesEXT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT,
@@ -1163,10 +1039,31 @@ namespace VULKAN_HPP_NAMESPACE
     ePipelineExecutableInfoKHR                             = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR,
     ePipelineExecutableStatisticKHR                        = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR,
     ePipelineExecutableInternalRepresentationKHR           = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR,
+    ePhysicalDeviceHostImageCopyFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT,
+    ePhysicalDeviceHostImageCopyPropertiesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT,
+    eMemoryToImageCopyEXT                                  = VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT,
+    eImageToMemoryCopyEXT                                  = VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT,
+    eCopyImageToMemoryInfoEXT                              = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT,
+    eCopyMemoryToImageInfoEXT                              = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT,
+    eHostImageLayoutTransitionInfoEXT                      = VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT,
+    eCopyImageToImageInfoEXT                               = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT,
+    eSubresourceHostMemcpySizeEXT                          = VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT,
+    eHostImageCopyDevicePerformanceQueryEXT                = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT,
+    eMemoryMapInfoKHR                                      = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR,
+    eMemoryUnmapInfoKHR                                    = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR,
     ePhysicalDeviceMapMemoryPlacedFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT,
     ePhysicalDeviceMapMemoryPlacedPropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT,
     eMemoryMapPlacedInfoEXT                                = VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT,
     ePhysicalDeviceShaderAtomicFloat2FeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT,
+    eSurfacePresentModeEXT                                 = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT,
+    eSurfacePresentScalingCapabilitiesEXT                  = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT,
+    eSurfacePresentModeCompatibilityEXT                    = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT,
+    ePhysicalDeviceSwapchainMaintenance1FeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT,
+    eSwapchainPresentFenceInfoEXT                          = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT,
+    eSwapchainPresentModesCreateInfoEXT                    = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT,
+    eSwapchainPresentModeInfoEXT                           = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT,
+    eSwapchainPresentScalingCreateInfoEXT                  = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT,
+    eReleaseSwapchainImagesInfoEXT                         = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT,
     ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV,
     eGraphicsShaderGroupCreateInfoNV                       = VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV,
     eGraphicsPipelineShaderGroupsCreateInfoNV              = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV,
@@ -1186,6 +1083,8 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceDeviceMemoryReportFeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT,
     eDeviceDeviceMemoryReportCreateInfoEXT                 = VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT,
     eDeviceMemoryReportCallbackDataEXT                     = VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT,
+    ePhysicalDeviceRobustness2FeaturesEXT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT,
+    ePhysicalDeviceRobustness2PropertiesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT,
     eSamplerCustomBorderColorCreateInfoEXT                 = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT,
     ePhysicalDeviceCustomBorderColorPropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT,
     ePhysicalDeviceCustomBorderColorFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT,
@@ -1215,13 +1114,7 @@ namespace VULKAN_HPP_NAMESPACE
     ePhysicalDeviceCudaKernelLaunchFeaturesNV   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV,
     ePhysicalDeviceCudaKernelLaunchPropertiesNV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV,
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    ePhysicalDeviceTileShadingFeaturesQCOM   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM,
-    ePhysicalDeviceTileShadingPropertiesQCOM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM,
-    eRenderPassTileShadingCreateInfoQCOM     = VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM,
-    ePerTileBeginInfoQCOM                    = VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM,
-    ePerTileEndInfoQCOM                      = VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM,
-    eDispatchTileInfoQCOM                    = VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM,
-    eQueryLowLatencySupportNV                = VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV,
+    eQueryLowLatencySupportNV = VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV,
 #if defined( VK_USE_PLATFORM_METAL_EXT )
     eExportMetalObjectCreateInfoEXT = VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT,
     eExportMetalObjectsInfoEXT      = VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECTS_INFO_EXT,
@@ -1236,6 +1129,8 @@ namespace VULKAN_HPP_NAMESPACE
     eExportMetalSharedEventInfoEXT  = VK_STRUCTURE_TYPE_EXPORT_METAL_SHARED_EVENT_INFO_EXT,
     eImportMetalSharedEventInfoEXT  = VK_STRUCTURE_TYPE_IMPORT_METAL_SHARED_EVENT_INFO_EXT,
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
+    eQueueFamilyCheckpointProperties2NV                        = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV,
+    eCheckpointData2NV                                         = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV,
     ePhysicalDeviceDescriptorBufferPropertiesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT,
     ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT,
     ePhysicalDeviceDescriptorBufferFeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT,
@@ -1325,81 +1220,73 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     eScreenSurfaceCreateInfoQNX = VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX,
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-    ePhysicalDeviceColorWriteEnableFeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT,
-    ePipelineColorWriteCreateInfoEXT                     = VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT,
-    ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT,
-    ePhysicalDeviceRayTracingMaintenance1FeaturesKHR     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR,
-    ePhysicalDeviceShaderUntypedPointersFeaturesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR,
-    ePhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE,
-    eVideoEncodeRgbConversionCapabilitiesVALVE           = VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE,
-    eVideoEncodeProfileRgbConversionInfoVALVE            = VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE,
-    eVideoEncodeSessionRgbConversionCreateInfoVALVE      = VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE,
-    ePhysicalDeviceImageViewMinLodFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT,
-    eImageViewMinLodCreateInfoEXT                        = VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT,
-    ePhysicalDeviceMultiDrawFeaturesEXT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT,
-    ePhysicalDeviceMultiDrawPropertiesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT,
-    ePhysicalDeviceImage2DViewOf3DFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT,
-    ePhysicalDeviceShaderTileImageFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT,
-    ePhysicalDeviceShaderTileImagePropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT,
-    eMicromapBuildInfoEXT                                = VK_STRUCTURE_TYPE_MICROMAP_BUILD_INFO_EXT,
-    eMicromapVersionInfoEXT                              = VK_STRUCTURE_TYPE_MICROMAP_VERSION_INFO_EXT,
-    eCopyMicromapInfoEXT                                 = VK_STRUCTURE_TYPE_COPY_MICROMAP_INFO_EXT,
-    eCopyMicromapToMemoryInfoEXT                         = VK_STRUCTURE_TYPE_COPY_MICROMAP_TO_MEMORY_INFO_EXT,
-    eCopyMemoryToMicromapInfoEXT                         = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_MICROMAP_INFO_EXT,
-    ePhysicalDeviceOpacityMicromapFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_FEATURES_EXT,
-    ePhysicalDeviceOpacityMicromapPropertiesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT,
-    eMicromapCreateInfoEXT                               = VK_STRUCTURE_TYPE_MICROMAP_CREATE_INFO_EXT,
-    eMicromapBuildSizesInfoEXT                           = VK_STRUCTURE_TYPE_MICROMAP_BUILD_SIZES_INFO_EXT,
-    eAccelerationStructureTrianglesOpacityMicromapEXT    = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT,
+    ePhysicalDeviceColorWriteEnableFeaturesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT,
+    ePipelineColorWriteCreateInfoEXT                   = VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT,
+    ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT,
+    ePhysicalDeviceRayTracingMaintenance1FeaturesKHR   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR,
+    ePhysicalDeviceImageViewMinLodFeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT,
+    eImageViewMinLodCreateInfoEXT                      = VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT,
+    ePhysicalDeviceMultiDrawFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT,
+    ePhysicalDeviceMultiDrawPropertiesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT,
+    ePhysicalDeviceImage2DViewOf3DFeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT,
+    ePhysicalDeviceShaderTileImageFeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT,
+    ePhysicalDeviceShaderTileImagePropertiesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT,
+    eMicromapBuildInfoEXT                              = VK_STRUCTURE_TYPE_MICROMAP_BUILD_INFO_EXT,
+    eMicromapVersionInfoEXT                            = VK_STRUCTURE_TYPE_MICROMAP_VERSION_INFO_EXT,
+    eCopyMicromapInfoEXT                               = VK_STRUCTURE_TYPE_COPY_MICROMAP_INFO_EXT,
+    eCopyMicromapToMemoryInfoEXT                       = VK_STRUCTURE_TYPE_COPY_MICROMAP_TO_MEMORY_INFO_EXT,
+    eCopyMemoryToMicromapInfoEXT                       = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_MICROMAP_INFO_EXT,
+    ePhysicalDeviceOpacityMicromapFeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_FEATURES_EXT,
+    ePhysicalDeviceOpacityMicromapPropertiesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT,
+    eMicromapCreateInfoEXT                             = VK_STRUCTURE_TYPE_MICROMAP_CREATE_INFO_EXT,
+    eMicromapBuildSizesInfoEXT                         = VK_STRUCTURE_TYPE_MICROMAP_BUILD_SIZES_INFO_EXT,
+    eAccelerationStructureTrianglesOpacityMicromapEXT  = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT,
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     ePhysicalDeviceDisplacementMicromapFeaturesNV         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV,
     ePhysicalDeviceDisplacementMicromapPropertiesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV,
     eAccelerationStructureTrianglesDisplacementMicromapNV = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV,
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI,
-    ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI,
-    ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI,
-    ePhysicalDeviceBorderColorSwizzleFeaturesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT,
-    eSamplerBorderColorComponentMappingCreateInfoEXT           = VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT,
-    ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT,
-    ePhysicalDeviceShaderCorePropertiesARM                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM,
-    eDeviceQueueShaderCoreControlCreateInfoARM                 = VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM,
-    ePhysicalDeviceSchedulingControlsFeaturesARM               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM,
-    ePhysicalDeviceSchedulingControlsPropertiesARM             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM,
-    ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT,
-    eImageViewSlicedCreateInfoEXT                              = VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT,
-    ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE,
-    eDescriptorSetBindingReferenceVALVE                        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE,
-    eDescriptorSetLayoutHostMappingInfoVALVE                   = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE,
-    ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT,
-    ePhysicalDeviceRenderPassStripedFeaturesARM                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM,
-    ePhysicalDeviceRenderPassStripedPropertiesARM              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM,
-    eRenderPassStripeBeginInfoARM                              = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM,
-    eRenderPassStripeInfoARM                                   = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM,
-    eRenderPassStripeSubmitInfoARM                             = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM,
-    ePhysicalDeviceCopyMemoryIndirectFeaturesNV                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV,
-    ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV,
-    eComputePipelineIndirectBufferInfoNV                       = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV,
-    ePipelineIndirectDeviceAddressInfoNV                       = VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV,
-    ePhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_LINEAR_SWEPT_SPHERES_FEATURES_NV,
-    eAccelerationStructureGeometryLinearSweptSpheresDataNV     = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV,
-    eAccelerationStructureGeometrySpheresDataNV                = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV,
-    ePhysicalDeviceLinearColorAttachmentFeaturesNV             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV,
-    ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR,
-    ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT,
-    ePhysicalDeviceImageProcessingFeaturesQCOM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM,
-    ePhysicalDeviceImageProcessingPropertiesQCOM               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_PROPERTIES_QCOM,
-    eImageViewSampleWeightCreateInfoQCOM                       = VK_STRUCTURE_TYPE_IMAGE_VIEW_SAMPLE_WEIGHT_CREATE_INFO_QCOM,
-    ePhysicalDeviceNestedCommandBufferFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT,
-    ePhysicalDeviceNestedCommandBufferPropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT,
-#if defined( VK_USE_PLATFORM_OHOS )
-    eNativeBufferUsageOHOS            = VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS,
-    eNativeBufferPropertiesOHOS       = VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS,
-    eNativeBufferFormatPropertiesOHOS = VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS,
-    eImportNativeBufferInfoOHOS       = VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS,
-    eMemoryGetNativeBufferInfoOHOS    = VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS,
-    eExternalFormatOHOS               = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS,
-#endif /*VK_USE_PLATFORM_OHOS*/
+    ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI,
+    ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI,
+    ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI,
+    ePhysicalDeviceBorderColorSwizzleFeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT,
+    eSamplerBorderColorComponentMappingCreateInfoEXT             = VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT,
+    ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT,
+    ePhysicalDeviceShaderCorePropertiesARM                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM,
+    ePhysicalDeviceShaderSubgroupRotateFeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR,
+    eDeviceQueueShaderCoreControlCreateInfoARM                   = VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM,
+    ePhysicalDeviceSchedulingControlsFeaturesARM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM,
+    ePhysicalDeviceSchedulingControlsPropertiesARM               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM,
+    ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT,
+    eImageViewSlicedCreateInfoEXT                                = VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT,
+    ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE,
+    eDescriptorSetBindingReferenceVALVE                          = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE,
+    eDescriptorSetLayoutHostMappingInfoVALVE                     = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE,
+    ePhysicalDeviceDepthClampZeroOneFeaturesEXT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT,
+    ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT,
+    ePhysicalDeviceRenderPassStripedFeaturesARM                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM,
+    ePhysicalDeviceRenderPassStripedPropertiesARM                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM,
+    eRenderPassStripeBeginInfoARM                                = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM,
+    eRenderPassStripeInfoARM                                     = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM,
+    eRenderPassStripeSubmitInfoARM                               = VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM,
+    ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM,
+    ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM,
+    eSubpassFragmentDensityMapOffsetEndInfoQCOM                  = VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM,
+    ePhysicalDeviceCopyMemoryIndirectFeaturesNV                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV,
+    ePhysicalDeviceCopyMemoryIndirectPropertiesNV                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV,
+    ePhysicalDeviceMemoryDecompressionFeaturesNV                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV,
+    ePhysicalDeviceMemoryDecompressionPropertiesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV,
+    ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV,
+    eComputePipelineIndirectBufferInfoNV                         = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV,
+    ePipelineIndirectDeviceAddressInfoNV                         = VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV,
+    ePhysicalDeviceLinearColorAttachmentFeaturesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV,
+    ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR,
+    ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT,
+    ePhysicalDeviceImageProcessingFeaturesQCOM                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM,
+    ePhysicalDeviceImageProcessingPropertiesQCOM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_PROPERTIES_QCOM,
+    eImageViewSampleWeightCreateInfoQCOM                         = VK_STRUCTURE_TYPE_IMAGE_VIEW_SAMPLE_WEIGHT_CREATE_INFO_QCOM,
+    ePhysicalDeviceNestedCommandBufferFeaturesEXT                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT,
+    ePhysicalDeviceNestedCommandBufferPropertiesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT,
     eExternalMemoryAcquireUnmodifiedEXT                          = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT,
     ePhysicalDeviceExtendedDynamicState3FeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT,
     ePhysicalDeviceExtendedDynamicState3PropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_PROPERTIES_EXT,
@@ -1409,30 +1296,6 @@ namespace VULKAN_HPP_NAMESPACE
     eRenderPassSubpassFeedbackCreateInfoEXT                      = VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT,
     eDirectDriverLoadingInfoLUNARG                               = VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG,
     eDirectDriverLoadingListLUNARG                               = VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG,
-    eTensorCreateInfoARM                                         = VK_STRUCTURE_TYPE_TENSOR_CREATE_INFO_ARM,
-    eTensorViewCreateInfoARM                                     = VK_STRUCTURE_TYPE_TENSOR_VIEW_CREATE_INFO_ARM,
-    eBindTensorMemoryInfoARM                                     = VK_STRUCTURE_TYPE_BIND_TENSOR_MEMORY_INFO_ARM,
-    eWriteDescriptorSetTensorARM                                 = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_TENSOR_ARM,
-    ePhysicalDeviceTensorPropertiesARM                           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_PROPERTIES_ARM,
-    eTensorFormatPropertiesARM                                   = VK_STRUCTURE_TYPE_TENSOR_FORMAT_PROPERTIES_ARM,
-    eTensorDescriptionARM                                        = VK_STRUCTURE_TYPE_TENSOR_DESCRIPTION_ARM,
-    eTensorMemoryRequirementsInfoARM                             = VK_STRUCTURE_TYPE_TENSOR_MEMORY_REQUIREMENTS_INFO_ARM,
-    eTensorMemoryBarrierARM                                      = VK_STRUCTURE_TYPE_TENSOR_MEMORY_BARRIER_ARM,
-    ePhysicalDeviceTensorFeaturesARM                             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_FEATURES_ARM,
-    eDeviceTensorMemoryRequirementsARM                           = VK_STRUCTURE_TYPE_DEVICE_TENSOR_MEMORY_REQUIREMENTS_ARM,
-    eCopyTensorInfoARM                                           = VK_STRUCTURE_TYPE_COPY_TENSOR_INFO_ARM,
-    eTensorCopyARM                                               = VK_STRUCTURE_TYPE_TENSOR_COPY_ARM,
-    eTensorDependencyInfoARM                                     = VK_STRUCTURE_TYPE_TENSOR_DEPENDENCY_INFO_ARM,
-    eMemoryDedicatedAllocateInfoTensorARM                        = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_TENSOR_ARM,
-    ePhysicalDeviceExternalTensorInfoARM                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_TENSOR_INFO_ARM,
-    eExternalTensorPropertiesARM                                 = VK_STRUCTURE_TYPE_EXTERNAL_TENSOR_PROPERTIES_ARM,
-    eExternalMemoryTensorCreateInfoARM                           = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_TENSOR_CREATE_INFO_ARM,
-    ePhysicalDeviceDescriptorBufferTensorFeaturesARM             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_FEATURES_ARM,
-    ePhysicalDeviceDescriptorBufferTensorPropertiesARM           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_PROPERTIES_ARM,
-    eDescriptorGetTensorInfoARM                                  = VK_STRUCTURE_TYPE_DESCRIPTOR_GET_TENSOR_INFO_ARM,
-    eTensorCaptureDescriptorDataInfoARM                          = VK_STRUCTURE_TYPE_TENSOR_CAPTURE_DESCRIPTOR_DATA_INFO_ARM,
-    eTensorViewCaptureDescriptorDataInfoARM                      = VK_STRUCTURE_TYPE_TENSOR_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_ARM,
-    eFrameBoundaryTensorsARM                                     = VK_STRUCTURE_TYPE_FRAME_BOUNDARY_TENSORS_ARM,
     ePhysicalDeviceShaderModuleIdentifierFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT,
     ePhysicalDeviceShaderModuleIdentifierPropertiesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT,
     ePipelineShaderStageModuleIdentifierCreateInfoEXT            = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT,
@@ -1447,152 +1310,82 @@ namespace VULKAN_HPP_NAMESPACE
     eOpticalFlowExecuteInfoNV                                    = VK_STRUCTURE_TYPE_OPTICAL_FLOW_EXECUTE_INFO_NV,
     eOpticalFlowSessionCreatePrivateDataInfoNV                   = VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_PRIVATE_DATA_INFO_NV,
     ePhysicalDeviceLegacyDitheringFeaturesEXT                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT,
+    ePhysicalDevicePipelineProtectedAccessFeaturesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT,
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     ePhysicalDeviceExternalFormatResolveFeaturesANDROID   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID,
     ePhysicalDeviceExternalFormatResolvePropertiesANDROID = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID,
     eAndroidHardwareBufferFormatResolvePropertiesANDROID  = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID,
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-    ePhysicalDeviceAntiLagFeaturesAMD = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD,
-    eAntiLagDataAMD                   = VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD,
-    eAntiLagPresentationInfoAMD       = VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    ePhysicalDeviceDenseGeometryFormatFeaturesAMDX             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX,
-    eAccelerationStructureDenseGeometryFormatTrianglesDataAMDX = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eSurfaceCapabilitiesPresentId2KHR                             = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR,
-    ePresentId2KHR                                                = VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR,
-    ePhysicalDevicePresentId2FeaturesKHR                          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR,
-    eSurfaceCapabilitiesPresentWait2KHR                           = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_WAIT_2_KHR,
-    ePhysicalDevicePresentWait2FeaturesKHR                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_2_FEATURES_KHR,
-    ePresentWait2InfoKHR                                          = VK_STRUCTURE_TYPE_PRESENT_WAIT_2_INFO_KHR,
-    ePhysicalDeviceRayTracingPositionFetchFeaturesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR,
-    ePhysicalDeviceShaderObjectFeaturesEXT                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT,
-    ePhysicalDeviceShaderObjectPropertiesEXT                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT,
-    eShaderCreateInfoEXT                                          = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT,
-    ePhysicalDevicePipelineBinaryFeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR,
-    ePipelineBinaryCreateInfoKHR                                  = VK_STRUCTURE_TYPE_PIPELINE_BINARY_CREATE_INFO_KHR,
-    ePipelineBinaryInfoKHR                                        = VK_STRUCTURE_TYPE_PIPELINE_BINARY_INFO_KHR,
-    ePipelineBinaryKeyKHR                                         = VK_STRUCTURE_TYPE_PIPELINE_BINARY_KEY_KHR,
-    ePhysicalDevicePipelineBinaryPropertiesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR,
-    eReleaseCapturedPipelineDataInfoKHR                           = VK_STRUCTURE_TYPE_RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR,
-    ePipelineBinaryDataInfoKHR                                    = VK_STRUCTURE_TYPE_PIPELINE_BINARY_DATA_INFO_KHR,
-    ePipelineCreateInfoKHR                                        = VK_STRUCTURE_TYPE_PIPELINE_CREATE_INFO_KHR,
-    eDevicePipelineBinaryInternalCacheControlKHR                  = VK_STRUCTURE_TYPE_DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR,
-    ePipelineBinaryHandlesInfoKHR                                 = VK_STRUCTURE_TYPE_PIPELINE_BINARY_HANDLES_INFO_KHR,
-    ePhysicalDeviceTilePropertiesFeaturesQCOM                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM,
-    eTilePropertiesQCOM                                           = VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM,
-    ePhysicalDeviceAmigoProfilingFeaturesSEC                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC,
-    eAmigoProfilingSubmitInfoSEC                                  = VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC,
-    eSurfacePresentModeKHR                                        = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR,
-    eSurfacePresentModeEXT                                        = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT,
-    eSurfacePresentScalingCapabilitiesKHR                         = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR,
-    eSurfacePresentScalingCapabilitiesEXT                         = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT,
-    eSurfacePresentModeCompatibilityKHR                           = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR,
-    eSurfacePresentModeCompatibilityEXT                           = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT,
-    ePhysicalDeviceSwapchainMaintenance1FeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR,
-    ePhysicalDeviceSwapchainMaintenance1FeaturesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT,
-    eSwapchainPresentFenceInfoKHR                                 = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR,
-    eSwapchainPresentFenceInfoEXT                                 = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT,
-    eSwapchainPresentModesCreateInfoKHR                           = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR,
-    eSwapchainPresentModesCreateInfoEXT                           = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT,
-    eSwapchainPresentModeInfoKHR                                  = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR,
-    eSwapchainPresentModeInfoEXT                                  = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT,
-    eSwapchainPresentScalingCreateInfoKHR                         = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR,
-    eSwapchainPresentScalingCreateInfoEXT                         = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT,
-    eReleaseSwapchainImagesInfoKHR                                = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR,
-    eReleaseSwapchainImagesInfoEXT                                = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT,
-    ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM,
-    ePhysicalDeviceRayTracingInvocationReorderFeaturesNV          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV,
-    ePhysicalDeviceRayTracingInvocationReorderPropertiesNV        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV,
-    ePhysicalDeviceCooperativeVectorFeaturesNV                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_FEATURES_NV,
-    ePhysicalDeviceCooperativeVectorPropertiesNV                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV,
-    eCooperativeVectorPropertiesNV                                = VK_STRUCTURE_TYPE_COOPERATIVE_VECTOR_PROPERTIES_NV,
-    eConvertCooperativeVectorMatrixInfoNV                         = VK_STRUCTURE_TYPE_CONVERT_COOPERATIVE_VECTOR_MATRIX_INFO_NV,
-    ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV,
-    ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV,
-    ePhysicalDeviceMutableDescriptorTypeFeaturesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT,
-    ePhysicalDeviceMutableDescriptorTypeFeaturesVALVE             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE,
-    eMutableDescriptorTypeCreateInfoEXT                           = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT,
-    eMutableDescriptorTypeCreateInfoVALVE                         = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE,
-    ePhysicalDeviceLegacyVertexAttributesFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT,
-    ePhysicalDeviceLegacyVertexAttributesPropertiesEXT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT,
-    eLayerSettingsCreateInfoEXT                                   = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
-    ePhysicalDeviceShaderCoreBuiltinsFeaturesARM                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM,
-    ePhysicalDeviceShaderCoreBuiltinsPropertiesARM                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM,
-    ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT,
-    ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT,
-    eLatencySleepModeInfoNV                                       = VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV,
-    eLatencySleepInfoNV                                           = VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV,
-    eSetLatencyMarkerInfoNV                                       = VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV,
-    eGetLatencyMarkerInfoNV                                       = VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV,
-    eLatencyTimingsFrameReportNV                                  = VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV,
-    eLatencySubmissionPresentIdNV                                 = VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV,
-    eOutOfBandQueueTypeInfoNV                                     = VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV,
-    eSwapchainLatencyCreateInfoNV                                 = VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV,
-    eLatencySurfaceCapabilitiesNV                                 = VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV,
-    ePhysicalDeviceCooperativeMatrixFeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR,
-    eCooperativeMatrixPropertiesKHR                               = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
-    ePhysicalDeviceCooperativeMatrixPropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
-    eDataGraphPipelineCreateInfoARM                               = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM,
-    eDataGraphPipelineSessionCreateInfoARM                        = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_CREATE_INFO_ARM,
-    eDataGraphPipelineResourceInfoARM                             = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_RESOURCE_INFO_ARM,
-    eDataGraphPipelineConstantARM                                 = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_ARM,
-    eDataGraphPipelineSessionMemoryRequirementsInfoARM            = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_MEMORY_REQUIREMENTS_INFO_ARM,
-    eBindDataGraphPipelineSessionMemoryInfoARM                    = VK_STRUCTURE_TYPE_BIND_DATA_GRAPH_PIPELINE_SESSION_MEMORY_INFO_ARM,
-    ePhysicalDeviceDataGraphFeaturesARM                           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_FEATURES_ARM,
-    eDataGraphPipelineShaderModuleCreateInfoARM                   = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SHADER_MODULE_CREATE_INFO_ARM,
-    eDataGraphPipelinePropertyQueryResultARM                      = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_PROPERTY_QUERY_RESULT_ARM,
-    eDataGraphPipelineInfoARM                                     = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_INFO_ARM,
-    eDataGraphPipelineCompilerControlCreateInfoARM                = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_COMPILER_CONTROL_CREATE_INFO_ARM,
-    eDataGraphPipelineSessionBindPointRequirementsInfoARM         = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENTS_INFO_ARM,
-    eDataGraphPipelineSessionBindPointRequirementARM              = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENT_ARM,
-    eDataGraphPipelineIdentifierCreateInfoARM                     = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_IDENTIFIER_CREATE_INFO_ARM,
-    eDataGraphPipelineDispatchInfoARM                             = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_DISPATCH_INFO_ARM,
-    eDataGraphProcessingEngineCreateInfoARM                       = VK_STRUCTURE_TYPE_DATA_GRAPH_PROCESSING_ENGINE_CREATE_INFO_ARM,
-    eQueueFamilyDataGraphProcessingEnginePropertiesARM            = VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM,
-    eQueueFamilyDataGraphPropertiesARM                            = VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM,
-    ePhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_INFO_ARM,
-    eDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_TENSOR_SEMI_STRUCTURED_SPARSITY_INFO_ARM,
-    ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM,
-    eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM           = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM,
-    ePhysicalDeviceComputeShaderDerivativesFeaturesKHR            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR,
-    ePhysicalDeviceComputeShaderDerivativesFeaturesNV             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV,
-    ePhysicalDeviceComputeShaderDerivativesPropertiesKHR          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR,
-    eVideoDecodeAv1CapabilitiesKHR                                = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR,
-    eVideoDecodeAv1PictureInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR,
-    eVideoDecodeAv1ProfileInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR,
-    eVideoDecodeAv1SessionParametersCreateInfoKHR                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
-    eVideoDecodeAv1DpbSlotInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR,
-    eVideoEncodeAv1CapabilitiesKHR                                = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR,
-    eVideoEncodeAv1SessionParametersCreateInfoKHR                 = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
-    eVideoEncodeAv1PictureInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PICTURE_INFO_KHR,
-    eVideoEncodeAv1DpbSlotInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_DPB_SLOT_INFO_KHR,
-    ePhysicalDeviceVideoEncodeAv1FeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_AV1_FEATURES_KHR,
-    eVideoEncodeAv1ProfileInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PROFILE_INFO_KHR,
-    eVideoEncodeAv1RateControlInfoKHR                             = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_INFO_KHR,
-    eVideoEncodeAv1RateControlLayerInfoKHR                        = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_LAYER_INFO_KHR,
-    eVideoEncodeAv1QualityLevelPropertiesKHR                      = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUALITY_LEVEL_PROPERTIES_KHR,
-    eVideoEncodeAv1SessionCreateInfoKHR                           = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_CREATE_INFO_KHR,
-    eVideoEncodeAv1GopRemainingFrameInfoKHR                       = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_GOP_REMAINING_FRAME_INFO_KHR,
-    ePhysicalDeviceVideoDecodeVp9FeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_DECODE_VP9_FEATURES_KHR,
-    eVideoDecodeVp9CapabilitiesKHR                                = VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_CAPABILITIES_KHR,
-    eVideoDecodeVp9PictureInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PICTURE_INFO_KHR,
-    eVideoDecodeVp9ProfileInfoKHR                                 = VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PROFILE_INFO_KHR,
-    ePhysicalDeviceVideoMaintenance1FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR,
-    eVideoInlineQueryInfoKHR                                      = VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR,
-    ePhysicalDevicePerStageDescriptorSetFeaturesNV                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV,
-    ePhysicalDeviceImageProcessing2FeaturesQCOM                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM,
-    ePhysicalDeviceImageProcessing2PropertiesQCOM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM,
-    eSamplerBlockMatchWindowCreateInfoQCOM                        = VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM,
-    eSamplerCubicWeightsCreateInfoQCOM                            = VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM,
-    ePhysicalDeviceCubicWeightsFeaturesQCOM                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM,
-    eBlitImageCubicWeightsInfoQCOM                                = VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM,
-    ePhysicalDeviceYcbcrDegammaFeaturesQCOM                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM,
-    eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM             = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM,
-    ePhysicalDeviceCubicClampFeaturesQCOM                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM,
-    ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT,
-    ePhysicalDeviceUnifiedImageLayoutsFeaturesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR,
-    eAttachmentFeedbackLoopInfoEXT                                = VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT,
+    ePhysicalDeviceMaintenance5FeaturesKHR                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR,
+    ePhysicalDeviceMaintenance5PropertiesKHR                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR,
+    eRenderingAreaInfoKHR                                        = VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR,
+    eDeviceImageSubresourceInfoKHR                               = VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR,
+    eSubresourceLayout2KHR                                       = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR,
+    eSubresourceLayout2EXT                                       = VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_EXT,
+    eImageSubresource2KHR                                        = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR,
+    eImageSubresource2EXT                                        = VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_EXT,
+    ePipelineCreateFlags2CreateInfoKHR                           = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR,
+    eBufferUsageFlags2CreateInfoKHR                              = VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR,
+    ePhysicalDeviceRayTracingPositionFetchFeaturesKHR            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR,
+    ePhysicalDeviceShaderObjectFeaturesEXT                       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT,
+    ePhysicalDeviceShaderObjectPropertiesEXT                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT,
+    eShaderCreateInfoEXT                                         = VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT,
+    ePhysicalDeviceTilePropertiesFeaturesQCOM                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM,
+    eTilePropertiesQCOM                                          = VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM,
+    ePhysicalDeviceAmigoProfilingFeaturesSEC                     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC,
+    eAmigoProfilingSubmitInfoSEC                                 = VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC,
+    ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM,
+    ePhysicalDeviceRayTracingInvocationReorderFeaturesNV         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV,
+    ePhysicalDeviceRayTracingInvocationReorderPropertiesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV,
+    ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV,
+    ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV,
+    ePhysicalDeviceMutableDescriptorTypeFeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT,
+    ePhysicalDeviceMutableDescriptorTypeFeaturesVALVE            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE,
+    eMutableDescriptorTypeCreateInfoEXT                          = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT,
+    eMutableDescriptorTypeCreateInfoVALVE                        = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE,
+    eLayerSettingsCreateInfoEXT                                  = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
+    ePhysicalDeviceShaderCoreBuiltinsFeaturesARM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM,
+    ePhysicalDeviceShaderCoreBuiltinsPropertiesARM               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM,
+    ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT,
+    ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT,
+    eLatencySleepModeInfoNV                                      = VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV,
+    eLatencySleepInfoNV                                          = VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV,
+    eSetLatencyMarkerInfoNV                                      = VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV,
+    eGetLatencyMarkerInfoNV                                      = VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV,
+    eLatencyTimingsFrameReportNV                                 = VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV,
+    eLatencySubmissionPresentIdNV                                = VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV,
+    eOutOfBandQueueTypeInfoNV                                    = VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV,
+    eSwapchainLatencyCreateInfoNV                                = VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV,
+    eLatencySurfaceCapabilitiesNV                                = VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV,
+    ePhysicalDeviceCooperativeMatrixFeaturesKHR                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR,
+    eCooperativeMatrixPropertiesKHR                              = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
+    ePhysicalDeviceCooperativeMatrixPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR,
+    ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM,
+    eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM          = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM,
+    eVideoDecodeAv1CapabilitiesKHR                               = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR,
+    eVideoDecodeAv1PictureInfoKHR                                = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR,
+    eVideoDecodeAv1ProfileInfoKHR                                = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR,
+    eVideoDecodeAv1SessionParametersCreateInfoKHR                = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
+    eVideoDecodeAv1DpbSlotInfoKHR                                = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR,
+    ePhysicalDeviceVideoMaintenance1FeaturesKHR                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR,
+    eVideoInlineQueryInfoKHR                                     = VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR,
+    ePhysicalDevicePerStageDescriptorSetFeaturesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV,
+    ePhysicalDeviceImageProcessing2FeaturesQCOM                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM,
+    ePhysicalDeviceImageProcessing2PropertiesQCOM                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM,
+    eSamplerBlockMatchWindowCreateInfoQCOM                       = VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM,
+    eSamplerCubicWeightsCreateInfoQCOM                           = VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM,
+    ePhysicalDeviceCubicWeightsFeaturesQCOM                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM,
+    eBlitImageCubicWeightsInfoQCOM                               = VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM,
+    ePhysicalDeviceYcbcrDegammaFeaturesQCOM                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM,
+    eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM            = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM,
+    ePhysicalDeviceCubicClampFeaturesQCOM                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM,
+    ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT,
+    ePhysicalDeviceVertexAttributeDivisorPropertiesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR,
+    ePipelineVertexInputDivisorStateCreateInfoKHR                = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR,
+    ePipelineVertexInputDivisorStateCreateInfoEXT                = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT,
+    ePhysicalDeviceVertexAttributeDivisorFeaturesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR,
+    ePhysicalDeviceVertexAttributeDivisorFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT,
+    ePhysicalDeviceShaderFloatControls2FeaturesKHR               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR,
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     eScreenBufferPropertiesQNX                           = VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX,
     eScreenBufferFormatPropertiesQNX                     = VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX,
@@ -1600,168 +1393,38 @@ namespace VULKAN_HPP_NAMESPACE
     eExternalFormatQNX                                   = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX,
     ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX,
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-    ePhysicalDeviceLayeredDriverPropertiesMSFT                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT,
-    eCalibratedTimestampInfoKHR                                 = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR,
-    eCalibratedTimestampInfoEXT                                 = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT,
-    eSetDescriptorBufferOffsetsInfoEXT                          = VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT,
-    eBindDescriptorBufferEmbeddedSamplersInfoEXT                = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT,
-    ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV,
-    ePhysicalDeviceTileMemoryHeapFeaturesQCOM                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM,
-    ePhysicalDeviceTileMemoryHeapPropertiesQCOM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM,
-    eTileMemoryRequirementsQCOM                                 = VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM,
-    eTileMemoryBindInfoQCOM                                     = VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM,
-    eTileMemorySizeInfoQCOM                                     = VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM,
-    ePhysicalDeviceCopyMemoryIndirectFeaturesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR,
-    ePhysicalDeviceCopyMemoryIndirectPropertiesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR,
-    ePhysicalDeviceCopyMemoryIndirectPropertiesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV,
-    eCopyMemoryIndirectInfoKHR                                  = VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR,
-    eCopyMemoryToImageIndirectInfoKHR                           = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR,
-    ePhysicalDeviceMemoryDecompressionFeaturesEXT               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT,
-    ePhysicalDeviceMemoryDecompressionFeaturesNV                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV,
-    ePhysicalDeviceMemoryDecompressionPropertiesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT,
-    ePhysicalDeviceMemoryDecompressionPropertiesNV              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV,
-    eDecompressMemoryInfoEXT                                    = VK_STRUCTURE_TYPE_DECOMPRESS_MEMORY_INFO_EXT,
-    eDisplaySurfaceStereoCreateInfoNV                           = VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV,
-    eDisplayModeStereoPropertiesNV                              = VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV,
-    eVideoEncodeIntraRefreshCapabilitiesKHR                     = VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR,
-    eVideoEncodeSessionIntraRefreshCreateInfoKHR                = VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR,
-    eVideoEncodeIntraRefreshInfoKHR                             = VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR,
-    eVideoReferenceIntraRefreshInfoKHR                          = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR,
-    ePhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR,
-    eVideoEncodeQuantizationMapCapabilitiesKHR                  = VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR,
-    eVideoFormatQuantizationMapPropertiesKHR                    = VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR,
-    eVideoEncodeQuantizationMapInfoKHR                          = VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR,
-    eVideoEncodeQuantizationMapSessionParametersCreateInfoKHR   = VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_SESSION_PARAMETERS_CREATE_INFO_KHR,
-    ePhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUANTIZATION_MAP_FEATURES_KHR,
-    eVideoEncodeH264QuantizationMapCapabilitiesKHR              = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUANTIZATION_MAP_CAPABILITIES_KHR,
-    eVideoEncodeH265QuantizationMapCapabilitiesKHR              = VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUANTIZATION_MAP_CAPABILITIES_KHR,
-    eVideoFormatH265QuantizationMapPropertiesKHR                = VK_STRUCTURE_TYPE_VIDEO_FORMAT_H265_QUANTIZATION_MAP_PROPERTIES_KHR,
-    eVideoEncodeAv1QuantizationMapCapabilitiesKHR               = VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUANTIZATION_MAP_CAPABILITIES_KHR,
-    eVideoFormatAv1QuantizationMapPropertiesKHR                 = VK_STRUCTURE_TYPE_VIDEO_FORMAT_AV1_QUANTIZATION_MAP_PROPERTIES_KHR,
-    ePhysicalDeviceRawAccessChainsFeaturesNV                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV,
-    eExternalComputeQueueDeviceCreateInfoNV                     = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV,
-    eExternalComputeQueueCreateInfoNV                           = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV,
-    eExternalComputeQueueDataParamsNV                           = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV,
-    ePhysicalDeviceExternalComputeQueuePropertiesNV             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV,
-    ePhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR,
-    ePhysicalDeviceCommandBufferInheritanceFeaturesNV           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV,
-    ePhysicalDeviceMaintenance7FeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR,
-    ePhysicalDeviceMaintenance7PropertiesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR,
-    ePhysicalDeviceLayeredApiPropertiesListKHR                  = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR,
-    ePhysicalDeviceLayeredApiPropertiesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_KHR,
-    ePhysicalDeviceLayeredApiVulkanPropertiesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR,
-    ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV,
-    ePhysicalDeviceShaderReplicatedCompositesFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT,
-    ePhysicalDeviceShaderFloat8FeaturesEXT                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT,
-    ePhysicalDeviceRayTracingValidationFeaturesNV               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV,
-    ePhysicalDeviceClusterAccelerationStructureFeaturesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_FEATURES_NV,
-    ePhysicalDeviceClusterAccelerationStructurePropertiesNV     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_PROPERTIES_NV,
-    eClusterAccelerationStructureClustersBottomLevelInputNV     = VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV,
-    eClusterAccelerationStructureTriangleClusterInputNV         = VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_TRIANGLE_CLUSTER_INPUT_NV,
-    eClusterAccelerationStructureMoveObjectsInputNV             = VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_MOVE_OBJECTS_INPUT_NV,
-    eClusterAccelerationStructureInputInfoNV                    = VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV,
-    eClusterAccelerationStructureCommandsInfoNV                 = VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV,
-    eRayTracingPipelineClusterAccelerationStructureCreateInfoNV = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CLUSTER_ACCELERATION_STRUCTURE_CREATE_INFO_NV,
-    ePhysicalDevicePartitionedAccelerationStructureFeaturesNV   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_FEATURES_NV,
-    ePhysicalDevicePartitionedAccelerationStructurePropertiesNV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_PROPERTIES_NV,
-    eWriteDescriptorSetPartitionedAccelerationStructureNV       = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_PARTITIONED_ACCELERATION_STRUCTURE_NV,
-    ePartitionedAccelerationStructureInstancesInputNV           = VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCES_INPUT_NV,
-    eBuildPartitionedAccelerationStructureInfoNV                = VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV,
-    ePartitionedAccelerationStructureFlagsNV                    = VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_FLAGS_NV,
-    ePhysicalDeviceDeviceGeneratedCommandsFeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_EXT,
-    ePhysicalDeviceDeviceGeneratedCommandsPropertiesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT,
-    eGeneratedCommandsMemoryRequirementsInfoEXT                 = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_EXT,
-    eIndirectExecutionSetCreateInfoEXT                          = VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_CREATE_INFO_EXT,
-    eGeneratedCommandsInfoEXT                                   = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_EXT,
-    eIndirectCommandsLayoutCreateInfoEXT                        = VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_EXT,
-    eIndirectCommandsLayoutTokenEXT                             = VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_EXT,
-    eWriteIndirectExecutionSetPipelineEXT                       = VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_PIPELINE_EXT,
-    eWriteIndirectExecutionSetShaderEXT                         = VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_SHADER_EXT,
-    eIndirectExecutionSetPipelineInfoEXT                        = VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_PIPELINE_INFO_EXT,
-    eIndirectExecutionSetShaderInfoEXT                          = VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_INFO_EXT,
-    eIndirectExecutionSetShaderLayoutInfoEXT                    = VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_LAYOUT_INFO_EXT,
-    eGeneratedCommandsPipelineInfoEXT                           = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_PIPELINE_INFO_EXT,
-    eGeneratedCommandsShaderInfoEXT                             = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_SHADER_INFO_EXT,
-    ePhysicalDeviceMaintenance8FeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR,
-    eMemoryBarrierAccessFlags3KHR                               = VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR,
-    ePhysicalDeviceImageAlignmentControlFeaturesMESA            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA,
-    ePhysicalDeviceImageAlignmentControlPropertiesMESA          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA,
-    eImageAlignmentControlCreateInfoMESA                        = VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA,
-    ePhysicalDeviceShaderFmaFeaturesKHR                         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR,
-    ePhysicalDeviceRayTracingInvocationReorderFeaturesEXT       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT,
-    ePhysicalDeviceRayTracingInvocationReorderPropertiesEXT     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT,
-    ePhysicalDeviceDepthClampControlFeaturesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT,
-    ePipelineViewportDepthClampControlCreateInfoEXT             = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT,
-    ePhysicalDeviceMaintenance9FeaturesKHR                      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR,
-    ePhysicalDeviceMaintenance9PropertiesKHR                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR,
-    eQueueFamilyOwnershipTransferPropertiesKHR                  = VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR,
-    ePhysicalDeviceVideoMaintenance2FeaturesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_2_FEATURES_KHR,
-    eVideoDecodeH264InlineSessionParametersInfoKHR              = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR,
-    eVideoDecodeH265InlineSessionParametersInfoKHR              = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR,
-    eVideoDecodeAv1InlineSessionParametersInfoKHR               = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR,
-#if defined( VK_USE_PLATFORM_OHOS )
-    eSurfaceCreateInfoOHOS                    = VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS,
-    eNativeBufferOHOS                         = VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS,
-    eSwapchainImageCreateInfoOHOS             = VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS,
-    ePhysicalDevicePresentationPropertiesOHOS = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS,
-#endif /*VK_USE_PLATFORM_OHOS*/
-    ePhysicalDeviceHdrVividFeaturesHUAWEI             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI,
-    eHdrVividDynamicMetadataHUAWEI                    = VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI,
-    ePhysicalDeviceCooperativeMatrix2FeaturesNV       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV,
-    eCooperativeMatrixFlexibleDimensionsPropertiesNV  = VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_FLEXIBLE_DIMENSIONS_PROPERTIES_NV,
-    ePhysicalDeviceCooperativeMatrix2PropertiesNV     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_PROPERTIES_NV,
-    ePhysicalDevicePipelineOpacityMicromapFeaturesARM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_OPACITY_MICROMAP_FEATURES_ARM,
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-    eImportMemoryMetalHandleInfoEXT = VK_STRUCTURE_TYPE_IMPORT_MEMORY_METAL_HANDLE_INFO_EXT,
-    eMemoryMetalHandlePropertiesEXT = VK_STRUCTURE_TYPE_MEMORY_METAL_HANDLE_PROPERTIES_EXT,
-    eMemoryGetMetalHandleInfoEXT    = VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EXT,
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-    ePhysicalDeviceDepthClampZeroOneFeaturesKHR             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR,
-    ePhysicalDeviceDepthClampZeroOneFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT,
-    ePhysicalDevicePerformanceCountersByRegionFeaturesARM   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM,
-    ePhysicalDevicePerformanceCountersByRegionPropertiesARM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM,
-    ePerformanceCounterARM                                  = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM,
-    ePerformanceCounterDescriptionARM                       = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM,
-    eRenderPassPerformanceCountersByRegionBeginInfoARM      = VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM,
-    ePhysicalDeviceVertexAttributeRobustnessFeaturesEXT     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT,
-    ePhysicalDeviceFormatPackFeaturesARM                    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FORMAT_PACK_FEATURES_ARM,
-    ePhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE,
-    ePhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE,
-    ePipelineFragmentDensityMapLayeredCreateInfoVALVE       = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE,
-    ePhysicalDeviceRobustness2FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR,
-    ePhysicalDeviceRobustness2FeaturesEXT                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT,
-    ePhysicalDeviceRobustness2PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR,
-    ePhysicalDeviceRobustness2PropertiesEXT                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eSetPresentConfigNV                      = VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV,
-    ePhysicalDevicePresentMeteringFeaturesNV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    ePhysicalDeviceFragmentDensityMapOffsetFeaturesEXT        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT,
-    ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM       = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM,
-    ePhysicalDeviceFragmentDensityMapOffsetPropertiesEXT      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT,
-    ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM,
-    eRenderPassFragmentDensityMapOffsetEndInfoEXT             = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT,
-    eSubpassFragmentDensityMapOffsetEndInfoQCOM               = VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM,
-    ePhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT,
-    ePhysicalDevicePresentModeFifoLatestReadyFeaturesKHR      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR,
-    ePhysicalDevicePresentModeFifoLatestReadyFeaturesEXT      = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT,
-    ePhysicalDeviceShader64BitIndexingFeaturesEXT             = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_INDEXING_FEATURES_EXT,
-    ePhysicalDeviceCustomResolveFeaturesEXT                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT,
-    eBeginCustomResolveInfoEXT                                = VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT,
-    eCustomResolveCreateInfoEXT                               = VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT,
-    ePhysicalDeviceDataGraphModelFeaturesQCOM                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_QCOM,
-    eDataGraphPipelineBuiltinModelCreateInfoQCOM              = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM,
-    ePhysicalDeviceMaintenance10FeaturesKHR                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_FEATURES_KHR,
-    ePhysicalDeviceMaintenance10PropertiesKHR                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_PROPERTIES_KHR,
-    eRenderingAttachmentFlagsInfoKHR                          = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_FLAGS_INFO_KHR,
-    eRenderingEndInfoKHR                                      = VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR,
-    eRenderingEndInfoEXT                                      = VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT,
-    eResolveImageModeInfoKHR                                  = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_MODE_INFO_KHR,
-    ePhysicalDevicePipelineCacheIncrementalModeFeaturesSEC    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC,
-    ePhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_FEATURES_EXT
+    ePhysicalDeviceLayeredDriverPropertiesMSFT            = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT,
+    ePhysicalDeviceIndexTypeUint8FeaturesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR,
+    ePhysicalDeviceIndexTypeUint8FeaturesEXT              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT,
+    ePhysicalDeviceLineRasterizationFeaturesKHR           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR,
+    ePhysicalDeviceLineRasterizationFeaturesEXT           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT,
+    ePipelineRasterizationLineStateCreateInfoKHR          = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR,
+    ePipelineRasterizationLineStateCreateInfoEXT          = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT,
+    ePhysicalDeviceLineRasterizationPropertiesKHR         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR,
+    ePhysicalDeviceLineRasterizationPropertiesEXT         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT,
+    eCalibratedTimestampInfoKHR                           = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR,
+    eCalibratedTimestampInfoEXT                           = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT,
+    ePhysicalDeviceShaderExpectAssumeFeaturesKHR          = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR,
+    ePhysicalDeviceMaintenance6FeaturesKHR                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR,
+    ePhysicalDeviceMaintenance6PropertiesKHR              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR,
+    eBindMemoryStatusKHR                                  = VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR,
+    eBindDescriptorSetsInfoKHR                            = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR,
+    ePushConstantsInfoKHR                                 = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
+    ePushDescriptorSetInfoKHR                             = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR,
+    ePushDescriptorSetWithTemplateInfoKHR                 = VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR,
+    eSetDescriptorBufferOffsetsInfoEXT                    = VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT,
+    eBindDescriptorBufferEmbeddedSamplersInfoEXT          = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT,
+    ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV,
+    ePhysicalDeviceRawAccessChainsFeaturesNV              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV,
+    ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV,
+    ePhysicalDeviceRayTracingValidationFeaturesNV         = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV
+  };
+
+  enum class PipelineCacheHeaderVersion
+  {
+    eOne = VK_PIPELINE_CACHE_HEADER_VERSION_ONE
   };
 
-  // wrapper class for enum VkObjectType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkObjectType.html
   enum class ObjectType
   {
     eUnknown                       = VK_OBJECT_TYPE_UNKNOWN,
@@ -1790,10 +1453,10 @@ namespace VULKAN_HPP_NAMESPACE
     eDescriptorSet                 = VK_OBJECT_TYPE_DESCRIPTOR_SET,
     eFramebuffer                   = VK_OBJECT_TYPE_FRAMEBUFFER,
     eCommandPool                   = VK_OBJECT_TYPE_COMMAND_POOL,
-    eDescriptorUpdateTemplate      = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE,
-    eDescriptorUpdateTemplateKHR   = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR,
     eSamplerYcbcrConversion        = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION,
     eSamplerYcbcrConversionKHR     = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR,
+    eDescriptorUpdateTemplate      = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE,
+    eDescriptorUpdateTemplateKHR   = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR,
     ePrivateDataSlot               = VK_OBJECT_TYPE_PRIVATE_DATA_SLOT,
     ePrivateDataSlotEXT            = VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT,
     eSurfaceKHR                    = VK_OBJECT_TYPE_SURFACE_KHR,
@@ -1819,22 +1482,13 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     eBufferCollectionFUCHSIA = VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA,
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-    eMicromapEXT                 = VK_OBJECT_TYPE_MICROMAP_EXT,
-    eTensorARM                   = VK_OBJECT_TYPE_TENSOR_ARM,
-    eTensorViewARM               = VK_OBJECT_TYPE_TENSOR_VIEW_ARM,
-    eOpticalFlowSessionNV        = VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV,
-    eShaderEXT                   = VK_OBJECT_TYPE_SHADER_EXT,
-    ePipelineBinaryKHR           = VK_OBJECT_TYPE_PIPELINE_BINARY_KHR,
-    eDataGraphPipelineSessionARM = VK_OBJECT_TYPE_DATA_GRAPH_PIPELINE_SESSION_ARM,
-    eExternalComputeQueueNV      = VK_OBJECT_TYPE_EXTERNAL_COMPUTE_QUEUE_NV,
-    eIndirectCommandsLayoutEXT   = VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_EXT,
-    eIndirectExecutionSetEXT     = VK_OBJECT_TYPE_INDIRECT_EXECUTION_SET_EXT
+    eMicromapEXT          = VK_OBJECT_TYPE_MICROMAP_EXT,
+    eOpticalFlowSessionNV = VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV,
+    eShaderEXT            = VK_OBJECT_TYPE_SHADER_EXT
   };
 
-  // wrapper class for enum VkVendorId, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVendorId.html
   enum class VendorId
   {
-    eKhronos  = VK_VENDOR_ID_KHRONOS,
     eVIV      = VK_VENDOR_ID_VIV,
     eVSI      = VK_VENDOR_ID_VSI,
     eKazan    = VK_VENDOR_ID_KAZAN,
@@ -1844,7 +1498,6 @@ namespace VULKAN_HPP_NAMESPACE
     eMobileye = VK_VENDOR_ID_MOBILEYE
   };
 
-  // wrapper class for enum VkFormat, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormat.html
   enum class Format
   {
     eUndefined                               = VK_FORMAT_UNDEFINED,
@@ -2140,10 +1793,6 @@ namespace VULKAN_HPP_NAMESPACE
     eAstc12x10SfloatBlockEXT                 = VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT,
     eAstc12x12SfloatBlock                    = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK,
     eAstc12x12SfloatBlockEXT                 = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT,
-    eA1B5G5R5UnormPack16                     = VK_FORMAT_A1B5G5R5_UNORM_PACK16,
-    eA1B5G5R5UnormPack16KHR                  = VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR,
-    eA8Unorm                                 = VK_FORMAT_A8_UNORM,
-    eA8UnormKHR                              = VK_FORMAT_A8_UNORM_KHR,
     ePvrtc12BppUnormBlockIMG                 = VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG,
     ePvrtc14BppUnormBlockIMG                 = VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG,
     ePvrtc22BppUnormBlockIMG                 = VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG,
@@ -2152,26 +1801,12 @@ namespace VULKAN_HPP_NAMESPACE
     ePvrtc14BppSrgbBlockIMG                  = VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG,
     ePvrtc22BppSrgbBlockIMG                  = VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG,
     ePvrtc24BppSrgbBlockIMG                  = VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG,
-    eR8BoolARM                               = VK_FORMAT_R8_BOOL_ARM,
     eR16G16Sfixed5NV                         = VK_FORMAT_R16G16_SFIXED5_NV,
     eR16G16S105NV                            = VK_FORMAT_R16G16_S10_5_NV,
-    eR10X6UintPack16ARM                      = VK_FORMAT_R10X6_UINT_PACK16_ARM,
-    eR10X6G10X6Uint2Pack16ARM                = VK_FORMAT_R10X6G10X6_UINT_2PACK16_ARM,
-    eR10X6G10X6B10X6A10X6Uint4Pack16ARM      = VK_FORMAT_R10X6G10X6B10X6A10X6_UINT_4PACK16_ARM,
-    eR12X4UintPack16ARM                      = VK_FORMAT_R12X4_UINT_PACK16_ARM,
-    eR12X4G12X4Uint2Pack16ARM                = VK_FORMAT_R12X4G12X4_UINT_2PACK16_ARM,
-    eR12X4G12X4B12X4A12X4Uint4Pack16ARM      = VK_FORMAT_R12X4G12X4B12X4A12X4_UINT_4PACK16_ARM,
-    eR14X2UintPack16ARM                      = VK_FORMAT_R14X2_UINT_PACK16_ARM,
-    eR14X2G14X2Uint2Pack16ARM                = VK_FORMAT_R14X2G14X2_UINT_2PACK16_ARM,
-    eR14X2G14X2B14X2A14X2Uint4Pack16ARM      = VK_FORMAT_R14X2G14X2B14X2A14X2_UINT_4PACK16_ARM,
-    eR14X2UnormPack16ARM                     = VK_FORMAT_R14X2_UNORM_PACK16_ARM,
-    eR14X2G14X2Unorm2Pack16ARM               = VK_FORMAT_R14X2G14X2_UNORM_2PACK16_ARM,
-    eR14X2G14X2B14X2A14X2Unorm4Pack16ARM     = VK_FORMAT_R14X2G14X2B14X2A14X2_UNORM_4PACK16_ARM,
-    eG14X2B14X2R14X22Plane420Unorm3Pack16ARM = VK_FORMAT_G14X2_B14X2R14X2_2PLANE_420_UNORM_3PACK16_ARM,
-    eG14X2B14X2R14X22Plane422Unorm3Pack16ARM = VK_FORMAT_G14X2_B14X2R14X2_2PLANE_422_UNORM_3PACK16_ARM
+    eA1B5G5R5UnormPack16KHR                  = VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR,
+    eA8UnormKHR                              = VK_FORMAT_A8_UNORM_KHR
   };
 
-  // wrapper class for enum VkFormatFeatureFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatFeatureFlagBits.html
   enum class FormatFeatureFlagBits : VkFormatFeatureFlags
   {
     eSampledImage                                               = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT,
@@ -2220,13 +1855,11 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoEncodeDpbKHR                    = VK_FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR
   };
 
-  // wrapper using for bitmask VkFormatFeatureFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatFeatureFlags.html
   using FormatFeatureFlags = Flags<FormatFeatureFlagBits>;
 
   template <>
   struct FlagTraits<FormatFeatureFlagBits>
   {
-    using WrappedType                                                 = VkFormatFeatureFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FormatFeatureFlags allFlags =
       FormatFeatureFlagBits::eSampledImage | FormatFeatureFlagBits::eStorageImage | FormatFeatureFlagBits::eStorageImageAtomic |
@@ -2244,7 +1877,6 @@ namespace VULKAN_HPP_NAMESPACE
       FormatFeatureFlagBits::eFragmentShadingRateAttachmentKHR | FormatFeatureFlagBits::eVideoEncodeInputKHR | FormatFeatureFlagBits::eVideoEncodeDpbKHR;
   };
 
-  // wrapper class for enum VkImageCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCreateFlagBits.html
   enum class ImageCreateFlagBits : VkImageCreateFlags
   {
     eSparseBinding                        = VK_IMAGE_CREATE_SPARSE_BINDING_BIT,
@@ -2271,18 +1903,15 @@ namespace VULKAN_HPP_NAMESPACE
     eDescriptorBufferCaptureReplayEXT     = VK_IMAGE_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT,
     eMultisampledRenderToSingleSampledEXT = VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT,
     e2DViewCompatibleEXT                  = VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT,
-    eVideoProfileIndependentKHR           = VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR,
-    eFragmentDensityMapOffsetEXT          = VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_EXT,
-    eFragmentDensityMapOffsetQCOM         = VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM
+    eFragmentDensityMapOffsetQCOM         = VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM,
+    eVideoProfileIndependentKHR           = VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR
   };
 
-  // wrapper using for bitmask VkImageCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCreateFlags.html
   using ImageCreateFlags = Flags<ImageCreateFlagBits>;
 
   template <>
   struct FlagTraits<ImageCreateFlagBits>
   {
-    using WrappedType                                               = VkImageCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageCreateFlags allFlags =
       ImageCreateFlagBits::eSparseBinding | ImageCreateFlagBits::eSparseResidency | ImageCreateFlagBits::eSparseAliased | ImageCreateFlagBits::eMutableFormat |
@@ -2291,10 +1920,9 @@ namespace VULKAN_HPP_NAMESPACE
       ImageCreateFlagBits::eProtected | ImageCreateFlagBits::eDisjoint | ImageCreateFlagBits::eCornerSampledNV |
       ImageCreateFlagBits::eSampleLocationsCompatibleDepthEXT | ImageCreateFlagBits::eSubsampledEXT | ImageCreateFlagBits::eDescriptorBufferCaptureReplayEXT |
       ImageCreateFlagBits::eMultisampledRenderToSingleSampledEXT | ImageCreateFlagBits::e2DViewCompatibleEXT |
-      ImageCreateFlagBits::eVideoProfileIndependentKHR | ImageCreateFlagBits::eFragmentDensityMapOffsetEXT;
+      ImageCreateFlagBits::eFragmentDensityMapOffsetQCOM | ImageCreateFlagBits::eVideoProfileIndependentKHR;
   };
 
-  // wrapper class for enum VkImageTiling, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageTiling.html
   enum class ImageTiling
   {
     eOptimal              = VK_IMAGE_TILING_OPTIMAL,
@@ -2302,7 +1930,6 @@ namespace VULKAN_HPP_NAMESPACE
     eDrmFormatModifierEXT = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
   };
 
-  // wrapper class for enum VkImageType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageType.html
   enum class ImageType
   {
     e1D = VK_IMAGE_TYPE_1D,
@@ -2310,102 +1937,83 @@ namespace VULKAN_HPP_NAMESPACE
     e3D = VK_IMAGE_TYPE_3D
   };
 
-  // wrapper class for enum VkImageUsageFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageUsageFlagBits.html
   enum class ImageUsageFlagBits : VkImageUsageFlags
   {
-    eTransferSrc                        = VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
-    eTransferDst                        = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
-    eSampled                            = VK_IMAGE_USAGE_SAMPLED_BIT,
-    eStorage                            = VK_IMAGE_USAGE_STORAGE_BIT,
-    eColorAttachment                    = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
-    eDepthStencilAttachment             = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
-    eTransientAttachment                = VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT,
-    eInputAttachment                    = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-    eHostTransfer                       = VK_IMAGE_USAGE_HOST_TRANSFER_BIT,
-    eHostTransferEXT                    = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT,
-    eVideoDecodeDstKHR                  = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR,
-    eVideoDecodeSrcKHR                  = VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR,
-    eVideoDecodeDpbKHR                  = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR,
-    eFragmentDensityMapEXT              = VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT,
-    eFragmentShadingRateAttachmentKHR   = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
-    eShadingRateImageNV                 = VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV,
-    eVideoEncodeDstKHR                  = VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR,
-    eVideoEncodeSrcKHR                  = VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR,
-    eVideoEncodeDpbKHR                  = VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR,
-    eAttachmentFeedbackLoopEXT          = VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
-    eInvocationMaskHUAWEI               = VK_IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI,
-    eSampleWeightQCOM                   = VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM,
-    eSampleBlockMatchQCOM               = VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM,
-    eTensorAliasingARM                  = VK_IMAGE_USAGE_TENSOR_ALIASING_BIT_ARM,
-    eTileMemoryQCOM                     = VK_IMAGE_USAGE_TILE_MEMORY_BIT_QCOM,
-    eVideoEncodeQuantizationDeltaMapKHR = VK_IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR,
-    eVideoEncodeEmphasisMapKHR          = VK_IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR
+    eTransferSrc                      = VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
+    eTransferDst                      = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
+    eSampled                          = VK_IMAGE_USAGE_SAMPLED_BIT,
+    eStorage                          = VK_IMAGE_USAGE_STORAGE_BIT,
+    eColorAttachment                  = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+    eDepthStencilAttachment           = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
+    eTransientAttachment              = VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT,
+    eInputAttachment                  = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
+    eVideoDecodeDstKHR                = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR,
+    eVideoDecodeSrcKHR                = VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR,
+    eVideoDecodeDpbKHR                = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR,
+    eFragmentDensityMapEXT            = VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT,
+    eFragmentShadingRateAttachmentKHR = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    eShadingRateImageNV               = VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV,
+    eHostTransferEXT                  = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT,
+    eVideoEncodeDstKHR                = VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR,
+    eVideoEncodeSrcKHR                = VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR,
+    eVideoEncodeDpbKHR                = VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR,
+    eAttachmentFeedbackLoopEXT        = VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
+    eInvocationMaskHUAWEI             = VK_IMAGE_USAGE_INVOCATION_MASK_BIT_HUAWEI,
+    eSampleWeightQCOM                 = VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM,
+    eSampleBlockMatchQCOM             = VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM
   };
 
-  // wrapper using for bitmask VkImageUsageFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageUsageFlags.html
   using ImageUsageFlags = Flags<ImageUsageFlagBits>;
 
   template <>
   struct FlagTraits<ImageUsageFlagBits>
   {
-    using WrappedType                                              = VkImageUsageFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool            isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageUsageFlags allFlags =
       ImageUsageFlagBits::eTransferSrc | ImageUsageFlagBits::eTransferDst | ImageUsageFlagBits::eSampled | ImageUsageFlagBits::eStorage |
       ImageUsageFlagBits::eColorAttachment | ImageUsageFlagBits::eDepthStencilAttachment | ImageUsageFlagBits::eTransientAttachment |
-      ImageUsageFlagBits::eInputAttachment | ImageUsageFlagBits::eHostTransfer | ImageUsageFlagBits::eVideoDecodeDstKHR |
-      ImageUsageFlagBits::eVideoDecodeSrcKHR | ImageUsageFlagBits::eVideoDecodeDpbKHR | ImageUsageFlagBits::eFragmentDensityMapEXT |
-      ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR | ImageUsageFlagBits::eVideoEncodeDstKHR | ImageUsageFlagBits::eVideoEncodeSrcKHR |
+      ImageUsageFlagBits::eInputAttachment | ImageUsageFlagBits::eVideoDecodeDstKHR | ImageUsageFlagBits::eVideoDecodeSrcKHR |
+      ImageUsageFlagBits::eVideoDecodeDpbKHR | ImageUsageFlagBits::eFragmentDensityMapEXT | ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR |
+      ImageUsageFlagBits::eHostTransferEXT | ImageUsageFlagBits::eVideoEncodeDstKHR | ImageUsageFlagBits::eVideoEncodeSrcKHR |
       ImageUsageFlagBits::eVideoEncodeDpbKHR | ImageUsageFlagBits::eAttachmentFeedbackLoopEXT | ImageUsageFlagBits::eInvocationMaskHUAWEI |
-      ImageUsageFlagBits::eSampleWeightQCOM | ImageUsageFlagBits::eSampleBlockMatchQCOM | ImageUsageFlagBits::eTensorAliasingARM |
-      ImageUsageFlagBits::eTileMemoryQCOM | ImageUsageFlagBits::eVideoEncodeQuantizationDeltaMapKHR | ImageUsageFlagBits::eVideoEncodeEmphasisMapKHR;
+      ImageUsageFlagBits::eSampleWeightQCOM | ImageUsageFlagBits::eSampleBlockMatchQCOM;
   };
 
-  // wrapper class for enum VkInstanceCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInstanceCreateFlagBits.html
   enum class InstanceCreateFlagBits : VkInstanceCreateFlags
   {
     eEnumeratePortabilityKHR = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
   };
 
-  // wrapper using for bitmask VkInstanceCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInstanceCreateFlags.html
   using InstanceCreateFlags = Flags<InstanceCreateFlagBits>;
 
   template <>
   struct FlagTraits<InstanceCreateFlagBits>
   {
-    using WrappedType                                                  = VkInstanceCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR InstanceCreateFlags allFlags  = InstanceCreateFlagBits::eEnumeratePortabilityKHR;
   };
 
-  // wrapper class for enum VkInternalAllocationType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInternalAllocationType.html
   enum class InternalAllocationType
   {
     eExecutable = VK_INTERNAL_ALLOCATION_TYPE_EXECUTABLE
   };
 
-  // wrapper class for enum VkMemoryHeapFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryHeapFlagBits.html
   enum class MemoryHeapFlagBits : VkMemoryHeapFlags
   {
     eDeviceLocal      = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
     eMultiInstance    = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT,
-    eMultiInstanceKHR = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHR,
-    eTileMemoryQCOM   = VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM
+    eMultiInstanceKHR = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHR
   };
 
-  // wrapper using for bitmask VkMemoryHeapFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryHeapFlags.html
   using MemoryHeapFlags = Flags<MemoryHeapFlagBits>;
 
   template <>
   struct FlagTraits<MemoryHeapFlagBits>
   {
-    using WrappedType                                              = VkMemoryHeapFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool            isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryHeapFlags allFlags =
-      MemoryHeapFlagBits::eDeviceLocal | MemoryHeapFlagBits::eMultiInstance | MemoryHeapFlagBits::eTileMemoryQCOM;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryHeapFlags allFlags  = MemoryHeapFlagBits::eDeviceLocal | MemoryHeapFlagBits::eMultiInstance;
   };
 
-  // wrapper class for enum VkMemoryPropertyFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryPropertyFlagBits.html
   enum class MemoryPropertyFlagBits : VkMemoryPropertyFlags
   {
     eDeviceLocal       = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
@@ -2419,13 +2027,11 @@ namespace VULKAN_HPP_NAMESPACE
     eRdmaCapableNV     = VK_MEMORY_PROPERTY_RDMA_CAPABLE_BIT_NV
   };
 
-  // wrapper using for bitmask VkMemoryPropertyFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryPropertyFlags.html
   using MemoryPropertyFlags = Flags<MemoryPropertyFlagBits>;
 
   template <>
   struct FlagTraits<MemoryPropertyFlagBits>
   {
-    using WrappedType                                                  = VkMemoryPropertyFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryPropertyFlags allFlags =
       MemoryPropertyFlagBits::eDeviceLocal | MemoryPropertyFlagBits::eHostVisible | MemoryPropertyFlagBits::eHostCoherent |
@@ -2433,7 +2039,6 @@ namespace VULKAN_HPP_NAMESPACE
       MemoryPropertyFlagBits::eDeviceCoherentAMD | MemoryPropertyFlagBits::eDeviceUncachedAMD | MemoryPropertyFlagBits::eRdmaCapableNV;
   };
 
-  // wrapper class for enum VkPhysicalDeviceType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceType.html
   enum class PhysicalDeviceType
   {
     eOther         = VK_PHYSICAL_DEVICE_TYPE_OTHER,
@@ -2443,7 +2048,6 @@ namespace VULKAN_HPP_NAMESPACE
     eCpu           = VK_PHYSICAL_DEVICE_TYPE_CPU
   };
 
-  // wrapper class for enum VkQueueFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFlagBits.html
   enum class QueueFlagBits : VkQueueFlags
   {
     eGraphics       = VK_QUEUE_GRAPHICS_BIT,
@@ -2453,24 +2057,20 @@ namespace VULKAN_HPP_NAMESPACE
     eProtected      = VK_QUEUE_PROTECTED_BIT,
     eVideoDecodeKHR = VK_QUEUE_VIDEO_DECODE_BIT_KHR,
     eVideoEncodeKHR = VK_QUEUE_VIDEO_ENCODE_BIT_KHR,
-    eOpticalFlowNV  = VK_QUEUE_OPTICAL_FLOW_BIT_NV,
-    eDataGraphARM   = VK_QUEUE_DATA_GRAPH_BIT_ARM
+    eOpticalFlowNV  = VK_QUEUE_OPTICAL_FLOW_BIT_NV
   };
 
-  // wrapper using for bitmask VkQueueFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFlags.html
   using QueueFlags = Flags<QueueFlagBits>;
 
   template <>
   struct FlagTraits<QueueFlagBits>
   {
-    using WrappedType                                         = VkQueueFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR QueueFlags allFlags  = QueueFlagBits::eGraphics | QueueFlagBits::eCompute | QueueFlagBits::eTransfer |
                                                                QueueFlagBits::eSparseBinding | QueueFlagBits::eProtected | QueueFlagBits::eVideoDecodeKHR |
-                                                               QueueFlagBits::eVideoEncodeKHR | QueueFlagBits::eOpticalFlowNV | QueueFlagBits::eDataGraphARM;
+                                                               QueueFlagBits::eVideoEncodeKHR | QueueFlagBits::eOpticalFlowNV;
   };
 
-  // wrapper class for enum VkSampleCountFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampleCountFlagBits.html
   enum class SampleCountFlagBits : VkSampleCountFlags
   {
     e1  = VK_SAMPLE_COUNT_1_BIT,
@@ -2482,20 +2082,17 @@ namespace VULKAN_HPP_NAMESPACE
     e64 = VK_SAMPLE_COUNT_64_BIT
   };
 
-  // wrapper using for bitmask VkSampleCountFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampleCountFlags.html
   using SampleCountFlags = Flags<SampleCountFlagBits>;
 
   template <>
   struct FlagTraits<SampleCountFlagBits>
   {
-    using WrappedType                                               = VkSampleCountFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SampleCountFlags allFlags  = SampleCountFlagBits::e1 | SampleCountFlagBits::e2 | SampleCountFlagBits::e4 |
                                                                      SampleCountFlagBits::e8 | SampleCountFlagBits::e16 | SampleCountFlagBits::e32 |
                                                                      SampleCountFlagBits::e64;
   };
 
-  // wrapper class for enum VkSystemAllocationScope, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSystemAllocationScope.html
   enum class SystemAllocationScope
   {
     eCommand  = VK_SYSTEM_ALLOCATION_SCOPE_COMMAND,
@@ -2509,7 +2106,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDeviceCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceCreateFlags.html
   using DeviceCreateFlags = Flags<DeviceCreateFlagBits>;
 
   template <>
@@ -2519,24 +2115,20 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR DeviceCreateFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkDeviceQueueCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueCreateFlagBits.html
   enum class DeviceQueueCreateFlagBits : VkDeviceQueueCreateFlags
   {
     eProtected = VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT
   };
 
-  // wrapper using for bitmask VkDeviceQueueCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueCreateFlags.html
   using DeviceQueueCreateFlags = Flags<DeviceQueueCreateFlagBits>;
 
   template <>
   struct FlagTraits<DeviceQueueCreateFlagBits>
   {
-    using WrappedType                                                     = VkDeviceQueueCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DeviceQueueCreateFlags allFlags  = DeviceQueueCreateFlagBits::eProtected;
   };
 
-  // wrapper class for enum VkPipelineStageFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineStageFlagBits.html
   enum class PipelineStageFlagBits : VkPipelineStageFlags
   {
     eTopOfPipe                        = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@@ -2567,21 +2159,18 @@ namespace VULKAN_HPP_NAMESPACE
     eFragmentDensityProcessEXT        = VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT,
     eFragmentShadingRateAttachmentKHR = VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
     eShadingRateImageNV               = VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV,
+    eCommandPreprocessNV              = VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV,
     eTaskShaderEXT                    = VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT,
     eTaskShaderNV                     = VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV,
     eMeshShaderEXT                    = VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT,
-    eMeshShaderNV                     = VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV,
-    eCommandPreprocessEXT             = VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT,
-    eCommandPreprocessNV              = VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV
+    eMeshShaderNV                     = VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV
   };
 
-  // wrapper using for bitmask VkPipelineStageFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineStageFlags.html
   using PipelineStageFlags = Flags<PipelineStageFlagBits>;
 
   template <>
   struct FlagTraits<PipelineStageFlagBits>
   {
-    using WrappedType                                                 = VkPipelineStageFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineStageFlags allFlags =
       PipelineStageFlagBits::eTopOfPipe | PipelineStageFlagBits::eDrawIndirect | PipelineStageFlagBits::eVertexInput | PipelineStageFlagBits::eVertexShader |
@@ -2591,28 +2180,24 @@ namespace VULKAN_HPP_NAMESPACE
       PipelineStageFlagBits::eBottomOfPipe | PipelineStageFlagBits::eHost | PipelineStageFlagBits::eAllGraphics | PipelineStageFlagBits::eAllCommands |
       PipelineStageFlagBits::eNone | PipelineStageFlagBits::eTransformFeedbackEXT | PipelineStageFlagBits::eConditionalRenderingEXT |
       PipelineStageFlagBits::eAccelerationStructureBuildKHR | PipelineStageFlagBits::eRayTracingShaderKHR | PipelineStageFlagBits::eFragmentDensityProcessEXT |
-      PipelineStageFlagBits::eFragmentShadingRateAttachmentKHR | PipelineStageFlagBits::eTaskShaderEXT | PipelineStageFlagBits::eMeshShaderEXT |
-      PipelineStageFlagBits::eCommandPreprocessEXT;
+      PipelineStageFlagBits::eFragmentShadingRateAttachmentKHR | PipelineStageFlagBits::eCommandPreprocessNV | PipelineStageFlagBits::eTaskShaderEXT |
+      PipelineStageFlagBits::eMeshShaderEXT;
   };
 
-  // wrapper class for enum VkMemoryMapFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryMapFlagBits.html
   enum class MemoryMapFlagBits : VkMemoryMapFlags
   {
     ePlacedEXT = VK_MEMORY_MAP_PLACED_BIT_EXT
   };
 
-  // wrapper using for bitmask VkMemoryMapFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryMapFlags.html
   using MemoryMapFlags = Flags<MemoryMapFlagBits>;
 
   template <>
   struct FlagTraits<MemoryMapFlagBits>
   {
-    using WrappedType                                             = VkMemoryMapFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryMapFlags allFlags  = MemoryMapFlagBits::ePlacedEXT;
   };
 
-  // wrapper class for enum VkImageAspectFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageAspectFlagBits.html
   enum class ImageAspectFlagBits : VkImageAspectFlags
   {
     eColor           = VK_IMAGE_ASPECT_COLOR_BIT,
@@ -2633,13 +2218,11 @@ namespace VULKAN_HPP_NAMESPACE
     eMemoryPlane3EXT = VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT
   };
 
-  // wrapper using for bitmask VkImageAspectFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageAspectFlags.html
   using ImageAspectFlags = Flags<ImageAspectFlagBits>;
 
   template <>
   struct FlagTraits<ImageAspectFlagBits>
   {
-    using WrappedType                                               = VkImageAspectFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageAspectFlags allFlags = ImageAspectFlagBits::eColor | ImageAspectFlagBits::eDepth | ImageAspectFlagBits::eStencil |
                                                                      ImageAspectFlagBits::eMetadata | ImageAspectFlagBits::ePlane0 |
@@ -2648,7 +2231,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      ImageAspectFlagBits::eMemoryPlane2EXT | ImageAspectFlagBits::eMemoryPlane3EXT;
   };
 
-  // wrapper class for enum VkSparseImageFormatFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageFormatFlagBits.html
   enum class SparseImageFormatFlagBits : VkSparseImageFormatFlags
   {
     eSingleMiptail        = VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT,
@@ -2656,48 +2238,40 @@ namespace VULKAN_HPP_NAMESPACE
     eNonstandardBlockSize = VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT
   };
 
-  // wrapper using for bitmask VkSparseImageFormatFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageFormatFlags.html
   using SparseImageFormatFlags = Flags<SparseImageFormatFlagBits>;
 
   template <>
   struct FlagTraits<SparseImageFormatFlagBits>
   {
-    using WrappedType                                                     = VkSparseImageFormatFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SparseImageFormatFlags allFlags =
       SparseImageFormatFlagBits::eSingleMiptail | SparseImageFormatFlagBits::eAlignedMipSize | SparseImageFormatFlagBits::eNonstandardBlockSize;
   };
 
-  // wrapper class for enum VkSparseMemoryBindFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseMemoryBindFlagBits.html
   enum class SparseMemoryBindFlagBits : VkSparseMemoryBindFlags
   {
     eMetadata = VK_SPARSE_MEMORY_BIND_METADATA_BIT
   };
 
-  // wrapper using for bitmask VkSparseMemoryBindFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseMemoryBindFlags.html
   using SparseMemoryBindFlags = Flags<SparseMemoryBindFlagBits>;
 
   template <>
   struct FlagTraits<SparseMemoryBindFlagBits>
   {
-    using WrappedType                                                    = VkSparseMemoryBindFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SparseMemoryBindFlags allFlags  = SparseMemoryBindFlagBits::eMetadata;
   };
 
-  // wrapper class for enum VkFenceCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceCreateFlagBits.html
   enum class FenceCreateFlagBits : VkFenceCreateFlags
   {
     eSignaled = VK_FENCE_CREATE_SIGNALED_BIT
   };
 
-  // wrapper using for bitmask VkFenceCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceCreateFlags.html
   using FenceCreateFlags = Flags<FenceCreateFlagBits>;
 
   template <>
   struct FlagTraits<FenceCreateFlagBits>
   {
-    using WrappedType                                               = VkFenceCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FenceCreateFlags allFlags  = FenceCreateFlagBits::eSignaled;
   };
@@ -2706,7 +2280,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkSemaphoreCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreCreateFlags.html
   using SemaphoreCreateFlags = Flags<SemaphoreCreateFlagBits>;
 
   template <>
@@ -2716,24 +2289,55 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR SemaphoreCreateFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkQueryPoolCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolCreateFlagBits.html
-  enum class QueryPoolCreateFlagBits : VkQueryPoolCreateFlags
+  enum class EventCreateFlagBits : VkEventCreateFlags
   {
-    eResetKHR = VK_QUERY_POOL_CREATE_RESET_BIT_KHR
+    eDeviceOnly    = VK_EVENT_CREATE_DEVICE_ONLY_BIT,
+    eDeviceOnlyKHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR
   };
 
-  // wrapper using for bitmask VkQueryPoolCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolCreateFlags.html
-  using QueryPoolCreateFlags = Flags<QueryPoolCreateFlagBits>;
+  using EventCreateFlags = Flags<EventCreateFlagBits>;
 
   template <>
-  struct FlagTraits<QueryPoolCreateFlagBits>
+  struct FlagTraits<EventCreateFlagBits>
   {
-    using WrappedType                                                   = VkQueryPoolCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryPoolCreateFlags allFlags  = QueryPoolCreateFlagBits::eResetKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR EventCreateFlags allFlags  = EventCreateFlagBits::eDeviceOnly;
+  };
+
+  enum class QueryPipelineStatisticFlagBits : VkQueryPipelineStatisticFlags
+  {
+    eInputAssemblyVertices                   = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT,
+    eInputAssemblyPrimitives                 = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT,
+    eVertexShaderInvocations                 = VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT,
+    eGeometryShaderInvocations               = VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT,
+    eGeometryShaderPrimitives                = VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT,
+    eClippingInvocations                     = VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT,
+    eClippingPrimitives                      = VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT,
+    eFragmentShaderInvocations               = VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT,
+    eTessellationControlShaderPatches        = VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT,
+    eTessellationEvaluationShaderInvocations = VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT,
+    eComputeShaderInvocations                = VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT,
+    eTaskShaderInvocationsEXT                = VK_QUERY_PIPELINE_STATISTIC_TASK_SHADER_INVOCATIONS_BIT_EXT,
+    eMeshShaderInvocationsEXT                = VK_QUERY_PIPELINE_STATISTIC_MESH_SHADER_INVOCATIONS_BIT_EXT,
+    eClusterCullingShaderInvocationsHUAWEI   = VK_QUERY_PIPELINE_STATISTIC_CLUSTER_CULLING_SHADER_INVOCATIONS_BIT_HUAWEI
+  };
+
+  using QueryPipelineStatisticFlags = Flags<QueryPipelineStatisticFlagBits>;
+
+  template <>
+  struct FlagTraits<QueryPipelineStatisticFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                        isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryPipelineStatisticFlags allFlags =
+      QueryPipelineStatisticFlagBits::eInputAssemblyVertices | QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives |
+      QueryPipelineStatisticFlagBits::eVertexShaderInvocations | QueryPipelineStatisticFlagBits::eGeometryShaderInvocations |
+      QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives | QueryPipelineStatisticFlagBits::eClippingInvocations |
+      QueryPipelineStatisticFlagBits::eClippingPrimitives | QueryPipelineStatisticFlagBits::eFragmentShaderInvocations |
+      QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches | QueryPipelineStatisticFlagBits::eTessellationEvaluationShaderInvocations |
+      QueryPipelineStatisticFlagBits::eComputeShaderInvocations | QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT |
+      QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT | QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI;
   };
 
-  // wrapper class for enum VkQueryResultFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryResultFlagBits.html
   enum class QueryResultFlagBits : VkQueryResultFlags
   {
     e64               = VK_QUERY_RESULT_64_BIT,
@@ -2743,20 +2347,17 @@ namespace VULKAN_HPP_NAMESPACE
     eWithStatusKHR    = VK_QUERY_RESULT_WITH_STATUS_BIT_KHR
   };
 
-  // wrapper using for bitmask VkQueryResultFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryResultFlags.html
   using QueryResultFlags = Flags<QueryResultFlagBits>;
 
   template <>
   struct FlagTraits<QueryResultFlagBits>
   {
-    using WrappedType                                               = VkQueryResultFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR QueryResultFlags allFlags  = QueryResultFlagBits::e64 | QueryResultFlagBits::eWait |
                                                                      QueryResultFlagBits::eWithAvailability | QueryResultFlagBits::ePartial |
                                                                      QueryResultFlagBits::eWithStatusKHR;
   };
 
-  // wrapper class for enum VkQueryType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryType.html
   enum class QueryType
   {
     eOcclusion                                                = VK_QUERY_TYPE_OCCLUSION,
@@ -2778,7 +2379,19 @@ namespace VULKAN_HPP_NAMESPACE
     eMicromapCompactedSizeEXT                                 = VK_QUERY_TYPE_MICROMAP_COMPACTED_SIZE_EXT
   };
 
-  // wrapper class for enum VkBufferCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCreateFlagBits.html
+  enum class QueryPoolCreateFlagBits : VkQueryPoolCreateFlags
+  {
+  };
+
+  using QueryPoolCreateFlags = Flags<QueryPoolCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<QueryPoolCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryPoolCreateFlags allFlags  = {};
+  };
+
   enum class BufferCreateFlagBits : VkBufferCreateFlags
   {
     eSparseBinding                    = VK_BUFFER_CREATE_SPARSE_BINDING_BIT,
@@ -2792,13 +2405,11 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoProfileIndependentKHR       = VK_BUFFER_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR
   };
 
-  // wrapper using for bitmask VkBufferCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCreateFlags.html
   using BufferCreateFlags = Flags<BufferCreateFlagBits>;
 
   template <>
   struct FlagTraits<BufferCreateFlagBits>
   {
-    using WrappedType                                                = VkBufferCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool              isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR BufferCreateFlags allFlags =
       BufferCreateFlagBits::eSparseBinding | BufferCreateFlagBits::eSparseResidency | BufferCreateFlagBits::eSparseAliased | BufferCreateFlagBits::eProtected |
@@ -2806,7 +2417,6 @@ namespace VULKAN_HPP_NAMESPACE
       BufferCreateFlagBits::eVideoProfileIndependentKHR;
   };
 
-  // wrapper class for enum VkBufferUsageFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferUsageFlagBits.html
   enum class BufferUsageFlagBits : VkBufferUsageFlags
   {
     eTransferSrc                       = VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
@@ -2839,17 +2449,14 @@ namespace VULKAN_HPP_NAMESPACE
     eResourceDescriptorBufferEXT                = VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
     ePushDescriptorsDescriptorBufferEXT         = VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT,
     eMicromapBuildInputReadOnlyEXT              = VK_BUFFER_USAGE_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT,
-    eMicromapStorageEXT                         = VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT,
-    eTileMemoryQCOM                             = VK_BUFFER_USAGE_TILE_MEMORY_BIT_QCOM
+    eMicromapStorageEXT                         = VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT
   };
 
-  // wrapper using for bitmask VkBufferUsageFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferUsageFlags.html
   using BufferUsageFlags = Flags<BufferUsageFlagBits>;
 
   template <>
   struct FlagTraits<BufferUsageFlagBits>
   {
-    using WrappedType                                               = VkBufferUsageFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR BufferUsageFlags allFlags =
       BufferUsageFlagBits::eTransferSrc | BufferUsageFlagBits::eTransferDst | BufferUsageFlagBits::eUniformTexelBuffer |
@@ -2863,18 +2470,28 @@ namespace VULKAN_HPP_NAMESPACE
       | BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR | BufferUsageFlagBits::eAccelerationStructureStorageKHR |
       BufferUsageFlagBits::eShaderBindingTableKHR | BufferUsageFlagBits::eVideoEncodeDstKHR | BufferUsageFlagBits::eVideoEncodeSrcKHR |
       BufferUsageFlagBits::eSamplerDescriptorBufferEXT | BufferUsageFlagBits::eResourceDescriptorBufferEXT |
-      BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT | BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT |
-      BufferUsageFlagBits::eMicromapStorageEXT | BufferUsageFlagBits::eTileMemoryQCOM;
+      BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT | BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT | BufferUsageFlagBits::eMicromapStorageEXT;
   };
 
-  // wrapper class for enum VkSharingMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSharingMode.html
   enum class SharingMode
   {
     eExclusive  = VK_SHARING_MODE_EXCLUSIVE,
     eConcurrent = VK_SHARING_MODE_CONCURRENT
   };
 
-  // wrapper class for enum VkImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageLayout.html
+  enum class BufferViewCreateFlagBits : VkBufferViewCreateFlags
+  {
+  };
+
+  using BufferViewCreateFlags = Flags<BufferViewCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<BufferViewCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR BufferViewCreateFlags allFlags  = {};
+  };
+
   enum class ImageLayout
   {
     eUndefined                                = VK_IMAGE_LAYOUT_UNDEFINED,
@@ -2902,8 +2519,6 @@ namespace VULKAN_HPP_NAMESPACE
     eReadOnlyOptimalKHR                       = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR,
     eAttachmentOptimal                        = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL,
     eAttachmentOptimalKHR                     = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR,
-    eRenderingLocalRead                       = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ,
-    eRenderingLocalReadKHR                    = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR,
     ePresentSrcKHR                            = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
     eVideoDecodeDstKHR                        = VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR,
     eVideoDecodeSrcKHR                        = VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR,
@@ -2912,16 +2527,13 @@ namespace VULKAN_HPP_NAMESPACE
     eFragmentDensityMapOptimalEXT             = VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT,
     eFragmentShadingRateAttachmentOptimalKHR  = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR,
     eShadingRateOptimalNV                     = VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV,
+    eRenderingLocalReadKHR                    = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR,
     eVideoEncodeDstKHR                        = VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR,
     eVideoEncodeSrcKHR                        = VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR,
     eVideoEncodeDpbKHR                        = VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR,
-    eAttachmentFeedbackLoopOptimalEXT         = VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT,
-    eTensorAliasingARM                        = VK_IMAGE_LAYOUT_TENSOR_ALIASING_ARM,
-    eVideoEncodeQuantizationMapKHR            = VK_IMAGE_LAYOUT_VIDEO_ENCODE_QUANTIZATION_MAP_KHR,
-    eZeroInitializedEXT                       = VK_IMAGE_LAYOUT_ZERO_INITIALIZED_EXT
+    eAttachmentFeedbackLoopOptimalEXT         = VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT
   };
 
-  // wrapper class for enum VkComponentSwizzle, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkComponentSwizzle.html
   enum class ComponentSwizzle
   {
     eIdentity = VK_COMPONENT_SWIZZLE_IDENTITY,
@@ -2933,7 +2545,6 @@ namespace VULKAN_HPP_NAMESPACE
     eA        = VK_COMPONENT_SWIZZLE_A
   };
 
-  // wrapper class for enum VkImageViewCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewCreateFlagBits.html
   enum class ImageViewCreateFlagBits : VkImageViewCreateFlags
   {
     eFragmentDensityMapDynamicEXT     = VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DYNAMIC_BIT_EXT,
@@ -2941,20 +2552,17 @@ namespace VULKAN_HPP_NAMESPACE
     eFragmentDensityMapDeferredEXT    = VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DEFERRED_BIT_EXT
   };
 
-  // wrapper using for bitmask VkImageViewCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewCreateFlags.html
   using ImageViewCreateFlags = Flags<ImageViewCreateFlagBits>;
 
   template <>
   struct FlagTraits<ImageViewCreateFlagBits>
   {
-    using WrappedType                                                   = VkImageViewCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageViewCreateFlags allFlags  = ImageViewCreateFlagBits::eFragmentDensityMapDynamicEXT |
                                                                          ImageViewCreateFlagBits::eDescriptorBufferCaptureReplayEXT |
                                                                          ImageViewCreateFlagBits::eFragmentDensityMapDeferredEXT;
   };
 
-  // wrapper class for enum VkImageViewType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewType.html
   enum class ImageViewType
   {
     e1D        = VK_IMAGE_VIEW_TYPE_1D,
@@ -2966,290 +2574,10 @@ namespace VULKAN_HPP_NAMESPACE
     eCubeArray = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY
   };
 
-  // wrapper class for enum VkAccessFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlagBits.html
-  enum class AccessFlagBits : VkAccessFlags
-  {
-    eIndirectCommandRead                  = VK_ACCESS_INDIRECT_COMMAND_READ_BIT,
-    eIndexRead                            = VK_ACCESS_INDEX_READ_BIT,
-    eVertexAttributeRead                  = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
-    eUniformRead                          = VK_ACCESS_UNIFORM_READ_BIT,
-    eInputAttachmentRead                  = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
-    eShaderRead                           = VK_ACCESS_SHADER_READ_BIT,
-    eShaderWrite                          = VK_ACCESS_SHADER_WRITE_BIT,
-    eColorAttachmentRead                  = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT,
-    eColorAttachmentWrite                 = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-    eDepthStencilAttachmentRead           = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
-    eDepthStencilAttachmentWrite          = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-    eTransferRead                         = VK_ACCESS_TRANSFER_READ_BIT,
-    eTransferWrite                        = VK_ACCESS_TRANSFER_WRITE_BIT,
-    eHostRead                             = VK_ACCESS_HOST_READ_BIT,
-    eHostWrite                            = VK_ACCESS_HOST_WRITE_BIT,
-    eMemoryRead                           = VK_ACCESS_MEMORY_READ_BIT,
-    eMemoryWrite                          = VK_ACCESS_MEMORY_WRITE_BIT,
-    eNone                                 = VK_ACCESS_NONE,
-    eNoneKHR                              = VK_ACCESS_NONE_KHR,
-    eTransformFeedbackWriteEXT            = VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT,
-    eTransformFeedbackCounterReadEXT      = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT,
-    eTransformFeedbackCounterWriteEXT     = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
-    eConditionalRenderingReadEXT          = VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT,
-    eColorAttachmentReadNoncoherentEXT    = VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT,
-    eAccelerationStructureReadKHR         = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR,
-    eAccelerationStructureReadNV          = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV,
-    eAccelerationStructureWriteKHR        = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR,
-    eAccelerationStructureWriteNV         = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV,
-    eFragmentDensityMapReadEXT            = VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT,
-    eFragmentShadingRateAttachmentReadKHR = VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR,
-    eShadingRateImageReadNV               = VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV,
-    eCommandPreprocessReadEXT             = VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT,
-    eCommandPreprocessReadNV              = VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV,
-    eCommandPreprocessWriteEXT            = VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT,
-    eCommandPreprocessWriteNV             = VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV
-  };
-
-  // wrapper using for bitmask VkAccessFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlags.html
-  using AccessFlags = Flags<AccessFlagBits>;
-
-  template <>
-  struct FlagTraits<AccessFlagBits>
-  {
-    using WrappedType                                          = VkAccessFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool        isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR AccessFlags allFlags =
-      AccessFlagBits::eIndirectCommandRead | AccessFlagBits::eIndexRead | AccessFlagBits::eVertexAttributeRead | AccessFlagBits::eUniformRead |
-      AccessFlagBits::eInputAttachmentRead | AccessFlagBits::eShaderRead | AccessFlagBits::eShaderWrite | AccessFlagBits::eColorAttachmentRead |
-      AccessFlagBits::eColorAttachmentWrite | AccessFlagBits::eDepthStencilAttachmentRead | AccessFlagBits::eDepthStencilAttachmentWrite |
-      AccessFlagBits::eTransferRead | AccessFlagBits::eTransferWrite | AccessFlagBits::eHostRead | AccessFlagBits::eHostWrite | AccessFlagBits::eMemoryRead |
-      AccessFlagBits::eMemoryWrite | AccessFlagBits::eNone | AccessFlagBits::eTransformFeedbackWriteEXT | AccessFlagBits::eTransformFeedbackCounterReadEXT |
-      AccessFlagBits::eTransformFeedbackCounterWriteEXT | AccessFlagBits::eConditionalRenderingReadEXT | AccessFlagBits::eColorAttachmentReadNoncoherentEXT |
-      AccessFlagBits::eAccelerationStructureReadKHR | AccessFlagBits::eAccelerationStructureWriteKHR | AccessFlagBits::eFragmentDensityMapReadEXT |
-      AccessFlagBits::eFragmentShadingRateAttachmentReadKHR | AccessFlagBits::eCommandPreprocessReadEXT | AccessFlagBits::eCommandPreprocessWriteEXT;
-  };
-
-  // wrapper class for enum VkDependencyFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDependencyFlagBits.html
-  enum class DependencyFlagBits : VkDependencyFlags
-  {
-    eByRegion                                    = VK_DEPENDENCY_BY_REGION_BIT,
-    eDeviceGroup                                 = VK_DEPENDENCY_DEVICE_GROUP_BIT,
-    eDeviceGroupKHR                              = VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR,
-    eViewLocal                                   = VK_DEPENDENCY_VIEW_LOCAL_BIT,
-    eViewLocalKHR                                = VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR,
-    eFeedbackLoopEXT                             = VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT,
-    eQueueFamilyOwnershipTransferUseAllStagesKHR = VK_DEPENDENCY_QUEUE_FAMILY_OWNERSHIP_TRANSFER_USE_ALL_STAGES_BIT_KHR,
-    eAsymmetricEventKHR                          = VK_DEPENDENCY_ASYMMETRIC_EVENT_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkDependencyFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDependencyFlags.html
-  using DependencyFlags = Flags<DependencyFlagBits>;
-
-  template <>
-  struct FlagTraits<DependencyFlagBits>
-  {
-    using WrappedType                                              = VkDependencyFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool            isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DependencyFlags allFlags =
-      DependencyFlagBits::eByRegion | DependencyFlagBits::eDeviceGroup | DependencyFlagBits::eViewLocal | DependencyFlagBits::eFeedbackLoopEXT |
-      DependencyFlagBits::eQueueFamilyOwnershipTransferUseAllStagesKHR | DependencyFlagBits::eAsymmetricEventKHR;
-  };
-
-  // wrapper class for enum VkCommandPoolCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolCreateFlagBits.html
-  enum class CommandPoolCreateFlagBits : VkCommandPoolCreateFlags
-  {
-    eTransient          = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT,
-    eResetCommandBuffer = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,
-    eProtected          = VK_COMMAND_POOL_CREATE_PROTECTED_BIT
-  };
-
-  // wrapper using for bitmask VkCommandPoolCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolCreateFlags.html
-  using CommandPoolCreateFlags = Flags<CommandPoolCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<CommandPoolCreateFlagBits>
-  {
-    using WrappedType                                                     = VkCommandPoolCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandPoolCreateFlags allFlags =
-      CommandPoolCreateFlagBits::eTransient | CommandPoolCreateFlagBits::eResetCommandBuffer | CommandPoolCreateFlagBits::eProtected;
-  };
-
-  // wrapper class for enum VkCommandPoolResetFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolResetFlagBits.html
-  enum class CommandPoolResetFlagBits : VkCommandPoolResetFlags
-  {
-    eReleaseResources = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT
-  };
-
-  // wrapper using for bitmask VkCommandPoolResetFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolResetFlags.html
-  using CommandPoolResetFlags = Flags<CommandPoolResetFlagBits>;
-
-  template <>
-  struct FlagTraits<CommandPoolResetFlagBits>
-  {
-    using WrappedType                                                    = VkCommandPoolResetFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandPoolResetFlags allFlags  = CommandPoolResetFlagBits::eReleaseResources;
-  };
-
-  // wrapper class for enum VkCommandBufferLevel, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferLevel.html
-  enum class CommandBufferLevel
-  {
-    ePrimary   = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
-    eSecondary = VK_COMMAND_BUFFER_LEVEL_SECONDARY
-  };
-
-  // wrapper class for enum VkCommandBufferResetFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferResetFlagBits.html
-  enum class CommandBufferResetFlagBits : VkCommandBufferResetFlags
-  {
-    eReleaseResources = VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT
-  };
-
-  // wrapper using for bitmask VkCommandBufferResetFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferResetFlags.html
-  using CommandBufferResetFlags = Flags<CommandBufferResetFlagBits>;
-
-  template <>
-  struct FlagTraits<CommandBufferResetFlagBits>
-  {
-    using WrappedType                                                      = VkCommandBufferResetFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandBufferResetFlags allFlags  = CommandBufferResetFlagBits::eReleaseResources;
-  };
-
-  // wrapper class for enum VkCommandBufferUsageFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferUsageFlagBits.html
-  enum class CommandBufferUsageFlagBits : VkCommandBufferUsageFlags
-  {
-    eOneTimeSubmit      = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
-    eRenderPassContinue = VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT,
-    eSimultaneousUse    = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT
-  };
-
-  // wrapper using for bitmask VkCommandBufferUsageFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferUsageFlags.html
-  using CommandBufferUsageFlags = Flags<CommandBufferUsageFlagBits>;
-
-  template <>
-  struct FlagTraits<CommandBufferUsageFlagBits>
-  {
-    using WrappedType                                                      = VkCommandBufferUsageFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandBufferUsageFlags allFlags =
-      CommandBufferUsageFlagBits::eOneTimeSubmit | CommandBufferUsageFlagBits::eRenderPassContinue | CommandBufferUsageFlagBits::eSimultaneousUse;
-  };
-
-  // wrapper class for enum VkQueryControlFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryControlFlagBits.html
-  enum class QueryControlFlagBits : VkQueryControlFlags
-  {
-    ePrecise = VK_QUERY_CONTROL_PRECISE_BIT
-  };
-
-  // wrapper using for bitmask VkQueryControlFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryControlFlags.html
-  using QueryControlFlags = Flags<QueryControlFlagBits>;
-
-  template <>
-  struct FlagTraits<QueryControlFlagBits>
-  {
-    using WrappedType                                                = VkQueryControlFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryControlFlags allFlags  = QueryControlFlagBits::ePrecise;
-  };
-
-  // wrapper class for enum VkIndexType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndexType.html
-  enum class IndexType
-  {
-    eUint16   = VK_INDEX_TYPE_UINT16,
-    eUint32   = VK_INDEX_TYPE_UINT32,
-    eUint8    = VK_INDEX_TYPE_UINT8,
-    eUint8EXT = VK_INDEX_TYPE_UINT8_EXT,
-    eUint8KHR = VK_INDEX_TYPE_UINT8_KHR,
-    eNoneKHR  = VK_INDEX_TYPE_NONE_KHR,
-    eNoneNV   = VK_INDEX_TYPE_NONE_NV
-  };
-
-  //=========================
-  //=== Index Type Traits ===
-  //=========================
-
-  template <typename T>
-  struct IndexTypeValue
-  {
-  };
-
-  template <>
-  struct IndexTypeValue<uint16_t>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint16;
-  };
-
-  template <>
-  struct CppType<IndexType, IndexType::eUint16>
-  {
-    using Type = uint16_t;
-  };
-
-  template <>
-  struct IndexTypeValue<uint32_t>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint32;
-  };
-
-  template <>
-  struct CppType<IndexType, IndexType::eUint32>
-  {
-    using Type = uint32_t;
-  };
-
-  template <>
-  struct IndexTypeValue<uint8_t>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint8;
-  };
-
-  template <>
-  struct CppType<IndexType, IndexType::eUint8>
-  {
-    using Type = uint8_t;
-  };
-
-  // wrapper class for enum VkPipelineCacheHeaderVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheHeaderVersion.html
-  enum class PipelineCacheHeaderVersion
-  {
-    eOne           = VK_PIPELINE_CACHE_HEADER_VERSION_ONE,
-    eDataGraphQCOM = VK_PIPELINE_CACHE_HEADER_VERSION_DATA_GRAPH_QCOM
-  };
-
-  // wrapper class for enum VkEventCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkEventCreateFlagBits.html
-  enum class EventCreateFlagBits : VkEventCreateFlags
-  {
-    eDeviceOnly    = VK_EVENT_CREATE_DEVICE_ONLY_BIT,
-    eDeviceOnlyKHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkEventCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkEventCreateFlags.html
-  using EventCreateFlags = Flags<EventCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<EventCreateFlagBits>
-  {
-    using WrappedType                                               = VkEventCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR EventCreateFlags allFlags  = EventCreateFlagBits::eDeviceOnly;
-  };
-
-  enum class BufferViewCreateFlagBits : VkBufferViewCreateFlags
-  {
-  };
-
-  // wrapper using for bitmask VkBufferViewCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferViewCreateFlags.html
-  using BufferViewCreateFlags = Flags<BufferViewCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<BufferViewCreateFlagBits>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR BufferViewCreateFlags allFlags  = {};
-  };
-
   enum class ShaderModuleCreateFlagBits : VkShaderModuleCreateFlags
   {
   };
 
-  // wrapper using for bitmask VkShaderModuleCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModuleCreateFlags.html
   using ShaderModuleCreateFlags = Flags<ShaderModuleCreateFlagBits>;
 
   template <>
@@ -3259,400 +2587,21 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR ShaderModuleCreateFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkPipelineCacheCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheCreateFlagBits.html
   enum class PipelineCacheCreateFlagBits : VkPipelineCacheCreateFlags
   {
-    eExternallySynchronized         = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT,
-    eExternallySynchronizedEXT      = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT,
-    eInternallySynchronizedMergeKHR = VK_PIPELINE_CACHE_CREATE_INTERNALLY_SYNCHRONIZED_MERGE_BIT_KHR
+    eExternallySynchronized    = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT,
+    eExternallySynchronizedEXT = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT
   };
 
-  // wrapper using for bitmask VkPipelineCacheCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheCreateFlags.html
   using PipelineCacheCreateFlags = Flags<PipelineCacheCreateFlagBits>;
 
   template <>
   struct FlagTraits<PipelineCacheCreateFlagBits>
   {
-    using WrappedType                                                       = VkPipelineCacheCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCacheCreateFlags allFlags =
-      PipelineCacheCreateFlagBits::eExternallySynchronized | PipelineCacheCreateFlagBits::eInternallySynchronizedMergeKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCacheCreateFlags allFlags  = PipelineCacheCreateFlagBits::eExternallySynchronized;
   };
 
-  // wrapper class for enum VkPipelineCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateFlagBits.html
-  enum class PipelineCreateFlagBits : VkPipelineCreateFlags
-  {
-    eDisableOptimization                                                = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
-    eAllowDerivatives                                                   = VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT,
-    eDerivative                                                         = VK_PIPELINE_CREATE_DERIVATIVE_BIT,
-    eDispatchBase                                                       = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT,
-    eDispatchBaseKHR                                                    = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT_KHR,
-    eViewIndexFromDeviceIndex                                           = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT,
-    eViewIndexFromDeviceIndexKHR                                        = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR,
-    eFailOnPipelineCompileRequired                                      = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT,
-    eFailOnPipelineCompileRequiredEXT                                   = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT,
-    eEarlyReturnOnFailure                                               = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT,
-    eEarlyReturnOnFailureEXT                                            = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT,
-    eNoProtectedAccess                                                  = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT,
-    eNoProtectedAccessEXT                                               = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT,
-    eProtectedAccessOnly                                                = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT,
-    eProtectedAccessOnlyEXT                                             = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT,
-    eRayTracingNoNullAnyHitShadersKHR                                   = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR,
-    eRayTracingNoNullClosestHitShadersKHR                               = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR,
-    eRayTracingNoNullMissShadersKHR                                     = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR,
-    eRayTracingNoNullIntersectionShadersKHR                             = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR,
-    eRayTracingSkipTrianglesKHR                                         = VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR,
-    eRayTracingSkipAabbsKHR                                             = VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR,
-    eRayTracingShaderGroupHandleCaptureReplayKHR                        = VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR,
-    eDeferCompileNV                                                     = VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV,
-    eRenderingFragmentDensityMapAttachmentEXT                           = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
-    eVkPipelineRasterizationStateCreateFragmentDensityMapAttachmentEXT  = VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
-    eRenderingFragmentShadingRateAttachmentKHR                          = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
-    eVkPipelineRasterizationStateCreateFragmentShadingRateAttachmentKHR = VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
-    eCaptureStatisticsKHR                                               = VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR,
-    eCaptureInternalRepresentationsKHR                                  = VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR,
-    eIndirectBindableNV                                                 = VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV,
-    eLibraryKHR                                                         = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR,
-    eDescriptorBufferEXT                                                = VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT,
-    eRetainLinkTimeOptimizationInfoEXT                                  = VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT,
-    eLinkTimeOptimizationEXT                                            = VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT,
-    eRayTracingAllowMotionNV                                            = VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV,
-    eColorAttachmentFeedbackLoopEXT                                     = VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
-    eDepthStencilAttachmentFeedbackLoopEXT                              = VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
-    eRayTracingOpacityMicromapEXT                                       = VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eRayTracingDisplacementMicromapNV = VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-  };
-
-  // wrapper using for bitmask VkPipelineCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateFlags.html
-  using PipelineCreateFlags = Flags<PipelineCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<PipelineCreateFlagBits>
-  {
-    using WrappedType                                                  = VkPipelineCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreateFlags allFlags =
-      PipelineCreateFlagBits::eDisableOptimization | PipelineCreateFlagBits::eAllowDerivatives | PipelineCreateFlagBits::eDerivative |
-      PipelineCreateFlagBits::eDispatchBase | PipelineCreateFlagBits::eViewIndexFromDeviceIndex | PipelineCreateFlagBits::eFailOnPipelineCompileRequired |
-      PipelineCreateFlagBits::eEarlyReturnOnFailure | PipelineCreateFlagBits::eNoProtectedAccess | PipelineCreateFlagBits::eProtectedAccessOnly |
-      PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR | PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR |
-      PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR | PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR |
-      PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR | PipelineCreateFlagBits::eRayTracingSkipAabbsKHR |
-      PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR | PipelineCreateFlagBits::eDeferCompileNV |
-      PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT | PipelineCreateFlagBits::eRenderingFragmentShadingRateAttachmentKHR |
-      PipelineCreateFlagBits::eCaptureStatisticsKHR | PipelineCreateFlagBits::eCaptureInternalRepresentationsKHR | PipelineCreateFlagBits::eIndirectBindableNV |
-      PipelineCreateFlagBits::eLibraryKHR | PipelineCreateFlagBits::eDescriptorBufferEXT | PipelineCreateFlagBits::eRetainLinkTimeOptimizationInfoEXT |
-      PipelineCreateFlagBits::eLinkTimeOptimizationEXT | PipelineCreateFlagBits::eRayTracingAllowMotionNV |
-      PipelineCreateFlagBits::eColorAttachmentFeedbackLoopEXT | PipelineCreateFlagBits::eDepthStencilAttachmentFeedbackLoopEXT |
-      PipelineCreateFlagBits::eRayTracingOpacityMicromapEXT
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      | PipelineCreateFlagBits::eRayTracingDisplacementMicromapNV
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ;
-  };
-
-  // wrapper class for enum VkPipelineShaderStageCreateFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageCreateFlagBits.html
-  enum class PipelineShaderStageCreateFlagBits : VkPipelineShaderStageCreateFlags
-  {
-    eAllowVaryingSubgroupSize    = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT,
-    eAllowVaryingSubgroupSizeEXT = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT,
-    eRequireFullSubgroups        = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT,
-    eRequireFullSubgroupsEXT     = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkPipelineShaderStageCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageCreateFlags.html
-  using PipelineShaderStageCreateFlags = Flags<PipelineShaderStageCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<PipelineShaderStageCreateFlagBits>
-  {
-    using WrappedType                                                             = VkPipelineShaderStageCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineShaderStageCreateFlags allFlags =
-      PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize | PipelineShaderStageCreateFlagBits::eRequireFullSubgroups;
-  };
-
-  // wrapper class for enum VkShaderStageFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderStageFlagBits.html
-  enum class ShaderStageFlagBits : VkShaderStageFlags
-  {
-    eVertex                 = VK_SHADER_STAGE_VERTEX_BIT,
-    eTessellationControl    = VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
-    eTessellationEvaluation = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
-    eGeometry               = VK_SHADER_STAGE_GEOMETRY_BIT,
-    eFragment               = VK_SHADER_STAGE_FRAGMENT_BIT,
-    eCompute                = VK_SHADER_STAGE_COMPUTE_BIT,
-    eAllGraphics            = VK_SHADER_STAGE_ALL_GRAPHICS,
-    eAll                    = VK_SHADER_STAGE_ALL,
-    eRaygenKHR              = VK_SHADER_STAGE_RAYGEN_BIT_KHR,
-    eRaygenNV               = VK_SHADER_STAGE_RAYGEN_BIT_NV,
-    eAnyHitKHR              = VK_SHADER_STAGE_ANY_HIT_BIT_KHR,
-    eAnyHitNV               = VK_SHADER_STAGE_ANY_HIT_BIT_NV,
-    eClosestHitKHR          = VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
-    eClosestHitNV           = VK_SHADER_STAGE_CLOSEST_HIT_BIT_NV,
-    eMissKHR                = VK_SHADER_STAGE_MISS_BIT_KHR,
-    eMissNV                 = VK_SHADER_STAGE_MISS_BIT_NV,
-    eIntersectionKHR        = VK_SHADER_STAGE_INTERSECTION_BIT_KHR,
-    eIntersectionNV         = VK_SHADER_STAGE_INTERSECTION_BIT_NV,
-    eCallableKHR            = VK_SHADER_STAGE_CALLABLE_BIT_KHR,
-    eCallableNV             = VK_SHADER_STAGE_CALLABLE_BIT_NV,
-    eTaskEXT                = VK_SHADER_STAGE_TASK_BIT_EXT,
-    eTaskNV                 = VK_SHADER_STAGE_TASK_BIT_NV,
-    eMeshEXT                = VK_SHADER_STAGE_MESH_BIT_EXT,
-    eMeshNV                 = VK_SHADER_STAGE_MESH_BIT_NV,
-    eSubpassShadingHUAWEI   = VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI,
-    eClusterCullingHUAWEI   = VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI
-  };
-
-  // wrapper using for bitmask VkShaderStageFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderStageFlags.html
-  using ShaderStageFlags = Flags<ShaderStageFlagBits>;
-
-  template <>
-  struct FlagTraits<ShaderStageFlagBits>
-  {
-    using WrappedType                                               = VkShaderStageFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ShaderStageFlags allFlags =
-      ShaderStageFlagBits::eVertex | ShaderStageFlagBits::eTessellationControl | ShaderStageFlagBits::eTessellationEvaluation | ShaderStageFlagBits::eGeometry |
-      ShaderStageFlagBits::eFragment | ShaderStageFlagBits::eCompute | ShaderStageFlagBits::eAllGraphics | ShaderStageFlagBits::eAll |
-      ShaderStageFlagBits::eRaygenKHR | ShaderStageFlagBits::eAnyHitKHR | ShaderStageFlagBits::eClosestHitKHR | ShaderStageFlagBits::eMissKHR |
-      ShaderStageFlagBits::eIntersectionKHR | ShaderStageFlagBits::eCallableKHR | ShaderStageFlagBits::eTaskEXT | ShaderStageFlagBits::eMeshEXT |
-      ShaderStageFlagBits::eSubpassShadingHUAWEI | ShaderStageFlagBits::eClusterCullingHUAWEI;
-  };
-
-  // wrapper class for enum VkPipelineLayoutCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLayoutCreateFlagBits.html
-  enum class PipelineLayoutCreateFlagBits : VkPipelineLayoutCreateFlags
-  {
-    eIndependentSetsEXT = VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkPipelineLayoutCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLayoutCreateFlags.html
-  using PipelineLayoutCreateFlags = Flags<PipelineLayoutCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<PipelineLayoutCreateFlagBits>
-  {
-    using WrappedType                                                        = VkPipelineLayoutCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineLayoutCreateFlags allFlags  = PipelineLayoutCreateFlagBits::eIndependentSetsEXT;
-  };
-
-  // wrapper class for enum VkBorderColor, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBorderColor.html
-  enum class BorderColor
-  {
-    eFloatTransparentBlack = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK,
-    eIntTransparentBlack   = VK_BORDER_COLOR_INT_TRANSPARENT_BLACK,
-    eFloatOpaqueBlack      = VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK,
-    eIntOpaqueBlack        = VK_BORDER_COLOR_INT_OPAQUE_BLACK,
-    eFloatOpaqueWhite      = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE,
-    eIntOpaqueWhite        = VK_BORDER_COLOR_INT_OPAQUE_WHITE,
-    eFloatCustomEXT        = VK_BORDER_COLOR_FLOAT_CUSTOM_EXT,
-    eIntCustomEXT          = VK_BORDER_COLOR_INT_CUSTOM_EXT
-  };
-
-  // wrapper class for enum VkFilter, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFilter.html
-  enum class Filter
-  {
-    eNearest  = VK_FILTER_NEAREST,
-    eLinear   = VK_FILTER_LINEAR,
-    eCubicEXT = VK_FILTER_CUBIC_EXT,
-    eCubicIMG = VK_FILTER_CUBIC_IMG
-  };
-
-  // wrapper class for enum VkSamplerAddressMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerAddressMode.html
-  enum class SamplerAddressMode
-  {
-    eRepeat               = VK_SAMPLER_ADDRESS_MODE_REPEAT,
-    eMirroredRepeat       = VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT,
-    eClampToEdge          = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
-    eClampToBorder        = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
-    eMirrorClampToEdge    = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE,
-    eMirrorClampToEdgeKHR = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE_KHR
-  };
-
-  // wrapper class for enum VkSamplerCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCreateFlagBits.html
-  enum class SamplerCreateFlagBits : VkSamplerCreateFlags
-  {
-    eSubsampledEXT                     = VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT,
-    eSubsampledCoarseReconstructionEXT = VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT,
-    eDescriptorBufferCaptureReplayEXT  = VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT,
-    eNonSeamlessCubeMapEXT             = VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT,
-    eImageProcessingQCOM               = VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM
-  };
-
-  // wrapper using for bitmask VkSamplerCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCreateFlags.html
-  using SamplerCreateFlags = Flags<SamplerCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<SamplerCreateFlagBits>
-  {
-    using WrappedType                                                 = VkSamplerCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR SamplerCreateFlags allFlags =
-      SamplerCreateFlagBits::eSubsampledEXT | SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT |
-      SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT | SamplerCreateFlagBits::eNonSeamlessCubeMapEXT | SamplerCreateFlagBits::eImageProcessingQCOM;
-  };
-
-  // wrapper class for enum VkSamplerMipmapMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerMipmapMode.html
-  enum class SamplerMipmapMode
-  {
-    eNearest = VK_SAMPLER_MIPMAP_MODE_NEAREST,
-    eLinear  = VK_SAMPLER_MIPMAP_MODE_LINEAR
-  };
-
-  // wrapper class for enum VkDescriptorPoolCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolCreateFlagBits.html
-  enum class DescriptorPoolCreateFlagBits : VkDescriptorPoolCreateFlags
-  {
-    eFreeDescriptorSet          = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
-    eUpdateAfterBind            = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
-    eUpdateAfterBindEXT         = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT,
-    eHostOnlyEXT                = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT,
-    eHostOnlyVALVE              = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE,
-    eAllowOverallocationSetsNV  = VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV,
-    eAllowOverallocationPoolsNV = VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV
-  };
-
-  // wrapper using for bitmask VkDescriptorPoolCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolCreateFlags.html
-  using DescriptorPoolCreateFlags = Flags<DescriptorPoolCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<DescriptorPoolCreateFlagBits>
-  {
-    using WrappedType                                                        = VkDescriptorPoolCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorPoolCreateFlags allFlags =
-      DescriptorPoolCreateFlagBits::eFreeDescriptorSet | DescriptorPoolCreateFlagBits::eUpdateAfterBind | DescriptorPoolCreateFlagBits::eHostOnlyEXT |
-      DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV | DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV;
-  };
-
-  // wrapper class for enum VkDescriptorSetLayoutCreateFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutCreateFlagBits.html
-  enum class DescriptorSetLayoutCreateFlagBits : VkDescriptorSetLayoutCreateFlags
-  {
-    eUpdateAfterBindPool          = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
-    eUpdateAfterBindPoolEXT       = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT,
-    ePushDescriptor               = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT,
-    ePushDescriptorKHR            = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR,
-    eDescriptorBufferEXT          = VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT,
-    eEmbeddedImmutableSamplersEXT = VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT,
-    eIndirectBindableNV           = VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV,
-    eHostOnlyPoolEXT              = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT,
-    eHostOnlyPoolVALVE            = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE,
-    ePerStageNV                   = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV
-  };
-
-  // wrapper using for bitmask VkDescriptorSetLayoutCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutCreateFlags.html
-  using DescriptorSetLayoutCreateFlags = Flags<DescriptorSetLayoutCreateFlagBits>;
-
-  template <>
-  struct FlagTraits<DescriptorSetLayoutCreateFlagBits>
-  {
-    using WrappedType                                                             = VkDescriptorSetLayoutCreateFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorSetLayoutCreateFlags allFlags =
-      DescriptorSetLayoutCreateFlagBits::eUpdateAfterBindPool | DescriptorSetLayoutCreateFlagBits::ePushDescriptor |
-      DescriptorSetLayoutCreateFlagBits::eDescriptorBufferEXT | DescriptorSetLayoutCreateFlagBits::eEmbeddedImmutableSamplersEXT |
-      DescriptorSetLayoutCreateFlagBits::eIndirectBindableNV | DescriptorSetLayoutCreateFlagBits::eHostOnlyPoolEXT |
-      DescriptorSetLayoutCreateFlagBits::ePerStageNV;
-  };
-
-  // wrapper class for enum VkDescriptorType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorType.html
-  enum class DescriptorType
-  {
-    eSampler                            = VK_DESCRIPTOR_TYPE_SAMPLER,
-    eCombinedImageSampler               = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-    eSampledImage                       = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
-    eStorageImage                       = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
-    eUniformTexelBuffer                 = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,
-    eStorageTexelBuffer                 = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER,
-    eUniformBuffer                      = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-    eStorageBuffer                      = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-    eUniformBufferDynamic               = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
-    eStorageBufferDynamic               = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC,
-    eInputAttachment                    = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT,
-    eInlineUniformBlock                 = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK,
-    eInlineUniformBlockEXT              = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT,
-    eAccelerationStructureKHR           = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
-    eAccelerationStructureNV            = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV,
-    eSampleWeightImageQCOM              = VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM,
-    eBlockMatchImageQCOM                = VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM,
-    eTensorARM                          = VK_DESCRIPTOR_TYPE_TENSOR_ARM,
-    eMutableEXT                         = VK_DESCRIPTOR_TYPE_MUTABLE_EXT,
-    eMutableVALVE                       = VK_DESCRIPTOR_TYPE_MUTABLE_VALVE,
-    ePartitionedAccelerationStructureNV = VK_DESCRIPTOR_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_NV
-  };
-
-  enum class DescriptorPoolResetFlagBits : VkDescriptorPoolResetFlags
-  {
-  };
-
-  // wrapper using for bitmask VkDescriptorPoolResetFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolResetFlags.html
-  using DescriptorPoolResetFlags = Flags<DescriptorPoolResetFlagBits>;
-
-  template <>
-  struct FlagTraits<DescriptorPoolResetFlagBits>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorPoolResetFlags allFlags  = {};
-  };
-
-  // wrapper class for enum VkQueryPipelineStatisticFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPipelineStatisticFlagBits.html
-  enum class QueryPipelineStatisticFlagBits : VkQueryPipelineStatisticFlags
-  {
-    eInputAssemblyVertices                   = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT,
-    eInputAssemblyPrimitives                 = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT,
-    eVertexShaderInvocations                 = VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT,
-    eGeometryShaderInvocations               = VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT,
-    eGeometryShaderPrimitives                = VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT,
-    eClippingInvocations                     = VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT,
-    eClippingPrimitives                      = VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT,
-    eFragmentShaderInvocations               = VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT,
-    eTessellationControlShaderPatches        = VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT,
-    eTessellationEvaluationShaderInvocations = VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT,
-    eComputeShaderInvocations                = VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT,
-    eTaskShaderInvocationsEXT                = VK_QUERY_PIPELINE_STATISTIC_TASK_SHADER_INVOCATIONS_BIT_EXT,
-    eMeshShaderInvocationsEXT                = VK_QUERY_PIPELINE_STATISTIC_MESH_SHADER_INVOCATIONS_BIT_EXT,
-    eClusterCullingShaderInvocationsHUAWEI   = VK_QUERY_PIPELINE_STATISTIC_CLUSTER_CULLING_SHADER_INVOCATIONS_BIT_HUAWEI
-  };
-
-  // wrapper using for bitmask VkQueryPipelineStatisticFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPipelineStatisticFlags.html
-  using QueryPipelineStatisticFlags = Flags<QueryPipelineStatisticFlagBits>;
-
-  template <>
-  struct FlagTraits<QueryPipelineStatisticFlagBits>
-  {
-    using WrappedType                                                          = VkQueryPipelineStatisticFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                        isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryPipelineStatisticFlags allFlags =
-      QueryPipelineStatisticFlagBits::eInputAssemblyVertices | QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives |
-      QueryPipelineStatisticFlagBits::eVertexShaderInvocations | QueryPipelineStatisticFlagBits::eGeometryShaderInvocations |
-      QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives | QueryPipelineStatisticFlagBits::eClippingInvocations |
-      QueryPipelineStatisticFlagBits::eClippingPrimitives | QueryPipelineStatisticFlagBits::eFragmentShaderInvocations |
-      QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches | QueryPipelineStatisticFlagBits::eTessellationEvaluationShaderInvocations |
-      QueryPipelineStatisticFlagBits::eComputeShaderInvocations | QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT |
-      QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT | QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI;
-  };
-
-  // wrapper class for enum VkPipelineBindPoint, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBindPoint.html
-  enum class PipelineBindPoint
-  {
-    eGraphics = VK_PIPELINE_BIND_POINT_GRAPHICS,
-    eCompute  = VK_PIPELINE_BIND_POINT_COMPUTE,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eExecutionGraphAMDX = VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eRayTracingKHR        = VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
-    eRayTracingNV         = VK_PIPELINE_BIND_POINT_RAY_TRACING_NV,
-    eSubpassShadingHUAWEI = VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI,
-    eDataGraphARM         = VK_PIPELINE_BIND_POINT_DATA_GRAPH_ARM
-  };
-
-  // wrapper class for enum VkBlendFactor, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlendFactor.html
   enum class BlendFactor
   {
     eZero                  = VK_BLEND_FACTOR_ZERO,
@@ -3676,7 +2625,6 @@ namespace VULKAN_HPP_NAMESPACE
     eOneMinusSrc1Alpha     = VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA
   };
 
-  // wrapper class for enum VkBlendOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlendOp.html
   enum class BlendOp
   {
     eAdd                 = VK_BLEND_OP_ADD,
@@ -3732,7 +2680,6 @@ namespace VULKAN_HPP_NAMESPACE
     eBlueEXT             = VK_BLEND_OP_BLUE_EXT
   };
 
-  // wrapper class for enum VkColorComponentFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkColorComponentFlagBits.html
   enum class ColorComponentFlagBits : VkColorComponentFlags
   {
     eR = VK_COLOR_COMPONENT_R_BIT,
@@ -3741,19 +2688,16 @@ namespace VULKAN_HPP_NAMESPACE
     eA = VK_COLOR_COMPONENT_A_BIT
   };
 
-  // wrapper using for bitmask VkColorComponentFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkColorComponentFlags.html
   using ColorComponentFlags = Flags<ColorComponentFlagBits>;
 
   template <>
   struct FlagTraits<ColorComponentFlagBits>
   {
-    using WrappedType                                                  = VkColorComponentFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ColorComponentFlags allFlags =
       ColorComponentFlagBits::eR | ColorComponentFlagBits::eG | ColorComponentFlagBits::eB | ColorComponentFlagBits::eA;
   };
 
-  // wrapper class for enum VkCompareOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCompareOp.html
   enum class CompareOp
   {
     eNever          = VK_COMPARE_OP_NEVER,
@@ -3766,7 +2710,6 @@ namespace VULKAN_HPP_NAMESPACE
     eAlways         = VK_COMPARE_OP_ALWAYS
   };
 
-  // wrapper class for enum VkCullModeFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCullModeFlagBits.html
   enum class CullModeFlagBits : VkCullModeFlags
   {
     eNone         = VK_CULL_MODE_NONE,
@@ -3775,19 +2718,16 @@ namespace VULKAN_HPP_NAMESPACE
     eFrontAndBack = VK_CULL_MODE_FRONT_AND_BACK
   };
 
-  // wrapper using for bitmask VkCullModeFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCullModeFlags.html
   using CullModeFlags = Flags<CullModeFlagBits>;
 
   template <>
   struct FlagTraits<CullModeFlagBits>
   {
-    using WrappedType                                            = VkCullModeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR CullModeFlags allFlags =
       CullModeFlagBits::eNone | CullModeFlagBits::eFront | CullModeFlagBits::eBack | CullModeFlagBits::eFrontAndBack;
   };
 
-  // wrapper class for enum VkDynamicState, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDynamicState.html
   enum class DynamicState
   {
     eViewport                            = VK_DYNAMIC_STATE_VIEWPORT,
@@ -3829,9 +2769,6 @@ namespace VULKAN_HPP_NAMESPACE
     eDepthBiasEnableEXT                  = VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT,
     ePrimitiveRestartEnable              = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE,
     ePrimitiveRestartEnableEXT           = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT,
-    eLineStipple                         = VK_DYNAMIC_STATE_LINE_STIPPLE,
-    eLineStippleEXT                      = VK_DYNAMIC_STATE_LINE_STIPPLE_EXT,
-    eLineStippleKHR                      = VK_DYNAMIC_STATE_LINE_STIPPLE_KHR,
     eViewportWScalingNV                  = VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV,
     eDiscardRectangleEXT                 = VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT,
     eDiscardRectangleEnableEXT           = VK_DYNAMIC_STATE_DISCARD_RECTANGLE_ENABLE_EXT,
@@ -3879,17 +2816,16 @@ namespace VULKAN_HPP_NAMESPACE
     eRepresentativeFragmentTestEnableNV  = VK_DYNAMIC_STATE_REPRESENTATIVE_FRAGMENT_TEST_ENABLE_NV,
     eCoverageReductionModeNV             = VK_DYNAMIC_STATE_COVERAGE_REDUCTION_MODE_NV,
     eAttachmentFeedbackLoopEnableEXT     = VK_DYNAMIC_STATE_ATTACHMENT_FEEDBACK_LOOP_ENABLE_EXT,
-    eDepthClampRangeEXT                  = VK_DYNAMIC_STATE_DEPTH_CLAMP_RANGE_EXT
+    eLineStippleKHR                      = VK_DYNAMIC_STATE_LINE_STIPPLE_KHR,
+    eLineStippleEXT                      = VK_DYNAMIC_STATE_LINE_STIPPLE_EXT
   };
 
-  // wrapper class for enum VkFrontFace, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFrontFace.html
   enum class FrontFace
   {
     eCounterClockwise = VK_FRONT_FACE_COUNTER_CLOCKWISE,
     eClockwise        = VK_FRONT_FACE_CLOCKWISE
   };
 
-  // wrapper class for enum VkLogicOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLogicOp.html
   enum class LogicOp
   {
     eClear        = VK_LOGIC_OP_CLEAR,
@@ -3910,7 +2846,92 @@ namespace VULKAN_HPP_NAMESPACE
     eSet          = VK_LOGIC_OP_SET
   };
 
-  // wrapper class for enum VkPolygonMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPolygonMode.html
+  enum class PipelineCreateFlagBits : VkPipelineCreateFlags
+  {
+    eDisableOptimization                                                = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+    eAllowDerivatives                                                   = VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT,
+    eDerivative                                                         = VK_PIPELINE_CREATE_DERIVATIVE_BIT,
+    eViewIndexFromDeviceIndex                                           = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT,
+    eViewIndexFromDeviceIndexKHR                                        = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR,
+    eDispatchBase                                                       = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT,
+    eDispatchBaseKHR                                                    = VK_PIPELINE_CREATE_DISPATCH_BASE_KHR,
+    eFailOnPipelineCompileRequired                                      = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT,
+    eFailOnPipelineCompileRequiredEXT                                   = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT,
+    eEarlyReturnOnFailure                                               = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT,
+    eEarlyReturnOnFailureEXT                                            = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT,
+    eRenderingFragmentShadingRateAttachmentKHR                          = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    eVkPipelineRasterizationStateCreateFragmentShadingRateAttachmentKHR = VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    eRenderingFragmentDensityMapAttachmentEXT                           = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
+    eVkPipelineRasterizationStateCreateFragmentDensityMapAttachmentEXT  = VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
+    eRayTracingNoNullAnyHitShadersKHR                                   = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR,
+    eRayTracingNoNullClosestHitShadersKHR                               = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR,
+    eRayTracingNoNullMissShadersKHR                                     = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR,
+    eRayTracingNoNullIntersectionShadersKHR                             = VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR,
+    eRayTracingSkipTrianglesKHR                                         = VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR,
+    eRayTracingSkipAabbsKHR                                             = VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR,
+    eRayTracingShaderGroupHandleCaptureReplayKHR                        = VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR,
+    eDeferCompileNV                                                     = VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV,
+    eCaptureStatisticsKHR                                               = VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR,
+    eCaptureInternalRepresentationsKHR                                  = VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR,
+    eIndirectBindableNV                                                 = VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV,
+    eLibraryKHR                                                         = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR,
+    eDescriptorBufferEXT                                                = VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT,
+    eRetainLinkTimeOptimizationInfoEXT                                  = VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT,
+    eLinkTimeOptimizationEXT                                            = VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT,
+    eRayTracingAllowMotionNV                                            = VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV,
+    eColorAttachmentFeedbackLoopEXT                                     = VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
+    eDepthStencilAttachmentFeedbackLoopEXT                              = VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
+    eRayTracingOpacityMicromapEXT                                       = VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT,
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    eRayTracingDisplacementMicromapNV = VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV,
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    eNoProtectedAccessEXT   = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT,
+    eProtectedAccessOnlyEXT = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT
+  };
+
+  using PipelineCreateFlags = Flags<PipelineCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<PipelineCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreateFlags allFlags =
+      PipelineCreateFlagBits::eDisableOptimization | PipelineCreateFlagBits::eAllowDerivatives | PipelineCreateFlagBits::eDerivative |
+      PipelineCreateFlagBits::eViewIndexFromDeviceIndex | PipelineCreateFlagBits::eDispatchBase | PipelineCreateFlagBits::eFailOnPipelineCompileRequired |
+      PipelineCreateFlagBits::eEarlyReturnOnFailure | PipelineCreateFlagBits::eRenderingFragmentShadingRateAttachmentKHR |
+      PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT | PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR |
+      PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR | PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR |
+      PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR | PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR |
+      PipelineCreateFlagBits::eRayTracingSkipAabbsKHR | PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR |
+      PipelineCreateFlagBits::eDeferCompileNV | PipelineCreateFlagBits::eCaptureStatisticsKHR | PipelineCreateFlagBits::eCaptureInternalRepresentationsKHR |
+      PipelineCreateFlagBits::eIndirectBindableNV | PipelineCreateFlagBits::eLibraryKHR | PipelineCreateFlagBits::eDescriptorBufferEXT |
+      PipelineCreateFlagBits::eRetainLinkTimeOptimizationInfoEXT | PipelineCreateFlagBits::eLinkTimeOptimizationEXT |
+      PipelineCreateFlagBits::eRayTracingAllowMotionNV | PipelineCreateFlagBits::eColorAttachmentFeedbackLoopEXT |
+      PipelineCreateFlagBits::eDepthStencilAttachmentFeedbackLoopEXT | PipelineCreateFlagBits::eRayTracingOpacityMicromapEXT
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      | PipelineCreateFlagBits::eRayTracingDisplacementMicromapNV
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      | PipelineCreateFlagBits::eNoProtectedAccessEXT | PipelineCreateFlagBits::eProtectedAccessOnlyEXT;
+  };
+
+  enum class PipelineShaderStageCreateFlagBits : VkPipelineShaderStageCreateFlags
+  {
+    eAllowVaryingSubgroupSize    = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT,
+    eAllowVaryingSubgroupSizeEXT = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT,
+    eRequireFullSubgroups        = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT,
+    eRequireFullSubgroupsEXT     = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT
+  };
+
+  using PipelineShaderStageCreateFlags = Flags<PipelineShaderStageCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<PipelineShaderStageCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineShaderStageCreateFlags allFlags =
+      PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize | PipelineShaderStageCreateFlagBits::eRequireFullSubgroups;
+  };
+
   enum class PolygonMode
   {
     eFill            = VK_POLYGON_MODE_FILL,
@@ -3919,7 +2940,6 @@ namespace VULKAN_HPP_NAMESPACE
     eFillRectangleNV = VK_POLYGON_MODE_FILL_RECTANGLE_NV
   };
 
-  // wrapper class for enum VkPrimitiveTopology, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPrimitiveTopology.html
   enum class PrimitiveTopology
   {
     ePointList                  = VK_PRIMITIVE_TOPOLOGY_POINT_LIST,
@@ -3935,7 +2955,50 @@ namespace VULKAN_HPP_NAMESPACE
     ePatchList                  = VK_PRIMITIVE_TOPOLOGY_PATCH_LIST
   };
 
-  // wrapper class for enum VkStencilOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStencilOp.html
+  enum class ShaderStageFlagBits : VkShaderStageFlags
+  {
+    eVertex                 = VK_SHADER_STAGE_VERTEX_BIT,
+    eTessellationControl    = VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
+    eTessellationEvaluation = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
+    eGeometry               = VK_SHADER_STAGE_GEOMETRY_BIT,
+    eFragment               = VK_SHADER_STAGE_FRAGMENT_BIT,
+    eCompute                = VK_SHADER_STAGE_COMPUTE_BIT,
+    eAllGraphics            = VK_SHADER_STAGE_ALL_GRAPHICS,
+    eAll                    = VK_SHADER_STAGE_ALL,
+    eRaygenKHR              = VK_SHADER_STAGE_RAYGEN_BIT_KHR,
+    eRaygenNV               = VK_SHADER_STAGE_RAYGEN_BIT_NV,
+    eAnyHitKHR              = VK_SHADER_STAGE_ANY_HIT_BIT_KHR,
+    eAnyHitNV               = VK_SHADER_STAGE_ANY_HIT_BIT_NV,
+    eClosestHitKHR          = VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
+    eClosestHitNV           = VK_SHADER_STAGE_CLOSEST_HIT_BIT_NV,
+    eMissKHR                = VK_SHADER_STAGE_MISS_BIT_KHR,
+    eMissNV                 = VK_SHADER_STAGE_MISS_BIT_NV,
+    eIntersectionKHR        = VK_SHADER_STAGE_INTERSECTION_BIT_KHR,
+    eIntersectionNV         = VK_SHADER_STAGE_INTERSECTION_BIT_NV,
+    eCallableKHR            = VK_SHADER_STAGE_CALLABLE_BIT_KHR,
+    eCallableNV             = VK_SHADER_STAGE_CALLABLE_BIT_NV,
+    eTaskEXT                = VK_SHADER_STAGE_TASK_BIT_EXT,
+    eTaskNV                 = VK_SHADER_STAGE_TASK_BIT_NV,
+    eMeshEXT                = VK_SHADER_STAGE_MESH_BIT_EXT,
+    eMeshNV                 = VK_SHADER_STAGE_MESH_BIT_NV,
+    eSubpassShadingHUAWEI   = VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI,
+    eClusterCullingHUAWEI   = VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI
+  };
+
+  using ShaderStageFlags = Flags<ShaderStageFlagBits>;
+
+  template <>
+  struct FlagTraits<ShaderStageFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR ShaderStageFlags allFlags =
+      ShaderStageFlagBits::eVertex | ShaderStageFlagBits::eTessellationControl | ShaderStageFlagBits::eTessellationEvaluation | ShaderStageFlagBits::eGeometry |
+      ShaderStageFlagBits::eFragment | ShaderStageFlagBits::eCompute | ShaderStageFlagBits::eAllGraphics | ShaderStageFlagBits::eAll |
+      ShaderStageFlagBits::eRaygenKHR | ShaderStageFlagBits::eAnyHitKHR | ShaderStageFlagBits::eClosestHitKHR | ShaderStageFlagBits::eMissKHR |
+      ShaderStageFlagBits::eIntersectionKHR | ShaderStageFlagBits::eCallableKHR | ShaderStageFlagBits::eTaskEXT | ShaderStageFlagBits::eMeshEXT |
+      ShaderStageFlagBits::eSubpassShadingHUAWEI | ShaderStageFlagBits::eClusterCullingHUAWEI;
+  };
+
   enum class StencilOp
   {
     eKeep              = VK_STENCIL_OP_KEEP,
@@ -3948,36 +3011,28 @@ namespace VULKAN_HPP_NAMESPACE
     eDecrementAndWrap  = VK_STENCIL_OP_DECREMENT_AND_WRAP
   };
 
-  // wrapper class for enum VkVertexInputRate, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputRate.html
   enum class VertexInputRate
   {
     eVertex   = VK_VERTEX_INPUT_RATE_VERTEX,
     eInstance = VK_VERTEX_INPUT_RATE_INSTANCE
   };
 
-  // wrapper class for enum VkPipelineColorBlendStateCreateFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorBlendStateCreateFlagBits.html
   enum class PipelineColorBlendStateCreateFlagBits : VkPipelineColorBlendStateCreateFlags
   {
     eRasterizationOrderAttachmentAccessEXT = VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT,
     eRasterizationOrderAttachmentAccessARM = VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_ARM
   };
 
-  // wrapper using for bitmask VkPipelineColorBlendStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorBlendStateCreateFlags.html
   using PipelineColorBlendStateCreateFlags = Flags<PipelineColorBlendStateCreateFlagBits>;
 
   template <>
   struct FlagTraits<PipelineColorBlendStateCreateFlagBits>
   {
-    using WrappedType                                                                 = VkPipelineColorBlendStateCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineColorBlendStateCreateFlags allFlags =
       PipelineColorBlendStateCreateFlagBits::eRasterizationOrderAttachmentAccessEXT;
   };
 
-  // wrapper class for enum VkPipelineDepthStencilStateCreateFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDepthStencilStateCreateFlagBits.html
   enum class PipelineDepthStencilStateCreateFlagBits : VkPipelineDepthStencilStateCreateFlags
   {
     eRasterizationOrderAttachmentDepthAccessEXT   = VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT,
@@ -3986,14 +3041,11 @@ namespace VULKAN_HPP_NAMESPACE
     eRasterizationOrderAttachmentStencilAccessARM = VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM
   };
 
-  // wrapper using for bitmask VkPipelineDepthStencilStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDepthStencilStateCreateFlags.html
   using PipelineDepthStencilStateCreateFlags = Flags<PipelineDepthStencilStateCreateFlagBits>;
 
   template <>
   struct FlagTraits<PipelineDepthStencilStateCreateFlagBits>
   {
-    using WrappedType                                                                   = VkPipelineDepthStencilStateCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineDepthStencilStateCreateFlags allFlags =
       PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentDepthAccessEXT |
@@ -4004,8 +3056,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineDynamicStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDynamicStateCreateFlags.html
   using PipelineDynamicStateCreateFlags = Flags<PipelineDynamicStateCreateFlagBits>;
 
   template <>
@@ -4019,8 +3069,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineInputAssemblyStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineInputAssemblyStateCreateFlags.html
   using PipelineInputAssemblyStateCreateFlags = Flags<PipelineInputAssemblyStateCreateFlagBits>;
 
   template <>
@@ -4030,12 +3078,24 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineInputAssemblyStateCreateFlags allFlags  = {};
   };
 
+  enum class PipelineLayoutCreateFlagBits : VkPipelineLayoutCreateFlags
+  {
+    eIndependentSetsEXT = VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT
+  };
+
+  using PipelineLayoutCreateFlags = Flags<PipelineLayoutCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<PipelineLayoutCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineLayoutCreateFlags allFlags  = PipelineLayoutCreateFlagBits::eIndependentSetsEXT;
+  };
+
   enum class PipelineMultisampleStateCreateFlagBits : VkPipelineMultisampleStateCreateFlags
   {
   };
 
-  // wrapper using for bitmask VkPipelineMultisampleStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineMultisampleStateCreateFlags.html
   using PipelineMultisampleStateCreateFlags = Flags<PipelineMultisampleStateCreateFlagBits>;
 
   template <>
@@ -4049,8 +3109,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineRasterizationStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationStateCreateFlags.html
   using PipelineRasterizationStateCreateFlags = Flags<PipelineRasterizationStateCreateFlagBits>;
 
   template <>
@@ -4064,8 +3122,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineTessellationStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineTessellationStateCreateFlags.html
   using PipelineTessellationStateCreateFlags = Flags<PipelineTessellationStateCreateFlagBits>;
 
   template <>
@@ -4079,8 +3135,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineVertexInputStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineVertexInputStateCreateFlags.html
   using PipelineVertexInputStateCreateFlags = Flags<PipelineVertexInputStateCreateFlagBits>;
 
   template <>
@@ -4094,8 +3148,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineViewportStateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportStateCreateFlags.html
   using PipelineViewportStateCreateFlags = Flags<PipelineViewportStateCreateFlagBits>;
 
   template <>
@@ -4105,121 +3157,414 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineViewportStateCreateFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkAttachmentDescriptionFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentDescriptionFlagBits.html
-  enum class AttachmentDescriptionFlagBits : VkAttachmentDescriptionFlags
+  enum class BorderColor
   {
-    eMayAlias                         = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT,
-    eResolveSkipTransferFunctionKHR   = VK_ATTACHMENT_DESCRIPTION_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR,
-    eResolveEnableTransferFunctionKHR = VK_ATTACHMENT_DESCRIPTION_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR
+    eFloatTransparentBlack = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK,
+    eIntTransparentBlack   = VK_BORDER_COLOR_INT_TRANSPARENT_BLACK,
+    eFloatOpaqueBlack      = VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK,
+    eIntOpaqueBlack        = VK_BORDER_COLOR_INT_OPAQUE_BLACK,
+    eFloatOpaqueWhite      = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE,
+    eIntOpaqueWhite        = VK_BORDER_COLOR_INT_OPAQUE_WHITE,
+    eFloatCustomEXT        = VK_BORDER_COLOR_FLOAT_CUSTOM_EXT,
+    eIntCustomEXT          = VK_BORDER_COLOR_INT_CUSTOM_EXT
+  };
+
+  enum class Filter
+  {
+    eNearest  = VK_FILTER_NEAREST,
+    eLinear   = VK_FILTER_LINEAR,
+    eCubicEXT = VK_FILTER_CUBIC_EXT,
+    eCubicIMG = VK_FILTER_CUBIC_IMG
+  };
+
+  enum class SamplerAddressMode
+  {
+    eRepeat               = VK_SAMPLER_ADDRESS_MODE_REPEAT,
+    eMirroredRepeat       = VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT,
+    eClampToEdge          = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
+    eClampToBorder        = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
+    eMirrorClampToEdge    = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE,
+    eMirrorClampToEdgeKHR = VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE_KHR
+  };
+
+  enum class SamplerCreateFlagBits : VkSamplerCreateFlags
+  {
+    eSubsampledEXT                     = VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT,
+    eSubsampledCoarseReconstructionEXT = VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT,
+    eDescriptorBufferCaptureReplayEXT  = VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT,
+    eNonSeamlessCubeMapEXT             = VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT,
+    eImageProcessingQCOM               = VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM
+  };
+
+  using SamplerCreateFlags = Flags<SamplerCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<SamplerCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR SamplerCreateFlags allFlags =
+      SamplerCreateFlagBits::eSubsampledEXT | SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT |
+      SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT | SamplerCreateFlagBits::eNonSeamlessCubeMapEXT | SamplerCreateFlagBits::eImageProcessingQCOM;
+  };
+
+  enum class SamplerMipmapMode
+  {
+    eNearest = VK_SAMPLER_MIPMAP_MODE_NEAREST,
+    eLinear  = VK_SAMPLER_MIPMAP_MODE_LINEAR
+  };
+
+  enum class DescriptorPoolCreateFlagBits : VkDescriptorPoolCreateFlags
+  {
+    eFreeDescriptorSet          = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
+    eUpdateAfterBind            = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
+    eUpdateAfterBindEXT         = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT,
+    eHostOnlyEXT                = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT,
+    eHostOnlyVALVE              = VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE,
+    eAllowOverallocationSetsNV  = VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV,
+    eAllowOverallocationPoolsNV = VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV
+  };
+
+  using DescriptorPoolCreateFlags = Flags<DescriptorPoolCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<DescriptorPoolCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorPoolCreateFlags allFlags =
+      DescriptorPoolCreateFlagBits::eFreeDescriptorSet | DescriptorPoolCreateFlagBits::eUpdateAfterBind | DescriptorPoolCreateFlagBits::eHostOnlyEXT |
+      DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV | DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV;
+  };
+
+  enum class DescriptorSetLayoutCreateFlagBits : VkDescriptorSetLayoutCreateFlags
+  {
+    eUpdateAfterBindPool          = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
+    eUpdateAfterBindPoolEXT       = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT,
+    ePushDescriptorKHR            = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR,
+    eDescriptorBufferEXT          = VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT,
+    eEmbeddedImmutableSamplersEXT = VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT,
+    eIndirectBindableNV           = VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV,
+    eHostOnlyPoolEXT              = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT,
+    eHostOnlyPoolVALVE            = VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE,
+    ePerStageNV                   = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV
+  };
+
+  using DescriptorSetLayoutCreateFlags = Flags<DescriptorSetLayoutCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<DescriptorSetLayoutCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorSetLayoutCreateFlags allFlags =
+      DescriptorSetLayoutCreateFlagBits::eUpdateAfterBindPool | DescriptorSetLayoutCreateFlagBits::ePushDescriptorKHR |
+      DescriptorSetLayoutCreateFlagBits::eDescriptorBufferEXT | DescriptorSetLayoutCreateFlagBits::eEmbeddedImmutableSamplersEXT |
+      DescriptorSetLayoutCreateFlagBits::eIndirectBindableNV | DescriptorSetLayoutCreateFlagBits::eHostOnlyPoolEXT |
+      DescriptorSetLayoutCreateFlagBits::ePerStageNV;
+  };
+
+  enum class DescriptorType
+  {
+    eSampler                  = VK_DESCRIPTOR_TYPE_SAMPLER,
+    eCombinedImageSampler     = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+    eSampledImage             = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
+    eStorageImage             = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
+    eUniformTexelBuffer       = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,
+    eStorageTexelBuffer       = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER,
+    eUniformBuffer            = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+    eStorageBuffer            = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+    eUniformBufferDynamic     = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
+    eStorageBufferDynamic     = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC,
+    eInputAttachment          = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT,
+    eInlineUniformBlock       = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK,
+    eInlineUniformBlockEXT    = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT,
+    eAccelerationStructureKHR = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
+    eAccelerationStructureNV  = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV,
+    eSampleWeightImageQCOM    = VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM,
+    eBlockMatchImageQCOM      = VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM,
+    eMutableEXT               = VK_DESCRIPTOR_TYPE_MUTABLE_EXT,
+    eMutableVALVE             = VK_DESCRIPTOR_TYPE_MUTABLE_VALVE
+  };
+
+  enum class DescriptorPoolResetFlagBits : VkDescriptorPoolResetFlags
+  {
+  };
+
+  using DescriptorPoolResetFlags = Flags<DescriptorPoolResetFlagBits>;
+
+  template <>
+  struct FlagTraits<DescriptorPoolResetFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorPoolResetFlags allFlags  = {};
+  };
+
+  enum class AccessFlagBits : VkAccessFlags
+  {
+    eIndirectCommandRead                  = VK_ACCESS_INDIRECT_COMMAND_READ_BIT,
+    eIndexRead                            = VK_ACCESS_INDEX_READ_BIT,
+    eVertexAttributeRead                  = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+    eUniformRead                          = VK_ACCESS_UNIFORM_READ_BIT,
+    eInputAttachmentRead                  = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
+    eShaderRead                           = VK_ACCESS_SHADER_READ_BIT,
+    eShaderWrite                          = VK_ACCESS_SHADER_WRITE_BIT,
+    eColorAttachmentRead                  = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT,
+    eColorAttachmentWrite                 = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+    eDepthStencilAttachmentRead           = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
+    eDepthStencilAttachmentWrite          = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
+    eTransferRead                         = VK_ACCESS_TRANSFER_READ_BIT,
+    eTransferWrite                        = VK_ACCESS_TRANSFER_WRITE_BIT,
+    eHostRead                             = VK_ACCESS_HOST_READ_BIT,
+    eHostWrite                            = VK_ACCESS_HOST_WRITE_BIT,
+    eMemoryRead                           = VK_ACCESS_MEMORY_READ_BIT,
+    eMemoryWrite                          = VK_ACCESS_MEMORY_WRITE_BIT,
+    eNone                                 = VK_ACCESS_NONE,
+    eNoneKHR                              = VK_ACCESS_NONE_KHR,
+    eTransformFeedbackWriteEXT            = VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT,
+    eTransformFeedbackCounterReadEXT      = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT,
+    eTransformFeedbackCounterWriteEXT     = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
+    eConditionalRenderingReadEXT          = VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT,
+    eColorAttachmentReadNoncoherentEXT    = VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT,
+    eAccelerationStructureReadKHR         = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR,
+    eAccelerationStructureReadNV          = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV,
+    eAccelerationStructureWriteKHR        = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR,
+    eAccelerationStructureWriteNV         = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV,
+    eFragmentDensityMapReadEXT            = VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT,
+    eFragmentShadingRateAttachmentReadKHR = VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR,
+    eShadingRateImageReadNV               = VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV,
+    eCommandPreprocessReadNV              = VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV,
+    eCommandPreprocessWriteNV             = VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV
+  };
+
+  using AccessFlags = Flags<AccessFlagBits>;
+
+  template <>
+  struct FlagTraits<AccessFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool        isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR AccessFlags allFlags =
+      AccessFlagBits::eIndirectCommandRead | AccessFlagBits::eIndexRead | AccessFlagBits::eVertexAttributeRead | AccessFlagBits::eUniformRead |
+      AccessFlagBits::eInputAttachmentRead | AccessFlagBits::eShaderRead | AccessFlagBits::eShaderWrite | AccessFlagBits::eColorAttachmentRead |
+      AccessFlagBits::eColorAttachmentWrite | AccessFlagBits::eDepthStencilAttachmentRead | AccessFlagBits::eDepthStencilAttachmentWrite |
+      AccessFlagBits::eTransferRead | AccessFlagBits::eTransferWrite | AccessFlagBits::eHostRead | AccessFlagBits::eHostWrite | AccessFlagBits::eMemoryRead |
+      AccessFlagBits::eMemoryWrite | AccessFlagBits::eNone | AccessFlagBits::eTransformFeedbackWriteEXT | AccessFlagBits::eTransformFeedbackCounterReadEXT |
+      AccessFlagBits::eTransformFeedbackCounterWriteEXT | AccessFlagBits::eConditionalRenderingReadEXT | AccessFlagBits::eColorAttachmentReadNoncoherentEXT |
+      AccessFlagBits::eAccelerationStructureReadKHR | AccessFlagBits::eAccelerationStructureWriteKHR | AccessFlagBits::eFragmentDensityMapReadEXT |
+      AccessFlagBits::eFragmentShadingRateAttachmentReadKHR | AccessFlagBits::eCommandPreprocessReadNV | AccessFlagBits::eCommandPreprocessWriteNV;
+  };
+
+  enum class AttachmentDescriptionFlagBits : VkAttachmentDescriptionFlags
+  {
+    eMayAlias = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT
   };
 
-  // wrapper using for bitmask VkAttachmentDescriptionFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentDescriptionFlags.html
   using AttachmentDescriptionFlags = Flags<AttachmentDescriptionFlagBits>;
 
   template <>
   struct FlagTraits<AttachmentDescriptionFlagBits>
   {
-    using WrappedType                                                         = VkAttachmentDescriptionFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR AttachmentDescriptionFlags allFlags  = AttachmentDescriptionFlagBits::eMayAlias |
-                                                                               AttachmentDescriptionFlagBits::eResolveSkipTransferFunctionKHR |
-                                                                               AttachmentDescriptionFlagBits::eResolveEnableTransferFunctionKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR AttachmentDescriptionFlags allFlags  = AttachmentDescriptionFlagBits::eMayAlias;
   };
 
-  // wrapper class for enum VkAttachmentLoadOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentLoadOp.html
   enum class AttachmentLoadOp
   {
     eLoad     = VK_ATTACHMENT_LOAD_OP_LOAD,
     eClear    = VK_ATTACHMENT_LOAD_OP_CLEAR,
     eDontCare = VK_ATTACHMENT_LOAD_OP_DONT_CARE,
-    eNone     = VK_ATTACHMENT_LOAD_OP_NONE,
-    eNoneEXT  = VK_ATTACHMENT_LOAD_OP_NONE_EXT,
-    eNoneKHR  = VK_ATTACHMENT_LOAD_OP_NONE_KHR
+    eNoneKHR  = VK_ATTACHMENT_LOAD_OP_NONE_KHR,
+    eNoneEXT  = VK_ATTACHMENT_LOAD_OP_NONE_EXT
   };
 
-  // wrapper class for enum VkAttachmentStoreOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentStoreOp.html
   enum class AttachmentStoreOp
   {
     eStore    = VK_ATTACHMENT_STORE_OP_STORE,
     eDontCare = VK_ATTACHMENT_STORE_OP_DONT_CARE,
     eNone     = VK_ATTACHMENT_STORE_OP_NONE,
+    eNoneEXT  = VK_ATTACHMENT_STORE_OP_NONE_EXT,
     eNoneKHR  = VK_ATTACHMENT_STORE_OP_NONE_KHR,
-    eNoneQCOM = VK_ATTACHMENT_STORE_OP_NONE_QCOM,
-    eNoneEXT  = VK_ATTACHMENT_STORE_OP_NONE_EXT
+    eNoneQCOM = VK_ATTACHMENT_STORE_OP_NONE_QCOM
+  };
+
+  enum class DependencyFlagBits : VkDependencyFlags
+  {
+    eByRegion        = VK_DEPENDENCY_BY_REGION_BIT,
+    eDeviceGroup     = VK_DEPENDENCY_DEVICE_GROUP_BIT,
+    eDeviceGroupKHR  = VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR,
+    eViewLocal       = VK_DEPENDENCY_VIEW_LOCAL_BIT,
+    eViewLocalKHR    = VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR,
+    eFeedbackLoopEXT = VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT
+  };
+
+  using DependencyFlags = Flags<DependencyFlagBits>;
+
+  template <>
+  struct FlagTraits<DependencyFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool            isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR DependencyFlags allFlags =
+      DependencyFlagBits::eByRegion | DependencyFlagBits::eDeviceGroup | DependencyFlagBits::eViewLocal | DependencyFlagBits::eFeedbackLoopEXT;
   };
 
-  // wrapper class for enum VkFramebufferCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferCreateFlagBits.html
   enum class FramebufferCreateFlagBits : VkFramebufferCreateFlags
   {
     eImageless    = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT,
     eImagelessKHR = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR
   };
 
-  // wrapper using for bitmask VkFramebufferCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferCreateFlags.html
   using FramebufferCreateFlags = Flags<FramebufferCreateFlagBits>;
 
   template <>
   struct FlagTraits<FramebufferCreateFlagBits>
   {
-    using WrappedType                                                     = VkFramebufferCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FramebufferCreateFlags allFlags  = FramebufferCreateFlagBits::eImageless;
   };
 
-  // wrapper class for enum VkRenderPassCreateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreateFlagBits.html
-  enum class RenderPassCreateFlagBits : VkRenderPassCreateFlags
+  enum class PipelineBindPoint
   {
-    eTransformQCOM                = VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM,
-    ePerLayerFragmentDensityVALVE = VK_RENDER_PASS_CREATE_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE
+    eGraphics = VK_PIPELINE_BIND_POINT_GRAPHICS,
+    eCompute  = VK_PIPELINE_BIND_POINT_COMPUTE,
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    eExecutionGraphAMDX = VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX,
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    eRayTracingKHR        = VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
+    eRayTracingNV         = VK_PIPELINE_BIND_POINT_RAY_TRACING_NV,
+    eSubpassShadingHUAWEI = VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI
+  };
+
+  enum class RenderPassCreateFlagBits : VkRenderPassCreateFlags
+  {
+    eTransformQCOM = VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM
   };
 
-  // wrapper using for bitmask VkRenderPassCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreateFlags.html
   using RenderPassCreateFlags = Flags<RenderPassCreateFlagBits>;
 
   template <>
   struct FlagTraits<RenderPassCreateFlagBits>
   {
-    using WrappedType                                                    = VkRenderPassCreateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR RenderPassCreateFlags allFlags =
-      RenderPassCreateFlagBits::eTransformQCOM | RenderPassCreateFlagBits::ePerLayerFragmentDensityVALVE;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR RenderPassCreateFlags allFlags  = RenderPassCreateFlagBits::eTransformQCOM;
   };
 
-  // wrapper class for enum VkSubpassDescriptionFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDescriptionFlagBits.html
   enum class SubpassDescriptionFlagBits : VkSubpassDescriptionFlags
   {
     ePerViewAttributesNVX                         = VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX,
     ePerViewPositionXOnlyNVX                      = VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX,
-    eTileShadingApronQCOM                         = VK_SUBPASS_DESCRIPTION_TILE_SHADING_APRON_BIT_QCOM,
+    eFragmentRegionQCOM                           = VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM,
+    eShaderResolveQCOM                            = VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM,
     eRasterizationOrderAttachmentColorAccessEXT   = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT,
     eRasterizationOrderAttachmentColorAccessARM   = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM,
     eRasterizationOrderAttachmentDepthAccessEXT   = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT,
     eRasterizationOrderAttachmentDepthAccessARM   = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM,
     eRasterizationOrderAttachmentStencilAccessEXT = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT,
     eRasterizationOrderAttachmentStencilAccessARM = VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM,
-    eEnableLegacyDitheringEXT                     = VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT,
-    eFragmentRegionEXT                            = VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_EXT,
-    eFragmentRegionQCOM                           = VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM,
-    eCustomResolveEXT                             = VK_SUBPASS_DESCRIPTION_CUSTOM_RESOLVE_BIT_EXT,
-    eShaderResolveQCOM                            = VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM
+    eEnableLegacyDitheringEXT                     = VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT
   };
 
-  // wrapper using for bitmask VkSubpassDescriptionFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDescriptionFlags.html
   using SubpassDescriptionFlags = Flags<SubpassDescriptionFlagBits>;
 
   template <>
   struct FlagTraits<SubpassDescriptionFlagBits>
   {
-    using WrappedType                                                      = VkSubpassDescriptionFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SubpassDescriptionFlags allFlags =
       SubpassDescriptionFlagBits::ePerViewAttributesNVX | SubpassDescriptionFlagBits::ePerViewPositionXOnlyNVX |
-      SubpassDescriptionFlagBits::eTileShadingApronQCOM | SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT |
-      SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT | SubpassDescriptionFlagBits::eRasterizationOrderAttachmentStencilAccessEXT |
-      SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT | SubpassDescriptionFlagBits::eFragmentRegionEXT | SubpassDescriptionFlagBits::eCustomResolveEXT;
+      SubpassDescriptionFlagBits::eFragmentRegionQCOM | SubpassDescriptionFlagBits::eShaderResolveQCOM |
+      SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT | SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT |
+      SubpassDescriptionFlagBits::eRasterizationOrderAttachmentStencilAccessEXT | SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT;
+  };
+
+  enum class CommandPoolCreateFlagBits : VkCommandPoolCreateFlags
+  {
+    eTransient          = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT,
+    eResetCommandBuffer = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,
+    eProtected          = VK_COMMAND_POOL_CREATE_PROTECTED_BIT
+  };
+
+  using CommandPoolCreateFlags = Flags<CommandPoolCreateFlagBits>;
+
+  template <>
+  struct FlagTraits<CommandPoolCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandPoolCreateFlags allFlags =
+      CommandPoolCreateFlagBits::eTransient | CommandPoolCreateFlagBits::eResetCommandBuffer | CommandPoolCreateFlagBits::eProtected;
+  };
+
+  enum class CommandPoolResetFlagBits : VkCommandPoolResetFlags
+  {
+    eReleaseResources = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT
+  };
+
+  using CommandPoolResetFlags = Flags<CommandPoolResetFlagBits>;
+
+  template <>
+  struct FlagTraits<CommandPoolResetFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandPoolResetFlags allFlags  = CommandPoolResetFlagBits::eReleaseResources;
+  };
+
+  enum class CommandBufferLevel
+  {
+    ePrimary   = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
+    eSecondary = VK_COMMAND_BUFFER_LEVEL_SECONDARY
+  };
+
+  enum class CommandBufferResetFlagBits : VkCommandBufferResetFlags
+  {
+    eReleaseResources = VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT
+  };
+
+  using CommandBufferResetFlags = Flags<CommandBufferResetFlagBits>;
+
+  template <>
+  struct FlagTraits<CommandBufferResetFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandBufferResetFlags allFlags  = CommandBufferResetFlagBits::eReleaseResources;
+  };
+
+  enum class CommandBufferUsageFlagBits : VkCommandBufferUsageFlags
+  {
+    eOneTimeSubmit      = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
+    eRenderPassContinue = VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT,
+    eSimultaneousUse    = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT
+  };
+
+  using CommandBufferUsageFlags = Flags<CommandBufferUsageFlagBits>;
+
+  template <>
+  struct FlagTraits<CommandBufferUsageFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR CommandBufferUsageFlags allFlags =
+      CommandBufferUsageFlagBits::eOneTimeSubmit | CommandBufferUsageFlagBits::eRenderPassContinue | CommandBufferUsageFlagBits::eSimultaneousUse;
+  };
+
+  enum class QueryControlFlagBits : VkQueryControlFlags
+  {
+    ePrecise = VK_QUERY_CONTROL_PRECISE_BIT
+  };
+
+  using QueryControlFlags = Flags<QueryControlFlagBits>;
+
+  template <>
+  struct FlagTraits<QueryControlFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool              isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR QueryControlFlags allFlags  = QueryControlFlagBits::ePrecise;
+  };
+
+  enum class IndexType
+  {
+    eUint16   = VK_INDEX_TYPE_UINT16,
+    eUint32   = VK_INDEX_TYPE_UINT32,
+    eNoneKHR  = VK_INDEX_TYPE_NONE_KHR,
+    eNoneNV   = VK_INDEX_TYPE_NONE_NV,
+    eUint8KHR = VK_INDEX_TYPE_UINT8_KHR,
+    eUint8EXT = VK_INDEX_TYPE_UINT8_EXT
   };
 
-  // wrapper class for enum VkStencilFaceFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStencilFaceFlagBits.html
   enum class StencilFaceFlagBits : VkStencilFaceFlags
   {
     eFront                 = VK_STENCIL_FACE_FRONT_BIT,
@@ -4228,30 +3573,52 @@ namespace VULKAN_HPP_NAMESPACE
     eVkStencilFrontAndBack = VK_STENCIL_FRONT_AND_BACK
   };
 
-  // wrapper using for bitmask VkStencilFaceFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStencilFaceFlags.html
   using StencilFaceFlags = Flags<StencilFaceFlagBits>;
 
   template <>
   struct FlagTraits<StencilFaceFlagBits>
   {
-    using WrappedType                                               = VkStencilFaceFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StencilFaceFlags allFlags =
       StencilFaceFlagBits::eFront | StencilFaceFlagBits::eBack | StencilFaceFlagBits::eFrontAndBack;
   };
 
-  // wrapper class for enum VkSubpassContents, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassContents.html
   enum class SubpassContents
   {
     eInline                              = VK_SUBPASS_CONTENTS_INLINE,
     eSecondaryCommandBuffers             = VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS,
-    eInlineAndSecondaryCommandBuffersKHR = VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR,
     eInlineAndSecondaryCommandBuffersEXT = VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT
   };
 
   //=== VK_VERSION_1_1 ===
 
-  // wrapper class for enum VkPeerMemoryFeatureFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPeerMemoryFeatureFlagBits.html
+  enum class SubgroupFeatureFlagBits : VkSubgroupFeatureFlags
+  {
+    eBasic              = VK_SUBGROUP_FEATURE_BASIC_BIT,
+    eVote               = VK_SUBGROUP_FEATURE_VOTE_BIT,
+    eArithmetic         = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT,
+    eBallot             = VK_SUBGROUP_FEATURE_BALLOT_BIT,
+    eShuffle            = VK_SUBGROUP_FEATURE_SHUFFLE_BIT,
+    eShuffleRelative    = VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT,
+    eClustered          = VK_SUBGROUP_FEATURE_CLUSTERED_BIT,
+    eQuad               = VK_SUBGROUP_FEATURE_QUAD_BIT,
+    ePartitionedNV      = VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV,
+    eRotateKHR          = VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR,
+    eRotateClusteredKHR = VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR
+  };
+
+  using SubgroupFeatureFlags = Flags<SubgroupFeatureFlagBits>;
+
+  template <>
+  struct FlagTraits<SubgroupFeatureFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR SubgroupFeatureFlags allFlags =
+      SubgroupFeatureFlagBits::eBasic | SubgroupFeatureFlagBits::eVote | SubgroupFeatureFlagBits::eArithmetic | SubgroupFeatureFlagBits::eBallot |
+      SubgroupFeatureFlagBits::eShuffle | SubgroupFeatureFlagBits::eShuffleRelative | SubgroupFeatureFlagBits::eClustered | SubgroupFeatureFlagBits::eQuad |
+      SubgroupFeatureFlagBits::ePartitionedNV | SubgroupFeatureFlagBits::eRotateKHR | SubgroupFeatureFlagBits::eRotateClusteredKHR;
+  };
+
   enum class PeerMemoryFeatureFlagBits : VkPeerMemoryFeatureFlags
   {
     eCopySrc    = VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT,
@@ -4259,52 +3626,42 @@ namespace VULKAN_HPP_NAMESPACE
     eGenericSrc = VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT,
     eGenericDst = VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT
   };
-
   using PeerMemoryFeatureFlagBitsKHR = PeerMemoryFeatureFlagBits;
 
-  // wrapper using for bitmask VkPeerMemoryFeatureFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPeerMemoryFeatureFlags.html
   using PeerMemoryFeatureFlags    = Flags<PeerMemoryFeatureFlagBits>;
   using PeerMemoryFeatureFlagsKHR = PeerMemoryFeatureFlags;
 
   template <>
   struct FlagTraits<PeerMemoryFeatureFlagBits>
   {
-    using WrappedType                                                     = VkPeerMemoryFeatureFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PeerMemoryFeatureFlags allFlags  = PeerMemoryFeatureFlagBits::eCopySrc | PeerMemoryFeatureFlagBits::eCopyDst |
                                                                            PeerMemoryFeatureFlagBits::eGenericSrc | PeerMemoryFeatureFlagBits::eGenericDst;
   };
 
-  // wrapper class for enum VkMemoryAllocateFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryAllocateFlagBits.html
   enum class MemoryAllocateFlagBits : VkMemoryAllocateFlags
   {
     eDeviceMask                 = VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT,
     eDeviceAddress              = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT,
-    eDeviceAddressCaptureReplay = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT,
-    eZeroInitializeEXT          = VK_MEMORY_ALLOCATE_ZERO_INITIALIZE_BIT_EXT
+    eDeviceAddressCaptureReplay = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT
   };
-
   using MemoryAllocateFlagBitsKHR = MemoryAllocateFlagBits;
 
-  // wrapper using for bitmask VkMemoryAllocateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryAllocateFlags.html
   using MemoryAllocateFlags    = Flags<MemoryAllocateFlagBits>;
   using MemoryAllocateFlagsKHR = MemoryAllocateFlags;
 
   template <>
   struct FlagTraits<MemoryAllocateFlagBits>
   {
-    using WrappedType                                                  = VkMemoryAllocateFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryAllocateFlags allFlags  = MemoryAllocateFlagBits::eDeviceMask | MemoryAllocateFlagBits::eDeviceAddress |
-                                                                        MemoryAllocateFlagBits::eDeviceAddressCaptureReplay |
-                                                                        MemoryAllocateFlagBits::eZeroInitializeEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryAllocateFlags allFlags =
+      MemoryAllocateFlagBits::eDeviceMask | MemoryAllocateFlagBits::eDeviceAddress | MemoryAllocateFlagBits::eDeviceAddressCaptureReplay;
   };
 
   enum class CommandPoolTrimFlagBits : VkCommandPoolTrimFlags
   {
   };
 
-  // wrapper using for bitmask VkCommandPoolTrimFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolTrimFlags.html
   using CommandPoolTrimFlags    = Flags<CommandPoolTrimFlagBits>;
   using CommandPoolTrimFlagsKHR = CommandPoolTrimFlags;
 
@@ -4315,8 +3672,65 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR CommandPoolTrimFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkExternalMemoryHandleTypeFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryHandleTypeFlagBits.html
+  enum class PointClippingBehavior
+  {
+    eAllClipPlanes      = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES,
+    eUserClipPlanesOnly = VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY
+  };
+  using PointClippingBehaviorKHR = PointClippingBehavior;
+
+  enum class TessellationDomainOrigin
+  {
+    eUpperLeft = VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT,
+    eLowerLeft = VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT
+  };
+  using TessellationDomainOriginKHR = TessellationDomainOrigin;
+
+  enum class SamplerYcbcrModelConversion
+  {
+    eRgbIdentity   = VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY,
+    eYcbcrIdentity = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY,
+    eYcbcr709      = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709,
+    eYcbcr601      = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601,
+    eYcbcr2020     = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020
+  };
+  using SamplerYcbcrModelConversionKHR = SamplerYcbcrModelConversion;
+
+  enum class SamplerYcbcrRange
+  {
+    eItuFull   = VK_SAMPLER_YCBCR_RANGE_ITU_FULL,
+    eItuNarrow = VK_SAMPLER_YCBCR_RANGE_ITU_NARROW
+  };
+  using SamplerYcbcrRangeKHR = SamplerYcbcrRange;
+
+  enum class ChromaLocation
+  {
+    eCositedEven = VK_CHROMA_LOCATION_COSITED_EVEN,
+    eMidpoint    = VK_CHROMA_LOCATION_MIDPOINT
+  };
+  using ChromaLocationKHR = ChromaLocation;
+
+  enum class DescriptorUpdateTemplateType
+  {
+    eDescriptorSet      = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET,
+    ePushDescriptorsKHR = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR
+  };
+  using DescriptorUpdateTemplateTypeKHR = DescriptorUpdateTemplateType;
+
+  enum class DescriptorUpdateTemplateCreateFlagBits : VkDescriptorUpdateTemplateCreateFlags
+  {
+  };
+
+  using DescriptorUpdateTemplateCreateFlags    = Flags<DescriptorUpdateTemplateCreateFlagBits>;
+  using DescriptorUpdateTemplateCreateFlagsKHR = DescriptorUpdateTemplateCreateFlags;
+
+  template <>
+  struct FlagTraits<DescriptorUpdateTemplateCreateFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorUpdateTemplateCreateFlags allFlags  = {};
+  };
+
   enum class ExternalMemoryHandleTypeFlagBits : VkExternalMemoryHandleTypeFlags
   {
     eOpaqueFd        = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
@@ -4336,30 +3750,18 @@ namespace VULKAN_HPP_NAMESPACE
     eZirconVmoFUCHSIA = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA,
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
     eRdmaAddressNV = VK_EXTERNAL_MEMORY_HANDLE_TYPE_RDMA_ADDRESS_BIT_NV,
-#if defined( VK_USE_PLATFORM_OHOS )
-    eOhNativeBufferOHOS = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OH_NATIVE_BUFFER_BIT_OHOS,
-#endif /*VK_USE_PLATFORM_OHOS*/
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-    eScreenBufferQNX = VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX,
+    eScreenBufferQNX = VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-    eMtlbufferEXT  = VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT,
-    eMtltextureEXT = VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT,
-    eMtlheapEXT    = VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
   };
-
   using ExternalMemoryHandleTypeFlagBitsKHR = ExternalMemoryHandleTypeFlagBits;
 
-  // wrapper using for bitmask VkExternalMemoryHandleTypeFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryHandleTypeFlags.html
   using ExternalMemoryHandleTypeFlags    = Flags<ExternalMemoryHandleTypeFlagBits>;
   using ExternalMemoryHandleTypeFlagsKHR = ExternalMemoryHandleTypeFlags;
 
   template <>
   struct FlagTraits<ExternalMemoryHandleTypeFlagBits>
   {
-    using WrappedType                                                            = VkExternalMemoryHandleTypeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalMemoryHandleTypeFlags allFlags =
       ExternalMemoryHandleTypeFlagBits::eOpaqueFd | ExternalMemoryHandleTypeFlagBits::eOpaqueWin32 | ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt |
@@ -4373,43 +3775,31 @@ namespace VULKAN_HPP_NAMESPACE
       | ExternalMemoryHandleTypeFlagBits::eZirconVmoFUCHSIA
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
       | ExternalMemoryHandleTypeFlagBits::eRdmaAddressNV
-#if defined( VK_USE_PLATFORM_OHOS )
-      | ExternalMemoryHandleTypeFlagBits::eOhNativeBufferOHOS
-#endif /*VK_USE_PLATFORM_OHOS*/
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
       | ExternalMemoryHandleTypeFlagBits::eScreenBufferQNX
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-      | ExternalMemoryHandleTypeFlagBits::eMtlbufferEXT | ExternalMemoryHandleTypeFlagBits::eMtltextureEXT | ExternalMemoryHandleTypeFlagBits::eMtlheapEXT
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
       ;
   };
 
-  // wrapper class for enum VkExternalMemoryFeatureFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryFeatureFlagBits.html
   enum class ExternalMemoryFeatureFlagBits : VkExternalMemoryFeatureFlags
   {
     eDedicatedOnly = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT,
     eExportable    = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT,
     eImportable    = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT
   };
-
   using ExternalMemoryFeatureFlagBitsKHR = ExternalMemoryFeatureFlagBits;
 
-  // wrapper using for bitmask VkExternalMemoryFeatureFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryFeatureFlags.html
   using ExternalMemoryFeatureFlags    = Flags<ExternalMemoryFeatureFlagBits>;
   using ExternalMemoryFeatureFlagsKHR = ExternalMemoryFeatureFlags;
 
   template <>
   struct FlagTraits<ExternalMemoryFeatureFlagBits>
   {
-    using WrappedType                                                         = VkExternalMemoryFeatureFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalMemoryFeatureFlags allFlags =
       ExternalMemoryFeatureFlagBits::eDedicatedOnly | ExternalMemoryFeatureFlagBits::eExportable | ExternalMemoryFeatureFlagBits::eImportable;
   };
 
-  // wrapper class for enum VkExternalFenceHandleTypeFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFenceHandleTypeFlagBits.html
   enum class ExternalFenceHandleTypeFlagBits : VkExternalFenceHandleTypeFlags
   {
     eOpaqueFd       = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
@@ -4417,87 +3807,70 @@ namespace VULKAN_HPP_NAMESPACE
     eOpaqueWin32Kmt = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT,
     eSyncFd         = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT
   };
-
   using ExternalFenceHandleTypeFlagBitsKHR = ExternalFenceHandleTypeFlagBits;
 
-  // wrapper using for bitmask VkExternalFenceHandleTypeFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFenceHandleTypeFlags.html
   using ExternalFenceHandleTypeFlags    = Flags<ExternalFenceHandleTypeFlagBits>;
   using ExternalFenceHandleTypeFlagsKHR = ExternalFenceHandleTypeFlags;
 
   template <>
   struct FlagTraits<ExternalFenceHandleTypeFlagBits>
   {
-    using WrappedType                                                           = VkExternalFenceHandleTypeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                         isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalFenceHandleTypeFlags allFlags =
       ExternalFenceHandleTypeFlagBits::eOpaqueFd | ExternalFenceHandleTypeFlagBits::eOpaqueWin32 | ExternalFenceHandleTypeFlagBits::eOpaqueWin32Kmt |
       ExternalFenceHandleTypeFlagBits::eSyncFd;
   };
 
-  // wrapper class for enum VkExternalFenceFeatureFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFenceFeatureFlagBits.html
   enum class ExternalFenceFeatureFlagBits : VkExternalFenceFeatureFlags
   {
     eExportable = VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT,
     eImportable = VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT
   };
-
   using ExternalFenceFeatureFlagBitsKHR = ExternalFenceFeatureFlagBits;
 
-  // wrapper using for bitmask VkExternalFenceFeatureFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFenceFeatureFlags.html
   using ExternalFenceFeatureFlags    = Flags<ExternalFenceFeatureFlagBits>;
   using ExternalFenceFeatureFlagsKHR = ExternalFenceFeatureFlags;
 
   template <>
   struct FlagTraits<ExternalFenceFeatureFlagBits>
   {
-    using WrappedType                                                        = VkExternalFenceFeatureFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalFenceFeatureFlags allFlags =
       ExternalFenceFeatureFlagBits::eExportable | ExternalFenceFeatureFlagBits::eImportable;
   };
 
-  // wrapper class for enum VkFenceImportFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceImportFlagBits.html
   enum class FenceImportFlagBits : VkFenceImportFlags
   {
     eTemporary = VK_FENCE_IMPORT_TEMPORARY_BIT
   };
-
   using FenceImportFlagBitsKHR = FenceImportFlagBits;
 
-  // wrapper using for bitmask VkFenceImportFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceImportFlags.html
   using FenceImportFlags    = Flags<FenceImportFlagBits>;
   using FenceImportFlagsKHR = FenceImportFlags;
 
   template <>
   struct FlagTraits<FenceImportFlagBits>
   {
-    using WrappedType                                               = VkFenceImportFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FenceImportFlags allFlags  = FenceImportFlagBits::eTemporary;
   };
 
-  // wrapper class for enum VkSemaphoreImportFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreImportFlagBits.html
   enum class SemaphoreImportFlagBits : VkSemaphoreImportFlags
   {
     eTemporary = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT
   };
-
   using SemaphoreImportFlagBitsKHR = SemaphoreImportFlagBits;
 
-  // wrapper using for bitmask VkSemaphoreImportFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreImportFlags.html
   using SemaphoreImportFlags    = Flags<SemaphoreImportFlagBits>;
   using SemaphoreImportFlagsKHR = SemaphoreImportFlags;
 
   template <>
   struct FlagTraits<SemaphoreImportFlagBits>
   {
-    using WrappedType                                                   = VkSemaphoreImportFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SemaphoreImportFlags allFlags  = SemaphoreImportFlagBits::eTemporary;
   };
 
-  // wrapper class for enum VkExternalSemaphoreHandleTypeFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalSemaphoreHandleTypeFlagBits.html
   enum class ExternalSemaphoreHandleTypeFlagBits : VkExternalSemaphoreHandleTypeFlags
   {
     eOpaqueFd       = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT,
@@ -4510,18 +3883,14 @@ namespace VULKAN_HPP_NAMESPACE
     eZirconEventFUCHSIA = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
   };
-
   using ExternalSemaphoreHandleTypeFlagBitsKHR = ExternalSemaphoreHandleTypeFlagBits;
 
-  // wrapper using for bitmask VkExternalSemaphoreHandleTypeFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalSemaphoreHandleTypeFlags.html
   using ExternalSemaphoreHandleTypeFlags    = Flags<ExternalSemaphoreHandleTypeFlagBits>;
   using ExternalSemaphoreHandleTypeFlagsKHR = ExternalSemaphoreHandleTypeFlags;
 
   template <>
   struct FlagTraits<ExternalSemaphoreHandleTypeFlagBits>
   {
-    using WrappedType                                                               = VkExternalSemaphoreHandleTypeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalSemaphoreHandleTypeFlags allFlags =
       ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd | ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32 |
@@ -4532,138 +3901,26 @@ namespace VULKAN_HPP_NAMESPACE
       ;
   };
 
-  // wrapper class for enum VkExternalSemaphoreFeatureFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalSemaphoreFeatureFlagBits.html
   enum class ExternalSemaphoreFeatureFlagBits : VkExternalSemaphoreFeatureFlags
   {
     eExportable = VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT,
     eImportable = VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT
   };
-
   using ExternalSemaphoreFeatureFlagBitsKHR = ExternalSemaphoreFeatureFlagBits;
 
-  // wrapper using for bitmask VkExternalSemaphoreFeatureFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalSemaphoreFeatureFlags.html
   using ExternalSemaphoreFeatureFlags    = Flags<ExternalSemaphoreFeatureFlagBits>;
   using ExternalSemaphoreFeatureFlagsKHR = ExternalSemaphoreFeatureFlags;
 
   template <>
   struct FlagTraits<ExternalSemaphoreFeatureFlagBits>
   {
-    using WrappedType                                                            = VkExternalSemaphoreFeatureFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalSemaphoreFeatureFlags allFlags =
       ExternalSemaphoreFeatureFlagBits::eExportable | ExternalSemaphoreFeatureFlagBits::eImportable;
   };
 
-  // wrapper class for enum VkSubgroupFeatureFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubgroupFeatureFlagBits.html
-  enum class SubgroupFeatureFlagBits : VkSubgroupFeatureFlags
-  {
-    eBasic              = VK_SUBGROUP_FEATURE_BASIC_BIT,
-    eVote               = VK_SUBGROUP_FEATURE_VOTE_BIT,
-    eArithmetic         = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT,
-    eBallot             = VK_SUBGROUP_FEATURE_BALLOT_BIT,
-    eShuffle            = VK_SUBGROUP_FEATURE_SHUFFLE_BIT,
-    eShuffleRelative    = VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT,
-    eClustered          = VK_SUBGROUP_FEATURE_CLUSTERED_BIT,
-    eQuad               = VK_SUBGROUP_FEATURE_QUAD_BIT,
-    eRotate             = VK_SUBGROUP_FEATURE_ROTATE_BIT,
-    eRotateKHR          = VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR,
-    eRotateClustered    = VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT,
-    eRotateClusteredKHR = VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR,
-    ePartitionedNV      = VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV
-  };
-
-  // wrapper using for bitmask VkSubgroupFeatureFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubgroupFeatureFlags.html
-  using SubgroupFeatureFlags = Flags<SubgroupFeatureFlagBits>;
-
-  template <>
-  struct FlagTraits<SubgroupFeatureFlagBits>
-  {
-    using WrappedType                                                   = VkSubgroupFeatureFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR SubgroupFeatureFlags allFlags =
-      SubgroupFeatureFlagBits::eBasic | SubgroupFeatureFlagBits::eVote | SubgroupFeatureFlagBits::eArithmetic | SubgroupFeatureFlagBits::eBallot |
-      SubgroupFeatureFlagBits::eShuffle | SubgroupFeatureFlagBits::eShuffleRelative | SubgroupFeatureFlagBits::eClustered | SubgroupFeatureFlagBits::eQuad |
-      SubgroupFeatureFlagBits::eRotate | SubgroupFeatureFlagBits::eRotateClustered | SubgroupFeatureFlagBits::ePartitionedNV;
-  };
-
-  // wrapper class for enum VkDescriptorUpdateTemplateType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplateType.html
-  enum class DescriptorUpdateTemplateType
-  {
-    eDescriptorSet   = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET,
-    ePushDescriptors = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS
-  };
-
-  using DescriptorUpdateTemplateTypeKHR = DescriptorUpdateTemplateType;
-
-  enum class DescriptorUpdateTemplateCreateFlagBits : VkDescriptorUpdateTemplateCreateFlags
-  {
-  };
-
-  // wrapper using for bitmask VkDescriptorUpdateTemplateCreateFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplateCreateFlags.html
-  using DescriptorUpdateTemplateCreateFlags    = Flags<DescriptorUpdateTemplateCreateFlagBits>;
-  using DescriptorUpdateTemplateCreateFlagsKHR = DescriptorUpdateTemplateCreateFlags;
-
-  template <>
-  struct FlagTraits<DescriptorUpdateTemplateCreateFlagBits>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorUpdateTemplateCreateFlags allFlags  = {};
-  };
-
-  // wrapper class for enum VkSamplerYcbcrModelConversion, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrModelConversion.html
-  enum class SamplerYcbcrModelConversion
-  {
-    eRgbIdentity   = VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY,
-    eYcbcrIdentity = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY,
-    eYcbcr709      = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709,
-    eYcbcr601      = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601,
-    eYcbcr2020     = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020
-  };
-
-  using SamplerYcbcrModelConversionKHR = SamplerYcbcrModelConversion;
-
-  // wrapper class for enum VkSamplerYcbcrRange, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrRange.html
-  enum class SamplerYcbcrRange
-  {
-    eItuFull   = VK_SAMPLER_YCBCR_RANGE_ITU_FULL,
-    eItuNarrow = VK_SAMPLER_YCBCR_RANGE_ITU_NARROW
-  };
-
-  using SamplerYcbcrRangeKHR = SamplerYcbcrRange;
-
-  // wrapper class for enum VkChromaLocation, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkChromaLocation.html
-  enum class ChromaLocation
-  {
-    eCositedEven = VK_CHROMA_LOCATION_COSITED_EVEN,
-    eMidpoint    = VK_CHROMA_LOCATION_MIDPOINT
-  };
-
-  using ChromaLocationKHR = ChromaLocation;
-
-  // wrapper class for enum VkPointClippingBehavior, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPointClippingBehavior.html
-  enum class PointClippingBehavior
-  {
-    eAllClipPlanes      = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES,
-    eUserClipPlanesOnly = VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY
-  };
-
-  using PointClippingBehaviorKHR = PointClippingBehavior;
-
-  // wrapper class for enum VkTessellationDomainOrigin, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTessellationDomainOrigin.html
-  enum class TessellationDomainOrigin
-  {
-    eUpperLeft = VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT,
-    eLowerLeft = VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT
-  };
-
-  using TessellationDomainOriginKHR = TessellationDomainOrigin;
-
   //=== VK_VERSION_1_2 ===
 
-  // wrapper class for enum VkDriverId, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDriverId.html
   enum class DriverId
   {
     eAmdProprietary            = VK_DRIVER_ID_AMD_PROPRIETARY,
@@ -4691,54 +3948,18 @@ namespace VULKAN_HPP_NAMESPACE
     eMesaDozen                 = VK_DRIVER_ID_MESA_DOZEN,
     eMesaNvk                   = VK_DRIVER_ID_MESA_NVK,
     eImaginationOpenSourceMESA = VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA,
-    eMesaHoneykrisp            = VK_DRIVER_ID_MESA_HONEYKRISP,
-    eVulkanScEmulationOnVulkan = VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN,
-    eMesaKosmickrisp           = VK_DRIVER_ID_MESA_KOSMICKRISP
+    eMesaAgxv                  = VK_DRIVER_ID_MESA_AGXV
   };
-
   using DriverIdKHR = DriverId;
 
-  // wrapper class for enum VkSemaphoreType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreType.html
-  enum class SemaphoreType
-  {
-    eBinary   = VK_SEMAPHORE_TYPE_BINARY,
-    eTimeline = VK_SEMAPHORE_TYPE_TIMELINE
-  };
-
-  using SemaphoreTypeKHR = SemaphoreType;
-
-  // wrapper class for enum VkSemaphoreWaitFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreWaitFlagBits.html
-  enum class SemaphoreWaitFlagBits : VkSemaphoreWaitFlags
-  {
-    eAny = VK_SEMAPHORE_WAIT_ANY_BIT
-  };
-
-  using SemaphoreWaitFlagBitsKHR = SemaphoreWaitFlagBits;
-
-  // wrapper using for bitmask VkSemaphoreWaitFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreWaitFlags.html
-  using SemaphoreWaitFlags    = Flags<SemaphoreWaitFlagBits>;
-  using SemaphoreWaitFlagsKHR = SemaphoreWaitFlags;
-
-  template <>
-  struct FlagTraits<SemaphoreWaitFlagBits>
-  {
-    using WrappedType                                                 = VkSemaphoreWaitFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR SemaphoreWaitFlags allFlags  = SemaphoreWaitFlagBits::eAny;
-  };
-
-  // wrapper class for enum VkShaderFloatControlsIndependence, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderFloatControlsIndependence.html
   enum class ShaderFloatControlsIndependence
   {
     e32BitOnly = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY,
     eAll       = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL,
     eNone      = VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE
   };
-
   using ShaderFloatControlsIndependenceKHR = ShaderFloatControlsIndependence;
 
-  // wrapper class for enum VkDescriptorBindingFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorBindingFlagBits.html
   enum class DescriptorBindingFlagBits : VkDescriptorBindingFlags
   {
     eUpdateAfterBind          = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
@@ -4746,35 +3967,20 @@ namespace VULKAN_HPP_NAMESPACE
     ePartiallyBound           = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT,
     eVariableDescriptorCount  = VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT
   };
-
   using DescriptorBindingFlagBitsEXT = DescriptorBindingFlagBits;
 
-  // wrapper using for bitmask VkDescriptorBindingFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorBindingFlags.html
   using DescriptorBindingFlags    = Flags<DescriptorBindingFlagBits>;
   using DescriptorBindingFlagsEXT = DescriptorBindingFlags;
 
   template <>
   struct FlagTraits<DescriptorBindingFlagBits>
   {
-    using WrappedType                                                     = VkDescriptorBindingFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DescriptorBindingFlags allFlags =
       DescriptorBindingFlagBits::eUpdateAfterBind | DescriptorBindingFlagBits::eUpdateUnusedWhilePending | DescriptorBindingFlagBits::ePartiallyBound |
       DescriptorBindingFlagBits::eVariableDescriptorCount;
   };
 
-  // wrapper class for enum VkSamplerReductionMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerReductionMode.html
-  enum class SamplerReductionMode
-  {
-    eWeightedAverage               = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE,
-    eMin                           = VK_SAMPLER_REDUCTION_MODE_MIN,
-    eMax                           = VK_SAMPLER_REDUCTION_MODE_MAX,
-    eWeightedAverageRangeclampQCOM = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_RANGECLAMP_QCOM
-  };
-
-  using SamplerReductionModeEXT = SamplerReductionMode;
-
-  // wrapper class for enum VkResolveModeFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveModeFlagBits.html
   enum class ResolveModeFlagBits : VkResolveModeFlags
   {
     eNone       = VK_RESOLVE_MODE_NONE,
@@ -4783,33 +3989,80 @@ namespace VULKAN_HPP_NAMESPACE
     eMin        = VK_RESOLVE_MODE_MIN_BIT,
     eMax        = VK_RESOLVE_MODE_MAX_BIT,
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-    eExternalFormatDownsampleANDROID = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID,
+    eExternalFormatDownsampleANDROID = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-    eCustomEXT = VK_RESOLVE_MODE_CUSTOM_BIT_EXT
   };
-
   using ResolveModeFlagBitsKHR = ResolveModeFlagBits;
 
-  // wrapper using for bitmask VkResolveModeFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveModeFlags.html
   using ResolveModeFlags    = Flags<ResolveModeFlagBits>;
   using ResolveModeFlagsKHR = ResolveModeFlags;
 
   template <>
   struct FlagTraits<ResolveModeFlagBits>
   {
-    using WrappedType                                               = VkResolveModeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ResolveModeFlags allFlags  = ResolveModeFlagBits::eNone | ResolveModeFlagBits::eSampleZero |
                                                                      ResolveModeFlagBits::eAverage | ResolveModeFlagBits::eMin | ResolveModeFlagBits::eMax
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
                                                                    | ResolveModeFlagBits::eExternalFormatDownsampleANDROID
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-                                                                   | ResolveModeFlagBits::eCustomEXT;
+      ;
+  };
+
+  enum class SamplerReductionMode
+  {
+    eWeightedAverage               = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE,
+    eMin                           = VK_SAMPLER_REDUCTION_MODE_MIN,
+    eMax                           = VK_SAMPLER_REDUCTION_MODE_MAX,
+    eWeightedAverageRangeclampQCOM = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_RANGECLAMP_QCOM
+  };
+  using SamplerReductionModeEXT = SamplerReductionMode;
+
+  enum class SemaphoreType
+  {
+    eBinary   = VK_SEMAPHORE_TYPE_BINARY,
+    eTimeline = VK_SEMAPHORE_TYPE_TIMELINE
+  };
+  using SemaphoreTypeKHR = SemaphoreType;
+
+  enum class SemaphoreWaitFlagBits : VkSemaphoreWaitFlags
+  {
+    eAny = VK_SEMAPHORE_WAIT_ANY_BIT
+  };
+  using SemaphoreWaitFlagBitsKHR = SemaphoreWaitFlagBits;
+
+  using SemaphoreWaitFlags    = Flags<SemaphoreWaitFlagBits>;
+  using SemaphoreWaitFlagsKHR = SemaphoreWaitFlags;
+
+  template <>
+  struct FlagTraits<SemaphoreWaitFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR SemaphoreWaitFlags allFlags  = SemaphoreWaitFlagBits::eAny;
   };
 
   //=== VK_VERSION_1_3 ===
 
-  // wrapper class for enum VkToolPurposeFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkToolPurposeFlagBits.html
+  enum class PipelineCreationFeedbackFlagBits : VkPipelineCreationFeedbackFlags
+  {
+    eValid                       = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT,
+    eApplicationPipelineCacheHit = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT,
+    eBasePipelineAcceleration    = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT
+  };
+  using PipelineCreationFeedbackFlagBitsEXT = PipelineCreationFeedbackFlagBits;
+
+  using PipelineCreationFeedbackFlags    = Flags<PipelineCreationFeedbackFlagBits>;
+  using PipelineCreationFeedbackFlagsEXT = PipelineCreationFeedbackFlags;
+
+  template <>
+  struct FlagTraits<PipelineCreationFeedbackFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreationFeedbackFlags allFlags  = PipelineCreationFeedbackFlagBits::eValid |
+                                                                                  PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit |
+                                                                                  PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration;
+  };
+
   enum class ToolPurposeFlagBits : VkToolPurposeFlags
   {
     eValidation         = VK_TOOL_PURPOSE_VALIDATION_BIT,
@@ -4820,17 +4073,14 @@ namespace VULKAN_HPP_NAMESPACE
     eDebugReportingEXT  = VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT,
     eDebugMarkersEXT    = VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT
   };
-
   using ToolPurposeFlagBitsEXT = ToolPurposeFlagBits;
 
-  // wrapper using for bitmask VkToolPurposeFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkToolPurposeFlags.html
   using ToolPurposeFlags    = Flags<ToolPurposeFlagBits>;
   using ToolPurposeFlagsEXT = ToolPurposeFlags;
 
   template <>
   struct FlagTraits<ToolPurposeFlagBits>
   {
-    using WrappedType                                               = VkToolPurposeFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ToolPurposeFlags allFlags =
       ToolPurposeFlagBits::eValidation | ToolPurposeFlagBits::eProfiling | ToolPurposeFlagBits::eTracing | ToolPurposeFlagBits::eAdditionalFeatures |
@@ -4840,10 +4090,8 @@ namespace VULKAN_HPP_NAMESPACE
   enum class PrivateDataSlotCreateFlagBits : VkPrivateDataSlotCreateFlags
   {
   };
-
   using PrivateDataSlotCreateFlagBitsEXT = PrivateDataSlotCreateFlagBits;
 
-  // wrapper using for bitmask VkPrivateDataSlotCreateFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPrivateDataSlotCreateFlags.html
   using PrivateDataSlotCreateFlags    = Flags<PrivateDataSlotCreateFlagBits>;
   using PrivateDataSlotCreateFlagsEXT = PrivateDataSlotCreateFlags;
 
@@ -4854,7 +4102,6 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR PrivateDataSlotCreateFlags allFlags  = {};
   };
 
-  // wrapper class for enum VkPipelineStageFlagBits2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineStageFlagBits2.html
   enum class PipelineStageFlagBits2 : VkPipelineStageFlags2
   {
     eNone                             = VK_PIPELINE_STAGE_2_NONE,
@@ -4887,7 +4134,6 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoEncodeKHR                   = VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR,
     eTransformFeedbackEXT             = VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT,
     eConditionalRenderingEXT          = VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT,
-    eCommandPreprocessEXT             = VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_EXT,
     eCommandPreprocessNV              = VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV,
     eFragmentShadingRateAttachmentKHR = VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
     eShadingRateImageNV               = VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV,
@@ -4906,23 +4152,16 @@ namespace VULKAN_HPP_NAMESPACE
     eAccelerationStructureCopyKHR     = VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_COPY_BIT_KHR,
     eMicromapBuildEXT                 = VK_PIPELINE_STAGE_2_MICROMAP_BUILD_BIT_EXT,
     eClusterCullingShaderHUAWEI       = VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER_BIT_HUAWEI,
-    eOpticalFlowNV                    = VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV,
-    eConvertCooperativeVectorMatrixNV = VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV,
-    eDataGraphARM                     = VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM,
-    eCopyIndirectKHR                  = VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR,
-    eMemoryDecompressionEXT           = VK_PIPELINE_STAGE_2_MEMORY_DECOMPRESSION_BIT_EXT
+    eOpticalFlowNV                    = VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV
   };
-
   using PipelineStageFlagBits2KHR = PipelineStageFlagBits2;
 
-  // wrapper using for bitmask VkPipelineStageFlags2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineStageFlags2.html
   using PipelineStageFlags2    = Flags<PipelineStageFlagBits2>;
   using PipelineStageFlags2KHR = PipelineStageFlags2;
 
   template <>
   struct FlagTraits<PipelineStageFlagBits2>
   {
-    using WrappedType                                                  = VkPipelineStageFlagBits2;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineStageFlags2 allFlags =
       PipelineStageFlagBits2::eNone | PipelineStageFlagBits2::eTopOfPipe | PipelineStageFlagBits2::eDrawIndirect | PipelineStageFlagBits2::eVertexInput |
@@ -4933,16 +4172,14 @@ namespace VULKAN_HPP_NAMESPACE
       PipelineStageFlagBits2::eAllCommands | PipelineStageFlagBits2::eCopy | PipelineStageFlagBits2::eResolve | PipelineStageFlagBits2::eBlit |
       PipelineStageFlagBits2::eClear | PipelineStageFlagBits2::eIndexInput | PipelineStageFlagBits2::eVertexAttributeInput |
       PipelineStageFlagBits2::ePreRasterizationShaders | PipelineStageFlagBits2::eVideoDecodeKHR | PipelineStageFlagBits2::eVideoEncodeKHR |
-      PipelineStageFlagBits2::eTransformFeedbackEXT | PipelineStageFlagBits2::eConditionalRenderingEXT | PipelineStageFlagBits2::eCommandPreprocessEXT |
+      PipelineStageFlagBits2::eTransformFeedbackEXT | PipelineStageFlagBits2::eConditionalRenderingEXT | PipelineStageFlagBits2::eCommandPreprocessNV |
       PipelineStageFlagBits2::eFragmentShadingRateAttachmentKHR | PipelineStageFlagBits2::eAccelerationStructureBuildKHR |
       PipelineStageFlagBits2::eRayTracingShaderKHR | PipelineStageFlagBits2::eFragmentDensityProcessEXT | PipelineStageFlagBits2::eTaskShaderEXT |
       PipelineStageFlagBits2::eMeshShaderEXT | PipelineStageFlagBits2::eSubpassShaderHUAWEI | PipelineStageFlagBits2::eInvocationMaskHUAWEI |
       PipelineStageFlagBits2::eAccelerationStructureCopyKHR | PipelineStageFlagBits2::eMicromapBuildEXT | PipelineStageFlagBits2::eClusterCullingShaderHUAWEI |
-      PipelineStageFlagBits2::eOpticalFlowNV | PipelineStageFlagBits2::eConvertCooperativeVectorMatrixNV | PipelineStageFlagBits2::eDataGraphARM |
-      PipelineStageFlagBits2::eCopyIndirectKHR | PipelineStageFlagBits2::eMemoryDecompressionEXT;
+      PipelineStageFlagBits2::eOpticalFlowNV;
   };
 
-  // wrapper class for enum VkAccessFlagBits2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlagBits2.html
   enum class AccessFlagBits2 : VkAccessFlags2
   {
     eNone                                 = VK_ACCESS_2_NONE,
@@ -4970,15 +4207,11 @@ namespace VULKAN_HPP_NAMESPACE
     eVideoDecodeWriteKHR                  = VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR,
     eVideoEncodeReadKHR                   = VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR,
     eVideoEncodeWriteKHR                  = VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR,
-    eShaderTileAttachmentReadQCOM         = VK_ACCESS_2_SHADER_TILE_ATTACHMENT_READ_BIT_QCOM,
-    eShaderTileAttachmentWriteQCOM        = VK_ACCESS_2_SHADER_TILE_ATTACHMENT_WRITE_BIT_QCOM,
     eTransformFeedbackWriteEXT            = VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT,
     eTransformFeedbackCounterReadEXT      = VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT,
     eTransformFeedbackCounterWriteEXT     = VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
     eConditionalRenderingReadEXT          = VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT,
-    eCommandPreprocessReadEXT             = VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_EXT,
     eCommandPreprocessReadNV              = VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV,
-    eCommandPreprocessWriteEXT            = VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_EXT,
     eCommandPreprocessWriteNV             = VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV,
     eFragmentShadingRateAttachmentReadKHR = VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR,
     eShadingRateImageReadNV               = VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV,
@@ -4994,23 +4227,16 @@ namespace VULKAN_HPP_NAMESPACE
     eMicromapReadEXT                      = VK_ACCESS_2_MICROMAP_READ_BIT_EXT,
     eMicromapWriteEXT                     = VK_ACCESS_2_MICROMAP_WRITE_BIT_EXT,
     eOpticalFlowReadNV                    = VK_ACCESS_2_OPTICAL_FLOW_READ_BIT_NV,
-    eOpticalFlowWriteNV                   = VK_ACCESS_2_OPTICAL_FLOW_WRITE_BIT_NV,
-    eDataGraphReadARM                     = VK_ACCESS_2_DATA_GRAPH_READ_BIT_ARM,
-    eDataGraphWriteARM                    = VK_ACCESS_2_DATA_GRAPH_WRITE_BIT_ARM,
-    eMemoryDecompressionReadEXT           = VK_ACCESS_2_MEMORY_DECOMPRESSION_READ_BIT_EXT,
-    eMemoryDecompressionWriteEXT          = VK_ACCESS_2_MEMORY_DECOMPRESSION_WRITE_BIT_EXT
+    eOpticalFlowWriteNV                   = VK_ACCESS_2_OPTICAL_FLOW_WRITE_BIT_NV
   };
-
   using AccessFlagBits2KHR = AccessFlagBits2;
 
-  // wrapper using for bitmask VkAccessFlags2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlags2.html
   using AccessFlags2    = Flags<AccessFlagBits2>;
   using AccessFlags2KHR = AccessFlags2;
 
   template <>
   struct FlagTraits<AccessFlagBits2>
   {
-    using WrappedType                                           = VkAccessFlagBits2;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool         isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR AccessFlags2 allFlags =
       AccessFlagBits2::eNone | AccessFlagBits2::eIndirectCommandRead | AccessFlagBits2::eIndexRead | AccessFlagBits2::eVertexAttributeRead |
@@ -5020,37 +4246,52 @@ namespace VULKAN_HPP_NAMESPACE
       AccessFlagBits2::eHostWrite | AccessFlagBits2::eMemoryRead | AccessFlagBits2::eMemoryWrite | AccessFlagBits2::eShaderSampledRead |
       AccessFlagBits2::eShaderStorageRead | AccessFlagBits2::eShaderStorageWrite | AccessFlagBits2::eVideoDecodeReadKHR |
       AccessFlagBits2::eVideoDecodeWriteKHR | AccessFlagBits2::eVideoEncodeReadKHR | AccessFlagBits2::eVideoEncodeWriteKHR |
-      AccessFlagBits2::eShaderTileAttachmentReadQCOM | AccessFlagBits2::eShaderTileAttachmentWriteQCOM | AccessFlagBits2::eTransformFeedbackWriteEXT |
-      AccessFlagBits2::eTransformFeedbackCounterReadEXT | AccessFlagBits2::eTransformFeedbackCounterWriteEXT | AccessFlagBits2::eConditionalRenderingReadEXT |
-      AccessFlagBits2::eCommandPreprocessReadEXT | AccessFlagBits2::eCommandPreprocessWriteEXT | AccessFlagBits2::eFragmentShadingRateAttachmentReadKHR |
-      AccessFlagBits2::eAccelerationStructureReadKHR | AccessFlagBits2::eAccelerationStructureWriteKHR | AccessFlagBits2::eFragmentDensityMapReadEXT |
-      AccessFlagBits2::eColorAttachmentReadNoncoherentEXT | AccessFlagBits2::eDescriptorBufferReadEXT | AccessFlagBits2::eInvocationMaskReadHUAWEI |
-      AccessFlagBits2::eShaderBindingTableReadKHR | AccessFlagBits2::eMicromapReadEXT | AccessFlagBits2::eMicromapWriteEXT |
-      AccessFlagBits2::eOpticalFlowReadNV | AccessFlagBits2::eOpticalFlowWriteNV | AccessFlagBits2::eDataGraphReadARM | AccessFlagBits2::eDataGraphWriteARM |
-      AccessFlagBits2::eMemoryDecompressionReadEXT | AccessFlagBits2::eMemoryDecompressionWriteEXT;
+      AccessFlagBits2::eTransformFeedbackWriteEXT | AccessFlagBits2::eTransformFeedbackCounterReadEXT | AccessFlagBits2::eTransformFeedbackCounterWriteEXT |
+      AccessFlagBits2::eConditionalRenderingReadEXT | AccessFlagBits2::eCommandPreprocessReadNV | AccessFlagBits2::eCommandPreprocessWriteNV |
+      AccessFlagBits2::eFragmentShadingRateAttachmentReadKHR | AccessFlagBits2::eAccelerationStructureReadKHR |
+      AccessFlagBits2::eAccelerationStructureWriteKHR | AccessFlagBits2::eFragmentDensityMapReadEXT | AccessFlagBits2::eColorAttachmentReadNoncoherentEXT |
+      AccessFlagBits2::eDescriptorBufferReadEXT | AccessFlagBits2::eInvocationMaskReadHUAWEI | AccessFlagBits2::eShaderBindingTableReadKHR |
+      AccessFlagBits2::eMicromapReadEXT | AccessFlagBits2::eMicromapWriteEXT | AccessFlagBits2::eOpticalFlowReadNV | AccessFlagBits2::eOpticalFlowWriteNV;
   };
 
-  // wrapper class for enum VkSubmitFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubmitFlagBits.html
   enum class SubmitFlagBits : VkSubmitFlags
   {
     eProtected = VK_SUBMIT_PROTECTED_BIT
   };
-
   using SubmitFlagBitsKHR = SubmitFlagBits;
 
-  // wrapper using for bitmask VkSubmitFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubmitFlags.html
   using SubmitFlags    = Flags<SubmitFlagBits>;
   using SubmitFlagsKHR = SubmitFlags;
 
   template <>
   struct FlagTraits<SubmitFlagBits>
   {
-    using WrappedType                                          = VkSubmitFlagBits;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool        isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SubmitFlags allFlags  = SubmitFlagBits::eProtected;
   };
 
-  // wrapper class for enum VkFormatFeatureFlagBits2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatFeatureFlagBits2.html
+  enum class RenderingFlagBits : VkRenderingFlags
+  {
+    eContentsSecondaryCommandBuffers = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT,
+    eSuspending                      = VK_RENDERING_SUSPENDING_BIT,
+    eResuming                        = VK_RENDERING_RESUMING_BIT,
+    eContentsInlineEXT               = VK_RENDERING_CONTENTS_INLINE_BIT_EXT,
+    eEnableLegacyDitheringEXT        = VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT
+  };
+  using RenderingFlagBitsKHR = RenderingFlagBits;
+
+  using RenderingFlags    = Flags<RenderingFlagBits>;
+  using RenderingFlagsKHR = RenderingFlags;
+
+  template <>
+  struct FlagTraits<RenderingFlagBits>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool           isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR RenderingFlags allFlags  = RenderingFlagBits::eContentsSecondaryCommandBuffers | RenderingFlagBits::eSuspending |
+                                                                   RenderingFlagBits::eResuming | RenderingFlagBits::eContentsInlineEXT |
+                                                                   RenderingFlagBits::eEnableLegacyDitheringEXT;
+  };
+
   enum class FormatFeatureFlagBits2 : VkFormatFeatureFlags2
   {
     eSampledImage                                            = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT,
@@ -5066,6 +4307,8 @@ namespace VULKAN_HPP_NAMESPACE
     eBlitSrc                                                 = VK_FORMAT_FEATURE_2_BLIT_SRC_BIT,
     eBlitDst                                                 = VK_FORMAT_FEATURE_2_BLIT_DST_BIT,
     eSampledImageFilterLinear                                = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
+    eSampledImageFilterCubic                                 = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT,
+    eSampledImageFilterCubicEXT                              = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT,
     eTransferSrc                                             = VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT,
     eTransferDst                                             = VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT,
     eSampledImageFilterMinmax                                = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT,
@@ -5080,388 +4323,53 @@ namespace VULKAN_HPP_NAMESPACE
     eStorageReadWithoutFormat             = VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT,
     eStorageWriteWithoutFormat            = VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT,
     eSampledImageDepthComparison          = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT,
-    eSampledImageFilterCubic              = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT,
-    eSampledImageFilterCubicEXT           = VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT,
-    eHostImageTransfer                    = VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT,
-    eHostImageTransferEXT                 = VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT,
     eVideoDecodeOutputKHR                 = VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR,
     eVideoDecodeDpbKHR                    = VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR,
     eAccelerationStructureVertexBufferKHR = VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR,
     eFragmentDensityMapEXT                = VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT,
     eFragmentShadingRateAttachmentKHR     = VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    eHostImageTransferEXT                 = VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT,
     eVideoEncodeInputKHR                  = VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR,
     eVideoEncodeDpbKHR                    = VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR,
-    eAccelerationStructureRadiusBufferNV  = VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_RADIUS_BUFFER_BIT_NV,
     eLinearColorAttachmentNV              = VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV,
     eWeightImageQCOM                      = VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM,
     eWeightSampledImageQCOM               = VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM,
     eBlockMatchingQCOM                    = VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM,
     eBoxFilterSampledQCOM                 = VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM,
-    eTensorShaderARM                      = VK_FORMAT_FEATURE_2_TENSOR_SHADER_BIT_ARM,
-    eTensorImageAliasingARM               = VK_FORMAT_FEATURE_2_TENSOR_IMAGE_ALIASING_BIT_ARM,
     eOpticalFlowImageNV                   = VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV,
     eOpticalFlowVectorNV                  = VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV,
-    eOpticalFlowCostNV                    = VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV,
-    eTensorDataGraphARM                   = VK_FORMAT_FEATURE_2_TENSOR_DATA_GRAPH_BIT_ARM,
-    eCopyImageIndirectDstKHR              = VK_FORMAT_FEATURE_2_COPY_IMAGE_INDIRECT_DST_BIT_KHR,
-    eVideoEncodeQuantizationDeltaMapKHR   = VK_FORMAT_FEATURE_2_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR,
-    eVideoEncodeEmphasisMapKHR            = VK_FORMAT_FEATURE_2_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR,
-    eDepthCopyOnComputeQueueKHR           = VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_COMPUTE_QUEUE_BIT_KHR,
-    eDepthCopyOnTransferQueueKHR          = VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_TRANSFER_QUEUE_BIT_KHR,
-    eStencilCopyOnComputeQueueKHR         = VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_COMPUTE_QUEUE_BIT_KHR,
-    eStencilCopyOnTransferQueueKHR        = VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_TRANSFER_QUEUE_BIT_KHR
+    eOpticalFlowCostNV                    = VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV
   };
-
   using FormatFeatureFlagBits2KHR = FormatFeatureFlagBits2;
 
-  // wrapper using for bitmask VkFormatFeatureFlags2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatFeatureFlags2.html
   using FormatFeatureFlags2    = Flags<FormatFeatureFlagBits2>;
   using FormatFeatureFlags2KHR = FormatFeatureFlags2;
 
   template <>
   struct FlagTraits<FormatFeatureFlagBits2>
   {
-    using WrappedType                                                  = VkFormatFeatureFlagBits2;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FormatFeatureFlags2 allFlags =
       FormatFeatureFlagBits2::eSampledImage | FormatFeatureFlagBits2::eStorageImage | FormatFeatureFlagBits2::eStorageImageAtomic |
       FormatFeatureFlagBits2::eUniformTexelBuffer | FormatFeatureFlagBits2::eStorageTexelBuffer | FormatFeatureFlagBits2::eStorageTexelBufferAtomic |
       FormatFeatureFlagBits2::eVertexBuffer | FormatFeatureFlagBits2::eColorAttachment | FormatFeatureFlagBits2::eColorAttachmentBlend |
       FormatFeatureFlagBits2::eDepthStencilAttachment | FormatFeatureFlagBits2::eBlitSrc | FormatFeatureFlagBits2::eBlitDst |
-      FormatFeatureFlagBits2::eSampledImageFilterLinear | FormatFeatureFlagBits2::eTransferSrc | FormatFeatureFlagBits2::eTransferDst |
-      FormatFeatureFlagBits2::eSampledImageFilterMinmax | FormatFeatureFlagBits2::eMidpointChromaSamples |
+      FormatFeatureFlagBits2::eSampledImageFilterLinear | FormatFeatureFlagBits2::eSampledImageFilterCubic | FormatFeatureFlagBits2::eTransferSrc |
+      FormatFeatureFlagBits2::eTransferDst | FormatFeatureFlagBits2::eSampledImageFilterMinmax | FormatFeatureFlagBits2::eMidpointChromaSamples |
       FormatFeatureFlagBits2::eSampledImageYcbcrConversionLinearFilter | FormatFeatureFlagBits2::eSampledImageYcbcrConversionSeparateReconstructionFilter |
       FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicit |
       FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable | FormatFeatureFlagBits2::eDisjoint |
       FormatFeatureFlagBits2::eCositedChromaSamples | FormatFeatureFlagBits2::eStorageReadWithoutFormat | FormatFeatureFlagBits2::eStorageWriteWithoutFormat |
-      FormatFeatureFlagBits2::eSampledImageDepthComparison | FormatFeatureFlagBits2::eSampledImageFilterCubic | FormatFeatureFlagBits2::eHostImageTransfer |
-      FormatFeatureFlagBits2::eVideoDecodeOutputKHR | FormatFeatureFlagBits2::eVideoDecodeDpbKHR |
+      FormatFeatureFlagBits2::eSampledImageDepthComparison | FormatFeatureFlagBits2::eVideoDecodeOutputKHR | FormatFeatureFlagBits2::eVideoDecodeDpbKHR |
       FormatFeatureFlagBits2::eAccelerationStructureVertexBufferKHR | FormatFeatureFlagBits2::eFragmentDensityMapEXT |
-      FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR | FormatFeatureFlagBits2::eVideoEncodeInputKHR | FormatFeatureFlagBits2::eVideoEncodeDpbKHR |
-      FormatFeatureFlagBits2::eAccelerationStructureRadiusBufferNV | FormatFeatureFlagBits2::eLinearColorAttachmentNV |
-      FormatFeatureFlagBits2::eWeightImageQCOM | FormatFeatureFlagBits2::eWeightSampledImageQCOM | FormatFeatureFlagBits2::eBlockMatchingQCOM |
-      FormatFeatureFlagBits2::eBoxFilterSampledQCOM | FormatFeatureFlagBits2::eTensorShaderARM | FormatFeatureFlagBits2::eTensorImageAliasingARM |
-      FormatFeatureFlagBits2::eOpticalFlowImageNV | FormatFeatureFlagBits2::eOpticalFlowVectorNV | FormatFeatureFlagBits2::eOpticalFlowCostNV |
-      FormatFeatureFlagBits2::eTensorDataGraphARM | FormatFeatureFlagBits2::eCopyImageIndirectDstKHR |
-      FormatFeatureFlagBits2::eVideoEncodeQuantizationDeltaMapKHR | FormatFeatureFlagBits2::eVideoEncodeEmphasisMapKHR |
-      FormatFeatureFlagBits2::eDepthCopyOnComputeQueueKHR | FormatFeatureFlagBits2::eDepthCopyOnTransferQueueKHR |
-      FormatFeatureFlagBits2::eStencilCopyOnComputeQueueKHR | FormatFeatureFlagBits2::eStencilCopyOnTransferQueueKHR;
+      FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR | FormatFeatureFlagBits2::eHostImageTransferEXT | FormatFeatureFlagBits2::eVideoEncodeInputKHR |
+      FormatFeatureFlagBits2::eVideoEncodeDpbKHR | FormatFeatureFlagBits2::eLinearColorAttachmentNV | FormatFeatureFlagBits2::eWeightImageQCOM |
+      FormatFeatureFlagBits2::eWeightSampledImageQCOM | FormatFeatureFlagBits2::eBlockMatchingQCOM | FormatFeatureFlagBits2::eBoxFilterSampledQCOM |
+      FormatFeatureFlagBits2::eOpticalFlowImageNV | FormatFeatureFlagBits2::eOpticalFlowVectorNV | FormatFeatureFlagBits2::eOpticalFlowCostNV;
   };
 
-  // wrapper class for enum VkPipelineCreationFeedbackFlagBits, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreationFeedbackFlagBits.html
-  enum class PipelineCreationFeedbackFlagBits : VkPipelineCreationFeedbackFlags
-  {
-    eValid                       = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT,
-    eApplicationPipelineCacheHit = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT,
-    eBasePipelineAcceleration    = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT
-  };
-
-  using PipelineCreationFeedbackFlagBitsEXT = PipelineCreationFeedbackFlagBits;
-
-  // wrapper using for bitmask VkPipelineCreationFeedbackFlags, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreationFeedbackFlags.html
-  using PipelineCreationFeedbackFlags    = Flags<PipelineCreationFeedbackFlagBits>;
-  using PipelineCreationFeedbackFlagsEXT = PipelineCreationFeedbackFlags;
-
-  template <>
-  struct FlagTraits<PipelineCreationFeedbackFlagBits>
-  {
-    using WrappedType                                                            = VkPipelineCreationFeedbackFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreationFeedbackFlags allFlags  = PipelineCreationFeedbackFlagBits::eValid |
-                                                                                  PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit |
-                                                                                  PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration;
-  };
-
-  // wrapper class for enum VkRenderingFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingFlagBits.html
-  enum class RenderingFlagBits : VkRenderingFlags
-  {
-    eContentsSecondaryCommandBuffers     = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT,
-    eSuspending                          = VK_RENDERING_SUSPENDING_BIT,
-    eResuming                            = VK_RENDERING_RESUMING_BIT,
-    eEnableLegacyDitheringEXT            = VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT,
-    eContentsInlineKHR                   = VK_RENDERING_CONTENTS_INLINE_BIT_KHR,
-    eContentsInlineEXT                   = VK_RENDERING_CONTENTS_INLINE_BIT_EXT,
-    ePerLayerFragmentDensityVALVE        = VK_RENDERING_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE,
-    eFragmentRegionEXT                   = VK_RENDERING_FRAGMENT_REGION_BIT_EXT,
-    eCustomResolveEXT                    = VK_RENDERING_CUSTOM_RESOLVE_BIT_EXT,
-    eLocalReadConcurrentAccessControlKHR = VK_RENDERING_LOCAL_READ_CONCURRENT_ACCESS_CONTROL_BIT_KHR
-  };
-
-  using RenderingFlagBitsKHR = RenderingFlagBits;
-
-  // wrapper using for bitmask VkRenderingFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingFlags.html
-  using RenderingFlags    = Flags<RenderingFlagBits>;
-  using RenderingFlagsKHR = RenderingFlags;
-
-  template <>
-  struct FlagTraits<RenderingFlagBits>
-  {
-    using WrappedType                                             = VkRenderingFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR RenderingFlags allFlags =
-      RenderingFlagBits::eContentsSecondaryCommandBuffers | RenderingFlagBits::eSuspending | RenderingFlagBits::eResuming |
-      RenderingFlagBits::eEnableLegacyDitheringEXT | RenderingFlagBits::eContentsInlineKHR | RenderingFlagBits::ePerLayerFragmentDensityVALVE |
-      RenderingFlagBits::eFragmentRegionEXT | RenderingFlagBits::eCustomResolveEXT | RenderingFlagBits::eLocalReadConcurrentAccessControlKHR;
-  };
-
-  //=== VK_VERSION_1_4 ===
-
-  // wrapper class for enum VkQueueGlobalPriority, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueGlobalPriority.html
-  enum class QueueGlobalPriority
-  {
-    eLow         = VK_QUEUE_GLOBAL_PRIORITY_LOW,
-    eLowKHR      = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR,
-    eMedium      = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM,
-    eMediumKHR   = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR,
-    eHigh        = VK_QUEUE_GLOBAL_PRIORITY_HIGH,
-    eHighKHR     = VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR,
-    eRealtime    = VK_QUEUE_GLOBAL_PRIORITY_REALTIME,
-    eRealtimeKHR = VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR
-  };
-
-  using QueueGlobalPriorityEXT = QueueGlobalPriority;
-  using QueueGlobalPriorityKHR = QueueGlobalPriority;
-
-  // wrapper class for enum VkMemoryUnmapFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryUnmapFlagBits.html
-  enum class MemoryUnmapFlagBits : VkMemoryUnmapFlags
-  {
-    eReserveEXT = VK_MEMORY_UNMAP_RESERVE_BIT_EXT
-  };
-
-  using MemoryUnmapFlagBitsKHR = MemoryUnmapFlagBits;
-
-  // wrapper using for bitmask VkMemoryUnmapFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryUnmapFlags.html
-  using MemoryUnmapFlags    = Flags<MemoryUnmapFlagBits>;
-  using MemoryUnmapFlagsKHR = MemoryUnmapFlags;
-
-  template <>
-  struct FlagTraits<MemoryUnmapFlagBits>
-  {
-    using WrappedType                                               = VkMemoryUnmapFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryUnmapFlags allFlags  = MemoryUnmapFlagBits::eReserveEXT;
-  };
-
-  // wrapper class for enum VkBufferUsageFlagBits2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferUsageFlagBits2.html
-  enum class BufferUsageFlagBits2 : VkBufferUsageFlags2
-  {
-    eTransferSrc         = VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT,
-    eTransferDst         = VK_BUFFER_USAGE_2_TRANSFER_DST_BIT,
-    eUniformTexelBuffer  = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT,
-    eStorageTexelBuffer  = VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT,
-    eUniformBuffer       = VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT,
-    eStorageBuffer       = VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT,
-    eIndexBuffer         = VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT,
-    eVertexBuffer        = VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT,
-    eIndirectBuffer      = VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT,
-    eShaderDeviceAddress = VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eExecutionGraphScratchAMDX = VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eConditionalRenderingEXT                    = VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT,
-    eShaderBindingTableKHR                      = VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR,
-    eRayTracingNV                               = VK_BUFFER_USAGE_2_RAY_TRACING_BIT_NV,
-    eTransformFeedbackBufferEXT                 = VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT,
-    eTransformFeedbackCounterBufferEXT          = VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT,
-    eVideoDecodeSrcKHR                          = VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR,
-    eVideoDecodeDstKHR                          = VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR,
-    eVideoEncodeDstKHR                          = VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR,
-    eVideoEncodeSrcKHR                          = VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR,
-    eAccelerationStructureBuildInputReadOnlyKHR = VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR,
-    eAccelerationStructureStorageKHR            = VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
-    eSamplerDescriptorBufferEXT                 = VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT,
-    eResourceDescriptorBufferEXT                = VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
-    ePushDescriptorsDescriptorBufferEXT         = VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT,
-    eMicromapBuildInputReadOnlyEXT              = VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT,
-    eMicromapStorageEXT                         = VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eCompressedDataDgf1AMDX = VK_BUFFER_USAGE_2_COMPRESSED_DATA_DGF1_BIT_AMDX,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eDataGraphForeignDescriptorARM = VK_BUFFER_USAGE_2_DATA_GRAPH_FOREIGN_DESCRIPTOR_BIT_ARM,
-    eTileMemoryQCOM                = VK_BUFFER_USAGE_2_TILE_MEMORY_BIT_QCOM,
-    eMemoryDecompressionEXT        = VK_BUFFER_USAGE_2_MEMORY_DECOMPRESSION_BIT_EXT,
-    ePreprocessBufferEXT           = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT
-  };
-
-  using BufferUsageFlagBits2KHR = BufferUsageFlagBits2;
-
-  // wrapper using for bitmask VkBufferUsageFlags2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferUsageFlags2.html
-  using BufferUsageFlags2    = Flags<BufferUsageFlagBits2>;
-  using BufferUsageFlags2KHR = BufferUsageFlags2;
-
-  template <>
-  struct FlagTraits<BufferUsageFlagBits2>
-  {
-    using WrappedType                                                = VkBufferUsageFlagBits2;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR BufferUsageFlags2 allFlags =
-      BufferUsageFlagBits2::eTransferSrc | BufferUsageFlagBits2::eTransferDst | BufferUsageFlagBits2::eUniformTexelBuffer |
-      BufferUsageFlagBits2::eStorageTexelBuffer | BufferUsageFlagBits2::eUniformBuffer | BufferUsageFlagBits2::eStorageBuffer |
-      BufferUsageFlagBits2::eIndexBuffer | BufferUsageFlagBits2::eVertexBuffer | BufferUsageFlagBits2::eIndirectBuffer |
-      BufferUsageFlagBits2::eShaderDeviceAddress
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      | BufferUsageFlagBits2::eExecutionGraphScratchAMDX
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      | BufferUsageFlagBits2::eConditionalRenderingEXT | BufferUsageFlagBits2::eShaderBindingTableKHR | BufferUsageFlagBits2::eTransformFeedbackBufferEXT |
-      BufferUsageFlagBits2::eTransformFeedbackCounterBufferEXT | BufferUsageFlagBits2::eVideoDecodeSrcKHR | BufferUsageFlagBits2::eVideoDecodeDstKHR |
-      BufferUsageFlagBits2::eVideoEncodeDstKHR | BufferUsageFlagBits2::eVideoEncodeSrcKHR | BufferUsageFlagBits2::eAccelerationStructureBuildInputReadOnlyKHR |
-      BufferUsageFlagBits2::eAccelerationStructureStorageKHR | BufferUsageFlagBits2::eSamplerDescriptorBufferEXT |
-      BufferUsageFlagBits2::eResourceDescriptorBufferEXT | BufferUsageFlagBits2::ePushDescriptorsDescriptorBufferEXT |
-      BufferUsageFlagBits2::eMicromapBuildInputReadOnlyEXT | BufferUsageFlagBits2::eMicromapStorageEXT
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      | BufferUsageFlagBits2::eCompressedDataDgf1AMDX
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      | BufferUsageFlagBits2::eDataGraphForeignDescriptorARM | BufferUsageFlagBits2::eTileMemoryQCOM | BufferUsageFlagBits2::eMemoryDecompressionEXT |
-      BufferUsageFlagBits2::ePreprocessBufferEXT;
-  };
-
-  // wrapper class for enum VkHostImageCopyFlagBits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkHostImageCopyFlagBits.html
-  enum class HostImageCopyFlagBits : VkHostImageCopyFlags
-  {
-    eMemcpy = VK_HOST_IMAGE_COPY_MEMCPY_BIT
-  };
-
-  using HostImageCopyFlagBitsEXT = HostImageCopyFlagBits;
-
-  // wrapper using for bitmask VkHostImageCopyFlags, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkHostImageCopyFlags.html
-  using HostImageCopyFlags    = Flags<HostImageCopyFlagBits>;
-  using HostImageCopyFlagsEXT = HostImageCopyFlags;
-
-  template <>
-  struct FlagTraits<HostImageCopyFlagBits>
-  {
-    using WrappedType                                                 = VkHostImageCopyFlagBits;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool               isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR HostImageCopyFlags allFlags  = HostImageCopyFlagBits::eMemcpy;
-  };
-
-  // wrapper class for enum VkPipelineCreateFlagBits2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateFlagBits2.html
-  enum class PipelineCreateFlagBits2 : VkPipelineCreateFlags2
-  {
-    eDisableOptimization           = VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT,
-    eAllowDerivatives              = VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT,
-    eDerivative                    = VK_PIPELINE_CREATE_2_DERIVATIVE_BIT,
-    eViewIndexFromDeviceIndex      = VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT,
-    eDispatchBase                  = VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT,
-    eFailOnPipelineCompileRequired = VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT,
-    eEarlyReturnOnFailure          = VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT,
-    eNoProtectedAccess             = VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT,
-    eNoProtectedAccessEXT          = VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT,
-    eProtectedAccessOnly           = VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT,
-    eProtectedAccessOnlyEXT        = VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eExecutionGraphAMDX = VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX,
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eRayTracingAllowSpheresAndLinearSweptSpheresNV = VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_SPHERES_AND_LINEAR_SWEPT_SPHERES_BIT_NV,
-    eEnableLegacyDitheringEXT                      = VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT,
-    eDeferCompileNV                                = VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV,
-    eCaptureStatisticsKHR                          = VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR,
-    eCaptureInternalRepresentationsKHR             = VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR,
-    eLinkTimeOptimizationEXT                       = VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT,
-    eRetainLinkTimeOptimizationInfoEXT             = VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT,
-    eLibraryKHR                                    = VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR,
-    eRayTracingSkipTrianglesKHR                    = VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR,
-    eRayTracingSkipBuiltInPrimitives               = VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_BUILT_IN_PRIMITIVES_BIT_KHR,
-    eRayTracingSkipAabbsKHR                        = VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR,
-    eRayTracingNoNullAnyHitShadersKHR              = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR,
-    eRayTracingNoNullClosestHitShadersKHR          = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR,
-    eRayTracingNoNullMissShadersKHR                = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR,
-    eRayTracingNoNullIntersectionShadersKHR        = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR,
-    eRayTracingShaderGroupHandleCaptureReplayKHR   = VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR,
-    eIndirectBindableNV                            = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV,
-    eRayTracingAllowMotionNV                       = VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV,
-    eRenderingFragmentShadingRateAttachmentKHR     = VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
-    eRenderingFragmentDensityMapAttachmentEXT      = VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
-    eRayTracingOpacityMicromapEXT                  = VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT,
-    eColorAttachmentFeedbackLoopEXT                = VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
-    eDepthStencilAttachmentFeedbackLoopEXT         = VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
-    eRayTracingDisplacementMicromapNV              = VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV,
-    eDescriptorBufferEXT                           = VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT,
-    eDisallowOpacityMicromapARM                    = VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM,
-    eCaptureDataKHR                                = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR,
-    eIndirectBindableEXT                           = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT,
-    ePerLayerFragmentDensityVALVE                  = VK_PIPELINE_CREATE_2_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE,
-    e64BitIndexingEXT                              = VK_PIPELINE_CREATE_2_64_BIT_INDEXING_BIT_EXT
-  };
-
-  using PipelineCreateFlagBits2KHR = PipelineCreateFlagBits2;
-
-  // wrapper using for bitmask VkPipelineCreateFlags2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateFlags2.html
-  using PipelineCreateFlags2    = Flags<PipelineCreateFlagBits2>;
-  using PipelineCreateFlags2KHR = PipelineCreateFlags2;
-
-  template <>
-  struct FlagTraits<PipelineCreateFlagBits2>
-  {
-    using WrappedType                                                   = VkPipelineCreateFlagBits2;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreateFlags2 allFlags =
-      PipelineCreateFlagBits2::eDisableOptimization | PipelineCreateFlagBits2::eAllowDerivatives | PipelineCreateFlagBits2::eDerivative |
-      PipelineCreateFlagBits2::eViewIndexFromDeviceIndex | PipelineCreateFlagBits2::eDispatchBase | PipelineCreateFlagBits2::eFailOnPipelineCompileRequired |
-      PipelineCreateFlagBits2::eEarlyReturnOnFailure | PipelineCreateFlagBits2::eNoProtectedAccess | PipelineCreateFlagBits2::eProtectedAccessOnly
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      | PipelineCreateFlagBits2::eExecutionGraphAMDX
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      | PipelineCreateFlagBits2::eRayTracingAllowSpheresAndLinearSweptSpheresNV | PipelineCreateFlagBits2::eEnableLegacyDitheringEXT |
-      PipelineCreateFlagBits2::eDeferCompileNV | PipelineCreateFlagBits2::eCaptureStatisticsKHR | PipelineCreateFlagBits2::eCaptureInternalRepresentationsKHR |
-      PipelineCreateFlagBits2::eLinkTimeOptimizationEXT | PipelineCreateFlagBits2::eRetainLinkTimeOptimizationInfoEXT | PipelineCreateFlagBits2::eLibraryKHR |
-      PipelineCreateFlagBits2::eRayTracingSkipTrianglesKHR | PipelineCreateFlagBits2::eRayTracingSkipAabbsKHR |
-      PipelineCreateFlagBits2::eRayTracingNoNullAnyHitShadersKHR | PipelineCreateFlagBits2::eRayTracingNoNullClosestHitShadersKHR |
-      PipelineCreateFlagBits2::eRayTracingNoNullMissShadersKHR | PipelineCreateFlagBits2::eRayTracingNoNullIntersectionShadersKHR |
-      PipelineCreateFlagBits2::eRayTracingShaderGroupHandleCaptureReplayKHR | PipelineCreateFlagBits2::eIndirectBindableNV |
-      PipelineCreateFlagBits2::eRayTracingAllowMotionNV | PipelineCreateFlagBits2::eRenderingFragmentShadingRateAttachmentKHR |
-      PipelineCreateFlagBits2::eRenderingFragmentDensityMapAttachmentEXT | PipelineCreateFlagBits2::eRayTracingOpacityMicromapEXT |
-      PipelineCreateFlagBits2::eColorAttachmentFeedbackLoopEXT | PipelineCreateFlagBits2::eDepthStencilAttachmentFeedbackLoopEXT |
-      PipelineCreateFlagBits2::eRayTracingDisplacementMicromapNV | PipelineCreateFlagBits2::eDescriptorBufferEXT |
-      PipelineCreateFlagBits2::eDisallowOpacityMicromapARM | PipelineCreateFlagBits2::eCaptureDataKHR | PipelineCreateFlagBits2::eIndirectBindableEXT |
-      PipelineCreateFlagBits2::ePerLayerFragmentDensityVALVE | PipelineCreateFlagBits2::e64BitIndexingEXT;
-  };
-
-  // wrapper class for enum VkPipelineRobustnessBufferBehavior, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRobustnessBufferBehavior.html
-  enum class PipelineRobustnessBufferBehavior
-  {
-    eDeviceDefault       = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT,
-    eDisabled            = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED,
-    eRobustBufferAccess  = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS,
-    eRobustBufferAccess2 = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2
-  };
-
-  using PipelineRobustnessBufferBehaviorEXT = PipelineRobustnessBufferBehavior;
-
-  // wrapper class for enum VkPipelineRobustnessImageBehavior, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRobustnessImageBehavior.html
-  enum class PipelineRobustnessImageBehavior
-  {
-    eDeviceDefault      = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT,
-    eDisabled           = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED,
-    eRobustImageAccess  = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS,
-    eRobustImageAccess2 = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2
-  };
-
-  using PipelineRobustnessImageBehaviorEXT = PipelineRobustnessImageBehavior;
-
-  // wrapper class for enum VkLineRasterizationMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLineRasterizationMode.html
-  enum class LineRasterizationMode
-  {
-    eDefault              = VK_LINE_RASTERIZATION_MODE_DEFAULT,
-    eDefaultKHR           = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR,
-    eRectangular          = VK_LINE_RASTERIZATION_MODE_RECTANGULAR,
-    eRectangularKHR       = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR,
-    eBresenham            = VK_LINE_RASTERIZATION_MODE_BRESENHAM,
-    eBresenhamKHR         = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR,
-    eRectangularSmooth    = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH,
-    eRectangularSmoothKHR = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR
-  };
-
-  using LineRasterizationModeEXT = LineRasterizationMode;
-  using LineRasterizationModeKHR = LineRasterizationMode;
-
   //=== VK_KHR_surface ===
 
-  // wrapper class for enum VkSurfaceTransformFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceTransformFlagBitsKHR.html
   enum class SurfaceTransformFlagBitsKHR : VkSurfaceTransformFlagsKHR
   {
     eIdentity                  = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR,
@@ -5475,13 +4383,11 @@ namespace VULKAN_HPP_NAMESPACE
     eInherit                   = VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR
   };
 
-  // wrapper using for bitmask VkSurfaceTransformFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceTransformFlagsKHR.html
   using SurfaceTransformFlagsKHR = Flags<SurfaceTransformFlagBitsKHR>;
 
   template <>
   struct FlagTraits<SurfaceTransformFlagBitsKHR>
   {
-    using WrappedType                                                       = VkSurfaceTransformFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SurfaceTransformFlagsKHR allFlags =
       SurfaceTransformFlagBitsKHR::eIdentity | SurfaceTransformFlagBitsKHR::eRotate90 | SurfaceTransformFlagBitsKHR::eRotate180 |
@@ -5489,7 +4395,6 @@ namespace VULKAN_HPP_NAMESPACE
       SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate180 | SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate270 | SurfaceTransformFlagBitsKHR::eInherit;
   };
 
-  // wrapper class for enum VkPresentModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentModeKHR.html
   enum class PresentModeKHR
   {
     eImmediate               = VK_PRESENT_MODE_IMMEDIATE_KHR,
@@ -5497,12 +4402,9 @@ namespace VULKAN_HPP_NAMESPACE
     eFifo                    = VK_PRESENT_MODE_FIFO_KHR,
     eFifoRelaxed             = VK_PRESENT_MODE_FIFO_RELAXED_KHR,
     eSharedDemandRefresh     = VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR,
-    eSharedContinuousRefresh = VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR,
-    eFifoLatestReady         = VK_PRESENT_MODE_FIFO_LATEST_READY_KHR,
-    eFifoLatestReadyEXT      = VK_PRESENT_MODE_FIFO_LATEST_READY_EXT
+    eSharedContinuousRefresh = VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR
   };
 
-  // wrapper class for enum VkColorSpaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkColorSpaceKHR.html
   enum class ColorSpaceKHR
   {
     eSrgbNonlinear             = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,
@@ -5516,16 +4418,15 @@ namespace VULKAN_HPP_NAMESPACE
     eBt709NonlinearEXT         = VK_COLOR_SPACE_BT709_NONLINEAR_EXT,
     eBt2020LinearEXT           = VK_COLOR_SPACE_BT2020_LINEAR_EXT,
     eHdr10St2084EXT            = VK_COLOR_SPACE_HDR10_ST2084_EXT,
-    eDolbyvisionEXT VULKAN_HPP_DEPRECATED_17( "eDolbyvisionEXT is deprecated, but no reason was given in the API XML" ) = VK_COLOR_SPACE_DOLBYVISION_EXT,
-    eHdr10HlgEXT                                                                                                        = VK_COLOR_SPACE_HDR10_HLG_EXT,
-    eAdobergbLinearEXT                                                                                                  = VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT,
-    eAdobergbNonlinearEXT                                                                                               = VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT,
-    ePassThroughEXT                                                                                                     = VK_COLOR_SPACE_PASS_THROUGH_EXT,
-    eExtendedSrgbNonlinearEXT = VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT,
-    eDisplayNativeAMD         = VK_COLOR_SPACE_DISPLAY_NATIVE_AMD
+    eDolbyvisionEXT            = VK_COLOR_SPACE_DOLBYVISION_EXT,
+    eHdr10HlgEXT               = VK_COLOR_SPACE_HDR10_HLG_EXT,
+    eAdobergbLinearEXT         = VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT,
+    eAdobergbNonlinearEXT      = VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT,
+    ePassThroughEXT            = VK_COLOR_SPACE_PASS_THROUGH_EXT,
+    eExtendedSrgbNonlinearEXT  = VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT,
+    eDisplayNativeAMD          = VK_COLOR_SPACE_DISPLAY_NATIVE_AMD
   };
 
-  // wrapper class for enum VkCompositeAlphaFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCompositeAlphaFlagBitsKHR.html
   enum class CompositeAlphaFlagBitsKHR : VkCompositeAlphaFlagsKHR
   {
     eOpaque         = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
@@ -5534,13 +4435,11 @@ namespace VULKAN_HPP_NAMESPACE
     eInherit        = VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR
   };
 
-  // wrapper using for bitmask VkCompositeAlphaFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCompositeAlphaFlagsKHR.html
   using CompositeAlphaFlagsKHR = Flags<CompositeAlphaFlagBitsKHR>;
 
   template <>
   struct FlagTraits<CompositeAlphaFlagBitsKHR>
   {
-    using WrappedType                                                     = VkCompositeAlphaFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR CompositeAlphaFlagsKHR allFlags  = CompositeAlphaFlagBitsKHR::eOpaque | CompositeAlphaFlagBitsKHR::ePreMultiplied |
                                                                            CompositeAlphaFlagBitsKHR::ePostMultiplied | CompositeAlphaFlagBitsKHR::eInherit;
@@ -5548,35 +4447,25 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_swapchain ===
 
-  // wrapper class for enum VkSwapchainCreateFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainCreateFlagBitsKHR.html
   enum class SwapchainCreateFlagBitsKHR : VkSwapchainCreateFlagsKHR
   {
     eSplitInstanceBindRegions    = VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR,
     eProtected                   = VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR,
     eMutableFormat               = VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR,
-    ePresentTimingEXT            = VK_SWAPCHAIN_CREATE_PRESENT_TIMING_BIT_EXT,
-    ePresentId2                  = VK_SWAPCHAIN_CREATE_PRESENT_ID_2_BIT_KHR,
-    ePresentWait2                = VK_SWAPCHAIN_CREATE_PRESENT_WAIT_2_BIT_KHR,
-    eDeferredMemoryAllocation    = VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR,
     eDeferredMemoryAllocationEXT = VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT
   };
 
-  // wrapper using for bitmask VkSwapchainCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainCreateFlagsKHR.html
   using SwapchainCreateFlagsKHR = Flags<SwapchainCreateFlagBitsKHR>;
 
   template <>
   struct FlagTraits<SwapchainCreateFlagBitsKHR>
   {
-    using WrappedType                                                      = VkSwapchainCreateFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SwapchainCreateFlagsKHR allFlags =
       SwapchainCreateFlagBitsKHR::eSplitInstanceBindRegions | SwapchainCreateFlagBitsKHR::eProtected | SwapchainCreateFlagBitsKHR::eMutableFormat |
-      SwapchainCreateFlagBitsKHR::ePresentTimingEXT | SwapchainCreateFlagBitsKHR::ePresentId2 | SwapchainCreateFlagBitsKHR::ePresentWait2 |
-      SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocation;
+      SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocationEXT;
   };
 
-  // wrapper class for enum VkDeviceGroupPresentModeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupPresentModeFlagBitsKHR.html
   enum class DeviceGroupPresentModeFlagBitsKHR : VkDeviceGroupPresentModeFlagsKHR
   {
     eLocal            = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR,
@@ -5585,14 +4474,11 @@ namespace VULKAN_HPP_NAMESPACE
     eLocalMultiDevice = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHR
   };
 
-  // wrapper using for bitmask VkDeviceGroupPresentModeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupPresentModeFlagsKHR.html
   using DeviceGroupPresentModeFlagsKHR = Flags<DeviceGroupPresentModeFlagBitsKHR>;
 
   template <>
   struct FlagTraits<DeviceGroupPresentModeFlagBitsKHR>
   {
-    using WrappedType                                                             = VkDeviceGroupPresentModeFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DeviceGroupPresentModeFlagsKHR allFlags =
       DeviceGroupPresentModeFlagBitsKHR::eLocal | DeviceGroupPresentModeFlagBitsKHR::eRemote | DeviceGroupPresentModeFlagBitsKHR::eSum |
@@ -5601,7 +4487,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_display ===
 
-  // wrapper class for enum VkDisplayPlaneAlphaFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneAlphaFlagBitsKHR.html
   enum class DisplayPlaneAlphaFlagBitsKHR : VkDisplayPlaneAlphaFlagsKHR
   {
     eOpaque                = VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR,
@@ -5610,13 +4495,11 @@ namespace VULKAN_HPP_NAMESPACE
     ePerPixelPremultiplied = VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR
   };
 
-  // wrapper using for bitmask VkDisplayPlaneAlphaFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneAlphaFlagsKHR.html
   using DisplayPlaneAlphaFlagsKHR = Flags<DisplayPlaneAlphaFlagBitsKHR>;
 
   template <>
   struct FlagTraits<DisplayPlaneAlphaFlagBitsKHR>
   {
-    using WrappedType                                                        = VkDisplayPlaneAlphaFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DisplayPlaneAlphaFlagsKHR allFlags  = DisplayPlaneAlphaFlagBitsKHR::eOpaque | DisplayPlaneAlphaFlagBitsKHR::eGlobal |
                                                                               DisplayPlaneAlphaFlagBitsKHR::ePerPixel |
@@ -5627,7 +4510,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDisplayModeCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeCreateFlagsKHR.html
   using DisplayModeCreateFlagsKHR = Flags<DisplayModeCreateFlagBitsKHR>;
 
   template <>
@@ -5641,7 +4523,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDisplaySurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplaySurfaceCreateFlagsKHR.html
   using DisplaySurfaceCreateFlagsKHR = Flags<DisplaySurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5658,7 +4539,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkXlibSurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkXlibSurfaceCreateFlagsKHR.html
   using XlibSurfaceCreateFlagsKHR = Flags<XlibSurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5676,7 +4556,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkXcbSurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkXcbSurfaceCreateFlagsKHR.html
   using XcbSurfaceCreateFlagsKHR = Flags<XcbSurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5694,7 +4573,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkWaylandSurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWaylandSurfaceCreateFlagsKHR.html
   using WaylandSurfaceCreateFlagsKHR = Flags<WaylandSurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5712,7 +4590,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkAndroidSurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidSurfaceCreateFlagsKHR.html
   using AndroidSurfaceCreateFlagsKHR = Flags<AndroidSurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5730,7 +4607,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkWin32SurfaceCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWin32SurfaceCreateFlagsKHR.html
   using Win32SurfaceCreateFlagsKHR = Flags<Win32SurfaceCreateFlagBitsKHR>;
 
   template <>
@@ -5743,7 +4619,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_report ===
 
-  // wrapper class for enum VkDebugReportFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportFlagBitsEXT.html
   enum class DebugReportFlagBitsEXT : VkDebugReportFlagsEXT
   {
     eInformation        = VK_DEBUG_REPORT_INFORMATION_BIT_EXT,
@@ -5753,20 +4628,17 @@ namespace VULKAN_HPP_NAMESPACE
     eDebug              = VK_DEBUG_REPORT_DEBUG_BIT_EXT
   };
 
-  // wrapper using for bitmask VkDebugReportFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportFlagsEXT.html
   using DebugReportFlagsEXT = Flags<DebugReportFlagBitsEXT>;
 
   template <>
   struct FlagTraits<DebugReportFlagBitsEXT>
   {
-    using WrappedType                                                  = VkDebugReportFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportFlagsEXT allFlags  = DebugReportFlagBitsEXT::eInformation | DebugReportFlagBitsEXT::eWarning |
                                                                         DebugReportFlagBitsEXT::ePerformanceWarning | DebugReportFlagBitsEXT::eError |
                                                                         DebugReportFlagBitsEXT::eDebug;
   };
 
-  // wrapper class for enum VkDebugReportObjectTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportObjectTypeEXT.html
   enum class DebugReportObjectTypeEXT
   {
     eUnknown                     = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
@@ -5822,7 +4694,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_AMD_rasterization_order ===
 
-  // wrapper class for enum VkRasterizationOrderAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRasterizationOrderAMD.html
   enum class RasterizationOrderAMD
   {
     eStrict  = VK_RASTERIZATION_ORDER_STRICT_AMD,
@@ -5831,8 +4702,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_queue ===
 
-  // wrapper class for enum VkVideoCodecOperationFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCodecOperationFlagBitsKHR.html
   enum class VideoCodecOperationFlagBitsKHR : VkVideoCodecOperationFlagsKHR
   {
     eNone       = VK_VIDEO_CODEC_OPERATION_NONE_KHR,
@@ -5840,27 +4709,20 @@ namespace VULKAN_HPP_NAMESPACE
     eEncodeH265 = VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR,
     eDecodeH264 = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR,
     eDecodeH265 = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR,
-    eDecodeAv1  = VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR,
-    eEncodeAv1  = VK_VIDEO_CODEC_OPERATION_ENCODE_AV1_BIT_KHR,
-    eDecodeVp9  = VK_VIDEO_CODEC_OPERATION_DECODE_VP9_BIT_KHR
+    eDecodeAv1  = VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoCodecOperationFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCodecOperationFlagsKHR.html
   using VideoCodecOperationFlagsKHR = Flags<VideoCodecOperationFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoCodecOperationFlagBitsKHR>
   {
-    using WrappedType                                                          = VkVideoCodecOperationFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                        isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoCodecOperationFlagsKHR allFlags =
       VideoCodecOperationFlagBitsKHR::eNone | VideoCodecOperationFlagBitsKHR::eEncodeH264 | VideoCodecOperationFlagBitsKHR::eEncodeH265 |
-      VideoCodecOperationFlagBitsKHR::eDecodeH264 | VideoCodecOperationFlagBitsKHR::eDecodeH265 | VideoCodecOperationFlagBitsKHR::eDecodeAv1 |
-      VideoCodecOperationFlagBitsKHR::eEncodeAv1 | VideoCodecOperationFlagBitsKHR::eDecodeVp9;
+      VideoCodecOperationFlagBitsKHR::eDecodeH264 | VideoCodecOperationFlagBitsKHR::eDecodeH265 | VideoCodecOperationFlagBitsKHR::eDecodeAv1;
   };
 
-  // wrapper class for enum VkVideoChromaSubsamplingFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoChromaSubsamplingFlagBitsKHR.html
   enum class VideoChromaSubsamplingFlagBitsKHR : VkVideoChromaSubsamplingFlagsKHR
   {
     eInvalid    = VK_VIDEO_CHROMA_SUBSAMPLING_INVALID_KHR,
@@ -5870,22 +4732,17 @@ namespace VULKAN_HPP_NAMESPACE
     e444        = VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoChromaSubsamplingFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoChromaSubsamplingFlagsKHR.html
   using VideoChromaSubsamplingFlagsKHR = Flags<VideoChromaSubsamplingFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoChromaSubsamplingFlagBitsKHR>
   {
-    using WrappedType                                                             = VkVideoChromaSubsamplingFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoChromaSubsamplingFlagsKHR allFlags =
       VideoChromaSubsamplingFlagBitsKHR::eInvalid | VideoChromaSubsamplingFlagBitsKHR::eMonochrome | VideoChromaSubsamplingFlagBitsKHR::e420 |
       VideoChromaSubsamplingFlagBitsKHR::e422 | VideoChromaSubsamplingFlagBitsKHR::e444;
   };
 
-  // wrapper class for enum VkVideoComponentBitDepthFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoComponentBitDepthFlagBitsKHR.html
   enum class VideoComponentBitDepthFlagBitsKHR : VkVideoComponentBitDepthFlagsKHR
   {
     eInvalid = VK_VIDEO_COMPONENT_BIT_DEPTH_INVALID_KHR,
@@ -5894,65 +4751,51 @@ namespace VULKAN_HPP_NAMESPACE
     e12      = VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoComponentBitDepthFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoComponentBitDepthFlagsKHR.html
   using VideoComponentBitDepthFlagsKHR = Flags<VideoComponentBitDepthFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoComponentBitDepthFlagBitsKHR>
   {
-    using WrappedType                                                             = VkVideoComponentBitDepthFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoComponentBitDepthFlagsKHR allFlags =
       VideoComponentBitDepthFlagBitsKHR::eInvalid | VideoComponentBitDepthFlagBitsKHR::e8 | VideoComponentBitDepthFlagBitsKHR::e10 |
       VideoComponentBitDepthFlagBitsKHR::e12;
   };
 
-  // wrapper class for enum VkVideoCapabilityFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCapabilityFlagBitsKHR.html
   enum class VideoCapabilityFlagBitsKHR : VkVideoCapabilityFlagsKHR
   {
     eProtectedContent        = VK_VIDEO_CAPABILITY_PROTECTED_CONTENT_BIT_KHR,
     eSeparateReferenceImages = VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoCapabilityFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCapabilityFlagsKHR.html
   using VideoCapabilityFlagsKHR = Flags<VideoCapabilityFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoCapabilityFlagBitsKHR>
   {
-    using WrappedType                                                      = VkVideoCapabilityFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoCapabilityFlagsKHR allFlags =
       VideoCapabilityFlagBitsKHR::eProtectedContent | VideoCapabilityFlagBitsKHR::eSeparateReferenceImages;
   };
 
-  // wrapper class for enum VkVideoSessionCreateFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionCreateFlagBitsKHR.html
   enum class VideoSessionCreateFlagBitsKHR : VkVideoSessionCreateFlagsKHR
   {
     eProtectedContent                  = VK_VIDEO_SESSION_CREATE_PROTECTED_CONTENT_BIT_KHR,
     eAllowEncodeParameterOptimizations = VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR,
-    eInlineQueries                     = VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR,
-    eAllowEncodeQuantizationDeltaMap   = VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR,
-    eAllowEncodeEmphasisMap            = VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_EMPHASIS_MAP_BIT_KHR,
-    eInlineSessionParameters           = VK_VIDEO_SESSION_CREATE_INLINE_SESSION_PARAMETERS_BIT_KHR
+    eInlineQueries                     = VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoSessionCreateFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionCreateFlagsKHR.html
   using VideoSessionCreateFlagsKHR = Flags<VideoSessionCreateFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoSessionCreateFlagBitsKHR>
   {
-    using WrappedType                                                         = VkVideoSessionCreateFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoSessionCreateFlagsKHR allFlags =
-      VideoSessionCreateFlagBitsKHR::eProtectedContent | VideoSessionCreateFlagBitsKHR::eAllowEncodeParameterOptimizations |
-      VideoSessionCreateFlagBitsKHR::eInlineQueries | VideoSessionCreateFlagBitsKHR::eAllowEncodeQuantizationDeltaMap |
-      VideoSessionCreateFlagBitsKHR::eAllowEncodeEmphasisMap | VideoSessionCreateFlagBitsKHR::eInlineSessionParameters;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoSessionCreateFlagsKHR allFlags  = VideoSessionCreateFlagBitsKHR::eProtectedContent |
+                                                                               VideoSessionCreateFlagBitsKHR::eAllowEncodeParameterOptimizations |
+                                                                               VideoSessionCreateFlagBitsKHR::eInlineQueries;
   };
 
-  // wrapper class for enum VkVideoCodingControlFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCodingControlFlagBitsKHR.html
   enum class VideoCodingControlFlagBitsKHR : VkVideoCodingControlFlagsKHR
   {
     eReset              = VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR,
@@ -5960,19 +4803,16 @@ namespace VULKAN_HPP_NAMESPACE
     eEncodeQualityLevel = VK_VIDEO_CODING_CONTROL_ENCODE_QUALITY_LEVEL_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoCodingControlFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCodingControlFlagsKHR.html
   using VideoCodingControlFlagsKHR = Flags<VideoCodingControlFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoCodingControlFlagBitsKHR>
   {
-    using WrappedType                                                         = VkVideoCodingControlFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoCodingControlFlagsKHR allFlags =
       VideoCodingControlFlagBitsKHR::eReset | VideoCodingControlFlagBitsKHR::eEncodeRateControl | VideoCodingControlFlagBitsKHR::eEncodeQualityLevel;
   };
 
-  // wrapper class for enum VkQueryResultStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryResultStatusKHR.html
   enum class QueryResultStatusKHR
   {
     eError                            = VK_QUERY_RESULT_STATUS_ERROR_KHR,
@@ -5981,30 +4821,23 @@ namespace VULKAN_HPP_NAMESPACE
     eInsufficientBitstreamBufferRange = VK_QUERY_RESULT_STATUS_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_KHR
   };
 
-  // wrapper class for enum VkVideoSessionParametersCreateFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersCreateFlagBitsKHR.html
   enum class VideoSessionParametersCreateFlagBitsKHR : VkVideoSessionParametersCreateFlagsKHR
   {
-    eQuantizationMapCompatible = VK_VIDEO_SESSION_PARAMETERS_CREATE_QUANTIZATION_MAP_COMPATIBLE_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoSessionParametersCreateFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersCreateFlagsKHR.html
   using VideoSessionParametersCreateFlagsKHR = Flags<VideoSessionParametersCreateFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoSessionParametersCreateFlagBitsKHR>
   {
-    using WrappedType                                                                   = VkVideoSessionParametersCreateFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoSessionParametersCreateFlagsKHR allFlags  = VideoSessionParametersCreateFlagBitsKHR::eQuantizationMapCompatible;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoSessionParametersCreateFlagsKHR allFlags  = {};
   };
 
   enum class VideoBeginCodingFlagBitsKHR : VkVideoBeginCodingFlagsKHR
   {
   };
 
-  // wrapper using for bitmask VkVideoBeginCodingFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoBeginCodingFlagsKHR.html
   using VideoBeginCodingFlagsKHR = Flags<VideoBeginCodingFlagBitsKHR>;
 
   template <>
@@ -6018,7 +4851,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkVideoEndCodingFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEndCodingFlagsKHR.html
   using VideoEndCodingFlagsKHR = Flags<VideoEndCodingFlagBitsKHR>;
 
   template <>
@@ -6030,28 +4862,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_decode_queue ===
 
-  // wrapper class for enum VkVideoDecodeCapabilityFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeCapabilityFlagBitsKHR.html
   enum class VideoDecodeCapabilityFlagBitsKHR : VkVideoDecodeCapabilityFlagsKHR
   {
     eDpbAndOutputCoincide = VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR,
     eDpbAndOutputDistinct = VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoDecodeCapabilityFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeCapabilityFlagsKHR.html
   using VideoDecodeCapabilityFlagsKHR = Flags<VideoDecodeCapabilityFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoDecodeCapabilityFlagBitsKHR>
   {
-    using WrappedType                                                            = VkVideoDecodeCapabilityFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoDecodeCapabilityFlagsKHR allFlags =
       VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputCoincide | VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputDistinct;
   };
 
-  // wrapper class for enum VkVideoDecodeUsageFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeUsageFlagBitsKHR.html
   enum class VideoDecodeUsageFlagBitsKHR : VkVideoDecodeUsageFlagsKHR
   {
     eDefault     = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR,
@@ -6060,13 +4886,11 @@ namespace VULKAN_HPP_NAMESPACE
     eStreaming   = VK_VIDEO_DECODE_USAGE_STREAMING_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoDecodeUsageFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeUsageFlagsKHR.html
   using VideoDecodeUsageFlagsKHR = Flags<VideoDecodeUsageFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoDecodeUsageFlagBitsKHR>
   {
-    using WrappedType                                                       = VkVideoDecodeUsageFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoDecodeUsageFlagsKHR allFlags = VideoDecodeUsageFlagBitsKHR::eDefault | VideoDecodeUsageFlagBitsKHR::eTranscoding |
                                                                              VideoDecodeUsageFlagBitsKHR::eOffline | VideoDecodeUsageFlagBitsKHR::eStreaming;
@@ -6076,7 +4900,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkVideoDecodeFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeFlagsKHR.html
   using VideoDecodeFlagsKHR = Flags<VideoDecodeFlagBitsKHR>;
 
   template <>
@@ -6092,8 +4915,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineRasterizationStateStreamCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationStateStreamCreateFlagsEXT.html
   using PipelineRasterizationStateStreamCreateFlagsEXT = Flags<PipelineRasterizationStateStreamCreateFlagBitsEXT>;
 
   template <>
@@ -6105,8 +4926,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_encode_h264 ===
 
-  // wrapper class for enum VkVideoEncodeH264CapabilityFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264CapabilityFlagBitsKHR.html
   enum class VideoEncodeH264CapabilityFlagBitsKHR : VkVideoEncodeH264CapabilityFlagsKHR
   {
     eHrdCompliance                  = VK_VIDEO_ENCODE_H264_CAPABILITY_HRD_COMPLIANCE_BIT_KHR,
@@ -6117,30 +4936,23 @@ namespace VULKAN_HPP_NAMESPACE
     eBFrameInL1List                 = VK_VIDEO_ENCODE_H264_CAPABILITY_B_FRAME_IN_L1_LIST_BIT_KHR,
     ePerPictureTypeMinMaxQp         = VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR,
     ePerSliceConstantQp             = VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR,
-    eGeneratePrefixNalu             = VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR,
-    eBPictureIntraRefresh           = VK_VIDEO_ENCODE_H264_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR,
-    eMbQpDiffWraparound             = VK_VIDEO_ENCODE_H264_CAPABILITY_MB_QP_DIFF_WRAPAROUND_BIT_KHR
+    eGeneratePrefixNalu             = VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH264CapabilityFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264CapabilityFlagsKHR.html
   using VideoEncodeH264CapabilityFlagsKHR = Flags<VideoEncodeH264CapabilityFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH264CapabilityFlagBitsKHR>
   {
-    using WrappedType                                                                = VkVideoEncodeH264CapabilityFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH264CapabilityFlagsKHR allFlags =
       VideoEncodeH264CapabilityFlagBitsKHR::eHrdCompliance | VideoEncodeH264CapabilityFlagBitsKHR::ePredictionWeightTableGenerated |
       VideoEncodeH264CapabilityFlagBitsKHR::eRowUnalignedSlice | VideoEncodeH264CapabilityFlagBitsKHR::eDifferentSliceType |
       VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL0List | VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL1List |
       VideoEncodeH264CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp | VideoEncodeH264CapabilityFlagBitsKHR::ePerSliceConstantQp |
-      VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu | VideoEncodeH264CapabilityFlagBitsKHR::eBPictureIntraRefresh |
-      VideoEncodeH264CapabilityFlagBitsKHR::eMbQpDiffWraparound;
+      VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu;
   };
 
-  // wrapper class for enum VkVideoEncodeH264StdFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264StdFlagBitsKHR.html
   enum class VideoEncodeH264StdFlagBitsKHR : VkVideoEncodeH264StdFlagsKHR
   {
     eSeparateColorPlaneFlagSet          = VK_VIDEO_ENCODE_H264_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR,
@@ -6165,13 +4977,11 @@ namespace VULKAN_HPP_NAMESPACE
     eDifferentSliceQpDelta              = VK_VIDEO_ENCODE_H264_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH264StdFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264StdFlagsKHR.html
   using VideoEncodeH264StdFlagsKHR = Flags<VideoEncodeH264StdFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH264StdFlagBitsKHR>
   {
-    using WrappedType                                                         = VkVideoEncodeH264StdFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH264StdFlagsKHR allFlags =
       VideoEncodeH264StdFlagBitsKHR::eSeparateColorPlaneFlagSet | VideoEncodeH264StdFlagBitsKHR::eQpprimeYZeroTransformBypassFlagSet |
@@ -6186,8 +4996,6 @@ namespace VULKAN_HPP_NAMESPACE
       VideoEncodeH264StdFlagBitsKHR::eSliceQpDelta | VideoEncodeH264StdFlagBitsKHR::eDifferentSliceQpDelta;
   };
 
-  // wrapper class for enum VkVideoEncodeH264RateControlFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264RateControlFlagBitsKHR.html
   enum class VideoEncodeH264RateControlFlagBitsKHR : VkVideoEncodeH264RateControlFlagsKHR
   {
     eAttemptHrdCompliance       = VK_VIDEO_ENCODE_H264_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR,
@@ -6197,14 +5005,11 @@ namespace VULKAN_HPP_NAMESPACE
     eTemporalLayerPatternDyadic = VK_VIDEO_ENCODE_H264_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH264RateControlFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264RateControlFlagsKHR.html
   using VideoEncodeH264RateControlFlagsKHR = Flags<VideoEncodeH264RateControlFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH264RateControlFlagBitsKHR>
   {
-    using WrappedType                                                                 = VkVideoEncodeH264RateControlFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH264RateControlFlagsKHR allFlags =
       VideoEncodeH264RateControlFlagBitsKHR::eAttemptHrdCompliance | VideoEncodeH264RateControlFlagBitsKHR::eRegularGop |
@@ -6214,8 +5019,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_encode_h265 ===
 
-  // wrapper class for enum VkVideoEncodeH265CapabilityFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265CapabilityFlagBitsKHR.html
   enum class VideoEncodeH265CapabilityFlagBitsKHR : VkVideoEncodeH265CapabilityFlagsKHR
   {
     eHrdCompliance                  = VK_VIDEO_ENCODE_H265_CAPABILITY_HRD_COMPLIANCE_BIT_KHR,
@@ -6227,30 +5030,23 @@ namespace VULKAN_HPP_NAMESPACE
     ePerPictureTypeMinMaxQp         = VK_VIDEO_ENCODE_H265_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR,
     ePerSliceSegmentConstantQp      = VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_KHR,
     eMultipleTilesPerSliceSegment   = VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR,
-    eMultipleSliceSegmentsPerTile   = VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR,
-    eBPictureIntraRefresh           = VK_VIDEO_ENCODE_H265_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR,
-    eCuQpDiffWraparound             = VK_VIDEO_ENCODE_H265_CAPABILITY_CU_QP_DIFF_WRAPAROUND_BIT_KHR
+    eMultipleSliceSegmentsPerTile   = VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH265CapabilityFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265CapabilityFlagsKHR.html
   using VideoEncodeH265CapabilityFlagsKHR = Flags<VideoEncodeH265CapabilityFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH265CapabilityFlagBitsKHR>
   {
-    using WrappedType                                                                = VkVideoEncodeH265CapabilityFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH265CapabilityFlagsKHR allFlags =
       VideoEncodeH265CapabilityFlagBitsKHR::eHrdCompliance | VideoEncodeH265CapabilityFlagBitsKHR::ePredictionWeightTableGenerated |
       VideoEncodeH265CapabilityFlagBitsKHR::eRowUnalignedSliceSegment | VideoEncodeH265CapabilityFlagBitsKHR::eDifferentSliceSegmentType |
       VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL0List | VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL1List |
       VideoEncodeH265CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp | VideoEncodeH265CapabilityFlagBitsKHR::ePerSliceSegmentConstantQp |
-      VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment | VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile |
-      VideoEncodeH265CapabilityFlagBitsKHR::eBPictureIntraRefresh | VideoEncodeH265CapabilityFlagBitsKHR::eCuQpDiffWraparound;
+      VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment | VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile;
   };
 
-  // wrapper class for enum VkVideoEncodeH265StdFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265StdFlagBitsKHR.html
   enum class VideoEncodeH265StdFlagBitsKHR : VkVideoEncodeH265StdFlagsKHR
   {
     eSeparateColorPlaneFlagSet              = VK_VIDEO_ENCODE_H265_STD_SEPARATE_COLOR_PLANE_FLAG_SET_BIT_KHR,
@@ -6276,13 +5072,11 @@ namespace VULKAN_HPP_NAMESPACE
     eDifferentSliceQpDelta                  = VK_VIDEO_ENCODE_H265_STD_DIFFERENT_SLICE_QP_DELTA_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH265StdFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265StdFlagsKHR.html
   using VideoEncodeH265StdFlagsKHR = Flags<VideoEncodeH265StdFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH265StdFlagBitsKHR>
   {
-    using WrappedType                                                         = VkVideoEncodeH265StdFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH265StdFlagsKHR allFlags =
       VideoEncodeH265StdFlagBitsKHR::eSeparateColorPlaneFlagSet | VideoEncodeH265StdFlagBitsKHR::eSampleAdaptiveOffsetEnabledFlagSet |
@@ -6298,8 +5092,6 @@ namespace VULKAN_HPP_NAMESPACE
       VideoEncodeH265StdFlagBitsKHR::eDifferentSliceQpDelta;
   };
 
-  // wrapper class for enum VkVideoEncodeH265CtbSizeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265CtbSizeFlagBitsKHR.html
   enum class VideoEncodeH265CtbSizeFlagBitsKHR : VkVideoEncodeH265CtbSizeFlagsKHR
   {
     e16 = VK_VIDEO_ENCODE_H265_CTB_SIZE_16_BIT_KHR,
@@ -6307,21 +5099,16 @@ namespace VULKAN_HPP_NAMESPACE
     e64 = VK_VIDEO_ENCODE_H265_CTB_SIZE_64_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH265CtbSizeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265CtbSizeFlagsKHR.html
   using VideoEncodeH265CtbSizeFlagsKHR = Flags<VideoEncodeH265CtbSizeFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH265CtbSizeFlagBitsKHR>
   {
-    using WrappedType                                                             = VkVideoEncodeH265CtbSizeFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH265CtbSizeFlagsKHR allFlags =
       VideoEncodeH265CtbSizeFlagBitsKHR::e16 | VideoEncodeH265CtbSizeFlagBitsKHR::e32 | VideoEncodeH265CtbSizeFlagBitsKHR::e64;
   };
 
-  // wrapper class for enum VkVideoEncodeH265TransformBlockSizeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265TransformBlockSizeFlagBitsKHR.html
   enum class VideoEncodeH265TransformBlockSizeFlagBitsKHR : VkVideoEncodeH265TransformBlockSizeFlagsKHR
   {
     e4  = VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_4_BIT_KHR,
@@ -6330,22 +5117,17 @@ namespace VULKAN_HPP_NAMESPACE
     e32 = VK_VIDEO_ENCODE_H265_TRANSFORM_BLOCK_SIZE_32_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH265TransformBlockSizeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265TransformBlockSizeFlagsKHR.html
   using VideoEncodeH265TransformBlockSizeFlagsKHR = Flags<VideoEncodeH265TransformBlockSizeFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH265TransformBlockSizeFlagBitsKHR>
   {
-    using WrappedType                                                                        = VkVideoEncodeH265TransformBlockSizeFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                      isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH265TransformBlockSizeFlagsKHR allFlags =
       VideoEncodeH265TransformBlockSizeFlagBitsKHR::e4 | VideoEncodeH265TransformBlockSizeFlagBitsKHR::e8 | VideoEncodeH265TransformBlockSizeFlagBitsKHR::e16 |
       VideoEncodeH265TransformBlockSizeFlagBitsKHR::e32;
   };
 
-  // wrapper class for enum VkVideoEncodeH265RateControlFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265RateControlFlagBitsKHR.html
   enum class VideoEncodeH265RateControlFlagBitsKHR : VkVideoEncodeH265RateControlFlagsKHR
   {
     eAttemptHrdCompliance          = VK_VIDEO_ENCODE_H265_RATE_CONTROL_ATTEMPT_HRD_COMPLIANCE_BIT_KHR,
@@ -6355,14 +5137,11 @@ namespace VULKAN_HPP_NAMESPACE
     eTemporalSubLayerPatternDyadic = VK_VIDEO_ENCODE_H265_RATE_CONTROL_TEMPORAL_SUB_LAYER_PATTERN_DYADIC_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeH265RateControlFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265RateControlFlagsKHR.html
   using VideoEncodeH265RateControlFlagsKHR = Flags<VideoEncodeH265RateControlFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeH265RateControlFlagBitsKHR>
   {
-    using WrappedType                                                                 = VkVideoEncodeH265RateControlFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeH265RateControlFlagsKHR allFlags =
       VideoEncodeH265RateControlFlagBitsKHR::eAttemptHrdCompliance | VideoEncodeH265RateControlFlagBitsKHR::eRegularGop |
@@ -6372,8 +5151,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_decode_h264 ===
 
-  // wrapper class for enum VkVideoDecodeH264PictureLayoutFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264PictureLayoutFlagBitsKHR.html
   enum class VideoDecodeH264PictureLayoutFlagBitsKHR : VkVideoDecodeH264PictureLayoutFlagsKHR
   {
     eProgressive                = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR,
@@ -6381,14 +5158,11 @@ namespace VULKAN_HPP_NAMESPACE
     eInterlacedSeparatePlanes   = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_SEPARATE_PLANES_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoDecodeH264PictureLayoutFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264PictureLayoutFlagsKHR.html
   using VideoDecodeH264PictureLayoutFlagsKHR = Flags<VideoDecodeH264PictureLayoutFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoDecodeH264PictureLayoutFlagBitsKHR>
   {
-    using WrappedType                                                                   = VkVideoDecodeH264PictureLayoutFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoDecodeH264PictureLayoutFlagsKHR allFlags  = VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive |
                                                                                          VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedInterleavedLines |
@@ -6397,7 +5171,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_AMD_shader_info ===
 
-  // wrapper class for enum VkShaderInfoTypeAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderInfoTypeAMD.html
   enum class ShaderInfoTypeAMD
   {
     eStatistics  = VK_SHADER_INFO_TYPE_STATISTICS_AMD,
@@ -6412,8 +5185,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkStreamDescriptorSurfaceCreateFlagsGGP, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkStreamDescriptorSurfaceCreateFlagsGGP.html
   using StreamDescriptorSurfaceCreateFlagsGGP = Flags<StreamDescriptorSurfaceCreateFlagBitsGGP>;
 
   template <>
@@ -6426,8 +5197,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_external_memory_capabilities ===
 
-  // wrapper class for enum VkExternalMemoryHandleTypeFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryHandleTypeFlagBitsNV.html
   enum class ExternalMemoryHandleTypeFlagBitsNV : VkExternalMemoryHandleTypeFlagsNV
   {
     eOpaqueWin32    = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_NV,
@@ -6436,22 +5205,17 @@ namespace VULKAN_HPP_NAMESPACE
     eD3D11ImageKmt  = VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV
   };
 
-  // wrapper using for bitmask VkExternalMemoryHandleTypeFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryHandleTypeFlagsNV.html
   using ExternalMemoryHandleTypeFlagsNV = Flags<ExternalMemoryHandleTypeFlagBitsNV>;
 
   template <>
   struct FlagTraits<ExternalMemoryHandleTypeFlagBitsNV>
   {
-    using WrappedType                                                              = VkExternalMemoryHandleTypeFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                            isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalMemoryHandleTypeFlagsNV allFlags =
       ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32 | ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32Kmt | ExternalMemoryHandleTypeFlagBitsNV::eD3D11Image |
       ExternalMemoryHandleTypeFlagBitsNV::eD3D11ImageKmt;
   };
 
-  // wrapper class for enum VkExternalMemoryFeatureFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryFeatureFlagBitsNV.html
   enum class ExternalMemoryFeatureFlagBitsNV : VkExternalMemoryFeatureFlagsNV
   {
     eDedicatedOnly = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_NV,
@@ -6459,13 +5223,11 @@ namespace VULKAN_HPP_NAMESPACE
     eImportable    = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV
   };
 
-  // wrapper using for bitmask VkExternalMemoryFeatureFlagsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryFeatureFlagsNV.html
   using ExternalMemoryFeatureFlagsNV = Flags<ExternalMemoryFeatureFlagBitsNV>;
 
   template <>
   struct FlagTraits<ExternalMemoryFeatureFlagBitsNV>
   {
-    using WrappedType                                                           = VkExternalMemoryFeatureFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                         isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExternalMemoryFeatureFlagsNV allFlags =
       ExternalMemoryFeatureFlagBitsNV::eDedicatedOnly | ExternalMemoryFeatureFlagBitsNV::eExportable | ExternalMemoryFeatureFlagBitsNV::eImportable;
@@ -6473,7 +5235,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_validation_flags ===
 
-  // wrapper class for enum VkValidationCheckEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCheckEXT.html
   enum class ValidationCheckEXT
   {
     eAll     = VK_VALIDATION_CHECK_ALL_EXT,
@@ -6487,7 +5248,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkViSurfaceCreateFlagsNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViSurfaceCreateFlagsNN.html
   using ViSurfaceCreateFlagsNN = Flags<ViSurfaceCreateFlagBitsNN>;
 
   template <>
@@ -6498,48 +5258,58 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
+  //=== VK_EXT_pipeline_robustness ===
+
+  enum class PipelineRobustnessBufferBehaviorEXT
+  {
+    eDeviceDefault       = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT,
+    eDisabled            = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT,
+    eRobustBufferAccess  = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT,
+    eRobustBufferAccess2 = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT
+  };
+
+  enum class PipelineRobustnessImageBehaviorEXT
+  {
+    eDeviceDefault      = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT,
+    eDisabled           = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED_EXT,
+    eRobustImageAccess  = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT,
+    eRobustImageAccess2 = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT
+  };
+
   //=== VK_EXT_conditional_rendering ===
 
-  // wrapper class for enum VkConditionalRenderingFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkConditionalRenderingFlagBitsEXT.html
   enum class ConditionalRenderingFlagBitsEXT : VkConditionalRenderingFlagsEXT
   {
     eInverted = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT
   };
 
-  // wrapper using for bitmask VkConditionalRenderingFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkConditionalRenderingFlagsEXT.html
   using ConditionalRenderingFlagsEXT = Flags<ConditionalRenderingFlagBitsEXT>;
 
   template <>
   struct FlagTraits<ConditionalRenderingFlagBitsEXT>
   {
-    using WrappedType                                                           = VkConditionalRenderingFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                         isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ConditionalRenderingFlagsEXT allFlags  = ConditionalRenderingFlagBitsEXT::eInverted;
   };
 
   //=== VK_EXT_display_surface_counter ===
 
-  // wrapper class for enum VkSurfaceCounterFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCounterFlagBitsEXT.html
   enum class SurfaceCounterFlagBitsEXT : VkSurfaceCounterFlagsEXT
   {
     eVblank = VK_SURFACE_COUNTER_VBLANK_BIT_EXT
   };
 
-  // wrapper using for bitmask VkSurfaceCounterFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCounterFlagsEXT.html
   using SurfaceCounterFlagsEXT = Flags<SurfaceCounterFlagBitsEXT>;
 
   template <>
   struct FlagTraits<SurfaceCounterFlagBitsEXT>
   {
-    using WrappedType                                                     = VkSurfaceCounterFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR SurfaceCounterFlagsEXT allFlags  = SurfaceCounterFlagBitsEXT::eVblank;
   };
 
   //=== VK_EXT_display_control ===
 
-  // wrapper class for enum VkDisplayPowerStateEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPowerStateEXT.html
   enum class DisplayPowerStateEXT
   {
     eOff     = VK_DISPLAY_POWER_STATE_OFF_EXT,
@@ -6547,13 +5317,11 @@ namespace VULKAN_HPP_NAMESPACE
     eOn      = VK_DISPLAY_POWER_STATE_ON_EXT
   };
 
-  // wrapper class for enum VkDeviceEventTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceEventTypeEXT.html
   enum class DeviceEventTypeEXT
   {
     eDisplayHotplug = VK_DEVICE_EVENT_TYPE_DISPLAY_HOTPLUG_EXT
   };
 
-  // wrapper class for enum VkDisplayEventTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayEventTypeEXT.html
   enum class DisplayEventTypeEXT
   {
     eFirstPixelOut = VK_DISPLAY_EVENT_TYPE_FIRST_PIXEL_OUT_EXT
@@ -6561,7 +5329,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_viewport_swizzle ===
 
-  // wrapper class for enum VkViewportCoordinateSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViewportCoordinateSwizzleNV.html
   enum class ViewportCoordinateSwizzleNV
   {
     ePositiveX = VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_X_NV,
@@ -6578,8 +5345,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineViewportSwizzleStateCreateFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportSwizzleStateCreateFlagsNV.html
   using PipelineViewportSwizzleStateCreateFlagsNV = Flags<PipelineViewportSwizzleStateCreateFlagBitsNV>;
 
   template <>
@@ -6591,7 +5356,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_discard_rectangles ===
 
-  // wrapper class for enum VkDiscardRectangleModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDiscardRectangleModeEXT.html
   enum class DiscardRectangleModeEXT
   {
     eInclusive = VK_DISCARD_RECTANGLE_MODE_INCLUSIVE_EXT,
@@ -6602,8 +5366,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineDiscardRectangleStateCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDiscardRectangleStateCreateFlagsEXT.html
   using PipelineDiscardRectangleStateCreateFlagsEXT = Flags<PipelineDiscardRectangleStateCreateFlagBitsEXT>;
 
   template <>
@@ -6615,8 +5377,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_conservative_rasterization ===
 
-  // wrapper class for enum VkConservativeRasterizationModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkConservativeRasterizationModeEXT.html
   enum class ConservativeRasterizationModeEXT
   {
     eDisabled      = VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT,
@@ -6628,8 +5388,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineRasterizationConservativeStateCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationConservativeStateCreateFlagsEXT.html
   using PipelineRasterizationConservativeStateCreateFlagsEXT = Flags<PipelineRasterizationConservativeStateCreateFlagBitsEXT>;
 
   template <>
@@ -6645,8 +5403,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineRasterizationDepthClipStateCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationDepthClipStateCreateFlagsEXT.html
   using PipelineRasterizationDepthClipStateCreateFlagsEXT = Flags<PipelineRasterizationDepthClipStateCreateFlagBitsEXT>;
 
   template <>
@@ -6658,28 +5414,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_performance_query ===
 
-  // wrapper class for enum VkPerformanceCounterDescriptionFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterDescriptionFlagBitsKHR.html
   enum class PerformanceCounterDescriptionFlagBitsKHR : VkPerformanceCounterDescriptionFlagsKHR
   {
     ePerformanceImpacting = VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_BIT_KHR,
     eConcurrentlyImpacted = VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_BIT_KHR
   };
 
-  // wrapper using for bitmask VkPerformanceCounterDescriptionFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterDescriptionFlagsKHR.html
   using PerformanceCounterDescriptionFlagsKHR = Flags<PerformanceCounterDescriptionFlagBitsKHR>;
 
   template <>
   struct FlagTraits<PerformanceCounterDescriptionFlagBitsKHR>
   {
-    using WrappedType                                                                    = VkPerformanceCounterDescriptionFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                  isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PerformanceCounterDescriptionFlagsKHR allFlags =
       PerformanceCounterDescriptionFlagBitsKHR::ePerformanceImpacting | PerformanceCounterDescriptionFlagBitsKHR::eConcurrentlyImpacted;
   };
 
-  // wrapper class for enum VkPerformanceCounterScopeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterScopeKHR.html
   enum class PerformanceCounterScopeKHR
   {
     eCommandBuffer             = VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR,
@@ -6690,7 +5440,6 @@ namespace VULKAN_HPP_NAMESPACE
     eVkQueryScopeCommand       = VK_QUERY_SCOPE_COMMAND_KHR
   };
 
-  // wrapper class for enum VkPerformanceCounterStorageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterStorageKHR.html
   enum class PerformanceCounterStorageKHR
   {
     eInt32   = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR,
@@ -6701,7 +5450,6 @@ namespace VULKAN_HPP_NAMESPACE
     eFloat64 = VK_PERFORMANCE_COUNTER_STORAGE_FLOAT64_KHR
   };
 
-  // wrapper class for enum VkPerformanceCounterUnitKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterUnitKHR.html
   enum class PerformanceCounterUnitKHR
   {
     eGeneric        = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR,
@@ -6721,7 +5469,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkAcquireProfilingLockFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAcquireProfilingLockFlagsKHR.html
   using AcquireProfilingLockFlagsKHR = Flags<AcquireProfilingLockFlagBitsKHR>;
 
   template <>
@@ -6738,7 +5485,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkIOSSurfaceCreateFlagsMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIOSSurfaceCreateFlagsMVK.html
   using IOSSurfaceCreateFlagsMVK = Flags<IOSSurfaceCreateFlagBitsMVK>;
 
   template <>
@@ -6756,7 +5502,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkMacOSSurfaceCreateFlagsMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMacOSSurfaceCreateFlagsMVK.html
   using MacOSSurfaceCreateFlagsMVK = Flags<MacOSSurfaceCreateFlagBitsMVK>;
 
   template <>
@@ -6769,8 +5514,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_utils ===
 
-  // wrapper class for enum VkDebugUtilsMessageSeverityFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessageSeverityFlagBitsEXT.html
   enum class DebugUtilsMessageSeverityFlagBitsEXT : VkDebugUtilsMessageSeverityFlagsEXT
   {
     eVerbose = VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT,
@@ -6779,22 +5522,17 @@ namespace VULKAN_HPP_NAMESPACE
     eError   = VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT
   };
 
-  // wrapper using for bitmask VkDebugUtilsMessageSeverityFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessageSeverityFlagsEXT.html
   using DebugUtilsMessageSeverityFlagsEXT = Flags<DebugUtilsMessageSeverityFlagBitsEXT>;
 
   template <>
   struct FlagTraits<DebugUtilsMessageSeverityFlagBitsEXT>
   {
-    using WrappedType                                                                = VkDebugUtilsMessageSeverityFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DebugUtilsMessageSeverityFlagsEXT allFlags =
       DebugUtilsMessageSeverityFlagBitsEXT::eVerbose | DebugUtilsMessageSeverityFlagBitsEXT::eInfo | DebugUtilsMessageSeverityFlagBitsEXT::eWarning |
       DebugUtilsMessageSeverityFlagBitsEXT::eError;
   };
 
-  // wrapper class for enum VkDebugUtilsMessageTypeFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessageTypeFlagBitsEXT.html
   enum class DebugUtilsMessageTypeFlagBitsEXT : VkDebugUtilsMessageTypeFlagsEXT
   {
     eGeneral              = VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT,
@@ -6803,14 +5541,11 @@ namespace VULKAN_HPP_NAMESPACE
     eDeviceAddressBinding = VK_DEBUG_UTILS_MESSAGE_TYPE_DEVICE_ADDRESS_BINDING_BIT_EXT
   };
 
-  // wrapper using for bitmask VkDebugUtilsMessageTypeFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessageTypeFlagsEXT.html
   using DebugUtilsMessageTypeFlagsEXT = Flags<DebugUtilsMessageTypeFlagBitsEXT>;
 
   template <>
   struct FlagTraits<DebugUtilsMessageTypeFlagBitsEXT>
   {
-    using WrappedType                                                            = VkDebugUtilsMessageTypeFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DebugUtilsMessageTypeFlagsEXT allFlags =
       DebugUtilsMessageTypeFlagBitsEXT::eGeneral | DebugUtilsMessageTypeFlagBitsEXT::eValidation | DebugUtilsMessageTypeFlagBitsEXT::ePerformance |
@@ -6821,8 +5556,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDebugUtilsMessengerCallbackDataFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerCallbackDataFlagsEXT.html
   using DebugUtilsMessengerCallbackDataFlagsEXT = Flags<DebugUtilsMessengerCallbackDataFlagBitsEXT>;
 
   template <>
@@ -6836,8 +5569,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDebugUtilsMessengerCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerCreateFlagsEXT.html
   using DebugUtilsMessengerCreateFlagsEXT = Flags<DebugUtilsMessengerCreateFlagBitsEXT>;
 
   template <>
@@ -6849,7 +5580,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_blend_operation_advanced ===
 
-  // wrapper class for enum VkBlendOverlapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlendOverlapEXT.html
   enum class BlendOverlapEXT
   {
     eUncorrelated = VK_BLEND_OVERLAP_UNCORRELATED_EXT,
@@ -6863,8 +5593,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineCoverageToColorStateCreateFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageToColorStateCreateFlagsNV.html
   using PipelineCoverageToColorStateCreateFlagsNV = Flags<PipelineCoverageToColorStateCreateFlagBitsNV>;
 
   template <>
@@ -6876,18 +5604,14 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_acceleration_structure ===
 
-  // wrapper class for enum VkAccelerationStructureTypeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureTypeKHR.html
   enum class AccelerationStructureTypeKHR
   {
     eTopLevel    = VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR,
     eBottomLevel = VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR,
     eGeneric     = VK_ACCELERATION_STRUCTURE_TYPE_GENERIC_KHR
   };
-
   using AccelerationStructureTypeNV = AccelerationStructureTypeKHR;
 
-  // wrapper class for enum VkAccelerationStructureBuildTypeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureBuildTypeKHR.html
   enum class AccelerationStructureBuildTypeKHR
   {
     eHost         = VK_ACCELERATION_STRUCTURE_BUILD_TYPE_HOST_KHR,
@@ -6895,28 +5619,23 @@ namespace VULKAN_HPP_NAMESPACE
     eHostOrDevice = VK_ACCELERATION_STRUCTURE_BUILD_TYPE_HOST_OR_DEVICE_KHR
   };
 
-  // wrapper class for enum VkGeometryFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryFlagBitsKHR.html
   enum class GeometryFlagBitsKHR : VkGeometryFlagsKHR
   {
     eOpaque                      = VK_GEOMETRY_OPAQUE_BIT_KHR,
     eNoDuplicateAnyHitInvocation = VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_KHR
   };
-
   using GeometryFlagBitsNV = GeometryFlagBitsKHR;
 
-  // wrapper using for bitmask VkGeometryFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryFlagsKHR.html
   using GeometryFlagsKHR = Flags<GeometryFlagBitsKHR>;
   using GeometryFlagsNV  = GeometryFlagsKHR;
 
   template <>
   struct FlagTraits<GeometryFlagBitsKHR>
   {
-    using WrappedType                                               = VkGeometryFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR GeometryFlagsKHR allFlags  = GeometryFlagBitsKHR::eOpaque | GeometryFlagBitsKHR::eNoDuplicateAnyHitInvocation;
   };
 
-  // wrapper class for enum VkGeometryInstanceFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryInstanceFlagBitsKHR.html
   enum class GeometryInstanceFlagBitsKHR : VkGeometryInstanceFlagsKHR
   {
     eTriangleFacingCullDisable     = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR,
@@ -6925,20 +5644,17 @@ namespace VULKAN_HPP_NAMESPACE
     eTriangleFrontCounterclockwise = VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR,
     eForceOpaque                   = VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR,
     eForceNoOpaque                 = VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR,
-    eForceOpacityMicromap2StateEXT = VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_BIT_EXT,
-    eDisableOpacityMicromapsEXT    = VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_BIT_EXT
+    eForceOpacityMicromap2StateEXT = VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT,
+    eDisableOpacityMicromapsEXT    = VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT
   };
-
   using GeometryInstanceFlagBitsNV = GeometryInstanceFlagBitsKHR;
 
-  // wrapper using for bitmask VkGeometryInstanceFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryInstanceFlagsKHR.html
   using GeometryInstanceFlagsKHR = Flags<GeometryInstanceFlagBitsKHR>;
   using GeometryInstanceFlagsNV  = GeometryInstanceFlagsKHR;
 
   template <>
   struct FlagTraits<GeometryInstanceFlagBitsKHR>
   {
-    using WrappedType                                                       = VkGeometryInstanceFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR GeometryInstanceFlagsKHR allFlags =
       GeometryInstanceFlagBitsKHR::eTriangleFacingCullDisable | GeometryInstanceFlagBitsKHR::eTriangleFlipFacing | GeometryInstanceFlagBitsKHR::eForceOpaque |
@@ -6946,8 +5662,6 @@ namespace VULKAN_HPP_NAMESPACE
       GeometryInstanceFlagBitsKHR::eDisableOpacityMicromapsEXT;
   };
 
-  // wrapper class for enum VkBuildAccelerationStructureFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildAccelerationStructureFlagBitsKHR.html
   enum class BuildAccelerationStructureFlagBitsKHR : VkBuildAccelerationStructureFlagsKHR
   {
     eAllowUpdate                       = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_KHR,
@@ -6956,28 +5670,22 @@ namespace VULKAN_HPP_NAMESPACE
     ePreferFastBuild                   = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_KHR,
     eLowMemory                         = VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_KHR,
     eMotionNV                          = VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV,
-    eAllowOpacityMicromapUpdateEXT     = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_BIT_EXT,
-    eAllowDisableOpacityMicromapsEXT   = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_BIT_EXT,
-    eAllowOpacityMicromapDataUpdateEXT = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT_EXT,
+    eAllowOpacityMicromapUpdateEXT     = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT,
+    eAllowDisableOpacityMicromapsEXT   = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT,
+    eAllowOpacityMicromapDataUpdateEXT = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT,
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eAllowDisplacementMicromapUpdateNV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV,
-    eAllowDisplacementMicromapUpdate   = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV,
+    eAllowDisplacementMicromapUpdateNV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV,
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    eAllowDataAccess                = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR,
-    eAllowClusterOpacityMicromapsNV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_CLUSTER_OPACITY_MICROMAPS_BIT_NV
+    eAllowDataAccess = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR
   };
-
   using BuildAccelerationStructureFlagBitsNV = BuildAccelerationStructureFlagBitsKHR;
 
-  // wrapper using for bitmask VkBuildAccelerationStructureFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildAccelerationStructureFlagsKHR.html
   using BuildAccelerationStructureFlagsKHR = Flags<BuildAccelerationStructureFlagBitsKHR>;
   using BuildAccelerationStructureFlagsNV  = BuildAccelerationStructureFlagsKHR;
 
   template <>
   struct FlagTraits<BuildAccelerationStructureFlagBitsKHR>
   {
-    using WrappedType                                                                 = VkBuildAccelerationStructureFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR BuildAccelerationStructureFlagsKHR allFlags =
       BuildAccelerationStructureFlagBitsKHR::eAllowUpdate | BuildAccelerationStructureFlagBitsKHR::eAllowCompaction |
@@ -6988,11 +5696,9 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
       | BuildAccelerationStructureFlagBitsKHR::eAllowDisplacementMicromapUpdateNV
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      | BuildAccelerationStructureFlagBitsKHR::eAllowDataAccess | BuildAccelerationStructureFlagBitsKHR::eAllowClusterOpacityMicromapsNV;
+      | BuildAccelerationStructureFlagBitsKHR::eAllowDataAccess;
   };
 
-  // wrapper class for enum VkCopyAccelerationStructureModeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyAccelerationStructureModeKHR.html
   enum class CopyAccelerationStructureModeKHR
   {
     eClone       = VK_COPY_ACCELERATION_STRUCTURE_MODE_CLONE_KHR,
@@ -7000,34 +5706,22 @@ namespace VULKAN_HPP_NAMESPACE
     eSerialize   = VK_COPY_ACCELERATION_STRUCTURE_MODE_SERIALIZE_KHR,
     eDeserialize = VK_COPY_ACCELERATION_STRUCTURE_MODE_DESERIALIZE_KHR
   };
-
   using CopyAccelerationStructureModeNV = CopyAccelerationStructureModeKHR;
 
-  // wrapper class for enum VkGeometryTypeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryTypeKHR.html
   enum class GeometryTypeKHR
   {
-    eTriangles            = VK_GEOMETRY_TYPE_TRIANGLES_KHR,
-    eAabbs                = VK_GEOMETRY_TYPE_AABBS_KHR,
-    eInstances            = VK_GEOMETRY_TYPE_INSTANCES_KHR,
-    eSpheresNV            = VK_GEOMETRY_TYPE_SPHERES_NV,
-    eLinearSweptSpheresNV = VK_GEOMETRY_TYPE_LINEAR_SWEPT_SPHERES_NV,
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    eDenseGeometryFormatTrianglesAMDX = VK_GEOMETRY_TYPE_DENSE_GEOMETRY_FORMAT_TRIANGLES_AMDX
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    eTriangles = VK_GEOMETRY_TYPE_TRIANGLES_KHR,
+    eAabbs     = VK_GEOMETRY_TYPE_AABBS_KHR,
+    eInstances = VK_GEOMETRY_TYPE_INSTANCES_KHR
   };
-
   using GeometryTypeNV = GeometryTypeKHR;
 
-  // wrapper class for enum VkAccelerationStructureCompatibilityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCompatibilityKHR.html
   enum class AccelerationStructureCompatibilityKHR
   {
     eCompatible   = VK_ACCELERATION_STRUCTURE_COMPATIBILITY_COMPATIBLE_KHR,
     eIncompatible = VK_ACCELERATION_STRUCTURE_COMPATIBILITY_INCOMPATIBLE_KHR
   };
 
-  // wrapper class for enum VkAccelerationStructureCreateFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCreateFlagBitsKHR.html
   enum class AccelerationStructureCreateFlagBitsKHR : VkAccelerationStructureCreateFlagsKHR
   {
     eDeviceAddressCaptureReplay       = VK_ACCELERATION_STRUCTURE_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR,
@@ -7035,22 +5729,17 @@ namespace VULKAN_HPP_NAMESPACE
     eMotionNV                         = VK_ACCELERATION_STRUCTURE_CREATE_MOTION_BIT_NV
   };
 
-  // wrapper using for bitmask VkAccelerationStructureCreateFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCreateFlagsKHR.html
   using AccelerationStructureCreateFlagsKHR = Flags<AccelerationStructureCreateFlagBitsKHR>;
 
   template <>
   struct FlagTraits<AccelerationStructureCreateFlagBitsKHR>
   {
-    using WrappedType                                                                  = VkAccelerationStructureCreateFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR AccelerationStructureCreateFlagsKHR allFlags =
       AccelerationStructureCreateFlagBitsKHR::eDeviceAddressCaptureReplay | AccelerationStructureCreateFlagBitsKHR::eDescriptorBufferCaptureReplayEXT |
       AccelerationStructureCreateFlagBitsKHR::eMotionNV;
   };
 
-  // wrapper class for enum VkBuildAccelerationStructureModeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildAccelerationStructureModeKHR.html
   enum class BuildAccelerationStructureModeKHR
   {
     eBuild  = VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR,
@@ -7059,17 +5748,14 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_ray_tracing_pipeline ===
 
-  // wrapper class for enum VkRayTracingShaderGroupTypeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingShaderGroupTypeKHR.html
   enum class RayTracingShaderGroupTypeKHR
   {
     eGeneral            = VK_RAY_TRACING_SHADER_GROUP_TYPE_GENERAL_KHR,
     eTrianglesHitGroup  = VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_KHR,
     eProceduralHitGroup = VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_KHR
   };
-
   using RayTracingShaderGroupTypeNV = RayTracingShaderGroupTypeKHR;
 
-  // wrapper class for enum VkShaderGroupShaderKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderGroupShaderKHR.html
   enum class ShaderGroupShaderKHR
   {
     eGeneral      = VK_SHADER_GROUP_SHADER_GENERAL_KHR,
@@ -7080,7 +5766,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_framebuffer_mixed_samples ===
 
-  // wrapper class for enum VkCoverageModulationModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCoverageModulationModeNV.html
   enum class CoverageModulationModeNV
   {
     eNone  = VK_COVERAGE_MODULATION_MODE_NONE_NV,
@@ -7093,8 +5778,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineCoverageModulationStateCreateFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageModulationStateCreateFlagsNV.html
   using PipelineCoverageModulationStateCreateFlagsNV = Flags<PipelineCoverageModulationStateCreateFlagBitsNV>;
 
   template <>
@@ -7106,8 +5789,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_validation_cache ===
 
-  // wrapper class for enum VkValidationCacheHeaderVersionEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCacheHeaderVersionEXT.html
   enum class ValidationCacheHeaderVersionEXT
   {
     eOne = VK_VALIDATION_CACHE_HEADER_VERSION_ONE_EXT
@@ -7117,8 +5798,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkValidationCacheCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCacheCreateFlagsEXT.html
   using ValidationCacheCreateFlagsEXT = Flags<ValidationCacheCreateFlagBitsEXT>;
 
   template <>
@@ -7130,7 +5809,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_shading_rate_image ===
 
-  // wrapper class for enum VkShadingRatePaletteEntryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShadingRatePaletteEntryNV.html
   enum class ShadingRatePaletteEntryNV
   {
     eNoInvocations           = VK_SHADING_RATE_PALETTE_ENTRY_NO_INVOCATIONS_NV,
@@ -7147,7 +5825,6 @@ namespace VULKAN_HPP_NAMESPACE
     e1InvocationPer4X4Pixels = VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_4X4_PIXELS_NV
   };
 
-  // wrapper class for enum VkCoarseSampleOrderTypeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCoarseSampleOrderTypeNV.html
   enum class CoarseSampleOrderTypeNV
   {
     eDefault     = VK_COARSE_SAMPLE_ORDER_TYPE_DEFAULT_NV,
@@ -7158,8 +5835,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_ray_tracing ===
 
-  // wrapper class for enum VkAccelerationStructureMemoryRequirementsTypeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMemoryRequirementsTypeNV.html
   enum class AccelerationStructureMemoryRequirementsTypeNV
   {
     eObject        = VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_OBJECT_NV,
@@ -7173,8 +5848,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineCompilerControlFlagsAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCompilerControlFlagsAMD.html
   using PipelineCompilerControlFlagsAMD = Flags<PipelineCompilerControlFlagBitsAMD>;
 
   template <>
@@ -7184,10 +5857,19 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCompilerControlFlagsAMD allFlags  = {};
   };
 
+  //=== VK_KHR_global_priority ===
+
+  enum class QueueGlobalPriorityKHR
+  {
+    eLow      = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR,
+    eMedium   = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR,
+    eHigh     = VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR,
+    eRealtime = VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR
+  };
+  using QueueGlobalPriorityEXT = QueueGlobalPriorityKHR;
+
   //=== VK_AMD_memory_overallocation_behavior ===
 
-  // wrapper class for enum VkMemoryOverallocationBehaviorAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryOverallocationBehaviorAMD.html
   enum class MemoryOverallocationBehaviorAMD
   {
     eDefault    = VK_MEMORY_OVERALLOCATION_BEHAVIOR_DEFAULT_AMD,
@@ -7195,100 +5877,30 @@ namespace VULKAN_HPP_NAMESPACE
     eDisallowed = VK_MEMORY_OVERALLOCATION_BEHAVIOR_DISALLOWED_AMD
   };
 
-  //=== VK_EXT_present_timing ===
-
-  // wrapper class for enum VkPresentStageFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentStageFlagBitsEXT.html
-  enum class PresentStageFlagBitsEXT : VkPresentStageFlagsEXT
-  {
-    eQueueOperationsEnd     = VK_PRESENT_STAGE_QUEUE_OPERATIONS_END_BIT_EXT,
-    eRequestDequeued        = VK_PRESENT_STAGE_REQUEST_DEQUEUED_BIT_EXT,
-    eImageFirstPixelOut     = VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_OUT_BIT_EXT,
-    eImageFirstPixelVisible = VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_VISIBLE_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkPresentStageFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentStageFlagsEXT.html
-  using PresentStageFlagsEXT = Flags<PresentStageFlagBitsEXT>;
-
-  template <>
-  struct FlagTraits<PresentStageFlagBitsEXT>
-  {
-    using WrappedType                                                   = VkPresentStageFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentStageFlagsEXT allFlags =
-      PresentStageFlagBitsEXT::eQueueOperationsEnd | PresentStageFlagBitsEXT::eRequestDequeued | PresentStageFlagBitsEXT::eImageFirstPixelOut |
-      PresentStageFlagBitsEXT::eImageFirstPixelVisible;
-  };
-
-  // wrapper class for enum VkPresentTimingInfoFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimingInfoFlagBitsEXT.html
-  enum class PresentTimingInfoFlagBitsEXT : VkPresentTimingInfoFlagsEXT
-  {
-    ePresentAtRelativeTime        = VK_PRESENT_TIMING_INFO_PRESENT_AT_RELATIVE_TIME_BIT_EXT,
-    ePresentAtNearestRefreshCycle = VK_PRESENT_TIMING_INFO_PRESENT_AT_NEAREST_REFRESH_CYCLE_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkPresentTimingInfoFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimingInfoFlagsEXT.html
-  using PresentTimingInfoFlagsEXT = Flags<PresentTimingInfoFlagBitsEXT>;
-
-  template <>
-  struct FlagTraits<PresentTimingInfoFlagBitsEXT>
-  {
-    using WrappedType                                                        = VkPresentTimingInfoFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentTimingInfoFlagsEXT allFlags =
-      PresentTimingInfoFlagBitsEXT::ePresentAtRelativeTime | PresentTimingInfoFlagBitsEXT::ePresentAtNearestRefreshCycle;
-  };
-
-  // wrapper class for enum VkPastPresentationTimingFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingFlagBitsEXT.html
-  enum class PastPresentationTimingFlagBitsEXT : VkPastPresentationTimingFlagsEXT
-  {
-    eAllowPartialResults    = VK_PAST_PRESENTATION_TIMING_ALLOW_PARTIAL_RESULTS_BIT_EXT,
-    eAllowOutOfOrderResults = VK_PAST_PRESENTATION_TIMING_ALLOW_OUT_OF_ORDER_RESULTS_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkPastPresentationTimingFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingFlagsEXT.html
-  using PastPresentationTimingFlagsEXT = Flags<PastPresentationTimingFlagBitsEXT>;
-
-  template <>
-  struct FlagTraits<PastPresentationTimingFlagBitsEXT>
-  {
-    using WrappedType                                                             = VkPastPresentationTimingFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PastPresentationTimingFlagsEXT allFlags =
-      PastPresentationTimingFlagBitsEXT::eAllowPartialResults | PastPresentationTimingFlagBitsEXT::eAllowOutOfOrderResults;
-  };
-
   //=== VK_INTEL_performance_query ===
 
-  // wrapper class for enum VkPerformanceConfigurationTypeINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceConfigurationTypeINTEL.html
   enum class PerformanceConfigurationTypeINTEL
   {
     eCommandQueueMetricsDiscoveryActivated = VK_PERFORMANCE_CONFIGURATION_TYPE_COMMAND_QUEUE_METRICS_DISCOVERY_ACTIVATED_INTEL
   };
 
-  // wrapper class for enum VkQueryPoolSamplingModeINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolSamplingModeINTEL.html
   enum class QueryPoolSamplingModeINTEL
   {
     eManual = VK_QUERY_POOL_SAMPLING_MODE_MANUAL_INTEL
   };
 
-  // wrapper class for enum VkPerformanceOverrideTypeINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceOverrideTypeINTEL.html
   enum class PerformanceOverrideTypeINTEL
   {
     eNullHardware   = VK_PERFORMANCE_OVERRIDE_TYPE_NULL_HARDWARE_INTEL,
     eFlushGpuCaches = VK_PERFORMANCE_OVERRIDE_TYPE_FLUSH_GPU_CACHES_INTEL
   };
 
-  // wrapper class for enum VkPerformanceParameterTypeINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceParameterTypeINTEL.html
   enum class PerformanceParameterTypeINTEL
   {
     eHwCountersSupported   = VK_PERFORMANCE_PARAMETER_TYPE_HW_COUNTERS_SUPPORTED_INTEL,
     eStreamMarkerValidBits = VK_PERFORMANCE_PARAMETER_TYPE_STREAM_MARKER_VALID_BITS_INTEL
   };
 
-  // wrapper class for enum VkPerformanceValueTypeINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceValueTypeINTEL.html
   enum class PerformanceValueTypeINTEL
   {
     eUint32 = VK_PERFORMANCE_VALUE_TYPE_UINT32_INTEL,
@@ -7305,8 +5917,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkImagePipeSurfaceCreateFlagsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImagePipeSurfaceCreateFlagsFUCHSIA.html
   using ImagePipeSurfaceCreateFlagsFUCHSIA = Flags<ImagePipeSurfaceCreateFlagBitsFUCHSIA>;
 
   template <>
@@ -7324,7 +5934,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkMetalSurfaceCreateFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMetalSurfaceCreateFlagsEXT.html
   using MetalSurfaceCreateFlagsEXT = Flags<MetalSurfaceCreateFlagBitsEXT>;
 
   template <>
@@ -7337,8 +5946,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_fragment_shading_rate ===
 
-  // wrapper class for enum VkFragmentShadingRateCombinerOpKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFragmentShadingRateCombinerOpKHR.html
   enum class FragmentShadingRateCombinerOpKHR
   {
     eKeep    = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR,
@@ -7354,7 +5961,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkShaderCorePropertiesFlagsAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderCorePropertiesFlagsAMD.html
   using ShaderCorePropertiesFlagsAMD = Flags<ShaderCorePropertiesFlagBitsAMD>;
 
   template <>
@@ -7366,7 +5972,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_validation_features ===
 
-  // wrapper class for enum VkValidationFeatureEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationFeatureEnableEXT.html
   enum class ValidationFeatureEnableEXT
   {
     eGpuAssisted                   = VK_VALIDATION_FEATURE_ENABLE_GPU_ASSISTED_EXT,
@@ -7376,7 +5981,6 @@ namespace VULKAN_HPP_NAMESPACE
     eSynchronizationValidation     = VK_VALIDATION_FEATURE_ENABLE_SYNCHRONIZATION_VALIDATION_EXT
   };
 
-  // wrapper class for enum VkValidationFeatureDisableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationFeatureDisableEXT.html
   enum class ValidationFeatureDisableEXT
   {
     eAll                   = VK_VALIDATION_FEATURE_DISABLE_ALL_EXT,
@@ -7391,7 +5995,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_coverage_reduction_mode ===
 
-  // wrapper class for enum VkCoverageReductionModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCoverageReductionModeNV.html
   enum class CoverageReductionModeNV
   {
     eMerge    = VK_COVERAGE_REDUCTION_MODE_MERGE_NV,
@@ -7402,8 +6005,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkPipelineCoverageReductionStateCreateFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageReductionStateCreateFlagsNV.html
   using PipelineCoverageReductionStateCreateFlagsNV = Flags<PipelineCoverageReductionStateCreateFlagBitsNV>;
 
   template <>
@@ -7415,7 +6016,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_provoking_vertex ===
 
-  // wrapper class for enum VkProvokingVertexModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkProvokingVertexModeEXT.html
   enum class ProvokingVertexModeEXT
   {
     eFirstVertex = VK_PROVOKING_VERTEX_MODE_FIRST_VERTEX_EXT,
@@ -7425,7 +6025,6 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_EXT_full_screen_exclusive ===
 
-  // wrapper class for enum VkFullScreenExclusiveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFullScreenExclusiveEXT.html
   enum class FullScreenExclusiveEXT
   {
     eDefault               = VK_FULL_SCREEN_EXCLUSIVE_DEFAULT_EXT,
@@ -7433,7 +6032,6 @@ namespace VULKAN_HPP_NAMESPACE
     eDisallowed            = VK_FULL_SCREEN_EXCLUSIVE_DISALLOWED_EXT,
     eApplicationControlled = VK_FULL_SCREEN_EXCLUSIVE_APPLICATION_CONTROLLED_EXT
   };
-
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_EXT_headless_surface ===
@@ -7442,8 +6040,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkHeadlessSurfaceCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkHeadlessSurfaceCreateFlagsEXT.html
   using HeadlessSurfaceCreateFlagsEXT = Flags<HeadlessSurfaceCreateFlagBitsEXT>;
 
   template <>
@@ -7455,8 +6051,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_pipeline_executable_properties ===
 
-  // wrapper class for enum VkPipelineExecutableStatisticFormatKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineExecutableStatisticFormatKHR.html
   enum class PipelineExecutableStatisticFormatKHR
   {
     eBool32  = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_BOOL32_KHR,
@@ -7465,26 +6059,90 @@ namespace VULKAN_HPP_NAMESPACE
     eFloat64 = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_FLOAT64_KHR
   };
 
+  //=== VK_EXT_host_image_copy ===
+
+  enum class HostImageCopyFlagBitsEXT : VkHostImageCopyFlagsEXT
+  {
+    eMemcpy = VK_HOST_IMAGE_COPY_MEMCPY_EXT
+  };
+
+  using HostImageCopyFlagsEXT = Flags<HostImageCopyFlagBitsEXT>;
+
+  template <>
+  struct FlagTraits<HostImageCopyFlagBitsEXT>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR HostImageCopyFlagsEXT allFlags  = HostImageCopyFlagBitsEXT::eMemcpy;
+  };
+
+  //=== VK_KHR_map_memory2 ===
+
+  enum class MemoryUnmapFlagBitsKHR : VkMemoryUnmapFlagsKHR
+  {
+    eReserveEXT = VK_MEMORY_UNMAP_RESERVE_BIT_EXT
+  };
+
+  using MemoryUnmapFlagsKHR = Flags<MemoryUnmapFlagBitsKHR>;
+
+  template <>
+  struct FlagTraits<MemoryUnmapFlagBitsKHR>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryUnmapFlagsKHR allFlags  = MemoryUnmapFlagBitsKHR::eReserveEXT;
+  };
+
+  //=== VK_EXT_surface_maintenance1 ===
+
+  enum class PresentScalingFlagBitsEXT : VkPresentScalingFlagsEXT
+  {
+    eOneToOne           = VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT,
+    eAspectRatioStretch = VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT,
+    eStretch            = VK_PRESENT_SCALING_STRETCH_BIT_EXT
+  };
+
+  using PresentScalingFlagsEXT = Flags<PresentScalingFlagBitsEXT>;
+
+  template <>
+  struct FlagTraits<PresentScalingFlagBitsEXT>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentScalingFlagsEXT allFlags =
+      PresentScalingFlagBitsEXT::eOneToOne | PresentScalingFlagBitsEXT::eAspectRatioStretch | PresentScalingFlagBitsEXT::eStretch;
+  };
+
+  enum class PresentGravityFlagBitsEXT : VkPresentGravityFlagsEXT
+  {
+    eMin      = VK_PRESENT_GRAVITY_MIN_BIT_EXT,
+    eMax      = VK_PRESENT_GRAVITY_MAX_BIT_EXT,
+    eCentered = VK_PRESENT_GRAVITY_CENTERED_BIT_EXT
+  };
+
+  using PresentGravityFlagsEXT = Flags<PresentGravityFlagBitsEXT>;
+
+  template <>
+  struct FlagTraits<PresentGravityFlagBitsEXT>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentGravityFlagsEXT allFlags =
+      PresentGravityFlagBitsEXT::eMin | PresentGravityFlagBitsEXT::eMax | PresentGravityFlagBitsEXT::eCentered;
+  };
+
   //=== VK_NV_device_generated_commands ===
 
-  // wrapper class for enum VkIndirectStateFlagBitsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectStateFlagBitsNV.html
   enum class IndirectStateFlagBitsNV : VkIndirectStateFlagsNV
   {
     eFlagFrontface = VK_INDIRECT_STATE_FLAG_FRONTFACE_BIT_NV
   };
 
-  // wrapper using for bitmask VkIndirectStateFlagsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectStateFlagsNV.html
   using IndirectStateFlagsNV = Flags<IndirectStateFlagBitsNV>;
 
   template <>
   struct FlagTraits<IndirectStateFlagBitsNV>
   {
-    using WrappedType                                                   = VkIndirectStateFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR IndirectStateFlagsNV allFlags  = IndirectStateFlagBitsNV::eFlagFrontface;
   };
 
-  // wrapper class for enum VkIndirectCommandsTokenTypeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsTokenTypeNV.html
   enum class IndirectCommandsTokenTypeNV
   {
     eShaderGroup   = VK_INDIRECT_COMMANDS_TOKEN_TYPE_SHADER_GROUP_NV,
@@ -7500,8 +6158,6 @@ namespace VULKAN_HPP_NAMESPACE
     eDispatch      = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_NV
   };
 
-  // wrapper class for enum VkIndirectCommandsLayoutUsageFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutUsageFlagBitsNV.html
   enum class IndirectCommandsLayoutUsageFlagBitsNV : VkIndirectCommandsLayoutUsageFlagsNV
   {
     eExplicitPreprocess = VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EXPLICIT_PREPROCESS_BIT_NV,
@@ -7509,14 +6165,11 @@ namespace VULKAN_HPP_NAMESPACE
     eUnorderedSequences = VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NV
   };
 
-  // wrapper using for bitmask VkIndirectCommandsLayoutUsageFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutUsageFlagsNV.html
   using IndirectCommandsLayoutUsageFlagsNV = Flags<IndirectCommandsLayoutUsageFlagBitsNV>;
 
   template <>
   struct FlagTraits<IndirectCommandsLayoutUsageFlagBitsNV>
   {
-    using WrappedType                                                                 = VkIndirectCommandsLayoutUsageFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR IndirectCommandsLayoutUsageFlagsNV allFlags  = IndirectCommandsLayoutUsageFlagBitsNV::eExplicitPreprocess |
                                                                                        IndirectCommandsLayoutUsageFlagBitsNV::eIndexedSequences |
@@ -7525,7 +6178,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_depth_bias_control ===
 
-  // wrapper class for enum VkDepthBiasRepresentationEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDepthBiasRepresentationEXT.html
   enum class DepthBiasRepresentationEXT
   {
     eLeastRepresentableValueFormat     = VK_DEPTH_BIAS_REPRESENTATION_LEAST_REPRESENTABLE_VALUE_FORMAT_EXT,
@@ -7535,8 +6187,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_device_memory_report ===
 
-  // wrapper class for enum VkDeviceMemoryReportEventTypeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemoryReportEventTypeEXT.html
   enum class DeviceMemoryReportEventTypeEXT
   {
     eAllocate         = VK_DEVICE_MEMORY_REPORT_EVENT_TYPE_ALLOCATE_EXT,
@@ -7550,7 +6200,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDeviceMemoryReportFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemoryReportFlagsEXT.html
   using DeviceMemoryReportFlagsEXT = Flags<DeviceMemoryReportFlagBitsEXT>;
 
   template <>
@@ -7562,32 +6211,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_encode_queue ===
 
-  // wrapper class for enum VkVideoEncodeCapabilityFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeCapabilityFlagBitsKHR.html
   enum class VideoEncodeCapabilityFlagBitsKHR : VkVideoEncodeCapabilityFlagsKHR
   {
     ePrecedingExternallyEncodedBytes           = VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR,
-    eInsufficientBitstreamBufferRangeDetection = VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR,
-    eQuantizationDeltaMap                      = VK_VIDEO_ENCODE_CAPABILITY_QUANTIZATION_DELTA_MAP_BIT_KHR,
-    eEmphasisMap                               = VK_VIDEO_ENCODE_CAPABILITY_EMPHASIS_MAP_BIT_KHR
+    eInsufficientBitstreamBufferRangeDetection = VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeCapabilityFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeCapabilityFlagsKHR.html
   using VideoEncodeCapabilityFlagsKHR = Flags<VideoEncodeCapabilityFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeCapabilityFlagBitsKHR>
   {
-    using WrappedType                                                            = VkVideoEncodeCapabilityFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeCapabilityFlagsKHR allFlags =
-      VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes | VideoEncodeCapabilityFlagBitsKHR::eInsufficientBitstreamBufferRangeDetection |
-      VideoEncodeCapabilityFlagBitsKHR::eQuantizationDeltaMap | VideoEncodeCapabilityFlagBitsKHR::eEmphasisMap;
+      VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes | VideoEncodeCapabilityFlagBitsKHR::eInsufficientBitstreamBufferRangeDetection;
   };
 
-  // wrapper class for enum VkVideoEncodeFeedbackFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeFeedbackFlagBitsKHR.html
   enum class VideoEncodeFeedbackFlagBitsKHR : VkVideoEncodeFeedbackFlagsKHR
   {
     eBitstreamBufferOffset = VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_BUFFER_OFFSET_BIT_KHR,
@@ -7595,20 +6234,17 @@ namespace VULKAN_HPP_NAMESPACE
     eBitstreamHasOverrides = VK_VIDEO_ENCODE_FEEDBACK_BITSTREAM_HAS_OVERRIDES_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeFeedbackFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeFeedbackFlagsKHR.html
   using VideoEncodeFeedbackFlagsKHR = Flags<VideoEncodeFeedbackFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeFeedbackFlagBitsKHR>
   {
-    using WrappedType                                                          = VkVideoEncodeFeedbackFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                        isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeFeedbackFlagsKHR allFlags  = VideoEncodeFeedbackFlagBitsKHR::eBitstreamBufferOffset |
                                                                                 VideoEncodeFeedbackFlagBitsKHR::eBitstreamBytesWritten |
                                                                                 VideoEncodeFeedbackFlagBitsKHR::eBitstreamHasOverrides;
   };
 
-  // wrapper class for enum VkVideoEncodeUsageFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeUsageFlagBitsKHR.html
   enum class VideoEncodeUsageFlagBitsKHR : VkVideoEncodeUsageFlagsKHR
   {
     eDefault      = VK_VIDEO_ENCODE_USAGE_DEFAULT_KHR,
@@ -7618,20 +6254,17 @@ namespace VULKAN_HPP_NAMESPACE
     eConferencing = VK_VIDEO_ENCODE_USAGE_CONFERENCING_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeUsageFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeUsageFlagsKHR.html
   using VideoEncodeUsageFlagsKHR = Flags<VideoEncodeUsageFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeUsageFlagBitsKHR>
   {
-    using WrappedType                                                       = VkVideoEncodeUsageFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeUsageFlagsKHR allFlags = VideoEncodeUsageFlagBitsKHR::eDefault | VideoEncodeUsageFlagBitsKHR::eTranscoding |
                                                                              VideoEncodeUsageFlagBitsKHR::eStreaming | VideoEncodeUsageFlagBitsKHR::eRecording |
                                                                              VideoEncodeUsageFlagBitsKHR::eConferencing;
   };
 
-  // wrapper class for enum VkVideoEncodeContentFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeContentFlagBitsKHR.html
   enum class VideoEncodeContentFlagBitsKHR : VkVideoEncodeContentFlagsKHR
   {
     eDefault  = VK_VIDEO_ENCODE_CONTENT_DEFAULT_KHR,
@@ -7640,20 +6273,17 @@ namespace VULKAN_HPP_NAMESPACE
     eRendered = VK_VIDEO_ENCODE_CONTENT_RENDERED_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeContentFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeContentFlagsKHR.html
   using VideoEncodeContentFlagsKHR = Flags<VideoEncodeContentFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeContentFlagBitsKHR>
   {
-    using WrappedType                                                         = VkVideoEncodeContentFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeContentFlagsKHR allFlags =
       VideoEncodeContentFlagBitsKHR::eDefault | VideoEncodeContentFlagBitsKHR::eCamera | VideoEncodeContentFlagBitsKHR::eDesktop |
       VideoEncodeContentFlagBitsKHR::eRendered;
   };
 
-  // wrapper class for enum VkVideoEncodeTuningModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeTuningModeKHR.html
   enum class VideoEncodeTuningModeKHR
   {
     eDefault         = VK_VIDEO_ENCODE_TUNING_MODE_DEFAULT_KHR,
@@ -7663,8 +6293,6 @@ namespace VULKAN_HPP_NAMESPACE
     eLossless        = VK_VIDEO_ENCODE_TUNING_MODE_LOSSLESS_KHR
   };
 
-  // wrapper class for enum VkVideoEncodeRateControlModeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRateControlModeFlagBitsKHR.html
   enum class VideoEncodeRateControlModeFlagBitsKHR : VkVideoEncodeRateControlModeFlagsKHR
   {
     eDefault  = VK_VIDEO_ENCODE_RATE_CONTROL_MODE_DEFAULT_KHR,
@@ -7673,46 +6301,34 @@ namespace VULKAN_HPP_NAMESPACE
     eVbr      = VK_VIDEO_ENCODE_RATE_CONTROL_MODE_VBR_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeRateControlModeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRateControlModeFlagsKHR.html
   using VideoEncodeRateControlModeFlagsKHR = Flags<VideoEncodeRateControlModeFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeRateControlModeFlagBitsKHR>
   {
-    using WrappedType                                                                 = VkVideoEncodeRateControlModeFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                               isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeRateControlModeFlagsKHR allFlags =
       VideoEncodeRateControlModeFlagBitsKHR::eDefault | VideoEncodeRateControlModeFlagBitsKHR::eDisabled | VideoEncodeRateControlModeFlagBitsKHR::eCbr |
       VideoEncodeRateControlModeFlagBitsKHR::eVbr;
   };
 
-  // wrapper class for enum VkVideoEncodeFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeFlagBitsKHR.html
   enum class VideoEncodeFlagBitsKHR : VkVideoEncodeFlagsKHR
   {
-    eIntraRefresh             = VK_VIDEO_ENCODE_INTRA_REFRESH_BIT_KHR,
-    eWithQuantizationDeltaMap = VK_VIDEO_ENCODE_WITH_QUANTIZATION_DELTA_MAP_BIT_KHR,
-    eWithEmphasisMap          = VK_VIDEO_ENCODE_WITH_EMPHASIS_MAP_BIT_KHR
   };
 
-  // wrapper using for bitmask VkVideoEncodeFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeFlagsKHR.html
   using VideoEncodeFlagsKHR = Flags<VideoEncodeFlagBitsKHR>;
 
   template <>
   struct FlagTraits<VideoEncodeFlagBitsKHR>
   {
-    using WrappedType                                                  = VkVideoEncodeFlagBitsKHR;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeFlagsKHR allFlags =
-      VideoEncodeFlagBitsKHR::eIntraRefresh | VideoEncodeFlagBitsKHR::eWithQuantizationDeltaMap | VideoEncodeFlagBitsKHR::eWithEmphasisMap;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeFlagsKHR allFlags  = {};
   };
 
   enum class VideoEncodeRateControlFlagBitsKHR : VkVideoEncodeRateControlFlagsKHR
   {
   };
 
-  // wrapper using for bitmask VkVideoEncodeRateControlFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRateControlFlagsKHR.html
   using VideoEncodeRateControlFlagsKHR = Flags<VideoEncodeRateControlFlagBitsKHR>;
 
   template <>
@@ -7724,8 +6340,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_device_diagnostics_config ===
 
-  // wrapper class for enum VkDeviceDiagnosticsConfigFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceDiagnosticsConfigFlagBitsNV.html
   enum class DeviceDiagnosticsConfigFlagBitsNV : VkDeviceDiagnosticsConfigFlagsNV
   {
     eEnableShaderDebugInfo      = VK_DEVICE_DIAGNOSTICS_CONFIG_ENABLE_SHADER_DEBUG_INFO_BIT_NV,
@@ -7734,48 +6348,20 @@ namespace VULKAN_HPP_NAMESPACE
     eEnableShaderErrorReporting = VK_DEVICE_DIAGNOSTICS_CONFIG_ENABLE_SHADER_ERROR_REPORTING_BIT_NV
   };
 
-  // wrapper using for bitmask VkDeviceDiagnosticsConfigFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceDiagnosticsConfigFlagsNV.html
   using DeviceDiagnosticsConfigFlagsNV = Flags<DeviceDiagnosticsConfigFlagBitsNV>;
 
   template <>
   struct FlagTraits<DeviceDiagnosticsConfigFlagBitsNV>
   {
-    using WrappedType                                                             = VkDeviceDiagnosticsConfigFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DeviceDiagnosticsConfigFlagsNV allFlags =
       DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderDebugInfo | DeviceDiagnosticsConfigFlagBitsNV::eEnableResourceTracking |
       DeviceDiagnosticsConfigFlagBitsNV::eEnableAutomaticCheckpoints | DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderErrorReporting;
   };
 
-  //=== VK_QCOM_tile_shading ===
-
-  // wrapper class for enum VkTileShadingRenderPassFlagBitsQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTileShadingRenderPassFlagBitsQCOM.html
-  enum class TileShadingRenderPassFlagBitsQCOM : VkTileShadingRenderPassFlagsQCOM
-  {
-    eEnable           = VK_TILE_SHADING_RENDER_PASS_ENABLE_BIT_QCOM,
-    ePerTileExecution = VK_TILE_SHADING_RENDER_PASS_PER_TILE_EXECUTION_BIT_QCOM
-  };
-
-  // wrapper using for bitmask VkTileShadingRenderPassFlagsQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTileShadingRenderPassFlagsQCOM.html
-  using TileShadingRenderPassFlagsQCOM = Flags<TileShadingRenderPassFlagBitsQCOM>;
-
-  template <>
-  struct FlagTraits<TileShadingRenderPassFlagBitsQCOM>
-  {
-    using WrappedType                                                             = VkTileShadingRenderPassFlagBitsQCOM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR TileShadingRenderPassFlagsQCOM allFlags =
-      TileShadingRenderPassFlagBitsQCOM::eEnable | TileShadingRenderPassFlagBitsQCOM::ePerTileExecution;
-  };
-
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_objects ===
 
-  // wrapper class for enum VkExportMetalObjectTypeFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalObjectTypeFlagBitsEXT.html
   enum class ExportMetalObjectTypeFlagBitsEXT : VkExportMetalObjectTypeFlagsEXT
   {
     eMetalDevice       = VK_EXPORT_METAL_OBJECT_TYPE_METAL_DEVICE_BIT_EXT,
@@ -7786,14 +6372,11 @@ namespace VULKAN_HPP_NAMESPACE
     eMetalSharedEvent  = VK_EXPORT_METAL_OBJECT_TYPE_METAL_SHARED_EVENT_BIT_EXT
   };
 
-  // wrapper using for bitmask VkExportMetalObjectTypeFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalObjectTypeFlagsEXT.html
   using ExportMetalObjectTypeFlagsEXT = Flags<ExportMetalObjectTypeFlagBitsEXT>;
 
   template <>
   struct FlagTraits<ExportMetalObjectTypeFlagBitsEXT>
   {
-    using WrappedType                                                            = VkExportMetalObjectTypeFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                          isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ExportMetalObjectTypeFlagsEXT allFlags =
       ExportMetalObjectTypeFlagBitsEXT::eMetalDevice | ExportMetalObjectTypeFlagBitsEXT::eMetalCommandQueue | ExportMetalObjectTypeFlagBitsEXT::eMetalBuffer |
@@ -7803,8 +6386,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_graphics_pipeline_library ===
 
-  // wrapper class for enum VkGraphicsPipelineLibraryFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsPipelineLibraryFlagBitsEXT.html
   enum class GraphicsPipelineLibraryFlagBitsEXT : VkGraphicsPipelineLibraryFlagsEXT
   {
     eVertexInputInterface    = VK_GRAPHICS_PIPELINE_LIBRARY_VERTEX_INPUT_INTERFACE_BIT_EXT,
@@ -7813,14 +6394,11 @@ namespace VULKAN_HPP_NAMESPACE
     eFragmentOutputInterface = VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT
   };
 
-  // wrapper using for bitmask VkGraphicsPipelineLibraryFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsPipelineLibraryFlagsEXT.html
   using GraphicsPipelineLibraryFlagsEXT = Flags<GraphicsPipelineLibraryFlagBitsEXT>;
 
   template <>
   struct FlagTraits<GraphicsPipelineLibraryFlagBitsEXT>
   {
-    using WrappedType                                                              = VkGraphicsPipelineLibraryFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                            isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR GraphicsPipelineLibraryFlagsEXT allFlags =
       GraphicsPipelineLibraryFlagBitsEXT::eVertexInputInterface | GraphicsPipelineLibraryFlagBitsEXT::ePreRasterizationShaders |
@@ -7829,7 +6407,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_fragment_shading_rate_enums ===
 
-  // wrapper class for enum VkFragmentShadingRateNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFragmentShadingRateNV.html
   enum class FragmentShadingRateNV
   {
     e1InvocationPerPixel     = VK_FRAGMENT_SHADING_RATE_1_INVOCATION_PER_PIXEL_NV,
@@ -7846,7 +6423,6 @@ namespace VULKAN_HPP_NAMESPACE
     eNoInvocations           = VK_FRAGMENT_SHADING_RATE_NO_INVOCATIONS_NV
   };
 
-  // wrapper class for enum VkFragmentShadingRateTypeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFragmentShadingRateTypeNV.html
   enum class FragmentShadingRateTypeNV
   {
     eFragmentSize = VK_FRAGMENT_SHADING_RATE_TYPE_FRAGMENT_SIZE_NV,
@@ -7855,8 +6431,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_ray_tracing_motion_blur ===
 
-  // wrapper class for enum VkAccelerationStructureMotionInstanceTypeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMotionInstanceTypeNV.html
   enum class AccelerationStructureMotionInstanceTypeNV
   {
     eStatic       = VK_ACCELERATION_STRUCTURE_MOTION_INSTANCE_TYPE_STATIC_NV,
@@ -7868,8 +6442,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkAccelerationStructureMotionInfoFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMotionInfoFlagsNV.html
   using AccelerationStructureMotionInfoFlagsNV = Flags<AccelerationStructureMotionInfoFlagBitsNV>;
 
   template <>
@@ -7883,8 +6455,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkAccelerationStructureMotionInstanceFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMotionInstanceFlagsNV.html
   using AccelerationStructureMotionInstanceFlagsNV = Flags<AccelerationStructureMotionInstanceFlagBitsNV>;
 
   template <>
@@ -7896,7 +6466,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_image_compression_control ===
 
-  // wrapper class for enum VkImageCompressionFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionFlagBitsEXT.html
   enum class ImageCompressionFlagBitsEXT : VkImageCompressionFlagsEXT
   {
     eDefault           = VK_IMAGE_COMPRESSION_DEFAULT_EXT,
@@ -7905,21 +6474,17 @@ namespace VULKAN_HPP_NAMESPACE
     eDisabled          = VK_IMAGE_COMPRESSION_DISABLED_EXT
   };
 
-  // wrapper using for bitmask VkImageCompressionFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionFlagsEXT.html
   using ImageCompressionFlagsEXT = Flags<ImageCompressionFlagBitsEXT>;
 
   template <>
   struct FlagTraits<ImageCompressionFlagBitsEXT>
   {
-    using WrappedType                                                       = VkImageCompressionFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageCompressionFlagsEXT allFlags =
       ImageCompressionFlagBitsEXT::eDefault | ImageCompressionFlagBitsEXT::eFixedRateDefault | ImageCompressionFlagBitsEXT::eFixedRateExplicit |
       ImageCompressionFlagBitsEXT::eDisabled;
   };
 
-  // wrapper class for enum VkImageCompressionFixedRateFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionFixedRateFlagBitsEXT.html
   enum class ImageCompressionFixedRateFlagBitsEXT : VkImageCompressionFixedRateFlagsEXT
   {
     eNone  = VK_IMAGE_COMPRESSION_FIXED_RATE_NONE_EXT,
@@ -7949,14 +6514,11 @@ namespace VULKAN_HPP_NAMESPACE
     e24Bpc = VK_IMAGE_COMPRESSION_FIXED_RATE_24BPC_BIT_EXT
   };
 
-  // wrapper using for bitmask VkImageCompressionFixedRateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionFixedRateFlagsEXT.html
   using ImageCompressionFixedRateFlagsEXT = Flags<ImageCompressionFixedRateFlagBitsEXT>;
 
   template <>
   struct FlagTraits<ImageCompressionFixedRateFlagBitsEXT>
   {
-    using WrappedType                                                                = VkImageCompressionFixedRateFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageCompressionFixedRateFlagsEXT allFlags =
       ImageCompressionFixedRateFlagBitsEXT::eNone | ImageCompressionFixedRateFlagBitsEXT::e1Bpc | ImageCompressionFixedRateFlagBitsEXT::e2Bpc |
@@ -7972,7 +6534,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_device_fault ===
 
-  // wrapper class for enum VkDeviceFaultAddressTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultAddressTypeEXT.html
   enum class DeviceFaultAddressTypeEXT
   {
     eNone                      = VK_DEVICE_FAULT_ADDRESS_TYPE_NONE_EXT,
@@ -7984,8 +6545,6 @@ namespace VULKAN_HPP_NAMESPACE
     eInstructionPointerFault   = VK_DEVICE_FAULT_ADDRESS_TYPE_INSTRUCTION_POINTER_FAULT_EXT
   };
 
-  // wrapper class for enum VkDeviceFaultVendorBinaryHeaderVersionEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultVendorBinaryHeaderVersionEXT.html
   enum class DeviceFaultVendorBinaryHeaderVersionEXT
   {
     eOne = VK_DEVICE_FAULT_VENDOR_BINARY_HEADER_VERSION_ONE_EXT
@@ -7998,8 +6557,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDirectFBSurfaceCreateFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectFBSurfaceCreateFlagsEXT.html
   using DirectFBSurfaceCreateFlagsEXT = Flags<DirectFBSurfaceCreateFlagBitsEXT>;
 
   template <>
@@ -8012,25 +6569,20 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_device_address_binding_report ===
 
-  // wrapper class for enum VkDeviceAddressBindingFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceAddressBindingFlagBitsEXT.html
   enum class DeviceAddressBindingFlagBitsEXT : VkDeviceAddressBindingFlagsEXT
   {
     eInternalObject = VK_DEVICE_ADDRESS_BINDING_INTERNAL_OBJECT_BIT_EXT
   };
 
-  // wrapper using for bitmask VkDeviceAddressBindingFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceAddressBindingFlagsEXT.html
   using DeviceAddressBindingFlagsEXT = Flags<DeviceAddressBindingFlagBitsEXT>;
 
   template <>
   struct FlagTraits<DeviceAddressBindingFlagBitsEXT>
   {
-    using WrappedType                                                           = VkDeviceAddressBindingFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                         isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR DeviceAddressBindingFlagsEXT allFlags  = DeviceAddressBindingFlagBitsEXT::eInternalObject;
   };
 
-  // wrapper class for enum VkDeviceAddressBindingTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceAddressBindingTypeEXT.html
   enum class DeviceAddressBindingTypeEXT
   {
     eBind   = VK_DEVICE_ADDRESS_BINDING_TYPE_BIND_EXT,
@@ -8040,8 +6592,6 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_buffer_collection ===
 
-  // wrapper class for enum VkImageConstraintsInfoFlagBitsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageConstraintsInfoFlagBitsFUCHSIA.html
   enum class ImageConstraintsInfoFlagBitsFUCHSIA : VkImageConstraintsInfoFlagsFUCHSIA
   {
     eCpuReadRarely     = VK_IMAGE_CONSTRAINTS_INFO_CPU_READ_RARELY_FUCHSIA,
@@ -8051,14 +6601,11 @@ namespace VULKAN_HPP_NAMESPACE
     eProtectedOptional = VK_IMAGE_CONSTRAINTS_INFO_PROTECTED_OPTIONAL_FUCHSIA
   };
 
-  // wrapper using for bitmask VkImageConstraintsInfoFlagsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageConstraintsInfoFlagsFUCHSIA.html
   using ImageConstraintsInfoFlagsFUCHSIA = Flags<ImageConstraintsInfoFlagBitsFUCHSIA>;
 
   template <>
   struct FlagTraits<ImageConstraintsInfoFlagBitsFUCHSIA>
   {
-    using WrappedType                                                               = VkImageConstraintsInfoFlagBitsFUCHSIA;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                             isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ImageConstraintsInfoFlagsFUCHSIA allFlags =
       ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadRarely | ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadOften |
@@ -8070,8 +6617,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkImageFormatConstraintsFlagsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageFormatConstraintsFlagsFUCHSIA.html
   using ImageFormatConstraintsFlagsFUCHSIA = Flags<ImageFormatConstraintsFlagBitsFUCHSIA>;
 
   template <>
@@ -8084,19 +6629,16 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_frame_boundary ===
 
-  // wrapper class for enum VkFrameBoundaryFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFrameBoundaryFlagBitsEXT.html
   enum class FrameBoundaryFlagBitsEXT : VkFrameBoundaryFlagsEXT
   {
     eFrameEnd = VK_FRAME_BOUNDARY_FRAME_END_BIT_EXT
   };
 
-  // wrapper using for bitmask VkFrameBoundaryFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFrameBoundaryFlagsEXT.html
   using FrameBoundaryFlagsEXT = Flags<FrameBoundaryFlagBitsEXT>;
 
   template <>
   struct FlagTraits<FrameBoundaryFlagBitsEXT>
   {
-    using WrappedType                                                    = VkFrameBoundaryFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR FrameBoundaryFlagsEXT allFlags  = FrameBoundaryFlagBitsEXT::eFrameEnd;
   };
@@ -8108,7 +6650,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkScreenSurfaceCreateFlagsQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkScreenSurfaceCreateFlagsQNX.html
   using ScreenSurfaceCreateFlagsQNX = Flags<ScreenSurfaceCreateFlagBitsQNX>;
 
   template <>
@@ -8119,79 +6660,8 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-
-  // wrapper class for enum VkVideoEncodeRgbModelConversionFlagBitsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbModelConversionFlagBitsVALVE.html
-  enum class VideoEncodeRgbModelConversionFlagBitsVALVE : VkVideoEncodeRgbModelConversionFlagsVALVE
-  {
-    eRgbIdentity   = VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_RGB_IDENTITY_BIT_VALVE,
-    eYcbcrIdentity = VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_IDENTITY_BIT_VALVE,
-    eYcbcr709      = VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_709_BIT_VALVE,
-    eYcbcr601      = VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_601_BIT_VALVE,
-    eYcbcr2020     = VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_2020_BIT_VALVE
-  };
-
-  // wrapper using for bitmask VkVideoEncodeRgbModelConversionFlagsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbModelConversionFlagsVALVE.html
-  using VideoEncodeRgbModelConversionFlagsVALVE = Flags<VideoEncodeRgbModelConversionFlagBitsVALVE>;
-
-  template <>
-  struct FlagTraits<VideoEncodeRgbModelConversionFlagBitsVALVE>
-  {
-    using WrappedType                                                                      = VkVideoEncodeRgbModelConversionFlagBitsVALVE;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                    isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeRgbModelConversionFlagsVALVE allFlags =
-      VideoEncodeRgbModelConversionFlagBitsVALVE::eRgbIdentity | VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcrIdentity |
-      VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr709 | VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr601 |
-      VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr2020;
-  };
-
-  // wrapper class for enum VkVideoEncodeRgbRangeCompressionFlagBitsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbRangeCompressionFlagBitsVALVE.html
-  enum class VideoEncodeRgbRangeCompressionFlagBitsVALVE : VkVideoEncodeRgbRangeCompressionFlagsVALVE
-  {
-    eFullRange   = VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FULL_RANGE_BIT_VALVE,
-    eNarrowRange = VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_NARROW_RANGE_BIT_VALVE
-  };
-
-  // wrapper using for bitmask VkVideoEncodeRgbRangeCompressionFlagsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbRangeCompressionFlagsVALVE.html
-  using VideoEncodeRgbRangeCompressionFlagsVALVE = Flags<VideoEncodeRgbRangeCompressionFlagBitsVALVE>;
-
-  template <>
-  struct FlagTraits<VideoEncodeRgbRangeCompressionFlagBitsVALVE>
-  {
-    using WrappedType                                                                       = VkVideoEncodeRgbRangeCompressionFlagBitsVALVE;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                     isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeRgbRangeCompressionFlagsVALVE allFlags =
-      VideoEncodeRgbRangeCompressionFlagBitsVALVE::eFullRange | VideoEncodeRgbRangeCompressionFlagBitsVALVE::eNarrowRange;
-  };
-
-  // wrapper class for enum VkVideoEncodeRgbChromaOffsetFlagBitsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbChromaOffsetFlagBitsVALVE.html
-  enum class VideoEncodeRgbChromaOffsetFlagBitsVALVE : VkVideoEncodeRgbChromaOffsetFlagsVALVE
-  {
-    eCositedEven = VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_COSITED_EVEN_BIT_VALVE,
-    eMidpoint    = VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_MIDPOINT_BIT_VALVE
-  };
-
-  // wrapper using for bitmask VkVideoEncodeRgbChromaOffsetFlagsVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbChromaOffsetFlagsVALVE.html
-  using VideoEncodeRgbChromaOffsetFlagsVALVE = Flags<VideoEncodeRgbChromaOffsetFlagBitsVALVE>;
-
-  template <>
-  struct FlagTraits<VideoEncodeRgbChromaOffsetFlagBitsVALVE>
-  {
-    using WrappedType                                                                   = VkVideoEncodeRgbChromaOffsetFlagBitsVALVE;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeRgbChromaOffsetFlagsVALVE allFlags =
-      VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven | VideoEncodeRgbChromaOffsetFlagBitsVALVE::eMidpoint;
-  };
-
   //=== VK_EXT_opacity_micromap ===
 
-  // wrapper class for enum VkMicromapTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapTypeEXT.html
   enum class MicromapTypeEXT
   {
     eOpacityMicromap = VK_MICROMAP_TYPE_OPACITY_MICROMAP_EXT,
@@ -8200,7 +6670,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
   };
 
-  // wrapper class for enum VkBuildMicromapFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildMicromapFlagBitsEXT.html
   enum class BuildMicromapFlagBitsEXT : VkBuildMicromapFlagsEXT
   {
     ePreferFastTrace = VK_BUILD_MICROMAP_PREFER_FAST_TRACE_BIT_EXT,
@@ -8208,19 +6677,16 @@ namespace VULKAN_HPP_NAMESPACE
     eAllowCompaction = VK_BUILD_MICROMAP_ALLOW_COMPACTION_BIT_EXT
   };
 
-  // wrapper using for bitmask VkBuildMicromapFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildMicromapFlagsEXT.html
   using BuildMicromapFlagsEXT = Flags<BuildMicromapFlagBitsEXT>;
 
   template <>
   struct FlagTraits<BuildMicromapFlagBitsEXT>
   {
-    using WrappedType                                                    = VkBuildMicromapFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                  isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR BuildMicromapFlagsEXT allFlags =
       BuildMicromapFlagBitsEXT::ePreferFastTrace | BuildMicromapFlagBitsEXT::ePreferFastBuild | BuildMicromapFlagBitsEXT::eAllowCompaction;
   };
 
-  // wrapper class for enum VkCopyMicromapModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMicromapModeEXT.html
   enum class CopyMicromapModeEXT
   {
     eClone       = VK_COPY_MICROMAP_MODE_CLONE_EXT,
@@ -8229,101 +6695,84 @@ namespace VULKAN_HPP_NAMESPACE
     eCompact     = VK_COPY_MICROMAP_MODE_COMPACT_EXT
   };
 
-  // wrapper class for enum VkMicromapCreateFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapCreateFlagBitsEXT.html
   enum class MicromapCreateFlagBitsEXT : VkMicromapCreateFlagsEXT
   {
     eDeviceAddressCaptureReplay = VK_MICROMAP_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_EXT
   };
 
-  // wrapper using for bitmask VkMicromapCreateFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapCreateFlagsEXT.html
   using MicromapCreateFlagsEXT = Flags<MicromapCreateFlagBitsEXT>;
 
   template <>
   struct FlagTraits<MicromapCreateFlagBitsEXT>
   {
-    using WrappedType                                                     = VkMicromapCreateFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR MicromapCreateFlagsEXT allFlags  = MicromapCreateFlagBitsEXT::eDeviceAddressCaptureReplay;
   };
 
-  // wrapper class for enum VkBuildMicromapModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildMicromapModeEXT.html
   enum class BuildMicromapModeEXT
   {
     eBuild = VK_BUILD_MICROMAP_MODE_BUILD_EXT
   };
 
-  // wrapper class for enum VkOpacityMicromapFormatEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpacityMicromapFormatEXT.html
   enum class OpacityMicromapFormatEXT
   {
     e2State = VK_OPACITY_MICROMAP_FORMAT_2_STATE_EXT,
     e4State = VK_OPACITY_MICROMAP_FORMAT_4_STATE_EXT
   };
 
-  // wrapper class for enum VkOpacityMicromapSpecialIndexEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpacityMicromapSpecialIndexEXT.html
   enum class OpacityMicromapSpecialIndexEXT
   {
-    eFullyTransparent                        = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_TRANSPARENT_EXT,
-    eFullyOpaque                             = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_OPAQUE_EXT,
-    eFullyUnknownTransparent                 = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_TRANSPARENT_EXT,
-    eFullyUnknownOpaque                      = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_OPAQUE_EXT,
-    eClusterGeometryDisableOpacityMicromapNV = VK_OPACITY_MICROMAP_SPECIAL_INDEX_CLUSTER_GEOMETRY_DISABLE_OPACITY_MICROMAP_NV
+    eFullyTransparent        = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_TRANSPARENT_EXT,
+    eFullyOpaque             = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_OPAQUE_EXT,
+    eFullyUnknownTransparent = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_TRANSPARENT_EXT,
+    eFullyUnknownOpaque      = VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_OPAQUE_EXT
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_NV_displacement_micromap ===
 
-  // wrapper class for enum VkDisplacementMicromapFormatNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplacementMicromapFormatNV.html
   enum class DisplacementMicromapFormatNV
   {
     e64Triangles64Bytes    = VK_DISPLACEMENT_MICROMAP_FORMAT_64_TRIANGLES_64_BYTES_NV,
     e256Triangles128Bytes  = VK_DISPLACEMENT_MICROMAP_FORMAT_256_TRIANGLES_128_BYTES_NV,
     e1024Triangles128Bytes = VK_DISPLACEMENT_MICROMAP_FORMAT_1024_TRIANGLES_128_BYTES_NV
   };
-
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_ARM_scheduling_controls ===
 
-  // wrapper class for enum VkPhysicalDeviceSchedulingControlsFlagBitsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSchedulingControlsFlagBitsARM.html
   enum class PhysicalDeviceSchedulingControlsFlagBitsARM : VkPhysicalDeviceSchedulingControlsFlagsARM
   {
     eShaderCoreCount = VK_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_SHADER_CORE_COUNT_ARM
   };
 
-  // wrapper using for bitmask VkPhysicalDeviceSchedulingControlsFlagsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSchedulingControlsFlagsARM.html
   using PhysicalDeviceSchedulingControlsFlagsARM = Flags<PhysicalDeviceSchedulingControlsFlagBitsARM>;
 
   template <>
   struct FlagTraits<PhysicalDeviceSchedulingControlsFlagBitsARM>
   {
-    using WrappedType                                                                       = VkPhysicalDeviceSchedulingControlsFlagBitsARM;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                     isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR PhysicalDeviceSchedulingControlsFlagsARM allFlags  = PhysicalDeviceSchedulingControlsFlagBitsARM::eShaderCoreCount;
   };
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
+  //=== VK_NV_memory_decompression ===
 
-  // wrapper class for enum VkRayTracingLssIndexingModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingLssIndexingModeNV.html
-  enum class RayTracingLssIndexingModeNV
+  enum class MemoryDecompressionMethodFlagBitsNV : VkMemoryDecompressionMethodFlagsNV
   {
-    eList       = VK_RAY_TRACING_LSS_INDEXING_MODE_LIST_NV,
-    eSuccessive = VK_RAY_TRACING_LSS_INDEXING_MODE_SUCCESSIVE_NV
+    eGdeflate10 = VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_NV
   };
 
-  // wrapper class for enum VkRayTracingLssPrimitiveEndCapsModeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingLssPrimitiveEndCapsModeNV.html
-  enum class RayTracingLssPrimitiveEndCapsModeNV
+  using MemoryDecompressionMethodFlagsNV = Flags<MemoryDecompressionMethodFlagBitsNV>;
+
+  template <>
+  struct FlagTraits<MemoryDecompressionMethodFlagBitsNV>
   {
-    eNone    = VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_NONE_NV,
-    eChained = VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_CHAINED_NV
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                             isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryDecompressionMethodFlagsNV allFlags  = MemoryDecompressionMethodFlagBitsNV::eGdeflate10;
   };
 
   //=== VK_EXT_subpass_merge_feedback ===
 
-  // wrapper class for enum VkSubpassMergeStatusEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassMergeStatusEXT.html
   enum class SubpassMergeStatusEXT
   {
     eMerged                               = VK_SUBPASS_MERGE_STATUS_MERGED_EXT,
@@ -8344,7 +6793,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_LUNARG_direct_driver_loading ===
 
-  // wrapper class for enum VkDirectDriverLoadingModeLUNARG, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectDriverLoadingModeLUNARG.html
   enum class DirectDriverLoadingModeLUNARG
   {
     eExclusive = VK_DIRECT_DRIVER_LOADING_MODE_EXCLUSIVE_LUNARG,
@@ -8355,8 +6803,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  // wrapper using for bitmask VkDirectDriverLoadingFlagsLUNARG, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectDriverLoadingFlagsLUNARG.html
   using DirectDriverLoadingFlagsLUNARG = Flags<DirectDriverLoadingFlagBitsLUNARG>;
 
   template <>
@@ -8366,78 +6812,8 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR DirectDriverLoadingFlagsLUNARG allFlags  = {};
   };
 
-  //=== VK_ARM_tensors ===
-
-  // wrapper class for enum VkTensorCreateFlagBitsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorCreateFlagBitsARM.html
-  enum class TensorCreateFlagBitsARM : VkTensorCreateFlagsARM
-  {
-    eMutableFormat                 = VK_TENSOR_CREATE_MUTABLE_FORMAT_BIT_ARM,
-    eProtected                     = VK_TENSOR_CREATE_PROTECTED_BIT_ARM,
-    eDescriptorBufferCaptureReplay = VK_TENSOR_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM
-  };
-
-  // wrapper using for bitmask VkTensorCreateFlagsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorCreateFlagsARM.html
-  using TensorCreateFlagsARM = Flags<TensorCreateFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<TensorCreateFlagBitsARM>
-  {
-    using WrappedType                                                   = VkTensorCreateFlagBitsARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR TensorCreateFlagsARM allFlags =
-      TensorCreateFlagBitsARM::eMutableFormat | TensorCreateFlagBitsARM::eProtected | TensorCreateFlagBitsARM::eDescriptorBufferCaptureReplay;
-  };
-
-  // wrapper class for enum VkTensorViewCreateFlagBitsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewCreateFlagBitsARM.html
-  enum class TensorViewCreateFlagBitsARM : VkTensorViewCreateFlagsARM
-  {
-    eDescriptorBufferCaptureReplay = VK_TENSOR_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM
-  };
-
-  // wrapper using for bitmask VkTensorViewCreateFlagsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewCreateFlagsARM.html
-  using TensorViewCreateFlagsARM = Flags<TensorViewCreateFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<TensorViewCreateFlagBitsARM>
-  {
-    using WrappedType                                                       = VkTensorViewCreateFlagBitsARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                     isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR TensorViewCreateFlagsARM allFlags  = TensorViewCreateFlagBitsARM::eDescriptorBufferCaptureReplay;
-  };
-
-  // wrapper class for enum VkTensorUsageFlagBitsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorUsageFlagBitsARM.html
-  enum class TensorUsageFlagBitsARM : VkTensorUsageFlagsARM
-  {
-    eShader        = VK_TENSOR_USAGE_SHADER_BIT_ARM,
-    eTransferSrc   = VK_TENSOR_USAGE_TRANSFER_SRC_BIT_ARM,
-    eTransferDst   = VK_TENSOR_USAGE_TRANSFER_DST_BIT_ARM,
-    eImageAliasing = VK_TENSOR_USAGE_IMAGE_ALIASING_BIT_ARM,
-    eDataGraph     = VK_TENSOR_USAGE_DATA_GRAPH_BIT_ARM
-  };
-
-  // wrapper using for bitmask VkTensorUsageFlagsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorUsageFlagsARM.html
-  using TensorUsageFlagsARM = Flags<TensorUsageFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<TensorUsageFlagBitsARM>
-  {
-    using WrappedType                                                  = VkTensorUsageFlagBitsARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR TensorUsageFlagsARM allFlags  = TensorUsageFlagBitsARM::eShader | TensorUsageFlagBitsARM::eTransferSrc |
-                                                                        TensorUsageFlagBitsARM::eTransferDst | TensorUsageFlagBitsARM::eImageAliasing |
-                                                                        TensorUsageFlagBitsARM::eDataGraph;
-  };
-
-  // wrapper class for enum VkTensorTilingARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorTilingARM.html
-  enum class TensorTilingARM
-  {
-    eOptimal = VK_TENSOR_TILING_OPTIMAL_ARM,
-    eLinear  = VK_TENSOR_TILING_LINEAR_ARM
-  };
-
   //=== VK_NV_optical_flow ===
 
-  // wrapper class for enum VkOpticalFlowUsageFlagBitsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowUsageFlagBitsNV.html
   enum class OpticalFlowUsageFlagBitsNV : VkOpticalFlowUsageFlagsNV
   {
     eUnknown    = VK_OPTICAL_FLOW_USAGE_UNKNOWN_NV,
@@ -8448,20 +6824,17 @@ namespace VULKAN_HPP_NAMESPACE
     eGlobalFlow = VK_OPTICAL_FLOW_USAGE_GLOBAL_FLOW_BIT_NV
   };
 
-  // wrapper using for bitmask VkOpticalFlowUsageFlagsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowUsageFlagsNV.html
   using OpticalFlowUsageFlagsNV = Flags<OpticalFlowUsageFlagBitsNV>;
 
   template <>
   struct FlagTraits<OpticalFlowUsageFlagBitsNV>
   {
-    using WrappedType                                                      = VkOpticalFlowUsageFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR OpticalFlowUsageFlagsNV allFlags  = OpticalFlowUsageFlagBitsNV::eUnknown | OpticalFlowUsageFlagBitsNV::eInput |
                                                                             OpticalFlowUsageFlagBitsNV::eOutput | OpticalFlowUsageFlagBitsNV::eHint |
                                                                             OpticalFlowUsageFlagBitsNV::eCost | OpticalFlowUsageFlagBitsNV::eGlobalFlow;
   };
 
-  // wrapper class for enum VkOpticalFlowGridSizeFlagBitsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowGridSizeFlagBitsNV.html
   enum class OpticalFlowGridSizeFlagBitsNV : VkOpticalFlowGridSizeFlagsNV
   {
     eUnknown = VK_OPTICAL_FLOW_GRID_SIZE_UNKNOWN_NV,
@@ -8471,20 +6844,17 @@ namespace VULKAN_HPP_NAMESPACE
     e8X8     = VK_OPTICAL_FLOW_GRID_SIZE_8X8_BIT_NV
   };
 
-  // wrapper using for bitmask VkOpticalFlowGridSizeFlagsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowGridSizeFlagsNV.html
   using OpticalFlowGridSizeFlagsNV = Flags<OpticalFlowGridSizeFlagBitsNV>;
 
   template <>
   struct FlagTraits<OpticalFlowGridSizeFlagBitsNV>
   {
-    using WrappedType                                                         = VkOpticalFlowGridSizeFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                       isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR OpticalFlowGridSizeFlagsNV allFlags  = OpticalFlowGridSizeFlagBitsNV::eUnknown | OpticalFlowGridSizeFlagBitsNV::e1X1 |
                                                                                OpticalFlowGridSizeFlagBitsNV::e2X2 | OpticalFlowGridSizeFlagBitsNV::e4X4 |
                                                                                OpticalFlowGridSizeFlagBitsNV::e8X8;
   };
 
-  // wrapper class for enum VkOpticalFlowPerformanceLevelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowPerformanceLevelNV.html
   enum class OpticalFlowPerformanceLevelNV
   {
     eUnknown = VK_OPTICAL_FLOW_PERFORMANCE_LEVEL_UNKNOWN_NV,
@@ -8493,8 +6863,6 @@ namespace VULKAN_HPP_NAMESPACE
     eFast    = VK_OPTICAL_FLOW_PERFORMANCE_LEVEL_FAST_NV
   };
 
-  // wrapper class for enum VkOpticalFlowSessionBindingPointNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionBindingPointNV.html
   enum class OpticalFlowSessionBindingPointNV
   {
     eUnknown            = VK_OPTICAL_FLOW_SESSION_BINDING_POINT_UNKNOWN_NV,
@@ -8508,8 +6876,6 @@ namespace VULKAN_HPP_NAMESPACE
     eGlobalFlow         = VK_OPTICAL_FLOW_SESSION_BINDING_POINT_GLOBAL_FLOW_NV
   };
 
-  // wrapper class for enum VkOpticalFlowSessionCreateFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionCreateFlagBitsNV.html
   enum class OpticalFlowSessionCreateFlagBitsNV : VkOpticalFlowSessionCreateFlagsNV
   {
     eEnableHint       = VK_OPTICAL_FLOW_SESSION_CREATE_ENABLE_HINT_BIT_NV,
@@ -8519,14 +6885,11 @@ namespace VULKAN_HPP_NAMESPACE
     eBothDirections   = VK_OPTICAL_FLOW_SESSION_CREATE_BOTH_DIRECTIONS_BIT_NV
   };
 
-  // wrapper using for bitmask VkOpticalFlowSessionCreateFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionCreateFlagsNV.html
   using OpticalFlowSessionCreateFlagsNV = Flags<OpticalFlowSessionCreateFlagBitsNV>;
 
   template <>
   struct FlagTraits<OpticalFlowSessionCreateFlagBitsNV>
   {
-    using WrappedType                                                              = VkOpticalFlowSessionCreateFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                            isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR OpticalFlowSessionCreateFlagsNV allFlags =
       OpticalFlowSessionCreateFlagBitsNV::eEnableHint | OpticalFlowSessionCreateFlagBitsNV::eEnableCost |
@@ -8534,54 +6897,140 @@ namespace VULKAN_HPP_NAMESPACE
       OpticalFlowSessionCreateFlagBitsNV::eBothDirections;
   };
 
-  // wrapper class for enum VkOpticalFlowExecuteFlagBitsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowExecuteFlagBitsNV.html
   enum class OpticalFlowExecuteFlagBitsNV : VkOpticalFlowExecuteFlagsNV
   {
     eDisableTemporalHints = VK_OPTICAL_FLOW_EXECUTE_DISABLE_TEMPORAL_HINTS_BIT_NV
   };
 
-  // wrapper using for bitmask VkOpticalFlowExecuteFlagsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowExecuteFlagsNV.html
   using OpticalFlowExecuteFlagsNV = Flags<OpticalFlowExecuteFlagBitsNV>;
 
   template <>
   struct FlagTraits<OpticalFlowExecuteFlagBitsNV>
   {
-    using WrappedType                                                        = VkOpticalFlowExecuteFlagBitsNV;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR OpticalFlowExecuteFlagsNV allFlags  = OpticalFlowExecuteFlagBitsNV::eDisableTemporalHints;
   };
 
-  //=== VK_AMD_anti_lag ===
+  //=== VK_KHR_maintenance5 ===
 
-  // wrapper class for enum VkAntiLagModeAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAntiLagModeAMD.html
-  enum class AntiLagModeAMD
+  enum class PipelineCreateFlagBits2KHR : VkPipelineCreateFlags2KHR
   {
-    eDriverControl = VK_ANTI_LAG_MODE_DRIVER_CONTROL_AMD,
-    eOn            = VK_ANTI_LAG_MODE_ON_AMD,
-    eOff           = VK_ANTI_LAG_MODE_OFF_AMD
+    eDisableOptimization                      = VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR,
+    eAllowDerivatives                         = VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR,
+    eDerivative                               = VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR,
+    eEnableLegacyDitheringEXT                 = VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT,
+    eViewIndexFromDeviceIndex                 = VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR,
+    eDispatchBase                             = VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR,
+    eDeferCompileNV                           = VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV,
+    eCaptureStatistics                        = VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR,
+    eCaptureInternalRepresentations           = VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR,
+    eFailOnPipelineCompileRequired            = VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR,
+    eEarlyReturnOnFailure                     = VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR,
+    eLinkTimeOptimizationEXT                  = VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT,
+    eRetainLinkTimeOptimizationInfoEXT        = VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT,
+    eLibrary                                  = VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR,
+    eRayTracingSkipTriangles                  = VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR,
+    eRayTracingSkipAabbs                      = VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR,
+    eRayTracingNoNullAnyHitShaders            = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR,
+    eRayTracingNoNullClosestHitShaders        = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR,
+    eRayTracingNoNullMissShaders              = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR,
+    eRayTracingNoNullIntersectionShaders      = VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR,
+    eRayTracingShaderGroupHandleCaptureReplay = VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR,
+    eIndirectBindableNV                       = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV,
+    eRayTracingAllowMotionNV                  = VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV,
+    eRenderingFragmentShadingRateAttachment   = VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
+    eRenderingFragmentDensityMapAttachmentEXT = VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
+    eRayTracingOpacityMicromapEXT             = VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT,
+    eColorAttachmentFeedbackLoopEXT           = VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
+    eDepthStencilAttachmentFeedbackLoopEXT    = VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT,
+    eNoProtectedAccessEXT                     = VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT,
+    eProtectedAccessOnlyEXT                   = VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT,
+    eRayTracingDisplacementMicromapNV         = VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV,
+    eDescriptorBufferEXT                      = VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT
   };
 
-  // wrapper class for enum VkAntiLagStageAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAntiLagStageAMD.html
-  enum class AntiLagStageAMD
+  using PipelineCreateFlags2KHR = Flags<PipelineCreateFlagBits2KHR>;
+
+  template <>
+  struct FlagTraits<PipelineCreateFlagBits2KHR>
   {
-    eInput   = VK_ANTI_LAG_STAGE_INPUT_AMD,
-    ePresent = VK_ANTI_LAG_STAGE_PRESENT_AMD
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                    isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR PipelineCreateFlags2KHR allFlags =
+      PipelineCreateFlagBits2KHR::eDisableOptimization | PipelineCreateFlagBits2KHR::eAllowDerivatives | PipelineCreateFlagBits2KHR::eDerivative |
+      PipelineCreateFlagBits2KHR::eEnableLegacyDitheringEXT | PipelineCreateFlagBits2KHR::eViewIndexFromDeviceIndex |
+      PipelineCreateFlagBits2KHR::eDispatchBase | PipelineCreateFlagBits2KHR::eDeferCompileNV | PipelineCreateFlagBits2KHR::eCaptureStatistics |
+      PipelineCreateFlagBits2KHR::eCaptureInternalRepresentations | PipelineCreateFlagBits2KHR::eFailOnPipelineCompileRequired |
+      PipelineCreateFlagBits2KHR::eEarlyReturnOnFailure | PipelineCreateFlagBits2KHR::eLinkTimeOptimizationEXT |
+      PipelineCreateFlagBits2KHR::eRetainLinkTimeOptimizationInfoEXT | PipelineCreateFlagBits2KHR::eLibrary |
+      PipelineCreateFlagBits2KHR::eRayTracingSkipTriangles | PipelineCreateFlagBits2KHR::eRayTracingSkipAabbs |
+      PipelineCreateFlagBits2KHR::eRayTracingNoNullAnyHitShaders | PipelineCreateFlagBits2KHR::eRayTracingNoNullClosestHitShaders |
+      PipelineCreateFlagBits2KHR::eRayTracingNoNullMissShaders | PipelineCreateFlagBits2KHR::eRayTracingNoNullIntersectionShaders |
+      PipelineCreateFlagBits2KHR::eRayTracingShaderGroupHandleCaptureReplay | PipelineCreateFlagBits2KHR::eIndirectBindableNV |
+      PipelineCreateFlagBits2KHR::eRayTracingAllowMotionNV | PipelineCreateFlagBits2KHR::eRenderingFragmentShadingRateAttachment |
+      PipelineCreateFlagBits2KHR::eRenderingFragmentDensityMapAttachmentEXT | PipelineCreateFlagBits2KHR::eRayTracingOpacityMicromapEXT |
+      PipelineCreateFlagBits2KHR::eColorAttachmentFeedbackLoopEXT | PipelineCreateFlagBits2KHR::eDepthStencilAttachmentFeedbackLoopEXT |
+      PipelineCreateFlagBits2KHR::eNoProtectedAccessEXT | PipelineCreateFlagBits2KHR::eProtectedAccessOnlyEXT |
+      PipelineCreateFlagBits2KHR::eRayTracingDisplacementMicromapNV | PipelineCreateFlagBits2KHR::eDescriptorBufferEXT;
   };
 
+  enum class BufferUsageFlagBits2KHR : VkBufferUsageFlags2KHR
+  {
+    eTransferSrc        = VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR,
+    eTransferDst        = VK_BUFFER_USAGE_2_TRANSFER_DST_BIT_KHR,
+    eUniformTexelBuffer = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR,
+    eStorageTexelBuffer = VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR,
+    eUniformBuffer      = VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR,
+    eStorageBuffer      = VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR,
+    eIndexBuffer        = VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR,
+    eVertexBuffer       = VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR,
+    eIndirectBuffer     = VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR,
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-
-  // wrapper class for enum VkCompressedTriangleFormatAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCompressedTriangleFormatAMDX.html
-  enum class CompressedTriangleFormatAMDX
-  {
-    eDgf1 = VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX
+    eExecutionGraphScratchAMDX = VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX,
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    eConditionalRenderingEXT                 = VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT,
+    eShaderBindingTable                      = VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR,
+    eRayTracingNV                            = VK_BUFFER_USAGE_2_RAY_TRACING_BIT_NV,
+    eTransformFeedbackBufferEXT              = VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT,
+    eTransformFeedbackCounterBufferEXT       = VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT,
+    eVideoDecodeSrc                          = VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR,
+    eVideoDecodeDst                          = VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR,
+    eVideoEncodeDst                          = VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR,
+    eVideoEncodeSrc                          = VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR,
+    eShaderDeviceAddress                     = VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR,
+    eAccelerationStructureBuildInputReadOnly = VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR,
+    eAccelerationStructureStorage            = VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+    eSamplerDescriptorBufferEXT              = VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT,
+    eResourceDescriptorBufferEXT             = VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
+    ePushDescriptorsDescriptorBufferEXT      = VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT,
+    eMicromapBuildInputReadOnlyEXT           = VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT,
+    eMicromapStorageEXT                      = VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT
   };
 
+  using BufferUsageFlags2KHR = Flags<BufferUsageFlagBits2KHR>;
+
+  template <>
+  struct FlagTraits<BufferUsageFlagBits2KHR>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR BufferUsageFlags2KHR allFlags =
+      BufferUsageFlagBits2KHR::eTransferSrc | BufferUsageFlagBits2KHR::eTransferDst | BufferUsageFlagBits2KHR::eUniformTexelBuffer |
+      BufferUsageFlagBits2KHR::eStorageTexelBuffer | BufferUsageFlagBits2KHR::eUniformBuffer | BufferUsageFlagBits2KHR::eStorageBuffer |
+      BufferUsageFlagBits2KHR::eIndexBuffer | BufferUsageFlagBits2KHR::eVertexBuffer | BufferUsageFlagBits2KHR::eIndirectBuffer
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      | BufferUsageFlagBits2KHR::eExecutionGraphScratchAMDX
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      | BufferUsageFlagBits2KHR::eConditionalRenderingEXT | BufferUsageFlagBits2KHR::eShaderBindingTable |
+      BufferUsageFlagBits2KHR::eTransformFeedbackBufferEXT | BufferUsageFlagBits2KHR::eTransformFeedbackCounterBufferEXT |
+      BufferUsageFlagBits2KHR::eVideoDecodeSrc | BufferUsageFlagBits2KHR::eVideoDecodeDst | BufferUsageFlagBits2KHR::eVideoEncodeDst |
+      BufferUsageFlagBits2KHR::eVideoEncodeSrc | BufferUsageFlagBits2KHR::eShaderDeviceAddress |
+      BufferUsageFlagBits2KHR::eAccelerationStructureBuildInputReadOnly | BufferUsageFlagBits2KHR::eAccelerationStructureStorage |
+      BufferUsageFlagBits2KHR::eSamplerDescriptorBufferEXT | BufferUsageFlagBits2KHR::eResourceDescriptorBufferEXT |
+      BufferUsageFlagBits2KHR::ePushDescriptorsDescriptorBufferEXT | BufferUsageFlagBits2KHR::eMicromapBuildInputReadOnlyEXT |
+      BufferUsageFlagBits2KHR::eMicromapStorageEXT;
+  };
 
   //=== VK_EXT_shader_object ===
 
-  // wrapper class for enum VkShaderCreateFlagBitsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderCreateFlagBitsEXT.html
   enum class ShaderCreateFlagBitsEXT : VkShaderCreateFlagsEXT
   {
     eLinkStage                     = VK_SHADER_CREATE_LINK_STAGE_BIT_EXT,
@@ -8590,120 +7039,37 @@ namespace VULKAN_HPP_NAMESPACE
     eNoTaskShader                  = VK_SHADER_CREATE_NO_TASK_SHADER_BIT_EXT,
     eDispatchBase                  = VK_SHADER_CREATE_DISPATCH_BASE_BIT_EXT,
     eFragmentShadingRateAttachment = VK_SHADER_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_EXT,
-    eFragmentDensityMapAttachment  = VK_SHADER_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT,
-    eIndirectBindable              = VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT,
-    e64BitIndexing                 = VK_SHADER_CREATE_64_BIT_INDEXING_BIT_EXT
+    eFragmentDensityMapAttachment  = VK_SHADER_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT
   };
 
-  // wrapper using for bitmask VkShaderCreateFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderCreateFlagsEXT.html
   using ShaderCreateFlagsEXT = Flags<ShaderCreateFlagBitsEXT>;
 
   template <>
   struct FlagTraits<ShaderCreateFlagBitsEXT>
   {
-    using WrappedType                                                   = VkShaderCreateFlagBitsEXT;
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR ShaderCreateFlagsEXT allFlags =
       ShaderCreateFlagBitsEXT::eLinkStage | ShaderCreateFlagBitsEXT::eAllowVaryingSubgroupSize | ShaderCreateFlagBitsEXT::eRequireFullSubgroups |
       ShaderCreateFlagBitsEXT::eNoTaskShader | ShaderCreateFlagBitsEXT::eDispatchBase | ShaderCreateFlagBitsEXT::eFragmentShadingRateAttachment |
-      ShaderCreateFlagBitsEXT::eFragmentDensityMapAttachment | ShaderCreateFlagBitsEXT::eIndirectBindable | ShaderCreateFlagBitsEXT::e64BitIndexing;
+      ShaderCreateFlagBitsEXT::eFragmentDensityMapAttachment;
   };
 
-  // wrapper class for enum VkShaderCodeTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderCodeTypeEXT.html
   enum class ShaderCodeTypeEXT
   {
     eBinary = VK_SHADER_CODE_TYPE_BINARY_EXT,
     eSpirv  = VK_SHADER_CODE_TYPE_SPIRV_EXT
   };
 
-  //=== VK_KHR_surface_maintenance1 ===
+  //=== VK_NV_ray_tracing_invocation_reorder ===
 
-  // wrapper class for enum VkPresentScalingFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentScalingFlagBitsKHR.html
-  enum class PresentScalingFlagBitsKHR : VkPresentScalingFlagsKHR
+  enum class RayTracingInvocationReorderModeNV
   {
-    eOneToOne           = VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR,
-    eAspectRatioStretch = VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR,
-    eStretch            = VK_PRESENT_SCALING_STRETCH_BIT_KHR
+    eNone    = VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV,
+    eReorder = VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV
   };
 
-  using PresentScalingFlagBitsEXT = PresentScalingFlagBitsKHR;
-
-  // wrapper using for bitmask VkPresentScalingFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentScalingFlagsKHR.html
-  using PresentScalingFlagsKHR = Flags<PresentScalingFlagBitsKHR>;
-  using PresentScalingFlagsEXT = PresentScalingFlagsKHR;
-
-  template <>
-  struct FlagTraits<PresentScalingFlagBitsKHR>
-  {
-    using WrappedType                                                     = VkPresentScalingFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentScalingFlagsKHR allFlags =
-      PresentScalingFlagBitsKHR::eOneToOne | PresentScalingFlagBitsKHR::eAspectRatioStretch | PresentScalingFlagBitsKHR::eStretch;
-  };
-
-  // wrapper class for enum VkPresentGravityFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentGravityFlagBitsKHR.html
-  enum class PresentGravityFlagBitsKHR : VkPresentGravityFlagsKHR
-  {
-    eMin      = VK_PRESENT_GRAVITY_MIN_BIT_KHR,
-    eMax      = VK_PRESENT_GRAVITY_MAX_BIT_KHR,
-    eCentered = VK_PRESENT_GRAVITY_CENTERED_BIT_KHR
-  };
-
-  using PresentGravityFlagBitsEXT = PresentGravityFlagBitsKHR;
-
-  // wrapper using for bitmask VkPresentGravityFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentGravityFlagsKHR.html
-  using PresentGravityFlagsKHR = Flags<PresentGravityFlagBitsKHR>;
-  using PresentGravityFlagsEXT = PresentGravityFlagsKHR;
-
-  template <>
-  struct FlagTraits<PresentGravityFlagBitsKHR>
-  {
-    using WrappedType                                                     = VkPresentGravityFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PresentGravityFlagsKHR allFlags =
-      PresentGravityFlagBitsKHR::eMin | PresentGravityFlagBitsKHR::eMax | PresentGravityFlagBitsKHR::eCentered;
-  };
-
-  //=== VK_NV_cooperative_vector ===
-
-  // wrapper class for enum VkCooperativeVectorMatrixLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCooperativeVectorMatrixLayoutNV.html
-  enum class CooperativeVectorMatrixLayoutNV
-  {
-    eRowMajor           = VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_ROW_MAJOR_NV,
-    eColumnMajor        = VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_COLUMN_MAJOR_NV,
-    eInferencingOptimal = VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_INFERENCING_OPTIMAL_NV,
-    eTrainingOptimal    = VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_TRAINING_OPTIMAL_NV
-  };
-
-  // wrapper class for enum VkComponentTypeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkComponentTypeKHR.html
-  enum class ComponentTypeKHR
-  {
-    eFloat16       = VK_COMPONENT_TYPE_FLOAT16_KHR,
-    eFloat32       = VK_COMPONENT_TYPE_FLOAT32_KHR,
-    eFloat64       = VK_COMPONENT_TYPE_FLOAT64_KHR,
-    eSint8         = VK_COMPONENT_TYPE_SINT8_KHR,
-    eSint16        = VK_COMPONENT_TYPE_SINT16_KHR,
-    eSint32        = VK_COMPONENT_TYPE_SINT32_KHR,
-    eSint64        = VK_COMPONENT_TYPE_SINT64_KHR,
-    eUint8         = VK_COMPONENT_TYPE_UINT8_KHR,
-    eUint16        = VK_COMPONENT_TYPE_UINT16_KHR,
-    eUint32        = VK_COMPONENT_TYPE_UINT32_KHR,
-    eUint64        = VK_COMPONENT_TYPE_UINT64_KHR,
-    eBfloat16      = VK_COMPONENT_TYPE_BFLOAT16_KHR,
-    eSint8PackedNV = VK_COMPONENT_TYPE_SINT8_PACKED_NV,
-    eUint8PackedNV = VK_COMPONENT_TYPE_UINT8_PACKED_NV,
-    eFloat8E4M3EXT = VK_COMPONENT_TYPE_FLOAT8_E4M3_EXT,
-    eFloatE4M3     = VK_COMPONENT_TYPE_FLOAT_E4M3_NV,
-    eFloat8E5M2EXT = VK_COMPONENT_TYPE_FLOAT8_E5M2_EXT,
-    eFloatE5M2     = VK_COMPONENT_TYPE_FLOAT_E5M2_NV
-  };
-
-  using ComponentTypeNV = ComponentTypeKHR;
-
   //=== VK_EXT_layer_settings ===
 
-  // wrapper class for enum VkLayerSettingTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLayerSettingTypeEXT.html
   enum class LayerSettingTypeEXT
   {
     eBool32  = VK_LAYER_SETTING_TYPE_BOOL32_EXT,
@@ -8716,78 +7082,8 @@ namespace VULKAN_HPP_NAMESPACE
     eString  = VK_LAYER_SETTING_TYPE_STRING_EXT
   };
 
-  //=================================
-  //=== Layer Setting Type Traits ===
-  //=================================
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eBool32>
-  {
-    using Type = Bool32;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eInt32>
-  {
-    using Type = int32_t;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eInt64>
-  {
-    using Type = int64_t;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eUint32>
-  {
-    using Type = uint32_t;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eUint64>
-  {
-    using Type = uint64_t;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eFloat32>
-  {
-    using Type = float;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eFloat64>
-  {
-    using Type = double;
-  };
-
-  template <>
-  struct CppType<LayerSettingTypeEXT, LayerSettingTypeEXT::eString>
-  {
-    using Type = char *;
-  };
-
-  template <typename T>
-  bool isSameType( LayerSettingTypeEXT layerSettingType )
-  {
-    switch ( layerSettingType )
-    {
-      case LayerSettingTypeEXT::eBool32 : return std::is_same<T, Bool32>::value;
-      case LayerSettingTypeEXT::eInt32  : return std::is_same<T, int32_t>::value;
-      case LayerSettingTypeEXT::eInt64  : return std::is_same<T, int64_t>::value;
-      case LayerSettingTypeEXT::eUint32 : return std::is_same<T, uint32_t>::value;
-      case LayerSettingTypeEXT::eUint64 : return std::is_same<T, uint64_t>::value;
-      case LayerSettingTypeEXT::eFloat32: return std::is_same<T, float>::value;
-      case LayerSettingTypeEXT::eFloat64: return std::is_same<T, double>::value;
-      case LayerSettingTypeEXT::eString : return std::is_same<T, char *>::value;
-      default                           : return false;
-    }
-  }
-
   //=== VK_NV_low_latency2 ===
 
-  // wrapper class for enum VkLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencyMarkerNV.html
   enum class LatencyMarkerNV
   {
     eSimulationStart            = VK_LATENCY_MARKER_SIMULATION_START_NV,
@@ -8804,7 +7100,6 @@ namespace VULKAN_HPP_NAMESPACE
     eOutOfBandPresentEnd        = VK_LATENCY_MARKER_OUT_OF_BAND_PRESENT_END_NV
   };
 
-  // wrapper class for enum VkOutOfBandQueueTypeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOutOfBandQueueTypeNV.html
   enum class OutOfBandQueueTypeNV
   {
     eRender  = VK_OUT_OF_BAND_QUEUE_TYPE_RENDER_NV,
@@ -8813,7 +7108,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_cooperative_matrix ===
 
-  // wrapper class for enum VkScopeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkScopeKHR.html
   enum class ScopeKHR
   {
     eDevice      = VK_SCOPE_DEVICE_KHR,
@@ -8821,203 +7115,26 @@ namespace VULKAN_HPP_NAMESPACE
     eSubgroup    = VK_SCOPE_SUBGROUP_KHR,
     eQueueFamily = VK_SCOPE_QUEUE_FAMILY_KHR
   };
-
   using ScopeNV = ScopeKHR;
 
-  //=== VK_ARM_data_graph ===
-
-  // wrapper class for enum VkDataGraphPipelineSessionBindPointARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionBindPointARM.html
-  enum class DataGraphPipelineSessionBindPointARM
+  enum class ComponentTypeKHR
   {
-    eTransient = VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TRANSIENT_ARM
-  };
-
-  // wrapper class for enum VkDataGraphPipelineSessionBindPointTypeARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionBindPointTypeARM.html
-  enum class DataGraphPipelineSessionBindPointTypeARM
-  {
-    eMemory = VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TYPE_MEMORY_ARM
-  };
-
-  // wrapper class for enum VkDataGraphPipelineSessionCreateFlagBitsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionCreateFlagBitsARM.html
-  enum class DataGraphPipelineSessionCreateFlagBitsARM : VkDataGraphPipelineSessionCreateFlagsARM
-  {
-    eProtected = VK_DATA_GRAPH_PIPELINE_SESSION_CREATE_PROTECTED_BIT_ARM
-  };
-
-  // wrapper using for bitmask VkDataGraphPipelineSessionCreateFlagsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionCreateFlagsARM.html
-  using DataGraphPipelineSessionCreateFlagsARM = Flags<DataGraphPipelineSessionCreateFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<DataGraphPipelineSessionCreateFlagBitsARM>
-  {
-    using WrappedType                                                                     = VkDataGraphPipelineSessionCreateFlagBitsARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                   isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DataGraphPipelineSessionCreateFlagsARM allFlags  = DataGraphPipelineSessionCreateFlagBitsARM::eProtected;
-  };
-
-  // wrapper class for enum VkDataGraphPipelinePropertyARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelinePropertyARM.html
-  enum class DataGraphPipelinePropertyARM
-  {
-    eCreationLog = VK_DATA_GRAPH_PIPELINE_PROPERTY_CREATION_LOG_ARM,
-    eIdentifier  = VK_DATA_GRAPH_PIPELINE_PROPERTY_IDENTIFIER_ARM
-  };
-
-  enum class DataGraphPipelineDispatchFlagBitsARM : VkDataGraphPipelineDispatchFlagsARM
-  {
-  };
-
-  // wrapper using for bitmask VkDataGraphPipelineDispatchFlagsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineDispatchFlagsARM.html
-  using DataGraphPipelineDispatchFlagsARM = Flags<DataGraphPipelineDispatchFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<DataGraphPipelineDispatchFlagBitsARM>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DataGraphPipelineDispatchFlagsARM allFlags  = {};
-  };
-
-  // wrapper class for enum VkPhysicalDeviceDataGraphProcessingEngineTypeARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphProcessingEngineTypeARM.html
-  enum class PhysicalDeviceDataGraphProcessingEngineTypeARM
-  {
-    eDefault     = VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_DEFAULT_ARM,
-    eNeuralQCOM  = VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_NEURAL_QCOM,
-    eComputeQCOM = VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_COMPUTE_QCOM
-  };
-
-  // wrapper class for enum VkPhysicalDeviceDataGraphOperationTypeARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphOperationTypeARM.html
-  enum class PhysicalDeviceDataGraphOperationTypeARM
-  {
-    eSpirvExtendedInstructionSet = VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_SPIRV_EXTENDED_INSTRUCTION_SET_ARM,
-    eNeuralModelQCOM             = VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_NEURAL_MODEL_QCOM,
-    eBuiltinModelQCOM            = VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_BUILTIN_MODEL_QCOM
-  };
-
-  //=== VK_KHR_video_encode_av1 ===
-
-  // wrapper class for enum VkVideoEncodeAV1PredictionModeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1PredictionModeKHR.html
-  enum class VideoEncodeAV1PredictionModeKHR
-  {
-    eIntraOnly              = VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_INTRA_ONLY_KHR,
-    eSingleReference        = VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_SINGLE_REFERENCE_KHR,
-    eUnidirectionalCompound = VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_UNIDIRECTIONAL_COMPOUND_KHR,
-    eBidirectionalCompound  = VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_BIDIRECTIONAL_COMPOUND_KHR
-  };
-
-  // wrapper class for enum VkVideoEncodeAV1RateControlGroupKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1RateControlGroupKHR.html
-  enum class VideoEncodeAV1RateControlGroupKHR
-  {
-    eIntra        = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_INTRA_KHR,
-    ePredictive   = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_PREDICTIVE_KHR,
-    eBipredictive = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_BIPREDICTIVE_KHR
-  };
-
-  // wrapper class for enum VkVideoEncodeAV1CapabilityFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1CapabilityFlagBitsKHR.html
-  enum class VideoEncodeAV1CapabilityFlagBitsKHR : VkVideoEncodeAV1CapabilityFlagsKHR
-  {
-    ePerRateControlGroupMinMaxQIndex = VK_VIDEO_ENCODE_AV1_CAPABILITY_PER_RATE_CONTROL_GROUP_MIN_MAX_Q_INDEX_BIT_KHR,
-    eGenerateObuExtensionHeader      = VK_VIDEO_ENCODE_AV1_CAPABILITY_GENERATE_OBU_EXTENSION_HEADER_BIT_KHR,
-    ePrimaryReferenceCdfOnly         = VK_VIDEO_ENCODE_AV1_CAPABILITY_PRIMARY_REFERENCE_CDF_ONLY_BIT_KHR,
-    eFrameSizeOverride               = VK_VIDEO_ENCODE_AV1_CAPABILITY_FRAME_SIZE_OVERRIDE_BIT_KHR,
-    eMotionVectorScaling             = VK_VIDEO_ENCODE_AV1_CAPABILITY_MOTION_VECTOR_SCALING_BIT_KHR,
-    eCompoundPredictionIntraRefresh  = VK_VIDEO_ENCODE_AV1_CAPABILITY_COMPOUND_PREDICTION_INTRA_REFRESH_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkVideoEncodeAV1CapabilityFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1CapabilityFlagsKHR.html
-  using VideoEncodeAV1CapabilityFlagsKHR = Flags<VideoEncodeAV1CapabilityFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<VideoEncodeAV1CapabilityFlagBitsKHR>
-  {
-    using WrappedType                                                               = VkVideoEncodeAV1CapabilityFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                             isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeAV1CapabilityFlagsKHR allFlags =
-      VideoEncodeAV1CapabilityFlagBitsKHR::ePerRateControlGroupMinMaxQIndex | VideoEncodeAV1CapabilityFlagBitsKHR::eGenerateObuExtensionHeader |
-      VideoEncodeAV1CapabilityFlagBitsKHR::ePrimaryReferenceCdfOnly | VideoEncodeAV1CapabilityFlagBitsKHR::eFrameSizeOverride |
-      VideoEncodeAV1CapabilityFlagBitsKHR::eMotionVectorScaling | VideoEncodeAV1CapabilityFlagBitsKHR::eCompoundPredictionIntraRefresh;
-  };
-
-  // wrapper class for enum VkVideoEncodeAV1StdFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1StdFlagBitsKHR.html
-  enum class VideoEncodeAV1StdFlagBitsKHR : VkVideoEncodeAV1StdFlagsKHR
-  {
-    eUniformTileSpacingFlagSet = VK_VIDEO_ENCODE_AV1_STD_UNIFORM_TILE_SPACING_FLAG_SET_BIT_KHR,
-    eSkipModePresentUnset      = VK_VIDEO_ENCODE_AV1_STD_SKIP_MODE_PRESENT_UNSET_BIT_KHR,
-    ePrimaryRefFrame           = VK_VIDEO_ENCODE_AV1_STD_PRIMARY_REF_FRAME_BIT_KHR,
-    eDeltaQ                    = VK_VIDEO_ENCODE_AV1_STD_DELTA_Q_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkVideoEncodeAV1StdFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1StdFlagsKHR.html
-  using VideoEncodeAV1StdFlagsKHR = Flags<VideoEncodeAV1StdFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<VideoEncodeAV1StdFlagBitsKHR>
-  {
-    using WrappedType                                                        = VkVideoEncodeAV1StdFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                      isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeAV1StdFlagsKHR allFlags =
-      VideoEncodeAV1StdFlagBitsKHR::eUniformTileSpacingFlagSet | VideoEncodeAV1StdFlagBitsKHR::eSkipModePresentUnset |
-      VideoEncodeAV1StdFlagBitsKHR::ePrimaryRefFrame | VideoEncodeAV1StdFlagBitsKHR::eDeltaQ;
-  };
-
-  // wrapper class for enum VkVideoEncodeAV1SuperblockSizeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1SuperblockSizeFlagBitsKHR.html
-  enum class VideoEncodeAV1SuperblockSizeFlagBitsKHR : VkVideoEncodeAV1SuperblockSizeFlagsKHR
-  {
-    e64  = VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_64_BIT_KHR,
-    e128 = VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_128_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkVideoEncodeAV1SuperblockSizeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1SuperblockSizeFlagsKHR.html
-  using VideoEncodeAV1SuperblockSizeFlagsKHR = Flags<VideoEncodeAV1SuperblockSizeFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<VideoEncodeAV1SuperblockSizeFlagBitsKHR>
-  {
-    using WrappedType                                                                   = VkVideoEncodeAV1SuperblockSizeFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeAV1SuperblockSizeFlagsKHR allFlags =
-      VideoEncodeAV1SuperblockSizeFlagBitsKHR::e64 | VideoEncodeAV1SuperblockSizeFlagBitsKHR::e128;
-  };
-
-  // wrapper class for enum VkVideoEncodeAV1RateControlFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1RateControlFlagBitsKHR.html
-  enum class VideoEncodeAV1RateControlFlagBitsKHR : VkVideoEncodeAV1RateControlFlagsKHR
-  {
-    eRegularGop                 = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REGULAR_GOP_BIT_KHR,
-    eTemporalLayerPatternDyadic = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR,
-    eReferencePatternFlat       = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR,
-    eReferencePatternDyadic     = VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkVideoEncodeAV1RateControlFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1RateControlFlagsKHR.html
-  using VideoEncodeAV1RateControlFlagsKHR = Flags<VideoEncodeAV1RateControlFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<VideoEncodeAV1RateControlFlagBitsKHR>
-  {
-    using WrappedType                                                                = VkVideoEncodeAV1RateControlFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeAV1RateControlFlagsKHR allFlags =
-      VideoEncodeAV1RateControlFlagBitsKHR::eRegularGop | VideoEncodeAV1RateControlFlagBitsKHR::eTemporalLayerPatternDyadic |
-      VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternFlat | VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternDyadic;
+    eFloat16 = VK_COMPONENT_TYPE_FLOAT16_KHR,
+    eFloat32 = VK_COMPONENT_TYPE_FLOAT32_KHR,
+    eFloat64 = VK_COMPONENT_TYPE_FLOAT64_KHR,
+    eSint8   = VK_COMPONENT_TYPE_SINT8_KHR,
+    eSint16  = VK_COMPONENT_TYPE_SINT16_KHR,
+    eSint32  = VK_COMPONENT_TYPE_SINT32_KHR,
+    eSint64  = VK_COMPONENT_TYPE_SINT64_KHR,
+    eUint8   = VK_COMPONENT_TYPE_UINT8_KHR,
+    eUint16  = VK_COMPONENT_TYPE_UINT16_KHR,
+    eUint32  = VK_COMPONENT_TYPE_UINT32_KHR,
+    eUint64  = VK_COMPONENT_TYPE_UINT64_KHR
   };
+  using ComponentTypeNV = ComponentTypeKHR;
 
   //=== VK_QCOM_image_processing2 ===
 
-  // wrapper class for enum VkBlockMatchWindowCompareModeQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlockMatchWindowCompareModeQCOM.html
   enum class BlockMatchWindowCompareModeQCOM
   {
     eMin = VK_BLOCK_MATCH_WINDOW_COMPARE_MODE_MIN_QCOM,
@@ -9026,7 +7143,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_QCOM_filter_cubic_weights ===
 
-  // wrapper class for enum VkCubicFilterWeightsQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCubicFilterWeightsQCOM.html
   enum class CubicFilterWeightsQCOM
   {
     eCatmullRom          = VK_CUBIC_FILTER_WEIGHTS_CATMULL_ROM_QCOM,
@@ -9037,667 +7153,201 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_MSFT_layered_driver ===
 
-  // wrapper class for enum VkLayeredDriverUnderlyingApiMSFT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkLayeredDriverUnderlyingApiMSFT.html
   enum class LayeredDriverUnderlyingApiMSFT
   {
     eNone  = VK_LAYERED_DRIVER_UNDERLYING_API_NONE_MSFT,
     eD3D12 = VK_LAYERED_DRIVER_UNDERLYING_API_D3D12_MSFT
   };
 
+  //=== VK_KHR_line_rasterization ===
+
+  enum class LineRasterizationModeKHR
+  {
+    eDefault           = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR,
+    eRectangular       = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR,
+    eBresenham         = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR,
+    eRectangularSmooth = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR
+  };
+  using LineRasterizationModeEXT = LineRasterizationModeKHR;
+
   //=== VK_KHR_calibrated_timestamps ===
 
-  // wrapper class for enum VkTimeDomainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTimeDomainKHR.html
   enum class TimeDomainKHR
   {
     eDevice                  = VK_TIME_DOMAIN_DEVICE_KHR,
     eClockMonotonic          = VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR,
     eClockMonotonicRaw       = VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR,
-    eQueryPerformanceCounter = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR,
-    ePresentStageLocalEXT    = VK_TIME_DOMAIN_PRESENT_STAGE_LOCAL_EXT,
-    eSwapchainLocalEXT       = VK_TIME_DOMAIN_SWAPCHAIN_LOCAL_EXT
+    eQueryPerformanceCounter = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR
   };
-
   using TimeDomainEXT = TimeDomainKHR;
 
-  //=== VK_KHR_copy_memory_indirect ===
+  //=========================
+  //=== Index Type Traits ===
+  //=========================
 
-  // wrapper class for enum VkAddressCopyFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAddressCopyFlagBitsKHR.html
-  enum class AddressCopyFlagBitsKHR : VkAddressCopyFlagsKHR
+  template <typename T>
+  struct IndexTypeValue
   {
-    eDeviceLocal = VK_ADDRESS_COPY_DEVICE_LOCAL_BIT_KHR,
-    eSparse      = VK_ADDRESS_COPY_SPARSE_BIT_KHR,
-    eProtected   = VK_ADDRESS_COPY_PROTECTED_BIT_KHR
   };
 
-  // wrapper using for bitmask VkAddressCopyFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAddressCopyFlagsKHR.html
-  using AddressCopyFlagsKHR = Flags<AddressCopyFlagBitsKHR>;
-
   template <>
-  struct FlagTraits<AddressCopyFlagBitsKHR>
+  struct IndexTypeValue<uint16_t>
   {
-    using WrappedType                                                  = VkAddressCopyFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR AddressCopyFlagsKHR allFlags =
-      AddressCopyFlagBitsKHR::eDeviceLocal | AddressCopyFlagBitsKHR::eSparse | AddressCopyFlagBitsKHR::eProtected;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint16;
   };
 
-  //=== VK_EXT_memory_decompression ===
-
-  // wrapper class for enum VkMemoryDecompressionMethodFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryDecompressionMethodFlagBitsEXT.html
-  enum class MemoryDecompressionMethodFlagBitsEXT : VkMemoryDecompressionMethodFlagsEXT
-  {
-    eGdeflate10 = VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_EXT
-  };
-
-  using MemoryDecompressionMethodFlagBitsNV = MemoryDecompressionMethodFlagBitsEXT;
-
-  // wrapper using for bitmask VkMemoryDecompressionMethodFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryDecompressionMethodFlagsEXT.html
-  using MemoryDecompressionMethodFlagsEXT = Flags<MemoryDecompressionMethodFlagBitsEXT>;
-  using MemoryDecompressionMethodFlagsNV  = MemoryDecompressionMethodFlagsEXT;
-
   template <>
-  struct FlagTraits<MemoryDecompressionMethodFlagBitsEXT>
+  struct CppType<IndexType, IndexType::eUint16>
   {
-    using WrappedType                                                                = VkMemoryDecompressionMethodFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR MemoryDecompressionMethodFlagsEXT allFlags  = MemoryDecompressionMethodFlagBitsEXT::eGdeflate10;
+    using Type = uint16_t;
   };
 
-  //=== VK_NV_display_stereo ===
-
-  // wrapper class for enum VkDisplaySurfaceStereoTypeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplaySurfaceStereoTypeNV.html
-  enum class DisplaySurfaceStereoTypeNV
-  {
-    eNone              = VK_DISPLAY_SURFACE_STEREO_TYPE_NONE_NV,
-    eOnboardDin        = VK_DISPLAY_SURFACE_STEREO_TYPE_ONBOARD_DIN_NV,
-    eHdmi3D            = VK_DISPLAY_SURFACE_STEREO_TYPE_HDMI_3D_NV,
-    eInbandDisplayport = VK_DISPLAY_SURFACE_STEREO_TYPE_INBAND_DISPLAYPORT_NV
-  };
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-
-  // wrapper class for enum VkVideoEncodeIntraRefreshModeFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeIntraRefreshModeFlagBitsKHR.html
-  enum class VideoEncodeIntraRefreshModeFlagBitsKHR : VkVideoEncodeIntraRefreshModeFlagsKHR
-  {
-    eNone                = VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_NONE_KHR,
-    ePerPicturePartition = VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_PER_PICTURE_PARTITION_BIT_KHR,
-    eBlockBased          = VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_BASED_BIT_KHR,
-    eBlockRowBased       = VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_ROW_BASED_BIT_KHR,
-    eBlockColumnBased    = VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_COLUMN_BASED_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkVideoEncodeIntraRefreshModeFlagsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeIntraRefreshModeFlagsKHR.html
-  using VideoEncodeIntraRefreshModeFlagsKHR = Flags<VideoEncodeIntraRefreshModeFlagBitsKHR>;
-
   template <>
-  struct FlagTraits<VideoEncodeIntraRefreshModeFlagBitsKHR>
+  struct IndexTypeValue<uint32_t>
   {
-    using WrappedType                                                                  = VkVideoEncodeIntraRefreshModeFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR VideoEncodeIntraRefreshModeFlagsKHR allFlags =
-      VideoEncodeIntraRefreshModeFlagBitsKHR::eNone | VideoEncodeIntraRefreshModeFlagBitsKHR::ePerPicturePartition |
-      VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockBased | VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockRowBased |
-      VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockColumnBased;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint32;
   };
 
-  //=== VK_KHR_maintenance7 ===
-
-  // wrapper class for enum VkPhysicalDeviceLayeredApiKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLayeredApiKHR.html
-  enum class PhysicalDeviceLayeredApiKHR
-  {
-    eVulkan   = VK_PHYSICAL_DEVICE_LAYERED_API_VULKAN_KHR,
-    eD3D12    = VK_PHYSICAL_DEVICE_LAYERED_API_D3D12_KHR,
-    eMetal    = VK_PHYSICAL_DEVICE_LAYERED_API_METAL_KHR,
-    eOpengl   = VK_PHYSICAL_DEVICE_LAYERED_API_OPENGL_KHR,
-    eOpengles = VK_PHYSICAL_DEVICE_LAYERED_API_OPENGLES_KHR
-  };
-
-  //=== VK_NV_cluster_acceleration_structure ===
-
-  // wrapper class for enum VkClusterAccelerationStructureClusterFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureClusterFlagBitsNV.html
-  enum class ClusterAccelerationStructureClusterFlagBitsNV : VkClusterAccelerationStructureClusterFlagsNV
-  {
-    eAllowDisableOpacityMicromaps = VK_CLUSTER_ACCELERATION_STRUCTURE_CLUSTER_ALLOW_DISABLE_OPACITY_MICROMAPS_NV
-  };
-
-  // wrapper using for bitmask VkClusterAccelerationStructureClusterFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureClusterFlagsNV.html
-  using ClusterAccelerationStructureClusterFlagsNV = Flags<ClusterAccelerationStructureClusterFlagBitsNV>;
-
   template <>
-  struct FlagTraits<ClusterAccelerationStructureClusterFlagBitsNV>
+  struct CppType<IndexType, IndexType::eUint32>
   {
-    using WrappedType                                                                         = VkClusterAccelerationStructureClusterFlagBitsNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                       isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ClusterAccelerationStructureClusterFlagsNV allFlags =
-      ClusterAccelerationStructureClusterFlagBitsNV::eAllowDisableOpacityMicromaps;
+    using Type = uint32_t;
   };
 
-  // wrapper class for enum VkClusterAccelerationStructureGeometryFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureGeometryFlagBitsNV.html
-  enum class ClusterAccelerationStructureGeometryFlagBitsNV : VkClusterAccelerationStructureGeometryFlagsNV
-  {
-    eCullDisable                 = VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_CULL_DISABLE_BIT_NV,
-    eNoDuplicateAnyhitInvocation = VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANYHIT_INVOCATION_BIT_NV,
-    eOpaque                      = VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT_NV
-  };
-
-  // wrapper using for bitmask VkClusterAccelerationStructureGeometryFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureGeometryFlagsNV.html
-  using ClusterAccelerationStructureGeometryFlagsNV = Flags<ClusterAccelerationStructureGeometryFlagBitsNV>;
-
   template <>
-  struct FlagTraits<ClusterAccelerationStructureGeometryFlagBitsNV>
+  struct IndexTypeValue<uint8_t>
   {
-    using WrappedType                                                                          = VkClusterAccelerationStructureGeometryFlagBitsNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                        isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ClusterAccelerationStructureGeometryFlagsNV allFlags =
-      ClusterAccelerationStructureGeometryFlagBitsNV::eCullDisable | ClusterAccelerationStructureGeometryFlagBitsNV::eNoDuplicateAnyhitInvocation |
-      ClusterAccelerationStructureGeometryFlagBitsNV::eOpaque;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR IndexType value = IndexType::eUint8KHR;
   };
 
-  // wrapper class for enum VkClusterAccelerationStructureAddressResolutionFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureAddressResolutionFlagBitsNV.html
-  enum class ClusterAccelerationStructureAddressResolutionFlagBitsNV : VkClusterAccelerationStructureAddressResolutionFlagsNV
-  {
-    eNone                      = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_NONE_NV,
-    eIndirectedDstImplicitData = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_IMPLICIT_DATA_BIT_NV,
-    eIndirectedScratchData     = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SCRATCH_DATA_BIT_NV,
-    eIndirectedDstAddressArray = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_ADDRESS_ARRAY_BIT_NV,
-    eIndirectedDstSizesArray   = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_SIZES_ARRAY_BIT_NV,
-    eIndirectedSrcInfosArray   = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_ARRAY_BIT_NV,
-    eIndirectedSrcInfosCount   = VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_COUNT_BIT_NV
-  };
-
-  // wrapper using for bitmask VkClusterAccelerationStructureAddressResolutionFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureAddressResolutionFlagsNV.html
-  using ClusterAccelerationStructureAddressResolutionFlagsNV = Flags<ClusterAccelerationStructureAddressResolutionFlagBitsNV>;
-
   template <>
-  struct FlagTraits<ClusterAccelerationStructureAddressResolutionFlagBitsNV>
+  struct CppType<IndexType, IndexType::eUint8KHR>
   {
-    using WrappedType = VkClusterAccelerationStructureAddressResolutionFlagBitsNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ClusterAccelerationStructureAddressResolutionFlagsNV allFlags =
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eNone | ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstImplicitData |
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedScratchData |
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstAddressArray |
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstSizesArray |
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosArray |
-      ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosCount;
-  };
-
-  // wrapper class for enum VkClusterAccelerationStructureIndexFormatFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureIndexFormatFlagBitsNV.html
-  enum class ClusterAccelerationStructureIndexFormatFlagBitsNV : VkClusterAccelerationStructureIndexFormatFlagsNV
-  {
-    e8  = VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_8BIT_NV,
-    e16 = VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_16BIT_NV,
-    e32 = VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_32BIT_NV
-  };
-
-  // wrapper using for bitmask VkClusterAccelerationStructureIndexFormatFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureIndexFormatFlagsNV.html
-  using ClusterAccelerationStructureIndexFormatFlagsNV = Flags<ClusterAccelerationStructureIndexFormatFlagBitsNV>;
-
-  template <>
-  struct FlagTraits<ClusterAccelerationStructureIndexFormatFlagBitsNV>
-  {
-    using WrappedType                                                                             = VkClusterAccelerationStructureIndexFormatFlagBitsNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                           isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ClusterAccelerationStructureIndexFormatFlagsNV allFlags  = ClusterAccelerationStructureIndexFormatFlagBitsNV::e8 |
-                                                                                                   ClusterAccelerationStructureIndexFormatFlagBitsNV::e16 |
-                                                                                                   ClusterAccelerationStructureIndexFormatFlagBitsNV::e32;
-  };
-
-  // wrapper class for enum VkClusterAccelerationStructureTypeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureTypeNV.html
-  enum class ClusterAccelerationStructureTypeNV
-  {
-    eClustersBottomLevel     = VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_CLUSTERS_BOTTOM_LEVEL_NV,
-    eTriangleCluster         = VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_NV,
-    eTriangleClusterTemplate = VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_TEMPLATE_NV
-  };
-
-  // wrapper class for enum VkClusterAccelerationStructureOpTypeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureOpTypeNV.html
-  enum class ClusterAccelerationStructureOpTypeNV
-  {
-    eMoveObjects                  = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_MOVE_OBJECTS_NV,
-    eBuildClustersBottomLevel     = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_CLUSTERS_BOTTOM_LEVEL_NV,
-    eBuildTriangleCluster         = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_NV,
-    eBuildTriangleClusterTemplate = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_TEMPLATE_NV,
-    eInstantiateTriangleCluster   = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_INSTANTIATE_TRIANGLE_CLUSTER_NV,
-    eGetClusterTemplateIndices    = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_GET_CLUSTER_TEMPLATE_INDICES_NV
-  };
-
-  // wrapper class for enum VkClusterAccelerationStructureOpModeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureOpModeNV.html
-  enum class ClusterAccelerationStructureOpModeNV
-  {
-    eImplicitDestinations = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_IMPLICIT_DESTINATIONS_NV,
-    eExplicitDestinations = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_EXPLICIT_DESTINATIONS_NV,
-    eComputeSizes         = VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_COMPUTE_SIZES_NV
-  };
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-
-  // wrapper class for enum VkPartitionedAccelerationStructureOpTypeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureOpTypeNV.html
-  enum class PartitionedAccelerationStructureOpTypeNV
-  {
-    eWriteInstance             = VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_INSTANCE_NV,
-    eUpdateInstance            = VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_UPDATE_INSTANCE_NV,
-    eWritePartitionTranslation = VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_PARTITION_TRANSLATION_NV
-  };
-
-  // wrapper class for enum VkPartitionedAccelerationStructureInstanceFlagBitsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureInstanceFlagBitsNV.html
-  enum class PartitionedAccelerationStructureInstanceFlagBitsNV : VkPartitionedAccelerationStructureInstanceFlagsNV
-  {
-    eFlagTriangleFacingCullDisable = VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FACING_CULL_DISABLE_BIT_NV,
-    eFlagTriangleFlipFacing        = VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FLIP_FACING_BIT_NV,
-    eFlagForceOpaque               = VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_OPAQUE_BIT_NV,
-    eFlagForceNoOpaque             = VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_NO_OPAQUE_BIT_NV,
-    eFlagEnableExplicitBoundingBox = VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_ENABLE_EXPLICIT_BOUNDING_BOX_NV
-  };
-
-  // wrapper using for bitmask VkPartitionedAccelerationStructureInstanceFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureInstanceFlagsNV.html
-  using PartitionedAccelerationStructureInstanceFlagsNV = Flags<PartitionedAccelerationStructureInstanceFlagBitsNV>;
-
-  template <>
-  struct FlagTraits<PartitionedAccelerationStructureInstanceFlagBitsNV>
-  {
-    using WrappedType                                                                              = VkPartitionedAccelerationStructureInstanceFlagBitsNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                            isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PartitionedAccelerationStructureInstanceFlagsNV allFlags =
-      PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFacingCullDisable |
-      PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFlipFacing | PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceOpaque |
-      PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceNoOpaque |
-      PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagEnableExplicitBoundingBox;
-  };
-
-  //=== VK_EXT_device_generated_commands ===
-
-  // wrapper class for enum VkIndirectCommandsTokenTypeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsTokenTypeEXT.html
-  enum class IndirectCommandsTokenTypeEXT
-  {
-    eExecutionSet         = VK_INDIRECT_COMMANDS_TOKEN_TYPE_EXECUTION_SET_EXT,
-    ePushConstant         = VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_EXT,
-    eSequenceIndex        = VK_INDIRECT_COMMANDS_TOKEN_TYPE_SEQUENCE_INDEX_EXT,
-    eIndexBuffer          = VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_EXT,
-    eVertexBuffer         = VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_EXT,
-    eDrawIndexed          = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_EXT,
-    eDraw                 = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_EXT,
-    eDrawIndexedCount     = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_COUNT_EXT,
-    eDrawCount            = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_COUNT_EXT,
-    eDispatch             = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_EXT,
-    eDrawMeshTasksNV      = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV_EXT,
-    eDrawMeshTasksCountNV = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_NV_EXT,
-    eDrawMeshTasks        = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_EXT,
-    eDrawMeshTasksCount   = VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_EXT,
-    eTraceRays2           = VK_INDIRECT_COMMANDS_TOKEN_TYPE_TRACE_RAYS2_EXT
-  };
-
-  // wrapper class for enum VkIndirectExecutionSetInfoTypeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetInfoTypeEXT.html
-  enum class IndirectExecutionSetInfoTypeEXT
-  {
-    ePipelines     = VK_INDIRECT_EXECUTION_SET_INFO_TYPE_PIPELINES_EXT,
-    eShaderObjects = VK_INDIRECT_EXECUTION_SET_INFO_TYPE_SHADER_OBJECTS_EXT
-  };
-
-  // wrapper class for enum VkIndirectCommandsLayoutUsageFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutUsageFlagBitsEXT.html
-  enum class IndirectCommandsLayoutUsageFlagBitsEXT : VkIndirectCommandsLayoutUsageFlagsEXT
-  {
-    eExplicitPreprocess = VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EXPLICIT_PREPROCESS_BIT_EXT,
-    eUnorderedSequences = VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_EXT
-  };
-
-  // wrapper using for bitmask VkIndirectCommandsLayoutUsageFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutUsageFlagsEXT.html
-  using IndirectCommandsLayoutUsageFlagsEXT = Flags<IndirectCommandsLayoutUsageFlagBitsEXT>;
-
-  template <>
-  struct FlagTraits<IndirectCommandsLayoutUsageFlagBitsEXT>
-  {
-    using WrappedType                                                                  = VkIndirectCommandsLayoutUsageFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR IndirectCommandsLayoutUsageFlagsEXT allFlags =
-      IndirectCommandsLayoutUsageFlagBitsEXT::eExplicitPreprocess | IndirectCommandsLayoutUsageFlagBitsEXT::eUnorderedSequences;
-  };
-
-  // wrapper class for enum VkIndirectCommandsInputModeFlagBitsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsInputModeFlagBitsEXT.html
-  enum class IndirectCommandsInputModeFlagBitsEXT : VkIndirectCommandsInputModeFlagsEXT
-  {
-    eVulkanIndexBuffer = VK_INDIRECT_COMMANDS_INPUT_MODE_VULKAN_INDEX_BUFFER_EXT,
-    eDxgiIndexBuffer   = VK_INDIRECT_COMMANDS_INPUT_MODE_DXGI_INDEX_BUFFER_EXT
-  };
-
-  // wrapper using for bitmask VkIndirectCommandsInputModeFlagsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsInputModeFlagsEXT.html
-  using IndirectCommandsInputModeFlagsEXT = Flags<IndirectCommandsInputModeFlagBitsEXT>;
-
-  template <>
-  struct FlagTraits<IndirectCommandsInputModeFlagBitsEXT>
-  {
-    using WrappedType                                                                = VkIndirectCommandsInputModeFlagBitsEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                              isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR IndirectCommandsInputModeFlagsEXT allFlags =
-      IndirectCommandsInputModeFlagBitsEXT::eVulkanIndexBuffer | IndirectCommandsInputModeFlagBitsEXT::eDxgiIndexBuffer;
-  };
-
-  //=== VK_KHR_maintenance8 ===
-
-  // wrapper class for enum VkAccessFlagBits3KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlagBits3KHR.html
-  enum class AccessFlagBits3KHR : VkAccessFlags3KHR
-  {
-    eNone = VK_ACCESS_3_NONE_KHR
-  };
-
-  // wrapper using for bitmask VkAccessFlags3KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccessFlags3KHR.html
-  using AccessFlags3KHR = Flags<AccessFlagBits3KHR>;
-
-  template <>
-  struct FlagTraits<AccessFlagBits3KHR>
-  {
-    using WrappedType                                              = VkAccessFlagBits3KHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool            isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR AccessFlags3KHR allFlags  = AccessFlagBits3KHR::eNone;
-  };
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-
-  // wrapper class for enum VkRayTracingInvocationReorderModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingInvocationReorderModeEXT.html
-  enum class RayTracingInvocationReorderModeEXT
-  {
-    eNone    = VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_EXT,
-    eReorder = VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_EXT
-  };
-
-  using RayTracingInvocationReorderModeNV = RayTracingInvocationReorderModeEXT;
-
-  //=== VK_EXT_depth_clamp_control ===
-
-  // wrapper class for enum VkDepthClampModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDepthClampModeEXT.html
-  enum class DepthClampModeEXT
-  {
-    eViewportRange    = VK_DEPTH_CLAMP_MODE_VIEWPORT_RANGE_EXT,
-    eUserDefinedRange = VK_DEPTH_CLAMP_MODE_USER_DEFINED_RANGE_EXT
-  };
-
-  //=== VK_KHR_maintenance9 ===
-
-  // wrapper class for enum VkDefaultVertexAttributeValueKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDefaultVertexAttributeValueKHR.html
-  enum class DefaultVertexAttributeValueKHR
-  {
-    eZeroZeroZeroZero = VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ZERO_KHR,
-    eZeroZeroZeroOne  = VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ONE_KHR
-  };
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-
-  enum class SurfaceCreateFlagBitsOHOS : VkSurfaceCreateFlagsOHOS
-  {
-  };
-
-  // wrapper using for bitmask VkSurfaceCreateFlagsOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCreateFlagsOHOS.html
-  using SurfaceCreateFlagsOHOS = Flags<SurfaceCreateFlagBitsOHOS>;
-
-  template <>
-  struct FlagTraits<SurfaceCreateFlagBitsOHOS>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                   isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR SurfaceCreateFlagsOHOS allFlags  = {};
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-
-  // wrapper class for enum VkSwapchainImageUsageFlagBitsOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainImageUsageFlagBitsOHOS.html
-  enum class SwapchainImageUsageFlagBitsOHOS : VkSwapchainImageUsageFlagsOHOS
-  {
-    eShared = VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_OHOS
-  };
-
-  // wrapper using for bitmask VkSwapchainImageUsageFlagsOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainImageUsageFlagsOHOS.html
-  using SwapchainImageUsageFlagsOHOS = Flags<SwapchainImageUsageFlagBitsOHOS>;
-
-  template <>
-  struct FlagTraits<SwapchainImageUsageFlagBitsOHOS>
-  {
-    using WrappedType                                                           = VkSwapchainImageUsageFlagBitsOHOS;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                         isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR SwapchainImageUsageFlagsOHOS allFlags  = SwapchainImageUsageFlagBitsOHOS::eShared;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-
-  enum class PerformanceCounterDescriptionFlagBitsARM : VkPerformanceCounterDescriptionFlagsARM
-  {
-  };
-
-  // wrapper using for bitmask VkPerformanceCounterDescriptionFlagsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterDescriptionFlagsARM.html
-  using PerformanceCounterDescriptionFlagsARM = Flags<PerformanceCounterDescriptionFlagBitsARM>;
-
-  template <>
-  struct FlagTraits<PerformanceCounterDescriptionFlagBitsARM>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                                  isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR PerformanceCounterDescriptionFlagsARM allFlags  = {};
-  };
-
-  //=== VK_QCOM_data_graph_model ===
-
-  // wrapper class for enum VkDataGraphModelCacheTypeQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphModelCacheTypeQCOM.html
-  enum class DataGraphModelCacheTypeQCOM
-  {
-    eGenericBinary = VK_DATA_GRAPH_MODEL_CACHE_TYPE_GENERIC_BINARY_QCOM
-  };
-
-  //=== VK_KHR_maintenance10 ===
-
-  // wrapper class for enum VkRenderingAttachmentFlagBitsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAttachmentFlagBitsKHR.html
-  enum class RenderingAttachmentFlagBitsKHR : VkRenderingAttachmentFlagsKHR
-  {
-    eInputAttachmentFeedback       = VK_RENDERING_ATTACHMENT_INPUT_ATTACHMENT_FEEDBACK_BIT_KHR,
-    eResolveSkipTransferFunction   = VK_RENDERING_ATTACHMENT_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR,
-    eResolveEnableTransferFunction = VK_RENDERING_ATTACHMENT_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkRenderingAttachmentFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAttachmentFlagsKHR.html
-  using RenderingAttachmentFlagsKHR = Flags<RenderingAttachmentFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<RenderingAttachmentFlagBitsKHR>
-  {
-    using WrappedType                                                          = VkRenderingAttachmentFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                        isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR RenderingAttachmentFlagsKHR allFlags  = RenderingAttachmentFlagBitsKHR::eInputAttachmentFeedback |
-                                                                                RenderingAttachmentFlagBitsKHR::eResolveSkipTransferFunction |
-                                                                                RenderingAttachmentFlagBitsKHR::eResolveEnableTransferFunction;
-  };
-
-  // wrapper class for enum VkResolveImageFlagBitsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveImageFlagBitsKHR.html
-  enum class ResolveImageFlagBitsKHR : VkResolveImageFlagsKHR
-  {
-    eSkipTransferFunction   = VK_RESOLVE_IMAGE_SKIP_TRANSFER_FUNCTION_BIT_KHR,
-    eEnableTransferFunction = VK_RESOLVE_IMAGE_ENABLE_TRANSFER_FUNCTION_BIT_KHR
-  };
-
-  // wrapper using for bitmask VkResolveImageFlagsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveImageFlagsKHR.html
-  using ResolveImageFlagsKHR = Flags<ResolveImageFlagBitsKHR>;
-
-  template <>
-  struct FlagTraits<ResolveImageFlagBitsKHR>
-  {
-    using WrappedType                                                   = VkResolveImageFlagBitsKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool                 isBitmask = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ResolveImageFlagsKHR allFlags =
-      ResolveImageFlagBitsKHR::eSkipTransferFunction | ResolveImageFlagBitsKHR::eEnableTransferFunction;
+    using Type = uint8_t;
   };
 
   //===========================================================
   //=== Mapping from ObjectType to DebugReportObjectTypeEXT ===
   //===========================================================
 
-  VULKAN_HPP_INLINE DebugReportObjectTypeEXT debugReportObjectType( ObjectType objectType )
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType( VULKAN_HPP_NAMESPACE::ObjectType objectType )
   {
     switch ( objectType )
     {
         //=== VK_VERSION_1_0 ===
-      case ObjectType::eInstance           : return DebugReportObjectTypeEXT::eInstance;
-      case ObjectType::ePhysicalDevice     : return DebugReportObjectTypeEXT::ePhysicalDevice;
-      case ObjectType::eDevice             : return DebugReportObjectTypeEXT::eDevice;
-      case ObjectType::eQueue              : return DebugReportObjectTypeEXT::eQueue;
-      case ObjectType::eDeviceMemory       : return DebugReportObjectTypeEXT::eDeviceMemory;
-      case ObjectType::eFence              : return DebugReportObjectTypeEXT::eFence;
-      case ObjectType::eSemaphore          : return DebugReportObjectTypeEXT::eSemaphore;
-      case ObjectType::eQueryPool          : return DebugReportObjectTypeEXT::eQueryPool;
-      case ObjectType::eBuffer             : return DebugReportObjectTypeEXT::eBuffer;
-      case ObjectType::eImage              : return DebugReportObjectTypeEXT::eImage;
-      case ObjectType::eImageView          : return DebugReportObjectTypeEXT::eImageView;
-      case ObjectType::eCommandPool        : return DebugReportObjectTypeEXT::eCommandPool;
-      case ObjectType::eCommandBuffer      : return DebugReportObjectTypeEXT::eCommandBuffer;
-      case ObjectType::eEvent              : return DebugReportObjectTypeEXT::eEvent;
-      case ObjectType::eBufferView         : return DebugReportObjectTypeEXT::eBufferView;
-      case ObjectType::eShaderModule       : return DebugReportObjectTypeEXT::eShaderModule;
-      case ObjectType::ePipelineCache      : return DebugReportObjectTypeEXT::ePipelineCache;
-      case ObjectType::ePipeline           : return DebugReportObjectTypeEXT::ePipeline;
-      case ObjectType::ePipelineLayout     : return DebugReportObjectTypeEXT::ePipelineLayout;
-      case ObjectType::eSampler            : return DebugReportObjectTypeEXT::eSampler;
-      case ObjectType::eDescriptorPool     : return DebugReportObjectTypeEXT::eDescriptorPool;
-      case ObjectType::eDescriptorSet      : return DebugReportObjectTypeEXT::eDescriptorSet;
-      case ObjectType::eDescriptorSetLayout: return DebugReportObjectTypeEXT::eDescriptorSetLayout;
-      case ObjectType::eFramebuffer        : return DebugReportObjectTypeEXT::eFramebuffer;
-      case ObjectType::eRenderPass:
-        return DebugReportObjectTypeEXT::eRenderPass;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eInstance: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eInstance;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePhysicalDevice: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePhysicalDevice;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDevice: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDevice;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eQueue: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueue;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDeviceMemory: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDeviceMemory;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eFence: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFence;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eSemaphore: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSemaphore;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eEvent: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eEvent;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eQueryPool: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueryPool;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eBuffer: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBuffer;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eBufferView: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferView;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eImage: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImage;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eImageView: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImageView;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eShaderModule: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eShaderModule;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePipelineCache: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineCache;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePipeline: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipeline;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePipelineLayout: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineLayout;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eSampler: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSampler;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorPool: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorPool;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSet: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSet;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSetLayout: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSetLayout;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eFramebuffer: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFramebuffer;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eRenderPass: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eRenderPass;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCommandPool: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandPool;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCommandBuffer:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandBuffer;
 
         //=== VK_VERSION_1_1 ===
-      case ObjectType::eDescriptorUpdateTemplate: return DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
-      case ObjectType::eSamplerYcbcrConversion:
-        return DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eSamplerYcbcrConversion: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorUpdateTemplate:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
 
         //=== VK_VERSION_1_3 ===
-      case ObjectType::ePrivateDataSlot:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePrivateDataSlot:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_KHR_surface ===
-      case ObjectType::eSurfaceKHR:
-        return DebugReportObjectTypeEXT::eSurfaceKHR;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eSurfaceKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSurfaceKHR;
 
         //=== VK_KHR_swapchain ===
-      case ObjectType::eSwapchainKHR:
-        return DebugReportObjectTypeEXT::eSwapchainKHR;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eSwapchainKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSwapchainKHR;
 
         //=== VK_KHR_display ===
-      case ObjectType::eDisplayKHR: return DebugReportObjectTypeEXT::eDisplayKHR;
-      case ObjectType::eDisplayModeKHR:
-        return DebugReportObjectTypeEXT::eDisplayModeKHR;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDisplayKHR: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayKHR;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDisplayModeKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayModeKHR;
 
         //=== VK_EXT_debug_report ===
-      case ObjectType::eDebugReportCallbackEXT:
-        return DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDebugReportCallbackEXT:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
 
         //=== VK_KHR_video_queue ===
-      case ObjectType::eVideoSessionKHR: return DebugReportObjectTypeEXT::eUnknown;
-      case ObjectType::eVideoSessionParametersKHR:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionKHR: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionParametersKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_NVX_binary_import ===
-      case ObjectType::eCuModuleNVX: return DebugReportObjectTypeEXT::eCuModuleNVX;
-      case ObjectType::eCuFunctionNVX:
-        return DebugReportObjectTypeEXT::eCuFunctionNVX;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCuModuleNVX: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuModuleNVX;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCuFunctionNVX:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuFunctionNVX;
 
         //=== VK_EXT_debug_utils ===
-      case ObjectType::eDebugUtilsMessengerEXT:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDebugUtilsMessengerEXT:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_KHR_acceleration_structure ===
-      case ObjectType::eAccelerationStructureKHR:
-        return DebugReportObjectTypeEXT::eAccelerationStructureKHR;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureKHR;
 
         //=== VK_EXT_validation_cache ===
-      case ObjectType::eValidationCacheEXT:
-        return DebugReportObjectTypeEXT::eValidationCacheEXT;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eValidationCacheEXT:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eValidationCacheEXT;
 
         //=== VK_NV_ray_tracing ===
-      case ObjectType::eAccelerationStructureNV:
-        return DebugReportObjectTypeEXT::eAccelerationStructureNV;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureNV:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureNV;
 
         //=== VK_INTEL_performance_query ===
-      case ObjectType::ePerformanceConfigurationINTEL:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::ePerformanceConfigurationINTEL:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_KHR_deferred_host_operations ===
-      case ObjectType::eDeferredOperationKHR:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eDeferredOperationKHR:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_NV_device_generated_commands ===
-      case ObjectType::eIndirectCommandsLayoutNV: return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eIndirectCommandsLayoutNV: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
         //=== VK_NV_cuda_kernel_launch ===
-      case ObjectType::eCudaModuleNV  : return DebugReportObjectTypeEXT::eCudaModuleNV;
-      case ObjectType::eCudaFunctionNV: return DebugReportObjectTypeEXT::eCudaFunctionNV;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCudaModuleNV: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaModuleNV;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eCudaFunctionNV: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaFunctionNV;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
         //=== VK_FUCHSIA_buffer_collection ===
-      case ObjectType::eBufferCollectionFUCHSIA: return DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eBufferCollectionFUCHSIA: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
         //=== VK_EXT_opacity_micromap ===
-      case ObjectType::eMicromapEXT:
-        return DebugReportObjectTypeEXT::eUnknown;
-
-        //=== VK_ARM_tensors ===
-      case ObjectType::eTensorARM: return DebugReportObjectTypeEXT::eUnknown;
-      case ObjectType::eTensorViewARM:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eMicromapEXT:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_NV_optical_flow ===
-      case ObjectType::eOpticalFlowSessionNV:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eOpticalFlowSessionNV:
+        return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
         //=== VK_EXT_shader_object ===
-      case ObjectType::eShaderEXT:
-        return DebugReportObjectTypeEXT::eUnknown;
+      case VULKAN_HPP_NAMESPACE::ObjectType::eShaderEXT: return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
-        //=== VK_KHR_pipeline_binary ===
-      case ObjectType::ePipelineBinaryKHR:
-        return DebugReportObjectTypeEXT::eUnknown;
-
-        //=== VK_ARM_data_graph ===
-      case ObjectType::eDataGraphPipelineSessionARM:
-        return DebugReportObjectTypeEXT::eUnknown;
-
-        //=== VK_NV_external_compute_queue ===
-      case ObjectType::eExternalComputeQueueNV:
-        return DebugReportObjectTypeEXT::eUnknown;
-
-        //=== VK_EXT_device_generated_commands ===
-      case ObjectType::eIndirectCommandsLayoutEXT: return DebugReportObjectTypeEXT::eUnknown;
-      case ObjectType::eIndirectExecutionSetEXT  : return DebugReportObjectTypeEXT::eUnknown;
-
-      default: VULKAN_HPP_ASSERT( false && "unknown ObjectType" ); return DebugReportObjectTypeEXT::eUnknown;
+      default: VULKAN_HPP_ASSERT( false && "unknown ObjectType" ); return VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
     }
   }
 
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_extension_inspection.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_extension_inspection.hpp
index 8b720a43..d9df2f6d 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_extension_inspection.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_extension_inspection.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,13 +8,11 @@
 #ifndef VULKAN_EXTENSION_INSPECTION_HPP
 #define VULKAN_EXTENSION_INSPECTION_HPP
 
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <map>
-#  include <set>
-#  include <string>
-#  include <vector>
-#  include <vulkan/vulkan.hpp>
-#endif
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include <vulkan/vulkan.hpp>
 
 namespace VULKAN_HPP_NAMESPACE
 {
@@ -44,562 +42,483 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::map<std::string, std::string> const & getDeprecatedExtensions()
   {
-    static const std::map<std::string, std::string> deprecatedExtensions = { { "VK_EXT_debug_report", "VK_EXT_debug_utils" },
-                                                                             { "VK_NV_glsl_shader", "" },
-                                                                             { "VK_NV_dedicated_allocation", "VK_KHR_dedicated_allocation" },
-                                                                             { "VK_AMD_gpu_shader_half_float", "VK_KHR_shader_float16_int8" },
-                                                                             { "VK_IMG_format_pvrtc", "" },
-                                                                             { "VK_NV_external_memory_capabilities", "VK_KHR_external_memory_capabilities" },
-                                                                             { "VK_NV_external_memory", "VK_KHR_external_memory" },
+    static std::map<std::string, std::string> deprecatedExtensions = {
+      { "VK_EXT_debug_report", "VK_EXT_debug_utils" },
+      { "VK_NV_glsl_shader", "" },
+      { "VK_NV_dedicated_allocation", "VK_KHR_dedicated_allocation" },
+      { "VK_AMD_gpu_shader_half_float", "VK_KHR_shader_float16_int8" },
+      { "VK_IMG_format_pvrtc", "" },
+      { "VK_NV_external_memory_capabilities", "VK_KHR_external_memory_capabilities" },
+      { "VK_NV_external_memory", "VK_KHR_external_memory" },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                                             { "VK_NV_external_memory_win32", "VK_KHR_external_memory_win32" },
+      { "VK_NV_external_memory_win32", "VK_KHR_external_memory_win32" },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                                             { "VK_EXT_validation_flags", "VK_EXT_layer_settings" },
-                                                                             { "VK_EXT_shader_subgroup_ballot", "VK_VERSION_1_2" },
-                                                                             { "VK_EXT_shader_subgroup_vote", "VK_VERSION_1_1" },
+      { "VK_EXT_validation_flags", "VK_EXT_layer_settings" },
+      { "VK_EXT_shader_subgroup_ballot", "VK_VERSION_1_2" },
+      { "VK_EXT_shader_subgroup_vote", "VK_VERSION_1_1" },
 #if defined( VK_USE_PLATFORM_IOS_MVK )
-                                                                             { "VK_MVK_ios_surface", "VK_EXT_metal_surface" },
+      { "VK_MVK_ios_surface", "VK_EXT_metal_surface" },
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
-                                                                             { "VK_MVK_macos_surface", "VK_EXT_metal_surface" },
+      { "VK_MVK_macos_surface", "VK_EXT_metal_surface" },
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
-                                                                             { "VK_AMD_gpu_shader_int16", "VK_KHR_shader_float16_int8" },
-                                                                             { "VK_NV_ray_tracing", "VK_KHR_ray_tracing_pipeline" },
-                                                                             { "VK_EXT_buffer_device_address", "VK_KHR_buffer_device_address" },
-                                                                             { "VK_EXT_validation_features", "VK_EXT_layer_settings" },
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                                             { "VK_NV_displacement_micromap", "VK_NV_cluster_acceleration_structure" }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      { "VK_AMD_gpu_shader_int16", "VK_KHR_shader_float16_int8" },
+      { "VK_EXT_buffer_device_address", "VK_KHR_buffer_device_address" },
+      { "VK_EXT_validation_features", "VK_EXT_layer_settings" }
     };
     return deprecatedExtensions;
   }
 
   VULKAN_HPP_INLINE std::set<std::string> const & getDeviceExtensions()
   {
-    static const std::set<std::string> deviceExtensions = { "VK_KHR_swapchain",
-                                                            "VK_KHR_display_swapchain",
-                                                            "VK_NV_glsl_shader",
-                                                            "VK_EXT_depth_range_unrestricted",
-                                                            "VK_KHR_sampler_mirror_clamp_to_edge",
-                                                            "VK_IMG_filter_cubic",
-                                                            "VK_AMD_rasterization_order",
-                                                            "VK_AMD_shader_trinary_minmax",
-                                                            "VK_AMD_shader_explicit_vertex_parameter",
-                                                            "VK_EXT_debug_marker",
-                                                            "VK_KHR_video_queue",
-                                                            "VK_KHR_video_decode_queue",
-                                                            "VK_AMD_gcn_shader",
-                                                            "VK_NV_dedicated_allocation",
-                                                            "VK_EXT_transform_feedback",
-                                                            "VK_NVX_binary_import",
-                                                            "VK_NVX_image_view_handle",
-                                                            "VK_AMD_draw_indirect_count",
-                                                            "VK_AMD_negative_viewport_height",
-                                                            "VK_AMD_gpu_shader_half_float",
-                                                            "VK_AMD_shader_ballot",
-                                                            "VK_KHR_video_encode_h264",
-                                                            "VK_KHR_video_encode_h265",
-                                                            "VK_KHR_video_decode_h264",
-                                                            "VK_AMD_texture_gather_bias_lod",
-                                                            "VK_AMD_shader_info",
-                                                            "VK_KHR_dynamic_rendering",
-                                                            "VK_AMD_shader_image_load_store_lod",
-                                                            "VK_NV_corner_sampled_image",
-                                                            "VK_KHR_multiview",
-                                                            "VK_IMG_format_pvrtc",
-                                                            "VK_NV_external_memory",
+    static std::set<std::string> deviceExtensions = {
+      "VK_KHR_swapchain",
+      "VK_KHR_display_swapchain",
+      "VK_NV_glsl_shader",
+      "VK_EXT_depth_range_unrestricted",
+      "VK_KHR_sampler_mirror_clamp_to_edge",
+      "VK_IMG_filter_cubic",
+      "VK_AMD_rasterization_order",
+      "VK_AMD_shader_trinary_minmax",
+      "VK_AMD_shader_explicit_vertex_parameter",
+      "VK_EXT_debug_marker",
+      "VK_KHR_video_queue",
+      "VK_KHR_video_decode_queue",
+      "VK_AMD_gcn_shader",
+      "VK_NV_dedicated_allocation",
+      "VK_EXT_transform_feedback",
+      "VK_NVX_binary_import",
+      "VK_NVX_image_view_handle",
+      "VK_AMD_draw_indirect_count",
+      "VK_AMD_negative_viewport_height",
+      "VK_AMD_gpu_shader_half_float",
+      "VK_AMD_shader_ballot",
+      "VK_KHR_video_encode_h264",
+      "VK_KHR_video_encode_h265",
+      "VK_KHR_video_decode_h264",
+      "VK_AMD_texture_gather_bias_lod",
+      "VK_AMD_shader_info",
+      "VK_KHR_dynamic_rendering",
+      "VK_AMD_shader_image_load_store_lod",
+      "VK_NV_corner_sampled_image",
+      "VK_KHR_multiview",
+      "VK_IMG_format_pvrtc",
+      "VK_NV_external_memory",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_NV_external_memory_win32",
-                                                            "VK_NV_win32_keyed_mutex",
+      "VK_NV_external_memory_win32",
+      "VK_NV_win32_keyed_mutex",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_device_group",
-                                                            "VK_KHR_shader_draw_parameters",
-                                                            "VK_EXT_shader_subgroup_ballot",
-                                                            "VK_EXT_shader_subgroup_vote",
-                                                            "VK_EXT_texture_compression_astc_hdr",
-                                                            "VK_EXT_astc_decode_mode",
-                                                            "VK_EXT_pipeline_robustness",
-                                                            "VK_KHR_maintenance1",
-                                                            "VK_KHR_external_memory",
+      "VK_KHR_device_group",
+      "VK_KHR_shader_draw_parameters",
+      "VK_EXT_shader_subgroup_ballot",
+      "VK_EXT_shader_subgroup_vote",
+      "VK_EXT_texture_compression_astc_hdr",
+      "VK_EXT_astc_decode_mode",
+      "VK_EXT_pipeline_robustness",
+      "VK_KHR_maintenance1",
+      "VK_KHR_external_memory",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_KHR_external_memory_win32",
+      "VK_KHR_external_memory_win32",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_external_memory_fd",
+      "VK_KHR_external_memory_fd",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_KHR_win32_keyed_mutex",
+      "VK_KHR_win32_keyed_mutex",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_external_semaphore",
+      "VK_KHR_external_semaphore",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_KHR_external_semaphore_win32",
+      "VK_KHR_external_semaphore_win32",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_external_semaphore_fd",
-                                                            "VK_KHR_push_descriptor",
-                                                            "VK_EXT_conditional_rendering",
-                                                            "VK_KHR_shader_float16_int8",
-                                                            "VK_KHR_16bit_storage",
-                                                            "VK_KHR_incremental_present",
-                                                            "VK_KHR_descriptor_update_template",
-                                                            "VK_NV_clip_space_w_scaling",
-                                                            "VK_EXT_display_control",
-                                                            "VK_GOOGLE_display_timing",
-                                                            "VK_NV_sample_mask_override_coverage",
-                                                            "VK_NV_geometry_shader_passthrough",
-                                                            "VK_NV_viewport_array2",
-                                                            "VK_NVX_multiview_per_view_attributes",
-                                                            "VK_NV_viewport_swizzle",
-                                                            "VK_EXT_discard_rectangles",
-                                                            "VK_EXT_conservative_rasterization",
-                                                            "VK_EXT_depth_clip_enable",
-                                                            "VK_EXT_hdr_metadata",
-                                                            "VK_KHR_imageless_framebuffer",
-                                                            "VK_KHR_create_renderpass2",
-                                                            "VK_IMG_relaxed_line_rasterization",
-                                                            "VK_KHR_shared_presentable_image",
-                                                            "VK_KHR_external_fence",
+      "VK_KHR_external_semaphore_fd",
+      "VK_KHR_push_descriptor",
+      "VK_EXT_conditional_rendering",
+      "VK_KHR_shader_float16_int8",
+      "VK_KHR_16bit_storage",
+      "VK_KHR_incremental_present",
+      "VK_KHR_descriptor_update_template",
+      "VK_NV_clip_space_w_scaling",
+      "VK_EXT_display_control",
+      "VK_GOOGLE_display_timing",
+      "VK_NV_sample_mask_override_coverage",
+      "VK_NV_geometry_shader_passthrough",
+      "VK_NV_viewport_array2",
+      "VK_NVX_multiview_per_view_attributes",
+      "VK_NV_viewport_swizzle",
+      "VK_EXT_discard_rectangles",
+      "VK_EXT_conservative_rasterization",
+      "VK_EXT_depth_clip_enable",
+      "VK_EXT_hdr_metadata",
+      "VK_KHR_imageless_framebuffer",
+      "VK_KHR_create_renderpass2",
+      "VK_IMG_relaxed_line_rasterization",
+      "VK_KHR_shared_presentable_image",
+      "VK_KHR_external_fence",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_KHR_external_fence_win32",
+      "VK_KHR_external_fence_win32",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_external_fence_fd",
-                                                            "VK_KHR_performance_query",
-                                                            "VK_KHR_maintenance2",
-                                                            "VK_KHR_variable_pointers",
-                                                            "VK_EXT_external_memory_dma_buf",
-                                                            "VK_EXT_queue_family_foreign",
-                                                            "VK_KHR_dedicated_allocation",
+      "VK_KHR_external_fence_fd",
+      "VK_KHR_performance_query",
+      "VK_KHR_maintenance2",
+      "VK_KHR_variable_pointers",
+      "VK_EXT_external_memory_dma_buf",
+      "VK_EXT_queue_family_foreign",
+      "VK_KHR_dedicated_allocation",
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-                                                            "VK_ANDROID_external_memory_android_hardware_buffer",
+      "VK_ANDROID_external_memory_android_hardware_buffer",
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-                                                            "VK_EXT_sampler_filter_minmax",
-                                                            "VK_KHR_storage_buffer_storage_class",
-                                                            "VK_AMD_gpu_shader_int16",
+      "VK_EXT_sampler_filter_minmax",
+      "VK_KHR_storage_buffer_storage_class",
+      "VK_AMD_gpu_shader_int16",
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_AMDX_shader_enqueue",
+      "VK_AMDX_shader_enqueue",
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_AMD_mixed_attachment_samples",
-                                                            "VK_AMD_shader_fragment_mask",
-                                                            "VK_EXT_inline_uniform_block",
-                                                            "VK_EXT_shader_stencil_export",
-                                                            "VK_KHR_shader_bfloat16",
-                                                            "VK_EXT_sample_locations",
-                                                            "VK_KHR_relaxed_block_layout",
-                                                            "VK_KHR_get_memory_requirements2",
-                                                            "VK_KHR_image_format_list",
-                                                            "VK_EXT_blend_operation_advanced",
-                                                            "VK_NV_fragment_coverage_to_color",
-                                                            "VK_KHR_acceleration_structure",
-                                                            "VK_KHR_ray_tracing_pipeline",
-                                                            "VK_KHR_ray_query",
-                                                            "VK_NV_framebuffer_mixed_samples",
-                                                            "VK_NV_fill_rectangle",
-                                                            "VK_NV_shader_sm_builtins",
-                                                            "VK_EXT_post_depth_coverage",
-                                                            "VK_KHR_sampler_ycbcr_conversion",
-                                                            "VK_KHR_bind_memory2",
-                                                            "VK_EXT_image_drm_format_modifier",
-                                                            "VK_EXT_validation_cache",
-                                                            "VK_EXT_descriptor_indexing",
-                                                            "VK_EXT_shader_viewport_index_layer",
+      "VK_AMD_mixed_attachment_samples",
+      "VK_AMD_shader_fragment_mask",
+      "VK_EXT_inline_uniform_block",
+      "VK_EXT_shader_stencil_export",
+      "VK_EXT_sample_locations",
+      "VK_KHR_relaxed_block_layout",
+      "VK_KHR_get_memory_requirements2",
+      "VK_KHR_image_format_list",
+      "VK_EXT_blend_operation_advanced",
+      "VK_NV_fragment_coverage_to_color",
+      "VK_KHR_acceleration_structure",
+      "VK_KHR_ray_tracing_pipeline",
+      "VK_KHR_ray_query",
+      "VK_NV_framebuffer_mixed_samples",
+      "VK_NV_fill_rectangle",
+      "VK_NV_shader_sm_builtins",
+      "VK_EXT_post_depth_coverage",
+      "VK_KHR_sampler_ycbcr_conversion",
+      "VK_KHR_bind_memory2",
+      "VK_EXT_image_drm_format_modifier",
+      "VK_EXT_validation_cache",
+      "VK_EXT_descriptor_indexing",
+      "VK_EXT_shader_viewport_index_layer",
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_KHR_portability_subset",
+      "VK_KHR_portability_subset",
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_NV_shading_rate_image",
-                                                            "VK_NV_ray_tracing",
-                                                            "VK_NV_representative_fragment_test",
-                                                            "VK_KHR_maintenance3",
-                                                            "VK_KHR_draw_indirect_count",
-                                                            "VK_EXT_filter_cubic",
-                                                            "VK_QCOM_render_pass_shader_resolve",
-                                                            "VK_EXT_global_priority",
-                                                            "VK_KHR_shader_subgroup_extended_types",
-                                                            "VK_KHR_8bit_storage",
-                                                            "VK_EXT_external_memory_host",
-                                                            "VK_AMD_buffer_marker",
-                                                            "VK_KHR_shader_atomic_int64",
-                                                            "VK_KHR_shader_clock",
-                                                            "VK_AMD_pipeline_compiler_control",
-                                                            "VK_EXT_calibrated_timestamps",
-                                                            "VK_AMD_shader_core_properties",
-                                                            "VK_KHR_video_decode_h265",
-                                                            "VK_KHR_global_priority",
-                                                            "VK_AMD_memory_overallocation_behavior",
-                                                            "VK_EXT_vertex_attribute_divisor",
+      "VK_NV_shading_rate_image",
+      "VK_NV_ray_tracing",
+      "VK_NV_representative_fragment_test",
+      "VK_KHR_maintenance3",
+      "VK_KHR_draw_indirect_count",
+      "VK_EXT_filter_cubic",
+      "VK_QCOM_render_pass_shader_resolve",
+      "VK_EXT_global_priority",
+      "VK_KHR_shader_subgroup_extended_types",
+      "VK_KHR_8bit_storage",
+      "VK_EXT_external_memory_host",
+      "VK_AMD_buffer_marker",
+      "VK_KHR_shader_atomic_int64",
+      "VK_KHR_shader_clock",
+      "VK_AMD_pipeline_compiler_control",
+      "VK_EXT_calibrated_timestamps",
+      "VK_AMD_shader_core_properties",
+      "VK_KHR_video_decode_h265",
+      "VK_KHR_global_priority",
+      "VK_AMD_memory_overallocation_behavior",
+      "VK_EXT_vertex_attribute_divisor",
 #if defined( VK_USE_PLATFORM_GGP )
-                                                            "VK_GGP_frame_token",
+      "VK_GGP_frame_token",
 #endif /*VK_USE_PLATFORM_GGP*/
-                                                            "VK_EXT_pipeline_creation_feedback",
-                                                            "VK_KHR_driver_properties",
-                                                            "VK_KHR_shader_float_controls",
-                                                            "VK_NV_shader_subgroup_partitioned",
-                                                            "VK_KHR_depth_stencil_resolve",
-                                                            "VK_KHR_swapchain_mutable_format",
-                                                            "VK_NV_compute_shader_derivatives",
-                                                            "VK_NV_mesh_shader",
-                                                            "VK_NV_fragment_shader_barycentric",
-                                                            "VK_NV_shader_image_footprint",
-                                                            "VK_NV_scissor_exclusive",
-                                                            "VK_NV_device_diagnostic_checkpoints",
-                                                            "VK_KHR_timeline_semaphore",
-                                                            "VK_EXT_present_timing",
-                                                            "VK_INTEL_shader_integer_functions2",
-                                                            "VK_INTEL_performance_query",
-                                                            "VK_KHR_vulkan_memory_model",
-                                                            "VK_EXT_pci_bus_info",
-                                                            "VK_AMD_display_native_hdr",
-                                                            "VK_KHR_shader_terminate_invocation",
-                                                            "VK_EXT_fragment_density_map",
-                                                            "VK_EXT_scalar_block_layout",
-                                                            "VK_GOOGLE_hlsl_functionality1",
-                                                            "VK_GOOGLE_decorate_string",
-                                                            "VK_EXT_subgroup_size_control",
-                                                            "VK_KHR_fragment_shading_rate",
-                                                            "VK_AMD_shader_core_properties2",
-                                                            "VK_AMD_device_coherent_memory",
-                                                            "VK_KHR_dynamic_rendering_local_read",
-                                                            "VK_EXT_shader_image_atomic_int64",
-                                                            "VK_KHR_shader_quad_control",
-                                                            "VK_KHR_spirv_1_4",
-                                                            "VK_EXT_memory_budget",
-                                                            "VK_EXT_memory_priority",
-                                                            "VK_NV_dedicated_allocation_image_aliasing",
-                                                            "VK_KHR_separate_depth_stencil_layouts",
-                                                            "VK_EXT_buffer_device_address",
-                                                            "VK_EXT_tooling_info",
-                                                            "VK_EXT_separate_stencil_usage",
-                                                            "VK_KHR_present_wait",
-                                                            "VK_NV_cooperative_matrix",
-                                                            "VK_NV_coverage_reduction_mode",
-                                                            "VK_EXT_fragment_shader_interlock",
-                                                            "VK_EXT_ycbcr_image_arrays",
-                                                            "VK_KHR_uniform_buffer_standard_layout",
-                                                            "VK_EXT_provoking_vertex",
+      "VK_EXT_pipeline_creation_feedback",
+      "VK_KHR_driver_properties",
+      "VK_KHR_shader_float_controls",
+      "VK_NV_shader_subgroup_partitioned",
+      "VK_KHR_depth_stencil_resolve",
+      "VK_KHR_swapchain_mutable_format",
+      "VK_NV_compute_shader_derivatives",
+      "VK_NV_mesh_shader",
+      "VK_NV_fragment_shader_barycentric",
+      "VK_NV_shader_image_footprint",
+      "VK_NV_scissor_exclusive",
+      "VK_NV_device_diagnostic_checkpoints",
+      "VK_KHR_timeline_semaphore",
+      "VK_INTEL_shader_integer_functions2",
+      "VK_INTEL_performance_query",
+      "VK_KHR_vulkan_memory_model",
+      "VK_EXT_pci_bus_info",
+      "VK_AMD_display_native_hdr",
+      "VK_KHR_shader_terminate_invocation",
+      "VK_EXT_fragment_density_map",
+      "VK_EXT_scalar_block_layout",
+      "VK_GOOGLE_hlsl_functionality1",
+      "VK_GOOGLE_decorate_string",
+      "VK_EXT_subgroup_size_control",
+      "VK_KHR_fragment_shading_rate",
+      "VK_AMD_shader_core_properties2",
+      "VK_AMD_device_coherent_memory",
+      "VK_KHR_dynamic_rendering_local_read",
+      "VK_EXT_shader_image_atomic_int64",
+      "VK_KHR_shader_quad_control",
+      "VK_KHR_spirv_1_4",
+      "VK_EXT_memory_budget",
+      "VK_EXT_memory_priority",
+      "VK_NV_dedicated_allocation_image_aliasing",
+      "VK_KHR_separate_depth_stencil_layouts",
+      "VK_EXT_buffer_device_address",
+      "VK_EXT_tooling_info",
+      "VK_EXT_separate_stencil_usage",
+      "VK_KHR_present_wait",
+      "VK_NV_cooperative_matrix",
+      "VK_NV_coverage_reduction_mode",
+      "VK_EXT_fragment_shader_interlock",
+      "VK_EXT_ycbcr_image_arrays",
+      "VK_KHR_uniform_buffer_standard_layout",
+      "VK_EXT_provoking_vertex",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_EXT_full_screen_exclusive",
+      "VK_EXT_full_screen_exclusive",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_KHR_buffer_device_address",
-                                                            "VK_EXT_line_rasterization",
-                                                            "VK_EXT_shader_atomic_float",
-                                                            "VK_EXT_host_query_reset",
-                                                            "VK_EXT_index_type_uint8",
-                                                            "VK_EXT_extended_dynamic_state",
-                                                            "VK_KHR_deferred_host_operations",
-                                                            "VK_KHR_pipeline_executable_properties",
-                                                            "VK_EXT_host_image_copy",
-                                                            "VK_KHR_map_memory2",
-                                                            "VK_EXT_map_memory_placed",
-                                                            "VK_EXT_shader_atomic_float2",
-                                                            "VK_EXT_swapchain_maintenance1",
-                                                            "VK_EXT_shader_demote_to_helper_invocation",
-                                                            "VK_NV_device_generated_commands",
-                                                            "VK_NV_inherited_viewport_scissor",
-                                                            "VK_KHR_shader_integer_dot_product",
-                                                            "VK_EXT_texel_buffer_alignment",
-                                                            "VK_QCOM_render_pass_transform",
-                                                            "VK_EXT_depth_bias_control",
-                                                            "VK_EXT_device_memory_report",
-                                                            "VK_EXT_robustness2",
-                                                            "VK_EXT_custom_border_color",
-                                                            "VK_GOOGLE_user_type",
-                                                            "VK_KHR_pipeline_library",
-                                                            "VK_NV_present_barrier",
-                                                            "VK_KHR_shader_non_semantic_info",
-                                                            "VK_KHR_present_id",
-                                                            "VK_EXT_private_data",
-                                                            "VK_EXT_pipeline_creation_cache_control",
-                                                            "VK_KHR_video_encode_queue",
-                                                            "VK_NV_device_diagnostics_config",
-                                                            "VK_QCOM_render_pass_store_ops",
+      "VK_KHR_buffer_device_address",
+      "VK_EXT_line_rasterization",
+      "VK_EXT_shader_atomic_float",
+      "VK_EXT_host_query_reset",
+      "VK_EXT_index_type_uint8",
+      "VK_EXT_extended_dynamic_state",
+      "VK_KHR_deferred_host_operations",
+      "VK_KHR_pipeline_executable_properties",
+      "VK_EXT_host_image_copy",
+      "VK_KHR_map_memory2",
+      "VK_EXT_map_memory_placed",
+      "VK_EXT_shader_atomic_float2",
+      "VK_EXT_swapchain_maintenance1",
+      "VK_EXT_shader_demote_to_helper_invocation",
+      "VK_NV_device_generated_commands",
+      "VK_NV_inherited_viewport_scissor",
+      "VK_KHR_shader_integer_dot_product",
+      "VK_EXT_texel_buffer_alignment",
+      "VK_QCOM_render_pass_transform",
+      "VK_EXT_depth_bias_control",
+      "VK_EXT_device_memory_report",
+      "VK_EXT_robustness2",
+      "VK_EXT_custom_border_color",
+      "VK_GOOGLE_user_type",
+      "VK_KHR_pipeline_library",
+      "VK_NV_present_barrier",
+      "VK_KHR_shader_non_semantic_info",
+      "VK_KHR_present_id",
+      "VK_EXT_private_data",
+      "VK_EXT_pipeline_creation_cache_control",
+      "VK_KHR_video_encode_queue",
+      "VK_NV_device_diagnostics_config",
+      "VK_QCOM_render_pass_store_ops",
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_NV_cuda_kernel_launch",
+      "VK_NV_cuda_kernel_launch",
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_QCOM_tile_shading",
-                                                            "VK_NV_low_latency",
+      "VK_NV_low_latency",
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-                                                            "VK_EXT_metal_objects",
+      "VK_EXT_metal_objects",
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
-                                                            "VK_KHR_synchronization2",
-                                                            "VK_EXT_descriptor_buffer",
-                                                            "VK_EXT_graphics_pipeline_library",
-                                                            "VK_AMD_shader_early_and_late_fragment_tests",
-                                                            "VK_KHR_fragment_shader_barycentric",
-                                                            "VK_KHR_shader_subgroup_uniform_control_flow",
-                                                            "VK_KHR_zero_initialize_workgroup_memory",
-                                                            "VK_NV_fragment_shading_rate_enums",
-                                                            "VK_NV_ray_tracing_motion_blur",
-                                                            "VK_EXT_mesh_shader",
-                                                            "VK_EXT_ycbcr_2plane_444_formats",
-                                                            "VK_EXT_fragment_density_map2",
-                                                            "VK_QCOM_rotated_copy_commands",
-                                                            "VK_EXT_image_robustness",
-                                                            "VK_KHR_workgroup_memory_explicit_layout",
-                                                            "VK_KHR_copy_commands2",
-                                                            "VK_EXT_image_compression_control",
-                                                            "VK_EXT_attachment_feedback_loop_layout",
-                                                            "VK_EXT_4444_formats",
-                                                            "VK_EXT_device_fault",
-                                                            "VK_ARM_rasterization_order_attachment_access",
-                                                            "VK_EXT_rgba10x6_formats",
+      "VK_KHR_synchronization2",
+      "VK_EXT_descriptor_buffer",
+      "VK_EXT_graphics_pipeline_library",
+      "VK_AMD_shader_early_and_late_fragment_tests",
+      "VK_KHR_fragment_shader_barycentric",
+      "VK_KHR_shader_subgroup_uniform_control_flow",
+      "VK_KHR_zero_initialize_workgroup_memory",
+      "VK_NV_fragment_shading_rate_enums",
+      "VK_NV_ray_tracing_motion_blur",
+      "VK_EXT_mesh_shader",
+      "VK_EXT_ycbcr_2plane_444_formats",
+      "VK_EXT_fragment_density_map2",
+      "VK_QCOM_rotated_copy_commands",
+      "VK_EXT_image_robustness",
+      "VK_KHR_workgroup_memory_explicit_layout",
+      "VK_KHR_copy_commands2",
+      "VK_EXT_image_compression_control",
+      "VK_EXT_attachment_feedback_loop_layout",
+      "VK_EXT_4444_formats",
+      "VK_EXT_device_fault",
+      "VK_ARM_rasterization_order_attachment_access",
+      "VK_EXT_rgba10x6_formats",
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                            "VK_NV_acquire_winrt_display",
+      "VK_NV_acquire_winrt_display",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                            "VK_VALVE_mutable_descriptor_type",
-                                                            "VK_EXT_vertex_input_dynamic_state",
-                                                            "VK_EXT_physical_device_drm",
-                                                            "VK_EXT_device_address_binding_report",
-                                                            "VK_EXT_depth_clip_control",
-                                                            "VK_EXT_primitive_topology_list_restart",
-                                                            "VK_KHR_format_feature_flags2",
-                                                            "VK_EXT_present_mode_fifo_latest_ready",
+      "VK_VALVE_mutable_descriptor_type",
+      "VK_EXT_vertex_input_dynamic_state",
+      "VK_EXT_physical_device_drm",
+      "VK_EXT_device_address_binding_report",
+      "VK_EXT_depth_clip_control",
+      "VK_EXT_primitive_topology_list_restart",
+      "VK_KHR_format_feature_flags2",
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-                                                            "VK_FUCHSIA_external_memory",
-                                                            "VK_FUCHSIA_external_semaphore",
-                                                            "VK_FUCHSIA_buffer_collection",
+      "VK_FUCHSIA_external_memory",
+      "VK_FUCHSIA_external_semaphore",
+      "VK_FUCHSIA_buffer_collection",
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-                                                            "VK_HUAWEI_subpass_shading",
-                                                            "VK_HUAWEI_invocation_mask",
-                                                            "VK_NV_external_memory_rdma",
-                                                            "VK_EXT_pipeline_properties",
-                                                            "VK_EXT_frame_boundary",
-                                                            "VK_EXT_multisampled_render_to_single_sampled",
-                                                            "VK_EXT_extended_dynamic_state2",
-                                                            "VK_EXT_color_write_enable",
-                                                            "VK_EXT_primitives_generated_query",
-                                                            "VK_KHR_ray_tracing_maintenance1",
-                                                            "VK_KHR_shader_untyped_pointers",
-                                                            "VK_EXT_global_priority_query",
-                                                            "VK_VALVE_video_encode_rgb_conversion",
-                                                            "VK_EXT_image_view_min_lod",
-                                                            "VK_EXT_multi_draw",
-                                                            "VK_EXT_image_2d_view_of_3d",
-                                                            "VK_EXT_shader_tile_image",
-                                                            "VK_EXT_opacity_micromap",
+      "VK_HUAWEI_subpass_shading",
+      "VK_HUAWEI_invocation_mask",
+      "VK_NV_external_memory_rdma",
+      "VK_EXT_pipeline_properties",
+      "VK_EXT_frame_boundary",
+      "VK_EXT_multisampled_render_to_single_sampled",
+      "VK_EXT_extended_dynamic_state2",
+      "VK_EXT_color_write_enable",
+      "VK_EXT_primitives_generated_query",
+      "VK_KHR_ray_tracing_maintenance1",
+      "VK_EXT_global_priority_query",
+      "VK_EXT_image_view_min_lod",
+      "VK_EXT_multi_draw",
+      "VK_EXT_image_2d_view_of_3d",
+      "VK_EXT_shader_tile_image",
+      "VK_EXT_opacity_micromap",
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_NV_displacement_micromap",
+      "VK_NV_displacement_micromap",
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_EXT_load_store_op_none",
-                                                            "VK_HUAWEI_cluster_culling_shader",
-                                                            "VK_EXT_border_color_swizzle",
-                                                            "VK_EXT_pageable_device_local_memory",
-                                                            "VK_KHR_maintenance4",
-                                                            "VK_ARM_shader_core_properties",
-                                                            "VK_KHR_shader_subgroup_rotate",
-                                                            "VK_ARM_scheduling_controls",
-                                                            "VK_EXT_image_sliced_view_of_3d",
-                                                            "VK_VALVE_descriptor_set_host_mapping",
-                                                            "VK_EXT_depth_clamp_zero_one",
-                                                            "VK_EXT_non_seamless_cube_map",
-                                                            "VK_ARM_render_pass_striped",
-                                                            "VK_QCOM_fragment_density_map_offset",
-                                                            "VK_NV_copy_memory_indirect",
-                                                            "VK_NV_memory_decompression",
-                                                            "VK_NV_device_generated_commands_compute",
-                                                            "VK_NV_ray_tracing_linear_swept_spheres",
-                                                            "VK_NV_linear_color_attachment",
-                                                            "VK_KHR_shader_maximal_reconvergence",
-                                                            "VK_EXT_image_compression_control_swapchain",
-                                                            "VK_QCOM_image_processing",
-                                                            "VK_EXT_nested_command_buffer",
-#if defined( VK_USE_PLATFORM_OHOS )
-                                                            "VK_OHOS_external_memory",
-#endif /*VK_USE_PLATFORM_OHOS*/
-                                                            "VK_EXT_external_memory_acquire_unmodified",
-                                                            "VK_EXT_extended_dynamic_state3",
-                                                            "VK_EXT_subpass_merge_feedback",
-                                                            "VK_ARM_tensors",
-                                                            "VK_EXT_shader_module_identifier",
-                                                            "VK_EXT_rasterization_order_attachment_access",
-                                                            "VK_NV_optical_flow",
-                                                            "VK_EXT_legacy_dithering",
-                                                            "VK_EXT_pipeline_protected_access",
+      "VK_EXT_load_store_op_none",
+      "VK_HUAWEI_cluster_culling_shader",
+      "VK_EXT_border_color_swizzle",
+      "VK_EXT_pageable_device_local_memory",
+      "VK_KHR_maintenance4",
+      "VK_ARM_shader_core_properties",
+      "VK_KHR_shader_subgroup_rotate",
+      "VK_ARM_scheduling_controls",
+      "VK_EXT_image_sliced_view_of_3d",
+      "VK_VALVE_descriptor_set_host_mapping",
+      "VK_EXT_depth_clamp_zero_one",
+      "VK_EXT_non_seamless_cube_map",
+      "VK_ARM_render_pass_striped",
+      "VK_QCOM_fragment_density_map_offset",
+      "VK_NV_copy_memory_indirect",
+      "VK_NV_memory_decompression",
+      "VK_NV_device_generated_commands_compute",
+      "VK_NV_linear_color_attachment",
+      "VK_KHR_shader_maximal_reconvergence",
+      "VK_EXT_image_compression_control_swapchain",
+      "VK_QCOM_image_processing",
+      "VK_EXT_nested_command_buffer",
+      "VK_EXT_external_memory_acquire_unmodified",
+      "VK_EXT_extended_dynamic_state3",
+      "VK_EXT_subpass_merge_feedback",
+      "VK_EXT_shader_module_identifier",
+      "VK_EXT_rasterization_order_attachment_access",
+      "VK_NV_optical_flow",
+      "VK_EXT_legacy_dithering",
+      "VK_EXT_pipeline_protected_access",
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-                                                            "VK_ANDROID_external_format_resolve",
+      "VK_ANDROID_external_format_resolve",
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-                                                            "VK_KHR_maintenance5",
-                                                            "VK_AMD_anti_lag",
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_AMDX_dense_geometry_format",
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_KHR_present_id2",
-                                                            "VK_KHR_present_wait2",
-                                                            "VK_KHR_ray_tracing_position_fetch",
-                                                            "VK_EXT_shader_object",
-                                                            "VK_KHR_pipeline_binary",
-                                                            "VK_QCOM_tile_properties",
-                                                            "VK_SEC_amigo_profiling",
-                                                            "VK_KHR_swapchain_maintenance1",
-                                                            "VK_QCOM_multiview_per_view_viewports",
-                                                            "VK_NV_ray_tracing_invocation_reorder",
-                                                            "VK_NV_cooperative_vector",
-                                                            "VK_NV_extended_sparse_address_space",
-                                                            "VK_EXT_mutable_descriptor_type",
-                                                            "VK_EXT_legacy_vertex_attributes",
-                                                            "VK_ARM_shader_core_builtins",
-                                                            "VK_EXT_pipeline_library_group_handles",
-                                                            "VK_EXT_dynamic_rendering_unused_attachments",
-                                                            "VK_NV_low_latency2",
-                                                            "VK_KHR_cooperative_matrix",
-                                                            "VK_ARM_data_graph",
-                                                            "VK_QCOM_multiview_per_view_render_areas",
-                                                            "VK_KHR_compute_shader_derivatives",
-                                                            "VK_KHR_video_decode_av1",
-                                                            "VK_KHR_video_encode_av1",
-                                                            "VK_KHR_video_decode_vp9",
-                                                            "VK_KHR_video_maintenance1",
-                                                            "VK_NV_per_stage_descriptor_set",
-                                                            "VK_QCOM_image_processing2",
-                                                            "VK_QCOM_filter_cubic_weights",
-                                                            "VK_QCOM_ycbcr_degamma",
-                                                            "VK_QCOM_filter_cubic_clamp",
-                                                            "VK_EXT_attachment_feedback_loop_dynamic_state",
-                                                            "VK_KHR_vertex_attribute_divisor",
-                                                            "VK_KHR_load_store_op_none",
-                                                            "VK_KHR_unified_image_layouts",
-                                                            "VK_KHR_shader_float_controls2",
+      "VK_KHR_maintenance5",
+      "VK_KHR_ray_tracing_position_fetch",
+      "VK_EXT_shader_object",
+      "VK_QCOM_tile_properties",
+      "VK_SEC_amigo_profiling",
+      "VK_QCOM_multiview_per_view_viewports",
+      "VK_NV_ray_tracing_invocation_reorder",
+      "VK_NV_extended_sparse_address_space",
+      "VK_EXT_mutable_descriptor_type",
+      "VK_ARM_shader_core_builtins",
+      "VK_EXT_pipeline_library_group_handles",
+      "VK_EXT_dynamic_rendering_unused_attachments",
+      "VK_NV_low_latency2",
+      "VK_KHR_cooperative_matrix",
+      "VK_QCOM_multiview_per_view_render_areas",
+      "VK_KHR_video_decode_av1",
+      "VK_KHR_video_maintenance1",
+      "VK_NV_per_stage_descriptor_set",
+      "VK_QCOM_image_processing2",
+      "VK_QCOM_filter_cubic_weights",
+      "VK_QCOM_ycbcr_degamma",
+      "VK_QCOM_filter_cubic_clamp",
+      "VK_EXT_attachment_feedback_loop_dynamic_state",
+      "VK_KHR_vertex_attribute_divisor",
+      "VK_KHR_load_store_op_none",
+      "VK_KHR_shader_float_controls2",
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-                                                            "VK_QNX_external_memory_screen_buffer",
+      "VK_QNX_external_memory_screen_buffer",
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-                                                            "VK_MSFT_layered_driver",
-                                                            "VK_KHR_index_type_uint8",
-                                                            "VK_KHR_line_rasterization",
-                                                            "VK_KHR_calibrated_timestamps",
-                                                            "VK_KHR_shader_expect_assume",
-                                                            "VK_KHR_maintenance6",
-                                                            "VK_NV_descriptor_pool_overallocation",
-                                                            "VK_QCOM_tile_memory_heap",
-                                                            "VK_KHR_copy_memory_indirect",
-                                                            "VK_EXT_memory_decompression",
-                                                            "VK_KHR_video_encode_intra_refresh",
-                                                            "VK_KHR_video_encode_quantization_map",
-                                                            "VK_NV_raw_access_chains",
-                                                            "VK_NV_external_compute_queue",
-                                                            "VK_KHR_shader_relaxed_extended_instruction",
-                                                            "VK_NV_command_buffer_inheritance",
-                                                            "VK_KHR_maintenance7",
-                                                            "VK_NV_shader_atomic_float16_vector",
-                                                            "VK_EXT_shader_replicated_composites",
-                                                            "VK_EXT_shader_float8",
-                                                            "VK_NV_ray_tracing_validation",
-                                                            "VK_NV_cluster_acceleration_structure",
-                                                            "VK_NV_partitioned_acceleration_structure",
-                                                            "VK_EXT_device_generated_commands",
-                                                            "VK_KHR_maintenance8",
-                                                            "VK_MESA_image_alignment_control",
-                                                            "VK_KHR_shader_fma",
-                                                            "VK_EXT_ray_tracing_invocation_reorder",
-                                                            "VK_EXT_depth_clamp_control",
-                                                            "VK_KHR_maintenance9",
-                                                            "VK_KHR_video_maintenance2",
-#if defined( VK_USE_PLATFORM_OHOS )
-                                                            "VK_OHOS_native_buffer",
-#endif /*VK_USE_PLATFORM_OHOS*/
-                                                            "VK_HUAWEI_hdr_vivid",
-                                                            "VK_NV_cooperative_matrix2",
-                                                            "VK_ARM_pipeline_opacity_micromap",
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-                                                            "VK_EXT_external_memory_metal",
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-                                                            "VK_KHR_depth_clamp_zero_one",
-                                                            "VK_ARM_performance_counters_by_region",
-                                                            "VK_EXT_vertex_attribute_robustness",
-                                                            "VK_ARM_format_pack",
-                                                            "VK_VALVE_fragment_density_map_layered",
-                                                            "VK_KHR_robustness2",
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-                                                            "VK_NV_present_metering",
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-                                                            "VK_EXT_fragment_density_map_offset",
-                                                            "VK_EXT_zero_initialize_device_memory",
-                                                            "VK_KHR_present_mode_fifo_latest_ready",
-                                                            "VK_EXT_shader_64bit_indexing",
-                                                            "VK_EXT_custom_resolve",
-                                                            "VK_QCOM_data_graph_model",
-                                                            "VK_KHR_maintenance10",
-                                                            "VK_SEC_pipeline_cache_incremental_mode",
-                                                            "VK_EXT_shader_uniform_buffer_unsized_array" };
+      "VK_MSFT_layered_driver",
+      "VK_KHR_index_type_uint8",
+      "VK_KHR_line_rasterization",
+      "VK_KHR_calibrated_timestamps",
+      "VK_KHR_shader_expect_assume",
+      "VK_KHR_maintenance6",
+      "VK_NV_descriptor_pool_overallocation",
+      "VK_NV_raw_access_chains",
+      "VK_NV_shader_atomic_float16_vector",
+      "VK_NV_ray_tracing_validation"
+    };
     return deviceExtensions;
   }
 
   VULKAN_HPP_INLINE std::set<std::string> const & getInstanceExtensions()
   {
-    static const std::set<std::string> instanceExtensions = { "VK_KHR_surface",
-                                                              "VK_KHR_display",
+    static std::set<std::string> instanceExtensions = {
+      "VK_KHR_surface",
+      "VK_KHR_display",
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
-                                                              "VK_KHR_xlib_surface",
+      "VK_KHR_xlib_surface",
 #endif /*VK_USE_PLATFORM_XLIB_KHR*/
 #if defined( VK_USE_PLATFORM_XCB_KHR )
-                                                              "VK_KHR_xcb_surface",
+      "VK_KHR_xcb_surface",
 #endif /*VK_USE_PLATFORM_XCB_KHR*/
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-                                                              "VK_KHR_wayland_surface",
+      "VK_KHR_wayland_surface",
 #endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-                                                              "VK_KHR_android_surface",
+      "VK_KHR_android_surface",
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                              "VK_KHR_win32_surface",
+      "VK_KHR_win32_surface",
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                              "VK_EXT_debug_report",
+      "VK_EXT_debug_report",
 #if defined( VK_USE_PLATFORM_GGP )
-                                                              "VK_GGP_stream_descriptor_surface",
+      "VK_GGP_stream_descriptor_surface",
 #endif /*VK_USE_PLATFORM_GGP*/
-                                                              "VK_NV_external_memory_capabilities",
-                                                              "VK_KHR_get_physical_device_properties2",
-                                                              "VK_EXT_validation_flags",
+      "VK_NV_external_memory_capabilities",
+      "VK_KHR_get_physical_device_properties2",
+      "VK_EXT_validation_flags",
 #if defined( VK_USE_PLATFORM_VI_NN )
-                                                              "VK_NN_vi_surface",
+      "VK_NN_vi_surface",
 #endif /*VK_USE_PLATFORM_VI_NN*/
-                                                              "VK_KHR_device_group_creation",
-                                                              "VK_KHR_external_memory_capabilities",
-                                                              "VK_KHR_external_semaphore_capabilities",
-                                                              "VK_EXT_direct_mode_display",
+      "VK_KHR_device_group_creation",
+      "VK_KHR_external_memory_capabilities",
+      "VK_KHR_external_semaphore_capabilities",
+      "VK_EXT_direct_mode_display",
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-                                                              "VK_EXT_acquire_xlib_display",
+      "VK_EXT_acquire_xlib_display",
 #endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
-                                                              "VK_EXT_display_surface_counter",
-                                                              "VK_EXT_swapchain_colorspace",
-                                                              "VK_KHR_external_fence_capabilities",
-                                                              "VK_KHR_get_surface_capabilities2",
-                                                              "VK_KHR_get_display_properties2",
+      "VK_EXT_display_surface_counter",
+      "VK_EXT_swapchain_colorspace",
+      "VK_KHR_external_fence_capabilities",
+      "VK_KHR_get_surface_capabilities2",
+      "VK_KHR_get_display_properties2",
 #if defined( VK_USE_PLATFORM_IOS_MVK )
-                                                              "VK_MVK_ios_surface",
+      "VK_MVK_ios_surface",
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
-                                                              "VK_MVK_macos_surface",
+      "VK_MVK_macos_surface",
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
-                                                              "VK_EXT_debug_utils",
+      "VK_EXT_debug_utils",
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-                                                              "VK_FUCHSIA_imagepipe_surface",
+      "VK_FUCHSIA_imagepipe_surface",
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-                                                              "VK_EXT_metal_surface",
+      "VK_EXT_metal_surface",
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
-                                                              "VK_KHR_surface_protected_capabilities",
-                                                              "VK_EXT_validation_features",
-                                                              "VK_EXT_headless_surface",
-                                                              "VK_EXT_surface_maintenance1",
-                                                              "VK_EXT_acquire_drm_display",
+      "VK_KHR_surface_protected_capabilities",
+      "VK_EXT_validation_features",
+      "VK_EXT_headless_surface",
+      "VK_EXT_surface_maintenance1",
+      "VK_EXT_acquire_drm_display",
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-                                                              "VK_EXT_directfb_surface",
+      "VK_EXT_directfb_surface",
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-                                                              "VK_QNX_screen_surface",
+      "VK_QNX_screen_surface",
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-                                                              "VK_KHR_portability_enumeration",
-                                                              "VK_GOOGLE_surfaceless_query",
-                                                              "VK_LUNARG_direct_driver_loading",
-                                                              "VK_KHR_surface_maintenance1",
-                                                              "VK_EXT_layer_settings",
-                                                              "VK_NV_display_stereo",
-#if defined( VK_USE_PLATFORM_OHOS )
-                                                              "VK_OHOS_surface"
-#endif /*VK_USE_PLATFORM_OHOS*/
+      "VK_KHR_portability_enumeration",
+      "VK_GOOGLE_surfaceless_query",
+      "VK_LUNARG_direct_driver_loading",
+      "VK_EXT_layer_settings"
     };
     return instanceExtensions;
   }
 
   VULKAN_HPP_INLINE std::map<std::string, std::vector<std::vector<std::string>>> const & getExtensionDepends( std::string const & extension )
   {
-    static const std::map<std::string, std::vector<std::vector<std::string>>>                        noDependencies;
-    static const std::map<std::string, std::map<std::string, std::vector<std::vector<std::string>>>> dependencies = {
+    static std::map<std::string, std::vector<std::vector<std::string>>>                        noDependencies;
+    static std::map<std::string, std::map<std::string, std::vector<std::vector<std::string>>>> dependencies = {
       { "VK_KHR_swapchain",
         { { "VK_VERSION_1_0",
             { {
@@ -613,50 +532,44 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_display_swapchain",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_display",
               "VK_KHR_swapchain",
-            } } } } }
+              "VK_KHR_display",
+            } } } } },
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
-      ,
       { "VK_KHR_xlib_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_XLIB_KHR*/
 #if defined( VK_USE_PLATFORM_XCB_KHR )
-      ,
       { "VK_KHR_xcb_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_XCB_KHR*/
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-      ,
       { "VK_KHR_wayland_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      ,
       { "VK_KHR_android_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_KHR_win32_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_EXT_debug_marker",
         { { "VK_VERSION_1_0",
             { {
@@ -671,13 +584,10 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_video_decode_queue",
         { { "VK_VERSION_1_0",
             { {
+              "VK_KHR_video_queue",
               "VK_KHR_synchronization2",
-              "VK_KHR_video_queue",
             } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_video_queue",
-            } } } } },
+          { "VK_VERSION_1_3", { {} } } } },
       { "VK_EXT_transform_feedback",
         { { "VK_VERSION_1_0",
             { {
@@ -708,23 +618,20 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_dynamic_rendering",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_depth_stencil_resolve",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
             { {
               "VK_KHR_depth_stencil_resolve",
             } } },
-          { "VK_VERSION_1_2", { {} } } } }
+          { "VK_VERSION_1_2", { {} } } } },
 #if defined( VK_USE_PLATFORM_GGP )
-      ,
       { "VK_GGP_stream_descriptor_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_GGP*/
-      ,
       { "VK_NV_corner_sampled_image",
         { { "VK_VERSION_1_0",
             { {
@@ -741,9 +648,8 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_NV_external_memory_capabilities",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_NV_external_memory_win32",
         { { "VK_VERSION_1_0",
             { {
@@ -753,23 +659,20 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_NV_external_memory_win32",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_KHR_device_group",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_device_group_creation",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_VI_NN )
-      ,
       { "VK_NN_vi_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_VI_NN*/
-      ,
       { "VK_EXT_texture_compression_astc_hdr",
         { { "VK_VERSION_1_0",
             { {
@@ -799,32 +702,28 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_external_memory_capabilities",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_KHR_external_memory_win32",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_memory",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_KHR_external_memory_fd",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_memory",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_KHR_win32_keyed_mutex",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_memory_win32",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_KHR_external_semaphore_capabilities",
         { { "VK_VERSION_1_0",
             { {
@@ -835,16 +734,14 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_semaphore_capabilities",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_KHR_external_semaphore_win32",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_semaphore",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_KHR_external_semaphore_fd",
         { { "VK_VERSION_1_0",
             { {
@@ -885,16 +782,14 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_display",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-      ,
       { "VK_EXT_acquire_xlib_display",
         { { "VK_VERSION_1_0",
             { {
               "VK_EXT_direct_mode_display",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
-      ,
       { "VK_EXT_display_surface_counter",
         { { "VK_VERSION_1_0",
             { {
@@ -949,7 +844,6 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_image_format_list",
               "VK_KHR_maintenance2",
             } } },
           { "VK_VERSION_1_1",
@@ -960,8 +854,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_create_renderpass2",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_maintenance2",
               "VK_KHR_multiview",
+              "VK_KHR_maintenance2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_IMG_relaxed_line_rasterization",
@@ -973,14 +867,14 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_shared_presentable_image",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_swapchain",
+              "VK_KHR_get_surface_capabilities2",
+              "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
             { {
-              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_swapchain",
+              "VK_KHR_get_surface_capabilities2",
             } } } } },
       { "VK_KHR_external_fence_capabilities",
         { { "VK_VERSION_1_0",
@@ -992,16 +886,14 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_fence_capabilities",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_KHR_external_fence_win32",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_external_fence",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_KHR_external_fence_fd",
         { { "VK_VERSION_1_0",
             { {
@@ -1030,24 +922,21 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_display",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_IOS_MVK )
-      ,
       { "VK_MVK_ios_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
-      ,
       { "VK_MVK_macos_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
-      ,
       { "VK_EXT_external_memory_dma_buf",
         { { "VK_VERSION_1_0",
             { {
@@ -1064,47 +953,42 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_memory_requirements2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      ,
       { "VK_ANDROID_external_memory_android_hardware_buffer",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_queue_family_foreign",
-              "VK_KHR_dedicated_allocation",
-              "VK_KHR_external_memory",
               "VK_KHR_sampler_ycbcr_conversion",
+              "VK_KHR_external_memory",
+              "VK_KHR_dedicated_allocation",
             } } },
           { "VK_VERSION_1_1",
             { {
               "VK_EXT_queue_family_foreign",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-      ,
       { "VK_EXT_sampler_filter_minmax",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
       { "VK_AMDX_shader_enqueue",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_extended_dynamic_state",
-              "VK_KHR_maintenance5",
-              "VK_KHR_pipeline_library",
-              "VK_KHR_spirv_1_4",
+              "VK_KHR_get_physical_device_properties2",
+            } } },
+          { "VK_VERSION_1_1",
+            { {
               "VK_KHR_synchronization2",
             } } },
           { "VK_VERSION_1_3",
             { {
-              "VK_KHR_maintenance5",
               "VK_KHR_pipeline_library",
-            } } } } }
+              "VK_KHR_spirv_1_4",
+            } } } } },
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
       { "VK_EXT_inline_uniform_block",
         { { "VK_VERSION_1_0",
             { {
@@ -1112,12 +996,6 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_maintenance1",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_shader_bfloat16",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_sample_locations",
         { { "VK_VERSION_1_0",
             { {
@@ -1135,7 +1013,6 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_EXT_descriptor_indexing",
               "VK_KHR_buffer_device_address",
-              "VK_KHR_deferred_host_operations",
             } } },
           { "VK_VERSION_1_2",
             { {
@@ -1144,31 +1021,23 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_ray_tracing_pipeline",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_acceleration_structure",
               "VK_KHR_spirv_1_4",
-            } } },
-          { "VK_VERSION_1_2",
-            { {
               "VK_KHR_acceleration_structure",
             } } } } },
       { "VK_KHR_ray_query",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_acceleration_structure",
               "VK_KHR_spirv_1_4",
-            } } },
-          { "VK_VERSION_1_2",
-            { {
               "VK_KHR_acceleration_structure",
             } } } } },
       { "VK_NV_shader_sm_builtins", { { "VK_VERSION_1_1", { {} } } } },
       { "VK_KHR_sampler_ycbcr_conversion",
         { { "VK_VERSION_1_0",
             { {
+              "VK_KHR_maintenance1",
               "VK_KHR_bind_memory2",
               "VK_KHR_get_memory_requirements2",
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_maintenance1",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_image_drm_format_modifier",
@@ -1176,7 +1045,6 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_bind_memory2",
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_image_format_list",
               "VK_KHR_sampler_ycbcr_conversion",
             } } },
           { "VK_VERSION_1_1",
@@ -1190,17 +1058,15 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
               "VK_KHR_maintenance3",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
       { "VK_KHR_portability_subset",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
       { "VK_NV_shading_rate_image",
         { { "VK_VERSION_1_0",
             { {
@@ -1210,8 +1076,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_ray_tracing",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_memory_requirements2",
               "VK_KHR_get_physical_device_properties2",
+              "VK_KHR_get_memory_requirements2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_NV_representative_fragment_test",
@@ -1280,17 +1146,15 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_GGP )
-      ,
       { "VK_GGP_frame_token",
         { { "VK_VERSION_1_0",
             { {
-              "VK_GGP_stream_descriptor_surface",
               "VK_KHR_swapchain",
-            } } } } }
+              "VK_GGP_stream_descriptor_surface",
+            } } } } },
 #endif /*VK_USE_PLATFORM_GGP*/
-      ,
       { "VK_KHR_driver_properties",
         { { "VK_VERSION_1_0",
             { {
@@ -1313,14 +1177,14 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_swapchain_mutable_format",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_image_format_list",
-              "VK_KHR_maintenance2",
               "VK_KHR_swapchain",
+              "VK_KHR_maintenance2",
+              "VK_KHR_image_format_list",
             } } },
           { "VK_VERSION_1_1",
             { {
-              "VK_KHR_image_format_list",
               "VK_KHR_swapchain",
+              "VK_KHR_image_format_list",
             } } },
           { "VK_VERSION_1_2",
             { {
@@ -1368,14 +1232,6 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_present_timing",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_calibrated_timestamps",
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_present_id2",
-              "VK_KHR_swapchain",
-            } } } } },
       { "VK_INTEL_shader_integer_functions2",
         { { "VK_VERSION_1_0",
             { {
@@ -1398,38 +1254,32 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_swapchain",
             } } },
           { "VK_VERSION_1_1",
             { {
               "VK_KHR_get_surface_capabilities2",
               "VK_KHR_swapchain",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-      ,
       { "VK_FUCHSIA_imagepipe_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-      ,
       { "VK_KHR_shader_terminate_invocation",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-      ,
       { "VK_EXT_metal_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
-      ,
       { "VK_EXT_fragment_density_map",
         { { "VK_VERSION_1_0",
             { {
@@ -1446,7 +1296,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_fragment_shading_rate",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_create_renderpass2",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -1480,11 +1329,7 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_shader_quad_control",
         { { "VK_VERSION_1_1",
             { {
-              "VK_KHR_shader_maximal_reconvergence",
               "VK_KHR_vulkan_memory_model",
-            } } },
-          { "VK_VERSION_1_2",
-            { {
               "VK_KHR_shader_maximal_reconvergence",
             } } } } },
       { "VK_KHR_spirv_1_4",
@@ -1519,7 +1364,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_separate_depth_stencil_layouts",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_create_renderpass2",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -1536,8 +1380,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_present_wait",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_present_id",
               "VK_KHR_swapchain",
+              "VK_KHR_present_id",
             } } } } },
       { "VK_NV_cooperative_matrix",
         { { "VK_VERSION_1_0",
@@ -1548,13 +1392,10 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_coverage_reduction_mode",
         { { "VK_VERSION_1_0",
             { {
+              "VK_NV_framebuffer_mixed_samples",
               "VK_KHR_get_physical_device_properties2",
-              "VK_NV_framebuffer_mixed_samples",
             } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_NV_framebuffer_mixed_samples",
-            } } } } },
+          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_fragment_shader_interlock",
         { { "VK_VERSION_1_0",
             { {
@@ -1578,25 +1419,20 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_EXT_full_screen_exclusive",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_surface",
-              "VK_KHR_swapchain",
             } } },
           { "VK_VERSION_1_1",
             { {
-              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_surface",
+              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_swapchain",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      ,
       { "VK_EXT_headless_surface",
         { { "VK_VERSION_1_0",
             { {
@@ -1605,8 +1441,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_buffer_device_address",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_device_group",
               "VK_KHR_get_physical_device_properties2",
+              "VK_KHR_device_group",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_line_rasterization",
@@ -1648,8 +1484,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_host_image_copy",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_copy_commands2",
-              "VK_KHR_format_feature_flags2",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -1662,8 +1496,7 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_map_memory2",
-            } } },
-          { "VK_VERSION_1_4", { {} } } } },
+            } } } } },
       { "VK_EXT_shader_atomic_float2",
         { { "VK_VERSION_1_0",
             { {
@@ -1672,21 +1505,17 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_surface_maintenance1",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_surface",
+              "VK_KHR_get_surface_capabilities2",
             } } } } },
       { "VK_EXT_swapchain_maintenance1",
         { { "VK_VERSION_1_0",
             { {
+              "VK_KHR_swapchain",
               "VK_EXT_surface_maintenance1",
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_swapchain",
             } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_EXT_surface_maintenance1",
-              "VK_KHR_swapchain",
-            } } } } },
+          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_shader_demote_to_helper_invocation",
         { { "VK_VERSION_1_0",
             { {
@@ -1750,21 +1579,18 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_surface",
-              "VK_KHR_swapchain",
             } } },
           { "VK_VERSION_1_1",
             { {
-              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_surface",
+              "VK_KHR_get_surface_capabilities2",
               "VK_KHR_swapchain",
             } } } } },
       { "VK_KHR_present_id",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_physical_device_properties2",
               "VK_KHR_swapchain",
+              "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_private_data",
@@ -1782,37 +1608,16 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_KHR_video_encode_queue",
         { { "VK_VERSION_1_0",
             { {
+              "VK_KHR_video_queue",
               "VK_KHR_synchronization2",
-              "VK_KHR_video_queue",
             } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_video_queue",
-            } } } } },
+          { "VK_VERSION_1_3", { {} } } } },
       { "VK_NV_device_diagnostics_config",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
-      { "VK_NV_cuda_kernel_launch",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
-      { "VK_QCOM_tile_shading",
-        { { "VK_VERSION_1_0",
-            { {
-                "VK_QCOM_tile_properties",
-              },
-              {
-                "VK_KHR_get_physical_device_properties2",
-              } } } } },
+          { "VK_VERSION_1_1", { {} } } } },
       { "VK_KHR_synchronization2",
         { { "VK_VERSION_1_0",
             { {
@@ -1822,16 +1627,12 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_descriptor_buffer",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_descriptor_indexing",
-              "VK_KHR_buffer_device_address",
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_synchronization2",
             } } },
           { "VK_VERSION_1_1",
             { {
-              "VK_EXT_descriptor_indexing",
               "VK_KHR_buffer_device_address",
-              "VK_KHR_synchronization2",
+              "VK_EXT_descriptor_indexing",
             } } },
           { "VK_VERSION_1_2",
             { {
@@ -1842,7 +1643,6 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_pipeline_library",
             } } },
           { "VK_VERSION_1_1",
             { {
@@ -1881,8 +1681,7 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_spirv_1_4",
-            } } },
-          { "VK_VERSION_1_2", { {} } } } },
+            } } } } },
       { "VK_EXT_ycbcr_2plane_444_formats",
         { { "VK_VERSION_1_0",
             { {
@@ -1953,24 +1752,21 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_sampler_ycbcr_conversion",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      ,
       { "VK_NV_acquire_winrt_display",
         { { "VK_VERSION_1_0",
             { {
               "VK_EXT_direct_mode_display",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-      ,
       { "VK_EXT_directfb_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-      ,
       { "VK_VALVE_mutable_descriptor_type",
         { { "VK_VERSION_1_0",
             { {
@@ -1991,7 +1787,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_device_address_binding_report",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_debug_utils",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2016,25 +1811,19 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_present_mode_fifo_latest_ready",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_swapchain",
-            } } } } }
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-      ,
       { "VK_FUCHSIA_external_memory",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_external_memory",
               "VK_KHR_external_memory_capabilities",
+              "VK_KHR_external_memory",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_FUCHSIA_external_semaphore",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_external_semaphore",
               "VK_KHR_external_semaphore_capabilities",
+              "VK_KHR_external_semaphore",
             } } } } },
       { "VK_FUCHSIA_buffer_collection",
         { { "VK_VERSION_1_0",
@@ -2042,17 +1831,12 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_FUCHSIA_external_memory",
               "VK_KHR_sampler_ycbcr_conversion",
             } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_FUCHSIA_external_memory",
-            } } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-      ,
       { "VK_HUAWEI_subpass_shading",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_create_renderpass2",
-              "VK_KHR_synchronization2",
             } } },
           { "VK_VERSION_1_2",
             { {
@@ -2065,10 +1849,7 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_ray_tracing_pipeline",
               "VK_KHR_synchronization2",
             } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_ray_tracing_pipeline",
-            } } } } },
+          { "VK_VERSION_1_3", { {} } } } },
       { "VK_NV_external_memory_rdma",
         { { "VK_VERSION_1_0",
             { {
@@ -2081,12 +1862,6 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_frame_boundary",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_multisampled_render_to_single_sampled",
         { { "VK_VERSION_1_0",
             { {
@@ -2099,16 +1874,14 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      ,
       { "VK_QNX_screen_surface",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_surface",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-      ,
       { "VK_EXT_color_write_enable",
         { { "VK_VERSION_1_0",
             { {
@@ -2125,31 +1898,13 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_acceleration_structure",
             } } } } },
-      { "VK_KHR_shader_untyped_pointers",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } } } },
       { "VK_EXT_global_priority_query",
         { { "VK_VERSION_1_0",
             { {
               "VK_EXT_global_priority",
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_EXT_global_priority",
-            } } } } },
-      { "VK_VALVE_video_encode_rgb_conversion",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_sampler_ycbcr_conversion",
-              "VK_KHR_video_encode_queue",
-            } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_KHR_video_encode_queue",
-            } } } } },
+          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_image_view_min_lod",
         { { "VK_VERSION_1_0",
             { {
@@ -2165,8 +1920,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_image_2d_view_of_3d",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_physical_device_properties2",
               "VK_KHR_maintenance1",
+              "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_shader_tile_image", { { "VK_VERSION_1_3", { {} } } } },
@@ -2176,19 +1931,14 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_acceleration_structure",
               "VK_KHR_synchronization2",
             } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_acceleration_structure",
-            } } } } }
+          { "VK_VERSION_1_3", { {} } } } },
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
       { "VK_NV_displacement_micromap",
         { { "VK_VERSION_1_0",
             { {
               "VK_EXT_opacity_micromap",
-            } } } } }
+            } } } } },
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
       { "VK_HUAWEI_cluster_culling_shader",
         { { "VK_VERSION_1_0",
             { {
@@ -2207,12 +1957,6 @@ namespace VULKAN_HPP_NAMESPACE
             } } } } },
       { "VK_KHR_maintenance4", { { "VK_VERSION_1_1", { {} } } } },
       { "VK_ARM_shader_core_properties", { { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_shader_subgroup_rotate",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_ARM_scheduling_controls",
         { { "VK_VERSION_1_0",
             { {
@@ -2221,8 +1965,8 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_image_sliced_view_of_3d",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_get_physical_device_properties2",
               "VK_KHR_maintenance1",
+              "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_VALVE_descriptor_set_host_mapping",
@@ -2247,7 +1991,6 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_synchronization2",
             } } },
           { "VK_VERSION_1_1",
             { {
@@ -2257,7 +2000,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_QCOM_fragment_density_map_offset",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_fragment_density_map",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2267,7 +2009,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_copy_memory_indirect",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_buffer_device_address",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2278,7 +2019,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_memory_decompression",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_buffer_device_address",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2291,11 +2031,6 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_NV_device_generated_commands",
             } } } } },
-      { "VK_NV_ray_tracing_linear_swept_spheres",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_ray_tracing_pipeline",
-            } } } } },
       { "VK_NV_linear_color_attachment",
         { { "VK_VERSION_1_0",
             { {
@@ -2324,23 +2059,7 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#if defined( VK_USE_PLATFORM_OHOS )
-      ,
-      { "VK_OHOS_external_memory",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_queue_family_foreign",
-              "VK_KHR_dedicated_allocation",
-              "VK_KHR_external_memory",
-              "VK_KHR_sampler_ycbcr_conversion",
-            } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_EXT_queue_family_foreign",
-            } } } } }
-#endif /*VK_USE_PLATFORM_OHOS*/
-      ,
+          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_external_memory_acquire_unmodified",
         { { "VK_VERSION_1_0",
             { {
@@ -2359,11 +2078,9 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_ARM_tensors", { { "VK_VERSION_1_3", { {} } } } },
       { "VK_EXT_shader_module_identifier",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_pipeline_creation_cache_control",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2380,9 +2097,7 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_optical_flow",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_format_feature_flags2",
               "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_synchronization2",
             } } },
           { "VK_VERSION_1_1",
             { {
@@ -2401,57 +2116,20 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
-          { "VK_VERSION_1_1", { {} } } } }
+          { "VK_VERSION_1_1", { {} } } } },
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      ,
       { "VK_ANDROID_external_format_resolve",
         { { "VK_VERSION_1_0",
             { {
               "VK_ANDROID_external_memory_android_hardware_buffer",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-      ,
       { "VK_KHR_maintenance5",
         { { "VK_VERSION_1_1",
             { {
               "VK_KHR_dynamic_rendering",
             } } },
           { "VK_VERSION_1_3", { {} } } } },
-      { "VK_AMD_anti_lag",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
-      { "VK_AMDX_dense_geometry_format",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_acceleration_structure",
-              "VK_KHR_maintenance5",
-            } } },
-          { "VK_VERSION_1_4",
-            { {
-              "VK_KHR_acceleration_structure",
-            } } } } }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
-      { "VK_KHR_present_id2",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_surface",
-              "VK_KHR_swapchain",
-            } } } } },
-      { "VK_KHR_present_wait2",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_surface_capabilities2",
-              "VK_KHR_present_id2",
-              "VK_KHR_surface",
-              "VK_KHR_swapchain",
-            } } } } },
       { "VK_KHR_ray_tracing_position_fetch",
         { { "VK_VERSION_1_0",
             { {
@@ -2460,7 +2138,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_shader_object",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_dynamic_rendering",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2468,12 +2145,6 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_dynamic_rendering",
             } } },
           { "VK_VERSION_1_3", { {} } } } },
-      { "VK_KHR_pipeline_binary",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_maintenance5",
-            } } },
-          { "VK_VERSION_1_4", { {} } } } },
       { "VK_QCOM_tile_properties",
         { { "VK_VERSION_1_0",
             { {
@@ -2486,25 +2157,6 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_surface_maintenance1",
-        { { "VK_VERSION_1_0",
-            { {
-                "VK_KHR_surface",
-              },
-              {
-                "VK_KHR_get_surface_capabilities2",
-              } } } } },
-      { "VK_KHR_swapchain_maintenance1",
-        { { "VK_VERSION_1_0",
-            { {
-                "VK_KHR_swapchain",
-              },
-              {
-                "VK_KHR_surface_maintenance1",
-              },
-              {
-                "VK_KHR_get_physical_device_properties2",
-              } } } } },
       { "VK_QCOM_multiview_per_view_viewports",
         { { "VK_VERSION_1_0",
             { {
@@ -2516,28 +2168,10 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_KHR_ray_tracing_pipeline",
             } } } } },
-      { "VK_NV_cooperative_vector",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_extended_sparse_address_space",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_EXT_mutable_descriptor_type",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_maintenance3",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_legacy_vertex_attributes",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_vertex_input_dynamic_state",
             } } } } },
       { "VK_ARM_shader_core_builtins",
         { { "VK_VERSION_1_0",
@@ -2548,13 +2182,12 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_pipeline_library_group_handles",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_pipeline_library",
               "VK_KHR_ray_tracing_pipeline",
+              "VK_KHR_pipeline_library",
             } } } } },
       { "VK_EXT_dynamic_rendering_unused_attachments",
         { { "VK_VERSION_1_0",
             { {
-              "VK_KHR_dynamic_rendering",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2565,59 +2198,20 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_NV_low_latency2",
         { { "VK_VERSION_1_0",
             { {
-                "VK_KHR_present_id",
-                "VK_KHR_timeline_semaphore",
-              },
-              {
-                "VK_KHR_present_id2",
-                "VK_KHR_timeline_semaphore",
-              } } },
-          { "VK_VERSION_1_2",
-            { {
-                "VK_KHR_present_id",
-              },
-              {
-                "VK_KHR_present_id2",
-              } } } } },
+              "VK_KHR_timeline_semaphore",
+            } } },
+          { "VK_VERSION_1_2", { {} } } } },
       { "VK_KHR_cooperative_matrix",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_ARM_data_graph",
-        { { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_deferred_host_operations",
-              "VK_KHR_maintenance5",
-            } } } } },
-      { "VK_QCOM_multiview_per_view_render_areas",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_compute_shader_derivatives",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_KHR_video_decode_av1",
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_video_decode_queue",
             } } } } },
-      { "VK_KHR_video_encode_av1",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_video_encode_queue",
-            } } } } },
-      { "VK_KHR_video_decode_vp9",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_video_decode_queue",
-            } } } } },
       { "VK_KHR_video_maintenance1",
         { { "VK_VERSION_1_0",
             { {
@@ -2627,8 +2221,7 @@ namespace VULKAN_HPP_NAMESPACE
         { { "VK_VERSION_1_0",
             { {
               "VK_KHR_maintenance6",
-            } } },
-          { "VK_VERSION_1_4", { {} } } } },
+            } } } } },
       { "VK_QCOM_image_processing2",
         { { "VK_VERSION_1_0",
             { {
@@ -2639,12 +2232,6 @@ namespace VULKAN_HPP_NAMESPACE
             { {
               "VK_EXT_filter_cubic",
             } } } } },
-      { "VK_QCOM_ycbcr_degamma",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_QCOM_filter_cubic_clamp",
         { { "VK_VERSION_1_0",
             { {
@@ -2658,7 +2245,6 @@ namespace VULKAN_HPP_NAMESPACE
       { "VK_EXT_attachment_feedback_loop_dynamic_state",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_attachment_feedback_loop_layout",
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1",
@@ -2671,33 +2257,24 @@ namespace VULKAN_HPP_NAMESPACE
               "VK_KHR_get_physical_device_properties2",
             } } },
           { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_unified_image_layouts",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
       { "VK_KHR_shader_float_controls2",
         { { "VK_VERSION_1_1",
             { {
               "VK_KHR_shader_float_controls",
-            } } } } }
+            } } } } },
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      ,
       { "VK_QNX_external_memory_screen_buffer",
         { { "VK_VERSION_1_0",
             { {
-              "VK_EXT_queue_family_foreign",
-              "VK_KHR_dedicated_allocation",
-              "VK_KHR_external_memory",
               "VK_KHR_sampler_ycbcr_conversion",
+              "VK_KHR_external_memory",
+              "VK_KHR_dedicated_allocation",
             } } },
           { "VK_VERSION_1_1",
             { {
               "VK_EXT_queue_family_foreign",
-            } } } } }
+            } } } } },
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-      ,
       { "VK_MSFT_layered_driver",
         { { "VK_VERSION_1_0",
             { {
@@ -2729,307 +2306,7 @@ namespace VULKAN_HPP_NAMESPACE
             } } },
           { "VK_VERSION_1_1", { {} } } } },
       { "VK_KHR_maintenance6", { { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_descriptor_pool_overallocation", { { "VK_VERSION_1_1", { {} } } } },
-      { "VK_QCOM_tile_memory_heap",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_memory_requirements2",
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_copy_memory_indirect",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_buffer_device_address",
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_2", { {} } } } },
-      { "VK_EXT_memory_decompression",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_buffer_device_address",
-              "VK_KHR_get_physical_device_properties2",
-            } } } } },
-      { "VK_NV_display_stereo",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_display",
-              "VK_KHR_get_display_properties2",
-            } } } } },
-      { "VK_KHR_video_encode_intra_refresh",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_video_encode_queue",
-            } } } } },
-      { "VK_KHR_video_encode_quantization_map",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_format_feature_flags2",
-              "VK_KHR_video_encode_queue",
-            } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_KHR_video_encode_queue",
-            } } } } },
-      { "VK_NV_raw_access_chains",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_shader_relaxed_extended_instruction",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_command_buffer_inheritance",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_maintenance7", { { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_shader_atomic_float16_vector",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_shader_replicated_composites",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_shader_float8",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_ray_tracing_validation",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_NV_cluster_acceleration_structure",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_acceleration_structure",
-            } } } } },
-      { "VK_NV_partitioned_acceleration_structure",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_acceleration_structure",
-            } } } } },
-      { "VK_EXT_device_generated_commands",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_buffer_device_address",
-              "VK_KHR_maintenance5",
-            } } },
-          { "VK_VERSION_1_2",
-            { {
-              "VK_KHR_maintenance5",
-            } } },
-          { "VK_VERSION_1_3", { {} } } } },
-      { "VK_KHR_maintenance8", { { "VK_VERSION_1_1", { {} } } } },
-      { "VK_MESA_image_alignment_control",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_shader_fma",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_ray_tracing_invocation_reorder",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_ray_tracing_pipeline",
-            } } } } },
-      { "VK_EXT_depth_clamp_control",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_maintenance9",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_video_maintenance2",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_video_queue",
-            } } } } }
-#if defined( VK_USE_PLATFORM_OHOS )
-      ,
-      { "VK_OHOS_surface",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_surface",
-            } } } } }
-#endif /*VK_USE_PLATFORM_OHOS*/
-      ,
-      { "VK_HUAWEI_hdr_vivid",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_hdr_metadata",
-              "VK_KHR_get_physical_device_properties2",
-              "VK_KHR_swapchain",
-            } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_EXT_hdr_metadata",
-              "VK_KHR_swapchain",
-            } } } } },
-      { "VK_NV_cooperative_matrix2",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_cooperative_matrix",
-            } } } } },
-      { "VK_ARM_pipeline_opacity_micromap",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_opacity_micromap",
-            } } } } }
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-      ,
-      { "VK_EXT_external_memory_metal",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_external_memory",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-      ,
-      { "VK_KHR_depth_clamp_zero_one",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_ARM_performance_counters_by_region",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_vertex_attribute_robustness",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_ARM_format_pack",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_VALVE_fragment_density_map_layered",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_fragment_density_map",
-              "VK_KHR_maintenance5",
-            } } },
-          { "VK_VERSION_1_4",
-            { {
-              "VK_EXT_fragment_density_map",
-            } } } } },
-      { "VK_KHR_robustness2",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      ,
-      { "VK_NV_present_metering",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      ,
-      { "VK_EXT_fragment_density_map_offset",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_EXT_fragment_density_map",
-              "VK_KHR_create_renderpass2",
-              "VK_KHR_dynamic_rendering",
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1",
-            { {
-              "VK_EXT_fragment_density_map",
-              "VK_KHR_create_renderpass2",
-              "VK_KHR_dynamic_rendering",
-            } } },
-          { "VK_VERSION_1_2",
-            { {
-              "VK_EXT_fragment_density_map",
-              "VK_KHR_dynamic_rendering",
-            } } },
-          { "VK_VERSION_1_3",
-            { {
-              "VK_EXT_fragment_density_map",
-            } } } } },
-      { "VK_EXT_zero_initialize_device_memory",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_KHR_present_mode_fifo_latest_ready",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_swapchain",
-            } } } } },
-      { "VK_EXT_shader_64bit_indexing",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_custom_resolve",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_QCOM_data_graph_model",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_ARM_data_graph",
-            } } } } },
-      { "VK_KHR_maintenance10",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_SEC_pipeline_cache_incremental_mode",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } },
-      { "VK_EXT_shader_uniform_buffer_unsized_array",
-        { { "VK_VERSION_1_0",
-            { {
-              "VK_KHR_get_physical_device_properties2",
-            } } },
-          { "VK_VERSION_1_1", { {} } } } }
+      { "VK_NV_descriptor_pool_overallocation", { { "VK_VERSION_1_1", { {} } } } }
     };
     auto depIt = dependencies.find( extension );
     return ( depIt != dependencies.end() ) ? depIt->second : noDependencies;
@@ -3039,8 +2316,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                                                                         std::string const & extension )
   {
 #if !defined( NDEBUG )
-    static std::set<std::string> versions = { "VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4" };
-    VULKAN_HPP_ASSERT( versions.find( version ) != versions.end() );
+    static std::set<std::string> versions = { "VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3" };
+    assert( versions.find( version ) != versions.end() );
 #endif
     static std::vector<std::vector<std::string>> noDependencies;
 
@@ -3066,126 +2343,99 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::map<std::string, std::string> const & getObsoletedExtensions()
   {
-    static const std::map<std::string, std::string> obsoletedExtensions = { { "VK_AMD_negative_viewport_height", "VK_KHR_maintenance1" } };
+    static std::map<std::string, std::string> obsoletedExtensions = { { "VK_AMD_negative_viewport_height", "VK_KHR_maintenance1" } };
     return obsoletedExtensions;
   }
 
   VULKAN_HPP_INLINE std::map<std::string, std::string> const & getPromotedExtensions()
   {
-    static const std::map<std::string, std::string> promotedExtensions = { { "VK_KHR_sampler_mirror_clamp_to_edge", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_debug_marker", "VK_EXT_debug_utils" },
-                                                                           { "VK_AMD_draw_indirect_count", "VK_KHR_draw_indirect_count" },
-                                                                           { "VK_KHR_dynamic_rendering", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_multiview", "VK_VERSION_1_1" },
+    static std::map<std::string, std::string> promotedExtensions = {
+      { "VK_KHR_sampler_mirror_clamp_to_edge", "VK_VERSION_1_2" },
+      { "VK_EXT_debug_marker", "VK_EXT_debug_utils" },
+      { "VK_AMD_draw_indirect_count", "VK_KHR_draw_indirect_count" },
+      { "VK_KHR_dynamic_rendering", "VK_VERSION_1_3" },
+      { "VK_KHR_multiview", "VK_VERSION_1_1" },
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-                                                                           { "VK_NV_win32_keyed_mutex", "VK_KHR_win32_keyed_mutex" },
+      { "VK_NV_win32_keyed_mutex", "VK_KHR_win32_keyed_mutex" },
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-                                                                           { "VK_KHR_get_physical_device_properties2", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_device_group", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_shader_draw_parameters", "VK_VERSION_1_1" },
-                                                                           { "VK_EXT_texture_compression_astc_hdr", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_pipeline_robustness", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_maintenance1", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_device_group_creation", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_external_memory_capabilities", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_external_memory", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_external_semaphore_capabilities", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_external_semaphore", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_push_descriptor", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_shader_float16_int8", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_16bit_storage", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_descriptor_update_template", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_imageless_framebuffer", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_create_renderpass2", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_external_fence_capabilities", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_external_fence", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_maintenance2", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_variable_pointers", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_dedicated_allocation", "VK_VERSION_1_1" },
-                                                                           { "VK_EXT_sampler_filter_minmax", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_storage_buffer_storage_class", "VK_VERSION_1_1" },
-                                                                           { "VK_EXT_inline_uniform_block", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_relaxed_block_layout", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_get_memory_requirements2", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_image_format_list", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_sampler_ycbcr_conversion", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_bind_memory2", "VK_VERSION_1_1" },
-                                                                           { "VK_EXT_descriptor_indexing", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_shader_viewport_index_layer", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_maintenance3", "VK_VERSION_1_1" },
-                                                                           { "VK_KHR_draw_indirect_count", "VK_VERSION_1_2" },
-                                                                           { "VK_QCOM_render_pass_shader_resolve", "VK_EXT_custom_resolve" },
-                                                                           { "VK_EXT_global_priority", "VK_KHR_global_priority" },
-                                                                           { "VK_KHR_shader_subgroup_extended_types", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_8bit_storage", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_shader_atomic_int64", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_calibrated_timestamps", "VK_KHR_calibrated_timestamps" },
-                                                                           { "VK_KHR_global_priority", "VK_VERSION_1_4" },
-                                                                           { "VK_EXT_vertex_attribute_divisor", "VK_KHR_vertex_attribute_divisor" },
-                                                                           { "VK_EXT_pipeline_creation_feedback", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_driver_properties", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_shader_float_controls", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_depth_stencil_resolve", "VK_VERSION_1_2" },
-                                                                           { "VK_NV_compute_shader_derivatives", "VK_KHR_compute_shader_derivatives" },
-                                                                           { "VK_NV_fragment_shader_barycentric", "VK_KHR_fragment_shader_barycentric" },
-                                                                           { "VK_KHR_timeline_semaphore", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_vulkan_memory_model", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_shader_terminate_invocation", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_scalar_block_layout", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_subgroup_size_control", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_dynamic_rendering_local_read", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_spirv_1_4", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_separate_depth_stencil_layouts", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_tooling_info", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_separate_stencil_usage", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_uniform_buffer_standard_layout", "VK_VERSION_1_2" },
-                                                                           { "VK_KHR_buffer_device_address", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_line_rasterization", "VK_KHR_line_rasterization" },
-                                                                           { "VK_EXT_host_query_reset", "VK_VERSION_1_2" },
-                                                                           { "VK_EXT_index_type_uint8", "VK_KHR_index_type_uint8" },
-                                                                           { "VK_EXT_extended_dynamic_state", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_host_image_copy", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_map_memory2", "VK_VERSION_1_4" },
-                                                                           { "VK_EXT_surface_maintenance1", "VK_KHR_surface_maintenance1" },
-                                                                           { "VK_EXT_swapchain_maintenance1", "VK_KHR_swapchain_maintenance1" },
-                                                                           { "VK_EXT_shader_demote_to_helper_invocation", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_shader_integer_dot_product", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_texel_buffer_alignment", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_robustness2", "VK_KHR_robustness2" },
-                                                                           { "VK_KHR_shader_non_semantic_info", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_private_data", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_pipeline_creation_cache_control", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_synchronization2", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_zero_initialize_workgroup_memory", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_ycbcr_2plane_444_formats", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_image_robustness", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_copy_commands2", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_4444_formats", "VK_VERSION_1_3" },
-                                                                           { "VK_ARM_rasterization_order_attachment_access",
-                                                                             "VK_EXT_rasterization_order_attachment_access" },
-                                                                           { "VK_VALVE_mutable_descriptor_type", "VK_EXT_mutable_descriptor_type" },
-                                                                           { "VK_KHR_format_feature_flags2", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_present_mode_fifo_latest_ready", "VK_KHR_present_mode_fifo_latest_ready" },
-                                                                           { "VK_EXT_extended_dynamic_state2", "VK_VERSION_1_3" },
-                                                                           { "VK_EXT_global_priority_query", "VK_KHR_global_priority" },
-                                                                           { "VK_EXT_load_store_op_none", "VK_KHR_load_store_op_none" },
-                                                                           { "VK_KHR_maintenance4", "VK_VERSION_1_3" },
-                                                                           { "VK_KHR_shader_subgroup_rotate", "VK_VERSION_1_4" },
-                                                                           { "VK_EXT_depth_clamp_zero_one", "VK_KHR_depth_clamp_zero_one" },
-                                                                           { "VK_QCOM_fragment_density_map_offset", "VK_EXT_fragment_density_map_offset" },
-                                                                           { "VK_NV_copy_memory_indirect", "VK_KHR_copy_memory_indirect" },
-                                                                           { "VK_NV_memory_decompression", "VK_EXT_memory_decompression" },
-                                                                           { "VK_EXT_pipeline_protected_access", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_maintenance5", "VK_VERSION_1_4" },
-                                                                           { "VK_NV_ray_tracing_invocation_reorder", "VK_EXT_ray_tracing_invocation_reorder" },
-                                                                           { "VK_KHR_vertex_attribute_divisor", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_load_store_op_none", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_shader_float_controls2", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_index_type_uint8", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_line_rasterization", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_shader_expect_assume", "VK_VERSION_1_4" },
-                                                                           { "VK_KHR_maintenance6", "VK_VERSION_1_4" },
-                                                                           { "VK_EXT_vertex_attribute_robustness", "VK_KHR_maintenance9" } };
+      { "VK_KHR_get_physical_device_properties2", "VK_VERSION_1_1" },
+      { "VK_KHR_device_group", "VK_VERSION_1_1" },
+      { "VK_KHR_shader_draw_parameters", "VK_VERSION_1_1" },
+      { "VK_EXT_texture_compression_astc_hdr", "VK_VERSION_1_3" },
+      { "VK_KHR_maintenance1", "VK_VERSION_1_1" },
+      { "VK_KHR_device_group_creation", "VK_VERSION_1_1" },
+      { "VK_KHR_external_memory_capabilities", "VK_VERSION_1_1" },
+      { "VK_KHR_external_memory", "VK_VERSION_1_1" },
+      { "VK_KHR_external_semaphore_capabilities", "VK_VERSION_1_1" },
+      { "VK_KHR_external_semaphore", "VK_VERSION_1_1" },
+      { "VK_KHR_shader_float16_int8", "VK_VERSION_1_2" },
+      { "VK_KHR_16bit_storage", "VK_VERSION_1_1" },
+      { "VK_KHR_descriptor_update_template", "VK_VERSION_1_1" },
+      { "VK_KHR_imageless_framebuffer", "VK_VERSION_1_2" },
+      { "VK_KHR_create_renderpass2", "VK_VERSION_1_2" },
+      { "VK_KHR_external_fence_capabilities", "VK_VERSION_1_1" },
+      { "VK_KHR_external_fence", "VK_VERSION_1_1" },
+      { "VK_KHR_maintenance2", "VK_VERSION_1_1" },
+      { "VK_KHR_variable_pointers", "VK_VERSION_1_1" },
+      { "VK_KHR_dedicated_allocation", "VK_VERSION_1_1" },
+      { "VK_EXT_sampler_filter_minmax", "VK_VERSION_1_2" },
+      { "VK_KHR_storage_buffer_storage_class", "VK_VERSION_1_1" },
+      { "VK_EXT_inline_uniform_block", "VK_VERSION_1_3" },
+      { "VK_KHR_relaxed_block_layout", "VK_VERSION_1_1" },
+      { "VK_KHR_get_memory_requirements2", "VK_VERSION_1_1" },
+      { "VK_KHR_image_format_list", "VK_VERSION_1_2" },
+      { "VK_KHR_sampler_ycbcr_conversion", "VK_VERSION_1_1" },
+      { "VK_KHR_bind_memory2", "VK_VERSION_1_1" },
+      { "VK_EXT_descriptor_indexing", "VK_VERSION_1_2" },
+      { "VK_EXT_shader_viewport_index_layer", "VK_VERSION_1_2" },
+      { "VK_KHR_maintenance3", "VK_VERSION_1_1" },
+      { "VK_KHR_draw_indirect_count", "VK_VERSION_1_2" },
+      { "VK_EXT_global_priority", "VK_KHR_global_priority" },
+      { "VK_KHR_shader_subgroup_extended_types", "VK_VERSION_1_2" },
+      { "VK_KHR_8bit_storage", "VK_VERSION_1_2" },
+      { "VK_KHR_shader_atomic_int64", "VK_VERSION_1_2" },
+      { "VK_EXT_calibrated_timestamps", "VK_KHR_calibrated_timestamps" },
+      { "VK_EXT_vertex_attribute_divisor", "VK_KHR_vertex_attribute_divisor" },
+      { "VK_EXT_pipeline_creation_feedback", "VK_VERSION_1_3" },
+      { "VK_KHR_driver_properties", "VK_VERSION_1_2" },
+      { "VK_KHR_shader_float_controls", "VK_VERSION_1_2" },
+      { "VK_KHR_depth_stencil_resolve", "VK_VERSION_1_2" },
+      { "VK_NV_fragment_shader_barycentric", "VK_KHR_fragment_shader_barycentric" },
+      { "VK_KHR_timeline_semaphore", "VK_VERSION_1_2" },
+      { "VK_KHR_vulkan_memory_model", "VK_VERSION_1_2" },
+      { "VK_KHR_shader_terminate_invocation", "VK_VERSION_1_3" },
+      { "VK_EXT_scalar_block_layout", "VK_VERSION_1_2" },
+      { "VK_EXT_subgroup_size_control", "VK_VERSION_1_3" },
+      { "VK_KHR_spirv_1_4", "VK_VERSION_1_2" },
+      { "VK_KHR_separate_depth_stencil_layouts", "VK_VERSION_1_2" },
+      { "VK_EXT_tooling_info", "VK_VERSION_1_3" },
+      { "VK_EXT_separate_stencil_usage", "VK_VERSION_1_2" },
+      { "VK_KHR_uniform_buffer_standard_layout", "VK_VERSION_1_2" },
+      { "VK_KHR_buffer_device_address", "VK_VERSION_1_2" },
+      { "VK_EXT_line_rasterization", "VK_KHR_line_rasterization" },
+      { "VK_EXT_host_query_reset", "VK_VERSION_1_2" },
+      { "VK_EXT_index_type_uint8", "VK_KHR_index_type_uint8" },
+      { "VK_EXT_extended_dynamic_state", "VK_VERSION_1_3" },
+      { "VK_EXT_shader_demote_to_helper_invocation", "VK_VERSION_1_3" },
+      { "VK_KHR_shader_integer_dot_product", "VK_VERSION_1_3" },
+      { "VK_EXT_texel_buffer_alignment", "VK_VERSION_1_3" },
+      { "VK_KHR_shader_non_semantic_info", "VK_VERSION_1_3" },
+      { "VK_EXT_private_data", "VK_VERSION_1_3" },
+      { "VK_EXT_pipeline_creation_cache_control", "VK_VERSION_1_3" },
+      { "VK_KHR_synchronization2", "VK_VERSION_1_3" },
+      { "VK_KHR_zero_initialize_workgroup_memory", "VK_VERSION_1_3" },
+      { "VK_EXT_ycbcr_2plane_444_formats", "VK_VERSION_1_3" },
+      { "VK_EXT_image_robustness", "VK_VERSION_1_3" },
+      { "VK_KHR_copy_commands2", "VK_VERSION_1_3" },
+      { "VK_EXT_4444_formats", "VK_VERSION_1_3" },
+      { "VK_ARM_rasterization_order_attachment_access", "VK_EXT_rasterization_order_attachment_access" },
+      { "VK_VALVE_mutable_descriptor_type", "VK_EXT_mutable_descriptor_type" },
+      { "VK_KHR_format_feature_flags2", "VK_VERSION_1_3" },
+      { "VK_EXT_extended_dynamic_state2", "VK_VERSION_1_3" },
+      { "VK_EXT_global_priority_query", "VK_KHR_global_priority" },
+      { "VK_EXT_load_store_op_none", "VK_KHR_load_store_op_none" },
+      { "VK_KHR_maintenance4", "VK_VERSION_1_3" }
+    };
     return promotedExtensions;
   }
 
@@ -3253,10 +2503,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_KHR_shader_float16_int8";
     }
-    if ( extension == "VK_NV_ray_tracing" )
-    {
-      return "VK_KHR_ray_tracing_pipeline";
-    }
     if ( extension == "VK_EXT_buffer_device_address" )
     {
       return "VK_KHR_buffer_device_address";
@@ -3265,13 +2511,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_EXT_layer_settings";
     }
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    if ( extension == "VK_NV_displacement_micromap" )
-    {
-      return "VK_NV_cluster_acceleration_structure";
-    }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
     return "";
   }
 
@@ -3328,10 +2567,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_EXT_pipeline_robustness" )
-    {
-      return "VK_VERSION_1_4";
-    }
     if ( extension == "VK_KHR_maintenance1" )
     {
       return "VK_VERSION_1_1";
@@ -3356,10 +2591,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_1";
     }
-    if ( extension == "VK_KHR_push_descriptor" )
-    {
-      return "VK_VERSION_1_4";
-    }
     if ( extension == "VK_KHR_shader_float16_int8" )
     {
       return "VK_VERSION_1_2";
@@ -3448,10 +2679,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_2";
     }
-    if ( extension == "VK_QCOM_render_pass_shader_resolve" )
-    {
-      return "VK_EXT_custom_resolve";
-    }
     if ( extension == "VK_EXT_global_priority" )
     {
       return "VK_KHR_global_priority";
@@ -3472,10 +2699,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_KHR_calibrated_timestamps";
     }
-    if ( extension == "VK_KHR_global_priority" )
-    {
-      return "VK_VERSION_1_4";
-    }
     if ( extension == "VK_EXT_vertex_attribute_divisor" )
     {
       return "VK_KHR_vertex_attribute_divisor";
@@ -3496,10 +2719,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_2";
     }
-    if ( extension == "VK_NV_compute_shader_derivatives" )
-    {
-      return "VK_KHR_compute_shader_derivatives";
-    }
     if ( extension == "VK_NV_fragment_shader_barycentric" )
     {
       return "VK_KHR_fragment_shader_barycentric";
@@ -3524,10 +2743,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_KHR_dynamic_rendering_local_read" )
-    {
-      return "VK_VERSION_1_4";
-    }
     if ( extension == "VK_KHR_spirv_1_4" )
     {
       return "VK_VERSION_1_2";
@@ -3568,22 +2783,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_EXT_host_image_copy" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_map_memory2" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_EXT_surface_maintenance1" )
-    {
-      return "VK_KHR_surface_maintenance1";
-    }
-    if ( extension == "VK_EXT_swapchain_maintenance1" )
-    {
-      return "VK_KHR_swapchain_maintenance1";
-    }
     if ( extension == "VK_EXT_shader_demote_to_helper_invocation" )
     {
       return "VK_VERSION_1_3";
@@ -3596,10 +2795,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_EXT_robustness2" )
-    {
-      return "VK_KHR_robustness2";
-    }
     if ( extension == "VK_KHR_shader_non_semantic_info" )
     {
       return "VK_VERSION_1_3";
@@ -3648,10 +2843,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_EXT_present_mode_fifo_latest_ready" )
-    {
-      return "VK_KHR_present_mode_fifo_latest_ready";
-    }
     if ( extension == "VK_EXT_extended_dynamic_state2" )
     {
       return "VK_VERSION_1_3";
@@ -3668,70 +2859,6 @@ namespace VULKAN_HPP_NAMESPACE
     {
       return "VK_VERSION_1_3";
     }
-    if ( extension == "VK_KHR_shader_subgroup_rotate" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_EXT_depth_clamp_zero_one" )
-    {
-      return "VK_KHR_depth_clamp_zero_one";
-    }
-    if ( extension == "VK_QCOM_fragment_density_map_offset" )
-    {
-      return "VK_EXT_fragment_density_map_offset";
-    }
-    if ( extension == "VK_NV_copy_memory_indirect" )
-    {
-      return "VK_KHR_copy_memory_indirect";
-    }
-    if ( extension == "VK_NV_memory_decompression" )
-    {
-      return "VK_EXT_memory_decompression";
-    }
-    if ( extension == "VK_EXT_pipeline_protected_access" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_maintenance5" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_NV_ray_tracing_invocation_reorder" )
-    {
-      return "VK_EXT_ray_tracing_invocation_reorder";
-    }
-    if ( extension == "VK_KHR_vertex_attribute_divisor" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_load_store_op_none" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_shader_float_controls2" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_index_type_uint8" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_line_rasterization" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_shader_expect_assume" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_KHR_maintenance6" )
-    {
-      return "VK_VERSION_1_4";
-    }
-    if ( extension == "VK_EXT_vertex_attribute_robustness" )
-    {
-      return "VK_KHR_maintenance9";
-    }
     return "";
   }
 
@@ -3739,23 +2866,18 @@ namespace VULKAN_HPP_NAMESPACE
   {
     return ( extension == "VK_EXT_debug_report" ) || ( extension == "VK_NV_glsl_shader" ) || ( extension == "VK_NV_dedicated_allocation" ) ||
            ( extension == "VK_AMD_gpu_shader_half_float" ) || ( extension == "VK_IMG_format_pvrtc" ) || ( extension == "VK_NV_external_memory_capabilities" ) ||
-           ( extension == "VK_NV_external_memory" )
+           ( extension == "VK_NV_external_memory" ) ||
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-        || ( extension == "VK_NV_external_memory_win32" )
+           ( extension == "VK_NV_external_memory_win32" ) ||
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-        || ( extension == "VK_EXT_validation_flags" ) || ( extension == "VK_EXT_shader_subgroup_ballot" ) || ( extension == "VK_EXT_shader_subgroup_vote" )
+           ( extension == "VK_EXT_validation_flags" ) || ( extension == "VK_EXT_shader_subgroup_ballot" ) || ( extension == "VK_EXT_shader_subgroup_vote" ) ||
 #if defined( VK_USE_PLATFORM_IOS_MVK )
-        || ( extension == "VK_MVK_ios_surface" )
+           ( extension == "VK_MVK_ios_surface" ) ||
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
-        || ( extension == "VK_MVK_macos_surface" )
+           ( extension == "VK_MVK_macos_surface" ) ||
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
-        || ( extension == "VK_AMD_gpu_shader_int16" ) || ( extension == "VK_NV_ray_tracing" ) || ( extension == "VK_EXT_buffer_device_address" ) ||
-           ( extension == "VK_EXT_validation_features" )
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        || ( extension == "VK_NV_displacement_micromap" )
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-        || false;
+           ( extension == "VK_AMD_gpu_shader_int16" ) || ( extension == "VK_EXT_buffer_device_address" ) || ( extension == "VK_EXT_validation_features" );
   }
 
   VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 bool isDeviceExtension( std::string const & extension )
@@ -3815,8 +2937,8 @@ namespace VULKAN_HPP_NAMESPACE
         || ( extension == "VK_AMDX_shader_enqueue" )
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
         || ( extension == "VK_AMD_mixed_attachment_samples" ) || ( extension == "VK_AMD_shader_fragment_mask" ) ||
-           ( extension == "VK_EXT_inline_uniform_block" ) || ( extension == "VK_EXT_shader_stencil_export" ) || ( extension == "VK_KHR_shader_bfloat16" ) ||
-           ( extension == "VK_EXT_sample_locations" ) || ( extension == "VK_KHR_relaxed_block_layout" ) || ( extension == "VK_KHR_get_memory_requirements2" ) ||
+           ( extension == "VK_EXT_inline_uniform_block" ) || ( extension == "VK_EXT_shader_stencil_export" ) || ( extension == "VK_EXT_sample_locations" ) ||
+           ( extension == "VK_KHR_relaxed_block_layout" ) || ( extension == "VK_KHR_get_memory_requirements2" ) ||
            ( extension == "VK_KHR_image_format_list" ) || ( extension == "VK_EXT_blend_operation_advanced" ) ||
            ( extension == "VK_NV_fragment_coverage_to_color" ) || ( extension == "VK_KHR_acceleration_structure" ) ||
            ( extension == "VK_KHR_ray_tracing_pipeline" ) || ( extension == "VK_KHR_ray_query" ) || ( extension == "VK_NV_framebuffer_mixed_samples" ) ||
@@ -3844,7 +2966,7 @@ namespace VULKAN_HPP_NAMESPACE
            ( extension == "VK_NV_compute_shader_derivatives" ) || ( extension == "VK_NV_mesh_shader" ) ||
            ( extension == "VK_NV_fragment_shader_barycentric" ) || ( extension == "VK_NV_shader_image_footprint" ) ||
            ( extension == "VK_NV_scissor_exclusive" ) || ( extension == "VK_NV_device_diagnostic_checkpoints" ) ||
-           ( extension == "VK_KHR_timeline_semaphore" ) || ( extension == "VK_EXT_present_timing" ) || ( extension == "VK_INTEL_shader_integer_functions2" ) ||
+           ( extension == "VK_KHR_timeline_semaphore" ) || ( extension == "VK_INTEL_shader_integer_functions2" ) ||
            ( extension == "VK_INTEL_performance_query" ) || ( extension == "VK_KHR_vulkan_memory_model" ) || ( extension == "VK_EXT_pci_bus_info" ) ||
            ( extension == "VK_AMD_display_native_hdr" ) || ( extension == "VK_KHR_shader_terminate_invocation" ) ||
            ( extension == "VK_EXT_fragment_density_map" ) || ( extension == "VK_EXT_scalar_block_layout" ) ||
@@ -3879,7 +3001,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
         || ( extension == "VK_NV_cuda_kernel_launch" )
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-        || ( extension == "VK_QCOM_tile_shading" ) || ( extension == "VK_NV_low_latency" )
+        || ( extension == "VK_NV_low_latency" )
 #if defined( VK_USE_PLATFORM_METAL_EXT )
         || ( extension == "VK_EXT_metal_objects" )
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
@@ -3899,7 +3021,7 @@ namespace VULKAN_HPP_NAMESPACE
         || ( extension == "VK_VALVE_mutable_descriptor_type" ) || ( extension == "VK_EXT_vertex_input_dynamic_state" ) ||
            ( extension == "VK_EXT_physical_device_drm" ) || ( extension == "VK_EXT_device_address_binding_report" ) ||
            ( extension == "VK_EXT_depth_clip_control" ) || ( extension == "VK_EXT_primitive_topology_list_restart" ) ||
-           ( extension == "VK_KHR_format_feature_flags2" ) || ( extension == "VK_EXT_present_mode_fifo_latest_ready" )
+           ( extension == "VK_KHR_format_feature_flags2" )
 #if defined( VK_USE_PLATFORM_FUCHSIA )
         || ( extension == "VK_FUCHSIA_external_memory" ) || ( extension == "VK_FUCHSIA_external_semaphore" ) || ( extension == "VK_FUCHSIA_buffer_collection" )
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
@@ -3907,8 +3029,7 @@ namespace VULKAN_HPP_NAMESPACE
            ( extension == "VK_EXT_pipeline_properties" ) || ( extension == "VK_EXT_frame_boundary" ) ||
            ( extension == "VK_EXT_multisampled_render_to_single_sampled" ) || ( extension == "VK_EXT_extended_dynamic_state2" ) ||
            ( extension == "VK_EXT_color_write_enable" ) || ( extension == "VK_EXT_primitives_generated_query" ) ||
-           ( extension == "VK_KHR_ray_tracing_maintenance1" ) || ( extension == "VK_KHR_shader_untyped_pointers" ) ||
-           ( extension == "VK_EXT_global_priority_query" ) || ( extension == "VK_VALVE_video_encode_rgb_conversion" ) ||
+           ( extension == "VK_KHR_ray_tracing_maintenance1" ) || ( extension == "VK_EXT_global_priority_query" ) ||
            ( extension == "VK_EXT_image_view_min_lod" ) || ( extension == "VK_EXT_multi_draw" ) || ( extension == "VK_EXT_image_2d_view_of_3d" ) ||
            ( extension == "VK_EXT_shader_tile_image" ) || ( extension == "VK_EXT_opacity_micromap" )
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
@@ -3922,72 +3043,33 @@ namespace VULKAN_HPP_NAMESPACE
            ( extension == "VK_EXT_non_seamless_cube_map" ) || ( extension == "VK_ARM_render_pass_striped" ) ||
            ( extension == "VK_QCOM_fragment_density_map_offset" ) || ( extension == "VK_NV_copy_memory_indirect" ) ||
            ( extension == "VK_NV_memory_decompression" ) || ( extension == "VK_NV_device_generated_commands_compute" ) ||
-           ( extension == "VK_NV_ray_tracing_linear_swept_spheres" ) || ( extension == "VK_NV_linear_color_attachment" ) ||
-           ( extension == "VK_KHR_shader_maximal_reconvergence" ) || ( extension == "VK_EXT_image_compression_control_swapchain" ) ||
-           ( extension == "VK_QCOM_image_processing" ) || ( extension == "VK_EXT_nested_command_buffer" )
-#if defined( VK_USE_PLATFORM_OHOS )
-        || ( extension == "VK_OHOS_external_memory" )
-#endif /*VK_USE_PLATFORM_OHOS*/
-        || ( extension == "VK_EXT_external_memory_acquire_unmodified" ) || ( extension == "VK_EXT_extended_dynamic_state3" ) ||
-           ( extension == "VK_EXT_subpass_merge_feedback" ) || ( extension == "VK_ARM_tensors" ) || ( extension == "VK_EXT_shader_module_identifier" ) ||
-           ( extension == "VK_EXT_rasterization_order_attachment_access" ) || ( extension == "VK_NV_optical_flow" ) ||
-           ( extension == "VK_EXT_legacy_dithering" ) || ( extension == "VK_EXT_pipeline_protected_access" )
+           ( extension == "VK_NV_linear_color_attachment" ) || ( extension == "VK_KHR_shader_maximal_reconvergence" ) ||
+           ( extension == "VK_EXT_image_compression_control_swapchain" ) || ( extension == "VK_QCOM_image_processing" ) ||
+           ( extension == "VK_EXT_nested_command_buffer" ) || ( extension == "VK_EXT_external_memory_acquire_unmodified" ) ||
+           ( extension == "VK_EXT_extended_dynamic_state3" ) || ( extension == "VK_EXT_subpass_merge_feedback" ) ||
+           ( extension == "VK_EXT_shader_module_identifier" ) || ( extension == "VK_EXT_rasterization_order_attachment_access" ) ||
+           ( extension == "VK_NV_optical_flow" ) || ( extension == "VK_EXT_legacy_dithering" ) || ( extension == "VK_EXT_pipeline_protected_access" )
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
         || ( extension == "VK_ANDROID_external_format_resolve" )
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-        || ( extension == "VK_KHR_maintenance5" ) || ( extension == "VK_AMD_anti_lag" )
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        || ( extension == "VK_AMDX_dense_geometry_format" )
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-        || ( extension == "VK_KHR_present_id2" ) || ( extension == "VK_KHR_present_wait2" ) || ( extension == "VK_KHR_ray_tracing_position_fetch" ) ||
-           ( extension == "VK_EXT_shader_object" ) || ( extension == "VK_KHR_pipeline_binary" ) || ( extension == "VK_QCOM_tile_properties" ) ||
-           ( extension == "VK_SEC_amigo_profiling" ) || ( extension == "VK_KHR_swapchain_maintenance1" ) ||
-           ( extension == "VK_QCOM_multiview_per_view_viewports" ) || ( extension == "VK_NV_ray_tracing_invocation_reorder" ) ||
-           ( extension == "VK_NV_cooperative_vector" ) || ( extension == "VK_NV_extended_sparse_address_space" ) ||
-           ( extension == "VK_EXT_mutable_descriptor_type" ) || ( extension == "VK_EXT_legacy_vertex_attributes" ) ||
-           ( extension == "VK_ARM_shader_core_builtins" ) || ( extension == "VK_EXT_pipeline_library_group_handles" ) ||
-           ( extension == "VK_EXT_dynamic_rendering_unused_attachments" ) || ( extension == "VK_NV_low_latency2" ) ||
-           ( extension == "VK_KHR_cooperative_matrix" ) || ( extension == "VK_ARM_data_graph" ) || ( extension == "VK_QCOM_multiview_per_view_render_areas" ) ||
-           ( extension == "VK_KHR_compute_shader_derivatives" ) || ( extension == "VK_KHR_video_decode_av1" ) || ( extension == "VK_KHR_video_encode_av1" ) ||
-           ( extension == "VK_KHR_video_decode_vp9" ) || ( extension == "VK_KHR_video_maintenance1" ) || ( extension == "VK_NV_per_stage_descriptor_set" ) ||
-           ( extension == "VK_QCOM_image_processing2" ) || ( extension == "VK_QCOM_filter_cubic_weights" ) || ( extension == "VK_QCOM_ycbcr_degamma" ) ||
-           ( extension == "VK_QCOM_filter_cubic_clamp" ) || ( extension == "VK_EXT_attachment_feedback_loop_dynamic_state" ) ||
-           ( extension == "VK_KHR_vertex_attribute_divisor" ) || ( extension == "VK_KHR_load_store_op_none" ) ||
-           ( extension == "VK_KHR_unified_image_layouts" ) || ( extension == "VK_KHR_shader_float_controls2" )
+        || ( extension == "VK_KHR_maintenance5" ) || ( extension == "VK_KHR_ray_tracing_position_fetch" ) || ( extension == "VK_EXT_shader_object" ) ||
+           ( extension == "VK_QCOM_tile_properties" ) || ( extension == "VK_SEC_amigo_profiling" ) || ( extension == "VK_QCOM_multiview_per_view_viewports" ) ||
+           ( extension == "VK_NV_ray_tracing_invocation_reorder" ) || ( extension == "VK_NV_extended_sparse_address_space" ) ||
+           ( extension == "VK_EXT_mutable_descriptor_type" ) || ( extension == "VK_ARM_shader_core_builtins" ) ||
+           ( extension == "VK_EXT_pipeline_library_group_handles" ) || ( extension == "VK_EXT_dynamic_rendering_unused_attachments" ) ||
+           ( extension == "VK_NV_low_latency2" ) || ( extension == "VK_KHR_cooperative_matrix" ) ||
+           ( extension == "VK_QCOM_multiview_per_view_render_areas" ) || ( extension == "VK_KHR_video_decode_av1" ) ||
+           ( extension == "VK_KHR_video_maintenance1" ) || ( extension == "VK_NV_per_stage_descriptor_set" ) || ( extension == "VK_QCOM_image_processing2" ) ||
+           ( extension == "VK_QCOM_filter_cubic_weights" ) || ( extension == "VK_QCOM_ycbcr_degamma" ) || ( extension == "VK_QCOM_filter_cubic_clamp" ) ||
+           ( extension == "VK_EXT_attachment_feedback_loop_dynamic_state" ) || ( extension == "VK_KHR_vertex_attribute_divisor" ) ||
+           ( extension == "VK_KHR_load_store_op_none" ) || ( extension == "VK_KHR_shader_float_controls2" )
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
         || ( extension == "VK_QNX_external_memory_screen_buffer" )
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
         || ( extension == "VK_MSFT_layered_driver" ) || ( extension == "VK_KHR_index_type_uint8" ) || ( extension == "VK_KHR_line_rasterization" ) ||
            ( extension == "VK_KHR_calibrated_timestamps" ) || ( extension == "VK_KHR_shader_expect_assume" ) || ( extension == "VK_KHR_maintenance6" ) ||
-           ( extension == "VK_NV_descriptor_pool_overallocation" ) || ( extension == "VK_QCOM_tile_memory_heap" ) ||
-           ( extension == "VK_KHR_copy_memory_indirect" ) || ( extension == "VK_EXT_memory_decompression" ) ||
-           ( extension == "VK_KHR_video_encode_intra_refresh" ) || ( extension == "VK_KHR_video_encode_quantization_map" ) ||
-           ( extension == "VK_NV_raw_access_chains" ) || ( extension == "VK_NV_external_compute_queue" ) ||
-           ( extension == "VK_KHR_shader_relaxed_extended_instruction" ) || ( extension == "VK_NV_command_buffer_inheritance" ) ||
-           ( extension == "VK_KHR_maintenance7" ) || ( extension == "VK_NV_shader_atomic_float16_vector" ) ||
-           ( extension == "VK_EXT_shader_replicated_composites" ) || ( extension == "VK_EXT_shader_float8" ) ||
-           ( extension == "VK_NV_ray_tracing_validation" ) || ( extension == "VK_NV_cluster_acceleration_structure" ) ||
-           ( extension == "VK_NV_partitioned_acceleration_structure" ) || ( extension == "VK_EXT_device_generated_commands" ) ||
-           ( extension == "VK_KHR_maintenance8" ) || ( extension == "VK_MESA_image_alignment_control" ) || ( extension == "VK_KHR_shader_fma" ) ||
-           ( extension == "VK_EXT_ray_tracing_invocation_reorder" ) || ( extension == "VK_EXT_depth_clamp_control" ) ||
-           ( extension == "VK_KHR_maintenance9" ) || ( extension == "VK_KHR_video_maintenance2" )
-#if defined( VK_USE_PLATFORM_OHOS )
-        || ( extension == "VK_OHOS_native_buffer" )
-#endif /*VK_USE_PLATFORM_OHOS*/
-        || ( extension == "VK_HUAWEI_hdr_vivid" ) || ( extension == "VK_NV_cooperative_matrix2" ) || ( extension == "VK_ARM_pipeline_opacity_micromap" )
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-        || ( extension == "VK_EXT_external_memory_metal" )
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-        || ( extension == "VK_KHR_depth_clamp_zero_one" ) || ( extension == "VK_ARM_performance_counters_by_region" ) ||
-           ( extension == "VK_EXT_vertex_attribute_robustness" ) || ( extension == "VK_ARM_format_pack" ) ||
-           ( extension == "VK_VALVE_fragment_density_map_layered" ) || ( extension == "VK_KHR_robustness2" )
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-        || ( extension == "VK_NV_present_metering" )
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-        || ( extension == "VK_EXT_fragment_density_map_offset" ) || ( extension == "VK_EXT_zero_initialize_device_memory" ) ||
-           ( extension == "VK_KHR_present_mode_fifo_latest_ready" ) || ( extension == "VK_EXT_shader_64bit_indexing" ) ||
-           ( extension == "VK_EXT_custom_resolve" ) || ( extension == "VK_QCOM_data_graph_model" ) || ( extension == "VK_KHR_maintenance10" ) ||
-           ( extension == "VK_SEC_pipeline_cache_incremental_mode" ) || ( extension == "VK_EXT_shader_uniform_buffer_unsized_array" );
+           ( extension == "VK_NV_descriptor_pool_overallocation" ) || ( extension == "VK_NV_raw_access_chains" ) ||
+           ( extension == "VK_NV_shader_atomic_float16_vector" ) || ( extension == "VK_NV_ray_tracing_validation" );
   }
 
   VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 bool isInstanceExtension( std::string const & extension )
@@ -4047,12 +3129,7 @@ namespace VULKAN_HPP_NAMESPACE
         || ( extension == "VK_QNX_screen_surface" )
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
         || ( extension == "VK_KHR_portability_enumeration" ) || ( extension == "VK_GOOGLE_surfaceless_query" ) ||
-           ( extension == "VK_LUNARG_direct_driver_loading" ) || ( extension == "VK_KHR_surface_maintenance1" ) || ( extension == "VK_EXT_layer_settings" ) ||
-           ( extension == "VK_NV_display_stereo" )
-#if defined( VK_USE_PLATFORM_OHOS )
-        || ( extension == "VK_OHOS_surface" )
-#endif /*VK_USE_PLATFORM_OHOS*/
-      ;
+           ( extension == "VK_LUNARG_direct_driver_loading" ) || ( extension == "VK_EXT_layer_settings" );
   }
 
   VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 bool isObsoletedExtension( std::string const & extension )
@@ -4063,54 +3140,43 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 bool isPromotedExtension( std::string const & extension )
   {
     return ( extension == "VK_KHR_sampler_mirror_clamp_to_edge" ) || ( extension == "VK_EXT_debug_marker" ) || ( extension == "VK_AMD_draw_indirect_count" ) ||
-           ( extension == "VK_KHR_dynamic_rendering" ) || ( extension == "VK_KHR_multiview" )
+           ( extension == "VK_KHR_dynamic_rendering" ) || ( extension == "VK_KHR_multiview" ) ||
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-        || ( extension == "VK_NV_win32_keyed_mutex" )
+           ( extension == "VK_NV_win32_keyed_mutex" ) ||
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-        || ( extension == "VK_KHR_get_physical_device_properties2" ) || ( extension == "VK_KHR_device_group" ) ||
+           ( extension == "VK_KHR_get_physical_device_properties2" ) || ( extension == "VK_KHR_device_group" ) ||
            ( extension == "VK_KHR_shader_draw_parameters" ) || ( extension == "VK_EXT_texture_compression_astc_hdr" ) ||
-           ( extension == "VK_EXT_pipeline_robustness" ) || ( extension == "VK_KHR_maintenance1" ) || ( extension == "VK_KHR_device_group_creation" ) ||
+           ( extension == "VK_KHR_maintenance1" ) || ( extension == "VK_KHR_device_group_creation" ) ||
            ( extension == "VK_KHR_external_memory_capabilities" ) || ( extension == "VK_KHR_external_memory" ) ||
            ( extension == "VK_KHR_external_semaphore_capabilities" ) || ( extension == "VK_KHR_external_semaphore" ) ||
-           ( extension == "VK_KHR_push_descriptor" ) || ( extension == "VK_KHR_shader_float16_int8" ) || ( extension == "VK_KHR_16bit_storage" ) ||
-           ( extension == "VK_KHR_descriptor_update_template" ) || ( extension == "VK_KHR_imageless_framebuffer" ) ||
-           ( extension == "VK_KHR_create_renderpass2" ) || ( extension == "VK_KHR_external_fence_capabilities" ) || ( extension == "VK_KHR_external_fence" ) ||
-           ( extension == "VK_KHR_maintenance2" ) || ( extension == "VK_KHR_variable_pointers" ) || ( extension == "VK_KHR_dedicated_allocation" ) ||
-           ( extension == "VK_EXT_sampler_filter_minmax" ) || ( extension == "VK_KHR_storage_buffer_storage_class" ) ||
-           ( extension == "VK_EXT_inline_uniform_block" ) || ( extension == "VK_KHR_relaxed_block_layout" ) ||
-           ( extension == "VK_KHR_get_memory_requirements2" ) || ( extension == "VK_KHR_image_format_list" ) ||
-           ( extension == "VK_KHR_sampler_ycbcr_conversion" ) || ( extension == "VK_KHR_bind_memory2" ) || ( extension == "VK_EXT_descriptor_indexing" ) ||
-           ( extension == "VK_EXT_shader_viewport_index_layer" ) || ( extension == "VK_KHR_maintenance3" ) || ( extension == "VK_KHR_draw_indirect_count" ) ||
-           ( extension == "VK_QCOM_render_pass_shader_resolve" ) || ( extension == "VK_EXT_global_priority" ) ||
+           ( extension == "VK_KHR_shader_float16_int8" ) || ( extension == "VK_KHR_16bit_storage" ) || ( extension == "VK_KHR_descriptor_update_template" ) ||
+           ( extension == "VK_KHR_imageless_framebuffer" ) || ( extension == "VK_KHR_create_renderpass2" ) ||
+           ( extension == "VK_KHR_external_fence_capabilities" ) || ( extension == "VK_KHR_external_fence" ) || ( extension == "VK_KHR_maintenance2" ) ||
+           ( extension == "VK_KHR_variable_pointers" ) || ( extension == "VK_KHR_dedicated_allocation" ) || ( extension == "VK_EXT_sampler_filter_minmax" ) ||
+           ( extension == "VK_KHR_storage_buffer_storage_class" ) || ( extension == "VK_EXT_inline_uniform_block" ) ||
+           ( extension == "VK_KHR_relaxed_block_layout" ) || ( extension == "VK_KHR_get_memory_requirements2" ) ||
+           ( extension == "VK_KHR_image_format_list" ) || ( extension == "VK_KHR_sampler_ycbcr_conversion" ) || ( extension == "VK_KHR_bind_memory2" ) ||
+           ( extension == "VK_EXT_descriptor_indexing" ) || ( extension == "VK_EXT_shader_viewport_index_layer" ) || ( extension == "VK_KHR_maintenance3" ) ||
+           ( extension == "VK_KHR_draw_indirect_count" ) || ( extension == "VK_EXT_global_priority" ) ||
            ( extension == "VK_KHR_shader_subgroup_extended_types" ) || ( extension == "VK_KHR_8bit_storage" ) ||
-           ( extension == "VK_KHR_shader_atomic_int64" ) || ( extension == "VK_EXT_calibrated_timestamps" ) || ( extension == "VK_KHR_global_priority" ) ||
+           ( extension == "VK_KHR_shader_atomic_int64" ) || ( extension == "VK_EXT_calibrated_timestamps" ) ||
            ( extension == "VK_EXT_vertex_attribute_divisor" ) || ( extension == "VK_EXT_pipeline_creation_feedback" ) ||
            ( extension == "VK_KHR_driver_properties" ) || ( extension == "VK_KHR_shader_float_controls" ) || ( extension == "VK_KHR_depth_stencil_resolve" ) ||
-           ( extension == "VK_NV_compute_shader_derivatives" ) || ( extension == "VK_NV_fragment_shader_barycentric" ) ||
-           ( extension == "VK_KHR_timeline_semaphore" ) || ( extension == "VK_KHR_vulkan_memory_model" ) ||
-           ( extension == "VK_KHR_shader_terminate_invocation" ) || ( extension == "VK_EXT_scalar_block_layout" ) ||
-           ( extension == "VK_EXT_subgroup_size_control" ) || ( extension == "VK_KHR_dynamic_rendering_local_read" ) || ( extension == "VK_KHR_spirv_1_4" ) ||
+           ( extension == "VK_NV_fragment_shader_barycentric" ) || ( extension == "VK_KHR_timeline_semaphore" ) ||
+           ( extension == "VK_KHR_vulkan_memory_model" ) || ( extension == "VK_KHR_shader_terminate_invocation" ) ||
+           ( extension == "VK_EXT_scalar_block_layout" ) || ( extension == "VK_EXT_subgroup_size_control" ) || ( extension == "VK_KHR_spirv_1_4" ) ||
            ( extension == "VK_KHR_separate_depth_stencil_layouts" ) || ( extension == "VK_EXT_tooling_info" ) ||
            ( extension == "VK_EXT_separate_stencil_usage" ) || ( extension == "VK_KHR_uniform_buffer_standard_layout" ) ||
            ( extension == "VK_KHR_buffer_device_address" ) || ( extension == "VK_EXT_line_rasterization" ) || ( extension == "VK_EXT_host_query_reset" ) ||
-           ( extension == "VK_EXT_index_type_uint8" ) || ( extension == "VK_EXT_extended_dynamic_state" ) || ( extension == "VK_EXT_host_image_copy" ) ||
-           ( extension == "VK_KHR_map_memory2" ) || ( extension == "VK_EXT_surface_maintenance1" ) || ( extension == "VK_EXT_swapchain_maintenance1" ) ||
+           ( extension == "VK_EXT_index_type_uint8" ) || ( extension == "VK_EXT_extended_dynamic_state" ) ||
            ( extension == "VK_EXT_shader_demote_to_helper_invocation" ) || ( extension == "VK_KHR_shader_integer_dot_product" ) ||
-           ( extension == "VK_EXT_texel_buffer_alignment" ) || ( extension == "VK_EXT_robustness2" ) || ( extension == "VK_KHR_shader_non_semantic_info" ) ||
-           ( extension == "VK_EXT_private_data" ) || ( extension == "VK_EXT_pipeline_creation_cache_control" ) || ( extension == "VK_KHR_synchronization2" ) ||
+           ( extension == "VK_EXT_texel_buffer_alignment" ) || ( extension == "VK_KHR_shader_non_semantic_info" ) || ( extension == "VK_EXT_private_data" ) ||
+           ( extension == "VK_EXT_pipeline_creation_cache_control" ) || ( extension == "VK_KHR_synchronization2" ) ||
            ( extension == "VK_KHR_zero_initialize_workgroup_memory" ) || ( extension == "VK_EXT_ycbcr_2plane_444_formats" ) ||
            ( extension == "VK_EXT_image_robustness" ) || ( extension == "VK_KHR_copy_commands2" ) || ( extension == "VK_EXT_4444_formats" ) ||
            ( extension == "VK_ARM_rasterization_order_attachment_access" ) || ( extension == "VK_VALVE_mutable_descriptor_type" ) ||
-           ( extension == "VK_KHR_format_feature_flags2" ) || ( extension == "VK_EXT_present_mode_fifo_latest_ready" ) ||
-           ( extension == "VK_EXT_extended_dynamic_state2" ) || ( extension == "VK_EXT_global_priority_query" ) ||
-           ( extension == "VK_EXT_load_store_op_none" ) || ( extension == "VK_KHR_maintenance4" ) || ( extension == "VK_KHR_shader_subgroup_rotate" ) ||
-           ( extension == "VK_EXT_depth_clamp_zero_one" ) || ( extension == "VK_QCOM_fragment_density_map_offset" ) ||
-           ( extension == "VK_NV_copy_memory_indirect" ) || ( extension == "VK_NV_memory_decompression" ) ||
-           ( extension == "VK_EXT_pipeline_protected_access" ) || ( extension == "VK_KHR_maintenance5" ) ||
-           ( extension == "VK_NV_ray_tracing_invocation_reorder" ) || ( extension == "VK_KHR_vertex_attribute_divisor" ) ||
-           ( extension == "VK_KHR_load_store_op_none" ) || ( extension == "VK_KHR_shader_float_controls2" ) || ( extension == "VK_KHR_index_type_uint8" ) ||
-           ( extension == "VK_KHR_line_rasterization" ) || ( extension == "VK_KHR_shader_expect_assume" ) || ( extension == "VK_KHR_maintenance6" ) ||
-           ( extension == "VK_EXT_vertex_attribute_robustness" );
+           ( extension == "VK_KHR_format_feature_flags2" ) || ( extension == "VK_EXT_extended_dynamic_state2" ) ||
+           ( extension == "VK_EXT_global_priority_query" ) || ( extension == "VK_EXT_load_store_op_none" ) || ( extension == "VK_KHR_maintenance4" );
   }
 }  // namespace VULKAN_HPP_NAMESPACE
 
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_format_traits.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_format_traits.hpp
index 5e574170..25790fdc 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_format_traits.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_format_traits.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -12,2250 +12,2019 @@
 
 namespace VULKAN_HPP_NAMESPACE
 {
+
   //=====================
   //=== Format Traits ===
   //=====================
 
-  //=== Function Declarations ===
-
   // The three-dimensional extent of a texel block.
-  VULKAN_HPP_CONSTEXPR_14 std::array<uint8_t, 3> blockExtent( Format format );
-
-  // The texel block size in bytes.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t blockSize( Format format );
-
-  // The class of the format (can't be just named "class"!)
-  VULKAN_HPP_CONSTEXPR_14 char const * compatibilityClass( Format format );
-
-  // The number of bits in this component, if not compressed, otherwise 0.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t componentBits( Format format, uint8_t component );
-
-  // The number of components of this format.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t componentCount( Format format );
-
-  // The name of the component
-  VULKAN_HPP_CONSTEXPR_14 char const * componentName( Format format, uint8_t component );
-
-  // The numeric format of the component
-  VULKAN_HPP_CONSTEXPR_14 char const * componentNumericFormat( Format format, uint8_t component );
-
-  // The plane this component lies in.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t componentPlaneIndex( Format format, uint8_t component );
-
-  // True, if the components of this format are compressed, otherwise false.
-  VULKAN_HPP_CONSTEXPR_14 bool componentsAreCompressed( Format format );
-
-  // A textual description of the compression scheme, or an empty string if it is not compressed
-  VULKAN_HPP_CONSTEXPR_14 char const * compressionScheme( Format format );
-
-  // Get all formats
-  std::vector<Format> const & getAllFormats();
-
-  // Get all color with a color component
-  std::vector<Format> const & getColorFormats();
-
-  // Get all formats with a depth component
-  std::vector<Format> const & getDepthFormats();
-
-  // Get all formats with a depth and a stencil component
-  std::vector<Format> const & getDepthStencilFormats();
-
-  // Get all formats with a stencil component
-  std::vector<Format> const & getStencilFormats();
-
-  // True, if this format has an alpha component
-  VULKAN_HPP_CONSTEXPR_14 bool hasAlphaComponent( Format format );
-
-  // True, if this format has a blue component
-  VULKAN_HPP_CONSTEXPR_14 bool hasBlueComponent( Format format );
-
-  // True, if this format has a depth component
-  VULKAN_HPP_CONSTEXPR_14 bool hasDepthComponent( Format format );
-
-  // True, if this format has a green component
-  VULKAN_HPP_CONSTEXPR_14 bool hasGreenComponent( Format format );
-
-  // True, if this format has a red component
-  VULKAN_HPP_CONSTEXPR_14 bool hasRedComponent( Format format );
-
-  // True, if this format has a stencil component
-  VULKAN_HPP_CONSTEXPR_14 bool hasStencilComponent( Format format );
-
-  // True, if the format is a color
-  VULKAN_HPP_CONSTEXPR_14 bool isColor( Format format );
-
-  // True, if this format is a compressed one.
-  VULKAN_HPP_CONSTEXPR_14 bool isCompressed( Format format );
-
-  // The number of bits into which the format is packed. A single image element in this format can be stored in the same space as a scalar type of this bit
-  // width.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t packed( Format format );
-
-  // The single-plane format that this plane is compatible with.
-  VULKAN_HPP_CONSTEXPR_14 Format planeCompatibleFormat( Format format, uint8_t plane );
-
-  // The number of image planes of this format.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t planeCount( Format format );
-
-  // The relative height of this plane. A value of k means that this plane is 1/k the height of the overall format.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t planeHeightDivisor( Format format, uint8_t plane );
-
-  // The relative width of this plane. A value of k means that this plane is 1/k the width of the overall format.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t planeWidthDivisor( Format format, uint8_t plane );
-
-  // The number of texels in a texel block.
-  VULKAN_HPP_CONSTEXPR_14 uint8_t texelsPerBlock( Format format );
-
-  //=== Function Definitions ===
-
-  // The three-dimensional extent of a texel block.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 std::array<uint8_t, 3> blockExtent( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 std::array<uint8_t, 3> blockExtent( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eBc1RgbUnormBlock                   : return { { 4, 4, 1 } };
-      case Format::eBc1RgbSrgbBlock                    : return { { 4, 4, 1 } };
-      case Format::eBc1RgbaUnormBlock                  : return { { 4, 4, 1 } };
-      case Format::eBc1RgbaSrgbBlock                   : return { { 4, 4, 1 } };
-      case Format::eBc2UnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc2SrgbBlock                       : return { { 4, 4, 1 } };
-      case Format::eBc3UnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc3SrgbBlock                       : return { { 4, 4, 1 } };
-      case Format::eBc4UnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc4SnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc5UnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc5SnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc6HUfloatBlock                    : return { { 4, 4, 1 } };
-      case Format::eBc6HSfloatBlock                    : return { { 4, 4, 1 } };
-      case Format::eBc7UnormBlock                      : return { { 4, 4, 1 } };
-      case Format::eBc7SrgbBlock                       : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8UnormBlock               : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8SrgbBlock                : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8A1UnormBlock             : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8A1SrgbBlock              : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8A8UnormBlock             : return { { 4, 4, 1 } };
-      case Format::eEtc2R8G8B8A8SrgbBlock              : return { { 4, 4, 1 } };
-      case Format::eEacR11UnormBlock                   : return { { 4, 4, 1 } };
-      case Format::eEacR11SnormBlock                   : return { { 4, 4, 1 } };
-      case Format::eEacR11G11UnormBlock                : return { { 4, 4, 1 } };
-      case Format::eEacR11G11SnormBlock                : return { { 4, 4, 1 } };
-      case Format::eAstc4x4UnormBlock                  : return { { 4, 4, 1 } };
-      case Format::eAstc4x4SrgbBlock                   : return { { 4, 4, 1 } };
-      case Format::eAstc5x4UnormBlock                  : return { { 5, 4, 1 } };
-      case Format::eAstc5x4SrgbBlock                   : return { { 5, 4, 1 } };
-      case Format::eAstc5x5UnormBlock                  : return { { 5, 5, 1 } };
-      case Format::eAstc5x5SrgbBlock                   : return { { 5, 5, 1 } };
-      case Format::eAstc6x5UnormBlock                  : return { { 6, 5, 1 } };
-      case Format::eAstc6x5SrgbBlock                   : return { { 6, 5, 1 } };
-      case Format::eAstc6x6UnormBlock                  : return { { 6, 6, 1 } };
-      case Format::eAstc6x6SrgbBlock                   : return { { 6, 6, 1 } };
-      case Format::eAstc8x5UnormBlock                  : return { { 8, 5, 1 } };
-      case Format::eAstc8x5SrgbBlock                   : return { { 8, 5, 1 } };
-      case Format::eAstc8x6UnormBlock                  : return { { 8, 6, 1 } };
-      case Format::eAstc8x6SrgbBlock                   : return { { 8, 6, 1 } };
-      case Format::eAstc8x8UnormBlock                  : return { { 8, 8, 1 } };
-      case Format::eAstc8x8SrgbBlock                   : return { { 8, 8, 1 } };
-      case Format::eAstc10x5UnormBlock                 : return { { 10, 5, 1 } };
-      case Format::eAstc10x5SrgbBlock                  : return { { 10, 5, 1 } };
-      case Format::eAstc10x6UnormBlock                 : return { { 10, 6, 1 } };
-      case Format::eAstc10x6SrgbBlock                  : return { { 10, 6, 1 } };
-      case Format::eAstc10x8UnormBlock                 : return { { 10, 8, 1 } };
-      case Format::eAstc10x8SrgbBlock                  : return { { 10, 8, 1 } };
-      case Format::eAstc10x10UnormBlock                : return { { 10, 10, 1 } };
-      case Format::eAstc10x10SrgbBlock                 : return { { 10, 10, 1 } };
-      case Format::eAstc12x10UnormBlock                : return { { 12, 10, 1 } };
-      case Format::eAstc12x10SrgbBlock                 : return { { 12, 10, 1 } };
-      case Format::eAstc12x12UnormBlock                : return { { 12, 12, 1 } };
-      case Format::eAstc12x12SrgbBlock                 : return { { 12, 12, 1 } };
-      case Format::eG8B8G8R8422Unorm                   : return { { 2, 1, 1 } };
-      case Format::eB8G8R8G8422Unorm                   : return { { 2, 1, 1 } };
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return { { 2, 1, 1 } };
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return { { 2, 1, 1 } };
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return { { 2, 1, 1 } };
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return { { 2, 1, 1 } };
-      case Format::eG16B16G16R16422Unorm               : return { { 2, 1, 1 } };
-      case Format::eB16G16R16G16422Unorm               : return { { 2, 1, 1 } };
-      case Format::eAstc4x4SfloatBlock                 : return { { 4, 4, 1 } };
-      case Format::eAstc5x4SfloatBlock                 : return { { 5, 4, 1 } };
-      case Format::eAstc5x5SfloatBlock                 : return { { 5, 5, 1 } };
-      case Format::eAstc6x5SfloatBlock                 : return { { 6, 5, 1 } };
-      case Format::eAstc6x6SfloatBlock                 : return { { 6, 6, 1 } };
-      case Format::eAstc8x5SfloatBlock                 : return { { 8, 5, 1 } };
-      case Format::eAstc8x6SfloatBlock                 : return { { 8, 6, 1 } };
-      case Format::eAstc8x8SfloatBlock                 : return { { 8, 8, 1 } };
-      case Format::eAstc10x5SfloatBlock                : return { { 10, 5, 1 } };
-      case Format::eAstc10x6SfloatBlock                : return { { 10, 6, 1 } };
-      case Format::eAstc10x8SfloatBlock                : return { { 10, 8, 1 } };
-      case Format::eAstc10x10SfloatBlock               : return { { 10, 10, 1 } };
-      case Format::eAstc12x10SfloatBlock               : return { { 12, 10, 1 } };
-      case Format::eAstc12x12SfloatBlock               : return { { 12, 12, 1 } };
-      case Format::ePvrtc12BppUnormBlockIMG            : return { { 8, 4, 1 } };
-      case Format::ePvrtc14BppUnormBlockIMG            : return { { 4, 4, 1 } };
-      case Format::ePvrtc22BppUnormBlockIMG            : return { { 8, 4, 1 } };
-      case Format::ePvrtc24BppUnormBlockIMG            : return { { 4, 4, 1 } };
-      case Format::ePvrtc12BppSrgbBlockIMG             : return { { 8, 4, 1 } };
-      case Format::ePvrtc14BppSrgbBlockIMG             : return { { 4, 4, 1 } };
-      case Format::ePvrtc22BppSrgbBlockIMG             : return { { 8, 4, 1 } };
-      case Format::ePvrtc24BppSrgbBlockIMG             : return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return { { 5, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return { { 5, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return { { 5, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return { { 5, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return { { 6, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return { { 6, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return { { 6, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return { { 6, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return { { 8, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return { { 8, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return { { 8, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return { { 8, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return { { 8, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return { { 8, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return { { 10, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return { { 10, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return { { 10, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return { { 10, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return { { 10, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return { { 10, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return { { 10, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return { { 10, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return { { 12, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return { { 12, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return { { 12, 12, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return { { 12, 12, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm: return { { 2, 1, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return { { 5, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return { { 5, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return { { 6, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return { { 6, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return { { 8, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return { { 8, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return { { 8, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return { { 10, 5, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return { { 10, 6, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return { { 10, 8, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return { { 10, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return { { 12, 10, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return { { 12, 12, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return { { 8, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return { { 8, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return { { 8, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return { { 4, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return { { 8, 4, 1 } };
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return { { 4, 4, 1 } };
 
       default: return { { 1, 1, 1 } };
     }
   }
 
   // The texel block size in bytes.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t blockSize( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t blockSize( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8                         : return 1;
-      case Format::eR4G4B4A4UnormPack16                    : return 2;
-      case Format::eB4G4R4A4UnormPack16                    : return 2;
-      case Format::eR5G6B5UnormPack16                      : return 2;
-      case Format::eB5G6R5UnormPack16                      : return 2;
-      case Format::eR5G5B5A1UnormPack16                    : return 2;
-      case Format::eB5G5R5A1UnormPack16                    : return 2;
-      case Format::eA1R5G5B5UnormPack16                    : return 2;
-      case Format::eR8Unorm                                : return 1;
-      case Format::eR8Snorm                                : return 1;
-      case Format::eR8Uscaled                              : return 1;
-      case Format::eR8Sscaled                              : return 1;
-      case Format::eR8Uint                                 : return 1;
-      case Format::eR8Sint                                 : return 1;
-      case Format::eR8Srgb                                 : return 1;
-      case Format::eR8G8Unorm                              : return 2;
-      case Format::eR8G8Snorm                              : return 2;
-      case Format::eR8G8Uscaled                            : return 2;
-      case Format::eR8G8Sscaled                            : return 2;
-      case Format::eR8G8Uint                               : return 2;
-      case Format::eR8G8Sint                               : return 2;
-      case Format::eR8G8Srgb                               : return 2;
-      case Format::eR8G8B8Unorm                            : return 3;
-      case Format::eR8G8B8Snorm                            : return 3;
-      case Format::eR8G8B8Uscaled                          : return 3;
-      case Format::eR8G8B8Sscaled                          : return 3;
-      case Format::eR8G8B8Uint                             : return 3;
-      case Format::eR8G8B8Sint                             : return 3;
-      case Format::eR8G8B8Srgb                             : return 3;
-      case Format::eB8G8R8Unorm                            : return 3;
-      case Format::eB8G8R8Snorm                            : return 3;
-      case Format::eB8G8R8Uscaled                          : return 3;
-      case Format::eB8G8R8Sscaled                          : return 3;
-      case Format::eB8G8R8Uint                             : return 3;
-      case Format::eB8G8R8Sint                             : return 3;
-      case Format::eB8G8R8Srgb                             : return 3;
-      case Format::eR8G8B8A8Unorm                          : return 4;
-      case Format::eR8G8B8A8Snorm                          : return 4;
-      case Format::eR8G8B8A8Uscaled                        : return 4;
-      case Format::eR8G8B8A8Sscaled                        : return 4;
-      case Format::eR8G8B8A8Uint                           : return 4;
-      case Format::eR8G8B8A8Sint                           : return 4;
-      case Format::eR8G8B8A8Srgb                           : return 4;
-      case Format::eB8G8R8A8Unorm                          : return 4;
-      case Format::eB8G8R8A8Snorm                          : return 4;
-      case Format::eB8G8R8A8Uscaled                        : return 4;
-      case Format::eB8G8R8A8Sscaled                        : return 4;
-      case Format::eB8G8R8A8Uint                           : return 4;
-      case Format::eB8G8R8A8Sint                           : return 4;
-      case Format::eB8G8R8A8Srgb                           : return 4;
-      case Format::eA8B8G8R8UnormPack32                    : return 4;
-      case Format::eA8B8G8R8SnormPack32                    : return 4;
-      case Format::eA8B8G8R8UscaledPack32                  : return 4;
-      case Format::eA8B8G8R8SscaledPack32                  : return 4;
-      case Format::eA8B8G8R8UintPack32                     : return 4;
-      case Format::eA8B8G8R8SintPack32                     : return 4;
-      case Format::eA8B8G8R8SrgbPack32                     : return 4;
-      case Format::eA2R10G10B10UnormPack32                 : return 4;
-      case Format::eA2R10G10B10SnormPack32                 : return 4;
-      case Format::eA2R10G10B10UscaledPack32               : return 4;
-      case Format::eA2R10G10B10SscaledPack32               : return 4;
-      case Format::eA2R10G10B10UintPack32                  : return 4;
-      case Format::eA2R10G10B10SintPack32                  : return 4;
-      case Format::eA2B10G10R10UnormPack32                 : return 4;
-      case Format::eA2B10G10R10SnormPack32                 : return 4;
-      case Format::eA2B10G10R10UscaledPack32               : return 4;
-      case Format::eA2B10G10R10SscaledPack32               : return 4;
-      case Format::eA2B10G10R10UintPack32                  : return 4;
-      case Format::eA2B10G10R10SintPack32                  : return 4;
-      case Format::eR16Unorm                               : return 2;
-      case Format::eR16Snorm                               : return 2;
-      case Format::eR16Uscaled                             : return 2;
-      case Format::eR16Sscaled                             : return 2;
-      case Format::eR16Uint                                : return 2;
-      case Format::eR16Sint                                : return 2;
-      case Format::eR16Sfloat                              : return 2;
-      case Format::eR16G16Unorm                            : return 4;
-      case Format::eR16G16Snorm                            : return 4;
-      case Format::eR16G16Uscaled                          : return 4;
-      case Format::eR16G16Sscaled                          : return 4;
-      case Format::eR16G16Uint                             : return 4;
-      case Format::eR16G16Sint                             : return 4;
-      case Format::eR16G16Sfloat                           : return 4;
-      case Format::eR16G16B16Unorm                         : return 6;
-      case Format::eR16G16B16Snorm                         : return 6;
-      case Format::eR16G16B16Uscaled                       : return 6;
-      case Format::eR16G16B16Sscaled                       : return 6;
-      case Format::eR16G16B16Uint                          : return 6;
-      case Format::eR16G16B16Sint                          : return 6;
-      case Format::eR16G16B16Sfloat                        : return 6;
-      case Format::eR16G16B16A16Unorm                      : return 8;
-      case Format::eR16G16B16A16Snorm                      : return 8;
-      case Format::eR16G16B16A16Uscaled                    : return 8;
-      case Format::eR16G16B16A16Sscaled                    : return 8;
-      case Format::eR16G16B16A16Uint                       : return 8;
-      case Format::eR16G16B16A16Sint                       : return 8;
-      case Format::eR16G16B16A16Sfloat                     : return 8;
-      case Format::eR32Uint                                : return 4;
-      case Format::eR32Sint                                : return 4;
-      case Format::eR32Sfloat                              : return 4;
-      case Format::eR32G32Uint                             : return 8;
-      case Format::eR32G32Sint                             : return 8;
-      case Format::eR32G32Sfloat                           : return 8;
-      case Format::eR32G32B32Uint                          : return 12;
-      case Format::eR32G32B32Sint                          : return 12;
-      case Format::eR32G32B32Sfloat                        : return 12;
-      case Format::eR32G32B32A32Uint                       : return 16;
-      case Format::eR32G32B32A32Sint                       : return 16;
-      case Format::eR32G32B32A32Sfloat                     : return 16;
-      case Format::eR64Uint                                : return 8;
-      case Format::eR64Sint                                : return 8;
-      case Format::eR64Sfloat                              : return 8;
-      case Format::eR64G64Uint                             : return 16;
-      case Format::eR64G64Sint                             : return 16;
-      case Format::eR64G64Sfloat                           : return 16;
-      case Format::eR64G64B64Uint                          : return 24;
-      case Format::eR64G64B64Sint                          : return 24;
-      case Format::eR64G64B64Sfloat                        : return 24;
-      case Format::eR64G64B64A64Uint                       : return 32;
-      case Format::eR64G64B64A64Sint                       : return 32;
-      case Format::eR64G64B64A64Sfloat                     : return 32;
-      case Format::eB10G11R11UfloatPack32                  : return 4;
-      case Format::eE5B9G9R9UfloatPack32                   : return 4;
-      case Format::eD16Unorm                               : return 2;
-      case Format::eX8D24UnormPack32                       : return 4;
-      case Format::eD32Sfloat                              : return 4;
-      case Format::eS8Uint                                 : return 1;
-      case Format::eD16UnormS8Uint                         : return 3;
-      case Format::eD24UnormS8Uint                         : return 4;
-      case Format::eD32SfloatS8Uint                        : return 5;
-      case Format::eBc1RgbUnormBlock                       : return 8;
-      case Format::eBc1RgbSrgbBlock                        : return 8;
-      case Format::eBc1RgbaUnormBlock                      : return 8;
-      case Format::eBc1RgbaSrgbBlock                       : return 8;
-      case Format::eBc2UnormBlock                          : return 16;
-      case Format::eBc2SrgbBlock                           : return 16;
-      case Format::eBc3UnormBlock                          : return 16;
-      case Format::eBc3SrgbBlock                           : return 16;
-      case Format::eBc4UnormBlock                          : return 8;
-      case Format::eBc4SnormBlock                          : return 8;
-      case Format::eBc5UnormBlock                          : return 16;
-      case Format::eBc5SnormBlock                          : return 16;
-      case Format::eBc6HUfloatBlock                        : return 16;
-      case Format::eBc6HSfloatBlock                        : return 16;
-      case Format::eBc7UnormBlock                          : return 16;
-      case Format::eBc7SrgbBlock                           : return 16;
-      case Format::eEtc2R8G8B8UnormBlock                   : return 8;
-      case Format::eEtc2R8G8B8SrgbBlock                    : return 8;
-      case Format::eEtc2R8G8B8A1UnormBlock                 : return 8;
-      case Format::eEtc2R8G8B8A1SrgbBlock                  : return 8;
-      case Format::eEtc2R8G8B8A8UnormBlock                 : return 16;
-      case Format::eEtc2R8G8B8A8SrgbBlock                  : return 16;
-      case Format::eEacR11UnormBlock                       : return 8;
-      case Format::eEacR11SnormBlock                       : return 8;
-      case Format::eEacR11G11UnormBlock                    : return 16;
-      case Format::eEacR11G11SnormBlock                    : return 16;
-      case Format::eAstc4x4UnormBlock                      : return 16;
-      case Format::eAstc4x4SrgbBlock                       : return 16;
-      case Format::eAstc5x4UnormBlock                      : return 16;
-      case Format::eAstc5x4SrgbBlock                       : return 16;
-      case Format::eAstc5x5UnormBlock                      : return 16;
-      case Format::eAstc5x5SrgbBlock                       : return 16;
-      case Format::eAstc6x5UnormBlock                      : return 16;
-      case Format::eAstc6x5SrgbBlock                       : return 16;
-      case Format::eAstc6x6UnormBlock                      : return 16;
-      case Format::eAstc6x6SrgbBlock                       : return 16;
-      case Format::eAstc8x5UnormBlock                      : return 16;
-      case Format::eAstc8x5SrgbBlock                       : return 16;
-      case Format::eAstc8x6UnormBlock                      : return 16;
-      case Format::eAstc8x6SrgbBlock                       : return 16;
-      case Format::eAstc8x8UnormBlock                      : return 16;
-      case Format::eAstc8x8SrgbBlock                       : return 16;
-      case Format::eAstc10x5UnormBlock                     : return 16;
-      case Format::eAstc10x5SrgbBlock                      : return 16;
-      case Format::eAstc10x6UnormBlock                     : return 16;
-      case Format::eAstc10x6SrgbBlock                      : return 16;
-      case Format::eAstc10x8UnormBlock                     : return 16;
-      case Format::eAstc10x8SrgbBlock                      : return 16;
-      case Format::eAstc10x10UnormBlock                    : return 16;
-      case Format::eAstc10x10SrgbBlock                     : return 16;
-      case Format::eAstc12x10UnormBlock                    : return 16;
-      case Format::eAstc12x10SrgbBlock                     : return 16;
-      case Format::eAstc12x12UnormBlock                    : return 16;
-      case Format::eAstc12x12SrgbBlock                     : return 16;
-      case Format::eG8B8G8R8422Unorm                       : return 4;
-      case Format::eB8G8R8G8422Unorm                       : return 4;
-      case Format::eG8B8R83Plane420Unorm                   : return 3;
-      case Format::eG8B8R82Plane420Unorm                   : return 3;
-      case Format::eG8B8R83Plane422Unorm                   : return 3;
-      case Format::eG8B8R82Plane422Unorm                   : return 3;
-      case Format::eG8B8R83Plane444Unorm                   : return 3;
-      case Format::eR10X6UnormPack16                       : return 2;
-      case Format::eR10X6G10X6Unorm2Pack16                 : return 4;
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return 8;
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return 8;
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return 8;
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return 6;
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return 6;
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return 6;
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return 6;
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return 6;
-      case Format::eR12X4UnormPack16                       : return 2;
-      case Format::eR12X4G12X4Unorm2Pack16                 : return 4;
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return 8;
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return 8;
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return 8;
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return 6;
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return 6;
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return 6;
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return 6;
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return 6;
-      case Format::eG16B16G16R16422Unorm                   : return 8;
-      case Format::eB16G16R16G16422Unorm                   : return 8;
-      case Format::eG16B16R163Plane420Unorm                : return 6;
-      case Format::eG16B16R162Plane420Unorm                : return 6;
-      case Format::eG16B16R163Plane422Unorm                : return 6;
-      case Format::eG16B16R162Plane422Unorm                : return 6;
-      case Format::eG16B16R163Plane444Unorm                : return 6;
-      case Format::eG8B8R82Plane444Unorm                   : return 3;
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return 6;
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return 6;
-      case Format::eG16B16R162Plane444Unorm                : return 6;
-      case Format::eA4R4G4B4UnormPack16                    : return 2;
-      case Format::eA4B4G4R4UnormPack16                    : return 2;
-      case Format::eAstc4x4SfloatBlock                     : return 16;
-      case Format::eAstc5x4SfloatBlock                     : return 16;
-      case Format::eAstc5x5SfloatBlock                     : return 16;
-      case Format::eAstc6x5SfloatBlock                     : return 16;
-      case Format::eAstc6x6SfloatBlock                     : return 16;
-      case Format::eAstc8x5SfloatBlock                     : return 16;
-      case Format::eAstc8x6SfloatBlock                     : return 16;
-      case Format::eAstc8x8SfloatBlock                     : return 16;
-      case Format::eAstc10x5SfloatBlock                    : return 16;
-      case Format::eAstc10x6SfloatBlock                    : return 16;
-      case Format::eAstc10x8SfloatBlock                    : return 16;
-      case Format::eAstc10x10SfloatBlock                   : return 16;
-      case Format::eAstc12x10SfloatBlock                   : return 16;
-      case Format::eAstc12x12SfloatBlock                   : return 16;
-      case Format::eA1B5G5R5UnormPack16                    : return 2;
-      case Format::eA8Unorm                                : return 1;
-      case Format::ePvrtc12BppUnormBlockIMG                : return 8;
-      case Format::ePvrtc14BppUnormBlockIMG                : return 8;
-      case Format::ePvrtc22BppUnormBlockIMG                : return 8;
-      case Format::ePvrtc24BppUnormBlockIMG                : return 8;
-      case Format::ePvrtc12BppSrgbBlockIMG                 : return 8;
-      case Format::ePvrtc14BppSrgbBlockIMG                 : return 8;
-      case Format::ePvrtc22BppSrgbBlockIMG                 : return 8;
-      case Format::ePvrtc24BppSrgbBlockIMG                 : return 8;
-      case Format::eR8BoolARM                              : return 1;
-      case Format::eR16G16Sfixed5NV                        : return 4;
-      case Format::eR10X6UintPack16ARM                     : return 2;
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return 4;
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return 8;
-      case Format::eR12X4UintPack16ARM                     : return 2;
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return 4;
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return 8;
-      case Format::eR14X2UintPack16ARM                     : return 2;
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return 4;
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return 8;
-      case Format::eR14X2UnormPack16ARM                    : return 2;
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return 4;
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return 8;
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return 6;
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint: return 12;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint: return 12;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat: return 12;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint: return 24;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint: return 24;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat: return 24;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint: return 5;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm: return 6;
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR: return 1;
 
       default: VULKAN_HPP_ASSERT( false ); return 0;
     }
   }
 
   // The class of the format (can't be just named "class"!)
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * compatibilityClass( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * compatibilityClass( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8                         : return "8-bit";
-      case Format::eR4G4B4A4UnormPack16                    : return "16-bit";
-      case Format::eB4G4R4A4UnormPack16                    : return "16-bit";
-      case Format::eR5G6B5UnormPack16                      : return "16-bit";
-      case Format::eB5G6R5UnormPack16                      : return "16-bit";
-      case Format::eR5G5B5A1UnormPack16                    : return "16-bit";
-      case Format::eB5G5R5A1UnormPack16                    : return "16-bit";
-      case Format::eA1R5G5B5UnormPack16                    : return "16-bit";
-      case Format::eR8Unorm                                : return "8-bit";
-      case Format::eR8Snorm                                : return "8-bit";
-      case Format::eR8Uscaled                              : return "8-bit";
-      case Format::eR8Sscaled                              : return "8-bit";
-      case Format::eR8Uint                                 : return "8-bit";
-      case Format::eR8Sint                                 : return "8-bit";
-      case Format::eR8Srgb                                 : return "8-bit";
-      case Format::eR8G8Unorm                              : return "16-bit";
-      case Format::eR8G8Snorm                              : return "16-bit";
-      case Format::eR8G8Uscaled                            : return "16-bit";
-      case Format::eR8G8Sscaled                            : return "16-bit";
-      case Format::eR8G8Uint                               : return "16-bit";
-      case Format::eR8G8Sint                               : return "16-bit";
-      case Format::eR8G8Srgb                               : return "16-bit";
-      case Format::eR8G8B8Unorm                            : return "24-bit";
-      case Format::eR8G8B8Snorm                            : return "24-bit";
-      case Format::eR8G8B8Uscaled                          : return "24-bit";
-      case Format::eR8G8B8Sscaled                          : return "24-bit";
-      case Format::eR8G8B8Uint                             : return "24-bit";
-      case Format::eR8G8B8Sint                             : return "24-bit";
-      case Format::eR8G8B8Srgb                             : return "24-bit";
-      case Format::eB8G8R8Unorm                            : return "24-bit";
-      case Format::eB8G8R8Snorm                            : return "24-bit";
-      case Format::eB8G8R8Uscaled                          : return "24-bit";
-      case Format::eB8G8R8Sscaled                          : return "24-bit";
-      case Format::eB8G8R8Uint                             : return "24-bit";
-      case Format::eB8G8R8Sint                             : return "24-bit";
-      case Format::eB8G8R8Srgb                             : return "24-bit";
-      case Format::eR8G8B8A8Unorm                          : return "32-bit";
-      case Format::eR8G8B8A8Snorm                          : return "32-bit";
-      case Format::eR8G8B8A8Uscaled                        : return "32-bit";
-      case Format::eR8G8B8A8Sscaled                        : return "32-bit";
-      case Format::eR8G8B8A8Uint                           : return "32-bit";
-      case Format::eR8G8B8A8Sint                           : return "32-bit";
-      case Format::eR8G8B8A8Srgb                           : return "32-bit";
-      case Format::eB8G8R8A8Unorm                          : return "32-bit";
-      case Format::eB8G8R8A8Snorm                          : return "32-bit";
-      case Format::eB8G8R8A8Uscaled                        : return "32-bit";
-      case Format::eB8G8R8A8Sscaled                        : return "32-bit";
-      case Format::eB8G8R8A8Uint                           : return "32-bit";
-      case Format::eB8G8R8A8Sint                           : return "32-bit";
-      case Format::eB8G8R8A8Srgb                           : return "32-bit";
-      case Format::eA8B8G8R8UnormPack32                    : return "32-bit";
-      case Format::eA8B8G8R8SnormPack32                    : return "32-bit";
-      case Format::eA8B8G8R8UscaledPack32                  : return "32-bit";
-      case Format::eA8B8G8R8SscaledPack32                  : return "32-bit";
-      case Format::eA8B8G8R8UintPack32                     : return "32-bit";
-      case Format::eA8B8G8R8SintPack32                     : return "32-bit";
-      case Format::eA8B8G8R8SrgbPack32                     : return "32-bit";
-      case Format::eA2R10G10B10UnormPack32                 : return "32-bit";
-      case Format::eA2R10G10B10SnormPack32                 : return "32-bit";
-      case Format::eA2R10G10B10UscaledPack32               : return "32-bit";
-      case Format::eA2R10G10B10SscaledPack32               : return "32-bit";
-      case Format::eA2R10G10B10UintPack32                  : return "32-bit";
-      case Format::eA2R10G10B10SintPack32                  : return "32-bit";
-      case Format::eA2B10G10R10UnormPack32                 : return "32-bit";
-      case Format::eA2B10G10R10SnormPack32                 : return "32-bit";
-      case Format::eA2B10G10R10UscaledPack32               : return "32-bit";
-      case Format::eA2B10G10R10SscaledPack32               : return "32-bit";
-      case Format::eA2B10G10R10UintPack32                  : return "32-bit";
-      case Format::eA2B10G10R10SintPack32                  : return "32-bit";
-      case Format::eR16Unorm                               : return "16-bit";
-      case Format::eR16Snorm                               : return "16-bit";
-      case Format::eR16Uscaled                             : return "16-bit";
-      case Format::eR16Sscaled                             : return "16-bit";
-      case Format::eR16Uint                                : return "16-bit";
-      case Format::eR16Sint                                : return "16-bit";
-      case Format::eR16Sfloat                              : return "16-bit";
-      case Format::eR16G16Unorm                            : return "32-bit";
-      case Format::eR16G16Snorm                            : return "32-bit";
-      case Format::eR16G16Uscaled                          : return "32-bit";
-      case Format::eR16G16Sscaled                          : return "32-bit";
-      case Format::eR16G16Uint                             : return "32-bit";
-      case Format::eR16G16Sint                             : return "32-bit";
-      case Format::eR16G16Sfloat                           : return "32-bit";
-      case Format::eR16G16B16Unorm                         : return "48-bit";
-      case Format::eR16G16B16Snorm                         : return "48-bit";
-      case Format::eR16G16B16Uscaled                       : return "48-bit";
-      case Format::eR16G16B16Sscaled                       : return "48-bit";
-      case Format::eR16G16B16Uint                          : return "48-bit";
-      case Format::eR16G16B16Sint                          : return "48-bit";
-      case Format::eR16G16B16Sfloat                        : return "48-bit";
-      case Format::eR16G16B16A16Unorm                      : return "64-bit";
-      case Format::eR16G16B16A16Snorm                      : return "64-bit";
-      case Format::eR16G16B16A16Uscaled                    : return "64-bit";
-      case Format::eR16G16B16A16Sscaled                    : return "64-bit";
-      case Format::eR16G16B16A16Uint                       : return "64-bit";
-      case Format::eR16G16B16A16Sint                       : return "64-bit";
-      case Format::eR16G16B16A16Sfloat                     : return "64-bit";
-      case Format::eR32Uint                                : return "32-bit";
-      case Format::eR32Sint                                : return "32-bit";
-      case Format::eR32Sfloat                              : return "32-bit";
-      case Format::eR32G32Uint                             : return "64-bit";
-      case Format::eR32G32Sint                             : return "64-bit";
-      case Format::eR32G32Sfloat                           : return "64-bit";
-      case Format::eR32G32B32Uint                          : return "96-bit";
-      case Format::eR32G32B32Sint                          : return "96-bit";
-      case Format::eR32G32B32Sfloat                        : return "96-bit";
-      case Format::eR32G32B32A32Uint                       : return "128-bit";
-      case Format::eR32G32B32A32Sint                       : return "128-bit";
-      case Format::eR32G32B32A32Sfloat                     : return "128-bit";
-      case Format::eR64Uint                                : return "64-bit";
-      case Format::eR64Sint                                : return "64-bit";
-      case Format::eR64Sfloat                              : return "64-bit";
-      case Format::eR64G64Uint                             : return "128-bit";
-      case Format::eR64G64Sint                             : return "128-bit";
-      case Format::eR64G64Sfloat                           : return "128-bit";
-      case Format::eR64G64B64Uint                          : return "192-bit";
-      case Format::eR64G64B64Sint                          : return "192-bit";
-      case Format::eR64G64B64Sfloat                        : return "192-bit";
-      case Format::eR64G64B64A64Uint                       : return "256-bit";
-      case Format::eR64G64B64A64Sint                       : return "256-bit";
-      case Format::eR64G64B64A64Sfloat                     : return "256-bit";
-      case Format::eB10G11R11UfloatPack32                  : return "32-bit";
-      case Format::eE5B9G9R9UfloatPack32                   : return "32-bit";
-      case Format::eD16Unorm                               : return "D16";
-      case Format::eX8D24UnormPack32                       : return "D24";
-      case Format::eD32Sfloat                              : return "D32";
-      case Format::eS8Uint                                 : return "S8";
-      case Format::eD16UnormS8Uint                         : return "D16S8";
-      case Format::eD24UnormS8Uint                         : return "D24S8";
-      case Format::eD32SfloatS8Uint                        : return "D32S8";
-      case Format::eBc1RgbUnormBlock                       : return "BC1_RGB";
-      case Format::eBc1RgbSrgbBlock                        : return "BC1_RGB";
-      case Format::eBc1RgbaUnormBlock                      : return "BC1_RGBA";
-      case Format::eBc1RgbaSrgbBlock                       : return "BC1_RGBA";
-      case Format::eBc2UnormBlock                          : return "BC2";
-      case Format::eBc2SrgbBlock                           : return "BC2";
-      case Format::eBc3UnormBlock                          : return "BC3";
-      case Format::eBc3SrgbBlock                           : return "BC3";
-      case Format::eBc4UnormBlock                          : return "BC4";
-      case Format::eBc4SnormBlock                          : return "BC4";
-      case Format::eBc5UnormBlock                          : return "BC5";
-      case Format::eBc5SnormBlock                          : return "BC5";
-      case Format::eBc6HUfloatBlock                        : return "BC6H";
-      case Format::eBc6HSfloatBlock                        : return "BC6H";
-      case Format::eBc7UnormBlock                          : return "BC7";
-      case Format::eBc7SrgbBlock                           : return "BC7";
-      case Format::eEtc2R8G8B8UnormBlock                   : return "ETC2_RGB";
-      case Format::eEtc2R8G8B8SrgbBlock                    : return "ETC2_RGB";
-      case Format::eEtc2R8G8B8A1UnormBlock                 : return "ETC2_RGBA";
-      case Format::eEtc2R8G8B8A1SrgbBlock                  : return "ETC2_RGBA";
-      case Format::eEtc2R8G8B8A8UnormBlock                 : return "ETC2_EAC_RGBA";
-      case Format::eEtc2R8G8B8A8SrgbBlock                  : return "ETC2_EAC_RGBA";
-      case Format::eEacR11UnormBlock                       : return "EAC_R";
-      case Format::eEacR11SnormBlock                       : return "EAC_R";
-      case Format::eEacR11G11UnormBlock                    : return "EAC_RG";
-      case Format::eEacR11G11SnormBlock                    : return "EAC_RG";
-      case Format::eAstc4x4UnormBlock                      : return "ASTC_4x4";
-      case Format::eAstc4x4SrgbBlock                       : return "ASTC_4x4";
-      case Format::eAstc5x4UnormBlock                      : return "ASTC_5x4";
-      case Format::eAstc5x4SrgbBlock                       : return "ASTC_5x4";
-      case Format::eAstc5x5UnormBlock                      : return "ASTC_5x5";
-      case Format::eAstc5x5SrgbBlock                       : return "ASTC_5x5";
-      case Format::eAstc6x5UnormBlock                      : return "ASTC_6x5";
-      case Format::eAstc6x5SrgbBlock                       : return "ASTC_6x5";
-      case Format::eAstc6x6UnormBlock                      : return "ASTC_6x6";
-      case Format::eAstc6x6SrgbBlock                       : return "ASTC_6x6";
-      case Format::eAstc8x5UnormBlock                      : return "ASTC_8x5";
-      case Format::eAstc8x5SrgbBlock                       : return "ASTC_8x5";
-      case Format::eAstc8x6UnormBlock                      : return "ASTC_8x6";
-      case Format::eAstc8x6SrgbBlock                       : return "ASTC_8x6";
-      case Format::eAstc8x8UnormBlock                      : return "ASTC_8x8";
-      case Format::eAstc8x8SrgbBlock                       : return "ASTC_8x8";
-      case Format::eAstc10x5UnormBlock                     : return "ASTC_10x5";
-      case Format::eAstc10x5SrgbBlock                      : return "ASTC_10x5";
-      case Format::eAstc10x6UnormBlock                     : return "ASTC_10x6";
-      case Format::eAstc10x6SrgbBlock                      : return "ASTC_10x6";
-      case Format::eAstc10x8UnormBlock                     : return "ASTC_10x8";
-      case Format::eAstc10x8SrgbBlock                      : return "ASTC_10x8";
-      case Format::eAstc10x10UnormBlock                    : return "ASTC_10x10";
-      case Format::eAstc10x10SrgbBlock                     : return "ASTC_10x10";
-      case Format::eAstc12x10UnormBlock                    : return "ASTC_12x10";
-      case Format::eAstc12x10SrgbBlock                     : return "ASTC_12x10";
-      case Format::eAstc12x12UnormBlock                    : return "ASTC_12x12";
-      case Format::eAstc12x12SrgbBlock                     : return "ASTC_12x12";
-      case Format::eG8B8G8R8422Unorm                       : return "32-bit G8B8G8R8";
-      case Format::eB8G8R8G8422Unorm                       : return "32-bit B8G8R8G8";
-      case Format::eG8B8R83Plane420Unorm                   : return "8-bit 3-plane 420";
-      case Format::eG8B8R82Plane420Unorm                   : return "8-bit 2-plane 420";
-      case Format::eG8B8R83Plane422Unorm                   : return "8-bit 3-plane 422";
-      case Format::eG8B8R82Plane422Unorm                   : return "8-bit 2-plane 422";
-      case Format::eG8B8R83Plane444Unorm                   : return "8-bit 3-plane 444";
-      case Format::eR10X6UnormPack16                       : return "16-bit";
-      case Format::eR10X6G10X6Unorm2Pack16                 : return "32-bit";
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return "64-bit R10G10B10A10";
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return "64-bit G10B10G10R10";
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return "64-bit B10G10R10G10";
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return "10-bit 3-plane 420";
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return "10-bit 2-plane 420";
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return "10-bit 3-plane 422";
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return "10-bit 2-plane 422";
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return "10-bit 3-plane 444";
-      case Format::eR12X4UnormPack16                       : return "16-bit";
-      case Format::eR12X4G12X4Unorm2Pack16                 : return "32-bit";
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return "64-bit R12G12B12A12";
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return "64-bit G12B12G12R12";
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return "64-bit B12G12R12G12";
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return "12-bit 3-plane 420";
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return "12-bit 2-plane 420";
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return "12-bit 3-plane 422";
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return "12-bit 2-plane 422";
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return "12-bit 3-plane 444";
-      case Format::eG16B16G16R16422Unorm                   : return "64-bit G16B16G16R16";
-      case Format::eB16G16R16G16422Unorm                   : return "64-bit B16G16R16G16";
-      case Format::eG16B16R163Plane420Unorm                : return "16-bit 3-plane 420";
-      case Format::eG16B16R162Plane420Unorm                : return "16-bit 2-plane 420";
-      case Format::eG16B16R163Plane422Unorm                : return "16-bit 3-plane 422";
-      case Format::eG16B16R162Plane422Unorm                : return "16-bit 2-plane 422";
-      case Format::eG16B16R163Plane444Unorm                : return "16-bit 3-plane 444";
-      case Format::eG8B8R82Plane444Unorm                   : return "8-bit 2-plane 444";
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return "10-bit 2-plane 444";
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return "12-bit 2-plane 444";
-      case Format::eG16B16R162Plane444Unorm                : return "16-bit 2-plane 444";
-      case Format::eA4R4G4B4UnormPack16                    : return "16-bit";
-      case Format::eA4B4G4R4UnormPack16                    : return "16-bit";
-      case Format::eAstc4x4SfloatBlock                     : return "ASTC_4x4";
-      case Format::eAstc5x4SfloatBlock                     : return "ASTC_5x4";
-      case Format::eAstc5x5SfloatBlock                     : return "ASTC_5x5";
-      case Format::eAstc6x5SfloatBlock                     : return "ASTC_6x5";
-      case Format::eAstc6x6SfloatBlock                     : return "ASTC_6x6";
-      case Format::eAstc8x5SfloatBlock                     : return "ASTC_8x5";
-      case Format::eAstc8x6SfloatBlock                     : return "ASTC_8x6";
-      case Format::eAstc8x8SfloatBlock                     : return "ASTC_8x8";
-      case Format::eAstc10x5SfloatBlock                    : return "ASTC_10x5";
-      case Format::eAstc10x6SfloatBlock                    : return "ASTC_10x6";
-      case Format::eAstc10x8SfloatBlock                    : return "ASTC_10x8";
-      case Format::eAstc10x10SfloatBlock                   : return "ASTC_10x10";
-      case Format::eAstc12x10SfloatBlock                   : return "ASTC_12x10";
-      case Format::eAstc12x12SfloatBlock                   : return "ASTC_12x12";
-      case Format::eA1B5G5R5UnormPack16                    : return "16-bit";
-      case Format::eA8Unorm                                : return "8-bit alpha";
-      case Format::ePvrtc12BppUnormBlockIMG                : return "PVRTC1_2BPP";
-      case Format::ePvrtc14BppUnormBlockIMG                : return "PVRTC1_4BPP";
-      case Format::ePvrtc22BppUnormBlockIMG                : return "PVRTC2_2BPP";
-      case Format::ePvrtc24BppUnormBlockIMG                : return "PVRTC2_4BPP";
-      case Format::ePvrtc12BppSrgbBlockIMG                 : return "PVRTC1_2BPP";
-      case Format::ePvrtc14BppSrgbBlockIMG                 : return "PVRTC1_4BPP";
-      case Format::ePvrtc22BppSrgbBlockIMG                 : return "PVRTC2_2BPP";
-      case Format::ePvrtc24BppSrgbBlockIMG                 : return "PVRTC2_4BPP";
-      case Format::eR8BoolARM                              : return "8-bit";
-      case Format::eR16G16Sfixed5NV                        : return "32-bit";
-      case Format::eR10X6UintPack16ARM                     : return "16-bit";
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return "32-bit";
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return "64-bit R10G10B10A10";
-      case Format::eR12X4UintPack16ARM                     : return "16-bit";
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return "32-bit";
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return "64-bit R12G12B12A12";
-      case Format::eR14X2UintPack16ARM                     : return "16-bit";
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return "32-bit";
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return "64-bit R14G14B14A14";
-      case Format::eR14X2UnormPack16ARM                    : return "16-bit";
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return "32-bit";
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return "64-bit R14G14B14A14";
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return "14-bit 2-plane 420";
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return "14-bit 2-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb: return "8-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb: return "24-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat: return "48-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint: return "96-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint: return "96-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat: return "96-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat: return "64-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat: return "128-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint: return "192-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint: return "192-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat: return "192-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint: return "256-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint: return "256-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat: return "256-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm: return "D16";
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32: return "D24";
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat: return "D32";
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint: return "S8";
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint: return "D16S8";
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint: return "D24S8";
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint: return "D32S8";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return "BC1_RGB";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return "BC1_RGB";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return "BC1_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return "BC1_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return "BC2";
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return "BC2";
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return "BC3";
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return "BC3";
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return "BC4";
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return "BC4";
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return "BC5";
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return "BC5";
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return "BC6H";
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return "BC6H";
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return "BC7";
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return "BC7";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return "ETC2_RGB";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return "ETC2_RGB";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return "ETC2_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return "ETC2_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return "ETC2_EAC_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return "ETC2_EAC_RGBA";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return "EAC_R";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return "EAC_R";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return "EAC_RG";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return "EAC_RG";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return "ASTC_4x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return "ASTC_4x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return "ASTC_5x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return "ASTC_5x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return "ASTC_5x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return "ASTC_5x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return "ASTC_6x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return "ASTC_6x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return "ASTC_6x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return "ASTC_6x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return "ASTC_8x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return "ASTC_8x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return "ASTC_8x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return "ASTC_8x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return "ASTC_8x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return "ASTC_8x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return "ASTC_10x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return "ASTC_10x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return "ASTC_10x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return "ASTC_10x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return "ASTC_10x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return "ASTC_10x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return "ASTC_10x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return "ASTC_10x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return "ASTC_12x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return "ASTC_12x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return "ASTC_12x12";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return "ASTC_12x12";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm: return "32-bit G8B8G8R8";
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm: return "32-bit B8G8R8G8";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm: return "8-bit 3-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm: return "8-bit 2-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm: return "8-bit 3-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm: return "8-bit 2-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm: return "8-bit 3-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return "64-bit R10G10B10A10";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return "64-bit G10B10G10R10";
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return "64-bit B10G10R10G10";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return "10-bit 3-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return "10-bit 2-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return "10-bit 3-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return "10-bit 2-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return "10-bit 3-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return "64-bit R12G12B12A12";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return "64-bit G12B12G12R12";
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return "64-bit B12G12R12G12";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return "12-bit 3-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return "12-bit 2-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return "12-bit 3-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return "12-bit 2-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return "12-bit 3-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm: return "64-bit G16B16G16R16";
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm: return "64-bit B16G16R16G16";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm: return "16-bit 3-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm: return "16-bit 2-plane 420";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm: return "16-bit 3-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm: return "16-bit 2-plane 422";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm: return "16-bit 3-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm: return "8-bit 2-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return "10-bit 2-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return "12-bit 2-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm: return "16-bit 2-plane 444";
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return "ASTC_4x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return "ASTC_5x4";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return "ASTC_5x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return "ASTC_6x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return "ASTC_6x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return "ASTC_8x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return "ASTC_8x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return "ASTC_8x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return "ASTC_10x5";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return "ASTC_10x6";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return "ASTC_10x8";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return "ASTC_10x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return "ASTC_12x10";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return "ASTC_12x12";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return "PVRTC1_2BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return "PVRTC1_4BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return "PVRTC2_2BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return "PVRTC2_4BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return "PVRTC1_2BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return "PVRTC1_4BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return "PVRTC2_2BPP";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return "PVRTC2_4BPP";
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV: return "32-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR: return "16-bit";
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR: return "8-bit alpha";
 
       default: VULKAN_HPP_ASSERT( false ); return "";
     }
   }
 
   // The number of bits in this component, if not compressed, otherwise 0.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentBits( Format format, uint8_t component )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentBits( VULKAN_HPP_NAMESPACE::Format format, uint8_t component )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8:
         switch ( component )
         {
-          case 0 : return 4;
-          case 1 : return 4;
+          case 0: return 4;
+          case 1: return 4;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR4G4B4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return 4;
-          case 1 : return 4;
-          case 2 : return 4;
-          case 3 : return 4;
+          case 0: return 4;
+          case 1: return 4;
+          case 2: return 4;
+          case 3: return 4;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB4G4R4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return 4;
-          case 1 : return 4;
-          case 2 : return 4;
-          case 3 : return 4;
+          case 0: return 4;
+          case 1: return 4;
+          case 2: return 4;
+          case 3: return 4;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR5G6B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16:
         switch ( component )
         {
-          case 0 : return 5;
-          case 1 : return 6;
-          case 2 : return 5;
+          case 0: return 5;
+          case 1: return 6;
+          case 2: return 5;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB5G6R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16:
         switch ( component )
         {
-          case 0 : return 5;
-          case 1 : return 6;
-          case 2 : return 5;
+          case 0: return 5;
+          case 1: return 6;
+          case 2: return 5;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR5G5B5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return 5;
-          case 1 : return 5;
-          case 2 : return 5;
-          case 3 : return 1;
+          case 0: return 5;
+          case 1: return 5;
+          case 2: return 5;
+          case 3: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB5G5R5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return 5;
-          case 1 : return 5;
-          case 2 : return 5;
-          case 3 : return 1;
+          case 0: return 5;
+          case 1: return 5;
+          case 2: return 5;
+          case 3: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA1R5G5B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16:
         switch ( component )
         {
-          case 0 : return 1;
-          case 1 : return 5;
-          case 2 : return 5;
-          case 3 : return 5;
+          case 0: return 1;
+          case 1: return 5;
+          case 2: return 5;
+          case 3: return 5;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
+          case 0: return 8;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8G8B8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8B8G8R8SrgbPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2R10G10B10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA2B10G10R10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32:
         switch ( component )
         {
-          case 0 : return 2;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 2;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR16G16B16A16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint:
         switch ( component )
         {
-          case 0 : return 32;
+          case 0: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint:
         switch ( component )
         {
-          case 0 : return 32;
+          case 0: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat:
         switch ( component )
         {
-          case 0 : return 32;
+          case 0: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
+          case 0: return 32;
+          case 1: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
+          case 0: return 32;
+          case 1: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
+          case 0: return 32;
+          case 1: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32A32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
-          case 3 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
+          case 3: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32A32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
-          case 3 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
+          case 3: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR32G32B32A32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 32;
-          case 2 : return 32;
-          case 3 : return 32;
+          case 0: return 32;
+          case 1: return 32;
+          case 2: return 32;
+          case 3: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint:
         switch ( component )
         {
-          case 0 : return 64;
+          case 0: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint:
         switch ( component )
         {
-          case 0 : return 64;
+          case 0: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat:
         switch ( component )
         {
-          case 0 : return 64;
+          case 0: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
+          case 0: return 64;
+          case 1: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
+          case 0: return 64;
+          case 1: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
+          case 0: return 64;
+          case 1: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64A64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
-          case 3 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
+          case 3: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64A64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
-          case 3 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
+          case 3: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR64G64B64A64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat:
         switch ( component )
         {
-          case 0 : return 64;
-          case 1 : return 64;
-          case 2 : return 64;
-          case 3 : return 64;
+          case 0: return 64;
+          case 1: return 64;
+          case 2: return 64;
+          case 3: return 64;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB10G11R11UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 11;
-          case 2 : return 11;
+          case 0: return 10;
+          case 1: return 11;
+          case 2: return 11;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eE5B9G9R9UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32:
         switch ( component )
         {
-          case 0 : return 9;
-          case 1 : return 9;
-          case 2 : return 9;
+          case 0: return 9;
+          case 1: return 9;
+          case 2: return 9;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eD16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm:
         switch ( component )
         {
-          case 0 : return 16;
+          case 0: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eX8D24UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32:
         switch ( component )
         {
-          case 0 : return 24;
+          case 0: return 24;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eD32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat:
         switch ( component )
         {
-          case 0 : return 32;
+          case 0: return 32;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eD16UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 8;
+          case 0: return 16;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eD24UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint:
         switch ( component )
         {
-          case 0 : return 24;
-          case 1 : return 8;
+          case 0: return 24;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eD32SfloatS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint:
         switch ( component )
         {
-          case 0 : return 32;
-          case 1 : return 8;
+          case 0: return 32;
+          case 1: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eEacR11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock:
         switch ( component )
         {
-          case 0 : return 11;
+          case 0: return 11;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eEacR11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock:
         switch ( component )
         {
-          case 0 : return 11;
+          case 0: return 11;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eEacR11G11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock:
         switch ( component )
         {
-          case 0 : return 11;
-          case 1 : return 11;
+          case 0: return 11;
+          case 1: return 11;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eEacR11G11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock:
         switch ( component )
         {
-          case 0 : return 11;
-          case 1 : return 11;
+          case 0: return 11;
+          case 1: return 11;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8G8R8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB8G8R8G8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
-          case 3 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
+          case 3: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR10X6UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16:
         switch ( component )
         {
-          case 0 : return 10;
+          case 0: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR10X6G10X6Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
+          case 0: return 10;
+          case 1: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
+          case 3: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR12X4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16:
         switch ( component )
         {
-          case 0 : return 12;
+          case 0: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR12X4G12X4Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
+          case 0: return 12;
+          case 1: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
-          case 3 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
+          case 3: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
-          case 3 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
+          case 3: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
-          case 3 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
+          case 3: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16G16R16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eB16G16R16G16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
-          case 3 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
+          case 3: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 8;
-          case 1 : return 8;
-          case 2 : return 8;
+          case 0: return 8;
+          case 1: return 8;
+          case 2: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
+          case 0: return 10;
+          case 1: return 10;
+          case 2: return 10;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
+          case 0: return 12;
+          case 1: return 12;
+          case 2: return 12;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 16;
-          case 1 : return 16;
-          case 2 : return 16;
+          case 0: return 16;
+          case 1: return 16;
+          case 2: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA4R4G4B4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16:
         switch ( component )
         {
-          case 0 : return 4;
-          case 1 : return 4;
-          case 2 : return 4;
-          case 3 : return 4;
+          case 0: return 4;
+          case 1: return 4;
+          case 2: return 4;
+          case 3: return 4;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA4B4G4R4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16:
         switch ( component )
         {
-          case 0 : return 4;
-          case 1 : return 4;
-          case 2 : return 4;
-          case 3 : return 4;
+          case 0: return 4;
+          case 1: return 4;
+          case 2: return 4;
+          case 3: return 4;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA1B5G5R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV:
         switch ( component )
         {
-          case 0 : return 1;
-          case 1 : return 5;
-          case 2 : return 5;
-          case 3 : return 5;
+          case 0: return 16;
+          case 1: return 16;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eA8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR:
         switch ( component )
         {
-          case 0 : return 8;
+          case 0: return 1;
+          case 1: return 5;
+          case 2: return 5;
+          case 3: return 5;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eR8BoolARM:
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR:
         switch ( component )
         {
-          case 0 : return 8;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR16G16Sfixed5NV:
-        switch ( component )
-        {
-          case 0 : return 16;
-          case 1 : return 16;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR10X6UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return 10;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR10X6G10X6Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 10;
-          case 1 : return 10;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 10;
-          case 1 : return 10;
-          case 2 : return 10;
-          case 3 : return 10;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR12X4UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return 12;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR12X4G12X4Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 12;
-          case 1 : return 12;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 12;
-          case 1 : return 12;
-          case 2 : return 12;
-          case 3 : return 12;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2G14X2Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          case 2 : return 14;
-          case 3 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2UnormPack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2G14X2Unorm2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          case 2 : return 14;
-          case 3 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          case 2 : return 14;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 14;
-          case 1 : return 14;
-          case 2 : return 14;
+          case 0: return 8;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
 
@@ -2264,2417 +2033,2292 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The number of components of this format.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentCount( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentCount( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8                         : return 2;
-      case Format::eR4G4B4A4UnormPack16                    : return 4;
-      case Format::eB4G4R4A4UnormPack16                    : return 4;
-      case Format::eR5G6B5UnormPack16                      : return 3;
-      case Format::eB5G6R5UnormPack16                      : return 3;
-      case Format::eR5G5B5A1UnormPack16                    : return 4;
-      case Format::eB5G5R5A1UnormPack16                    : return 4;
-      case Format::eA1R5G5B5UnormPack16                    : return 4;
-      case Format::eR8Unorm                                : return 1;
-      case Format::eR8Snorm                                : return 1;
-      case Format::eR8Uscaled                              : return 1;
-      case Format::eR8Sscaled                              : return 1;
-      case Format::eR8Uint                                 : return 1;
-      case Format::eR8Sint                                 : return 1;
-      case Format::eR8Srgb                                 : return 1;
-      case Format::eR8G8Unorm                              : return 2;
-      case Format::eR8G8Snorm                              : return 2;
-      case Format::eR8G8Uscaled                            : return 2;
-      case Format::eR8G8Sscaled                            : return 2;
-      case Format::eR8G8Uint                               : return 2;
-      case Format::eR8G8Sint                               : return 2;
-      case Format::eR8G8Srgb                               : return 2;
-      case Format::eR8G8B8Unorm                            : return 3;
-      case Format::eR8G8B8Snorm                            : return 3;
-      case Format::eR8G8B8Uscaled                          : return 3;
-      case Format::eR8G8B8Sscaled                          : return 3;
-      case Format::eR8G8B8Uint                             : return 3;
-      case Format::eR8G8B8Sint                             : return 3;
-      case Format::eR8G8B8Srgb                             : return 3;
-      case Format::eB8G8R8Unorm                            : return 3;
-      case Format::eB8G8R8Snorm                            : return 3;
-      case Format::eB8G8R8Uscaled                          : return 3;
-      case Format::eB8G8R8Sscaled                          : return 3;
-      case Format::eB8G8R8Uint                             : return 3;
-      case Format::eB8G8R8Sint                             : return 3;
-      case Format::eB8G8R8Srgb                             : return 3;
-      case Format::eR8G8B8A8Unorm                          : return 4;
-      case Format::eR8G8B8A8Snorm                          : return 4;
-      case Format::eR8G8B8A8Uscaled                        : return 4;
-      case Format::eR8G8B8A8Sscaled                        : return 4;
-      case Format::eR8G8B8A8Uint                           : return 4;
-      case Format::eR8G8B8A8Sint                           : return 4;
-      case Format::eR8G8B8A8Srgb                           : return 4;
-      case Format::eB8G8R8A8Unorm                          : return 4;
-      case Format::eB8G8R8A8Snorm                          : return 4;
-      case Format::eB8G8R8A8Uscaled                        : return 4;
-      case Format::eB8G8R8A8Sscaled                        : return 4;
-      case Format::eB8G8R8A8Uint                           : return 4;
-      case Format::eB8G8R8A8Sint                           : return 4;
-      case Format::eB8G8R8A8Srgb                           : return 4;
-      case Format::eA8B8G8R8UnormPack32                    : return 4;
-      case Format::eA8B8G8R8SnormPack32                    : return 4;
-      case Format::eA8B8G8R8UscaledPack32                  : return 4;
-      case Format::eA8B8G8R8SscaledPack32                  : return 4;
-      case Format::eA8B8G8R8UintPack32                     : return 4;
-      case Format::eA8B8G8R8SintPack32                     : return 4;
-      case Format::eA8B8G8R8SrgbPack32                     : return 4;
-      case Format::eA2R10G10B10UnormPack32                 : return 4;
-      case Format::eA2R10G10B10SnormPack32                 : return 4;
-      case Format::eA2R10G10B10UscaledPack32               : return 4;
-      case Format::eA2R10G10B10SscaledPack32               : return 4;
-      case Format::eA2R10G10B10UintPack32                  : return 4;
-      case Format::eA2R10G10B10SintPack32                  : return 4;
-      case Format::eA2B10G10R10UnormPack32                 : return 4;
-      case Format::eA2B10G10R10SnormPack32                 : return 4;
-      case Format::eA2B10G10R10UscaledPack32               : return 4;
-      case Format::eA2B10G10R10SscaledPack32               : return 4;
-      case Format::eA2B10G10R10UintPack32                  : return 4;
-      case Format::eA2B10G10R10SintPack32                  : return 4;
-      case Format::eR16Unorm                               : return 1;
-      case Format::eR16Snorm                               : return 1;
-      case Format::eR16Uscaled                             : return 1;
-      case Format::eR16Sscaled                             : return 1;
-      case Format::eR16Uint                                : return 1;
-      case Format::eR16Sint                                : return 1;
-      case Format::eR16Sfloat                              : return 1;
-      case Format::eR16G16Unorm                            : return 2;
-      case Format::eR16G16Snorm                            : return 2;
-      case Format::eR16G16Uscaled                          : return 2;
-      case Format::eR16G16Sscaled                          : return 2;
-      case Format::eR16G16Uint                             : return 2;
-      case Format::eR16G16Sint                             : return 2;
-      case Format::eR16G16Sfloat                           : return 2;
-      case Format::eR16G16B16Unorm                         : return 3;
-      case Format::eR16G16B16Snorm                         : return 3;
-      case Format::eR16G16B16Uscaled                       : return 3;
-      case Format::eR16G16B16Sscaled                       : return 3;
-      case Format::eR16G16B16Uint                          : return 3;
-      case Format::eR16G16B16Sint                          : return 3;
-      case Format::eR16G16B16Sfloat                        : return 3;
-      case Format::eR16G16B16A16Unorm                      : return 4;
-      case Format::eR16G16B16A16Snorm                      : return 4;
-      case Format::eR16G16B16A16Uscaled                    : return 4;
-      case Format::eR16G16B16A16Sscaled                    : return 4;
-      case Format::eR16G16B16A16Uint                       : return 4;
-      case Format::eR16G16B16A16Sint                       : return 4;
-      case Format::eR16G16B16A16Sfloat                     : return 4;
-      case Format::eR32Uint                                : return 1;
-      case Format::eR32Sint                                : return 1;
-      case Format::eR32Sfloat                              : return 1;
-      case Format::eR32G32Uint                             : return 2;
-      case Format::eR32G32Sint                             : return 2;
-      case Format::eR32G32Sfloat                           : return 2;
-      case Format::eR32G32B32Uint                          : return 3;
-      case Format::eR32G32B32Sint                          : return 3;
-      case Format::eR32G32B32Sfloat                        : return 3;
-      case Format::eR32G32B32A32Uint                       : return 4;
-      case Format::eR32G32B32A32Sint                       : return 4;
-      case Format::eR32G32B32A32Sfloat                     : return 4;
-      case Format::eR64Uint                                : return 1;
-      case Format::eR64Sint                                : return 1;
-      case Format::eR64Sfloat                              : return 1;
-      case Format::eR64G64Uint                             : return 2;
-      case Format::eR64G64Sint                             : return 2;
-      case Format::eR64G64Sfloat                           : return 2;
-      case Format::eR64G64B64Uint                          : return 3;
-      case Format::eR64G64B64Sint                          : return 3;
-      case Format::eR64G64B64Sfloat                        : return 3;
-      case Format::eR64G64B64A64Uint                       : return 4;
-      case Format::eR64G64B64A64Sint                       : return 4;
-      case Format::eR64G64B64A64Sfloat                     : return 4;
-      case Format::eB10G11R11UfloatPack32                  : return 3;
-      case Format::eE5B9G9R9UfloatPack32                   : return 3;
-      case Format::eD16Unorm                               : return 1;
-      case Format::eX8D24UnormPack32                       : return 1;
-      case Format::eD32Sfloat                              : return 1;
-      case Format::eS8Uint                                 : return 1;
-      case Format::eD16UnormS8Uint                         : return 2;
-      case Format::eD24UnormS8Uint                         : return 2;
-      case Format::eD32SfloatS8Uint                        : return 2;
-      case Format::eBc1RgbUnormBlock                       : return 3;
-      case Format::eBc1RgbSrgbBlock                        : return 3;
-      case Format::eBc1RgbaUnormBlock                      : return 4;
-      case Format::eBc1RgbaSrgbBlock                       : return 4;
-      case Format::eBc2UnormBlock                          : return 4;
-      case Format::eBc2SrgbBlock                           : return 4;
-      case Format::eBc3UnormBlock                          : return 4;
-      case Format::eBc3SrgbBlock                           : return 4;
-      case Format::eBc4UnormBlock                          : return 1;
-      case Format::eBc4SnormBlock                          : return 1;
-      case Format::eBc5UnormBlock                          : return 2;
-      case Format::eBc5SnormBlock                          : return 2;
-      case Format::eBc6HUfloatBlock                        : return 3;
-      case Format::eBc6HSfloatBlock                        : return 3;
-      case Format::eBc7UnormBlock                          : return 4;
-      case Format::eBc7SrgbBlock                           : return 4;
-      case Format::eEtc2R8G8B8UnormBlock                   : return 3;
-      case Format::eEtc2R8G8B8SrgbBlock                    : return 3;
-      case Format::eEtc2R8G8B8A1UnormBlock                 : return 4;
-      case Format::eEtc2R8G8B8A1SrgbBlock                  : return 4;
-      case Format::eEtc2R8G8B8A8UnormBlock                 : return 4;
-      case Format::eEtc2R8G8B8A8SrgbBlock                  : return 4;
-      case Format::eEacR11UnormBlock                       : return 1;
-      case Format::eEacR11SnormBlock                       : return 1;
-      case Format::eEacR11G11UnormBlock                    : return 2;
-      case Format::eEacR11G11SnormBlock                    : return 2;
-      case Format::eAstc4x4UnormBlock                      : return 4;
-      case Format::eAstc4x4SrgbBlock                       : return 4;
-      case Format::eAstc5x4UnormBlock                      : return 4;
-      case Format::eAstc5x4SrgbBlock                       : return 4;
-      case Format::eAstc5x5UnormBlock                      : return 4;
-      case Format::eAstc5x5SrgbBlock                       : return 4;
-      case Format::eAstc6x5UnormBlock                      : return 4;
-      case Format::eAstc6x5SrgbBlock                       : return 4;
-      case Format::eAstc6x6UnormBlock                      : return 4;
-      case Format::eAstc6x6SrgbBlock                       : return 4;
-      case Format::eAstc8x5UnormBlock                      : return 4;
-      case Format::eAstc8x5SrgbBlock                       : return 4;
-      case Format::eAstc8x6UnormBlock                      : return 4;
-      case Format::eAstc8x6SrgbBlock                       : return 4;
-      case Format::eAstc8x8UnormBlock                      : return 4;
-      case Format::eAstc8x8SrgbBlock                       : return 4;
-      case Format::eAstc10x5UnormBlock                     : return 4;
-      case Format::eAstc10x5SrgbBlock                      : return 4;
-      case Format::eAstc10x6UnormBlock                     : return 4;
-      case Format::eAstc10x6SrgbBlock                      : return 4;
-      case Format::eAstc10x8UnormBlock                     : return 4;
-      case Format::eAstc10x8SrgbBlock                      : return 4;
-      case Format::eAstc10x10UnormBlock                    : return 4;
-      case Format::eAstc10x10SrgbBlock                     : return 4;
-      case Format::eAstc12x10UnormBlock                    : return 4;
-      case Format::eAstc12x10SrgbBlock                     : return 4;
-      case Format::eAstc12x12UnormBlock                    : return 4;
-      case Format::eAstc12x12SrgbBlock                     : return 4;
-      case Format::eG8B8G8R8422Unorm                       : return 4;
-      case Format::eB8G8R8G8422Unorm                       : return 4;
-      case Format::eG8B8R83Plane420Unorm                   : return 3;
-      case Format::eG8B8R82Plane420Unorm                   : return 3;
-      case Format::eG8B8R83Plane422Unorm                   : return 3;
-      case Format::eG8B8R82Plane422Unorm                   : return 3;
-      case Format::eG8B8R83Plane444Unorm                   : return 3;
-      case Format::eR10X6UnormPack16                       : return 1;
-      case Format::eR10X6G10X6Unorm2Pack16                 : return 2;
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return 4;
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return 4;
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return 4;
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return 3;
-      case Format::eR12X4UnormPack16                       : return 1;
-      case Format::eR12X4G12X4Unorm2Pack16                 : return 2;
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return 4;
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return 4;
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return 4;
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return 3;
-      case Format::eG16B16G16R16422Unorm                   : return 4;
-      case Format::eB16G16R16G16422Unorm                   : return 4;
-      case Format::eG16B16R163Plane420Unorm                : return 3;
-      case Format::eG16B16R162Plane420Unorm                : return 3;
-      case Format::eG16B16R163Plane422Unorm                : return 3;
-      case Format::eG16B16R162Plane422Unorm                : return 3;
-      case Format::eG16B16R163Plane444Unorm                : return 3;
-      case Format::eG8B8R82Plane444Unorm                   : return 3;
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return 3;
-      case Format::eG16B16R162Plane444Unorm                : return 3;
-      case Format::eA4R4G4B4UnormPack16                    : return 4;
-      case Format::eA4B4G4R4UnormPack16                    : return 4;
-      case Format::eAstc4x4SfloatBlock                     : return 4;
-      case Format::eAstc5x4SfloatBlock                     : return 4;
-      case Format::eAstc5x5SfloatBlock                     : return 4;
-      case Format::eAstc6x5SfloatBlock                     : return 4;
-      case Format::eAstc6x6SfloatBlock                     : return 4;
-      case Format::eAstc8x5SfloatBlock                     : return 4;
-      case Format::eAstc8x6SfloatBlock                     : return 4;
-      case Format::eAstc8x8SfloatBlock                     : return 4;
-      case Format::eAstc10x5SfloatBlock                    : return 4;
-      case Format::eAstc10x6SfloatBlock                    : return 4;
-      case Format::eAstc10x8SfloatBlock                    : return 4;
-      case Format::eAstc10x10SfloatBlock                   : return 4;
-      case Format::eAstc12x10SfloatBlock                   : return 4;
-      case Format::eAstc12x12SfloatBlock                   : return 4;
-      case Format::eA1B5G5R5UnormPack16                    : return 4;
-      case Format::eA8Unorm                                : return 1;
-      case Format::ePvrtc12BppUnormBlockIMG                : return 4;
-      case Format::ePvrtc14BppUnormBlockIMG                : return 4;
-      case Format::ePvrtc22BppUnormBlockIMG                : return 4;
-      case Format::ePvrtc24BppUnormBlockIMG                : return 4;
-      case Format::ePvrtc12BppSrgbBlockIMG                 : return 4;
-      case Format::ePvrtc14BppSrgbBlockIMG                 : return 4;
-      case Format::ePvrtc22BppSrgbBlockIMG                 : return 4;
-      case Format::ePvrtc24BppSrgbBlockIMG                 : return 4;
-      case Format::eR8BoolARM                              : return 1;
-      case Format::eR16G16Sfixed5NV                        : return 2;
-      case Format::eR10X6UintPack16ARM                     : return 1;
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return 2;
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return 4;
-      case Format::eR12X4UintPack16ARM                     : return 1;
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return 2;
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return 4;
-      case Format::eR14X2UintPack16ARM                     : return 1;
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return 2;
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return 4;
-      case Format::eR14X2UnormPack16ARM                    : return 1;
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return 2;
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return 4;
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return 3;
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR: return 4;
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR: return 1;
 
       default: return 0;
     }
   }
 
   // The name of the component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * componentName( Format format, uint8_t component )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * componentName( VULKAN_HPP_NAMESPACE::Format format, uint8_t component )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR4G4B4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB4G4R4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR5G6B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB5G6R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR5G5B5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB5G5R5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA1R5G5B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "A";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SrgbPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB10G11R11UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eE5B9G9R9UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm:
         switch ( component )
         {
-          case 0 : return "D";
+          case 0: return "D";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eX8D24UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32:
         switch ( component )
         {
-          case 0 : return "D";
+          case 0: return "D";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat:
         switch ( component )
         {
-          case 0 : return "D";
+          case 0: return "D";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint:
         switch ( component )
         {
-          case 0 : return "S";
+          case 0: return "S";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD16UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint:
         switch ( component )
         {
-          case 0 : return "D";
-          case 1 : return "S";
+          case 0: return "D";
+          case 1: return "S";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD24UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint:
         switch ( component )
         {
-          case 0 : return "D";
-          case 1 : return "S";
+          case 0: return "D";
+          case 1: return "S";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD32SfloatS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint:
         switch ( component )
         {
-          case 0 : return "D";
-          case 1 : return "S";
+          case 0: return "D";
+          case 1: return "S";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbaUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbaSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc2UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc2SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc3UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc3SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc4SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc5SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc6HUfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc6HSfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc7UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc7SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A1UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A1SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11G11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11G11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8G8R8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8G8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "G";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6G10X6Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "G";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16:
         switch ( component )
         {
-          case 0 : return "R";
+          case 0: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4G12X4Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "G";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16G16R16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB16G16R16G16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm:
         switch ( component )
         {
-          case 0 : return "B";
-          case 1 : return "G";
-          case 2 : return "R";
-          case 3 : return "G";
+          case 0: return "B";
+          case 1: return "G";
+          case 2: return "R";
+          case 3: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "G";
+          case 1: return "B";
+          case 2: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA4R4G4B4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "R";
-          case 2 : return "G";
-          case 3 : return "B";
+          case 0: return "A";
+          case 1: return "R";
+          case 2: return "G";
+          case 3: return "B";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA4B4G4R4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA1B5G5R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "A";
-          case 1 : return "B";
-          case 2 : return "G";
-          case 3 : return "R";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc12BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc14BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc22BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc24BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc12BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc14BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
+          case 2: return "B";
+          case 3: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc22BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "R";
+          case 1: return "G";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc24BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR:
         switch ( component )
         {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
+          case 0: return "A";
+          case 1: return "B";
+          case 2: return "G";
+          case 3: return "R";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8BoolARM:
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR:
         switch ( component )
         {
-          case 0 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR16G16Sfixed5NV:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6G10X6Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4G12X4Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2UnormPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2Unorm2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "R";
-          case 1 : return "G";
-          case 2 : return "B";
-          case 3 : return "A";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "G";
-          case 1 : return "B";
-          case 2 : return "R";
+          case 0: return "A";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
 
@@ -4683,2143 +4327,2033 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The numeric format of the component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * componentNumericFormat( Format format, uint8_t component )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * componentNumericFormat( VULKAN_HPP_NAMESPACE::Format format, uint8_t component )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR4G4B4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB4G4R4A4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR5G6B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB5G6R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR5G5B5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB5G5R5A1UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA1R5G5B5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
+          case 0: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
+          case 0: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
+          case 0: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
+          case 0: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
+          case 0: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
+          case 0: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8G8B8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8A8Srgb:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8B8G8R8SrgbPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2R10G10B10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SscaledPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10UintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA2B10G10R10SintPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
+          case 0: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
+          case 0: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
+          case 0: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
+          case 0: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
+          case 0: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
+          case 0: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Snorm:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
-          case 2 : return "SNORM";
-          case 3 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
+          case 2: return "SNORM";
+          case 3: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Uscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled:
         switch ( component )
         {
-          case 0 : return "USCALED";
-          case 1 : return "USCALED";
-          case 2 : return "USCALED";
-          case 3 : return "USCALED";
+          case 0: return "USCALED";
+          case 1: return "USCALED";
+          case 2: return "USCALED";
+          case 3: return "USCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sscaled:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled:
         switch ( component )
         {
-          case 0 : return "SSCALED";
-          case 1 : return "SSCALED";
-          case 2 : return "SSCALED";
-          case 3 : return "SSCALED";
+          case 0: return "SSCALED";
+          case 1: return "SSCALED";
+          case 2: return "SSCALED";
+          case 3: return "SSCALED";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR16G16B16A16Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
+          case 0: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
+          case 0: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
+          case 0: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR32G32B32A32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
+          case 0: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
+          case 0: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
+          case 0: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
+          case 0: return "UINT";
+          case 1: return "UINT";
+          case 2: return "UINT";
+          case 3: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Sint:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint:
         switch ( component )
         {
-          case 0 : return "SINT";
-          case 1 : return "SINT";
-          case 2 : return "SINT";
-          case 3 : return "SINT";
+          case 0: return "SINT";
+          case 1: return "SINT";
+          case 2: return "SINT";
+          case 3: return "SINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR64G64B64A64Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB10G11R11UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32:
         switch ( component )
         {
-          case 0 : return "UFLOAT";
-          case 1 : return "UFLOAT";
-          case 2 : return "UFLOAT";
+          case 0: return "UFLOAT";
+          case 1: return "UFLOAT";
+          case 2: return "UFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eE5B9G9R9UfloatPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32:
         switch ( component )
         {
-          case 0 : return "UFLOAT";
-          case 1 : return "UFLOAT";
-          case 2 : return "UFLOAT";
+          case 0: return "UFLOAT";
+          case 1: return "UFLOAT";
+          case 2: return "UFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD16Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eX8D24UnormPack32:
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD32Sfloat:
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
+          case 0: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint:
         switch ( component )
         {
-          case 0 : return "UINT";
+          case 0: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD16UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UINT";
+          case 0: return "UNORM";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD24UnormS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UINT";
+          case 0: return "UNORM";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eD32SfloatS8Uint:
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "UINT";
+          case 0: return "SFLOAT";
+          case 1: return "UINT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbaUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc1RgbaSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc2UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc2SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc3UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc3SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc4SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock:
         switch ( component )
         {
-          case 0 : return "SNORM";
+          case 0: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc5SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc6HUfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock:
         switch ( component )
         {
-          case 0 : return "UFLOAT";
-          case 1 : return "UFLOAT";
-          case 2 : return "UFLOAT";
+          case 0: return "UFLOAT";
+          case 1: return "UFLOAT";
+          case 2: return "UFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc6HSfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc7UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eBc7SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A1UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A1SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEtc2R8G8B8A8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock:
         switch ( component )
         {
-          case 0 : return "SNORM";
+          case 0: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11G11UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eEacR11G11SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock:
         switch ( component )
         {
-          case 0 : return "SNORM";
-          case 1 : return "SNORM";
+          case 0: return "SNORM";
+          case 1: return "SNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8G8R8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB8G8R8G8422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6G10X6Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4G12X4Unorm2Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16G16R16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eB16G16R16G16422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA4R4G4B4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA4B4G4R4UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc4x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc5x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc6x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc8x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc10x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eAstc12x12SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock:
         switch ( component )
         {
-          case 0 : return "SFLOAT";
-          case 1 : return "SFLOAT";
-          case 2 : return "SFLOAT";
-          case 3 : return "SFLOAT";
+          case 0: return "SFLOAT";
+          case 1: return "SFLOAT";
+          case 2: return "SFLOAT";
+          case 3: return "SFLOAT";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA1B5G5R5UnormPack16:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eA8Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc12BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc14BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc22BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc24BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc12BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc14BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SRGB";
+          case 1: return "SRGB";
+          case 2: return "SRGB";
+          case 3: return "SRGB";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc22BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "SFIXED5";
+          case 1: return "SFIXED5";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::ePvrtc24BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR:
         switch ( component )
         {
-          case 0 : return "SRGB";
-          case 1 : return "SRGB";
-          case 2 : return "SRGB";
-          case 3 : return "UNORM";
+          case 0: return "UNORM";
+          case 1: return "UNORM";
+          case 2: return "UNORM";
+          case 3: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
-      case Format::eR8BoolARM:
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR:
         switch ( component )
         {
-          case 0 : return "BOOL";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR16G16Sfixed5NV:
-        switch ( component )
-        {
-          case 0 : return "SFIXED5";
-          case 1 : return "SFIXED5";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6G10X6Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4G12X4Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2UintPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2Uint2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UINT";
-          case 1 : return "UINT";
-          case 2 : return "UINT";
-          case 3 : return "UINT";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2UnormPack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UNORM";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2Unorm2Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          case 3 : return "UNORM";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
-          default: VULKAN_HPP_ASSERT( false ); return "";
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return "UNORM";
-          case 1 : return "UNORM";
-          case 2 : return "UNORM";
+          case 0: return "UNORM";
           default: VULKAN_HPP_ASSERT( false ); return "";
         }
 
@@ -6828,216 +6362,200 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The plane this component lies in.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentPlaneIndex( Format format, uint8_t component )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t componentPlaneIndex( VULKAN_HPP_NAMESPACE::Format format, uint8_t component )
   {
     switch ( format )
     {
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 2;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( component )
         {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
-          default: VULKAN_HPP_ASSERT( false ); return 0;
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( component )
-        {
-          case 0 : return 0;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 0;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 0;
         }
 
@@ -7046,1878 +6564,428 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // True, if the components of this format are compressed, otherwise false.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool componentsAreCompressed( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool componentsAreCompressed( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eBc1RgbUnormBlock:
-      case Format::eBc1RgbSrgbBlock:
-      case Format::eBc1RgbaUnormBlock:
-      case Format::eBc1RgbaSrgbBlock:
-      case Format::eBc2UnormBlock:
-      case Format::eBc2SrgbBlock:
-      case Format::eBc3UnormBlock:
-      case Format::eBc3SrgbBlock:
-      case Format::eBc4UnormBlock:
-      case Format::eBc4SnormBlock:
-      case Format::eBc5UnormBlock:
-      case Format::eBc5SnormBlock:
-      case Format::eBc6HUfloatBlock:
-      case Format::eBc6HSfloatBlock:
-      case Format::eBc7UnormBlock:
-      case Format::eBc7SrgbBlock:
-      case Format::eEtc2R8G8B8UnormBlock:
-      case Format::eEtc2R8G8B8SrgbBlock:
-      case Format::eEtc2R8G8B8A1UnormBlock:
-      case Format::eEtc2R8G8B8A1SrgbBlock:
-      case Format::eEtc2R8G8B8A8UnormBlock:
-      case Format::eEtc2R8G8B8A8SrgbBlock:
-      case Format::eAstc4x4UnormBlock:
-      case Format::eAstc4x4SrgbBlock:
-      case Format::eAstc5x4UnormBlock:
-      case Format::eAstc5x4SrgbBlock:
-      case Format::eAstc5x5UnormBlock:
-      case Format::eAstc5x5SrgbBlock:
-      case Format::eAstc6x5UnormBlock:
-      case Format::eAstc6x5SrgbBlock:
-      case Format::eAstc6x6UnormBlock:
-      case Format::eAstc6x6SrgbBlock:
-      case Format::eAstc8x5UnormBlock:
-      case Format::eAstc8x5SrgbBlock:
-      case Format::eAstc8x6UnormBlock:
-      case Format::eAstc8x6SrgbBlock:
-      case Format::eAstc8x8UnormBlock:
-      case Format::eAstc8x8SrgbBlock:
-      case Format::eAstc10x5UnormBlock:
-      case Format::eAstc10x5SrgbBlock:
-      case Format::eAstc10x6UnormBlock:
-      case Format::eAstc10x6SrgbBlock:
-      case Format::eAstc10x8UnormBlock:
-      case Format::eAstc10x8SrgbBlock:
-      case Format::eAstc10x10UnormBlock:
-      case Format::eAstc10x10SrgbBlock:
-      case Format::eAstc12x10UnormBlock:
-      case Format::eAstc12x10SrgbBlock:
-      case Format::eAstc12x12UnormBlock:
-      case Format::eAstc12x12SrgbBlock:
-      case Format::eAstc4x4SfloatBlock:
-      case Format::eAstc5x4SfloatBlock:
-      case Format::eAstc5x5SfloatBlock:
-      case Format::eAstc6x5SfloatBlock:
-      case Format::eAstc6x6SfloatBlock:
-      case Format::eAstc8x5SfloatBlock:
-      case Format::eAstc8x6SfloatBlock:
-      case Format::eAstc8x8SfloatBlock:
-      case Format::eAstc10x5SfloatBlock:
-      case Format::eAstc10x6SfloatBlock:
-      case Format::eAstc10x8SfloatBlock:
-      case Format::eAstc10x10SfloatBlock:
-      case Format::eAstc12x10SfloatBlock:
-      case Format::eAstc12x12SfloatBlock:
-      case Format::ePvrtc12BppUnormBlockIMG:
-      case Format::ePvrtc14BppUnormBlockIMG:
-      case Format::ePvrtc22BppUnormBlockIMG:
-      case Format::ePvrtc24BppUnormBlockIMG:
-      case Format::ePvrtc12BppSrgbBlockIMG:
-      case Format::ePvrtc14BppSrgbBlockIMG:
-      case Format::ePvrtc22BppSrgbBlockIMG:
-      case Format::ePvrtc24BppSrgbBlockIMG : return true;
-      default                              : return false;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG:
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return true;
+      default: return false;
     }
   }
 
   // A textual description of the compression scheme, or an empty string if it is not compressed
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * compressionScheme( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 char const * compressionScheme( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eBc1RgbUnormBlock       : return "BC";
-      case Format::eBc1RgbSrgbBlock        : return "BC";
-      case Format::eBc1RgbaUnormBlock      : return "BC";
-      case Format::eBc1RgbaSrgbBlock       : return "BC";
-      case Format::eBc2UnormBlock          : return "BC";
-      case Format::eBc2SrgbBlock           : return "BC";
-      case Format::eBc3UnormBlock          : return "BC";
-      case Format::eBc3SrgbBlock           : return "BC";
-      case Format::eBc4UnormBlock          : return "BC";
-      case Format::eBc4SnormBlock          : return "BC";
-      case Format::eBc5UnormBlock          : return "BC";
-      case Format::eBc5SnormBlock          : return "BC";
-      case Format::eBc6HUfloatBlock        : return "BC";
-      case Format::eBc6HSfloatBlock        : return "BC";
-      case Format::eBc7UnormBlock          : return "BC";
-      case Format::eBc7SrgbBlock           : return "BC";
-      case Format::eEtc2R8G8B8UnormBlock   : return "ETC2";
-      case Format::eEtc2R8G8B8SrgbBlock    : return "ETC2";
-      case Format::eEtc2R8G8B8A1UnormBlock : return "ETC2";
-      case Format::eEtc2R8G8B8A1SrgbBlock  : return "ETC2";
-      case Format::eEtc2R8G8B8A8UnormBlock : return "ETC2";
-      case Format::eEtc2R8G8B8A8SrgbBlock  : return "ETC2";
-      case Format::eEacR11UnormBlock       : return "EAC";
-      case Format::eEacR11SnormBlock       : return "EAC";
-      case Format::eEacR11G11UnormBlock    : return "EAC";
-      case Format::eEacR11G11SnormBlock    : return "EAC";
-      case Format::eAstc4x4UnormBlock      : return "ASTC LDR";
-      case Format::eAstc4x4SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc5x4UnormBlock      : return "ASTC LDR";
-      case Format::eAstc5x4SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc5x5UnormBlock      : return "ASTC LDR";
-      case Format::eAstc5x5SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc6x5UnormBlock      : return "ASTC LDR";
-      case Format::eAstc6x5SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc6x6UnormBlock      : return "ASTC LDR";
-      case Format::eAstc6x6SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc8x5UnormBlock      : return "ASTC LDR";
-      case Format::eAstc8x5SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc8x6UnormBlock      : return "ASTC LDR";
-      case Format::eAstc8x6SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc8x8UnormBlock      : return "ASTC LDR";
-      case Format::eAstc8x8SrgbBlock       : return "ASTC LDR";
-      case Format::eAstc10x5UnormBlock     : return "ASTC LDR";
-      case Format::eAstc10x5SrgbBlock      : return "ASTC LDR";
-      case Format::eAstc10x6UnormBlock     : return "ASTC LDR";
-      case Format::eAstc10x6SrgbBlock      : return "ASTC LDR";
-      case Format::eAstc10x8UnormBlock     : return "ASTC LDR";
-      case Format::eAstc10x8SrgbBlock      : return "ASTC LDR";
-      case Format::eAstc10x10UnormBlock    : return "ASTC LDR";
-      case Format::eAstc10x10SrgbBlock     : return "ASTC LDR";
-      case Format::eAstc12x10UnormBlock    : return "ASTC LDR";
-      case Format::eAstc12x10SrgbBlock     : return "ASTC LDR";
-      case Format::eAstc12x12UnormBlock    : return "ASTC LDR";
-      case Format::eAstc12x12SrgbBlock     : return "ASTC LDR";
-      case Format::eAstc4x4SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc5x4SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc5x5SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc6x5SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc6x6SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc8x5SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc8x6SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc8x8SfloatBlock     : return "ASTC HDR";
-      case Format::eAstc10x5SfloatBlock    : return "ASTC HDR";
-      case Format::eAstc10x6SfloatBlock    : return "ASTC HDR";
-      case Format::eAstc10x8SfloatBlock    : return "ASTC HDR";
-      case Format::eAstc10x10SfloatBlock   : return "ASTC HDR";
-      case Format::eAstc12x10SfloatBlock   : return "ASTC HDR";
-      case Format::eAstc12x12SfloatBlock   : return "ASTC HDR";
-      case Format::ePvrtc12BppUnormBlockIMG: return "PVRTC";
-      case Format::ePvrtc14BppUnormBlockIMG: return "PVRTC";
-      case Format::ePvrtc22BppUnormBlockIMG: return "PVRTC";
-      case Format::ePvrtc24BppUnormBlockIMG: return "PVRTC";
-      case Format::ePvrtc12BppSrgbBlockIMG : return "PVRTC";
-      case Format::ePvrtc14BppSrgbBlockIMG : return "PVRTC";
-      case Format::ePvrtc22BppSrgbBlockIMG : return "PVRTC";
-      case Format::ePvrtc24BppSrgbBlockIMG : return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return "BC";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return "ETC2";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return "EAC";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return "EAC";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return "EAC";
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return "EAC";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return "ASTC LDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return "ASTC HDR";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return "PVRTC";
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return "PVRTC";
 
       default: return "";
     }
   }
 
-  // Get all formats
-  VULKAN_HPP_INLINE std::vector<Format> const & getAllFormats()
-  {
-    static std::vector<Format> allFormats = { Format::eR4G4UnormPack8,
-                                              Format::eR4G4B4A4UnormPack16,
-                                              Format::eB4G4R4A4UnormPack16,
-                                              Format::eR5G6B5UnormPack16,
-                                              Format::eB5G6R5UnormPack16,
-                                              Format::eR5G5B5A1UnormPack16,
-                                              Format::eB5G5R5A1UnormPack16,
-                                              Format::eA1R5G5B5UnormPack16,
-                                              Format::eR8Unorm,
-                                              Format::eR8Snorm,
-                                              Format::eR8Uscaled,
-                                              Format::eR8Sscaled,
-                                              Format::eR8Uint,
-                                              Format::eR8Sint,
-                                              Format::eR8Srgb,
-                                              Format::eR8G8Unorm,
-                                              Format::eR8G8Snorm,
-                                              Format::eR8G8Uscaled,
-                                              Format::eR8G8Sscaled,
-                                              Format::eR8G8Uint,
-                                              Format::eR8G8Sint,
-                                              Format::eR8G8Srgb,
-                                              Format::eR8G8B8Unorm,
-                                              Format::eR8G8B8Snorm,
-                                              Format::eR8G8B8Uscaled,
-                                              Format::eR8G8B8Sscaled,
-                                              Format::eR8G8B8Uint,
-                                              Format::eR8G8B8Sint,
-                                              Format::eR8G8B8Srgb,
-                                              Format::eB8G8R8Unorm,
-                                              Format::eB8G8R8Snorm,
-                                              Format::eB8G8R8Uscaled,
-                                              Format::eB8G8R8Sscaled,
-                                              Format::eB8G8R8Uint,
-                                              Format::eB8G8R8Sint,
-                                              Format::eB8G8R8Srgb,
-                                              Format::eR8G8B8A8Unorm,
-                                              Format::eR8G8B8A8Snorm,
-                                              Format::eR8G8B8A8Uscaled,
-                                              Format::eR8G8B8A8Sscaled,
-                                              Format::eR8G8B8A8Uint,
-                                              Format::eR8G8B8A8Sint,
-                                              Format::eR8G8B8A8Srgb,
-                                              Format::eB8G8R8A8Unorm,
-                                              Format::eB8G8R8A8Snorm,
-                                              Format::eB8G8R8A8Uscaled,
-                                              Format::eB8G8R8A8Sscaled,
-                                              Format::eB8G8R8A8Uint,
-                                              Format::eB8G8R8A8Sint,
-                                              Format::eB8G8R8A8Srgb,
-                                              Format::eA8B8G8R8UnormPack32,
-                                              Format::eA8B8G8R8SnormPack32,
-                                              Format::eA8B8G8R8UscaledPack32,
-                                              Format::eA8B8G8R8SscaledPack32,
-                                              Format::eA8B8G8R8UintPack32,
-                                              Format::eA8B8G8R8SintPack32,
-                                              Format::eA8B8G8R8SrgbPack32,
-                                              Format::eA2R10G10B10UnormPack32,
-                                              Format::eA2R10G10B10SnormPack32,
-                                              Format::eA2R10G10B10UscaledPack32,
-                                              Format::eA2R10G10B10SscaledPack32,
-                                              Format::eA2R10G10B10UintPack32,
-                                              Format::eA2R10G10B10SintPack32,
-                                              Format::eA2B10G10R10UnormPack32,
-                                              Format::eA2B10G10R10SnormPack32,
-                                              Format::eA2B10G10R10UscaledPack32,
-                                              Format::eA2B10G10R10SscaledPack32,
-                                              Format::eA2B10G10R10UintPack32,
-                                              Format::eA2B10G10R10SintPack32,
-                                              Format::eR16Unorm,
-                                              Format::eR16Snorm,
-                                              Format::eR16Uscaled,
-                                              Format::eR16Sscaled,
-                                              Format::eR16Uint,
-                                              Format::eR16Sint,
-                                              Format::eR16Sfloat,
-                                              Format::eR16G16Unorm,
-                                              Format::eR16G16Snorm,
-                                              Format::eR16G16Uscaled,
-                                              Format::eR16G16Sscaled,
-                                              Format::eR16G16Uint,
-                                              Format::eR16G16Sint,
-                                              Format::eR16G16Sfloat,
-                                              Format::eR16G16B16Unorm,
-                                              Format::eR16G16B16Snorm,
-                                              Format::eR16G16B16Uscaled,
-                                              Format::eR16G16B16Sscaled,
-                                              Format::eR16G16B16Uint,
-                                              Format::eR16G16B16Sint,
-                                              Format::eR16G16B16Sfloat,
-                                              Format::eR16G16B16A16Unorm,
-                                              Format::eR16G16B16A16Snorm,
-                                              Format::eR16G16B16A16Uscaled,
-                                              Format::eR16G16B16A16Sscaled,
-                                              Format::eR16G16B16A16Uint,
-                                              Format::eR16G16B16A16Sint,
-                                              Format::eR16G16B16A16Sfloat,
-                                              Format::eR32Uint,
-                                              Format::eR32Sint,
-                                              Format::eR32Sfloat,
-                                              Format::eR32G32Uint,
-                                              Format::eR32G32Sint,
-                                              Format::eR32G32Sfloat,
-                                              Format::eR32G32B32Uint,
-                                              Format::eR32G32B32Sint,
-                                              Format::eR32G32B32Sfloat,
-                                              Format::eR32G32B32A32Uint,
-                                              Format::eR32G32B32A32Sint,
-                                              Format::eR32G32B32A32Sfloat,
-                                              Format::eR64Uint,
-                                              Format::eR64Sint,
-                                              Format::eR64Sfloat,
-                                              Format::eR64G64Uint,
-                                              Format::eR64G64Sint,
-                                              Format::eR64G64Sfloat,
-                                              Format::eR64G64B64Uint,
-                                              Format::eR64G64B64Sint,
-                                              Format::eR64G64B64Sfloat,
-                                              Format::eR64G64B64A64Uint,
-                                              Format::eR64G64B64A64Sint,
-                                              Format::eR64G64B64A64Sfloat,
-                                              Format::eB10G11R11UfloatPack32,
-                                              Format::eE5B9G9R9UfloatPack32,
-                                              Format::eD16Unorm,
-                                              Format::eX8D24UnormPack32,
-                                              Format::eD32Sfloat,
-                                              Format::eS8Uint,
-                                              Format::eD16UnormS8Uint,
-                                              Format::eD24UnormS8Uint,
-                                              Format::eD32SfloatS8Uint,
-                                              Format::eBc1RgbUnormBlock,
-                                              Format::eBc1RgbSrgbBlock,
-                                              Format::eBc1RgbaUnormBlock,
-                                              Format::eBc1RgbaSrgbBlock,
-                                              Format::eBc2UnormBlock,
-                                              Format::eBc2SrgbBlock,
-                                              Format::eBc3UnormBlock,
-                                              Format::eBc3SrgbBlock,
-                                              Format::eBc4UnormBlock,
-                                              Format::eBc4SnormBlock,
-                                              Format::eBc5UnormBlock,
-                                              Format::eBc5SnormBlock,
-                                              Format::eBc6HUfloatBlock,
-                                              Format::eBc6HSfloatBlock,
-                                              Format::eBc7UnormBlock,
-                                              Format::eBc7SrgbBlock,
-                                              Format::eEtc2R8G8B8UnormBlock,
-                                              Format::eEtc2R8G8B8SrgbBlock,
-                                              Format::eEtc2R8G8B8A1UnormBlock,
-                                              Format::eEtc2R8G8B8A1SrgbBlock,
-                                              Format::eEtc2R8G8B8A8UnormBlock,
-                                              Format::eEtc2R8G8B8A8SrgbBlock,
-                                              Format::eEacR11UnormBlock,
-                                              Format::eEacR11SnormBlock,
-                                              Format::eEacR11G11UnormBlock,
-                                              Format::eEacR11G11SnormBlock,
-                                              Format::eAstc4x4UnormBlock,
-                                              Format::eAstc4x4SrgbBlock,
-                                              Format::eAstc5x4UnormBlock,
-                                              Format::eAstc5x4SrgbBlock,
-                                              Format::eAstc5x5UnormBlock,
-                                              Format::eAstc5x5SrgbBlock,
-                                              Format::eAstc6x5UnormBlock,
-                                              Format::eAstc6x5SrgbBlock,
-                                              Format::eAstc6x6UnormBlock,
-                                              Format::eAstc6x6SrgbBlock,
-                                              Format::eAstc8x5UnormBlock,
-                                              Format::eAstc8x5SrgbBlock,
-                                              Format::eAstc8x6UnormBlock,
-                                              Format::eAstc8x6SrgbBlock,
-                                              Format::eAstc8x8UnormBlock,
-                                              Format::eAstc8x8SrgbBlock,
-                                              Format::eAstc10x5UnormBlock,
-                                              Format::eAstc10x5SrgbBlock,
-                                              Format::eAstc10x6UnormBlock,
-                                              Format::eAstc10x6SrgbBlock,
-                                              Format::eAstc10x8UnormBlock,
-                                              Format::eAstc10x8SrgbBlock,
-                                              Format::eAstc10x10UnormBlock,
-                                              Format::eAstc10x10SrgbBlock,
-                                              Format::eAstc12x10UnormBlock,
-                                              Format::eAstc12x10SrgbBlock,
-                                              Format::eAstc12x12UnormBlock,
-                                              Format::eAstc12x12SrgbBlock,
-                                              Format::eG8B8G8R8422Unorm,
-                                              Format::eB8G8R8G8422Unorm,
-                                              Format::eG8B8R83Plane420Unorm,
-                                              Format::eG8B8R82Plane420Unorm,
-                                              Format::eG8B8R83Plane422Unorm,
-                                              Format::eG8B8R82Plane422Unorm,
-                                              Format::eG8B8R83Plane444Unorm,
-                                              Format::eR10X6UnormPack16,
-                                              Format::eR10X6G10X6Unorm2Pack16,
-                                              Format::eR10X6G10X6B10X6A10X6Unorm4Pack16,
-                                              Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16,
-                                              Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16,
-                                              Format::eG10X6B10X6R10X63Plane420Unorm3Pack16,
-                                              Format::eG10X6B10X6R10X62Plane420Unorm3Pack16,
-                                              Format::eG10X6B10X6R10X63Plane422Unorm3Pack16,
-                                              Format::eG10X6B10X6R10X62Plane422Unorm3Pack16,
-                                              Format::eG10X6B10X6R10X63Plane444Unorm3Pack16,
-                                              Format::eR12X4UnormPack16,
-                                              Format::eR12X4G12X4Unorm2Pack16,
-                                              Format::eR12X4G12X4B12X4A12X4Unorm4Pack16,
-                                              Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16,
-                                              Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16,
-                                              Format::eG12X4B12X4R12X43Plane420Unorm3Pack16,
-                                              Format::eG12X4B12X4R12X42Plane420Unorm3Pack16,
-                                              Format::eG12X4B12X4R12X43Plane422Unorm3Pack16,
-                                              Format::eG12X4B12X4R12X42Plane422Unorm3Pack16,
-                                              Format::eG12X4B12X4R12X43Plane444Unorm3Pack16,
-                                              Format::eG16B16G16R16422Unorm,
-                                              Format::eB16G16R16G16422Unorm,
-                                              Format::eG16B16R163Plane420Unorm,
-                                              Format::eG16B16R162Plane420Unorm,
-                                              Format::eG16B16R163Plane422Unorm,
-                                              Format::eG16B16R162Plane422Unorm,
-                                              Format::eG16B16R163Plane444Unorm,
-                                              Format::eG8B8R82Plane444Unorm,
-                                              Format::eG10X6B10X6R10X62Plane444Unorm3Pack16,
-                                              Format::eG12X4B12X4R12X42Plane444Unorm3Pack16,
-                                              Format::eG16B16R162Plane444Unorm,
-                                              Format::eA4R4G4B4UnormPack16,
-                                              Format::eA4B4G4R4UnormPack16,
-                                              Format::eAstc4x4SfloatBlock,
-                                              Format::eAstc5x4SfloatBlock,
-                                              Format::eAstc5x5SfloatBlock,
-                                              Format::eAstc6x5SfloatBlock,
-                                              Format::eAstc6x6SfloatBlock,
-                                              Format::eAstc8x5SfloatBlock,
-                                              Format::eAstc8x6SfloatBlock,
-                                              Format::eAstc8x8SfloatBlock,
-                                              Format::eAstc10x5SfloatBlock,
-                                              Format::eAstc10x6SfloatBlock,
-                                              Format::eAstc10x8SfloatBlock,
-                                              Format::eAstc10x10SfloatBlock,
-                                              Format::eAstc12x10SfloatBlock,
-                                              Format::eAstc12x12SfloatBlock,
-                                              Format::eA1B5G5R5UnormPack16,
-                                              Format::eA8Unorm,
-                                              Format::ePvrtc12BppUnormBlockIMG,
-                                              Format::ePvrtc14BppUnormBlockIMG,
-                                              Format::ePvrtc22BppUnormBlockIMG,
-                                              Format::ePvrtc24BppUnormBlockIMG,
-                                              Format::ePvrtc12BppSrgbBlockIMG,
-                                              Format::ePvrtc14BppSrgbBlockIMG,
-                                              Format::ePvrtc22BppSrgbBlockIMG,
-                                              Format::ePvrtc24BppSrgbBlockIMG,
-                                              Format::eR8BoolARM,
-                                              Format::eR16G16Sfixed5NV,
-                                              Format::eR10X6UintPack16ARM,
-                                              Format::eR10X6G10X6Uint2Pack16ARM,
-                                              Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM,
-                                              Format::eR12X4UintPack16ARM,
-                                              Format::eR12X4G12X4Uint2Pack16ARM,
-                                              Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM,
-                                              Format::eR14X2UintPack16ARM,
-                                              Format::eR14X2G14X2Uint2Pack16ARM,
-                                              Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM,
-                                              Format::eR14X2UnormPack16ARM,
-                                              Format::eR14X2G14X2Unorm2Pack16ARM,
-                                              Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM,
-                                              Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM,
-                                              Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM };
-    return allFormats;
-  }
-
-  // Get all formats with a color component
-  VULKAN_HPP_INLINE std::vector<Format> const & getColorFormats()
-  {
-    static std::vector<Format> colorFormats = { Format::eR4G4UnormPack8,
-                                                Format::eR4G4B4A4UnormPack16,
-                                                Format::eB4G4R4A4UnormPack16,
-                                                Format::eR5G6B5UnormPack16,
-                                                Format::eB5G6R5UnormPack16,
-                                                Format::eR5G5B5A1UnormPack16,
-                                                Format::eB5G5R5A1UnormPack16,
-                                                Format::eA1R5G5B5UnormPack16,
-                                                Format::eR8Unorm,
-                                                Format::eR8Snorm,
-                                                Format::eR8Uscaled,
-                                                Format::eR8Sscaled,
-                                                Format::eR8Uint,
-                                                Format::eR8Sint,
-                                                Format::eR8Srgb,
-                                                Format::eR8G8Unorm,
-                                                Format::eR8G8Snorm,
-                                                Format::eR8G8Uscaled,
-                                                Format::eR8G8Sscaled,
-                                                Format::eR8G8Uint,
-                                                Format::eR8G8Sint,
-                                                Format::eR8G8Srgb,
-                                                Format::eR8G8B8Unorm,
-                                                Format::eR8G8B8Snorm,
-                                                Format::eR8G8B8Uscaled,
-                                                Format::eR8G8B8Sscaled,
-                                                Format::eR8G8B8Uint,
-                                                Format::eR8G8B8Sint,
-                                                Format::eR8G8B8Srgb,
-                                                Format::eB8G8R8Unorm,
-                                                Format::eB8G8R8Snorm,
-                                                Format::eB8G8R8Uscaled,
-                                                Format::eB8G8R8Sscaled,
-                                                Format::eB8G8R8Uint,
-                                                Format::eB8G8R8Sint,
-                                                Format::eB8G8R8Srgb,
-                                                Format::eR8G8B8A8Unorm,
-                                                Format::eR8G8B8A8Snorm,
-                                                Format::eR8G8B8A8Uscaled,
-                                                Format::eR8G8B8A8Sscaled,
-                                                Format::eR8G8B8A8Uint,
-                                                Format::eR8G8B8A8Sint,
-                                                Format::eR8G8B8A8Srgb,
-                                                Format::eB8G8R8A8Unorm,
-                                                Format::eB8G8R8A8Snorm,
-                                                Format::eB8G8R8A8Uscaled,
-                                                Format::eB8G8R8A8Sscaled,
-                                                Format::eB8G8R8A8Uint,
-                                                Format::eB8G8R8A8Sint,
-                                                Format::eB8G8R8A8Srgb,
-                                                Format::eA8B8G8R8UnormPack32,
-                                                Format::eA8B8G8R8SnormPack32,
-                                                Format::eA8B8G8R8UscaledPack32,
-                                                Format::eA8B8G8R8SscaledPack32,
-                                                Format::eA8B8G8R8UintPack32,
-                                                Format::eA8B8G8R8SintPack32,
-                                                Format::eA8B8G8R8SrgbPack32,
-                                                Format::eA2R10G10B10UnormPack32,
-                                                Format::eA2R10G10B10SnormPack32,
-                                                Format::eA2R10G10B10UscaledPack32,
-                                                Format::eA2R10G10B10SscaledPack32,
-                                                Format::eA2R10G10B10UintPack32,
-                                                Format::eA2R10G10B10SintPack32,
-                                                Format::eA2B10G10R10UnormPack32,
-                                                Format::eA2B10G10R10SnormPack32,
-                                                Format::eA2B10G10R10UscaledPack32,
-                                                Format::eA2B10G10R10SscaledPack32,
-                                                Format::eA2B10G10R10UintPack32,
-                                                Format::eA2B10G10R10SintPack32,
-                                                Format::eR16Unorm,
-                                                Format::eR16Snorm,
-                                                Format::eR16Uscaled,
-                                                Format::eR16Sscaled,
-                                                Format::eR16Uint,
-                                                Format::eR16Sint,
-                                                Format::eR16Sfloat,
-                                                Format::eR16G16Unorm,
-                                                Format::eR16G16Snorm,
-                                                Format::eR16G16Uscaled,
-                                                Format::eR16G16Sscaled,
-                                                Format::eR16G16Uint,
-                                                Format::eR16G16Sint,
-                                                Format::eR16G16Sfloat,
-                                                Format::eR16G16B16Unorm,
-                                                Format::eR16G16B16Snorm,
-                                                Format::eR16G16B16Uscaled,
-                                                Format::eR16G16B16Sscaled,
-                                                Format::eR16G16B16Uint,
-                                                Format::eR16G16B16Sint,
-                                                Format::eR16G16B16Sfloat,
-                                                Format::eR16G16B16A16Unorm,
-                                                Format::eR16G16B16A16Snorm,
-                                                Format::eR16G16B16A16Uscaled,
-                                                Format::eR16G16B16A16Sscaled,
-                                                Format::eR16G16B16A16Uint,
-                                                Format::eR16G16B16A16Sint,
-                                                Format::eR16G16B16A16Sfloat,
-                                                Format::eR32Uint,
-                                                Format::eR32Sint,
-                                                Format::eR32Sfloat,
-                                                Format::eR32G32Uint,
-                                                Format::eR32G32Sint,
-                                                Format::eR32G32Sfloat,
-                                                Format::eR32G32B32Uint,
-                                                Format::eR32G32B32Sint,
-                                                Format::eR32G32B32Sfloat,
-                                                Format::eR32G32B32A32Uint,
-                                                Format::eR32G32B32A32Sint,
-                                                Format::eR32G32B32A32Sfloat,
-                                                Format::eR64Uint,
-                                                Format::eR64Sint,
-                                                Format::eR64Sfloat,
-                                                Format::eR64G64Uint,
-                                                Format::eR64G64Sint,
-                                                Format::eR64G64Sfloat,
-                                                Format::eR64G64B64Uint,
-                                                Format::eR64G64B64Sint,
-                                                Format::eR64G64B64Sfloat,
-                                                Format::eR64G64B64A64Uint,
-                                                Format::eR64G64B64A64Sint,
-                                                Format::eR64G64B64A64Sfloat,
-                                                Format::eB10G11R11UfloatPack32,
-                                                Format::eE5B9G9R9UfloatPack32,
-                                                Format::eBc1RgbUnormBlock,
-                                                Format::eBc1RgbSrgbBlock,
-                                                Format::eBc1RgbaUnormBlock,
-                                                Format::eBc1RgbaSrgbBlock,
-                                                Format::eBc2UnormBlock,
-                                                Format::eBc2SrgbBlock,
-                                                Format::eBc3UnormBlock,
-                                                Format::eBc3SrgbBlock,
-                                                Format::eBc4UnormBlock,
-                                                Format::eBc4SnormBlock,
-                                                Format::eBc5UnormBlock,
-                                                Format::eBc5SnormBlock,
-                                                Format::eBc6HUfloatBlock,
-                                                Format::eBc6HSfloatBlock,
-                                                Format::eBc7UnormBlock,
-                                                Format::eBc7SrgbBlock,
-                                                Format::eEtc2R8G8B8UnormBlock,
-                                                Format::eEtc2R8G8B8SrgbBlock,
-                                                Format::eEtc2R8G8B8A1UnormBlock,
-                                                Format::eEtc2R8G8B8A1SrgbBlock,
-                                                Format::eEtc2R8G8B8A8UnormBlock,
-                                                Format::eEtc2R8G8B8A8SrgbBlock,
-                                                Format::eEacR11UnormBlock,
-                                                Format::eEacR11SnormBlock,
-                                                Format::eEacR11G11UnormBlock,
-                                                Format::eEacR11G11SnormBlock,
-                                                Format::eAstc4x4UnormBlock,
-                                                Format::eAstc4x4SrgbBlock,
-                                                Format::eAstc5x4UnormBlock,
-                                                Format::eAstc5x4SrgbBlock,
-                                                Format::eAstc5x5UnormBlock,
-                                                Format::eAstc5x5SrgbBlock,
-                                                Format::eAstc6x5UnormBlock,
-                                                Format::eAstc6x5SrgbBlock,
-                                                Format::eAstc6x6UnormBlock,
-                                                Format::eAstc6x6SrgbBlock,
-                                                Format::eAstc8x5UnormBlock,
-                                                Format::eAstc8x5SrgbBlock,
-                                                Format::eAstc8x6UnormBlock,
-                                                Format::eAstc8x6SrgbBlock,
-                                                Format::eAstc8x8UnormBlock,
-                                                Format::eAstc8x8SrgbBlock,
-                                                Format::eAstc10x5UnormBlock,
-                                                Format::eAstc10x5SrgbBlock,
-                                                Format::eAstc10x6UnormBlock,
-                                                Format::eAstc10x6SrgbBlock,
-                                                Format::eAstc10x8UnormBlock,
-                                                Format::eAstc10x8SrgbBlock,
-                                                Format::eAstc10x10UnormBlock,
-                                                Format::eAstc10x10SrgbBlock,
-                                                Format::eAstc12x10UnormBlock,
-                                                Format::eAstc12x10SrgbBlock,
-                                                Format::eAstc12x12UnormBlock,
-                                                Format::eAstc12x12SrgbBlock,
-                                                Format::eG8B8G8R8422Unorm,
-                                                Format::eB8G8R8G8422Unorm,
-                                                Format::eG8B8R83Plane420Unorm,
-                                                Format::eG8B8R82Plane420Unorm,
-                                                Format::eG8B8R83Plane422Unorm,
-                                                Format::eG8B8R82Plane422Unorm,
-                                                Format::eG8B8R83Plane444Unorm,
-                                                Format::eR10X6UnormPack16,
-                                                Format::eR10X6G10X6Unorm2Pack16,
-                                                Format::eR10X6G10X6B10X6A10X6Unorm4Pack16,
-                                                Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16,
-                                                Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16,
-                                                Format::eG10X6B10X6R10X63Plane420Unorm3Pack16,
-                                                Format::eG10X6B10X6R10X62Plane420Unorm3Pack16,
-                                                Format::eG10X6B10X6R10X63Plane422Unorm3Pack16,
-                                                Format::eG10X6B10X6R10X62Plane422Unorm3Pack16,
-                                                Format::eG10X6B10X6R10X63Plane444Unorm3Pack16,
-                                                Format::eR12X4UnormPack16,
-                                                Format::eR12X4G12X4Unorm2Pack16,
-                                                Format::eR12X4G12X4B12X4A12X4Unorm4Pack16,
-                                                Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16,
-                                                Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16,
-                                                Format::eG12X4B12X4R12X43Plane420Unorm3Pack16,
-                                                Format::eG12X4B12X4R12X42Plane420Unorm3Pack16,
-                                                Format::eG12X4B12X4R12X43Plane422Unorm3Pack16,
-                                                Format::eG12X4B12X4R12X42Plane422Unorm3Pack16,
-                                                Format::eG12X4B12X4R12X43Plane444Unorm3Pack16,
-                                                Format::eG16B16G16R16422Unorm,
-                                                Format::eB16G16R16G16422Unorm,
-                                                Format::eG16B16R163Plane420Unorm,
-                                                Format::eG16B16R162Plane420Unorm,
-                                                Format::eG16B16R163Plane422Unorm,
-                                                Format::eG16B16R162Plane422Unorm,
-                                                Format::eG16B16R163Plane444Unorm,
-                                                Format::eG8B8R82Plane444Unorm,
-                                                Format::eG10X6B10X6R10X62Plane444Unorm3Pack16,
-                                                Format::eG12X4B12X4R12X42Plane444Unorm3Pack16,
-                                                Format::eG16B16R162Plane444Unorm,
-                                                Format::eA4R4G4B4UnormPack16,
-                                                Format::eA4B4G4R4UnormPack16,
-                                                Format::eAstc4x4SfloatBlock,
-                                                Format::eAstc5x4SfloatBlock,
-                                                Format::eAstc5x5SfloatBlock,
-                                                Format::eAstc6x5SfloatBlock,
-                                                Format::eAstc6x6SfloatBlock,
-                                                Format::eAstc8x5SfloatBlock,
-                                                Format::eAstc8x6SfloatBlock,
-                                                Format::eAstc8x8SfloatBlock,
-                                                Format::eAstc10x5SfloatBlock,
-                                                Format::eAstc10x6SfloatBlock,
-                                                Format::eAstc10x8SfloatBlock,
-                                                Format::eAstc10x10SfloatBlock,
-                                                Format::eAstc12x10SfloatBlock,
-                                                Format::eAstc12x12SfloatBlock,
-                                                Format::eA1B5G5R5UnormPack16,
-                                                Format::eA8Unorm,
-                                                Format::ePvrtc12BppUnormBlockIMG,
-                                                Format::ePvrtc14BppUnormBlockIMG,
-                                                Format::ePvrtc22BppUnormBlockIMG,
-                                                Format::ePvrtc24BppUnormBlockIMG,
-                                                Format::ePvrtc12BppSrgbBlockIMG,
-                                                Format::ePvrtc14BppSrgbBlockIMG,
-                                                Format::ePvrtc22BppSrgbBlockIMG,
-                                                Format::ePvrtc24BppSrgbBlockIMG,
-                                                Format::eR8BoolARM,
-                                                Format::eR16G16Sfixed5NV,
-                                                Format::eR10X6UintPack16ARM,
-                                                Format::eR10X6G10X6Uint2Pack16ARM,
-                                                Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM,
-                                                Format::eR12X4UintPack16ARM,
-                                                Format::eR12X4G12X4Uint2Pack16ARM,
-                                                Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM,
-                                                Format::eR14X2UintPack16ARM,
-                                                Format::eR14X2G14X2Uint2Pack16ARM,
-                                                Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM,
-                                                Format::eR14X2UnormPack16ARM,
-                                                Format::eR14X2G14X2Unorm2Pack16ARM,
-                                                Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM,
-                                                Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM,
-                                                Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM };
-    return colorFormats;
-  }
-
-  // Get all formats with a depth component
-  VULKAN_HPP_INLINE std::vector<Format> const & getDepthFormats()
-  {
-    static std::vector<Format> depthFormats = { Format::eD16Unorm,       Format::eX8D24UnormPack32, Format::eD32Sfloat,
-                                                Format::eD16UnormS8Uint, Format::eD24UnormS8Uint,   Format::eD32SfloatS8Uint };
-    return depthFormats;
-  }
-
-  // Get all formats with a depth and a stencil component
-  VULKAN_HPP_INLINE std::vector<Format> const & getDepthStencilFormats()
-  {
-    static std::vector<Format> depthStencilFormats = { Format::eD16UnormS8Uint, Format::eD24UnormS8Uint, Format::eD32SfloatS8Uint };
-    return depthStencilFormats;
-  }
-
-  // Get all formats with a stencil component
-  VULKAN_HPP_INLINE std::vector<Format> const & getStencilFormats()
-  {
-    static std::vector<Format> stencilFormats = { Format::eS8Uint, Format::eD16UnormS8Uint, Format::eD24UnormS8Uint, Format::eD32SfloatS8Uint };
-    return stencilFormats;
-  }
-
-  // True, if this format has an alpha component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool hasAlphaComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eR4G4B4A4UnormPack16:
-      case Format::eB4G4R4A4UnormPack16:
-      case Format::eR5G5B5A1UnormPack16:
-      case Format::eB5G5R5A1UnormPack16:
-      case Format::eA1R5G5B5UnormPack16:
-      case Format::eR8G8B8A8Unorm:
-      case Format::eR8G8B8A8Snorm:
-      case Format::eR8G8B8A8Uscaled:
-      case Format::eR8G8B8A8Sscaled:
-      case Format::eR8G8B8A8Uint:
-      case Format::eR8G8B8A8Sint:
-      case Format::eR8G8B8A8Srgb:
-      case Format::eB8G8R8A8Unorm:
-      case Format::eB8G8R8A8Snorm:
-      case Format::eB8G8R8A8Uscaled:
-      case Format::eB8G8R8A8Sscaled:
-      case Format::eB8G8R8A8Uint:
-      case Format::eB8G8R8A8Sint:
-      case Format::eB8G8R8A8Srgb:
-      case Format::eA8B8G8R8UnormPack32:
-      case Format::eA8B8G8R8SnormPack32:
-      case Format::eA8B8G8R8UscaledPack32:
-      case Format::eA8B8G8R8SscaledPack32:
-      case Format::eA8B8G8R8UintPack32:
-      case Format::eA8B8G8R8SintPack32:
-      case Format::eA8B8G8R8SrgbPack32:
-      case Format::eA2R10G10B10UnormPack32:
-      case Format::eA2R10G10B10SnormPack32:
-      case Format::eA2R10G10B10UscaledPack32:
-      case Format::eA2R10G10B10SscaledPack32:
-      case Format::eA2R10G10B10UintPack32:
-      case Format::eA2R10G10B10SintPack32:
-      case Format::eA2B10G10R10UnormPack32:
-      case Format::eA2B10G10R10SnormPack32:
-      case Format::eA2B10G10R10UscaledPack32:
-      case Format::eA2B10G10R10SscaledPack32:
-      case Format::eA2B10G10R10UintPack32:
-      case Format::eA2B10G10R10SintPack32:
-      case Format::eR16G16B16A16Unorm:
-      case Format::eR16G16B16A16Snorm:
-      case Format::eR16G16B16A16Uscaled:
-      case Format::eR16G16B16A16Sscaled:
-      case Format::eR16G16B16A16Uint:
-      case Format::eR16G16B16A16Sint:
-      case Format::eR16G16B16A16Sfloat:
-      case Format::eR32G32B32A32Uint:
-      case Format::eR32G32B32A32Sint:
-      case Format::eR32G32B32A32Sfloat:
-      case Format::eR64G64B64A64Uint:
-      case Format::eR64G64B64A64Sint:
-      case Format::eR64G64B64A64Sfloat:
-      case Format::eBc1RgbaUnormBlock:
-      case Format::eBc1RgbaSrgbBlock:
-      case Format::eBc2UnormBlock:
-      case Format::eBc2SrgbBlock:
-      case Format::eBc3UnormBlock:
-      case Format::eBc3SrgbBlock:
-      case Format::eBc7UnormBlock:
-      case Format::eBc7SrgbBlock:
-      case Format::eEtc2R8G8B8A1UnormBlock:
-      case Format::eEtc2R8G8B8A1SrgbBlock:
-      case Format::eEtc2R8G8B8A8UnormBlock:
-      case Format::eEtc2R8G8B8A8SrgbBlock:
-      case Format::eAstc4x4UnormBlock:
-      case Format::eAstc4x4SrgbBlock:
-      case Format::eAstc5x4UnormBlock:
-      case Format::eAstc5x4SrgbBlock:
-      case Format::eAstc5x5UnormBlock:
-      case Format::eAstc5x5SrgbBlock:
-      case Format::eAstc6x5UnormBlock:
-      case Format::eAstc6x5SrgbBlock:
-      case Format::eAstc6x6UnormBlock:
-      case Format::eAstc6x6SrgbBlock:
-      case Format::eAstc8x5UnormBlock:
-      case Format::eAstc8x5SrgbBlock:
-      case Format::eAstc8x6UnormBlock:
-      case Format::eAstc8x6SrgbBlock:
-      case Format::eAstc8x8UnormBlock:
-      case Format::eAstc8x8SrgbBlock:
-      case Format::eAstc10x5UnormBlock:
-      case Format::eAstc10x5SrgbBlock:
-      case Format::eAstc10x6UnormBlock:
-      case Format::eAstc10x6SrgbBlock:
-      case Format::eAstc10x8UnormBlock:
-      case Format::eAstc10x8SrgbBlock:
-      case Format::eAstc10x10UnormBlock:
-      case Format::eAstc10x10SrgbBlock:
-      case Format::eAstc12x10UnormBlock:
-      case Format::eAstc12x10SrgbBlock:
-      case Format::eAstc12x12UnormBlock:
-      case Format::eAstc12x12SrgbBlock:
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
-      case Format::eA4R4G4B4UnormPack16:
-      case Format::eA4B4G4R4UnormPack16:
-      case Format::eAstc4x4SfloatBlock:
-      case Format::eAstc5x4SfloatBlock:
-      case Format::eAstc5x5SfloatBlock:
-      case Format::eAstc6x5SfloatBlock:
-      case Format::eAstc6x6SfloatBlock:
-      case Format::eAstc8x5SfloatBlock:
-      case Format::eAstc8x6SfloatBlock:
-      case Format::eAstc8x8SfloatBlock:
-      case Format::eAstc10x5SfloatBlock:
-      case Format::eAstc10x6SfloatBlock:
-      case Format::eAstc10x8SfloatBlock:
-      case Format::eAstc10x10SfloatBlock:
-      case Format::eAstc12x10SfloatBlock:
-      case Format::eAstc12x12SfloatBlock:
-      case Format::eA1B5G5R5UnormPack16:
-      case Format::eA8Unorm:
-      case Format::ePvrtc12BppUnormBlockIMG:
-      case Format::ePvrtc14BppUnormBlockIMG:
-      case Format::ePvrtc22BppUnormBlockIMG:
-      case Format::ePvrtc24BppUnormBlockIMG:
-      case Format::ePvrtc12BppSrgbBlockIMG:
-      case Format::ePvrtc14BppSrgbBlockIMG:
-      case Format::ePvrtc22BppSrgbBlockIMG:
-      case Format::ePvrtc24BppSrgbBlockIMG:
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM: return true;
-      default                                          : return false;
-    }
-  }
-
-  // True, if this format has a blue component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool hasBlueComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eR4G4B4A4UnormPack16:
-      case Format::eB4G4R4A4UnormPack16:
-      case Format::eR5G6B5UnormPack16:
-      case Format::eB5G6R5UnormPack16:
-      case Format::eR5G5B5A1UnormPack16:
-      case Format::eB5G5R5A1UnormPack16:
-      case Format::eA1R5G5B5UnormPack16:
-      case Format::eR8G8B8Unorm:
-      case Format::eR8G8B8Snorm:
-      case Format::eR8G8B8Uscaled:
-      case Format::eR8G8B8Sscaled:
-      case Format::eR8G8B8Uint:
-      case Format::eR8G8B8Sint:
-      case Format::eR8G8B8Srgb:
-      case Format::eB8G8R8Unorm:
-      case Format::eB8G8R8Snorm:
-      case Format::eB8G8R8Uscaled:
-      case Format::eB8G8R8Sscaled:
-      case Format::eB8G8R8Uint:
-      case Format::eB8G8R8Sint:
-      case Format::eB8G8R8Srgb:
-      case Format::eR8G8B8A8Unorm:
-      case Format::eR8G8B8A8Snorm:
-      case Format::eR8G8B8A8Uscaled:
-      case Format::eR8G8B8A8Sscaled:
-      case Format::eR8G8B8A8Uint:
-      case Format::eR8G8B8A8Sint:
-      case Format::eR8G8B8A8Srgb:
-      case Format::eB8G8R8A8Unorm:
-      case Format::eB8G8R8A8Snorm:
-      case Format::eB8G8R8A8Uscaled:
-      case Format::eB8G8R8A8Sscaled:
-      case Format::eB8G8R8A8Uint:
-      case Format::eB8G8R8A8Sint:
-      case Format::eB8G8R8A8Srgb:
-      case Format::eA8B8G8R8UnormPack32:
-      case Format::eA8B8G8R8SnormPack32:
-      case Format::eA8B8G8R8UscaledPack32:
-      case Format::eA8B8G8R8SscaledPack32:
-      case Format::eA8B8G8R8UintPack32:
-      case Format::eA8B8G8R8SintPack32:
-      case Format::eA8B8G8R8SrgbPack32:
-      case Format::eA2R10G10B10UnormPack32:
-      case Format::eA2R10G10B10SnormPack32:
-      case Format::eA2R10G10B10UscaledPack32:
-      case Format::eA2R10G10B10SscaledPack32:
-      case Format::eA2R10G10B10UintPack32:
-      case Format::eA2R10G10B10SintPack32:
-      case Format::eA2B10G10R10UnormPack32:
-      case Format::eA2B10G10R10SnormPack32:
-      case Format::eA2B10G10R10UscaledPack32:
-      case Format::eA2B10G10R10SscaledPack32:
-      case Format::eA2B10G10R10UintPack32:
-      case Format::eA2B10G10R10SintPack32:
-      case Format::eR16G16B16Unorm:
-      case Format::eR16G16B16Snorm:
-      case Format::eR16G16B16Uscaled:
-      case Format::eR16G16B16Sscaled:
-      case Format::eR16G16B16Uint:
-      case Format::eR16G16B16Sint:
-      case Format::eR16G16B16Sfloat:
-      case Format::eR16G16B16A16Unorm:
-      case Format::eR16G16B16A16Snorm:
-      case Format::eR16G16B16A16Uscaled:
-      case Format::eR16G16B16A16Sscaled:
-      case Format::eR16G16B16A16Uint:
-      case Format::eR16G16B16A16Sint:
-      case Format::eR16G16B16A16Sfloat:
-      case Format::eR32G32B32Uint:
-      case Format::eR32G32B32Sint:
-      case Format::eR32G32B32Sfloat:
-      case Format::eR32G32B32A32Uint:
-      case Format::eR32G32B32A32Sint:
-      case Format::eR32G32B32A32Sfloat:
-      case Format::eR64G64B64Uint:
-      case Format::eR64G64B64Sint:
-      case Format::eR64G64B64Sfloat:
-      case Format::eR64G64B64A64Uint:
-      case Format::eR64G64B64A64Sint:
-      case Format::eR64G64B64A64Sfloat:
-      case Format::eB10G11R11UfloatPack32:
-      case Format::eE5B9G9R9UfloatPack32:
-      case Format::eBc1RgbUnormBlock:
-      case Format::eBc1RgbSrgbBlock:
-      case Format::eBc1RgbaUnormBlock:
-      case Format::eBc1RgbaSrgbBlock:
-      case Format::eBc2UnormBlock:
-      case Format::eBc2SrgbBlock:
-      case Format::eBc3UnormBlock:
-      case Format::eBc3SrgbBlock:
-      case Format::eBc6HUfloatBlock:
-      case Format::eBc6HSfloatBlock:
-      case Format::eBc7UnormBlock:
-      case Format::eBc7SrgbBlock:
-      case Format::eEtc2R8G8B8UnormBlock:
-      case Format::eEtc2R8G8B8SrgbBlock:
-      case Format::eEtc2R8G8B8A1UnormBlock:
-      case Format::eEtc2R8G8B8A1SrgbBlock:
-      case Format::eEtc2R8G8B8A8UnormBlock:
-      case Format::eEtc2R8G8B8A8SrgbBlock:
-      case Format::eAstc4x4UnormBlock:
-      case Format::eAstc4x4SrgbBlock:
-      case Format::eAstc5x4UnormBlock:
-      case Format::eAstc5x4SrgbBlock:
-      case Format::eAstc5x5UnormBlock:
-      case Format::eAstc5x5SrgbBlock:
-      case Format::eAstc6x5UnormBlock:
-      case Format::eAstc6x5SrgbBlock:
-      case Format::eAstc6x6UnormBlock:
-      case Format::eAstc6x6SrgbBlock:
-      case Format::eAstc8x5UnormBlock:
-      case Format::eAstc8x5SrgbBlock:
-      case Format::eAstc8x6UnormBlock:
-      case Format::eAstc8x6SrgbBlock:
-      case Format::eAstc8x8UnormBlock:
-      case Format::eAstc8x8SrgbBlock:
-      case Format::eAstc10x5UnormBlock:
-      case Format::eAstc10x5SrgbBlock:
-      case Format::eAstc10x6UnormBlock:
-      case Format::eAstc10x6SrgbBlock:
-      case Format::eAstc10x8UnormBlock:
-      case Format::eAstc10x8SrgbBlock:
-      case Format::eAstc10x10UnormBlock:
-      case Format::eAstc10x10SrgbBlock:
-      case Format::eAstc12x10UnormBlock:
-      case Format::eAstc12x10SrgbBlock:
-      case Format::eAstc12x12UnormBlock:
-      case Format::eAstc12x12SrgbBlock:
-      case Format::eG8B8G8R8422Unorm:
-      case Format::eB8G8R8G8422Unorm:
-      case Format::eG8B8R83Plane420Unorm:
-      case Format::eG8B8R82Plane420Unorm:
-      case Format::eG8B8R83Plane422Unorm:
-      case Format::eG8B8R82Plane422Unorm:
-      case Format::eG8B8R83Plane444Unorm:
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
-      case Format::eG16B16G16R16422Unorm:
-      case Format::eB16G16R16G16422Unorm:
-      case Format::eG16B16R163Plane420Unorm:
-      case Format::eG16B16R162Plane420Unorm:
-      case Format::eG16B16R163Plane422Unorm:
-      case Format::eG16B16R162Plane422Unorm:
-      case Format::eG16B16R163Plane444Unorm:
-      case Format::eG8B8R82Plane444Unorm:
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
-      case Format::eG16B16R162Plane444Unorm:
-      case Format::eA4R4G4B4UnormPack16:
-      case Format::eA4B4G4R4UnormPack16:
-      case Format::eAstc4x4SfloatBlock:
-      case Format::eAstc5x4SfloatBlock:
-      case Format::eAstc5x5SfloatBlock:
-      case Format::eAstc6x5SfloatBlock:
-      case Format::eAstc6x6SfloatBlock:
-      case Format::eAstc8x5SfloatBlock:
-      case Format::eAstc8x6SfloatBlock:
-      case Format::eAstc8x8SfloatBlock:
-      case Format::eAstc10x5SfloatBlock:
-      case Format::eAstc10x6SfloatBlock:
-      case Format::eAstc10x8SfloatBlock:
-      case Format::eAstc10x10SfloatBlock:
-      case Format::eAstc12x10SfloatBlock:
-      case Format::eAstc12x12SfloatBlock:
-      case Format::eA1B5G5R5UnormPack16:
-      case Format::ePvrtc12BppUnormBlockIMG:
-      case Format::ePvrtc14BppUnormBlockIMG:
-      case Format::ePvrtc22BppUnormBlockIMG:
-      case Format::ePvrtc24BppUnormBlockIMG:
-      case Format::ePvrtc12BppSrgbBlockIMG:
-      case Format::ePvrtc14BppSrgbBlockIMG:
-      case Format::ePvrtc22BppSrgbBlockIMG:
-      case Format::ePvrtc24BppSrgbBlockIMG:
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return true;
-      default                                              : return false;
-    }
-  }
-
-  // True, if this format has a depth component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool hasDepthComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eD16Unorm:
-      case Format::eX8D24UnormPack32:
-      case Format::eD32Sfloat:
-      case Format::eD16UnormS8Uint:
-      case Format::eD24UnormS8Uint:
-      case Format::eD32SfloatS8Uint : return true;
-      default                       : return false;
-    }
-  }
-
-  // True, if this format has a green component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool hasGreenComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eR4G4UnormPack8:
-      case Format::eR4G4B4A4UnormPack16:
-      case Format::eB4G4R4A4UnormPack16:
-      case Format::eR5G6B5UnormPack16:
-      case Format::eB5G6R5UnormPack16:
-      case Format::eR5G5B5A1UnormPack16:
-      case Format::eB5G5R5A1UnormPack16:
-      case Format::eA1R5G5B5UnormPack16:
-      case Format::eR8G8Unorm:
-      case Format::eR8G8Snorm:
-      case Format::eR8G8Uscaled:
-      case Format::eR8G8Sscaled:
-      case Format::eR8G8Uint:
-      case Format::eR8G8Sint:
-      case Format::eR8G8Srgb:
-      case Format::eR8G8B8Unorm:
-      case Format::eR8G8B8Snorm:
-      case Format::eR8G8B8Uscaled:
-      case Format::eR8G8B8Sscaled:
-      case Format::eR8G8B8Uint:
-      case Format::eR8G8B8Sint:
-      case Format::eR8G8B8Srgb:
-      case Format::eB8G8R8Unorm:
-      case Format::eB8G8R8Snorm:
-      case Format::eB8G8R8Uscaled:
-      case Format::eB8G8R8Sscaled:
-      case Format::eB8G8R8Uint:
-      case Format::eB8G8R8Sint:
-      case Format::eB8G8R8Srgb:
-      case Format::eR8G8B8A8Unorm:
-      case Format::eR8G8B8A8Snorm:
-      case Format::eR8G8B8A8Uscaled:
-      case Format::eR8G8B8A8Sscaled:
-      case Format::eR8G8B8A8Uint:
-      case Format::eR8G8B8A8Sint:
-      case Format::eR8G8B8A8Srgb:
-      case Format::eB8G8R8A8Unorm:
-      case Format::eB8G8R8A8Snorm:
-      case Format::eB8G8R8A8Uscaled:
-      case Format::eB8G8R8A8Sscaled:
-      case Format::eB8G8R8A8Uint:
-      case Format::eB8G8R8A8Sint:
-      case Format::eB8G8R8A8Srgb:
-      case Format::eA8B8G8R8UnormPack32:
-      case Format::eA8B8G8R8SnormPack32:
-      case Format::eA8B8G8R8UscaledPack32:
-      case Format::eA8B8G8R8SscaledPack32:
-      case Format::eA8B8G8R8UintPack32:
-      case Format::eA8B8G8R8SintPack32:
-      case Format::eA8B8G8R8SrgbPack32:
-      case Format::eA2R10G10B10UnormPack32:
-      case Format::eA2R10G10B10SnormPack32:
-      case Format::eA2R10G10B10UscaledPack32:
-      case Format::eA2R10G10B10SscaledPack32:
-      case Format::eA2R10G10B10UintPack32:
-      case Format::eA2R10G10B10SintPack32:
-      case Format::eA2B10G10R10UnormPack32:
-      case Format::eA2B10G10R10SnormPack32:
-      case Format::eA2B10G10R10UscaledPack32:
-      case Format::eA2B10G10R10SscaledPack32:
-      case Format::eA2B10G10R10UintPack32:
-      case Format::eA2B10G10R10SintPack32:
-      case Format::eR16G16Unorm:
-      case Format::eR16G16Snorm:
-      case Format::eR16G16Uscaled:
-      case Format::eR16G16Sscaled:
-      case Format::eR16G16Uint:
-      case Format::eR16G16Sint:
-      case Format::eR16G16Sfloat:
-      case Format::eR16G16B16Unorm:
-      case Format::eR16G16B16Snorm:
-      case Format::eR16G16B16Uscaled:
-      case Format::eR16G16B16Sscaled:
-      case Format::eR16G16B16Uint:
-      case Format::eR16G16B16Sint:
-      case Format::eR16G16B16Sfloat:
-      case Format::eR16G16B16A16Unorm:
-      case Format::eR16G16B16A16Snorm:
-      case Format::eR16G16B16A16Uscaled:
-      case Format::eR16G16B16A16Sscaled:
-      case Format::eR16G16B16A16Uint:
-      case Format::eR16G16B16A16Sint:
-      case Format::eR16G16B16A16Sfloat:
-      case Format::eR32G32Uint:
-      case Format::eR32G32Sint:
-      case Format::eR32G32Sfloat:
-      case Format::eR32G32B32Uint:
-      case Format::eR32G32B32Sint:
-      case Format::eR32G32B32Sfloat:
-      case Format::eR32G32B32A32Uint:
-      case Format::eR32G32B32A32Sint:
-      case Format::eR32G32B32A32Sfloat:
-      case Format::eR64G64Uint:
-      case Format::eR64G64Sint:
-      case Format::eR64G64Sfloat:
-      case Format::eR64G64B64Uint:
-      case Format::eR64G64B64Sint:
-      case Format::eR64G64B64Sfloat:
-      case Format::eR64G64B64A64Uint:
-      case Format::eR64G64B64A64Sint:
-      case Format::eR64G64B64A64Sfloat:
-      case Format::eB10G11R11UfloatPack32:
-      case Format::eE5B9G9R9UfloatPack32:
-      case Format::eBc1RgbUnormBlock:
-      case Format::eBc1RgbSrgbBlock:
-      case Format::eBc1RgbaUnormBlock:
-      case Format::eBc1RgbaSrgbBlock:
-      case Format::eBc2UnormBlock:
-      case Format::eBc2SrgbBlock:
-      case Format::eBc3UnormBlock:
-      case Format::eBc3SrgbBlock:
-      case Format::eBc5UnormBlock:
-      case Format::eBc5SnormBlock:
-      case Format::eBc6HUfloatBlock:
-      case Format::eBc6HSfloatBlock:
-      case Format::eBc7UnormBlock:
-      case Format::eBc7SrgbBlock:
-      case Format::eEtc2R8G8B8UnormBlock:
-      case Format::eEtc2R8G8B8SrgbBlock:
-      case Format::eEtc2R8G8B8A1UnormBlock:
-      case Format::eEtc2R8G8B8A1SrgbBlock:
-      case Format::eEtc2R8G8B8A8UnormBlock:
-      case Format::eEtc2R8G8B8A8SrgbBlock:
-      case Format::eEacR11G11UnormBlock:
-      case Format::eEacR11G11SnormBlock:
-      case Format::eAstc4x4UnormBlock:
-      case Format::eAstc4x4SrgbBlock:
-      case Format::eAstc5x4UnormBlock:
-      case Format::eAstc5x4SrgbBlock:
-      case Format::eAstc5x5UnormBlock:
-      case Format::eAstc5x5SrgbBlock:
-      case Format::eAstc6x5UnormBlock:
-      case Format::eAstc6x5SrgbBlock:
-      case Format::eAstc6x6UnormBlock:
-      case Format::eAstc6x6SrgbBlock:
-      case Format::eAstc8x5UnormBlock:
-      case Format::eAstc8x5SrgbBlock:
-      case Format::eAstc8x6UnormBlock:
-      case Format::eAstc8x6SrgbBlock:
-      case Format::eAstc8x8UnormBlock:
-      case Format::eAstc8x8SrgbBlock:
-      case Format::eAstc10x5UnormBlock:
-      case Format::eAstc10x5SrgbBlock:
-      case Format::eAstc10x6UnormBlock:
-      case Format::eAstc10x6SrgbBlock:
-      case Format::eAstc10x8UnormBlock:
-      case Format::eAstc10x8SrgbBlock:
-      case Format::eAstc10x10UnormBlock:
-      case Format::eAstc10x10SrgbBlock:
-      case Format::eAstc12x10UnormBlock:
-      case Format::eAstc12x10SrgbBlock:
-      case Format::eAstc12x12UnormBlock:
-      case Format::eAstc12x12SrgbBlock:
-      case Format::eG8B8G8R8422Unorm:
-      case Format::eB8G8R8G8422Unorm:
-      case Format::eG8B8R83Plane420Unorm:
-      case Format::eG8B8R82Plane420Unorm:
-      case Format::eG8B8R83Plane422Unorm:
-      case Format::eG8B8R82Plane422Unorm:
-      case Format::eG8B8R83Plane444Unorm:
-      case Format::eR10X6G10X6Unorm2Pack16:
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
-      case Format::eR12X4G12X4Unorm2Pack16:
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
-      case Format::eG16B16G16R16422Unorm:
-      case Format::eB16G16R16G16422Unorm:
-      case Format::eG16B16R163Plane420Unorm:
-      case Format::eG16B16R162Plane420Unorm:
-      case Format::eG16B16R163Plane422Unorm:
-      case Format::eG16B16R162Plane422Unorm:
-      case Format::eG16B16R163Plane444Unorm:
-      case Format::eG8B8R82Plane444Unorm:
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
-      case Format::eG16B16R162Plane444Unorm:
-      case Format::eA4R4G4B4UnormPack16:
-      case Format::eA4B4G4R4UnormPack16:
-      case Format::eAstc4x4SfloatBlock:
-      case Format::eAstc5x4SfloatBlock:
-      case Format::eAstc5x5SfloatBlock:
-      case Format::eAstc6x5SfloatBlock:
-      case Format::eAstc6x6SfloatBlock:
-      case Format::eAstc8x5SfloatBlock:
-      case Format::eAstc8x6SfloatBlock:
-      case Format::eAstc8x8SfloatBlock:
-      case Format::eAstc10x5SfloatBlock:
-      case Format::eAstc10x6SfloatBlock:
-      case Format::eAstc10x8SfloatBlock:
-      case Format::eAstc10x10SfloatBlock:
-      case Format::eAstc12x10SfloatBlock:
-      case Format::eAstc12x12SfloatBlock:
-      case Format::eA1B5G5R5UnormPack16:
-      case Format::ePvrtc12BppUnormBlockIMG:
-      case Format::ePvrtc14BppUnormBlockIMG:
-      case Format::ePvrtc22BppUnormBlockIMG:
-      case Format::ePvrtc24BppUnormBlockIMG:
-      case Format::ePvrtc12BppSrgbBlockIMG:
-      case Format::ePvrtc14BppSrgbBlockIMG:
-      case Format::ePvrtc22BppSrgbBlockIMG:
-      case Format::ePvrtc24BppSrgbBlockIMG:
-      case Format::eR16G16Sfixed5NV:
-      case Format::eR10X6G10X6Uint2Pack16ARM:
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-      case Format::eR12X4G12X4Uint2Pack16ARM:
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-      case Format::eR14X2G14X2Uint2Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-      case Format::eR14X2G14X2Unorm2Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return true;
-      default                                              : return false;
-    }
-  }
-
-  // True, if this format has a red component
-  VULKAN_HPP_CONSTEXPR_14 bool hasRedComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eR4G4UnormPack8:
-      case Format::eR4G4B4A4UnormPack16:
-      case Format::eB4G4R4A4UnormPack16:
-      case Format::eR5G6B5UnormPack16:
-      case Format::eB5G6R5UnormPack16:
-      case Format::eR5G5B5A1UnormPack16:
-      case Format::eB5G5R5A1UnormPack16:
-      case Format::eA1R5G5B5UnormPack16:
-      case Format::eR8Unorm:
-      case Format::eR8Snorm:
-      case Format::eR8Uscaled:
-      case Format::eR8Sscaled:
-      case Format::eR8Uint:
-      case Format::eR8Sint:
-      case Format::eR8Srgb:
-      case Format::eR8G8Unorm:
-      case Format::eR8G8Snorm:
-      case Format::eR8G8Uscaled:
-      case Format::eR8G8Sscaled:
-      case Format::eR8G8Uint:
-      case Format::eR8G8Sint:
-      case Format::eR8G8Srgb:
-      case Format::eR8G8B8Unorm:
-      case Format::eR8G8B8Snorm:
-      case Format::eR8G8B8Uscaled:
-      case Format::eR8G8B8Sscaled:
-      case Format::eR8G8B8Uint:
-      case Format::eR8G8B8Sint:
-      case Format::eR8G8B8Srgb:
-      case Format::eB8G8R8Unorm:
-      case Format::eB8G8R8Snorm:
-      case Format::eB8G8R8Uscaled:
-      case Format::eB8G8R8Sscaled:
-      case Format::eB8G8R8Uint:
-      case Format::eB8G8R8Sint:
-      case Format::eB8G8R8Srgb:
-      case Format::eR8G8B8A8Unorm:
-      case Format::eR8G8B8A8Snorm:
-      case Format::eR8G8B8A8Uscaled:
-      case Format::eR8G8B8A8Sscaled:
-      case Format::eR8G8B8A8Uint:
-      case Format::eR8G8B8A8Sint:
-      case Format::eR8G8B8A8Srgb:
-      case Format::eB8G8R8A8Unorm:
-      case Format::eB8G8R8A8Snorm:
-      case Format::eB8G8R8A8Uscaled:
-      case Format::eB8G8R8A8Sscaled:
-      case Format::eB8G8R8A8Uint:
-      case Format::eB8G8R8A8Sint:
-      case Format::eB8G8R8A8Srgb:
-      case Format::eA8B8G8R8UnormPack32:
-      case Format::eA8B8G8R8SnormPack32:
-      case Format::eA8B8G8R8UscaledPack32:
-      case Format::eA8B8G8R8SscaledPack32:
-      case Format::eA8B8G8R8UintPack32:
-      case Format::eA8B8G8R8SintPack32:
-      case Format::eA8B8G8R8SrgbPack32:
-      case Format::eA2R10G10B10UnormPack32:
-      case Format::eA2R10G10B10SnormPack32:
-      case Format::eA2R10G10B10UscaledPack32:
-      case Format::eA2R10G10B10SscaledPack32:
-      case Format::eA2R10G10B10UintPack32:
-      case Format::eA2R10G10B10SintPack32:
-      case Format::eA2B10G10R10UnormPack32:
-      case Format::eA2B10G10R10SnormPack32:
-      case Format::eA2B10G10R10UscaledPack32:
-      case Format::eA2B10G10R10SscaledPack32:
-      case Format::eA2B10G10R10UintPack32:
-      case Format::eA2B10G10R10SintPack32:
-      case Format::eR16Unorm:
-      case Format::eR16Snorm:
-      case Format::eR16Uscaled:
-      case Format::eR16Sscaled:
-      case Format::eR16Uint:
-      case Format::eR16Sint:
-      case Format::eR16Sfloat:
-      case Format::eR16G16Unorm:
-      case Format::eR16G16Snorm:
-      case Format::eR16G16Uscaled:
-      case Format::eR16G16Sscaled:
-      case Format::eR16G16Uint:
-      case Format::eR16G16Sint:
-      case Format::eR16G16Sfloat:
-      case Format::eR16G16B16Unorm:
-      case Format::eR16G16B16Snorm:
-      case Format::eR16G16B16Uscaled:
-      case Format::eR16G16B16Sscaled:
-      case Format::eR16G16B16Uint:
-      case Format::eR16G16B16Sint:
-      case Format::eR16G16B16Sfloat:
-      case Format::eR16G16B16A16Unorm:
-      case Format::eR16G16B16A16Snorm:
-      case Format::eR16G16B16A16Uscaled:
-      case Format::eR16G16B16A16Sscaled:
-      case Format::eR16G16B16A16Uint:
-      case Format::eR16G16B16A16Sint:
-      case Format::eR16G16B16A16Sfloat:
-      case Format::eR32Uint:
-      case Format::eR32Sint:
-      case Format::eR32Sfloat:
-      case Format::eR32G32Uint:
-      case Format::eR32G32Sint:
-      case Format::eR32G32Sfloat:
-      case Format::eR32G32B32Uint:
-      case Format::eR32G32B32Sint:
-      case Format::eR32G32B32Sfloat:
-      case Format::eR32G32B32A32Uint:
-      case Format::eR32G32B32A32Sint:
-      case Format::eR32G32B32A32Sfloat:
-      case Format::eR64Uint:
-      case Format::eR64Sint:
-      case Format::eR64Sfloat:
-      case Format::eR64G64Uint:
-      case Format::eR64G64Sint:
-      case Format::eR64G64Sfloat:
-      case Format::eR64G64B64Uint:
-      case Format::eR64G64B64Sint:
-      case Format::eR64G64B64Sfloat:
-      case Format::eR64G64B64A64Uint:
-      case Format::eR64G64B64A64Sint:
-      case Format::eR64G64B64A64Sfloat:
-      case Format::eB10G11R11UfloatPack32:
-      case Format::eE5B9G9R9UfloatPack32:
-      case Format::eBc1RgbUnormBlock:
-      case Format::eBc1RgbSrgbBlock:
-      case Format::eBc1RgbaUnormBlock:
-      case Format::eBc1RgbaSrgbBlock:
-      case Format::eBc2UnormBlock:
-      case Format::eBc2SrgbBlock:
-      case Format::eBc3UnormBlock:
-      case Format::eBc3SrgbBlock:
-      case Format::eBc4UnormBlock:
-      case Format::eBc4SnormBlock:
-      case Format::eBc5UnormBlock:
-      case Format::eBc5SnormBlock:
-      case Format::eBc6HUfloatBlock:
-      case Format::eBc6HSfloatBlock:
-      case Format::eBc7UnormBlock:
-      case Format::eBc7SrgbBlock:
-      case Format::eEtc2R8G8B8UnormBlock:
-      case Format::eEtc2R8G8B8SrgbBlock:
-      case Format::eEtc2R8G8B8A1UnormBlock:
-      case Format::eEtc2R8G8B8A1SrgbBlock:
-      case Format::eEtc2R8G8B8A8UnormBlock:
-      case Format::eEtc2R8G8B8A8SrgbBlock:
-      case Format::eEacR11UnormBlock:
-      case Format::eEacR11SnormBlock:
-      case Format::eEacR11G11UnormBlock:
-      case Format::eEacR11G11SnormBlock:
-      case Format::eAstc4x4UnormBlock:
-      case Format::eAstc4x4SrgbBlock:
-      case Format::eAstc5x4UnormBlock:
-      case Format::eAstc5x4SrgbBlock:
-      case Format::eAstc5x5UnormBlock:
-      case Format::eAstc5x5SrgbBlock:
-      case Format::eAstc6x5UnormBlock:
-      case Format::eAstc6x5SrgbBlock:
-      case Format::eAstc6x6UnormBlock:
-      case Format::eAstc6x6SrgbBlock:
-      case Format::eAstc8x5UnormBlock:
-      case Format::eAstc8x5SrgbBlock:
-      case Format::eAstc8x6UnormBlock:
-      case Format::eAstc8x6SrgbBlock:
-      case Format::eAstc8x8UnormBlock:
-      case Format::eAstc8x8SrgbBlock:
-      case Format::eAstc10x5UnormBlock:
-      case Format::eAstc10x5SrgbBlock:
-      case Format::eAstc10x6UnormBlock:
-      case Format::eAstc10x6SrgbBlock:
-      case Format::eAstc10x8UnormBlock:
-      case Format::eAstc10x8SrgbBlock:
-      case Format::eAstc10x10UnormBlock:
-      case Format::eAstc10x10SrgbBlock:
-      case Format::eAstc12x10UnormBlock:
-      case Format::eAstc12x10SrgbBlock:
-      case Format::eAstc12x12UnormBlock:
-      case Format::eAstc12x12SrgbBlock:
-      case Format::eG8B8G8R8422Unorm:
-      case Format::eB8G8R8G8422Unorm:
-      case Format::eG8B8R83Plane420Unorm:
-      case Format::eG8B8R82Plane420Unorm:
-      case Format::eG8B8R83Plane422Unorm:
-      case Format::eG8B8R82Plane422Unorm:
-      case Format::eG8B8R83Plane444Unorm:
-      case Format::eR10X6UnormPack16:
-      case Format::eR10X6G10X6Unorm2Pack16:
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16:
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16:
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16:
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
-      case Format::eR12X4UnormPack16:
-      case Format::eR12X4G12X4Unorm2Pack16:
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16:
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16:
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16:
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
-      case Format::eG16B16G16R16422Unorm:
-      case Format::eB16G16R16G16422Unorm:
-      case Format::eG16B16R163Plane420Unorm:
-      case Format::eG16B16R162Plane420Unorm:
-      case Format::eG16B16R163Plane422Unorm:
-      case Format::eG16B16R162Plane422Unorm:
-      case Format::eG16B16R163Plane444Unorm:
-      case Format::eG8B8R82Plane444Unorm:
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
-      case Format::eG16B16R162Plane444Unorm:
-      case Format::eA4R4G4B4UnormPack16:
-      case Format::eA4B4G4R4UnormPack16:
-      case Format::eAstc4x4SfloatBlock:
-      case Format::eAstc5x4SfloatBlock:
-      case Format::eAstc5x5SfloatBlock:
-      case Format::eAstc6x5SfloatBlock:
-      case Format::eAstc6x6SfloatBlock:
-      case Format::eAstc8x5SfloatBlock:
-      case Format::eAstc8x6SfloatBlock:
-      case Format::eAstc8x8SfloatBlock:
-      case Format::eAstc10x5SfloatBlock:
-      case Format::eAstc10x6SfloatBlock:
-      case Format::eAstc10x8SfloatBlock:
-      case Format::eAstc10x10SfloatBlock:
-      case Format::eAstc12x10SfloatBlock:
-      case Format::eAstc12x12SfloatBlock:
-      case Format::eA1B5G5R5UnormPack16:
-      case Format::ePvrtc12BppUnormBlockIMG:
-      case Format::ePvrtc14BppUnormBlockIMG:
-      case Format::ePvrtc22BppUnormBlockIMG:
-      case Format::ePvrtc24BppUnormBlockIMG:
-      case Format::ePvrtc12BppSrgbBlockIMG:
-      case Format::ePvrtc14BppSrgbBlockIMG:
-      case Format::ePvrtc22BppSrgbBlockIMG:
-      case Format::ePvrtc24BppSrgbBlockIMG:
-      case Format::eR8BoolARM:
-      case Format::eR16G16Sfixed5NV:
-      case Format::eR10X6UintPack16ARM:
-      case Format::eR10X6G10X6Uint2Pack16ARM:
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM:
-      case Format::eR12X4UintPack16ARM:
-      case Format::eR12X4G12X4Uint2Pack16ARM:
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM:
-      case Format::eR14X2UintPack16ARM:
-      case Format::eR14X2G14X2Uint2Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM:
-      case Format::eR14X2UnormPack16ARM:
-      case Format::eR14X2G14X2Unorm2Pack16ARM:
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return true;
-      default                                              : return false;
-    }
-  }
-
-  // True, if this format has a stencil component
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool hasStencilComponent( Format format )
-  {
-    switch ( format )
-    {
-      case Format::eS8Uint:
-      case Format::eD16UnormS8Uint:
-      case Format::eD24UnormS8Uint:
-      case Format::eD32SfloatS8Uint: return true;
-      default                      : return false;
-    }
-  }
-
-  // True, if this format is a color.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool isColor( Format format )
-  {
-    return hasRedComponent( format ) || hasGreenComponent( format ) || hasBlueComponent( format ) || hasAlphaComponent( format );
-  }
-
   // True, if this format is a compressed one.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool isCompressed( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 bool isCompressed( VULKAN_HPP_NAMESPACE::Format format )
   {
-    return ( *compressionScheme( format ) != 0 );
+    return ( *VULKAN_HPP_NAMESPACE::compressionScheme( format ) != 0 );
   }
 
   // The number of bits into which the format is packed. A single image element in this format
   // can be stored in the same space as a scalar type of this bit width.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t packed( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t packed( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8                         : return 8;
-      case Format::eR4G4B4A4UnormPack16                    : return 16;
-      case Format::eB4G4R4A4UnormPack16                    : return 16;
-      case Format::eR5G6B5UnormPack16                      : return 16;
-      case Format::eB5G6R5UnormPack16                      : return 16;
-      case Format::eR5G5B5A1UnormPack16                    : return 16;
-      case Format::eB5G5R5A1UnormPack16                    : return 16;
-      case Format::eA1R5G5B5UnormPack16                    : return 16;
-      case Format::eA8B8G8R8UnormPack32                    : return 32;
-      case Format::eA8B8G8R8SnormPack32                    : return 32;
-      case Format::eA8B8G8R8UscaledPack32                  : return 32;
-      case Format::eA8B8G8R8SscaledPack32                  : return 32;
-      case Format::eA8B8G8R8UintPack32                     : return 32;
-      case Format::eA8B8G8R8SintPack32                     : return 32;
-      case Format::eA8B8G8R8SrgbPack32                     : return 32;
-      case Format::eA2R10G10B10UnormPack32                 : return 32;
-      case Format::eA2R10G10B10SnormPack32                 : return 32;
-      case Format::eA2R10G10B10UscaledPack32               : return 32;
-      case Format::eA2R10G10B10SscaledPack32               : return 32;
-      case Format::eA2R10G10B10UintPack32                  : return 32;
-      case Format::eA2R10G10B10SintPack32                  : return 32;
-      case Format::eA2B10G10R10UnormPack32                 : return 32;
-      case Format::eA2B10G10R10SnormPack32                 : return 32;
-      case Format::eA2B10G10R10UscaledPack32               : return 32;
-      case Format::eA2B10G10R10SscaledPack32               : return 32;
-      case Format::eA2B10G10R10UintPack32                  : return 32;
-      case Format::eA2B10G10R10SintPack32                  : return 32;
-      case Format::eB10G11R11UfloatPack32                  : return 32;
-      case Format::eE5B9G9R9UfloatPack32                   : return 32;
-      case Format::eX8D24UnormPack32                       : return 32;
-      case Format::eR10X6UnormPack16                       : return 16;
-      case Format::eR10X6G10X6Unorm2Pack16                 : return 16;
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return 16;
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return 16;
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return 16;
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return 16;
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return 16;
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return 16;
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return 16;
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return 16;
-      case Format::eR12X4UnormPack16                       : return 16;
-      case Format::eR12X4G12X4Unorm2Pack16                 : return 16;
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return 16;
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return 16;
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return 16;
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return 16;
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return 16;
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return 16;
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return 16;
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return 16;
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return 16;
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return 16;
-      case Format::eA4R4G4B4UnormPack16                    : return 16;
-      case Format::eA4B4G4R4UnormPack16                    : return 16;
-      case Format::eA1B5G5R5UnormPack16                    : return 16;
-      case Format::eR10X6UintPack16ARM                     : return 16;
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return 16;
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return 16;
-      case Format::eR12X4UintPack16ARM                     : return 16;
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return 16;
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return 16;
-      case Format::eR14X2UintPack16ARM                     : return 16;
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return 16;
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return 16;
-      case Format::eR14X2UnormPack16ARM                    : return 16;
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return 16;
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return 16;
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return 16;
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8: return 8;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32: return 32;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR: return 16;
 
       default: return 0;
     }
   }
 
   // The single-plane format that this plane is compatible with.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 Format planeCompatibleFormat( Format format, uint8_t plane )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 VULKAN_HPP_NAMESPACE::Format planeCompatibleFormat( VULKAN_HPP_NAMESPACE::Format format, uint8_t plane )
   {
     switch ( format )
     {
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8Unorm;
-          case 2 : return Format::eR8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8G8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8Unorm;
-          case 2 : return Format::eR8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8G8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8Unorm;
-          case 2 : return Format::eR8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6UnormPack16;
-          case 2 : return Format::eR10X6UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6G10X6Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6UnormPack16;
-          case 2 : return Format::eR10X6UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6G10X6Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6UnormPack16;
-          case 2 : return Format::eR10X6UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4UnormPack16;
-          case 2 : return Format::eR12X4UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4G12X4Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4UnormPack16;
-          case 2 : return Format::eR12X4UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4G12X4Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4UnormPack16;
-          case 2 : return Format::eR12X4UnormPack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16Unorm;
-          case 2 : return Format::eR16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16G16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16Unorm;
-          case 2 : return Format::eR16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16G16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16Unorm;
-          case 2 : return Format::eR16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 2: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR8Unorm;
-          case 1 : return Format::eR8G8Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR8Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR10X6UnormPack16;
-          case 1 : return Format::eR10X6G10X6Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return Format::eR12X4UnormPack16;
-          case 1 : return Format::eR12X4G12X4Unorm2Pack16;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return Format::eR16Unorm;
-          case 1 : return Format::eR16G16Unorm;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return Format::eR14X2UnormPack16ARM;
-          case 1 : return Format::eR14X2G14X2Unorm2Pack16ARM;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return Format::eR14X2UnormPack16ARM;
-          case 1 : return Format::eR14X2G14X2Unorm2Pack16ARM;
-          default: VULKAN_HPP_ASSERT( false ); return Format::eUndefined;
+          case 0: return VULKAN_HPP_NAMESPACE::Format::eR16Unorm;
+          case 1: return VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm;
+          default: VULKAN_HPP_ASSERT( false ); return VULKAN_HPP_NAMESPACE::Format::eUndefined;
         }
 
       default: VULKAN_HPP_ASSERT( plane == 0 ); return format;
@@ -8925,238 +6993,222 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The number of image planes of this format.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeCount( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeCount( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eG8B8R83Plane420Unorm                   : return 3;
-      case Format::eG8B8R82Plane420Unorm                   : return 2;
-      case Format::eG8B8R83Plane422Unorm                   : return 3;
-      case Format::eG8B8R82Plane422Unorm                   : return 2;
-      case Format::eG8B8R83Plane444Unorm                   : return 3;
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return 2;
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return 3;
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return 2;
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return 2;
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return 3;
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return 2;
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return 3;
-      case Format::eG16B16R163Plane420Unorm                : return 3;
-      case Format::eG16B16R162Plane420Unorm                : return 2;
-      case Format::eG16B16R163Plane422Unorm                : return 3;
-      case Format::eG16B16R162Plane422Unorm                : return 2;
-      case Format::eG16B16R163Plane444Unorm                : return 3;
-      case Format::eG8B8R82Plane444Unorm                   : return 2;
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return 2;
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return 2;
-      case Format::eG16B16R162Plane444Unorm                : return 2;
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return 2;
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm: return 3;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return 2;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm: return 2;
 
       default: return 1;
     }
   }
 
   // The relative height of this plane. A value of k means that this plane is 1/k the height of the overall format.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeHeightDivisor( Format format, uint8_t plane )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeHeightDivisor( VULKAN_HPP_NAMESPACE::Format format, uint8_t plane )
   {
     switch ( format )
     {
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          default: VULKAN_HPP_ASSERT( false ); return 1;
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return 1;
-          case 1 : return 2;
-          default: VULKAN_HPP_ASSERT( false ); return 1;
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
 
@@ -9165,202 +7217,188 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The relative width of this plane. A value of k means that this plane is 1/k the width of the overall format.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeWidthDivisor( Format format, uint8_t plane )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t planeWidthDivisor( VULKAN_HPP_NAMESPACE::Format format, uint8_t plane )
   {
     switch ( format )
     {
-      case Format::eG8B8R83Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R83Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R83Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane420Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
-          case 2 : return 2;
+          case 0: return 1;
+          case 1: return 2;
+          case 2: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane422Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 2;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R163Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          case 2 : return 1;
+          case 0: return 1;
+          case 1: return 1;
+          case 2: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG8B8R82Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
-      case Format::eG16B16R162Plane444Unorm:
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm:
         switch ( plane )
         {
-          case 0 : return 1;
-          case 1 : return 1;
-          default: VULKAN_HPP_ASSERT( false ); return 1;
-        }
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return 1;
-          case 1 : return 2;
-          default: VULKAN_HPP_ASSERT( false ); return 1;
-        }
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM:
-        switch ( plane )
-        {
-          case 0 : return 1;
-          case 1 : return 2;
+          case 0: return 1;
+          case 1: return 1;
           default: VULKAN_HPP_ASSERT( false ); return 1;
         }
 
@@ -9369,274 +7407,259 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
   // The number of texels in a texel block.
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t texelsPerBlock( Format format )
+  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_14 uint8_t texelsPerBlock( VULKAN_HPP_NAMESPACE::Format format )
   {
     switch ( format )
     {
-      case Format::eR4G4UnormPack8                         : return 1;
-      case Format::eR4G4B4A4UnormPack16                    : return 1;
-      case Format::eB4G4R4A4UnormPack16                    : return 1;
-      case Format::eR5G6B5UnormPack16                      : return 1;
-      case Format::eB5G6R5UnormPack16                      : return 1;
-      case Format::eR5G5B5A1UnormPack16                    : return 1;
-      case Format::eB5G5R5A1UnormPack16                    : return 1;
-      case Format::eA1R5G5B5UnormPack16                    : return 1;
-      case Format::eR8Unorm                                : return 1;
-      case Format::eR8Snorm                                : return 1;
-      case Format::eR8Uscaled                              : return 1;
-      case Format::eR8Sscaled                              : return 1;
-      case Format::eR8Uint                                 : return 1;
-      case Format::eR8Sint                                 : return 1;
-      case Format::eR8Srgb                                 : return 1;
-      case Format::eR8G8Unorm                              : return 1;
-      case Format::eR8G8Snorm                              : return 1;
-      case Format::eR8G8Uscaled                            : return 1;
-      case Format::eR8G8Sscaled                            : return 1;
-      case Format::eR8G8Uint                               : return 1;
-      case Format::eR8G8Sint                               : return 1;
-      case Format::eR8G8Srgb                               : return 1;
-      case Format::eR8G8B8Unorm                            : return 1;
-      case Format::eR8G8B8Snorm                            : return 1;
-      case Format::eR8G8B8Uscaled                          : return 1;
-      case Format::eR8G8B8Sscaled                          : return 1;
-      case Format::eR8G8B8Uint                             : return 1;
-      case Format::eR8G8B8Sint                             : return 1;
-      case Format::eR8G8B8Srgb                             : return 1;
-      case Format::eB8G8R8Unorm                            : return 1;
-      case Format::eB8G8R8Snorm                            : return 1;
-      case Format::eB8G8R8Uscaled                          : return 1;
-      case Format::eB8G8R8Sscaled                          : return 1;
-      case Format::eB8G8R8Uint                             : return 1;
-      case Format::eB8G8R8Sint                             : return 1;
-      case Format::eB8G8R8Srgb                             : return 1;
-      case Format::eR8G8B8A8Unorm                          : return 1;
-      case Format::eR8G8B8A8Snorm                          : return 1;
-      case Format::eR8G8B8A8Uscaled                        : return 1;
-      case Format::eR8G8B8A8Sscaled                        : return 1;
-      case Format::eR8G8B8A8Uint                           : return 1;
-      case Format::eR8G8B8A8Sint                           : return 1;
-      case Format::eR8G8B8A8Srgb                           : return 1;
-      case Format::eB8G8R8A8Unorm                          : return 1;
-      case Format::eB8G8R8A8Snorm                          : return 1;
-      case Format::eB8G8R8A8Uscaled                        : return 1;
-      case Format::eB8G8R8A8Sscaled                        : return 1;
-      case Format::eB8G8R8A8Uint                           : return 1;
-      case Format::eB8G8R8A8Sint                           : return 1;
-      case Format::eB8G8R8A8Srgb                           : return 1;
-      case Format::eA8B8G8R8UnormPack32                    : return 1;
-      case Format::eA8B8G8R8SnormPack32                    : return 1;
-      case Format::eA8B8G8R8UscaledPack32                  : return 1;
-      case Format::eA8B8G8R8SscaledPack32                  : return 1;
-      case Format::eA8B8G8R8UintPack32                     : return 1;
-      case Format::eA8B8G8R8SintPack32                     : return 1;
-      case Format::eA8B8G8R8SrgbPack32                     : return 1;
-      case Format::eA2R10G10B10UnormPack32                 : return 1;
-      case Format::eA2R10G10B10SnormPack32                 : return 1;
-      case Format::eA2R10G10B10UscaledPack32               : return 1;
-      case Format::eA2R10G10B10SscaledPack32               : return 1;
-      case Format::eA2R10G10B10UintPack32                  : return 1;
-      case Format::eA2R10G10B10SintPack32                  : return 1;
-      case Format::eA2B10G10R10UnormPack32                 : return 1;
-      case Format::eA2B10G10R10SnormPack32                 : return 1;
-      case Format::eA2B10G10R10UscaledPack32               : return 1;
-      case Format::eA2B10G10R10SscaledPack32               : return 1;
-      case Format::eA2B10G10R10UintPack32                  : return 1;
-      case Format::eA2B10G10R10SintPack32                  : return 1;
-      case Format::eR16Unorm                               : return 1;
-      case Format::eR16Snorm                               : return 1;
-      case Format::eR16Uscaled                             : return 1;
-      case Format::eR16Sscaled                             : return 1;
-      case Format::eR16Uint                                : return 1;
-      case Format::eR16Sint                                : return 1;
-      case Format::eR16Sfloat                              : return 1;
-      case Format::eR16G16Unorm                            : return 1;
-      case Format::eR16G16Snorm                            : return 1;
-      case Format::eR16G16Uscaled                          : return 1;
-      case Format::eR16G16Sscaled                          : return 1;
-      case Format::eR16G16Uint                             : return 1;
-      case Format::eR16G16Sint                             : return 1;
-      case Format::eR16G16Sfloat                           : return 1;
-      case Format::eR16G16B16Unorm                         : return 1;
-      case Format::eR16G16B16Snorm                         : return 1;
-      case Format::eR16G16B16Uscaled                       : return 1;
-      case Format::eR16G16B16Sscaled                       : return 1;
-      case Format::eR16G16B16Uint                          : return 1;
-      case Format::eR16G16B16Sint                          : return 1;
-      case Format::eR16G16B16Sfloat                        : return 1;
-      case Format::eR16G16B16A16Unorm                      : return 1;
-      case Format::eR16G16B16A16Snorm                      : return 1;
-      case Format::eR16G16B16A16Uscaled                    : return 1;
-      case Format::eR16G16B16A16Sscaled                    : return 1;
-      case Format::eR16G16B16A16Uint                       : return 1;
-      case Format::eR16G16B16A16Sint                       : return 1;
-      case Format::eR16G16B16A16Sfloat                     : return 1;
-      case Format::eR32Uint                                : return 1;
-      case Format::eR32Sint                                : return 1;
-      case Format::eR32Sfloat                              : return 1;
-      case Format::eR32G32Uint                             : return 1;
-      case Format::eR32G32Sint                             : return 1;
-      case Format::eR32G32Sfloat                           : return 1;
-      case Format::eR32G32B32Uint                          : return 1;
-      case Format::eR32G32B32Sint                          : return 1;
-      case Format::eR32G32B32Sfloat                        : return 1;
-      case Format::eR32G32B32A32Uint                       : return 1;
-      case Format::eR32G32B32A32Sint                       : return 1;
-      case Format::eR32G32B32A32Sfloat                     : return 1;
-      case Format::eR64Uint                                : return 1;
-      case Format::eR64Sint                                : return 1;
-      case Format::eR64Sfloat                              : return 1;
-      case Format::eR64G64Uint                             : return 1;
-      case Format::eR64G64Sint                             : return 1;
-      case Format::eR64G64Sfloat                           : return 1;
-      case Format::eR64G64B64Uint                          : return 1;
-      case Format::eR64G64B64Sint                          : return 1;
-      case Format::eR64G64B64Sfloat                        : return 1;
-      case Format::eR64G64B64A64Uint                       : return 1;
-      case Format::eR64G64B64A64Sint                       : return 1;
-      case Format::eR64G64B64A64Sfloat                     : return 1;
-      case Format::eB10G11R11UfloatPack32                  : return 1;
-      case Format::eE5B9G9R9UfloatPack32                   : return 1;
-      case Format::eD16Unorm                               : return 1;
-      case Format::eX8D24UnormPack32                       : return 1;
-      case Format::eD32Sfloat                              : return 1;
-      case Format::eS8Uint                                 : return 1;
-      case Format::eD16UnormS8Uint                         : return 1;
-      case Format::eD24UnormS8Uint                         : return 1;
-      case Format::eD32SfloatS8Uint                        : return 1;
-      case Format::eBc1RgbUnormBlock                       : return 16;
-      case Format::eBc1RgbSrgbBlock                        : return 16;
-      case Format::eBc1RgbaUnormBlock                      : return 16;
-      case Format::eBc1RgbaSrgbBlock                       : return 16;
-      case Format::eBc2UnormBlock                          : return 16;
-      case Format::eBc2SrgbBlock                           : return 16;
-      case Format::eBc3UnormBlock                          : return 16;
-      case Format::eBc3SrgbBlock                           : return 16;
-      case Format::eBc4UnormBlock                          : return 16;
-      case Format::eBc4SnormBlock                          : return 16;
-      case Format::eBc5UnormBlock                          : return 16;
-      case Format::eBc5SnormBlock                          : return 16;
-      case Format::eBc6HUfloatBlock                        : return 16;
-      case Format::eBc6HSfloatBlock                        : return 16;
-      case Format::eBc7UnormBlock                          : return 16;
-      case Format::eBc7SrgbBlock                           : return 16;
-      case Format::eEtc2R8G8B8UnormBlock                   : return 16;
-      case Format::eEtc2R8G8B8SrgbBlock                    : return 16;
-      case Format::eEtc2R8G8B8A1UnormBlock                 : return 16;
-      case Format::eEtc2R8G8B8A1SrgbBlock                  : return 16;
-      case Format::eEtc2R8G8B8A8UnormBlock                 : return 16;
-      case Format::eEtc2R8G8B8A8SrgbBlock                  : return 16;
-      case Format::eEacR11UnormBlock                       : return 16;
-      case Format::eEacR11SnormBlock                       : return 16;
-      case Format::eEacR11G11UnormBlock                    : return 16;
-      case Format::eEacR11G11SnormBlock                    : return 16;
-      case Format::eAstc4x4UnormBlock                      : return 16;
-      case Format::eAstc4x4SrgbBlock                       : return 16;
-      case Format::eAstc5x4UnormBlock                      : return 20;
-      case Format::eAstc5x4SrgbBlock                       : return 20;
-      case Format::eAstc5x5UnormBlock                      : return 25;
-      case Format::eAstc5x5SrgbBlock                       : return 25;
-      case Format::eAstc6x5UnormBlock                      : return 30;
-      case Format::eAstc6x5SrgbBlock                       : return 30;
-      case Format::eAstc6x6UnormBlock                      : return 36;
-      case Format::eAstc6x6SrgbBlock                       : return 36;
-      case Format::eAstc8x5UnormBlock                      : return 40;
-      case Format::eAstc8x5SrgbBlock                       : return 40;
-      case Format::eAstc8x6UnormBlock                      : return 48;
-      case Format::eAstc8x6SrgbBlock                       : return 48;
-      case Format::eAstc8x8UnormBlock                      : return 64;
-      case Format::eAstc8x8SrgbBlock                       : return 64;
-      case Format::eAstc10x5UnormBlock                     : return 50;
-      case Format::eAstc10x5SrgbBlock                      : return 50;
-      case Format::eAstc10x6UnormBlock                     : return 60;
-      case Format::eAstc10x6SrgbBlock                      : return 60;
-      case Format::eAstc10x8UnormBlock                     : return 80;
-      case Format::eAstc10x8SrgbBlock                      : return 80;
-      case Format::eAstc10x10UnormBlock                    : return 100;
-      case Format::eAstc10x10SrgbBlock                     : return 100;
-      case Format::eAstc12x10UnormBlock                    : return 120;
-      case Format::eAstc12x10SrgbBlock                     : return 120;
-      case Format::eAstc12x12UnormBlock                    : return 144;
-      case Format::eAstc12x12SrgbBlock                     : return 144;
-      case Format::eG8B8G8R8422Unorm                       : return 1;
-      case Format::eB8G8R8G8422Unorm                       : return 1;
-      case Format::eG8B8R83Plane420Unorm                   : return 1;
-      case Format::eG8B8R82Plane420Unorm                   : return 1;
-      case Format::eG8B8R83Plane422Unorm                   : return 1;
-      case Format::eG8B8R82Plane422Unorm                   : return 1;
-      case Format::eG8B8R83Plane444Unorm                   : return 1;
-      case Format::eR10X6UnormPack16                       : return 1;
-      case Format::eR10X6G10X6Unorm2Pack16                 : return 1;
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return 1;
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return 1;
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return 1;
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return 1;
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return 1;
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return 1;
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return 1;
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return 1;
-      case Format::eR12X4UnormPack16                       : return 1;
-      case Format::eR12X4G12X4Unorm2Pack16                 : return 1;
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return 1;
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return 1;
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return 1;
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return 1;
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return 1;
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return 1;
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return 1;
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return 1;
-      case Format::eG16B16G16R16422Unorm                   : return 1;
-      case Format::eB16G16R16G16422Unorm                   : return 1;
-      case Format::eG16B16R163Plane420Unorm                : return 1;
-      case Format::eG16B16R162Plane420Unorm                : return 1;
-      case Format::eG16B16R163Plane422Unorm                : return 1;
-      case Format::eG16B16R162Plane422Unorm                : return 1;
-      case Format::eG16B16R163Plane444Unorm                : return 1;
-      case Format::eG8B8R82Plane444Unorm                   : return 1;
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return 1;
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return 1;
-      case Format::eG16B16R162Plane444Unorm                : return 1;
-      case Format::eA4R4G4B4UnormPack16                    : return 1;
-      case Format::eA4B4G4R4UnormPack16                    : return 1;
-      case Format::eAstc4x4SfloatBlock                     : return 16;
-      case Format::eAstc5x4SfloatBlock                     : return 20;
-      case Format::eAstc5x5SfloatBlock                     : return 25;
-      case Format::eAstc6x5SfloatBlock                     : return 30;
-      case Format::eAstc6x6SfloatBlock                     : return 36;
-      case Format::eAstc8x5SfloatBlock                     : return 40;
-      case Format::eAstc8x6SfloatBlock                     : return 48;
-      case Format::eAstc8x8SfloatBlock                     : return 64;
-      case Format::eAstc10x5SfloatBlock                    : return 50;
-      case Format::eAstc10x6SfloatBlock                    : return 60;
-      case Format::eAstc10x8SfloatBlock                    : return 80;
-      case Format::eAstc10x10SfloatBlock                   : return 100;
-      case Format::eAstc12x10SfloatBlock                   : return 120;
-      case Format::eAstc12x12SfloatBlock                   : return 144;
-      case Format::eA1B5G5R5UnormPack16                    : return 1;
-      case Format::eA8Unorm                                : return 1;
-      case Format::ePvrtc12BppUnormBlockIMG                : return 1;
-      case Format::ePvrtc14BppUnormBlockIMG                : return 1;
-      case Format::ePvrtc22BppUnormBlockIMG                : return 1;
-      case Format::ePvrtc24BppUnormBlockIMG                : return 1;
-      case Format::ePvrtc12BppSrgbBlockIMG                 : return 1;
-      case Format::ePvrtc14BppSrgbBlockIMG                 : return 1;
-      case Format::ePvrtc22BppSrgbBlockIMG                 : return 1;
-      case Format::ePvrtc24BppSrgbBlockIMG                 : return 1;
-      case Format::eR8BoolARM                              : return 1;
-      case Format::eR16G16Sfixed5NV                        : return 1;
-      case Format::eR10X6UintPack16ARM                     : return 1;
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return 1;
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return 1;
-      case Format::eR12X4UintPack16ARM                     : return 1;
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return 1;
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return 1;
-      case Format::eR14X2UintPack16ARM                     : return 1;
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return 1;
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return 1;
-      case Format::eR14X2UnormPack16ARM                    : return 1;
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return 1;
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return 1;
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return 1;
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4UnormPack8: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR4G4B4A4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB4G4R4A4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G6B5UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G6R5UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR5G5B5A1UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB5G5R5A1UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA1R5G5B5UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR8G8B8A8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8A8Srgb: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8UintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8B8G8R8SrgbPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10UintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2R10G10B10SintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SscaledPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10UintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA2B10G10R10SintPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Snorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sscaled: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16B16A16Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR32G32B32A32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR64G64B64A64Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB10G11R11UfloatPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eE5B9G9R9UfloatPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD16Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eX8D24UnormPack32: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD32Sfloat: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD16UnormS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD24UnormS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eD32SfloatS8Uint: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbUnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbSrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaUnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc1RgbaSrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc2SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc3SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc4SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc5SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HUfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc6HSfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eBc7SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A1SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEtc2R8G8B8A8SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eEacR11G11SnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4UnormBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SrgbBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4UnormBlock: return 20;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SrgbBlock: return 20;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5UnormBlock: return 25;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SrgbBlock: return 25;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5UnormBlock: return 30;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SrgbBlock: return 30;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6UnormBlock: return 36;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SrgbBlock: return 36;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5UnormBlock: return 40;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SrgbBlock: return 40;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6UnormBlock: return 48;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SrgbBlock: return 48;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8UnormBlock: return 64;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SrgbBlock: return 64;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5UnormBlock: return 50;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SrgbBlock: return 50;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6UnormBlock: return 60;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SrgbBlock: return 60;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8UnormBlock: return 80;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SrgbBlock: return 80;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10UnormBlock: return 100;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SrgbBlock: return 100;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10UnormBlock: return 120;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SrgbBlock: return 120;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12UnormBlock: return 144;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SrgbBlock: return 144;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8G8R8422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB8G8R8G8422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane420Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane420Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R83Plane444Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6Unorm2Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4Unorm2Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16G16R16422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eB16G16R16G16422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane420Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane420Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane422Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R163Plane444Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG8B8R82Plane444Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eG16B16R162Plane444Unorm: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA4R4G4B4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA4B4G4R4UnormPack16: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc4x4SfloatBlock: return 16;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x4SfloatBlock: return 20;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc5x5SfloatBlock: return 25;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x5SfloatBlock: return 30;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc6x6SfloatBlock: return 36;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x5SfloatBlock: return 40;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x6SfloatBlock: return 48;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc8x8SfloatBlock: return 64;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x5SfloatBlock: return 50;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x6SfloatBlock: return 60;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x8SfloatBlock: return 80;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc10x10SfloatBlock: return 100;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x10SfloatBlock: return 120;
+      case VULKAN_HPP_NAMESPACE::Format::eAstc12x12SfloatBlock: return 144;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppUnormBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppUnormBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppUnormBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppUnormBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc12BppSrgbBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc14BppSrgbBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc22BppSrgbBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::ePvrtc24BppSrgbBlockIMG: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eR16G16Sfixed5NV: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA1B5G5R5UnormPack16KHR: return 1;
+      case VULKAN_HPP_NAMESPACE::Format::eA8UnormKHR: return 1;
 
       default: VULKAN_HPP_ASSERT( false ); return 0;
     }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_fuchsia.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_fuchsia.h
index f65efc62..f60907d1 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_fuchsia.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_fuchsia.h
@@ -2,7 +2,7 @@
 #define VULKAN_FUCHSIA_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -34,14 +34,12 @@ typedef struct VkImagePipeSurfaceCreateInfoFUCHSIA {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateImagePipeSurfaceFUCHSIA)(VkInstance instance, const VkImagePipeSurfaceCreateInfoFUCHSIA* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateImagePipeSurfaceFUCHSIA(
     VkInstance                                  instance,
     const VkImagePipeSurfaceCreateInfoFUCHSIA*  pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_FUCHSIA_external_memory is a preprocessor guard. Do not pass it to API calls.
@@ -72,21 +70,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryZirconHandleFUCHSIA)(VkDevice device
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle, VkMemoryZirconHandlePropertiesFUCHSIA* pMemoryZirconHandleProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryZirconHandleFUCHSIA(
     VkDevice                                    device,
     const VkMemoryGetZirconHandleInfoFUCHSIA*   pGetZirconHandleInfo,
     zx_handle_t*                                pZirconHandle);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryZirconHandlePropertiesFUCHSIA(
     VkDevice                                    device,
     VkExternalMemoryHandleTypeFlagBits          handleType,
     zx_handle_t                                 zirconHandle,
     VkMemoryZirconHandlePropertiesFUCHSIA*      pMemoryZirconHandleProperties);
 #endif
-#endif
 
 
 // VK_FUCHSIA_external_semaphore is a preprocessor guard. Do not pass it to API calls.
@@ -113,19 +107,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkImportSemaphoreZirconHandleFUCHSIA)(VkDevice
 typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreZirconHandleFUCHSIA)(VkDevice device, const VkSemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreZirconHandleFUCHSIA(
     VkDevice                                    device,
     const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreZirconHandleFUCHSIA(
     VkDevice                                    device,
     const VkSemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo,
     zx_handle_t*                                pZirconHandle);
 #endif
-#endif
 
 
 // VK_FUCHSIA_buffer_collection is a preprocessor guard. Do not pass it to API calls.
@@ -238,42 +228,32 @@ typedef void (VKAPI_PTR *PFN_vkDestroyBufferCollectionFUCHSIA)(VkDevice device,
 typedef VkResult (VKAPI_PTR *PFN_vkGetBufferCollectionPropertiesFUCHSIA)(VkDevice device, VkBufferCollectionFUCHSIA collection, VkBufferCollectionPropertiesFUCHSIA* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateBufferCollectionFUCHSIA(
     VkDevice                                    device,
     const VkBufferCollectionCreateInfoFUCHSIA*  pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkBufferCollectionFUCHSIA*                  pCollection);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetBufferCollectionImageConstraintsFUCHSIA(
     VkDevice                                    device,
     VkBufferCollectionFUCHSIA                   collection,
     const VkImageConstraintsInfoFUCHSIA*        pImageConstraintsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkSetBufferCollectionBufferConstraintsFUCHSIA(
     VkDevice                                    device,
     VkBufferCollectionFUCHSIA                   collection,
     const VkBufferConstraintsInfoFUCHSIA*       pBufferConstraintsInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkDestroyBufferCollectionFUCHSIA(
     VkDevice                                    device,
     VkBufferCollectionFUCHSIA                   collection,
     const VkAllocationCallbacks*                pAllocator);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetBufferCollectionPropertiesFUCHSIA(
     VkDevice                                    device,
     VkBufferCollectionFUCHSIA                   collection,
     VkBufferCollectionPropertiesFUCHSIA*        pProperties);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_funcs.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_funcs.hpp
index 4383b402..2eec7f6d 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_funcs.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_funcs.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,9 +8,6 @@
 #ifndef VULKAN_FUNCS_HPP
 #define VULKAN_FUNCS_HPP
 
-// include-what-you-use: make sure, vulkan.hpp is used by code-completers
-// IWYU pragma: private, include "vulkan/vulkan.hpp"
-
 namespace VULKAN_HPP_NAMESPACE
 {
 
@@ -20,12 +17,11 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_VERSION_1_0 ===
 
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result createInstance( const InstanceCreateInfo *  pCreateInfo,
-                                                                const AllocationCallbacks * pAllocator,
-                                                                Instance *                  pInstance,
-                                                                Dispatch const &            d ) VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result createInstance( const VULKAN_HPP_NAMESPACE::InstanceCreateInfo *  pCreateInfo,
+                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                VULKAN_HPP_NAMESPACE::Instance *                  pInstance,
+                                                                Dispatch const &                                  d ) VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( pCreateInfo ),
@@ -34,88 +30,81 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Instance>::type
-                       createInstance( const InstanceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d )
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Instance>::type createInstance(
+    const VULKAN_HPP_NAMESPACE::InstanceCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateInstance && "Function <vkCreateInstance> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Instance instance;
-    Result   result = static_cast<Result>( d.vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                             reinterpret_cast<VkInstance *>( &instance ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::createInstance" );
+    VULKAN_HPP_NAMESPACE::Instance instance;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                          reinterpret_cast<VkInstance *>( &instance ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::createInstance" );
 
-    return detail::createResultValueType( result, std::move( instance ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( instance ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Instance, Dispatch>>::type
-                       createInstanceUnique( const InstanceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d )
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Instance, Dispatch>>::type createInstanceUnique(
+    const VULKAN_HPP_NAMESPACE::InstanceCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateInstance && "Function <vkCreateInstance> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Instance instance;
-    Result   result = static_cast<Result>( d.vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                             reinterpret_cast<VkInstance *>( &instance ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::createInstanceUnique" );
+    VULKAN_HPP_NAMESPACE::Instance instance;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                          reinterpret_cast<VkInstance *>( &instance ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::createInstanceUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<Instance, Dispatch>( instance, detail::ObjectDestroy<detail::NoParent, Dispatch>( allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Instance, Dispatch>( instance, ObjectDestroy<NoParent, Dispatch>( allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyInstance.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroy( const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyInstance( static_cast<VkInstance>( m_instance ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyInstance( m_instance, reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyInstance.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroy( Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyInstance && "Function <vkDestroyInstance> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyInstance( m_instance, reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyInstance( m_instance,
+                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::enumeratePhysicalDevices( uint32_t *       pPhysicalDeviceCount,
-                                                                                    PhysicalDevice * pPhysicalDevices,
-                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::enumeratePhysicalDevices( uint32_t *                             pPhysicalDeviceCount,
+                                                                                    VULKAN_HPP_NAMESPACE::PhysicalDevice * pPhysicalDevices,
+                                                                                    Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkEnumeratePhysicalDevices( static_cast<VkInstance>( m_instance ), pPhysicalDeviceCount, reinterpret_cast<VkPhysicalDevice *>( pPhysicalDevices ) ) );
+    return static_cast<Result>( d.vkEnumeratePhysicalDevices( m_instance, pPhysicalDeviceCount, reinterpret_cast<VkPhysicalDevice *>( pPhysicalDevices ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-  template <typename PhysicalDeviceAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, PhysicalDevice>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDevice, PhysicalDeviceAllocator>>::type
+  template <typename PhysicalDeviceAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator>>::type
                        Instance::enumeratePhysicalDevices( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -123,34 +112,32 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDevices && "Function <vkEnumeratePhysicalDevices> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<PhysicalDevice, PhysicalDeviceAllocator> physicalDevices;
-    uint32_t                                             physicalDeviceCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator> physicalDevices;
+    uint32_t                                                                   physicalDeviceCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceCount )
       {
         physicalDevices.resize( physicalDeviceCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, reinterpret_cast<VkPhysicalDevice *>( physicalDevices.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDevices" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDevices" );
     VULKAN_HPP_ASSERT( physicalDeviceCount <= physicalDevices.size() );
     if ( physicalDeviceCount < physicalDevices.size() )
     {
       physicalDevices.resize( physicalDeviceCount );
     }
-    return detail::createResultValueType( result, std::move( physicalDevices ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDevices ) );
   }
 
-  // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
   template <typename PhysicalDeviceAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, PhysicalDevice>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDevice, PhysicalDeviceAllocator>>::type
+            typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDevice>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator>>::type
                        Instance::enumeratePhysicalDevices( PhysicalDeviceAllocator & physicalDeviceAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -158,96 +145,90 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDevices && "Function <vkEnumeratePhysicalDevices> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<PhysicalDevice, PhysicalDeviceAllocator> physicalDevices( physicalDeviceAllocator );
-    uint32_t                                             physicalDeviceCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator> physicalDevices( physicalDeviceAllocator );
+    uint32_t                                                                   physicalDeviceCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceCount )
       {
         physicalDevices.resize( physicalDeviceCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkEnumeratePhysicalDevices( m_instance, &physicalDeviceCount, reinterpret_cast<VkPhysicalDevice *>( physicalDevices.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDevices" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDevices" );
     VULKAN_HPP_ASSERT( physicalDeviceCount <= physicalDevices.size() );
     if ( physicalDeviceCount < physicalDevices.size() )
     {
       physicalDevices.resize( physicalDeviceCount );
     }
-    return detail::createResultValueType( result, std::move( physicalDevices ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDevices ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures( PhysicalDeviceFeatures * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceFeatures( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceFeatures *>( pFeatures ) );
+    d.vkGetPhysicalDeviceFeatures( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures *>( pFeatures ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures PhysicalDevice::getFeatures( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures
+                                         PhysicalDevice::getFeatures( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFeatures && "Function <vkGetPhysicalDeviceFeatures> requires <VK_VERSION_1_0>" );
 #  endif
 
-    PhysicalDeviceFeatures features;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures features;
     d.vkGetPhysicalDeviceFeatures( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures *>( &features ) );
 
     return features;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    PhysicalDevice::getFormatProperties( Format format, FormatProperties * pFormatProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties( VULKAN_HPP_NAMESPACE::Format             format,
+                                                              VULKAN_HPP_NAMESPACE::FormatProperties * pFormatProperties,
+                                                              Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceFormatProperties(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties *>( pFormatProperties ) );
+    d.vkGetPhysicalDeviceFormatProperties( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties *>( pFormatProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties PhysicalDevice::getFormatProperties( Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties
+    PhysicalDevice::getFormatProperties( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFormatProperties && "Function <vkGetPhysicalDeviceFormatProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    FormatProperties formatProperties;
+    VULKAN_HPP_NAMESPACE::FormatProperties formatProperties;
     d.vkGetPhysicalDeviceFormatProperties( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties *>( &formatProperties ) );
 
     return formatProperties;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties( Format                  format,
-                                                                                          ImageType               type,
-                                                                                          ImageTiling             tiling,
-                                                                                          ImageUsageFlags         usage,
-                                                                                          ImageCreateFlags        flags,
-                                                                                          ImageFormatProperties * pImageFormatProperties,
-                                                                                          Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                  format,
+                                                                                          VULKAN_HPP_NAMESPACE::ImageType               type,
+                                                                                          VULKAN_HPP_NAMESPACE::ImageTiling             tiling,
+                                                                                          VULKAN_HPP_NAMESPACE::ImageUsageFlags         usage,
+                                                                                          VULKAN_HPP_NAMESPACE::ImageCreateFlags        flags,
+                                                                                          VULKAN_HPP_NAMESPACE::ImageFormatProperties * pImageFormatProperties,
+                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties( m_physicalDevice,
                                                                             static_cast<VkFormat>( format ),
                                                                             static_cast<VkImageType>( type ),
                                                                             static_cast<VkImageTiling>( tiling ),
@@ -257,78 +238,73 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties>::type PhysicalDevice::getImageFormatProperties(
-    Format format, ImageType type, ImageTiling tiling, ImageUsageFlags usage, ImageCreateFlags flags, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties>::type
+                       PhysicalDevice::getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format           format,
+                                              VULKAN_HPP_NAMESPACE::ImageType        type,
+                                              VULKAN_HPP_NAMESPACE::ImageTiling      tiling,
+                                              VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage,
+                                              VULKAN_HPP_NAMESPACE::ImageCreateFlags flags,
+                                              Dispatch const &                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceImageFormatProperties && "Function <vkGetPhysicalDeviceImageFormatProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    ImageFormatProperties imageFormatProperties;
-    Result                result = static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties( m_physicalDevice,
-                                                                                     static_cast<VkFormat>( format ),
-                                                                                     static_cast<VkImageType>( type ),
-                                                                                     static_cast<VkImageTiling>( tiling ),
-                                                                                     static_cast<VkImageUsageFlags>( usage ),
-                                                                                     static_cast<VkImageCreateFlags>( flags ),
-                                                                                     reinterpret_cast<VkImageFormatProperties *>( &imageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties" );
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties imageFormatProperties;
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceImageFormatProperties( m_physicalDevice,
+                                                  static_cast<VkFormat>( format ),
+                                                  static_cast<VkImageType>( type ),
+                                                  static_cast<VkImageTiling>( tiling ),
+                                                  static_cast<VkImageUsageFlags>( usage ),
+                                                  static_cast<VkImageCreateFlags>( flags ),
+                                                  reinterpret_cast<VkImageFormatProperties *>( &imageFormatProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties" );
 
-    return detail::createResultValueType( result, std::move( imageFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getProperties( PhysicalDeviceProperties * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties * pProperties,
+                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceProperties *>( pProperties ) );
+    d.vkGetPhysicalDeviceProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties *>( pProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties PhysicalDevice::getProperties( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties
+                                         PhysicalDevice::getProperties( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceProperties && "Function <vkGetPhysicalDeviceProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    PhysicalDeviceProperties properties;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties properties;
     d.vkGetPhysicalDeviceProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties *>( &properties ) );
 
     return properties;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties( uint32_t *              pQueueFamilyPropertyCount,
-                                                                   QueueFamilyProperties * pQueueFamilyProperties,
-                                                                   Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties( uint32_t *                                    pQueueFamilyPropertyCount,
+                                                                   VULKAN_HPP_NAMESPACE::QueueFamilyProperties * pQueueFamilyProperties,
+                                                                   Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetPhysicalDeviceQueueFamilyProperties(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties *>( pQueueFamilyProperties ) );
+      m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties *>( pQueueFamilyProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-  template <typename QueueFamilyPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, QueueFamilyProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator>
+  template <typename QueueFamilyPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator>
                                          PhysicalDevice::getQueueFamilyProperties( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -336,8 +312,8 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties && "Function <vkGetPhysicalDeviceQueueFamilyProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties;
-    uint32_t                                                           queueFamilyPropertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties;
+    uint32_t                                                                                 queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     d.vkGetPhysicalDeviceQueueFamilyProperties(
@@ -351,13 +327,11 @@ namespace VULKAN_HPP_NAMESPACE
     return queueFamilyProperties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-  template <typename QueueFamilyPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, QueueFamilyProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator>
+  template <
+    typename QueueFamilyPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator>
     PhysicalDevice::getQueueFamilyProperties( QueueFamilyPropertiesAllocator & queueFamilyPropertiesAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -365,8 +339,8 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties && "Function <vkGetPhysicalDeviceQueueFamilyProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties( queueFamilyPropertiesAllocator );
-    uint32_t                                                           queueFamilyPropertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator> queueFamilyProperties( queueFamilyPropertiesAllocator );
+    uint32_t                                                                                 queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     d.vkGetPhysicalDeviceQueueFamilyProperties(
@@ -381,46 +355,41 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties( PhysicalDeviceMemoryProperties * pMemoryProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties * pMemoryProperties,
+                                                              Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceMemoryProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                           reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( pMemoryProperties ) );
+    d.vkGetPhysicalDeviceMemoryProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( pMemoryProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties PhysicalDevice::getMemoryProperties( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties
+                                         PhysicalDevice::getMemoryProperties( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceMemoryProperties && "Function <vkGetPhysicalDeviceMemoryProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    PhysicalDeviceMemoryProperties memoryProperties;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties memoryProperties;
     d.vkGetPhysicalDeviceMemoryProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( &memoryProperties ) );
 
     return memoryProperties;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE PFN_vkVoidFunction Instance::getProcAddr( const char * pName, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetInstanceProcAddr( static_cast<VkInstance>( m_instance ), pName );
+    return d.vkGetInstanceProcAddr( m_instance, pName );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE PFN_VoidFunction Instance::getProcAddr( const std::string & name, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE PFN_vkVoidFunction Instance::getProcAddr( const std::string & name, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -433,18 +402,16 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE PFN_vkVoidFunction Device::getProcAddr( const char * pName, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetDeviceProcAddr( static_cast<VkDevice>( m_device ), pName );
+    return d.vkGetDeviceProcAddr( m_device, pName );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE PFN_VoidFunction Device::getProcAddr( const std::string & name, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE PFN_vkVoidFunction Device::getProcAddr( const std::string & name, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -457,93 +424,92 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDevice( const DeviceCreateInfo *    pCreateInfo,
-                                                                              const AllocationCallbacks * pAllocator,
-                                                                              Device *                    pDevice,
-                                                                              Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDevice( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo *    pCreateInfo,
+                                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                              VULKAN_HPP_NAMESPACE::Device *                    pDevice,
+                                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDevice( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkCreateDevice( m_physicalDevice,
                                                   reinterpret_cast<const VkDeviceCreateInfo *>( pCreateInfo ),
                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                   reinterpret_cast<VkDevice *>( pDevice ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Device>::type
-    PhysicalDevice::createDevice( const DeviceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Device>::type PhysicalDevice::createDevice(
+    const VULKAN_HPP_NAMESPACE::DeviceCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDevice && "Function <vkCreateDevice> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Device device;
-    Result result = static_cast<Result>( d.vkCreateDevice( m_physicalDevice,
-                                                           reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
-                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                           reinterpret_cast<VkDevice *>( &device ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDevice" );
+    VULKAN_HPP_NAMESPACE::Device device;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDevice( m_physicalDevice,
+                        reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                        reinterpret_cast<VkDevice *>( &device ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDevice" );
 
-    return detail::createResultValueType( result, std::move( device ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( device ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Device, Dispatch>>::type
-    PhysicalDevice::createDeviceUnique( const DeviceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Device, Dispatch>>::type
+                       PhysicalDevice::createDeviceUnique( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo &            createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDevice && "Function <vkCreateDevice> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Device device;
-    Result result = static_cast<Result>( d.vkCreateDevice( m_physicalDevice,
-                                                           reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
-                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                           reinterpret_cast<VkDevice *>( &device ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDeviceUnique" );
+    VULKAN_HPP_NAMESPACE::Device device;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDevice( m_physicalDevice,
+                        reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                        reinterpret_cast<VkDevice *>( &device ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDeviceUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Device, Dispatch>( device, detail::ObjectDestroy<detail::NoParent, Dispatch>( allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Device, Dispatch>( device, ObjectDestroy<NoParent, Dispatch>( allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDevice.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDevice( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDevice( m_device, reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDevice.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyDevice && "Function <vkDestroyDevice> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyDevice( m_device, reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyDevice( m_device,
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceExtensionProperties( const char *          pLayerName,
-                                                                                      uint32_t *            pPropertyCount,
-                                                                                      ExtensionProperties * pProperties,
-                                                                                      Dispatch const &      d ) VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceExtensionProperties( const char *                                pLayerName,
+                                                                                      uint32_t *                                  pPropertyCount,
+                                                                                      VULKAN_HPP_NAMESPACE::ExtensionProperties * pProperties,
+                                                                                      Dispatch const &                            d ) VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
@@ -551,13 +517,8 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+  template <typename ExtensionPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
                        enumerateInstanceExtensionProperties( Optional<const std::string> layerName, Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -565,35 +526,34 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateInstanceExtensionProperties && "Function <vkEnumerateInstanceExtensionProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<ExtensionProperties, ExtensionPropertiesAllocator> properties;
-    uint32_t                                                       propertyCount;
-    Result                                                         result;
+    std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator> properties;
+    uint32_t                                                                             propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                         result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateInstanceExtensionProperties(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateInstanceExtensionProperties(
           layerName ? layerName->c_str() : nullptr, &propertyCount, reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceExtensionProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceExtensionProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+  template <
+    typename ExtensionPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::ExtensionProperties>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
                        enumerateInstanceExtensionProperties( Optional<const std::string>    layerName,
                                                              ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                                              Dispatch const &               d )
@@ -603,50 +563,44 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateInstanceExtensionProperties && "Function <vkEnumerateInstanceExtensionProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<ExtensionProperties, ExtensionPropertiesAllocator> properties( extensionPropertiesAllocator );
-    uint32_t                                                       propertyCount;
-    Result                                                         result;
+    std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator> properties( extensionPropertiesAllocator );
+    uint32_t                                                                             propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                         result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateInstanceExtensionProperties(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateInstanceExtensionProperties(
           layerName ? layerName->c_str() : nullptr, &propertyCount, reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceExtensionProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceExtensionProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceExtensionProperties( const char *          pLayerName,
-                                                                                                    uint32_t *            pPropertyCount,
-                                                                                                    ExtensionProperties * pProperties,
-                                                                                                    Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceExtensionProperties( const char *                                pLayerName,
+                                                                                                    uint32_t *                                  pPropertyCount,
+                                                                                                    VULKAN_HPP_NAMESPACE::ExtensionProperties * pProperties,
+                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkEnumerateDeviceExtensionProperties(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pLayerName, pPropertyCount, reinterpret_cast<VkExtensionProperties *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, pLayerName, pPropertyCount, reinterpret_cast<VkExtensionProperties *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+  template <typename ExtensionPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
                        PhysicalDevice::enumerateDeviceExtensionProperties( Optional<const std::string> layerName, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -654,36 +608,34 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateDeviceExtensionProperties && "Function <vkEnumerateDeviceExtensionProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<ExtensionProperties, ExtensionPropertiesAllocator> properties;
-    uint32_t                                                       propertyCount;
-    Result                                                         result;
+    std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator> properties;
+    uint32_t                                                                             propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                         result;
     do
     {
-      result =
-        static_cast<Result>( d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateDeviceExtensionProperties(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateDeviceExtensionProperties(
           m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+  template <
+    typename ExtensionPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::ExtensionProperties>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
                        PhysicalDevice::enumerateDeviceExtensionProperties( Optional<const std::string>    layerName,
                                                         ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                                         Dispatch const &               d ) const
@@ -693,49 +645,42 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateDeviceExtensionProperties && "Function <vkEnumerateDeviceExtensionProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<ExtensionProperties, ExtensionPropertiesAllocator> properties( extensionPropertiesAllocator );
-    uint32_t                                                       propertyCount;
-    Result                                                         result;
+    std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator> properties( extensionPropertiesAllocator );
+    uint32_t                                                                             propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                         result;
     do
     {
-      result =
-        static_cast<Result>( d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateDeviceExtensionProperties(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateDeviceExtensionProperties(
           m_physicalDevice, layerName ? layerName->c_str() : nullptr, &propertyCount, reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceLayerProperties( uint32_t *        pPropertyCount,
-                                                                                  LayerProperties * pProperties,
-                                                                                  Dispatch const &  d ) VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceLayerProperties( uint32_t *                              pPropertyCount,
+                                                                                  VULKAN_HPP_NAMESPACE::LayerProperties * pProperties,
+                                                                                  Dispatch const &                        d ) VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkEnumerateInstanceLayerProperties( pPropertyCount, reinterpret_cast<VkLayerProperties *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-  template <typename LayerPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+  template <typename LayerPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
                        enumerateInstanceLayerProperties( Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -743,34 +688,32 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateInstanceLayerProperties && "Function <vkEnumerateInstanceLayerProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<LayerProperties, LayerPropertiesAllocator> properties;
-    uint32_t                                               propertyCount;
-    Result                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator> properties;
+    uint32_t                                                                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                 result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkEnumerateInstanceLayerProperties( &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceLayerProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceLayerProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
   template <typename LayerPropertiesAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::LayerProperties>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
                        enumerateInstanceLayerProperties( LayerPropertiesAllocator & layerPropertiesAllocator, Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -778,48 +721,41 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateInstanceLayerProperties && "Function <vkEnumerateInstanceLayerProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<LayerProperties, LayerPropertiesAllocator> properties( layerPropertiesAllocator );
-    uint32_t                                               propertyCount;
-    Result                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator> properties( layerPropertiesAllocator );
+    uint32_t                                                                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                 result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkEnumerateInstanceLayerProperties( &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkEnumerateInstanceLayerProperties( &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceLayerProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceLayerProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateDeviceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceLayerProperties( uint32_t *        pPropertyCount,
-                                                                                                LayerProperties * pProperties,
-                                                                                                Dispatch const &  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::enumerateDeviceLayerProperties( uint32_t *                              pPropertyCount,
+                                                                                                VULKAN_HPP_NAMESPACE::LayerProperties * pProperties,
+                                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkEnumerateDeviceLayerProperties(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkLayerProperties *>( pProperties ) ) );
+    return static_cast<Result>( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, pPropertyCount, reinterpret_cast<VkLayerProperties *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateDeviceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-  template <typename LayerPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+  template <typename LayerPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
                        PhysicalDevice::enumerateDeviceLayerProperties( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -827,35 +763,32 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateDeviceLayerProperties && "Function <vkEnumerateDeviceLayerProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<LayerProperties, LayerPropertiesAllocator> properties;
-    uint32_t                                               propertyCount;
-    Result                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator> properties;
+    uint32_t                                                                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                 result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkEnumerateDeviceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
   template <typename LayerPropertiesAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::LayerProperties>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
                        PhysicalDevice::enumerateDeviceLayerProperties( LayerPropertiesAllocator & layerPropertiesAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -863,94 +796,91 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateDeviceLayerProperties && "Function <vkEnumerateDeviceLayerProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<LayerProperties, LayerPropertiesAllocator> properties( layerPropertiesAllocator );
-    uint32_t                                               propertyCount;
-    Result                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator> properties( layerPropertiesAllocator );
+    uint32_t                                                                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                 result;
     do
     {
-      result = static_cast<Result>( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkEnumerateDeviceLayerProperties( m_physicalDevice, &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex, Queue * pQueue, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex, VULKAN_HPP_NAMESPACE::Queue * pQueue, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceQueue( static_cast<VkDevice>( m_device ), queueFamilyIndex, queueIndex, reinterpret_cast<VkQueue *>( pQueue ) );
+    d.vkGetDeviceQueue( m_device, queueFamilyIndex, queueIndex, reinterpret_cast<VkQueue *>( pQueue ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Queue Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Queue
+                                         Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDeviceQueue && "Function <vkGetDeviceQueue> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Queue queue;
+    VULKAN_HPP_NAMESPACE::Queue queue;
     d.vkGetDeviceQueue( m_device, queueFamilyIndex, queueIndex, reinterpret_cast<VkQueue *>( &queue ) );
 
     return queue;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Queue::submit( uint32_t submitCount, const SubmitInfo * pSubmits, Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::submit( uint32_t                                 submitCount,
+                                                               const VULKAN_HPP_NAMESPACE::SubmitInfo * pSubmits,
+                                                               VULKAN_HPP_NAMESPACE::Fence              fence,
+                                                               Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkQueueSubmit( static_cast<VkQueue>( m_queue ), submitCount, reinterpret_cast<const VkSubmitInfo *>( pSubmits ), static_cast<VkFence>( fence ) ) );
+    return static_cast<Result>( d.vkQueueSubmit( m_queue, submitCount, reinterpret_cast<const VkSubmitInfo *>( pSubmits ), static_cast<VkFence>( fence ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Queue::submit( ArrayProxy<const SubmitInfo> const & submits, Fence fence, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo> const & submits, VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkQueueSubmit && "Function <vkQueueSubmit> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkQueueSubmit( m_queue, submits.size(), reinterpret_cast<const VkSubmitInfo *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::waitIdle( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkQueueWaitIdle( static_cast<VkQueue>( m_queue ) ) );
+    return static_cast<Result>( d.vkQueueWaitIdle( m_queue ) );
   }
 #else
-  // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::waitIdle( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -958,24 +888,22 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkQueueWaitIdle && "Function <vkQueueWaitIdle> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkQueueWaitIdle( m_queue ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::waitIdle" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkQueueWaitIdle( m_queue ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::waitIdle" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitIdle( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkDeviceWaitIdle( static_cast<VkDevice>( m_device ) ) );
+    return static_cast<Result>( d.vkDeviceWaitIdle( m_device ) );
   }
 #else
-  // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::waitIdle( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -983,122 +911,137 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkDeviceWaitIdle && "Function <vkDeviceWaitIdle> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkDeviceWaitIdle( m_device ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitIdle" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkDeviceWaitIdle( m_device ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitIdle" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateMemory( const MemoryAllocateInfo *  pAllocateInfo,
-                                                                        const AllocationCallbacks * pAllocator,
-                                                                        DeviceMemory *              pMemory,
-                                                                        Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateMemory( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo *  pAllocateInfo,
+                                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceMemory *              pMemory,
+                                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAllocateMemory( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkAllocateMemory( m_device,
                                                     reinterpret_cast<const VkMemoryAllocateInfo *>( pAllocateInfo ),
                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                     reinterpret_cast<VkDeviceMemory *>( pMemory ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceMemory>::type
-    Device::allocateMemory( const MemoryAllocateInfo & allocateInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceMemory>::type
+                       Device::allocateMemory( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo &          allocateInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                            Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateMemory && "Function <vkAllocateMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    DeviceMemory memory;
-    Result       result = static_cast<Result>( d.vkAllocateMemory( m_device,
-                                                             reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                             reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateMemory" );
+    VULKAN_HPP_NAMESPACE::DeviceMemory memory;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkAllocateMemory( m_device,
+                          reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                          reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateMemory" );
 
-    return detail::createResultValueType( result, std::move( memory ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memory ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DeviceMemory, Dispatch>>::type
-    Device::allocateMemoryUnique( const MemoryAllocateInfo & allocateInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DeviceMemory, Dispatch>>::type
+                       Device::allocateMemoryUnique( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo &          allocateInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateMemory && "Function <vkAllocateMemory> requires <VK_VERSION_1_0>" );
 #    endif
 
-    DeviceMemory memory;
-    Result       result = static_cast<Result>( d.vkAllocateMemory( m_device,
-                                                             reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                             reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateMemoryUnique" );
+    VULKAN_HPP_NAMESPACE::DeviceMemory memory;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkAllocateMemory( m_device,
+                          reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                          reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateMemoryUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<DeviceMemory, Dispatch>( memory, detail::ObjectFree<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DeviceMemory, Dispatch>( memory, ObjectFree<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::freeMemory( DeviceMemory memory, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                             Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkFreeMemory( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkFreeMemory( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::freeMemory( DeviceMemory memory, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory                        memory,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                             Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkFreeMemory && "Function <vkFreeMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkFreeMemory( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkFreeMemory( m_device,
+                    static_cast<VkDeviceMemory>( memory ),
+                    reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void( Device::free )( DeviceMemory memory, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkFreeMemory( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkFreeMemory( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void( Device::free )( DeviceMemory memory, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::DeviceMemory                        memory,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkFreeMemory && "Function <vkFreeMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkFreeMemory( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkFreeMemory( m_device,
+                    static_cast<VkDeviceMemory>( memory ),
+                    reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory(
-    DeviceMemory memory, DeviceSize offset, DeviceSize size, MemoryMapFlags flags, void ** ppData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory   memory,
+                                                                   VULKAN_HPP_NAMESPACE::DeviceSize     offset,
+                                                                   VULKAN_HPP_NAMESPACE::DeviceSize     size,
+                                                                   VULKAN_HPP_NAMESPACE::MemoryMapFlags flags,
+                                                                   void **                              ppData,
+                                                                   Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkMapMemory( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkMapMemory( m_device,
                                                static_cast<VkDeviceMemory>( memory ),
                                                static_cast<VkDeviceSize>( offset ),
                                                static_cast<VkDeviceSize>( size ),
@@ -1107,119 +1050,115 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type
-                       Device::mapMemory( DeviceMemory memory, DeviceSize offset, DeviceSize size, MemoryMapFlags flags, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type Device::mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory   memory,
+                                                                                                   VULKAN_HPP_NAMESPACE::DeviceSize     offset,
+                                                                                                   VULKAN_HPP_NAMESPACE::DeviceSize     size,
+                                                                                                   VULKAN_HPP_NAMESPACE::MemoryMapFlags flags,
+                                                                                                   Dispatch const &                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkMapMemory && "Function <vkMapMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    void * pData;
-    Result result = static_cast<Result>( d.vkMapMemory( m_device,
-                                                        static_cast<VkDeviceMemory>( memory ),
-                                                        static_cast<VkDeviceSize>( offset ),
-                                                        static_cast<VkDeviceSize>( size ),
-                                                        static_cast<VkMemoryMapFlags>( flags ),
-                                                        &pData ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory" );
+    void *                       pData;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkMapMemory( m_device,
+                                                                                                    static_cast<VkDeviceMemory>( memory ),
+                                                                                                    static_cast<VkDeviceSize>( offset ),
+                                                                                                    static_cast<VkDeviceSize>( size ),
+                                                                                                    static_cast<VkMemoryMapFlags>( flags ),
+                                                                                                    &pData ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory" );
 
-    return detail::createResultValueType( result, std::move( pData ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pData ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUnmapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::unmapMemory( DeviceMemory memory, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::unmapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUnmapMemory( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ) );
+    d.vkUnmapMemory( m_device, static_cast<VkDeviceMemory>( memory ) );
   }
 
-  // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::flushMappedMemoryRanges( uint32_t                  memoryRangeCount,
-                                                                                 const MappedMemoryRange * pMemoryRanges,
-                                                                                 Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::flushMappedMemoryRanges( uint32_t                                        memoryRangeCount,
+                                                                                 const VULKAN_HPP_NAMESPACE::MappedMemoryRange * pMemoryRanges,
+                                                                                 Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkFlushMappedMemoryRanges( static_cast<VkDevice>( m_device ), memoryRangeCount, reinterpret_cast<const VkMappedMemoryRange *>( pMemoryRanges ) ) );
+    return static_cast<Result>( d.vkFlushMappedMemoryRanges( m_device, memoryRangeCount, reinterpret_cast<const VkMappedMemoryRange *>( pMemoryRanges ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::flushMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges, Dispatch const & d ) const
+    Device::flushMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges,
+                                     Dispatch const &                                                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkFlushMappedMemoryRanges && "Function <vkFlushMappedMemoryRanges> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkFlushMappedMemoryRanges( m_device, memoryRanges.size(), reinterpret_cast<const VkMappedMemoryRange *>( memoryRanges.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::flushMappedMemoryRanges" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkFlushMappedMemoryRanges( m_device, memoryRanges.size(), reinterpret_cast<const VkMappedMemoryRange *>( memoryRanges.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::flushMappedMemoryRanges" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkInvalidateMappedMemoryRanges, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::invalidateMappedMemoryRanges( uint32_t                  memoryRangeCount,
-                                                                                      const MappedMemoryRange * pMemoryRanges,
-                                                                                      Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::invalidateMappedMemoryRanges( uint32_t                                        memoryRangeCount,
+                                                                                      const VULKAN_HPP_NAMESPACE::MappedMemoryRange * pMemoryRanges,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkInvalidateMappedMemoryRanges( static_cast<VkDevice>( m_device ), memoryRangeCount, reinterpret_cast<const VkMappedMemoryRange *>( pMemoryRanges ) ) );
+      d.vkInvalidateMappedMemoryRanges( m_device, memoryRangeCount, reinterpret_cast<const VkMappedMemoryRange *>( pMemoryRanges ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkInvalidateMappedMemoryRanges, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::invalidateMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges, Dispatch const & d ) const
+    Device::invalidateMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges,
+                                          Dispatch const &                                                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkInvalidateMappedMemoryRanges && "Function <vkInvalidateMappedMemoryRanges> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkInvalidateMappedMemoryRanges( m_device, memoryRanges.size(), reinterpret_cast<const VkMappedMemoryRange *>( memoryRanges.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::invalidateMappedMemoryRanges" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::invalidateMappedMemoryRanges" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceMemoryCommitment, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getMemoryCommitment( DeviceMemory memory, DeviceSize * pCommittedMemoryInBytes, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize * pCommittedMemoryInBytes,
+                                                      Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceMemoryCommitment(
-      static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ), reinterpret_cast<VkDeviceSize *>( pCommittedMemoryInBytes ) );
+    d.vkGetDeviceMemoryCommitment( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<VkDeviceSize *>( pCommittedMemoryInBytes ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceMemoryCommitment, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize Device::getMemoryCommitment( DeviceMemory memory, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize Device::getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDeviceMemoryCommitment && "Function <vkGetDeviceMemoryCommitment> requires <VK_VERSION_1_0>" );
 #  endif
 
-    DeviceSize committedMemoryInBytes;
+    VULKAN_HPP_NAMESPACE::DeviceSize committedMemoryInBytes;
     d.vkGetDeviceMemoryCommitment( m_device, static_cast<VkDeviceMemory>( memory ), reinterpret_cast<VkDeviceSize *>( &committedMemoryInBytes ) );
 
     return committedMemoryInBytes;
@@ -1227,151 +1166,140 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::bindBufferMemory( Buffer buffer, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory( VULKAN_HPP_NAMESPACE::Buffer       buffer,
+                                                                          VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                                          VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                                                                          Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindBufferMemory(
-      static_cast<VkDevice>( m_device ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
+    return static_cast<Result>(
+      d.vkBindBufferMemory( m_device, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
   }
 #else
-  // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindBufferMemory( Buffer buffer, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindBufferMemory(
+    VULKAN_HPP_NAMESPACE::Buffer buffer, VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindBufferMemory && "Function <vkBindBufferMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkBindBufferMemory( m_device, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::bindImageMemory( Image image, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory( VULKAN_HPP_NAMESPACE::Image        image,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                                                                         Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindImageMemory(
-      static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
+    return static_cast<Result>(
+      d.vkBindImageMemory( m_device, static_cast<VkImage>( image ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
   }
 #else
-  // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindImageMemory( Image image, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindImageMemory(
+    VULKAN_HPP_NAMESPACE::Image image, VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindImageMemory && "Function <vkBindImageMemory> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkBindImageMemory( m_device, static_cast<VkImage>( image ), static_cast<VkDeviceMemory>( memory ), static_cast<VkDeviceSize>( memoryOffset ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getBufferMemoryRequirements( Buffer buffer, MemoryRequirements * pMemoryRequirements, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements( VULKAN_HPP_NAMESPACE::Buffer               buffer,
+                                                              VULKAN_HPP_NAMESPACE::MemoryRequirements * pMemoryRequirements,
+                                                              Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetBufferMemoryRequirements(
-      static_cast<VkDevice>( m_device ), static_cast<VkBuffer>( buffer ), reinterpret_cast<VkMemoryRequirements *>( pMemoryRequirements ) );
+    d.vkGetBufferMemoryRequirements( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<VkMemoryRequirements *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements Device::getBufferMemoryRequirements( Buffer buffer, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements
+    Device::getBufferMemoryRequirements( VULKAN_HPP_NAMESPACE::Buffer buffer, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetBufferMemoryRequirements && "Function <vkGetBufferMemoryRequirements> requires <VK_VERSION_1_0>" );
 #  endif
 
-    MemoryRequirements memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements;
     d.vkGetBufferMemoryRequirements( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<VkMemoryRequirements *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageMemoryRequirements, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getImageMemoryRequirements( Image image, MemoryRequirements * pMemoryRequirements, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                image,
+                                                             VULKAN_HPP_NAMESPACE::MemoryRequirements * pMemoryRequirements,
+                                                             Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageMemoryRequirements(
-      static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), reinterpret_cast<VkMemoryRequirements *>( pMemoryRequirements ) );
+    d.vkGetImageMemoryRequirements( m_device, static_cast<VkImage>( image ), reinterpret_cast<VkMemoryRequirements *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageMemoryRequirements, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements Device::getImageMemoryRequirements( Image image, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements
+                                         Device::getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetImageMemoryRequirements && "Function <vkGetImageMemoryRequirements> requires <VK_VERSION_1_0>" );
 #  endif
 
-    MemoryRequirements memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements;
     d.vkGetImageMemoryRequirements( m_device, static_cast<VkImage>( image ), reinterpret_cast<VkMemoryRequirements *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( Image                           image,
-                                                                   uint32_t *                      pSparseMemoryRequirementCount,
-                                                                   SparseImageMemoryRequirements * pSparseMemoryRequirements,
-                                                                   Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                           image,
+                                                                   uint32_t *                                            pSparseMemoryRequirementCount,
+                                                                   VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements * pSparseMemoryRequirements,
+                                                                   Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSparseMemoryRequirements( static_cast<VkDevice>( m_device ),
+    d.vkGetImageSparseMemoryRequirements( m_device,
                                           static_cast<VkImage>( image ),
                                           pSparseMemoryRequirementCount,
                                           reinterpret_cast<VkSparseImageMemoryRequirements *>( pSparseMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-  template <typename SparseImageMemoryRequirementsAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, SparseImageMemoryRequirements>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
-                                         Device::getImageSparseMemoryRequirements( Image image, Dispatch const & d ) const
+  template <typename SparseImageMemoryRequirementsAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
+                                         Device::getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements && "Function <vkGetImageSparseMemoryRequirements> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements;
-    uint32_t                                                                           sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements;
+    uint32_t                                                                                                 sparseMemoryRequirementCount;
     d.vkGetImageSparseMemoryRequirements( m_device, static_cast<VkImage>( image ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
     d.vkGetImageSparseMemoryRequirements( m_device,
@@ -1387,14 +1315,13 @@ namespace VULKAN_HPP_NAMESPACE
     return sparseMemoryRequirements;
   }
 
-  // wrapper function for command vkGetImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
   template <typename SparseImageMemoryRequirementsAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, SparseImageMemoryRequirements>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
-                                         Device::getImageSparseMemoryRequirements( Image                                    image,
+            typename std::enable_if<
+              std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
+                                         Device::getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image              image,
                                               SparseImageMemoryRequirementsAllocator & sparseImageMemoryRequirementsAllocator,
                                               Dispatch const &                         d ) const
   {
@@ -1403,8 +1330,9 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements && "Function <vkGetImageSparseMemoryRequirements> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements( sparseImageMemoryRequirementsAllocator );
-    uint32_t                                                                           sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator> sparseMemoryRequirements(
+      sparseImageMemoryRequirementsAllocator );
+    uint32_t sparseMemoryRequirementCount;
     d.vkGetImageSparseMemoryRequirements( m_device, static_cast<VkImage>( image ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
     d.vkGetImageSparseMemoryRequirements( m_device,
@@ -1421,20 +1349,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties( Format                        format,
-                                                                         ImageType                     type,
-                                                                         SampleCountFlagBits           samples,
-                                                                         ImageUsageFlags               usage,
-                                                                         ImageTiling                   tiling,
-                                                                         uint32_t *                    pPropertyCount,
-                                                                         SparseImageFormatProperties * pProperties,
-                                                                         Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                        format,
+                                                                         VULKAN_HPP_NAMESPACE::ImageType                     type,
+                                                                         VULKAN_HPP_NAMESPACE::SampleCountFlagBits           samples,
+                                                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags               usage,
+                                                                         VULKAN_HPP_NAMESPACE::ImageTiling                   tiling,
+                                                                         uint32_t *                                          pPropertyCount,
+                                                                         VULKAN_HPP_NAMESPACE::SparseImageFormatProperties * pProperties,
+                                                                         Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceSparseImageFormatProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice,
                                                       static_cast<VkFormat>( format ),
                                                       static_cast<VkImageType>( type ),
                                                       static_cast<VkSampleCountFlagBits>( samples ),
@@ -1445,15 +1371,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-  template <typename SparseImageFormatPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, SparseImageFormatProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
-                                         PhysicalDevice::getSparseImageFormatProperties(
-      Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling, Dispatch const & d ) const
+  template <typename SparseImageFormatPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
+                                         PhysicalDevice::getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                    VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                    VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                    VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                    VULKAN_HPP_NAMESPACE::ImageTiling         tiling,
+                                                    Dispatch const &                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -1461,8 +1386,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSparseImageFormatProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties;
-    uint32_t                                                                       propertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties;
+    uint32_t                                                                                             propertyCount;
     d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice,
                                                       static_cast<VkFormat>( format ),
                                                       static_cast<VkImageType>( type ),
@@ -1489,20 +1414,19 @@ namespace VULKAN_HPP_NAMESPACE
     return properties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-  template <typename SparseImageFormatPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, SparseImageFormatProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
-                                         PhysicalDevice::getSparseImageFormatProperties( Format                                 format,
-                                                    ImageType                              type,
-                                                    SampleCountFlagBits                    samples,
-                                                    ImageUsageFlags                        usage,
-                                                    ImageTiling                            tiling,
-                                                    SparseImageFormatPropertiesAllocator & sparseImageFormatPropertiesAllocator,
-                                                    Dispatch const &                       d ) const
+  template <
+    typename SparseImageFormatPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
+                                         PhysicalDevice::getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                    VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                    VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                    VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                    VULKAN_HPP_NAMESPACE::ImageTiling         tiling,
+                                                    SparseImageFormatPropertiesAllocator &    sparseImageFormatPropertiesAllocator,
+                                                    Dispatch const &                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -1510,8 +1434,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSparseImageFormatProperties> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties( sparseImageFormatPropertiesAllocator );
-    uint32_t                                                                       propertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator> properties( sparseImageFormatPropertiesAllocator );
+    uint32_t                                                                                             propertyCount;
     d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice,
                                                       static_cast<VkFormat>( format ),
                                                       static_cast<VkImageType>( type ),
@@ -1539,442 +1463,651 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Queue::bindSparse( uint32_t bindInfoCount, const BindSparseInfo * pBindInfo, Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::bindSparse( uint32_t                                     bindInfoCount,
+                                                                   const VULKAN_HPP_NAMESPACE::BindSparseInfo * pBindInfo,
+                                                                   VULKAN_HPP_NAMESPACE::Fence                  fence,
+                                                                   Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkQueueBindSparse(
-      static_cast<VkQueue>( m_queue ), bindInfoCount, reinterpret_cast<const VkBindSparseInfo *>( pBindInfo ), static_cast<VkFence>( fence ) ) );
+    return static_cast<Result>(
+      d.vkQueueBindSparse( m_queue, bindInfoCount, reinterpret_cast<const VkBindSparseInfo *>( pBindInfo ), static_cast<VkFence>( fence ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Queue::bindSparse( ArrayProxy<const BindSparseInfo> const & bindInfo, Fence fence, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::bindSparse(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindSparseInfo> const & bindInfo, VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkQueueBindSparse && "Function <vkQueueBindSparse> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkQueueBindSparse( m_queue, bindInfo.size(), reinterpret_cast<const VkBindSparseInfo *>( bindInfo.data() ), static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::bindSparse" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::bindSparse" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFence( const FenceCreateInfo *     pCreateInfo,
-                                                                     const AllocationCallbacks * pAllocator,
-                                                                     Fence *                     pFence,
-                                                                     Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFence( const VULKAN_HPP_NAMESPACE::FenceCreateInfo *     pCreateInfo,
+                                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                     VULKAN_HPP_NAMESPACE::Fence *                     pFence,
+                                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateFence( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateFence( m_device,
                                                  reinterpret_cast<const VkFenceCreateInfo *>( pCreateInfo ),
                                                  reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                  reinterpret_cast<VkFence *>( pFence ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type
-                       Device::createFence( const FenceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type Device::createFence(
+    const VULKAN_HPP_NAMESPACE::FenceCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateFence && "Function <vkCreateFence> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkCreateFence( m_device,
-                                                          reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFence" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateFence( m_device,
+                       reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFence" );
 
-    return detail::createResultValueType( result, std::move( fence ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fence ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type
-                       Device::createFenceUnique( const FenceCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type Device::createFenceUnique(
+    const VULKAN_HPP_NAMESPACE::FenceCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateFence && "Function <vkCreateFence> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkCreateFence( m_device,
-                                                          reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFenceUnique" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateFence( m_device,
+                       reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFenceUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Fence, Dispatch>( fence, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>( fence, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyFence( Fence fence, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyFence( VULKAN_HPP_NAMESPACE::Fence                       fence,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                               Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyFence( static_cast<VkDevice>( m_device ), static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyFence( m_device, static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyFence( Fence fence, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyFence( VULKAN_HPP_NAMESPACE::Fence                               fence,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                               Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyFence && "Function <vkDestroyFence> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyFence( m_device, static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyFence( m_device,
+                      static_cast<VkFence>( fence ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Fence fence, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Fence                       fence,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyFence( static_cast<VkDevice>( m_device ), static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyFence( m_device, static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Fence fence, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Fence                               fence,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyFence && "Function <vkDestroyFence> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyFence( m_device, static_cast<VkFence>( fence ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyFence( m_device,
+                      static_cast<VkFence>( fence ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetFences( uint32_t fenceCount, const Fence * pFences, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetFences( uint32_t                            fenceCount,
+                                                                     const VULKAN_HPP_NAMESPACE::Fence * pFences,
+                                                                     Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkResetFences( static_cast<VkDevice>( m_device ), fenceCount, reinterpret_cast<const VkFence *>( pFences ) ) );
+    return static_cast<Result>( d.vkResetFences( m_device, fenceCount, reinterpret_cast<const VkFence *>( pFences ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::resetFences( ArrayProxy<const Fence> const & fences,
-                                                                                                                      Dispatch const &                d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::resetFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkResetFences && "Function <vkResetFences> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkResetFences( m_device, fences.size(), reinterpret_cast<const VkFence *>( fences.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetFences" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkResetFences( m_device, fences.size(), reinterpret_cast<const VkFence *>( fences.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetFences" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceStatus( Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceStatus( VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetFenceStatus( static_cast<VkDevice>( m_device ), static_cast<VkFence>( fence ) ) );
+    return static_cast<Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) );
   }
 #else
-  // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceStatus( Fence fence, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::getFenceStatus( VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetFenceStatus && "Function <vkGetFenceStatus> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus", { Result::eSuccess, Result::eNotReady } );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetFenceStatus( m_device, static_cast<VkFence>( fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceStatus", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::waitForFences( uint32_t fenceCount, const Fence * pFences, Bool32 waitAll, uint64_t timeout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitForFences( uint32_t                            fenceCount,
+                                                                       const VULKAN_HPP_NAMESPACE::Fence * pFences,
+                                                                       VULKAN_HPP_NAMESPACE::Bool32        waitAll,
+                                                                       uint64_t                            timeout,
+                                                                       Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWaitForFences(
-      static_cast<VkDevice>( m_device ), fenceCount, reinterpret_cast<const VkFence *>( pFences ), static_cast<VkBool32>( waitAll ), timeout ) );
+    return static_cast<Result>(
+      d.vkWaitForFences( m_device, fenceCount, reinterpret_cast<const VkFence *>( pFences ), static_cast<VkBool32>( waitAll ), timeout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::waitForFences( ArrayProxy<const Fence> const & fences, Bool32 waitAll, uint64_t timeout, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                         Device::waitForFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences,
+                           VULKAN_HPP_NAMESPACE::Bool32                                                waitAll,
+                           uint64_t                                                                    timeout,
+                           Dispatch const &                                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkWaitForFences && "Function <vkWaitForFences> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkWaitForFences( m_device, fences.size(), reinterpret_cast<const VkFence *>( fences.data() ), static_cast<VkBool32>( waitAll ), timeout ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForFences", { Result::eSuccess, Result::eTimeout } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForFences", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSemaphore( const SemaphoreCreateInfo * pCreateInfo,
-                                                                         const AllocationCallbacks * pAllocator,
-                                                                         Semaphore *                 pSemaphore,
-                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo * pCreateInfo,
+                                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                         VULKAN_HPP_NAMESPACE::Semaphore *                 pSemaphore,
+                                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSemaphore( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateSemaphore( m_device,
                                                      reinterpret_cast<const VkSemaphoreCreateInfo *>( pCreateInfo ),
                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                      reinterpret_cast<VkSemaphore *>( pSemaphore ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Semaphore>::type
-    Device::createSemaphore( const SemaphoreCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Semaphore>::type
+                       Device::createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo &         createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSemaphore && "Function <vkCreateSemaphore> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Semaphore semaphore;
-    Result    result = static_cast<Result>( d.vkCreateSemaphore( m_device,
-                                                              reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSemaphore" );
+    VULKAN_HPP_NAMESPACE::Semaphore semaphore;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSemaphore( m_device,
+                           reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSemaphore" );
 
-    return detail::createResultValueType( result, std::move( semaphore ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( semaphore ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Semaphore, Dispatch>>::type
-    Device::createSemaphoreUnique( const SemaphoreCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Semaphore, Dispatch>>::type
+                       Device::createSemaphoreUnique( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo &         createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSemaphore && "Function <vkCreateSemaphore> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Semaphore semaphore;
-    Result    result = static_cast<Result>( d.vkCreateSemaphore( m_device,
-                                                              reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSemaphoreUnique" );
+    VULKAN_HPP_NAMESPACE::Semaphore semaphore;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSemaphore( m_device,
+                           reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSemaphoreUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<Semaphore, Dispatch>( semaphore, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Semaphore, Dispatch>( semaphore, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySemaphore( Semaphore semaphore, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySemaphore(
-      static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySemaphore( m_device, static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroySemaphore( Semaphore semaphore, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore                           semaphore,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySemaphore && "Function <vkDestroySemaphore> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroySemaphore( m_device, static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySemaphore( m_device,
+                          static_cast<VkSemaphore>( semaphore ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Semaphore semaphore, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySemaphore(
-      static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySemaphore( m_device, static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Semaphore semaphore, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Semaphore                           semaphore,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySemaphore && "Function <vkDestroySemaphore> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroySemaphore( m_device, static_cast<VkSemaphore>( semaphore ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySemaphore( m_device,
+                          static_cast<VkSemaphore>( semaphore ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createQueryPool( const QueryPoolCreateInfo * pCreateInfo,
-                                                                         const AllocationCallbacks * pAllocator,
-                                                                         QueryPool *                 pQueryPool,
-                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createEvent( const VULKAN_HPP_NAMESPACE::EventCreateInfo *     pCreateInfo,
+                                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                     VULKAN_HPP_NAMESPACE::Event *                     pEvent,
+                                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateQueryPool( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateEvent( m_device,
+                                                 reinterpret_cast<const VkEventCreateInfo *>( pCreateInfo ),
+                                                 reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                 reinterpret_cast<VkEvent *>( pEvent ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Event>::type Device::createEvent(
+    const VULKAN_HPP_NAMESPACE::EventCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateEvent && "Function <vkCreateEvent> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Event  event;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateEvent( m_device,
+                       reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkEvent *>( &event ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createEvent" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( event ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Event, Dispatch>>::type Device::createEventUnique(
+    const VULKAN_HPP_NAMESPACE::EventCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateEvent && "Function <vkCreateEvent> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::Event  event;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateEvent( m_device,
+                       reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkEvent *>( &event ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createEventUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Event, Dispatch>( event, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyEvent( VULKAN_HPP_NAMESPACE::Event                       event,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                               Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyEvent( m_device, static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyEvent( VULKAN_HPP_NAMESPACE::Event                               event,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                               Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyEvent && "Function <vkDestroyEvent> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyEvent( m_device,
+                      static_cast<VkEvent>( event ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Event                       event,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyEvent( m_device, static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Event                               event,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyEvent && "Function <vkDestroyEvent> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyEvent( m_device,
+                      static_cast<VkEvent>( event ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getEventStatus( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::getEventStatus( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetEventStatus && "Function <vkGetEventStatus> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus", { VULKAN_HPP_NAMESPACE::Result::eEventSet, VULKAN_HPP_NAMESPACE::Result::eEventReset } );
+
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setEvent( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkSetEvent( m_device, static_cast<VkEvent>( event ) ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setEvent( VULKAN_HPP_NAMESPACE::Event event,
+                                                                                                                   Dispatch const &            d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkSetEvent && "Function <vkSetEvent> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkSetEvent( m_device, static_cast<VkEvent>( event ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setEvent" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetEvent( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkResetEvent( m_device, static_cast<VkEvent>( event ) ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::resetEvent( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkResetEvent && "Function <vkResetEvent> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkResetEvent( m_device, static_cast<VkEvent>( event ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetEvent" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createQueryPool( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo * pCreateInfo,
+                                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                         VULKAN_HPP_NAMESPACE::QueryPool *                 pQueryPool,
+                                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateQueryPool( m_device,
                                                      reinterpret_cast<const VkQueryPoolCreateInfo *>( pCreateInfo ),
                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                      reinterpret_cast<VkQueryPool *>( pQueryPool ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<QueryPool>::type
-    Device::createQueryPool( const QueryPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::QueryPool>::type
+                       Device::createQueryPool( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo &         createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateQueryPool && "Function <vkCreateQueryPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    QueryPool queryPool;
-    Result    result = static_cast<Result>( d.vkCreateQueryPool( m_device,
-                                                              reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createQueryPool" );
+    VULKAN_HPP_NAMESPACE::QueryPool queryPool;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateQueryPool( m_device,
+                           reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createQueryPool" );
 
-    return detail::createResultValueType( result, std::move( queryPool ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( queryPool ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<QueryPool, Dispatch>>::type
-    Device::createQueryPoolUnique( const QueryPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::QueryPool, Dispatch>>::type
+                       Device::createQueryPoolUnique( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo &         createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateQueryPool && "Function <vkCreateQueryPool> requires <VK_VERSION_1_0>" );
 #    endif
 
-    QueryPool queryPool;
-    Result    result = static_cast<Result>( d.vkCreateQueryPool( m_device,
-                                                              reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createQueryPoolUnique" );
+    VULKAN_HPP_NAMESPACE::QueryPool queryPool;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateQueryPool( m_device,
+                           reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createQueryPoolUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<QueryPool, Dispatch>( queryPool, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::QueryPool, Dispatch>( queryPool, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyQueryPool( QueryPool queryPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyQueryPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyQueryPool( m_device, static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyQueryPool( QueryPool queryPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool                           queryPool,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyQueryPool && "Function <vkDestroyQueryPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyQueryPool( m_device, static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyQueryPool( m_device,
+                          static_cast<VkQueryPool>( queryPool ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( QueryPool queryPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyQueryPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyQueryPool( m_device, static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( QueryPool queryPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::QueryPool                           queryPool,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyQueryPool && "Function <vkDestroyQueryPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyQueryPool( m_device, static_cast<VkQueryPool>( queryPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyQueryPool( m_device,
+                          static_cast<VkQueryPool>( queryPool ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getQueryPoolResults( QueryPool        queryPool,
-                                                                             uint32_t         firstQuery,
-                                                                             uint32_t         queryCount,
-                                                                             size_t           dataSize,
-                                                                             void *           pData,
-                                                                             DeviceSize       stride,
-                                                                             QueryResultFlags flags,
-                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                                                             uint32_t                               firstQuery,
+                                                                             uint32_t                               queryCount,
+                                                                             size_t                                 dataSize,
+                                                                             void *                                 pData,
+                                                                             VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                                                             VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                                                                             Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetQueryPoolResults( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetQueryPoolResults( m_device,
                                                          static_cast<VkQueryPool>( queryPool ),
                                                          firstQuery,
                                                          queryCount,
@@ -1985,14 +2118,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<DataType, DataTypeAllocator>> Device::getQueryPoolResults(
-    QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, DeviceSize stride, QueryResultFlags flags, Dispatch const & d ) const
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<DataType, DataTypeAllocator>>
+                                         Device::getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                 uint32_t                               firstQuery,
+                                 uint32_t                               queryCount,
+                                 size_t                                 dataSize,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                 VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                                 Dispatch const &                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -2001,275 +2135,408 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkGetQueryPoolResults( m_device,
-                                                                  static_cast<VkQueryPool>( queryPool ),
-                                                                  firstQuery,
-                                                                  queryCount,
-                                                                  data.size() * sizeof( DataType ),
-                                                                  reinterpret_cast<void *>( data.data() ),
-                                                                  static_cast<VkDeviceSize>( stride ),
-                                                                  static_cast<VkQueryResultFlags>( flags ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getQueryPoolResults", { Result::eSuccess, Result::eNotReady } );
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetQueryPoolResults( m_device,
+                                                                                                              static_cast<VkQueryPool>( queryPool ),
+                                                                                                              firstQuery,
+                                                                                                              queryCount,
+                                                                                                              data.size() * sizeof( DataType ),
+                                                                                                              reinterpret_cast<void *>( data.data() ),
+                                                                                                              static_cast<VkDeviceSize>( stride ),
+                                                                                                              static_cast<VkQueryResultFlags>( flags ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::getQueryPoolResults",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
     return ResultValue<std::vector<DataType, DataTypeAllocator>>( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<DataType> Device::getQueryPoolResult(
-    QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, DeviceSize stride, QueryResultFlags flags, Dispatch const & d ) const
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<DataType> Device::getQueryPoolResult( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                                                                           uint32_t                               firstQuery,
+                                                                                           uint32_t                               queryCount,
+                                                                                           VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                                                                           VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                                                                                           Dispatch const &                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetQueryPoolResults && "Function <vkGetQueryPoolResults> requires <VK_VERSION_1_0>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetQueryPoolResults( m_device,
-                                                                  static_cast<VkQueryPool>( queryPool ),
-                                                                  firstQuery,
-                                                                  queryCount,
-                                                                  sizeof( DataType ),
-                                                                  reinterpret_cast<void *>( &data ),
-                                                                  static_cast<VkDeviceSize>( stride ),
-                                                                  static_cast<VkQueryResultFlags>( flags ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getQueryPoolResult", { Result::eSuccess, Result::eNotReady } );
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetQueryPoolResults( m_device,
+                                                                                                              static_cast<VkQueryPool>( queryPool ),
+                                                                                                              firstQuery,
+                                                                                                              queryCount,
+                                                                                                              sizeof( DataType ),
+                                                                                                              reinterpret_cast<void *>( &data ),
+                                                                                                              static_cast<VkDeviceSize>( stride ),
+                                                                                                              static_cast<VkQueryResultFlags>( flags ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getQueryPoolResult", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
     return ResultValue<DataType>( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBuffer( const BufferCreateInfo *    pCreateInfo,
-                                                                      const AllocationCallbacks * pAllocator,
-                                                                      Buffer *                    pBuffer,
-                                                                      Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBuffer( const VULKAN_HPP_NAMESPACE::BufferCreateInfo *    pCreateInfo,
+                                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer *                    pBuffer,
+                                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateBuffer( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateBuffer( m_device,
                                                   reinterpret_cast<const VkBufferCreateInfo *>( pCreateInfo ),
                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                   reinterpret_cast<VkBuffer *>( pBuffer ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Buffer>::type
-                       Device::createBuffer( const BufferCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Buffer>::type Device::createBuffer(
+    const VULKAN_HPP_NAMESPACE::BufferCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateBuffer && "Function <vkCreateBuffer> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Buffer buffer;
-    Result result = static_cast<Result>( d.vkCreateBuffer( m_device,
-                                                           reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
-                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                           reinterpret_cast<VkBuffer *>( &buffer ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBuffer" );
+    VULKAN_HPP_NAMESPACE::Buffer buffer;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateBuffer( m_device,
+                        reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                        reinterpret_cast<VkBuffer *>( &buffer ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBuffer" );
 
-    return detail::createResultValueType( result, std::move( buffer ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( buffer ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Buffer, Dispatch>>::type
-    Device::createBufferUnique( const BufferCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Buffer, Dispatch>>::type Device::createBufferUnique(
+    const VULKAN_HPP_NAMESPACE::BufferCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateBuffer && "Function <vkCreateBuffer> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Buffer buffer;
-    Result result = static_cast<Result>( d.vkCreateBuffer( m_device,
-                                                           reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
-                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                           reinterpret_cast<VkBuffer *>( &buffer ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferUnique" );
+    VULKAN_HPP_NAMESPACE::Buffer buffer;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateBuffer( m_device,
+                        reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                        reinterpret_cast<VkBuffer *>( &buffer ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Buffer, Dispatch>( buffer, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Buffer, Dispatch>( buffer, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyBuffer( Buffer buffer, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
+                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyBuffer( static_cast<VkDevice>( m_device ), static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyBuffer( Buffer buffer, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer                              buffer,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyBuffer && "Function <vkDestroyBuffer> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyBuffer( m_device,
+                       static_cast<VkBuffer>( buffer ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Buffer buffer, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyBuffer( static_cast<VkDevice>( m_device ), static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Buffer buffer, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Buffer                              buffer,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyBuffer && "Function <vkDestroyBuffer> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyBuffer( m_device, static_cast<VkBuffer>( buffer ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyBuffer( m_device,
+                       static_cast<VkBuffer>( buffer ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImage( const ImageCreateInfo *     pCreateInfo,
-                                                                     const AllocationCallbacks * pAllocator,
-                                                                     Image *                     pImage,
-                                                                     Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo * pCreateInfo,
+                                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *  pAllocator,
+                                                                          VULKAN_HPP_NAMESPACE::BufferView *                 pView,
+                                                                          Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateImage( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateBufferView( m_device,
+                                                      reinterpret_cast<const VkBufferViewCreateInfo *>( pCreateInfo ),
+                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                      reinterpret_cast<VkBufferView *>( pView ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferView>::type
+                       Device::createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo &        createInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                              Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateBufferView && "Function <vkCreateBufferView> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::BufferView view;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateBufferView( m_device,
+                            reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkBufferView *>( &view ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferView" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( view ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::BufferView, Dispatch>>::type
+                       Device::createBufferViewUnique( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo &        createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                    Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateBufferView && "Function <vkCreateBufferView> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::BufferView view;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateBufferView( m_device,
+                            reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkBufferView *>( &view ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferViewUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::BufferView, Dispatch>( view, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBufferView( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
+                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                    Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyBufferView( m_device, static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBufferView( VULKAN_HPP_NAMESPACE::BufferView                          bufferView,
+                                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                    Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyBufferView && "Function <vkDestroyBufferView> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyBufferView( m_device,
+                           static_cast<VkBufferView>( bufferView ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyBufferView( m_device, static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferView                          bufferView,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyBufferView && "Function <vkDestroyBufferView> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyBufferView( m_device,
+                           static_cast<VkBufferView>( bufferView ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImage( const VULKAN_HPP_NAMESPACE::ImageCreateInfo *     pCreateInfo,
+                                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                     VULKAN_HPP_NAMESPACE::Image *                     pImage,
+                                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateImage( m_device,
                                                  reinterpret_cast<const VkImageCreateInfo *>( pCreateInfo ),
                                                  reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                  reinterpret_cast<VkImage *>( pImage ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Image>::type
-                       Device::createImage( const ImageCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Image>::type Device::createImage(
+    const VULKAN_HPP_NAMESPACE::ImageCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImage && "Function <vkCreateImage> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Image  image;
-    Result result = static_cast<Result>( d.vkCreateImage( m_device,
-                                                          reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkImage *>( &image ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImage" );
+    VULKAN_HPP_NAMESPACE::Image  image;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateImage( m_device,
+                       reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkImage *>( &image ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImage" );
 
-    return detail::createResultValueType( result, std::move( image ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( image ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Image, Dispatch>>::type
-                       Device::createImageUnique( const ImageCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Image, Dispatch>>::type Device::createImageUnique(
+    const VULKAN_HPP_NAMESPACE::ImageCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImage && "Function <vkCreateImage> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Image  image;
-    Result result = static_cast<Result>( d.vkCreateImage( m_device,
-                                                          reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkImage *>( &image ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageUnique" );
+    VULKAN_HPP_NAMESPACE::Image  image;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateImage( m_device,
+                       reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
+                       reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                       reinterpret_cast<VkImage *>( &image ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Image, Dispatch>( image, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Image, Dispatch>( image, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyImage( Image image, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyImage( VULKAN_HPP_NAMESPACE::Image                       image,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                               Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyImage( static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyImage( m_device, static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyImage( Image image, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyImage( VULKAN_HPP_NAMESPACE::Image                               image,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                               Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyImage && "Function <vkDestroyImage> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyImage( m_device, static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyImage( m_device,
+                      static_cast<VkImage>( image ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Image image, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Image                       image,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyImage( static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyImage( m_device, static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Image image, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Image                               image,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyImage && "Function <vkDestroyImage> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyImage( m_device, static_cast<VkImage>( image ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyImage( m_device,
+                      static_cast<VkImage>( image ),
+                      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout( Image                    image,
-                                                            const ImageSubresource * pSubresource,
-                                                            SubresourceLayout *      pLayout,
-                                                            Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout( VULKAN_HPP_NAMESPACE::Image                    image,
+                                                            const VULKAN_HPP_NAMESPACE::ImageSubresource * pSubresource,
+                                                            VULKAN_HPP_NAMESPACE::SubresourceLayout *      pLayout,
+                                                            Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSubresourceLayout( static_cast<VkDevice>( m_device ),
+    d.vkGetImageSubresourceLayout( m_device,
                                    static_cast<VkImage>( image ),
                                    reinterpret_cast<const VkImageSubresource *>( pSubresource ),
                                    reinterpret_cast<VkSubresourceLayout *>( pLayout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout Device::getImageSubresourceLayout( Image                    image,
-                                                                                              const ImageSubresource & subresource,
-                                                                                              Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout Device::getImageSubresourceLayout(
+    VULKAN_HPP_NAMESPACE::Image image, const VULKAN_HPP_NAMESPACE::ImageSubresource & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetImageSubresourceLayout && "Function <vkGetImageSubresourceLayout> requires <VK_VERSION_1_0>" );
 #  endif
 
-    SubresourceLayout layout;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout layout;
     d.vkGetImageSubresourceLayout( m_device,
                                    static_cast<VkImage>( image ),
                                    reinterpret_cast<const VkImageSubresource *>( &subresource ),
@@ -2279,1358 +2546,362 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImageView( const ImageViewCreateInfo * pCreateInfo,
-                                                                         const AllocationCallbacks * pAllocator,
-                                                                         ImageView *                 pView,
-                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createImageView( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo * pCreateInfo,
+                                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                         VULKAN_HPP_NAMESPACE::ImageView *                 pView,
+                                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateImageView( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateImageView( m_device,
                                                      reinterpret_cast<const VkImageViewCreateInfo *>( pCreateInfo ),
                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                      reinterpret_cast<VkImageView *>( pView ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageView>::type
-    Device::createImageView( const ImageViewCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageView>::type
+                       Device::createImageView( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo &         createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImageView && "Function <vkCreateImageView> requires <VK_VERSION_1_0>" );
 #  endif
 
-    ImageView view;
-    Result    result = static_cast<Result>( d.vkCreateImageView( m_device,
-                                                              reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkImageView *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageView" );
+    VULKAN_HPP_NAMESPACE::ImageView view;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateImageView( m_device,
+                           reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkImageView *>( &view ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageView" );
 
-    return detail::createResultValueType( result, std::move( view ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( view ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<ImageView, Dispatch>>::type
-    Device::createImageViewUnique( const ImageViewCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ImageView, Dispatch>>::type
+                       Device::createImageViewUnique( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo &         createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImageView && "Function <vkCreateImageView> requires <VK_VERSION_1_0>" );
 #    endif
 
-    ImageView view;
-    Result    result = static_cast<Result>( d.vkCreateImageView( m_device,
-                                                              reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkImageView *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageViewUnique" );
+    VULKAN_HPP_NAMESPACE::ImageView view;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateImageView( m_device,
+                           reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                           reinterpret_cast<VkImageView *>( &view ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createImageViewUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<ImageView, Dispatch>( view, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::ImageView, Dispatch>( view, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyImageView( ImageView imageView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyImageView( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyImageView(
-      static_cast<VkDevice>( m_device ), static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyImageView( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyImageView( ImageView imageView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyImageView( VULKAN_HPP_NAMESPACE::ImageView                           imageView,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyImageView && "Function <vkDestroyImageView> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyImageView( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyImageView( m_device,
+                          static_cast<VkImageView>( imageView ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( ImageView imageView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyImageView(
-      static_cast<VkDevice>( m_device ), static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyImageView( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( ImageView imageView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ImageView                           imageView,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyImageView && "Function <vkDestroyImageView> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyImageView( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyImageView( m_device,
+                          static_cast<VkImageView>( imageView ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCommandPool( const CommandPoolCreateInfo * pCreateInfo,
-                                                                           const AllocationCallbacks *   pAllocator,
-                                                                           CommandPool *                 pCommandPool,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createShaderModule( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
+                                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                                            VULKAN_HPP_NAMESPACE::ShaderModule *                 pShaderModule,
+                                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateCommandPool( static_cast<VkDevice>( m_device ),
-                                                       reinterpret_cast<const VkCommandPoolCreateInfo *>( pCreateInfo ),
-                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                       reinterpret_cast<VkCommandPool *>( pCommandPool ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CommandPool>::type
-    Device::createCommandPool( const CommandPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateCommandPool && "Function <vkCreateCommandPool> requires <VK_VERSION_1_0>" );
-#  endif
-
-    CommandPool commandPool;
-    Result      result = static_cast<Result>( d.vkCreateCommandPool( m_device,
-                                                                reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCommandPool" );
-
-    return detail::createResultValueType( result, std::move( commandPool ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<CommandPool, Dispatch>>::type
-    Device::createCommandPoolUnique( const CommandPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateCommandPool && "Function <vkCreateCommandPool> requires <VK_VERSION_1_0>" );
-#    endif
-
-    CommandPool commandPool;
-    Result      result = static_cast<Result>( d.vkCreateCommandPool( m_device,
-                                                                reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCommandPoolUnique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<CommandPool, Dispatch>( commandPool, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCommandPool( CommandPool commandPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCommandPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCommandPool( CommandPool commandPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyCommandPool && "Function <vkDestroyCommandPool> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CommandPool commandPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCommandPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CommandPool commandPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyCommandPool && "Function <vkDestroyCommandPool> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetCommandPool( CommandPool           commandPool,
-                                                                          CommandPoolResetFlags flags,
-                                                                          Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkResetCommandPool( static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
-  }
-#else
-  // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::resetCommandPool( CommandPool commandPool, CommandPoolResetFlags flags, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkResetCommandPool && "Function <vkResetCommandPool> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result =
-      static_cast<Result>( d.vkResetCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetCommandPool" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-  // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateCommandBuffers( const CommandBufferAllocateInfo * pAllocateInfo,
-                                                                                CommandBuffer *                   pCommandBuffers,
-                                                                                Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAllocateCommandBuffers( static_cast<VkDevice>( m_device ),
-                                                            reinterpret_cast<const VkCommandBufferAllocateInfo *>( pAllocateInfo ),
-                                                            reinterpret_cast<VkCommandBuffer *>( pCommandBuffers ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-  template <typename CommandBufferAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, CommandBuffer>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CommandBuffer, CommandBufferAllocator>>::type
-                       Device::allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
-#  endif
-
-    std::vector<CommandBuffer, CommandBufferAllocator> commandBuffers( allocateInfo.commandBufferCount );
-    Result                                             result = static_cast<Result>( d.vkAllocateCommandBuffers(
-      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffers" );
-
-    return detail::createResultValueType( result, std::move( commandBuffers ) );
-  }
-
-  // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-  template <typename CommandBufferAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, CommandBuffer>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CommandBuffer, CommandBufferAllocator>>::type
-    Device::allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo, CommandBufferAllocator & commandBufferAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
-#  endif
-
-    std::vector<CommandBuffer, CommandBufferAllocator> commandBuffers( allocateInfo.commandBufferCount, commandBufferAllocator );
-    Result                                             result = static_cast<Result>( d.vkAllocateCommandBuffers(
-      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffers" );
-
-    return detail::createResultValueType( result, std::move( commandBuffers ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-  template <typename Dispatch,
-            typename CommandBufferAllocator,
-            typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<CommandBuffer, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
-                       Device::allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
-#    endif
-
-    std::vector<CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
-    Result                     result = static_cast<Result>( d.vkAllocateCommandBuffers(
-      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffersUnique" );
-    std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator> uniqueCommandBuffers;
-    uniqueCommandBuffers.reserve( allocateInfo.commandBufferCount );
-    detail::PoolFree<Device, CommandPool, Dispatch> deleter( *this, allocateInfo.commandPool, d );
-    for ( auto const & commandBuffer : commandBuffers )
-    {
-      uniqueCommandBuffers.push_back( UniqueHandle<CommandBuffer, Dispatch>( commandBuffer, deleter ) );
-    }
-    return detail::createResultValueType( result, std::move( uniqueCommandBuffers ) );
-  }
-
-  // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-  template <typename Dispatch,
-            typename CommandBufferAllocator,
-            typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<CommandBuffer, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
-                       Device::allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo,
-                                          CommandBufferAllocator &          commandBufferAllocator,
-                                          Dispatch const &                  d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
-#    endif
-
-    std::vector<CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
-    Result                     result = static_cast<Result>( d.vkAllocateCommandBuffers(
-      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffersUnique" );
-    std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator> uniqueCommandBuffers( commandBufferAllocator );
-    uniqueCommandBuffers.reserve( allocateInfo.commandBufferCount );
-    detail::PoolFree<Device, CommandPool, Dispatch> deleter( *this, allocateInfo.commandPool, d );
-    for ( auto const & commandBuffer : commandBuffers )
-    {
-      uniqueCommandBuffers.push_back( UniqueHandle<CommandBuffer, Dispatch>( commandBuffer, deleter ) );
-    }
-    return detail::createResultValueType( result, std::move( uniqueCommandBuffers ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::freeCommandBuffers( CommandPool           commandPool,
-                                                     uint32_t              commandBufferCount,
-                                                     const CommandBuffer * pCommandBuffers,
-                                                     Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkFreeCommandBuffers( static_cast<VkDevice>( m_device ),
-                            static_cast<VkCommandPool>( commandPool ),
-                            commandBufferCount,
-                            reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::freeCommandBuffers( CommandPool commandPool, ArrayProxy<const CommandBuffer> const & commandBuffers, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkFreeCommandBuffers && "Function <vkFreeCommandBuffers> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkFreeCommandBuffers(
-      m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void( Device::free )( CommandPool           commandPool,
-                                          uint32_t              commandBufferCount,
-                                          const CommandBuffer * pCommandBuffers,
-                                          Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkFreeCommandBuffers( static_cast<VkDevice>( m_device ),
-                            static_cast<VkCommandPool>( commandPool ),
-                            commandBufferCount,
-                            reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void( Device::free )( CommandPool                             commandPool,
-                                          ArrayProxy<const CommandBuffer> const & commandBuffers,
-                                          Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkFreeCommandBuffers && "Function <vkFreeCommandBuffers> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkFreeCommandBuffers(
-      m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::begin( const CommandBufferBeginInfo * pBeginInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBeginCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCommandBufferBeginInfo *>( pBeginInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::begin( const CommandBufferBeginInfo & beginInfo,
-                                                                                                                       Dispatch const &               d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkBeginCommandBuffer && "Function <vkBeginCommandBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo *>( &beginInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::begin" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::end( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkEndCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ) ) );
-  }
-#else
-  // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::end( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkEndCommandBuffer && "Function <vkEndCommandBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkEndCommandBuffer( m_commandBuffer ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::end" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::reset( CommandBufferResetFlags flags, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkResetCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCommandBufferResetFlags>( flags ) ) );
-  }
-#else
-  // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::reset( CommandBufferResetFlags flags,
-                                                                                                                       Dispatch const &        d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkResetCommandBuffer && "Function <vkResetCommandBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkResetCommandBuffer( m_commandBuffer, static_cast<VkCommandBufferResetFlags>( flags ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::reset" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-  // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer(
-    Buffer srcBuffer, Buffer dstBuffer, uint32_t regionCount, const BufferCopy * pRegions, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                       static_cast<VkBuffer>( srcBuffer ),
-                       static_cast<VkBuffer>( dstBuffer ),
-                       regionCount,
-                       reinterpret_cast<const VkBufferCopy *>( pRegions ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::copyBuffer( Buffer srcBuffer, Buffer dstBuffer, ArrayProxy<const BufferCopy> const & regions, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyBuffer && "Function <vkCmdCopyBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdCopyBuffer( m_commandBuffer,
-                       static_cast<VkBuffer>( srcBuffer ),
-                       static_cast<VkBuffer>( dstBuffer ),
-                       regions.size(),
-                       reinterpret_cast<const VkBufferCopy *>( regions.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage( Image             srcImage,
-                                                   ImageLayout       srcImageLayout,
-                                                   Image             dstImage,
-                                                   ImageLayout       dstImageLayout,
-                                                   uint32_t          regionCount,
-                                                   const ImageCopy * pRegions,
-                                                   Dispatch const &  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                      static_cast<VkImage>( srcImage ),
-                      static_cast<VkImageLayout>( srcImageLayout ),
-                      static_cast<VkImage>( dstImage ),
-                      static_cast<VkImageLayout>( dstImageLayout ),
-                      regionCount,
-                      reinterpret_cast<const VkImageCopy *>( pRegions ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage( Image                               srcImage,
-                                                   ImageLayout                         srcImageLayout,
-                                                   Image                               dstImage,
-                                                   ImageLayout                         dstImageLayout,
-                                                   ArrayProxy<const ImageCopy> const & regions,
-                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyImage && "Function <vkCmdCopyImage> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdCopyImage( m_commandBuffer,
-                      static_cast<VkImage>( srcImage ),
-                      static_cast<VkImageLayout>( srcImageLayout ),
-                      static_cast<VkImage>( dstImage ),
-                      static_cast<VkImageLayout>( dstImageLayout ),
-                      regions.size(),
-                      reinterpret_cast<const VkImageCopy *>( regions.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( Buffer                  srcBuffer,
-                                                           Image                   dstImage,
-                                                           ImageLayout             dstImageLayout,
-                                                           uint32_t                regionCount,
-                                                           const BufferImageCopy * pRegions,
-                                                           Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBufferToImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              static_cast<VkBuffer>( srcBuffer ),
-                              static_cast<VkImage>( dstImage ),
-                              static_cast<VkImageLayout>( dstImageLayout ),
-                              regionCount,
-                              reinterpret_cast<const VkBufferImageCopy *>( pRegions ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( Buffer                                    srcBuffer,
-                                                           Image                                     dstImage,
-                                                           ImageLayout                               dstImageLayout,
-                                                           ArrayProxy<const BufferImageCopy> const & regions,
-                                                           Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyBufferToImage && "Function <vkCmdCopyBufferToImage> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdCopyBufferToImage( m_commandBuffer,
-                              static_cast<VkBuffer>( srcBuffer ),
-                              static_cast<VkImage>( dstImage ),
-                              static_cast<VkImageLayout>( dstImageLayout ),
-                              regions.size(),
-                              reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( Image                   srcImage,
-                                                           ImageLayout             srcImageLayout,
-                                                           Buffer                  dstBuffer,
-                                                           uint32_t                regionCount,
-                                                           const BufferImageCopy * pRegions,
-                                                           Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImageToBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              static_cast<VkImage>( srcImage ),
-                              static_cast<VkImageLayout>( srcImageLayout ),
-                              static_cast<VkBuffer>( dstBuffer ),
-                              regionCount,
-                              reinterpret_cast<const VkBufferImageCopy *>( pRegions ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( Image                                     srcImage,
-                                                           ImageLayout                               srcImageLayout,
-                                                           Buffer                                    dstBuffer,
-                                                           ArrayProxy<const BufferImageCopy> const & regions,
-                                                           Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyImageToBuffer && "Function <vkCmdCopyImageToBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdCopyImageToBuffer( m_commandBuffer,
-                              static_cast<VkImage>( srcImage ),
-                              static_cast<VkImageLayout>( srcImageLayout ),
-                              static_cast<VkBuffer>( dstBuffer ),
-                              regions.size(),
-                              reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::updateBuffer( Buffer dstBuffer, DeviceSize dstOffset, DeviceSize dataSize, const void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdUpdateBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                         static_cast<VkBuffer>( dstBuffer ),
-                         static_cast<VkDeviceSize>( dstOffset ),
-                         static_cast<VkDeviceSize>( dataSize ),
-                         pData );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::updateBuffer( Buffer dstBuffer, DeviceSize dstOffset, ArrayProxy<const DataType> const & data, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdUpdateBuffer && "Function <vkCmdUpdateBuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdUpdateBuffer( m_commandBuffer,
-                         static_cast<VkBuffer>( dstBuffer ),
-                         static_cast<VkDeviceSize>( dstOffset ),
-                         data.size() * sizeof( DataType ),
-                         reinterpret_cast<const void *>( data.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdFillBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdFillBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::fillBuffer( Buffer dstBuffer, DeviceSize dstOffset, DeviceSize size, uint32_t data, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdFillBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                       static_cast<VkBuffer>( dstBuffer ),
-                       static_cast<VkDeviceSize>( dstOffset ),
-                       static_cast<VkDeviceSize>( size ),
-                       data );
-  }
-
-  // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier( PipelineStageFlags          srcStageMask,
-                                                         PipelineStageFlags          dstStageMask,
-                                                         DependencyFlags             dependencyFlags,
-                                                         uint32_t                    memoryBarrierCount,
-                                                         const MemoryBarrier *       pMemoryBarriers,
-                                                         uint32_t                    bufferMemoryBarrierCount,
-                                                         const BufferMemoryBarrier * pBufferMemoryBarriers,
-                                                         uint32_t                    imageMemoryBarrierCount,
-                                                         const ImageMemoryBarrier *  pImageMemoryBarriers,
-                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPipelineBarrier( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                            static_cast<VkPipelineStageFlags>( srcStageMask ),
-                            static_cast<VkPipelineStageFlags>( dstStageMask ),
-                            static_cast<VkDependencyFlags>( dependencyFlags ),
-                            memoryBarrierCount,
-                            reinterpret_cast<const VkMemoryBarrier *>( pMemoryBarriers ),
-                            bufferMemoryBarrierCount,
-                            reinterpret_cast<const VkBufferMemoryBarrier *>( pBufferMemoryBarriers ),
-                            imageMemoryBarrierCount,
-                            reinterpret_cast<const VkImageMemoryBarrier *>( pImageMemoryBarriers ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier( PipelineStageFlags                            srcStageMask,
-                                                         PipelineStageFlags                            dstStageMask,
-                                                         DependencyFlags                               dependencyFlags,
-                                                         ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                                                         ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                                                         ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers,
-                                                         Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPipelineBarrier && "Function <vkCmdPipelineBarrier> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdPipelineBarrier( m_commandBuffer,
-                            static_cast<VkPipelineStageFlags>( srcStageMask ),
-                            static_cast<VkPipelineStageFlags>( dstStageMask ),
-                            static_cast<VkDependencyFlags>( dependencyFlags ),
-                            memoryBarriers.size(),
-                            reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
-                            bufferMemoryBarriers.size(),
-                            reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
-                            imageMemoryBarriers.size(),
-                            reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBeginQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQuery.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginQuery( QueryPool queryPool, uint32_t query, QueryControlFlags flags, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginQuery(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ) );
-  }
-
-  // wrapper function for command vkCmdEndQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQuery.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endQuery( QueryPool queryPool, uint32_t query, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndQuery( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query );
-  }
-
-  // wrapper function for command vkCmdResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::resetQueryPool( QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResetQueryPool( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
-  }
-
-  // wrapper function for command vkCmdWriteTimestamp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::writeTimestamp( PipelineStageFlagBits pipelineStage, QueryPool queryPool, uint32_t query, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteTimestamp(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlagBits>( pipelineStage ), static_cast<VkQueryPool>( queryPool ), query );
-  }
-
-  // wrapper function for command vkCmdCopyQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyQueryPoolResults.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyQueryPoolResults( QueryPool        queryPool,
-                                                              uint32_t         firstQuery,
-                                                              uint32_t         queryCount,
-                                                              Buffer           dstBuffer,
-                                                              DeviceSize       dstOffset,
-                                                              DeviceSize       stride,
-                                                              QueryResultFlags flags,
-                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyQueryPoolResults( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                 static_cast<VkQueryPool>( queryPool ),
-                                 firstQuery,
-                                 queryCount,
-                                 static_cast<VkBuffer>( dstBuffer ),
-                                 static_cast<VkDeviceSize>( dstOffset ),
-                                 static_cast<VkDeviceSize>( stride ),
-                                 static_cast<VkQueryResultFlags>( flags ) );
-  }
-
-  // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::executeCommands( uint32_t commandBufferCount, const CommandBuffer * pCommandBuffers, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdExecuteCommands( static_cast<VkCommandBuffer>( m_commandBuffer ), commandBufferCount, reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::executeCommands( ArrayProxy<const CommandBuffer> const & commandBuffers, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdExecuteCommands && "Function <vkCmdExecuteCommands> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdExecuteCommands( m_commandBuffer, commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createEvent( const EventCreateInfo *     pCreateInfo,
-                                                                     const AllocationCallbacks * pAllocator,
-                                                                     Event *                     pEvent,
-                                                                     Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateEvent( static_cast<VkDevice>( m_device ),
-                                                 reinterpret_cast<const VkEventCreateInfo *>( pCreateInfo ),
-                                                 reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                 reinterpret_cast<VkEvent *>( pEvent ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Event>::type
-                       Device::createEvent( const EventCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateEvent && "Function <vkCreateEvent> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Event  event;
-    Result result = static_cast<Result>( d.vkCreateEvent( m_device,
-                                                          reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkEvent *>( &event ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createEvent" );
-
-    return detail::createResultValueType( result, std::move( event ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Event, Dispatch>>::type
-                       Device::createEventUnique( const EventCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateEvent && "Function <vkCreateEvent> requires <VK_VERSION_1_0>" );
-#    endif
-
-    Event  event;
-    Result result = static_cast<Result>( d.vkCreateEvent( m_device,
-                                                          reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
-                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                          reinterpret_cast<VkEvent *>( &event ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createEventUnique" );
-
-    return detail::createResultValueType( result, UniqueHandle<Event, Dispatch>( event, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyEvent( Event event, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyEvent( Event event, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyEvent && "Function <vkDestroyEvent> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyEvent( m_device, static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Event event, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Event event, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyEvent && "Function <vkDestroyEvent> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyEvent( m_device, static_cast<VkEvent>( event ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getEventStatus( Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetEventStatus( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( event ) ) );
-  }
-#else
-  // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getEventStatus( Event event, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetEventStatus && "Function <vkGetEventStatus> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkGetEventStatus( m_device, static_cast<VkEvent>( event ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEventStatus", { Result::eEventSet, Result::eEventReset } );
-
-    return static_cast<Result>( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setEvent( Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( event ) ) );
-  }
-#else
-  // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setEvent( Event event, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkSetEvent && "Function <vkSetEvent> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkSetEvent( m_device, static_cast<VkEvent>( event ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setEvent" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetEvent( Event event, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkResetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( event ) ) );
-  }
-#else
-  // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::resetEvent( Event event, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkResetEvent && "Function <vkResetEvent> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkResetEvent( m_device, static_cast<VkEvent>( event ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetEvent" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-  // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBufferView( const BufferViewCreateInfo * pCreateInfo,
-                                                                          const AllocationCallbacks *  pAllocator,
-                                                                          BufferView *                 pView,
-                                                                          Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateBufferView( static_cast<VkDevice>( m_device ),
-                                                      reinterpret_cast<const VkBufferViewCreateInfo *>( pCreateInfo ),
-                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                      reinterpret_cast<VkBufferView *>( pView ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferView>::type
-    Device::createBufferView( const BufferViewCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateBufferView && "Function <vkCreateBufferView> requires <VK_VERSION_1_0>" );
-#  endif
-
-    BufferView view;
-    Result     result = static_cast<Result>( d.vkCreateBufferView( m_device,
-                                                               reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkBufferView *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferView" );
-
-    return detail::createResultValueType( result, std::move( view ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<BufferView, Dispatch>>::type
-    Device::createBufferViewUnique( const BufferViewCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateBufferView && "Function <vkCreateBufferView> requires <VK_VERSION_1_0>" );
-#    endif
-
-    BufferView view;
-    Result     result = static_cast<Result>( d.vkCreateBufferView( m_device,
-                                                               reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkBufferView *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferViewUnique" );
-
-    return detail::createResultValueType( result, UniqueHandle<BufferView, Dispatch>( view, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyBufferView( BufferView bufferView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyBufferView(
-      static_cast<VkDevice>( m_device ), static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyBufferView( BufferView bufferView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyBufferView && "Function <vkDestroyBufferView> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyBufferView( m_device, static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( BufferView bufferView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyBufferView(
-      static_cast<VkDevice>( m_device ), static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( BufferView bufferView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyBufferView && "Function <vkDestroyBufferView> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyBufferView( m_device, static_cast<VkBufferView>( bufferView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createShaderModule( const ShaderModuleCreateInfo * pCreateInfo,
-                                                                            const AllocationCallbacks *    pAllocator,
-                                                                            ShaderModule *                 pShaderModule,
-                                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateShaderModule( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateShaderModule( m_device,
                                                         reinterpret_cast<const VkShaderModuleCreateInfo *>( pCreateInfo ),
                                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                         reinterpret_cast<VkShaderModule *>( pShaderModule ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ShaderModule>::type
-    Device::createShaderModule( const ShaderModuleCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ShaderModule>::type
+                       Device::createShaderModule( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo &      createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShaderModule && "Function <vkCreateShaderModule> requires <VK_VERSION_1_0>" );
 #  endif
 
-    ShaderModule shaderModule;
-    Result       result = static_cast<Result>( d.vkCreateShaderModule( m_device,
-                                                                 reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderModule" );
+    VULKAN_HPP_NAMESPACE::ShaderModule shaderModule;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShaderModule( m_device,
+                              reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderModule" );
 
-    return detail::createResultValueType( result, std::move( shaderModule ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( shaderModule ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<ShaderModule, Dispatch>>::type
-    Device::createShaderModuleUnique( const ShaderModuleCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderModule, Dispatch>>::type
+                       Device::createShaderModuleUnique( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo &      createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShaderModule && "Function <vkCreateShaderModule> requires <VK_VERSION_1_0>" );
 #    endif
 
-    ShaderModule shaderModule;
-    Result       result = static_cast<Result>( d.vkCreateShaderModule( m_device,
-                                                                 reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderModuleUnique" );
+    VULKAN_HPP_NAMESPACE::ShaderModule shaderModule;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShaderModule( m_device,
+                              reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderModuleUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<ShaderModule, Dispatch>( shaderModule, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderModule, Dispatch>( shaderModule, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyShaderModule( ShaderModule shaderModule, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyShaderModule( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyShaderModule(
-      static_cast<VkDevice>( m_device ), static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyShaderModule( ShaderModule shaderModule, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyShaderModule( VULKAN_HPP_NAMESPACE::ShaderModule                        shaderModule,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyShaderModule && "Function <vkDestroyShaderModule> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyShaderModule( m_device,
+                             static_cast<VkShaderModule>( shaderModule ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( ShaderModule shaderModule, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyShaderModule(
-      static_cast<VkDevice>( m_device ), static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( ShaderModule shaderModule, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ShaderModule                        shaderModule,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyShaderModule && "Function <vkDestroyShaderModule> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyShaderModule( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyShaderModule( m_device,
+                             static_cast<VkShaderModule>( shaderModule ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineCache( const PipelineCacheCreateInfo * pCreateInfo,
-                                                                             const AllocationCallbacks *     pAllocator,
-                                                                             PipelineCache *                 pPipelineCache,
-                                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineCache( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo * pCreateInfo,
+                                                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                                             VULKAN_HPP_NAMESPACE::PipelineCache *                 pPipelineCache,
+                                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreatePipelineCache( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreatePipelineCache( m_device,
                                                          reinterpret_cast<const VkPipelineCacheCreateInfo *>( pCreateInfo ),
                                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                          reinterpret_cast<VkPipelineCache *>( pPipelineCache ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineCache>::type
-    Device::createPipelineCache( const PipelineCacheCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PipelineCache>::type
+                       Device::createPipelineCache( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo &     createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                 Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePipelineCache && "Function <vkCreatePipelineCache> requires <VK_VERSION_1_0>" );
 #  endif
 
-    PipelineCache pipelineCache;
-    Result        result = static_cast<Result>( d.vkCreatePipelineCache( m_device,
-                                                                  reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineCache" );
+    VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache;
+    VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePipelineCache( m_device,
+                               reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineCache" );
 
-    return detail::createResultValueType( result, std::move( pipelineCache ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineCache ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<PipelineCache, Dispatch>>::type
-    Device::createPipelineCacheUnique( const PipelineCacheCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineCache, Dispatch>>::type
+                       Device::createPipelineCacheUnique( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo &     createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                       Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePipelineCache && "Function <vkCreatePipelineCache> requires <VK_VERSION_1_0>" );
 #    endif
 
-    PipelineCache pipelineCache;
-    Result        result = static_cast<Result>( d.vkCreatePipelineCache( m_device,
-                                                                  reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineCacheUnique" );
+    VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache;
+    VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePipelineCache( m_device,
+                               reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineCacheUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<PipelineCache, Dispatch>( pipelineCache, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineCache, Dispatch>( pipelineCache, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipelineCache( PipelineCache pipelineCache, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                       Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineCache(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipelineCache( m_device, static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipelineCache( PipelineCache pipelineCache, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                       Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipelineCache && "Function <vkDestroyPipelineCache> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipelineCache( m_device, static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipelineCache( m_device,
+                              static_cast<VkPipelineCache>( pipelineCache ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( PipelineCache pipelineCache, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineCache(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipelineCache( m_device, static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PipelineCache pipelineCache, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipelineCache && "Function <vkDestroyPipelineCache> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipelineCache( m_device, static_cast<VkPipelineCache>( pipelineCache ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipelineCache( m_device,
+                              static_cast<VkPipelineCache>( pipelineCache ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getPipelineCacheData( PipelineCache pipelineCache, size_t * pDataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                                                              size_t *                            pDataSize,
+                                                                              void *                              pData,
+                                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetPipelineCacheData( static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( pipelineCache ), pDataSize, pData ) );
+    return static_cast<Result>( d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), pDataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getPipelineCacheData( PipelineCache pipelineCache, Dispatch const & d ) const
+                       Device::getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -3639,33 +2910,32 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data;
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineCacheData" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineCacheData" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getPipelineCacheData( PipelineCache pipelineCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
+    Device::getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -3674,69 +2944,272 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data( uint8_tAllocator );
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPipelineCacheData( m_device, static_cast<VkPipelineCache>( pipelineCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineCacheData" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineCacheData" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergePipelineCaches( PipelineCache         dstCache,
-                                                                             uint32_t              srcCacheCount,
-                                                                             const PipelineCache * pSrcCaches,
-                                                                             Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache         dstCache,
+                                                                             uint32_t                                    srcCacheCount,
+                                                                             const VULKAN_HPP_NAMESPACE::PipelineCache * pSrcCaches,
+                                                                             Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkMergePipelineCaches(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( dstCache ), srcCacheCount, reinterpret_cast<const VkPipelineCache *>( pSrcCaches ) ) );
+    return static_cast<Result>(
+      d.vkMergePipelineCaches( m_device, static_cast<VkPipelineCache>( dstCache ), srcCacheCount, reinterpret_cast<const VkPipelineCache *>( pSrcCaches ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::mergePipelineCaches( PipelineCache dstCache, ArrayProxy<const PipelineCache> const & srcCaches, Dispatch const & d ) const
+                                          Device::mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache                                                 dstCache,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches,
+                                 Dispatch const &                                                                    d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkMergePipelineCaches && "Function <vkMergePipelineCaches> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkMergePipelineCaches(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkMergePipelineCaches(
       m_device, static_cast<VkPipelineCache>( dstCache ), srcCaches.size(), reinterpret_cast<const VkPipelineCache *>( srcCaches.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mergePipelineCaches" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mergePipelineCaches" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createComputePipelines( PipelineCache                     pipelineCache,
-                                                                                uint32_t                          createInfoCount,
-                                                                                const ComputePipelineCreateInfo * pCreateInfos,
-                                                                                const AllocationCallbacks *       pAllocator,
-                                                                                Pipeline *                        pPipelines,
-                                                                                Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                      pipelineCache,
+                                                                                 uint32_t                                                 createInfoCount,
+                                                                                 const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo * pCreateInfos,
+                                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *        pAllocator,
+                                                                                 VULKAN_HPP_NAMESPACE::Pipeline *                         pPipelines,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateComputePipelines( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
+                                                             static_cast<VkPipelineCache>( pipelineCache ),
+                                                             createInfoCount,
+                                                             reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( pCreateInfos ),
+                                                             reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                             reinterpret_cast<VkPipeline *>( pPipelines ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename PipelineAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                     Dispatch const &                                                                                 d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelines",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+  }
+
+  template <typename PipelineAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                     PipelineAllocator &                                                                              pipelineAllocator,
+                                     Dispatch const &                                                                                 d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelines",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                                         Device::createGraphicsPipeline( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                    const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo &  createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                    Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipeline",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+
+    return ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>( result, std::move( pipeline ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch, typename PipelineAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createGraphicsPipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                           Dispatch const &                                                                                 d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#    endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelinesUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
+    uniquePipelines.reserve( createInfos.size() );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    for ( auto const & pipeline : pipelines )
+    {
+      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
+    }
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+  }
+
+  template <
+    typename Dispatch,
+    typename PipelineAllocator,
+    typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createGraphicsPipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                           PipelineAllocator &                                                                              pipelineAllocator,
+                                           Dispatch const &                                                                                 d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#    endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelinesUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
+    uniquePipelines.reserve( createInfos.size() );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    for ( auto const & pipeline : pipelines )
+    {
+      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
+    }
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                                         Device::createGraphicsPipelineUnique( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                          const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo &  createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateGraphicsPipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelineUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>( pipeline, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                     pipelineCache,
+                                                                                uint32_t                                                createInfoCount,
+                                                                                const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo * pCreateInfos,
+                                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                                VULKAN_HPP_NAMESPACE::Pipeline *                        pPipelines,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateComputePipelines( m_device,
                                                             static_cast<VkPipelineCache>( pipelineCache ),
                                                             createInfoCount,
                                                             reinterpret_cast<const VkComputePipelineCreateInfo *>( pCreateInfos ),
@@ -3745,519 +3218,544 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createComputePipelines( PipelineCache                                       pipelineCache,
-                                    ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                    Optional<const AllocationCallbacks>                 allocator,
-                                    Dispatch const &                                    d ) const
+  template <typename PipelineAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                    Dispatch const &                                                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     createInfos.size(),
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelines",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
   template <typename PipelineAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createComputePipelines( PipelineCache                                       pipelineCache,
-                                    ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                    Optional<const AllocationCallbacks>                 allocator,
-                                    PipelineAllocator &                                 pipelineAllocator,
-                                    Dispatch const &                                    d ) const
+            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                    PipelineAllocator &                                                                             pipelineAllocator,
+                                    Dispatch const &                                                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     createInfos.size(),
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelines",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline> Device::createComputePipeline( PipelineCache                       pipelineCache,
-                                                                                              const ComputePipelineCreateInfo &   createInfo,
-                                                                                              Optional<const AllocationCallbacks> allocator,
-                                                                                              Dispatch const &                    d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                                         Device::createComputePipeline( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                   const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo &   createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     1,
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipeline", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipeline",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
+    return ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>( result, std::move( pipeline ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createComputePipelinesUnique( PipelineCache                                       pipelineCache,
-                                          ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                          Optional<const AllocationCallbacks>                 allocator,
-                                          Dispatch const &                                    d ) const
+  template <typename Dispatch, typename PipelineAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createComputePipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                          Dispatch const &                                                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     createInfos.size(),
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelinesUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelinesUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createComputePipelinesUnique( PipelineCache                                       pipelineCache,
-                                          ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                          Optional<const AllocationCallbacks>                 allocator,
-                                          PipelineAllocator &                                 pipelineAllocator,
-                                          Dispatch const &                                    d ) const
+  template <
+    typename Dispatch,
+    typename PipelineAllocator,
+    typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createComputePipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                          PipelineAllocator &                                                                             pipelineAllocator,
+                                          Dispatch const &                                                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     createInfos.size(),
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelinesUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelinesUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>> Device::createComputePipelineUnique(
-    PipelineCache pipelineCache, const ComputePipelineCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                                         Device::createComputePipelineUnique( VULKAN_HPP_NAMESPACE::PipelineCache                       pipelineCache,
+                                         const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo &   createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                         Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateComputePipelines && "Function <vkCreateComputePipelines> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateComputePipelines( m_device,
-                                                                     static_cast<VkPipelineCache>( pipelineCache ),
-                                                                     1,
-                                                                     reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelineUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateComputePipelines(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelineUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>( pipeline, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyPipeline( Pipeline pipeline, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipeline( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
+                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipeline(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipeline( m_device, static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipeline( Pipeline pipeline, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipeline( VULKAN_HPP_NAMESPACE::Pipeline                            pipeline,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipeline && "Function <vkDestroyPipeline> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipeline( m_device, static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipeline( m_device,
+                         static_cast<VkPipeline>( pipeline ),
+                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Pipeline pipeline, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipeline(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipeline( m_device, static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Pipeline pipeline, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Pipeline                            pipeline,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipeline && "Function <vkDestroyPipeline> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipeline( m_device, static_cast<VkPipeline>( pipeline ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipeline( m_device,
+                         static_cast<VkPipeline>( pipeline ),
+                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineLayout( const PipelineLayoutCreateInfo * pCreateInfo,
-                                                                              const AllocationCallbacks *      pAllocator,
-                                                                              PipelineLayout *                 pPipelineLayout,
-                                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineLayout( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo * pCreateInfo,
+                                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                                              VULKAN_HPP_NAMESPACE::PipelineLayout *                 pPipelineLayout,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreatePipelineLayout( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreatePipelineLayout( m_device,
                                                           reinterpret_cast<const VkPipelineLayoutCreateInfo *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                           reinterpret_cast<VkPipelineLayout *>( pPipelineLayout ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineLayout>::type
-    Device::createPipelineLayout( const PipelineLayoutCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PipelineLayout>::type
+                       Device::createPipelineLayout( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo &    createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePipelineLayout && "Function <vkCreatePipelineLayout> requires <VK_VERSION_1_0>" );
 #  endif
 
-    PipelineLayout pipelineLayout;
-    Result         result = static_cast<Result>( d.vkCreatePipelineLayout( m_device,
-                                                                   reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineLayout" );
+    VULKAN_HPP_NAMESPACE::PipelineLayout pipelineLayout;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePipelineLayout( m_device,
+                                reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineLayout" );
 
-    return detail::createResultValueType( result, std::move( pipelineLayout ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineLayout ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<PipelineLayout, Dispatch>>::type
-    Device::createPipelineLayoutUnique( const PipelineLayoutCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineLayout, Dispatch>>::type
+                       Device::createPipelineLayoutUnique( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo &    createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePipelineLayout && "Function <vkCreatePipelineLayout> requires <VK_VERSION_1_0>" );
 #    endif
 
-    PipelineLayout pipelineLayout;
-    Result         result = static_cast<Result>( d.vkCreatePipelineLayout( m_device,
-                                                                   reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineLayoutUnique" );
+    VULKAN_HPP_NAMESPACE::PipelineLayout pipelineLayout;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePipelineLayout( m_device,
+                                reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineLayoutUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<PipelineLayout, Dispatch>( pipelineLayout, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineLayout, Dispatch>( pipelineLayout, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipelineLayout( PipelineLayout pipelineLayout, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
+                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineLayout(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipelineLayout( m_device, static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipelineLayout( PipelineLayout pipelineLayout, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout                      pipelineLayout,
+                                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                        Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipelineLayout && "Function <vkDestroyPipelineLayout> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipelineLayout( m_device, static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipelineLayout( m_device,
+                               static_cast<VkPipelineLayout>( pipelineLayout ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( PipelineLayout pipelineLayout, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineLayout(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPipelineLayout( m_device, static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PipelineLayout pipelineLayout, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PipelineLayout                      pipelineLayout,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyPipelineLayout && "Function <vkDestroyPipelineLayout> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyPipelineLayout( m_device, static_cast<VkPipelineLayout>( pipelineLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyPipelineLayout( m_device,
+                               static_cast<VkPipelineLayout>( pipelineLayout ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSampler( const SamplerCreateInfo *   pCreateInfo,
-                                                                       const AllocationCallbacks * pAllocator,
-                                                                       Sampler *                   pSampler,
-                                                                       Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSampler( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo *   pCreateInfo,
+                                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                       VULKAN_HPP_NAMESPACE::Sampler *                   pSampler,
+                                                                       Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSampler( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateSampler( m_device,
                                                    reinterpret_cast<const VkSamplerCreateInfo *>( pCreateInfo ),
                                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                    reinterpret_cast<VkSampler *>( pSampler ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Sampler>::type
-                       Device::createSampler( const SamplerCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Sampler>::type Device::createSampler(
+    const VULKAN_HPP_NAMESPACE::SamplerCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSampler && "Function <vkCreateSampler> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Sampler sampler;
-    Result  result = static_cast<Result>( d.vkCreateSampler( m_device,
-                                                            reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
-                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                            reinterpret_cast<VkSampler *>( &sampler ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSampler" );
+    VULKAN_HPP_NAMESPACE::Sampler sampler;
+    VULKAN_HPP_NAMESPACE::Result  result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSampler( m_device,
+                         reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
+                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                         reinterpret_cast<VkSampler *>( &sampler ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSampler" );
 
-    return detail::createResultValueType( result, std::move( sampler ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( sampler ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Sampler, Dispatch>>::type
-    Device::createSamplerUnique( const SamplerCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Sampler, Dispatch>>::type Device::createSamplerUnique(
+    const VULKAN_HPP_NAMESPACE::SamplerCreateInfo & createInfo, Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSampler && "Function <vkCreateSampler> requires <VK_VERSION_1_0>" );
 #    endif
 
-    Sampler sampler;
-    Result  result = static_cast<Result>( d.vkCreateSampler( m_device,
-                                                            reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
-                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                            reinterpret_cast<VkSampler *>( &sampler ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerUnique" );
+    VULKAN_HPP_NAMESPACE::Sampler sampler;
+    VULKAN_HPP_NAMESPACE::Result  result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSampler( m_device,
+                         reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
+                         reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                         reinterpret_cast<VkSampler *>( &sampler ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Sampler, Dispatch>( sampler, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Sampler, Dispatch>( sampler, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySampler( Sampler sampler, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySampler( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
+                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                 Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySampler( static_cast<VkDevice>( m_device ), static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySampler( m_device, static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySampler( Sampler sampler, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySampler( VULKAN_HPP_NAMESPACE::Sampler                             sampler,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySampler && "Function <vkDestroySampler> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroySampler( m_device, static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySampler( m_device,
+                        static_cast<VkSampler>( sampler ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Sampler sampler, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySampler( static_cast<VkDevice>( m_device ), static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySampler( m_device, static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Sampler sampler, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Sampler                             sampler,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySampler && "Function <vkDestroySampler> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroySampler( m_device, static_cast<VkSampler>( sampler ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySampler( m_device,
+                        static_cast<VkSampler>( sampler ),
+                        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorSetLayout( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                                                                   const AllocationCallbacks *           pAllocator,
-                                                                                   DescriptorSetLayout *                 pSetLayout,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *           pAllocator,
+                                                                                   VULKAN_HPP_NAMESPACE::DescriptorSetLayout *                 pSetLayout,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDescriptorSetLayout( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateDescriptorSetLayout( m_device,
                                                                reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( pCreateInfo ),
                                                                reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                reinterpret_cast<VkDescriptorSetLayout *>( pSetLayout ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorSetLayout>::type Device::createDescriptorSetLayout(
-    const DescriptorSetLayoutCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>::type
+                       Device::createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>   allocator,
+                                       Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDescriptorSetLayout && "Function <vkCreateDescriptorSetLayout> requires <VK_VERSION_1_0>" );
 #  endif
 
-    DescriptorSetLayout setLayout;
-    Result              result = static_cast<Result>( d.vkCreateDescriptorSetLayout( m_device,
-                                                                        reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorSetLayout" );
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayout setLayout;
+    VULKAN_HPP_NAMESPACE::Result              result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorSetLayout(
+      m_device,
+      reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorSetLayout" );
 
-    return detail::createResultValueType( result, std::move( setLayout ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( setLayout ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DescriptorSetLayout, Dispatch>>::type Device::createDescriptorSetLayoutUnique(
-    const DescriptorSetLayoutCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSetLayout, Dispatch>>::type
+                       Device::createDescriptorSetLayoutUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>   allocator,
+                                             Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDescriptorSetLayout && "Function <vkCreateDescriptorSetLayout> requires <VK_VERSION_1_0>" );
 #    endif
 
-    DescriptorSetLayout setLayout;
-    Result              result = static_cast<Result>( d.vkCreateDescriptorSetLayout( m_device,
-                                                                        reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorSetLayoutUnique" );
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayout setLayout;
+    VULKAN_HPP_NAMESPACE::Result              result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorSetLayout(
+      m_device,
+      reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorSetLayoutUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DescriptorSetLayout, Dispatch>( setLayout, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSetLayout, Dispatch>( setLayout, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorSetLayout( DescriptorSetLayout         descriptorSetLayout,
-                                                             const AllocationCallbacks * pAllocator,
-                                                             Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
+                                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                             Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorSetLayout( static_cast<VkDevice>( m_device ),
-                                    static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
-                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorSetLayout(
+      m_device, static_cast<VkDescriptorSetLayout>( descriptorSetLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorSetLayout( DescriptorSetLayout                 descriptorSetLayout,
-                                                             Optional<const AllocationCallbacks> allocator,
-                                                             Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout                 descriptorSetLayout,
+                                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                             Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -4265,26 +3763,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDescriptorSetLayout(
-      m_device, static_cast<VkDescriptorSetLayout>( descriptorSetLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DescriptorSetLayout descriptorSetLayout, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorSetLayout( static_cast<VkDevice>( m_device ),
-                                    static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
-                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorSetLayout(
+      m_device, static_cast<VkDescriptorSetLayout>( descriptorSetLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DescriptorSetLayout descriptorSetLayout, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout                 descriptorSetLayout,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -4292,340 +3791,320 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDescriptorSetLayout(
-      m_device, static_cast<VkDescriptorSetLayout>( descriptorSetLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDescriptorSetLayout>( descriptorSetLayout ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorPool( const DescriptorPoolCreateInfo * pCreateInfo,
-                                                                              const AllocationCallbacks *      pAllocator,
-                                                                              DescriptorPool *                 pDescriptorPool,
-                                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo * pCreateInfo,
+                                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                                              VULKAN_HPP_NAMESPACE::DescriptorPool *                 pDescriptorPool,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDescriptorPool( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateDescriptorPool( m_device,
                                                           reinterpret_cast<const VkDescriptorPoolCreateInfo *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                           reinterpret_cast<VkDescriptorPool *>( pDescriptorPool ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorPool>::type
-    Device::createDescriptorPool( const DescriptorPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorPool>::type
+                       Device::createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo &    createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDescriptorPool && "Function <vkCreateDescriptorPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    DescriptorPool descriptorPool;
-    Result         result = static_cast<Result>( d.vkCreateDescriptorPool( m_device,
-                                                                   reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorPool" );
+    VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDescriptorPool( m_device,
+                                reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorPool" );
 
-    return detail::createResultValueType( result, std::move( descriptorPool ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorPool ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DescriptorPool, Dispatch>>::type
-    Device::createDescriptorPoolUnique( const DescriptorPoolCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorPool, Dispatch>>::type
+                       Device::createDescriptorPoolUnique( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo &    createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDescriptorPool && "Function <vkCreateDescriptorPool> requires <VK_VERSION_1_0>" );
 #    endif
 
-    DescriptorPool descriptorPool;
-    Result         result = static_cast<Result>( d.vkCreateDescriptorPool( m_device,
-                                                                   reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorPoolUnique" );
+    VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDescriptorPool( m_device,
+                                reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorPoolUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DescriptorPool, Dispatch>( descriptorPool, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorPool, Dispatch>( descriptorPool, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyDescriptorPool( DescriptorPool descriptorPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
+                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyDescriptorPool( DescriptorPool descriptorPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool                      descriptorPool,
+                                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                        Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyDescriptorPool && "Function <vkDestroyDescriptorPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyDescriptorPool( m_device,
+                               static_cast<VkDescriptorPool>( descriptorPool ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( DescriptorPool descriptorPool, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DescriptorPool descriptorPool, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorPool                      descriptorPool,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyDescriptorPool && "Function <vkDestroyDescriptorPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    d.vkDestroyDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyDescriptorPool( m_device,
+                               static_cast<VkDescriptorPool>( descriptorPool ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetDescriptorPool( DescriptorPool           descriptorPool,
-                                                                             DescriptorPoolResetFlags flags,
-                                                                             Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result Device::resetDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool           descriptorPool,
+                                                        VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags,
+                                                        Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkResetDescriptorPool(
-      static_cast<VkDevice>( m_device ), static_cast<VkDescriptorPool>( descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) ) );
+    return static_cast<Result>(
+      d.vkResetDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) ) );
   }
 #else
-  // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::resetDescriptorPool( DescriptorPool descriptorPool, DescriptorPoolResetFlags flags, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::resetDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool           descriptorPool,
+                                                      VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags,
+                                                      Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkResetDescriptorPool && "Function <vkResetDescriptorPool> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>(
-      d.vkResetDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetDescriptorPool" );
-
-    return detail::createResultValueType( result );
+    d.vkResetDescriptorPool( m_device, static_cast<VkDescriptorPool>( descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateDescriptorSets( const DescriptorSetAllocateInfo * pAllocateInfo,
-                                                                                DescriptorSet *                   pDescriptorSets,
-                                                                                Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo * pAllocateInfo,
+                                                                                VULKAN_HPP_NAMESPACE::DescriptorSet *                   pDescriptorSets,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAllocateDescriptorSets( static_cast<VkDevice>( m_device ),
-                                                            reinterpret_cast<const VkDescriptorSetAllocateInfo *>( pAllocateInfo ),
-                                                            reinterpret_cast<VkDescriptorSet *>( pDescriptorSets ) ) );
+    return static_cast<Result>( d.vkAllocateDescriptorSets(
+      m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo *>( pAllocateInfo ), reinterpret_cast<VkDescriptorSet *>( pDescriptorSets ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-  template <typename DescriptorSetAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, DescriptorSet>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DescriptorSet, DescriptorSetAllocator>>::type
-                       Device::allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d ) const
+  template <typename DescriptorSetAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator>>::type
+                       Device::allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateDescriptorSets && "Function <vkAllocateDescriptorSets> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<DescriptorSet, DescriptorSetAllocator> descriptorSets( allocateInfo.descriptorSetCount );
-    Result                                             result = static_cast<Result>( d.vkAllocateDescriptorSets(
+    std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator> descriptorSets( allocateInfo.descriptorSetCount );
+    VULKAN_HPP_NAMESPACE::Result                                             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateDescriptorSets(
       m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSets" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSets" );
 
-    return detail::createResultValueType( result, std::move( descriptorSets ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorSets ) );
   }
 
-  // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
   template <typename DescriptorSetAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, DescriptorSet>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DescriptorSet, DescriptorSetAllocator>>::type
-    Device::allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo, DescriptorSetAllocator & descriptorSetAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, VULKAN_HPP_NAMESPACE::DescriptorSet>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator>>::type
+                       Device::allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                                    DescriptorSetAllocator &                                descriptorSetAllocator,
+                                    Dispatch const &                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateDescriptorSets && "Function <vkAllocateDescriptorSets> requires <VK_VERSION_1_0>" );
 #  endif
 
-    std::vector<DescriptorSet, DescriptorSetAllocator> descriptorSets( allocateInfo.descriptorSetCount, descriptorSetAllocator );
-    Result                                             result = static_cast<Result>( d.vkAllocateDescriptorSets(
+    std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator> descriptorSets( allocateInfo.descriptorSetCount, descriptorSetAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateDescriptorSets(
       m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSets" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSets" );
 
-    return detail::createResultValueType( result, std::move( descriptorSets ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorSets ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-  template <typename Dispatch,
-            typename DescriptorSetAllocator,
-            typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<DescriptorSet, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
-                       Device::allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d ) const
+  template <typename Dispatch, typename DescriptorSetAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
+    Device::allocateDescriptorSetsUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateDescriptorSets && "Function <vkAllocateDescriptorSets> requires <VK_VERSION_1_0>" );
 #    endif
 
-    std::vector<DescriptorSet> descriptorSets( allocateInfo.descriptorSetCount );
-    Result                     result = static_cast<Result>( d.vkAllocateDescriptorSets(
+    std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet> descriptorSets( allocateInfo.descriptorSetCount );
+    VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateDescriptorSets(
       m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSetsUnique" );
-    std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator> uniqueDescriptorSets;
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSetsUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator> uniqueDescriptorSets;
     uniqueDescriptorSets.reserve( allocateInfo.descriptorSetCount );
-    detail::PoolFree<Device, DescriptorPool, Dispatch> deleter( *this, allocateInfo.descriptorPool, d );
+    PoolFree<Device, DescriptorPool, Dispatch> deleter( *this, allocateInfo.descriptorPool, d );
     for ( auto const & descriptorSet : descriptorSets )
     {
       uniqueDescriptorSets.push_back( UniqueHandle<DescriptorSet, Dispatch>( descriptorSet, deleter ) );
     }
-    return detail::createResultValueType( result, std::move( uniqueDescriptorSets ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueDescriptorSets ) );
   }
 
-  // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-  template <typename Dispatch,
-            typename DescriptorSetAllocator,
-            typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<DescriptorSet, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
-                       Device::allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo,
-                                          DescriptorSetAllocator &          descriptorSetAllocator,
-                                          Dispatch const &                  d ) const
+  template <
+    typename Dispatch,
+    typename DescriptorSetAllocator,
+    typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
+    Device::allocateDescriptorSetsUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                                          DescriptorSetAllocator &                                descriptorSetAllocator,
+                                          Dispatch const &                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAllocateDescriptorSets && "Function <vkAllocateDescriptorSets> requires <VK_VERSION_1_0>" );
 #    endif
 
-    std::vector<DescriptorSet> descriptorSets( allocateInfo.descriptorSetCount );
-    Result                     result = static_cast<Result>( d.vkAllocateDescriptorSets(
+    std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet> descriptorSets( allocateInfo.descriptorSetCount );
+    VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateDescriptorSets(
       m_device, reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSetsUnique" );
-    std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator> uniqueDescriptorSets( descriptorSetAllocator );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateDescriptorSetsUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator> uniqueDescriptorSets( descriptorSetAllocator );
     uniqueDescriptorSets.reserve( allocateInfo.descriptorSetCount );
-    detail::PoolFree<Device, DescriptorPool, Dispatch> deleter( *this, allocateInfo.descriptorPool, d );
+    PoolFree<Device, DescriptorPool, Dispatch> deleter( *this, allocateInfo.descriptorPool, d );
     for ( auto const & descriptorSet : descriptorSets )
     {
       uniqueDescriptorSets.push_back( UniqueHandle<DescriptorSet, Dispatch>( descriptorSet, deleter ) );
     }
-    return detail::createResultValueType( result, std::move( uniqueDescriptorSets ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueDescriptorSets ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::freeDescriptorSets( DescriptorPool        descriptorPool,
-                                                                            uint32_t              descriptorSetCount,
-                                                                            const DescriptorSet * pDescriptorSets,
-                                                                            Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result Device::freeDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
+                                                       uint32_t                                    descriptorSetCount,
+                                                       const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                                                       Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkFreeDescriptorSets( static_cast<VkDevice>( m_device ),
-                                                        static_cast<VkDescriptorPool>( descriptorPool ),
-                                                        descriptorSetCount,
-                                                        reinterpret_cast<const VkDescriptorSet *>( pDescriptorSets ) ) );
+    return static_cast<Result>( d.vkFreeDescriptorSets(
+      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSetCount, reinterpret_cast<const VkDescriptorSet *>( pDescriptorSets ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::freeDescriptorSets( DescriptorPool descriptorPool, ArrayProxy<const DescriptorSet> const & descriptorSets, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::freeDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorPool                                                descriptorPool,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkFreeDescriptorSets && "Function <vkFreeDescriptorSets> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkFreeDescriptorSets(
-      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::freeDescriptorSets" );
-
-    return detail::createResultValueType( result );
+    d.vkFreeDescriptorSets(
+      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result( Device::free )( DescriptorPool        descriptorPool,
-                                                                 uint32_t              descriptorSetCount,
-                                                                 const DescriptorSet * pDescriptorSets,
-                                                                 Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result( Device::free )( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
+                                            uint32_t                                    descriptorSetCount,
+                                            const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                                            Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkFreeDescriptorSets( static_cast<VkDevice>( m_device ),
-                                                        static_cast<VkDescriptorPool>( descriptorPool ),
-                                                        descriptorSetCount,
-                                                        reinterpret_cast<const VkDescriptorSet *>( pDescriptorSets ) ) );
+    return static_cast<Result>( d.vkFreeDescriptorSets(
+      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSetCount, reinterpret_cast<const VkDescriptorSet *>( pDescriptorSets ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE
-    typename ResultValueType<void>::type( Device::free )( DescriptorPool                          descriptorPool,
-                                                          ArrayProxy<const DescriptorSet> const & descriptorSets,
-                                                          Dispatch const &                        d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::DescriptorPool                                                descriptorPool,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                                          Dispatch const &                                                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkFreeDescriptorSets && "Function <vkFreeDescriptorSets> requires <VK_VERSION_1_0>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkFreeDescriptorSets(
-      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::( Device::free )" );
-
-    return detail::createResultValueType( result );
+    d.vkFreeDescriptorSets(
+      m_device, static_cast<VkDescriptorPool>( descriptorPool ), descriptorSets.size(), reinterpret_cast<const VkDescriptorSet *>( descriptorSets.data() ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSets( uint32_t                   descriptorWriteCount,
-                                                       const WriteDescriptorSet * pDescriptorWrites,
-                                                       uint32_t                   descriptorCopyCount,
-                                                       const CopyDescriptorSet *  pDescriptorCopies,
-                                                       Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::updateDescriptorSets( uint32_t                                         descriptorWriteCount,
+                                                       const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites,
+                                                       uint32_t                                         descriptorCopyCount,
+                                                       const VULKAN_HPP_NAMESPACE::CopyDescriptorSet *  pDescriptorCopies,
+                                                       Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUpdateDescriptorSets( static_cast<VkDevice>( m_device ),
+    d.vkUpdateDescriptorSets( m_device,
                               descriptorWriteCount,
                               reinterpret_cast<const VkWriteDescriptorSet *>( pDescriptorWrites ),
                               descriptorCopyCount,
@@ -4633,11 +4112,11 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSets( ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                                                       ArrayProxy<const CopyDescriptorSet> const &  descriptorCopies,
-                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    Device::updateDescriptorSets( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CopyDescriptorSet> const &  descriptorCopies,
+                                  Dispatch const &                                                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -4652,28 +4131,759 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipeline.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindPipeline( PipelineBindPoint pipelineBindPoint, Pipeline pipeline, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFramebuffer( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo * pCreateInfo,
+                                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                           VULKAN_HPP_NAMESPACE::Framebuffer *                 pFramebuffer,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindPipeline(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
+    return static_cast<Result>( d.vkCreateFramebuffer( m_device,
+                                                       reinterpret_cast<const VkFramebufferCreateInfo *>( pCreateInfo ),
+                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                       reinterpret_cast<VkFramebuffer *>( pFramebuffer ) ) );
   }
 
-  // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets( PipelineBindPoint     pipelineBindPoint,
-                                                            PipelineLayout        layout,
-                                                            uint32_t              firstSet,
-                                                            uint32_t              descriptorSetCount,
-                                                            const DescriptorSet * pDescriptorSets,
-                                                            uint32_t              dynamicOffsetCount,
-                                                            const uint32_t *      pDynamicOffsets,
-                                                            Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Framebuffer>::type
+                       Device::createFramebuffer( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo &       createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                               Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindDescriptorSets( static_cast<VkCommandBuffer>( m_commandBuffer ),
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateFramebuffer && "Function <vkCreateFramebuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Framebuffer framebuffer;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateFramebuffer( m_device,
+                             reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFramebuffer" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( framebuffer ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Framebuffer, Dispatch>>::type
+                       Device::createFramebufferUnique( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo &       createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateFramebuffer && "Function <vkCreateFramebuffer> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::Framebuffer framebuffer;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateFramebuffer( m_device,
+                             reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFramebufferUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Framebuffer, Dispatch>( framebuffer, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyFramebuffer( m_device, static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer                         framebuffer,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                     Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyFramebuffer && "Function <vkDestroyFramebuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyFramebuffer( m_device,
+                            static_cast<VkFramebuffer>( framebuffer ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyFramebuffer( m_device, static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::Framebuffer                         framebuffer,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyFramebuffer && "Function <vkDestroyFramebuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyFramebuffer( m_device,
+                            static_cast<VkFramebuffer>( framebuffer ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo * pCreateInfo,
+                                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *  pAllocator,
+                                                                          VULKAN_HPP_NAMESPACE::RenderPass *                 pRenderPass,
+                                                                          Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateRenderPass( m_device,
+                                                      reinterpret_cast<const VkRenderPassCreateInfo *>( pCreateInfo ),
+                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                      reinterpret_cast<VkRenderPass *>( pRenderPass ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+                       Device::createRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo &        createInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                              Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateRenderPass && "Function <vkCreateRenderPass> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass( m_device,
+                            reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( renderPass ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+                       Device::createRenderPassUnique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo &        createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                    Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateRenderPass && "Function <vkCreateRenderPass> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass( m_device,
+                            reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPassUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>( renderPass, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyRenderPass( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
+                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                    Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyRenderPass( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyRenderPass( VULKAN_HPP_NAMESPACE::RenderPass                          renderPass,
+                                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                    Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyRenderPass && "Function <vkDestroyRenderPass> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyRenderPass( m_device,
+                           static_cast<VkRenderPass>( renderPass ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyRenderPass( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::RenderPass                          renderPass,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyRenderPass && "Function <vkDestroyRenderPass> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyRenderPass( m_device,
+                           static_cast<VkRenderPass>( renderPass ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
+                                                           VULKAN_HPP_NAMESPACE::Extent2D * pGranularity,
+                                                           Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetRenderAreaGranularity( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<VkExtent2D *>( pGranularity ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Extent2D Device::getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
+                                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetRenderAreaGranularity && "Function <vkGetRenderAreaGranularity> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Extent2D granularity;
+    d.vkGetRenderAreaGranularity( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<VkExtent2D *>( &granularity ) );
+
+    return granularity;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCommandPool( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo * pCreateInfo,
+                                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                           VULKAN_HPP_NAMESPACE::CommandPool *                 pCommandPool,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateCommandPool( m_device,
+                                                       reinterpret_cast<const VkCommandPoolCreateInfo *>( pCreateInfo ),
+                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                       reinterpret_cast<VkCommandPool *>( pCommandPool ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::CommandPool>::type
+                       Device::createCommandPool( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo &       createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                               Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateCommandPool && "Function <vkCreateCommandPool> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::CommandPool commandPool;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCommandPool( m_device,
+                             reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCommandPool" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( commandPool ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandPool, Dispatch>>::type
+                       Device::createCommandPoolUnique( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo &       createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateCommandPool && "Function <vkCreateCommandPool> requires <VK_VERSION_1_0>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::CommandPool commandPool;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCommandPool( m_device,
+                             reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCommandPoolUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::CommandPool, Dispatch>( commandPool, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCommandPool( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCommandPool( VULKAN_HPP_NAMESPACE::CommandPool                         commandPool,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                     Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyCommandPool && "Function <vkDestroyCommandPool> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyCommandPool( m_device,
+                            static_cast<VkCommandPool>( commandPool ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CommandPool                         commandPool,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyCommandPool && "Function <vkDestroyCommandPool> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkDestroyCommandPool( m_device,
+                            static_cast<VkCommandPool>( commandPool ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::resetCommandPool( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                                                                          VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags,
+                                                                          Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkResetCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::resetCommandPool( VULKAN_HPP_NAMESPACE::CommandPool commandPool, VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkResetCommandPool && "Function <vkResetCommandPool> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkResetCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetCommandPool" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo * pAllocateInfo,
+                                                                                VULKAN_HPP_NAMESPACE::CommandBuffer *                   pCommandBuffers,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkAllocateCommandBuffers(
+      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( pAllocateInfo ), reinterpret_cast<VkCommandBuffer *>( pCommandBuffers ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename CommandBufferAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator>>::type
+                       Device::allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator> commandBuffers( allocateInfo.commandBufferCount );
+    VULKAN_HPP_NAMESPACE::Result                                             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateCommandBuffers(
+      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffers" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( commandBuffers ) );
+  }
+
+  template <typename CommandBufferAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, VULKAN_HPP_NAMESPACE::CommandBuffer>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator>>::type
+                       Device::allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                                    CommandBufferAllocator &                                commandBufferAllocator,
+                                    Dispatch const &                                        d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator> commandBuffers( allocateInfo.commandBufferCount, commandBufferAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateCommandBuffers(
+      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffers" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( commandBuffers ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch, typename CommandBufferAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
+    Device::allocateCommandBuffersUnique( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
+#    endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
+    VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateCommandBuffers(
+      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffersUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator> uniqueCommandBuffers;
+    uniqueCommandBuffers.reserve( allocateInfo.commandBufferCount );
+    PoolFree<Device, CommandPool, Dispatch> deleter( *this, allocateInfo.commandPool, d );
+    for ( auto const & commandBuffer : commandBuffers )
+    {
+      uniqueCommandBuffers.push_back( UniqueHandle<CommandBuffer, Dispatch>( commandBuffer, deleter ) );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueCommandBuffers ) );
+  }
+
+  template <
+    typename Dispatch,
+    typename CommandBufferAllocator,
+    typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
+    Device::allocateCommandBuffersUnique( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                                          CommandBufferAllocator &                                commandBufferAllocator,
+                                          Dispatch const &                                        d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkAllocateCommandBuffers && "Function <vkAllocateCommandBuffers> requires <VK_VERSION_1_0>" );
+#    endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
+    VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAllocateCommandBuffers(
+      m_device, reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ), reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::allocateCommandBuffersUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator> uniqueCommandBuffers( commandBufferAllocator );
+    uniqueCommandBuffers.reserve( allocateInfo.commandBufferCount );
+    PoolFree<Device, CommandPool, Dispatch> deleter( *this, allocateInfo.commandPool, d );
+    for ( auto const & commandBuffer : commandBuffers )
+    {
+      uniqueCommandBuffers.push_back( UniqueHandle<CommandBuffer, Dispatch>( commandBuffer, deleter ) );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueCommandBuffers ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::freeCommandBuffers( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                                                     uint32_t                                    commandBufferCount,
+                                                     const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                                                     Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkFreeCommandBuffers(
+      m_device, static_cast<VkCommandPool>( commandPool ), commandBufferCount, reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::freeCommandBuffers( VULKAN_HPP_NAMESPACE::CommandPool                                                   commandPool,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkFreeCommandBuffers && "Function <vkFreeCommandBuffers> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkFreeCommandBuffers(
+      m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                                          uint32_t                                    commandBufferCount,
+                                          const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                                          Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkFreeCommandBuffers(
+      m_device, static_cast<VkCommandPool>( commandPool ), commandBufferCount, reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void( Device::free )( VULKAN_HPP_NAMESPACE::CommandPool                                                   commandPool,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                                          Dispatch const &                                                                    d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkFreeCommandBuffers && "Function <vkFreeCommandBuffers> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkFreeCommandBuffers(
+      m_device, static_cast<VkCommandPool>( commandPool ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo * pBeginInfo,
+                                                                      Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo *>( pBeginInfo ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          CommandBuffer::begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo & beginInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkBeginCommandBuffer && "Function <vkBeginCommandBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo *>( &beginInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::begin" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::end( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkEndCommandBuffer( m_commandBuffer ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::end( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkEndCommandBuffer && "Function <vkEndCommandBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEndCommandBuffer( m_commandBuffer ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::end" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags,
+                                                                      Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkResetCommandBuffer( m_commandBuffer, static_cast<VkCommandBufferResetFlags>( flags ) ) );
+  }
+#else
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkResetCommandBuffer && "Function <vkResetCommandBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkResetCommandBuffer( m_commandBuffer, static_cast<VkCommandBufferResetFlags>( flags ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::reset" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindPipeline( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                      VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                                      Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBindPipeline( m_commandBuffer, static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewport( uint32_t                               firstViewport,
+                                                     uint32_t                               viewportCount,
+                                                     const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                                                     Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetViewport( m_commandBuffer, firstViewport, viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewport( uint32_t                                                                       firstViewport,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
+                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdSetViewport && "Function <vkCmdSetViewport> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdSetViewport( m_commandBuffer, firstViewport, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setScissor( uint32_t                             firstScissor,
+                                                    uint32_t                             scissorCount,
+                                                    const VULKAN_HPP_NAMESPACE::Rect2D * pScissors,
+                                                    Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetScissor( m_commandBuffer, firstScissor, scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setScissor( uint32_t                                                                     firstScissor,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
+                                                    Dispatch const &                                                             d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdSetScissor && "Function <vkCmdSetScissor> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdSetScissor( m_commandBuffer, firstScissor, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setLineWidth( float lineWidth, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetLineWidth( m_commandBuffer, lineWidth );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setDepthBias( float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetDepthBias( m_commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setBlendConstants( const float blendConstants[4], Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetBlendConstants( m_commandBuffer, blendConstants );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBounds( float minDepthBounds, float maxDepthBounds, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetDepthBounds( m_commandBuffer, minDepthBounds, maxDepthBounds );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setStencilCompareMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t compareMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetStencilCompareMask( m_commandBuffer, static_cast<VkStencilFaceFlags>( faceMask ), compareMask );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setStencilWriteMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t writeMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetStencilWriteMask( m_commandBuffer, static_cast<VkStencilFaceFlags>( faceMask ), writeMask );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setStencilReference( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t reference, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdSetStencilReference( m_commandBuffer, static_cast<VkStencilFaceFlags>( faceMask ), reference );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint     pipelineBindPoint,
+                                                            VULKAN_HPP_NAMESPACE::PipelineLayout        layout,
+                                                            uint32_t                                    firstSet,
+                                                            uint32_t                                    descriptorSetCount,
+                                                            const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                                                            uint32_t                                    dynamicOffsetCount,
+                                                            const uint32_t *                            pDynamicOffsets,
+                                                            Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBindDescriptorSets( m_commandBuffer,
                                static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
                                static_cast<VkPipelineLayout>( layout ),
                                firstSet,
@@ -4684,14 +4894,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets( PipelineBindPoint                       pipelineBindPoint,
-                                                            PipelineLayout                          layout,
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                            VULKAN_HPP_NAMESPACE::PipelineLayout    layout,
                                                             uint32_t                                firstSet,
-                                                            ArrayProxy<const DescriptorSet> const & descriptorSets,
-                                                            ArrayProxy<const uint32_t> const &      dynamicOffsets,
-                                                            Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                            dynamicOffsets,
+                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -4709,748 +4918,34 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearColorImage( Image                         image,
-                                                         ImageLayout                   imageLayout,
-                                                         const ClearColorValue *       pColor,
-                                                         uint32_t                      rangeCount,
-                                                         const ImageSubresourceRange * pRanges,
-                                                         Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                         VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                         VULKAN_HPP_NAMESPACE::IndexType  indexType,
+                                                         Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdClearColorImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                            static_cast<VkImage>( image ),
-                            static_cast<VkImageLayout>( imageLayout ),
-                            reinterpret_cast<const VkClearColorValue *>( pColor ),
-                            rangeCount,
-                            reinterpret_cast<const VkImageSubresourceRange *>( pRanges ) );
+    d.vkCmdBindIndexBuffer( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), static_cast<VkIndexType>( indexType ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t                                 firstBinding,
+                                                           uint32_t                                 bindingCount,
+                                                           const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                                           const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                                           Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBindVertexBuffers(
+      m_commandBuffer, firstBinding, bindingCount, reinterpret_cast<const VkBuffer *>( pBuffers ), reinterpret_cast<const VkDeviceSize *>( pOffsets ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearColorImage( Image                                           image,
-                                                         ImageLayout                                     imageLayout,
-                                                         const ClearColorValue &                         color,
-                                                         ArrayProxy<const ImageSubresourceRange> const & ranges,
-                                                         Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdClearColorImage && "Function <vkCmdClearColorImage> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdClearColorImage( m_commandBuffer,
-                            static_cast<VkImage>( image ),
-                            static_cast<VkImageLayout>( imageLayout ),
-                            reinterpret_cast<const VkClearColorValue *>( &color ),
-                            ranges.size(),
-                            reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdDispatch, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatch.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatch( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
-  }
-
-  // wrapper function for command vkCmdDispatchIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchIndirect.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchIndirect( Buffer buffer, DeviceSize offset, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchIndirect( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
-  }
-
-  // wrapper function for command vkCmdSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setEvent( Event event, PipelineStageFlags stageMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetEvent( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
-  }
-
-  // wrapper function for command vkCmdResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resetEvent( Event event, PipelineStageFlags stageMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResetEvent( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
-  }
-
-  // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents( uint32_t                    eventCount,
-                                                    const Event *               pEvents,
-                                                    PipelineStageFlags          srcStageMask,
-                                                    PipelineStageFlags          dstStageMask,
-                                                    uint32_t                    memoryBarrierCount,
-                                                    const MemoryBarrier *       pMemoryBarriers,
-                                                    uint32_t                    bufferMemoryBarrierCount,
-                                                    const BufferMemoryBarrier * pBufferMemoryBarriers,
-                                                    uint32_t                    imageMemoryBarrierCount,
-                                                    const ImageMemoryBarrier *  pImageMemoryBarriers,
-                                                    Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWaitEvents( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                       eventCount,
-                       reinterpret_cast<const VkEvent *>( pEvents ),
-                       static_cast<VkPipelineStageFlags>( srcStageMask ),
-                       static_cast<VkPipelineStageFlags>( dstStageMask ),
-                       memoryBarrierCount,
-                       reinterpret_cast<const VkMemoryBarrier *>( pMemoryBarriers ),
-                       bufferMemoryBarrierCount,
-                       reinterpret_cast<const VkBufferMemoryBarrier *>( pBufferMemoryBarriers ),
-                       imageMemoryBarrierCount,
-                       reinterpret_cast<const VkImageMemoryBarrier *>( pImageMemoryBarriers ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents( ArrayProxy<const Event> const &               events,
-                                                    PipelineStageFlags                            srcStageMask,
-                                                    PipelineStageFlags                            dstStageMask,
-                                                    ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                                                    ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                                                    ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers,
-                                                    Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdWaitEvents && "Function <vkCmdWaitEvents> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdWaitEvents( m_commandBuffer,
-                       events.size(),
-                       reinterpret_cast<const VkEvent *>( events.data() ),
-                       static_cast<VkPipelineStageFlags>( srcStageMask ),
-                       static_cast<VkPipelineStageFlags>( dstStageMask ),
-                       memoryBarriers.size(),
-                       reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
-                       bufferMemoryBarriers.size(),
-                       reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
-                       imageMemoryBarriers.size(),
-                       reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants(
-    PipelineLayout layout, ShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void * pValues, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushConstants( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                          static_cast<VkPipelineLayout>( layout ),
-                          static_cast<VkShaderStageFlags>( stageFlags ),
-                          offset,
-                          size,
-                          pValues );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-  template <typename ValuesType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants( PipelineLayout                       layout,
-                                                       ShaderStageFlags                     stageFlags,
-                                                       uint32_t                             offset,
-                                                       ArrayProxy<const ValuesType> const & values,
-                                                       Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushConstants && "Function <vkCmdPushConstants> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdPushConstants( m_commandBuffer,
-                          static_cast<VkPipelineLayout>( layout ),
-                          static_cast<VkShaderStageFlags>( stageFlags ),
-                          offset,
-                          values.size() * sizeof( ValuesType ),
-                          reinterpret_cast<const void *>( values.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createGraphicsPipelines( PipelineCache                      pipelineCache,
-                                                                                 uint32_t                           createInfoCount,
-                                                                                 const GraphicsPipelineCreateInfo * pCreateInfos,
-                                                                                 const AllocationCallbacks *        pAllocator,
-                                                                                 Pipeline *                         pPipelines,
-                                                                                 Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateGraphicsPipelines( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkPipelineCache>( pipelineCache ),
-                                                             createInfoCount,
-                                                             reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( pCreateInfos ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                             reinterpret_cast<VkPipeline *>( pPipelines ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createGraphicsPipelines( PipelineCache                                        pipelineCache,
-                                     ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                     Optional<const AllocationCallbacks>                  allocator,
-                                     Dispatch const &                                     d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#  endif
-
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      createInfos.size(),
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
-  }
-
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createGraphicsPipelines( PipelineCache                                        pipelineCache,
-                                     ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                     Optional<const AllocationCallbacks>                  allocator,
-                                     PipelineAllocator &                                  pipelineAllocator,
-                                     Dispatch const &                                     d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#  endif
-
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      createInfos.size(),
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
-  }
-
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline> Device::createGraphicsPipeline( PipelineCache                       pipelineCache,
-                                                                                               const GraphicsPipelineCreateInfo &  createInfo,
-                                                                                               Optional<const AllocationCallbacks> allocator,
-                                                                                               Dispatch const &                    d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      1,
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipeline", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createGraphicsPipelinesUnique( PipelineCache                                        pipelineCache,
-                                           ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                           Optional<const AllocationCallbacks>                  allocator,
-                                           Dispatch const &                                     d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#    endif
-
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      createInfos.size(),
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelinesUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
-    uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipeline : pipelines )
-    {
-      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
-  }
-
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createGraphicsPipelinesUnique( PipelineCache                                        pipelineCache,
-                                           ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                           Optional<const AllocationCallbacks>                  allocator,
-                                           PipelineAllocator &                                  pipelineAllocator,
-                                           Dispatch const &                                     d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#    endif
-
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      createInfos.size(),
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelinesUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
-    uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipeline : pipelines )
-    {
-      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
-  }
-
-  // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>> Device::createGraphicsPipelineUnique(
-    PipelineCache pipelineCache, const GraphicsPipelineCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateGraphicsPipelines && "Function <vkCreateGraphicsPipelines> requires <VK_VERSION_1_0>" );
-#    endif
-
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateGraphicsPipelines( m_device,
-                                                                      static_cast<VkPipelineCache>( pipelineCache ),
-                                                                      1,
-                                                                      reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelineUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createFramebuffer( const FramebufferCreateInfo * pCreateInfo,
-                                                                           const AllocationCallbacks *   pAllocator,
-                                                                           Framebuffer *                 pFramebuffer,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateFramebuffer( static_cast<VkDevice>( m_device ),
-                                                       reinterpret_cast<const VkFramebufferCreateInfo *>( pCreateInfo ),
-                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                       reinterpret_cast<VkFramebuffer *>( pFramebuffer ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Framebuffer>::type
-    Device::createFramebuffer( const FramebufferCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateFramebuffer && "Function <vkCreateFramebuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Framebuffer framebuffer;
-    Result      result = static_cast<Result>( d.vkCreateFramebuffer( m_device,
-                                                                reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFramebuffer" );
-
-    return detail::createResultValueType( result, std::move( framebuffer ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Framebuffer, Dispatch>>::type
-    Device::createFramebufferUnique( const FramebufferCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateFramebuffer && "Function <vkCreateFramebuffer> requires <VK_VERSION_1_0>" );
-#    endif
-
-    Framebuffer framebuffer;
-    Result      result = static_cast<Result>( d.vkCreateFramebuffer( m_device,
-                                                                reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createFramebufferUnique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<Framebuffer, Dispatch>( framebuffer, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyFramebuffer( Framebuffer framebuffer, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyFramebuffer(
-      static_cast<VkDevice>( m_device ), static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyFramebuffer( Framebuffer framebuffer, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyFramebuffer && "Function <vkDestroyFramebuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyFramebuffer( m_device, static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Framebuffer framebuffer, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyFramebuffer(
-      static_cast<VkDevice>( m_device ), static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( Framebuffer framebuffer, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyFramebuffer && "Function <vkDestroyFramebuffer> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyFramebuffer( m_device, static_cast<VkFramebuffer>( framebuffer ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass( const RenderPassCreateInfo * pCreateInfo,
-                                                                          const AllocationCallbacks *  pAllocator,
-                                                                          RenderPass *                 pRenderPass,
-                                                                          Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateRenderPass( static_cast<VkDevice>( m_device ),
-                                                      reinterpret_cast<const VkRenderPassCreateInfo *>( pCreateInfo ),
-                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                      reinterpret_cast<VkRenderPass *>( pRenderPass ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-    Device::createRenderPass( const RenderPassCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateRenderPass && "Function <vkCreateRenderPass> requires <VK_VERSION_1_0>" );
-#  endif
-
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass( m_device,
-                                                               reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass" );
-
-    return detail::createResultValueType( result, std::move( renderPass ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-    Device::createRenderPassUnique( const RenderPassCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateRenderPass && "Function <vkCreateRenderPass> requires <VK_VERSION_1_0>" );
-#    endif
-
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass( m_device,
-                                                               reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPassUnique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<RenderPass, Dispatch>( renderPass, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyRenderPass( RenderPass renderPass, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyRenderPass(
-      static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyRenderPass( RenderPass renderPass, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyRenderPass && "Function <vkDestroyRenderPass> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyRenderPass( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( RenderPass renderPass, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyRenderPass(
-      static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( RenderPass renderPass, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyRenderPass && "Function <vkDestroyRenderPass> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkDestroyRenderPass( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getRenderAreaGranularity( RenderPass renderPass, Extent2D * pGranularity, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetRenderAreaGranularity( static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( renderPass ), reinterpret_cast<VkExtent2D *>( pGranularity ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D Device::getRenderAreaGranularity( RenderPass renderPass, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetRenderAreaGranularity && "Function <vkGetRenderAreaGranularity> requires <VK_VERSION_1_0>" );
-#  endif
-
-    Extent2D granularity;
-    d.vkGetRenderAreaGranularity( m_device, static_cast<VkRenderPass>( renderPass ), reinterpret_cast<VkExtent2D *>( &granularity ) );
-
-    return granularity;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setViewport( uint32_t firstViewport, uint32_t viewportCount, const Viewport * pViewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewport( static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setViewport( uint32_t firstViewport, ArrayProxy<const Viewport> const & viewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdSetViewport && "Function <vkCmdSetViewport> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdSetViewport( m_commandBuffer, firstViewport, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setScissor( uint32_t firstScissor, uint32_t scissorCount, const Rect2D * pScissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetScissor( static_cast<VkCommandBuffer>( m_commandBuffer ), firstScissor, scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setScissor( uint32_t firstScissor, ArrayProxy<const Rect2D> const & scissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdSetScissor && "Function <vkCmdSetScissor> requires <VK_VERSION_1_0>" );
-#  endif
-
-    d.vkCmdSetScissor( m_commandBuffer, firstScissor, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetLineWidth, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineWidth.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLineWidth( float lineWidth, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineWidth( static_cast<VkCommandBuffer>( m_commandBuffer ), lineWidth );
-  }
-
-  // wrapper function for command vkCmdSetDepthBias, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setDepthBias( float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBias( static_cast<VkCommandBuffer>( m_commandBuffer ), depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
-  }
-
-  // wrapper function for command vkCmdSetBlendConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetBlendConstants.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setBlendConstants( const float blendConstants[4], Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetBlendConstants( static_cast<VkCommandBuffer>( m_commandBuffer ), blendConstants );
-  }
-
-  // wrapper function for command vkCmdSetDepthBounds, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBounds.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBounds( float minDepthBounds, float maxDepthBounds, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBounds( static_cast<VkCommandBuffer>( m_commandBuffer ), minDepthBounds, maxDepthBounds );
-  }
-
-  // wrapper function for command vkCmdSetStencilCompareMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilCompareMask.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilCompareMask( StencilFaceFlags faceMask, uint32_t compareMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilCompareMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), compareMask );
-  }
-
-  // wrapper function for command vkCmdSetStencilWriteMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilWriteMask.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilWriteMask( StencilFaceFlags faceMask, uint32_t writeMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilWriteMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), writeMask );
-  }
-
-  // wrapper function for command vkCmdSetStencilReference, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilReference.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilReference( StencilFaceFlags faceMask, uint32_t reference, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilReference( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), reference );
-  }
-
-  // wrapper function for command vkCmdBindIndexBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer( Buffer buffer, DeviceSize offset, IndexType indexType, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindIndexBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                            static_cast<VkBuffer>( buffer ),
-                            static_cast<VkDeviceSize>( offset ),
-                            static_cast<VkIndexType>( indexType ) );
-  }
-
-  // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers(
-    uint32_t firstBinding, uint32_t bindingCount, const Buffer * pBuffers, const DeviceSize * pOffsets, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindVertexBuffers( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              firstBinding,
-                              bindingCount,
-                              reinterpret_cast<const VkBuffer *>( pBuffers ),
-                              reinterpret_cast<const VkDeviceSize *>( pOffsets ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t                             firstBinding,
-                                                           ArrayProxy<const Buffer> const &     buffers,
-                                                           ArrayProxy<const DeviceSize> const & offsets,
-                                                           Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t                                                                         firstBinding,
+                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5473,17 +4968,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDraw, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDraw.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::draw(
     uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDraw( static_cast<VkCommandBuffer>( m_commandBuffer ), vertexCount, instanceCount, firstVertex, firstInstance );
+    d.vkCmdDraw( m_commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance );
   }
 
-  // wrapper function for command vkCmdDrawIndexed, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexed.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::drawIndexed( uint32_t         indexCount,
                                                      uint32_t         instanceCount,
                                                      uint32_t         firstIndex,
@@ -5492,42 +4985,138 @@ namespace VULKAN_HPP_NAMESPACE
                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndexed( static_cast<VkCommandBuffer>( m_commandBuffer ), indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
+    d.vkCmdDrawIndexed( m_commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
   }
 
-  // wrapper function for command vkCmdDrawIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirect.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                      uint32_t                         drawCount,
+                                                      uint32_t                         stride,
+                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdDrawIndirect( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                             VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                             uint32_t                         drawCount,
+                                                             uint32_t                         stride,
+                                                             Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdDrawIndexedIndirect( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+  }
+
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
-    CommandBuffer::drawIndirect( Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    CommandBuffer::dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndirect(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+    d.vkCmdDispatch( m_commandBuffer, groupCountX, groupCountY, groupCountZ );
   }
 
-  // wrapper function for command vkCmdDrawIndexedIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirect.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::drawIndexedIndirect( Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                          VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                          Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndexedIndirect(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+    d.vkCmdDispatchIndirect( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
   }
 
-  // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage( Image             srcImage,
-                                                   ImageLayout       srcImageLayout,
-                                                   Image             dstImage,
-                                                   ImageLayout       dstImageLayout,
-                                                   uint32_t          regionCount,
-                                                   const ImageBlit * pRegions,
-                                                   Filter            filter,
-                                                   Dispatch const &  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer( VULKAN_HPP_NAMESPACE::Buffer             srcBuffer,
+                                                    VULKAN_HPP_NAMESPACE::Buffer             dstBuffer,
+                                                    uint32_t                                 regionCount,
+                                                    const VULKAN_HPP_NAMESPACE::BufferCopy * pRegions,
+                                                    Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBlitImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdCopyBuffer( m_commandBuffer,
+                       static_cast<VkBuffer>( srcBuffer ),
+                       static_cast<VkBuffer>( dstBuffer ),
+                       regionCount,
+                       reinterpret_cast<const VkBufferCopy *>( pRegions ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer( VULKAN_HPP_NAMESPACE::Buffer                                                     srcBuffer,
+                                                    VULKAN_HPP_NAMESPACE::Buffer                                                     dstBuffer,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferCopy> const & regions,
+                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyBuffer && "Function <vkCmdCopyBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdCopyBuffer( m_commandBuffer,
+                       static_cast<VkBuffer>( srcBuffer ),
+                       static_cast<VkBuffer>( dstBuffer ),
+                       regions.size(),
+                       reinterpret_cast<const VkBufferCopy *>( regions.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout       srcImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::Image             dstImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout       dstImageLayout,
+                                                   uint32_t                                regionCount,
+                                                   const VULKAN_HPP_NAMESPACE::ImageCopy * pRegions,
+                                                   Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyImage( m_commandBuffer,
+                      static_cast<VkImage>( srcImage ),
+                      static_cast<VkImageLayout>( srcImageLayout ),
+                      static_cast<VkImage>( dstImage ),
+                      static_cast<VkImageLayout>( dstImageLayout ),
+                      regionCount,
+                      reinterpret_cast<const VkImageCopy *>( pRegions ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageCopy> const & regions,
+                                                   Dispatch const &                                                                d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyImage && "Function <vkCmdCopyImage> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdCopyImage( m_commandBuffer,
+                      static_cast<VkImage>( srcImage ),
+                      static_cast<VkImageLayout>( srcImageLayout ),
+                      static_cast<VkImage>( dstImage ),
+                      static_cast<VkImageLayout>( dstImageLayout ),
+                      regions.size(),
+                      reinterpret_cast<const VkImageCopy *>( regions.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout       srcImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::Image             dstImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout       dstImageLayout,
+                                                   uint32_t                                regionCount,
+                                                   const VULKAN_HPP_NAMESPACE::ImageBlit * pRegions,
+                                                   VULKAN_HPP_NAMESPACE::Filter            filter,
+                                                   Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBlitImage( m_commandBuffer,
                       static_cast<VkImage>( srcImage ),
                       static_cast<VkImageLayout>( srcImageLayout ),
                       static_cast<VkImage>( dstImage ),
@@ -5538,15 +5127,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage( Image                               srcImage,
-                                                   ImageLayout                         srcImageLayout,
-                                                   Image                               dstImage,
-                                                   ImageLayout                         dstImageLayout,
-                                                   ArrayProxy<const ImageBlit> const & regions,
-                                                   Filter                              filter,
-                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageBlit> const & regions,
+                                                   VULKAN_HPP_NAMESPACE::Filter                                                    filter,
+                                                   Dispatch const &                                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5564,17 +5152,176 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdClearDepthStencilImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage( Image                          image,
-                                                                ImageLayout                    imageLayout,
-                                                                const ClearDepthStencilValue * pDepthStencil,
-                                                                uint32_t                       rangeCount,
-                                                                const ImageSubresourceRange *  pRanges,
-                                                                Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                  srcBuffer,
+                                                           VULKAN_HPP_NAMESPACE::Image                   dstImage,
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout             dstImageLayout,
+                                                           uint32_t                                      regionCount,
+                                                           const VULKAN_HPP_NAMESPACE::BufferImageCopy * pRegions,
+                                                           Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdClearDepthStencilImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdCopyBufferToImage( m_commandBuffer,
+                              static_cast<VkBuffer>( srcBuffer ),
+                              static_cast<VkImage>( dstImage ),
+                              static_cast<VkImageLayout>( dstImageLayout ),
+                              regionCount,
+                              reinterpret_cast<const VkBufferImageCopy *>( pRegions ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                                                          srcBuffer,
+                                                           VULKAN_HPP_NAMESPACE::Image                                                           dstImage,
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout                                                     dstImageLayout,
+                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions,
+                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyBufferToImage && "Function <vkCmdCopyBufferToImage> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdCopyBufferToImage( m_commandBuffer,
+                              static_cast<VkBuffer>( srcBuffer ),
+                              static_cast<VkImage>( dstImage ),
+                              static_cast<VkImageLayout>( dstImageLayout ),
+                              regions.size(),
+                              reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                   srcImage,
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout             srcImageLayout,
+                                                           VULKAN_HPP_NAMESPACE::Buffer                  dstBuffer,
+                                                           uint32_t                                      regionCount,
+                                                           const VULKAN_HPP_NAMESPACE::BufferImageCopy * pRegions,
+                                                           Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyImageToBuffer( m_commandBuffer,
+                              static_cast<VkImage>( srcImage ),
+                              static_cast<VkImageLayout>( srcImageLayout ),
+                              static_cast<VkBuffer>( dstBuffer ),
+                              regionCount,
+                              reinterpret_cast<const VkBufferImageCopy *>( pRegions ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                                                           srcImage,
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout                                                     srcImageLayout,
+                                                           VULKAN_HPP_NAMESPACE::Buffer                                                          dstBuffer,
+                                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions,
+                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyImageToBuffer && "Function <vkCmdCopyImageToBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdCopyImageToBuffer( m_commandBuffer,
+                              static_cast<VkImage>( srcImage ),
+                              static_cast<VkImageLayout>( srcImageLayout ),
+                              static_cast<VkBuffer>( dstBuffer ),
+                              regions.size(),
+                              reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::updateBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize dataSize,
+                                                      const void *                     pData,
+                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdUpdateBuffer(
+      m_commandBuffer, static_cast<VkBuffer>( dstBuffer ), static_cast<VkDeviceSize>( dstOffset ), static_cast<VkDeviceSize>( dataSize ), pData );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::updateBuffer( VULKAN_HPP_NAMESPACE::Buffer                             dstBuffer,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize                         dstOffset,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const DataType> const & data,
+                                                      Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdUpdateBuffer && "Function <vkCmdUpdateBuffer> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdUpdateBuffer( m_commandBuffer,
+                         static_cast<VkBuffer>( dstBuffer ),
+                         static_cast<VkDeviceSize>( dstOffset ),
+                         data.size() * sizeof( DataType ),
+                         reinterpret_cast<const void *>( data.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                                                    VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                                                    VULKAN_HPP_NAMESPACE::DeviceSize size,
+                                                    uint32_t                         data,
+                                                    Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdFillBuffer( m_commandBuffer, static_cast<VkBuffer>( dstBuffer ), static_cast<VkDeviceSize>( dstOffset ), static_cast<VkDeviceSize>( size ), data );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::clearColorImage( VULKAN_HPP_NAMESPACE::Image                         image,
+                                                         VULKAN_HPP_NAMESPACE::ImageLayout                   imageLayout,
+                                                         const VULKAN_HPP_NAMESPACE::ClearColorValue *       pColor,
+                                                         uint32_t                                            rangeCount,
+                                                         const VULKAN_HPP_NAMESPACE::ImageSubresourceRange * pRanges,
+                                                         Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdClearColorImage( m_commandBuffer,
+                            static_cast<VkImage>( image ),
+                            static_cast<VkImageLayout>( imageLayout ),
+                            reinterpret_cast<const VkClearColorValue *>( pColor ),
+                            rangeCount,
+                            reinterpret_cast<const VkImageSubresourceRange *>( pRanges ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::clearColorImage( VULKAN_HPP_NAMESPACE::Image                   image,
+                                                         VULKAN_HPP_NAMESPACE::ImageLayout             imageLayout,
+                                                         const VULKAN_HPP_NAMESPACE::ClearColorValue & color,
+                                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges,
+                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdClearColorImage && "Function <vkCmdClearColorImage> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdClearColorImage( m_commandBuffer,
+                            static_cast<VkImage>( image ),
+                            static_cast<VkImageLayout>( imageLayout ),
+                            reinterpret_cast<const VkClearColorValue *>( &color ),
+                            ranges.size(),
+                            reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                          image,
+                                                                VULKAN_HPP_NAMESPACE::ImageLayout                    imageLayout,
+                                                                const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue * pDepthStencil,
+                                                                uint32_t                                             rangeCount,
+                                                                const VULKAN_HPP_NAMESPACE::ImageSubresourceRange *  pRanges,
+                                                                Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdClearDepthStencilImage( m_commandBuffer,
                                    static_cast<VkImage>( image ),
                                    static_cast<VkImageLayout>( imageLayout ),
                                    reinterpret_cast<const VkClearDepthStencilValue *>( pDepthStencil ),
@@ -5583,13 +5330,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdClearDepthStencilImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage( Image                                           image,
-                                                                ImageLayout                                     imageLayout,
-                                                                const ClearDepthStencilValue &                  depthStencil,
-                                                                ArrayProxy<const ImageSubresourceRange> const & ranges,
-                                                                Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                                                                 image,
+                                           VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+                                           const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue &                                        depthStencil,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges,
+                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5605,13 +5352,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearAttachments(
-    uint32_t attachmentCount, const ClearAttachment * pAttachments, uint32_t rectCount, const ClearRect * pRects, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::clearAttachments( uint32_t                                      attachmentCount,
+                                                          const VULKAN_HPP_NAMESPACE::ClearAttachment * pAttachments,
+                                                          uint32_t                                      rectCount,
+                                                          const VULKAN_HPP_NAMESPACE::ClearRect *       pRects,
+                                                          Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdClearAttachments( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdClearAttachments( m_commandBuffer,
                              attachmentCount,
                              reinterpret_cast<const VkClearAttachment *>( pAttachments ),
                              rectCount,
@@ -5619,11 +5368,10 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::clearAttachments( ArrayProxy<const ClearAttachment> const & attachments,
-                                                          ArrayProxy<const ClearRect> const &       rects,
-                                                          Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::clearAttachments( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearAttachment> const & attachments,
+                                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearRect> const &       rects,
+                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5638,18 +5386,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage( Image                srcImage,
-                                                      ImageLayout          srcImageLayout,
-                                                      Image                dstImage,
-                                                      ImageLayout          dstImageLayout,
-                                                      uint32_t             regionCount,
-                                                      const ImageResolve * pRegions,
-                                                      Dispatch const &     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage( VULKAN_HPP_NAMESPACE::Image                srcImage,
+                                                      VULKAN_HPP_NAMESPACE::ImageLayout          srcImageLayout,
+                                                      VULKAN_HPP_NAMESPACE::Image                dstImage,
+                                                      VULKAN_HPP_NAMESPACE::ImageLayout          dstImageLayout,
+                                                      uint32_t                                   regionCount,
+                                                      const VULKAN_HPP_NAMESPACE::ImageResolve * pRegions,
+                                                      Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResolveImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdResolveImage( m_commandBuffer,
                          static_cast<VkImage>( srcImage ),
                          static_cast<VkImageLayout>( srcImageLayout ),
                          static_cast<VkImage>( dstImage ),
@@ -5659,14 +5406,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage( Image                                  srcImage,
-                                                      ImageLayout                            srcImageLayout,
-                                                      Image                                  dstImage,
-                                                      ImageLayout                            dstImageLayout,
-                                                      ArrayProxy<const ImageResolve> const & regions,
-                                                      Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage( VULKAN_HPP_NAMESPACE::Image                                                        srcImage,
+                                                      VULKAN_HPP_NAMESPACE::ImageLayout                                                  srcImageLayout,
+                                                      VULKAN_HPP_NAMESPACE::Image                                                        dstImage,
+                                                      VULKAN_HPP_NAMESPACE::ImageLayout                                                  dstImageLayout,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageResolve> const & regions,
+                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5683,22 +5429,241 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::beginRenderPass( const RenderPassBeginInfo * pRenderPassBegin, SubpassContents contents, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                                                  VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask,
+                                                  Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginRenderPass( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                            reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ),
-                            static_cast<VkSubpassContents>( contents ) );
+    d.vkCmdSetEvent( m_commandBuffer, static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resetEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                                                    VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask,
+                                                    Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdResetEvent( m_commandBuffer, static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::waitEvents( uint32_t                                          eventCount,
+                                                    const VULKAN_HPP_NAMESPACE::Event *               pEvents,
+                                                    VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
+                                                    VULKAN_HPP_NAMESPACE::PipelineStageFlags          dstStageMask,
+                                                    uint32_t                                          memoryBarrierCount,
+                                                    const VULKAN_HPP_NAMESPACE::MemoryBarrier *       pMemoryBarriers,
+                                                    uint32_t                                          bufferMemoryBarrierCount,
+                                                    const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier * pBufferMemoryBarriers,
+                                                    uint32_t                                          imageMemoryBarrierCount,
+                                                    const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier *  pImageMemoryBarriers,
+                                                    Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdWaitEvents( m_commandBuffer,
+                       eventCount,
+                       reinterpret_cast<const VkEvent *>( pEvents ),
+                       static_cast<VkPipelineStageFlags>( srcStageMask ),
+                       static_cast<VkPipelineStageFlags>( dstStageMask ),
+                       memoryBarrierCount,
+                       reinterpret_cast<const VkMemoryBarrier *>( pMemoryBarriers ),
+                       bufferMemoryBarrierCount,
+                       reinterpret_cast<const VkBufferMemoryBarrier *>( pBufferMemoryBarriers ),
+                       imageMemoryBarrierCount,
+                       reinterpret_cast<const VkImageMemoryBarrier *>( pImageMemoryBarriers ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
-    CommandBuffer::beginRenderPass( const RenderPassBeginInfo & renderPassBegin, SubpassContents contents, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    CommandBuffer::waitEvents( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &               events,
+                               VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                               VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers,
+                               Dispatch const &                                                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdWaitEvents && "Function <vkCmdWaitEvents> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdWaitEvents( m_commandBuffer,
+                       events.size(),
+                       reinterpret_cast<const VkEvent *>( events.data() ),
+                       static_cast<VkPipelineStageFlags>( srcStageMask ),
+                       static_cast<VkPipelineStageFlags>( dstStageMask ),
+                       memoryBarriers.size(),
+                       reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
+                       bufferMemoryBarriers.size(),
+                       reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
+                       imageMemoryBarriers.size(),
+                       reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
+                                                         VULKAN_HPP_NAMESPACE::PipelineStageFlags          dstStageMask,
+                                                         VULKAN_HPP_NAMESPACE::DependencyFlags             dependencyFlags,
+                                                         uint32_t                                          memoryBarrierCount,
+                                                         const VULKAN_HPP_NAMESPACE::MemoryBarrier *       pMemoryBarriers,
+                                                         uint32_t                                          bufferMemoryBarrierCount,
+                                                         const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier * pBufferMemoryBarriers,
+                                                         uint32_t                                          imageMemoryBarrierCount,
+                                                         const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier *  pImageMemoryBarriers,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdPipelineBarrier( m_commandBuffer,
+                            static_cast<VkPipelineStageFlags>( srcStageMask ),
+                            static_cast<VkPipelineStageFlags>( dstStageMask ),
+                            static_cast<VkDependencyFlags>( dependencyFlags ),
+                            memoryBarrierCount,
+                            reinterpret_cast<const VkMemoryBarrier *>( pMemoryBarriers ),
+                            bufferMemoryBarrierCount,
+                            reinterpret_cast<const VkBufferMemoryBarrier *>( pBufferMemoryBarriers ),
+                            imageMemoryBarrierCount,
+                            reinterpret_cast<const VkImageMemoryBarrier *>( pImageMemoryBarriers ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                                    VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                                    VULKAN_HPP_NAMESPACE::DependencyFlags                                                     dependencyFlags,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers,
+                                    Dispatch const &                                                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdPipelineBarrier && "Function <vkCmdPipelineBarrier> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdPipelineBarrier( m_commandBuffer,
+                            static_cast<VkPipelineStageFlags>( srcStageMask ),
+                            static_cast<VkPipelineStageFlags>( dstStageMask ),
+                            static_cast<VkDependencyFlags>( dependencyFlags ),
+                            memoryBarriers.size(),
+                            reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
+                            bufferMemoryBarriers.size(),
+                            reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
+                            imageMemoryBarriers.size(),
+                            reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginQuery( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                                                    uint32_t                                query,
+                                                    VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                                                    Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBeginQuery( m_commandBuffer, static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdEndQuery( m_commandBuffer, static_cast<VkQueryPool>( queryPool ), query );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                                                        uint32_t                        firstQuery,
+                                                        uint32_t                        queryCount,
+                                                        Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdResetQueryPool( m_commandBuffer, static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                                                        VULKAN_HPP_NAMESPACE::QueryPool             queryPool,
+                                                        uint32_t                                    query,
+                                                        Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdWriteTimestamp( m_commandBuffer, static_cast<VkPipelineStageFlagBits>( pipelineStage ), static_cast<VkQueryPool>( queryPool ), query );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                                              uint32_t                               firstQuery,
+                                                              uint32_t                               queryCount,
+                                                              VULKAN_HPP_NAMESPACE::Buffer           dstBuffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize       dstOffset,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                                              VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                                                              Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyQueryPoolResults( m_commandBuffer,
+                                 static_cast<VkQueryPool>( queryPool ),
+                                 firstQuery,
+                                 queryCount,
+                                 static_cast<VkBuffer>( dstBuffer ),
+                                 static_cast<VkDeviceSize>( dstOffset ),
+                                 static_cast<VkDeviceSize>( stride ),
+                                 static_cast<VkQueryResultFlags>( flags ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout   layout,
+                                                       VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags,
+                                                       uint32_t                               offset,
+                                                       uint32_t                               size,
+                                                       const void *                           pValues,
+                                                       Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdPushConstants( m_commandBuffer, static_cast<VkPipelineLayout>( layout ), static_cast<VkShaderStageFlags>( stageFlags ), offset, size, pValues );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename ValuesType, typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout                       layout,
+                                                       VULKAN_HPP_NAMESPACE::ShaderStageFlags                     stageFlags,
+                                                       uint32_t                                                   offset,
+                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const ValuesType> const & values,
+                                                       Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdPushConstants && "Function <vkCmdPushConstants> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdPushConstants( m_commandBuffer,
+                          static_cast<VkPipelineLayout>( layout ),
+                          static_cast<VkShaderStageFlags>( stageFlags ),
+                          offset,
+                          values.size() * sizeof( ValuesType ),
+                          reinterpret_cast<const void *>( values.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                                                         VULKAN_HPP_NAMESPACE::SubpassContents             contents,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBeginRenderPass( m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ), static_cast<VkSubpassContents>( contents ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                         VULKAN_HPP_NAMESPACE::SubpassContents             contents,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5709,26 +5674,46 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdNextSubpass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass( SubpassContents contents, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass( VULKAN_HPP_NAMESPACE::SubpassContents contents, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdNextSubpass( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkSubpassContents>( contents ) );
+    d.vkCmdNextSubpass( m_commandBuffer, static_cast<VkSubpassContents>( contents ) );
   }
 
-  // wrapper function for command vkCmdEndRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRenderPass( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRenderPass( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdEndRenderPass( m_commandBuffer );
   }
 
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::executeCommands( uint32_t                                    commandBufferCount,
+                                                         const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                                                         Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdExecuteCommands( m_commandBuffer, commandBufferCount, reinterpret_cast<const VkCommandBuffer *>( pCommandBuffers ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::executeCommands( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdExecuteCommands && "Function <vkCmdExecuteCommands> requires <VK_VERSION_1_0>" );
+#  endif
+
+    d.vkCmdExecuteCommands( m_commandBuffer, commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
   //=== VK_VERSION_1_1 ===
 
-  // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result enumerateInstanceVersion( uint32_t * pApiVersion, Dispatch const & d ) VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -5736,8 +5721,7 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint32_t>::type enumerateInstanceVersion( Dispatch const & d )
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -5745,96 +5729,84 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkEnumerateInstanceVersion && "Function <vkEnumerateInstanceVersion> requires <VK_VERSION_1_1>" );
 #  endif
 
-    uint32_t apiVersion;
-    Result   result = static_cast<Result>( d.vkEnumerateInstanceVersion( &apiVersion ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceVersion" );
+    uint32_t                     apiVersion;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumerateInstanceVersion( &apiVersion ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::enumerateInstanceVersion" );
 
-    return detail::createResultValueType( result, std::move( apiVersion ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( apiVersion ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory2( uint32_t                     bindInfoCount,
-                                                                           const BindBufferMemoryInfo * pBindInfos,
-                                                                           Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory2( uint32_t                                           bindInfoCount,
+                                                                           const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo * pBindInfos,
+                                                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBindBufferMemory2( static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindBufferMemoryInfo *>( pBindInfos ) ) );
+    return static_cast<Result>( d.vkBindBufferMemory2( m_device, bindInfoCount, reinterpret_cast<const VkBindBufferMemoryInfo *>( pBindInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindBufferMemory2( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos, Dispatch const & d ) const
+    Device::bindBufferMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindBufferMemory2 && "Function <vkBindBufferMemory2> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkBindBufferMemory2( m_device, bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkBindBufferMemory2( m_device, bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2( uint32_t                    bindInfoCount,
-                                                                          const BindImageMemoryInfo * pBindInfos,
-                                                                          Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2( uint32_t                                          bindInfoCount,
+                                                                          const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo * pBindInfos,
+                                                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBindImageMemory2( static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindImageMemoryInfo *>( pBindInfos ) ) );
+    return static_cast<Result>( d.vkBindImageMemory2( m_device, bindInfoCount, reinterpret_cast<const VkBindImageMemoryInfo *>( pBindInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindImageMemory2( ArrayProxy<const BindImageMemoryInfo> const & bindInfos, Dispatch const & d ) const
+    Device::bindImageMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindImageMemory2 && "Function <vkBindImageMemory2> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkBindImageMemory2( m_device, bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkBindImageMemory2( m_device, bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getGroupPeerMemoryFeatures( uint32_t                 heapIndex,
-                                                             uint32_t                 localDeviceIndex,
-                                                             uint32_t                 remoteDeviceIndex,
-                                                             PeerMemoryFeatureFlags * pPeerMemoryFeatures,
-                                                             Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getGroupPeerMemoryFeatures( uint32_t                                       heapIndex,
+                                                             uint32_t                                       localDeviceIndex,
+                                                             uint32_t                                       remoteDeviceIndex,
+                                                             VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags * pPeerMemoryFeatures,
+                                                             Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetDeviceGroupPeerMemoryFeatures(
-      static_cast<VkDevice>( m_device ), heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( pPeerMemoryFeatures ) );
+      m_device, heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( pPeerMemoryFeatures ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeatures( uint32_t         heapIndex,
-                                                                                                    uint32_t         localDeviceIndex,
-                                                                                                    uint32_t         remoteDeviceIndex,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeatures(
+    uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -5842,7 +5814,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceGroupPeerMemoryFeatures> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
 #  endif
 
-    PeerMemoryFeatureFlags peerMemoryFeatures;
+    VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags peerMemoryFeatures;
     d.vkGetDeviceGroupPeerMemoryFeatures(
       m_device, heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( &peerMemoryFeatures ) );
 
@@ -5850,925 +5822,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDeviceMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMask.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDeviceMask( uint32_t deviceMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDeviceMask( static_cast<VkCommandBuffer>( m_commandBuffer ), deviceMask );
+    d.vkCmdSetDeviceMask( m_commandBuffer, deviceMask );
   }
 
-  // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::enumeratePhysicalDeviceGroups( uint32_t *                      pPhysicalDeviceGroupCount,
-                                                                                         PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
-                                                                                         Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups( static_cast<VkInstance>( m_instance ),
-                                                                   pPhysicalDeviceGroupCount,
-                                                                   reinterpret_cast<VkPhysicalDeviceGroupProperties *>( pPhysicalDeviceGroupProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-  template <typename PhysicalDeviceGroupPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
-                       Instance::enumeratePhysicalDeviceGroups( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceGroups &&
-                       "Function <vkEnumeratePhysicalDeviceGroups> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties;
-    uint32_t                                                                           physicalDeviceGroupCount;
-    Result                                                                             result;
-    do
-    {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups( m_instance, &physicalDeviceGroupCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
-      {
-        physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups(
-          m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
-    VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
-    if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
-    {
-      physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-    }
-    return detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
-  }
-
-  // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-  template <typename PhysicalDeviceGroupPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
-    Instance::enumeratePhysicalDeviceGroups( PhysicalDeviceGroupPropertiesAllocator & physicalDeviceGroupPropertiesAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceGroups &&
-                       "Function <vkEnumeratePhysicalDeviceGroups> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties( physicalDeviceGroupPropertiesAllocator );
-    uint32_t                                                                           physicalDeviceGroupCount;
-    Result                                                                             result;
-    do
-    {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups( m_instance, &physicalDeviceGroupCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
-      {
-        physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups(
-          m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
-    VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
-    if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
-    {
-      physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-    }
-    return detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetImageMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 * pInfo,
-                                                              MemoryRequirements2 *                pMemoryRequirements,
-                                                              Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageMemoryRequirements2( static_cast<VkDevice>( m_device ),
-                                     reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( pInfo ),
-                                     reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info,
-                                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetImageMemoryRequirements2 &&
-                       "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetImageMemoryRequirements2(
-      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetImageMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info,
-                                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetImageMemoryRequirements2 &&
-                       "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetImageMemoryRequirements2(
-      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetBufferMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 * pInfo,
-                                                               MemoryRequirements2 *                 pMemoryRequirements,
-                                                               Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetBufferMemoryRequirements2( static_cast<VkDevice>( m_device ),
-                                      reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( pInfo ),
-                                      reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info,
-                                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetBufferMemoryRequirements2 &&
-                       "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetBufferMemoryRequirements2(
-      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetBufferMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info,
-                                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetBufferMemoryRequirements2 &&
-                       "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetBufferMemoryRequirements2(
-      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 * pInfo,
-                                                                    uint32_t *                                 pSparseMemoryRequirementCount,
-                                                                    SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
-                                                                    Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSparseMemoryRequirements2( static_cast<VkDevice>( m_device ),
-                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( pInfo ),
-                                           pSparseMemoryRequirementCount,
-                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements2 &&
-                       "Function <vkGetImageSparseMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
-    uint32_t                                                                             sparseMemoryRequirementCount;
-    d.vkGetImageSparseMemoryRequirements2(
-      m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
-    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    d.vkGetImageSparseMemoryRequirements2( m_device,
-                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
-                                           &sparseMemoryRequirementCount,
-                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
-
-    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
-    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
-    {
-      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    }
-    return sparseMemoryRequirements;
-  }
-
-  // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info,
-                                               SparseImageMemoryRequirements2Allocator &  sparseImageMemoryRequirements2Allocator,
-                                               Dispatch const &                           d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements2 &&
-                       "Function <vkGetImageSparseMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( sparseImageMemoryRequirements2Allocator );
-    uint32_t                                                                             sparseMemoryRequirementCount;
-    d.vkGetImageSparseMemoryRequirements2(
-      m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
-    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    d.vkGetImageSparseMemoryRequirements2( m_device,
-                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
-                                           &sparseMemoryRequirementCount,
-                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
-
-    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
-    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
-    {
-      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    }
-    return sparseMemoryRequirements;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceFeatures2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures2( PhysicalDeviceFeatures2 * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceFeatures2( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceFeatures2 *>( pFeatures ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFeatures2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFeatures2 &&
-                       "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    PhysicalDeviceFeatures2 features;
-    d.vkGetPhysicalDeviceFeatures2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
-
-    return features;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceFeatures2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFeatures2 &&
-                       "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    PhysicalDeviceFeatures2 &  features = structureChain.template get<PhysicalDeviceFeatures2>();
-    d.vkGetPhysicalDeviceFeatures2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getProperties2( PhysicalDeviceProperties2 * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceProperties2 *>( pProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties2 PhysicalDevice::getProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceProperties2 &&
-                       "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    PhysicalDeviceProperties2 properties;
-    d.vkGetPhysicalDeviceProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
-
-    return properties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceProperties2 &&
-                       "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...>  structureChain;
-    PhysicalDeviceProperties2 & properties = structureChain.template get<PhysicalDeviceProperties2>();
-    d.vkGetPhysicalDeviceProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    PhysicalDevice::getFormatProperties2( Format format, FormatProperties2 * pFormatProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceFormatProperties2(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( pFormatProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties2 PhysicalDevice::getFormatProperties2( Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    FormatProperties2 formatProperties;
-    d.vkGetPhysicalDeviceFormatProperties2( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
-
-    return formatProperties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFormatProperties2( Format           format,
-                                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    FormatProperties2 &        formatProperties = structureChain.template get<FormatProperties2>();
-    d.vkGetPhysicalDeviceFormatProperties2( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                                                           ImageFormatProperties2 *               pImageFormatProperties,
-                                                                                           Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                             reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( pImageFormatInfo ),
-                                                                             reinterpret_cast<VkImageFormatProperties2 *>( pImageFormatProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties2>::type
-                       PhysicalDevice::getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceImageFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    ImageFormatProperties2 imageFormatProperties;
-    Result                 result =
-      static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2( m_physicalDevice,
-                                                                        reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
-                                                                        reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
-
-    return detail::createResultValueType( result, std::move( imageFormatProperties ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                       PhysicalDevice::getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceImageFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    ImageFormatProperties2 &   imageFormatProperties = structureChain.template get<ImageFormatProperties2>();
-    Result                     result =
-      static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2( m_physicalDevice,
-                                                                        reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
-                                                                        reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
-
-    return detail::createResultValueType( result, std::move( structureChain ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2( uint32_t *               pQueueFamilyPropertyCount,
-                                                                    QueueFamilyProperties2 * pQueueFamilyProperties,
-                                                                    Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceQueueFamilyProperties2(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( pQueueFamilyProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-  template <typename QueueFamilyProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
-                                         PhysicalDevice::getQueueFamilyProperties2( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties;
-    uint32_t                                                             queueFamilyPropertyCount;
-    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
-    queueFamilyProperties.resize( queueFamilyPropertyCount );
-    d.vkGetPhysicalDeviceQueueFamilyProperties2(
-      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
-
-    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
-    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
-    {
-      queueFamilyProperties.resize( queueFamilyPropertyCount );
-    }
-    return queueFamilyProperties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-  template <typename QueueFamilyProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
-    PhysicalDevice::getQueueFamilyProperties2( QueueFamilyProperties2Allocator & queueFamilyProperties2Allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties( queueFamilyProperties2Allocator );
-    uint32_t                                                             queueFamilyPropertyCount;
-    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
-    queueFamilyProperties.resize( queueFamilyPropertyCount );
-    d.vkGetPhysicalDeviceQueueFamilyProperties2(
-      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
-
-    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
-    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
-    {
-      queueFamilyProperties.resize( queueFamilyPropertyCount );
-    }
-    return queueFamilyProperties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
-                                         PhysicalDevice::getQueueFamilyProperties2( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains;
-    std::vector<QueueFamilyProperties2>                  queueFamilyProperties;
-    uint32_t                                             queueFamilyPropertyCount;
-    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
-    structureChains.resize( queueFamilyPropertyCount );
-    queueFamilyProperties.resize( queueFamilyPropertyCount );
-    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
-    {
-      queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
-    }
-    d.vkGetPhysicalDeviceQueueFamilyProperties2(
-      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
-
-    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
-    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
-    {
-      structureChains.resize( queueFamilyPropertyCount );
-    }
-    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
-    {
-      structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
-    }
-    return structureChains;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
-    PhysicalDevice::getQueueFamilyProperties2( StructureChainAllocator & structureChainAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains( structureChainAllocator );
-    std::vector<QueueFamilyProperties2>                  queueFamilyProperties;
-    uint32_t                                             queueFamilyPropertyCount;
-    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
-    structureChains.resize( queueFamilyPropertyCount );
-    queueFamilyProperties.resize( queueFamilyPropertyCount );
-    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
-    {
-      queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
-    }
-    d.vkGetPhysicalDeviceQueueFamilyProperties2(
-      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
-
-    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
-    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
-    {
-      structureChains.resize( queueFamilyPropertyCount );
-    }
-    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
-    {
-      structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
-    }
-    return structureChains;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2( PhysicalDeviceMemoryProperties2 * pMemoryProperties,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceMemoryProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                            reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( pMemoryProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties2 PhysicalDevice::getMemoryProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceMemoryProperties2 &&
-                       "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    PhysicalDeviceMemoryProperties2 memoryProperties;
-    d.vkGetPhysicalDeviceMemoryProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
-
-    return memoryProperties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceMemoryProperties2 &&
-                       "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    StructureChain<X, Y, Z...>        structureChain;
-    PhysicalDeviceMemoryProperties2 & memoryProperties = structureChain.template get<PhysicalDeviceMemoryProperties2>();
-    d.vkGetPhysicalDeviceMemoryProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                                                          uint32_t *                                   pPropertyCount,
-                                                                          SparseImageFormatProperties2 *               pProperties,
-                                                                          Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( pFormatInfo ),
-                                                       pPropertyCount,
-                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( pProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-  template <typename SparseImageFormatProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-    PhysicalDevice::getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSparseImageFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceSparseImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties;
-    uint32_t                                                                         propertyCount;
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2(
-      m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
-    properties.resize( propertyCount );
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice,
-                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
-                                                       &propertyCount,
-                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( properties.data() ) );
-
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return properties;
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-  template <typename SparseImageFormatProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                                         PhysicalDevice::getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                     SparseImageFormatProperties2Allocator &      sparseImageFormatProperties2Allocator,
-                                                     Dispatch const &                             d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSparseImageFormatProperties2 &&
-                       "Function <vkGetPhysicalDeviceSparseImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-#  endif
-
-    std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( sparseImageFormatProperties2Allocator );
-    uint32_t                                                                         propertyCount;
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2(
-      m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
-    properties.resize( propertyCount );
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice,
-                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
-                                                       &propertyCount,
-                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( properties.data() ) );
-
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return properties;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkTrimCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::trimCommandPool( CommandPool commandPool, CommandPoolTrimFlags flags, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkTrimCommandPool( static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolTrimFlags>( flags ) );
-  }
-
-  // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getQueue2( const DeviceQueueInfo2 * pQueueInfo, Queue * pQueue, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceQueue2( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceQueueInfo2 *>( pQueueInfo ), reinterpret_cast<VkQueue *>( pQueue ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Queue Device::getQueue2( const DeviceQueueInfo2 & queueInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceQueue2 && "Function <vkGetDeviceQueue2> requires <VK_VERSION_1_1>" );
-#  endif
-
-    Queue queue;
-    d.vkGetDeviceQueue2( m_device, reinterpret_cast<const VkDeviceQueueInfo2 *>( &queueInfo ), reinterpret_cast<VkQueue *>( &queue ) );
-
-    return queue;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalBufferProperties( const PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                                                      ExternalBufferProperties *               pExternalBufferProperties,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalBufferProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                   reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( pExternalBufferInfo ),
-                                                   reinterpret_cast<VkExternalBufferProperties *>( pExternalBufferProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalBufferProperties
-    PhysicalDevice::getExternalBufferProperties( const PhysicalDeviceExternalBufferInfo & externalBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalBufferProperties &&
-                       "Function <vkGetPhysicalDeviceExternalBufferProperties> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
-#  endif
-
-    ExternalBufferProperties externalBufferProperties;
-    d.vkGetPhysicalDeviceExternalBufferProperties( m_physicalDevice,
-                                                   reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
-                                                   reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
-
-    return externalBufferProperties;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalFenceProperties( const PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                                                     ExternalFenceProperties *               pExternalFenceProperties,
-                                                                     Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalFenceProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                  reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( pExternalFenceInfo ),
-                                                  reinterpret_cast<VkExternalFenceProperties *>( pExternalFenceProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalFenceProperties
-    PhysicalDevice::getExternalFenceProperties( const PhysicalDeviceExternalFenceInfo & externalFenceInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalFenceProperties &&
-                       "Function <vkGetPhysicalDeviceExternalFenceProperties> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
-#  endif
-
-    ExternalFenceProperties externalFenceProperties;
-    d.vkGetPhysicalDeviceExternalFenceProperties( m_physicalDevice,
-                                                  reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
-                                                  reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
-
-    return externalFenceProperties;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalSemaphoreProperties( const PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                                                         ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
-                                                                         Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalSemaphoreProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                      reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( pExternalSemaphoreInfo ),
-                                                      reinterpret_cast<VkExternalSemaphoreProperties *>( pExternalSemaphoreProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalSemaphoreProperties PhysicalDevice::getExternalSemaphoreProperties(
-    const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalSemaphoreProperties &&
-                       "Function <vkGetPhysicalDeviceExternalSemaphoreProperties> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
-#  endif
-
-    ExternalSemaphoreProperties externalSemaphoreProperties;
-    d.vkGetPhysicalDeviceExternalSemaphoreProperties( m_physicalDevice,
-                                                      reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
-                                                      reinterpret_cast<VkExternalSemaphoreProperties *>( &externalSemaphoreProperties ) );
-
-    return externalSemaphoreProperties;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdDispatchBase, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBase.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::dispatchBase( uint32_t         baseGroupX,
                                                       uint32_t         baseGroupY,
                                                       uint32_t         baseGroupZ,
@@ -6778,30 +5839,886 @@ namespace VULKAN_HPP_NAMESPACE
                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchBase( static_cast<VkCommandBuffer>( m_commandBuffer ), baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
+    d.vkCmdDispatchBase( m_commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
   }
 
-  // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorUpdateTemplate( const DescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                                                        const AllocationCallbacks *                pAllocator,
-                                                                                        DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
-                                                                                        Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::enumeratePhysicalDeviceGroups( uint32_t *                                            pPhysicalDeviceGroupCount,
+                                             VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
+                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDescriptorUpdateTemplate( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkEnumeratePhysicalDeviceGroups(
+      m_instance, pPhysicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( pPhysicalDeviceGroupProperties ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename PhysicalDeviceGroupPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    Instance::enumeratePhysicalDeviceGroups( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceGroups &&
+                       "Function <vkEnumeratePhysicalDeviceGroups> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties;
+    uint32_t                                                                                                 physicalDeviceGroupCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                             result;
+    do
+    {
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroups( m_instance, &physicalDeviceGroupCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
+      {
+        physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroups(
+          m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
+    VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
+    if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
+    {
+      physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+  }
+
+  template <typename PhysicalDeviceGroupPropertiesAllocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    Instance::enumeratePhysicalDeviceGroups( PhysicalDeviceGroupPropertiesAllocator & physicalDeviceGroupPropertiesAllocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceGroups &&
+                       "Function <vkEnumeratePhysicalDeviceGroups> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties(
+      physicalDeviceGroupPropertiesAllocator );
+    uint32_t                     physicalDeviceGroupCount;
+    VULKAN_HPP_NAMESPACE::Result result;
+    do
+    {
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroups( m_instance, &physicalDeviceGroupCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
+      {
+        physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroups(
+          m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
+    VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
+    if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
+    {
+      physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
+                                                              VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                pMemoryRequirements,
+                                                              Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetImageMemoryRequirements2(
+      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetImageMemoryRequirements2 &&
+                       "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+    d.vkGetImageMemoryRequirements2(
+      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
+
+    return memoryRequirements;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetImageMemoryRequirements2 &&
+                       "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+    d.vkGetImageMemoryRequirements2(
+      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
+                                                               VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                                               Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetBufferMemoryRequirements2(
+      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetBufferMemoryRequirements2 &&
+                       "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+    d.vkGetBufferMemoryRequirements2(
+      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
+
+    return memoryRequirements;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetBufferMemoryRequirements2 &&
+                       "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+    d.vkGetBufferMemoryRequirements2(
+      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
+                                                                    uint32_t *                                             pSparseMemoryRequirementCount,
+                                                                    VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 * pSparseMemoryRequirements,
+                                                                    Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetImageSparseMemoryRequirements2( m_device,
+                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( pInfo ),
+                                           pSparseMemoryRequirementCount,
+                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename SparseImageMemoryRequirements2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+    Device::getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements2 &&
+                       "Function <vkGetImageSparseMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
+    uint32_t                                                                                                   sparseMemoryRequirementCount;
+    d.vkGetImageSparseMemoryRequirements2(
+      m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
+    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    d.vkGetImageSparseMemoryRequirements2( m_device,
+                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
+                                           &sparseMemoryRequirementCount,
+                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
+
+    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
+    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
+    {
+      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    }
+    return sparseMemoryRequirements;
+  }
+
+  template <typename SparseImageMemoryRequirements2Allocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                                         Device::getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                               SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
+                                               Dispatch const &                                                 d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetImageSparseMemoryRequirements2 &&
+                       "Function <vkGetImageSparseMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
+      sparseImageMemoryRequirements2Allocator );
+    uint32_t sparseMemoryRequirementCount;
+    d.vkGetImageSparseMemoryRequirements2(
+      m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
+    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    d.vkGetImageSparseMemoryRequirements2( m_device,
+                                           reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ),
+                                           &sparseMemoryRequirementCount,
+                                           reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
+
+    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
+    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
+    {
+      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    }
+    return sparseMemoryRequirements;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures2( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceFeatures2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( pFeatures ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2
+                                         PhysicalDevice::getFeatures2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFeatures2 &&
+                       "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 features;
+    d.vkGetPhysicalDeviceFeatures2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
+
+    return features;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getFeatures2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFeatures2 &&
+                       "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 &  features = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2>();
+    d.vkGetPhysicalDeviceFeatures2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( pProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2
+                                         PhysicalDevice::getProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceProperties2 &&
+                       "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 properties;
+    d.vkGetPhysicalDeviceProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
+
+    return properties;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceProperties2 &&
+                       "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>();
+    d.vkGetPhysicalDeviceProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format              format,
+                                                               VULKAN_HPP_NAMESPACE::FormatProperties2 * pFormatProperties,
+                                                               Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceFormatProperties2( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( pFormatProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties2
+    PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::FormatProperties2 formatProperties;
+    d.vkGetPhysicalDeviceFormatProperties2( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
+
+    return formatProperties;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::FormatProperties2 &        formatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::FormatProperties2>();
+    d.vkGetPhysicalDeviceFormatProperties2( m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                               VULKAN_HPP_NAMESPACE::ImageFormatProperties2 *               pImageFormatProperties,
+                                               Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2( m_physicalDevice,
+                                                                             reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( pImageFormatInfo ),
+                                                                             reinterpret_cast<VkImageFormatProperties2 *>( pImageFormatProperties ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>::type
+    PhysicalDevice::getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceImageFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties2 imageFormatProperties;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceImageFormatProperties2( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
+                                                   reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+    PhysicalDevice::getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceImageFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    StructureChain<X, Y, Z...>                     structureChain;
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties2 & imageFormatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>();
+    VULKAN_HPP_NAMESPACE::Result                   result                = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceImageFormatProperties2( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
+                                                   reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2( uint32_t *                                     pQueueFamilyPropertyCount,
+                                                                    VULKAN_HPP_NAMESPACE::QueueFamilyProperties2 * pQueueFamilyProperties,
+                                                                    Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceQueueFamilyProperties2(
+      m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( pQueueFamilyProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename QueueFamilyProperties2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+                                         PhysicalDevice::getQueueFamilyProperties2( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
+                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties;
+    uint32_t                                                                                   queueFamilyPropertyCount;
+    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
+    queueFamilyProperties.resize( queueFamilyPropertyCount );
+    d.vkGetPhysicalDeviceQueueFamilyProperties2(
+      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
+
+    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
+    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
+    {
+      queueFamilyProperties.resize( queueFamilyPropertyCount );
+    }
+    return queueFamilyProperties;
+  }
+
+  template <
+    typename QueueFamilyProperties2Allocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+    PhysicalDevice::getQueueFamilyProperties2( QueueFamilyProperties2Allocator & queueFamilyProperties2Allocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
+                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties( queueFamilyProperties2Allocator );
+    uint32_t                                                                                   queueFamilyPropertyCount;
+    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
+    queueFamilyProperties.resize( queueFamilyPropertyCount );
+    d.vkGetPhysicalDeviceQueueFamilyProperties2(
+      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
+
+    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
+    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
+    {
+      queueFamilyProperties.resize( queueFamilyPropertyCount );
+    }
+    return queueFamilyProperties;
+  }
+
+  template <typename StructureChain, typename StructureChainAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
+                                         PhysicalDevice::getQueueFamilyProperties2( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
+                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<StructureChain, StructureChainAllocator>      structureChains;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+    uint32_t                                                  queueFamilyPropertyCount;
+    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
+    structureChains.resize( queueFamilyPropertyCount );
+    queueFamilyProperties.resize( queueFamilyPropertyCount );
+    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
+    {
+      queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
+    }
+    d.vkGetPhysicalDeviceQueueFamilyProperties2(
+      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
+
+    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
+    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
+    {
+      structureChains.resize( queueFamilyPropertyCount );
+    }
+    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
+    {
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
+    }
+    return structureChains;
+  }
+
+  template <typename StructureChain,
+            typename StructureChainAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
+    PhysicalDevice::getQueueFamilyProperties2( StructureChainAllocator & structureChainAllocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyProperties2 &&
+                       "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<StructureChain, StructureChainAllocator>      structureChains( structureChainAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+    uint32_t                                                  queueFamilyPropertyCount;
+    d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
+    structureChains.resize( queueFamilyPropertyCount );
+    queueFamilyProperties.resize( queueFamilyPropertyCount );
+    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
+    {
+      queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
+    }
+    d.vkGetPhysicalDeviceQueueFamilyProperties2(
+      m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
+
+    VULKAN_HPP_ASSERT( queueFamilyPropertyCount <= queueFamilyProperties.size() );
+    if ( queueFamilyPropertyCount < queueFamilyProperties.size() )
+    {
+      structureChains.resize( queueFamilyPropertyCount );
+    }
+    for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
+    {
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
+    }
+    return structureChains;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
+                                                               Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceMemoryProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( pMemoryProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                                         PhysicalDevice::getMemoryProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceMemoryProperties2 &&
+                       "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 memoryProperties;
+    d.vkGetPhysicalDeviceMemoryProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
+
+    return memoryProperties;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getMemoryProperties2( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceMemoryProperties2 &&
+                       "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>        structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 & memoryProperties =
+      structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2>();
+    d.vkGetPhysicalDeviceMemoryProperties2( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
+
+    return structureChain;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                                                          uint32_t *                                                         pPropertyCount,
+                                                                          VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2 *               pProperties,
+                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice,
+                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( pFormatInfo ),
+                                                       pPropertyCount,
+                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( pProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename SparseImageFormatProperties2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+    PhysicalDevice::getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSparseImageFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceSparseImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties;
+    uint32_t                                                                                               propertyCount;
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2(
+      m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
+    properties.resize( propertyCount );
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice,
+                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
+                                                       &propertyCount,
+                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( properties.data() ) );
+
+    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
+    if ( propertyCount < properties.size() )
+    {
+      properties.resize( propertyCount );
+    }
+    return properties;
+  }
+
+  template <
+    typename SparseImageFormatProperties2Allocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+    PhysicalDevice::getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                     SparseImageFormatProperties2Allocator &                            sparseImageFormatProperties2Allocator,
+                                                     Dispatch const &                                                   d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSparseImageFormatProperties2 &&
+                       "Function <vkGetPhysicalDeviceSparseImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( sparseImageFormatProperties2Allocator );
+    uint32_t                                                                                               propertyCount;
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2(
+      m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
+    properties.resize( propertyCount );
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice,
+                                                       reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
+                                                       &propertyCount,
+                                                       reinterpret_cast<VkSparseImageFormatProperties2 *>( properties.data() ) );
+
+    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
+    if ( propertyCount < properties.size() )
+    {
+      properties.resize( propertyCount );
+    }
+    return properties;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::trimCommandPool( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
+                                                  VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags,
+                                                  Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkTrimCommandPool( m_device, static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolTrimFlags>( flags ) );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getQueue2( const VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 * pQueueInfo,
+                                            VULKAN_HPP_NAMESPACE::Queue *                  pQueue,
+                                            Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetDeviceQueue2( m_device, reinterpret_cast<const VkDeviceQueueInfo2 *>( pQueueInfo ), reinterpret_cast<VkQueue *>( pQueue ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Queue Device::getQueue2( const VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 & queueInfo,
+                                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetDeviceQueue2 && "Function <vkGetDeviceQueue2> requires <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Queue queue;
+    d.vkGetDeviceQueue2( m_device, reinterpret_cast<const VkDeviceQueueInfo2 *>( &queueInfo ), reinterpret_cast<VkQueue *>( &queue ) );
+
+    return queue;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createSamplerYcbcrConversion( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                          VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion *                 pYcbcrConversion,
+                                          Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateSamplerYcbcrConversion( m_device,
+                                                                  reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( pCreateInfo ),
+                                                                  reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                                  reinterpret_cast<VkSamplerYcbcrConversion *>( pYcbcrConversion ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::type
+                       Device::createSamplerYcbcrConversion( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo & createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                          Dispatch const &                                               d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateSamplerYcbcrConversion &&
+                       "Function <vkCreateSamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSamplerYcbcrConversion(
+      m_device,
+      reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversion" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( ycbcrConversion ) );
+  }
+
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>>::type
+                       Device::createSamplerYcbcrConversionUnique( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo & createInfo,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                                Dispatch const &                                               d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCreateSamplerYcbcrConversion &&
+                       "Function <vkCreateSamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSamplerYcbcrConversion(
+      m_device,
+      reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionUnique" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>( ycbcrConversion, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+  }
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroySamplerYcbcrConversion(
+      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion              ycbcrConversion,
+                                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroySamplerYcbcrConversion &&
+                       "Function <vkDestroySamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+#  endif
+
+    d.vkDestroySamplerYcbcrConversion(
+      m_device,
+      static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroySamplerYcbcrConversion(
+      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion              ycbcrConversion,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroySamplerYcbcrConversion &&
+                       "Function <vkDestroySamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+#  endif
+
+    d.vkDestroySamplerYcbcrConversion(
+      m_device,
+      static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createDescriptorUpdateTemplate( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                            VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
+                                            Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateDescriptorUpdateTemplate( m_device,
                                                                     reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( pCreateInfo ),
                                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                     reinterpret_cast<VkDescriptorUpdateTemplate *>( pDescriptorUpdateTemplate ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorUpdateTemplate>::type Device::createDescriptorUpdateTemplate(
-    const DescriptorUpdateTemplateCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::type
+                       Device::createDescriptorUpdateTemplate( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                            Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -6809,24 +6726,23 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateDescriptorUpdateTemplate> requires <VK_KHR_descriptor_update_template> or <VK_VERSION_1_1>" );
 #  endif
 
-    DescriptorUpdateTemplate descriptorUpdateTemplate;
-    Result                   result = static_cast<Result>( d.vkCreateDescriptorUpdateTemplate( m_device,
-                                                                             reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplate" );
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorUpdateTemplate(
+      m_device,
+      reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplate" );
 
-    return detail::createResultValueType( result, std::move( descriptorUpdateTemplate ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorUpdateTemplate ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DescriptorUpdateTemplate, Dispatch>>::type
-                       Device::createDescriptorUpdateTemplateUnique( const DescriptorUpdateTemplateCreateInfo & createInfo,
-                                                  Optional<const AllocationCallbacks>        allocator,
-                                                  Dispatch const &                           d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>>::type
+                       Device::createDescriptorUpdateTemplateUnique( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                                  Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -6834,39 +6750,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateDescriptorUpdateTemplate> requires <VK_KHR_descriptor_update_template> or <VK_VERSION_1_1>" );
 #    endif
 
-    DescriptorUpdateTemplate descriptorUpdateTemplate;
-    Result                   result = static_cast<Result>( d.vkCreateDescriptorUpdateTemplate( m_device,
-                                                                             reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateUnique" );
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorUpdateTemplate(
+      m_device,
+      reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DescriptorUpdateTemplate, Dispatch>( descriptorUpdateTemplate, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
+                                                                UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>(
+                                                                  descriptorUpdateTemplate, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplate( DescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                                                  const AllocationCallbacks * pAllocator,
-                                                                  Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorUpdateTemplate( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorUpdateTemplate(
+      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplate( DescriptorUpdateTemplate            descriptorUpdateTemplate,
-                                                                  Optional<const AllocationCallbacks> allocator,
-                                                                  Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate            descriptorUpdateTemplate,
+                                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -6875,29 +6788,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDescriptorUpdateTemplate(
-      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DescriptorUpdateTemplate descriptorUpdateTemplate, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorUpdateTemplate( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorUpdateTemplate(
+      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( DescriptorUpdateTemplate            descriptorUpdateTemplate,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate            descriptorUpdateTemplate,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -6906,33 +6817,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDescriptorUpdateTemplate(
-      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplate( DescriptorSet            descriptorSet,
-                                                                  DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                  const void *             pData,
-                                                                  Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                                                  VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                  const void *                                   pData,
+                                                                  Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUpdateDescriptorSetWithTemplate( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkDescriptorSet>( descriptorSet ),
-                                         static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                         pData );
+    d.vkUpdateDescriptorSetWithTemplate(
+      m_device, static_cast<VkDescriptorSet>( descriptorSet ), static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), pData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplate( DescriptorSet            descriptorSet,
-                                                                  DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                  DataType const &         data,
-                                                                  Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                                                  VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                  DataType const &                               data,
+                                                                  Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -6947,51 +6854,143 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                                                DescriptorSetLayoutSupport *          pSupport,
-                                                                Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                                                      VULKAN_HPP_NAMESPACE::ExternalBufferProperties *               pExternalBufferProperties,
+                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetLayoutSupport( static_cast<VkDevice>( m_device ),
-                                       reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( pCreateInfo ),
-                                       reinterpret_cast<VkDescriptorSetLayoutSupport *>( pSupport ) );
+    d.vkGetPhysicalDeviceExternalBufferProperties( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( pExternalBufferInfo ),
+                                                   reinterpret_cast<VkExternalBufferProperties *>( pExternalBufferProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutSupport Device::getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+    PhysicalDevice::getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo,
+                                                 Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalBufferProperties &&
+                       "Function <vkGetPhysicalDeviceExternalBufferProperties> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::ExternalBufferProperties externalBufferProperties;
+    d.vkGetPhysicalDeviceExternalBufferProperties( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
+                                                   reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
+
+    return externalBufferProperties;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                                                     VULKAN_HPP_NAMESPACE::ExternalFenceProperties *               pExternalFenceProperties,
+                                                                     Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceExternalFenceProperties( m_physicalDevice,
+                                                  reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( pExternalFenceInfo ),
+                                                  reinterpret_cast<VkExternalFenceProperties *>( pExternalFenceProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+    PhysicalDevice::getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo,
+                                                Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalFenceProperties &&
+                       "Function <vkGetPhysicalDeviceExternalFenceProperties> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::ExternalFenceProperties externalFenceProperties;
+    d.vkGetPhysicalDeviceExternalFenceProperties( m_physicalDevice,
+                                                  reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
+                                                  reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
+
+    return externalFenceProperties;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    PhysicalDevice::getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                                    VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
+                                                    Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetPhysicalDeviceExternalSemaphoreProperties( m_physicalDevice,
+                                                      reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( pExternalSemaphoreInfo ),
+                                                      reinterpret_cast<VkExternalSemaphoreProperties *>( pExternalSemaphoreProperties ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+    PhysicalDevice::getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
+                                                    Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalSemaphoreProperties &&
+                       "Function <vkGetPhysicalDeviceExternalSemaphoreProperties> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties externalSemaphoreProperties;
+    d.vkGetPhysicalDeviceExternalSemaphoreProperties( m_physicalDevice,
+                                                      reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
+                                                      reinterpret_cast<VkExternalSemaphoreProperties *>( &externalSemaphoreProperties ) );
+
+    return externalSemaphoreProperties;
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                                                VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport *          pSupport,
+                                                                Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetDescriptorSetLayoutSupport(
+      m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( pCreateInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( pSupport ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                                         Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                           Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDescriptorSetLayoutSupport && "Function <vkGetDescriptorSetLayoutSupport> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 #  endif
 
-    DescriptorSetLayoutSupport support;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport support;
     d.vkGetDescriptorSetLayoutSupport(
       m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
 
     return support;
   }
 
-  // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                           Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDescriptorSetLayoutSupport && "Function <vkGetDescriptorSetLayoutSupport> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...>   structureChain;
-    DescriptorSetLayoutSupport & support = structureChain.template get<DescriptorSetLayoutSupport>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>   structureChain;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport & support = structureChain.template get<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>();
     d.vkGetDescriptorSetLayoutSupport(
       m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
 
@@ -6999,239 +6998,284 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateSamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSamplerYcbcrConversion( const SamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                                                                      const AllocationCallbacks *              pAllocator,
-                                                                                      SamplerYcbcrConversion *                 pYcbcrConversion,
-                                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  //=== VK_VERSION_1_2 ===
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                           VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                           VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                           VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                           uint32_t                         maxDrawCount,
+                                                           uint32_t                         stride,
+                                                           Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSamplerYcbcrConversion( static_cast<VkDevice>( m_device ),
-                                                                  reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( pCreateInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                  reinterpret_cast<VkSamplerYcbcrConversion *>( pYcbcrConversion ) ) );
+    d.vkCmdDrawIndirectCount( m_commandBuffer,
+                              static_cast<VkBuffer>( buffer ),
+                              static_cast<VkDeviceSize>( offset ),
+                              static_cast<VkBuffer>( countBuffer ),
+                              static_cast<VkDeviceSize>( countBufferOffset ),
+                              maxDrawCount,
+                              stride );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                  VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                  VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                  VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                  uint32_t                         maxDrawCount,
+                                                                  uint32_t                         stride,
+                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdDrawIndexedIndirectCount( m_commandBuffer,
+                                     static_cast<VkBuffer>( buffer ),
+                                     static_cast<VkDeviceSize>( offset ),
+                                     static_cast<VkBuffer>( countBuffer ),
+                                     static_cast<VkDeviceSize>( countBufferOffset ),
+                                     maxDrawCount,
+                                     stride );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 * pCreateInfo,
+                                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                           VULKAN_HPP_NAMESPACE::RenderPass *                  pRenderPass,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCreateRenderPass2( m_device,
+                                                       reinterpret_cast<const VkRenderPassCreateInfo2 *>( pCreateInfo ),
+                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
+                                                       reinterpret_cast<VkRenderPass *>( pRenderPass ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SamplerYcbcrConversion>::type Device::createSamplerYcbcrConversion(
-    const SamplerYcbcrConversionCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+                       Device::createRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &       createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                               Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateSamplerYcbcrConversion &&
-                       "Function <vkCreateSamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+    VULKAN_HPP_ASSERT( d.vkCreateRenderPass2 && "Function <vkCreateRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #  endif
 
-    SamplerYcbcrConversion ycbcrConversion;
-    Result                 result = static_cast<Result>( d.vkCreateSamplerYcbcrConversion( m_device,
-                                                                           reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversion" );
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass2( m_device,
+                             reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2" );
 
-    return detail::createResultValueType( result, std::move( ycbcrConversion ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( renderPass ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SamplerYcbcrConversion, Dispatch>>::type
-                       Device::createSamplerYcbcrConversionUnique( const SamplerYcbcrConversionCreateInfo & createInfo,
-                                                Optional<const AllocationCallbacks>      allocator,
-                                                Dispatch const &                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+                       Device::createRenderPass2Unique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &       createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateSamplerYcbcrConversion &&
-                       "Function <vkCreateSamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+    VULKAN_HPP_ASSERT( d.vkCreateRenderPass2 && "Function <vkCreateRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #    endif
 
-    SamplerYcbcrConversion ycbcrConversion;
-    Result                 result = static_cast<Result>( d.vkCreateSamplerYcbcrConversion( m_device,
-                                                                           reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionUnique" );
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass2( m_device,
+                             reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2Unique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<SamplerYcbcrConversion, Dispatch>( ycbcrConversion, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>( renderPass, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversion( SamplerYcbcrConversion      ycbcrConversion,
-                                                                const AllocationCallbacks * pAllocator,
-                                                                Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                                                          const VULKAN_HPP_NAMESPACE::SubpassBeginInfo *    pSubpassBeginInfo,
+                                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySamplerYcbcrConversion( static_cast<VkDevice>( m_device ),
-                                       static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkCmdBeginRenderPass2(
+      m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversion( SamplerYcbcrConversion              ycbcrConversion,
-                                                                Optional<const AllocationCallbacks> allocator,
-                                                                Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                          const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo,
+                                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroySamplerYcbcrConversion &&
-                       "Function <vkDestroySamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+    VULKAN_HPP_ASSERT( d.vkCmdBeginRenderPass2 && "Function <vkCmdBeginRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #  endif
 
-    d.vkDestroySamplerYcbcrConversion(
-      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkCmdBeginRenderPass2(
+      m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( &renderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( SamplerYcbcrConversion ycbcrConversion, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
+                                                      const VULKAN_HPP_NAMESPACE::SubpassEndInfo *   pSubpassEndInfo,
+                                                      Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySamplerYcbcrConversion( static_cast<VkDevice>( m_device ),
-                                       static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkCmdNextSubpass2(
+      m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySamplerYcbcrConversion, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( SamplerYcbcrConversion ycbcrConversion, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                                                      const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo,
+                                                      Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroySamplerYcbcrConversion &&
-                       "Function <vkDestroySamplerYcbcrConversion> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
+    VULKAN_HPP_ASSERT( d.vkCmdNextSubpass2 && "Function <vkCmdNextSubpass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #  endif
 
-    d.vkDestroySamplerYcbcrConversion(
-      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkCmdNextSubpass2(
+      m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  //=== VK_VERSION_1_2 ===
-
-  // wrapper function for command vkResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPool.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::resetQueryPool( QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
+                                                        Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkResetQueryPool( static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
-  }
-
-  // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreCounterValue( Semaphore        semaphore,
-                                                                                  uint64_t *       pValue,
-                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSemaphoreCounterValue( static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( semaphore ), pValue ) );
+    d.vkCmdEndRenderPass2( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Device::getSemaphoreCounterValue( Semaphore        semaphore,
-                                                                                                                    Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo,
+                                                        Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdEndRenderPass2 && "Function <vkCmdEndRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
+#  endif
+
+    d.vkCmdEndRenderPass2( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    Device::resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkResetQueryPool( m_device, static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreCounterValue( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
+                                                                                  uint64_t *                      pValue,
+                                                                                  Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkGetSemaphoreCounterValue( m_device, static_cast<VkSemaphore>( semaphore ), pValue ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Device::getSemaphoreCounterValue( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
+                                                                                                                    Dispatch const &                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSemaphoreCounterValue && "Function <vkGetSemaphoreCounterValue> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    uint64_t value;
-    Result   result = static_cast<Result>( d.vkGetSemaphoreCounterValue( m_device, static_cast<VkSemaphore>( semaphore ), &value ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreCounterValue" );
+    uint64_t                     value;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSemaphoreCounterValue( m_device, static_cast<VkSemaphore>( semaphore ), &value ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreCounterValue" );
 
-    return detail::createResultValueType( result, std::move( value ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const SemaphoreWaitInfo * pWaitInfo,
-                                                                        uint64_t                  timeout,
-                                                                        Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
+                                                                        uint64_t                                        timeout,
+                                                                        Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWaitSemaphores( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( pWaitInfo ), timeout ) );
+    return static_cast<Result>( d.vkWaitSemaphores( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( pWaitInfo ), timeout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const SemaphoreWaitInfo & waitInfo, uint64_t timeout, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+    Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo, uint64_t timeout, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkWaitSemaphores && "Function <vkWaitSemaphores> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkWaitSemaphores( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphores", { Result::eSuccess, Result::eTimeout } );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkWaitSemaphores( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphores", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphore( const SemaphoreSignalInfo * pSignalInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
+                                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSignalSemaphore( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreSignalInfo *>( pSignalInfo ) ) );
+    return static_cast<Result>( d.vkSignalSemaphore( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( pSignalInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::signalSemaphore( const SemaphoreSignalInfo & signalInfo, Dispatch const & d ) const
+                                          Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSignalSemaphore && "Function <vkSignalSemaphore> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkSignalSemaphore( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphore" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkSignalSemaphore( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphore" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddress( const BufferDeviceAddressInfo * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                                            Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<DeviceAddress>(
-      d.vkGetBufferDeviceAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
+    return static_cast<DeviceAddress>( d.vkGetBufferDeviceAddress( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddress( const BufferDeviceAddressInfo & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress Device::getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7241,24 +7285,22 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkDeviceAddress result = d.vkGetBufferDeviceAddress( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
 
-    return static_cast<DeviceAddress>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                                                    Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetBufferOpaqueCaptureAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) );
+    return d.vkGetBufferOpaqueCaptureAddress( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                                    Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7272,23 +7314,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
-                                                                    Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
+                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetDeviceMemoryOpaqueCaptureAddress( static_cast<VkDevice>( m_device ),
-                                                    reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( pInfo ) );
+    return d.vkGetDeviceMemoryOpaqueCaptureAddress( m_device, reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo & info,
-                                                                    Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info,
+                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7302,209 +7339,23 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDrawIndirectCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCount( Buffer           buffer,
-                                                           DeviceSize       offset,
-                                                           Buffer           countBuffer,
-                                                           DeviceSize       countBufferOffset,
-                                                           uint32_t         maxDrawCount,
-                                                           uint32_t         stride,
-                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndirectCount( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              static_cast<VkBuffer>( buffer ),
-                              static_cast<VkDeviceSize>( offset ),
-                              static_cast<VkBuffer>( countBuffer ),
-                              static_cast<VkDeviceSize>( countBufferOffset ),
-                              maxDrawCount,
-                              stride );
-  }
-
-  // wrapper function for command vkCmdDrawIndexedIndirectCount, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCount( Buffer           buffer,
-                                                                  DeviceSize       offset,
-                                                                  Buffer           countBuffer,
-                                                                  DeviceSize       countBufferOffset,
-                                                                  uint32_t         maxDrawCount,
-                                                                  uint32_t         stride,
-                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndexedIndirectCount( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                     static_cast<VkBuffer>( buffer ),
-                                     static_cast<VkDeviceSize>( offset ),
-                                     static_cast<VkBuffer>( countBuffer ),
-                                     static_cast<VkDeviceSize>( countBufferOffset ),
-                                     maxDrawCount,
-                                     stride );
-  }
-
-  // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass2( const RenderPassCreateInfo2 * pCreateInfo,
-                                                                           const AllocationCallbacks *   pAllocator,
-                                                                           RenderPass *                  pRenderPass,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateRenderPass2( static_cast<VkDevice>( m_device ),
-                                                       reinterpret_cast<const VkRenderPassCreateInfo2 *>( pCreateInfo ),
-                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                       reinterpret_cast<VkRenderPass *>( pRenderPass ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-    Device::createRenderPass2( const RenderPassCreateInfo2 & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateRenderPass2 && "Function <vkCreateRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
-#  endif
-
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass2( m_device,
-                                                                reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2" );
-
-    return detail::createResultValueType( result, std::move( renderPass ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-    Device::createRenderPass2Unique( const RenderPassCreateInfo2 & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateRenderPass2 && "Function <vkCreateRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
-#    endif
-
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass2( m_device,
-                                                                reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2Unique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<RenderPass, Dispatch>( renderPass, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const RenderPassBeginInfo * pRenderPassBegin,
-                                                          const SubpassBeginInfo *    pSubpassBeginInfo,
-                                                          Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginRenderPass2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                             reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ),
-                             reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const RenderPassBeginInfo & renderPassBegin,
-                                                          const SubpassBeginInfo &    subpassBeginInfo,
-                                                          Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBeginRenderPass2 && "Function <vkCmdBeginRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
-#  endif
-
-    d.vkCmdBeginRenderPass2(
-      m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( &renderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const SubpassBeginInfo * pSubpassBeginInfo,
-                                                      const SubpassEndInfo *   pSubpassEndInfo,
-                                                      Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdNextSubpass2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                         reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ),
-                         reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const SubpassBeginInfo & subpassBeginInfo,
-                                                      const SubpassEndInfo &   subpassEndInfo,
-                                                      Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdNextSubpass2 && "Function <vkCmdNextSubpass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
-#  endif
-
-    d.vkCmdNextSubpass2(
-      m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const SubpassEndInfo * pSubpassEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRenderPass2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const SubpassEndInfo & subpassEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdEndRenderPass2 && "Function <vkCmdEndRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
-#  endif
-
-    d.vkCmdEndRenderPass2( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
   //=== VK_VERSION_1_3 ===
 
-  // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getToolProperties( uint32_t *                     pToolCount,
-                                                                                   PhysicalDeviceToolProperties * pToolProperties,
-                                                                                   Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getToolProperties( uint32_t *                                           pToolCount,
+                                                                                   VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties * pToolProperties,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceToolProperties(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pToolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( pToolProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, pToolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( pToolProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-  template <typename PhysicalDeviceToolPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
-                       PhysicalDevice::getToolProperties( Dispatch const & d ) const
+  template <typename PhysicalDeviceToolPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    PhysicalDevice::getToolProperties( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7512,35 +7363,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceToolProperties> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties;
-    uint32_t                                                                         toolCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties;
+    uint32_t                                                                                               toolCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && toolCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
       {
         toolProperties.resize( toolCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
     VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
     if ( toolCount < toolProperties.size() )
     {
       toolProperties.resize( toolCount );
     }
-    return detail::createResultValueType( result, std::move( toolProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-  template <typename PhysicalDeviceToolPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+  template <
+    typename PhysicalDeviceToolPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
     PhysicalDevice::getToolProperties( PhysicalDeviceToolPropertiesAllocator & physicalDeviceToolPropertiesAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -7549,104 +7400,106 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceToolProperties> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties( physicalDeviceToolPropertiesAllocator );
-    uint32_t                                                                         toolCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties(
+      physicalDeviceToolPropertiesAllocator );
+    uint32_t                     toolCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && toolCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
       {
         toolProperties.resize( toolCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceToolProperties( m_physicalDevice, &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
     VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
     if ( toolCount < toolProperties.size() )
     {
       toolProperties.resize( toolCount );
     }
-    return detail::createResultValueType( result, std::move( toolProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPrivateDataSlot( const PrivateDataSlotCreateInfo * pCreateInfo,
-                                                                               const AllocationCallbacks *       pAllocator,
-                                                                               PrivateDataSlot *                 pPrivateDataSlot,
-                                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPrivateDataSlot( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo * pCreateInfo,
+                                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                               VULKAN_HPP_NAMESPACE::PrivateDataSlot *                 pPrivateDataSlot,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreatePrivateDataSlot( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreatePrivateDataSlot( m_device,
                                                            reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( pCreateInfo ),
                                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                            reinterpret_cast<VkPrivateDataSlot *>( pPrivateDataSlot ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PrivateDataSlot>::type
-    Device::createPrivateDataSlot( const PrivateDataSlotCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::type
+                       Device::createPrivateDataSlot( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &   createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePrivateDataSlot && "Function <vkCreatePrivateDataSlot> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #  endif
 
-    PrivateDataSlot privateDataSlot;
-    Result          result = static_cast<Result>( d.vkCreatePrivateDataSlot( m_device,
-                                                                    reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlot" );
+    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePrivateDataSlot( m_device,
+                                 reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlot" );
 
-    return detail::createResultValueType( result, std::move( privateDataSlot ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( privateDataSlot ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<PrivateDataSlot, Dispatch>>::type
-    Device::createPrivateDataSlotUnique( const PrivateDataSlotCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>>::type
+                       Device::createPrivateDataSlotUnique( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &   createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                         Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePrivateDataSlot && "Function <vkCreatePrivateDataSlot> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #    endif
 
-    PrivateDataSlot privateDataSlot;
-    Result          result = static_cast<Result>( d.vkCreatePrivateDataSlot( m_device,
-                                                                    reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotUnique" );
+    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreatePrivateDataSlot( m_device,
+                                 reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<PrivateDataSlot, Dispatch>( privateDataSlot, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>( privateDataSlot, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPrivateDataSlot( PrivateDataSlot privateDataSlot, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPrivateDataSlot(
-      static_cast<VkDevice>( m_device ), static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPrivateDataSlot( m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlot( PrivateDataSlot                     privateDataSlot,
-                                                         Optional<const AllocationCallbacks> allocator,
-                                                         Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot                     privateDataSlot,
+                                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                         Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7654,25 +7507,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyPrivateDataSlot(
-      m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkPrivateDataSlot>( privateDataSlot ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PrivateDataSlot privateDataSlot, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPrivateDataSlot(
-      static_cast<VkDevice>( m_device ), static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPrivateDataSlot( m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PrivateDataSlot privateDataSlot, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot                     privateDataSlot,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7680,54 +7534,62 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyPrivateDataSlot(
-      m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkPrivateDataSlot>( privateDataSlot ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setPrivateData(
-    ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t data, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                        uint64_t                              objectHandle,
+                                                                        VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                        uint64_t                              data,
+                                                                        Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSetPrivateData(
-      static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
+    return static_cast<Result>(
+      d.vkSetPrivateData( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
   }
 #else
-  // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::setPrivateData( ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t data, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                                 uint64_t                              objectHandle,
+                                                                                 VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                                 uint64_t                              data,
+                                                                                 Dispatch const &                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSetPrivateData && "Function <vkSetPrivateData> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkSetPrivateData( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateData" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateData" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getPrivateData(
-    ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                 uint64_t                              objectHandle,
+                                                 VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                 uint64_t *                            pData,
+                                                 Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPrivateData(
-      static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), pData );
+    d.vkGetPrivateData( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), pData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
-    Device::getPrivateData( ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                          uint64_t                              objectHandle,
+                                                                          VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                          Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -7741,365 +7603,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const DependencyInfo * pDependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                   const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                                                   Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPipelineBarrier2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
+    d.vkCmdSetEvent2( m_commandBuffer, static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const DependencyInfo & dependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPipelineBarrier2 && "Function <vkCmdPipelineBarrier2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
-#  endif
-
-    d.vkCmdPipelineBarrier2( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdWriteTimestamp2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::writeTimestamp2( PipelineStageFlags2 stage, QueryPool queryPool, uint32_t query, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteTimestamp2(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
-  }
-
-  // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Queue::submit2( uint32_t submitCount, const SubmitInfo2 * pSubmits, Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkQueueSubmit2( static_cast<VkQueue>( m_queue ), submitCount, reinterpret_cast<const VkSubmitInfo2 *>( pSubmits ), static_cast<VkFence>( fence ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Queue::submit2( ArrayProxy<const SubmitInfo2> const & submits, Fence fence, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkQueueSubmit2 && "Function <vkQueueSubmit2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
-#  endif
-
-    Result result = static_cast<Result>(
-      d.vkQueueSubmit2( m_queue, submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const CopyBufferInfo2 * pCopyBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferInfo2 *>( pCopyBufferInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const CopyBufferInfo2 & copyBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyBuffer2 && "Function <vkCmdCopyBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-#  endif
-
-    d.vkCmdCopyBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const CopyImageInfo2 * pCopyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageInfo2 *>( pCopyImageInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const CopyImageInfo2 & copyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyImage2 && "Function <vkCmdCopyImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-#  endif
-
-    d.vkCmdCopyImage2( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
-                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBufferToImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferToImageInfo2 *>( pCopyBufferToImageInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const CopyBufferToImageInfo2 & copyBufferToImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyBufferToImage2 && "Function <vkCmdCopyBufferToImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-#  endif
-
-    d.vkCmdCopyBufferToImage2( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
-                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImageToBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageToBufferInfo2 *>( pCopyImageToBufferInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const CopyImageToBufferInfo2 & copyImageToBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyImageToBuffer2 && "Function <vkCmdCopyImageToBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-#  endif
-
-    d.vkCmdCopyImageToBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements( const DeviceBufferMemoryRequirements * pInfo,
-                                                              MemoryRequirements2 *                  pMemoryRequirements,
-                                                              Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceBufferMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                           reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( pInfo ),
-                                           reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info,
-                                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceBufferMemoryRequirements &&
-                       "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetDeviceBufferMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info,
-                                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceBufferMemoryRequirements &&
-                       "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetDeviceBufferMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements( const DeviceImageMemoryRequirements * pInfo,
-                                                             MemoryRequirements2 *                 pMemoryRequirements,
-                                                             Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceImageMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                          reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ),
-                                          reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getImageMemoryRequirements( const DeviceImageMemoryRequirements & info,
-                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageMemoryRequirements &&
-                       "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetDeviceImageMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageMemoryRequirements( const DeviceImageMemoryRequirements & info,
-                                                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageMemoryRequirements &&
-                       "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetDeviceImageMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements * pInfo,
-                                                                   uint32_t *                            pSparseMemoryRequirementCount,
-                                                                   SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
-                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceImageSparseMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ),
-                                                pSparseMemoryRequirementCount,
-                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSparseMemoryRequirements &&
-                       "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
-    uint32_t                                                                             sparseMemoryRequirementCount;
-    d.vkGetDeviceImageSparseMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
-    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    d.vkGetDeviceImageSparseMemoryRequirements( m_device,
-                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
-                                                &sparseMemoryRequirementCount,
-                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
-
-    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
-    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
-    {
-      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    }
-    return sparseMemoryRequirements;
-  }
-
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements &     info,
-                                              SparseImageMemoryRequirements2Allocator & sparseImageMemoryRequirements2Allocator,
-                                              Dispatch const &                          d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSparseMemoryRequirements &&
-                       "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-#  endif
-
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( sparseImageMemoryRequirements2Allocator );
-    uint32_t                                                                             sparseMemoryRequirementCount;
-    d.vkGetDeviceImageSparseMemoryRequirements(
-      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
-    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    d.vkGetDeviceImageSparseMemoryRequirements( m_device,
-                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
-                                                &sparseMemoryRequirementCount,
-                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
-
-    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
-    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
-    {
-      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-    }
-    return sparseMemoryRequirements;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setEvent2( Event event, const DependencyInfo * pDependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetEvent2(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setEvent2( Event event, const DependencyInfo & dependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                   const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                                                   Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8110,34 +7627,31 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdResetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resetEvent2( Event event, PipelineStageFlags2 stageMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resetEvent2( VULKAN_HPP_NAMESPACE::Event               event,
+                                                     VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask,
+                                                     Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResetEvent2( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
+    d.vkCmdResetEvent2( m_commandBuffer, static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
   }
 
-  // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( uint32_t               eventCount,
-                                                     const Event *          pEvents,
-                                                     const DependencyInfo * pDependencyInfos,
-                                                     Dispatch const &       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( uint32_t                                     eventCount,
+                                                     const VULKAN_HPP_NAMESPACE::Event *          pEvents,
+                                                     const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfos,
+                                                     Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWaitEvents2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                        eventCount,
-                        reinterpret_cast<const VkEvent *>( pEvents ),
-                        reinterpret_cast<const VkDependencyInfo *>( pDependencyInfos ) );
+    d.vkCmdWaitEvents2(
+      m_commandBuffer, eventCount, reinterpret_cast<const VkEvent *>( pEvents ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfos ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( ArrayProxy<const Event> const &          events,
-                                                     ArrayProxy<const DependencyInfo> const & dependencyInfos,
-                                                     Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos,
+                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8159,18 +7673,162 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const BlitImageInfo2 * pBlitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                                                          Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBlitImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkBlitImageInfo2 *>( pBlitImageInfo ) );
+    d.vkCmdPipelineBarrier2( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const BlitImageInfo2 & blitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                                                          Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdPipelineBarrier2 && "Function <vkCmdPipelineBarrier2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
+#  endif
+
+    d.vkCmdPipelineBarrier2( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                         VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                                         uint32_t                                  query,
+                                                         Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdWriteTimestamp2( m_commandBuffer, static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::submit2( uint32_t                                  submitCount,
+                                                                const VULKAN_HPP_NAMESPACE::SubmitInfo2 * pSubmits,
+                                                                VULKAN_HPP_NAMESPACE::Fence               fence,
+                                                                Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkQueueSubmit2( m_queue, submitCount, reinterpret_cast<const VkSubmitInfo2 *>( pSubmits ), static_cast<VkFence>( fence ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit2(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits, VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkQueueSubmit2 && "Function <vkQueueSubmit2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkQueueSubmit2( m_queue, submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 * pCopyBufferInfo,
+                                                     Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( pCopyBufferInfo ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo,
+                                                     Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyBuffer2 && "Function <vkCmdCopyBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+#  endif
+
+    d.vkCmdCopyBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyImage2( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( pCopyImageInfo ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyImage2 && "Function <vkCmdCopyImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+#  endif
+
+    d.vkCmdCopyImage2( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyBufferToImage2( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( pCopyBufferToImageInfo ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyBufferToImage2 && "Function <vkCmdCopyBufferToImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+#  endif
+
+    d.vkCmdCopyBufferToImage2( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdCopyImageToBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( pCopyImageToBufferInfo ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCmdCopyImageToBuffer2 && "Function <vkCmdCopyImageToBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+#  endif
+
+    d.vkCmdCopyImageToBuffer2( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdBlitImage2( m_commandBuffer, reinterpret_cast<const VkBlitImageInfo2 *>( pBlitImageInfo ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8181,18 +7839,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const ResolveImageInfo2 * pResolveImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
+                                                       Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResolveImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkResolveImageInfo2 *>( pResolveImageInfo ) );
+    d.vkCmdResolveImage2( m_commandBuffer, reinterpret_cast<const VkResolveImageInfo2 *>( pResolveImageInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const ResolveImageInfo2 & resolveImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo,
+                                                       Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8203,18 +7861,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const RenderingInfo * pRenderingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                                                        Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginRendering( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ) );
+    d.vkCmdBeginRendering( m_commandBuffer, reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const RenderingInfo & renderingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo,
+                                                        Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8225,51 +7883,48 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRendering( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRendering( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdEndRendering( m_commandBuffer );
   }
 
-  // wrapper function for command vkCmdSetCullMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullMode.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCullMode( CullModeFlags cullMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCullMode( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCullMode( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCullModeFlags>( cullMode ) );
+    d.vkCmdSetCullMode( m_commandBuffer, static_cast<VkCullModeFlags>( cullMode ) );
   }
 
-  // wrapper function for command vkCmdSetFrontFace, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFace.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setFrontFace( FrontFace frontFace, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setFrontFace( VULKAN_HPP_NAMESPACE::FrontFace frontFace, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetFrontFace( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkFrontFace>( frontFace ) );
+    d.vkCmdSetFrontFace( m_commandBuffer, static_cast<VkFrontFace>( frontFace ) );
   }
 
-  // wrapper function for command vkCmdSetPrimitiveTopology, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopology.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopology( PrimitiveTopology primitiveTopology, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopology( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology,
+                                                              Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPrimitiveTopology( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPrimitiveTopology>( primitiveTopology ) );
+    d.vkCmdSetPrimitiveTopology( m_commandBuffer, static_cast<VkPrimitiveTopology>( primitiveTopology ) );
   }
 
-  // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setViewportWithCount( uint32_t viewportCount, const Viewport * pViewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCount( uint32_t                               viewportCount,
+                                                              const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                                                              Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewportWithCount( static_cast<VkCommandBuffer>( m_commandBuffer ), viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
+    d.vkCmdSetViewportWithCount( m_commandBuffer, viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCount( ArrayProxy<const Viewport> const & viewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
+                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8281,18 +7936,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCount( uint32_t scissorCount, const Rect2D * pScissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setScissorWithCount( uint32_t scissorCount, const VULKAN_HPP_NAMESPACE::Rect2D * pScissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetScissorWithCount( static_cast<VkCommandBuffer>( m_commandBuffer ), scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
+    d.vkCmdSetScissorWithCount( m_commandBuffer, scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCount( ArrayProxy<const Rect2D> const & scissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
+                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8304,18 +7959,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t           firstBinding,
-                                                            uint32_t           bindingCount,
-                                                            const Buffer *     pBuffers,
-                                                            const DeviceSize * pOffsets,
-                                                            const DeviceSize * pSizes,
-                                                            const DeviceSize * pStrides,
-                                                            Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                                 firstBinding,
+                                                            uint32_t                                 bindingCount,
+                                                            const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                                            const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                                            const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                                                            const VULKAN_HPP_NAMESPACE::DeviceSize * pStrides,
+                                                            Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindVertexBuffers2( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBindVertexBuffers2( m_commandBuffer,
                                firstBinding,
                                bindingCount,
                                reinterpret_cast<const VkBuffer *>( pBuffers ),
@@ -8325,14 +7979,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                             firstBinding,
-                                                            ArrayProxy<const Buffer> const &     buffers,
-                                                            ArrayProxy<const DeviceSize> const & offsets,
-                                                            ArrayProxy<const DeviceSize> const & sizes,
-                                                            ArrayProxy<const DeviceSize> const & strides,
-                                                            Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                                                                         firstBinding,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides,
+                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -8368,54 +8021,52 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDepthTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnable( Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthTestEnable ) );
+    d.vkCmdSetDepthTestEnable( m_commandBuffer, static_cast<VkBool32>( depthTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthWriteEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnable( Bool32 depthWriteEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthWriteEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthWriteEnable ) );
+    d.vkCmdSetDepthWriteEnable( m_commandBuffer, static_cast<VkBool32>( depthWriteEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthCompareOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOp.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOp( CompareOp depthCompareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOp( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthCompareOp( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCompareOp>( depthCompareOp ) );
+    d.vkCmdSetDepthCompareOp( m_commandBuffer, static_cast<VkCompareOp>( depthCompareOp ) );
   }
 
-  // wrapper function for command vkCmdSetDepthBoundsTestEnable, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnable( Bool32 depthBoundsTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable,
+                                                                  Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBoundsTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBoundsTestEnable ) );
+    d.vkCmdSetDepthBoundsTestEnable( m_commandBuffer, static_cast<VkBool32>( depthBoundsTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetStencilTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnable( Bool32 stencilTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnable( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stencilTestEnable ) );
+    d.vkCmdSetStencilTestEnable( m_commandBuffer, static_cast<VkBool32>( stencilTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetStencilOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOp.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilOp(
-    StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setStencilOp( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                                      VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                                                      VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                                                      VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                                                      VULKAN_HPP_NAMESPACE::CompareOp        compareOp,
+                                                      Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilOp( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdSetStencilOp( m_commandBuffer,
                          static_cast<VkStencilFaceFlags>( faceMask ),
                          static_cast<VkStencilOp>( failOp ),
                          static_cast<VkStencilOp>( passOp ),
@@ -8423,1179 +8074,750 @@ namespace VULKAN_HPP_NAMESPACE
                          static_cast<VkCompareOp>( compareOp ) );
   }
 
-  // wrapper function for command vkCmdSetRasterizerDiscardEnable, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnable( Bool32 rasterizerDiscardEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnable( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable,
+                                                                    Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRasterizerDiscardEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( rasterizerDiscardEnable ) );
+    d.vkCmdSetRasterizerDiscardEnable( m_commandBuffer, static_cast<VkBool32>( rasterizerDiscardEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthBiasEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnable( Bool32 depthBiasEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBiasEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBiasEnable ) );
+    d.vkCmdSetDepthBiasEnable( m_commandBuffer, static_cast<VkBool32>( depthBiasEnable ) );
   }
 
-  // wrapper function for command vkCmdSetPrimitiveRestartEnable, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnable.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnable( Bool32 primitiveRestartEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnable( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable,
+                                                                   Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPrimitiveRestartEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( primitiveRestartEnable ) );
+    d.vkCmdSetPrimitiveRestartEnable( m_commandBuffer, static_cast<VkBool32>( primitiveRestartEnable ) );
   }
 
-  //=== VK_VERSION_1_4 ===
-
-  // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory2( const MemoryMapInfo * pMemoryMapInfo,
-                                                                    void **               ppData,
-                                                                    Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements * pInfo,
+                                                              VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                  pMemoryRequirements,
+                                                              Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkMapMemory2( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryMapInfo *>( pMemoryMapInfo ), ppData ) );
+    d.vkGetDeviceBufferMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type Device::mapMemory2( const MemoryMapInfo & memoryMapInfo,
-                                                                                                    Dispatch const &      d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkMapMemory2 && "Function <vkMapMemory2> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceBufferMemoryRequirements &&
+                       "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    void * pData;
-    Result result = static_cast<Result>( d.vkMapMemory2( m_device, reinterpret_cast<const VkMemoryMapInfo *>( &memoryMapInfo ), &pData ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory2" );
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+    d.vkGetDeviceBufferMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
-    return detail::createResultValueType( result, std::move( pData ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::unmapMemory2( const MemoryUnmapInfo * pMemoryUnmapInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkUnmapMemory2( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryUnmapInfo *>( pMemoryUnmapInfo ) ) );
+    return memoryRequirements;
   }
 
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::unmapMemory2( const MemoryUnmapInfo & memoryUnmapInfo,
-                                                                                                                       Dispatch const &        d ) const
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkUnmapMemory2 && "Function <vkUnmapMemory2> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceBufferMemoryRequirements &&
+                       "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkUnmapMemory2( m_device, reinterpret_cast<const VkMemoryUnmapInfo *>( &memoryUnmapInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::unmapMemory2" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getImageSubresourceLayout( const DeviceImageSubresourceInfo * pInfo, SubresourceLayout2 * pLayout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceImageSubresourceLayout(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceImageSubresourceInfo *>( pInfo ), reinterpret_cast<VkSubresourceLayout2 *>( pLayout ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Device::getImageSubresourceLayout( const DeviceImageSubresourceInfo & info,
-                                                                                               Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayout &&
-                       "Function <vkGetDeviceImageSubresourceLayout> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-#  endif
-
-    SubresourceLayout2 layout;
-    d.vkGetDeviceImageSubresourceLayout(
-      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ), reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
-
-    return layout;
-  }
-
-  // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageSubresourceLayout( const DeviceImageSubresourceInfo & info,
-                                                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayout &&
-                       "Function <vkGetDeviceImageSubresourceLayout> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
-    d.vkGetDeviceImageSubresourceLayout(
-      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ), reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+    d.vkGetDeviceBufferMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageSubresourceLayout2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout2( Image                     image,
-                                                             const ImageSubresource2 * pSubresource,
-                                                             SubresourceLayout2 *      pLayout,
-                                                             Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                                             VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                                             Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSubresourceLayout2( static_cast<VkDevice>( m_device ),
-                                    static_cast<VkImage>( image ),
-                                    reinterpret_cast<const VkImageSubresource2 *>( pSubresource ),
-                                    reinterpret_cast<VkSubresourceLayout2 *>( pLayout ) );
+    d.vkGetDeviceImageMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSubresourceLayout2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Device::getImageSubresourceLayout2( Image                     image,
-                                                                                                const ImageSubresource2 & subresource,
-                                                                                                Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT(
-      d.vkGetImageSubresourceLayout2 &&
-      "Function <vkGetImageSubresourceLayout2> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageMemoryRequirements &&
+                       "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    SubresourceLayout2 layout;
-    d.vkGetImageSubresourceLayout2( m_device,
-                                    static_cast<VkImage>( image ),
-                                    reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                    reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+    d.vkGetDeviceImageMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
-    return layout;
+    return memoryRequirements;
   }
 
-  // wrapper function for command vkGetImageSubresourceLayout2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getImageSubresourceLayout2( Image image, const ImageSubresource2 & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT(
-      d.vkGetImageSubresourceLayout2 &&
-      "Function <vkGetImageSubresourceLayout2> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageMemoryRequirements &&
+                       "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
-    d.vkGetImageSubresourceLayout2( m_device,
-                                    static_cast<VkImage>( image ),
-                                    reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                    reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+    d.vkGetDeviceImageMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToImage( const CopyMemoryToImageInfo * pCopyMemoryToImageInfo,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                                                   uint32_t *                                                  pSparseMemoryRequirementCount,
+                                                                   VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
+                                                                   Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkCopyMemoryToImage( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyMemoryToImageInfo *>( pCopyMemoryToImageInfo ) ) );
+    d.vkGetDeviceImageSparseMemoryRequirements( m_device,
+                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ),
+                                                pSparseMemoryRequirementCount,
+                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyMemoryToImage( const CopyMemoryToImageInfo & copyMemoryToImageInfo, Dispatch const & d ) const
+  template <typename SparseImageMemoryRequirements2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+    Device::getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyMemoryToImage && "Function <vkCopyMemoryToImage> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSparseMemoryRequirements &&
+                       "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyMemoryToImage( m_device, reinterpret_cast<const VkCopyMemoryToImageInfo *>( &copyMemoryToImageInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToImage" );
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
+    uint32_t                                                                                                   sparseMemoryRequirementCount;
+    d.vkGetDeviceImageSparseMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
+    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    d.vkGetDeviceImageSparseMemoryRequirements( m_device,
+                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
+                                                &sparseMemoryRequirementCount,
+                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
 
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToMemory( const CopyImageToMemoryInfo * pCopyImageToMemoryInfo,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkCopyImageToMemory( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToMemoryInfo *>( pCopyImageToMemoryInfo ) ) );
+    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
+    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
+    {
+      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    }
+    return sparseMemoryRequirements;
   }
 
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyImageToMemory( const CopyImageToMemoryInfo & copyImageToMemoryInfo, Dispatch const & d ) const
+  template <typename SparseImageMemoryRequirements2Allocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                                         Device::getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                              SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
+                                              Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyImageToMemory && "Function <vkCopyImageToMemory> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSparseMemoryRequirements &&
+                       "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyImageToMemory( m_device, reinterpret_cast<const VkCopyImageToMemoryInfo *>( &copyImageToMemoryInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToMemory" );
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
+      sparseImageMemoryRequirements2Allocator );
+    uint32_t sparseMemoryRequirementCount;
+    d.vkGetDeviceImageSparseMemoryRequirements(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
+    sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    d.vkGetDeviceImageSparseMemoryRequirements( m_device,
+                                                reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
+                                                &sparseMemoryRequirementCount,
+                                                reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
 
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToImage( const CopyImageToImageInfo * pCopyImageToImageInfo,
-                                                                          Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkCopyImageToImage( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToImageInfo *>( pCopyImageToImageInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyImageToImage( const CopyImageToImageInfo & copyImageToImageInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyImageToImage && "Function <vkCopyImageToImage> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkCopyImageToImage( m_device, reinterpret_cast<const VkCopyImageToImageInfo *>( &copyImageToImageInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToImage" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::transitionImageLayout( uint32_t                              transitionCount,
-                                                                               const HostImageLayoutTransitionInfo * pTransitions,
-                                                                               Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkTransitionImageLayout(
-      static_cast<VkDevice>( m_device ), transitionCount, reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( pTransitions ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::transitionImageLayout( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkTransitionImageLayout && "Function <vkTransitionImageLayout> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-#  endif
-
-    Result result = static_cast<Result>(
-      d.vkTransitionImageLayout( m_device, transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( transitions.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::transitionImageLayout" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet( PipelineBindPoint          pipelineBindPoint,
-                                                           PipelineLayout             layout,
-                                                           uint32_t                   set,
-                                                           uint32_t                   descriptorWriteCount,
-                                                           const WriteDescriptorSet * pDescriptorWrites,
-                                                           Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSet( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
-                              static_cast<VkPipelineLayout>( layout ),
-                              set,
-                              descriptorWriteCount,
-                              reinterpret_cast<const VkWriteDescriptorSet *>( pDescriptorWrites ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet( PipelineBindPoint                            pipelineBindPoint,
-                                                           PipelineLayout                               layout,
-                                                           uint32_t                                     set,
-                                                           ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                                                           Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSet && "Function <vkCmdPushDescriptorSet> requires <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdPushDescriptorSet( m_commandBuffer,
-                              static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
-                              static_cast<VkPipelineLayout>( layout ),
-                              set,
-                              descriptorWrites.size(),
-                              reinterpret_cast<const VkWriteDescriptorSet *>( descriptorWrites.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate(
-    DescriptorUpdateTemplate descriptorUpdateTemplate, PipelineLayout layout, uint32_t set, const void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSetWithTemplate( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                          static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                          static_cast<VkPipelineLayout>( layout ),
-                                          set,
-                                          pData );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                       PipelineLayout           layout,
-                                                                       uint32_t                 set,
-                                                                       DataType const &         data,
-                                                                       Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT(
-      d.vkCmdPushDescriptorSetWithTemplate &&
-      "Function <vkCmdPushDescriptorSetWithTemplate> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdPushDescriptorSetWithTemplate( m_commandBuffer,
-                                          static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                          static_cast<VkPipelineLayout>( layout ),
-                                          set,
-                                          reinterpret_cast<const void *>( &data ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2( const BindDescriptorSetsInfo * pBindDescriptorSetsInfo,
-                                                             Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindDescriptorSets2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                reinterpret_cast<const VkBindDescriptorSetsInfo *>( pBindDescriptorSetsInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2( const BindDescriptorSetsInfo & bindDescriptorSetsInfo,
-                                                             Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBindDescriptorSets2 && "Function <vkCmdBindDescriptorSets2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdBindDescriptorSets2( m_commandBuffer, reinterpret_cast<const VkBindDescriptorSetsInfo *>( &bindDescriptorSetsInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2( const PushConstantsInfo * pPushConstantsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushConstants2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPushConstantsInfo *>( pPushConstantsInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2( const PushConstantsInfo & pushConstantsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushConstants2 && "Function <vkCmdPushConstants2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdPushConstants2( m_commandBuffer, reinterpret_cast<const VkPushConstantsInfo *>( &pushConstantsInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2( const PushDescriptorSetInfo * pPushDescriptorSetInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSet2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPushDescriptorSetInfo *>( pPushDescriptorSetInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2( const PushDescriptorSetInfo & pushDescriptorSetInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSet2 && "Function <vkCmdPushDescriptorSet2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdPushDescriptorSet2( m_commandBuffer, reinterpret_cast<const VkPushDescriptorSetInfo *>( &pushDescriptorSetInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo,
-                                                                        Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSetWithTemplate2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                           reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( pPushDescriptorSetWithTemplateInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo,
-                                                                        Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetWithTemplate2 &&
-                       "Function <vkCmdPushDescriptorSetWithTemplate2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdPushDescriptorSetWithTemplate2( m_commandBuffer,
-                                           reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( &pushDescriptorSetWithTemplateInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetLineStipple, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStipple.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLineStipple( uint32_t lineStippleFactor, uint16_t lineStipplePattern, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineStipple( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
-  }
-
-  // wrapper function for command vkCmdBindIndexBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::bindIndexBuffer2( Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindIndexBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                             static_cast<VkBuffer>( buffer ),
-                             static_cast<VkDeviceSize>( offset ),
-                             static_cast<VkDeviceSize>( size ),
-                             static_cast<VkIndexType>( indexType ) );
-  }
-
-  // wrapper function for command vkGetRenderingAreaGranularity, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getRenderingAreaGranularity( const RenderingAreaInfo * pRenderingAreaInfo, Extent2D * pGranularity, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetRenderingAreaGranularity(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkRenderingAreaInfo *>( pRenderingAreaInfo ), reinterpret_cast<VkExtent2D *>( pGranularity ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRenderingAreaGranularity, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D Device::getRenderingAreaGranularity( const RenderingAreaInfo & renderingAreaInfo,
-                                                                                       Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetRenderingAreaGranularity && "Function <vkGetRenderingAreaGranularity> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-#  endif
-
-    Extent2D granularity;
-    d.vkGetRenderingAreaGranularity(
-      m_device, reinterpret_cast<const VkRenderingAreaInfo *>( &renderingAreaInfo ), reinterpret_cast<VkExtent2D *>( &granularity ) );
-
-    return granularity;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo * pLocationInfo,
-                                                                         Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRenderingAttachmentLocations( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                            reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( pLocationInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo & locationInfo,
-                                                                         Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdSetRenderingAttachmentLocations &&
-                       "Function <vkCmdSetRenderingAttachmentLocations> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdSetRenderingAttachmentLocations( m_commandBuffer, reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( &locationInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo,
-                                                                            Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRenderingInputAttachmentIndices( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( pInputAttachmentIndexInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo,
-                                                                            Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdSetRenderingInputAttachmentIndices &&
-                       "Function <vkCmdSetRenderingInputAttachmentIndices> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
-#  endif
-
-    d.vkCmdSetRenderingInputAttachmentIndices( m_commandBuffer, reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( &inputAttachmentIndexInfo ) );
+    VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
+    if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
+    {
+      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+    }
+    return sparseMemoryRequirements;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_surface ===
 
-  // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroySurfaceKHR( SurfaceKHR surface, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroySurfaceKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySurfaceKHR(
-      static_cast<VkInstance>( m_instance ), static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySurfaceKHR( m_instance, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Instance::destroySurfaceKHR( SurfaceKHR surface, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroySurfaceKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                          surface,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySurfaceKHR && "Function <vkDestroySurfaceKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    d.vkDestroySurfaceKHR( m_instance, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySurfaceKHR( m_instance,
+                           static_cast<VkSurfaceKHR>( surface ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroy( SurfaceKHR surface, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySurfaceKHR(
-      static_cast<VkInstance>( m_instance ), static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySurfaceKHR( m_instance, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroy( SurfaceKHR surface, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                          surface,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySurfaceKHR && "Function <vkDestroySurfaceKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    d.vkDestroySurfaceKHR( m_instance, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySurfaceKHR( m_instance,
+                           static_cast<VkSurfaceKHR>( surface ),
+                           reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getSurfaceSupportKHR( uint32_t queueFamilyIndex, SurfaceKHR surface, Bool32 * pSupported, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceSupportKHR( uint32_t                         queueFamilyIndex,
+                                                                                      VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                                                                      VULKAN_HPP_NAMESPACE::Bool32 *   pSupported,
+                                                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceSupportKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkBool32 *>( pSupported ) ) );
+      m_physicalDevice, queueFamilyIndex, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkBool32 *>( pSupported ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Bool32>::type
-                       PhysicalDevice::getSurfaceSupportKHR( uint32_t queueFamilyIndex, SurfaceKHR surface, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Bool32>::type
+                       PhysicalDevice::getSurfaceSupportKHR( uint32_t queueFamilyIndex, VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfaceSupportKHR && "Function <vkGetPhysicalDeviceSurfaceSupportKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    Bool32 supported;
-    Result result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceSupportKHR(
+    VULKAN_HPP_NAMESPACE::Bool32 supported;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceSupportKHR(
       m_physicalDevice, queueFamilyIndex, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkBool32 *>( &supported ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceSupportKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceSupportKHR" );
 
-    return detail::createResultValueType( result, std::move( supported ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( supported ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilitiesKHR( SurfaceKHR               surface,
-                                                                                           SurfaceCapabilitiesKHR * pSurfaceCapabilities,
-                                                                                           Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR               surface,
+                                                                                           VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR * pSurfaceCapabilities,
+                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                             static_cast<VkSurfaceKHR>( surface ),
-                                                                             reinterpret_cast<VkSurfaceCapabilitiesKHR *>( pSurfaceCapabilities ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
+      m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkSurfaceCapabilitiesKHR *>( pSurfaceCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilitiesKHR>::type
-                       PhysicalDevice::getSurfaceCapabilitiesKHR( SurfaceKHR surface, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR>::type
+                       PhysicalDevice::getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfaceCapabilitiesKHR && "Function <vkGetPhysicalDeviceSurfaceCapabilitiesKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    SurfaceCapabilitiesKHR surfaceCapabilities;
-    Result                 result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
+    VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR surfaceCapabilities;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
       m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkSurfaceCapabilitiesKHR *>( &surfaceCapabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilitiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilitiesKHR" );
 
-    return detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormatsKHR( SurfaceKHR         surface,
-                                                                                      uint32_t *         pSurfaceFormatCount,
-                                                                                      SurfaceFormatKHR * pSurfaceFormats,
-                                                                                      Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR         surface,
+                                                                                      uint32_t *                               pSurfaceFormatCount,
+                                                                                      VULKAN_HPP_NAMESPACE::SurfaceFormatKHR * pSurfaceFormats,
+                                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                        static_cast<VkSurfaceKHR>( surface ),
-                                                                        pSurfaceFormatCount,
-                                                                        reinterpret_cast<VkSurfaceFormatKHR *>( pSurfaceFormats ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR(
+      m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), pSurfaceFormatCount, reinterpret_cast<VkSurfaceFormatKHR *>( pSurfaceFormats ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-  template <typename SurfaceFormatKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, SurfaceFormatKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
-                       PhysicalDevice::getSurfaceFormatsKHR( SurfaceKHR surface, Dispatch const & d ) const
+  template <typename SurfaceFormatKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
+                       PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfaceFormatsKHR && "Function <vkGetPhysicalDeviceSurfaceFormatsKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator> surfaceFormats;
-    uint32_t                                                 surfaceFormatCount;
-    Result                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator> surfaceFormats;
+    uint32_t                                                                       surfaceFormatCount;
+    VULKAN_HPP_NAMESPACE::Result                                                   result;
     do
     {
-      result =
-        static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDeviceSurfaceFormatsKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         surfaceFormats.resize( surfaceFormatCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR(
           m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, reinterpret_cast<VkSurfaceFormatKHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
       surfaceFormats.resize( surfaceFormatCount );
     }
-    return detail::createResultValueType( result, std::move( surfaceFormats ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
   template <typename SurfaceFormatKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, SurfaceFormatKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
-    PhysicalDevice::getSurfaceFormatsKHR( SurfaceKHR surface, SurfaceFormatKHRAllocator & surfaceFormatKHRAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
+                       PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                          SurfaceFormatKHRAllocator &      surfaceFormatKHRAllocator,
+                                          Dispatch const &                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfaceFormatsKHR && "Function <vkGetPhysicalDeviceSurfaceFormatsKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator> surfaceFormats( surfaceFormatKHRAllocator );
-    uint32_t                                                 surfaceFormatCount;
-    Result                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator> surfaceFormats( surfaceFormatKHRAllocator );
+    uint32_t                                                                       surfaceFormatCount;
+    VULKAN_HPP_NAMESPACE::Result                                                   result;
     do
     {
-      result =
-        static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDeviceSurfaceFormatsKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         surfaceFormats.resize( surfaceFormatCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormatsKHR(
           m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, reinterpret_cast<VkSurfaceFormatKHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
       surfaceFormats.resize( surfaceFormatCount );
     }
-    return detail::createResultValueType( result, std::move( surfaceFormats ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfacePresentModesKHR( SurfaceKHR       surface,
-                                                                                           uint32_t *       pPresentModeCount,
-                                                                                           PresentModeKHR * pPresentModes,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR       surface,
+                                                                                           uint32_t *                             pPresentModeCount,
+                                                                                           VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes,
+                                                                                           Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                             static_cast<VkSurfaceKHR>( surface ),
-                                                                             pPresentModeCount,
-                                                                             reinterpret_cast<VkPresentModeKHR *>( pPresentModes ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR(
+      m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), pPresentModeCount, reinterpret_cast<VkPresentModeKHR *>( pPresentModes ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-  template <typename PresentModeKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-                       PhysicalDevice::getSurfacePresentModesKHR( SurfaceKHR surface, Dispatch const & d ) const
+  template <typename PresentModeKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+                       PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfacePresentModesKHR && "Function <vkGetPhysicalDeviceSurfacePresentModesKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    std::vector<PresentModeKHR, PresentModeKHRAllocator> presentModes;
-    uint32_t                                             presentModeCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator> presentModes;
+    uint32_t                                                                   presentModeCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetPhysicalDeviceSurfacePresentModesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &presentModeCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentModeCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
       {
         presentModes.resize( presentModeCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR(
           m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &presentModeCount, reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
     VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
     if ( presentModeCount < presentModes.size() )
     {
       presentModes.resize( presentModeCount );
     }
-    return detail::createResultValueType( result, std::move( presentModes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
   template <typename PresentModeKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-    PhysicalDevice::getSurfacePresentModesKHR( SurfaceKHR surface, PresentModeKHRAllocator & presentModeKHRAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PresentModeKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+                       PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                               PresentModeKHRAllocator &        presentModeKHRAllocator,
+                                               Dispatch const &                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceSurfacePresentModesKHR && "Function <vkGetPhysicalDeviceSurfacePresentModesKHR> requires <VK_KHR_surface>" );
 #  endif
 
-    std::vector<PresentModeKHR, PresentModeKHRAllocator> presentModes( presentModeKHRAllocator );
-    uint32_t                                             presentModeCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator> presentModes( presentModeKHRAllocator );
+    uint32_t                                                                   presentModeCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetPhysicalDeviceSurfacePresentModesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &presentModeCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentModeCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
       {
         presentModes.resize( presentModeCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfacePresentModesKHR(
           m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &presentModeCount, reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
     VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
     if ( presentModeCount < presentModes.size() )
     {
       presentModes.resize( presentModeCount );
     }
-    return detail::createResultValueType( result, std::move( presentModes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_swapchain ===
 
-  // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSwapchainKHR( const SwapchainCreateInfoKHR * pCreateInfo,
-                                                                            const AllocationCallbacks *    pAllocator,
-                                                                            SwapchainKHR *                 pSwapchain,
-                                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR * pCreateInfo,
+                                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                                            VULKAN_HPP_NAMESPACE::SwapchainKHR *                 pSwapchain,
+                                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSwapchainKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateSwapchainKHR( m_device,
                                                         reinterpret_cast<const VkSwapchainCreateInfoKHR *>( pCreateInfo ),
                                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                         reinterpret_cast<VkSwapchainKHR *>( pSwapchain ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SwapchainKHR>::type
-    Device::createSwapchainKHR( const SwapchainCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SwapchainKHR>::type
+                       Device::createSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &      createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSwapchainKHR && "Function <vkCreateSwapchainKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    SwapchainKHR swapchain;
-    Result       result = static_cast<Result>( d.vkCreateSwapchainKHR( m_device,
-                                                                 reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSwapchainKHR" );
+    VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSwapchainKHR( m_device,
+                              reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSwapchainKHR" );
 
-    return detail::createResultValueType( result, std::move( swapchain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchain ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SwapchainKHR, Dispatch>>::type
-    Device::createSwapchainKHRUnique( const SwapchainCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::type
+                       Device::createSwapchainKHRUnique( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &      createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSwapchainKHR && "Function <vkCreateSwapchainKHR> requires <VK_KHR_swapchain>" );
 #    endif
 
-    SwapchainKHR swapchain;
-    Result       result = static_cast<Result>( d.vkCreateSwapchainKHR( m_device,
-                                                                 reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSwapchainKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateSwapchainKHR( m_device,
+                              reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSwapchainKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SwapchainKHR, Dispatch>( swapchain, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>( swapchain, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroySwapchainKHR( SwapchainKHR swapchain, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySwapchainKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySwapchainKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroySwapchainKHR( SwapchainKHR swapchain, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR                        swapchain,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySwapchainKHR && "Function <vkDestroySwapchainKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    d.vkDestroySwapchainKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySwapchainKHR( m_device,
+                             static_cast<VkSwapchainKHR>( swapchain ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( SwapchainKHR swapchain, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySwapchainKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySwapchainKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( SwapchainKHR swapchain, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                        swapchain,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroySwapchainKHR && "Function <vkDestroySwapchainKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    d.vkDestroySwapchainKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroySwapchainKHR( m_device,
+                             static_cast<VkSwapchainKHR>( swapchain ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainImagesKHR( SwapchainKHR     swapchain,
-                                                                               uint32_t *       pSwapchainImageCount,
-                                                                               Image *          pSwapchainImages,
-                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                               uint32_t *                         pSwapchainImageCount,
+                                                                               VULKAN_HPP_NAMESPACE::Image *      pSwapchainImages,
+                                                                               Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSwapchainImagesKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), pSwapchainImageCount, reinterpret_cast<VkImage *>( pSwapchainImages ) ) );
+    return static_cast<Result>(
+      d.vkGetSwapchainImagesKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), pSwapchainImageCount, reinterpret_cast<VkImage *>( pSwapchainImages ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-  template <typename ImageAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ImageAllocator::value_type, Image>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Image, ImageAllocator>>::type
-                       Device::getSwapchainImagesKHR( SwapchainKHR swapchain, Dispatch const & d ) const
+  template <typename ImageAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator>>::type
+                       Device::getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSwapchainImagesKHR && "Function <vkGetSwapchainImagesKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    std::vector<Image, ImageAllocator> swapchainImages;
-    uint32_t                           swapchainImageCount;
-    Result                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator> swapchainImages;
+    uint32_t                                                 swapchainImageCount;
+    VULKAN_HPP_NAMESPACE::Result                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetSwapchainImagesKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && swapchainImageCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetSwapchainImagesKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && swapchainImageCount )
       {
         swapchainImages.resize( swapchainImageCount );
-        result = static_cast<Result>( d.vkGetSwapchainImagesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSwapchainImagesKHR(
           m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, reinterpret_cast<VkImage *>( swapchainImages.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainImagesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainImagesKHR" );
     VULKAN_HPP_ASSERT( swapchainImageCount <= swapchainImages.size() );
     if ( swapchainImageCount < swapchainImages.size() )
     {
       swapchainImages.resize( swapchainImageCount );
     }
-    return detail::createResultValueType( result, std::move( swapchainImages ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchainImages ) );
   }
 
-  // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
   template <typename ImageAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename ImageAllocator::value_type, Image>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Image, ImageAllocator>>::type
-                       Device::getSwapchainImagesKHR( SwapchainKHR swapchain, ImageAllocator & imageAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename ImageAllocator::value_type, VULKAN_HPP_NAMESPACE::Image>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator>>::type
+                       Device::getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, ImageAllocator & imageAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSwapchainImagesKHR && "Function <vkGetSwapchainImagesKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    std::vector<Image, ImageAllocator> swapchainImages( imageAllocator );
-    uint32_t                           swapchainImageCount;
-    Result                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator> swapchainImages( imageAllocator );
+    uint32_t                                                 swapchainImageCount;
+    VULKAN_HPP_NAMESPACE::Result                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetSwapchainImagesKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && swapchainImageCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetSwapchainImagesKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && swapchainImageCount )
       {
         swapchainImages.resize( swapchainImageCount );
-        result = static_cast<Result>( d.vkGetSwapchainImagesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSwapchainImagesKHR(
           m_device, static_cast<VkSwapchainKHR>( swapchain ), &swapchainImageCount, reinterpret_cast<VkImage *>( swapchainImages.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainImagesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainImagesKHR" );
     VULKAN_HPP_ASSERT( swapchainImageCount <= swapchainImages.size() );
     if ( swapchainImageCount < swapchainImages.size() )
     {
       swapchainImages.resize( swapchainImageCount );
     }
-    return detail::createResultValueType( result, std::move( swapchainImages ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchainImages ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImageKHR(
-    SwapchainKHR swapchain, uint64_t timeout, Semaphore semaphore, Fence fence, uint32_t * pImageIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                             uint64_t                           timeout,
+                                                                             VULKAN_HPP_NAMESPACE::Semaphore    semaphore,
+                                                                             VULKAN_HPP_NAMESPACE::Fence        fence,
+                                                                             uint32_t *                         pImageIndex,
+                                                                             Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireNextImageKHR( static_cast<VkDevice>( m_device ),
-                                                         static_cast<VkSwapchainKHR>( swapchain ),
-                                                         timeout,
-                                                         static_cast<VkSemaphore>( semaphore ),
-                                                         static_cast<VkFence>( fence ),
-                                                         pImageIndex ) );
+    return static_cast<Result>( d.vkAcquireNextImageKHR(
+      m_device, static_cast<VkSwapchainKHR>( swapchain ), timeout, static_cast<VkSemaphore>( semaphore ), static_cast<VkFence>( fence ), pImageIndex ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t>
-    Device::acquireNextImageKHR( SwapchainKHR swapchain, uint64_t timeout, Semaphore semaphore, Fence fence, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t> Device::acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                                            uint64_t                           timeout,
+                                                                                            VULKAN_HPP_NAMESPACE::Semaphore    semaphore,
+                                                                                            VULKAN_HPP_NAMESPACE::Fence        fence,
+                                                                                            Dispatch const &                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireNextImageKHR && "Function <vkAcquireNextImageKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    uint32_t imageIndex;
-    Result   result = static_cast<Result>( d.vkAcquireNextImageKHR(
+    uint32_t                     imageIndex;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireNextImageKHR(
       m_device, static_cast<VkSwapchainKHR>( swapchain ), timeout, static_cast<VkSemaphore>( semaphore ), static_cast<VkFence>( fence ), &imageIndex ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImageKHR",
-                         { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImageKHR", { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR } );
-#  endif
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImageKHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eTimeout,
+                                                 VULKAN_HPP_NAMESPACE::Result::eNotReady,
+                                                 VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
     return ResultValue<uint32_t>( result, std::move( imageIndex ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const PresentInfoKHR * pPresentInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR * pPresentInfo,
+                                                                   Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkQueuePresentKHR( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkPresentInfoKHR *>( pPresentInfo ) ) );
+    return static_cast<Result>( d.vkQueuePresentKHR( m_queue, reinterpret_cast<const VkPresentInfoKHR *>( pPresentInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const PresentInfoKHR & presentInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Queue::presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR & presentInfo,
+                                                                                         Dispatch const &                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkQueuePresentKHR && "Function <vkQueuePresentKHR> requires <VK_KHR_swapchain>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkQueuePresentKHR( m_queue, reinterpret_cast<const VkPresentInfoKHR *>( &presentInfo ) ) );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkQueuePresentKHR( m_queue, reinterpret_cast<const VkPresentInfoKHR *>( &presentInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR", { Result::eSuccess, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR", { Result::eSuccess, Result::eSuboptimalKHR } );
-#  endif
-
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupPresentCapabilitiesKHR( DeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities,
-                                                                                        Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupPresentCapabilitiesKHR(
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDeviceGroupPresentCapabilitiesKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( pDeviceGroupPresentCapabilities ) ) );
+    return static_cast<Result>(
+      d.vkGetDeviceGroupPresentCapabilitiesKHR( m_device, reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( pDeviceGroupPresentCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentCapabilitiesKHR>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR>::type
                        Device::getGroupPresentCapabilitiesKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -9604,33 +8826,29 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceGroupPresentCapabilitiesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 #  endif
 
-    DeviceGroupPresentCapabilitiesKHR deviceGroupPresentCapabilities;
-    Result                            result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR deviceGroupPresentCapabilities;
+    VULKAN_HPP_NAMESPACE::Result                            result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetDeviceGroupPresentCapabilitiesKHR( m_device, reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( &deviceGroupPresentCapabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupPresentCapabilitiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupPresentCapabilitiesKHR" );
 
-    return detail::createResultValueType( result, std::move( deviceGroupPresentCapabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( deviceGroupPresentCapabilities ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupSurfacePresentModesKHR( SurfaceKHR                       surface,
-                                                                                        DeviceGroupPresentModeFlagsKHR * pModes,
-                                                                                        Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                       surface,
+                                                                                        VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR * pModes,
+                                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetDeviceGroupSurfacePresentModesKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( pModes ) ) );
+      m_device, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( pModes ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-                       Device::getGroupSurfacePresentModesKHR( SurfaceKHR surface, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR>::type
+                       Device::getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -9638,136 +8856,124 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceGroupSurfacePresentModesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 #  endif
 
-    DeviceGroupPresentModeFlagsKHR modes;
-    Result                         result = static_cast<Result>( d.vkGetDeviceGroupSurfacePresentModesKHR(
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes;
+    VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeviceGroupSurfacePresentModesKHR(
       m_device, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( &modes ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModesKHR" );
 
-    return detail::createResultValueType( result, std::move( modes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( modes ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getPresentRectanglesKHR( SurfaceKHR surface, uint32_t * pRectCount, Rect2D * pRects, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDevicePresentRectanglesKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkSurfaceKHR>( surface ), pRectCount, reinterpret_cast<VkRect2D *>( pRects ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-  template <typename Rect2DAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, Rect2D>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Rect2D, Rect2DAllocator>>::type
-                       PhysicalDevice::getPresentRectanglesKHR( SurfaceKHR surface, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDevicePresentRectanglesKHR &&
-                       "Function <vkGetPhysicalDevicePresentRectanglesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
-#  endif
-
-    std::vector<Rect2D, Rect2DAllocator> rects;
-    uint32_t                             rectCount;
-    Result                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && rectCount )
-      {
-        rects.resize( rectCount );
-        result = static_cast<Result>( d.vkGetPhysicalDevicePresentRectanglesKHR(
-          m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, reinterpret_cast<VkRect2D *>( rects.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
-    VULKAN_HPP_ASSERT( rectCount <= rects.size() );
-    if ( rectCount < rects.size() )
-    {
-      rects.resize( rectCount );
-    }
-    return detail::createResultValueType( result, std::move( rects ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-  template <typename Rect2DAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, Rect2D>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Rect2D, Rect2DAllocator>>::type
-                       PhysicalDevice::getPresentRectanglesKHR( SurfaceKHR surface, Rect2DAllocator & rect2DAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDevicePresentRectanglesKHR &&
-                       "Function <vkGetPhysicalDevicePresentRectanglesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
-#  endif
-
-    std::vector<Rect2D, Rect2DAllocator> rects( rect2DAllocator );
-    uint32_t                             rectCount;
-    Result                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && rectCount )
-      {
-        rects.resize( rectCount );
-        result = static_cast<Result>( d.vkGetPhysicalDevicePresentRectanglesKHR(
-          m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, reinterpret_cast<VkRect2D *>( rects.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
-    VULKAN_HPP_ASSERT( rectCount <= rects.size() );
-    if ( rectCount < rects.size() )
-    {
-      rects.resize( rectCount );
-    }
-    return detail::createResultValueType( result, std::move( rects ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImage2KHR( const AcquireNextImageInfoKHR * pAcquireInfo,
-                                                                              uint32_t *                      pImageIndex,
-                                                                              Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                                                                         uint32_t *                       pRectCount,
+                                                                                         VULKAN_HPP_NAMESPACE::Rect2D *   pRects,
+                                                                                         Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkAcquireNextImage2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAcquireNextImageInfoKHR *>( pAcquireInfo ), pImageIndex ) );
+      d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), pRectCount, reinterpret_cast<VkRect2D *>( pRects ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t> Device::acquireNextImage2KHR( const AcquireNextImageInfoKHR & acquireInfo,
-                                                                                             Dispatch const &                d ) const
+  template <typename Rect2DAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator>>::type
+                       PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDevicePresentRectanglesKHR &&
+                       "Function <vkGetPhysicalDevicePresentRectanglesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator> rects;
+    uint32_t                                                   rectCount;
+    VULKAN_HPP_NAMESPACE::Result                               result;
+    do
+    {
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && rectCount )
+      {
+        rects.resize( rectCount );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDevicePresentRectanglesKHR(
+          m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, reinterpret_cast<VkRect2D *>( rects.data() ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
+    VULKAN_HPP_ASSERT( rectCount <= rects.size() );
+    if ( rectCount < rects.size() )
+    {
+      rects.resize( rectCount );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( rects ) );
+  }
+
+  template <typename Rect2DAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, VULKAN_HPP_NAMESPACE::Rect2D>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator>>::type
+    PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Rect2DAllocator & rect2DAllocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetPhysicalDevicePresentRectanglesKHR &&
+                       "Function <vkGetPhysicalDevicePresentRectanglesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator> rects( rect2DAllocator );
+    uint32_t                                                   rectCount;
+    VULKAN_HPP_NAMESPACE::Result                               result;
+    do
+    {
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && rectCount )
+      {
+        rects.resize( rectCount );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDevicePresentRectanglesKHR(
+          m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), &rectCount, reinterpret_cast<VkRect2D *>( rects.data() ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
+    VULKAN_HPP_ASSERT( rectCount <= rects.size() );
+    if ( rectCount < rects.size() )
+    {
+      rects.resize( rectCount );
+    }
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( rects ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR * pAcquireInfo,
+                                                                              uint32_t *                                            pImageIndex,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkAcquireNextImage2KHR( m_device, reinterpret_cast<const VkAcquireNextImageInfoKHR *>( pAcquireInfo ), pImageIndex ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t> Device::acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR & acquireInfo,
+                                                                                             Dispatch const &                                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireNextImage2KHR && "Function <vkAcquireNextImage2KHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 #  endif
 
-    uint32_t imageIndex;
-    Result   result =
-      static_cast<Result>( d.vkAcquireNextImage2KHR( m_device, reinterpret_cast<const VkAcquireNextImageInfoKHR *>( &acquireInfo ), &imageIndex ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImage2KHR",
-                         { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImage2KHR", { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR } );
-#  endif
+    uint32_t                     imageIndex;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkAcquireNextImage2KHR( m_device, reinterpret_cast<const VkAcquireNextImageInfoKHR *>( &acquireInfo ), &imageIndex ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImage2KHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eTimeout,
+                                                 VULKAN_HPP_NAMESPACE::Result::eNotReady,
+                                                 VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
     return ResultValue<uint32_t>( result, std::move( imageIndex ) );
   }
@@ -9775,26 +8981,19 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_display ===
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPropertiesKHR( uint32_t *             pPropertyCount,
-                                                                                         DisplayPropertiesKHR * pProperties,
-                                                                                         Dispatch const &       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPropertiesKHR( uint32_t *                                   pPropertyCount,
+                                                                                         VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR * pProperties,
+                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceDisplayPropertiesKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkDisplayPropertiesKHR *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, pPropertyCount, reinterpret_cast<VkDisplayPropertiesKHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-  template <typename DisplayPropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, DisplayPropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
+  template <typename DisplayPropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
                        PhysicalDevice::getDisplayPropertiesKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -9802,35 +9001,33 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceDisplayPropertiesKHR && "Function <vkGetPhysicalDeviceDisplayPropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator> properties;
-    uint32_t                                                         propertyCount;
-    Result                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator> properties;
+    uint32_t                                                                               propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-  template <typename DisplayPropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, DisplayPropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
+  template <
+    typename DisplayPropertiesKHRAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
                        PhysicalDevice::getDisplayPropertiesKHR( DisplayPropertiesKHRAllocator & displayPropertiesKHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -9838,85 +9035,79 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceDisplayPropertiesKHR && "Function <vkGetPhysicalDeviceDisplayPropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator> properties( displayPropertiesKHRAllocator );
-    uint32_t                                                         propertyCount;
-    Result                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator> properties( displayPropertiesKHRAllocator );
+    uint32_t                                                                               propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlanePropertiesKHR( uint32_t *                  pPropertyCount,
-                                                                                              DisplayPlanePropertiesKHR * pProperties,
-                                                                                              Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlanePropertiesKHR( uint32_t *                                        pPropertyCount,
+                                                                                              VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR * pProperties,
+                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkDisplayPlanePropertiesKHR *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, pPropertyCount, reinterpret_cast<VkDisplayPlanePropertiesKHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-  template <typename DisplayPlanePropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, DisplayPlanePropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
-                       PhysicalDevice::getDisplayPlanePropertiesKHR( Dispatch const & d ) const
+  template <typename DisplayPlanePropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
+    PhysicalDevice::getDisplayPlanePropertiesKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR && "Function <vkGetPhysicalDeviceDisplayPlanePropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator> properties;
-    uint32_t                                                                   propertyCount;
-    Result                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator> properties;
+    uint32_t                                                                                         propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPlanePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-  template <typename DisplayPlanePropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, DisplayPlanePropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
+  template <
+    typename DisplayPlanePropertiesKHRAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
     PhysicalDevice::getDisplayPlanePropertiesKHR( DisplayPlanePropertiesKHRAllocator & displayPlanePropertiesKHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -9924,50 +9115,43 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR && "Function <vkGetPhysicalDeviceDisplayPlanePropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator> properties( displayPlanePropertiesKHRAllocator );
-    uint32_t                                                                   propertyCount;
-    Result                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator> properties( displayPlanePropertiesKHRAllocator );
+    uint32_t                                                                                         propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPlanePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t         planeIndex,
-                                                                                                     uint32_t *       pDisplayCount,
-                                                                                                     DisplayKHR *     pDisplays,
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t                           planeIndex,
+                                                                                                     uint32_t *                         pDisplayCount,
+                                                                                                     VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplays,
                                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDisplayPlaneSupportedDisplaysKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), planeIndex, pDisplayCount, reinterpret_cast<VkDisplayKHR *>( pDisplays ) ) );
+    return static_cast<Result>(
+      d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, pDisplayCount, reinterpret_cast<VkDisplayKHR *>( pDisplays ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-  template <typename DisplayKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, DisplayKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayKHR, DisplayKHRAllocator>>::type
+  template <typename DisplayKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator>>::type
                        PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -9975,35 +9159,32 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDisplayPlaneSupportedDisplaysKHR && "Function <vkGetDisplayPlaneSupportedDisplaysKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayKHR, DisplayKHRAllocator> displays;
-    uint32_t                                     displayCount;
-    Result                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator> displays;
+    uint32_t                                                           displayCount;
+    VULKAN_HPP_NAMESPACE::Result                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && displayCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && displayCount )
       {
         displays.resize( displayCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, reinterpret_cast<VkDisplayKHR *>( displays.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
     VULKAN_HPP_ASSERT( displayCount <= displays.size() );
     if ( displayCount < displays.size() )
     {
       displays.resize( displayCount );
     }
-    return detail::createResultValueType( result, std::move( displays ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( displays ) );
   }
 
-  // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
   template <typename DisplayKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, DisplayKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayKHR, DisplayKHRAllocator>>::type
+            typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator>>::type
     PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, DisplayKHRAllocator & displayKHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -10011,89 +9192,81 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDisplayPlaneSupportedDisplaysKHR && "Function <vkGetDisplayPlaneSupportedDisplaysKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayKHR, DisplayKHRAllocator> displays( displayKHRAllocator );
-    uint32_t                                     displayCount;
-    Result                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator> displays( displayKHRAllocator );
+    uint32_t                                                           displayCount;
+    VULKAN_HPP_NAMESPACE::Result                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && displayCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && displayCount )
       {
         displays.resize( displayCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, &displayCount, reinterpret_cast<VkDisplayKHR *>( displays.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
     VULKAN_HPP_ASSERT( displayCount <= displays.size() );
     if ( displayCount < displays.size() )
     {
       displays.resize( displayCount );
     }
-    return detail::createResultValueType( result, std::move( displays ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( displays ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDisplayModePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModePropertiesKHR( DisplayKHR                 display,
-                                                                                             uint32_t *                 pPropertyCount,
-                                                                                             DisplayModePropertiesKHR * pProperties,
-                                                                                             Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                 display,
+                                                                                             uint32_t *                                       pPropertyCount,
+                                                                                             VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR * pProperties,
+                                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDisplayModePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                 static_cast<VkDisplayKHR>( display ),
-                                                                 pPropertyCount,
-                                                                 reinterpret_cast<VkDisplayModePropertiesKHR *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetDisplayModePropertiesKHR(
+      m_physicalDevice, static_cast<VkDisplayKHR>( display ), pPropertyCount, reinterpret_cast<VkDisplayModePropertiesKHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDisplayModePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-  template <typename DisplayModePropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, DisplayModePropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
-                       PhysicalDevice::getDisplayModePropertiesKHR( DisplayKHR display, Dispatch const & d ) const
+  template <typename DisplayModePropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
+    PhysicalDevice::getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDisplayModePropertiesKHR && "Function <vkGetDisplayModePropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator> properties;
-    uint32_t                                                                 propertyCount;
-    Result                                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator> properties;
+    uint32_t                                                                                       propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                   result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayModePropertiesKHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetDisplayModePropertiesKHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetDisplayModePropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayModePropertiesKHR(
           m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModePropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetDisplayModePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
   template <typename DisplayModePropertiesKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, DisplayModePropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
-                       PhysicalDevice::getDisplayModePropertiesKHR( DisplayKHR                          display,
+            typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR>::value,
+                                    int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
+    PhysicalDevice::getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR    display,
                                                  DisplayModePropertiesKHRAllocator & displayModePropertiesKHRAllocator,
                                                  Dispatch const &                    d ) const
   {
@@ -10102,39 +9275,39 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDisplayModePropertiesKHR && "Function <vkGetDisplayModePropertiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator> properties( displayModePropertiesKHRAllocator );
-    uint32_t                                                                 propertyCount;
-    Result                                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator> properties( displayModePropertiesKHRAllocator );
+    uint32_t                                                                                       propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                   result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayModePropertiesKHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetDisplayModePropertiesKHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetDisplayModePropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayModePropertiesKHR(
           m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModePropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDisplayModeKHR( DisplayKHR                       display,
-                                                                                      const DisplayModeCreateInfoKHR * pCreateInfo,
-                                                                                      const AllocationCallbacks *      pAllocator,
-                                                                                      DisplayModeKHR *                 pMode,
-                                                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                       display,
+                                                                                      const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR * pCreateInfo,
+                                                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                                                      VULKAN_HPP_NAMESPACE::DisplayModeKHR *                 pMode,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDisplayModeKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkCreateDisplayModeKHR( m_physicalDevice,
                                                           static_cast<VkDisplayKHR>( display ),
                                                           reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
@@ -10142,162 +9315,162 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayModeKHR>::type PhysicalDevice::createDisplayModeKHR(
-    DisplayKHR display, const DisplayModeCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayModeKHR>::type
+                       PhysicalDevice::createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                          display,
+                                          const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR &    createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDisplayModeKHR && "Function <vkCreateDisplayModeKHR> requires <VK_KHR_display>" );
 #  endif
 
-    DisplayModeKHR mode;
-    Result         result = static_cast<Result>( d.vkCreateDisplayModeKHR( m_physicalDevice,
-                                                                   static_cast<VkDisplayKHR>( display ),
-                                                                   reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDisplayModeKHR" );
+    VULKAN_HPP_NAMESPACE::DisplayModeKHR mode;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDisplayModeKHR( m_physicalDevice,
+                                static_cast<VkDisplayKHR>( display ),
+                                reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDisplayModeKHR" );
 
-    return detail::createResultValueType( result, std::move( mode ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( mode ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DisplayModeKHR, Dispatch>>::type PhysicalDevice::createDisplayModeKHRUnique(
-    DisplayKHR display, const DisplayModeCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayModeKHR, Dispatch>>::type
+                       PhysicalDevice::createDisplayModeKHRUnique( VULKAN_HPP_NAMESPACE::DisplayKHR                          display,
+                                                const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR &    createInfo,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDisplayModeKHR && "Function <vkCreateDisplayModeKHR> requires <VK_KHR_display>" );
 #    endif
 
-    DisplayModeKHR mode;
-    Result         result = static_cast<Result>( d.vkCreateDisplayModeKHR( m_physicalDevice,
-                                                                   static_cast<VkDisplayKHR>( display ),
-                                                                   reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDisplayModeKHRUnique" );
+    VULKAN_HPP_NAMESPACE::DisplayModeKHR mode;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateDisplayModeKHR( m_physicalDevice,
+                                static_cast<VkDisplayKHR>( display ),
+                                reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::createDisplayModeKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DisplayModeKHR, Dispatch>( mode, detail::ObjectDestroy<PhysicalDevice, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayModeKHR, Dispatch>( mode, ObjectDestroy<PhysicalDevice, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneCapabilitiesKHR( DisplayModeKHR                mode,
-                                                                                                uint32_t                      planeIndex,
-                                                                                                DisplayPlaneCapabilitiesKHR * pCapabilities,
-                                                                                                Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getDisplayPlaneCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR                mode,
+                                                    uint32_t                                            planeIndex,
+                                                    VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR * pCapabilities,
+                                                    Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDisplayPlaneCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                    static_cast<VkDisplayModeKHR>( mode ),
-                                                                    planeIndex,
-                                                                    reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( pCapabilities ) ) );
+    return static_cast<Result>( d.vkGetDisplayPlaneCapabilitiesKHR(
+      m_physicalDevice, static_cast<VkDisplayModeKHR>( mode ), planeIndex, reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( pCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayPlaneCapabilitiesKHR>::type
-                       PhysicalDevice::getDisplayPlaneCapabilitiesKHR( DisplayModeKHR mode, uint32_t planeIndex, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR>::type
+    PhysicalDevice::getDisplayPlaneCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR mode, uint32_t planeIndex, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDisplayPlaneCapabilitiesKHR && "Function <vkGetDisplayPlaneCapabilitiesKHR> requires <VK_KHR_display>" );
 #  endif
 
-    DisplayPlaneCapabilitiesKHR capabilities;
-    Result                      result = static_cast<Result>( d.vkGetDisplayPlaneCapabilitiesKHR(
+    VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR capabilities;
+    VULKAN_HPP_NAMESPACE::Result                      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayPlaneCapabilitiesKHR(
       m_physicalDevice, static_cast<VkDisplayModeKHR>( mode ), planeIndex, reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( &capabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilitiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilitiesKHR" );
 
-    return detail::createResultValueType( result, std::move( capabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDisplayPlaneSurfaceKHR( const DisplaySurfaceCreateInfoKHR * pCreateInfo,
-                                                                                        const AllocationCallbacks *         pAllocator,
-                                                                                        SurfaceKHR *                        pSurface,
-                                                                                        Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDisplayPlaneSurfaceKHR( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR * pCreateInfo,
+                                                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                                                        VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
+                                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDisplayPlaneSurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateDisplayPlaneSurfaceKHR( m_instance,
                                                                   reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( pCreateInfo ),
                                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                   reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type Instance::createDisplayPlaneSurfaceKHR(
-    const DisplaySurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createDisplayPlaneSurfaceKHR( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDisplayPlaneSurfaceKHR && "Function <vkCreateDisplayPlaneSurfaceKHR> requires <VK_KHR_display>" );
 #  endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateDisplayPlaneSurfaceKHR( m_instance,
-                                                                           reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDisplayPlaneSurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDisplayPlaneSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDisplayPlaneSurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createDisplayPlaneSurfaceKHRUnique(
-    const DisplaySurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createDisplayPlaneSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDisplayPlaneSurfaceKHR && "Function <vkCreateDisplayPlaneSurfaceKHR> requires <VK_KHR_display>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateDisplayPlaneSurfaceKHR( m_instance,
-                                                                           reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDisplayPlaneSurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDisplayPlaneSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDisplayPlaneSurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_display_swapchain ===
 
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSharedSwapchainsKHR( uint32_t                       swapchainCount,
-                                                                                   const SwapchainCreateInfoKHR * pCreateInfos,
-                                                                                   const AllocationCallbacks *    pAllocator,
-                                                                                   SwapchainKHR *                 pSwapchains,
-                                                                                   Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSharedSwapchainsKHR( uint32_t                                             swapchainCount,
+                                                                                   const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR * pCreateInfos,
+                                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                                                   VULKAN_HPP_NAMESPACE::SwapchainKHR *                 pSwapchains,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSharedSwapchainsKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
                                                                swapchainCount,
                                                                reinterpret_cast<const VkSwapchainCreateInfoKHR *>( pCreateInfos ),
                                                                reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
@@ -10305,164 +9478,165 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-  template <typename SwapchainKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, SwapchainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SwapchainKHR, SwapchainKHRAllocator>>::type Device::createSharedSwapchainsKHR(
-    ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename SwapchainKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator>>::type
+    Device::createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                       Dispatch const &                                                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #  endif
 
-    std::vector<SwapchainKHR, SwapchainKHRAllocator> swapchains( createInfos.size() );
-    Result                                           result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        createInfos.size(),
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHR" );
+    std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator> swapchains( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                           result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      createInfos.size(),
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHR" );
 
-    return detail::createResultValueType( result, std::move( swapchains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchains ) );
   }
 
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
   template <typename SwapchainKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, SwapchainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SwapchainKHR, SwapchainKHRAllocator>>::type
-                       Device::createSharedSwapchainsKHR( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                       Optional<const AllocationCallbacks>              allocator,
-                                       SwapchainKHRAllocator &                          swapchainKHRAllocator,
-                                       Dispatch const &                                 d ) const
+            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SwapchainKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator>>::type
+    Device::createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                       SwapchainKHRAllocator &                                                                      swapchainKHRAllocator,
+                                       Dispatch const &                                                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #  endif
 
-    std::vector<SwapchainKHR, SwapchainKHRAllocator> swapchains( createInfos.size(), swapchainKHRAllocator );
-    Result                                           result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        createInfos.size(),
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHR" );
+    std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator> swapchains( createInfos.size(), swapchainKHRAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                           result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      createInfos.size(),
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHR" );
 
-    return detail::createResultValueType( result, std::move( swapchains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchains ) );
   }
 
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SwapchainKHR>::type
-    Device::createSharedSwapchainKHR( const SwapchainCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SwapchainKHR>::type
+                       Device::createSharedSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &      createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #  endif
 
-    SwapchainKHR swapchain;
-    Result       result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        1,
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainKHR" );
+    VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      1,
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainKHR" );
 
-    return detail::createResultValueType( result, std::move( swapchain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchain ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-  template <typename Dispatch,
-            typename SwapchainKHRAllocator,
-            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<SwapchainKHR, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
-                       Device::createSharedSwapchainsKHRUnique( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                             Optional<const AllocationCallbacks>              allocator,
-                                             Dispatch const &                                 d ) const
+  template <typename Dispatch, typename SwapchainKHRAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
+    Device::createSharedSwapchainsKHRUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                             Dispatch const &                                                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #    endif
 
-    std::vector<SwapchainKHR> swapchains( createInfos.size() );
-    Result                    result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        createInfos.size(),
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHRUnique" );
-    std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator> uniqueSwapchains;
+    std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR> swapchains( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      createInfos.size(),
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHRUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator> uniqueSwapchains;
     uniqueSwapchains.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & swapchain : swapchains )
     {
       uniqueSwapchains.push_back( UniqueHandle<SwapchainKHR, Dispatch>( swapchain, deleter ) );
     }
-    return detail::createResultValueType( result, std::move( uniqueSwapchains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueSwapchains ) );
   }
 
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
   template <typename Dispatch,
             typename SwapchainKHRAllocator,
-            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<SwapchainKHR, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
-                       Device::createSharedSwapchainsKHRUnique( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                             Optional<const AllocationCallbacks>              allocator,
-                                             SwapchainKHRAllocator &                          swapchainKHRAllocator,
-                                             Dispatch const &                                 d ) const
+            typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::value,
+                                    int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
+    Device::createSharedSwapchainsKHRUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                             SwapchainKHRAllocator &                                                                      swapchainKHRAllocator,
+                                             Dispatch const &                                                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #    endif
 
-    std::vector<SwapchainKHR> swapchains( createInfos.size() );
-    Result                    result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        createInfos.size(),
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHRUnique" );
-    std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator> uniqueSwapchains( swapchainKHRAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR> swapchains( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      createInfos.size(),
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHRUnique" );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator> uniqueSwapchains( swapchainKHRAllocator );
     uniqueSwapchains.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & swapchain : swapchains )
     {
       uniqueSwapchains.push_back( UniqueHandle<SwapchainKHR, Dispatch>( swapchain, deleter ) );
     }
-    return detail::createResultValueType( result, std::move( uniqueSwapchains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( uniqueSwapchains ) );
   }
 
-  // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SwapchainKHR, Dispatch>>::type
-    Device::createSharedSwapchainKHRUnique( const SwapchainCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::type
+                       Device::createSharedSwapchainKHRUnique( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &      createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateSharedSwapchainsKHR && "Function <vkCreateSharedSwapchainsKHR> requires <VK_KHR_display_swapchain>" );
 #    endif
 
-    SwapchainKHR swapchain;
-    Result       result = static_cast<Result>( d.vkCreateSharedSwapchainsKHR( m_device,
-                                                                        1,
-                                                                        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSharedSwapchainsKHR(
+      m_device,
+      1,
+      reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SwapchainKHR, Dispatch>( swapchain, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>( swapchain, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -10470,81 +9644,79 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
   //=== VK_KHR_xlib_surface ===
 
-  // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createXlibSurfaceKHR( const XlibSurfaceCreateInfoKHR * pCreateInfo,
-                                                                                const AllocationCallbacks *      pAllocator,
-                                                                                SurfaceKHR *                     pSurface,
-                                                                                Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createXlibSurfaceKHR( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR * pCreateInfo,
+                                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                                                VULKAN_HPP_NAMESPACE::SurfaceKHR *                     pSurface,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateXlibSurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateXlibSurfaceKHR( m_instance,
                                                           reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                           reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createXlibSurfaceKHR( const XlibSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createXlibSurfaceKHR( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR &    createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                    Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateXlibSurfaceKHR && "Function <vkCreateXlibSurfaceKHR> requires <VK_KHR_xlib_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateXlibSurfaceKHR( m_instance,
-                                                                   reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXlibSurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateXlibSurfaceKHR( m_instance,
+                                reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXlibSurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-    Instance::createXlibSurfaceKHRUnique( const XlibSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createXlibSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR &    createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateXlibSurfaceKHR && "Function <vkCreateXlibSurfaceKHR> requires <VK_KHR_xlib_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateXlibSurfaceKHR( m_instance,
-                                                                   reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXlibSurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateXlibSurfaceKHR( m_instance,
+                                reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXlibSurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32
     PhysicalDevice::getXlibPresentationSupportKHR( uint32_t queueFamilyIndex, Display * dpy, VisualID visualID, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>(
-      d.vkGetPhysicalDeviceXlibPresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, dpy, visualID ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceXlibPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, dpy, visualID ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE Bool32
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
     PhysicalDevice::getXlibPresentationSupportKHR( uint32_t queueFamilyIndex, Display & dpy, VisualID visualID, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -10555,7 +9727,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkBool32 result = d.vkGetPhysicalDeviceXlibPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, &dpy, visualID );
 
-    return static_cast<Bool32>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_XLIB_KHR*/
@@ -10563,86 +9735,84 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XCB_KHR )
   //=== VK_KHR_xcb_surface ===
 
-  // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createXcbSurfaceKHR( const XcbSurfaceCreateInfoKHR * pCreateInfo,
-                                                                               const AllocationCallbacks *     pAllocator,
-                                                                               SurfaceKHR *                    pSurface,
-                                                                               Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createXcbSurfaceKHR( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR * pCreateInfo,
+                                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                                               VULKAN_HPP_NAMESPACE::SurfaceKHR *                    pSurface,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateXcbSurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateXcbSurfaceKHR( m_instance,
                                                          reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( pCreateInfo ),
                                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                          reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createXcbSurfaceKHR( const XcbSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createXcbSurfaceKHR( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR &     createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateXcbSurfaceKHR && "Function <vkCreateXcbSurfaceKHR> requires <VK_KHR_xcb_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateXcbSurfaceKHR( m_instance,
-                                                                  reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXcbSurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateXcbSurfaceKHR( m_instance,
+                               reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXcbSurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-    Instance::createXcbSurfaceKHRUnique( const XcbSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createXcbSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR &     createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                         Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateXcbSurfaceKHR && "Function <vkCreateXcbSurfaceKHR> requires <VK_KHR_xcb_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateXcbSurfaceKHR( m_instance,
-                                                                  reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXcbSurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateXcbSurfaceKHR( m_instance,
+                               reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createXcbSurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
                                                                          xcb_connection_t * connection,
                                                                          xcb_visualid_t     visual_id,
                                                                          Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>(
-      d.vkGetPhysicalDeviceXcbPresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, connection, visual_id ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceXcbPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, connection, visual_id ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE Bool32 PhysicalDevice::getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
-                                                                         xcb_connection_t & connection,
-                                                                         xcb_visualid_t     visual_id,
-                                                                         Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32 PhysicalDevice::getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
+                                                                                               xcb_connection_t & connection,
+                                                                                               xcb_visualid_t     visual_id,
+                                                                                               Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -10652,7 +9822,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkBool32 result = d.vkGetPhysicalDeviceXcbPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, &connection, visual_id );
 
-    return static_cast<Bool32>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_XCB_KHR*/
@@ -10660,84 +9830,81 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
   //=== VK_KHR_wayland_surface ===
 
-  // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createWaylandSurfaceKHR( const WaylandSurfaceCreateInfoKHR * pCreateInfo,
-                                                                                   const AllocationCallbacks *         pAllocator,
-                                                                                   SurfaceKHR *                        pSurface,
-                                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createWaylandSurfaceKHR( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR * pCreateInfo,
+                                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                                                   VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateWaylandSurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateWaylandSurfaceKHR( m_instance,
                                                              reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( pCreateInfo ),
                                                              reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                              reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createWaylandSurfaceKHR( const WaylandSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createWaylandSurfaceKHR( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR & createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                       Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateWaylandSurfaceKHR && "Function <vkCreateWaylandSurfaceKHR> requires <VK_KHR_wayland_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateWaylandSurfaceKHR( m_instance,
-                                                                      reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWaylandSurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateWaylandSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWaylandSurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createWaylandSurfaceKHRUnique(
-    const WaylandSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createWaylandSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateWaylandSurfaceKHR && "Function <vkCreateWaylandSurfaceKHR> requires <VK_KHR_wayland_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateWaylandSurfaceKHR( m_instance,
-                                                                      reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWaylandSurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateWaylandSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWaylandSurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
                                                                              struct wl_display * display,
                                                                              Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>(
-      d.vkGetPhysicalDeviceWaylandPresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, display ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceWaylandPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, display ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
-                                                                             struct wl_display & display,
-                                                                             Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+    PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t queueFamilyIndex, struct wl_display & display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -10747,7 +9914,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkBool32 result = d.vkGetPhysicalDeviceWaylandPresentationSupportKHR( m_physicalDevice, queueFamilyIndex, &display );
 
-    return static_cast<Bool32>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WAYLAND_KHR*/
@@ -10755,61 +9922,64 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_KHR_android_surface ===
 
-  // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createAndroidSurfaceKHR( const AndroidSurfaceCreateInfoKHR * pCreateInfo,
-                                                                                   const AllocationCallbacks *         pAllocator,
-                                                                                   SurfaceKHR *                        pSurface,
-                                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createAndroidSurfaceKHR( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR * pCreateInfo,
+                                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                                                   VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateAndroidSurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateAndroidSurfaceKHR( m_instance,
                                                              reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( pCreateInfo ),
                                                              reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                              reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createAndroidSurfaceKHR( const AndroidSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createAndroidSurfaceKHR( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR & createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                       Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAndroidSurfaceKHR && "Function <vkCreateAndroidSurfaceKHR> requires <VK_KHR_android_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateAndroidSurfaceKHR( m_instance,
-                                                                      reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createAndroidSurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAndroidSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createAndroidSurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createAndroidSurfaceKHRUnique(
-    const AndroidSurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createAndroidSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAndroidSurfaceKHR && "Function <vkCreateAndroidSurfaceKHR> requires <VK_KHR_android_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateAndroidSurfaceKHR( m_instance,
-                                                                      reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createAndroidSurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAndroidSurfaceKHR(
+      m_instance,
+      reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createAndroidSurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -10818,160 +9988,156 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_win32_surface ===
 
-  // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createWin32SurfaceKHR( const Win32SurfaceCreateInfoKHR * pCreateInfo,
-                                                                                 const AllocationCallbacks *       pAllocator,
-                                                                                 SurfaceKHR *                      pSurface,
-                                                                                 Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createWin32SurfaceKHR( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR * pCreateInfo,
+                                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                                 VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateWin32SurfaceKHR( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateWin32SurfaceKHR( m_instance,
                                                            reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( pCreateInfo ),
                                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                            reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createWin32SurfaceKHR( const Win32SurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createWin32SurfaceKHR( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR &   createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateWin32SurfaceKHR && "Function <vkCreateWin32SurfaceKHR> requires <VK_KHR_win32_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateWin32SurfaceKHR( m_instance,
-                                                                    reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWin32SurfaceKHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateWin32SurfaceKHR( m_instance,
+                                 reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWin32SurfaceKHR" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createWin32SurfaceKHRUnique(
-    const Win32SurfaceCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createWin32SurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR &   createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                           Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateWin32SurfaceKHR && "Function <vkCreateWin32SurfaceKHR> requires <VK_KHR_win32_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateWin32SurfaceKHR( m_instance,
-                                                                    reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWin32SurfaceKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateWin32SurfaceKHR( m_instance,
+                                 reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createWin32SurfaceKHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceWin32PresentationSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWin32PresentationSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWin32PresentationSupportKHR( uint32_t queueFamilyIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>( d.vkGetPhysicalDeviceWin32PresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceWin32PresentationSupportKHR( m_physicalDevice, queueFamilyIndex ) );
   }
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_EXT_debug_report ===
 
-  // wrapper function for command vkCreateDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDebugReportCallbackEXT( const DebugReportCallbackCreateInfoEXT * pCreateInfo,
-                                                                                        const AllocationCallbacks *              pAllocator,
-                                                                                        DebugReportCallbackEXT *                 pCallback,
-                                                                                        Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::createDebugReportCallbackEXT( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT * pCreateInfo,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                            VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT *                 pCallback,
+                                            Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDebugReportCallbackEXT( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateDebugReportCallbackEXT( m_instance,
                                                                   reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( pCreateInfo ),
                                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                   reinterpret_cast<VkDebugReportCallbackEXT *>( pCallback ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DebugReportCallbackEXT>::type Instance::createDebugReportCallbackEXT(
-    const DebugReportCallbackCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>::type
+                       Instance::createDebugReportCallbackEXT( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                            Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDebugReportCallbackEXT && "Function <vkCreateDebugReportCallbackEXT> requires <VK_EXT_debug_report>" );
 #  endif
 
-    DebugReportCallbackEXT callback;
-    Result                 result = static_cast<Result>( d.vkCreateDebugReportCallbackEXT( m_instance,
-                                                                           reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugReportCallbackEXT" );
+    VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT callback;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDebugReportCallbackEXT(
+      m_instance,
+      reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugReportCallbackEXT" );
 
-    return detail::createResultValueType( result, std::move( callback ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( callback ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DebugReportCallbackEXT, Dispatch>>::type
-                       Instance::createDebugReportCallbackEXTUnique( const DebugReportCallbackCreateInfoEXT & createInfo,
-                                                  Optional<const AllocationCallbacks>      allocator,
-                                                  Dispatch const &                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT, Dispatch>>::type
+                       Instance::createDebugReportCallbackEXTUnique( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                                  Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDebugReportCallbackEXT && "Function <vkCreateDebugReportCallbackEXT> requires <VK_EXT_debug_report>" );
 #    endif
 
-    DebugReportCallbackEXT callback;
-    Result                 result = static_cast<Result>( d.vkCreateDebugReportCallbackEXT( m_instance,
-                                                                           reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugReportCallbackEXTUnique" );
+    VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT callback;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDebugReportCallbackEXT(
+      m_instance,
+      reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugReportCallbackEXTUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DebugReportCallbackEXT, Dispatch>( callback, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT, Dispatch>( callback, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroyDebugReportCallbackEXT( DebugReportCallbackEXT      callback,
-                                                                  const AllocationCallbacks * pAllocator,
-                                                                  Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyDebugReportCallbackEXT(
-      static_cast<VkInstance>( m_instance ), static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_instance, static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroyDebugReportCallbackEXT( DebugReportCallbackEXT              callback,
-                                                                  Optional<const AllocationCallbacks> allocator,
-                                                                  Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT              callback,
+                                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -10979,27 +10145,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDebugReportCallbackEXT(
-      m_instance, static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_instance,
+      static_cast<VkDebugReportCallbackEXT>( callback ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Instance::destroy( DebugReportCallbackEXT callback, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyDebugReportCallbackEXT(
-      static_cast<VkInstance>( m_instance ), static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_instance, static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Instance::destroy( DebugReportCallbackEXT callback, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT              callback,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11007,23 +10173,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDebugReportCallbackEXT(
-      m_instance, static_cast<VkDebugReportCallbackEXT>( callback ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_instance,
+      static_cast<VkDebugReportCallbackEXT>( callback ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                                          DebugReportObjectTypeEXT objectType_,
-                                                          uint64_t                 object,
-                                                          size_t                   location,
-                                                          int32_t                  messageCode,
-                                                          const char *             pLayerPrefix,
-                                                          const char *             pMessage,
-                                                          Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                                          VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                                          uint64_t                                       object,
+                                                          size_t                                         location,
+                                                          int32_t                                        messageCode,
+                                                          const char *                                   pLayerPrefix,
+                                                          const char *                                   pMessage,
+                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDebugReportMessageEXT( static_cast<VkInstance>( m_instance ),
+    d.vkDebugReportMessageEXT( m_instance,
                                static_cast<VkDebugReportFlagsEXT>( flags ),
                                static_cast<VkDebugReportObjectTypeEXT>( objectType_ ),
                                object,
@@ -11034,16 +10201,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                                          DebugReportObjectTypeEXT objectType_,
-                                                          uint64_t                 object,
-                                                          size_t                   location,
-                                                          int32_t                  messageCode,
-                                                          const std::string &      layerPrefix,
-                                                          const std::string &      message,
-                                                          Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                                          VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                                          uint64_t                                       object,
+                                                          size_t                                         location,
+                                                          int32_t                                        messageCode,
+                                                          const std::string &                            layerPrefix,
+                                                          const std::string &                            message,
+                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11063,76 +10229,70 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_marker ===
 
-  // wrapper function for command vkDebugMarkerSetObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT * pTagInfo,
-                                                                                    Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT * pTagInfo,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkDebugMarkerSetObjectTagEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( pTagInfo ) ) );
+    return static_cast<Result>( d.vkDebugMarkerSetObjectTagEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( pTagInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDebugMarkerSetObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT & tagInfo, Dispatch const & d ) const
+    Device::debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT & tagInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDebugMarkerSetObjectTagEXT && "Function <vkDebugMarkerSetObjectTagEXT> requires <VK_EXT_debug_marker>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkDebugMarkerSetObjectTagEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( &tagInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectTagEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkDebugMarkerSetObjectTagEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( &tagInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectTagEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT * pNameInfo,
-                                                                                     Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT * pNameInfo,
+                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkDebugMarkerSetObjectNameEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( pNameInfo ) ) );
+    return static_cast<Result>( d.vkDebugMarkerSetObjectNameEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( pNameInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT & nameInfo, Dispatch const & d ) const
+    Device::debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT & nameInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDebugMarkerSetObjectNameEXT && "Function <vkDebugMarkerSetObjectNameEXT> requires <VK_EXT_debug_marker>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkDebugMarkerSetObjectNameEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( &nameInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectNameEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkDebugMarkerSetObjectNameEXT( m_device, reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( &nameInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectNameEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT * pMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT * pMarkerInfo,
+                                                             Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDebugMarkerBeginEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( pMarkerInfo ) );
+    d.vkCmdDebugMarkerBeginEXT( m_commandBuffer, reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( pMarkerInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT & markerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo,
+                                                             Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11143,26 +10303,25 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDebugMarkerEndEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerEndEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::debugMarkerEndEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDebugMarkerEndEXT( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdDebugMarkerEndEXT( m_commandBuffer );
   }
 
-  // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT * pMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT * pMarkerInfo,
+                                                              Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDebugMarkerInsertEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( pMarkerInfo ) );
+    d.vkCmdDebugMarkerInsertEXT( m_commandBuffer, reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( pMarkerInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT & markerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo,
+                                                              Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11175,84 +10334,72 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_queue ===
 
-  // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR * pVideoProfile,
-                                                                                         VideoCapabilitiesKHR *      pCapabilities,
-                                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile,
+                                                                                         VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR *      pCapabilities,
+                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                           reinterpret_cast<const VkVideoProfileInfoKHR *>( pVideoProfile ),
-                                                                           reinterpret_cast<VkVideoCapabilitiesKHR *>( pCapabilities ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR(
+      m_physicalDevice, reinterpret_cast<const VkVideoProfileInfoKHR *>( pVideoProfile ), reinterpret_cast<VkVideoCapabilitiesKHR *>( pCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoCapabilitiesKHR>::type
-                       PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR>::type
+                       PhysicalDevice::getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceVideoCapabilitiesKHR && "Function <vkGetPhysicalDeviceVideoCapabilitiesKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    VideoCapabilitiesKHR capabilities;
-    Result               result = static_cast<Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR(
+    VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR capabilities;
+    VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR(
       m_physicalDevice, reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ), reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
 
-    return detail::createResultValueType( result, std::move( capabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                       PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile, Dispatch const & d ) const
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+                       PhysicalDevice::getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceVideoCapabilitiesKHR && "Function <vkGetPhysicalDeviceVideoCapabilitiesKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    VideoCapabilitiesKHR &     capabilities = structureChain.template get<VideoCapabilitiesKHR>();
-    Result                     result       = static_cast<Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR(
+    StructureChain<X, Y, Z...>                   structureChain;
+    VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR & capabilities = structureChain.template get<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR>();
+    VULKAN_HPP_NAMESPACE::Result                 result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceVideoCapabilitiesKHR(
       m_physicalDevice, reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ), reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
-                                                                                             uint32_t *                               pVideoFormatPropertyCount,
-                                                                                             VideoFormatPropertiesKHR *               pVideoFormatProperties,
-                                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
+                                                 uint32_t *                                                     pVideoFormatPropertyCount,
+                                                 VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR *               pVideoFormatProperties,
+                                                 Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( m_physicalDevice,
                                                                                reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( pVideoFormatInfo ),
                                                                                pVideoFormatPropertyCount,
                                                                                reinterpret_cast<VkVideoFormatPropertiesKHR *>( pVideoFormatProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-  template <typename VideoFormatPropertiesKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VideoFormatPropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
-                       PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo, Dispatch const & d ) const
+  template <typename VideoFormatPropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
+    PhysicalDevice::getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11260,42 +10407,41 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator> videoFormatProperties;
-    uint32_t                                                                 videoFormatPropertyCount;
-    Result                                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator> videoFormatProperties;
+    uint32_t                                                                                       videoFormatPropertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                   result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ), &videoFormatPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && videoFormatPropertyCount )
       {
         videoFormatProperties.resize( videoFormatPropertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( m_physicalDevice,
                                                          reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
                                                          &videoFormatPropertyCount,
                                                          reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
     VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
     if ( videoFormatPropertyCount < videoFormatProperties.size() )
     {
       videoFormatProperties.resize( videoFormatPropertyCount );
     }
-    return detail::createResultValueType( result, std::move( videoFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( videoFormatProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
   template <typename VideoFormatPropertiesKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VideoFormatPropertiesKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
-                       PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                                 VideoFormatPropertiesKHRAllocator &      videoFormatPropertiesKHRAllocator,
-                                                 Dispatch const &                         d ) const
+            typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>::value,
+                                    int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
+    PhysicalDevice::getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
+                                                 VideoFormatPropertiesKHRAllocator &                            videoFormatPropertiesKHRAllocator,
+                                                 Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11303,315 +10449,208 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator> videoFormatProperties( videoFormatPropertiesKHRAllocator );
-    uint32_t                                                                 videoFormatPropertyCount;
-    Result                                                                   result;
+    std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator> videoFormatProperties( videoFormatPropertiesKHRAllocator );
+    uint32_t                                                                                       videoFormatPropertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                   result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ), &videoFormatPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && videoFormatPropertyCount )
       {
         videoFormatProperties.resize( videoFormatPropertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( m_physicalDevice,
                                                          reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
                                                          &videoFormatPropertyCount,
                                                          reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
     VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
     if ( videoFormatPropertyCount < videoFormatProperties.size() )
     {
       videoFormatProperties.resize( videoFormatPropertyCount );
     }
-    return detail::createResultValueType( result, std::move( videoFormatProperties ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-                       PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR &&
-                       "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains;
-    std::vector<VideoFormatPropertiesKHR>                videoFormatProperties;
-    uint32_t                                             videoFormatPropertyCount;
-    Result                                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
-        m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ), &videoFormatPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
-      {
-        structureChains.resize( videoFormatPropertyCount );
-        videoFormatProperties.resize( videoFormatPropertyCount );
-        for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-        {
-          videoFormatProperties[i].pNext = structureChains[i].template get<VideoFormatPropertiesKHR>().pNext;
-        }
-        result = static_cast<Result>(
-          d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( m_physicalDevice,
-                                                         reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
-                                                         &videoFormatPropertyCount,
-                                                         reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
-    VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
-    if ( videoFormatPropertyCount < videoFormatProperties.size() )
-    {
-      structureChains.resize( videoFormatPropertyCount );
-    }
-    for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-    {
-      structureChains[i].template get<VideoFormatPropertiesKHR>() = videoFormatProperties[i];
-    }
-    return detail::createResultValueType( result, std::move( structureChains ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-                       PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                                 StructureChainAllocator &                structureChainAllocator,
-                                                 Dispatch const &                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR &&
-                       "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains( structureChainAllocator );
-    std::vector<VideoFormatPropertiesKHR>                videoFormatProperties;
-    uint32_t                                             videoFormatPropertyCount;
-    Result                                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceVideoFormatPropertiesKHR(
-        m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ), &videoFormatPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
-      {
-        structureChains.resize( videoFormatPropertyCount );
-        videoFormatProperties.resize( videoFormatPropertyCount );
-        for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-        {
-          videoFormatProperties[i].pNext = structureChains[i].template get<VideoFormatPropertiesKHR>().pNext;
-        }
-        result = static_cast<Result>(
-          d.vkGetPhysicalDeviceVideoFormatPropertiesKHR( m_physicalDevice,
-                                                         reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
-                                                         &videoFormatPropertyCount,
-                                                         reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
-    VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
-    if ( videoFormatPropertyCount < videoFormatProperties.size() )
-    {
-      structureChains.resize( videoFormatPropertyCount );
-    }
-    for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-    {
-      structureChains[i].template get<VideoFormatPropertiesKHR>() = videoFormatProperties[i];
-    }
-    return detail::createResultValueType( result, std::move( structureChains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( videoFormatProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createVideoSessionKHR( const VideoSessionCreateInfoKHR * pCreateInfo,
-                                                                               const AllocationCallbacks *       pAllocator,
-                                                                               VideoSessionKHR *                 pVideoSession,
-                                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createVideoSessionKHR( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR * pCreateInfo,
+                                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                               VULKAN_HPP_NAMESPACE::VideoSessionKHR *                 pVideoSession,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateVideoSessionKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateVideoSessionKHR( m_device,
                                                            reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( pCreateInfo ),
                                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                            reinterpret_cast<VkVideoSessionKHR *>( pVideoSession ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoSessionKHR>::type
-    Device::createVideoSessionKHR( const VideoSessionCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoSessionKHR>::type
+                       Device::createVideoSessionKHR( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR &   createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateVideoSessionKHR && "Function <vkCreateVideoSessionKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    VideoSessionKHR videoSession;
-    Result          result = static_cast<Result>( d.vkCreateVideoSessionKHR( m_device,
-                                                                    reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionKHR" );
+    VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateVideoSessionKHR( m_device,
+                                 reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionKHR" );
 
-    return detail::createResultValueType( result, std::move( videoSession ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( videoSession ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VideoSessionKHR, Dispatch>>::type
-    Device::createVideoSessionKHRUnique( const VideoSessionCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionKHR, Dispatch>>::type
+                       Device::createVideoSessionKHRUnique( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR &   createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                         Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateVideoSessionKHR && "Function <vkCreateVideoSessionKHR> requires <VK_KHR_video_queue>" );
 #    endif
 
-    VideoSessionKHR videoSession;
-    Result          result = static_cast<Result>( d.vkCreateVideoSessionKHR( m_device,
-                                                                    reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionKHRUnique" );
+    VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateVideoSessionKHR( m_device,
+                                 reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<VideoSessionKHR, Dispatch>( videoSession, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionKHR, Dispatch>( videoSession, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyVideoSessionKHR( VideoSessionKHR videoSession, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyVideoSessionKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyVideoSessionKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyVideoSessionKHR( VideoSessionKHR videoSession, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                     videoSession,
+                                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                         Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyVideoSessionKHR && "Function <vkDestroyVideoSessionKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    d.vkDestroyVideoSessionKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyVideoSessionKHR(
+      m_device,
+      static_cast<VkVideoSessionKHR>( videoSession ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( VideoSessionKHR videoSession, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyVideoSessionKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyVideoSessionKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( VideoSessionKHR videoSession, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR                     videoSession,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyVideoSessionKHR && "Function <vkDestroyVideoSessionKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    d.vkDestroyVideoSessionKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyVideoSessionKHR(
+      m_device,
+      static_cast<VkVideoSessionKHR>( videoSession ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getVideoSessionMemoryRequirementsKHR( VideoSessionKHR                     videoSession,
-                                                                                              uint32_t *                          pMemoryRequirementsCount,
-                                                                                              VideoSessionMemoryRequirementsKHR * pMemoryRequirements,
-                                                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                     videoSession,
+                                                  uint32_t *                                                pMemoryRequirementsCount,
+                                                  VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR * pMemoryRequirements,
+                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetVideoSessionMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetVideoSessionMemoryRequirementsKHR( m_device,
                                                                           static_cast<VkVideoSessionKHR>( videoSession ),
                                                                           pMemoryRequirementsCount,
                                                                           reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( pMemoryRequirements ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-  template <
-    typename VideoSessionMemoryRequirementsKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VideoSessionMemoryRequirementsKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename VideoSessionMemoryRequirementsKHRAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
-    Device::getVideoSessionMemoryRequirementsKHR( VideoSessionKHR videoSession, Dispatch const & d ) const
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
+    Device::getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetVideoSessionMemoryRequirementsKHR && "Function <vkGetVideoSessionMemoryRequirementsKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator> memoryRequirements;
-    uint32_t                                                                                   memoryRequirementsCount;
-    Result                                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator> memoryRequirements;
+    uint32_t                                                                                                         memoryRequirementsCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                     result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetVideoSessionMemoryRequirementsKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), &memoryRequirementsCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && memoryRequirementsCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && memoryRequirementsCount )
       {
         memoryRequirements.resize( memoryRequirementsCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetVideoSessionMemoryRequirementsKHR( m_device,
                                                     static_cast<VkVideoSessionKHR>( videoSession ),
                                                     &memoryRequirementsCount,
                                                     reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( memoryRequirements.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getVideoSessionMemoryRequirementsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
     VULKAN_HPP_ASSERT( memoryRequirementsCount <= memoryRequirements.size() );
     if ( memoryRequirementsCount < memoryRequirements.size() )
     {
       memoryRequirements.resize( memoryRequirementsCount );
     }
-    return detail::createResultValueType( result, std::move( memoryRequirements ) );
+    return memoryRequirements;
   }
 
-  // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-  template <
-    typename VideoSessionMemoryRequirementsKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VideoSessionMemoryRequirementsKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename VideoSessionMemoryRequirementsKHRAllocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR>::value,
+              int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
-    Device::getVideoSessionMemoryRequirementsKHR( VideoSessionKHR                              videoSession,
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
+    Device::getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR        videoSession,
                                                   VideoSessionMemoryRequirementsKHRAllocator & videoSessionMemoryRequirementsKHRAllocator,
                                                   Dispatch const &                             d ) const
   {
@@ -11620,188 +10659,184 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetVideoSessionMemoryRequirementsKHR && "Function <vkGetVideoSessionMemoryRequirementsKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator> memoryRequirements( videoSessionMemoryRequirementsKHRAllocator );
-    uint32_t                                                                                   memoryRequirementsCount;
-    Result                                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator> memoryRequirements(
+      videoSessionMemoryRequirementsKHRAllocator );
+    uint32_t                     memoryRequirementsCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetVideoSessionMemoryRequirementsKHR( m_device, static_cast<VkVideoSessionKHR>( videoSession ), &memoryRequirementsCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && memoryRequirementsCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && memoryRequirementsCount )
       {
         memoryRequirements.resize( memoryRequirementsCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetVideoSessionMemoryRequirementsKHR( m_device,
                                                     static_cast<VkVideoSessionKHR>( videoSession ),
                                                     &memoryRequirementsCount,
                                                     reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( memoryRequirements.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getVideoSessionMemoryRequirementsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
     VULKAN_HPP_ASSERT( memoryRequirementsCount <= memoryRequirements.size() );
     if ( memoryRequirementsCount < memoryRequirements.size() )
     {
       memoryRequirements.resize( memoryRequirementsCount );
     }
-    return detail::createResultValueType( result, std::move( memoryRequirements ) );
+    return memoryRequirements;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBindVideoSessionMemoryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindVideoSessionMemoryKHR( VideoSessionKHR                       videoSession,
-                                                                                   uint32_t                              bindSessionMemoryInfoCount,
-                                                                                   const BindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::bindVideoSessionMemoryKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                       videoSession,
+                                       uint32_t                                                    bindSessionMemoryInfoCount,
+                                       const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos,
+                                       Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindVideoSessionMemoryKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkBindVideoSessionMemoryKHR( m_device,
                                                                static_cast<VkVideoSessionKHR>( videoSession ),
                                                                bindSessionMemoryInfoCount,
                                                                reinterpret_cast<const VkBindVideoSessionMemoryInfoKHR *>( pBindSessionMemoryInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindVideoSessionMemoryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindVideoSessionMemoryKHR(
-    VideoSessionKHR videoSession, ArrayProxy<const BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos, Dispatch const & d ) const
+    VULKAN_HPP_NAMESPACE::VideoSessionKHR                                                               videoSession,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos,
+    Dispatch const &                                                                                    d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindVideoSessionMemoryKHR && "Function <vkBindVideoSessionMemoryKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkBindVideoSessionMemoryKHR( m_device,
-                                                          static_cast<VkVideoSessionKHR>( videoSession ),
-                                                          bindSessionMemoryInfos.size(),
-                                                          reinterpret_cast<const VkBindVideoSessionMemoryInfoKHR *>( bindSessionMemoryInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindVideoSessionMemoryKHR" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkBindVideoSessionMemoryKHR( m_device,
+                                     static_cast<VkVideoSessionKHR>( videoSession ),
+                                     bindSessionMemoryInfos.size(),
+                                     reinterpret_cast<const VkBindVideoSessionMemoryInfoKHR *>( bindSessionMemoryInfos.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindVideoSessionMemoryKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createVideoSessionParametersKHR( const VideoSessionParametersCreateInfoKHR * pCreateInfo,
-                                                                                         const AllocationCallbacks *                 pAllocator,
-                                                                                         VideoSessionParametersKHR *                 pVideoSessionParameters,
-                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR * pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                 pAllocator,
+                                             VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR *                 pVideoSessionParameters,
+                                             Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateVideoSessionParametersKHR( m_device,
                                                                      reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( pCreateInfo ),
                                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                      reinterpret_cast<VkVideoSessionParametersKHR *>( pVideoSessionParameters ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoSessionParametersKHR>::type Device::createVideoSessionParametersKHR(
-    const VideoSessionParametersCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>::type
+                       Device::createVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>         allocator,
+                                             Dispatch const &                                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateVideoSessionParametersKHR && "Function <vkCreateVideoSessionParametersKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    VideoSessionParametersKHR videoSessionParameters;
-    Result                    result = static_cast<Result>( d.vkCreateVideoSessionParametersKHR( m_device,
-                                                                              reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionParametersKHR" );
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters;
+    VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateVideoSessionParametersKHR(
+      m_device,
+      reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionParametersKHR" );
 
-    return detail::createResultValueType( result, std::move( videoSessionParameters ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( videoSessionParameters ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VideoSessionParametersKHR, Dispatch>>::type
-                       Device::createVideoSessionParametersKHRUnique( const VideoSessionParametersCreateInfoKHR & createInfo,
-                                                   Optional<const AllocationCallbacks>         allocator,
-                                                   Dispatch const &                            d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR, Dispatch>>::type
+                       Device::createVideoSessionParametersKHRUnique( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR & createInfo,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>         allocator,
+                                                   Dispatch const &                                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateVideoSessionParametersKHR && "Function <vkCreateVideoSessionParametersKHR> requires <VK_KHR_video_queue>" );
 #    endif
 
-    VideoSessionParametersKHR videoSessionParameters;
-    Result                    result = static_cast<Result>( d.vkCreateVideoSessionParametersKHR( m_device,
-                                                                              reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionParametersKHRUnique" );
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters;
+    VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateVideoSessionParametersKHR(
+      m_device,
+      reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createVideoSessionParametersKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<VideoSessionParametersKHR, Dispatch>( videoSessionParameters, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
+                                                                UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR, Dispatch>(
+                                                                  videoSessionParameters, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::updateVideoSessionParametersKHR( VideoSessionParametersKHR                   videoSessionParameters,
-                                                                                         const VideoSessionParametersUpdateInfoKHR * pUpdateInfo,
-                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::updateVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                   videoSessionParameters,
+                                             const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR * pUpdateInfo,
+                                             Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkUpdateVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkUpdateVideoSessionParametersKHR( m_device,
                                                                      static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
                                                                      reinterpret_cast<const VkVideoSessionParametersUpdateInfoKHR *>( pUpdateInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::updateVideoSessionParametersKHR(
-    VideoSessionParametersKHR videoSessionParameters, const VideoSessionParametersUpdateInfoKHR & updateInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          Device::updateVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                   videoSessionParameters,
+                                             const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR & updateInfo,
+                                             Dispatch const &                                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkUpdateVideoSessionParametersKHR && "Function <vkUpdateVideoSessionParametersKHR> requires <VK_KHR_video_queue>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkUpdateVideoSessionParametersKHR( m_device,
-                                                                static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
-                                                                reinterpret_cast<const VkVideoSessionParametersUpdateInfoKHR *>( &updateInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::updateVideoSessionParametersKHR" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkUpdateVideoSessionParametersKHR( m_device,
+                                           static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
+                                           reinterpret_cast<const VkVideoSessionParametersUpdateInfoKHR *>( &updateInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::updateVideoSessionParametersKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyVideoSessionParametersKHR( VideoSessionParametersKHR   videoSessionParameters,
-                                                                   const AllocationCallbacks * pAllocator,
-                                                                   Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
+                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
-                                          static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
-                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyVideoSessionParametersKHR(
+      m_device, static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyVideoSessionParametersKHR( VideoSessionParametersKHR           videoSessionParameters,
-                                                                   Optional<const AllocationCallbacks> allocator,
-                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR           videoSessionParameters,
+                                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11809,29 +10844,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyVideoSessionParametersKHR(
-      m_device, static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( VideoSessionParametersKHR videoSessionParameters, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
-                                          static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
-                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyVideoSessionParametersKHR(
+      m_device, static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( VideoSessionParametersKHR           videoSessionParameters,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR           videoSessionParameters,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11839,22 +10872,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyVideoSessionParametersKHR(
-      m_device, static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkVideoSessionParametersKHR>( videoSessionParameters ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VideoBeginCodingInfoKHR * pBeginInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR * pBeginInfo,
+                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginVideoCodingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkVideoBeginCodingInfoKHR *>( pBeginInfo ) );
+    d.vkCmdBeginVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoBeginCodingInfoKHR *>( pBeginInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VideoBeginCodingInfoKHR & beginInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR & beginInfo,
+                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11865,18 +10900,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VideoEndCodingInfoKHR * pEndCodingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR * pEndCodingInfo,
+                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndVideoCodingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkVideoEndCodingInfoKHR *>( pEndCodingInfo ) );
+    d.vkCmdEndVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoEndCodingInfoKHR *>( pEndCodingInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VideoEndCodingInfoKHR & endCodingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR & endCodingInfo,
+                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11887,21 +10922,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VideoCodingControlInfoKHR * pCodingControlInfo,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR * pCodingControlInfo,
+                                                               Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdControlVideoCodingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkVideoCodingControlInfoKHR *>( pCodingControlInfo ) );
+    d.vkCmdControlVideoCodingKHR( m_commandBuffer, reinterpret_cast<const VkVideoCodingControlInfoKHR *>( pCodingControlInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VideoCodingControlInfoKHR & codingControlInfo,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR & codingControlInfo,
+                                                               Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11914,18 +10946,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_decode_queue ===
 
-  // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VideoDecodeInfoKHR * pDecodeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR * pDecodeInfo,
+                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDecodeVideoKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkVideoDecodeInfoKHR *>( pDecodeInfo ) );
+    d.vkCmdDecodeVideoKHR( m_commandBuffer, reinterpret_cast<const VkVideoDecodeInfoKHR *>( pDecodeInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VideoDecodeInfoKHR & decodeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR & decodeInfo,
+                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11938,18 +10970,16 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_transform_feedback ===
 
-  // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t           firstBinding,
-                                                                         uint32_t           bindingCount,
-                                                                         const Buffer *     pBuffers,
-                                                                         const DeviceSize * pOffsets,
-                                                                         const DeviceSize * pSizes,
-                                                                         Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t                                 firstBinding,
+                                                                         uint32_t                                 bindingCount,
+                                                                         const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                                                         const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                                                         const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                                                                         Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindTransformFeedbackBuffersEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBindTransformFeedbackBuffersEXT( m_commandBuffer,
                                             firstBinding,
                                             bindingCount,
                                             reinterpret_cast<const VkBuffer *>( pBuffers ),
@@ -11958,14 +10988,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t                             firstBinding,
-                                                                         ArrayProxy<const Buffer> const &     buffers,
-                                                                         ArrayProxy<const DeviceSize> const & offsets,
-                                                                         ArrayProxy<const DeviceSize> const & sizes,
-                                                                         Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t                                                                         firstBinding,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
+                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -11994,17 +11023,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t           firstCounterBuffer,
-                                                                   uint32_t           counterBufferCount,
-                                                                   const Buffer *     pCounterBuffers,
-                                                                   const DeviceSize * pCounterBufferOffsets,
-                                                                   Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
+                                                                   uint32_t                                 counterBufferCount,
+                                                                   const VULKAN_HPP_NAMESPACE::Buffer *     pCounterBuffers,
+                                                                   const VULKAN_HPP_NAMESPACE::DeviceSize * pCounterBufferOffsets,
+                                                                   Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBeginTransformFeedbackEXT( m_commandBuffer,
                                       firstCounterBuffer,
                                       counterBufferCount,
                                       reinterpret_cast<const VkBuffer *>( pCounterBuffers ),
@@ -12012,13 +11039,12 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t                             firstCounterBuffer,
-                                                                   ArrayProxy<const Buffer> const &     counterBuffers,
-                                                                   ArrayProxy<const DeviceSize> const & counterBufferOffsets,
-                                                                   Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::beginTransformFeedbackEXT( uint32_t                                                                         firstCounterBuffer,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     counterBuffers,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets,
+                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12041,16 +11067,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndTransformFeedbackEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t           firstCounterBuffer,
-                                                                 uint32_t           counterBufferCount,
-                                                                 const Buffer *     pCounterBuffers,
-                                                                 const DeviceSize * pCounterBufferOffsets,
-                                                                 Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
+                                                                 uint32_t                                 counterBufferCount,
+                                                                 const VULKAN_HPP_NAMESPACE::Buffer *     pCounterBuffers,
+                                                                 const VULKAN_HPP_NAMESPACE::DeviceSize * pCounterBufferOffsets,
+                                                                 Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndTransformFeedbackEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdEndTransformFeedbackEXT( m_commandBuffer,
                                     firstCounterBuffer,
                                     counterBufferCount,
                                     reinterpret_cast<const VkBuffer *>( pCounterBuffers ),
@@ -12058,12 +11083,12 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndTransformFeedbackEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t                             firstCounterBuffer,
-                                                                 ArrayProxy<const Buffer> const &     counterBuffers,
-                                                                 ArrayProxy<const DeviceSize> const & counterBufferOffsets,
-                                                                 Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::endTransformFeedbackEXT( uint32_t                                                                         firstCounterBuffer,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     counterBuffers,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets,
+                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12086,37 +11111,36 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQueryIndexedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginQueryIndexedEXT(
-    QueryPool queryPool, uint32_t query, QueryControlFlags flags, uint32_t index, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                                                              uint32_t                                query,
+                                                              VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                                                              uint32_t                                index,
+                                                              Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginQueryIndexedEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ), index );
+    d.vkCmdBeginQueryIndexedEXT( m_commandBuffer, static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ), index );
   }
 
-  // wrapper function for command vkCmdEndQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQueryIndexedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endQueryIndexedEXT( QueryPool queryPool, uint32_t query, uint32_t index, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::endQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, uint32_t index, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndQueryIndexedEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, index );
+    d.vkCmdEndQueryIndexedEXT( m_commandBuffer, static_cast<VkQueryPool>( queryPool ), query, index );
   }
 
-  // wrapper function for command vkCmdDrawIndirectByteCountEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectByteCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectByteCountEXT( uint32_t         instanceCount,
-                                                                  uint32_t         firstInstance,
-                                                                  Buffer           counterBuffer,
-                                                                  DeviceSize       counterBufferOffset,
-                                                                  uint32_t         counterOffset,
-                                                                  uint32_t         vertexStride,
-                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectByteCountEXT( uint32_t                         instanceCount,
+                                                                  uint32_t                         firstInstance,
+                                                                  VULKAN_HPP_NAMESPACE::Buffer     counterBuffer,
+                                                                  VULKAN_HPP_NAMESPACE::DeviceSize counterBufferOffset,
+                                                                  uint32_t                         counterOffset,
+                                                                  uint32_t                         vertexStride,
+                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndirectByteCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawIndirectByteCountEXT( m_commandBuffer,
                                      instanceCount,
                                      firstInstance,
                                      static_cast<VkBuffer>( counterBuffer ),
@@ -12127,231 +11151,246 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NVX_binary_import ===
 
-  // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCuModuleNVX( const CuModuleCreateInfoNVX * pCreateInfo,
-                                                                           const AllocationCallbacks *   pAllocator,
-                                                                           CuModuleNVX *                 pModule,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCuModuleNVX( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX * pCreateInfo,
+                                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                           VULKAN_HPP_NAMESPACE::CuModuleNVX *                 pModule,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateCuModuleNVX( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateCuModuleNVX( m_device,
                                                        reinterpret_cast<const VkCuModuleCreateInfoNVX *>( pCreateInfo ),
                                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                        reinterpret_cast<VkCuModuleNVX *>( pModule ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CuModuleNVX>::type
-    Device::createCuModuleNVX( const CuModuleCreateInfoNVX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::CuModuleNVX>::type
+                       Device::createCuModuleNVX( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX &       createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                               Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCuModuleNVX && "Function <vkCreateCuModuleNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    CuModuleNVX module;
-    Result      result = static_cast<Result>( d.vkCreateCuModuleNVX( m_device,
-                                                                reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuModuleNVX" );
+    VULKAN_HPP_NAMESPACE::CuModuleNVX module;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCuModuleNVX( m_device,
+                             reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuModuleNVX" );
 
-    return detail::createResultValueType( result, std::move( module ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( module ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<CuModuleNVX, Dispatch>>::type
-    Device::createCuModuleNVXUnique( const CuModuleCreateInfoNVX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CuModuleNVX, Dispatch>>::type
+                       Device::createCuModuleNVXUnique( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX &       createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCuModuleNVX && "Function <vkCreateCuModuleNVX> requires <VK_NVX_binary_import>" );
 #    endif
 
-    CuModuleNVX module;
-    Result      result = static_cast<Result>( d.vkCreateCuModuleNVX( m_device,
-                                                                reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuModuleNVXUnique" );
+    VULKAN_HPP_NAMESPACE::CuModuleNVX module;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCuModuleNVX( m_device,
+                             reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuModuleNVXUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<CuModuleNVX, Dispatch>( module, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::CuModuleNVX, Dispatch>( module, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCuFunctionNVX( const CuFunctionCreateInfoNVX * pCreateInfo,
-                                                                             const AllocationCallbacks *     pAllocator,
-                                                                             CuFunctionNVX *                 pFunction,
-                                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX * pCreateInfo,
+                                                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                                             VULKAN_HPP_NAMESPACE::CuFunctionNVX *                 pFunction,
+                                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateCuFunctionNVX( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateCuFunctionNVX( m_device,
                                                          reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( pCreateInfo ),
                                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                          reinterpret_cast<VkCuFunctionNVX *>( pFunction ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CuFunctionNVX>::type
-    Device::createCuFunctionNVX( const CuFunctionCreateInfoNVX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::CuFunctionNVX>::type
+                       Device::createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX &     createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                 Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCuFunctionNVX && "Function <vkCreateCuFunctionNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    CuFunctionNVX function;
-    Result        result = static_cast<Result>( d.vkCreateCuFunctionNVX( m_device,
-                                                                  reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuFunctionNVX" );
+    VULKAN_HPP_NAMESPACE::CuFunctionNVX function;
+    VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCuFunctionNVX( m_device,
+                               reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuFunctionNVX" );
 
-    return detail::createResultValueType( result, std::move( function ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( function ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<CuFunctionNVX, Dispatch>>::type
-    Device::createCuFunctionNVXUnique( const CuFunctionCreateInfoNVX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CuFunctionNVX, Dispatch>>::type
+                       Device::createCuFunctionNVXUnique( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX &     createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                       Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCuFunctionNVX && "Function <vkCreateCuFunctionNVX> requires <VK_NVX_binary_import>" );
 #    endif
 
-    CuFunctionNVX function;
-    Result        result = static_cast<Result>( d.vkCreateCuFunctionNVX( m_device,
-                                                                  reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuFunctionNVXUnique" );
+    VULKAN_HPP_NAMESPACE::CuFunctionNVX function;
+    VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCuFunctionNVX( m_device,
+                               reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCuFunctionNVXUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<CuFunctionNVX, Dispatch>( function, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::CuFunctionNVX, Dispatch>( function, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyCuModuleNVX( CuModuleNVX module, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCuModuleNVX(
-      static_cast<VkDevice>( m_device ), static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCuModuleNVX( m_device, static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCuModuleNVX( CuModuleNVX module, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                         module,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                     Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCuModuleNVX && "Function <vkDestroyCuModuleNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    d.vkDestroyCuModuleNVX( m_device, static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCuModuleNVX( m_device,
+                            static_cast<VkCuModuleNVX>( module ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CuModuleNVX module, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCuModuleNVX(
-      static_cast<VkDevice>( m_device ), static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCuModuleNVX( m_device, static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CuModuleNVX module, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                         module,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCuModuleNVX && "Function <vkDestroyCuModuleNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    d.vkDestroyCuModuleNVX( m_device, static_cast<VkCuModuleNVX>( module ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCuModuleNVX( m_device,
+                            static_cast<VkCuModuleNVX>( module ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCuFunctionNVX( CuFunctionNVX function, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                       Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCuFunctionNVX(
-      static_cast<VkDevice>( m_device ), static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCuFunctionNVX( m_device, static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCuFunctionNVX( CuFunctionNVX function, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX                       function,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                       Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCuFunctionNVX && "Function <vkDestroyCuFunctionNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    d.vkDestroyCuFunctionNVX( m_device, static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCuFunctionNVX( m_device,
+                              static_cast<VkCuFunctionNVX>( function ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CuFunctionNVX function, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCuFunctionNVX(
-      static_cast<VkDevice>( m_device ), static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCuFunctionNVX( m_device, static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CuFunctionNVX function, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX                       function,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCuFunctionNVX && "Function <vkDestroyCuFunctionNVX> requires <VK_NVX_binary_import>" );
 #  endif
 
-    d.vkDestroyCuFunctionNVX( m_device, static_cast<VkCuFunctionNVX>( function ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCuFunctionNVX( m_device,
+                              static_cast<VkCuFunctionNVX>( function ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const CuLaunchInfoNVX * pLaunchInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX * pLaunchInfo,
+                                                           Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCuLaunchKernelNVX( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCuLaunchInfoNVX *>( pLaunchInfo ) );
+    d.vkCmdCuLaunchKernelNVX( m_commandBuffer, reinterpret_cast<const VkCuLaunchInfoNVX *>( pLaunchInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const CuLaunchInfoNVX & launchInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX & launchInfo,
+                                                           Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12364,18 +11403,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NVX_image_view_handle ===
 
-  // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint32_t Device::getImageViewHandleNVX( const ImageViewHandleInfoNVX * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint32_t Device::getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX * pInfo,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetImageViewHandleNVX( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageViewHandleInfoNVX *>( pInfo ) );
+    return d.vkGetImageViewHandleNVX( m_device, reinterpret_cast<const VkImageViewHandleInfoNVX *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint32_t Device::getImageViewHandleNVX( const ImageViewHandleInfoNVX & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint32_t Device::getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX & info,
+                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12388,75 +11427,48 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getImageViewHandle64NVX( const ImageViewHandleInfoNVX * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView                       imageView,
+                                                                                VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX * pProperties,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetImageViewHandle64NVX( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageViewHandleInfoNVX *>( pInfo ) );
+    return static_cast<Result>(
+      d.vkGetImageViewAddressNVX( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<VkImageViewAddressPropertiesNVX *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getImageViewHandle64NVX( const ImageViewHandleInfoNVX & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetImageViewHandle64NVX && "Function <vkGetImageViewHandle64NVX> requires <VK_NVX_image_view_handle>" );
-#  endif
-
-    uint64_t result = d.vkGetImageViewHandle64NVX( m_device, reinterpret_cast<const VkImageViewHandleInfoNVX *>( &info ) );
-
-    return result;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewAddressNVX( ImageView                       imageView,
-                                                                                ImageViewAddressPropertiesNVX * pProperties,
-                                                                                Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetImageViewAddressNVX(
-      static_cast<VkDevice>( m_device ), static_cast<VkImageView>( imageView ), reinterpret_cast<VkImageViewAddressPropertiesNVX *>( pProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageViewAddressPropertiesNVX>::type
-                       Device::getImageViewAddressNVX( ImageView imageView, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX>::type
+                       Device::getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView imageView, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetImageViewAddressNVX && "Function <vkGetImageViewAddressNVX> requires <VK_NVX_image_view_handle>" );
 #  endif
 
-    ImageViewAddressPropertiesNVX properties;
-    Result                        result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX properties;
+    VULKAN_HPP_NAMESPACE::Result                        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetImageViewAddressNVX( m_device, static_cast<VkImageView>( imageView ), reinterpret_cast<VkImageViewAddressPropertiesNVX *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageViewAddressNVX" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageViewAddressNVX" );
 
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_AMD_draw_indirect_count ===
 
-  // wrapper function for command vkCmdDrawIndirectCountAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountAMD( Buffer           buffer,
-                                                              DeviceSize       offset,
-                                                              Buffer           countBuffer,
-                                                              DeviceSize       countBufferOffset,
-                                                              uint32_t         maxDrawCount,
-                                                              uint32_t         stride,
-                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                              VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                              uint32_t                         maxDrawCount,
+                                                              uint32_t                         stride,
+                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndirectCountAMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawIndirectCountAMD( m_commandBuffer,
                                  static_cast<VkBuffer>( buffer ),
                                  static_cast<VkDeviceSize>( offset ),
                                  static_cast<VkBuffer>( countBuffer ),
@@ -12465,19 +11477,17 @@ namespace VULKAN_HPP_NAMESPACE
                                  stride );
   }
 
-  // wrapper function for command vkCmdDrawIndexedIndirectCountAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountAMD( Buffer           buffer,
-                                                                     DeviceSize       offset,
-                                                                     Buffer           countBuffer,
-                                                                     DeviceSize       countBufferOffset,
-                                                                     uint32_t         maxDrawCount,
-                                                                     uint32_t         stride,
-                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                     VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                     VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                     VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                     uint32_t                         maxDrawCount,
+                                                                     uint32_t                         stride,
+                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndexedIndirectCountAMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawIndexedIndirectCountAMD( m_commandBuffer,
                                         static_cast<VkBuffer>( buffer ),
                                         static_cast<VkDeviceSize>( offset ),
                                         static_cast<VkBuffer>( countBuffer ),
@@ -12488,17 +11498,16 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_AMD_shader_info ===
 
-  // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getShaderInfoAMD( Pipeline            pipeline,
-                                                                          ShaderStageFlagBits shaderStage,
-                                                                          ShaderInfoTypeAMD   infoType,
-                                                                          size_t *            pInfoSize,
-                                                                          void *              pInfo,
-                                                                          Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                                                                          VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                                                                          VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                                                                          size_t *                                  pInfoSize,
+                                                                          void *                                    pInfo,
+                                                                          Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetShaderInfoAMD( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetShaderInfoAMD( m_device,
                                                       static_cast<VkPipeline>( pipeline ),
                                                       static_cast<VkShaderStageFlagBits>( shaderStage ),
                                                       static_cast<VkShaderInfoTypeAMD>( infoType ),
@@ -12507,13 +11516,12 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getShaderInfoAMD( Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, Dispatch const & d ) const
+                       Device::getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                              VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                              VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                              Dispatch const &                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12522,42 +11530,44 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> info;
     size_t                                 infoSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetShaderInfoAMD( m_device,
-                                                          static_cast<VkPipeline>( pipeline ),
-                                                          static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                          static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                          &infoSize,
-                                                          nullptr ) );
-      if ( ( result == Result::eSuccess ) && infoSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderInfoAMD( m_device,
+                                                                                static_cast<VkPipeline>( pipeline ),
+                                                                                static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                &infoSize,
+                                                                                nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && infoSize )
       {
         info.resize( infoSize );
-        result = static_cast<Result>( d.vkGetShaderInfoAMD( m_device,
-                                                            static_cast<VkPipeline>( pipeline ),
-                                                            static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                            static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                            &infoSize,
-                                                            reinterpret_cast<void *>( info.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderInfoAMD( m_device,
+                                                                                  static_cast<VkPipeline>( pipeline ),
+                                                                                  static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                  static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                  &infoSize,
+                                                                                  reinterpret_cast<void *>( info.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderInfoAMD" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderInfoAMD" );
     VULKAN_HPP_ASSERT( infoSize <= info.size() );
     if ( infoSize < info.size() )
     {
       info.resize( infoSize );
     }
-    return detail::createResultValueType( result, std::move( info ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( info ) );
   }
 
-  // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type Device::getShaderInfoAMD(
-    Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+                       Device::getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                              VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                              VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                              Uint8_tAllocator &                        uint8_tAllocator,
+                              Dispatch const &                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12566,50 +11576,50 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> info( uint8_tAllocator );
     size_t                                 infoSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetShaderInfoAMD( m_device,
-                                                          static_cast<VkPipeline>( pipeline ),
-                                                          static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                          static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                          &infoSize,
-                                                          nullptr ) );
-      if ( ( result == Result::eSuccess ) && infoSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderInfoAMD( m_device,
+                                                                                static_cast<VkPipeline>( pipeline ),
+                                                                                static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                &infoSize,
+                                                                                nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && infoSize )
       {
         info.resize( infoSize );
-        result = static_cast<Result>( d.vkGetShaderInfoAMD( m_device,
-                                                            static_cast<VkPipeline>( pipeline ),
-                                                            static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                            static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                            &infoSize,
-                                                            reinterpret_cast<void *>( info.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderInfoAMD( m_device,
+                                                                                  static_cast<VkPipeline>( pipeline ),
+                                                                                  static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                  static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                  &infoSize,
+                                                                                  reinterpret_cast<void *>( info.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderInfoAMD" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderInfoAMD" );
     VULKAN_HPP_ASSERT( infoSize <= info.size() );
     if ( infoSize < info.size() )
     {
       info.resize( infoSize );
     }
-    return detail::createResultValueType( result, std::move( info ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( info ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_dynamic_rendering ===
 
-  // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const RenderingInfo * pRenderingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                                                           Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginRenderingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ) );
+    d.vkCmdBeginRenderingKHR( m_commandBuffer, reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const RenderingInfo & renderingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo,
+                                                           Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12620,75 +11630,75 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderingKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endRenderingKHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRenderingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdEndRenderingKHR( m_commandBuffer );
   }
 
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_stream_descriptor_surface ===
 
-  // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createStreamDescriptorSurfaceGGP( const StreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
-                                                                                            const AllocationCallbacks *                  pAllocator,
-                                                                                            SurfaceKHR *                                 pSurface,
-                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::createStreamDescriptorSurfaceGGP( const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
+                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                  pAllocator,
+                                                VULKAN_HPP_NAMESPACE::SurfaceKHR *                                 pSurface,
+                                                Dispatch const &                                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateStreamDescriptorSurfaceGGP( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateStreamDescriptorSurfaceGGP( m_instance,
                                                                       reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( pCreateInfo ),
                                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                       reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type Instance::createStreamDescriptorSurfaceGGP(
-    const StreamDescriptorSurfaceCreateInfoGGP & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createStreamDescriptorSurfaceGGP( const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP & createInfo,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>          allocator,
+                                                Dispatch const &                                                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateStreamDescriptorSurfaceGGP && "Function <vkCreateStreamDescriptorSurfaceGGP> requires <VK_GGP_stream_descriptor_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateStreamDescriptorSurfaceGGP( m_instance,
-                                                                               reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createStreamDescriptorSurfaceGGP" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateStreamDescriptorSurfaceGGP(
+      m_instance,
+      reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createStreamDescriptorSurfaceGGP" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createStreamDescriptorSurfaceGGPUnique(
-    const StreamDescriptorSurfaceCreateInfoGGP & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createStreamDescriptorSurfaceGGPUnique( const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP & createInfo,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>          allocator,
+                                                      Dispatch const &                                                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateStreamDescriptorSurfaceGGP && "Function <vkCreateStreamDescriptorSurfaceGGP> requires <VK_GGP_stream_descriptor_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateStreamDescriptorSurfaceGGP( m_instance,
-                                                                               reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createStreamDescriptorSurfaceGGPUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateStreamDescriptorSurfaceGGP(
+      m_instance,
+      reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createStreamDescriptorSurfaceGGPUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -12696,22 +11706,20 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_external_memory_capabilities ===
 
-  // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getExternalImageFormatPropertiesNV( Format                            format,
-                                                        ImageType                         type,
-                                                        ImageTiling                       tiling,
-                                                        ImageUsageFlags                   usage,
-                                                        ImageCreateFlags                  flags,
-                                                        ExternalMemoryHandleTypeFlagsNV   externalHandleType,
-                                                        ExternalImageFormatPropertiesNV * pExternalImageFormatProperties,
-                                                        Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+    PhysicalDevice::getExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format                            format,
+                                                        VULKAN_HPP_NAMESPACE::ImageType                         type,
+                                                        VULKAN_HPP_NAMESPACE::ImageTiling                       tiling,
+                                                        VULKAN_HPP_NAMESPACE::ImageUsageFlags                   usage,
+                                                        VULKAN_HPP_NAMESPACE::ImageCreateFlags                  flags,
+                                                        VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV   externalHandleType,
+                                                        VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV * pExternalImageFormatProperties,
+                                                        Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetPhysicalDeviceExternalImageFormatPropertiesNV( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+      d.vkGetPhysicalDeviceExternalImageFormatPropertiesNV( m_physicalDevice,
                                                             static_cast<VkFormat>( format ),
                                                             static_cast<VkImageType>( type ),
                                                             static_cast<VkImageTiling>( tiling ),
@@ -12722,17 +11730,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExternalImageFormatPropertiesNV>::type
-                       PhysicalDevice::getExternalImageFormatPropertiesNV( Format                          format,
-                                                        ImageType                       type,
-                                                        ImageTiling                     tiling,
-                                                        ImageUsageFlags                 usage,
-                                                        ImageCreateFlags                flags,
-                                                        ExternalMemoryHandleTypeFlagsNV externalHandleType,
-                                                        Dispatch const &                d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV>::type
+                       PhysicalDevice::getExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format                          format,
+                                                        VULKAN_HPP_NAMESPACE::ImageType                       type,
+                                                        VULKAN_HPP_NAMESPACE::ImageTiling                     tiling,
+                                                        VULKAN_HPP_NAMESPACE::ImageUsageFlags                 usage,
+                                                        VULKAN_HPP_NAMESPACE::ImageCreateFlags                flags,
+                                                        VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV externalHandleType,
+                                                        Dispatch const &                                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12740,8 +11746,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceExternalImageFormatPropertiesNV> requires <VK_NV_external_memory_capabilities>" );
 #  endif
 
-    ExternalImageFormatPropertiesNV externalImageFormatProperties;
-    Result                          result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV externalImageFormatProperties;
+    VULKAN_HPP_NAMESPACE::Result                          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetPhysicalDeviceExternalImageFormatPropertiesNV( m_physicalDevice,
                                                             static_cast<VkFormat>( format ),
                                                             static_cast<VkImageType>( type ),
@@ -12750,64 +11756,60 @@ namespace VULKAN_HPP_NAMESPACE
                                                             static_cast<VkImageCreateFlags>( flags ),
                                                             static_cast<VkExternalMemoryHandleTypeFlagsNV>( externalHandleType ),
                                                             reinterpret_cast<VkExternalImageFormatPropertiesNV *>( &externalImageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getExternalImageFormatPropertiesNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getExternalImageFormatPropertiesNV" );
 
-    return detail::createResultValueType( result, std::move( externalImageFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( externalImageFormatProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_NV_external_memory_win32 ===
 
-  // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryWin32HandleNV( DeviceMemory                    memory,
-                                                                                ExternalMemoryHandleTypeFlagsNV handleType,
-                                                                                HANDLE *                        pHandle,
-                                                                                Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryWin32HandleNV( VULKAN_HPP_NAMESPACE::DeviceMemory                    memory,
+                                                                                VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType,
+                                                                                HANDLE *                                              pHandle,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryWin32HandleNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ), static_cast<VkExternalMemoryHandleTypeFlagsNV>( handleType ), pHandle ) );
+    return static_cast<Result>(
+      d.vkGetMemoryWin32HandleNV( m_device, static_cast<VkDeviceMemory>( memory ), static_cast<VkExternalMemoryHandleTypeFlagsNV>( handleType ), pHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                       Device::getMemoryWin32HandleNV( DeviceMemory memory, ExternalMemoryHandleTypeFlagsNV handleType, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type Device::getMemoryWin32HandleNV(
+    VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryWin32HandleNV && "Function <vkGetMemoryWin32HandleNV> requires <VK_NV_external_memory_win32>" );
 #    endif
 
-    HANDLE handle;
-    Result result = static_cast<Result>(
+    HANDLE                       handle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetMemoryWin32HandleNV( m_device, static_cast<VkDeviceMemory>( memory ), static_cast<VkExternalMemoryHandleTypeFlagsNV>( handleType ), &handle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandleNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandleNV" );
 
-    return detail::createResultValueType( result, std::move( handle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_get_physical_device_properties2 ===
 
-  // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures2KHR( PhysicalDeviceFeatures2 * pFeatures, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFeatures2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 * pFeatures,
+                                                          Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceFeatures2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceFeatures2 *>( pFeatures ) );
+    d.vkGetPhysicalDeviceFeatures2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( pFeatures ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2
+                                         PhysicalDevice::getFeatures2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12815,16 +11817,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFeatures2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    PhysicalDeviceFeatures2 features;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 features;
     d.vkGetPhysicalDeviceFeatures2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
     return features;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getFeatures2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12832,28 +11833,26 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFeatures2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    PhysicalDeviceFeatures2 &  features = structureChain.template get<PhysicalDeviceFeatures2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 &  features = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2>();
     d.vkGetPhysicalDeviceFeatures2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getProperties2KHR( PhysicalDeviceProperties2 * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
+                                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), reinterpret_cast<VkPhysicalDeviceProperties2 *>( pProperties ) );
+    d.vkGetPhysicalDeviceProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( pProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties2 PhysicalDevice::getProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2
+                                         PhysicalDevice::getProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12861,16 +11860,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    PhysicalDeviceProperties2 properties;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 properties;
     d.vkGetPhysicalDeviceProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
     return properties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12878,31 +11876,28 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...>  structureChain;
-    PhysicalDeviceProperties2 & properties = structureChain.template get<PhysicalDeviceProperties2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>();
     d.vkGetPhysicalDeviceProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    PhysicalDevice::getFormatProperties2KHR( Format format, FormatProperties2 * pFormatProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format              format,
+                                                                  VULKAN_HPP_NAMESPACE::FormatProperties2 * pFormatProperties,
+                                                                  Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetPhysicalDeviceFormatProperties2KHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( pFormatProperties ) );
+      m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( pFormatProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties2 PhysicalDevice::getFormatProperties2KHR( Format           format,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties2
+    PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12910,18 +11905,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    FormatProperties2 formatProperties;
+    VULKAN_HPP_NAMESPACE::FormatProperties2 formatProperties;
     d.vkGetPhysicalDeviceFormatProperties2KHR(
       m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
     return formatProperties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFormatProperties2KHR( Format           format,
-                                                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12929,8 +11922,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    FormatProperties2 &        formatProperties = structureChain.template get<FormatProperties2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::FormatProperties2 &        formatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::FormatProperties2>();
     d.vkGetPhysicalDeviceFormatProperties2KHR(
       m_physicalDevice, static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
@@ -12938,25 +11931,22 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                                                              ImageFormatProperties2 *               pImageFormatProperties,
-                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                                  VULKAN_HPP_NAMESPACE::ImageFormatProperties2 *               pImageFormatProperties,
+                                                  Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2KHR( m_physicalDevice,
                                                                                 reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( pImageFormatInfo ),
                                                                                 reinterpret_cast<VkImageFormatProperties2 *>( pImageFormatProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties2>::type
-                       PhysicalDevice::getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>::type
+    PhysicalDevice::getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12964,21 +11954,19 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    ImageFormatProperties2 imageFormatProperties;
-    Result                 result =
-      static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2KHR( m_physicalDevice,
-                                                                           reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
-                                                                           reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties2 imageFormatProperties;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceImageFormatProperties2KHR( m_physicalDevice,
+                                                      reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
+                                                      reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
 
-    return detail::createResultValueType( result, std::move( imageFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                       PhysicalDevice::getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+    PhysicalDevice::getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -12986,38 +11974,31 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    ImageFormatProperties2 &   imageFormatProperties = structureChain.template get<ImageFormatProperties2>();
-    Result                     result =
-      static_cast<Result>( d.vkGetPhysicalDeviceImageFormatProperties2KHR( m_physicalDevice,
-                                                                           reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
-                                                                           reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
+    StructureChain<X, Y, Z...>                     structureChain;
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties2 & imageFormatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>();
+    VULKAN_HPP_NAMESPACE::Result                   result                = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceImageFormatProperties2KHR( m_physicalDevice,
+                                                      reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
+                                                      reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2KHR( uint32_t *               pQueueFamilyPropertyCount,
-                                                                       QueueFamilyProperties2 * pQueueFamilyProperties,
-                                                                       Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyProperties2KHR( uint32_t *                                     pQueueFamilyPropertyCount,
+                                                                       VULKAN_HPP_NAMESPACE::QueueFamilyProperties2 * pQueueFamilyProperties,
+                                                                       Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( pQueueFamilyProperties ) );
+      m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( pQueueFamilyProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-  template <typename QueueFamilyProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+  template <typename QueueFamilyProperties2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
                                          PhysicalDevice::getQueueFamilyProperties2KHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -13026,8 +12007,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties;
-    uint32_t                                                             queueFamilyPropertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties;
+    uint32_t                                                                                   queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR(
@@ -13041,13 +12022,11 @@ namespace VULKAN_HPP_NAMESPACE
     return queueFamilyProperties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-  template <typename QueueFamilyProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+  template <
+    typename QueueFamilyProperties2Allocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
     PhysicalDevice::getQueueFamilyProperties2KHR( QueueFamilyProperties2Allocator & queueFamilyProperties2Allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -13056,8 +12035,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties( queueFamilyProperties2Allocator );
-    uint32_t                                                             queueFamilyPropertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator> queueFamilyProperties( queueFamilyProperties2Allocator );
+    uint32_t                                                                                   queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR(
@@ -13071,13 +12050,7 @@ namespace VULKAN_HPP_NAMESPACE
     return queueFamilyProperties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename StructureChain, typename StructureChainAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
                                          PhysicalDevice::getQueueFamilyProperties2KHR( Dispatch const & d ) const
   {
@@ -13087,15 +12060,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<StructureChain, StructureChainAllocator> structureChains;
-    std::vector<QueueFamilyProperties2>                  queueFamilyProperties;
-    uint32_t                                             queueFamilyPropertyCount;
+    std::vector<StructureChain, StructureChainAllocator>      structureChains;
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+    uint32_t                                                  queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     structureChains.resize( queueFamilyPropertyCount );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
     {
-      queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
+      queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
     }
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR(
       m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
@@ -13107,18 +12080,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
     for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
     {
-      structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
     }
     return structureChains;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
   template <typename StructureChain,
             typename StructureChainAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain, StructureChainAllocator>
     PhysicalDevice::getQueueFamilyProperties2KHR( StructureChainAllocator & structureChainAllocator, Dispatch const & d ) const
   {
@@ -13128,15 +12098,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<StructureChain, StructureChainAllocator> structureChains( structureChainAllocator );
-    std::vector<QueueFamilyProperties2>                  queueFamilyProperties;
-    uint32_t                                             queueFamilyPropertyCount;
+    std::vector<StructureChain, StructureChainAllocator>      structureChains( structureChainAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+    uint32_t                                                  queueFamilyPropertyCount;
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR( m_physicalDevice, &queueFamilyPropertyCount, nullptr );
     structureChains.resize( queueFamilyPropertyCount );
     queueFamilyProperties.resize( queueFamilyPropertyCount );
     for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
     {
-      queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
+      queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
     }
     d.vkGetPhysicalDeviceQueueFamilyProperties2KHR(
       m_physicalDevice, &queueFamilyPropertyCount, reinterpret_cast<VkQueueFamilyProperties2 *>( queueFamilyProperties.data() ) );
@@ -13148,28 +12118,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
     for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
     {
-      structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
     }
     return structureChains;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2KHR( PhysicalDeviceMemoryProperties2 * pMemoryProperties,
-                                                                  Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getMemoryProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
+                                                                  Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceMemoryProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                               reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( pMemoryProperties ) );
+    d.vkGetPhysicalDeviceMemoryProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( pMemoryProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties2 PhysicalDevice::getMemoryProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                                         PhysicalDevice::getMemoryProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13177,16 +12143,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceMemoryProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    PhysicalDeviceMemoryProperties2 memoryProperties;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 memoryProperties;
     d.vkGetPhysicalDeviceMemoryProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
     return memoryProperties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         PhysicalDevice::getMemoryProperties2KHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13194,38 +12159,33 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceMemoryProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...>        structureChain;
-    PhysicalDeviceMemoryProperties2 & memoryProperties = structureChain.template get<PhysicalDeviceMemoryProperties2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>        structureChain;
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 & memoryProperties =
+      structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2>();
     d.vkGetPhysicalDeviceMemoryProperties2KHR( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                                                             uint32_t *                                   pPropertyCount,
-                                                                             SparseImageFormatProperties2 *               pProperties,
-                                                                             Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                                                             uint32_t *                                                         pPropertyCount,
+                                                                             VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2 *               pProperties,
+                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR( m_physicalDevice,
                                                           reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( pFormatInfo ),
                                                           pPropertyCount,
                                                           reinterpret_cast<VkSparseImageFormatProperties2 *>( pProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-  template <typename SparseImageFormatProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-    PhysicalDevice::getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const & d ) const
+  template <typename SparseImageFormatProperties2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+    PhysicalDevice::getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                        Dispatch const &                                                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13233,8 +12193,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSparseImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties;
-    uint32_t                                                                         propertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties;
+    uint32_t                                                                                               propertyCount;
     d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
       m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
     properties.resize( propertyCount );
@@ -13251,16 +12211,15 @@ namespace VULKAN_HPP_NAMESPACE
     return properties;
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-  template <typename SparseImageFormatProperties2Allocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                                         PhysicalDevice::getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                        SparseImageFormatProperties2Allocator &      sparseImageFormatProperties2Allocator,
-                                                        Dispatch const &                             d ) const
+  template <
+    typename SparseImageFormatProperties2Allocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+    PhysicalDevice::getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                        SparseImageFormatProperties2Allocator & sparseImageFormatProperties2Allocator,
+                                                        Dispatch const &                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13268,8 +12227,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSparseImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( sparseImageFormatProperties2Allocator );
-    uint32_t                                                                         propertyCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator> properties( sparseImageFormatProperties2Allocator );
+    uint32_t                                                                                               propertyCount;
     d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR(
       m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ), &propertyCount, nullptr );
     properties.resize( propertyCount );
@@ -13289,28 +12248,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_device_group ===
 
-  // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getGroupPeerMemoryFeaturesKHR( uint32_t                 heapIndex,
-                                                                uint32_t                 localDeviceIndex,
-                                                                uint32_t                 remoteDeviceIndex,
-                                                                PeerMemoryFeatureFlags * pPeerMemoryFeatures,
-                                                                Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getGroupPeerMemoryFeaturesKHR( uint32_t                                       heapIndex,
+                                                                uint32_t                                       localDeviceIndex,
+                                                                uint32_t                                       remoteDeviceIndex,
+                                                                VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags * pPeerMemoryFeatures,
+                                                                Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetDeviceGroupPeerMemoryFeaturesKHR(
-      static_cast<VkDevice>( m_device ), heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( pPeerMemoryFeatures ) );
+      m_device, heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( pPeerMemoryFeatures ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeaturesKHR( uint32_t         heapIndex,
-                                                                                                       uint32_t         localDeviceIndex,
-                                                                                                       uint32_t         remoteDeviceIndex,
-                                                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeaturesKHR(
+    uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13318,7 +12271,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceGroupPeerMemoryFeaturesKHR> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
 #  endif
 
-    PeerMemoryFeatureFlags peerMemoryFeatures;
+    VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags peerMemoryFeatures;
     d.vkGetDeviceGroupPeerMemoryFeaturesKHR(
       m_device, heapIndex, localDeviceIndex, remoteDeviceIndex, reinterpret_cast<VkPeerMemoryFeatureFlags *>( &peerMemoryFeatures ) );
 
@@ -13326,16 +12279,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDeviceMaskKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMaskKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setDeviceMaskKHR( uint32_t deviceMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDeviceMaskKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), deviceMask );
+    d.vkCmdSetDeviceMaskKHR( m_commandBuffer, deviceMask );
   }
 
-  // wrapper function for command vkCmdDispatchBaseKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBaseKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::dispatchBaseKHR( uint32_t         baseGroupX,
                                                          uint32_t         baseGroupY,
                                                          uint32_t         baseGroupZ,
@@ -13345,67 +12296,70 @@ namespace VULKAN_HPP_NAMESPACE
                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchBaseKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
+    d.vkCmdDispatchBaseKHR( m_commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
   }
 
 #if defined( VK_USE_PLATFORM_VI_NN )
   //=== VK_NN_vi_surface ===
 
-  // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createViSurfaceNN( const ViSurfaceCreateInfoNN * pCreateInfo,
-                                                                             const AllocationCallbacks *   pAllocator,
-                                                                             SurfaceKHR *                  pSurface,
-                                                                             Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createViSurfaceNN( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN * pCreateInfo,
+                                                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                             VULKAN_HPP_NAMESPACE::SurfaceKHR *                  pSurface,
+                                                                             Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateViSurfaceNN( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateViSurfaceNN( m_instance,
                                                        reinterpret_cast<const VkViSurfaceCreateInfoNN *>( pCreateInfo ),
                                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                        reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createViSurfaceNN( const ViSurfaceCreateInfoNN & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createViSurfaceNN( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN &       createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                 Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateViSurfaceNN && "Function <vkCreateViSurfaceNN> requires <VK_NN_vi_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateViSurfaceNN( m_instance,
-                                                                reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createViSurfaceNN" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateViSurfaceNN( m_instance,
+                             reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createViSurfaceNN" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-    Instance::createViSurfaceNNUnique( const ViSurfaceCreateInfoNN & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createViSurfaceNNUnique( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN &       createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                       Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateViSurfaceNN && "Function <vkCreateViSurfaceNN> requires <VK_NN_vi_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateViSurfaceNN( m_instance,
-                                                                reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createViSurfaceNNUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateViSurfaceNN( m_instance,
+                             reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createViSurfaceNNUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -13413,38 +12367,33 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_maintenance1 ===
 
-  // wrapper function for command vkTrimCommandPoolKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPoolKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::trimCommandPoolKHR( CommandPool commandPool, CommandPoolTrimFlags flags, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::trimCommandPoolKHR( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
+                                                     VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags,
+                                                     Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkTrimCommandPoolKHR( static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolTrimFlags>( flags ) );
+    d.vkTrimCommandPoolKHR( m_device, static_cast<VkCommandPool>( commandPool ), static_cast<VkCommandPoolTrimFlags>( flags ) );
   }
 
   //=== VK_KHR_device_group_creation ===
 
-  // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::enumeratePhysicalDeviceGroupsKHR( uint32_t *                      pPhysicalDeviceGroupCount,
-                                                                                            PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
-                                                                                            Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::enumeratePhysicalDeviceGroupsKHR( uint32_t *                                            pPhysicalDeviceGroupCount,
+                                                VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
+                                                Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR( static_cast<VkInstance>( m_instance ),
-                                                                      pPhysicalDeviceGroupCount,
-                                                                      reinterpret_cast<VkPhysicalDeviceGroupProperties *>( pPhysicalDeviceGroupProperties ) ) );
+    return static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR(
+      m_instance, pPhysicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( pPhysicalDeviceGroupProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-  template <typename PhysicalDeviceGroupPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
-                       Instance::enumeratePhysicalDeviceGroupsKHR( Dispatch const & d ) const
+  template <typename PhysicalDeviceGroupPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    Instance::enumeratePhysicalDeviceGroupsKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13452,35 +12401,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkEnumeratePhysicalDeviceGroupsKHR> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties;
-    uint32_t                                                                           physicalDeviceGroupCount;
-    Result                                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties;
+    uint32_t                                                                                                 physicalDeviceGroupCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                             result;
     do
     {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR( m_instance, &physicalDeviceGroupCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroupsKHR( m_instance, &physicalDeviceGroupCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
       {
         physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroupsKHR(
           m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
     VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
     if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
     {
       physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
     }
-    return detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
   }
 
-  // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
   template <typename PhysicalDeviceGroupPropertiesAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+            typename std::enable_if<
+              std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
     Instance::enumeratePhysicalDeviceGroupsKHR( PhysicalDeviceGroupPropertiesAllocator & physicalDeviceGroupPropertiesAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -13489,50 +12438,48 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkEnumeratePhysicalDeviceGroupsKHR> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties( physicalDeviceGroupPropertiesAllocator );
-    uint32_t                                                                           physicalDeviceGroupCount;
-    Result                                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator> physicalDeviceGroupProperties(
+      physicalDeviceGroupPropertiesAllocator );
+    uint32_t                     physicalDeviceGroupCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR( m_instance, &physicalDeviceGroupCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroupsKHR( m_instance, &physicalDeviceGroupCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
       {
         physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceGroupsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceGroupsKHR(
           m_instance, &physicalDeviceGroupCount, reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
     VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
     if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
     {
       physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
     }
-    return detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_external_memory_capabilities ===
 
-  // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalBufferPropertiesKHR( const PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                                                         ExternalBufferProperties *               pExternalBufferProperties,
-                                                                         Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getExternalBufferPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                                                         VULKAN_HPP_NAMESPACE::ExternalBufferProperties * pExternalBufferProperties,
+                                                                         Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalBufferPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    d.vkGetPhysicalDeviceExternalBufferPropertiesKHR( m_physicalDevice,
                                                       reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( pExternalBufferInfo ),
                                                       reinterpret_cast<VkExternalBufferProperties *>( pExternalBufferProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalBufferProperties
-    PhysicalDevice::getExternalBufferPropertiesKHR( const PhysicalDeviceExternalBufferInfo & externalBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+    PhysicalDevice::getExternalBufferPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo,
+                                                    Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13540,7 +12487,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceExternalBufferPropertiesKHR> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
 #  endif
 
-    ExternalBufferProperties externalBufferProperties;
+    VULKAN_HPP_NAMESPACE::ExternalBufferProperties externalBufferProperties;
     d.vkGetPhysicalDeviceExternalBufferPropertiesKHR( m_physicalDevice,
                                                       reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
                                                       reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
@@ -13552,163 +12499,151 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
 
-  // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                                                 HANDLE *                            pHandle,
-                                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo,
+                                                                                 HANDLE *                                                  pHandle,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryWin32HandleKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
+    return static_cast<Result>(
+      d.vkGetMemoryWin32HandleKHR( m_device, reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                       Device::getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
+                       Device::getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryWin32HandleKHR && "Function <vkGetMemoryWin32HandleKHR> requires <VK_KHR_external_memory_win32>" );
 #    endif
 
-    HANDLE handle;
-    Result result =
-      static_cast<Result>( d.vkGetMemoryWin32HandleKHR( m_device, reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandleKHR" );
+    HANDLE                       handle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetMemoryWin32HandleKHR( m_device, reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandleKHR" );
 
-    return detail::createResultValueType( result, std::move( handle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryWin32HandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                                           HANDLE                           handle,
-                                                                                           MemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties,
-                                                                                           Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                               HANDLE                                                 handle,
+                                               VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties,
+                                               Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryWin32HandlePropertiesKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetMemoryWin32HandlePropertiesKHR( m_device,
                                                                        static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                                        handle,
                                                                        reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( pMemoryWin32HandleProperties ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryWin32HandlePropertiesKHR>::type
-                       Device::getMemoryWin32HandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR>::type
+    Device::getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryWin32HandlePropertiesKHR && "Function <vkGetMemoryWin32HandlePropertiesKHR> requires <VK_KHR_external_memory_win32>" );
 #    endif
 
-    MemoryWin32HandlePropertiesKHR memoryWin32HandleProperties;
-    Result                         result =
-      static_cast<Result>( d.vkGetMemoryWin32HandlePropertiesKHR( m_device,
-                                                                  static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                                  handle,
-                                                                  reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( &memoryWin32HandleProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandlePropertiesKHR" );
+    VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR memoryWin32HandleProperties;
+    VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetMemoryWin32HandlePropertiesKHR( m_device,
+                                             static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
+                                             handle,
+                                             reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( &memoryWin32HandleProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandlePropertiesKHR" );
 
-    return detail::createResultValueType( result, std::move( memoryWin32HandleProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryWin32HandleProperties ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_memory_fd ===
 
-  // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryFdKHR( const MemoryGetFdInfoKHR * pGetFdInfo,
-                                                                        int *                      pFd,
-                                                                        Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR * pGetFdInfo,
+                                                                        int *                                            pFd,
+                                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
+    return static_cast<Result>( d.vkGetMemoryFdKHR( m_device, reinterpret_cast<const VkMemoryGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getMemoryFdKHR( const MemoryGetFdInfoKHR & getFdInfo,
-                                                                                                     Dispatch const &           d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR & getFdInfo,
+                                                                                                     Dispatch const &                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryFdKHR && "Function <vkGetMemoryFdKHR> requires <VK_KHR_external_memory_fd>" );
 #  endif
 
-    int    fd;
-    Result result = static_cast<Result>( d.vkGetMemoryFdKHR( m_device, reinterpret_cast<const VkMemoryGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdKHR" );
+    int                          fd;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetMemoryFdKHR( m_device, reinterpret_cast<const VkMemoryGetFdInfoKHR *>( &getFdInfo ), &fd ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdKHR" );
 
-    return detail::createResultValueType( result, std::move( fd ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                                  int                              fd,
-                                                                                  MemoryFdPropertiesKHR *          pMemoryFdProperties,
-                                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                                                                  int                                                    fd,
+                                                                                  VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR *          pMemoryFdProperties,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryFdPropertiesKHR( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                              fd,
-                                                              reinterpret_cast<VkMemoryFdPropertiesKHR *>( pMemoryFdProperties ) ) );
+    return static_cast<Result>( d.vkGetMemoryFdPropertiesKHR(
+      m_device, static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ), fd, reinterpret_cast<VkMemoryFdPropertiesKHR *>( pMemoryFdProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryFdPropertiesKHR>::type
-                       Device::getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, int fd, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR>::type
+                       Device::getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, int fd, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryFdPropertiesKHR && "Function <vkGetMemoryFdPropertiesKHR> requires <VK_KHR_external_memory_fd>" );
 #  endif
 
-    MemoryFdPropertiesKHR memoryFdProperties;
-    Result                result = static_cast<Result>( d.vkGetMemoryFdPropertiesKHR(
+    VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR memoryFdProperties;
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetMemoryFdPropertiesKHR(
       m_device, static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ), fd, reinterpret_cast<VkMemoryFdPropertiesKHR *>( &memoryFdProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdPropertiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdPropertiesKHR" );
 
-    return detail::createResultValueType( result, std::move( memoryFdProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryFdProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_external_semaphore_capabilities ===
 
-  // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalSemaphorePropertiesKHR( const PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                                                            ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
-                                                                            Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    PhysicalDevice::getExternalSemaphorePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                                       VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
+                                                       Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    d.vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( m_physicalDevice,
                                                          reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( pExternalSemaphoreInfo ),
                                                          reinterpret_cast<VkExternalSemaphoreProperties *>( pExternalSemaphoreProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalSemaphoreProperties PhysicalDevice::getExternalSemaphorePropertiesKHR(
-    const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+    PhysicalDevice::getExternalSemaphorePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
+                                                       Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13716,7 +12651,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceExternalSemaphorePropertiesKHR> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
 #  endif
 
-    ExternalSemaphoreProperties externalSemaphoreProperties;
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties externalSemaphoreProperties;
     d.vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( m_physicalDevice,
                                                          reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
                                                          reinterpret_cast<VkExternalSemaphoreProperties *>( &externalSemaphoreProperties ) );
@@ -13728,142 +12663,131 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_semaphore_win32 ===
 
-  // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importSemaphoreWin32HandleKHR(
-    const ImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkImportSemaphoreWin32HandleKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreWin32HandleInfoKHR *>( pImportSemaphoreWin32HandleInfo ) ) );
+    return static_cast<Result>(
+      d.vkImportSemaphoreWin32HandleKHR( m_device, reinterpret_cast<const VkImportSemaphoreWin32HandleInfoKHR *>( pImportSemaphoreWin32HandleInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::importSemaphoreWin32HandleKHR( const ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo, Dispatch const & d ) const
+    Device::importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo,
+                                           Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkImportSemaphoreWin32HandleKHR && "Function <vkImportSemaphoreWin32HandleKHR> requires <VK_KHR_external_semaphore_win32>" );
 #    endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkImportSemaphoreWin32HandleKHR( m_device, reinterpret_cast<const VkImportSemaphoreWin32HandleInfoKHR *>( &importSemaphoreWin32HandleInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreWin32HandleKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreWin32HandleKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSemaphoreWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                                                    HANDLE *                               pHandle,
-                                                                                    Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreWin32HandleKHR(
+    const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo, HANDLE * pHandle, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSemaphoreWin32HandleKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
+    return static_cast<Result>(
+      d.vkGetSemaphoreWin32HandleKHR( m_device, reinterpret_cast<const VkSemaphoreGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSemaphoreWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                       Device::getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
+    Device::getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSemaphoreWin32HandleKHR && "Function <vkGetSemaphoreWin32HandleKHR> requires <VK_KHR_external_semaphore_win32>" );
 #    endif
 
-    HANDLE handle;
-    Result result = static_cast<Result>(
+    HANDLE                       handle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetSemaphoreWin32HandleKHR( m_device, reinterpret_cast<const VkSemaphoreGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreWin32HandleKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreWin32HandleKHR" );
 
-    return detail::createResultValueType( result, std::move( handle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_semaphore_fd ===
 
-  // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo,
-                                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkImportSemaphoreFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( pImportSemaphoreFdInfo ) ) );
+    return static_cast<Result>( d.vkImportSemaphoreFdKHR( m_device, reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( pImportSemaphoreFdInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo, Dispatch const & d ) const
+    Device::importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkImportSemaphoreFdKHR && "Function <vkImportSemaphoreFdKHR> requires <VK_KHR_external_semaphore_fd>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkImportSemaphoreFdKHR( m_device, reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( &importSemaphoreFdInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreFdKHR" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkImportSemaphoreFdKHR( m_device, reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( &importSemaphoreFdInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreFdKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR * pGetFdInfo,
-                                                                           int *                         pFd,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR * pGetFdInfo,
+                                                                           int *                                               pFd,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetSemaphoreFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
+    return static_cast<Result>( d.vkGetSemaphoreFdKHR( m_device, reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR & getFdInfo,
-                                                                                                        Dispatch const &              d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type
+                       Device::getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR & getFdInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSemaphoreFdKHR && "Function <vkGetSemaphoreFdKHR> requires <VK_KHR_external_semaphore_fd>" );
 #  endif
 
-    int    fd;
-    Result result = static_cast<Result>( d.vkGetSemaphoreFdKHR( m_device, reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreFdKHR" );
+    int                          fd;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSemaphoreFdKHR( m_device, reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( &getFdInfo ), &fd ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreFdKHR" );
 
-    return detail::createResultValueType( result, std::move( fd ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_push_descriptor ===
 
-  // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetKHR( PipelineBindPoint          pipelineBindPoint,
-                                                              PipelineLayout             layout,
-                                                              uint32_t                   set,
-                                                              uint32_t                   descriptorWriteCount,
-                                                              const WriteDescriptorSet * pDescriptorWrites,
-                                                              Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetKHR( VULKAN_HPP_NAMESPACE::PipelineBindPoint          pipelineBindPoint,
+                                                              VULKAN_HPP_NAMESPACE::PipelineLayout             layout,
+                                                              uint32_t                                         set,
+                                                              uint32_t                                         descriptorWriteCount,
+                                                              const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites,
+                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSetKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdPushDescriptorSetKHR( m_commandBuffer,
                                  static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
                                  static_cast<VkPipelineLayout>( layout ),
                                  set,
@@ -13872,17 +12796,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetKHR( PipelineBindPoint                            pipelineBindPoint,
-                                                              PipelineLayout                               layout,
-                                                              uint32_t                                     set,
-                                                              ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                                                              Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::pushDescriptorSetKHR( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                  pipelineBindPoint,
+                                         VULKAN_HPP_NAMESPACE::PipelineLayout                                                     layout,
+                                         uint32_t                                                                                 set,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+                                         Dispatch const &                                                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetKHR && "Function <vkCmdPushDescriptorSetKHR> requires <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetKHR && "Function <vkCmdPushDescriptorSetKHR> requires <VK_KHR_push_descriptor>" );
 #  endif
 
     d.vkCmdPushDescriptorSetKHR( m_commandBuffer,
@@ -13894,35 +12818,30 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR(
-    DescriptorUpdateTemplate descriptorUpdateTemplate, PipelineLayout layout, uint32_t set, const void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                          VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
+                                                                          uint32_t                                       set,
+                                                                          const void *                                   pData,
+                                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSetWithTemplateKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                             static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                             static_cast<VkPipelineLayout>( layout ),
-                                             set,
-                                             pData );
+    d.vkCmdPushDescriptorSetWithTemplateKHR(
+      m_commandBuffer, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), static_cast<VkPipelineLayout>( layout ), set, pData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                          PipelineLayout           layout,
-                                                                          uint32_t                 set,
-                                                                          DataType const &         data,
-                                                                          Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                          VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
+                                                                          uint32_t                                       set,
+                                                                          DataType const &                               data,
+                                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT(
-      d.vkCmdPushDescriptorSetWithTemplateKHR &&
-      "Function <vkCmdPushDescriptorSetWithTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetWithTemplateKHR &&
+                       "Function <vkCmdPushDescriptorSetWithTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor>" );
 #  endif
 
     d.vkCmdPushDescriptorSetWithTemplateKHR( m_commandBuffer,
@@ -13935,23 +12854,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_conditional_rendering ===
 
-  // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginConditionalRenderingEXT( const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin,
+                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginConditionalRenderingEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                         reinterpret_cast<const VkConditionalRenderingBeginInfoEXT *>( pConditionalRenderingBegin ) );
+    d.vkCmdBeginConditionalRenderingEXT( m_commandBuffer, reinterpret_cast<const VkConditionalRenderingBeginInfoEXT *>( pConditionalRenderingBegin ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginConditionalRenderingEXT( const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin,
+                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -13962,38 +12876,35 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndConditionalRenderingEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndConditionalRenderingEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endConditionalRenderingEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndConditionalRenderingEXT( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdEndConditionalRenderingEXT( m_commandBuffer );
   }
 
   //=== VK_KHR_descriptor_update_template ===
 
-  // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDescriptorUpdateTemplateKHR( const DescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                                                           const AllocationCallbacks *                pAllocator,
-                                                                                           DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createDescriptorUpdateTemplateKHR( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                               VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
+                                               Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDescriptorUpdateTemplateKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateDescriptorUpdateTemplateKHR( m_device,
                                                                        reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( pCreateInfo ),
                                                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                        reinterpret_cast<VkDescriptorUpdateTemplate *>( pDescriptorUpdateTemplate ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorUpdateTemplate>::type Device::createDescriptorUpdateTemplateKHR(
-    const DescriptorUpdateTemplateCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::type
+                       Device::createDescriptorUpdateTemplateKHR( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo & createInfo,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                               Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14001,24 +12912,23 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateDescriptorUpdateTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_VERSION_1_1>" );
 #  endif
 
-    DescriptorUpdateTemplate descriptorUpdateTemplate;
-    Result                   result = static_cast<Result>( d.vkCreateDescriptorUpdateTemplateKHR( m_device,
-                                                                                reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateKHR" );
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorUpdateTemplateKHR(
+      m_device,
+      reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateKHR" );
 
-    return detail::createResultValueType( result, std::move( descriptorUpdateTemplate ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorUpdateTemplate ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DescriptorUpdateTemplate, Dispatch>>::type
-                       Device::createDescriptorUpdateTemplateKHRUnique( const DescriptorUpdateTemplateCreateInfo & createInfo,
-                                                     Optional<const AllocationCallbacks>        allocator,
-                                                     Dispatch const &                           d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>>::type
+                       Device::createDescriptorUpdateTemplateKHRUnique( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo & createInfo,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                                     Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14026,39 +12936,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateDescriptorUpdateTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_VERSION_1_1>" );
 #    endif
 
-    DescriptorUpdateTemplate descriptorUpdateTemplate;
-    Result                   result = static_cast<Result>( d.vkCreateDescriptorUpdateTemplateKHR( m_device,
-                                                                                reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateKHRUnique" );
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDescriptorUpdateTemplateKHR(
+      m_device,
+      reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DescriptorUpdateTemplate, Dispatch>( descriptorUpdateTemplate, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
+                                                                UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>(
+                                                                  descriptorUpdateTemplate, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( DescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                                                     const AllocationCallbacks * pAllocator,
-                                                                     Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDescriptorUpdateTemplateKHR( static_cast<VkDevice>( m_device ),
-                                            static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDescriptorUpdateTemplateKHR(
+      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( DescriptorUpdateTemplate            descriptorUpdateTemplate,
-                                                                     Optional<const AllocationCallbacks> allocator,
-                                                                     Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate            descriptorUpdateTemplate,
+                                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                     Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14067,33 +12974,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDescriptorUpdateTemplateKHR(
-      m_device, static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplateKHR( DescriptorSet            descriptorSet,
-                                                                     DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                     const void *             pData,
-                                                                     Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                                                     VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                     const void *                                   pData,
+                                                                     Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUpdateDescriptorSetWithTemplateKHR( static_cast<VkDevice>( m_device ),
-                                            static_cast<VkDescriptorSet>( descriptorSet ),
-                                            static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                            pData );
+    d.vkUpdateDescriptorSetWithTemplateKHR(
+      m_device, static_cast<VkDescriptorSet>( descriptorSet ), static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ), pData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplateKHR( DescriptorSet            descriptorSet,
-                                                                     DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                     DataType const &         data,
-                                                                     Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_INLINE void Device::updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                                                     VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                                                     DataType const &                               data,
+                                                                     Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14110,24 +13013,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_clip_space_w_scaling ===
 
-  // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingNV( uint32_t                   firstViewport,
-                                                               uint32_t                   viewportCount,
-                                                               const ViewportWScalingNV * pViewportWScalings,
-                                                               Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingNV( uint32_t                                         firstViewport,
+                                                               uint32_t                                         viewportCount,
+                                                               const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * pViewportWScalings,
+                                                               Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewportWScalingNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewportCount, reinterpret_cast<const VkViewportWScalingNV *>( pViewportWScalings ) );
+    d.vkCmdSetViewportWScalingNV( m_commandBuffer, firstViewport, viewportCount, reinterpret_cast<const VkViewportWScalingNV *>( pViewportWScalings ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingNV( uint32_t                                     firstViewport,
-                                                               ArrayProxy<const ViewportWScalingNV> const & viewportWScalings,
-                                                               Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setViewportWScalingNV( uint32_t                                                                                 firstViewport,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings,
+                                          Dispatch const &                                                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14142,76 +13043,68 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_direct_mode_display ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::releaseDisplayEXT( DisplayKHR display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result PhysicalDevice::releaseDisplayEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkReleaseDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( display ) ) );
+    return static_cast<Result>( d.vkReleaseDisplayEXT( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
   }
 #else
-  // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type PhysicalDevice::releaseDisplayEXT( DisplayKHR       display,
-                                                                                                                                    Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::releaseDisplayEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkReleaseDisplayEXT && "Function <vkReleaseDisplayEXT> requires <VK_EXT_direct_mode_display>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkReleaseDisplayEXT( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::releaseDisplayEXT" );
-
-    return detail::createResultValueType( result );
+    d.vkReleaseDisplayEXT( m_physicalDevice, static_cast<VkDisplayKHR>( display ) );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
   //=== VK_EXT_acquire_xlib_display ===
 
-  // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireXlibDisplayEXT( Display *        dpy,
-                                                                                       DisplayKHR       display,
-                                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireXlibDisplayEXT( Display *                        dpy,
+                                                                                       VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                                                       Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireXlibDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), dpy, static_cast<VkDisplayKHR>( display ) ) );
+    return static_cast<Result>( d.vkAcquireXlibDisplayEXT( m_physicalDevice, dpy, static_cast<VkDisplayKHR>( display ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          PhysicalDevice::acquireXlibDisplayEXT( Display & dpy, DisplayKHR display, Dispatch const & d ) const
+    PhysicalDevice::acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireXlibDisplayEXT && "Function <vkAcquireXlibDisplayEXT> requires <VK_EXT_acquire_xlib_display>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkAcquireXlibDisplayEXT( m_physicalDevice, &dpy, static_cast<VkDisplayKHR>( display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireXlibDisplayEXT" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireXlibDisplayEXT( m_physicalDevice, &dpy, static_cast<VkDisplayKHR>( display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireXlibDisplayEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getRandROutputDisplayEXT( Display * dpy, RROutput rrOutput, DisplayKHR * pDisplay, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getRandROutputDisplayEXT( Display *                          dpy,
+                                                                                          RROutput                           rrOutput,
+                                                                                          VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplay,
+                                                                                          Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetRandROutputDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( pDisplay ) ) );
+    return static_cast<Result>( d.vkGetRandROutputDisplayEXT( m_physicalDevice, dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( pDisplay ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
                        PhysicalDevice::getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -14219,17 +13112,17 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetRandROutputDisplayEXT && "Function <vkGetRandROutputDisplayEXT> requires <VK_EXT_acquire_xlib_display>" );
 #    endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetRandROutputDisplayEXT( m_physicalDevice, &dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getRandROutputDisplayEXT" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetRandROutputDisplayEXT( m_physicalDevice, &dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getRandROutputDisplayEXT" );
 
-    return detail::createResultValueType( result, std::move( display ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( display ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
                        PhysicalDevice::getRandROutputDisplayEXTUnique( Display & dpy, RROutput rrOutput, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -14237,11 +13130,13 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetRandROutputDisplayEXT && "Function <vkGetRandROutputDisplayEXT> requires <VK_EXT_acquire_xlib_display>" );
 #      endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetRandROutputDisplayEXT( m_physicalDevice, &dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getRandROutputDisplayEXTUnique" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetRandROutputDisplayEXT( m_physicalDevice, &dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getRandROutputDisplayEXTUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<DisplayKHR, Dispatch>( display, detail::ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>( display, ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -14249,25 +13144,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_display_surface_counter ===
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilities2EXT( SurfaceKHR                surface,
-                                                                                            SurfaceCapabilities2EXT * pSurfaceCapabilities,
-                                                                                            Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR                surface,
+                                                VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT * pSurfaceCapabilities,
+                                                Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2EXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                              static_cast<VkSurfaceKHR>( surface ),
-                                                                              reinterpret_cast<VkSurfaceCapabilities2EXT *>( pSurfaceCapabilities ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2EXT(
+      m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkSurfaceCapabilities2EXT *>( pSurfaceCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilities2EXT>::type
-                       PhysicalDevice::getSurfaceCapabilities2EXT( SurfaceKHR surface, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT>::type
+                       PhysicalDevice::getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14275,115 +13166,117 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfaceCapabilities2EXT> requires <VK_EXT_display_surface_counter>" );
 #  endif
 
-    SurfaceCapabilities2EXT surfaceCapabilities;
-    Result                  result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2EXT(
+    VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT surfaceCapabilities;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2EXT(
       m_physicalDevice, static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkSurfaceCapabilities2EXT *>( &surfaceCapabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2EXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2EXT" );
 
-    return detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_display_control ===
 
-  // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::displayPowerControlEXT( DisplayKHR                  display,
-                                                                                const DisplayPowerInfoEXT * pDisplayPowerInfo,
-                                                                                Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                                                const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT * pDisplayPowerInfo,
+                                                                                Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkDisplayPowerControlEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkDisplayKHR>( display ), reinterpret_cast<const VkDisplayPowerInfoEXT *>( pDisplayPowerInfo ) ) );
+    return static_cast<Result>(
+      d.vkDisplayPowerControlEXT( m_device, static_cast<VkDisplayKHR>( display ), reinterpret_cast<const VkDisplayPowerInfoEXT *>( pDisplayPowerInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::displayPowerControlEXT( DisplayKHR display, const DisplayPowerInfoEXT & displayPowerInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                                                         const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT & displayPowerInfo,
+                                                                                         Dispatch const &                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDisplayPowerControlEXT && "Function <vkDisplayPowerControlEXT> requires <VK_EXT_display_control>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkDisplayPowerControlEXT( m_device, static_cast<VkDisplayKHR>( display ), reinterpret_cast<const VkDisplayPowerInfoEXT *>( &displayPowerInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::displayPowerControlEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::displayPowerControlEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerEventEXT( const DeviceEventInfoEXT *  pDeviceEventInfo,
-                                                                          const AllocationCallbacks * pAllocator,
-                                                                          Fence *                     pFence,
-                                                                          Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT *  pDeviceEventInfo,
+                                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                          VULKAN_HPP_NAMESPACE::Fence *                     pFence,
+                                                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkRegisterDeviceEventEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkRegisterDeviceEventEXT( m_device,
                                                             reinterpret_cast<const VkDeviceEventInfoEXT *>( pDeviceEventInfo ),
                                                             reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                             reinterpret_cast<VkFence *>( pFence ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type
-    Device::registerEventEXT( const DeviceEventInfoEXT & deviceEventInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type
+                       Device::registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT &          deviceEventInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                              Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkRegisterDeviceEventEXT && "Function <vkRegisterDeviceEventEXT> requires <VK_EXT_display_control>" );
 #  endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkRegisterDeviceEventEXT( m_device,
-                                                                     reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerEventEXT" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkRegisterDeviceEventEXT(
+      m_device,
+      reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerEventEXT" );
 
-    return detail::createResultValueType( result, std::move( fence ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fence ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type
-    Device::registerEventEXTUnique( const DeviceEventInfoEXT & deviceEventInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type
+                       Device::registerEventEXTUnique( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT &          deviceEventInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                    Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkRegisterDeviceEventEXT && "Function <vkRegisterDeviceEventEXT> requires <VK_EXT_display_control>" );
 #    endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkRegisterDeviceEventEXT( m_device,
-                                                                     reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerEventEXTUnique" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkRegisterDeviceEventEXT(
+      m_device,
+      reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerEventEXTUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Fence, Dispatch>( fence, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>( fence, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerDisplayEventEXT( DisplayKHR                  display,
-                                                                                 const DisplayEventInfoEXT * pDisplayEventInfo,
-                                                                                 const AllocationCallbacks * pAllocator,
-                                                                                 Fence *                     pFence,
-                                                                                 Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                                                 const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT * pDisplayEventInfo,
+                                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                                 VULKAN_HPP_NAMESPACE::Fence *                     pFence,
+                                                                                 Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkRegisterDisplayEventEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkRegisterDisplayEventEXT( m_device,
                                                              static_cast<VkDisplayKHR>( display ),
                                                              reinterpret_cast<const VkDisplayEventInfoEXT *>( pDisplayEventInfo ),
                                                              reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
@@ -14391,220 +13284,179 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type Device::registerDisplayEventEXT( DisplayKHR                  display,
-                                                                                                                const DisplayEventInfoEXT & displayEventInfo,
-                                                                                                                Optional<const AllocationCallbacks> allocator,
-                                                                                                                Dispatch const &                    d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type
+                       Device::registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                          display,
+                                     const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT &         displayEventInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkRegisterDisplayEventEXT && "Function <vkRegisterDisplayEventEXT> requires <VK_EXT_display_control>" );
 #  endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkRegisterDisplayEventEXT( m_device,
-                                                                      static_cast<VkDisplayKHR>( display ),
-                                                                      reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerDisplayEventEXT" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkRegisterDisplayEventEXT(
+      m_device,
+      static_cast<VkDisplayKHR>( display ),
+      reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerDisplayEventEXT" );
 
-    return detail::createResultValueType( result, std::move( fence ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fence ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type Device::registerDisplayEventEXTUnique(
-    DisplayKHR display, const DisplayEventInfoEXT & displayEventInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type
+                       Device::registerDisplayEventEXTUnique( VULKAN_HPP_NAMESPACE::DisplayKHR                          display,
+                                           const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT &         displayEventInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                           Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkRegisterDisplayEventEXT && "Function <vkRegisterDisplayEventEXT> requires <VK_EXT_display_control>" );
 #    endif
 
-    Fence  fence;
-    Result result = static_cast<Result>( d.vkRegisterDisplayEventEXT( m_device,
-                                                                      static_cast<VkDisplayKHR>( display ),
-                                                                      reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
-                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                      reinterpret_cast<VkFence *>( &fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerDisplayEventEXTUnique" );
+    VULKAN_HPP_NAMESPACE::Fence  fence;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkRegisterDisplayEventEXT(
+      m_device,
+      static_cast<VkDisplayKHR>( display ),
+      reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkFence *>( &fence ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::registerDisplayEventEXTUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<Fence, Dispatch>( fence, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>( fence, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainCounterEXT( SwapchainKHR              swapchain,
-                                                                                SurfaceCounterFlagBitsEXT counter,
-                                                                                uint64_t *                pCounterValue,
-                                                                                Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainCounterEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR              swapchain,
+                                                                                VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter,
+                                                                                uint64_t *                                      pCounterValue,
+                                                                                Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSwapchainCounterEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), static_cast<VkSurfaceCounterFlagBitsEXT>( counter ), pCounterValue ) );
+    return static_cast<Result>(
+      d.vkGetSwapchainCounterEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ), static_cast<VkSurfaceCounterFlagBitsEXT>( counter ), pCounterValue ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    ResultValue<uint64_t>
-#  else
-    typename ResultValueType<uint64_t>::type
-#  endif
-    Device::getSwapchainCounterEXT( SwapchainKHR swapchain, SurfaceCounterFlagBitsEXT counter, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Device::getSwapchainCounterEXT(
+    VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSwapchainCounterEXT && "Function <vkGetSwapchainCounterEXT> requires <VK_EXT_display_control>" );
 #  endif
 
-    uint64_t counterValue;
-    Result   result = static_cast<Result>(
+    uint64_t                     counterValue;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetSwapchainCounterEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ), static_cast<VkSurfaceCounterFlagBitsEXT>( counter ), &counterValue ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainCounterEXT" );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainCounterEXT", { Result::eSuccess, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainCounterEXT" );
-#  endif
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    return ResultValue<uint64_t>( result, std::move( counterValue ) );
-#  else
-    return detail::createResultValueType( result, std::move( counterValue ) );
-#  endif
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( counterValue ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_GOOGLE_display_timing ===
 
-  // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRefreshCycleDurationGOOGLE( SwapchainKHR                 swapchain,
-                                                                                       RefreshCycleDurationGOOGLE * pDisplayTimingProperties,
-                                                                                       Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getRefreshCycleDurationGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR                 swapchain,
+                                           VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE * pDisplayTimingProperties,
+                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetRefreshCycleDurationGOOGLE( static_cast<VkDevice>( m_device ),
-                                                                   static_cast<VkSwapchainKHR>( swapchain ),
-                                                                   reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( pDisplayTimingProperties ) ) );
+    return static_cast<Result>( d.vkGetRefreshCycleDurationGOOGLE(
+      m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( pDisplayTimingProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RefreshCycleDurationGOOGLE>::type
-                       Device::getRefreshCycleDurationGOOGLE( SwapchainKHR swapchain, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE>::type
+                       Device::getRefreshCycleDurationGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetRefreshCycleDurationGOOGLE && "Function <vkGetRefreshCycleDurationGOOGLE> requires <VK_GOOGLE_display_timing>" );
 #  endif
 
-    RefreshCycleDurationGOOGLE displayTimingProperties;
-    Result                     result = static_cast<Result>( d.vkGetRefreshCycleDurationGOOGLE(
+    VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE displayTimingProperties;
+    VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRefreshCycleDurationGOOGLE(
       m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( &displayTimingProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRefreshCycleDurationGOOGLE" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRefreshCycleDurationGOOGLE" );
 
-    return detail::createResultValueType( result, std::move( displayTimingProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( displayTimingProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPastPresentationTimingGOOGLE( SwapchainKHR                   swapchain,
-                                                                                         uint32_t *                     pPresentationTimingCount,
-                                                                                         PastPresentationTimingGOOGLE * pPresentationTimings,
-                                                                                         Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                             uint32_t *                                           pPresentationTimingCount,
+                                             VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE * pPresentationTimings,
+                                             Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( m_device,
                                                                      static_cast<VkSwapchainKHR>( swapchain ),
                                                                      pPresentationTimingCount,
                                                                      reinterpret_cast<VkPastPresentationTimingGOOGLE *>( pPresentationTimings ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-  template <typename PastPresentationTimingGOOGLEAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, PastPresentationTimingGOOGLE>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename PastPresentationTimingGOOGLEAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>
-#  else
-    typename ResultValueType<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
-#  endif
-    Device::getPastPresentationTimingGOOGLE( SwapchainKHR swapchain, Dispatch const & d ) const
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
+    Device::getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPastPresentationTimingGOOGLE && "Function <vkGetPastPresentationTimingGOOGLE> requires <VK_GOOGLE_display_timing>" );
 #  endif
 
-    std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator> presentationTimings;
-    uint32_t                                                                         presentationTimingCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator> presentationTimings;
+    uint32_t                                                                                               presentationTimingCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                           result;
     do
     {
-      result =
-        static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( m_device, static_cast<VkSwapchainKHR>( swapchain ), &presentationTimingCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentationTimingCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPastPresentationTimingGOOGLE( m_device, static_cast<VkSwapchainKHR>( swapchain ), &presentationTimingCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentationTimingCount )
       {
         presentationTimings.resize( presentationTimingCount );
-        result = static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( m_device,
-                                                                           static_cast<VkSwapchainKHR>( swapchain ),
-                                                                           &presentationTimingCount,
-                                                                           reinterpret_cast<VkPastPresentationTimingGOOGLE *>( presentationTimings.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPastPresentationTimingGOOGLE( m_device,
+                                               static_cast<VkSwapchainKHR>( swapchain ),
+                                               &presentationTimingCount,
+                                               reinterpret_cast<VkPastPresentationTimingGOOGLE *>( presentationTimings.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE", { Result::eSuccess, Result::eIncomplete, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE" );
-#  endif
-
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE" );
     VULKAN_HPP_ASSERT( presentationTimingCount <= presentationTimings.size() );
     if ( presentationTimingCount < presentationTimings.size() )
     {
       presentationTimings.resize( presentationTimingCount );
     }
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    return ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>( result, std::move( presentationTimings ) );
-#  else
-    return detail::createResultValueType( result, std::move( presentationTimings ) );
-#  endif
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentationTimings ) );
   }
 
-  // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-  template <typename PastPresentationTimingGOOGLEAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, PastPresentationTimingGOOGLE>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <
+    typename PastPresentationTimingGOOGLEAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>::value,
+                            int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>
-#  else
-    typename ResultValueType<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
-#  endif
-    Device::getPastPresentationTimingGOOGLE( SwapchainKHR                            swapchain,
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
+    Device::getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR      swapchain,
                                              PastPresentationTimingGOOGLEAllocator & pastPresentationTimingGOOGLEAllocator,
                                              Dispatch const &                        d ) const
   {
@@ -14613,64 +13465,51 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetPastPresentationTimingGOOGLE && "Function <vkGetPastPresentationTimingGOOGLE> requires <VK_GOOGLE_display_timing>" );
 #  endif
 
-    std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator> presentationTimings( pastPresentationTimingGOOGLEAllocator );
-    uint32_t                                                                         presentationTimingCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator> presentationTimings(
+      pastPresentationTimingGOOGLEAllocator );
+    uint32_t                     presentationTimingCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result =
-        static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( m_device, static_cast<VkSwapchainKHR>( swapchain ), &presentationTimingCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentationTimingCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPastPresentationTimingGOOGLE( m_device, static_cast<VkSwapchainKHR>( swapchain ), &presentationTimingCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentationTimingCount )
       {
         presentationTimings.resize( presentationTimingCount );
-        result = static_cast<Result>( d.vkGetPastPresentationTimingGOOGLE( m_device,
-                                                                           static_cast<VkSwapchainKHR>( swapchain ),
-                                                                           &presentationTimingCount,
-                                                                           reinterpret_cast<VkPastPresentationTimingGOOGLE *>( presentationTimings.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPastPresentationTimingGOOGLE( m_device,
+                                               static_cast<VkSwapchainKHR>( swapchain ),
+                                               &presentationTimingCount,
+                                               reinterpret_cast<VkPastPresentationTimingGOOGLE *>( presentationTimings.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE", { Result::eSuccess, Result::eIncomplete, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE" );
-#  endif
-
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPastPresentationTimingGOOGLE" );
     VULKAN_HPP_ASSERT( presentationTimingCount <= presentationTimings.size() );
     if ( presentationTimingCount < presentationTimings.size() )
     {
       presentationTimings.resize( presentationTimingCount );
     }
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    return ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>( result, std::move( presentationTimings ) );
-#  else
-    return detail::createResultValueType( result, std::move( presentationTimings ) );
-#  endif
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentationTimings ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_discard_rectangles ===
 
-  // wrapper function for command vkCmdSetDiscardRectangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT( uint32_t         firstDiscardRectangle,
-                                                                uint32_t         discardRectangleCount,
-                                                                const Rect2D *   pDiscardRectangles,
-                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT( uint32_t                             firstDiscardRectangle,
+                                                                uint32_t                             discardRectangleCount,
+                                                                const VULKAN_HPP_NAMESPACE::Rect2D * pDiscardRectangles,
+                                                                Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDiscardRectangleEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstDiscardRectangle, discardRectangleCount, reinterpret_cast<const VkRect2D *>( pDiscardRectangles ) );
+    d.vkCmdSetDiscardRectangleEXT( m_commandBuffer, firstDiscardRectangle, discardRectangleCount, reinterpret_cast<const VkRect2D *>( pDiscardRectangles ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetDiscardRectangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT( uint32_t                         firstDiscardRectangle,
-                                                                ArrayProxy<const Rect2D> const & discardRectangles,
-                                                                Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT( uint32_t firstDiscardRectangle,
+                                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles,
+                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14682,46 +13521,40 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDiscardRectangleEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEnableEXT( Bool32 discardRectangleEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 discardRectangleEnable,
+                                                                      Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDiscardRectangleEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( discardRectangleEnable ) );
+    d.vkCmdSetDiscardRectangleEnableEXT( m_commandBuffer, static_cast<VkBool32>( discardRectangleEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDiscardRectangleModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleModeEXT( DiscardRectangleModeEXT discardRectangleMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleModeEXT( VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT discardRectangleMode,
+                                                                    Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDiscardRectangleModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDiscardRectangleModeEXT>( discardRectangleMode ) );
+    d.vkCmdSetDiscardRectangleModeEXT( m_commandBuffer, static_cast<VkDiscardRectangleModeEXT>( discardRectangleMode ) );
   }
 
   //=== VK_EXT_hdr_metadata ===
 
-  // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( uint32_t               swapchainCount,
-                                                    const SwapchainKHR *   pSwapchains,
-                                                    const HdrMetadataEXT * pMetadata,
-                                                    Dispatch const &       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( uint32_t                                     swapchainCount,
+                                                    const VULKAN_HPP_NAMESPACE::SwapchainKHR *   pSwapchains,
+                                                    const VULKAN_HPP_NAMESPACE::HdrMetadataEXT * pMetadata,
+                                                    Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkSetHdrMetadataEXT( static_cast<VkDevice>( m_device ),
-                           swapchainCount,
-                           reinterpret_cast<const VkSwapchainKHR *>( pSwapchains ),
-                           reinterpret_cast<const VkHdrMetadataEXT *>( pMetadata ) );
+    d.vkSetHdrMetadataEXT(
+      m_device, swapchainCount, reinterpret_cast<const VkSwapchainKHR *>( pSwapchains ), reinterpret_cast<const VkHdrMetadataEXT *>( pMetadata ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( ArrayProxy<const SwapchainKHR> const &   swapchains,
-                                                    ArrayProxy<const HdrMetadataEXT> const & metadata,
-                                                    Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const &   swapchains,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata,
+                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14745,83 +13578,83 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_create_renderpass2 ===
 
-  // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass2KHR( const RenderPassCreateInfo2 * pCreateInfo,
-                                                                              const AllocationCallbacks *   pAllocator,
-                                                                              RenderPass *                  pRenderPass,
-                                                                              Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 * pCreateInfo,
+                                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                              VULKAN_HPP_NAMESPACE::RenderPass *                  pRenderPass,
+                                                                              Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateRenderPass2KHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateRenderPass2KHR( m_device,
                                                           reinterpret_cast<const VkRenderPassCreateInfo2 *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                           reinterpret_cast<VkRenderPass *>( pRenderPass ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-    Device::createRenderPass2KHR( const RenderPassCreateInfo2 & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+                       Device::createRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &       createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRenderPass2KHR && "Function <vkCreateRenderPass2KHR> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #  endif
 
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass2KHR( m_device,
-                                                                   reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2KHR" );
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass2KHR( m_device,
+                                reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2KHR" );
 
-    return detail::createResultValueType( result, std::move( renderPass ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( renderPass ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-    Device::createRenderPass2KHRUnique( const RenderPassCreateInfo2 & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+                       Device::createRenderPass2KHRUnique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &       createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRenderPass2KHR && "Function <vkCreateRenderPass2KHR> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 #    endif
 
-    RenderPass renderPass;
-    Result     result = static_cast<Result>( d.vkCreateRenderPass2KHR( m_device,
-                                                                   reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2KHRUnique" );
+    VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateRenderPass2KHR( m_device,
+                                reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRenderPass2KHRUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<RenderPass, Dispatch>( renderPass, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>( renderPass, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const RenderPassBeginInfo * pRenderPassBegin,
-                                                             const SubpassBeginInfo *    pSubpassBeginInfo,
-                                                             Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                                                             const VULKAN_HPP_NAMESPACE::SubpassBeginInfo *    pSubpassBeginInfo,
+                                                             Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginRenderPass2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ),
-                                reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ) );
+    d.vkCmdBeginRenderPass2KHR(
+      m_commandBuffer, reinterpret_cast<const VkRenderPassBeginInfo *>( pRenderPassBegin ), reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const RenderPassBeginInfo & renderPassBegin,
-                                                             const SubpassBeginInfo &    subpassBeginInfo,
-                                                             Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                             const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo,
+                                                             Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14833,24 +13666,21 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const SubpassBeginInfo * pSubpassBeginInfo,
-                                                         const SubpassEndInfo *   pSubpassEndInfo,
-                                                         Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
+                                                         const VULKAN_HPP_NAMESPACE::SubpassEndInfo *   pSubpassEndInfo,
+                                                         Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdNextSubpass2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                            reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ),
-                            reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
+    d.vkCmdNextSubpass2KHR(
+      m_commandBuffer, reinterpret_cast<const VkSubpassBeginInfo *>( pSubpassBeginInfo ), reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const SubpassBeginInfo & subpassBeginInfo,
-                                                         const SubpassEndInfo &   subpassEndInfo,
-                                                         Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                                                         const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo,
+                                                         Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14862,18 +13692,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const SubpassEndInfo * pSubpassEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
+                                                           Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRenderPass2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
+    d.vkCmdEndRenderPass2KHR( m_commandBuffer, reinterpret_cast<const VkSubpassEndInfo *>( pSubpassEndInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const SubpassEndInfo & subpassEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo,
+                                                           Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14887,57 +13717,51 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_KHR_shared_presentable_image ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainStatusKHR( SwapchainKHR swapchain, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainStatusKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                               Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSwapchainStatusKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ) ) );
+    return static_cast<Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
   }
 #else
-  // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainStatusKHR( SwapchainKHR swapchain, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::getSwapchainStatusKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                                                     Dispatch const &                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSwapchainStatusKHR && "Function <vkGetSwapchainStatusKHR> requires <VK_KHR_shared_presentable_image>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSwapchainStatusKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR", { Result::eSuccess, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainStatusKHR", { Result::eSuccess, Result::eSuboptimalKHR } );
-#  endif
-
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_external_fence_capabilities ===
 
-  // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalFencePropertiesKHR( const PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                                                        ExternalFenceProperties *               pExternalFenceProperties,
-                                                                        Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                                                        VULKAN_HPP_NAMESPACE::ExternalFenceProperties *               pExternalFenceProperties,
+                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalFencePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    d.vkGetPhysicalDeviceExternalFencePropertiesKHR( m_physicalDevice,
                                                      reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( pExternalFenceInfo ),
                                                      reinterpret_cast<VkExternalFenceProperties *>( pExternalFenceProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalFenceProperties
-    PhysicalDevice::getExternalFencePropertiesKHR( const PhysicalDeviceExternalFenceInfo & externalFenceInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+    PhysicalDevice::getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo,
+                                                   Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -14945,7 +13769,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceExternalFencePropertiesKHR> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
 #  endif
 
-    ExternalFenceProperties externalFenceProperties;
+    VULKAN_HPP_NAMESPACE::ExternalFenceProperties externalFenceProperties;
     d.vkGetPhysicalDeviceExternalFencePropertiesKHR( m_physicalDevice,
                                                      reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
                                                      reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
@@ -14957,141 +13781,132 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_fence_win32 ===
 
-  // wrapper function for command vkImportFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importFenceWin32HandleKHR(
+    const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkImportFenceWin32HandleKHR( static_cast<VkDevice>( m_device ),
-                                                               reinterpret_cast<const VkImportFenceWin32HandleInfoKHR *>( pImportFenceWin32HandleInfo ) ) );
+    return static_cast<Result>(
+      d.vkImportFenceWin32HandleKHR( m_device, reinterpret_cast<const VkImportFenceWin32HandleInfoKHR *>( pImportFenceWin32HandleInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkImportFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo, Dispatch const & d ) const
+    Device::importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkImportFenceWin32HandleKHR && "Function <vkImportFenceWin32HandleKHR> requires <VK_KHR_external_fence_win32>" );
 #    endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkImportFenceWin32HandleKHR( m_device, reinterpret_cast<const VkImportFenceWin32HandleInfoKHR *>( &importFenceWin32HandleInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceWin32HandleKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceWin32HandleKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                                                HANDLE *                           pHandle,
-                                                                                Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
+                                                                                HANDLE *                                                 pHandle,
+                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetFenceWin32HandleKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
+      d.vkGetFenceWin32HandleKHR( m_device, reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( pGetWin32HandleInfo ), pHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                       Device::getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
+                       Device::getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR & getWin32HandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetFenceWin32HandleKHR && "Function <vkGetFenceWin32HandleKHR> requires <VK_KHR_external_fence_win32>" );
 #    endif
 
-    HANDLE handle;
-    Result result =
-      static_cast<Result>( d.vkGetFenceWin32HandleKHR( m_device, reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceWin32HandleKHR" );
+    HANDLE                       handle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetFenceWin32HandleKHR( m_device, reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceWin32HandleKHR" );
 
-    return detail::createResultValueType( result, std::move( handle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_KHR_external_fence_fd ===
 
-  // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importFenceFdKHR( const ImportFenceFdInfoKHR * pImportFenceFdInfo,
-                                                                          Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR * pImportFenceFdInfo,
+                                                                          Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkImportFenceFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportFenceFdInfoKHR *>( pImportFenceFdInfo ) ) );
+    return static_cast<Result>( d.vkImportFenceFdKHR( m_device, reinterpret_cast<const VkImportFenceFdInfoKHR *>( pImportFenceFdInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::importFenceFdKHR( const ImportFenceFdInfoKHR & importFenceFdInfo, Dispatch const & d ) const
+    Device::importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR & importFenceFdInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkImportFenceFdKHR && "Function <vkImportFenceFdKHR> requires <VK_KHR_external_fence_fd>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkImportFenceFdKHR( m_device, reinterpret_cast<const VkImportFenceFdInfoKHR *>( &importFenceFdInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceFdKHR" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkImportFenceFdKHR( m_device, reinterpret_cast<const VkImportFenceFdInfoKHR *>( &importFenceFdInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceFdKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceFdKHR( const FenceGetFdInfoKHR * pGetFdInfo,
-                                                                       int *                     pFd,
-                                                                       Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR * pGetFdInfo,
+                                                                       int *                                           pFd,
+                                                                       Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetFenceFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkFenceGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
+    return static_cast<Result>( d.vkGetFenceFdKHR( m_device, reinterpret_cast<const VkFenceGetFdInfoKHR *>( pGetFdInfo ), pFd ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getFenceFdKHR( const FenceGetFdInfoKHR & getFdInfo,
-                                                                                                    Dispatch const &          d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR & getFdInfo,
+                                                                                                    Dispatch const &                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetFenceFdKHR && "Function <vkGetFenceFdKHR> requires <VK_KHR_external_fence_fd>" );
 #  endif
 
-    int    fd;
-    Result result = static_cast<Result>( d.vkGetFenceFdKHR( m_device, reinterpret_cast<const VkFenceGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceFdKHR" );
+    int                          fd;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetFenceFdKHR( m_device, reinterpret_cast<const VkFenceGetFdInfoKHR *>( &getFdInfo ), &fd ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceFdKHR" );
 
-    return detail::createResultValueType( result, std::move( fd ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_performance_query ===
 
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                           queueFamilyIndex,
-                                                                     uint32_t *                         pCounterCount,
-                                                                     PerformanceCounterKHR *            pCounters,
-                                                                     PerformanceCounterDescriptionKHR * pCounterDescriptions,
-                                                                     Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+    PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                                                 queueFamilyIndex,
+                                                                     uint32_t *                                               pCounterCount,
+                                                                     VULKAN_HPP_NAMESPACE::PerformanceCounterKHR *            pCounters,
+                                                                     VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR * pCounterDescriptions,
+                                                                     Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+      d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( m_physicalDevice,
                                                                          queueFamilyIndex,
                                                                          pCounterCount,
                                                                          reinterpret_cast<VkPerformanceCounterKHR *>( pCounters ),
@@ -15099,18 +13914,10 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-  template <typename PerformanceCounterKHRAllocator,
-            typename PerformanceCounterDescriptionKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PerformanceCounterKHRAllocator::value_type, PerformanceCounterKHR>::value &&
-                                      std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, PerformanceCounterDescriptionKHR>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename PerformanceCounterKHRAllocator, typename PerformanceCounterDescriptionKHRAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-                                       std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
+    typename ResultValueType<std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+                                       std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
     PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t queueFamilyIndex, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -15119,51 +13926,49 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR> requires <VK_KHR_performance_query>" );
 #  endif
 
-    std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-              std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>
-                                                                                               data_;
-    std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator> &                       counters            = data_.first;
-    std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator> & counterDescriptions = data_.second;
-    uint32_t                                                                                   counterCount;
-    Result                                                                                     result;
+    std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+              std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>
+                                                                                                                     data_;
+    std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator> &                       counters            = data_.first;
+    std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator> & counterDescriptions = data_.second;
+    uint32_t                                                                                                         counterCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                     result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( m_physicalDevice, queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-      if ( ( result == Result::eSuccess ) && counterCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && counterCount )
       {
         counters.resize( counterCount );
         counterDescriptions.resize( counterCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
           m_physicalDevice,
           queueFamilyIndex,
           &counterCount,
           reinterpret_cast<VkPerformanceCounterKHR *>( counters.data() ),
           reinterpret_cast<VkPerformanceCounterDescriptionKHR *>( counterDescriptions.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
     VULKAN_HPP_ASSERT( counterCount <= counters.size() );
     if ( counterCount < counters.size() )
     {
       counters.resize( counterCount );
       counterDescriptions.resize( counterCount );
     }
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
   template <typename PerformanceCounterKHRAllocator,
             typename PerformanceCounterDescriptionKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PerformanceCounterKHRAllocator::value_type, PerformanceCounterKHR>::value &&
-                                      std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, PerformanceCounterDescriptionKHR>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<
+              std::is_same<typename PerformanceCounterKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>::value &&
+                std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>::value,
+              int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-                                       std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
+    typename ResultValueType<std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+                                       std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
     PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                                    queueFamilyIndex,
                                                                      PerformanceCounterKHRAllocator &            performanceCounterKHRAllocator,
                                                                      PerformanceCounterDescriptionKHRAllocator & performanceCounterDescriptionKHRAllocator,
@@ -15175,60 +13980,56 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR> requires <VK_KHR_performance_query>" );
 #  endif
 
-    std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-              std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>
+    std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+              std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>
       data_(
         std::piecewise_construct, std::forward_as_tuple( performanceCounterKHRAllocator ), std::forward_as_tuple( performanceCounterDescriptionKHRAllocator ) );
-    std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator> &                       counters            = data_.first;
-    std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator> & counterDescriptions = data_.second;
-    uint32_t                                                                                   counterCount;
-    Result                                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator> &                       counters            = data_.first;
+    std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator> & counterDescriptions = data_.second;
+    uint32_t                                                                                                         counterCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                     result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( m_physicalDevice, queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-      if ( ( result == Result::eSuccess ) && counterCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && counterCount )
       {
         counters.resize( counterCount );
         counterDescriptions.resize( counterCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
           m_physicalDevice,
           queueFamilyIndex,
           &counterCount,
           reinterpret_cast<VkPerformanceCounterKHR *>( counters.data() ),
           reinterpret_cast<VkPerformanceCounterDescriptionKHR *>( counterDescriptions.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
     VULKAN_HPP_ASSERT( counterCount <= counters.size() );
     if ( counterCount < counters.size() )
     {
       counters.resize( counterCount );
       counterDescriptions.resize( counterCount );
     }
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR( const QueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
-                                                                                  uint32_t *                                pNumPasses,
-                                                                                  Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR( const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
+                                                             uint32_t *                                                      pNumPasses,
+                                                             Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                               reinterpret_cast<const VkQueryPoolPerformanceCreateInfoKHR *>( pPerformanceQueryCreateInfo ),
-                                                               pNumPasses );
+    d.vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
+      m_physicalDevice, reinterpret_cast<const VkQueryPoolPerformanceCreateInfoKHR *>( pPerformanceQueryCreateInfo ), pNumPasses );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR(
-    const QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15244,63 +14045,57 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR * pInfo,
-                                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR * pInfo,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkAcquireProfilingLockKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( pInfo ) ) );
+    return static_cast<Result>( d.vkAcquireProfilingLockKHR( m_device, reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR & info, Dispatch const & d ) const
+    Device::acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireProfilingLockKHR && "Function <vkAcquireProfilingLockKHR> requires <VK_KHR_performance_query>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkAcquireProfilingLockKHR( m_device, reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( &info ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireProfilingLockKHR" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireProfilingLockKHR( m_device, reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( &info ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireProfilingLockKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkReleaseProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseProfilingLockKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::releaseProfilingLockKHR( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkReleaseProfilingLockKHR( static_cast<VkDevice>( m_device ) );
+    d.vkReleaseProfilingLockKHR( m_device );
   }
 
   //=== VK_KHR_get_surface_capabilities2 ===
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                                                            SurfaceCapabilities2KHR *             pSurfaceCapabilities,
-                                                                                            Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR *             pSurfaceCapabilities,
+                                                Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( m_physicalDevice,
                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ),
                                                                               reinterpret_cast<VkSurfaceCapabilities2KHR *>( pSurfaceCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilities2KHR>::type
-                       PhysicalDevice::getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR>::type
+    PhysicalDevice::getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15308,21 +14103,19 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfaceCapabilities2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 #  endif
 
-    SurfaceCapabilities2KHR surfaceCapabilities;
-    Result                  result =
-      static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( m_physicalDevice,
-                                                                         reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                         reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
+    VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR surfaceCapabilities;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( m_physicalDevice,
+                                                    reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                    reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
 
-    return detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                       PhysicalDevice::getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+    PhysicalDevice::getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15330,42 +14123,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfaceCapabilities2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    SurfaceCapabilities2KHR &  surfaceCapabilities = structureChain.template get<SurfaceCapabilities2KHR>();
-    Result                     result =
-      static_cast<Result>( d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( m_physicalDevice,
-                                                                         reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                         reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
+    StructureChain<X, Y, Z...>                      structureChain;
+    VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR & surfaceCapabilities = structureChain.template get<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR>();
+    VULKAN_HPP_NAMESPACE::Result                    result              = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetPhysicalDeviceSurfaceCapabilities2KHR( m_physicalDevice,
+                                                    reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                    reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                                                       uint32_t *                            pSurfaceFormatCount,
-                                                                                       SurfaceFormat2KHR *                   pSurfaceFormats,
-                                                                                       Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                                                       uint32_t *                                pSurfaceFormatCount,
+                                                                                       VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR * pSurfaceFormats,
+                                                                                       Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
                                                                          reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ),
                                                                          pSurfaceFormatCount,
                                                                          reinterpret_cast<VkSurfaceFormat2KHR *>( pSurfaceFormats ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-  template <typename SurfaceFormat2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, SurfaceFormat2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
-                       PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+  template <typename SurfaceFormat2KHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
+    PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15373,41 +14159,39 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfaceFormats2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 #  endif
 
-    std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator> surfaceFormats;
-    uint32_t                                                   surfaceFormatCount;
-    Result                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator> surfaceFormats;
+    uint32_t                                                                         surfaceFormatCount;
+    VULKAN_HPP_NAMESPACE::Result                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         surfaceFormats.resize( surfaceFormatCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
-                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                               &surfaceFormatCount,
-                                                                               reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                   &surfaceFormatCount,
+                                                   reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
       surfaceFormats.resize( surfaceFormatCount );
     }
-    return detail::createResultValueType( result, std::move( surfaceFormats ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
   template <typename SurfaceFormat2KHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, SurfaceFormat2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
-                       PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                                           SurfaceFormat2KHRAllocator &          surfaceFormat2KHRAllocator,
-                                           Dispatch const &                      d ) const
+            typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
+                       PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                           SurfaceFormat2KHRAllocator &                                surfaceFormat2KHRAllocator,
+                                           Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15415,40 +14199,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfaceFormats2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 #  endif
 
-    std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator> surfaceFormats( surfaceFormat2KHRAllocator );
-    uint32_t                                                   surfaceFormatCount;
-    Result                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator> surfaceFormats( surfaceFormat2KHRAllocator );
+    uint32_t                                                                         surfaceFormatCount;
+    VULKAN_HPP_NAMESPACE::Result                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         surfaceFormats.resize( surfaceFormatCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
-                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                               &surfaceFormatCount,
-                                                                               reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                   &surfaceFormatCount,
+                                                   reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
       surfaceFormats.resize( surfaceFormatCount );
     }
-    return detail::createResultValueType( result, std::move( surfaceFormats ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename StructureChain, typename StructureChainAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-                       PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+    PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15457,28 +14236,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     std::vector<StructureChain, StructureChainAllocator> structureChains;
-    std::vector<SurfaceFormat2KHR>                       surfaceFormats;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR> surfaceFormats;
     uint32_t                                             surfaceFormatCount;
-    Result                                               result;
+    VULKAN_HPP_NAMESPACE::Result                         result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         structureChains.resize( surfaceFormatCount );
         surfaceFormats.resize( surfaceFormatCount );
         for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
         {
-          surfaceFormats[i].pNext = structureChains[i].template get<SurfaceFormat2KHR>().pNext;
+          surfaceFormats[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>().pNext;
         }
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
-                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                               &surfaceFormatCount,
-                                                                               reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                   &surfaceFormatCount,
+                                                   reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
@@ -15486,22 +14266,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
     for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
     {
-      structureChains[i].template get<SurfaceFormat2KHR>() = surfaceFormats[i];
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>() = surfaceFormats[i];
     }
-    return detail::createResultValueType( result, std::move( structureChains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChains ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
   template <typename StructureChain,
             typename StructureChainAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-                       PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                                           StructureChainAllocator &             structureChainAllocator,
-                                           Dispatch const &                      d ) const
+                       PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                           StructureChainAllocator &                                   structureChainAllocator,
+                                           Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15510,28 +14287,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     std::vector<StructureChain, StructureChainAllocator> structureChains( structureChainAllocator );
-    std::vector<SurfaceFormat2KHR>                       surfaceFormats;
+    std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR> surfaceFormats;
     uint32_t                                             surfaceFormatCount;
-    Result                                               result;
+    VULKAN_HPP_NAMESPACE::Result                         result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &surfaceFormatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
       {
         structureChains.resize( surfaceFormatCount );
         surfaceFormats.resize( surfaceFormatCount );
         for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
         {
-          surfaceFormats[i].pNext = structureChains[i].template get<SurfaceFormat2KHR>().pNext;
+          surfaceFormats[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>().pNext;
         }
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
-                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                               &surfaceFormatCount,
-                                                                               reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice,
+                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                   &surfaceFormatCount,
+                                                   reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
     VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
     if ( surfaceFormatCount < surfaceFormats.size() )
     {
@@ -15539,35 +14317,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
     for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
     {
-      structureChains[i].template get<SurfaceFormat2KHR>() = surfaceFormats[i];
+      structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>() = surfaceFormats[i];
     }
-    return detail::createResultValueType( result, std::move( structureChains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChains ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_get_display_properties2 ===
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayProperties2KHR( uint32_t *              pPropertyCount,
-                                                                                          DisplayProperties2KHR * pProperties,
-                                                                                          Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayProperties2KHR( uint32_t *                                    pPropertyCount,
+                                                                                          VULKAN_HPP_NAMESPACE::DisplayProperties2KHR * pProperties,
+                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceDisplayProperties2KHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkDisplayProperties2KHR *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, pPropertyCount, reinterpret_cast<VkDisplayProperties2KHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-  template <typename DisplayProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, DisplayProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
-                       PhysicalDevice::getDisplayProperties2KHR( Dispatch const & d ) const
+  template <typename DisplayProperties2KHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
+    PhysicalDevice::getDisplayProperties2KHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15575,36 +14347,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceDisplayProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator> properties;
-    uint32_t                                                           propertyCount;
-    Result                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator> properties;
+    uint32_t                                                                                 propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-  template <typename DisplayProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, DisplayProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
-                       PhysicalDevice::getDisplayProperties2KHR( DisplayProperties2KHRAllocator & displayProperties2KHRAllocator, Dispatch const & d ) const
+  template <
+    typename DisplayProperties2KHRAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayProperties2KHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
+    PhysicalDevice::getDisplayProperties2KHR( DisplayProperties2KHRAllocator & displayProperties2KHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15612,50 +14383,44 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceDisplayProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator> properties( displayProperties2KHRAllocator );
-    uint32_t                                                           propertyCount;
-    Result                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator> properties( displayProperties2KHRAllocator );
+    uint32_t                                                                                 propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceDisplayProperties2KHR( m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneProperties2KHR( uint32_t *                   pPropertyCount,
-                                                                                               DisplayPlaneProperties2KHR * pProperties,
-                                                                                               Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneProperties2KHR( uint32_t * pPropertyCount,
+                                                                                               VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR * pProperties,
+                                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkDisplayPlaneProperties2KHR *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR( m_physicalDevice, pPropertyCount, reinterpret_cast<VkDisplayPlaneProperties2KHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-  template <typename DisplayPlaneProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, DisplayPlaneProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
-                       PhysicalDevice::getDisplayPlaneProperties2KHR( Dispatch const & d ) const
+  template <typename DisplayPlaneProperties2KHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
+    PhysicalDevice::getDisplayPlaneProperties2KHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -15663,35 +14428,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceDisplayPlaneProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator> properties;
-    uint32_t                                                                     propertyCount;
-    Result                                                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator> properties;
+    uint32_t                                                                                           propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPlaneProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-  template <typename DisplayPlaneProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, DisplayPlaneProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
+  template <
+    typename DisplayPlaneProperties2KHRAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
     PhysicalDevice::getDisplayPlaneProperties2KHR( DisplayPlaneProperties2KHRAllocator & displayPlaneProperties2KHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -15700,89 +14465,82 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceDisplayPlaneProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator> properties( displayPlaneProperties2KHRAllocator );
-    uint32_t                                                                     propertyCount;
-    Result                                                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator> properties( displayPlaneProperties2KHRAllocator );
+    uint32_t                                                                                           propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkDisplayPlaneProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDisplayModeProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModeProperties2KHR( DisplayKHR                  display,
-                                                                                              uint32_t *                  pPropertyCount,
-                                                                                              DisplayModeProperties2KHR * pProperties,
-                                                                                              Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                                                              uint32_t *                                        pPropertyCount,
+                                                                                              VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR * pProperties,
+                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDisplayModeProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                  static_cast<VkDisplayKHR>( display ),
-                                                                  pPropertyCount,
-                                                                  reinterpret_cast<VkDisplayModeProperties2KHR *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetDisplayModeProperties2KHR(
+      m_physicalDevice, static_cast<VkDisplayKHR>( display ), pPropertyCount, reinterpret_cast<VkDisplayModeProperties2KHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDisplayModeProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-  template <typename DisplayModeProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, DisplayModeProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
-                       PhysicalDevice::getDisplayModeProperties2KHR( DisplayKHR display, Dispatch const & d ) const
+  template <typename DisplayModeProperties2KHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
+    PhysicalDevice::getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDisplayModeProperties2KHR && "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator> properties;
-    uint32_t                                                                   propertyCount;
-    Result                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator> properties;
+    uint32_t                                                                                         propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayModeProperties2KHR(
           m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetDisplayModeProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-  template <typename DisplayModeProperties2KHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, DisplayModeProperties2KHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
-                       PhysicalDevice::getDisplayModeProperties2KHR( DisplayKHR                           display,
+  template <
+    typename DisplayModeProperties2KHRAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
+    PhysicalDevice::getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR     display,
                                                   DisplayModeProperties2KHRAllocator & displayModeProperties2KHRAllocator,
                                                   Dispatch const &                     d ) const
   {
@@ -15791,216 +14549,124 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDisplayModeProperties2KHR && "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator> properties( displayModeProperties2KHRAllocator );
-    uint32_t                                                                   propertyCount;
-    Result                                                                     result;
+    std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator> properties( displayModeProperties2KHRAllocator );
+    uint32_t                                                                                         propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                     result;
     do
     {
-      result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayModeProperties2KHR(
           m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-
-  // wrapper function for command vkGetDisplayModeProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-                       PhysicalDevice::getDisplayModeProperties2KHR( DisplayKHR display, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDisplayModeProperties2KHR && "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains;
-    std::vector<DisplayModeProperties2KHR>               properties;
-    uint32_t                                             propertyCount;
-    Result                                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        structureChains.resize( propertyCount );
-        properties.resize( propertyCount );
-        for ( uint32_t i = 0; i < propertyCount; i++ )
-        {
-          properties[i].pNext = structureChains[i].template get<DisplayModeProperties2KHR>().pNext;
-        }
-        result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR(
-          m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      structureChains.resize( propertyCount );
-    }
-    for ( uint32_t i = 0; i < propertyCount; i++ )
-    {
-      structureChains[i].template get<DisplayModeProperties2KHR>() = properties[i];
-    }
-    return detail::createResultValueType( result, std::move( structureChains ) );
-  }
-
-  // wrapper function for command vkGetDisplayModeProperties2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-  template <typename StructureChain,
-            typename StructureChainAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-    PhysicalDevice::getDisplayModeProperties2KHR( DisplayKHR display, StructureChainAllocator & structureChainAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDisplayModeProperties2KHR && "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
-#  endif
-
-    std::vector<StructureChain, StructureChainAllocator> structureChains( structureChainAllocator );
-    std::vector<DisplayModeProperties2KHR>               properties;
-    uint32_t                                             propertyCount;
-    Result                                               result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR( m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        structureChains.resize( propertyCount );
-        properties.resize( propertyCount );
-        for ( uint32_t i = 0; i < propertyCount; i++ )
-        {
-          properties[i].pNext = structureChains[i].template get<DisplayModeProperties2KHR>().pNext;
-        }
-        result = static_cast<Result>( d.vkGetDisplayModeProperties2KHR(
-          m_physicalDevice, static_cast<VkDisplayKHR>( display ), &propertyCount, reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayModeProperties2KHR" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      structureChains.resize( propertyCount );
-    }
-    for ( uint32_t i = 0; i < propertyCount; i++ )
-    {
-      structureChains[i].template get<DisplayModeProperties2KHR>() = properties[i];
-    }
-    return detail::createResultValueType( result, std::move( structureChains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
-                                                                                                 DisplayPlaneCapabilities2KHR * pCapabilities,
-                                                                                                 Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
+                                                     VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR * pCapabilities,
+                                                     Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDisplayPlaneCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetDisplayPlaneCapabilities2KHR( m_physicalDevice,
                                                                      reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( pDisplayPlaneInfo ),
                                                                      reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( pCapabilities ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayPlaneCapabilities2KHR>::type
-                       PhysicalDevice::getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR & displayPlaneInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR>::type
+    PhysicalDevice::getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR & displayPlaneInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDisplayPlaneCapabilities2KHR && "Function <vkGetDisplayPlaneCapabilities2KHR> requires <VK_KHR_get_display_properties2>" );
 #  endif
 
-    DisplayPlaneCapabilities2KHR capabilities;
-    Result                       result = static_cast<Result>( d.vkGetDisplayPlaneCapabilities2KHR( m_physicalDevice,
-                                                                              reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( &displayPlaneInfo ),
-                                                                              reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( &capabilities ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilities2KHR" );
+    VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR capabilities;
+    VULKAN_HPP_NAMESPACE::Result                       result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDisplayPlaneCapabilities2KHR( m_physicalDevice,
+                                                                                      reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( &displayPlaneInfo ),
+                                                                                      reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( &capabilities ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilities2KHR" );
 
-    return detail::createResultValueType( result, std::move( capabilities ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_IOS_MVK )
   //=== VK_MVK_ios_surface ===
 
-  // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createIOSSurfaceMVK( const IOSSurfaceCreateInfoMVK * pCreateInfo,
-                                                                               const AllocationCallbacks *     pAllocator,
-                                                                               SurfaceKHR *                    pSurface,
-                                                                               Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createIOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK * pCreateInfo,
+                                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                                               VULKAN_HPP_NAMESPACE::SurfaceKHR *                    pSurface,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateIOSSurfaceMVK( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateIOSSurfaceMVK( m_instance,
                                                          reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( pCreateInfo ),
                                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                          reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createIOSSurfaceMVK( const IOSSurfaceCreateInfoMVK & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createIOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK &     createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateIOSSurfaceMVK && "Function <vkCreateIOSSurfaceMVK> requires <VK_MVK_ios_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateIOSSurfaceMVK( m_instance,
-                                                                  reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createIOSSurfaceMVK" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateIOSSurfaceMVK( m_instance,
+                               reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createIOSSurfaceMVK" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-    Instance::createIOSSurfaceMVKUnique( const IOSSurfaceCreateInfoMVK & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createIOSSurfaceMVKUnique( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK &     createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                         Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateIOSSurfaceMVK && "Function <vkCreateIOSSurfaceMVK> requires <VK_MVK_ios_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateIOSSurfaceMVK( m_instance,
-                                                                  reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createIOSSurfaceMVKUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateIOSSurfaceMVK( m_instance,
+                               reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createIOSSurfaceMVKUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -16009,61 +14675,64 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
   //=== VK_MVK_macos_surface ===
 
-  // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createMacOSSurfaceMVK( const MacOSSurfaceCreateInfoMVK * pCreateInfo,
-                                                                                 const AllocationCallbacks *       pAllocator,
-                                                                                 SurfaceKHR *                      pSurface,
-                                                                                 Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createMacOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK * pCreateInfo,
+                                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                                 VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateMacOSSurfaceMVK( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateMacOSSurfaceMVK( m_instance,
                                                            reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( pCreateInfo ),
                                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                            reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createMacOSSurfaceMVK( const MacOSSurfaceCreateInfoMVK & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createMacOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK &   createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMacOSSurfaceMVK && "Function <vkCreateMacOSSurfaceMVK> requires <VK_MVK_macos_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateMacOSSurfaceMVK( m_instance,
-                                                                    reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMacOSSurfaceMVK" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMacOSSurfaceMVK( m_instance,
+                                 reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMacOSSurfaceMVK" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createMacOSSurfaceMVKUnique(
-    const MacOSSurfaceCreateInfoMVK & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createMacOSSurfaceMVKUnique( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK &   createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                           Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMacOSSurfaceMVK && "Function <vkCreateMacOSSurfaceMVK> requires <VK_MVK_macos_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateMacOSSurfaceMVK( m_instance,
-                                                                    reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMacOSSurfaceMVKUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMacOSSurfaceMVK( m_instance,
+                                 reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMacOSSurfaceMVKUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -16071,106 +14740,70 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_utils ===
 
-  // wrapper function for command vkSetDebugUtilsObjectNameEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT * pNameInfo,
-                                                                                    Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT * pNameInfo,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkSetDebugUtilsObjectNameEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( pNameInfo ) ) );
+    return static_cast<Result>( d.vkSetDebugUtilsObjectNameEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( pNameInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetDebugUtilsObjectNameEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT & nameInfo, Dispatch const & d ) const
+    Device::setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT & nameInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSetDebugUtilsObjectNameEXT && "Function <vkSetDebugUtilsObjectNameEXT> requires <VK_EXT_debug_utils>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkSetDebugUtilsObjectNameEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( &nameInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectNameEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkSetDebugUtilsObjectNameEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( &nameInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectNameEXT" );
 
-    return detail::createResultValueType( result );
-  }
-
-  // wrapper function for command vkSetDebugUtilsObjectNameEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-  template <typename HandleType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::setDebugUtilsObjectNameEXT( HandleType const & handle, std::string const & name, Dispatch const & d ) const
-  {
-    VULKAN_HPP_STATIC_ASSERT( VULKAN_HPP_NAMESPACE::isVulkanHandleType<HandleType>::value, "HandleType must be a Vulkan handle type" );
-    // It might be, that neither constructors, nor setters, nor designated initializers are available... need to explicitly set member by member
-    VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT nameInfo;
-    nameInfo.objectType   = handle.objectType;
-    nameInfo.objectHandle = reinterpret_cast<uint64_t>( static_cast<typename HandleType::CType>( handle ) );
-    nameInfo.pObjectName  = name.c_str();
-    return setDebugUtilsObjectNameEXT( nameInfo, d );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT * pTagInfo,
-                                                                                   Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT * pTagInfo,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkSetDebugUtilsObjectTagEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( pTagInfo ) ) );
+    return static_cast<Result>( d.vkSetDebugUtilsObjectTagEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( pTagInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT & tagInfo, Dispatch const & d ) const
+    Device::setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT & tagInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSetDebugUtilsObjectTagEXT && "Function <vkSetDebugUtilsObjectTagEXT> requires <VK_EXT_debug_utils>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkSetDebugUtilsObjectTagEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( &tagInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectTagEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkSetDebugUtilsObjectTagEXT( m_device, reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( &tagInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectTagEXT" );
 
-    return detail::createResultValueType( result );
-  }
-
-  // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-  template <typename HandleType, typename TagType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::setDebugUtilsObjectTagEXT( HandleType const & handle, uint64_t name, TagType const & tag, Dispatch const & d ) const
-  {
-    VULKAN_HPP_STATIC_ASSERT( VULKAN_HPP_NAMESPACE::isVulkanHandleType<HandleType>::value, "HandleType must be a Vulkan handle type" );
-    // It might be, that neither constructors, nor setters, nor designated initializers are available... need to explicitly set member by member
-    VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT tagInfo;
-    tagInfo.objectType   = handle.objectType;
-    tagInfo.objectHandle = reinterpret_cast<uint64_t>( static_cast<typename HandleType::CType>( handle ) );
-    tagInfo.tagName      = name;
-    tagInfo.tagSize      = sizeof( TagType );
-    tagInfo.pTag         = &tag;
-    return setDebugUtilsObjectTagEXT( tagInfo, d );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                                         Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkQueueBeginDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
+    d.vkQueueBeginDebugUtilsLabelEXT( m_queue, reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                                         Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16181,28 +14814,25 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueueEndDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueEndDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void Queue::endDebugUtilsLabelEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkQueueEndDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ) );
+    d.vkQueueEndDebugUtilsLabelEXT( m_queue );
   }
 
-  // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                                          Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkQueueInsertDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
+    d.vkQueueInsertDebugUtilsLabelEXT( m_queue, reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                                          Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16213,18 +14843,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                                                 Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginDebugUtilsLabelEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
+    d.vkCmdBeginDebugUtilsLabelEXT( m_commandBuffer, reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                                                 Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16235,28 +14865,25 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEndDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::endDebugUtilsLabelEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndDebugUtilsLabelEXT( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdEndDebugUtilsLabelEXT( m_commandBuffer );
   }
 
-  // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                                                  Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdInsertDebugUtilsLabelEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
+    d.vkCmdInsertDebugUtilsLabelEXT( m_commandBuffer, reinterpret_cast<const VkDebugUtilsLabelEXT *>( pLabelInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                                                  Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16267,90 +14894,84 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDebugUtilsMessengerEXT( const DebugUtilsMessengerCreateInfoEXT * pCreateInfo,
-                                                                                        const AllocationCallbacks *              pAllocator,
-                                                                                        DebugUtilsMessengerEXT *                 pMessenger,
-                                                                                        Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::createDebugUtilsMessengerEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT * pCreateInfo,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                            VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT *                 pMessenger,
+                                            Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDebugUtilsMessengerEXT( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateDebugUtilsMessengerEXT( m_instance,
                                                                   reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( pCreateInfo ),
                                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                   reinterpret_cast<VkDebugUtilsMessengerEXT *>( pMessenger ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DebugUtilsMessengerEXT>::type Instance::createDebugUtilsMessengerEXT(
-    const DebugUtilsMessengerCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>::type
+                       Instance::createDebugUtilsMessengerEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                            Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDebugUtilsMessengerEXT && "Function <vkCreateDebugUtilsMessengerEXT> requires <VK_EXT_debug_utils>" );
 #  endif
 
-    DebugUtilsMessengerEXT messenger;
-    Result                 result = static_cast<Result>( d.vkCreateDebugUtilsMessengerEXT( m_instance,
-                                                                           reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugUtilsMessengerEXT" );
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT messenger;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDebugUtilsMessengerEXT(
+      m_instance,
+      reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugUtilsMessengerEXT" );
 
-    return detail::createResultValueType( result, std::move( messenger ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( messenger ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DebugUtilsMessengerEXT, Dispatch>>::type
-                       Instance::createDebugUtilsMessengerEXTUnique( const DebugUtilsMessengerCreateInfoEXT & createInfo,
-                                                  Optional<const AllocationCallbacks>      allocator,
-                                                  Dispatch const &                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT, Dispatch>>::type
+                       Instance::createDebugUtilsMessengerEXTUnique( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                                  Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDebugUtilsMessengerEXT && "Function <vkCreateDebugUtilsMessengerEXT> requires <VK_EXT_debug_utils>" );
 #    endif
 
-    DebugUtilsMessengerEXT messenger;
-    Result                 result = static_cast<Result>( d.vkCreateDebugUtilsMessengerEXT( m_instance,
-                                                                           reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugUtilsMessengerEXTUnique" );
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT messenger;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDebugUtilsMessengerEXT(
+      m_instance,
+      reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDebugUtilsMessengerEXTUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DebugUtilsMessengerEXT, Dispatch>( messenger, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT, Dispatch>( messenger, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroyDebugUtilsMessengerEXT( DebugUtilsMessengerEXT      messenger,
-                                                                  const AllocationCallbacks * pAllocator,
-                                                                  Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDebugUtilsMessengerEXT( static_cast<VkInstance>( m_instance ),
-                                       static_cast<VkDebugUtilsMessengerEXT>( messenger ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDebugUtilsMessengerEXT(
+      m_instance, static_cast<VkDebugUtilsMessengerEXT>( messenger ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::destroyDebugUtilsMessengerEXT( DebugUtilsMessengerEXT              messenger,
-                                                                  Optional<const AllocationCallbacks> allocator,
-                                                                  Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT              messenger,
+                                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16358,28 +14979,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDebugUtilsMessengerEXT(
-      m_instance, static_cast<VkDebugUtilsMessengerEXT>( messenger ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_instance,
+      static_cast<VkDebugUtilsMessengerEXT>( messenger ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Instance::destroy( DebugUtilsMessengerEXT messenger, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDebugUtilsMessengerEXT( static_cast<VkInstance>( m_instance ),
-                                       static_cast<VkDebugUtilsMessengerEXT>( messenger ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyDebugUtilsMessengerEXT(
+      m_instance, static_cast<VkDebugUtilsMessengerEXT>( messenger ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Instance::destroy( DebugUtilsMessengerEXT messenger, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT              messenger,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16387,31 +15007,31 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDebugUtilsMessengerEXT(
-      m_instance, static_cast<VkDebugUtilsMessengerEXT>( messenger ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_instance,
+      static_cast<VkDebugUtilsMessengerEXT>( messenger ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSubmitDebugUtilsMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                                               DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                                               const DebugUtilsMessengerCallbackDataEXT * pCallbackData,
-                                                               Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                                               VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                                               const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT * pCallbackData,
+                                                               Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkSubmitDebugUtilsMessageEXT( static_cast<VkInstance>( m_instance ),
+    d.vkSubmitDebugUtilsMessageEXT( m_instance,
                                     static_cast<VkDebugUtilsMessageSeverityFlagBitsEXT>( messageSeverity ),
                                     static_cast<VkDebugUtilsMessageTypeFlagsEXT>( messageTypes ),
                                     reinterpret_cast<const VkDebugUtilsMessengerCallbackDataEXT *>( pCallbackData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSubmitDebugUtilsMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                                               DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                                               const DebugUtilsMessengerCallbackDataEXT & callbackData,
-                                                               Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                                               VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                                               const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT & callbackData,
+                                                               Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16428,23 +15048,20 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_ANDROID_external_memory_android_hardware_buffer ===
 
-  // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer *           buffer,
-                                                                                                   AndroidHardwareBufferPropertiesANDROID * pProperties,
-                                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer *                                 buffer,
+                                                       VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID * pProperties,
+                                                       Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetAndroidHardwareBufferPropertiesANDROID(
-      static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( pProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetAndroidHardwareBufferPropertiesANDROID( m_device, buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( pProperties ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AndroidHardwareBufferPropertiesANDROID>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID>::type
                        Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -16453,18 +15070,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetAndroidHardwareBufferPropertiesANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 #    endif
 
-    AndroidHardwareBufferPropertiesANDROID properties;
-    Result                                 result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID properties;
+    VULKAN_HPP_NAMESPACE::Result                                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetAndroidHardwareBufferPropertiesANDROID( m_device, &buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
 
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
                        Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -16473,34 +15088,32 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetAndroidHardwareBufferPropertiesANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 #    endif
 
-    StructureChain<X, Y, Z...>               structureChain;
-    AndroidHardwareBufferPropertiesANDROID & properties = structureChain.template get<AndroidHardwareBufferPropertiesANDROID>();
-    Result                                   result     = static_cast<Result>(
+    StructureChain<X, Y, Z...>                                     structureChain;
+    VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID & properties =
+      structureChain.template get<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID>();
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetAndroidHardwareBufferPropertiesANDROID( m_device, &buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
-                                                                                               struct AHardwareBuffer **                         pBuffer,
-                                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
+                                                   struct AHardwareBuffer **                                               pBuffer,
+                                                   Dispatch const &                                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryAndroidHardwareBufferANDROID(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetAndroidHardwareBufferInfoANDROID *>( pInfo ), pBuffer ) );
+    return static_cast<Result>(
+      d.vkGetMemoryAndroidHardwareBufferANDROID( m_device, reinterpret_cast<const VkMemoryGetAndroidHardwareBufferInfoANDROID *>( pInfo ), pBuffer ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<struct AHardwareBuffer *>::type
-                       Device::getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID & info, Dispatch const & d ) const
+    Device::getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16508,12 +15121,12 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetMemoryAndroidHardwareBufferANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 #    endif
 
-    struct AHardwareBuffer * buffer;
-    Result                   result = static_cast<Result>(
+    struct AHardwareBuffer *     buffer;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetMemoryAndroidHardwareBufferANDROID( m_device, reinterpret_cast<const VkMemoryGetAndroidHardwareBufferInfoANDROID *>( &info ), &buffer ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryAndroidHardwareBufferANDROID" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryAndroidHardwareBufferANDROID" );
 
-    return detail::createResultValueType( result, std::move( buffer ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( buffer ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_ANDROID_KHR*/
@@ -16521,18 +15134,17 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_AMDX_shader_enqueue ===
 
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createExecutionGraphPipelinesAMDX( PipelineCache                                pipelineCache,
-                                                                                           uint32_t                                     createInfoCount,
-                                                                                           const ExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
-                                                                                           const AllocationCallbacks *                  pAllocator,
-                                                                                           Pipeline *                                   pPipelines,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createExecutionGraphPipelinesAMDX( VULKAN_HPP_NAMESPACE::PipelineCache                                pipelineCache,
+                                               uint32_t                                                           createInfoCount,
+                                               const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                  pAllocator,
+                                               VULKAN_HPP_NAMESPACE::Pipeline *                                   pPipelines,
+                                               Dispatch const &                                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
                                                                        static_cast<VkPipelineCache>( pipelineCache ),
                                                                        createInfoCount,
                                                                        reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( pCreateInfos ),
@@ -16541,221 +15153,208 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createExecutionGraphPipelinesAMDX( PipelineCache                                                  pipelineCache,
-                                               ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                               Optional<const AllocationCallbacks>                            allocator,
-                                               Dispatch const &                                               d ) const
+  template <typename PipelineAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>> Device::createExecutionGraphPipelinesAMDX(
+    VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+    Dispatch const &                                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result =
-      static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                  static_cast<VkPipelineCache>( pipelineCache ),
-                                                                  createInfos.size(),
-                                                                  reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDX", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDX",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
   template <typename PipelineAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createExecutionGraphPipelinesAMDX( PipelineCache                                                  pipelineCache,
-                                               ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                               Optional<const AllocationCallbacks>                            allocator,
-                                               PipelineAllocator &                                            pipelineAllocator,
-                                               Dispatch const &                                               d ) const
+            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>> Device::createExecutionGraphPipelinesAMDX(
+    VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+    PipelineAllocator &                                                                                        pipelineAllocator,
+    Dispatch const &                                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result =
-      static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                  static_cast<VkPipelineCache>( pipelineCache ),
-                                                                  createInfos.size(),
-                                                                  reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDX", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDX",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline>
-                                         Device::createExecutionGraphPipelineAMDX( PipelineCache                                pipelineCache,
-                                              const ExecutionGraphPipelineCreateInfoAMDX & createInfo,
-                                              Optional<const AllocationCallbacks>          allocator,
-                                              Dispatch const &                             d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                                         Device::createExecutionGraphPipelineAMDX( VULKAN_HPP_NAMESPACE::PipelineCache                                pipelineCache,
+                                              const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX & createInfo,
+                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>          allocator,
+                                              Dispatch const &                                                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                                static_cast<VkPipelineCache>( pipelineCache ),
-                                                                                1,
-                                                                                reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelineAMDX", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelineAMDX",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
+    return ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>( result, std::move( pipeline ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createExecutionGraphPipelinesAMDXUnique( PipelineCache                                                  pipelineCache,
-                                                     ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                     Optional<const AllocationCallbacks>                            allocator,
-                                                     Dispatch const &                                               d ) const
+  template <typename Dispatch, typename PipelineAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createExecutionGraphPipelinesAMDXUnique(
+      VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+      Dispatch const &                                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #      endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result =
-      static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                  static_cast<VkPipelineCache>( pipelineCache ),
-                                                                  createInfos.size(),
-                                                                  reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDXUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDXUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createExecutionGraphPipelinesAMDXUnique( PipelineCache                                                  pipelineCache,
-                                                     ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                     Optional<const AllocationCallbacks>                            allocator,
-                                                     PipelineAllocator &                                            pipelineAllocator,
-                                                     Dispatch const &                                               d ) const
+  template <
+    typename Dispatch,
+    typename PipelineAllocator,
+    typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createExecutionGraphPipelinesAMDXUnique(
+      VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+      PipelineAllocator &                                                                                        pipelineAllocator,
+      Dispatch const &                                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #      endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result =
-      static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                  static_cast<VkPipelineCache>( pipelineCache ),
-                                                                  createInfos.size(),
-                                                                  reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDXUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDXUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                                         Device::createExecutionGraphPipelineAMDXUnique( PipelineCache                                pipelineCache,
-                                                    const ExecutionGraphPipelineCreateInfoAMDX & createInfo,
-                                                    Optional<const AllocationCallbacks>          allocator,
-                                                    Dispatch const &                             d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                                         Device::createExecutionGraphPipelineAMDXUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                pipelineCache,
+                                                    const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX & createInfo,
+                                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>          allocator,
+                                                    Dispatch const &                                                   d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateExecutionGraphPipelinesAMDX && "Function <vkCreateExecutionGraphPipelinesAMDX> requires <VK_AMDX_shader_enqueue>" );
 #      endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateExecutionGraphPipelinesAMDX( m_device,
-                                                                                static_cast<VkPipelineCache>( pipelineCache ),
-                                                                                1,
-                                                                                reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelineAMDXUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateExecutionGraphPipelinesAMDX(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createExecutionGraphPipelineAMDXUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>( pipeline, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getExecutionGraphPipelineScratchSizeAMDX( Pipeline                                executionGraph,
-                                                                                                  ExecutionGraphPipelineScratchSizeAMDX * pSizeInfo,
-                                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getExecutionGraphPipelineScratchSizeAMDX( VULKAN_HPP_NAMESPACE::Pipeline                                executionGraph,
+                                                      VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX * pSizeInfo,
+                                                      Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetExecutionGraphPipelineScratchSizeAMDX( static_cast<VkDevice>( m_device ),
-                                                                              static_cast<VkPipeline>( executionGraph ),
-                                                                              reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( pSizeInfo ) ) );
+    return static_cast<Result>( d.vkGetExecutionGraphPipelineScratchSizeAMDX(
+      m_device, static_cast<VkPipeline>( executionGraph ), reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( pSizeInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExecutionGraphPipelineScratchSizeAMDX>::type
-                       Device::getExecutionGraphPipelineScratchSizeAMDX( Pipeline executionGraph, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX>::type
+                       Device::getExecutionGraphPipelineScratchSizeAMDX( VULKAN_HPP_NAMESPACE::Pipeline executionGraph, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16763,168 +15362,128 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetExecutionGraphPipelineScratchSizeAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    ExecutionGraphPipelineScratchSizeAMDX sizeInfo;
-    Result                                result = static_cast<Result>( d.vkGetExecutionGraphPipelineScratchSizeAMDX(
+    VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX sizeInfo;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetExecutionGraphPipelineScratchSizeAMDX(
       m_device, static_cast<VkPipeline>( executionGraph ), reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( &sizeInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getExecutionGraphPipelineScratchSizeAMDX" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getExecutionGraphPipelineScratchSizeAMDX" );
 
-    return detail::createResultValueType( result, std::move( sizeInfo ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( sizeInfo ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getExecutionGraphPipelineNodeIndexAMDX( Pipeline                                      executionGraph,
-                                                                                                const PipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
-                                                                                                uint32_t *                                    pNodeIndex,
-                                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getExecutionGraphPipelineNodeIndexAMDX( VULKAN_HPP_NAMESPACE::Pipeline                                      executionGraph,
+                                                    const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
+                                                    uint32_t *                                                          pNodeIndex,
+                                                    Dispatch const &                                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetExecutionGraphPipelineNodeIndexAMDX( static_cast<VkDevice>( m_device ),
-                                                                            static_cast<VkPipeline>( executionGraph ),
-                                                                            reinterpret_cast<const VkPipelineShaderStageNodeCreateInfoAMDX *>( pNodeInfo ),
-                                                                            pNodeIndex ) );
+    return static_cast<Result>( d.vkGetExecutionGraphPipelineNodeIndexAMDX(
+      m_device, static_cast<VkPipeline>( executionGraph ), reinterpret_cast<const VkPipelineShaderStageNodeCreateInfoAMDX *>( pNodeInfo ), pNodeIndex ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint32_t>::type
-    Device::getExecutionGraphPipelineNodeIndexAMDX( Pipeline executionGraph, const PipelineShaderStageNodeCreateInfoAMDX & nodeInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint32_t>::type Device::getExecutionGraphPipelineNodeIndexAMDX(
+    VULKAN_HPP_NAMESPACE::Pipeline executionGraph, const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX & nodeInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetExecutionGraphPipelineNodeIndexAMDX && "Function <vkGetExecutionGraphPipelineNodeIndexAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    uint32_t nodeIndex;
-    Result   result = static_cast<Result>( d.vkGetExecutionGraphPipelineNodeIndexAMDX(
+    uint32_t                     nodeIndex;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetExecutionGraphPipelineNodeIndexAMDX(
       m_device, static_cast<VkPipeline>( executionGraph ), reinterpret_cast<const VkPipelineShaderStageNodeCreateInfoAMDX *>( &nodeInfo ), &nodeIndex ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getExecutionGraphPipelineNodeIndexAMDX" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getExecutionGraphPipelineNodeIndexAMDX" );
 
-    return detail::createResultValueType( result, std::move( nodeIndex ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( nodeIndex ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdInitializeGraphScratchMemoryAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInitializeGraphScratchMemoryAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::initializeGraphScratchMemoryAMDX( Pipeline         executionGraph,
-                                                                          DeviceAddress    scratch,
-                                                                          DeviceSize       scratchSize,
-                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdInitializeGraphScratchMemoryAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                             static_cast<VkPipeline>( executionGraph ),
-                                             static_cast<VkDeviceAddress>( scratch ),
-                                             static_cast<VkDeviceSize>( scratchSize ) );
+    d.vkCmdInitializeGraphScratchMemoryAMDX( m_commandBuffer, static_cast<VkDeviceAddress>( scratch ) );
   }
 
-  // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphAMDX( DeviceAddress                      scratch,
-                                                           DeviceSize                         scratchSize,
-                                                           const DispatchGraphCountInfoAMDX * pCountInfo,
-                                                           Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                           const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX * pCountInfo,
+                                                           Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchGraphAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                              static_cast<VkDeviceAddress>( scratch ),
-                              static_cast<VkDeviceSize>( scratchSize ),
-                              reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( pCountInfo ) );
+    d.vkCmdDispatchGraphAMDX( m_commandBuffer, static_cast<VkDeviceAddress>( scratch ), reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( pCountInfo ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphAMDX( DeviceAddress                      scratch,
-                                                           DeviceSize                         scratchSize,
-                                                           const DispatchGraphCountInfoAMDX & countInfo,
-                                                           Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                           const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo,
+                                                           Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdDispatchGraphAMDX && "Function <vkCmdDispatchGraphAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    d.vkCmdDispatchGraphAMDX( m_commandBuffer,
-                              static_cast<VkDeviceAddress>( scratch ),
-                              static_cast<VkDeviceSize>( scratchSize ),
-                              reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
+    d.vkCmdDispatchGraphAMDX( m_commandBuffer, static_cast<VkDeviceAddress>( scratch ), reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectAMDX( DeviceAddress                      scratch,
-                                                                   DeviceSize                         scratchSize,
-                                                                   const DispatchGraphCountInfoAMDX * pCountInfo,
-                                                                   Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                                   const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX * pCountInfo,
+                                                                   Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchGraphIndirectAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                      static_cast<VkDeviceAddress>( scratch ),
-                                      static_cast<VkDeviceSize>( scratchSize ),
-                                      reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( pCountInfo ) );
+    d.vkCmdDispatchGraphIndirectAMDX(
+      m_commandBuffer, static_cast<VkDeviceAddress>( scratch ), reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( pCountInfo ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectAMDX( DeviceAddress                      scratch,
-                                                                   DeviceSize                         scratchSize,
-                                                                   const DispatchGraphCountInfoAMDX & countInfo,
-                                                                   Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                                   const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo,
+                                                                   Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdDispatchGraphIndirectAMDX && "Function <vkCmdDispatchGraphIndirectAMDX> requires <VK_AMDX_shader_enqueue>" );
 #    endif
 
-    d.vkCmdDispatchGraphIndirectAMDX( m_commandBuffer,
-                                      static_cast<VkDeviceAddress>( scratch ),
-                                      static_cast<VkDeviceSize>( scratchSize ),
-                                      reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
+    d.vkCmdDispatchGraphIndirectAMDX(
+      m_commandBuffer, static_cast<VkDeviceAddress>( scratch ), reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDispatchGraphIndirectCountAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectCountAMDX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectCountAMDX( DeviceAddress    scratch,
-                                                                        DeviceSize       scratchSize,
-                                                                        DeviceAddress    countInfo,
-                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectCountAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceAddress countInfo,
+                                                                        Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchGraphIndirectCountAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                           static_cast<VkDeviceAddress>( scratch ),
-                                           static_cast<VkDeviceSize>( scratchSize ),
-                                           static_cast<VkDeviceAddress>( countInfo ) );
+    d.vkCmdDispatchGraphIndirectCountAMDX( m_commandBuffer, static_cast<VkDeviceAddress>( scratch ), static_cast<VkDeviceAddress>( countInfo ) );
   }
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_EXT_sample_locations ===
 
-  // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEXT( const SampleLocationsInfoEXT * pSampleLocationsInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT * pSampleLocationsInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetSampleLocationsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkSampleLocationsInfoEXT *>( pSampleLocationsInfo ) );
+    d.vkCmdSetSampleLocationsEXT( m_commandBuffer, reinterpret_cast<const VkSampleLocationsInfoEXT *>( pSampleLocationsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEXT( const SampleLocationsInfoEXT & sampleLocationsInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT & sampleLocationsInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16935,25 +15494,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getMultisamplePropertiesEXT( SampleCountFlagBits        samples,
-                                                                      MultisamplePropertiesEXT * pMultisampleProperties,
-                                                                      Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void PhysicalDevice::getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples,
+                                                                      VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT * pMultisampleProperties,
+                                                                      Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceMultisamplePropertiesEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                   static_cast<VkSampleCountFlagBits>( samples ),
-                                                   reinterpret_cast<VkMultisamplePropertiesEXT *>( pMultisampleProperties ) );
+    d.vkGetPhysicalDeviceMultisamplePropertiesEXT(
+      m_physicalDevice, static_cast<VkSampleCountFlagBits>( samples ), reinterpret_cast<VkMultisamplePropertiesEXT *>( pMultisampleProperties ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MultisamplePropertiesEXT PhysicalDevice::getMultisamplePropertiesEXT( SampleCountFlagBits samples,
-                                                                                                               Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT
+    PhysicalDevice::getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16961,7 +15515,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceMultisamplePropertiesEXT> requires <VK_EXT_sample_locations>" );
 #  endif
 
-    MultisamplePropertiesEXT multisampleProperties;
+    VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT multisampleProperties;
     d.vkGetPhysicalDeviceMultisamplePropertiesEXT(
       m_physicalDevice, static_cast<VkSampleCountFlagBits>( samples ), reinterpret_cast<VkMultisamplePropertiesEXT *>( &multisampleProperties ) );
 
@@ -16971,25 +15525,20 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_get_memory_requirements2 ===
 
-  // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 * pInfo,
-                                                                 MemoryRequirements2 *                pMemoryRequirements,
-                                                                 Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
+                                                                 VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                pMemoryRequirements,
+                                                                 Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
-                                        reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( pInfo ),
-                                        reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+    d.vkGetImageMemoryRequirements2KHR(
+      m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -16997,18 +15546,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetImageMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info,
-                                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17016,8 +15563,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetImageMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
@@ -17025,25 +15572,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 * pInfo,
-                                                                  MemoryRequirements2 *                 pMemoryRequirements,
-                                                                  Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
+                                                                  VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                                                  Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetBufferMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
-                                         reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( pInfo ),
-                                         reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+    d.vkGetBufferMemoryRequirements2KHR(
+      m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info,
-                                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17051,18 +15593,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetBufferMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetBufferMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info,
-                                                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17070,8 +15610,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetBufferMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetBufferMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
@@ -17079,31 +15619,23 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 * pInfo,
-                                                                       uint32_t *                                 pSparseMemoryRequirementCount,
-                                                                       SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
-                                                                       Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
+                                                                       uint32_t *                                             pSparseMemoryRequirementCount,
+                                                                       VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 * pSparseMemoryRequirements,
+                                                                       Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSparseMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
+    d.vkGetImageSparseMemoryRequirements2KHR( m_device,
                                               reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( pInfo ),
                                               pSparseMemoryRequirementCount,
                                               reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-    Device::getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const & d ) const
+  template <typename SparseImageMemoryRequirements2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+    Device::getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17111,8 +15643,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageSparseMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
-    uint32_t                                                                             sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
+    uint32_t                                                                                                   sparseMemoryRequirementCount;
     d.vkGetImageSparseMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -17129,17 +15661,15 @@ namespace VULKAN_HPP_NAMESPACE
     return sparseMemoryRequirements;
   }
 
-  // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info,
-                                                  SparseImageMemoryRequirements2Allocator &  sparseImageMemoryRequirements2Allocator,
-                                                  Dispatch const &                           d ) const
+  template <typename SparseImageMemoryRequirements2Allocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                                         Device::getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                                  SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
+                                                  Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17147,8 +15677,9 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageSparseMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( sparseImageMemoryRequirements2Allocator );
-    uint32_t                                                                             sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
+      sparseImageMemoryRequirements2Allocator );
+    uint32_t sparseMemoryRequirementCount;
     d.vkGetImageSparseMemoryRequirements2KHR(
       m_device, reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -17168,90 +15699,85 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_acceleration_structure ===
 
-  // wrapper function for command vkCreateAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createAccelerationStructureKHR( const AccelerationStructureCreateInfoKHR * pCreateInfo,
-                                                                                        const AllocationCallbacks *                pAllocator,
-                                                                                        AccelerationStructureKHR *                 pAccelerationStructure,
-                                                                                        Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR * pCreateInfo,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                            VULKAN_HPP_NAMESPACE::AccelerationStructureKHR *                 pAccelerationStructure,
+                                            Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateAccelerationStructureKHR( m_device,
                                                                     reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( pCreateInfo ),
                                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                     reinterpret_cast<VkAccelerationStructureKHR *>( pAccelerationStructure ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AccelerationStructureKHR>::type Device::createAccelerationStructureKHR(
-    const AccelerationStructureCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>::type
+                       Device::createAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                            Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAccelerationStructureKHR && "Function <vkCreateAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    AccelerationStructureKHR accelerationStructure;
-    Result                   result = static_cast<Result>( d.vkCreateAccelerationStructureKHR( m_device,
-                                                                             reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureKHR" );
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAccelerationStructureKHR(
+      m_device,
+      reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureKHR" );
 
-    return detail::createResultValueType( result, std::move( accelerationStructure ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( accelerationStructure ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<AccelerationStructureKHR, Dispatch>>::type
-                       Device::createAccelerationStructureKHRUnique( const AccelerationStructureCreateInfoKHR & createInfo,
-                                                  Optional<const AllocationCallbacks>        allocator,
-                                                  Dispatch const &                           d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR, Dispatch>>::type
+                       Device::createAccelerationStructureKHRUnique( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                                  Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAccelerationStructureKHR && "Function <vkCreateAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 #    endif
 
-    AccelerationStructureKHR accelerationStructure;
-    Result                   result = static_cast<Result>( d.vkCreateAccelerationStructureKHR( m_device,
-                                                                             reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureKHRUnique" );
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAccelerationStructureKHR(
+      m_device,
+      reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<AccelerationStructureKHR, Dispatch>( accelerationStructure, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result,
+      UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR, Dispatch>( accelerationStructure, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureKHR( AccelerationStructureKHR    accelerationStructure,
-                                                                  const AllocationCallbacks * pAllocator,
-                                                                  Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyAccelerationStructureKHR(
+      m_device, static_cast<VkAccelerationStructureKHR>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureKHR( AccelerationStructureKHR            accelerationStructure,
-                                                                  Optional<const AllocationCallbacks> allocator,
-                                                                  Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR            accelerationStructure,
+                                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17259,63 +15785,60 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyAccelerationStructureKHR(
-      m_device, static_cast<VkAccelerationStructureKHR>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyAccelerationStructureKHR(
+      m_device, static_cast<VkAccelerationStructureKHR>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR            accelerationStructure,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyAccelerationStructureKHR && "Function <vkDestroyAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
+#  endif
+
+    d.vkDestroyAccelerationStructureKHR(
+      m_device,
+      static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
-    Device::destroy( AccelerationStructureKHR accelerationStructure, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    CommandBuffer::buildAccelerationStructuresKHR( uint32_t                                                                     infoCount,
+                                                   const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                                   const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
+                                                   Dispatch const &                                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkAccelerationStructureKHR>( accelerationStructure ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( AccelerationStructureKHR            accelerationStructure,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyAccelerationStructureKHR && "Function <vkDestroyAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
-#  endif
-
-    d.vkDestroyAccelerationStructureKHR(
-      m_device, static_cast<VkAccelerationStructureKHR>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresKHR( uint32_t                                               infoCount,
-                                                                        const AccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                                                        const AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
-                                                                        Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildAccelerationStructuresKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBuildAccelerationStructuresKHR( m_commandBuffer,
                                            infoCount,
                                            reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( pInfos ),
                                            reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( ppBuildRangeInfos ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::buildAccelerationStructuresKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                                   ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
-                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresKHR(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
+    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17337,18 +15860,16 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR( uint32_t                                          infoCount,
-                                                                                const AccelerationStructureBuildGeometryInfoKHR * pInfos,
-                                                                                const DeviceAddress *                             pIndirectDeviceAddresses,
-                                                                                const uint32_t *                                  pIndirectStrides,
-                                                                                const uint32_t * const *                          ppMaxPrimitiveCounts,
-                                                                                Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR( uint32_t infoCount,
+                                                                                const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR * pInfos,
+                                                                                const VULKAN_HPP_NAMESPACE::DeviceAddress * pIndirectDeviceAddresses,
+                                                                                const uint32_t *                            pIndirectStrides,
+                                                                                const uint32_t * const *                    ppMaxPrimitiveCounts,
+                                                                                Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildAccelerationStructuresIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBuildAccelerationStructuresIndirectKHR( m_commandBuffer,
                                                    infoCount,
                                                    reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( pInfos ),
                                                    reinterpret_cast<const VkDeviceAddress *>( pIndirectDeviceAddresses ),
@@ -17357,14 +15878,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const & infos,
-                                                                                ArrayProxy<const DeviceAddress> const &    indirectDeviceAddresses,
-                                                                                ArrayProxy<const uint32_t> const &         indirectStrides,
-                                                                                ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts,
-                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const &                             indirectDeviceAddresses,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                                                        indirectStrides,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t * const> const &                                                pMaxPrimitiveCounts,
+    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17399,19 +15919,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBuildAccelerationStructuresKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::buildAccelerationStructuresKHR( DeferredOperationKHR                                   deferredOperation,
-                                            uint32_t                                               infoCount,
-                                            const AccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                            const AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
-                                            Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
+    Device::buildAccelerationStructuresKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                   deferredOperation,
+                                            uint32_t                                                                     infoCount,
+                                            const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                            const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
+                                            Dispatch const &                                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkBuildAccelerationStructuresKHR( static_cast<VkDevice>( m_device ),
+      d.vkBuildAccelerationStructuresKHR( m_device,
                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
                                           infoCount,
                                           reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( pInfos ),
@@ -17419,14 +15937,12 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBuildAccelerationStructuresKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::buildAccelerationStructuresKHR( DeferredOperationKHR                                                     deferredOperation,
-                                            ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                            ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
-                                            Dispatch const &                                                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::buildAccelerationStructuresKHR(
+    VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                                           deferredOperation,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
+    Dispatch const &                                                                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17441,76 +15957,71 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_NO_EXCEPTIONS*/
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkBuildAccelerationStructuresKHR( m_device,
                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
                                           infos.size(),
                                           reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
                                           reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureKHR( DeferredOperationKHR                     deferredOperation,
-                                                                                      const CopyAccelerationStructureInfoKHR * pInfo,
-                                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                                                      const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                                                  static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                  reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( pInfo ) ) );
+    return static_cast<Result>( d.vkCopyAccelerationStructureKHR(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureKHR( DeferredOperationKHR                     deferredOperation,
-                                                                                      const CopyAccelerationStructureInfoKHR & info,
-                                                                                      Dispatch const &                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                         Device::copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                     deferredOperation,
+                                          const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info,
+                                          Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCopyAccelerationStructureKHR && "Function <vkCopyAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyAccelerationStructureKHR(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCopyAccelerationStructureKHR(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureToMemoryKHR( DeferredOperationKHR deferredOperation,
-                                                                                              const CopyAccelerationStructureToMemoryInfoKHR * pInfo,
-                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                  const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
+                                                  Dispatch const &                                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyAccelerationStructureToMemoryKHR( static_cast<VkDevice>( m_device ),
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( pInfo ) ) );
+    return static_cast<Result>( d.vkCopyAccelerationStructureToMemoryKHR(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureToMemoryKHR( DeferredOperationKHR deferredOperation,
-                                                                                              const CopyAccelerationStructureToMemoryInfoKHR & info,
-                                                                                              Dispatch const &                                 d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                         Device::copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                  const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info,
+                                                  Dispatch const &                                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17518,36 +16029,34 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCopyAccelerationStructureToMemoryKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyAccelerationStructureToMemoryKHR(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCopyAccelerationStructureToMemoryKHR(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToAccelerationStructureKHR( DeferredOperationKHR deferredOperation,
-                                                                                              const CopyMemoryToAccelerationStructureInfoKHR * pInfo,
-                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                  const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
+                                                  Dispatch const &                                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyMemoryToAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( pInfo ) ) );
+    return static_cast<Result>( d.vkCopyMemoryToAccelerationStructureKHR(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToAccelerationStructureKHR( DeferredOperationKHR deferredOperation,
-                                                                                              const CopyMemoryToAccelerationStructureInfoKHR & info,
-                                                                                              Dispatch const &                                 d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                         Device::copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                  const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info,
+                                                  Dispatch const &                                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17555,29 +16064,29 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCopyMemoryToAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyMemoryToAccelerationStructureKHR(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCopyMemoryToAccelerationStructureKHR(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::writeAccelerationStructuresPropertiesKHR( uint32_t                         accelerationStructureCount,
-                                                                                                  const AccelerationStructureKHR * pAccelerationStructures,
-                                                                                                  QueryType                        queryType,
-                                                                                                  size_t                           dataSize,
-                                                                                                  void *                           pData,
-                                                                                                  size_t                           stride,
-                                                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::writeAccelerationStructuresPropertiesKHR( uint32_t                                               accelerationStructureCount,
+                                                      const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures,
+                                                      VULKAN_HPP_NAMESPACE::QueryType                        queryType,
+                                                      size_t                                                 dataSize,
+                                                      void *                                                 pData,
+                                                      size_t                                                 stride,
+                                                      Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR( m_device,
                                                                               accelerationStructureCount,
                                                                               reinterpret_cast<const VkAccelerationStructureKHR *>( pAccelerationStructures ),
                                                                               static_cast<VkQueryType>( queryType ),
@@ -17587,16 +16096,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
                        Device::writeAccelerationStructuresPropertiesKHR(
-      ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures, QueryType queryType, size_t dataSize, size_t stride, Dispatch const & d ) const
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      size_t                                                                                         dataSize,
+      size_t                                                                                         stride,
+      Dispatch const &                                                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17606,24 +16113,25 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result =
-      static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR( m_device,
-                                                                         accelerationStructures.size(),
-                                                                         reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
-                                                                         static_cast<VkQueryType>( queryType ),
-                                                                         data.size() * sizeof( DataType ),
-                                                                         reinterpret_cast<void *>( data.data() ),
-                                                                         stride ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkWriteAccelerationStructuresPropertiesKHR( m_device,
+                                                    accelerationStructures.size(),
+                                                    reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
+                                                    static_cast<VkQueryType>( queryType ),
+                                                    data.size() * sizeof( DataType ),
+                                                    reinterpret_cast<void *>( data.data() ),
+                                                    stride ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type Device::writeAccelerationStructuresPropertyKHR(
-    ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures, QueryType queryType, size_t stride, Dispatch const & d ) const
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+    VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+    size_t                                                                                         stride,
+    Dispatch const &                                                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17631,38 +16139,33 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkWriteAccelerationStructuresPropertiesKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    DataType data;
-    Result   result =
-      static_cast<Result>( d.vkWriteAccelerationStructuresPropertiesKHR( m_device,
-                                                                         accelerationStructures.size(),
-                                                                         reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
-                                                                         static_cast<VkQueryType>( queryType ),
-                                                                         sizeof( DataType ),
-                                                                         reinterpret_cast<void *>( &data ),
-                                                                         stride ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertyKHR" );
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkWriteAccelerationStructuresPropertiesKHR( m_device,
+                                                    accelerationStructures.size(),
+                                                    reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
+                                                    static_cast<VkQueryType>( queryType ),
+                                                    sizeof( DataType ),
+                                                    reinterpret_cast<void *>( &data ),
+                                                    stride ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertyKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR * pInfo,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
+                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyAccelerationStructureKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                         reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( pInfo ) );
+    d.vkCmdCopyAccelerationStructureKHR( m_commandBuffer, reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR & info,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info,
+                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17673,23 +16176,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR * pInfo,
-                                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyAccelerationStructureToMemoryKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                 reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( pInfo ) );
+    d.vkCmdCopyAccelerationStructureToMemoryKHR( m_commandBuffer, reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR & info,
-                                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17701,23 +16199,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR * pInfo,
-                                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryToAccelerationStructureKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                 reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( pInfo ) );
+    d.vkCmdCopyMemoryToAccelerationStructureKHR( m_commandBuffer, reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR & info,
-                                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17729,23 +16222,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR * pInfo,
-                                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceAddress Device::getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR * pInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<DeviceAddress>( d.vkGetAccelerationStructureDeviceAddressKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAccelerationStructureDeviceAddressInfoKHR *>( pInfo ) ) );
+    return static_cast<DeviceAddress>(
+      d.vkGetAccelerationStructureDeviceAddressKHR( m_device, reinterpret_cast<const VkAccelerationStructureDeviceAddressInfoKHR *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR & info,
-                                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+                    Device::getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR & info,
+                                                Dispatch const &                                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17756,22 +16246,21 @@ namespace VULKAN_HPP_NAMESPACE
     VkDeviceAddress result =
       d.vkGetAccelerationStructureDeviceAddressKHR( m_device, reinterpret_cast<const VkAccelerationStructureDeviceAddressInfoKHR *>( &info ) );
 
-    return static_cast<DeviceAddress>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesKHR( uint32_t                         accelerationStructureCount,
-                                                                                  const AccelerationStructureKHR * pAccelerationStructures,
-                                                                                  QueryType                        queryType,
-                                                                                  QueryPool                        queryPool,
-                                                                                  uint32_t                         firstQuery,
-                                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::writeAccelerationStructuresPropertiesKHR( uint32_t                                               accelerationStructureCount,
+                                                             const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures,
+                                                             VULKAN_HPP_NAMESPACE::QueryType                        queryType,
+                                                             VULKAN_HPP_NAMESPACE::QueryPool                        queryPool,
+                                                             uint32_t                                               firstQuery,
+                                                             Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteAccelerationStructuresPropertiesKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdWriteAccelerationStructuresPropertiesKHR( m_commandBuffer,
                                                      accelerationStructureCount,
                                                      reinterpret_cast<const VkAccelerationStructureKHR *>( pAccelerationStructures ),
                                                      static_cast<VkQueryType>( queryType ),
@@ -17780,14 +16269,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesKHR( ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures,
-                                                                                  QueryType                                          queryType,
-                                                                                  QueryPool                                          queryPool,
-                                                                                  uint32_t                                           firstQuery,
-                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesKHR(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+    VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+    VULKAN_HPP_NAMESPACE::QueryPool                                                                queryPool,
+    uint32_t                                                                                       firstQuery,
+    Dispatch const &                                                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17804,25 +16292,22 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getAccelerationStructureCompatibilityKHR( const AccelerationStructureVersionInfoKHR * pVersionInfo,
-                                                                           AccelerationStructureCompatibilityKHR *     pCompatibility,
-                                                                           Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR * pVersionInfo,
+                                                                           VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR *     pCompatibility,
+                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceAccelerationStructureCompatibilityKHR( static_cast<VkDevice>( m_device ),
+    d.vkGetDeviceAccelerationStructureCompatibilityKHR( m_device,
                                                         reinterpret_cast<const VkAccelerationStructureVersionInfoKHR *>( pVersionInfo ),
                                                         reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( pCompatibility ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureCompatibilityKHR
-    Device::getAccelerationStructureCompatibilityKHR( const AccelerationStructureVersionInfoKHR & versionInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+    Device::getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo,
+                                                      Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17830,7 +16315,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceAccelerationStructureCompatibilityKHR> requires <VK_KHR_acceleration_structure>" );
 #  endif
 
-    AccelerationStructureCompatibilityKHR compatibility;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR compatibility;
     d.vkGetDeviceAccelerationStructureCompatibilityKHR( m_device,
                                                         reinterpret_cast<const VkAccelerationStructureVersionInfoKHR *>( &versionInfo ),
                                                         reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( &compatibility ) );
@@ -17839,17 +16324,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                 buildType,
-                                                                        const AccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
-                                                                        const uint32_t *                                  pMaxPrimitiveCounts,
-                                                                        AccelerationStructureBuildSizesInfoKHR *          pSizeInfo,
-                                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
+                                                                        const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
+                                                                        const uint32_t *                                               pMaxPrimitiveCounts,
+                                                                        VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR * pSizeInfo,
+                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetAccelerationStructureBuildSizesKHR( static_cast<VkDevice>( m_device ),
+    d.vkGetAccelerationStructureBuildSizesKHR( m_device,
                                                static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                                reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( pBuildInfo ),
                                                pMaxPrimitiveCounts,
@@ -17857,14 +16340,12 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR
-    Device::getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                 buildType,
-                                                   const AccelerationStructureBuildGeometryInfoKHR & buildInfo,
-                                                   ArrayProxy<const uint32_t> const &                maxPrimitiveCounts,
-                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR
+                                         Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
+                                                   const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
+                                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                maxPrimitiveCounts,
+                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17880,7 +16361,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_NO_EXCEPTIONS*/
 
-    AccelerationStructureBuildSizesInfoKHR sizeInfo;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR sizeInfo;
     d.vkGetAccelerationStructureBuildSizesKHR( m_device,
                                                static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                                reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( &buildInfo ),
@@ -17893,19 +16374,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_ray_tracing_pipeline ===
 
-  // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                                                      uint32_t                              width,
-                                                      uint32_t                              height,
-                                                      uint32_t                              depth,
-                                                      Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                                                      uint32_t                                                    width,
+                                                      uint32_t                                                    height,
+                                                      uint32_t                                                    depth,
+                                                      Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdTraceRaysKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdTraceRaysKHR( m_commandBuffer,
                          reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pRaygenShaderBindingTable ),
                          reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pMissShaderBindingTable ),
                          reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pHitShaderBindingTable ),
@@ -17916,16 +16396,15 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                                                      const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                                                      uint32_t                              width,
-                                                      uint32_t                              height,
-                                                      uint32_t                              depth,
-                                                      Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                                                      const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                                                      uint32_t                                                    width,
+                                                      uint32_t                                                    height,
+                                                      uint32_t                                                    depth,
+                                                      Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -17943,19 +16422,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRayTracingPipelinesKHR( DeferredOperationKHR                    deferredOperation,
-                                                                                      PipelineCache                           pipelineCache,
-                                                                                      uint32_t                                createInfoCount,
-                                                                                      const RayTracingPipelineCreateInfoKHR * pCreateInfos,
-                                                                                      const AllocationCallbacks *             pAllocator,
-                                                                                      Pipeline *                              pPipelines,
-                                                                                      Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                    deferredOperation,
+                                          VULKAN_HPP_NAMESPACE::PipelineCache                           pipelineCache,
+                                          uint32_t                                                      createInfoCount,
+                                          const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR * pCreateInfos,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *             pAllocator,
+                                          VULKAN_HPP_NAMESPACE::Pipeline *                              pPipelines,
+                                          Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
                                                                   static_cast<VkDeferredOperationKHR>( deferredOperation ),
                                                                   static_cast<VkPipelineCache>( pipelineCache ),
                                                                   createInfoCount,
@@ -17965,236 +16443,240 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesKHR( DeferredOperationKHR                                      deferredOperation,
-                                          PipelineCache                                             pipelineCache,
-                                          ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                          Optional<const AllocationCallbacks>                       allocator,
-                                          Dispatch const &                                          d ) const
+  template <typename PipelineAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                          VULKAN_HPP_NAMESPACE::PipelineCache        pipelineCache,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+                                          Dispatch const &                                                                                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           createInfos.size(),
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
   template <typename PipelineAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesKHR( DeferredOperationKHR                                      deferredOperation,
-                                          PipelineCache                                             pipelineCache,
-                                          ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                          Optional<const AllocationCallbacks>                       allocator,
-                                          PipelineAllocator &                                       pipelineAllocator,
-                                          Dispatch const &                                          d ) const
+            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                          VULKAN_HPP_NAMESPACE::PipelineCache        pipelineCache,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+                                          PipelineAllocator & pipelineAllocator,
+                                          Dispatch const &    d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           createInfos.size(),
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline> Device::createRayTracingPipelineKHR( DeferredOperationKHR                    deferredOperation,
-                                                                                                    PipelineCache                           pipelineCache,
-                                                                                                    const RayTracingPipelineCreateInfoKHR & createInfo,
-                                                                                                    Optional<const AllocationCallbacks>     allocator,
-                                                                                                    Dispatch const &                        d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                                         Device::createRayTracingPipelineKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                    deferredOperation,
+                                         VULKAN_HPP_NAMESPACE::PipelineCache                           pipelineCache,
+                                         const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR & createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>     allocator,
+                                         Dispatch const &                                              d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #  endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           1,
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineKHR",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineKHR",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
+    return ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>( result, std::move( pipeline ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesKHRUnique( DeferredOperationKHR                                      deferredOperation,
-                                                PipelineCache                                             pipelineCache,
-                                                ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                Optional<const AllocationCallbacks>                       allocator,
-                                                Dispatch const &                                          d ) const
+  template <typename Dispatch, typename PipelineAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesKHRUnique(
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                            deferredOperation,
+      VULKAN_HPP_NAMESPACE::PipelineCache                                                                   pipelineCache,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+      Dispatch const &                                                                                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           createInfos.size(),
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHRUnique",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHRUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesKHRUnique( DeferredOperationKHR                                      deferredOperation,
-                                                PipelineCache                                             pipelineCache,
-                                                ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                Optional<const AllocationCallbacks>                       allocator,
-                                                PipelineAllocator &                                       pipelineAllocator,
-                                                Dispatch const &                                          d ) const
+  template <
+    typename Dispatch,
+    typename PipelineAllocator,
+    typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesKHRUnique(
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                            deferredOperation,
+      VULKAN_HPP_NAMESPACE::PipelineCache                                                                   pipelineCache,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+      PipelineAllocator &                                                                                   pipelineAllocator,
+      Dispatch const &                                                                                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           createInfos.size(),
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHRUnique",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHRUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                                         Device::createRayTracingPipelineKHRUnique( DeferredOperationKHR                    deferredOperation,
-                                               PipelineCache                           pipelineCache,
-                                               const RayTracingPipelineCreateInfoKHR & createInfo,
-                                               Optional<const AllocationCallbacks>     allocator,
-                                               Dispatch const &                        d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                                         Device::createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                    deferredOperation,
+                                               VULKAN_HPP_NAMESPACE::PipelineCache                           pipelineCache,
+                                               const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR & createInfo,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>     allocator,
+                                               Dispatch const &                                              d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesKHR && "Function <vkCreateRayTracingPipelinesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #    endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateRayTracingPipelinesKHR( m_device,
-                                                                           static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                           static_cast<VkPipelineCache>( pipelineCache ),
-                                                                           1,
-                                                                           reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineKHRUnique",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesKHR(
+      m_device,
+      static_cast<VkDeferredOperationKHR>( deferredOperation ),
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineKHRUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR,
+                                                 VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>( pipeline, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesKHR(
-    Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                                            uint32_t                       firstGroup,
+                                                                                            uint32_t                       groupCount,
+                                                                                            size_t                         dataSize,
+                                                                                            void *                         pData,
+                                                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
+    return static_cast<Result>(
+      d.vkGetRayTracingShaderGroupHandlesKHR( m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
-    Device::getRayTracingShaderGroupHandlesKHR( Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type Device::getRayTracingShaderGroupHandlesKHR(
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18204,18 +16686,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesKHR(
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingShaderGroupHandlesKHR(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, data.size() * sizeof( DataType ), reinterpret_cast<void *>( data.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getRayTracingShaderGroupHandleKHR( Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
+    Device::getRayTracingShaderGroupHandleKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18223,37 +16703,33 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetRayTracingShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesKHR(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingShaderGroupHandlesKHR(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, sizeof( DataType ), reinterpret_cast<void *>( &data ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandleKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandleKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingCaptureReplayShaderGroupHandlesKHR(
-    Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingCaptureReplayShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                                                         uint32_t                       firstGroup,
+                                                                                                         uint32_t                       groupCount,
+                                                                                                         size_t                         dataSize,
+                                                                                                         void *                         pData,
+                                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
+    return static_cast<Result>(
+      d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
                        Device::getRayTracingCaptureReplayShaderGroupHandlesKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
+      VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18263,18 +16739,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, data.size() * sizeof( DataType ), reinterpret_cast<void *>( data.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandlesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandlesKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-    Device::getRayTracingCaptureReplayShaderGroupHandleKHR( Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
+  template <typename DataType, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type Device::getRayTracingCaptureReplayShaderGroupHandleKHR(
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18282,26 +16756,25 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetRayTracingCaptureReplayShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, sizeof( DataType ), reinterpret_cast<void *>( &data ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandleKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingCaptureReplayShaderGroupHandleKHR" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                                                              DeviceAddress                         indirectDeviceAddress,
-                                                              Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                                                              VULKAN_HPP_NAMESPACE::DeviceAddress                         indirectDeviceAddress,
+                                                              Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdTraceRaysIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdTraceRaysIndirectKHR( m_commandBuffer,
                                  reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pRaygenShaderBindingTable ),
                                  reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pMissShaderBindingTable ),
                                  reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( pHitShaderBindingTable ),
@@ -18310,14 +16783,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                                                              const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                                                              DeviceAddress                         indirectDeviceAddress,
-                                                              Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                                                              const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                                                              VULKAN_HPP_NAMESPACE::DeviceAddress                         indirectDeviceAddress,
+                                                              Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18333,51 +16805,46 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetRayTracingShaderGroupStackSizeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupStackSizeKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceSize Device::getRayTracingShaderGroupStackSizeKHR( Pipeline             pipeline,
-                                                                             uint32_t             group,
-                                                                             ShaderGroupShaderKHR groupShader,
-                                                                             Dispatch const &     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceSize Device::getRayTracingShaderGroupStackSizeKHR( VULKAN_HPP_NAMESPACE::Pipeline             pipeline,
+                                                                             uint32_t                                   group,
+                                                                             VULKAN_HPP_NAMESPACE::ShaderGroupShaderKHR groupShader,
+                                                                             Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<DeviceSize>( d.vkGetRayTracingShaderGroupStackSizeKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), group, static_cast<VkShaderGroupShaderKHR>( groupShader ) ) );
+    return static_cast<DeviceSize>(
+      d.vkGetRayTracingShaderGroupStackSizeKHR( m_device, static_cast<VkPipeline>( pipeline ), group, static_cast<VkShaderGroupShaderKHR>( groupShader ) ) );
   }
 
-  // wrapper function for command vkCmdSetRayTracingPipelineStackSizeKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRayTracingPipelineStackSizeKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setRayTracingPipelineStackSizeKHR( uint32_t pipelineStackSize, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRayTracingPipelineStackSizeKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), pipelineStackSize );
+    d.vkCmdSetRayTracingPipelineStackSizeKHR( m_commandBuffer, pipelineStackSize );
   }
 
   //=== VK_KHR_sampler_ycbcr_conversion ===
 
-  // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createSamplerYcbcrConversionKHR( const SamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                                                                         const AllocationCallbacks *              pAllocator,
-                                                                                         SamplerYcbcrConversion *                 pYcbcrConversion,
-                                                                                         Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createSamplerYcbcrConversionKHR( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                             VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion *                 pYcbcrConversion,
+                                             Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSamplerYcbcrConversionKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateSamplerYcbcrConversionKHR( m_device,
                                                                      reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( pCreateInfo ),
                                                                      reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                      reinterpret_cast<VkSamplerYcbcrConversion *>( pYcbcrConversion ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SamplerYcbcrConversion>::type Device::createSamplerYcbcrConversionKHR(
-    const SamplerYcbcrConversionCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::type
+                       Device::createSamplerYcbcrConversionKHR( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                             Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18385,24 +16852,23 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateSamplerYcbcrConversionKHR> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
 #  endif
 
-    SamplerYcbcrConversion ycbcrConversion;
-    Result                 result = static_cast<Result>( d.vkCreateSamplerYcbcrConversionKHR( m_device,
-                                                                              reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionKHR" );
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSamplerYcbcrConversionKHR(
+      m_device,
+      reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionKHR" );
 
-    return detail::createResultValueType( result, std::move( ycbcrConversion ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( ycbcrConversion ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SamplerYcbcrConversion, Dispatch>>::type
-                       Device::createSamplerYcbcrConversionKHRUnique( const SamplerYcbcrConversionCreateInfo & createInfo,
-                                                   Optional<const AllocationCallbacks>      allocator,
-                                                   Dispatch const &                         d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>>::type
+                       Device::createSamplerYcbcrConversionKHRUnique( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo & createInfo,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>      allocator,
+                                                   Dispatch const &                                               d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18410,39 +16876,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkCreateSamplerYcbcrConversionKHR> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
 #    endif
 
-    SamplerYcbcrConversion ycbcrConversion;
-    Result                 result = static_cast<Result>( d.vkCreateSamplerYcbcrConversionKHR( m_device,
-                                                                              reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionKHRUnique" );
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateSamplerYcbcrConversionKHR(
+      m_device,
+      reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<SamplerYcbcrConversion, Dispatch>( ycbcrConversion, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>( ycbcrConversion, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( SamplerYcbcrConversion      ycbcrConversion,
-                                                                   const AllocationCallbacks * pAllocator,
-                                                                   Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroySamplerYcbcrConversionKHR( static_cast<VkDevice>( m_device ),
-                                          static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
-                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroySamplerYcbcrConversionKHR(
+      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( SamplerYcbcrConversion              ycbcrConversion,
-                                                                   Optional<const AllocationCallbacks> allocator,
-                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion              ycbcrConversion,
+                                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18451,92 +16913,84 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroySamplerYcbcrConversionKHR(
-      m_device, static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_bind_memory2 ===
 
-  // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory2KHR( uint32_t                     bindInfoCount,
-                                                                              const BindBufferMemoryInfo * pBindInfos,
-                                                                              Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindBufferMemory2KHR( uint32_t                                           bindInfoCount,
+                                                                              const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo * pBindInfos,
+                                                                              Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBindBufferMemory2KHR( static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindBufferMemoryInfo *>( pBindInfos ) ) );
+    return static_cast<Result>( d.vkBindBufferMemory2KHR( m_device, bindInfoCount, reinterpret_cast<const VkBindBufferMemoryInfo *>( pBindInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindBufferMemory2KHR( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos, Dispatch const & d ) const
+    Device::bindBufferMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos,
+                                  Dispatch const &                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindBufferMemory2KHR && "Function <vkBindBufferMemory2KHR> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkBindBufferMemory2KHR( m_device, bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2KHR" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkBindBufferMemory2KHR( m_device, bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2KHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2KHR( uint32_t                    bindInfoCount,
-                                                                             const BindImageMemoryInfo * pBindInfos,
-                                                                             Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindImageMemory2KHR( uint32_t                                          bindInfoCount,
+                                                                             const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo * pBindInfos,
+                                                                             Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBindImageMemory2KHR( static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindImageMemoryInfo *>( pBindInfos ) ) );
+    return static_cast<Result>( d.vkBindImageMemory2KHR( m_device, bindInfoCount, reinterpret_cast<const VkBindImageMemoryInfo *>( pBindInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindImageMemory2KHR( ArrayProxy<const BindImageMemoryInfo> const & bindInfos, Dispatch const & d ) const
+    Device::bindImageMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindImageMemory2KHR && "Function <vkBindImageMemory2KHR> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkBindImageMemory2KHR( m_device, bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2KHR" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkBindImageMemory2KHR( m_device, bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2KHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_image_drm_format_modifier ===
 
-  // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageDrmFormatModifierPropertiesEXT( Image                                 image,
-                                                                                                ImageDrmFormatModifierPropertiesEXT * pProperties,
-                                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageDrmFormatModifierPropertiesEXT(
+    VULKAN_HPP_NAMESPACE::Image image, VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetImageDrmFormatModifierPropertiesEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( pProperties ) ) );
+      m_device, static_cast<VkImage>( image ), reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageDrmFormatModifierPropertiesEXT>::type
-                       Device::getImageDrmFormatModifierPropertiesEXT( Image image, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT>::type
+                       Device::getImageDrmFormatModifierPropertiesEXT( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18544,93 +16998,94 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageDrmFormatModifierPropertiesEXT> requires <VK_EXT_image_drm_format_modifier>" );
 #  endif
 
-    ImageDrmFormatModifierPropertiesEXT properties;
-    Result                              result = static_cast<Result>( d.vkGetImageDrmFormatModifierPropertiesEXT(
+    VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT properties;
+    VULKAN_HPP_NAMESPACE::Result                              result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetImageDrmFormatModifierPropertiesEXT(
       m_device, static_cast<VkImage>( image ), reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageDrmFormatModifierPropertiesEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageDrmFormatModifierPropertiesEXT" );
 
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_validation_cache ===
 
-  // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createValidationCacheEXT( const ValidationCacheCreateInfoEXT * pCreateInfo,
-                                                                                  const AllocationCallbacks *          pAllocator,
-                                                                                  ValidationCacheEXT *                 pValidationCache,
-                                                                                  Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createValidationCacheEXT( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT * pCreateInfo,
+                                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                                                  VULKAN_HPP_NAMESPACE::ValidationCacheEXT *                 pValidationCache,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateValidationCacheEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateValidationCacheEXT( m_device,
                                                               reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( pCreateInfo ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                               reinterpret_cast<VkValidationCacheEXT *>( pValidationCache ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ValidationCacheEXT>::type
-    Device::createValidationCacheEXT( const ValidationCacheCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>::type
+                       Device::createValidationCacheEXT( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT & createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                      Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateValidationCacheEXT && "Function <vkCreateValidationCacheEXT> requires <VK_EXT_validation_cache>" );
 #  endif
 
-    ValidationCacheEXT validationCache;
-    Result             result = static_cast<Result>( d.vkCreateValidationCacheEXT( m_device,
-                                                                       reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createValidationCacheEXT" );
+    VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache;
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateValidationCacheEXT(
+      m_device,
+      reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createValidationCacheEXT" );
 
-    return detail::createResultValueType( result, std::move( validationCache ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( validationCache ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<ValidationCacheEXT, Dispatch>>::type Device::createValidationCacheEXTUnique(
-    const ValidationCacheCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ValidationCacheEXT, Dispatch>>::type
+                       Device::createValidationCacheEXTUnique( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                            Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateValidationCacheEXT && "Function <vkCreateValidationCacheEXT> requires <VK_EXT_validation_cache>" );
 #    endif
 
-    ValidationCacheEXT validationCache;
-    Result             result = static_cast<Result>( d.vkCreateValidationCacheEXT( m_device,
-                                                                       reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createValidationCacheEXTUnique" );
+    VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache;
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateValidationCacheEXT(
+      m_device,
+      reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createValidationCacheEXTUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<ValidationCacheEXT, Dispatch>( validationCache, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::ValidationCacheEXT, Dispatch>( validationCache, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyValidationCacheEXT( ValidationCacheEXT          validationCache,
-                                                            const AllocationCallbacks * pAllocator,
-                                                            Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
+                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyValidationCacheEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyValidationCacheEXT( ValidationCacheEXT                  validationCache,
-                                                            Optional<const AllocationCallbacks> allocator,
-                                                            Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT                  validationCache,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                            Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18638,25 +17093,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyValidationCacheEXT(
-      m_device, static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkValidationCacheEXT>( validationCache ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( ValidationCacheEXT validationCache, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyValidationCacheEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( ValidationCacheEXT validationCache, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT                  validationCache,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18664,61 +17121,57 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyValidationCacheEXT(
-      m_device, static_cast<VkValidationCacheEXT>( validationCache ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkValidationCacheEXT>( validationCache ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergeValidationCachesEXT( ValidationCacheEXT         dstCache,
-                                                                                  uint32_t                   srcCacheCount,
-                                                                                  const ValidationCacheEXT * pSrcCaches,
-                                                                                  Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT         dstCache,
+                                                                                  uint32_t                                         srcCacheCount,
+                                                                                  const VULKAN_HPP_NAMESPACE::ValidationCacheEXT * pSrcCaches,
+                                                                                  Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkMergeValidationCachesEXT( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkValidationCacheEXT>( dstCache ),
-                                                              srcCacheCount,
-                                                              reinterpret_cast<const VkValidationCacheEXT *>( pSrcCaches ) ) );
+    return static_cast<Result>( d.vkMergeValidationCachesEXT(
+      m_device, static_cast<VkValidationCacheEXT>( dstCache ), srcCacheCount, reinterpret_cast<const VkValidationCacheEXT *>( pSrcCaches ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::mergeValidationCachesEXT( ValidationCacheEXT dstCache, ArrayProxy<const ValidationCacheEXT> const & srcCaches, Dispatch const & d ) const
+                                          Device::mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT                                                 dstCache,
+                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches,
+                                      Dispatch const &                                                                         d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkMergeValidationCachesEXT && "Function <vkMergeValidationCachesEXT> requires <VK_EXT_validation_cache>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkMergeValidationCachesEXT(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkMergeValidationCachesEXT(
       m_device, static_cast<VkValidationCacheEXT>( dstCache ), srcCaches.size(), reinterpret_cast<const VkValidationCacheEXT *>( srcCaches.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mergeValidationCachesEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mergeValidationCachesEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getValidationCacheDataEXT( ValidationCacheEXT validationCache, size_t * pDataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache,
+                                                                                   size_t *                                 pDataSize,
+                                                                                   void *                                   pData,
+                                                                                   Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetValidationCacheDataEXT( static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( validationCache ), pDataSize, pData ) );
+    return static_cast<Result>( d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), pDataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getValidationCacheDataEXT( ValidationCacheEXT validationCache, Dispatch const & d ) const
+                       Device::getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18727,33 +17180,32 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data;
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getValidationCacheDataEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getValidationCacheDataEXT" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getValidationCacheDataEXT( ValidationCacheEXT validationCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
+    Device::getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18762,58 +17214,56 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data( uint8_tAllocator );
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetValidationCacheDataEXT( m_device, static_cast<VkValidationCacheEXT>( validationCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getValidationCacheDataEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getValidationCacheDataEXT" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_shading_rate_image ===
 
-  // wrapper function for command vkCmdBindShadingRateImageNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadingRateImageNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindShadingRateImageNV( ImageView imageView, ImageLayout imageLayout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                                                VULKAN_HPP_NAMESPACE::ImageLayout imageLayout,
+                                                                Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindShadingRateImageNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkImageView>( imageView ), static_cast<VkImageLayout>( imageLayout ) );
+    d.vkCmdBindShadingRateImageNV( m_commandBuffer, static_cast<VkImageView>( imageView ), static_cast<VkImageLayout>( imageLayout ) );
   }
 
-  // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportShadingRatePaletteNV( uint32_t                     firstViewport,
-                                                                         uint32_t                     viewportCount,
-                                                                         const ShadingRatePaletteNV * pShadingRatePalettes,
-                                                                         Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportShadingRatePaletteNV( uint32_t                                           firstViewport,
+                                                                         uint32_t                                           viewportCount,
+                                                                         const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * pShadingRatePalettes,
+                                                                         Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkCmdSetViewportShadingRatePaletteNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewportCount, reinterpret_cast<const VkShadingRatePaletteNV *>( pShadingRatePalettes ) );
+      m_commandBuffer, firstViewport, viewportCount, reinterpret_cast<const VkShadingRatePaletteNV *>( pShadingRatePalettes ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportShadingRatePaletteNV( uint32_t                                       firstViewport,
-                                                                         ArrayProxy<const ShadingRatePaletteNV> const & shadingRatePalettes,
-                                                                         Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportShadingRatePaletteNV(
+    uint32_t                                                                                   firstViewport,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes,
+    Dispatch const &                                                                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18825,26 +17275,25 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetCoarseSampleOrderNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoarseSampleOrderNV( CoarseSampleOrderTypeNV           sampleOrderType,
-                                                                uint32_t                          customSampleOrderCount,
-                                                                const CoarseSampleOrderCustomNV * pCustomSampleOrders,
-                                                                Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType,
+                                                                uint32_t                                                customSampleOrderCount,
+                                                                const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * pCustomSampleOrders,
+                                                                Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoarseSampleOrderNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdSetCoarseSampleOrderNV( m_commandBuffer,
                                    static_cast<VkCoarseSampleOrderTypeNV>( sampleOrderType ),
                                    customSampleOrderCount,
                                    reinterpret_cast<const VkCoarseSampleOrderCustomNV *>( pCustomSampleOrders ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetCoarseSampleOrderNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoarseSampleOrderNV( CoarseSampleOrderTypeNV                             sampleOrderType,
-                                                                ArrayProxy<const CoarseSampleOrderCustomNV> const & customSampleOrders,
-                                                                Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV                                                   sampleOrderType,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders,
+                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18860,90 +17309,85 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_ray_tracing ===
 
-  // wrapper function for command vkCreateAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createAccelerationStructureNV( const AccelerationStructureCreateInfoNV * pCreateInfo,
-                                                                                       const AllocationCallbacks *               pAllocator,
-                                                                                       AccelerationStructureNV *                 pAccelerationStructure,
-                                                                                       Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV * pCreateInfo,
+                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                           VULKAN_HPP_NAMESPACE::AccelerationStructureNV *                 pAccelerationStructure,
+                                           Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateAccelerationStructureNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateAccelerationStructureNV( m_device,
                                                                    reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( pCreateInfo ),
                                                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                    reinterpret_cast<VkAccelerationStructureNV *>( pAccelerationStructure ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AccelerationStructureNV>::type Device::createAccelerationStructureNV(
-    const AccelerationStructureCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>::type
+                       Device::createAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV & createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                           Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAccelerationStructureNV && "Function <vkCreateAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    AccelerationStructureNV accelerationStructure;
-    Result                  result = static_cast<Result>( d.vkCreateAccelerationStructureNV( m_device,
-                                                                            reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureNV" );
+    VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAccelerationStructureNV(
+      m_device,
+      reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureNV" );
 
-    return detail::createResultValueType( result, std::move( accelerationStructure ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( accelerationStructure ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<AccelerationStructureNV, Dispatch>>::type
-                       Device::createAccelerationStructureNVUnique( const AccelerationStructureCreateInfoNV & createInfo,
-                                                 Optional<const AllocationCallbacks>       allocator,
-                                                 Dispatch const &                          d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureNV, Dispatch>>::type
+                       Device::createAccelerationStructureNVUnique( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV & createInfo,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                                 Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateAccelerationStructureNV && "Function <vkCreateAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
 #    endif
 
-    AccelerationStructureNV accelerationStructure;
-    Result                  result = static_cast<Result>( d.vkCreateAccelerationStructureNV( m_device,
-                                                                            reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureNVUnique" );
+    VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateAccelerationStructureNV(
+      m_device,
+      reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createAccelerationStructureNVUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<AccelerationStructureNV, Dispatch>( accelerationStructure, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result,
+      UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureNV, Dispatch>( accelerationStructure, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureNV( AccelerationStructureNV     accelerationStructure,
-                                                                 const AllocationCallbacks * pAllocator,
-                                                                 Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
+                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                 Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyAccelerationStructureNV( static_cast<VkDevice>( m_device ),
-                                        static_cast<VkAccelerationStructureNV>( accelerationStructure ),
-                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyAccelerationStructureNV(
+      m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureNV( AccelerationStructureNV             accelerationStructure,
-                                                                 Optional<const AllocationCallbacks> allocator,
-                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV             accelerationStructure,
+                                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -18951,59 +17395,57 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyAccelerationStructureNV(
-      m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkAccelerationStructureNV>( accelerationStructure ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkDestroyAccelerationStructureNV(
+      m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV             accelerationStructure,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkDestroyAccelerationStructureNV && "Function <vkDestroyAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
+#  endif
+
+    d.vkDestroyAccelerationStructureNV(
+      m_device,
+      static_cast<VkAccelerationStructureNV>( accelerationStructure ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
-    Device::destroy( AccelerationStructureNV accelerationStructure, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    Device::getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV * pInfo,
+                                                          VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR *                              pMemoryRequirements,
+                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyAccelerationStructureNV( static_cast<VkDevice>( m_device ),
-                                        static_cast<VkAccelerationStructureNV>( accelerationStructure ),
-                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( AccelerationStructureNV             accelerationStructure,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyAccelerationStructureNV && "Function <vkDestroyAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
-#  endif
-
-    d.vkDestroyAccelerationStructureNV(
-      m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV * pInfo,
-                                                                               MemoryRequirements2KHR *                              pMemoryRequirements,
-                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetAccelerationStructureMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
+    d.vkGetAccelerationStructureMemoryRequirementsNV( m_device,
                                                       reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( pInfo ),
                                                       reinterpret_cast<VkMemoryRequirements2KHR *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2KHR Device::getAccelerationStructureMemoryRequirementsNV(
-    const AccelerationStructureMemoryRequirementsInfoNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR
+    Device::getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info,
+                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19011,7 +17453,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetAccelerationStructureMemoryRequirementsNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    MemoryRequirements2KHR memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR memoryRequirements;
     d.vkGetAccelerationStructureMemoryRequirementsNV( m_device,
                                                       reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( &info ),
                                                       reinterpret_cast<VkMemoryRequirements2KHR *>( &memoryRequirements ) );
@@ -19019,12 +17461,10 @@ namespace VULKAN_HPP_NAMESPACE
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                         Device::getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info,
-                                                          Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info,
+                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19032,8 +17472,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetAccelerationStructureMemoryRequirementsNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2KHR &   memoryRequirements = structureChain.template get<MemoryRequirements2KHR>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR &   memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR>();
     d.vkGetAccelerationStructureMemoryRequirementsNV( m_device,
                                                       reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( &info ),
                                                       reinterpret_cast<VkMemoryRequirements2KHR *>( &memoryRequirements ) );
@@ -19042,53 +17482,46 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindAccelerationStructureMemoryNV( uint32_t                                      bindInfoCount,
-                                                                                           const BindAccelerationStructureMemoryInfoNV * pBindInfos,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindAccelerationStructureMemoryNV(
+    uint32_t bindInfoCount, const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV * pBindInfos, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindAccelerationStructureMemoryNV(
-      static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindAccelerationStructureMemoryInfoNV *>( pBindInfos ) ) );
+    return static_cast<Result>(
+      d.vkBindAccelerationStructureMemoryNV( m_device, bindInfoCount, reinterpret_cast<const VkBindAccelerationStructureMemoryInfoNV *>( pBindInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::bindAccelerationStructureMemoryNV( ArrayProxy<const BindAccelerationStructureMemoryInfoNV> const & bindInfos, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindAccelerationStructureMemoryNV(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV> const & bindInfos, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindAccelerationStructureMemoryNV && "Function <vkBindAccelerationStructureMemoryNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkBindAccelerationStructureMemoryNV(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkBindAccelerationStructureMemoryNV(
       m_device, bindInfos.size(), reinterpret_cast<const VkBindAccelerationStructureMemoryInfoNV *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindAccelerationStructureMemoryNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindAccelerationStructureMemoryNV" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const AccelerationStructureInfoNV * pInfo,
-                                                                      Buffer                              instanceData,
-                                                                      DeviceSize                          instanceOffset,
-                                                                      Bool32                              update,
-                                                                      AccelerationStructureNV             dst,
-                                                                      AccelerationStructureNV             src,
-                                                                      Buffer                              scratch,
-                                                                      DeviceSize                          scratchOffset,
-                                                                      Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV * pInfo,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                                                      VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                                                      VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                                                      VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize                          scratchOffset,
+                                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildAccelerationStructureNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBuildAccelerationStructureNV( m_commandBuffer,
                                          reinterpret_cast<const VkAccelerationStructureInfoNV *>( pInfo ),
                                          static_cast<VkBuffer>( instanceData ),
                                          static_cast<VkDeviceSize>( instanceOffset ),
@@ -19100,18 +17533,16 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const AccelerationStructureInfoNV & info,
-                                                                      Buffer                              instanceData,
-                                                                      DeviceSize                          instanceOffset,
-                                                                      Bool32                              update,
-                                                                      AccelerationStructureNV             dst,
-                                                                      AccelerationStructureNV             src,
-                                                                      Buffer                              scratch,
-                                                                      DeviceSize                          scratchOffset,
-                                                                      Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV & info,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                                                      VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                                                      VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                                                      VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize                          scratchOffset,
+                                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19130,41 +17561,38 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureNV( AccelerationStructureNV          dst,
-                                                                     AccelerationStructureNV          src,
-                                                                     CopyAccelerationStructureModeKHR mode,
-                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
+                                                                     VULKAN_HPP_NAMESPACE::AccelerationStructureNV          src,
+                                                                     VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode,
+                                                                     Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyAccelerationStructureNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdCopyAccelerationStructureNV( m_commandBuffer,
                                         static_cast<VkAccelerationStructureNV>( dst ),
                                         static_cast<VkAccelerationStructureNV>( src ),
                                         static_cast<VkCopyAccelerationStructureModeKHR>( mode ) );
   }
 
-  // wrapper function for command vkCmdTraceRaysNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysNV( Buffer           raygenShaderBindingTableBuffer,
-                                                     DeviceSize       raygenShaderBindingOffset,
-                                                     Buffer           missShaderBindingTableBuffer,
-                                                     DeviceSize       missShaderBindingOffset,
-                                                     DeviceSize       missShaderBindingStride,
-                                                     Buffer           hitShaderBindingTableBuffer,
-                                                     DeviceSize       hitShaderBindingOffset,
-                                                     DeviceSize       hitShaderBindingStride,
-                                                     Buffer           callableShaderBindingTableBuffer,
-                                                     DeviceSize       callableShaderBindingOffset,
-                                                     DeviceSize       callableShaderBindingStride,
-                                                     uint32_t         width,
-                                                     uint32_t         height,
-                                                     uint32_t         depth,
-                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer     raygenShaderBindingTableBuffer,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize raygenShaderBindingOffset,
+                                                     VULKAN_HPP_NAMESPACE::Buffer     missShaderBindingTableBuffer,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingOffset,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingStride,
+                                                     VULKAN_HPP_NAMESPACE::Buffer     hitShaderBindingTableBuffer,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingOffset,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingStride,
+                                                     VULKAN_HPP_NAMESPACE::Buffer     callableShaderBindingTableBuffer,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingOffset,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingStride,
+                                                     uint32_t                         width,
+                                                     uint32_t                         height,
+                                                     uint32_t                         depth,
+                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdTraceRaysNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdTraceRaysNV( m_commandBuffer,
                         static_cast<VkBuffer>( raygenShaderBindingTableBuffer ),
                         static_cast<VkDeviceSize>( raygenShaderBindingOffset ),
                         static_cast<VkBuffer>( missShaderBindingTableBuffer ),
@@ -19181,18 +17609,16 @@ namespace VULKAN_HPP_NAMESPACE
                         depth );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRayTracingPipelinesNV( PipelineCache                          pipelineCache,
-                                                                                     uint32_t                               createInfoCount,
-                                                                                     const RayTracingPipelineCreateInfoNV * pCreateInfos,
-                                                                                     const AllocationCallbacks *            pAllocator,
-                                                                                     Pipeline *                             pPipelines,
-                                                                                     Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                                                                     uint32_t                            createInfoCount,
+                                                                                     const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV * pCreateInfos,
+                                                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks *            pAllocator,
+                                                                                     VULKAN_HPP_NAMESPACE::Pipeline *                             pPipelines,
+                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateRayTracingPipelinesNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
                                                                  static_cast<VkPipelineCache>( pipelineCache ),
                                                                  createInfoCount,
                                                                  reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( pCreateInfos ),
@@ -19201,215 +17627,208 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesNV( PipelineCache                                            pipelineCache,
-                                         ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                         Optional<const AllocationCallbacks>                      allocator,
-                                         Dispatch const &                                         d ) const
+  template <typename PipelineAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                         Dispatch const &                                                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNV", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNV",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
   template <typename PipelineAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesNV( PipelineCache                                            pipelineCache,
-                                         ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                         Optional<const AllocationCallbacks>                      allocator,
-                                         PipelineAllocator &                                      pipelineAllocator,
-                                         Dispatch const &                                         d ) const
+            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                         PipelineAllocator &                                                                                  pipelineAllocator,
+                                         Dispatch const &                                                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNV", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNV",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline> Device::createRayTracingPipelineNV( PipelineCache                          pipelineCache,
-                                                                                                   const RayTracingPipelineCreateInfoNV & createInfo,
-                                                                                                   Optional<const AllocationCallbacks>    allocator,
-                                                                                                   Dispatch const &                       d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                                         Device::createRayTracingPipelineNV( VULKAN_HPP_NAMESPACE::PipelineCache                          pipelineCache,
+                                        const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV & createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>    allocator,
+                                        Dispatch const &                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          1,
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineNV", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineNV",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
+    return ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>( result, std::move( pipeline ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesNVUnique( PipelineCache                                            pipelineCache,
-                                               ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                               Optional<const AllocationCallbacks>                      allocator,
-                                               Dispatch const &                                         d ) const
+  template <typename Dispatch, typename PipelineAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                               Dispatch const &                                                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNVUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNVUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createRayTracingPipelinesNVUnique( PipelineCache                                            pipelineCache,
-                                               ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                               Optional<const AllocationCallbacks>                      allocator,
-                                               PipelineAllocator &                                      pipelineAllocator,
-                                               Dispatch const &                                         d ) const
+  template <
+    typename Dispatch,
+    typename PipelineAllocator,
+    typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                                         Device::createRayTracingPipelinesNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                               PipelineAllocator & pipelineAllocator,
+                                               Dispatch const &    d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #    endif
 
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNVUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      createInfos.size(),
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelinesNVUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
     uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & pipeline : pipelines )
     {
       uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
   }
 
-  // wrapper function for command vkCreateRayTracingPipelinesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>> Device::createRayTracingPipelineNVUnique(
-    PipelineCache pipelineCache, const RayTracingPipelineCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                                         Device::createRayTracingPipelineNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache                          pipelineCache,
+                                              const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV & createInfo,
+                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>    allocator,
+                                              Dispatch const &                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateRayTracingPipelinesNV && "Function <vkCreateRayTracingPipelinesNV> requires <VK_NV_ray_tracing>" );
 #    endif
 
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateRayTracingPipelinesNV( m_device,
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          1,
-                                                                          reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineNVUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateRayTracingPipelinesNV(
+      m_device,
+      static_cast<VkPipelineCache>( pipelineCache ),
+      1,
+      reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createRayTracingPipelineNVUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT } );
 
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>( pipeline, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesNV(
-    Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getRayTracingShaderGroupHandlesNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                                           uint32_t                       firstGroup,
+                                                                                           uint32_t                       groupCount,
+                                                                                           size_t                         dataSize,
+                                                                                           void *                         pData,
+                                                                                           Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
+    return static_cast<Result>(
+      d.vkGetRayTracingShaderGroupHandlesNV( m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, dataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
-    Device::getRayTracingShaderGroupHandlesNV( Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type Device::getRayTracingShaderGroupHandlesNV(
+    VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19419,18 +17838,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesNV(
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingShaderGroupHandlesNV(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, data.size() * sizeof( DataType ), reinterpret_cast<void *>( data.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandlesNV" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getRayTracingShaderGroupHandleNV( Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
+    Device::getRayTracingShaderGroupHandleNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19438,38 +17855,30 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetRayTracingShaderGroupHandlesNV> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetRayTracingShaderGroupHandlesNV(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetRayTracingShaderGroupHandlesNV(
       m_device, static_cast<VkPipeline>( pipeline ), firstGroup, groupCount, sizeof( DataType ), reinterpret_cast<void *>( &data ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandleNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getRayTracingShaderGroupHandleNV" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetAccelerationStructureHandleNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAccelerationStructureHandleNV( AccelerationStructureNV accelerationStructure,
-                                                                                          size_t                  dataSize,
-                                                                                          void *                  pData,
-                                                                                          Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
+                                                                                          size_t                                        dataSize,
+                                                                                          void *                                        pData,
+                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetAccelerationStructureHandleNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkAccelerationStructureNV>( accelerationStructure ), dataSize, pData ) );
+    return static_cast<Result>(
+      d.vkGetAccelerationStructureHandleNV( m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), dataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAccelerationStructureHandleNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
-                       Device::getAccelerationStructureHandleNV( AccelerationStructureNV accelerationStructure, size_t dataSize, Dispatch const & d ) const
+    Device::getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure, size_t dataSize, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19478,45 +17887,41 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkGetAccelerationStructureHandleNV(
+    VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetAccelerationStructureHandleNV(
       m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), data.size() * sizeof( DataType ), reinterpret_cast<void *>( data.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetAccelerationStructureHandleNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getAccelerationStructureHandleNV( AccelerationStructureNV accelerationStructure, Dispatch const & d ) const
+                       Device::getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetAccelerationStructureHandleNV && "Function <vkGetAccelerationStructureHandleNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetAccelerationStructureHandleNV(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetAccelerationStructureHandleNV(
       m_device, static_cast<VkAccelerationStructureNV>( accelerationStructure ), sizeof( DataType ), reinterpret_cast<void *>( &data ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureHandleNV" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV( uint32_t                        accelerationStructureCount,
-                                                                                 const AccelerationStructureNV * pAccelerationStructures,
-                                                                                 QueryType                       queryType,
-                                                                                 QueryPool                       queryPool,
-                                                                                 uint32_t                        firstQuery,
-                                                                                 Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV( uint32_t accelerationStructureCount,
+                                                                                 const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * pAccelerationStructures,
+                                                                                 VULKAN_HPP_NAMESPACE::QueryType                       queryType,
+                                                                                 VULKAN_HPP_NAMESPACE::QueryPool                       queryPool,
+                                                                                 uint32_t                                              firstQuery,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteAccelerationStructuresPropertiesNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdWriteAccelerationStructuresPropertiesNV( m_commandBuffer,
                                                     accelerationStructureCount,
                                                     reinterpret_cast<const VkAccelerationStructureNV *>( pAccelerationStructures ),
                                                     static_cast<VkQueryType>( queryType ),
@@ -19525,14 +17930,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV( ArrayProxy<const AccelerationStructureNV> const & accelerationStructures,
-                                                                                 QueryType                                         queryType,
-                                                                                 QueryPool                                         queryPool,
-                                                                                 uint32_t                                          firstQuery,
-                                                                                 Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
+    VULKAN_HPP_NAMESPACE::QueryType                                                               queryType,
+    VULKAN_HPP_NAMESPACE::QueryPool                                                               queryPool,
+    uint32_t                                                                                      firstQuery,
+    Dispatch const &                                                                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19550,52 +17954,49 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::compileDeferredNV( Pipeline pipeline, uint32_t shader, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::compileDeferredNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                           uint32_t                       shader,
+                                                                           Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCompileDeferredNV( static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( pipeline ), shader ) );
+    return static_cast<Result>( d.vkCompileDeferredNV( m_device, static_cast<VkPipeline>( pipeline ), shader ) );
   }
 #else
-  // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::compileDeferredNV( Pipeline pipeline, uint32_t shader, Dispatch const & d ) const
+                                          Device::compileDeferredNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t shader, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCompileDeferredNV && "Function <vkCompileDeferredNV> requires <VK_NV_ray_tracing>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCompileDeferredNV( m_device, static_cast<VkPipeline>( pipeline ), shader ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::compileDeferredNV" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCompileDeferredNV( m_device, static_cast<VkPipeline>( pipeline ), shader ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::compileDeferredNV" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_maintenance3 ===
 
-  // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                                                   DescriptorSetLayoutSupport *          pSupport,
-                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                                                   VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport *          pSupport,
+                                                                   Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetLayoutSupportKHR( static_cast<VkDevice>( m_device ),
-                                          reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( pCreateInfo ),
-                                          reinterpret_cast<VkDescriptorSetLayoutSupport *>( pSupport ) );
+    d.vkGetDescriptorSetLayoutSupportKHR(
+      m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( pCreateInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( pSupport ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutSupport Device::getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                                         Device::getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                              Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19603,18 +18004,17 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDescriptorSetLayoutSupportKHR> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 #  endif
 
-    DescriptorSetLayoutSupport support;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport support;
     d.vkGetDescriptorSetLayoutSupportKHR(
       m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
 
     return support;
   }
 
-  // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         Device::getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                              Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19622,8 +18022,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDescriptorSetLayoutSupportKHR> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 #  endif
 
-    StructureChain<X, Y, Z...>   structureChain;
-    DescriptorSetLayoutSupport & support = structureChain.template get<DescriptorSetLayoutSupport>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>   structureChain;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport & support = structureChain.template get<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>();
     d.vkGetDescriptorSetLayoutSupportKHR(
       m_device, reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ), reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
 
@@ -19633,18 +18033,17 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_draw_indirect_count ===
 
-  // wrapper function for command vkCmdDrawIndirectCountKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountKHR( Buffer           buffer,
-                                                              DeviceSize       offset,
-                                                              Buffer           countBuffer,
-                                                              DeviceSize       countBufferOffset,
-                                                              uint32_t         maxDrawCount,
-                                                              uint32_t         stride,
-                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                              VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                              uint32_t                         maxDrawCount,
+                                                              uint32_t                         stride,
+                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndirectCountKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawIndirectCountKHR( m_commandBuffer,
                                  static_cast<VkBuffer>( buffer ),
                                  static_cast<VkDeviceSize>( offset ),
                                  static_cast<VkBuffer>( countBuffer ),
@@ -19653,19 +18052,17 @@ namespace VULKAN_HPP_NAMESPACE
                                  stride );
   }
 
-  // wrapper function for command vkCmdDrawIndexedIndirectCountKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountKHR( Buffer           buffer,
-                                                                     DeviceSize       offset,
-                                                                     Buffer           countBuffer,
-                                                                     DeviceSize       countBufferOffset,
-                                                                     uint32_t         maxDrawCount,
-                                                                     uint32_t         stride,
-                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                     VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                     VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                     VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                     uint32_t                         maxDrawCount,
+                                                                     uint32_t                         stride,
+                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawIndexedIndirectCountKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawIndexedIndirectCountKHR( m_commandBuffer,
                                         static_cast<VkBuffer>( buffer ),
                                         static_cast<VkDeviceSize>( offset ),
                                         static_cast<VkBuffer>( countBuffer ),
@@ -19676,95 +18073,76 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_external_memory_host ===
 
-  // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryHostPointerPropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                                           const void *                     pHostPointer,
-                                                                                           MemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties,
-                                                                                           Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                               const void *                                           pHostPointer,
+                                               VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties,
+                                               Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryHostPointerPropertiesEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetMemoryHostPointerPropertiesEXT( m_device,
                                                                        static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                                        pHostPointer,
                                                                        reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( pMemoryHostPointerProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryHostPointerPropertiesEXT>::type
-    Device::getMemoryHostPointerPropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT>::type
+                       Device::getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                               const void *                                           pHostPointer,
+                                               Dispatch const &                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryHostPointerPropertiesEXT && "Function <vkGetMemoryHostPointerPropertiesEXT> requires <VK_EXT_external_memory_host>" );
 #  endif
 
-    MemoryHostPointerPropertiesEXT memoryHostPointerProperties;
-    Result                         result =
-      static_cast<Result>( d.vkGetMemoryHostPointerPropertiesEXT( m_device,
-                                                                  static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                                  pHostPointer,
-                                                                  reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( &memoryHostPointerProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryHostPointerPropertiesEXT" );
+    VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT memoryHostPointerProperties;
+    VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetMemoryHostPointerPropertiesEXT( m_device,
+                                             static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
+                                             pHostPointer,
+                                             reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( &memoryHostPointerProperties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryHostPointerPropertiesEXT" );
 
-    return detail::createResultValueType( result, std::move( memoryHostPointerProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryHostPointerProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_AMD_buffer_marker ===
 
-  // wrapper function for command vkCmdWriteBufferMarkerAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarkerAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarkerAMD(
-    PipelineStageFlagBits pipelineStage, Buffer dstBuffer, DeviceSize dstOffset, uint32_t marker, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarkerAMD( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                                                              VULKAN_HPP_NAMESPACE::Buffer                dstBuffer,
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize            dstOffset,
+                                                              uint32_t                                    marker,
+                                                              Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteBufferMarkerAMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdWriteBufferMarkerAMD( m_commandBuffer,
                                  static_cast<VkPipelineStageFlagBits>( pipelineStage ),
                                  static_cast<VkBuffer>( dstBuffer ),
                                  static_cast<VkDeviceSize>( dstOffset ),
                                  marker );
   }
 
-  // wrapper function for command vkCmdWriteBufferMarker2AMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarker2AMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarker2AMD(
-    PipelineStageFlags2 stage, Buffer dstBuffer, DeviceSize dstOffset, uint32_t marker, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteBufferMarker2AMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  static_cast<VkPipelineStageFlags2>( stage ),
-                                  static_cast<VkBuffer>( dstBuffer ),
-                                  static_cast<VkDeviceSize>( dstOffset ),
-                                  marker );
-  }
-
   //=== VK_EXT_calibrated_timestamps ===
 
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCalibrateableTimeDomainsEXT( uint32_t *       pTimeDomainCount,
-                                                                                                TimeDomainKHR *  pTimeDomains,
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCalibrateableTimeDomainsEXT( uint32_t *                            pTimeDomainCount,
+                                                                                                VULKAN_HPP_NAMESPACE::TimeDomainKHR * pTimeDomains,
                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pTimeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( pTimeDomains ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, pTimeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( pTimeDomains ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-  template <typename TimeDomainKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+  template <typename TimeDomainKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
                        PhysicalDevice::getCalibrateableTimeDomainsEXT( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -19773,35 +18151,32 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsEXT> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 #  endif
 
-    std::vector<TimeDomainKHR, TimeDomainKHRAllocator> timeDomains;
-    uint32_t                                           timeDomainCount;
-    Result                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator> timeDomains;
+    uint32_t                                                                 timeDomainCount;
+    VULKAN_HPP_NAMESPACE::Result                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && timeDomainCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
       {
         timeDomains.resize( timeDomainCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
     VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
     if ( timeDomainCount < timeDomains.size() )
     {
       timeDomains.resize( timeDomainCount );
     }
-    return detail::createResultValueType( result, std::move( timeDomains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
   template <typename TimeDomainKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::TimeDomainKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
                        PhysicalDevice::getCalibrateableTimeDomainsEXT( TimeDomainKHRAllocator & timeDomainKHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -19810,53 +18185,46 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsEXT> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 #  endif
 
-    std::vector<TimeDomainKHR, TimeDomainKHRAllocator> timeDomains( timeDomainKHRAllocator );
-    uint32_t                                           timeDomainCount;
-    Result                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator> timeDomains( timeDomainKHRAllocator );
+    uint32_t                                                                 timeDomainCount;
+    VULKAN_HPP_NAMESPACE::Result                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && timeDomainCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
       {
         timeDomains.resize( timeDomainCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( m_physicalDevice, &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
     VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
     if ( timeDomainCount < timeDomains.size() )
     {
       timeDomains.resize( timeDomainCount );
     }
-    return detail::createResultValueType( result, std::move( timeDomains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetCalibratedTimestampsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCalibratedTimestampsEXT( uint32_t                           timestampCount,
-                                                                                    const CalibratedTimestampInfoKHR * pTimestampInfos,
-                                                                                    uint64_t *                         pTimestamps,
-                                                                                    uint64_t *                         pMaxDeviation,
-                                                                                    Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCalibratedTimestampsEXT( uint32_t                                                 timestampCount,
+                                                                                    const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR * pTimestampInfos,
+                                                                                    uint64_t *                                               pTimestamps,
+                                                                                    uint64_t *                                               pMaxDeviation,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetCalibratedTimestampsEXT( static_cast<VkDevice>( m_device ),
-                                                                timestampCount,
-                                                                reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( pTimestampInfos ),
-                                                                pTimestamps,
-                                                                pMaxDeviation ) );
+    return static_cast<Result>( d.vkGetCalibratedTimestampsEXT(
+      m_device, timestampCount, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( pTimestampInfos ), pTimestamps, pMaxDeviation ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetCalibratedTimestampsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-  template <typename Uint64_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint64_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-                       Device::getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos, Dispatch const & d ) const
+    Device::getCalibratedTimestampsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                        Dispatch const &                                                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19868,22 +18236,20 @@ namespace VULKAN_HPP_NAMESPACE
       std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) );
     std::vector<uint64_t, Uint64_tAllocator> & timestamps   = data_.first;
     uint64_t &                                 maxDeviation = data_.second;
-    Result                                     result       = static_cast<Result>( d.vkGetCalibratedTimestampsEXT(
+    VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCalibratedTimestampsEXT(
       m_device, timestampInfos.size(), reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ), timestamps.data(), &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetCalibratedTimestampsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
   template <typename Uint64_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-                       Device::getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                        Uint64_tAllocator &                                  uint64_tAllocator,
-                                        Dispatch const &                                     d ) const
+    Device::getCalibratedTimestampsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                        Uint64_tAllocator &                                                                              uint64_tAllocator,
+                                        Dispatch const &                                                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19895,17 +18261,16 @@ namespace VULKAN_HPP_NAMESPACE
       std::piecewise_construct, std::forward_as_tuple( timestampInfos.size(), uint64_tAllocator ), std::forward_as_tuple( 0 ) );
     std::vector<uint64_t, Uint64_tAllocator> & timestamps   = data_.first;
     uint64_t &                                 maxDeviation = data_.second;
-    Result                                     result       = static_cast<Result>( d.vkGetCalibratedTimestampsEXT(
+    VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCalibratedTimestampsEXT(
       m_device, timestampInfos.size(), reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ), timestamps.data(), &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetCalibratedTimestampsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-                       Device::getCalibratedTimestampEXT( const CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d ) const
+                       Device::getCalibratedTimestampEXT( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -19916,47 +18281,45 @@ namespace VULKAN_HPP_NAMESPACE
     std::pair<uint64_t, uint64_t> data_;
     uint64_t &                    timestamp    = data_.first;
     uint64_t &                    maxDeviation = data_.second;
-    Result                        result       = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result  result       = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetCalibratedTimestampsEXT( m_device, 1, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( &timestampInfo ), &timestamp, &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_mesh_shader ===
 
-  // wrapper function for command vkCmdDrawMeshTasksNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksNV( uint32_t taskCount, uint32_t firstTask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksNV( static_cast<VkCommandBuffer>( m_commandBuffer ), taskCount, firstTask );
+    d.vkCmdDrawMeshTasksNV( m_commandBuffer, taskCount, firstTask );
   }
 
-  // wrapper function for command vkCmdDrawMeshTasksIndirectNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectNV(
-    Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                 VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                 uint32_t                         drawCount,
+                                                                 uint32_t                         stride,
+                                                                 Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksIndirectNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+    d.vkCmdDrawMeshTasksIndirectNV( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
   }
 
-  // wrapper function for command vkCmdDrawMeshTasksIndirectCountNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountNV( Buffer           buffer,
-                                                                      DeviceSize       offset,
-                                                                      Buffer           countBuffer,
-                                                                      DeviceSize       countBufferOffset,
-                                                                      uint32_t         maxDrawCount,
-                                                                      uint32_t         stride,
-                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                      VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                      uint32_t                         maxDrawCount,
+                                                                      uint32_t                         stride,
+                                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksIndirectCountNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawMeshTasksIndirectCountNV( m_commandBuffer,
                                          static_cast<VkBuffer>( buffer ),
                                          static_cast<VkDeviceSize>( offset ),
                                          static_cast<VkBuffer>( countBuffer ),
@@ -19967,28 +18330,23 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_scissor_exclusive ===
 
-  // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorEnableNV( uint32_t         firstExclusiveScissor,
-                                                                     uint32_t         exclusiveScissorCount,
-                                                                     const Bool32 *   pExclusiveScissorEnables,
-                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorEnableNV( uint32_t                             firstExclusiveScissor,
+                                                                     uint32_t                             exclusiveScissorCount,
+                                                                     const VULKAN_HPP_NAMESPACE::Bool32 * pExclusiveScissorEnables,
+                                                                     Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetExclusiveScissorEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                        firstExclusiveScissor,
-                                        exclusiveScissorCount,
-                                        reinterpret_cast<const VkBool32 *>( pExclusiveScissorEnables ) );
+    d.vkCmdSetExclusiveScissorEnableNV(
+      m_commandBuffer, firstExclusiveScissor, exclusiveScissorCount, reinterpret_cast<const VkBool32 *>( pExclusiveScissorEnables ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorEnableNV( uint32_t                         firstExclusiveScissor,
-                                                                     ArrayProxy<const Bool32> const & exclusiveScissorEnables,
-                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setExclusiveScissorEnableNV( uint32_t                                                                     firstExclusiveScissor,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & exclusiveScissorEnables,
+                                                Dispatch const &                                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -20000,24 +18358,21 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV( uint32_t         firstExclusiveScissor,
-                                                               uint32_t         exclusiveScissorCount,
-                                                               const Rect2D *   pExclusiveScissors,
-                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV( uint32_t                             firstExclusiveScissor,
+                                                               uint32_t                             exclusiveScissorCount,
+                                                               const VULKAN_HPP_NAMESPACE::Rect2D * pExclusiveScissors,
+                                                               Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetExclusiveScissorNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstExclusiveScissor, exclusiveScissorCount, reinterpret_cast<const VkRect2D *>( pExclusiveScissors ) );
+    d.vkCmdSetExclusiveScissorNV( m_commandBuffer, firstExclusiveScissor, exclusiveScissorCount, reinterpret_cast<const VkRect2D *>( pExclusiveScissors ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV( uint32_t                         firstExclusiveScissor,
-                                                               ArrayProxy<const Rect2D> const & exclusiveScissors,
-                                                               Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV( uint32_t firstExclusiveScissor,
+                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors,
+                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -20031,17 +18386,15 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_device_diagnostic_checkpoints ===
 
-  // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCheckpointNV( const void * pCheckpointMarker, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCheckpointNV( static_cast<VkCommandBuffer>( m_commandBuffer ), pCheckpointMarker );
+    d.vkCmdSetCheckpointNV( m_commandBuffer, pCheckpointMarker );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
-  template <typename CheckpointMarkerType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename CheckpointMarkerType, typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCheckpointNV( CheckpointMarkerType const & checkpointMarker, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -20053,30 +18406,27 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Queue::getCheckpointDataNV( uint32_t * pCheckpointDataCount, CheckpointDataNV * pCheckpointData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::getCheckpointDataNV( uint32_t *                               pCheckpointDataCount,
+                                                     VULKAN_HPP_NAMESPACE::CheckpointDataNV * pCheckpointData,
+                                                     Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetQueueCheckpointDataNV( static_cast<VkQueue>( m_queue ), pCheckpointDataCount, reinterpret_cast<VkCheckpointDataNV *>( pCheckpointData ) );
+    d.vkGetQueueCheckpointDataNV( m_queue, pCheckpointDataCount, reinterpret_cast<VkCheckpointDataNV *>( pCheckpointData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-  template <typename CheckpointDataNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, CheckpointDataNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV, CheckpointDataNVAllocator> Queue::getCheckpointDataNV( Dispatch const & d ) const
+  template <typename CheckpointDataNVAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator>
+                                         Queue::getCheckpointDataNV( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointDataNV && "Function <vkGetQueueCheckpointDataNV> requires <VK_NV_device_diagnostic_checkpoints>" );
 #  endif
 
-    std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData;
-    uint32_t                                                 checkpointDataCount;
+    std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator> checkpointData;
+    uint32_t                                                                       checkpointDataCount;
     d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr );
     checkpointData.resize( checkpointDataCount );
     d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointDataNV *>( checkpointData.data() ) );
@@ -20089,12 +18439,10 @@ namespace VULKAN_HPP_NAMESPACE
     return checkpointData;
   }
 
-  // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
   template <typename CheckpointDataNVAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, CheckpointDataNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV, CheckpointDataNVAllocator>
+            typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, VULKAN_HPP_NAMESPACE::CheckpointDataNV>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator>
                                          Queue::getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataNVAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -20102,8 +18450,8 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointDataNV && "Function <vkGetQueueCheckpointDataNV> requires <VK_NV_device_diagnostic_checkpoints>" );
 #  endif
 
-    std::vector<CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( checkpointDataNVAllocator );
-    uint32_t                                                 checkpointDataCount;
+    std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator> checkpointData( checkpointDataNVAllocator );
+    uint32_t                                                                       checkpointDataCount;
     d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, nullptr );
     checkpointData.resize( checkpointDataCount );
     d.vkGetQueueCheckpointDataNV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointDataNV *>( checkpointData.data() ) );
@@ -20117,531 +18465,326 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Queue::getCheckpointData2NV( uint32_t * pCheckpointDataCount, CheckpointData2NV * pCheckpointData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetQueueCheckpointData2NV( static_cast<VkQueue>( m_queue ), pCheckpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( pCheckpointData ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-  template <typename CheckpointData2NVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, CheckpointData2NV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointData2NV, CheckpointData2NVAllocator> Queue::getCheckpointData2NV( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointData2NV && "Function <vkGetQueueCheckpointData2NV> requires <VK_NV_device_diagnostic_checkpoints>" );
-#  endif
-
-    std::vector<CheckpointData2NV, CheckpointData2NVAllocator> checkpointData;
-    uint32_t                                                   checkpointDataCount;
-    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, nullptr );
-    checkpointData.resize( checkpointDataCount );
-    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
-
-    VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
-    if ( checkpointDataCount < checkpointData.size() )
-    {
-      checkpointData.resize( checkpointDataCount );
-    }
-    return checkpointData;
-  }
-
-  // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-  template <typename CheckpointData2NVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, CheckpointData2NV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointData2NV, CheckpointData2NVAllocator>
-                                         Queue::getCheckpointData2NV( CheckpointData2NVAllocator & checkpointData2NVAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointData2NV && "Function <vkGetQueueCheckpointData2NV> requires <VK_NV_device_diagnostic_checkpoints>" );
-#  endif
-
-    std::vector<CheckpointData2NV, CheckpointData2NVAllocator> checkpointData( checkpointData2NVAllocator );
-    uint32_t                                                   checkpointDataCount;
-    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, nullptr );
-    checkpointData.resize( checkpointDataCount );
-    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
-
-    VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
-    if ( checkpointDataCount < checkpointData.size() )
-    {
-      checkpointData.resize( checkpointDataCount );
-    }
-    return checkpointData;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
   //=== VK_KHR_timeline_semaphore ===
 
-  // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreCounterValueKHR( Semaphore        semaphore,
-                                                                                     uint64_t *       pValue,
-                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreCounterValueKHR( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
+                                                                                     uint64_t *                      pValue,
+                                                                                     Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSemaphoreCounterValueKHR( static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( semaphore ), pValue ) );
+    return static_cast<Result>( d.vkGetSemaphoreCounterValueKHR( m_device, static_cast<VkSemaphore>( semaphore ), pValue ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Device::getSemaphoreCounterValueKHR( Semaphore        semaphore,
-                                                                                                                       Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type
+                       Device::getSemaphoreCounterValueKHR( VULKAN_HPP_NAMESPACE::Semaphore semaphore, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSemaphoreCounterValueKHR && "Function <vkGetSemaphoreCounterValueKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    uint64_t value;
-    Result   result = static_cast<Result>( d.vkGetSemaphoreCounterValueKHR( m_device, static_cast<VkSemaphore>( semaphore ), &value ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreCounterValueKHR" );
+    uint64_t                     value;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetSemaphoreCounterValueKHR( m_device, static_cast<VkSemaphore>( semaphore ), &value ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreCounterValueKHR" );
 
-    return detail::createResultValueType( result, std::move( value ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const SemaphoreWaitInfo * pWaitInfo,
-                                                                           uint64_t                  timeout,
-                                                                           Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
+                                                                           uint64_t                                        timeout,
+                                                                           Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkWaitSemaphoresKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( pWaitInfo ), timeout ) );
+    return static_cast<Result>( d.vkWaitSemaphoresKHR( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( pWaitInfo ), timeout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const SemaphoreWaitInfo & waitInfo, uint64_t timeout, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+    Device::waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo, uint64_t timeout, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkWaitSemaphoresKHR && "Function <vkWaitSemaphoresKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkWaitSemaphoresKHR( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphoresKHR", { Result::eSuccess, Result::eTimeout } );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkWaitSemaphoresKHR( m_device, reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphoresKHR", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphoreKHR( const SemaphoreSignalInfo * pSignalInfo,
-                                                                            Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
+                                                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSignalSemaphoreKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreSignalInfo *>( pSignalInfo ) ) );
+    return static_cast<Result>( d.vkSignalSemaphoreKHR( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( pSignalInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::signalSemaphoreKHR( const SemaphoreSignalInfo & signalInfo, Dispatch const & d ) const
+                                          Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSignalSemaphoreKHR && "Function <vkSignalSemaphoreKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkSignalSemaphoreKHR( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphoreKHR" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkSignalSemaphoreKHR( m_device, reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphoreKHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  //=== VK_EXT_present_timing ===
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setSwapchainPresentTimingQueueSizeEXT( SwapchainKHR     swapchain,
-                                                                                               uint32_t         size,
-                                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkSetSwapchainPresentTimingQueueSizeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), size ) );
-  }
-#else
-  // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setSwapchainPresentTimingQueueSizeEXT( SwapchainKHR swapchain, uint32_t size, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkSetSwapchainPresentTimingQueueSizeEXT && "Function <vkSetSwapchainPresentTimingQueueSizeEXT> requires <VK_EXT_present_timing>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkSetSwapchainPresentTimingQueueSizeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ), size ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setSwapchainPresentTimingQueueSizeEXT", { Result::eSuccess, Result::eNotReady } );
-
-    return static_cast<Result>( result );
-  }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-  // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainTimingPropertiesEXT( SwapchainKHR                   swapchain,
-                                                                                         SwapchainTimingPropertiesEXT * pSwapchainTimingProperties,
-                                                                                         uint64_t *                     pSwapchainTimingPropertiesCounter,
-                                                                                         Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSwapchainTimingPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                     static_cast<VkSwapchainKHR>( swapchain ),
-                                                                     reinterpret_cast<VkSwapchainTimingPropertiesEXT *>( pSwapchainTimingProperties ),
-                                                                     pSwapchainTimingPropertiesCounter ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>>
-                                         Device::getSwapchainTimingPropertiesEXT( SwapchainKHR swapchain, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetSwapchainTimingPropertiesEXT && "Function <vkGetSwapchainTimingPropertiesEXT> requires <VK_EXT_present_timing>" );
-#  endif
-
-    std::pair<SwapchainTimingPropertiesEXT, uint64_t> data_;
-    SwapchainTimingPropertiesEXT &                    swapchainTimingProperties        = data_.first;
-    uint64_t &                                        swapchainTimingPropertiesCounter = data_.second;
-    Result                                            result                           = static_cast<Result>( d.vkGetSwapchainTimingPropertiesEXT( m_device,
-                                                                              static_cast<VkSwapchainKHR>( swapchain ),
-                                                                              reinterpret_cast<VkSwapchainTimingPropertiesEXT *>( &swapchainTimingProperties ),
-                                                                              &swapchainTimingPropertiesCounter ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainTimingPropertiesEXT", { Result::eSuccess, Result::eNotReady } );
-
-    return ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>>( result, std::move( data_ ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetSwapchainTimeDomainPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimeDomainPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSwapchainTimeDomainPropertiesEXT( SwapchainKHR                       swapchain,
-                                                                                             SwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
-                                                                                             uint64_t *                         pTimeDomainsCounter,
-                                                                                             Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetSwapchainTimeDomainPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                               static_cast<VkSwapchainKHR>( swapchain ),
-                                               reinterpret_cast<VkSwapchainTimeDomainPropertiesEXT *>( pSwapchainTimeDomainProperties ),
-                                               pTimeDomainsCounter ) );
-  }
-
-  // wrapper function for command vkGetPastPresentationTimingEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPastPresentationTimingEXT( const PastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
-                                                                                      PastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties,
-                                                                                      Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetPastPresentationTimingEXT( static_cast<VkDevice>( m_device ),
-                                        reinterpret_cast<const VkPastPresentationTimingInfoEXT *>( pPastPresentationTimingInfo ),
-                                        reinterpret_cast<VkPastPresentationTimingPropertiesEXT *>( pPastPresentationTimingProperties ) ) );
-  }
-
   //=== VK_INTEL_performance_query ===
 
-  // wrapper function for command vkInitializePerformanceApiINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL * pInitializeInfo,
-                                                                                       Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::initializePerformanceApiINTEL(
+    const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL * pInitializeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkInitializePerformanceApiINTEL( static_cast<VkDevice>( m_device ),
-                                                                   reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( pInitializeInfo ) ) );
+    return static_cast<Result>(
+      d.vkInitializePerformanceApiINTEL( m_device, reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( pInitializeInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkInitializePerformanceApiINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL & initializeInfo, Dispatch const & d ) const
+    Device::initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL & initializeInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkInitializePerformanceApiINTEL && "Function <vkInitializePerformanceApiINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkInitializePerformanceApiINTEL( m_device, reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( &initializeInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::initializePerformanceApiINTEL" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkInitializePerformanceApiINTEL( m_device, reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( &initializeInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::initializePerformanceApiINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUninitializePerformanceApiINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUninitializePerformanceApiINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void Device::uninitializePerformanceApiINTEL( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUninitializePerformanceApiINTEL( static_cast<VkDevice>( m_device ) );
+    d.vkUninitializePerformanceApiINTEL( m_device );
   }
 
-  // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL * pMarkerInfo,
-                                                                                          Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL * pMarkerInfo,
+                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCmdSetPerformanceMarkerINTEL( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                  reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( pMarkerInfo ) ) );
+    return static_cast<Result>( d.vkCmdSetPerformanceMarkerINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( pMarkerInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          CommandBuffer::setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL & markerInfo, Dispatch const & d ) const
+    CommandBuffer::setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL & markerInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdSetPerformanceMarkerINTEL && "Function <vkCmdSetPerformanceMarkerINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkCmdSetPerformanceMarkerINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( &markerInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceMarkerINTEL" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCmdSetPerformanceMarkerINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( &markerInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceMarkerINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL * pMarkerInfo,
-                                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceStreamMarkerINTEL(
+    const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL * pMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCmdSetPerformanceStreamMarkerINTEL( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                        reinterpret_cast<const VkPerformanceStreamMarkerInfoINTEL *>( pMarkerInfo ) ) );
+    return static_cast<Result>(
+      d.vkCmdSetPerformanceStreamMarkerINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceStreamMarkerInfoINTEL *>( pMarkerInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    CommandBuffer::setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL & markerInfo, Dispatch const & d ) const
+    CommandBuffer::setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL & markerInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdSetPerformanceStreamMarkerINTEL && "Function <vkCmdSetPerformanceStreamMarkerINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkCmdSetPerformanceStreamMarkerINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceStreamMarkerInfoINTEL *>( &markerInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceStreamMarkerINTEL" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceStreamMarkerINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL * pOverrideInfo,
-                                                                                            Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result CommandBuffer::setPerformanceOverrideINTEL(
+    const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL * pOverrideInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCmdSetPerformanceOverrideINTEL( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                    reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( pOverrideInfo ) ) );
+    return static_cast<Result>(
+      d.vkCmdSetPerformanceOverrideINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( pOverrideInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    CommandBuffer::setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL & overrideInfo, Dispatch const & d ) const
+    CommandBuffer::setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL & overrideInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdSetPerformanceOverrideINTEL && "Function <vkCmdSetPerformanceOverrideINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result =
-      static_cast<Result>( d.vkCmdSetPerformanceOverrideINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( &overrideInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceOverrideINTEL" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCmdSetPerformanceOverrideINTEL( m_commandBuffer, reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( &overrideInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceOverrideINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquirePerformanceConfigurationINTEL( const PerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
-                                                                                              PerformanceConfigurationINTEL *                  pConfiguration,
-                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::acquirePerformanceConfigurationINTEL( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
+                                                  VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL *                  pConfiguration,
+                                                  Dispatch const &                                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquirePerformanceConfigurationINTEL( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkAcquirePerformanceConfigurationINTEL( m_device,
                                                                           reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( pAcquireInfo ),
                                                                           reinterpret_cast<VkPerformanceConfigurationINTEL *>( pConfiguration ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PerformanceConfigurationINTEL>::type
-                       Device::acquirePerformanceConfigurationINTEL( const PerformanceConfigurationAcquireInfoINTEL & acquireInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>::type
+    Device::acquirePerformanceConfigurationINTEL( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL & acquireInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquirePerformanceConfigurationINTEL && "Function <vkAcquirePerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    PerformanceConfigurationINTEL configuration;
-    Result                        result =
-      static_cast<Result>( d.vkAcquirePerformanceConfigurationINTEL( m_device,
-                                                                     reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( &acquireInfo ),
-                                                                     reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquirePerformanceConfigurationINTEL" );
+    VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration;
+    VULKAN_HPP_NAMESPACE::Result                        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkAcquirePerformanceConfigurationINTEL( m_device,
+                                                reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( &acquireInfo ),
+                                                reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquirePerformanceConfigurationINTEL" );
 
-    return detail::createResultValueType( result, std::move( configuration ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( configuration ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<PerformanceConfigurationINTEL, Dispatch>>::type
-    Device::acquirePerformanceConfigurationINTELUnique( const PerformanceConfigurationAcquireInfoINTEL & acquireInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL, Dispatch>>::type
+                       Device::acquirePerformanceConfigurationINTELUnique( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL & acquireInfo,
+                                                        Dispatch const &                                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquirePerformanceConfigurationINTEL && "Function <vkAcquirePerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 #    endif
 
-    PerformanceConfigurationINTEL configuration;
-    Result                        result =
-      static_cast<Result>( d.vkAcquirePerformanceConfigurationINTEL( m_device,
-                                                                     reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( &acquireInfo ),
-                                                                     reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquirePerformanceConfigurationINTELUnique" );
+    VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration;
+    VULKAN_HPP_NAMESPACE::Result                        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkAcquirePerformanceConfigurationINTEL( m_device,
+                                                reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( &acquireInfo ),
+                                                reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquirePerformanceConfigurationINTELUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<PerformanceConfigurationINTEL, Dispatch>( configuration, detail::ObjectRelease<Device, Dispatch>( *this, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL, Dispatch>( configuration, ObjectRelease<Device, Dispatch>( *this, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releasePerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration,
-                                                                                              Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releasePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
+                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkReleasePerformanceConfigurationINTEL( static_cast<VkDevice>( m_device ), static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    return static_cast<Result>( d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
   }
 #else
-  // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::releasePerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration, Dispatch const & d ) const
+    Device::releasePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkReleasePerformanceConfigurationINTEL && "Function <vkReleasePerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releasePerformanceConfigurationINTEL" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releasePerformanceConfigurationINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::release( PerformanceConfigurationINTEL configuration, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::release( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
+                                                                 Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkReleasePerformanceConfigurationINTEL( static_cast<VkDevice>( m_device ), static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    return static_cast<Result>( d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
   }
 #else
-  // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::release( PerformanceConfigurationINTEL configuration,
-                                                                                                                  Dispatch const &              d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          Device::release( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkReleasePerformanceConfigurationINTEL && "Function <vkReleasePerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::release" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkReleasePerformanceConfigurationINTEL( m_device, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::release" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::setPerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration,
-                                                                                         Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
+                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkQueueSetPerformanceConfigurationINTEL( static_cast<VkQueue>( m_queue ), static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    return static_cast<Result>( d.vkQueueSetPerformanceConfigurationINTEL( m_queue, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
   }
 #else
-  // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Queue::setPerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration, Dispatch const & d ) const
+    Queue::setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -20649,117 +18792,116 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkQueueSetPerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkQueueSetPerformanceConfigurationINTEL( m_queue, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::setPerformanceConfigurationINTEL" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkQueueSetPerformanceConfigurationINTEL( m_queue, static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::setPerformanceConfigurationINTEL" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetPerformanceParameterINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter,
-                                                                                      PerformanceValueINTEL *       pValue,
-                                                                                      Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter,
+                                                                                      VULKAN_HPP_NAMESPACE::PerformanceValueINTEL *       pValue,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetPerformanceParameterINTEL(
-      static_cast<VkDevice>( m_device ), static_cast<VkPerformanceParameterTypeINTEL>( parameter ), reinterpret_cast<VkPerformanceValueINTEL *>( pValue ) ) );
+      m_device, static_cast<VkPerformanceParameterTypeINTEL>( parameter ), reinterpret_cast<VkPerformanceValueINTEL *>( pValue ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPerformanceParameterINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PerformanceValueINTEL>::type
-                       Device::getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PerformanceValueINTEL>::type
+                       Device::getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPerformanceParameterINTEL && "Function <vkGetPerformanceParameterINTEL> requires <VK_INTEL_performance_query>" );
 #  endif
 
-    PerformanceValueINTEL value;
-    Result                result = static_cast<Result>( d.vkGetPerformanceParameterINTEL(
+    VULKAN_HPP_NAMESPACE::PerformanceValueINTEL value;
+    VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPerformanceParameterINTEL(
       m_device, static_cast<VkPerformanceParameterTypeINTEL>( parameter ), reinterpret_cast<VkPerformanceValueINTEL *>( &value ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPerformanceParameterINTEL" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPerformanceParameterINTEL" );
 
-    return detail::createResultValueType( result, std::move( value ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_AMD_display_native_hdr ===
 
-  // wrapper function for command vkSetLocalDimmingAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLocalDimmingAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::setLocalDimmingAMD( SwapchainKHR swapChain, Bool32 localDimmingEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setLocalDimmingAMD( VULKAN_HPP_NAMESPACE::SwapchainKHR swapChain,
+                                                     VULKAN_HPP_NAMESPACE::Bool32       localDimmingEnable,
+                                                     Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkSetLocalDimmingAMD( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapChain ), static_cast<VkBool32>( localDimmingEnable ) );
+    d.vkSetLocalDimmingAMD( m_device, static_cast<VkSwapchainKHR>( swapChain ), static_cast<VkBool32>( localDimmingEnable ) );
   }
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_imagepipe_surface ===
 
-  // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createImagePipeSurfaceFUCHSIA( const ImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
-                                                                                         const AllocationCallbacks *               pAllocator,
-                                                                                         SurfaceKHR *                              pSurface,
-                                                                                         Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Instance::createImagePipeSurfaceFUCHSIA( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                             VULKAN_HPP_NAMESPACE::SurfaceKHR *                              pSurface,
+                                             Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateImagePipeSurfaceFUCHSIA( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateImagePipeSurfaceFUCHSIA( m_instance,
                                                                    reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( pCreateInfo ),
                                                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                    reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type Instance::createImagePipeSurfaceFUCHSIA(
-    const ImagePipeSurfaceCreateInfoFUCHSIA & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createImagePipeSurfaceFUCHSIA( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA & createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                             Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImagePipeSurfaceFUCHSIA && "Function <vkCreateImagePipeSurfaceFUCHSIA> requires <VK_FUCHSIA_imagepipe_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateImagePipeSurfaceFUCHSIA( m_instance,
-                                                                            reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createImagePipeSurfaceFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateImagePipeSurfaceFUCHSIA(
+      m_instance,
+      reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createImagePipeSurfaceFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createImagePipeSurfaceFUCHSIAUnique(
-    const ImagePipeSurfaceCreateInfoFUCHSIA & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createImagePipeSurfaceFUCHSIAUnique( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA & createInfo,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                                   Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateImagePipeSurfaceFUCHSIA && "Function <vkCreateImagePipeSurfaceFUCHSIA> requires <VK_FUCHSIA_imagepipe_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateImagePipeSurfaceFUCHSIA( m_instance,
-                                                                            reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createImagePipeSurfaceFUCHSIAUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateImagePipeSurfaceFUCHSIA(
+      m_instance,
+      reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createImagePipeSurfaceFUCHSIAUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -20768,61 +18910,64 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_surface ===
 
-  // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createMetalSurfaceEXT( const MetalSurfaceCreateInfoEXT * pCreateInfo,
-                                                                                 const AllocationCallbacks *       pAllocator,
-                                                                                 SurfaceKHR *                      pSurface,
-                                                                                 Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createMetalSurfaceEXT( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT * pCreateInfo,
+                                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                                 VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateMetalSurfaceEXT( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateMetalSurfaceEXT( m_instance,
                                                            reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( pCreateInfo ),
                                                            reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                            reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createMetalSurfaceEXT( const MetalSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createMetalSurfaceEXT( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT &   createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMetalSurfaceEXT && "Function <vkCreateMetalSurfaceEXT> requires <VK_EXT_metal_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateMetalSurfaceEXT( m_instance,
-                                                                    reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMetalSurfaceEXT" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMetalSurfaceEXT( m_instance,
+                                 reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMetalSurfaceEXT" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createMetalSurfaceEXTUnique(
-    const MetalSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createMetalSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT &   createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                           Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMetalSurfaceEXT && "Function <vkCreateMetalSurfaceEXT> requires <VK_EXT_metal_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateMetalSurfaceEXT( m_instance,
-                                                                    reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMetalSurfaceEXTUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMetalSurfaceEXT( m_instance,
+                                 reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
+                                 reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createMetalSurfaceEXTUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -20830,31 +18975,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_fragment_shading_rate ===
 
-  // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getFragmentShadingRatesKHR( uint32_t *                             pFragmentShadingRateCount,
-                                                                                            PhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates,
-                                                                                            Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getFragmentShadingRatesKHR( uint32_t *                                                   pFragmentShadingRateCount,
+                                                VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates,
+                                                Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetPhysicalDeviceFragmentShadingRatesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                    pFragmentShadingRateCount,
-                                                    reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( pFragmentShadingRates ) ) );
+    return static_cast<Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR(
+      m_physicalDevice, pFragmentShadingRateCount, reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( pFragmentShadingRates ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-  template <
-    typename PhysicalDeviceFragmentShadingRateKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type, PhysicalDeviceFragmentShadingRateKHR>::value,
-                            int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename PhysicalDeviceFragmentShadingRateKHRAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
     PhysicalDevice::getFragmentShadingRatesKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -20863,38 +18998,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFragmentShadingRatesKHR> requires <VK_KHR_fragment_shading_rate>" );
 #  endif
 
-    std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator> fragmentShadingRates;
-    uint32_t                                                                                         fragmentShadingRateCount;
-    Result                                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator> fragmentShadingRates;
+    uint32_t                                                                                                               fragmentShadingRateCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR( m_physicalDevice, &fragmentShadingRateCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && fragmentShadingRateCount )
+      result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR( m_physicalDevice, &fragmentShadingRateCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && fragmentShadingRateCount )
       {
         fragmentShadingRates.resize( fragmentShadingRateCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR(
           m_physicalDevice, &fragmentShadingRateCount, reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( fragmentShadingRates.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
     VULKAN_HPP_ASSERT( fragmentShadingRateCount <= fragmentShadingRates.size() );
     if ( fragmentShadingRateCount < fragmentShadingRates.size() )
     {
       fragmentShadingRates.resize( fragmentShadingRateCount );
     }
-    return detail::createResultValueType( result, std::move( fragmentShadingRates ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fragmentShadingRates ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-  template <
-    typename PhysicalDeviceFragmentShadingRateKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type, PhysicalDeviceFragmentShadingRateKHR>::value,
-                            int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename PhysicalDeviceFragmentShadingRateKHRAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type,
+                                                 VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>::value,
+                                    int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
     PhysicalDevice::getFragmentShadingRatesKHR( PhysicalDeviceFragmentShadingRateKHRAllocator & physicalDeviceFragmentShadingRateKHRAllocator,
                                                 Dispatch const &                                d ) const
   {
@@ -20904,50 +19037,46 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceFragmentShadingRatesKHR> requires <VK_KHR_fragment_shading_rate>" );
 #  endif
 
-    std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator> fragmentShadingRates(
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator> fragmentShadingRates(
       physicalDeviceFragmentShadingRateKHRAllocator );
-    uint32_t fragmentShadingRateCount;
-    Result   result;
+    uint32_t                     fragmentShadingRateCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR( m_physicalDevice, &fragmentShadingRateCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && fragmentShadingRateCount )
+      result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR( m_physicalDevice, &fragmentShadingRateCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && fragmentShadingRateCount )
       {
         fragmentShadingRates.resize( fragmentShadingRateCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceFragmentShadingRatesKHR(
           m_physicalDevice, &fragmentShadingRateCount, reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( fragmentShadingRates.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
     VULKAN_HPP_ASSERT( fragmentShadingRateCount <= fragmentShadingRates.size() );
     if ( fragmentShadingRateCount < fragmentShadingRates.size() )
     {
       fragmentShadingRates.resize( fragmentShadingRateCount );
     }
-    return detail::createResultValueType( result, std::move( fragmentShadingRates ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fragmentShadingRates ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const Extent2D *                       pFragmentSize,
-                                                                   const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                                                   Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D *                       pFragmentSize,
+                                                                   const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                                                   Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetFragmentShadingRateKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                      reinterpret_cast<const VkExtent2D *>( pFragmentSize ),
-                                      reinterpret_cast<const VkFragmentShadingRateCombinerOpKHR *>( combinerOps ) );
+    d.vkCmdSetFragmentShadingRateKHR(
+      m_commandBuffer, reinterpret_cast<const VkExtent2D *>( pFragmentSize ), reinterpret_cast<const VkFragmentShadingRateCombinerOpKHR *>( combinerOps ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const Extent2D &                       fragmentSize,
-                                                                   const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                                                   Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D &                       fragmentSize,
+                                                                   const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                                                   Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -20961,77 +19090,66 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_dynamic_rendering_local_read ===
 
-  // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo * pLocationInfo,
-                                                                            Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR( const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR * pLocationInfo,
+                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRenderingAttachmentLocationsKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( pLocationInfo ) );
+    d.vkCmdSetRenderingAttachmentLocationsKHR( m_commandBuffer, reinterpret_cast<const VkRenderingAttachmentLocationInfoKHR *>( pLocationInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo & locationInfo,
-                                                                            Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR( const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR & locationInfo,
+                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdSetRenderingAttachmentLocationsKHR &&
-                       "Function <vkCmdSetRenderingAttachmentLocationsKHR> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
+                       "Function <vkCmdSetRenderingAttachmentLocationsKHR> requires <VK_KHR_dynamic_rendering_local_read>" );
 #  endif
 
-    d.vkCmdSetRenderingAttachmentLocationsKHR( m_commandBuffer, reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( &locationInfo ) );
+    d.vkCmdSetRenderingAttachmentLocationsKHR( m_commandBuffer, reinterpret_cast<const VkRenderingAttachmentLocationInfoKHR *>( &locationInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo,
-                                                                               Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndicesKHR( const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR * pLocationInfo,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRenderingInputAttachmentIndicesKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                  reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( pInputAttachmentIndexInfo ) );
+    d.vkCmdSetRenderingInputAttachmentIndicesKHR( m_commandBuffer, reinterpret_cast<const VkRenderingInputAttachmentIndexInfoKHR *>( pLocationInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo,
-                                                                               Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndicesKHR( const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR & locationInfo,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCmdSetRenderingInputAttachmentIndicesKHR &&
-                       "Function <vkCmdSetRenderingInputAttachmentIndicesKHR> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
+                       "Function <vkCmdSetRenderingInputAttachmentIndicesKHR> requires <VK_KHR_dynamic_rendering_local_read>" );
 #  endif
 
-    d.vkCmdSetRenderingInputAttachmentIndicesKHR( m_commandBuffer, reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( &inputAttachmentIndexInfo ) );
+    d.vkCmdSetRenderingInputAttachmentIndicesKHR( m_commandBuffer, reinterpret_cast<const VkRenderingInputAttachmentIndexInfoKHR *>( &locationInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_buffer_device_address ===
 
-  // wrapper function for command vkGetBufferDeviceAddressEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressEXT( const BufferDeviceAddressInfo * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                                               Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<DeviceAddress>(
-      d.vkGetBufferDeviceAddressEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
+    return static_cast<DeviceAddress>( d.vkGetBufferDeviceAddressEXT( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferDeviceAddressEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressEXT( const BufferDeviceAddressInfo & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress Device::getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21041,33 +19159,27 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkDeviceAddress result = d.vkGetBufferDeviceAddressEXT( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
 
-    return static_cast<DeviceAddress>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_tooling_info ===
 
-  // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getToolPropertiesEXT( uint32_t *                     pToolCount,
-                                                                                      PhysicalDeviceToolProperties * pToolProperties,
-                                                                                      Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getToolPropertiesEXT( uint32_t *                                           pToolCount,
+                                                                                      VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties * pToolProperties,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceToolPropertiesEXT(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pToolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( pToolProperties ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, pToolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( pToolProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-  template <typename PhysicalDeviceToolPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
-                       PhysicalDevice::getToolPropertiesEXT( Dispatch const & d ) const
+  template <typename PhysicalDeviceToolPropertiesAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    PhysicalDevice::getToolPropertiesEXT( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21075,35 +19187,35 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceToolPropertiesEXT> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties;
-    uint32_t                                                                         toolCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties;
+    uint32_t                                                                                               toolCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && toolCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
       {
         toolProperties.resize( toolCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
     VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
     if ( toolCount < toolProperties.size() )
     {
       toolProperties.resize( toolCount );
     }
-    return detail::createResultValueType( result, std::move( toolProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-  template <typename PhysicalDeviceToolPropertiesAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+  template <
+    typename PhysicalDeviceToolPropertiesAllocator,
+    typename Dispatch,
+    typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value,
+                            int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
     PhysicalDevice::getToolPropertiesEXT( PhysicalDeviceToolPropertiesAllocator & physicalDeviceToolPropertiesAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -21112,88 +19224,79 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceToolPropertiesEXT> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties( physicalDeviceToolPropertiesAllocator );
-    uint32_t                                                                         toolCount;
-    Result                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator> toolProperties(
+      physicalDeviceToolPropertiesAllocator );
+    uint32_t                     toolCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && toolCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
       {
         toolProperties.resize( toolCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceToolPropertiesEXT( m_physicalDevice, &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
     VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
     if ( toolCount < toolProperties.size() )
     {
       toolProperties.resize( toolCount );
     }
-    return detail::createResultValueType( result, std::move( toolProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_present_wait ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::waitForPresentKHR( SwapchainKHR swapchain, uint64_t presentId, uint64_t timeout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitForPresentKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                           uint64_t                           presentId,
+                                                                           uint64_t                           timeout,
+                                                                           Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWaitForPresentKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), presentId, timeout ) );
+    return static_cast<Result>( d.vkWaitForPresentKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), presentId, timeout ) );
   }
 #else
-  // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::waitForPresentKHR( SwapchainKHR swapchain, uint64_t presentId, uint64_t timeout, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+    Device::waitForPresentKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, uint64_t presentId, uint64_t timeout, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkWaitForPresentKHR && "Function <vkWaitForPresentKHR> requires <VK_KHR_present_wait>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkWaitForPresentKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), presentId, timeout ) );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkWaitForPresentKHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), presentId, timeout ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::waitForPresentKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::waitForPresentKHR",
-                         { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForPresentKHR", { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR } );
-#  endif
-
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_NV_cooperative_matrix ===
 
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeMatrixPropertiesNV( uint32_t *                      pPropertyCount,
-                                                                                                  CooperativeMatrixPropertiesNV * pProperties,
-                                                                                                  Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeMatrixPropertiesNV(
+    uint32_t * pPropertyCount, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( pProperties ) ) );
+      m_physicalDevice, pPropertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-  template <typename CooperativeMatrixPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, CooperativeMatrixPropertiesNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
-                       PhysicalDevice::getCooperativeMatrixPropertiesNV( Dispatch const & d ) const
+  template <typename CooperativeMatrixPropertiesNVAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
+    PhysicalDevice::getCooperativeMatrixPropertiesNV( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21201,36 +19304,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesNV> requires <VK_NV_cooperative_matrix>" );
 #  endif
 
-    std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator> properties;
-    uint32_t                                                                           propertyCount;
-    Result                                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator> properties;
+    uint32_t                                                                                                 propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
   template <typename CooperativeMatrixPropertiesNVAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, CooperativeMatrixPropertiesNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
-                       PhysicalDevice::getCooperativeMatrixPropertiesNV( CooperativeMatrixPropertiesNVAllocator & cooperativeMatrixPropertiesNVAllocator,
+            typename std::enable_if<
+              std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
+    PhysicalDevice::getCooperativeMatrixPropertiesNV( CooperativeMatrixPropertiesNVAllocator & cooperativeMatrixPropertiesNVAllocator,
                                                       Dispatch const &                         d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -21239,53 +19342,45 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesNV> requires <VK_NV_cooperative_matrix>" );
 #  endif
 
-    std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator> properties( cooperativeMatrixPropertiesNVAllocator );
-    uint32_t                                                                           propertyCount;
-    Result                                                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator> properties(
+      cooperativeMatrixPropertiesNVAllocator );
+    uint32_t                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_coverage_reduction_mode ===
 
-  // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV(
-    uint32_t * pCombinationCount, FramebufferMixedSamplesCombinationNV * pCombinations, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    uint32_t * pCombinationCount, VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV * pCombinations, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pCombinationCount, reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( pCombinations ) ) );
+      m_physicalDevice, pCombinationCount, reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( pCombinations ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-  template <
-    typename FramebufferMixedSamplesCombinationNVAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type, FramebufferMixedSamplesCombinationNV>::value,
-                            int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename FramebufferMixedSamplesCombinationNVAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
     PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -21294,38 +19389,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV> requires <VK_NV_coverage_reduction_mode>" );
 #  endif
 
-    std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator> combinations;
-    uint32_t                                                                                         combinationCount;
-    Result                                                                                           result;
+    std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator> combinations;
+    uint32_t                                                                                                               combinationCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                           result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( m_physicalDevice, &combinationCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && combinationCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( m_physicalDevice, &combinationCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && combinationCount )
       {
         combinations.resize( combinationCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
           m_physicalDevice, &combinationCount, reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( combinations.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
     VULKAN_HPP_ASSERT( combinationCount <= combinations.size() );
     if ( combinationCount < combinations.size() )
     {
       combinations.resize( combinationCount );
     }
-    return detail::createResultValueType( result, std::move( combinations ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( combinations ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-  template <
-    typename FramebufferMixedSamplesCombinationNVAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type, FramebufferMixedSamplesCombinationNV>::value,
-                            int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename FramebufferMixedSamplesCombinationNVAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type,
+                                                 VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>::value,
+                                    int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
     PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV(
       FramebufferMixedSamplesCombinationNVAllocator & framebufferMixedSamplesCombinationNVAllocator, Dispatch const & d ) const
   {
@@ -21335,57 +19428,52 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV> requires <VK_NV_coverage_reduction_mode>" );
 #  endif
 
-    std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator> combinations(
+    std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator> combinations(
       framebufferMixedSamplesCombinationNVAllocator );
-    uint32_t combinationCount;
-    Result   result;
+    uint32_t                     combinationCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( m_physicalDevice, &combinationCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && combinationCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV( m_physicalDevice, &combinationCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && combinationCount )
       {
         combinations.resize( combinationCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
           m_physicalDevice, &combinationCount, reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( combinations.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
     VULKAN_HPP_ASSERT( combinationCount <= combinations.size() );
     if ( combinationCount < combinations.size() )
     {
       combinations.resize( combinationCount );
     }
-    return detail::createResultValueType( result, std::move( combinations ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( combinations ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_EXT_full_screen_exclusive ===
 
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                                                            uint32_t *                            pPresentModeCount,
-                                                                                            PresentModeKHR *                      pPresentModes,
-                                                                                            Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                uint32_t *                                                  pPresentModeCount,
+                                                VULKAN_HPP_NAMESPACE::PresentModeKHR *                      pPresentModes,
+                                                Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+    return static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT( m_physicalDevice,
                                                                               reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ),
                                                                               pPresentModeCount,
                                                                               reinterpret_cast<VkPresentModeKHR *>( pPresentModes ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-  template <typename PresentModeKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-                       PhysicalDevice::getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+  template <typename PresentModeKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+    PhysicalDevice::getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21393,41 +19481,39 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfacePresentModes2EXT> requires <VK_EXT_full_screen_exclusive>" );
 #    endif
 
-    std::vector<PresentModeKHR, PresentModeKHRAllocator> presentModes;
-    uint32_t                                             presentModeCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator> presentModes;
+    uint32_t                                                                   presentModeCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &presentModeCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentModeCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
       {
         presentModes.resize( presentModeCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT( m_physicalDevice,
-                                                                                    reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                                    &presentModeCount,
-                                                                                    reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfacePresentModes2EXT( m_physicalDevice,
+                                                        reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                        &presentModeCount,
+                                                        reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
     VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
     if ( presentModeCount < presentModes.size() )
     {
       presentModes.resize( presentModeCount );
     }
-    return detail::createResultValueType( result, std::move( presentModes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
   template <typename PresentModeKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-                       PhysicalDevice::getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                                                PresentModeKHRAllocator &             presentModeKHRAllocator,
-                                                Dispatch const &                      d ) const
+            typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PresentModeKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+                       PhysicalDevice::getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                                PresentModeKHRAllocator &                                   presentModeKHRAllocator,
+                                                Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21435,109 +19521,100 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceSurfacePresentModes2EXT> requires <VK_EXT_full_screen_exclusive>" );
 #    endif
 
-    std::vector<PresentModeKHR, PresentModeKHRAllocator> presentModes( presentModeKHRAllocator );
-    uint32_t                                             presentModeCount;
-    Result                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator> presentModes( presentModeKHRAllocator );
+    uint32_t                                                                   presentModeCount;
+    VULKAN_HPP_NAMESPACE::Result                                               result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT(
         m_physicalDevice, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), &presentModeCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && presentModeCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
       {
         presentModes.resize( presentModeCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceSurfacePresentModes2EXT( m_physicalDevice,
-                                                                                    reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
-                                                                                    &presentModeCount,
-                                                                                    reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPhysicalDeviceSurfacePresentModes2EXT( m_physicalDevice,
+                                                        reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
+                                                        &presentModeCount,
+                                                        reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
     VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
     if ( presentModeCount < presentModes.size() )
     {
       presentModes.resize( presentModeCount );
     }
-    return detail::createResultValueType( result, std::move( presentModes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireFullScreenExclusiveModeEXT( SwapchainKHR     swapchain,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::acquireFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                                           Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ) ) );
+    return static_cast<Result>( d.vkAcquireFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
   }
 #  else
-  // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::acquireFullScreenExclusiveModeEXT( SwapchainKHR swapchain, Dispatch const & d ) const
+    Device::acquireFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireFullScreenExclusiveModeEXT && "Function <vkAcquireFullScreenExclusiveModeEXT> requires <VK_EXT_full_screen_exclusive>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkAcquireFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireFullScreenExclusiveModeEXT" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireFullScreenExclusiveModeEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseFullScreenExclusiveModeEXT( SwapchainKHR     swapchain,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                                           Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkReleaseFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ) ) );
+    return static_cast<Result>( d.vkReleaseFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
   }
 #  else
-  // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::releaseFullScreenExclusiveModeEXT( SwapchainKHR swapchain, Dispatch const & d ) const
+    Device::releaseFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkReleaseFullScreenExclusiveModeEXT && "Function <vkReleaseFullScreenExclusiveModeEXT> requires <VK_EXT_full_screen_exclusive>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkReleaseFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseFullScreenExclusiveModeEXT" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkReleaseFullScreenExclusiveModeEXT( m_device, static_cast<VkSwapchainKHR>( swapchain ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseFullScreenExclusiveModeEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                                                         DeviceGroupPresentModeFlagsKHR *      pModes,
-                                                                                         Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                             VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR *      pModes,
+                                             Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDeviceGroupSurfacePresentModes2EXT( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ),
-                                                                           reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( pModes ) ) );
+    return static_cast<Result>( d.vkGetDeviceGroupSurfacePresentModes2EXT(
+      m_device, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( pModes ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-                       Device::getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR>::type
+    Device::getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21545,92 +19622,94 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceGroupSurfacePresentModes2EXT> requires <VK_EXT_full_screen_exclusive>" );
 #    endif
 
-    DeviceGroupPresentModeFlagsKHR modes;
-    Result                         result = static_cast<Result>( d.vkGetDeviceGroupSurfacePresentModes2EXT(
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes;
+    VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeviceGroupSurfacePresentModes2EXT(
       m_device, reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( &modes ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModes2EXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModes2EXT" );
 
-    return detail::createResultValueType( result, std::move( modes ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( modes ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_EXT_headless_surface ===
 
-  // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createHeadlessSurfaceEXT( const HeadlessSurfaceCreateInfoEXT * pCreateInfo,
-                                                                                    const AllocationCallbacks *          pAllocator,
-                                                                                    SurfaceKHR *                         pSurface,
-                                                                                    Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createHeadlessSurfaceEXT( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT * pCreateInfo,
+                                                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                                                    VULKAN_HPP_NAMESPACE::SurfaceKHR *                         pSurface,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateHeadlessSurfaceEXT( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateHeadlessSurfaceEXT( m_instance,
                                                               reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( pCreateInfo ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                               reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type Instance::createHeadlessSurfaceEXT(
-    const HeadlessSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createHeadlessSurfaceEXT( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT & createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                        Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateHeadlessSurfaceEXT && "Function <vkCreateHeadlessSurfaceEXT> requires <VK_EXT_headless_surface>" );
 #  endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateHeadlessSurfaceEXT( m_instance,
-                                                                       reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createHeadlessSurfaceEXT" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateHeadlessSurfaceEXT(
+      m_instance,
+      reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createHeadlessSurfaceEXT" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createHeadlessSurfaceEXTUnique(
-    const HeadlessSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createHeadlessSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT & createInfo,
+                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                              Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateHeadlessSurfaceEXT && "Function <vkCreateHeadlessSurfaceEXT> requires <VK_EXT_headless_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateHeadlessSurfaceEXT( m_instance,
-                                                                       reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createHeadlessSurfaceEXTUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateHeadlessSurfaceEXT(
+      m_instance,
+      reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createHeadlessSurfaceEXTUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_buffer_device_address ===
 
-  // wrapper function for command vkGetBufferDeviceAddressKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressKHR( const BufferDeviceAddressInfo * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                                               Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<DeviceAddress>(
-      d.vkGetBufferDeviceAddressKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
+    return static_cast<DeviceAddress>( d.vkGetBufferDeviceAddressKHR( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferDeviceAddressKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressKHR( const BufferDeviceAddressInfo & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress Device::getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21640,24 +19719,22 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkDeviceAddress result = d.vkGetBufferDeviceAddressKHR( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
 
-    return static_cast<DeviceAddress>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                                                       Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetBufferOpaqueCaptureAddressKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) );
+    return d.vkGetBufferOpaqueCaptureAddressKHR( m_device, reinterpret_cast<const VkBufferDeviceAddressInfo *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                                       Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21671,23 +19748,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
-                                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
+                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetDeviceMemoryOpaqueCaptureAddressKHR( static_cast<VkDevice>( m_device ),
-                                                       reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( pInfo ) );
+    return d.vkGetDeviceMemoryOpaqueCaptureAddressKHR( m_device, reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo & info,
-                                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint64_t Device::getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info,
+                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21703,65 +19775,63 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_line_rasterization ===
 
-  // wrapper function for command vkCmdSetLineStippleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
     CommandBuffer::setLineStippleEXT( uint32_t lineStippleFactor, uint16_t lineStipplePattern, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineStippleEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
+    d.vkCmdSetLineStippleEXT( m_commandBuffer, lineStippleFactor, lineStipplePattern );
   }
 
   //=== VK_EXT_host_query_reset ===
 
-  // wrapper function for command vkResetQueryPoolEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPoolEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::resetQueryPoolEXT( QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::resetQueryPoolEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                                                    uint32_t                        firstQuery,
+                                                    uint32_t                        queryCount,
+                                                    Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkResetQueryPoolEXT( static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
+    d.vkResetQueryPoolEXT( m_device, static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
   }
 
   //=== VK_EXT_extended_dynamic_state ===
 
-  // wrapper function for command vkCmdSetCullModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCullModeEXT( CullModeFlags cullMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCullModeEXT( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCullModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCullModeFlags>( cullMode ) );
+    d.vkCmdSetCullModeEXT( m_commandBuffer, static_cast<VkCullModeFlags>( cullMode ) );
   }
 
-  // wrapper function for command vkCmdSetFrontFaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setFrontFaceEXT( FrontFace frontFace, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setFrontFaceEXT( VULKAN_HPP_NAMESPACE::FrontFace frontFace, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetFrontFaceEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkFrontFace>( frontFace ) );
+    d.vkCmdSetFrontFaceEXT( m_commandBuffer, static_cast<VkFrontFace>( frontFace ) );
   }
 
-  // wrapper function for command vkCmdSetPrimitiveTopologyEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopologyEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopologyEXT( PrimitiveTopology primitiveTopology, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopologyEXT( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology,
+                                                                 Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPrimitiveTopologyEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPrimitiveTopology>( primitiveTopology ) );
+    d.vkCmdSetPrimitiveTopologyEXT( m_commandBuffer, static_cast<VkPrimitiveTopology>( primitiveTopology ) );
   }
 
-  // wrapper function for command vkCmdSetViewportWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setViewportWithCountEXT( uint32_t viewportCount, const Viewport * pViewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCountEXT( uint32_t                               viewportCount,
+                                                                 const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                                                                 Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewportWithCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
+    d.vkCmdSetViewportWithCountEXT( m_commandBuffer, viewportCount, reinterpret_cast<const VkViewport *>( pViewports ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewportWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCountEXT( ArrayProxy<const Viewport> const & viewports, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
+                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21773,18 +19843,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetScissorWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCountEXT( uint32_t scissorCount, const Rect2D * pScissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setScissorWithCountEXT( uint32_t scissorCount, const VULKAN_HPP_NAMESPACE::Rect2D * pScissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetScissorWithCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
+    d.vkCmdSetScissorWithCountEXT( m_commandBuffer, scissorCount, reinterpret_cast<const VkRect2D *>( pScissors ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetScissorWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCountEXT( ArrayProxy<const Rect2D> const & scissors, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
+                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21796,18 +19866,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t           firstBinding,
-                                                               uint32_t           bindingCount,
-                                                               const Buffer *     pBuffers,
-                                                               const DeviceSize * pOffsets,
-                                                               const DeviceSize * pSizes,
-                                                               const DeviceSize * pStrides,
-                                                               Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t                                 firstBinding,
+                                                               uint32_t                                 bindingCount,
+                                                               const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                                               const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                                               const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                                                               const VULKAN_HPP_NAMESPACE::DeviceSize * pStrides,
+                                                               Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindVertexBuffers2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBindVertexBuffers2EXT( m_commandBuffer,
                                   firstBinding,
                                   bindingCount,
                                   reinterpret_cast<const VkBuffer *>( pBuffers ),
@@ -21817,14 +19886,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t                             firstBinding,
-                                                               ArrayProxy<const Buffer> const &     buffers,
-                                                               ArrayProxy<const DeviceSize> const & offsets,
-                                                               ArrayProxy<const DeviceSize> const & sizes,
-                                                               ArrayProxy<const DeviceSize> const & strides,
-                                                               Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t                                                                         firstBinding,
+                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
+                                                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides,
+                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21860,54 +19928,52 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDepthTestEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnableEXT( Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthTestEnable ) );
+    d.vkCmdSetDepthTestEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnableEXT( Bool32 depthWriteEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthWriteEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthWriteEnable ) );
+    d.vkCmdSetDepthWriteEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthWriteEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthCompareOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOpEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOpEXT( CompareOp depthCompareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOpEXT( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthCompareOpEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCompareOp>( depthCompareOp ) );
+    d.vkCmdSetDepthCompareOpEXT( m_commandBuffer, static_cast<VkCompareOp>( depthCompareOp ) );
   }
 
-  // wrapper function for command vkCmdSetDepthBoundsTestEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnableEXT( Bool32 depthBoundsTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable,
+                                                                     Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBoundsTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBoundsTestEnable ) );
+    d.vkCmdSetDepthBoundsTestEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthBoundsTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetStencilTestEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnableEXT( Bool32 stencilTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stencilTestEnable ) );
+    d.vkCmdSetStencilTestEnableEXT( m_commandBuffer, static_cast<VkBool32>( stencilTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetStencilOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOpEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setStencilOpEXT(
-    StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setStencilOpEXT( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                                         VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                                                         VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                                                         VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                                                         VULKAN_HPP_NAMESPACE::CompareOp        compareOp,
+                                                         Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetStencilOpEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdSetStencilOpEXT( m_commandBuffer,
                             static_cast<VkStencilFaceFlags>( faceMask ),
                             static_cast<VkStencilOp>( failOp ),
                             static_cast<VkStencilOp>( passOp ),
@@ -21917,77 +19983,74 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_deferred_host_operations ===
 
-  // wrapper function for command vkCreateDeferredOperationKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDeferredOperationKHR( const AllocationCallbacks * pAllocator,
-                                                                                    DeferredOperationKHR *      pDeferredOperation,
-                                                                                    Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDeferredOperationKHR( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                                    VULKAN_HPP_NAMESPACE::DeferredOperationKHR *      pDeferredOperation,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDeferredOperationKHR( static_cast<VkDevice>( m_device ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                reinterpret_cast<VkDeferredOperationKHR *>( pDeferredOperation ) ) );
+    return static_cast<Result>( d.vkCreateDeferredOperationKHR(
+      m_device, reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ), reinterpret_cast<VkDeferredOperationKHR *>( pDeferredOperation ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDeferredOperationKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeferredOperationKHR>::type
-                       Device::createDeferredOperationKHR( Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>::type
+                       Device::createDeferredOperationKHR( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDeferredOperationKHR && "Function <vkCreateDeferredOperationKHR> requires <VK_KHR_deferred_host_operations>" );
 #  endif
 
-    DeferredOperationKHR deferredOperation;
-    Result               result = static_cast<Result>( d.vkCreateDeferredOperationKHR(
-      m_device, reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ), reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDeferredOperationKHR" );
+    VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation;
+    VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDeferredOperationKHR(
+      m_device,
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDeferredOperationKHR" );
 
-    return detail::createResultValueType( result, std::move( deferredOperation ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( deferredOperation ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDeferredOperationKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DeferredOperationKHR, Dispatch>>::type
-                       Device::createDeferredOperationKHRUnique( Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DeferredOperationKHR, Dispatch>>::type
+                       Device::createDeferredOperationKHRUnique( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDeferredOperationKHR && "Function <vkCreateDeferredOperationKHR> requires <VK_KHR_deferred_host_operations>" );
 #    endif
 
-    DeferredOperationKHR deferredOperation;
-    Result               result = static_cast<Result>( d.vkCreateDeferredOperationKHR(
-      m_device, reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ), reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDeferredOperationKHRUnique" );
+    VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation;
+    VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDeferredOperationKHR(
+      m_device,
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDeferredOperationKHRUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<DeferredOperationKHR, Dispatch>( deferredOperation, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DeferredOperationKHR, Dispatch>( deferredOperation, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDeferredOperationKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyDeferredOperationKHR( DeferredOperationKHR operation, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyDeferredOperationKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDeferredOperationKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDeferredOperationKHR( DeferredOperationKHR                operation,
-                                                              Optional<const AllocationCallbacks> allocator,
-                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                operation,
+                                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                              Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -21995,26 +20058,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDeferredOperationKHR(
-      m_device, static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDeferredOperationKHR>( operation ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyDeferredOperationKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( DeferredOperationKHR operation, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyDeferredOperationKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDeferredOperationKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DeferredOperationKHR operation, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                operation,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22022,100 +20086,94 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyDeferredOperationKHR(
-      m_device, static_cast<VkDeferredOperationKHR>( operation ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkDeferredOperationKHR>( operation ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeferredOperationMaxConcurrencyKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationMaxConcurrencyKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE uint32_t Device::getDeferredOperationMaxConcurrencyKHR( DeferredOperationKHR operation, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE uint32_t Device::getDeferredOperationMaxConcurrencyKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                                            Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return d.vkGetDeferredOperationMaxConcurrencyKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( operation ) );
+    return d.vkGetDeferredOperationMaxConcurrencyKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) );
   }
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeferredOperationResultKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDeferredOperationResultKHR( DeferredOperationKHR operation,
-                                                                                       Dispatch const &     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDeferredOperationResultKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                                                       Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDeferredOperationResultKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( operation ) ) );
+    return static_cast<Result>( d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
   }
 #else
-  // wrapper function for command vkGetDeferredOperationResultKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDeferredOperationResultKHR( DeferredOperationKHR operation, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+    Device::getDeferredOperationResultKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDeferredOperationResultKHR && "Function <vkGetDeferredOperationResultKHR> requires <VK_KHR_deferred_host_operations>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDeferredOperationResultKHR", { Result::eSuccess, Result::eNotReady } );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeferredOperationResultKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::deferredOperationJoinKHR( DeferredOperationKHR operation, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::deferredOperationJoinKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                                                  Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkDeferredOperationJoinKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( operation ) ) );
+    return static_cast<Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
   }
 #else
-  // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::deferredOperationJoinKHR( DeferredOperationKHR operation, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::deferredOperationJoinKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                                                                        Dispatch const &                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDeferredOperationJoinKHR && "Function <vkDeferredOperationJoinKHR> requires <VK_KHR_deferred_host_operations>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::deferredOperationJoinKHR", { Result::eSuccess, Result::eThreadDoneKHR, Result::eThreadIdleKHR } );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkDeferredOperationJoinKHR( m_device, static_cast<VkDeferredOperationKHR>( operation ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::deferredOperationJoinKHR",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eThreadDoneKHR, VULKAN_HPP_NAMESPACE::Result::eThreadIdleKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
   //=== VK_KHR_pipeline_executable_properties ===
 
-  // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineExecutablePropertiesKHR( const PipelineInfoKHR *           pPipelineInfo,
-                                                                                            uint32_t *                        pExecutableCount,
-                                                                                            PipelineExecutablePropertiesKHR * pProperties,
-                                                                                            Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR * pPipelineInfo,
+                                                                                            uint32_t *                                    pExecutableCount,
+                                                                                            VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR * pProperties,
+                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPipelineExecutablePropertiesKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetPipelineExecutablePropertiesKHR( m_device,
                                                                         reinterpret_cast<const VkPipelineInfoKHR *>( pPipelineInfo ),
                                                                         pExecutableCount,
                                                                         reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-  template <
-    typename PipelineExecutablePropertiesKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, PipelineExecutablePropertiesKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
-                       Device::getPipelineExecutablePropertiesKHR( const PipelineInfoKHR & pipelineInfo, Dispatch const & d ) const
+  template <typename PipelineExecutablePropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
+    Device::getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22123,42 +20181,42 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutablePropertiesKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator> properties;
-    uint32_t                                                                               executableCount;
-    Result                                                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator> properties;
+    uint32_t                                                                                                     executableCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                 result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetPipelineExecutablePropertiesKHR( m_device, reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ), &executableCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && executableCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && executableCount )
       {
         properties.resize( executableCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutablePropertiesKHR( m_device,
-                                                                              reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ),
-                                                                              &executableCount,
-                                                                              reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( properties.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPipelineExecutablePropertiesKHR( m_device,
+                                                  reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ),
+                                                  &executableCount,
+                                                  reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
     VULKAN_HPP_ASSERT( executableCount <= properties.size() );
     if ( executableCount < properties.size() )
     {
       properties.resize( executableCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-  template <
-    typename PipelineExecutablePropertiesKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, PipelineExecutablePropertiesKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
-                       Device::getPipelineExecutablePropertiesKHR( const PipelineInfoKHR &                    pipelineInfo,
-                                                PipelineExecutablePropertiesKHRAllocator & pipelineExecutablePropertiesKHRAllocator,
-                                                Dispatch const &                           d ) const
+  template <typename PipelineExecutablePropertiesKHRAllocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
+    Device::getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo,
+                                                PipelineExecutablePropertiesKHRAllocator &    pipelineExecutablePropertiesKHRAllocator,
+                                                Dispatch const &                              d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22166,57 +20224,53 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutablePropertiesKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator> properties( pipelineExecutablePropertiesKHRAllocator );
-    uint32_t                                                                               executableCount;
-    Result                                                                                 result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator> properties(
+      pipelineExecutablePropertiesKHRAllocator );
+    uint32_t                     executableCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetPipelineExecutablePropertiesKHR( m_device, reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ), &executableCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && executableCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && executableCount )
       {
         properties.resize( executableCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutablePropertiesKHR( m_device,
-                                                                              reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ),
-                                                                              &executableCount,
-                                                                              reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( properties.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPipelineExecutablePropertiesKHR( m_device,
+                                                  reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ),
+                                                  &executableCount,
+                                                  reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
     VULKAN_HPP_ASSERT( executableCount <= properties.size() );
     if ( executableCount < properties.size() )
     {
       properties.resize( executableCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR * pExecutableInfo,
-                                                                                            uint32_t *                        pStatisticCount,
-                                                                                            PipelineExecutableStatisticKHR *  pStatistics,
-                                                                                            Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR * pExecutableInfo,
+                                                uint32_t *                                              pStatisticCount,
+                                                VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR *  pStatistics,
+                                                Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR( m_device,
                                                                         reinterpret_cast<const VkPipelineExecutableInfoKHR *>( pExecutableInfo ),
                                                                         pStatisticCount,
                                                                         reinterpret_cast<VkPipelineExecutableStatisticKHR *>( pStatistics ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-  template <
-    typename PipelineExecutableStatisticKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, PipelineExecutableStatisticKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
-                       Device::getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR & executableInfo, Dispatch const & d ) const
+  template <typename PipelineExecutableStatisticKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
+    Device::getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22224,42 +20278,42 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutableStatisticsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator> statistics;
-    uint32_t                                                                             statisticCount;
-    Result                                                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator> statistics;
+    uint32_t                                                                                                   statisticCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                               result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableStatisticsKHR(
         m_device, reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ), &statisticCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && statisticCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && statisticCount )
       {
         statistics.resize( statisticCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR( m_device,
-                                                                              reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
-                                                                              &statisticCount,
-                                                                              reinterpret_cast<VkPipelineExecutableStatisticKHR *>( statistics.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPipelineExecutableStatisticsKHR( m_device,
+                                                  reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
+                                                  &statisticCount,
+                                                  reinterpret_cast<VkPipelineExecutableStatisticKHR *>( statistics.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
     VULKAN_HPP_ASSERT( statisticCount <= statistics.size() );
     if ( statisticCount < statistics.size() )
     {
       statistics.resize( statisticCount );
     }
-    return detail::createResultValueType( result, std::move( statistics ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( statistics ) );
   }
 
-  // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-  template <
-    typename PipelineExecutableStatisticKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, PipelineExecutableStatisticKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
-                       Device::getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR &         executableInfo,
-                                                PipelineExecutableStatisticKHRAllocator & pipelineExecutableStatisticKHRAllocator,
-                                                Dispatch const &                          d ) const
+  template <typename PipelineExecutableStatisticKHRAllocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
+    Device::getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+                                                PipelineExecutableStatisticKHRAllocator &               pipelineExecutableStatisticKHRAllocator,
+                                                Dispatch const &                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22267,61 +20321,54 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutableStatisticsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator> statistics( pipelineExecutableStatisticKHRAllocator );
-    uint32_t                                                                             statisticCount;
-    Result                                                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator> statistics(
+      pipelineExecutableStatisticKHRAllocator );
+    uint32_t                     statisticCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableStatisticsKHR(
         m_device, reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ), &statisticCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && statisticCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && statisticCount )
       {
         statistics.resize( statisticCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutableStatisticsKHR( m_device,
-                                                                              reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
-                                                                              &statisticCount,
-                                                                              reinterpret_cast<VkPipelineExecutableStatisticKHR *>( statistics.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetPipelineExecutableStatisticsKHR( m_device,
+                                                  reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
+                                                  &statisticCount,
+                                                  reinterpret_cast<VkPipelineExecutableStatisticKHR *>( statistics.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
     VULKAN_HPP_ASSERT( statisticCount <= statistics.size() );
     if ( statisticCount < statistics.size() )
     {
       statistics.resize( statisticCount );
     }
-    return detail::createResultValueType( result, std::move( statistics ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( statistics ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR *             pExecutableInfo,
-                                                             uint32_t *                                    pInternalRepresentationCount,
-                                                             PipelineExecutableInternalRepresentationKHR * pInternalRepresentations,
-                                                             Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+    Device::getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR *             pExecutableInfo,
+                                                             uint32_t *                                                          pInternalRepresentationCount,
+                                                             VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR * pInternalRepresentations,
+                                                             Dispatch const &                                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetPipelineExecutableInternalRepresentationsKHR( static_cast<VkDevice>( m_device ),
+      d.vkGetPipelineExecutableInternalRepresentationsKHR( m_device,
                                                            reinterpret_cast<const VkPipelineExecutableInfoKHR *>( pExecutableInfo ),
                                                            pInternalRepresentationCount,
                                                            reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( pInternalRepresentations ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-  template <typename PipelineExecutableInternalRepresentationKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<
-              std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type, PipelineExecutableInternalRepresentationKHR>::value,
-              int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
-    Device::getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR & executableInfo, Dispatch const & d ) const
+  template <typename PipelineExecutableInternalRepresentationKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
+    Device::getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22329,46 +20376,44 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutableInternalRepresentationsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator> internalRepresentations;
-    uint32_t                                                                                                       internalRepresentationCount;
-    Result                                                                                                         result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>
+                                 internalRepresentations;
+    uint32_t                     internalRepresentationCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
         m_device, reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ), &internalRepresentationCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && internalRepresentationCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && internalRepresentationCount )
       {
         internalRepresentations.resize( internalRepresentationCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
           m_device,
           reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
           &internalRepresentationCount,
           reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( internalRepresentations.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
     VULKAN_HPP_ASSERT( internalRepresentationCount <= internalRepresentations.size() );
     if ( internalRepresentationCount < internalRepresentations.size() )
     {
       internalRepresentations.resize( internalRepresentationCount );
     }
-    return detail::createResultValueType( result, std::move( internalRepresentations ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( internalRepresentations ) );
   }
 
-  // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
   template <typename PipelineExecutableInternalRepresentationKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<
-              std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type, PipelineExecutableInternalRepresentationKHR>::value,
-              int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
+            typename std::enable_if<std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type,
+                                                 VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>::value,
+                                    int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
     Device::getPipelineExecutableInternalRepresentationsKHR(
-      const PipelineExecutableInfoKHR &                      executableInfo,
-      PipelineExecutableInternalRepresentationKHRAllocator & pipelineExecutableInternalRepresentationKHRAllocator,
-      Dispatch const &                                       d ) const
+      const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+      PipelineExecutableInternalRepresentationKHRAllocator &  pipelineExecutableInternalRepresentationKHRAllocator,
+      Dispatch const &                                        d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22376,208 +20421,194 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineExecutableInternalRepresentationsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 #  endif
 
-    std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator> internalRepresentations(
-      pipelineExecutableInternalRepresentationKHRAllocator );
-    uint32_t internalRepresentationCount;
-    Result   result;
+    std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>
+                                 internalRepresentations( pipelineExecutableInternalRepresentationKHRAllocator );
+    uint32_t                     internalRepresentationCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
         m_device, reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ), &internalRepresentationCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && internalRepresentationCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && internalRepresentationCount )
       {
         internalRepresentations.resize( internalRepresentationCount );
-        result = static_cast<Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelineExecutableInternalRepresentationsKHR(
           m_device,
           reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
           &internalRepresentationCount,
           reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( internalRepresentations.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
     VULKAN_HPP_ASSERT( internalRepresentationCount <= internalRepresentations.size() );
     if ( internalRepresentationCount < internalRepresentations.size() )
     {
       internalRepresentations.resize( internalRepresentationCount );
     }
-    return detail::createResultValueType( result, std::move( internalRepresentations ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( internalRepresentations ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_host_image_copy ===
 
-  // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToImageEXT( const CopyMemoryToImageInfo * pCopyMemoryToImageInfo,
-                                                                              Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT * pCopyMemoryToImageInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCopyMemoryToImageEXT( m_device, reinterpret_cast<const VkCopyMemoryToImageInfoEXT *>( pCopyMemoryToImageInfo ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT & copyMemoryToImageInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCopyMemoryToImageEXT && "Function <vkCopyMemoryToImageEXT> requires <VK_EXT_host_image_copy>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCopyMemoryToImageEXT( m_device, reinterpret_cast<const VkCopyMemoryToImageInfoEXT *>( &copyMemoryToImageInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToImageEXT" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT * pCopyImageToMemoryInfo,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCopyImageToMemoryEXT( m_device, reinterpret_cast<const VkCopyImageToMemoryInfoEXT *>( pCopyImageToMemoryInfo ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT & copyImageToMemoryInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCopyImageToMemoryEXT && "Function <vkCopyImageToMemoryEXT> requires <VK_EXT_host_image_copy>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCopyImageToMemoryEXT( m_device, reinterpret_cast<const VkCopyImageToMemoryInfoEXT *>( &copyImageToMemoryInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToMemoryEXT" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT * pCopyImageToImageInfo,
+                                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkCopyImageToImageEXT( m_device, reinterpret_cast<const VkCopyImageToImageInfoEXT *>( pCopyImageToImageInfo ) ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT & copyImageToImageInfo, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkCopyImageToImageEXT && "Function <vkCopyImageToImageEXT> requires <VK_EXT_host_image_copy>" );
+#  endif
+
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCopyImageToImageEXT( m_device, reinterpret_cast<const VkCopyImageToImageInfoEXT *>( &copyImageToImageInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToImageEXT" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::transitionImageLayoutEXT( uint32_t transitionCount,
+                                                                                  const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT * pTransitions,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkCopyMemoryToImageEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyMemoryToImageInfo *>( pCopyMemoryToImageInfo ) ) );
+      d.vkTransitionImageLayoutEXT( m_device, transitionCount, reinterpret_cast<const VkHostImageLayoutTransitionInfoEXT *>( pTransitions ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyMemoryToImageEXT( const CopyMemoryToImageInfo & copyMemoryToImageInfo, Dispatch const & d ) const
+    Device::transitionImageLayoutEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT> const & transitions,
+                                      Dispatch const &                                                                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyMemoryToImageEXT && "Function <vkCopyMemoryToImageEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkTransitionImageLayoutEXT && "Function <vkTransitionImageLayoutEXT> requires <VK_EXT_host_image_copy>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyMemoryToImageEXT( m_device, reinterpret_cast<const VkCopyMemoryToImageInfo *>( &copyMemoryToImageInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToImageEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkTransitionImageLayoutEXT( m_device, transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfoEXT *>( transitions.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::transitionImageLayoutEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToMemoryEXT( const CopyImageToMemoryInfo * pCopyImageToMemoryInfo,
-                                                                              Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout2EXT( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                                const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource,
+                                                                VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *      pLayout,
+                                                                Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkCopyImageToMemoryEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToMemoryInfo *>( pCopyImageToMemoryInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyImageToMemoryEXT( const CopyImageToMemoryInfo & copyImageToMemoryInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyImageToMemoryEXT && "Function <vkCopyImageToMemoryEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkCopyImageToMemoryEXT( m_device, reinterpret_cast<const VkCopyImageToMemoryInfo *>( &copyImageToMemoryInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToMemoryEXT" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyImageToImageEXT( const CopyImageToImageInfo * pCopyImageToImageInfo,
-                                                                             Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkCopyImageToImageEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToImageInfo *>( pCopyImageToImageInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::copyImageToImageEXT( const CopyImageToImageInfo & copyImageToImageInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCopyImageToImageEXT && "Function <vkCopyImageToImageEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkCopyImageToImageEXT( m_device, reinterpret_cast<const VkCopyImageToImageInfo *>( &copyImageToImageInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToImageEXT" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::transitionImageLayoutEXT( uint32_t                              transitionCount,
-                                                                                  const HostImageLayoutTransitionInfo * pTransitions,
-                                                                                  Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkTransitionImageLayoutEXT(
-      static_cast<VkDevice>( m_device ), transitionCount, reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( pTransitions ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::transitionImageLayoutEXT( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkTransitionImageLayoutEXT && "Function <vkTransitionImageLayoutEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-#  endif
-
-    Result result = static_cast<Result>(
-      d.vkTransitionImageLayoutEXT( m_device, transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( transitions.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::transitionImageLayoutEXT" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout2EXT( Image                     image,
-                                                                const ImageSubresource2 * pSubresource,
-                                                                SubresourceLayout2 *      pLayout,
-                                                                Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSubresourceLayout2EXT( static_cast<VkDevice>( m_device ),
+    d.vkGetImageSubresourceLayout2EXT( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( pSubresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( pLayout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( pSubresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( pLayout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Device::getImageSubresourceLayout2EXT( Image                     image,
-                                                                                                   const ImageSubresource2 & subresource,
-                                                                                                   Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR Device::getImageSubresourceLayout2EXT(
+    VULKAN_HPP_NAMESPACE::Image image, const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT(
       d.vkGetImageSubresourceLayout2EXT &&
-      "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 #  endif
 
-    SubresourceLayout2 layout;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
     d.vkGetImageSubresourceLayout2EXT( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return layout;
   }
 
-  // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getImageSubresourceLayout2EXT( Image image, const ImageSubresource2 & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> Device::getImageSubresourceLayout2EXT(
+    VULKAN_HPP_NAMESPACE::Image image, const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT(
       d.vkGetImageSubresourceLayout2EXT &&
-      "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
     d.vkGetImageSubresourceLayout2EXT( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return structureChain;
   }
@@ -22585,114 +20616,106 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_map_memory2 ===
 
-  // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory2KHR( const MemoryMapInfo * pMemoryMapInfo,
-                                                                       void **               ppData,
-                                                                       Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR * pMemoryMapInfo,
+                                                                       void **                                        ppData,
+                                                                       Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkMapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryMapInfo *>( pMemoryMapInfo ), ppData ) );
+    return static_cast<Result>( d.vkMapMemory2KHR( m_device, reinterpret_cast<const VkMemoryMapInfoKHR *>( pMemoryMapInfo ), ppData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type Device::mapMemory2KHR( const MemoryMapInfo & memoryMapInfo,
-                                                                                                       Dispatch const &      d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type
+                       Device::mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR & memoryMapInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkMapMemory2KHR && "Function <vkMapMemory2KHR> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkMapMemory2KHR && "Function <vkMapMemory2KHR> requires <VK_KHR_map_memory2>" );
 #  endif
 
-    void * pData;
-    Result result = static_cast<Result>( d.vkMapMemory2KHR( m_device, reinterpret_cast<const VkMemoryMapInfo *>( &memoryMapInfo ), &pData ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory2KHR" );
+    void *                       pData;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkMapMemory2KHR( m_device, reinterpret_cast<const VkMemoryMapInfoKHR *>( &memoryMapInfo ), &pData ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory2KHR" );
 
-    return detail::createResultValueType( result, std::move( pData ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pData ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::unmapMemory2KHR( const MemoryUnmapInfo * pMemoryUnmapInfo,
-                                                                         Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR * pMemoryUnmapInfo,
+                                                                         Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkUnmapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryUnmapInfo *>( pMemoryUnmapInfo ) ) );
+    return static_cast<Result>( d.vkUnmapMemory2KHR( m_device, reinterpret_cast<const VkMemoryUnmapInfoKHR *>( pMemoryUnmapInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::unmapMemory2KHR( const MemoryUnmapInfo & memoryUnmapInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR & memoryUnmapInfo,
+                                                                                  Dispatch const &                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkUnmapMemory2KHR && "Function <vkUnmapMemory2KHR> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkUnmapMemory2KHR && "Function <vkUnmapMemory2KHR> requires <VK_KHR_map_memory2>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkUnmapMemory2KHR( m_device, reinterpret_cast<const VkMemoryUnmapInfo *>( &memoryUnmapInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::unmapMemory2KHR" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkUnmapMemory2KHR( m_device, reinterpret_cast<const VkMemoryUnmapInfoKHR *>( &memoryUnmapInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::unmapMemory2KHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_swapchain_maintenance1 ===
 
-  // wrapper function for command vkReleaseSwapchainImagesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR * pReleaseInfo,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT * pReleaseInfo,
+                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkReleaseSwapchainImagesEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( pReleaseInfo ) ) );
+    return static_cast<Result>( d.vkReleaseSwapchainImagesEXT( m_device, reinterpret_cast<const VkReleaseSwapchainImagesInfoEXT *>( pReleaseInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleaseSwapchainImagesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR & releaseInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    Device::releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT & releaseInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkReleaseSwapchainImagesEXT &&
-                       "Function <vkReleaseSwapchainImagesEXT> requires <VK_EXT_swapchain_maintenance1> or <VK_KHR_swapchain_maintenance1>" );
+    VULKAN_HPP_ASSERT( d.vkReleaseSwapchainImagesEXT && "Function <vkReleaseSwapchainImagesEXT> requires <VK_EXT_swapchain_maintenance1>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkReleaseSwapchainImagesEXT( m_device, reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( &releaseInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseSwapchainImagesEXT" );
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkReleaseSwapchainImagesEXT( m_device, reinterpret_cast<const VkReleaseSwapchainImagesInfoEXT *>( &releaseInfo ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseSwapchainImagesEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_device_generated_commands ===
 
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV * pInfo,
-                                                                           MemoryRequirements2 *                             pMemoryRequirements,
-                                                                           Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV * pInfo,
+                                                                           VULKAN_HPP_NAMESPACE::MemoryRequirements2 * pMemoryRequirements,
+                                                                           Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetGeneratedCommandsMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
+    d.vkGetGeneratedCommandsMemoryRequirementsNV( m_device,
                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( pInfo ),
                                                   reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-    Device::getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info,
+                                                      Dispatch const &                                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22700,7 +20723,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetGeneratedCommandsMemoryRequirementsNV> requires <VK_NV_device_generated_commands>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetGeneratedCommandsMemoryRequirementsNV( m_device,
                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( &info ),
                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -22708,11 +20731,10 @@ namespace VULKAN_HPP_NAMESPACE
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info,
+                                                      Dispatch const &                                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22720,8 +20742,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetGeneratedCommandsMemoryRequirementsNV> requires <VK_NV_device_generated_commands>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetGeneratedCommandsMemoryRequirementsNV( m_device,
                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( &info ),
                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -22730,23 +20752,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
-                                                                       Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
+                                                                       Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPreprocessGeneratedCommandsNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                          reinterpret_cast<const VkGeneratedCommandsInfoNV *>( pGeneratedCommandsInfo ) );
+    d.vkCmdPreprocessGeneratedCommandsNV( m_commandBuffer, reinterpret_cast<const VkGeneratedCommandsInfoNV *>( pGeneratedCommandsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV & generatedCommandsInfo,
-                                                                       Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo,
+                                                                       Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22757,26 +20774,21 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( Bool32                          isPreprocessed,
-                                                                    const GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
-                                                                    Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                                                    const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
+                                                                    Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdExecuteGeneratedCommandsNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                       static_cast<VkBool32>( isPreprocessed ),
-                                       reinterpret_cast<const VkGeneratedCommandsInfoNV *>( pGeneratedCommandsInfo ) );
+    d.vkCmdExecuteGeneratedCommandsNV(
+      m_commandBuffer, static_cast<VkBool32>( isPreprocessed ), reinterpret_cast<const VkGeneratedCommandsInfoNV *>( pGeneratedCommandsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( Bool32                          isPreprocessed,
-                                                                    const GeneratedCommandsInfoNV & generatedCommandsInfo,
-                                                                    Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                                                    const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo,
+                                                                    Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22788,103 +20800,95 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindPipelineShaderGroupNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipelineShaderGroupNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindPipelineShaderGroupNV( PipelineBindPoint pipelineBindPoint,
-                                                                   Pipeline          pipeline,
-                                                                   uint32_t          groupIndex,
-                                                                   Dispatch const &  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                   VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                                                   uint32_t                                groupIndex,
+                                                                   Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindPipelineShaderGroupNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ), groupIndex );
+    d.vkCmdBindPipelineShaderGroupNV( m_commandBuffer, static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ), groupIndex );
   }
 
-  // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createIndirectCommandsLayoutNV( const IndirectCommandsLayoutCreateInfoNV * pCreateInfo,
-                                                                                        const AllocationCallbacks *                pAllocator,
-                                                                                        IndirectCommandsLayoutNV *                 pIndirectCommandsLayout,
-                                                                                        Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createIndirectCommandsLayoutNV( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV * pCreateInfo,
+                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                            VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV *                 pIndirectCommandsLayout,
+                                            Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateIndirectCommandsLayoutNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateIndirectCommandsLayoutNV( m_device,
                                                                     reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( pCreateInfo ),
                                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                     reinterpret_cast<VkIndirectCommandsLayoutNV *>( pIndirectCommandsLayout ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectCommandsLayoutNV>::type Device::createIndirectCommandsLayoutNV(
-    const IndirectCommandsLayoutCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>::type
+                       Device::createIndirectCommandsLayoutNV( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV & createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                            Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateIndirectCommandsLayoutNV && "Function <vkCreateIndirectCommandsLayoutNV> requires <VK_NV_device_generated_commands>" );
 #  endif
 
-    IndirectCommandsLayoutNV indirectCommandsLayout;
-    Result                   result = static_cast<Result>( d.vkCreateIndirectCommandsLayoutNV( m_device,
-                                                                             reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutNV" );
+    VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateIndirectCommandsLayoutNV(
+      m_device,
+      reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutNV" );
 
-    return detail::createResultValueType( result, std::move( indirectCommandsLayout ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( indirectCommandsLayout ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<IndirectCommandsLayoutNV, Dispatch>>::type
-                       Device::createIndirectCommandsLayoutNVUnique( const IndirectCommandsLayoutCreateInfoNV & createInfo,
-                                                  Optional<const AllocationCallbacks>        allocator,
-                                                  Dispatch const &                           d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV, Dispatch>>::type
+                       Device::createIndirectCommandsLayoutNVUnique( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV & createInfo,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator,
+                                                  Dispatch const &                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateIndirectCommandsLayoutNV && "Function <vkCreateIndirectCommandsLayoutNV> requires <VK_NV_device_generated_commands>" );
 #    endif
 
-    IndirectCommandsLayoutNV indirectCommandsLayout;
-    Result                   result = static_cast<Result>( d.vkCreateIndirectCommandsLayoutNV( m_device,
-                                                                             reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutNVUnique" );
+    VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout;
+    VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateIndirectCommandsLayoutNV(
+      m_device,
+      reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutNVUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<IndirectCommandsLayoutNV, Dispatch>( indirectCommandsLayout, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
+                                                                UniqueHandle<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV, Dispatch>(
+                                                                  indirectCommandsLayout, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutNV( IndirectCommandsLayoutNV    indirectCommandsLayout,
-                                                                  const AllocationCallbacks * pAllocator,
-                                                                  Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                  Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectCommandsLayoutNV( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyIndirectCommandsLayoutNV(
+      m_device, static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutNV( IndirectCommandsLayoutNV            indirectCommandsLayout,
-                                                                  Optional<const AllocationCallbacks> allocator,
-                                                                  Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV            indirectCommandsLayout,
+                                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22892,29 +20896,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyIndirectCommandsLayoutNV(
-      m_device, static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( IndirectCommandsLayoutNV indirectCommandsLayout, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectCommandsLayoutNV( static_cast<VkDevice>( m_device ),
-                                         static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
-                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyIndirectCommandsLayoutNV(
+      m_device, static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( IndirectCommandsLayoutNV            indirectCommandsLayout,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV            indirectCommandsLayout,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22922,24 +20924,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyIndirectCommandsLayoutNV(
-      m_device, static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkIndirectCommandsLayoutNV>( indirectCommandsLayout ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_depth_bias_control ===
 
-  // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const DepthBiasInfoEXT * pDepthBiasInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT * pDepthBiasInfo,
+                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBias2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDepthBiasInfoEXT *>( pDepthBiasInfo ) );
+    d.vkCmdSetDepthBias2EXT( m_commandBuffer, reinterpret_cast<const VkDepthBiasInfoEXT *>( pDepthBiasInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const DepthBiasInfoEXT & depthBiasInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT & depthBiasInfo,
+                                                          Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -22953,47 +20957,45 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_acquire_drm_display ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireDrmDisplayEXT( int32_t          drmFd,
-                                                                                      DisplayKHR       display,
-                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireDrmDisplayEXT( int32_t                          drmFd,
+                                                                                      VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                                                      Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireDrmDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), drmFd, static_cast<VkDisplayKHR>( display ) ) );
+    return static_cast<Result>( d.vkAcquireDrmDisplayEXT( m_physicalDevice, drmFd, static_cast<VkDisplayKHR>( display ) ) );
   }
 #else
-  // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          PhysicalDevice::acquireDrmDisplayEXT( int32_t drmFd, DisplayKHR display, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type
+    PhysicalDevice::acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireDrmDisplayEXT && "Function <vkAcquireDrmDisplayEXT> requires <VK_EXT_acquire_drm_display>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkAcquireDrmDisplayEXT( m_physicalDevice, drmFd, static_cast<VkDisplayKHR>( display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireDrmDisplayEXT" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireDrmDisplayEXT( m_physicalDevice, drmFd, static_cast<VkDisplayKHR>( display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireDrmDisplayEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId, DisplayKHR * display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getDrmDisplayEXT( int32_t                            drmFd,
+                                                                                  uint32_t                           connectorId,
+                                                                                  VULKAN_HPP_NAMESPACE::DisplayKHR * display,
+                                                                                  Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetDrmDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( display ) ) );
+    return static_cast<Result>( d.vkGetDrmDisplayEXT( m_physicalDevice, drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( display ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
                        PhysicalDevice::getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -23001,17 +21003,17 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDrmDisplayEXT && "Function <vkGetDrmDisplayEXT> requires <VK_EXT_acquire_drm_display>" );
 #  endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetDrmDisplayEXT( m_physicalDevice, drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDrmDisplayEXT" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDrmDisplayEXT( m_physicalDevice, drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDrmDisplayEXT" );
 
-    return detail::createResultValueType( result, std::move( display ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( display ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
                        PhysicalDevice::getDrmDisplayEXTUnique( int32_t drmFd, uint32_t connectorId, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -23019,92 +21021,95 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetDrmDisplayEXT && "Function <vkGetDrmDisplayEXT> requires <VK_EXT_acquire_drm_display>" );
 #    endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetDrmDisplayEXT( m_physicalDevice, drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDrmDisplayEXTUnique" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDrmDisplayEXT( m_physicalDevice, drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDrmDisplayEXTUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<DisplayKHR, Dispatch>( display, detail::ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>( display, ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_private_data ===
 
-  // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPrivateDataSlotEXT( const PrivateDataSlotCreateInfo * pCreateInfo,
-                                                                                  const AllocationCallbacks *       pAllocator,
-                                                                                  PrivateDataSlot *                 pPrivateDataSlot,
-                                                                                  Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPrivateDataSlotEXT( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo * pCreateInfo,
+                                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                                                  VULKAN_HPP_NAMESPACE::PrivateDataSlot *                 pPrivateDataSlot,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreatePrivateDataSlotEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreatePrivateDataSlotEXT( m_device,
                                                               reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( pCreateInfo ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                               reinterpret_cast<VkPrivateDataSlot *>( pPrivateDataSlot ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PrivateDataSlot>::type
-    Device::createPrivateDataSlotEXT( const PrivateDataSlotCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::type
+                       Device::createPrivateDataSlotEXT( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &   createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePrivateDataSlotEXT && "Function <vkCreatePrivateDataSlotEXT> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #  endif
 
-    PrivateDataSlot privateDataSlot;
-    Result          result = static_cast<Result>( d.vkCreatePrivateDataSlotEXT( m_device,
-                                                                       reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotEXT" );
+    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreatePrivateDataSlotEXT(
+      m_device,
+      reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotEXT" );
 
-    return detail::createResultValueType( result, std::move( privateDataSlot ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( privateDataSlot ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<PrivateDataSlot, Dispatch>>::type Device::createPrivateDataSlotEXTUnique(
-    const PrivateDataSlotCreateInfo & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>>::type
+                       Device::createPrivateDataSlotEXTUnique( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &   createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreatePrivateDataSlotEXT && "Function <vkCreatePrivateDataSlotEXT> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #    endif
 
-    PrivateDataSlot privateDataSlot;
-    Result          result = static_cast<Result>( d.vkCreatePrivateDataSlotEXT( m_device,
-                                                                       reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotEXTUnique" );
+    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreatePrivateDataSlotEXT(
+      m_device,
+      reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPrivateDataSlotEXTUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<PrivateDataSlot, Dispatch>( privateDataSlot, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>( privateDataSlot, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyPrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPrivateDataSlotEXT( PrivateDataSlot privateDataSlot, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                            Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPrivateDataSlotEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyPrivateDataSlotEXT( m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( PrivateDataSlot                     privateDataSlot,
-                                                            Optional<const AllocationCallbacks> allocator,
-                                                            Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot                     privateDataSlot,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                            Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23112,54 +21117,62 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyPrivateDataSlotEXT(
-      m_device, static_cast<VkPrivateDataSlot>( privateDataSlot ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkPrivateDataSlot>( privateDataSlot ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setPrivateDataEXT(
-    ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t data, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                           uint64_t                              objectHandle,
+                                                                           VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                           uint64_t                              data,
+                                                                           Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSetPrivateDataEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
+    return static_cast<Result>(
+      d.vkSetPrivateDataEXT( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
   }
 #else
-  // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::setPrivateDataEXT( ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t data, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                                    uint64_t                              objectHandle,
+                                                                                    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                                    uint64_t                              data,
+                                                                                    Dispatch const &                      d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSetPrivateDataEXT && "Function <vkSetPrivateDataEXT> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkSetPrivateDataEXT( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateDataEXT" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getPrivateDataEXT(
-    ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, uint64_t * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                    uint64_t                              objectHandle,
+                                                    VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                    uint64_t *                            pData,
+                                                    Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPrivateDataEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), pData );
+    d.vkGetPrivateDataEXT( m_device, static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), pData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
-    Device::getPrivateDataEXT( ObjectType objectType_, uint64_t objectHandle, PrivateDataSlot privateDataSlot, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                                             uint64_t                              objectHandle,
+                                                                             VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                                             Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23175,27 +21188,24 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_video_encode_queue ===
 
-  // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
-                                                             VideoEncodeQualityLevelPropertiesKHR *               pQualityLevelProperties,
-                                                             Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
+    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
+                                                             VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR *               pQualityLevelProperties,
+                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+      d.vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( m_physicalDevice,
                                                                  reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( pQualityLevelInfo ),
                                                                  reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( pQualityLevelProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoEncodeQualityLevelPropertiesKHR>::type
-    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR>::type
+    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
+                                                             Dispatch const &                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23203,21 +21213,20 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR> requires <VK_KHR_video_encode_queue>" );
 #  endif
 
-    VideoEncodeQualityLevelPropertiesKHR qualityLevelProperties;
-    Result                               result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR qualityLevelProperties;
+    VULKAN_HPP_NAMESPACE::Result                               result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( m_physicalDevice,
                                                                  reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( &qualityLevelInfo ),
                                                                  reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( &qualityLevelProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
 
-    return detail::createResultValueType( result, std::move( qualityLevelProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( qualityLevelProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo, Dispatch const & d ) const
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+    PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
+                                                             Dispatch const &                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23225,31 +21234,30 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR> requires <VK_KHR_video_encode_queue>" );
 #  endif
 
-    StructureChain<X, Y, Z...>             structureChain;
-    VideoEncodeQualityLevelPropertiesKHR & qualityLevelProperties = structureChain.template get<VideoEncodeQualityLevelPropertiesKHR>();
-    Result                                 result                 = static_cast<Result>(
+    StructureChain<X, Y, Z...>                                   structureChain;
+    VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR & qualityLevelProperties =
+      structureChain.template get<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR>();
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR( m_physicalDevice,
                                                                  reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( &qualityLevelInfo ),
                                                                  reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( &qualityLevelProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
-                                                 VideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
-                                                 size_t *                                       pDataSize,
-                                                 void *                                         pData,
-                                                 Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
+    Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
+                                                 VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
+                                                 size_t *                                                             pDataSize,
+                                                 void *                                                               pData,
+                                                 Dispatch const &                                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetEncodedVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
+      d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( pVideoSessionParametersInfo ),
                                                reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( pFeedbackInfo ),
                                                pDataSize,
@@ -23257,205 +21265,192 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-    Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo, Dispatch const & d ) const
+    typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
+    Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                                 Dispatch const &                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetEncodedVideoSessionParametersKHR && "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
 #  endif
 
-    std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>> data_;
-    VideoEncodeSessionParametersFeedbackInfoKHR &                                                  feedbackInfo = data_.first;
-    std::vector<uint8_t, Uint8_tAllocator> &                                                       data         = data_.second;
-    size_t                                                                                         dataSize;
-    Result                                                                                         result;
+    std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>> data_;
+    VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR &                                                  feedbackInfo = data_.first;
+    std::vector<uint8_t, Uint8_tAllocator> &                                                                             data         = data_.second;
+    size_t                                                                                                               dataSize;
+    VULKAN_HPP_NAMESPACE::Result                                                                                         result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                  reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                  reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                  &dataSize,
                                                  nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                    reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                    reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                    &dataSize,
                                                    reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-    Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                                 Uint8_tAllocator &                             uint8_tAllocator,
-                                                 Dispatch const &                               d ) const
+    typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
+    Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                                 Uint8_tAllocator &                                                   uint8_tAllocator,
+                                                 Dispatch const &                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetEncodedVideoSessionParametersKHR && "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
 #  endif
 
-    std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>> data_(
+    std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>> data_(
       std::piecewise_construct, std::forward_as_tuple(), std::forward_as_tuple( uint8_tAllocator ) );
-    VideoEncodeSessionParametersFeedbackInfoKHR & feedbackInfo = data_.first;
-    std::vector<uint8_t, Uint8_tAllocator> &      data         = data_.second;
-    size_t                                        dataSize;
-    Result                                        result;
+    VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR & feedbackInfo = data_.first;
+    std::vector<uint8_t, Uint8_tAllocator> &                            data         = data_.second;
+    size_t                                                              dataSize;
+    VULKAN_HPP_NAMESPACE::Result                                        result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                  reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                  reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                  &dataSize,
                                                  nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                    reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                    reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                    &dataSize,
                                                    reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+  }
+
+  template <typename X, typename Y, typename... Z, typename Uint8_tAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
+    Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                                 Dispatch const &                                                     d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetEncodedVideoSessionParametersKHR && "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
+#  endif
+
+    std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>> data_;
+    VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR &                                 feedbackInfo =
+      data_.first.template get<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR>();
+    std::vector<uint8_t, Uint8_tAllocator> & data = data_.second;
+    size_t                                   dataSize;
+    VULKAN_HPP_NAMESPACE::Result             result;
+    do
+    {
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetEncodedVideoSessionParametersKHR( m_device,
+                                                 reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
+                                                 reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
+                                                 &dataSize,
+                                                 nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
+      {
+        data.resize( dataSize );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetEncodedVideoSessionParametersKHR( m_device,
+                                                   reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
+                                                   reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
+                                                   &dataSize,
+                                                   reinterpret_cast<void *>( data.data() ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
   template <typename X,
             typename Y,
             typename... Z,
             typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
-    Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
+    Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                                 Uint8_tAllocator &                                                   uint8_tAllocator,
+                                                 Dispatch const &                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetEncodedVideoSessionParametersKHR && "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
 #  endif
 
-    std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>> data_;
-    VideoEncodeSessionParametersFeedbackInfoKHR & feedbackInfo = data_.first.template get<VideoEncodeSessionParametersFeedbackInfoKHR>();
-    std::vector<uint8_t, Uint8_tAllocator> &      data         = data_.second;
-    size_t                                        dataSize;
-    Result                                        result;
-    do
-    {
-      result = static_cast<Result>(
-        d.vkGetEncodedVideoSessionParametersKHR( m_device,
-                                                 reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
-                                                 reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
-                                                 &dataSize,
-                                                 nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
-      {
-        data.resize( dataSize );
-        result = static_cast<Result>(
-          d.vkGetEncodedVideoSessionParametersKHR( m_device,
-                                                   reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
-                                                   reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
-                                                   &dataSize,
-                                                   reinterpret_cast<void *>( data.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
-
-    return detail::createResultValueType( result, std::move( data_ ) );
-  }
-
-  // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-  template <typename X,
-            typename Y,
-            typename... Z,
-            typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
-                       Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                                 Uint8_tAllocator &                             uint8_tAllocator,
-                                                 Dispatch const &                               d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetEncodedVideoSessionParametersKHR && "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
-#  endif
-
-    std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>> data_(
+    std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>> data_(
       std::piecewise_construct, std::forward_as_tuple(), std::forward_as_tuple( uint8_tAllocator ) );
-    VideoEncodeSessionParametersFeedbackInfoKHR & feedbackInfo = data_.first.template get<VideoEncodeSessionParametersFeedbackInfoKHR>();
-    std::vector<uint8_t, Uint8_tAllocator> &      data         = data_.second;
-    size_t                                        dataSize;
-    Result                                        result;
+    VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR & feedbackInfo =
+      data_.first.template get<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR>();
+    std::vector<uint8_t, Uint8_tAllocator> & data = data_.second;
+    size_t                                   dataSize;
+    VULKAN_HPP_NAMESPACE::Result             result;
     do
     {
-      result = static_cast<Result>(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                  reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                  reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                  &dataSize,
                                                  nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetEncodedVideoSessionParametersKHR( m_device,
                                                    reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
                                                    reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
                                                    &dataSize,
                                                    reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VideoEncodeInfoKHR * pEncodeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR * pEncodeInfo,
+                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEncodeVideoKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkVideoEncodeInfoKHR *>( pEncodeInfo ) );
+    d.vkCmdEncodeVideoKHR( m_commandBuffer, reinterpret_cast<const VkVideoEncodeInfoKHR *>( pEncodeInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VideoEncodeInfoKHR & encodeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR & encodeInfo,
+                                                        Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23469,82 +21464,82 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_NV_cuda_kernel_launch ===
 
-  // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCudaModuleNV( const CudaModuleCreateInfoNV * pCreateInfo,
-                                                                            const AllocationCallbacks *    pAllocator,
-                                                                            CudaModuleNV *                 pModule,
-                                                                            Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCudaModuleNV( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV * pCreateInfo,
+                                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                                            VULKAN_HPP_NAMESPACE::CudaModuleNV *                 pModule,
+                                                                            Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateCudaModuleNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateCudaModuleNV( m_device,
                                                         reinterpret_cast<const VkCudaModuleCreateInfoNV *>( pCreateInfo ),
                                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                         reinterpret_cast<VkCudaModuleNV *>( pModule ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CudaModuleNV>::type
-    Device::createCudaModuleNV( const CudaModuleCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::CudaModuleNV>::type
+                       Device::createCudaModuleNV( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV &      createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCudaModuleNV && "Function <vkCreateCudaModuleNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    CudaModuleNV module;
-    Result       result = static_cast<Result>( d.vkCreateCudaModuleNV( m_device,
-                                                                 reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaModuleNV" );
+    VULKAN_HPP_NAMESPACE::CudaModuleNV module;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCudaModuleNV( m_device,
+                              reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaModuleNV" );
 
-    return detail::createResultValueType( result, std::move( module ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( module ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<CudaModuleNV, Dispatch>>::type
-    Device::createCudaModuleNVUnique( const CudaModuleCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CudaModuleNV, Dispatch>>::type
+                       Device::createCudaModuleNVUnique( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV &      createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCudaModuleNV && "Function <vkCreateCudaModuleNV> requires <VK_NV_cuda_kernel_launch>" );
 #      endif
 
-    CudaModuleNV module;
-    Result       result = static_cast<Result>( d.vkCreateCudaModuleNV( m_device,
-                                                                 reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                 reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaModuleNVUnique" );
+    VULKAN_HPP_NAMESPACE::CudaModuleNV module;
+    VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCudaModuleNV( m_device,
+                              reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
+                              reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                              reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaModuleNVUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<CudaModuleNV, Dispatch>( module, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::CudaModuleNV, Dispatch>( module, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getCudaModuleCacheNV( CudaModuleNV module, size_t * pCacheSize, void * pCacheData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCudaModuleCacheNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module,
+                                                                              size_t *                           pCacheSize,
+                                                                              void *                             pCacheData,
+                                                                              Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetCudaModuleCacheNV( static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( module ), pCacheSize, pCacheData ) );
+    return static_cast<Result>( d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), pCacheSize, pCacheData ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getCudaModuleCacheNV( CudaModuleNV module, Dispatch const & d ) const
+                       Device::getCudaModuleCacheNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23553,33 +21548,31 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> cacheData;
     size_t                                 cacheSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && cacheSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && cacheSize )
       {
         cacheData.resize( cacheSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, reinterpret_cast<void *>( cacheData.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCudaModuleCacheNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCudaModuleCacheNV" );
     VULKAN_HPP_ASSERT( cacheSize <= cacheData.size() );
     if ( cacheSize < cacheData.size() )
     {
       cacheData.resize( cacheSize );
     }
-    return detail::createResultValueType( result, std::move( cacheData ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( cacheData ) );
   }
 
-  // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getCudaModuleCacheNV( CudaModuleNV module, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
+                       Device::getCudaModuleCacheNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23588,194 +21581,205 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> cacheData( uint8_tAllocator );
     size_t                                 cacheSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && cacheSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && cacheSize )
       {
         cacheData.resize( cacheSize );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetCudaModuleCacheNV( m_device, static_cast<VkCudaModuleNV>( module ), &cacheSize, reinterpret_cast<void *>( cacheData.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCudaModuleCacheNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCudaModuleCacheNV" );
     VULKAN_HPP_ASSERT( cacheSize <= cacheData.size() );
     if ( cacheSize < cacheData.size() )
     {
       cacheData.resize( cacheSize );
     }
-    return detail::createResultValueType( result, std::move( cacheData ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( cacheData ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCudaFunctionNV( const CudaFunctionCreateInfoNV * pCreateInfo,
-                                                                              const AllocationCallbacks *      pAllocator,
-                                                                              CudaFunctionNV *                 pFunction,
-                                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createCudaFunctionNV( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV * pCreateInfo,
+                                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                                              VULKAN_HPP_NAMESPACE::CudaFunctionNV *                 pFunction,
+                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateCudaFunctionNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateCudaFunctionNV( m_device,
                                                           reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( pCreateInfo ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                           reinterpret_cast<VkCudaFunctionNV *>( pFunction ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CudaFunctionNV>::type
-    Device::createCudaFunctionNV( const CudaFunctionCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::CudaFunctionNV>::type
+                       Device::createCudaFunctionNV( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV &    createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                  Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCudaFunctionNV && "Function <vkCreateCudaFunctionNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    CudaFunctionNV function;
-    Result         result = static_cast<Result>( d.vkCreateCudaFunctionNV( m_device,
-                                                                   reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaFunctionNV" );
+    VULKAN_HPP_NAMESPACE::CudaFunctionNV function;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCudaFunctionNV( m_device,
+                                reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaFunctionNV" );
 
-    return detail::createResultValueType( result, std::move( function ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( function ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<CudaFunctionNV, Dispatch>>::type
-    Device::createCudaFunctionNVUnique( const CudaFunctionCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CudaFunctionNV, Dispatch>>::type
+                       Device::createCudaFunctionNVUnique( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV &    createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateCudaFunctionNV && "Function <vkCreateCudaFunctionNV> requires <VK_NV_cuda_kernel_launch>" );
 #      endif
 
-    CudaFunctionNV function;
-    Result         result = static_cast<Result>( d.vkCreateCudaFunctionNV( m_device,
-                                                                   reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaFunctionNVUnique" );
+    VULKAN_HPP_NAMESPACE::CudaFunctionNV function;
+    VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateCudaFunctionNV( m_device,
+                                reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
+                                reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                                reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createCudaFunctionNVUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<CudaFunctionNV, Dispatch>( function, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::CudaFunctionNV, Dispatch>( function, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCudaModuleNV( CudaModuleNV module, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleNV                module,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCudaModuleNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCudaModuleNV( m_device, static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCudaModuleNV( CudaModuleNV module, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleNV                        module,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                      Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCudaModuleNV && "Function <vkDestroyCudaModuleNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    d.vkDestroyCudaModuleNV( m_device, static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCudaModuleNV( m_device,
+                             static_cast<VkCudaModuleNV>( module ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CudaModuleNV module, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CudaModuleNV                module,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCudaModuleNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCudaModuleNV( m_device, static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CudaModuleNV module, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CudaModuleNV                        module,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCudaModuleNV && "Function <vkDestroyCudaModuleNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    d.vkDestroyCudaModuleNV( m_device, static_cast<VkCudaModuleNV>( module ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCudaModuleNV( m_device,
+                             static_cast<VkCudaModuleNV>( module ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCudaFunctionNV( CudaFunctionNV function, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV              function,
+                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCudaFunctionNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCudaFunctionNV( m_device, static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyCudaFunctionNV( CudaFunctionNV function, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV                      function,
+                                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                        Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCudaFunctionNV && "Function <vkDestroyCudaFunctionNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    d.vkDestroyCudaFunctionNV( m_device, static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCudaFunctionNV( m_device,
+                               static_cast<VkCudaFunctionNV>( function ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CudaFunctionNV function, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CudaFunctionNV              function,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyCudaFunctionNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyCudaFunctionNV( m_device, static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( CudaFunctionNV function, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::CudaFunctionNV                      function,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyCudaFunctionNV && "Function <vkDestroyCudaFunctionNV> requires <VK_NV_cuda_kernel_launch>" );
 #    endif
 
-    d.vkDestroyCudaFunctionNV( m_device, static_cast<VkCudaFunctionNV>( function ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyCudaFunctionNV( m_device,
+                               static_cast<VkCudaFunctionNV>( function ),
+                               reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const CudaLaunchInfoNV * pLaunchInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV * pLaunchInfo,
+                                                            Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCudaLaunchKernelNV( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCudaLaunchInfoNV *>( pLaunchInfo ) );
+    d.vkCmdCudaLaunchKernelNV( m_commandBuffer, reinterpret_cast<const VkCudaLaunchInfoNV *>( pLaunchInfo ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const CudaLaunchInfoNV & launchInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV & launchInfo,
+                                                            Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23787,118 +21791,67 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-
-  // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchTileQCOM( const DispatchTileInfoQCOM * pDispatchTileInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchTileQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDispatchTileInfoQCOM *>( pDispatchTileInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchTileQCOM( const DispatchTileInfoQCOM & dispatchTileInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdDispatchTileQCOM && "Function <vkCmdDispatchTileQCOM> requires <VK_QCOM_tile_shading>" );
-#  endif
-
-    d.vkCmdDispatchTileQCOM( m_commandBuffer, reinterpret_cast<const VkDispatchTileInfoQCOM *>( &dispatchTileInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM * pPerTileBeginInfo,
-                                                                   Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginPerTileExecutionQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPerTileBeginInfoQCOM *>( pPerTileBeginInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM & perTileBeginInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBeginPerTileExecutionQCOM && "Function <vkCmdBeginPerTileExecutionQCOM> requires <VK_QCOM_tile_shading>" );
-#  endif
-
-    d.vkCmdBeginPerTileExecutionQCOM( m_commandBuffer, reinterpret_cast<const VkPerTileBeginInfoQCOM *>( &perTileBeginInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdEndPerTileExecutionQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endPerTileExecutionQCOM( const PerTileEndInfoQCOM * pPerTileEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndPerTileExecutionQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPerTileEndInfoQCOM *>( pPerTileEndInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndPerTileExecutionQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endPerTileExecutionQCOM( const PerTileEndInfoQCOM & perTileEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdEndPerTileExecutionQCOM && "Function <vkCmdEndPerTileExecutionQCOM> requires <VK_QCOM_tile_shading>" );
-#  endif
-
-    d.vkCmdEndPerTileExecutionQCOM( m_commandBuffer, reinterpret_cast<const VkPerTileEndInfoQCOM *>( &perTileEndInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_objects ===
 
-  // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::exportMetalObjectsEXT( ExportMetalObjectsInfoEXT * pMetalObjectsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::exportMetalObjectsEXT( VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT * pMetalObjectsInfo,
+                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkExportMetalObjectsEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<VkExportMetalObjectsInfoEXT *>( pMetalObjectsInfo ) );
+    d.vkExportMetalObjectsEXT( m_device, reinterpret_cast<VkExportMetalObjectsInfoEXT *>( pMetalObjectsInfo ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::exportMetalObjectsEXT( ExportMetalObjectsInfoEXT & metalObjectsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT
+                                         Device::exportMetalObjectsEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkExportMetalObjectsEXT && "Function <vkExportMetalObjectsEXT> requires <VK_EXT_metal_objects>" );
 #    endif
 
+    VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT metalObjectsInfo;
     d.vkExportMetalObjectsEXT( m_device, reinterpret_cast<VkExportMetalObjectsInfoEXT *>( &metalObjectsInfo ) );
+
+    return metalObjectsInfo;
+  }
+
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         Device::exportMetalObjectsEXT( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkExportMetalObjectsEXT && "Function <vkExportMetalObjectsEXT> requires <VK_EXT_metal_objects>" );
+#    endif
+
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+    VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT & metalObjectsInfo = structureChain.template get<VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT>();
+    d.vkExportMetalObjectsEXT( m_device, reinterpret_cast<VkExportMetalObjectsInfoEXT *>( &metalObjectsInfo ) );
+
+    return structureChain;
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_METAL_EXT*/
 
   //=== VK_KHR_synchronization2 ===
 
-  // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( Event event, const DependencyInfo * pDependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                      const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                                                      Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetEvent2KHR(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
+    d.vkCmdSetEvent2KHR( m_commandBuffer, static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( Event event, const DependencyInfo & dependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                      const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                                                      Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23909,34 +21862,31 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdResetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resetEvent2KHR( Event event, PipelineStageFlags2 stageMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event               event,
+                                                        VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask,
+                                                        Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResetEvent2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
+    d.vkCmdResetEvent2KHR( m_commandBuffer, static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
   }
 
-  // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( uint32_t               eventCount,
-                                                        const Event *          pEvents,
-                                                        const DependencyInfo * pDependencyInfos,
-                                                        Dispatch const &       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( uint32_t                                     eventCount,
+                                                        const VULKAN_HPP_NAMESPACE::Event *          pEvents,
+                                                        const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfos,
+                                                        Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWaitEvents2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                           eventCount,
-                           reinterpret_cast<const VkEvent *>( pEvents ),
-                           reinterpret_cast<const VkDependencyInfo *>( pDependencyInfos ) );
+    d.vkCmdWaitEvents2KHR(
+      m_commandBuffer, eventCount, reinterpret_cast<const VkEvent *>( pEvents ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfos ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( ArrayProxy<const Event> const &          events,
-                                                        ArrayProxy<const DependencyInfo> const & dependencyInfos,
-                                                        Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos,
+                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23958,18 +21908,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const DependencyInfo * pDependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                                                             Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPipelineBarrier2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
+    d.vkCmdPipelineBarrier2KHR( m_commandBuffer, reinterpret_cast<const VkDependencyInfo *>( pDependencyInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const DependencyInfo & dependencyInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                                                             Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -23980,97 +21930,158 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdWriteTimestamp2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::writeTimestamp2KHR( PipelineStageFlags2 stage, QueryPool queryPool, uint32_t query, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                            VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                                            uint32_t                                  query,
+                                                            Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteTimestamp2KHR(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
+    d.vkCmdWriteTimestamp2KHR( m_commandBuffer, static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
   }
 
-  // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Queue::submit2KHR( uint32_t submitCount, const SubmitInfo2 * pSubmits, Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::submit2KHR( uint32_t                                  submitCount,
+                                                                   const VULKAN_HPP_NAMESPACE::SubmitInfo2 * pSubmits,
+                                                                   VULKAN_HPP_NAMESPACE::Fence               fence,
+                                                                   Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkQueueSubmit2KHR( static_cast<VkQueue>( m_queue ), submitCount, reinterpret_cast<const VkSubmitInfo2 *>( pSubmits ), static_cast<VkFence>( fence ) ) );
+      d.vkQueueSubmit2KHR( m_queue, submitCount, reinterpret_cast<const VkSubmitInfo2 *>( pSubmits ), static_cast<VkFence>( fence ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Queue::submit2KHR( ArrayProxy<const SubmitInfo2> const & submits, Fence fence, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit2KHR(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits, VULKAN_HPP_NAMESPACE::Fence fence, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkQueueSubmit2KHR && "Function <vkQueueSubmit2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkQueueSubmit2KHR( m_queue, submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2KHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2KHR" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarker2AMD( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                               VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
+                                                               VULKAN_HPP_NAMESPACE::DeviceSize          dstOffset,
+                                                               uint32_t                                  marker,
+                                                               Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkCmdWriteBufferMarker2AMD(
+      m_commandBuffer, static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkBuffer>( dstBuffer ), static_cast<VkDeviceSize>( dstOffset ), marker );
+  }
+
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::getCheckpointData2NV( uint32_t *                                pCheckpointDataCount,
+                                                      VULKAN_HPP_NAMESPACE::CheckpointData2NV * pCheckpointData,
+                                                      Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    d.vkGetQueueCheckpointData2NV( m_queue, pCheckpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( pCheckpointData ) );
+  }
+
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename CheckpointData2NVAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator>
+                                         Queue::getCheckpointData2NV( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointData2NV && "Function <vkGetQueueCheckpointData2NV> requires <VK_KHR_synchronization2>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator> checkpointData;
+    uint32_t                                                                         checkpointDataCount;
+    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, nullptr );
+    checkpointData.resize( checkpointDataCount );
+    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
+
+    VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
+    if ( checkpointDataCount < checkpointData.size() )
+    {
+      checkpointData.resize( checkpointDataCount );
+    }
+    return checkpointData;
+  }
+
+  template <typename CheckpointData2NVAllocator,
+            typename Dispatch,
+            typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator>
+                                         Queue::getCheckpointData2NV( CheckpointData2NVAllocator & checkpointData2NVAllocator, Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetQueueCheckpointData2NV && "Function <vkGetQueueCheckpointData2NV> requires <VK_KHR_synchronization2>" );
+#  endif
+
+    std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator> checkpointData( checkpointData2NVAllocator );
+    uint32_t                                                                         checkpointDataCount;
+    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, nullptr );
+    checkpointData.resize( checkpointDataCount );
+    d.vkGetQueueCheckpointData2NV( m_queue, &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
+
+    VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
+    if ( checkpointDataCount < checkpointData.size() )
+    {
+      checkpointData.resize( checkpointDataCount );
+    }
+    return checkpointData;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_descriptor_buffer ===
 
-  // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getDescriptorSetLayoutSizeEXT( DescriptorSetLayout layout, DeviceSize * pLayoutSizeInBytes, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutSizeEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize *        pLayoutSizeInBytes,
+                                                                Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetLayoutSizeEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkDescriptorSetLayout>( layout ), reinterpret_cast<VkDeviceSize *>( pLayoutSizeInBytes ) );
+    d.vkGetDescriptorSetLayoutSizeEXT( m_device, static_cast<VkDescriptorSetLayout>( layout ), reinterpret_cast<VkDeviceSize *>( pLayoutSizeInBytes ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize Device::getDescriptorSetLayoutSizeEXT( DescriptorSetLayout layout,
-                                                                                           Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize
+    Device::getDescriptorSetLayoutSizeEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDescriptorSetLayoutSizeEXT && "Function <vkGetDescriptorSetLayoutSizeEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DeviceSize layoutSizeInBytes;
+    VULKAN_HPP_NAMESPACE::DeviceSize layoutSizeInBytes;
     d.vkGetDescriptorSetLayoutSizeEXT( m_device, static_cast<VkDescriptorSetLayout>( layout ), reinterpret_cast<VkDeviceSize *>( &layoutSizeInBytes ) );
 
     return layoutSizeInBytes;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutBindingOffsetEXT( DescriptorSetLayout layout,
-                                                                         uint32_t            binding,
-                                                                         DeviceSize *        pOffset,
-                                                                         Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutBindingOffsetEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                                                         uint32_t                                  binding,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceSize *        pOffset,
+                                                                         Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetLayoutBindingOffsetEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkDescriptorSetLayout>( layout ), binding, reinterpret_cast<VkDeviceSize *>( pOffset ) );
+    d.vkGetDescriptorSetLayoutBindingOffsetEXT( m_device, static_cast<VkDescriptorSetLayout>( layout ), binding, reinterpret_cast<VkDeviceSize *>( pOffset ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize Device::getDescriptorSetLayoutBindingOffsetEXT( DescriptorSetLayout layout,
-                                                                                                    uint32_t            binding,
-                                                                                                    Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize Device::getDescriptorSetLayoutBindingOffsetEXT(
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout, uint32_t binding, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24078,27 +22089,29 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDescriptorSetLayoutBindingOffsetEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DeviceSize offset;
+    VULKAN_HPP_NAMESPACE::DeviceSize offset;
     d.vkGetDescriptorSetLayoutBindingOffsetEXT( m_device, static_cast<VkDescriptorSetLayout>( layout ), binding, reinterpret_cast<VkDeviceSize *>( &offset ) );
 
     return offset;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getDescriptorEXT( const DescriptorGetInfoEXT * pDescriptorInfo, size_t dataSize, void * pDescriptor, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT * pDescriptorInfo,
+                                                   size_t                                             dataSize,
+                                                   void *                                             pDescriptor,
+                                                   Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDescriptorGetInfoEXT *>( pDescriptorInfo ), dataSize, pDescriptor );
+    d.vkGetDescriptorEXT( m_device, reinterpret_cast<const VkDescriptorGetInfoEXT *>( pDescriptorInfo ), dataSize, pDescriptor );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo, size_t dataSize, void * pDescriptor, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo,
+                                                   size_t                                             dataSize,
+                                                   void *                                             pDescriptor,
+                                                   Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24108,10 +22121,9 @@ namespace VULKAN_HPP_NAMESPACE
     d.vkGetDescriptorEXT( m_device, reinterpret_cast<const VkDescriptorGetInfoEXT *>( &descriptorInfo ), dataSize, pDescriptor );
   }
 
-  // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-  template <typename DescriptorType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorType Device::getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo,
-                                                                                  Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename DescriptorType, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorType Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24126,24 +22138,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBuffersEXT( uint32_t                               bufferCount,
-                                                                  const DescriptorBufferBindingInfoEXT * pBindingInfos,
-                                                                  Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBuffersEXT( uint32_t                                                     bufferCount,
+                                                                  const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT * pBindingInfos,
+                                                                  Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindDescriptorBuffersEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), bufferCount, reinterpret_cast<const VkDescriptorBufferBindingInfoEXT *>( pBindingInfos ) );
+    d.vkCmdBindDescriptorBuffersEXT( m_commandBuffer, bufferCount, reinterpret_cast<const VkDescriptorBufferBindingInfoEXT *>( pBindingInfos ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBuffersEXT( ArrayProxy<const DescriptorBufferBindingInfoEXT> const & bindingInfos,
-                                                                  Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::bindDescriptorBuffersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT> const & bindingInfos,
+                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24154,19 +22162,17 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( PipelineBindPoint  pipelineBindPoint,
-                                                                       PipelineLayout     layout,
-                                                                       uint32_t           firstSet,
-                                                                       uint32_t           setCount,
-                                                                       const uint32_t *   pBufferIndices,
-                                                                       const DeviceSize * pOffsets,
-                                                                       Dispatch const &   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint  pipelineBindPoint,
+                                                                       VULKAN_HPP_NAMESPACE::PipelineLayout     layout,
+                                                                       uint32_t                                 firstSet,
+                                                                       uint32_t                                 setCount,
+                                                                       const uint32_t *                         pBufferIndices,
+                                                                       const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                                                       Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDescriptorBufferOffsetsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdSetDescriptorBufferOffsetsEXT( m_commandBuffer,
                                           static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
                                           static_cast<VkPipelineLayout>( layout ),
                                           firstSet,
@@ -24176,15 +22182,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( PipelineBindPoint                    pipelineBindPoint,
-                                                                       PipelineLayout                       layout,
-                                                                       uint32_t                             firstSet,
-                                                                       ArrayProxy<const uint32_t> const &   bufferIndices,
-                                                                       ArrayProxy<const DeviceSize> const & offsets,
-                                                                       Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint                  pipelineBindPoint,
+                                                                       VULKAN_HPP_NAMESPACE::PipelineLayout                     layout,
+                                                                       uint32_t                                                 firstSet,
+                                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const & bufferIndices,
+                                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24209,37 +22213,30 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplersEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplersEXT( PipelineBindPoint pipelineBindPoint,
-                                                                                 PipelineLayout    layout,
-                                                                                 uint32_t          set,
-                                                                                 Dispatch const &  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                                 VULKAN_HPP_NAMESPACE::PipelineLayout    layout,
+                                                                                 uint32_t                                set,
+                                                                                 Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkCmdBindDescriptorBufferEmbeddedSamplersEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipelineLayout>( layout ), set );
+      m_commandBuffer, static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipelineLayout>( layout ), set );
   }
 
-  // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getBufferOpaqueCaptureDescriptorDataEXT( const BufferCaptureDescriptorDataInfoEXT * pInfo,
-                                                                                                 void *                                     pData,
-                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getBufferOpaqueCaptureDescriptorDataEXT(
+    const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetBufferOpaqueCaptureDescriptorDataEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
+    return static_cast<Result>(
+      d.vkGetBufferOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkBufferCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getBufferOpaqueCaptureDescriptorDataEXT( const BufferCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
+    Device::getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24247,33 +22244,28 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetBufferOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetBufferOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkBufferCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getBufferOpaqueCaptureDescriptorDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getBufferOpaqueCaptureDescriptorDataEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT * pInfo,
-                                                                                                void *                                    pData,
-                                                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageOpaqueCaptureDescriptorDataEXT(
+    const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetImageOpaqueCaptureDescriptorDataEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
+    return static_cast<Result>(
+      d.vkGetImageOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkImageCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
+    Device::getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24281,33 +22273,28 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetImageOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkImageCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageOpaqueCaptureDescriptorDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageOpaqueCaptureDescriptorDataEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT * pInfo,
-                                                                                                    void *                                        pData,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getImageViewOpaqueCaptureDescriptorDataEXT(
+    const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetImageViewOpaqueCaptureDescriptorDataEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageViewCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
+    return static_cast<Result>(
+      d.vkGetImageViewOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkImageViewCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
+    Device::getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24315,33 +22302,28 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetImageViewOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetImageViewOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkImageViewCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageViewOpaqueCaptureDescriptorDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageViewOpaqueCaptureDescriptorDataEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSamplerOpaqueCaptureDescriptorDataEXT( const SamplerCaptureDescriptorDataInfoEXT * pInfo,
-                                                                                                  void *                                      pData,
-                                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSamplerOpaqueCaptureDescriptorDataEXT(
+    const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSamplerOpaqueCaptureDescriptorDataEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSamplerCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
+    return static_cast<Result>(
+      d.vkGetSamplerOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkSamplerCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getSamplerOpaqueCaptureDescriptorDataEXT( const SamplerCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
+    Device::getSamplerOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24349,32 +22331,29 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetSamplerOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetSamplerOpaqueCaptureDescriptorDataEXT( m_device, reinterpret_cast<const VkSamplerCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSamplerOpaqueCaptureDescriptorDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSamplerOpaqueCaptureDescriptorDataEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-    const AccelerationStructureCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
+      m_device, reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( pInfo ), pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-    Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const AccelerationStructureCaptureDescriptorDataInfoEXT & info, Dispatch const & d ) const
+    Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT & info,
+                                                                    Dispatch const &                                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24382,65 +22361,59 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
       m_device, reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_fragment_shading_rate_enums ===
 
-  // wrapper function for command vkCmdSetFragmentShadingRateEnumNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateEnumNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateEnumNV( FragmentShadingRateNV                  shadingRate,
-                                                                      const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                                                      Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateEnumNV( VULKAN_HPP_NAMESPACE::FragmentShadingRateNV                  shadingRate,
+                                                                      const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                                                      Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetFragmentShadingRateEnumNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                         static_cast<VkFragmentShadingRateNV>( shadingRate ),
-                                         reinterpret_cast<const VkFragmentShadingRateCombinerOpKHR *>( combinerOps ) );
+    d.vkCmdSetFragmentShadingRateEnumNV(
+      m_commandBuffer, static_cast<VkFragmentShadingRateNV>( shadingRate ), reinterpret_cast<const VkFragmentShadingRateCombinerOpKHR *>( combinerOps ) );
   }
 
   //=== VK_EXT_mesh_shader ===
 
-  // wrapper function for command vkCmdDrawMeshTasksEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
     CommandBuffer::drawMeshTasksEXT( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
+    d.vkCmdDrawMeshTasksEXT( m_commandBuffer, groupCountX, groupCountY, groupCountZ );
   }
 
-  // wrapper function for command vkCmdDrawMeshTasksIndirectEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectEXT(
-    Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                  VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                  uint32_t                         drawCount,
+                                                                  uint32_t                         stride,
+                                                                  Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksIndirectEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
+    d.vkCmdDrawMeshTasksIndirectEXT( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
   }
 
-  // wrapper function for command vkCmdDrawMeshTasksIndirectCountEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountEXT( Buffer           buffer,
-                                                                       DeviceSize       offset,
-                                                                       Buffer           countBuffer,
-                                                                       DeviceSize       countBufferOffset,
-                                                                       uint32_t         maxDrawCount,
-                                                                       uint32_t         stride,
-                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                       VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                       uint32_t                         maxDrawCount,
+                                                                       uint32_t                         stride,
+                                                                       Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMeshTasksIndirectCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdDrawMeshTasksIndirectCountEXT( m_commandBuffer,
                                           static_cast<VkBuffer>( buffer ),
                                           static_cast<VkDeviceSize>( offset ),
                                           static_cast<VkBuffer>( countBuffer ),
@@ -24451,18 +22424,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_copy_commands2 ===
 
-  // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const CopyBufferInfo2 * pCopyBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 * pCopyBufferInfo,
+                                                        Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBuffer2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferInfo2 *>( pCopyBufferInfo ) );
+    d.vkCmdCopyBuffer2KHR( m_commandBuffer, reinterpret_cast<const VkCopyBufferInfo2 *>( pCopyBufferInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const CopyBufferInfo2 & copyBufferInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo,
+                                                        Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24473,18 +22446,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const CopyImageInfo2 * pCopyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
+                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageInfo2 *>( pCopyImageInfo ) );
+    d.vkCmdCopyImage2KHR( m_commandBuffer, reinterpret_cast<const VkCopyImageInfo2 *>( pCopyImageInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const CopyImageInfo2 & copyImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo,
+                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24495,21 +22468,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyBufferToImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkCopyBufferToImageInfo2 *>( pCopyBufferToImageInfo ) );
+    d.vkCmdCopyBufferToImage2KHR( m_commandBuffer, reinterpret_cast<const VkCopyBufferToImageInfo2 *>( pCopyBufferToImageInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const CopyBufferToImageInfo2 & copyBufferToImageInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24520,21 +22490,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyImageToBuffer2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkCopyImageToBufferInfo2 *>( pCopyImageToBufferInfo ) );
+    d.vkCmdCopyImageToBuffer2KHR( m_commandBuffer, reinterpret_cast<const VkCopyImageToBufferInfo2 *>( pCopyImageToBufferInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const CopyImageToBufferInfo2 & copyImageToBufferInfo,
-                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo,
+                                                               Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24545,18 +22512,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const BlitImageInfo2 * pBlitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
+                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBlitImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkBlitImageInfo2 *>( pBlitImageInfo ) );
+    d.vkCmdBlitImage2KHR( m_commandBuffer, reinterpret_cast<const VkBlitImageInfo2 *>( pBlitImageInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const BlitImageInfo2 & blitImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo,
+                                                       Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24567,18 +22534,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const ResolveImageInfo2 * pResolveImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
+                                                          Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdResolveImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkResolveImageInfo2 *>( pResolveImageInfo ) );
+    d.vkCmdResolveImage2KHR( m_commandBuffer, reinterpret_cast<const VkResolveImageInfo2 *>( pResolveImageInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const ResolveImageInfo2 & resolveImageInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo,
+                                                          Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24591,79 +22558,124 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_device_fault ===
 
-  // wrapper function for command vkGetDeviceFaultInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceFaultInfoEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFaultInfoEXT( DeviceFaultCountsEXT * pFaultCounts,
-                                                                         DeviceFaultInfoEXT *   pFaultInfo,
-                                                                         Dispatch const &       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFaultInfoEXT( VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT * pFaultCounts,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT *   pFaultInfo,
+                                                                         Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetDeviceFaultInfoEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<VkDeviceFaultCountsEXT *>( pFaultCounts ), reinterpret_cast<VkDeviceFaultInfoEXT *>( pFaultInfo ) ) );
+      m_device, reinterpret_cast<VkDeviceFaultCountsEXT *>( pFaultCounts ), reinterpret_cast<VkDeviceFaultInfoEXT *>( pFaultInfo ) ) );
   }
 
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>>::type
+    Device::getFaultInfoEXT( Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkGetDeviceFaultInfoEXT && "Function <vkGetDeviceFaultInfoEXT> requires <VK_EXT_device_fault>" );
+#  endif
+
+    std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT> data_;
+    VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT &                                                    faultCounts = data_.first;
+    VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT &                                                      faultInfo   = data_.second;
+    VULKAN_HPP_NAMESPACE::Result                                                                    result;
+    do
+    {
+      result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeviceFaultInfoEXT( m_device, reinterpret_cast<VkDeviceFaultCountsEXT *>( &faultCounts ), nullptr ) );
+      if ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+        std::free( faultInfo.pAddressInfos );
+        if ( faultCounts.addressInfoCount )
+        {
+          faultInfo.pAddressInfos = reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT *>(
+            std::malloc( faultCounts.addressInfoCount * sizeof( VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT ) ) );
+        }
+        std::free( faultInfo.pVendorInfos );
+        if ( faultCounts.vendorInfoCount )
+        {
+          faultInfo.pVendorInfos = reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT *>(
+            std::malloc( faultCounts.vendorInfoCount * sizeof( VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT ) ) );
+        }
+        std::free( faultInfo.pVendorBinaryData );
+        if ( faultCounts.vendorBinarySize )
+        {
+          faultInfo.pVendorBinaryData = std::malloc( faultCounts.vendorBinarySize );
+        }
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeviceFaultInfoEXT(
+          m_device, reinterpret_cast<VkDeviceFaultCountsEXT *>( &faultCounts ), reinterpret_cast<VkDeviceFaultInfoEXT *>( &faultInfo ) ) );
+      }
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultInfoEXT", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncomplete } );
+
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+  }
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_NV_acquire_winrt_display ===
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireWinrtDisplayNV( DisplayKHR display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::acquireWinrtDisplayNV( VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                                                       Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireWinrtDisplayNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( display ) ) );
+    return static_cast<Result>( d.vkAcquireWinrtDisplayNV( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
   }
 #  else
-  // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          PhysicalDevice::acquireWinrtDisplayNV( DisplayKHR display, Dispatch const & d ) const
+    PhysicalDevice::acquireWinrtDisplayNV( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkAcquireWinrtDisplayNV && "Function <vkAcquireWinrtDisplayNV> requires <VK_NV_acquire_winrt_display>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkAcquireWinrtDisplayNV( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireWinrtDisplayNV" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkAcquireWinrtDisplayNV( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireWinrtDisplayNV" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getWinrtDisplayNV( uint32_t         deviceRelativeId,
-                                                                                   DisplayKHR *     pDisplay,
-                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getWinrtDisplayNV( uint32_t                           deviceRelativeId,
+                                                                                   VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplay,
+                                                                                   Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetWinrtDisplayNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( pDisplay ) ) );
+    return static_cast<Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( pDisplay ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type PhysicalDevice::getWinrtDisplayNV( uint32_t         deviceRelativeId,
-                                                                                                                       Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
+                       PhysicalDevice::getWinrtDisplayNV( uint32_t deviceRelativeId, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetWinrtDisplayNV && "Function <vkGetWinrtDisplayNV> requires <VK_NV_acquire_winrt_display>" );
 #    endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNV" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNV" );
 
-    return detail::createResultValueType( result, std::move( display ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( display ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
                        PhysicalDevice::getWinrtDisplayNVUnique( uint32_t deviceRelativeId, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -24671,11 +22683,13 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetWinrtDisplayNV && "Function <vkGetWinrtDisplayNV> requires <VK_NV_acquire_winrt_display>" );
 #      endif
 
-    DisplayKHR display;
-    Result     result = static_cast<Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNVUnique" );
+    VULKAN_HPP_NAMESPACE::DisplayKHR display;
+    VULKAN_HPP_NAMESPACE::Result     result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNVUnique" );
 
-    return detail::createResultValueType( result, UniqueHandle<DisplayKHR, Dispatch>( display, detail::ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>( display, ObjectRelease<PhysicalDevice, Dispatch>( *this, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -24684,84 +22698,81 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
   //=== VK_EXT_directfb_surface ===
 
-  // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDirectFBSurfaceEXT( const DirectFBSurfaceCreateInfoEXT * pCreateInfo,
-                                                                                    const AllocationCallbacks *          pAllocator,
-                                                                                    SurfaceKHR *                         pSurface,
-                                                                                    Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createDirectFBSurfaceEXT( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT * pCreateInfo,
+                                                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                                                    VULKAN_HPP_NAMESPACE::SurfaceKHR *                         pSurface,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDirectFBSurfaceEXT( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateDirectFBSurfaceEXT( m_instance,
                                                               reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( pCreateInfo ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                               reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type Instance::createDirectFBSurfaceEXT(
-    const DirectFBSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createDirectFBSurfaceEXT( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT & createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                        Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDirectFBSurfaceEXT && "Function <vkCreateDirectFBSurfaceEXT> requires <VK_EXT_directfb_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateDirectFBSurfaceEXT( m_instance,
-                                                                       reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDirectFBSurfaceEXT" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDirectFBSurfaceEXT(
+      m_instance,
+      reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDirectFBSurfaceEXT" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createDirectFBSurfaceEXTUnique(
-    const DirectFBSurfaceCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createDirectFBSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT & createInfo,
+                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>  allocator,
+                                              Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateDirectFBSurfaceEXT && "Function <vkCreateDirectFBSurfaceEXT> requires <VK_EXT_directfb_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateDirectFBSurfaceEXT( m_instance,
-                                                                       reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDirectFBSurfaceEXTUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateDirectFBSurfaceEXT(
+      m_instance,
+      reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createDirectFBSurfaceEXTUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t         queueFamilyIndex,
                                                                               IDirectFB *      dfb,
                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>(
-      d.vkGetPhysicalDeviceDirectFBPresentationSupportEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, dfb ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceDirectFBPresentationSupportEXT( m_physicalDevice, queueFamilyIndex, dfb ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE Bool32 PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t         queueFamilyIndex,
-                                                                              IDirectFB &      dfb,
-                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+    PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t queueFamilyIndex, IDirectFB & dfb, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24771,23 +22782,22 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkBool32 result = d.vkGetPhysicalDeviceDirectFBPresentationSupportEXT( m_physicalDevice, queueFamilyIndex, &dfb );
 
-    return static_cast<Bool32>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
   //=== VK_EXT_vertex_input_dynamic_state ===
 
-  // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setVertexInputEXT( uint32_t                                    vertexBindingDescriptionCount,
-                                                           const VertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
-                                                           uint32_t                                    vertexAttributeDescriptionCount,
-                                                           const VertexInputAttributeDescription2EXT * pVertexAttributeDescriptions,
-                                                           Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setVertexInputEXT( uint32_t                                                          vertexBindingDescriptionCount,
+                                                           const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
+                                                           uint32_t                                                          vertexAttributeDescriptionCount,
+                                                           const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT * pVertexAttributeDescriptions,
+                                                           Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetVertexInputEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdSetVertexInputEXT( m_commandBuffer,
                               vertexBindingDescriptionCount,
                               reinterpret_cast<const VkVertexInputBindingDescription2EXT *>( pVertexBindingDescriptions ),
                               vertexAttributeDescriptionCount,
@@ -24795,11 +22805,11 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setVertexInputEXT( ArrayProxy<const VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
-                                                           ArrayProxy<const VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions,
-                                                           Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setVertexInputEXT(
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
+    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions,
+    Dispatch const &                                                                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24817,62 +22827,57 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_external_memory ===
 
-  // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                                                                      zx_handle_t *                            pZirconHandle,
-                                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                          zx_handle_t *                                                  pZirconHandle,
+                                          Dispatch const &                                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryZirconHandleFUCHSIA(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA *>( pGetZirconHandleInfo ), pZirconHandle ) );
+    return static_cast<Result>(
+      d.vkGetMemoryZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA *>( pGetZirconHandleInfo ), pZirconHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<zx_handle_t>::type
-                       Device::getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo, Dispatch const & d ) const
+    Device::getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryZirconHandleFUCHSIA && "Function <vkGetMemoryZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_memory>" );
 #    endif
 
-    zx_handle_t zirconHandle;
-    Result      result = static_cast<Result>(
+    zx_handle_t                  zirconHandle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetMemoryZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA *>( &getZirconHandleInfo ), &zirconHandle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandleFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandleFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( zirconHandle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( zirconHandle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits      handleType,
-                                                    zx_handle_t                           zirconHandle,
-                                                    MemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties,
-                                                    Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+    Device::getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits      handleType,
+                                                    zx_handle_t                                                 zirconHandle,
+                                                    VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties,
+                                                    Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetMemoryZirconHandlePropertiesFUCHSIA( static_cast<VkDevice>( m_device ),
+      d.vkGetMemoryZirconHandlePropertiesFUCHSIA( m_device,
                                                   static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                   zirconHandle,
                                                   reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA *>( pMemoryZirconHandleProperties ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryZirconHandlePropertiesFUCHSIA>::type
-    Device::getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA>::type
+                       Device::getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                                    zx_handle_t                                            zirconHandle,
+                                                    Dispatch const &                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -24880,15 +22885,15 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetMemoryZirconHandlePropertiesFUCHSIA> requires <VK_FUCHSIA_external_memory>" );
 #    endif
 
-    MemoryZirconHandlePropertiesFUCHSIA memoryZirconHandleProperties;
-    Result                              result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA memoryZirconHandleProperties;
+    VULKAN_HPP_NAMESPACE::Result                              result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetMemoryZirconHandlePropertiesFUCHSIA( m_device,
                                                   static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                   zirconHandle,
                                                   reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA *>( &memoryZirconHandleProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandlePropertiesFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandlePropertiesFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( memoryZirconHandleProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryZirconHandleProperties ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
@@ -24896,67 +22901,61 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_external_semaphore ===
 
-  // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::importSemaphoreZirconHandleFUCHSIA(
-    const ImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkImportSemaphoreZirconHandleFUCHSIA(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA *>( pImportSemaphoreZirconHandleInfo ) ) );
+      m_device, reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA *>( pImportSemaphoreZirconHandleInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo, Dispatch const & d ) const
+    Device::importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo,
+                                                Dispatch const &                                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkImportSemaphoreZirconHandleFUCHSIA && "Function <vkImportSemaphoreZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_semaphore>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkImportSemaphoreZirconHandleFUCHSIA(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkImportSemaphoreZirconHandleFUCHSIA(
       m_device, reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA *>( &importSemaphoreZirconHandleInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreZirconHandleFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreZirconHandleFUCHSIA" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                                                                         zx_handle_t *                               pZirconHandle,
-                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                             zx_handle_t *                                                     pZirconHandle,
+                                             Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSemaphoreZirconHandleFUCHSIA(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA *>( pGetZirconHandleInfo ), pZirconHandle ) );
+    return static_cast<Result>(
+      d.vkGetSemaphoreZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA *>( pGetZirconHandleInfo ), pZirconHandle ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<zx_handle_t>::type
-                       Device::getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo, Dispatch const & d ) const
+    Device::getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetSemaphoreZirconHandleFUCHSIA && "Function <vkGetSemaphoreZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_semaphore>" );
 #    endif
 
-    zx_handle_t zirconHandle;
-    Result      result = static_cast<Result>(
+    zx_handle_t                  zirconHandle;
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetSemaphoreZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA *>( &getZirconHandleInfo ), &zirconHandle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreZirconHandleFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreZirconHandleFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( zirconHandle ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( zirconHandle ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
@@ -24964,90 +22963,86 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_buffer_collection ===
 
-  // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createBufferCollectionFUCHSIA( const BufferCollectionCreateInfoFUCHSIA * pCreateInfo,
-                                                                                       const AllocationCallbacks *               pAllocator,
-                                                                                       BufferCollectionFUCHSIA *                 pCollection,
-                                                                                       Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::createBufferCollectionFUCHSIA( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA * pCreateInfo,
+                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                           VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA *                 pCollection,
+                                           Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateBufferCollectionFUCHSIA( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateBufferCollectionFUCHSIA( m_device,
                                                                    reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( pCreateInfo ),
                                                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                    reinterpret_cast<VkBufferCollectionFUCHSIA *>( pCollection ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferCollectionFUCHSIA>::type Device::createBufferCollectionFUCHSIA(
-    const BufferCollectionCreateInfoFUCHSIA & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>::type
+                       Device::createBufferCollectionFUCHSIA( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA & createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                           Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateBufferCollectionFUCHSIA && "Function <vkCreateBufferCollectionFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 #    endif
 
-    BufferCollectionFUCHSIA collection;
-    Result                  result = static_cast<Result>( d.vkCreateBufferCollectionFUCHSIA( m_device,
-                                                                            reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferCollectionFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateBufferCollectionFUCHSIA(
+      m_device,
+      reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferCollectionFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( collection ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( collection ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<BufferCollectionFUCHSIA, Dispatch>>::type
-                       Device::createBufferCollectionFUCHSIAUnique( const BufferCollectionCreateInfoFUCHSIA & createInfo,
-                                                 Optional<const AllocationCallbacks>       allocator,
-                                                 Dispatch const &                          d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA, Dispatch>>::type
+                       Device::createBufferCollectionFUCHSIAUnique( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA & createInfo,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>       allocator,
+                                                 Dispatch const &                                                d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateBufferCollectionFUCHSIA && "Function <vkCreateBufferCollectionFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 #      endif
 
-    BufferCollectionFUCHSIA collection;
-    Result                  result = static_cast<Result>( d.vkCreateBufferCollectionFUCHSIA( m_device,
-                                                                            reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferCollectionFUCHSIAUnique" );
+    VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection;
+    VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateBufferCollectionFUCHSIA(
+      m_device,
+      reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createBufferCollectionFUCHSIAUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<BufferCollectionFUCHSIA, Dispatch>( collection, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA, Dispatch>( collection, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setBufferCollectionImageConstraintsFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                                                                    const ImageConstraintsInfoFUCHSIA * pImageConstraintsInfo,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::setBufferCollectionImageConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                        const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA * pImageConstraintsInfo,
+                                                        Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkSetBufferCollectionImageConstraintsFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                      static_cast<VkBufferCollectionFUCHSIA>( collection ),
-                                                      reinterpret_cast<const VkImageConstraintsInfoFUCHSIA *>( pImageConstraintsInfo ) ) );
+    return static_cast<Result>( d.vkSetBufferCollectionImageConstraintsFUCHSIA(
+      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkImageConstraintsInfoFUCHSIA *>( pImageConstraintsInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setBufferCollectionImageConstraintsFUCHSIA(
-    BufferCollectionFUCHSIA collection, const ImageConstraintsInfoFUCHSIA & imageConstraintsInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          Device::setBufferCollectionImageConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                        const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA & imageConstraintsInfo,
+                                                        Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25055,33 +23050,31 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkSetBufferCollectionImageConstraintsFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkSetBufferCollectionImageConstraintsFUCHSIA(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkSetBufferCollectionImageConstraintsFUCHSIA(
       m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkImageConstraintsInfoFUCHSIA *>( &imageConstraintsInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setBufferCollectionImageConstraintsFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setBufferCollectionImageConstraintsFUCHSIA" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setBufferCollectionBufferConstraintsFUCHSIA(
-    BufferCollectionFUCHSIA collection, const BufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::setBufferCollectionBufferConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA              collection,
+                                                         const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo,
+                                                         Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkSetBufferCollectionBufferConstraintsFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                       static_cast<VkBufferCollectionFUCHSIA>( collection ),
-                                                       reinterpret_cast<const VkBufferConstraintsInfoFUCHSIA *>( pBufferConstraintsInfo ) ) );
+    return static_cast<Result>( d.vkSetBufferCollectionBufferConstraintsFUCHSIA(
+      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkBufferConstraintsInfoFUCHSIA *>( pBufferConstraintsInfo ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setBufferCollectionBufferConstraintsFUCHSIA(
-    BufferCollectionFUCHSIA collection, const BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          Device::setBufferCollectionBufferConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA              collection,
+                                                         const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo,
+                                                         Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25089,33 +23082,29 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkSetBufferCollectionBufferConstraintsFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 #    endif
 
-    Result result = static_cast<Result>( d.vkSetBufferCollectionBufferConstraintsFUCHSIA(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkSetBufferCollectionBufferConstraintsFUCHSIA(
       m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkBufferConstraintsInfoFUCHSIA *>( &bufferConstraintsInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setBufferCollectionBufferConstraintsFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setBufferCollectionBufferConstraintsFUCHSIA" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyBufferCollectionFUCHSIA( BufferCollectionFUCHSIA     collection,
-                                                                 const AllocationCallbacks * pAllocator,
-                                                                 Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
+                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                 Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyBufferCollectionFUCHSIA(
-      static_cast<VkDevice>( m_device ), static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyBufferCollectionFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                                 Optional<const AllocationCallbacks> allocator,
-                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25123,27 +23112,27 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif
 
     d.vkDestroyBufferCollectionFUCHSIA(
-      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkBufferCollectionFUCHSIA>( collection ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( BufferCollectionFUCHSIA collection, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkDestroyBufferCollectionFUCHSIA(
-      static_cast<VkDevice>( m_device ), static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( BufferCollectionFUCHSIA collection, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25151,29 +23140,27 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif
 
     d.vkDestroyBufferCollectionFUCHSIA(
-      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkBufferCollectionFUCHSIA>( collection ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getBufferCollectionPropertiesFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                                                              BufferCollectionPropertiesFUCHSIA * pProperties,
-                                                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getBufferCollectionPropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                  VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA * pProperties,
+                                                  Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetBufferCollectionPropertiesFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                                          static_cast<VkBufferCollectionFUCHSIA>( collection ),
-                                                                          reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetBufferCollectionPropertiesFUCHSIA(
+      m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( pProperties ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferCollectionPropertiesFUCHSIA>::type
-                       Device::getBufferCollectionPropertiesFUCHSIA( BufferCollectionFUCHSIA collection, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA>::type
+                       Device::getBufferCollectionPropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25181,36 +23168,32 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetBufferCollectionPropertiesFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 #    endif
 
-    BufferCollectionPropertiesFUCHSIA properties;
-    Result                            result = static_cast<Result>( d.vkGetBufferCollectionPropertiesFUCHSIA(
+    VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA properties;
+    VULKAN_HPP_NAMESPACE::Result                            result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetBufferCollectionPropertiesFUCHSIA(
       m_device, static_cast<VkBufferCollectionFUCHSIA>( collection ), reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getBufferCollectionPropertiesFUCHSIA" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getBufferCollectionPropertiesFUCHSIA" );
 
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
   //=== VK_HUAWEI_subpass_shading ===
 
-  // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSubpassShadingMaxWorkgroupSizeHUAWEI( RenderPass       renderpass,
-                                                                                                 Extent2D *       pMaxWorkgroupSize,
-                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getSubpassShadingMaxWorkgroupSizeHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderpass,
+                                                                                                 VULKAN_HPP_NAMESPACE::Extent2D * pMaxWorkgroupSize,
+                                                                                                 Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
-      static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( renderpass ), reinterpret_cast<VkExtent2D *>( pMaxWorkgroupSize ) ) );
+      m_device, static_cast<VkRenderPass>( renderpass ), reinterpret_cast<VkExtent2D *>( pMaxWorkgroupSize ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Extent2D>::type Device::getSubpassShadingMaxWorkgroupSizeHUAWEI( RenderPass       renderpass,
-                                                                                                                                   Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::Extent2D>::type
+                       Device::getSubpassShadingMaxWorkgroupSizeHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderpass, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25218,229 +23201,213 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI> requires <VK_HUAWEI_subpass_shading>" );
 #  endif
 
-    Extent2D maxWorkgroupSize;
-    Result   result = static_cast<Result>( d.vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
+    VULKAN_HPP_NAMESPACE::Extent2D maxWorkgroupSize;
+    VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
       m_device, static_cast<VkRenderPass>( renderpass ), reinterpret_cast<VkExtent2D *>( &maxWorkgroupSize ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSubpassShadingMaxWorkgroupSizeHUAWEI" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSubpassShadingMaxWorkgroupSizeHUAWEI" );
 
-    return detail::createResultValueType( result, std::move( maxWorkgroupSize ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( maxWorkgroupSize ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSubpassShadingHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSubpassShadingHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::subpassShadingHUAWEI( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSubpassShadingHUAWEI( static_cast<VkCommandBuffer>( m_commandBuffer ) );
+    d.vkCmdSubpassShadingHUAWEI( m_commandBuffer );
   }
 
   //=== VK_HUAWEI_invocation_mask ===
 
-  // wrapper function for command vkCmdBindInvocationMaskHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindInvocationMaskHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindInvocationMaskHUAWEI( ImageView imageView, ImageLayout imageLayout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                                                  VULKAN_HPP_NAMESPACE::ImageLayout imageLayout,
+                                                                  Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindInvocationMaskHUAWEI(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkImageView>( imageView ), static_cast<VkImageLayout>( imageLayout ) );
+    d.vkCmdBindInvocationMaskHUAWEI( m_commandBuffer, static_cast<VkImageView>( imageView ), static_cast<VkImageLayout>( imageLayout ) );
   }
 
   //=== VK_NV_external_memory_rdma ===
 
-  // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
-                                                                                  RemoteAddressNV *                    pAddress,
-                                                                                  Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    Device::getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
+                                      VULKAN_HPP_NAMESPACE::RemoteAddressNV *                    pAddress,
+                                      Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryRemoteAddressNV( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkMemoryGetRemoteAddressInfoNV *>( pMemoryGetRemoteAddressInfo ),
-                                                              reinterpret_cast<VkRemoteAddressNV *>( pAddress ) ) );
+    return static_cast<Result>( d.vkGetMemoryRemoteAddressNV(
+      m_device, reinterpret_cast<const VkMemoryGetRemoteAddressInfoNV *>( pMemoryGetRemoteAddressInfo ), reinterpret_cast<VkRemoteAddressNV *>( pAddress ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RemoteAddressNV>::type
-                       Device::getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::RemoteAddressNV>::type
+    Device::getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMemoryRemoteAddressNV && "Function <vkGetMemoryRemoteAddressNV> requires <VK_NV_external_memory_rdma>" );
 #  endif
 
-    RemoteAddressNV address;
-    Result          result = static_cast<Result>( d.vkGetMemoryRemoteAddressNV(
+    VULKAN_HPP_NAMESPACE::RemoteAddressNV address;
+    VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetMemoryRemoteAddressNV(
       m_device, reinterpret_cast<const VkMemoryGetRemoteAddressInfoNV *>( &memoryGetRemoteAddressInfo ), reinterpret_cast<VkRemoteAddressNV *>( &address ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryRemoteAddressNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryRemoteAddressNV" );
 
-    return detail::createResultValueType( result, std::move( address ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( address ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_pipeline_properties ===
 
-  // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelinePropertiesEXT( const PipelineInfoEXT * pPipelineInfo,
-                                                                                  BaseOutStructure *      pPipelineProperties,
-                                                                                  Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT * pPipelineInfo,
+                                                                                  VULKAN_HPP_NAMESPACE::BaseOutStructure *      pPipelineProperties,
+                                                                                  Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPipelinePropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkPipelineInfoEXT *>( pPipelineInfo ),
-                                                              reinterpret_cast<VkBaseOutStructure *>( pPipelineProperties ) ) );
+    return static_cast<Result>( d.vkGetPipelinePropertiesEXT(
+      m_device, reinterpret_cast<const VkPipelineInfoEXT *>( pPipelineInfo ), reinterpret_cast<VkBaseOutStructure *>( pPipelineProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BaseOutStructure>::type
-                       Device::getPipelinePropertiesEXT( const PipelineInfoEXT & pipelineInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::BaseOutStructure>::type
+                       Device::getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT & pipelineInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetPipelinePropertiesEXT && "Function <vkGetPipelinePropertiesEXT> requires <VK_EXT_pipeline_properties>" );
 #  endif
 
-    BaseOutStructure pipelineProperties;
-    Result           result = static_cast<Result>( d.vkGetPipelinePropertiesEXT(
+    VULKAN_HPP_NAMESPACE::BaseOutStructure pipelineProperties;
+    VULKAN_HPP_NAMESPACE::Result           result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPipelinePropertiesEXT(
       m_device, reinterpret_cast<const VkPipelineInfoEXT *>( &pipelineInfo ), reinterpret_cast<VkBaseOutStructure *>( &pipelineProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelinePropertiesEXT" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelinePropertiesEXT" );
 
-    return detail::createResultValueType( result, std::move( pipelineProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_extended_dynamic_state2 ===
 
-  // wrapper function for command vkCmdSetPatchControlPointsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPatchControlPointsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setPatchControlPointsEXT( uint32_t patchControlPoints, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPatchControlPointsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), patchControlPoints );
+    d.vkCmdSetPatchControlPointsEXT( m_commandBuffer, patchControlPoints );
   }
 
-  // wrapper function for command vkCmdSetRasterizerDiscardEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnableEXT( Bool32 rasterizerDiscardEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable,
+                                                                       Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRasterizerDiscardEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( rasterizerDiscardEnable ) );
+    d.vkCmdSetRasterizerDiscardEnableEXT( m_commandBuffer, static_cast<VkBool32>( rasterizerDiscardEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthBiasEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnableEXT( Bool32 depthBiasEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthBiasEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBiasEnable ) );
+    d.vkCmdSetDepthBiasEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthBiasEnable ) );
   }
 
-  // wrapper function for command vkCmdSetLogicOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEXT( LogicOp logicOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEXT( VULKAN_HPP_NAMESPACE::LogicOp logicOp, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLogicOpEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkLogicOp>( logicOp ) );
+    d.vkCmdSetLogicOpEXT( m_commandBuffer, static_cast<VkLogicOp>( logicOp ) );
   }
 
-  // wrapper function for command vkCmdSetPrimitiveRestartEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnableEXT( Bool32 primitiveRestartEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable,
+                                                                      Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPrimitiveRestartEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( primitiveRestartEnable ) );
+    d.vkCmdSetPrimitiveRestartEnableEXT( m_commandBuffer, static_cast<VkBool32>( primitiveRestartEnable ) );
   }
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_screen_surface ===
 
-  // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createScreenSurfaceQNX( const ScreenSurfaceCreateInfoQNX * pCreateInfo,
-                                                                                  const AllocationCallbacks *        pAllocator,
-                                                                                  SurfaceKHR *                       pSurface,
-                                                                                  Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createScreenSurfaceQNX( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX * pCreateInfo,
+                                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *        pAllocator,
+                                                                                  VULKAN_HPP_NAMESPACE::SurfaceKHR *                       pSurface,
+                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateScreenSurfaceQNX( static_cast<VkInstance>( m_instance ),
+    return static_cast<Result>( d.vkCreateScreenSurfaceQNX( m_instance,
                                                             reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( pCreateInfo ),
                                                             reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                             reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createScreenSurfaceQNX( const ScreenSurfaceCreateInfoQNX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+                       Instance::createScreenSurfaceQNX( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX &  createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                      Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateScreenSurfaceQNX && "Function <vkCreateScreenSurfaceQNX> requires <VK_QNX_screen_surface>" );
 #    endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateScreenSurfaceQNX( m_instance,
-                                                                     reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createScreenSurfaceQNX" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateScreenSurfaceQNX(
+      m_instance,
+      reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createScreenSurfaceQNX" );
 
-    return detail::createResultValueType( result, std::move( surface ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surface ) );
   }
 
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type Instance::createScreenSurfaceQNXUnique(
-    const ScreenSurfaceCreateInfoQNX & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+                       Instance::createScreenSurfaceQNXUnique( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX &  createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                            Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateScreenSurfaceQNX && "Function <vkCreateScreenSurfaceQNX> requires <VK_QNX_screen_surface>" );
 #      endif
 
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateScreenSurfaceQNX( m_instance,
-                                                                     reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createScreenSurfaceQNXUnique" );
+    VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
+    VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateScreenSurfaceQNX(
+      m_instance,
+      reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createScreenSurfaceQNXUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>( surface, ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
   }
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE Bool32 PhysicalDevice::getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
                                                                             struct _screen_window * window,
                                                                             Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Bool32>(
-      d.vkGetPhysicalDeviceScreenPresentationSupportQNX( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, window ) );
+    return static_cast<Bool32>( d.vkGetPhysicalDeviceScreenPresentationSupportQNX( m_physicalDevice, queueFamilyIndex, window ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE Bool32 PhysicalDevice::getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
-                                                                            struct _screen_window & window,
-                                                                            Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+    PhysicalDevice::getScreenPresentationSupportQNX( uint32_t queueFamilyIndex, struct _screen_window & window, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25450,27 +23417,26 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkBool32 result = d.vkGetPhysicalDeviceScreenPresentationSupportQNX( m_physicalDevice, queueFamilyIndex, &window );
 
-    return static_cast<Bool32>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
   //=== VK_EXT_color_write_enable ===
 
-  // wrapper function for command vkCmdSetColorWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setColorWriteEnableEXT( uint32_t attachmentCount, const Bool32 * pColorWriteEnables, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteEnableEXT( uint32_t                             attachmentCount,
+                                                                const VULKAN_HPP_NAMESPACE::Bool32 * pColorWriteEnables,
+                                                                Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetColorWriteEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), attachmentCount, reinterpret_cast<const VkBool32 *>( pColorWriteEnables ) );
+    d.vkCmdSetColorWriteEnableEXT( m_commandBuffer, attachmentCount, reinterpret_cast<const VkBool32 *>( pColorWriteEnables ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetColorWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteEnableEXT( ArrayProxy<const Bool32> const & colorWriteEnables,
-                                                                Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteEnableEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables,
+                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25483,41 +23449,34 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_ray_tracing_maintenance1 ===
 
-  // wrapper function for command vkCmdTraceRaysIndirect2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirect2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirect2KHR( DeviceAddress indirectDeviceAddress, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirect2KHR( VULKAN_HPP_NAMESPACE::DeviceAddress indirectDeviceAddress,
+                                                               Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdTraceRaysIndirect2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDeviceAddress>( indirectDeviceAddress ) );
+    d.vkCmdTraceRaysIndirect2KHR( m_commandBuffer, static_cast<VkDeviceAddress>( indirectDeviceAddress ) );
   }
 
   //=== VK_EXT_multi_draw ===
 
-  // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMultiEXT( uint32_t                 drawCount,
-                                                      const MultiDrawInfoEXT * pVertexInfo,
-                                                      uint32_t                 instanceCount,
-                                                      uint32_t                 firstInstance,
-                                                      uint32_t                 stride,
-                                                      Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMultiEXT( uint32_t                                       drawCount,
+                                                      const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT * pVertexInfo,
+                                                      uint32_t                                       instanceCount,
+                                                      uint32_t                                       firstInstance,
+                                                      uint32_t                                       stride,
+                                                      Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMultiEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                         drawCount,
-                         reinterpret_cast<const VkMultiDrawInfoEXT *>( pVertexInfo ),
-                         instanceCount,
-                         firstInstance,
-                         stride );
+    d.vkCmdDrawMultiEXT( m_commandBuffer, drawCount, reinterpret_cast<const VkMultiDrawInfoEXT *>( pVertexInfo ), instanceCount, firstInstance, stride );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMultiEXT( StridedArrayProxy<const MultiDrawInfoEXT> const & vertexInfo,
-                                                      uint32_t                                          instanceCount,
-                                                      uint32_t                                          firstInstance,
-                                                      Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMultiEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT> const & vertexInfo,
+                                                      uint32_t         instanceCount,
+                                                      uint32_t         firstInstance,
+                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25533,34 +23492,28 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMultiIndexedEXT( uint32_t                        drawCount,
-                                                             const MultiDrawIndexedInfoEXT * pIndexInfo,
-                                                             uint32_t                        instanceCount,
-                                                             uint32_t                        firstInstance,
-                                                             uint32_t                        stride,
-                                                             const int32_t *                 pVertexOffset,
-                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawMultiIndexedEXT( uint32_t                                              drawCount,
+                                                             const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT * pIndexInfo,
+                                                             uint32_t                                              instanceCount,
+                                                             uint32_t                                              firstInstance,
+                                                             uint32_t                                              stride,
+                                                             const int32_t *                                       pVertexOffset,
+                                                             Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawMultiIndexedEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                drawCount,
-                                reinterpret_cast<const VkMultiDrawIndexedInfoEXT *>( pIndexInfo ),
-                                instanceCount,
-                                firstInstance,
-                                stride,
-                                pVertexOffset );
+    d.vkCmdDrawMultiIndexedEXT(
+      m_commandBuffer, drawCount, reinterpret_cast<const VkMultiDrawIndexedInfoEXT *>( pIndexInfo ), instanceCount, firstInstance, stride, pVertexOffset );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawMultiIndexedEXT( StridedArrayProxy<const MultiDrawIndexedInfoEXT> const & indexInfo,
-                                                             uint32_t                                                 instanceCount,
-                                                             uint32_t                                                 firstInstance,
-                                                             Optional<const int32_t>                                  vertexOffset,
-                                                             Dispatch const &                                         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::drawMultiIndexedEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT> const & indexInfo,
+                                        uint32_t                                                                                             instanceCount,
+                                        uint32_t                                                                                             firstInstance,
+                                        Optional<const int32_t>                                                                              vertexOffset,
+                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25573,132 +23526,139 @@ namespace VULKAN_HPP_NAMESPACE
                                 instanceCount,
                                 firstInstance,
                                 indexInfo.stride(),
-                                vertexOffset.get() );
+                                static_cast<const int32_t *>( vertexOffset ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_opacity_micromap ===
 
-  // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createMicromapEXT( const MicromapCreateInfoEXT * pCreateInfo,
-                                                                           const AllocationCallbacks *   pAllocator,
-                                                                           MicromapEXT *                 pMicromap,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createMicromapEXT( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT * pCreateInfo,
+                                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                                           VULKAN_HPP_NAMESPACE::MicromapEXT *                 pMicromap,
+                                                                           Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateMicromapEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateMicromapEXT( m_device,
                                                        reinterpret_cast<const VkMicromapCreateInfoEXT *>( pCreateInfo ),
                                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                        reinterpret_cast<VkMicromapEXT *>( pMicromap ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MicromapEXT>::type
-    Device::createMicromapEXT( const MicromapCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::MicromapEXT>::type
+                       Device::createMicromapEXT( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT &       createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                               Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMicromapEXT && "Function <vkCreateMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    MicromapEXT micromap;
-    Result      result = static_cast<Result>( d.vkCreateMicromapEXT( m_device,
-                                                                reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createMicromapEXT" );
+    VULKAN_HPP_NAMESPACE::MicromapEXT micromap;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMicromapEXT( m_device,
+                             reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createMicromapEXT" );
 
-    return detail::createResultValueType( result, std::move( micromap ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( micromap ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<MicromapEXT, Dispatch>>::type
-    Device::createMicromapEXTUnique( const MicromapCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::MicromapEXT, Dispatch>>::type
+                       Device::createMicromapEXTUnique( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT &       createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                     Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateMicromapEXT && "Function <vkCreateMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #    endif
 
-    MicromapEXT micromap;
-    Result      result = static_cast<Result>( d.vkCreateMicromapEXT( m_device,
-                                                                reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createMicromapEXTUnique" );
+    VULKAN_HPP_NAMESPACE::MicromapEXT micromap;
+    VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateMicromapEXT( m_device,
+                             reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
+                             reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                             reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createMicromapEXTUnique" );
 
-    return detail::createResultValueType( result,
-                                          UniqueHandle<MicromapEXT, Dispatch>( micromap, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::MicromapEXT, Dispatch>( micromap, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyMicromapEXT( MicromapEXT micromap, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                     Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyMicromapEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyMicromapEXT( m_device, static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyMicromapEXT( MicromapEXT micromap, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT                         micromap,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                     Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyMicromapEXT && "Function <vkDestroyMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    d.vkDestroyMicromapEXT( m_device, static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyMicromapEXT( m_device,
+                            static_cast<VkMicromapEXT>( micromap ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( MicromapEXT micromap, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyMicromapEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyMicromapEXT( m_device, static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( MicromapEXT micromap, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                         micromap,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyMicromapEXT && "Function <vkDestroyMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    d.vkDestroyMicromapEXT( m_device, static_cast<VkMicromapEXT>( micromap ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyMicromapEXT( m_device,
+                            static_cast<VkMicromapEXT>( micromap ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::buildMicromapsEXT( uint32_t infoCount, const MicromapBuildInfoEXT * pInfos, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT( uint32_t                                           infoCount,
+                                                           const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT * pInfos,
+                                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildMicromapsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), infoCount, reinterpret_cast<const VkMicromapBuildInfoEXT *>( pInfos ) );
+    d.vkCmdBuildMicromapsEXT( m_commandBuffer, infoCount, reinterpret_cast<const VkMicromapBuildInfoEXT *>( pInfos ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT( ArrayProxy<const MicromapBuildInfoEXT> const & infos, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos,
+                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25709,173 +23669,156 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::buildMicromapsEXT( DeferredOperationKHR         deferredOperation,
-                                                                           uint32_t                     infoCount,
-                                                                           const MicromapBuildInfoEXT * pInfos,
-                                                                           Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR         deferredOperation,
+                                                                           uint32_t                                           infoCount,
+                                                                           const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT * pInfos,
+                                                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBuildMicromapsEXT( static_cast<VkDevice>( m_device ),
-                                                       static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                       infoCount,
-                                                       reinterpret_cast<const VkMicromapBuildInfoEXT *>( pInfos ) ) );
+    return static_cast<Result>( d.vkBuildMicromapsEXT(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), infoCount, reinterpret_cast<const VkMicromapBuildInfoEXT *>( pInfos ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::buildMicromapsEXT( DeferredOperationKHR                           deferredOperation,
-                                                                           ArrayProxy<const MicromapBuildInfoEXT> const & infos,
-                                                                           Dispatch const &                               d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                         Device::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                 deferredOperation,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos,
+                               Dispatch const &                                                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBuildMicromapsEXT && "Function <vkBuildMicromapsEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkBuildMicromapsEXT(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkBuildMicromapsEXT(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), infos.size(), reinterpret_cast<const VkMicromapBuildInfoEXT *>( infos.data() ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::buildMicromapsEXT",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::buildMicromapsEXT",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapEXT( DeferredOperationKHR        deferredOperation,
-                                                                         const CopyMicromapInfoEXT * pInfo,
-                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
+                                                                         const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo,
+                                                                         Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyMicromapEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMicromapInfoEXT *>( pInfo ) ) );
+    return static_cast<Result>(
+      d.vkCopyMicromapEXT( m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMicromapInfoEXT *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapEXT( DeferredOperationKHR        deferredOperation,
-                                                                         const CopyMicromapInfoEXT & info,
-                                                                         Dispatch const &            d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                                                               const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info,
+                                                                                               Dispatch const &                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCopyMicromapEXT && "Function <vkCopyMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkCopyMicromapEXT( m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMicromapInfoEXT *>( &info ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapEXT", { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapEXT",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapToMemoryEXT( DeferredOperationKHR                deferredOperation,
-                                                                                 const CopyMicromapToMemoryInfoEXT * pInfo,
-                                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                                 const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyMicromapToMemoryEXT( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                             reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( pInfo ) ) );
+    return static_cast<Result>( d.vkCopyMicromapToMemoryEXT(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapToMemoryEXT( DeferredOperationKHR                deferredOperation,
-                                                                                 const CopyMicromapToMemoryInfoEXT & info,
-                                                                                 Dispatch const &                    d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::copyMicromapToMemoryEXT(
+    VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation, const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCopyMicromapToMemoryEXT && "Function <vkCopyMicromapToMemoryEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyMicromapToMemoryEXT(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCopyMicromapToMemoryEXT(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( &info ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapToMemoryEXT",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapToMemoryEXT",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToMicromapEXT( DeferredOperationKHR                deferredOperation,
-                                                                                 const CopyMemoryToMicromapInfoEXT * pInfo,
-                                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                                 const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
+                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCopyMemoryToMicromapEXT( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                             reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( pInfo ) ) );
+    return static_cast<Result>( d.vkCopyMemoryToMicromapEXT(
+      m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToMicromapEXT( DeferredOperationKHR                deferredOperation,
-                                                                                 const CopyMemoryToMicromapInfoEXT & info,
-                                                                                 Dispatch const &                    d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::copyMemoryToMicromapEXT(
+    VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation, const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCopyMemoryToMicromapEXT && "Function <vkCopyMemoryToMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkCopyMemoryToMicromapEXT(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCopyMemoryToMicromapEXT(
       m_device, static_cast<VkDeferredOperationKHR>( deferredOperation ), reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( &info ) ) );
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToMicromapEXT",
-                         { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck(
+      result,
+      VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToMicromapEXT",
+      { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR, VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-    return static_cast<Result>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::writeMicromapsPropertiesEXT( uint32_t            micromapCount,
-                                                                                     const MicromapEXT * pMicromaps,
-                                                                                     QueryType           queryType,
-                                                                                     size_t              dataSize,
-                                                                                     void *              pData,
-                                                                                     size_t              stride,
-                                                                                     Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
+                                                                                     const VULKAN_HPP_NAMESPACE::MicromapEXT * pMicromaps,
+                                                                                     VULKAN_HPP_NAMESPACE::QueryType           queryType,
+                                                                                     size_t                                    dataSize,
+                                                                                     void *                                    pData,
+                                                                                     size_t                                    stride,
+                                                                                     Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWriteMicromapsPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                 micromapCount,
-                                                                 reinterpret_cast<const VkMicromapEXT *>( pMicromaps ),
-                                                                 static_cast<VkQueryType>( queryType ),
-                                                                 dataSize,
-                                                                 pData,
-                                                                 stride ) );
+    return static_cast<Result>( d.vkWriteMicromapsPropertiesEXT(
+      m_device, micromapCount, reinterpret_cast<const VkMicromapEXT *>( pMicromaps ), static_cast<VkQueryType>( queryType ), dataSize, pData, stride ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-  template <typename DataType,
-            typename DataTypeAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type Device::writeMicromapsPropertiesEXT(
-    ArrayProxy<const MicromapEXT> const & micromaps, QueryType queryType, size_t dataSize, size_t stride, Dispatch const & d ) const
+  template <typename DataType, typename DataTypeAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
+                       Device::writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                         VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                         size_t                                                                            dataSize,
+                                         size_t                                                                            stride,
+                                         Dispatch const &                                                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25884,55 +23827,56 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
     std::vector<DataType, DataTypeAllocator> data( dataSize / sizeof( DataType ) );
-    Result                                   result = static_cast<Result>( d.vkWriteMicromapsPropertiesEXT( m_device,
-                                                                          micromaps.size(),
-                                                                          reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
-                                                                          static_cast<VkQueryType>( queryType ),
-                                                                          data.size() * sizeof( DataType ),
-                                                                          reinterpret_cast<void *>( data.data() ),
-                                                                          stride ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertiesEXT" );
+    VULKAN_HPP_NAMESPACE::Result             result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkWriteMicromapsPropertiesEXT( m_device,
+                                                                                  micromaps.size(),
+                                                                                  reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
+                                                                                  static_cast<VkQueryType>( queryType ),
+                                                                                  data.size() * sizeof( DataType ),
+                                                                                  reinterpret_cast<void *>( data.data() ),
+                                                                                  stride ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertiesEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename DataType, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-    Device::writeMicromapsPropertyEXT( ArrayProxy<const MicromapEXT> const & micromaps, QueryType queryType, size_t stride, Dispatch const & d ) const
+                       Device::writeMicromapsPropertyEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                       VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                       size_t                                                                            stride,
+                                       Dispatch const &                                                                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkWriteMicromapsPropertiesEXT && "Function <vkWriteMicromapsPropertiesEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    DataType data;
-    Result   result = static_cast<Result>( d.vkWriteMicromapsPropertiesEXT( m_device,
-                                                                          micromaps.size(),
-                                                                          reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
-                                                                          static_cast<VkQueryType>( queryType ),
-                                                                          sizeof( DataType ),
-                                                                          reinterpret_cast<void *>( &data ),
-                                                                          stride ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertyEXT" );
+    DataType                     data;
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkWriteMicromapsPropertiesEXT( m_device,
+                                                                                  micromaps.size(),
+                                                                                  reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
+                                                                                  static_cast<VkQueryType>( queryType ),
+                                                                                  sizeof( DataType ),
+                                                                                  reinterpret_cast<void *>( &data ),
+                                                                                  stride ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertyEXT" );
 
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const CopyMicromapInfoEXT * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMicromapEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyMicromapInfoEXT *>( pInfo ) );
+    d.vkCmdCopyMicromapEXT( m_commandBuffer, reinterpret_cast<const VkCopyMicromapInfoEXT *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const CopyMicromapInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25943,18 +23887,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMicromapToMemoryEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( pInfo ) );
+    d.vkCmdCopyMicromapToMemoryEXT( m_commandBuffer, reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25965,18 +23909,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT * pInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryToMicromapEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( pInfo ) );
+    d.vkCmdCopyMemoryToMicromapEXT( m_commandBuffer, reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( pInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info,
+                                                                 Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -25987,18 +23931,16 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeMicromapsPropertiesEXT( uint32_t            micromapCount,
-                                                                     const MicromapEXT * pMicromaps,
-                                                                     QueryType           queryType,
-                                                                     QueryPool           queryPool,
-                                                                     uint32_t            firstQuery,
-                                                                     Dispatch const &    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
+                                                                     const VULKAN_HPP_NAMESPACE::MicromapEXT * pMicromaps,
+                                                                     VULKAN_HPP_NAMESPACE::QueryType           queryType,
+                                                                     VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                                                     uint32_t                                  firstQuery,
+                                                                     Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdWriteMicromapsPropertiesEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdWriteMicromapsPropertiesEXT( m_commandBuffer,
                                         micromapCount,
                                         reinterpret_cast<const VkMicromapEXT *>( pMicromaps ),
                                         static_cast<VkQueryType>( queryType ),
@@ -26007,14 +23949,13 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::writeMicromapsPropertiesEXT( ArrayProxy<const MicromapEXT> const & micromaps,
-                                                                     QueryType                             queryType,
-                                                                     QueryPool                             queryPool,
-                                                                     uint32_t                              firstQuery,
-                                                                     Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                                VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                                VULKAN_HPP_NAMESPACE::QueryPool                                                   queryPool,
+                                                uint32_t                                                                          firstQuery,
+                                                Dispatch const &                                                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26030,32 +23971,28 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getMicromapCompatibilityEXT( const MicromapVersionInfoEXT *          pVersionInfo,
-                                                              AccelerationStructureCompatibilityKHR * pCompatibility,
-                                                              Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT *          pVersionInfo,
+                                                              VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR * pCompatibility,
+                                                              Dispatch const &                                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceMicromapCompatibilityEXT( static_cast<VkDevice>( m_device ),
+    d.vkGetDeviceMicromapCompatibilityEXT( m_device,
                                            reinterpret_cast<const VkMicromapVersionInfoEXT *>( pVersionInfo ),
                                            reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( pCompatibility ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureCompatibilityKHR
-    Device::getMicromapCompatibilityEXT( const MicromapVersionInfoEXT & versionInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+    Device::getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT & versionInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDeviceMicromapCompatibilityEXT && "Function <vkGetDeviceMicromapCompatibilityEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    AccelerationStructureCompatibilityKHR compatibility;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR compatibility;
     d.vkGetDeviceMicromapCompatibilityEXT( m_device,
                                            reinterpret_cast<const VkMicromapVersionInfoEXT *>( &versionInfo ),
                                            reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( &compatibility ) );
@@ -26064,33 +24001,32 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType,
-                                                           const MicromapBuildInfoEXT *      pBuildInfo,
-                                                           MicromapBuildSizesInfoEXT *       pSizeInfo,
-                                                           Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                                           const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT *      pBuildInfo,
+                                                           VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT *       pSizeInfo,
+                                                           Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetMicromapBuildSizesEXT( static_cast<VkDevice>( m_device ),
+    d.vkGetMicromapBuildSizesEXT( m_device,
                                   static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                   reinterpret_cast<const VkMicromapBuildInfoEXT *>( pBuildInfo ),
                                   reinterpret_cast<VkMicromapBuildSizesInfoEXT *>( pSizeInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MicromapBuildSizesInfoEXT Device::getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType,
-                                                                                                     const MicromapBuildInfoEXT &      buildInfo,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT
+                                         Device::getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                      const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT &      buildInfo,
+                                      Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetMicromapBuildSizesEXT && "Function <vkGetMicromapBuildSizesEXT> requires <VK_EXT_opacity_micromap>" );
 #  endif
 
-    MicromapBuildSizesInfoEXT sizeInfo;
+    VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT sizeInfo;
     d.vkGetMicromapBuildSizesEXT( m_device,
                                   static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                   reinterpret_cast<const VkMicromapBuildInfoEXT *>( &buildInfo ),
@@ -26102,55 +24038,48 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_HUAWEI_cluster_culling_shader ===
 
-  // wrapper function for command vkCmdDrawClusterHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
     CommandBuffer::drawClusterHUAWEI( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawClusterHUAWEI( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
+    d.vkCmdDrawClusterHUAWEI( m_commandBuffer, groupCountX, groupCountY, groupCountZ );
   }
 
-  // wrapper function for command vkCmdDrawClusterIndirectHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterIndirectHUAWEI.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::drawClusterIndirectHUAWEI( Buffer buffer, DeviceSize offset, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                   VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                   Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDrawClusterIndirectHUAWEI( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
+    d.vkCmdDrawClusterIndirectHUAWEI( m_commandBuffer, static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
   }
 
   //=== VK_EXT_pageable_device_local_memory ===
 
-  // wrapper function for command vkSetDeviceMemoryPriorityEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDeviceMemoryPriorityEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::setMemoryPriorityEXT( DeviceMemory memory, float priority, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setMemoryPriorityEXT( VULKAN_HPP_NAMESPACE::DeviceMemory memory, float priority, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkSetDeviceMemoryPriorityEXT( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( memory ), priority );
+    d.vkSetDeviceMemoryPriorityEXT( m_device, static_cast<VkDeviceMemory>( memory ), priority );
   }
 
   //=== VK_KHR_maintenance4 ===
 
-  // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements * pInfo,
-                                                                 MemoryRequirements2 *                  pMemoryRequirements,
-                                                                 Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements * pInfo,
+                                                                 VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                  pMemoryRequirements,
+                                                                 Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceBufferMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
-                                              reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( pInfo ),
-                                              reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+    d.vkGetDeviceBufferMemoryRequirementsKHR(
+      m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26158,18 +24087,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceBufferMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetDeviceBufferMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info,
-                                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26177,8 +24104,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceBufferMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetDeviceBufferMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
@@ -26186,25 +24113,20 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements * pInfo,
-                                                                MemoryRequirements2 *                 pMemoryRequirements,
-                                                                Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                                                VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                                                Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceImageMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
-                                             reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ),
-                                             reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+    d.vkGetDeviceImageMemoryRequirementsKHR(
+      m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+    Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26212,18 +24134,16 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceImageMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetDeviceImageMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info,
-                                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26231,8 +24151,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceImageMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetDeviceImageMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
@@ -26240,31 +24160,23 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements * pInfo,
-                                                                      uint32_t *                            pSparseMemoryRequirementCount,
-                                                                      SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
-                                                                      Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                                                      uint32_t *                                                  pSparseMemoryRequirementCount,
+                                                                      VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
+                                                                      Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceImageSparseMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
+    d.vkGetDeviceImageSparseMemoryRequirementsKHR( m_device,
                                                    reinterpret_cast<const VkDeviceImageMemoryRequirements *>( pInfo ),
                                                    pSparseMemoryRequirementCount,
                                                    reinterpret_cast<VkSparseImageMemoryRequirements2 *>( pSparseMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info, Dispatch const & d ) const
+  template <typename SparseImageMemoryRequirements2Allocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+    Device::getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26272,8 +24184,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceImageSparseMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
-    uint32_t                                                                             sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements;
+    uint32_t                                                                                                   sparseMemoryRequirementCount;
     d.vkGetDeviceImageSparseMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -26290,17 +24202,15 @@ namespace VULKAN_HPP_NAMESPACE
     return sparseMemoryRequirements;
   }
 
-  // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-  template <
-    typename SparseImageMemoryRequirements2Allocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                                         Device::getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements &     info,
-                                                 SparseImageMemoryRequirements2Allocator & sparseImageMemoryRequirements2Allocator,
-                                                 Dispatch const &                          d ) const
+  template <typename SparseImageMemoryRequirements2Allocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                                         Device::getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                 SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
+                                                 Dispatch const &                                            d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26308,8 +24218,9 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDeviceImageSparseMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 #  endif
 
-    std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements( sparseImageMemoryRequirements2Allocator );
-    uint32_t                                                                             sparseMemoryRequirementCount;
+    std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator> sparseMemoryRequirements(
+      sparseImageMemoryRequirements2Allocator );
+    uint32_t sparseMemoryRequirementCount;
     d.vkGetDeviceImageSparseMemoryRequirementsKHR(
       m_device, reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
     sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -26329,25 +24240,22 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_VALVE_descriptor_set_host_mapping ===
 
-  // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutHostMappingInfoVALVE( const DescriptorSetBindingReferenceVALVE * pBindingReference,
-                                                                             DescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping,
-                                                                             Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getDescriptorSetLayoutHostMappingInfoVALVE( const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE * pBindingReference,
+                                                                             VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping,
+                                                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetLayoutHostMappingInfoVALVE( static_cast<VkDevice>( m_device ),
+    d.vkGetDescriptorSetLayoutHostMappingInfoVALVE( m_device,
                                                     reinterpret_cast<const VkDescriptorSetBindingReferenceVALVE *>( pBindingReference ),
                                                     reinterpret_cast<VkDescriptorSetLayoutHostMappingInfoVALVE *>( pHostMapping ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutHostMappingInfoVALVE Device::getDescriptorSetLayoutHostMappingInfoVALVE(
-    const DescriptorSetBindingReferenceVALVE & bindingReference, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE
+    Device::getDescriptorSetLayoutHostMappingInfoVALVE( const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE & bindingReference,
+                                                        Dispatch const &                                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26355,7 +24263,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetDescriptorSetLayoutHostMappingInfoVALVE> requires <VK_VALVE_descriptor_set_host_mapping>" );
 #  endif
 
-    DescriptorSetLayoutHostMappingInfoVALVE hostMapping;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE hostMapping;
     d.vkGetDescriptorSetLayoutHostMappingInfoVALVE( m_device,
                                                     reinterpret_cast<const VkDescriptorSetBindingReferenceVALVE *>( &bindingReference ),
                                                     reinterpret_cast<VkDescriptorSetLayoutHostMappingInfoVALVE *>( &hostMapping ) );
@@ -26364,21 +24272,18 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDescriptorSetHostMappingVALVE( DescriptorSet descriptorSet, void ** ppData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    Device::getDescriptorSetHostMappingVALVE( VULKAN_HPP_NAMESPACE::DescriptorSet descriptorSet, void ** ppData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDescriptorSetHostMappingVALVE( static_cast<VkDevice>( m_device ), static_cast<VkDescriptorSet>( descriptorSet ), ppData );
+    d.vkGetDescriptorSetHostMappingVALVE( m_device, static_cast<VkDescriptorSet>( descriptorSet ), ppData );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE void * Device::getDescriptorSetHostMappingVALVE( DescriptorSet    descriptorSet,
-                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE void * Device::getDescriptorSetHostMappingVALVE( VULKAN_HPP_NAMESPACE::DescriptorSet descriptorSet,
+                                                                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26395,28 +24300,27 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_copy_memory_indirect ===
 
-  // wrapper function for command vkCmdCopyMemoryIndirectNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::copyMemoryIndirectNV( DeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress copyBufferAddress,
+                                                              uint32_t                            copyCount,
+                                                              uint32_t                            stride,
+                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryIndirectNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDeviceAddress>( copyBufferAddress ), copyCount, stride );
+    d.vkCmdCopyMemoryIndirectNV( m_commandBuffer, static_cast<VkDeviceAddress>( copyBufferAddress ), copyCount, stride );
   }
 
-  // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectNV( DeviceAddress                  copyBufferAddress,
-                                                                     uint32_t                       copyCount,
-                                                                     uint32_t                       stride,
-                                                                     Image                          dstImage,
-                                                                     ImageLayout                    dstImageLayout,
-                                                                     const ImageSubresourceLayers * pImageSubresources,
-                                                                     Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress                  copyBufferAddress,
+                                                                     uint32_t                                             copyCount,
+                                                                     uint32_t                                             stride,
+                                                                     VULKAN_HPP_NAMESPACE::Image                          dstImage,
+                                                                     VULKAN_HPP_NAMESPACE::ImageLayout                    dstImageLayout,
+                                                                     const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers * pImageSubresources,
+                                                                     Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryToImageIndirectNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdCopyMemoryToImageIndirectNV( m_commandBuffer,
                                         static_cast<VkDeviceAddress>( copyBufferAddress ),
                                         copyCount,
                                         stride,
@@ -26426,15 +24330,14 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectNV( DeviceAddress                                    copyBufferAddress,
-                                                                     uint32_t                                         stride,
-                                                                     Image                                            dstImage,
-                                                                     ImageLayout                                      dstImageLayout,
-                                                                     ArrayProxy<const ImageSubresourceLayers> const & imageSubresources,
-                                                                     Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::copyMemoryToImageIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress                                                          copyBufferAddress,
+                                                uint32_t                                                                                     stride,
+                                                VULKAN_HPP_NAMESPACE::Image                                                                  dstImage,
+                                                VULKAN_HPP_NAMESPACE::ImageLayout                                                            dstImageLayout,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers> const & imageSubresources,
+                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26453,23 +24356,20 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_memory_decompression ===
 
-  // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryNV( uint32_t                         decompressRegionCount,
-                                                            const DecompressMemoryRegionNV * pDecompressMemoryRegions,
-                                                            Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryNV( uint32_t                                               decompressRegionCount,
+                                                            const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV * pDecompressMemoryRegions,
+                                                            Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDecompressMemoryNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                               decompressRegionCount,
-                               reinterpret_cast<const VkDecompressMemoryRegionNV *>( pDecompressMemoryRegions ) );
+    d.vkCmdDecompressMemoryNV( m_commandBuffer, decompressRegionCount, reinterpret_cast<const VkDecompressMemoryRegionNV *>( pDecompressMemoryRegions ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryNV( ArrayProxy<const DecompressMemoryRegionNV> const & decompressMemoryRegions,
-                                                            Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::decompressMemoryNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV> const & decompressMemoryRegions,
+                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26481,42 +24381,34 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdDecompressMemoryIndirectCountNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountNV( DeviceAddress    indirectCommandsAddress,
-                                                                         DeviceAddress    indirectCommandsCountAddress,
-                                                                         uint32_t         stride,
-                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsCountAddress,
+                                                                         uint32_t                            stride,
+                                                                         Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDecompressMemoryIndirectCountNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                            static_cast<VkDeviceAddress>( indirectCommandsAddress ),
-                                            static_cast<VkDeviceAddress>( indirectCommandsCountAddress ),
-                                            stride );
+    d.vkCmdDecompressMemoryIndirectCountNV(
+      m_commandBuffer, static_cast<VkDeviceAddress>( indirectCommandsAddress ), static_cast<VkDeviceAddress>( indirectCommandsCountAddress ), stride );
   }
 
   //=== VK_NV_device_generated_commands_compute ===
 
-  // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo * pCreateInfo,
-                                                                          MemoryRequirements2 *             pMemoryRequirements,
-                                                                          Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo * pCreateInfo,
+                                                                          VULKAN_HPP_NAMESPACE::MemoryRequirements2 *             pMemoryRequirements,
+                                                                          Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPipelineIndirectMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
-                                                 reinterpret_cast<const VkComputePipelineCreateInfo *>( pCreateInfo ),
-                                                 reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
+    d.vkGetPipelineIndirectMemoryRequirementsNV(
+      m_device, reinterpret_cast<const VkComputePipelineCreateInfo *>( pCreateInfo ), reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo,
-                                                                                                              Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                                         Device::getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo,
+                                                     Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26524,18 +24416,17 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineIndirectMemoryRequirementsNV> requires <VK_NV_device_generated_commands_compute>" );
 #  endif
 
-    MemoryRequirements2 memoryRequirements;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
     d.vkGetPipelineIndirectMemoryRequirementsNV(
       m_device, reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
     return memoryRequirements;
   }
 
-  // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                         Device::getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo,
+                                                     Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26543,8 +24434,8 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPipelineIndirectMemoryRequirementsNV> requires <VK_NV_device_generated_commands_compute>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
     d.vkGetPipelineIndirectMemoryRequirementsNV(
       m_device, reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
@@ -26552,34 +24443,28 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdUpdatePipelineIndirectBufferNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdatePipelineIndirectBufferNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::updatePipelineIndirectBufferNV( PipelineBindPoint pipelineBindPoint, Pipeline pipeline, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                        VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                                                        Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdUpdatePipelineIndirectBufferNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
+    d.vkCmdUpdatePipelineIndirectBufferNV( m_commandBuffer, static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
   }
 
-  // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV * pInfo,
-                                                                        Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE DeviceAddress Device::getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV * pInfo,
+                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<DeviceAddress>(
-      d.vkGetPipelineIndirectDeviceAddressNV( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkPipelineIndirectDeviceAddressInfoNV *>( pInfo ) ) );
+      d.vkGetPipelineIndirectDeviceAddressNV( m_device, reinterpret_cast<const VkPipelineIndirectDeviceAddressInfoNV *>( pInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE DeviceAddress Device::getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV & info,
-                                                                        Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+    Device::getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26589,141 +24474,48 @@ namespace VULKAN_HPP_NAMESPACE
 
     VkDeviceAddress result = d.vkGetPipelineIndirectDeviceAddressNV( m_device, reinterpret_cast<const VkPipelineIndirectDeviceAddressInfoNV *>( &info ) );
 
-    return static_cast<DeviceAddress>( result );
+    return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-
-  // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer * buffer,
-                                                                                       NativeBufferPropertiesOHOS *   pProperties,
-                                                                                       Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetNativeBufferPropertiesOHOS( static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( pProperties ) ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<NativeBufferPropertiesOHOS>::type
-                       Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetNativeBufferPropertiesOHOS && "Function <vkGetNativeBufferPropertiesOHOS> requires <VK_OHOS_external_memory>" );
-#    endif
-
-    NativeBufferPropertiesOHOS properties;
-    Result                     result =
-      static_cast<Result>( d.vkGetNativeBufferPropertiesOHOS( m_device, &buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getNativeBufferPropertiesOHOS" );
-
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-
-  // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                       Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetNativeBufferPropertiesOHOS && "Function <vkGetNativeBufferPropertiesOHOS> requires <VK_OHOS_external_memory>" );
-#    endif
-
-    StructureChain<X, Y, Z...>   structureChain;
-    NativeBufferPropertiesOHOS & properties = structureChain.template get<NativeBufferPropertiesOHOS>();
-    Result                       result =
-      static_cast<Result>( d.vkGetNativeBufferPropertiesOHOS( m_device, &buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getNativeBufferPropertiesOHOS" );
-
-    return detail::createResultValueType( result, std::move( structureChain ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetMemoryNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS * pInfo,
-                                                                                   struct OH_NativeBuffer **             pBuffer,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetMemoryNativeBufferOHOS( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetNativeBufferInfoOHOS *>( pInfo ), pBuffer ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<struct OH_NativeBuffer *>::type
-                       Device::getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetMemoryNativeBufferOHOS && "Function <vkGetMemoryNativeBufferOHOS> requires <VK_OHOS_external_memory>" );
-#    endif
-
-    struct OH_NativeBuffer * buffer;
-    Result                   result =
-      static_cast<Result>( d.vkGetMemoryNativeBufferOHOS( m_device, reinterpret_cast<const VkMemoryGetNativeBufferInfoOHOS *>( &info ), &buffer ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryNativeBufferOHOS" );
-
-    return detail::createResultValueType( result, std::move( buffer ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_extended_dynamic_state3 ===
 
-  // wrapper function for command vkCmdSetDepthClampEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthClampEnableEXT( Bool32 depthClampEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthClampEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClampEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthClampEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthClampEnable ) );
+    d.vkCmdSetDepthClampEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthClampEnable ) );
   }
 
-  // wrapper function for command vkCmdSetPolygonModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPolygonModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setPolygonModeEXT( PolygonMode polygonMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setPolygonModeEXT( VULKAN_HPP_NAMESPACE::PolygonMode polygonMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetPolygonModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPolygonMode>( polygonMode ) );
+    d.vkCmdSetPolygonModeEXT( m_commandBuffer, static_cast<VkPolygonMode>( polygonMode ) );
   }
 
-  // wrapper function for command vkCmdSetRasterizationSamplesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationSamplesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRasterizationSamplesEXT( SampleCountFlagBits rasterizationSamples, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRasterizationSamplesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples,
+                                                                    Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRasterizationSamplesEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkSampleCountFlagBits>( rasterizationSamples ) );
+    d.vkCmdSetRasterizationSamplesEXT( m_commandBuffer, static_cast<VkSampleCountFlagBits>( rasterizationSamples ) );
   }
 
-  // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::setSampleMaskEXT( SampleCountFlagBits samples, const SampleMask * pSampleMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                          const VULKAN_HPP_NAMESPACE::SampleMask *  pSampleMask,
+                                                          Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetSampleMaskEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkSampleCountFlagBits>( samples ), reinterpret_cast<const VkSampleMask *>( pSampleMask ) );
+    d.vkCmdSetSampleMaskEXT( m_commandBuffer, static_cast<VkSampleCountFlagBits>( samples ), reinterpret_cast<const VkSampleMask *>( pSampleMask ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setSampleMaskEXT( SampleCountFlagBits                  samples,
-                                                          ArrayProxy<const SampleMask> const & sampleMask,
-                                                          Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits                                        samples,
+                                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SampleMask> const & sampleMask,
+                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26742,49 +24534,43 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetAlphaToCoverageEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToCoverageEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setAlphaToCoverageEnableEXT( Bool32 alphaToCoverageEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable,
+                                                                     Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetAlphaToCoverageEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( alphaToCoverageEnable ) );
+    d.vkCmdSetAlphaToCoverageEnableEXT( m_commandBuffer, static_cast<VkBool32>( alphaToCoverageEnable ) );
   }
 
-  // wrapper function for command vkCmdSetAlphaToOneEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToOneEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setAlphaToOneEnableEXT( Bool32 alphaToOneEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setAlphaToOneEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToOneEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetAlphaToOneEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( alphaToOneEnable ) );
+    d.vkCmdSetAlphaToOneEnableEXT( m_commandBuffer, static_cast<VkBool32>( alphaToOneEnable ) );
   }
 
-  // wrapper function for command vkCmdSetLogicOpEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEnableEXT( Bool32 logicOpEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 logicOpEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLogicOpEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( logicOpEnable ) );
+    d.vkCmdSetLogicOpEnableEXT( m_commandBuffer, static_cast<VkBool32>( logicOpEnable ) );
   }
 
-  // wrapper function for command vkCmdSetColorBlendEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT( uint32_t         firstAttachment,
-                                                                uint32_t         attachmentCount,
-                                                                const Bool32 *   pColorBlendEnables,
-                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT( uint32_t                             firstAttachment,
+                                                                uint32_t                             attachmentCount,
+                                                                const VULKAN_HPP_NAMESPACE::Bool32 * pColorBlendEnables,
+                                                                Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetColorBlendEnableEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstAttachment, attachmentCount, reinterpret_cast<const VkBool32 *>( pColorBlendEnables ) );
+    d.vkCmdSetColorBlendEnableEXT( m_commandBuffer, firstAttachment, attachmentCount, reinterpret_cast<const VkBool32 *>( pColorBlendEnables ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetColorBlendEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT( uint32_t                         firstAttachment,
-                                                                ArrayProxy<const Bool32> const & colorBlendEnables,
-                                                                Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT( uint32_t                                                                     firstAttachment,
+                                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorBlendEnables,
+                                                                Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26796,28 +24582,23 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEquationEXT( uint32_t                      firstAttachment,
-                                                                  uint32_t                      attachmentCount,
-                                                                  const ColorBlendEquationEXT * pColorBlendEquations,
-                                                                  Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEquationEXT( uint32_t                                            firstAttachment,
+                                                                  uint32_t                                            attachmentCount,
+                                                                  const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT * pColorBlendEquations,
+                                                                  Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetColorBlendEquationEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                     firstAttachment,
-                                     attachmentCount,
-                                     reinterpret_cast<const VkColorBlendEquationEXT *>( pColorBlendEquations ) );
+    d.vkCmdSetColorBlendEquationEXT(
+      m_commandBuffer, firstAttachment, attachmentCount, reinterpret_cast<const VkColorBlendEquationEXT *>( pColorBlendEquations ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEquationEXT( uint32_t                                        firstAttachment,
-                                                                  ArrayProxy<const ColorBlendEquationEXT> const & colorBlendEquations,
-                                                                  Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setColorBlendEquationEXT( uint32_t                                                                                    firstAttachment,
+                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT> const & colorBlendEquations,
+                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26830,24 +24611,22 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT( uint32_t                    firstAttachment,
-                                                              uint32_t                    attachmentCount,
-                                                              const ColorComponentFlags * pColorWriteMasks,
-                                                              Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT( uint32_t                                          firstAttachment,
+                                                              uint32_t                                          attachmentCount,
+                                                              const VULKAN_HPP_NAMESPACE::ColorComponentFlags * pColorWriteMasks,
+                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetColorWriteMaskEXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstAttachment, attachmentCount, reinterpret_cast<const VkColorComponentFlags *>( pColorWriteMasks ) );
+    d.vkCmdSetColorWriteMaskEXT( m_commandBuffer, firstAttachment, attachmentCount, reinterpret_cast<const VkColorComponentFlags *>( pColorWriteMasks ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT( uint32_t                                      firstAttachment,
-                                                              ArrayProxy<const ColorComponentFlags> const & colorWriteMasks,
-                                                              Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setColorWriteMaskEXT( uint32_t                                                                                  firstAttachment,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorComponentFlags> const & colorWriteMasks,
+                                         Dispatch const &                                                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26860,84 +24639,70 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetTessellationDomainOriginEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetTessellationDomainOriginEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setTessellationDomainOriginEXT( TessellationDomainOrigin domainOrigin, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setTessellationDomainOriginEXT( VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin,
+                                                                        Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetTessellationDomainOriginEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkTessellationDomainOrigin>( domainOrigin ) );
+    d.vkCmdSetTessellationDomainOriginEXT( m_commandBuffer, static_cast<VkTessellationDomainOrigin>( domainOrigin ) );
   }
 
-  // wrapper function for command vkCmdSetRasterizationStreamEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationStreamEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setRasterizationStreamEXT( uint32_t rasterizationStream, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRasterizationStreamEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), rasterizationStream );
+    d.vkCmdSetRasterizationStreamEXT( m_commandBuffer, rasterizationStream );
   }
 
-  // wrapper function for command vkCmdSetConservativeRasterizationModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetConservativeRasterizationModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setConservativeRasterizationModeEXT( ConservativeRasterizationModeEXT conservativeRasterizationMode,
-                                                                             Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setConservativeRasterizationModeEXT( VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode,
+                                                        Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetConservativeRasterizationModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                static_cast<VkConservativeRasterizationModeEXT>( conservativeRasterizationMode ) );
+    d.vkCmdSetConservativeRasterizationModeEXT( m_commandBuffer, static_cast<VkConservativeRasterizationModeEXT>( conservativeRasterizationMode ) );
   }
 
-  // wrapper function for command vkCmdSetExtraPrimitiveOverestimationSizeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExtraPrimitiveOverestimationSizeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setExtraPrimitiveOverestimationSizeEXT( float            extraPrimitiveOverestimationSize,
                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetExtraPrimitiveOverestimationSizeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), extraPrimitiveOverestimationSize );
+    d.vkCmdSetExtraPrimitiveOverestimationSizeEXT( m_commandBuffer, extraPrimitiveOverestimationSize );
   }
 
-  // wrapper function for command vkCmdSetDepthClipEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthClipEnableEXT( Bool32 depthClipEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthClipEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthClipEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthClipEnable ) );
+    d.vkCmdSetDepthClipEnableEXT( m_commandBuffer, static_cast<VkBool32>( depthClipEnable ) );
   }
 
-  // wrapper function for command vkCmdSetSampleLocationsEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEnableEXT( Bool32 sampleLocationsEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 sampleLocationsEnable,
+                                                                     Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetSampleLocationsEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( sampleLocationsEnable ) );
+    d.vkCmdSetSampleLocationsEnableEXT( m_commandBuffer, static_cast<VkBool32>( sampleLocationsEnable ) );
   }
 
-  // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendAdvancedEXT( uint32_t                      firstAttachment,
-                                                                  uint32_t                      attachmentCount,
-                                                                  const ColorBlendAdvancedEXT * pColorBlendAdvanced,
-                                                                  Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendAdvancedEXT( uint32_t                                            firstAttachment,
+                                                                  uint32_t                                            attachmentCount,
+                                                                  const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT * pColorBlendAdvanced,
+                                                                  Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetColorBlendAdvancedEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                     firstAttachment,
-                                     attachmentCount,
-                                     reinterpret_cast<const VkColorBlendAdvancedEXT *>( pColorBlendAdvanced ) );
+    d.vkCmdSetColorBlendAdvancedEXT(
+      m_commandBuffer, firstAttachment, attachmentCount, reinterpret_cast<const VkColorBlendAdvancedEXT *>( pColorBlendAdvanced ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setColorBlendAdvancedEXT( uint32_t                                        firstAttachment,
-                                                                  ArrayProxy<const ColorBlendAdvancedEXT> const & colorBlendAdvanced,
-                                                                  Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setColorBlendAdvancedEXT( uint32_t                                                                                    firstAttachment,
+                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT> const & colorBlendAdvanced,
+                                             Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -26950,69 +24715,61 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetProvokingVertexModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetProvokingVertexModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setProvokingVertexModeEXT( ProvokingVertexModeEXT provokingVertexMode, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode,
+                                                                   Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetProvokingVertexModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkProvokingVertexModeEXT>( provokingVertexMode ) );
+    d.vkCmdSetProvokingVertexModeEXT( m_commandBuffer, static_cast<VkProvokingVertexModeEXT>( provokingVertexMode ) );
   }
 
-  // wrapper function for command vkCmdSetLineRasterizationModeEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineRasterizationModeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLineRasterizationModeEXT( LineRasterizationModeEXT lineRasterizationMode,
-                                                                     Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setLineRasterizationModeEXT( VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT lineRasterizationMode,
+                                                                     Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineRasterizationModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkLineRasterizationModeEXT>( lineRasterizationMode ) );
+    d.vkCmdSetLineRasterizationModeEXT( m_commandBuffer, static_cast<VkLineRasterizationModeEXT>( lineRasterizationMode ) );
   }
 
-  // wrapper function for command vkCmdSetLineStippleEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setLineStippleEnableEXT( Bool32 stippledLineEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setLineStippleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stippledLineEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineStippleEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stippledLineEnable ) );
+    d.vkCmdSetLineStippleEnableEXT( m_commandBuffer, static_cast<VkBool32>( stippledLineEnable ) );
   }
 
-  // wrapper function for command vkCmdSetDepthClipNegativeOneToOneEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipNegativeOneToOneEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthClipNegativeOneToOneEXT( Bool32 negativeOneToOne, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setDepthClipNegativeOneToOneEXT( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne,
+                                                                         Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthClipNegativeOneToOneEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( negativeOneToOne ) );
+    d.vkCmdSetDepthClipNegativeOneToOneEXT( m_commandBuffer, static_cast<VkBool32>( negativeOneToOne ) );
   }
 
-  // wrapper function for command vkCmdSetViewportWScalingEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingEnableNV( Bool32 viewportWScalingEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingEnableNV( VULKAN_HPP_NAMESPACE::Bool32 viewportWScalingEnable,
+                                                                     Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewportWScalingEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( viewportWScalingEnable ) );
+    d.vkCmdSetViewportWScalingEnableNV( m_commandBuffer, static_cast<VkBool32>( viewportWScalingEnable ) );
   }
 
-  // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportSwizzleNV( uint32_t                  firstViewport,
-                                                              uint32_t                  viewportCount,
-                                                              const ViewportSwizzleNV * pViewportSwizzles,
-                                                              Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setViewportSwizzleNV( uint32_t                                        firstViewport,
+                                                              uint32_t                                        viewportCount,
+                                                              const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV * pViewportSwizzles,
+                                                              Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetViewportSwizzleNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewportCount, reinterpret_cast<const VkViewportSwizzleNV *>( pViewportSwizzles ) );
+    d.vkCmdSetViewportSwizzleNV( m_commandBuffer, firstViewport, viewportCount, reinterpret_cast<const VkViewportSwizzleNV *>( pViewportSwizzles ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setViewportSwizzleNV( uint32_t                                    firstViewport,
-                                                              ArrayProxy<const ViewportSwizzleNV> const & viewportSwizzles,
-                                                              Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setViewportSwizzleNV( uint32_t                                                                                firstViewport,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles,
+                                         Dispatch const &                                                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27025,60 +24782,50 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetCoverageToColorEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorEnableNV( Bool32 coverageToColorEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable,
+                                                                    Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageToColorEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( coverageToColorEnable ) );
+    d.vkCmdSetCoverageToColorEnableNV( m_commandBuffer, static_cast<VkBool32>( coverageToColorEnable ) );
   }
 
-  // wrapper function for command vkCmdSetCoverageToColorLocationNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorLocationNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorLocationNV( uint32_t coverageToColorLocation, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageToColorLocationNV( static_cast<VkCommandBuffer>( m_commandBuffer ), coverageToColorLocation );
+    d.vkCmdSetCoverageToColorLocationNV( m_commandBuffer, coverageToColorLocation );
   }
 
-  // wrapper function for command vkCmdSetCoverageModulationModeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationModeNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationModeNV( CoverageModulationModeNV coverageModulationMode,
-                                                                     Dispatch const &         d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationModeNV( VULKAN_HPP_NAMESPACE::CoverageModulationModeNV coverageModulationMode,
+                                                                     Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageModulationModeNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCoverageModulationModeNV>( coverageModulationMode ) );
+    d.vkCmdSetCoverageModulationModeNV( m_commandBuffer, static_cast<VkCoverageModulationModeNV>( coverageModulationMode ) );
   }
 
-  // wrapper function for command vkCmdSetCoverageModulationTableEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableEnableNV( Bool32 coverageModulationTableEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageModulationTableEnable,
+                                                                            Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageModulationTableEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( coverageModulationTableEnable ) );
+    d.vkCmdSetCoverageModulationTableEnableNV( m_commandBuffer, static_cast<VkBool32>( coverageModulationTableEnable ) );
   }
 
-  // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableNV( uint32_t         coverageModulationTableCount,
                                                                       const float *    pCoverageModulationTable,
                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageModulationTableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), coverageModulationTableCount, pCoverageModulationTable );
+    d.vkCmdSetCoverageModulationTableNV( m_commandBuffer, coverageModulationTableCount, pCoverageModulationTable );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableNV( ArrayProxy<const float> const & coverageModulationTable,
-                                                                      Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const float> const & coverageModulationTable,
+                                                                      Dispatch const &                                      d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27090,559 +24837,73 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetShadingRateImageEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetShadingRateImageEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setShadingRateImageEnableNV( Bool32 shadingRateImageEnable, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable,
+                                                                     Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetShadingRateImageEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( shadingRateImageEnable ) );
+    d.vkCmdSetShadingRateImageEnableNV( m_commandBuffer, static_cast<VkBool32>( shadingRateImageEnable ) );
   }
 
-  // wrapper function for command vkCmdSetRepresentativeFragmentTestEnableNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRepresentativeFragmentTestEnableNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setRepresentativeFragmentTestEnableNV( Bool32           representativeFragmentTestEnable,
-                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setRepresentativeFragmentTestEnableNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable,
+                                                                               Dispatch const &             d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetRepresentativeFragmentTestEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( representativeFragmentTestEnable ) );
+    d.vkCmdSetRepresentativeFragmentTestEnableNV( m_commandBuffer, static_cast<VkBool32>( representativeFragmentTestEnable ) );
   }
 
-  // wrapper function for command vkCmdSetCoverageReductionModeNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageReductionModeNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setCoverageReductionModeNV( CoverageReductionModeNV coverageReductionMode,
-                                                                    Dispatch const &        d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setCoverageReductionModeNV( VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode,
+                                                                    Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetCoverageReductionModeNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCoverageReductionModeNV>( coverageReductionMode ) );
+    d.vkCmdSetCoverageReductionModeNV( m_commandBuffer, static_cast<VkCoverageReductionModeNV>( coverageReductionMode ) );
   }
 
-  //=== VK_ARM_tensors ===
-
-  // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createTensorARM( const TensorCreateInfoARM * pCreateInfo,
-                                                                         const AllocationCallbacks * pAllocator,
-                                                                         TensorARM *                 pTensor,
-                                                                         Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateTensorARM( static_cast<VkDevice>( m_device ),
-                                                     reinterpret_cast<const VkTensorCreateInfoARM *>( pCreateInfo ),
-                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                     reinterpret_cast<VkTensorARM *>( pTensor ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TensorARM>::type
-    Device::createTensorARM( const TensorCreateInfoARM & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateTensorARM && "Function <vkCreateTensorARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    TensorARM tensor;
-    Result    result = static_cast<Result>( d.vkCreateTensorARM( m_device,
-                                                              reinterpret_cast<const VkTensorCreateInfoARM *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkTensorARM *>( &tensor ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createTensorARM" );
-
-    return detail::createResultValueType( result, std::move( tensor ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<TensorARM, Dispatch>>::type
-    Device::createTensorARMUnique( const TensorCreateInfoARM & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateTensorARM && "Function <vkCreateTensorARM> requires <VK_ARM_tensors>" );
-#    endif
-
-    TensorARM tensor;
-    Result    result = static_cast<Result>( d.vkCreateTensorARM( m_device,
-                                                              reinterpret_cast<const VkTensorCreateInfoARM *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkTensorARM *>( &tensor ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createTensorARMUnique" );
-
-    return detail::createResultValueType( result, UniqueHandle<TensorARM, Dispatch>( tensor, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyTensorARM( TensorARM tensor, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyTensorARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkTensorARM>( tensor ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyTensorARM( TensorARM tensor, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyTensorARM && "Function <vkDestroyTensorARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    d.vkDestroyTensorARM( m_device, static_cast<VkTensorARM>( tensor ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( TensorARM tensor, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyTensorARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkTensorARM>( tensor ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( TensorARM tensor, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyTensorARM && "Function <vkDestroyTensorARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    d.vkDestroyTensorARM( m_device, static_cast<VkTensorARM>( tensor ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createTensorViewARM( const TensorViewCreateInfoARM * pCreateInfo,
-                                                                             const AllocationCallbacks *     pAllocator,
-                                                                             TensorViewARM *                 pView,
-                                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateTensorViewARM( static_cast<VkDevice>( m_device ),
-                                                         reinterpret_cast<const VkTensorViewCreateInfoARM *>( pCreateInfo ),
-                                                         reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                         reinterpret_cast<VkTensorViewARM *>( pView ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TensorViewARM>::type
-    Device::createTensorViewARM( const TensorViewCreateInfoARM & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateTensorViewARM && "Function <vkCreateTensorViewARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    TensorViewARM view;
-    Result        result = static_cast<Result>( d.vkCreateTensorViewARM( m_device,
-                                                                  reinterpret_cast<const VkTensorViewCreateInfoARM *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkTensorViewARM *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createTensorViewARM" );
-
-    return detail::createResultValueType( result, std::move( view ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<TensorViewARM, Dispatch>>::type
-    Device::createTensorViewARMUnique( const TensorViewCreateInfoARM & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateTensorViewARM && "Function <vkCreateTensorViewARM> requires <VK_ARM_tensors>" );
-#    endif
-
-    TensorViewARM view;
-    Result        result = static_cast<Result>( d.vkCreateTensorViewARM( m_device,
-                                                                  reinterpret_cast<const VkTensorViewCreateInfoARM *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkTensorViewARM *>( &view ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createTensorViewARMUnique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<TensorViewARM, Dispatch>( view, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyTensorViewARM( TensorViewARM tensorView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyTensorViewARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkTensorViewARM>( tensorView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyTensorViewARM( TensorViewARM tensorView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyTensorViewARM && "Function <vkDestroyTensorViewARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    d.vkDestroyTensorViewARM( m_device, static_cast<VkTensorViewARM>( tensorView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( TensorViewARM tensorView, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyTensorViewARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkTensorViewARM>( tensorView ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( TensorViewARM tensorView, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyTensorViewARM && "Function <vkDestroyTensorViewARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    d.vkDestroyTensorViewARM( m_device, static_cast<VkTensorViewARM>( tensorView ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM * pInfo,
-                                                                 MemoryRequirements2 *                   pMemoryRequirements,
-                                                                 Dispatch const &                        d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                        reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( pInfo ),
-                                        reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetTensorMemoryRequirementsARM && "Function <vkGetTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetTensorMemoryRequirementsARM(
-      m_device, reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info,
-                                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetTensorMemoryRequirementsARM && "Function <vkGetTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetTensorMemoryRequirementsARM(
-      m_device, reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindTensorMemoryARM( uint32_t                        bindInfoCount,
-                                                                             const BindTensorMemoryInfoARM * pBindInfos,
-                                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkBindTensorMemoryARM( static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindTensorMemoryInfoARM *>( pBindInfos ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::bindTensorMemoryARM( ArrayProxy<const BindTensorMemoryInfoARM> const & bindInfos, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkBindTensorMemoryARM && "Function <vkBindTensorMemoryARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    Result result =
-      static_cast<Result>( d.vkBindTensorMemoryARM( m_device, bindInfos.size(), reinterpret_cast<const VkBindTensorMemoryInfoARM *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindTensorMemoryARM" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM * pInfo,
-                                                                 MemoryRequirements2 *                     pMemoryRequirements,
-                                                                 Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDeviceTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                              reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( pInfo ),
-                                              reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceTensorMemoryRequirementsARM && "Function <vkGetDeviceTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetDeviceTensorMemoryRequirementsARM(
-      m_device, reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info,
-                                                                                                            Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceTensorMemoryRequirementsARM && "Function <vkGetDeviceTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetDeviceTensorMemoryRequirementsARM(
-      m_device, reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( &info ), reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyTensorARM( const CopyTensorInfoARM * pCopyTensorInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyTensorARM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyTensorInfoARM *>( pCopyTensorInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyTensorARM( const CopyTensorInfoARM & copyTensorInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyTensorARM && "Function <vkCmdCopyTensorARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    d.vkCmdCopyTensorARM( m_commandBuffer, reinterpret_cast<const VkCopyTensorInfoARM *>( &copyTensorInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getExternalTensorPropertiesARM( const PhysicalDeviceExternalTensorInfoARM * pExternalTensorInfo,
-                                                                         ExternalTensorPropertiesARM *               pExternalTensorProperties,
-                                                                         Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceExternalTensorPropertiesARM( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                      reinterpret_cast<const VkPhysicalDeviceExternalTensorInfoARM *>( pExternalTensorInfo ),
-                                                      reinterpret_cast<VkExternalTensorPropertiesARM *>( pExternalTensorProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalTensorPropertiesARM PhysicalDevice::getExternalTensorPropertiesARM(
-    const PhysicalDeviceExternalTensorInfoARM & externalTensorInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceExternalTensorPropertiesARM &&
-                       "Function <vkGetPhysicalDeviceExternalTensorPropertiesARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    ExternalTensorPropertiesARM externalTensorProperties;
-    d.vkGetPhysicalDeviceExternalTensorPropertiesARM( m_physicalDevice,
-                                                      reinterpret_cast<const VkPhysicalDeviceExternalTensorInfoARM *>( &externalTensorInfo ),
-                                                      reinterpret_cast<VkExternalTensorPropertiesARM *>( &externalTensorProperties ) );
-
-    return externalTensorProperties;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getTensorOpaqueCaptureDescriptorDataARM( const TensorCaptureDescriptorDataInfoARM * pInfo,
-                                                                                                 void *                                     pData,
-                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetTensorOpaqueCaptureDescriptorDataARM(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkTensorCaptureDescriptorDataInfoARM *>( pInfo ), pData ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getTensorOpaqueCaptureDescriptorDataARM( const TensorCaptureDescriptorDataInfoARM & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetTensorOpaqueCaptureDescriptorDataARM && "Function <vkGetTensorOpaqueCaptureDescriptorDataARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    DataType data;
-    Result   result = static_cast<Result>(
-      d.vkGetTensorOpaqueCaptureDescriptorDataARM( m_device, reinterpret_cast<const VkTensorCaptureDescriptorDataInfoARM *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getTensorOpaqueCaptureDescriptorDataARM" );
-
-    return detail::createResultValueType( result, std::move( data ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM * pInfo,
-                                                                                                     void *                                         pData,
-                                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetTensorViewOpaqueCaptureDescriptorDataARM(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkTensorViewCaptureDescriptorDataInfoARM *>( pInfo ), pData ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                       Device::getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetTensorViewOpaqueCaptureDescriptorDataARM &&
-                       "Function <vkGetTensorViewOpaqueCaptureDescriptorDataARM> requires <VK_ARM_tensors>" );
-#  endif
-
-    DataType data;
-    Result   result = static_cast<Result>(
-      d.vkGetTensorViewOpaqueCaptureDescriptorDataARM( m_device, reinterpret_cast<const VkTensorViewCaptureDescriptorDataInfoARM *>( &info ), &data ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getTensorViewOpaqueCaptureDescriptorDataARM" );
-
-    return detail::createResultValueType( result, std::move( data ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
   //=== VK_EXT_shader_module_identifier ===
 
-  // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getShaderModuleIdentifierEXT( ShaderModule shaderModule, ShaderModuleIdentifierEXT * pIdentifier, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getShaderModuleIdentifierEXT( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                                                               VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT * pIdentifier,
+                                                               Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetShaderModuleIdentifierEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( pIdentifier ) );
+    d.vkGetShaderModuleIdentifierEXT( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( pIdentifier ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ShaderModuleIdentifierEXT Device::getShaderModuleIdentifierEXT( ShaderModule     shaderModule,
-                                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+    Device::getShaderModuleIdentifierEXT( VULKAN_HPP_NAMESPACE::ShaderModule shaderModule, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetShaderModuleIdentifierEXT && "Function <vkGetShaderModuleIdentifierEXT> requires <VK_EXT_shader_module_identifier>" );
 #  endif
 
-    ShaderModuleIdentifierEXT identifier;
+    VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT identifier;
     d.vkGetShaderModuleIdentifierEXT( m_device, static_cast<VkShaderModule>( shaderModule ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( &identifier ) );
 
     return identifier;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getShaderModuleCreateInfoIdentifierEXT( const ShaderModuleCreateInfo * pCreateInfo,
-                                                                         ShaderModuleIdentifierEXT *    pIdentifier,
-                                                                         Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
+                                                                         VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT *    pIdentifier,
+                                                                         Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetShaderModuleCreateInfoIdentifierEXT( static_cast<VkDevice>( m_device ),
-                                                reinterpret_cast<const VkShaderModuleCreateInfo *>( pCreateInfo ),
-                                                reinterpret_cast<VkShaderModuleIdentifierEXT *>( pIdentifier ) );
+    d.vkGetShaderModuleCreateInfoIdentifierEXT(
+      m_device, reinterpret_cast<const VkShaderModuleCreateInfo *>( pCreateInfo ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( pIdentifier ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ShaderModuleIdentifierEXT
-    Device::getShaderModuleCreateInfoIdentifierEXT( const ShaderModuleCreateInfo & createInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+                                         Device::getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo & createInfo,
+                                                    Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27650,7 +24911,7 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetShaderModuleCreateInfoIdentifierEXT> requires <VK_EXT_shader_module_identifier>" );
 #  endif
 
-    ShaderModuleIdentifierEXT identifier;
+    VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT identifier;
     d.vkGetShaderModuleCreateInfoIdentifierEXT(
       m_device, reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( &identifier ) );
 
@@ -27660,33 +24921,27 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_optical_flow ===
 
-  // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
-                                                                                              uint32_t *                           pFormatCount,
-                                                                                              OpticalFlowImageFormatPropertiesNV * pImageFormatProperties,
-                                                                                              Dispatch const &                     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
+    PhysicalDevice::getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
+                                                  uint32_t *                                                 pFormatCount,
+                                                  VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV * pImageFormatProperties,
+                                                  Dispatch const &                                           d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>(
-      d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+      d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV( m_physicalDevice,
                                                       reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( pOpticalFlowImageFormatInfo ),
                                                       pFormatCount,
                                                       reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( pImageFormatProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-  template <typename OpticalFlowImageFormatPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, OpticalFlowImageFormatPropertiesNV>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename OpticalFlowImageFormatPropertiesNVAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
-    PhysicalDevice::getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo, Dispatch const & d ) const
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
+    PhysicalDevice::getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
+                                                  Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27694,44 +24949,42 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceOpticalFlowImageFormatsNV> requires <VK_NV_optical_flow>" );
 #  endif
 
-    std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator> imageFormatProperties;
-    uint32_t                                                                                     formatCount;
-    Result                                                                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator> imageFormatProperties;
+    uint32_t                                                                                                           formatCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
         m_physicalDevice, reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ), &formatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && formatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && formatCount )
       {
         imageFormatProperties.resize( formatCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV( m_physicalDevice,
                                                           reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ),
                                                           &formatCount,
                                                           reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( imageFormatProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
     VULKAN_HPP_ASSERT( formatCount <= imageFormatProperties.size() );
     if ( formatCount < imageFormatProperties.size() )
     {
       imageFormatProperties.resize( formatCount );
     }
-    return detail::createResultValueType( result, std::move( imageFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
   template <typename OpticalFlowImageFormatPropertiesNVAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, OpticalFlowImageFormatPropertiesNV>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<
+              std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>::value,
+              int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
-    PhysicalDevice::getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV &          opticalFlowImageFormatInfo,
-                                                  OpticalFlowImageFormatPropertiesNVAllocator & opticalFlowImageFormatPropertiesNVAllocator,
-                                                  Dispatch const &                              d ) const
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
+    PhysicalDevice::getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
+                                                  OpticalFlowImageFormatPropertiesNVAllocator &              opticalFlowImageFormatPropertiesNVAllocator,
+                                                  Dispatch const &                                           d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27739,111 +24992,110 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceOpticalFlowImageFormatsNV> requires <VK_NV_optical_flow>" );
 #  endif
 
-    std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator> imageFormatProperties(
+    std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator> imageFormatProperties(
       opticalFlowImageFormatPropertiesNVAllocator );
-    uint32_t formatCount;
-    Result   result;
+    uint32_t                     formatCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
         m_physicalDevice, reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ), &formatCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && formatCount )
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && formatCount )
       {
         imageFormatProperties.resize( formatCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceOpticalFlowImageFormatsNV( m_physicalDevice,
                                                           reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ),
                                                           &formatCount,
                                                           reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( imageFormatProperties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
     VULKAN_HPP_ASSERT( formatCount <= imageFormatProperties.size() );
     if ( formatCount < imageFormatProperties.size() )
     {
       imageFormatProperties.resize( formatCount );
     }
-    return detail::createResultValueType( result, std::move( imageFormatProperties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCreateOpticalFlowSessionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createOpticalFlowSessionNV( const OpticalFlowSessionCreateInfoNV * pCreateInfo,
-                                                                                    const AllocationCallbacks *            pAllocator,
-                                                                                    OpticalFlowSessionNV *                 pSession,
-                                                                                    Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createOpticalFlowSessionNV( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV * pCreateInfo,
+                                                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *            pAllocator,
+                                                                                    VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV *                 pSession,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateOpticalFlowSessionNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateOpticalFlowSessionNV( m_device,
                                                                 reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( pCreateInfo ),
                                                                 reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
                                                                 reinterpret_cast<VkOpticalFlowSessionNV *>( pSession ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateOpticalFlowSessionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<OpticalFlowSessionNV>::type Device::createOpticalFlowSessionNV(
-    const OpticalFlowSessionCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>::type
+                       Device::createOpticalFlowSessionNV( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV & createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>    allocator,
+                                        Dispatch const &                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateOpticalFlowSessionNV && "Function <vkCreateOpticalFlowSessionNV> requires <VK_NV_optical_flow>" );
 #  endif
 
-    OpticalFlowSessionNV session;
-    Result               result = static_cast<Result>( d.vkCreateOpticalFlowSessionNV( m_device,
-                                                                         reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
-                                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                         reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createOpticalFlowSessionNV" );
+    VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV session;
+    VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateOpticalFlowSessionNV(
+      m_device,
+      reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createOpticalFlowSessionNV" );
 
-    return detail::createResultValueType( result, std::move( session ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( session ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateOpticalFlowSessionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<OpticalFlowSessionNV, Dispatch>>::type Device::createOpticalFlowSessionNVUnique(
-    const OpticalFlowSessionCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV, Dispatch>>::type
+                       Device::createOpticalFlowSessionNVUnique( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV & createInfo,
+                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>    allocator,
+                                              Dispatch const &                                             d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateOpticalFlowSessionNV && "Function <vkCreateOpticalFlowSessionNV> requires <VK_NV_optical_flow>" );
 #    endif
 
-    OpticalFlowSessionNV session;
-    Result               result = static_cast<Result>( d.vkCreateOpticalFlowSessionNV( m_device,
-                                                                         reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
-                                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                         reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createOpticalFlowSessionNVUnique" );
+    VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV session;
+    VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkCreateOpticalFlowSessionNV(
+      m_device,
+      reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+      reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createOpticalFlowSessionNVUnique" );
 
-    return detail::createResultValueType(
-      result, UniqueHandle<OpticalFlowSessionNV, Dispatch>( session, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV, Dispatch>( session, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyOpticalFlowSessionNV( OpticalFlowSessionNV session, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                              Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyOpticalFlowSessionNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyOpticalFlowSessionNV( m_device, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyOpticalFlowSessionNV( OpticalFlowSessionNV                session,
-                                                              Optional<const AllocationCallbacks> allocator,
-                                                              Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV                session,
+                                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                              Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27851,26 +25103,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyOpticalFlowSessionNV(
-      m_device, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkOpticalFlowSessionNV>( session ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( OpticalFlowSessionNV session, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyOpticalFlowSessionNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyOpticalFlowSessionNV( m_device, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( OpticalFlowSessionNV session, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV                session,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27878,68 +25130,68 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
     d.vkDestroyOpticalFlowSessionNV(
-      m_device, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      m_device,
+      static_cast<VkOpticalFlowSessionNV>( session ),
+      reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindOpticalFlowSessionImageNV( OpticalFlowSessionNV             session,
-                                                                                       OpticalFlowSessionBindingPointNV bindingPoint,
-                                                                                       ImageView                        view,
-                                                                                       ImageLayout                      layout,
-                                                                                       Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindOpticalFlowSessionImageNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                                                                       VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                                                                                       VULKAN_HPP_NAMESPACE::ImageView                        view,
+                                                                                       VULKAN_HPP_NAMESPACE::ImageLayout                      layout,
+                                                                                       Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindOpticalFlowSessionImageNV( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkBindOpticalFlowSessionImageNV( m_device,
                                                                    static_cast<VkOpticalFlowSessionNV>( session ),
                                                                    static_cast<VkOpticalFlowSessionBindingPointNV>( bindingPoint ),
                                                                    static_cast<VkImageView>( view ),
                                                                    static_cast<VkImageLayout>( layout ) ) );
   }
 #else
-  // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindOpticalFlowSessionImageNV(
-    OpticalFlowSessionNV session, OpticalFlowSessionBindingPointNV bindingPoint, ImageView view, ImageLayout layout, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
+                                          Device::bindOpticalFlowSessionImageNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                           VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                                           VULKAN_HPP_NAMESPACE::ImageView                        view,
+                                           VULKAN_HPP_NAMESPACE::ImageLayout                      layout,
+                                           Dispatch const &                                       d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkBindOpticalFlowSessionImageNV && "Function <vkBindOpticalFlowSessionImageNV> requires <VK_NV_optical_flow>" );
 #  endif
 
-    Result result = static_cast<Result>( d.vkBindOpticalFlowSessionImageNV( m_device,
-                                                                            static_cast<VkOpticalFlowSessionNV>( session ),
-                                                                            static_cast<VkOpticalFlowSessionBindingPointNV>( bindingPoint ),
-                                                                            static_cast<VkImageView>( view ),
-                                                                            static_cast<VkImageLayout>( layout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindOpticalFlowSessionImageNV" );
+    VULKAN_HPP_NAMESPACE::Result result =
+      static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkBindOpticalFlowSessionImageNV( m_device,
+                                                                                    static_cast<VkOpticalFlowSessionNV>( session ),
+                                                                                    static_cast<VkOpticalFlowSessionBindingPointNV>( bindingPoint ),
+                                                                                    static_cast<VkImageView>( view ),
+                                                                                    static_cast<VkImageLayout>( layout ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindOpticalFlowSessionImageNV" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-  // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( OpticalFlowSessionNV             session,
-                                                              const OpticalFlowExecuteInfoNV * pExecuteInfo,
-                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                                              const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV * pExecuteInfo,
+                                                              Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdOpticalFlowExecuteNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                 static_cast<VkOpticalFlowSessionNV>( session ),
-                                 reinterpret_cast<const VkOpticalFlowExecuteInfoNV *>( pExecuteInfo ) );
+    d.vkCmdOpticalFlowExecuteNV(
+      m_commandBuffer, static_cast<VkOpticalFlowSessionNV>( session ), reinterpret_cast<const VkOpticalFlowExecuteInfoNV *>( pExecuteInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( OpticalFlowSessionNV             session,
-                                                              const OpticalFlowExecuteInfoNV & executeInfo,
-                                                              Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                                              const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV & executeInfo,
+                                                              Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -27953,242 +25205,161 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_maintenance5 ===
 
-  // wrapper function for command vkCmdBindIndexBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::bindIndexBuffer2KHR( Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                             VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                             VULKAN_HPP_NAMESPACE::DeviceSize size,
+                                                             VULKAN_HPP_NAMESPACE::IndexType  indexType,
+                                                             Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindIndexBuffer2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
+    d.vkCmdBindIndexBuffer2KHR( m_commandBuffer,
                                 static_cast<VkBuffer>( buffer ),
                                 static_cast<VkDeviceSize>( offset ),
                                 static_cast<VkDeviceSize>( size ),
                                 static_cast<VkIndexType>( indexType ) );
   }
 
-  // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getRenderingAreaGranularityKHR( const RenderingAreaInfo * pRenderingAreaInfo,
-                                                                 Extent2D *                pGranularity,
-                                                                 Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR * pRenderingAreaInfo,
+                                                                 VULKAN_HPP_NAMESPACE::Extent2D *                   pGranularity,
+                                                                 Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetRenderingAreaGranularityKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkRenderingAreaInfo *>( pRenderingAreaInfo ), reinterpret_cast<VkExtent2D *>( pGranularity ) );
+      m_device, reinterpret_cast<const VkRenderingAreaInfoKHR *>( pRenderingAreaInfo ), reinterpret_cast<VkExtent2D *>( pGranularity ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D Device::getRenderingAreaGranularityKHR( const RenderingAreaInfo & renderingAreaInfo,
-                                                                                          Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Extent2D
+    Device::getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR & renderingAreaInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetRenderingAreaGranularityKHR && "Function <vkGetRenderingAreaGranularityKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetRenderingAreaGranularityKHR && "Function <vkGetRenderingAreaGranularityKHR> requires <VK_KHR_maintenance5>" );
 #  endif
 
-    Extent2D granularity;
+    VULKAN_HPP_NAMESPACE::Extent2D granularity;
     d.vkGetRenderingAreaGranularityKHR(
-      m_device, reinterpret_cast<const VkRenderingAreaInfo *>( &renderingAreaInfo ), reinterpret_cast<VkExtent2D *>( &granularity ) );
+      m_device, reinterpret_cast<const VkRenderingAreaInfoKHR *>( &renderingAreaInfo ), reinterpret_cast<VkExtent2D *>( &granularity ) );
 
     return granularity;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo * pInfo, SubresourceLayout2 * pLayout, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR * pInfo,
+                                                               VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *               pLayout,
+                                                               Dispatch const &                                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkGetDeviceImageSubresourceLayoutKHR(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceImageSubresourceInfo *>( pInfo ), reinterpret_cast<VkSubresourceLayout2 *>( pLayout ) );
+      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( pInfo ), reinterpret_cast<VkSubresourceLayout2KHR *>( pLayout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Device::getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info,
-                                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+    Device::getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayoutKHR &&
-                       "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayoutKHR && "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5>" );
 #  endif
 
-    SubresourceLayout2 layout;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
     d.vkGetDeviceImageSubresourceLayoutKHR(
-      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ), reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( &info ), reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return layout;
   }
 
-  // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> Device::getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info,
-                                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+    Device::getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayoutKHR &&
-                       "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkGetDeviceImageSubresourceLayoutKHR && "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
     d.vkGetDeviceImageSubresourceLayoutKHR(
-      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ), reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+      m_device, reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( &info ), reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout2KHR( Image                     image,
-                                                                const ImageSubresource2 * pSubresource,
-                                                                SubresourceLayout2 *      pLayout,
-                                                                Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getImageSubresourceLayout2KHR( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                                const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource,
+                                                                VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *      pLayout,
+                                                                Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetImageSubresourceLayout2KHR( static_cast<VkDevice>( m_device ),
+    d.vkGetImageSubresourceLayout2KHR( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( pSubresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( pLayout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( pSubresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( pLayout ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Device::getImageSubresourceLayout2KHR( Image                     image,
-                                                                                                   const ImageSubresource2 & subresource,
-                                                                                                   Dispatch const &          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR Device::getImageSubresourceLayout2KHR(
+    VULKAN_HPP_NAMESPACE::Image image, const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT(
       d.vkGetImageSubresourceLayout2KHR &&
-      "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 #  endif
 
-    SubresourceLayout2 layout;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
     d.vkGetImageSubresourceLayout2KHR( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return layout;
   }
 
-  // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getImageSubresourceLayout2KHR( Image image, const ImageSubresource2 & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> Device::getImageSubresourceLayout2KHR(
+    VULKAN_HPP_NAMESPACE::Image image, const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT(
       d.vkGetImageSubresourceLayout2KHR &&
-      "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 #  endif
 
-    StructureChain<X, Y, Z...> structureChain;
-    SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+    VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+    VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
     d.vkGetImageSubresourceLayout2KHR( m_device,
                                        static_cast<VkImage>( image ),
-                                       reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                       reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                       reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                       reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
     return structureChain;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  //=== VK_AMD_anti_lag ===
-
-  // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::antiLagUpdateAMD( const AntiLagDataAMD * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkAntiLagUpdateAMD( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAntiLagDataAMD *>( pData ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::antiLagUpdateAMD( const AntiLagDataAMD & data, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAntiLagUpdateAMD && "Function <vkAntiLagUpdateAMD> requires <VK_AMD_anti_lag>" );
-#  endif
-
-    d.vkAntiLagUpdateAMD( m_device, reinterpret_cast<const VkAntiLagDataAMD *>( &data ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_KHR_present_wait2 ===
-
-  // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitForPresent2KHR( SwapchainKHR                swapchain,
-                                                                            const PresentWait2InfoKHR * pPresentWait2Info,
-                                                                            Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkWaitForPresent2KHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkPresentWait2InfoKHR *>( pPresentWait2Info ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitForPresent2KHR( SwapchainKHR                swapchain,
-                                                                            const PresentWait2InfoKHR & presentWait2Info,
-                                                                            Dispatch const &            d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkWaitForPresent2KHR && "Function <vkWaitForPresent2KHR> requires <VK_KHR_present_wait2>" );
-#  endif
-
-    Result result = static_cast<Result>(
-      d.vkWaitForPresent2KHR( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkPresentWait2InfoKHR *>( &presentWait2Info ) ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::waitForPresent2KHR",
-                         { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForPresent2KHR", { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR } );
-#  endif
-
-    return static_cast<Result>( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
   //=== VK_EXT_shader_object ===
 
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createShadersEXT( uint32_t                    createInfoCount,
-                                                                          const ShaderCreateInfoEXT * pCreateInfos,
-                                                                          const AllocationCallbacks * pAllocator,
-                                                                          ShaderEXT *                 pShaders,
-                                                                          Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createShadersEXT( uint32_t                                          createInfoCount,
+                                                                          const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT * pCreateInfos,
+                                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                                          VULKAN_HPP_NAMESPACE::ShaderEXT *                 pShaders,
+                                                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateShadersEXT( static_cast<VkDevice>( m_device ),
+    return static_cast<Result>( d.vkCreateShadersEXT( m_device,
                                                       createInfoCount,
                                                       reinterpret_cast<const VkShaderCreateInfoEXT *>( pCreateInfos ),
                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
@@ -28196,230 +25367,243 @@ namespace VULKAN_HPP_NAMESPACE
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename ShaderEXTAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, ShaderEXT>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>> Device::createShadersEXT(
-    ArrayProxy<const ShaderCreateInfoEXT> const & createInfos, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename ShaderEXTAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>
+    Device::createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                              Dispatch const &                                                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #  endif
 
-    std::vector<ShaderEXT, ShaderEXTAllocator> shaders( createInfos.size() );
-    Result                                     result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               createInfos.size(),
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXT", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator> shaders( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            createInfos.size(),
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXT",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
 
-    return ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>>( result, std::move( shaders ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>( result, std::move( shaders ) );
   }
 
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
   template <typename ShaderEXTAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, ShaderEXT>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>>
-                                         Device::createShadersEXT( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                              Optional<const AllocationCallbacks>           allocator,
-                              ShaderEXTAllocator &                          shaderEXTAllocator,
-                              Dispatch const &                              d ) const
+            typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, VULKAN_HPP_NAMESPACE::ShaderEXT>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>
+    Device::createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                              ShaderEXTAllocator &                                                                      shaderEXTAllocator,
+                              Dispatch const &                                                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #  endif
 
-    std::vector<ShaderEXT, ShaderEXTAllocator> shaders( createInfos.size(), shaderEXTAllocator );
-    Result                                     result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               createInfos.size(),
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXT", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
+    std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator> shaders( createInfos.size(), shaderEXTAllocator );
+    VULKAN_HPP_NAMESPACE::Result                                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            createInfos.size(),
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXT",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
 
-    return ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>>( result, std::move( shaders ) );
+    return ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>( result, std::move( shaders ) );
   }
 
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<ShaderEXT>
-    Device::createShaderEXT( const ShaderCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<VULKAN_HPP_NAMESPACE::ShaderEXT>
+                                         Device::createShaderEXT( const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT &         createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                             Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #  endif
 
-    ShaderEXT shader;
-    Result    result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               1,
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( &shader ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderEXT", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
+    VULKAN_HPP_NAMESPACE::ShaderEXT shader;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            1,
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( &shader ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderEXT",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
 
-    return ResultValue<ShaderEXT>( result, std::move( shader ) );
+    return ResultValue<VULKAN_HPP_NAMESPACE::ShaderEXT>( result, std::move( shader ) );
   }
 
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename Dispatch,
-            typename ShaderEXTAllocator,
-            typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<ShaderEXT, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>> Device::createShadersEXTUnique(
-    ArrayProxy<const ShaderCreateInfoEXT> const & createInfos, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch, typename ShaderEXTAllocator>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>
+    Device::createShadersEXTUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                                    Dispatch const &                                                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #    endif
 
-    std::vector<ShaderEXT> shaders( createInfos.size() );
-    Result                 result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               createInfos.size(),
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXTUnique", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
-    std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator> uniqueShaders;
+    std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT> shaders( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            createInfos.size(),
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXTUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator> uniqueShaders;
     uniqueShaders.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & shader : shaders )
     {
       uniqueShaders.push_back( UniqueHandle<ShaderEXT, Dispatch>( shader, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>>( result, std::move( uniqueShaders ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>( result, std::move( uniqueShaders ) );
   }
 
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename Dispatch,
-            typename ShaderEXTAllocator,
-            typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<ShaderEXT, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>>
-                                         Device::createShadersEXTUnique( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                                    Optional<const AllocationCallbacks>           allocator,
-                                    ShaderEXTAllocator &                          shaderEXTAllocator,
-                                    Dispatch const &                              d ) const
+  template <
+    typename Dispatch,
+    typename ShaderEXTAllocator,
+    typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>
+    Device::createShadersEXTUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                                    ShaderEXTAllocator &                                                                      shaderEXTAllocator,
+                                    Dispatch const &                                                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #    endif
 
-    std::vector<ShaderEXT> shaders( createInfos.size() );
-    Result                 result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               createInfos.size(),
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXTUnique", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
-    std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator> uniqueShaders( shaderEXTAllocator );
+    std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT> shaders( createInfos.size() );
+    VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            createInfos.size(),
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShadersEXTUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
+    std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator> uniqueShaders( shaderEXTAllocator );
     uniqueShaders.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
+    ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
     for ( auto const & shader : shaders )
     {
       uniqueShaders.push_back( UniqueHandle<ShaderEXT, Dispatch>( shader, deleter ) );
     }
-    return ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>>( result, std::move( uniqueShaders ) );
+    return ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>( result, std::move( uniqueShaders ) );
   }
 
-  // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<ShaderEXT, Dispatch>>
-    Device::createShaderEXTUnique( const ShaderCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>
+                                         Device::createShaderEXTUnique( const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT &         createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                   Dispatch const &                                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkCreateShadersEXT && "Function <vkCreateShadersEXT> requires <VK_EXT_shader_object>" );
 #    endif
 
-    ShaderEXT shader;
-    Result    result = static_cast<Result>( d.vkCreateShadersEXT( m_device,
-                                                               1,
-                                                               reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                               reinterpret_cast<VkShaderEXT *>( &shader ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderEXTUnique", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
+    VULKAN_HPP_NAMESPACE::ShaderEXT shader;
+    VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkCreateShadersEXT( m_device,
+                            1,
+                            reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
+                            reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+                            reinterpret_cast<VkShaderEXT *>( &shader ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                               VULKAN_HPP_NAMESPACE_STRING "::Device::createShaderEXTUnique",
+                                               { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT } );
 
-    return ResultValue<UniqueHandle<ShaderEXT, Dispatch>>(
-      result, UniqueHandle<ShaderEXT, Dispatch>( shader, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
+    return ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>(
+      result, UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>( shader, ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
   }
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyShaderEXT( ShaderEXT shader, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyShaderEXT( VULKAN_HPP_NAMESPACE::ShaderEXT                   shader,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                   Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyShaderEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyShaderEXT( m_device, static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyShaderEXT( ShaderEXT shader, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroyShaderEXT( VULKAN_HPP_NAMESPACE::ShaderEXT                           shader,
+                                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                                   Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyShaderEXT && "Function <vkDestroyShaderEXT> requires <VK_EXT_shader_object>" );
 #  endif
 
-    d.vkDestroyShaderEXT( m_device, static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyShaderEXT( m_device,
+                          static_cast<VkShaderEXT>( shader ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( ShaderEXT shader, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ShaderEXT                   shader,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyShaderEXT(
-      static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
+    d.vkDestroyShaderEXT( m_device, static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( ShaderEXT shader, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::destroy( VULKAN_HPP_NAMESPACE::ShaderEXT                           shader,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator,
+                                          Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkDestroyShaderEXT && "Function <vkDestroyShaderEXT> requires <VK_EXT_shader_object>" );
 #  endif
 
-    d.vkDestroyShaderEXT( m_device, static_cast<VkShaderEXT>( shader ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+    d.vkDestroyShaderEXT( m_device,
+                          static_cast<VkShaderEXT>( shader ),
+                          reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getShaderBinaryDataEXT( ShaderEXT shader, size_t * pDataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+    Device::getShaderBinaryDataEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader, size_t * pDataSize, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetShaderBinaryDataEXT( static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( shader ), pDataSize, pData ) );
+    return static_cast<Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), pDataSize, pData ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint8_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getShaderBinaryDataEXT( ShaderEXT shader, Dispatch const & d ) const
+                       Device::getShaderBinaryDataEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -28428,33 +25612,31 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data;
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result =
-          static_cast<Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderBinaryDataEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderBinaryDataEXT" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 
-  // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
   template <typename Uint8_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-                       Device::getShaderBinaryDataEXT( ShaderEXT shader, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
+                       Device::getShaderBinaryDataEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -28463,47 +25645,43 @@ namespace VULKAN_HPP_NAMESPACE
 
     std::vector<uint8_t, Uint8_tAllocator> data( uint8_tAllocator );
     size_t                                 dataSize;
-    Result                                 result;
+    VULKAN_HPP_NAMESPACE::Result           result;
     do
     {
-      result = static_cast<Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, nullptr ) );
-      if ( ( result == Result::eSuccess ) && dataSize )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
       {
         data.resize( dataSize );
-        result =
-          static_cast<Result>( d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          d.vkGetShaderBinaryDataEXT( m_device, static_cast<VkShaderEXT>( shader ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderBinaryDataEXT" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getShaderBinaryDataEXT" );
     VULKAN_HPP_ASSERT( dataSize <= data.size() );
     if ( dataSize < data.size() )
     {
       data.resize( dataSize );
     }
-    return detail::createResultValueType( result, std::move( data ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( uint32_t                    stageCount,
-                                                        const ShaderStageFlagBits * pStages,
-                                                        const ShaderEXT *           pShaders,
-                                                        Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( uint32_t                                          stageCount,
+                                                        const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits * pStages,
+                                                        const VULKAN_HPP_NAMESPACE::ShaderEXT *           pShaders,
+                                                        Dispatch const &                                  d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindShadersEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                           stageCount,
-                           reinterpret_cast<const VkShaderStageFlagBits *>( pStages ),
-                           reinterpret_cast<const VkShaderEXT *>( pShaders ) );
+    d.vkCmdBindShadersEXT(
+      m_commandBuffer, stageCount, reinterpret_cast<const VkShaderStageFlagBits *>( pStages ), reinterpret_cast<const VkShaderEXT *>( pShaders ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( ArrayProxy<const ShaderStageFlagBits> const & stages,
-                                                        ArrayProxy<const ShaderEXT> const &           shaders,
-                                                        Dispatch const &                              d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits> const & stages,
+                                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const &           shaders,
+                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -28525,876 +25703,187 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthClampRangeEXT( DepthClampModeEXT          depthClampMode,
-                                                               const DepthClampRangeEXT * pDepthClampRange,
-                                                               Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDepthClampRangeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  static_cast<VkDepthClampModeEXT>( depthClampMode ),
-                                  reinterpret_cast<const VkDepthClampRangeEXT *>( pDepthClampRange ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDepthClampRangeEXT( DepthClampModeEXT                  depthClampMode,
-                                                               Optional<const DepthClampRangeEXT> depthClampRange,
-                                                               Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdSetDepthClampRangeEXT &&
-                       "Function <vkCmdSetDepthClampRangeEXT> requires <VK_EXT_depth_clamp_control> or <VK_EXT_shader_object>" );
-#  endif
-
-    d.vkCmdSetDepthClampRangeEXT(
-      m_commandBuffer, static_cast<VkDepthClampModeEXT>( depthClampMode ), reinterpret_cast<const VkDepthClampRangeEXT *>( depthClampRange.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_KHR_pipeline_binary ===
-
-  // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR * pCreateInfo,
-                                                                                   const AllocationCallbacks *         pAllocator,
-                                                                                   PipelineBinaryHandlesInfoKHR *      pBinaries,
-                                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreatePipelineBinariesKHR( static_cast<VkDevice>( m_device ),
-                                                               reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( pCreateInfo ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                               reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( pBinaries ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-  template <typename PipelineBinaryKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, PipelineBinaryKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>
-    Device::createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreatePipelineBinariesKHR && "Function <vkCreatePipelineBinariesKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator> pipelineBinaries;
-    PipelineBinaryHandlesInfoKHR                               binaries;
-    Result                                                     result;
-    if ( createInfo.pKeysAndDataInfo )
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline && !createInfo.pPipelineCreateInfo );
-      pipelineBinaries.resize( createInfo.pKeysAndDataInfo->binaryCount );
-      binaries.pipelineBinaryCount = createInfo.pKeysAndDataInfo->binaryCount;
-      binaries.pPipelineBinaries   = pipelineBinaries.data();
-      result                       = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-    }
-    else
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline ^ !createInfo.pPipelineCreateInfo );
-      result = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinaries.resize( binaries.pipelineBinaryCount );
-        binaries.pPipelineBinaries = pipelineBinaries.data();
-        result                     = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                     reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      }
-    }
-
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineBinariesKHR", { Result::eSuccess, Result::eIncomplete, Result::ePipelineBinaryMissingKHR } );
-
-    return ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>( result, std::move( pipelineBinaries ) );
-  }
-
-  // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-  template <typename PipelineBinaryKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, PipelineBinaryKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>
-                                         Device::createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR & createInfo,
-                                       Optional<const AllocationCallbacks> allocator,
-                                       PipelineBinaryKHRAllocator &        pipelineBinaryKHRAllocator,
-                                       Dispatch const &                    d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreatePipelineBinariesKHR && "Function <vkCreatePipelineBinariesKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator> pipelineBinaries( pipelineBinaryKHRAllocator );
-    PipelineBinaryHandlesInfoKHR                               binaries;
-    Result                                                     result;
-    if ( createInfo.pKeysAndDataInfo )
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline && !createInfo.pPipelineCreateInfo );
-      pipelineBinaries.resize( createInfo.pKeysAndDataInfo->binaryCount );
-      binaries.pipelineBinaryCount = createInfo.pKeysAndDataInfo->binaryCount;
-      binaries.pPipelineBinaries   = pipelineBinaries.data();
-      result                       = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-    }
-    else
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline ^ !createInfo.pPipelineCreateInfo );
-      result = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinaries.resize( binaries.pipelineBinaryCount );
-        binaries.pPipelineBinaries = pipelineBinaries.data();
-        result                     = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                     reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      }
-    }
-
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineBinariesKHR", { Result::eSuccess, Result::eIncomplete, Result::ePipelineBinaryMissingKHR } );
-
-    return ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>( result, std::move( pipelineBinaries ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-  template <typename Dispatch,
-            typename PipelineBinaryKHRAllocator,
-            typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, UniqueHandle<PipelineBinaryKHR, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>
-                                         Device::createPipelineBinariesKHRUnique( const PipelineBinaryCreateInfoKHR & createInfo,
-                                             Optional<const AllocationCallbacks> allocator,
-                                             Dispatch const &                    d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreatePipelineBinariesKHR && "Function <vkCreatePipelineBinariesKHR> requires <VK_KHR_pipeline_binary>" );
-#    endif
-
-    std::vector<PipelineBinaryKHR> pipelineBinaries;
-    PipelineBinaryHandlesInfoKHR   binaries;
-    Result                         result;
-    if ( createInfo.pKeysAndDataInfo )
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline && !createInfo.pPipelineCreateInfo );
-      pipelineBinaries.resize( createInfo.pKeysAndDataInfo->binaryCount );
-      binaries.pipelineBinaryCount = createInfo.pKeysAndDataInfo->binaryCount;
-      binaries.pPipelineBinaries   = pipelineBinaries.data();
-      result                       = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-    }
-    else
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline ^ !createInfo.pPipelineCreateInfo );
-      result = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinaries.resize( binaries.pipelineBinaryCount );
-        binaries.pPipelineBinaries = pipelineBinaries.data();
-        result                     = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                     reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      }
-    }
-
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineBinariesKHRUnique",
-                         { Result::eSuccess, Result::eIncomplete, Result::ePipelineBinaryMissingKHR } );
-    std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator> uniquePipelineBinaries;
-    uniquePipelineBinaries.reserve( pipelineBinaries.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipelineBinary : pipelineBinaries )
-    {
-      uniquePipelineBinaries.push_back( UniqueHandle<PipelineBinaryKHR, Dispatch>( pipelineBinary, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>( result, std::move( uniquePipelineBinaries ) );
-  }
-
-  // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-  template <typename Dispatch,
-            typename PipelineBinaryKHRAllocator,
-            typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, UniqueHandle<PipelineBinaryKHR, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>
-                                         Device::createPipelineBinariesKHRUnique( const PipelineBinaryCreateInfoKHR & createInfo,
-                                             Optional<const AllocationCallbacks> allocator,
-                                             PipelineBinaryKHRAllocator &        pipelineBinaryKHRAllocator,
-                                             Dispatch const &                    d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreatePipelineBinariesKHR && "Function <vkCreatePipelineBinariesKHR> requires <VK_KHR_pipeline_binary>" );
-#    endif
-
-    std::vector<PipelineBinaryKHR> pipelineBinaries;
-    PipelineBinaryHandlesInfoKHR   binaries;
-    Result                         result;
-    if ( createInfo.pKeysAndDataInfo )
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline && !createInfo.pPipelineCreateInfo );
-      pipelineBinaries.resize( createInfo.pKeysAndDataInfo->binaryCount );
-      binaries.pipelineBinaryCount = createInfo.pKeysAndDataInfo->binaryCount;
-      binaries.pPipelineBinaries   = pipelineBinaries.data();
-      result                       = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-    }
-    else
-    {
-      VULKAN_HPP_ASSERT( !createInfo.pipeline ^ !createInfo.pPipelineCreateInfo );
-      result = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                   reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                   reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinaries.resize( binaries.pipelineBinaryCount );
-        binaries.pPipelineBinaries = pipelineBinaries.data();
-        result                     = static_cast<Result>( d.vkCreatePipelineBinariesKHR( m_device,
-                                                                     reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                     reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      }
-    }
-
-    detail::resultCheck( result,
-                         VULKAN_HPP_NAMESPACE_STRING "::Device::createPipelineBinariesKHRUnique",
-                         { Result::eSuccess, Result::eIncomplete, Result::ePipelineBinaryMissingKHR } );
-    std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator> uniquePipelineBinaries( pipelineBinaryKHRAllocator );
-    uniquePipelineBinaries.reserve( pipelineBinaries.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipelineBinary : pipelineBinaries )
-    {
-      uniquePipelineBinaries.push_back( UniqueHandle<PipelineBinaryKHR, Dispatch>( pipelineBinary, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>( result, std::move( uniquePipelineBinaries ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroyPipelineBinaryKHR( PipelineBinaryKHR pipelineBinary, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineBinaryKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineBinaryKHR>( pipelineBinary ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyPipelineBinaryKHR( PipelineBinaryKHR                   pipelineBinary,
-                                                           Optional<const AllocationCallbacks> allocator,
-                                                           Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyPipelineBinaryKHR && "Function <vkDestroyPipelineBinaryKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    d.vkDestroyPipelineBinaryKHR(
-      m_device, static_cast<VkPipelineBinaryKHR>( pipelineBinary ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PipelineBinaryKHR pipelineBinary, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyPipelineBinaryKHR(
-      static_cast<VkDevice>( m_device ), static_cast<VkPipelineBinaryKHR>( pipelineBinary ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( PipelineBinaryKHR pipelineBinary, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyPipelineBinaryKHR && "Function <vkDestroyPipelineBinaryKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    d.vkDestroyPipelineBinaryKHR(
-      m_device, static_cast<VkPipelineBinaryKHR>( pipelineBinary ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineKeyKHR( const PipelineCreateInfoKHR * pPipelineCreateInfo,
-                                                                           PipelineBinaryKeyKHR *        pPipelineKey,
-                                                                           Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPipelineKeyKHR( static_cast<VkDevice>( m_device ),
-                                                       reinterpret_cast<const VkPipelineCreateInfoKHR *>( pPipelineCreateInfo ),
-                                                       reinterpret_cast<VkPipelineBinaryKeyKHR *>( pPipelineKey ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineBinaryKeyKHR>::type
-                       Device::getPipelineKeyKHR( Optional<const PipelineCreateInfoKHR> pipelineCreateInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPipelineKeyKHR && "Function <vkGetPipelineKeyKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    PipelineBinaryKeyKHR pipelineKey;
-    Result               result = static_cast<Result>( d.vkGetPipelineKeyKHR(
-      m_device, reinterpret_cast<const VkPipelineCreateInfoKHR *>( pipelineCreateInfo.get() ), reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineKey ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineKeyKHR" );
-
-    return detail::createResultValueType( result, std::move( pipelineKey ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR * pInfo,
-                                                                                  PipelineBinaryKeyKHR *            pPipelineBinaryKey,
-                                                                                  size_t *                          pPipelineBinaryDataSize,
-                                                                                  void *                            pPipelineBinaryData,
-                                                                                  Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPipelineBinaryDataKHR( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( pInfo ),
-                                                              reinterpret_cast<VkPipelineBinaryKeyKHR *>( pPipelineBinaryKey ),
-                                                              pPipelineBinaryDataSize,
-                                                              pPipelineBinaryData ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-                       Device::getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPipelineBinaryDataKHR && "Function <vkGetPipelineBinaryDataKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>> data_;
-    PipelineBinaryKeyKHR &                                                  pipelineBinaryKey  = data_.first;
-    std::vector<uint8_t, Uint8_tAllocator> &                                pipelineBinaryData = data_.second;
-    size_t                                                                  pipelineBinaryDataSize;
-    Result                                                                  result = static_cast<Result>( d.vkGetPipelineBinaryDataKHR( m_device,
-                                                                       reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                       reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                       &pipelineBinaryDataSize,
-                                                                       nullptr ) );
-    if ( result == Result::eSuccess )
-    {
-      pipelineBinaryData.resize( pipelineBinaryDataSize );
-      result = static_cast<Result>( d.vkGetPipelineBinaryDataKHR( m_device,
-                                                                  reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                  reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                  &pipelineBinaryDataSize,
-                                                                  reinterpret_cast<void *>( pipelineBinaryData.data() ) ) );
-    }
-
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineBinaryDataKHR" );
-
-    return detail::createResultValueType( result, std::move( data_ ) );
-  }
-
-  // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-  template <typename Uint8_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-                       Device::getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR & info, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPipelineBinaryDataKHR && "Function <vkGetPipelineBinaryDataKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>> data_(
-      std::piecewise_construct, std::forward_as_tuple(), std::forward_as_tuple( uint8_tAllocator ) );
-    PipelineBinaryKeyKHR &                   pipelineBinaryKey  = data_.first;
-    std::vector<uint8_t, Uint8_tAllocator> & pipelineBinaryData = data_.second;
-    size_t                                   pipelineBinaryDataSize;
-    Result                                   result = static_cast<Result>( d.vkGetPipelineBinaryDataKHR( m_device,
-                                                                       reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                       reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                       &pipelineBinaryDataSize,
-                                                                       nullptr ) );
-    if ( result == Result::eSuccess )
-    {
-      pipelineBinaryData.resize( pipelineBinaryDataSize );
-      result = static_cast<Result>( d.vkGetPipelineBinaryDataKHR( m_device,
-                                                                  reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                  reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                  &pipelineBinaryDataSize,
-                                                                  reinterpret_cast<void *>( pipelineBinaryData.data() ) ) );
-    }
-
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineBinaryDataKHR" );
-
-    return detail::createResultValueType( result, std::move( data_ ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseCapturedPipelineDataKHR( const ReleaseCapturedPipelineDataInfoKHR * pInfo,
-                                                                                        const AllocationCallbacks *                pAllocator,
-                                                                                        Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkReleaseCapturedPipelineDataKHR( static_cast<VkDevice>( m_device ),
-                                                                    reinterpret_cast<const VkReleaseCapturedPipelineDataInfoKHR *>( pInfo ),
-                                                                    reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::releaseCapturedPipelineDataKHR(
-    const ReleaseCapturedPipelineDataInfoKHR & info, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkReleaseCapturedPipelineDataKHR && "Function <vkReleaseCapturedPipelineDataKHR> requires <VK_KHR_pipeline_binary>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkReleaseCapturedPipelineDataKHR(
-      m_device, reinterpret_cast<const VkReleaseCapturedPipelineDataInfoKHR *>( &info ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseCapturedPipelineDataKHR" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
   //=== VK_QCOM_tile_properties ===
 
-  // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFramebufferTilePropertiesQCOM( Framebuffer          framebuffer,
-                                                                                          uint32_t *           pPropertiesCount,
-                                                                                          TilePropertiesQCOM * pProperties,
-                                                                                          Dispatch const &     d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer          framebuffer,
+                                                                                          uint32_t *                                 pPropertiesCount,
+                                                                                          VULKAN_HPP_NAMESPACE::TilePropertiesQCOM * pProperties,
+                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
-                                                                      static_cast<VkFramebuffer>( framebuffer ),
-                                                                      pPropertiesCount,
-                                                                      reinterpret_cast<VkTilePropertiesQCOM *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM(
+      m_device, static_cast<VkFramebuffer>( framebuffer ), pPropertiesCount, reinterpret_cast<VkTilePropertiesQCOM *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-  template <typename TilePropertiesQCOMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, TilePropertiesQCOM>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
-                       Device::getFramebufferTilePropertiesQCOM( Framebuffer framebuffer, Dispatch const & d ) const
+  template <typename TilePropertiesQCOMAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
+                       Device::getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetFramebufferTilePropertiesQCOM && "Function <vkGetFramebufferTilePropertiesQCOM> requires <VK_QCOM_tile_properties>" );
 #  endif
 
-    std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator> properties;
-    uint32_t                                                     propertiesCount;
-    Result                                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator> properties;
+    uint32_t                                                                           propertiesCount;
+    VULKAN_HPP_NAMESPACE::Result                                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM( m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertiesCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetFramebufferTilePropertiesQCOM( m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertiesCount )
       {
         properties.resize( propertiesCount );
-        result = static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetFramebufferTilePropertiesQCOM(
           m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, reinterpret_cast<VkTilePropertiesQCOM *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFramebufferTilePropertiesQCOM" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
     VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
     if ( propertiesCount < properties.size() )
     {
       properties.resize( propertiesCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return properties;
   }
 
-  // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
   template <typename TilePropertiesQCOMAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, TilePropertiesQCOM>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
-    Device::getFramebufferTilePropertiesQCOM( Framebuffer framebuffer, TilePropertiesQCOMAllocator & tilePropertiesQCOMAllocator, Dispatch const & d ) const
+            typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
+                       Device::getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer,
+                                              TilePropertiesQCOMAllocator &     tilePropertiesQCOMAllocator,
+                                              Dispatch const &                  d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetFramebufferTilePropertiesQCOM && "Function <vkGetFramebufferTilePropertiesQCOM> requires <VK_QCOM_tile_properties>" );
 #  endif
 
-    std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator> properties( tilePropertiesQCOMAllocator );
-    uint32_t                                                     propertiesCount;
-    Result                                                       result;
+    std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator> properties( tilePropertiesQCOMAllocator );
+    uint32_t                                                                           propertiesCount;
+    VULKAN_HPP_NAMESPACE::Result                                                       result;
     do
     {
-      result = static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM( m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertiesCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        d.vkGetFramebufferTilePropertiesQCOM( m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertiesCount )
       {
         properties.resize( propertiesCount );
-        result = static_cast<Result>( d.vkGetFramebufferTilePropertiesQCOM(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetFramebufferTilePropertiesQCOM(
           m_device, static_cast<VkFramebuffer>( framebuffer ), &propertiesCount, reinterpret_cast<VkTilePropertiesQCOM *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFramebufferTilePropertiesQCOM" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
     VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
     if ( propertiesCount < properties.size() )
     {
       properties.resize( propertiesCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return properties;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDynamicRenderingTilePropertiesQCOM( const RenderingInfo * pRenderingInfo,
-                                                                                               TilePropertiesQCOM *  pProperties,
-                                                                                               Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result Device::getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                                                                          VULKAN_HPP_NAMESPACE::TilePropertiesQCOM *  pProperties,
+                                                                          Dispatch const &                            d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDynamicRenderingTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ),
-                                                                           reinterpret_cast<VkTilePropertiesQCOM *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetDynamicRenderingTilePropertiesQCOM(
+      m_device, reinterpret_cast<const VkRenderingInfo *>( pRenderingInfo ), reinterpret_cast<VkTilePropertiesQCOM *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TilePropertiesQCOM>::type
-                       Device::getDynamicRenderingTilePropertiesQCOM( const RenderingInfo & renderingInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::TilePropertiesQCOM
+    Device::getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetDynamicRenderingTilePropertiesQCOM && "Function <vkGetDynamicRenderingTilePropertiesQCOM> requires <VK_QCOM_tile_properties>" );
 #  endif
 
-    TilePropertiesQCOM properties;
-    Result             result = static_cast<Result>( d.vkGetDynamicRenderingTilePropertiesQCOM(
-      m_device, reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ), reinterpret_cast<VkTilePropertiesQCOM *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDynamicRenderingTilePropertiesQCOM" );
+    VULKAN_HPP_NAMESPACE::TilePropertiesQCOM properties;
+    d.vkGetDynamicRenderingTilePropertiesQCOM(
+      m_device, reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ), reinterpret_cast<VkTilePropertiesQCOM *>( &properties ) );
 
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-
-  // wrapper function for command vkReleaseSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR * pReleaseInfo,
-                                                                                   Dispatch const &                      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkReleaseSwapchainImagesKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( pReleaseInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkReleaseSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR & releaseInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkReleaseSwapchainImagesKHR &&
-                       "Function <vkReleaseSwapchainImagesKHR> requires <VK_EXT_swapchain_maintenance1> or <VK_KHR_swapchain_maintenance1>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkReleaseSwapchainImagesKHR( m_device, reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( &releaseInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseSwapchainImagesKHR" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_NV_cooperative_vector ===
-
-  // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeVectorPropertiesNV( uint32_t *                      pPropertyCount,
-                                                                                                  CooperativeVectorPropertiesNV * pProperties,
-                                                                                                  Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkCooperativeVectorPropertiesNV *>( pProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-  template <typename CooperativeVectorPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeVectorPropertiesNVAllocator::value_type, CooperativeVectorPropertiesNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator>>::type
-                       PhysicalDevice::getCooperativeVectorPropertiesNV( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV &&
-                       "Function <vkGetPhysicalDeviceCooperativeVectorPropertiesNV> requires <VK_NV_cooperative_vector>" );
-#  endif
-
-    std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator> properties;
-    uint32_t                                                                           propertyCount;
-    Result                                                                             result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV(
-          m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeVectorPropertiesNV *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeVectorPropertiesNV" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-  template <typename CooperativeVectorPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeVectorPropertiesNVAllocator::value_type, CooperativeVectorPropertiesNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator>>::type
-                       PhysicalDevice::getCooperativeVectorPropertiesNV( CooperativeVectorPropertiesNVAllocator & cooperativeVectorPropertiesNVAllocator,
-                                                      Dispatch const &                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV &&
-                       "Function <vkGetPhysicalDeviceCooperativeVectorPropertiesNV> requires <VK_NV_cooperative_vector>" );
-#  endif
-
-    std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator> properties( cooperativeVectorPropertiesNVAllocator );
-    uint32_t                                                                           propertyCount;
-    Result                                                                             result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeVectorPropertiesNV(
-          m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeVectorPropertiesNV *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeVectorPropertiesNV" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV * pInfo,
-                                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkConvertCooperativeVectorMatrixNV( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( pInfo ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV & info,
-                                                                                          Dispatch const &                             d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkConvertCooperativeVectorMatrixNV && "Function <vkConvertCooperativeVectorMatrixNV> requires <VK_NV_cooperative_vector>" );
-#  endif
-
-    Result result =
-      static_cast<Result>( d.vkConvertCooperativeVectorMatrixNV( m_device, reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( &info ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::convertCooperativeVectorMatrixNV", { Result::eSuccess, Result::eIncomplete } );
-
-    return static_cast<Result>( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::convertCooperativeVectorMatrixNV( uint32_t                                     infoCount,
-                                                                          const ConvertCooperativeVectorMatrixInfoNV * pInfos,
-                                                                          Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdConvertCooperativeVectorMatrixNV(
-      static_cast<VkCommandBuffer>( m_commandBuffer ), infoCount, reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( pInfos ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::convertCooperativeVectorMatrixNV( ArrayProxy<const ConvertCooperativeVectorMatrixInfoNV> const & infos,
-                                                                          Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdConvertCooperativeVectorMatrixNV && "Function <vkCmdConvertCooperativeVectorMatrixNV> requires <VK_NV_cooperative_vector>" );
-#  endif
-
-    d.vkCmdConvertCooperativeVectorMatrixNV( m_commandBuffer, infos.size(), reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( infos.data() ) );
+    return properties;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_NV_low_latency2 ===
 
-  // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setLatencySleepModeNV( SwapchainKHR                   swapchain,
-                                                                               const LatencySleepModeInfoNV * pSleepModeInfo,
-                                                                               Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::setLatencySleepModeNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                                               const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV * pSleepModeInfo,
+                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkSetLatencySleepModeNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepModeInfoNV *>( pSleepModeInfo ) ) );
+    return static_cast<Result>(
+      d.vkSetLatencySleepModeNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepModeInfoNV *>( pSleepModeInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::setLatencySleepModeNV( SwapchainKHR swapchain, const LatencySleepModeInfoNV & sleepModeInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setLatencySleepModeNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                                                        const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV & sleepModeInfo,
+                                                                                        Dispatch const &                                     d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkSetLatencySleepModeNV && "Function <vkSetLatencySleepModeNV> requires <VK_NV_low_latency2>" );
 #  endif
 
-    Result result = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkSetLatencySleepModeNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepModeInfoNV *>( &sleepModeInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setLatencySleepModeNV" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setLatencySleepModeNV" );
 
-    return detail::createResultValueType( result );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::latencySleepNV( SwapchainKHR               swapchain,
-                                                                        const LatencySleepInfoNV * pSleepInfo,
-                                                                        Dispatch const &           d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE Result Device::latencySleepNV( VULKAN_HPP_NAMESPACE::SwapchainKHR               swapchain,
+                                                   const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV * pSleepInfo,
+                                                   Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkLatencySleepNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepInfoNV *>( pSleepInfo ) ) );
+    return static_cast<Result>(
+      d.vkLatencySleepNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepInfoNV *>( pSleepInfo ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-                                          Device::latencySleepNV( SwapchainKHR swapchain, const LatencySleepInfoNV & sleepInfo, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::latencySleepNV( VULKAN_HPP_NAMESPACE::SwapchainKHR               swapchain,
+                                                 const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV & sleepInfo,
+                                                 Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkLatencySleepNV && "Function <vkLatencySleepNV> requires <VK_NV_low_latency2>" );
 #  endif
 
-    Result result = static_cast<Result>(
-      d.vkLatencySleepNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepInfoNV *>( &sleepInfo ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::latencySleepNV" );
-
-    return detail::createResultValueType( result );
+    d.vkLatencySleepNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkLatencySleepInfoNV *>( &sleepInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::setLatencyMarkerNV( SwapchainKHR swapchain, const SetLatencyMarkerInfoNV * pLatencyMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setLatencyMarkerNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                     const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV * pLatencyMarkerInfo,
+                                                     Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkSetLatencyMarkerNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkSetLatencyMarkerInfoNV *>( pLatencyMarkerInfo ) );
+    d.vkSetLatencyMarkerNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<const VkSetLatencyMarkerInfoNV *>( pLatencyMarkerInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::setLatencyMarkerNV( SwapchainKHR swapchain, const SetLatencyMarkerInfoNV & latencyMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::setLatencyMarkerNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                     const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV & latencyMarkerInfo,
+                                                     Dispatch const &                                     d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -29405,76 +25894,44 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::getLatencyTimingsNV( SwapchainKHR swapchain, GetLatencyMarkerInfoNV * pLatencyMarkerInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Device::getLatencyTimingsNV( VULKAN_HPP_NAMESPACE::SwapchainKHR             swapchain,
+                                                      VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV * pLatencyMarkerInfo,
+                                                      Dispatch const &                               d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetLatencyTimingsNV(
-      static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( pLatencyMarkerInfo ) );
+    d.vkGetLatencyTimingsNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( pLatencyMarkerInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-  template <typename LatencyTimingsFrameReportNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename LatencyTimingsFrameReportNVAllocator::value_type, LatencyTimingsFrameReportNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator>
-                                         Device::getLatencyTimingsNV( SwapchainKHR swapchain, Dispatch const & d ) const
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV
+    Device::getLatencyTimingsNV( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
     VULKAN_HPP_ASSERT( d.vkGetLatencyTimingsNV && "Function <vkGetLatencyTimingsNV> requires <VK_NV_low_latency2>" );
 #  endif
 
-    std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator> timings;
-    GetLatencyMarkerInfoNV                                                         latencyMarkerInfo;
-    d.vkGetLatencyTimingsNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
-    timings.resize( latencyMarkerInfo.timingCount );
-    latencyMarkerInfo.pTimings = timings.data();
+    VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV latencyMarkerInfo;
     d.vkGetLatencyTimingsNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
 
-    return timings;
-  }
-
-  // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-  template <typename LatencyTimingsFrameReportNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename LatencyTimingsFrameReportNVAllocator::value_type, LatencyTimingsFrameReportNV>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator>
-    Device::getLatencyTimingsNV( SwapchainKHR swapchain, LatencyTimingsFrameReportNVAllocator & latencyTimingsFrameReportNVAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetLatencyTimingsNV && "Function <vkGetLatencyTimingsNV> requires <VK_NV_low_latency2>" );
-#  endif
-
-    std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator> timings( latencyTimingsFrameReportNVAllocator );
-    GetLatencyMarkerInfoNV                                                         latencyMarkerInfo;
-    d.vkGetLatencyTimingsNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
-    timings.resize( latencyMarkerInfo.timingCount );
-    latencyMarkerInfo.pTimings = timings.data();
-    d.vkGetLatencyTimingsNV( m_device, static_cast<VkSwapchainKHR>( swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
-
-    return timings;
+    return latencyMarkerInfo;
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV * pQueueTypeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV * pQueueTypeInfo,
+                                                   Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkQueueNotifyOutOfBandNV( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkOutOfBandQueueTypeInfoNV *>( pQueueTypeInfo ) );
+    d.vkQueueNotifyOutOfBandNV( m_queue, reinterpret_cast<const VkOutOfBandQueueTypeInfoNV *>( pQueueTypeInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV & queueTypeInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV & queueTypeInfo,
+                                                   Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -29487,28 +25944,20 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_cooperative_matrix ===
 
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeMatrixPropertiesKHR( uint32_t *                       pPropertyCount,
-                                                                                                   CooperativeMatrixPropertiesKHR * pProperties,
-                                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeMatrixPropertiesKHR(
+    uint32_t * pPropertyCount, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     return static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pPropertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( pProperties ) ) );
+      m_physicalDevice, pPropertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( pProperties ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-  template <
-    typename CooperativeMatrixPropertiesKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, CooperativeMatrixPropertiesKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
-                       PhysicalDevice::getCooperativeMatrixPropertiesKHR( Dispatch const & d ) const
+  template <typename CooperativeMatrixPropertiesKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
+    PhysicalDevice::getCooperativeMatrixPropertiesKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -29516,37 +25965,36 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR> requires <VK_KHR_cooperative_matrix>" );
 #  endif
 
-    std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator> properties;
-    uint32_t                                                                             propertyCount;
-    Result                                                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator> properties;
+    uint32_t                                                                                                   propertyCount;
+    VULKAN_HPP_NAMESPACE::Result                                                                               result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-  template <
-    typename CooperativeMatrixPropertiesKHRAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, CooperativeMatrixPropertiesKHR>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
-                       PhysicalDevice::getCooperativeMatrixPropertiesKHR( CooperativeMatrixPropertiesKHRAllocator & cooperativeMatrixPropertiesKHRAllocator,
+  template <typename CooperativeMatrixPropertiesKHRAllocator,
+            typename Dispatch,
+            typename std::enable_if<
+              std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>::value,
+              int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+    typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
+    PhysicalDevice::getCooperativeMatrixPropertiesKHR( CooperativeMatrixPropertiesKHRAllocator & cooperativeMatrixPropertiesKHRAllocator,
                                                        Dispatch const &                          d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -29555,902 +26003,55 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR> requires <VK_KHR_cooperative_matrix>" );
 #  endif
 
-    std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator> properties( cooperativeMatrixPropertiesKHRAllocator );
-    uint32_t                                                                             propertyCount;
-    Result                                                                               result;
+    std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator> properties(
+      cooperativeMatrixPropertiesKHRAllocator );
+    uint32_t                     propertyCount;
+    VULKAN_HPP_NAMESPACE::Result result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( m_physicalDevice, &propertyCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
       {
         properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
           m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( properties.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
     VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
     if ( propertyCount < properties.size() )
     {
       properties.resize( propertyCount );
     }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_ARM_data_graph ===
-
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDataGraphPipelinesARM( DeferredOperationKHR                   deferredOperation,
-                                                                                     PipelineCache                          pipelineCache,
-                                                                                     uint32_t                               createInfoCount,
-                                                                                     const DataGraphPipelineCreateInfoARM * pCreateInfos,
-                                                                                     const AllocationCallbacks *            pAllocator,
-                                                                                     Pipeline *                             pPipelines,
-                                                                                     Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDataGraphPipelinesARM( static_cast<VkDevice>( m_device ),
-                                                                 static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                 static_cast<VkPipelineCache>( pipelineCache ),
-                                                                 createInfoCount,
-                                                                 reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( pCreateInfos ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                 reinterpret_cast<VkPipeline *>( pPipelines ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createDataGraphPipelinesARM( DeferredOperationKHR                                     deferredOperation,
-                                         PipelineCache                                            pipelineCache,
-                                         ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                         Optional<const AllocationCallbacks>                      allocator,
-                                         Dispatch const &                                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size() );
-    Result                                   result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelinesARM", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
-  }
-
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename PipelineAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                                         Device::createDataGraphPipelinesARM( DeferredOperationKHR                                     deferredOperation,
-                                         PipelineCache                                            pipelineCache,
-                                         ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                         Optional<const AllocationCallbacks>                      allocator,
-                                         PipelineAllocator &                                      pipelineAllocator,
-                                         Dispatch const &                                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<Pipeline, PipelineAllocator> pipelines( createInfos.size(), pipelineAllocator );
-    Result                                   result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelinesARM", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<std::vector<Pipeline, PipelineAllocator>>( result, std::move( pipelines ) );
-  }
-
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<Pipeline> Device::createDataGraphPipelineARM( DeferredOperationKHR                   deferredOperation,
-                                                                                                   PipelineCache                          pipelineCache,
-                                                                                                   const DataGraphPipelineCreateInfoARM & createInfo,
-                                                                                                   Optional<const AllocationCallbacks>    allocator,
-                                                                                                   Dispatch const &                       d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          1,
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( &createInfo ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelineARM", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<Pipeline>( result, std::move( pipeline ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createDataGraphPipelinesARMUnique( DeferredOperationKHR                                     deferredOperation,
-                                               PipelineCache                                            pipelineCache,
-                                               ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                               Optional<const AllocationCallbacks>                      allocator,
-                                               Dispatch const &                                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#    endif
-
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelinesARMUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines;
-    uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipeline : pipelines )
-    {
-      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
-  }
-
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename Dispatch,
-            typename PipelineAllocator,
-            typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                                         Device::createDataGraphPipelinesARMUnique( DeferredOperationKHR                                     deferredOperation,
-                                               PipelineCache                                            pipelineCache,
-                                               ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                               Optional<const AllocationCallbacks>                      allocator,
-                                               PipelineAllocator &                                      pipelineAllocator,
-                                               Dispatch const &                                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#    endif
-
-    std::vector<Pipeline> pipelines( createInfos.size() );
-    Result                result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          createInfos.size(),
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( createInfos.data() ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelinesARMUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-    std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator> uniquePipelines( pipelineAllocator );
-    uniquePipelines.reserve( createInfos.size() );
-    detail::ObjectDestroy<Device, Dispatch> deleter( *this, allocator, d );
-    for ( auto const & pipeline : pipelines )
-    {
-      uniquePipelines.push_back( UniqueHandle<Pipeline, Dispatch>( pipeline, deleter ) );
-    }
-    return ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>( result, std::move( uniquePipelines ) );
-  }
-
-  // wrapper function for command vkCreateDataGraphPipelinesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                                         Device::createDataGraphPipelineARMUnique( DeferredOperationKHR                   deferredOperation,
-                                              PipelineCache                          pipelineCache,
-                                              const DataGraphPipelineCreateInfoARM & createInfo,
-                                              Optional<const AllocationCallbacks>    allocator,
-                                              Dispatch const &                       d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelinesARM && "Function <vkCreateDataGraphPipelinesARM> requires <VK_ARM_data_graph>" );
-#    endif
-
-    Pipeline pipeline;
-    Result   result = static_cast<Result>( d.vkCreateDataGraphPipelinesARM( m_device,
-                                                                          static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                          static_cast<VkPipelineCache>( pipelineCache ),
-                                                                          1,
-                                                                          reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( &createInfo ),
-                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                          reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-    detail::resultCheck(
-      result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelineARMUnique", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-
-    return ResultValue<UniqueHandle<Pipeline, Dispatch>>(
-      result, UniqueHandle<Pipeline, Dispatch>( pipeline, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createDataGraphPipelineSessionARM( const DataGraphPipelineSessionCreateInfoARM * pCreateInfo,
-                                                                                           const AllocationCallbacks *                   pAllocator,
-                                                                                           DataGraphPipelineSessionARM *                 pSession,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateDataGraphPipelineSessionARM( static_cast<VkDevice>( m_device ),
-                                                                       reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( pCreateInfo ),
-                                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                       reinterpret_cast<VkDataGraphPipelineSessionARM *>( pSession ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataGraphPipelineSessionARM>::type Device::createDataGraphPipelineSessionARM(
-    const DataGraphPipelineSessionCreateInfoARM & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelineSessionARM && "Function <vkCreateDataGraphPipelineSessionARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    DataGraphPipelineSessionARM session;
-    Result                      result =
-      static_cast<Result>( d.vkCreateDataGraphPipelineSessionARM( m_device,
-                                                                  reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkDataGraphPipelineSessionARM *>( &session ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelineSessionARM" );
-
-    return detail::createResultValueType( result, std::move( session ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<DataGraphPipelineSessionARM, Dispatch>>::type
-                       Device::createDataGraphPipelineSessionARMUnique( const DataGraphPipelineSessionCreateInfoARM & createInfo,
-                                                     Optional<const AllocationCallbacks>           allocator,
-                                                     Dispatch const &                              d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateDataGraphPipelineSessionARM && "Function <vkCreateDataGraphPipelineSessionARM> requires <VK_ARM_data_graph>" );
-#    endif
-
-    DataGraphPipelineSessionARM session;
-    Result                      result =
-      static_cast<Result>( d.vkCreateDataGraphPipelineSessionARM( m_device,
-                                                                  reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( &createInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                  reinterpret_cast<VkDataGraphPipelineSessionARM *>( &session ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createDataGraphPipelineSessionARMUnique" );
-
-    return detail::createResultValueType(
-      result, UniqueHandle<DataGraphPipelineSessionARM, Dispatch>( session, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM * pInfo,
-                                                                 uint32_t *                                                   pBindPointRequirementCount,
-                                                                 DataGraphPipelineSessionBindPointRequirementARM *            pBindPointRequirements,
-                                                                 Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-      static_cast<VkDevice>( m_device ),
-      reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( pInfo ),
-      pBindPointRequirementCount,
-      reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( pBindPointRequirements ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-  template <typename DataGraphPipelineSessionBindPointRequirementARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataGraphPipelineSessionBindPointRequirementARMAllocator::value_type,
-                                                 DataGraphPipelineSessionBindPointRequirementARM>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator>>::type
-    Device::getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM & info, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM &&
-                       "Function <vkGetDataGraphPipelineSessionBindPointRequirementsARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator> bindPointRequirements;
-    uint32_t                                                                                                               bindPointRequirementCount;
-    Result                                                                                                                 result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-        m_device, reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ), &bindPointRequirementCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && bindPointRequirementCount )
-      {
-        bindPointRequirements.resize( bindPointRequirementCount );
-        result = static_cast<Result>( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-          m_device,
-          reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ),
-          &bindPointRequirementCount,
-          reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( bindPointRequirements.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDataGraphPipelineSessionBindPointRequirementsARM" );
-    VULKAN_HPP_ASSERT( bindPointRequirementCount <= bindPointRequirements.size() );
-    if ( bindPointRequirementCount < bindPointRequirements.size() )
-    {
-      bindPointRequirements.resize( bindPointRequirementCount );
-    }
-    return detail::createResultValueType( result, std::move( bindPointRequirements ) );
-  }
-
-  // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-  template <typename DataGraphPipelineSessionBindPointRequirementARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataGraphPipelineSessionBindPointRequirementARMAllocator::value_type,
-                                                 DataGraphPipelineSessionBindPointRequirementARM>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator>>::type
-    Device::getDataGraphPipelineSessionBindPointRequirementsARM(
-      const DataGraphPipelineSessionBindPointRequirementsInfoARM & info,
-      DataGraphPipelineSessionBindPointRequirementARMAllocator &   dataGraphPipelineSessionBindPointRequirementARMAllocator,
-      Dispatch const &                                             d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM &&
-                       "Function <vkGetDataGraphPipelineSessionBindPointRequirementsARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator> bindPointRequirements(
-      dataGraphPipelineSessionBindPointRequirementARMAllocator );
-    uint32_t bindPointRequirementCount;
-    Result   result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-        m_device, reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ), &bindPointRequirementCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && bindPointRequirementCount )
-      {
-        bindPointRequirements.resize( bindPointRequirementCount );
-        result = static_cast<Result>( d.vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-          m_device,
-          reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ),
-          &bindPointRequirementCount,
-          reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( bindPointRequirements.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDataGraphPipelineSessionBindPointRequirementsARM" );
-    VULKAN_HPP_ASSERT( bindPointRequirementCount <= bindPointRequirements.size() );
-    if ( bindPointRequirementCount < bindPointRequirements.size() )
-    {
-      bindPointRequirements.resize( bindPointRequirementCount );
-    }
-    return detail::createResultValueType( result, std::move( bindPointRequirements ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM * pInfo,
-                                                                                   MemoryRequirements2 * pMemoryRequirements,
-                                                                                   Dispatch const &      d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetDataGraphPipelineSessionMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                                          reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( pInfo ),
-                                                          reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2 Device::getDataGraphPipelineSessionMemoryRequirementsARM(
-    const DataGraphPipelineSessionMemoryRequirementsInfoARM & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineSessionMemoryRequirementsARM &&
-                       "Function <vkGetDataGraphPipelineSessionMemoryRequirementsARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetDataGraphPipelineSessionMemoryRequirementsARM( m_device,
-                                                          reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( &info ),
-                                                          reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info,
-                                                              Dispatch const &                                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineSessionMemoryRequirementsARM &&
-                       "Function <vkGetDataGraphPipelineSessionMemoryRequirementsARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetDataGraphPipelineSessionMemoryRequirementsARM( m_device,
-                                                          reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( &info ),
-                                                          reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::bindDataGraphPipelineSessionMemoryARM( uint32_t                                          bindInfoCount,
-                                                                                               const BindDataGraphPipelineSessionMemoryInfoARM * pBindInfos,
-                                                                                               Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkBindDataGraphPipelineSessionMemoryARM(
-      static_cast<VkDevice>( m_device ), bindInfoCount, reinterpret_cast<const VkBindDataGraphPipelineSessionMemoryInfoARM *>( pBindInfos ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::bindDataGraphPipelineSessionMemoryARM( ArrayProxy<const BindDataGraphPipelineSessionMemoryInfoARM> const & bindInfos, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkBindDataGraphPipelineSessionMemoryARM && "Function <vkBindDataGraphPipelineSessionMemoryARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    Result result = static_cast<Result>( d.vkBindDataGraphPipelineSessionMemoryARM(
-      m_device, bindInfos.size(), reinterpret_cast<const VkBindDataGraphPipelineSessionMemoryInfoARM *>( bindInfos.data() ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindDataGraphPipelineSessionMemoryARM" );
-
-    return detail::createResultValueType( result );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDataGraphPipelineSessionARM( DataGraphPipelineSessionARM session,
-                                                                     const AllocationCallbacks * pAllocator,
-                                                                     Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDataGraphPipelineSessionARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkDataGraphPipelineSessionARM>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyDataGraphPipelineSessionARM( DataGraphPipelineSessionARM         session,
-                                                                     Optional<const AllocationCallbacks> allocator,
-                                                                     Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyDataGraphPipelineSessionARM && "Function <vkDestroyDataGraphPipelineSessionARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    d.vkDestroyDataGraphPipelineSessionARM(
-      m_device, static_cast<VkDataGraphPipelineSessionARM>( session ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DataGraphPipelineSessionARM session, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyDataGraphPipelineSessionARM(
-      static_cast<VkDevice>( m_device ), static_cast<VkDataGraphPipelineSessionARM>( session ), reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( DataGraphPipelineSessionARM session, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyDataGraphPipelineSessionARM && "Function <vkDestroyDataGraphPipelineSessionARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    d.vkDestroyDataGraphPipelineSessionARM(
-      m_device, static_cast<VkDataGraphPipelineSessionARM>( session ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchDataGraphARM( DataGraphPipelineSessionARM              session,
-                                                              const DataGraphPipelineDispatchInfoARM * pInfo,
-                                                              Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDispatchDataGraphARM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                 static_cast<VkDataGraphPipelineSessionARM>( session ),
-                                 reinterpret_cast<const VkDataGraphPipelineDispatchInfoARM *>( pInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::dispatchDataGraphARM( DataGraphPipelineSessionARM                      session,
-                                                              Optional<const DataGraphPipelineDispatchInfoARM> info,
-                                                              Dispatch const &                                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdDispatchDataGraphARM && "Function <vkCmdDispatchDataGraphARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    d.vkCmdDispatchDataGraphARM(
-      m_commandBuffer, static_cast<VkDataGraphPipelineSessionARM>( session ), reinterpret_cast<const VkDataGraphPipelineDispatchInfoARM *>( info.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM * pPipelineInfo,
-                                                                                                    uint32_t *                       pPropertiesCount,
-                                                                                                    DataGraphPipelinePropertyARM *   pProperties,
-                                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDataGraphPipelineAvailablePropertiesARM( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkDataGraphPipelineInfoARM *>( pPipelineInfo ),
-                                                                                pPropertiesCount,
-                                                                                reinterpret_cast<VkDataGraphPipelinePropertyARM *>( pProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-  template <typename DataGraphPipelinePropertyARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataGraphPipelinePropertyARMAllocator::value_type, DataGraphPipelinePropertyARM>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator>>::type
-                       Device::getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM & pipelineInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineAvailablePropertiesARM &&
-                       "Function <vkGetDataGraphPipelineAvailablePropertiesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator> properties;
-    uint32_t                                                                         propertiesCount;
-    Result                                                                           result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDataGraphPipelineAvailablePropertiesARM(
-        m_device, reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ), &propertiesCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertiesCount )
-      {
-        properties.resize( propertiesCount );
-        result =
-          static_cast<Result>( d.vkGetDataGraphPipelineAvailablePropertiesARM( m_device,
-                                                                               reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ),
-                                                                               &propertiesCount,
-                                                                               reinterpret_cast<VkDataGraphPipelinePropertyARM *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDataGraphPipelineAvailablePropertiesARM" );
-    VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
-    if ( propertiesCount < properties.size() )
-    {
-      properties.resize( propertiesCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-
-  // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-  template <typename DataGraphPipelinePropertyARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename DataGraphPipelinePropertyARMAllocator::value_type, DataGraphPipelinePropertyARM>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator>>::type
-                       Device::getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM &        pipelineInfo,
-                                                        DataGraphPipelinePropertyARMAllocator & dataGraphPipelinePropertyARMAllocator,
-                                                        Dispatch const &                        d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetDataGraphPipelineAvailablePropertiesARM &&
-                       "Function <vkGetDataGraphPipelineAvailablePropertiesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator> properties( dataGraphPipelinePropertyARMAllocator );
-    uint32_t                                                                         propertiesCount;
-    Result                                                                           result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetDataGraphPipelineAvailablePropertiesARM(
-        m_device, reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ), &propertiesCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertiesCount )
-      {
-        properties.resize( propertiesCount );
-        result =
-          static_cast<Result>( d.vkGetDataGraphPipelineAvailablePropertiesARM( m_device,
-                                                                               reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ),
-                                                                               &propertiesCount,
-                                                                               reinterpret_cast<VkDataGraphPipelinePropertyARM *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getDataGraphPipelineAvailablePropertiesARM" );
-    VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
-    if ( propertiesCount < properties.size() )
-    {
-      properties.resize( propertiesCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetDataGraphPipelinePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelinePropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getDataGraphPipelinePropertiesARM( const DataGraphPipelineInfoARM *          pPipelineInfo,
-                                                                                           uint32_t                                  propertiesCount,
-                                                                                           DataGraphPipelinePropertyQueryResultARM * pProperties,
-                                                                                           Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetDataGraphPipelinePropertiesARM( static_cast<VkDevice>( m_device ),
-                                                                       reinterpret_cast<const VkDataGraphPipelineInfoARM *>( pPipelineInfo ),
-                                                                       propertiesCount,
-                                                                       reinterpret_cast<VkDataGraphPipelinePropertyQueryResultARM *>( pProperties ) ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::getQueueFamilyDataGraphPropertiesARM( uint32_t                            queueFamilyIndex,
-                                                          uint32_t *                          pQueueFamilyDataGraphPropertyCount,
-                                                          QueueFamilyDataGraphPropertiesARM * pQueueFamilyDataGraphProperties,
-                                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                              queueFamilyIndex,
-                                                              pQueueFamilyDataGraphPropertyCount,
-                                                              reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( pQueueFamilyDataGraphProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-  template <
-    typename QueueFamilyDataGraphPropertiesARMAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename QueueFamilyDataGraphPropertiesARMAllocator::value_type, QueueFamilyDataGraphPropertiesARM>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator>>::type
-    PhysicalDevice::getQueueFamilyDataGraphPropertiesARM( uint32_t queueFamilyIndex, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator> queueFamilyDataGraphProperties;
-    uint32_t                                                                                   queueFamilyDataGraphPropertyCount;
-    Result                                                                                     result;
-    do
-    {
-      result = static_cast<Result>(
-        d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM( m_physicalDevice, queueFamilyIndex, &queueFamilyDataGraphPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && queueFamilyDataGraphPropertyCount )
-      {
-        queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-          m_physicalDevice,
-          queueFamilyIndex,
-          &queueFamilyDataGraphPropertyCount,
-          reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( queueFamilyDataGraphProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getQueueFamilyDataGraphPropertiesARM" );
-    VULKAN_HPP_ASSERT( queueFamilyDataGraphPropertyCount <= queueFamilyDataGraphProperties.size() );
-    if ( queueFamilyDataGraphPropertyCount < queueFamilyDataGraphProperties.size() )
-    {
-      queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-    }
-    return detail::createResultValueType( result, std::move( queueFamilyDataGraphProperties ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-  template <
-    typename QueueFamilyDataGraphPropertiesARMAllocator,
-    typename Dispatch,
-    typename std::enable_if<std::is_same<typename QueueFamilyDataGraphPropertiesARMAllocator::value_type, QueueFamilyDataGraphPropertiesARM>::value, int>::type,
-    typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator>>::type
-    PhysicalDevice::getQueueFamilyDataGraphPropertiesARM( uint32_t                                     queueFamilyIndex,
-                                                          QueueFamilyDataGraphPropertiesARMAllocator & queueFamilyDataGraphPropertiesARMAllocator,
-                                                          Dispatch const &                             d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator> queueFamilyDataGraphProperties(
-      queueFamilyDataGraphPropertiesARMAllocator );
-    uint32_t queueFamilyDataGraphPropertyCount;
-    Result   result;
-    do
-    {
-      result = static_cast<Result>(
-        d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM( m_physicalDevice, queueFamilyIndex, &queueFamilyDataGraphPropertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && queueFamilyDataGraphPropertyCount )
-      {
-        queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-          m_physicalDevice,
-          queueFamilyIndex,
-          &queueFamilyDataGraphPropertyCount,
-          reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( queueFamilyDataGraphProperties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getQueueFamilyDataGraphPropertiesARM" );
-    VULKAN_HPP_ASSERT( queueFamilyDataGraphPropertyCount <= queueFamilyDataGraphProperties.size() );
-    if ( queueFamilyDataGraphPropertyCount < queueFamilyDataGraphProperties.size() )
-    {
-      queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-    }
-    return detail::createResultValueType( result, std::move( queueFamilyDataGraphProperties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void PhysicalDevice::getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-    const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM * pQueueFamilyDataGraphProcessingEngineInfo,
-    QueueFamilyDataGraphProcessingEnginePropertiesARM *               pQueueFamilyDataGraphProcessingEngineProperties,
-    Dispatch const &                                                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ),
-      reinterpret_cast<const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( pQueueFamilyDataGraphProcessingEngineInfo ),
-      reinterpret_cast<VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( pQueueFamilyDataGraphProcessingEngineProperties ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE QueueFamilyDataGraphProcessingEnginePropertiesARM PhysicalDevice::getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-    const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & queueFamilyDataGraphProcessingEngineInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM &&
-                       "Function <vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM> requires <VK_ARM_data_graph>" );
-#  endif
-
-    QueueFamilyDataGraphProcessingEnginePropertiesARM queueFamilyDataGraphProcessingEngineProperties;
-    d.vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-      m_physicalDevice,
-      reinterpret_cast<const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( &queueFamilyDataGraphProcessingEngineInfo ),
-      reinterpret_cast<VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( &queueFamilyDataGraphProcessingEngineProperties ) );
-
-    return queueFamilyDataGraphProcessingEngineProperties;
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
 
-  // wrapper function for command vkCmdSetAttachmentFeedbackLoopEnableEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAttachmentFeedbackLoopEnableEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setAttachmentFeedbackLoopEnableEXT( ImageAspectFlags aspectMask, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::setAttachmentFeedbackLoopEnableEXT( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask,
+                                                                            Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetAttachmentFeedbackLoopEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkImageAspectFlags>( aspectMask ) );
+    d.vkCmdSetAttachmentFeedbackLoopEnableEXT( m_commandBuffer, static_cast<VkImageAspectFlags>( aspectMask ) );
   }
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_external_memory_screen_buffer ===
 
-  // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getScreenBufferPropertiesQNX( const struct _screen_buffer * buffer,
-                                                                                      ScreenBufferPropertiesQNX *   pProperties,
-                                                                                      Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getScreenBufferPropertiesQNX( const struct _screen_buffer *                     buffer,
+                                                                                      VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX * pProperties,
+                                                                                      Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkGetScreenBufferPropertiesQNX( static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( pProperties ) ) );
+    return static_cast<Result>( d.vkGetScreenBufferPropertiesQNX( m_device, buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( pProperties ) ) );
   }
 
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ScreenBufferPropertiesQNX>::type
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX>::type
                        Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -30458,18 +26059,16 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetScreenBufferPropertiesQNX && "Function <vkGetScreenBufferPropertiesQNX> requires <VK_QNX_external_memory_screen_buffer>" );
 #    endif
 
-    ScreenBufferPropertiesQNX properties;
-    Result                    result =
-      static_cast<Result>( d.vkGetScreenBufferPropertiesQNX( m_device, &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
+    VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX properties;
+    VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetScreenBufferPropertiesQNX( m_device, &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
 
-    return detail::createResultValueType( result, std::move( properties ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
   }
 
-  // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
+  template <typename X, typename Y, typename... Z, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
                        Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -30477,50 +26076,42 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_ASSERT( d.vkGetScreenBufferPropertiesQNX && "Function <vkGetScreenBufferPropertiesQNX> requires <VK_QNX_external_memory_screen_buffer>" );
 #    endif
 
-    StructureChain<X, Y, Z...>  structureChain;
-    ScreenBufferPropertiesQNX & properties = structureChain.template get<ScreenBufferPropertiesQNX>();
-    Result                      result =
-      static_cast<Result>( d.vkGetScreenBufferPropertiesQNX( m_device, &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
+    StructureChain<X, Y, Z...>                        structureChain;
+    VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX>();
+    VULKAN_HPP_NAMESPACE::Result                      result     = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+      d.vkGetScreenBufferPropertiesQNX( m_device, &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
 
-    return detail::createResultValueType( result, std::move( structureChain ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
   }
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
   //=== VK_KHR_line_rasterization ===
 
-  // wrapper function for command vkCmdSetLineStippleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_INLINE void
     CommandBuffer::setLineStippleKHR( uint32_t lineStippleFactor, uint16_t lineStipplePattern, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetLineStippleKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
+    d.vkCmdSetLineStippleKHR( m_commandBuffer, lineStippleFactor, lineStipplePattern );
   }
 
   //=== VK_KHR_calibrated_timestamps ===
 
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCalibrateableTimeDomainsKHR( uint32_t *       pTimeDomainCount,
-                                                                                                TimeDomainKHR *  pTimeDomains,
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCalibrateableTimeDomainsKHR( uint32_t *                            pTimeDomainCount,
+                                                                                                VULKAN_HPP_NAMESPACE::TimeDomainKHR * pTimeDomains,
                                                                                                 Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ), pTimeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( pTimeDomains ) ) );
+    return static_cast<Result>(
+      d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, pTimeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( pTimeDomains ) ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-  template <typename TimeDomainKHRAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+  template <typename TimeDomainKHRAllocator, typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
                        PhysicalDevice::getCalibrateableTimeDomainsKHR( Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -30529,35 +26120,32 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsKHR> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 #  endif
 
-    std::vector<TimeDomainKHR, TimeDomainKHRAllocator> timeDomains;
-    uint32_t                                           timeDomainCount;
-    Result                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator> timeDomains;
+    uint32_t                                                                 timeDomainCount;
+    VULKAN_HPP_NAMESPACE::Result                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && timeDomainCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
       {
         timeDomains.resize( timeDomainCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
     VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
     if ( timeDomainCount < timeDomains.size() )
     {
       timeDomains.resize( timeDomainCount );
     }
-    return detail::createResultValueType( result, std::move( timeDomains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
   }
 
-  // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
   template <typename TimeDomainKHRAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+            typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::TimeDomainKHR>::value, int>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
                        PhysicalDevice::getCalibrateableTimeDomainsKHR( TimeDomainKHRAllocator & timeDomainKHRAllocator, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
@@ -30566,53 +26154,46 @@ namespace VULKAN_HPP_NAMESPACE
                        "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsKHR> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 #  endif
 
-    std::vector<TimeDomainKHR, TimeDomainKHRAllocator> timeDomains( timeDomainKHRAllocator );
-    uint32_t                                           timeDomainCount;
-    Result                                             result;
+    std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator> timeDomains( timeDomainKHRAllocator );
+    uint32_t                                                                 timeDomainCount;
+    VULKAN_HPP_NAMESPACE::Result                                             result;
     do
     {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && timeDomainCount )
+      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, nullptr ) );
+      if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
       {
         timeDomains.resize( timeDomainCount );
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           d.vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( m_physicalDevice, &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
       }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
+    } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
     VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
     if ( timeDomainCount < timeDomains.size() )
     {
       timeDomains.resize( timeDomainCount );
     }
-    return detail::createResultValueType( result, std::move( timeDomains ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkGetCalibratedTimestampsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCalibratedTimestampsKHR( uint32_t                           timestampCount,
-                                                                                    const CalibratedTimestampInfoKHR * pTimestampInfos,
-                                                                                    uint64_t *                         pTimestamps,
-                                                                                    uint64_t *                         pMaxDeviation,
-                                                                                    Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getCalibratedTimestampsKHR( uint32_t                                                 timestampCount,
+                                                                                    const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR * pTimestampInfos,
+                                                                                    uint64_t *                                               pTimestamps,
+                                                                                    uint64_t *                                               pMaxDeviation,
+                                                                                    Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetCalibratedTimestampsKHR( static_cast<VkDevice>( m_device ),
-                                                                timestampCount,
-                                                                reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( pTimestampInfos ),
-                                                                pTimestamps,
-                                                                pMaxDeviation ) );
+    return static_cast<Result>( d.vkGetCalibratedTimestampsKHR(
+      m_device, timestampCount, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( pTimestampInfos ), pTimestamps, pMaxDeviation ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetCalibratedTimestampsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-  template <typename Uint64_tAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Uint64_tAllocator, typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-                       Device::getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos, Dispatch const & d ) const
+    Device::getCalibratedTimestampsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                        Dispatch const &                                                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -30624,22 +26205,20 @@ namespace VULKAN_HPP_NAMESPACE
       std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) );
     std::vector<uint64_t, Uint64_tAllocator> & timestamps   = data_.first;
     uint64_t &                                 maxDeviation = data_.second;
-    Result                                     result       = static_cast<Result>( d.vkGetCalibratedTimestampsKHR(
+    VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCalibratedTimestampsKHR(
       m_device, timestampInfos.size(), reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ), timestamps.data(), &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetCalibratedTimestampsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
   template <typename Uint64_tAllocator,
             typename Dispatch,
-            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+            typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-                       Device::getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                        Uint64_tAllocator &                                  uint64_tAllocator,
-                                        Dispatch const &                                     d ) const
+    Device::getCalibratedTimestampsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                        Uint64_tAllocator &                                                                              uint64_tAllocator,
+                                        Dispatch const &                                                                                 d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -30651,17 +26230,16 @@ namespace VULKAN_HPP_NAMESPACE
       std::piecewise_construct, std::forward_as_tuple( timestampInfos.size(), uint64_tAllocator ), std::forward_as_tuple( 0 ) );
     std::vector<uint64_t, Uint64_tAllocator> & timestamps   = data_.first;
     uint64_t &                                 maxDeviation = data_.second;
-    Result                                     result       = static_cast<Result>( d.vkGetCalibratedTimestampsKHR(
+    VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( d.vkGetCalibratedTimestampsKHR(
       m_device, timestampInfos.size(), reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ), timestamps.data(), &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 
-  // wrapper function for command vkGetCalibratedTimestampsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
+  template <typename Dispatch>
   VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-                       Device::getCalibratedTimestampKHR( const CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d ) const
+                       Device::getCalibratedTimestampKHR( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d ) const
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -30672,134 +26250,122 @@ namespace VULKAN_HPP_NAMESPACE
     std::pair<uint64_t, uint64_t> data_;
     uint64_t &                    timestamp    = data_.first;
     uint64_t &                    maxDeviation = data_.second;
-    Result                        result       = static_cast<Result>(
+    VULKAN_HPP_NAMESPACE::Result  result       = static_cast<VULKAN_HPP_NAMESPACE::Result>(
       d.vkGetCalibratedTimestampsKHR( m_device, 1, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( &timestampInfo ), &timestamp, &maxDeviation ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampKHR" );
+    VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampKHR" );
 
-    return detail::createResultValueType( result, std::move( data_ ) );
+    return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_KHR_maintenance6 ===
 
-  // wrapper function for command vkCmdBindDescriptorSets2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2KHR( const BindDescriptorSetsInfo * pBindDescriptorSetsInfo,
-                                                                Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR * pBindDescriptorSetsInfo,
+                                                                Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindDescriptorSets2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                   reinterpret_cast<const VkBindDescriptorSetsInfo *>( pBindDescriptorSetsInfo ) );
+    d.vkCmdBindDescriptorSets2KHR( m_commandBuffer, reinterpret_cast<const VkBindDescriptorSetsInfoKHR *>( pBindDescriptorSetsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindDescriptorSets2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2KHR( const BindDescriptorSetsInfo & bindDescriptorSetsInfo,
-                                                                Dispatch const &               d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR & bindDescriptorSetsInfo,
+                                                                Dispatch const &                                        d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBindDescriptorSets2KHR && "Function <vkCmdBindDescriptorSets2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdBindDescriptorSets2KHR && "Function <vkCmdBindDescriptorSets2KHR> requires <VK_KHR_maintenance6>" );
 #  endif
 
-    d.vkCmdBindDescriptorSets2KHR( m_commandBuffer, reinterpret_cast<const VkBindDescriptorSetsInfo *>( &bindDescriptorSetsInfo ) );
+    d.vkCmdBindDescriptorSets2KHR( m_commandBuffer, reinterpret_cast<const VkBindDescriptorSetsInfoKHR *>( &bindDescriptorSetsInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const PushConstantsInfo * pPushConstantsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR * pPushConstantsInfo,
+                                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushConstants2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPushConstantsInfo *>( pPushConstantsInfo ) );
+    d.vkCmdPushConstants2KHR( m_commandBuffer, reinterpret_cast<const VkPushConstantsInfoKHR *>( pPushConstantsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const PushConstantsInfo & pushConstantsInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR & pushConstantsInfo,
+                                                           Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushConstants2KHR && "Function <vkCmdPushConstants2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdPushConstants2KHR && "Function <vkCmdPushConstants2KHR> requires <VK_KHR_maintenance6>" );
 #  endif
 
-    d.vkCmdPushConstants2KHR( m_commandBuffer, reinterpret_cast<const VkPushConstantsInfo *>( &pushConstantsInfo ) );
+    d.vkCmdPushConstants2KHR( m_commandBuffer, reinterpret_cast<const VkPushConstantsInfoKHR *>( &pushConstantsInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2KHR( const PushDescriptorSetInfo * pPushDescriptorSetInfo,
-                                                               Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR * pPushDescriptorSetInfo,
+                                                               Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSet2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkPushDescriptorSetInfo *>( pPushDescriptorSetInfo ) );
+    d.vkCmdPushDescriptorSet2KHR( m_commandBuffer, reinterpret_cast<const VkPushDescriptorSetInfoKHR *>( pPushDescriptorSetInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2KHR( const PushDescriptorSetInfo & pushDescriptorSetInfo,
-                                                               Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR & pushDescriptorSetInfo,
+                                                               Dispatch const &                                       d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSet2KHR && "Function <vkCmdPushDescriptorSet2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSet2KHR && "Function <vkCmdPushDescriptorSet2KHR> requires <VK_KHR_maintenance6>" );
 #  endif
 
-    d.vkCmdPushDescriptorSet2KHR( m_commandBuffer, reinterpret_cast<const VkPushDescriptorSetInfo *>( &pushDescriptorSetInfo ) );
+    d.vkCmdPushDescriptorSet2KHR( m_commandBuffer, reinterpret_cast<const VkPushDescriptorSetInfoKHR *>( &pushDescriptorSetInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo,
-                                                                           Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::pushDescriptorSetWithTemplate2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR * pPushDescriptorSetWithTemplateInfo,
+                                                      Dispatch const &                                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPushDescriptorSetWithTemplate2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                              reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( pPushDescriptorSetWithTemplateInfo ) );
+    d.vkCmdPushDescriptorSetWithTemplate2KHR( m_commandBuffer,
+                                              reinterpret_cast<const VkPushDescriptorSetWithTemplateInfoKHR *>( pPushDescriptorSetWithTemplateInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo,
-                                                                           Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::pushDescriptorSetWithTemplate2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR & pushDescriptorSetWithTemplateInfo,
+                                                      Dispatch const &                                                   d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetWithTemplate2KHR &&
-                       "Function <vkCmdPushDescriptorSetWithTemplate2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+    VULKAN_HPP_ASSERT( d.vkCmdPushDescriptorSetWithTemplate2KHR && "Function <vkCmdPushDescriptorSetWithTemplate2KHR> requires <VK_KHR_maintenance6>" );
 #  endif
 
     d.vkCmdPushDescriptorSetWithTemplate2KHR( m_commandBuffer,
-                                              reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( &pushDescriptorSetWithTemplateInfo ) );
+                                              reinterpret_cast<const VkPushDescriptorSetWithTemplateInfoKHR *>( &pushDescriptorSetWithTemplateInfo ) );
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo,
-                                                                        Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setDescriptorBufferOffsets2EXT( const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo,
+                                                   Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdSetDescriptorBufferOffsets2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                           reinterpret_cast<const VkSetDescriptorBufferOffsetsInfoEXT *>( pSetDescriptorBufferOffsetsInfo ) );
+    d.vkCmdSetDescriptorBufferOffsets2EXT( m_commandBuffer, reinterpret_cast<const VkSetDescriptorBufferOffsetsInfoEXT *>( pSetDescriptorBufferOffsetsInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo,
-                                                                        Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void
+    CommandBuffer::setDescriptorBufferOffsets2EXT( const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo,
+                                                   Dispatch const &                                                d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -30810,26 +26376,21 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::bindDescriptorBufferEmbeddedSamplers2EXT( const BindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo,
-                                                             Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplers2EXT(
+    const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo,
+    Dispatch const &                                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
     d.vkCmdBindDescriptorBufferEmbeddedSamplers2EXT(
-      static_cast<VkCommandBuffer>( m_commandBuffer ),
-      reinterpret_cast<const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( pBindDescriptorBufferEmbeddedSamplersInfo ) );
+      m_commandBuffer, reinterpret_cast<const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( pBindDescriptorBufferEmbeddedSamplersInfo ) );
   }
 
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    CommandBuffer::bindDescriptorBufferEmbeddedSamplers2EXT( const BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo,
-                                                             Dispatch const &                                    d ) const VULKAN_HPP_NOEXCEPT
+  template <typename Dispatch>
+  VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplers2EXT(
+    const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo,
+    Dispatch const &                                                          d ) const VULKAN_HPP_NOEXCEPT
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
 #  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
@@ -30842,1404 +26403,5 @@ namespace VULKAN_HPP_NAMESPACE
   }
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  //=== VK_QCOM_tile_memory_heap ===
-
-  // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindTileMemoryQCOM( const TileMemoryBindInfoQCOM * pTileMemoryBindInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBindTileMemoryQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkTileMemoryBindInfoQCOM *>( pTileMemoryBindInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::bindTileMemoryQCOM( Optional<const TileMemoryBindInfoQCOM> tileMemoryBindInfo,
-                                                            Dispatch const &                       d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBindTileMemoryQCOM && "Function <vkCmdBindTileMemoryQCOM> requires <VK_QCOM_tile_memory_heap>" );
-#  endif
-
-    d.vkCmdBindTileMemoryQCOM( m_commandBuffer, reinterpret_cast<const VkTileMemoryBindInfoQCOM *>( tileMemoryBindInfo.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_KHR_copy_memory_indirect ===
-
-  // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR * pCopyMemoryIndirectInfo,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkCopyMemoryIndirectInfoKHR *>( pCopyMemoryIndirectInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR & copyMemoryIndirectInfo,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyMemoryIndirectKHR && "Function <vkCmdCopyMemoryIndirectKHR> requires <VK_KHR_copy_memory_indirect>" );
-#  endif
-
-    d.vkCmdCopyMemoryIndirectKHR( m_commandBuffer, reinterpret_cast<const VkCopyMemoryIndirectInfoKHR *>( &copyMemoryIndirectInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR * pCopyMemoryToImageIndirectInfo,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdCopyMemoryToImageIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                         reinterpret_cast<const VkCopyMemoryToImageIndirectInfoKHR *>( pCopyMemoryToImageIndirectInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR & copyMemoryToImageIndirectInfo,
-                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdCopyMemoryToImageIndirectKHR && "Function <vkCmdCopyMemoryToImageIndirectKHR> requires <VK_KHR_copy_memory_indirect>" );
-#  endif
-
-    d.vkCmdCopyMemoryToImageIndirectKHR( m_commandBuffer, reinterpret_cast<const VkCopyMemoryToImageIndirectInfoKHR *>( &copyMemoryToImageIndirectInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_EXT_memory_decompression ===
-
-  // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryEXT( const DecompressMemoryInfoEXT * pDecompressMemoryInfoEXT,
-                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDecompressMemoryEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                reinterpret_cast<const VkDecompressMemoryInfoEXT *>( pDecompressMemoryInfoEXT ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryEXT( const DecompressMemoryInfoEXT & decompressMemoryInfoEXT,
-                                                             Dispatch const &                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdDecompressMemoryEXT && "Function <vkCmdDecompressMemoryEXT> requires <VK_EXT_memory_decompression>" );
-#  endif
-
-    d.vkCmdDecompressMemoryEXT( m_commandBuffer, reinterpret_cast<const VkDecompressMemoryInfoEXT *>( &decompressMemoryInfoEXT ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdDecompressMemoryIndirectCountEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountEXT( MemoryDecompressionMethodFlagsEXT decompressionMethod,
-                                                                          DeviceAddress                     indirectCommandsAddress,
-                                                                          DeviceAddress                     indirectCommandsCountAddress,
-                                                                          uint32_t                          maxDecompressionCount,
-                                                                          uint32_t                          stride,
-                                                                          Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdDecompressMemoryIndirectCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                             static_cast<VkMemoryDecompressionMethodFlagsEXT>( decompressionMethod ),
-                                             static_cast<VkDeviceAddress>( indirectCommandsAddress ),
-                                             static_cast<VkDeviceAddress>( indirectCommandsCountAddress ),
-                                             maxDecompressionCount,
-                                             stride );
-  }
-
-  //=== VK_NV_external_compute_queue ===
-
-  // wrapper function for command vkCreateExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createExternalComputeQueueNV( const ExternalComputeQueueCreateInfoNV * pCreateInfo,
-                                                                                      const AllocationCallbacks *              pAllocator,
-                                                                                      ExternalComputeQueueNV *                 pExternalQueue,
-                                                                                      Dispatch const &                         d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateExternalComputeQueueNV( static_cast<VkDevice>( m_device ),
-                                                                  reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( pCreateInfo ),
-                                                                  reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                  reinterpret_cast<VkExternalComputeQueueNV *>( pExternalQueue ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExternalComputeQueueNV>::type Device::createExternalComputeQueueNV(
-    const ExternalComputeQueueCreateInfoNV & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateExternalComputeQueueNV && "Function <vkCreateExternalComputeQueueNV> requires <VK_NV_external_compute_queue>" );
-#  endif
-
-    ExternalComputeQueueNV externalQueue;
-    Result                 result = static_cast<Result>( d.vkCreateExternalComputeQueueNV( m_device,
-                                                                           reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkExternalComputeQueueNV *>( &externalQueue ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExternalComputeQueueNV" );
-
-    return detail::createResultValueType( result, std::move( externalQueue ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<ExternalComputeQueueNV, Dispatch>>::type
-                       Device::createExternalComputeQueueNVUnique( const ExternalComputeQueueCreateInfoNV & createInfo,
-                                                Optional<const AllocationCallbacks>      allocator,
-                                                Dispatch const &                         d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateExternalComputeQueueNV && "Function <vkCreateExternalComputeQueueNV> requires <VK_NV_external_compute_queue>" );
-#    endif
-
-    ExternalComputeQueueNV externalQueue;
-    Result                 result = static_cast<Result>( d.vkCreateExternalComputeQueueNV( m_device,
-                                                                           reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkExternalComputeQueueNV *>( &externalQueue ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createExternalComputeQueueNVUnique" );
-
-    return detail::createResultValueType(
-      result, UniqueHandle<ExternalComputeQueueNV, Dispatch>( externalQueue, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyExternalComputeQueueNV( ExternalComputeQueueNV      externalQueue,
-                                                                const AllocationCallbacks * pAllocator,
-                                                                Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyExternalComputeQueueNV( static_cast<VkDevice>( m_device ),
-                                       static_cast<VkExternalComputeQueueNV>( externalQueue ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyExternalComputeQueueNV( ExternalComputeQueueNV              externalQueue,
-                                                                Optional<const AllocationCallbacks> allocator,
-                                                                Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyExternalComputeQueueNV && "Function <vkDestroyExternalComputeQueueNV> requires <VK_NV_external_compute_queue>" );
-#  endif
-
-    d.vkDestroyExternalComputeQueueNV(
-      m_device, static_cast<VkExternalComputeQueueNV>( externalQueue ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( ExternalComputeQueueNV externalQueue, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyExternalComputeQueueNV( static_cast<VkDevice>( m_device ),
-                                       static_cast<VkExternalComputeQueueNV>( externalQueue ),
-                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyExternalComputeQueueNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( ExternalComputeQueueNV externalQueue, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyExternalComputeQueueNV && "Function <vkDestroyExternalComputeQueueNV> requires <VK_NV_external_compute_queue>" );
-#  endif
-
-    d.vkDestroyExternalComputeQueueNV(
-      m_device, static_cast<VkExternalComputeQueueNV>( externalQueue ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetExternalComputeQueueDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    ExternalComputeQueueNV::getData( ExternalComputeQueueDataParamsNV * params, void * pData, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetExternalComputeQueueDataNV(
-      static_cast<VkExternalComputeQueueNV>( m_externalComputeQueueNV ), reinterpret_cast<VkExternalComputeQueueDataParamsNV *>( params ), pData );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetExternalComputeQueueDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-  template <typename DataType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<ExternalComputeQueueDataParamsNV, DataType>
-                                         ExternalComputeQueueNV::getData( Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetExternalComputeQueueDataNV && "Function <vkGetExternalComputeQueueDataNV> requires <VK_NV_external_compute_queue>" );
-#  endif
-
-    std::pair<ExternalComputeQueueDataParamsNV, DataType> data_;
-    ExternalComputeQueueDataParamsNV &                    arams = data_.first;
-    DataType &                                            data  = data_.second;
-    d.vkGetExternalComputeQueueDataNV( m_externalComputeQueueNV, reinterpret_cast<VkExternalComputeQueueDataParamsNV *>( &arams ), &data );
-
-    return data_;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_NV_cluster_acceleration_structure ===
-
-  // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getClusterAccelerationStructureBuildSizesNV( const ClusterAccelerationStructureInputInfoNV * pInfo,
-                                                                              AccelerationStructureBuildSizesInfoKHR *        pSizeInfo,
-                                                                              Dispatch const &                                d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetClusterAccelerationStructureBuildSizesNV( static_cast<VkDevice>( m_device ),
-                                                     reinterpret_cast<const VkClusterAccelerationStructureInputInfoNV *>( pInfo ),
-                                                     reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( pSizeInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR
-    Device::getClusterAccelerationStructureBuildSizesNV( const ClusterAccelerationStructureInputInfoNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetClusterAccelerationStructureBuildSizesNV &&
-                       "Function <vkGetClusterAccelerationStructureBuildSizesNV> requires <VK_NV_cluster_acceleration_structure>" );
-#  endif
-
-    AccelerationStructureBuildSizesInfoKHR sizeInfo;
-    d.vkGetClusterAccelerationStructureBuildSizesNV( m_device,
-                                                     reinterpret_cast<const VkClusterAccelerationStructureInputInfoNV *>( &info ),
-                                                     reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( &sizeInfo ) );
-
-    return sizeInfo;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV * pCommandInfos,
-                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildClusterAccelerationStructureIndirectNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                        reinterpret_cast<const VkClusterAccelerationStructureCommandsInfoNV *>( pCommandInfos ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV & commandInfos,
-                                                                                     Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBuildClusterAccelerationStructureIndirectNV &&
-                       "Function <vkCmdBuildClusterAccelerationStructureIndirectNV> requires <VK_NV_cluster_acceleration_structure>" );
-#  endif
-
-    d.vkCmdBuildClusterAccelerationStructureIndirectNV( m_commandBuffer,
-                                                        reinterpret_cast<const VkClusterAccelerationStructureCommandsInfoNV *>( &commandInfos ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-
-  // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getPartitionedAccelerationStructuresBuildSizesNV( const PartitionedAccelerationStructureInstancesInputNV * pInfo,
-                                                                                   AccelerationStructureBuildSizesInfoKHR *                 pSizeInfo,
-                                                                                   Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetPartitionedAccelerationStructuresBuildSizesNV( static_cast<VkDevice>( m_device ),
-                                                          reinterpret_cast<const VkPartitionedAccelerationStructureInstancesInputNV *>( pInfo ),
-                                                          reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( pSizeInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR Device::getPartitionedAccelerationStructuresBuildSizesNV(
-    const PartitionedAccelerationStructureInstancesInputNV & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPartitionedAccelerationStructuresBuildSizesNV &&
-                       "Function <vkGetPartitionedAccelerationStructuresBuildSizesNV> requires <VK_NV_partitioned_acceleration_structure>" );
-#  endif
-
-    AccelerationStructureBuildSizesInfoKHR sizeInfo;
-    d.vkGetPartitionedAccelerationStructuresBuildSizesNV( m_device,
-                                                          reinterpret_cast<const VkPartitionedAccelerationStructureInstancesInputNV *>( &info ),
-                                                          reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( &sizeInfo ) );
-
-    return sizeInfo;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV * pBuildInfo,
-                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBuildPartitionedAccelerationStructuresNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                     reinterpret_cast<const VkBuildPartitionedAccelerationStructureInfoNV *>( pBuildInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV & buildInfo,
-                                                                                  Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBuildPartitionedAccelerationStructuresNV &&
-                       "Function <vkCmdBuildPartitionedAccelerationStructuresNV> requires <VK_NV_partitioned_acceleration_structure>" );
-#  endif
-
-    d.vkCmdBuildPartitionedAccelerationStructuresNV( m_commandBuffer, reinterpret_cast<const VkBuildPartitionedAccelerationStructureInfoNV *>( &buildInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_EXT_device_generated_commands ===
-
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT * pInfo,
-                                                                            MemoryRequirements2 *                              pMemoryRequirements,
-                                                                            Dispatch const &                                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkGetGeneratedCommandsMemoryRequirementsEXT( static_cast<VkDevice>( m_device ),
-                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( pInfo ),
-                                                   reinterpret_cast<VkMemoryRequirements2 *>( pMemoryRequirements ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-    Device::getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetGeneratedCommandsMemoryRequirementsEXT &&
-                       "Function <vkGetGeneratedCommandsMemoryRequirementsEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    MemoryRequirements2 memoryRequirements;
-    d.vkGetGeneratedCommandsMemoryRequirementsEXT( m_device,
-                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( &info ),
-                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return memoryRequirements;
-  }
-
-  // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-  template <typename X, typename Y, typename... Z, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-    Device::getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetGeneratedCommandsMemoryRequirementsEXT &&
-                       "Function <vkGetGeneratedCommandsMemoryRequirementsEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    StructureChain<X, Y, Z...> structureChain;
-    MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-    d.vkGetGeneratedCommandsMemoryRequirementsEXT( m_device,
-                                                   reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( &info ),
-                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-    return structureChain;
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT * pGeneratedCommandsInfo,
-                                                                        CommandBuffer                    stateCommandBuffer,
-                                                                        Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdPreprocessGeneratedCommandsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                           reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( pGeneratedCommandsInfo ),
-                                           static_cast<VkCommandBuffer>( stateCommandBuffer ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT & generatedCommandsInfo,
-                                                                        CommandBuffer                    stateCommandBuffer,
-                                                                        Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdPreprocessGeneratedCommandsEXT && "Function <vkCmdPreprocessGeneratedCommandsEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkCmdPreprocessGeneratedCommandsEXT(
-      m_commandBuffer, reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( &generatedCommandsInfo ), static_cast<VkCommandBuffer>( stateCommandBuffer ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsEXT( Bool32                           isPreprocessed,
-                                                                     const GeneratedCommandsInfoEXT * pGeneratedCommandsInfo,
-                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdExecuteGeneratedCommandsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                        static_cast<VkBool32>( isPreprocessed ),
-                                        reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( pGeneratedCommandsInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsEXT( Bool32                           isPreprocessed,
-                                                                     const GeneratedCommandsInfoEXT & generatedCommandsInfo,
-                                                                     Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdExecuteGeneratedCommandsEXT && "Function <vkCmdExecuteGeneratedCommandsEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkCmdExecuteGeneratedCommandsEXT(
-      m_commandBuffer, static_cast<VkBool32>( isPreprocessed ), reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( &generatedCommandsInfo ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createIndirectCommandsLayoutEXT( const IndirectCommandsLayoutCreateInfoEXT * pCreateInfo,
-                                                                                         const AllocationCallbacks *                 pAllocator,
-                                                                                         IndirectCommandsLayoutEXT *                 pIndirectCommandsLayout,
-                                                                                         Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateIndirectCommandsLayoutEXT( static_cast<VkDevice>( m_device ),
-                                                                     reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( pCreateInfo ),
-                                                                     reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                     reinterpret_cast<VkIndirectCommandsLayoutEXT *>( pIndirectCommandsLayout ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectCommandsLayoutEXT>::type Device::createIndirectCommandsLayoutEXT(
-    const IndirectCommandsLayoutCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateIndirectCommandsLayoutEXT && "Function <vkCreateIndirectCommandsLayoutEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    IndirectCommandsLayoutEXT indirectCommandsLayout;
-    Result                    result = static_cast<Result>( d.vkCreateIndirectCommandsLayoutEXT( m_device,
-                                                                              reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkIndirectCommandsLayoutEXT *>( &indirectCommandsLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutEXT" );
-
-    return detail::createResultValueType( result, std::move( indirectCommandsLayout ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<IndirectCommandsLayoutEXT, Dispatch>>::type
-                       Device::createIndirectCommandsLayoutEXTUnique( const IndirectCommandsLayoutCreateInfoEXT & createInfo,
-                                                   Optional<const AllocationCallbacks>         allocator,
-                                                   Dispatch const &                            d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateIndirectCommandsLayoutEXT && "Function <vkCreateIndirectCommandsLayoutEXT> requires <VK_EXT_device_generated_commands>" );
-#    endif
-
-    IndirectCommandsLayoutEXT indirectCommandsLayout;
-    Result                    result = static_cast<Result>( d.vkCreateIndirectCommandsLayoutEXT( m_device,
-                                                                              reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkIndirectCommandsLayoutEXT *>( &indirectCommandsLayout ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutEXTUnique" );
-
-    return detail::createResultValueType(
-      result, UniqueHandle<IndirectCommandsLayoutEXT, Dispatch>( indirectCommandsLayout, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT   indirectCommandsLayout,
-                                                                   const AllocationCallbacks * pAllocator,
-                                                                   Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectCommandsLayoutEXT( static_cast<VkDevice>( m_device ),
-                                          static_cast<VkIndirectCommandsLayoutEXT>( indirectCommandsLayout ),
-                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT           indirectCommandsLayout,
-                                                                   Optional<const AllocationCallbacks> allocator,
-                                                                   Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyIndirectCommandsLayoutEXT && "Function <vkDestroyIndirectCommandsLayoutEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkDestroyIndirectCommandsLayoutEXT(
-      m_device, static_cast<VkIndirectCommandsLayoutEXT>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( IndirectCommandsLayoutEXT indirectCommandsLayout, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectCommandsLayoutEXT( static_cast<VkDevice>( m_device ),
-                                          static_cast<VkIndirectCommandsLayoutEXT>( indirectCommandsLayout ),
-                                          reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroy( IndirectCommandsLayoutEXT           indirectCommandsLayout,
-                                          Optional<const AllocationCallbacks> allocator,
-                                          Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyIndirectCommandsLayoutEXT && "Function <vkDestroyIndirectCommandsLayoutEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkDestroyIndirectCommandsLayoutEXT(
-      m_device, static_cast<VkIndirectCommandsLayoutEXT>( indirectCommandsLayout ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::createIndirectExecutionSetEXT( const IndirectExecutionSetCreateInfoEXT * pCreateInfo,
-                                                                                       const AllocationCallbacks *               pAllocator,
-                                                                                       IndirectExecutionSetEXT *                 pIndirectExecutionSet,
-                                                                                       Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateIndirectExecutionSetEXT( static_cast<VkDevice>( m_device ),
-                                                                   reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( pCreateInfo ),
-                                                                   reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                                   reinterpret_cast<VkIndirectExecutionSetEXT *>( pIndirectExecutionSet ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectExecutionSetEXT>::type Device::createIndirectExecutionSetEXT(
-    const IndirectExecutionSetCreateInfoEXT & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateIndirectExecutionSetEXT && "Function <vkCreateIndirectExecutionSetEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    IndirectExecutionSetEXT indirectExecutionSet;
-    Result                  result = static_cast<Result>( d.vkCreateIndirectExecutionSetEXT( m_device,
-                                                                            reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkIndirectExecutionSetEXT *>( &indirectExecutionSet ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectExecutionSetEXT" );
-
-    return detail::createResultValueType( result, std::move( indirectExecutionSet ) );
-  }
-
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<IndirectExecutionSetEXT, Dispatch>>::type
-                       Device::createIndirectExecutionSetEXTUnique( const IndirectExecutionSetCreateInfoEXT & createInfo,
-                                                 Optional<const AllocationCallbacks>       allocator,
-                                                 Dispatch const &                          d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateIndirectExecutionSetEXT && "Function <vkCreateIndirectExecutionSetEXT> requires <VK_EXT_device_generated_commands>" );
-#    endif
-
-    IndirectExecutionSetEXT indirectExecutionSet;
-    Result                  result = static_cast<Result>( d.vkCreateIndirectExecutionSetEXT( m_device,
-                                                                            reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkIndirectExecutionSetEXT *>( &indirectExecutionSet ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::createIndirectExecutionSetEXTUnique" );
-
-    return detail::createResultValueType(
-      result, UniqueHandle<IndirectExecutionSetEXT, Dispatch>( indirectExecutionSet, detail::ObjectDestroy<Device, Dispatch>( *this, allocator, d ) ) );
-  }
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectExecutionSetEXT( IndirectExecutionSetEXT     indirectExecutionSet,
-                                                                 const AllocationCallbacks * pAllocator,
-                                                                 Dispatch const &            d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectExecutionSetEXT( static_cast<VkDevice>( m_device ),
-                                        static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::destroyIndirectExecutionSetEXT( IndirectExecutionSetEXT             indirectExecutionSet,
-                                                                 Optional<const AllocationCallbacks> allocator,
-                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyIndirectExecutionSetEXT && "Function <vkDestroyIndirectExecutionSetEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkDestroyIndirectExecutionSetEXT(
-      m_device, static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( IndirectExecutionSetEXT indirectExecutionSet, const AllocationCallbacks * pAllocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkDestroyIndirectExecutionSetEXT( static_cast<VkDevice>( m_device ),
-                                        static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                        reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void
-    Device::destroy( IndirectExecutionSetEXT indirectExecutionSet, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkDestroyIndirectExecutionSetEXT && "Function <vkDestroyIndirectExecutionSetEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkDestroyIndirectExecutionSetEXT(
-      m_device, static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ), reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateIndirectExecutionSetPipelineEXT( IndirectExecutionSetEXT                      indirectExecutionSet,
-                                                                        uint32_t                                     executionSetWriteCount,
-                                                                        const WriteIndirectExecutionSetPipelineEXT * pExecutionSetWrites,
-                                                                        Dispatch const &                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUpdateIndirectExecutionSetPipelineEXT( static_cast<VkDevice>( m_device ),
-                                               static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                               executionSetWriteCount,
-                                               reinterpret_cast<const VkWriteIndirectExecutionSetPipelineEXT *>( pExecutionSetWrites ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateIndirectExecutionSetPipelineEXT( IndirectExecutionSetEXT                                        indirectExecutionSet,
-                                                                        ArrayProxy<const WriteIndirectExecutionSetPipelineEXT> const & executionSetWrites,
-                                                                        Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkUpdateIndirectExecutionSetPipelineEXT &&
-                       "Function <vkUpdateIndirectExecutionSetPipelineEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkUpdateIndirectExecutionSetPipelineEXT( m_device,
-                                               static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                               executionSetWrites.size(),
-                                               reinterpret_cast<const VkWriteIndirectExecutionSetPipelineEXT *>( executionSetWrites.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateIndirectExecutionSetShaderEXT( IndirectExecutionSetEXT                    indirectExecutionSet,
-                                                                      uint32_t                                   executionSetWriteCount,
-                                                                      const WriteIndirectExecutionSetShaderEXT * pExecutionSetWrites,
-                                                                      Dispatch const &                           d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkUpdateIndirectExecutionSetShaderEXT( static_cast<VkDevice>( m_device ),
-                                             static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                             executionSetWriteCount,
-                                             reinterpret_cast<const VkWriteIndirectExecutionSetShaderEXT *>( pExecutionSetWrites ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void Device::updateIndirectExecutionSetShaderEXT( IndirectExecutionSetEXT                                      indirectExecutionSet,
-                                                                      ArrayProxy<const WriteIndirectExecutionSetShaderEXT> const & executionSetWrites,
-                                                                      Dispatch const &                                             d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkUpdateIndirectExecutionSetShaderEXT &&
-                       "Function <vkUpdateIndirectExecutionSetShaderEXT> requires <VK_EXT_device_generated_commands>" );
-#  endif
-
-    d.vkUpdateIndirectExecutionSetShaderEXT( m_device,
-                                             static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSet ),
-                                             executionSetWrites.size(),
-                                             reinterpret_cast<const VkWriteIndirectExecutionSetShaderEXT *>( executionSetWrites.data() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-
-  // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Instance::createSurfaceOHOS( const SurfaceCreateInfoOHOS * pCreateInfo,
-                                                                             const AllocationCallbacks *   pAllocator,
-                                                                             SurfaceKHR *                  pSurface,
-                                                                             Dispatch const &              d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkCreateSurfaceOHOS( static_cast<VkInstance>( m_instance ),
-                                                       reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( pCreateInfo ),
-                                                       reinterpret_cast<const VkAllocationCallbacks *>( pAllocator ),
-                                                       reinterpret_cast<VkSurfaceKHR *>( pSurface ) ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-    Instance::createSurfaceOHOS( const SurfaceCreateInfoOHOS & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateSurfaceOHOS && "Function <vkCreateSurfaceOHOS> requires <VK_OHOS_surface>" );
-#    endif
-
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateSurfaceOHOS( m_instance,
-                                                                reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createSurfaceOHOS" );
-
-    return detail::createResultValueType( result, std::move( surface ) );
-  }
-
-#    ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-    Instance::createSurfaceOHOSUnique( const SurfaceCreateInfoOHOS & createInfo, Optional<const AllocationCallbacks> allocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#      if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCreateSurfaceOHOS && "Function <vkCreateSurfaceOHOS> requires <VK_OHOS_surface>" );
-#      endif
-
-    SurfaceKHR surface;
-    Result     result = static_cast<Result>( d.vkCreateSurfaceOHOS( m_instance,
-                                                                reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( &createInfo ),
-                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::createSurfaceOHOSUnique" );
-
-    return detail::createResultValueType( result,
-                                          UniqueHandle<SurfaceKHR, Dispatch>( surface, detail::ObjectDestroy<Instance, Dispatch>( *this, allocator, d ) ) );
-  }
-#    endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif     /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-
-  // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::getSwapchainGrallocUsageOHOS( Format format, ImageUsageFlags imageUsage, uint64_t * grallocUsage, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetSwapchainGrallocUsageOHOS(
-      static_cast<VkDevice>( m_device ), static_cast<VkFormat>( format ), static_cast<VkImageUsageFlags>( imageUsage ), grallocUsage ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type
-                       Device::getSwapchainGrallocUsageOHOS( Format format, ImageUsageFlags imageUsage, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetSwapchainGrallocUsageOHOS && "Function <vkGetSwapchainGrallocUsageOHOS> requires <VK_OHOS_native_buffer>" );
-#    endif
-
-    uint64_t grallocUsage;
-    Result   result = static_cast<Result>(
-      d.vkGetSwapchainGrallocUsageOHOS( m_device, static_cast<VkFormat>( format ), static_cast<VkImageUsageFlags>( imageUsage ), &grallocUsage ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSwapchainGrallocUsageOHOS" );
-
-    return detail::createResultValueType( result, std::move( grallocUsage ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    Device::acquireImageOHOS( Image image, int32_t nativeFenceFd, Semaphore semaphore, Fence fence, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkAcquireImageOHOS(
-      static_cast<VkDevice>( m_device ), static_cast<VkImage>( image ), nativeFenceFd, static_cast<VkSemaphore>( semaphore ), static_cast<VkFence>( fence ) ) );
-  }
-#  else
-  // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type
-    Device::acquireImageOHOS( Image image, int32_t nativeFenceFd, Semaphore semaphore, Fence fence, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkAcquireImageOHOS && "Function <vkAcquireImageOHOS> requires <VK_OHOS_native_buffer>" );
-#    endif
-
-    Result result = static_cast<Result>(
-      d.vkAcquireImageOHOS( m_device, static_cast<VkImage>( image ), nativeFenceFd, static_cast<VkSemaphore>( semaphore ), static_cast<VkFence>( fence ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireImageOHOS" );
-
-    return detail::createResultValueType( result );
-  }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-  // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::signalReleaseImageOHOS(
-    uint32_t waitSemaphoreCount, const Semaphore * pWaitSemaphores, Image image, int32_t * pNativeFenceFd, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkQueueSignalReleaseImageOHOS( static_cast<VkQueue>( m_queue ),
-                                                                 waitSemaphoreCount,
-                                                                 reinterpret_cast<const VkSemaphore *>( pWaitSemaphores ),
-                                                                 static_cast<VkImage>( image ),
-                                                                 pNativeFenceFd ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int32_t>::type
-                       Queue::signalReleaseImageOHOS( ArrayProxy<const Semaphore> const & waitSemaphores, Image image, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkQueueSignalReleaseImageOHOS && "Function <vkQueueSignalReleaseImageOHOS> requires <VK_OHOS_native_buffer>" );
-#    endif
-
-    int32_t nativeFenceFd;
-    Result  result = static_cast<Result>( d.vkQueueSignalReleaseImageOHOS(
-      m_queue, waitSemaphores.size(), reinterpret_cast<const VkSemaphore *>( waitSemaphores.data() ), static_cast<VkImage>( image ), &nativeFenceFd ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::signalReleaseImageOHOS" );
-
-    return detail::createResultValueType( result, std::move( nativeFenceFd ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_NV_cooperative_matrix2 ===
-
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV(
-    uint32_t * pPropertyCount, CooperativeMatrixFlexibleDimensionsPropertiesNV * pProperties, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-      static_cast<VkPhysicalDevice>( m_physicalDevice ),
-      pPropertyCount,
-      reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( pProperties ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-  template <typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator::value_type,
-                                                 CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator>>::type
-    PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV( Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV &&
-                       "Function <vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV> requires <VK_NV_cooperative_matrix2>" );
-#  endif
-
-    std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator> properties;
-    uint32_t                                                                                                               propertyCount;
-    Result                                                                                                                 result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-          m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-
-  // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-  template <typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator::value_type,
-                                                 CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator>>::type
-    PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV(
-      CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator & cooperativeMatrixFlexibleDimensionsPropertiesNVAllocator, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV &&
-                       "Function <vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV> requires <VK_NV_cooperative_matrix2>" );
-#  endif
-
-    std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator> properties(
-      cooperativeMatrixFlexibleDimensionsPropertiesNVAllocator );
-    uint32_t propertyCount;
-    Result   result;
-    do
-    {
-      result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV( m_physicalDevice, &propertyCount, nullptr ) );
-      if ( ( result == Result::eSuccess ) && propertyCount )
-      {
-        properties.resize( propertyCount );
-        result = static_cast<Result>( d.vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-          m_physicalDevice, &propertyCount, reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( properties.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV" );
-    VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-    if ( propertyCount < properties.size() )
-    {
-      properties.resize( propertyCount );
-    }
-    return detail::createResultValueType( result, std::move( properties ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-
-  // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT * pGetMetalHandleInfo,
-                                                                                 void **                             pHandle,
-                                                                                 Dispatch const &                    d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryMetalHandleEXT(
-      static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetMetalHandleInfoEXT *>( pGetMetalHandleInfo ), pHandle ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type
-                       Device::getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT & getMetalHandleInfo, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetMemoryMetalHandleEXT && "Function <vkGetMemoryMetalHandleEXT> requires <VK_EXT_external_memory_metal>" );
-#    endif
-
-    void * handle;
-    Result result =
-      static_cast<Result>( d.vkGetMemoryMetalHandleEXT( m_device, reinterpret_cast<const VkMemoryGetMetalHandleInfoEXT *>( &getMetalHandleInfo ), &handle ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryMetalHandleEXT" );
-
-    return detail::createResultValueType( result, std::move( handle ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getMemoryMetalHandlePropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                                           const void *                     pHandle,
-                                                                                           MemoryMetalHandlePropertiesEXT * pMemoryMetalHandleProperties,
-                                                                                           Dispatch const &                 d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>( d.vkGetMemoryMetalHandlePropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                       static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                                       pHandle,
-                                                                       reinterpret_cast<VkMemoryMetalHandlePropertiesEXT *>( pMemoryMetalHandleProperties ) ) );
-  }
-
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-  template <typename HandleType, typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryMetalHandlePropertiesEXT>::type
-    Device::getMemoryMetalHandlePropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, HandleType const & handle, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#    if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkGetMemoryMetalHandlePropertiesEXT && "Function <vkGetMemoryMetalHandlePropertiesEXT> requires <VK_EXT_external_memory_metal>" );
-#    endif
-
-    MemoryMetalHandlePropertiesEXT memoryMetalHandleProperties;
-    Result                         result =
-      static_cast<Result>( d.vkGetMemoryMetalHandlePropertiesEXT( m_device,
-                                                                  static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                                  reinterpret_cast<const void *>( &handle ),
-                                                                  reinterpret_cast<VkMemoryMetalHandlePropertiesEXT *>( &memoryMetalHandleProperties ) ) );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryMetalHandlePropertiesEXT" );
-
-    return detail::createResultValueType( result, std::move( memoryMetalHandleProperties ) );
-  }
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-    PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t                           queueFamilyIndex,
-                                                                        uint32_t *                         pCounterCount,
-                                                                        PerformanceCounterARM *            pCounters,
-                                                                        PerformanceCounterDescriptionARM * pCounterDescriptions,
-                                                                        Dispatch const &                   d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    return static_cast<Result>(
-      d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                            queueFamilyIndex,
-                                                                            pCounterCount,
-                                                                            reinterpret_cast<VkPerformanceCounterARM *>( pCounters ),
-                                                                            reinterpret_cast<VkPerformanceCounterDescriptionARM *>( pCounterDescriptions ) ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-  template <typename PerformanceCounterARMAllocator,
-            typename PerformanceCounterDescriptionARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PerformanceCounterARMAllocator::value_type, PerformanceCounterARM>::value &&
-                                      std::is_same<typename PerformanceCounterDescriptionARMAllocator::value_type, PerformanceCounterDescriptionARM>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-                                       std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>>::type
-    PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t queueFamilyIndex, Dispatch const & d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM &&
-                       "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM> requires <VK_ARM_performance_counters_by_region>" );
-#  endif
-
-    std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-              std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>
-                                                                                               data_;
-    std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator> &                       counters            = data_.first;
-    std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator> & counterDescriptions = data_.second;
-    uint32_t                                                                                   counterCount;
-    Result                                                                                     result;
-    do
-    {
-      result = static_cast<Result>(
-        d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM( m_physicalDevice, queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-      if ( ( result == Result::eSuccess ) && counterCount )
-      {
-        counters.resize( counterCount );
-        counterDescriptions.resize( counterCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-          m_physicalDevice,
-          queueFamilyIndex,
-          &counterCount,
-          reinterpret_cast<VkPerformanceCounterARM *>( counters.data() ),
-          reinterpret_cast<VkPerformanceCounterDescriptionARM *>( counterDescriptions.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM" );
-    VULKAN_HPP_ASSERT( counterCount <= counters.size() );
-    if ( counterCount < counters.size() )
-    {
-      counters.resize( counterCount );
-      counterDescriptions.resize( counterCount );
-    }
-    return detail::createResultValueType( result, std::move( data_ ) );
-  }
-
-  // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-  template <typename PerformanceCounterARMAllocator,
-            typename PerformanceCounterDescriptionARMAllocator,
-            typename Dispatch,
-            typename std::enable_if<std::is_same<typename PerformanceCounterARMAllocator::value_type, PerformanceCounterARM>::value &&
-                                      std::is_same<typename PerformanceCounterDescriptionARMAllocator::value_type, PerformanceCounterDescriptionARM>::value,
-                                    int>::type,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-    typename ResultValueType<std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-                                       std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>>::type
-    PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t                                    queueFamilyIndex,
-                                                                        PerformanceCounterARMAllocator &            performanceCounterARMAllocator,
-                                                                        PerformanceCounterDescriptionARMAllocator & performanceCounterDescriptionARMAllocator,
-                                                                        Dispatch const &                            d ) const
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM &&
-                       "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM> requires <VK_ARM_performance_counters_by_region>" );
-#  endif
-
-    std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-              std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>
-      data_(
-        std::piecewise_construct, std::forward_as_tuple( performanceCounterARMAllocator ), std::forward_as_tuple( performanceCounterDescriptionARMAllocator ) );
-    std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator> &                       counters            = data_.first;
-    std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator> & counterDescriptions = data_.second;
-    uint32_t                                                                                   counterCount;
-    Result                                                                                     result;
-    do
-    {
-      result = static_cast<Result>(
-        d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM( m_physicalDevice, queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-      if ( ( result == Result::eSuccess ) && counterCount )
-      {
-        counters.resize( counterCount );
-        counterDescriptions.resize( counterCount );
-        result = static_cast<Result>( d.vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-          m_physicalDevice,
-          queueFamilyIndex,
-          &counterCount,
-          reinterpret_cast<VkPerformanceCounterARM *>( counters.data() ),
-          reinterpret_cast<VkPerformanceCounterDescriptionARM *>( counterDescriptions.data() ) ) );
-      }
-    } while ( result == Result::eIncomplete );
-    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM" );
-    VULKAN_HPP_ASSERT( counterCount <= counters.size() );
-    if ( counterCount < counters.size() )
-    {
-      counters.resize( counterCount );
-      counterDescriptions.resize( counterCount );
-    }
-    return detail::createResultValueType( result, std::move( data_ ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_EXT_fragment_density_map_offset ===
-
-  // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRendering2EXT( const RenderingEndInfoKHR * pRenderingEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRendering2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingEndInfoKHR *>( pRenderingEndInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRendering2EXT( Optional<const RenderingEndInfoKHR> renderingEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdEndRendering2EXT && "Function <vkCmdEndRendering2EXT> requires <VK_EXT_fragment_density_map_offset> or <VK_KHR_maintenance10>" );
-#  endif
-
-    d.vkCmdEndRendering2EXT( m_commandBuffer, reinterpret_cast<const VkRenderingEndInfoKHR *>( renderingEndInfo.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_EXT_custom_resolve ===
-
-  // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginCustomResolveEXT( const BeginCustomResolveInfoEXT * pBeginCustomResolveInfo,
-                                                               Dispatch const &                  d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdBeginCustomResolveEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                  reinterpret_cast<const VkBeginCustomResolveInfoEXT *>( pBeginCustomResolveInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::beginCustomResolveEXT( Optional<const BeginCustomResolveInfoEXT> beginCustomResolveInfo,
-                                                               Dispatch const &                          d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdBeginCustomResolveEXT && "Function <vkCmdBeginCustomResolveEXT> requires <VK_EXT_custom_resolve>" );
-#  endif
-
-    d.vkCmdBeginCustomResolveEXT( m_commandBuffer, reinterpret_cast<const VkBeginCustomResolveInfoEXT *>( beginCustomResolveInfo.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-  //=== VK_KHR_maintenance10 ===
-
-  // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRendering2KHR( const RenderingEndInfoKHR * pRenderingEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-    d.vkCmdEndRendering2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingEndInfoKHR *>( pRenderingEndInfo ) );
-  }
-
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-  template <typename Dispatch, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type>
-  VULKAN_HPP_INLINE void CommandBuffer::endRendering2KHR( Optional<const RenderingEndInfoKHR> renderingEndInfo, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
-  {
-    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
-#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
-    VULKAN_HPP_ASSERT( d.vkCmdEndRendering2KHR && "Function <vkCmdEndRendering2KHR> requires <VK_EXT_fragment_density_map_offset> or <VK_KHR_maintenance10>" );
-#  endif
-
-    d.vkCmdEndRendering2KHR( m_commandBuffer, reinterpret_cast<const VkRenderingEndInfoKHR *>( renderingEndInfo.get() ) );
-  }
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
 }  // namespace VULKAN_HPP_NAMESPACE
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_ggp.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_ggp.h
index 156c84a1..0a8863a1 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_ggp.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_ggp.h
@@ -2,7 +2,7 @@
 #define VULKAN_GGP_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -34,14 +34,12 @@ typedef struct VkStreamDescriptorSurfaceCreateInfoGGP {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateStreamDescriptorSurfaceGGP)(VkInstance instance, const VkStreamDescriptorSurfaceCreateInfoGGP* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateStreamDescriptorSurfaceGGP(
     VkInstance                                  instance,
     const VkStreamDescriptorSurfaceCreateInfoGGP* pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_GGP_frame_token is a preprocessor guard. Do not pass it to API calls.
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_handles.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_handles.hpp
index 808496c2..3b360dca 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_handles.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_handles.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,9 +8,6 @@
 #ifndef VULKAN_HANDLES_HPP
 #define VULKAN_HANDLES_HPP
 
-// include-what-you-use: make sure, vulkan.hpp is used by code-completers
-// IWYU pragma: private, include "vulkan/vulkan.hpp"
-
 namespace VULKAN_HPP_NAMESPACE
 {
 
@@ -27,8 +24,12 @@ namespace VULKAN_HPP_NAMESPACE
   struct BaseInStructure;
   struct BaseOutStructure;
   struct BufferMemoryBarrier;
+  struct DispatchIndirectCommand;
+  struct DrawIndexedIndirectCommand;
+  struct DrawIndirectCommand;
   struct ImageMemoryBarrier;
   struct MemoryBarrier;
+  struct PipelineCacheHeaderVersionOne;
   struct AllocationCallbacks;
   struct ApplicationInfo;
   struct FormatProperties;
@@ -61,31 +62,36 @@ namespace VULKAN_HPP_NAMESPACE
   struct SparseMemoryBind;
   struct FenceCreateInfo;
   struct SemaphoreCreateInfo;
+  struct EventCreateInfo;
   struct QueryPoolCreateInfo;
   struct BufferCreateInfo;
+  struct BufferViewCreateInfo;
   struct ImageCreateInfo;
   struct SubresourceLayout;
   struct ComponentMapping;
   struct ImageSubresourceRange;
   struct ImageViewCreateInfo;
-  struct CommandPoolCreateInfo;
-  struct CommandBufferAllocateInfo;
-  struct CommandBufferBeginInfo;
-  struct CommandBufferInheritanceInfo;
-  struct BufferCopy;
-  struct BufferImageCopy;
-  struct ImageCopy;
-  struct ImageSubresourceLayers;
-  struct DispatchIndirectCommand;
-  struct PipelineCacheHeaderVersionOne;
-  struct EventCreateInfo;
-  struct BufferViewCreateInfo;
   struct ShaderModuleCreateInfo;
   struct PipelineCacheCreateInfo;
   struct ComputePipelineCreateInfo;
+  struct GraphicsPipelineCreateInfo;
+  struct PipelineColorBlendAttachmentState;
+  struct PipelineColorBlendStateCreateInfo;
+  struct PipelineDepthStencilStateCreateInfo;
+  struct PipelineDynamicStateCreateInfo;
+  struct PipelineInputAssemblyStateCreateInfo;
+  struct PipelineMultisampleStateCreateInfo;
+  struct PipelineRasterizationStateCreateInfo;
   struct PipelineShaderStageCreateInfo;
+  struct PipelineTessellationStateCreateInfo;
+  struct PipelineVertexInputStateCreateInfo;
+  struct PipelineViewportStateCreateInfo;
   struct SpecializationInfo;
   struct SpecializationMapEntry;
+  struct StencilOpState;
+  struct VertexInputAttributeDescription;
+  struct VertexInputBindingDescription;
+  struct Viewport;
   struct PipelineLayoutCreateInfo;
   struct PushConstantRange;
   struct SamplerCreateInfo;
@@ -98,49 +104,45 @@ namespace VULKAN_HPP_NAMESPACE
   struct DescriptorSetLayoutBinding;
   struct DescriptorSetLayoutCreateInfo;
   struct WriteDescriptorSet;
-  union ClearColorValue;
-  struct DrawIndexedIndirectCommand;
-  struct DrawIndirectCommand;
-  struct GraphicsPipelineCreateInfo;
-  struct PipelineColorBlendAttachmentState;
-  struct PipelineColorBlendStateCreateInfo;
-  struct PipelineDepthStencilStateCreateInfo;
-  struct PipelineDynamicStateCreateInfo;
-  struct PipelineInputAssemblyStateCreateInfo;
-  struct PipelineMultisampleStateCreateInfo;
-  struct PipelineRasterizationStateCreateInfo;
-  struct PipelineTessellationStateCreateInfo;
-  struct PipelineVertexInputStateCreateInfo;
-  struct PipelineViewportStateCreateInfo;
-  struct StencilOpState;
-  struct VertexInputAttributeDescription;
-  struct VertexInputBindingDescription;
-  struct Viewport;
   struct AttachmentDescription;
   struct AttachmentReference;
   struct FramebufferCreateInfo;
   struct RenderPassCreateInfo;
   struct SubpassDependency;
   struct SubpassDescription;
+  struct CommandPoolCreateInfo;
+  struct CommandBufferAllocateInfo;
+  struct CommandBufferBeginInfo;
+  struct CommandBufferInheritanceInfo;
+  struct BufferCopy;
+  struct BufferImageCopy;
   struct ClearAttachment;
+  union ClearColorValue;
   struct ClearDepthStencilValue;
   struct ClearRect;
   union ClearValue;
   struct ImageBlit;
+  struct ImageCopy;
   struct ImageResolve;
+  struct ImageSubresourceLayers;
   struct RenderPassBeginInfo;
 
   //=== VK_VERSION_1_1 ===
+  struct PhysicalDeviceSubgroupProperties;
   struct BindBufferMemoryInfo;
   using BindBufferMemoryInfoKHR = BindBufferMemoryInfo;
   struct BindImageMemoryInfo;
   using BindImageMemoryInfoKHR = BindImageMemoryInfo;
+  struct PhysicalDevice16BitStorageFeatures;
+  using PhysicalDevice16BitStorageFeaturesKHR = PhysicalDevice16BitStorageFeatures;
   struct MemoryDedicatedRequirements;
   using MemoryDedicatedRequirementsKHR = MemoryDedicatedRequirements;
   struct MemoryDedicatedAllocateInfo;
   using MemoryDedicatedAllocateInfoKHR = MemoryDedicatedAllocateInfo;
   struct MemoryAllocateFlagsInfo;
   using MemoryAllocateFlagsInfoKHR = MemoryAllocateFlagsInfo;
+  struct DeviceGroupRenderPassBeginInfo;
+  using DeviceGroupRenderPassBeginInfoKHR = DeviceGroupRenderPassBeginInfo;
   struct DeviceGroupCommandBufferBeginInfo;
   using DeviceGroupCommandBufferBeginInfoKHR = DeviceGroupCommandBufferBeginInfo;
   struct DeviceGroupSubmitInfo;
@@ -183,16 +185,46 @@ namespace VULKAN_HPP_NAMESPACE
   using SparseImageFormatProperties2KHR = SparseImageFormatProperties2;
   struct PhysicalDeviceSparseImageFormatInfo2;
   using PhysicalDeviceSparseImageFormatInfo2KHR = PhysicalDeviceSparseImageFormatInfo2;
+  struct PhysicalDevicePointClippingProperties;
+  using PhysicalDevicePointClippingPropertiesKHR = PhysicalDevicePointClippingProperties;
+  struct RenderPassInputAttachmentAspectCreateInfo;
+  using RenderPassInputAttachmentAspectCreateInfoKHR = RenderPassInputAttachmentAspectCreateInfo;
+  struct InputAttachmentAspectReference;
+  using InputAttachmentAspectReferenceKHR = InputAttachmentAspectReference;
   struct ImageViewUsageCreateInfo;
   using ImageViewUsageCreateInfoKHR = ImageViewUsageCreateInfo;
+  struct PipelineTessellationDomainOriginStateCreateInfo;
+  using PipelineTessellationDomainOriginStateCreateInfoKHR = PipelineTessellationDomainOriginStateCreateInfo;
+  struct RenderPassMultiviewCreateInfo;
+  using RenderPassMultiviewCreateInfoKHR = RenderPassMultiviewCreateInfo;
+  struct PhysicalDeviceMultiviewFeatures;
+  using PhysicalDeviceMultiviewFeaturesKHR = PhysicalDeviceMultiviewFeatures;
+  struct PhysicalDeviceMultiviewProperties;
+  using PhysicalDeviceMultiviewPropertiesKHR = PhysicalDeviceMultiviewProperties;
+  struct PhysicalDeviceVariablePointersFeatures;
+  using PhysicalDeviceVariablePointerFeatures     = PhysicalDeviceVariablePointersFeatures;
+  using PhysicalDeviceVariablePointerFeaturesKHR  = PhysicalDeviceVariablePointersFeatures;
+  using PhysicalDeviceVariablePointersFeaturesKHR = PhysicalDeviceVariablePointersFeatures;
   struct PhysicalDeviceProtectedMemoryFeatures;
   struct PhysicalDeviceProtectedMemoryProperties;
   struct DeviceQueueInfo2;
   struct ProtectedSubmitInfo;
+  struct SamplerYcbcrConversionCreateInfo;
+  using SamplerYcbcrConversionCreateInfoKHR = SamplerYcbcrConversionCreateInfo;
+  struct SamplerYcbcrConversionInfo;
+  using SamplerYcbcrConversionInfoKHR = SamplerYcbcrConversionInfo;
   struct BindImagePlaneMemoryInfo;
   using BindImagePlaneMemoryInfoKHR = BindImagePlaneMemoryInfo;
   struct ImagePlaneMemoryRequirementsInfo;
   using ImagePlaneMemoryRequirementsInfoKHR = ImagePlaneMemoryRequirementsInfo;
+  struct PhysicalDeviceSamplerYcbcrConversionFeatures;
+  using PhysicalDeviceSamplerYcbcrConversionFeaturesKHR = PhysicalDeviceSamplerYcbcrConversionFeatures;
+  struct SamplerYcbcrConversionImageFormatProperties;
+  using SamplerYcbcrConversionImageFormatPropertiesKHR = SamplerYcbcrConversionImageFormatProperties;
+  struct DescriptorUpdateTemplateEntry;
+  using DescriptorUpdateTemplateEntryKHR = DescriptorUpdateTemplateEntry;
+  struct DescriptorUpdateTemplateCreateInfo;
+  using DescriptorUpdateTemplateCreateInfoKHR = DescriptorUpdateTemplateCreateInfo;
   struct ExternalMemoryProperties;
   using ExternalMemoryPropertiesKHR = ExternalMemoryProperties;
   struct PhysicalDeviceExternalImageFormatInfo;
@@ -223,45 +255,10 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDeviceExternalSemaphoreInfoKHR = PhysicalDeviceExternalSemaphoreInfo;
   struct ExternalSemaphoreProperties;
   using ExternalSemaphorePropertiesKHR = ExternalSemaphoreProperties;
-  struct PhysicalDeviceSubgroupProperties;
-  struct PhysicalDevice16BitStorageFeatures;
-  using PhysicalDevice16BitStorageFeaturesKHR = PhysicalDevice16BitStorageFeatures;
-  struct PhysicalDeviceVariablePointersFeatures;
-  using PhysicalDeviceVariablePointerFeatures     = PhysicalDeviceVariablePointersFeatures;
-  using PhysicalDeviceVariablePointerFeaturesKHR  = PhysicalDeviceVariablePointersFeatures;
-  using PhysicalDeviceVariablePointersFeaturesKHR = PhysicalDeviceVariablePointersFeatures;
-  struct DescriptorUpdateTemplateEntry;
-  using DescriptorUpdateTemplateEntryKHR = DescriptorUpdateTemplateEntry;
-  struct DescriptorUpdateTemplateCreateInfo;
-  using DescriptorUpdateTemplateCreateInfoKHR = DescriptorUpdateTemplateCreateInfo;
   struct PhysicalDeviceMaintenance3Properties;
   using PhysicalDeviceMaintenance3PropertiesKHR = PhysicalDeviceMaintenance3Properties;
   struct DescriptorSetLayoutSupport;
   using DescriptorSetLayoutSupportKHR = DescriptorSetLayoutSupport;
-  struct SamplerYcbcrConversionCreateInfo;
-  using SamplerYcbcrConversionCreateInfoKHR = SamplerYcbcrConversionCreateInfo;
-  struct SamplerYcbcrConversionInfo;
-  using SamplerYcbcrConversionInfoKHR = SamplerYcbcrConversionInfo;
-  struct PhysicalDeviceSamplerYcbcrConversionFeatures;
-  using PhysicalDeviceSamplerYcbcrConversionFeaturesKHR = PhysicalDeviceSamplerYcbcrConversionFeatures;
-  struct SamplerYcbcrConversionImageFormatProperties;
-  using SamplerYcbcrConversionImageFormatPropertiesKHR = SamplerYcbcrConversionImageFormatProperties;
-  struct DeviceGroupRenderPassBeginInfo;
-  using DeviceGroupRenderPassBeginInfoKHR = DeviceGroupRenderPassBeginInfo;
-  struct PhysicalDevicePointClippingProperties;
-  using PhysicalDevicePointClippingPropertiesKHR = PhysicalDevicePointClippingProperties;
-  struct RenderPassInputAttachmentAspectCreateInfo;
-  using RenderPassInputAttachmentAspectCreateInfoKHR = RenderPassInputAttachmentAspectCreateInfo;
-  struct InputAttachmentAspectReference;
-  using InputAttachmentAspectReferenceKHR = InputAttachmentAspectReference;
-  struct PipelineTessellationDomainOriginStateCreateInfo;
-  using PipelineTessellationDomainOriginStateCreateInfoKHR = PipelineTessellationDomainOriginStateCreateInfo;
-  struct RenderPassMultiviewCreateInfo;
-  using RenderPassMultiviewCreateInfoKHR = RenderPassMultiviewCreateInfo;
-  struct PhysicalDeviceMultiviewFeatures;
-  using PhysicalDeviceMultiviewFeaturesKHR = PhysicalDeviceMultiviewFeatures;
-  struct PhysicalDeviceMultiviewProperties;
-  using PhysicalDeviceMultiviewPropertiesKHR = PhysicalDeviceMultiviewProperties;
   struct PhysicalDeviceShaderDrawParametersFeatures;
   using PhysicalDeviceShaderDrawParameterFeatures = PhysicalDeviceShaderDrawParametersFeatures;
 
@@ -272,12 +269,75 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceVulkan12Properties;
   struct ImageFormatListCreateInfo;
   using ImageFormatListCreateInfoKHR = ImageFormatListCreateInfo;
+  struct RenderPassCreateInfo2;
+  using RenderPassCreateInfo2KHR = RenderPassCreateInfo2;
+  struct AttachmentDescription2;
+  using AttachmentDescription2KHR = AttachmentDescription2;
+  struct AttachmentReference2;
+  using AttachmentReference2KHR = AttachmentReference2;
+  struct SubpassDescription2;
+  using SubpassDescription2KHR = SubpassDescription2;
+  struct SubpassDependency2;
+  using SubpassDependency2KHR = SubpassDependency2;
+  struct SubpassBeginInfo;
+  using SubpassBeginInfoKHR = SubpassBeginInfo;
+  struct SubpassEndInfo;
+  using SubpassEndInfoKHR = SubpassEndInfo;
+  struct PhysicalDevice8BitStorageFeatures;
+  using PhysicalDevice8BitStorageFeaturesKHR = PhysicalDevice8BitStorageFeatures;
   struct ConformanceVersion;
   using ConformanceVersionKHR = ConformanceVersion;
   struct PhysicalDeviceDriverProperties;
   using PhysicalDeviceDriverPropertiesKHR = PhysicalDeviceDriverProperties;
+  struct PhysicalDeviceShaderAtomicInt64Features;
+  using PhysicalDeviceShaderAtomicInt64FeaturesKHR = PhysicalDeviceShaderAtomicInt64Features;
+  struct PhysicalDeviceShaderFloat16Int8Features;
+  using PhysicalDeviceFloat16Int8FeaturesKHR       = PhysicalDeviceShaderFloat16Int8Features;
+  using PhysicalDeviceShaderFloat16Int8FeaturesKHR = PhysicalDeviceShaderFloat16Int8Features;
+  struct PhysicalDeviceFloatControlsProperties;
+  using PhysicalDeviceFloatControlsPropertiesKHR = PhysicalDeviceFloatControlsProperties;
+  struct DescriptorSetLayoutBindingFlagsCreateInfo;
+  using DescriptorSetLayoutBindingFlagsCreateInfoEXT = DescriptorSetLayoutBindingFlagsCreateInfo;
+  struct PhysicalDeviceDescriptorIndexingFeatures;
+  using PhysicalDeviceDescriptorIndexingFeaturesEXT = PhysicalDeviceDescriptorIndexingFeatures;
+  struct PhysicalDeviceDescriptorIndexingProperties;
+  using PhysicalDeviceDescriptorIndexingPropertiesEXT = PhysicalDeviceDescriptorIndexingProperties;
+  struct DescriptorSetVariableDescriptorCountAllocateInfo;
+  using DescriptorSetVariableDescriptorCountAllocateInfoEXT = DescriptorSetVariableDescriptorCountAllocateInfo;
+  struct DescriptorSetVariableDescriptorCountLayoutSupport;
+  using DescriptorSetVariableDescriptorCountLayoutSupportEXT = DescriptorSetVariableDescriptorCountLayoutSupport;
+  struct SubpassDescriptionDepthStencilResolve;
+  using SubpassDescriptionDepthStencilResolveKHR = SubpassDescriptionDepthStencilResolve;
+  struct PhysicalDeviceDepthStencilResolveProperties;
+  using PhysicalDeviceDepthStencilResolvePropertiesKHR = PhysicalDeviceDepthStencilResolveProperties;
+  struct PhysicalDeviceScalarBlockLayoutFeatures;
+  using PhysicalDeviceScalarBlockLayoutFeaturesEXT = PhysicalDeviceScalarBlockLayoutFeatures;
+  struct ImageStencilUsageCreateInfo;
+  using ImageStencilUsageCreateInfoEXT = ImageStencilUsageCreateInfo;
+  struct SamplerReductionModeCreateInfo;
+  using SamplerReductionModeCreateInfoEXT = SamplerReductionModeCreateInfo;
+  struct PhysicalDeviceSamplerFilterMinmaxProperties;
+  using PhysicalDeviceSamplerFilterMinmaxPropertiesEXT = PhysicalDeviceSamplerFilterMinmaxProperties;
   struct PhysicalDeviceVulkanMemoryModelFeatures;
   using PhysicalDeviceVulkanMemoryModelFeaturesKHR = PhysicalDeviceVulkanMemoryModelFeatures;
+  struct PhysicalDeviceImagelessFramebufferFeatures;
+  using PhysicalDeviceImagelessFramebufferFeaturesKHR = PhysicalDeviceImagelessFramebufferFeatures;
+  struct FramebufferAttachmentsCreateInfo;
+  using FramebufferAttachmentsCreateInfoKHR = FramebufferAttachmentsCreateInfo;
+  struct FramebufferAttachmentImageInfo;
+  using FramebufferAttachmentImageInfoKHR = FramebufferAttachmentImageInfo;
+  struct RenderPassAttachmentBeginInfo;
+  using RenderPassAttachmentBeginInfoKHR = RenderPassAttachmentBeginInfo;
+  struct PhysicalDeviceUniformBufferStandardLayoutFeatures;
+  using PhysicalDeviceUniformBufferStandardLayoutFeaturesKHR = PhysicalDeviceUniformBufferStandardLayoutFeatures;
+  struct PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
+  using PhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR = PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
+  struct PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
+  using PhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR = PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
+  struct AttachmentReferenceStencilLayout;
+  using AttachmentReferenceStencilLayoutKHR = AttachmentReferenceStencilLayout;
+  struct AttachmentDescriptionStencilLayout;
+  using AttachmentDescriptionStencilLayoutKHR = AttachmentDescriptionStencilLayout;
   struct PhysicalDeviceHostQueryResetFeatures;
   using PhysicalDeviceHostQueryResetFeaturesEXT = PhysicalDeviceHostQueryResetFeatures;
   struct PhysicalDeviceTimelineSemaphoreFeatures;
@@ -303,81 +363,28 @@ namespace VULKAN_HPP_NAMESPACE
   using MemoryOpaqueCaptureAddressAllocateInfoKHR = MemoryOpaqueCaptureAddressAllocateInfo;
   struct DeviceMemoryOpaqueCaptureAddressInfo;
   using DeviceMemoryOpaqueCaptureAddressInfoKHR = DeviceMemoryOpaqueCaptureAddressInfo;
-  struct PhysicalDevice8BitStorageFeatures;
-  using PhysicalDevice8BitStorageFeaturesKHR = PhysicalDevice8BitStorageFeatures;
-  struct PhysicalDeviceShaderAtomicInt64Features;
-  using PhysicalDeviceShaderAtomicInt64FeaturesKHR = PhysicalDeviceShaderAtomicInt64Features;
-  struct PhysicalDeviceShaderFloat16Int8Features;
-  using PhysicalDeviceFloat16Int8FeaturesKHR       = PhysicalDeviceShaderFloat16Int8Features;
-  using PhysicalDeviceShaderFloat16Int8FeaturesKHR = PhysicalDeviceShaderFloat16Int8Features;
-  struct PhysicalDeviceFloatControlsProperties;
-  using PhysicalDeviceFloatControlsPropertiesKHR = PhysicalDeviceFloatControlsProperties;
-  struct DescriptorSetLayoutBindingFlagsCreateInfo;
-  using DescriptorSetLayoutBindingFlagsCreateInfoEXT = DescriptorSetLayoutBindingFlagsCreateInfo;
-  struct PhysicalDeviceDescriptorIndexingFeatures;
-  using PhysicalDeviceDescriptorIndexingFeaturesEXT = PhysicalDeviceDescriptorIndexingFeatures;
-  struct PhysicalDeviceDescriptorIndexingProperties;
-  using PhysicalDeviceDescriptorIndexingPropertiesEXT = PhysicalDeviceDescriptorIndexingProperties;
-  struct DescriptorSetVariableDescriptorCountAllocateInfo;
-  using DescriptorSetVariableDescriptorCountAllocateInfoEXT = DescriptorSetVariableDescriptorCountAllocateInfo;
-  struct DescriptorSetVariableDescriptorCountLayoutSupport;
-  using DescriptorSetVariableDescriptorCountLayoutSupportEXT = DescriptorSetVariableDescriptorCountLayoutSupport;
-  struct PhysicalDeviceScalarBlockLayoutFeatures;
-  using PhysicalDeviceScalarBlockLayoutFeaturesEXT = PhysicalDeviceScalarBlockLayoutFeatures;
-  struct SamplerReductionModeCreateInfo;
-  using SamplerReductionModeCreateInfoEXT = SamplerReductionModeCreateInfo;
-  struct PhysicalDeviceSamplerFilterMinmaxProperties;
-  using PhysicalDeviceSamplerFilterMinmaxPropertiesEXT = PhysicalDeviceSamplerFilterMinmaxProperties;
-  struct PhysicalDeviceUniformBufferStandardLayoutFeatures;
-  using PhysicalDeviceUniformBufferStandardLayoutFeaturesKHR = PhysicalDeviceUniformBufferStandardLayoutFeatures;
-  struct PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
-  using PhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR = PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
-  struct RenderPassCreateInfo2;
-  using RenderPassCreateInfo2KHR = RenderPassCreateInfo2;
-  struct AttachmentDescription2;
-  using AttachmentDescription2KHR = AttachmentDescription2;
-  struct AttachmentReference2;
-  using AttachmentReference2KHR = AttachmentReference2;
-  struct SubpassDescription2;
-  using SubpassDescription2KHR = SubpassDescription2;
-  struct SubpassDependency2;
-  using SubpassDependency2KHR = SubpassDependency2;
-  struct SubpassBeginInfo;
-  using SubpassBeginInfoKHR = SubpassBeginInfo;
-  struct SubpassEndInfo;
-  using SubpassEndInfoKHR = SubpassEndInfo;
-  struct SubpassDescriptionDepthStencilResolve;
-  using SubpassDescriptionDepthStencilResolveKHR = SubpassDescriptionDepthStencilResolve;
-  struct PhysicalDeviceDepthStencilResolveProperties;
-  using PhysicalDeviceDepthStencilResolvePropertiesKHR = PhysicalDeviceDepthStencilResolveProperties;
-  struct ImageStencilUsageCreateInfo;
-  using ImageStencilUsageCreateInfoEXT = ImageStencilUsageCreateInfo;
-  struct PhysicalDeviceImagelessFramebufferFeatures;
-  using PhysicalDeviceImagelessFramebufferFeaturesKHR = PhysicalDeviceImagelessFramebufferFeatures;
-  struct FramebufferAttachmentsCreateInfo;
-  using FramebufferAttachmentsCreateInfoKHR = FramebufferAttachmentsCreateInfo;
-  struct FramebufferAttachmentImageInfo;
-  using FramebufferAttachmentImageInfoKHR = FramebufferAttachmentImageInfo;
-  struct RenderPassAttachmentBeginInfo;
-  using RenderPassAttachmentBeginInfoKHR = RenderPassAttachmentBeginInfo;
-  struct PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
-  using PhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR = PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
-  struct AttachmentReferenceStencilLayout;
-  using AttachmentReferenceStencilLayoutKHR = AttachmentReferenceStencilLayout;
-  struct AttachmentDescriptionStencilLayout;
-  using AttachmentDescriptionStencilLayoutKHR = AttachmentDescriptionStencilLayout;
 
   //=== VK_VERSION_1_3 ===
   struct PhysicalDeviceVulkan13Features;
   struct PhysicalDeviceVulkan13Properties;
+  struct PipelineCreationFeedbackCreateInfo;
+  using PipelineCreationFeedbackCreateInfoEXT = PipelineCreationFeedbackCreateInfo;
+  struct PipelineCreationFeedback;
+  using PipelineCreationFeedbackEXT = PipelineCreationFeedback;
+  struct PhysicalDeviceShaderTerminateInvocationFeatures;
+  using PhysicalDeviceShaderTerminateInvocationFeaturesKHR = PhysicalDeviceShaderTerminateInvocationFeatures;
   struct PhysicalDeviceToolProperties;
   using PhysicalDeviceToolPropertiesEXT = PhysicalDeviceToolProperties;
+  struct PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
+  using PhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT = PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
   struct PhysicalDevicePrivateDataFeatures;
   using PhysicalDevicePrivateDataFeaturesEXT = PhysicalDevicePrivateDataFeatures;
   struct DevicePrivateDataCreateInfo;
   using DevicePrivateDataCreateInfoEXT = DevicePrivateDataCreateInfo;
   struct PrivateDataSlotCreateInfo;
   using PrivateDataSlotCreateInfoEXT = PrivateDataSlotCreateInfo;
+  struct PhysicalDevicePipelineCreationCacheControlFeatures;
+  using PhysicalDevicePipelineCreationCacheControlFeaturesEXT = PhysicalDevicePipelineCreationCacheControlFeatures;
   struct MemoryBarrier2;
   using MemoryBarrier2KHR = MemoryBarrier2;
   struct BufferMemoryBarrier2;
@@ -394,6 +401,10 @@ namespace VULKAN_HPP_NAMESPACE
   using CommandBufferSubmitInfoKHR = CommandBufferSubmitInfo;
   struct PhysicalDeviceSynchronization2Features;
   using PhysicalDeviceSynchronization2FeaturesKHR = PhysicalDeviceSynchronization2Features;
+  struct PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
+  using PhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR = PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
+  struct PhysicalDeviceImageRobustnessFeatures;
+  using PhysicalDeviceImageRobustnessFeaturesEXT = PhysicalDeviceImageRobustnessFeatures;
   struct CopyBufferInfo2;
   using CopyBufferInfo2KHR = CopyBufferInfo2;
   struct CopyImageInfo2;
@@ -402,38 +413,20 @@ namespace VULKAN_HPP_NAMESPACE
   using CopyBufferToImageInfo2KHR = CopyBufferToImageInfo2;
   struct CopyImageToBufferInfo2;
   using CopyImageToBufferInfo2KHR = CopyImageToBufferInfo2;
+  struct BlitImageInfo2;
+  using BlitImageInfo2KHR = BlitImageInfo2;
+  struct ResolveImageInfo2;
+  using ResolveImageInfo2KHR = ResolveImageInfo2;
   struct BufferCopy2;
   using BufferCopy2KHR = BufferCopy2;
   struct ImageCopy2;
   using ImageCopy2KHR = ImageCopy2;
+  struct ImageBlit2;
+  using ImageBlit2KHR = ImageBlit2;
   struct BufferImageCopy2;
   using BufferImageCopy2KHR = BufferImageCopy2;
-  struct PhysicalDeviceTextureCompressionASTCHDRFeatures;
-  using PhysicalDeviceTextureCompressionASTCHDRFeaturesEXT = PhysicalDeviceTextureCompressionASTCHDRFeatures;
-  struct FormatProperties3;
-  using FormatProperties3KHR = FormatProperties3;
-  struct PhysicalDeviceMaintenance4Features;
-  using PhysicalDeviceMaintenance4FeaturesKHR = PhysicalDeviceMaintenance4Features;
-  struct PhysicalDeviceMaintenance4Properties;
-  using PhysicalDeviceMaintenance4PropertiesKHR = PhysicalDeviceMaintenance4Properties;
-  struct DeviceBufferMemoryRequirements;
-  using DeviceBufferMemoryRequirementsKHR = DeviceBufferMemoryRequirements;
-  struct DeviceImageMemoryRequirements;
-  using DeviceImageMemoryRequirementsKHR = DeviceImageMemoryRequirements;
-  struct PipelineCreationFeedbackCreateInfo;
-  using PipelineCreationFeedbackCreateInfoEXT = PipelineCreationFeedbackCreateInfo;
-  struct PipelineCreationFeedback;
-  using PipelineCreationFeedbackEXT = PipelineCreationFeedback;
-  struct PhysicalDeviceShaderTerminateInvocationFeatures;
-  using PhysicalDeviceShaderTerminateInvocationFeaturesKHR = PhysicalDeviceShaderTerminateInvocationFeatures;
-  struct PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
-  using PhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT = PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
-  struct PhysicalDevicePipelineCreationCacheControlFeatures;
-  using PhysicalDevicePipelineCreationCacheControlFeaturesEXT = PhysicalDevicePipelineCreationCacheControlFeatures;
-  struct PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
-  using PhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR = PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
-  struct PhysicalDeviceImageRobustnessFeatures;
-  using PhysicalDeviceImageRobustnessFeaturesEXT = PhysicalDeviceImageRobustnessFeatures;
+  struct ImageResolve2;
+  using ImageResolve2KHR = ImageResolve2;
   struct PhysicalDeviceSubgroupSizeControlFeatures;
   using PhysicalDeviceSubgroupSizeControlFeaturesEXT = PhysicalDeviceSubgroupSizeControlFeatures;
   struct PhysicalDeviceSubgroupSizeControlProperties;
@@ -449,20 +442,8 @@ namespace VULKAN_HPP_NAMESPACE
   using WriteDescriptorSetInlineUniformBlockEXT = WriteDescriptorSetInlineUniformBlock;
   struct DescriptorPoolInlineUniformBlockCreateInfo;
   using DescriptorPoolInlineUniformBlockCreateInfoEXT = DescriptorPoolInlineUniformBlockCreateInfo;
-  struct PhysicalDeviceShaderIntegerDotProductFeatures;
-  using PhysicalDeviceShaderIntegerDotProductFeaturesKHR = PhysicalDeviceShaderIntegerDotProductFeatures;
-  struct PhysicalDeviceShaderIntegerDotProductProperties;
-  using PhysicalDeviceShaderIntegerDotProductPropertiesKHR = PhysicalDeviceShaderIntegerDotProductProperties;
-  struct PhysicalDeviceTexelBufferAlignmentProperties;
-  using PhysicalDeviceTexelBufferAlignmentPropertiesEXT = PhysicalDeviceTexelBufferAlignmentProperties;
-  struct BlitImageInfo2;
-  using BlitImageInfo2KHR = BlitImageInfo2;
-  struct ImageBlit2;
-  using ImageBlit2KHR = ImageBlit2;
-  struct ResolveImageInfo2;
-  using ResolveImageInfo2KHR = ResolveImageInfo2;
-  struct ImageResolve2;
-  using ImageResolve2KHR = ImageResolve2;
+  struct PhysicalDeviceTextureCompressionASTCHDRFeatures;
+  using PhysicalDeviceTextureCompressionASTCHDRFeaturesEXT = PhysicalDeviceTextureCompressionASTCHDRFeatures;
   struct RenderingInfo;
   using RenderingInfoKHR = RenderingInfo;
   struct RenderingAttachmentInfo;
@@ -473,120 +454,22 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDeviceDynamicRenderingFeaturesKHR = PhysicalDeviceDynamicRenderingFeatures;
   struct CommandBufferInheritanceRenderingInfo;
   using CommandBufferInheritanceRenderingInfoKHR = CommandBufferInheritanceRenderingInfo;
-
-  //=== VK_VERSION_1_4 ===
-  struct PhysicalDeviceVulkan14Features;
-  struct PhysicalDeviceVulkan14Properties;
-  struct DeviceQueueGlobalPriorityCreateInfo;
-  using DeviceQueueGlobalPriorityCreateInfoEXT = DeviceQueueGlobalPriorityCreateInfo;
-  using DeviceQueueGlobalPriorityCreateInfoKHR = DeviceQueueGlobalPriorityCreateInfo;
-  struct PhysicalDeviceGlobalPriorityQueryFeatures;
-  using PhysicalDeviceGlobalPriorityQueryFeaturesEXT = PhysicalDeviceGlobalPriorityQueryFeatures;
-  using PhysicalDeviceGlobalPriorityQueryFeaturesKHR = PhysicalDeviceGlobalPriorityQueryFeatures;
-  struct QueueFamilyGlobalPriorityProperties;
-  using QueueFamilyGlobalPriorityPropertiesEXT = QueueFamilyGlobalPriorityProperties;
-  using QueueFamilyGlobalPriorityPropertiesKHR = QueueFamilyGlobalPriorityProperties;
-  struct PhysicalDeviceIndexTypeUint8Features;
-  using PhysicalDeviceIndexTypeUint8FeaturesEXT = PhysicalDeviceIndexTypeUint8Features;
-  using PhysicalDeviceIndexTypeUint8FeaturesKHR = PhysicalDeviceIndexTypeUint8Features;
-  struct MemoryMapInfo;
-  using MemoryMapInfoKHR = MemoryMapInfo;
-  struct MemoryUnmapInfo;
-  using MemoryUnmapInfoKHR = MemoryUnmapInfo;
-  struct PhysicalDeviceMaintenance5Features;
-  using PhysicalDeviceMaintenance5FeaturesKHR = PhysicalDeviceMaintenance5Features;
-  struct PhysicalDeviceMaintenance5Properties;
-  using PhysicalDeviceMaintenance5PropertiesKHR = PhysicalDeviceMaintenance5Properties;
-  struct DeviceImageSubresourceInfo;
-  using DeviceImageSubresourceInfoKHR = DeviceImageSubresourceInfo;
-  struct ImageSubresource2;
-  using ImageSubresource2EXT = ImageSubresource2;
-  using ImageSubresource2KHR = ImageSubresource2;
-  struct SubresourceLayout2;
-  using SubresourceLayout2EXT = SubresourceLayout2;
-  using SubresourceLayout2KHR = SubresourceLayout2;
-  struct BufferUsageFlags2CreateInfo;
-  using BufferUsageFlags2CreateInfoKHR = BufferUsageFlags2CreateInfo;
-  struct PhysicalDeviceMaintenance6Features;
-  using PhysicalDeviceMaintenance6FeaturesKHR = PhysicalDeviceMaintenance6Features;
-  struct PhysicalDeviceMaintenance6Properties;
-  using PhysicalDeviceMaintenance6PropertiesKHR = PhysicalDeviceMaintenance6Properties;
-  struct BindMemoryStatus;
-  using BindMemoryStatusKHR = BindMemoryStatus;
-  struct PhysicalDeviceHostImageCopyFeatures;
-  using PhysicalDeviceHostImageCopyFeaturesEXT = PhysicalDeviceHostImageCopyFeatures;
-  struct PhysicalDeviceHostImageCopyProperties;
-  using PhysicalDeviceHostImageCopyPropertiesEXT = PhysicalDeviceHostImageCopyProperties;
-  struct MemoryToImageCopy;
-  using MemoryToImageCopyEXT = MemoryToImageCopy;
-  struct ImageToMemoryCopy;
-  using ImageToMemoryCopyEXT = ImageToMemoryCopy;
-  struct CopyMemoryToImageInfo;
-  using CopyMemoryToImageInfoEXT = CopyMemoryToImageInfo;
-  struct CopyImageToMemoryInfo;
-  using CopyImageToMemoryInfoEXT = CopyImageToMemoryInfo;
-  struct CopyImageToImageInfo;
-  using CopyImageToImageInfoEXT = CopyImageToImageInfo;
-  struct HostImageLayoutTransitionInfo;
-  using HostImageLayoutTransitionInfoEXT = HostImageLayoutTransitionInfo;
-  struct SubresourceHostMemcpySize;
-  using SubresourceHostMemcpySizeEXT = SubresourceHostMemcpySize;
-  struct HostImageCopyDevicePerformanceQuery;
-  using HostImageCopyDevicePerformanceQueryEXT = HostImageCopyDevicePerformanceQuery;
-  struct PhysicalDeviceShaderSubgroupRotateFeatures;
-  using PhysicalDeviceShaderSubgroupRotateFeaturesKHR = PhysicalDeviceShaderSubgroupRotateFeatures;
-  struct PhysicalDeviceShaderFloatControls2Features;
-  using PhysicalDeviceShaderFloatControls2FeaturesKHR = PhysicalDeviceShaderFloatControls2Features;
-  struct PhysicalDeviceShaderExpectAssumeFeatures;
-  using PhysicalDeviceShaderExpectAssumeFeaturesKHR = PhysicalDeviceShaderExpectAssumeFeatures;
-  struct PipelineCreateFlags2CreateInfo;
-  using PipelineCreateFlags2CreateInfoKHR = PipelineCreateFlags2CreateInfo;
-  struct PhysicalDevicePushDescriptorProperties;
-  using PhysicalDevicePushDescriptorPropertiesKHR = PhysicalDevicePushDescriptorProperties;
-  struct BindDescriptorSetsInfo;
-  using BindDescriptorSetsInfoKHR = BindDescriptorSetsInfo;
-  struct PushConstantsInfo;
-  using PushConstantsInfoKHR = PushConstantsInfo;
-  struct PushDescriptorSetInfo;
-  using PushDescriptorSetInfoKHR = PushDescriptorSetInfo;
-  struct PushDescriptorSetWithTemplateInfo;
-  using PushDescriptorSetWithTemplateInfoKHR = PushDescriptorSetWithTemplateInfo;
-  struct PhysicalDevicePipelineProtectedAccessFeatures;
-  using PhysicalDevicePipelineProtectedAccessFeaturesEXT = PhysicalDevicePipelineProtectedAccessFeatures;
-  struct PhysicalDevicePipelineRobustnessFeatures;
-  using PhysicalDevicePipelineRobustnessFeaturesEXT = PhysicalDevicePipelineRobustnessFeatures;
-  struct PhysicalDevicePipelineRobustnessProperties;
-  using PhysicalDevicePipelineRobustnessPropertiesEXT = PhysicalDevicePipelineRobustnessProperties;
-  struct PipelineRobustnessCreateInfo;
-  using PipelineRobustnessCreateInfoEXT = PipelineRobustnessCreateInfo;
-  struct PhysicalDeviceLineRasterizationFeatures;
-  using PhysicalDeviceLineRasterizationFeaturesEXT = PhysicalDeviceLineRasterizationFeatures;
-  using PhysicalDeviceLineRasterizationFeaturesKHR = PhysicalDeviceLineRasterizationFeatures;
-  struct PhysicalDeviceLineRasterizationProperties;
-  using PhysicalDeviceLineRasterizationPropertiesEXT = PhysicalDeviceLineRasterizationProperties;
-  using PhysicalDeviceLineRasterizationPropertiesKHR = PhysicalDeviceLineRasterizationProperties;
-  struct PipelineRasterizationLineStateCreateInfo;
-  using PipelineRasterizationLineStateCreateInfoEXT = PipelineRasterizationLineStateCreateInfo;
-  using PipelineRasterizationLineStateCreateInfoKHR = PipelineRasterizationLineStateCreateInfo;
-  struct PhysicalDeviceVertexAttributeDivisorProperties;
-  using PhysicalDeviceVertexAttributeDivisorPropertiesKHR = PhysicalDeviceVertexAttributeDivisorProperties;
-  struct VertexInputBindingDivisorDescription;
-  using VertexInputBindingDivisorDescriptionEXT = VertexInputBindingDivisorDescription;
-  using VertexInputBindingDivisorDescriptionKHR = VertexInputBindingDivisorDescription;
-  struct PipelineVertexInputDivisorStateCreateInfo;
-  using PipelineVertexInputDivisorStateCreateInfoEXT = PipelineVertexInputDivisorStateCreateInfo;
-  using PipelineVertexInputDivisorStateCreateInfoKHR = PipelineVertexInputDivisorStateCreateInfo;
-  struct PhysicalDeviceVertexAttributeDivisorFeatures;
-  using PhysicalDeviceVertexAttributeDivisorFeaturesEXT = PhysicalDeviceVertexAttributeDivisorFeatures;
-  using PhysicalDeviceVertexAttributeDivisorFeaturesKHR = PhysicalDeviceVertexAttributeDivisorFeatures;
-  struct RenderingAreaInfo;
-  using RenderingAreaInfoKHR = RenderingAreaInfo;
-  struct PhysicalDeviceDynamicRenderingLocalReadFeatures;
-  using PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR = PhysicalDeviceDynamicRenderingLocalReadFeatures;
-  struct RenderingAttachmentLocationInfo;
-  using RenderingAttachmentLocationInfoKHR = RenderingAttachmentLocationInfo;
-  struct RenderingInputAttachmentIndexInfo;
-  using RenderingInputAttachmentIndexInfoKHR = RenderingInputAttachmentIndexInfo;
+  struct PhysicalDeviceShaderIntegerDotProductFeatures;
+  using PhysicalDeviceShaderIntegerDotProductFeaturesKHR = PhysicalDeviceShaderIntegerDotProductFeatures;
+  struct PhysicalDeviceShaderIntegerDotProductProperties;
+  using PhysicalDeviceShaderIntegerDotProductPropertiesKHR = PhysicalDeviceShaderIntegerDotProductProperties;
+  struct PhysicalDeviceTexelBufferAlignmentProperties;
+  using PhysicalDeviceTexelBufferAlignmentPropertiesEXT = PhysicalDeviceTexelBufferAlignmentProperties;
+  struct FormatProperties3;
+  using FormatProperties3KHR = FormatProperties3;
+  struct PhysicalDeviceMaintenance4Features;
+  using PhysicalDeviceMaintenance4FeaturesKHR = PhysicalDeviceMaintenance4Features;
+  struct PhysicalDeviceMaintenance4Properties;
+  using PhysicalDeviceMaintenance4PropertiesKHR = PhysicalDeviceMaintenance4Properties;
+  struct DeviceBufferMemoryRequirements;
+  using DeviceBufferMemoryRequirementsKHR = DeviceBufferMemoryRequirements;
+  struct DeviceImageMemoryRequirements;
+  using DeviceImageMemoryRequirementsKHR = DeviceImageMemoryRequirements;
 
   //=== VK_KHR_surface ===
   struct SurfaceCapabilitiesKHR;
@@ -686,7 +569,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NVX_binary_import ===
   struct CuModuleCreateInfoNVX;
-  struct CuModuleTexturingModeCreateInfoNVX;
   struct CuFunctionCreateInfoNVX;
   struct CuLaunchInfoNVX;
 
@@ -745,6 +627,13 @@ namespace VULKAN_HPP_NAMESPACE
   struct ShaderResourceUsageAMD;
   struct ShaderStatisticsInfoAMD;
 
+  //=== VK_KHR_dynamic_rendering ===
+  struct RenderingFragmentShadingRateAttachmentInfoKHR;
+  struct RenderingFragmentDensityMapAttachmentInfoEXT;
+  struct AttachmentSampleCountInfoAMD;
+  using AttachmentSampleCountInfoNV = AttachmentSampleCountInfoAMD;
+  struct MultiviewPerViewAttributesInfoNVX;
+
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_stream_descriptor_surface ===
   struct StreamDescriptorSurfaceCreateInfoGGP;
@@ -783,6 +672,11 @@ namespace VULKAN_HPP_NAMESPACE
   struct ImageViewASTCDecodeModeEXT;
   struct PhysicalDeviceASTCDecodeFeaturesEXT;
 
+  //=== VK_EXT_pipeline_robustness ===
+  struct PhysicalDevicePipelineRobustnessFeaturesEXT;
+  struct PhysicalDevicePipelineRobustnessPropertiesEXT;
+  struct PipelineRobustnessCreateInfoEXT;
+
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_external_memory_win32 ===
   struct ImportMemoryWin32HandleInfoKHR;
@@ -813,6 +707,9 @@ namespace VULKAN_HPP_NAMESPACE
   struct ImportSemaphoreFdInfoKHR;
   struct SemaphoreGetFdInfoKHR;
 
+  //=== VK_KHR_push_descriptor ===
+  struct PhysicalDevicePushDescriptorPropertiesKHR;
+
   //=== VK_EXT_conditional_rendering ===
   struct ConditionalRenderingBeginInfoEXT;
   struct PhysicalDeviceConditionalRenderingFeaturesEXT;
@@ -844,7 +741,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NVX_multiview_per_view_attributes ===
   struct PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
-  struct MultiviewPerViewAttributesInfoNVX;
 
   //=== VK_NV_viewport_swizzle ===
   struct ViewportSwizzleNV;
@@ -945,13 +841,6 @@ namespace VULKAN_HPP_NAMESPACE
   union DeviceOrHostAddressConstAMDX;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_AMD_mixed_attachment_samples ===
-  struct AttachmentSampleCountInfoAMD;
-  using AttachmentSampleCountInfoNV = AttachmentSampleCountInfoAMD;
-
-  //=== VK_KHR_shader_bfloat16 ===
-  struct PhysicalDeviceShaderBfloat16FeaturesKHR;
-
   //=== VK_EXT_sample_locations ===
   struct SampleLocationEXT;
   struct SampleLocationsInfoEXT;
@@ -1089,6 +978,14 @@ namespace VULKAN_HPP_NAMESPACE
   struct VideoDecodeH265PictureInfoKHR;
   struct VideoDecodeH265DpbSlotInfoKHR;
 
+  //=== VK_KHR_global_priority ===
+  struct DeviceQueueGlobalPriorityCreateInfoKHR;
+  using DeviceQueueGlobalPriorityCreateInfoEXT = DeviceQueueGlobalPriorityCreateInfoKHR;
+  struct PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
+  using PhysicalDeviceGlobalPriorityQueryFeaturesEXT = PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
+  struct QueueFamilyGlobalPriorityPropertiesKHR;
+  using QueueFamilyGlobalPriorityPropertiesEXT = QueueFamilyGlobalPriorityPropertiesKHR;
+
   //=== VK_AMD_memory_overallocation_behavior ===
   struct DeviceMemoryOverallocationCreateInfoAMD;
 
@@ -1100,6 +997,9 @@ namespace VULKAN_HPP_NAMESPACE
   struct PresentFrameTokenGGP;
 #endif /*VK_USE_PLATFORM_GGP*/
 
+  //=== VK_NV_compute_shader_derivatives ===
+  struct PhysicalDeviceComputeShaderDerivativesFeaturesNV;
+
   //=== VK_NV_mesh_shader ===
   struct PhysicalDeviceMeshShaderFeaturesNV;
   struct PhysicalDeviceMeshShaderPropertiesNV;
@@ -1115,21 +1015,6 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_NV_device_diagnostic_checkpoints ===
   struct QueueFamilyCheckpointPropertiesNV;
   struct CheckpointDataNV;
-  struct QueueFamilyCheckpointProperties2NV;
-  struct CheckpointData2NV;
-
-  //=== VK_EXT_present_timing ===
-  struct PhysicalDevicePresentTimingFeaturesEXT;
-  struct PresentTimingSurfaceCapabilitiesEXT;
-  struct SwapchainCalibratedTimestampInfoEXT;
-  struct SwapchainTimingPropertiesEXT;
-  struct SwapchainTimeDomainPropertiesEXT;
-  struct PastPresentationTimingInfoEXT;
-  struct PastPresentationTimingPropertiesEXT;
-  struct PastPresentationTimingEXT;
-  struct PresentTimingsInfoEXT;
-  struct PresentTimingInfoEXT;
-  struct PresentStageTimeEXT;
 
   //=== VK_INTEL_shader_integer_functions2 ===
   struct PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
@@ -1166,7 +1051,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceFragmentDensityMapFeaturesEXT;
   struct PhysicalDeviceFragmentDensityMapPropertiesEXT;
   struct RenderPassFragmentDensityMapCreateInfoEXT;
-  struct RenderingFragmentDensityMapAttachmentInfoEXT;
 
   //=== VK_KHR_fragment_shading_rate ===
   struct FragmentShadingRateAttachmentInfoKHR;
@@ -1174,7 +1058,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceFragmentShadingRateFeaturesKHR;
   struct PhysicalDeviceFragmentShadingRatePropertiesKHR;
   struct PhysicalDeviceFragmentShadingRateKHR;
-  struct RenderingFragmentShadingRateAttachmentInfoKHR;
 
   //=== VK_AMD_shader_core_properties2 ===
   struct PhysicalDeviceShaderCoreProperties2AMD;
@@ -1182,6 +1065,11 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_AMD_device_coherent_memory ===
   struct PhysicalDeviceCoherentMemoryFeaturesAMD;
 
+  //=== VK_KHR_dynamic_rendering_local_read ===
+  struct PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
+  struct RenderingAttachmentLocationInfoKHR;
+  struct RenderingInputAttachmentIndexInfoKHR;
+
   //=== VK_EXT_shader_image_atomic_int64 ===
   struct PhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
 
@@ -1259,6 +1147,22 @@ namespace VULKAN_HPP_NAMESPACE
   struct PipelineExecutableStatisticKHR;
   struct PipelineExecutableInternalRepresentationKHR;
 
+  //=== VK_EXT_host_image_copy ===
+  struct PhysicalDeviceHostImageCopyFeaturesEXT;
+  struct PhysicalDeviceHostImageCopyPropertiesEXT;
+  struct MemoryToImageCopyEXT;
+  struct ImageToMemoryCopyEXT;
+  struct CopyMemoryToImageInfoEXT;
+  struct CopyImageToMemoryInfoEXT;
+  struct CopyImageToImageInfoEXT;
+  struct HostImageLayoutTransitionInfoEXT;
+  struct SubresourceHostMemcpySizeEXT;
+  struct HostImageCopyDevicePerformanceQueryEXT;
+
+  //=== VK_KHR_map_memory2 ===
+  struct MemoryMapInfoKHR;
+  struct MemoryUnmapInfoKHR;
+
   //=== VK_EXT_map_memory_placed ===
   struct PhysicalDeviceMapMemoryPlacedFeaturesEXT;
   struct PhysicalDeviceMapMemoryPlacedPropertiesEXT;
@@ -1267,6 +1171,19 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_shader_atomic_float2 ===
   struct PhysicalDeviceShaderAtomicFloat2FeaturesEXT;
 
+  //=== VK_EXT_surface_maintenance1 ===
+  struct SurfacePresentModeEXT;
+  struct SurfacePresentScalingCapabilitiesEXT;
+  struct SurfacePresentModeCompatibilityEXT;
+
+  //=== VK_EXT_swapchain_maintenance1 ===
+  struct PhysicalDeviceSwapchainMaintenance1FeaturesEXT;
+  struct SwapchainPresentFenceInfoEXT;
+  struct SwapchainPresentModesCreateInfoEXT;
+  struct SwapchainPresentModeInfoEXT;
+  struct SwapchainPresentScalingCreateInfoEXT;
+  struct ReleaseSwapchainImagesInfoEXT;
+
   //=== VK_NV_device_generated_commands ===
   struct PhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
   struct PhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
@@ -1303,6 +1220,10 @@ namespace VULKAN_HPP_NAMESPACE
   struct DeviceDeviceMemoryReportCreateInfoEXT;
   struct DeviceMemoryReportCallbackDataEXT;
 
+  //=== VK_EXT_robustness2 ===
+  struct PhysicalDeviceRobustness2FeaturesEXT;
+  struct PhysicalDeviceRobustness2PropertiesEXT;
+
   //=== VK_EXT_custom_border_color ===
   struct SamplerCustomBorderColorCreateInfoEXT;
   struct PhysicalDeviceCustomBorderColorPropertiesEXT;
@@ -1346,14 +1267,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceCudaKernelLaunchPropertiesNV;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  //=== VK_QCOM_tile_shading ===
-  struct PhysicalDeviceTileShadingFeaturesQCOM;
-  struct PhysicalDeviceTileShadingPropertiesQCOM;
-  struct RenderPassTileShadingCreateInfoQCOM;
-  struct PerTileBeginInfoQCOM;
-  struct PerTileEndInfoQCOM;
-  struct DispatchTileInfoQCOM;
-
   //=== VK_NV_low_latency ===
   struct QueryLowLatencySupportNV;
 
@@ -1373,6 +1286,10 @@ namespace VULKAN_HPP_NAMESPACE
   struct ImportMetalSharedEventInfoEXT;
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
+  //=== VK_KHR_synchronization2 ===
+  struct QueueFamilyCheckpointProperties2NV;
+  struct CheckpointData2NV;
+
   //=== VK_EXT_descriptor_buffer ===
   struct PhysicalDeviceDescriptorBufferPropertiesEXT;
   struct PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
@@ -1555,15 +1472,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceRayTracingMaintenance1FeaturesKHR;
   struct TraceRaysIndirectCommand2KHR;
 
-  //=== VK_KHR_shader_untyped_pointers ===
-  struct PhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-  struct PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-  struct VideoEncodeRgbConversionCapabilitiesVALVE;
-  struct VideoEncodeProfileRgbConversionInfoVALVE;
-  struct VideoEncodeSessionRgbConversionCreateInfoVALVE;
-
   //=== VK_EXT_image_view_min_lod ===
   struct PhysicalDeviceImageViewMinLodFeaturesEXT;
   struct ImageViewMinLodCreateInfoEXT;
@@ -1617,6 +1525,9 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_ARM_shader_core_properties ===
   struct PhysicalDeviceShaderCorePropertiesARM;
 
+  //=== VK_KHR_shader_subgroup_rotate ===
+  struct PhysicalDeviceShaderSubgroupRotateFeaturesKHR;
+
   //=== VK_ARM_scheduling_controls ===
   struct DeviceQueueShaderCoreControlCreateInfoARM;
   struct PhysicalDeviceSchedulingControlsFeaturesARM;
@@ -1631,6 +1542,9 @@ namespace VULKAN_HPP_NAMESPACE
   struct DescriptorSetBindingReferenceVALVE;
   struct DescriptorSetLayoutHostMappingInfoVALVE;
 
+  //=== VK_EXT_depth_clamp_zero_one ===
+  struct PhysicalDeviceDepthClampZeroOneFeaturesEXT;
+
   //=== VK_EXT_non_seamless_cube_map ===
   struct PhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
 
@@ -1641,11 +1555,21 @@ namespace VULKAN_HPP_NAMESPACE
   struct RenderPassStripeInfoARM;
   struct RenderPassStripeSubmitInfoARM;
 
+  //=== VK_QCOM_fragment_density_map_offset ===
+  struct PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
+  struct PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
+  struct SubpassFragmentDensityMapOffsetEndInfoQCOM;
+
   //=== VK_NV_copy_memory_indirect ===
+  struct CopyMemoryIndirectCommandNV;
+  struct CopyMemoryToImageIndirectCommandNV;
   struct PhysicalDeviceCopyMemoryIndirectFeaturesNV;
+  struct PhysicalDeviceCopyMemoryIndirectPropertiesNV;
 
   //=== VK_NV_memory_decompression ===
   struct DecompressMemoryRegionNV;
+  struct PhysicalDeviceMemoryDecompressionFeaturesNV;
+  struct PhysicalDeviceMemoryDecompressionPropertiesNV;
 
   //=== VK_NV_device_generated_commands_compute ===
   struct PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
@@ -1653,11 +1577,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PipelineIndirectDeviceAddressInfoNV;
   struct BindPipelineIndirectCommandNV;
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
-  struct PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-  struct AccelerationStructureGeometryLinearSweptSpheresDataNV;
-  struct AccelerationStructureGeometrySpheresDataNV;
-
   //=== VK_NV_linear_color_attachment ===
   struct PhysicalDeviceLinearColorAttachmentFeaturesNV;
 
@@ -1676,16 +1595,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceNestedCommandBufferFeaturesEXT;
   struct PhysicalDeviceNestedCommandBufferPropertiesEXT;
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_external_memory ===
-  struct NativeBufferUsageOHOS;
-  struct NativeBufferPropertiesOHOS;
-  struct NativeBufferFormatPropertiesOHOS;
-  struct ImportNativeBufferInfoOHOS;
-  struct MemoryGetNativeBufferInfoOHOS;
-  struct ExternalFormatOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
   //=== VK_EXT_external_memory_acquire_unmodified ===
   struct ExternalMemoryAcquireUnmodifiedEXT;
 
@@ -1707,32 +1616,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct DirectDriverLoadingInfoLUNARG;
   struct DirectDriverLoadingListLUNARG;
 
-  //=== VK_ARM_tensors ===
-  struct TensorDescriptionARM;
-  struct TensorCreateInfoARM;
-  struct TensorViewCreateInfoARM;
-  struct TensorMemoryRequirementsInfoARM;
-  struct BindTensorMemoryInfoARM;
-  struct WriteDescriptorSetTensorARM;
-  struct TensorFormatPropertiesARM;
-  struct PhysicalDeviceTensorPropertiesARM;
-  struct TensorMemoryBarrierARM;
-  struct TensorDependencyInfoARM;
-  struct PhysicalDeviceTensorFeaturesARM;
-  struct DeviceTensorMemoryRequirementsARM;
-  struct CopyTensorInfoARM;
-  struct TensorCopyARM;
-  struct MemoryDedicatedAllocateInfoTensorARM;
-  struct PhysicalDeviceExternalTensorInfoARM;
-  struct ExternalTensorPropertiesARM;
-  struct ExternalMemoryTensorCreateInfoARM;
-  struct PhysicalDeviceDescriptorBufferTensorFeaturesARM;
-  struct PhysicalDeviceDescriptorBufferTensorPropertiesARM;
-  struct DescriptorGetTensorInfoARM;
-  struct TensorCaptureDescriptorDataInfoARM;
-  struct TensorViewCaptureDescriptorDataInfoARM;
-  struct FrameBoundaryTensorsARM;
-
   //=== VK_EXT_shader_module_identifier ===
   struct PhysicalDeviceShaderModuleIdentifierFeaturesEXT;
   struct PhysicalDeviceShaderModuleIdentifierPropertiesEXT;
@@ -1755,6 +1638,9 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_legacy_dithering ===
   struct PhysicalDeviceLegacyDitheringFeaturesEXT;
 
+  //=== VK_EXT_pipeline_protected_access ===
+  struct PhysicalDevicePipelineProtectedAccessFeaturesEXT;
+
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_ANDROID_external_format_resolve ===
   struct PhysicalDeviceExternalFormatResolveFeaturesANDROID;
@@ -1762,26 +1648,17 @@ namespace VULKAN_HPP_NAMESPACE
   struct AndroidHardwareBufferFormatResolvePropertiesANDROID;
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  //=== VK_AMD_anti_lag ===
-  struct PhysicalDeviceAntiLagFeaturesAMD;
-  struct AntiLagDataAMD;
-  struct AntiLagPresentationInfoAMD;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-  struct PhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-  struct AccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_KHR_present_id2 ===
-  struct SurfaceCapabilitiesPresentId2KHR;
-  struct PresentId2KHR;
-  struct PhysicalDevicePresentId2FeaturesKHR;
-
-  //=== VK_KHR_present_wait2 ===
-  struct SurfaceCapabilitiesPresentWait2KHR;
-  struct PhysicalDevicePresentWait2FeaturesKHR;
-  struct PresentWait2InfoKHR;
+  //=== VK_KHR_maintenance5 ===
+  struct PhysicalDeviceMaintenance5FeaturesKHR;
+  struct PhysicalDeviceMaintenance5PropertiesKHR;
+  struct RenderingAreaInfoKHR;
+  struct DeviceImageSubresourceInfoKHR;
+  struct ImageSubresource2KHR;
+  using ImageSubresource2EXT = ImageSubresource2KHR;
+  struct SubresourceLayout2KHR;
+  using SubresourceLayout2EXT = SubresourceLayout2KHR;
+  struct PipelineCreateFlags2CreateInfoKHR;
+  struct BufferUsageFlags2CreateInfoKHR;
 
   //=== VK_KHR_ray_tracing_position_fetch ===
   struct PhysicalDeviceRayTracingPositionFetchFeaturesKHR;
@@ -1791,20 +1668,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceShaderObjectPropertiesEXT;
   struct ShaderCreateInfoEXT;
 
-  //=== VK_KHR_pipeline_binary ===
-  struct PhysicalDevicePipelineBinaryFeaturesKHR;
-  struct PhysicalDevicePipelineBinaryPropertiesKHR;
-  struct DevicePipelineBinaryInternalCacheControlKHR;
-  struct PipelineBinaryKeyKHR;
-  struct PipelineBinaryDataKHR;
-  struct PipelineBinaryKeysAndDataKHR;
-  struct PipelineBinaryCreateInfoKHR;
-  struct PipelineBinaryInfoKHR;
-  struct ReleaseCapturedPipelineDataInfoKHR;
-  struct PipelineBinaryDataInfoKHR;
-  struct PipelineCreateInfoKHR;
-  struct PipelineBinaryHandlesInfoKHR;
-
   //=== VK_QCOM_tile_properties ===
   struct PhysicalDeviceTilePropertiesFeaturesQCOM;
   struct TilePropertiesQCOM;
@@ -1813,28 +1676,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceAmigoProfilingFeaturesSEC;
   struct AmigoProfilingSubmitInfoSEC;
 
-  //=== VK_KHR_surface_maintenance1 ===
-  struct SurfacePresentModeKHR;
-  using SurfacePresentModeEXT = SurfacePresentModeKHR;
-  struct SurfacePresentScalingCapabilitiesKHR;
-  using SurfacePresentScalingCapabilitiesEXT = SurfacePresentScalingCapabilitiesKHR;
-  struct SurfacePresentModeCompatibilityKHR;
-  using SurfacePresentModeCompatibilityEXT = SurfacePresentModeCompatibilityKHR;
-
-  //=== VK_KHR_swapchain_maintenance1 ===
-  struct PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-  using PhysicalDeviceSwapchainMaintenance1FeaturesEXT = PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-  struct SwapchainPresentFenceInfoKHR;
-  using SwapchainPresentFenceInfoEXT = SwapchainPresentFenceInfoKHR;
-  struct SwapchainPresentModesCreateInfoKHR;
-  using SwapchainPresentModesCreateInfoEXT = SwapchainPresentModesCreateInfoKHR;
-  struct SwapchainPresentModeInfoKHR;
-  using SwapchainPresentModeInfoEXT = SwapchainPresentModeInfoKHR;
-  struct SwapchainPresentScalingCreateInfoKHR;
-  using SwapchainPresentScalingCreateInfoEXT = SwapchainPresentScalingCreateInfoKHR;
-  struct ReleaseSwapchainImagesInfoKHR;
-  using ReleaseSwapchainImagesInfoEXT = ReleaseSwapchainImagesInfoKHR;
-
   //=== VK_QCOM_multiview_per_view_viewports ===
   struct PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
 
@@ -1842,12 +1683,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceRayTracingInvocationReorderPropertiesNV;
   struct PhysicalDeviceRayTracingInvocationReorderFeaturesNV;
 
-  //=== VK_NV_cooperative_vector ===
-  struct PhysicalDeviceCooperativeVectorPropertiesNV;
-  struct PhysicalDeviceCooperativeVectorFeaturesNV;
-  struct CooperativeVectorPropertiesNV;
-  struct ConvertCooperativeVectorMatrixInfoNV;
-
   //=== VK_NV_extended_sparse_address_space ===
   struct PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
   struct PhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
@@ -1860,10 +1695,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct MutableDescriptorTypeCreateInfoEXT;
   using MutableDescriptorTypeCreateInfoVALVE = MutableDescriptorTypeCreateInfoEXT;
 
-  //=== VK_EXT_legacy_vertex_attributes ===
-  struct PhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-  struct PhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-
   //=== VK_EXT_layer_settings ===
   struct LayerSettingsCreateInfoEXT;
   struct LayerSettingEXT;
@@ -1894,39 +1725,10 @@ namespace VULKAN_HPP_NAMESPACE
   struct PhysicalDeviceCooperativeMatrixFeaturesKHR;
   struct PhysicalDeviceCooperativeMatrixPropertiesKHR;
 
-  //=== VK_ARM_data_graph ===
-  struct PhysicalDeviceDataGraphFeaturesARM;
-  struct DataGraphPipelineConstantARM;
-  struct DataGraphPipelineResourceInfoARM;
-  struct DataGraphPipelineCompilerControlCreateInfoARM;
-  struct DataGraphPipelineCreateInfoARM;
-  struct DataGraphPipelineShaderModuleCreateInfoARM;
-  struct DataGraphPipelineSessionCreateInfoARM;
-  struct DataGraphPipelineSessionBindPointRequirementsInfoARM;
-  struct DataGraphPipelineSessionBindPointRequirementARM;
-  struct DataGraphPipelineSessionMemoryRequirementsInfoARM;
-  struct BindDataGraphPipelineSessionMemoryInfoARM;
-  struct DataGraphPipelineInfoARM;
-  struct DataGraphPipelinePropertyQueryResultARM;
-  struct DataGraphPipelineIdentifierCreateInfoARM;
-  struct DataGraphPipelineDispatchInfoARM;
-  struct PhysicalDeviceDataGraphProcessingEngineARM;
-  struct QueueFamilyDataGraphPropertiesARM;
-  struct DataGraphProcessingEngineCreateInfoARM;
-  struct PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-  struct QueueFamilyDataGraphProcessingEnginePropertiesARM;
-  struct PhysicalDeviceDataGraphOperationSupportARM;
-  struct DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-
   //=== VK_QCOM_multiview_per_view_render_areas ===
   struct PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
   struct MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
 
-  //=== VK_KHR_compute_shader_derivatives ===
-  struct PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-  using PhysicalDeviceComputeShaderDerivativesFeaturesNV = PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-  struct PhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-
   //=== VK_KHR_video_decode_av1 ===
   struct VideoDecodeAV1ProfileInfoKHR;
   struct VideoDecodeAV1CapabilitiesKHR;
@@ -1934,27 +1736,6 @@ namespace VULKAN_HPP_NAMESPACE
   struct VideoDecodeAV1PictureInfoKHR;
   struct VideoDecodeAV1DpbSlotInfoKHR;
 
-  //=== VK_KHR_video_encode_av1 ===
-  struct PhysicalDeviceVideoEncodeAV1FeaturesKHR;
-  struct VideoEncodeAV1CapabilitiesKHR;
-  struct VideoEncodeAV1QualityLevelPropertiesKHR;
-  struct VideoEncodeAV1SessionCreateInfoKHR;
-  struct VideoEncodeAV1SessionParametersCreateInfoKHR;
-  struct VideoEncodeAV1PictureInfoKHR;
-  struct VideoEncodeAV1DpbSlotInfoKHR;
-  struct VideoEncodeAV1ProfileInfoKHR;
-  struct VideoEncodeAV1QIndexKHR;
-  struct VideoEncodeAV1FrameSizeKHR;
-  struct VideoEncodeAV1GopRemainingFrameInfoKHR;
-  struct VideoEncodeAV1RateControlInfoKHR;
-  struct VideoEncodeAV1RateControlLayerInfoKHR;
-
-  //=== VK_KHR_video_decode_vp9 ===
-  struct PhysicalDeviceVideoDecodeVP9FeaturesKHR;
-  struct VideoDecodeVP9ProfileInfoKHR;
-  struct VideoDecodeVP9CapabilitiesKHR;
-  struct VideoDecodeVP9PictureInfoKHR;
-
   //=== VK_KHR_video_maintenance1 ===
   struct PhysicalDeviceVideoMaintenance1FeaturesKHR;
   struct VideoInlineQueryInfoKHR;
@@ -1982,9 +1763,17 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
   struct PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
 
-  //=== VK_KHR_unified_image_layouts ===
-  struct PhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-  struct AttachmentFeedbackLoopInfoEXT;
+  //=== VK_KHR_vertex_attribute_divisor ===
+  struct PhysicalDeviceVertexAttributeDivisorPropertiesKHR;
+  struct VertexInputBindingDivisorDescriptionKHR;
+  using VertexInputBindingDivisorDescriptionEXT = VertexInputBindingDivisorDescriptionKHR;
+  struct PipelineVertexInputDivisorStateCreateInfoKHR;
+  using PipelineVertexInputDivisorStateCreateInfoEXT = PipelineVertexInputDivisorStateCreateInfoKHR;
+  struct PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
+  using PhysicalDeviceVertexAttributeDivisorFeaturesEXT = PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
+
+  //=== VK_KHR_shader_float_controls2 ===
+  struct PhysicalDeviceShaderFloatControls2FeaturesKHR;
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_external_memory_screen_buffer ===
@@ -1998,296 +1787,48 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_MSFT_layered_driver ===
   struct PhysicalDeviceLayeredDriverPropertiesMSFT;
 
+  //=== VK_KHR_index_type_uint8 ===
+  struct PhysicalDeviceIndexTypeUint8FeaturesKHR;
+  using PhysicalDeviceIndexTypeUint8FeaturesEXT = PhysicalDeviceIndexTypeUint8FeaturesKHR;
+
+  //=== VK_KHR_line_rasterization ===
+  struct PhysicalDeviceLineRasterizationFeaturesKHR;
+  using PhysicalDeviceLineRasterizationFeaturesEXT = PhysicalDeviceLineRasterizationFeaturesKHR;
+  struct PhysicalDeviceLineRasterizationPropertiesKHR;
+  using PhysicalDeviceLineRasterizationPropertiesEXT = PhysicalDeviceLineRasterizationPropertiesKHR;
+  struct PipelineRasterizationLineStateCreateInfoKHR;
+  using PipelineRasterizationLineStateCreateInfoEXT = PipelineRasterizationLineStateCreateInfoKHR;
+
   //=== VK_KHR_calibrated_timestamps ===
   struct CalibratedTimestampInfoKHR;
   using CalibratedTimestampInfoEXT = CalibratedTimestampInfoKHR;
 
+  //=== VK_KHR_shader_expect_assume ===
+  struct PhysicalDeviceShaderExpectAssumeFeaturesKHR;
+
   //=== VK_KHR_maintenance6 ===
+  struct PhysicalDeviceMaintenance6FeaturesKHR;
+  struct PhysicalDeviceMaintenance6PropertiesKHR;
+  struct BindMemoryStatusKHR;
+  struct BindDescriptorSetsInfoKHR;
+  struct PushConstantsInfoKHR;
+  struct PushDescriptorSetInfoKHR;
+  struct PushDescriptorSetWithTemplateInfoKHR;
   struct SetDescriptorBufferOffsetsInfoEXT;
   struct BindDescriptorBufferEmbeddedSamplersInfoEXT;
 
   //=== VK_NV_descriptor_pool_overallocation ===
   struct PhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
 
-  //=== VK_QCOM_tile_memory_heap ===
-  struct PhysicalDeviceTileMemoryHeapFeaturesQCOM;
-  struct PhysicalDeviceTileMemoryHeapPropertiesQCOM;
-  struct TileMemoryRequirementsQCOM;
-  struct TileMemoryBindInfoQCOM;
-  struct TileMemorySizeInfoQCOM;
-
-  //=== VK_KHR_copy_memory_indirect ===
-  struct StridedDeviceAddressRangeKHR;
-  struct CopyMemoryIndirectCommandKHR;
-  using CopyMemoryIndirectCommandNV = CopyMemoryIndirectCommandKHR;
-  struct CopyMemoryIndirectInfoKHR;
-  struct CopyMemoryToImageIndirectCommandKHR;
-  using CopyMemoryToImageIndirectCommandNV = CopyMemoryToImageIndirectCommandKHR;
-  struct CopyMemoryToImageIndirectInfoKHR;
-  struct PhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-  struct PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-  using PhysicalDeviceCopyMemoryIndirectPropertiesNV = PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-
-  //=== VK_EXT_memory_decompression ===
-  struct DecompressMemoryInfoEXT;
-  struct DecompressMemoryRegionEXT;
-  struct PhysicalDeviceMemoryDecompressionFeaturesEXT;
-  using PhysicalDeviceMemoryDecompressionFeaturesNV = PhysicalDeviceMemoryDecompressionFeaturesEXT;
-  struct PhysicalDeviceMemoryDecompressionPropertiesEXT;
-  using PhysicalDeviceMemoryDecompressionPropertiesNV = PhysicalDeviceMemoryDecompressionPropertiesEXT;
-
-  //=== VK_NV_display_stereo ===
-  struct DisplaySurfaceStereoCreateInfoNV;
-  struct DisplayModeStereoPropertiesNV;
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-  struct VideoEncodeIntraRefreshCapabilitiesKHR;
-  struct VideoEncodeSessionIntraRefreshCreateInfoKHR;
-  struct VideoEncodeIntraRefreshInfoKHR;
-  struct VideoReferenceIntraRefreshInfoKHR;
-  struct PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-
-  //=== VK_KHR_video_encode_quantization_map ===
-  struct VideoEncodeQuantizationMapCapabilitiesKHR;
-  struct VideoFormatQuantizationMapPropertiesKHR;
-  struct VideoEncodeQuantizationMapInfoKHR;
-  struct VideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-  struct PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-  struct VideoEncodeH264QuantizationMapCapabilitiesKHR;
-  struct VideoEncodeH265QuantizationMapCapabilitiesKHR;
-  struct VideoFormatH265QuantizationMapPropertiesKHR;
-  struct VideoEncodeAV1QuantizationMapCapabilitiesKHR;
-  struct VideoFormatAV1QuantizationMapPropertiesKHR;
-
   //=== VK_NV_raw_access_chains ===
   struct PhysicalDeviceRawAccessChainsFeaturesNV;
 
-  //=== VK_NV_external_compute_queue ===
-  struct ExternalComputeQueueDeviceCreateInfoNV;
-  struct ExternalComputeQueueCreateInfoNV;
-  struct ExternalComputeQueueDataParamsNV;
-  struct PhysicalDeviceExternalComputeQueuePropertiesNV;
-
-  //=== VK_KHR_shader_relaxed_extended_instruction ===
-  struct PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-
-  //=== VK_NV_command_buffer_inheritance ===
-  struct PhysicalDeviceCommandBufferInheritanceFeaturesNV;
-
-  //=== VK_KHR_maintenance7 ===
-  struct PhysicalDeviceMaintenance7FeaturesKHR;
-  struct PhysicalDeviceMaintenance7PropertiesKHR;
-  struct PhysicalDeviceLayeredApiPropertiesListKHR;
-  struct PhysicalDeviceLayeredApiPropertiesKHR;
-  struct PhysicalDeviceLayeredApiVulkanPropertiesKHR;
-
   //=== VK_NV_shader_atomic_float16_vector ===
   struct PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
 
-  //=== VK_EXT_shader_replicated_composites ===
-  struct PhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-
-  //=== VK_EXT_shader_float8 ===
-  struct PhysicalDeviceShaderFloat8FeaturesEXT;
-
   //=== VK_NV_ray_tracing_validation ===
   struct PhysicalDeviceRayTracingValidationFeaturesNV;
 
-  //=== VK_NV_cluster_acceleration_structure ===
-  struct PhysicalDeviceClusterAccelerationStructureFeaturesNV;
-  struct PhysicalDeviceClusterAccelerationStructurePropertiesNV;
-  struct ClusterAccelerationStructureClustersBottomLevelInputNV;
-  struct ClusterAccelerationStructureTriangleClusterInputNV;
-  struct ClusterAccelerationStructureMoveObjectsInputNV;
-  union ClusterAccelerationStructureOpInputNV;
-  struct ClusterAccelerationStructureInputInfoNV;
-  struct ClusterAccelerationStructureCommandsInfoNV;
-  struct StridedDeviceAddressNV;
-  struct ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV;
-  struct ClusterAccelerationStructureMoveObjectsInfoNV;
-  struct ClusterAccelerationStructureBuildClustersBottomLevelInfoNV;
-  struct ClusterAccelerationStructureBuildTriangleClusterInfoNV;
-  struct ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV;
-  struct ClusterAccelerationStructureInstantiateClusterInfoNV;
-  struct ClusterAccelerationStructureGetTemplateIndicesInfoNV;
-  struct RayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-  struct PhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-  struct PhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-  struct PartitionedAccelerationStructureFlagsNV;
-  struct BuildPartitionedAccelerationStructureIndirectCommandNV;
-  struct PartitionedAccelerationStructureWriteInstanceDataNV;
-  struct PartitionedAccelerationStructureUpdateInstanceDataNV;
-  struct PartitionedAccelerationStructureWritePartitionTranslationDataNV;
-  struct WriteDescriptorSetPartitionedAccelerationStructureNV;
-  struct PartitionedAccelerationStructureInstancesInputNV;
-  struct BuildPartitionedAccelerationStructureInfoNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  struct PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-  struct PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-  struct GeneratedCommandsMemoryRequirementsInfoEXT;
-  struct IndirectExecutionSetCreateInfoEXT;
-  union IndirectExecutionSetInfoEXT;
-  struct IndirectExecutionSetPipelineInfoEXT;
-  struct IndirectExecutionSetShaderInfoEXT;
-  struct GeneratedCommandsInfoEXT;
-  struct WriteIndirectExecutionSetPipelineEXT;
-  struct IndirectCommandsLayoutCreateInfoEXT;
-  struct IndirectCommandsLayoutTokenEXT;
-  struct DrawIndirectCountIndirectCommandEXT;
-  struct IndirectCommandsVertexBufferTokenEXT;
-  struct BindVertexBufferIndirectCommandEXT;
-  struct IndirectCommandsIndexBufferTokenEXT;
-  struct BindIndexBufferIndirectCommandEXT;
-  struct IndirectCommandsPushConstantTokenEXT;
-  struct IndirectCommandsExecutionSetTokenEXT;
-  union IndirectCommandsTokenDataEXT;
-  struct IndirectExecutionSetShaderLayoutInfoEXT;
-  struct GeneratedCommandsPipelineInfoEXT;
-  struct GeneratedCommandsShaderInfoEXT;
-  struct WriteIndirectExecutionSetShaderEXT;
-
-  //=== VK_KHR_maintenance8 ===
-  struct MemoryBarrierAccessFlags3KHR;
-  struct PhysicalDeviceMaintenance8FeaturesKHR;
-
-  //=== VK_MESA_image_alignment_control ===
-  struct PhysicalDeviceImageAlignmentControlFeaturesMESA;
-  struct PhysicalDeviceImageAlignmentControlPropertiesMESA;
-  struct ImageAlignmentControlCreateInfoMESA;
-
-  //=== VK_KHR_shader_fma ===
-  struct PhysicalDeviceShaderFmaFeaturesKHR;
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-  struct PhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-  struct PhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-
-  //=== VK_EXT_depth_clamp_control ===
-  struct PhysicalDeviceDepthClampControlFeaturesEXT;
-  struct PipelineViewportDepthClampControlCreateInfoEXT;
-  struct DepthClampRangeEXT;
-
-  //=== VK_KHR_maintenance9 ===
-  struct PhysicalDeviceMaintenance9FeaturesKHR;
-  struct PhysicalDeviceMaintenance9PropertiesKHR;
-  struct QueueFamilyOwnershipTransferPropertiesKHR;
-
-  //=== VK_KHR_video_maintenance2 ===
-  struct PhysicalDeviceVideoMaintenance2FeaturesKHR;
-  struct VideoDecodeH264InlineSessionParametersInfoKHR;
-  struct VideoDecodeH265InlineSessionParametersInfoKHR;
-  struct VideoDecodeAV1InlineSessionParametersInfoKHR;
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-  struct SurfaceCreateInfoOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-  struct NativeBufferOHOS;
-  struct SwapchainImageCreateInfoOHOS;
-  struct PhysicalDevicePresentationPropertiesOHOS;
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_HUAWEI_hdr_vivid ===
-  struct PhysicalDeviceHdrVividFeaturesHUAWEI;
-  struct HdrVividDynamicMetadataHUAWEI;
-
-  //=== VK_NV_cooperative_matrix2 ===
-  struct CooperativeMatrixFlexibleDimensionsPropertiesNV;
-  struct PhysicalDeviceCooperativeMatrix2FeaturesNV;
-  struct PhysicalDeviceCooperativeMatrix2PropertiesNV;
-
-  //=== VK_ARM_pipeline_opacity_micromap ===
-  struct PhysicalDevicePipelineOpacityMicromapFeaturesARM;
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  //=== VK_EXT_external_memory_metal ===
-  struct ImportMemoryMetalHandleInfoEXT;
-  struct MemoryMetalHandlePropertiesEXT;
-  struct MemoryGetMetalHandleInfoEXT;
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  //=== VK_KHR_depth_clamp_zero_one ===
-  struct PhysicalDeviceDepthClampZeroOneFeaturesKHR;
-  using PhysicalDeviceDepthClampZeroOneFeaturesEXT = PhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-  //=== VK_ARM_performance_counters_by_region ===
-  struct PhysicalDevicePerformanceCountersByRegionFeaturesARM;
-  struct PhysicalDevicePerformanceCountersByRegionPropertiesARM;
-  struct PerformanceCounterARM;
-  struct PerformanceCounterDescriptionARM;
-  struct RenderPassPerformanceCountersByRegionBeginInfoARM;
-
-  //=== VK_EXT_vertex_attribute_robustness ===
-  struct PhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
-
-  //=== VK_ARM_format_pack ===
-  struct PhysicalDeviceFormatPackFeaturesARM;
-
-  //=== VK_VALVE_fragment_density_map_layered ===
-  struct PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-  struct PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-  struct PipelineFragmentDensityMapLayeredCreateInfoVALVE;
-
-  //=== VK_KHR_robustness2 ===
-  struct PhysicalDeviceRobustness2FeaturesKHR;
-  using PhysicalDeviceRobustness2FeaturesEXT = PhysicalDeviceRobustness2FeaturesKHR;
-  struct PhysicalDeviceRobustness2PropertiesKHR;
-  using PhysicalDeviceRobustness2PropertiesEXT = PhysicalDeviceRobustness2PropertiesKHR;
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_NV_present_metering ===
-  struct SetPresentConfigNV;
-  struct PhysicalDevicePresentMeteringFeaturesNV;
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  //=== VK_EXT_fragment_density_map_offset ===
-  struct PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-  using PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM = PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-  struct PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-  using PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM = PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-  struct RenderPassFragmentDensityMapOffsetEndInfoEXT;
-  using SubpassFragmentDensityMapOffsetEndInfoQCOM = RenderPassFragmentDensityMapOffsetEndInfoEXT;
-
-  //=== VK_EXT_zero_initialize_device_memory ===
-  struct PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-
-  //=== VK_KHR_present_mode_fifo_latest_ready ===
-  struct PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-  using PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT = PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-  //=== VK_EXT_shader_64bit_indexing ===
-  struct PhysicalDeviceShader64BitIndexingFeaturesEXT;
-
-  //=== VK_EXT_custom_resolve ===
-  struct PhysicalDeviceCustomResolveFeaturesEXT;
-  struct BeginCustomResolveInfoEXT;
-  struct CustomResolveCreateInfoEXT;
-
-  //=== VK_QCOM_data_graph_model ===
-  struct PipelineCacheHeaderVersionDataGraphQCOM;
-  struct DataGraphPipelineBuiltinModelCreateInfoQCOM;
-  struct PhysicalDeviceDataGraphModelFeaturesQCOM;
-
-  //=== VK_KHR_maintenance10 ===
-  struct PhysicalDeviceMaintenance10FeaturesKHR;
-  struct PhysicalDeviceMaintenance10PropertiesKHR;
-  struct RenderingEndInfoKHR;
-  using RenderingEndInfoEXT = RenderingEndInfoKHR;
-  struct RenderingAttachmentFlagsInfoKHR;
-  struct ResolveImageModeInfoKHR;
-
-  //=== VK_SEC_pipeline_cache_incremental_mode ===
-  struct PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-  //=== VK_EXT_shader_uniform_buffer_unsized_array ===
-  struct PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-
   //===================================
   //=== HANDLE forward declarations ===
   //===================================
@@ -2300,14 +1841,12 @@ namespace VULKAN_HPP_NAMESPACE
   class DeviceMemory;
   class Fence;
   class Semaphore;
+  class Event;
   class QueryPool;
   class Buffer;
+  class BufferView;
   class Image;
   class ImageView;
-  class CommandPool;
-  class CommandBuffer;
-  class Event;
-  class BufferView;
   class ShaderModule;
   class PipelineCache;
   class Pipeline;
@@ -2318,10 +1857,12 @@ namespace VULKAN_HPP_NAMESPACE
   class DescriptorSetLayout;
   class Framebuffer;
   class RenderPass;
+  class CommandPool;
+  class CommandBuffer;
 
   //=== VK_VERSION_1_1 ===
-  class DescriptorUpdateTemplate;
   class SamplerYcbcrConversion;
+  class DescriptorUpdateTemplate;
 
   //=== VK_VERSION_1_3 ===
   class PrivateDataSlot;
@@ -2382,31 +1923,12 @@ namespace VULKAN_HPP_NAMESPACE
   //=== VK_EXT_opacity_micromap ===
   class MicromapEXT;
 
-  //=== VK_ARM_tensors ===
-  class TensorARM;
-  class TensorViewARM;
-
   //=== VK_NV_optical_flow ===
   class OpticalFlowSessionNV;
 
   //=== VK_EXT_shader_object ===
   class ShaderEXT;
 
-  //=== VK_KHR_pipeline_binary ===
-  class PipelineBinaryKHR;
-
-  //=== VK_ARM_data_graph ===
-  class DataGraphPipelineSessionARM;
-
-  //=== VK_NV_external_compute_queue ===
-  class ExternalComputeQueueNV;
-
-  //=== VK_EXT_device_generated_commands ===
-  class IndirectCommandsLayoutEXT;
-  class IndirectExecutionSetEXT;
-
-  typedef void( VKAPI_PTR * PFN_VoidFunction )();
-
 #ifndef VULKAN_HPP_NO_SMART_HANDLE
   //======================
   //=== UNIQUE HANDLEs ===
@@ -2417,7 +1939,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Instance, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<detail::NoParent, Dispatch>;
+    using deleter = ObjectDestroy<NoParent, Dispatch>;
   };
 
   using UniqueInstance = UniqueHandle<Instance, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2426,7 +1948,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Device, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<detail::NoParent, Dispatch>;
+    using deleter = ObjectDestroy<NoParent, Dispatch>;
   };
 
   using UniqueDevice = UniqueHandle<Device, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2435,7 +1957,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DeviceMemory, Dispatch>
   {
   public:
-    using deleter = detail::ObjectFree<Device, Dispatch>;
+    using deleter = ObjectFree<Device, Dispatch>;
   };
 
   using UniqueDeviceMemory = UniqueHandle<DeviceMemory, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2444,7 +1966,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Fence, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueFence = UniqueHandle<Fence, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2453,16 +1975,25 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Semaphore, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueSemaphore = UniqueHandle<Semaphore, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
+  template <typename Dispatch>
+  class UniqueHandleTraits<Event, Dispatch>
+  {
+  public:
+    using deleter = ObjectDestroy<Device, Dispatch>;
+  };
+
+  using UniqueEvent = UniqueHandle<Event, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+
   template <typename Dispatch>
   class UniqueHandleTraits<QueryPool, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueQueryPool = UniqueHandle<QueryPool, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2471,16 +2002,25 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Buffer, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueBuffer = UniqueHandle<Buffer, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
+  template <typename Dispatch>
+  class UniqueHandleTraits<BufferView, Dispatch>
+  {
+  public:
+    using deleter = ObjectDestroy<Device, Dispatch>;
+  };
+
+  using UniqueBufferView = UniqueHandle<BufferView, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+
   template <typename Dispatch>
   class UniqueHandleTraits<Image, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueImage = UniqueHandle<Image, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2489,52 +2029,16 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<ImageView, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueImageView = UniqueHandle<ImageView, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
-  template <typename Dispatch>
-  class UniqueHandleTraits<CommandPool, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueCommandPool = UniqueHandle<CommandPool, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  template <typename Dispatch>
-  class UniqueHandleTraits<CommandBuffer, Dispatch>
-  {
-  public:
-    using deleter = detail::PoolFree<Device, CommandPool, Dispatch>;
-  };
-
-  using UniqueCommandBuffer = UniqueHandle<CommandBuffer, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  template <typename Dispatch>
-  class UniqueHandleTraits<Event, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueEvent = UniqueHandle<Event, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  template <typename Dispatch>
-  class UniqueHandleTraits<BufferView, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueBufferView = UniqueHandle<BufferView, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
   template <typename Dispatch>
   class UniqueHandleTraits<ShaderModule, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueShaderModule = UniqueHandle<ShaderModule, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2543,7 +2047,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<PipelineCache, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniquePipelineCache = UniqueHandle<PipelineCache, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2552,7 +2056,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Pipeline, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniquePipeline = UniqueHandle<Pipeline, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2561,7 +2065,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<PipelineLayout, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniquePipelineLayout = UniqueHandle<PipelineLayout, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2570,7 +2074,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Sampler, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueSampler = UniqueHandle<Sampler, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2579,7 +2083,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DescriptorPool, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueDescriptorPool = UniqueHandle<DescriptorPool, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2588,7 +2092,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DescriptorSet, Dispatch>
   {
   public:
-    using deleter = detail::PoolFree<Device, DescriptorPool, Dispatch>;
+    using deleter = PoolFree<Device, DescriptorPool, Dispatch>;
   };
 
   using UniqueDescriptorSet = UniqueHandle<DescriptorSet, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2597,7 +2101,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DescriptorSetLayout, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueDescriptorSetLayout = UniqueHandle<DescriptorSetLayout, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2606,7 +2110,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<Framebuffer, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueFramebuffer = UniqueHandle<Framebuffer, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2615,38 +2119,56 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<RenderPass, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueRenderPass = UniqueHandle<RenderPass, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
-  //=== VK_VERSION_1_1 ===
   template <typename Dispatch>
-  class UniqueHandleTraits<DescriptorUpdateTemplate, Dispatch>
+  class UniqueHandleTraits<CommandPool, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
-  using UniqueDescriptorUpdateTemplate    = UniqueHandle<DescriptorUpdateTemplate, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-  using UniqueDescriptorUpdateTemplateKHR = UniqueHandle<DescriptorUpdateTemplate, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+  using UniqueCommandPool = UniqueHandle<CommandPool, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
+  template <typename Dispatch>
+  class UniqueHandleTraits<CommandBuffer, Dispatch>
+  {
+  public:
+    using deleter = PoolFree<Device, CommandPool, Dispatch>;
+  };
+
+  using UniqueCommandBuffer = UniqueHandle<CommandBuffer, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+
+  //=== VK_VERSION_1_1 ===
   template <typename Dispatch>
   class UniqueHandleTraits<SamplerYcbcrConversion, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueSamplerYcbcrConversion    = UniqueHandle<SamplerYcbcrConversion, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
   using UniqueSamplerYcbcrConversionKHR = UniqueHandle<SamplerYcbcrConversion, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
+  template <typename Dispatch>
+  class UniqueHandleTraits<DescriptorUpdateTemplate, Dispatch>
+  {
+  public:
+    using deleter = ObjectDestroy<Device, Dispatch>;
+  };
+
+  using UniqueDescriptorUpdateTemplate    = UniqueHandle<DescriptorUpdateTemplate, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+  using UniqueDescriptorUpdateTemplateKHR = UniqueHandle<DescriptorUpdateTemplate, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+
   //=== VK_VERSION_1_3 ===
   template <typename Dispatch>
   class UniqueHandleTraits<PrivateDataSlot, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniquePrivateDataSlot    = UniqueHandle<PrivateDataSlot, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2657,7 +2179,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<SurfaceKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Instance, Dispatch>;
+    using deleter = ObjectDestroy<Instance, Dispatch>;
   };
 
   using UniqueSurfaceKHR = UniqueHandle<SurfaceKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2667,7 +2189,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<SwapchainKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueSwapchainKHR = UniqueHandle<SwapchainKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2677,7 +2199,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DisplayKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<PhysicalDevice, Dispatch>;
+    using deleter = ObjectDestroy<PhysicalDevice, Dispatch>;
   };
 
   using UniqueDisplayKHR = UniqueHandle<DisplayKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2687,7 +2209,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DebugReportCallbackEXT, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Instance, Dispatch>;
+    using deleter = ObjectDestroy<Instance, Dispatch>;
   };
 
   using UniqueDebugReportCallbackEXT = UniqueHandle<DebugReportCallbackEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2697,7 +2219,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<VideoSessionKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueVideoSessionKHR = UniqueHandle<VideoSessionKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2706,7 +2228,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<VideoSessionParametersKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueVideoSessionParametersKHR = UniqueHandle<VideoSessionParametersKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2716,7 +2238,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<CuModuleNVX, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueCuModuleNVX = UniqueHandle<CuModuleNVX, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2725,7 +2247,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<CuFunctionNVX, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueCuFunctionNVX = UniqueHandle<CuFunctionNVX, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2735,7 +2257,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DebugUtilsMessengerEXT, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Instance, Dispatch>;
+    using deleter = ObjectDestroy<Instance, Dispatch>;
   };
 
   using UniqueDebugUtilsMessengerEXT = UniqueHandle<DebugUtilsMessengerEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2745,7 +2267,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<AccelerationStructureKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueAccelerationStructureKHR = UniqueHandle<AccelerationStructureKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2755,7 +2277,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<ValidationCacheEXT, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueValidationCacheEXT = UniqueHandle<ValidationCacheEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2765,7 +2287,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<AccelerationStructureNV, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueAccelerationStructureNV = UniqueHandle<AccelerationStructureNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2775,7 +2297,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<PerformanceConfigurationINTEL, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniquePerformanceConfigurationINTEL = UniqueHandle<PerformanceConfigurationINTEL, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2785,7 +2307,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<DeferredOperationKHR, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueDeferredOperationKHR = UniqueHandle<DeferredOperationKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2795,7 +2317,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<IndirectCommandsLayoutNV, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueIndirectCommandsLayoutNV = UniqueHandle<IndirectCommandsLayoutNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2806,7 +2328,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<CudaModuleNV, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueCudaModuleNV = UniqueHandle<CudaModuleNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2815,7 +2337,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<CudaFunctionNV, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueCudaFunctionNV = UniqueHandle<CudaFunctionNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2827,7 +2349,7 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<BufferCollectionFUCHSIA, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueBufferCollectionFUCHSIA = UniqueHandle<BufferCollectionFUCHSIA, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2838,36 +2360,17 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<MicromapEXT, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueMicromapEXT = UniqueHandle<MicromapEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 
-  //=== VK_ARM_tensors ===
-  template <typename Dispatch>
-  class UniqueHandleTraits<TensorARM, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueTensorARM = UniqueHandle<TensorARM, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  template <typename Dispatch>
-  class UniqueHandleTraits<TensorViewARM, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueTensorViewARM = UniqueHandle<TensorViewARM, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
   //=== VK_NV_optical_flow ===
   template <typename Dispatch>
   class UniqueHandleTraits<OpticalFlowSessionNV, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueOpticalFlowSessionNV = UniqueHandle<OpticalFlowSessionNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
@@ -2877,59 +2380,10 @@ namespace VULKAN_HPP_NAMESPACE
   class UniqueHandleTraits<ShaderEXT, Dispatch>
   {
   public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
+    using deleter = ObjectDestroy<Device, Dispatch>;
   };
 
   using UniqueShaderEXT = UniqueHandle<ShaderEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  //=== VK_KHR_pipeline_binary ===
-  template <typename Dispatch>
-  class UniqueHandleTraits<PipelineBinaryKHR, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniquePipelineBinaryKHR = UniqueHandle<PipelineBinaryKHR, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  //=== VK_ARM_data_graph ===
-  template <typename Dispatch>
-  class UniqueHandleTraits<DataGraphPipelineSessionARM, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueDataGraphPipelineSessionARM = UniqueHandle<DataGraphPipelineSessionARM, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  //=== VK_NV_external_compute_queue ===
-  template <typename Dispatch>
-  class UniqueHandleTraits<ExternalComputeQueueNV, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueExternalComputeQueueNV = UniqueHandle<ExternalComputeQueueNV, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  //=== VK_EXT_device_generated_commands ===
-  template <typename Dispatch>
-  class UniqueHandleTraits<IndirectCommandsLayoutEXT, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueIndirectCommandsLayoutEXT = UniqueHandle<IndirectCommandsLayoutEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
-
-  template <typename Dispatch>
-  class UniqueHandleTraits<IndirectExecutionSetEXT, Dispatch>
-  {
-  public:
-    using deleter = detail::ObjectDestroy<Device, Dispatch>;
-  };
-
-  using UniqueIndirectExecutionSetEXT = UniqueHandle<IndirectExecutionSetEXT, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
 #endif /*VULKAN_HPP_NO_SMART_HANDLE*/
 
   //===============
@@ -2942,34 +2396,18 @@ namespace VULKAN_HPP_NAMESPACE
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = false;
   };
 
-  // wrapper class for handle VkSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceKHR.html
   class SurfaceKHR
   {
   public:
     using CType      = VkSurfaceKHR;
     using NativeType = VkSurfaceKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSurfaceKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSurfaceKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSurfaceKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSurfaceKHR;
 
   public:
-    SurfaceKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    SurfaceKHR( SurfaceKHR const & rhs )             = default;
-    SurfaceKHR & operator=( SurfaceKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    SurfaceKHR( SurfaceKHR && rhs )             = default;
-    SurfaceKHR & operator=( SurfaceKHR && rhs ) = default;
-#else
-    SurfaceKHR( SurfaceKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_surfaceKHR( exchange( rhs.m_surfaceKHR, {} ) ) {}
-
-    SurfaceKHR & operator=( SurfaceKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_surfaceKHR = exchange( rhs.m_surfaceKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR SurfaceKHR() = default;
 
     VULKAN_HPP_CONSTEXPR SurfaceKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -2989,6 +2427,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( SurfaceKHR const & ) const = default;
+#else
+    bool operator==( SurfaceKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_surfaceKHR == rhs.m_surfaceKHR;
+    }
+
+    bool operator!=( SurfaceKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_surfaceKHR != rhs.m_surfaceKHR;
+    }
+
+    bool operator<( SurfaceKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_surfaceKHR < rhs.m_surfaceKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSurfaceKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_surfaceKHR;
@@ -3009,59 +2466,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eSurfaceKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eSurfaceKHR>
   {
-    using Type = SurfaceKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SurfaceKHR;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eSurfaceKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSurfaceKHR>
   {
-    using Type = SurfaceKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SurfaceKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkSurfaceKHR, VK_NULL_HANDLE>
   {
-    using Type = SurfaceKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SurfaceKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<SurfaceKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::SurfaceKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDebugReportCallbackEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportCallbackEXT.html
   class DebugReportCallbackEXT
   {
   public:
     using CType      = VkDebugReportCallbackEXT;
     using NativeType = VkDebugReportCallbackEXT;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDebugReportCallbackEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDebugReportCallbackEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
 
   public:
-    DebugReportCallbackEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DebugReportCallbackEXT( DebugReportCallbackEXT const & rhs )             = default;
-    DebugReportCallbackEXT & operator=( DebugReportCallbackEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DebugReportCallbackEXT( DebugReportCallbackEXT && rhs )             = default;
-    DebugReportCallbackEXT & operator=( DebugReportCallbackEXT && rhs ) = default;
-#else
-    DebugReportCallbackEXT( DebugReportCallbackEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_debugReportCallbackEXT( exchange( rhs.m_debugReportCallbackEXT, {} ) ) {}
-
-    DebugReportCallbackEXT & operator=( DebugReportCallbackEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_debugReportCallbackEXT = exchange( rhs.m_debugReportCallbackEXT, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DebugReportCallbackEXT() = default;
 
     VULKAN_HPP_CONSTEXPR DebugReportCallbackEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3084,6 +2525,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DebugReportCallbackEXT const & ) const = default;
+#else
+    bool operator==( DebugReportCallbackEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugReportCallbackEXT == rhs.m_debugReportCallbackEXT;
+    }
+
+    bool operator!=( DebugReportCallbackEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugReportCallbackEXT != rhs.m_debugReportCallbackEXT;
+    }
+
+    bool operator<( DebugReportCallbackEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugReportCallbackEXT < rhs.m_debugReportCallbackEXT;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDebugReportCallbackEXT() const VULKAN_HPP_NOEXCEPT
     {
       return m_debugReportCallbackEXT;
@@ -3104,59 +2564,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDebugReportCallbackEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDebugReportCallbackEXT>
   {
-    using Type = DebugReportCallbackEXT;
+    using Type = VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDebugReportCallbackEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDebugReportCallbackEXT>
   {
-    using Type = DebugReportCallbackEXT;
+    using Type = VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDebugReportCallbackEXT, VK_NULL_HANDLE>
   {
-    using Type = DebugReportCallbackEXT;
+    using Type = VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DebugReportCallbackEXT>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDebugUtilsMessengerEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerEXT.html
   class DebugUtilsMessengerEXT
   {
   public:
     using CType      = VkDebugUtilsMessengerEXT;
     using NativeType = VkDebugUtilsMessengerEXT;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDebugUtilsMessengerEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDebugUtilsMessengerEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    DebugUtilsMessengerEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DebugUtilsMessengerEXT( DebugUtilsMessengerEXT const & rhs )             = default;
-    DebugUtilsMessengerEXT & operator=( DebugUtilsMessengerEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DebugUtilsMessengerEXT( DebugUtilsMessengerEXT && rhs )             = default;
-    DebugUtilsMessengerEXT & operator=( DebugUtilsMessengerEXT && rhs ) = default;
-#else
-    DebugUtilsMessengerEXT( DebugUtilsMessengerEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_debugUtilsMessengerEXT( exchange( rhs.m_debugUtilsMessengerEXT, {} ) ) {}
-
-    DebugUtilsMessengerEXT & operator=( DebugUtilsMessengerEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_debugUtilsMessengerEXT = exchange( rhs.m_debugUtilsMessengerEXT, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DebugUtilsMessengerEXT() = default;
 
     VULKAN_HPP_CONSTEXPR DebugUtilsMessengerEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3179,6 +2623,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DebugUtilsMessengerEXT const & ) const = default;
+#else
+    bool operator==( DebugUtilsMessengerEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugUtilsMessengerEXT == rhs.m_debugUtilsMessengerEXT;
+    }
+
+    bool operator!=( DebugUtilsMessengerEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugUtilsMessengerEXT != rhs.m_debugUtilsMessengerEXT;
+    }
+
+    bool operator<( DebugUtilsMessengerEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_debugUtilsMessengerEXT < rhs.m_debugUtilsMessengerEXT;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDebugUtilsMessengerEXT() const VULKAN_HPP_NOEXCEPT
     {
       return m_debugUtilsMessengerEXT;
@@ -3199,53 +2662,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDebugUtilsMessengerEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDebugUtilsMessengerEXT>
   {
-    using Type = DebugUtilsMessengerEXT;
+    using Type = VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDebugUtilsMessengerEXT, VK_NULL_HANDLE>
   {
-    using Type = DebugUtilsMessengerEXT;
+    using Type = VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DebugUtilsMessengerEXT>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDisplayKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayKHR.html
   class DisplayKHR
   {
   public:
     using CType      = VkDisplayKHR;
     using NativeType = VkDisplayKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDisplayKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDisplayKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDisplayKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayKHR;
 
   public:
-    DisplayKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DisplayKHR( DisplayKHR const & rhs )             = default;
-    DisplayKHR & operator=( DisplayKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DisplayKHR( DisplayKHR && rhs )             = default;
-    DisplayKHR & operator=( DisplayKHR && rhs ) = default;
-#else
-    DisplayKHR( DisplayKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_displayKHR( exchange( rhs.m_displayKHR, {} ) ) {}
-
-    DisplayKHR & operator=( DisplayKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_displayKHR = exchange( rhs.m_displayKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DisplayKHR() = default;
 
     VULKAN_HPP_CONSTEXPR DisplayKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3265,6 +2712,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DisplayKHR const & ) const = default;
+#else
+    bool operator==( DisplayKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayKHR == rhs.m_displayKHR;
+    }
+
+    bool operator!=( DisplayKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayKHR != rhs.m_displayKHR;
+    }
+
+    bool operator<( DisplayKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayKHR < rhs.m_displayKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDisplayKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_displayKHR;
@@ -3285,59 +2751,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDisplayKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDisplayKHR>
   {
-    using Type = DisplayKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayKHR;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDisplayKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayKHR>
   {
-    using Type = DisplayKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDisplayKHR, VK_NULL_HANDLE>
   {
-    using Type = DisplayKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DisplayKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DisplayKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainKHR.html
   class SwapchainKHR
   {
   public:
     using CType      = VkSwapchainKHR;
     using NativeType = VkSwapchainKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSwapchainKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSwapchainKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSwapchainKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSwapchainKHR;
 
   public:
-    SwapchainKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    SwapchainKHR( SwapchainKHR const & rhs )             = default;
-    SwapchainKHR & operator=( SwapchainKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    SwapchainKHR( SwapchainKHR && rhs )             = default;
-    SwapchainKHR & operator=( SwapchainKHR && rhs ) = default;
-#else
-    SwapchainKHR( SwapchainKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_swapchainKHR( exchange( rhs.m_swapchainKHR, {} ) ) {}
-
-    SwapchainKHR & operator=( SwapchainKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_swapchainKHR = exchange( rhs.m_swapchainKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR SwapchainKHR() = default;
 
     VULKAN_HPP_CONSTEXPR SwapchainKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3357,6 +2807,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( SwapchainKHR const & ) const = default;
+#else
+    bool operator==( SwapchainKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_swapchainKHR == rhs.m_swapchainKHR;
+    }
+
+    bool operator!=( SwapchainKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_swapchainKHR != rhs.m_swapchainKHR;
+    }
+
+    bool operator<( SwapchainKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_swapchainKHR < rhs.m_swapchainKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSwapchainKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_swapchainKHR;
@@ -3377,151 +2846,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eSwapchainKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eSwapchainKHR>
   {
-    using Type = SwapchainKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SwapchainKHR;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eSwapchainKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSwapchainKHR>
   {
-    using Type = SwapchainKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SwapchainKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkSwapchainKHR, VK_NULL_HANDLE>
   {
-    using Type = SwapchainKHR;
+    using Type = VULKAN_HPP_NAMESPACE::SwapchainKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<SwapchainKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::SwapchainKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImage.html
-  class Image
-  {
-  public:
-    using CType      = VkImage;
-    using NativeType = VkImage;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eImage;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eImage;
-
-  public:
-    Image() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Image( Image const & rhs )             = default;
-    Image & operator=( Image const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Image( Image && rhs )             = default;
-    Image & operator=( Image && rhs ) = default;
-#else
-    Image( Image && rhs ) VULKAN_HPP_NOEXCEPT : m_image( exchange( rhs.m_image, {} ) ) {}
-
-    Image & operator=( Image && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_image = exchange( rhs.m_image, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR Image( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT Image( VkImage image ) VULKAN_HPP_NOEXCEPT : m_image( image ) {}
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    Image & operator=( VkImage image ) VULKAN_HPP_NOEXCEPT
-    {
-      m_image = image;
-      return *this;
-    }
-#endif
-
-    Image & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_image = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkImage() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_image;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_image != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_image == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkImage m_image = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eImage>
-  {
-    using Type = Image;
-  };
-
-  template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eImage>
-  {
-    using Type = Image;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkImage, VK_NULL_HANDLE>
-  {
-    using Type = Image;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<Image>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphore.html
   class Semaphore
   {
   public:
     using CType      = VkSemaphore;
     using NativeType = VkSemaphore;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSemaphore;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSemaphore;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSemaphore;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSemaphore;
 
   public:
-    Semaphore() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Semaphore( Semaphore const & rhs )             = default;
-    Semaphore & operator=( Semaphore const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Semaphore( Semaphore && rhs )             = default;
-    Semaphore & operator=( Semaphore && rhs ) = default;
-#else
-    Semaphore( Semaphore && rhs ) VULKAN_HPP_NOEXCEPT : m_semaphore( exchange( rhs.m_semaphore, {} ) ) {}
-
-    Semaphore & operator=( Semaphore && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_semaphore = exchange( rhs.m_semaphore, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Semaphore() = default;
 
     VULKAN_HPP_CONSTEXPR Semaphore( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3541,6 +2902,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Semaphore const & ) const = default;
+#else
+    bool operator==( Semaphore const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_semaphore == rhs.m_semaphore;
+    }
+
+    bool operator!=( Semaphore const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_semaphore != rhs.m_semaphore;
+    }
+
+    bool operator<( Semaphore const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_semaphore < rhs.m_semaphore;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSemaphore() const VULKAN_HPP_NOEXCEPT
     {
       return m_semaphore;
@@ -3561,59 +2941,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eSemaphore>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eSemaphore>
   {
-    using Type = Semaphore;
+    using Type = VULKAN_HPP_NAMESPACE::Semaphore;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eSemaphore>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSemaphore>
   {
-    using Type = Semaphore;
+    using Type = VULKAN_HPP_NAMESPACE::Semaphore;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkSemaphore, VK_NULL_HANDLE>
   {
-    using Type = Semaphore;
+    using Type = VULKAN_HPP_NAMESPACE::Semaphore;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Semaphore>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Semaphore>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFence.html
   class Fence
   {
   public:
     using CType      = VkFence;
     using NativeType = VkFence;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eFence;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eFence;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eFence;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFence;
 
   public:
-    Fence() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Fence( Fence const & rhs )             = default;
-    Fence & operator=( Fence const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Fence( Fence && rhs )             = default;
-    Fence & operator=( Fence && rhs ) = default;
-#else
-    Fence( Fence && rhs ) VULKAN_HPP_NOEXCEPT : m_fence( exchange( rhs.m_fence, {} ) ) {}
-
-    Fence & operator=( Fence && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_fence = exchange( rhs.m_fence, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Fence() = default;
 
     VULKAN_HPP_CONSTEXPR Fence( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3633,6 +2997,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Fence const & ) const = default;
+#else
+    bool operator==( Fence const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_fence == rhs.m_fence;
+    }
+
+    bool operator!=( Fence const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_fence != rhs.m_fence;
+    }
+
+    bool operator<( Fence const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_fence < rhs.m_fence;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkFence() const VULKAN_HPP_NOEXCEPT
     {
       return m_fence;
@@ -3653,63 +3036,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eFence>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eFence>
   {
-    using Type = Fence;
+    using Type = VULKAN_HPP_NAMESPACE::Fence;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eFence>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFence>
   {
-    using Type = Fence;
+    using Type = VULKAN_HPP_NAMESPACE::Fence;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkFence, VK_NULL_HANDLE>
   {
-    using Type = Fence;
+    using Type = VULKAN_HPP_NAMESPACE::Fence;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Fence>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Fence>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPerformanceConfigurationINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceConfigurationINTEL.html
   class PerformanceConfigurationINTEL
   {
   public:
     using CType      = VkPerformanceConfigurationINTEL;
     using NativeType = VkPerformanceConfigurationINTEL;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePerformanceConfigurationINTEL;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePerformanceConfigurationINTEL;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    PerformanceConfigurationINTEL() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PerformanceConfigurationINTEL( PerformanceConfigurationINTEL const & rhs )             = default;
-    PerformanceConfigurationINTEL & operator=( PerformanceConfigurationINTEL const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PerformanceConfigurationINTEL( PerformanceConfigurationINTEL && rhs )             = default;
-    PerformanceConfigurationINTEL & operator=( PerformanceConfigurationINTEL && rhs ) = default;
-#else
-    PerformanceConfigurationINTEL( PerformanceConfigurationINTEL && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_performanceConfigurationINTEL( exchange( rhs.m_performanceConfigurationINTEL, {} ) )
-    {
-    }
-
-    PerformanceConfigurationINTEL & operator=( PerformanceConfigurationINTEL && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_performanceConfigurationINTEL = exchange( rhs.m_performanceConfigurationINTEL, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR PerformanceConfigurationINTEL() = default;
 
     VULKAN_HPP_CONSTEXPR PerformanceConfigurationINTEL( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3732,6 +3095,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PerformanceConfigurationINTEL const & ) const = default;
+#else
+    bool operator==( PerformanceConfigurationINTEL const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_performanceConfigurationINTEL == rhs.m_performanceConfigurationINTEL;
+    }
+
+    bool operator!=( PerformanceConfigurationINTEL const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_performanceConfigurationINTEL != rhs.m_performanceConfigurationINTEL;
+    }
+
+    bool operator<( PerformanceConfigurationINTEL const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_performanceConfigurationINTEL < rhs.m_performanceConfigurationINTEL;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPerformanceConfigurationINTEL() const VULKAN_HPP_NOEXCEPT
     {
       return m_performanceConfigurationINTEL;
@@ -3752,53 +3134,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePerformanceConfigurationINTEL>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePerformanceConfigurationINTEL>
   {
-    using Type = PerformanceConfigurationINTEL;
+    using Type = VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPerformanceConfigurationINTEL, VK_NULL_HANDLE>
   {
-    using Type = PerformanceConfigurationINTEL;
+    using Type = VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<PerformanceConfigurationINTEL>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPool.html
   class QueryPool
   {
   public:
     using CType      = VkQueryPool;
     using NativeType = VkQueryPool;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eQueryPool;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eQueryPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eQueryPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueryPool;
 
   public:
-    QueryPool() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    QueryPool( QueryPool const & rhs )             = default;
-    QueryPool & operator=( QueryPool const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    QueryPool( QueryPool && rhs )             = default;
-    QueryPool & operator=( QueryPool && rhs ) = default;
-#else
-    QueryPool( QueryPool && rhs ) VULKAN_HPP_NOEXCEPT : m_queryPool( exchange( rhs.m_queryPool, {} ) ) {}
-
-    QueryPool & operator=( QueryPool && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_queryPool = exchange( rhs.m_queryPool, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR QueryPool() = default;
 
     VULKAN_HPP_CONSTEXPR QueryPool( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3818,6 +3184,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( QueryPool const & ) const = default;
+#else
+    bool operator==( QueryPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queryPool == rhs.m_queryPool;
+    }
+
+    bool operator!=( QueryPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queryPool != rhs.m_queryPool;
+    }
+
+    bool operator<( QueryPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queryPool < rhs.m_queryPool;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkQueryPool() const VULKAN_HPP_NOEXCEPT
     {
       return m_queryPool;
@@ -3838,59 +3223,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eQueryPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eQueryPool>
   {
-    using Type = QueryPool;
+    using Type = VULKAN_HPP_NAMESPACE::QueryPool;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eQueryPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueryPool>
   {
-    using Type = QueryPool;
+    using Type = VULKAN_HPP_NAMESPACE::QueryPool;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkQueryPool, VK_NULL_HANDLE>
   {
-    using Type = QueryPool;
+    using Type = VULKAN_HPP_NAMESPACE::QueryPool;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<QueryPool>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::QueryPool>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuffer.html
   class Buffer
   {
   public:
     using CType      = VkBuffer;
     using NativeType = VkBuffer;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBuffer;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBuffer;
 
   public:
-    Buffer() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Buffer( Buffer const & rhs )             = default;
-    Buffer & operator=( Buffer const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Buffer( Buffer && rhs )             = default;
-    Buffer & operator=( Buffer && rhs ) = default;
-#else
-    Buffer( Buffer && rhs ) VULKAN_HPP_NOEXCEPT : m_buffer( exchange( rhs.m_buffer, {} ) ) {}
-
-    Buffer & operator=( Buffer && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_buffer = exchange( rhs.m_buffer, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Buffer() = default;
 
     VULKAN_HPP_CONSTEXPR Buffer( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -3910,6 +3279,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Buffer const & ) const = default;
+#else
+    bool operator==( Buffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_buffer == rhs.m_buffer;
+    }
+
+    bool operator!=( Buffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_buffer != rhs.m_buffer;
+    }
+
+    bool operator<( Buffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_buffer < rhs.m_buffer;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkBuffer() const VULKAN_HPP_NOEXCEPT
     {
       return m_buffer;
@@ -3930,59 +3318,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eBuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eBuffer>
   {
-    using Type = Buffer;
+    using Type = VULKAN_HPP_NAMESPACE::Buffer;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eBuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBuffer>
   {
-    using Type = Buffer;
+    using Type = VULKAN_HPP_NAMESPACE::Buffer;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkBuffer, VK_NULL_HANDLE>
   {
-    using Type = Buffer;
+    using Type = VULKAN_HPP_NAMESPACE::Buffer;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Buffer>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Buffer>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLayout.html
   class PipelineLayout
   {
   public:
     using CType      = VkPipelineLayout;
     using NativeType = VkPipelineLayout;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineLayout;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipelineLayout;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipelineLayout;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineLayout;
 
   public:
-    PipelineLayout() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PipelineLayout( PipelineLayout const & rhs )             = default;
-    PipelineLayout & operator=( PipelineLayout const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PipelineLayout( PipelineLayout && rhs )             = default;
-    PipelineLayout & operator=( PipelineLayout && rhs ) = default;
-#else
-    PipelineLayout( PipelineLayout && rhs ) VULKAN_HPP_NOEXCEPT : m_pipelineLayout( exchange( rhs.m_pipelineLayout, {} ) ) {}
-
-    PipelineLayout & operator=( PipelineLayout && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipelineLayout = exchange( rhs.m_pipelineLayout, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR PipelineLayout() = default;
 
     VULKAN_HPP_CONSTEXPR PipelineLayout( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4002,6 +3374,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PipelineLayout const & ) const = default;
+#else
+    bool operator==( PipelineLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineLayout == rhs.m_pipelineLayout;
+    }
+
+    bool operator!=( PipelineLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineLayout != rhs.m_pipelineLayout;
+    }
+
+    bool operator<( PipelineLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineLayout < rhs.m_pipelineLayout;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipelineLayout() const VULKAN_HPP_NOEXCEPT
     {
       return m_pipelineLayout;
@@ -4022,59 +3413,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePipelineLayout>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePipelineLayout>
   {
-    using Type = PipelineLayout;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineLayout;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::ePipelineLayout>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineLayout>
   {
-    using Type = PipelineLayout;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineLayout;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPipelineLayout, VK_NULL_HANDLE>
   {
-    using Type = PipelineLayout;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineLayout;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<PipelineLayout>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::PipelineLayout>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSet.html
   class DescriptorSet
   {
   public:
     using CType      = VkDescriptorSet;
     using NativeType = VkDescriptorSet;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorSet;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorSet;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSet;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSet;
 
   public:
-    DescriptorSet() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DescriptorSet( DescriptorSet const & rhs )             = default;
-    DescriptorSet & operator=( DescriptorSet const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DescriptorSet( DescriptorSet && rhs )             = default;
-    DescriptorSet & operator=( DescriptorSet && rhs ) = default;
-#else
-    DescriptorSet( DescriptorSet && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorSet( exchange( rhs.m_descriptorSet, {} ) ) {}
-
-    DescriptorSet & operator=( DescriptorSet && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_descriptorSet = exchange( rhs.m_descriptorSet, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DescriptorSet() = default;
 
     VULKAN_HPP_CONSTEXPR DescriptorSet( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4094,6 +3469,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DescriptorSet const & ) const = default;
+#else
+    bool operator==( DescriptorSet const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSet == rhs.m_descriptorSet;
+    }
+
+    bool operator!=( DescriptorSet const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSet != rhs.m_descriptorSet;
+    }
+
+    bool operator<( DescriptorSet const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSet < rhs.m_descriptorSet;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorSet() const VULKAN_HPP_NOEXCEPT
     {
       return m_descriptorSet;
@@ -4114,59 +3508,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDescriptorSet>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSet>
   {
-    using Type = DescriptorSet;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSet;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDescriptorSet>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSet>
   {
-    using Type = DescriptorSet;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSet;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDescriptorSet, VK_NULL_HANDLE>
   {
-    using Type = DescriptorSet;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSet;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DescriptorSet>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DescriptorSet>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageView.html
   class ImageView
   {
   public:
     using CType      = VkImageView;
     using NativeType = VkImageView;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eImageView;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eImageView;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eImageView;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImageView;
 
   public:
-    ImageView() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    ImageView( ImageView const & rhs )             = default;
-    ImageView & operator=( ImageView const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    ImageView( ImageView && rhs )             = default;
-    ImageView & operator=( ImageView && rhs ) = default;
-#else
-    ImageView( ImageView && rhs ) VULKAN_HPP_NOEXCEPT : m_imageView( exchange( rhs.m_imageView, {} ) ) {}
-
-    ImageView & operator=( ImageView && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_imageView = exchange( rhs.m_imageView, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR ImageView() = default;
 
     VULKAN_HPP_CONSTEXPR ImageView( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4186,6 +3564,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( ImageView const & ) const = default;
+#else
+    bool operator==( ImageView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_imageView == rhs.m_imageView;
+    }
+
+    bool operator!=( ImageView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_imageView != rhs.m_imageView;
+    }
+
+    bool operator<( ImageView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_imageView < rhs.m_imageView;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkImageView() const VULKAN_HPP_NOEXCEPT
     {
       return m_imageView;
@@ -4206,59 +3603,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eImageView>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eImageView>
   {
-    using Type = ImageView;
+    using Type = VULKAN_HPP_NAMESPACE::ImageView;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eImageView>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImageView>
   {
-    using Type = ImageView;
+    using Type = VULKAN_HPP_NAMESPACE::ImageView;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkImageView, VK_NULL_HANDLE>
   {
-    using Type = ImageView;
+    using Type = VULKAN_HPP_NAMESPACE::ImageView;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<ImageView>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::ImageView>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipeline.html
   class Pipeline
   {
   public:
     using CType      = VkPipeline;
     using NativeType = VkPipeline;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipeline;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipeline;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipeline;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipeline;
 
   public:
-    Pipeline() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Pipeline( Pipeline const & rhs )             = default;
-    Pipeline & operator=( Pipeline const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Pipeline( Pipeline && rhs )             = default;
-    Pipeline & operator=( Pipeline && rhs ) = default;
-#else
-    Pipeline( Pipeline && rhs ) VULKAN_HPP_NOEXCEPT : m_pipeline( exchange( rhs.m_pipeline, {} ) ) {}
-
-    Pipeline & operator=( Pipeline && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipeline = exchange( rhs.m_pipeline, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Pipeline() = default;
 
     VULKAN_HPP_CONSTEXPR Pipeline( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4278,6 +3659,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Pipeline const & ) const = default;
+#else
+    bool operator==( Pipeline const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipeline == rhs.m_pipeline;
+    }
+
+    bool operator!=( Pipeline const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipeline != rhs.m_pipeline;
+    }
+
+    bool operator<( Pipeline const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipeline < rhs.m_pipeline;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipeline() const VULKAN_HPP_NOEXCEPT
     {
       return m_pipeline;
@@ -4298,59 +3698,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePipeline>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePipeline>
   {
-    using Type = Pipeline;
+    using Type = VULKAN_HPP_NAMESPACE::Pipeline;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::ePipeline>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipeline>
   {
-    using Type = Pipeline;
+    using Type = VULKAN_HPP_NAMESPACE::Pipeline;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPipeline, VK_NULL_HANDLE>
   {
-    using Type = Pipeline;
+    using Type = VULKAN_HPP_NAMESPACE::Pipeline;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Pipeline>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Pipeline>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderEXT.html
   class ShaderEXT
   {
   public:
     using CType      = VkShaderEXT;
     using NativeType = VkShaderEXT;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eShaderEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eShaderEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    ShaderEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    ShaderEXT( ShaderEXT const & rhs )             = default;
-    ShaderEXT & operator=( ShaderEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    ShaderEXT( ShaderEXT && rhs )             = default;
-    ShaderEXT & operator=( ShaderEXT && rhs ) = default;
-#else
-    ShaderEXT( ShaderEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_shaderEXT( exchange( rhs.m_shaderEXT, {} ) ) {}
-
-    ShaderEXT & operator=( ShaderEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_shaderEXT = exchange( rhs.m_shaderEXT, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR ShaderEXT() = default;
 
     VULKAN_HPP_CONSTEXPR ShaderEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4370,6 +3754,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( ShaderEXT const & ) const = default;
+#else
+    bool operator==( ShaderEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderEXT == rhs.m_shaderEXT;
+    }
+
+    bool operator!=( ShaderEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderEXT != rhs.m_shaderEXT;
+    }
+
+    bool operator<( ShaderEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderEXT < rhs.m_shaderEXT;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkShaderEXT() const VULKAN_HPP_NOEXCEPT
     {
       return m_shaderEXT;
@@ -4390,55 +3793,132 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eShaderEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eShaderEXT>
   {
-    using Type = ShaderEXT;
+    using Type = VULKAN_HPP_NAMESPACE::ShaderEXT;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkShaderEXT, VK_NULL_HANDLE>
   {
-    using Type = ShaderEXT;
+    using Type = VULKAN_HPP_NAMESPACE::ShaderEXT;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<ShaderEXT>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::ShaderEXT>
+  {
+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
+  };
+
+  class Image
+  {
+  public:
+    using CType      = VkImage;
+    using NativeType = VkImage;
+
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eImage;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImage;
+
+  public:
+    VULKAN_HPP_CONSTEXPR Image() = default;
+
+    VULKAN_HPP_CONSTEXPR Image( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
+
+    VULKAN_HPP_TYPESAFE_EXPLICIT Image( VkImage image ) VULKAN_HPP_NOEXCEPT : m_image( image ) {}
+
+#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
+    Image & operator=( VkImage image ) VULKAN_HPP_NOEXCEPT
+    {
+      m_image = image;
+      return *this;
+    }
+#endif
+
+    Image & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
+    {
+      m_image = {};
+      return *this;
+    }
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Image const & ) const = default;
+#else
+    bool operator==( Image const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image == rhs.m_image;
+    }
+
+    bool operator!=( Image const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image != rhs.m_image;
+    }
+
+    bool operator<( Image const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image < rhs.m_image;
+    }
+#endif
+
+    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkImage() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image;
+    }
+
+    explicit operator bool() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image != VK_NULL_HANDLE;
+    }
+
+    bool operator!() const VULKAN_HPP_NOEXCEPT
+    {
+      return m_image == VK_NULL_HANDLE;
+    }
+
+  private:
+    VkImage m_image = {};
+  };
+
+  template <>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eImage>
+  {
+    using Type = VULKAN_HPP_NAMESPACE::Image;
+  };
+
+  template <>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImage>
+  {
+    using Type = VULKAN_HPP_NAMESPACE::Image;
+  };
+
+#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
+  template <>
+  struct CppType<VkImage, VK_NULL_HANDLE>
+  {
+    using Type = VULKAN_HPP_NAMESPACE::Image;
+  };
+#endif
+
+  template <>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Image>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkAccelerationStructureNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureNV.html
   class AccelerationStructureNV
   {
   public:
     using CType      = VkAccelerationStructureNV;
     using NativeType = VkAccelerationStructureNV;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eAccelerationStructureNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eAccelerationStructureNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureNV;
 
   public:
-    AccelerationStructureNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    AccelerationStructureNV( AccelerationStructureNV const & rhs )             = default;
-    AccelerationStructureNV & operator=( AccelerationStructureNV const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    AccelerationStructureNV( AccelerationStructureNV && rhs )             = default;
-    AccelerationStructureNV & operator=( AccelerationStructureNV && rhs ) = default;
-#else
-    AccelerationStructureNV( AccelerationStructureNV && rhs ) VULKAN_HPP_NOEXCEPT : m_accelerationStructureNV( exchange( rhs.m_accelerationStructureNV, {} ) )
-    {
-    }
-
-    AccelerationStructureNV & operator=( AccelerationStructureNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_accelerationStructureNV = exchange( rhs.m_accelerationStructureNV, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR AccelerationStructureNV() = default;
 
     VULKAN_HPP_CONSTEXPR AccelerationStructureNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4461,6 +3941,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( AccelerationStructureNV const & ) const = default;
+#else
+    bool operator==( AccelerationStructureNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureNV == rhs.m_accelerationStructureNV;
+    }
+
+    bool operator!=( AccelerationStructureNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureNV != rhs.m_accelerationStructureNV;
+    }
+
+    bool operator<( AccelerationStructureNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureNV < rhs.m_accelerationStructureNV;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkAccelerationStructureNV() const VULKAN_HPP_NOEXCEPT
     {
       return m_accelerationStructureNV;
@@ -4481,151 +3980,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eAccelerationStructureNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureNV>
   {
-    using Type = AccelerationStructureNV;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureNV;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eAccelerationStructureNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureNV>
   {
-    using Type = AccelerationStructureNV;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureNV;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkAccelerationStructureNV, VK_NULL_HANDLE>
   {
-    using Type = AccelerationStructureNV;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureNV;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<AccelerationStructureNV>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDataGraphPipelineSessionARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionARM.html
-  class DataGraphPipelineSessionARM
-  {
-  public:
-    using CType      = VkDataGraphPipelineSessionARM;
-    using NativeType = VkDataGraphPipelineSessionARM;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDataGraphPipelineSessionARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    DataGraphPipelineSessionARM() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DataGraphPipelineSessionARM( DataGraphPipelineSessionARM const & rhs )             = default;
-    DataGraphPipelineSessionARM & operator=( DataGraphPipelineSessionARM const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DataGraphPipelineSessionARM( DataGraphPipelineSessionARM && rhs )             = default;
-    DataGraphPipelineSessionARM & operator=( DataGraphPipelineSessionARM && rhs ) = default;
-#else
-    DataGraphPipelineSessionARM( DataGraphPipelineSessionARM && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_dataGraphPipelineSessionARM( exchange( rhs.m_dataGraphPipelineSessionARM, {} ) )
-    {
-    }
-
-    DataGraphPipelineSessionARM & operator=( DataGraphPipelineSessionARM && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_dataGraphPipelineSessionARM = exchange( rhs.m_dataGraphPipelineSessionARM, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineSessionARM( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT DataGraphPipelineSessionARM( VkDataGraphPipelineSessionARM dataGraphPipelineSessionARM ) VULKAN_HPP_NOEXCEPT
-      : m_dataGraphPipelineSessionARM( dataGraphPipelineSessionARM )
-    {
-    }
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    DataGraphPipelineSessionARM & operator=( VkDataGraphPipelineSessionARM dataGraphPipelineSessionARM ) VULKAN_HPP_NOEXCEPT
-    {
-      m_dataGraphPipelineSessionARM = dataGraphPipelineSessionARM;
-      return *this;
-    }
-#endif
-
-    DataGraphPipelineSessionARM & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_dataGraphPipelineSessionARM = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDataGraphPipelineSessionARM() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_dataGraphPipelineSessionARM;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_dataGraphPipelineSessionARM != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_dataGraphPipelineSessionARM == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkDataGraphPipelineSessionARM m_dataGraphPipelineSessionARM = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eDataGraphPipelineSessionARM>
-  {
-    using Type = DataGraphPipelineSessionARM;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkDataGraphPipelineSessionARM, VK_NULL_HANDLE>
-  {
-    using Type = DataGraphPipelineSessionARM;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<DataGraphPipelineSessionARM>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkOpticalFlowSessionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionNV.html
   class OpticalFlowSessionNV
   {
   public:
     using CType      = VkOpticalFlowSessionNV;
     using NativeType = VkOpticalFlowSessionNV;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eOpticalFlowSessionNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eOpticalFlowSessionNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    OpticalFlowSessionNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    OpticalFlowSessionNV( OpticalFlowSessionNV const & rhs )             = default;
-    OpticalFlowSessionNV & operator=( OpticalFlowSessionNV const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    OpticalFlowSessionNV( OpticalFlowSessionNV && rhs )             = default;
-    OpticalFlowSessionNV & operator=( OpticalFlowSessionNV && rhs ) = default;
-#else
-    OpticalFlowSessionNV( OpticalFlowSessionNV && rhs ) VULKAN_HPP_NOEXCEPT : m_opticalFlowSessionNV( exchange( rhs.m_opticalFlowSessionNV, {} ) ) {}
-
-    OpticalFlowSessionNV & operator=( OpticalFlowSessionNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_opticalFlowSessionNV = exchange( rhs.m_opticalFlowSessionNV, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR OpticalFlowSessionNV() = default;
 
     VULKAN_HPP_CONSTEXPR OpticalFlowSessionNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4648,6 +4039,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( OpticalFlowSessionNV const & ) const = default;
+#else
+    bool operator==( OpticalFlowSessionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_opticalFlowSessionNV == rhs.m_opticalFlowSessionNV;
+    }
+
+    bool operator!=( OpticalFlowSessionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_opticalFlowSessionNV != rhs.m_opticalFlowSessionNV;
+    }
+
+    bool operator<( OpticalFlowSessionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_opticalFlowSessionNV < rhs.m_opticalFlowSessionNV;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkOpticalFlowSessionNV() const VULKAN_HPP_NOEXCEPT
     {
       return m_opticalFlowSessionNV;
@@ -4668,56 +4078,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eOpticalFlowSessionNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eOpticalFlowSessionNV>
   {
-    using Type = OpticalFlowSessionNV;
+    using Type = VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkOpticalFlowSessionNV, VK_NULL_HANDLE>
   {
-    using Type = OpticalFlowSessionNV;
+    using Type = VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<OpticalFlowSessionNV>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDescriptorUpdateTemplate, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplate.html
   class DescriptorUpdateTemplate
   {
   public:
     using CType      = VkDescriptorUpdateTemplate;
     using NativeType = VkDescriptorUpdateTemplate;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorUpdateTemplate;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorUpdateTemplate;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
 
   public:
-    DescriptorUpdateTemplate() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DescriptorUpdateTemplate( DescriptorUpdateTemplate const & rhs )             = default;
-    DescriptorUpdateTemplate & operator=( DescriptorUpdateTemplate const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DescriptorUpdateTemplate( DescriptorUpdateTemplate && rhs )             = default;
-    DescriptorUpdateTemplate & operator=( DescriptorUpdateTemplate && rhs ) = default;
-#else
-    DescriptorUpdateTemplate( DescriptorUpdateTemplate && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_descriptorUpdateTemplate( exchange( rhs.m_descriptorUpdateTemplate, {} ) )
-    {
-    }
-
-    DescriptorUpdateTemplate & operator=( DescriptorUpdateTemplate && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_descriptorUpdateTemplate = exchange( rhs.m_descriptorUpdateTemplate, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplate() = default;
 
     VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplate( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4740,6 +4131,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DescriptorUpdateTemplate const & ) const = default;
+#else
+    bool operator==( DescriptorUpdateTemplate const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorUpdateTemplate == rhs.m_descriptorUpdateTemplate;
+    }
+
+    bool operator!=( DescriptorUpdateTemplate const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorUpdateTemplate != rhs.m_descriptorUpdateTemplate;
+    }
+
+    bool operator<( DescriptorUpdateTemplate const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorUpdateTemplate < rhs.m_descriptorUpdateTemplate;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorUpdateTemplate() const VULKAN_HPP_NOEXCEPT
     {
       return m_descriptorUpdateTemplate;
@@ -4760,61 +4170,45 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDescriptorUpdateTemplate>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorUpdateTemplate>
   {
-    using Type = DescriptorUpdateTemplate;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDescriptorUpdateTemplate>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorUpdateTemplate>
   {
-    using Type = DescriptorUpdateTemplate;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDescriptorUpdateTemplate, VK_NULL_HANDLE>
   {
-    using Type = DescriptorUpdateTemplate;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DescriptorUpdateTemplate>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
   using DescriptorUpdateTemplateKHR = DescriptorUpdateTemplate;
 
-  // wrapper class for handle VkEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkEvent.html
   class Event
   {
   public:
     using CType      = VkEvent;
     using NativeType = VkEvent;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eEvent;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eEvent;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eEvent;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eEvent;
 
   public:
-    Event() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Event( Event const & rhs )             = default;
-    Event & operator=( Event const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Event( Event && rhs )             = default;
-    Event & operator=( Event && rhs ) = default;
-#else
-    Event( Event && rhs ) VULKAN_HPP_NOEXCEPT : m_event( exchange( rhs.m_event, {} ) ) {}
-
-    Event & operator=( Event && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_event = exchange( rhs.m_event, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Event() = default;
 
     VULKAN_HPP_CONSTEXPR Event( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4834,6 +4228,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Event const & ) const = default;
+#else
+    bool operator==( Event const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_event == rhs.m_event;
+    }
+
+    bool operator!=( Event const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_event != rhs.m_event;
+    }
+
+    bool operator<( Event const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_event < rhs.m_event;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkEvent() const VULKAN_HPP_NOEXCEPT
     {
       return m_event;
@@ -4854,62 +4267,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eEvent>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eEvent>
   {
-    using Type = Event;
+    using Type = VULKAN_HPP_NAMESPACE::Event;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eEvent>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eEvent>
   {
-    using Type = Event;
+    using Type = VULKAN_HPP_NAMESPACE::Event;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkEvent, VK_NULL_HANDLE>
   {
-    using Type = Event;
+    using Type = VULKAN_HPP_NAMESPACE::Event;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Event>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Event>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkAccelerationStructureKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureKHR.html
   class AccelerationStructureKHR
   {
   public:
     using CType      = VkAccelerationStructureKHR;
     using NativeType = VkAccelerationStructureKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eAccelerationStructureKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eAccelerationStructureKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureKHR;
 
   public:
-    AccelerationStructureKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    AccelerationStructureKHR( AccelerationStructureKHR const & rhs )             = default;
-    AccelerationStructureKHR & operator=( AccelerationStructureKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    AccelerationStructureKHR( AccelerationStructureKHR && rhs )             = default;
-    AccelerationStructureKHR & operator=( AccelerationStructureKHR && rhs ) = default;
-#else
-    AccelerationStructureKHR( AccelerationStructureKHR && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_accelerationStructureKHR( exchange( rhs.m_accelerationStructureKHR, {} ) )
-    {
-    }
-
-    AccelerationStructureKHR & operator=( AccelerationStructureKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_accelerationStructureKHR = exchange( rhs.m_accelerationStructureKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR AccelerationStructureKHR() = default;
 
     VULKAN_HPP_CONSTEXPR AccelerationStructureKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -4932,6 +4326,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( AccelerationStructureKHR const & ) const = default;
+#else
+    bool operator==( AccelerationStructureKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureKHR == rhs.m_accelerationStructureKHR;
+    }
+
+    bool operator!=( AccelerationStructureKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureKHR != rhs.m_accelerationStructureKHR;
+    }
+
+    bool operator<( AccelerationStructureKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_accelerationStructureKHR < rhs.m_accelerationStructureKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkAccelerationStructureKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_accelerationStructureKHR;
@@ -4952,59 +4365,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eAccelerationStructureKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureKHR>
   {
-    using Type = AccelerationStructureKHR;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureKHR;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eAccelerationStructureKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureKHR>
   {
-    using Type = AccelerationStructureKHR;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkAccelerationStructureKHR, VK_NULL_HANDLE>
   {
-    using Type = AccelerationStructureKHR;
+    using Type = VULKAN_HPP_NAMESPACE::AccelerationStructureKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<AccelerationStructureKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapEXT.html
   class MicromapEXT
   {
   public:
     using CType      = VkMicromapEXT;
     using NativeType = VkMicromapEXT;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eMicromapEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eMicromapEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    MicromapEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    MicromapEXT( MicromapEXT const & rhs )             = default;
-    MicromapEXT & operator=( MicromapEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    MicromapEXT( MicromapEXT && rhs )             = default;
-    MicromapEXT & operator=( MicromapEXT && rhs ) = default;
-#else
-    MicromapEXT( MicromapEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_micromapEXT( exchange( rhs.m_micromapEXT, {} ) ) {}
-
-    MicromapEXT & operator=( MicromapEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_micromapEXT = exchange( rhs.m_micromapEXT, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR MicromapEXT() = default;
 
     VULKAN_HPP_CONSTEXPR MicromapEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -5024,6 +4421,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( MicromapEXT const & ) const = default;
+#else
+    bool operator==( MicromapEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_micromapEXT == rhs.m_micromapEXT;
+    }
+
+    bool operator!=( MicromapEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_micromapEXT != rhs.m_micromapEXT;
+    }
+
+    bool operator<( MicromapEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_micromapEXT < rhs.m_micromapEXT;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkMicromapEXT() const VULKAN_HPP_NOEXCEPT
     {
       return m_micromapEXT;
@@ -5044,53 +4460,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eMicromapEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eMicromapEXT>
   {
-    using Type = MicromapEXT;
+    using Type = VULKAN_HPP_NAMESPACE::MicromapEXT;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkMicromapEXT, VK_NULL_HANDLE>
   {
-    using Type = MicromapEXT;
+    using Type = VULKAN_HPP_NAMESPACE::MicromapEXT;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<MicromapEXT>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::MicromapEXT>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBuffer.html
   class CommandBuffer
   {
   public:
     using CType      = VkCommandBuffer;
     using NativeType = VkCommandBuffer;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCommandBuffer;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCommandBuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCommandBuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandBuffer;
 
   public:
-    CommandBuffer() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CommandBuffer( CommandBuffer const & rhs )             = default;
-    CommandBuffer & operator=( CommandBuffer const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CommandBuffer( CommandBuffer && rhs )             = default;
-    CommandBuffer & operator=( CommandBuffer && rhs ) = default;
-#else
-    CommandBuffer( CommandBuffer && rhs ) VULKAN_HPP_NOEXCEPT : m_commandBuffer( exchange( rhs.m_commandBuffer, {} ) ) {}
-
-    CommandBuffer & operator=( CommandBuffer && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_commandBuffer = exchange( rhs.m_commandBuffer, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR CommandBuffer() = default;
 
     VULKAN_HPP_CONSTEXPR CommandBuffer( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -5108,414 +4508,160 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CommandBuffer const & ) const = default;
+#else
+    bool operator==( CommandBuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandBuffer == rhs.m_commandBuffer;
+    }
+
+    bool operator!=( CommandBuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandBuffer != rhs.m_commandBuffer;
+    }
+
+    bool operator<( CommandBuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandBuffer < rhs.m_commandBuffer;
+    }
+#endif
+
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result begin( const CommandBufferBeginInfo * pBeginInfo,
-                                       Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo * pBeginInfo,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type begin( const CommandBufferBeginInfo & beginInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo & beginInfo,
                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result end( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type end( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result reset( CommandBufferResetFlags flags, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags,
+                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type reset( CommandBufferResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer( Buffer             srcBuffer,
-                     Buffer             dstBuffer,
-                     uint32_t           regionCount,
-                     const BufferCopy * pRegions,
-                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindPipeline( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                       VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                       Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewport( uint32_t                               firstViewport,
+                      uint32_t                               viewportCount,
+                      const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                      Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer( Buffer                               srcBuffer,
-                     Buffer                               dstBuffer,
-                     ArrayProxy<const BufferCopy> const & regions,
-                     Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage( Image              srcImage,
-                    ImageLayout        srcImageLayout,
-                    Image              dstImage,
-                    ImageLayout        dstImageLayout,
-                    uint32_t           regionCount,
-                    const ImageCopy *  pRegions,
-                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage( Image                               srcImage,
-                    ImageLayout                         srcImageLayout,
-                    Image                               dstImage,
-                    ImageLayout                         dstImageLayout,
-                    ArrayProxy<const ImageCopy> const & regions,
-                    Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage( Buffer                  srcBuffer,
-                            Image                   dstImage,
-                            ImageLayout             dstImageLayout,
-                            uint32_t                regionCount,
-                            const BufferImageCopy * pRegions,
-                            Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage( Buffer                                    srcBuffer,
-                            Image                                     dstImage,
-                            ImageLayout                               dstImageLayout,
-                            ArrayProxy<const BufferImageCopy> const & regions,
-                            Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer( Image                   srcImage,
-                            ImageLayout             srcImageLayout,
-                            Buffer                  dstBuffer,
-                            uint32_t                regionCount,
-                            const BufferImageCopy * pRegions,
-                            Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer( Image                                     srcImage,
-                            ImageLayout                               srcImageLayout,
-                            Buffer                                    dstBuffer,
-                            ArrayProxy<const BufferImageCopy> const & regions,
-                            Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateBuffer( Buffer             dstBuffer,
-                       DeviceSize         dstOffset,
-                       DeviceSize         dataSize,
-                       const void *       pData,
-                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateBuffer( Buffer                             dstBuffer,
-                       DeviceSize                         dstOffset,
-                       ArrayProxy<const DataType> const & data,
-                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdFillBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdFillBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void fillBuffer( Buffer dstBuffer, DeviceSize dstOffset, DeviceSize size, uint32_t data, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const
-      VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier( PipelineStageFlags          srcStageMask,
-                          PipelineStageFlags          dstStageMask,
-                          DependencyFlags             dependencyFlags,
-                          uint32_t                    memoryBarrierCount,
-                          const MemoryBarrier *       pMemoryBarriers,
-                          uint32_t                    bufferMemoryBarrierCount,
-                          const BufferMemoryBarrier * pBufferMemoryBarriers,
-                          uint32_t                    imageMemoryBarrierCount,
-                          const ImageMemoryBarrier *  pImageMemoryBarriers,
-                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier( PipelineStageFlags                            srcStageMask,
-                          PipelineStageFlags                            dstStageMask,
-                          DependencyFlags                               dependencyFlags,
-                          ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                          ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                          ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers,
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdBeginQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQuery.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginQuery( QueryPool          queryPool,
-                     uint32_t           query,
-                     QueryControlFlags  flags,
-                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdEndQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQuery.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endQuery( QueryPool queryPool, uint32_t query, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetQueryPool( QueryPool          queryPool,
-                         uint32_t           firstQuery,
-                         uint32_t           queryCount,
-                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdWriteTimestamp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeTimestamp( PipelineStageFlagBits pipelineStage,
-                         QueryPool             queryPool,
-                         uint32_t              query,
-                         Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdCopyQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyQueryPoolResults.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyQueryPoolResults( QueryPool          queryPool,
-                               uint32_t           firstQuery,
-                               uint32_t           queryCount,
-                               Buffer             dstBuffer,
-                               DeviceSize         dstOffset,
-                               DeviceSize         stride,
-                               QueryResultFlags   flags,
-                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeCommands( uint32_t              commandBufferCount,
-                          const CommandBuffer * pCommandBuffers,
-                          Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeCommands( ArrayProxy<const CommandBuffer> const & commandBuffers,
-                          Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdBindPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipeline.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindPipeline( PipelineBindPoint  pipelineBindPoint,
-                       Pipeline           pipeline,
-                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets( PipelineBindPoint     pipelineBindPoint,
-                             PipelineLayout        layout,
-                             uint32_t              firstSet,
-                             uint32_t              descriptorSetCount,
-                             const DescriptorSet * pDescriptorSets,
-                             uint32_t              dynamicOffsetCount,
-                             const uint32_t *      pDynamicOffsets,
-                             Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets( PipelineBindPoint                       pipelineBindPoint,
-                             PipelineLayout                          layout,
-                             uint32_t                                firstSet,
-                             ArrayProxy<const DescriptorSet> const & descriptorSets,
-                             ArrayProxy<const uint32_t> const &      dynamicOffsets,
-                             Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearColorImage( Image                         image,
-                          ImageLayout                   imageLayout,
-                          const ClearColorValue *       pColor,
-                          uint32_t                      rangeCount,
-                          const ImageSubresourceRange * pRanges,
-                          Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearColorImage( Image                                           image,
-                          ImageLayout                                     imageLayout,
-                          const ClearColorValue &                         color,
-                          ArrayProxy<const ImageSubresourceRange> const & ranges,
-                          Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdDispatch, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatch.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatch( uint32_t           groupCountX,
-                   uint32_t           groupCountY,
-                   uint32_t           groupCountZ,
-                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdDispatchIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchIndirect.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchIndirect( Buffer buffer, DeviceSize offset, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setEvent( Event event, PipelineStageFlags stageMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetEvent( Event event, PipelineStageFlags stageMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents( uint32_t                    eventCount,
-                     const Event *               pEvents,
-                     PipelineStageFlags          srcStageMask,
-                     PipelineStageFlags          dstStageMask,
-                     uint32_t                    memoryBarrierCount,
-                     const MemoryBarrier *       pMemoryBarriers,
-                     uint32_t                    bufferMemoryBarrierCount,
-                     const BufferMemoryBarrier * pBufferMemoryBarriers,
-                     uint32_t                    imageMemoryBarrierCount,
-                     const ImageMemoryBarrier *  pImageMemoryBarriers,
-                     Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents( ArrayProxy<const Event> const &               events,
-                     PipelineStageFlags                            srcStageMask,
-                     PipelineStageFlags                            dstStageMask,
-                     ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                     ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                     ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers,
-                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants( PipelineLayout     layout,
-                        ShaderStageFlags   stageFlags,
-                        uint32_t           offset,
-                        uint32_t           size,
-                        const void *       pValues,
-                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-    template <typename ValuesType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants( PipelineLayout                       layout,
-                        ShaderStageFlags                     stageFlags,
-                        uint32_t                             offset,
-                        ArrayProxy<const ValuesType> const & values,
-                        Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewport( uint32_t           firstViewport,
-                      uint32_t           viewportCount,
-                      const Viewport *   pViewports,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewport( uint32_t                                                                       firstViewport,
+                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewport( uint32_t                           firstViewport,
-                      ArrayProxy<const Viewport> const & viewports,
-                      Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissor( uint32_t           firstScissor,
-                     uint32_t           scissorCount,
-                     const Rect2D *     pScissors,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissor( uint32_t                             firstScissor,
+                     uint32_t                             scissorCount,
+                     const VULKAN_HPP_NAMESPACE::Rect2D * pScissors,
+                     Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissor( uint32_t                                                                     firstScissor,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissor( uint32_t                         firstScissor,
-                     ArrayProxy<const Rect2D> const & scissors,
-                     Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetLineWidth, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineWidth.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setLineWidth( float lineWidth, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBias, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDepthBias( float              depthBiasConstantFactor,
                        float              depthBiasClamp,
                        float              depthBiasSlopeFactor,
                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetBlendConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetBlendConstants.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setBlendConstants( const float blendConstants[4], Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBounds, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBounds.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDepthBounds( float minDepthBounds, float maxDepthBounds, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilCompareMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilCompareMask.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilCompareMask( StencilFaceFlags   faceMask,
-                                uint32_t           compareMask,
-                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilCompareMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                uint32_t                               compareMask,
+                                Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilWriteMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilWriteMask.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilWriteMask( StencilFaceFlags   faceMask,
-                              uint32_t           writeMask,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilWriteMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                              uint32_t                               writeMask,
+                              Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilReference, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilReference.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilReference( StencilFaceFlags   faceMask,
-                              uint32_t           reference,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilReference( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                              uint32_t                               reference,
+                              Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdBindIndexBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindIndexBuffer( Buffer             buffer,
-                          DeviceSize         offset,
-                          IndexType          indexType,
-                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers( uint32_t           firstBinding,
-                            uint32_t           bindingCount,
-                            const Buffer *     pBuffers,
-                            const DeviceSize * pOffsets,
-                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint     pipelineBindPoint,
+                             VULKAN_HPP_NAMESPACE::PipelineLayout        layout,
+                             uint32_t                                    firstSet,
+                             uint32_t                                    descriptorSetCount,
+                             const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                             uint32_t                                    dynamicOffsetCount,
+                             const uint32_t *                            pDynamicOffsets,
+                             Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers( uint32_t                             firstBinding,
-                            ArrayProxy<const Buffer> const &     buffers,
-                            ArrayProxy<const DeviceSize> const & offsets,
-                            Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                             pipelineBindPoint,
+                             VULKAN_HPP_NAMESPACE::PipelineLayout                                                layout,
+                             uint32_t                                                                            firstSet,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                            dynamicOffsets,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDraw, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDraw.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                          VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                          VULKAN_HPP_NAMESPACE::IndexType  indexType,
+                          Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers( uint32_t                                 firstBinding,
+                            uint32_t                                 bindingCount,
+                            const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                            const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                            Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers( uint32_t                                                                         firstBinding,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void draw( uint32_t           vertexCount,
                uint32_t           instanceCount,
                uint32_t           firstVertex,
                uint32_t           firstInstance,
                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndexed, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexed.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void drawIndexed( uint32_t           indexCount,
                       uint32_t           instanceCount,
                       uint32_t           firstIndex,
@@ -5523,123 +4669,336 @@ namespace VULKAN_HPP_NAMESPACE
                       uint32_t           firstInstance,
                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirect.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndirect( Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-      const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                       VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                       uint32_t                         drawCount,
+                       uint32_t                         stride,
+                       Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndexedIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirect.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndexedIndirect( Buffer             buffer,
-                              DeviceSize         offset,
-                              uint32_t           drawCount,
-                              uint32_t           stride,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                              VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                              uint32_t                         drawCount,
+                              uint32_t                         stride,
+                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage( Image              srcImage,
-                    ImageLayout        srcImageLayout,
-                    Image              dstImage,
-                    ImageLayout        dstImageLayout,
-                    uint32_t           regionCount,
-                    const ImageBlit *  pRegions,
-                    Filter             filter,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatch( uint32_t           groupCountX,
+                   uint32_t           groupCountY,
+                   uint32_t           groupCountZ,
+                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                           VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                           Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer( VULKAN_HPP_NAMESPACE::Buffer             srcBuffer,
+                     VULKAN_HPP_NAMESPACE::Buffer             dstBuffer,
+                     uint32_t                                 regionCount,
+                     const VULKAN_HPP_NAMESPACE::BufferCopy * pRegions,
+                     Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer( VULKAN_HPP_NAMESPACE::Buffer                                                     srcBuffer,
+                     VULKAN_HPP_NAMESPACE::Buffer                                                     dstBuffer,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferCopy> const & regions,
+                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout       srcImageLayout,
+                    VULKAN_HPP_NAMESPACE::Image             dstImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout       dstImageLayout,
+                    uint32_t                                regionCount,
+                    const VULKAN_HPP_NAMESPACE::ImageCopy * pRegions,
+                    Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                    VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageCopy> const & regions,
                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage( Image                               srcImage,
-                    ImageLayout                         srcImageLayout,
-                    Image                               dstImage,
-                    ImageLayout                         dstImageLayout,
-                    ArrayProxy<const ImageBlit> const & regions,
-                    Filter                              filter,
-                    Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdClearDepthStencilImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearDepthStencilImage( Image                          image,
-                                 ImageLayout                    imageLayout,
-                                 const ClearDepthStencilValue * pDepthStencil,
-                                 uint32_t                       rangeCount,
-                                 const ImageSubresourceRange *  pRanges,
-                                 Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage( VULKAN_HPP_NAMESPACE::Image             srcImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout       srcImageLayout,
+                    VULKAN_HPP_NAMESPACE::Image             dstImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout       dstImageLayout,
+                    uint32_t                                regionCount,
+                    const VULKAN_HPP_NAMESPACE::ImageBlit * pRegions,
+                    VULKAN_HPP_NAMESPACE::Filter            filter,
+                    Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdClearDepthStencilImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearDepthStencilImage( Image                                           image,
-                                 ImageLayout                                     imageLayout,
-                                 const ClearDepthStencilValue &                  depthStencil,
-                                 ArrayProxy<const ImageSubresourceRange> const & ranges,
-                                 Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                    VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageBlit> const & regions,
+                    VULKAN_HPP_NAMESPACE::Filter                                                    filter,
+                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearAttachments( uint32_t                attachmentCount,
-                           const ClearAttachment * pAttachments,
-                           uint32_t                rectCount,
-                           const ClearRect *       pRects,
-                           Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                  srcBuffer,
+                            VULKAN_HPP_NAMESPACE::Image                   dstImage,
+                            VULKAN_HPP_NAMESPACE::ImageLayout             dstImageLayout,
+                            uint32_t                                      regionCount,
+                            const VULKAN_HPP_NAMESPACE::BufferImageCopy * pRegions,
+                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void clearAttachments( ArrayProxy<const ClearAttachment> const & attachments,
-                           ArrayProxy<const ClearRect> const &       rects,
-                           Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                                                          srcBuffer,
+                            VULKAN_HPP_NAMESPACE::Image                                                           dstImage,
+                            VULKAN_HPP_NAMESPACE::ImageLayout                                                     dstImageLayout,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage( Image                srcImage,
-                       ImageLayout          srcImageLayout,
-                       Image                dstImage,
-                       ImageLayout          dstImageLayout,
-                       uint32_t             regionCount,
-                       const ImageResolve * pRegions,
-                       Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                   srcImage,
+                            VULKAN_HPP_NAMESPACE::ImageLayout             srcImageLayout,
+                            VULKAN_HPP_NAMESPACE::Buffer                  dstBuffer,
+                            uint32_t                                      regionCount,
+                            const VULKAN_HPP_NAMESPACE::BufferImageCopy * pRegions,
+                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage( Image                                  srcImage,
-                       ImageLayout                            srcImageLayout,
-                       Image                                  dstImage,
-                       ImageLayout                            dstImageLayout,
-                       ArrayProxy<const ImageResolve> const & regions,
-                       Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                                                           srcImage,
+                            VULKAN_HPP_NAMESPACE::ImageLayout                                                     srcImageLayout,
+                            VULKAN_HPP_NAMESPACE::Buffer                                                          dstBuffer,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass( const RenderPassBeginInfo * pRenderPassBegin,
-                          SubpassContents             contents,
-                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                       VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                       VULKAN_HPP_NAMESPACE::DeviceSize dataSize,
+                       const void *                     pData,
+                       Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass( const RenderPassBeginInfo & renderPassBegin,
-                          SubpassContents             contents,
-                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateBuffer( VULKAN_HPP_NAMESPACE::Buffer                             dstBuffer,
+                       VULKAN_HPP_NAMESPACE::DeviceSize                         dstOffset,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const DataType> const & data,
+                       Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdNextSubpass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void nextSubpass( SubpassContents contents, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                     VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                     VULKAN_HPP_NAMESPACE::DeviceSize size,
+                     uint32_t                         data,
+                     Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdEndRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearColorImage( VULKAN_HPP_NAMESPACE::Image                         image,
+                          VULKAN_HPP_NAMESPACE::ImageLayout                   imageLayout,
+                          const VULKAN_HPP_NAMESPACE::ClearColorValue *       pColor,
+                          uint32_t                                            rangeCount,
+                          const VULKAN_HPP_NAMESPACE::ImageSubresourceRange * pRanges,
+                          Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearColorImage( VULKAN_HPP_NAMESPACE::Image                                                                 image,
+                          VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+                          const VULKAN_HPP_NAMESPACE::ClearColorValue &                                               color,
+                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges,
+                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                          image,
+                                 VULKAN_HPP_NAMESPACE::ImageLayout                    imageLayout,
+                                 const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue * pDepthStencil,
+                                 uint32_t                                             rangeCount,
+                                 const VULKAN_HPP_NAMESPACE::ImageSubresourceRange *  pRanges,
+                                 Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                                                                 image,
+                                 VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+                                 const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue &                                        depthStencil,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearAttachments( uint32_t                                      attachmentCount,
+                           const VULKAN_HPP_NAMESPACE::ClearAttachment * pAttachments,
+                           uint32_t                                      rectCount,
+                           const VULKAN_HPP_NAMESPACE::ClearRect *       pRects,
+                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void clearAttachments( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearAttachment> const & attachments,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearRect> const &       rects,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage( VULKAN_HPP_NAMESPACE::Image                srcImage,
+                       VULKAN_HPP_NAMESPACE::ImageLayout          srcImageLayout,
+                       VULKAN_HPP_NAMESPACE::Image                dstImage,
+                       VULKAN_HPP_NAMESPACE::ImageLayout          dstImageLayout,
+                       uint32_t                                   regionCount,
+                       const VULKAN_HPP_NAMESPACE::ImageResolve * pRegions,
+                       Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage( VULKAN_HPP_NAMESPACE::Image                                                        srcImage,
+                       VULKAN_HPP_NAMESPACE::ImageLayout                                                  srcImageLayout,
+                       VULKAN_HPP_NAMESPACE::Image                                                        dstImage,
+                       VULKAN_HPP_NAMESPACE::ImageLayout                                                  dstImageLayout,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageResolve> const & regions,
+                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                   VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask,
+                   Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask,
+                     Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents( uint32_t                                          eventCount,
+                     const VULKAN_HPP_NAMESPACE::Event *               pEvents,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags          dstStageMask,
+                     uint32_t                                          memoryBarrierCount,
+                     const VULKAN_HPP_NAMESPACE::MemoryBarrier *       pMemoryBarriers,
+                     uint32_t                                          bufferMemoryBarrierCount,
+                     const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier * pBufferMemoryBarriers,
+                     uint32_t                                          imageMemoryBarrierCount,
+                     const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier *  pImageMemoryBarriers,
+                     Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &               events,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers,
+                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags          srcStageMask,
+                          VULKAN_HPP_NAMESPACE::PipelineStageFlags          dstStageMask,
+                          VULKAN_HPP_NAMESPACE::DependencyFlags             dependencyFlags,
+                          uint32_t                                          memoryBarrierCount,
+                          const VULKAN_HPP_NAMESPACE::MemoryBarrier *       pMemoryBarriers,
+                          uint32_t                                          bufferMemoryBarrierCount,
+                          const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier * pBufferMemoryBarriers,
+                          uint32_t                                          imageMemoryBarrierCount,
+                          const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier *  pImageMemoryBarriers,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                          VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                          VULKAN_HPP_NAMESPACE::DependencyFlags                                                     dependencyFlags,
+                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers,
+                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginQuery( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                     uint32_t                                query,
+                     VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                     Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                   uint32_t                        query,
+                   Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                         uint32_t                        firstQuery,
+                         uint32_t                        queryCount,
+                         Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeTimestamp( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                         VULKAN_HPP_NAMESPACE::QueryPool             queryPool,
+                         uint32_t                                    query,
+                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                               uint32_t                               firstQuery,
+                               uint32_t                               queryCount,
+                               VULKAN_HPP_NAMESPACE::Buffer           dstBuffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize       dstOffset,
+                               VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                               VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                               Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout   layout,
+                        VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags,
+                        uint32_t                               offset,
+                        uint32_t                               size,
+                        const void *                           pValues,
+                        Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename ValuesType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout                       layout,
+                        VULKAN_HPP_NAMESPACE::ShaderStageFlags                     stageFlags,
+                        uint32_t                                                   offset,
+                        VULKAN_HPP_NAMESPACE::ArrayProxy<const ValuesType> const & values,
+                        Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                          VULKAN_HPP_NAMESPACE::SubpassContents             contents,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                          VULKAN_HPP_NAMESPACE::SubpassContents             contents,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void nextSubpass( VULKAN_HPP_NAMESPACE::SubpassContents contents, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRenderPass( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void executeCommands( uint32_t                                    commandBufferCount,
+                          const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                          Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void executeCommands( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
     //=== VK_VERSION_1_1 ===
 
-    // wrapper function for command vkCmdSetDeviceMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMask.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDeviceMask( uint32_t deviceMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDispatchBase, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBase.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void dispatchBase( uint32_t           baseGroupX,
                        uint32_t           baseGroupY,
                        uint32_t           baseGroupZ,
@@ -5650,616 +5009,440 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_VERSION_1_2 ===
 
-    // wrapper function for command vkCmdDrawIndirectCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndirectCount( Buffer             buffer,
-                            DeviceSize         offset,
-                            Buffer             countBuffer,
-                            DeviceSize         countBufferOffset,
-                            uint32_t           maxDrawCount,
-                            uint32_t           stride,
-                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                            VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                            VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                            VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                            uint32_t                         maxDrawCount,
+                            uint32_t                         stride,
+                            Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCount, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndexedIndirectCount( Buffer             buffer,
-                                   DeviceSize         offset,
-                                   Buffer             countBuffer,
-                                   DeviceSize         countBufferOffset,
-                                   uint32_t           maxDrawCount,
-                                   uint32_t           stride,
-                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                   VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                   VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                   VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                   uint32_t                         maxDrawCount,
+                                   uint32_t                         stride,
+                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass2( const RenderPassBeginInfo * pRenderPassBegin,
-                           const SubpassBeginInfo *    pSubpassBeginInfo,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                           const VULKAN_HPP_NAMESPACE::SubpassBeginInfo *    pSubpassBeginInfo,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass2( const RenderPassBeginInfo & renderPassBegin,
-                           const SubpassBeginInfo &    subpassBeginInfo,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                           const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void nextSubpass2( const SubpassBeginInfo * pSubpassBeginInfo,
-                       const SubpassEndInfo *   pSubpassEndInfo,
-                       Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
+                       const VULKAN_HPP_NAMESPACE::SubpassEndInfo *   pSubpassEndInfo,
+                       Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void nextSubpass2( const SubpassBeginInfo & subpassBeginInfo,
-                       const SubpassEndInfo &   subpassEndInfo,
-                       Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                       const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo,
+                       Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRenderPass2( const SubpassEndInfo * pSubpassEndInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
+                         Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRenderPass2( const SubpassEndInfo & subpassEndInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo,
+                         Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_3 ===
 
-    // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier2( const DependencyInfo * pDependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
+                    const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                    Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier2( const DependencyInfo & dependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
+                    const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                    Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdWriteTimestamp2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeTimestamp2( PipelineStageFlags2 stage,
-                          QueryPool           queryPool,
-                          uint32_t            query,
-                          Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetEvent2( VULKAN_HPP_NAMESPACE::Event               event,
+                      VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask,
+                      Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer2( const CopyBufferInfo2 * pCopyBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents2( uint32_t                                     eventCount,
+                      const VULKAN_HPP_NAMESPACE::Event *          pEvents,
+                      const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfos,
+                      Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer2( const CopyBufferInfo2 & copyBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos,
+                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage2( const CopyImageInfo2 * pCopyImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                           Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage2( const CopyImageInfo2 & copyImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                           Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage2( const CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                          VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                          uint32_t                                  query,
+                          Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 * pCopyBufferInfo,
+                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage2( const CopyBufferToImageInfo2 & copyBufferToImageInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo,
+                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer2( const CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
+                     Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer2( const CopyImageToBufferInfo2 & copyImageToBufferInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo,
+                     Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      setEvent2( Event event, const DependencyInfo * pDependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setEvent2( Event event, const DependencyInfo & dependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdResetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetEvent2( Event event, PipelineStageFlags2 stageMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents2( uint32_t               eventCount,
-                      const Event *          pEvents,
-                      const DependencyInfo * pDependencyInfos,
-                      Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents2( ArrayProxy<const Event> const &          events,
-                      ArrayProxy<const DependencyInfo> const & dependencyInfos,
-                      Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage2( const BlitImageInfo2 * pBlitImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
+                     Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage2( const BlitImageInfo2 & blitImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo,
+                     Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage2( const ResolveImageInfo2 * pResolveImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
+                        Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage2( const ResolveImageInfo2 & resolveImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo,
+                        Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRendering( const RenderingInfo * pRenderingInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRendering( const RenderingInfo & renderingInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo,
+                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRendering( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCullMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullMode.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCullMode( CullModeFlags cullMode, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCullMode( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetFrontFace, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFace.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setFrontFace( FrontFace frontFace, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setFrontFace( VULKAN_HPP_NAMESPACE::FrontFace frontFace, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetPrimitiveTopology, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopology.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setPrimitiveTopology( PrimitiveTopology primitiveTopology, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setPrimitiveTopology( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology,
+                               Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWithCount( uint32_t           viewportCount,
-                               const Viewport *   pViewports,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWithCount( uint32_t                               viewportCount,
+                               const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                               Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWithCount( ArrayProxy<const Viewport> const & viewports,
-                               Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissorWithCount( uint32_t           scissorCount,
-                              const Rect2D *     pScissors,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissorWithCount( uint32_t                             scissorCount,
+                              const VULKAN_HPP_NAMESPACE::Rect2D * pScissors,
+                              Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissorWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissorWithCount( ArrayProxy<const Rect2D> const & scissors,
-                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers2( uint32_t           firstBinding,
-                             uint32_t           bindingCount,
-                             const Buffer *     pBuffers,
-                             const DeviceSize * pOffsets,
-                             const DeviceSize * pSizes,
-                             const DeviceSize * pStrides,
-                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers2( uint32_t                                 firstBinding,
+                             uint32_t                                 bindingCount,
+                             const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                             const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                             const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                             const VULKAN_HPP_NAMESPACE::DeviceSize * pStrides,
+                             Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers2( uint32_t                                     firstBinding,
-                             ArrayProxy<const Buffer> const &             buffers,
-                             ArrayProxy<const DeviceSize> const &         offsets,
-                             ArrayProxy<const DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             ArrayProxy<const DeviceSize> const & strides VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers2(
+      uint32_t                                                                                 firstBinding,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &             buffers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const &         offsets,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetDepthTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthTestEnable( Bool32 depthTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable,
+                             Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthWriteEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthWriteEnable( Bool32 depthWriteEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable,
+                              Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthCompareOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOp.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthCompareOp( CompareOp depthCompareOp, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthCompareOp( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp,
+                            Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBoundsTestEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBoundsTestEnable( Bool32 depthBoundsTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBoundsTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable,
+                                   Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilTestEnable( Bool32 stencilTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilTestEnable( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable,
+                               Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOp.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilOp( StencilFaceFlags   faceMask,
-                       StencilOp          failOp,
-                       StencilOp          passOp,
-                       StencilOp          depthFailOp,
-                       CompareOp          compareOp,
-                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilOp( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                       VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                       VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                       VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                       VULKAN_HPP_NAMESPACE::CompareOp        compareOp,
+                       Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetRasterizerDiscardEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRasterizerDiscardEnable( Bool32 rasterizerDiscardEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRasterizerDiscardEnable( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable,
+                                     Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBiasEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBiasEnable( Bool32 depthBiasEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBiasEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable,
+                             Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetPrimitiveRestartEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnable.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setPrimitiveRestartEnable( Bool32 primitiveRestartEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    //=== VK_VERSION_1_4 ===
-
-    // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet( PipelineBindPoint          pipelineBindPoint,
-                            PipelineLayout             layout,
-                            uint32_t                   set,
-                            uint32_t                   descriptorWriteCount,
-                            const WriteDescriptorSet * pDescriptorWrites,
-                            Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet( PipelineBindPoint                            pipelineBindPoint,
-                            PipelineLayout                               layout,
-                            uint32_t                                     set,
-                            ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                        PipelineLayout           layout,
-                                        uint32_t                 set,
-                                        const void *             pData,
-                                        Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                        PipelineLayout           layout,
-                                        uint32_t                 set,
-                                        DataType const &         data,
-                                        Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets2( const BindDescriptorSetsInfo * pBindDescriptorSetsInfo,
-                              Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets2( const BindDescriptorSetsInfo & bindDescriptorSetsInfo,
-                              Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants2( const PushConstantsInfo * pPushConstantsInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants2( const PushConstantsInfo & pushConstantsInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet2( const PushDescriptorSetInfo * pPushDescriptorSetInfo,
-                             Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet2( const PushDescriptorSetInfo & pushDescriptorSetInfo,
-                             Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo,
-                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo,
-                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdSetLineStipple, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStipple.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLineStipple( uint32_t           lineStippleFactor,
-                         uint16_t           lineStipplePattern,
-                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdBindIndexBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindIndexBuffer2( Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-      const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo * pLocationInfo,
-                                          Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo & locationInfo,
-                                          Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo,
-                                             Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo,
-                                             Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setPrimitiveRestartEnable( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable,
+                                    Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_debug_marker ===
 
-    // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT * pMarkerInfo,
-                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT * pMarkerInfo,
+                              Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT & markerInfo,
-                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo,
+                              Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDebugMarkerEndEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerEndEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void debugMarkerEndEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT * pMarkerInfo,
-                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT * pMarkerInfo,
+                               Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT & markerInfo,
-                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo,
+                               Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_queue ===
 
-    // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginVideoCodingKHR( const VideoBeginCodingInfoKHR * pBeginInfo,
-                              Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR * pBeginInfo,
+                              Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginVideoCodingKHR( const VideoBeginCodingInfoKHR & beginInfo,
-                              Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR & beginInfo,
+                              Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endVideoCodingKHR( const VideoEndCodingInfoKHR * pEndCodingInfo,
-                            Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR * pEndCodingInfo,
+                            Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endVideoCodingKHR( const VideoEndCodingInfoKHR & endCodingInfo,
-                            Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR & endCodingInfo,
+                            Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void controlVideoCodingKHR( const VideoCodingControlInfoKHR * pCodingControlInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR * pCodingControlInfo,
+                                Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void controlVideoCodingKHR( const VideoCodingControlInfoKHR & codingControlInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR & codingControlInfo,
+                                Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_decode_queue ===
 
-    // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decodeVideoKHR( const VideoDecodeInfoKHR * pDecodeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR * pDecodeInfo,
+                         Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decodeVideoKHR( const VideoDecodeInfoKHR & decodeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR & decodeInfo,
+                         Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_transform_feedback ===
 
-    // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindTransformFeedbackBuffersEXT( uint32_t           firstBinding,
-                                          uint32_t           bindingCount,
-                                          const Buffer *     pBuffers,
-                                          const DeviceSize * pOffsets,
-                                          const DeviceSize * pSizes,
-                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindTransformFeedbackBuffersEXT( uint32_t                                 firstBinding,
+                                          uint32_t                                 bindingCount,
+                                          const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                          const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                          const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                                          Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindTransformFeedbackBuffersEXT( uint32_t                                   firstBinding,
-                                          ArrayProxy<const Buffer> const &           buffers,
-                                          ArrayProxy<const DeviceSize> const &       offsets,
-                                          ArrayProxy<const DeviceSize> const & sizes VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindTransformFeedbackBuffersEXT( uint32_t                                                                         firstBinding,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes
+                                                             VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginTransformFeedbackEXT( uint32_t           firstCounterBuffer,
-                                    uint32_t           counterBufferCount,
-                                    const Buffer *     pCounterBuffers,
-                                    const DeviceSize * pCounterBufferOffsets,
-                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
+                                    uint32_t                                 counterBufferCount,
+                                    const VULKAN_HPP_NAMESPACE::Buffer *     pCounterBuffers,
+                                    const VULKAN_HPP_NAMESPACE::DeviceSize * pCounterBufferOffsets,
+                                    Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginTransformFeedbackEXT( uint32_t                                                  firstCounterBuffer,
-                                    ArrayProxy<const Buffer> const &                          counterBuffers,
-                                    ArrayProxy<const DeviceSize> const & counterBufferOffsets VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginTransformFeedbackEXT( uint32_t                                                                     firstCounterBuffer,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
+                                                       VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endTransformFeedbackEXT( uint32_t           firstCounterBuffer,
-                                  uint32_t           counterBufferCount,
-                                  const Buffer *     pCounterBuffers,
-                                  const DeviceSize * pCounterBufferOffsets,
-                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endTransformFeedbackEXT( uint32_t                                 firstCounterBuffer,
+                                  uint32_t                                 counterBufferCount,
+                                  const VULKAN_HPP_NAMESPACE::Buffer *     pCounterBuffers,
+                                  const VULKAN_HPP_NAMESPACE::DeviceSize * pCounterBufferOffsets,
+                                  Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endTransformFeedbackEXT( uint32_t                                                  firstCounterBuffer,
-                                  ArrayProxy<const Buffer> const &                          counterBuffers,
-                                  ArrayProxy<const DeviceSize> const & counterBufferOffsets VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endTransformFeedbackEXT( uint32_t                                                                     firstCounterBuffer,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
+                                                     VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBeginQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQueryIndexedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginQueryIndexedEXT( QueryPool          queryPool,
-                               uint32_t           query,
-                               QueryControlFlags  flags,
-                               uint32_t           index,
-                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                               uint32_t                                query,
+                               VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                               uint32_t                                index,
+                               Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdEndQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQueryIndexedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endQueryIndexedEXT( QueryPool          queryPool,
-                             uint32_t           query,
-                             uint32_t           index,
-                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                             uint32_t                        query,
+                             uint32_t                        index,
+                             Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndirectByteCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectByteCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndirectByteCountEXT( uint32_t           instanceCount,
-                                   uint32_t           firstInstance,
-                                   Buffer             counterBuffer,
-                                   DeviceSize         counterBufferOffset,
-                                   uint32_t           counterOffset,
-                                   uint32_t           vertexStride,
-                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndirectByteCountEXT( uint32_t                         instanceCount,
+                                   uint32_t                         firstInstance,
+                                   VULKAN_HPP_NAMESPACE::Buffer     counterBuffer,
+                                   VULKAN_HPP_NAMESPACE::DeviceSize counterBufferOffset,
+                                   uint32_t                         counterOffset,
+                                   uint32_t                         vertexStride,
+                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NVX_binary_import ===
 
-    // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void cuLaunchKernelNVX( const CuLaunchInfoNVX * pLaunchInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX * pLaunchInfo,
+                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void cuLaunchKernelNVX( const CuLaunchInfoNVX & launchInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX & launchInfo,
+                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_AMD_draw_indirect_count ===
 
-    // wrapper function for command vkCmdDrawIndirectCountAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndirectCountAMD( Buffer             buffer,
-                               DeviceSize         offset,
-                               Buffer             countBuffer,
-                               DeviceSize         countBufferOffset,
-                               uint32_t           maxDrawCount,
-                               uint32_t           stride,
-                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                               VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                               uint32_t                         maxDrawCount,
+                               uint32_t                         stride,
+                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCountAMD, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndexedIndirectCountAMD( Buffer             buffer,
-                                      DeviceSize         offset,
-                                      Buffer             countBuffer,
-                                      DeviceSize         countBufferOffset,
-                                      uint32_t           maxDrawCount,
-                                      uint32_t           stride,
-                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                      VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                      VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                      VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                      uint32_t                         maxDrawCount,
+                                      uint32_t                         stride,
+                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_dynamic_rendering ===
 
-    // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderingKHR( const RenderingInfo * pRenderingInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                            Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderingKHR( const RenderingInfo & renderingInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo,
+                            Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderingKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endRenderingKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_device_group ===
 
-    // wrapper function for command vkCmdSetDeviceMaskKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMaskKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setDeviceMaskKHR( uint32_t deviceMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDispatchBaseKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBaseKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void dispatchBaseKHR( uint32_t           baseGroupX,
                           uint32_t           baseGroupY,
                           uint32_t           baseGroupZ,
@@ -6270,1939 +5453,1381 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_push_descriptor ===
 
-    // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetKHR( PipelineBindPoint          pipelineBindPoint,
-                               PipelineLayout             layout,
-                               uint32_t                   set,
-                               uint32_t                   descriptorWriteCount,
-                               const WriteDescriptorSet * pDescriptorWrites,
-                               Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetKHR( VULKAN_HPP_NAMESPACE::PipelineBindPoint          pipelineBindPoint,
+                               VULKAN_HPP_NAMESPACE::PipelineLayout             layout,
+                               uint32_t                                         set,
+                               uint32_t                                         descriptorWriteCount,
+                               const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites,
+                               Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetKHR( PipelineBindPoint                            pipelineBindPoint,
-                               PipelineLayout                               layout,
-                               uint32_t                                     set,
-                               ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                               Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetKHR( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                  pipelineBindPoint,
+                               VULKAN_HPP_NAMESPACE::PipelineLayout                                                     layout,
+                               uint32_t                                                                                 set,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplateKHR( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                           PipelineLayout           layout,
-                                           uint32_t                 set,
-                                           const void *             pData,
-                                           Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                           VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
+                                           uint32_t                                       set,
+                                           const void *                                   pData,
+                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplateKHR( DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                           PipelineLayout           layout,
-                                           uint32_t                 set,
-                                           DataType const &         data,
-                                           Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                           VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
+                                           uint32_t                                       set,
+                                           DataType const &                               data,
+                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_conditional_rendering ===
 
-    // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginConditionalRenderingEXT( const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT * pConditionalRenderingBegin,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginConditionalRenderingEXT( const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndConditionalRenderingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndConditionalRenderingEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endConditionalRenderingEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_clip_space_w_scaling ===
 
-    // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWScalingNV( uint32_t                   firstViewport,
-                                uint32_t                   viewportCount,
-                                const ViewportWScalingNV * pViewportWScalings,
-                                Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWScalingNV( uint32_t                                         firstViewport,
+                                uint32_t                                         viewportCount,
+                                const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * pViewportWScalings,
+                                Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWScalingNV( uint32_t                                     firstViewport,
-                                ArrayProxy<const ViewportWScalingNV> const & viewportWScalings,
-                                Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWScalingNV( uint32_t                                                                                 firstViewport,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_discard_rectangles ===
 
-    // wrapper function for command vkCmdSetDiscardRectangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDiscardRectangleEXT( uint32_t           firstDiscardRectangle,
-                                 uint32_t           discardRectangleCount,
-                                 const Rect2D *     pDiscardRectangles,
-                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDiscardRectangleEXT( uint32_t                             firstDiscardRectangle,
+                                 uint32_t                             discardRectangleCount,
+                                 const VULKAN_HPP_NAMESPACE::Rect2D * pDiscardRectangles,
+                                 Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetDiscardRectangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDiscardRectangleEXT( uint32_t                         firstDiscardRectangle,
-                                 ArrayProxy<const Rect2D> const & discardRectangles,
-                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDiscardRectangleEXT( uint32_t                                                                     firstDiscardRectangle,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetDiscardRectangleEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDiscardRectangleEnableEXT( Bool32 discardRectangleEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDiscardRectangleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 discardRectangleEnable,
+                                       Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDiscardRectangleModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDiscardRectangleModeEXT( DiscardRectangleModeEXT discardRectangleMode,
-                                     Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDiscardRectangleModeEXT( VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT discardRectangleMode,
+                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_create_renderpass2 ===
 
-    // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass2KHR( const RenderPassBeginInfo * pRenderPassBegin,
-                              const SubpassBeginInfo *    pSubpassBeginInfo,
-                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo * pRenderPassBegin,
+                              const VULKAN_HPP_NAMESPACE::SubpassBeginInfo *    pSubpassBeginInfo,
+                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginRenderPass2KHR( const RenderPassBeginInfo & renderPassBegin,
-                              const SubpassBeginInfo &    subpassBeginInfo,
-                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                              const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo,
+                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void nextSubpass2KHR( const SubpassBeginInfo * pSubpassBeginInfo,
-                          const SubpassEndInfo *   pSubpassEndInfo,
-                          Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo * pSubpassBeginInfo,
+                          const VULKAN_HPP_NAMESPACE::SubpassEndInfo *   pSubpassEndInfo,
+                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void nextSubpass2KHR( const SubpassBeginInfo & subpassBeginInfo,
-                          const SubpassEndInfo &   subpassEndInfo,
-                          Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                          const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo,
+                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRenderPass2KHR( const SubpassEndInfo * pSubpassEndInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo * pSubpassEndInfo,
+                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRenderPass2KHR( const SubpassEndInfo & subpassEndInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo,
+                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_debug_utils ===
 
-    // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo,
-                                  Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                  Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                  Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdEndDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endDebugUtilsLabelEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo,
-                                   Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                   Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo,
-                                   Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                   Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_AMDX_shader_enqueue ===
 
-    // wrapper function for command vkCmdInitializeGraphScratchMemoryAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInitializeGraphScratchMemoryAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void initializeGraphScratchMemoryAMDX( Pipeline           executionGraph,
-                                           DeviceAddress      scratch,
-                                           DeviceSize         scratchSize,
-                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                           Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchGraphAMDX( DeviceAddress                      scratch,
-                            DeviceSize                         scratchSize,
-                            const DispatchGraphCountInfoAMDX * pCountInfo,
-                            Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                            const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX * pCountInfo,
+                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchGraphAMDX( DeviceAddress                      scratch,
-                            DeviceSize                         scratchSize,
-                            const DispatchGraphCountInfoAMDX & countInfo,
-                            Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                            const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo,
+                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchGraphIndirectAMDX( DeviceAddress                      scratch,
-                                    DeviceSize                         scratchSize,
-                                    const DispatchGraphCountInfoAMDX * pCountInfo,
-                                    Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                    const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX * pCountInfo,
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchGraphIndirectAMDX( DeviceAddress                      scratch,
-                                    DeviceSize                         scratchSize,
-                                    const DispatchGraphCountInfoAMDX & countInfo,
-                                    Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                    const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo,
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDispatchGraphIndirectCountAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectCountAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchGraphIndirectCountAMDX( DeviceAddress      scratch,
-                                         DeviceSize         scratchSize,
-                                         DeviceAddress      countInfo,
-                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void dispatchGraphIndirectCountAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                         VULKAN_HPP_NAMESPACE::DeviceAddress countInfo,
+                                         Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_EXT_sample_locations ===
 
-    // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setSampleLocationsEXT( const SampleLocationsInfoEXT * pSampleLocationsInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT * pSampleLocationsInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setSampleLocationsEXT( const SampleLocationsInfoEXT & sampleLocationsInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT & sampleLocationsInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_acceleration_structure ===
 
-    // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructuresKHR( uint32_t                                               infoCount,
-                                         const AccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                         const AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructuresKHR( uint32_t                                                                     infoCount,
+                                         const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                         const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructuresKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                         ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
-                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructuresKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructuresIndirectKHR( uint32_t                                          infoCount,
-                                                 const AccelerationStructureBuildGeometryInfoKHR * pInfos,
-                                                 const DeviceAddress *                             pIndirectDeviceAddresses,
-                                                 const uint32_t *                                  pIndirectStrides,
-                                                 const uint32_t * const *                          ppMaxPrimitiveCounts,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructuresIndirectKHR( uint32_t                                                                infoCount,
+                                                 const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR * pInfos,
+                                                 const VULKAN_HPP_NAMESPACE::DeviceAddress *                             pIndirectDeviceAddresses,
+                                                 const uint32_t *                                                        pIndirectStrides,
+                                                 const uint32_t * const *                                                ppMaxPrimitiveCounts,
                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructuresIndirectKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const & infos,
-                                                 ArrayProxy<const DeviceAddress> const &                             indirectDeviceAddresses,
-                                                 ArrayProxy<const uint32_t> const &                                  indirectStrides,
-                                                 ArrayProxy<const uint32_t * const> const &                          pMaxPrimitiveCounts,
-                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructuresIndirectKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const &                             indirectDeviceAddresses,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                                                        indirectStrides,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t * const> const &                                                pMaxPrimitiveCounts,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR * pInfo,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR & info,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR & info,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR & info,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeAccelerationStructuresPropertiesKHR( uint32_t                         accelerationStructureCount,
-                                                   const AccelerationStructureKHR * pAccelerationStructures,
-                                                   QueryType                        queryType,
-                                                   QueryPool                        queryPool,
-                                                   uint32_t                         firstQuery,
-                                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeAccelerationStructuresPropertiesKHR( ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures,
-                                                   QueryType                                          queryType,
-                                                   QueryPool                                          queryPool,
-                                                   uint32_t                                           firstQuery,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeAccelerationStructuresPropertiesKHR( uint32_t                                               accelerationStructureCount,
+                                                   const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures,
+                                                   VULKAN_HPP_NAMESPACE::QueryType                        queryType,
+                                                   VULKAN_HPP_NAMESPACE::QueryPool                        queryPool,
+                                                   uint32_t                                               firstQuery,
                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeAccelerationStructuresPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      VULKAN_HPP_NAMESPACE::QueryPool                                                                queryPool,
+      uint32_t                                                                                       firstQuery,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_ray_tracing_pipeline ===
 
-    // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysKHR( const StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                       uint32_t                              width,
-                       uint32_t                              height,
-                       uint32_t                              depth,
-                       Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                       uint32_t                                                    width,
+                       uint32_t                                                    height,
+                       uint32_t                                                    depth,
+                       Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                       const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                       uint32_t                              width,
-                       uint32_t                              height,
-                       uint32_t                              depth,
-                       Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                       const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                       uint32_t                                                    width,
+                       uint32_t                                                    height,
+                       uint32_t                                                    depth,
+                       Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
-                               DeviceAddress                         indirectDeviceAddress,
-                               Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pRaygenShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pMissShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pHitShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR * pCallableShaderBindingTable,
+                               VULKAN_HPP_NAMESPACE::DeviceAddress                         indirectDeviceAddress,
+                               Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                               const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                               DeviceAddress                         indirectDeviceAddress,
-                               Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                               const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                               VULKAN_HPP_NAMESPACE::DeviceAddress                         indirectDeviceAddress,
+                               Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetRayTracingPipelineStackSizeKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRayTracingPipelineStackSizeKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setRayTracingPipelineStackSizeKHR( uint32_t pipelineStackSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_shading_rate_image ===
 
-    // wrapper function for command vkCmdBindShadingRateImageNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadingRateImageNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindShadingRateImageNV( ImageView          imageView,
-                                 ImageLayout        imageLayout,
-                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                 VULKAN_HPP_NAMESPACE::ImageLayout imageLayout,
+                                 Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportShadingRatePaletteNV( uint32_t                     firstViewport,
-                                          uint32_t                     viewportCount,
-                                          const ShadingRatePaletteNV * pShadingRatePalettes,
-                                          Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportShadingRatePaletteNV( uint32_t                                           firstViewport,
+                                          uint32_t                                           viewportCount,
+                                          const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * pShadingRatePalettes,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportShadingRatePaletteNV( uint32_t                                       firstViewport,
-                                          ArrayProxy<const ShadingRatePaletteNV> const & shadingRatePalettes,
-                                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportShadingRatePaletteNV( uint32_t                                                                                   firstViewport,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetCoarseSampleOrderNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoarseSampleOrderNV( CoarseSampleOrderTypeNV           sampleOrderType,
-                                 uint32_t                          customSampleOrderCount,
-                                 const CoarseSampleOrderCustomNV * pCustomSampleOrders,
-                                 Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType,
+                                 uint32_t                                                customSampleOrderCount,
+                                 const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * pCustomSampleOrders,
+                                 Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetCoarseSampleOrderNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoarseSampleOrderNV( CoarseSampleOrderTypeNV                             sampleOrderType,
-                                 ArrayProxy<const CoarseSampleOrderCustomNV> const & customSampleOrders,
-                                 Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV                                                   sampleOrderType,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_ray_tracing ===
 
-    // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructureNV( const AccelerationStructureInfoNV * pInfo,
-                                       Buffer                              instanceData,
-                                       DeviceSize                          instanceOffset,
-                                       Bool32                              update,
-                                       AccelerationStructureNV             dst,
-                                       AccelerationStructureNV             src,
-                                       Buffer                              scratch,
-                                       DeviceSize                          scratchOffset,
-                                       Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV * pInfo,
+                                       VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                       VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                       VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize                          scratchOffset,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildAccelerationStructureNV( const AccelerationStructureInfoNV & info,
-                                       Buffer                              instanceData,
-                                       DeviceSize                          instanceOffset,
-                                       Bool32                              update,
-                                       AccelerationStructureNV             dst,
-                                       AccelerationStructureNV             src,
-                                       Buffer                              scratch,
-                                       DeviceSize                          scratchOffset,
-                                       Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV & info,
+                                       VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                       VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                       VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize                          scratchOffset,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyAccelerationStructureNV( AccelerationStructureNV          dst,
-                                      AccelerationStructureNV          src,
-                                      CopyAccelerationStructureModeKHR mode,
-                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
+                                      VULKAN_HPP_NAMESPACE::AccelerationStructureNV          src,
+                                      VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdTraceRaysNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysNV( Buffer             raygenShaderBindingTableBuffer,
-                      DeviceSize         raygenShaderBindingOffset,
-                      Buffer             missShaderBindingTableBuffer,
-                      DeviceSize         missShaderBindingOffset,
-                      DeviceSize         missShaderBindingStride,
-                      Buffer             hitShaderBindingTableBuffer,
-                      DeviceSize         hitShaderBindingOffset,
-                      DeviceSize         hitShaderBindingStride,
-                      Buffer             callableShaderBindingTableBuffer,
-                      DeviceSize         callableShaderBindingOffset,
-                      DeviceSize         callableShaderBindingStride,
-                      uint32_t           width,
-                      uint32_t           height,
-                      uint32_t           depth,
-                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer     raygenShaderBindingTableBuffer,
+                      VULKAN_HPP_NAMESPACE::DeviceSize raygenShaderBindingOffset,
+                      VULKAN_HPP_NAMESPACE::Buffer     missShaderBindingTableBuffer,
+                      VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingOffset,
+                      VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingStride,
+                      VULKAN_HPP_NAMESPACE::Buffer     hitShaderBindingTableBuffer,
+                      VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingOffset,
+                      VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingStride,
+                      VULKAN_HPP_NAMESPACE::Buffer     callableShaderBindingTableBuffer,
+                      VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingOffset,
+                      VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingStride,
+                      uint32_t                         width,
+                      uint32_t                         height,
+                      uint32_t                         depth,
+                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeAccelerationStructuresPropertiesNV( uint32_t                        accelerationStructureCount,
-                                                  const AccelerationStructureNV * pAccelerationStructures,
-                                                  QueryType                       queryType,
-                                                  QueryPool                       queryPool,
-                                                  uint32_t                        firstQuery,
-                                                  Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeAccelerationStructuresPropertiesNV( ArrayProxy<const AccelerationStructureNV> const & accelerationStructures,
-                                                  QueryType                                         queryType,
-                                                  QueryPool                                         queryPool,
-                                                  uint32_t                                          firstQuery,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeAccelerationStructuresPropertiesNV( uint32_t                                              accelerationStructureCount,
+                                                  const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * pAccelerationStructures,
+                                                  VULKAN_HPP_NAMESPACE::QueryType                       queryType,
+                                                  VULKAN_HPP_NAMESPACE::QueryPool                       queryPool,
+                                                  uint32_t                                              firstQuery,
                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeAccelerationStructuresPropertiesNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                               queryType,
+      VULKAN_HPP_NAMESPACE::QueryPool                                                               queryPool,
+      uint32_t                                                                                      firstQuery,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_draw_indirect_count ===
 
-    // wrapper function for command vkCmdDrawIndirectCountKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndirectCountKHR( Buffer             buffer,
-                               DeviceSize         offset,
-                               Buffer             countBuffer,
-                               DeviceSize         countBufferOffset,
-                               uint32_t           maxDrawCount,
-                               uint32_t           stride,
-                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                               VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                               uint32_t                         maxDrawCount,
+                               uint32_t                         stride,
+                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCountKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawIndexedIndirectCountKHR( Buffer             buffer,
-                                      DeviceSize         offset,
-                                      Buffer             countBuffer,
-                                      DeviceSize         countBufferOffset,
-                                      uint32_t           maxDrawCount,
-                                      uint32_t           stride,
-                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                      VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                      VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                      VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                      uint32_t                         maxDrawCount,
+                                      uint32_t                         stride,
+                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_AMD_buffer_marker ===
 
-    // wrapper function for command vkCmdWriteBufferMarkerAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarkerAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeBufferMarkerAMD( PipelineStageFlagBits pipelineStage,
-                               Buffer                dstBuffer,
-                               DeviceSize            dstOffset,
-                               uint32_t              marker,
-                               Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkCmdWriteBufferMarker2AMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarker2AMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeBufferMarker2AMD( PipelineStageFlags2 stage,
-                                Buffer              dstBuffer,
-                                DeviceSize          dstOffset,
-                                uint32_t            marker,
-                                Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeBufferMarkerAMD( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                               VULKAN_HPP_NAMESPACE::Buffer                dstBuffer,
+                               VULKAN_HPP_NAMESPACE::DeviceSize            dstOffset,
+                               uint32_t                                    marker,
+                               Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_mesh_shader ===
 
-    // wrapper function for command vkCmdDrawMeshTasksNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void drawMeshTasksNV( uint32_t taskCount, uint32_t firstTask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMeshTasksIndirectNV( Buffer             buffer,
-                                  DeviceSize         offset,
-                                  uint32_t           drawCount,
-                                  uint32_t           stride,
-                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                  VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                  uint32_t                         drawCount,
+                                  uint32_t                         stride,
+                                  Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectCountNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMeshTasksIndirectCountNV( Buffer             buffer,
-                                       DeviceSize         offset,
-                                       Buffer             countBuffer,
-                                       DeviceSize         countBufferOffset,
-                                       uint32_t           maxDrawCount,
-                                       uint32_t           stride,
-                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                       VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                       uint32_t                         maxDrawCount,
+                                       uint32_t                         stride,
+                                       Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_scissor_exclusive ===
 
-    // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setExclusiveScissorEnableNV( uint32_t           firstExclusiveScissor,
-                                      uint32_t           exclusiveScissorCount,
-                                      const Bool32 *     pExclusiveScissorEnables,
-                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setExclusiveScissorEnableNV( uint32_t                             firstExclusiveScissor,
+                                      uint32_t                             exclusiveScissorCount,
+                                      const VULKAN_HPP_NAMESPACE::Bool32 * pExclusiveScissorEnables,
+                                      Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setExclusiveScissorEnableNV( uint32_t                         firstExclusiveScissor,
-                                      ArrayProxy<const Bool32> const & exclusiveScissorEnables,
-                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setExclusiveScissorEnableNV( uint32_t                                                                     firstExclusiveScissor,
+                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & exclusiveScissorEnables,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setExclusiveScissorNV( uint32_t           firstExclusiveScissor,
-                                uint32_t           exclusiveScissorCount,
-                                const Rect2D *     pExclusiveScissors,
-                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setExclusiveScissorNV( uint32_t                             firstExclusiveScissor,
+                                uint32_t                             exclusiveScissorCount,
+                                const VULKAN_HPP_NAMESPACE::Rect2D * pExclusiveScissors,
+                                Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setExclusiveScissorNV( uint32_t                         firstExclusiveScissor,
-                                ArrayProxy<const Rect2D> const & exclusiveScissors,
-                                Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setExclusiveScissorNV( uint32_t                                                                     firstExclusiveScissor,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_device_diagnostic_checkpoints ===
 
-    // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCheckpointNV( const void * pCheckpointMarker, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
-    template <typename CheckpointMarkerType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename CheckpointMarkerType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCheckpointNV( CheckpointMarkerType const & checkpointMarker,
                           Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_INTEL_performance_query ===
 
-    // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL * pMarkerInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL * pMarkerInfo,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL & markerInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL & markerInfo,
+                                 Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL * pMarkerInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL * pMarkerInfo,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL & markerInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL & markerInfo,
+                                       Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL * pOverrideInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL * pOverrideInfo,
                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL & overrideInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL & overrideInfo,
+                                   Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_fragment_shading_rate ===
 
-    // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setFragmentShadingRateKHR( const Extent2D *                       pFragmentSize,
-                                    const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                    Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D *                       pFragmentSize,
+                                    const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setFragmentShadingRateKHR( const Extent2D &                       fragmentSize,
-                                    const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                    Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D &                       fragmentSize,
+                                    const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_dynamic_rendering_local_read ===
 
-    // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo * pLocationInfo,
-                                             Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRenderingAttachmentLocationsKHR( const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR * pLocationInfo,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo & locationInfo,
-                                             Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRenderingAttachmentLocationsKHR( const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR & locationInfo,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo * pInputAttachmentIndexInfo,
-                                                Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRenderingInputAttachmentIndicesKHR( const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR * pLocationInfo,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo,
-                                                Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRenderingInputAttachmentIndicesKHR( const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR & locationInfo,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_line_rasterization ===
 
-    // wrapper function for command vkCmdSetLineStippleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setLineStippleEXT( uint32_t           lineStippleFactor,
                             uint16_t           lineStipplePattern,
                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_extended_dynamic_state ===
 
-    // wrapper function for command vkCmdSetCullModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCullModeEXT( CullModeFlags cullMode, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCullModeEXT( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetFrontFaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setFrontFaceEXT( FrontFace frontFace, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setFrontFaceEXT( VULKAN_HPP_NAMESPACE::FrontFace frontFace, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetPrimitiveTopologyEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopologyEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setPrimitiveTopologyEXT( PrimitiveTopology primitiveTopology, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setPrimitiveTopologyEXT( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology,
+                                  Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetViewportWithCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWithCountEXT( uint32_t           viewportCount,
-                                  const Viewport *   pViewports,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWithCountEXT( uint32_t                               viewportCount,
+                                  const VULKAN_HPP_NAMESPACE::Viewport * pViewports,
+                                  Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports,
                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewportWithCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWithCountEXT( ArrayProxy<const Viewport> const & viewports,
-                                  Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetScissorWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissorWithCountEXT( uint32_t           scissorCount,
-                                 const Rect2D *     pScissors,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissorWithCountEXT( uint32_t                             scissorCount,
+                                 const VULKAN_HPP_NAMESPACE::Rect2D * pScissors,
+                                 Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setScissorWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors,
                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetScissorWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setScissorWithCountEXT( ArrayProxy<const Rect2D> const & scissors,
-                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers2EXT( uint32_t           firstBinding,
-                                uint32_t           bindingCount,
-                                const Buffer *     pBuffers,
-                                const DeviceSize * pOffsets,
-                                const DeviceSize * pSizes,
-                                const DeviceSize * pStrides,
-                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers2EXT( uint32_t                                 firstBinding,
+                                uint32_t                                 bindingCount,
+                                const VULKAN_HPP_NAMESPACE::Buffer *     pBuffers,
+                                const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                const VULKAN_HPP_NAMESPACE::DeviceSize * pSizes,
+                                const VULKAN_HPP_NAMESPACE::DeviceSize * pStrides,
+                                Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindVertexBuffers2EXT( uint32_t                                     firstBinding,
-                                ArrayProxy<const Buffer> const &             buffers,
-                                ArrayProxy<const DeviceSize> const &         offsets,
-                                ArrayProxy<const DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                ArrayProxy<const DeviceSize> const & strides VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindVertexBuffers2EXT(
+      uint32_t                                                                                 firstBinding,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &             buffers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const &         offsets,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetDepthTestEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthTestEnableEXT( Bool32 depthTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable,
+                                Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthWriteEnableEXT( Bool32 depthWriteEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthWriteEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable,
+                                 Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthCompareOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOpEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthCompareOpEXT( CompareOp depthCompareOp, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthCompareOpEXT( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp,
+                               Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBoundsTestEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBoundsTestEnableEXT( Bool32 depthBoundsTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBoundsTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable,
+                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilTestEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilTestEnableEXT( Bool32 stencilTestEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable,
+                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetStencilOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOpEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setStencilOpEXT( StencilFaceFlags   faceMask,
-                          StencilOp          failOp,
-                          StencilOp          passOp,
-                          StencilOp          depthFailOp,
-                          CompareOp          compareOp,
-                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setStencilOpEXT( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                          VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                          VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                          VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                          VULKAN_HPP_NAMESPACE::CompareOp        compareOp,
+                          Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_device_generated_commands ===
 
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
-                                        Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV & generatedCommandsInfo,
-                                        Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeGeneratedCommandsNV( Bool32                          isPreprocessed,
-                                     const GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
-                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                     const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV * pGeneratedCommandsInfo,
+                                     Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeGeneratedCommandsNV( Bool32                          isPreprocessed,
-                                     const GeneratedCommandsInfoNV & generatedCommandsInfo,
-                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                     const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo,
+                                     Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBindPipelineShaderGroupNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipelineShaderGroupNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindPipelineShaderGroupNV( PipelineBindPoint  pipelineBindPoint,
-                                    Pipeline           pipeline,
-                                    uint32_t           groupIndex,
-                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                    VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                    uint32_t                                groupIndex,
+                                    Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_depth_bias_control ===
 
-    // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBias2EXT( const DepthBiasInfoEXT * pDepthBiasInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT * pDepthBiasInfo,
+                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBias2EXT( const DepthBiasInfoEXT & depthBiasInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT & depthBiasInfo,
+                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_encode_queue ===
 
-    // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void encodeVideoKHR( const VideoEncodeInfoKHR * pEncodeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR * pEncodeInfo,
+                         Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void encodeVideoKHR( const VideoEncodeInfoKHR & encodeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR & encodeInfo,
+                         Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_NV_cuda_kernel_launch ===
 
-    // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void cudaLaunchKernelNV( const CudaLaunchInfoNV * pLaunchInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV * pLaunchInfo,
+                             Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void cudaLaunchKernelNV( const CudaLaunchInfoNV & launchInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV & launchInfo,
+                             Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
-    //=== VK_QCOM_tile_shading ===
-
-    // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchTileQCOM( const DispatchTileInfoQCOM * pDispatchTileInfo,
-                           Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchTileQCOM( const DispatchTileInfoQCOM & dispatchTileInfo,
-                           Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM * pPerTileBeginInfo,
-                                    Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM & perTileBeginInfo,
-                                    Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdEndPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endPerTileExecutionQCOM( const PerTileEndInfoQCOM * pPerTileEndInfo,
-                                  Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endPerTileExecutionQCOM( const PerTileEndInfoQCOM & perTileEndInfo,
-                                  Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     //=== VK_KHR_synchronization2 ===
 
-    // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setEvent2KHR( Event                  event,
-                       const DependencyInfo * pDependencyInfo,
-                       Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setEvent2KHR( VULKAN_HPP_NAMESPACE::Event                  event,
+                       const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                       Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      setEvent2KHR( Event event, const DependencyInfo & dependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setEvent2KHR( VULKAN_HPP_NAMESPACE::Event                  event,
+                       const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                       Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdResetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetEvent2KHR( Event event, PipelineStageFlags2 stageMask, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event               event,
+                         VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask,
+                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents2KHR( uint32_t               eventCount,
-                         const Event *          pEvents,
-                         const DependencyInfo * pDependencyInfos,
-                         Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents2KHR( uint32_t                                     eventCount,
+                         const VULKAN_HPP_NAMESPACE::Event *          pEvents,
+                         const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfos,
+                         Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void waitEvents2KHR( ArrayProxy<const Event> const &          events,
-                         ArrayProxy<const DependencyInfo> const & dependencyInfos,
-                         Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void waitEvents2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos,
+                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier2KHR( const DependencyInfo * pDependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo * pDependencyInfo,
+                              Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pipelineBarrier2KHR( const DependencyInfo & dependencyInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo,
+                              Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdWriteTimestamp2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeTimestamp2KHR( PipelineStageFlags2 stage,
-                             QueryPool           queryPool,
-                             uint32_t            query,
-                             Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                             VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                             uint32_t                                  query,
+                             Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeBufferMarker2AMD( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
+                                VULKAN_HPP_NAMESPACE::DeviceSize          dstOffset,
+                                uint32_t                                  marker,
+                                Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_descriptor_buffer ===
 
-    // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorBuffersEXT( uint32_t                               bufferCount,
-                                   const DescriptorBufferBindingInfoEXT * pBindingInfos,
-                                   Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorBuffersEXT( uint32_t                                                     bufferCount,
+                                   const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT * pBindingInfos,
+                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorBuffersEXT( ArrayProxy<const DescriptorBufferBindingInfoEXT> const & bindingInfos,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorBuffersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT> const & bindingInfos,
                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDescriptorBufferOffsetsEXT( PipelineBindPoint  pipelineBindPoint,
-                                        PipelineLayout     layout,
-                                        uint32_t           firstSet,
-                                        uint32_t           setCount,
-                                        const uint32_t *   pBufferIndices,
-                                        const DeviceSize * pOffsets,
-                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint  pipelineBindPoint,
+                                        VULKAN_HPP_NAMESPACE::PipelineLayout     layout,
+                                        uint32_t                                 firstSet,
+                                        uint32_t                                 setCount,
+                                        const uint32_t *                         pBufferIndices,
+                                        const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets,
+                                        Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDescriptorBufferOffsetsEXT( PipelineBindPoint                    pipelineBindPoint,
-                                        PipelineLayout                       layout,
-                                        uint32_t                             firstSet,
-                                        ArrayProxy<const uint32_t> const &   bufferIndices,
-                                        ArrayProxy<const DeviceSize> const & offsets,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                          pipelineBindPoint,
+                                        VULKAN_HPP_NAMESPACE::PipelineLayout                                             layout,
+                                        uint32_t                                                                         firstSet,
+                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                         bufferIndices,
+                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorBufferEmbeddedSamplersEXT( PipelineBindPoint  pipelineBindPoint,
-                                                  PipelineLayout     layout,
-                                                  uint32_t           set,
-                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                  VULKAN_HPP_NAMESPACE::PipelineLayout    layout,
+                                                  uint32_t                                set,
+                                                  Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_fragment_shading_rate_enums ===
 
-    // wrapper function for command vkCmdSetFragmentShadingRateEnumNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateEnumNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setFragmentShadingRateEnumNV( FragmentShadingRateNV                  shadingRate,
-                                       const FragmentShadingRateCombinerOpKHR combinerOps[2],
-                                       Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setFragmentShadingRateEnumNV( VULKAN_HPP_NAMESPACE::FragmentShadingRateNV                  shadingRate,
+                                       const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2],
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_mesh_shader ===
 
-    // wrapper function for command vkCmdDrawMeshTasksEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void drawMeshTasksEXT( uint32_t           groupCountX,
                            uint32_t           groupCountY,
                            uint32_t           groupCountZ,
                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMeshTasksIndirectEXT( Buffer             buffer,
-                                   DeviceSize         offset,
-                                   uint32_t           drawCount,
-                                   uint32_t           stride,
-                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                   VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                   uint32_t                         drawCount,
+                                   uint32_t                         stride,
+                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMeshTasksIndirectCountEXT( Buffer             buffer,
-                                        DeviceSize         offset,
-                                        Buffer             countBuffer,
-                                        DeviceSize         countBufferOffset,
-                                        uint32_t           maxDrawCount,
-                                        uint32_t           stride,
-                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                        VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                        uint32_t                         maxDrawCount,
+                                        uint32_t                         stride,
+                                        Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_copy_commands2 ===
 
-    // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer2KHR( const CopyBufferInfo2 * pCopyBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 * pCopyBufferInfo,
+                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBuffer2KHR( const CopyBufferInfo2 & copyBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo,
+                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage2KHR( const CopyImageInfo2 * pCopyImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 * pCopyImageInfo,
+                        Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImage2KHR( const CopyImageInfo2 & copyImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo,
+                        Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage2KHR( const CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 * pCopyBufferToImageInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyBufferToImage2KHR( const CopyBufferToImageInfo2 & copyBufferToImageInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer2KHR( const CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 * pCopyImageToBufferInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyImageToBuffer2KHR( const CopyImageToBufferInfo2 & copyImageToBufferInfo,
-                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo,
+                                Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage2KHR( const BlitImageInfo2 * pBlitImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 * pBlitImageInfo,
+                        Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void blitImage2KHR( const BlitImageInfo2 & blitImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo,
+                        Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage2KHR( const ResolveImageInfo2 * pResolveImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 * pResolveImageInfo,
+                           Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resolveImage2KHR( const ResolveImageInfo2 & resolveImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo,
+                           Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_vertex_input_dynamic_state ===
 
-    // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setVertexInputEXT( uint32_t                                    vertexBindingDescriptionCount,
-                            const VertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
-                            uint32_t                                    vertexAttributeDescriptionCount,
-                            const VertexInputAttributeDescription2EXT * pVertexAttributeDescriptions,
-                            Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setVertexInputEXT( uint32_t                                                          vertexBindingDescriptionCount,
+                            const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT *   pVertexBindingDescriptions,
+                            uint32_t                                                          vertexAttributeDescriptionCount,
+                            const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT * pVertexAttributeDescriptions,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setVertexInputEXT( ArrayProxy<const VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
-                            ArrayProxy<const VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions,
-                            Dispatch const & d                                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void
+      setVertexInputEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
+                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions,
+                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_HUAWEI_subpass_shading ===
 
-    // wrapper function for command vkCmdSubpassShadingHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSubpassShadingHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void subpassShadingHUAWEI( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_HUAWEI_invocation_mask ===
 
-    // wrapper function for command vkCmdBindInvocationMaskHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindInvocationMaskHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindInvocationMaskHUAWEI( ImageView          imageView,
-                                   ImageLayout        imageLayout,
-                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                   VULKAN_HPP_NAMESPACE::ImageLayout imageLayout,
+                                   Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_extended_dynamic_state2 ===
 
-    // wrapper function for command vkCmdSetPatchControlPointsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPatchControlPointsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setPatchControlPointsEXT( uint32_t patchControlPoints, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetRasterizerDiscardEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRasterizerDiscardEnableEXT( Bool32 rasterizerDiscardEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRasterizerDiscardEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable,
+                                        Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthBiasEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthBiasEnableEXT( Bool32 depthBiasEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthBiasEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable,
+                                Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetLogicOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLogicOpEXT( LogicOp logicOp, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLogicOpEXT( VULKAN_HPP_NAMESPACE::LogicOp logicOp, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetPrimitiveRestartEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setPrimitiveRestartEnableEXT( Bool32 primitiveRestartEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setPrimitiveRestartEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable,
+                                       Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_color_write_enable ===
 
-    // wrapper function for command vkCmdSetColorWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorWriteEnableEXT( uint32_t           attachmentCount,
-                                 const Bool32 *     pColorWriteEnables,
-                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorWriteEnableEXT( uint32_t                             attachmentCount,
+                                 const VULKAN_HPP_NAMESPACE::Bool32 * pColorWriteEnables,
+                                 Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetColorWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorWriteEnableEXT( ArrayProxy<const Bool32> const & colorWriteEnables,
-                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorWriteEnableEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_ray_tracing_maintenance1 ===
 
-    // wrapper function for command vkCmdTraceRaysIndirect2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirect2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void traceRaysIndirect2KHR( DeviceAddress indirectDeviceAddress, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void traceRaysIndirect2KHR( VULKAN_HPP_NAMESPACE::DeviceAddress indirectDeviceAddress,
+                                Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_multi_draw ===
 
-    // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMultiEXT( uint32_t                 drawCount,
-                       const MultiDrawInfoEXT * pVertexInfo,
-                       uint32_t                 instanceCount,
-                       uint32_t                 firstInstance,
-                       uint32_t                 stride,
-                       Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMultiEXT( uint32_t                                       drawCount,
+                       const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT * pVertexInfo,
+                       uint32_t                                       instanceCount,
+                       uint32_t                                       firstInstance,
+                       uint32_t                                       stride,
+                       Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMultiEXT( StridedArrayProxy<const MultiDrawInfoEXT> const & vertexInfo,
-                       uint32_t                                          instanceCount,
-                       uint32_t                                          firstInstance,
-                       Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMultiEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT> const & vertexInfo,
+                       uint32_t                                                                                      instanceCount,
+                       uint32_t                                                                                      firstInstance,
+                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMultiIndexedEXT( uint32_t                        drawCount,
-                              const MultiDrawIndexedInfoEXT * pIndexInfo,
-                              uint32_t                        instanceCount,
-                              uint32_t                        firstInstance,
-                              uint32_t                        stride,
-                              const int32_t *                 pVertexOffset,
-                              Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMultiIndexedEXT( uint32_t                                              drawCount,
+                              const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT * pIndexInfo,
+                              uint32_t                                              instanceCount,
+                              uint32_t                                              firstInstance,
+                              uint32_t                                              stride,
+                              const int32_t *                                       pVertexOffset,
+                              Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawMultiIndexedEXT( StridedArrayProxy<const MultiDrawIndexedInfoEXT> const & indexInfo,
-                              uint32_t                                                 instanceCount,
-                              uint32_t                                                 firstInstance,
-                              Optional<const int32_t> vertexOffset                     VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawMultiIndexedEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT> const & indexInfo,
+                              uint32_t                                                                                             instanceCount,
+                              uint32_t                                                                                             firstInstance,
+                              Optional<const int32_t> vertexOffset VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_opacity_micromap ===
 
-    // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildMicromapsEXT( uint32_t                     infoCount,
-                            const MicromapBuildInfoEXT * pInfos,
-                            Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildMicromapsEXT( uint32_t                                           infoCount,
+                            const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT * pInfos,
+                            Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildMicromapsEXT( ArrayProxy<const MicromapBuildInfoEXT> const & infos,
-                            Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void buildMicromapsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMicromapEXT( const CopyMicromapInfoEXT * pInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMicromapEXT( const CopyMicromapInfoEXT & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT * pInfo,
-                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT & info,
-                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT * pInfo,
-                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT & info,
-                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeMicromapsPropertiesEXT( uint32_t            micromapCount,
-                                      const MicromapEXT * pMicromaps,
-                                      QueryType           queryType,
-                                      QueryPool           queryPool,
-                                      uint32_t            firstQuery,
-                                      Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
+                                      const VULKAN_HPP_NAMESPACE::MicromapEXT * pMicromaps,
+                                      VULKAN_HPP_NAMESPACE::QueryType           queryType,
+                                      VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                      uint32_t                                  firstQuery,
+                                      Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void writeMicromapsPropertiesEXT( ArrayProxy<const MicromapEXT> const & micromaps,
-                                      QueryType                             queryType,
-                                      QueryPool                             queryPool,
-                                      uint32_t                              firstQuery,
-                                      Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                      VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                      VULKAN_HPP_NAMESPACE::QueryPool                                                   queryPool,
+                                      uint32_t                                                                          firstQuery,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_HUAWEI_cluster_culling_shader ===
 
-    // wrapper function for command vkCmdDrawClusterHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void drawClusterHUAWEI( uint32_t           groupCountX,
                             uint32_t           groupCountY,
                             uint32_t           groupCountZ,
                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdDrawClusterIndirectHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterIndirectHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void drawClusterIndirectHUAWEI( Buffer buffer, DeviceSize offset, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                    VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                    Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_copy_memory_indirect ===
 
-    // wrapper function for command vkCmdCopyMemoryIndirectNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryIndirectNV( DeviceAddress      copyBufferAddress,
-                               uint32_t           copyCount,
-                               uint32_t           stride,
-                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress copyBufferAddress,
+                               uint32_t                            copyCount,
+                               uint32_t                            stride,
+                               Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToImageIndirectNV( DeviceAddress                  copyBufferAddress,
-                                      uint32_t                       copyCount,
-                                      uint32_t                       stride,
-                                      Image                          dstImage,
-                                      ImageLayout                    dstImageLayout,
-                                      const ImageSubresourceLayers * pImageSubresources,
-                                      Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToImageIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress                  copyBufferAddress,
+                                      uint32_t                                             copyCount,
+                                      uint32_t                                             stride,
+                                      VULKAN_HPP_NAMESPACE::Image                          dstImage,
+                                      VULKAN_HPP_NAMESPACE::ImageLayout                    dstImageLayout,
+                                      const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers * pImageSubresources,
+                                      Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToImageIndirectNV( DeviceAddress                                    copyBufferAddress,
-                                      uint32_t                                         stride,
-                                      Image                                            dstImage,
-                                      ImageLayout                                      dstImageLayout,
-                                      ArrayProxy<const ImageSubresourceLayers> const & imageSubresources,
-                                      Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void copyMemoryToImageIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress                                                          copyBufferAddress,
+                                      uint32_t                                                                                     stride,
+                                      VULKAN_HPP_NAMESPACE::Image                                                                  dstImage,
+                                      VULKAN_HPP_NAMESPACE::ImageLayout                                                            dstImageLayout,
+                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers> const & imageSubresources,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_memory_decompression ===
 
-    // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryNV( uint32_t                         decompressRegionCount,
-                             const DecompressMemoryRegionNV * pDecompressMemoryRegions,
-                             Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void decompressMemoryNV( uint32_t                                               decompressRegionCount,
+                             const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV * pDecompressMemoryRegions,
+                             Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryNV( ArrayProxy<const DecompressMemoryRegionNV> const & decompressMemoryRegions,
-                             Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void decompressMemoryNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV> const & decompressMemoryRegions,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdDecompressMemoryIndirectCountNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryIndirectCountNV( DeviceAddress      indirectCommandsAddress,
-                                          DeviceAddress      indirectCommandsCountAddress,
-                                          uint32_t           stride,
-                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
+                                          VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsCountAddress,
+                                          uint32_t                            stride,
+                                          Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_device_generated_commands_compute ===
 
-    // wrapper function for command vkCmdUpdatePipelineIndirectBufferNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdatePipelineIndirectBufferNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updatePipelineIndirectBufferNV( PipelineBindPoint  pipelineBindPoint,
-                                         Pipeline           pipeline,
-                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                         VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                         Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_extended_dynamic_state3 ===
 
-    // wrapper function for command vkCmdSetDepthClampEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthClampEnableEXT( Bool32 depthClampEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthClampEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClampEnable,
+                                 Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetPolygonModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPolygonModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setPolygonModeEXT( PolygonMode polygonMode, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setPolygonModeEXT( VULKAN_HPP_NAMESPACE::PolygonMode polygonMode,
+                            Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetRasterizationSamplesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationSamplesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRasterizationSamplesEXT( SampleCountFlagBits rasterizationSamples,
-                                     Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRasterizationSamplesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples,
+                                     Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setSampleMaskEXT( SampleCountFlagBits samples,
-                           const SampleMask *  pSampleMask,
-                           Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                           const VULKAN_HPP_NAMESPACE::SampleMask *  pSampleMask,
+                           Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setSampleMaskEXT( SampleCountFlagBits                             samples,
-                           ArrayProxy<const SampleMask> const & sampleMask VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits                                        samples,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SampleMask> const & sampleMask,
                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetAlphaToCoverageEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToCoverageEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setAlphaToCoverageEnableEXT( Bool32 alphaToCoverageEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable,
+                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetAlphaToOneEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToOneEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setAlphaToOneEnableEXT( Bool32 alphaToOneEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setAlphaToOneEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToOneEnable,
+                                 Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetLogicOpEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLogicOpEnableEXT( Bool32 logicOpEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLogicOpEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 logicOpEnable,
+                              Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetColorBlendEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendEnableEXT( uint32_t           firstAttachment,
-                                 uint32_t           attachmentCount,
-                                 const Bool32 *     pColorBlendEnables,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendEnableEXT( uint32_t                             firstAttachment,
+                                 uint32_t                             attachmentCount,
+                                 const VULKAN_HPP_NAMESPACE::Bool32 * pColorBlendEnables,
+                                 Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendEnableEXT( uint32_t                                                                     firstAttachment,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorBlendEnables,
                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetColorBlendEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendEnableEXT( uint32_t                         firstAttachment,
-                                 ArrayProxy<const Bool32> const & colorBlendEnables,
-                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendEquationEXT( uint32_t                      firstAttachment,
-                                   uint32_t                      attachmentCount,
-                                   const ColorBlendEquationEXT * pColorBlendEquations,
-                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendEquationEXT( uint32_t                                            firstAttachment,
+                                   uint32_t                                            attachmentCount,
+                                   const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT * pColorBlendEquations,
+                                   Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendEquationEXT( uint32_t                                        firstAttachment,
-                                   ArrayProxy<const ColorBlendEquationEXT> const & colorBlendEquations,
-                                   Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendEquationEXT( uint32_t                                                                                    firstAttachment,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT> const & colorBlendEquations,
+                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorWriteMaskEXT( uint32_t                    firstAttachment,
-                               uint32_t                    attachmentCount,
-                               const ColorComponentFlags * pColorWriteMasks,
-                               Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorWriteMaskEXT( uint32_t                                          firstAttachment,
+                               uint32_t                                          attachmentCount,
+                               const VULKAN_HPP_NAMESPACE::ColorComponentFlags * pColorWriteMasks,
+                               Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorWriteMaskEXT( uint32_t                                      firstAttachment,
-                               ArrayProxy<const ColorComponentFlags> const & colorWriteMasks,
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorWriteMaskEXT( uint32_t                                                                                  firstAttachment,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorComponentFlags> const & colorWriteMasks,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetTessellationDomainOriginEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetTessellationDomainOriginEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setTessellationDomainOriginEXT( TessellationDomainOrigin domainOrigin,
-                                         Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setTessellationDomainOriginEXT( VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin,
+                                         Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetRasterizationStreamEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationStreamEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setRasterizationStreamEXT( uint32_t rasterizationStream, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetConservativeRasterizationModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetConservativeRasterizationModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setConservativeRasterizationModeEXT( ConservativeRasterizationModeEXT conservativeRasterizationMode,
-                                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setConservativeRasterizationModeEXT( VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetExtraPrimitiveOverestimationSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExtraPrimitiveOverestimationSizeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setExtraPrimitiveOverestimationSizeEXT( float              extraPrimitiveOverestimationSize,
                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthClipEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthClipEnableEXT( Bool32 depthClipEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthClipEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable,
+                                Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetSampleLocationsEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setSampleLocationsEnableEXT( Bool32 sampleLocationsEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setSampleLocationsEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 sampleLocationsEnable,
+                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendAdvancedEXT( uint32_t                      firstAttachment,
-                                   uint32_t                      attachmentCount,
-                                   const ColorBlendAdvancedEXT * pColorBlendAdvanced,
-                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendAdvancedEXT( uint32_t                                            firstAttachment,
+                                   uint32_t                                            attachmentCount,
+                                   const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT * pColorBlendAdvanced,
+                                   Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setColorBlendAdvancedEXT( uint32_t                                        firstAttachment,
-                                   ArrayProxy<const ColorBlendAdvancedEXT> const & colorBlendAdvanced,
-                                   Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setColorBlendAdvancedEXT( uint32_t                                                                                    firstAttachment,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT> const & colorBlendAdvanced,
+                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetProvokingVertexModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetProvokingVertexModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setProvokingVertexModeEXT( ProvokingVertexModeEXT provokingVertexMode,
-                                    Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode,
+                                    Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetLineRasterizationModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineRasterizationModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLineRasterizationModeEXT( LineRasterizationModeEXT lineRasterizationMode,
-                                      Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLineRasterizationModeEXT( VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT lineRasterizationMode,
+                                      Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetLineStippleEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLineStippleEnableEXT( Bool32 stippledLineEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLineStippleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stippledLineEnable,
+                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetDepthClipNegativeOneToOneEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipNegativeOneToOneEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthClipNegativeOneToOneEXT( Bool32 negativeOneToOne, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDepthClipNegativeOneToOneEXT( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne,
+                                          Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetViewportWScalingEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportWScalingEnableNV( Bool32 viewportWScalingEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportWScalingEnableNV( VULKAN_HPP_NAMESPACE::Bool32 viewportWScalingEnable,
+                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportSwizzleNV( uint32_t                  firstViewport,
-                               uint32_t                  viewportCount,
-                               const ViewportSwizzleNV * pViewportSwizzles,
-                               Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportSwizzleNV( uint32_t                                        firstViewport,
+                               uint32_t                                        viewportCount,
+                               const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV * pViewportSwizzles,
+                               Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setViewportSwizzleNV( uint32_t                                    firstViewport,
-                               ArrayProxy<const ViewportSwizzleNV> const & viewportSwizzles,
-                               Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setViewportSwizzleNV( uint32_t                                                                                firstViewport,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetCoverageToColorEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoverageToColorEnableNV( Bool32 coverageToColorEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable,
+                                     Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCoverageToColorLocationNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorLocationNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCoverageToColorLocationNV( uint32_t           coverageToColorLocation,
                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCoverageModulationModeNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationModeNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoverageModulationModeNV( CoverageModulationModeNV coverageModulationMode,
-                                      Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoverageModulationModeNV( VULKAN_HPP_NAMESPACE::CoverageModulationModeNV coverageModulationMode,
+                                      Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCoverageModulationTableEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoverageModulationTableEnableNV( Bool32             coverageModulationTableEnable,
-                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoverageModulationTableEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageModulationTableEnable,
+                                             Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setCoverageModulationTableNV( uint32_t           coverageModulationTableCount,
                                        const float *      pCoverageModulationTable,
                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoverageModulationTableNV( ArrayProxy<const float> const & coverageModulationTable,
-                                       Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoverageModulationTableNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const float> const & coverageModulationTable,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetShadingRateImageEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetShadingRateImageEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setShadingRateImageEnableNV( Bool32 shadingRateImageEnable, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable,
+                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetRepresentativeFragmentTestEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRepresentativeFragmentTestEnableNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setRepresentativeFragmentTestEnableNV( Bool32             representativeFragmentTestEnable,
-                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setRepresentativeFragmentTestEnableNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable,
+                                                Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkCmdSetCoverageReductionModeNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageReductionModeNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setCoverageReductionModeNV( CoverageReductionModeNV coverageReductionMode,
-                                     Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    //=== VK_ARM_tensors ===
-
-    // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyTensorARM( const CopyTensorInfoARM * pCopyTensorInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyTensorARM( const CopyTensorInfoARM & copyTensorInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setCoverageReductionModeNV( VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode,
+                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_NV_optical_flow ===
 
-    // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void opticalFlowExecuteNV( OpticalFlowSessionNV             session,
-                               const OpticalFlowExecuteInfoNV * pExecuteInfo,
-                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                               const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV * pExecuteInfo,
+                               Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void opticalFlowExecuteNV( OpticalFlowSessionNV             session,
-                               const OpticalFlowExecuteInfoNV & executeInfo,
-                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                               const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV & executeInfo,
+                               Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_maintenance5 ===
 
-    // wrapper function for command vkCmdBindIndexBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindIndexBuffer2KHR( Buffer             buffer,
-                              DeviceSize         offset,
-                              DeviceSize         size,
-                              IndexType          indexType,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                              VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                              VULKAN_HPP_NAMESPACE::DeviceSize size,
+                              VULKAN_HPP_NAMESPACE::IndexType  indexType,
+                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_shader_object ===
 
-    // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindShadersEXT( uint32_t                    stageCount,
-                         const ShaderStageFlagBits * pStages,
-                         const ShaderEXT *           pShaders,
-                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindShadersEXT( uint32_t                                          stageCount,
+                         const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits * pStages,
+                         const VULKAN_HPP_NAMESPACE::ShaderEXT *           pShaders,
+                         Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindShadersEXT( ArrayProxy<const ShaderStageFlagBits> const & stages,
-                         ArrayProxy<const ShaderEXT> const &           shaders,
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthClampRangeEXT( DepthClampModeEXT          depthClampMode,
-                                const DepthClampRangeEXT * pDepthClampRange,
-                                Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDepthClampRangeEXT( DepthClampModeEXT                                  depthClampMode,
-                                Optional<const DepthClampRangeEXT> depthClampRange VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_cooperative_vector ===
-
-    // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void convertCooperativeVectorMatrixNV( uint32_t                                     infoCount,
-                                           const ConvertCooperativeVectorMatrixInfoNV * pInfos,
-                                           Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void convertCooperativeVectorMatrixNV( ArrayProxy<const ConvertCooperativeVectorMatrixInfoNV> const & infos,
-                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_ARM_data_graph ===
-
-    // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchDataGraphARM( DataGraphPipelineSessionARM              session,
-                               const DataGraphPipelineDispatchInfoARM * pInfo,
-                               Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void dispatchDataGraphARM( DataGraphPipelineSessionARM                           session,
-                               Optional<const DataGraphPipelineDispatchInfoARM> info VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits> const & stages,
+                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const &           shaders,
+                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
 
-    // wrapper function for command vkCmdSetAttachmentFeedbackLoopEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAttachmentFeedbackLoopEnableEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setAttachmentFeedbackLoopEnableEXT( ImageAspectFlags   aspectMask,
-                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setAttachmentFeedbackLoopEnableEXT( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask,
+                                             Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_line_rasterization ===
 
-    // wrapper function for command vkCmdSetLineStippleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void setLineStippleKHR( uint32_t           lineStippleFactor,
                             uint16_t           lineStipplePattern,
                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_maintenance6 ===
 
-    // wrapper function for command vkCmdBindDescriptorSets2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets2KHR( const BindDescriptorSetsInfo * pBindDescriptorSetsInfo,
-                                 Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR * pBindDescriptorSetsInfo,
+                                 Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindDescriptorSets2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorSets2KHR( const BindDescriptorSetsInfo & bindDescriptorSetsInfo,
-                                 Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR & bindDescriptorSetsInfo,
+                                 Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants2KHR( const PushConstantsInfo * pPushConstantsInfo,
-                            Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR * pPushConstantsInfo,
+                            Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushConstants2KHR( const PushConstantsInfo & pushConstantsInfo,
-                            Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR & pushConstantsInfo,
+                            Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet2KHR( const PushDescriptorSetInfo * pPushDescriptorSetInfo,
-                                Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR * pPushDescriptorSetInfo,
+                                Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSet2KHR( const PushDescriptorSetInfo & pushDescriptorSetInfo,
-                                Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR & pushDescriptorSetInfo,
+                                Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo * pPushDescriptorSetWithTemplateInfo,
-                                            Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetWithTemplate2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR * pPushDescriptorSetWithTemplateInfo,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo,
-                                            Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void pushDescriptorSetWithTemplate2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR & pushDescriptorSetWithTemplateInfo,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo,
-                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDescriptorBufferOffsets2EXT( const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT * pSetDescriptorBufferOffsetsInfo,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo,
-                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setDescriptorBufferOffsets2EXT( const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorBufferEmbeddedSamplers2EXT( const BindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorBufferEmbeddedSamplers2EXT(
+      const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT * pBindDescriptorBufferEmbeddedSamplersInfo,
+      Dispatch const & d                                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindDescriptorBufferEmbeddedSamplers2EXT( const BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_QCOM_tile_memory_heap ===
-
-    // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindTileMemoryQCOM( const TileMemoryBindInfoQCOM * pTileMemoryBindInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void bindTileMemoryQCOM( Optional<const TileMemoryBindInfoQCOM> tileMemoryBindInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_KHR_copy_memory_indirect ===
-
-    // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR * pCopyMemoryIndirectInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR & copyMemoryIndirectInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR * pCopyMemoryToImageIndirectInfo,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR & copyMemoryToImageIndirectInfo,
-                                       Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_EXT_memory_decompression ===
-
-    // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryEXT( const DecompressMemoryInfoEXT * pDecompressMemoryInfoEXT,
-                              Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryEXT( const DecompressMemoryInfoEXT & decompressMemoryInfoEXT,
-                              Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdDecompressMemoryIndirectCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void decompressMemoryIndirectCountEXT( MemoryDecompressionMethodFlagsEXT decompressionMethod,
-                                           DeviceAddress                     indirectCommandsAddress,
-                                           DeviceAddress                     indirectCommandsCountAddress,
-                                           uint32_t                          maxDecompressionCount,
-                                           uint32_t                          stride,
-                                           Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    //=== VK_NV_cluster_acceleration_structure ===
-
-    // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV * pCommandInfos,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV & commandInfos,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_partitioned_acceleration_structure ===
-
-    // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV * pBuildInfo,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV & buildInfo,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_EXT_device_generated_commands ===
-
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT * pGeneratedCommandsInfo,
-                                         CommandBuffer                    stateCommandBuffer,
-                                         Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT & generatedCommandsInfo,
-                                         CommandBuffer                    stateCommandBuffer,
-                                         Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeGeneratedCommandsEXT( Bool32                           isPreprocessed,
-                                      const GeneratedCommandsInfoEXT * pGeneratedCommandsInfo,
-                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void executeGeneratedCommandsEXT( Bool32                           isPreprocessed,
-                                      const GeneratedCommandsInfoEXT & generatedCommandsInfo,
-                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_EXT_fragment_density_map_offset ===
-
-    // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRendering2EXT( const RenderingEndInfoKHR * pRenderingEndInfo,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRendering2EXT( Optional<const RenderingEndInfoKHR> renderingEndInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_EXT_custom_resolve ===
-
-    // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginCustomResolveEXT( const BeginCustomResolveInfoEXT * pBeginCustomResolveInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginCustomResolveEXT( Optional<const BeginCustomResolveInfoEXT> beginCustomResolveInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_KHR_maintenance10 ===
-
-    // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRendering2KHR( const RenderingEndInfoKHR * pRenderingEndInfo,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void endRendering2KHR( Optional<const RenderingEndInfoKHR> renderingEndInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void bindDescriptorBufferEmbeddedSamplers2EXT(
+      const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo,
+      Dispatch const & d                                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     operator VkCommandBuffer() const VULKAN_HPP_NOEXCEPT
@@ -8225,59 +6850,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCommandBuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCommandBuffer>
   {
-    using Type = CommandBuffer;
+    using Type = VULKAN_HPP_NAMESPACE::CommandBuffer;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCommandBuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandBuffer>
   {
-    using Type = CommandBuffer;
+    using Type = VULKAN_HPP_NAMESPACE::CommandBuffer;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCommandBuffer, VK_NULL_HANDLE>
   {
-    using Type = CommandBuffer;
+    using Type = VULKAN_HPP_NAMESPACE::CommandBuffer;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<CommandBuffer>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CommandBuffer>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDeviceMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemory.html
   class DeviceMemory
   {
   public:
     using CType      = VkDeviceMemory;
     using NativeType = VkDeviceMemory;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDeviceMemory;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDeviceMemory;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDeviceMemory;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDeviceMemory;
 
   public:
-    DeviceMemory() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DeviceMemory( DeviceMemory const & rhs )             = default;
-    DeviceMemory & operator=( DeviceMemory const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DeviceMemory( DeviceMemory && rhs )             = default;
-    DeviceMemory & operator=( DeviceMemory && rhs ) = default;
-#else
-    DeviceMemory( DeviceMemory && rhs ) VULKAN_HPP_NOEXCEPT : m_deviceMemory( exchange( rhs.m_deviceMemory, {} ) ) {}
-
-    DeviceMemory & operator=( DeviceMemory && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_deviceMemory = exchange( rhs.m_deviceMemory, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DeviceMemory() = default;
 
     VULKAN_HPP_CONSTEXPR DeviceMemory( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8297,6 +6906,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DeviceMemory const & ) const = default;
+#else
+    bool                                 operator==( DeviceMemory const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deviceMemory == rhs.m_deviceMemory;
+    }
+
+    bool operator!=( DeviceMemory const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deviceMemory != rhs.m_deviceMemory;
+    }
+
+    bool operator<( DeviceMemory const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deviceMemory < rhs.m_deviceMemory;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDeviceMemory() const VULKAN_HPP_NOEXCEPT
     {
       return m_deviceMemory;
@@ -8317,59 +6945,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDeviceMemory>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDeviceMemory>
   {
-    using Type = DeviceMemory;
+    using Type = VULKAN_HPP_NAMESPACE::DeviceMemory;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDeviceMemory>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDeviceMemory>
   {
-    using Type = DeviceMemory;
+    using Type = VULKAN_HPP_NAMESPACE::DeviceMemory;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDeviceMemory, VK_NULL_HANDLE>
   {
-    using Type = DeviceMemory;
+    using Type = VULKAN_HPP_NAMESPACE::DeviceMemory;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DeviceMemory>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DeviceMemory>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionKHR.html
   class VideoSessionKHR
   {
   public:
     using CType      = VkVideoSessionKHR;
     using NativeType = VkVideoSessionKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eVideoSessionKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    VideoSessionKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    VideoSessionKHR( VideoSessionKHR const & rhs )             = default;
-    VideoSessionKHR & operator=( VideoSessionKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    VideoSessionKHR( VideoSessionKHR && rhs )             = default;
-    VideoSessionKHR & operator=( VideoSessionKHR && rhs ) = default;
-#else
-    VideoSessionKHR( VideoSessionKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_videoSessionKHR( exchange( rhs.m_videoSessionKHR, {} ) ) {}
-
-    VideoSessionKHR & operator=( VideoSessionKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_videoSessionKHR = exchange( rhs.m_videoSessionKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR VideoSessionKHR() = default;
 
     VULKAN_HPP_CONSTEXPR VideoSessionKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8389,6 +7001,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( VideoSessionKHR const & ) const = default;
+#else
+    bool operator==( VideoSessionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionKHR == rhs.m_videoSessionKHR;
+    }
+
+    bool operator!=( VideoSessionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionKHR != rhs.m_videoSessionKHR;
+    }
+
+    bool operator<( VideoSessionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionKHR < rhs.m_videoSessionKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkVideoSessionKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_videoSessionKHR;
@@ -8409,53 +7040,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eVideoSessionKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionKHR>
   {
-    using Type = VideoSessionKHR;
+    using Type = VULKAN_HPP_NAMESPACE::VideoSessionKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkVideoSessionKHR, VK_NULL_HANDLE>
   {
-    using Type = VideoSessionKHR;
+    using Type = VULKAN_HPP_NAMESPACE::VideoSessionKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<VideoSessionKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::VideoSessionKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDeferredOperationKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeferredOperationKHR.html
   class DeferredOperationKHR
   {
   public:
     using CType      = VkDeferredOperationKHR;
     using NativeType = VkDeferredOperationKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDeferredOperationKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDeferredOperationKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    DeferredOperationKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DeferredOperationKHR( DeferredOperationKHR const & rhs )             = default;
-    DeferredOperationKHR & operator=( DeferredOperationKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DeferredOperationKHR( DeferredOperationKHR && rhs )             = default;
-    DeferredOperationKHR & operator=( DeferredOperationKHR && rhs ) = default;
-#else
-    DeferredOperationKHR( DeferredOperationKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_deferredOperationKHR( exchange( rhs.m_deferredOperationKHR, {} ) ) {}
-
-    DeferredOperationKHR & operator=( DeferredOperationKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_deferredOperationKHR = exchange( rhs.m_deferredOperationKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DeferredOperationKHR() = default;
 
     VULKAN_HPP_CONSTEXPR DeferredOperationKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8478,6 +7093,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DeferredOperationKHR const & ) const = default;
+#else
+    bool operator==( DeferredOperationKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deferredOperationKHR == rhs.m_deferredOperationKHR;
+    }
+
+    bool operator!=( DeferredOperationKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deferredOperationKHR != rhs.m_deferredOperationKHR;
+    }
+
+    bool operator<( DeferredOperationKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_deferredOperationKHR < rhs.m_deferredOperationKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDeferredOperationKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_deferredOperationKHR;
@@ -8498,26 +7132,25 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDeferredOperationKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDeferredOperationKHR>
   {
-    using Type = DeferredOperationKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DeferredOperationKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDeferredOperationKHR, VK_NULL_HANDLE>
   {
-    using Type = DeferredOperationKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DeferredOperationKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DeferredOperationKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkBufferCollectionFUCHSIA, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionFUCHSIA.html
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   class BufferCollectionFUCHSIA
   {
@@ -8525,29 +7158,12 @@ namespace VULKAN_HPP_NAMESPACE
     using CType      = VkBufferCollectionFUCHSIA;
     using NativeType = VkBufferCollectionFUCHSIA;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBufferCollectionFUCHSIA;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBufferCollectionFUCHSIA;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
 
   public:
-    BufferCollectionFUCHSIA() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    BufferCollectionFUCHSIA( BufferCollectionFUCHSIA const & rhs )             = default;
-    BufferCollectionFUCHSIA & operator=( BufferCollectionFUCHSIA const & rhs ) = default;
-
-#  if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    BufferCollectionFUCHSIA( BufferCollectionFUCHSIA && rhs )             = default;
-    BufferCollectionFUCHSIA & operator=( BufferCollectionFUCHSIA && rhs ) = default;
-#  else
-    BufferCollectionFUCHSIA( BufferCollectionFUCHSIA && rhs ) VULKAN_HPP_NOEXCEPT : m_bufferCollectionFUCHSIA( exchange( rhs.m_bufferCollectionFUCHSIA, {} ) )
-    {
-    }
-
-    BufferCollectionFUCHSIA & operator=( BufferCollectionFUCHSIA && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_bufferCollectionFUCHSIA = exchange( rhs.m_bufferCollectionFUCHSIA, {} );
-      return *this;
-    }
-#  endif
+    VULKAN_HPP_CONSTEXPR BufferCollectionFUCHSIA() = default;
 
     VULKAN_HPP_CONSTEXPR BufferCollectionFUCHSIA( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8570,6 +7186,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( BufferCollectionFUCHSIA const & ) const = default;
+#  else
+    bool operator==( BufferCollectionFUCHSIA const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferCollectionFUCHSIA == rhs.m_bufferCollectionFUCHSIA;
+    }
+
+    bool operator!=( BufferCollectionFUCHSIA const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferCollectionFUCHSIA != rhs.m_bufferCollectionFUCHSIA;
+    }
+
+    bool operator<( BufferCollectionFUCHSIA const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferCollectionFUCHSIA < rhs.m_bufferCollectionFUCHSIA;
+    }
+#  endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkBufferCollectionFUCHSIA() const VULKAN_HPP_NOEXCEPT
     {
       return m_bufferCollectionFUCHSIA;
@@ -8590,60 +7225,44 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eBufferCollectionFUCHSIA>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eBufferCollectionFUCHSIA>
   {
-    using Type = BufferCollectionFUCHSIA;
+    using Type = VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA>
   {
-    using Type = BufferCollectionFUCHSIA;
+    using Type = VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA;
   };
 
 #  if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkBufferCollectionFUCHSIA, VK_NULL_HANDLE>
   {
-    using Type = BufferCollectionFUCHSIA;
+    using Type = VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA;
   };
 #  endif
 
   template <>
-  struct isVulkanHandleType<BufferCollectionFUCHSIA>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper class for handle VkBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferView.html
   class BufferView
   {
   public:
     using CType      = VkBufferView;
     using NativeType = VkBufferView;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBufferView;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBufferView;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBufferView;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferView;
 
   public:
-    BufferView() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    BufferView( BufferView const & rhs )             = default;
-    BufferView & operator=( BufferView const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    BufferView( BufferView && rhs )             = default;
-    BufferView & operator=( BufferView && rhs ) = default;
-#else
-    BufferView( BufferView && rhs ) VULKAN_HPP_NOEXCEPT : m_bufferView( exchange( rhs.m_bufferView, {} ) ) {}
-
-    BufferView & operator=( BufferView && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_bufferView = exchange( rhs.m_bufferView, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR BufferView() = default;
 
     VULKAN_HPP_CONSTEXPR BufferView( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8663,6 +7282,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( BufferView const & ) const = default;
+#else
+    bool operator==( BufferView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferView == rhs.m_bufferView;
+    }
+
+    bool operator!=( BufferView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferView != rhs.m_bufferView;
+    }
+
+    bool operator<( BufferView const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_bufferView < rhs.m_bufferView;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkBufferView() const VULKAN_HPP_NOEXCEPT
     {
       return m_bufferView;
@@ -8683,59 +7321,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eBufferView>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eBufferView>
   {
-    using Type = BufferView;
+    using Type = VULKAN_HPP_NAMESPACE::BufferView;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eBufferView>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferView>
   {
-    using Type = BufferView;
+    using Type = VULKAN_HPP_NAMESPACE::BufferView;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkBufferView, VK_NULL_HANDLE>
   {
-    using Type = BufferView;
+    using Type = VULKAN_HPP_NAMESPACE::BufferView;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<BufferView>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::BufferView>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPool.html
   class CommandPool
   {
   public:
     using CType      = VkCommandPool;
     using NativeType = VkCommandPool;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCommandPool;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCommandPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCommandPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandPool;
 
   public:
-    CommandPool() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CommandPool( CommandPool const & rhs )             = default;
-    CommandPool & operator=( CommandPool const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CommandPool( CommandPool && rhs )             = default;
-    CommandPool & operator=( CommandPool && rhs ) = default;
-#else
-    CommandPool( CommandPool && rhs ) VULKAN_HPP_NOEXCEPT : m_commandPool( exchange( rhs.m_commandPool, {} ) ) {}
-
-    CommandPool & operator=( CommandPool && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_commandPool = exchange( rhs.m_commandPool, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR CommandPool() = default;
 
     VULKAN_HPP_CONSTEXPR CommandPool( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8755,6 +7377,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CommandPool const & ) const = default;
+#else
+    bool operator==( CommandPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandPool == rhs.m_commandPool;
+    }
+
+    bool operator!=( CommandPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandPool != rhs.m_commandPool;
+    }
+
+    bool operator<( CommandPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_commandPool < rhs.m_commandPool;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCommandPool() const VULKAN_HPP_NOEXCEPT
     {
       return m_commandPool;
@@ -8775,59 +7416,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCommandPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCommandPool>
   {
-    using Type = CommandPool;
+    using Type = VULKAN_HPP_NAMESPACE::CommandPool;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCommandPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandPool>
   {
-    using Type = CommandPool;
+    using Type = VULKAN_HPP_NAMESPACE::CommandPool;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCommandPool, VK_NULL_HANDLE>
   {
-    using Type = CommandPool;
+    using Type = VULKAN_HPP_NAMESPACE::CommandPool;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<CommandPool>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CommandPool>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCache.html
   class PipelineCache
   {
   public:
     using CType      = VkPipelineCache;
     using NativeType = VkPipelineCache;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineCache;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipelineCache;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipelineCache;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineCache;
 
   public:
-    PipelineCache() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PipelineCache( PipelineCache const & rhs )             = default;
-    PipelineCache & operator=( PipelineCache const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PipelineCache( PipelineCache && rhs )             = default;
-    PipelineCache & operator=( PipelineCache && rhs ) = default;
-#else
-    PipelineCache( PipelineCache && rhs ) VULKAN_HPP_NOEXCEPT : m_pipelineCache( exchange( rhs.m_pipelineCache, {} ) ) {}
-
-    PipelineCache & operator=( PipelineCache && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipelineCache = exchange( rhs.m_pipelineCache, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR PipelineCache() = default;
 
     VULKAN_HPP_CONSTEXPR PipelineCache( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8847,6 +7472,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PipelineCache const & ) const = default;
+#else
+    bool operator==( PipelineCache const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineCache == rhs.m_pipelineCache;
+    }
+
+    bool operator!=( PipelineCache const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineCache != rhs.m_pipelineCache;
+    }
+
+    bool operator<( PipelineCache const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_pipelineCache < rhs.m_pipelineCache;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipelineCache() const VULKAN_HPP_NOEXCEPT
     {
       return m_pipelineCache;
@@ -8867,59 +7511,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePipelineCache>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePipelineCache>
   {
-    using Type = PipelineCache;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineCache;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::ePipelineCache>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineCache>
   {
-    using Type = PipelineCache;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineCache;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPipelineCache, VK_NULL_HANDLE>
   {
-    using Type = PipelineCache;
+    using Type = VULKAN_HPP_NAMESPACE::PipelineCache;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<PipelineCache>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::PipelineCache>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuFunctionNVX.html
   class CuFunctionNVX
   {
   public:
     using CType      = VkCuFunctionNVX;
     using NativeType = VkCuFunctionNVX;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCuFunctionNVX;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCuFunctionNVX;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCuFunctionNVX;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuFunctionNVX;
 
   public:
-    CuFunctionNVX() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CuFunctionNVX( CuFunctionNVX const & rhs )             = default;
-    CuFunctionNVX & operator=( CuFunctionNVX const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CuFunctionNVX( CuFunctionNVX && rhs )             = default;
-    CuFunctionNVX & operator=( CuFunctionNVX && rhs ) = default;
-#else
-    CuFunctionNVX( CuFunctionNVX && rhs ) VULKAN_HPP_NOEXCEPT : m_cuFunctionNVX( exchange( rhs.m_cuFunctionNVX, {} ) ) {}
-
-    CuFunctionNVX & operator=( CuFunctionNVX && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_cuFunctionNVX = exchange( rhs.m_cuFunctionNVX, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR CuFunctionNVX() = default;
 
     VULKAN_HPP_CONSTEXPR CuFunctionNVX( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -8939,6 +7567,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CuFunctionNVX const & ) const = default;
+#else
+    bool operator==( CuFunctionNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuFunctionNVX == rhs.m_cuFunctionNVX;
+    }
+
+    bool operator!=( CuFunctionNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuFunctionNVX != rhs.m_cuFunctionNVX;
+    }
+
+    bool operator<( CuFunctionNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuFunctionNVX < rhs.m_cuFunctionNVX;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCuFunctionNVX() const VULKAN_HPP_NOEXCEPT
     {
       return m_cuFunctionNVX;
@@ -8959,59 +7606,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCuFunctionNVX>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCuFunctionNVX>
   {
-    using Type = CuFunctionNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuFunctionNVX;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCuFunctionNVX>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuFunctionNVX>
   {
-    using Type = CuFunctionNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuFunctionNVX;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCuFunctionNVX, VK_NULL_HANDLE>
   {
-    using Type = CuFunctionNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuFunctionNVX;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<CuFunctionNVX>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CuFunctionNVX>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuModuleNVX.html
   class CuModuleNVX
   {
   public:
     using CType      = VkCuModuleNVX;
     using NativeType = VkCuModuleNVX;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCuModuleNVX;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCuModuleNVX;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCuModuleNVX;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuModuleNVX;
 
   public:
-    CuModuleNVX() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CuModuleNVX( CuModuleNVX const & rhs )             = default;
-    CuModuleNVX & operator=( CuModuleNVX const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CuModuleNVX( CuModuleNVX && rhs )             = default;
-    CuModuleNVX & operator=( CuModuleNVX && rhs ) = default;
-#else
-    CuModuleNVX( CuModuleNVX && rhs ) VULKAN_HPP_NOEXCEPT : m_cuModuleNVX( exchange( rhs.m_cuModuleNVX, {} ) ) {}
-
-    CuModuleNVX & operator=( CuModuleNVX && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_cuModuleNVX = exchange( rhs.m_cuModuleNVX, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR CuModuleNVX() = default;
 
     VULKAN_HPP_CONSTEXPR CuModuleNVX( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9031,6 +7662,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CuModuleNVX const & ) const = default;
+#else
+    bool operator==( CuModuleNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuModuleNVX == rhs.m_cuModuleNVX;
+    }
+
+    bool operator!=( CuModuleNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuModuleNVX != rhs.m_cuModuleNVX;
+    }
+
+    bool operator<( CuModuleNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cuModuleNVX < rhs.m_cuModuleNVX;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCuModuleNVX() const VULKAN_HPP_NOEXCEPT
     {
       return m_cuModuleNVX;
@@ -9051,32 +7701,31 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCuModuleNVX>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCuModuleNVX>
   {
-    using Type = CuModuleNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuModuleNVX;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCuModuleNVX>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuModuleNVX>
   {
-    using Type = CuModuleNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuModuleNVX;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCuModuleNVX, VK_NULL_HANDLE>
   {
-    using Type = CuModuleNVX;
+    using Type = VULKAN_HPP_NAMESPACE::CuModuleNVX;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<CuModuleNVX>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CuModuleNVX>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaFunctionNV.html
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   class CudaFunctionNV
   {
@@ -9084,27 +7733,12 @@ namespace VULKAN_HPP_NAMESPACE
     using CType      = VkCudaFunctionNV;
     using NativeType = VkCudaFunctionNV;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCudaFunctionNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCudaFunctionNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCudaFunctionNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaFunctionNV;
 
   public:
-    CudaFunctionNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CudaFunctionNV( CudaFunctionNV const & rhs )             = default;
-    CudaFunctionNV & operator=( CudaFunctionNV const & rhs ) = default;
-
-#  if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CudaFunctionNV( CudaFunctionNV && rhs )             = default;
-    CudaFunctionNV & operator=( CudaFunctionNV && rhs ) = default;
-#  else
-    CudaFunctionNV( CudaFunctionNV && rhs ) VULKAN_HPP_NOEXCEPT : m_cudaFunctionNV( exchange( rhs.m_cudaFunctionNV, {} ) ) {}
-
-    CudaFunctionNV & operator=( CudaFunctionNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_cudaFunctionNV = exchange( rhs.m_cudaFunctionNV, {} );
-      return *this;
-    }
-#  endif
+    VULKAN_HPP_CONSTEXPR CudaFunctionNV() = default;
 
     VULKAN_HPP_CONSTEXPR CudaFunctionNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9124,6 +7758,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CudaFunctionNV const & ) const = default;
+#  else
+    bool operator==( CudaFunctionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaFunctionNV == rhs.m_cudaFunctionNV;
+    }
+
+    bool operator!=( CudaFunctionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaFunctionNV != rhs.m_cudaFunctionNV;
+    }
+
+    bool operator<( CudaFunctionNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaFunctionNV < rhs.m_cudaFunctionNV;
+    }
+#  endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCudaFunctionNV() const VULKAN_HPP_NOEXCEPT
     {
       return m_cudaFunctionNV;
@@ -9144,33 +7797,32 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCudaFunctionNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCudaFunctionNV>
   {
-    using Type = CudaFunctionNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaFunctionNV;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCudaFunctionNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaFunctionNV>
   {
-    using Type = CudaFunctionNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaFunctionNV;
   };
 
 #  if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCudaFunctionNV, VK_NULL_HANDLE>
   {
-    using Type = CudaFunctionNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaFunctionNV;
   };
 #  endif
 
   template <>
-  struct isVulkanHandleType<CudaFunctionNV>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CudaFunctionNV>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper class for handle VkCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaModuleNV.html
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   class CudaModuleNV
   {
@@ -9178,27 +7830,12 @@ namespace VULKAN_HPP_NAMESPACE
     using CType      = VkCudaModuleNV;
     using NativeType = VkCudaModuleNV;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCudaModuleNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCudaModuleNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCudaModuleNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaModuleNV;
 
   public:
-    CudaModuleNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    CudaModuleNV( CudaModuleNV const & rhs )             = default;
-    CudaModuleNV & operator=( CudaModuleNV const & rhs ) = default;
-
-#  if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    CudaModuleNV( CudaModuleNV && rhs )             = default;
-    CudaModuleNV & operator=( CudaModuleNV && rhs ) = default;
-#  else
-    CudaModuleNV( CudaModuleNV && rhs ) VULKAN_HPP_NOEXCEPT : m_cudaModuleNV( exchange( rhs.m_cudaModuleNV, {} ) ) {}
-
-    CudaModuleNV & operator=( CudaModuleNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_cudaModuleNV = exchange( rhs.m_cudaModuleNV, {} );
-      return *this;
-    }
-#  endif
+    VULKAN_HPP_CONSTEXPR CudaModuleNV() = default;
 
     VULKAN_HPP_CONSTEXPR CudaModuleNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9218,6 +7855,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( CudaModuleNV const & ) const = default;
+#  else
+    bool operator==( CudaModuleNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaModuleNV == rhs.m_cudaModuleNV;
+    }
+
+    bool operator!=( CudaModuleNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaModuleNV != rhs.m_cudaModuleNV;
+    }
+
+    bool operator<( CudaModuleNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_cudaModuleNV < rhs.m_cudaModuleNV;
+    }
+#  endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCudaModuleNV() const VULKAN_HPP_NOEXCEPT
     {
       return m_cudaModuleNV;
@@ -9238,60 +7894,44 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eCudaModuleNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eCudaModuleNV>
   {
-    using Type = CudaModuleNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaModuleNV;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eCudaModuleNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaModuleNV>
   {
-    using Type = CudaModuleNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaModuleNV;
   };
 
 #  if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkCudaModuleNV, VK_NULL_HANDLE>
   {
-    using Type = CudaModuleNV;
+    using Type = VULKAN_HPP_NAMESPACE::CudaModuleNV;
   };
 #  endif
 
   template <>
-  struct isVulkanHandleType<CudaModuleNV>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::CudaModuleNV>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper class for handle VkDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPool.html
   class DescriptorPool
   {
   public:
     using CType      = VkDescriptorPool;
     using NativeType = VkDescriptorPool;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorPool;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorPool;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorPool;
 
   public:
-    DescriptorPool() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DescriptorPool( DescriptorPool const & rhs )             = default;
-    DescriptorPool & operator=( DescriptorPool const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DescriptorPool( DescriptorPool && rhs )             = default;
-    DescriptorPool & operator=( DescriptorPool && rhs ) = default;
-#else
-    DescriptorPool( DescriptorPool && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorPool( exchange( rhs.m_descriptorPool, {} ) ) {}
-
-    DescriptorPool & operator=( DescriptorPool && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_descriptorPool = exchange( rhs.m_descriptorPool, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DescriptorPool() = default;
 
     VULKAN_HPP_CONSTEXPR DescriptorPool( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9311,6 +7951,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DescriptorPool const & ) const = default;
+#else
+    bool operator==( DescriptorPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorPool == rhs.m_descriptorPool;
+    }
+
+    bool operator!=( DescriptorPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorPool != rhs.m_descriptorPool;
+    }
+
+    bool operator<( DescriptorPool const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorPool < rhs.m_descriptorPool;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorPool() const VULKAN_HPP_NOEXCEPT
     {
       return m_descriptorPool;
@@ -9331,59 +7990,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDescriptorPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorPool>
   {
-    using Type = DescriptorPool;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorPool;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDescriptorPool>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorPool>
   {
-    using Type = DescriptorPool;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorPool;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDescriptorPool, VK_NULL_HANDLE>
   {
-    using Type = DescriptorPool;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorPool;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DescriptorPool>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DescriptorPool>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayout.html
   class DescriptorSetLayout
   {
   public:
     using CType      = VkDescriptorSetLayout;
     using NativeType = VkDescriptorSetLayout;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorSetLayout;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorSetLayout;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSetLayout;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSetLayout;
 
   public:
-    DescriptorSetLayout() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DescriptorSetLayout( DescriptorSetLayout const & rhs )             = default;
-    DescriptorSetLayout & operator=( DescriptorSetLayout const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DescriptorSetLayout( DescriptorSetLayout && rhs )             = default;
-    DescriptorSetLayout & operator=( DescriptorSetLayout && rhs ) = default;
-#else
-    DescriptorSetLayout( DescriptorSetLayout && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorSetLayout( exchange( rhs.m_descriptorSetLayout, {} ) ) {}
-
-    DescriptorSetLayout & operator=( DescriptorSetLayout && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_descriptorSetLayout = exchange( rhs.m_descriptorSetLayout, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DescriptorSetLayout() = default;
 
     VULKAN_HPP_CONSTEXPR DescriptorSetLayout( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9406,6 +8049,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DescriptorSetLayout const & ) const = default;
+#else
+    bool operator==( DescriptorSetLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSetLayout == rhs.m_descriptorSetLayout;
+    }
+
+    bool operator!=( DescriptorSetLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSetLayout != rhs.m_descriptorSetLayout;
+    }
+
+    bool operator<( DescriptorSetLayout const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_descriptorSetLayout < rhs.m_descriptorSetLayout;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorSetLayout() const VULKAN_HPP_NOEXCEPT
     {
       return m_descriptorSetLayout;
@@ -9426,160 +8088,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDescriptorSetLayout>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSetLayout>
   {
-    using Type = DescriptorSetLayout;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSetLayout;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDescriptorSetLayout>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSetLayout>
   {
-    using Type = DescriptorSetLayout;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSetLayout;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDescriptorSetLayout, VK_NULL_HANDLE>
   {
-    using Type = DescriptorSetLayout;
+    using Type = VULKAN_HPP_NAMESPACE::DescriptorSetLayout;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DescriptorSetLayout>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkExternalComputeQueueNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalComputeQueueNV.html
-  class ExternalComputeQueueNV
-  {
-  public:
-    using CType      = VkExternalComputeQueueNV;
-    using NativeType = VkExternalComputeQueueNV;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eExternalComputeQueueNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    ExternalComputeQueueNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    ExternalComputeQueueNV( ExternalComputeQueueNV const & rhs )             = default;
-    ExternalComputeQueueNV & operator=( ExternalComputeQueueNV const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    ExternalComputeQueueNV( ExternalComputeQueueNV && rhs )             = default;
-    ExternalComputeQueueNV & operator=( ExternalComputeQueueNV && rhs ) = default;
-#else
-    ExternalComputeQueueNV( ExternalComputeQueueNV && rhs ) VULKAN_HPP_NOEXCEPT : m_externalComputeQueueNV( exchange( rhs.m_externalComputeQueueNV, {} ) ) {}
-
-    ExternalComputeQueueNV & operator=( ExternalComputeQueueNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_externalComputeQueueNV = exchange( rhs.m_externalComputeQueueNV, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    ExternalComputeQueueNV( VkExternalComputeQueueNV externalComputeQueueNV ) VULKAN_HPP_NOEXCEPT : m_externalComputeQueueNV( externalComputeQueueNV ) {}
-
-    ExternalComputeQueueNV & operator=( VkExternalComputeQueueNV externalComputeQueueNV ) VULKAN_HPP_NOEXCEPT
-    {
-      m_externalComputeQueueNV = externalComputeQueueNV;
-      return *this;
-    }
-
-    ExternalComputeQueueNV & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_externalComputeQueueNV = {};
-      return *this;
-    }
-
-    //=== VK_NV_external_compute_queue ===
-
-    // wrapper function for command vkGetExternalComputeQueueDataNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      getData( ExternalComputeQueueDataParamsNV * params, void * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetExternalComputeQueueDataNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::pair<ExternalComputeQueueDataParamsNV, DataType>
-                         getData( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    operator VkExternalComputeQueueNV() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_externalComputeQueueNV;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_externalComputeQueueNV != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_externalComputeQueueNV == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkExternalComputeQueueNV m_externalComputeQueueNV = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eExternalComputeQueueNV>
-  {
-    using Type = ExternalComputeQueueNV;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkExternalComputeQueueNV, VK_NULL_HANDLE>
-  {
-    using Type = ExternalComputeQueueNV;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<ExternalComputeQueueNV>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebuffer.html
   class Framebuffer
   {
   public:
     using CType      = VkFramebuffer;
     using NativeType = VkFramebuffer;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eFramebuffer;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eFramebuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eFramebuffer;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFramebuffer;
 
   public:
-    Framebuffer() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Framebuffer( Framebuffer const & rhs )             = default;
-    Framebuffer & operator=( Framebuffer const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Framebuffer( Framebuffer && rhs )             = default;
-    Framebuffer & operator=( Framebuffer && rhs ) = default;
-#else
-    Framebuffer( Framebuffer && rhs ) VULKAN_HPP_NOEXCEPT : m_framebuffer( exchange( rhs.m_framebuffer, {} ) ) {}
-
-    Framebuffer & operator=( Framebuffer && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_framebuffer = exchange( rhs.m_framebuffer, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Framebuffer() = default;
 
     VULKAN_HPP_CONSTEXPR Framebuffer( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9599,6 +8144,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Framebuffer const & ) const = default;
+#else
+    bool operator==( Framebuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_framebuffer == rhs.m_framebuffer;
+    }
+
+    bool operator!=( Framebuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_framebuffer != rhs.m_framebuffer;
+    }
+
+    bool operator<( Framebuffer const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_framebuffer < rhs.m_framebuffer;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkFramebuffer() const VULKAN_HPP_NOEXCEPT
     {
       return m_framebuffer;
@@ -9619,154 +8183,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eFramebuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eFramebuffer>
   {
-    using Type = Framebuffer;
+    using Type = VULKAN_HPP_NAMESPACE::Framebuffer;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eFramebuffer>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFramebuffer>
   {
-    using Type = Framebuffer;
+    using Type = VULKAN_HPP_NAMESPACE::Framebuffer;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkFramebuffer, VK_NULL_HANDLE>
   {
-    using Type = Framebuffer;
+    using Type = VULKAN_HPP_NAMESPACE::Framebuffer;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Framebuffer>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Framebuffer>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkIndirectCommandsLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutEXT.html
-  class IndirectCommandsLayoutEXT
-  {
-  public:
-    using CType      = VkIndirectCommandsLayoutEXT;
-    using NativeType = VkIndirectCommandsLayoutEXT;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectCommandsLayoutEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    IndirectCommandsLayoutEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    IndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT const & rhs )             = default;
-    IndirectCommandsLayoutEXT & operator=( IndirectCommandsLayoutEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    IndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT && rhs )             = default;
-    IndirectCommandsLayoutEXT & operator=( IndirectCommandsLayoutEXT && rhs ) = default;
-#else
-    IndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_indirectCommandsLayoutEXT( exchange( rhs.m_indirectCommandsLayoutEXT, {} ) )
-    {
-    }
-
-    IndirectCommandsLayoutEXT & operator=( IndirectCommandsLayoutEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectCommandsLayoutEXT = exchange( rhs.m_indirectCommandsLayoutEXT, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT IndirectCommandsLayoutEXT( VkIndirectCommandsLayoutEXT indirectCommandsLayoutEXT ) VULKAN_HPP_NOEXCEPT
-      : m_indirectCommandsLayoutEXT( indirectCommandsLayoutEXT )
-    {
-    }
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    IndirectCommandsLayoutEXT & operator=( VkIndirectCommandsLayoutEXT indirectCommandsLayoutEXT ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectCommandsLayoutEXT = indirectCommandsLayoutEXT;
-      return *this;
-    }
-#endif
-
-    IndirectCommandsLayoutEXT & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectCommandsLayoutEXT = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkIndirectCommandsLayoutEXT() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectCommandsLayoutEXT;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectCommandsLayoutEXT != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectCommandsLayoutEXT == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkIndirectCommandsLayoutEXT m_indirectCommandsLayoutEXT = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eIndirectCommandsLayoutEXT>
-  {
-    using Type = IndirectCommandsLayoutEXT;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkIndirectCommandsLayoutEXT, VK_NULL_HANDLE>
-  {
-    using Type = IndirectCommandsLayoutEXT;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<IndirectCommandsLayoutEXT>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkIndirectCommandsLayoutNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutNV.html
   class IndirectCommandsLayoutNV
   {
   public:
     using CType      = VkIndirectCommandsLayoutNV;
     using NativeType = VkIndirectCommandsLayoutNV;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectCommandsLayoutNV;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eIndirectCommandsLayoutNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    IndirectCommandsLayoutNV() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    IndirectCommandsLayoutNV( IndirectCommandsLayoutNV const & rhs )             = default;
-    IndirectCommandsLayoutNV & operator=( IndirectCommandsLayoutNV const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    IndirectCommandsLayoutNV( IndirectCommandsLayoutNV && rhs )             = default;
-    IndirectCommandsLayoutNV & operator=( IndirectCommandsLayoutNV && rhs ) = default;
-#else
-    IndirectCommandsLayoutNV( IndirectCommandsLayoutNV && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_indirectCommandsLayoutNV( exchange( rhs.m_indirectCommandsLayoutNV, {} ) )
-    {
-    }
-
-    IndirectCommandsLayoutNV & operator=( IndirectCommandsLayoutNV && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectCommandsLayoutNV = exchange( rhs.m_indirectCommandsLayoutNV, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutNV() = default;
 
     VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutNV( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9789,6 +8242,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( IndirectCommandsLayoutNV const & ) const = default;
+#else
+    bool operator==( IndirectCommandsLayoutNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_indirectCommandsLayoutNV == rhs.m_indirectCommandsLayoutNV;
+    }
+
+    bool operator!=( IndirectCommandsLayoutNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_indirectCommandsLayoutNV != rhs.m_indirectCommandsLayoutNV;
+    }
+
+    bool operator<( IndirectCommandsLayoutNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_indirectCommandsLayoutNV < rhs.m_indirectCommandsLayoutNV;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkIndirectCommandsLayoutNV() const VULKAN_HPP_NOEXCEPT
     {
       return m_indirectCommandsLayoutNV;
@@ -9809,144 +8281,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eIndirectCommandsLayoutNV>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eIndirectCommandsLayoutNV>
   {
-    using Type = IndirectCommandsLayoutNV;
+    using Type = VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkIndirectCommandsLayoutNV, VK_NULL_HANDLE>
   {
-    using Type = IndirectCommandsLayoutNV;
+    using Type = VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<IndirectCommandsLayoutNV>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkIndirectExecutionSetEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetEXT.html
-  class IndirectExecutionSetEXT
-  {
-  public:
-    using CType      = VkIndirectExecutionSetEXT;
-    using NativeType = VkIndirectExecutionSetEXT;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectExecutionSetEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    IndirectExecutionSetEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    IndirectExecutionSetEXT( IndirectExecutionSetEXT const & rhs )             = default;
-    IndirectExecutionSetEXT & operator=( IndirectExecutionSetEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    IndirectExecutionSetEXT( IndirectExecutionSetEXT && rhs )             = default;
-    IndirectExecutionSetEXT & operator=( IndirectExecutionSetEXT && rhs ) = default;
-#else
-    IndirectExecutionSetEXT( IndirectExecutionSetEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_indirectExecutionSetEXT( exchange( rhs.m_indirectExecutionSetEXT, {} ) )
-    {
-    }
-
-    IndirectExecutionSetEXT & operator=( IndirectExecutionSetEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectExecutionSetEXT = exchange( rhs.m_indirectExecutionSetEXT, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT IndirectExecutionSetEXT( VkIndirectExecutionSetEXT indirectExecutionSetEXT ) VULKAN_HPP_NOEXCEPT
-      : m_indirectExecutionSetEXT( indirectExecutionSetEXT )
-    {
-    }
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    IndirectExecutionSetEXT & operator=( VkIndirectExecutionSetEXT indirectExecutionSetEXT ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectExecutionSetEXT = indirectExecutionSetEXT;
-      return *this;
-    }
-#endif
-
-    IndirectExecutionSetEXT & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_indirectExecutionSetEXT = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkIndirectExecutionSetEXT() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectExecutionSetEXT;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectExecutionSetEXT != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_indirectExecutionSetEXT == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkIndirectExecutionSetEXT m_indirectExecutionSetEXT = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eIndirectExecutionSetEXT>
-  {
-    using Type = IndirectExecutionSetEXT;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkIndirectExecutionSetEXT, VK_NULL_HANDLE>
-  {
-    using Type = IndirectExecutionSetEXT;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<IndirectExecutionSetEXT>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPrivateDataSlot.html
   class PrivateDataSlot
   {
   public:
     using CType      = VkPrivateDataSlot;
     using NativeType = VkPrivateDataSlot;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePrivateDataSlot;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePrivateDataSlot;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    PrivateDataSlot() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PrivateDataSlot( PrivateDataSlot const & rhs )             = default;
-    PrivateDataSlot & operator=( PrivateDataSlot const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PrivateDataSlot( PrivateDataSlot && rhs )             = default;
-    PrivateDataSlot & operator=( PrivateDataSlot && rhs ) = default;
-#else
-    PrivateDataSlot( PrivateDataSlot && rhs ) VULKAN_HPP_NOEXCEPT : m_privateDataSlot( exchange( rhs.m_privateDataSlot, {} ) ) {}
-
-    PrivateDataSlot & operator=( PrivateDataSlot && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_privateDataSlot = exchange( rhs.m_privateDataSlot, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR PrivateDataSlot() = default;
 
     VULKAN_HPP_CONSTEXPR PrivateDataSlot( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -9966,6 +8331,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PrivateDataSlot const & ) const = default;
+#else
+    bool operator==( PrivateDataSlot const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_privateDataSlot == rhs.m_privateDataSlot;
+    }
+
+    bool operator!=( PrivateDataSlot const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_privateDataSlot != rhs.m_privateDataSlot;
+    }
+
+    bool operator<( PrivateDataSlot const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_privateDataSlot < rhs.m_privateDataSlot;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPrivateDataSlot() const VULKAN_HPP_NOEXCEPT
     {
       return m_privateDataSlot;
@@ -9986,55 +8370,39 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePrivateDataSlot>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePrivateDataSlot>
   {
-    using Type = PrivateDataSlot;
+    using Type = VULKAN_HPP_NAMESPACE::PrivateDataSlot;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPrivateDataSlot, VK_NULL_HANDLE>
   {
-    using Type = PrivateDataSlot;
+    using Type = VULKAN_HPP_NAMESPACE::PrivateDataSlot;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<PrivateDataSlot>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::PrivateDataSlot>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
   using PrivateDataSlotEXT = PrivateDataSlot;
 
-  // wrapper class for handle VkRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPass.html
   class RenderPass
   {
   public:
     using CType      = VkRenderPass;
     using NativeType = VkRenderPass;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eRenderPass;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eRenderPass;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eRenderPass;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eRenderPass;
 
   public:
-    RenderPass() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    RenderPass( RenderPass const & rhs )             = default;
-    RenderPass & operator=( RenderPass const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    RenderPass( RenderPass && rhs )             = default;
-    RenderPass & operator=( RenderPass && rhs ) = default;
-#else
-    RenderPass( RenderPass && rhs ) VULKAN_HPP_NOEXCEPT : m_renderPass( exchange( rhs.m_renderPass, {} ) ) {}
-
-    RenderPass & operator=( RenderPass && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_renderPass = exchange( rhs.m_renderPass, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR RenderPass() = default;
 
     VULKAN_HPP_CONSTEXPR RenderPass( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10054,6 +8422,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( RenderPass const & ) const = default;
+#else
+    bool operator==( RenderPass const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_renderPass == rhs.m_renderPass;
+    }
+
+    bool operator!=( RenderPass const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_renderPass != rhs.m_renderPass;
+    }
+
+    bool operator<( RenderPass const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_renderPass < rhs.m_renderPass;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkRenderPass() const VULKAN_HPP_NOEXCEPT
     {
       return m_renderPass;
@@ -10074,59 +8461,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eRenderPass>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eRenderPass>
   {
-    using Type = RenderPass;
+    using Type = VULKAN_HPP_NAMESPACE::RenderPass;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eRenderPass>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eRenderPass>
   {
-    using Type = RenderPass;
+    using Type = VULKAN_HPP_NAMESPACE::RenderPass;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkRenderPass, VK_NULL_HANDLE>
   {
-    using Type = RenderPass;
+    using Type = VULKAN_HPP_NAMESPACE::RenderPass;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<RenderPass>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::RenderPass>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampler.html
   class Sampler
   {
   public:
     using CType      = VkSampler;
     using NativeType = VkSampler;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSampler;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSampler;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSampler;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSampler;
 
   public:
-    Sampler() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Sampler( Sampler const & rhs )             = default;
-    Sampler & operator=( Sampler const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Sampler( Sampler && rhs )             = default;
-    Sampler & operator=( Sampler && rhs ) = default;
-#else
-    Sampler( Sampler && rhs ) VULKAN_HPP_NOEXCEPT : m_sampler( exchange( rhs.m_sampler, {} ) ) {}
-
-    Sampler & operator=( Sampler && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_sampler = exchange( rhs.m_sampler, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Sampler() = default;
 
     VULKAN_HPP_CONSTEXPR Sampler( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10146,6 +8517,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Sampler const & ) const = default;
+#else
+    bool operator==( Sampler const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_sampler == rhs.m_sampler;
+    }
+
+    bool operator!=( Sampler const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_sampler != rhs.m_sampler;
+    }
+
+    bool operator<( Sampler const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_sampler < rhs.m_sampler;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSampler() const VULKAN_HPP_NOEXCEPT
     {
       return m_sampler;
@@ -10166,59 +8556,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eSampler>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eSampler>
   {
-    using Type = Sampler;
+    using Type = VULKAN_HPP_NAMESPACE::Sampler;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eSampler>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSampler>
   {
-    using Type = Sampler;
+    using Type = VULKAN_HPP_NAMESPACE::Sampler;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkSampler, VK_NULL_HANDLE>
   {
-    using Type = Sampler;
+    using Type = VULKAN_HPP_NAMESPACE::Sampler;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Sampler>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Sampler>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkSamplerYcbcrConversion, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversion.html
   class SamplerYcbcrConversion
   {
   public:
     using CType      = VkSamplerYcbcrConversion;
     using NativeType = VkSamplerYcbcrConversion;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSamplerYcbcrConversion;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSamplerYcbcrConversion;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
 
   public:
-    SamplerYcbcrConversion() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    SamplerYcbcrConversion( SamplerYcbcrConversion const & rhs )             = default;
-    SamplerYcbcrConversion & operator=( SamplerYcbcrConversion const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    SamplerYcbcrConversion( SamplerYcbcrConversion && rhs )             = default;
-    SamplerYcbcrConversion & operator=( SamplerYcbcrConversion && rhs ) = default;
-#else
-    SamplerYcbcrConversion( SamplerYcbcrConversion && rhs ) VULKAN_HPP_NOEXCEPT : m_samplerYcbcrConversion( exchange( rhs.m_samplerYcbcrConversion, {} ) ) {}
-
-    SamplerYcbcrConversion & operator=( SamplerYcbcrConversion && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_samplerYcbcrConversion = exchange( rhs.m_samplerYcbcrConversion, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversion() = default;
 
     VULKAN_HPP_CONSTEXPR SamplerYcbcrConversion( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10241,6 +8615,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( SamplerYcbcrConversion const & ) const = default;
+#else
+    bool operator==( SamplerYcbcrConversion const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_samplerYcbcrConversion == rhs.m_samplerYcbcrConversion;
+    }
+
+    bool operator!=( SamplerYcbcrConversion const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_samplerYcbcrConversion != rhs.m_samplerYcbcrConversion;
+    }
+
+    bool operator<( SamplerYcbcrConversion const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_samplerYcbcrConversion < rhs.m_samplerYcbcrConversion;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSamplerYcbcrConversion() const VULKAN_HPP_NOEXCEPT
     {
       return m_samplerYcbcrConversion;
@@ -10261,61 +8654,45 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eSamplerYcbcrConversion>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eSamplerYcbcrConversion>
   {
-    using Type = SamplerYcbcrConversion;
+    using Type = VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eSamplerYcbcrConversion>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSamplerYcbcrConversion>
   {
-    using Type = SamplerYcbcrConversion;
+    using Type = VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkSamplerYcbcrConversion, VK_NULL_HANDLE>
   {
-    using Type = SamplerYcbcrConversion;
+    using Type = VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<SamplerYcbcrConversion>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
   using SamplerYcbcrConversionKHR = SamplerYcbcrConversion;
 
-  // wrapper class for handle VkShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModule.html
   class ShaderModule
   {
   public:
     using CType      = VkShaderModule;
     using NativeType = VkShaderModule;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eShaderModule;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eShaderModule;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eShaderModule;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eShaderModule;
 
   public:
-    ShaderModule() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    ShaderModule( ShaderModule const & rhs )             = default;
-    ShaderModule & operator=( ShaderModule const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    ShaderModule( ShaderModule && rhs )             = default;
-    ShaderModule & operator=( ShaderModule && rhs ) = default;
-#else
-    ShaderModule( ShaderModule && rhs ) VULKAN_HPP_NOEXCEPT : m_shaderModule( exchange( rhs.m_shaderModule, {} ) ) {}
-
-    ShaderModule & operator=( ShaderModule && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_shaderModule = exchange( rhs.m_shaderModule, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR ShaderModule() = default;
 
     VULKAN_HPP_CONSTEXPR ShaderModule( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10335,6 +8712,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( ShaderModule const & ) const = default;
+#else
+    bool operator==( ShaderModule const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderModule == rhs.m_shaderModule;
+    }
+
+    bool operator!=( ShaderModule const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderModule != rhs.m_shaderModule;
+    }
+
+    bool operator<( ShaderModule const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_shaderModule < rhs.m_shaderModule;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkShaderModule() const VULKAN_HPP_NOEXCEPT
     {
       return m_shaderModule;
@@ -10355,231 +8751,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eShaderModule>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eShaderModule>
   {
-    using Type = ShaderModule;
+    using Type = VULKAN_HPP_NAMESPACE::ShaderModule;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eShaderModule>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eShaderModule>
   {
-    using Type = ShaderModule;
+    using Type = VULKAN_HPP_NAMESPACE::ShaderModule;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkShaderModule, VK_NULL_HANDLE>
   {
-    using Type = ShaderModule;
+    using Type = VULKAN_HPP_NAMESPACE::ShaderModule;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<ShaderModule>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::ShaderModule>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorARM.html
-  class TensorARM
-  {
-  public:
-    using CType      = VkTensorARM;
-    using NativeType = VkTensorARM;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eTensorARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    TensorARM() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    TensorARM( TensorARM const & rhs )             = default;
-    TensorARM & operator=( TensorARM const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    TensorARM( TensorARM && rhs )             = default;
-    TensorARM & operator=( TensorARM && rhs ) = default;
-#else
-    TensorARM( TensorARM && rhs ) VULKAN_HPP_NOEXCEPT : m_tensorARM( exchange( rhs.m_tensorARM, {} ) ) {}
-
-    TensorARM & operator=( TensorARM && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorARM = exchange( rhs.m_tensorARM, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR TensorARM( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT TensorARM( VkTensorARM tensorARM ) VULKAN_HPP_NOEXCEPT : m_tensorARM( tensorARM ) {}
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    TensorARM & operator=( VkTensorARM tensorARM ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorARM = tensorARM;
-      return *this;
-    }
-#endif
-
-    TensorARM & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorARM = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkTensorARM() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorARM;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorARM != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorARM == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkTensorARM m_tensorARM = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eTensorARM>
-  {
-    using Type = TensorARM;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkTensorARM, VK_NULL_HANDLE>
-  {
-    using Type = TensorARM;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<TensorARM>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewARM.html
-  class TensorViewARM
-  {
-  public:
-    using CType      = VkTensorViewARM;
-    using NativeType = VkTensorViewARM;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eTensorViewARM;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    TensorViewARM() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    TensorViewARM( TensorViewARM const & rhs )             = default;
-    TensorViewARM & operator=( TensorViewARM const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    TensorViewARM( TensorViewARM && rhs )             = default;
-    TensorViewARM & operator=( TensorViewARM && rhs ) = default;
-#else
-    TensorViewARM( TensorViewARM && rhs ) VULKAN_HPP_NOEXCEPT : m_tensorViewARM( exchange( rhs.m_tensorViewARM, {} ) ) {}
-
-    TensorViewARM & operator=( TensorViewARM && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorViewARM = exchange( rhs.m_tensorViewARM, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR TensorViewARM( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT TensorViewARM( VkTensorViewARM tensorViewARM ) VULKAN_HPP_NOEXCEPT : m_tensorViewARM( tensorViewARM ) {}
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    TensorViewARM & operator=( VkTensorViewARM tensorViewARM ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorViewARM = tensorViewARM;
-      return *this;
-    }
-#endif
-
-    TensorViewARM & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_tensorViewARM = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkTensorViewARM() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorViewARM;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorViewARM != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_tensorViewARM == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkTensorViewARM m_tensorViewARM = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::eTensorViewARM>
-  {
-    using Type = TensorViewARM;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkTensorViewARM, VK_NULL_HANDLE>
-  {
-    using Type = TensorViewARM;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<TensorViewARM>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCacheEXT.html
   class ValidationCacheEXT
   {
   public:
     using CType      = VkValidationCacheEXT;
     using NativeType = VkValidationCacheEXT;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eValidationCacheEXT;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eValidationCacheEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eValidationCacheEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eValidationCacheEXT;
 
   public:
-    ValidationCacheEXT() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    ValidationCacheEXT( ValidationCacheEXT const & rhs )             = default;
-    ValidationCacheEXT & operator=( ValidationCacheEXT const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    ValidationCacheEXT( ValidationCacheEXT && rhs )             = default;
-    ValidationCacheEXT & operator=( ValidationCacheEXT && rhs ) = default;
-#else
-    ValidationCacheEXT( ValidationCacheEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_validationCacheEXT( exchange( rhs.m_validationCacheEXT, {} ) ) {}
-
-    ValidationCacheEXT & operator=( ValidationCacheEXT && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_validationCacheEXT = exchange( rhs.m_validationCacheEXT, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR ValidationCacheEXT() = default;
 
     VULKAN_HPP_CONSTEXPR ValidationCacheEXT( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10601,6 +8809,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( ValidationCacheEXT const & ) const = default;
+#else
+    bool operator==( ValidationCacheEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_validationCacheEXT == rhs.m_validationCacheEXT;
+    }
+
+    bool operator!=( ValidationCacheEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_validationCacheEXT != rhs.m_validationCacheEXT;
+    }
+
+    bool operator<( ValidationCacheEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_validationCacheEXT < rhs.m_validationCacheEXT;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkValidationCacheEXT() const VULKAN_HPP_NOEXCEPT
     {
       return m_validationCacheEXT;
@@ -10621,62 +8848,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eValidationCacheEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eValidationCacheEXT>
   {
-    using Type = ValidationCacheEXT;
+    using Type = VULKAN_HPP_NAMESPACE::ValidationCacheEXT;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eValidationCacheEXT>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eValidationCacheEXT>
   {
-    using Type = ValidationCacheEXT;
+    using Type = VULKAN_HPP_NAMESPACE::ValidationCacheEXT;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkValidationCacheEXT, VK_NULL_HANDLE>
   {
-    using Type = ValidationCacheEXT;
+    using Type = VULKAN_HPP_NAMESPACE::ValidationCacheEXT;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<ValidationCacheEXT>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkVideoSessionParametersKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersKHR.html
   class VideoSessionParametersKHR
   {
   public:
     using CType      = VkVideoSessionParametersKHR;
     using NativeType = VkVideoSessionParametersKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eVideoSessionParametersKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionParametersKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
   public:
-    VideoSessionParametersKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    VideoSessionParametersKHR( VideoSessionParametersKHR const & rhs )             = default;
-    VideoSessionParametersKHR & operator=( VideoSessionParametersKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    VideoSessionParametersKHR( VideoSessionParametersKHR && rhs )             = default;
-    VideoSessionParametersKHR & operator=( VideoSessionParametersKHR && rhs ) = default;
-#else
-    VideoSessionParametersKHR( VideoSessionParametersKHR && rhs ) VULKAN_HPP_NOEXCEPT
-      : m_videoSessionParametersKHR( exchange( rhs.m_videoSessionParametersKHR, {} ) )
-    {
-    }
-
-    VideoSessionParametersKHR & operator=( VideoSessionParametersKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_videoSessionParametersKHR = exchange( rhs.m_videoSessionParametersKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR VideoSessionParametersKHR() = default;
 
     VULKAN_HPP_CONSTEXPR VideoSessionParametersKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10699,6 +8907,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( VideoSessionParametersKHR const & ) const = default;
+#else
+    bool operator==( VideoSessionParametersKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionParametersKHR == rhs.m_videoSessionParametersKHR;
+    }
+
+    bool operator!=( VideoSessionParametersKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionParametersKHR != rhs.m_videoSessionParametersKHR;
+    }
+
+    bool operator<( VideoSessionParametersKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_videoSessionParametersKHR < rhs.m_videoSessionParametersKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkVideoSessionParametersKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_videoSessionParametersKHR;
@@ -10719,139 +8946,37 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eVideoSessionParametersKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionParametersKHR>
   {
-    using Type = VideoSessionParametersKHR;
+    using Type = VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkVideoSessionParametersKHR, VK_NULL_HANDLE>
   {
-    using Type = VideoSessionParametersKHR;
+    using Type = VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<VideoSessionParametersKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryKHR.html
-  class PipelineBinaryKHR
-  {
-  public:
-    using CType      = VkPipelineBinaryKHR;
-    using NativeType = VkPipelineBinaryKHR;
-
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineBinaryKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-  public:
-    PipelineBinaryKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PipelineBinaryKHR( PipelineBinaryKHR const & rhs )             = default;
-    PipelineBinaryKHR & operator=( PipelineBinaryKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PipelineBinaryKHR( PipelineBinaryKHR && rhs )             = default;
-    PipelineBinaryKHR & operator=( PipelineBinaryKHR && rhs ) = default;
-#else
-    PipelineBinaryKHR( PipelineBinaryKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_pipelineBinaryKHR( exchange( rhs.m_pipelineBinaryKHR, {} ) ) {}
-
-    PipelineBinaryKHR & operator=( PipelineBinaryKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipelineBinaryKHR = exchange( rhs.m_pipelineBinaryKHR, {} );
-      return *this;
-    }
-#endif
-
-    VULKAN_HPP_CONSTEXPR PipelineBinaryKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT PipelineBinaryKHR( VkPipelineBinaryKHR pipelineBinaryKHR ) VULKAN_HPP_NOEXCEPT : m_pipelineBinaryKHR( pipelineBinaryKHR ) {}
-
-#if ( VULKAN_HPP_TYPESAFE_CONVERSION == 1 )
-    PipelineBinaryKHR & operator=( VkPipelineBinaryKHR pipelineBinaryKHR ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipelineBinaryKHR = pipelineBinaryKHR;
-      return *this;
-    }
-#endif
-
-    PipelineBinaryKHR & operator=( std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      m_pipelineBinaryKHR = {};
-      return *this;
-    }
-
-    VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipelineBinaryKHR() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_pipelineBinaryKHR;
-    }
-
-    explicit operator bool() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_pipelineBinaryKHR != VK_NULL_HANDLE;
-    }
-
-    bool operator!() const VULKAN_HPP_NOEXCEPT
-    {
-      return m_pipelineBinaryKHR == VK_NULL_HANDLE;
-    }
-
-  private:
-    VkPipelineBinaryKHR m_pipelineBinaryKHR = {};
-  };
-
-  template <>
-  struct CppType<ObjectType, ObjectType::ePipelineBinaryKHR>
-  {
-    using Type = PipelineBinaryKHR;
-  };
-
-#if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
-  template <>
-  struct CppType<VkPipelineBinaryKHR, VK_NULL_HANDLE>
-  {
-    using Type = PipelineBinaryKHR;
-  };
-#endif
-
-  template <>
-  struct isVulkanHandleType<PipelineBinaryKHR>
-  {
-    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-  };
-
-  // wrapper class for handle VkQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueue.html
   class Queue
   {
   public:
     using CType      = VkQueue;
     using NativeType = VkQueue;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eQueue;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eQueue;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eQueue;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueue;
 
   public:
-    Queue() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Queue( Queue const & rhs )             = default;
-    Queue & operator=( Queue const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Queue( Queue && rhs )             = default;
-    Queue & operator=( Queue && rhs ) = default;
-#else
-    Queue( Queue && rhs ) VULKAN_HPP_NOEXCEPT : m_queue( exchange( rhs.m_queue, {} ) ) {}
-
-    Queue & operator=( Queue && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_queue = exchange( rhs.m_queue, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Queue() = default;
 
     VULKAN_HPP_CONSTEXPR Queue( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -10869,220 +8994,185 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Queue const & ) const = default;
+#else
+    bool operator==( Queue const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queue == rhs.m_queue;
+    }
+
+    bool operator!=( Queue const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queue != rhs.m_queue;
+    }
+
+    bool operator<( Queue const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_queue < rhs.m_queue;
+    }
+#endif
+
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result submit( uint32_t           submitCount,
-                                        const SubmitInfo * pSubmits,
-                                        Fence              fence,
-                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result submit( uint32_t                                 submitCount,
+                                        const VULKAN_HPP_NAMESPACE::SubmitInfo * pSubmits,
+                                        VULKAN_HPP_NAMESPACE::Fence              fence,
+                                        Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type submit( ArrayProxy<const SubmitInfo> const & submits,
-                                                                                         Fence fence        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      submit( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo> const & submits,
+              VULKAN_HPP_NAMESPACE::Fence fence                                                VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+              Dispatch const & d                                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result waitIdle( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type waitIdle( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindSparse( uint32_t               bindInfoCount,
-                                            const BindSparseInfo * pBindInfo,
-                                            Fence                  fence,
-                                            Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindSparse( uint32_t                                     bindInfoCount,
+                                            const VULKAN_HPP_NAMESPACE::BindSparseInfo * pBindInfo,
+                                            VULKAN_HPP_NAMESPACE::Fence                  fence,
+                                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindSparse( ArrayProxy<const BindSparseInfo> const & bindInfo,
-                  Fence fence                              VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                  Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindSparse( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindSparseInfo> const & bindInfo,
+                  VULKAN_HPP_NAMESPACE::Fence fence                                                    VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                  Dispatch const & d                                                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_3 ===
 
-    // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result submit2( uint32_t            submitCount,
-                                         const SubmitInfo2 * pSubmits,
-                                         Fence               fence,
-                                         Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result submit2( uint32_t                                  submitCount,
+                                         const VULKAN_HPP_NAMESPACE::SubmitInfo2 * pSubmits,
+                                         VULKAN_HPP_NAMESPACE::Fence               fence,
+                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type submit2( ArrayProxy<const SubmitInfo2> const & submits,
-                                                                                          Fence fence        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      submit2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+               VULKAN_HPP_NAMESPACE::Fence fence                                                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+               Dispatch const & d                                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_swapchain ===
 
-    // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result presentKHR( const PresentInfoKHR * pPresentInfo,
-                                            Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR * pPresentInfo,
+                                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result presentKHR( const PresentInfoKHR & presentInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR & presentInfo,
+                                                                  Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_debug_utils ===
 
-    // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo,
-                                  Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                  Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                  Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkQueueEndDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueEndDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void endDebugUtilsLabelEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT * pLabelInfo,
-                                   Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pLabelInfo,
+                                   Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo,
-                                   Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo,
+                                   Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_device_diagnostic_checkpoints ===
 
-    // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getCheckpointDataNV( uint32_t *         pCheckpointDataCount,
-                              CheckpointDataNV * pCheckpointData,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getCheckpointDataNV( uint32_t *                               pCheckpointDataCount,
+                              VULKAN_HPP_NAMESPACE::CheckpointDataNV * pCheckpointData,
+                              Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-    template <typename CheckpointDataNVAllocator = std::allocator<CheckpointDataNV>,
-              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, CheckpointDataNV>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                            = true>
-    VULKAN_HPP_NODISCARD std::vector<CheckpointDataNV, CheckpointDataNVAllocator>
+    template <typename CheckpointDataNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CheckpointDataNV>,
+              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator>
                          getCheckpointDataNV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-    template <typename CheckpointDataNVAllocator = std::allocator<CheckpointDataNV>,
-              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, CheckpointDataNV>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                            = true>
-    VULKAN_HPP_NODISCARD std::vector<CheckpointDataNV, CheckpointDataNVAllocator>
+    template <
+      typename CheckpointDataNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CheckpointDataNV>,
+      typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename CheckpointDataNVAllocator::value_type, VULKAN_HPP_NAMESPACE::CheckpointDataNV>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV, CheckpointDataNVAllocator>
       getCheckpointDataNV( CheckpointDataNVAllocator & checkpointDataNVAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getCheckpointData2NV( uint32_t *          pCheckpointDataCount,
-                               CheckpointData2NV * pCheckpointData,
-                               Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-    template <typename CheckpointData2NVAllocator = std::allocator<CheckpointData2NV>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, CheckpointData2NV>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD std::vector<CheckpointData2NV, CheckpointData2NVAllocator>
-                         getCheckpointData2NV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-    template <typename CheckpointData2NVAllocator = std::allocator<CheckpointData2NV>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, CheckpointData2NV>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD std::vector<CheckpointData2NV, CheckpointData2NVAllocator>
-      getCheckpointData2NV( CheckpointData2NVAllocator & checkpointData2NVAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     //=== VK_INTEL_performance_query ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+         setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
+                                           Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_synchronization2 ===
 
-    // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result submit2KHR( uint32_t            submitCount,
-                                            const SubmitInfo2 * pSubmits,
-                                            Fence               fence,
-                                            Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result submit2KHR( uint32_t                                  submitCount,
+                                            const VULKAN_HPP_NAMESPACE::SubmitInfo2 * pSubmits,
+                                            VULKAN_HPP_NAMESPACE::Fence               fence,
+                                            Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      submit2KHR( ArrayProxy<const SubmitInfo2> const & submits,
-                  Fence fence                           VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                  Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      submit2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+                  VULKAN_HPP_NAMESPACE::Fence fence                                                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                  Dispatch const & d                                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getCheckpointData2NV( uint32_t *                                pCheckpointDataCount,
+                               VULKAN_HPP_NAMESPACE::CheckpointData2NV * pCheckpointData,
+                               Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename CheckpointData2NVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CheckpointData2NV>,
+              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator>
+                         getCheckpointData2NV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename CheckpointData2NVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CheckpointData2NV>,
+      typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename CheckpointData2NVAllocator::value_type, VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV, CheckpointData2NVAllocator>
+      getCheckpointData2NV( CheckpointData2NVAllocator & checkpointData2NVAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_low_latency2 ===
 
-    // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV * pQueueTypeInfo,
-                            Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV * pQueueTypeInfo,
+                            Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV & queueTypeInfo,
-                            Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV & queueTypeInfo,
+                            Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-#if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_native_buffer ===
-
-    // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result signalReleaseImageOHOS( uint32_t           waitSemaphoreCount,
-                                                        const Semaphore *  pWaitSemaphores,
-                                                        Image              image,
-                                                        int32_t *          pNativeFenceFd,
-                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<int32_t>::type signalReleaseImageOHOS( ArrayProxy<const Semaphore> const & waitSemaphores,
-                                                                                         Image                               image,
-                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_OHOS*/
-
     operator VkQueue() const VULKAN_HPP_NOEXCEPT
     {
       return m_queue;
@@ -11103,59 +9193,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eQueue>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eQueue>
   {
-    using Type = Queue;
+    using Type = VULKAN_HPP_NAMESPACE::Queue;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eQueue>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueue>
   {
-    using Type = Queue;
+    using Type = VULKAN_HPP_NAMESPACE::Queue;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkQueue, VK_NULL_HANDLE>
   {
-    using Type = Queue;
+    using Type = VULKAN_HPP_NAMESPACE::Queue;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Queue>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Queue>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDevice.html
   class Device
   {
   public:
     using CType      = VkDevice;
     using NativeType = VkDevice;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDevice;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDevice;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDevice;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDevice;
 
   public:
-    Device() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Device( Device const & rhs )             = default;
-    Device & operator=( Device const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Device( Device && rhs )             = default;
-    Device & operator=( Device && rhs ) = default;
-#else
-    Device( Device && rhs ) VULKAN_HPP_NOEXCEPT : m_device( exchange( rhs.m_device, {} ) ) {}
-
-    Device & operator=( Device && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_device = exchange( rhs.m_device, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Device() = default;
 
     VULKAN_HPP_CONSTEXPR Device( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -11173,7553 +9247,5078 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Device const & ) const = default;
+#else
+    bool operator==( Device const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_device == rhs.m_device;
+    }
+
+    bool operator!=( Device const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_device != rhs.m_device;
+    }
+
+    bool operator<( Device const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_device < rhs.m_device;
+    }
+#endif
+
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     PFN_vkVoidFunction getProcAddr( const char * pName, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    PFN_VoidFunction getProcAddr( const std::string & name, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    PFN_vkVoidFunction getProcAddr( const std::string & name, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDevice.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDevice.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueue( uint32_t           queueFamilyIndex,
-                   uint32_t           queueIndex,
-                   Queue *            pQueue,
-                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueue( uint32_t                      queueFamilyIndex,
+                   uint32_t                      queueIndex,
+                   VULKAN_HPP_NAMESPACE::Queue * pQueue,
+                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Queue getQueue( uint32_t           queueFamilyIndex,
-                                         uint32_t           queueIndex,
-                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Queue
+      getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result waitIdle( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type waitIdle( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result allocateMemory( const MemoryAllocateInfo *  pAllocateInfo,
-                                                const AllocationCallbacks * pAllocator,
-                                                DeviceMemory *              pMemory,
-                                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result allocateMemory( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo *  pAllocateInfo,
+                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                VULKAN_HPP_NAMESPACE::DeviceMemory *              pMemory,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DeviceMemory>::type
-      allocateMemory( const MemoryAllocateInfo &                    allocateInfo,
-                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceMemory>::type
+      allocateMemory( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo &                    allocateInfo,
+                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DeviceMemory, Dispatch>>::type
-      allocateMemoryUnique( const MemoryAllocateInfo &                    allocateInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DeviceMemory, Dispatch>>::type
+      allocateMemoryUnique( const VULKAN_HPP_NAMESPACE::MemoryAllocateInfo &                    allocateInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void freeMemory( DeviceMemory                memory,
-                     const AllocationCallbacks * pAllocator,
-                     Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
+                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                     Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void freeMemory( DeviceMemory memory                           VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void freeMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory                           VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void( free )( DeviceMemory                memory,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void( free )( VULKAN_HPP_NAMESPACE::DeviceMemory                memory,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void( free )( DeviceMemory                                  memory,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void( free )( VULKAN_HPP_NAMESPACE::DeviceMemory                                  memory,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result mapMemory( DeviceMemory       memory,
-                                           DeviceSize         offset,
-                                           DeviceSize         size,
-                                           MemoryMapFlags     flags,
-                                           void **            ppData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory   memory,
+                                           VULKAN_HPP_NAMESPACE::DeviceSize     offset,
+                                           VULKAN_HPP_NAMESPACE::DeviceSize     size,
+                                           VULKAN_HPP_NAMESPACE::MemoryMapFlags flags,
+                                           void **                              ppData,
+                                           Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory         memory,
+                                                                           VULKAN_HPP_NAMESPACE::DeviceSize           offset,
+                                                                           VULKAN_HPP_NAMESPACE::DeviceSize           size,
+                                                                           VULKAN_HPP_NAMESPACE::MemoryMapFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void unmapMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result flushMappedMemoryRanges( uint32_t                                        memoryRangeCount,
+                                                         const VULKAN_HPP_NAMESPACE::MappedMemoryRange * pMemoryRanges,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      flushMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result invalidateMappedMemoryRanges( uint32_t                                        memoryRangeCount,
+                                                              const VULKAN_HPP_NAMESPACE::MappedMemoryRange * pMemoryRanges,
+                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      invalidateMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges,
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                              VULKAN_HPP_NAMESPACE::DeviceSize * pCommittedMemoryInBytes,
+                              Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize
+      getMemoryCommitment( VULKAN_HPP_NAMESPACE::DeviceMemory memory, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindBufferMemory( VULKAN_HPP_NAMESPACE::Buffer       buffer,
+                                                  VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                                                  Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#else
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      bindBufferMemory( VULKAN_HPP_NAMESPACE::Buffer       buffer,
+                        VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                        VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                        Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindImageMemory( VULKAN_HPP_NAMESPACE::Image        image,
+                                                 VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                                                 VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                                                 Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#else
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      bindImageMemory( VULKAN_HPP_NAMESPACE::Image        image,
+                       VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                       VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset,
+                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getBufferMemoryRequirements( VULKAN_HPP_NAMESPACE::Buffer               buffer,
+                                      VULKAN_HPP_NAMESPACE::MemoryRequirements * pMemoryRequirements,
+                                      Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements
+      getBufferMemoryRequirements( VULKAN_HPP_NAMESPACE::Buffer buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                image,
+                                     VULKAN_HPP_NAMESPACE::MemoryRequirements * pMemoryRequirements,
+                                     Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements
+      getImageMemoryRequirements( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image                           image,
+                                           uint32_t *                                            pSparseMemoryRequirementCount,
+                                           VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements * pSparseMemoryRequirements,
                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory( DeviceMemory         memory,
-                                                                           DeviceSize           offset,
-                                                                           DeviceSize           size,
-                                                                           MemoryMapFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                           Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkUnmapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void unmapMemory( DeviceMemory memory, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result flushMappedMemoryRanges( uint32_t                  memoryRangeCount,
-                                                         const MappedMemoryRange * pMemoryRanges,
-                                                         Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      flushMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkInvalidateMappedMemoryRanges, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result invalidateMappedMemoryRanges( uint32_t                  memoryRangeCount,
-                                                              const MappedMemoryRange * pMemoryRanges,
-                                                              Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkInvalidateMappedMemoryRanges, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      invalidateMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges,
-                                    Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDeviceMemoryCommitment, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMemoryCommitment( DeviceMemory       memory,
-                              DeviceSize *       pCommittedMemoryInBytes,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceMemoryCommitment, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DeviceSize getMemoryCommitment( DeviceMemory       memory,
-                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindBufferMemory( Buffer             buffer,
-                                                  DeviceMemory       memory,
-                                                  DeviceSize         memoryOffset,
-                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#else
-    // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindBufferMemory( Buffer buffer, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindImageMemory( Image              image,
-                                                 DeviceMemory       memory,
-                                                 DeviceSize         memoryOffset,
-                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#else
-    // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindImageMemory( Image image, DeviceMemory memory, DeviceSize memoryOffset, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    // wrapper function for command vkGetBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getBufferMemoryRequirements( Buffer               buffer,
-                                      MemoryRequirements * pMemoryRequirements,
-                                      Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements
-      getBufferMemoryRequirements( Buffer buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageMemoryRequirements( Image                image,
-                                     MemoryRequirements * pMemoryRequirements,
-                                     Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements getImageMemoryRequirements( Image              image,
-                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSparseMemoryRequirements( Image                           image,
-                                           uint32_t *                      pSparseMemoryRequirementCount,
-                                           SparseImageMemoryRequirements * pSparseMemoryRequirements,
-                                           Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-    template <
-      typename SparseImageMemoryRequirementsAllocator = std::allocator<SparseImageMemoryRequirements>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, SparseImageMemoryRequirements>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
-                         getImageSparseMemoryRequirements( Image image, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-    template <
-      typename SparseImageMemoryRequirementsAllocator = std::allocator<SparseImageMemoryRequirements>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, SparseImageMemoryRequirements>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
-                         getImageSparseMemoryRequirements( Image                                    image,
+    template <typename SparseImageMemoryRequirementsAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
+      getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirementsAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageMemoryRequirementsAllocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements, SparseImageMemoryRequirementsAllocator>
+                         getImageSparseMemoryRequirements( VULKAN_HPP_NAMESPACE::Image              image,
                                                            SparseImageMemoryRequirementsAllocator & sparseImageMemoryRequirementsAllocator,
                                                            Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createFence( const FenceCreateInfo *     pCreateInfo,
-                                             const AllocationCallbacks * pAllocator,
-                                             Fence *                     pFence,
-                                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-      createFence( const FenceCreateInfo &                       createInfo,
-                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type
-      createFenceUnique( const FenceCreateInfo &                       createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyFence( Fence                       fence,
-                       const AllocationCallbacks * pAllocator,
-                       Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyFence( Fence fence                                   VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Fence fence, const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFence.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Fence                                         fence,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result resetFences( uint32_t           fenceCount,
-                                             const Fence *      pFences,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createFence( const VULKAN_HPP_NAMESPACE::FenceCreateInfo *     pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                             VULKAN_HPP_NAMESPACE::Fence *                     pFence,
                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      resetFences( ArrayProxy<const Fence> const & fences, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type
+      createFence( const VULKAN_HPP_NAMESPACE::FenceCreateInfo &                       createInfo,
+                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type
+      createFenceUnique( const VULKAN_HPP_NAMESPACE::FenceCreateInfo &                       createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyFence( VULKAN_HPP_NAMESPACE::Fence                       fence,
+                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                       Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyFence( VULKAN_HPP_NAMESPACE::Fence fence                                   VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Fence                       fence,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Fence                                         fence,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result resetFences( uint32_t                            fenceCount,
+                                             const VULKAN_HPP_NAMESPACE::Fence * pFences,
+                                             Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type resetFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFenceStatus( Fence fence, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFenceStatus( VULKAN_HPP_NAMESPACE::Fence fence,
+                                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFenceStatus( Fence fence, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getFenceStatus( VULKAN_HPP_NAMESPACE::Fence fence,
+                                                                      Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitForFences( uint32_t           fenceCount,
-                                               const Fence *      pFences,
-                                               Bool32             waitAll,
-                                               uint64_t           timeout,
-                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result waitForFences( uint32_t                            fenceCount,
+                                               const VULKAN_HPP_NAMESPACE::Fence * pFences,
+                                               VULKAN_HPP_NAMESPACE::Bool32        waitAll,
+                                               uint64_t                            timeout,
+                                               Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitForFences( ArrayProxy<const Fence> const & fences,
-                                               Bool32                          waitAll,
-                                               uint64_t                        timeout,
-                                               Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitForFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences,
+                                                                     VULKAN_HPP_NAMESPACE::Bool32                                                waitAll,
+                                                                     uint64_t                                                                    timeout,
+                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSemaphore( const SemaphoreCreateInfo * pCreateInfo,
-                                                 const AllocationCallbacks * pAllocator,
-                                                 Semaphore *                 pSemaphore,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo * pCreateInfo,
+                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                 VULKAN_HPP_NAMESPACE::Semaphore *                 pSemaphore,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Semaphore>::type
-      createSemaphore( const SemaphoreCreateInfo &                   createInfo,
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Semaphore>::type
+      createSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo &                   createInfo,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Semaphore, Dispatch>>::type
-      createSemaphoreUnique( const SemaphoreCreateInfo &                   createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Semaphore, Dispatch>>::type
+      createSemaphoreUnique( const VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo &                   createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySemaphore( Semaphore                   semaphore,
-                           const AllocationCallbacks * pAllocator,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
+                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySemaphore( Semaphore semaphore                           VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore                           VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Semaphore                   semaphore,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Semaphore                   semaphore,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Semaphore                                     semaphore,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Semaphore                                     semaphore,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createQueryPool( const QueryPoolCreateInfo * pCreateInfo,
-                                                 const AllocationCallbacks * pAllocator,
-                                                 QueryPool *                 pQueryPool,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createEvent( const VULKAN_HPP_NAMESPACE::EventCreateInfo *     pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                             VULKAN_HPP_NAMESPACE::Event *                     pEvent,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<QueryPool>::type
-      createQueryPool( const QueryPoolCreateInfo &                   createInfo,
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Event>::type
+      createEvent( const VULKAN_HPP_NAMESPACE::EventCreateInfo &                       createInfo,
+                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<QueryPool, Dispatch>>::type
-      createQueryPoolUnique( const QueryPoolCreateInfo &                   createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Event, Dispatch>>::type
+      createEventUnique( const VULKAN_HPP_NAMESPACE::EventCreateInfo &                       createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyQueryPool( QueryPool                   queryPool,
-                           const AllocationCallbacks * pAllocator,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyEvent( VULKAN_HPP_NAMESPACE::Event                       event,
+                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                       Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyQueryPool( QueryPool queryPool                           VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyEvent( VULKAN_HPP_NAMESPACE::Event event                                   VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( QueryPool                   queryPool,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Event                       event,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( QueryPool                                     queryPool,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getQueryPoolResults( QueryPool          queryPool,
-                                                     uint32_t           firstQuery,
-                                                     uint32_t           queryCount,
-                                                     size_t             dataSize,
-                                                     void *             pData,
-                                                     DeviceSize         stride,
-                                                     QueryResultFlags   flags,
-                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<DataType, DataTypeAllocator>>
-                         getQueryPoolResults( QueryPool              queryPool,
-                                              uint32_t               firstQuery,
-                                              uint32_t               queryCount,
-                                              size_t                 dataSize,
-                                              DeviceSize             stride,
-                                              QueryResultFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                              Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<DataType> getQueryPoolResult( QueryPool              queryPool,
-                                                                   uint32_t               firstQuery,
-                                                                   uint32_t               queryCount,
-                                                                   DeviceSize             stride,
-                                                                   QueryResultFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                   Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createBuffer( const BufferCreateInfo *    pCreateInfo,
-                                              const AllocationCallbacks * pAllocator,
-                                              Buffer *                    pBuffer,
-                                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Buffer>::type
-      createBuffer( const BufferCreateInfo &                      createInfo,
-                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Buffer, Dispatch>>::type
-      createBufferUnique( const BufferCreateInfo &                      createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBuffer( Buffer                      buffer,
-                        const AllocationCallbacks * pAllocator,
-                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBuffer( Buffer buffer                                 VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      destroy( Buffer buffer, const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Buffer                                        buffer,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createImage( const ImageCreateInfo *     pCreateInfo,
-                                             const AllocationCallbacks * pAllocator,
-                                             Image *                     pImage,
-                                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Image>::type
-      createImage( const ImageCreateInfo &                       createInfo,
-                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Image, Dispatch>>::type
-      createImageUnique( const ImageCreateInfo &                       createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyImage( Image                       image,
-                       const AllocationCallbacks * pAllocator,
-                       Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyImage( Image image                                   VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Image image, const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Image                                         image,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetImageSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayout( Image                    image,
-                                    const ImageSubresource * pSubresource,
-                                    SubresourceLayout *      pLayout,
-                                    Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout getImageSubresourceLayout( Image                    image,
-                                                                      const ImageSubresource & subresource,
-                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createImageView( const ImageViewCreateInfo * pCreateInfo,
-                                                 const AllocationCallbacks * pAllocator,
-                                                 ImageView *                 pView,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageView>::type
-      createImageView( const ImageViewCreateInfo &                   createInfo,
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<ImageView, Dispatch>>::type
-      createImageViewUnique( const ImageViewCreateInfo &                   createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyImageView( ImageView                   imageView,
-                           const AllocationCallbacks * pAllocator,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyImageView( ImageView imageView                           VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ImageView                   imageView,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyImageView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ImageView                                     imageView,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createCommandPool( const CommandPoolCreateInfo * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   CommandPool *                 pCommandPool,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<CommandPool>::type
-      createCommandPool( const CommandPoolCreateInfo &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<CommandPool, Dispatch>>::type
-      createCommandPoolUnique( const CommandPoolCreateInfo &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCommandPool( CommandPool                 commandPool,
-                             const AllocationCallbacks * pAllocator,
-                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCommandPool( CommandPool commandPool                       VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CommandPool                 commandPool,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CommandPool                                   commandPool,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Event                                         event,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result resetCommandPool( CommandPool           commandPool,
-                                                  CommandPoolResetFlags flags,
-                                                  Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getEventStatus( VULKAN_HPP_NAMESPACE::Event event,
+                                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      resetCommandPool( CommandPool                 commandPool,
-                        CommandPoolResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result allocateCommandBuffers( const CommandBufferAllocateInfo * pAllocateInfo,
-                                                        CommandBuffer *                   pCommandBuffers,
-                                                        Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    template <typename CommandBufferAllocator = std::allocator<CommandBuffer>,
-              typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, CommandBuffer>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CommandBuffer, CommandBufferAllocator>>::type
-      allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    template <typename CommandBufferAllocator = std::allocator<CommandBuffer>,
-              typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, CommandBuffer>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CommandBuffer, CommandBufferAllocator>>::type
-      allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo,
-                              CommandBufferAllocator &          commandBufferAllocator,
-                              Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    template <typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename CommandBufferAllocator = std::allocator<UniqueHandle<CommandBuffer, Dispatch>>,
-              typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<CommandBuffer, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
-      allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    template <typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename CommandBufferAllocator = std::allocator<UniqueHandle<CommandBuffer, Dispatch>>,
-              typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<CommandBuffer, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
-      allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo,
-                                    CommandBufferAllocator &          commandBufferAllocator,
-                                    Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void freeCommandBuffers( CommandPool           commandPool,
-                             uint32_t              commandBufferCount,
-                             const CommandBuffer * pCommandBuffers,
-                             Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void freeCommandBuffers( CommandPool                             commandPool,
-                             ArrayProxy<const CommandBuffer> const & commandBuffers,
-                             Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void( free )( CommandPool           commandPool,
-                  uint32_t              commandBufferCount,
-                  const CommandBuffer * pCommandBuffers,
-                  Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeCommandBuffers.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void( free )( CommandPool                             commandPool,
-                  ArrayProxy<const CommandBuffer> const & commandBuffers,
-                  Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createEvent( const EventCreateInfo *     pCreateInfo,
-                                             const AllocationCallbacks * pAllocator,
-                                             Event *                     pEvent,
-                                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Event>::type
-      createEvent( const EventCreateInfo &                       createInfo,
-                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Event, Dispatch>>::type
-      createEventUnique( const EventCreateInfo &                       createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyEvent( Event                       event,
-                       const AllocationCallbacks * pAllocator,
-                       Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyEvent( Event event                                   VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Event event, const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Event                                         event,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getEventStatus( Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#else
-    // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getEventStatus( Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getEventStatus( VULKAN_HPP_NAMESPACE::Event event,
+                                                                      Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setEvent( Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setEvent( VULKAN_HPP_NAMESPACE::Event event,
+                                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type setEvent( Event              event,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type setEvent( VULKAN_HPP_NAMESPACE::Event event,
                                                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result resetEvent( Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result resetEvent( VULKAN_HPP_NAMESPACE::Event event,
+                                            Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      resetEvent( Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type resetEvent( VULKAN_HPP_NAMESPACE::Event event, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createBufferView( const BufferViewCreateInfo * pCreateInfo,
-                                                  const AllocationCallbacks *  pAllocator,
-                                                  BufferView *                 pView,
-                                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createQueryPool( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo * pCreateInfo,
+                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                 VULKAN_HPP_NAMESPACE::QueryPool *                 pQueryPool,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<BufferView>::type
-      createBufferView( const BufferViewCreateInfo &                  createInfo,
-                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::QueryPool>::type
+      createQueryPool( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo &                   createInfo,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<BufferView, Dispatch>>::type
-      createBufferViewUnique( const BufferViewCreateInfo &                  createInfo,
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::QueryPool, Dispatch>>::type
+      createQueryPoolUnique( const VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo &                   createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBufferView( BufferView                  bufferView,
-                            const AllocationCallbacks * pAllocator,
-                            Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
+                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBufferView( BufferView bufferView                         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool                           VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( BufferView                  bufferView,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::QueryPool                   queryPool,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferView.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( BufferView                                    bufferView,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::QueryPool                                     queryPool,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createShaderModule( const ShaderModuleCreateInfo * pCreateInfo,
-                                                    const AllocationCallbacks *    pAllocator,
-                                                    ShaderModule *                 pShaderModule,
-                                                    Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                                     uint32_t                               firstQuery,
+                                                     uint32_t                               queryCount,
+                                                     size_t                                 dataSize,
+                                                     void *                                 pData,
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                                     VULKAN_HPP_NAMESPACE::QueryResultFlags flags,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ShaderModule>::type
-      createShaderModule( const ShaderModuleCreateInfo &                createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<DataType, DataTypeAllocator>>
+                         getQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool              queryPool,
+                                              uint32_t                                     firstQuery,
+                                              uint32_t                                     queryCount,
+                                              size_t                                       dataSize,
+                                              VULKAN_HPP_NAMESPACE::DeviceSize             stride,
+                                              VULKAN_HPP_NAMESPACE::QueryResultFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                              Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<DataType> getQueryPoolResult( VULKAN_HPP_NAMESPACE::QueryPool              queryPool,
+                                                                   uint32_t                                     firstQuery,
+                                                                   uint32_t                                     queryCount,
+                                                                   VULKAN_HPP_NAMESPACE::DeviceSize             stride,
+                                                                   VULKAN_HPP_NAMESPACE::QueryResultFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createBuffer( const VULKAN_HPP_NAMESPACE::BufferCreateInfo *    pCreateInfo,
+                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                              VULKAN_HPP_NAMESPACE::Buffer *                    pBuffer,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Buffer>::type
+      createBuffer( const VULKAN_HPP_NAMESPACE::BufferCreateInfo &                      createInfo,
+                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<ShaderModule, Dispatch>>::type
-      createShaderModuleUnique( const ShaderModuleCreateInfo &                createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Buffer, Dispatch>>::type
+      createBufferUnique( const VULKAN_HPP_NAMESPACE::BufferCreateInfo &                      createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyShaderModule( ShaderModule                shaderModule,
-                              const AllocationCallbacks * pAllocator,
-                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
+                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                        Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyShaderModule( ShaderModule shaderModule                     VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer                                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ShaderModule                shaderModule,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Buffer                      buffer,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderModule.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ShaderModule                                  shaderModule,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Buffer                                        buffer,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createPipelineCache( const PipelineCacheCreateInfo * pCreateInfo,
-                                                     const AllocationCallbacks *     pAllocator,
-                                                     PipelineCache *                 pPipelineCache,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo * pCreateInfo,
+                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *  pAllocator,
+                                                  VULKAN_HPP_NAMESPACE::BufferView *                 pView,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PipelineCache>::type
-      createPipelineCache( const PipelineCacheCreateInfo &               createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferView>::type
+      createBufferView( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo &                  createInfo,
+                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<PipelineCache, Dispatch>>::type
-      createPipelineCacheUnique( const PipelineCacheCreateInfo &               createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::BufferView, Dispatch>>::type
+      createBufferViewUnique( const VULKAN_HPP_NAMESPACE::BufferViewCreateInfo &                  createInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineCache( PipelineCache               pipelineCache,
-                               const AllocationCallbacks * pAllocator,
-                               Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBufferView( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
+                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                            Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineCache( PipelineCache pipelineCache                   VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBufferView( VULKAN_HPP_NAMESPACE::BufferView bufferView                         VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineCache               pipelineCache,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::BufferView                  bufferView,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineCache.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineCache                                 pipelineCache,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::BufferView                                    bufferView,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelineCacheData( PipelineCache      pipelineCache,
-                                                      size_t *           pDataSize,
-                                                      void *             pData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createImage( const VULKAN_HPP_NAMESPACE::ImageCreateInfo *     pCreateInfo,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                             VULKAN_HPP_NAMESPACE::Image *                     pImage,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Image>::type
+      createImage( const VULKAN_HPP_NAMESPACE::ImageCreateInfo &                       createInfo,
+                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Image, Dispatch>>::type
+      createImageUnique( const VULKAN_HPP_NAMESPACE::ImageCreateInfo &                       createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyImage( VULKAN_HPP_NAMESPACE::Image                       image,
+                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                       Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyImage( VULKAN_HPP_NAMESPACE::Image image                                   VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Image                       image,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Image                                         image,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSubresourceLayout( VULKAN_HPP_NAMESPACE::Image                    image,
+                                    const VULKAN_HPP_NAMESPACE::ImageSubresource * pSubresource,
+                                    VULKAN_HPP_NAMESPACE::SubresourceLayout *      pLayout,
+                                    Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout
+                         getImageSubresourceLayout( VULKAN_HPP_NAMESPACE::Image                    image,
+                                                    const VULKAN_HPP_NAMESPACE::ImageSubresource & subresource,
+                                                    Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createImageView( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo * pCreateInfo,
+                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                 VULKAN_HPP_NAMESPACE::ImageView *                 pView,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageView>::type
+      createImageView( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo &                   createInfo,
+                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ImageView, Dispatch>>::type
+      createImageViewUnique( const VULKAN_HPP_NAMESPACE::ImageViewCreateInfo &                   createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyImageView( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
+                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyImageView( VULKAN_HPP_NAMESPACE::ImageView imageView                           VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ImageView                   imageView,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ImageView                                     imageView,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createShaderModule( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
+                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                    VULKAN_HPP_NAMESPACE::ShaderModule *                 pShaderModule,
+                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ShaderModule>::type
+      createShaderModule( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo &                createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderModule, Dispatch>>::type
+      createShaderModuleUnique( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo &                createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyShaderModule( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyShaderModule( VULKAN_HPP_NAMESPACE::ShaderModule shaderModule                     VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ShaderModule                                  shaderModule,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createPipelineCache( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo * pCreateInfo,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                     VULKAN_HPP_NAMESPACE::PipelineCache *                 pPipelineCache,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PipelineCache>::type
+      createPipelineCache( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo &               createInfo,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineCache, Dispatch>>::type
+      createPipelineCacheUnique( const VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo &               createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
+                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                               Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache                   VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PipelineCache               pipelineCache,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                                      size_t *                            pDataSize,
+                                                      void *                              pData,
+                                                      Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+      getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
+              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+      getPipelineCacheData( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                            Uint8_tAllocator &                  uint8_tAllocator,
+                            Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache         dstCache,
+                                                     uint32_t                                    srcCacheCount,
+                                                     const VULKAN_HPP_NAMESPACE::PipelineCache * pSrcCaches,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      mergePipelineCaches( VULKAN_HPP_NAMESPACE::PipelineCache                                                 dstCache,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches,
+                           Dispatch const & d                                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                      pipelineCache,
+                                                         uint32_t                                                 createInfoCount,
+                                                         const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo * pCreateInfos,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks *        pAllocator,
+                                                         VULKAN_HPP_NAMESPACE::Pipeline *                         pPipelines,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>,
+              typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createGraphicsPipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                                  PipelineAllocator &                                                                              pipelineAllocator,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                         createGraphicsPipeline( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                 const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo &            createInfo,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createGraphicsPipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator         = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createGraphicsPipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                              pipelineCache,
+                                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const & createInfos,
+                                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                        allocator,
+                                                        PipelineAllocator &                                                                              pipelineAllocator,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                         createGraphicsPipelineUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                       const VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo &            createInfo,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                     pipelineCache,
+                                                        uint32_t                                                createInfoCount,
+                                                        const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo * pCreateInfos,
+                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                        VULKAN_HPP_NAMESPACE::Pipeline *                        pPipelines,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>,
+              typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createComputePipelines( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                                 PipelineAllocator &                                                                             pipelineAllocator,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                         createComputePipeline( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo &             createInfo,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createComputePipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator         = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createComputePipelinesUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                             pipelineCache,
+                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const & createInfos,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                       allocator,
+                                                       PipelineAllocator &                                                                             pipelineAllocator,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                         createComputePipelineUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                      const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo &             createInfo,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipeline( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
+                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                          Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline                             VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Pipeline                    pipeline,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Pipeline                                      pipeline,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createPipelineLayout( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::PipelineLayout *                 pPipelineLayout,
                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getPipelineCacheData( PipelineCache pipelineCache, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type getPipelineCacheData(
-      PipelineCache pipelineCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result mergePipelineCaches( PipelineCache         dstCache,
-                                                     uint32_t              srcCacheCount,
-                                                     const PipelineCache * pSrcCaches,
-                                                     Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type mergePipelineCaches(
-      PipelineCache dstCache, ArrayProxy<const PipelineCache> const & srcCaches, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createComputePipelines( PipelineCache                     pipelineCache,
-                                                        uint32_t                          createInfoCount,
-                                                        const ComputePipelineCreateInfo * pCreateInfos,
-                                                        const AllocationCallbacks *       pAllocator,
-                                                        Pipeline *                        pPipelines,
-                                                        Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createComputePipelines( PipelineCache                                       pipelineCache,
-                                                 ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                                 Optional<const AllocationCallbacks> allocator       VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                 Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createComputePipelines( PipelineCache                                       pipelineCache,
-                                                 ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                                 Optional<const AllocationCallbacks>                 allocator,
-                                                 PipelineAllocator &                                 pipelineAllocator,
-                                                 Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline> createComputePipeline( PipelineCache                                 pipelineCache,
-                                                                      const ComputePipelineCreateInfo &             createInfo,
-                                                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PipelineLayout>::type
+      createPipelineLayout( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo &              createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createComputePipelinesUnique( PipelineCache                                       pipelineCache,
-                                                       ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                                       Optional<const AllocationCallbacks> allocator       VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                       Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createComputePipelinesUnique( PipelineCache                                       pipelineCache,
-                                                       ArrayProxy<const ComputePipelineCreateInfo> const & createInfos,
-                                                       Optional<const AllocationCallbacks>                 allocator,
-                                                       PipelineAllocator &                                 pipelineAllocator,
-                                                       Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createComputePipelineUnique( PipelineCache                                 pipelineCache,
-                                                      const ComputePipelineCreateInfo &             createInfo,
-                                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PipelineLayout, Dispatch>>::type
+      createPipelineLayoutUnique( const VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo &              createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipeline( Pipeline                    pipeline,
-                          const AllocationCallbacks * pAllocator,
-                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
+                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipeline( Pipeline pipeline                             VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout pipelineLayout                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Pipeline                    pipeline,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PipelineLayout              pipelineLayout,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipeline.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Pipeline                                      pipeline,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PipelineLayout                                pipelineLayout,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createPipelineLayout( const PipelineLayoutCreateInfo * pCreateInfo,
-                                                      const AllocationCallbacks *      pAllocator,
-                                                      PipelineLayout *                 pPipelineLayout,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSampler( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo *   pCreateInfo,
+                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                               VULKAN_HPP_NAMESPACE::Sampler *                   pSampler,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PipelineLayout>::type
-      createPipelineLayout( const PipelineLayoutCreateInfo &              createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Sampler>::type
+      createSampler( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo &                     createInfo,
+                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<PipelineLayout, Dispatch>>::type
-      createPipelineLayoutUnique( const PipelineLayoutCreateInfo &              createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Sampler, Dispatch>>::type
+      createSamplerUnique( const VULKAN_HPP_NAMESPACE::SamplerCreateInfo &                     createInfo,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineLayout( PipelineLayout              pipelineLayout,
-                                const AllocationCallbacks * pAllocator,
-                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySampler( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
+                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                         Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineLayout( PipelineLayout pipelineLayout                 VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySampler( VULKAN_HPP_NAMESPACE::Sampler sampler                               VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineLayout              pipelineLayout,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Sampler                     sampler,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineLayout                                pipelineLayout,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Sampler                                       sampler,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSampler( const SamplerCreateInfo *   pCreateInfo,
-                                               const AllocationCallbacks * pAllocator,
-                                               Sampler *                   pSampler,
-                                               Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Sampler>::type
-      createSampler( const SamplerCreateInfo &                     createInfo,
-                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Sampler, Dispatch>>::type
-      createSamplerUnique( const SamplerCreateInfo &                     createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySampler( Sampler                     sampler,
-                         const AllocationCallbacks * pAllocator,
-                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySampler( Sampler sampler                               VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      destroy( Sampler sampler, const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySampler.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Sampler                                       sampler,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDescriptorSetLayout( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                                           const AllocationCallbacks *           pAllocator,
-                                                           DescriptorSetLayout *                 pSetLayout,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *           pAllocator,
+                                                           VULKAN_HPP_NAMESPACE::DescriptorSetLayout *                 pSetLayout,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorSetLayout>::type
-      createDescriptorSetLayout( const DescriptorSetLayoutCreateInfo &         createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>::type
+      createDescriptorSetLayout( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo &         createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DescriptorSetLayout, Dispatch>>::type
-      createDescriptorSetLayoutUnique( const DescriptorSetLayoutCreateInfo &         createInfo,
-                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSetLayout, Dispatch>>::type
+      createDescriptorSetLayoutUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo &         createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorSetLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorSetLayout( DescriptorSetLayout         descriptorSetLayout,
-                                     const AllocationCallbacks * pAllocator,
-                                     Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
+                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                     Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorSetLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorSetLayout( DescriptorSetLayout descriptorSetLayout       VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout descriptorSetLayout       VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorSetLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorSetLayout         descriptorSetLayout,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout         descriptorSetLayout,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorSetLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorSetLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorSetLayout                           descriptorSetLayout,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorSetLayout                           descriptorSetLayout,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDescriptorPool( const DescriptorPoolCreateInfo * pCreateInfo,
-                                                      const AllocationCallbacks *      pAllocator,
-                                                      DescriptorPool *                 pDescriptorPool,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::DescriptorPool *                 pDescriptorPool,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorPool>::type
-      createDescriptorPool( const DescriptorPoolCreateInfo &              createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorPool>::type
+      createDescriptorPool( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo &              createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DescriptorPool, Dispatch>>::type
-      createDescriptorPoolUnique( const DescriptorPoolCreateInfo &              createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorPool, Dispatch>>::type
+      createDescriptorPoolUnique( const VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo &              createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorPool( DescriptorPool              descriptorPool,
-                                const AllocationCallbacks * pAllocator,
-                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
+                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorPool( DescriptorPool descriptorPool                 VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorPool              descriptorPool,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorPool                                descriptorPool,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorPool                                descriptorPool,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result resetDescriptorPool( DescriptorPool           descriptorPool,
-                                                     DescriptorPoolResetFlags flags,
-                                                     Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result resetDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool           descriptorPool,
+                                VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags,
+                                Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      resetDescriptorPool( DescriptorPool                 descriptorPool,
-                           DescriptorPoolResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool                 descriptorPool,
+                              VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                              Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result allocateDescriptorSets( const DescriptorSetAllocateInfo * pAllocateInfo,
-                                                        DescriptorSet *                   pDescriptorSets,
-                                                        Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo * pAllocateInfo,
+                                                        VULKAN_HPP_NAMESPACE::DescriptorSet *                   pDescriptorSets,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-    template <typename DescriptorSetAllocator = std::allocator<DescriptorSet>,
+    template <typename DescriptorSetAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DescriptorSet>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator>>::type
+      allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                              Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DescriptorSetAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DescriptorSet>,
               typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, DescriptorSet>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DescriptorSet, DescriptorSetAllocator>>::type
-      allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-    template <typename DescriptorSetAllocator = std::allocator<DescriptorSet>,
+              typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, VULKAN_HPP_NAMESPACE::DescriptorSet>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet, DescriptorSetAllocator>>::type
+      allocateDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                              DescriptorSetAllocator &                                descriptorSetAllocator,
+                              Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename DescriptorSetAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>>>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
+      allocateDescriptorSetsUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                                    Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename DescriptorSetAllocator    = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>>,
+      typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>>::value,
+                              int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
+      allocateDescriptorSetsUnique( const VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo & allocateInfo,
+                                    DescriptorSetAllocator &                                descriptorSetAllocator,
+                                    Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result freeDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
+                               uint32_t                                    descriptorSetCount,
+                               const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                               Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void freeDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorPool                                                descriptorPool,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result( free )( VULKAN_HPP_NAMESPACE::DescriptorPool        descriptorPool,
+                    uint32_t                                    descriptorSetCount,
+                    const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets,
+                    Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void( free )( VULKAN_HPP_NAMESPACE::DescriptorPool                                                descriptorPool,
+                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSets( uint32_t                                         descriptorWriteCount,
+                               const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites,
+                               uint32_t                                         descriptorCopyCount,
+                               const VULKAN_HPP_NAMESPACE::CopyDescriptorSet *  pDescriptorCopies,
+                               Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSets( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CopyDescriptorSet> const &  descriptorCopies,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createFramebuffer( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::Framebuffer *                 pFramebuffer,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Framebuffer>::type
+      createFramebuffer( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Framebuffer, Dispatch>>::type
+      createFramebufferUnique( const VULKAN_HPP_NAMESPACE::FramebufferCreateInfo &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
+                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                             Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer                       VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::Framebuffer                                   framebuffer,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo * pCreateInfo,
+                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *  pAllocator,
+                                                  VULKAN_HPP_NAMESPACE::RenderPass *                 pRenderPass,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+      createRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo &                  createInfo,
+                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+      createRenderPassUnique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo &                  createInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyRenderPass( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
+                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                            Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass                         VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::RenderPass                                    renderPass,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
+                                   VULKAN_HPP_NAMESPACE::Extent2D * pGranularity,
+                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D
+                         getRenderAreaGranularity( VULKAN_HPP_NAMESPACE::RenderPass renderPass,
+                                                   Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createCommandPool( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::CommandPool *                 pCommandPool,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::CommandPool>::type
+      createCommandPool( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandPool, Dispatch>>::type
+      createCommandPoolUnique( const VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCommandPool( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
+                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                             Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCommandPool( VULKAN_HPP_NAMESPACE::CommandPool commandPool                       VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CommandPool                                   commandPool,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result resetCommandPool( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                                                  VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#else
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type resetCommandPool( VULKAN_HPP_NAMESPACE::CommandPool                 commandPool,
+                                                           VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo * pAllocateInfo,
+                                                        VULKAN_HPP_NAMESPACE::CommandBuffer *                   pCommandBuffers,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename CommandBufferAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CommandBuffer>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator>>::type
+      allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                              Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename CommandBufferAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CommandBuffer>,
               typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, DescriptorSet>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DescriptorSet, DescriptorSetAllocator>>::type
-      allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo,
-                              DescriptorSetAllocator &          descriptorSetAllocator,
-                              Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, VULKAN_HPP_NAMESPACE::CommandBuffer>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer, CommandBufferAllocator>>::type
+      allocateCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                              CommandBufferAllocator &                                commandBufferAllocator,
+                              Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
     template <typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename DescriptorSetAllocator = std::allocator<UniqueHandle<DescriptorSet, Dispatch>>,
-              typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<DescriptorSet, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
-      allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-    template <typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename DescriptorSetAllocator = std::allocator<UniqueHandle<DescriptorSet, Dispatch>>,
-              typename std::enable_if<std::is_same<typename DescriptorSetAllocator::value_type, UniqueHandle<DescriptorSet, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<DescriptorSet, Dispatch>, DescriptorSetAllocator>>::type
-      allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo,
-                                    DescriptorSetAllocator &          descriptorSetAllocator,
-                                    Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename CommandBufferAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>>>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
+      allocateCommandBuffersUnique( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                                    Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename CommandBufferAllocator    = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>>,
+      typename std::enable_if<std::is_same<typename CommandBufferAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>>::value,
+                              int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::CommandBuffer, Dispatch>, CommandBufferAllocator>>::type
+      allocateCommandBuffersUnique( const VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo & allocateInfo,
+                                    CommandBufferAllocator &                                commandBufferAllocator,
+                                    Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result freeDescriptorSets( DescriptorPool        descriptorPool,
-                                                    uint32_t              descriptorSetCount,
-                                                    const DescriptorSet * pDescriptorSets,
-                                                    Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void freeCommandBuffers( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                             uint32_t                                    commandBufferCount,
+                             const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                             Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      freeDescriptorSets( DescriptorPool                          descriptorPool,
-                          ArrayProxy<const DescriptorSet> const & descriptorSets,
-                          Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void freeCommandBuffers( VULKAN_HPP_NAMESPACE::CommandPool                                                   commandPool,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result( free )( DescriptorPool        descriptorPool,
-                                         uint32_t              descriptorSetCount,
-                                         const DescriptorSet * pDescriptorSets,
-                                         Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void( free )( VULKAN_HPP_NAMESPACE::CommandPool           commandPool,
+                  uint32_t                                    commandBufferCount,
+                  const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers,
+                  Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkFreeDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFreeDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type( free )( DescriptorPool                          descriptorPool,
-                                                                                          ArrayProxy<const DescriptorSet> const & descriptorSets,
-                                                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSets( uint32_t                   descriptorWriteCount,
-                               const WriteDescriptorSet * pDescriptorWrites,
-                               uint32_t                   descriptorCopyCount,
-                               const CopyDescriptorSet *  pDescriptorCopies,
-                               Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSets( ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                               ArrayProxy<const CopyDescriptorSet> const &  descriptorCopies,
-                               Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createGraphicsPipelines( PipelineCache                      pipelineCache,
-                                                         uint32_t                           createInfoCount,
-                                                         const GraphicsPipelineCreateInfo * pCreateInfos,
-                                                         const AllocationCallbacks *        pAllocator,
-                                                         Pipeline *                         pPipelines,
-                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createGraphicsPipelines( PipelineCache                                        pipelineCache,
-                                                  ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                                  Optional<const AllocationCallbacks> allocator        VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createGraphicsPipelines( PipelineCache                                        pipelineCache,
-                                                  ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                                  Optional<const AllocationCallbacks>                  allocator,
-                                                  PipelineAllocator &                                  pipelineAllocator,
-                                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline> createGraphicsPipeline( PipelineCache                                 pipelineCache,
-                                                                       const GraphicsPipelineCreateInfo &            createInfo,
-                                                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createGraphicsPipelinesUnique( PipelineCache                                        pipelineCache,
-                                                        ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                                        Optional<const AllocationCallbacks> allocator        VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                        Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createGraphicsPipelinesUnique( PipelineCache                                        pipelineCache,
-                                                        ArrayProxy<const GraphicsPipelineCreateInfo> const & createInfos,
-                                                        Optional<const AllocationCallbacks>                  allocator,
-                                                        PipelineAllocator &                                  pipelineAllocator,
-                                                        Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createGraphicsPipelineUnique( PipelineCache                                 pipelineCache,
-                                                       const GraphicsPipelineCreateInfo &            createInfo,
-                                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createFramebuffer( const FramebufferCreateInfo * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   Framebuffer *                 pFramebuffer,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Framebuffer>::type
-      createFramebuffer( const FramebufferCreateInfo &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Framebuffer, Dispatch>>::type
-      createFramebufferUnique( const FramebufferCreateInfo &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyFramebuffer( Framebuffer                 framebuffer,
-                             const AllocationCallbacks * pAllocator,
-                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyFramebuffer( Framebuffer framebuffer                       VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Framebuffer                 framebuffer,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyFramebuffer.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Framebuffer                                   framebuffer,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createRenderPass( const RenderPassCreateInfo * pCreateInfo,
-                                                  const AllocationCallbacks *  pAllocator,
-                                                  RenderPass *                 pRenderPass,
-                                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-      createRenderPass( const RenderPassCreateInfo &                  createInfo,
-                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-      createRenderPassUnique( const RenderPassCreateInfo &                  createInfo,
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyRenderPass( RenderPass                  renderPass,
-                            const AllocationCallbacks * pAllocator,
-                            Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyRenderPass( RenderPass renderPass                         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( RenderPass                  renderPass,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyRenderPass.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( RenderPass                                    renderPass,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getRenderAreaGranularity( RenderPass         renderPass,
-                                   Extent2D *         pGranularity,
-                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Extent2D getRenderAreaGranularity( RenderPass         renderPass,
-                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void( free )( VULKAN_HPP_NAMESPACE::CommandPool                                                   commandPool,
+                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers,
+                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_1 ===
 
-    // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindBufferMemory2( uint32_t                     bindInfoCount,
-                                                   const BindBufferMemoryInfo * pBindInfos,
-                                                   Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindBufferMemory2( uint32_t                                           bindInfoCount,
+                                                   const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo * pBindInfos,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindBufferMemory2( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindBufferMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos,
+                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindImageMemory2( uint32_t                    bindInfoCount,
-                                                  const BindImageMemoryInfo * pBindInfos,
-                                                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindImageMemory2( uint32_t                                          bindInfoCount,
+                                                  const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo * pBindInfos,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindImageMemory2( ArrayProxy<const BindImageMemoryInfo> const & bindInfos, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindImageMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos,
+                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getGroupPeerMemoryFeatures( uint32_t                 heapIndex,
-                                     uint32_t                 localDeviceIndex,
-                                     uint32_t                 remoteDeviceIndex,
-                                     PeerMemoryFeatureFlags * pPeerMemoryFeatures,
-                                     Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getGroupPeerMemoryFeatures( uint32_t                                       heapIndex,
+                                     uint32_t                                       localDeviceIndex,
+                                     uint32_t                                       remoteDeviceIndex,
+                                     VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags * pPeerMemoryFeatures,
+                                     Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PeerMemoryFeatureFlags
-      getGroupPeerMemoryFeatures( uint32_t           heapIndex,
-                                  uint32_t           localDeviceIndex,
-                                  uint32_t           remoteDeviceIndex,
-                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+                         getGroupPeerMemoryFeatures( uint32_t           heapIndex,
+                                                     uint32_t           localDeviceIndex,
+                                                     uint32_t           remoteDeviceIndex,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 * pInfo,
-                                      MemoryRequirements2 *                pMemoryRequirements,
-                                      Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
+                                      VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                pMemoryRequirements,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements2(
-      const ImageMemoryRequirementsInfo2 & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetImageMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info,
-                                                      Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 * pInfo,
-                                       MemoryRequirements2 *                 pMemoryRequirements,
-                                       Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
+                                       VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements2(
-      const BufferMemoryRequirementsInfo2 & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetBufferMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info,
-                                                       Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 * pInfo,
-                                            uint32_t *                                 pSparseMemoryRequirementCount,
-                                            SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
-                                            Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
+                                            uint32_t *                                                       pSparseMemoryRequirementCount,
+                                            VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-      getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                         getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info,
-                                                            SparseImageMemoryRequirements2Allocator &  sparseImageMemoryRequirements2Allocator,
-                                                            Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                                            Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                                            SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
+                                                            Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkTrimCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void trimCommandPool( CommandPool          commandPool,
-                          CommandPoolTrimFlags flags,
-                          Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void trimCommandPool( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
+                          VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags,
+                          Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void
-      getQueue2( const DeviceQueueInfo2 * pQueueInfo, Queue * pQueue, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueue2( const VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 * pQueueInfo,
+                    VULKAN_HPP_NAMESPACE::Queue *                  pQueue,
+                    Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Queue getQueue2( const DeviceQueueInfo2 & queueInfo,
-                                          Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDescriptorUpdateTemplate( const DescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                                const AllocationCallbacks *                pAllocator,
-                                                                DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Queue getQueue2( const VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 & queueInfo,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSamplerYcbcrConversion( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                                              VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion *                 pYcbcrConversion,
+                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorUpdateTemplate>::type
-      createDescriptorUpdateTemplate( const DescriptorUpdateTemplateCreateInfo &    createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::type
+      createSamplerYcbcrConversion( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo &      createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DescriptorUpdateTemplate, Dispatch>>::type
-      createDescriptorUpdateTemplateUnique( const DescriptorUpdateTemplateCreateInfo &    createInfo,
-                                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>>::type
+      createSamplerYcbcrConversionUnique( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo &      createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorUpdateTemplate( DescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                          const AllocationCallbacks * pAllocator,
-                                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                        Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorUpdateTemplate( DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                          Optional<const AllocationCallbacks> allocator     VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion        VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion                        ycbcrConversion,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDescriptorUpdateTemplate( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                                                VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
+                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::type
+      createDescriptorUpdateTemplate( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo &    createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>>::type
+      createDescriptorUpdateTemplateUnique( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo &    createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorUpdateTemplate    descriptorUpdateTemplate,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DescriptorUpdateTemplate                      descriptorUpdateTemplate,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate                      descriptorUpdateTemplate,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSetWithTemplate( DescriptorSet            descriptorSet,
-                                          DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                          const void *             pData,
-                                          Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                          VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                          const void *                                   pData,
+                                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSetWithTemplate( DescriptorSet            descriptorSet,
-                                          DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                          DataType const &         data,
-                                          Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                          VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                          DataType const &                               data,
+                                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                        DescriptorSetLayoutSupport *          pSupport,
-                                        Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                        VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport *          pSupport,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DescriptorSetLayoutSupport getDescriptorSetLayoutSupport(
-      const DescriptorSetLayoutCreateInfo & createInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                        Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateSamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSamplerYcbcrConversion( const SamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                                              const AllocationCallbacks *              pAllocator,
-                                                              SamplerYcbcrConversion *                 pYcbcrConversion,
-                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SamplerYcbcrConversion>::type
-      createSamplerYcbcrConversion( const SamplerYcbcrConversionCreateInfo &      createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SamplerYcbcrConversion, Dispatch>>::type
-      createSamplerYcbcrConversionUnique( const SamplerYcbcrConversionCreateInfo &      createInfo,
-                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroySamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySamplerYcbcrConversion( SamplerYcbcrConversion      ycbcrConversion,
-                                        const AllocationCallbacks * pAllocator,
-                                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySamplerYcbcrConversion( SamplerYcbcrConversion ycbcrConversion        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroySamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SamplerYcbcrConversion      ycbcrConversion,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversion.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SamplerYcbcrConversion                        ycbcrConversion,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                         getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_2 ===
 
-    // wrapper function for command vkResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPool.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetQueryPool( QueryPool          queryPool,
-                         uint32_t           firstQuery,
-                         uint32_t           queryCount,
-                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSemaphoreCounterValue( Semaphore          semaphore,
-                                                          uint64_t *         pValue,
-                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::RenderPass *                  pRenderPass,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getSemaphoreCounterValue( Semaphore          semaphore,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+      createRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  ifndef VULKAN_HPP_NO_SMART_HANDLE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+      createRenderPass2Unique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
+#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                         uint32_t                        firstQuery,
+                         uint32_t                        queryCount,
+                         Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSemaphoreCounterValue( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
+                                                          uint64_t *                      pValue,
+                                                          Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getSemaphoreCounterValue( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
                                                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitSemaphores( const SemaphoreWaitInfo * pWaitInfo,
-                                                uint64_t                  timeout,
-                                                Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
+                                                uint64_t                                        timeout,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitSemaphores( const SemaphoreWaitInfo & waitInfo,
-                                                uint64_t                  timeout,
-                                                Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
+                                                                      uint64_t                                        timeout,
+                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result signalSemaphore( const SemaphoreSignalInfo * pSignalInfo,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      signalSemaphore( const SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddress( const BufferDeviceAddressInfo * pInfo,
-                                    Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceAddress getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                    Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddress( const BufferDeviceAddressInfo & info,
-                                    Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::DeviceAddress getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo * pInfo,
-                                            Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo & info,
-                                            Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
-                                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo & info,
-                                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createRenderPass2( const RenderPassCreateInfo2 * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   RenderPass *                  pRenderPass,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-      createRenderPass2( const RenderPassCreateInfo2 &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-      createRenderPass2Unique( const RenderPassCreateInfo2 &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     //=== VK_VERSION_1_3 ===
 
-    // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createPrivateDataSlot( const PrivateDataSlotCreateInfo * pCreateInfo,
-                                                       const AllocationCallbacks *       pAllocator,
-                                                       PrivateDataSlot *                 pPrivateDataSlot,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createPrivateDataSlot( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo * pCreateInfo,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                       VULKAN_HPP_NAMESPACE::PrivateDataSlot *                 pPrivateDataSlot,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PrivateDataSlot>::type
-      createPrivateDataSlot( const PrivateDataSlotCreateInfo &             createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::type
+      createPrivateDataSlot( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &             createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<PrivateDataSlot, Dispatch>>::type
-      createPrivateDataSlotUnique( const PrivateDataSlotCreateInfo &             createInfo,
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>>::type
+      createPrivateDataSlotUnique( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &             createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPrivateDataSlot( PrivateDataSlot             privateDataSlot,
-                                 const AllocationCallbacks * pAllocator,
-                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                 Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPrivateDataSlot( PrivateDataSlot privateDataSlot               VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot               VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PrivateDataSlot             privateDataSlot,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlot.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PrivateDataSlot                               privateDataSlot,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::PrivateDataSlot                               privateDataSlot,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPrivateData( ObjectType         objectType,
-                                                uint64_t           objectHandle,
-                                                PrivateDataSlot    privateDataSlot,
-                                                uint64_t           data,
-                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                uint64_t                              objectHandle,
+                                                VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                uint64_t                              data,
+                                                Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPrivateData( ObjectType         objectType,
-                      uint64_t           objectHandle,
-                      PrivateDataSlot    privateDataSlot,
-                      uint64_t           data,
-                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                         uint64_t                              objectHandle,
+                                                         VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                         uint64_t                              data,
+                                                         Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getPrivateData( ObjectType         objectType,
-                         uint64_t           objectHandle,
-                         PrivateDataSlot    privateDataSlot,
-                         uint64_t *         pData,
-                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                         uint64_t                              objectHandle,
+                         VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                         uint64_t *                            pData,
+                         Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD uint64_t getPrivateData( ObjectType         objectType,
-                                                  uint64_t           objectHandle,
-                                                  PrivateDataSlot    privateDataSlot,
-                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD uint64_t getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                  uint64_t                              objectHandle,
+                                                  VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                  Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getBufferMemoryRequirements( const DeviceBufferMemoryRequirements * pInfo,
-                                      MemoryRequirements2 *                  pMemoryRequirements,
-                                      Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements * pInfo,
+                                      VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                  pMemoryRequirements,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements(
-      const DeviceBufferMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info,
-                                                      Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageMemoryRequirements( const DeviceImageMemoryRequirements * pInfo,
-                                     MemoryRequirements2 *                 pMemoryRequirements,
-                                     Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                     VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements(
-      const DeviceImageMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageMemoryRequirements( const DeviceImageMemoryRequirements & info,
-                                                     Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements * pInfo,
-                                           uint32_t *                            pSparseMemoryRequirementCount,
-                                           SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
-                                           Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                           uint32_t *                                                  pSparseMemoryRequirementCount,
+                                           VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-      getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                         getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements &     info,
-                                                           SparseImageMemoryRequirements2Allocator & sparseImageMemoryRequirements2Allocator,
-                                                           Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_VERSION_1_4 ===
-
-    // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result mapMemory2( const MemoryMapInfo * pMemoryMapInfo,
-                                            void **               ppData,
-                                            Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory2( const MemoryMapInfo & memoryMapInfo,
-                                                                            Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result unmapMemory2( const MemoryUnmapInfo * pMemoryUnmapInfo,
-                                              Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      unmapMemory2( const MemoryUnmapInfo & memoryUnmapInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayout( const DeviceImageSubresourceInfo * pInfo,
-                                    SubresourceLayout2 *               pLayout,
-                                    Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayout( const DeviceImageSubresourceInfo & info,
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageSubresourceLayout( const DeviceImageSubresourceInfo & info,
-                                                    Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetImageSubresourceLayout2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayout2( Image                     image,
-                                     const ImageSubresource2 * pSubresource,
-                                     SubresourceLayout2 *      pLayout,
-                                     Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSubresourceLayout2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayout2( Image                     image,
-                                                                        const ImageSubresource2 & subresource,
-                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetImageSubresourceLayout2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageSubresourceLayout2(
-      Image image, const ImageSubresource2 & subresource, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToImage( const CopyMemoryToImageInfo * pCopyMemoryToImageInfo,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyMemoryToImage( const CopyMemoryToImageInfo & copyMemoryToImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyImageToMemory( const CopyImageToMemoryInfo * pCopyImageToMemoryInfo,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyImageToMemory( const CopyImageToMemoryInfo & copyImageToMemoryInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyImageToImage( const CopyImageToImageInfo * pCopyImageToImageInfo,
-                                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyImageToImage( const CopyImageToImageInfo & copyImageToImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result transitionImageLayout( uint32_t                              transitionCount,
-                                                       const HostImageLayoutTransitionInfo * pTransitions,
-                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      transitionImageLayout( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions,
-                             Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetRenderingAreaGranularity, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getRenderingAreaGranularity( const RenderingAreaInfo * pRenderingAreaInfo,
-                                      Extent2D *                pGranularity,
-                                      Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRenderingAreaGranularity, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Extent2D getRenderingAreaGranularity( const RenderingAreaInfo & renderingAreaInfo,
-                                                               Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                           Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                           SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
+                                                           Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_swapchain ===
 
-    // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSwapchainKHR( const SwapchainCreateInfoKHR * pCreateInfo,
-                                                    const AllocationCallbacks *    pAllocator,
-                                                    SwapchainKHR *                 pSwapchain,
-                                                    Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR * pCreateInfo,
+                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                    VULKAN_HPP_NAMESPACE::SwapchainKHR *                 pSwapchain,
+                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SwapchainKHR>::type
-      createSwapchainKHR( const SwapchainCreateInfoKHR &                createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SwapchainKHR>::type
+      createSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &                createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SwapchainKHR, Dispatch>>::type
-      createSwapchainKHRUnique( const SwapchainCreateInfoKHR &                createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::type
+      createSwapchainKHRUnique( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &                createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySwapchainKHR( SwapchainKHR                swapchain,
-                              const AllocationCallbacks * pAllocator,
-                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
+                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySwapchainKHR( SwapchainKHR swapchain                        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain                        VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SwapchainKHR                swapchain,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                swapchain,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySwapchainKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SwapchainKHR                                  swapchain,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SwapchainKHR                                  swapchain,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainImagesKHR( SwapchainKHR       swapchain,
-                                                       uint32_t *         pSwapchainImageCount,
-                                                       Image *            pSwapchainImages,
-                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                       uint32_t *                         pSwapchainImageCount,
+                                                       VULKAN_HPP_NAMESPACE::Image *      pSwapchainImages,
+                                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-    template <typename ImageAllocator                                                                             = std::allocator<Image>,
-              typename Dispatch                                                                                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ImageAllocator::value_type, Image>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Image, ImageAllocator>>::type
-      getSwapchainImagesKHR( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-    template <typename ImageAllocator                                                                             = std::allocator<Image>,
-              typename Dispatch                                                                                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ImageAllocator::value_type, Image>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Image, ImageAllocator>>::type
-      getSwapchainImagesKHR( SwapchainKHR swapchain, ImageAllocator & imageAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename ImageAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Image>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator>>::type
+      getSwapchainImagesKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename ImageAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Image>,
+              typename Dispatch       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename ImageAllocator::value_type, VULKAN_HPP_NAMESPACE::Image>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image, ImageAllocator>>::type getSwapchainImagesKHR(
+      VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, ImageAllocator & imageAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireNextImageKHR( SwapchainKHR       swapchain,
-                                                     uint64_t           timeout,
-                                                     Semaphore          semaphore,
-                                                     Fence              fence,
-                                                     uint32_t *         pImageIndex,
-                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                     uint64_t                           timeout,
+                                                     VULKAN_HPP_NAMESPACE::Semaphore    semaphore,
+                                                     VULKAN_HPP_NAMESPACE::Fence        fence,
+                                                     uint32_t *                         pImageIndex,
+                                                     Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImageKHR( SwapchainKHR        swapchain,
-                                                                    uint64_t            timeout,
-                                                                    Semaphore semaphore VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                    Fence fence         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                    Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImageKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR        swapchain,
+                                                                    uint64_t                                  timeout,
+                                                                    VULKAN_HPP_NAMESPACE::Semaphore semaphore VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                                    VULKAN_HPP_NAMESPACE::Fence fence         VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                                                    Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getGroupPresentCapabilitiesKHR( DeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getGroupPresentCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR * pDeviceGroupPresentCapabilities,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentCapabilitiesKHR>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR>::type
       getGroupPresentCapabilitiesKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getGroupSurfacePresentModesKHR( SurfaceKHR                       surface,
-                                                                DeviceGroupPresentModeFlagsKHR * pModes,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                       surface,
+                                                                VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR * pModes,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-      getGroupSurfacePresentModesKHR( SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR>::type
+      getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireNextImage2KHR( const AcquireNextImageInfoKHR * pAcquireInfo,
-                                                      uint32_t *                      pImageIndex,
-                                                      Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR * pAcquireInfo,
+                                                      uint32_t *                                            pImageIndex,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImage2KHR( const AcquireNextImageInfoKHR & acquireInfo,
-                                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR & acquireInfo,
+                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_display_swapchain ===
 
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSharedSwapchainsKHR( uint32_t                       swapchainCount,
-                                                           const SwapchainCreateInfoKHR * pCreateInfos,
-                                                           const AllocationCallbacks *    pAllocator,
-                                                           SwapchainKHR *                 pSwapchains,
-                                                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSharedSwapchainsKHR( uint32_t                                             swapchainCount,
+                                                           const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR * pCreateInfos,
+                                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                           VULKAN_HPP_NAMESPACE::SwapchainKHR *                 pSwapchains,
+                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename SwapchainKHRAllocator = std::allocator<SwapchainKHR>,
+    template <typename SwapchainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SwapchainKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator>>::type
+      createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SwapchainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SwapchainKHR>,
               typename Dispatch              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, SwapchainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SwapchainKHR, SwapchainKHRAllocator>>::type
-      createSharedSwapchainsKHR( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                 Optional<const AllocationCallbacks> allocator    VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename SwapchainKHRAllocator = std::allocator<SwapchainKHR>,
-              typename Dispatch              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, SwapchainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SwapchainKHR, SwapchainKHRAllocator>>::type
-      createSharedSwapchainsKHR( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                 Optional<const AllocationCallbacks>              allocator,
-                                 SwapchainKHRAllocator &                          swapchainKHRAllocator,
-                                 Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SwapchainKHR>::type
-      createSharedSwapchainKHR( const SwapchainCreateInfoKHR &                createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SwapchainKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainKHRAllocator>>::type
+      createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                 SwapchainKHRAllocator &                                                                      swapchainKHRAllocator,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SwapchainKHR>::type
+      createSharedSwapchainKHR( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &                createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
     template <typename Dispatch              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename SwapchainKHRAllocator = std::allocator<UniqueHandle<SwapchainKHR, Dispatch>>,
-              typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<SwapchainKHR, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
-      createSharedSwapchainsKHRUnique( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                       Optional<const AllocationCallbacks> allocator    VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                       Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename Dispatch              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename SwapchainKHRAllocator = std::allocator<UniqueHandle<SwapchainKHR, Dispatch>>,
-              typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<SwapchainKHR, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
-      createSharedSwapchainsKHRUnique( ArrayProxy<const SwapchainCreateInfoKHR> const & createInfos,
-                                       Optional<const AllocationCallbacks>              allocator,
-                                       SwapchainKHRAllocator &                          swapchainKHRAllocator,
-                                       Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SwapchainKHR, Dispatch>>::type
-      createSharedSwapchainKHRUnique( const SwapchainCreateInfoKHR &                createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename SwapchainKHRAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
+      createSharedSwapchainsKHRUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename SwapchainKHRAllocator     = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>,
+      typename std::enable_if<std::is_same<typename SwapchainKHRAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::value,
+                              int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>, SwapchainKHRAllocator>>::type
+      createSharedSwapchainsKHRUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                    allocator,
+                                       SwapchainKHRAllocator &                                                                      swapchainKHRAllocator,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR, Dispatch>>::type
+      createSharedSwapchainKHRUnique( const VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR &                createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_debug_marker ===
 
-    // wrapper function for command vkDebugMarkerSetObjectTagEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT * pTagInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT * pTagInfo,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDebugMarkerSetObjectTagEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT & tagInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT & tagInfo,
+                                  Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT * pNameInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT * pNameInfo,
                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT & nameInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT & nameInfo,
+                                   Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_queue ===
 
-    // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createVideoSessionKHR( const VideoSessionCreateInfoKHR * pCreateInfo,
-                                                       const AllocationCallbacks *       pAllocator,
-                                                       VideoSessionKHR *                 pVideoSession,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createVideoSessionKHR( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR * pCreateInfo,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                       VULKAN_HPP_NAMESPACE::VideoSessionKHR *                 pVideoSession,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<VideoSessionKHR>::type
-      createVideoSessionKHR( const VideoSessionCreateInfoKHR &             createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoSessionKHR>::type
+      createVideoSessionKHR( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR &             createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VideoSessionKHR, Dispatch>>::type
-      createVideoSessionKHRUnique( const VideoSessionCreateInfoKHR &             createInfo,
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionKHR, Dispatch>>::type
+      createVideoSessionKHRUnique( const VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR &             createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyVideoSessionKHR( VideoSessionKHR             videoSession,
-                                 const AllocationCallbacks * pAllocator,
-                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
+                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                 Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyVideoSessionKHR( VideoSessionKHR videoSession                  VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession                  VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( VideoSessionKHR             videoSession,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR             videoSession,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( VideoSessionKHR                               videoSession,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::VideoSessionKHR                               videoSession,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getVideoSessionMemoryRequirementsKHR( VideoSessionKHR                     videoSession,
-                                                                      uint32_t *                          pMemoryRequirementsCount,
-                                                                      VideoSessionMemoryRequirementsKHR * pMemoryRequirements,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                     videoSession,
+                                                                      uint32_t *                                                pMemoryRequirementsCount,
+                                                                      VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR * pMemoryRequirements,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-    template <typename VideoSessionMemoryRequirementsKHRAllocator                            = std::allocator<VideoSessionMemoryRequirementsKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VideoSessionMemoryRequirementsKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
-      getVideoSessionMemoryRequirementsKHR( VideoSessionKHR videoSession, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-    template <typename VideoSessionMemoryRequirementsKHRAllocator                            = std::allocator<VideoSessionMemoryRequirementsKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VideoSessionMemoryRequirementsKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
-      getVideoSessionMemoryRequirementsKHR( VideoSessionKHR                              videoSession,
+    template <typename VideoSessionMemoryRequirementsKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR>,
+              typename Dispatch                                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
+      getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession,
+                                            Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename VideoSessionMemoryRequirementsKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR>,
+              typename Dispatch                                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename VideoSessionMemoryRequirementsKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR, VideoSessionMemoryRequirementsKHRAllocator>>::type
+      getVideoSessionMemoryRequirementsKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR        videoSession,
                                             VideoSessionMemoryRequirementsKHRAllocator & videoSessionMemoryRequirementsKHRAllocator,
                                             Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBindVideoSessionMemoryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindVideoSessionMemoryKHR( VideoSessionKHR                       videoSession,
-                                                           uint32_t                              bindSessionMemoryInfoCount,
-                                                           const BindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindVideoSessionMemoryKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                       videoSession,
+                                                           uint32_t                                                    bindSessionMemoryInfoCount,
+                                                           const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR * pBindSessionMemoryInfos,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindVideoSessionMemoryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindVideoSessionMemoryKHR( VideoSessionKHR                                         videoSession,
-                                 ArrayProxy<const BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos,
-                                 Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindVideoSessionMemoryKHR( VULKAN_HPP_NAMESPACE::VideoSessionKHR                                                               videoSession,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createVideoSessionParametersKHR( const VideoSessionParametersCreateInfoKHR * pCreateInfo,
-                                                                 const AllocationCallbacks *                 pAllocator,
-                                                                 VideoSessionParametersKHR *                 pVideoSessionParameters,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR * pCreateInfo,
+                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                 pAllocator,
+                                                                 VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR *                 pVideoSessionParameters,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<VideoSessionParametersKHR>::type
-      createVideoSessionParametersKHR( const VideoSessionParametersCreateInfoKHR &   createInfo,
-                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>::type
+      createVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR &   createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VideoSessionParametersKHR, Dispatch>>::type
-      createVideoSessionParametersKHRUnique( const VideoSessionParametersCreateInfoKHR &   createInfo,
-                                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR, Dispatch>>::type
+      createVideoSessionParametersKHRUnique( const VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR &   createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result updateVideoSessionParametersKHR( VideoSessionParametersKHR                   videoSessionParameters,
-                                                                 const VideoSessionParametersUpdateInfoKHR * pUpdateInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result updateVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                   videoSessionParameters,
+                                                                 const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR * pUpdateInfo,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      updateVideoSessionParametersKHR( VideoSessionParametersKHR                   videoSessionParameters,
-                                       const VideoSessionParametersUpdateInfoKHR & updateInfo,
-                                       Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      updateVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                   videoSessionParameters,
+                                       const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR & updateInfo,
+                                       Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyVideoSessionParametersKHR( VideoSessionParametersKHR   videoSessionParameters,
-                                           const AllocationCallbacks * pAllocator,
-                                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
+                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyVideoSessionParametersKHR( VideoSessionParametersKHR videoSessionParameters VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                           Optional<const AllocationCallbacks> allocator    VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( VideoSessionParametersKHR   videoSessionParameters,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR   videoSessionParameters,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( VideoSessionParametersKHR                     videoSessionParameters,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                     videoSessionParameters,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NVX_binary_import ===
 
-    // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createCuModuleNVX( const CuModuleCreateInfoNVX * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   CuModuleNVX *                 pModule,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createCuModuleNVX( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::CuModuleNVX *                 pModule,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<CuModuleNVX>::type
-      createCuModuleNVX( const CuModuleCreateInfoNVX &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::CuModuleNVX>::type
+      createCuModuleNVX( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<CuModuleNVX, Dispatch>>::type
-      createCuModuleNVXUnique( const CuModuleCreateInfoNVX &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CuModuleNVX, Dispatch>>::type
+      createCuModuleNVXUnique( const VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createCuFunctionNVX( const CuFunctionCreateInfoNVX * pCreateInfo,
-                                                     const AllocationCallbacks *     pAllocator,
-                                                     CuFunctionNVX *                 pFunction,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX * pCreateInfo,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                     VULKAN_HPP_NAMESPACE::CuFunctionNVX *                 pFunction,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<CuFunctionNVX>::type
-      createCuFunctionNVX( const CuFunctionCreateInfoNVX &               createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::CuFunctionNVX>::type
+      createCuFunctionNVX( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX &               createInfo,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<CuFunctionNVX, Dispatch>>::type
-      createCuFunctionNVXUnique( const CuFunctionCreateInfoNVX &               createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CuFunctionNVX, Dispatch>>::type
+      createCuFunctionNVXUnique( const VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX &               createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCuModuleNVX( CuModuleNVX                 module,
-                             const AllocationCallbacks * pAllocator,
-                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
+                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                             Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCuModuleNVX( CuModuleNVX                                   module,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX                                   module,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CuModuleNVX                 module,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                 module,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuModuleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CuModuleNVX                                   module,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CuModuleNVX                                   module,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCuFunctionNVX( CuFunctionNVX               function,
-                               const AllocationCallbacks * pAllocator,
-                               Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
+                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                               Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCuFunctionNVX( CuFunctionNVX                                 function,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX                                 function,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CuFunctionNVX               function,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX               function,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCuFunctionNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CuFunctionNVX                                 function,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CuFunctionNVX                                 function,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NVX_image_view_handle ===
 
-    // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint32_t getImageViewHandleNVX( const ImageViewHandleInfoNVX * pInfo,
-                                    Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint32_t getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX * pInfo,
+                                    Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint32_t getImageViewHandleNVX( const ImageViewHandleInfoNVX & info,
-                                    Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint32_t getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX & info,
+                                    Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getImageViewHandle64NVX( const ImageViewHandleInfoNVX * pInfo,
-                                      Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView                       imageView,
+                                                        VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX * pProperties,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getImageViewHandle64NVX( const ImageViewHandleInfoNVX & info,
-                                      Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageViewAddressNVX( ImageView                       imageView,
-                                                        ImageViewAddressPropertiesNVX * pProperties,
-                                                        Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageViewAddressPropertiesNVX>::type
-      getImageViewAddressNVX( ImageView imageView, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX>::type
+      getImageViewAddressNVX( VULKAN_HPP_NAMESPACE::ImageView imageView, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_AMD_shader_info ===
 
-    // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getShaderInfoAMD( Pipeline            pipeline,
-                                                  ShaderStageFlagBits shaderStage,
-                                                  ShaderInfoTypeAMD   infoType,
-                                                  size_t *            pInfoSize,
-                                                  void *              pInfo,
-                                                  Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                                                  VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                                                  VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                                                  size_t *                                  pInfoSize,
+                                                  void *                                    pInfo,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type getShaderInfoAMD(
-      Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getShaderInfoAMD( Pipeline            pipeline,
-                        ShaderStageFlagBits shaderStage,
-                        ShaderInfoTypeAMD   infoType,
-                        Uint8_tAllocator &  uint8_tAllocator,
-                        Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                        VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                        VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                        Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
+              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+      getShaderInfoAMD( VULKAN_HPP_NAMESPACE::Pipeline            pipeline,
+                        VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                        VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType,
+                        Uint8_tAllocator &                        uint8_tAllocator,
+                        Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_external_memory_win32 ===
 
-    // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryWin32HandleNV( DeviceMemory                    memory,
-                                                        ExternalMemoryHandleTypeFlagsNV handleType,
-                                                        HANDLE *                        pHandle,
-                                                        Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryWin32HandleNV( VULKAN_HPP_NAMESPACE::DeviceMemory                    memory,
+                                                        VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType,
+                                                        HANDLE *                                              pHandle,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getMemoryWin32HandleNV( DeviceMemory                    memory,
-                                                                                        ExternalMemoryHandleTypeFlagsNV handleType,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getMemoryWin32HandleNV( VULKAN_HPP_NAMESPACE::DeviceMemory                    memory,
+                                                                                        VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType,
                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_device_group ===
 
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getGroupPeerMemoryFeaturesKHR( uint32_t                 heapIndex,
-                                        uint32_t                 localDeviceIndex,
-                                        uint32_t                 remoteDeviceIndex,
-                                        PeerMemoryFeatureFlags * pPeerMemoryFeatures,
-                                        Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getGroupPeerMemoryFeaturesKHR( uint32_t                                       heapIndex,
+                                        uint32_t                                       localDeviceIndex,
+                                        uint32_t                                       remoteDeviceIndex,
+                                        VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags * pPeerMemoryFeatures,
+                                        Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PeerMemoryFeatureFlags
-      getGroupPeerMemoryFeaturesKHR( uint32_t           heapIndex,
-                                     uint32_t           localDeviceIndex,
-                                     uint32_t           remoteDeviceIndex,
-                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+                         getGroupPeerMemoryFeaturesKHR( uint32_t           heapIndex,
+                                                        uint32_t           localDeviceIndex,
+                                                        uint32_t           remoteDeviceIndex,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_maintenance1 ===
 
-    // wrapper function for command vkTrimCommandPoolKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPoolKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void trimCommandPoolKHR( CommandPool          commandPool,
-                             CommandPoolTrimFlags flags,
-                             Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void trimCommandPoolKHR( VULKAN_HPP_NAMESPACE::CommandPool          commandPool,
+                             VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags,
+                             Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_memory_win32 ===
 
-    // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                         HANDLE *                            pHandle,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR * pGetWin32HandleInfo,
+                                                         HANDLE *                                                  pHandle,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR & getWin32HandleInfo,
-                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type
+      getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR & getWin32HandleInfo,
+                               Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryWin32HandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                   HANDLE                           handle,
-                                                                   MemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                                                   HANDLE                                                 handle,
+                                                                   VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR * pMemoryWin32HandleProperties,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MemoryWin32HandlePropertiesKHR>::type getMemoryWin32HandlePropertiesKHR(
-      ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR>::type getMemoryWin32HandlePropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_memory_fd ===
 
-    // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryFdKHR( const MemoryGetFdInfoKHR * pGetFdInfo,
-                                                int *                      pFd,
-                                                Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR * pGetFdInfo,
+                                                int *                                            pFd,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getMemoryFdKHR( const MemoryGetFdInfoKHR & getFdInfo,
-                                                                             Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR & getFdInfo,
+                                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType,
-                                                          int                              fd,
-                                                          MemoryFdPropertiesKHR *          pMemoryFdProperties,
-                                                          Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                                          int                                                    fd,
+                                                          VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR *          pMemoryFdProperties,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MemoryFdPropertiesKHR>::type
-      getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, int fd, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR>::type getMemoryFdPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, int fd, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_semaphore_win32 ===
 
-    // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result importSemaphoreWin32HandleKHR( const ImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR * pImportSemaphoreWin32HandleInfo,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      importSemaphoreWin32HandleKHR( const ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo,
-                                     Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo,
+                                     Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                            HANDLE *                               pHandle,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR * pGetWin32HandleInfo,
+                                                            HANDLE *                                                     pHandle,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo,
-                                                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type
+      getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo,
+                                  Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_semaphore_fd ===
 
-    // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR * pImportSemaphoreFdInfo,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo,
+                            Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR * pGetFdInfo,
-                                                   int *                         pFd,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR * pGetFdInfo,
+                                                   int *                                               pFd,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR & getFdInfo,
-                                                                                Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR & getFdInfo,
+                                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_descriptor_update_template ===
 
-    // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDescriptorUpdateTemplateKHR( const DescriptorUpdateTemplateCreateInfo * pCreateInfo,
-                                                                   const AllocationCallbacks *                pAllocator,
-                                                                   DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDescriptorUpdateTemplateKHR( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo * pCreateInfo,
+                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                                                   VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate *                 pDescriptorUpdateTemplate,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorUpdateTemplate>::type
-      createDescriptorUpdateTemplateKHR( const DescriptorUpdateTemplateCreateInfo &    createInfo,
-                                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::type
+      createDescriptorUpdateTemplateKHR( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo &    createInfo,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DescriptorUpdateTemplate, Dispatch>>::type
-      createDescriptorUpdateTemplateKHRUnique( const DescriptorUpdateTemplateCreateInfo &    createInfo,
-                                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate, Dispatch>>::type
+      createDescriptorUpdateTemplateKHRUnique( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo & createInfo,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator
+                                                                  VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorUpdateTemplateKHR( DescriptorUpdateTemplate    descriptorUpdateTemplate,
-                                             const AllocationCallbacks * pAllocator,
-                                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate    descriptorUpdateTemplate,
+                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDescriptorUpdateTemplateKHR( DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                             Optional<const AllocationCallbacks> allocator     VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSetWithTemplateKHR( DescriptorSet            descriptorSet,
-                                             DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                             const void *             pData,
-                                             Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                             VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                             const void *                                   pData,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateDescriptorSetWithTemplateKHR( DescriptorSet            descriptorSet,
-                                             DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                             DataType const &         data,
-                                             Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void updateDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorSet            descriptorSet,
+                                             VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
+                                             DataType const &                               data,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_display_control ===
 
-    // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result displayPowerControlEXT( DisplayKHR                  display,
-                                                        const DisplayPowerInfoEXT * pDisplayPowerInfo,
-                                                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                        const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT * pDisplayPowerInfo,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type displayPowerControlEXT(
-      DisplayKHR display, const DisplayPowerInfoEXT & displayPowerInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                                 const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT & displayPowerInfo,
+                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result registerEventEXT( const DeviceEventInfoEXT *  pDeviceEventInfo,
-                                                  const AllocationCallbacks * pAllocator,
-                                                  Fence *                     pFence,
-                                                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT *  pDeviceEventInfo,
+                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                  VULKAN_HPP_NAMESPACE::Fence *                     pFence,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-      registerEventEXT( const DeviceEventInfoEXT &                    deviceEventInfo,
-                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type
+      registerEventEXT( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT &                    deviceEventInfo,
+                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type
-      registerEventEXTUnique( const DeviceEventInfoEXT &                    deviceEventInfo,
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type
+      registerEventEXTUnique( const VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT &                    deviceEventInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result registerDisplayEventEXT( DisplayKHR                  display,
-                                                         const DisplayEventInfoEXT * pDisplayEventInfo,
-                                                         const AllocationCallbacks * pAllocator,
-                                                         Fence *                     pFence,
-                                                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                         const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT * pDisplayEventInfo,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                         VULKAN_HPP_NAMESPACE::Fence *                     pFence,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-      registerDisplayEventEXT( DisplayKHR                                    display,
-                               const DisplayEventInfoEXT &                   displayEventInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Fence>::type
+      registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                                    display,
+                               const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT &                   displayEventInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Fence, Dispatch>>::type
-      registerDisplayEventEXTUnique( DisplayKHR                                    display,
-                                     const DisplayEventInfoEXT &                   displayEventInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Fence, Dispatch>>::type
+      registerDisplayEventEXTUnique( VULKAN_HPP_NAMESPACE::DisplayKHR                                    display,
+                                     const VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT &                   displayEventInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainCounterEXT( SwapchainKHR              swapchain,
-                                                        SurfaceCounterFlagBitsEXT counter,
-                                                        uint64_t *                pCounterValue,
-                                                        Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSwapchainCounterEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR              swapchain,
+                                                        VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter,
+                                                        uint64_t *                                      pCounterValue,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<uint64_t>
-#  else
-      typename ResultValueType<uint64_t>::type
-#  endif
-      getSwapchainCounterEXT( SwapchainKHR swapchain, SurfaceCounterFlagBitsEXT counter, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getSwapchainCounterEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR              swapchain,
+                                                                                          VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter,
+                                                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_GOOGLE_display_timing ===
 
-    // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getRefreshCycleDurationGOOGLE( SwapchainKHR                 swapchain,
-                                                               RefreshCycleDurationGOOGLE * pDisplayTimingProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getRefreshCycleDurationGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR                 swapchain,
+                                                               VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE * pDisplayTimingProperties,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<RefreshCycleDurationGOOGLE>::type
-      getRefreshCycleDurationGOOGLE( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE>::type
+      getRefreshCycleDurationGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPastPresentationTimingGOOGLE( SwapchainKHR                   swapchain,
-                                                                 uint32_t *                     pPresentationTimingCount,
-                                                                 PastPresentationTimingGOOGLE * pPresentationTimings,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                                 uint32_t *                                           pPresentationTimingCount,
+                                                                 VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE * pPresentationTimings,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-    template <
-      typename PastPresentationTimingGOOGLEAllocator = std::allocator<PastPresentationTimingGOOGLE>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, PastPresentationTimingGOOGLE>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>
-#  else
-      typename ResultValueType<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
-#  endif
-      getPastPresentationTimingGOOGLE( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-    template <
-      typename PastPresentationTimingGOOGLEAllocator = std::allocator<PastPresentationTimingGOOGLE>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, PastPresentationTimingGOOGLE>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>
-#  else
-      typename ResultValueType<std::vector<PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
-#  endif
-      getPastPresentationTimingGOOGLE( SwapchainKHR                            swapchain,
+    template <typename PastPresentationTimingGOOGLEAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
+      getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PastPresentationTimingGOOGLEAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PastPresentationTimingGOOGLEAllocator::value_type, VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE, PastPresentationTimingGOOGLEAllocator>>::type
+      getPastPresentationTimingGOOGLE( VULKAN_HPP_NAMESPACE::SwapchainKHR      swapchain,
                                        PastPresentationTimingGOOGLEAllocator & pastPresentationTimingGOOGLEAllocator,
                                        Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_hdr_metadata ===
 
-    // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setHdrMetadataEXT( uint32_t               swapchainCount,
-                            const SwapchainKHR *   pSwapchains,
-                            const HdrMetadataEXT * pMetadata,
-                            Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setHdrMetadataEXT( uint32_t                                     swapchainCount,
+                            const VULKAN_HPP_NAMESPACE::SwapchainKHR *   pSwapchains,
+                            const VULKAN_HPP_NAMESPACE::HdrMetadataEXT * pMetadata,
+                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setHdrMetadataEXT( ArrayProxy<const SwapchainKHR> const &   swapchains,
-                            ArrayProxy<const HdrMetadataEXT> const & metadata,
-                            Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setHdrMetadataEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const &   swapchains,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_create_renderpass2 ===
 
-    // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createRenderPass2KHR( const RenderPassCreateInfo2 * pCreateInfo,
-                                                      const AllocationCallbacks *   pAllocator,
-                                                      RenderPass *                  pRenderPass,
-                                                      Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::RenderPass *                  pRenderPass,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-      createRenderPass2KHR( const RenderPassCreateInfo2 &                 createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::RenderPass>::type
+      createRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &                 createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<RenderPass, Dispatch>>::type
-      createRenderPass2KHRUnique( const RenderPassCreateInfo2 &                 createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::RenderPass, Dispatch>>::type
+      createRenderPass2KHRUnique( const VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 &                 createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_shared_presentable_image ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainStatusKHR( SwapchainKHR       swapchain,
-                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSwapchainStatusKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainStatusKHR( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getSwapchainStatusKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_fence_win32 ===
 
-    // wrapper function for command vkImportFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR * pImportFenceWin32HandleInfo,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkImportFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo,
-                                 Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo,
+                                 Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
-                                                        HANDLE *                           pHandle,
-                                                        Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR * pGetWin32HandleInfo,
+                                                        HANDLE *                                                 pHandle,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR & getWin32HandleInfo,
-                                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type
+      getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR & getWin32HandleInfo,
+                              Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_fence_fd ===
 
-    // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result importFenceFdKHR( const ImportFenceFdInfoKHR * pImportFenceFdInfo,
-                                                  Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR * pImportFenceFdInfo,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      importFenceFdKHR( const ImportFenceFdInfoKHR & importFenceFdInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR & importFenceFdInfo,
+                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFenceFdKHR( const FenceGetFdInfoKHR * pGetFdInfo,
-                                               int *                     pFd,
-                                               Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR * pGetFdInfo,
+                                               int *                                           pFd,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getFenceFdKHR( const FenceGetFdInfoKHR & getFdInfo,
-                                                                            Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR & getFdInfo,
+                                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_performance_query ===
 
-    // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR * pInfo,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR & info,
+                               Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkReleaseProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseProfilingLockKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void releaseProfilingLockKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_debug_utils ===
 
-    // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT * pNameInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT * pNameInfo,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT & nameInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-    template <typename HandleType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setDebugUtilsObjectNameEXT( HandleType const & handle, std::string const & name, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT & nameInfo,
+                                  Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT * pTagInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT * pTagInfo,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT & tagInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkSetDebugUtilsObjectTagEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-    template <typename HandleType,
-              typename TagType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type setDebugUtilsObjectTagEXT(
-      HandleType const & handle, uint64_t name, TagType const & tag, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT & tagInfo,
+                                 Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     //=== VK_ANDROID_external_memory_android_hardware_buffer ===
 
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer *           buffer,
-                                                 AndroidHardwareBufferPropertiesANDROID * pProperties,
-                                                 Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer *                                 buffer,
+                                                 VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID * pProperties,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<AndroidHardwareBufferPropertiesANDROID>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID>::type
       getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
       getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
-                                                                       struct AHardwareBuffer **                         pBuffer,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID * pInfo,
+                                                                       struct AHardwareBuffer **                                               pBuffer,
                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<struct AHardwareBuffer *>::type
-      getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID & info,
-                                             Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID & info,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_AMDX_shader_enqueue ===
 
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createExecutionGraphPipelinesAMDX( PipelineCache                                pipelineCache,
-                                                                   uint32_t                                     createInfoCount,
-                                                                   const ExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
-                                                                   const AllocationCallbacks *                  pAllocator,
-                                                                   Pipeline *                                   pPipelines,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createExecutionGraphPipelinesAMDX( VULKAN_HPP_NAMESPACE::PipelineCache                                pipelineCache,
+                                                                   uint32_t                                                           createInfoCount,
+                                                                   const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX * pCreateInfos,
+                                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                  pAllocator,
+                                                                   VULKAN_HPP_NAMESPACE::Pipeline *                                   pPipelines,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createExecutionGraphPipelinesAMDX( PipelineCache                                                  pipelineCache,
-                                                            ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                            Optional<const AllocationCallbacks> allocator                  VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                            Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createExecutionGraphPipelinesAMDX( PipelineCache                                                  pipelineCache,
-                                                            ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                            Optional<const AllocationCallbacks>                            allocator,
-                                                            PipelineAllocator &                                            pipelineAllocator,
-                                                            Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline>
-                         createExecutionGraphPipelineAMDX( PipelineCache                                 pipelineCache,
-                                                           const ExecutionGraphPipelineCreateInfoAMDX &  createInfo,
-                                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createExecutionGraphPipelinesAMDX( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>,
+              typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createExecutionGraphPipelinesAMDX( VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+                                                            PipelineAllocator & pipelineAllocator,
+                                                            Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                         createExecutionGraphPipelineAMDX( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                           const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX &  createInfo,
+                                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
     template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createExecutionGraphPipelinesAMDXUnique( PipelineCache                                                  pipelineCache,
-                                                                  ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                                  Optional<const AllocationCallbacks> allocator                  VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                                  Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createExecutionGraphPipelinesAMDXUnique( PipelineCache                                                  pipelineCache,
-                                                                  ArrayProxy<const ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                                  Optional<const AllocationCallbacks>                            allocator,
-                                                                  PipelineAllocator &                                            pipelineAllocator,
-                                                                  Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createExecutionGraphPipelineAMDXUnique( PipelineCache                                 pipelineCache,
-                                                                 const ExecutionGraphPipelineCreateInfoAMDX &  createInfo,
-                                                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename PipelineAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createExecutionGraphPipelinesAMDXUnique(
+                           VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator         = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createExecutionGraphPipelinesAMDXUnique(
+                           VULKAN_HPP_NAMESPACE::PipelineCache                                                                        pipelineCache,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                                  allocator,
+                           PipelineAllocator &                                                                                        pipelineAllocator,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>> createExecutionGraphPipelineAMDXUnique(
+      VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+      const VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX &  createInfo,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getExecutionGraphPipelineScratchSizeAMDX( Pipeline                                executionGraph,
-                                                ExecutionGraphPipelineScratchSizeAMDX * pSizeInfo,
-                                                Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      getExecutionGraphPipelineScratchSizeAMDX( VULKAN_HPP_NAMESPACE::Pipeline                                executionGraph,
+                                                VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX * pSizeInfo,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ExecutionGraphPipelineScratchSizeAMDX>::type
-      getExecutionGraphPipelineScratchSizeAMDX( Pipeline executionGraph, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX>::type
+      getExecutionGraphPipelineScratchSizeAMDX( VULKAN_HPP_NAMESPACE::Pipeline executionGraph,
+                                                Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getExecutionGraphPipelineNodeIndexAMDX( Pipeline                                      executionGraph,
-                                                                        const PipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
-                                                                        uint32_t *                                    pNodeIndex,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getExecutionGraphPipelineNodeIndexAMDX( VULKAN_HPP_NAMESPACE::Pipeline                                      executionGraph,
+                                                                        const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX * pNodeInfo,
+                                                                        uint32_t *                                                          pNodeIndex,
                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type getExecutionGraphPipelineNodeIndexAMDX(
-      Pipeline executionGraph, const PipelineShaderStageNodeCreateInfoAMDX & nodeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type
+      getExecutionGraphPipelineNodeIndexAMDX( VULKAN_HPP_NAMESPACE::Pipeline                                      executionGraph,
+                                              const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX & nodeInfo,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_KHR_get_memory_requirements2 ===
 
-    // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 * pInfo,
-                                         MemoryRequirements2 *                pMemoryRequirements,
-                                         Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 * pInfo,
+                                         VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                pMemoryRequirements,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements2KHR(
-      const ImageMemoryRequirementsInfo2 & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info,
-                                                         Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 * pInfo,
-                                          MemoryRequirements2 *                 pMemoryRequirements,
-                                          Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 * pInfo,
+                                          VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements2KHR(
-      const BufferMemoryRequirementsInfo2 & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info,
-                                                          Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 * pInfo,
-                                               uint32_t *                                 pSparseMemoryRequirementCount,
-                                               SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
-                                               Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 * pInfo,
+                                               uint32_t *                                                       pSparseMemoryRequirementCount,
+                                               VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *           pSparseMemoryRequirements,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                         getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info,
-                                                               Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                         getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info,
-                                                               SparseImageMemoryRequirements2Allocator &  sparseImageMemoryRequirements2Allocator,
-                                                               Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                                               Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info,
+                                                               SparseImageMemoryRequirements2Allocator &                        sparseImageMemoryRequirements2Allocator,
+                                                               Dispatch const & d                                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_acceleration_structure ===
 
-    // wrapper function for command vkCreateAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createAccelerationStructureKHR( const AccelerationStructureCreateInfoKHR * pCreateInfo,
-                                                                const AllocationCallbacks *                pAllocator,
-                                                                AccelerationStructureKHR *                 pAccelerationStructure,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR * pCreateInfo,
+                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                                                VULKAN_HPP_NAMESPACE::AccelerationStructureKHR *                 pAccelerationStructure,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<AccelerationStructureKHR>::type
-      createAccelerationStructureKHR( const AccelerationStructureCreateInfoKHR &    createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>::type
+      createAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR &    createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<AccelerationStructureKHR, Dispatch>>::type
-      createAccelerationStructureKHRUnique( const AccelerationStructureCreateInfoKHR &    createInfo,
-                                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR, Dispatch>>::type
+      createAccelerationStructureKHRUnique( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR &    createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyAccelerationStructureKHR( AccelerationStructureKHR    accelerationStructure,
-                                          const AllocationCallbacks * pAllocator,
-                                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyAccelerationStructureKHR( AccelerationStructureKHR accelerationStructure VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                          Optional<const AllocationCallbacks> allocator  VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator  VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( AccelerationStructureKHR    accelerationStructure,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR    accelerationStructure,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( AccelerationStructureKHR                      accelerationStructure,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                      accelerationStructure,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result buildAccelerationStructuresKHR( DeferredOperationKHR                                   deferredOperation,
-                                                                uint32_t                                               infoCount,
-                                                                const AccelerationStructureBuildGeometryInfoKHR *      pInfos,
-                                                                const AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result buildAccelerationStructuresKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                   deferredOperation,
+                                                                uint32_t                                                                     infoCount,
+                                                                const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR *      pInfos,
+                                                                const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const * ppBuildRangeInfos,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result buildAccelerationStructuresKHR( DeferredOperationKHR                                                     deferredOperation,
-                                                                ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                                                ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
-                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result buildAccelerationStructuresKHR(
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                                           deferredOperation,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyAccelerationStructureKHR( DeferredOperationKHR                     deferredOperation,
-                                                              const CopyAccelerationStructureInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                     deferredOperation,
+                                                              const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR * pInfo,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyAccelerationStructureKHR( DeferredOperationKHR                     deferredOperation,
-                                                              const CopyAccelerationStructureInfoKHR & info,
-                                                              Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                                                    const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info,
+                                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyAccelerationStructureToMemoryKHR( DeferredOperationKHR                             deferredOperation,
-                                                                      const CopyAccelerationStructureToMemoryInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                                      const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR * pInfo,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyAccelerationStructureToMemoryKHR( DeferredOperationKHR                             deferredOperation,
-                                                                      const CopyAccelerationStructureToMemoryInfoKHR & info,
-                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                         copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                               const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info,
+                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToAccelerationStructureKHR( DeferredOperationKHR                             deferredOperation,
-                                                                      const CopyMemoryToAccelerationStructureInfoKHR * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                                      const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR * pInfo,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToAccelerationStructureKHR( DeferredOperationKHR                             deferredOperation,
-                                                                      const CopyMemoryToAccelerationStructureInfoKHR & info,
-                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                         copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                               const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info,
+                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      writeAccelerationStructuresPropertiesKHR( uint32_t                         accelerationStructureCount,
-                                                const AccelerationStructureKHR * pAccelerationStructures,
-                                                QueryType                        queryType,
-                                                size_t                           dataSize,
-                                                void *                           pData,
-                                                size_t                           stride,
-                                                Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
-      writeAccelerationStructuresPropertiesKHR( ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures,
-                                                QueryType                                          queryType,
-                                                size_t                                             dataSize,
-                                                size_t                                             stride,
-                                                Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      writeAccelerationStructuresPropertyKHR( ArrayProxy<const AccelerationStructureKHR> const & accelerationStructures,
-                                              QueryType                                          queryType,
-                                              size_t                                             stride,
-                                              Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR * pInfo,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR & info,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getAccelerationStructureCompatibilityKHR( const AccelerationStructureVersionInfoKHR * pVersionInfo,
-                                                   AccelerationStructureCompatibilityKHR *     pCompatibility,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD AccelerationStructureCompatibilityKHR getAccelerationStructureCompatibilityKHR(
-      const AccelerationStructureVersionInfoKHR & versionInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                 buildType,
-                                                const AccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
-                                                const uint32_t *                                  pMaxPrimitiveCounts,
-                                                AccelerationStructureBuildSizesInfoKHR *          pSizeInfo,
+      writeAccelerationStructuresPropertiesKHR( uint32_t                                               accelerationStructureCount,
+                                                const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures,
+                                                VULKAN_HPP_NAMESPACE::QueryType                        queryType,
+                                                size_t                                                 dataSize,
+                                                void *                                                 pData,
+                                                size_t                                                 stride,
                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR
-      getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                     buildType,
-                                             const AccelerationStructureBuildGeometryInfoKHR &     buildInfo,
-                                             ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type writeAccelerationStructuresPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      size_t                                                                                         dataSize,
+      size_t                                                                                         stride,
+      Dispatch const & d                                                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type writeAccelerationStructuresPropertyKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      size_t                                                                                         stride,
+      Dispatch const & d                                                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceAddress getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR * pInfo,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::DeviceAddress
+      getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR & info,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR * pVersionInfo,
+                                                   VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR *     pCompatibility,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+                         getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo,
+                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
+                                                const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR * pBuildInfo,
+                                                const uint32_t *                                                        pMaxPrimitiveCounts,
+                                                VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR *          pSizeInfo,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR getAccelerationStructureBuildSizesKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                     buildType,
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR &     buildInfo,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_ray_tracing_pipeline ===
 
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createRayTracingPipelinesKHR( DeferredOperationKHR                    deferredOperation,
-                                                              PipelineCache                           pipelineCache,
-                                                              uint32_t                                createInfoCount,
-                                                              const RayTracingPipelineCreateInfoKHR * pCreateInfos,
-                                                              const AllocationCallbacks *             pAllocator,
-                                                              Pipeline *                              pPipelines,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                    deferredOperation,
+                                                              VULKAN_HPP_NAMESPACE::PipelineCache                           pipelineCache,
+                                                              uint32_t                                                      createInfoCount,
+                                                              const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR * pCreateInfos,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *             pAllocator,
+                                                              VULKAN_HPP_NAMESPACE::Pipeline *                              pPipelines,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createRayTracingPipelinesKHR( DeferredOperationKHR                                      deferredOperation,
-                                                       PipelineCache                                             pipelineCache,
-                                                       ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                       Optional<const AllocationCallbacks> allocator             VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                       Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createRayTracingPipelinesKHR( DeferredOperationKHR                                      deferredOperation,
-                                                       PipelineCache                                             pipelineCache,
-                                                       ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                       Optional<const AllocationCallbacks>                       allocator,
-                                                       PipelineAllocator &                                       pipelineAllocator,
-                                                       Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline>
-                         createRayTracingPipelineKHR( DeferredOperationKHR                          deferredOperation,
-                                                      PipelineCache                                 pipelineCache,
-                                                      const RayTracingPipelineCreateInfoKHR &       createInfo,
-                                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                            deferredOperation,
+                                                       VULKAN_HPP_NAMESPACE::PipelineCache                                                                   pipelineCache,
+                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>,
+              typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createRayTracingPipelinesKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                            deferredOperation,
+                                                       VULKAN_HPP_NAMESPACE::PipelineCache                                                                   pipelineCache,
+                                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+                                                       PipelineAllocator &                                                                                   pipelineAllocator,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                         createRayTracingPipelineKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                          deferredOperation,
+                                                      VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                      const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR &       createInfo,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
     template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createRayTracingPipelinesKHRUnique( DeferredOperationKHR                                      deferredOperation,
-                                                             PipelineCache                                             pipelineCache,
-                                                             ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                             Optional<const AllocationCallbacks> allocator             VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                             Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createRayTracingPipelinesKHRUnique( DeferredOperationKHR                                      deferredOperation,
-                                                             PipelineCache                                             pipelineCache,
-                                                             ArrayProxy<const RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                                             Optional<const AllocationCallbacks>                       allocator,
-                                                             PipelineAllocator &                                       pipelineAllocator,
-                                                             Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createRayTracingPipelineKHRUnique( DeferredOperationKHR                          deferredOperation,
-                                                            PipelineCache                                 pipelineCache,
-                                                            const RayTracingPipelineCreateInfoKHR &       createInfo,
-                                                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename PipelineAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createRayTracingPipelinesKHRUnique( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                             VULKAN_HPP_NAMESPACE::PipelineCache        pipelineCache,
+                                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator         = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createRayTracingPipelinesKHRUnique( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                             VULKAN_HPP_NAMESPACE::PipelineCache        pipelineCache,
+                                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const & createInfos,
+                                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                             allocator,
+                                                             PipelineAllocator & pipelineAllocator,
+                                                             Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                         createRayTracingPipelineKHRUnique( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                          deferredOperation,
+                                                            VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                            const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR &       createInfo,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesKHR( Pipeline           pipeline,
-                                                                    uint32_t           firstGroup,
-                                                                    uint32_t           groupCount,
-                                                                    size_t             dataSize,
-                                                                    void *             pData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                    uint32_t                       firstGroup,
+                                                                    uint32_t                       groupCount,
+                                                                    size_t                         dataSize,
+                                                                    void *                         pData,
                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type getRayTracingShaderGroupHandlesKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
+      getRayTracingShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                          uint32_t                       firstGroup,
+                                          uint32_t                       groupCount,
+                                          size_t                         dataSize,
+                                          Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getRayTracingCaptureReplayShaderGroupHandlesKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-      const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getRayTracingCaptureReplayShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                       uint32_t                       firstGroup,
+                                                       uint32_t                       groupCount,
+                                                       size_t                         dataSize,
+                                                       void *                         pData,
+                                                       Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type getRayTracingCaptureReplayShaderGroupHandlesKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
+      getRayTracingCaptureReplayShaderGroupHandlesKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                       uint32_t                       firstGroup,
+                                                       uint32_t                       groupCount,
+                                                       size_t                         dataSize,
+                                                       Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingCaptureReplayShaderGroupHandleKHR(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetRayTracingShaderGroupStackSizeKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupStackSizeKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceSize getRayTracingShaderGroupStackSizeKHR( Pipeline             pipeline,
-                                                     uint32_t             group,
-                                                     ShaderGroupShaderKHR groupShader,
-                                                     Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceSize getRayTracingShaderGroupStackSizeKHR( VULKAN_HPP_NAMESPACE::Pipeline             pipeline,
+                                                     uint32_t                                   group,
+                                                     VULKAN_HPP_NAMESPACE::ShaderGroupShaderKHR groupShader,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_sampler_ycbcr_conversion ===
 
-    // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSamplerYcbcrConversionKHR( const SamplerYcbcrConversionCreateInfo * pCreateInfo,
-                                                                 const AllocationCallbacks *              pAllocator,
-                                                                 SamplerYcbcrConversion *                 pYcbcrConversion,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createSamplerYcbcrConversionKHR( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo * pCreateInfo,
+                                                                 const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                                                 VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion *                 pYcbcrConversion,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SamplerYcbcrConversion>::type
-      createSamplerYcbcrConversionKHR( const SamplerYcbcrConversionCreateInfo &      createInfo,
-                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::type
+      createSamplerYcbcrConversionKHR( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo &      createInfo,
+                                       Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                       Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SamplerYcbcrConversion, Dispatch>>::type
-      createSamplerYcbcrConversionKHRUnique( const SamplerYcbcrConversionCreateInfo &      createInfo,
-                                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion, Dispatch>>::type
+      createSamplerYcbcrConversionKHRUnique( const VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo &      createInfo,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySamplerYcbcrConversionKHR( SamplerYcbcrConversion      ycbcrConversion,
-                                           const AllocationCallbacks * pAllocator,
-                                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion      ycbcrConversion,
+                                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySamplerYcbcrConversionKHR( SamplerYcbcrConversion ycbcrConversion        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion        VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_bind_memory2 ===
 
-    // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindBufferMemory2KHR( uint32_t                     bindInfoCount,
-                                                      const BindBufferMemoryInfo * pBindInfos,
-                                                      Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindBufferMemory2KHR( uint32_t                                           bindInfoCount,
+                                                      const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo * pBindInfos,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindBufferMemory2KHR( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindBufferMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindImageMemory2KHR( uint32_t                    bindInfoCount,
-                                                     const BindImageMemoryInfo * pBindInfos,
-                                                     Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindImageMemory2KHR( uint32_t                                          bindInfoCount,
+                                                     const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo * pBindInfos,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindImageMemory2KHR( ArrayProxy<const BindImageMemoryInfo> const & bindInfos, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindImageMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_image_drm_format_modifier ===
 
-    // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageDrmFormatModifierPropertiesEXT( Image                                 image,
-                                                                        ImageDrmFormatModifierPropertiesEXT * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageDrmFormatModifierPropertiesEXT( VULKAN_HPP_NAMESPACE::Image                                 image,
+                                                                        VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT * pProperties,
                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageDrmFormatModifierPropertiesEXT>::type
-      getImageDrmFormatModifierPropertiesEXT( Image image, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT>::type
+      getImageDrmFormatModifierPropertiesEXT( VULKAN_HPP_NAMESPACE::Image image, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_validation_cache ===
 
-    // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createValidationCacheEXT( const ValidationCacheCreateInfoEXT * pCreateInfo,
-                                                          const AllocationCallbacks *          pAllocator,
-                                                          ValidationCacheEXT *                 pValidationCache,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createValidationCacheEXT( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT * pCreateInfo,
+                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                          VULKAN_HPP_NAMESPACE::ValidationCacheEXT *                 pValidationCache,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ValidationCacheEXT>::type
-      createValidationCacheEXT( const ValidationCacheCreateInfoEXT &          createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>::type
+      createValidationCacheEXT( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT &          createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<ValidationCacheEXT, Dispatch>>::type
-      createValidationCacheEXTUnique( const ValidationCacheCreateInfoEXT &          createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::ValidationCacheEXT, Dispatch>>::type
+      createValidationCacheEXTUnique( const VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT &          createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyValidationCacheEXT( ValidationCacheEXT          validationCache,
-                                    const AllocationCallbacks * pAllocator,
-                                    Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
+                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                    Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyValidationCacheEXT( ValidationCacheEXT validationCache            VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache            VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ValidationCacheEXT          validationCache,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT          validationCache,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyValidationCacheEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ValidationCacheEXT                            validationCache,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ValidationCacheEXT                            validationCache,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result mergeValidationCachesEXT( ValidationCacheEXT         dstCache,
-                                                          uint32_t                   srcCacheCount,
-                                                          const ValidationCacheEXT * pSrcCaches,
-                                                          Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT         dstCache,
+                                                          uint32_t                                         srcCacheCount,
+                                                          const VULKAN_HPP_NAMESPACE::ValidationCacheEXT * pSrcCaches,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type mergeValidationCachesEXT(
-      ValidationCacheEXT dstCache, ArrayProxy<const ValidationCacheEXT> const & srcCaches, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
+      mergeValidationCachesEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT                                                 dstCache,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getValidationCacheDataEXT( ValidationCacheEXT validationCache,
-                                                           size_t *           pDataSize,
-                                                           void *             pData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache,
+                                                           size_t *                                 pDataSize,
+                                                           void *                                   pData,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getValidationCacheDataEXT( ValidationCacheEXT validationCache, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
+      getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
               typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type getValidationCacheDataEXT(
-      ValidationCacheEXT validationCache, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+      getValidationCacheDataEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache,
+                                 Uint8_tAllocator &                       uint8_tAllocator,
+                                 Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_ray_tracing ===
 
-    // wrapper function for command vkCreateAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createAccelerationStructureNV( const AccelerationStructureCreateInfoNV * pCreateInfo,
-                                                               const AllocationCallbacks *               pAllocator,
-                                                               AccelerationStructureNV *                 pAccelerationStructure,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV * pCreateInfo,
+                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                                               VULKAN_HPP_NAMESPACE::AccelerationStructureNV *                 pAccelerationStructure,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<AccelerationStructureNV>::type
-      createAccelerationStructureNV( const AccelerationStructureCreateInfoNV &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>::type
+      createAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV &     createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<AccelerationStructureNV, Dispatch>>::type
-      createAccelerationStructureNVUnique( const AccelerationStructureCreateInfoNV &     createInfo,
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::AccelerationStructureNV, Dispatch>>::type
+      createAccelerationStructureNVUnique( const VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV &     createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyAccelerationStructureNV( AccelerationStructureNV     accelerationStructure,
-                                         const AllocationCallbacks * pAllocator,
-                                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
+                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                         Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyAccelerationStructureNV( AccelerationStructureNV accelerationStructure VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( AccelerationStructureNV     accelerationStructure,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV     accelerationStructure,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyAccelerationStructureNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( AccelerationStructureNV                       accelerationStructure,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::AccelerationStructureNV                       accelerationStructure,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV * pInfo,
-                                                       MemoryRequirements2KHR *                              pMemoryRequirements,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV * pInfo,
+                                                       VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR *                              pMemoryRequirements,
                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2KHR getAccelerationStructureMemoryRequirementsNV(
-      const AccelerationStructureMemoryRequirementsInfoNV & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR
+                         getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info,
+                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getAccelerationStructureMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info,
                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindAccelerationStructureMemoryNV( uint32_t                                      bindInfoCount,
-                                                                   const BindAccelerationStructureMemoryInfoNV * pBindInfos,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindAccelerationStructureMemoryNV( uint32_t                                                            bindInfoCount,
+                                                                   const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV * pBindInfos,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindAccelerationStructureMemoryNV( ArrayProxy<const BindAccelerationStructureMemoryInfoNV> const & bindInfos,
-                                         Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      bindAccelerationStructureMemoryNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV> const & bindInfos,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createRayTracingPipelinesNV( PipelineCache                          pipelineCache,
-                                                             uint32_t                               createInfoCount,
-                                                             const RayTracingPipelineCreateInfoNV * pCreateInfos,
-                                                             const AllocationCallbacks *            pAllocator,
-                                                             Pipeline *                             pPipelines,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                          pipelineCache,
+                                                             uint32_t                                                     createInfoCount,
+                                                             const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV * pCreateInfos,
+                                                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks *            pAllocator,
+                                                             VULKAN_HPP_NAMESPACE::Pipeline *                             pPipelines,
                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createRayTracingPipelinesNV( PipelineCache                                            pipelineCache,
-                                                      ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                                      Optional<const AllocationCallbacks> allocator            VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                      Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createRayTracingPipelinesNV( PipelineCache                                            pipelineCache,
-                                                      ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                                      Optional<const AllocationCallbacks>                      allocator,
-                                                      PipelineAllocator &                                      pipelineAllocator,
-                                                      Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline>
-                         createRayTracingPipelineNV( PipelineCache                                 pipelineCache,
-                                                     const RayTracingPipelineCreateInfoNV &        createInfo,
-                                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Pipeline>,
+              typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, VULKAN_HPP_NAMESPACE::Pipeline>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::Pipeline, PipelineAllocator>>
+                         createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                                      PipelineAllocator &                                                                                  pipelineAllocator,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::Pipeline>
+                         createRayTracingPipelineNV( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                     const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV &        createInfo,
+                                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
     template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createRayTracingPipelinesNVUnique( PipelineCache                                            pipelineCache,
-                                                            ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                                            Optional<const AllocationCallbacks> allocator            VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createRayTracingPipelinesNVUnique( PipelineCache                                            pipelineCache,
-                                                            ArrayProxy<const RayTracingPipelineCreateInfoNV> const & createInfos,
-                                                            Optional<const AllocationCallbacks>                      allocator,
-                                                            PipelineAllocator &                                      pipelineAllocator,
-                                                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createRayTracingPipelineNVUnique( PipelineCache                                 pipelineCache,
-                                                           const RayTracingPipelineCreateInfoNV &        createInfo,
-                                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename PipelineAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createRayTracingPipelinesNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename PipelineAllocator         = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>,
+              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>, PipelineAllocator>>
+                         createRayTracingPipelinesNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                                                  pipelineCache,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const & createInfos,
+                                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                            allocator,
+                                                            PipelineAllocator &                                                                                  pipelineAllocator,
+                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::Pipeline, Dispatch>>
+                         createRayTracingPipelineNVUnique( VULKAN_HPP_NAMESPACE::PipelineCache                                 pipelineCache,
+                                                           const VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV &        createInfo,
+                                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesNV( Pipeline           pipeline,
-                                                                   uint32_t           firstGroup,
-                                                                   uint32_t           groupCount,
-                                                                   size_t             dataSize,
-                                                                   void *             pData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getRayTracingShaderGroupHandlesNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                                   uint32_t                       firstGroup,
+                                                                   uint32_t                       groupCount,
+                                                                   size_t                         dataSize,
+                                                                   void *                         pData,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type getRayTracingShaderGroupHandlesNV(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
+      getRayTracingShaderGroupHandlesNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                         uint32_t                       firstGroup,
+                                         uint32_t                       groupCount,
+                                         size_t                         dataSize,
+                                         Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleNV(
-      Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t firstGroup, uint32_t groupCount, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetAccelerationStructureHandleNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getAccelerationStructureHandleNV( AccelerationStructureNV accelerationStructure,
-                                                                  size_t                  dataSize,
-                                                                  void *                  pData,
-                                                                  Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
+                                                                  size_t                                        dataSize,
+                                                                  void *                                        pData,
+                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAccelerationStructureHandleNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type getAccelerationStructureHandleNV(
-      AccelerationStructureNV accelerationStructure, size_t dataSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetAccelerationStructureHandleNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+      VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure, size_t dataSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getAccelerationStructureHandleNV( AccelerationStructureNV accelerationStructure, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getAccelerationStructureHandleNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure,
+                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result compileDeferredNV( Pipeline           pipeline,
-                                                   uint32_t           shader,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result compileDeferredNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline,
+                                                   uint32_t                       shader,
+                                                   Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      compileDeferredNV( Pipeline pipeline, uint32_t shader, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      compileDeferredNV( VULKAN_HPP_NAMESPACE::Pipeline pipeline, uint32_t shader, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_maintenance3 ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo * pCreateInfo,
-                                           DescriptorSetLayoutSupport *          pSupport,
-                                           Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo * pCreateInfo,
+                                           VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport *          pSupport,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DescriptorSetLayoutSupport getDescriptorSetLayoutSupportKHR(
-      const DescriptorSetLayoutCreateInfo & createInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo,
-                                                           Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                         getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo,
+                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_external_memory_host ===
 
-    // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryHostPointerPropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                   const void *                     pHostPointer,
-                                                                   MemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                                                   const void *                                           pHostPointer,
+                                                                   VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT * pMemoryHostPointerProperties,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MemoryHostPointerPropertiesEXT>::type getMemoryHostPointerPropertiesEXT(
-      ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT>::type
+      getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                         const void *                                           pHostPointer,
+                                         Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_calibrated_timestamps ===
 
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCalibratedTimestampsEXT( uint32_t                           timestampCount,
-                                                            const CalibratedTimestampInfoKHR * pTimestampInfos,
-                                                            uint64_t *                         pTimestamps,
-                                                            uint64_t *                         pMaxDeviation,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCalibratedTimestampsEXT( uint32_t                                                 timestampCount,
+                                                            const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR * pTimestampInfos,
+                                                            uint64_t *                                               pTimestamps,
+                                                            uint64_t *                                               pMaxDeviation,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
+    template <typename Uint64_tAllocator = std::allocator<uint64_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
+      getCalibratedTimestampsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename Uint64_tAllocator                                                                                = std::allocator<uint64_t>,
               typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
+              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-      getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-    template <typename Uint64_tAllocator                                                                                = std::allocator<uint64_t>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-      getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                  Uint64_tAllocator &                                  uint64_tAllocator,
-                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+      getCalibratedTimestampsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                  Uint64_tAllocator &                                                                              uint64_tAllocator,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-      getCalibratedTimestampEXT( const CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getCalibratedTimestampEXT( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo,
+                                 Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_timeline_semaphore ===
 
-    // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSemaphoreCounterValueKHR( Semaphore          semaphore,
-                                                             uint64_t *         pValue,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSemaphoreCounterValueKHR( VULKAN_HPP_NAMESPACE::Semaphore semaphore,
+                                                             uint64_t *                      pValue,
                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type
-      getSemaphoreCounterValueKHR( Semaphore semaphore, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getSemaphoreCounterValueKHR( VULKAN_HPP_NAMESPACE::Semaphore semaphore, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitSemaphoresKHR( const SemaphoreWaitInfo * pWaitInfo,
-                                                   uint64_t                  timeout,
-                                                   Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo * pWaitInfo,
+                                                   uint64_t                                        timeout,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitSemaphoresKHR( const SemaphoreWaitInfo & waitInfo,
-                                                   uint64_t                  timeout,
-                                                   Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
+                                                                         uint64_t                                        timeout,
+                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result signalSemaphoreKHR( const SemaphoreSignalInfo * pSignalInfo,
-                                                    Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo * pSignalInfo,
+                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      signalSemaphoreKHR( const SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    //=== VK_EXT_present_timing ===
-
-#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setSwapchainPresentTimingQueueSizeEXT( SwapchainKHR       swapchain,
-                                                                       uint32_t           size,
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#else
-    // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setSwapchainPresentTimingQueueSizeEXT( SwapchainKHR       swapchain,
-                                                                       uint32_t           size,
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainTimingPropertiesEXT( SwapchainKHR                   swapchain,
-                                                                 SwapchainTimingPropertiesEXT * pSwapchainTimingProperties,
-                                                                 uint64_t *                     pSwapchainTimingPropertiesCounter,
-                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>>
-                         getSwapchainTimingPropertiesEXT( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetSwapchainTimeDomainPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimeDomainPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainTimeDomainPropertiesEXT( SwapchainKHR                       swapchain,
-                                                                     SwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
-                                                                     uint64_t *                         pTimeDomainsCounter,
-                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
-    // wrapper function for command vkGetPastPresentationTimingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPastPresentationTimingEXT( const PastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
-                                                              PastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties,
-                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
     //=== VK_INTEL_performance_query ===
 
-    // wrapper function for command vkInitializePerformanceApiINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL * pInitializeInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL * pInitializeInfo,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkInitializePerformanceApiINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL & initializeInfo,
-                                     Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL & initializeInfo,
+                                     Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkUninitializePerformanceApiINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUninitializePerformanceApiINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     void uninitializePerformanceApiINTEL( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-    // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquirePerformanceConfigurationINTEL( const PerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
-                                                                      PerformanceConfigurationINTEL *                  pConfiguration,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquirePerformanceConfigurationINTEL( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL * pAcquireInfo,
+                                                                      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL *                  pConfiguration,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PerformanceConfigurationINTEL>::type
-      acquirePerformanceConfigurationINTEL( const PerformanceConfigurationAcquireInfoINTEL & acquireInfo,
-                                            Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>::type
+      acquirePerformanceConfigurationINTEL( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL & acquireInfo,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<PerformanceConfigurationINTEL, Dispatch>>::type
-      acquirePerformanceConfigurationINTELUnique( const PerformanceConfigurationAcquireInfoINTEL & acquireInfo,
-                                                  Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL, Dispatch>>::type
+      acquirePerformanceConfigurationINTELUnique( const VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL & acquireInfo,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releasePerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result releasePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releasePerformanceConfigurationINTEL( PerformanceConfigurationINTEL configuration VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                            Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      releasePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                            Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result release( PerformanceConfigurationINTEL configuration,
-                                         Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result release( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkReleasePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleasePerformanceConfigurationINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type release( PerformanceConfigurationINTEL configuration,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type release( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration,
                                                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetPerformanceParameterINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter,
-                                                              PerformanceValueINTEL *       pValue,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter,
+                                                              VULKAN_HPP_NAMESPACE::PerformanceValueINTEL *       pValue,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPerformanceParameterINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PerformanceValueINTEL>::type
-      getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PerformanceValueINTEL>::type
+      getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter,
+                                    Dispatch const & d                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_AMD_display_native_hdr ===
 
-    // wrapper function for command vkSetLocalDimmingAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLocalDimmingAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLocalDimmingAMD( SwapchainKHR       swapChain,
-                             Bool32             localDimmingEnable,
-                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLocalDimmingAMD( VULKAN_HPP_NAMESPACE::SwapchainKHR swapChain,
+                             VULKAN_HPP_NAMESPACE::Bool32       localDimmingEnable,
+                             Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_EXT_buffer_device_address ===
 
-    // wrapper function for command vkGetBufferDeviceAddressEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddressEXT( const BufferDeviceAddressInfo * pInfo,
-                                       Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceAddress getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferDeviceAddressEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddressEXT( const BufferDeviceAddressInfo & info,
-                                       Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::DeviceAddress getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_present_wait ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitForPresentKHR( SwapchainKHR       swapchain,
-                                                   uint64_t           presentId,
-                                                   uint64_t           timeout,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result waitForPresentKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                   uint64_t                           presentId,
+                                                   uint64_t                           timeout,
+                                                   Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      waitForPresentKHR( SwapchainKHR swapchain, uint64_t presentId, uint64_t timeout, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitForPresentKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                                                         uint64_t                           presentId,
+                                                                         uint64_t                           timeout,
+                                                                         Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_EXT_full_screen_exclusive ===
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireFullScreenExclusiveModeEXT( SwapchainKHR       swapchain,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  else
-    // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireFullScreenExclusiveModeEXT( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      acquireFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releaseFullScreenExclusiveModeEXT( SwapchainKHR       swapchain,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result releaseFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  else
-    // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releaseFullScreenExclusiveModeEXT( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      releaseFullScreenExclusiveModeEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                                 DeviceGroupPresentModeFlagsKHR *      pModes,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                                 VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR *      pModes,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-      getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR>::type
+      getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                       Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_buffer_device_address ===
 
-    // wrapper function for command vkGetBufferDeviceAddressKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddressKHR( const BufferDeviceAddressInfo * pInfo,
-                                       Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceAddress getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferDeviceAddressKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getBufferAddressKHR( const BufferDeviceAddressInfo & info,
-                                       Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::DeviceAddress getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo * pInfo,
-                                               Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo & info,
-                                               Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo * pInfo,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint64_t getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo & info,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo * pInfo,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint64_t getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_host_query_reset ===
 
-    // wrapper function for command vkResetQueryPoolEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPoolEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void resetQueryPoolEXT( QueryPool          queryPool,
-                            uint32_t           firstQuery,
-                            uint32_t           queryCount,
-                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void resetQueryPoolEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
+                            uint32_t                        firstQuery,
+                            uint32_t                        queryCount,
+                            Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_deferred_host_operations ===
 
-    // wrapper function for command vkCreateDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDeferredOperationKHR( const AllocationCallbacks * pAllocator,
-                                                            DeferredOperationKHR *      pDeferredOperation,
-                                                            Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDeferredOperationKHR( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                            VULKAN_HPP_NAMESPACE::DeferredOperationKHR *      pDeferredOperation,
+                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DeferredOperationKHR>::type
-      createDeferredOperationKHR( Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>::type
+      createDeferredOperationKHR( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DeferredOperationKHR, Dispatch>>::type
-      createDeferredOperationKHRUnique( Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DeferredOperationKHR, Dispatch>>::type
+      createDeferredOperationKHRUnique( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDeferredOperationKHR( DeferredOperationKHR        operation,
-                                      const AllocationCallbacks * pAllocator,
-                                      Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
+                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                      Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDeferredOperationKHR( DeferredOperationKHR operation                VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDeferredOperationKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation                VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DeferredOperationKHR        operation,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        operation,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDeferredOperationKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DeferredOperationKHR                          operation,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                          operation,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeferredOperationMaxConcurrencyKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationMaxConcurrencyKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    uint32_t getDeferredOperationMaxConcurrencyKHR( DeferredOperationKHR operation,
-                                                    Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    uint32_t getDeferredOperationMaxConcurrencyKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeferredOperationResultKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDeferredOperationResultKHR( DeferredOperationKHR operation,
-                                                               Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDeferredOperationResultKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkGetDeferredOperationResultKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDeferredOperationResultKHR( DeferredOperationKHR operation,
-                                                               Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                         getDeferredOperationResultKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                        Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result deferredOperationJoinKHR( DeferredOperationKHR operation,
-                                                          Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result deferredOperationJoinKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result deferredOperationJoinKHR( DeferredOperationKHR operation, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result deferredOperationJoinKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR operation,
+                                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_pipeline_executable_properties ===
 
-    // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelineExecutablePropertiesKHR( const PipelineInfoKHR *           pPipelineInfo,
-                                                                    uint32_t *                        pExecutableCount,
-                                                                    PipelineExecutablePropertiesKHR * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR *           pPipelineInfo,
+                                                                    uint32_t *                                              pExecutableCount,
+                                                                    VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR * pProperties,
                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-    template <typename PipelineExecutablePropertiesKHRAllocator                              = std::allocator<PipelineExecutablePropertiesKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, PipelineExecutablePropertiesKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
-      getPipelineExecutablePropertiesKHR( const PipelineInfoKHR & pipelineInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-    template <typename PipelineExecutablePropertiesKHRAllocator                              = std::allocator<PipelineExecutablePropertiesKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, PipelineExecutablePropertiesKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
-      getPipelineExecutablePropertiesKHR( const PipelineInfoKHR &                    pipelineInfo,
-                                          PipelineExecutablePropertiesKHRAllocator & pipelineExecutablePropertiesKHRAllocator,
-                                          Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineExecutablePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>,
+              typename Dispatch                                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
+      getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo,
+                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineExecutablePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>,
+              typename Dispatch                                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PipelineExecutablePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR, PipelineExecutablePropertiesKHRAllocator>>::type
+      getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo,
+                                          PipelineExecutablePropertiesKHRAllocator &    pipelineExecutablePropertiesKHRAllocator,
+                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR * pExecutableInfo,
-                                                                    uint32_t *                        pStatisticCount,
-                                                                    PipelineExecutableStatisticKHR *  pStatistics,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR * pExecutableInfo,
+                                                                    uint32_t *                                              pStatisticCount,
+                                                                    VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR *  pStatistics,
                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-    template <
-      typename PipelineExecutableStatisticKHRAllocator = std::allocator<PipelineExecutableStatisticKHR>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, PipelineExecutableStatisticKHR>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
-      getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR & executableInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-    template <
-      typename PipelineExecutableStatisticKHRAllocator = std::allocator<PipelineExecutableStatisticKHR>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, PipelineExecutableStatisticKHR>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
-      getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR &         executableInfo,
-                                          PipelineExecutableStatisticKHRAllocator & pipelineExecutableStatisticKHRAllocator,
-                                          Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineExecutableStatisticKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
+      getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+                                          Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineExecutableStatisticKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PipelineExecutableStatisticKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR, PipelineExecutableStatisticKHRAllocator>>::type
+      getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+                                          PipelineExecutableStatisticKHRAllocator &               pipelineExecutableStatisticKHRAllocator,
+                                          Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR *             pExecutableInfo,
-                                                       uint32_t *                                    pInternalRepresentationCount,
-                                                       PipelineExecutableInternalRepresentationKHR * pInternalRepresentations,
+      getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR *             pExecutableInfo,
+                                                       uint32_t *                                                          pInternalRepresentationCount,
+                                                       VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR * pInternalRepresentations,
                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-    template <typename PipelineExecutableInternalRepresentationKHRAllocator = std::allocator<PipelineExecutableInternalRepresentationKHR>,
+    template <typename PipelineExecutableInternalRepresentationKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>,
+              typename Dispatch                                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<
+      std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
+      getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+                                                       Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PipelineExecutableInternalRepresentationKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>,
               typename Dispatch                                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<
-                std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type, PipelineExecutableInternalRepresentationKHR>::value,
-                int>::type                                                                   = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
-      getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR & executableInfo,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-    template <typename PipelineExecutableInternalRepresentationKHRAllocator = std::allocator<PipelineExecutableInternalRepresentationKHR>,
-              typename Dispatch                                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<
-                std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type, PipelineExecutableInternalRepresentationKHR>::value,
-                int>::type                                                                   = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
+              typename std::enable_if<std::is_same<typename PipelineExecutableInternalRepresentationKHRAllocator::value_type,
+                                                   VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>::value,
+                                      int>::type                            = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<
+      std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR, PipelineExecutableInternalRepresentationKHRAllocator>>::type
       getPipelineExecutableInternalRepresentationsKHR(
-        const PipelineExecutableInfoKHR &                      executableInfo,
-        PipelineExecutableInternalRepresentationKHRAllocator & pipelineExecutableInternalRepresentationKHRAllocator,
-        Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+        const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo,
+        PipelineExecutableInternalRepresentationKHRAllocator &  pipelineExecutableInternalRepresentationKHRAllocator,
+        Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_host_image_copy ===
 
-    // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToImageEXT( const CopyMemoryToImageInfo * pCopyMemoryToImageInfo,
-                                                      Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT * pCopyMemoryToImageInfo,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyMemoryToImageEXT( const CopyMemoryToImageInfo & copyMemoryToImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT & copyMemoryToImageInfo,
+                            Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyImageToMemoryEXT( const CopyImageToMemoryInfo * pCopyImageToMemoryInfo,
-                                                      Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT * pCopyImageToMemoryInfo,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyImageToMemoryEXT( const CopyImageToMemoryInfo & copyImageToMemoryInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT & copyImageToMemoryInfo,
+                            Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyImageToImageEXT( const CopyImageToImageInfo * pCopyImageToImageInfo,
-                                                     Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT * pCopyImageToImageInfo,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      copyImageToImageEXT( const CopyImageToImageInfo & copyImageToImageInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT & copyImageToImageInfo,
+                           Dispatch const & d                                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result transitionImageLayoutEXT( uint32_t                              transitionCount,
-                                                          const HostImageLayoutTransitionInfo * pTransitions,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result transitionImageLayoutEXT( uint32_t                                                       transitionCount,
+                                                          const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT * pTransitions,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      transitionImageLayoutEXT( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions,
-                                Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      transitionImageLayoutEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT> const & transitions,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayout2EXT( Image                     image,
-                                        const ImageSubresource2 * pSubresource,
-                                        SubresourceLayout2 *      pLayout,
-                                        Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSubresourceLayout2EXT( VULKAN_HPP_NAMESPACE::Image                        image,
+                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource,
+                                        VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *      pLayout,
+                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayout2EXT(
-      Image image, const ImageSubresource2 & subresource, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageSubresourceLayout2EXT(
-      Image image, const ImageSubresource2 & subresource, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                         getImageSubresourceLayout2EXT( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource,
+                                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageSubresourceLayout2EXT( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource,
+                                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_map_memory2 ===
 
-    // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result mapMemory2KHR( const MemoryMapInfo * pMemoryMapInfo,
-                                               void **               ppData,
-                                               Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR * pMemoryMapInfo,
+                                               void **                                        ppData,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory2KHR( const MemoryMapInfo & memoryMapInfo,
-                                                                               Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR & memoryMapInfo,
+                                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result unmapMemory2KHR( const MemoryUnmapInfo * pMemoryUnmapInfo,
-                                                 Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR * pMemoryUnmapInfo,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      unmapMemory2KHR( const MemoryUnmapInfo & memoryUnmapInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR & memoryUnmapInfo,
+                                                          Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_swapchain_maintenance1 ===
 
-    // wrapper function for command vkReleaseSwapchainImagesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR * pReleaseInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT * pReleaseInfo,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleaseSwapchainImagesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR & releaseInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT & releaseInfo,
+                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_device_generated_commands ===
 
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV * pInfo,
-                                                   MemoryRequirements2 *                             pMemoryRequirements,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV * pInfo,
+                                                   VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                             pMemoryRequirements,
                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getGeneratedCommandsMemoryRequirementsNV(
-      const GeneratedCommandsMemoryRequirementsInfoNV & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info,
+                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createIndirectCommandsLayoutNV( const IndirectCommandsLayoutCreateInfoNV * pCreateInfo,
-                                                                const AllocationCallbacks *                pAllocator,
-                                                                IndirectCommandsLayoutNV *                 pIndirectCommandsLayout,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createIndirectCommandsLayoutNV( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV * pCreateInfo,
+                                                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                pAllocator,
+                                                                VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV *                 pIndirectCommandsLayout,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<IndirectCommandsLayoutNV>::type
-      createIndirectCommandsLayoutNV( const IndirectCommandsLayoutCreateInfoNV &    createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>::type
+      createIndirectCommandsLayoutNV( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV &    createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<IndirectCommandsLayoutNV, Dispatch>>::type
-      createIndirectCommandsLayoutNVUnique( const IndirectCommandsLayoutCreateInfoNV &    createInfo,
-                                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV, Dispatch>>::type
+      createIndirectCommandsLayoutNVUnique( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV &    createInfo,
+                                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectCommandsLayoutNV( IndirectCommandsLayoutNV    indirectCommandsLayout,
-                                          const AllocationCallbacks * pAllocator,
-                                          Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
+                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectCommandsLayoutNV( IndirectCommandsLayoutNV indirectCommandsLayout VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                          Optional<const AllocationCallbacks> allocator   VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator   VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectCommandsLayoutNV    indirectCommandsLayout,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV    indirectCommandsLayout,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectCommandsLayoutNV                      indirectCommandsLayout,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV                      indirectCommandsLayout,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_private_data ===
 
-    // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createPrivateDataSlotEXT( const PrivateDataSlotCreateInfo * pCreateInfo,
-                                                          const AllocationCallbacks *       pAllocator,
-                                                          PrivateDataSlot *                 pPrivateDataSlot,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createPrivateDataSlotEXT( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo * pCreateInfo,
+                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                          VULKAN_HPP_NAMESPACE::PrivateDataSlot *                 pPrivateDataSlot,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PrivateDataSlot>::type
-      createPrivateDataSlotEXT( const PrivateDataSlotCreateInfo &             createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::type
+      createPrivateDataSlotEXT( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &             createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<PrivateDataSlot, Dispatch>>::type
-      createPrivateDataSlotEXTUnique( const PrivateDataSlotCreateInfo &             createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::PrivateDataSlot, Dispatch>>::type
+      createPrivateDataSlotEXTUnique( const VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo &             createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyPrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPrivateDataSlotEXT( PrivateDataSlot             privateDataSlot,
-                                    const AllocationCallbacks * pAllocator,
-                                    Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot             privateDataSlot,
+                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                    Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPrivateDataSlotEXT( PrivateDataSlot privateDataSlot               VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot               VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setPrivateDataEXT( ObjectType         objectType,
-                                                   uint64_t           objectHandle,
-                                                   PrivateDataSlot    privateDataSlot,
-                                                   uint64_t           data,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                   uint64_t                              objectHandle,
+                                                   VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                   uint64_t                              data,
+                                                   Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setPrivateDataEXT( ObjectType         objectType,
-                         uint64_t           objectHandle,
-                         PrivateDataSlot    privateDataSlot,
-                         uint64_t           data,
-                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                            uint64_t                              objectHandle,
+                                                            VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                            uint64_t                              data,
+                                                            Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getPrivateDataEXT( ObjectType         objectType,
-                            uint64_t           objectHandle,
-                            PrivateDataSlot    privateDataSlot,
-                            uint64_t *         pData,
-                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                            uint64_t                              objectHandle,
+                            VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                            uint64_t *                            pData,
+                            Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD uint64_t getPrivateDataEXT( ObjectType         objectType,
-                                                     uint64_t           objectHandle,
-                                                     PrivateDataSlot    privateDataSlot,
-                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD uint64_t getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                     uint64_t                              objectHandle,
+                                                     VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                     Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_encode_queue ===
 
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
-                                                                     VideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
-                                                                     size_t *                                       pDataSize,
-                                                                     void *                                         pData,
-                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR * pVideoSessionParametersInfo,
+                                           VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR *  pFeedbackInfo,
+                                           size_t *                                                             pDataSize,
+                                           void *                                                               pData,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
+      getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
               typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-      getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-      getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                           Uint8_tAllocator &                             uint8_tAllocator,
-                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
+      getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                           Uint8_tAllocator &                                                   uint8_tAllocator,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X,
+              typename Y,
+              typename... Z,
+              typename Uint8_tAllocator = std::allocator<uint8_t>,
+              typename Dispatch         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
+      getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename X,
               typename Y,
               typename... Z,
               typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
               typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
-      getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
-      getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
-                                           Uint8_tAllocator &                             uint8_tAllocator,
-                                           Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t, Uint8_tAllocator>>>::type
+      getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo,
+                                           Uint8_tAllocator &                                                   uint8_tAllocator,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_NV_cuda_kernel_launch ===
 
-    // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createCudaModuleNV( const CudaModuleCreateInfoNV * pCreateInfo,
-                                                    const AllocationCallbacks *    pAllocator,
-                                                    CudaModuleNV *                 pModule,
-                                                    Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createCudaModuleNV( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV * pCreateInfo,
+                                                    const VULKAN_HPP_NAMESPACE::AllocationCallbacks *    pAllocator,
+                                                    VULKAN_HPP_NAMESPACE::CudaModuleNV *                 pModule,
+                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<CudaModuleNV>::type
-      createCudaModuleNV( const CudaModuleCreateInfoNV &                createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::CudaModuleNV>::type
+      createCudaModuleNV( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV &                createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<CudaModuleNV, Dispatch>>::type
-      createCudaModuleNVUnique( const CudaModuleCreateInfoNV &                createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CudaModuleNV, Dispatch>>::type
+      createCudaModuleNVUnique( const VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV &                createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCudaModuleCacheNV( CudaModuleNV       module,
-                                                      size_t *           pCacheSize,
-                                                      void *             pCacheData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCudaModuleCacheNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module,
+                                                      size_t *                           pCacheSize,
+                                                      void *                             pCacheData,
+                                                      Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
+      getCudaModuleCacheNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
+              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type getCudaModuleCacheNV(
+      VULKAN_HPP_NAMESPACE::CudaModuleNV module, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createCudaFunctionNV( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::CudaFunctionNV *                 pFunction,
                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getCudaModuleCacheNV( CudaModuleNV module, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getCudaModuleCacheNV( CudaModuleNV module, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createCudaFunctionNV( const CudaFunctionCreateInfoNV * pCreateInfo,
-                                                      const AllocationCallbacks *      pAllocator,
-                                                      CudaFunctionNV *                 pFunction,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<CudaFunctionNV>::type
-      createCudaFunctionNV( const CudaFunctionCreateInfoNV &              createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::CudaFunctionNV>::type
+      createCudaFunctionNV( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV &              createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<CudaFunctionNV, Dispatch>>::type
-      createCudaFunctionNVUnique( const CudaFunctionCreateInfoNV &              createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::CudaFunctionNV, Dispatch>>::type
+      createCudaFunctionNVUnique( const VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV &              createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCudaModuleNV( CudaModuleNV                module,
-                              const AllocationCallbacks * pAllocator,
-                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleNV                module,
+                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCudaModuleNV( CudaModuleNV                                  module,
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleNV                                  module,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CudaModuleNV                module,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CudaModuleNV                module,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaModuleNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CudaModuleNV                                  module,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CudaModuleNV                                  module,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCudaFunctionNV( CudaFunctionNV              function,
-                                const AllocationCallbacks * pAllocator,
-                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV              function,
+                                const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyCudaFunctionNV( CudaFunctionNV                                function,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV                                function,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CudaFunctionNV              function,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CudaFunctionNV              function,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyCudaFunctionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( CudaFunctionNV                                function,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::CudaFunctionNV                                function,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
     //=== VK_EXT_metal_objects ===
 
-    // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void exportMetalObjectsEXT( ExportMetalObjectsInfoEXT * pMetalObjectsInfo,
-                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void exportMetalObjectsEXT( VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT * pMetalObjectsInfo,
+                                Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void exportMetalObjectsEXT( ExportMetalObjectsInfoEXT & metalObjectsInfo,
-                                Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT
+                         exportMetalObjectsEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         exportMetalObjectsEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_EXT_descriptor_buffer ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetLayoutSizeEXT( DescriptorSetLayout layout,
-                                        DeviceSize *        pLayoutSizeInBytes,
-                                        Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetLayoutSizeEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize *        pLayoutSizeInBytes,
+                                        Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DeviceSize getDescriptorSetLayoutSizeEXT( DescriptorSetLayout layout,
-                                                                   Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize
+                         getDescriptorSetLayoutSizeEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                                        Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetLayoutBindingOffsetEXT( DescriptorSetLayout layout,
-                                                 uint32_t            binding,
-                                                 DeviceSize *        pOffset,
-                                                 Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetLayoutBindingOffsetEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                                 uint32_t                                  binding,
+                                                 VULKAN_HPP_NAMESPACE::DeviceSize *        pOffset,
+                                                 Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DeviceSize getDescriptorSetLayoutBindingOffsetEXT(
-      DescriptorSetLayout layout, uint32_t binding, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize
+                         getDescriptorSetLayoutBindingOffsetEXT( VULKAN_HPP_NAMESPACE::DescriptorSetLayout layout,
+                                                                 uint32_t                                  binding,
+                                                                 Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorEXT( const DescriptorGetInfoEXT * pDescriptorInfo,
-                           size_t                       dataSize,
-                           void *                       pDescriptor,
-                           Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT * pDescriptorInfo,
+                           size_t                                             dataSize,
+                           void *                                             pDescriptor,
+                           Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo,
-                           size_t                       dataSize,
-                           void *                       pDescriptor,
-                           Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-    template <typename DescriptorType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DescriptorType getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo,
-                                                          Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo,
+                           size_t                                             dataSize,
+                           void *                                             pDescriptor,
+                           Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename DescriptorType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD DescriptorType getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getBufferOpaqueCaptureDescriptorDataEXT(
-      const BufferCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT * pInfo,
+                                               void *                                                           pData,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getBufferOpaqueCaptureDescriptorDataEXT( const BufferCaptureDescriptorDataInfoEXT & info,
-                                               Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT & info,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT * pInfo,
-                                                                        void *                                    pData,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT * pInfo,
+                                                                        void *                                                          pData,
                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT & info,
-                                              Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT & info,
+                                              Dispatch const & d                                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT * pInfo,
-                                                  void *                                        pData,
+      getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT * pInfo,
+                                                  void *                                                              pData,
                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT & info,
-                                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT & info,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSamplerOpaqueCaptureDescriptorDataEXT(
-      const SamplerCaptureDescriptorDataInfoEXT * pInfo, void * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getSamplerOpaqueCaptureDescriptorDataEXT( const SamplerCaptureDescriptorDataInfoEXT & info,
-                                                Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const AccelerationStructureCaptureDescriptorDataInfoEXT * pInfo,
-                                                              void *                                                    pData,
+      getSamplerOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT * pInfo,
+                                                void *                                                            pData,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
+      getSamplerOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT & info,
+                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT * pInfo,
+                                                              void *                                                                          pData,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const AccelerationStructureCaptureDescriptorDataInfoEXT & info,
+      getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT & info,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_device_fault ===
 
-    // wrapper function for command vkGetDeviceFaultInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceFaultInfoEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFaultInfoEXT( DeviceFaultCountsEXT * pFaultCounts,
-                                                 DeviceFaultInfoEXT *   pFaultInfo,
-                                                 Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFaultInfoEXT( VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT * pFaultCounts,
+                                                 VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT *   pFaultInfo,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>>::type
+      getFaultInfoEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_external_memory ===
 
-    // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                                              zx_handle_t *                            pZirconHandle,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                                              zx_handle_t *                                                  pZirconHandle,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
-      getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
-                                    Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
+                                    Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits      handleType,
-                                                                        zx_handle_t                           zirconHandle,
-                                                                        MemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties,
-                                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits      handleType,
+                                              zx_handle_t                                                 zirconHandle,
+                                              VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA * pMemoryZirconHandleProperties,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MemoryZirconHandlePropertiesFUCHSIA>::type getMemoryZirconHandlePropertiesFUCHSIA(
-      ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA>::type
+      getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
+                                              zx_handle_t                                            zirconHandle,
+                                              Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_external_semaphore ===
 
-    // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo,
-                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA * pImportSemaphoreZirconHandleInfo,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo,
-                                          Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo,
+                                          Dispatch const & d                                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
-                                                                 zx_handle_t *                               pZirconHandle,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA * pGetZirconHandleInfo,
+                                                                 zx_handle_t *                                                     pZirconHandle,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
-      getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
-                                       Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo,
+                                       Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_buffer_collection ===
 
-    // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createBufferCollectionFUCHSIA( const BufferCollectionCreateInfoFUCHSIA * pCreateInfo,
-                                                               const AllocationCallbacks *               pAllocator,
-                                                               BufferCollectionFUCHSIA *                 pCollection,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createBufferCollectionFUCHSIA( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA * pCreateInfo,
+                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                                               VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA *                 pCollection,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<BufferCollectionFUCHSIA>::type
-      createBufferCollectionFUCHSIA( const BufferCollectionCreateInfoFUCHSIA &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>::type
+      createBufferCollectionFUCHSIA( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA &     createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<BufferCollectionFUCHSIA, Dispatch>>::type
-      createBufferCollectionFUCHSIAUnique( const BufferCollectionCreateInfoFUCHSIA &     createInfo,
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA, Dispatch>>::type
+      createBufferCollectionFUCHSIAUnique( const VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA &     createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      setBufferCollectionImageConstraintsFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                  const ImageConstraintsInfoFUCHSIA * pImageConstraintsInfo,
-                                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      setBufferCollectionImageConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                  const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA * pImageConstraintsInfo,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setBufferCollectionImageConstraintsFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                  const ImageConstraintsInfoFUCHSIA & imageConstraintsInfo,
-                                                  Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setBufferCollectionImageConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                  const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA & imageConstraintsInfo,
+                                                  Dispatch const & d                                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      setBufferCollectionBufferConstraintsFUCHSIA( BufferCollectionFUCHSIA              collection,
-                                                   const BufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo,
-                                                   Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      setBufferCollectionBufferConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA              collection,
+                                                   const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA * pBufferConstraintsInfo,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      setBufferCollectionBufferConstraintsFUCHSIA( BufferCollectionFUCHSIA              collection,
-                                                   const BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo,
-                                                   Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      setBufferCollectionBufferConstraintsFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA              collection,
+                                                   const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo,
+                                                   Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBufferCollectionFUCHSIA( BufferCollectionFUCHSIA     collection,
-                                         const AllocationCallbacks * pAllocator,
-                                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
+                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                         Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyBufferCollectionFUCHSIA( BufferCollectionFUCHSIA                       collection,
-                                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA                       collection,
+                                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( BufferCollectionFUCHSIA     collection,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA     collection,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyBufferCollectionFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( BufferCollectionFUCHSIA                       collection,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA                       collection,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getBufferCollectionPropertiesFUCHSIA( BufferCollectionFUCHSIA             collection,
-                                                                      BufferCollectionPropertiesFUCHSIA * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getBufferCollectionPropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA             collection,
+                                                                      VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA * pProperties,
                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<BufferCollectionPropertiesFUCHSIA>::type
-      getBufferCollectionPropertiesFUCHSIA( BufferCollectionFUCHSIA collection, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA>::type
+      getBufferCollectionPropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection,
+                                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_FUCHSIA*/
 
     //=== VK_HUAWEI_subpass_shading ===
 
-    // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSubpassShadingMaxWorkgroupSizeHUAWEI(
-      RenderPass renderpass, Extent2D * pMaxWorkgroupSize, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result
+      getSubpassShadingMaxWorkgroupSizeHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderpass,
+                                               VULKAN_HPP_NAMESPACE::Extent2D * pMaxWorkgroupSize,
+                                               Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Extent2D>::type
-      getSubpassShadingMaxWorkgroupSizeHUAWEI( RenderPass renderpass, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Extent2D>::type
+      getSubpassShadingMaxWorkgroupSizeHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderpass, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_external_memory_rdma ===
 
-    // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
-                                                          RemoteAddressNV *                    pAddress,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV * pMemoryGetRemoteAddressInfo,
+                                                          VULKAN_HPP_NAMESPACE::RemoteAddressNV *                    pAddress,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<RemoteAddressNV>::type
-      getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo,
-                                Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::RemoteAddressNV>::type
+      getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo,
+                                Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_pipeline_properties ===
 
-    // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelinePropertiesEXT( const PipelineInfoEXT * pPipelineInfo,
-                                                          BaseOutStructure *      pPipelineProperties,
-                                                          Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT * pPipelineInfo,
+                                                          VULKAN_HPP_NAMESPACE::BaseOutStructure *      pPipelineProperties,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<BaseOutStructure>::type
-      getPipelinePropertiesEXT( const PipelineInfoEXT & pipelineInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::BaseOutStructure>::type
+      getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT & pipelineInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_opacity_micromap ===
 
-    // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createMicromapEXT( const MicromapCreateInfoEXT * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   MicromapEXT *                 pMicromap,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createMicromapEXT( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::MicromapEXT *                 pMicromap,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MicromapEXT>::type
-      createMicromapEXT( const MicromapCreateInfoEXT &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::MicromapEXT>::type
+      createMicromapEXT( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<MicromapEXT, Dispatch>>::type
-      createMicromapEXTUnique( const MicromapCreateInfoEXT &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::MicromapEXT, Dispatch>>::type
+      createMicromapEXTUnique( const VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyMicromapEXT( MicromapEXT                 micromap,
-                             const AllocationCallbacks * pAllocator,
-                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
+                             const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                             Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyMicromapEXT( MicromapEXT micromap                          VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapEXT micromap                          VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( MicromapEXT                 micromap,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                 micromap,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( MicromapEXT                                   micromap,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::MicromapEXT                                   micromap,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result buildMicromapsEXT( DeferredOperationKHR         deferredOperation,
-                                                   uint32_t                     infoCount,
-                                                   const MicromapBuildInfoEXT * pInfos,
-                                                   Dispatch const & d           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR         deferredOperation,
+                                                   uint32_t                                           infoCount,
+                                                   const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT * pInfos,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result buildMicromapsEXT( DeferredOperationKHR                           deferredOperation,
-                                                   ArrayProxy<const MicromapBuildInfoEXT> const & infos,
-                                                   Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                         buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                 deferredOperation,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMicromapEXT( DeferredOperationKHR        deferredOperation,
-                                                 const CopyMicromapInfoEXT * pInfo,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
+                                                 const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT * pInfo,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMicromapEXT( DeferredOperationKHR        deferredOperation,
-                                                 const CopyMicromapInfoEXT & info,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
+                                                                       const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info,
+                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMicromapToMemoryEXT( DeferredOperationKHR                deferredOperation,
-                                                         const CopyMicromapToMemoryInfoEXT * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                         const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT * pInfo,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMicromapToMemoryEXT( DeferredOperationKHR                deferredOperation,
-                                                         const CopyMicromapToMemoryInfoEXT & info,
-                                                         Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                               const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info,
+                                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToMicromapEXT( DeferredOperationKHR                deferredOperation,
-                                                         const CopyMemoryToMicromapInfoEXT * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                         const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT * pInfo,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result copyMemoryToMicromapEXT( DeferredOperationKHR                deferredOperation,
-                                                         const CopyMemoryToMicromapInfoEXT & info,
-                                                         Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                               const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info,
+                                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result writeMicromapsPropertiesEXT( uint32_t            micromapCount,
-                                                             const MicromapEXT * pMicromaps,
-                                                             QueryType           queryType,
-                                                             size_t              dataSize,
-                                                             void *              pData,
-                                                             size_t              stride,
-                                                             Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result writeMicromapsPropertiesEXT( uint32_t                                  micromapCount,
+                                                             const VULKAN_HPP_NAMESPACE::MicromapEXT * pMicromaps,
+                                                             VULKAN_HPP_NAMESPACE::QueryType           queryType,
+                                                             size_t                                    dataSize,
+                                                             void *                                    pData,
+                                                             size_t                                    stride,
+                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-    template <typename DataType,
-              typename DataTypeAllocator                                                                                = std::allocator<DataType>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataTypeAllocator::value_type, DataType>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
+    template <typename DataType, typename DataTypeAllocator = std::allocator<DataType>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType, DataTypeAllocator>>::type
-      writeMicromapsPropertiesEXT( ArrayProxy<const MicromapEXT> const & micromaps,
-                                   QueryType                             queryType,
-                                   size_t                                dataSize,
-                                   size_t                                stride,
-                                   Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type writeMicromapsPropertyEXT(
-      ArrayProxy<const MicromapEXT> const & micromaps, QueryType queryType, size_t stride, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                   VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                   size_t                                                                            dataSize,
+                                   size_t                                                                            stride,
+                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename DataType, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
+      writeMicromapsPropertyEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                 VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                 size_t                                                                            stride,
+                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMicromapCompatibilityEXT( const MicromapVersionInfoEXT *          pVersionInfo,
-                                      AccelerationStructureCompatibilityKHR * pCompatibility,
-                                      Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT *          pVersionInfo,
+                                      VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR * pCompatibility,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD AccelerationStructureCompatibilityKHR getMicromapCompatibilityEXT(
-      const MicromapVersionInfoEXT & versionInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+                         getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT & versionInfo,
+                                                      Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType,
-                                   const MicromapBuildInfoEXT *      pBuildInfo,
-                                   MicromapBuildSizesInfoEXT *       pSizeInfo,
-                                   Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                   const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT *      pBuildInfo,
+                                   VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT *       pSizeInfo,
+                                   Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MicromapBuildSizesInfoEXT
-      getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType,
-                                const MicromapBuildInfoEXT &      buildInfo,
-                                Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT
+                         getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                                   const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT &      buildInfo,
+                                                   Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_pageable_device_local_memory ===
 
-    // wrapper function for command vkSetDeviceMemoryPriorityEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDeviceMemoryPriorityEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setMemoryPriorityEXT( DeviceMemory memory, float priority, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setMemoryPriorityEXT( VULKAN_HPP_NAMESPACE::DeviceMemory memory,
+                               float                              priority,
+                               Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     //=== VK_KHR_maintenance4 ===
 
-    // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements * pInfo,
-                                         MemoryRequirements2 *                  pMemoryRequirements,
-                                         Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements * pInfo,
+                                         VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                  pMemoryRequirements,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirementsKHR(
-      const DeviceBufferMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info,
-                                                         Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements * pInfo,
-                                        MemoryRequirements2 *                 pMemoryRequirements,
-                                        Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                        VULKAN_HPP_NAMESPACE::MemoryRequirements2 *                 pMemoryRequirements,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirementsKHR(
-      const DeviceImageMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info,
-                                                        Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements * pInfo,
-                                              uint32_t *                            pSparseMemoryRequirementCount,
-                                              SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
-                                              Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements * pInfo,
+                                              uint32_t *                                                  pSparseMemoryRequirementCount,
+                                              VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 *      pSparseMemoryRequirements,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-      getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-    template <
-      typename SparseImageMemoryRequirements2Allocator = std::allocator<SparseImageMemoryRequirements2>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, SparseImageMemoryRequirements2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
-                         getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements &     info,
-                                                              SparseImageMemoryRequirements2Allocator & sparseImageMemoryRequirements2Allocator,
-                                                              Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                              Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageMemoryRequirements2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageMemoryRequirements2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2, SparseImageMemoryRequirements2Allocator>
+                         getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info,
+                                                              SparseImageMemoryRequirements2Allocator &                   sparseImageMemoryRequirements2Allocator,
+                                                              Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VALVE_descriptor_set_host_mapping ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetLayoutHostMappingInfoVALVE( const DescriptorSetBindingReferenceVALVE * pBindingReference,
-                                                     DescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetLayoutHostMappingInfoVALVE( const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE * pBindingReference,
+                                                     VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE *  pHostMapping,
                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD DescriptorSetLayoutHostMappingInfoVALVE getDescriptorSetLayoutHostMappingInfoVALVE(
-      const DescriptorSetBindingReferenceVALVE & bindingReference, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE
+                         getDescriptorSetLayoutHostMappingInfoVALVE( const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE & bindingReference,
+                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDescriptorSetHostMappingVALVE( DescriptorSet      descriptorSet,
-                                           void **            ppData,
-                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getDescriptorSetHostMappingVALVE( VULKAN_HPP_NAMESPACE::DescriptorSet descriptorSet,
+                                           void **                             ppData,
+                                           Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD void * getDescriptorSetHostMappingVALVE( DescriptorSet      descriptorSet,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD void * getDescriptorSetHostMappingVALVE( VULKAN_HPP_NAMESPACE::DescriptorSet descriptorSet,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_device_generated_commands_compute ===
 
-    // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo * pCreateInfo,
-                                                  MemoryRequirements2 *             pMemoryRequirements,
-                                                  Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo * pCreateInfo,
+                                                  VULKAN_HPP_NAMESPACE::MemoryRequirements2 *             pMemoryRequirements,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getPipelineIndirectMemoryRequirementsNV(
-      const ComputePipelineCreateInfo & createInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo,
-                                                                  Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                         getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo,
+                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo,
+                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    DeviceAddress getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV * pInfo,
                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    DeviceAddress getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV & info,
-                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_external_memory ===
-
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer * buffer,
-                                                               NativeBufferPropertiesOHOS *   pProperties,
-                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<NativeBufferPropertiesOHOS>::type
-      getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetMemoryNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS * pInfo,
-                                                           struct OH_NativeBuffer **             pBuffer,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<struct OH_NativeBuffer *>::type
-      getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_OHOS*/
-
-    //=== VK_ARM_tensors ===
-
-    // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createTensorARM( const TensorCreateInfoARM * pCreateInfo,
-                                                 const AllocationCallbacks * pAllocator,
-                                                 TensorARM *                 pTensor,
-                                                 Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<TensorARM>::type
-      createTensorARM( const TensorCreateInfoARM &                   createInfo,
-                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<TensorARM, Dispatch>>::type
-      createTensorARMUnique( const TensorCreateInfoARM &                   createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyTensorARM( TensorARM                   tensor,
-                           const AllocationCallbacks * pAllocator,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyTensorARM( TensorARM tensor                              VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( TensorARM                   tensor,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( TensorARM                                     tensor,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createTensorViewARM( const TensorViewCreateInfoARM * pCreateInfo,
-                                                     const AllocationCallbacks *     pAllocator,
-                                                     TensorViewARM *                 pView,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<TensorViewARM>::type
-      createTensorViewARM( const TensorViewCreateInfoARM &               createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<TensorViewARM, Dispatch>>::type
-      createTensorViewARMUnique( const TensorViewCreateInfoARM &               createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyTensorViewARM( TensorViewARM               tensorView,
-                               const AllocationCallbacks * pAllocator,
-                               Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyTensorViewARM( TensorViewARM tensorView                      VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( TensorViewARM               tensorView,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyTensorViewARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( TensorViewARM                                 tensorView,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM * pInfo,
-                                         MemoryRequirements2 *                   pMemoryRequirements,
-                                         Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getTensorMemoryRequirementsARM(
-      const TensorMemoryRequirementsInfoARM & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info,
-                                                         Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindTensorMemoryARM( uint32_t                        bindInfoCount,
-                                                     const BindTensorMemoryInfoARM * pBindInfos,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindTensorMemoryARM( ArrayProxy<const BindTensorMemoryInfoARM> const & bindInfos, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM * pInfo,
-                                         MemoryRequirements2 *                     pMemoryRequirements,
-                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getTensorMemoryRequirementsARM(
-      const DeviceTensorMemoryRequirementsARM & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info,
-                                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getTensorOpaqueCaptureDescriptorDataARM(
-      const TensorCaptureDescriptorDataInfoARM * pInfo, void * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getTensorOpaqueCaptureDescriptorDataARM( const TensorCaptureDescriptorDataInfoARM & info,
-                                               Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM * pInfo,
-                                                   void *                                         pData,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-    template <typename DataType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-      getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM & info,
-                                                   Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::DeviceAddress getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV & info,
+                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_shader_module_identifier ===
 
-    // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getShaderModuleIdentifierEXT( ShaderModule                shaderModule,
-                                       ShaderModuleIdentifierEXT * pIdentifier,
-                                       Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getShaderModuleIdentifierEXT( VULKAN_HPP_NAMESPACE::ShaderModule                shaderModule,
+                                       VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT * pIdentifier,
+                                       Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ShaderModuleIdentifierEXT
-      getShaderModuleIdentifierEXT( ShaderModule shaderModule, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+                         getShaderModuleIdentifierEXT( VULKAN_HPP_NAMESPACE::ShaderModule shaderModule,
+                                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getShaderModuleCreateInfoIdentifierEXT( const ShaderModuleCreateInfo * pCreateInfo,
-                                                 ShaderModuleIdentifierEXT *    pIdentifier,
-                                                 Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo * pCreateInfo,
+                                                 VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT *    pIdentifier,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ShaderModuleIdentifierEXT getShaderModuleCreateInfoIdentifierEXT(
-      const ShaderModuleCreateInfo & createInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+                         getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo & createInfo,
+                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_optical_flow ===
 
-    // wrapper function for command vkCreateOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createOpticalFlowSessionNV( const OpticalFlowSessionCreateInfoNV * pCreateInfo,
-                                                            const AllocationCallbacks *            pAllocator,
-                                                            OpticalFlowSessionNV *                 pSession,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createOpticalFlowSessionNV( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV * pCreateInfo,
+                                                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks *            pAllocator,
+                                                            VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV *                 pSession,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<OpticalFlowSessionNV>::type
-      createOpticalFlowSessionNV( const OpticalFlowSessionCreateInfoNV &        createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>::type
+      createOpticalFlowSessionNV( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV &        createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<OpticalFlowSessionNV, Dispatch>>::type
-      createOpticalFlowSessionNVUnique( const OpticalFlowSessionCreateInfoNV &        createInfo,
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV, Dispatch>>::type
+      createOpticalFlowSessionNVUnique( const VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV &        createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyOpticalFlowSessionNV( OpticalFlowSessionNV        session,
-                                      const AllocationCallbacks * pAllocator,
-                                      Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
+                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                      Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyOpticalFlowSessionNV( OpticalFlowSessionNV                          session,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV                          session,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( OpticalFlowSessionNV        session,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV        session,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyOpticalFlowSessionNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( OpticalFlowSessionNV                          session,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV                          session,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindOpticalFlowSessionImageNV( OpticalFlowSessionNV             session,
-                                                               OpticalFlowSessionBindingPointNV bindingPoint,
-                                                               ImageView                        view,
-                                                               ImageLayout                      layout,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result bindOpticalFlowSessionImageNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                                               VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                                                               VULKAN_HPP_NAMESPACE::ImageView                        view,
+                                                               VULKAN_HPP_NAMESPACE::ImageLayout                      layout,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindOpticalFlowSessionImageNV( OpticalFlowSessionNV             session,
-                                     OpticalFlowSessionBindingPointNV bindingPoint,
-                                     ImageView                        view,
-                                     ImageLayout                      layout,
-                                     Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+         bindOpticalFlowSessionImageNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                        VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                                        VULKAN_HPP_NAMESPACE::ImageView                        view,
+                                        VULKAN_HPP_NAMESPACE::ImageLayout                      layout,
+                                        Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     //=== VK_KHR_maintenance5 ===
 
-    // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getRenderingAreaGranularityKHR( const RenderingAreaInfo * pRenderingAreaInfo,
-                                         Extent2D *                pGranularity,
-                                         Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR * pRenderingAreaInfo,
+                                         VULKAN_HPP_NAMESPACE::Extent2D *                   pGranularity,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Extent2D getRenderingAreaGranularityKHR( const RenderingAreaInfo & renderingAreaInfo,
-                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D
+                         getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR & renderingAreaInfo,
+                                                         Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo * pInfo,
-                                       SubresourceLayout2 *               pLayout,
-                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR * pInfo,
+                                       VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *               pLayout,
+                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayoutKHR(
-      const DeviceImageSubresourceInfo & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info,
-                                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                         getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getImageSubresourceLayout2KHR( Image                     image,
-                                        const ImageSubresource2 * pSubresource,
-                                        SubresourceLayout2 *      pLayout,
-                                        Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getImageSubresourceLayout2KHR( VULKAN_HPP_NAMESPACE::Image                        image,
+                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource,
+                                        VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR *      pLayout,
+                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayout2KHR(
-      Image image, const ImageSubresource2 & subresource, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageSubresourceLayout2KHR(
-      Image image, const ImageSubresource2 & subresource, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_AMD_anti_lag ===
-
-    // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void antiLagUpdateAMD( const AntiLagDataAMD * pData, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void antiLagUpdateAMD( const AntiLagDataAMD & data, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_KHR_present_wait2 ===
-
-    // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitForPresent2KHR( SwapchainKHR                swapchain,
-                                                    const PresentWait2InfoKHR * pPresentWait2Info,
-                                                    Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result waitForPresent2KHR( SwapchainKHR                swapchain,
-                                                    const PresentWait2InfoKHR & presentWait2Info,
-                                                    Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                         getImageSubresourceLayout2KHR( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource,
+                                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getImageSubresourceLayout2KHR( VULKAN_HPP_NAMESPACE::Image                        image,
+                                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource,
+                                                        Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_shader_object ===
 
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createShadersEXT( uint32_t                    createInfoCount,
-                                                  const ShaderCreateInfoEXT * pCreateInfos,
-                                                  const AllocationCallbacks * pAllocator,
-                                                  ShaderEXT *                 pShaders,
-                                                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createShadersEXT( uint32_t                                          createInfoCount,
+                                                  const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT * pCreateInfos,
+                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                                  VULKAN_HPP_NAMESPACE::ShaderEXT *                 pShaders,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename ShaderEXTAllocator                                                                                 = std::allocator<ShaderEXT>,
-              typename Dispatch                                                                                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, ShaderEXT>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                              = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>>
-                         createShadersEXT( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename ShaderEXTAllocator                                                                                 = std::allocator<ShaderEXT>,
-              typename Dispatch                                                                                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, ShaderEXT>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                              = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<ShaderEXT, ShaderEXTAllocator>>
-                         createShadersEXT( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                                           Optional<const AllocationCallbacks>           allocator,
-                                           ShaderEXTAllocator &                          shaderEXTAllocator,
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<ShaderEXT> createShaderEXT( const ShaderCreateInfoEXT &                   createInfo,
-                                                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename ShaderEXTAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ShaderEXT>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>
+                         createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename ShaderEXTAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ShaderEXT>,
+              typename Dispatch           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, VULKAN_HPP_NAMESPACE::ShaderEXT>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT, ShaderEXTAllocator>>
+                         createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                                           ShaderEXTAllocator &                                                                      shaderEXTAllocator,
+                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<VULKAN_HPP_NAMESPACE::ShaderEXT>
+                         createShaderEXT( const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT &                   createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
     template <typename Dispatch           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename ShaderEXTAllocator = std::allocator<UniqueHandle<ShaderEXT, Dispatch>>,
-              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<ShaderEXT, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>>
-                         createShadersEXTUnique( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename Dispatch           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename ShaderEXTAllocator = std::allocator<UniqueHandle<ShaderEXT, Dispatch>>,
-              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<ShaderEXT, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<ShaderEXT, Dispatch>, ShaderEXTAllocator>>
-                         createShadersEXTUnique( ArrayProxy<const ShaderCreateInfoEXT> const & createInfos,
-                                                 Optional<const AllocationCallbacks>           allocator,
-                                                 ShaderEXTAllocator &                          shaderEXTAllocator,
-                                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<ShaderEXT, Dispatch>>
-                         createShaderEXTUnique( const ShaderCreateInfoEXT &                   createInfo,
-                                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename ShaderEXTAllocator = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>
+                         createShadersEXTUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename ShaderEXTAllocator        = std::allocator<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>,
+              typename std::enable_if<std::is_same<typename ShaderEXTAllocator::value_type, UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>::value,
+                                      int>::type = 0>
+    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>, ShaderEXTAllocator>>
+                         createShadersEXTUnique( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                 allocator,
+                                                 ShaderEXTAllocator &                                                                      shaderEXTAllocator,
+                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<VULKAN_HPP_NAMESPACE::ShaderEXT, Dispatch>>
+                         createShaderEXTUnique( const VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT &                   createInfo,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyShaderEXT( ShaderEXT                   shader,
-                           const AllocationCallbacks * pAllocator,
-                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyShaderEXT( VULKAN_HPP_NAMESPACE::ShaderEXT                   shader,
+                           const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                           Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyShaderEXT( ShaderEXT shader                              VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyShaderEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader                              VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ShaderEXT                   shader,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ShaderEXT                   shader,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ShaderEXT                                     shader,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::ShaderEXT                                     shader,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getShaderBinaryDataEXT( ShaderEXT          shader,
-                                                        size_t *           pDataSize,
-                                                        void *             pData,
-                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getShaderBinaryDataEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader,
+                                                        size_t *                        pDataSize,
+                                                        void *                          pData,
+                                                        Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
+    template <typename Uint8_tAllocator = std::allocator<uint8_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getShaderBinaryDataEXT( ShaderEXT shader, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
+      getShaderBinaryDataEXT( VULKAN_HPP_NAMESPACE::ShaderEXT shader, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
               typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type
-      getShaderBinaryDataEXT( ShaderEXT shader, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_KHR_pipeline_binary ===
-
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR * pCreateInfo,
-                                                           const AllocationCallbacks *         pAllocator,
-                                                           PipelineBinaryHandlesInfoKHR *      pBinaries,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    template <typename PipelineBinaryKHRAllocator = std::allocator<PipelineBinaryKHR>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, PipelineBinaryKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>
-                         createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR &           createInfo,
-                                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    template <typename PipelineBinaryKHRAllocator = std::allocator<PipelineBinaryKHR>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, PipelineBinaryKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<PipelineBinaryKHR, PipelineBinaryKHRAllocator>>
-                         createPipelineBinariesKHR( const PipelineBinaryCreateInfoKHR & createInfo,
-                                                    Optional<const AllocationCallbacks> allocator,
-                                                    PipelineBinaryKHRAllocator &        pipelineBinaryKHRAllocator,
-                                                    Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    template <
-      typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename PipelineBinaryKHRAllocator = std::allocator<UniqueHandle<PipelineBinaryKHR, Dispatch>>,
-      typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, UniqueHandle<PipelineBinaryKHR, Dispatch>>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>
-                         createPipelineBinariesKHRUnique( const PipelineBinaryCreateInfoKHR &           createInfo,
-                                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    template <
-      typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename PipelineBinaryKHRAllocator = std::allocator<UniqueHandle<PipelineBinaryKHR, Dispatch>>,
-      typename std::enable_if<std::is_same<typename PipelineBinaryKHRAllocator::value_type, UniqueHandle<PipelineBinaryKHR, Dispatch>>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<PipelineBinaryKHR, Dispatch>, PipelineBinaryKHRAllocator>>
-                         createPipelineBinariesKHRUnique( const PipelineBinaryCreateInfoKHR & createInfo,
-                                                          Optional<const AllocationCallbacks> allocator,
-                                                          PipelineBinaryKHRAllocator &        pipelineBinaryKHRAllocator,
-                                                          Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineBinaryKHR( PipelineBinaryKHR           pipelineBinary,
-                                   const AllocationCallbacks * pAllocator,
-                                   Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyPipelineBinaryKHR( PipelineBinaryKHR pipelineBinary              VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineBinaryKHR           pipelineBinary,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPipelineBinaryKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( PipelineBinaryKHR                             pipelineBinary,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelineKeyKHR( const PipelineCreateInfoKHR * pPipelineCreateInfo,
-                                                   PipelineBinaryKeyKHR *        pPipelineKey,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<PipelineBinaryKeyKHR>::type
-      getPipelineKeyKHR( Optional<const PipelineCreateInfoKHR> pipelineCreateInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR * pInfo,
-                                                          PipelineBinaryKeyKHR *            pPipelineBinaryKey,
-                                                          size_t *                          pPipelineBinaryDataSize,
-                                                          void *                            pPipelineBinaryData,
-                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type
-      getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-    template <typename Uint8_tAllocator                                                                               = std::allocator<uint8_t>,
-              typename Dispatch                                                                                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t, Uint8_tAllocator>>>::type getPipelineBinaryDataKHR(
-      const PipelineBinaryDataInfoKHR & info, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releaseCapturedPipelineDataKHR( const ReleaseCapturedPipelineDataInfoKHR * pInfo,
-                                                                const AllocationCallbacks *                pAllocator,
-                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releaseCapturedPipelineDataKHR( const ReleaseCapturedPipelineDataInfoKHR &    info,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename Uint8_tAllocator::value_type, uint8_t>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t, Uint8_tAllocator>>::type getShaderBinaryDataEXT(
+      VULKAN_HPP_NAMESPACE::ShaderEXT shader, Uint8_tAllocator & uint8_tAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_QCOM_tile_properties ===
 
-    // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFramebufferTilePropertiesQCOM( Framebuffer          framebuffer,
-                                                                  uint32_t *           pPropertiesCount,
-                                                                  TilePropertiesQCOM * pProperties,
-                                                                  Dispatch const & d   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-    template <typename TilePropertiesQCOMAllocator = std::allocator<TilePropertiesQCOM>,
-              typename Dispatch                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, TilePropertiesQCOM>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
-      getFramebufferTilePropertiesQCOM( Framebuffer framebuffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-    template <typename TilePropertiesQCOMAllocator = std::allocator<TilePropertiesQCOM>,
-              typename Dispatch                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, TilePropertiesQCOM>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type getFramebufferTilePropertiesQCOM(
-      Framebuffer framebuffer, TilePropertiesQCOMAllocator & tilePropertiesQCOMAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDynamicRenderingTilePropertiesQCOM( const RenderingInfo * pRenderingInfo,
-                                                                       TilePropertiesQCOM *  pProperties,
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<TilePropertiesQCOM>::type
-      getDynamicRenderingTilePropertiesQCOM( const RenderingInfo & renderingInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_KHR_swapchain_maintenance1 ===
-
-    // wrapper function for command vkReleaseSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR * pReleaseInfo,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleaseSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR & releaseInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_cooperative_vector ===
-
-    // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV * pInfo,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer          framebuffer,
+                                                                  uint32_t *                                 pPropertiesCount,
+                                                                  VULKAN_HPP_NAMESPACE::TilePropertiesQCOM * pProperties,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV & info,
-                                                                  Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename TilePropertiesQCOMAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>,
+              typename Dispatch                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
+      getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename TilePropertiesQCOMAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>,
+      typename Dispatch                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename TilePropertiesQCOMAllocator::value_type, VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM, TilePropertiesQCOMAllocator>>::type
+      getFramebufferTilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer,
+                                        TilePropertiesQCOMAllocator &     tilePropertiesQCOMAllocator,
+                                        Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo * pRenderingInfo,
+                                                  VULKAN_HPP_NAMESPACE::TilePropertiesQCOM *  pProperties,
+                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::TilePropertiesQCOM
+                         getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo,
+                                                                Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_low_latency2 ===
 
-    // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result setLatencySleepModeNV( SwapchainKHR                   swapchain,
-                                                       const LatencySleepModeInfoNV * pSleepModeInfo,
-                                                       Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result setLatencySleepModeNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                       const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV * pSleepModeInfo,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type setLatencySleepModeNV(
-      SwapchainKHR swapchain, const LatencySleepModeInfoNV & sleepModeInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type setLatencySleepModeNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                                                                const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV & sleepModeInfo,
+                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result latencySleepNV( SwapchainKHR               swapchain,
-                                                const LatencySleepInfoNV * pSleepInfo,
-                                                Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result latencySleepNV( VULKAN_HPP_NAMESPACE::SwapchainKHR               swapchain,
+                           const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV * pSleepInfo,
+                           Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      latencySleepNV( SwapchainKHR swapchain, const LatencySleepInfoNV & sleepInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void latencySleepNV( VULKAN_HPP_NAMESPACE::SwapchainKHR               swapchain,
+                         const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV & sleepInfo,
+                         Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLatencyMarkerNV( SwapchainKHR                   swapchain,
-                             const SetLatencyMarkerInfoNV * pLatencyMarkerInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLatencyMarkerNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                             const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV * pLatencyMarkerInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void setLatencyMarkerNV( SwapchainKHR                   swapchain,
-                             const SetLatencyMarkerInfoNV & latencyMarkerInfo,
-                             Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void setLatencyMarkerNV( VULKAN_HPP_NAMESPACE::SwapchainKHR                   swapchain,
+                             const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV & latencyMarkerInfo,
+                             Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getLatencyTimingsNV( SwapchainKHR             swapchain,
-                              GetLatencyMarkerInfoNV * pLatencyMarkerInfo,
-                              Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getLatencyTimingsNV( VULKAN_HPP_NAMESPACE::SwapchainKHR             swapchain,
+                              VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV * pLatencyMarkerInfo,
+                              Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-    template <
-      typename LatencyTimingsFrameReportNVAllocator = std::allocator<LatencyTimingsFrameReportNV>,
-      typename Dispatch                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename LatencyTimingsFrameReportNVAllocator::value_type, LatencyTimingsFrameReportNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                  = true>
-    VULKAN_HPP_NODISCARD std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator>
-                         getLatencyTimingsNV( SwapchainKHR swapchain, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-    template <
-      typename LatencyTimingsFrameReportNVAllocator = std::allocator<LatencyTimingsFrameReportNV>,
-      typename Dispatch                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename LatencyTimingsFrameReportNVAllocator::value_type, LatencyTimingsFrameReportNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                  = true>
-    VULKAN_HPP_NODISCARD std::vector<LatencyTimingsFrameReportNV, LatencyTimingsFrameReportNVAllocator>
-                         getLatencyTimingsNV( SwapchainKHR                           swapchain,
-                                              LatencyTimingsFrameReportNVAllocator & latencyTimingsFrameReportNVAllocator,
-                                              Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV
+                         getLatencyTimingsNV( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain,
+                                              Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    //=== VK_ARM_data_graph ===
-
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDataGraphPipelinesARM( DeferredOperationKHR                   deferredOperation,
-                                                             PipelineCache                          pipelineCache,
-                                                             uint32_t                               createInfoCount,
-                                                             const DataGraphPipelineCreateInfoARM * pCreateInfos,
-                                                             const AllocationCallbacks *            pAllocator,
-                                                             Pipeline *                             pPipelines,
-                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createDataGraphPipelinesARM( DeferredOperationKHR                                     deferredOperation,
-                                                      PipelineCache                                            pipelineCache,
-                                                      ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                                      Optional<const AllocationCallbacks> allocator            VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                      Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename PipelineAllocator                                                                                = std::allocator<Pipeline>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, Pipeline>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<Pipeline, PipelineAllocator>>
-                         createDataGraphPipelinesARM( DeferredOperationKHR                                     deferredOperation,
-                                                      PipelineCache                                            pipelineCache,
-                                                      ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                                      Optional<const AllocationCallbacks>                      allocator,
-                                                      PipelineAllocator &                                      pipelineAllocator,
-                                                      Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<Pipeline>
-                         createDataGraphPipelineARM( DeferredOperationKHR                          deferredOperation,
-                                                     PipelineCache                                 pipelineCache,
-                                                     const DataGraphPipelineCreateInfoARM &        createInfo,
-                                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createDataGraphPipelinesARMUnique( DeferredOperationKHR                                     deferredOperation,
-                                                            PipelineCache                                            pipelineCache,
-                                                            ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                                            Optional<const AllocationCallbacks> allocator            VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename Dispatch          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename PipelineAllocator = std::allocator<UniqueHandle<Pipeline, Dispatch>>,
-              typename std::enable_if<std::is_same<typename PipelineAllocator::value_type, UniqueHandle<Pipeline, Dispatch>>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD ResultValue<std::vector<UniqueHandle<Pipeline, Dispatch>, PipelineAllocator>>
-                         createDataGraphPipelinesARMUnique( DeferredOperationKHR                                     deferredOperation,
-                                                            PipelineCache                                            pipelineCache,
-                                                            ArrayProxy<const DataGraphPipelineCreateInfoARM> const & createInfos,
-                                                            Optional<const AllocationCallbacks>                      allocator,
-                                                            PipelineAllocator &                                      pipelineAllocator,
-                                                            Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ResultValue<UniqueHandle<Pipeline, Dispatch>>
-                         createDataGraphPipelineARMUnique( DeferredOperationKHR                          deferredOperation,
-                                                           PipelineCache                                 pipelineCache,
-                                                           const DataGraphPipelineCreateInfoARM &        createInfo,
-                                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDataGraphPipelineSessionARM( const DataGraphPipelineSessionCreateInfoARM * pCreateInfo,
-                                                                   const AllocationCallbacks *                   pAllocator,
-                                                                   DataGraphPipelineSessionARM *                 pSession,
-                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DataGraphPipelineSessionARM>::type
-      createDataGraphPipelineSessionARM( const DataGraphPipelineSessionCreateInfoARM & createInfo,
-                                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DataGraphPipelineSessionARM, Dispatch>>::type
-      createDataGraphPipelineSessionARMUnique( const DataGraphPipelineSessionCreateInfoARM & createInfo,
-                                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM * pInfo,
-                                                           uint32_t *                                                   pBindPointRequirementCount,
-                                                           DataGraphPipelineSessionBindPointRequirementARM *            pBindPointRequirements,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-    template <typename DataGraphPipelineSessionBindPointRequirementARMAllocator              = std::allocator<DataGraphPipelineSessionBindPointRequirementARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataGraphPipelineSessionBindPointRequirementARMAllocator::value_type,
-                                                   DataGraphPipelineSessionBindPointRequirementARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator>>::type
-      getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM & info,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-    template <typename DataGraphPipelineSessionBindPointRequirementARMAllocator              = std::allocator<DataGraphPipelineSessionBindPointRequirementARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DataGraphPipelineSessionBindPointRequirementARMAllocator::value_type,
-                                                   DataGraphPipelineSessionBindPointRequirementARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM, DataGraphPipelineSessionBindPointRequirementARMAllocator>>::type
-      getDataGraphPipelineSessionBindPointRequirementsARM(
-        const DataGraphPipelineSessionBindPointRequirementsInfoARM & info,
-        DataGraphPipelineSessionBindPointRequirementARMAllocator &   dataGraphPipelineSessionBindPointRequirementARMAllocator,
-        Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM * pInfo,
-                                                           MemoryRequirements2 *                                     pMemoryRequirements,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getDataGraphPipelineSessionMemoryRequirementsARM(
-      const DataGraphPipelineSessionMemoryRequirementsInfoARM & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info,
-                                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result bindDataGraphPipelineSessionMemoryARM( uint32_t                                          bindInfoCount,
-                                                                       const BindDataGraphPipelineSessionMemoryInfoARM * pBindInfos,
-                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      bindDataGraphPipelineSessionMemoryARM( ArrayProxy<const BindDataGraphPipelineSessionMemoryInfoARM> const & bindInfos,
-                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDataGraphPipelineSessionARM( DataGraphPipelineSessionARM session,
-                                             const AllocationCallbacks * pAllocator,
-                                             Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDataGraphPipelineSessionARM( DataGraphPipelineSessionARM                   session,
-                                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DataGraphPipelineSessionARM session,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDataGraphPipelineSessionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DataGraphPipelineSessionARM                   session,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM * pPipelineInfo,
-                                                  uint32_t *                       pPropertiesCount,
-                                                  DataGraphPipelinePropertyARM *   pProperties,
-                                                  Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-    template <
-      typename DataGraphPipelinePropertyARMAllocator = std::allocator<DataGraphPipelinePropertyARM>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename DataGraphPipelinePropertyARMAllocator::value_type, DataGraphPipelinePropertyARM>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator>>::type
-      getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM & pipelineInfo,
-                                                  Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-    template <
-      typename DataGraphPipelinePropertyARMAllocator = std::allocator<DataGraphPipelinePropertyARM>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename DataGraphPipelinePropertyARMAllocator::value_type, DataGraphPipelinePropertyARM>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataGraphPipelinePropertyARM, DataGraphPipelinePropertyARMAllocator>>::type
-      getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM &        pipelineInfo,
-                                                  DataGraphPipelinePropertyARMAllocator & dataGraphPipelinePropertyARMAllocator,
-                                                  Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetDataGraphPipelinePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelinePropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDataGraphPipelinePropertiesARM( const DataGraphPipelineInfoARM *          pPipelineInfo,
-                                                                   uint32_t                                  propertiesCount,
-                                                                   DataGraphPipelinePropertyQueryResultARM * pProperties,
-                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     //=== VK_QNX_external_memory_screen_buffer ===
 
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getScreenBufferPropertiesQNX( const struct _screen_buffer * buffer,
-                                                              ScreenBufferPropertiesQNX *   pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getScreenBufferPropertiesQNX( const struct _screen_buffer *                     buffer,
+                                                              VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX * pProperties,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ScreenBufferPropertiesQNX>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX>::type
       getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
       getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
     //=== VK_KHR_calibrated_timestamps ===
 
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCalibratedTimestampsKHR( uint32_t                           timestampCount,
-                                                            const CalibratedTimestampInfoKHR * pTimestampInfos,
-                                                            uint64_t *                         pTimestamps,
-                                                            uint64_t *                         pMaxDeviation,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCalibratedTimestampsKHR( uint32_t                                                 timestampCount,
+                                                            const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR * pTimestampInfos,
+                                                            uint64_t *                                               pTimestamps,
+                                                            uint64_t *                                               pMaxDeviation,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
+    template <typename Uint64_tAllocator = std::allocator<uint64_t>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
+      getCalibratedTimestampsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename Uint64_tAllocator                                                                                = std::allocator<uint64_t>,
               typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
+              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-      getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-    template <typename Uint64_tAllocator                                                                                = std::allocator<uint64_t>,
-              typename Dispatch                                                                                         = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Uint64_tAllocator::value_type, uint64_t>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t, Uint64_tAllocator>, uint64_t>>::type
-      getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos,
-                                  Uint64_tAllocator &                                  uint64_tAllocator,
-                                  Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+      getCalibratedTimestampsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos,
+                                  Uint64_tAllocator &                                                                              uint64_tAllocator,
+                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-      getCalibratedTimestampKHR( const CalibratedTimestampInfoKHR & timestampInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getCalibratedTimestampKHR( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo,
+                                 Dispatch const & d                                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    //=== VK_NV_external_compute_queue ===
-
-    // wrapper function for command vkCreateExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createExternalComputeQueueNV( const ExternalComputeQueueCreateInfoNV * pCreateInfo,
-                                                              const AllocationCallbacks *              pAllocator,
-                                                              ExternalComputeQueueNV *                 pExternalQueue,
-                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ExternalComputeQueueNV>::type
-      createExternalComputeQueueNV( const ExternalComputeQueueCreateInfoNV &      createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<ExternalComputeQueueNV, Dispatch>>::type
-      createExternalComputeQueueNVUnique( const ExternalComputeQueueCreateInfoNV &      createInfo,
-                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyExternalComputeQueueNV( ExternalComputeQueueNV      externalQueue,
-                                        const AllocationCallbacks * pAllocator,
-                                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyExternalComputeQueueNV( ExternalComputeQueueNV                        externalQueue,
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ExternalComputeQueueNV      externalQueue,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyExternalComputeQueueNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( ExternalComputeQueueNV                        externalQueue,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_cluster_acceleration_structure ===
-
-    // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getClusterAccelerationStructureBuildSizesNV( const ClusterAccelerationStructureInputInfoNV * pInfo,
-                                                      AccelerationStructureBuildSizesInfoKHR *        pSizeInfo,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR getClusterAccelerationStructureBuildSizesNV(
-      const ClusterAccelerationStructureInputInfoNV & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_partitioned_acceleration_structure ===
-
-    // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getPartitionedAccelerationStructuresBuildSizesNV( const PartitionedAccelerationStructureInstancesInputNV * pInfo,
-                                                           AccelerationStructureBuildSizesInfoKHR *                 pSizeInfo,
-                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR getPartitionedAccelerationStructuresBuildSizesNV(
-      const PartitionedAccelerationStructureInstancesInputNV & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_EXT_device_generated_commands ===
-
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT * pInfo,
-                                                    MemoryRequirements2 *                              pMemoryRequirements,
-                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MemoryRequirements2 getGeneratedCommandsMemoryRequirementsEXT(
-      const GeneratedCommandsMemoryRequirementsInfoEXT & info, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info,
-                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createIndirectCommandsLayoutEXT( const IndirectCommandsLayoutCreateInfoEXT * pCreateInfo,
-                                                                 const AllocationCallbacks *                 pAllocator,
-                                                                 IndirectCommandsLayoutEXT *                 pIndirectCommandsLayout,
-                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<IndirectCommandsLayoutEXT>::type
-      createIndirectCommandsLayoutEXT( const IndirectCommandsLayoutCreateInfoEXT &   createInfo,
-                                       Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                       Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<IndirectCommandsLayoutEXT, Dispatch>>::type
-      createIndirectCommandsLayoutEXTUnique( const IndirectCommandsLayoutCreateInfoEXT &   createInfo,
-                                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT   indirectCommandsLayout,
-                                           const AllocationCallbacks * pAllocator,
-                                           Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT indirectCommandsLayout VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                           Optional<const AllocationCallbacks> allocator    VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectCommandsLayoutEXT   indirectCommandsLayout,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectCommandsLayoutEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectCommandsLayoutEXT                     indirectCommandsLayout,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createIndirectExecutionSetEXT( const IndirectExecutionSetCreateInfoEXT * pCreateInfo,
-                                                               const AllocationCallbacks *               pAllocator,
-                                                               IndirectExecutionSetEXT *                 pIndirectExecutionSet,
-                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<IndirectExecutionSetEXT>::type
-      createIndirectExecutionSetEXT( const IndirectExecutionSetCreateInfoEXT &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<IndirectExecutionSetEXT, Dispatch>>::type
-      createIndirectExecutionSetEXTUnique( const IndirectExecutionSetCreateInfoEXT &     createInfo,
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectExecutionSetEXT( IndirectExecutionSetEXT     indirectExecutionSet,
-                                         const AllocationCallbacks * pAllocator,
-                                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyIndirectExecutionSetEXT( IndirectExecutionSetEXT indirectExecutionSet  VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectExecutionSetEXT     indirectExecutionSet,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyIndirectExecutionSetEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( IndirectExecutionSetEXT                       indirectExecutionSet,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateIndirectExecutionSetPipelineEXT( IndirectExecutionSetEXT                      indirectExecutionSet,
-                                                uint32_t                                     executionSetWriteCount,
-                                                const WriteIndirectExecutionSetPipelineEXT * pExecutionSetWrites,
-                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateIndirectExecutionSetPipelineEXT( IndirectExecutionSetEXT                                        indirectExecutionSet,
-                                                ArrayProxy<const WriteIndirectExecutionSetPipelineEXT> const & executionSetWrites,
-                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateIndirectExecutionSetShaderEXT( IndirectExecutionSetEXT                    indirectExecutionSet,
-                                              uint32_t                                   executionSetWriteCount,
-                                              const WriteIndirectExecutionSetShaderEXT * pExecutionSetWrites,
-                                              Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void updateIndirectExecutionSetShaderEXT( IndirectExecutionSetEXT                                      indirectExecutionSet,
-                                              ArrayProxy<const WriteIndirectExecutionSetShaderEXT> const & executionSetWrites,
-                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_native_buffer ===
-
-    // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSwapchainGrallocUsageOHOS( Format             format,
-                                                              ImageUsageFlags    imageUsage,
-                                                              uint64_t *         grallocUsage,
-                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type
-      getSwapchainGrallocUsageOHOS( Format format, ImageUsageFlags imageUsage, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-#  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireImageOHOS( Image              image,
-                                                  int32_t            nativeFenceFd,
-                                                  Semaphore          semaphore,
-                                                  Fence              fence,
-                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  else
-    // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireImageOHOS( Image               image,
-                        int32_t             nativeFenceFd,
-                        Semaphore semaphore VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                        Fence fence         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                        Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-    //=== VK_EXT_external_memory_metal ===
-
-    // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT * pGetMetalHandleInfo,
-                                                         void **                             pHandle,
-                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT & getMetalHandleInfo,
-                                                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getMemoryMetalHandlePropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                   const void *                     pHandle,
-                                                                   MemoryMetalHandlePropertiesEXT * pMemoryMetalHandleProperties,
-                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-    template <typename HandleType,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<MemoryMetalHandlePropertiesEXT>::type getMemoryMetalHandlePropertiesEXT(
-      ExternalMemoryHandleTypeFlagBits handleType, HandleType const & handle, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif   /*VK_USE_PLATFORM_METAL_EXT*/
-
     operator VkDevice() const VULKAN_HPP_NOEXCEPT
     {
       return m_device;
@@ -18740,59 +14339,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDevice>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDevice>
   {
-    using Type = Device;
+    using Type = VULKAN_HPP_NAMESPACE::Device;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDevice>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDevice>
   {
-    using Type = Device;
+    using Type = VULKAN_HPP_NAMESPACE::Device;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDevice, VK_NULL_HANDLE>
   {
-    using Type = Device;
+    using Type = VULKAN_HPP_NAMESPACE::Device;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Device>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Device>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeKHR.html
   class DisplayModeKHR
   {
   public:
     using CType      = VkDisplayModeKHR;
     using NativeType = VkDisplayModeKHR;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDisplayModeKHR;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDisplayModeKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDisplayModeKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayModeKHR;
 
   public:
-    DisplayModeKHR() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    DisplayModeKHR( DisplayModeKHR const & rhs )             = default;
-    DisplayModeKHR & operator=( DisplayModeKHR const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    DisplayModeKHR( DisplayModeKHR && rhs )             = default;
-    DisplayModeKHR & operator=( DisplayModeKHR && rhs ) = default;
-#else
-    DisplayModeKHR( DisplayModeKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_displayModeKHR( exchange( rhs.m_displayModeKHR, {} ) ) {}
-
-    DisplayModeKHR & operator=( DisplayModeKHR && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_displayModeKHR = exchange( rhs.m_displayModeKHR, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR DisplayModeKHR() = default;
 
     VULKAN_HPP_CONSTEXPR DisplayModeKHR( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -18812,6 +14395,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DisplayModeKHR const & ) const = default;
+#else
+    bool operator==( DisplayModeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayModeKHR == rhs.m_displayModeKHR;
+    }
+
+    bool operator!=( DisplayModeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayModeKHR != rhs.m_displayModeKHR;
+    }
+
+    bool operator<( DisplayModeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_displayModeKHR < rhs.m_displayModeKHR;
+    }
+#endif
+
     VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDisplayModeKHR() const VULKAN_HPP_NOEXCEPT
     {
       return m_displayModeKHR;
@@ -18832,59 +14434,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eDisplayModeKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eDisplayModeKHR>
   {
-    using Type = DisplayModeKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayModeKHR;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eDisplayModeKHR>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayModeKHR>
   {
-    using Type = DisplayModeKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayModeKHR;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkDisplayModeKHR, VK_NULL_HANDLE>
   {
-    using Type = DisplayModeKHR;
+    using Type = VULKAN_HPP_NAMESPACE::DisplayModeKHR;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<DisplayModeKHR>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::DisplayModeKHR>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkPhysicalDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevice.html
   class PhysicalDevice
   {
   public:
     using CType      = VkPhysicalDevice;
     using NativeType = VkPhysicalDevice;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePhysicalDevice;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePhysicalDevice;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePhysicalDevice;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePhysicalDevice;
 
   public:
-    PhysicalDevice() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    PhysicalDevice( PhysicalDevice const & rhs )             = default;
-    PhysicalDevice & operator=( PhysicalDevice const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    PhysicalDevice( PhysicalDevice && rhs )             = default;
-    PhysicalDevice & operator=( PhysicalDevice && rhs ) = default;
-#else
-    PhysicalDevice( PhysicalDevice && rhs ) VULKAN_HPP_NOEXCEPT : m_physicalDevice( exchange( rhs.m_physicalDevice, {} ) ) {}
-
-    PhysicalDevice & operator=( PhysicalDevice && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_physicalDevice = exchange( rhs.m_physicalDevice, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR PhysicalDevice() = default;
 
     VULKAN_HPP_CONSTEXPR PhysicalDevice( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -18902,1171 +14488,849 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PhysicalDevice const & ) const = default;
+#else
+    bool operator==( PhysicalDevice const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_physicalDevice == rhs.m_physicalDevice;
+    }
+
+    bool operator!=( PhysicalDevice const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_physicalDevice != rhs.m_physicalDevice;
+    }
+
+    bool operator<( PhysicalDevice const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_physicalDevice < rhs.m_physicalDevice;
+    }
+#endif
+
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFeatures( PhysicalDeviceFeatures * pFeatures, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFeatures( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pFeatures,
+                      Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceFeatures getFeatures( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures
+                         getFeatures( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFormatProperties( Format             format,
-                              FormatProperties * pFormatProperties,
-                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFormatProperties( VULKAN_HPP_NAMESPACE::Format             format,
+                              VULKAN_HPP_NAMESPACE::FormatProperties * pFormatProperties,
+                              Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD FormatProperties getFormatProperties( Format             format,
-                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties
+      getFormatProperties( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageFormatProperties( Format                  format,
-                                                          ImageType               type,
-                                                          ImageTiling             tiling,
-                                                          ImageUsageFlags         usage,
-                                                          ImageCreateFlags        flags,
-                                                          ImageFormatProperties * pImageFormatProperties,
-                                                          Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                  format,
+                                                          VULKAN_HPP_NAMESPACE::ImageType               type,
+                                                          VULKAN_HPP_NAMESPACE::ImageTiling             tiling,
+                                                          VULKAN_HPP_NAMESPACE::ImageUsageFlags         usage,
+                                                          VULKAN_HPP_NAMESPACE::ImageCreateFlags        flags,
+                                                          VULKAN_HPP_NAMESPACE::ImageFormatProperties * pImageFormatProperties,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties>::type
-      getImageFormatProperties( Format                 format,
-                                ImageType              type,
-                                ImageTiling            tiling,
-                                ImageUsageFlags        usage,
-                                ImageCreateFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties>::type
+      getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                 format,
+                                VULKAN_HPP_NAMESPACE::ImageType              type,
+                                VULKAN_HPP_NAMESPACE::ImageTiling            tiling,
+                                VULKAN_HPP_NAMESPACE::ImageUsageFlags        usage,
+                                VULKAN_HPP_NAMESPACE::ImageCreateFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getProperties( PhysicalDeviceProperties * pProperties, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties * pProperties,
+                        Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceProperties getProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties
+                         getProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueueFamilyProperties( uint32_t *              pQueueFamilyPropertyCount,
-                                   QueueFamilyProperties * pQueueFamilyProperties,
-                                   Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueueFamilyProperties( uint32_t *                                    pQueueFamilyPropertyCount,
+                                   VULKAN_HPP_NAMESPACE::QueueFamilyProperties * pQueueFamilyProperties,
+                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-    template <typename QueueFamilyPropertiesAllocator = std::allocator<QueueFamilyProperties>,
-              typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, QueueFamilyProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator>
+    template <typename QueueFamilyPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties>,
+              typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator>
                          getQueueFamilyProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-    template <typename QueueFamilyPropertiesAllocator = std::allocator<QueueFamilyProperties>,
+    template <typename QueueFamilyPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties>,
               typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, QueueFamilyProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties, QueueFamilyPropertiesAllocator>
+              typename std::enable_if<std::is_same<typename QueueFamilyPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties>::value,
+                                      int>::type      = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties, QueueFamilyPropertiesAllocator>
                          getQueueFamilyProperties( QueueFamilyPropertiesAllocator & queueFamilyPropertiesAllocator,
                                                    Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMemoryProperties( PhysicalDeviceMemoryProperties * pMemoryProperties,
-                              Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMemoryProperties( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties * pMemoryProperties,
+                              Dispatch const & d                                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties
-      getMemoryProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties
+                         getMemoryProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDevice( const DeviceCreateInfo *    pCreateInfo,
-                                              const AllocationCallbacks * pAllocator,
-                                              Device *                    pDevice,
-                                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDevice( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo *    pCreateInfo,
+                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                              VULKAN_HPP_NAMESPACE::Device *                    pDevice,
+                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Device>::type
-      createDevice( const DeviceCreateInfo &                      createInfo,
-                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Device>::type
+      createDevice( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo &                      createInfo,
+                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Device, Dispatch>>::type
-      createDeviceUnique( const DeviceCreateInfo &                      createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Device, Dispatch>>::type
+      createDeviceUnique( const VULKAN_HPP_NAMESPACE::DeviceCreateInfo &                      createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result enumerateDeviceExtensionProperties( const char *          pLayerName,
-                                                                    uint32_t *            pPropertyCount,
-                                                                    ExtensionProperties * pProperties,
-                                                                    Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result enumerateDeviceExtensionProperties( const char *                                pLayerName,
+                                                                    uint32_t *                                  pPropertyCount,
+                                                                    VULKAN_HPP_NAMESPACE::ExtensionProperties * pProperties,
+                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-    template <typename ExtensionPropertiesAllocator = std::allocator<ExtensionProperties>,
-              typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                  = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
-      enumerateDeviceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+    template <typename ExtensionPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ExtensionProperties>,
+              typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
+      enumerateDeviceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                           Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-    template <typename ExtensionPropertiesAllocator = std::allocator<ExtensionProperties>,
-              typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                  = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+    template <
+      typename ExtensionPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ExtensionProperties>,
+      typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::ExtensionProperties>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
       enumerateDeviceExtensionProperties( Optional<const std::string>    layerName,
                                           ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkEnumerateDeviceLayerProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result enumerateDeviceLayerProperties( uint32_t *         pPropertyCount,
-                                                                LayerProperties *  pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result enumerateDeviceLayerProperties( uint32_t *                              pPropertyCount,
+                                                                VULKAN_HPP_NAMESPACE::LayerProperties * pProperties,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumerateDeviceLayerProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-    template <typename LayerPropertiesAllocator = std::allocator<LayerProperties>,
-              typename Dispatch                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+    template <typename LayerPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::LayerProperties>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
       enumerateDeviceLayerProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumerateDeviceLayerProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-    template <typename LayerPropertiesAllocator = std::allocator<LayerProperties>,
+    template <typename LayerPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::LayerProperties>,
               typename Dispatch                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                          = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+              typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::LayerProperties>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
       enumerateDeviceLayerProperties( LayerPropertiesAllocator & layerPropertiesAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getSparseImageFormatProperties( Format                        format,
-                                         ImageType                     type,
-                                         SampleCountFlagBits           samples,
-                                         ImageUsageFlags               usage,
-                                         ImageTiling                   tiling,
-                                         uint32_t *                    pPropertyCount,
-                                         SparseImageFormatProperties * pProperties,
-                                         Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                        format,
+                                         VULKAN_HPP_NAMESPACE::ImageType                     type,
+                                         VULKAN_HPP_NAMESPACE::SampleCountFlagBits           samples,
+                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags               usage,
+                                         VULKAN_HPP_NAMESPACE::ImageTiling                   tiling,
+                                         uint32_t *                                          pPropertyCount,
+                                         VULKAN_HPP_NAMESPACE::SparseImageFormatProperties * pProperties,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
+    template <typename SparseImageFormatPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>,
+              typename Dispatch                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
+                         getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                         VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                         VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                         VULKAN_HPP_NAMESPACE::ImageTiling         tiling,
+                                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <
-      typename SparseImageFormatPropertiesAllocator = std::allocator<SparseImageFormatProperties>,
+      typename SparseImageFormatPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>,
       typename Dispatch                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, SparseImageFormatProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                  = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
-                         getSparseImageFormatProperties( Format              format,
-                                                         ImageType           type,
-                                                         SampleCountFlagBits samples,
-                                                         ImageUsageFlags     usage,
-                                                         ImageTiling         tiling,
-                                                         Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-    template <
-      typename SparseImageFormatPropertiesAllocator = std::allocator<SparseImageFormatProperties>,
-      typename Dispatch                             = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, SparseImageFormatProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                  = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
-                         getSparseImageFormatProperties( Format                                 format,
-                                                         ImageType                              type,
-                                                         SampleCountFlagBits                    samples,
-                                                         ImageUsageFlags                        usage,
-                                                         ImageTiling                            tiling,
-                                                         SparseImageFormatPropertiesAllocator & sparseImageFormatPropertiesAllocator,
-                                                         Dispatch const & d                     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      typename std::enable_if<std::is_same<typename SparseImageFormatPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>::value,
+                              int>::type            = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties, SparseImageFormatPropertiesAllocator>
+                         getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                         VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                         VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                         VULKAN_HPP_NAMESPACE::ImageTiling         tiling,
+                                                         SparseImageFormatPropertiesAllocator &    sparseImageFormatPropertiesAllocator,
+                                                         Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_1 ===
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFeatures2( PhysicalDeviceFeatures2 * pFeatures, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFeatures2( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 * pFeatures,
+                       Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceFeatures2 getFeatures2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFeatures2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2
+                         getFeatures2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getFeatures2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getProperties2( PhysicalDeviceProperties2 * pProperties, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
+                         Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceProperties2 getProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2
+                         getProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFormatProperties2( Format              format,
-                               FormatProperties2 * pFormatProperties,
-                               Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFormatProperties2( VULKAN_HPP_NAMESPACE::Format              format,
+                               VULKAN_HPP_NAMESPACE::FormatProperties2 * pFormatProperties,
+                               Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD FormatProperties2 getFormatProperties2( Format             format,
-                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getFormatProperties2( Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties2
+      getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                           ImageFormatProperties2 *               pImageFormatProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                                           VULKAN_HPP_NAMESPACE::ImageFormatProperties2 *               pImageFormatProperties,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties2>::type
-      getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>::type
+      getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo,
+                                 Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+      getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo,
+                                 Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueueFamilyProperties2( uint32_t *               pQueueFamilyPropertyCount,
-                                    QueueFamilyProperties2 * pQueueFamilyProperties,
-                                    Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueueFamilyProperties2( uint32_t *                                     pQueueFamilyPropertyCount,
+                                    VULKAN_HPP_NAMESPACE::QueueFamilyProperties2 * pQueueFamilyProperties,
+                                    Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-    template <typename QueueFamilyProperties2Allocator = std::allocator<QueueFamilyProperties2>,
-              typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                        = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+    template <typename QueueFamilyProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>,
+              typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
                          getQueueFamilyProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-    template <typename QueueFamilyProperties2Allocator = std::allocator<QueueFamilyProperties2>,
+    template <typename QueueFamilyProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>,
               typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                        = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>::value,
+                                      int>::type       = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
                          getQueueFamilyProperties2( QueueFamilyProperties2Allocator & queueFamilyProperties2Allocator,
                                                     Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
     template <typename StructureChain,
               typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
+              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD std::vector<StructureChain, StructureChainAllocator>
                          getQueueFamilyProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
     template <typename StructureChain,
               typename StructureChainAllocator = std::allocator<StructureChain>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
+              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD std::vector<StructureChain, StructureChainAllocator>
       getQueueFamilyProperties2( StructureChainAllocator & structureChainAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMemoryProperties2( PhysicalDeviceMemoryProperties2 * pMemoryProperties,
-                               Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMemoryProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
+                               Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties2
-      getMemoryProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                         getMemoryProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
                          getMemoryProperties2( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                          uint32_t *                                   pPropertyCount,
-                                          SparseImageFormatProperties2 *               pProperties,
-                                          Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                          uint32_t *                                                         pPropertyCount,
+                                          VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2 *               pProperties,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-    template <
-      typename SparseImageFormatProperties2Allocator = std::allocator<SparseImageFormatProperties2>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                         getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                          Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-    template <
-      typename SparseImageFormatProperties2Allocator = std::allocator<SparseImageFormatProperties2>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                         getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                          SparseImageFormatProperties2Allocator &      sparseImageFormatProperties2Allocator,
-                                                          Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageFormatProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+                         getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                          Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageFormatProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageFormatProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+                         getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                          SparseImageFormatProperties2Allocator &                            sparseImageFormatProperties2Allocator,
+                                                          Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalBufferProperties( const PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                      ExternalBufferProperties *               pExternalBufferProperties,
-                                      Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                      VULKAN_HPP_NAMESPACE::ExternalBufferProperties *               pExternalBufferProperties,
+                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalBufferProperties getExternalBufferProperties(
-      const PhysicalDeviceExternalBufferInfo & externalBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+                         getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalFenceProperties( const PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                     ExternalFenceProperties *               pExternalFenceProperties,
-                                     Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                     VULKAN_HPP_NAMESPACE::ExternalFenceProperties *               pExternalFenceProperties,
+                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalFenceProperties getExternalFenceProperties(
-      const PhysicalDeviceExternalFenceInfo & externalFenceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+                         getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalSemaphoreProperties( const PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                         ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
-                                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                         VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalSemaphoreProperties
-      getExternalSemaphoreProperties( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
-                                      Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+                         getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_3 ===
 
-    // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getToolProperties( uint32_t *                     pToolCount,
-                                                   PhysicalDeviceToolProperties * pToolProperties,
-                                                   Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getToolProperties( uint32_t *                                           pToolCount,
+                                                   VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties * pToolProperties,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-    template <
-      typename PhysicalDeviceToolPropertiesAllocator = std::allocator<PhysicalDeviceToolProperties>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    template <typename PhysicalDeviceToolPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
       getToolProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-    template <
-      typename PhysicalDeviceToolPropertiesAllocator = std::allocator<PhysicalDeviceToolProperties>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    template <typename PhysicalDeviceToolPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
       getToolProperties( PhysicalDeviceToolPropertiesAllocator & physicalDeviceToolPropertiesAllocator,
                          Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceSupportKHR( uint32_t           queueFamilyIndex,
-                                                      SurfaceKHR         surface,
-                                                      Bool32 *           pSupported,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceSupportKHR( uint32_t                         queueFamilyIndex,
+                                                      VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                                      VULKAN_HPP_NAMESPACE::Bool32 *   pSupported,
+                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<Bool32>::type
-      getSurfaceSupportKHR( uint32_t queueFamilyIndex, SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Bool32>::type getSurfaceSupportKHR(
+      uint32_t queueFamilyIndex, VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceCapabilitiesKHR( SurfaceKHR               surface,
-                                                           SurfaceCapabilitiesKHR * pSurfaceCapabilities,
-                                                           Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilitiesKHR>::type
-      getSurfaceCapabilitiesKHR( SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceFormatsKHR( SurfaceKHR         surface,
-                                                      uint32_t *         pSurfaceFormatCount,
-                                                      SurfaceFormatKHR * pSurfaceFormats,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-    template <typename SurfaceFormatKHRAllocator = std::allocator<SurfaceFormatKHR>,
-              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, SurfaceFormatKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
-      getSurfaceFormatsKHR( SurfaceKHR surface VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ), Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-    template <typename SurfaceFormatKHRAllocator = std::allocator<SurfaceFormatKHR>,
-              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, SurfaceFormatKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type getSurfaceFormatsKHR(
-      SurfaceKHR surface, SurfaceFormatKHRAllocator & surfaceFormatKHRAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfacePresentModesKHR( SurfaceKHR         surface,
-                                                           uint32_t *         pPresentModeCount,
-                                                           PresentModeKHR *   pPresentModes,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR               surface,
+                                                           VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR * pSurfaceCapabilities,
                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-    template <typename PresentModeKHRAllocator = std::allocator<PresentModeKHR>,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR>::type
+      getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR         surface,
+                                                      uint32_t *                               pSurfaceFormatCount,
+                                                      VULKAN_HPP_NAMESPACE::SurfaceFormatKHR * pSurfaceFormats,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename SurfaceFormatKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>,
+              typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
+      getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                            Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename SurfaceFormatKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>,
+      typename Dispatch                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename SurfaceFormatKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR, SurfaceFormatKHRAllocator>>::type
+      getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                            SurfaceFormatKHRAllocator &      surfaceFormatKHRAllocator,
+                            Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
+
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR       surface,
+                                                           uint32_t *                             pPresentModeCount,
+                                                           VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes,
+                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    template <typename PresentModeKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PresentModeKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+      getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                 Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PresentModeKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PresentModeKHR>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-      getSurfacePresentModesKHR( SurfaceKHR surface VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ), Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-    template <typename PresentModeKHRAllocator = std::allocator<PresentModeKHR>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type getSurfacePresentModesKHR(
-      SurfaceKHR surface, PresentModeKHRAllocator & presentModeKHRAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PresentModeKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+      getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                 PresentModeKHRAllocator &        presentModeKHRAllocator,
+                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_swapchain ===
 
-    // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getPresentRectanglesKHR( SurfaceKHR         surface,
-                                                         uint32_t *         pRectCount,
-                                                         Rect2D *           pRects,
-                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface,
+                                                         uint32_t *                       pRectCount,
+                                                         VULKAN_HPP_NAMESPACE::Rect2D *   pRects,
+                                                         Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-    template <typename Rect2DAllocator                                                                              = std::allocator<Rect2D>,
-              typename Dispatch                                                                                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, Rect2D>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Rect2D, Rect2DAllocator>>::type
-      getPresentRectanglesKHR( SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-    template <typename Rect2DAllocator                                                                              = std::allocator<Rect2D>,
-              typename Dispatch                                                                                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, Rect2D>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Rect2D, Rect2DAllocator>>::type
-      getPresentRectanglesKHR( SurfaceKHR surface, Rect2DAllocator & rect2DAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Rect2DAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Rect2D>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator>>::type
+      getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Rect2DAllocator = std::allocator<VULKAN_HPP_NAMESPACE::Rect2D>,
+              typename Dispatch        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename Rect2DAllocator::value_type, VULKAN_HPP_NAMESPACE::Rect2D>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Rect2D, Rect2DAllocator>>::type getPresentRectanglesKHR(
+      VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Rect2DAllocator & rect2DAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_display ===
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPropertiesKHR( uint32_t *             pPropertyCount,
-                                                         DisplayPropertiesKHR * pProperties,
-                                                         Dispatch const & d     VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPropertiesKHR( uint32_t *                                   pPropertyCount,
+                                                         VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR * pProperties,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-    template <typename DisplayPropertiesKHRAllocator = std::allocator<DisplayPropertiesKHR>,
-              typename Dispatch                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, DisplayPropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
+    template <typename DisplayPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR>,
+              typename Dispatch                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
       getDisplayPropertiesKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-    template <typename DisplayPropertiesKHRAllocator = std::allocator<DisplayPropertiesKHR>,
+    template <typename DisplayPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR>,
               typename Dispatch                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, DisplayPropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
+              typename std::enable_if<std::is_same<typename DisplayPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR>::value,
+                                      int>::type     = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR, DisplayPropertiesKHRAllocator>>::type
       getDisplayPropertiesKHR( DisplayPropertiesKHRAllocator & displayPropertiesKHRAllocator,
                                Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPlanePropertiesKHR( uint32_t *                  pPropertyCount,
-                                                              DisplayPlanePropertiesKHR * pProperties,
-                                                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPlanePropertiesKHR( uint32_t *                                        pPropertyCount,
+                                                              VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR * pProperties,
+                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-    template <typename DisplayPlanePropertiesKHRAllocator = std::allocator<DisplayPlanePropertiesKHR>,
-              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, DisplayPlanePropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
+    template <typename DisplayPlanePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR>,
+              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
       getDisplayPlanePropertiesKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-    template <typename DisplayPlanePropertiesKHRAllocator = std::allocator<DisplayPlanePropertiesKHR>,
-              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, DisplayPlanePropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
+    template <
+      typename DisplayPlanePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR>,
+      typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename DisplayPlanePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR>::value,
+                              int>::type          = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR, DisplayPlanePropertiesKHRAllocator>>::type
       getDisplayPlanePropertiesKHR( DisplayPlanePropertiesKHRAllocator & displayPlanePropertiesKHRAllocator,
                                     Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPlaneSupportedDisplaysKHR( uint32_t           planeIndex,
-                                                                     uint32_t *         pDisplayCount,
-                                                                     DisplayKHR *       pDisplays,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPlaneSupportedDisplaysKHR( uint32_t                           planeIndex,
+                                                                     uint32_t *                         pDisplayCount,
+                                                                     VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplays,
                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-    template <typename DisplayKHRAllocator = std::allocator<DisplayKHR>,
-              typename Dispatch            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, DisplayKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayKHR, DisplayKHRAllocator>>::type
+    template <typename DisplayKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator>>::type
       getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-    template <typename DisplayKHRAllocator = std::allocator<DisplayKHR>,
+    template <typename DisplayKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayKHR>,
               typename Dispatch            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, DisplayKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayKHR, DisplayKHRAllocator>>::type getDisplayPlaneSupportedDisplaysKHR(
+              typename std::enable_if<std::is_same<typename DisplayKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR, DisplayKHRAllocator>>::type getDisplayPlaneSupportedDisplaysKHR(
       uint32_t planeIndex, DisplayKHRAllocator & displayKHRAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDisplayModePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayModePropertiesKHR( DisplayKHR                 display,
-                                                             uint32_t *                 pPropertyCount,
-                                                             DisplayModePropertiesKHR * pProperties,
-                                                             Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                 display,
+                                                             uint32_t *                                       pPropertyCount,
+                                                             VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR * pProperties,
+                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDisplayModePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-    template <typename DisplayModePropertiesKHRAllocator = std::allocator<DisplayModePropertiesKHR>,
-              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, DisplayModePropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
-      getDisplayModePropertiesKHR( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDisplayModePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-    template <typename DisplayModePropertiesKHRAllocator = std::allocator<DisplayModePropertiesKHR>,
-              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, DisplayModePropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
-      getDisplayModePropertiesKHR( DisplayKHR                          display,
+    template <typename DisplayModePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR>,
+              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
+      getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename DisplayModePropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR>,
+      typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename DisplayModePropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR>::value,
+                              int>::type         = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR, DisplayModePropertiesKHRAllocator>>::type
+      getDisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR    display,
                                    DisplayModePropertiesKHRAllocator & displayModePropertiesKHRAllocator,
                                    Dispatch const & d                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDisplayModeKHR( DisplayKHR                       display,
-                                                      const DisplayModeCreateInfoKHR * pCreateInfo,
-                                                      const AllocationCallbacks *      pAllocator,
-                                                      DisplayModeKHR *                 pMode,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                       display,
+                                                      const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::DisplayModeKHR *                 pMode,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayModeKHR>::type
-      createDisplayModeKHR( DisplayKHR                                    display,
-                            const DisplayModeCreateInfoKHR &              createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayModeKHR>::type
+      createDisplayModeKHR( VULKAN_HPP_NAMESPACE::DisplayKHR                                    display,
+                            const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR &              createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DisplayModeKHR, Dispatch>>::type
-      createDisplayModeKHRUnique( DisplayKHR                                    display,
-                                  const DisplayModeCreateInfoKHR &              createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayModeKHR, Dispatch>>::type
+      createDisplayModeKHRUnique( VULKAN_HPP_NAMESPACE::DisplayKHR                                    display,
+                                  const VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR &              createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilitiesKHR( DisplayModeKHR                mode,
-                                                                uint32_t                      planeIndex,
-                                                                DisplayPlaneCapabilitiesKHR * pCapabilities,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR                mode,
+                                                                uint32_t                                            planeIndex,
+                                                                VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR * pCapabilities,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayPlaneCapabilitiesKHR>::type
-      getDisplayPlaneCapabilitiesKHR( DisplayModeKHR mode, uint32_t planeIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR>::type getDisplayPlaneCapabilitiesKHR(
+      VULKAN_HPP_NAMESPACE::DisplayModeKHR mode, uint32_t planeIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
     //=== VK_KHR_xlib_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getXlibPresentationSupportKHR( uint32_t           queueFamilyIndex,
                                           Display *          dpy,
                                           VisualID           visualID,
                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    Bool32 getXlibPresentationSupportKHR( uint32_t           queueFamilyIndex,
-                                          Display &          dpy,
-                                          VisualID           visualID,
-                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::Bool32 getXlibPresentationSupportKHR( uint32_t           queueFamilyIndex,
+                                                                Display &          dpy,
+                                                                VisualID           visualID,
+                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XCB_KHR )
     //=== VK_KHR_xcb_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
                                          xcb_connection_t * connection,
                                          xcb_visualid_t     visual_id,
                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    Bool32 getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
-                                         xcb_connection_t & connection,
-                                         xcb_visualid_t     visual_id,
-                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::Bool32 getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
+                                                               xcb_connection_t & connection,
+                                                               xcb_visualid_t     visual_id,
+                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
     //=== VK_KHR_wayland_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
                                              struct wl_display * display,
                                              Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    Bool32 getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
-                                             struct wl_display & display,
-                                             Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::Bool32 getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
+                                                                   struct wl_display & display,
+                                                                   Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_win32_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceWin32PresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWin32PresentationSupportKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getWin32PresentationSupportKHR( uint32_t queueFamilyIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_video_queue ===
 
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getVideoCapabilitiesKHR( const VideoProfileInfoKHR * pVideoProfile,
-                                                         VideoCapabilitiesKHR *      pCapabilities,
-                                                         Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile,
+                                                         VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR *      pCapabilities,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<VideoCapabilitiesKHR>::type
-      getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR>::type
+      getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile,
+                               Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+      getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile,
+                               Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
-                                                             uint32_t *                               pVideoFormatPropertyCount,
-                                                             VideoFormatPropertiesKHR *               pVideoFormatProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR * pVideoFormatInfo,
+                                                             uint32_t *                                                     pVideoFormatPropertyCount,
+                                                             VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR *               pVideoFormatProperties,
                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename VideoFormatPropertiesKHRAllocator = std::allocator<VideoFormatPropertiesKHR>,
-              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VideoFormatPropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
-      getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                   Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename VideoFormatPropertiesKHRAllocator = std::allocator<VideoFormatPropertiesKHR>,
-              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VideoFormatPropertiesKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                            = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
-      getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                   VideoFormatPropertiesKHRAllocator &      videoFormatPropertiesKHRAllocator,
-                                   Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename StructureChain,
-              typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-      getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                   Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename StructureChain,
-              typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-      getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
-                                   StructureChainAllocator &                structureChainAllocator,
-                                   Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename VideoFormatPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>,
+              typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
+      getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
+                                   Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename VideoFormatPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>,
+      typename Dispatch                          = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename VideoFormatPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>::value,
+                              int>::type         = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR, VideoFormatPropertiesKHRAllocator>>::type
+      getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo,
+                                   VideoFormatPropertiesKHRAllocator &                            videoFormatPropertiesKHRAllocator,
+                                   Dispatch const & d                                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_external_memory_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getExternalImageFormatPropertiesNV( Format                            format,
-                                                                    ImageType                         type,
-                                                                    ImageTiling                       tiling,
-                                                                    ImageUsageFlags                   usage,
-                                                                    ImageCreateFlags                  flags,
-                                                                    ExternalMemoryHandleTypeFlagsNV   externalHandleType,
-                                                                    ExternalImageFormatPropertiesNV * pExternalImageFormatProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format                            format,
+                                                                    VULKAN_HPP_NAMESPACE::ImageType                         type,
+                                                                    VULKAN_HPP_NAMESPACE::ImageTiling                       tiling,
+                                                                    VULKAN_HPP_NAMESPACE::ImageUsageFlags                   usage,
+                                                                    VULKAN_HPP_NAMESPACE::ImageCreateFlags                  flags,
+                                                                    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV   externalHandleType,
+                                                                    VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV * pExternalImageFormatProperties,
                                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ExternalImageFormatPropertiesNV>::type
-      getExternalImageFormatPropertiesNV( Format                                             format,
-                                          ImageType                                          type,
-                                          ImageTiling                                        tiling,
-                                          ImageUsageFlags                                    usage,
-                                          ImageCreateFlags flags                             VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                          ExternalMemoryHandleTypeFlagsNV externalHandleType VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                          Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV>::type
+      getExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format                                             format,
+                                          VULKAN_HPP_NAMESPACE::ImageType                                          type,
+                                          VULKAN_HPP_NAMESPACE::ImageTiling                                        tiling,
+                                          VULKAN_HPP_NAMESPACE::ImageUsageFlags                                    usage,
+                                          VULKAN_HPP_NAMESPACE::ImageCreateFlags flags                             VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                          VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV externalHandleType VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_get_physical_device_properties2 ===
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFeatures2KHR( PhysicalDeviceFeatures2 * pFeatures, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFeatures2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 * pFeatures,
+                          Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceFeatures2 getFeatures2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFeatures2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2
+                         getFeatures2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getFeatures2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getProperties2KHR( PhysicalDeviceProperties2 * pProperties, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 * pProperties,
+                            Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceProperties2 getProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2
+                         getProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                         getProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getFormatProperties2KHR( Format              format,
-                                  FormatProperties2 * pFormatProperties,
-                                  Dispatch const & d  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format              format,
+                                  VULKAN_HPP_NAMESPACE::FormatProperties2 * pFormatProperties,
+                                  Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD FormatProperties2 getFormatProperties2KHR( Format             format,
-                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                         getFormatProperties2KHR( Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties2
+      getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                              ImageFormatProperties2 *               pImageFormatProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
+                                                              VULKAN_HPP_NAMESPACE::ImageFormatProperties2 *               pImageFormatProperties,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties2>::type
-      getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>::type
+      getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo,
+                                    Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+      getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo,
+                                    Dispatch const & d                                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueueFamilyProperties2KHR( uint32_t *               pQueueFamilyPropertyCount,
-                                       QueueFamilyProperties2 * pQueueFamilyProperties,
-                                       Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueueFamilyProperties2KHR( uint32_t *                                     pQueueFamilyPropertyCount,
+                                       VULKAN_HPP_NAMESPACE::QueueFamilyProperties2 * pQueueFamilyProperties,
+                                       Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-    template <typename QueueFamilyProperties2Allocator = std::allocator<QueueFamilyProperties2>,
-              typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                        = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+    template <typename QueueFamilyProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>,
+              typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
                          getQueueFamilyProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-    template <typename QueueFamilyProperties2Allocator = std::allocator<QueueFamilyProperties2>,
+    template <typename QueueFamilyProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>,
               typename Dispatch                        = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, QueueFamilyProperties2>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                        = true>
-    VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2, QueueFamilyProperties2Allocator>
+              typename std::enable_if<std::is_same<typename QueueFamilyProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>::value,
+                                      int>::type       = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2, QueueFamilyProperties2Allocator>
                          getQueueFamilyProperties2KHR( QueueFamilyProperties2Allocator & queueFamilyProperties2Allocator,
                                                        Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
     template <typename StructureChain,
               typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
+              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD std::vector<StructureChain, StructureChainAllocator>
                          getQueueFamilyProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
     template <typename StructureChain,
               typename StructureChainAllocator = std::allocator<StructureChain>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
+              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD std::vector<StructureChain, StructureChainAllocator>
       getQueueFamilyProperties2KHR( StructureChainAllocator & structureChainAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMemoryProperties2KHR( PhysicalDeviceMemoryProperties2 * pMemoryProperties,
-                                  Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMemoryProperties2KHR( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 * pMemoryProperties,
+                                  Dispatch const & d                                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties2
-      getMemoryProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                         getMemoryProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
                          getMemoryProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
-                                             uint32_t *                                   pPropertyCount,
-                                             SparseImageFormatProperties2 *               pProperties,
-                                             Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 * pFormatInfo,
+                                             uint32_t *                                                         pPropertyCount,
+                                             VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2 *               pProperties,
+                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-    template <
-      typename SparseImageFormatProperties2Allocator = std::allocator<SparseImageFormatProperties2>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                         getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                             Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-    template <
-      typename SparseImageFormatProperties2Allocator = std::allocator<SparseImageFormatProperties2>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename SparseImageFormatProperties2Allocator::value_type, SparseImageFormatProperties2>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
-                         getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
-                                                             SparseImageFormatProperties2Allocator &      sparseImageFormatProperties2Allocator,
-                                                             Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageFormatProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+                         getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                             Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename SparseImageFormatProperties2Allocator = std::allocator<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename SparseImageFormatProperties2Allocator::value_type, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2, SparseImageFormatProperties2Allocator>
+                         getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo,
+                                                             SparseImageFormatProperties2Allocator &                            sparseImageFormatProperties2Allocator,
+                                                             Dispatch const & d                                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_external_memory_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalBufferPropertiesKHR( const PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
-                                         ExternalBufferProperties *               pExternalBufferProperties,
-                                         Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalBufferPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo * pExternalBufferInfo,
+                                         VULKAN_HPP_NAMESPACE::ExternalBufferProperties *               pExternalBufferProperties,
+                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalBufferProperties getExternalBufferPropertiesKHR(
-      const PhysicalDeviceExternalBufferInfo & externalBufferInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+                         getExternalBufferPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo,
+                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_external_semaphore_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalSemaphorePropertiesKHR( const PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
-                                            ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
-                                            Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalSemaphorePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo * pExternalSemaphoreInfo,
+                                            VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties *               pExternalSemaphoreProperties,
+                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalSemaphoreProperties
-      getExternalSemaphorePropertiesKHR( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
-                                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+                         getExternalSemaphorePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo,
+                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_direct_mode_display ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result releaseDisplayEXT( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    Result releaseDisplayEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      releaseDisplayEXT( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void releaseDisplayEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
     //=== VK_EXT_acquire_xlib_display ===
 
-    // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireXlibDisplayEXT( Display *          dpy,
-                                                       DisplayKHR         display,
-                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireXlibDisplayEXT( Display *                        dpy,
+                                                       VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                       Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireXlibDisplayEXT( Display & dpy, DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getRandROutputDisplayEXT( Display *          dpy,
-                                                          RROutput           rrOutput,
-                                                          DisplayKHR *       pDisplay,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getRandROutputDisplayEXT( Display *                          dpy,
+                                                          RROutput                           rrOutput,
+                                                          VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplay,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
       getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
       getRandROutputDisplayEXTUnique( Display & dpy, RROutput rrOutput, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -20074,443 +15338,313 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_display_surface_counter ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceCapabilities2EXT( SurfaceKHR                surface,
-                                                            SurfaceCapabilities2EXT * pSurfaceCapabilities,
-                                                            Dispatch const & d        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR                surface,
+                                                            VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT * pSurfaceCapabilities,
+                                                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilities2EXT>::type
-      getSurfaceCapabilities2EXT( SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT>::type
+      getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_external_fence_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalFencePropertiesKHR( const PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
-                                        ExternalFenceProperties *               pExternalFenceProperties,
-                                        Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo * pExternalFenceInfo,
+                                        VULKAN_HPP_NAMESPACE::ExternalFenceProperties *               pExternalFenceProperties,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalFenceProperties getExternalFencePropertiesKHR(
-      const PhysicalDeviceExternalFenceInfo & externalFenceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+                         getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_performance_query ===
 
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                           queueFamilyIndex,
-                                                       uint32_t *                         pCounterCount,
-                                                       PerformanceCounterKHR *            pCounters,
-                                                       PerformanceCounterDescriptionKHR * pCounterDescriptions,
-                                                       Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                                                 queueFamilyIndex,
+                                                       uint32_t *                                               pCounterCount,
+                                                       VULKAN_HPP_NAMESPACE::PerformanceCounterKHR *            pCounters,
+                                                       VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR * pCounterDescriptions,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-    template <typename PerformanceCounterKHRAllocator                                        = std::allocator<PerformanceCounterKHR>,
-              typename PerformanceCounterDescriptionKHRAllocator                             = std::allocator<PerformanceCounterDescriptionKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PerformanceCounterKHRAllocator::value_type, PerformanceCounterKHR>::value &&
-                                        std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, PerformanceCounterDescriptionKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-                                                            std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
+    template <typename PerformanceCounterKHRAllocator            = std::allocator<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>,
+              typename PerformanceCounterDescriptionKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>,
+              typename Dispatch                                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+                                         std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
       enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t queueFamilyIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-    template <typename PerformanceCounterKHRAllocator                                        = std::allocator<PerformanceCounterKHR>,
-              typename PerformanceCounterDescriptionKHRAllocator                             = std::allocator<PerformanceCounterDescriptionKHR>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PerformanceCounterKHRAllocator::value_type, PerformanceCounterKHR>::value &&
-                                        std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, PerformanceCounterDescriptionKHR>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
-                                                            std::vector<PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
+    template <typename PerformanceCounterKHRAllocator            = std::allocator<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>,
+              typename PerformanceCounterDescriptionKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>,
+              typename Dispatch                                  = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PerformanceCounterKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>::value &&
+                  std::is_same<typename PerformanceCounterDescriptionKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR, PerformanceCounterKHRAllocator>,
+                                         std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR, PerformanceCounterDescriptionKHRAllocator>>>::type
       enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t                                    queueFamilyIndex,
                                                        PerformanceCounterKHRAllocator &            performanceCounterKHRAllocator,
                                                        PerformanceCounterDescriptionKHRAllocator & performanceCounterDescriptionKHRAllocator,
                                                        Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueueFamilyPerformanceQueryPassesKHR( const QueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
-                                                  uint32_t *                                pNumPasses,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getQueueFamilyPerformanceQueryPassesKHR( const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR * pPerformanceQueryCreateInfo,
+                                                  uint32_t *                                                      pNumPasses,
                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD uint32_t
-      getQueueFamilyPerformanceQueryPassesKHR( const QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo,
-                                               Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+      getQueueFamilyPerformanceQueryPassesKHR( const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_get_surface_capabilities2 ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                            SurfaceCapabilities2KHR *             pSurfaceCapabilities,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                            VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR *             pSurfaceCapabilities,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilities2KHR>::type
-      getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR>::type
+      getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                  Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+      getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                  Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                       uint32_t *                            pSurfaceFormatCount,
-                                                       SurfaceFormat2KHR *                   pSurfaceFormats,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                       uint32_t *                                                  pSurfaceFormatCount,
+                                                       VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR *                   pSurfaceFormats,
                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-    template <typename SurfaceFormat2KHRAllocator = std::allocator<SurfaceFormat2KHR>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, SurfaceFormat2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
-      getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-    template <typename SurfaceFormat2KHRAllocator = std::allocator<SurfaceFormat2KHR>,
-              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, SurfaceFormat2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                              = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
-      getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                             SurfaceFormat2KHRAllocator &          surfaceFormat2KHRAllocator,
-                             Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
+    template <typename SurfaceFormat2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>,
+              typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
+      getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                             Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename SurfaceFormat2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>,
+      typename Dispatch                   = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename SurfaceFormat2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR, SurfaceFormat2KHRAllocator>>::type
+      getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                             SurfaceFormat2KHRAllocator &                                surfaceFormat2KHRAllocator,
+                             Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename StructureChain,
+              typename StructureChainAllocator = std::allocator<StructureChain>,
+              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
+      getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                             Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
     template <typename StructureChain,
               typename StructureChainAllocator = std::allocator<StructureChain>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
+              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0>
     VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-      getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-    template <typename StructureChain,
-              typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-      getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                             StructureChainAllocator &             structureChainAllocator,
-                             Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                             StructureChainAllocator &                                   structureChainAllocator,
+                             Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_get_display_properties2 ===
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayProperties2KHR( uint32_t *              pPropertyCount,
-                                                          DisplayProperties2KHR * pProperties,
-                                                          Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayProperties2KHR( uint32_t *                                    pPropertyCount,
+                                                          VULKAN_HPP_NAMESPACE::DisplayProperties2KHR * pProperties,
+                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-    template <typename DisplayProperties2KHRAllocator = std::allocator<DisplayProperties2KHR>,
-              typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, DisplayProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
+    template <typename DisplayProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR>,
+              typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
       getDisplayProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-    template <typename DisplayProperties2KHRAllocator = std::allocator<DisplayProperties2KHR>,
+    template <typename DisplayProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR>,
               typename Dispatch                       = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, DisplayProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
+              typename std::enable_if<std::is_same<typename DisplayProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayProperties2KHR>::value,
+                                      int>::type      = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR, DisplayProperties2KHRAllocator>>::type
       getDisplayProperties2KHR( DisplayProperties2KHRAllocator & displayProperties2KHRAllocator,
                                 Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPlaneProperties2KHR( uint32_t *                   pPropertyCount,
-                                                               DisplayPlaneProperties2KHR * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPlaneProperties2KHR( uint32_t *                                         pPropertyCount,
+                                                               VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR * pProperties,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-    template <typename DisplayPlaneProperties2KHRAllocator = std::allocator<DisplayPlaneProperties2KHR>,
-              typename Dispatch                            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, DisplayPlaneProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
+    template <typename DisplayPlaneProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR>,
+              typename Dispatch                            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
       getDisplayPlaneProperties2KHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-    template <typename DisplayPlaneProperties2KHRAllocator = std::allocator<DisplayPlaneProperties2KHR>,
-              typename Dispatch                            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, DisplayPlaneProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
+    template <
+      typename DisplayPlaneProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR>,
+      typename Dispatch                            = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename DisplayPlaneProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR>::value,
+                              int>::type           = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR, DisplayPlaneProperties2KHRAllocator>>::type
       getDisplayPlaneProperties2KHR( DisplayPlaneProperties2KHRAllocator & displayPlaneProperties2KHRAllocator,
                                      Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayModeProperties2KHR( DisplayKHR                  display,
-                                                              uint32_t *                  pPropertyCount,
-                                                              DisplayModeProperties2KHR * pProperties,
-                                                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                              uint32_t *                                        pPropertyCount,
+                                                              VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR * pProperties,
+                                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename DisplayModeProperties2KHRAllocator = std::allocator<DisplayModeProperties2KHR>,
-              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, DisplayModeProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
-      getDisplayModeProperties2KHR( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename DisplayModeProperties2KHRAllocator = std::allocator<DisplayModeProperties2KHR>,
-              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, DisplayModeProperties2KHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
-      getDisplayModeProperties2KHR( DisplayKHR                           display,
+    template <typename DisplayModeProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR>,
+              typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
+      getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <
+      typename DisplayModeProperties2KHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR>,
+      typename Dispatch                           = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+      typename std::enable_if<std::is_same<typename DisplayModeProperties2KHRAllocator::value_type, VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR>::value,
+                              int>::type          = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR, DisplayModeProperties2KHRAllocator>>::type
+      getDisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayKHR     display,
                                     DisplayModeProperties2KHRAllocator & displayModeProperties2KHRAllocator,
                                     Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename StructureChain,
-              typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type
-      getDisplayModeProperties2KHR( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename StructureChain,
-              typename StructureChainAllocator = std::allocator<StructureChain>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename StructureChainAllocator::value_type, StructureChain>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain, StructureChainAllocator>>::type getDisplayModeProperties2KHR(
-      DisplayKHR display, StructureChainAllocator & structureChainAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
-                                                                 DisplayPlaneCapabilities2KHR * pCapabilities,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR *   pDisplayPlaneInfo,
+                                                                 VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR * pCapabilities,
                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayPlaneCapabilities2KHR>::type
-      getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR & displayPlaneInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR>::type
+      getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR & displayPlaneInfo,
+                                       Dispatch const & d                                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_sample_locations ===
 
-    // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getMultisamplePropertiesEXT( SampleCountFlagBits        samples,
-                                      MultisamplePropertiesEXT * pMultisampleProperties,
-                                      Dispatch const & d         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples,
+                                      VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT * pMultisampleProperties,
+                                      Dispatch const & d                               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD MultisamplePropertiesEXT
-      getMultisamplePropertiesEXT( SampleCountFlagBits samples, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT
+                         getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                      Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_calibrated_timestamps ===
 
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCalibrateableTimeDomainsEXT( uint32_t *         pTimeDomainCount,
-                                                                TimeDomainKHR *    pTimeDomains,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCalibrateableTimeDomainsEXT( uint32_t *                            pTimeDomainCount,
+                                                                VULKAN_HPP_NAMESPACE::TimeDomainKHR * pTimeDomains,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-    template <typename TimeDomainKHRAllocator = std::allocator<TimeDomainKHR>,
-              typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+    template <typename TimeDomainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TimeDomainKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
       getCalibrateableTimeDomainsEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-    template <typename TimeDomainKHRAllocator = std::allocator<TimeDomainKHR>,
+    template <typename TimeDomainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TimeDomainKHR>,
               typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::TimeDomainKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
       getCalibrateableTimeDomainsEXT( TimeDomainKHRAllocator & timeDomainKHRAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_fragment_shading_rate ===
 
-    // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getFragmentShadingRatesKHR( uint32_t *                             pFragmentShadingRateCount,
-                                                            PhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getFragmentShadingRatesKHR( uint32_t *                                                   pFragmentShadingRateCount,
+                                                            VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR * pFragmentShadingRates,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-    template <
-      typename PhysicalDeviceFragmentShadingRateKHRAllocator                         = std::allocator<PhysicalDeviceFragmentShadingRateKHR>,
-      typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type, PhysicalDeviceFragmentShadingRateKHR>::value,
-                              int>::type                                             = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
+    template <typename PhysicalDeviceFragmentShadingRateKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>,
+              typename Dispatch                                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
       getFragmentShadingRatesKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-    template <
-      typename PhysicalDeviceFragmentShadingRateKHRAllocator                         = std::allocator<PhysicalDeviceFragmentShadingRateKHR>,
-      typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type, PhysicalDeviceFragmentShadingRateKHR>::value,
-                              int>::type                                             = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
+    template <typename PhysicalDeviceFragmentShadingRateKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>,
+              typename Dispatch                                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename PhysicalDeviceFragmentShadingRateKHRAllocator::value_type,
+                                                   VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>::value,
+                                      int>::type                     = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR, PhysicalDeviceFragmentShadingRateKHRAllocator>>::type
       getFragmentShadingRatesKHR( PhysicalDeviceFragmentShadingRateKHRAllocator & physicalDeviceFragmentShadingRateKHRAllocator,
                                   Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_EXT_tooling_info ===
 
-    // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getToolPropertiesEXT( uint32_t *                     pToolCount,
-                                                      PhysicalDeviceToolProperties * pToolProperties,
-                                                      Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getToolPropertiesEXT( uint32_t *                                           pToolCount,
+                                                      VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties * pToolProperties,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-    template <
-      typename PhysicalDeviceToolPropertiesAllocator = std::allocator<PhysicalDeviceToolProperties>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    template <typename PhysicalDeviceToolPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
       getToolPropertiesEXT( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-    template <
-      typename PhysicalDeviceToolPropertiesAllocator = std::allocator<PhysicalDeviceToolProperties>,
-      typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, PhysicalDeviceToolProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                                    = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
+    template <typename PhysicalDeviceToolPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>,
+              typename Dispatch                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PhysicalDeviceToolPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties, PhysicalDeviceToolPropertiesAllocator>>::type
       getToolPropertiesEXT( PhysicalDeviceToolPropertiesAllocator & physicalDeviceToolPropertiesAllocator,
                             Dispatch const & d                      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_cooperative_matrix ===
 
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCooperativeMatrixPropertiesNV( uint32_t *                      pPropertyCount,
-                                                                  CooperativeMatrixPropertiesNV * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCooperativeMatrixPropertiesNV( uint32_t *                                            pPropertyCount,
+                                                                  VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV * pProperties,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-    template <
-      typename CooperativeMatrixPropertiesNVAllocator = std::allocator<CooperativeMatrixPropertiesNV>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, CooperativeMatrixPropertiesNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
+    template <typename CooperativeMatrixPropertiesNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
       getCooperativeMatrixPropertiesNV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-    template <
-      typename CooperativeMatrixPropertiesNVAllocator = std::allocator<CooperativeMatrixPropertiesNV>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, CooperativeMatrixPropertiesNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
+    template <typename CooperativeMatrixPropertiesNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename CooperativeMatrixPropertiesNVAllocator::value_type, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV, CooperativeMatrixPropertiesNVAllocator>>::type
       getCooperativeMatrixPropertiesNV( CooperativeMatrixPropertiesNVAllocator & cooperativeMatrixPropertiesNVAllocator,
                                         Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_NV_coverage_reduction_mode ===
 
-    // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getSupportedFramebufferMixedSamplesCombinationsNV( uint32_t *                             pCombinationCount,
-                                                         FramebufferMixedSamplesCombinationNV * pCombinations,
+      getSupportedFramebufferMixedSamplesCombinationsNV( uint32_t *                                                   pCombinationCount,
+                                                         VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV * pCombinations,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-    template <
-      typename FramebufferMixedSamplesCombinationNVAllocator                         = std::allocator<FramebufferMixedSamplesCombinationNV>,
-      typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type, FramebufferMixedSamplesCombinationNV>::value,
-                              int>::type                                             = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
+    template <typename FramebufferMixedSamplesCombinationNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>,
+              typename Dispatch                                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
       getSupportedFramebufferMixedSamplesCombinationsNV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-    template <
-      typename FramebufferMixedSamplesCombinationNVAllocator                         = std::allocator<FramebufferMixedSamplesCombinationNV>,
-      typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type, FramebufferMixedSamplesCombinationNV>::value,
-                              int>::type                                             = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
+    template <typename FramebufferMixedSamplesCombinationNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>,
+              typename Dispatch                                      = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<std::is_same<typename FramebufferMixedSamplesCombinationNVAllocator::value_type,
+                                                   VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>::value,
+                                      int>::type                     = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV, FramebufferMixedSamplesCombinationNVAllocator>>::type
       getSupportedFramebufferMixedSamplesCombinationsNV( FramebufferMixedSamplesCombinationNVAllocator & framebufferMixedSamplesCombinationNVAllocator,
                                                          Dispatch const & d                              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -20518,126 +15652,97 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_EXT_full_screen_exclusive ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                            uint32_t *                            pPresentModeCount,
-                                                            PresentModeKHR *                      pPresentModes,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
+                                                            uint32_t *                                                  pPresentModeCount,
+                                                            VULKAN_HPP_NAMESPACE::PresentModeKHR *                      pPresentModes,
                                                             Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-    template <typename PresentModeKHRAllocator = std::allocator<PresentModeKHR>,
+    template <typename PresentModeKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PresentModeKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+      getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                  Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename PresentModeKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PresentModeKHR>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-      getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-    template <typename PresentModeKHRAllocator = std::allocator<PresentModeKHR>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, PresentModeKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR, PresentModeKHRAllocator>>::type
-      getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
-                                  PresentModeKHRAllocator &             presentModeKHRAllocator,
-                                  Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+              typename std::enable_if<std::is_same<typename PresentModeKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::PresentModeKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR, PresentModeKHRAllocator>>::type
+      getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo,
+                                  PresentModeKHRAllocator &                                   presentModeKHRAllocator,
+                                  Dispatch const & d                                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_acquire_drm_display ===
 
 #ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireDrmDisplayEXT( int32_t            drmFd,
-                                                      DisplayKHR         display,
-                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireDrmDisplayEXT( int32_t                          drmFd,
+                                                      VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #else
-    // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireDrmDisplayEXT( int32_t drmFd, DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    typename ResultValueType<void>::type
+         acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getDrmDisplayEXT( int32_t            drmFd,
-                                                  uint32_t           connectorId,
-                                                  DisplayKHR *       display,
-                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getDrmDisplayEXT( int32_t                            drmFd,
+                                                  uint32_t                           connectorId,
+                                                  VULKAN_HPP_NAMESPACE::DisplayKHR * display,
+                                                  Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
       getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
       getDrmDisplayEXTUnique( int32_t drmFd, uint32_t connectorId, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_video_encode_queue ===
 
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD Result
-      getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
-                                               VideoEncodeQualityLevelPropertiesKHR *               pQualityLevelProperties,
+      getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
+                                               VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR *               pQualityLevelProperties,
                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<VideoEncodeQualityLevelPropertiesKHR>::type
-      getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
-                                               Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-    template <typename X,
-              typename Y,
-              typename... Z,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-      getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
-                                               Dispatch const & d                                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR>::type
+      getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename X, typename Y, typename... Z, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>>::type
+      getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo,
+                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_acquire_winrt_display ===
 
 #  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result acquireWinrtDisplayNV( DisplayKHR         display,
-                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result acquireWinrtDisplayNV( VULKAN_HPP_NAMESPACE::DisplayKHR display,
+                                                       Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  else
-    // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type
-      acquireWinrtDisplayNV( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+      acquireWinrtDisplayNV( VULKAN_HPP_NAMESPACE::DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getWinrtDisplayNV( uint32_t           deviceRelativeId,
-                                                   DisplayKHR *       pDisplay,
-                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getWinrtDisplayNV( uint32_t                           deviceRelativeId,
+                                                   VULKAN_HPP_NAMESPACE::DisplayKHR * pDisplay,
+                                                   Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type getWinrtDisplayNV( uint32_t           deviceRelativeId,
-                                                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DisplayKHR>::type
+      getWinrtDisplayNV( uint32_t deviceRelativeId, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DisplayKHR, Dispatch>>::type
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>>::type
       getWinrtDisplayNVUnique( uint32_t deviceRelativeId, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -20646,302 +15751,99 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
     //=== VK_EXT_directfb_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getDirectFBPresentationSupportEXT( uint32_t           queueFamilyIndex,
                                               IDirectFB *        dfb,
                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    Bool32 getDirectFBPresentationSupportEXT( uint32_t           queueFamilyIndex,
-                                              IDirectFB &        dfb,
-                                              Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::Bool32 getDirectFBPresentationSupportEXT( uint32_t           queueFamilyIndex,
+                                                                    IDirectFB &        dfb,
+                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     //=== VK_QNX_screen_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     Bool32 getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
                                             struct _screen_window * window,
                                             Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    Bool32 getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
-                                            struct _screen_window & window,
-                                            Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NAMESPACE::Bool32 getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
+                                                                  struct _screen_window & window,
+                                                                  Dispatch const & d      VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif   /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-    //=== VK_ARM_tensors ===
-
-    // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getExternalTensorPropertiesARM( const PhysicalDeviceExternalTensorInfoARM * pExternalTensorInfo,
-                                         ExternalTensorPropertiesARM *               pExternalTensorProperties,
-                                         Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD ExternalTensorPropertiesARM getExternalTensorPropertiesARM(
-      const PhysicalDeviceExternalTensorInfoARM & externalTensorInfo, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     //=== VK_NV_optical_flow ===
 
-    // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
-                                                              uint32_t *                           pFormatCount,
-                                                              OpticalFlowImageFormatPropertiesNV * pImageFormatProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV * pOpticalFlowImageFormatInfo,
+                                                              uint32_t *                                                 pFormatCount,
+                                                              VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV * pImageFormatProperties,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-    template <typename OpticalFlowImageFormatPropertiesNVAllocator                           = std::allocator<OpticalFlowImageFormatPropertiesNV>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, OpticalFlowImageFormatPropertiesNV>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
-      getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
-                                    Dispatch const & d                   VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-    template <typename OpticalFlowImageFormatPropertiesNVAllocator                           = std::allocator<OpticalFlowImageFormatPropertiesNV>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, OpticalFlowImageFormatPropertiesNV>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
-      getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV &          opticalFlowImageFormatInfo,
-                                    OpticalFlowImageFormatPropertiesNVAllocator & opticalFlowImageFormatPropertiesNVAllocator,
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_NV_cooperative_vector ===
-
-    // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCooperativeVectorPropertiesNV( uint32_t *                      pPropertyCount,
-                                                                  CooperativeVectorPropertiesNV * pProperties,
-                                                                  Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-    template <
-      typename CooperativeVectorPropertiesNVAllocator = std::allocator<CooperativeVectorPropertiesNV>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeVectorPropertiesNVAllocator::value_type, CooperativeVectorPropertiesNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator>>::type
-      getCooperativeVectorPropertiesNV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-    template <
-      typename CooperativeVectorPropertiesNVAllocator = std::allocator<CooperativeVectorPropertiesNV>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeVectorPropertiesNVAllocator::value_type, CooperativeVectorPropertiesNV>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeVectorPropertiesNV, CooperativeVectorPropertiesNVAllocator>>::type
-      getCooperativeVectorPropertiesNV( CooperativeVectorPropertiesNVAllocator & cooperativeVectorPropertiesNVAllocator,
-                                        Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename OpticalFlowImageFormatPropertiesNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>,
+              typename Dispatch                                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
+      getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
+                                    Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename OpticalFlowImageFormatPropertiesNVAllocator = std::allocator<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>,
+              typename Dispatch                                    = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename OpticalFlowImageFormatPropertiesNVAllocator::value_type, VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV, OpticalFlowImageFormatPropertiesNVAllocator>>::type
+      getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo,
+                                    OpticalFlowImageFormatPropertiesNVAllocator &              opticalFlowImageFormatPropertiesNVAllocator,
+                                    Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_cooperative_matrix ===
 
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCooperativeMatrixPropertiesKHR( uint32_t *                       pPropertyCount,
-                                                                   CooperativeMatrixPropertiesKHR * pProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCooperativeMatrixPropertiesKHR( uint32_t *                                             pPropertyCount,
+                                                                   VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR * pProperties,
                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-    template <
-      typename CooperativeMatrixPropertiesKHRAllocator = std::allocator<CooperativeMatrixPropertiesKHR>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, CooperativeMatrixPropertiesKHR>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
+    template <typename CooperativeMatrixPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
       getCooperativeMatrixPropertiesKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-    template <
-      typename CooperativeMatrixPropertiesKHRAllocator = std::allocator<CooperativeMatrixPropertiesKHR>,
-      typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, CooperativeMatrixPropertiesKHR>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
+    template <typename CooperativeMatrixPropertiesKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>,
+              typename Dispatch                                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename CooperativeMatrixPropertiesKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR, CooperativeMatrixPropertiesKHRAllocator>>::type
       getCooperativeMatrixPropertiesKHR( CooperativeMatrixPropertiesKHRAllocator & cooperativeMatrixPropertiesKHRAllocator,
                                          Dispatch const & d                        VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    //=== VK_ARM_data_graph ===
-
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getQueueFamilyDataGraphPropertiesARM( uint32_t                            queueFamilyIndex,
-                                                                      uint32_t *                          pQueueFamilyDataGraphPropertyCount,
-                                                                      QueueFamilyDataGraphPropertiesARM * pQueueFamilyDataGraphProperties,
-                                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-    template <typename QueueFamilyDataGraphPropertiesARMAllocator                            = std::allocator<QueueFamilyDataGraphPropertiesARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyDataGraphPropertiesARMAllocator::value_type, QueueFamilyDataGraphPropertiesARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator>>::type
-      getQueueFamilyDataGraphPropertiesARM( uint32_t queueFamilyIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-    template <typename QueueFamilyDataGraphPropertiesARMAllocator                            = std::allocator<QueueFamilyDataGraphPropertiesARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename QueueFamilyDataGraphPropertiesARMAllocator::value_type, QueueFamilyDataGraphPropertiesARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM, QueueFamilyDataGraphPropertiesARMAllocator>>::type
-      getQueueFamilyDataGraphPropertiesARM( uint32_t                                     queueFamilyIndex,
-                                            QueueFamilyDataGraphPropertiesARMAllocator & queueFamilyDataGraphPropertiesARMAllocator,
-                                            Dispatch const & d                           VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-      const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM * pQueueFamilyDataGraphProcessingEngineInfo,
-      QueueFamilyDataGraphProcessingEnginePropertiesARM *               pQueueFamilyDataGraphProcessingEngineProperties,
-      Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD QueueFamilyDataGraphProcessingEnginePropertiesARM getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-      const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & queueFamilyDataGraphProcessingEngineInfo,
-      Dispatch const & d                                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     //=== VK_KHR_calibrated_timestamps ===
 
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result getCalibrateableTimeDomainsKHR( uint32_t *         pTimeDomainCount,
-                                                                TimeDomainKHR *    pTimeDomains,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result getCalibrateableTimeDomainsKHR( uint32_t *                            pTimeDomainCount,
+                                                                VULKAN_HPP_NAMESPACE::TimeDomainKHR * pTimeDomains,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-    template <typename TimeDomainKHRAllocator = std::allocator<TimeDomainKHR>,
-              typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+    template <typename TimeDomainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TimeDomainKHR>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
       getCalibrateableTimeDomainsKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-    template <typename TimeDomainKHRAllocator = std::allocator<TimeDomainKHR>,
+    template <typename TimeDomainKHRAllocator = std::allocator<VULKAN_HPP_NAMESPACE::TimeDomainKHR>,
               typename Dispatch               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, TimeDomainKHR>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                      = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR, TimeDomainKHRAllocator>>::type
+              typename std::enable_if<std::is_same<typename TimeDomainKHRAllocator::value_type, VULKAN_HPP_NAMESPACE::TimeDomainKHR>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR, TimeDomainKHRAllocator>>::type
       getCalibrateableTimeDomainsKHR( TimeDomainKHRAllocator & timeDomainKHRAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    //=== VK_NV_cooperative_matrix2 ===
-
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      getCooperativeMatrixFlexibleDimensionsPropertiesNV( uint32_t *                                        pPropertyCount,
-                                                          CooperativeMatrixFlexibleDimensionsPropertiesNV * pProperties,
-                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-    template <typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator              = std::allocator<CooperativeMatrixFlexibleDimensionsPropertiesNV>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator::value_type,
-                                                   CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator>>::type
-      getCooperativeMatrixFlexibleDimensionsPropertiesNV( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-    template <typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator              = std::allocator<CooperativeMatrixFlexibleDimensionsPropertiesNV>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator::value_type,
-                                                   CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD
-      typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV, CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator>>::type
-      getCooperativeMatrixFlexibleDimensionsPropertiesNV(
-        CooperativeMatrixFlexibleDimensionsPropertiesNVAllocator & cooperativeMatrixFlexibleDimensionsPropertiesNVAllocator,
-        Dispatch const & d                                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
-    //=== VK_ARM_performance_counters_by_region ===
-
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result
-      enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t                           queueFamilyIndex,
-                                                          uint32_t *                         pCounterCount,
-                                                          PerformanceCounterARM *            pCounters,
-                                                          PerformanceCounterDescriptionARM * pCounterDescriptions,
-                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-    template <typename PerformanceCounterARMAllocator                                        = std::allocator<PerformanceCounterARM>,
-              typename PerformanceCounterDescriptionARMAllocator                             = std::allocator<PerformanceCounterDescriptionARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PerformanceCounterARMAllocator::value_type, PerformanceCounterARM>::value &&
-                                        std::is_same<typename PerformanceCounterDescriptionARMAllocator::value_type, PerformanceCounterDescriptionARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-                                                            std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>>::type
-      enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t queueFamilyIndex, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-    template <typename PerformanceCounterARMAllocator                                        = std::allocator<PerformanceCounterARM>,
-              typename PerformanceCounterDescriptionARMAllocator                             = std::allocator<PerformanceCounterDescriptionARM>,
-              typename Dispatch                                                              = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PerformanceCounterARMAllocator::value_type, PerformanceCounterARM>::value &&
-                                        std::is_same<typename PerformanceCounterDescriptionARMAllocator::value_type, PerformanceCounterDescriptionARM>::value,
-                                      int>::type                                             = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterARM, PerformanceCounterARMAllocator>,
-                                                            std::vector<PerformanceCounterDescriptionARM, PerformanceCounterDescriptionARMAllocator>>>::type
-      enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t                                    queueFamilyIndex,
-                                                          PerformanceCounterARMAllocator &            performanceCounterARMAllocator,
-                                                          PerformanceCounterDescriptionARMAllocator & performanceCounterDescriptionARMAllocator,
-                                                          Dispatch const & d                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-
     operator VkPhysicalDevice() const VULKAN_HPP_NOEXCEPT
     {
       return m_physicalDevice;
@@ -20962,59 +15864,43 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::ePhysicalDevice>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::ePhysicalDevice>
   {
-    using Type = PhysicalDevice;
+    using Type = VULKAN_HPP_NAMESPACE::PhysicalDevice;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::ePhysicalDevice>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePhysicalDevice>
   {
-    using Type = PhysicalDevice;
+    using Type = VULKAN_HPP_NAMESPACE::PhysicalDevice;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkPhysicalDevice, VK_NULL_HANDLE>
   {
-    using Type = PhysicalDevice;
+    using Type = VULKAN_HPP_NAMESPACE::PhysicalDevice;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<PhysicalDevice>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::PhysicalDevice>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
-  // wrapper class for handle VkInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInstance.html
   class Instance
   {
   public:
     using CType      = VkInstance;
     using NativeType = VkInstance;
 
-    static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eInstance;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eInstance;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eInstance;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+      VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eInstance;
 
   public:
-    Instance() VULKAN_HPP_NOEXCEPT {}  // = default; - try to workaround a compiler issue
-
-    Instance( Instance const & rhs )             = default;
-    Instance & operator=( Instance const & rhs ) = default;
-
-#if !defined( VULKAN_HPP_HANDLES_MOVE_EXCHANGE )
-    Instance( Instance && rhs )             = default;
-    Instance & operator=( Instance && rhs ) = default;
-#else
-    Instance( Instance && rhs ) VULKAN_HPP_NOEXCEPT : m_instance( exchange( rhs.m_instance, {} ) ) {}
-
-    Instance & operator=( Instance && rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      m_instance = exchange( rhs.m_instance, {} );
-      return *this;
-    }
-#endif
+    VULKAN_HPP_CONSTEXPR Instance() = default;
 
     VULKAN_HPP_CONSTEXPR Instance( std::nullptr_t ) VULKAN_HPP_NOEXCEPT {}
 
@@ -21032,158 +15918,147 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( Instance const & ) const = default;
+#else
+    bool operator==( Instance const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_instance == rhs.m_instance;
+    }
+
+    bool operator!=( Instance const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_instance != rhs.m_instance;
+    }
+
+    bool operator<( Instance const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return m_instance < rhs.m_instance;
+    }
+#endif
+
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkDestroyInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyInstance.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( const AllocationCallbacks * pAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyInstance.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result enumeratePhysicalDevices( uint32_t *         pPhysicalDeviceCount,
-                                                          PhysicalDevice *   pPhysicalDevices,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result enumeratePhysicalDevices( uint32_t *                             pPhysicalDeviceCount,
+                                                          VULKAN_HPP_NAMESPACE::PhysicalDevice * pPhysicalDevices,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-    template <typename PhysicalDeviceAllocator = std::allocator<PhysicalDevice>,
-              typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, PhysicalDevice>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDevice, PhysicalDeviceAllocator>>::type
+    template <typename PhysicalDeviceAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDevice>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator>>::type
       enumeratePhysicalDevices( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-    template <typename PhysicalDeviceAllocator = std::allocator<PhysicalDevice>,
+    template <typename PhysicalDeviceAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDevice>,
               typename Dispatch                = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, PhysicalDevice>::value, int>::type = 0,
-              typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                        = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDevice, PhysicalDeviceAllocator>>::type
+              typename std::enable_if<std::is_same<typename PhysicalDeviceAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDevice>::value, int>::type = 0>
+    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice, PhysicalDeviceAllocator>>::type
       enumeratePhysicalDevices( PhysicalDeviceAllocator & physicalDeviceAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
     PFN_vkVoidFunction getProcAddr( const char * pName, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    PFN_VoidFunction getProcAddr( const std::string & name, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    PFN_vkVoidFunction getProcAddr( const std::string & name, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_VERSION_1_1 ===
 
-    // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result enumeratePhysicalDeviceGroups( uint32_t *                      pPhysicalDeviceGroupCount,
-                                                               PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result enumeratePhysicalDeviceGroups( uint32_t *                                            pPhysicalDeviceGroupCount,
+                                                               VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-    template <
-      typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<PhysicalDeviceGroupProperties>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    template <typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
       enumeratePhysicalDeviceGroups( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-    template <
-      typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<PhysicalDeviceGroupProperties>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    template <typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
       enumeratePhysicalDeviceGroups( PhysicalDeviceGroupPropertiesAllocator & physicalDeviceGroupPropertiesAllocator,
                                      Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_surface ===
 
-    // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySurfaceKHR( SurfaceKHR                  surface,
-                            const AllocationCallbacks * pAllocator,
-                            Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySurfaceKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
+                            const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                            Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroySurfaceKHR( SurfaceKHR surface                            VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroySurfaceKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface                            VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SurfaceKHR                  surface,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroySurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( SurfaceKHR                                    surface,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::SurfaceKHR                                    surface,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
     //=== VK_KHR_display ===
 
-    // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDisplayPlaneSurfaceKHR( const DisplaySurfaceCreateInfoKHR * pCreateInfo,
-                                                              const AllocationCallbacks *         pAllocator,
-                                                              SurfaceKHR *                        pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDisplayPlaneSurfaceKHR( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR * pCreateInfo,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                              VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createDisplayPlaneSurfaceKHR( const DisplaySurfaceCreateInfoKHR &           createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createDisplayPlaneSurfaceKHR( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR &           createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createDisplayPlaneSurfaceKHRUnique( const DisplaySurfaceCreateInfoKHR &           createInfo,
-                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createDisplayPlaneSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR &           createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
     //=== VK_KHR_xlib_surface ===
 
-    // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createXlibSurfaceKHR( const XlibSurfaceCreateInfoKHR * pCreateInfo,
-                                                      const AllocationCallbacks *      pAllocator,
-                                                      SurfaceKHR *                     pSurface,
-                                                      Dispatch const & d               VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createXlibSurfaceKHR( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR * pCreateInfo,
+                                                      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *      pAllocator,
+                                                      VULKAN_HPP_NAMESPACE::SurfaceKHR *                     pSurface,
+                                                      Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createXlibSurfaceKHR( const XlibSurfaceCreateInfoKHR &              createInfo,
-                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                            Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createXlibSurfaceKHR( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR &              createInfo,
+                            Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                            Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createXlibSurfaceKHRUnique( const XlibSurfaceCreateInfoKHR &              createInfo,
-                                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createXlibSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR &              createInfo,
+                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_XLIB_KHR*/
@@ -21191,26 +16066,23 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XCB_KHR )
     //=== VK_KHR_xcb_surface ===
 
-    // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createXcbSurfaceKHR( const XcbSurfaceCreateInfoKHR * pCreateInfo,
-                                                     const AllocationCallbacks *     pAllocator,
-                                                     SurfaceKHR *                    pSurface,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createXcbSurfaceKHR( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR * pCreateInfo,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                     VULKAN_HPP_NAMESPACE::SurfaceKHR *                    pSurface,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createXcbSurfaceKHR( const XcbSurfaceCreateInfoKHR &               createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createXcbSurfaceKHR( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR &               createInfo,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createXcbSurfaceKHRUnique( const XcbSurfaceCreateInfoKHR &               createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createXcbSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR &               createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_XCB_KHR*/
@@ -21218,26 +16090,23 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
     //=== VK_KHR_wayland_surface ===
 
-    // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createWaylandSurfaceKHR( const WaylandSurfaceCreateInfoKHR * pCreateInfo,
-                                                         const AllocationCallbacks *         pAllocator,
-                                                         SurfaceKHR *                        pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createWaylandSurfaceKHR( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR * pCreateInfo,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                         VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createWaylandSurfaceKHR( const WaylandSurfaceCreateInfoKHR &           createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createWaylandSurfaceKHR( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR &           createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createWaylandSurfaceKHRUnique( const WaylandSurfaceCreateInfoKHR &           createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createWaylandSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR &           createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_WAYLAND_KHR*/
@@ -21245,26 +16114,23 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     //=== VK_KHR_android_surface ===
 
-    // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createAndroidSurfaceKHR( const AndroidSurfaceCreateInfoKHR * pCreateInfo,
-                                                         const AllocationCallbacks *         pAllocator,
-                                                         SurfaceKHR *                        pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createAndroidSurfaceKHR( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR * pCreateInfo,
+                                                         const VULKAN_HPP_NAMESPACE::AllocationCallbacks *         pAllocator,
+                                                         VULKAN_HPP_NAMESPACE::SurfaceKHR *                        pSurface,
                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createAndroidSurfaceKHR( const AndroidSurfaceCreateInfoKHR &           createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createAndroidSurfaceKHR( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR &           createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createAndroidSurfaceKHRUnique( const AndroidSurfaceCreateInfoKHR &           createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createAndroidSurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR &           createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_ANDROID_KHR*/
@@ -21272,137 +16138,112 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_win32_surface ===
 
-    // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createWin32SurfaceKHR( const Win32SurfaceCreateInfoKHR * pCreateInfo,
-                                                       const AllocationCallbacks *       pAllocator,
-                                                       SurfaceKHR *                      pSurface,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createWin32SurfaceKHR( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR * pCreateInfo,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                       VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createWin32SurfaceKHR( const Win32SurfaceCreateInfoKHR &             createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createWin32SurfaceKHR( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR &             createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createWin32SurfaceKHRUnique( const Win32SurfaceCreateInfoKHR &             createInfo,
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createWin32SurfaceKHRUnique( const VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR &             createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_debug_report ===
 
-    // wrapper function for command vkCreateDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDebugReportCallbackEXT( const DebugReportCallbackCreateInfoEXT * pCreateInfo,
-                                                              const AllocationCallbacks *              pAllocator,
-                                                              DebugReportCallbackEXT *                 pCallback,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDebugReportCallbackEXT( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT * pCreateInfo,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                                              VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT *                 pCallback,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DebugReportCallbackEXT>::type
-      createDebugReportCallbackEXT( const DebugReportCallbackCreateInfoEXT &      createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>::type
+      createDebugReportCallbackEXT( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT &      createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DebugReportCallbackEXT, Dispatch>>::type
-      createDebugReportCallbackEXTUnique( const DebugReportCallbackCreateInfoEXT &      createInfo,
-                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT, Dispatch>>::type
+      createDebugReportCallbackEXTUnique( const VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT &      createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDebugReportCallbackEXT( DebugReportCallbackEXT      callback,
-                                        const AllocationCallbacks * pAllocator,
-                                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
+                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                        Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDebugReportCallbackEXT( DebugReportCallbackEXT callback               VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT callback               VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DebugReportCallbackEXT      callback,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT      callback,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugReportCallbackEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DebugReportCallbackEXT                        callback,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT                        callback,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                DebugReportObjectTypeEXT objectType,
-                                uint64_t                 object,
-                                size_t                   location,
-                                int32_t                  messageCode,
-                                const char *             pLayerPrefix,
-                                const char *             pMessage,
-                                Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                uint64_t                                       object,
+                                size_t                                         location,
+                                int32_t                                        messageCode,
+                                const char *                                   pLayerPrefix,
+                                const char *                                   pMessage,
+                                Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                DebugReportObjectTypeEXT objectType,
-                                uint64_t                 object,
-                                size_t                   location,
-                                int32_t                  messageCode,
-                                const std::string &      layerPrefix,
-                                const std::string &      message,
-                                Dispatch const & d       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                uint64_t                                       object,
+                                size_t                                         location,
+                                int32_t                                        messageCode,
+                                const std::string &                            layerPrefix,
+                                const std::string &                            message,
+                                Dispatch const & d                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_GGP )
     //=== VK_GGP_stream_descriptor_surface ===
 
-    // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createStreamDescriptorSurfaceGGP( const StreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
-                                                                  const AllocationCallbacks *                  pAllocator,
-                                                                  SurfaceKHR *                                 pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createStreamDescriptorSurfaceGGP( const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP * pCreateInfo,
+                                                                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                  pAllocator,
+                                                                  VULKAN_HPP_NAMESPACE::SurfaceKHR *                                 pSurface,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createStreamDescriptorSurfaceGGP( const StreamDescriptorSurfaceCreateInfoGGP &  createInfo,
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createStreamDescriptorSurfaceGGP( const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP &  createInfo,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createStreamDescriptorSurfaceGGPUnique( const StreamDescriptorSurfaceCreateInfoGGP &  createInfo,
-                                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type createStreamDescriptorSurfaceGGPUnique(
+      const VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP &  createInfo,
+      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_GGP*/
@@ -21410,56 +16251,46 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_VI_NN )
     //=== VK_NN_vi_surface ===
 
-    // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createViSurfaceNN( const ViSurfaceCreateInfoNN * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   SurfaceKHR *                  pSurface,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createViSurfaceNN( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN * pCreateInfo,
+                                                   const VULKAN_HPP_NAMESPACE::AllocationCallbacks *   pAllocator,
+                                                   VULKAN_HPP_NAMESPACE::SurfaceKHR *                  pSurface,
+                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createViSurfaceNN( const ViSurfaceCreateInfoNN &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createViSurfaceNN( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN &                 createInfo,
+                         Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createViSurfaceNNUnique( const ViSurfaceCreateInfoNN &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createViSurfaceNNUnique( const VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN &                 createInfo,
+                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                               Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_VI_NN*/
 
     //=== VK_KHR_device_group_creation ===
 
-    // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result enumeratePhysicalDeviceGroupsKHR( uint32_t *                      pPhysicalDeviceGroupCount,
-                                                                  PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result enumeratePhysicalDeviceGroupsKHR( uint32_t *                                            pPhysicalDeviceGroupCount,
+                                                                  VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties * pPhysicalDeviceGroupProperties,
                                                                   Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-    template <
-      typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<PhysicalDeviceGroupProperties>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    template <typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
       enumeratePhysicalDeviceGroupsKHR( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-    // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-    template <
-      typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<PhysicalDeviceGroupProperties>,
-      typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-      typename std::enable_if<std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, PhysicalDeviceGroupProperties>::value, int>::type = 0,
-      typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
+    template <typename PhysicalDeviceGroupPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>,
+              typename Dispatch                               = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+              typename std::enable_if<
+                std::is_same<typename PhysicalDeviceGroupPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties>::value,
+                int>::type = 0>
+    VULKAN_HPP_NODISCARD
+      typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties, PhysicalDeviceGroupPropertiesAllocator>>::type
       enumeratePhysicalDeviceGroupsKHR( PhysicalDeviceGroupPropertiesAllocator & physicalDeviceGroupPropertiesAllocator,
                                         Dispatch const & d                       VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
@@ -21467,26 +16298,23 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_IOS_MVK )
     //=== VK_MVK_ios_surface ===
 
-    // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createIOSSurfaceMVK( const IOSSurfaceCreateInfoMVK * pCreateInfo,
-                                                     const AllocationCallbacks *     pAllocator,
-                                                     SurfaceKHR *                    pSurface,
-                                                     Dispatch const & d              VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createIOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK * pCreateInfo,
+                                                     const VULKAN_HPP_NAMESPACE::AllocationCallbacks *     pAllocator,
+                                                     VULKAN_HPP_NAMESPACE::SurfaceKHR *                    pSurface,
+                                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createIOSSurfaceMVK( const IOSSurfaceCreateInfoMVK &               createInfo,
-                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createIOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK &               createInfo,
+                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createIOSSurfaceMVKUnique( const IOSSurfaceCreateInfoMVK &               createInfo,
-                                 Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                 Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createIOSSurfaceMVKUnique( const VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK &               createInfo,
+                                 Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                 Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_IOS_MVK*/
@@ -21494,131 +16322,104 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
     //=== VK_MVK_macos_surface ===
 
-    // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createMacOSSurfaceMVK( const MacOSSurfaceCreateInfoMVK * pCreateInfo,
-                                                       const AllocationCallbacks *       pAllocator,
-                                                       SurfaceKHR *                      pSurface,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createMacOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK * pCreateInfo,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                       VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createMacOSSurfaceMVK( const MacOSSurfaceCreateInfoMVK &             createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createMacOSSurfaceMVK( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK &             createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createMacOSSurfaceMVKUnique( const MacOSSurfaceCreateInfoMVK &             createInfo,
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createMacOSSurfaceMVKUnique( const VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK &             createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_MACOS_MVK*/
 
     //=== VK_EXT_debug_utils ===
 
-    // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDebugUtilsMessengerEXT( const DebugUtilsMessengerCreateInfoEXT * pCreateInfo,
-                                                              const AllocationCallbacks *              pAllocator,
-                                                              DebugUtilsMessengerEXT *                 pMessenger,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDebugUtilsMessengerEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT * pCreateInfo,
+                                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks *              pAllocator,
+                                                              VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT *                 pMessenger,
                                                               Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<DebugUtilsMessengerEXT>::type
-      createDebugUtilsMessengerEXT( const DebugUtilsMessengerCreateInfoEXT &      createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>::type
+      createDebugUtilsMessengerEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT &      createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<DebugUtilsMessengerEXT, Dispatch>>::type
-      createDebugUtilsMessengerEXTUnique( const DebugUtilsMessengerCreateInfoEXT &      createInfo,
-                                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT, Dispatch>>::type
+      createDebugUtilsMessengerEXTUnique( const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT &      createInfo,
+                                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDebugUtilsMessengerEXT( DebugUtilsMessengerEXT      messenger,
-                                        const AllocationCallbacks * pAllocator,
-                                        Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
+                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                        Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroyDebugUtilsMessengerEXT( DebugUtilsMessengerEXT messenger              VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                        Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroyDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT messenger              VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                        Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DebugUtilsMessengerEXT      messenger,
-                  const AllocationCallbacks * pAllocator,
-                  Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT      messenger,
+                  const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                  Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkDestroyDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDebugUtilsMessengerEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void destroy( DebugUtilsMessengerEXT                        messenger,
-                  Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                  Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void destroy( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT                        messenger,
+                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                  Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-    // wrapper function for command vkSubmitDebugUtilsMessageEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                     DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                     const DebugUtilsMessengerCallbackDataEXT * pCallbackData,
-                                     Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                     VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                     const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT * pCallbackData,
+                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkSubmitDebugUtilsMessageEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    void submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                     DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                     const DebugUtilsMessengerCallbackDataEXT & callbackData,
-                                     Dispatch const & d                         VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    void submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                     VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                     const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT & callbackData,
+                                     Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_imagepipe_surface ===
 
-    // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createImagePipeSurfaceFUCHSIA( const ImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
-                                                               const AllocationCallbacks *               pAllocator,
-                                                               SurfaceKHR *                              pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createImagePipeSurfaceFUCHSIA( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA * pCreateInfo,
+                                                               const VULKAN_HPP_NAMESPACE::AllocationCallbacks *               pAllocator,
+                                                               VULKAN_HPP_NAMESPACE::SurfaceKHR *                              pSurface,
                                                                Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createImagePipeSurfaceFUCHSIA( const ImagePipeSurfaceCreateInfoFUCHSIA &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                     Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createImagePipeSurfaceFUCHSIA( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA &     createInfo,
+                                     Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                     Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createImagePipeSurfaceFUCHSIAUnique( const ImagePipeSurfaceCreateInfoFUCHSIA &     createInfo,
-                                           Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                           Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createImagePipeSurfaceFUCHSIAUnique( const VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA &     createInfo,
+                                           Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                           Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_FUCHSIA*/
@@ -21626,78 +16427,69 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_METAL_EXT )
     //=== VK_EXT_metal_surface ===
 
-    // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createMetalSurfaceEXT( const MetalSurfaceCreateInfoEXT * pCreateInfo,
-                                                       const AllocationCallbacks *       pAllocator,
-                                                       SurfaceKHR *                      pSurface,
-                                                       Dispatch const & d                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createMetalSurfaceEXT( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT * pCreateInfo,
+                                                       const VULKAN_HPP_NAMESPACE::AllocationCallbacks *       pAllocator,
+                                                       VULKAN_HPP_NAMESPACE::SurfaceKHR *                      pSurface,
+                                                       Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createMetalSurfaceEXT( const MetalSurfaceCreateInfoEXT &             createInfo,
-                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                             Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createMetalSurfaceEXT( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT &             createInfo,
+                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                             Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createMetalSurfaceEXTUnique( const MetalSurfaceCreateInfoEXT &             createInfo,
-                                   Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                   Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createMetalSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT &             createInfo,
+                                   Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                   Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_EXT_headless_surface ===
 
-    // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createHeadlessSurfaceEXT( const HeadlessSurfaceCreateInfoEXT * pCreateInfo,
-                                                          const AllocationCallbacks *          pAllocator,
-                                                          SurfaceKHR *                         pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createHeadlessSurfaceEXT( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT * pCreateInfo,
+                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                          VULKAN_HPP_NAMESPACE::SurfaceKHR *                         pSurface,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createHeadlessSurfaceEXT( const HeadlessSurfaceCreateInfoEXT &          createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createHeadlessSurfaceEXT( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT &          createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createHeadlessSurfaceEXTUnique( const HeadlessSurfaceCreateInfoEXT &          createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createHeadlessSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT &          createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
     //=== VK_EXT_directfb_surface ===
 
-    // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createDirectFBSurfaceEXT( const DirectFBSurfaceCreateInfoEXT * pCreateInfo,
-                                                          const AllocationCallbacks *          pAllocator,
-                                                          SurfaceKHR *                         pSurface,
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createDirectFBSurfaceEXT( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT * pCreateInfo,
+                                                          const VULKAN_HPP_NAMESPACE::AllocationCallbacks *          pAllocator,
+                                                          VULKAN_HPP_NAMESPACE::SurfaceKHR *                         pSurface,
                                                           Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createDirectFBSurfaceEXT( const DirectFBSurfaceCreateInfoEXT &          createInfo,
-                                Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createDirectFBSurfaceEXT( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT &          createInfo,
+                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createDirectFBSurfaceEXTUnique( const DirectFBSurfaceCreateInfoEXT &          createInfo,
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                      Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createDirectFBSurfaceEXTUnique( const VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT &          createInfo,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                      Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_DIRECTFB_EXT*/
@@ -21705,57 +16497,27 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     //=== VK_QNX_screen_surface ===
 
-    // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createScreenSurfaceQNX( const ScreenSurfaceCreateInfoQNX * pCreateInfo,
-                                                        const AllocationCallbacks *        pAllocator,
-                                                        SurfaceKHR *                       pSurface,
-                                                        Dispatch const & d                 VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD Result createScreenSurfaceQNX( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX * pCreateInfo,
+                                                        const VULKAN_HPP_NAMESPACE::AllocationCallbacks *        pAllocator,
+                                                        VULKAN_HPP_NAMESPACE::SurfaceKHR *                       pSurface,
+                                                        Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 #  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createScreenSurfaceQNX( const ScreenSurfaceCreateInfoQNX &            createInfo,
-                              Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                              Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::SurfaceKHR>::type
+      createScreenSurfaceQNX( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX &            createInfo,
+                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                              Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createScreenSurfaceQNXUnique( const ScreenSurfaceCreateInfoQNX &            createInfo,
-                                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR, Dispatch>>::type
+      createScreenSurfaceQNXUnique( const VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX &            createInfo,
+                                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #    endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 #endif     /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-#if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_surface ===
-
-    // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD Result createSurfaceOHOS( const SurfaceCreateInfoOHOS * pCreateInfo,
-                                                   const AllocationCallbacks *   pAllocator,
-                                                   SurfaceKHR *                  pSurface,
-                                                   Dispatch const & d            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
-#  ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-    // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-      createSurfaceOHOS( const SurfaceCreateInfoOHOS &                 createInfo,
-                         Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                         Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#    ifndef VULKAN_HPP_NO_SMART_HANDLE
-    // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-    VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<SurfaceKHR, Dispatch>>::type
-      createSurfaceOHOSUnique( const SurfaceCreateInfoOHOS &                 createInfo,
-                               Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
-#    endif /* VULKAN_HPP_NO_SMART_HANDLE */
-#  endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
-#endif     /*VK_USE_PLATFORM_OHOS*/
-
     operator VkInstance() const VULKAN_HPP_NOEXCEPT
     {
       return m_instance;
@@ -21776,181 +16538,123 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  struct CppType<ObjectType, ObjectType::eInstance>
+  struct CppType<VULKAN_HPP_NAMESPACE::ObjectType, VULKAN_HPP_NAMESPACE::ObjectType::eInstance>
   {
-    using Type = Instance;
+    using Type = VULKAN_HPP_NAMESPACE::Instance;
   };
 
   template <>
-  struct CppType<DebugReportObjectTypeEXT, DebugReportObjectTypeEXT::eInstance>
+  struct CppType<VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT, VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eInstance>
   {
-    using Type = Instance;
+    using Type = VULKAN_HPP_NAMESPACE::Instance;
   };
 
 #if ( VK_USE_64_BIT_PTR_DEFINES == 1 )
   template <>
   struct CppType<VkInstance, VK_NULL_HANDLE>
   {
-    using Type = Instance;
+    using Type = VULKAN_HPP_NAMESPACE::Instance;
   };
 #endif
 
   template <>
-  struct isVulkanHandleType<Instance>
+  struct isVulkanHandleType<VULKAN_HPP_NAMESPACE::Instance>
   {
     static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
   };
 
   //=== VK_VERSION_1_0 ===
 
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-  VULKAN_HPP_NODISCARD Result createInstance( const InstanceCreateInfo *  pCreateInfo,
-                                              const AllocationCallbacks * pAllocator,
-                                              Instance *                  pInstance,
-                                              Dispatch const & d          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD Result createInstance( const VULKAN_HPP_NAMESPACE::InstanceCreateInfo *  pCreateInfo,
+                                              const VULKAN_HPP_NAMESPACE::AllocationCallbacks * pAllocator,
+                                              VULKAN_HPP_NAMESPACE::Instance *                  pInstance,
+                                              Dispatch const & d                                VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<Instance>::type
-    createInstance( const InstanceCreateInfo &                    createInfo,
-                    Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                    Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD typename ResultValueType<VULKAN_HPP_NAMESPACE::Instance>::type
+    createInstance( const VULKAN_HPP_NAMESPACE::InstanceCreateInfo &                    createInfo,
+                    Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                    Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
 #  ifndef VULKAN_HPP_NO_SMART_HANDLE
-  // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<Instance, Dispatch>>::type
-    createInstanceUnique( const InstanceCreateInfo &                    createInfo,
-                          Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                          Dispatch const & d                            VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD typename ResultValueType<UniqueHandle<VULKAN_HPP_NAMESPACE::Instance, Dispatch>>::type
+    createInstanceUnique( const VULKAN_HPP_NAMESPACE::InstanceCreateInfo &                    createInfo,
+                          Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                          Dispatch const & d                                                  VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
 #  endif /* VULKAN_HPP_NO_SMART_HANDLE */
 #endif   /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-  VULKAN_HPP_NODISCARD Result enumerateInstanceExtensionProperties( const char *          pLayerName,
-                                                                    uint32_t *            pPropertyCount,
-                                                                    ExtensionProperties * pProperties,
-                                                                    Dispatch const & d    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD Result enumerateInstanceExtensionProperties( const char *                                pLayerName,
+                                                                    uint32_t *                                  pPropertyCount,
+                                                                    VULKAN_HPP_NAMESPACE::ExtensionProperties * pProperties,
+                                                                    Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator = std::allocator<ExtensionProperties>,
-            typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type = 0,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                  = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
-    enumerateInstanceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
+  template <typename ExtensionPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ExtensionProperties>,
+            typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
+    enumerateInstanceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
                                           Dispatch const & d                    VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
-  // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-  template <typename ExtensionPropertiesAllocator = std::allocator<ExtensionProperties>,
-            typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-            typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, ExtensionProperties>::value, int>::type = 0,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                                  = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties, ExtensionPropertiesAllocator>>::type
+  template <
+    typename ExtensionPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::ExtensionProperties>,
+    typename Dispatch                     = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
+    typename std::enable_if<std::is_same<typename ExtensionPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::ExtensionProperties>::value, int>::type = 0>
+  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties, ExtensionPropertiesAllocator>>::type
     enumerateInstanceExtensionProperties( Optional<const std::string>    layerName,
                                           ExtensionPropertiesAllocator & extensionPropertiesAllocator,
                                           Dispatch const & d             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
-  VULKAN_HPP_NODISCARD Result enumerateInstanceLayerProperties( uint32_t *         pPropertyCount,
-                                                                LayerProperties *  pProperties,
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD Result enumerateInstanceLayerProperties( uint32_t *                              pPropertyCount,
+                                                                VULKAN_HPP_NAMESPACE::LayerProperties * pProperties,
                                                                 Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-  template <typename LayerPropertiesAllocator = std::allocator<LayerProperties>,
-            typename Dispatch                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type = 0,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                          = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+  template <typename LayerPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::LayerProperties>, typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
     enumerateInstanceLayerProperties( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
-  // wrapper function for command vkEnumerateInstanceLayerProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-  template <typename LayerPropertiesAllocator = std::allocator<LayerProperties>,
+  template <typename LayerPropertiesAllocator = std::allocator<VULKAN_HPP_NAMESPACE::LayerProperties>,
             typename Dispatch                 = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, LayerProperties>::value, int>::type = 0,
-            typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type                                          = true>
-  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties, LayerPropertiesAllocator>>::type
+            typename std::enable_if<std::is_same<typename LayerPropertiesAllocator::value_type, VULKAN_HPP_NAMESPACE::LayerProperties>::value, int>::type = 0>
+  VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::LayerProperties, LayerPropertiesAllocator>>::type
     enumerateInstanceLayerProperties( LayerPropertiesAllocator & layerPropertiesAllocator, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
   //=== VK_VERSION_1_1 ===
 
-  // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
   VULKAN_HPP_NODISCARD Result enumerateInstanceVersion( uint32_t *         pApiVersion,
                                                         Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT;
 #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
-  // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<detail::isDispatchLoader<Dispatch>::value, bool>::type = true>
+  template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
   VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type enumerateInstanceVersion( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
 #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
 
-  // operators to compare VULKAN_HPP_NAMESPACE::-handles
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator==( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) == static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator!=( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) != static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator<( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) < static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator<=( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) <= static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator>( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) > static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator>=( T const & lhs, T const & rhs )
-  {
-    return static_cast<typename T::NativeType>( lhs ) >= static_cast<typename T::NativeType>( rhs );
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator==( T const & v, std::nullptr_t )
-  {
-    return !v;
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator==( std::nullptr_t, T const & v )
-  {
-    return !v;
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator!=( T const & v, std::nullptr_t )
-  {
-    return !!v;
-  }
-
-  template <typename T, typename std::enable_if<isVulkanHandleType<T>::value, int>::type = 0>
-  bool operator!=( std::nullptr_t, T const & v )
-  {
-    return !!v;
-  }
 }  // namespace VULKAN_HPP_NAMESPACE
+
+// operators to compare vk::-handles with nullptr
+template <typename T>
+typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, bool>::type operator==( const T & v, std::nullptr_t )
+{
+  return !v;
+}
+
+template <typename T>
+typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, bool>::type operator==( std::nullptr_t, const T & v )
+{
+  return !v;
+}
+
+template <typename T>
+typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, bool>::type operator!=( const T & v, std::nullptr_t )
+{
+  return v;
+}
+
+template <typename T>
+typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, bool>::type operator!=( std::nullptr_t, const T & v )
+{
+  return v;
+}
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_hash.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_hash.hpp
index a67ae47d..8adf2577 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_hash.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_hash.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -94,6 +94,15 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::Event>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::Event const & event ) const VULKAN_HPP_NOEXCEPT
+    {
+      return std::hash<VkEvent>{}( static_cast<VkEvent>( event ) );
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::QueryPool>
   {
@@ -112,6 +121,15 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::BufferView>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::BufferView const & bufferView ) const VULKAN_HPP_NOEXCEPT
+    {
+      return std::hash<VkBufferView>{}( static_cast<VkBufferView>( bufferView ) );
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::Image>
   {
@@ -130,42 +148,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandPool>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CommandPool const & commandPool ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkCommandPool>{}( static_cast<VkCommandPool>( commandPool ) );
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CommandBuffer>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CommandBuffer const & commandBuffer ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkCommandBuffer>{}( static_cast<VkCommandBuffer>( commandBuffer ) );
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::Event>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::Event const & event ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkEvent>{}( static_cast<VkEvent>( event ) );
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferView>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BufferView const & bufferView ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkBufferView>{}( static_cast<VkBufferView>( bufferView ) );
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ShaderModule>
   {
@@ -256,17 +238,26 @@ namespace std
     }
   };
 
-  //=== VK_VERSION_1_1 ===
-
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>
+  struct hash<VULKAN_HPP_NAMESPACE::CommandPool>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const & descriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CommandPool const & commandPool ) const VULKAN_HPP_NOEXCEPT
     {
-      return std::hash<VkDescriptorUpdateTemplate>{}( static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ) );
+      return std::hash<VkCommandPool>{}( static_cast<VkCommandPool>( commandPool ) );
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::CommandBuffer>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CommandBuffer const & commandBuffer ) const VULKAN_HPP_NOEXCEPT
+    {
+      return std::hash<VkCommandBuffer>{}( static_cast<VkCommandBuffer>( commandBuffer ) );
+    }
+  };
+
+  //=== VK_VERSION_1_1 ===
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>
   {
@@ -276,6 +267,15 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const & descriptorUpdateTemplate ) const VULKAN_HPP_NOEXCEPT
+    {
+      return std::hash<VkDescriptorUpdateTemplate>{}( static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ) );
+    }
+  };
+
   //=== VK_VERSION_1_3 ===
 
   template <>
@@ -503,26 +503,6 @@ namespace std
     }
   };
 
-  //=== VK_ARM_tensors ===
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorARM const & tensorARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkTensorARM>{}( static_cast<VkTensorARM>( tensorARM ) );
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorViewARM const & tensorViewARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkTensorViewARM>{}( static_cast<VkTensorViewARM>( tensorViewARM ) );
-    }
-  };
-
   //=== VK_NV_optical_flow ===
 
   template <>
@@ -545,59 +525,6 @@ namespace std
     }
   };
 
-  //=== VK_KHR_pipeline_binary ===
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryKHR const & pipelineBinaryKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkPipelineBinaryKHR>{}( static_cast<VkPipelineBinaryKHR>( pipelineBinaryKHR ) );
-    }
-  };
-
-  //=== VK_ARM_data_graph ===
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const & dataGraphPipelineSessionARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkDataGraphPipelineSessionARM>{}( static_cast<VkDataGraphPipelineSessionARM>( dataGraphPipelineSessionARM ) );
-    }
-  };
-
-  //=== VK_NV_external_compute_queue ===
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV const & externalComputeQueueNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkExternalComputeQueueNV>{}( static_cast<VkExternalComputeQueueNV>( externalComputeQueueNV ) );
-    }
-  };
-
-  //=== VK_EXT_device_generated_commands ===
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT const & indirectCommandsLayoutEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkIndirectCommandsLayoutEXT>{}( static_cast<VkIndirectCommandsLayoutEXT>( indirectCommandsLayoutEXT ) );
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT const & indirectExecutionSetEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      return std::hash<VkIndirectExecutionSetEXT>{}( static_cast<VkIndirectExecutionSetEXT>( indirectExecutionSetEXT ) );
-    }
-  };
-
 #if 14 <= VULKAN_HPP_CPP_VERSION
   //======================================
   //=== HASH structures for structures ===
@@ -1135,35 +1062,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD const & antiLagPresentationInfoAMD ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagPresentationInfoAMD.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagPresentationInfoAMD.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagPresentationInfoAMD.stage );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagPresentationInfoAMD.frameIndex );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AntiLagDataAMD>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::AntiLagDataAMD const & antiLagDataAMD ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagDataAMD.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagDataAMD.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagDataAMD.mode );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagDataAMD.maxFPS );
-      VULKAN_HPP_HASH_COMBINE( seed, antiLagDataAMD.pPresentationInfo );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ApplicationInfo>
   {
@@ -1241,19 +1139,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT const & attachmentFeedbackLoopInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, attachmentFeedbackLoopInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, attachmentFeedbackLoopInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, attachmentFeedbackLoopInfoEXT.feedbackLoopEnable );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::AttachmentReference>
   {
@@ -1385,18 +1270,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT const & beginCustomResolveInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, beginCustomResolveInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, beginCustomResolveInfoEXT.pNext );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV>
   {
@@ -1444,24 +1317,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM const & bindDataGraphPipelineSessionMemoryInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.session );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.bindPoint );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.objectIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.memory );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDataGraphPipelineSessionMemoryInfoARM.memoryOffset );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT>
   {
@@ -1479,20 +1334,20 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo const & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR const & bindDescriptorSetsInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.stageFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.layout );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.firstSet );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.descriptorSetCount );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.pDescriptorSets );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.dynamicOffsetCount );
-      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfo.pDynamicOffsets );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.stageFlags );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.layout );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.firstSet );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.descriptorSetCount );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.pDescriptorSets );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.dynamicOffsetCount );
+      VULKAN_HPP_HASH_COMBINE( seed, bindDescriptorSetsInfoKHR.pDynamicOffsets );
       return seed;
     }
   };
@@ -1579,19 +1434,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT const & bindIndexBufferIndirectCommandEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindIndexBufferIndirectCommandEXT.bufferAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, bindIndexBufferIndirectCommandEXT.size );
-      VULKAN_HPP_HASH_COMBINE( seed, bindIndexBufferIndirectCommandEXT.indexType );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandNV>
   {
@@ -1606,14 +1448,14 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindMemoryStatus>
+  struct hash<VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindMemoryStatus const & bindMemoryStatus ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR const & bindMemoryStatusKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatus.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatus.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatus.pResult );
+      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatusKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatusKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, bindMemoryStatusKHR.pResult );
       return seed;
     }
   };
@@ -1771,34 +1613,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM const & bindTensorMemoryInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindTensorMemoryInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, bindTensorMemoryInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, bindTensorMemoryInfoARM.tensor );
-      VULKAN_HPP_HASH_COMBINE( seed, bindTensorMemoryInfoARM.memory );
-      VULKAN_HPP_HASH_COMBINE( seed, bindTensorMemoryInfoARM.memoryOffset );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT const & bindVertexBufferIndirectCommandEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bindVertexBufferIndirectCommandEXT.bufferAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, bindVertexBufferIndirectCommandEXT.size );
-      VULKAN_HPP_HASH_COMBINE( seed, bindVertexBufferIndirectCommandEXT.stride );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandNV>
   {
@@ -2208,14 +2022,14 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo const & bufferUsageFlags2CreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR const & bufferUsageFlags2CreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfo.usage );
+      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, bufferUsageFlags2CreateInfoKHR.usage );
       return seed;
     }
   };
@@ -2237,69 +2051,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV const & stridedDeviceAddressNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressNV.startAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressNV.strideInBytes );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV const &
-                              buildPartitionedAccelerationStructureIndirectCommandNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureIndirectCommandNV.opType );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureIndirectCommandNV.argCount );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureIndirectCommandNV.argData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV const & partitionedAccelerationStructureInstancesInputNV )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.instanceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.maxInstancePerPartitionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.partitionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureInstancesInputNV.maxInstanceInGlobalPartitionCount );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV const & buildPartitionedAccelerationStructureInfoNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.input );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.srcAccelerationStructureData );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.dstAccelerationStructureData );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.scratchData );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.srcInfos );
-      VULKAN_HPP_HASH_COMBINE( seed, buildPartitionedAccelerationStructureInfoNV.srcInfosCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR>
   {
@@ -2366,197 +2117,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const &
-                              clusterAccelerationStructureBuildClustersBottomLevelInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildClustersBottomLevelInfoNV.clusterReferencesCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildClustersBottomLevelInfoNV.clusterReferencesStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildClustersBottomLevelInfoNV.clusterReferences );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const &
-                              clusterAccelerationStructureGeometryIndexAndGeometryFlagsNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureGeometryIndexAndGeometryFlagsNV.geometryIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureGeometryIndexAndGeometryFlagsNV.reserved );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureGeometryIndexAndGeometryFlagsNV.geometryFlags );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV const &
-                              clusterAccelerationStructureBuildTriangleClusterInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.clusterID );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.clusterFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.triangleCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.positionTruncateBitCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.indexType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.baseGeometryIndexAndGeometryFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.indexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.geometryIndexAndFlagsBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.indexBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.geometryIndexAndFlagsBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapArray );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexBuffer );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const &
-                              clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.clusterID );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.clusterFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.triangleCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.vertexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.positionTruncateBitCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.indexType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.opacityMicromapIndexType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.baseGeometryIndexAndGeometryFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.indexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.vertexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.geometryIndexAndFlagsBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.opacityMicromapIndexBufferStride );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.indexBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.vertexBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.geometryIndexAndFlagsBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.opacityMicromapArray );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.opacityMicromapIndexBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.instantiationBoundingBoxLimit );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV const &
-                              clusterAccelerationStructureClustersBottomLevelInputNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureClustersBottomLevelInputNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureClustersBottomLevelInputNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureClustersBottomLevelInputNV.maxTotalClusterCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureClustersBottomLevelInputNV.maxClusterCountPerAccelerationStructure );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV const & clusterAccelerationStructureTriangleClusterInputNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.vertexFormat );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxGeometryIndexValue );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxClusterUniqueGeometryCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxClusterTriangleCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxClusterVertexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxTotalTriangleCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.maxTotalVertexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureTriangleClusterInputNV.minPositionTruncateBitCount );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV const & clusterAccelerationStructureMoveObjectsInputNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInputNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInputNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInputNV.type );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInputNV.noMoveOverlap );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInputNV.maxMovedBytes );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR const & stridedDeviceAddressRegionKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.deviceAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.stride );
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.size );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV const &
-                              clusterAccelerationStructureGetTemplateIndicesInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureGetTemplateIndicesInfoNV.clusterTemplateAddress );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV const &
-                              clusterAccelerationStructureInstantiateClusterInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureInstantiateClusterInfoNV.clusterIdOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureInstantiateClusterInfoNV.geometryIndexOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureInstantiateClusterInfoNV.reserved );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureInstantiateClusterInfoNV.clusterTemplateAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureInstantiateClusterInfoNV.vertexBuffer );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV const & clusterAccelerationStructureMoveObjectsInfoNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, clusterAccelerationStructureMoveObjectsInfoNV.srcAccelerationStructure );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV>
   {
@@ -2881,29 +2441,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV>
-  {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV const & cooperativeMatrixFlexibleDimensionsPropertiesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.MGranularity );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.NGranularity );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.KGranularity );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.AType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.BType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.CType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.ResultType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.saturatingAccumulation );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.scope );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeMatrixFlexibleDimensionsPropertiesNV.workgroupInvocations );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>
   {
@@ -2945,24 +2482,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV const & cooperativeVectorPropertiesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.inputType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.inputInterpretation );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.matrixInterpretation );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.biasInterpretation );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.resultType );
-      VULKAN_HPP_HASH_COMBINE( seed, cooperativeVectorPropertiesNV.transpose );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR>
   {
@@ -3096,166 +2615,119 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToImageInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyImageToImageInfo const & copyImageToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT const & copyImageToImageInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.srcImage );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.srcImageLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.dstImage );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.dstImageLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.regionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfo.pRegions );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.srcImage );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.srcImageLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.dstImage );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.dstImageLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.regionCount );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToImageInfoEXT.pRegions );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageToMemoryCopy>
+  struct hash<VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImageToMemoryCopy const & imageToMemoryCopy ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT const & imageToMemoryCopyEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.pHostPointer );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.memoryRowLength );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.memoryImageHeight );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.imageSubresource );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.imageOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopy.imageExtent );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.pHostPointer );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.memoryRowLength );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.memoryImageHeight );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.imageSubresource );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.imageOffset );
+      VULKAN_HPP_HASH_COMBINE( seed, imageToMemoryCopyEXT.imageExtent );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo const & copyImageToMemoryInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT const & copyImageToMemoryInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.srcImage );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.srcImageLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.regionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfo.pRegions );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.srcImage );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.srcImageLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.regionCount );
+      VULKAN_HPP_HASH_COMBINE( seed, copyImageToMemoryInfoEXT.pRegions );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR const & copyMemoryIndirectCommandKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV const & copyMemoryIndirectCommandNV ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandKHR.srcAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandKHR.dstAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandKHR.size );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandNV.srcAddress );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandNV.dstAddress );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectCommandNV.size );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR const & stridedDeviceAddressRangeKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV const & copyMemoryToImageIndirectCommandNV ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRangeKHR.address );
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRangeKHR.size );
-      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRangeKHR.stride );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.srcAddress );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.bufferRowLength );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.bufferImageHeight );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.imageSubresource );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.imageOffset );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandNV.imageExtent );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR const & copyMemoryIndirectInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT const & memoryToImageCopyEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.srcCopyFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.dstCopyFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.copyCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryIndirectInfoKHR.copyAddressRange );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.pHostPointer );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.memoryRowLength );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.memoryImageHeight );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.imageSubresource );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.imageOffset );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopyEXT.imageExtent );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR const & copyMemoryToImageIndirectCommandKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT const & copyMemoryToImageInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.srcAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.bufferRowLength );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.bufferImageHeight );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.imageSubresource );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.imageOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectCommandKHR.imageExtent );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR const & copyMemoryToImageIndirectInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.srcCopyFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.copyCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.copyAddressRange );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.dstImage );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.dstImageLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageIndirectInfoKHR.pImageSubresources );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryToImageCopy>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryToImageCopy const & memoryToImageCopy ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.pHostPointer );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.memoryRowLength );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.memoryImageHeight );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.imageSubresource );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.imageOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryToImageCopy.imageExtent );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo const & copyMemoryToImageInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.dstImage );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.dstImageLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.regionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfo.pRegions );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.dstImage );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.dstImageLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.regionCount );
+      VULKAN_HPP_HASH_COMBINE( seed, copyMemoryToImageInfoEXT.pRegions );
       return seed;
     }
   };
@@ -3275,38 +2747,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCopyARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorCopyARM const & tensorCopyARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.dimensionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.pSrcOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.pDstOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCopyARM.pExtent );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CopyTensorInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CopyTensorInfoARM const & copyTensorInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.srcTensor );
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.dstTensor );
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.regionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, copyTensorInfoARM.pRegions );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX>
   {
@@ -3362,19 +2802,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX const & cuModuleTexturingModeCreateInfoNVX ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, cuModuleTexturingModeCreateInfoNVX.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, cuModuleTexturingModeCreateInfoNVX.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, cuModuleTexturingModeCreateInfoNVX.use64bitTexturing );
-      return seed;
-    }
-  };
-
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV>
@@ -3436,23 +2863,6 @@ namespace std
   };
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT const & customResolveCreateInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.customResolve );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.colorAttachmentCount );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.pColorAttachmentFormats );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.depthAttachmentFormat );
-      VULKAN_HPP_HASH_COMBINE( seed, customResolveCreateInfoEXT.stencilAttachmentFormat );
-      return seed;
-    }
-  };
-
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::D3D12FenceSubmitInfoKHR>
@@ -3471,283 +2881,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM const & physicalDeviceDataGraphOperationSupportARM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphOperationSupportARM.operationType );
-      for ( size_t i = 0; i < VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphOperationSupportARM.name[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphOperationSupportARM.version );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM const & dataGraphPipelineBuiltinModelCreateInfoQCOM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineBuiltinModelCreateInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineBuiltinModelCreateInfoQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineBuiltinModelCreateInfoQCOM.pOperation );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM const & dataGraphPipelineCompilerControlCreateInfoARM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCompilerControlCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCompilerControlCreateInfoARM.pNext );
-      for ( const char * p = dataGraphPipelineCompilerControlCreateInfoARM.pVendorOptions; *p != '\0'; ++p )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, *p );
-      }
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM const & dataGraphPipelineConstantARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantARM.id );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantARM.pConstantData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const &
-                              dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.dimension );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.zeroCount );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.groupSize );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM const & dataGraphPipelineResourceInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineResourceInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineResourceInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineResourceInfoARM.descriptorSet );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineResourceInfoARM.binding );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineResourceInfoARM.arrayElement );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM const & dataGraphPipelineCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.layout );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.resourceInfoCount );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineCreateInfoARM.pResourceInfos );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM const & dataGraphPipelineDispatchInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineDispatchInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineDispatchInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineDispatchInfoARM.flags );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM const & dataGraphPipelineIdentifierCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineIdentifierCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineIdentifierCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineIdentifierCreateInfoARM.identifierSize );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineIdentifierCreateInfoARM.pIdentifier );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM const & dataGraphPipelineInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineInfoARM.dataGraphPipeline );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM const & dataGraphPipelinePropertyQueryResultARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.property );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.isText );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.dataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelinePropertyQueryResultARM.pData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM>
-  {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM const & dataGraphPipelineSessionBindPointRequirementARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementARM.bindPoint );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementARM.bindPointType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementARM.numObjects );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM const &
-                              dataGraphPipelineSessionBindPointRequirementsInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementsInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementsInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionBindPointRequirementsInfoARM.session );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM const & dataGraphPipelineSessionCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionCreateInfoARM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionCreateInfoARM.dataGraphPipeline );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM const & dataGraphPipelineSessionMemoryRequirementsInfoARM )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionMemoryRequirementsInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionMemoryRequirementsInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionMemoryRequirementsInfoARM.session );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionMemoryRequirementsInfoARM.bindPoint );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineSessionMemoryRequirementsInfoARM.objectIndex );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM const & dataGraphPipelineShaderModuleCreateInfoARM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.module );
-      for ( const char * p = dataGraphPipelineShaderModuleCreateInfoARM.pName; *p != '\0'; ++p )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, *p );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.pSpecializationInfo );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.constantCount );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphPipelineShaderModuleCreateInfoARM.pConstants );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM const & physicalDeviceDataGraphProcessingEngineARM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphProcessingEngineARM.type );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphProcessingEngineARM.isForeign );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM const & dataGraphProcessingEngineCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphProcessingEngineCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphProcessingEngineCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphProcessingEngineCreateInfoARM.processingEngineCount );
-      VULKAN_HPP_HASH_COMBINE( seed, dataGraphProcessingEngineCreateInfoARM.pProcessingEngines );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT>
   {
@@ -3918,35 +3051,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT const & decompressMemoryRegionEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryRegionEXT.srcAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryRegionEXT.dstAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryRegionEXT.compressedSize );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryRegionEXT.decompressedSize );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT const & decompressMemoryInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryInfoEXT.decompressionMethod );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryInfoEXT.regionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, decompressMemoryInfoEXT.pRegions );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV>
   {
@@ -4105,18 +3209,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DepthClampRangeEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DepthClampRangeEXT const & depthClampRangeEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, depthClampRangeEXT.minDepthClamp );
-      VULKAN_HPP_HASH_COMBINE( seed, depthClampRangeEXT.maxDepthClamp );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT>
   {
@@ -4186,19 +3278,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM const & descriptorGetTensorInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, descriptorGetTensorInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, descriptorGetTensorInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, descriptorGetTensorInfoARM.tensorView );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>
   {
@@ -4529,6 +3608,14 @@ namespace std
       VULKAN_HPP_HASH_COMBINE( seed, deviceCreateInfo.flags );
       VULKAN_HPP_HASH_COMBINE( seed, deviceCreateInfo.queueCreateInfoCount );
       VULKAN_HPP_HASH_COMBINE( seed, deviceCreateInfo.pQueueCreateInfos );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceCreateInfo.enabledLayerCount );
+      for ( size_t i = 0; i < deviceCreateInfo.enabledLayerCount; ++i )
+      {
+        for ( const char * p = deviceCreateInfo.ppEnabledLayerNames[i]; *p != '\0'; ++p )
+        {
+          VULKAN_HPP_HASH_COMBINE( seed, *p );
+        }
+      }
       VULKAN_HPP_HASH_COMBINE( seed, deviceCreateInfo.enabledExtensionCount );
       for ( size_t i = 0; i < deviceCreateInfo.enabledExtensionCount; ++i )
       {
@@ -4831,28 +3918,28 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresource2>
+  struct hash<VULKAN_HPP_NAMESPACE::ImageSubresource2KHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImageSubresource2 const & imageSubresource2 ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImageSubresource2KHR const & imageSubresource2KHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2.imageSubresource );
+      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2KHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2KHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, imageSubresource2KHR.imageSubresource );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo const & deviceImageSubresourceInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR const & deviceImageSubresourceInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfo.pCreateInfo );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfo.pSubresource );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfoKHR.pCreateInfo );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceImageSubresourceInfoKHR.pSubresource );
       return seed;
     }
   };
@@ -4903,20 +3990,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR const & devicePipelineBinaryInternalCacheControlKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, devicePipelineBinaryInternalCacheControlKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, devicePipelineBinaryInternalCacheControlKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, devicePipelineBinaryInternalCacheControlKHR.disableInternalCache );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DevicePrivateDataCreateInfo>
   {
@@ -4931,14 +4004,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo const & deviceQueueGlobalPriorityCreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR const & deviceQueueGlobalPriorityCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfo.globalPriority );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, deviceQueueGlobalPriorityCreateInfoKHR.globalPriority );
       return seed;
     }
   };
@@ -4972,54 +4046,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorDescriptionARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorDescriptionARM const & tensorDescriptionARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.tiling );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.format );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.dimensionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.pDimensions );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.pStrides );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDescriptionARM.usage );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorCreateInfoARM const & tensorCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.pDescription );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.sharingMode );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.queueFamilyIndexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCreateInfoARM.pQueueFamilyIndices );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM const & deviceTensorMemoryRequirementsARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, deviceTensorMemoryRequirementsARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceTensorMemoryRequirementsARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, deviceTensorMemoryRequirementsARM.pCreateInfo );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG>
   {
@@ -5079,18 +4105,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM const & dispatchTileInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, dispatchTileInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, dispatchTileInfoQCOM.pNext );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT>
   {
@@ -5155,19 +4169,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV const & displayModeStereoPropertiesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, displayModeStereoPropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, displayModeStereoPropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, displayModeStereoPropertiesNV.hdmi3DSupported );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DisplayNativeHdrSurfaceCapabilitiesAMD>
   {
@@ -5334,19 +4335,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV const & displaySurfaceStereoCreateInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, displaySurfaceStereoCreateInfoNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, displaySurfaceStereoCreateInfoNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, displaySurfaceStereoCreateInfoNV.stereoType );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>
   {
@@ -5376,19 +4364,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT const & drawIndirectCountIndirectCommandEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, drawIndirectCountIndirectCommandEXT.bufferAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, drawIndirectCountIndirectCommandEXT.stride );
-      VULKAN_HPP_HASH_COMBINE( seed, drawIndirectCountIndirectCommandEXT.commandCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandEXT>
   {
@@ -5526,9 +4501,7 @@ namespace std
       std::size_t seed = 0;
       VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.sType );
       VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.minSize );
-      VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.maxSize );
-      VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.sizeGranularity );
+      VULKAN_HPP_HASH_COMBINE( seed, executionGraphPipelineScratchSizeAMDX.size );
       return seed;
     }
   };
@@ -5822,46 +4795,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV const & externalComputeQueueCreateInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueCreateInfoNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueCreateInfoNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueCreateInfoNV.preferredQueue );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV const & externalComputeQueueDataParamsNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDataParamsNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDataParamsNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDataParamsNV.deviceIndex );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV const & externalComputeQueueDeviceCreateInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDeviceCreateInfoNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDeviceCreateInfoNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalComputeQueueDeviceCreateInfoNV.reservedExternalQueues );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ExternalFenceProperties>
   {
@@ -5892,21 +4825,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalFormatOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalFormatOHOS const & externalFormatOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalFormatOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalFormatOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalFormatOHOS.externalFormat );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ExternalFormatQNX>
@@ -6016,19 +4934,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM const & externalMemoryTensorCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalMemoryTensorCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalMemoryTensorCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalMemoryTensorCreateInfoARM.handleTypes );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties>
   {
@@ -6044,19 +4949,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM const & externalTensorPropertiesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, externalTensorPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, externalTensorPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, externalTensorPropertiesARM.externalMemoryProperties );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::FenceCreateInfo>
   {
@@ -6191,20 +5083,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM const & frameBoundaryTensorsARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, frameBoundaryTensorsARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, frameBoundaryTensorsARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, frameBoundaryTensorsARM.tensorCount );
-      VULKAN_HPP_HASH_COMBINE( seed, frameBoundaryTensorsARM.pTensors );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>
   {
@@ -6273,28 +5151,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT const & generatedCommandsInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.shaderStages );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.indirectExecutionSet );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.indirectCommandsLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.indirectAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.indirectAddressSize );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.preprocessAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.preprocessSize );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.maxSequenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.sequenceCountAddress );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsInfoEXT.maxDrawCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV>
   {
@@ -6332,23 +5188,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT const & generatedCommandsMemoryRequirementsInfoEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.indirectExecutionSet );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.indirectCommandsLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.maxSequenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsMemoryRequirementsInfoEXT.maxDrawCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV>
   {
@@ -6366,33 +5205,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT const & generatedCommandsPipelineInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsPipelineInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsPipelineInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsPipelineInfoEXT.pipeline );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT const & generatedCommandsShaderInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsShaderInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsShaderInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsShaderInfoEXT.shaderCount );
-      VULKAN_HPP_HASH_COMBINE( seed, generatedCommandsShaderInfoEXT.pShaders );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV>
   {
@@ -6765,20 +5577,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI const & hdrVividDynamicMetadataHUAWEI ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, hdrVividDynamicMetadataHUAWEI.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, hdrVividDynamicMetadataHUAWEI.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, hdrVividDynamicMetadataHUAWEI.dynamicMetadataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, hdrVividDynamicMetadataHUAWEI.pDynamicMetadata );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT>
   {
@@ -6793,31 +5591,32 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery>
+  struct hash<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery const & hostImageCopyDevicePerformanceQuery ) const VULKAN_HPP_NOEXCEPT
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT const & hostImageCopyDevicePerformanceQueryEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQuery.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQuery.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQuery.optimalDeviceAccess );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQuery.identicalMemoryLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQueryEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQueryEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQueryEXT.optimalDeviceAccess );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageCopyDevicePerformanceQueryEXT.identicalMemoryLayout );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo const & hostImageLayoutTransitionInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT const & hostImageLayoutTransitionInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.image );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.oldLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.newLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfo.subresourceRange );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.image );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.oldLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.newLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, hostImageLayoutTransitionInfoEXT.subresourceRange );
       return seed;
     }
   };
@@ -6838,19 +5637,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_IOS_MVK*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA const & imageAlignmentControlCreateInfoMESA ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, imageAlignmentControlCreateInfoMESA.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, imageAlignmentControlCreateInfoMESA.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, imageAlignmentControlCreateInfoMESA.maximumRequestedAlignment );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ImageBlit>
   {
@@ -7409,22 +6195,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT const & importMemoryMetalHandleInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, importMemoryMetalHandleInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, importMemoryMetalHandleInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, importMemoryMetalHandleInfoEXT.handleType );
-      VULKAN_HPP_HASH_COMBINE( seed, importMemoryMetalHandleInfoEXT.handle );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ImportMemoryWin32HandleInfoKHR>
@@ -7535,21 +6305,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS const & importNativeBufferInfoOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, importNativeBufferInfoOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, importNativeBufferInfoOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, importNativeBufferInfoOHOS.buffer );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::ImportScreenBufferInfoQNX>
@@ -7619,82 +6374,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT const & indirectCommandsExecutionSetTokenEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsExecutionSetTokenEXT.type );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsExecutionSetTokenEXT.shaderStages );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT const & indirectCommandsIndexBufferTokenEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsIndexBufferTokenEXT.mode );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushConstantRange>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushConstantRange const & pushConstantRange ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.stageFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.offset );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.size );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT const & indirectCommandsPushConstantTokenEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsPushConstantTokenEXT.updateRange );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT const & indirectCommandsVertexBufferTokenEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsVertexBufferTokenEXT.vertexBindingUnit );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT const & indirectCommandsLayoutCreateInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.shaderStages );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.indirectStride );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.pipelineLayout );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.tokenCount );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectCommandsLayoutCreateInfoEXT.pTokens );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV>
   {
@@ -7738,53 +6417,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT const & indirectExecutionSetPipelineInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetPipelineInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetPipelineInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetPipelineInfoEXT.initialPipeline );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetPipelineInfoEXT.maxPipelineCount );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT const & indirectExecutionSetShaderLayoutInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderLayoutInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderLayoutInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderLayoutInfoEXT.setLayoutCount );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderLayoutInfoEXT.pSetLayouts );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT const & indirectExecutionSetShaderInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.shaderCount );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.pInitialShaders );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.pSetLayoutInfos );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.maxShaderCount );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.pushConstantRangeCount );
-      VULKAN_HPP_HASH_COMBINE( seed, indirectExecutionSetShaderInfoEXT.pPushConstantRanges );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL>
   {
@@ -8025,20 +6657,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR const & memoryBarrierAccessFlags3KHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryBarrierAccessFlags3KHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryBarrierAccessFlags3KHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryBarrierAccessFlags3KHR.srcAccessMask3 );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryBarrierAccessFlags3KHR.dstAccessMask3 );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfo>
   {
@@ -8053,19 +6671,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM const & memoryDedicatedAllocateInfoTensorARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryDedicatedAllocateInfoTensorARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryDedicatedAllocateInfoTensorARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryDedicatedAllocateInfoTensorARM.tensor );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::MemoryDedicatedRequirements>
   {
@@ -8123,37 +6728,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT const & memoryGetMetalHandleInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetMetalHandleInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetMetalHandleInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetMetalHandleInfoEXT.memory );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetMetalHandleInfoEXT.handleType );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS const & memoryGetNativeBufferInfoOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetNativeBufferInfoOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetNativeBufferInfoOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryGetNativeBufferInfoOHOS.memory );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV>
   {
@@ -8226,17 +6800,17 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryMapInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryMapInfo const & memoryMapInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR const & memoryMapInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.memory );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.offset );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfo.size );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.memory );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.offset );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryMapInfoKHR.size );
       return seed;
     }
   };
@@ -8254,21 +6828,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT const & memoryMetalHandlePropertiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMetalHandlePropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMetalHandlePropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryMetalHandlePropertiesEXT.memoryTypeBits );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::MemoryOpaqueCaptureAddressAllocateInfo>
   {
@@ -8335,15 +6894,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::MemoryUnmapInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryUnmapInfo const & memoryUnmapInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR const & memoryUnmapInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfo.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfo.memory );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfoKHR.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, memoryUnmapInfoKHR.memory );
       return seed;
     }
   };
@@ -8562,74 +7121,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS const & nativeBufferFormatPropertiesOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.format );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.externalFormat );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.formatFeatures );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.samplerYcbcrConversionComponents );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.suggestedYcbcrModel );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.suggestedYcbcrRange );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.suggestedXChromaOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferFormatPropertiesOHOS.suggestedYChromaOffset );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::NativeBufferOHOS const & nativeBufferOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferOHOS.handle );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS const & nativeBufferPropertiesOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferPropertiesOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferPropertiesOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferPropertiesOHOS.allocationSize );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferPropertiesOHOS.memoryTypeBits );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS const & nativeBufferUsageOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferUsageOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferUsageOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, nativeBufferUsageOHOS.OHOSNativeBufferUsage );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::OpaqueCaptureDescriptorDataCreateInfoEXT>
   {
@@ -8735,105 +7226,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV const & partitionedAccelerationStructureFlagsNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureFlagsNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureFlagsNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureFlagsNV.enablePartitionTranslation );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV const &
-                              partitionedAccelerationStructureUpdateInstanceDataNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureUpdateInstanceDataNV.instanceIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureUpdateInstanceDataNV.instanceContributionToHitGroupIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureUpdateInstanceDataNV.accelerationStructure );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV const & partitionedAccelerationStructureWriteInstanceDataNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.transform );
-      for ( size_t i = 0; i < 6; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.explicitAABB[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.instanceID );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.instanceMask );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.instanceContributionToHitGroupIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.instanceFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.instanceIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.partitionIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWriteInstanceDataNV.accelerationStructure );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV const &
-                              partitionedAccelerationStructureWritePartitionTranslationDataNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWritePartitionTranslationDataNV.partitionIndex );
-      for ( size_t i = 0; i < 3; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, partitionedAccelerationStructureWritePartitionTranslationDataNV.partitionTranslation[i] );
-      }
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentStageTimeEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentStageTimeEXT const & presentStageTimeEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentStageTimeEXT.stage );
-      VULKAN_HPP_HASH_COMBINE( seed, presentStageTimeEXT.time );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT const & pastPresentationTimingEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.presentId );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.targetTime );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.presentStageCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.pPresentStages );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.timeDomain );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.timeDomainId );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingEXT.reportComplete );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE>
   {
@@ -8849,60 +7241,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT const & pastPresentationTimingInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingInfoEXT.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingInfoEXT.swapchain );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT const & pastPresentationTimingPropertiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.timingPropertiesCounter );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.timeDomainsCounter );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.presentationTimingCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pastPresentationTimingPropertiesEXT.pPresentationTimings );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM const & perTileBeginInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, perTileBeginInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, perTileBeginInfoQCOM.pNext );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM const & perTileEndInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, perTileEndInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, perTileEndInfoQCOM.pNext );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL>
   {
@@ -8917,36 +7255,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PerformanceCounterARM const & performanceCounterARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterARM.counterID );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM const & performanceCounterDescriptionARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterDescriptionARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterDescriptionARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, performanceCounterDescriptionARM.flags );
-      for ( size_t i = 0; i < VK_MAX_DESCRIPTION_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, performanceCounterDescriptionARM.name[i] );
-      }
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>
   {
@@ -9170,19 +7478,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD const & physicalDeviceAntiLagFeaturesAMD ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceAntiLagFeaturesAMD.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceAntiLagFeaturesAMD.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceAntiLagFeaturesAMD.antiLag );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT>
   {
@@ -9291,41 +7586,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV const &
-                              physicalDeviceClusterAccelerationStructureFeaturesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructureFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructureFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructureFeaturesNV.clusterAccelerationStructure );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV const &
-                              physicalDeviceClusterAccelerationStructurePropertiesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.maxVerticesPerCluster );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.maxTrianglesPerCluster );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.clusterScratchByteAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.clusterByteAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.clusterTemplateByteAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.clusterBottomLevelByteAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.clusterTemplateBoundsByteAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceClusterAccelerationStructurePropertiesNV.maxClusterGeometryIndex );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderFeaturesHUAWEI>
   {
@@ -9409,45 +7669,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV const & physicalDeviceCommandBufferInheritanceFeaturesNV )
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV const & physicalDeviceComputeShaderDerivativesFeaturesNV )
       const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCommandBufferInheritanceFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCommandBufferInheritanceFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCommandBufferInheritanceFeaturesNV.commandBufferInheritance );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & physicalDeviceComputeShaderDerivativesFeaturesKHR )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesKHR.computeDerivativeGroupQuads );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesKHR.computeDerivativeGroupLinear );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & physicalDeviceComputeShaderDerivativesPropertiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesPropertiesKHR.meshAndTaskShaderDerivatives );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesNV.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesNV.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesNV.computeDerivativeGroupQuads );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceComputeShaderDerivativesFeaturesNV.computeDerivativeGroupLinear );
       return seed;
     }
   };
@@ -9489,42 +7720,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV const & physicalDeviceCooperativeMatrix2FeaturesNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixWorkgroupScope );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixFlexibleDimensions );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixReductions );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixConversions );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixPerElementOperations );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixTensorAddressing );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2FeaturesNV.cooperativeMatrixBlockLoads );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV const & physicalDeviceCooperativeMatrix2PropertiesNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2PropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2PropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2PropertiesNV.cooperativeMatrixWorkgroupScopeMaxWorkgroupSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2PropertiesNV.cooperativeMatrixFlexibleDimensionsMaxDimension );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeMatrix2PropertiesNV.cooperativeMatrixWorkgroupScopeReservedSharedMemory );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesKHR>
   {
@@ -9583,53 +7778,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV const & physicalDeviceCooperativeVectorFeaturesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorFeaturesNV.cooperativeVector );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorFeaturesNV.cooperativeVectorTraining );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV const & physicalDeviceCooperativeVectorPropertiesNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.cooperativeVectorSupportedStages );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.cooperativeVectorTrainingFloat16Accumulation );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.cooperativeVectorTrainingFloat32Accumulation );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCooperativeVectorPropertiesNV.maxCooperativeVectorComponents );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & physicalDeviceCopyMemoryIndirectFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectFeaturesKHR.indirectMemoryCopy );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectFeaturesKHR.indirectMemoryToImageCopy );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV>
   {
@@ -9645,15 +7793,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & physicalDeviceCopyMemoryIndirectPropertiesKHR ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV const & physicalDeviceCopyMemoryIndirectPropertiesNV ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesKHR.supportedQueues );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesNV.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesNV.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCopyMemoryIndirectPropertiesNV.supportedQueues );
       return seed;
     }
   };
@@ -9775,51 +7923,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT const & physicalDeviceCustomResolveFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCustomResolveFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCustomResolveFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceCustomResolveFeaturesEXT.customResolve );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM const & physicalDeviceDataGraphFeaturesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.dataGraph );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.dataGraphUpdateAfterBind );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.dataGraphSpecializationConstants );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.dataGraphDescriptorBuffer );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphFeaturesARM.dataGraphShaderModule );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM const & physicalDeviceDataGraphModelFeaturesQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphModelFeaturesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphModelFeaturesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDataGraphModelFeaturesQCOM.dataGraphModel );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV>
   {
@@ -9834,22 +7937,6 @@ namespace std
     }
   };
 
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & physicalDeviceDenseGeometryFormatFeaturesAMDX ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDenseGeometryFormatFeaturesAMDX.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDenseGeometryFormatFeaturesAMDX.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDenseGeometryFormatFeaturesAMDX.denseGeometryFormat );
-      return seed;
-    }
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthBiasControlFeaturesEXT>
   {
@@ -9868,29 +7955,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT const & physicalDeviceDepthClampControlFeaturesEXT ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT const & physicalDeviceDepthClampZeroOneFeaturesEXT ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampControlFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampControlFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampControlFeaturesEXT.depthClampControl );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR const & physicalDeviceDepthClampZeroOneFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesKHR.depthClampZeroOne );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDepthClampZeroOneFeaturesEXT.depthClampZeroOne );
       return seed;
     }
   };
@@ -10017,36 +8090,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM>
-  {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM const & physicalDeviceDescriptorBufferTensorFeaturesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorFeaturesARM.descriptorBufferTensorDescriptors );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM const & physicalDeviceDescriptorBufferTensorPropertiesARM )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorPropertiesARM.tensorCaptureReplayDescriptorDataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorPropertiesARM.tensorViewCaptureReplayDescriptorDataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDescriptorBufferTensorPropertiesARM.tensorDescriptorSize );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>
   {
@@ -10161,21 +8204,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & physicalDeviceDeviceGeneratedCommandsFeaturesEXT )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsFeaturesEXT.deviceGeneratedCommands );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsFeaturesEXT.dynamicGeneratedPipelineLayout );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesNV>
   {
@@ -10190,32 +8218,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & physicalDeviceDeviceGeneratedCommandsPropertiesEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectPipelineCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectShaderObjectCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectSequenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectCommandsTokenCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectCommandsTokenOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.maxIndirectCommandsIndirectStride );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.supportedIndirectCommandsInputModes );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.supportedIndirectCommandsShaderStages );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.supportedIndirectCommandsShaderStagesPipelineBinding );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.supportedIndirectCommandsShaderStagesShaderBinding );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.deviceGeneratedCommandsTransformFeedback );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDeviceGeneratedCommandsPropertiesEXT.deviceGeneratedCommandsMultiDrawIndirectCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesNV>
   {
@@ -10367,15 +8369,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR>
   {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures const & physicalDeviceDynamicRenderingLocalReadFeatures ) const VULKAN_HPP_NOEXCEPT
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & physicalDeviceDynamicRenderingLocalReadFeaturesKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeatures.dynamicRenderingLocalRead );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceDynamicRenderingLocalReadFeaturesKHR.dynamicRenderingLocalRead );
       return seed;
     }
   };
@@ -10542,21 +8545,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV const & physicalDeviceExternalComputeQueuePropertiesNV ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalComputeQueuePropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalComputeQueuePropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalComputeQueuePropertiesNV.externalDataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalComputeQueuePropertiesNV.maxExternalQueues );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo>
   {
@@ -10677,21 +8665,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM const & physicalDeviceExternalTensorInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalTensorInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalTensorInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalTensorInfoARM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalTensorInfoARM.pDescription );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceExternalTensorInfoARM.handleType );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFaultFeaturesEXT>
   {
@@ -10749,19 +8722,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM const & physicalDeviceFormatPackFeaturesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFormatPackFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFormatPackFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFormatPackFeaturesARM.formatPack );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMap2FeaturesEXT>
   {
@@ -10810,58 +8770,30 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const &
-                              physicalDeviceFragmentDensityMapLayeredFeaturesVALVE ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredFeaturesVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredFeaturesVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredFeaturesVALVE.fragmentDensityMapLayered );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const &
-                              physicalDeviceFragmentDensityMapLayeredPropertiesVALVE ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredPropertiesVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredPropertiesVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapLayeredPropertiesVALVE.maxFragmentDensityMapLayers );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & physicalDeviceFragmentDensityMapOffsetFeaturesEXT )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesEXT.fragmentDensityMapOffset );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & physicalDeviceFragmentDensityMapOffsetPropertiesEXT ) const
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & physicalDeviceFragmentDensityMapOffsetFeaturesQCOM ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesEXT.fragmentDensityOffsetGranularity );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesQCOM.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesQCOM.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetFeaturesQCOM.fragmentDensityMapOffset );
+      return seed;
+    }
+  };
+
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const &
+                              physicalDeviceFragmentDensityMapOffsetPropertiesQCOM ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesQCOM.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesQCOM.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceFragmentDensityMapOffsetPropertiesQCOM.fragmentDensityOffsetGranularity );
       return seed;
     }
   };
@@ -11033,15 +8965,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures const & physicalDeviceGlobalPriorityQueryFeatures ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & physicalDeviceGlobalPriorityQueryFeaturesKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeatures.globalPriorityQuery );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceGlobalPriorityQueryFeaturesKHR.globalPriorityQuery );
       return seed;
     }
   };
@@ -11095,49 +9027,37 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI const & physicalDeviceHdrVividFeaturesHUAWEI ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHdrVividFeaturesHUAWEI.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHdrVividFeaturesHUAWEI.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHdrVividFeaturesHUAWEI.hdrVivid );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures const & physicalDeviceHostImageCopyFeatures ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeatures.hostImageCopy );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties const & physicalDeviceHostImageCopyProperties ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT const & physicalDeviceHostImageCopyFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.copySrcLayoutCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.pCopySrcLayouts );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.copyDstLayoutCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.pCopyDstLayouts );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyFeaturesEXT.hostImageCopy );
+      return seed;
+    }
+  };
+
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT>
+  {
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT const & physicalDeviceHostImageCopyPropertiesEXT ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.copySrcLayoutCount );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.pCopySrcLayouts );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.copyDstLayoutCount );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.pCopyDstLayouts );
       for ( size_t i = 0; i < VK_UUID_SIZE; ++i )
       {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.optimalTilingLayoutUUID[i] );
+        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.optimalTilingLayoutUUID[i] );
       }
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyProperties.identicalMemoryTypeRequirements );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceHostImageCopyPropertiesEXT.identicalMemoryTypeRequirements );
       return seed;
     }
   };
@@ -11196,34 +9116,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA>
-  {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA const & physicalDeviceImageAlignmentControlFeaturesMESA ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlFeaturesMESA.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlFeaturesMESA.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlFeaturesMESA.imageAlignmentControl );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA const & physicalDeviceImageAlignmentControlPropertiesMESA )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlPropertiesMESA.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlPropertiesMESA.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceImageAlignmentControlPropertiesMESA.supportedImageAlignmentMask );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageCompressionControlFeaturesEXT>
   {
@@ -11418,14 +9310,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features const & physicalDeviceIndexTypeUint8Features ) const VULKAN_HPP_NOEXCEPT
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR const & physicalDeviceIndexTypeUint8FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8Features.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8Features.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8Features.indexTypeUint8 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8FeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8FeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceIndexTypeUint8FeaturesKHR.indexTypeUint8 );
       return seed;
     }
   };
@@ -11492,36 +9385,29 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR const & physicalDeviceLayeredApiPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT const & physicalDeviceLayeredDriverPropertiesMSFT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.vendorID );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.deviceID );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.layeredAPI );
-      for ( size_t i = 0; i < VK_MAX_PHYSICAL_DEVICE_NAME_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesKHR.deviceName[i] );
-      }
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.underlyingAPI );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR const & physicalDeviceLayeredApiPropertiesListKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT const & physicalDeviceLegacyDitheringFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesListKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesListKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesListKHR.layeredApiCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiPropertiesListKHR.pLayeredApis );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.legacyDithering );
       return seed;
     }
   };
@@ -11661,157 +9547,34 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties const & physicalDeviceSparseProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard2DBlockShape );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard2DMultisampleBlockShape );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard3DBlockShape );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyAlignedMipSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyNonResidentStrict );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties const & physicalDeviceProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.apiVersion );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.driverVersion );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.vendorID );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceID );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceType );
-      for ( size_t i = 0; i < VK_MAX_PHYSICAL_DEVICE_NAME_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceName[i] );
-      }
-      for ( size_t i = 0; i < VK_UUID_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.pipelineCacheUUID[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.limits );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.sparseProperties );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 const & physicalDeviceProperties2 ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.properties );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR const & physicalDeviceLayeredApiVulkanPropertiesKHR ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR const & physicalDeviceLineRasterizationFeaturesKHR ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiVulkanPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiVulkanPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredApiVulkanPropertiesKHR.properties );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.rectangularLines );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.bresenhamLines );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.smoothLines );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.stippledRectangularLines );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.stippledBresenhamLines );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeaturesKHR.stippledSmoothLines );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT const & physicalDeviceLayeredDriverPropertiesMSFT ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR const & physicalDeviceLineRasterizationPropertiesKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLayeredDriverPropertiesMSFT.underlyingAPI );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT const & physicalDeviceLegacyDitheringFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyDitheringFeaturesEXT.legacyDithering );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT>
-  {
-    std::size_t operator()(
-      VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & physicalDeviceLegacyVertexAttributesFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesFeaturesEXT.legacyVertexAttributes );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & physicalDeviceLegacyVertexAttributesPropertiesEXT )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLegacyVertexAttributesPropertiesEXT.nativeUnalignedPerformance );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures const & physicalDeviceLineRasterizationFeatures ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.rectangularLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.bresenhamLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.smoothLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.stippledRectangularLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.stippledBresenhamLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationFeatures.stippledSmoothLines );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties const & physicalDeviceLineRasterizationProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationProperties.lineSubPixelPrecisionBits );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationPropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationPropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceLineRasterizationPropertiesKHR.lineSubPixelPrecisionBits );
       return seed;
     }
   };
@@ -11830,36 +9593,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR const & physicalDeviceMaintenance10FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10FeaturesKHR.maintenance10 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR const & physicalDeviceMaintenance10PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10PropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10PropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10PropertiesKHR.rgba4OpaqueBlackSwizzled );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10PropertiesKHR.resolveSrgbFormatAppliesTransferFunction );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance10PropertiesKHR.resolveSrgbFormatSupportsTransferFunctionControl );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance3Properties>
   {
@@ -11901,138 +9634,64 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features const & physicalDeviceMaintenance5Features ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Features.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Features.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Features.maintenance5 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties const & physicalDeviceMaintenance5Properties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.earlyFragmentMultisampleCoverageAfterSampleCounting );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.earlyFragmentSampleMaskTestBeforeSampleCounting );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.depthStencilSwizzleOneSupport );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.polygonModePointSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.nonStrictSinglePixelWideLinesUseParallelogram );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5Properties.nonStrictWideLinesUseParallelogram );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features const & physicalDeviceMaintenance6Features ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Features.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Features.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Features.maintenance6 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties const & physicalDeviceMaintenance6Properties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Properties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Properties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Properties.blockTexelViewCompatibleMultipleLayers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Properties.maxCombinedImageSamplerDescriptorCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6Properties.fragmentShadingRateClampCombinerInputs );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR const & physicalDeviceMaintenance7FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR const & physicalDeviceMaintenance5FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7FeaturesKHR.maintenance7 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5FeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5FeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5FeaturesKHR.maintenance5 );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR const & physicalDeviceMaintenance7PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR const & physicalDeviceMaintenance5PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.robustFragmentShadingRateAttachmentAccess );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.separateDepthStencilAttachmentAccess );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetTotalUniformBuffersDynamic );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetTotalStorageBuffersDynamic );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetTotalBuffersDynamic );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance7PropertiesKHR.maxDescriptorSetUpdateAfterBindTotalBuffersDynamic );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.earlyFragmentMultisampleCoverageAfterSampleCounting );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.earlyFragmentSampleMaskTestBeforeSampleCounting );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.depthStencilSwizzleOneSupport );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.polygonModePointSize );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.nonStrictSinglePixelWideLinesUseParallelogram );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance5PropertiesKHR.nonStrictWideLinesUseParallelogram );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR const & physicalDeviceMaintenance8FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR const & physicalDeviceMaintenance6FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance8FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance8FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance8FeaturesKHR.maintenance8 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6FeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6FeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6FeaturesKHR.maintenance6 );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR const & physicalDeviceMaintenance9FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR const & physicalDeviceMaintenance6PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9FeaturesKHR.maintenance9 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR const & physicalDeviceMaintenance9PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9PropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9PropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9PropertiesKHR.image2DViewOf3DSparse );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance9PropertiesKHR.defaultVertexAttributeValue );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6PropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6PropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6PropertiesKHR.blockTexelViewCompatibleMultipleLayers );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6PropertiesKHR.maxCombinedImageSamplerDescriptorCount );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMaintenance6PropertiesKHR.fragmentShadingRateClampCombinerInputs );
       return seed;
     }
   };
@@ -12089,30 +9748,30 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT const & physicalDeviceMemoryDecompressionFeaturesEXT ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV const & physicalDeviceMemoryDecompressionFeaturesNV ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesEXT.memoryDecompression );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesNV.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesNV.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionFeaturesNV.memoryDecompression );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT const & physicalDeviceMemoryDecompressionPropertiesEXT ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV const & physicalDeviceMemoryDecompressionPropertiesNV ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesEXT.decompressionMethods );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesEXT.maxDecompressionIndirectCount );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesNV.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesNV.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesNV.decompressionMethods );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceMemoryDecompressionPropertiesNV.maxDecompressionIndirectCount );
       return seed;
     }
   };
@@ -12549,34 +10208,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV const &
-                              physicalDevicePartitionedAccelerationStructureFeaturesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructureFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructureFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructureFeaturesNV.partitionedAccelerationStructure );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV const &
-                              physicalDevicePartitionedAccelerationStructurePropertiesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructurePropertiesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructurePropertiesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePartitionedAccelerationStructurePropertiesNV.maxPartitionCount );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerStageDescriptorSetFeaturesNV>
   {
@@ -12592,38 +10223,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM const &
-                              physicalDevicePerformanceCountersByRegionFeaturesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionFeaturesARM.performanceCountersByRegion );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM const &
-                              physicalDevicePerformanceCountersByRegionPropertiesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.maxPerRegionPerformanceCounters );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.performanceCounterRegionSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.rowStrideAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.regionAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePerformanceCountersByRegionPropertiesARM.identityTransformOrder );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceQueryFeaturesKHR>
   {
@@ -12653,52 +10252,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR const & physicalDevicePipelineBinaryFeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryFeaturesKHR.pipelineBinaries );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR const & physicalDevicePipelineBinaryPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pipelineBinaryInternalCache );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pipelineBinaryInternalCacheControl );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pipelineBinaryPrefersInternalCache );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pipelineBinaryPrecompiledInternalCache );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineBinaryPropertiesKHR.pipelineBinaryCompressedData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const &
-                              physicalDevicePipelineCacheIncrementalModeFeaturesSEC ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineCacheIncrementalModeFeaturesSEC.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineCacheIncrementalModeFeaturesSEC.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineCacheIncrementalModeFeaturesSEC.pipelineCacheIncrementalMode );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>
   {
@@ -12742,20 +10295,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM const & physicalDevicePipelineOpacityMicromapFeaturesARM )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineOpacityMicromapFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineOpacityMicromapFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineOpacityMicromapFeaturesARM.pipelineOpacityMicromap );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelinePropertiesFeaturesEXT>
   {
@@ -12771,46 +10310,46 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures const & physicalDevicePipelineProtectedAccessFeatures ) const
-      VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT const & physicalDevicePipelineProtectedAccessFeaturesEXT )
+      const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeatures.pipelineProtectedAccess );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineProtectedAccessFeaturesEXT.pipelineProtectedAccess );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures const & physicalDevicePipelineRobustnessFeatures ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT const & physicalDevicePipelineRobustnessFeaturesEXT ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeatures.pipelineRobustness );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessFeaturesEXT.pipelineRobustness );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties const & physicalDevicePipelineRobustnessProperties ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT const & physicalDevicePipelineRobustnessPropertiesEXT ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.defaultRobustnessStorageBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.defaultRobustnessUniformBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.defaultRobustnessVertexInputs );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessProperties.defaultRobustnessImages );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.defaultRobustnessStorageBuffers );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.defaultRobustnessUniformBuffers );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.defaultRobustnessVertexInputs );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePipelineRobustnessPropertiesEXT.defaultRobustnessImages );
       return seed;
     }
   };
@@ -12889,19 +10428,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR const & physicalDevicePresentId2FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentId2FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentId2FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentId2FeaturesKHR.presentId2 );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentIdFeaturesKHR>
   {
@@ -12915,67 +10441,6 @@ namespace std
     }
   };
 
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV const & physicalDevicePresentMeteringFeaturesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentMeteringFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentMeteringFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentMeteringFeaturesNV.presentMetering );
-      return seed;
-    }
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & physicalDevicePresentModeFifoLatestReadyFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentModeFifoLatestReadyFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentModeFifoLatestReadyFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentModeFifoLatestReadyFeaturesKHR.presentModeFifoLatestReady );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT const & physicalDevicePresentTimingFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentTimingFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentTimingFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentTimingFeaturesEXT.presentTiming );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentTimingFeaturesEXT.presentAtAbsoluteTime );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentTimingFeaturesEXT.presentAtRelativeTime );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR const & physicalDevicePresentWait2FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentWait2FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentWait2FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentWait2FeaturesKHR.presentWait2 );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWaitFeaturesKHR>
   {
@@ -12989,22 +10454,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS const & physicalDevicePresentationPropertiesOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentationPropertiesOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentationPropertiesOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePresentationPropertiesOHOS.sharedImage );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>
   {
@@ -13049,6 +10498,59 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties const & physicalDeviceSparseProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard2DBlockShape );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard2DMultisampleBlockShape );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyStandard3DBlockShape );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyAlignedMipSize );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSparseProperties.residencyNonResidentStrict );
+      return seed;
+    }
+  };
+
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties const & physicalDeviceProperties ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.apiVersion );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.driverVersion );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.vendorID );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceID );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceType );
+      for ( size_t i = 0; i < VK_MAX_PHYSICAL_DEVICE_NAME_SIZE; ++i )
+      {
+        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.deviceName[i] );
+      }
+      for ( size_t i = 0; i < VK_UUID_SIZE; ++i )
+      {
+        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.pipelineCacheUUID[i] );
+      }
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.limits );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties.sparseProperties );
+      return seed;
+    }
+  };
+
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 const & physicalDeviceProperties2 ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceProperties2.properties );
+      return seed;
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryFeatures>
   {
@@ -13108,30 +10610,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties const & physicalDevicePushDescriptorProperties ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR const & physicalDevicePushDescriptorPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorProperties.maxPushDescriptors );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const &
-                              physicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM.queueFamilyIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM.engineType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorPropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorPropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDevicePushDescriptorPropertiesKHR.maxPushDescriptors );
       return seed;
     }
   };
@@ -13193,20 +10680,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const &
-                              physicalDeviceRayTracingInvocationReorderFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderFeaturesEXT.rayTracingInvocationReorder );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesNV>
   {
@@ -13222,21 +10695,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const &
-                              physicalDeviceRayTracingInvocationReorderPropertiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderPropertiesEXT.rayTracingInvocationReorderReorderingHint );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingInvocationReorderPropertiesEXT.maxShaderBindingTableRecordIndex );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesNV>
   {
@@ -13251,21 +10709,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const &
-                              physicalDeviceRayTracingLinearSweptSpheresFeaturesNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingLinearSweptSpheresFeaturesNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingLinearSweptSpheresFeaturesNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingLinearSweptSpheresFeaturesNV.spheres );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRayTracingLinearSweptSpheresFeaturesNV.linearSweptSpheres );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMaintenance1FeaturesKHR>
   {
@@ -13442,31 +10885,31 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR const & physicalDeviceRobustness2FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT const & physicalDeviceRobustness2FeaturesEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesKHR.robustBufferAccess2 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesKHR.robustImageAccess2 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesKHR.nullDescriptor );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesEXT.robustBufferAccess2 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesEXT.robustImageAccess2 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2FeaturesEXT.nullDescriptor );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR const & physicalDeviceRobustness2PropertiesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT const & physicalDeviceRobustness2PropertiesEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesKHR.robustStorageBufferAccessSizeAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesKHR.robustUniformBufferAccessSizeAlignment );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesEXT.robustStorageBufferAccessSizeAlignment );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceRobustness2PropertiesEXT.robustUniformBufferAccessSizeAlignment );
       return seed;
     }
   };
@@ -13577,20 +11020,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT const & physicalDeviceShader64BitIndexingFeaturesEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShader64BitIndexingFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShader64BitIndexingFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShader64BitIndexingFeaturesEXT.shader64BitIndexing );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>
   {
@@ -13670,22 +11099,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR const & physicalDeviceShaderBfloat16FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderBfloat16FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderBfloat16FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderBfloat16FeaturesKHR.shaderBFloat16Type );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderBfloat16FeaturesKHR.shaderBFloat16DotProduct );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderBfloat16FeaturesKHR.shaderBFloat16CooperativeMatrix );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderClockFeaturesKHR>
   {
@@ -13841,7 +11254,6 @@ namespace std
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueueFeaturesAMDX.sType );
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueueFeaturesAMDX.pNext );
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueueFeaturesAMDX.shaderEnqueue );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueueFeaturesAMDX.shaderMeshEnqueue );
       return seed;
     }
   };
@@ -13862,26 +11274,21 @@ namespace std
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueuePropertiesAMDX.maxExecutionGraphShaderPayloadSize );
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueuePropertiesAMDX.maxExecutionGraphShaderPayloadCount );
       VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueuePropertiesAMDX.executionGraphDispatchAddressAlignment );
-      for ( size_t i = 0; i < 3; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueuePropertiesAMDX.maxExecutionGraphWorkgroupCount[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderEnqueuePropertiesAMDX.maxExecutionGraphWorkgroups );
       return seed;
     }
   };
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures const & physicalDeviceShaderExpectAssumeFeatures ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR const & physicalDeviceShaderExpectAssumeFeaturesKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeatures.shaderExpectAssume );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderExpectAssumeFeaturesKHR.shaderExpectAssume );
       return seed;
     }
   };
@@ -13902,45 +11309,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT const & physicalDeviceShaderFloat8FeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloat8FeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloat8FeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloat8FeaturesEXT.shaderFloat8 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloat8FeaturesEXT.shaderFloat8CooperativeMatrix );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features const & physicalDeviceShaderFloatControls2Features ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR const & physicalDeviceShaderFloatControls2FeaturesKHR ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2Features.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2Features.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2Features.shaderFloatControls2 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR const & physicalDeviceShaderFmaFeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFmaFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFmaFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFmaFeaturesKHR.shaderFmaFloat16 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFmaFeaturesKHR.shaderFmaFloat32 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFmaFeaturesKHR.shaderFmaFloat64 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2FeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2FeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderFloatControls2FeaturesKHR.shaderFloatControls2 );
       return seed;
     }
   };
@@ -14139,35 +11516,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const &
-                              physicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR.shaderRelaxedExtendedInstruction );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & physicalDeviceShaderReplicatedCompositesFeaturesEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderReplicatedCompositesFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderReplicatedCompositesFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderReplicatedCompositesFeaturesEXT.shaderReplicatedComposites );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSMBuiltinsFeaturesNV>
   {
@@ -14212,16 +11560,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures const & physicalDeviceShaderSubgroupRotateFeatures ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & physicalDeviceShaderSubgroupRotateFeaturesKHR ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeatures.shaderSubgroupRotate );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeatures.shaderSubgroupRotateClustered );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeaturesKHR.shaderSubgroupRotate );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderSubgroupRotateFeaturesKHR.shaderSubgroupRotateClustered );
       return seed;
     }
   };
@@ -14286,34 +11634,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const &
-                              physicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT.shaderUniformBufferUnsizedArray );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR const & physicalDeviceShaderUntypedPointersFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUntypedPointersFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUntypedPointersFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceShaderUntypedPointersFeaturesKHR.shaderUntypedPointers );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShadingRateImageFeaturesNV>
   {
@@ -14466,15 +11786,15 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & physicalDeviceSwapchainMaintenance1FeaturesKHR ) const
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & physicalDeviceSwapchainMaintenance1FeaturesEXT ) const
       VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesKHR.swapchainMaintenance1 );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceSwapchainMaintenance1FeaturesEXT.swapchainMaintenance1 );
       return seed;
     }
   };
@@ -14493,49 +11813,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM const & physicalDeviceTensorFeaturesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.tensorNonPacked );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.shaderTensorAccess );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.shaderStorageTensorArrayDynamicIndexing );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.shaderStorageTensorArrayNonUniformIndexing );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.descriptorBindingStorageTensorUpdateAfterBind );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorFeaturesARM.tensors );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM const & physicalDeviceTensorPropertiesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorDimensionCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorElements );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxPerDimensionTensorElements );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorStride );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorShaderAccessArrayLength );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxTensorShaderAccessSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxDescriptorSetStorageTensors );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxPerStageDescriptorSetStorageTensors );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxDescriptorSetUpdateAfterBindStorageTensors );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.maxPerStageDescriptorUpdateAfterBindStorageTensors );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.shaderStorageTensorArrayNonUniformIndexingNative );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTensorPropertiesARM.shaderTensorSupportedStages );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentFeaturesEXT>
   {
@@ -14581,35 +11858,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM const & physicalDeviceTileMemoryHeapFeaturesQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapFeaturesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapFeaturesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapFeaturesQCOM.tileMemoryHeap );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM const & physicalDeviceTileMemoryHeapPropertiesQCOM ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapPropertiesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapPropertiesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapPropertiesQCOM.queueSubmitBoundary );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileMemoryHeapPropertiesQCOM.tileBufferTransfers );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTilePropertiesFeaturesQCOM>
   {
@@ -14624,50 +11872,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM const & physicalDeviceTileShadingFeaturesQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShading );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingFragmentStage );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingColorAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingDepthAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingStencilAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingInputAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingSampledAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingPerTileDraw );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingPerTileDispatch );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingDispatchTile );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingApron );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingAnisotropicApron );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingAtomicOps );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingFeaturesQCOM.tileShadingImageProcessing );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM const & physicalDeviceTileShadingPropertiesQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.maxApronSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.preferNonCoherent );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.tileGranularity );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceTileShadingPropertiesQCOM.maxTileShadingRate );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceTimelineSemaphoreFeatures>
   {
@@ -14763,21 +11967,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & physicalDeviceUnifiedImageLayoutsFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceUnifiedImageLayoutsFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceUnifiedImageLayoutsFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceUnifiedImageLayoutsFeaturesKHR.unifiedImageLayouts );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceUnifiedImageLayoutsFeaturesKHR.unifiedImageLayoutsVideo );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>
   {
@@ -14808,31 +11997,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures const & physicalDeviceVertexAttributeDivisorFeatures ) const
-      VULKAN_HPP_NOEXCEPT
+    std::size_t operator()(
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & physicalDeviceVertexAttributeDivisorFeaturesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeatures.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeatures.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeatures.vertexAttributeInstanceRateDivisor );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeatures.vertexAttributeInstanceRateZeroDivisor );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties const & physicalDeviceVertexAttributeDivisorProperties ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorProperties.maxVertexAttribDivisor );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorProperties.supportsNonZeroFirstInstance );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeaturesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeaturesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeaturesKHR.vertexAttributeInstanceRateDivisor );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorFeaturesKHR.vertexAttributeInstanceRateZeroDivisor );
       return seed;
     }
   };
@@ -14852,16 +12026,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT>
+  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & physicalDeviceVertexAttributeRobustnessFeaturesEXT ) const
-      VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & physicalDeviceVertexAttributeDivisorPropertiesKHR )
+      const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeRobustnessFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeRobustnessFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeRobustnessFeaturesEXT.vertexAttributeRobustness );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorPropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorPropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorPropertiesKHR.maxVertexAttribDivisor );
+      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVertexAttributeDivisorPropertiesKHR.supportsNonZeroFirstInstance );
       return seed;
     }
   };
@@ -14880,48 +12054,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR const & physicalDeviceVideoDecodeVP9FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoDecodeVP9FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoDecodeVP9FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoDecodeVP9FeaturesKHR.videoDecodeVP9 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR const & physicalDeviceVideoEncodeAV1FeaturesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeAV1FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeAV1FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeAV1FeaturesKHR.videoEncodeAV1 );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & physicalDeviceVideoEncodeIntraRefreshFeaturesKHR )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeIntraRefreshFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeIntraRefreshFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeIntraRefreshFeaturesKHR.videoEncodeIntraRefresh );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR>
   {
@@ -14953,36 +12085,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & physicalDeviceVideoEncodeQuantizationMapFeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeQuantizationMapFeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeQuantizationMapFeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeQuantizationMapFeaturesKHR.videoEncodeQuantizationMap );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & physicalDeviceVideoEncodeRgbConversionFeaturesVALVE ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeRgbConversionFeaturesVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeRgbConversionFeaturesVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoEncodeRgbConversionFeaturesVALVE.videoEncodeRgbConversion );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR>
   {
@@ -15010,20 +12112,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR const & physicalDeviceVideoMaintenance2FeaturesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoMaintenance2FeaturesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoMaintenance2FeaturesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVideoMaintenance2FeaturesKHR.videoMaintenance2 );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan11Features>
   {
@@ -15297,79 +12385,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features const & physicalDeviceVulkan14Features ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.globalPriorityQuery );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.shaderSubgroupRotate );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.shaderSubgroupRotateClustered );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.shaderFloatControls2 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.shaderExpectAssume );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.rectangularLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.bresenhamLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.smoothLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.stippledRectangularLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.stippledBresenhamLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.stippledSmoothLines );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.vertexAttributeInstanceRateDivisor );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.vertexAttributeInstanceRateZeroDivisor );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.indexTypeUint8 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.dynamicRenderingLocalRead );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.maintenance5 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.maintenance6 );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.pipelineProtectedAccess );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.pipelineRobustness );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.hostImageCopy );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Features.pushDescriptor );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties const & physicalDeviceVulkan14Properties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.lineSubPixelPrecisionBits );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.maxVertexAttribDivisor );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.supportsNonZeroFirstInstance );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.maxPushDescriptors );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.dynamicRenderingLocalReadDepthStencilAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.dynamicRenderingLocalReadMultisampledAttachments );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.earlyFragmentMultisampleCoverageAfterSampleCounting );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.earlyFragmentSampleMaskTestBeforeSampleCounting );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.depthStencilSwizzleOneSupport );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.polygonModePointSize );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.nonStrictSinglePixelWideLinesUseParallelogram );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.nonStrictWideLinesUseParallelogram );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.blockTexelViewCompatibleMultipleLayers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.maxCombinedImageSamplerDescriptorCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.fragmentShadingRateClampCombinerInputs );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.defaultRobustnessStorageBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.defaultRobustnessUniformBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.defaultRobustnessVertexInputs );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.defaultRobustnessImages );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.copySrcLayoutCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.pCopySrcLayouts );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.copyDstLayoutCount );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.pCopyDstLayouts );
-      for ( size_t i = 0; i < VK_UUID_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.optimalTilingLayoutUUID[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceVulkan14Properties.identicalMemoryTypeRequirements );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures>
   {
@@ -15445,21 +12460,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & physicalDeviceZeroInitializeDeviceMemoryFeaturesEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceZeroInitializeDeviceMemoryFeaturesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceZeroInitializeDeviceMemoryFeaturesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, physicalDeviceZeroInitializeDeviceMemoryFeaturesEXT.zeroInitializeDeviceMemory );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>
   {
@@ -15475,116 +12475,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR const & pipelineBinaryKeyKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeyKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeyKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeyKHR.keySize );
-      for ( size_t i = 0; i < VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeyKHR.key[i] );
-      }
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR const & pipelineBinaryDataKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryDataKHR.dataSize );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryDataKHR.pData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR const & pipelineBinaryKeysAndDataKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeysAndDataKHR.binaryCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeysAndDataKHR.pPipelineBinaryKeys );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryKeysAndDataKHR.pPipelineBinaryData );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR const & pipelineCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateInfoKHR.pNext );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR const & pipelineBinaryCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryCreateInfoKHR.pKeysAndDataInfo );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryCreateInfoKHR.pipeline );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryCreateInfoKHR.pPipelineCreateInfo );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR const & pipelineBinaryDataInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryDataInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryDataInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryDataInfoKHR.pipelineBinary );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR const & pipelineBinaryHandlesInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryHandlesInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryHandlesInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryHandlesInfoKHR.pipelineBinaryCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryHandlesInfoKHR.pPipelineBinaries );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR const & pipelineBinaryInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryInfoKHR.binaryCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineBinaryInfoKHR.pPipelineBinaries );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo>
   {
@@ -15600,25 +12490,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM const & pipelineCacheHeaderVersionDataGraphQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCacheHeaderVersionDataGraphQCOM.headerSize );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCacheHeaderVersionDataGraphQCOM.headerVersion );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCacheHeaderVersionDataGraphQCOM.cacheType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCacheHeaderVersionDataGraphQCOM.cacheVersion );
-      for ( size_t i = 0; i < VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, pipelineCacheHeaderVersionDataGraphQCOM.toolchainVersion[i] );
-      }
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>
   {
@@ -15730,14 +12601,14 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo const & pipelineCreateFlags2CreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR const & pipelineCreateFlags2CreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfo.flags );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineCreateFlags2CreateInfoKHR.flags );
       return seed;
     }
   };
@@ -15846,20 +12717,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE const & pipelineFragmentDensityMapLayeredCreateInfoVALVE )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineFragmentDensityMapLayeredCreateInfoVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineFragmentDensityMapLayeredCreateInfoVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineFragmentDensityMapLayeredCreateInfoVALVE.maxFragmentDensityMapLayers );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateEnumStateCreateInfoNV>
   {
@@ -15924,6 +12781,19 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::PushConstantRange>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushConstantRange const & pushConstantRange ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.stageFlags );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.offset );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantRange.size );
+      return seed;
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>
   {
@@ -15990,18 +12860,18 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo const & pipelineRasterizationLineStateCreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR const & pipelineRasterizationLineStateCreateInfoKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.lineRasterizationMode );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.stippledLineEnable );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.lineStippleFactor );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfo.lineStipplePattern );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.lineRasterizationMode );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.stippledLineEnable );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.lineStippleFactor );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRasterizationLineStateCreateInfoKHR.lineStipplePattern );
       return seed;
     }
   };
@@ -16082,17 +12952,17 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo const & pipelineRobustnessCreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT const & pipelineRobustnessCreateInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.storageBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.uniformBuffers );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.vertexInputs );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfo.images );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.storageBuffers );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.uniformBuffers );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.vertexInputs );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineRobustnessCreateInfoEXT.images );
       return seed;
     }
   };
@@ -16176,28 +13046,29 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription>
+  struct hash<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription const & vertexInputBindingDivisorDescription ) const VULKAN_HPP_NOEXCEPT
+    std::size_t
+      operator()( VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR const & vertexInputBindingDivisorDescriptionKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, vertexInputBindingDivisorDescription.binding );
-      VULKAN_HPP_HASH_COMBINE( seed, vertexInputBindingDivisorDescription.divisor );
+      VULKAN_HPP_HASH_COMBINE( seed, vertexInputBindingDivisorDescriptionKHR.binding );
+      VULKAN_HPP_HASH_COMBINE( seed, vertexInputBindingDivisorDescriptionKHR.divisor );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR>
   {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo const & pipelineVertexInputDivisorStateCreateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR const & pipelineVertexInputDivisorStateCreateInfoKHR ) const
+      VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfo.vertexBindingDivisorCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfo.pVertexBindingDivisors );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfoKHR.vertexBindingDivisorCount );
+      VULKAN_HPP_HASH_COMBINE( seed, pipelineVertexInputDivisorStateCreateInfoKHR.pVertexBindingDivisors );
       return seed;
     }
   };
@@ -16219,21 +13090,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT const & pipelineViewportDepthClampControlCreateInfoEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineViewportDepthClampControlCreateInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineViewportDepthClampControlCreateInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineViewportDepthClampControlCreateInfoEXT.depthClampMode );
-      VULKAN_HPP_HASH_COMBINE( seed, pipelineViewportDepthClampControlCreateInfoEXT.pDepthClampRange );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClipControlCreateInfoEXT>
   {
@@ -16364,20 +13220,6 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_GGP*/
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentId2KHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentId2KHR const & presentId2KHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentId2KHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, presentId2KHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, presentId2KHR.swapchainCount );
-      VULKAN_HPP_HASH_COMBINE( seed, presentId2KHR.pPresentIds );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PresentIdKHR>
   {
@@ -16475,67 +13317,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT const & presentTimingInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.targetTime );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.timeDomainId );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.presentStageQueries );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingInfoEXT.targetTimeDomainPresentStage );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT const & presentTimingSurfaceCapabilitiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.presentTimingSupported );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.presentAtAbsoluteTimeSupported );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.presentAtRelativeTimeSupported );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingSurfaceCapabilitiesEXT.presentStageQueries );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT const & presentTimingsInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingsInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingsInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingsInfoEXT.swapchainCount );
-      VULKAN_HPP_HASH_COMBINE( seed, presentTimingsInfoEXT.pTimingInfos );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR const & presentWait2InfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, presentWait2InfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, presentWait2InfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, presentWait2InfoKHR.presentId );
-      VULKAN_HPP_HASH_COMBINE( seed, presentWait2InfoKHR.timeout );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo>
   {
@@ -16563,18 +13344,18 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushConstantsInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushConstantsInfo const & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR const & pushConstantsInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.layout );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.stageFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.offset );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.size );
-      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfo.pValues );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.layout );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.stageFlags );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.offset );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.size );
+      VULKAN_HPP_HASH_COMBINE( seed, pushConstantsInfoKHR.pValues );
       return seed;
     }
   };
@@ -16600,34 +13381,34 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo const & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR const & pushDescriptorSetInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.stageFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.layout );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.set );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.descriptorWriteCount );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfo.pDescriptorWrites );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.stageFlags );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.layout );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.set );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.descriptorWriteCount );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetInfoKHR.pDescriptorWrites );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo const & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR const & pushDescriptorSetWithTemplateInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.descriptorUpdateTemplate );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.layout );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.set );
-      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfo.pData );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.descriptorUpdateTemplate );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.layout );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.set );
+      VULKAN_HPP_HASH_COMBINE( seed, pushDescriptorSetWithTemplateInfoKHR.pData );
       return seed;
     }
   };
@@ -16731,61 +13512,19 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM const & queueFamilyDataGraphProcessingEnginePropertiesARM )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphProcessingEnginePropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphProcessingEnginePropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphProcessingEnginePropertiesARM.foreignSemaphoreHandleTypes );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphProcessingEnginePropertiesARM.foreignMemoryHandleTypes );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM const & queueFamilyDataGraphPropertiesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphPropertiesARM.engine );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyDataGraphPropertiesARM.operation );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties const & queueFamilyGlobalPriorityProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityProperties.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityProperties.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityProperties.priorityCount );
-      for ( size_t i = 0; i < VK_MAX_GLOBAL_PRIORITY_SIZE; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityProperties.priorities[i] );
-      }
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR>
   {
     std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR const & queueFamilyOwnershipTransferPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
+      operator()( VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR const & queueFamilyGlobalPriorityPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyOwnershipTransferPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyOwnershipTransferPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyOwnershipTransferPropertiesKHR.optimalImageTransferToQueueFamilies );
+      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityPropertiesKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityPropertiesKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityPropertiesKHR.priorityCount );
+      for ( size_t i = 0; i < VK_MAX_GLOBAL_PRIORITY_SIZE_KHR; ++i )
+      {
+        VULKAN_HPP_HASH_COMBINE( seed, queueFamilyGlobalPriorityPropertiesKHR.priorities[i] );
+      }
       return seed;
     }
   };
@@ -16844,20 +13583,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV const &
-                              rayTracingPipelineClusterAccelerationStructureCreateInfoNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, rayTracingPipelineClusterAccelerationStructureCreateInfoNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, rayTracingPipelineClusterAccelerationStructureCreateInfoNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, rayTracingPipelineClusterAccelerationStructureCreateInfoNV.allowClusterAccelerationStructure );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR>
   {
@@ -16965,29 +13690,16 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR const & releaseCapturedPipelineDataInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT const & releaseSwapchainImagesInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, releaseCapturedPipelineDataInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseCapturedPipelineDataInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseCapturedPipelineDataInfoKHR.pipeline );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR const & releaseSwapchainImagesInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoKHR.swapchain );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoKHR.imageIndexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoKHR.pImageIndices );
+      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoEXT.swapchain );
+      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoEXT.imageIndexCount );
+      VULKAN_HPP_HASH_COMBINE( seed, releaseSwapchainImagesInfoEXT.pImageIndices );
       return seed;
     }
   };
@@ -17195,21 +13907,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT const & renderPassFragmentDensityMapOffsetEndInfoEXT ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassFragmentDensityMapOffsetEndInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassFragmentDensityMapOffsetEndInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassFragmentDensityMapOffsetEndInfoEXT.fragmentDensityOffsetCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassFragmentDensityMapOffsetEndInfoEXT.pFragmentDensityOffsets );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>
   {
@@ -17243,24 +13940,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM const & renderPassPerformanceCountersByRegionBeginInfoARM )
-      const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.counterAddressCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.pCounterAddresses );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.serializeRegions );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.counterIndexCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassPerformanceCountersByRegionBeginInfoARM.pCounterIndices );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT>
   {
@@ -17377,20 +14056,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM const & renderPassTileShadingCreateInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassTileShadingCreateInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassTileShadingCreateInfoQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassTileShadingCreateInfoQCOM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, renderPassTileShadingCreateInfoQCOM.tileApronSize );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::RenderPassTransformBeginInfoQCOM>
   {
@@ -17405,57 +14070,32 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAreaInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingAreaInfo const & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR const & renderingAreaInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.viewMask );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.colorAttachmentCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.pColorAttachmentFormats );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.depthAttachmentFormat );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfo.stencilAttachmentFormat );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.viewMask );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.colorAttachmentCount );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.pColorAttachmentFormats );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.depthAttachmentFormat );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAreaInfoKHR.stencilAttachmentFormat );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR const & renderingAttachmentFlagsInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR const & renderingAttachmentLocationInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentFlagsInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentFlagsInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentFlagsInfoKHR.flags );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo const & renderingAttachmentLocationInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfo.colorAttachmentCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfo.pColorAttachmentLocations );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR const & renderingEndInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderingEndInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingEndInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfoKHR.colorAttachmentCount );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingAttachmentLocationInfoKHR.pColorAttachmentLocations );
       return seed;
     }
   };
@@ -17512,17 +14152,17 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo>
+  struct hash<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo const & renderingInputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR const & renderingInputAttachmentIndexInfoKHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.colorAttachmentCount );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.pColorAttachmentInputIndices );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.pDepthInputAttachmentIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfo.pStencilInputAttachmentIndex );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.colorAttachmentCount );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.pColorAttachmentInputIndices );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.pDepthInputAttachmentIndex );
+      VULKAN_HPP_HASH_COMBINE( seed, renderingInputAttachmentIndexInfoKHR.pStencilInputAttachmentIndex );
       return seed;
     }
   };
@@ -17545,21 +14185,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR const & resolveImageModeInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, resolveImageModeInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, resolveImageModeInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, resolveImageModeInfoKHR.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, resolveImageModeInfoKHR.resolveMode );
-      VULKAN_HPP_HASH_COMBINE( seed, resolveImageModeInfoKHR.stencilResolveMode );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SamplerBlockMatchWindowCreateInfoQCOM>
   {
@@ -17910,22 +14535,6 @@ namespace std
     }
   };
 
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SetPresentConfigNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SetPresentConfigNV const & setPresentConfigNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, setPresentConfigNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, setPresentConfigNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, setPresentConfigNV.numFramesPerBatch );
-      VULKAN_HPP_HASH_COMBINE( seed, setPresentConfigNV.presentConfigFeedback );
-      return seed;
-    }
-  };
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SetStateFlagsIndirectCommandNV>
   {
@@ -18128,6 +14737,19 @@ namespace std
   };
 #  endif /*VK_USE_PLATFORM_GGP*/
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR const & stridedDeviceAddressRegionKHR ) const VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.deviceAddress );
+      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.stride );
+      VULKAN_HPP_HASH_COMBINE( seed, stridedDeviceAddressRegionKHR.size );
+      return seed;
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SubmitInfo>
   {
@@ -18207,6 +14829,21 @@ namespace std
     }
   };
 
+  template <>
+  struct hash<VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM>
+  {
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM const & subpassFragmentDensityMapOffsetEndInfoQCOM ) const
+      VULKAN_HPP_NOEXCEPT
+    {
+      std::size_t seed = 0;
+      VULKAN_HPP_HASH_COMBINE( seed, subpassFragmentDensityMapOffsetEndInfoQCOM.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, subpassFragmentDensityMapOffsetEndInfoQCOM.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, subpassFragmentDensityMapOffsetEndInfoQCOM.fragmentDensityOffsetCount );
+      VULKAN_HPP_HASH_COMBINE( seed, subpassFragmentDensityMapOffsetEndInfoQCOM.pFragmentDensityOffsets );
+      return seed;
+    }
+  };
+
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SubpassResolvePerformanceQueryEXT>
   {
@@ -18236,27 +14873,27 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize>
+  struct hash<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize const & subresourceHostMemcpySize ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT const & subresourceHostMemcpySizeEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySize.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySize.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySize.size );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySizeEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySizeEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceHostMemcpySizeEXT.size );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SubresourceLayout2>
+  struct hash<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SubresourceLayout2 const & subresourceLayout2 ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR const & subresourceLayout2KHR ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2.subresourceLayout );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2KHR.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2KHR.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, subresourceLayout2KHR.subresourceLayout );
       return seed;
     }
   };
@@ -18346,48 +14983,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR const & surfaceCapabilitiesPresentId2KHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentId2KHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentId2KHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentId2KHR.presentId2Supported );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR const & surfaceCapabilitiesPresentWait2KHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentWait2KHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentWait2KHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCapabilitiesPresentWait2KHR.presentWait2Supported );
-      return seed;
-    }
-  };
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS const & surfaceCreateInfoOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCreateInfoOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCreateInfoOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCreateInfoOHOS.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, surfaceCreateInfoOHOS.window );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>
   {
@@ -18445,45 +15040,45 @@ namespace std
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR const & surfacePresentModeCompatibilityKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT const & surfacePresentModeCompatibilityEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityKHR.presentModeCount );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityKHR.pPresentModes );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityEXT.presentModeCount );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeCompatibilityEXT.pPresentModes );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR const & surfacePresentModeKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT const & surfacePresentModeEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeKHR.presentMode );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentModeEXT.presentMode );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR const & surfacePresentScalingCapabilitiesKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT const & surfacePresentScalingCapabilitiesEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.supportedPresentScaling );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.supportedPresentGravityX );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.supportedPresentGravityY );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.minScaledImageExtent );
-      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesKHR.maxScaledImageExtent );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.supportedPresentScaling );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.supportedPresentGravityX );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.supportedPresentGravityY );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.minScaledImageExtent );
+      VULKAN_HPP_HASH_COMBINE( seed, surfacePresentScalingCapabilitiesEXT.maxScaledImageExtent );
       return seed;
     }
   };
@@ -18501,21 +15096,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT const & swapchainCalibratedTimestampInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainCalibratedTimestampInfoEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainCalibratedTimestampInfoEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainCalibratedTimestampInfoEXT.swapchain );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainCalibratedTimestampInfoEXT.presentStage );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainCalibratedTimestampInfoEXT.timeDomainId );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SwapchainCounterCreateInfoEXT>
   {
@@ -18571,21 +15151,6 @@ namespace std
     }
   };
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS const & swapchainImageCreateInfoOHOS ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainImageCreateInfoOHOS.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainImageCreateInfoOHOS.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainImageCreateInfoOHOS.usage );
-      return seed;
-    }
-  };
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::SwapchainLatencyCreateInfoNV>
   {
@@ -18613,189 +15178,58 @@ namespace std
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR const & swapchainPresentFenceInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT const & swapchainPresentFenceInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoKHR.swapchainCount );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoKHR.pFences );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoEXT.swapchainCount );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentFenceInfoEXT.pFences );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR const & swapchainPresentModeInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT const & swapchainPresentModeInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoKHR.swapchainCount );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoKHR.pPresentModes );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoEXT.swapchainCount );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModeInfoEXT.pPresentModes );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR const & swapchainPresentModesCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT const & swapchainPresentModesCreateInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoKHR.presentModeCount );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoKHR.pPresentModes );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoEXT.presentModeCount );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentModesCreateInfoEXT.pPresentModes );
       return seed;
     }
   };
 
   template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR>
+  struct hash<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT>
   {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR const & swapchainPresentScalingCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
+    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT const & swapchainPresentScalingCreateInfoEXT ) const VULKAN_HPP_NOEXCEPT
     {
       std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoKHR.scalingBehavior );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoKHR.presentGravityX );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoKHR.presentGravityY );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT const & swapchainTimeDomainPropertiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimeDomainPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimeDomainPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimeDomainPropertiesEXT.timeDomainCount );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimeDomainPropertiesEXT.pTimeDomains );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimeDomainPropertiesEXT.pTimeDomainIds );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT const & swapchainTimingPropertiesEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimingPropertiesEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimingPropertiesEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimingPropertiesEXT.refreshDuration );
-      VULKAN_HPP_HASH_COMBINE( seed, swapchainTimingPropertiesEXT.refreshInterval );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM const & tensorCaptureDescriptorDataInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCaptureDescriptorDataInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCaptureDescriptorDataInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorCaptureDescriptorDataInfoARM.tensor );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM const & tensorMemoryBarrierARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.srcStageMask );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.srcAccessMask );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.dstStageMask );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.dstAccessMask );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.srcQueueFamilyIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.dstQueueFamilyIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryBarrierARM.tensor );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM const & tensorDependencyInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDependencyInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDependencyInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDependencyInfoARM.tensorMemoryBarrierCount );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorDependencyInfoARM.pTensorMemoryBarriers );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM const & tensorFormatPropertiesARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorFormatPropertiesARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorFormatPropertiesARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorFormatPropertiesARM.optimalTilingTensorFeatures );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorFormatPropertiesARM.linearTilingTensorFeatures );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM const & tensorMemoryRequirementsInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryRequirementsInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryRequirementsInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorMemoryRequirementsInfoARM.tensor );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM const & tensorViewCaptureDescriptorDataInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCaptureDescriptorDataInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCaptureDescriptorDataInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCaptureDescriptorDataInfoARM.tensorView );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM const & tensorViewCreateInfoARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCreateInfoARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCreateInfoARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCreateInfoARM.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCreateInfoARM.tensor );
-      VULKAN_HPP_HASH_COMBINE( seed, tensorViewCreateInfoARM.format );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoEXT.sType );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoEXT.pNext );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoEXT.scalingBehavior );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoEXT.presentGravityX );
+      VULKAN_HPP_HASH_COMBINE( seed, swapchainPresentScalingCreateInfoEXT.presentGravityY );
       return seed;
     }
   };
@@ -18813,46 +15247,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM const & tileMemoryBindInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryBindInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryBindInfoQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryBindInfoQCOM.memory );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM const & tileMemoryRequirementsQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryRequirementsQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryRequirementsQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryRequirementsQCOM.size );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemoryRequirementsQCOM.alignment );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM const & tileMemorySizeInfoQCOM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemorySizeInfoQCOM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemorySizeInfoQCOM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, tileMemorySizeInfoQCOM.size );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM>
   {
@@ -19121,20 +15515,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR const & videoDecodeAV1InlineSessionParametersInfoKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeAV1InlineSessionParametersInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeAV1InlineSessionParametersInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeAV1InlineSessionParametersInfoKHR.pStdSequenceHeader );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeAV1PictureInfoKHR>
   {
@@ -19224,21 +15604,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR const & videoDecodeH264InlineSessionParametersInfoKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH264InlineSessionParametersInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH264InlineSessionParametersInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH264InlineSessionParametersInfoKHR.pStdSPS );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH264InlineSessionParametersInfoKHR.pStdPPS );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureInfoKHR>
   {
@@ -19327,22 +15692,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR const & videoDecodeH265InlineSessionParametersInfoKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265InlineSessionParametersInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265InlineSessionParametersInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265InlineSessionParametersInfoKHR.pStdVPS );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265InlineSessionParametersInfoKHR.pStdSPS );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeH265InlineSessionParametersInfoKHR.pStdPPS );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeH265PictureInfoKHR>
   {
@@ -19440,289 +15789,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR const & videoDecodeVP9CapabilitiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9CapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9CapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9CapabilitiesKHR.maxLevel );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR const & videoDecodeVP9PictureInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.pStdPictureInfo );
-      for ( size_t i = 0; i < VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.referenceNameSlotIndices[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.uncompressedHeaderOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.compressedHeaderOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9PictureInfoKHR.tilesOffset );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR const & videoDecodeVP9ProfileInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9ProfileInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9ProfileInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoDecodeVP9ProfileInfoKHR.stdProfile );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR const & videoEncodeAV1CapabilitiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxLevel );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.codedPictureAlignment );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxTiles );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.minTileSize );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxTileSize );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.superblockSizes );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxSingleReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.singleReferenceNameMask );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxUnidirectionalCompoundReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxUnidirectionalCompoundGroup1ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.unidirectionalCompoundReferenceNameMask );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxBidirectionalCompoundReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxBidirectionalCompoundGroup1ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxBidirectionalCompoundGroup2ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.bidirectionalCompoundReferenceNameMask );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxTemporalLayerCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxSpatialLayerCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxOperatingPoints );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.minQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.maxQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.prefersGopRemainingFrames );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.requiresGopRemainingFrames );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1CapabilitiesKHR.stdSyntaxFlags );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR const & videoEncodeAV1DpbSlotInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1DpbSlotInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1DpbSlotInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1DpbSlotInfoKHR.pStdReferenceInfo );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR const & videoEncodeAV1FrameSizeKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1FrameSizeKHR.intraFrameSize );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1FrameSizeKHR.predictiveFrameSize );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1FrameSizeKHR.bipredictiveFrameSize );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR const & videoEncodeAV1GopRemainingFrameInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.useGopRemainingFrames );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.gopRemainingIntra );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.gopRemainingPredictive );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1GopRemainingFrameInfoKHR.gopRemainingBipredictive );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR const & videoEncodeAV1PictureInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.predictionMode );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.rateControlGroup );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.constantQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.pStdPictureInfo );
-      for ( size_t i = 0; i < VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR; ++i )
-      {
-        VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.referenceNameSlotIndices[i] );
-      }
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.primaryReferenceCdfOnly );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1PictureInfoKHR.generateObuExtensionHeader );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR const & videoEncodeAV1ProfileInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1ProfileInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1ProfileInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1ProfileInfoKHR.stdProfile );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR const & videoEncodeAV1QIndexKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QIndexKHR.intraQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QIndexKHR.predictiveQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QIndexKHR.bipredictiveQIndex );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR const & videoEncodeAV1QualityLevelPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredRateControlFlags );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredGopFrameCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredKeyFramePeriod );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredConsecutiveBipredictiveFrameCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredTemporalLayerCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredConstantQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxSingleReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredSingleReferenceNameMask );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxUnidirectionalCompoundReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxUnidirectionalCompoundGroup1ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredUnidirectionalCompoundReferenceNameMask );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxBidirectionalCompoundReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxBidirectionalCompoundGroup1ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredMaxBidirectionalCompoundGroup2ReferenceCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QualityLevelPropertiesKHR.preferredBidirectionalCompoundReferenceNameMask );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR const & videoEncodeAV1QuantizationMapCapabilitiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QuantizationMapCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QuantizationMapCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QuantizationMapCapabilitiesKHR.minQIndexDelta );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1QuantizationMapCapabilitiesKHR.maxQIndexDelta );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR const & videoEncodeAV1RateControlInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.flags );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.gopFrameCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.keyFramePeriod );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.consecutiveBipredictiveFrameCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlInfoKHR.temporalLayerCount );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR const & videoEncodeAV1RateControlLayerInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.useMinQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.minQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.useMaxQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.maxQIndex );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.useMaxFrameSize );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1RateControlLayerInfoKHR.maxFrameSize );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR const & videoEncodeAV1SessionCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionCreateInfoKHR.useMaxLevel );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionCreateInfoKHR.maxLevel );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR const & videoEncodeAV1SessionParametersCreateInfoKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.pStdSequenceHeader );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.pStdDecoderModelInfo );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.stdOperatingPointCount );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeAV1SessionParametersCreateInfoKHR.pStdOperatingPoints );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeCapabilitiesKHR>
   {
@@ -19888,21 +15954,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR const & videoEncodeH264QuantizationMapCapabilitiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH264QuantizationMapCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH264QuantizationMapCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH264QuantizationMapCapabilitiesKHR.minQpDelta );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH264QuantizationMapCapabilitiesKHR.maxQpDelta );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlInfoKHR>
   {
@@ -20166,21 +16217,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR const & videoEncodeH265QuantizationMapCapabilitiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH265QuantizationMapCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH265QuantizationMapCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH265QuantizationMapCapabilitiesKHR.minQpDelta );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeH265QuantizationMapCapabilitiesKHR.maxQpDelta );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlInfoKHR>
   {
@@ -20323,52 +16359,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR const & videoEncodeIntraRefreshCapabilitiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.intraRefreshModes );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.maxIntraRefreshCycleDuration );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.maxIntraRefreshActiveReferencePictures );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.partitionIndependentIntraRefreshRegions );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshCapabilitiesKHR.nonRectangularIntraRefreshRegions );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR const & videoEncodeIntraRefreshInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshInfoKHR.intraRefreshCycleDuration );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeIntraRefreshInfoKHR.intraRefreshIndex );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE const & videoEncodeProfileRgbConversionInfoVALVE ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeProfileRgbConversionInfoVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeProfileRgbConversionInfoVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeProfileRgbConversionInfoVALVE.performEncodeRgbConversion );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelInfoKHR>
   {
@@ -20396,48 +16386,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR const & videoEncodeQuantizationMapCapabilitiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapCapabilitiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapCapabilitiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapCapabilitiesKHR.maxQuantizationMapExtent );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR const & videoEncodeQuantizationMapInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapInfoKHR.quantizationMap );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapInfoKHR.quantizationMapExtent );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const &
-                              videoEncodeQuantizationMapSessionParametersCreateInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapSessionParametersCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapSessionParametersCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeQuantizationMapSessionParametersCreateInfoKHR.quantizationMapTexelSize );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR>
   {
@@ -20472,37 +16420,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE const & videoEncodeRgbConversionCapabilitiesVALVE ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.rgbModels );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.rgbRanges );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.xChromaOffsets );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeRgbConversionCapabilitiesVALVE.yChromaOffsets );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR const & videoEncodeSessionIntraRefreshCreateInfoKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionIntraRefreshCreateInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionIntraRefreshCreateInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionIntraRefreshCreateInfoKHR.intraRefreshMode );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR>
   {
@@ -20531,23 +16448,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE const & videoEncodeSessionRgbConversionCreateInfoVALVE ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.rgbModel );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.rgbRange );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.xChromaOffset );
-      VULKAN_HPP_HASH_COMBINE( seed, videoEncodeSessionRgbConversionCreateInfoVALVE.yChromaOffset );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoEncodeUsageInfoKHR>
   {
@@ -20576,34 +16476,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR const & videoFormatAV1QuantizationMapPropertiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatAV1QuantizationMapPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatAV1QuantizationMapPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatAV1QuantizationMapPropertiesKHR.compatibleSuperblockSizes );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR const & videoFormatH265QuantizationMapPropertiesKHR ) const
-      VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatH265QuantizationMapPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatH265QuantizationMapPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatH265QuantizationMapPropertiesKHR.compatibleCtbSizes );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>
   {
@@ -20622,20 +16494,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR>
-  {
-    std::size_t
-      operator()( VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR const & videoFormatQuantizationMapPropertiesKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatQuantizationMapPropertiesKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatQuantizationMapPropertiesKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoFormatQuantizationMapPropertiesKHR.quantizationMapTexelSize );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoInlineQueryInfoKHR>
   {
@@ -20665,19 +16523,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR const & videoReferenceIntraRefreshInfoKHR ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, videoReferenceIntraRefreshInfoKHR.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, videoReferenceIntraRefreshInfoKHR.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, videoReferenceIntraRefreshInfoKHR.dirtyIntraRefreshRegions );
-      return seed;
-    }
-  };
-
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR>
   {
@@ -20861,63 +16706,6 @@ namespace std
     }
   };
 
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV const &
-                              writeDescriptorSetPartitionedAccelerationStructureNV ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetPartitionedAccelerationStructureNV.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetPartitionedAccelerationStructureNV.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetPartitionedAccelerationStructureNV.accelerationStructureCount );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetPartitionedAccelerationStructureNV.pAccelerationStructures );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM const & writeDescriptorSetTensorARM ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetTensorARM.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetTensorARM.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetTensorARM.tensorViewCount );
-      VULKAN_HPP_HASH_COMBINE( seed, writeDescriptorSetTensorARM.pTensorViews );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT const & writeIndirectExecutionSetPipelineEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetPipelineEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetPipelineEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetPipelineEXT.index );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetPipelineEXT.pipeline );
-      return seed;
-    }
-  };
-
-  template <>
-  struct hash<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT>
-  {
-    std::size_t operator()( VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT const & writeIndirectExecutionSetShaderEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      std::size_t seed = 0;
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetShaderEXT.sType );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetShaderEXT.pNext );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetShaderEXT.index );
-      VULKAN_HPP_HASH_COMBINE( seed, writeIndirectExecutionSetShaderEXT.shader );
-      return seed;
-    }
-  };
-
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
   template <>
   struct hash<VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR>
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_hpp_macros.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_hpp_macros.hpp
index 95f77f59..b7546791 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_hpp_macros.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_hpp_macros.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -35,18 +35,6 @@
 #  include <ciso646>
 #endif
 
-#define VULKAN_HPP_STRINGIFY2( text ) #text
-#define VULKAN_HPP_STRINGIFY( text )  VULKAN_HPP_STRINGIFY2( text )
-#define VULKAN_HPP_NAMESPACE_STRING   VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE )
-
-#if defined( __clang__ ) || defined( __GNUC__ ) || defined( __GNUG__ )
-#  define VULKAN_HPP_COMPILE_WARNING( text ) _Pragma( VULKAN_HPP_STRINGIFY( GCC warning text ) )
-#elif defined( _MSC_VER )
-#  define VULKAN_HPP_COMPILE_WARNING( text ) _Pragma( VULKAN_HPP_STRINGIFY( message( __FILE__ "(" VULKAN_HPP_STRINGIFY( __LINE__ ) "): warning: " text ) ) )
-#else
-#  define VULKAN_HPP_COMPILE_WARNING( text )
-#endif
-
 #if defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
 #  if !defined( VULKAN_HPP_NO_SMART_HANDLE )
 #    define VULKAN_HPP_NO_SMART_HANDLE
@@ -91,27 +79,14 @@
 #  define __has_include( x ) false
 #endif
 
-#if defined( __cpp_lib_three_way_comparison ) && ( 201907 <= __cpp_lib_three_way_comparison ) && __has_include( <compare> ) && !defined( VULKAN_HPP_NO_SPACESHIP_OPERATOR )
+#if ( 201907 <= __cpp_lib_three_way_comparison ) && __has_include( <compare> ) && !defined( VULKAN_HPP_NO_SPACESHIP_OPERATOR )
 #  define VULKAN_HPP_HAS_SPACESHIP_OPERATOR
 #endif
 
-#if defined( __cpp_lib_span ) && ( 201803 <= __cpp_lib_span )
+#if ( 201803 <= __cpp_lib_span )
 #  define VULKAN_HPP_SUPPORT_SPAN
 #endif
 
-#if defined( VULKAN_HPP_CXX_MODULE ) && !( defined( __cpp_modules ) && defined( __cpp_lib_modules ) )
-VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ named modules and the standard library module." )
-#endif
-
-#ifndef VK_USE_64_BIT_PTR_DEFINES
-#  if defined( __LP64__ ) || defined( _WIN64 ) || ( defined( __x86_64__ ) && !defined( __ILP32__ ) ) || defined( _M_X64 ) || defined( __ia64 ) || \
-    defined( _M_IA64 ) || defined( __aarch64__ ) || defined( __powerpc64__ ) || ( defined( __riscv ) && __riscv_xlen == 64 )
-#    define VK_USE_64_BIT_PTR_DEFINES 1
-#  else
-#    define VK_USE_64_BIT_PTR_DEFINES 0
-#  endif
-#endif
-
 // 32-bit vulkan is not typesafe for non-dispatchable handles, so don't allow copy constructors on this platform by default.
 // To enable this feature on 32-bit platforms please #define VULKAN_HPP_TYPESAFE_CONVERSION 1
 // To disable this feature on 64-bit platforms please #define VULKAN_HPP_TYPESAFE_CONVERSION 0
@@ -170,11 +145,6 @@ VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ name
 #  else
 #    define VULKAN_HPP_CONSTEXPR_14
 #  endif
-#  if 201603 <= __cpp_constexpr
-#    define VULKAN_HPP_CONSTEXPR_17 constexpr
-#  else
-#    define VULKAN_HPP_CONSTEXPR_17
-#  endif
 #  if ( 201907 <= __cpp_constexpr ) && ( !defined( __GNUC__ ) || ( 110400 < GCC_VERSION ) )
 #    define VULKAN_HPP_CONSTEXPR_20 constexpr
 #  else
@@ -215,12 +185,6 @@ VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ name
 #  define VULKAN_HPP_DEPRECATED( msg )
 #endif
 
-#if 17 <= VULKAN_HPP_CPP_VERSION
-#  define VULKAN_HPP_DEPRECATED_17( msg ) [[deprecated( msg )]]
-#else
-#  define VULKAN_HPP_DEPRECATED_17( msg )
-#endif
-
 #if ( 17 <= VULKAN_HPP_CPP_VERSION ) && !defined( VULKAN_HPP_NO_NODISCARD_WARNINGS )
 #  define VULKAN_HPP_NODISCARD [[nodiscard]]
 #  if defined( VULKAN_HPP_NO_EXCEPTIONS )
@@ -237,6 +201,10 @@ VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ name
 #  define VULKAN_HPP_NAMESPACE vk
 #endif
 
+#define VULKAN_HPP_STRINGIFY2( text ) #text
+#define VULKAN_HPP_STRINGIFY( text )  VULKAN_HPP_STRINGIFY2( text )
+#define VULKAN_HPP_NAMESPACE_STRING   VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE )
+
 #if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC )
 #  if defined( VK_NO_PROTOTYPES )
 #    define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
@@ -270,60 +238,61 @@ VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ name
 
 namespace VULKAN_HPP_NAMESPACE
 {
-  namespace detail
-  {
-    class DispatchLoaderDynamic;
-
-#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
-#  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
-    extern VULKAN_HPP_STORAGE_API DispatchLoaderDynamic defaultDispatchLoaderDynamic;
-#  endif
-#endif
-  }  // namespace detail
+  class DispatchLoaderDynamic;
 }  // namespace VULKAN_HPP_NAMESPACE
 
-#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE )
-#  define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic
-#endif
-#if !defined( VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE )
-#  define VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic
-#endif
-
-#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
-#  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
-#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE
-#  else
-#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE
-#  endif
-#endif
-
 #if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
 #  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
-#    define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::detail::defaultDispatchLoaderDynamic
-#    define VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE                       \
-      namespace VULKAN_HPP_NAMESPACE                                                 \
-      {                                                                              \
-        namespace detail                                                             \
-        {                                                                            \
-          VULKAN_HPP_STORAGE_API DispatchLoaderDynamic defaultDispatchLoaderDynamic; \
-        }                                                                            \
+#    define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::defaultDispatchLoaderDynamic
+#    define VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE                                             \
+      namespace VULKAN_HPP_NAMESPACE                                                                       \
+      {                                                                                                    \
+        VULKAN_HPP_STORAGE_API ::VULKAN_HPP_NAMESPACE::DispatchLoaderDynamic defaultDispatchLoaderDynamic; \
       }
+
+namespace VULKAN_HPP_NAMESPACE
+{
+  extern VULKAN_HPP_STORAGE_API VULKAN_HPP_NAMESPACE::DispatchLoaderDynamic defaultDispatchLoaderDynamic;
+}  // namespace VULKAN_HPP_NAMESPACE
 #  else
-#    define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::detail::getDispatchLoaderStatic()
+#    define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::getDispatchLoaderStatic()
 #    define VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 #  endif
 #endif
 
-#if defined( VULKAN_HPP_NO_DEFAULT_DISPATCHER )
-#  define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment )
-#else
-#  define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment ) = assignment
+#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
+#  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
+#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::DispatchLoaderDynamic
+#  else
+#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::DispatchLoaderStatic
+#  endif
+#endif
+
+#if defined( VULKAN_HPP_NO_DEFAULT_DISPATCHER )
+#  define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT
+#  define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT
+#  define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT
+#else
+#  define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT         = {}
+#  define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT = nullptr
+#  define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT       = VULKAN_HPP_DEFAULT_DISPATCHER
+#endif
+
+#if !defined( VULKAN_HPP_EXPECTED ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_expected )
+#  include <expected>
+#  define VULKAN_HPP_EXPECTED   std::expected
+#  define VULKAN_HPP_UNEXPECTED std::unexpected
 #endif
-#define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT VULKAN_HPP_DEFAULT_ASSIGNMENT( VULKAN_HPP_DEFAULT_DISPATCHER )
 
 #if !defined( VULKAN_HPP_RAII_NAMESPACE )
-#  define VULKAN_HPP_RAII_NAMESPACE        raii
-#  define VULKAN_HPP_RAII_NAMESPACE_STRING VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE )
+#  define VULKAN_HPP_RAII_NAMESPACE raii
 #endif
 
+#if defined( VULKAN_HPP_NO_EXCEPTIONS ) && defined( VULKAN_HPP_EXPECTED )
+#  define VULKAN_HPP_RAII_NO_EXCEPTIONS
+#  define VULKAN_HPP_RAII_CREATE_NOEXCEPT noexcept
+#else
+#  define VULKAN_HPP_RAII_CREATE_NOEXCEPT
 #endif
+
+#endif
\ No newline at end of file
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_ios.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_ios.h
index 94feb5fd..22ed2c03 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_ios.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_ios.h
@@ -2,7 +2,7 @@
 #define VULKAN_IOS_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -34,14 +34,12 @@ typedef struct VkIOSSurfaceCreateInfoMVK {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateIOSSurfaceMVK)(VkInstance instance, const VkIOSSurfaceCreateInfoMVK* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateIOSSurfaceMVK(
     VkInstance                                  instance,
     const VkIOSSurfaceCreateInfoMVK*            pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_macos.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_macos.h
index 07b32d60..a7f5613a 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_macos.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_macos.h
@@ -2,7 +2,7 @@
 #define VULKAN_MACOS_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -34,14 +34,12 @@ typedef struct VkMacOSSurfaceCreateInfoMVK {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateMacOSSurfaceMVK)(VkInstance instance, const VkMacOSSurfaceCreateInfoMVK* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateMacOSSurfaceMVK(
     VkInstance                                  instance,
     const VkMacOSSurfaceCreateInfoMVK*          pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_metal.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_metal.h
index 325c3712..89a55749 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_metal.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_metal.h
@@ -2,7 +2,7 @@
 #define VULKAN_METAL_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -40,14 +40,12 @@ typedef struct VkMetalSurfaceCreateInfoEXT {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateMetalSurfaceEXT)(VkInstance instance, const VkMetalSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateMetalSurfaceEXT(
     VkInstance                                  instance,
     const VkMetalSurfaceCreateInfoEXT*          pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 
 // VK_EXT_metal_objects is a preprocessor guard. Do not pass it to API calls.
@@ -185,57 +183,10 @@ typedef struct VkImportMetalSharedEventInfoEXT {
 typedef void (VKAPI_PTR *PFN_vkExportMetalObjectsEXT)(VkDevice device, VkExportMetalObjectsInfoEXT* pMetalObjectsInfo);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR void VKAPI_CALL vkExportMetalObjectsEXT(
     VkDevice                                    device,
     VkExportMetalObjectsInfoEXT*                pMetalObjectsInfo);
 #endif
-#endif
-
-
-// VK_EXT_external_memory_metal is a preprocessor guard. Do not pass it to API calls.
-#define VK_EXT_external_memory_metal 1
-#define VK_EXT_EXTERNAL_MEMORY_METAL_SPEC_VERSION 1
-#define VK_EXT_EXTERNAL_MEMORY_METAL_EXTENSION_NAME "VK_EXT_external_memory_metal"
-typedef struct VkImportMemoryMetalHandleInfoEXT {
-    VkStructureType                       sType;
-    const void*                           pNext;
-    VkExternalMemoryHandleTypeFlagBits    handleType;
-    void*                                 handle;
-} VkImportMemoryMetalHandleInfoEXT;
-
-typedef struct VkMemoryMetalHandlePropertiesEXT {
-    VkStructureType    sType;
-    void*              pNext;
-    uint32_t           memoryTypeBits;
-} VkMemoryMetalHandlePropertiesEXT;
-
-typedef struct VkMemoryGetMetalHandleInfoEXT {
-    VkStructureType                       sType;
-    const void*                           pNext;
-    VkDeviceMemory                        memory;
-    VkExternalMemoryHandleTypeFlagBits    handleType;
-} VkMemoryGetMetalHandleInfoEXT;
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryMetalHandleEXT)(VkDevice device, const VkMemoryGetMetalHandleInfoEXT* pGetMetalHandleInfo, void** pHandle);
-typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryMetalHandlePropertiesEXT)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHandle, VkMemoryMetalHandlePropertiesEXT* pMemoryMetalHandleProperties);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryMetalHandleEXT(
-    VkDevice                                    device,
-    const VkMemoryGetMetalHandleInfoEXT*        pGetMetalHandleInfo,
-    void**                                      pHandle);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryMetalHandlePropertiesEXT(
-    VkDevice                                    device,
-    VkExternalMemoryHandleTypeFlagBits          handleType,
-    const void*                                 pHandle,
-    VkMemoryMetalHandlePropertiesEXT*           pMemoryMetalHandleProperties);
-#endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_ohos.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_ohos.h
deleted file mode 100644
index 0731e551..00000000
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_ohos.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef VULKAN_OHOS_H_
-#define VULKAN_OHOS_H_ 1
-
-/*
-** Copyright 2015-2025 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-/*
-** This header is generated from the Khronos Vulkan XML API Registry.
-**
-*/
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-// VK_OHOS_external_memory is a preprocessor guard. Do not pass it to API calls.
-#define VK_OHOS_external_memory 1
-struct OH_NativeBuffer;
-#define VK_OHOS_EXTERNAL_MEMORY_SPEC_VERSION 1
-#define VK_OHOS_EXTERNAL_MEMORY_EXTENSION_NAME "VK_OHOS_external_memory"
-typedef struct VkNativeBufferUsageOHOS {
-    VkStructureType    sType;
-    void*              pNext;
-    uint64_t           OHOSNativeBufferUsage;
-} VkNativeBufferUsageOHOS;
-
-typedef struct VkNativeBufferPropertiesOHOS {
-    VkStructureType    sType;
-    void*              pNext;
-    VkDeviceSize       allocationSize;
-    uint32_t           memoryTypeBits;
-} VkNativeBufferPropertiesOHOS;
-
-typedef struct VkNativeBufferFormatPropertiesOHOS {
-    VkStructureType                  sType;
-    void*                            pNext;
-    VkFormat                         format;
-    uint64_t                         externalFormat;
-    VkFormatFeatureFlags             formatFeatures;
-    VkComponentMapping               samplerYcbcrConversionComponents;
-    VkSamplerYcbcrModelConversion    suggestedYcbcrModel;
-    VkSamplerYcbcrRange              suggestedYcbcrRange;
-    VkChromaLocation                 suggestedXChromaOffset;
-    VkChromaLocation                 suggestedYChromaOffset;
-} VkNativeBufferFormatPropertiesOHOS;
-
-typedef struct VkImportNativeBufferInfoOHOS {
-    VkStructureType            sType;
-    const void*                pNext;
-    struct OH_NativeBuffer*    buffer;
-} VkImportNativeBufferInfoOHOS;
-
-typedef struct VkMemoryGetNativeBufferInfoOHOS {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkDeviceMemory     memory;
-} VkMemoryGetNativeBufferInfoOHOS;
-
-typedef struct VkExternalFormatOHOS {
-    VkStructureType    sType;
-    void*              pNext;
-    uint64_t           externalFormat;
-} VkExternalFormatOHOS;
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetNativeBufferPropertiesOHOS)(VkDevice device, const struct OH_NativeBuffer* buffer, VkNativeBufferPropertiesOHOS* pProperties);
-typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryNativeBufferOHOS)(VkDevice device, const VkMemoryGetNativeBufferInfoOHOS* pInfo, struct OH_NativeBuffer** pBuffer);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetNativeBufferPropertiesOHOS(
-    VkDevice                                    device,
-    const struct OH_NativeBuffer*               buffer,
-    VkNativeBufferPropertiesOHOS*               pProperties);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryNativeBufferOHOS(
-    VkDevice                                    device,
-    const VkMemoryGetNativeBufferInfoOHOS*      pInfo,
-    struct OH_NativeBuffer**                    pBuffer);
-#endif
-#endif
-
-
-// VK_OHOS_surface is a preprocessor guard. Do not pass it to API calls.
-#define VK_OHOS_surface 1
-typedef struct NativeWindow OHNativeWindow;
-#define VK_OHOS_SURFACE_SPEC_VERSION      1
-#define VK_OHOS_SURFACE_EXTENSION_NAME    "VK_OHOS_surface"
-typedef VkFlags VkSurfaceCreateFlagsOHOS;
-typedef struct VkSurfaceCreateInfoOHOS {
-    VkStructureType             sType;
-    const void*                 pNext;
-    VkSurfaceCreateFlagsOHOS    flags;
-    OHNativeWindow*             window;
-} VkSurfaceCreateInfoOHOS;
-
-typedef VkResult (VKAPI_PTR *PFN_vkCreateSurfaceOHOS)(VkInstance instance, const VkSurfaceCreateInfoOHOS* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkCreateSurfaceOHOS(
-    VkInstance                                  instance,
-    const VkSurfaceCreateInfoOHOS*              pCreateInfo,
-    const VkAllocationCallbacks*                pAllocator,
-    VkSurfaceKHR*                               pSurface);
-#endif
-#endif
-
-
-// VK_OHOS_native_buffer is a preprocessor guard. Do not pass it to API calls.
-#define VK_OHOS_native_buffer 1
-struct OHBufferHandle;
-#define VK_OHOS_NATIVE_BUFFER_SPEC_VERSION 1
-#define VK_OHOS_NATIVE_BUFFER_EXTENSION_NAME "VK_OHOS_native_buffer"
-
-typedef enum VkSwapchainImageUsageFlagBitsOHOS {
-    VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_OHOS = 0x00000001,
-    VK_SWAPCHAIN_IMAGE_USAGE_FLAG_BITS_MAX_ENUM_OHOS = 0x7FFFFFFF
-} VkSwapchainImageUsageFlagBitsOHOS;
-typedef VkFlags VkSwapchainImageUsageFlagsOHOS;
-typedef struct VkNativeBufferOHOS {
-    VkStructureType           sType;
-    const void*               pNext;
-    struct OHBufferHandle*    handle;
-} VkNativeBufferOHOS;
-
-typedef struct VkSwapchainImageCreateInfoOHOS {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkSwapchainImageUsageFlagsOHOS    usage;
-} VkSwapchainImageCreateInfoOHOS;
-
-typedef struct VkPhysicalDevicePresentationPropertiesOHOS {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           sharedImage;
-} VkPhysicalDevicePresentationPropertiesOHOS;
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageOHOS)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, uint64_t* grallocUsage);
-typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageOHOS)(VkDevice device, VkImage image, int32_t nativeFenceFd, VkSemaphore semaphore, VkFence fence);
-typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalReleaseImageOHOS)(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int32_t* pNativeFenceFd);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsageOHOS(
-    VkDevice                                    device,
-    VkFormat                                    format,
-    VkImageUsageFlags                           imageUsage,
-    uint64_t*                                   grallocUsage);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkAcquireImageOHOS(
-    VkDevice                                    device,
-    VkImage                                     image,
-    int32_t                                     nativeFenceFd,
-    VkSemaphore                                 semaphore,
-    VkFence                                     fence);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkQueueSignalReleaseImageOHOS(
-    VkQueue                                     queue,
-    uint32_t                                    waitSemaphoreCount,
-    const VkSemaphore*                          pWaitSemaphores,
-    VkImage                                     image,
-    int32_t*                                    pNativeFenceFd);
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_raii.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_raii.hpp
index 355f766d..5d05edb9 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_raii.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_raii.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,2994 +8,2603 @@
 #ifndef VULKAN_RAII_HPP
 #define VULKAN_RAII_HPP
 
+#include <memory>   // std::unique_ptr
+#include <utility>  // std::exchange, std::forward
 #include <vulkan/vulkan.hpp>
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <memory>   // std::unique_ptr
-#  include <utility>  // std::forward
-#endif
 
 #if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
 namespace VULKAN_HPP_NAMESPACE
 {
   namespace VULKAN_HPP_RAII_NAMESPACE
   {
-    namespace detail
+#  if ( 14 <= VULKAN_HPP_CPP_VERSION )
+    using std::exchange;
+#  else
+    template <class T, class U = T>
+    VULKAN_HPP_CONSTEXPR_14 VULKAN_HPP_INLINE T exchange( T & obj, U && newValue )
     {
-      using PFN_dummy = void ( * )();
+      T oldValue = std::move( obj );
+      obj        = std::forward<U>( newValue );
+      return oldValue;
+    }
+#  endif
 
-      class ContextDispatcher : public ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderBase
-      {
-      public:
-        ContextDispatcher( PFN_vkGetInstanceProcAddr getProcAddr )
-          : vkGetInstanceProcAddr( getProcAddr )
-          //=== VK_VERSION_1_0 ===
-          , vkCreateInstance( PFN_vkCreateInstance( getProcAddr( NULL, "vkCreateInstance" ) ) )
-          , vkEnumerateInstanceExtensionProperties(
-              PFN_vkEnumerateInstanceExtensionProperties( getProcAddr( NULL, "vkEnumerateInstanceExtensionProperties" ) ) )
-          , vkEnumerateInstanceLayerProperties( PFN_vkEnumerateInstanceLayerProperties( getProcAddr( NULL, "vkEnumerateInstanceLayerProperties" ) ) )
-          //=== VK_VERSION_1_1 ===
-          , vkEnumerateInstanceVersion( PFN_vkEnumerateInstanceVersion( getProcAddr( NULL, "vkEnumerateInstanceVersion" ) ) )
-        {
-        }
-
-      public:
-        PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = 0;
+    template <class T>
+    class CreateReturnType
+    {
+    public:
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      using Type = VULKAN_HPP_EXPECTED<T, VULKAN_HPP_NAMESPACE::Result>;
+#  else
+      using Type                                                              = T;
+#  endif
+    };
 
+    class ContextDispatcher : public DispatchLoaderBase
+    {
+    public:
+      ContextDispatcher( PFN_vkGetInstanceProcAddr getProcAddr )
+        : vkGetInstanceProcAddr( getProcAddr )
         //=== VK_VERSION_1_0 ===
-        PFN_vkCreateInstance                       vkCreateInstance                       = 0;
-        PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties = 0;
-        PFN_vkEnumerateInstanceLayerProperties     vkEnumerateInstanceLayerProperties     = 0;
+        , vkCreateInstance( PFN_vkCreateInstance( getProcAddr( NULL, "vkCreateInstance" ) ) )
+        , vkEnumerateInstanceExtensionProperties( PFN_vkEnumerateInstanceExtensionProperties( getProcAddr( NULL, "vkEnumerateInstanceExtensionProperties" ) ) )
+        , vkEnumerateInstanceLayerProperties( PFN_vkEnumerateInstanceLayerProperties( getProcAddr( NULL, "vkEnumerateInstanceLayerProperties" ) ) )
+        //=== VK_VERSION_1_1 ===
+        , vkEnumerateInstanceVersion( PFN_vkEnumerateInstanceVersion( getProcAddr( NULL, "vkEnumerateInstanceVersion" ) ) )
+      {
+      }
+
+    public:
+      PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = 0;
+
+      //=== VK_VERSION_1_0 ===
+      PFN_vkCreateInstance                       vkCreateInstance                       = 0;
+      PFN_vkEnumerateInstanceExtensionProperties vkEnumerateInstanceExtensionProperties = 0;
+      PFN_vkEnumerateInstanceLayerProperties     vkEnumerateInstanceLayerProperties     = 0;
+
+      //=== VK_VERSION_1_1 ===
+      PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion = 0;
+    };
+
+    class InstanceDispatcher : public DispatchLoaderBase
+    {
+    public:
+      InstanceDispatcher( PFN_vkGetInstanceProcAddr getProcAddr, VkInstance instance ) : vkGetInstanceProcAddr( getProcAddr )
+      {
+        //=== VK_VERSION_1_0 ===
+        vkDestroyInstance           = PFN_vkDestroyInstance( vkGetInstanceProcAddr( instance, "vkDestroyInstance" ) );
+        vkEnumeratePhysicalDevices  = PFN_vkEnumeratePhysicalDevices( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDevices" ) );
+        vkGetPhysicalDeviceFeatures = PFN_vkGetPhysicalDeviceFeatures( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures" ) );
+        vkGetPhysicalDeviceFormatProperties =
+          PFN_vkGetPhysicalDeviceFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties" ) );
+        vkGetPhysicalDeviceImageFormatProperties =
+          PFN_vkGetPhysicalDeviceImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties" ) );
+        vkGetPhysicalDeviceProperties = PFN_vkGetPhysicalDeviceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties" ) );
+        vkGetPhysicalDeviceQueueFamilyProperties =
+          PFN_vkGetPhysicalDeviceQueueFamilyProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) );
+        vkGetPhysicalDeviceMemoryProperties =
+          PFN_vkGetPhysicalDeviceMemoryProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) );
+        vkCreateDevice = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
+        vkEnumerateDeviceExtensionProperties =
+          PFN_vkEnumerateDeviceExtensionProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) );
+        vkEnumerateDeviceLayerProperties = PFN_vkEnumerateDeviceLayerProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceLayerProperties" ) );
+        vkGetPhysicalDeviceSparseImageFormatProperties =
+          PFN_vkGetPhysicalDeviceSparseImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties" ) );
 
         //=== VK_VERSION_1_1 ===
-        PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion = 0;
-      };
-
-      class InstanceDispatcher : public ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderBase
-      {
-      public:
-        InstanceDispatcher( PFN_vkGetInstanceProcAddr getProcAddr, VkInstance instance ) : vkGetInstanceProcAddr( getProcAddr )
-        {
-          //=== VK_VERSION_1_0 ===
-          vkDestroyInstance           = PFN_vkDestroyInstance( vkGetInstanceProcAddr( instance, "vkDestroyInstance" ) );
-          vkEnumeratePhysicalDevices  = PFN_vkEnumeratePhysicalDevices( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDevices" ) );
-          vkGetPhysicalDeviceFeatures = PFN_vkGetPhysicalDeviceFeatures( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures" ) );
-          vkGetPhysicalDeviceFormatProperties =
-            PFN_vkGetPhysicalDeviceFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties" ) );
-          vkGetPhysicalDeviceImageFormatProperties =
-            PFN_vkGetPhysicalDeviceImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties" ) );
-          vkGetPhysicalDeviceProperties = PFN_vkGetPhysicalDeviceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties" ) );
-          vkGetPhysicalDeviceQueueFamilyProperties =
-            PFN_vkGetPhysicalDeviceQueueFamilyProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) );
-          vkGetPhysicalDeviceMemoryProperties =
-            PFN_vkGetPhysicalDeviceMemoryProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) );
-          vkCreateDevice = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
-          vkEnumerateDeviceExtensionProperties =
-            PFN_vkEnumerateDeviceExtensionProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) );
-          vkEnumerateDeviceLayerProperties = PFN_vkEnumerateDeviceLayerProperties( vkGetInstanceProcAddr( instance, "vkEnumerateDeviceLayerProperties" ) );
-          vkGetPhysicalDeviceSparseImageFormatProperties =
-            PFN_vkGetPhysicalDeviceSparseImageFormatProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties" ) );
-
-          //=== VK_VERSION_1_1 ===
-          vkEnumeratePhysicalDeviceGroups = PFN_vkEnumeratePhysicalDeviceGroups( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroups" ) );
-          vkGetPhysicalDeviceFeatures2    = PFN_vkGetPhysicalDeviceFeatures2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2" ) );
-          vkGetPhysicalDeviceProperties2  = PFN_vkGetPhysicalDeviceProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2" ) );
-          vkGetPhysicalDeviceFormatProperties2 =
-            PFN_vkGetPhysicalDeviceFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2" ) );
-          vkGetPhysicalDeviceImageFormatProperties2 =
-            PFN_vkGetPhysicalDeviceImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2" ) );
-          vkGetPhysicalDeviceQueueFamilyProperties2 =
-            PFN_vkGetPhysicalDeviceQueueFamilyProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2" ) );
-          vkGetPhysicalDeviceMemoryProperties2 =
-            PFN_vkGetPhysicalDeviceMemoryProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2" ) );
-          vkGetPhysicalDeviceSparseImageFormatProperties2 =
-            PFN_vkGetPhysicalDeviceSparseImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2" ) );
-          vkGetPhysicalDeviceExternalBufferProperties =
-            PFN_vkGetPhysicalDeviceExternalBufferProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferProperties" ) );
-          vkGetPhysicalDeviceExternalFenceProperties =
-            PFN_vkGetPhysicalDeviceExternalFenceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFenceProperties" ) );
-          vkGetPhysicalDeviceExternalSemaphoreProperties =
-            PFN_vkGetPhysicalDeviceExternalSemaphoreProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphoreProperties" ) );
-
-          //=== VK_VERSION_1_3 ===
-          vkGetPhysicalDeviceToolProperties = PFN_vkGetPhysicalDeviceToolProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolProperties" ) );
-
-          //=== VK_KHR_surface ===
-          vkDestroySurfaceKHR = PFN_vkDestroySurfaceKHR( vkGetInstanceProcAddr( instance, "vkDestroySurfaceKHR" ) );
-          vkGetPhysicalDeviceSurfaceSupportKHR =
-            PFN_vkGetPhysicalDeviceSurfaceSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceSupportKHR" ) );
-          vkGetPhysicalDeviceSurfaceCapabilitiesKHR =
-            PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" ) );
-          vkGetPhysicalDeviceSurfaceFormatsKHR =
-            PFN_vkGetPhysicalDeviceSurfaceFormatsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormatsKHR" ) );
-          vkGetPhysicalDeviceSurfacePresentModesKHR =
-            PFN_vkGetPhysicalDeviceSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModesKHR" ) );
-
-          //=== VK_KHR_swapchain ===
-          vkGetPhysicalDevicePresentRectanglesKHR =
-            PFN_vkGetPhysicalDevicePresentRectanglesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDevicePresentRectanglesKHR" ) );
-
-          //=== VK_KHR_display ===
-          vkGetPhysicalDeviceDisplayPropertiesKHR =
-            PFN_vkGetPhysicalDeviceDisplayPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPropertiesKHR" ) );
-          vkGetPhysicalDeviceDisplayPlanePropertiesKHR =
-            PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR" ) );
-          vkGetDisplayPlaneSupportedDisplaysKHR =
-            PFN_vkGetDisplayPlaneSupportedDisplaysKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneSupportedDisplaysKHR" ) );
-          vkGetDisplayModePropertiesKHR    = PFN_vkGetDisplayModePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModePropertiesKHR" ) );
-          vkCreateDisplayModeKHR           = PFN_vkCreateDisplayModeKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayModeKHR" ) );
-          vkGetDisplayPlaneCapabilitiesKHR = PFN_vkGetDisplayPlaneCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilitiesKHR" ) );
-          vkCreateDisplayPlaneSurfaceKHR   = PFN_vkCreateDisplayPlaneSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayPlaneSurfaceKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_XLIB_KHR )
-          //=== VK_KHR_xlib_surface ===
-          vkCreateXlibSurfaceKHR = PFN_vkCreateXlibSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXlibSurfaceKHR" ) );
-          vkGetPhysicalDeviceXlibPresentationSupportKHR =
-            PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXlibPresentationSupportKHR" ) );
-#  endif /*VK_USE_PLATFORM_XLIB_KHR*/
-
-#  if defined( VK_USE_PLATFORM_XCB_KHR )
-          //=== VK_KHR_xcb_surface ===
-          vkCreateXcbSurfaceKHR = PFN_vkCreateXcbSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXcbSurfaceKHR" ) );
-          vkGetPhysicalDeviceXcbPresentationSupportKHR =
-            PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXcbPresentationSupportKHR" ) );
-#  endif /*VK_USE_PLATFORM_XCB_KHR*/
-
-#  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-          //=== VK_KHR_wayland_surface ===
-          vkCreateWaylandSurfaceKHR = PFN_vkCreateWaylandSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWaylandSurfaceKHR" ) );
-          vkGetPhysicalDeviceWaylandPresentationSupportKHR =
-            PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWaylandPresentationSupportKHR" ) );
-#  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
-
-#  if defined( VK_USE_PLATFORM_ANDROID_KHR )
-          //=== VK_KHR_android_surface ===
-          vkCreateAndroidSurfaceKHR = PFN_vkCreateAndroidSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateAndroidSurfaceKHR" ) );
-#  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_KHR_win32_surface ===
-          vkCreateWin32SurfaceKHR = PFN_vkCreateWin32SurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWin32SurfaceKHR" ) );
-          vkGetPhysicalDeviceWin32PresentationSupportKHR =
-            PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWin32PresentationSupportKHR" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_EXT_debug_report ===
-          vkCreateDebugReportCallbackEXT  = PFN_vkCreateDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugReportCallbackEXT" ) );
-          vkDestroyDebugReportCallbackEXT = PFN_vkDestroyDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugReportCallbackEXT" ) );
-          vkDebugReportMessageEXT         = PFN_vkDebugReportMessageEXT( vkGetInstanceProcAddr( instance, "vkDebugReportMessageEXT" ) );
-
-          //=== VK_KHR_video_queue ===
-          vkGetPhysicalDeviceVideoCapabilitiesKHR =
-            PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR" ) );
-          vkGetPhysicalDeviceVideoFormatPropertiesKHR =
-            PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoFormatPropertiesKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_GGP )
-          //=== VK_GGP_stream_descriptor_surface ===
-          vkCreateStreamDescriptorSurfaceGGP =
-            PFN_vkCreateStreamDescriptorSurfaceGGP( vkGetInstanceProcAddr( instance, "vkCreateStreamDescriptorSurfaceGGP" ) );
-#  endif /*VK_USE_PLATFORM_GGP*/
-
-          //=== VK_NV_external_memory_capabilities ===
-          vkGetPhysicalDeviceExternalImageFormatPropertiesNV =
-            PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalImageFormatPropertiesNV" ) );
-
-          //=== VK_KHR_get_physical_device_properties2 ===
-          vkGetPhysicalDeviceFeatures2KHR = PFN_vkGetPhysicalDeviceFeatures2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2KHR" ) );
-          if ( !vkGetPhysicalDeviceFeatures2 )
-            vkGetPhysicalDeviceFeatures2 = vkGetPhysicalDeviceFeatures2KHR;
-          vkGetPhysicalDeviceProperties2KHR = PFN_vkGetPhysicalDeviceProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceProperties2 )
-            vkGetPhysicalDeviceProperties2 = vkGetPhysicalDeviceProperties2KHR;
-          vkGetPhysicalDeviceFormatProperties2KHR =
-            PFN_vkGetPhysicalDeviceFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceFormatProperties2 )
-            vkGetPhysicalDeviceFormatProperties2 = vkGetPhysicalDeviceFormatProperties2KHR;
-          vkGetPhysicalDeviceImageFormatProperties2KHR =
-            PFN_vkGetPhysicalDeviceImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceImageFormatProperties2 )
-            vkGetPhysicalDeviceImageFormatProperties2 = vkGetPhysicalDeviceImageFormatProperties2KHR;
-          vkGetPhysicalDeviceQueueFamilyProperties2KHR =
-            PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceQueueFamilyProperties2 )
-            vkGetPhysicalDeviceQueueFamilyProperties2 = vkGetPhysicalDeviceQueueFamilyProperties2KHR;
-          vkGetPhysicalDeviceMemoryProperties2KHR =
-            PFN_vkGetPhysicalDeviceMemoryProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceMemoryProperties2 )
-            vkGetPhysicalDeviceMemoryProperties2 = vkGetPhysicalDeviceMemoryProperties2KHR;
-          vkGetPhysicalDeviceSparseImageFormatProperties2KHR =
-            PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR" ) );
-          if ( !vkGetPhysicalDeviceSparseImageFormatProperties2 )
-            vkGetPhysicalDeviceSparseImageFormatProperties2 = vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
-
-#  if defined( VK_USE_PLATFORM_VI_NN )
-          //=== VK_NN_vi_surface ===
-          vkCreateViSurfaceNN = PFN_vkCreateViSurfaceNN( vkGetInstanceProcAddr( instance, "vkCreateViSurfaceNN" ) );
-#  endif /*VK_USE_PLATFORM_VI_NN*/
-
-          //=== VK_KHR_device_group_creation ===
-          vkEnumeratePhysicalDeviceGroupsKHR =
-            PFN_vkEnumeratePhysicalDeviceGroupsKHR( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroupsKHR" ) );
-          if ( !vkEnumeratePhysicalDeviceGroups )
-            vkEnumeratePhysicalDeviceGroups = vkEnumeratePhysicalDeviceGroupsKHR;
-
-          //=== VK_KHR_external_memory_capabilities ===
-          vkGetPhysicalDeviceExternalBufferPropertiesKHR =
-            PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferPropertiesKHR" ) );
-          if ( !vkGetPhysicalDeviceExternalBufferProperties )
-            vkGetPhysicalDeviceExternalBufferProperties = vkGetPhysicalDeviceExternalBufferPropertiesKHR;
-
-          //=== VK_KHR_external_semaphore_capabilities ===
-          vkGetPhysicalDeviceExternalSemaphorePropertiesKHR =
-            PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" ) );
-          if ( !vkGetPhysicalDeviceExternalSemaphoreProperties )
-            vkGetPhysicalDeviceExternalSemaphoreProperties = vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
-
-          //=== VK_EXT_direct_mode_display ===
-          vkReleaseDisplayEXT = PFN_vkReleaseDisplayEXT( vkGetInstanceProcAddr( instance, "vkReleaseDisplayEXT" ) );
-
-#  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-          //=== VK_EXT_acquire_xlib_display ===
-          vkAcquireXlibDisplayEXT    = PFN_vkAcquireXlibDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireXlibDisplayEXT" ) );
-          vkGetRandROutputDisplayEXT = PFN_vkGetRandROutputDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetRandROutputDisplayEXT" ) );
-#  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
-
-          //=== VK_EXT_display_surface_counter ===
-          vkGetPhysicalDeviceSurfaceCapabilities2EXT =
-            PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2EXT" ) );
-
-          //=== VK_KHR_external_fence_capabilities ===
-          vkGetPhysicalDeviceExternalFencePropertiesKHR =
-            PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFencePropertiesKHR" ) );
-          if ( !vkGetPhysicalDeviceExternalFenceProperties )
-            vkGetPhysicalDeviceExternalFenceProperties = vkGetPhysicalDeviceExternalFencePropertiesKHR;
-
-          //=== VK_KHR_performance_query ===
-          vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
-            vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR" ) );
-          vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR" ) );
-
-          //=== VK_KHR_get_surface_capabilities2 ===
-          vkGetPhysicalDeviceSurfaceCapabilities2KHR =
-            PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2KHR" ) );
-          vkGetPhysicalDeviceSurfaceFormats2KHR =
-            PFN_vkGetPhysicalDeviceSurfaceFormats2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormats2KHR" ) );
-
-          //=== VK_KHR_get_display_properties2 ===
-          vkGetPhysicalDeviceDisplayProperties2KHR =
-            PFN_vkGetPhysicalDeviceDisplayProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayProperties2KHR" ) );
-          vkGetPhysicalDeviceDisplayPlaneProperties2KHR =
-            PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlaneProperties2KHR" ) );
-          vkGetDisplayModeProperties2KHR    = PFN_vkGetDisplayModeProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModeProperties2KHR" ) );
-          vkGetDisplayPlaneCapabilities2KHR = PFN_vkGetDisplayPlaneCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilities2KHR" ) );
-
-#  if defined( VK_USE_PLATFORM_IOS_MVK )
-          //=== VK_MVK_ios_surface ===
-          vkCreateIOSSurfaceMVK = PFN_vkCreateIOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateIOSSurfaceMVK" ) );
-#  endif /*VK_USE_PLATFORM_IOS_MVK*/
-
-#  if defined( VK_USE_PLATFORM_MACOS_MVK )
-          //=== VK_MVK_macos_surface ===
-          vkCreateMacOSSurfaceMVK = PFN_vkCreateMacOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateMacOSSurfaceMVK" ) );
-#  endif /*VK_USE_PLATFORM_MACOS_MVK*/
-
-          //=== VK_EXT_debug_utils ===
-          vkCreateDebugUtilsMessengerEXT  = PFN_vkCreateDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugUtilsMessengerEXT" ) );
-          vkDestroyDebugUtilsMessengerEXT = PFN_vkDestroyDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugUtilsMessengerEXT" ) );
-          vkSubmitDebugUtilsMessageEXT    = PFN_vkSubmitDebugUtilsMessageEXT( vkGetInstanceProcAddr( instance, "vkSubmitDebugUtilsMessageEXT" ) );
-
-          //=== VK_EXT_sample_locations ===
-          vkGetPhysicalDeviceMultisamplePropertiesEXT =
-            PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT" ) );
-
-          //=== VK_EXT_calibrated_timestamps ===
-          vkGetPhysicalDeviceCalibrateableTimeDomainsEXT =
-            PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" ) );
-          if ( !vkGetPhysicalDeviceCalibrateableTimeDomainsKHR )
-            vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
-
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-          //=== VK_FUCHSIA_imagepipe_surface ===
-          vkCreateImagePipeSurfaceFUCHSIA = PFN_vkCreateImagePipeSurfaceFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateImagePipeSurfaceFUCHSIA" ) );
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-          //=== VK_EXT_metal_surface ===
-          vkCreateMetalSurfaceEXT = PFN_vkCreateMetalSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateMetalSurfaceEXT" ) );
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-          //=== VK_KHR_fragment_shading_rate ===
-          vkGetPhysicalDeviceFragmentShadingRatesKHR =
-            PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFragmentShadingRatesKHR" ) );
-
-          //=== VK_EXT_tooling_info ===
-          vkGetPhysicalDeviceToolPropertiesEXT =
-            PFN_vkGetPhysicalDeviceToolPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolPropertiesEXT" ) );
-          if ( !vkGetPhysicalDeviceToolProperties )
-            vkGetPhysicalDeviceToolProperties = vkGetPhysicalDeviceToolPropertiesEXT;
-
-          //=== VK_NV_cooperative_matrix ===
-          vkGetPhysicalDeviceCooperativeMatrixPropertiesNV =
-            PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV" ) );
-
-          //=== VK_NV_coverage_reduction_mode ===
-          vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV" ) );
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_EXT_full_screen_exclusive ===
-          vkGetPhysicalDeviceSurfacePresentModes2EXT =
-            PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_EXT_headless_surface ===
-          vkCreateHeadlessSurfaceEXT = PFN_vkCreateHeadlessSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateHeadlessSurfaceEXT" ) );
-
-          //=== VK_EXT_acquire_drm_display ===
-          vkAcquireDrmDisplayEXT = PFN_vkAcquireDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireDrmDisplayEXT" ) );
-          vkGetDrmDisplayEXT     = PFN_vkGetDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetDrmDisplayEXT" ) );
-
-          //=== VK_KHR_video_encode_queue ===
-          vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_NV_acquire_winrt_display ===
-          vkAcquireWinrtDisplayNV = PFN_vkAcquireWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkAcquireWinrtDisplayNV" ) );
-          vkGetWinrtDisplayNV     = PFN_vkGetWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkGetWinrtDisplayNV" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-#  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-          //=== VK_EXT_directfb_surface ===
-          vkCreateDirectFBSurfaceEXT = PFN_vkCreateDirectFBSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateDirectFBSurfaceEXT" ) );
-          vkGetPhysicalDeviceDirectFBPresentationSupportEXT =
-            PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT" ) );
-#  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-
-#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
-          //=== VK_QNX_screen_surface ===
-          vkCreateScreenSurfaceQNX = PFN_vkCreateScreenSurfaceQNX( vkGetInstanceProcAddr( instance, "vkCreateScreenSurfaceQNX" ) );
-          vkGetPhysicalDeviceScreenPresentationSupportQNX =
-            PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceScreenPresentationSupportQNX" ) );
-#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-
-          //=== VK_ARM_tensors ===
-          vkGetPhysicalDeviceExternalTensorPropertiesARM =
-            PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalTensorPropertiesARM" ) );
-
-          //=== VK_NV_optical_flow ===
-          vkGetPhysicalDeviceOpticalFlowImageFormatsNV =
-            PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV" ) );
-
-          //=== VK_NV_cooperative_vector ===
-          vkGetPhysicalDeviceCooperativeVectorPropertiesNV =
-            PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeVectorPropertiesNV" ) );
-
-          //=== VK_KHR_cooperative_matrix ===
-          vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR =
-            PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR" ) );
-
-          //=== VK_ARM_data_graph ===
-          vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM = PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM" ) );
-          vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM" ) );
-
-          //=== VK_KHR_calibrated_timestamps ===
-          vkGetPhysicalDeviceCalibrateableTimeDomainsKHR =
-            PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-          //=== VK_OHOS_surface ===
-          vkCreateSurfaceOHOS = PFN_vkCreateSurfaceOHOS( vkGetInstanceProcAddr( instance, "vkCreateSurfaceOHOS" ) );
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-          //=== VK_NV_cooperative_matrix2 ===
-          vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-            vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV" ) );
-
-          //=== VK_ARM_performance_counters_by_region ===
-          vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-            vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM" ) );
-
-          vkGetDeviceProcAddr = PFN_vkGetDeviceProcAddr( vkGetInstanceProcAddr( instance, "vkGetDeviceProcAddr" ) );
-        }
-
-      public:
-        //=== VK_VERSION_1_0 ===
-        PFN_vkDestroyInstance                              vkDestroyInstance                              = 0;
-        PFN_vkEnumeratePhysicalDevices                     vkEnumeratePhysicalDevices                     = 0;
-        PFN_vkGetPhysicalDeviceFeatures                    vkGetPhysicalDeviceFeatures                    = 0;
-        PFN_vkGetPhysicalDeviceFormatProperties            vkGetPhysicalDeviceFormatProperties            = 0;
-        PFN_vkGetPhysicalDeviceImageFormatProperties       vkGetPhysicalDeviceImageFormatProperties       = 0;
-        PFN_vkGetPhysicalDeviceProperties                  vkGetPhysicalDeviceProperties                  = 0;
-        PFN_vkGetPhysicalDeviceQueueFamilyProperties       vkGetPhysicalDeviceQueueFamilyProperties       = 0;
-        PFN_vkGetPhysicalDeviceMemoryProperties            vkGetPhysicalDeviceMemoryProperties            = 0;
-        PFN_vkGetInstanceProcAddr                          vkGetInstanceProcAddr                          = 0;
-        PFN_vkCreateDevice                                 vkCreateDevice                                 = 0;
-        PFN_vkEnumerateDeviceExtensionProperties           vkEnumerateDeviceExtensionProperties           = 0;
-        PFN_vkEnumerateDeviceLayerProperties               vkEnumerateDeviceLayerProperties               = 0;
-        PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties = 0;
-
-        //=== VK_VERSION_1_1 ===
-        PFN_vkEnumeratePhysicalDeviceGroups                 vkEnumeratePhysicalDeviceGroups                 = 0;
-        PFN_vkGetPhysicalDeviceFeatures2                    vkGetPhysicalDeviceFeatures2                    = 0;
-        PFN_vkGetPhysicalDeviceProperties2                  vkGetPhysicalDeviceProperties2                  = 0;
-        PFN_vkGetPhysicalDeviceFormatProperties2            vkGetPhysicalDeviceFormatProperties2            = 0;
-        PFN_vkGetPhysicalDeviceImageFormatProperties2       vkGetPhysicalDeviceImageFormatProperties2       = 0;
-        PFN_vkGetPhysicalDeviceQueueFamilyProperties2       vkGetPhysicalDeviceQueueFamilyProperties2       = 0;
-        PFN_vkGetPhysicalDeviceMemoryProperties2            vkGetPhysicalDeviceMemoryProperties2            = 0;
-        PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2 = 0;
-        PFN_vkGetPhysicalDeviceExternalBufferProperties     vkGetPhysicalDeviceExternalBufferProperties     = 0;
-        PFN_vkGetPhysicalDeviceExternalFenceProperties      vkGetPhysicalDeviceExternalFenceProperties      = 0;
-        PFN_vkGetPhysicalDeviceExternalSemaphoreProperties  vkGetPhysicalDeviceExternalSemaphoreProperties  = 0;
+        vkEnumeratePhysicalDeviceGroups = PFN_vkEnumeratePhysicalDeviceGroups( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroups" ) );
+        vkGetPhysicalDeviceFeatures2    = PFN_vkGetPhysicalDeviceFeatures2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2" ) );
+        vkGetPhysicalDeviceProperties2  = PFN_vkGetPhysicalDeviceProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2" ) );
+        vkGetPhysicalDeviceFormatProperties2 =
+          PFN_vkGetPhysicalDeviceFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2" ) );
+        vkGetPhysicalDeviceImageFormatProperties2 =
+          PFN_vkGetPhysicalDeviceImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2" ) );
+        vkGetPhysicalDeviceQueueFamilyProperties2 =
+          PFN_vkGetPhysicalDeviceQueueFamilyProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2" ) );
+        vkGetPhysicalDeviceMemoryProperties2 =
+          PFN_vkGetPhysicalDeviceMemoryProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2" ) );
+        vkGetPhysicalDeviceSparseImageFormatProperties2 =
+          PFN_vkGetPhysicalDeviceSparseImageFormatProperties2( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2" ) );
+        vkGetPhysicalDeviceExternalBufferProperties =
+          PFN_vkGetPhysicalDeviceExternalBufferProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferProperties" ) );
+        vkGetPhysicalDeviceExternalFenceProperties =
+          PFN_vkGetPhysicalDeviceExternalFenceProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFenceProperties" ) );
+        vkGetPhysicalDeviceExternalSemaphoreProperties =
+          PFN_vkGetPhysicalDeviceExternalSemaphoreProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphoreProperties" ) );
 
         //=== VK_VERSION_1_3 ===
-        PFN_vkGetPhysicalDeviceToolProperties vkGetPhysicalDeviceToolProperties = 0;
+        vkGetPhysicalDeviceToolProperties = PFN_vkGetPhysicalDeviceToolProperties( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolProperties" ) );
 
         //=== VK_KHR_surface ===
-        PFN_vkDestroySurfaceKHR                       vkDestroySurfaceKHR                       = 0;
-        PFN_vkGetPhysicalDeviceSurfaceSupportKHR      vkGetPhysicalDeviceSurfaceSupportKHR      = 0;
-        PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR = 0;
-        PFN_vkGetPhysicalDeviceSurfaceFormatsKHR      vkGetPhysicalDeviceSurfaceFormatsKHR      = 0;
-        PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR = 0;
+        vkDestroySurfaceKHR = PFN_vkDestroySurfaceKHR( vkGetInstanceProcAddr( instance, "vkDestroySurfaceKHR" ) );
+        vkGetPhysicalDeviceSurfaceSupportKHR =
+          PFN_vkGetPhysicalDeviceSurfaceSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceSupportKHR" ) );
+        vkGetPhysicalDeviceSurfaceCapabilitiesKHR =
+          PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" ) );
+        vkGetPhysicalDeviceSurfaceFormatsKHR =
+          PFN_vkGetPhysicalDeviceSurfaceFormatsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormatsKHR" ) );
+        vkGetPhysicalDeviceSurfacePresentModesKHR =
+          PFN_vkGetPhysicalDeviceSurfacePresentModesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModesKHR" ) );
 
         //=== VK_KHR_swapchain ===
-        PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR = 0;
+        vkGetPhysicalDevicePresentRectanglesKHR =
+          PFN_vkGetPhysicalDevicePresentRectanglesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDevicePresentRectanglesKHR" ) );
 
         //=== VK_KHR_display ===
-        PFN_vkGetPhysicalDeviceDisplayPropertiesKHR      vkGetPhysicalDeviceDisplayPropertiesKHR      = 0;
-        PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR = 0;
-        PFN_vkGetDisplayPlaneSupportedDisplaysKHR        vkGetDisplayPlaneSupportedDisplaysKHR        = 0;
-        PFN_vkGetDisplayModePropertiesKHR                vkGetDisplayModePropertiesKHR                = 0;
-        PFN_vkCreateDisplayModeKHR                       vkCreateDisplayModeKHR                       = 0;
-        PFN_vkGetDisplayPlaneCapabilitiesKHR             vkGetDisplayPlaneCapabilitiesKHR             = 0;
-        PFN_vkCreateDisplayPlaneSurfaceKHR               vkCreateDisplayPlaneSurfaceKHR               = 0;
+        vkGetPhysicalDeviceDisplayPropertiesKHR =
+          PFN_vkGetPhysicalDeviceDisplayPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPropertiesKHR" ) );
+        vkGetPhysicalDeviceDisplayPlanePropertiesKHR =
+          PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlanePropertiesKHR" ) );
+        vkGetDisplayPlaneSupportedDisplaysKHR =
+          PFN_vkGetDisplayPlaneSupportedDisplaysKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneSupportedDisplaysKHR" ) );
+        vkGetDisplayModePropertiesKHR    = PFN_vkGetDisplayModePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModePropertiesKHR" ) );
+        vkCreateDisplayModeKHR           = PFN_vkCreateDisplayModeKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayModeKHR" ) );
+        vkGetDisplayPlaneCapabilitiesKHR = PFN_vkGetDisplayPlaneCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilitiesKHR" ) );
+        vkCreateDisplayPlaneSurfaceKHR   = PFN_vkCreateDisplayPlaneSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateDisplayPlaneSurfaceKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_XLIB_KHR )
         //=== VK_KHR_xlib_surface ===
-        PFN_vkCreateXlibSurfaceKHR                        vkCreateXlibSurfaceKHR                        = 0;
-        PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR = 0;
-#  else
-        PFN_dummy vkCreateXlibSurfaceKHR_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceXlibPresentationSupportKHR_placeholder = 0;
+        vkCreateXlibSurfaceKHR = PFN_vkCreateXlibSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXlibSurfaceKHR" ) );
+        vkGetPhysicalDeviceXlibPresentationSupportKHR =
+          PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXlibPresentationSupportKHR" ) );
 #  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
         //=== VK_KHR_xcb_surface ===
-        PFN_vkCreateXcbSurfaceKHR                        vkCreateXcbSurfaceKHR                        = 0;
-        PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR = 0;
-#  else
-        PFN_dummy vkCreateXcbSurfaceKHR_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceXcbPresentationSupportKHR_placeholder = 0;
+        vkCreateXcbSurfaceKHR = PFN_vkCreateXcbSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateXcbSurfaceKHR" ) );
+        vkGetPhysicalDeviceXcbPresentationSupportKHR =
+          PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceXcbPresentationSupportKHR" ) );
 #  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
         //=== VK_KHR_wayland_surface ===
-        PFN_vkCreateWaylandSurfaceKHR                        vkCreateWaylandSurfaceKHR                        = 0;
-        PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR = 0;
-#  else
-        PFN_dummy vkCreateWaylandSurfaceKHR_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceWaylandPresentationSupportKHR_placeholder = 0;
+        vkCreateWaylandSurfaceKHR = PFN_vkCreateWaylandSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWaylandSurfaceKHR" ) );
+        vkGetPhysicalDeviceWaylandPresentationSupportKHR =
+          PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWaylandPresentationSupportKHR" ) );
 #  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
         //=== VK_KHR_android_surface ===
-        PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR = 0;
-#  else
-        PFN_dummy vkCreateAndroidSurfaceKHR_placeholder = 0;
+        vkCreateAndroidSurfaceKHR = PFN_vkCreateAndroidSurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateAndroidSurfaceKHR" ) );
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_KHR_win32_surface ===
-        PFN_vkCreateWin32SurfaceKHR                        vkCreateWin32SurfaceKHR                        = 0;
-        PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR = 0;
-#  else
-        PFN_dummy vkCreateWin32SurfaceKHR_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceWin32PresentationSupportKHR_placeholder = 0;
+        vkCreateWin32SurfaceKHR = PFN_vkCreateWin32SurfaceKHR( vkGetInstanceProcAddr( instance, "vkCreateWin32SurfaceKHR" ) );
+        vkGetPhysicalDeviceWin32PresentationSupportKHR =
+          PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceWin32PresentationSupportKHR" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_EXT_debug_report ===
-        PFN_vkCreateDebugReportCallbackEXT  vkCreateDebugReportCallbackEXT  = 0;
-        PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = 0;
-        PFN_vkDebugReportMessageEXT         vkDebugReportMessageEXT         = 0;
+        vkCreateDebugReportCallbackEXT  = PFN_vkCreateDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugReportCallbackEXT" ) );
+        vkDestroyDebugReportCallbackEXT = PFN_vkDestroyDebugReportCallbackEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugReportCallbackEXT" ) );
+        vkDebugReportMessageEXT         = PFN_vkDebugReportMessageEXT( vkGetInstanceProcAddr( instance, "vkDebugReportMessageEXT" ) );
 
         //=== VK_KHR_video_queue ===
-        PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR     vkGetPhysicalDeviceVideoCapabilitiesKHR     = 0;
-        PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR = 0;
+        vkGetPhysicalDeviceVideoCapabilitiesKHR =
+          PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR" ) );
+        vkGetPhysicalDeviceVideoFormatPropertiesKHR =
+          PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoFormatPropertiesKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_GGP )
         //=== VK_GGP_stream_descriptor_surface ===
-        PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP = 0;
-#  else
-        PFN_dummy vkCreateStreamDescriptorSurfaceGGP_placeholder = 0;
+        vkCreateStreamDescriptorSurfaceGGP = PFN_vkCreateStreamDescriptorSurfaceGGP( vkGetInstanceProcAddr( instance, "vkCreateStreamDescriptorSurfaceGGP" ) );
 #  endif /*VK_USE_PLATFORM_GGP*/
 
         //=== VK_NV_external_memory_capabilities ===
-        PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV = 0;
+        vkGetPhysicalDeviceExternalImageFormatPropertiesNV =
+          PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalImageFormatPropertiesNV" ) );
 
         //=== VK_KHR_get_physical_device_properties2 ===
-        PFN_vkGetPhysicalDeviceFeatures2KHR                    vkGetPhysicalDeviceFeatures2KHR                    = 0;
-        PFN_vkGetPhysicalDeviceProperties2KHR                  vkGetPhysicalDeviceProperties2KHR                  = 0;
-        PFN_vkGetPhysicalDeviceFormatProperties2KHR            vkGetPhysicalDeviceFormatProperties2KHR            = 0;
-        PFN_vkGetPhysicalDeviceImageFormatProperties2KHR       vkGetPhysicalDeviceImageFormatProperties2KHR       = 0;
-        PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR       vkGetPhysicalDeviceQueueFamilyProperties2KHR       = 0;
-        PFN_vkGetPhysicalDeviceMemoryProperties2KHR            vkGetPhysicalDeviceMemoryProperties2KHR            = 0;
-        PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR = 0;
+        vkGetPhysicalDeviceFeatures2KHR = PFN_vkGetPhysicalDeviceFeatures2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFeatures2KHR" ) );
+        if ( !vkGetPhysicalDeviceFeatures2 )
+          vkGetPhysicalDeviceFeatures2 = vkGetPhysicalDeviceFeatures2KHR;
+        vkGetPhysicalDeviceProperties2KHR = PFN_vkGetPhysicalDeviceProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceProperties2 )
+          vkGetPhysicalDeviceProperties2 = vkGetPhysicalDeviceProperties2KHR;
+        vkGetPhysicalDeviceFormatProperties2KHR =
+          PFN_vkGetPhysicalDeviceFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFormatProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceFormatProperties2 )
+          vkGetPhysicalDeviceFormatProperties2 = vkGetPhysicalDeviceFormatProperties2KHR;
+        vkGetPhysicalDeviceImageFormatProperties2KHR =
+          PFN_vkGetPhysicalDeviceImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceImageFormatProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceImageFormatProperties2 )
+          vkGetPhysicalDeviceImageFormatProperties2 = vkGetPhysicalDeviceImageFormatProperties2KHR;
+        vkGetPhysicalDeviceQueueFamilyProperties2KHR =
+          PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceQueueFamilyProperties2 )
+          vkGetPhysicalDeviceQueueFamilyProperties2 = vkGetPhysicalDeviceQueueFamilyProperties2KHR;
+        vkGetPhysicalDeviceMemoryProperties2KHR =
+          PFN_vkGetPhysicalDeviceMemoryProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceMemoryProperties2 )
+          vkGetPhysicalDeviceMemoryProperties2 = vkGetPhysicalDeviceMemoryProperties2KHR;
+        vkGetPhysicalDeviceSparseImageFormatProperties2KHR =
+          PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR" ) );
+        if ( !vkGetPhysicalDeviceSparseImageFormatProperties2 )
+          vkGetPhysicalDeviceSparseImageFormatProperties2 = vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
 
 #  if defined( VK_USE_PLATFORM_VI_NN )
         //=== VK_NN_vi_surface ===
-        PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN = 0;
-#  else
-        PFN_dummy vkCreateViSurfaceNN_placeholder = 0;
+        vkCreateViSurfaceNN = PFN_vkCreateViSurfaceNN( vkGetInstanceProcAddr( instance, "vkCreateViSurfaceNN" ) );
 #  endif /*VK_USE_PLATFORM_VI_NN*/
 
         //=== VK_KHR_device_group_creation ===
-        PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR = 0;
+        vkEnumeratePhysicalDeviceGroupsKHR = PFN_vkEnumeratePhysicalDeviceGroupsKHR( vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceGroupsKHR" ) );
+        if ( !vkEnumeratePhysicalDeviceGroups )
+          vkEnumeratePhysicalDeviceGroups = vkEnumeratePhysicalDeviceGroupsKHR;
 
         //=== VK_KHR_external_memory_capabilities ===
-        PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR = 0;
+        vkGetPhysicalDeviceExternalBufferPropertiesKHR =
+          PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalBufferPropertiesKHR" ) );
+        if ( !vkGetPhysicalDeviceExternalBufferProperties )
+          vkGetPhysicalDeviceExternalBufferProperties = vkGetPhysicalDeviceExternalBufferPropertiesKHR;
 
         //=== VK_KHR_external_semaphore_capabilities ===
-        PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = 0;
+        vkGetPhysicalDeviceExternalSemaphorePropertiesKHR =
+          PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" ) );
+        if ( !vkGetPhysicalDeviceExternalSemaphoreProperties )
+          vkGetPhysicalDeviceExternalSemaphoreProperties = vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
 
         //=== VK_EXT_direct_mode_display ===
-        PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT = 0;
+        vkReleaseDisplayEXT = PFN_vkReleaseDisplayEXT( vkGetInstanceProcAddr( instance, "vkReleaseDisplayEXT" ) );
 
 #  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
         //=== VK_EXT_acquire_xlib_display ===
-        PFN_vkAcquireXlibDisplayEXT    vkAcquireXlibDisplayEXT    = 0;
-        PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT = 0;
-#  else
-        PFN_dummy vkAcquireXlibDisplayEXT_placeholder    = 0;
-        PFN_dummy vkGetRandROutputDisplayEXT_placeholder = 0;
+        vkAcquireXlibDisplayEXT    = PFN_vkAcquireXlibDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireXlibDisplayEXT" ) );
+        vkGetRandROutputDisplayEXT = PFN_vkGetRandROutputDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetRandROutputDisplayEXT" ) );
 #  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
         //=== VK_EXT_display_surface_counter ===
-        PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT = 0;
+        vkGetPhysicalDeviceSurfaceCapabilities2EXT =
+          PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2EXT" ) );
 
         //=== VK_KHR_external_fence_capabilities ===
-        PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR = 0;
+        vkGetPhysicalDeviceExternalFencePropertiesKHR =
+          PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceExternalFencePropertiesKHR" ) );
+        if ( !vkGetPhysicalDeviceExternalFenceProperties )
+          vkGetPhysicalDeviceExternalFenceProperties = vkGetPhysicalDeviceExternalFencePropertiesKHR;
 
         //=== VK_KHR_performance_query ===
-        PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = 0;
-        PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         = 0;
+        vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+          vkGetInstanceProcAddr( instance, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR" ) );
+        vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
+          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR" ) );
 
         //=== VK_KHR_get_surface_capabilities2 ===
-        PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR = 0;
-        PFN_vkGetPhysicalDeviceSurfaceFormats2KHR      vkGetPhysicalDeviceSurfaceFormats2KHR      = 0;
+        vkGetPhysicalDeviceSurfaceCapabilities2KHR =
+          PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceCapabilities2KHR" ) );
+        vkGetPhysicalDeviceSurfaceFormats2KHR =
+          PFN_vkGetPhysicalDeviceSurfaceFormats2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfaceFormats2KHR" ) );
 
         //=== VK_KHR_get_display_properties2 ===
-        PFN_vkGetPhysicalDeviceDisplayProperties2KHR      vkGetPhysicalDeviceDisplayProperties2KHR      = 0;
-        PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR = 0;
-        PFN_vkGetDisplayModeProperties2KHR                vkGetDisplayModeProperties2KHR                = 0;
-        PFN_vkGetDisplayPlaneCapabilities2KHR             vkGetDisplayPlaneCapabilities2KHR             = 0;
+        vkGetPhysicalDeviceDisplayProperties2KHR =
+          PFN_vkGetPhysicalDeviceDisplayProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayProperties2KHR" ) );
+        vkGetPhysicalDeviceDisplayPlaneProperties2KHR =
+          PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDisplayPlaneProperties2KHR" ) );
+        vkGetDisplayModeProperties2KHR    = PFN_vkGetDisplayModeProperties2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayModeProperties2KHR" ) );
+        vkGetDisplayPlaneCapabilities2KHR = PFN_vkGetDisplayPlaneCapabilities2KHR( vkGetInstanceProcAddr( instance, "vkGetDisplayPlaneCapabilities2KHR" ) );
 
 #  if defined( VK_USE_PLATFORM_IOS_MVK )
         //=== VK_MVK_ios_surface ===
-        PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK = 0;
-#  else
-        PFN_dummy vkCreateIOSSurfaceMVK_placeholder = 0;
+        vkCreateIOSSurfaceMVK = PFN_vkCreateIOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateIOSSurfaceMVK" ) );
 #  endif /*VK_USE_PLATFORM_IOS_MVK*/
 
 #  if defined( VK_USE_PLATFORM_MACOS_MVK )
         //=== VK_MVK_macos_surface ===
-        PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK = 0;
-#  else
-        PFN_dummy vkCreateMacOSSurfaceMVK_placeholder = 0;
+        vkCreateMacOSSurfaceMVK = PFN_vkCreateMacOSSurfaceMVK( vkGetInstanceProcAddr( instance, "vkCreateMacOSSurfaceMVK" ) );
 #  endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
         //=== VK_EXT_debug_utils ===
-        PFN_vkCreateDebugUtilsMessengerEXT  vkCreateDebugUtilsMessengerEXT  = 0;
-        PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = 0;
-        PFN_vkSubmitDebugUtilsMessageEXT    vkSubmitDebugUtilsMessageEXT    = 0;
+        vkCreateDebugUtilsMessengerEXT  = PFN_vkCreateDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkCreateDebugUtilsMessengerEXT" ) );
+        vkDestroyDebugUtilsMessengerEXT = PFN_vkDestroyDebugUtilsMessengerEXT( vkGetInstanceProcAddr( instance, "vkDestroyDebugUtilsMessengerEXT" ) );
+        vkSubmitDebugUtilsMessageEXT    = PFN_vkSubmitDebugUtilsMessageEXT( vkGetInstanceProcAddr( instance, "vkSubmitDebugUtilsMessageEXT" ) );
 
         //=== VK_EXT_sample_locations ===
-        PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT = 0;
+        vkGetPhysicalDeviceMultisamplePropertiesEXT =
+          PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT" ) );
 
         //=== VK_EXT_calibrated_timestamps ===
-        PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = 0;
+        vkGetPhysicalDeviceCalibrateableTimeDomainsEXT =
+          PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" ) );
+        if ( !vkGetPhysicalDeviceCalibrateableTimeDomainsKHR )
+          vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = vkGetPhysicalDeviceCalibrateableTimeDomainsEXT;
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
         //=== VK_FUCHSIA_imagepipe_surface ===
-        PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA = 0;
-#  else
-        PFN_dummy vkCreateImagePipeSurfaceFUCHSIA_placeholder = 0;
+        vkCreateImagePipeSurfaceFUCHSIA = PFN_vkCreateImagePipeSurfaceFUCHSIA( vkGetInstanceProcAddr( instance, "vkCreateImagePipeSurfaceFUCHSIA" ) );
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
         //=== VK_EXT_metal_surface ===
-        PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT = 0;
-#  else
-        PFN_dummy vkCreateMetalSurfaceEXT_placeholder = 0;
+        vkCreateMetalSurfaceEXT = PFN_vkCreateMetalSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateMetalSurfaceEXT" ) );
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
         //=== VK_KHR_fragment_shading_rate ===
-        PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR = 0;
+        vkGetPhysicalDeviceFragmentShadingRatesKHR =
+          PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceFragmentShadingRatesKHR" ) );
 
         //=== VK_EXT_tooling_info ===
-        PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT = 0;
+        vkGetPhysicalDeviceToolPropertiesEXT =
+          PFN_vkGetPhysicalDeviceToolPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceToolPropertiesEXT" ) );
+        if ( !vkGetPhysicalDeviceToolProperties )
+          vkGetPhysicalDeviceToolProperties = vkGetPhysicalDeviceToolPropertiesEXT;
 
         //=== VK_NV_cooperative_matrix ===
-        PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = 0;
+        vkGetPhysicalDeviceCooperativeMatrixPropertiesNV =
+          PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesNV" ) );
 
         //=== VK_NV_coverage_reduction_mode ===
-        PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = 0;
+        vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV" ) );
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_EXT_full_screen_exclusive ===
-        PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT = 0;
-#  else
-        PFN_dummy vkGetPhysicalDeviceSurfacePresentModes2EXT_placeholder = 0;
+        vkGetPhysicalDeviceSurfacePresentModes2EXT =
+          PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_EXT_headless_surface ===
-        PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT = 0;
+        vkCreateHeadlessSurfaceEXT = PFN_vkCreateHeadlessSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateHeadlessSurfaceEXT" ) );
 
         //=== VK_EXT_acquire_drm_display ===
-        PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT = 0;
-        PFN_vkGetDrmDisplayEXT     vkGetDrmDisplayEXT     = 0;
+        vkAcquireDrmDisplayEXT = PFN_vkAcquireDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkAcquireDrmDisplayEXT" ) );
+        vkGetDrmDisplayEXT     = PFN_vkGetDrmDisplayEXT( vkGetInstanceProcAddr( instance, "vkGetDrmDisplayEXT" ) );
 
         //=== VK_KHR_video_encode_queue ===
-        PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = 0;
+        vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+          vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_NV_acquire_winrt_display ===
-        PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV = 0;
-        PFN_vkGetWinrtDisplayNV     vkGetWinrtDisplayNV     = 0;
-#  else
-        PFN_dummy vkAcquireWinrtDisplayNV_placeholder = 0;
-        PFN_dummy vkGetWinrtDisplayNV_placeholder     = 0;
+        vkAcquireWinrtDisplayNV = PFN_vkAcquireWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkAcquireWinrtDisplayNV" ) );
+        vkGetWinrtDisplayNV     = PFN_vkGetWinrtDisplayNV( vkGetInstanceProcAddr( instance, "vkGetWinrtDisplayNV" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
         //=== VK_EXT_directfb_surface ===
-        PFN_vkCreateDirectFBSurfaceEXT                        vkCreateDirectFBSurfaceEXT                        = 0;
-        PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT = 0;
-#  else
-        PFN_dummy vkCreateDirectFBSurfaceEXT_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceDirectFBPresentationSupportEXT_placeholder = 0;
+        vkCreateDirectFBSurfaceEXT = PFN_vkCreateDirectFBSurfaceEXT( vkGetInstanceProcAddr( instance, "vkCreateDirectFBSurfaceEXT" ) );
+        vkGetPhysicalDeviceDirectFBPresentationSupportEXT =
+          PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT" ) );
 #  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
         //=== VK_QNX_screen_surface ===
-        PFN_vkCreateScreenSurfaceQNX                        vkCreateScreenSurfaceQNX                        = 0;
-        PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX = 0;
-#  else
-        PFN_dummy vkCreateScreenSurfaceQNX_placeholder                        = 0;
-        PFN_dummy vkGetPhysicalDeviceScreenPresentationSupportQNX_placeholder = 0;
+        vkCreateScreenSurfaceQNX = PFN_vkCreateScreenSurfaceQNX( vkGetInstanceProcAddr( instance, "vkCreateScreenSurfaceQNX" ) );
+        vkGetPhysicalDeviceScreenPresentationSupportQNX =
+          PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceScreenPresentationSupportQNX" ) );
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-        //=== VK_ARM_tensors ===
-        PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM vkGetPhysicalDeviceExternalTensorPropertiesARM = 0;
-
         //=== VK_NV_optical_flow ===
-        PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV = 0;
-
-        //=== VK_NV_cooperative_vector ===
-        PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV vkGetPhysicalDeviceCooperativeVectorPropertiesNV = 0;
+        vkGetPhysicalDeviceOpticalFlowImageFormatsNV =
+          PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV" ) );
 
         //=== VK_KHR_cooperative_matrix ===
-        PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = 0;
-
-        //=== VK_ARM_data_graph ===
-        PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM                 vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM                 = 0;
-        PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = 0;
+        vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR =
+          PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR" ) );
 
         //=== VK_KHR_calibrated_timestamps ===
-        PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = 0;
+        vkGetPhysicalDeviceCalibrateableTimeDomainsKHR =
+          PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsKHR" ) );
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_surface ===
-        PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS = 0;
+        vkGetDeviceProcAddr = PFN_vkGetDeviceProcAddr( vkGetInstanceProcAddr( instance, "vkGetDeviceProcAddr" ) );
+      }
+
+    public:
+      //=== VK_VERSION_1_0 ===
+      PFN_vkDestroyInstance                              vkDestroyInstance                              = 0;
+      PFN_vkEnumeratePhysicalDevices                     vkEnumeratePhysicalDevices                     = 0;
+      PFN_vkGetPhysicalDeviceFeatures                    vkGetPhysicalDeviceFeatures                    = 0;
+      PFN_vkGetPhysicalDeviceFormatProperties            vkGetPhysicalDeviceFormatProperties            = 0;
+      PFN_vkGetPhysicalDeviceImageFormatProperties       vkGetPhysicalDeviceImageFormatProperties       = 0;
+      PFN_vkGetPhysicalDeviceProperties                  vkGetPhysicalDeviceProperties                  = 0;
+      PFN_vkGetPhysicalDeviceQueueFamilyProperties       vkGetPhysicalDeviceQueueFamilyProperties       = 0;
+      PFN_vkGetPhysicalDeviceMemoryProperties            vkGetPhysicalDeviceMemoryProperties            = 0;
+      PFN_vkGetInstanceProcAddr                          vkGetInstanceProcAddr                          = 0;
+      PFN_vkCreateDevice                                 vkCreateDevice                                 = 0;
+      PFN_vkEnumerateDeviceExtensionProperties           vkEnumerateDeviceExtensionProperties           = 0;
+      PFN_vkEnumerateDeviceLayerProperties               vkEnumerateDeviceLayerProperties               = 0;
+      PFN_vkGetPhysicalDeviceSparseImageFormatProperties vkGetPhysicalDeviceSparseImageFormatProperties = 0;
+
+      //=== VK_VERSION_1_1 ===
+      PFN_vkEnumeratePhysicalDeviceGroups                 vkEnumeratePhysicalDeviceGroups                 = 0;
+      PFN_vkGetPhysicalDeviceFeatures2                    vkGetPhysicalDeviceFeatures2                    = 0;
+      PFN_vkGetPhysicalDeviceProperties2                  vkGetPhysicalDeviceProperties2                  = 0;
+      PFN_vkGetPhysicalDeviceFormatProperties2            vkGetPhysicalDeviceFormatProperties2            = 0;
+      PFN_vkGetPhysicalDeviceImageFormatProperties2       vkGetPhysicalDeviceImageFormatProperties2       = 0;
+      PFN_vkGetPhysicalDeviceQueueFamilyProperties2       vkGetPhysicalDeviceQueueFamilyProperties2       = 0;
+      PFN_vkGetPhysicalDeviceMemoryProperties2            vkGetPhysicalDeviceMemoryProperties2            = 0;
+      PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2 = 0;
+      PFN_vkGetPhysicalDeviceExternalBufferProperties     vkGetPhysicalDeviceExternalBufferProperties     = 0;
+      PFN_vkGetPhysicalDeviceExternalFenceProperties      vkGetPhysicalDeviceExternalFenceProperties      = 0;
+      PFN_vkGetPhysicalDeviceExternalSemaphoreProperties  vkGetPhysicalDeviceExternalSemaphoreProperties  = 0;
+
+      //=== VK_VERSION_1_3 ===
+      PFN_vkGetPhysicalDeviceToolProperties vkGetPhysicalDeviceToolProperties = 0;
+
+      //=== VK_KHR_surface ===
+      PFN_vkDestroySurfaceKHR                       vkDestroySurfaceKHR                       = 0;
+      PFN_vkGetPhysicalDeviceSurfaceSupportKHR      vkGetPhysicalDeviceSurfaceSupportKHR      = 0;
+      PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR = 0;
+      PFN_vkGetPhysicalDeviceSurfaceFormatsKHR      vkGetPhysicalDeviceSurfaceFormatsKHR      = 0;
+      PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR = 0;
+
+      //=== VK_KHR_swapchain ===
+      PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR = 0;
+
+      //=== VK_KHR_display ===
+      PFN_vkGetPhysicalDeviceDisplayPropertiesKHR      vkGetPhysicalDeviceDisplayPropertiesKHR      = 0;
+      PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR = 0;
+      PFN_vkGetDisplayPlaneSupportedDisplaysKHR        vkGetDisplayPlaneSupportedDisplaysKHR        = 0;
+      PFN_vkGetDisplayModePropertiesKHR                vkGetDisplayModePropertiesKHR                = 0;
+      PFN_vkCreateDisplayModeKHR                       vkCreateDisplayModeKHR                       = 0;
+      PFN_vkGetDisplayPlaneCapabilitiesKHR             vkGetDisplayPlaneCapabilitiesKHR             = 0;
+      PFN_vkCreateDisplayPlaneSurfaceKHR               vkCreateDisplayPlaneSurfaceKHR               = 0;
+
+#  if defined( VK_USE_PLATFORM_XLIB_KHR )
+      //=== VK_KHR_xlib_surface ===
+      PFN_vkCreateXlibSurfaceKHR                        vkCreateXlibSurfaceKHR                        = 0;
+      PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR = 0;
 #  else
-        PFN_dummy vkCreateSurfaceOHOS_placeholder = 0;
-#  endif /*VK_USE_PLATFORM_OHOS*/
+      PFN_dummy vkCreateXlibSurfaceKHR_placeholder                            = 0;
+      PFN_dummy vkGetPhysicalDeviceXlibPresentationSupportKHR_placeholder     = 0;
+#  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
-        //=== VK_NV_cooperative_matrix2 ===
-        PFN_vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV = 0;
+#  if defined( VK_USE_PLATFORM_XCB_KHR )
+      //=== VK_KHR_xcb_surface ===
+      PFN_vkCreateXcbSurfaceKHR                        vkCreateXcbSurfaceKHR                        = 0;
+      PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR = 0;
+#  else
+      PFN_dummy vkCreateXcbSurfaceKHR_placeholder                             = 0;
+      PFN_dummy vkGetPhysicalDeviceXcbPresentationSupportKHR_placeholder      = 0;
+#  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
-        //=== VK_ARM_performance_counters_by_region ===
-        PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM = 0;
-
-        PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr = 0;
-      };
-
-      class DeviceDispatcher : public ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderBase
-      {
-      public:
-        DeviceDispatcher( PFN_vkGetDeviceProcAddr getProcAddr, VkDevice device ) : vkGetDeviceProcAddr( getProcAddr )
-        {
-          //=== VK_VERSION_1_0 ===
-          vkGetDeviceProcAddr                = PFN_vkGetDeviceProcAddr( vkGetDeviceProcAddr( device, "vkGetDeviceProcAddr" ) );
-          vkDestroyDevice                    = PFN_vkDestroyDevice( vkGetDeviceProcAddr( device, "vkDestroyDevice" ) );
-          vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetDeviceProcAddr( device, "vkGetDeviceQueue" ) );
-          vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetDeviceProcAddr( device, "vkQueueSubmit" ) );
-          vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetDeviceProcAddr( device, "vkQueueWaitIdle" ) );
-          vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetDeviceProcAddr( device, "vkDeviceWaitIdle" ) );
-          vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetDeviceProcAddr( device, "vkAllocateMemory" ) );
-          vkFreeMemory                       = PFN_vkFreeMemory( vkGetDeviceProcAddr( device, "vkFreeMemory" ) );
-          vkMapMemory                        = PFN_vkMapMemory( vkGetDeviceProcAddr( device, "vkMapMemory" ) );
-          vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetDeviceProcAddr( device, "vkUnmapMemory" ) );
-          vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkFlushMappedMemoryRanges" ) );
-          vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkInvalidateMappedMemoryRanges" ) );
-          vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryCommitment" ) );
-          vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetDeviceProcAddr( device, "vkBindBufferMemory" ) );
-          vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetDeviceProcAddr( device, "vkBindImageMemory" ) );
-          vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements" ) );
-          vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements" ) );
-          vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements" ) );
-          vkQueueBindSparse                  = PFN_vkQueueBindSparse( vkGetDeviceProcAddr( device, "vkQueueBindSparse" ) );
-          vkCreateFence                      = PFN_vkCreateFence( vkGetDeviceProcAddr( device, "vkCreateFence" ) );
-          vkDestroyFence                     = PFN_vkDestroyFence( vkGetDeviceProcAddr( device, "vkDestroyFence" ) );
-          vkResetFences                      = PFN_vkResetFences( vkGetDeviceProcAddr( device, "vkResetFences" ) );
-          vkGetFenceStatus                   = PFN_vkGetFenceStatus( vkGetDeviceProcAddr( device, "vkGetFenceStatus" ) );
-          vkWaitForFences                    = PFN_vkWaitForFences( vkGetDeviceProcAddr( device, "vkWaitForFences" ) );
-          vkCreateSemaphore                  = PFN_vkCreateSemaphore( vkGetDeviceProcAddr( device, "vkCreateSemaphore" ) );
-          vkDestroySemaphore                 = PFN_vkDestroySemaphore( vkGetDeviceProcAddr( device, "vkDestroySemaphore" ) );
-          vkCreateQueryPool                  = PFN_vkCreateQueryPool( vkGetDeviceProcAddr( device, "vkCreateQueryPool" ) );
-          vkDestroyQueryPool                 = PFN_vkDestroyQueryPool( vkGetDeviceProcAddr( device, "vkDestroyQueryPool" ) );
-          vkGetQueryPoolResults              = PFN_vkGetQueryPoolResults( vkGetDeviceProcAddr( device, "vkGetQueryPoolResults" ) );
-          vkCreateBuffer                     = PFN_vkCreateBuffer( vkGetDeviceProcAddr( device, "vkCreateBuffer" ) );
-          vkDestroyBuffer                    = PFN_vkDestroyBuffer( vkGetDeviceProcAddr( device, "vkDestroyBuffer" ) );
-          vkCreateImage                      = PFN_vkCreateImage( vkGetDeviceProcAddr( device, "vkCreateImage" ) );
-          vkDestroyImage                     = PFN_vkDestroyImage( vkGetDeviceProcAddr( device, "vkDestroyImage" ) );
-          vkGetImageSubresourceLayout        = PFN_vkGetImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout" ) );
-          vkCreateImageView                  = PFN_vkCreateImageView( vkGetDeviceProcAddr( device, "vkCreateImageView" ) );
-          vkDestroyImageView                 = PFN_vkDestroyImageView( vkGetDeviceProcAddr( device, "vkDestroyImageView" ) );
-          vkCreateCommandPool                = PFN_vkCreateCommandPool( vkGetDeviceProcAddr( device, "vkCreateCommandPool" ) );
-          vkDestroyCommandPool               = PFN_vkDestroyCommandPool( vkGetDeviceProcAddr( device, "vkDestroyCommandPool" ) );
-          vkResetCommandPool                 = PFN_vkResetCommandPool( vkGetDeviceProcAddr( device, "vkResetCommandPool" ) );
-          vkAllocateCommandBuffers           = PFN_vkAllocateCommandBuffers( vkGetDeviceProcAddr( device, "vkAllocateCommandBuffers" ) );
-          vkFreeCommandBuffers               = PFN_vkFreeCommandBuffers( vkGetDeviceProcAddr( device, "vkFreeCommandBuffers" ) );
-          vkBeginCommandBuffer               = PFN_vkBeginCommandBuffer( vkGetDeviceProcAddr( device, "vkBeginCommandBuffer" ) );
-          vkEndCommandBuffer                 = PFN_vkEndCommandBuffer( vkGetDeviceProcAddr( device, "vkEndCommandBuffer" ) );
-          vkResetCommandBuffer               = PFN_vkResetCommandBuffer( vkGetDeviceProcAddr( device, "vkResetCommandBuffer" ) );
-          vkCmdCopyBuffer                    = PFN_vkCmdCopyBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer" ) );
-          vkCmdCopyImage                     = PFN_vkCmdCopyImage( vkGetDeviceProcAddr( device, "vkCmdCopyImage" ) );
-          vkCmdCopyBufferToImage             = PFN_vkCmdCopyBufferToImage( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage" ) );
-          vkCmdCopyImageToBuffer             = PFN_vkCmdCopyImageToBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer" ) );
-          vkCmdUpdateBuffer                  = PFN_vkCmdUpdateBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdateBuffer" ) );
-          vkCmdFillBuffer                    = PFN_vkCmdFillBuffer( vkGetDeviceProcAddr( device, "vkCmdFillBuffer" ) );
-          vkCmdPipelineBarrier               = PFN_vkCmdPipelineBarrier( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier" ) );
-          vkCmdBeginQuery                    = PFN_vkCmdBeginQuery( vkGetDeviceProcAddr( device, "vkCmdBeginQuery" ) );
-          vkCmdEndQuery                      = PFN_vkCmdEndQuery( vkGetDeviceProcAddr( device, "vkCmdEndQuery" ) );
-          vkCmdResetQueryPool                = PFN_vkCmdResetQueryPool( vkGetDeviceProcAddr( device, "vkCmdResetQueryPool" ) );
-          vkCmdWriteTimestamp                = PFN_vkCmdWriteTimestamp( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp" ) );
-          vkCmdCopyQueryPoolResults          = PFN_vkCmdCopyQueryPoolResults( vkGetDeviceProcAddr( device, "vkCmdCopyQueryPoolResults" ) );
-          vkCmdExecuteCommands               = PFN_vkCmdExecuteCommands( vkGetDeviceProcAddr( device, "vkCmdExecuteCommands" ) );
-          vkCreateEvent                      = PFN_vkCreateEvent( vkGetDeviceProcAddr( device, "vkCreateEvent" ) );
-          vkDestroyEvent                     = PFN_vkDestroyEvent( vkGetDeviceProcAddr( device, "vkDestroyEvent" ) );
-          vkGetEventStatus                   = PFN_vkGetEventStatus( vkGetDeviceProcAddr( device, "vkGetEventStatus" ) );
-          vkSetEvent                         = PFN_vkSetEvent( vkGetDeviceProcAddr( device, "vkSetEvent" ) );
-          vkResetEvent                       = PFN_vkResetEvent( vkGetDeviceProcAddr( device, "vkResetEvent" ) );
-          vkCreateBufferView                 = PFN_vkCreateBufferView( vkGetDeviceProcAddr( device, "vkCreateBufferView" ) );
-          vkDestroyBufferView                = PFN_vkDestroyBufferView( vkGetDeviceProcAddr( device, "vkDestroyBufferView" ) );
-          vkCreateShaderModule               = PFN_vkCreateShaderModule( vkGetDeviceProcAddr( device, "vkCreateShaderModule" ) );
-          vkDestroyShaderModule              = PFN_vkDestroyShaderModule( vkGetDeviceProcAddr( device, "vkDestroyShaderModule" ) );
-          vkCreatePipelineCache              = PFN_vkCreatePipelineCache( vkGetDeviceProcAddr( device, "vkCreatePipelineCache" ) );
-          vkDestroyPipelineCache             = PFN_vkDestroyPipelineCache( vkGetDeviceProcAddr( device, "vkDestroyPipelineCache" ) );
-          vkGetPipelineCacheData             = PFN_vkGetPipelineCacheData( vkGetDeviceProcAddr( device, "vkGetPipelineCacheData" ) );
-          vkMergePipelineCaches              = PFN_vkMergePipelineCaches( vkGetDeviceProcAddr( device, "vkMergePipelineCaches" ) );
-          vkCreateComputePipelines           = PFN_vkCreateComputePipelines( vkGetDeviceProcAddr( device, "vkCreateComputePipelines" ) );
-          vkDestroyPipeline                  = PFN_vkDestroyPipeline( vkGetDeviceProcAddr( device, "vkDestroyPipeline" ) );
-          vkCreatePipelineLayout             = PFN_vkCreatePipelineLayout( vkGetDeviceProcAddr( device, "vkCreatePipelineLayout" ) );
-          vkDestroyPipelineLayout            = PFN_vkDestroyPipelineLayout( vkGetDeviceProcAddr( device, "vkDestroyPipelineLayout" ) );
-          vkCreateSampler                    = PFN_vkCreateSampler( vkGetDeviceProcAddr( device, "vkCreateSampler" ) );
-          vkDestroySampler                   = PFN_vkDestroySampler( vkGetDeviceProcAddr( device, "vkDestroySampler" ) );
-          vkCreateDescriptorSetLayout        = PFN_vkCreateDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkCreateDescriptorSetLayout" ) );
-          vkDestroyDescriptorSetLayout       = PFN_vkDestroyDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkDestroyDescriptorSetLayout" ) );
-          vkCreateDescriptorPool             = PFN_vkCreateDescriptorPool( vkGetDeviceProcAddr( device, "vkCreateDescriptorPool" ) );
-          vkDestroyDescriptorPool            = PFN_vkDestroyDescriptorPool( vkGetDeviceProcAddr( device, "vkDestroyDescriptorPool" ) );
-          vkResetDescriptorPool              = PFN_vkResetDescriptorPool( vkGetDeviceProcAddr( device, "vkResetDescriptorPool" ) );
-          vkAllocateDescriptorSets           = PFN_vkAllocateDescriptorSets( vkGetDeviceProcAddr( device, "vkAllocateDescriptorSets" ) );
-          vkFreeDescriptorSets               = PFN_vkFreeDescriptorSets( vkGetDeviceProcAddr( device, "vkFreeDescriptorSets" ) );
-          vkUpdateDescriptorSets             = PFN_vkUpdateDescriptorSets( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSets" ) );
-          vkCmdBindPipeline                  = PFN_vkCmdBindPipeline( vkGetDeviceProcAddr( device, "vkCmdBindPipeline" ) );
-          vkCmdBindDescriptorSets            = PFN_vkCmdBindDescriptorSets( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets" ) );
-          vkCmdClearColorImage               = PFN_vkCmdClearColorImage( vkGetDeviceProcAddr( device, "vkCmdClearColorImage" ) );
-          vkCmdDispatch                      = PFN_vkCmdDispatch( vkGetDeviceProcAddr( device, "vkCmdDispatch" ) );
-          vkCmdDispatchIndirect              = PFN_vkCmdDispatchIndirect( vkGetDeviceProcAddr( device, "vkCmdDispatchIndirect" ) );
-          vkCmdSetEvent                      = PFN_vkCmdSetEvent( vkGetDeviceProcAddr( device, "vkCmdSetEvent" ) );
-          vkCmdResetEvent                    = PFN_vkCmdResetEvent( vkGetDeviceProcAddr( device, "vkCmdResetEvent" ) );
-          vkCmdWaitEvents                    = PFN_vkCmdWaitEvents( vkGetDeviceProcAddr( device, "vkCmdWaitEvents" ) );
-          vkCmdPushConstants                 = PFN_vkCmdPushConstants( vkGetDeviceProcAddr( device, "vkCmdPushConstants" ) );
-          vkCreateGraphicsPipelines          = PFN_vkCreateGraphicsPipelines( vkGetDeviceProcAddr( device, "vkCreateGraphicsPipelines" ) );
-          vkCreateFramebuffer                = PFN_vkCreateFramebuffer( vkGetDeviceProcAddr( device, "vkCreateFramebuffer" ) );
-          vkDestroyFramebuffer               = PFN_vkDestroyFramebuffer( vkGetDeviceProcAddr( device, "vkDestroyFramebuffer" ) );
-          vkCreateRenderPass                 = PFN_vkCreateRenderPass( vkGetDeviceProcAddr( device, "vkCreateRenderPass" ) );
-          vkDestroyRenderPass                = PFN_vkDestroyRenderPass( vkGetDeviceProcAddr( device, "vkDestroyRenderPass" ) );
-          vkGetRenderAreaGranularity         = PFN_vkGetRenderAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderAreaGranularity" ) );
-          vkCmdSetViewport                   = PFN_vkCmdSetViewport( vkGetDeviceProcAddr( device, "vkCmdSetViewport" ) );
-          vkCmdSetScissor                    = PFN_vkCmdSetScissor( vkGetDeviceProcAddr( device, "vkCmdSetScissor" ) );
-          vkCmdSetLineWidth                  = PFN_vkCmdSetLineWidth( vkGetDeviceProcAddr( device, "vkCmdSetLineWidth" ) );
-          vkCmdSetDepthBias                  = PFN_vkCmdSetDepthBias( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias" ) );
-          vkCmdSetBlendConstants             = PFN_vkCmdSetBlendConstants( vkGetDeviceProcAddr( device, "vkCmdSetBlendConstants" ) );
-          vkCmdSetDepthBounds                = PFN_vkCmdSetDepthBounds( vkGetDeviceProcAddr( device, "vkCmdSetDepthBounds" ) );
-          vkCmdSetStencilCompareMask         = PFN_vkCmdSetStencilCompareMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilCompareMask" ) );
-          vkCmdSetStencilWriteMask           = PFN_vkCmdSetStencilWriteMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilWriteMask" ) );
-          vkCmdSetStencilReference           = PFN_vkCmdSetStencilReference( vkGetDeviceProcAddr( device, "vkCmdSetStencilReference" ) );
-          vkCmdBindIndexBuffer               = PFN_vkCmdBindIndexBuffer( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer" ) );
-          vkCmdBindVertexBuffers             = PFN_vkCmdBindVertexBuffers( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers" ) );
-          vkCmdDraw                          = PFN_vkCmdDraw( vkGetDeviceProcAddr( device, "vkCmdDraw" ) );
-          vkCmdDrawIndexed                   = PFN_vkCmdDrawIndexed( vkGetDeviceProcAddr( device, "vkCmdDrawIndexed" ) );
-          vkCmdDrawIndirect                  = PFN_vkCmdDrawIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndirect" ) );
-          vkCmdDrawIndexedIndirect           = PFN_vkCmdDrawIndexedIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirect" ) );
-          vkCmdBlitImage                     = PFN_vkCmdBlitImage( vkGetDeviceProcAddr( device, "vkCmdBlitImage" ) );
-          vkCmdClearDepthStencilImage        = PFN_vkCmdClearDepthStencilImage( vkGetDeviceProcAddr( device, "vkCmdClearDepthStencilImage" ) );
-          vkCmdClearAttachments              = PFN_vkCmdClearAttachments( vkGetDeviceProcAddr( device, "vkCmdClearAttachments" ) );
-          vkCmdResolveImage                  = PFN_vkCmdResolveImage( vkGetDeviceProcAddr( device, "vkCmdResolveImage" ) );
-          vkCmdBeginRenderPass               = PFN_vkCmdBeginRenderPass( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass" ) );
-          vkCmdNextSubpass                   = PFN_vkCmdNextSubpass( vkGetDeviceProcAddr( device, "vkCmdNextSubpass" ) );
-          vkCmdEndRenderPass                 = PFN_vkCmdEndRenderPass( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass" ) );
-
-          //=== VK_VERSION_1_1 ===
-          vkBindBufferMemory2                 = PFN_vkBindBufferMemory2( vkGetDeviceProcAddr( device, "vkBindBufferMemory2" ) );
-          vkBindImageMemory2                  = PFN_vkBindImageMemory2( vkGetDeviceProcAddr( device, "vkBindImageMemory2" ) );
-          vkGetDeviceGroupPeerMemoryFeatures  = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeatures" ) );
-          vkCmdSetDeviceMask                  = PFN_vkCmdSetDeviceMask( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMask" ) );
-          vkGetImageMemoryRequirements2       = PFN_vkGetImageMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2" ) );
-          vkGetBufferMemoryRequirements2      = PFN_vkGetBufferMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2" ) );
-          vkGetImageSparseMemoryRequirements2 = PFN_vkGetImageSparseMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2" ) );
-          vkTrimCommandPool                   = PFN_vkTrimCommandPool( vkGetDeviceProcAddr( device, "vkTrimCommandPool" ) );
-          vkGetDeviceQueue2                   = PFN_vkGetDeviceQueue2( vkGetDeviceProcAddr( device, "vkGetDeviceQueue2" ) );
-          vkCmdDispatchBase                   = PFN_vkCmdDispatchBase( vkGetDeviceProcAddr( device, "vkCmdDispatchBase" ) );
-          vkCreateDescriptorUpdateTemplate    = PFN_vkCreateDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplate" ) );
-          vkDestroyDescriptorUpdateTemplate   = PFN_vkDestroyDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplate" ) );
-          vkUpdateDescriptorSetWithTemplate   = PFN_vkUpdateDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplate" ) );
-          vkGetDescriptorSetLayoutSupport     = PFN_vkGetDescriptorSetLayoutSupport( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupport" ) );
-          vkCreateSamplerYcbcrConversion      = PFN_vkCreateSamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversion" ) );
-          vkDestroySamplerYcbcrConversion     = PFN_vkDestroySamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversion" ) );
-
-          //=== VK_VERSION_1_2 ===
-          vkResetQueryPool                = PFN_vkResetQueryPool( vkGetDeviceProcAddr( device, "vkResetQueryPool" ) );
-          vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValue" ) );
-          vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetDeviceProcAddr( device, "vkWaitSemaphores" ) );
-          vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetDeviceProcAddr( device, "vkSignalSemaphore" ) );
-          vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddress" ) );
-          vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddress" ) );
-          vkGetDeviceMemoryOpaqueCaptureAddress =
-            PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
-          vkCmdDrawIndirectCount        = PFN_vkCmdDrawIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCount" ) );
-          vkCmdDrawIndexedIndirectCount = PFN_vkCmdDrawIndexedIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCount" ) );
-          vkCreateRenderPass2           = PFN_vkCreateRenderPass2( vkGetDeviceProcAddr( device, "vkCreateRenderPass2" ) );
-          vkCmdBeginRenderPass2         = PFN_vkCmdBeginRenderPass2( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2" ) );
-          vkCmdNextSubpass2             = PFN_vkCmdNextSubpass2( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2" ) );
-          vkCmdEndRenderPass2           = PFN_vkCmdEndRenderPass2( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2" ) );
-
-          //=== VK_VERSION_1_3 ===
-          vkCreatePrivateDataSlot             = PFN_vkCreatePrivateDataSlot( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlot" ) );
-          vkDestroyPrivateDataSlot            = PFN_vkDestroyPrivateDataSlot( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlot" ) );
-          vkSetPrivateData                    = PFN_vkSetPrivateData( vkGetDeviceProcAddr( device, "vkSetPrivateData" ) );
-          vkGetPrivateData                    = PFN_vkGetPrivateData( vkGetDeviceProcAddr( device, "vkGetPrivateData" ) );
-          vkCmdPipelineBarrier2               = PFN_vkCmdPipelineBarrier2( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2" ) );
-          vkCmdWriteTimestamp2                = PFN_vkCmdWriteTimestamp2( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2" ) );
-          vkQueueSubmit2                      = PFN_vkQueueSubmit2( vkGetDeviceProcAddr( device, "vkQueueSubmit2" ) );
-          vkCmdCopyBuffer2                    = PFN_vkCmdCopyBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2" ) );
-          vkCmdCopyImage2                     = PFN_vkCmdCopyImage2( vkGetDeviceProcAddr( device, "vkCmdCopyImage2" ) );
-          vkCmdCopyBufferToImage2             = PFN_vkCmdCopyBufferToImage2( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2" ) );
-          vkCmdCopyImageToBuffer2             = PFN_vkCmdCopyImageToBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2" ) );
-          vkGetDeviceBufferMemoryRequirements = PFN_vkGetDeviceBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirements" ) );
-          vkGetDeviceImageMemoryRequirements  = PFN_vkGetDeviceImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirements" ) );
-          vkGetDeviceImageSparseMemoryRequirements =
-            PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirements" ) );
-          vkCmdSetEvent2                  = PFN_vkCmdSetEvent2( vkGetDeviceProcAddr( device, "vkCmdSetEvent2" ) );
-          vkCmdResetEvent2                = PFN_vkCmdResetEvent2( vkGetDeviceProcAddr( device, "vkCmdResetEvent2" ) );
-          vkCmdWaitEvents2                = PFN_vkCmdWaitEvents2( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2" ) );
-          vkCmdBlitImage2                 = PFN_vkCmdBlitImage2( vkGetDeviceProcAddr( device, "vkCmdBlitImage2" ) );
-          vkCmdResolveImage2              = PFN_vkCmdResolveImage2( vkGetDeviceProcAddr( device, "vkCmdResolveImage2" ) );
-          vkCmdBeginRendering             = PFN_vkCmdBeginRendering( vkGetDeviceProcAddr( device, "vkCmdBeginRendering" ) );
-          vkCmdEndRendering               = PFN_vkCmdEndRendering( vkGetDeviceProcAddr( device, "vkCmdEndRendering" ) );
-          vkCmdSetCullMode                = PFN_vkCmdSetCullMode( vkGetDeviceProcAddr( device, "vkCmdSetCullMode" ) );
-          vkCmdSetFrontFace               = PFN_vkCmdSetFrontFace( vkGetDeviceProcAddr( device, "vkCmdSetFrontFace" ) );
-          vkCmdSetPrimitiveTopology       = PFN_vkCmdSetPrimitiveTopology( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopology" ) );
-          vkCmdSetViewportWithCount       = PFN_vkCmdSetViewportWithCount( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCount" ) );
-          vkCmdSetScissorWithCount        = PFN_vkCmdSetScissorWithCount( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCount" ) );
-          vkCmdBindVertexBuffers2         = PFN_vkCmdBindVertexBuffers2( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2" ) );
-          vkCmdSetDepthTestEnable         = PFN_vkCmdSetDepthTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnable" ) );
-          vkCmdSetDepthWriteEnable        = PFN_vkCmdSetDepthWriteEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnable" ) );
-          vkCmdSetDepthCompareOp          = PFN_vkCmdSetDepthCompareOp( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOp" ) );
-          vkCmdSetDepthBoundsTestEnable   = PFN_vkCmdSetDepthBoundsTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnable" ) );
-          vkCmdSetStencilTestEnable       = PFN_vkCmdSetStencilTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnable" ) );
-          vkCmdSetStencilOp               = PFN_vkCmdSetStencilOp( vkGetDeviceProcAddr( device, "vkCmdSetStencilOp" ) );
-          vkCmdSetRasterizerDiscardEnable = PFN_vkCmdSetRasterizerDiscardEnable( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnable" ) );
-          vkCmdSetDepthBiasEnable         = PFN_vkCmdSetDepthBiasEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnable" ) );
-          vkCmdSetPrimitiveRestartEnable  = PFN_vkCmdSetPrimitiveRestartEnable( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnable" ) );
-
-          //=== VK_VERSION_1_4 ===
-          vkMapMemory2                        = PFN_vkMapMemory2( vkGetDeviceProcAddr( device, "vkMapMemory2" ) );
-          vkUnmapMemory2                      = PFN_vkUnmapMemory2( vkGetDeviceProcAddr( device, "vkUnmapMemory2" ) );
-          vkGetDeviceImageSubresourceLayout   = PFN_vkGetDeviceImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayout" ) );
-          vkGetImageSubresourceLayout2        = PFN_vkGetImageSubresourceLayout2( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2" ) );
-          vkCopyMemoryToImage                 = PFN_vkCopyMemoryToImage( vkGetDeviceProcAddr( device, "vkCopyMemoryToImage" ) );
-          vkCopyImageToMemory                 = PFN_vkCopyImageToMemory( vkGetDeviceProcAddr( device, "vkCopyImageToMemory" ) );
-          vkCopyImageToImage                  = PFN_vkCopyImageToImage( vkGetDeviceProcAddr( device, "vkCopyImageToImage" ) );
-          vkTransitionImageLayout             = PFN_vkTransitionImageLayout( vkGetDeviceProcAddr( device, "vkTransitionImageLayout" ) );
-          vkCmdPushDescriptorSet              = PFN_vkCmdPushDescriptorSet( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet" ) );
-          vkCmdPushDescriptorSetWithTemplate  = PFN_vkCmdPushDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate" ) );
-          vkCmdBindDescriptorSets2            = PFN_vkCmdBindDescriptorSets2( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2" ) );
-          vkCmdPushConstants2                 = PFN_vkCmdPushConstants2( vkGetDeviceProcAddr( device, "vkCmdPushConstants2" ) );
-          vkCmdPushDescriptorSet2             = PFN_vkCmdPushDescriptorSet2( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2" ) );
-          vkCmdPushDescriptorSetWithTemplate2 = PFN_vkCmdPushDescriptorSetWithTemplate2( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2" ) );
-          vkCmdSetLineStipple                 = PFN_vkCmdSetLineStipple( vkGetDeviceProcAddr( device, "vkCmdSetLineStipple" ) );
-          vkCmdBindIndexBuffer2               = PFN_vkCmdBindIndexBuffer2( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2" ) );
-          vkGetRenderingAreaGranularity       = PFN_vkGetRenderingAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularity" ) );
-          vkCmdSetRenderingAttachmentLocations =
-            PFN_vkCmdSetRenderingAttachmentLocations( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocations" ) );
-          vkCmdSetRenderingInputAttachmentIndices =
-            PFN_vkCmdSetRenderingInputAttachmentIndices( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndices" ) );
-
-          //=== VK_KHR_swapchain ===
-          vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetDeviceProcAddr( device, "vkCreateSwapchainKHR" ) );
-          vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetDeviceProcAddr( device, "vkDestroySwapchainKHR" ) );
-          vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainImagesKHR" ) );
-          vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetDeviceProcAddr( device, "vkAcquireNextImageKHR" ) );
-          vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetDeviceProcAddr( device, "vkQueuePresentKHR" ) );
-          vkGetDeviceGroupPresentCapabilitiesKHR =
-            PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
-          vkGetDeviceGroupSurfacePresentModesKHR =
-            PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
-          vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetDeviceProcAddr( device, "vkAcquireNextImage2KHR" ) );
-
-          //=== VK_KHR_display_swapchain ===
-          vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetDeviceProcAddr( device, "vkCreateSharedSwapchainsKHR" ) );
-
-          //=== VK_EXT_debug_marker ===
-          vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectTagEXT" ) );
-          vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectNameEXT" ) );
-          vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerBeginEXT" ) );
-          vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerEndEXT" ) );
-          vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerInsertEXT" ) );
-
-          //=== VK_KHR_video_queue ===
-          vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionKHR" ) );
-          vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionKHR" ) );
-          vkGetVideoSessionMemoryRequirementsKHR =
-            PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetVideoSessionMemoryRequirementsKHR" ) );
-          vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetDeviceProcAddr( device, "vkBindVideoSessionMemoryKHR" ) );
-          vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionParametersKHR" ) );
-          vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkUpdateVideoSessionParametersKHR" ) );
-          vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionParametersKHR" ) );
-          vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginVideoCodingKHR" ) );
-          vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdEndVideoCodingKHR" ) );
-          vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdControlVideoCodingKHR" ) );
-
-          //=== VK_KHR_video_decode_queue ===
-          vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdDecodeVideoKHR" ) );
-
-          //=== VK_EXT_transform_feedback ===
-          vkCmdBindTransformFeedbackBuffersEXT =
-            PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindTransformFeedbackBuffersEXT" ) );
-          vkCmdBeginTransformFeedbackEXT = PFN_vkCmdBeginTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdBeginTransformFeedbackEXT" ) );
-          vkCmdEndTransformFeedbackEXT   = PFN_vkCmdEndTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdEndTransformFeedbackEXT" ) );
-          vkCmdBeginQueryIndexedEXT      = PFN_vkCmdBeginQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdBeginQueryIndexedEXT" ) );
-          vkCmdEndQueryIndexedEXT        = PFN_vkCmdEndQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdEndQueryIndexedEXT" ) );
-          vkCmdDrawIndirectByteCountEXT  = PFN_vkCmdDrawIndirectByteCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectByteCountEXT" ) );
-
-          //=== VK_NVX_binary_import ===
-          vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetDeviceProcAddr( device, "vkCreateCuModuleNVX" ) );
-          vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetDeviceProcAddr( device, "vkCreateCuFunctionNVX" ) );
-          vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetDeviceProcAddr( device, "vkDestroyCuModuleNVX" ) );
-          vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetDeviceProcAddr( device, "vkDestroyCuFunctionNVX" ) );
-          vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetDeviceProcAddr( device, "vkCmdCuLaunchKernelNVX" ) );
-
-          //=== VK_NVX_image_view_handle ===
-          vkGetImageViewHandleNVX   = PFN_vkGetImageViewHandleNVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandleNVX" ) );
-          vkGetImageViewHandle64NVX = PFN_vkGetImageViewHandle64NVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandle64NVX" ) );
-          vkGetImageViewAddressNVX  = PFN_vkGetImageViewAddressNVX( vkGetDeviceProcAddr( device, "vkGetImageViewAddressNVX" ) );
-
-          //=== VK_AMD_draw_indirect_count ===
-          vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountAMD" ) );
-          if ( !vkCmdDrawIndirectCount )
-            vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
-          vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountAMD" ) );
-          if ( !vkCmdDrawIndexedIndirectCount )
-            vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
-
-          //=== VK_AMD_shader_info ===
-          vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetDeviceProcAddr( device, "vkGetShaderInfoAMD" ) );
-
-          //=== VK_KHR_dynamic_rendering ===
-          vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderingKHR" ) );
-          if ( !vkCmdBeginRendering )
-            vkCmdBeginRendering = vkCmdBeginRenderingKHR;
-          vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderingKHR" ) );
-          if ( !vkCmdEndRendering )
-            vkCmdEndRendering = vkCmdEndRenderingKHR;
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_NV_external_memory_win32 ===
-          vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleNV" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_KHR_device_group ===
-          vkGetDeviceGroupPeerMemoryFeaturesKHR =
-            PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
-          if ( !vkGetDeviceGroupPeerMemoryFeatures )
-            vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
-          vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMaskKHR" ) );
-          if ( !vkCmdSetDeviceMask )
-            vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
-          vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetDeviceProcAddr( device, "vkCmdDispatchBaseKHR" ) );
-          if ( !vkCmdDispatchBase )
-            vkCmdDispatchBase = vkCmdDispatchBaseKHR;
-
-          //=== VK_KHR_maintenance1 ===
-          vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetDeviceProcAddr( device, "vkTrimCommandPoolKHR" ) );
-          if ( !vkTrimCommandPool )
-            vkTrimCommandPool = vkTrimCommandPoolKHR;
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_KHR_external_memory_win32 ===
-          vkGetMemoryWin32HandleKHR           = PFN_vkGetMemoryWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleKHR" ) );
-          vkGetMemoryWin32HandlePropertiesKHR = PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandlePropertiesKHR" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_KHR_external_memory_fd ===
-          vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdKHR" ) );
-          vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdPropertiesKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_KHR_external_semaphore_win32 ===
-          vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreWin32HandleKHR" ) );
-          vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreWin32HandleKHR" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_KHR_external_semaphore_fd ===
-          vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreFdKHR" ) );
-          vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreFdKHR" ) );
-
-          //=== VK_KHR_push_descriptor ===
-          vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetKHR" ) );
-          if ( !vkCmdPushDescriptorSet )
-            vkCmdPushDescriptorSet = vkCmdPushDescriptorSetKHR;
-          vkCmdPushDescriptorSetWithTemplateKHR =
-            PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
-          if ( !vkCmdPushDescriptorSetWithTemplate )
-            vkCmdPushDescriptorSetWithTemplate = vkCmdPushDescriptorSetWithTemplateKHR;
-
-          //=== VK_EXT_conditional_rendering ===
-          vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdBeginConditionalRenderingEXT" ) );
-          vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdEndConditionalRenderingEXT" ) );
-
-          //=== VK_KHR_descriptor_update_template ===
-          vkCreateDescriptorUpdateTemplateKHR = PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplateKHR" ) );
-          if ( !vkCreateDescriptorUpdateTemplate )
-            vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
-          vkDestroyDescriptorUpdateTemplateKHR =
-            PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplateKHR" ) );
-          if ( !vkDestroyDescriptorUpdateTemplate )
-            vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
-          vkUpdateDescriptorSetWithTemplateKHR =
-            PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplateKHR" ) );
-          if ( !vkUpdateDescriptorSetWithTemplate )
-            vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
-
-          //=== VK_NV_clip_space_w_scaling ===
-          vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingNV" ) );
-
-          //=== VK_EXT_display_control ===
-          vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetDeviceProcAddr( device, "vkDisplayPowerControlEXT" ) );
-          vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDeviceEventEXT" ) );
-          vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDisplayEventEXT" ) );
-          vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainCounterEXT" ) );
-
-          //=== VK_GOOGLE_display_timing ===
-          vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetDeviceProcAddr( device, "vkGetRefreshCycleDurationGOOGLE" ) );
-          vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingGOOGLE" ) );
-
-          //=== VK_EXT_discard_rectangles ===
-          vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEXT" ) );
-          vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEnableEXT" ) );
-          vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleModeEXT" ) );
-
-          //=== VK_EXT_hdr_metadata ===
-          vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetDeviceProcAddr( device, "vkSetHdrMetadataEXT" ) );
-
-          //=== VK_KHR_create_renderpass2 ===
-          vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCreateRenderPass2KHR" ) );
-          if ( !vkCreateRenderPass2 )
-            vkCreateRenderPass2 = vkCreateRenderPass2KHR;
-          vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2KHR" ) );
-          if ( !vkCmdBeginRenderPass2 )
-            vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
-          vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2KHR" ) );
-          if ( !vkCmdNextSubpass2 )
-            vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
-          vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2KHR" ) );
-          if ( !vkCmdEndRenderPass2 )
-            vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
-
-          //=== VK_KHR_shared_presentable_image ===
-          vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainStatusKHR" ) );
-
-#  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_KHR_external_fence_win32 ===
-          vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportFenceWin32HandleKHR" ) );
-          vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetFenceWin32HandleKHR" ) );
-#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
-
-          //=== VK_KHR_external_fence_fd ===
-          vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetDeviceProcAddr( device, "vkImportFenceFdKHR" ) );
-          vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetDeviceProcAddr( device, "vkGetFenceFdKHR" ) );
-
-          //=== VK_KHR_performance_query ===
-          vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetDeviceProcAddr( device, "vkAcquireProfilingLockKHR" ) );
-          vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetDeviceProcAddr( device, "vkReleaseProfilingLockKHR" ) );
-
-          //=== VK_EXT_debug_utils ===
-          vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectNameEXT" ) );
-          vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectTagEXT" ) );
-          vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueBeginDebugUtilsLabelEXT" ) );
-          vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueEndDebugUtilsLabelEXT" ) );
-          vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueInsertDebugUtilsLabelEXT" ) );
-          vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdBeginDebugUtilsLabelEXT" ) );
-          vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdEndDebugUtilsLabelEXT" ) );
-          vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdInsertDebugUtilsLabelEXT" ) );
+#  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
+      //=== VK_KHR_wayland_surface ===
+      PFN_vkCreateWaylandSurfaceKHR                        vkCreateWaylandSurfaceKHR                        = 0;
+      PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR = 0;
+#  else
+      PFN_dummy vkCreateWaylandSurfaceKHR_placeholder                         = 0;
+      PFN_dummy vkGetPhysicalDeviceWaylandPresentationSupportKHR_placeholder  = 0;
+#  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
-          //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-          vkGetAndroidHardwareBufferPropertiesANDROID =
-            PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetDeviceProcAddr( device, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
-          vkGetMemoryAndroidHardwareBufferANDROID =
-            PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetDeviceProcAddr( device, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
+      //=== VK_KHR_android_surface ===
+      PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR = 0;
+#  else
+      PFN_dummy vkCreateAndroidSurfaceKHR_placeholder                         = 0;
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-          //=== VK_AMDX_shader_enqueue ===
-          vkCreateExecutionGraphPipelinesAMDX = PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetDeviceProcAddr( device, "vkCreateExecutionGraphPipelinesAMDX" ) );
-          vkGetExecutionGraphPipelineScratchSizeAMDX =
-            PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
-          vkGetExecutionGraphPipelineNodeIndexAMDX =
-            PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
-          vkCmdInitializeGraphScratchMemoryAMDX =
-            PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetDeviceProcAddr( device, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
-          vkCmdDispatchGraphAMDX              = PFN_vkCmdDispatchGraphAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphAMDX" ) );
-          vkCmdDispatchGraphIndirectAMDX      = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectAMDX" ) );
-          vkCmdDispatchGraphIndirectCountAMDX = PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectCountAMDX" ) );
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-          //=== VK_EXT_sample_locations ===
-          vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEXT" ) );
-
-          //=== VK_KHR_get_memory_requirements2 ===
-          vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2KHR" ) );
-          if ( !vkGetImageMemoryRequirements2 )
-            vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
-          vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2KHR" ) );
-          if ( !vkGetBufferMemoryRequirements2 )
-            vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
-          vkGetImageSparseMemoryRequirements2KHR =
-            PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2KHR" ) );
-          if ( !vkGetImageSparseMemoryRequirements2 )
-            vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
-
-          //=== VK_KHR_acceleration_structure ===
-          vkCreateAccelerationStructureKHR    = PFN_vkCreateAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureKHR" ) );
-          vkDestroyAccelerationStructureKHR   = PFN_vkDestroyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureKHR" ) );
-          vkCmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresKHR" ) );
-          vkCmdBuildAccelerationStructuresIndirectKHR =
-            PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
-          vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkBuildAccelerationStructuresKHR" ) );
-          vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureKHR" ) );
-          vkCopyAccelerationStructureToMemoryKHR =
-            PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureToMemoryKHR" ) );
-          vkCopyMemoryToAccelerationStructureKHR =
-            PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyMemoryToAccelerationStructureKHR" ) );
-          vkWriteAccelerationStructuresPropertiesKHR =
-            PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkWriteAccelerationStructuresPropertiesKHR" ) );
-          vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureKHR" ) );
-          vkCmdCopyAccelerationStructureToMemoryKHR =
-            PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
-          vkCmdCopyMemoryToAccelerationStructureKHR =
-            PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
-          vkGetAccelerationStructureDeviceAddressKHR =
-            PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureDeviceAddressKHR" ) );
-          vkCmdWriteAccelerationStructuresPropertiesKHR =
-            PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
-          vkGetDeviceAccelerationStructureCompatibilityKHR =
-            PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetDeviceProcAddr( device, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
-          vkGetAccelerationStructureBuildSizesKHR =
-            PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureBuildSizesKHR" ) );
-
-          //=== VK_KHR_ray_tracing_pipeline ===
-          vkCmdTraceRaysKHR              = PFN_vkCmdTraceRaysKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysKHR" ) );
-          vkCreateRayTracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesKHR" ) );
-          vkGetRayTracingShaderGroupHandlesKHR =
-            PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesKHR" ) );
-          vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
-            PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
-          vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirectKHR" ) );
-          vkGetRayTracingShaderGroupStackSizeKHR =
-            PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
-          vkCmdSetRayTracingPipelineStackSizeKHR =
-            PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetDeviceProcAddr( device, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
-
-          //=== VK_KHR_sampler_ycbcr_conversion ===
-          vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversionKHR" ) );
-          if ( !vkCreateSamplerYcbcrConversion )
-            vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
-          vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversionKHR" ) );
-          if ( !vkDestroySamplerYcbcrConversion )
-            vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
-
-          //=== VK_KHR_bind_memory2 ===
-          vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetDeviceProcAddr( device, "vkBindBufferMemory2KHR" ) );
-          if ( !vkBindBufferMemory2 )
-            vkBindBufferMemory2 = vkBindBufferMemory2KHR;
-          vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetDeviceProcAddr( device, "vkBindImageMemory2KHR" ) );
-          if ( !vkBindImageMemory2 )
-            vkBindImageMemory2 = vkBindImageMemory2KHR;
-
-          //=== VK_EXT_image_drm_format_modifier ===
-          vkGetImageDrmFormatModifierPropertiesEXT =
-            PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
-
-          //=== VK_EXT_validation_cache ===
-          vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetDeviceProcAddr( device, "vkCreateValidationCacheEXT" ) );
-          vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetDeviceProcAddr( device, "vkDestroyValidationCacheEXT" ) );
-          vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetDeviceProcAddr( device, "vkMergeValidationCachesEXT" ) );
-          vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetDeviceProcAddr( device, "vkGetValidationCacheDataEXT" ) );
-
-          //=== VK_NV_shading_rate_image ===
-          vkCmdBindShadingRateImageNV = PFN_vkCmdBindShadingRateImageNV( vkGetDeviceProcAddr( device, "vkCmdBindShadingRateImageNV" ) );
-          vkCmdSetViewportShadingRatePaletteNV =
-            PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportShadingRatePaletteNV" ) );
-          vkCmdSetCoarseSampleOrderNV = PFN_vkCmdSetCoarseSampleOrderNV( vkGetDeviceProcAddr( device, "vkCmdSetCoarseSampleOrderNV" ) );
-
-          //=== VK_NV_ray_tracing ===
-          vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureNV" ) );
-          vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureNV" ) );
-          vkGetAccelerationStructureMemoryRequirementsNV =
-            PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
-          vkBindAccelerationStructureMemoryNV = PFN_vkBindAccelerationStructureMemoryNV( vkGetDeviceProcAddr( device, "vkBindAccelerationStructureMemoryNV" ) );
-          vkCmdBuildAccelerationStructureNV   = PFN_vkCmdBuildAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructureNV" ) );
-          vkCmdCopyAccelerationStructureNV    = PFN_vkCmdCopyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureNV" ) );
-          vkCmdTraceRaysNV                    = PFN_vkCmdTraceRaysNV( vkGetDeviceProcAddr( device, "vkCmdTraceRaysNV" ) );
-          vkCreateRayTracingPipelinesNV       = PFN_vkCreateRayTracingPipelinesNV( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesNV" ) );
-          vkGetRayTracingShaderGroupHandlesNV = PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesNV" ) );
-          if ( !vkGetRayTracingShaderGroupHandlesKHR )
-            vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
-          vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureHandleNV" ) );
-          vkCmdWriteAccelerationStructuresPropertiesNV =
-            PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
-          vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetDeviceProcAddr( device, "vkCompileDeferredNV" ) );
-
-          //=== VK_KHR_maintenance3 ===
-          vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupportKHR" ) );
-          if ( !vkGetDescriptorSetLayoutSupport )
-            vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
-
-          //=== VK_KHR_draw_indirect_count ===
-          vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountKHR" ) );
-          if ( !vkCmdDrawIndirectCount )
-            vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
-          vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountKHR" ) );
-          if ( !vkCmdDrawIndexedIndirectCount )
-            vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
-
-          //=== VK_EXT_external_memory_host ===
-          vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryHostPointerPropertiesEXT" ) );
-
-          //=== VK_AMD_buffer_marker ===
-          vkCmdWriteBufferMarkerAMD  = PFN_vkCmdWriteBufferMarkerAMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarkerAMD" ) );
-          vkCmdWriteBufferMarker2AMD = PFN_vkCmdWriteBufferMarker2AMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarker2AMD" ) );
-
-          //=== VK_EXT_calibrated_timestamps ===
-          vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsEXT" ) );
-          if ( !vkGetCalibratedTimestampsKHR )
-            vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
-
-          //=== VK_NV_mesh_shader ===
-          vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksNV" ) );
-          vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectNV" ) );
-          vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountNV" ) );
-
-          //=== VK_NV_scissor_exclusive ===
-          vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorEnableNV" ) );
-          vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorNV" ) );
-
-          //=== VK_NV_device_diagnostic_checkpoints ===
-          vkCmdSetCheckpointNV        = PFN_vkCmdSetCheckpointNV( vkGetDeviceProcAddr( device, "vkCmdSetCheckpointNV" ) );
-          vkGetQueueCheckpointDataNV  = PFN_vkGetQueueCheckpointDataNV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointDataNV" ) );
-          vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointData2NV" ) );
-
-          //=== VK_KHR_timeline_semaphore ===
-          vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValueKHR" ) );
-          if ( !vkGetSemaphoreCounterValue )
-            vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
-          vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetDeviceProcAddr( device, "vkWaitSemaphoresKHR" ) );
-          if ( !vkWaitSemaphores )
-            vkWaitSemaphores = vkWaitSemaphoresKHR;
-          vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetDeviceProcAddr( device, "vkSignalSemaphoreKHR" ) );
-          if ( !vkSignalSemaphore )
-            vkSignalSemaphore = vkSignalSemaphoreKHR;
-
-          //=== VK_EXT_present_timing ===
-          vkSetSwapchainPresentTimingQueueSizeEXT =
-            PFN_vkSetSwapchainPresentTimingQueueSizeEXT( vkGetDeviceProcAddr( device, "vkSetSwapchainPresentTimingQueueSizeEXT" ) );
-          vkGetSwapchainTimingPropertiesEXT = PFN_vkGetSwapchainTimingPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimingPropertiesEXT" ) );
-          vkGetSwapchainTimeDomainPropertiesEXT =
-            PFN_vkGetSwapchainTimeDomainPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimeDomainPropertiesEXT" ) );
-          vkGetPastPresentationTimingEXT = PFN_vkGetPastPresentationTimingEXT( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingEXT" ) );
-
-          //=== VK_INTEL_performance_query ===
-          vkInitializePerformanceApiINTEL   = PFN_vkInitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkInitializePerformanceApiINTEL" ) );
-          vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkUninitializePerformanceApiINTEL" ) );
-          vkCmdSetPerformanceMarkerINTEL    = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceMarkerINTEL" ) );
-          vkCmdSetPerformanceStreamMarkerINTEL =
-            PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
-          vkCmdSetPerformanceOverrideINTEL = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceOverrideINTEL" ) );
-          vkAcquirePerformanceConfigurationINTEL =
-            PFN_vkAcquirePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkAcquirePerformanceConfigurationINTEL" ) );
-          vkReleasePerformanceConfigurationINTEL =
-            PFN_vkReleasePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkReleasePerformanceConfigurationINTEL" ) );
-          vkQueueSetPerformanceConfigurationINTEL =
-            PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkQueueSetPerformanceConfigurationINTEL" ) );
-          vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetDeviceProcAddr( device, "vkGetPerformanceParameterINTEL" ) );
-
-          //=== VK_AMD_display_native_hdr ===
-          vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetDeviceProcAddr( device, "vkSetLocalDimmingAMD" ) );
-
-          //=== VK_KHR_fragment_shading_rate ===
-          vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateKHR" ) );
-
-          //=== VK_KHR_dynamic_rendering_local_read ===
-          vkCmdSetRenderingAttachmentLocationsKHR =
-            PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
-          if ( !vkCmdSetRenderingAttachmentLocations )
-            vkCmdSetRenderingAttachmentLocations = vkCmdSetRenderingAttachmentLocationsKHR;
-          vkCmdSetRenderingInputAttachmentIndicesKHR =
-            PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
-          if ( !vkCmdSetRenderingInputAttachmentIndices )
-            vkCmdSetRenderingInputAttachmentIndices = vkCmdSetRenderingInputAttachmentIndicesKHR;
-
-          //=== VK_EXT_buffer_device_address ===
-          vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressEXT" ) );
-          if ( !vkGetBufferDeviceAddress )
-            vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
-
-          //=== VK_KHR_present_wait ===
-          vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetDeviceProcAddr( device, "vkWaitForPresentKHR" ) );
-
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
-          //=== VK_EXT_full_screen_exclusive ===
-          vkAcquireFullScreenExclusiveModeEXT = PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkAcquireFullScreenExclusiveModeEXT" ) );
-          vkReleaseFullScreenExclusiveModeEXT = PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkReleaseFullScreenExclusiveModeEXT" ) );
-          vkGetDeviceGroupSurfacePresentModes2EXT =
-            PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
+      //=== VK_KHR_win32_surface ===
+      PFN_vkCreateWin32SurfaceKHR                        vkCreateWin32SurfaceKHR                        = 0;
+      PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR = 0;
+#  else
+      PFN_dummy vkCreateWin32SurfaceKHR_placeholder                           = 0;
+      PFN_dummy vkGetPhysicalDeviceWin32PresentationSupportKHR_placeholder    = 0;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-          //=== VK_KHR_buffer_device_address ===
-          vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressKHR" ) );
-          if ( !vkGetBufferDeviceAddress )
-            vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
-          vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddressKHR" ) );
-          if ( !vkGetBufferOpaqueCaptureAddress )
-            vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
-          vkGetDeviceMemoryOpaqueCaptureAddressKHR =
-            PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
-          if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
-            vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
+      //=== VK_EXT_debug_report ===
+      PFN_vkCreateDebugReportCallbackEXT  vkCreateDebugReportCallbackEXT  = 0;
+      PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = 0;
+      PFN_vkDebugReportMessageEXT         vkDebugReportMessageEXT         = 0;
 
-          //=== VK_EXT_line_rasterization ===
-          vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEXT" ) );
-          if ( !vkCmdSetLineStipple )
-            vkCmdSetLineStipple = vkCmdSetLineStippleEXT;
+      //=== VK_KHR_video_queue ===
+      PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR     vkGetPhysicalDeviceVideoCapabilitiesKHR     = 0;
+      PFN_vkGetPhysicalDeviceVideoFormatPropertiesKHR vkGetPhysicalDeviceVideoFormatPropertiesKHR = 0;
 
-          //=== VK_EXT_host_query_reset ===
-          vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetDeviceProcAddr( device, "vkResetQueryPoolEXT" ) );
-          if ( !vkResetQueryPool )
-            vkResetQueryPool = vkResetQueryPoolEXT;
+#  if defined( VK_USE_PLATFORM_GGP )
+      //=== VK_GGP_stream_descriptor_surface ===
+      PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP = 0;
+#  else
+      PFN_dummy vkCreateStreamDescriptorSurfaceGGP_placeholder                = 0;
+#  endif /*VK_USE_PLATFORM_GGP*/
 
-          //=== VK_EXT_extended_dynamic_state ===
-          vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetCullModeEXT" ) );
-          if ( !vkCmdSetCullMode )
-            vkCmdSetCullMode = vkCmdSetCullModeEXT;
-          vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetDeviceProcAddr( device, "vkCmdSetFrontFaceEXT" ) );
-          if ( !vkCmdSetFrontFace )
-            vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
-          vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopologyEXT" ) );
-          if ( !vkCmdSetPrimitiveTopology )
-            vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
-          vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCountEXT" ) );
-          if ( !vkCmdSetViewportWithCount )
-            vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
-          vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCountEXT" ) );
-          if ( !vkCmdSetScissorWithCount )
-            vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
-          vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2EXT" ) );
-          if ( !vkCmdBindVertexBuffers2 )
-            vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
-          vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnableEXT" ) );
-          if ( !vkCmdSetDepthTestEnable )
-            vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
-          vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnableEXT" ) );
-          if ( !vkCmdSetDepthWriteEnable )
-            vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
-          vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOpEXT" ) );
-          if ( !vkCmdSetDepthCompareOp )
-            vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
-          vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnableEXT" ) );
-          if ( !vkCmdSetDepthBoundsTestEnable )
-            vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
-          vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnableEXT" ) );
-          if ( !vkCmdSetStencilTestEnable )
-            vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
-          vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilOpEXT" ) );
-          if ( !vkCmdSetStencilOp )
-            vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
+      //=== VK_NV_external_memory_capabilities ===
+      PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV = 0;
 
-          //=== VK_KHR_deferred_host_operations ===
-          vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkCreateDeferredOperationKHR" ) );
-          vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkDestroyDeferredOperationKHR" ) );
-          vkGetDeferredOperationMaxConcurrencyKHR =
-            PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
-          vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationResultKHR" ) );
-          vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetDeviceProcAddr( device, "vkDeferredOperationJoinKHR" ) );
+      //=== VK_KHR_get_physical_device_properties2 ===
+      PFN_vkGetPhysicalDeviceFeatures2KHR                    vkGetPhysicalDeviceFeatures2KHR                    = 0;
+      PFN_vkGetPhysicalDeviceProperties2KHR                  vkGetPhysicalDeviceProperties2KHR                  = 0;
+      PFN_vkGetPhysicalDeviceFormatProperties2KHR            vkGetPhysicalDeviceFormatProperties2KHR            = 0;
+      PFN_vkGetPhysicalDeviceImageFormatProperties2KHR       vkGetPhysicalDeviceImageFormatProperties2KHR       = 0;
+      PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR       vkGetPhysicalDeviceQueueFamilyProperties2KHR       = 0;
+      PFN_vkGetPhysicalDeviceMemoryProperties2KHR            vkGetPhysicalDeviceMemoryProperties2KHR            = 0;
+      PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR = 0;
 
-          //=== VK_KHR_pipeline_executable_properties ===
-          vkGetPipelineExecutablePropertiesKHR =
-            PFN_vkGetPipelineExecutablePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutablePropertiesKHR" ) );
-          vkGetPipelineExecutableStatisticsKHR =
-            PFN_vkGetPipelineExecutableStatisticsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableStatisticsKHR" ) );
-          vkGetPipelineExecutableInternalRepresentationsKHR =
-            PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
+#  if defined( VK_USE_PLATFORM_VI_NN )
+      //=== VK_NN_vi_surface ===
+      PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN = 0;
+#  else
+      PFN_dummy vkCreateViSurfaceNN_placeholder                               = 0;
+#  endif /*VK_USE_PLATFORM_VI_NN*/
 
-          //=== VK_EXT_host_image_copy ===
-          vkCopyMemoryToImageEXT = PFN_vkCopyMemoryToImageEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToImageEXT" ) );
-          if ( !vkCopyMemoryToImage )
-            vkCopyMemoryToImage = vkCopyMemoryToImageEXT;
-          vkCopyImageToMemoryEXT = PFN_vkCopyImageToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyImageToMemoryEXT" ) );
-          if ( !vkCopyImageToMemory )
-            vkCopyImageToMemory = vkCopyImageToMemoryEXT;
-          vkCopyImageToImageEXT = PFN_vkCopyImageToImageEXT( vkGetDeviceProcAddr( device, "vkCopyImageToImageEXT" ) );
-          if ( !vkCopyImageToImage )
-            vkCopyImageToImage = vkCopyImageToImageEXT;
-          vkTransitionImageLayoutEXT = PFN_vkTransitionImageLayoutEXT( vkGetDeviceProcAddr( device, "vkTransitionImageLayoutEXT" ) );
-          if ( !vkTransitionImageLayout )
-            vkTransitionImageLayout = vkTransitionImageLayoutEXT;
-          vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2EXT" ) );
-          if ( !vkGetImageSubresourceLayout2 )
-            vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2EXT;
+      //=== VK_KHR_device_group_creation ===
+      PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR = 0;
 
-          //=== VK_KHR_map_memory2 ===
-          vkMapMemory2KHR = PFN_vkMapMemory2KHR( vkGetDeviceProcAddr( device, "vkMapMemory2KHR" ) );
-          if ( !vkMapMemory2 )
-            vkMapMemory2 = vkMapMemory2KHR;
-          vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetDeviceProcAddr( device, "vkUnmapMemory2KHR" ) );
-          if ( !vkUnmapMemory2 )
-            vkUnmapMemory2 = vkUnmapMemory2KHR;
+      //=== VK_KHR_external_memory_capabilities ===
+      PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR = 0;
 
-          //=== VK_EXT_swapchain_maintenance1 ===
-          vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesEXT" ) );
-          if ( !vkReleaseSwapchainImagesKHR )
-            vkReleaseSwapchainImagesKHR = vkReleaseSwapchainImagesEXT;
+      //=== VK_KHR_external_semaphore_capabilities ===
+      PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = 0;
 
-          //=== VK_NV_device_generated_commands ===
-          vkGetGeneratedCommandsMemoryRequirementsNV =
-            PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
-          vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsNV" ) );
-          vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsNV" ) );
-          vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetDeviceProcAddr( device, "vkCmdBindPipelineShaderGroupNV" ) );
-          vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutNV" ) );
-          vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutNV" ) );
+      //=== VK_EXT_direct_mode_display ===
+      PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT = 0;
 
-          //=== VK_EXT_depth_bias_control ===
-          vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias2EXT" ) );
+#  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
+      //=== VK_EXT_acquire_xlib_display ===
+      PFN_vkAcquireXlibDisplayEXT    vkAcquireXlibDisplayEXT    = 0;
+      PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT = 0;
+#  else
+      PFN_dummy vkAcquireXlibDisplayEXT_placeholder                           = 0;
+      PFN_dummy vkGetRandROutputDisplayEXT_placeholder                        = 0;
+#  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
-          //=== VK_EXT_private_data ===
-          vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlotEXT" ) );
-          if ( !vkCreatePrivateDataSlot )
-            vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
-          vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlotEXT" ) );
-          if ( !vkDestroyPrivateDataSlot )
-            vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
-          vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkSetPrivateDataEXT" ) );
-          if ( !vkSetPrivateData )
-            vkSetPrivateData = vkSetPrivateDataEXT;
-          vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkGetPrivateDataEXT" ) );
-          if ( !vkGetPrivateData )
-            vkGetPrivateData = vkGetPrivateDataEXT;
+      //=== VK_EXT_display_surface_counter ===
+      PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT = 0;
 
-          //=== VK_KHR_video_encode_queue ===
-          vkGetEncodedVideoSessionParametersKHR =
-            PFN_vkGetEncodedVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkGetEncodedVideoSessionParametersKHR" ) );
-          vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdEncodeVideoKHR" ) );
+      //=== VK_KHR_external_fence_capabilities ===
+      PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR = 0;
 
-#  if defined( VK_ENABLE_BETA_EXTENSIONS )
-          //=== VK_NV_cuda_kernel_launch ===
-          vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetDeviceProcAddr( device, "vkCreateCudaModuleNV" ) );
-          vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetDeviceProcAddr( device, "vkGetCudaModuleCacheNV" ) );
-          vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetDeviceProcAddr( device, "vkCreateCudaFunctionNV" ) );
-          vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetDeviceProcAddr( device, "vkDestroyCudaModuleNV" ) );
-          vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetDeviceProcAddr( device, "vkDestroyCudaFunctionNV" ) );
-          vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetDeviceProcAddr( device, "vkCmdCudaLaunchKernelNV" ) );
-#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      //=== VK_KHR_performance_query ===
+      PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = 0;
+      PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR         = 0;
 
-          //=== VK_QCOM_tile_shading ===
-          vkCmdDispatchTileQCOM          = PFN_vkCmdDispatchTileQCOM( vkGetDeviceProcAddr( device, "vkCmdDispatchTileQCOM" ) );
-          vkCmdBeginPerTileExecutionQCOM = PFN_vkCmdBeginPerTileExecutionQCOM( vkGetDeviceProcAddr( device, "vkCmdBeginPerTileExecutionQCOM" ) );
-          vkCmdEndPerTileExecutionQCOM   = PFN_vkCmdEndPerTileExecutionQCOM( vkGetDeviceProcAddr( device, "vkCmdEndPerTileExecutionQCOM" ) );
+      //=== VK_KHR_get_surface_capabilities2 ===
+      PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR = 0;
+      PFN_vkGetPhysicalDeviceSurfaceFormats2KHR      vkGetPhysicalDeviceSurfaceFormats2KHR      = 0;
+
+      //=== VK_KHR_get_display_properties2 ===
+      PFN_vkGetPhysicalDeviceDisplayProperties2KHR      vkGetPhysicalDeviceDisplayProperties2KHR      = 0;
+      PFN_vkGetPhysicalDeviceDisplayPlaneProperties2KHR vkGetPhysicalDeviceDisplayPlaneProperties2KHR = 0;
+      PFN_vkGetDisplayModeProperties2KHR                vkGetDisplayModeProperties2KHR                = 0;
+      PFN_vkGetDisplayPlaneCapabilities2KHR             vkGetDisplayPlaneCapabilities2KHR             = 0;
+
+#  if defined( VK_USE_PLATFORM_IOS_MVK )
+      //=== VK_MVK_ios_surface ===
+      PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK = 0;
+#  else
+      PFN_dummy vkCreateIOSSurfaceMVK_placeholder                             = 0;
+#  endif /*VK_USE_PLATFORM_IOS_MVK*/
+
+#  if defined( VK_USE_PLATFORM_MACOS_MVK )
+      //=== VK_MVK_macos_surface ===
+      PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK = 0;
+#  else
+      PFN_dummy vkCreateMacOSSurfaceMVK_placeholder                           = 0;
+#  endif /*VK_USE_PLATFORM_MACOS_MVK*/
+
+      //=== VK_EXT_debug_utils ===
+      PFN_vkCreateDebugUtilsMessengerEXT  vkCreateDebugUtilsMessengerEXT  = 0;
+      PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = 0;
+      PFN_vkSubmitDebugUtilsMessageEXT    vkSubmitDebugUtilsMessageEXT    = 0;
+
+      //=== VK_EXT_sample_locations ===
+      PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT = 0;
+
+      //=== VK_EXT_calibrated_timestamps ===
+      PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT vkGetPhysicalDeviceCalibrateableTimeDomainsEXT = 0;
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_imagepipe_surface ===
+      PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA = 0;
+#  else
+      PFN_dummy vkCreateImagePipeSurfaceFUCHSIA_placeholder                   = 0;
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
-          //=== VK_EXT_metal_objects ===
-          vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetDeviceProcAddr( device, "vkExportMetalObjectsEXT" ) );
+      //=== VK_EXT_metal_surface ===
+      PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT = 0;
+#  else
+      PFN_dummy vkCreateMetalSurfaceEXT_placeholder                           = 0;
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-          //=== VK_KHR_synchronization2 ===
-          vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdSetEvent2KHR" ) );
-          if ( !vkCmdSetEvent2 )
-            vkCmdSetEvent2 = vkCmdSetEvent2KHR;
-          vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdResetEvent2KHR" ) );
-          if ( !vkCmdResetEvent2 )
-            vkCmdResetEvent2 = vkCmdResetEvent2KHR;
-          vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2KHR" ) );
-          if ( !vkCmdWaitEvents2 )
-            vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
-          vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2KHR" ) );
-          if ( !vkCmdPipelineBarrier2 )
-            vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
-          vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2KHR" ) );
-          if ( !vkCmdWriteTimestamp2 )
-            vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
-          vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetDeviceProcAddr( device, "vkQueueSubmit2KHR" ) );
-          if ( !vkQueueSubmit2 )
-            vkQueueSubmit2 = vkQueueSubmit2KHR;
+      //=== VK_KHR_fragment_shading_rate ===
+      PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR vkGetPhysicalDeviceFragmentShadingRatesKHR = 0;
 
-          //=== VK_EXT_descriptor_buffer ===
-          vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSizeEXT" ) );
-          vkGetDescriptorSetLayoutBindingOffsetEXT =
-            PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
-          vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorEXT" ) );
-          vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBuffersEXT" ) );
-          vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
-          vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
-            PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
-          vkGetBufferOpaqueCaptureDescriptorDataEXT =
-            PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
-          vkGetImageOpaqueCaptureDescriptorDataEXT =
-            PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
-          vkGetImageViewOpaqueCaptureDescriptorDataEXT =
-            PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
-          vkGetSamplerOpaqueCaptureDescriptorDataEXT =
-            PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
-          vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-            vkGetDeviceProcAddr( device, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
+      //=== VK_EXT_tooling_info ===
+      PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT = 0;
 
-          //=== VK_NV_fragment_shading_rate_enums ===
-          vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateEnumNV" ) );
+      //=== VK_NV_cooperative_matrix ===
+      PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV = 0;
 
-          //=== VK_EXT_mesh_shader ===
-          vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksEXT" ) );
-          vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectEXT" ) );
-          vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
+      //=== VK_NV_coverage_reduction_mode ===
+      PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV = 0;
 
-          //=== VK_KHR_copy_commands2 ===
-          vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2KHR" ) );
-          if ( !vkCmdCopyBuffer2 )
-            vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
-          vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImage2KHR" ) );
-          if ( !vkCmdCopyImage2 )
-            vkCmdCopyImage2 = vkCmdCopyImage2KHR;
-          vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2KHR" ) );
-          if ( !vkCmdCopyBufferToImage2 )
-            vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
-          vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2KHR" ) );
-          if ( !vkCmdCopyImageToBuffer2 )
-            vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
-          vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetDeviceProcAddr( device, "vkCmdBlitImage2KHR" ) );
-          if ( !vkCmdBlitImage2 )
-            vkCmdBlitImage2 = vkCmdBlitImage2KHR;
-          vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetDeviceProcAddr( device, "vkCmdResolveImage2KHR" ) );
-          if ( !vkCmdResolveImage2 )
-            vkCmdResolveImage2 = vkCmdResolveImage2KHR;
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_EXT_full_screen_exclusive ===
+      PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT = 0;
+#  else
+      PFN_dummy vkGetPhysicalDeviceSurfacePresentModes2EXT_placeholder        = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-          //=== VK_EXT_device_fault ===
-          vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetDeviceProcAddr( device, "vkGetDeviceFaultInfoEXT" ) );
+      //=== VK_EXT_headless_surface ===
+      PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT = 0;
 
-          //=== VK_EXT_vertex_input_dynamic_state ===
-          vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetDeviceProcAddr( device, "vkCmdSetVertexInputEXT" ) );
+      //=== VK_EXT_acquire_drm_display ===
+      PFN_vkAcquireDrmDisplayEXT vkAcquireDrmDisplayEXT = 0;
+      PFN_vkGetDrmDisplayEXT     vkGetDrmDisplayEXT     = 0;
 
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-          //=== VK_FUCHSIA_external_memory ===
-          vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandleFUCHSIA" ) );
-          vkGetMemoryZirconHandlePropertiesFUCHSIA =
-            PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+      //=== VK_KHR_video_encode_queue ===
+      PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = 0;
 
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-          //=== VK_FUCHSIA_external_semaphore ===
-          vkImportSemaphoreZirconHandleFUCHSIA =
-            PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
-          vkGetSemaphoreZirconHandleFUCHSIA = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_NV_acquire_winrt_display ===
+      PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV = 0;
+      PFN_vkGetWinrtDisplayNV     vkGetWinrtDisplayNV     = 0;
+#  else
+      PFN_dummy vkAcquireWinrtDisplayNV_placeholder                           = 0;
+      PFN_dummy vkGetWinrtDisplayNV_placeholder                               = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-#  if defined( VK_USE_PLATFORM_FUCHSIA )
-          //=== VK_FUCHSIA_buffer_collection ===
-          vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkCreateBufferCollectionFUCHSIA" ) );
-          vkSetBufferCollectionImageConstraintsFUCHSIA =
-            PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
-          vkSetBufferCollectionBufferConstraintsFUCHSIA =
-            PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
-          vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkDestroyBufferCollectionFUCHSIA" ) );
-          vkGetBufferCollectionPropertiesFUCHSIA =
-            PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
-#  endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-          //=== VK_HUAWEI_subpass_shading ===
-          vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
-            PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetDeviceProcAddr( device, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
-          vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetDeviceProcAddr( device, "vkCmdSubpassShadingHUAWEI" ) );
-
-          //=== VK_HUAWEI_invocation_mask ===
-          vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetDeviceProcAddr( device, "vkCmdBindInvocationMaskHUAWEI" ) );
-
-          //=== VK_NV_external_memory_rdma ===
-          vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetDeviceProcAddr( device, "vkGetMemoryRemoteAddressNV" ) );
-
-          //=== VK_EXT_pipeline_properties ===
-          vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetPipelinePropertiesEXT" ) );
-
-          //=== VK_EXT_extended_dynamic_state2 ===
-          vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetDeviceProcAddr( device, "vkCmdSetPatchControlPointsEXT" ) );
-          vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnableEXT" ) );
-          if ( !vkCmdSetRasterizerDiscardEnable )
-            vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
-          vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnableEXT" ) );
-          if ( !vkCmdSetDepthBiasEnable )
-            vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
-          vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEXT" ) );
-          vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnableEXT" ) );
-          if ( !vkCmdSetPrimitiveRestartEnable )
-            vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
-
-          //=== VK_EXT_color_write_enable ===
-          vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteEnableEXT" ) );
-
-          //=== VK_KHR_ray_tracing_maintenance1 ===
-          vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirect2KHR" ) );
-
-          //=== VK_EXT_multi_draw ===
-          vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiEXT" ) );
-          vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiIndexedEXT" ) );
-
-          //=== VK_EXT_opacity_micromap ===
-          vkCreateMicromapEXT                 = PFN_vkCreateMicromapEXT( vkGetDeviceProcAddr( device, "vkCreateMicromapEXT" ) );
-          vkDestroyMicromapEXT                = PFN_vkDestroyMicromapEXT( vkGetDeviceProcAddr( device, "vkDestroyMicromapEXT" ) );
-          vkCmdBuildMicromapsEXT              = PFN_vkCmdBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkCmdBuildMicromapsEXT" ) );
-          vkBuildMicromapsEXT                 = PFN_vkBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkBuildMicromapsEXT" ) );
-          vkCopyMicromapEXT                   = PFN_vkCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapEXT" ) );
-          vkCopyMicromapToMemoryEXT           = PFN_vkCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapToMemoryEXT" ) );
-          vkCopyMemoryToMicromapEXT           = PFN_vkCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToMicromapEXT" ) );
-          vkWriteMicromapsPropertiesEXT       = PFN_vkWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkWriteMicromapsPropertiesEXT" ) );
-          vkCmdCopyMicromapEXT                = PFN_vkCmdCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapEXT" ) );
-          vkCmdCopyMicromapToMemoryEXT        = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapToMemoryEXT" ) );
-          vkCmdCopyMemoryToMicromapEXT        = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToMicromapEXT" ) );
-          vkCmdWriteMicromapsPropertiesEXT    = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkCmdWriteMicromapsPropertiesEXT" ) );
-          vkGetDeviceMicromapCompatibilityEXT = PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetDeviceProcAddr( device, "vkGetDeviceMicromapCompatibilityEXT" ) );
-          vkGetMicromapBuildSizesEXT          = PFN_vkGetMicromapBuildSizesEXT( vkGetDeviceProcAddr( device, "vkGetMicromapBuildSizesEXT" ) );
-
-          //=== VK_HUAWEI_cluster_culling_shader ===
-          vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterHUAWEI" ) );
-          vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterIndirectHUAWEI" ) );
-
-          //=== VK_EXT_pageable_device_local_memory ===
-          vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetDeviceProcAddr( device, "vkSetDeviceMemoryPriorityEXT" ) );
-
-          //=== VK_KHR_maintenance4 ===
-          vkGetDeviceBufferMemoryRequirementsKHR =
-            PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
-          if ( !vkGetDeviceBufferMemoryRequirements )
-            vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
-          vkGetDeviceImageMemoryRequirementsKHR =
-            PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirementsKHR" ) );
-          if ( !vkGetDeviceImageMemoryRequirements )
-            vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
-          vkGetDeviceImageSparseMemoryRequirementsKHR =
-            PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
-          if ( !vkGetDeviceImageSparseMemoryRequirements )
-            vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
-
-          //=== VK_VALVE_descriptor_set_host_mapping ===
-          vkGetDescriptorSetLayoutHostMappingInfoVALVE =
-            PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
-          vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetHostMappingVALVE" ) );
-
-          //=== VK_NV_copy_memory_indirect ===
-          vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectNV" ) );
-          vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectNV" ) );
-
-          //=== VK_NV_memory_decompression ===
-          vkCmdDecompressMemoryNV = PFN_vkCmdDecompressMemoryNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryNV" ) );
-          vkCmdDecompressMemoryIndirectCountNV =
-            PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountNV" ) );
-
-          //=== VK_NV_device_generated_commands_compute ===
-          vkGetPipelineIndirectMemoryRequirementsNV =
-            PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
-          vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) );
-          vkGetPipelineIndirectDeviceAddressNV =
-            PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) );
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-          //=== VK_OHOS_external_memory ===
-          vkGetNativeBufferPropertiesOHOS = PFN_vkGetNativeBufferPropertiesOHOS( vkGetDeviceProcAddr( device, "vkGetNativeBufferPropertiesOHOS" ) );
-          vkGetMemoryNativeBufferOHOS     = PFN_vkGetMemoryNativeBufferOHOS( vkGetDeviceProcAddr( device, "vkGetMemoryNativeBufferOHOS" ) );
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-          //=== VK_EXT_extended_dynamic_state3 ===
-          vkCmdSetDepthClampEnableEXT         = PFN_vkCmdSetDepthClampEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampEnableEXT" ) );
-          vkCmdSetPolygonModeEXT              = PFN_vkCmdSetPolygonModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetPolygonModeEXT" ) );
-          vkCmdSetRasterizationSamplesEXT     = PFN_vkCmdSetRasterizationSamplesEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationSamplesEXT" ) );
-          vkCmdSetSampleMaskEXT               = PFN_vkCmdSetSampleMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleMaskEXT" ) );
-          vkCmdSetAlphaToCoverageEnableEXT    = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToCoverageEnableEXT" ) );
-          vkCmdSetAlphaToOneEnableEXT         = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToOneEnableEXT" ) );
-          vkCmdSetLogicOpEnableEXT            = PFN_vkCmdSetLogicOpEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEnableEXT" ) );
-          vkCmdSetColorBlendEnableEXT         = PFN_vkCmdSetColorBlendEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEnableEXT" ) );
-          vkCmdSetColorBlendEquationEXT       = PFN_vkCmdSetColorBlendEquationEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEquationEXT" ) );
-          vkCmdSetColorWriteMaskEXT           = PFN_vkCmdSetColorWriteMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteMaskEXT" ) );
-          vkCmdSetTessellationDomainOriginEXT = PFN_vkCmdSetTessellationDomainOriginEXT( vkGetDeviceProcAddr( device, "vkCmdSetTessellationDomainOriginEXT" ) );
-          vkCmdSetRasterizationStreamEXT      = PFN_vkCmdSetRasterizationStreamEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationStreamEXT" ) );
-          vkCmdSetConservativeRasterizationModeEXT =
-            PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetConservativeRasterizationModeEXT" ) );
-          vkCmdSetExtraPrimitiveOverestimationSizeEXT =
-            PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetDeviceProcAddr( device, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
-          vkCmdSetDepthClipEnableEXT       = PFN_vkCmdSetDepthClipEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipEnableEXT" ) );
-          vkCmdSetSampleLocationsEnableEXT = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEnableEXT" ) );
-          vkCmdSetColorBlendAdvancedEXT    = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendAdvancedEXT" ) );
-          vkCmdSetProvokingVertexModeEXT   = PFN_vkCmdSetProvokingVertexModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetProvokingVertexModeEXT" ) );
-          vkCmdSetLineRasterizationModeEXT = PFN_vkCmdSetLineRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineRasterizationModeEXT" ) );
-          vkCmdSetLineStippleEnableEXT     = PFN_vkCmdSetLineStippleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEnableEXT" ) );
-          vkCmdSetDepthClipNegativeOneToOneEXT =
-            PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
-          vkCmdSetViewportWScalingEnableNV  = PFN_vkCmdSetViewportWScalingEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingEnableNV" ) );
-          vkCmdSetViewportSwizzleNV         = PFN_vkCmdSetViewportSwizzleNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportSwizzleNV" ) );
-          vkCmdSetCoverageToColorEnableNV   = PFN_vkCmdSetCoverageToColorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorEnableNV" ) );
-          vkCmdSetCoverageToColorLocationNV = PFN_vkCmdSetCoverageToColorLocationNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorLocationNV" ) );
-          vkCmdSetCoverageModulationModeNV  = PFN_vkCmdSetCoverageModulationModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationModeNV" ) );
-          vkCmdSetCoverageModulationTableEnableNV =
-            PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableEnableNV" ) );
-          vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableNV" ) );
-          vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetShadingRateImageEnableNV" ) );
-          vkCmdSetRepresentativeFragmentTestEnableNV =
-            PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
-          vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageReductionModeNV" ) );
-
-          //=== VK_ARM_tensors ===
-          vkCreateTensorARM                = PFN_vkCreateTensorARM( vkGetDeviceProcAddr( device, "vkCreateTensorARM" ) );
-          vkDestroyTensorARM               = PFN_vkDestroyTensorARM( vkGetDeviceProcAddr( device, "vkDestroyTensorARM" ) );
-          vkCreateTensorViewARM            = PFN_vkCreateTensorViewARM( vkGetDeviceProcAddr( device, "vkCreateTensorViewARM" ) );
-          vkDestroyTensorViewARM           = PFN_vkDestroyTensorViewARM( vkGetDeviceProcAddr( device, "vkDestroyTensorViewARM" ) );
-          vkGetTensorMemoryRequirementsARM = PFN_vkGetTensorMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetTensorMemoryRequirementsARM" ) );
-          vkBindTensorMemoryARM            = PFN_vkBindTensorMemoryARM( vkGetDeviceProcAddr( device, "vkBindTensorMemoryARM" ) );
-          vkGetDeviceTensorMemoryRequirementsARM =
-            PFN_vkGetDeviceTensorMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDeviceTensorMemoryRequirementsARM" ) );
-          vkCmdCopyTensorARM = PFN_vkCmdCopyTensorARM( vkGetDeviceProcAddr( device, "vkCmdCopyTensorARM" ) );
-          vkGetTensorOpaqueCaptureDescriptorDataARM =
-            PFN_vkGetTensorOpaqueCaptureDescriptorDataARM( vkGetDeviceProcAddr( device, "vkGetTensorOpaqueCaptureDescriptorDataARM" ) );
-          vkGetTensorViewOpaqueCaptureDescriptorDataARM =
-            PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM( vkGetDeviceProcAddr( device, "vkGetTensorViewOpaqueCaptureDescriptorDataARM" ) );
-
-          //=== VK_EXT_shader_module_identifier ===
-          vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleIdentifierEXT" ) );
-          vkGetShaderModuleCreateInfoIdentifierEXT =
-            PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
-
-          //=== VK_NV_optical_flow ===
-          vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkCreateOpticalFlowSessionNV" ) );
-          vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkDestroyOpticalFlowSessionNV" ) );
-          vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetDeviceProcAddr( device, "vkBindOpticalFlowSessionImageNV" ) );
-          vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetDeviceProcAddr( device, "vkCmdOpticalFlowExecuteNV" ) );
-
-          //=== VK_KHR_maintenance5 ===
-          vkCmdBindIndexBuffer2KHR = PFN_vkCmdBindIndexBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2KHR" ) );
-          if ( !vkCmdBindIndexBuffer2 )
-            vkCmdBindIndexBuffer2 = vkCmdBindIndexBuffer2KHR;
-          vkGetRenderingAreaGranularityKHR = PFN_vkGetRenderingAreaGranularityKHR( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularityKHR" ) );
-          if ( !vkGetRenderingAreaGranularity )
-            vkGetRenderingAreaGranularity = vkGetRenderingAreaGranularityKHR;
-          vkGetDeviceImageSubresourceLayoutKHR =
-            PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayoutKHR" ) );
-          if ( !vkGetDeviceImageSubresourceLayout )
-            vkGetDeviceImageSubresourceLayout = vkGetDeviceImageSubresourceLayoutKHR;
-          vkGetImageSubresourceLayout2KHR = PFN_vkGetImageSubresourceLayout2KHR( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2KHR" ) );
-          if ( !vkGetImageSubresourceLayout2 )
-            vkGetImageSubresourceLayout2 = vkGetImageSubresourceLayout2KHR;
-
-          //=== VK_AMD_anti_lag ===
-          vkAntiLagUpdateAMD = PFN_vkAntiLagUpdateAMD( vkGetDeviceProcAddr( device, "vkAntiLagUpdateAMD" ) );
-
-          //=== VK_KHR_present_wait2 ===
-          vkWaitForPresent2KHR = PFN_vkWaitForPresent2KHR( vkGetDeviceProcAddr( device, "vkWaitForPresent2KHR" ) );
-
-          //=== VK_EXT_shader_object ===
-          vkCreateShadersEXT         = PFN_vkCreateShadersEXT( vkGetDeviceProcAddr( device, "vkCreateShadersEXT" ) );
-          vkDestroyShaderEXT         = PFN_vkDestroyShaderEXT( vkGetDeviceProcAddr( device, "vkDestroyShaderEXT" ) );
-          vkGetShaderBinaryDataEXT   = PFN_vkGetShaderBinaryDataEXT( vkGetDeviceProcAddr( device, "vkGetShaderBinaryDataEXT" ) );
-          vkCmdBindShadersEXT        = PFN_vkCmdBindShadersEXT( vkGetDeviceProcAddr( device, "vkCmdBindShadersEXT" ) );
-          vkCmdSetDepthClampRangeEXT = PFN_vkCmdSetDepthClampRangeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampRangeEXT" ) );
-
-          //=== VK_KHR_pipeline_binary ===
-          vkCreatePipelineBinariesKHR      = PFN_vkCreatePipelineBinariesKHR( vkGetDeviceProcAddr( device, "vkCreatePipelineBinariesKHR" ) );
-          vkDestroyPipelineBinaryKHR       = PFN_vkDestroyPipelineBinaryKHR( vkGetDeviceProcAddr( device, "vkDestroyPipelineBinaryKHR" ) );
-          vkGetPipelineKeyKHR              = PFN_vkGetPipelineKeyKHR( vkGetDeviceProcAddr( device, "vkGetPipelineKeyKHR" ) );
-          vkGetPipelineBinaryDataKHR       = PFN_vkGetPipelineBinaryDataKHR( vkGetDeviceProcAddr( device, "vkGetPipelineBinaryDataKHR" ) );
-          vkReleaseCapturedPipelineDataKHR = PFN_vkReleaseCapturedPipelineDataKHR( vkGetDeviceProcAddr( device, "vkReleaseCapturedPipelineDataKHR" ) );
-
-          //=== VK_QCOM_tile_properties ===
-          vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetFramebufferTilePropertiesQCOM" ) );
-          vkGetDynamicRenderingTilePropertiesQCOM =
-            PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
-
-          //=== VK_KHR_swapchain_maintenance1 ===
-          vkReleaseSwapchainImagesKHR = PFN_vkReleaseSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesKHR" ) );
-
-          //=== VK_NV_cooperative_vector ===
-          vkConvertCooperativeVectorMatrixNV = PFN_vkConvertCooperativeVectorMatrixNV( vkGetDeviceProcAddr( device, "vkConvertCooperativeVectorMatrixNV" ) );
-          vkCmdConvertCooperativeVectorMatrixNV =
-            PFN_vkCmdConvertCooperativeVectorMatrixNV( vkGetDeviceProcAddr( device, "vkCmdConvertCooperativeVectorMatrixNV" ) );
-
-          //=== VK_NV_low_latency2 ===
-          vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetDeviceProcAddr( device, "vkSetLatencySleepModeNV" ) );
-          vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetDeviceProcAddr( device, "vkLatencySleepNV" ) );
-          vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetDeviceProcAddr( device, "vkSetLatencyMarkerNV" ) );
-          vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetDeviceProcAddr( device, "vkGetLatencyTimingsNV" ) );
-          vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetDeviceProcAddr( device, "vkQueueNotifyOutOfBandNV" ) );
-
-          //=== VK_ARM_data_graph ===
-          vkCreateDataGraphPipelinesARM       = PFN_vkCreateDataGraphPipelinesARM( vkGetDeviceProcAddr( device, "vkCreateDataGraphPipelinesARM" ) );
-          vkCreateDataGraphPipelineSessionARM = PFN_vkCreateDataGraphPipelineSessionARM( vkGetDeviceProcAddr( device, "vkCreateDataGraphPipelineSessionARM" ) );
-          vkGetDataGraphPipelineSessionBindPointRequirementsARM =
-            PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineSessionBindPointRequirementsARM" ) );
-          vkGetDataGraphPipelineSessionMemoryRequirementsARM =
-            PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineSessionMemoryRequirementsARM" ) );
-          vkBindDataGraphPipelineSessionMemoryARM =
-            PFN_vkBindDataGraphPipelineSessionMemoryARM( vkGetDeviceProcAddr( device, "vkBindDataGraphPipelineSessionMemoryARM" ) );
-          vkDestroyDataGraphPipelineSessionARM =
-            PFN_vkDestroyDataGraphPipelineSessionARM( vkGetDeviceProcAddr( device, "vkDestroyDataGraphPipelineSessionARM" ) );
-          vkCmdDispatchDataGraphARM = PFN_vkCmdDispatchDataGraphARM( vkGetDeviceProcAddr( device, "vkCmdDispatchDataGraphARM" ) );
-          vkGetDataGraphPipelineAvailablePropertiesARM =
-            PFN_vkGetDataGraphPipelineAvailablePropertiesARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelineAvailablePropertiesARM" ) );
-          vkGetDataGraphPipelinePropertiesARM = PFN_vkGetDataGraphPipelinePropertiesARM( vkGetDeviceProcAddr( device, "vkGetDataGraphPipelinePropertiesARM" ) );
-
-          //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-          vkCmdSetAttachmentFeedbackLoopEnableEXT =
-            PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
+#  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
+      //=== VK_EXT_directfb_surface ===
+      PFN_vkCreateDirectFBSurfaceEXT                        vkCreateDirectFBSurfaceEXT                        = 0;
+      PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT vkGetPhysicalDeviceDirectFBPresentationSupportEXT = 0;
+#  else
+      PFN_dummy vkCreateDirectFBSurfaceEXT_placeholder                        = 0;
+      PFN_dummy vkGetPhysicalDeviceDirectFBPresentationSupportEXT_placeholder = 0;
+#  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
-          //=== VK_QNX_external_memory_screen_buffer ===
-          vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetDeviceProcAddr( device, "vkGetScreenBufferPropertiesQNX" ) );
+      //=== VK_QNX_screen_surface ===
+      PFN_vkCreateScreenSurfaceQNX                        vkCreateScreenSurfaceQNX                        = 0;
+      PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX vkGetPhysicalDeviceScreenPresentationSupportQNX = 0;
+#  else
+      PFN_dummy vkCreateScreenSurfaceQNX_placeholder                          = 0;
+      PFN_dummy vkGetPhysicalDeviceScreenPresentationSupportQNX_placeholder   = 0;
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-          //=== VK_KHR_line_rasterization ===
-          vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleKHR" ) );
-          if ( !vkCmdSetLineStipple )
-            vkCmdSetLineStipple = vkCmdSetLineStippleKHR;
+      //=== VK_NV_optical_flow ===
+      PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV vkGetPhysicalDeviceOpticalFlowImageFormatsNV = 0;
 
-          //=== VK_KHR_calibrated_timestamps ===
-          vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsKHR" ) );
+      //=== VK_KHR_cooperative_matrix ===
+      PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = 0;
 
-          //=== VK_KHR_maintenance6 ===
-          vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2KHR" ) );
-          if ( !vkCmdBindDescriptorSets2 )
-            vkCmdBindDescriptorSets2 = vkCmdBindDescriptorSets2KHR;
-          vkCmdPushConstants2KHR = PFN_vkCmdPushConstants2KHR( vkGetDeviceProcAddr( device, "vkCmdPushConstants2KHR" ) );
-          if ( !vkCmdPushConstants2 )
-            vkCmdPushConstants2 = vkCmdPushConstants2KHR;
-          vkCmdPushDescriptorSet2KHR = PFN_vkCmdPushDescriptorSet2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2KHR" ) );
-          if ( !vkCmdPushDescriptorSet2 )
-            vkCmdPushDescriptorSet2 = vkCmdPushDescriptorSet2KHR;
-          vkCmdPushDescriptorSetWithTemplate2KHR =
-            PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
-          if ( !vkCmdPushDescriptorSetWithTemplate2 )
-            vkCmdPushDescriptorSetWithTemplate2 = vkCmdPushDescriptorSetWithTemplate2KHR;
-          vkCmdSetDescriptorBufferOffsets2EXT = PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
-          vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
-            PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
+      //=== VK_KHR_calibrated_timestamps ===
+      PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR vkGetPhysicalDeviceCalibrateableTimeDomainsKHR = 0;
 
-          //=== VK_QCOM_tile_memory_heap ===
-          vkCmdBindTileMemoryQCOM = PFN_vkCmdBindTileMemoryQCOM( vkGetDeviceProcAddr( device, "vkCmdBindTileMemoryQCOM" ) );
+      PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr = 0;
+    };
 
-          //=== VK_KHR_copy_memory_indirect ===
-          vkCmdCopyMemoryIndirectKHR        = PFN_vkCmdCopyMemoryIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectKHR" ) );
-          vkCmdCopyMemoryToImageIndirectKHR = PFN_vkCmdCopyMemoryToImageIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectKHR" ) );
-
-          //=== VK_EXT_memory_decompression ===
-          vkCmdDecompressMemoryEXT = PFN_vkCmdDecompressMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryEXT" ) );
-          vkCmdDecompressMemoryIndirectCountEXT =
-            PFN_vkCmdDecompressMemoryIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountEXT" ) );
-
-          //=== VK_NV_external_compute_queue ===
-          vkCreateExternalComputeQueueNV  = PFN_vkCreateExternalComputeQueueNV( vkGetDeviceProcAddr( device, "vkCreateExternalComputeQueueNV" ) );
-          vkDestroyExternalComputeQueueNV = PFN_vkDestroyExternalComputeQueueNV( vkGetDeviceProcAddr( device, "vkDestroyExternalComputeQueueNV" ) );
-          vkGetExternalComputeQueueDataNV = PFN_vkGetExternalComputeQueueDataNV( vkGetDeviceProcAddr( device, "vkGetExternalComputeQueueDataNV" ) );
-
-          //=== VK_NV_cluster_acceleration_structure ===
-          vkGetClusterAccelerationStructureBuildSizesNV =
-            PFN_vkGetClusterAccelerationStructureBuildSizesNV( vkGetDeviceProcAddr( device, "vkGetClusterAccelerationStructureBuildSizesNV" ) );
-          vkCmdBuildClusterAccelerationStructureIndirectNV =
-            PFN_vkCmdBuildClusterAccelerationStructureIndirectNV( vkGetDeviceProcAddr( device, "vkCmdBuildClusterAccelerationStructureIndirectNV" ) );
-
-          //=== VK_NV_partitioned_acceleration_structure ===
-          vkGetPartitionedAccelerationStructuresBuildSizesNV =
-            PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV( vkGetDeviceProcAddr( device, "vkGetPartitionedAccelerationStructuresBuildSizesNV" ) );
-          vkCmdBuildPartitionedAccelerationStructuresNV =
-            PFN_vkCmdBuildPartitionedAccelerationStructuresNV( vkGetDeviceProcAddr( device, "vkCmdBuildPartitionedAccelerationStructuresNV" ) );
-
-          //=== VK_EXT_device_generated_commands ===
-          vkGetGeneratedCommandsMemoryRequirementsEXT =
-            PFN_vkGetGeneratedCommandsMemoryRequirementsEXT( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsEXT" ) );
-          vkCmdPreprocessGeneratedCommandsEXT = PFN_vkCmdPreprocessGeneratedCommandsEXT( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsEXT" ) );
-          vkCmdExecuteGeneratedCommandsEXT    = PFN_vkCmdExecuteGeneratedCommandsEXT( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsEXT" ) );
-          vkCreateIndirectCommandsLayoutEXT   = PFN_vkCreateIndirectCommandsLayoutEXT( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutEXT" ) );
-          vkDestroyIndirectCommandsLayoutEXT  = PFN_vkDestroyIndirectCommandsLayoutEXT( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutEXT" ) );
-          vkCreateIndirectExecutionSetEXT     = PFN_vkCreateIndirectExecutionSetEXT( vkGetDeviceProcAddr( device, "vkCreateIndirectExecutionSetEXT" ) );
-          vkDestroyIndirectExecutionSetEXT    = PFN_vkDestroyIndirectExecutionSetEXT( vkGetDeviceProcAddr( device, "vkDestroyIndirectExecutionSetEXT" ) );
-          vkUpdateIndirectExecutionSetPipelineEXT =
-            PFN_vkUpdateIndirectExecutionSetPipelineEXT( vkGetDeviceProcAddr( device, "vkUpdateIndirectExecutionSetPipelineEXT" ) );
-          vkUpdateIndirectExecutionSetShaderEXT =
-            PFN_vkUpdateIndirectExecutionSetShaderEXT( vkGetDeviceProcAddr( device, "vkUpdateIndirectExecutionSetShaderEXT" ) );
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-          //=== VK_OHOS_native_buffer ===
-          vkGetSwapchainGrallocUsageOHOS = PFN_vkGetSwapchainGrallocUsageOHOS( vkGetDeviceProcAddr( device, "vkGetSwapchainGrallocUsageOHOS" ) );
-          vkAcquireImageOHOS             = PFN_vkAcquireImageOHOS( vkGetDeviceProcAddr( device, "vkAcquireImageOHOS" ) );
-          vkQueueSignalReleaseImageOHOS  = PFN_vkQueueSignalReleaseImageOHOS( vkGetDeviceProcAddr( device, "vkQueueSignalReleaseImageOHOS" ) );
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-          //=== VK_EXT_external_memory_metal ===
-          vkGetMemoryMetalHandleEXT           = PFN_vkGetMemoryMetalHandleEXT( vkGetDeviceProcAddr( device, "vkGetMemoryMetalHandleEXT" ) );
-          vkGetMemoryMetalHandlePropertiesEXT = PFN_vkGetMemoryMetalHandlePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryMetalHandlePropertiesEXT" ) );
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-          //=== VK_EXT_fragment_density_map_offset ===
-          vkCmdEndRendering2EXT = PFN_vkCmdEndRendering2EXT( vkGetDeviceProcAddr( device, "vkCmdEndRendering2EXT" ) );
-          if ( !vkCmdEndRendering2KHR )
-            vkCmdEndRendering2KHR = vkCmdEndRendering2EXT;
-
-          //=== VK_EXT_custom_resolve ===
-          vkCmdBeginCustomResolveEXT = PFN_vkCmdBeginCustomResolveEXT( vkGetDeviceProcAddr( device, "vkCmdBeginCustomResolveEXT" ) );
-
-          //=== VK_KHR_maintenance10 ===
-          vkCmdEndRendering2KHR = PFN_vkCmdEndRendering2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRendering2KHR" ) );
-        }
-
-      public:
+    class DeviceDispatcher : public DispatchLoaderBase
+    {
+    public:
+      DeviceDispatcher( PFN_vkGetDeviceProcAddr getProcAddr, VkDevice device ) : vkGetDeviceProcAddr( getProcAddr )
+      {
         //=== VK_VERSION_1_0 ===
-        PFN_vkGetDeviceProcAddr                vkGetDeviceProcAddr                = 0;
-        PFN_vkDestroyDevice                    vkDestroyDevice                    = 0;
-        PFN_vkGetDeviceQueue                   vkGetDeviceQueue                   = 0;
-        PFN_vkQueueSubmit                      vkQueueSubmit                      = 0;
-        PFN_vkQueueWaitIdle                    vkQueueWaitIdle                    = 0;
-        PFN_vkDeviceWaitIdle                   vkDeviceWaitIdle                   = 0;
-        PFN_vkAllocateMemory                   vkAllocateMemory                   = 0;
-        PFN_vkFreeMemory                       vkFreeMemory                       = 0;
-        PFN_vkMapMemory                        vkMapMemory                        = 0;
-        PFN_vkUnmapMemory                      vkUnmapMemory                      = 0;
-        PFN_vkFlushMappedMemoryRanges          vkFlushMappedMemoryRanges          = 0;
-        PFN_vkInvalidateMappedMemoryRanges     vkInvalidateMappedMemoryRanges     = 0;
-        PFN_vkGetDeviceMemoryCommitment        vkGetDeviceMemoryCommitment        = 0;
-        PFN_vkBindBufferMemory                 vkBindBufferMemory                 = 0;
-        PFN_vkBindImageMemory                  vkBindImageMemory                  = 0;
-        PFN_vkGetBufferMemoryRequirements      vkGetBufferMemoryRequirements      = 0;
-        PFN_vkGetImageMemoryRequirements       vkGetImageMemoryRequirements       = 0;
-        PFN_vkGetImageSparseMemoryRequirements vkGetImageSparseMemoryRequirements = 0;
-        PFN_vkQueueBindSparse                  vkQueueBindSparse                  = 0;
-        PFN_vkCreateFence                      vkCreateFence                      = 0;
-        PFN_vkDestroyFence                     vkDestroyFence                     = 0;
-        PFN_vkResetFences                      vkResetFences                      = 0;
-        PFN_vkGetFenceStatus                   vkGetFenceStatus                   = 0;
-        PFN_vkWaitForFences                    vkWaitForFences                    = 0;
-        PFN_vkCreateSemaphore                  vkCreateSemaphore                  = 0;
-        PFN_vkDestroySemaphore                 vkDestroySemaphore                 = 0;
-        PFN_vkCreateQueryPool                  vkCreateQueryPool                  = 0;
-        PFN_vkDestroyQueryPool                 vkDestroyQueryPool                 = 0;
-        PFN_vkGetQueryPoolResults              vkGetQueryPoolResults              = 0;
-        PFN_vkCreateBuffer                     vkCreateBuffer                     = 0;
-        PFN_vkDestroyBuffer                    vkDestroyBuffer                    = 0;
-        PFN_vkCreateImage                      vkCreateImage                      = 0;
-        PFN_vkDestroyImage                     vkDestroyImage                     = 0;
-        PFN_vkGetImageSubresourceLayout        vkGetImageSubresourceLayout        = 0;
-        PFN_vkCreateImageView                  vkCreateImageView                  = 0;
-        PFN_vkDestroyImageView                 vkDestroyImageView                 = 0;
-        PFN_vkCreateCommandPool                vkCreateCommandPool                = 0;
-        PFN_vkDestroyCommandPool               vkDestroyCommandPool               = 0;
-        PFN_vkResetCommandPool                 vkResetCommandPool                 = 0;
-        PFN_vkAllocateCommandBuffers           vkAllocateCommandBuffers           = 0;
-        PFN_vkFreeCommandBuffers               vkFreeCommandBuffers               = 0;
-        PFN_vkBeginCommandBuffer               vkBeginCommandBuffer               = 0;
-        PFN_vkEndCommandBuffer                 vkEndCommandBuffer                 = 0;
-        PFN_vkResetCommandBuffer               vkResetCommandBuffer               = 0;
-        PFN_vkCmdCopyBuffer                    vkCmdCopyBuffer                    = 0;
-        PFN_vkCmdCopyImage                     vkCmdCopyImage                     = 0;
-        PFN_vkCmdCopyBufferToImage             vkCmdCopyBufferToImage             = 0;
-        PFN_vkCmdCopyImageToBuffer             vkCmdCopyImageToBuffer             = 0;
-        PFN_vkCmdUpdateBuffer                  vkCmdUpdateBuffer                  = 0;
-        PFN_vkCmdFillBuffer                    vkCmdFillBuffer                    = 0;
-        PFN_vkCmdPipelineBarrier               vkCmdPipelineBarrier               = 0;
-        PFN_vkCmdBeginQuery                    vkCmdBeginQuery                    = 0;
-        PFN_vkCmdEndQuery                      vkCmdEndQuery                      = 0;
-        PFN_vkCmdResetQueryPool                vkCmdResetQueryPool                = 0;
-        PFN_vkCmdWriteTimestamp                vkCmdWriteTimestamp                = 0;
-        PFN_vkCmdCopyQueryPoolResults          vkCmdCopyQueryPoolResults          = 0;
-        PFN_vkCmdExecuteCommands               vkCmdExecuteCommands               = 0;
-        PFN_vkCreateEvent                      vkCreateEvent                      = 0;
-        PFN_vkDestroyEvent                     vkDestroyEvent                     = 0;
-        PFN_vkGetEventStatus                   vkGetEventStatus                   = 0;
-        PFN_vkSetEvent                         vkSetEvent                         = 0;
-        PFN_vkResetEvent                       vkResetEvent                       = 0;
-        PFN_vkCreateBufferView                 vkCreateBufferView                 = 0;
-        PFN_vkDestroyBufferView                vkDestroyBufferView                = 0;
-        PFN_vkCreateShaderModule               vkCreateShaderModule               = 0;
-        PFN_vkDestroyShaderModule              vkDestroyShaderModule              = 0;
-        PFN_vkCreatePipelineCache              vkCreatePipelineCache              = 0;
-        PFN_vkDestroyPipelineCache             vkDestroyPipelineCache             = 0;
-        PFN_vkGetPipelineCacheData             vkGetPipelineCacheData             = 0;
-        PFN_vkMergePipelineCaches              vkMergePipelineCaches              = 0;
-        PFN_vkCreateComputePipelines           vkCreateComputePipelines           = 0;
-        PFN_vkDestroyPipeline                  vkDestroyPipeline                  = 0;
-        PFN_vkCreatePipelineLayout             vkCreatePipelineLayout             = 0;
-        PFN_vkDestroyPipelineLayout            vkDestroyPipelineLayout            = 0;
-        PFN_vkCreateSampler                    vkCreateSampler                    = 0;
-        PFN_vkDestroySampler                   vkDestroySampler                   = 0;
-        PFN_vkCreateDescriptorSetLayout        vkCreateDescriptorSetLayout        = 0;
-        PFN_vkDestroyDescriptorSetLayout       vkDestroyDescriptorSetLayout       = 0;
-        PFN_vkCreateDescriptorPool             vkCreateDescriptorPool             = 0;
-        PFN_vkDestroyDescriptorPool            vkDestroyDescriptorPool            = 0;
-        PFN_vkResetDescriptorPool              vkResetDescriptorPool              = 0;
-        PFN_vkAllocateDescriptorSets           vkAllocateDescriptorSets           = 0;
-        PFN_vkFreeDescriptorSets               vkFreeDescriptorSets               = 0;
-        PFN_vkUpdateDescriptorSets             vkUpdateDescriptorSets             = 0;
-        PFN_vkCmdBindPipeline                  vkCmdBindPipeline                  = 0;
-        PFN_vkCmdBindDescriptorSets            vkCmdBindDescriptorSets            = 0;
-        PFN_vkCmdClearColorImage               vkCmdClearColorImage               = 0;
-        PFN_vkCmdDispatch                      vkCmdDispatch                      = 0;
-        PFN_vkCmdDispatchIndirect              vkCmdDispatchIndirect              = 0;
-        PFN_vkCmdSetEvent                      vkCmdSetEvent                      = 0;
-        PFN_vkCmdResetEvent                    vkCmdResetEvent                    = 0;
-        PFN_vkCmdWaitEvents                    vkCmdWaitEvents                    = 0;
-        PFN_vkCmdPushConstants                 vkCmdPushConstants                 = 0;
-        PFN_vkCreateGraphicsPipelines          vkCreateGraphicsPipelines          = 0;
-        PFN_vkCreateFramebuffer                vkCreateFramebuffer                = 0;
-        PFN_vkDestroyFramebuffer               vkDestroyFramebuffer               = 0;
-        PFN_vkCreateRenderPass                 vkCreateRenderPass                 = 0;
-        PFN_vkDestroyRenderPass                vkDestroyRenderPass                = 0;
-        PFN_vkGetRenderAreaGranularity         vkGetRenderAreaGranularity         = 0;
-        PFN_vkCmdSetViewport                   vkCmdSetViewport                   = 0;
-        PFN_vkCmdSetScissor                    vkCmdSetScissor                    = 0;
-        PFN_vkCmdSetLineWidth                  vkCmdSetLineWidth                  = 0;
-        PFN_vkCmdSetDepthBias                  vkCmdSetDepthBias                  = 0;
-        PFN_vkCmdSetBlendConstants             vkCmdSetBlendConstants             = 0;
-        PFN_vkCmdSetDepthBounds                vkCmdSetDepthBounds                = 0;
-        PFN_vkCmdSetStencilCompareMask         vkCmdSetStencilCompareMask         = 0;
-        PFN_vkCmdSetStencilWriteMask           vkCmdSetStencilWriteMask           = 0;
-        PFN_vkCmdSetStencilReference           vkCmdSetStencilReference           = 0;
-        PFN_vkCmdBindIndexBuffer               vkCmdBindIndexBuffer               = 0;
-        PFN_vkCmdBindVertexBuffers             vkCmdBindVertexBuffers             = 0;
-        PFN_vkCmdDraw                          vkCmdDraw                          = 0;
-        PFN_vkCmdDrawIndexed                   vkCmdDrawIndexed                   = 0;
-        PFN_vkCmdDrawIndirect                  vkCmdDrawIndirect                  = 0;
-        PFN_vkCmdDrawIndexedIndirect           vkCmdDrawIndexedIndirect           = 0;
-        PFN_vkCmdBlitImage                     vkCmdBlitImage                     = 0;
-        PFN_vkCmdClearDepthStencilImage        vkCmdClearDepthStencilImage        = 0;
-        PFN_vkCmdClearAttachments              vkCmdClearAttachments              = 0;
-        PFN_vkCmdResolveImage                  vkCmdResolveImage                  = 0;
-        PFN_vkCmdBeginRenderPass               vkCmdBeginRenderPass               = 0;
-        PFN_vkCmdNextSubpass                   vkCmdNextSubpass                   = 0;
-        PFN_vkCmdEndRenderPass                 vkCmdEndRenderPass                 = 0;
+        vkGetDeviceProcAddr                = PFN_vkGetDeviceProcAddr( vkGetDeviceProcAddr( device, "vkGetDeviceProcAddr" ) );
+        vkDestroyDevice                    = PFN_vkDestroyDevice( vkGetDeviceProcAddr( device, "vkDestroyDevice" ) );
+        vkGetDeviceQueue                   = PFN_vkGetDeviceQueue( vkGetDeviceProcAddr( device, "vkGetDeviceQueue" ) );
+        vkQueueSubmit                      = PFN_vkQueueSubmit( vkGetDeviceProcAddr( device, "vkQueueSubmit" ) );
+        vkQueueWaitIdle                    = PFN_vkQueueWaitIdle( vkGetDeviceProcAddr( device, "vkQueueWaitIdle" ) );
+        vkDeviceWaitIdle                   = PFN_vkDeviceWaitIdle( vkGetDeviceProcAddr( device, "vkDeviceWaitIdle" ) );
+        vkAllocateMemory                   = PFN_vkAllocateMemory( vkGetDeviceProcAddr( device, "vkAllocateMemory" ) );
+        vkFreeMemory                       = PFN_vkFreeMemory( vkGetDeviceProcAddr( device, "vkFreeMemory" ) );
+        vkMapMemory                        = PFN_vkMapMemory( vkGetDeviceProcAddr( device, "vkMapMemory" ) );
+        vkUnmapMemory                      = PFN_vkUnmapMemory( vkGetDeviceProcAddr( device, "vkUnmapMemory" ) );
+        vkFlushMappedMemoryRanges          = PFN_vkFlushMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkFlushMappedMemoryRanges" ) );
+        vkInvalidateMappedMemoryRanges     = PFN_vkInvalidateMappedMemoryRanges( vkGetDeviceProcAddr( device, "vkInvalidateMappedMemoryRanges" ) );
+        vkGetDeviceMemoryCommitment        = PFN_vkGetDeviceMemoryCommitment( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryCommitment" ) );
+        vkBindBufferMemory                 = PFN_vkBindBufferMemory( vkGetDeviceProcAddr( device, "vkBindBufferMemory" ) );
+        vkBindImageMemory                  = PFN_vkBindImageMemory( vkGetDeviceProcAddr( device, "vkBindImageMemory" ) );
+        vkGetBufferMemoryRequirements      = PFN_vkGetBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements" ) );
+        vkGetImageMemoryRequirements       = PFN_vkGetImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements" ) );
+        vkGetImageSparseMemoryRequirements = PFN_vkGetImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements" ) );
+        vkQueueBindSparse                  = PFN_vkQueueBindSparse( vkGetDeviceProcAddr( device, "vkQueueBindSparse" ) );
+        vkCreateFence                      = PFN_vkCreateFence( vkGetDeviceProcAddr( device, "vkCreateFence" ) );
+        vkDestroyFence                     = PFN_vkDestroyFence( vkGetDeviceProcAddr( device, "vkDestroyFence" ) );
+        vkResetFences                      = PFN_vkResetFences( vkGetDeviceProcAddr( device, "vkResetFences" ) );
+        vkGetFenceStatus                   = PFN_vkGetFenceStatus( vkGetDeviceProcAddr( device, "vkGetFenceStatus" ) );
+        vkWaitForFences                    = PFN_vkWaitForFences( vkGetDeviceProcAddr( device, "vkWaitForFences" ) );
+        vkCreateSemaphore                  = PFN_vkCreateSemaphore( vkGetDeviceProcAddr( device, "vkCreateSemaphore" ) );
+        vkDestroySemaphore                 = PFN_vkDestroySemaphore( vkGetDeviceProcAddr( device, "vkDestroySemaphore" ) );
+        vkCreateEvent                      = PFN_vkCreateEvent( vkGetDeviceProcAddr( device, "vkCreateEvent" ) );
+        vkDestroyEvent                     = PFN_vkDestroyEvent( vkGetDeviceProcAddr( device, "vkDestroyEvent" ) );
+        vkGetEventStatus                   = PFN_vkGetEventStatus( vkGetDeviceProcAddr( device, "vkGetEventStatus" ) );
+        vkSetEvent                         = PFN_vkSetEvent( vkGetDeviceProcAddr( device, "vkSetEvent" ) );
+        vkResetEvent                       = PFN_vkResetEvent( vkGetDeviceProcAddr( device, "vkResetEvent" ) );
+        vkCreateQueryPool                  = PFN_vkCreateQueryPool( vkGetDeviceProcAddr( device, "vkCreateQueryPool" ) );
+        vkDestroyQueryPool                 = PFN_vkDestroyQueryPool( vkGetDeviceProcAddr( device, "vkDestroyQueryPool" ) );
+        vkGetQueryPoolResults              = PFN_vkGetQueryPoolResults( vkGetDeviceProcAddr( device, "vkGetQueryPoolResults" ) );
+        vkCreateBuffer                     = PFN_vkCreateBuffer( vkGetDeviceProcAddr( device, "vkCreateBuffer" ) );
+        vkDestroyBuffer                    = PFN_vkDestroyBuffer( vkGetDeviceProcAddr( device, "vkDestroyBuffer" ) );
+        vkCreateBufferView                 = PFN_vkCreateBufferView( vkGetDeviceProcAddr( device, "vkCreateBufferView" ) );
+        vkDestroyBufferView                = PFN_vkDestroyBufferView( vkGetDeviceProcAddr( device, "vkDestroyBufferView" ) );
+        vkCreateImage                      = PFN_vkCreateImage( vkGetDeviceProcAddr( device, "vkCreateImage" ) );
+        vkDestroyImage                     = PFN_vkDestroyImage( vkGetDeviceProcAddr( device, "vkDestroyImage" ) );
+        vkGetImageSubresourceLayout        = PFN_vkGetImageSubresourceLayout( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout" ) );
+        vkCreateImageView                  = PFN_vkCreateImageView( vkGetDeviceProcAddr( device, "vkCreateImageView" ) );
+        vkDestroyImageView                 = PFN_vkDestroyImageView( vkGetDeviceProcAddr( device, "vkDestroyImageView" ) );
+        vkCreateShaderModule               = PFN_vkCreateShaderModule( vkGetDeviceProcAddr( device, "vkCreateShaderModule" ) );
+        vkDestroyShaderModule              = PFN_vkDestroyShaderModule( vkGetDeviceProcAddr( device, "vkDestroyShaderModule" ) );
+        vkCreatePipelineCache              = PFN_vkCreatePipelineCache( vkGetDeviceProcAddr( device, "vkCreatePipelineCache" ) );
+        vkDestroyPipelineCache             = PFN_vkDestroyPipelineCache( vkGetDeviceProcAddr( device, "vkDestroyPipelineCache" ) );
+        vkGetPipelineCacheData             = PFN_vkGetPipelineCacheData( vkGetDeviceProcAddr( device, "vkGetPipelineCacheData" ) );
+        vkMergePipelineCaches              = PFN_vkMergePipelineCaches( vkGetDeviceProcAddr( device, "vkMergePipelineCaches" ) );
+        vkCreateGraphicsPipelines          = PFN_vkCreateGraphicsPipelines( vkGetDeviceProcAddr( device, "vkCreateGraphicsPipelines" ) );
+        vkCreateComputePipelines           = PFN_vkCreateComputePipelines( vkGetDeviceProcAddr( device, "vkCreateComputePipelines" ) );
+        vkDestroyPipeline                  = PFN_vkDestroyPipeline( vkGetDeviceProcAddr( device, "vkDestroyPipeline" ) );
+        vkCreatePipelineLayout             = PFN_vkCreatePipelineLayout( vkGetDeviceProcAddr( device, "vkCreatePipelineLayout" ) );
+        vkDestroyPipelineLayout            = PFN_vkDestroyPipelineLayout( vkGetDeviceProcAddr( device, "vkDestroyPipelineLayout" ) );
+        vkCreateSampler                    = PFN_vkCreateSampler( vkGetDeviceProcAddr( device, "vkCreateSampler" ) );
+        vkDestroySampler                   = PFN_vkDestroySampler( vkGetDeviceProcAddr( device, "vkDestroySampler" ) );
+        vkCreateDescriptorSetLayout        = PFN_vkCreateDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkCreateDescriptorSetLayout" ) );
+        vkDestroyDescriptorSetLayout       = PFN_vkDestroyDescriptorSetLayout( vkGetDeviceProcAddr( device, "vkDestroyDescriptorSetLayout" ) );
+        vkCreateDescriptorPool             = PFN_vkCreateDescriptorPool( vkGetDeviceProcAddr( device, "vkCreateDescriptorPool" ) );
+        vkDestroyDescriptorPool            = PFN_vkDestroyDescriptorPool( vkGetDeviceProcAddr( device, "vkDestroyDescriptorPool" ) );
+        vkResetDescriptorPool              = PFN_vkResetDescriptorPool( vkGetDeviceProcAddr( device, "vkResetDescriptorPool" ) );
+        vkAllocateDescriptorSets           = PFN_vkAllocateDescriptorSets( vkGetDeviceProcAddr( device, "vkAllocateDescriptorSets" ) );
+        vkFreeDescriptorSets               = PFN_vkFreeDescriptorSets( vkGetDeviceProcAddr( device, "vkFreeDescriptorSets" ) );
+        vkUpdateDescriptorSets             = PFN_vkUpdateDescriptorSets( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSets" ) );
+        vkCreateFramebuffer                = PFN_vkCreateFramebuffer( vkGetDeviceProcAddr( device, "vkCreateFramebuffer" ) );
+        vkDestroyFramebuffer               = PFN_vkDestroyFramebuffer( vkGetDeviceProcAddr( device, "vkDestroyFramebuffer" ) );
+        vkCreateRenderPass                 = PFN_vkCreateRenderPass( vkGetDeviceProcAddr( device, "vkCreateRenderPass" ) );
+        vkDestroyRenderPass                = PFN_vkDestroyRenderPass( vkGetDeviceProcAddr( device, "vkDestroyRenderPass" ) );
+        vkGetRenderAreaGranularity         = PFN_vkGetRenderAreaGranularity( vkGetDeviceProcAddr( device, "vkGetRenderAreaGranularity" ) );
+        vkCreateCommandPool                = PFN_vkCreateCommandPool( vkGetDeviceProcAddr( device, "vkCreateCommandPool" ) );
+        vkDestroyCommandPool               = PFN_vkDestroyCommandPool( vkGetDeviceProcAddr( device, "vkDestroyCommandPool" ) );
+        vkResetCommandPool                 = PFN_vkResetCommandPool( vkGetDeviceProcAddr( device, "vkResetCommandPool" ) );
+        vkAllocateCommandBuffers           = PFN_vkAllocateCommandBuffers( vkGetDeviceProcAddr( device, "vkAllocateCommandBuffers" ) );
+        vkFreeCommandBuffers               = PFN_vkFreeCommandBuffers( vkGetDeviceProcAddr( device, "vkFreeCommandBuffers" ) );
+        vkBeginCommandBuffer               = PFN_vkBeginCommandBuffer( vkGetDeviceProcAddr( device, "vkBeginCommandBuffer" ) );
+        vkEndCommandBuffer                 = PFN_vkEndCommandBuffer( vkGetDeviceProcAddr( device, "vkEndCommandBuffer" ) );
+        vkResetCommandBuffer               = PFN_vkResetCommandBuffer( vkGetDeviceProcAddr( device, "vkResetCommandBuffer" ) );
+        vkCmdBindPipeline                  = PFN_vkCmdBindPipeline( vkGetDeviceProcAddr( device, "vkCmdBindPipeline" ) );
+        vkCmdSetViewport                   = PFN_vkCmdSetViewport( vkGetDeviceProcAddr( device, "vkCmdSetViewport" ) );
+        vkCmdSetScissor                    = PFN_vkCmdSetScissor( vkGetDeviceProcAddr( device, "vkCmdSetScissor" ) );
+        vkCmdSetLineWidth                  = PFN_vkCmdSetLineWidth( vkGetDeviceProcAddr( device, "vkCmdSetLineWidth" ) );
+        vkCmdSetDepthBias                  = PFN_vkCmdSetDepthBias( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias" ) );
+        vkCmdSetBlendConstants             = PFN_vkCmdSetBlendConstants( vkGetDeviceProcAddr( device, "vkCmdSetBlendConstants" ) );
+        vkCmdSetDepthBounds                = PFN_vkCmdSetDepthBounds( vkGetDeviceProcAddr( device, "vkCmdSetDepthBounds" ) );
+        vkCmdSetStencilCompareMask         = PFN_vkCmdSetStencilCompareMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilCompareMask" ) );
+        vkCmdSetStencilWriteMask           = PFN_vkCmdSetStencilWriteMask( vkGetDeviceProcAddr( device, "vkCmdSetStencilWriteMask" ) );
+        vkCmdSetStencilReference           = PFN_vkCmdSetStencilReference( vkGetDeviceProcAddr( device, "vkCmdSetStencilReference" ) );
+        vkCmdBindDescriptorSets            = PFN_vkCmdBindDescriptorSets( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets" ) );
+        vkCmdBindIndexBuffer               = PFN_vkCmdBindIndexBuffer( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer" ) );
+        vkCmdBindVertexBuffers             = PFN_vkCmdBindVertexBuffers( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers" ) );
+        vkCmdDraw                          = PFN_vkCmdDraw( vkGetDeviceProcAddr( device, "vkCmdDraw" ) );
+        vkCmdDrawIndexed                   = PFN_vkCmdDrawIndexed( vkGetDeviceProcAddr( device, "vkCmdDrawIndexed" ) );
+        vkCmdDrawIndirect                  = PFN_vkCmdDrawIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndirect" ) );
+        vkCmdDrawIndexedIndirect           = PFN_vkCmdDrawIndexedIndirect( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirect" ) );
+        vkCmdDispatch                      = PFN_vkCmdDispatch( vkGetDeviceProcAddr( device, "vkCmdDispatch" ) );
+        vkCmdDispatchIndirect              = PFN_vkCmdDispatchIndirect( vkGetDeviceProcAddr( device, "vkCmdDispatchIndirect" ) );
+        vkCmdCopyBuffer                    = PFN_vkCmdCopyBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer" ) );
+        vkCmdCopyImage                     = PFN_vkCmdCopyImage( vkGetDeviceProcAddr( device, "vkCmdCopyImage" ) );
+        vkCmdBlitImage                     = PFN_vkCmdBlitImage( vkGetDeviceProcAddr( device, "vkCmdBlitImage" ) );
+        vkCmdCopyBufferToImage             = PFN_vkCmdCopyBufferToImage( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage" ) );
+        vkCmdCopyImageToBuffer             = PFN_vkCmdCopyImageToBuffer( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer" ) );
+        vkCmdUpdateBuffer                  = PFN_vkCmdUpdateBuffer( vkGetDeviceProcAddr( device, "vkCmdUpdateBuffer" ) );
+        vkCmdFillBuffer                    = PFN_vkCmdFillBuffer( vkGetDeviceProcAddr( device, "vkCmdFillBuffer" ) );
+        vkCmdClearColorImage               = PFN_vkCmdClearColorImage( vkGetDeviceProcAddr( device, "vkCmdClearColorImage" ) );
+        vkCmdClearDepthStencilImage        = PFN_vkCmdClearDepthStencilImage( vkGetDeviceProcAddr( device, "vkCmdClearDepthStencilImage" ) );
+        vkCmdClearAttachments              = PFN_vkCmdClearAttachments( vkGetDeviceProcAddr( device, "vkCmdClearAttachments" ) );
+        vkCmdResolveImage                  = PFN_vkCmdResolveImage( vkGetDeviceProcAddr( device, "vkCmdResolveImage" ) );
+        vkCmdSetEvent                      = PFN_vkCmdSetEvent( vkGetDeviceProcAddr( device, "vkCmdSetEvent" ) );
+        vkCmdResetEvent                    = PFN_vkCmdResetEvent( vkGetDeviceProcAddr( device, "vkCmdResetEvent" ) );
+        vkCmdWaitEvents                    = PFN_vkCmdWaitEvents( vkGetDeviceProcAddr( device, "vkCmdWaitEvents" ) );
+        vkCmdPipelineBarrier               = PFN_vkCmdPipelineBarrier( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier" ) );
+        vkCmdBeginQuery                    = PFN_vkCmdBeginQuery( vkGetDeviceProcAddr( device, "vkCmdBeginQuery" ) );
+        vkCmdEndQuery                      = PFN_vkCmdEndQuery( vkGetDeviceProcAddr( device, "vkCmdEndQuery" ) );
+        vkCmdResetQueryPool                = PFN_vkCmdResetQueryPool( vkGetDeviceProcAddr( device, "vkCmdResetQueryPool" ) );
+        vkCmdWriteTimestamp                = PFN_vkCmdWriteTimestamp( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp" ) );
+        vkCmdCopyQueryPoolResults          = PFN_vkCmdCopyQueryPoolResults( vkGetDeviceProcAddr( device, "vkCmdCopyQueryPoolResults" ) );
+        vkCmdPushConstants                 = PFN_vkCmdPushConstants( vkGetDeviceProcAddr( device, "vkCmdPushConstants" ) );
+        vkCmdBeginRenderPass               = PFN_vkCmdBeginRenderPass( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass" ) );
+        vkCmdNextSubpass                   = PFN_vkCmdNextSubpass( vkGetDeviceProcAddr( device, "vkCmdNextSubpass" ) );
+        vkCmdEndRenderPass                 = PFN_vkCmdEndRenderPass( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass" ) );
+        vkCmdExecuteCommands               = PFN_vkCmdExecuteCommands( vkGetDeviceProcAddr( device, "vkCmdExecuteCommands" ) );
 
         //=== VK_VERSION_1_1 ===
-        PFN_vkBindBufferMemory2                 vkBindBufferMemory2                 = 0;
-        PFN_vkBindImageMemory2                  vkBindImageMemory2                  = 0;
-        PFN_vkGetDeviceGroupPeerMemoryFeatures  vkGetDeviceGroupPeerMemoryFeatures  = 0;
-        PFN_vkCmdSetDeviceMask                  vkCmdSetDeviceMask                  = 0;
-        PFN_vkGetImageMemoryRequirements2       vkGetImageMemoryRequirements2       = 0;
-        PFN_vkGetBufferMemoryRequirements2      vkGetBufferMemoryRequirements2      = 0;
-        PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2 = 0;
-        PFN_vkTrimCommandPool                   vkTrimCommandPool                   = 0;
-        PFN_vkGetDeviceQueue2                   vkGetDeviceQueue2                   = 0;
-        PFN_vkCmdDispatchBase                   vkCmdDispatchBase                   = 0;
-        PFN_vkCreateDescriptorUpdateTemplate    vkCreateDescriptorUpdateTemplate    = 0;
-        PFN_vkDestroyDescriptorUpdateTemplate   vkDestroyDescriptorUpdateTemplate   = 0;
-        PFN_vkUpdateDescriptorSetWithTemplate   vkUpdateDescriptorSetWithTemplate   = 0;
-        PFN_vkGetDescriptorSetLayoutSupport     vkGetDescriptorSetLayoutSupport     = 0;
-        PFN_vkCreateSamplerYcbcrConversion      vkCreateSamplerYcbcrConversion      = 0;
-        PFN_vkDestroySamplerYcbcrConversion     vkDestroySamplerYcbcrConversion     = 0;
+        vkBindBufferMemory2                 = PFN_vkBindBufferMemory2( vkGetDeviceProcAddr( device, "vkBindBufferMemory2" ) );
+        vkBindImageMemory2                  = PFN_vkBindImageMemory2( vkGetDeviceProcAddr( device, "vkBindImageMemory2" ) );
+        vkGetDeviceGroupPeerMemoryFeatures  = PFN_vkGetDeviceGroupPeerMemoryFeatures( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeatures" ) );
+        vkCmdSetDeviceMask                  = PFN_vkCmdSetDeviceMask( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMask" ) );
+        vkCmdDispatchBase                   = PFN_vkCmdDispatchBase( vkGetDeviceProcAddr( device, "vkCmdDispatchBase" ) );
+        vkGetImageMemoryRequirements2       = PFN_vkGetImageMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2" ) );
+        vkGetBufferMemoryRequirements2      = PFN_vkGetBufferMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2" ) );
+        vkGetImageSparseMemoryRequirements2 = PFN_vkGetImageSparseMemoryRequirements2( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2" ) );
+        vkTrimCommandPool                   = PFN_vkTrimCommandPool( vkGetDeviceProcAddr( device, "vkTrimCommandPool" ) );
+        vkGetDeviceQueue2                   = PFN_vkGetDeviceQueue2( vkGetDeviceProcAddr( device, "vkGetDeviceQueue2" ) );
+        vkCreateSamplerYcbcrConversion      = PFN_vkCreateSamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversion" ) );
+        vkDestroySamplerYcbcrConversion     = PFN_vkDestroySamplerYcbcrConversion( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversion" ) );
+        vkCreateDescriptorUpdateTemplate    = PFN_vkCreateDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplate" ) );
+        vkDestroyDescriptorUpdateTemplate   = PFN_vkDestroyDescriptorUpdateTemplate( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplate" ) );
+        vkUpdateDescriptorSetWithTemplate   = PFN_vkUpdateDescriptorSetWithTemplate( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplate" ) );
+        vkGetDescriptorSetLayoutSupport     = PFN_vkGetDescriptorSetLayoutSupport( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupport" ) );
 
         //=== VK_VERSION_1_2 ===
-        PFN_vkResetQueryPool                      vkResetQueryPool                      = 0;
-        PFN_vkGetSemaphoreCounterValue            vkGetSemaphoreCounterValue            = 0;
-        PFN_vkWaitSemaphores                      vkWaitSemaphores                      = 0;
-        PFN_vkSignalSemaphore                     vkSignalSemaphore                     = 0;
-        PFN_vkGetBufferDeviceAddress              vkGetBufferDeviceAddress              = 0;
-        PFN_vkGetBufferOpaqueCaptureAddress       vkGetBufferOpaqueCaptureAddress       = 0;
-        PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress = 0;
-        PFN_vkCmdDrawIndirectCount                vkCmdDrawIndirectCount                = 0;
-        PFN_vkCmdDrawIndexedIndirectCount         vkCmdDrawIndexedIndirectCount         = 0;
-        PFN_vkCreateRenderPass2                   vkCreateRenderPass2                   = 0;
-        PFN_vkCmdBeginRenderPass2                 vkCmdBeginRenderPass2                 = 0;
-        PFN_vkCmdNextSubpass2                     vkCmdNextSubpass2                     = 0;
-        PFN_vkCmdEndRenderPass2                   vkCmdEndRenderPass2                   = 0;
+        vkCmdDrawIndirectCount          = PFN_vkCmdDrawIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCount" ) );
+        vkCmdDrawIndexedIndirectCount   = PFN_vkCmdDrawIndexedIndirectCount( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCount" ) );
+        vkCreateRenderPass2             = PFN_vkCreateRenderPass2( vkGetDeviceProcAddr( device, "vkCreateRenderPass2" ) );
+        vkCmdBeginRenderPass2           = PFN_vkCmdBeginRenderPass2( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2" ) );
+        vkCmdNextSubpass2               = PFN_vkCmdNextSubpass2( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2" ) );
+        vkCmdEndRenderPass2             = PFN_vkCmdEndRenderPass2( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2" ) );
+        vkResetQueryPool                = PFN_vkResetQueryPool( vkGetDeviceProcAddr( device, "vkResetQueryPool" ) );
+        vkGetSemaphoreCounterValue      = PFN_vkGetSemaphoreCounterValue( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValue" ) );
+        vkWaitSemaphores                = PFN_vkWaitSemaphores( vkGetDeviceProcAddr( device, "vkWaitSemaphores" ) );
+        vkSignalSemaphore               = PFN_vkSignalSemaphore( vkGetDeviceProcAddr( device, "vkSignalSemaphore" ) );
+        vkGetBufferDeviceAddress        = PFN_vkGetBufferDeviceAddress( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddress" ) );
+        vkGetBufferOpaqueCaptureAddress = PFN_vkGetBufferOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddress" ) );
+        vkGetDeviceMemoryOpaqueCaptureAddress =
+          PFN_vkGetDeviceMemoryOpaqueCaptureAddress( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddress" ) );
 
         //=== VK_VERSION_1_3 ===
-        PFN_vkCreatePrivateDataSlot                  vkCreatePrivateDataSlot                  = 0;
-        PFN_vkDestroyPrivateDataSlot                 vkDestroyPrivateDataSlot                 = 0;
-        PFN_vkSetPrivateData                         vkSetPrivateData                         = 0;
-        PFN_vkGetPrivateData                         vkGetPrivateData                         = 0;
-        PFN_vkCmdPipelineBarrier2                    vkCmdPipelineBarrier2                    = 0;
-        PFN_vkCmdWriteTimestamp2                     vkCmdWriteTimestamp2                     = 0;
-        PFN_vkQueueSubmit2                           vkQueueSubmit2                           = 0;
-        PFN_vkCmdCopyBuffer2                         vkCmdCopyBuffer2                         = 0;
-        PFN_vkCmdCopyImage2                          vkCmdCopyImage2                          = 0;
-        PFN_vkCmdCopyBufferToImage2                  vkCmdCopyBufferToImage2                  = 0;
-        PFN_vkCmdCopyImageToBuffer2                  vkCmdCopyImageToBuffer2                  = 0;
-        PFN_vkGetDeviceBufferMemoryRequirements      vkGetDeviceBufferMemoryRequirements      = 0;
-        PFN_vkGetDeviceImageMemoryRequirements       vkGetDeviceImageMemoryRequirements       = 0;
-        PFN_vkGetDeviceImageSparseMemoryRequirements vkGetDeviceImageSparseMemoryRequirements = 0;
-        PFN_vkCmdSetEvent2                           vkCmdSetEvent2                           = 0;
-        PFN_vkCmdResetEvent2                         vkCmdResetEvent2                         = 0;
-        PFN_vkCmdWaitEvents2                         vkCmdWaitEvents2                         = 0;
-        PFN_vkCmdBlitImage2                          vkCmdBlitImage2                          = 0;
-        PFN_vkCmdResolveImage2                       vkCmdResolveImage2                       = 0;
-        PFN_vkCmdBeginRendering                      vkCmdBeginRendering                      = 0;
-        PFN_vkCmdEndRendering                        vkCmdEndRendering                        = 0;
-        PFN_vkCmdSetCullMode                         vkCmdSetCullMode                         = 0;
-        PFN_vkCmdSetFrontFace                        vkCmdSetFrontFace                        = 0;
-        PFN_vkCmdSetPrimitiveTopology                vkCmdSetPrimitiveTopology                = 0;
-        PFN_vkCmdSetViewportWithCount                vkCmdSetViewportWithCount                = 0;
-        PFN_vkCmdSetScissorWithCount                 vkCmdSetScissorWithCount                 = 0;
-        PFN_vkCmdBindVertexBuffers2                  vkCmdBindVertexBuffers2                  = 0;
-        PFN_vkCmdSetDepthTestEnable                  vkCmdSetDepthTestEnable                  = 0;
-        PFN_vkCmdSetDepthWriteEnable                 vkCmdSetDepthWriteEnable                 = 0;
-        PFN_vkCmdSetDepthCompareOp                   vkCmdSetDepthCompareOp                   = 0;
-        PFN_vkCmdSetDepthBoundsTestEnable            vkCmdSetDepthBoundsTestEnable            = 0;
-        PFN_vkCmdSetStencilTestEnable                vkCmdSetStencilTestEnable                = 0;
-        PFN_vkCmdSetStencilOp                        vkCmdSetStencilOp                        = 0;
-        PFN_vkCmdSetRasterizerDiscardEnable          vkCmdSetRasterizerDiscardEnable          = 0;
-        PFN_vkCmdSetDepthBiasEnable                  vkCmdSetDepthBiasEnable                  = 0;
-        PFN_vkCmdSetPrimitiveRestartEnable           vkCmdSetPrimitiveRestartEnable           = 0;
-
-        //=== VK_VERSION_1_4 ===
-        PFN_vkMapMemory2                            vkMapMemory2                            = 0;
-        PFN_vkUnmapMemory2                          vkUnmapMemory2                          = 0;
-        PFN_vkGetDeviceImageSubresourceLayout       vkGetDeviceImageSubresourceLayout       = 0;
-        PFN_vkGetImageSubresourceLayout2            vkGetImageSubresourceLayout2            = 0;
-        PFN_vkCopyMemoryToImage                     vkCopyMemoryToImage                     = 0;
-        PFN_vkCopyImageToMemory                     vkCopyImageToMemory                     = 0;
-        PFN_vkCopyImageToImage                      vkCopyImageToImage                      = 0;
-        PFN_vkTransitionImageLayout                 vkTransitionImageLayout                 = 0;
-        PFN_vkCmdPushDescriptorSet                  vkCmdPushDescriptorSet                  = 0;
-        PFN_vkCmdPushDescriptorSetWithTemplate      vkCmdPushDescriptorSetWithTemplate      = 0;
-        PFN_vkCmdBindDescriptorSets2                vkCmdBindDescriptorSets2                = 0;
-        PFN_vkCmdPushConstants2                     vkCmdPushConstants2                     = 0;
-        PFN_vkCmdPushDescriptorSet2                 vkCmdPushDescriptorSet2                 = 0;
-        PFN_vkCmdPushDescriptorSetWithTemplate2     vkCmdPushDescriptorSetWithTemplate2     = 0;
-        PFN_vkCmdSetLineStipple                     vkCmdSetLineStipple                     = 0;
-        PFN_vkCmdBindIndexBuffer2                   vkCmdBindIndexBuffer2                   = 0;
-        PFN_vkGetRenderingAreaGranularity           vkGetRenderingAreaGranularity           = 0;
-        PFN_vkCmdSetRenderingAttachmentLocations    vkCmdSetRenderingAttachmentLocations    = 0;
-        PFN_vkCmdSetRenderingInputAttachmentIndices vkCmdSetRenderingInputAttachmentIndices = 0;
+        vkCreatePrivateDataSlot             = PFN_vkCreatePrivateDataSlot( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlot" ) );
+        vkDestroyPrivateDataSlot            = PFN_vkDestroyPrivateDataSlot( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlot" ) );
+        vkSetPrivateData                    = PFN_vkSetPrivateData( vkGetDeviceProcAddr( device, "vkSetPrivateData" ) );
+        vkGetPrivateData                    = PFN_vkGetPrivateData( vkGetDeviceProcAddr( device, "vkGetPrivateData" ) );
+        vkCmdSetEvent2                      = PFN_vkCmdSetEvent2( vkGetDeviceProcAddr( device, "vkCmdSetEvent2" ) );
+        vkCmdResetEvent2                    = PFN_vkCmdResetEvent2( vkGetDeviceProcAddr( device, "vkCmdResetEvent2" ) );
+        vkCmdWaitEvents2                    = PFN_vkCmdWaitEvents2( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2" ) );
+        vkCmdPipelineBarrier2               = PFN_vkCmdPipelineBarrier2( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2" ) );
+        vkCmdWriteTimestamp2                = PFN_vkCmdWriteTimestamp2( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2" ) );
+        vkQueueSubmit2                      = PFN_vkQueueSubmit2( vkGetDeviceProcAddr( device, "vkQueueSubmit2" ) );
+        vkCmdCopyBuffer2                    = PFN_vkCmdCopyBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2" ) );
+        vkCmdCopyImage2                     = PFN_vkCmdCopyImage2( vkGetDeviceProcAddr( device, "vkCmdCopyImage2" ) );
+        vkCmdCopyBufferToImage2             = PFN_vkCmdCopyBufferToImage2( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2" ) );
+        vkCmdCopyImageToBuffer2             = PFN_vkCmdCopyImageToBuffer2( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2" ) );
+        vkCmdBlitImage2                     = PFN_vkCmdBlitImage2( vkGetDeviceProcAddr( device, "vkCmdBlitImage2" ) );
+        vkCmdResolveImage2                  = PFN_vkCmdResolveImage2( vkGetDeviceProcAddr( device, "vkCmdResolveImage2" ) );
+        vkCmdBeginRendering                 = PFN_vkCmdBeginRendering( vkGetDeviceProcAddr( device, "vkCmdBeginRendering" ) );
+        vkCmdEndRendering                   = PFN_vkCmdEndRendering( vkGetDeviceProcAddr( device, "vkCmdEndRendering" ) );
+        vkCmdSetCullMode                    = PFN_vkCmdSetCullMode( vkGetDeviceProcAddr( device, "vkCmdSetCullMode" ) );
+        vkCmdSetFrontFace                   = PFN_vkCmdSetFrontFace( vkGetDeviceProcAddr( device, "vkCmdSetFrontFace" ) );
+        vkCmdSetPrimitiveTopology           = PFN_vkCmdSetPrimitiveTopology( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopology" ) );
+        vkCmdSetViewportWithCount           = PFN_vkCmdSetViewportWithCount( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCount" ) );
+        vkCmdSetScissorWithCount            = PFN_vkCmdSetScissorWithCount( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCount" ) );
+        vkCmdBindVertexBuffers2             = PFN_vkCmdBindVertexBuffers2( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2" ) );
+        vkCmdSetDepthTestEnable             = PFN_vkCmdSetDepthTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnable" ) );
+        vkCmdSetDepthWriteEnable            = PFN_vkCmdSetDepthWriteEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnable" ) );
+        vkCmdSetDepthCompareOp              = PFN_vkCmdSetDepthCompareOp( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOp" ) );
+        vkCmdSetDepthBoundsTestEnable       = PFN_vkCmdSetDepthBoundsTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnable" ) );
+        vkCmdSetStencilTestEnable           = PFN_vkCmdSetStencilTestEnable( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnable" ) );
+        vkCmdSetStencilOp                   = PFN_vkCmdSetStencilOp( vkGetDeviceProcAddr( device, "vkCmdSetStencilOp" ) );
+        vkCmdSetRasterizerDiscardEnable     = PFN_vkCmdSetRasterizerDiscardEnable( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnable" ) );
+        vkCmdSetDepthBiasEnable             = PFN_vkCmdSetDepthBiasEnable( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnable" ) );
+        vkCmdSetPrimitiveRestartEnable      = PFN_vkCmdSetPrimitiveRestartEnable( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnable" ) );
+        vkGetDeviceBufferMemoryRequirements = PFN_vkGetDeviceBufferMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirements" ) );
+        vkGetDeviceImageMemoryRequirements  = PFN_vkGetDeviceImageMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirements" ) );
+        vkGetDeviceImageSparseMemoryRequirements =
+          PFN_vkGetDeviceImageSparseMemoryRequirements( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirements" ) );
 
         //=== VK_KHR_swapchain ===
-        PFN_vkCreateSwapchainKHR                   vkCreateSwapchainKHR                   = 0;
-        PFN_vkDestroySwapchainKHR                  vkDestroySwapchainKHR                  = 0;
-        PFN_vkGetSwapchainImagesKHR                vkGetSwapchainImagesKHR                = 0;
-        PFN_vkAcquireNextImageKHR                  vkAcquireNextImageKHR                  = 0;
-        PFN_vkQueuePresentKHR                      vkQueuePresentKHR                      = 0;
-        PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR = 0;
-        PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR = 0;
-        PFN_vkAcquireNextImage2KHR                 vkAcquireNextImage2KHR                 = 0;
+        vkCreateSwapchainKHR    = PFN_vkCreateSwapchainKHR( vkGetDeviceProcAddr( device, "vkCreateSwapchainKHR" ) );
+        vkDestroySwapchainKHR   = PFN_vkDestroySwapchainKHR( vkGetDeviceProcAddr( device, "vkDestroySwapchainKHR" ) );
+        vkGetSwapchainImagesKHR = PFN_vkGetSwapchainImagesKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainImagesKHR" ) );
+        vkAcquireNextImageKHR   = PFN_vkAcquireNextImageKHR( vkGetDeviceProcAddr( device, "vkAcquireNextImageKHR" ) );
+        vkQueuePresentKHR       = PFN_vkQueuePresentKHR( vkGetDeviceProcAddr( device, "vkQueuePresentKHR" ) );
+        vkGetDeviceGroupPresentCapabilitiesKHR =
+          PFN_vkGetDeviceGroupPresentCapabilitiesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPresentCapabilitiesKHR" ) );
+        vkGetDeviceGroupSurfacePresentModesKHR =
+          PFN_vkGetDeviceGroupSurfacePresentModesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModesKHR" ) );
+        vkAcquireNextImage2KHR = PFN_vkAcquireNextImage2KHR( vkGetDeviceProcAddr( device, "vkAcquireNextImage2KHR" ) );
 
         //=== VK_KHR_display_swapchain ===
-        PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR = 0;
+        vkCreateSharedSwapchainsKHR = PFN_vkCreateSharedSwapchainsKHR( vkGetDeviceProcAddr( device, "vkCreateSharedSwapchainsKHR" ) );
 
         //=== VK_EXT_debug_marker ===
-        PFN_vkDebugMarkerSetObjectTagEXT  vkDebugMarkerSetObjectTagEXT  = 0;
-        PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT = 0;
-        PFN_vkCmdDebugMarkerBeginEXT      vkCmdDebugMarkerBeginEXT      = 0;
-        PFN_vkCmdDebugMarkerEndEXT        vkCmdDebugMarkerEndEXT        = 0;
-        PFN_vkCmdDebugMarkerInsertEXT     vkCmdDebugMarkerInsertEXT     = 0;
+        vkDebugMarkerSetObjectTagEXT  = PFN_vkDebugMarkerSetObjectTagEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectTagEXT" ) );
+        vkDebugMarkerSetObjectNameEXT = PFN_vkDebugMarkerSetObjectNameEXT( vkGetDeviceProcAddr( device, "vkDebugMarkerSetObjectNameEXT" ) );
+        vkCmdDebugMarkerBeginEXT      = PFN_vkCmdDebugMarkerBeginEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerBeginEXT" ) );
+        vkCmdDebugMarkerEndEXT        = PFN_vkCmdDebugMarkerEndEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerEndEXT" ) );
+        vkCmdDebugMarkerInsertEXT     = PFN_vkCmdDebugMarkerInsertEXT( vkGetDeviceProcAddr( device, "vkCmdDebugMarkerInsertEXT" ) );
 
         //=== VK_KHR_video_queue ===
-        PFN_vkCreateVideoSessionKHR                vkCreateVideoSessionKHR                = 0;
-        PFN_vkDestroyVideoSessionKHR               vkDestroyVideoSessionKHR               = 0;
-        PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR = 0;
-        PFN_vkBindVideoSessionMemoryKHR            vkBindVideoSessionMemoryKHR            = 0;
-        PFN_vkCreateVideoSessionParametersKHR      vkCreateVideoSessionParametersKHR      = 0;
-        PFN_vkUpdateVideoSessionParametersKHR      vkUpdateVideoSessionParametersKHR      = 0;
-        PFN_vkDestroyVideoSessionParametersKHR     vkDestroyVideoSessionParametersKHR     = 0;
-        PFN_vkCmdBeginVideoCodingKHR               vkCmdBeginVideoCodingKHR               = 0;
-        PFN_vkCmdEndVideoCodingKHR                 vkCmdEndVideoCodingKHR                 = 0;
-        PFN_vkCmdControlVideoCodingKHR             vkCmdControlVideoCodingKHR             = 0;
+        vkCreateVideoSessionKHR  = PFN_vkCreateVideoSessionKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionKHR" ) );
+        vkDestroyVideoSessionKHR = PFN_vkDestroyVideoSessionKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionKHR" ) );
+        vkGetVideoSessionMemoryRequirementsKHR =
+          PFN_vkGetVideoSessionMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetVideoSessionMemoryRequirementsKHR" ) );
+        vkBindVideoSessionMemoryKHR        = PFN_vkBindVideoSessionMemoryKHR( vkGetDeviceProcAddr( device, "vkBindVideoSessionMemoryKHR" ) );
+        vkCreateVideoSessionParametersKHR  = PFN_vkCreateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkCreateVideoSessionParametersKHR" ) );
+        vkUpdateVideoSessionParametersKHR  = PFN_vkUpdateVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkUpdateVideoSessionParametersKHR" ) );
+        vkDestroyVideoSessionParametersKHR = PFN_vkDestroyVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkDestroyVideoSessionParametersKHR" ) );
+        vkCmdBeginVideoCodingKHR           = PFN_vkCmdBeginVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginVideoCodingKHR" ) );
+        vkCmdEndVideoCodingKHR             = PFN_vkCmdEndVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdEndVideoCodingKHR" ) );
+        vkCmdControlVideoCodingKHR         = PFN_vkCmdControlVideoCodingKHR( vkGetDeviceProcAddr( device, "vkCmdControlVideoCodingKHR" ) );
 
         //=== VK_KHR_video_decode_queue ===
-        PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR = 0;
+        vkCmdDecodeVideoKHR = PFN_vkCmdDecodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdDecodeVideoKHR" ) );
 
         //=== VK_EXT_transform_feedback ===
-        PFN_vkCmdBindTransformFeedbackBuffersEXT vkCmdBindTransformFeedbackBuffersEXT = 0;
-        PFN_vkCmdBeginTransformFeedbackEXT       vkCmdBeginTransformFeedbackEXT       = 0;
-        PFN_vkCmdEndTransformFeedbackEXT         vkCmdEndTransformFeedbackEXT         = 0;
-        PFN_vkCmdBeginQueryIndexedEXT            vkCmdBeginQueryIndexedEXT            = 0;
-        PFN_vkCmdEndQueryIndexedEXT              vkCmdEndQueryIndexedEXT              = 0;
-        PFN_vkCmdDrawIndirectByteCountEXT        vkCmdDrawIndirectByteCountEXT        = 0;
+        vkCmdBindTransformFeedbackBuffersEXT =
+          PFN_vkCmdBindTransformFeedbackBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindTransformFeedbackBuffersEXT" ) );
+        vkCmdBeginTransformFeedbackEXT = PFN_vkCmdBeginTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdBeginTransformFeedbackEXT" ) );
+        vkCmdEndTransformFeedbackEXT   = PFN_vkCmdEndTransformFeedbackEXT( vkGetDeviceProcAddr( device, "vkCmdEndTransformFeedbackEXT" ) );
+        vkCmdBeginQueryIndexedEXT      = PFN_vkCmdBeginQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdBeginQueryIndexedEXT" ) );
+        vkCmdEndQueryIndexedEXT        = PFN_vkCmdEndQueryIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdEndQueryIndexedEXT" ) );
+        vkCmdDrawIndirectByteCountEXT  = PFN_vkCmdDrawIndirectByteCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectByteCountEXT" ) );
 
         //=== VK_NVX_binary_import ===
-        PFN_vkCreateCuModuleNVX    vkCreateCuModuleNVX    = 0;
-        PFN_vkCreateCuFunctionNVX  vkCreateCuFunctionNVX  = 0;
-        PFN_vkDestroyCuModuleNVX   vkDestroyCuModuleNVX   = 0;
-        PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX = 0;
-        PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX = 0;
+        vkCreateCuModuleNVX    = PFN_vkCreateCuModuleNVX( vkGetDeviceProcAddr( device, "vkCreateCuModuleNVX" ) );
+        vkCreateCuFunctionNVX  = PFN_vkCreateCuFunctionNVX( vkGetDeviceProcAddr( device, "vkCreateCuFunctionNVX" ) );
+        vkDestroyCuModuleNVX   = PFN_vkDestroyCuModuleNVX( vkGetDeviceProcAddr( device, "vkDestroyCuModuleNVX" ) );
+        vkDestroyCuFunctionNVX = PFN_vkDestroyCuFunctionNVX( vkGetDeviceProcAddr( device, "vkDestroyCuFunctionNVX" ) );
+        vkCmdCuLaunchKernelNVX = PFN_vkCmdCuLaunchKernelNVX( vkGetDeviceProcAddr( device, "vkCmdCuLaunchKernelNVX" ) );
 
         //=== VK_NVX_image_view_handle ===
-        PFN_vkGetImageViewHandleNVX   vkGetImageViewHandleNVX   = 0;
-        PFN_vkGetImageViewHandle64NVX vkGetImageViewHandle64NVX = 0;
-        PFN_vkGetImageViewAddressNVX  vkGetImageViewAddressNVX  = 0;
+        vkGetImageViewHandleNVX  = PFN_vkGetImageViewHandleNVX( vkGetDeviceProcAddr( device, "vkGetImageViewHandleNVX" ) );
+        vkGetImageViewAddressNVX = PFN_vkGetImageViewAddressNVX( vkGetDeviceProcAddr( device, "vkGetImageViewAddressNVX" ) );
 
         //=== VK_AMD_draw_indirect_count ===
-        PFN_vkCmdDrawIndirectCountAMD        vkCmdDrawIndirectCountAMD        = 0;
-        PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD = 0;
+        vkCmdDrawIndirectCountAMD = PFN_vkCmdDrawIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountAMD" ) );
+        if ( !vkCmdDrawIndirectCount )
+          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountAMD;
+        vkCmdDrawIndexedIndirectCountAMD = PFN_vkCmdDrawIndexedIndirectCountAMD( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountAMD" ) );
+        if ( !vkCmdDrawIndexedIndirectCount )
+          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountAMD;
 
         //=== VK_AMD_shader_info ===
-        PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = 0;
+        vkGetShaderInfoAMD = PFN_vkGetShaderInfoAMD( vkGetDeviceProcAddr( device, "vkGetShaderInfoAMD" ) );
 
         //=== VK_KHR_dynamic_rendering ===
-        PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR = 0;
-        PFN_vkCmdEndRenderingKHR   vkCmdEndRenderingKHR   = 0;
+        vkCmdBeginRenderingKHR = PFN_vkCmdBeginRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderingKHR" ) );
+        if ( !vkCmdBeginRendering )
+          vkCmdBeginRendering = vkCmdBeginRenderingKHR;
+        vkCmdEndRenderingKHR = PFN_vkCmdEndRenderingKHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderingKHR" ) );
+        if ( !vkCmdEndRendering )
+          vkCmdEndRendering = vkCmdEndRenderingKHR;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_NV_external_memory_win32 ===
-        PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV = 0;
-#  else
-        PFN_dummy vkGetMemoryWin32HandleNV_placeholder = 0;
+        vkGetMemoryWin32HandleNV = PFN_vkGetMemoryWin32HandleNV( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleNV" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_KHR_device_group ===
-        PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR = 0;
-        PFN_vkCmdSetDeviceMaskKHR                 vkCmdSetDeviceMaskKHR                 = 0;
-        PFN_vkCmdDispatchBaseKHR                  vkCmdDispatchBaseKHR                  = 0;
+        vkGetDeviceGroupPeerMemoryFeaturesKHR =
+          PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR( vkGetDeviceProcAddr( device, "vkGetDeviceGroupPeerMemoryFeaturesKHR" ) );
+        if ( !vkGetDeviceGroupPeerMemoryFeatures )
+          vkGetDeviceGroupPeerMemoryFeatures = vkGetDeviceGroupPeerMemoryFeaturesKHR;
+        vkCmdSetDeviceMaskKHR = PFN_vkCmdSetDeviceMaskKHR( vkGetDeviceProcAddr( device, "vkCmdSetDeviceMaskKHR" ) );
+        if ( !vkCmdSetDeviceMask )
+          vkCmdSetDeviceMask = vkCmdSetDeviceMaskKHR;
+        vkCmdDispatchBaseKHR = PFN_vkCmdDispatchBaseKHR( vkGetDeviceProcAddr( device, "vkCmdDispatchBaseKHR" ) );
+        if ( !vkCmdDispatchBase )
+          vkCmdDispatchBase = vkCmdDispatchBaseKHR;
 
         //=== VK_KHR_maintenance1 ===
-        PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR = 0;
+        vkTrimCommandPoolKHR = PFN_vkTrimCommandPoolKHR( vkGetDeviceProcAddr( device, "vkTrimCommandPoolKHR" ) );
+        if ( !vkTrimCommandPool )
+          vkTrimCommandPool = vkTrimCommandPoolKHR;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_KHR_external_memory_win32 ===
-        PFN_vkGetMemoryWin32HandleKHR           vkGetMemoryWin32HandleKHR           = 0;
-        PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR = 0;
-#  else
-        PFN_dummy vkGetMemoryWin32HandleKHR_placeholder           = 0;
-        PFN_dummy vkGetMemoryWin32HandlePropertiesKHR_placeholder = 0;
+        vkGetMemoryWin32HandleKHR           = PFN_vkGetMemoryWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandleKHR" ) );
+        vkGetMemoryWin32HandlePropertiesKHR = PFN_vkGetMemoryWin32HandlePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryWin32HandlePropertiesKHR" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_KHR_external_memory_fd ===
-        PFN_vkGetMemoryFdKHR           vkGetMemoryFdKHR           = 0;
-        PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR = 0;
+        vkGetMemoryFdKHR           = PFN_vkGetMemoryFdKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdKHR" ) );
+        vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR( vkGetDeviceProcAddr( device, "vkGetMemoryFdPropertiesKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_KHR_external_semaphore_win32 ===
-        PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR = 0;
-        PFN_vkGetSemaphoreWin32HandleKHR    vkGetSemaphoreWin32HandleKHR    = 0;
-#  else
-        PFN_dummy vkImportSemaphoreWin32HandleKHR_placeholder = 0;
-        PFN_dummy vkGetSemaphoreWin32HandleKHR_placeholder    = 0;
+        vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreWin32HandleKHR" ) );
+        vkGetSemaphoreWin32HandleKHR    = PFN_vkGetSemaphoreWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreWin32HandleKHR" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_KHR_external_semaphore_fd ===
-        PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR = 0;
-        PFN_vkGetSemaphoreFdKHR    vkGetSemaphoreFdKHR    = 0;
+        vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkImportSemaphoreFdKHR" ) );
+        vkGetSemaphoreFdKHR    = PFN_vkGetSemaphoreFdKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreFdKHR" ) );
 
         //=== VK_KHR_push_descriptor ===
-        PFN_vkCmdPushDescriptorSetKHR             vkCmdPushDescriptorSetKHR             = 0;
-        PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR = 0;
+        vkCmdPushDescriptorSetKHR = PFN_vkCmdPushDescriptorSetKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetKHR" ) );
+        vkCmdPushDescriptorSetWithTemplateKHR =
+          PFN_vkCmdPushDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplateKHR" ) );
 
         //=== VK_EXT_conditional_rendering ===
-        PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT = 0;
-        PFN_vkCmdEndConditionalRenderingEXT   vkCmdEndConditionalRenderingEXT   = 0;
+        vkCmdBeginConditionalRenderingEXT = PFN_vkCmdBeginConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdBeginConditionalRenderingEXT" ) );
+        vkCmdEndConditionalRenderingEXT   = PFN_vkCmdEndConditionalRenderingEXT( vkGetDeviceProcAddr( device, "vkCmdEndConditionalRenderingEXT" ) );
 
         //=== VK_KHR_descriptor_update_template ===
-        PFN_vkCreateDescriptorUpdateTemplateKHR  vkCreateDescriptorUpdateTemplateKHR  = 0;
-        PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR = 0;
-        PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR = 0;
+        vkCreateDescriptorUpdateTemplateKHR = PFN_vkCreateDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkCreateDescriptorUpdateTemplateKHR" ) );
+        if ( !vkCreateDescriptorUpdateTemplate )
+          vkCreateDescriptorUpdateTemplate = vkCreateDescriptorUpdateTemplateKHR;
+        vkDestroyDescriptorUpdateTemplateKHR =
+          PFN_vkDestroyDescriptorUpdateTemplateKHR( vkGetDeviceProcAddr( device, "vkDestroyDescriptorUpdateTemplateKHR" ) );
+        if ( !vkDestroyDescriptorUpdateTemplate )
+          vkDestroyDescriptorUpdateTemplate = vkDestroyDescriptorUpdateTemplateKHR;
+        vkUpdateDescriptorSetWithTemplateKHR =
+          PFN_vkUpdateDescriptorSetWithTemplateKHR( vkGetDeviceProcAddr( device, "vkUpdateDescriptorSetWithTemplateKHR" ) );
+        if ( !vkUpdateDescriptorSetWithTemplate )
+          vkUpdateDescriptorSetWithTemplate = vkUpdateDescriptorSetWithTemplateKHR;
 
         //=== VK_NV_clip_space_w_scaling ===
-        PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV = 0;
+        vkCmdSetViewportWScalingNV = PFN_vkCmdSetViewportWScalingNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingNV" ) );
 
         //=== VK_EXT_display_control ===
-        PFN_vkDisplayPowerControlEXT  vkDisplayPowerControlEXT  = 0;
-        PFN_vkRegisterDeviceEventEXT  vkRegisterDeviceEventEXT  = 0;
-        PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT = 0;
-        PFN_vkGetSwapchainCounterEXT  vkGetSwapchainCounterEXT  = 0;
+        vkDisplayPowerControlEXT  = PFN_vkDisplayPowerControlEXT( vkGetDeviceProcAddr( device, "vkDisplayPowerControlEXT" ) );
+        vkRegisterDeviceEventEXT  = PFN_vkRegisterDeviceEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDeviceEventEXT" ) );
+        vkRegisterDisplayEventEXT = PFN_vkRegisterDisplayEventEXT( vkGetDeviceProcAddr( device, "vkRegisterDisplayEventEXT" ) );
+        vkGetSwapchainCounterEXT  = PFN_vkGetSwapchainCounterEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainCounterEXT" ) );
 
         //=== VK_GOOGLE_display_timing ===
-        PFN_vkGetRefreshCycleDurationGOOGLE   vkGetRefreshCycleDurationGOOGLE   = 0;
-        PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE = 0;
+        vkGetRefreshCycleDurationGOOGLE   = PFN_vkGetRefreshCycleDurationGOOGLE( vkGetDeviceProcAddr( device, "vkGetRefreshCycleDurationGOOGLE" ) );
+        vkGetPastPresentationTimingGOOGLE = PFN_vkGetPastPresentationTimingGOOGLE( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingGOOGLE" ) );
 
         //=== VK_EXT_discard_rectangles ===
-        PFN_vkCmdSetDiscardRectangleEXT       vkCmdSetDiscardRectangleEXT       = 0;
-        PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT = 0;
-        PFN_vkCmdSetDiscardRectangleModeEXT   vkCmdSetDiscardRectangleModeEXT   = 0;
+        vkCmdSetDiscardRectangleEXT       = PFN_vkCmdSetDiscardRectangleEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEXT" ) );
+        vkCmdSetDiscardRectangleEnableEXT = PFN_vkCmdSetDiscardRectangleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleEnableEXT" ) );
+        vkCmdSetDiscardRectangleModeEXT   = PFN_vkCmdSetDiscardRectangleModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetDiscardRectangleModeEXT" ) );
 
         //=== VK_EXT_hdr_metadata ===
-        PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT = 0;
+        vkSetHdrMetadataEXT = PFN_vkSetHdrMetadataEXT( vkGetDeviceProcAddr( device, "vkSetHdrMetadataEXT" ) );
 
         //=== VK_KHR_create_renderpass2 ===
-        PFN_vkCreateRenderPass2KHR   vkCreateRenderPass2KHR   = 0;
-        PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR = 0;
-        PFN_vkCmdNextSubpass2KHR     vkCmdNextSubpass2KHR     = 0;
-        PFN_vkCmdEndRenderPass2KHR   vkCmdEndRenderPass2KHR   = 0;
+        vkCreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCreateRenderPass2KHR" ) );
+        if ( !vkCreateRenderPass2 )
+          vkCreateRenderPass2 = vkCreateRenderPass2KHR;
+        vkCmdBeginRenderPass2KHR = PFN_vkCmdBeginRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdBeginRenderPass2KHR" ) );
+        if ( !vkCmdBeginRenderPass2 )
+          vkCmdBeginRenderPass2 = vkCmdBeginRenderPass2KHR;
+        vkCmdNextSubpass2KHR = PFN_vkCmdNextSubpass2KHR( vkGetDeviceProcAddr( device, "vkCmdNextSubpass2KHR" ) );
+        if ( !vkCmdNextSubpass2 )
+          vkCmdNextSubpass2 = vkCmdNextSubpass2KHR;
+        vkCmdEndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR( vkGetDeviceProcAddr( device, "vkCmdEndRenderPass2KHR" ) );
+        if ( !vkCmdEndRenderPass2 )
+          vkCmdEndRenderPass2 = vkCmdEndRenderPass2KHR;
 
         //=== VK_KHR_shared_presentable_image ===
-        PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR = 0;
+        vkGetSwapchainStatusKHR = PFN_vkGetSwapchainStatusKHR( vkGetDeviceProcAddr( device, "vkGetSwapchainStatusKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_KHR_external_fence_win32 ===
-        PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR = 0;
-        PFN_vkGetFenceWin32HandleKHR    vkGetFenceWin32HandleKHR    = 0;
-#  else
-        PFN_dummy vkImportFenceWin32HandleKHR_placeholder = 0;
-        PFN_dummy vkGetFenceWin32HandleKHR_placeholder    = 0;
+        vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkImportFenceWin32HandleKHR" ) );
+        vkGetFenceWin32HandleKHR    = PFN_vkGetFenceWin32HandleKHR( vkGetDeviceProcAddr( device, "vkGetFenceWin32HandleKHR" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_KHR_external_fence_fd ===
-        PFN_vkImportFenceFdKHR vkImportFenceFdKHR = 0;
-        PFN_vkGetFenceFdKHR    vkGetFenceFdKHR    = 0;
+        vkImportFenceFdKHR = PFN_vkImportFenceFdKHR( vkGetDeviceProcAddr( device, "vkImportFenceFdKHR" ) );
+        vkGetFenceFdKHR    = PFN_vkGetFenceFdKHR( vkGetDeviceProcAddr( device, "vkGetFenceFdKHR" ) );
 
         //=== VK_KHR_performance_query ===
-        PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR = 0;
-        PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR = 0;
+        vkAcquireProfilingLockKHR = PFN_vkAcquireProfilingLockKHR( vkGetDeviceProcAddr( device, "vkAcquireProfilingLockKHR" ) );
+        vkReleaseProfilingLockKHR = PFN_vkReleaseProfilingLockKHR( vkGetDeviceProcAddr( device, "vkReleaseProfilingLockKHR" ) );
 
         //=== VK_EXT_debug_utils ===
-        PFN_vkSetDebugUtilsObjectNameEXT    vkSetDebugUtilsObjectNameEXT    = 0;
-        PFN_vkSetDebugUtilsObjectTagEXT     vkSetDebugUtilsObjectTagEXT     = 0;
-        PFN_vkQueueBeginDebugUtilsLabelEXT  vkQueueBeginDebugUtilsLabelEXT  = 0;
-        PFN_vkQueueEndDebugUtilsLabelEXT    vkQueueEndDebugUtilsLabelEXT    = 0;
-        PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT = 0;
-        PFN_vkCmdBeginDebugUtilsLabelEXT    vkCmdBeginDebugUtilsLabelEXT    = 0;
-        PFN_vkCmdEndDebugUtilsLabelEXT      vkCmdEndDebugUtilsLabelEXT      = 0;
-        PFN_vkCmdInsertDebugUtilsLabelEXT   vkCmdInsertDebugUtilsLabelEXT   = 0;
+        vkSetDebugUtilsObjectNameEXT    = PFN_vkSetDebugUtilsObjectNameEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectNameEXT" ) );
+        vkSetDebugUtilsObjectTagEXT     = PFN_vkSetDebugUtilsObjectTagEXT( vkGetDeviceProcAddr( device, "vkSetDebugUtilsObjectTagEXT" ) );
+        vkQueueBeginDebugUtilsLabelEXT  = PFN_vkQueueBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueBeginDebugUtilsLabelEXT" ) );
+        vkQueueEndDebugUtilsLabelEXT    = PFN_vkQueueEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueEndDebugUtilsLabelEXT" ) );
+        vkQueueInsertDebugUtilsLabelEXT = PFN_vkQueueInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkQueueInsertDebugUtilsLabelEXT" ) );
+        vkCmdBeginDebugUtilsLabelEXT    = PFN_vkCmdBeginDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdBeginDebugUtilsLabelEXT" ) );
+        vkCmdEndDebugUtilsLabelEXT      = PFN_vkCmdEndDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdEndDebugUtilsLabelEXT" ) );
+        vkCmdInsertDebugUtilsLabelEXT   = PFN_vkCmdInsertDebugUtilsLabelEXT( vkGetDeviceProcAddr( device, "vkCmdInsertDebugUtilsLabelEXT" ) );
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
         //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-        PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID = 0;
-        PFN_vkGetMemoryAndroidHardwareBufferANDROID     vkGetMemoryAndroidHardwareBufferANDROID     = 0;
-#  else
-        PFN_dummy vkGetAndroidHardwareBufferPropertiesANDROID_placeholder = 0;
-        PFN_dummy vkGetMemoryAndroidHardwareBufferANDROID_placeholder     = 0;
+        vkGetAndroidHardwareBufferPropertiesANDROID =
+          PFN_vkGetAndroidHardwareBufferPropertiesANDROID( vkGetDeviceProcAddr( device, "vkGetAndroidHardwareBufferPropertiesANDROID" ) );
+        vkGetMemoryAndroidHardwareBufferANDROID =
+          PFN_vkGetMemoryAndroidHardwareBufferANDROID( vkGetDeviceProcAddr( device, "vkGetMemoryAndroidHardwareBufferANDROID" ) );
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
         //=== VK_AMDX_shader_enqueue ===
-        PFN_vkCreateExecutionGraphPipelinesAMDX        vkCreateExecutionGraphPipelinesAMDX        = 0;
-        PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX = 0;
-        PFN_vkGetExecutionGraphPipelineNodeIndexAMDX   vkGetExecutionGraphPipelineNodeIndexAMDX   = 0;
-        PFN_vkCmdInitializeGraphScratchMemoryAMDX      vkCmdInitializeGraphScratchMemoryAMDX      = 0;
-        PFN_vkCmdDispatchGraphAMDX                     vkCmdDispatchGraphAMDX                     = 0;
-        PFN_vkCmdDispatchGraphIndirectAMDX             vkCmdDispatchGraphIndirectAMDX             = 0;
-        PFN_vkCmdDispatchGraphIndirectCountAMDX        vkCmdDispatchGraphIndirectCountAMDX        = 0;
-#  else
-        PFN_dummy vkCreateExecutionGraphPipelinesAMDX_placeholder        = 0;
-        PFN_dummy vkGetExecutionGraphPipelineScratchSizeAMDX_placeholder = 0;
-        PFN_dummy vkGetExecutionGraphPipelineNodeIndexAMDX_placeholder   = 0;
-        PFN_dummy vkCmdInitializeGraphScratchMemoryAMDX_placeholder      = 0;
-        PFN_dummy vkCmdDispatchGraphAMDX_placeholder                     = 0;
-        PFN_dummy vkCmdDispatchGraphIndirectAMDX_placeholder             = 0;
-        PFN_dummy vkCmdDispatchGraphIndirectCountAMDX_placeholder        = 0;
+        vkCreateExecutionGraphPipelinesAMDX = PFN_vkCreateExecutionGraphPipelinesAMDX( vkGetDeviceProcAddr( device, "vkCreateExecutionGraphPipelinesAMDX" ) );
+        vkGetExecutionGraphPipelineScratchSizeAMDX =
+          PFN_vkGetExecutionGraphPipelineScratchSizeAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineScratchSizeAMDX" ) );
+        vkGetExecutionGraphPipelineNodeIndexAMDX =
+          PFN_vkGetExecutionGraphPipelineNodeIndexAMDX( vkGetDeviceProcAddr( device, "vkGetExecutionGraphPipelineNodeIndexAMDX" ) );
+        vkCmdInitializeGraphScratchMemoryAMDX =
+          PFN_vkCmdInitializeGraphScratchMemoryAMDX( vkGetDeviceProcAddr( device, "vkCmdInitializeGraphScratchMemoryAMDX" ) );
+        vkCmdDispatchGraphAMDX              = PFN_vkCmdDispatchGraphAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphAMDX" ) );
+        vkCmdDispatchGraphIndirectAMDX      = PFN_vkCmdDispatchGraphIndirectAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectAMDX" ) );
+        vkCmdDispatchGraphIndirectCountAMDX = PFN_vkCmdDispatchGraphIndirectCountAMDX( vkGetDeviceProcAddr( device, "vkCmdDispatchGraphIndirectCountAMDX" ) );
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
         //=== VK_EXT_sample_locations ===
-        PFN_vkCmdSetSampleLocationsEXT vkCmdSetSampleLocationsEXT = 0;
+        vkCmdSetSampleLocationsEXT = PFN_vkCmdSetSampleLocationsEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEXT" ) );
 
         //=== VK_KHR_get_memory_requirements2 ===
-        PFN_vkGetImageMemoryRequirements2KHR       vkGetImageMemoryRequirements2KHR       = 0;
-        PFN_vkGetBufferMemoryRequirements2KHR      vkGetBufferMemoryRequirements2KHR      = 0;
-        PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR = 0;
+        vkGetImageMemoryRequirements2KHR = PFN_vkGetImageMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageMemoryRequirements2KHR" ) );
+        if ( !vkGetImageMemoryRequirements2 )
+          vkGetImageMemoryRequirements2 = vkGetImageMemoryRequirements2KHR;
+        vkGetBufferMemoryRequirements2KHR = PFN_vkGetBufferMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetBufferMemoryRequirements2KHR" ) );
+        if ( !vkGetBufferMemoryRequirements2 )
+          vkGetBufferMemoryRequirements2 = vkGetBufferMemoryRequirements2KHR;
+        vkGetImageSparseMemoryRequirements2KHR =
+          PFN_vkGetImageSparseMemoryRequirements2KHR( vkGetDeviceProcAddr( device, "vkGetImageSparseMemoryRequirements2KHR" ) );
+        if ( !vkGetImageSparseMemoryRequirements2 )
+          vkGetImageSparseMemoryRequirements2 = vkGetImageSparseMemoryRequirements2KHR;
 
         //=== VK_KHR_acceleration_structure ===
-        PFN_vkCreateAccelerationStructureKHR                 vkCreateAccelerationStructureKHR                 = 0;
-        PFN_vkDestroyAccelerationStructureKHR                vkDestroyAccelerationStructureKHR                = 0;
-        PFN_vkCmdBuildAccelerationStructuresKHR              vkCmdBuildAccelerationStructuresKHR              = 0;
-        PFN_vkCmdBuildAccelerationStructuresIndirectKHR      vkCmdBuildAccelerationStructuresIndirectKHR      = 0;
-        PFN_vkBuildAccelerationStructuresKHR                 vkBuildAccelerationStructuresKHR                 = 0;
-        PFN_vkCopyAccelerationStructureKHR                   vkCopyAccelerationStructureKHR                   = 0;
-        PFN_vkCopyAccelerationStructureToMemoryKHR           vkCopyAccelerationStructureToMemoryKHR           = 0;
-        PFN_vkCopyMemoryToAccelerationStructureKHR           vkCopyMemoryToAccelerationStructureKHR           = 0;
-        PFN_vkWriteAccelerationStructuresPropertiesKHR       vkWriteAccelerationStructuresPropertiesKHR       = 0;
-        PFN_vkCmdCopyAccelerationStructureKHR                vkCmdCopyAccelerationStructureKHR                = 0;
-        PFN_vkCmdCopyAccelerationStructureToMemoryKHR        vkCmdCopyAccelerationStructureToMemoryKHR        = 0;
-        PFN_vkCmdCopyMemoryToAccelerationStructureKHR        vkCmdCopyMemoryToAccelerationStructureKHR        = 0;
-        PFN_vkGetAccelerationStructureDeviceAddressKHR       vkGetAccelerationStructureDeviceAddressKHR       = 0;
-        PFN_vkCmdWriteAccelerationStructuresPropertiesKHR    vkCmdWriteAccelerationStructuresPropertiesKHR    = 0;
-        PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR = 0;
-        PFN_vkGetAccelerationStructureBuildSizesKHR          vkGetAccelerationStructureBuildSizesKHR          = 0;
+        vkCreateAccelerationStructureKHR    = PFN_vkCreateAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureKHR" ) );
+        vkDestroyAccelerationStructureKHR   = PFN_vkDestroyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureKHR" ) );
+        vkCmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresKHR" ) );
+        vkCmdBuildAccelerationStructuresIndirectKHR =
+          PFN_vkCmdBuildAccelerationStructuresIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructuresIndirectKHR" ) );
+        vkBuildAccelerationStructuresKHR = PFN_vkBuildAccelerationStructuresKHR( vkGetDeviceProcAddr( device, "vkBuildAccelerationStructuresKHR" ) );
+        vkCopyAccelerationStructureKHR   = PFN_vkCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureKHR" ) );
+        vkCopyAccelerationStructureToMemoryKHR =
+          PFN_vkCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCopyAccelerationStructureToMemoryKHR" ) );
+        vkCopyMemoryToAccelerationStructureKHR =
+          PFN_vkCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCopyMemoryToAccelerationStructureKHR" ) );
+        vkWriteAccelerationStructuresPropertiesKHR =
+          PFN_vkWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkWriteAccelerationStructuresPropertiesKHR" ) );
+        vkCmdCopyAccelerationStructureKHR = PFN_vkCmdCopyAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureKHR" ) );
+        vkCmdCopyAccelerationStructureToMemoryKHR =
+          PFN_vkCmdCopyAccelerationStructureToMemoryKHR( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureToMemoryKHR" ) );
+        vkCmdCopyMemoryToAccelerationStructureKHR =
+          PFN_vkCmdCopyMemoryToAccelerationStructureKHR( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToAccelerationStructureKHR" ) );
+        vkGetAccelerationStructureDeviceAddressKHR =
+          PFN_vkGetAccelerationStructureDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureDeviceAddressKHR" ) );
+        vkCmdWriteAccelerationStructuresPropertiesKHR =
+          PFN_vkCmdWriteAccelerationStructuresPropertiesKHR( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesKHR" ) );
+        vkGetDeviceAccelerationStructureCompatibilityKHR =
+          PFN_vkGetDeviceAccelerationStructureCompatibilityKHR( vkGetDeviceProcAddr( device, "vkGetDeviceAccelerationStructureCompatibilityKHR" ) );
+        vkGetAccelerationStructureBuildSizesKHR =
+          PFN_vkGetAccelerationStructureBuildSizesKHR( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureBuildSizesKHR" ) );
 
         //=== VK_KHR_ray_tracing_pipeline ===
-        PFN_vkCmdTraceRaysKHR                                 vkCmdTraceRaysKHR                                 = 0;
-        PFN_vkCreateRayTracingPipelinesKHR                    vkCreateRayTracingPipelinesKHR                    = 0;
-        PFN_vkGetRayTracingShaderGroupHandlesKHR              vkGetRayTracingShaderGroupHandlesKHR              = 0;
-        PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR = 0;
-        PFN_vkCmdTraceRaysIndirectKHR                         vkCmdTraceRaysIndirectKHR                         = 0;
-        PFN_vkGetRayTracingShaderGroupStackSizeKHR            vkGetRayTracingShaderGroupStackSizeKHR            = 0;
-        PFN_vkCmdSetRayTracingPipelineStackSizeKHR            vkCmdSetRayTracingPipelineStackSizeKHR            = 0;
+        vkCmdTraceRaysKHR              = PFN_vkCmdTraceRaysKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysKHR" ) );
+        vkCreateRayTracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesKHR" ) );
+        vkGetRayTracingShaderGroupHandlesKHR =
+          PFN_vkGetRayTracingShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesKHR" ) );
+        vkGetRayTracingCaptureReplayShaderGroupHandlesKHR =
+          PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR" ) );
+        vkCmdTraceRaysIndirectKHR = PFN_vkCmdTraceRaysIndirectKHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirectKHR" ) );
+        vkGetRayTracingShaderGroupStackSizeKHR =
+          PFN_vkGetRayTracingShaderGroupStackSizeKHR( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupStackSizeKHR" ) );
+        vkCmdSetRayTracingPipelineStackSizeKHR =
+          PFN_vkCmdSetRayTracingPipelineStackSizeKHR( vkGetDeviceProcAddr( device, "vkCmdSetRayTracingPipelineStackSizeKHR" ) );
 
         //=== VK_KHR_sampler_ycbcr_conversion ===
-        PFN_vkCreateSamplerYcbcrConversionKHR  vkCreateSamplerYcbcrConversionKHR  = 0;
-        PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR = 0;
+        vkCreateSamplerYcbcrConversionKHR = PFN_vkCreateSamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkCreateSamplerYcbcrConversionKHR" ) );
+        if ( !vkCreateSamplerYcbcrConversion )
+          vkCreateSamplerYcbcrConversion = vkCreateSamplerYcbcrConversionKHR;
+        vkDestroySamplerYcbcrConversionKHR = PFN_vkDestroySamplerYcbcrConversionKHR( vkGetDeviceProcAddr( device, "vkDestroySamplerYcbcrConversionKHR" ) );
+        if ( !vkDestroySamplerYcbcrConversion )
+          vkDestroySamplerYcbcrConversion = vkDestroySamplerYcbcrConversionKHR;
 
         //=== VK_KHR_bind_memory2 ===
-        PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR = 0;
-        PFN_vkBindImageMemory2KHR  vkBindImageMemory2KHR  = 0;
+        vkBindBufferMemory2KHR = PFN_vkBindBufferMemory2KHR( vkGetDeviceProcAddr( device, "vkBindBufferMemory2KHR" ) );
+        if ( !vkBindBufferMemory2 )
+          vkBindBufferMemory2 = vkBindBufferMemory2KHR;
+        vkBindImageMemory2KHR = PFN_vkBindImageMemory2KHR( vkGetDeviceProcAddr( device, "vkBindImageMemory2KHR" ) );
+        if ( !vkBindImageMemory2 )
+          vkBindImageMemory2 = vkBindImageMemory2KHR;
 
         //=== VK_EXT_image_drm_format_modifier ===
-        PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT = 0;
+        vkGetImageDrmFormatModifierPropertiesEXT =
+          PFN_vkGetImageDrmFormatModifierPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetImageDrmFormatModifierPropertiesEXT" ) );
 
         //=== VK_EXT_validation_cache ===
-        PFN_vkCreateValidationCacheEXT  vkCreateValidationCacheEXT  = 0;
-        PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT = 0;
-        PFN_vkMergeValidationCachesEXT  vkMergeValidationCachesEXT  = 0;
-        PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT = 0;
+        vkCreateValidationCacheEXT  = PFN_vkCreateValidationCacheEXT( vkGetDeviceProcAddr( device, "vkCreateValidationCacheEXT" ) );
+        vkDestroyValidationCacheEXT = PFN_vkDestroyValidationCacheEXT( vkGetDeviceProcAddr( device, "vkDestroyValidationCacheEXT" ) );
+        vkMergeValidationCachesEXT  = PFN_vkMergeValidationCachesEXT( vkGetDeviceProcAddr( device, "vkMergeValidationCachesEXT" ) );
+        vkGetValidationCacheDataEXT = PFN_vkGetValidationCacheDataEXT( vkGetDeviceProcAddr( device, "vkGetValidationCacheDataEXT" ) );
 
         //=== VK_NV_shading_rate_image ===
-        PFN_vkCmdBindShadingRateImageNV          vkCmdBindShadingRateImageNV          = 0;
-        PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV = 0;
-        PFN_vkCmdSetCoarseSampleOrderNV          vkCmdSetCoarseSampleOrderNV          = 0;
+        vkCmdBindShadingRateImageNV = PFN_vkCmdBindShadingRateImageNV( vkGetDeviceProcAddr( device, "vkCmdBindShadingRateImageNV" ) );
+        vkCmdSetViewportShadingRatePaletteNV =
+          PFN_vkCmdSetViewportShadingRatePaletteNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportShadingRatePaletteNV" ) );
+        vkCmdSetCoarseSampleOrderNV = PFN_vkCmdSetCoarseSampleOrderNV( vkGetDeviceProcAddr( device, "vkCmdSetCoarseSampleOrderNV" ) );
 
         //=== VK_NV_ray_tracing ===
-        PFN_vkCreateAccelerationStructureNV                vkCreateAccelerationStructureNV                = 0;
-        PFN_vkDestroyAccelerationStructureNV               vkDestroyAccelerationStructureNV               = 0;
-        PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV = 0;
-        PFN_vkBindAccelerationStructureMemoryNV            vkBindAccelerationStructureMemoryNV            = 0;
-        PFN_vkCmdBuildAccelerationStructureNV              vkCmdBuildAccelerationStructureNV              = 0;
-        PFN_vkCmdCopyAccelerationStructureNV               vkCmdCopyAccelerationStructureNV               = 0;
-        PFN_vkCmdTraceRaysNV                               vkCmdTraceRaysNV                               = 0;
-        PFN_vkCreateRayTracingPipelinesNV                  vkCreateRayTracingPipelinesNV                  = 0;
-        PFN_vkGetRayTracingShaderGroupHandlesNV            vkGetRayTracingShaderGroupHandlesNV            = 0;
-        PFN_vkGetAccelerationStructureHandleNV             vkGetAccelerationStructureHandleNV             = 0;
-        PFN_vkCmdWriteAccelerationStructuresPropertiesNV   vkCmdWriteAccelerationStructuresPropertiesNV   = 0;
-        PFN_vkCompileDeferredNV                            vkCompileDeferredNV                            = 0;
+        vkCreateAccelerationStructureNV  = PFN_vkCreateAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCreateAccelerationStructureNV" ) );
+        vkDestroyAccelerationStructureNV = PFN_vkDestroyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkDestroyAccelerationStructureNV" ) );
+        vkGetAccelerationStructureMemoryRequirementsNV =
+          PFN_vkGetAccelerationStructureMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureMemoryRequirementsNV" ) );
+        vkBindAccelerationStructureMemoryNV = PFN_vkBindAccelerationStructureMemoryNV( vkGetDeviceProcAddr( device, "vkBindAccelerationStructureMemoryNV" ) );
+        vkCmdBuildAccelerationStructureNV   = PFN_vkCmdBuildAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdBuildAccelerationStructureNV" ) );
+        vkCmdCopyAccelerationStructureNV    = PFN_vkCmdCopyAccelerationStructureNV( vkGetDeviceProcAddr( device, "vkCmdCopyAccelerationStructureNV" ) );
+        vkCmdTraceRaysNV                    = PFN_vkCmdTraceRaysNV( vkGetDeviceProcAddr( device, "vkCmdTraceRaysNV" ) );
+        vkCreateRayTracingPipelinesNV       = PFN_vkCreateRayTracingPipelinesNV( vkGetDeviceProcAddr( device, "vkCreateRayTracingPipelinesNV" ) );
+        vkGetRayTracingShaderGroupHandlesNV = PFN_vkGetRayTracingShaderGroupHandlesNV( vkGetDeviceProcAddr( device, "vkGetRayTracingShaderGroupHandlesNV" ) );
+        if ( !vkGetRayTracingShaderGroupHandlesKHR )
+          vkGetRayTracingShaderGroupHandlesKHR = vkGetRayTracingShaderGroupHandlesNV;
+        vkGetAccelerationStructureHandleNV = PFN_vkGetAccelerationStructureHandleNV( vkGetDeviceProcAddr( device, "vkGetAccelerationStructureHandleNV" ) );
+        vkCmdWriteAccelerationStructuresPropertiesNV =
+          PFN_vkCmdWriteAccelerationStructuresPropertiesNV( vkGetDeviceProcAddr( device, "vkCmdWriteAccelerationStructuresPropertiesNV" ) );
+        vkCompileDeferredNV = PFN_vkCompileDeferredNV( vkGetDeviceProcAddr( device, "vkCompileDeferredNV" ) );
 
         //=== VK_KHR_maintenance3 ===
-        PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR = 0;
+        vkGetDescriptorSetLayoutSupportKHR = PFN_vkGetDescriptorSetLayoutSupportKHR( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSupportKHR" ) );
+        if ( !vkGetDescriptorSetLayoutSupport )
+          vkGetDescriptorSetLayoutSupport = vkGetDescriptorSetLayoutSupportKHR;
 
         //=== VK_KHR_draw_indirect_count ===
-        PFN_vkCmdDrawIndirectCountKHR        vkCmdDrawIndirectCountKHR        = 0;
-        PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR = 0;
+        vkCmdDrawIndirectCountKHR = PFN_vkCmdDrawIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndirectCountKHR" ) );
+        if ( !vkCmdDrawIndirectCount )
+          vkCmdDrawIndirectCount = vkCmdDrawIndirectCountKHR;
+        vkCmdDrawIndexedIndirectCountKHR = PFN_vkCmdDrawIndexedIndirectCountKHR( vkGetDeviceProcAddr( device, "vkCmdDrawIndexedIndirectCountKHR" ) );
+        if ( !vkCmdDrawIndexedIndirectCount )
+          vkCmdDrawIndexedIndirectCount = vkCmdDrawIndexedIndirectCountKHR;
 
         //=== VK_EXT_external_memory_host ===
-        PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT = 0;
+        vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetMemoryHostPointerPropertiesEXT" ) );
 
         //=== VK_AMD_buffer_marker ===
-        PFN_vkCmdWriteBufferMarkerAMD  vkCmdWriteBufferMarkerAMD  = 0;
-        PFN_vkCmdWriteBufferMarker2AMD vkCmdWriteBufferMarker2AMD = 0;
+        vkCmdWriteBufferMarkerAMD = PFN_vkCmdWriteBufferMarkerAMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarkerAMD" ) );
 
         //=== VK_EXT_calibrated_timestamps ===
-        PFN_vkGetCalibratedTimestampsEXT vkGetCalibratedTimestampsEXT = 0;
+        vkGetCalibratedTimestampsEXT = PFN_vkGetCalibratedTimestampsEXT( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsEXT" ) );
+        if ( !vkGetCalibratedTimestampsKHR )
+          vkGetCalibratedTimestampsKHR = vkGetCalibratedTimestampsEXT;
 
         //=== VK_NV_mesh_shader ===
-        PFN_vkCmdDrawMeshTasksNV              vkCmdDrawMeshTasksNV              = 0;
-        PFN_vkCmdDrawMeshTasksIndirectNV      vkCmdDrawMeshTasksIndirectNV      = 0;
-        PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV = 0;
+        vkCmdDrawMeshTasksNV              = PFN_vkCmdDrawMeshTasksNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksNV" ) );
+        vkCmdDrawMeshTasksIndirectNV      = PFN_vkCmdDrawMeshTasksIndirectNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectNV" ) );
+        vkCmdDrawMeshTasksIndirectCountNV = PFN_vkCmdDrawMeshTasksIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountNV" ) );
 
         //=== VK_NV_scissor_exclusive ===
-        PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV = 0;
-        PFN_vkCmdSetExclusiveScissorNV       vkCmdSetExclusiveScissorNV       = 0;
+        vkCmdSetExclusiveScissorEnableNV = PFN_vkCmdSetExclusiveScissorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorEnableNV" ) );
+        vkCmdSetExclusiveScissorNV       = PFN_vkCmdSetExclusiveScissorNV( vkGetDeviceProcAddr( device, "vkCmdSetExclusiveScissorNV" ) );
 
         //=== VK_NV_device_diagnostic_checkpoints ===
-        PFN_vkCmdSetCheckpointNV        vkCmdSetCheckpointNV        = 0;
-        PFN_vkGetQueueCheckpointDataNV  vkGetQueueCheckpointDataNV  = 0;
-        PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV = 0;
+        vkCmdSetCheckpointNV       = PFN_vkCmdSetCheckpointNV( vkGetDeviceProcAddr( device, "vkCmdSetCheckpointNV" ) );
+        vkGetQueueCheckpointDataNV = PFN_vkGetQueueCheckpointDataNV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointDataNV" ) );
 
         //=== VK_KHR_timeline_semaphore ===
-        PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR = 0;
-        PFN_vkWaitSemaphoresKHR           vkWaitSemaphoresKHR           = 0;
-        PFN_vkSignalSemaphoreKHR          vkSignalSemaphoreKHR          = 0;
-
-        //=== VK_EXT_present_timing ===
-        PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT = 0;
-        PFN_vkGetSwapchainTimingPropertiesEXT       vkGetSwapchainTimingPropertiesEXT       = 0;
-        PFN_vkGetSwapchainTimeDomainPropertiesEXT   vkGetSwapchainTimeDomainPropertiesEXT   = 0;
-        PFN_vkGetPastPresentationTimingEXT          vkGetPastPresentationTimingEXT          = 0;
+        vkGetSemaphoreCounterValueKHR = PFN_vkGetSemaphoreCounterValueKHR( vkGetDeviceProcAddr( device, "vkGetSemaphoreCounterValueKHR" ) );
+        if ( !vkGetSemaphoreCounterValue )
+          vkGetSemaphoreCounterValue = vkGetSemaphoreCounterValueKHR;
+        vkWaitSemaphoresKHR = PFN_vkWaitSemaphoresKHR( vkGetDeviceProcAddr( device, "vkWaitSemaphoresKHR" ) );
+        if ( !vkWaitSemaphores )
+          vkWaitSemaphores = vkWaitSemaphoresKHR;
+        vkSignalSemaphoreKHR = PFN_vkSignalSemaphoreKHR( vkGetDeviceProcAddr( device, "vkSignalSemaphoreKHR" ) );
+        if ( !vkSignalSemaphore )
+          vkSignalSemaphore = vkSignalSemaphoreKHR;
 
         //=== VK_INTEL_performance_query ===
-        PFN_vkInitializePerformanceApiINTEL         vkInitializePerformanceApiINTEL         = 0;
-        PFN_vkUninitializePerformanceApiINTEL       vkUninitializePerformanceApiINTEL       = 0;
-        PFN_vkCmdSetPerformanceMarkerINTEL          vkCmdSetPerformanceMarkerINTEL          = 0;
-        PFN_vkCmdSetPerformanceStreamMarkerINTEL    vkCmdSetPerformanceStreamMarkerINTEL    = 0;
-        PFN_vkCmdSetPerformanceOverrideINTEL        vkCmdSetPerformanceOverrideINTEL        = 0;
-        PFN_vkAcquirePerformanceConfigurationINTEL  vkAcquirePerformanceConfigurationINTEL  = 0;
-        PFN_vkReleasePerformanceConfigurationINTEL  vkReleasePerformanceConfigurationINTEL  = 0;
-        PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL = 0;
-        PFN_vkGetPerformanceParameterINTEL          vkGetPerformanceParameterINTEL          = 0;
+        vkInitializePerformanceApiINTEL   = PFN_vkInitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkInitializePerformanceApiINTEL" ) );
+        vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkUninitializePerformanceApiINTEL" ) );
+        vkCmdSetPerformanceMarkerINTEL    = PFN_vkCmdSetPerformanceMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceMarkerINTEL" ) );
+        vkCmdSetPerformanceStreamMarkerINTEL =
+          PFN_vkCmdSetPerformanceStreamMarkerINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceStreamMarkerINTEL" ) );
+        vkCmdSetPerformanceOverrideINTEL = PFN_vkCmdSetPerformanceOverrideINTEL( vkGetDeviceProcAddr( device, "vkCmdSetPerformanceOverrideINTEL" ) );
+        vkAcquirePerformanceConfigurationINTEL =
+          PFN_vkAcquirePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkAcquirePerformanceConfigurationINTEL" ) );
+        vkReleasePerformanceConfigurationINTEL =
+          PFN_vkReleasePerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkReleasePerformanceConfigurationINTEL" ) );
+        vkQueueSetPerformanceConfigurationINTEL =
+          PFN_vkQueueSetPerformanceConfigurationINTEL( vkGetDeviceProcAddr( device, "vkQueueSetPerformanceConfigurationINTEL" ) );
+        vkGetPerformanceParameterINTEL = PFN_vkGetPerformanceParameterINTEL( vkGetDeviceProcAddr( device, "vkGetPerformanceParameterINTEL" ) );
 
         //=== VK_AMD_display_native_hdr ===
-        PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD = 0;
+        vkSetLocalDimmingAMD = PFN_vkSetLocalDimmingAMD( vkGetDeviceProcAddr( device, "vkSetLocalDimmingAMD" ) );
 
         //=== VK_KHR_fragment_shading_rate ===
-        PFN_vkCmdSetFragmentShadingRateKHR vkCmdSetFragmentShadingRateKHR = 0;
+        vkCmdSetFragmentShadingRateKHR = PFN_vkCmdSetFragmentShadingRateKHR( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateKHR" ) );
 
         //=== VK_KHR_dynamic_rendering_local_read ===
-        PFN_vkCmdSetRenderingAttachmentLocationsKHR    vkCmdSetRenderingAttachmentLocationsKHR    = 0;
-        PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR = 0;
+        vkCmdSetRenderingAttachmentLocationsKHR =
+          PFN_vkCmdSetRenderingAttachmentLocationsKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingAttachmentLocationsKHR" ) );
+        vkCmdSetRenderingInputAttachmentIndicesKHR =
+          PFN_vkCmdSetRenderingInputAttachmentIndicesKHR( vkGetDeviceProcAddr( device, "vkCmdSetRenderingInputAttachmentIndicesKHR" ) );
 
         //=== VK_EXT_buffer_device_address ===
-        PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT = 0;
+        vkGetBufferDeviceAddressEXT = PFN_vkGetBufferDeviceAddressEXT( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressEXT" ) );
+        if ( !vkGetBufferDeviceAddress )
+          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressEXT;
 
         //=== VK_KHR_present_wait ===
-        PFN_vkWaitForPresentKHR vkWaitForPresentKHR = 0;
+        vkWaitForPresentKHR = PFN_vkWaitForPresentKHR( vkGetDeviceProcAddr( device, "vkWaitForPresentKHR" ) );
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
         //=== VK_EXT_full_screen_exclusive ===
-        PFN_vkAcquireFullScreenExclusiveModeEXT     vkAcquireFullScreenExclusiveModeEXT     = 0;
-        PFN_vkReleaseFullScreenExclusiveModeEXT     vkReleaseFullScreenExclusiveModeEXT     = 0;
-        PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT = 0;
-#  else
-        PFN_dummy vkAcquireFullScreenExclusiveModeEXT_placeholder     = 0;
-        PFN_dummy vkReleaseFullScreenExclusiveModeEXT_placeholder     = 0;
-        PFN_dummy vkGetDeviceGroupSurfacePresentModes2EXT_placeholder = 0;
+        vkAcquireFullScreenExclusiveModeEXT = PFN_vkAcquireFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkAcquireFullScreenExclusiveModeEXT" ) );
+        vkReleaseFullScreenExclusiveModeEXT = PFN_vkReleaseFullScreenExclusiveModeEXT( vkGetDeviceProcAddr( device, "vkReleaseFullScreenExclusiveModeEXT" ) );
+        vkGetDeviceGroupSurfacePresentModes2EXT =
+          PFN_vkGetDeviceGroupSurfacePresentModes2EXT( vkGetDeviceProcAddr( device, "vkGetDeviceGroupSurfacePresentModes2EXT" ) );
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
         //=== VK_KHR_buffer_device_address ===
-        PFN_vkGetBufferDeviceAddressKHR              vkGetBufferDeviceAddressKHR              = 0;
-        PFN_vkGetBufferOpaqueCaptureAddressKHR       vkGetBufferOpaqueCaptureAddressKHR       = 0;
-        PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR = 0;
+        vkGetBufferDeviceAddressKHR = PFN_vkGetBufferDeviceAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferDeviceAddressKHR" ) );
+        if ( !vkGetBufferDeviceAddress )
+          vkGetBufferDeviceAddress = vkGetBufferDeviceAddressKHR;
+        vkGetBufferOpaqueCaptureAddressKHR = PFN_vkGetBufferOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureAddressKHR" ) );
+        if ( !vkGetBufferOpaqueCaptureAddress )
+          vkGetBufferOpaqueCaptureAddress = vkGetBufferOpaqueCaptureAddressKHR;
+        vkGetDeviceMemoryOpaqueCaptureAddressKHR =
+          PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR( vkGetDeviceProcAddr( device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR" ) );
+        if ( !vkGetDeviceMemoryOpaqueCaptureAddress )
+          vkGetDeviceMemoryOpaqueCaptureAddress = vkGetDeviceMemoryOpaqueCaptureAddressKHR;
 
         //=== VK_EXT_line_rasterization ===
-        PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT = 0;
+        vkCmdSetLineStippleEXT = PFN_vkCmdSetLineStippleEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEXT" ) );
+        if ( !vkCmdSetLineStippleKHR )
+          vkCmdSetLineStippleKHR = vkCmdSetLineStippleEXT;
 
         //=== VK_EXT_host_query_reset ===
-        PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT = 0;
+        vkResetQueryPoolEXT = PFN_vkResetQueryPoolEXT( vkGetDeviceProcAddr( device, "vkResetQueryPoolEXT" ) );
+        if ( !vkResetQueryPool )
+          vkResetQueryPool = vkResetQueryPoolEXT;
 
         //=== VK_EXT_extended_dynamic_state ===
-        PFN_vkCmdSetCullModeEXT              vkCmdSetCullModeEXT              = 0;
-        PFN_vkCmdSetFrontFaceEXT             vkCmdSetFrontFaceEXT             = 0;
-        PFN_vkCmdSetPrimitiveTopologyEXT     vkCmdSetPrimitiveTopologyEXT     = 0;
-        PFN_vkCmdSetViewportWithCountEXT     vkCmdSetViewportWithCountEXT     = 0;
-        PFN_vkCmdSetScissorWithCountEXT      vkCmdSetScissorWithCountEXT      = 0;
-        PFN_vkCmdBindVertexBuffers2EXT       vkCmdBindVertexBuffers2EXT       = 0;
-        PFN_vkCmdSetDepthTestEnableEXT       vkCmdSetDepthTestEnableEXT       = 0;
-        PFN_vkCmdSetDepthWriteEnableEXT      vkCmdSetDepthWriteEnableEXT      = 0;
-        PFN_vkCmdSetDepthCompareOpEXT        vkCmdSetDepthCompareOpEXT        = 0;
-        PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT = 0;
-        PFN_vkCmdSetStencilTestEnableEXT     vkCmdSetStencilTestEnableEXT     = 0;
-        PFN_vkCmdSetStencilOpEXT             vkCmdSetStencilOpEXT             = 0;
+        vkCmdSetCullModeEXT = PFN_vkCmdSetCullModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetCullModeEXT" ) );
+        if ( !vkCmdSetCullMode )
+          vkCmdSetCullMode = vkCmdSetCullModeEXT;
+        vkCmdSetFrontFaceEXT = PFN_vkCmdSetFrontFaceEXT( vkGetDeviceProcAddr( device, "vkCmdSetFrontFaceEXT" ) );
+        if ( !vkCmdSetFrontFace )
+          vkCmdSetFrontFace = vkCmdSetFrontFaceEXT;
+        vkCmdSetPrimitiveTopologyEXT = PFN_vkCmdSetPrimitiveTopologyEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveTopologyEXT" ) );
+        if ( !vkCmdSetPrimitiveTopology )
+          vkCmdSetPrimitiveTopology = vkCmdSetPrimitiveTopologyEXT;
+        vkCmdSetViewportWithCountEXT = PFN_vkCmdSetViewportWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetViewportWithCountEXT" ) );
+        if ( !vkCmdSetViewportWithCount )
+          vkCmdSetViewportWithCount = vkCmdSetViewportWithCountEXT;
+        vkCmdSetScissorWithCountEXT = PFN_vkCmdSetScissorWithCountEXT( vkGetDeviceProcAddr( device, "vkCmdSetScissorWithCountEXT" ) );
+        if ( !vkCmdSetScissorWithCount )
+          vkCmdSetScissorWithCount = vkCmdSetScissorWithCountEXT;
+        vkCmdBindVertexBuffers2EXT = PFN_vkCmdBindVertexBuffers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindVertexBuffers2EXT" ) );
+        if ( !vkCmdBindVertexBuffers2 )
+          vkCmdBindVertexBuffers2 = vkCmdBindVertexBuffers2EXT;
+        vkCmdSetDepthTestEnableEXT = PFN_vkCmdSetDepthTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthTestEnableEXT" ) );
+        if ( !vkCmdSetDepthTestEnable )
+          vkCmdSetDepthTestEnable = vkCmdSetDepthTestEnableEXT;
+        vkCmdSetDepthWriteEnableEXT = PFN_vkCmdSetDepthWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthWriteEnableEXT" ) );
+        if ( !vkCmdSetDepthWriteEnable )
+          vkCmdSetDepthWriteEnable = vkCmdSetDepthWriteEnableEXT;
+        vkCmdSetDepthCompareOpEXT = PFN_vkCmdSetDepthCompareOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthCompareOpEXT" ) );
+        if ( !vkCmdSetDepthCompareOp )
+          vkCmdSetDepthCompareOp = vkCmdSetDepthCompareOpEXT;
+        vkCmdSetDepthBoundsTestEnableEXT = PFN_vkCmdSetDepthBoundsTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBoundsTestEnableEXT" ) );
+        if ( !vkCmdSetDepthBoundsTestEnable )
+          vkCmdSetDepthBoundsTestEnable = vkCmdSetDepthBoundsTestEnableEXT;
+        vkCmdSetStencilTestEnableEXT = PFN_vkCmdSetStencilTestEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilTestEnableEXT" ) );
+        if ( !vkCmdSetStencilTestEnable )
+          vkCmdSetStencilTestEnable = vkCmdSetStencilTestEnableEXT;
+        vkCmdSetStencilOpEXT = PFN_vkCmdSetStencilOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetStencilOpEXT" ) );
+        if ( !vkCmdSetStencilOp )
+          vkCmdSetStencilOp = vkCmdSetStencilOpEXT;
 
         //=== VK_KHR_deferred_host_operations ===
-        PFN_vkCreateDeferredOperationKHR            vkCreateDeferredOperationKHR            = 0;
-        PFN_vkDestroyDeferredOperationKHR           vkDestroyDeferredOperationKHR           = 0;
-        PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR = 0;
-        PFN_vkGetDeferredOperationResultKHR         vkGetDeferredOperationResultKHR         = 0;
-        PFN_vkDeferredOperationJoinKHR              vkDeferredOperationJoinKHR              = 0;
+        vkCreateDeferredOperationKHR  = PFN_vkCreateDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkCreateDeferredOperationKHR" ) );
+        vkDestroyDeferredOperationKHR = PFN_vkDestroyDeferredOperationKHR( vkGetDeviceProcAddr( device, "vkDestroyDeferredOperationKHR" ) );
+        vkGetDeferredOperationMaxConcurrencyKHR =
+          PFN_vkGetDeferredOperationMaxConcurrencyKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationMaxConcurrencyKHR" ) );
+        vkGetDeferredOperationResultKHR = PFN_vkGetDeferredOperationResultKHR( vkGetDeviceProcAddr( device, "vkGetDeferredOperationResultKHR" ) );
+        vkDeferredOperationJoinKHR      = PFN_vkDeferredOperationJoinKHR( vkGetDeviceProcAddr( device, "vkDeferredOperationJoinKHR" ) );
 
         //=== VK_KHR_pipeline_executable_properties ===
-        PFN_vkGetPipelineExecutablePropertiesKHR              vkGetPipelineExecutablePropertiesKHR              = 0;
-        PFN_vkGetPipelineExecutableStatisticsKHR              vkGetPipelineExecutableStatisticsKHR              = 0;
-        PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR = 0;
+        vkGetPipelineExecutablePropertiesKHR =
+          PFN_vkGetPipelineExecutablePropertiesKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutablePropertiesKHR" ) );
+        vkGetPipelineExecutableStatisticsKHR =
+          PFN_vkGetPipelineExecutableStatisticsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableStatisticsKHR" ) );
+        vkGetPipelineExecutableInternalRepresentationsKHR =
+          PFN_vkGetPipelineExecutableInternalRepresentationsKHR( vkGetDeviceProcAddr( device, "vkGetPipelineExecutableInternalRepresentationsKHR" ) );
 
         //=== VK_EXT_host_image_copy ===
-        PFN_vkCopyMemoryToImageEXT          vkCopyMemoryToImageEXT          = 0;
-        PFN_vkCopyImageToMemoryEXT          vkCopyImageToMemoryEXT          = 0;
-        PFN_vkCopyImageToImageEXT           vkCopyImageToImageEXT           = 0;
-        PFN_vkTransitionImageLayoutEXT      vkTransitionImageLayoutEXT      = 0;
-        PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT = 0;
+        vkCopyMemoryToImageEXT          = PFN_vkCopyMemoryToImageEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToImageEXT" ) );
+        vkCopyImageToMemoryEXT          = PFN_vkCopyImageToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyImageToMemoryEXT" ) );
+        vkCopyImageToImageEXT           = PFN_vkCopyImageToImageEXT( vkGetDeviceProcAddr( device, "vkCopyImageToImageEXT" ) );
+        vkTransitionImageLayoutEXT      = PFN_vkTransitionImageLayoutEXT( vkGetDeviceProcAddr( device, "vkTransitionImageLayoutEXT" ) );
+        vkGetImageSubresourceLayout2EXT = PFN_vkGetImageSubresourceLayout2EXT( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2EXT" ) );
+        if ( !vkGetImageSubresourceLayout2KHR )
+          vkGetImageSubresourceLayout2KHR = vkGetImageSubresourceLayout2EXT;
 
         //=== VK_KHR_map_memory2 ===
-        PFN_vkMapMemory2KHR   vkMapMemory2KHR   = 0;
-        PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR = 0;
+        vkMapMemory2KHR   = PFN_vkMapMemory2KHR( vkGetDeviceProcAddr( device, "vkMapMemory2KHR" ) );
+        vkUnmapMemory2KHR = PFN_vkUnmapMemory2KHR( vkGetDeviceProcAddr( device, "vkUnmapMemory2KHR" ) );
 
         //=== VK_EXT_swapchain_maintenance1 ===
-        PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT = 0;
+        vkReleaseSwapchainImagesEXT = PFN_vkReleaseSwapchainImagesEXT( vkGetDeviceProcAddr( device, "vkReleaseSwapchainImagesEXT" ) );
 
         //=== VK_NV_device_generated_commands ===
-        PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV = 0;
-        PFN_vkCmdPreprocessGeneratedCommandsNV         vkCmdPreprocessGeneratedCommandsNV         = 0;
-        PFN_vkCmdExecuteGeneratedCommandsNV            vkCmdExecuteGeneratedCommandsNV            = 0;
-        PFN_vkCmdBindPipelineShaderGroupNV             vkCmdBindPipelineShaderGroupNV             = 0;
-        PFN_vkCreateIndirectCommandsLayoutNV           vkCreateIndirectCommandsLayoutNV           = 0;
-        PFN_vkDestroyIndirectCommandsLayoutNV          vkDestroyIndirectCommandsLayoutNV          = 0;
+        vkGetGeneratedCommandsMemoryRequirementsNV =
+          PFN_vkGetGeneratedCommandsMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetGeneratedCommandsMemoryRequirementsNV" ) );
+        vkCmdPreprocessGeneratedCommandsNV = PFN_vkCmdPreprocessGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdPreprocessGeneratedCommandsNV" ) );
+        vkCmdExecuteGeneratedCommandsNV    = PFN_vkCmdExecuteGeneratedCommandsNV( vkGetDeviceProcAddr( device, "vkCmdExecuteGeneratedCommandsNV" ) );
+        vkCmdBindPipelineShaderGroupNV     = PFN_vkCmdBindPipelineShaderGroupNV( vkGetDeviceProcAddr( device, "vkCmdBindPipelineShaderGroupNV" ) );
+        vkCreateIndirectCommandsLayoutNV   = PFN_vkCreateIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkCreateIndirectCommandsLayoutNV" ) );
+        vkDestroyIndirectCommandsLayoutNV  = PFN_vkDestroyIndirectCommandsLayoutNV( vkGetDeviceProcAddr( device, "vkDestroyIndirectCommandsLayoutNV" ) );
 
         //=== VK_EXT_depth_bias_control ===
-        PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT = 0;
+        vkCmdSetDepthBias2EXT = PFN_vkCmdSetDepthBias2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBias2EXT" ) );
 
         //=== VK_EXT_private_data ===
-        PFN_vkCreatePrivateDataSlotEXT  vkCreatePrivateDataSlotEXT  = 0;
-        PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT = 0;
-        PFN_vkSetPrivateDataEXT         vkSetPrivateDataEXT         = 0;
-        PFN_vkGetPrivateDataEXT         vkGetPrivateDataEXT         = 0;
+        vkCreatePrivateDataSlotEXT = PFN_vkCreatePrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkCreatePrivateDataSlotEXT" ) );
+        if ( !vkCreatePrivateDataSlot )
+          vkCreatePrivateDataSlot = vkCreatePrivateDataSlotEXT;
+        vkDestroyPrivateDataSlotEXT = PFN_vkDestroyPrivateDataSlotEXT( vkGetDeviceProcAddr( device, "vkDestroyPrivateDataSlotEXT" ) );
+        if ( !vkDestroyPrivateDataSlot )
+          vkDestroyPrivateDataSlot = vkDestroyPrivateDataSlotEXT;
+        vkSetPrivateDataEXT = PFN_vkSetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkSetPrivateDataEXT" ) );
+        if ( !vkSetPrivateData )
+          vkSetPrivateData = vkSetPrivateDataEXT;
+        vkGetPrivateDataEXT = PFN_vkGetPrivateDataEXT( vkGetDeviceProcAddr( device, "vkGetPrivateDataEXT" ) );
+        if ( !vkGetPrivateData )
+          vkGetPrivateData = vkGetPrivateDataEXT;
 
         //=== VK_KHR_video_encode_queue ===
-        PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR = 0;
-        PFN_vkCmdEncodeVideoKHR                   vkCmdEncodeVideoKHR                   = 0;
+        vkGetEncodedVideoSessionParametersKHR =
+          PFN_vkGetEncodedVideoSessionParametersKHR( vkGetDeviceProcAddr( device, "vkGetEncodedVideoSessionParametersKHR" ) );
+        vkCmdEncodeVideoKHR = PFN_vkCmdEncodeVideoKHR( vkGetDeviceProcAddr( device, "vkCmdEncodeVideoKHR" ) );
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
         //=== VK_NV_cuda_kernel_launch ===
-        PFN_vkCreateCudaModuleNV    vkCreateCudaModuleNV    = 0;
-        PFN_vkGetCudaModuleCacheNV  vkGetCudaModuleCacheNV  = 0;
-        PFN_vkCreateCudaFunctionNV  vkCreateCudaFunctionNV  = 0;
-        PFN_vkDestroyCudaModuleNV   vkDestroyCudaModuleNV   = 0;
-        PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV = 0;
-        PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV = 0;
-#  else
-        PFN_dummy vkCreateCudaModuleNV_placeholder    = 0;
-        PFN_dummy vkGetCudaModuleCacheNV_placeholder  = 0;
-        PFN_dummy vkCreateCudaFunctionNV_placeholder  = 0;
-        PFN_dummy vkDestroyCudaModuleNV_placeholder   = 0;
-        PFN_dummy vkDestroyCudaFunctionNV_placeholder = 0;
-        PFN_dummy vkCmdCudaLaunchKernelNV_placeholder = 0;
+        vkCreateCudaModuleNV    = PFN_vkCreateCudaModuleNV( vkGetDeviceProcAddr( device, "vkCreateCudaModuleNV" ) );
+        vkGetCudaModuleCacheNV  = PFN_vkGetCudaModuleCacheNV( vkGetDeviceProcAddr( device, "vkGetCudaModuleCacheNV" ) );
+        vkCreateCudaFunctionNV  = PFN_vkCreateCudaFunctionNV( vkGetDeviceProcAddr( device, "vkCreateCudaFunctionNV" ) );
+        vkDestroyCudaModuleNV   = PFN_vkDestroyCudaModuleNV( vkGetDeviceProcAddr( device, "vkDestroyCudaModuleNV" ) );
+        vkDestroyCudaFunctionNV = PFN_vkDestroyCudaFunctionNV( vkGetDeviceProcAddr( device, "vkDestroyCudaFunctionNV" ) );
+        vkCmdCudaLaunchKernelNV = PFN_vkCmdCudaLaunchKernelNV( vkGetDeviceProcAddr( device, "vkCmdCudaLaunchKernelNV" ) );
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-        //=== VK_QCOM_tile_shading ===
-        PFN_vkCmdDispatchTileQCOM          vkCmdDispatchTileQCOM          = 0;
-        PFN_vkCmdBeginPerTileExecutionQCOM vkCmdBeginPerTileExecutionQCOM = 0;
-        PFN_vkCmdEndPerTileExecutionQCOM   vkCmdEndPerTileExecutionQCOM   = 0;
-
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
         //=== VK_EXT_metal_objects ===
-        PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT = 0;
-#  else
-        PFN_dummy vkExportMetalObjectsEXT_placeholder = 0;
+        vkExportMetalObjectsEXT = PFN_vkExportMetalObjectsEXT( vkGetDeviceProcAddr( device, "vkExportMetalObjectsEXT" ) );
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
         //=== VK_KHR_synchronization2 ===
-        PFN_vkCmdSetEvent2KHR        vkCmdSetEvent2KHR        = 0;
-        PFN_vkCmdResetEvent2KHR      vkCmdResetEvent2KHR      = 0;
-        PFN_vkCmdWaitEvents2KHR      vkCmdWaitEvents2KHR      = 0;
-        PFN_vkCmdPipelineBarrier2KHR vkCmdPipelineBarrier2KHR = 0;
-        PFN_vkCmdWriteTimestamp2KHR  vkCmdWriteTimestamp2KHR  = 0;
-        PFN_vkQueueSubmit2KHR        vkQueueSubmit2KHR        = 0;
+        vkCmdSetEvent2KHR = PFN_vkCmdSetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdSetEvent2KHR" ) );
+        if ( !vkCmdSetEvent2 )
+          vkCmdSetEvent2 = vkCmdSetEvent2KHR;
+        vkCmdResetEvent2KHR = PFN_vkCmdResetEvent2KHR( vkGetDeviceProcAddr( device, "vkCmdResetEvent2KHR" ) );
+        if ( !vkCmdResetEvent2 )
+          vkCmdResetEvent2 = vkCmdResetEvent2KHR;
+        vkCmdWaitEvents2KHR = PFN_vkCmdWaitEvents2KHR( vkGetDeviceProcAddr( device, "vkCmdWaitEvents2KHR" ) );
+        if ( !vkCmdWaitEvents2 )
+          vkCmdWaitEvents2 = vkCmdWaitEvents2KHR;
+        vkCmdPipelineBarrier2KHR = PFN_vkCmdPipelineBarrier2KHR( vkGetDeviceProcAddr( device, "vkCmdPipelineBarrier2KHR" ) );
+        if ( !vkCmdPipelineBarrier2 )
+          vkCmdPipelineBarrier2 = vkCmdPipelineBarrier2KHR;
+        vkCmdWriteTimestamp2KHR = PFN_vkCmdWriteTimestamp2KHR( vkGetDeviceProcAddr( device, "vkCmdWriteTimestamp2KHR" ) );
+        if ( !vkCmdWriteTimestamp2 )
+          vkCmdWriteTimestamp2 = vkCmdWriteTimestamp2KHR;
+        vkQueueSubmit2KHR = PFN_vkQueueSubmit2KHR( vkGetDeviceProcAddr( device, "vkQueueSubmit2KHR" ) );
+        if ( !vkQueueSubmit2 )
+          vkQueueSubmit2 = vkQueueSubmit2KHR;
+        vkCmdWriteBufferMarker2AMD  = PFN_vkCmdWriteBufferMarker2AMD( vkGetDeviceProcAddr( device, "vkCmdWriteBufferMarker2AMD" ) );
+        vkGetQueueCheckpointData2NV = PFN_vkGetQueueCheckpointData2NV( vkGetDeviceProcAddr( device, "vkGetQueueCheckpointData2NV" ) );
 
         //=== VK_EXT_descriptor_buffer ===
-        PFN_vkGetDescriptorSetLayoutSizeEXT                          vkGetDescriptorSetLayoutSizeEXT                          = 0;
-        PFN_vkGetDescriptorSetLayoutBindingOffsetEXT                 vkGetDescriptorSetLayoutBindingOffsetEXT                 = 0;
-        PFN_vkGetDescriptorEXT                                       vkGetDescriptorEXT                                       = 0;
-        PFN_vkCmdBindDescriptorBuffersEXT                            vkCmdBindDescriptorBuffersEXT                            = 0;
-        PFN_vkCmdSetDescriptorBufferOffsetsEXT                       vkCmdSetDescriptorBufferOffsetsEXT                       = 0;
-        PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT             vkCmdBindDescriptorBufferEmbeddedSamplersEXT             = 0;
-        PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT                vkGetBufferOpaqueCaptureDescriptorDataEXT                = 0;
-        PFN_vkGetImageOpaqueCaptureDescriptorDataEXT                 vkGetImageOpaqueCaptureDescriptorDataEXT                 = 0;
-        PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT             vkGetImageViewOpaqueCaptureDescriptorDataEXT             = 0;
-        PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT               vkGetSamplerOpaqueCaptureDescriptorDataEXT               = 0;
-        PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = 0;
+        vkGetDescriptorSetLayoutSizeEXT = PFN_vkGetDescriptorSetLayoutSizeEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutSizeEXT" ) );
+        vkGetDescriptorSetLayoutBindingOffsetEXT =
+          PFN_vkGetDescriptorSetLayoutBindingOffsetEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutBindingOffsetEXT" ) );
+        vkGetDescriptorEXT                 = PFN_vkGetDescriptorEXT( vkGetDeviceProcAddr( device, "vkGetDescriptorEXT" ) );
+        vkCmdBindDescriptorBuffersEXT      = PFN_vkCmdBindDescriptorBuffersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBuffersEXT" ) );
+        vkCmdSetDescriptorBufferOffsetsEXT = PFN_vkCmdSetDescriptorBufferOffsetsEXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsetsEXT" ) );
+        vkCmdBindDescriptorBufferEmbeddedSamplersEXT =
+          PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplersEXT" ) );
+        vkGetBufferOpaqueCaptureDescriptorDataEXT =
+          PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetBufferOpaqueCaptureDescriptorDataEXT" ) );
+        vkGetImageOpaqueCaptureDescriptorDataEXT =
+          PFN_vkGetImageOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageOpaqueCaptureDescriptorDataEXT" ) );
+        vkGetImageViewOpaqueCaptureDescriptorDataEXT =
+          PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetImageViewOpaqueCaptureDescriptorDataEXT" ) );
+        vkGetSamplerOpaqueCaptureDescriptorDataEXT =
+          PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT( vkGetDeviceProcAddr( device, "vkGetSamplerOpaqueCaptureDescriptorDataEXT" ) );
+        vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+          vkGetDeviceProcAddr( device, "vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT" ) );
 
         //=== VK_NV_fragment_shading_rate_enums ===
-        PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV = 0;
+        vkCmdSetFragmentShadingRateEnumNV = PFN_vkCmdSetFragmentShadingRateEnumNV( vkGetDeviceProcAddr( device, "vkCmdSetFragmentShadingRateEnumNV" ) );
 
         //=== VK_EXT_mesh_shader ===
-        PFN_vkCmdDrawMeshTasksEXT              vkCmdDrawMeshTasksEXT              = 0;
-        PFN_vkCmdDrawMeshTasksIndirectEXT      vkCmdDrawMeshTasksIndirectEXT      = 0;
-        PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT = 0;
+        vkCmdDrawMeshTasksEXT              = PFN_vkCmdDrawMeshTasksEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksEXT" ) );
+        vkCmdDrawMeshTasksIndirectEXT      = PFN_vkCmdDrawMeshTasksIndirectEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectEXT" ) );
+        vkCmdDrawMeshTasksIndirectCountEXT = PFN_vkCmdDrawMeshTasksIndirectCountEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMeshTasksIndirectCountEXT" ) );
 
         //=== VK_KHR_copy_commands2 ===
-        PFN_vkCmdCopyBuffer2KHR        vkCmdCopyBuffer2KHR        = 0;
-        PFN_vkCmdCopyImage2KHR         vkCmdCopyImage2KHR         = 0;
-        PFN_vkCmdCopyBufferToImage2KHR vkCmdCopyBufferToImage2KHR = 0;
-        PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR = 0;
-        PFN_vkCmdBlitImage2KHR         vkCmdBlitImage2KHR         = 0;
-        PFN_vkCmdResolveImage2KHR      vkCmdResolveImage2KHR      = 0;
+        vkCmdCopyBuffer2KHR = PFN_vkCmdCopyBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBuffer2KHR" ) );
+        if ( !vkCmdCopyBuffer2 )
+          vkCmdCopyBuffer2 = vkCmdCopyBuffer2KHR;
+        vkCmdCopyImage2KHR = PFN_vkCmdCopyImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImage2KHR" ) );
+        if ( !vkCmdCopyImage2 )
+          vkCmdCopyImage2 = vkCmdCopyImage2KHR;
+        vkCmdCopyBufferToImage2KHR = PFN_vkCmdCopyBufferToImage2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyBufferToImage2KHR" ) );
+        if ( !vkCmdCopyBufferToImage2 )
+          vkCmdCopyBufferToImage2 = vkCmdCopyBufferToImage2KHR;
+        vkCmdCopyImageToBuffer2KHR = PFN_vkCmdCopyImageToBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdCopyImageToBuffer2KHR" ) );
+        if ( !vkCmdCopyImageToBuffer2 )
+          vkCmdCopyImageToBuffer2 = vkCmdCopyImageToBuffer2KHR;
+        vkCmdBlitImage2KHR = PFN_vkCmdBlitImage2KHR( vkGetDeviceProcAddr( device, "vkCmdBlitImage2KHR" ) );
+        if ( !vkCmdBlitImage2 )
+          vkCmdBlitImage2 = vkCmdBlitImage2KHR;
+        vkCmdResolveImage2KHR = PFN_vkCmdResolveImage2KHR( vkGetDeviceProcAddr( device, "vkCmdResolveImage2KHR" ) );
+        if ( !vkCmdResolveImage2 )
+          vkCmdResolveImage2 = vkCmdResolveImage2KHR;
 
         //=== VK_EXT_device_fault ===
-        PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT = 0;
+        vkGetDeviceFaultInfoEXT = PFN_vkGetDeviceFaultInfoEXT( vkGetDeviceProcAddr( device, "vkGetDeviceFaultInfoEXT" ) );
 
         //=== VK_EXT_vertex_input_dynamic_state ===
-        PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT = 0;
+        vkCmdSetVertexInputEXT = PFN_vkCmdSetVertexInputEXT( vkGetDeviceProcAddr( device, "vkCmdSetVertexInputEXT" ) );
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
         //=== VK_FUCHSIA_external_memory ===
-        PFN_vkGetMemoryZirconHandleFUCHSIA           vkGetMemoryZirconHandleFUCHSIA           = 0;
-        PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePropertiesFUCHSIA = 0;
-#  else
-        PFN_dummy vkGetMemoryZirconHandleFUCHSIA_placeholder           = 0;
-        PFN_dummy vkGetMemoryZirconHandlePropertiesFUCHSIA_placeholder = 0;
+        vkGetMemoryZirconHandleFUCHSIA = PFN_vkGetMemoryZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandleFUCHSIA" ) );
+        vkGetMemoryZirconHandlePropertiesFUCHSIA =
+          PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetMemoryZirconHandlePropertiesFUCHSIA" ) );
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
         //=== VK_FUCHSIA_external_semaphore ===
-        PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA = 0;
-        PFN_vkGetSemaphoreZirconHandleFUCHSIA    vkGetSemaphoreZirconHandleFUCHSIA    = 0;
-#  else
-        PFN_dummy vkImportSemaphoreZirconHandleFUCHSIA_placeholder = 0;
-        PFN_dummy vkGetSemaphoreZirconHandleFUCHSIA_placeholder    = 0;
+        vkImportSemaphoreZirconHandleFUCHSIA =
+          PFN_vkImportSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkImportSemaphoreZirconHandleFUCHSIA" ) );
+        vkGetSemaphoreZirconHandleFUCHSIA = PFN_vkGetSemaphoreZirconHandleFUCHSIA( vkGetDeviceProcAddr( device, "vkGetSemaphoreZirconHandleFUCHSIA" ) );
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
         //=== VK_FUCHSIA_buffer_collection ===
-        PFN_vkCreateBufferCollectionFUCHSIA               vkCreateBufferCollectionFUCHSIA               = 0;
-        PFN_vkSetBufferCollectionImageConstraintsFUCHSIA  vkSetBufferCollectionImageConstraintsFUCHSIA  = 0;
-        PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA vkSetBufferCollectionBufferConstraintsFUCHSIA = 0;
-        PFN_vkDestroyBufferCollectionFUCHSIA              vkDestroyBufferCollectionFUCHSIA              = 0;
-        PFN_vkGetBufferCollectionPropertiesFUCHSIA        vkGetBufferCollectionPropertiesFUCHSIA        = 0;
-#  else
-        PFN_dummy vkCreateBufferCollectionFUCHSIA_placeholder               = 0;
-        PFN_dummy vkSetBufferCollectionImageConstraintsFUCHSIA_placeholder  = 0;
-        PFN_dummy vkSetBufferCollectionBufferConstraintsFUCHSIA_placeholder = 0;
-        PFN_dummy vkDestroyBufferCollectionFUCHSIA_placeholder              = 0;
-        PFN_dummy vkGetBufferCollectionPropertiesFUCHSIA_placeholder        = 0;
+        vkCreateBufferCollectionFUCHSIA = PFN_vkCreateBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkCreateBufferCollectionFUCHSIA" ) );
+        vkSetBufferCollectionImageConstraintsFUCHSIA =
+          PFN_vkSetBufferCollectionImageConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionImageConstraintsFUCHSIA" ) );
+        vkSetBufferCollectionBufferConstraintsFUCHSIA =
+          PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA( vkGetDeviceProcAddr( device, "vkSetBufferCollectionBufferConstraintsFUCHSIA" ) );
+        vkDestroyBufferCollectionFUCHSIA = PFN_vkDestroyBufferCollectionFUCHSIA( vkGetDeviceProcAddr( device, "vkDestroyBufferCollectionFUCHSIA" ) );
+        vkGetBufferCollectionPropertiesFUCHSIA =
+          PFN_vkGetBufferCollectionPropertiesFUCHSIA( vkGetDeviceProcAddr( device, "vkGetBufferCollectionPropertiesFUCHSIA" ) );
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
         //=== VK_HUAWEI_subpass_shading ===
-        PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = 0;
-        PFN_vkCmdSubpassShadingHUAWEI                       vkCmdSubpassShadingHUAWEI                       = 0;
+        vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI =
+          PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI( vkGetDeviceProcAddr( device, "vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI" ) );
+        vkCmdSubpassShadingHUAWEI = PFN_vkCmdSubpassShadingHUAWEI( vkGetDeviceProcAddr( device, "vkCmdSubpassShadingHUAWEI" ) );
 
         //=== VK_HUAWEI_invocation_mask ===
-        PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI = 0;
+        vkCmdBindInvocationMaskHUAWEI = PFN_vkCmdBindInvocationMaskHUAWEI( vkGetDeviceProcAddr( device, "vkCmdBindInvocationMaskHUAWEI" ) );
 
         //=== VK_NV_external_memory_rdma ===
-        PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV = 0;
+        vkGetMemoryRemoteAddressNV = PFN_vkGetMemoryRemoteAddressNV( vkGetDeviceProcAddr( device, "vkGetMemoryRemoteAddressNV" ) );
 
         //=== VK_EXT_pipeline_properties ===
-        PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT = 0;
+        vkGetPipelinePropertiesEXT = PFN_vkGetPipelinePropertiesEXT( vkGetDeviceProcAddr( device, "vkGetPipelinePropertiesEXT" ) );
 
         //=== VK_EXT_extended_dynamic_state2 ===
-        PFN_vkCmdSetPatchControlPointsEXT      vkCmdSetPatchControlPointsEXT      = 0;
-        PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT = 0;
-        PFN_vkCmdSetDepthBiasEnableEXT         vkCmdSetDepthBiasEnableEXT         = 0;
-        PFN_vkCmdSetLogicOpEXT                 vkCmdSetLogicOpEXT                 = 0;
-        PFN_vkCmdSetPrimitiveRestartEnableEXT  vkCmdSetPrimitiveRestartEnableEXT  = 0;
+        vkCmdSetPatchControlPointsEXT      = PFN_vkCmdSetPatchControlPointsEXT( vkGetDeviceProcAddr( device, "vkCmdSetPatchControlPointsEXT" ) );
+        vkCmdSetRasterizerDiscardEnableEXT = PFN_vkCmdSetRasterizerDiscardEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizerDiscardEnableEXT" ) );
+        if ( !vkCmdSetRasterizerDiscardEnable )
+          vkCmdSetRasterizerDiscardEnable = vkCmdSetRasterizerDiscardEnableEXT;
+        vkCmdSetDepthBiasEnableEXT = PFN_vkCmdSetDepthBiasEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthBiasEnableEXT" ) );
+        if ( !vkCmdSetDepthBiasEnable )
+          vkCmdSetDepthBiasEnable = vkCmdSetDepthBiasEnableEXT;
+        vkCmdSetLogicOpEXT                = PFN_vkCmdSetLogicOpEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEXT" ) );
+        vkCmdSetPrimitiveRestartEnableEXT = PFN_vkCmdSetPrimitiveRestartEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetPrimitiveRestartEnableEXT" ) );
+        if ( !vkCmdSetPrimitiveRestartEnable )
+          vkCmdSetPrimitiveRestartEnable = vkCmdSetPrimitiveRestartEnableEXT;
 
         //=== VK_EXT_color_write_enable ===
-        PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT = 0;
+        vkCmdSetColorWriteEnableEXT = PFN_vkCmdSetColorWriteEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteEnableEXT" ) );
 
         //=== VK_KHR_ray_tracing_maintenance1 ===
-        PFN_vkCmdTraceRaysIndirect2KHR vkCmdTraceRaysIndirect2KHR = 0;
+        vkCmdTraceRaysIndirect2KHR = PFN_vkCmdTraceRaysIndirect2KHR( vkGetDeviceProcAddr( device, "vkCmdTraceRaysIndirect2KHR" ) );
 
         //=== VK_EXT_multi_draw ===
-        PFN_vkCmdDrawMultiEXT        vkCmdDrawMultiEXT        = 0;
-        PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT = 0;
+        vkCmdDrawMultiEXT        = PFN_vkCmdDrawMultiEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiEXT" ) );
+        vkCmdDrawMultiIndexedEXT = PFN_vkCmdDrawMultiIndexedEXT( vkGetDeviceProcAddr( device, "vkCmdDrawMultiIndexedEXT" ) );
 
         //=== VK_EXT_opacity_micromap ===
-        PFN_vkCreateMicromapEXT                 vkCreateMicromapEXT                 = 0;
-        PFN_vkDestroyMicromapEXT                vkDestroyMicromapEXT                = 0;
-        PFN_vkCmdBuildMicromapsEXT              vkCmdBuildMicromapsEXT              = 0;
-        PFN_vkBuildMicromapsEXT                 vkBuildMicromapsEXT                 = 0;
-        PFN_vkCopyMicromapEXT                   vkCopyMicromapEXT                   = 0;
-        PFN_vkCopyMicromapToMemoryEXT           vkCopyMicromapToMemoryEXT           = 0;
-        PFN_vkCopyMemoryToMicromapEXT           vkCopyMemoryToMicromapEXT           = 0;
-        PFN_vkWriteMicromapsPropertiesEXT       vkWriteMicromapsPropertiesEXT       = 0;
-        PFN_vkCmdCopyMicromapEXT                vkCmdCopyMicromapEXT                = 0;
-        PFN_vkCmdCopyMicromapToMemoryEXT        vkCmdCopyMicromapToMemoryEXT        = 0;
-        PFN_vkCmdCopyMemoryToMicromapEXT        vkCmdCopyMemoryToMicromapEXT        = 0;
-        PFN_vkCmdWriteMicromapsPropertiesEXT    vkCmdWriteMicromapsPropertiesEXT    = 0;
-        PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT = 0;
-        PFN_vkGetMicromapBuildSizesEXT          vkGetMicromapBuildSizesEXT          = 0;
+        vkCreateMicromapEXT                 = PFN_vkCreateMicromapEXT( vkGetDeviceProcAddr( device, "vkCreateMicromapEXT" ) );
+        vkDestroyMicromapEXT                = PFN_vkDestroyMicromapEXT( vkGetDeviceProcAddr( device, "vkDestroyMicromapEXT" ) );
+        vkCmdBuildMicromapsEXT              = PFN_vkCmdBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkCmdBuildMicromapsEXT" ) );
+        vkBuildMicromapsEXT                 = PFN_vkBuildMicromapsEXT( vkGetDeviceProcAddr( device, "vkBuildMicromapsEXT" ) );
+        vkCopyMicromapEXT                   = PFN_vkCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapEXT" ) );
+        vkCopyMicromapToMemoryEXT           = PFN_vkCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCopyMicromapToMemoryEXT" ) );
+        vkCopyMemoryToMicromapEXT           = PFN_vkCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCopyMemoryToMicromapEXT" ) );
+        vkWriteMicromapsPropertiesEXT       = PFN_vkWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkWriteMicromapsPropertiesEXT" ) );
+        vkCmdCopyMicromapEXT                = PFN_vkCmdCopyMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapEXT" ) );
+        vkCmdCopyMicromapToMemoryEXT        = PFN_vkCmdCopyMicromapToMemoryEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMicromapToMemoryEXT" ) );
+        vkCmdCopyMemoryToMicromapEXT        = PFN_vkCmdCopyMemoryToMicromapEXT( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToMicromapEXT" ) );
+        vkCmdWriteMicromapsPropertiesEXT    = PFN_vkCmdWriteMicromapsPropertiesEXT( vkGetDeviceProcAddr( device, "vkCmdWriteMicromapsPropertiesEXT" ) );
+        vkGetDeviceMicromapCompatibilityEXT = PFN_vkGetDeviceMicromapCompatibilityEXT( vkGetDeviceProcAddr( device, "vkGetDeviceMicromapCompatibilityEXT" ) );
+        vkGetMicromapBuildSizesEXT          = PFN_vkGetMicromapBuildSizesEXT( vkGetDeviceProcAddr( device, "vkGetMicromapBuildSizesEXT" ) );
 
         //=== VK_HUAWEI_cluster_culling_shader ===
-        PFN_vkCmdDrawClusterHUAWEI         vkCmdDrawClusterHUAWEI         = 0;
-        PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI = 0;
+        vkCmdDrawClusterHUAWEI         = PFN_vkCmdDrawClusterHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterHUAWEI" ) );
+        vkCmdDrawClusterIndirectHUAWEI = PFN_vkCmdDrawClusterIndirectHUAWEI( vkGetDeviceProcAddr( device, "vkCmdDrawClusterIndirectHUAWEI" ) );
 
         //=== VK_EXT_pageable_device_local_memory ===
-        PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT = 0;
+        vkSetDeviceMemoryPriorityEXT = PFN_vkSetDeviceMemoryPriorityEXT( vkGetDeviceProcAddr( device, "vkSetDeviceMemoryPriorityEXT" ) );
 
         //=== VK_KHR_maintenance4 ===
-        PFN_vkGetDeviceBufferMemoryRequirementsKHR      vkGetDeviceBufferMemoryRequirementsKHR      = 0;
-        PFN_vkGetDeviceImageMemoryRequirementsKHR       vkGetDeviceImageMemoryRequirementsKHR       = 0;
-        PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR = 0;
+        vkGetDeviceBufferMemoryRequirementsKHR =
+          PFN_vkGetDeviceBufferMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceBufferMemoryRequirementsKHR" ) );
+        if ( !vkGetDeviceBufferMemoryRequirements )
+          vkGetDeviceBufferMemoryRequirements = vkGetDeviceBufferMemoryRequirementsKHR;
+        vkGetDeviceImageMemoryRequirementsKHR =
+          PFN_vkGetDeviceImageMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageMemoryRequirementsKHR" ) );
+        if ( !vkGetDeviceImageMemoryRequirements )
+          vkGetDeviceImageMemoryRequirements = vkGetDeviceImageMemoryRequirementsKHR;
+        vkGetDeviceImageSparseMemoryRequirementsKHR =
+          PFN_vkGetDeviceImageSparseMemoryRequirementsKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSparseMemoryRequirementsKHR" ) );
+        if ( !vkGetDeviceImageSparseMemoryRequirements )
+          vkGetDeviceImageSparseMemoryRequirements = vkGetDeviceImageSparseMemoryRequirementsKHR;
 
         //=== VK_VALVE_descriptor_set_host_mapping ===
-        PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE = 0;
-        PFN_vkGetDescriptorSetHostMappingVALVE           vkGetDescriptorSetHostMappingVALVE           = 0;
+        vkGetDescriptorSetLayoutHostMappingInfoVALVE =
+          PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE" ) );
+        vkGetDescriptorSetHostMappingVALVE = PFN_vkGetDescriptorSetHostMappingVALVE( vkGetDeviceProcAddr( device, "vkGetDescriptorSetHostMappingVALVE" ) );
 
         //=== VK_NV_copy_memory_indirect ===
-        PFN_vkCmdCopyMemoryIndirectNV        vkCmdCopyMemoryIndirectNV        = 0;
-        PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV = 0;
+        vkCmdCopyMemoryIndirectNV        = PFN_vkCmdCopyMemoryIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryIndirectNV" ) );
+        vkCmdCopyMemoryToImageIndirectNV = PFN_vkCmdCopyMemoryToImageIndirectNV( vkGetDeviceProcAddr( device, "vkCmdCopyMemoryToImageIndirectNV" ) );
 
         //=== VK_NV_memory_decompression ===
-        PFN_vkCmdDecompressMemoryNV              vkCmdDecompressMemoryNV              = 0;
-        PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV = 0;
+        vkCmdDecompressMemoryNV = PFN_vkCmdDecompressMemoryNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryNV" ) );
+        vkCmdDecompressMemoryIndirectCountNV =
+          PFN_vkCmdDecompressMemoryIndirectCountNV( vkGetDeviceProcAddr( device, "vkCmdDecompressMemoryIndirectCountNV" ) );
 
         //=== VK_NV_device_generated_commands_compute ===
-        PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0;
-        PFN_vkCmdUpdatePipelineIndirectBufferNV       vkCmdUpdatePipelineIndirectBufferNV       = 0;
-        PFN_vkGetPipelineIndirectDeviceAddressNV      vkGetPipelineIndirectDeviceAddressNV      = 0;
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_external_memory ===
-        PFN_vkGetNativeBufferPropertiesOHOS vkGetNativeBufferPropertiesOHOS = 0;
-        PFN_vkGetMemoryNativeBufferOHOS     vkGetMemoryNativeBufferOHOS     = 0;
-#  else
-        PFN_dummy vkGetNativeBufferPropertiesOHOS_placeholder = 0;
-        PFN_dummy vkGetMemoryNativeBufferOHOS_placeholder     = 0;
-#  endif /*VK_USE_PLATFORM_OHOS*/
+        vkGetPipelineIndirectMemoryRequirementsNV =
+          PFN_vkGetPipelineIndirectMemoryRequirementsNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectMemoryRequirementsNV" ) );
+        vkCmdUpdatePipelineIndirectBufferNV = PFN_vkCmdUpdatePipelineIndirectBufferNV( vkGetDeviceProcAddr( device, "vkCmdUpdatePipelineIndirectBufferNV" ) );
+        vkGetPipelineIndirectDeviceAddressNV =
+          PFN_vkGetPipelineIndirectDeviceAddressNV( vkGetDeviceProcAddr( device, "vkGetPipelineIndirectDeviceAddressNV" ) );
 
         //=== VK_EXT_extended_dynamic_state3 ===
-        PFN_vkCmdSetDepthClampEnableEXT                 vkCmdSetDepthClampEnableEXT                 = 0;
-        PFN_vkCmdSetPolygonModeEXT                      vkCmdSetPolygonModeEXT                      = 0;
-        PFN_vkCmdSetRasterizationSamplesEXT             vkCmdSetRasterizationSamplesEXT             = 0;
-        PFN_vkCmdSetSampleMaskEXT                       vkCmdSetSampleMaskEXT                       = 0;
-        PFN_vkCmdSetAlphaToCoverageEnableEXT            vkCmdSetAlphaToCoverageEnableEXT            = 0;
-        PFN_vkCmdSetAlphaToOneEnableEXT                 vkCmdSetAlphaToOneEnableEXT                 = 0;
-        PFN_vkCmdSetLogicOpEnableEXT                    vkCmdSetLogicOpEnableEXT                    = 0;
-        PFN_vkCmdSetColorBlendEnableEXT                 vkCmdSetColorBlendEnableEXT                 = 0;
-        PFN_vkCmdSetColorBlendEquationEXT               vkCmdSetColorBlendEquationEXT               = 0;
-        PFN_vkCmdSetColorWriteMaskEXT                   vkCmdSetColorWriteMaskEXT                   = 0;
-        PFN_vkCmdSetTessellationDomainOriginEXT         vkCmdSetTessellationDomainOriginEXT         = 0;
-        PFN_vkCmdSetRasterizationStreamEXT              vkCmdSetRasterizationStreamEXT              = 0;
-        PFN_vkCmdSetConservativeRasterizationModeEXT    vkCmdSetConservativeRasterizationModeEXT    = 0;
-        PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT vkCmdSetExtraPrimitiveOverestimationSizeEXT = 0;
-        PFN_vkCmdSetDepthClipEnableEXT                  vkCmdSetDepthClipEnableEXT                  = 0;
-        PFN_vkCmdSetSampleLocationsEnableEXT            vkCmdSetSampleLocationsEnableEXT            = 0;
-        PFN_vkCmdSetColorBlendAdvancedEXT               vkCmdSetColorBlendAdvancedEXT               = 0;
-        PFN_vkCmdSetProvokingVertexModeEXT              vkCmdSetProvokingVertexModeEXT              = 0;
-        PFN_vkCmdSetLineRasterizationModeEXT            vkCmdSetLineRasterizationModeEXT            = 0;
-        PFN_vkCmdSetLineStippleEnableEXT                vkCmdSetLineStippleEnableEXT                = 0;
-        PFN_vkCmdSetDepthClipNegativeOneToOneEXT        vkCmdSetDepthClipNegativeOneToOneEXT        = 0;
-        PFN_vkCmdSetViewportWScalingEnableNV            vkCmdSetViewportWScalingEnableNV            = 0;
-        PFN_vkCmdSetViewportSwizzleNV                   vkCmdSetViewportSwizzleNV                   = 0;
-        PFN_vkCmdSetCoverageToColorEnableNV             vkCmdSetCoverageToColorEnableNV             = 0;
-        PFN_vkCmdSetCoverageToColorLocationNV           vkCmdSetCoverageToColorLocationNV           = 0;
-        PFN_vkCmdSetCoverageModulationModeNV            vkCmdSetCoverageModulationModeNV            = 0;
-        PFN_vkCmdSetCoverageModulationTableEnableNV     vkCmdSetCoverageModulationTableEnableNV     = 0;
-        PFN_vkCmdSetCoverageModulationTableNV           vkCmdSetCoverageModulationTableNV           = 0;
-        PFN_vkCmdSetShadingRateImageEnableNV            vkCmdSetShadingRateImageEnableNV            = 0;
-        PFN_vkCmdSetRepresentativeFragmentTestEnableNV  vkCmdSetRepresentativeFragmentTestEnableNV  = 0;
-        PFN_vkCmdSetCoverageReductionModeNV             vkCmdSetCoverageReductionModeNV             = 0;
-
-        //=== VK_ARM_tensors ===
-        PFN_vkCreateTensorARM                             vkCreateTensorARM                             = 0;
-        PFN_vkDestroyTensorARM                            vkDestroyTensorARM                            = 0;
-        PFN_vkCreateTensorViewARM                         vkCreateTensorViewARM                         = 0;
-        PFN_vkDestroyTensorViewARM                        vkDestroyTensorViewARM                        = 0;
-        PFN_vkGetTensorMemoryRequirementsARM              vkGetTensorMemoryRequirementsARM              = 0;
-        PFN_vkBindTensorMemoryARM                         vkBindTensorMemoryARM                         = 0;
-        PFN_vkGetDeviceTensorMemoryRequirementsARM        vkGetDeviceTensorMemoryRequirementsARM        = 0;
-        PFN_vkCmdCopyTensorARM                            vkCmdCopyTensorARM                            = 0;
-        PFN_vkGetTensorOpaqueCaptureDescriptorDataARM     vkGetTensorOpaqueCaptureDescriptorDataARM     = 0;
-        PFN_vkGetTensorViewOpaqueCaptureDescriptorDataARM vkGetTensorViewOpaqueCaptureDescriptorDataARM = 0;
+        vkCmdSetDepthClampEnableEXT         = PFN_vkCmdSetDepthClampEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClampEnableEXT" ) );
+        vkCmdSetPolygonModeEXT              = PFN_vkCmdSetPolygonModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetPolygonModeEXT" ) );
+        vkCmdSetRasterizationSamplesEXT     = PFN_vkCmdSetRasterizationSamplesEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationSamplesEXT" ) );
+        vkCmdSetSampleMaskEXT               = PFN_vkCmdSetSampleMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleMaskEXT" ) );
+        vkCmdSetAlphaToCoverageEnableEXT    = PFN_vkCmdSetAlphaToCoverageEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToCoverageEnableEXT" ) );
+        vkCmdSetAlphaToOneEnableEXT         = PFN_vkCmdSetAlphaToOneEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAlphaToOneEnableEXT" ) );
+        vkCmdSetLogicOpEnableEXT            = PFN_vkCmdSetLogicOpEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLogicOpEnableEXT" ) );
+        vkCmdSetColorBlendEnableEXT         = PFN_vkCmdSetColorBlendEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEnableEXT" ) );
+        vkCmdSetColorBlendEquationEXT       = PFN_vkCmdSetColorBlendEquationEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendEquationEXT" ) );
+        vkCmdSetColorWriteMaskEXT           = PFN_vkCmdSetColorWriteMaskEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorWriteMaskEXT" ) );
+        vkCmdSetTessellationDomainOriginEXT = PFN_vkCmdSetTessellationDomainOriginEXT( vkGetDeviceProcAddr( device, "vkCmdSetTessellationDomainOriginEXT" ) );
+        vkCmdSetRasterizationStreamEXT      = PFN_vkCmdSetRasterizationStreamEXT( vkGetDeviceProcAddr( device, "vkCmdSetRasterizationStreamEXT" ) );
+        vkCmdSetConservativeRasterizationModeEXT =
+          PFN_vkCmdSetConservativeRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetConservativeRasterizationModeEXT" ) );
+        vkCmdSetExtraPrimitiveOverestimationSizeEXT =
+          PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT( vkGetDeviceProcAddr( device, "vkCmdSetExtraPrimitiveOverestimationSizeEXT" ) );
+        vkCmdSetDepthClipEnableEXT       = PFN_vkCmdSetDepthClipEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipEnableEXT" ) );
+        vkCmdSetSampleLocationsEnableEXT = PFN_vkCmdSetSampleLocationsEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetSampleLocationsEnableEXT" ) );
+        vkCmdSetColorBlendAdvancedEXT    = PFN_vkCmdSetColorBlendAdvancedEXT( vkGetDeviceProcAddr( device, "vkCmdSetColorBlendAdvancedEXT" ) );
+        vkCmdSetProvokingVertexModeEXT   = PFN_vkCmdSetProvokingVertexModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetProvokingVertexModeEXT" ) );
+        vkCmdSetLineRasterizationModeEXT = PFN_vkCmdSetLineRasterizationModeEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineRasterizationModeEXT" ) );
+        vkCmdSetLineStippleEnableEXT     = PFN_vkCmdSetLineStippleEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleEnableEXT" ) );
+        vkCmdSetDepthClipNegativeOneToOneEXT =
+          PFN_vkCmdSetDepthClipNegativeOneToOneEXT( vkGetDeviceProcAddr( device, "vkCmdSetDepthClipNegativeOneToOneEXT" ) );
+        vkCmdSetViewportWScalingEnableNV  = PFN_vkCmdSetViewportWScalingEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportWScalingEnableNV" ) );
+        vkCmdSetViewportSwizzleNV         = PFN_vkCmdSetViewportSwizzleNV( vkGetDeviceProcAddr( device, "vkCmdSetViewportSwizzleNV" ) );
+        vkCmdSetCoverageToColorEnableNV   = PFN_vkCmdSetCoverageToColorEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorEnableNV" ) );
+        vkCmdSetCoverageToColorLocationNV = PFN_vkCmdSetCoverageToColorLocationNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageToColorLocationNV" ) );
+        vkCmdSetCoverageModulationModeNV  = PFN_vkCmdSetCoverageModulationModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationModeNV" ) );
+        vkCmdSetCoverageModulationTableEnableNV =
+          PFN_vkCmdSetCoverageModulationTableEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableEnableNV" ) );
+        vkCmdSetCoverageModulationTableNV = PFN_vkCmdSetCoverageModulationTableNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageModulationTableNV" ) );
+        vkCmdSetShadingRateImageEnableNV  = PFN_vkCmdSetShadingRateImageEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetShadingRateImageEnableNV" ) );
+        vkCmdSetRepresentativeFragmentTestEnableNV =
+          PFN_vkCmdSetRepresentativeFragmentTestEnableNV( vkGetDeviceProcAddr( device, "vkCmdSetRepresentativeFragmentTestEnableNV" ) );
+        vkCmdSetCoverageReductionModeNV = PFN_vkCmdSetCoverageReductionModeNV( vkGetDeviceProcAddr( device, "vkCmdSetCoverageReductionModeNV" ) );
 
         //=== VK_EXT_shader_module_identifier ===
-        PFN_vkGetShaderModuleIdentifierEXT           vkGetShaderModuleIdentifierEXT           = 0;
-        PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT = 0;
+        vkGetShaderModuleIdentifierEXT = PFN_vkGetShaderModuleIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleIdentifierEXT" ) );
+        vkGetShaderModuleCreateInfoIdentifierEXT =
+          PFN_vkGetShaderModuleCreateInfoIdentifierEXT( vkGetDeviceProcAddr( device, "vkGetShaderModuleCreateInfoIdentifierEXT" ) );
 
         //=== VK_NV_optical_flow ===
-        PFN_vkCreateOpticalFlowSessionNV    vkCreateOpticalFlowSessionNV    = 0;
-        PFN_vkDestroyOpticalFlowSessionNV   vkDestroyOpticalFlowSessionNV   = 0;
-        PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV = 0;
-        PFN_vkCmdOpticalFlowExecuteNV       vkCmdOpticalFlowExecuteNV       = 0;
+        vkCreateOpticalFlowSessionNV    = PFN_vkCreateOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkCreateOpticalFlowSessionNV" ) );
+        vkDestroyOpticalFlowSessionNV   = PFN_vkDestroyOpticalFlowSessionNV( vkGetDeviceProcAddr( device, "vkDestroyOpticalFlowSessionNV" ) );
+        vkBindOpticalFlowSessionImageNV = PFN_vkBindOpticalFlowSessionImageNV( vkGetDeviceProcAddr( device, "vkBindOpticalFlowSessionImageNV" ) );
+        vkCmdOpticalFlowExecuteNV       = PFN_vkCmdOpticalFlowExecuteNV( vkGetDeviceProcAddr( device, "vkCmdOpticalFlowExecuteNV" ) );
 
         //=== VK_KHR_maintenance5 ===
-        PFN_vkCmdBindIndexBuffer2KHR             vkCmdBindIndexBuffer2KHR             = 0;
-        PFN_vkGetRenderingAreaGranularityKHR     vkGetRenderingAreaGranularityKHR     = 0;
-        PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR = 0;
-        PFN_vkGetImageSubresourceLayout2KHR      vkGetImageSubresourceLayout2KHR      = 0;
-
-        //=== VK_AMD_anti_lag ===
-        PFN_vkAntiLagUpdateAMD vkAntiLagUpdateAMD = 0;
-
-        //=== VK_KHR_present_wait2 ===
-        PFN_vkWaitForPresent2KHR vkWaitForPresent2KHR = 0;
+        vkCmdBindIndexBuffer2KHR         = PFN_vkCmdBindIndexBuffer2KHR( vkGetDeviceProcAddr( device, "vkCmdBindIndexBuffer2KHR" ) );
+        vkGetRenderingAreaGranularityKHR = PFN_vkGetRenderingAreaGranularityKHR( vkGetDeviceProcAddr( device, "vkGetRenderingAreaGranularityKHR" ) );
+        vkGetDeviceImageSubresourceLayoutKHR =
+          PFN_vkGetDeviceImageSubresourceLayoutKHR( vkGetDeviceProcAddr( device, "vkGetDeviceImageSubresourceLayoutKHR" ) );
+        vkGetImageSubresourceLayout2KHR = PFN_vkGetImageSubresourceLayout2KHR( vkGetDeviceProcAddr( device, "vkGetImageSubresourceLayout2KHR" ) );
 
         //=== VK_EXT_shader_object ===
-        PFN_vkCreateShadersEXT         vkCreateShadersEXT         = 0;
-        PFN_vkDestroyShaderEXT         vkDestroyShaderEXT         = 0;
-        PFN_vkGetShaderBinaryDataEXT   vkGetShaderBinaryDataEXT   = 0;
-        PFN_vkCmdBindShadersEXT        vkCmdBindShadersEXT        = 0;
-        PFN_vkCmdSetDepthClampRangeEXT vkCmdSetDepthClampRangeEXT = 0;
-
-        //=== VK_KHR_pipeline_binary ===
-        PFN_vkCreatePipelineBinariesKHR      vkCreatePipelineBinariesKHR      = 0;
-        PFN_vkDestroyPipelineBinaryKHR       vkDestroyPipelineBinaryKHR       = 0;
-        PFN_vkGetPipelineKeyKHR              vkGetPipelineKeyKHR              = 0;
-        PFN_vkGetPipelineBinaryDataKHR       vkGetPipelineBinaryDataKHR       = 0;
-        PFN_vkReleaseCapturedPipelineDataKHR vkReleaseCapturedPipelineDataKHR = 0;
+        vkCreateShadersEXT       = PFN_vkCreateShadersEXT( vkGetDeviceProcAddr( device, "vkCreateShadersEXT" ) );
+        vkDestroyShaderEXT       = PFN_vkDestroyShaderEXT( vkGetDeviceProcAddr( device, "vkDestroyShaderEXT" ) );
+        vkGetShaderBinaryDataEXT = PFN_vkGetShaderBinaryDataEXT( vkGetDeviceProcAddr( device, "vkGetShaderBinaryDataEXT" ) );
+        vkCmdBindShadersEXT      = PFN_vkCmdBindShadersEXT( vkGetDeviceProcAddr( device, "vkCmdBindShadersEXT" ) );
 
         //=== VK_QCOM_tile_properties ===
-        PFN_vkGetFramebufferTilePropertiesQCOM      vkGetFramebufferTilePropertiesQCOM      = 0;
-        PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM = 0;
-
-        //=== VK_KHR_swapchain_maintenance1 ===
-        PFN_vkReleaseSwapchainImagesKHR vkReleaseSwapchainImagesKHR = 0;
-
-        //=== VK_NV_cooperative_vector ===
-        PFN_vkConvertCooperativeVectorMatrixNV    vkConvertCooperativeVectorMatrixNV    = 0;
-        PFN_vkCmdConvertCooperativeVectorMatrixNV vkCmdConvertCooperativeVectorMatrixNV = 0;
+        vkGetFramebufferTilePropertiesQCOM = PFN_vkGetFramebufferTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetFramebufferTilePropertiesQCOM" ) );
+        vkGetDynamicRenderingTilePropertiesQCOM =
+          PFN_vkGetDynamicRenderingTilePropertiesQCOM( vkGetDeviceProcAddr( device, "vkGetDynamicRenderingTilePropertiesQCOM" ) );
 
         //=== VK_NV_low_latency2 ===
-        PFN_vkSetLatencySleepModeNV  vkSetLatencySleepModeNV  = 0;
-        PFN_vkLatencySleepNV         vkLatencySleepNV         = 0;
-        PFN_vkSetLatencyMarkerNV     vkSetLatencyMarkerNV     = 0;
-        PFN_vkGetLatencyTimingsNV    vkGetLatencyTimingsNV    = 0;
-        PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV = 0;
-
-        //=== VK_ARM_data_graph ===
-        PFN_vkCreateDataGraphPipelinesARM                         vkCreateDataGraphPipelinesARM                         = 0;
-        PFN_vkCreateDataGraphPipelineSessionARM                   vkCreateDataGraphPipelineSessionARM                   = 0;
-        PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM vkGetDataGraphPipelineSessionBindPointRequirementsARM = 0;
-        PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM    vkGetDataGraphPipelineSessionMemoryRequirementsARM    = 0;
-        PFN_vkBindDataGraphPipelineSessionMemoryARM               vkBindDataGraphPipelineSessionMemoryARM               = 0;
-        PFN_vkDestroyDataGraphPipelineSessionARM                  vkDestroyDataGraphPipelineSessionARM                  = 0;
-        PFN_vkCmdDispatchDataGraphARM                             vkCmdDispatchDataGraphARM                             = 0;
-        PFN_vkGetDataGraphPipelineAvailablePropertiesARM          vkGetDataGraphPipelineAvailablePropertiesARM          = 0;
-        PFN_vkGetDataGraphPipelinePropertiesARM                   vkGetDataGraphPipelinePropertiesARM                   = 0;
+        vkSetLatencySleepModeNV  = PFN_vkSetLatencySleepModeNV( vkGetDeviceProcAddr( device, "vkSetLatencySleepModeNV" ) );
+        vkLatencySleepNV         = PFN_vkLatencySleepNV( vkGetDeviceProcAddr( device, "vkLatencySleepNV" ) );
+        vkSetLatencyMarkerNV     = PFN_vkSetLatencyMarkerNV( vkGetDeviceProcAddr( device, "vkSetLatencyMarkerNV" ) );
+        vkGetLatencyTimingsNV    = PFN_vkGetLatencyTimingsNV( vkGetDeviceProcAddr( device, "vkGetLatencyTimingsNV" ) );
+        vkQueueNotifyOutOfBandNV = PFN_vkQueueNotifyOutOfBandNV( vkGetDeviceProcAddr( device, "vkQueueNotifyOutOfBandNV" ) );
 
         //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
-        PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT = 0;
+        vkCmdSetAttachmentFeedbackLoopEnableEXT =
+          PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT( vkGetDeviceProcAddr( device, "vkCmdSetAttachmentFeedbackLoopEnableEXT" ) );
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
         //=== VK_QNX_external_memory_screen_buffer ===
-        PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX = 0;
-#  else
-        PFN_dummy vkGetScreenBufferPropertiesQNX_placeholder = 0;
+        vkGetScreenBufferPropertiesQNX = PFN_vkGetScreenBufferPropertiesQNX( vkGetDeviceProcAddr( device, "vkGetScreenBufferPropertiesQNX" ) );
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
         //=== VK_KHR_line_rasterization ===
-        PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR = 0;
+        vkCmdSetLineStippleKHR = PFN_vkCmdSetLineStippleKHR( vkGetDeviceProcAddr( device, "vkCmdSetLineStippleKHR" ) );
 
         //=== VK_KHR_calibrated_timestamps ===
-        PFN_vkGetCalibratedTimestampsKHR vkGetCalibratedTimestampsKHR = 0;
+        vkGetCalibratedTimestampsKHR = PFN_vkGetCalibratedTimestampsKHR( vkGetDeviceProcAddr( device, "vkGetCalibratedTimestampsKHR" ) );
 
         //=== VK_KHR_maintenance6 ===
-        PFN_vkCmdBindDescriptorSets2KHR                   vkCmdBindDescriptorSets2KHR                   = 0;
-        PFN_vkCmdPushConstants2KHR                        vkCmdPushConstants2KHR                        = 0;
-        PFN_vkCmdPushDescriptorSet2KHR                    vkCmdPushDescriptorSet2KHR                    = 0;
-        PFN_vkCmdPushDescriptorSetWithTemplate2KHR        vkCmdPushDescriptorSetWithTemplate2KHR        = 0;
-        PFN_vkCmdSetDescriptorBufferOffsets2EXT           vkCmdSetDescriptorBufferOffsets2EXT           = 0;
-        PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT vkCmdBindDescriptorBufferEmbeddedSamplers2EXT = 0;
+        vkCmdBindDescriptorSets2KHR = PFN_vkCmdBindDescriptorSets2KHR( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorSets2KHR" ) );
+        vkCmdPushConstants2KHR      = PFN_vkCmdPushConstants2KHR( vkGetDeviceProcAddr( device, "vkCmdPushConstants2KHR" ) );
+        vkCmdPushDescriptorSet2KHR  = PFN_vkCmdPushDescriptorSet2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSet2KHR" ) );
+        vkCmdPushDescriptorSetWithTemplate2KHR =
+          PFN_vkCmdPushDescriptorSetWithTemplate2KHR( vkGetDeviceProcAddr( device, "vkCmdPushDescriptorSetWithTemplate2KHR" ) );
+        vkCmdSetDescriptorBufferOffsets2EXT = PFN_vkCmdSetDescriptorBufferOffsets2EXT( vkGetDeviceProcAddr( device, "vkCmdSetDescriptorBufferOffsets2EXT" ) );
+        vkCmdBindDescriptorBufferEmbeddedSamplers2EXT =
+          PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT( vkGetDeviceProcAddr( device, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT" ) );
+      }
 
-        //=== VK_QCOM_tile_memory_heap ===
-        PFN_vkCmdBindTileMemoryQCOM vkCmdBindTileMemoryQCOM = 0;
+    public:
+      //=== VK_VERSION_1_0 ===
+      PFN_vkGetDeviceProcAddr                vkGetDeviceProcAddr                = 0;
+      PFN_vkDestroyDevice                    vkDestroyDevice                    = 0;
+      PFN_vkGetDeviceQueue                   vkGetDeviceQueue                   = 0;
+      PFN_vkQueueSubmit                      vkQueueSubmit                      = 0;
+      PFN_vkQueueWaitIdle                    vkQueueWaitIdle                    = 0;
+      PFN_vkDeviceWaitIdle                   vkDeviceWaitIdle                   = 0;
+      PFN_vkAllocateMemory                   vkAllocateMemory                   = 0;
+      PFN_vkFreeMemory                       vkFreeMemory                       = 0;
+      PFN_vkMapMemory                        vkMapMemory                        = 0;
+      PFN_vkUnmapMemory                      vkUnmapMemory                      = 0;
+      PFN_vkFlushMappedMemoryRanges          vkFlushMappedMemoryRanges          = 0;
+      PFN_vkInvalidateMappedMemoryRanges     vkInvalidateMappedMemoryRanges     = 0;
+      PFN_vkGetDeviceMemoryCommitment        vkGetDeviceMemoryCommitment        = 0;
+      PFN_vkBindBufferMemory                 vkBindBufferMemory                 = 0;
+      PFN_vkBindImageMemory                  vkBindImageMemory                  = 0;
+      PFN_vkGetBufferMemoryRequirements      vkGetBufferMemoryRequirements      = 0;
+      PFN_vkGetImageMemoryRequirements       vkGetImageMemoryRequirements       = 0;
+      PFN_vkGetImageSparseMemoryRequirements vkGetImageSparseMemoryRequirements = 0;
+      PFN_vkQueueBindSparse                  vkQueueBindSparse                  = 0;
+      PFN_vkCreateFence                      vkCreateFence                      = 0;
+      PFN_vkDestroyFence                     vkDestroyFence                     = 0;
+      PFN_vkResetFences                      vkResetFences                      = 0;
+      PFN_vkGetFenceStatus                   vkGetFenceStatus                   = 0;
+      PFN_vkWaitForFences                    vkWaitForFences                    = 0;
+      PFN_vkCreateSemaphore                  vkCreateSemaphore                  = 0;
+      PFN_vkDestroySemaphore                 vkDestroySemaphore                 = 0;
+      PFN_vkCreateEvent                      vkCreateEvent                      = 0;
+      PFN_vkDestroyEvent                     vkDestroyEvent                     = 0;
+      PFN_vkGetEventStatus                   vkGetEventStatus                   = 0;
+      PFN_vkSetEvent                         vkSetEvent                         = 0;
+      PFN_vkResetEvent                       vkResetEvent                       = 0;
+      PFN_vkCreateQueryPool                  vkCreateQueryPool                  = 0;
+      PFN_vkDestroyQueryPool                 vkDestroyQueryPool                 = 0;
+      PFN_vkGetQueryPoolResults              vkGetQueryPoolResults              = 0;
+      PFN_vkCreateBuffer                     vkCreateBuffer                     = 0;
+      PFN_vkDestroyBuffer                    vkDestroyBuffer                    = 0;
+      PFN_vkCreateBufferView                 vkCreateBufferView                 = 0;
+      PFN_vkDestroyBufferView                vkDestroyBufferView                = 0;
+      PFN_vkCreateImage                      vkCreateImage                      = 0;
+      PFN_vkDestroyImage                     vkDestroyImage                     = 0;
+      PFN_vkGetImageSubresourceLayout        vkGetImageSubresourceLayout        = 0;
+      PFN_vkCreateImageView                  vkCreateImageView                  = 0;
+      PFN_vkDestroyImageView                 vkDestroyImageView                 = 0;
+      PFN_vkCreateShaderModule               vkCreateShaderModule               = 0;
+      PFN_vkDestroyShaderModule              vkDestroyShaderModule              = 0;
+      PFN_vkCreatePipelineCache              vkCreatePipelineCache              = 0;
+      PFN_vkDestroyPipelineCache             vkDestroyPipelineCache             = 0;
+      PFN_vkGetPipelineCacheData             vkGetPipelineCacheData             = 0;
+      PFN_vkMergePipelineCaches              vkMergePipelineCaches              = 0;
+      PFN_vkCreateGraphicsPipelines          vkCreateGraphicsPipelines          = 0;
+      PFN_vkCreateComputePipelines           vkCreateComputePipelines           = 0;
+      PFN_vkDestroyPipeline                  vkDestroyPipeline                  = 0;
+      PFN_vkCreatePipelineLayout             vkCreatePipelineLayout             = 0;
+      PFN_vkDestroyPipelineLayout            vkDestroyPipelineLayout            = 0;
+      PFN_vkCreateSampler                    vkCreateSampler                    = 0;
+      PFN_vkDestroySampler                   vkDestroySampler                   = 0;
+      PFN_vkCreateDescriptorSetLayout        vkCreateDescriptorSetLayout        = 0;
+      PFN_vkDestroyDescriptorSetLayout       vkDestroyDescriptorSetLayout       = 0;
+      PFN_vkCreateDescriptorPool             vkCreateDescriptorPool             = 0;
+      PFN_vkDestroyDescriptorPool            vkDestroyDescriptorPool            = 0;
+      PFN_vkResetDescriptorPool              vkResetDescriptorPool              = 0;
+      PFN_vkAllocateDescriptorSets           vkAllocateDescriptorSets           = 0;
+      PFN_vkFreeDescriptorSets               vkFreeDescriptorSets               = 0;
+      PFN_vkUpdateDescriptorSets             vkUpdateDescriptorSets             = 0;
+      PFN_vkCreateFramebuffer                vkCreateFramebuffer                = 0;
+      PFN_vkDestroyFramebuffer               vkDestroyFramebuffer               = 0;
+      PFN_vkCreateRenderPass                 vkCreateRenderPass                 = 0;
+      PFN_vkDestroyRenderPass                vkDestroyRenderPass                = 0;
+      PFN_vkGetRenderAreaGranularity         vkGetRenderAreaGranularity         = 0;
+      PFN_vkCreateCommandPool                vkCreateCommandPool                = 0;
+      PFN_vkDestroyCommandPool               vkDestroyCommandPool               = 0;
+      PFN_vkResetCommandPool                 vkResetCommandPool                 = 0;
+      PFN_vkAllocateCommandBuffers           vkAllocateCommandBuffers           = 0;
+      PFN_vkFreeCommandBuffers               vkFreeCommandBuffers               = 0;
+      PFN_vkBeginCommandBuffer               vkBeginCommandBuffer               = 0;
+      PFN_vkEndCommandBuffer                 vkEndCommandBuffer                 = 0;
+      PFN_vkResetCommandBuffer               vkResetCommandBuffer               = 0;
+      PFN_vkCmdBindPipeline                  vkCmdBindPipeline                  = 0;
+      PFN_vkCmdSetViewport                   vkCmdSetViewport                   = 0;
+      PFN_vkCmdSetScissor                    vkCmdSetScissor                    = 0;
+      PFN_vkCmdSetLineWidth                  vkCmdSetLineWidth                  = 0;
+      PFN_vkCmdSetDepthBias                  vkCmdSetDepthBias                  = 0;
+      PFN_vkCmdSetBlendConstants             vkCmdSetBlendConstants             = 0;
+      PFN_vkCmdSetDepthBounds                vkCmdSetDepthBounds                = 0;
+      PFN_vkCmdSetStencilCompareMask         vkCmdSetStencilCompareMask         = 0;
+      PFN_vkCmdSetStencilWriteMask           vkCmdSetStencilWriteMask           = 0;
+      PFN_vkCmdSetStencilReference           vkCmdSetStencilReference           = 0;
+      PFN_vkCmdBindDescriptorSets            vkCmdBindDescriptorSets            = 0;
+      PFN_vkCmdBindIndexBuffer               vkCmdBindIndexBuffer               = 0;
+      PFN_vkCmdBindVertexBuffers             vkCmdBindVertexBuffers             = 0;
+      PFN_vkCmdDraw                          vkCmdDraw                          = 0;
+      PFN_vkCmdDrawIndexed                   vkCmdDrawIndexed                   = 0;
+      PFN_vkCmdDrawIndirect                  vkCmdDrawIndirect                  = 0;
+      PFN_vkCmdDrawIndexedIndirect           vkCmdDrawIndexedIndirect           = 0;
+      PFN_vkCmdDispatch                      vkCmdDispatch                      = 0;
+      PFN_vkCmdDispatchIndirect              vkCmdDispatchIndirect              = 0;
+      PFN_vkCmdCopyBuffer                    vkCmdCopyBuffer                    = 0;
+      PFN_vkCmdCopyImage                     vkCmdCopyImage                     = 0;
+      PFN_vkCmdBlitImage                     vkCmdBlitImage                     = 0;
+      PFN_vkCmdCopyBufferToImage             vkCmdCopyBufferToImage             = 0;
+      PFN_vkCmdCopyImageToBuffer             vkCmdCopyImageToBuffer             = 0;
+      PFN_vkCmdUpdateBuffer                  vkCmdUpdateBuffer                  = 0;
+      PFN_vkCmdFillBuffer                    vkCmdFillBuffer                    = 0;
+      PFN_vkCmdClearColorImage               vkCmdClearColorImage               = 0;
+      PFN_vkCmdClearDepthStencilImage        vkCmdClearDepthStencilImage        = 0;
+      PFN_vkCmdClearAttachments              vkCmdClearAttachments              = 0;
+      PFN_vkCmdResolveImage                  vkCmdResolveImage                  = 0;
+      PFN_vkCmdSetEvent                      vkCmdSetEvent                      = 0;
+      PFN_vkCmdResetEvent                    vkCmdResetEvent                    = 0;
+      PFN_vkCmdWaitEvents                    vkCmdWaitEvents                    = 0;
+      PFN_vkCmdPipelineBarrier               vkCmdPipelineBarrier               = 0;
+      PFN_vkCmdBeginQuery                    vkCmdBeginQuery                    = 0;
+      PFN_vkCmdEndQuery                      vkCmdEndQuery                      = 0;
+      PFN_vkCmdResetQueryPool                vkCmdResetQueryPool                = 0;
+      PFN_vkCmdWriteTimestamp                vkCmdWriteTimestamp                = 0;
+      PFN_vkCmdCopyQueryPoolResults          vkCmdCopyQueryPoolResults          = 0;
+      PFN_vkCmdPushConstants                 vkCmdPushConstants                 = 0;
+      PFN_vkCmdBeginRenderPass               vkCmdBeginRenderPass               = 0;
+      PFN_vkCmdNextSubpass                   vkCmdNextSubpass                   = 0;
+      PFN_vkCmdEndRenderPass                 vkCmdEndRenderPass                 = 0;
+      PFN_vkCmdExecuteCommands               vkCmdExecuteCommands               = 0;
 
-        //=== VK_KHR_copy_memory_indirect ===
-        PFN_vkCmdCopyMemoryIndirectKHR        vkCmdCopyMemoryIndirectKHR        = 0;
-        PFN_vkCmdCopyMemoryToImageIndirectKHR vkCmdCopyMemoryToImageIndirectKHR = 0;
+      //=== VK_VERSION_1_1 ===
+      PFN_vkBindBufferMemory2                 vkBindBufferMemory2                 = 0;
+      PFN_vkBindImageMemory2                  vkBindImageMemory2                  = 0;
+      PFN_vkGetDeviceGroupPeerMemoryFeatures  vkGetDeviceGroupPeerMemoryFeatures  = 0;
+      PFN_vkCmdSetDeviceMask                  vkCmdSetDeviceMask                  = 0;
+      PFN_vkCmdDispatchBase                   vkCmdDispatchBase                   = 0;
+      PFN_vkGetImageMemoryRequirements2       vkGetImageMemoryRequirements2       = 0;
+      PFN_vkGetBufferMemoryRequirements2      vkGetBufferMemoryRequirements2      = 0;
+      PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2 = 0;
+      PFN_vkTrimCommandPool                   vkTrimCommandPool                   = 0;
+      PFN_vkGetDeviceQueue2                   vkGetDeviceQueue2                   = 0;
+      PFN_vkCreateSamplerYcbcrConversion      vkCreateSamplerYcbcrConversion      = 0;
+      PFN_vkDestroySamplerYcbcrConversion     vkDestroySamplerYcbcrConversion     = 0;
+      PFN_vkCreateDescriptorUpdateTemplate    vkCreateDescriptorUpdateTemplate    = 0;
+      PFN_vkDestroyDescriptorUpdateTemplate   vkDestroyDescriptorUpdateTemplate   = 0;
+      PFN_vkUpdateDescriptorSetWithTemplate   vkUpdateDescriptorSetWithTemplate   = 0;
+      PFN_vkGetDescriptorSetLayoutSupport     vkGetDescriptorSetLayoutSupport     = 0;
 
-        //=== VK_EXT_memory_decompression ===
-        PFN_vkCmdDecompressMemoryEXT              vkCmdDecompressMemoryEXT              = 0;
-        PFN_vkCmdDecompressMemoryIndirectCountEXT vkCmdDecompressMemoryIndirectCountEXT = 0;
+      //=== VK_VERSION_1_2 ===
+      PFN_vkCmdDrawIndirectCount                vkCmdDrawIndirectCount                = 0;
+      PFN_vkCmdDrawIndexedIndirectCount         vkCmdDrawIndexedIndirectCount         = 0;
+      PFN_vkCreateRenderPass2                   vkCreateRenderPass2                   = 0;
+      PFN_vkCmdBeginRenderPass2                 vkCmdBeginRenderPass2                 = 0;
+      PFN_vkCmdNextSubpass2                     vkCmdNextSubpass2                     = 0;
+      PFN_vkCmdEndRenderPass2                   vkCmdEndRenderPass2                   = 0;
+      PFN_vkResetQueryPool                      vkResetQueryPool                      = 0;
+      PFN_vkGetSemaphoreCounterValue            vkGetSemaphoreCounterValue            = 0;
+      PFN_vkWaitSemaphores                      vkWaitSemaphores                      = 0;
+      PFN_vkSignalSemaphore                     vkSignalSemaphore                     = 0;
+      PFN_vkGetBufferDeviceAddress              vkGetBufferDeviceAddress              = 0;
+      PFN_vkGetBufferOpaqueCaptureAddress       vkGetBufferOpaqueCaptureAddress       = 0;
+      PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress = 0;
 
-        //=== VK_NV_external_compute_queue ===
-        PFN_vkCreateExternalComputeQueueNV  vkCreateExternalComputeQueueNV  = 0;
-        PFN_vkDestroyExternalComputeQueueNV vkDestroyExternalComputeQueueNV = 0;
-        PFN_vkGetExternalComputeQueueDataNV vkGetExternalComputeQueueDataNV = 0;
+      //=== VK_VERSION_1_3 ===
+      PFN_vkCreatePrivateDataSlot                  vkCreatePrivateDataSlot                  = 0;
+      PFN_vkDestroyPrivateDataSlot                 vkDestroyPrivateDataSlot                 = 0;
+      PFN_vkSetPrivateData                         vkSetPrivateData                         = 0;
+      PFN_vkGetPrivateData                         vkGetPrivateData                         = 0;
+      PFN_vkCmdSetEvent2                           vkCmdSetEvent2                           = 0;
+      PFN_vkCmdResetEvent2                         vkCmdResetEvent2                         = 0;
+      PFN_vkCmdWaitEvents2                         vkCmdWaitEvents2                         = 0;
+      PFN_vkCmdPipelineBarrier2                    vkCmdPipelineBarrier2                    = 0;
+      PFN_vkCmdWriteTimestamp2                     vkCmdWriteTimestamp2                     = 0;
+      PFN_vkQueueSubmit2                           vkQueueSubmit2                           = 0;
+      PFN_vkCmdCopyBuffer2                         vkCmdCopyBuffer2                         = 0;
+      PFN_vkCmdCopyImage2                          vkCmdCopyImage2                          = 0;
+      PFN_vkCmdCopyBufferToImage2                  vkCmdCopyBufferToImage2                  = 0;
+      PFN_vkCmdCopyImageToBuffer2                  vkCmdCopyImageToBuffer2                  = 0;
+      PFN_vkCmdBlitImage2                          vkCmdBlitImage2                          = 0;
+      PFN_vkCmdResolveImage2                       vkCmdResolveImage2                       = 0;
+      PFN_vkCmdBeginRendering                      vkCmdBeginRendering                      = 0;
+      PFN_vkCmdEndRendering                        vkCmdEndRendering                        = 0;
+      PFN_vkCmdSetCullMode                         vkCmdSetCullMode                         = 0;
+      PFN_vkCmdSetFrontFace                        vkCmdSetFrontFace                        = 0;
+      PFN_vkCmdSetPrimitiveTopology                vkCmdSetPrimitiveTopology                = 0;
+      PFN_vkCmdSetViewportWithCount                vkCmdSetViewportWithCount                = 0;
+      PFN_vkCmdSetScissorWithCount                 vkCmdSetScissorWithCount                 = 0;
+      PFN_vkCmdBindVertexBuffers2                  vkCmdBindVertexBuffers2                  = 0;
+      PFN_vkCmdSetDepthTestEnable                  vkCmdSetDepthTestEnable                  = 0;
+      PFN_vkCmdSetDepthWriteEnable                 vkCmdSetDepthWriteEnable                 = 0;
+      PFN_vkCmdSetDepthCompareOp                   vkCmdSetDepthCompareOp                   = 0;
+      PFN_vkCmdSetDepthBoundsTestEnable            vkCmdSetDepthBoundsTestEnable            = 0;
+      PFN_vkCmdSetStencilTestEnable                vkCmdSetStencilTestEnable                = 0;
+      PFN_vkCmdSetStencilOp                        vkCmdSetStencilOp                        = 0;
+      PFN_vkCmdSetRasterizerDiscardEnable          vkCmdSetRasterizerDiscardEnable          = 0;
+      PFN_vkCmdSetDepthBiasEnable                  vkCmdSetDepthBiasEnable                  = 0;
+      PFN_vkCmdSetPrimitiveRestartEnable           vkCmdSetPrimitiveRestartEnable           = 0;
+      PFN_vkGetDeviceBufferMemoryRequirements      vkGetDeviceBufferMemoryRequirements      = 0;
+      PFN_vkGetDeviceImageMemoryRequirements       vkGetDeviceImageMemoryRequirements       = 0;
+      PFN_vkGetDeviceImageSparseMemoryRequirements vkGetDeviceImageSparseMemoryRequirements = 0;
 
-        //=== VK_NV_cluster_acceleration_structure ===
-        PFN_vkGetClusterAccelerationStructureBuildSizesNV    vkGetClusterAccelerationStructureBuildSizesNV    = 0;
-        PFN_vkCmdBuildClusterAccelerationStructureIndirectNV vkCmdBuildClusterAccelerationStructureIndirectNV = 0;
+      //=== VK_KHR_swapchain ===
+      PFN_vkCreateSwapchainKHR                   vkCreateSwapchainKHR                   = 0;
+      PFN_vkDestroySwapchainKHR                  vkDestroySwapchainKHR                  = 0;
+      PFN_vkGetSwapchainImagesKHR                vkGetSwapchainImagesKHR                = 0;
+      PFN_vkAcquireNextImageKHR                  vkAcquireNextImageKHR                  = 0;
+      PFN_vkQueuePresentKHR                      vkQueuePresentKHR                      = 0;
+      PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR = 0;
+      PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR = 0;
+      PFN_vkAcquireNextImage2KHR                 vkAcquireNextImage2KHR                 = 0;
 
-        //=== VK_NV_partitioned_acceleration_structure ===
-        PFN_vkGetPartitionedAccelerationStructuresBuildSizesNV vkGetPartitionedAccelerationStructuresBuildSizesNV = 0;
-        PFN_vkCmdBuildPartitionedAccelerationStructuresNV      vkCmdBuildPartitionedAccelerationStructuresNV      = 0;
+      //=== VK_KHR_display_swapchain ===
+      PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR = 0;
 
-        //=== VK_EXT_device_generated_commands ===
-        PFN_vkGetGeneratedCommandsMemoryRequirementsEXT vkGetGeneratedCommandsMemoryRequirementsEXT = 0;
-        PFN_vkCmdPreprocessGeneratedCommandsEXT         vkCmdPreprocessGeneratedCommandsEXT         = 0;
-        PFN_vkCmdExecuteGeneratedCommandsEXT            vkCmdExecuteGeneratedCommandsEXT            = 0;
-        PFN_vkCreateIndirectCommandsLayoutEXT           vkCreateIndirectCommandsLayoutEXT           = 0;
-        PFN_vkDestroyIndirectCommandsLayoutEXT          vkDestroyIndirectCommandsLayoutEXT          = 0;
-        PFN_vkCreateIndirectExecutionSetEXT             vkCreateIndirectExecutionSetEXT             = 0;
-        PFN_vkDestroyIndirectExecutionSetEXT            vkDestroyIndirectExecutionSetEXT            = 0;
-        PFN_vkUpdateIndirectExecutionSetPipelineEXT     vkUpdateIndirectExecutionSetPipelineEXT     = 0;
-        PFN_vkUpdateIndirectExecutionSetShaderEXT       vkUpdateIndirectExecutionSetShaderEXT       = 0;
+      //=== VK_EXT_debug_marker ===
+      PFN_vkDebugMarkerSetObjectTagEXT  vkDebugMarkerSetObjectTagEXT  = 0;
+      PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT = 0;
+      PFN_vkCmdDebugMarkerBeginEXT      vkCmdDebugMarkerBeginEXT      = 0;
+      PFN_vkCmdDebugMarkerEndEXT        vkCmdDebugMarkerEndEXT        = 0;
+      PFN_vkCmdDebugMarkerInsertEXT     vkCmdDebugMarkerInsertEXT     = 0;
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-        //=== VK_OHOS_native_buffer ===
-        PFN_vkGetSwapchainGrallocUsageOHOS vkGetSwapchainGrallocUsageOHOS = 0;
-        PFN_vkAcquireImageOHOS             vkAcquireImageOHOS             = 0;
-        PFN_vkQueueSignalReleaseImageOHOS  vkQueueSignalReleaseImageOHOS  = 0;
+      //=== VK_KHR_video_queue ===
+      PFN_vkCreateVideoSessionKHR                vkCreateVideoSessionKHR                = 0;
+      PFN_vkDestroyVideoSessionKHR               vkDestroyVideoSessionKHR               = 0;
+      PFN_vkGetVideoSessionMemoryRequirementsKHR vkGetVideoSessionMemoryRequirementsKHR = 0;
+      PFN_vkBindVideoSessionMemoryKHR            vkBindVideoSessionMemoryKHR            = 0;
+      PFN_vkCreateVideoSessionParametersKHR      vkCreateVideoSessionParametersKHR      = 0;
+      PFN_vkUpdateVideoSessionParametersKHR      vkUpdateVideoSessionParametersKHR      = 0;
+      PFN_vkDestroyVideoSessionParametersKHR     vkDestroyVideoSessionParametersKHR     = 0;
+      PFN_vkCmdBeginVideoCodingKHR               vkCmdBeginVideoCodingKHR               = 0;
+      PFN_vkCmdEndVideoCodingKHR                 vkCmdEndVideoCodingKHR                 = 0;
+      PFN_vkCmdControlVideoCodingKHR             vkCmdControlVideoCodingKHR             = 0;
+
+      //=== VK_KHR_video_decode_queue ===
+      PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR = 0;
+
+      //=== VK_EXT_transform_feedback ===
+      PFN_vkCmdBindTransformFeedbackBuffersEXT vkCmdBindTransformFeedbackBuffersEXT = 0;
+      PFN_vkCmdBeginTransformFeedbackEXT       vkCmdBeginTransformFeedbackEXT       = 0;
+      PFN_vkCmdEndTransformFeedbackEXT         vkCmdEndTransformFeedbackEXT         = 0;
+      PFN_vkCmdBeginQueryIndexedEXT            vkCmdBeginQueryIndexedEXT            = 0;
+      PFN_vkCmdEndQueryIndexedEXT              vkCmdEndQueryIndexedEXT              = 0;
+      PFN_vkCmdDrawIndirectByteCountEXT        vkCmdDrawIndirectByteCountEXT        = 0;
+
+      //=== VK_NVX_binary_import ===
+      PFN_vkCreateCuModuleNVX    vkCreateCuModuleNVX    = 0;
+      PFN_vkCreateCuFunctionNVX  vkCreateCuFunctionNVX  = 0;
+      PFN_vkDestroyCuModuleNVX   vkDestroyCuModuleNVX   = 0;
+      PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX = 0;
+      PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX = 0;
+
+      //=== VK_NVX_image_view_handle ===
+      PFN_vkGetImageViewHandleNVX  vkGetImageViewHandleNVX  = 0;
+      PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX = 0;
+
+      //=== VK_AMD_draw_indirect_count ===
+      PFN_vkCmdDrawIndirectCountAMD        vkCmdDrawIndirectCountAMD        = 0;
+      PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD = 0;
+
+      //=== VK_AMD_shader_info ===
+      PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = 0;
+
+      //=== VK_KHR_dynamic_rendering ===
+      PFN_vkCmdBeginRenderingKHR vkCmdBeginRenderingKHR = 0;
+      PFN_vkCmdEndRenderingKHR   vkCmdEndRenderingKHR   = 0;
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_NV_external_memory_win32 ===
+      PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV = 0;
 #  else
-        PFN_dummy vkGetSwapchainGrallocUsageOHOS_placeholder = 0;
-        PFN_dummy vkAcquireImageOHOS_placeholder             = 0;
-        PFN_dummy vkQueueSignalReleaseImageOHOS_placeholder  = 0;
-#  endif /*VK_USE_PLATFORM_OHOS*/
+      PFN_dummy vkGetMemoryWin32HandleNV_placeholder                          = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_device_group ===
+      PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR = 0;
+      PFN_vkCmdSetDeviceMaskKHR                 vkCmdSetDeviceMaskKHR                 = 0;
+      PFN_vkCmdDispatchBaseKHR                  vkCmdDispatchBaseKHR                  = 0;
+
+      //=== VK_KHR_maintenance1 ===
+      PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR = 0;
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_memory_win32 ===
+      PFN_vkGetMemoryWin32HandleKHR           vkGetMemoryWin32HandleKHR           = 0;
+      PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR = 0;
+#  else
+      PFN_dummy vkGetMemoryWin32HandleKHR_placeholder                         = 0;
+      PFN_dummy vkGetMemoryWin32HandlePropertiesKHR_placeholder               = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_memory_fd ===
+      PFN_vkGetMemoryFdKHR           vkGetMemoryFdKHR           = 0;
+      PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR = 0;
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_semaphore_win32 ===
+      PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR = 0;
+      PFN_vkGetSemaphoreWin32HandleKHR    vkGetSemaphoreWin32HandleKHR    = 0;
+#  else
+      PFN_dummy vkImportSemaphoreWin32HandleKHR_placeholder                   = 0;
+      PFN_dummy vkGetSemaphoreWin32HandleKHR_placeholder                      = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_semaphore_fd ===
+      PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR = 0;
+      PFN_vkGetSemaphoreFdKHR    vkGetSemaphoreFdKHR    = 0;
+
+      //=== VK_KHR_push_descriptor ===
+      PFN_vkCmdPushDescriptorSetKHR             vkCmdPushDescriptorSetKHR             = 0;
+      PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR = 0;
+
+      //=== VK_EXT_conditional_rendering ===
+      PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT = 0;
+      PFN_vkCmdEndConditionalRenderingEXT   vkCmdEndConditionalRenderingEXT   = 0;
+
+      //=== VK_KHR_descriptor_update_template ===
+      PFN_vkCreateDescriptorUpdateTemplateKHR  vkCreateDescriptorUpdateTemplateKHR  = 0;
+      PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR = 0;
+      PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR = 0;
+
+      //=== VK_NV_clip_space_w_scaling ===
+      PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV = 0;
+
+      //=== VK_EXT_display_control ===
+      PFN_vkDisplayPowerControlEXT  vkDisplayPowerControlEXT  = 0;
+      PFN_vkRegisterDeviceEventEXT  vkRegisterDeviceEventEXT  = 0;
+      PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT = 0;
+      PFN_vkGetSwapchainCounterEXT  vkGetSwapchainCounterEXT  = 0;
+
+      //=== VK_GOOGLE_display_timing ===
+      PFN_vkGetRefreshCycleDurationGOOGLE   vkGetRefreshCycleDurationGOOGLE   = 0;
+      PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE = 0;
+
+      //=== VK_EXT_discard_rectangles ===
+      PFN_vkCmdSetDiscardRectangleEXT       vkCmdSetDiscardRectangleEXT       = 0;
+      PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT = 0;
+      PFN_vkCmdSetDiscardRectangleModeEXT   vkCmdSetDiscardRectangleModeEXT   = 0;
+
+      //=== VK_EXT_hdr_metadata ===
+      PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT = 0;
+
+      //=== VK_KHR_create_renderpass2 ===
+      PFN_vkCreateRenderPass2KHR   vkCreateRenderPass2KHR   = 0;
+      PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR = 0;
+      PFN_vkCmdNextSubpass2KHR     vkCmdNextSubpass2KHR     = 0;
+      PFN_vkCmdEndRenderPass2KHR   vkCmdEndRenderPass2KHR   = 0;
+
+      //=== VK_KHR_shared_presentable_image ===
+      PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR = 0;
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_KHR_external_fence_win32 ===
+      PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR = 0;
+      PFN_vkGetFenceWin32HandleKHR    vkGetFenceWin32HandleKHR    = 0;
+#  else
+      PFN_dummy vkImportFenceWin32HandleKHR_placeholder                       = 0;
+      PFN_dummy vkGetFenceWin32HandleKHR_placeholder                          = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_external_fence_fd ===
+      PFN_vkImportFenceFdKHR vkImportFenceFdKHR = 0;
+      PFN_vkGetFenceFdKHR    vkGetFenceFdKHR    = 0;
+
+      //=== VK_KHR_performance_query ===
+      PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR = 0;
+      PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR = 0;
+
+      //=== VK_EXT_debug_utils ===
+      PFN_vkSetDebugUtilsObjectNameEXT    vkSetDebugUtilsObjectNameEXT    = 0;
+      PFN_vkSetDebugUtilsObjectTagEXT     vkSetDebugUtilsObjectTagEXT     = 0;
+      PFN_vkQueueBeginDebugUtilsLabelEXT  vkQueueBeginDebugUtilsLabelEXT  = 0;
+      PFN_vkQueueEndDebugUtilsLabelEXT    vkQueueEndDebugUtilsLabelEXT    = 0;
+      PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT = 0;
+      PFN_vkCmdBeginDebugUtilsLabelEXT    vkCmdBeginDebugUtilsLabelEXT    = 0;
+      PFN_vkCmdEndDebugUtilsLabelEXT      vkCmdEndDebugUtilsLabelEXT      = 0;
+      PFN_vkCmdInsertDebugUtilsLabelEXT   vkCmdInsertDebugUtilsLabelEXT   = 0;
+
+#  if defined( VK_USE_PLATFORM_ANDROID_KHR )
+      //=== VK_ANDROID_external_memory_android_hardware_buffer ===
+      PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID = 0;
+      PFN_vkGetMemoryAndroidHardwareBufferANDROID     vkGetMemoryAndroidHardwareBufferANDROID     = 0;
+#  else
+      PFN_dummy vkGetAndroidHardwareBufferPropertiesANDROID_placeholder       = 0;
+      PFN_dummy vkGetMemoryAndroidHardwareBufferANDROID_placeholder           = 0;
+#  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
+
+#  if defined( VK_ENABLE_BETA_EXTENSIONS )
+      //=== VK_AMDX_shader_enqueue ===
+      PFN_vkCreateExecutionGraphPipelinesAMDX        vkCreateExecutionGraphPipelinesAMDX        = 0;
+      PFN_vkGetExecutionGraphPipelineScratchSizeAMDX vkGetExecutionGraphPipelineScratchSizeAMDX = 0;
+      PFN_vkGetExecutionGraphPipelineNodeIndexAMDX   vkGetExecutionGraphPipelineNodeIndexAMDX   = 0;
+      PFN_vkCmdInitializeGraphScratchMemoryAMDX      vkCmdInitializeGraphScratchMemoryAMDX      = 0;
+      PFN_vkCmdDispatchGraphAMDX                     vkCmdDispatchGraphAMDX                     = 0;
+      PFN_vkCmdDispatchGraphIndirectAMDX             vkCmdDispatchGraphIndirectAMDX             = 0;
+      PFN_vkCmdDispatchGraphIndirectCountAMDX        vkCmdDispatchGraphIndirectCountAMDX        = 0;
+#  else
+      PFN_dummy vkCreateExecutionGraphPipelinesAMDX_placeholder               = 0;
+      PFN_dummy vkGetExecutionGraphPipelineScratchSizeAMDX_placeholder        = 0;
+      PFN_dummy vkGetExecutionGraphPipelineNodeIndexAMDX_placeholder          = 0;
+      PFN_dummy vkCmdInitializeGraphScratchMemoryAMDX_placeholder             = 0;
+      PFN_dummy vkCmdDispatchGraphAMDX_placeholder                            = 0;
+      PFN_dummy vkCmdDispatchGraphIndirectAMDX_placeholder                    = 0;
+      PFN_dummy vkCmdDispatchGraphIndirectCountAMDX_placeholder               = 0;
+#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
+
+      //=== VK_EXT_sample_locations ===
+      PFN_vkCmdSetSampleLocationsEXT vkCmdSetSampleLocationsEXT = 0;
+
+      //=== VK_KHR_get_memory_requirements2 ===
+      PFN_vkGetImageMemoryRequirements2KHR       vkGetImageMemoryRequirements2KHR       = 0;
+      PFN_vkGetBufferMemoryRequirements2KHR      vkGetBufferMemoryRequirements2KHR      = 0;
+      PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR = 0;
+
+      //=== VK_KHR_acceleration_structure ===
+      PFN_vkCreateAccelerationStructureKHR                 vkCreateAccelerationStructureKHR                 = 0;
+      PFN_vkDestroyAccelerationStructureKHR                vkDestroyAccelerationStructureKHR                = 0;
+      PFN_vkCmdBuildAccelerationStructuresKHR              vkCmdBuildAccelerationStructuresKHR              = 0;
+      PFN_vkCmdBuildAccelerationStructuresIndirectKHR      vkCmdBuildAccelerationStructuresIndirectKHR      = 0;
+      PFN_vkBuildAccelerationStructuresKHR                 vkBuildAccelerationStructuresKHR                 = 0;
+      PFN_vkCopyAccelerationStructureKHR                   vkCopyAccelerationStructureKHR                   = 0;
+      PFN_vkCopyAccelerationStructureToMemoryKHR           vkCopyAccelerationStructureToMemoryKHR           = 0;
+      PFN_vkCopyMemoryToAccelerationStructureKHR           vkCopyMemoryToAccelerationStructureKHR           = 0;
+      PFN_vkWriteAccelerationStructuresPropertiesKHR       vkWriteAccelerationStructuresPropertiesKHR       = 0;
+      PFN_vkCmdCopyAccelerationStructureKHR                vkCmdCopyAccelerationStructureKHR                = 0;
+      PFN_vkCmdCopyAccelerationStructureToMemoryKHR        vkCmdCopyAccelerationStructureToMemoryKHR        = 0;
+      PFN_vkCmdCopyMemoryToAccelerationStructureKHR        vkCmdCopyMemoryToAccelerationStructureKHR        = 0;
+      PFN_vkGetAccelerationStructureDeviceAddressKHR       vkGetAccelerationStructureDeviceAddressKHR       = 0;
+      PFN_vkCmdWriteAccelerationStructuresPropertiesKHR    vkCmdWriteAccelerationStructuresPropertiesKHR    = 0;
+      PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR = 0;
+      PFN_vkGetAccelerationStructureBuildSizesKHR          vkGetAccelerationStructureBuildSizesKHR          = 0;
+
+      //=== VK_KHR_ray_tracing_pipeline ===
+      PFN_vkCmdTraceRaysKHR                                 vkCmdTraceRaysKHR                                 = 0;
+      PFN_vkCreateRayTracingPipelinesKHR                    vkCreateRayTracingPipelinesKHR                    = 0;
+      PFN_vkGetRayTracingShaderGroupHandlesKHR              vkGetRayTracingShaderGroupHandlesKHR              = 0;
+      PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR = 0;
+      PFN_vkCmdTraceRaysIndirectKHR                         vkCmdTraceRaysIndirectKHR                         = 0;
+      PFN_vkGetRayTracingShaderGroupStackSizeKHR            vkGetRayTracingShaderGroupStackSizeKHR            = 0;
+      PFN_vkCmdSetRayTracingPipelineStackSizeKHR            vkCmdSetRayTracingPipelineStackSizeKHR            = 0;
+
+      //=== VK_KHR_sampler_ycbcr_conversion ===
+      PFN_vkCreateSamplerYcbcrConversionKHR  vkCreateSamplerYcbcrConversionKHR  = 0;
+      PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR = 0;
+
+      //=== VK_KHR_bind_memory2 ===
+      PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR = 0;
+      PFN_vkBindImageMemory2KHR  vkBindImageMemory2KHR  = 0;
+
+      //=== VK_EXT_image_drm_format_modifier ===
+      PFN_vkGetImageDrmFormatModifierPropertiesEXT vkGetImageDrmFormatModifierPropertiesEXT = 0;
+
+      //=== VK_EXT_validation_cache ===
+      PFN_vkCreateValidationCacheEXT  vkCreateValidationCacheEXT  = 0;
+      PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT = 0;
+      PFN_vkMergeValidationCachesEXT  vkMergeValidationCachesEXT  = 0;
+      PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT = 0;
+
+      //=== VK_NV_shading_rate_image ===
+      PFN_vkCmdBindShadingRateImageNV          vkCmdBindShadingRateImageNV          = 0;
+      PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV = 0;
+      PFN_vkCmdSetCoarseSampleOrderNV          vkCmdSetCoarseSampleOrderNV          = 0;
+
+      //=== VK_NV_ray_tracing ===
+      PFN_vkCreateAccelerationStructureNV                vkCreateAccelerationStructureNV                = 0;
+      PFN_vkDestroyAccelerationStructureNV               vkDestroyAccelerationStructureNV               = 0;
+      PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV = 0;
+      PFN_vkBindAccelerationStructureMemoryNV            vkBindAccelerationStructureMemoryNV            = 0;
+      PFN_vkCmdBuildAccelerationStructureNV              vkCmdBuildAccelerationStructureNV              = 0;
+      PFN_vkCmdCopyAccelerationStructureNV               vkCmdCopyAccelerationStructureNV               = 0;
+      PFN_vkCmdTraceRaysNV                               vkCmdTraceRaysNV                               = 0;
+      PFN_vkCreateRayTracingPipelinesNV                  vkCreateRayTracingPipelinesNV                  = 0;
+      PFN_vkGetRayTracingShaderGroupHandlesNV            vkGetRayTracingShaderGroupHandlesNV            = 0;
+      PFN_vkGetAccelerationStructureHandleNV             vkGetAccelerationStructureHandleNV             = 0;
+      PFN_vkCmdWriteAccelerationStructuresPropertiesNV   vkCmdWriteAccelerationStructuresPropertiesNV   = 0;
+      PFN_vkCompileDeferredNV                            vkCompileDeferredNV                            = 0;
+
+      //=== VK_KHR_maintenance3 ===
+      PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR = 0;
+
+      //=== VK_KHR_draw_indirect_count ===
+      PFN_vkCmdDrawIndirectCountKHR        vkCmdDrawIndirectCountKHR        = 0;
+      PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR = 0;
+
+      //=== VK_EXT_external_memory_host ===
+      PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT = 0;
+
+      //=== VK_AMD_buffer_marker ===
+      PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD = 0;
+
+      //=== VK_EXT_calibrated_timestamps ===
+      PFN_vkGetCalibratedTimestampsEXT vkGetCalibratedTimestampsEXT = 0;
+
+      //=== VK_NV_mesh_shader ===
+      PFN_vkCmdDrawMeshTasksNV              vkCmdDrawMeshTasksNV              = 0;
+      PFN_vkCmdDrawMeshTasksIndirectNV      vkCmdDrawMeshTasksIndirectNV      = 0;
+      PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV = 0;
+
+      //=== VK_NV_scissor_exclusive ===
+      PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV = 0;
+      PFN_vkCmdSetExclusiveScissorNV       vkCmdSetExclusiveScissorNV       = 0;
+
+      //=== VK_NV_device_diagnostic_checkpoints ===
+      PFN_vkCmdSetCheckpointNV       vkCmdSetCheckpointNV       = 0;
+      PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV = 0;
+
+      //=== VK_KHR_timeline_semaphore ===
+      PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR = 0;
+      PFN_vkWaitSemaphoresKHR           vkWaitSemaphoresKHR           = 0;
+      PFN_vkSignalSemaphoreKHR          vkSignalSemaphoreKHR          = 0;
+
+      //=== VK_INTEL_performance_query ===
+      PFN_vkInitializePerformanceApiINTEL         vkInitializePerformanceApiINTEL         = 0;
+      PFN_vkUninitializePerformanceApiINTEL       vkUninitializePerformanceApiINTEL       = 0;
+      PFN_vkCmdSetPerformanceMarkerINTEL          vkCmdSetPerformanceMarkerINTEL          = 0;
+      PFN_vkCmdSetPerformanceStreamMarkerINTEL    vkCmdSetPerformanceStreamMarkerINTEL    = 0;
+      PFN_vkCmdSetPerformanceOverrideINTEL        vkCmdSetPerformanceOverrideINTEL        = 0;
+      PFN_vkAcquirePerformanceConfigurationINTEL  vkAcquirePerformanceConfigurationINTEL  = 0;
+      PFN_vkReleasePerformanceConfigurationINTEL  vkReleasePerformanceConfigurationINTEL  = 0;
+      PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL = 0;
+      PFN_vkGetPerformanceParameterINTEL          vkGetPerformanceParameterINTEL          = 0;
+
+      //=== VK_AMD_display_native_hdr ===
+      PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD = 0;
+
+      //=== VK_KHR_fragment_shading_rate ===
+      PFN_vkCmdSetFragmentShadingRateKHR vkCmdSetFragmentShadingRateKHR = 0;
+
+      //=== VK_KHR_dynamic_rendering_local_read ===
+      PFN_vkCmdSetRenderingAttachmentLocationsKHR    vkCmdSetRenderingAttachmentLocationsKHR    = 0;
+      PFN_vkCmdSetRenderingInputAttachmentIndicesKHR vkCmdSetRenderingInputAttachmentIndicesKHR = 0;
+
+      //=== VK_EXT_buffer_device_address ===
+      PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT = 0;
+
+      //=== VK_KHR_present_wait ===
+      PFN_vkWaitForPresentKHR vkWaitForPresentKHR = 0;
+
+#  if defined( VK_USE_PLATFORM_WIN32_KHR )
+      //=== VK_EXT_full_screen_exclusive ===
+      PFN_vkAcquireFullScreenExclusiveModeEXT     vkAcquireFullScreenExclusiveModeEXT     = 0;
+      PFN_vkReleaseFullScreenExclusiveModeEXT     vkReleaseFullScreenExclusiveModeEXT     = 0;
+      PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT = 0;
+#  else
+      PFN_dummy vkAcquireFullScreenExclusiveModeEXT_placeholder               = 0;
+      PFN_dummy vkReleaseFullScreenExclusiveModeEXT_placeholder               = 0;
+      PFN_dummy vkGetDeviceGroupSurfacePresentModes2EXT_placeholder           = 0;
+#  endif /*VK_USE_PLATFORM_WIN32_KHR*/
+
+      //=== VK_KHR_buffer_device_address ===
+      PFN_vkGetBufferDeviceAddressKHR              vkGetBufferDeviceAddressKHR              = 0;
+      PFN_vkGetBufferOpaqueCaptureAddressKHR       vkGetBufferOpaqueCaptureAddressKHR       = 0;
+      PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR = 0;
+
+      //=== VK_EXT_line_rasterization ===
+      PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT = 0;
+
+      //=== VK_EXT_host_query_reset ===
+      PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT = 0;
+
+      //=== VK_EXT_extended_dynamic_state ===
+      PFN_vkCmdSetCullModeEXT              vkCmdSetCullModeEXT              = 0;
+      PFN_vkCmdSetFrontFaceEXT             vkCmdSetFrontFaceEXT             = 0;
+      PFN_vkCmdSetPrimitiveTopologyEXT     vkCmdSetPrimitiveTopologyEXT     = 0;
+      PFN_vkCmdSetViewportWithCountEXT     vkCmdSetViewportWithCountEXT     = 0;
+      PFN_vkCmdSetScissorWithCountEXT      vkCmdSetScissorWithCountEXT      = 0;
+      PFN_vkCmdBindVertexBuffers2EXT       vkCmdBindVertexBuffers2EXT       = 0;
+      PFN_vkCmdSetDepthTestEnableEXT       vkCmdSetDepthTestEnableEXT       = 0;
+      PFN_vkCmdSetDepthWriteEnableEXT      vkCmdSetDepthWriteEnableEXT      = 0;
+      PFN_vkCmdSetDepthCompareOpEXT        vkCmdSetDepthCompareOpEXT        = 0;
+      PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnableEXT = 0;
+      PFN_vkCmdSetStencilTestEnableEXT     vkCmdSetStencilTestEnableEXT     = 0;
+      PFN_vkCmdSetStencilOpEXT             vkCmdSetStencilOpEXT             = 0;
+
+      //=== VK_KHR_deferred_host_operations ===
+      PFN_vkCreateDeferredOperationKHR            vkCreateDeferredOperationKHR            = 0;
+      PFN_vkDestroyDeferredOperationKHR           vkDestroyDeferredOperationKHR           = 0;
+      PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR = 0;
+      PFN_vkGetDeferredOperationResultKHR         vkGetDeferredOperationResultKHR         = 0;
+      PFN_vkDeferredOperationJoinKHR              vkDeferredOperationJoinKHR              = 0;
+
+      //=== VK_KHR_pipeline_executable_properties ===
+      PFN_vkGetPipelineExecutablePropertiesKHR              vkGetPipelineExecutablePropertiesKHR              = 0;
+      PFN_vkGetPipelineExecutableStatisticsKHR              vkGetPipelineExecutableStatisticsKHR              = 0;
+      PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR = 0;
+
+      //=== VK_EXT_host_image_copy ===
+      PFN_vkCopyMemoryToImageEXT          vkCopyMemoryToImageEXT          = 0;
+      PFN_vkCopyImageToMemoryEXT          vkCopyImageToMemoryEXT          = 0;
+      PFN_vkCopyImageToImageEXT           vkCopyImageToImageEXT           = 0;
+      PFN_vkTransitionImageLayoutEXT      vkTransitionImageLayoutEXT      = 0;
+      PFN_vkGetImageSubresourceLayout2EXT vkGetImageSubresourceLayout2EXT = 0;
+
+      //=== VK_KHR_map_memory2 ===
+      PFN_vkMapMemory2KHR   vkMapMemory2KHR   = 0;
+      PFN_vkUnmapMemory2KHR vkUnmapMemory2KHR = 0;
+
+      //=== VK_EXT_swapchain_maintenance1 ===
+      PFN_vkReleaseSwapchainImagesEXT vkReleaseSwapchainImagesEXT = 0;
+
+      //=== VK_NV_device_generated_commands ===
+      PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV = 0;
+      PFN_vkCmdPreprocessGeneratedCommandsNV         vkCmdPreprocessGeneratedCommandsNV         = 0;
+      PFN_vkCmdExecuteGeneratedCommandsNV            vkCmdExecuteGeneratedCommandsNV            = 0;
+      PFN_vkCmdBindPipelineShaderGroupNV             vkCmdBindPipelineShaderGroupNV             = 0;
+      PFN_vkCreateIndirectCommandsLayoutNV           vkCreateIndirectCommandsLayoutNV           = 0;
+      PFN_vkDestroyIndirectCommandsLayoutNV          vkDestroyIndirectCommandsLayoutNV          = 0;
+
+      //=== VK_EXT_depth_bias_control ===
+      PFN_vkCmdSetDepthBias2EXT vkCmdSetDepthBias2EXT = 0;
+
+      //=== VK_EXT_private_data ===
+      PFN_vkCreatePrivateDataSlotEXT  vkCreatePrivateDataSlotEXT  = 0;
+      PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT = 0;
+      PFN_vkSetPrivateDataEXT         vkSetPrivateDataEXT         = 0;
+      PFN_vkGetPrivateDataEXT         vkGetPrivateDataEXT         = 0;
+
+      //=== VK_KHR_video_encode_queue ===
+      PFN_vkGetEncodedVideoSessionParametersKHR vkGetEncodedVideoSessionParametersKHR = 0;
+      PFN_vkCmdEncodeVideoKHR                   vkCmdEncodeVideoKHR                   = 0;
+
+#  if defined( VK_ENABLE_BETA_EXTENSIONS )
+      //=== VK_NV_cuda_kernel_launch ===
+      PFN_vkCreateCudaModuleNV    vkCreateCudaModuleNV    = 0;
+      PFN_vkGetCudaModuleCacheNV  vkGetCudaModuleCacheNV  = 0;
+      PFN_vkCreateCudaFunctionNV  vkCreateCudaFunctionNV  = 0;
+      PFN_vkDestroyCudaModuleNV   vkDestroyCudaModuleNV   = 0;
+      PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV = 0;
+      PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV = 0;
+#  else
+      PFN_dummy vkCreateCudaModuleNV_placeholder                              = 0;
+      PFN_dummy vkGetCudaModuleCacheNV_placeholder                            = 0;
+      PFN_dummy vkCreateCudaFunctionNV_placeholder                            = 0;
+      PFN_dummy vkDestroyCudaModuleNV_placeholder                             = 0;
+      PFN_dummy vkDestroyCudaFunctionNV_placeholder                           = 0;
+      PFN_dummy vkCmdCudaLaunchKernelNV_placeholder                           = 0;
+#  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
-        //=== VK_EXT_external_memory_metal ===
-        PFN_vkGetMemoryMetalHandleEXT           vkGetMemoryMetalHandleEXT           = 0;
-        PFN_vkGetMemoryMetalHandlePropertiesEXT vkGetMemoryMetalHandlePropertiesEXT = 0;
+      //=== VK_EXT_metal_objects ===
+      PFN_vkExportMetalObjectsEXT vkExportMetalObjectsEXT = 0;
 #  else
-        PFN_dummy vkGetMemoryMetalHandleEXT_placeholder           = 0;
-        PFN_dummy vkGetMemoryMetalHandlePropertiesEXT_placeholder = 0;
+      PFN_dummy vkExportMetalObjectsEXT_placeholder                           = 0;
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-        //=== VK_EXT_fragment_density_map_offset ===
-        PFN_vkCmdEndRendering2EXT vkCmdEndRendering2EXT = 0;
+      //=== VK_KHR_synchronization2 ===
+      PFN_vkCmdSetEvent2KHR           vkCmdSetEvent2KHR           = 0;
+      PFN_vkCmdResetEvent2KHR         vkCmdResetEvent2KHR         = 0;
+      PFN_vkCmdWaitEvents2KHR         vkCmdWaitEvents2KHR         = 0;
+      PFN_vkCmdPipelineBarrier2KHR    vkCmdPipelineBarrier2KHR    = 0;
+      PFN_vkCmdWriteTimestamp2KHR     vkCmdWriteTimestamp2KHR     = 0;
+      PFN_vkQueueSubmit2KHR           vkQueueSubmit2KHR           = 0;
+      PFN_vkCmdWriteBufferMarker2AMD  vkCmdWriteBufferMarker2AMD  = 0;
+      PFN_vkGetQueueCheckpointData2NV vkGetQueueCheckpointData2NV = 0;
 
-        //=== VK_EXT_custom_resolve ===
-        PFN_vkCmdBeginCustomResolveEXT vkCmdBeginCustomResolveEXT = 0;
+      //=== VK_EXT_descriptor_buffer ===
+      PFN_vkGetDescriptorSetLayoutSizeEXT                          vkGetDescriptorSetLayoutSizeEXT                          = 0;
+      PFN_vkGetDescriptorSetLayoutBindingOffsetEXT                 vkGetDescriptorSetLayoutBindingOffsetEXT                 = 0;
+      PFN_vkGetDescriptorEXT                                       vkGetDescriptorEXT                                       = 0;
+      PFN_vkCmdBindDescriptorBuffersEXT                            vkCmdBindDescriptorBuffersEXT                            = 0;
+      PFN_vkCmdSetDescriptorBufferOffsetsEXT                       vkCmdSetDescriptorBufferOffsetsEXT                       = 0;
+      PFN_vkCmdBindDescriptorBufferEmbeddedSamplersEXT             vkCmdBindDescriptorBufferEmbeddedSamplersEXT             = 0;
+      PFN_vkGetBufferOpaqueCaptureDescriptorDataEXT                vkGetBufferOpaqueCaptureDescriptorDataEXT                = 0;
+      PFN_vkGetImageOpaqueCaptureDescriptorDataEXT                 vkGetImageOpaqueCaptureDescriptorDataEXT                 = 0;
+      PFN_vkGetImageViewOpaqueCaptureDescriptorDataEXT             vkGetImageViewOpaqueCaptureDescriptorDataEXT             = 0;
+      PFN_vkGetSamplerOpaqueCaptureDescriptorDataEXT               vkGetSamplerOpaqueCaptureDescriptorDataEXT               = 0;
+      PFN_vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT = 0;
 
-        //=== VK_KHR_maintenance10 ===
-        PFN_vkCmdEndRendering2KHR vkCmdEndRendering2KHR = 0;
-      };
+      //=== VK_NV_fragment_shading_rate_enums ===
+      PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV = 0;
 
-    }  // namespace detail
+      //=== VK_EXT_mesh_shader ===
+      PFN_vkCmdDrawMeshTasksEXT              vkCmdDrawMeshTasksEXT              = 0;
+      PFN_vkCmdDrawMeshTasksIndirectEXT      vkCmdDrawMeshTasksIndirectEXT      = 0;
+      PFN_vkCmdDrawMeshTasksIndirectCountEXT vkCmdDrawMeshTasksIndirectCountEXT = 0;
+
+      //=== VK_KHR_copy_commands2 ===
+      PFN_vkCmdCopyBuffer2KHR        vkCmdCopyBuffer2KHR        = 0;
+      PFN_vkCmdCopyImage2KHR         vkCmdCopyImage2KHR         = 0;
+      PFN_vkCmdCopyBufferToImage2KHR vkCmdCopyBufferToImage2KHR = 0;
+      PFN_vkCmdCopyImageToBuffer2KHR vkCmdCopyImageToBuffer2KHR = 0;
+      PFN_vkCmdBlitImage2KHR         vkCmdBlitImage2KHR         = 0;
+      PFN_vkCmdResolveImage2KHR      vkCmdResolveImage2KHR      = 0;
+
+      //=== VK_EXT_device_fault ===
+      PFN_vkGetDeviceFaultInfoEXT vkGetDeviceFaultInfoEXT = 0;
+
+      //=== VK_EXT_vertex_input_dynamic_state ===
+      PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT = 0;
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_external_memory ===
+      PFN_vkGetMemoryZirconHandleFUCHSIA           vkGetMemoryZirconHandleFUCHSIA           = 0;
+      PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA vkGetMemoryZirconHandlePropertiesFUCHSIA = 0;
+#  else
+      PFN_dummy vkGetMemoryZirconHandleFUCHSIA_placeholder                    = 0;
+      PFN_dummy vkGetMemoryZirconHandlePropertiesFUCHSIA_placeholder          = 0;
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_external_semaphore ===
+      PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA = 0;
+      PFN_vkGetSemaphoreZirconHandleFUCHSIA    vkGetSemaphoreZirconHandleFUCHSIA    = 0;
+#  else
+      PFN_dummy vkImportSemaphoreZirconHandleFUCHSIA_placeholder              = 0;
+      PFN_dummy vkGetSemaphoreZirconHandleFUCHSIA_placeholder                 = 0;
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+#  if defined( VK_USE_PLATFORM_FUCHSIA )
+      //=== VK_FUCHSIA_buffer_collection ===
+      PFN_vkCreateBufferCollectionFUCHSIA               vkCreateBufferCollectionFUCHSIA               = 0;
+      PFN_vkSetBufferCollectionImageConstraintsFUCHSIA  vkSetBufferCollectionImageConstraintsFUCHSIA  = 0;
+      PFN_vkSetBufferCollectionBufferConstraintsFUCHSIA vkSetBufferCollectionBufferConstraintsFUCHSIA = 0;
+      PFN_vkDestroyBufferCollectionFUCHSIA              vkDestroyBufferCollectionFUCHSIA              = 0;
+      PFN_vkGetBufferCollectionPropertiesFUCHSIA        vkGetBufferCollectionPropertiesFUCHSIA        = 0;
+#  else
+      PFN_dummy vkCreateBufferCollectionFUCHSIA_placeholder                   = 0;
+      PFN_dummy vkSetBufferCollectionImageConstraintsFUCHSIA_placeholder      = 0;
+      PFN_dummy vkSetBufferCollectionBufferConstraintsFUCHSIA_placeholder     = 0;
+      PFN_dummy vkDestroyBufferCollectionFUCHSIA_placeholder                  = 0;
+      PFN_dummy vkGetBufferCollectionPropertiesFUCHSIA_placeholder            = 0;
+#  endif /*VK_USE_PLATFORM_FUCHSIA*/
+
+      //=== VK_HUAWEI_subpass_shading ===
+      PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI = 0;
+      PFN_vkCmdSubpassShadingHUAWEI                       vkCmdSubpassShadingHUAWEI                       = 0;
+
+      //=== VK_HUAWEI_invocation_mask ===
+      PFN_vkCmdBindInvocationMaskHUAWEI vkCmdBindInvocationMaskHUAWEI = 0;
+
+      //=== VK_NV_external_memory_rdma ===
+      PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV = 0;
+
+      //=== VK_EXT_pipeline_properties ===
+      PFN_vkGetPipelinePropertiesEXT vkGetPipelinePropertiesEXT = 0;
+
+      //=== VK_EXT_extended_dynamic_state2 ===
+      PFN_vkCmdSetPatchControlPointsEXT      vkCmdSetPatchControlPointsEXT      = 0;
+      PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT = 0;
+      PFN_vkCmdSetDepthBiasEnableEXT         vkCmdSetDepthBiasEnableEXT         = 0;
+      PFN_vkCmdSetLogicOpEXT                 vkCmdSetLogicOpEXT                 = 0;
+      PFN_vkCmdSetPrimitiveRestartEnableEXT  vkCmdSetPrimitiveRestartEnableEXT  = 0;
+
+      //=== VK_EXT_color_write_enable ===
+      PFN_vkCmdSetColorWriteEnableEXT vkCmdSetColorWriteEnableEXT = 0;
+
+      //=== VK_KHR_ray_tracing_maintenance1 ===
+      PFN_vkCmdTraceRaysIndirect2KHR vkCmdTraceRaysIndirect2KHR = 0;
+
+      //=== VK_EXT_multi_draw ===
+      PFN_vkCmdDrawMultiEXT        vkCmdDrawMultiEXT        = 0;
+      PFN_vkCmdDrawMultiIndexedEXT vkCmdDrawMultiIndexedEXT = 0;
+
+      //=== VK_EXT_opacity_micromap ===
+      PFN_vkCreateMicromapEXT                 vkCreateMicromapEXT                 = 0;
+      PFN_vkDestroyMicromapEXT                vkDestroyMicromapEXT                = 0;
+      PFN_vkCmdBuildMicromapsEXT              vkCmdBuildMicromapsEXT              = 0;
+      PFN_vkBuildMicromapsEXT                 vkBuildMicromapsEXT                 = 0;
+      PFN_vkCopyMicromapEXT                   vkCopyMicromapEXT                   = 0;
+      PFN_vkCopyMicromapToMemoryEXT           vkCopyMicromapToMemoryEXT           = 0;
+      PFN_vkCopyMemoryToMicromapEXT           vkCopyMemoryToMicromapEXT           = 0;
+      PFN_vkWriteMicromapsPropertiesEXT       vkWriteMicromapsPropertiesEXT       = 0;
+      PFN_vkCmdCopyMicromapEXT                vkCmdCopyMicromapEXT                = 0;
+      PFN_vkCmdCopyMicromapToMemoryEXT        vkCmdCopyMicromapToMemoryEXT        = 0;
+      PFN_vkCmdCopyMemoryToMicromapEXT        vkCmdCopyMemoryToMicromapEXT        = 0;
+      PFN_vkCmdWriteMicromapsPropertiesEXT    vkCmdWriteMicromapsPropertiesEXT    = 0;
+      PFN_vkGetDeviceMicromapCompatibilityEXT vkGetDeviceMicromapCompatibilityEXT = 0;
+      PFN_vkGetMicromapBuildSizesEXT          vkGetMicromapBuildSizesEXT          = 0;
+
+      //=== VK_HUAWEI_cluster_culling_shader ===
+      PFN_vkCmdDrawClusterHUAWEI         vkCmdDrawClusterHUAWEI         = 0;
+      PFN_vkCmdDrawClusterIndirectHUAWEI vkCmdDrawClusterIndirectHUAWEI = 0;
+
+      //=== VK_EXT_pageable_device_local_memory ===
+      PFN_vkSetDeviceMemoryPriorityEXT vkSetDeviceMemoryPriorityEXT = 0;
+
+      //=== VK_KHR_maintenance4 ===
+      PFN_vkGetDeviceBufferMemoryRequirementsKHR      vkGetDeviceBufferMemoryRequirementsKHR      = 0;
+      PFN_vkGetDeviceImageMemoryRequirementsKHR       vkGetDeviceImageMemoryRequirementsKHR       = 0;
+      PFN_vkGetDeviceImageSparseMemoryRequirementsKHR vkGetDeviceImageSparseMemoryRequirementsKHR = 0;
+
+      //=== VK_VALVE_descriptor_set_host_mapping ===
+      PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE vkGetDescriptorSetLayoutHostMappingInfoVALVE = 0;
+      PFN_vkGetDescriptorSetHostMappingVALVE           vkGetDescriptorSetHostMappingVALVE           = 0;
+
+      //=== VK_NV_copy_memory_indirect ===
+      PFN_vkCmdCopyMemoryIndirectNV        vkCmdCopyMemoryIndirectNV        = 0;
+      PFN_vkCmdCopyMemoryToImageIndirectNV vkCmdCopyMemoryToImageIndirectNV = 0;
+
+      //=== VK_NV_memory_decompression ===
+      PFN_vkCmdDecompressMemoryNV              vkCmdDecompressMemoryNV              = 0;
+      PFN_vkCmdDecompressMemoryIndirectCountNV vkCmdDecompressMemoryIndirectCountNV = 0;
+
+      //=== VK_NV_device_generated_commands_compute ===
+      PFN_vkGetPipelineIndirectMemoryRequirementsNV vkGetPipelineIndirectMemoryRequirementsNV = 0;
+      PFN_vkCmdUpdatePipelineIndirectBufferNV       vkCmdUpdatePipelineIndirectBufferNV       = 0;
+      PFN_vkGetPipelineIndirectDeviceAddressNV      vkGetPipelineIndirectDeviceAddressNV      = 0;
+
+      //=== VK_EXT_extended_dynamic_state3 ===
+      PFN_vkCmdSetDepthClampEnableEXT                 vkCmdSetDepthClampEnableEXT                 = 0;
+      PFN_vkCmdSetPolygonModeEXT                      vkCmdSetPolygonModeEXT                      = 0;
+      PFN_vkCmdSetRasterizationSamplesEXT             vkCmdSetRasterizationSamplesEXT             = 0;
+      PFN_vkCmdSetSampleMaskEXT                       vkCmdSetSampleMaskEXT                       = 0;
+      PFN_vkCmdSetAlphaToCoverageEnableEXT            vkCmdSetAlphaToCoverageEnableEXT            = 0;
+      PFN_vkCmdSetAlphaToOneEnableEXT                 vkCmdSetAlphaToOneEnableEXT                 = 0;
+      PFN_vkCmdSetLogicOpEnableEXT                    vkCmdSetLogicOpEnableEXT                    = 0;
+      PFN_vkCmdSetColorBlendEnableEXT                 vkCmdSetColorBlendEnableEXT                 = 0;
+      PFN_vkCmdSetColorBlendEquationEXT               vkCmdSetColorBlendEquationEXT               = 0;
+      PFN_vkCmdSetColorWriteMaskEXT                   vkCmdSetColorWriteMaskEXT                   = 0;
+      PFN_vkCmdSetTessellationDomainOriginEXT         vkCmdSetTessellationDomainOriginEXT         = 0;
+      PFN_vkCmdSetRasterizationStreamEXT              vkCmdSetRasterizationStreamEXT              = 0;
+      PFN_vkCmdSetConservativeRasterizationModeEXT    vkCmdSetConservativeRasterizationModeEXT    = 0;
+      PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT vkCmdSetExtraPrimitiveOverestimationSizeEXT = 0;
+      PFN_vkCmdSetDepthClipEnableEXT                  vkCmdSetDepthClipEnableEXT                  = 0;
+      PFN_vkCmdSetSampleLocationsEnableEXT            vkCmdSetSampleLocationsEnableEXT            = 0;
+      PFN_vkCmdSetColorBlendAdvancedEXT               vkCmdSetColorBlendAdvancedEXT               = 0;
+      PFN_vkCmdSetProvokingVertexModeEXT              vkCmdSetProvokingVertexModeEXT              = 0;
+      PFN_vkCmdSetLineRasterizationModeEXT            vkCmdSetLineRasterizationModeEXT            = 0;
+      PFN_vkCmdSetLineStippleEnableEXT                vkCmdSetLineStippleEnableEXT                = 0;
+      PFN_vkCmdSetDepthClipNegativeOneToOneEXT        vkCmdSetDepthClipNegativeOneToOneEXT        = 0;
+      PFN_vkCmdSetViewportWScalingEnableNV            vkCmdSetViewportWScalingEnableNV            = 0;
+      PFN_vkCmdSetViewportSwizzleNV                   vkCmdSetViewportSwizzleNV                   = 0;
+      PFN_vkCmdSetCoverageToColorEnableNV             vkCmdSetCoverageToColorEnableNV             = 0;
+      PFN_vkCmdSetCoverageToColorLocationNV           vkCmdSetCoverageToColorLocationNV           = 0;
+      PFN_vkCmdSetCoverageModulationModeNV            vkCmdSetCoverageModulationModeNV            = 0;
+      PFN_vkCmdSetCoverageModulationTableEnableNV     vkCmdSetCoverageModulationTableEnableNV     = 0;
+      PFN_vkCmdSetCoverageModulationTableNV           vkCmdSetCoverageModulationTableNV           = 0;
+      PFN_vkCmdSetShadingRateImageEnableNV            vkCmdSetShadingRateImageEnableNV            = 0;
+      PFN_vkCmdSetRepresentativeFragmentTestEnableNV  vkCmdSetRepresentativeFragmentTestEnableNV  = 0;
+      PFN_vkCmdSetCoverageReductionModeNV             vkCmdSetCoverageReductionModeNV             = 0;
+
+      //=== VK_EXT_shader_module_identifier ===
+      PFN_vkGetShaderModuleIdentifierEXT           vkGetShaderModuleIdentifierEXT           = 0;
+      PFN_vkGetShaderModuleCreateInfoIdentifierEXT vkGetShaderModuleCreateInfoIdentifierEXT = 0;
+
+      //=== VK_NV_optical_flow ===
+      PFN_vkCreateOpticalFlowSessionNV    vkCreateOpticalFlowSessionNV    = 0;
+      PFN_vkDestroyOpticalFlowSessionNV   vkDestroyOpticalFlowSessionNV   = 0;
+      PFN_vkBindOpticalFlowSessionImageNV vkBindOpticalFlowSessionImageNV = 0;
+      PFN_vkCmdOpticalFlowExecuteNV       vkCmdOpticalFlowExecuteNV       = 0;
+
+      //=== VK_KHR_maintenance5 ===
+      PFN_vkCmdBindIndexBuffer2KHR             vkCmdBindIndexBuffer2KHR             = 0;
+      PFN_vkGetRenderingAreaGranularityKHR     vkGetRenderingAreaGranularityKHR     = 0;
+      PFN_vkGetDeviceImageSubresourceLayoutKHR vkGetDeviceImageSubresourceLayoutKHR = 0;
+      PFN_vkGetImageSubresourceLayout2KHR      vkGetImageSubresourceLayout2KHR      = 0;
+
+      //=== VK_EXT_shader_object ===
+      PFN_vkCreateShadersEXT       vkCreateShadersEXT       = 0;
+      PFN_vkDestroyShaderEXT       vkDestroyShaderEXT       = 0;
+      PFN_vkGetShaderBinaryDataEXT vkGetShaderBinaryDataEXT = 0;
+      PFN_vkCmdBindShadersEXT      vkCmdBindShadersEXT      = 0;
+
+      //=== VK_QCOM_tile_properties ===
+      PFN_vkGetFramebufferTilePropertiesQCOM      vkGetFramebufferTilePropertiesQCOM      = 0;
+      PFN_vkGetDynamicRenderingTilePropertiesQCOM vkGetDynamicRenderingTilePropertiesQCOM = 0;
+
+      //=== VK_NV_low_latency2 ===
+      PFN_vkSetLatencySleepModeNV  vkSetLatencySleepModeNV  = 0;
+      PFN_vkLatencySleepNV         vkLatencySleepNV         = 0;
+      PFN_vkSetLatencyMarkerNV     vkSetLatencyMarkerNV     = 0;
+      PFN_vkGetLatencyTimingsNV    vkGetLatencyTimingsNV    = 0;
+      PFN_vkQueueNotifyOutOfBandNV vkQueueNotifyOutOfBandNV = 0;
+
+      //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
+      PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT vkCmdSetAttachmentFeedbackLoopEnableEXT = 0;
+
+#  if defined( VK_USE_PLATFORM_SCREEN_QNX )
+      //=== VK_QNX_external_memory_screen_buffer ===
+      PFN_vkGetScreenBufferPropertiesQNX vkGetScreenBufferPropertiesQNX = 0;
+#  else
+      PFN_dummy vkGetScreenBufferPropertiesQNX_placeholder                    = 0;
+#  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+
+      //=== VK_KHR_line_rasterization ===
+      PFN_vkCmdSetLineStippleKHR vkCmdSetLineStippleKHR = 0;
+
+      //=== VK_KHR_calibrated_timestamps ===
+      PFN_vkGetCalibratedTimestampsKHR vkGetCalibratedTimestampsKHR = 0;
+
+      //=== VK_KHR_maintenance6 ===
+      PFN_vkCmdBindDescriptorSets2KHR                   vkCmdBindDescriptorSets2KHR                   = 0;
+      PFN_vkCmdPushConstants2KHR                        vkCmdPushConstants2KHR                        = 0;
+      PFN_vkCmdPushDescriptorSet2KHR                    vkCmdPushDescriptorSet2KHR                    = 0;
+      PFN_vkCmdPushDescriptorSetWithTemplate2KHR        vkCmdPushDescriptorSetWithTemplate2KHR        = 0;
+      PFN_vkCmdSetDescriptorBufferOffsets2EXT           vkCmdSetDescriptorBufferOffsets2EXT           = 0;
+      PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT vkCmdBindDescriptorBufferEmbeddedSamplers2EXT = 0;
+    };
 
     //========================================
     //=== RAII HANDLE forward declarations ===
@@ -3009,14 +2618,12 @@ namespace VULKAN_HPP_NAMESPACE
     class DeviceMemory;
     class Fence;
     class Semaphore;
+    class Event;
     class QueryPool;
     class Buffer;
+    class BufferView;
     class Image;
     class ImageView;
-    class CommandPool;
-    class CommandBuffer;
-    class Event;
-    class BufferView;
     class ShaderModule;
     class PipelineCache;
     class Pipeline;
@@ -3027,10 +2634,12 @@ namespace VULKAN_HPP_NAMESPACE
     class DescriptorSetLayout;
     class Framebuffer;
     class RenderPass;
+    class CommandPool;
+    class CommandBuffer;
 
     //=== VK_VERSION_1_1 ===
-    class DescriptorUpdateTemplate;
     class SamplerYcbcrConversion;
+    class DescriptorUpdateTemplate;
 
     //=== VK_VERSION_1_3 ===
     class PrivateDataSlot;
@@ -3056,18 +2665,12 @@ namespace VULKAN_HPP_NAMESPACE
     class CuModuleNVX;
     class CuFunctionNVX;
 
-    //=== VK_KHR_descriptor_update_template ===
-    using DescriptorUpdateTemplateKHR = DescriptorUpdateTemplate;
-
     //=== VK_EXT_debug_utils ===
     class DebugUtilsMessengerEXT;
 
     //=== VK_KHR_acceleration_structure ===
     class AccelerationStructureKHR;
 
-    //=== VK_KHR_sampler_ycbcr_conversion ===
-    using SamplerYcbcrConversionKHR = SamplerYcbcrConversion;
-
     //=== VK_EXT_validation_cache ===
     class ValidationCacheEXT;
 
@@ -3083,9 +2686,6 @@ namespace VULKAN_HPP_NAMESPACE
     //=== VK_NV_device_generated_commands ===
     class IndirectCommandsLayoutNV;
 
-    //=== VK_EXT_private_data ===
-    using PrivateDataSlotEXT = PrivateDataSlot;
-
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_NV_cuda_kernel_launch ===
     class CudaModuleNV;
@@ -3100,46 +2700,26 @@ namespace VULKAN_HPP_NAMESPACE
     //=== VK_EXT_opacity_micromap ===
     class MicromapEXT;
 
-    //=== VK_ARM_tensors ===
-    class TensorARM;
-    class TensorViewARM;
-
     //=== VK_NV_optical_flow ===
     class OpticalFlowSessionNV;
 
     //=== VK_EXT_shader_object ===
     class ShaderEXT;
 
-    //=== VK_KHR_pipeline_binary ===
-    class PipelineBinaryKHR;
-
-    //=== VK_ARM_data_graph ===
-    class DataGraphPipelineSessionARM;
-
-    //=== VK_NV_external_compute_queue ===
-    class ExternalComputeQueueNV;
-
-    //=== VK_EXT_device_generated_commands ===
-    class IndirectCommandsLayoutEXT;
-    class IndirectExecutionSetEXT;
-
     //====================
     //=== RAII HANDLES ===
     //====================
 
-    template <typename Type>
-    struct isVulkanRAIIHandleType
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = false;
-    };
-
     class Context
     {
     public:
 #  if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-      Context() : m_dispatcher( new detail::ContextDispatcher( m_dynamicLoader.getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" ) ) )
+      Context()
+        : m_dispatcher( new VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ContextDispatcher(
+            m_dynamicLoader.getProcAddress<PFN_vkGetInstanceProcAddr>( "vkGetInstanceProcAddr" ) ) )
 #  else
-      Context( PFN_vkGetInstanceProcAddr getInstanceProcAddr ) : m_dispatcher( new detail::ContextDispatcher( getInstanceProcAddr ) )
+      Context( PFN_vkGetInstanceProcAddr getInstanceProcAddr )
+        : m_dispatcher( new VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ContextDispatcher( getInstanceProcAddr ) )
 #  endif
       {
       }
@@ -3170,13 +2750,13 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      detail::ContextDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ContextDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return &*m_dispatcher;
       }
 
-      void swap( Context & rhs )
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Context & rhs )
       {
 #  if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
         std::swap( m_dynamicLoader, rhs.m_dynamicLoader );
@@ -3186,54 +2766,54 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Instance>::type
-        createInstance( InstanceCreateInfo const &          createInfo,
-                        Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance>::Type
+                           createInstance( VULKAN_HPP_NAMESPACE::InstanceCreateInfo const &                                createInfo,
+                                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties>>::type
-        enumerateInstanceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties>
+                           enumerateInstanceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkEnumerateInstanceLayerProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties>>::type enumerateInstanceLayerProperties() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> enumerateInstanceLayerProperties() const;
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type enumerateInstanceVersion() const;
+      VULKAN_HPP_NODISCARD uint32_t enumerateInstanceVersion() const;
 
     private:
 #  if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-      VULKAN_HPP_NAMESPACE::detail::DynamicLoader m_dynamicLoader;
+      VULKAN_HPP_NAMESPACE::DynamicLoader m_dynamicLoader;
 #  endif
-      std::unique_ptr<detail::ContextDispatcher> m_dispatcher;
+      std::unique_ptr<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ContextDispatcher> m_dispatcher;
     };
 
-    // wrapper class for handle VkInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInstance.html
     class Instance
     {
     public:
       using CType   = VkInstance;
       using CppType = VULKAN_HPP_NAMESPACE::Instance;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eInstance;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eInstance;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eInstance;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eInstance;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Instance( Context const & context, InstanceCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Context const &                context,
+                VULKAN_HPP_NAMESPACE::InstanceCreateInfo const &                                createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = context.createInstance( createInfo, allocator );
       }
 #  endif
 
-      Instance( Context const & context, VkInstance instance, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_instance( instance ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+      Instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Context const &                context,
+                VkInstance                                                                      instance,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_instance( instance ), m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
       {
-        m_dispatcher.reset( new detail::InstanceDispatcher( context.getDispatcher()->vkGetInstanceProcAddr, static_cast<VkInstance>( m_instance ) ) );
+        m_dispatcher.reset( new VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher( context.getDispatcher()->vkGetInstanceProcAddr,
+                                                                                                     static_cast<VkInstance>( m_instance ) ) );
       }
 
       Instance( std::nullptr_t ) {}
@@ -3247,8 +2827,8 @@ namespace VULKAN_HPP_NAMESPACE
       Instance( Instance const & ) = delete;
 
       Instance( Instance && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_instance( exchange( rhs.m_instance, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
+        : m_instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_instance, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
         , m_dispatcher( rhs.m_dispatcher.release() )
       {
       }
@@ -3266,16 +2846,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Instance const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Instance const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_instance;
       }
 
-      VULKAN_HPP_NAMESPACE::Instance const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_instance );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Instance() const VULKAN_HPP_NOEXCEPT
       {
         return m_instance;
@@ -3296,16 +2871,16 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_instance, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_instance, nullptr );
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return &*m_dispatcher;
       }
 
-      void swap( Instance & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_instance, rhs.m_instance );
         std::swap( m_allocator, rhs.m_allocator );
@@ -3314,222 +2889,197 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDevice>>::type enumeratePhysicalDevices() const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice>>::Type
+        enumeratePhysicalDevices() const;
 
-      // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-      VULKAN_HPP_NODISCARD PFN_VoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD PFN_vkVoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties>>::type enumeratePhysicalDeviceGroups() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> enumeratePhysicalDeviceGroups() const;
 
       //=== VK_KHR_display ===
 
-      // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createDisplayPlaneSurfaceKHR( DisplaySurfaceCreateInfoKHR const & createInfo,
-                                      Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createDisplayPlaneSurfaceKHR( VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR const &                       createInfo,
+                                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_XLIB_KHR )
       //=== VK_KHR_xlib_surface ===
 
-      // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createXlibSurfaceKHR( XlibSurfaceCreateInfoKHR const &    createInfo,
-                              Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createXlibSurfaceKHR( VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR const &                          createInfo,
+                                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
       //=== VK_KHR_xcb_surface ===
 
-      // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createXcbSurfaceKHR( XcbSurfaceCreateInfoKHR const &     createInfo,
-                             Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createXcbSurfaceKHR( VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR const &                           createInfo,
+                                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
       //=== VK_KHR_wayland_surface ===
 
-      // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createWaylandSurfaceKHR( WaylandSurfaceCreateInfoKHR const & createInfo,
-                                 Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createWaylandSurfaceKHR( VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR const &                       createInfo,
+                                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
       //=== VK_KHR_android_surface ===
 
-      // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createAndroidSurfaceKHR( AndroidSurfaceCreateInfoKHR const & createInfo,
-                                 Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createAndroidSurfaceKHR( VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR const &                       createInfo,
+                                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_win32_surface ===
 
-      // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createWin32SurfaceKHR( Win32SurfaceCreateInfoKHR const &   createInfo,
-                               Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createWin32SurfaceKHR( VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR const &                         createInfo,
+                                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_EXT_debug_report ===
 
-      // wrapper function for command vkCreateDebugReportCallbackEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DebugReportCallbackEXT>::type
-        createDebugReportCallbackEXT( DebugReportCallbackCreateInfoEXT const & createInfo,
-                                      Optional<const AllocationCallbacks>      allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugReportCallbackEXT>::Type
+        createDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT const &                  createInfo,
+                                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-      void debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                  DebugReportObjectTypeEXT objectType,
-                                  uint64_t                 object,
-                                  size_t                   location,
-                                  int32_t                  messageCode,
-                                  const std::string &      layerPrefix,
-                                  const std::string &      message ) const VULKAN_HPP_NOEXCEPT;
+      void debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                  VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                  uint64_t                                       object,
+                                  size_t                                         location,
+                                  int32_t                                        messageCode,
+                                  const std::string &                            layerPrefix,
+                                  const std::string &                            message ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_GGP )
       //=== VK_GGP_stream_descriptor_surface ===
 
-      // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createStreamDescriptorSurfaceGGP( StreamDescriptorSurfaceCreateInfoGGP const & createInfo,
-                                          Optional<const AllocationCallbacks>          allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createStreamDescriptorSurfaceGGP( VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP const &              createInfo,
+                                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_GGP*/
 
 #  if defined( VK_USE_PLATFORM_VI_NN )
       //=== VK_NN_vi_surface ===
 
-      // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createViSurfaceNN( ViSurfaceCreateInfoNN const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createViSurfaceNN( VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_VI_NN*/
 
       //=== VK_KHR_device_group_creation ===
 
-      // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceGroupProperties>>::type enumeratePhysicalDeviceGroupsKHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> enumeratePhysicalDeviceGroupsKHR() const;
 
 #  if defined( VK_USE_PLATFORM_IOS_MVK )
       //=== VK_MVK_ios_surface ===
 
-      // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createIOSSurfaceMVK( IOSSurfaceCreateInfoMVK const &     createInfo,
-                             Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createIOSSurfaceMVK( VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK const &                           createInfo,
+                                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_IOS_MVK*/
 
 #  if defined( VK_USE_PLATFORM_MACOS_MVK )
       //=== VK_MVK_macos_surface ===
 
-      // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createMacOSSurfaceMVK( MacOSSurfaceCreateInfoMVK const &   createInfo,
-                               Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createMacOSSurfaceMVK( VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK const &                         createInfo,
+                                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
       //=== VK_EXT_debug_utils ===
 
-      // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DebugUtilsMessengerEXT>::type
-        createDebugUtilsMessengerEXT( DebugUtilsMessengerCreateInfoEXT const & createInfo,
-                                      Optional<const AllocationCallbacks>      allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugUtilsMessengerEXT>::Type
+        createDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT const &                  createInfo,
+                                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkSubmitDebugUtilsMessageEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-      void submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                       DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                       const DebugUtilsMessengerCallbackDataEXT & callbackData ) const VULKAN_HPP_NOEXCEPT;
+      void submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                       VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                       const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT & callbackData ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_imagepipe_surface ===
 
-      // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createImagePipeSurfaceFUCHSIA( ImagePipeSurfaceCreateInfoFUCHSIA const & createInfo,
-                                       Optional<const AllocationCallbacks>       allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createImagePipeSurfaceFUCHSIA( VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA const &                 createInfo,
+                                                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
       //=== VK_EXT_metal_surface ===
 
-      // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createMetalSurfaceEXT( MetalSurfaceCreateInfoEXT const &   createInfo,
-                               Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createMetalSurfaceEXT( VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT const &                         createInfo,
+                                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
       //=== VK_EXT_headless_surface ===
 
-      // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createHeadlessSurfaceEXT( HeadlessSurfaceCreateInfoEXT const & createInfo,
-                                  Optional<const AllocationCallbacks>  allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createHeadlessSurfaceEXT( VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT const &                      createInfo,
+                                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
       //=== VK_EXT_directfb_surface ===
 
-      // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createDirectFBSurfaceEXT( DirectFBSurfaceCreateInfoEXT const & createInfo,
-                                  Optional<const AllocationCallbacks>  allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createDirectFBSurfaceEXT( VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT const &                      createInfo,
+                                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
       //=== VK_QNX_screen_surface ===
 
-      // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createScreenSurfaceQNX( ScreenSurfaceCreateInfoQNX const &  createInfo,
-                                Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                           createScreenSurfaceQNX( VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX const &                        createInfo,
+                                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_surface ===
-
-      // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceKHR>::type
-        createSurfaceOHOS( SurfaceCreateInfoOHOS const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
     private:
-      VULKAN_HPP_NAMESPACE::Instance              m_instance  = {};
-      const AllocationCallbacks *                 m_allocator = {};
-      std::unique_ptr<detail::InstanceDispatcher> m_dispatcher;
+      VULKAN_HPP_NAMESPACE::Instance                                                       m_instance  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                                    m_allocator = {};
+      std::unique_ptr<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher> m_dispatcher;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Instance>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkPhysicalDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevice.html
     class PhysicalDevice
     {
     public:
       using CType   = VkPhysicalDevice;
       using CppType = VULKAN_HPP_NAMESPACE::PhysicalDevice;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePhysicalDevice;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePhysicalDevice;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePhysicalDevice;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePhysicalDevice;
 
     public:
-      PhysicalDevice( Instance const & instance, VkPhysicalDevice physicalDevice )
+      PhysicalDevice( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const & instance, VkPhysicalDevice physicalDevice )
         : m_physicalDevice( physicalDevice ), m_dispatcher( instance.getDispatcher() )
       {
       }
@@ -3546,8 +3096,8 @@ namespace VULKAN_HPP_NAMESPACE
       PhysicalDevice( PhysicalDevice const & rhs ) : m_physicalDevice( rhs.m_physicalDevice ), m_dispatcher( rhs.m_dispatcher ) {}
 
       PhysicalDevice( PhysicalDevice && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_physicalDevice( exchange( rhs.m_physicalDevice, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_physicalDevice( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_physicalDevice, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -3568,16 +3118,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::PhysicalDevice const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::PhysicalDevice const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_physicalDevice;
       }
 
-      VULKAN_HPP_NAMESPACE::PhysicalDevice const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_physicalDevice );
-      }
-
       operator VULKAN_HPP_NAMESPACE::PhysicalDevice() const VULKAN_HPP_NOEXCEPT
       {
         return m_physicalDevice;
@@ -3592,16 +3137,16 @@ namespace VULKAN_HPP_NAMESPACE
       VULKAN_HPP_NAMESPACE::PhysicalDevice release()
       {
         m_dispatcher = nullptr;
-        return exchange( m_physicalDevice, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_physicalDevice, nullptr );
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( PhysicalDevice & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_physicalDevice, rhs.m_physicalDevice );
         std::swap( m_dispatcher, rhs.m_dispatcher );
@@ -3609,587 +3154,357 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetPhysicalDeviceFeatures, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceFeatures getFeatures() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures getFeatures() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-      VULKAN_HPP_NODISCARD FormatProperties getFormatProperties( Format format ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties getFormatProperties( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties>::type getImageFormatProperties(
-        Format format, ImageType type, ImageTiling tiling, ImageUsageFlags usage, ImageCreateFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageFormatProperties
+                           getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format                 format,
+                                                     VULKAN_HPP_NAMESPACE::ImageType              type,
+                                                     VULKAN_HPP_NAMESPACE::ImageTiling            tiling,
+                                                     VULKAN_HPP_NAMESPACE::ImageUsageFlags        usage,
+                                                     VULKAN_HPP_NAMESPACE::ImageCreateFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceProperties getProperties() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties getProperties() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-      VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties> getQueueFamilyProperties() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties> getQueueFamilyProperties() const;
 
-      // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties getMemoryProperties() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties getMemoryProperties() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Device>::type
-        createDevice( DeviceCreateInfo const &            createInfo,
-                      Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device>::Type
+                           createDevice( VULKAN_HPP_NAMESPACE::DeviceCreateInfo const &                                  createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ExtensionProperties>>::type
-        enumerateDeviceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties>
+                           enumerateDeviceExtensionProperties( Optional<const std::string> layerName VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkEnumerateDeviceLayerProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<LayerProperties>>::type enumerateDeviceLayerProperties() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> enumerateDeviceLayerProperties() const;
 
-      // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties>
-        getSparseImageFormatProperties( Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>
+                           getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                           VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                           VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                           VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                           VULKAN_HPP_NAMESPACE::ImageTiling         tiling ) const;
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceFeatures2 getFeatures2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 getFeatures2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFeatures2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getFeatures2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceProperties2 getProperties2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 getProperties2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getProperties2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getProperties2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-      VULKAN_HPP_NODISCARD FormatProperties2 getFormatProperties2( Format format ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties2 getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFormatProperties2( Format format ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-      VULKAN_HPP_NODISCARD Result getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                             ImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageFormatProperties2
+                           getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties2>::type
-        getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-      VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2> getQueueFamilyProperties2() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> getQueueFamilyProperties2() const;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
       template <typename StructureChain>
       VULKAN_HPP_NODISCARD std::vector<StructureChain> getQueueFamilyProperties2() const;
 
-      // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties2 getMemoryProperties2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 getMemoryProperties2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getMemoryProperties2() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getMemoryProperties2() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2>
-                           getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>
+                           getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-      VULKAN_HPP_NODISCARD ExternalBufferProperties
-        getExternalBufferProperties( const PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+        getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-      VULKAN_HPP_NODISCARD ExternalFenceProperties
-        getExternalFenceProperties( const PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+        getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-      VULKAN_HPP_NODISCARD ExternalSemaphoreProperties
-        getExternalSemaphoreProperties( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+        getExternalSemaphoreProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_3 ===
 
-      // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties>>::type getToolProperties() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> getToolProperties() const;
 
       //=== VK_KHR_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Bool32>::type getSurfaceSupportKHR( uint32_t                         queueFamilyIndex,
-                                                                                        VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 getSurfaceSupportKHR( uint32_t queueFamilyIndex, VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilitiesKHR>::type getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormatKHR>>::type
-        getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>
+                           getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR>>::type
-        getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR>
+                           getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_KHR_swapchain ===
 
-      // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Rect2D>>::type getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::Rect2D> getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
 
       //=== VK_KHR_display ===
 
-      // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPropertiesKHR>>::type getDisplayPropertiesKHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR> getDisplayPropertiesKHR() const;
 
-      // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlanePropertiesKHR>>::type getDisplayPlanePropertiesKHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR> getDisplayPlanePropertiesKHR() const;
 
-      // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayKHR>>::type getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>>::Type
+        getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex ) const;
 
 #  if defined( VK_USE_PLATFORM_XLIB_KHR )
       //=== VK_KHR_xlib_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-      VULKAN_HPP_NODISCARD Bool32 getXlibPresentationSupportKHR( uint32_t queueFamilyIndex, Display & dpy, VisualID visualID ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32
+                           getXlibPresentationSupportKHR( uint32_t queueFamilyIndex, Display & dpy, VisualID visualID ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
       //=== VK_KHR_xcb_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-      VULKAN_HPP_NODISCARD Bool32 getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
-                                                                xcb_connection_t & connection,
-                                                                xcb_visualid_t     visual_id ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32
+        getXcbPresentationSupportKHR( uint32_t queueFamilyIndex, xcb_connection_t & connection, xcb_visualid_t visual_id ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
       //=== VK_KHR_wayland_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-      VULKAN_HPP_NODISCARD Bool32 getWaylandPresentationSupportKHR( uint32_t queueFamilyIndex, struct wl_display & display ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
+                                                                                          struct wl_display & display ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_win32_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceWin32PresentationSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWin32PresentationSupportKHR.html
-      VULKAN_HPP_NODISCARD Bool32 getWin32PresentationSupportKHR( uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 getWin32PresentationSupportKHR( uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_video_queue ===
 
-      // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-      VULKAN_HPP_NODISCARD Result getVideoCapabilitiesKHR( const VideoProfileInfoKHR * pVideoProfile,
-                                                           VideoCapabilitiesKHR *      pCapabilities ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR
+                           getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<VideoCapabilitiesKHR>::type getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoFormatPropertiesKHR>>::type
-        getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-      template <typename StructureChain>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain>>::type
-        getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>
+                           getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const;
 
       //=== VK_NV_external_memory_capabilities ===
 
-      // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ExternalImageFormatPropertiesNV>::type
-        getExternalImageFormatPropertiesNV( Format                                             format,
-                                            ImageType                                          type,
-                                            ImageTiling                                        tiling,
-                                            ImageUsageFlags                                    usage,
-                                            ImageCreateFlags flags                             VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                            ExternalMemoryHandleTypeFlagsNV externalHandleType VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV getExternalImageFormatPropertiesNV(
+        VULKAN_HPP_NAMESPACE::Format                                             format,
+        VULKAN_HPP_NAMESPACE::ImageType                                          type,
+        VULKAN_HPP_NAMESPACE::ImageTiling                                        tiling,
+        VULKAN_HPP_NAMESPACE::ImageUsageFlags                                    usage,
+        VULKAN_HPP_NAMESPACE::ImageCreateFlags flags                             VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+        VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV externalHandleType VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_KHR_get_physical_device_properties2 ===
 
-      // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceFeatures2 getFeatures2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 getFeatures2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFeatures2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getFeatures2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceProperties2 getProperties2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 getProperties2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getProperties2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getProperties2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-      VULKAN_HPP_NODISCARD FormatProperties2 getFormatProperties2KHR( Format format ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::FormatProperties2 getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getFormatProperties2KHR( Format format ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-      VULKAN_HPP_NODISCARD Result getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo,
-                                                                ImageFormatProperties2 *               pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageFormatProperties2
+                           getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageFormatProperties2>::type
-        getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-      VULKAN_HPP_NODISCARD std::vector<QueueFamilyProperties2> getQueueFamilyProperties2KHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> getQueueFamilyProperties2KHR() const;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
       template <typename StructureChain>
       VULKAN_HPP_NODISCARD std::vector<StructureChain> getQueueFamilyProperties2KHR() const;
 
-      // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-      VULKAN_HPP_NODISCARD PhysicalDeviceMemoryProperties2 getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageFormatProperties2>
-                           getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>
+                           getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const;
 
       //=== VK_KHR_external_memory_capabilities ===
 
-      // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-      VULKAN_HPP_NODISCARD ExternalBufferProperties
-        getExternalBufferPropertiesKHR( const PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+        getExternalBufferPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_external_semaphore_capabilities ===
 
-      // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-      VULKAN_HPP_NODISCARD ExternalSemaphoreProperties
-        getExternalSemaphorePropertiesKHR( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties
+        getExternalSemaphorePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
       //=== VK_EXT_acquire_xlib_display ===
 
-      // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-      typename ResultValueType<void>::type acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const;
+      void acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const;
 
-      // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type
-        getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                           getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
       //=== VK_EXT_display_surface_counter ===
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilities2EXT>::type getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
 
       //=== VK_KHR_external_fence_capabilities ===
 
-      // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-      VULKAN_HPP_NODISCARD ExternalFenceProperties
-        getExternalFencePropertiesKHR( const PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+        getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_performance_query ===
 
-      // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR>, std::vector<PerformanceCounterDescriptionKHR>>>::type
+      VULKAN_HPP_NODISCARD
+        std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>, std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>>
         enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t queueFamilyIndex ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-      VULKAN_HPP_NODISCARD uint32_t
-        getQueueFamilyPerformanceQueryPassesKHR( const QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD uint32_t getQueueFamilyPerformanceQueryPassesKHR(
+        const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_get_surface_capabilities2 ===
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-      VULKAN_HPP_NODISCARD Result getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo,
-                                                              SurfaceCapabilities2KHR *             pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR
+                           getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SurfaceCapabilities2KHR>::type
-        getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SurfaceFormat2KHR>>::type
-        getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>
+                           getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
       template <typename StructureChain>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain>>::type
-        getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<StructureChain> getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 
       //=== VK_KHR_get_display_properties2 ===
 
-      // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayProperties2KHR>>::type getDisplayProperties2KHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR> getDisplayProperties2KHR() const;
 
-      // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayPlaneProperties2KHR>>::type getDisplayPlaneProperties2KHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR> getDisplayPlaneProperties2KHR() const;
 
-      // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayPlaneCapabilities2KHR>::type
-        getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR & displayPlaneInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR
+                           getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR & displayPlaneInfo ) const;
 
       //=== VK_EXT_sample_locations ===
 
-      // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-      VULKAN_HPP_NODISCARD MultisamplePropertiesEXT getMultisamplePropertiesEXT( SampleCountFlagBits samples ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT
+                           getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_calibrated_timestamps ===
 
-      // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR>>::type getCalibrateableTimeDomainsEXT() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> getCalibrateableTimeDomainsEXT() const;
 
       //=== VK_KHR_fragment_shading_rate ===
 
-      // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR>>::type getFragmentShadingRatesKHR() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR> getFragmentShadingRatesKHR() const;
 
       //=== VK_EXT_tooling_info ===
 
-      // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PhysicalDeviceToolProperties>>::type getToolPropertiesEXT() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> getToolPropertiesEXT() const;
 
       //=== VK_NV_cooperative_matrix ===
 
-      // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV>>::type getCooperativeMatrixPropertiesNV() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV> getCooperativeMatrixPropertiesNV() const;
 
       //=== VK_NV_coverage_reduction_mode ===
 
-      // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV>>::type
-        getSupportedFramebufferMixedSamplesCombinationsNV() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV> getSupportedFramebufferMixedSamplesCombinationsNV() const;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_EXT_full_screen_exclusive ===
 
-      // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PresentModeKHR>>::type
-        getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR>
+                           getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_EXT_acquire_drm_display ===
 
-      // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-      typename ResultValueType<void>::type acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const;
+      void acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const;
 
-      // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type getDrmDisplayEXT( int32_t  drmFd,
-                                                                                        uint32_t connectorId ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                           getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_video_encode_queue ===
 
-      // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-      VULKAN_HPP_NODISCARD Result
-        getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
-                                                 VideoEncodeQualityLevelPropertiesKHR *               pQualityLevelProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR
+        getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const;
 
-      // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<VideoEncodeQualityLevelPropertiesKHR>::type
-        getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+        getVideoEncodeQualityLevelPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_NV_acquire_winrt_display ===
 
-      // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayKHR>::type
-        getWinrtDisplayNV( uint32_t deviceRelativeId ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                           getWinrtDisplayNV( uint32_t deviceRelativeId ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
       //=== VK_EXT_directfb_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-      VULKAN_HPP_NODISCARD Bool32 getDirectFBPresentationSupportEXT( uint32_t queueFamilyIndex, IDirectFB & dfb ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 getDirectFBPresentationSupportEXT( uint32_t    queueFamilyIndex,
+                                                                                           IDirectFB & dfb ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
       //=== VK_QNX_screen_surface ===
 
-      // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-      VULKAN_HPP_NODISCARD Bool32 getScreenPresentationSupportQNX( uint32_t queueFamilyIndex, struct _screen_window & window ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Bool32 getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
+                                                                                         struct _screen_window & window ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-      //=== VK_ARM_tensors ===
-
-      // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-      VULKAN_HPP_NODISCARD ExternalTensorPropertiesARM
-        getExternalTensorPropertiesARM( const PhysicalDeviceExternalTensorInfoARM & externalTensorInfo ) const VULKAN_HPP_NOEXCEPT;
-
       //=== VK_NV_optical_flow ===
 
-      // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV>>::type
-        getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo ) const;
-
-      //=== VK_NV_cooperative_vector ===
-
-      // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeVectorPropertiesNV>>::type getCooperativeVectorPropertiesNV() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>
+                           getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo ) const;
 
       //=== VK_KHR_cooperative_matrix ===
 
-      // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR>>::type getCooperativeMatrixPropertiesKHR() const;
-
-      //=== VK_ARM_data_graph ===
-
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM>>::type
-        getQueueFamilyDataGraphPropertiesARM( uint32_t queueFamilyIndex ) const;
-
-      // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-      VULKAN_HPP_NODISCARD QueueFamilyDataGraphProcessingEnginePropertiesARM getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-        const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & queueFamilyDataGraphProcessingEngineInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR> getCooperativeMatrixPropertiesKHR() const;
 
       //=== VK_KHR_calibrated_timestamps ===
 
-      // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TimeDomainKHR>>::type getCalibrateableTimeDomainsKHR() const;
-
-      //=== VK_NV_cooperative_matrix2 ===
-
-      // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV>>::type
-        getCooperativeMatrixFlexibleDimensionsPropertiesNV() const;
-
-      //=== VK_ARM_performance_counters_by_region ===
-
-      // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<PerformanceCounterARM>, std::vector<PerformanceCounterDescriptionARM>>>::type
-        enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t queueFamilyIndex ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> getCalibrateableTimeDomainsKHR() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::PhysicalDevice m_physicalDevice = {};
-      detail::InstanceDispatcher const *   m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::PhysicalDevice                                        m_physicalDevice = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<PhysicalDevice>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class PhysicalDevices : public std::vector<PhysicalDevice>
+    class PhysicalDevices : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PhysicalDevices( Instance const & instance )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      PhysicalDevices( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const & instance )
       {
         *this = instance.enumeratePhysicalDevices();
       }
@@ -4204,34 +3519,39 @@ namespace VULKAN_HPP_NAMESPACE
       PhysicalDevices & operator=( PhysicalDevices && rhs )  = default;
 
     private:
-      PhysicalDevices( std::vector<PhysicalDevice> && rhs )
+      PhysicalDevices( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDevice.html
     class Device
     {
     public:
       using CType   = VkDevice;
       using CppType = VULKAN_HPP_NAMESPACE::Device;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDevice;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDevice;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDevice;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDevice;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Device( PhysicalDevice const & physicalDevice, DeviceCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const &         physicalDevice,
+              VULKAN_HPP_NAMESPACE::DeviceCreateInfo const &                                  createInfo,
+              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = physicalDevice.createDevice( createInfo, allocator );
       }
 #  endif
 
-      Device( PhysicalDevice const & physicalDevice, VkDevice device, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+      Device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const &         physicalDevice,
+              VkDevice                                                                        device,
+              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device ), m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
       {
-        m_dispatcher.reset( new detail::DeviceDispatcher( physicalDevice.getDispatcher()->vkGetDeviceProcAddr, static_cast<VkDevice>( m_device ) ) );
+        m_dispatcher.reset( new VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher( physicalDevice.getDispatcher()->vkGetDeviceProcAddr,
+                                                                                                   static_cast<VkDevice>( m_device ) ) );
       }
 
       Device( std::nullptr_t ) {}
@@ -4245,8 +3565,8 @@ namespace VULKAN_HPP_NAMESPACE
       Device( Device const & ) = delete;
 
       Device( Device && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
         , m_dispatcher( rhs.m_dispatcher.release() )
       {
       }
@@ -4264,16 +3584,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Device const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Device const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_device;
       }
 
-      VULKAN_HPP_NAMESPACE::Device const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_device );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Device() const VULKAN_HPP_NOEXCEPT
       {
         return m_device;
@@ -4294,16 +3609,16 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_device, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_device, nullptr );
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return &*m_dispatcher;
       }
 
-      void swap( Device & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_allocator, rhs.m_allocator );
@@ -4312,1493 +3627,997 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-      VULKAN_HPP_NODISCARD PFN_VoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD PFN_vkVoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-      VULKAN_HPP_NODISCARD Queue getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue>::Type
+                           getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-      typename ResultValueType<void>::type waitIdle() const;
+      void waitIdle() const;
 
-      // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DeviceMemory>::type
-        allocateMemory( MemoryAllocateInfo const &          allocateInfo,
-                        Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceMemory>::Type
+        allocateMemory( VULKAN_HPP_NAMESPACE::MemoryAllocateInfo const &                                allocateInfo,
+                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-      typename ResultValueType<void>::type flushMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges ) const;
+      void flushMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges ) const;
 
-      // wrapper function for command vkInvalidateMappedMemoryRanges, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-      typename ResultValueType<void>::type invalidateMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges ) const;
+      void invalidateMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges ) const;
 
-      // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-        createFence( FenceCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                           createFence( VULKAN_HPP_NAMESPACE::FenceCreateInfo const &                                   createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-      typename ResultValueType<void>::type resetFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences ) const;
+      void resetFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences ) const;
 
-      // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-      VULKAN_HPP_NODISCARD Result waitForFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences, Bool32 waitAll, uint64_t timeout ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitForFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences,
+                                                                       VULKAN_HPP_NAMESPACE::Bool32                                                waitAll,
+                                                                       uint64_t timeout ) const;
 
-      // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Semaphore>::type
-        createSemaphore( SemaphoreCreateInfo const &         createInfo,
-                         Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Semaphore>::Type
+                           createSemaphore( VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo const &                               createInfo,
+                                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<QueryPool>::type
-        createQueryPool( QueryPoolCreateInfo const &         createInfo,
-                         Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Event>::Type
+                           createEvent( VULKAN_HPP_NAMESPACE::EventCreateInfo const &                                   createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Buffer>::type
-        createBuffer( BufferCreateInfo const &            createInfo,
-                      Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::QueryPool>::Type
+                           createQueryPool( VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo const &                               createInfo,
+                                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Image>::type
-        createImage( ImageCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Buffer>::Type
+                           createBuffer( VULKAN_HPP_NAMESPACE::BufferCreateInfo const &                                  createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageView>::type
-        createImageView( ImageViewCreateInfo const &         createInfo,
-                         Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferView>::Type
+                           createBufferView( VULKAN_HPP_NAMESPACE::BufferViewCreateInfo const &                              createInfo,
+                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<CommandPool>::type
-        createCommandPool( CommandPoolCreateInfo const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Image>::Type
+                           createImage( VULKAN_HPP_NAMESPACE::ImageCreateInfo const &                                   createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<CommandBuffer>>::type
-        allocateCommandBuffers( CommandBufferAllocateInfo const & allocateInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ImageView>::Type
+                           createImageView( VULKAN_HPP_NAMESPACE::ImageViewCreateInfo const &                               createInfo,
+                                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Event>::type
-        createEvent( EventCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderModule>::Type
+        createShaderModule( VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo const &                            createInfo,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<BufferView>::type
-        createBufferView( BufferViewCreateInfo const &        createInfo,
-                          Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache>::Type
+        createPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo const &                           createInfo,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ShaderModule>::type
-        createShaderModule( ShaderModuleCreateInfo const &      createInfo,
-                            Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+        createGraphicsPipelines( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const &                   createInfos,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const;
 
-      // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PipelineCache>::type
-        createPipelineCache( PipelineCacheCreateInfo const &     createInfo,
-                             Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+        createGraphicsPipeline( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo const &                                                     createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createComputePipelines( Optional<const PipelineCache> const &         pipelineCache,
-                                ArrayProxy<ComputePipelineCreateInfo> const & createInfos,
-                                Optional<const AllocationCallbacks>           allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+        createComputePipelines( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const &                    createInfos,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createComputePipeline( Optional<const PipelineCache> const & pipelineCache,
-                               ComputePipelineCreateInfo const &     createInfo,
-                               Optional<const AllocationCallbacks>   allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+        createComputePipeline( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                               VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo const &                                                      createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PipelineLayout>::type
-        createPipelineLayout( PipelineLayoutCreateInfo const &    createInfo,
-                              Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineLayout>::Type
+        createPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo const &                          createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Sampler>::type
-        createSampler( SamplerCreateInfo const &           createInfo,
-                       Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Sampler>::Type
+                           createSampler( VULKAN_HPP_NAMESPACE::SamplerCreateInfo const &                                 createInfo,
+                                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateDescriptorSetLayout, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorSetLayout>::type
-        createDescriptorSetLayout( DescriptorSetLayoutCreateInfo const & createInfo,
-                                   Optional<const AllocationCallbacks>   allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSetLayout>::Type
+        createDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo const &                     createInfo,
+                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorPool>::type
-        createDescriptorPool( DescriptorPoolCreateInfo const &    createInfo,
-                              Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorPool>::Type
+        createDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo const &                          createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DescriptorSet>>::type
-        allocateDescriptorSets( DescriptorSetAllocateInfo const & allocateInfo ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet>>::Type
+        allocateDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo const & allocateInfo ) const;
 
-      // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-      void updateDescriptorSets( ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                                 ArrayProxy<const CopyDescriptorSet> const &  descriptorCopies ) const VULKAN_HPP_NOEXCEPT;
+      void updateDescriptorSets( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CopyDescriptorSet> const &  descriptorCopies ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createGraphicsPipelines( Optional<const PipelineCache> const &          pipelineCache,
-                                 ArrayProxy<GraphicsPipelineCreateInfo> const & createInfos,
-                                 Optional<const AllocationCallbacks>            allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Framebuffer>::Type
+                           createFramebuffer( VULKAN_HPP_NAMESPACE::FramebufferCreateInfo const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createGraphicsPipeline( Optional<const PipelineCache> const & pipelineCache,
-                                GraphicsPipelineCreateInfo const &    createInfo,
-                                Optional<const AllocationCallbacks>   allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                           createRenderPass( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo const &                              createInfo,
+                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Framebuffer>::type
-        createFramebuffer( FramebufferCreateInfo const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandPool>::Type
+                           createCommandPool( VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-        createRenderPass( RenderPassCreateInfo const &        createInfo,
-                          Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer>>::Type
+        allocateCommandBuffers( VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo const & allocateInfo ) const;
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-      typename ResultValueType<void>::type bindBufferMemory2( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos ) const;
+      void bindBufferMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos ) const;
 
-      // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-      typename ResultValueType<void>::type bindImageMemory2( ArrayProxy<const BindImageMemoryInfo> const & bindInfos ) const;
+      void bindImageMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos ) const;
 
-      // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-      VULKAN_HPP_NODISCARD PeerMemoryFeatureFlags getGroupPeerMemoryFeatures( uint32_t heapIndex,
-                                                                              uint32_t localDeviceIndex,
-                                                                              uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+                           getGroupPeerMemoryFeatures( uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageMemoryRequirements2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageMemoryRequirements2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferMemoryRequirements2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferMemoryRequirements2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2>
-                           getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                           getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info ) const;
 
-      // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-      VULKAN_HPP_NODISCARD Queue getQueue2( DeviceQueueInfo2 const & queueInfo ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue>::Type
+                           getQueue2( VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 const & queueInfo ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorUpdateTemplate>::type
-        createDescriptorUpdateTemplate( DescriptorUpdateTemplateCreateInfo const & createInfo,
-                                        Optional<const AllocationCallbacks>        allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion>::Type
+        createSamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const &                  createInfo,
+                                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-      VULKAN_HPP_NODISCARD DescriptorSetLayoutSupport
-        getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate>::Type
+        createDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const &                createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
+
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                           getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCreateSamplerYcbcrConversion, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SamplerYcbcrConversion>::type
-        createSamplerYcbcrConversion( SamplerYcbcrConversionCreateInfo const & createInfo,
-                                      Optional<const AllocationCallbacks>      allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_2 ===
 
-      // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-      VULKAN_HPP_NODISCARD Result waitSemaphores( const SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                           createRenderPass2( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-      typename ResultValueType<void>::type signalSemaphore( const SemaphoreSignalInfo & signalInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const;
 
-      // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-      VULKAN_HPP_NODISCARD DeviceAddress getBufferAddress( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      void signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const;
 
-      // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-      VULKAN_HPP_NODISCARD uint64_t getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceAddress
+                           getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-      VULKAN_HPP_NODISCARD uint64_t getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD uint64_t getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-        createRenderPass2( RenderPassCreateInfo2 const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD uint64_t
+        getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_3 ===
 
-      // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PrivateDataSlot>::type
-        createPrivateDataSlot( PrivateDataSlotCreateInfo const &   createInfo,
-                               Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot>::Type
+        createPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const &                         createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-      typename ResultValueType<void>::type
-        setPrivateData( ObjectType objectType, uint64_t objectHandle, VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot, uint64_t data ) const;
+      void setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                           uint64_t                              objectHandle,
+                           VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                           uint64_t                              data ) const;
 
-      // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-      VULKAN_HPP_NODISCARD uint64_t getPrivateData( ObjectType                            objectType,
+      VULKAN_HPP_NODISCARD uint64_t getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
                                                     uint64_t                              objectHandle,
                                                     VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageMemoryRequirements( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2> getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements & info ) const;
-
-      //=== VK_VERSION_1_4 ===
-
-      // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory2( const MemoryMapInfo & memoryMapInfo ) const;
-
-      // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-      typename ResultValueType<void>::type unmapMemory2( const MemoryUnmapInfo & memoryUnmapInfo ) const;
-
-      // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-      VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayout( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageSubresourceLayout( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-      typename ResultValueType<void>::type copyMemoryToImage( const CopyMemoryToImageInfo & copyMemoryToImageInfo ) const;
-
-      // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-      typename ResultValueType<void>::type copyImageToMemory( const CopyImageToMemoryInfo & copyImageToMemoryInfo ) const;
-
-      // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-      typename ResultValueType<void>::type copyImageToImage( const CopyImageToImageInfo & copyImageToImageInfo ) const;
-
-      // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-      typename ResultValueType<void>::type transitionImageLayout( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions ) const;
-
-      // wrapper function for command vkGetRenderingAreaGranularity, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-      VULKAN_HPP_NODISCARD Extent2D getRenderingAreaGranularity( const RenderingAreaInfo & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                           getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const;
 
       //=== VK_KHR_swapchain ===
 
-      // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SwapchainKHR>::type
-        createSwapchainKHR( SwapchainCreateInfoKHR const &      createInfo,
-                            Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>::Type
+        createSwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const &                            createInfo,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentCapabilitiesKHR>::type getGroupPresentCapabilitiesKHR() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR getGroupPresentCapabilitiesKHR() const;
 
-      // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-        getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR
+                           getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const;
 
-      // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-      VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImage2KHR( const AcquireNextImageInfoKHR & acquireInfo ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, uint32_t>
+                           acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR & acquireInfo ) const;
 
       //=== VK_KHR_display_swapchain ===
 
-      // wrapper function for command vkCreateSharedSwapchainsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<SwapchainKHR>>::type
-        createSharedSwapchainsKHR( ArrayProxy<SwapchainCreateInfoKHR> const & createInfos, Optional<const AllocationCallbacks> allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>>::Type
+        createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateSharedSwapchainsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SwapchainKHR>::type
-        createSharedSwapchainKHR( SwapchainCreateInfoKHR const &      createInfo,
-                                  Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>::Type
+        createSharedSwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const &                            createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_EXT_debug_marker ===
 
-      // wrapper function for command vkDebugMarkerSetObjectTagEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-      typename ResultValueType<void>::type debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT & tagInfo ) const;
+      void debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT & tagInfo ) const;
 
-      // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-      typename ResultValueType<void>::type debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT & nameInfo ) const;
+      void debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT & nameInfo ) const;
 
       //=== VK_KHR_video_queue ===
 
-      // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<VideoSessionKHR>::type
-        createVideoSessionKHR( VideoSessionCreateInfoKHR const &   createInfo,
-                               Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionKHR>::Type
+        createVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR const &                         createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateVideoSessionParametersKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<VideoSessionParametersKHR>::type
-        createVideoSessionParametersKHR( VideoSessionParametersCreateInfoKHR const & createInfo,
-                                         Optional<const AllocationCallbacks>         allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionParametersKHR>::Type
+        createVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR const &               createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_NVX_binary_import ===
 
-      // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<CuModuleNVX>::type
-        createCuModuleNVX( CuModuleCreateInfoNVX const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuModuleNVX>::Type
+                           createCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<CuFunctionNVX>::type
-        createCuFunctionNVX( CuFunctionCreateInfoNVX const &     createInfo,
-                             Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuFunctionNVX>::Type
+        createCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX const &                           createInfo,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_NVX_image_view_handle ===
 
-      // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-      VULKAN_HPP_NODISCARD uint32_t getImageViewHandleNVX( const ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-      VULKAN_HPP_NODISCARD uint64_t getImageViewHandle64NVX( const ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD uint32_t getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_device_group ===
 
-      // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-      VULKAN_HPP_NODISCARD PeerMemoryFeatureFlags getGroupPeerMemoryFeaturesKHR( uint32_t heapIndex,
-                                                                                 uint32_t localDeviceIndex,
-                                                                                 uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+                           getGroupPeerMemoryFeaturesKHR( uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_memory_win32 ===
 
-      // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
+      VULKAN_HPP_NODISCARD HANDLE getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
 
-      // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<MemoryWin32HandlePropertiesKHR>::type
-        getMemoryWin32HandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR
+                           getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_memory_fd ===
 
-      // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getMemoryFdKHR( const MemoryGetFdInfoKHR & getFdInfo ) const;
+      VULKAN_HPP_NODISCARD int getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR & getFdInfo ) const;
 
-      // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<MemoryFdPropertiesKHR>::type getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType,
-                                                                                                           int                              fd ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR
+                           getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, int fd ) const;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_semaphore_win32 ===
 
-      // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-      typename ResultValueType<void>::type importSemaphoreWin32HandleKHR( const ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo ) const;
+      void importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo ) const;
 
-      // wrapper function for command vkGetSemaphoreWin32HandleKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
+      VULKAN_HPP_NODISCARD HANDLE getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_semaphore_fd ===
 
-      // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-      typename ResultValueType<void>::type importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo ) const;
+      void importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo ) const;
 
-      // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR & getFdInfo ) const;
+      VULKAN_HPP_NODISCARD int getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR & getFdInfo ) const;
 
       //=== VK_KHR_descriptor_update_template ===
 
-      // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DescriptorUpdateTemplate>::type
-        createDescriptorUpdateTemplateKHR( DescriptorUpdateTemplateCreateInfo const & createInfo,
-                                           Optional<const AllocationCallbacks>        allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate>::Type
+        createDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const &                createInfo,
+                                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-      void
-        destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                            Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                               Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator
+                                                 VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_display_control ===
 
-      // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-      typename ResultValueType<void>::type displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display,
-                                                                   const DisplayPowerInfoEXT &      displayPowerInfo ) const;
+      void displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display, const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT & displayPowerInfo ) const;
 
-      // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-        registerEventEXT( DeviceEventInfoEXT const &          deviceEventInfo,
-                          Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                           registerEventEXT( VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT const &                                deviceEventInfo,
+                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Fence>::type
-        registerDisplayEventEXT( DisplayKHR const &                  display,
-                                 DisplayEventInfoEXT const &         displayEventInfo,
-                                 Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                           registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR const &             display,
+                                                    VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT const &                               displayEventInfo,
+                                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_EXT_hdr_metadata ===
 
-      // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-      void setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
-                              ArrayProxy<const HdrMetadataEXT> const &                     metadata ) const;
+      void setHdrMetadataEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const &   swapchains,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const;
 
       //=== VK_KHR_create_renderpass2 ===
 
-      // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<RenderPass>::type
-        createRenderPass2KHR( RenderPassCreateInfo2 const &       createInfo,
-                              Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                           createRenderPass2KHR( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const &                             createInfo,
+                                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_KHR_external_fence_win32 ===
 
-      // wrapper function for command vkImportFenceWin32HandleKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-      typename ResultValueType<void>::type importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo ) const;
+      void importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo ) const;
 
-      // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
+      VULKAN_HPP_NODISCARD HANDLE getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR & getWin32HandleInfo ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_external_fence_fd ===
 
-      // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-      typename ResultValueType<void>::type importFenceFdKHR( const ImportFenceFdInfoKHR & importFenceFdInfo ) const;
+      void importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR & importFenceFdInfo ) const;
 
-      // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<int>::type getFenceFdKHR( const FenceGetFdInfoKHR & getFdInfo ) const;
+      VULKAN_HPP_NODISCARD int getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR & getFdInfo ) const;
 
       //=== VK_KHR_performance_query ===
 
-      // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-      typename ResultValueType<void>::type acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR & info ) const;
+      void acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR & info ) const;
 
-      // wrapper function for command vkReleaseProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseProfilingLockKHR.html
       void releaseProfilingLockKHR() const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_debug_utils ===
 
-      // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-      typename ResultValueType<void>::type setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT & nameInfo ) const;
+      void setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT & nameInfo ) const;
 
-      // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-      template <typename HandleType>
-      typename ResultValueType<void>::type setDebugUtilsObjectNameEXT( HandleType const & handle, std::string const & name ) const;
-
-      // wrapper function for command vkSetDebugUtilsObjectTagEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-      typename ResultValueType<void>::type setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT & tagInfo ) const;
-
-      // wrapper function for command vkSetDebugUtilsObjectTagEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-      template <typename HandleType, typename TagType>
-      typename ResultValueType<void>::type setDebugUtilsObjectTagEXT( HandleType const & handle, uint64_t name, TagType const & tag ) const;
+      void setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT & tagInfo ) const;
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
       //=== VK_ANDROID_external_memory_android_hardware_buffer ===
 
-      // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-      VULKAN_HPP_NODISCARD Result getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer *           buffer,
-                                                                             AndroidHardwareBufferPropertiesANDROID * pProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID
+                           getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const;
 
-      // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<AndroidHardwareBufferPropertiesANDROID>::type
-        getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const;
-
-      // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const;
 
-      // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<struct AHardwareBuffer *>::type
-        getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID & info ) const;
+      VULKAN_HPP_NODISCARD struct AHardwareBuffer *
+        getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID & info ) const;
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_AMDX_shader_enqueue ===
 
-      // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createExecutionGraphPipelinesAMDX( Optional<const PipelineCache> const &                    pipelineCache,
-                                           ArrayProxy<ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                           Optional<const AllocationCallbacks>                      allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+        createExecutionGraphPipelinesAMDX(
+          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+          VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const &         createInfos,
+          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createExecutionGraphPipelineAMDX( Optional<const PipelineCache> const &        pipelineCache,
-                                          ExecutionGraphPipelineCreateInfoAMDX const & createInfo,
-                                          Optional<const AllocationCallbacks>          allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                           createExecutionGraphPipelineAMDX(
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                             VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX const &                                           createInfo,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
       //=== VK_KHR_get_memory_requirements2 ===
 
-      // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2>
-                           getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                           getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info ) const;
 
       //=== VK_KHR_acceleration_structure ===
 
-      // wrapper function for command vkCreateAccelerationStructureKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<AccelerationStructureKHR>::type
-        createAccelerationStructureKHR( AccelerationStructureCreateInfoKHR const & createInfo,
-                                        Optional<const AllocationCallbacks>        allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureKHR>::Type
+        createAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR const &                createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkBuildAccelerationStructuresKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-      VULKAN_HPP_NODISCARD Result
-        buildAccelerationStructuresKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                               deferredOperation,
-                                        ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                        ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result buildAccelerationStructuresKHR(
+        VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                                           deferredOperation,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const;
 
-      // wrapper function for command vkCopyAccelerationStructureKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-      VULKAN_HPP_NODISCARD Result copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                const CopyAccelerationStructureInfoKHR &   info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                           copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                     deferredOperation,
+                                                         const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const;
 
-      // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-      VULKAN_HPP_NODISCARD Result copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR       deferredOperation,
-                                                                        const CopyAccelerationStructureToMemoryInfoKHR & info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                           copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                                 const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info ) const;
 
-      // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-      VULKAN_HPP_NODISCARD Result copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR       deferredOperation,
-                                                                        const CopyMemoryToAccelerationStructureInfoKHR & info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                           copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                                 const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info ) const;
 
-      // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type
-        writeAccelerationStructuresPropertiesKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
-                                                  QueryType                                                                queryType,
-                                                  size_t                                                                   dataSize,
-                                                  size_t                                                                   stride ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType> writeAccelerationStructuresPropertiesKHR(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+        VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+        size_t                                                                                         dataSize,
+        size_t                                                                                         stride ) const;
 
-      // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type writeAccelerationStructuresPropertyKHR(
-        ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures, QueryType queryType, size_t stride ) const;
+      VULKAN_HPP_NODISCARD DataType writeAccelerationStructuresPropertyKHR(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+        VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+        size_t                                                                                         stride ) const;
 
-      // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-      VULKAN_HPP_NODISCARD DeviceAddress getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceAddress
+        getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-      VULKAN_HPP_NODISCARD AccelerationStructureCompatibilityKHR
-        getAccelerationStructureCompatibilityKHR( const AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+        getAccelerationStructureCompatibilityKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-      VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR
-        getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                     buildType,
-                                               const AccelerationStructureBuildGeometryInfoKHR &     buildInfo,
-                                               ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR getAccelerationStructureBuildSizesKHR(
+        VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                     buildType,
+        const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR &     buildInfo,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const & maxPrimitiveCounts VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
       //=== VK_KHR_ray_tracing_pipeline ===
 
-      // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createRayTracingPipelinesKHR( Optional<const DeferredOperationKHR> const &        deferredOperation,
-                                      Optional<const PipelineCache> const &               pipelineCache,
-                                      ArrayProxy<RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                      Optional<const AllocationCallbacks>                 allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+        createRayTracingPipelinesKHR(
+          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+          VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const &                     createInfos,
+          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                     allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createRayTracingPipelineKHR( Optional<const DeferredOperationKHR> const & deferredOperation,
-                                     Optional<const PipelineCache> const &        pipelineCache,
-                                     RayTracingPipelineCreateInfoKHR const &      createInfo,
-                                     Optional<const AllocationCallbacks>          allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                           createRayTracingPipelineKHR(
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+                             VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR const &                                                       createInfo,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_sampler_ycbcr_conversion ===
 
-      // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<SamplerYcbcrConversion>::type
-        createSamplerYcbcrConversionKHR( SamplerYcbcrConversionCreateInfo const & createInfo,
-                                         Optional<const AllocationCallbacks>      allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion>::Type
+        createSamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const &                  createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-      void destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                             Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                             Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator
+                                               VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_bind_memory2 ===
 
-      // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-      typename ResultValueType<void>::type bindBufferMemory2KHR( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos ) const;
+      void bindBufferMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos ) const;
 
-      // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-      typename ResultValueType<void>::type bindImageMemory2KHR( ArrayProxy<const BindImageMemoryInfo> const & bindInfos ) const;
+      void bindImageMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos ) const;
 
       //=== VK_EXT_validation_cache ===
 
-      // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ValidationCacheEXT>::type
-        createValidationCacheEXT( ValidationCacheCreateInfoEXT const & createInfo,
-                                  Optional<const AllocationCallbacks>  allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ValidationCacheEXT>::Type
+        createValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT const &                      createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_NV_ray_tracing ===
 
-      // wrapper function for command vkCreateAccelerationStructureNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<AccelerationStructureNV>::type
-        createAccelerationStructureNV( AccelerationStructureCreateInfoNV const & createInfo,
-                                       Optional<const AllocationCallbacks>       allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureNV>::Type
+        createAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV const &                 createInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2KHR
-        getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR getAccelerationStructureMemoryRequirementsNV(
+        const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getAccelerationStructureMemoryRequirementsNV(
+        const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-      typename ResultValueType<void>::type bindAccelerationStructureMemoryNV( ArrayProxy<const BindAccelerationStructureMemoryInfoNV> const & bindInfos ) const;
+      void bindAccelerationStructureMemoryNV(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV> const & bindInfos ) const;
 
-      // wrapper function for command vkCreateRayTracingPipelinesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createRayTracingPipelinesNV( Optional<const PipelineCache> const &              pipelineCache,
-                                     ArrayProxy<RayTracingPipelineCreateInfoNV> const & createInfos,
-                                     Optional<const AllocationCallbacks>                allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+        createRayTracingPipelinesNV( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const &               createInfos,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateRayTracingPipelinesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createRayTracingPipelineNV( Optional<const PipelineCache> const &  pipelineCache,
-                                    RayTracingPipelineCreateInfoNV const & createInfo,
-                                    Optional<const AllocationCallbacks>    allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+        createRayTracingPipelineNV( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                    VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV const &                                                 createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_maintenance3 ===
 
-      // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-      VULKAN_HPP_NODISCARD DescriptorSetLayoutSupport
-        getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+                           getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_external_memory_host ===
 
-      // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<MemoryHostPointerPropertiesEXT>::type
-        getMemoryHostPointerPropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT
+        getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer ) const;
 
       //=== VK_EXT_calibrated_timestamps ===
 
-      // wrapper function for command vkGetCalibratedTimestampsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t>, uint64_t>>::type
-        getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos ) const;
+      VULKAN_HPP_NODISCARD std::pair<std::vector<uint64_t>, uint64_t>
+        getCalibratedTimestampsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos ) const;
 
-      // wrapper function for command vkGetCalibratedTimestampsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-        getCalibratedTimestampEXT( const CalibratedTimestampInfoKHR & timestampInfo ) const;
+      VULKAN_HPP_NODISCARD std::pair<uint64_t, uint64_t>
+                           getCalibratedTimestampEXT( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo ) const;
 
       //=== VK_KHR_timeline_semaphore ===
 
-      // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-      VULKAN_HPP_NODISCARD Result waitSemaphoresKHR( const SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const;
 
-      // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-      typename ResultValueType<void>::type signalSemaphoreKHR( const SemaphoreSignalInfo & signalInfo ) const;
-
-      //=== VK_EXT_present_timing ===
-
-      // wrapper function for command vkGetPastPresentationTimingEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingEXT.html
-      VULKAN_HPP_NODISCARD Result
-        getPastPresentationTimingEXT( const PastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
-                                      PastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties ) const VULKAN_HPP_NOEXCEPT;
+      void signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const;
 
       //=== VK_INTEL_performance_query ===
 
-      // wrapper function for command vkInitializePerformanceApiINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-      typename ResultValueType<void>::type initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL & initializeInfo ) const;
+      void initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL & initializeInfo ) const;
 
-      // wrapper function for command vkUninitializePerformanceApiINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUninitializePerformanceApiINTEL.html
       void uninitializePerformanceApiINTEL() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PerformanceConfigurationINTEL>::type
-        acquirePerformanceConfigurationINTEL( PerformanceConfigurationAcquireInfoINTEL const & acquireInfo ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PerformanceConfigurationINTEL>::Type
+        acquirePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL const & acquireInfo ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkGetPerformanceParameterINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PerformanceValueINTEL>::type getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PerformanceValueINTEL
+                           getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter ) const;
 
       //=== VK_EXT_buffer_device_address ===
 
-      // wrapper function for command vkGetBufferDeviceAddressEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-      VULKAN_HPP_NODISCARD DeviceAddress getBufferAddressEXT( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceAddress
+                           getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_EXT_full_screen_exclusive ===
 
-      // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-        getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR
+                           getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_KHR_buffer_device_address ===
 
-      // wrapper function for command vkGetBufferDeviceAddressKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-      VULKAN_HPP_NODISCARD DeviceAddress getBufferAddressKHR( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceAddress
+                           getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-      VULKAN_HPP_NODISCARD uint64_t getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD uint64_t getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
-      VULKAN_HPP_NODISCARD uint64_t getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD uint64_t
+        getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_deferred_host_operations ===
 
-      // wrapper function for command vkCreateDeferredOperationKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DeferredOperationKHR>::type
-        createDeferredOperationKHR( Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR>::Type
+        createDeferredOperationKHR( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_pipeline_executable_properties ===
 
-      // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR>>::type
-        getPipelineExecutablePropertiesKHR( const PipelineInfoKHR & pipelineInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>
+                           getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo ) const;
 
-      // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutableStatisticKHR>>::type
-        getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR & executableInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>
+                           getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo ) const;
 
-      // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR>>::type
-        getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR & executableInfo ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>
+                           getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo ) const;
 
       //=== VK_EXT_host_image_copy ===
 
-      // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-      typename ResultValueType<void>::type copyMemoryToImageEXT( const CopyMemoryToImageInfo & copyMemoryToImageInfo ) const;
+      void copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT & copyMemoryToImageInfo ) const;
 
-      // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-      typename ResultValueType<void>::type copyImageToMemoryEXT( const CopyImageToMemoryInfo & copyImageToMemoryInfo ) const;
+      void copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT & copyImageToMemoryInfo ) const;
 
-      // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-      typename ResultValueType<void>::type copyImageToImageEXT( const CopyImageToImageInfo & copyImageToImageInfo ) const;
+      void copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT & copyImageToImageInfo ) const;
 
-      // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-      typename ResultValueType<void>::type transitionImageLayoutEXT( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions ) const;
+      void transitionImageLayoutEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT> const & transitions ) const;
 
       //=== VK_KHR_map_memory2 ===
 
-      // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type mapMemory2KHR( const MemoryMapInfo & memoryMapInfo ) const;
+      VULKAN_HPP_NODISCARD void * mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR & memoryMapInfo ) const;
 
-      // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-      typename ResultValueType<void>::type unmapMemory2KHR( const MemoryUnmapInfo & memoryUnmapInfo ) const;
+      void unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR & memoryUnmapInfo ) const;
 
       //=== VK_EXT_swapchain_maintenance1 ===
 
-      // wrapper function for command vkReleaseSwapchainImagesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-      typename ResultValueType<void>::type releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR & releaseInfo ) const;
+      void releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT & releaseInfo ) const;
 
       //=== VK_NV_device_generated_commands ===
 
-      // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2
-        getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+        getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+        getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<IndirectCommandsLayoutNV>::type
-        createIndirectCommandsLayoutNV( IndirectCommandsLayoutCreateInfoNV const & createInfo,
-                                        Optional<const AllocationCallbacks>        allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutNV>::Type
+        createIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV const &                createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_EXT_private_data ===
 
-      // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PrivateDataSlot>::type
-        createPrivateDataSlotEXT( PrivateDataSlotCreateInfo const &   createInfo,
-                                  Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot>::Type
+        createPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const &                         createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkDestroyPrivateDataSlotEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-      void destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                      Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                      Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator
+                                        VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-      typename ResultValueType<void>::type
-        setPrivateDataEXT( ObjectType objectType, uint64_t objectHandle, VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot, uint64_t data ) const;
+      void setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                              uint64_t                              objectHandle,
+                              VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                              uint64_t                              data ) const;
 
-      // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-      VULKAN_HPP_NODISCARD uint64_t getPrivateDataEXT( ObjectType                            objectType,
+      VULKAN_HPP_NODISCARD uint64_t getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
                                                        uint64_t                              objectHandle,
                                                        VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_video_encode_queue ===
 
-      // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>>>::type
-        getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>>
+        getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const;
 
-      // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t>>>::type
-        getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t>>
+        getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const;
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_NV_cuda_kernel_launch ===
 
-      // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<CudaModuleNV>::type
-        createCudaModuleNV( CudaModuleCreateInfoNV const &      createInfo,
-                            Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaModuleNV>::Type
+        createCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV const &                            createInfo,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<CudaFunctionNV>::type
-        createCudaFunctionNV( CudaFunctionCreateInfoNV const &    createInfo,
-                              Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaFunctionNV>::Type
+        createCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV const &                          createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
       //=== VK_EXT_metal_objects ===
 
-      // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-      void exportMetalObjectsEXT( ExportMetalObjectsInfoEXT & metalObjectsInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT exportMetalObjectsEXT() const VULKAN_HPP_NOEXCEPT;
+
+      template <typename X, typename Y, typename... Z>
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> exportMetalObjectsEXT() const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
       //=== VK_EXT_descriptor_buffer ===
 
-      // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-      void getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo, size_t dataSize, void * pDescriptor ) const VULKAN_HPP_NOEXCEPT;
+      void getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo, size_t dataSize, void * pDescriptor ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
       template <typename DescriptorType>
-      VULKAN_HPP_NODISCARD DescriptorType getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD DescriptorType getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getBufferOpaqueCaptureDescriptorDataEXT( const BufferCaptureDescriptorDataInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD DataType getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT & info ) const;
 
-      // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD DataType getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT & info ) const;
 
-      // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD DataType
+        getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT & info ) const;
 
-      // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getSamplerOpaqueCaptureDescriptorDataEXT( const SamplerCaptureDescriptorDataInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD DataType getSamplerOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT & info ) const;
 
-      // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const AccelerationStructureCaptureDescriptorDataInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD DataType
+        getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT & info ) const;
 
       //=== VK_EXT_device_fault ===
 
-      // wrapper function for command vkGetDeviceFaultInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceFaultInfoEXT.html
-      VULKAN_HPP_NODISCARD Result getFaultInfoEXT( DeviceFaultCountsEXT * pFaultCounts, DeviceFaultInfoEXT * pFaultInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT> getFaultInfoEXT() const;
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_external_memory ===
 
-      // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
-        getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const;
+      VULKAN_HPP_NODISCARD zx_handle_t getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const;
 
-      // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<MemoryZirconHandlePropertiesFUCHSIA>::type
-        getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA
+        getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle ) const;
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_external_semaphore ===
 
-      // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-      typename ResultValueType<void>::type
-        importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo ) const;
+      void importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo ) const;
 
-      // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<zx_handle_t>::type
-        getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const;
+      VULKAN_HPP_NODISCARD zx_handle_t
+        getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const;
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
       //=== VK_FUCHSIA_buffer_collection ===
 
-      // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<BufferCollectionFUCHSIA>::type
-        createBufferCollectionFUCHSIA( BufferCollectionCreateInfoFUCHSIA const & createInfo,
-                                       Optional<const AllocationCallbacks>       allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferCollectionFUCHSIA>::Type
+        createBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA const &                 createInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
       //=== VK_NV_external_memory_rdma ===
 
-      // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<RemoteAddressNV>::type
-        getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::RemoteAddressNV
+                           getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo ) const;
 
       //=== VK_EXT_pipeline_properties ===
 
-      // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<BaseOutStructure>::type getPipelinePropertiesEXT( const PipelineInfoEXT & pipelineInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::BaseOutStructure getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT & pipelineInfo ) const;
 
       //=== VK_EXT_opacity_micromap ===
 
-      // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<MicromapEXT>::type
-        createMicromapEXT( MicromapCreateInfoEXT const &       createInfo,
-                           Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::MicromapEXT>::Type
+                           createMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT const &                             createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
-      // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-      VULKAN_HPP_NODISCARD Result buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR     deferredOperation,
-                                                     ArrayProxy<const MicromapBuildInfoEXT> const & infos ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result
+                           buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                 deferredOperation,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos ) const;
 
-      // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-      VULKAN_HPP_NODISCARD Result copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation, const CopyMicromapInfoEXT & info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR        deferredOperation,
+                                                                         const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info ) const;
 
-      // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-      VULKAN_HPP_NODISCARD Result copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                           const CopyMicromapToMemoryInfoEXT &        info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                                 const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info ) const;
 
-      // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-      VULKAN_HPP_NODISCARD Result copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                           const CopyMemoryToMicromapInfoEXT &        info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                                                                 const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info ) const;
 
-      // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type writeMicromapsPropertiesEXT(
-        ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps, QueryType queryType, size_t dataSize, size_t stride ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType>
+                           writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                                        VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                                        size_t                                                                            dataSize,
+                                                        size_t                                                                            stride ) const;
 
-      // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        writeMicromapsPropertyEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps, QueryType queryType, size_t stride ) const;
+      VULKAN_HPP_NODISCARD DataType writeMicromapsPropertyEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                                               VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                                               size_t                                                                            stride ) const;
 
-      // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-      VULKAN_HPP_NODISCARD AccelerationStructureCompatibilityKHR
-        getMicromapCompatibilityEXT( const MicromapVersionInfoEXT & versionInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+                           getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT & versionInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-      VULKAN_HPP_NODISCARD MicromapBuildSizesInfoEXT getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType,
-                                                                               const MicromapBuildInfoEXT &      buildInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT
+                           getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                                     const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT &      buildInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_maintenance4 ===
 
-      // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+                           getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements2> getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                           getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const;
 
       //=== VK_VALVE_descriptor_set_host_mapping ===
 
-      // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-      VULKAN_HPP_NODISCARD DescriptorSetLayoutHostMappingInfoVALVE
-        getDescriptorSetLayoutHostMappingInfoVALVE( const DescriptorSetBindingReferenceVALVE & bindingReference ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE getDescriptorSetLayoutHostMappingInfoVALVE(
+        const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE & bindingReference ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_device_generated_commands_compute ===
 
-      // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2
-        getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements2
+        getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+        getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-      VULKAN_HPP_NODISCARD DeviceAddress getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_external_memory ===
-
-      // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-      VULKAN_HPP_NODISCARD Result getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer * buffer,
-                                                                 NativeBufferPropertiesOHOS *   pProperties ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<NativeBufferPropertiesOHOS>::type
-        getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer ) const;
-
-      // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer ) const;
-
-      // wrapper function for command vkGetMemoryNativeBufferOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<struct OH_NativeBuffer *>::type
-        getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS & info ) const;
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-      //=== VK_ARM_tensors ===
-
-      // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<TensorARM>::type
-        createTensorARM( TensorCreateInfoARM const &         createInfo,
-                         Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<TensorViewARM>::type
-        createTensorViewARM( TensorViewCreateInfoARM const &     createInfo,
-                             Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-      typename ResultValueType<void>::type bindTensorMemoryARM( ArrayProxy<const BindTensorMemoryInfoARM> const & bindInfos ) const;
-
-      // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2 getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-      template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getTensorOpaqueCaptureDescriptorDataARM( const TensorCaptureDescriptorDataInfoARM & info ) const;
-
-      // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-      template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type
-        getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM & info ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceAddress
+                           getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_shader_module_identifier ===
 
-      // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-      VULKAN_HPP_NODISCARD ShaderModuleIdentifierEXT
-        getShaderModuleCreateInfoIdentifierEXT( const ShaderModuleCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+                           getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_optical_flow ===
 
-      // wrapper function for command vkCreateOpticalFlowSessionNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<OpticalFlowSessionNV>::type
-        createOpticalFlowSessionNV( OpticalFlowSessionCreateInfoNV const & createInfo,
-                                    Optional<const AllocationCallbacks>    allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::OpticalFlowSessionNV>::Type
+        createOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV const &                    createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_maintenance5 ===
 
-      // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-      VULKAN_HPP_NODISCARD Extent2D getRenderingAreaGranularityKHR( const RenderingAreaInfo & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D
+                           getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-      VULKAN_HPP_NODISCARD SubresourceLayout2 getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                           getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_AMD_anti_lag ===
-
-      // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-      void antiLagUpdateAMD( const AntiLagDataAMD & data ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_shader_object ===
 
-      // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<ShaderEXT>>::type
-        createShadersEXT( ArrayProxy<ShaderCreateInfoEXT> const & createInfos, Optional<const AllocationCallbacks> allocator = nullptr ) const;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT>>::Type
+        createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>     allocator = nullptr ) const;
 
-      // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ShaderEXT>::type
-        createShaderEXT( ShaderCreateInfoEXT const &         createInfo,
-                         Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      //=== VK_KHR_pipeline_binary ===
-
-      // wrapper function for command vkCreatePipelineBinariesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<PipelineBinaryKHR>>::type
-        createPipelineBinariesKHR( PipelineBinaryCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr ) const;
-
-      // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<PipelineBinaryKeyKHR>::type
-        getPipelineKeyKHR( Optional<const PipelineCreateInfoKHR> pipelineCreateInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
-
-      // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t>>>::type
-        getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR & info ) const;
-
-      // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-      typename ResultValueType<void>::type
-        releaseCapturedPipelineDataKHR( const ReleaseCapturedPipelineDataInfoKHR &    info,
-                                        Optional<const AllocationCallbacks> allocator VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT>::Type
+                           createShaderEXT( VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT const &                               createInfo,
+                                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const
+        VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_QCOM_tile_properties ===
 
-      // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<TilePropertiesQCOM>::type
-        getDynamicRenderingTilePropertiesQCOM( const RenderingInfo & renderingInfo ) const;
-
-      //=== VK_KHR_swapchain_maintenance1 ===
-
-      // wrapper function for command vkReleaseSwapchainImagesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-      typename ResultValueType<void>::type releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR & releaseInfo ) const;
-
-      //=== VK_NV_cooperative_vector ===
-
-      // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-      VULKAN_HPP_NODISCARD Result convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV & info ) const;
-
-      //=== VK_ARM_data_graph ===
-
-      // wrapper function for command vkCreateDataGraphPipelinesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<Pipeline>>::type
-        createDataGraphPipelinesARM( Optional<const DeferredOperationKHR> const &       deferredOperation,
-                                     Optional<const PipelineCache> const &              pipelineCache,
-                                     ArrayProxy<DataGraphPipelineCreateInfoARM> const & createInfos,
-                                     Optional<const AllocationCallbacks>                allocator = nullptr ) const;
-
-      // wrapper function for command vkCreateDataGraphPipelinesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Pipeline>::type
-        createDataGraphPipelineARM( Optional<const DeferredOperationKHR> const & deferredOperation,
-                                    Optional<const PipelineCache> const &        pipelineCache,
-                                    DataGraphPipelineCreateInfoARM const &       createInfo,
-                                    Optional<const AllocationCallbacks>          allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataGraphPipelineSessionARM>::type
-        createDataGraphPipelineSessionARM( DataGraphPipelineSessionCreateInfoARM const & createInfo,
-                                           Optional<const AllocationCallbacks>           allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM>>::type
-        getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM & info ) const;
-
-      // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2
-        getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-        getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-      typename ResultValueType<void>::type
-        bindDataGraphPipelineSessionMemoryARM( ArrayProxy<const BindDataGraphPipelineSessionMemoryInfoARM> const & bindInfos ) const;
-
-      // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataGraphPipelinePropertyARM>>::type
-        getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM & pipelineInfo ) const;
-
-      // wrapper function for command vkGetDataGraphPipelinePropertiesARM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelinePropertiesARM.html
-      VULKAN_HPP_NODISCARD Result getDataGraphPipelinePropertiesARM( const DataGraphPipelineInfoARM *          pPipelineInfo,
-                                                                     uint32_t                                  propertiesCount,
-                                                                     DataGraphPipelinePropertyQueryResultARM * pProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::TilePropertiesQCOM
+                           getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
       //=== VK_QNX_external_memory_screen_buffer ===
 
-      // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-      VULKAN_HPP_NODISCARD Result getScreenBufferPropertiesQNX( const struct _screen_buffer * buffer,
-                                                                ScreenBufferPropertiesQNX *   pProperties ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const;
 
-      // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ScreenBufferPropertiesQNX>::type getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const;
-
-      // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD typename ResultValueType<StructureChain<X, Y, Z...>>::type
-        getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const;
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
       //=== VK_KHR_calibrated_timestamps ===
 
-      // wrapper function for command vkGetCalibratedTimestampsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<std::vector<uint64_t>, uint64_t>>::type
-        getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos ) const;
+      VULKAN_HPP_NODISCARD std::pair<std::vector<uint64_t>, uint64_t>
+        getCalibratedTimestampsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos ) const;
 
-      // wrapper function for command vkGetCalibratedTimestampsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-        getCalibratedTimestampKHR( const CalibratedTimestampInfoKHR & timestampInfo ) const;
-
-      //=== VK_NV_external_compute_queue ===
-
-      // wrapper function for command vkCreateExternalComputeQueueNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ExternalComputeQueueNV>::type
-        createExternalComputeQueueNV( ExternalComputeQueueCreateInfoNV const & createInfo,
-                                      Optional<const AllocationCallbacks>      allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      //=== VK_NV_cluster_acceleration_structure ===
-
-      // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-      VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR
-        getClusterAccelerationStructureBuildSizesNV( const ClusterAccelerationStructureInputInfoNV & info ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_NV_partitioned_acceleration_structure ===
-
-      // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-      VULKAN_HPP_NODISCARD AccelerationStructureBuildSizesInfoKHR
-        getPartitionedAccelerationStructuresBuildSizesNV( const PartitionedAccelerationStructureInstancesInputNV & info ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_EXT_device_generated_commands ===
-
-      // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-      VULKAN_HPP_NODISCARD MemoryRequirements2
-        getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...>
-                           getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<IndirectCommandsLayoutEXT>::type
-        createIndirectCommandsLayoutEXT( IndirectCommandsLayoutCreateInfoEXT const & createInfo,
-                                         Optional<const AllocationCallbacks>         allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-      // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<IndirectExecutionSetEXT>::type
-        createIndirectExecutionSetEXT( IndirectExecutionSetCreateInfoEXT const & createInfo,
-                                       Optional<const AllocationCallbacks>       allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_native_buffer ===
-
-      // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getSwapchainGrallocUsageOHOS( Format format, ImageUsageFlags imageUsage ) const;
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-      //=== VK_EXT_external_memory_metal ===
-
-      // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT & getMetalHandleInfo ) const;
-
-      // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-      template <typename HandleType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<MemoryMetalHandlePropertiesEXT>::type
-        getMemoryMetalHandlePropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, HandleType const & handle ) const;
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
+      VULKAN_HPP_NODISCARD std::pair<uint64_t, uint64_t>
+                           getCalibratedTimestampKHR( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device              m_device    = {};
-      const AllocationCallbacks *               m_allocator = {};
-      std::unique_ptr<detail::DeviceDispatcher> m_dispatcher;
+      VULKAN_HPP_NAMESPACE::Device                                                       m_device    = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                                  m_allocator = {};
+      std::unique_ptr<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher> m_dispatcher;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Device>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkAccelerationStructureKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureKHR.html
     class AccelerationStructureKHR
     {
     public:
       using CType   = VkAccelerationStructureKHR;
       using CppType = VULKAN_HPP_NAMESPACE::AccelerationStructureKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eAccelerationStructureKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eAccelerationStructureKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureKHR;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      AccelerationStructureKHR( Device const &                             device,
-                                AccelerationStructureCreateInfoKHR const & createInfo,
-                                Optional<const AllocationCallbacks>        allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      AccelerationStructureKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR const &                createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createAccelerationStructureKHR( createInfo, allocator );
       }
 #  endif
 
-      AccelerationStructureKHR( Device const &                      device,
-                                VkAccelerationStructureKHR          accelerationStructure,
-                                Optional<const AllocationCallbacks> allocator = nullptr )
+      AccelerationStructureKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VkAccelerationStructureKHR                                                      accelerationStructure,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_accelerationStructureKHR( accelerationStructure )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_accelerationStructure( accelerationStructure )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -5814,10 +4633,10 @@ namespace VULKAN_HPP_NAMESPACE
       AccelerationStructureKHR( AccelerationStructureKHR const & ) = delete;
 
       AccelerationStructureKHR( AccelerationStructureKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_accelerationStructureKHR( exchange( rhs.m_accelerationStructureKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_accelerationStructure( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_accelerationStructure, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -5828,40 +4647,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_accelerationStructureKHR, rhs.m_accelerationStructureKHR );
+          std::swap( m_accelerationStructure, rhs.m_accelerationStructure );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_accelerationStructureKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_accelerationStructureKHR );
+        return m_accelerationStructure;
       }
 
       operator VULKAN_HPP_NAMESPACE::AccelerationStructureKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_accelerationStructureKHR;
+        return m_accelerationStructure;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_accelerationStructureKHR )
+        if ( m_accelerationStructure )
         {
           getDispatcher()->vkDestroyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkAccelerationStructureKHR>( m_accelerationStructureKHR ),
+                                                              static_cast<VkAccelerationStructureKHR>( m_accelerationStructure ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                   = nullptr;
-        m_accelerationStructureKHR = nullptr;
-        m_allocator                = nullptr;
-        m_dispatcher               = nullptr;
+        m_device                = nullptr;
+        m_accelerationStructure = nullptr;
+        m_allocator             = nullptr;
+        m_dispatcher            = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::AccelerationStructureKHR release()
@@ -5869,7 +4683,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_accelerationStructureKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_accelerationStructure, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -5877,57 +4691,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( AccelerationStructureKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_accelerationStructureKHR, rhs.m_accelerationStructureKHR );
+        std::swap( m_accelerationStructure, rhs.m_accelerationStructure );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                   m_device                   = {};
-      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR m_accelerationStructureKHR = {};
-      const AllocationCallbacks *                    m_allocator                = {};
-      detail::DeviceDispatcher const *               m_dispatcher               = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                = {};
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                            m_accelerationStructure = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator             = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher            = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<AccelerationStructureKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkAccelerationStructureNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureNV.html
     class AccelerationStructureNV
     {
     public:
       using CType   = VkAccelerationStructureNV;
       using CppType = VULKAN_HPP_NAMESPACE::AccelerationStructureNV;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eAccelerationStructureNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eAccelerationStructureNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eAccelerationStructureNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eAccelerationStructureNV;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      AccelerationStructureNV( Device const &                            device,
-                               AccelerationStructureCreateInfoNV const & createInfo,
-                               Optional<const AllocationCallbacks>       allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      AccelerationStructureNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                               VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV const &                 createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createAccelerationStructureNV( createInfo, allocator );
       }
 #  endif
 
-      AccelerationStructureNV( Device const & device, VkAccelerationStructureNV accelerationStructure, Optional<const AllocationCallbacks> allocator = nullptr )
+      AccelerationStructureNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                               VkAccelerationStructureNV                                                       accelerationStructure,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_accelerationStructureNV( accelerationStructure )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_accelerationStructure( accelerationStructure )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -5943,10 +4753,10 @@ namespace VULKAN_HPP_NAMESPACE
       AccelerationStructureNV( AccelerationStructureNV const & ) = delete;
 
       AccelerationStructureNV( AccelerationStructureNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_accelerationStructureNV( exchange( rhs.m_accelerationStructureNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_accelerationStructure( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_accelerationStructure, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -5957,40 +4767,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_accelerationStructureNV, rhs.m_accelerationStructureNV );
+          std::swap( m_accelerationStructure, rhs.m_accelerationStructure );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::AccelerationStructureNV const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::AccelerationStructureNV const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_accelerationStructureNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::AccelerationStructureNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_accelerationStructureNV );
+        return m_accelerationStructure;
       }
 
       operator VULKAN_HPP_NAMESPACE::AccelerationStructureNV() const VULKAN_HPP_NOEXCEPT
       {
-        return m_accelerationStructureNV;
+        return m_accelerationStructure;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_accelerationStructureNV )
+        if ( m_accelerationStructure )
         {
           getDispatcher()->vkDestroyAccelerationStructureNV( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkAccelerationStructureNV>( m_accelerationStructureNV ),
+                                                             static_cast<VkAccelerationStructureNV>( m_accelerationStructure ),
                                                              reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                  = nullptr;
-        m_accelerationStructureNV = nullptr;
-        m_allocator               = nullptr;
-        m_dispatcher              = nullptr;
+        m_device                = nullptr;
+        m_accelerationStructure = nullptr;
+        m_allocator             = nullptr;
+        m_dispatcher            = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::AccelerationStructureNV release()
@@ -5998,7 +4803,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_accelerationStructureNV, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_accelerationStructure, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6006,65 +4811,62 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( AccelerationStructureNV & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureNV & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_accelerationStructureNV, rhs.m_accelerationStructureNV );
+        std::swap( m_accelerationStructure, rhs.m_accelerationStructure );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_NV_ray_tracing ===
 
-      // wrapper function for command vkGetAccelerationStructureHandleNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type getHandle( size_t dataSize ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType> getHandle( size_t dataSize ) const;
 
-      // wrapper function for command vkGetAccelerationStructureHandleNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getHandle() const;
+      VULKAN_HPP_NODISCARD DataType getHandle() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                  m_device                  = {};
-      VULKAN_HPP_NAMESPACE::AccelerationStructureNV m_accelerationStructureNV = {};
-      const AllocationCallbacks *                   m_allocator               = {};
-      detail::DeviceDispatcher const *              m_dispatcher              = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                = {};
+      VULKAN_HPP_NAMESPACE::AccelerationStructureNV                             m_accelerationStructure = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator             = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher            = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<AccelerationStructureNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuffer.html
     class Buffer
     {
     public:
       using CType   = VkBuffer;
       using CppType = VULKAN_HPP_NAMESPACE::Buffer;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBuffer;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBuffer;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Buffer( Device const & device, BufferCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Buffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+              VULKAN_HPP_NAMESPACE::BufferCreateInfo const &                                  createInfo,
+              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createBuffer( createInfo, allocator );
       }
 #  endif
 
-      Buffer( Device const & device, VkBuffer buffer, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_buffer( buffer ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) ), m_dispatcher( device.getDispatcher() )
+      Buffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+              VkBuffer                                                                        buffer,
+              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device )
+        , m_buffer( buffer )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
+        , m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -6079,10 +4881,10 @@ namespace VULKAN_HPP_NAMESPACE
       Buffer( Buffer const & ) = delete;
 
       Buffer( Buffer && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_buffer( exchange( rhs.m_buffer, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_buffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_buffer, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -6100,16 +4902,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Buffer const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Buffer const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_buffer;
       }
 
-      VULKAN_HPP_NAMESPACE::Buffer const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_buffer );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Buffer() const VULKAN_HPP_NOEXCEPT
       {
         return m_buffer;
@@ -6133,7 +4930,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_buffer, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_buffer, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6141,13 +4938,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Buffer & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Buffer & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_buffer, rhs.m_buffer );
@@ -6157,39 +4954,17 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-      typename ResultValueType<void>::type bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, DeviceSize memoryOffset ) const;
+      void bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const;
 
-      // wrapper function for command vkGetBufferMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-      VULKAN_HPP_NODISCARD MemoryRequirements getMemoryRequirements() const VULKAN_HPP_NOEXCEPT;
-
-    protected:
-      Buffer( VULKAN_HPP_NAMESPACE::Device     device,
-              VULKAN_HPP_NAMESPACE::Buffer     buffer,
-              const AllocationCallbacks *      allocator,
-              detail::DeviceDispatcher const * dispatcher ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( device, {} ) )
-        , m_buffer( exchange( buffer, {} ) )
-        , m_allocator( exchange( allocator, {} ) )
-        , m_dispatcher( exchange( dispatcher, nullptr ) )
-      {
-      }
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements getMemoryRequirements() const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Buffer     m_buffer     = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Buffer                                              m_buffer     = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Buffer>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkBufferCollectionFUCHSIA, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionFUCHSIA.html
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
     class BufferCollectionFUCHSIA
     {
@@ -6197,23 +4972,26 @@ namespace VULKAN_HPP_NAMESPACE
       using CType   = VkBufferCollectionFUCHSIA;
       using CppType = VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBufferCollectionFUCHSIA;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBufferCollectionFUCHSIA;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA;
 
     public:
-#    if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      BufferCollectionFUCHSIA( Device const &                            device,
-                               BufferCollectionCreateInfoFUCHSIA const & createInfo,
-                               Optional<const AllocationCallbacks>       allocator = nullptr )
+#    if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      BufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                               VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA const &                 createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createBufferCollectionFUCHSIA( createInfo, allocator );
       }
 #    endif
 
-      BufferCollectionFUCHSIA( Device const & device, VkBufferCollectionFUCHSIA collection, Optional<const AllocationCallbacks> allocator = nullptr )
+      BufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                               VkBufferCollectionFUCHSIA                                                       collection,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_bufferCollectionFUCHSIA( collection )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_collection( collection )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -6229,10 +5007,10 @@ namespace VULKAN_HPP_NAMESPACE
       BufferCollectionFUCHSIA( BufferCollectionFUCHSIA const & ) = delete;
 
       BufferCollectionFUCHSIA( BufferCollectionFUCHSIA && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_bufferCollectionFUCHSIA( exchange( rhs.m_bufferCollectionFUCHSIA, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_collection( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_collection, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -6243,40 +5021,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_bufferCollectionFUCHSIA, rhs.m_bufferCollectionFUCHSIA );
+          std::swap( m_collection, rhs.m_collection );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_bufferCollectionFUCHSIA;
-      }
-
-      VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_bufferCollectionFUCHSIA );
+        return m_collection;
       }
 
       operator VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA() const VULKAN_HPP_NOEXCEPT
       {
-        return m_bufferCollectionFUCHSIA;
+        return m_collection;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_bufferCollectionFUCHSIA )
+        if ( m_collection )
         {
           getDispatcher()->vkDestroyBufferCollectionFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkBufferCollectionFUCHSIA>( m_bufferCollectionFUCHSIA ),
+                                                             static_cast<VkBufferCollectionFUCHSIA>( m_collection ),
                                                              reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                  = nullptr;
-        m_bufferCollectionFUCHSIA = nullptr;
-        m_allocator               = nullptr;
-        m_dispatcher              = nullptr;
+        m_device     = nullptr;
+        m_collection = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA release()
@@ -6284,7 +5057,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_bufferCollectionFUCHSIA, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_collection, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6292,71 +5065,62 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( BufferCollectionFUCHSIA & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferCollectionFUCHSIA & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_bufferCollectionFUCHSIA, rhs.m_bufferCollectionFUCHSIA );
+        std::swap( m_collection, rhs.m_collection );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_FUCHSIA_buffer_collection ===
 
-      // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-      typename ResultValueType<void>::type setImageConstraints( const ImageConstraintsInfoFUCHSIA & imageConstraintsInfo ) const;
+      void setImageConstraints( const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA & imageConstraintsInfo ) const;
 
-      // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-      typename ResultValueType<void>::type setBufferConstraints( const BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo ) const;
+      void setBufferConstraints( const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo ) const;
 
-      // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<BufferCollectionPropertiesFUCHSIA>::type getProperties() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA getProperties() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                  m_device                  = {};
-      VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA m_bufferCollectionFUCHSIA = {};
-      const AllocationCallbacks *                   m_allocator               = {};
-      detail::DeviceDispatcher const *              m_dispatcher              = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA                             m_collection = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
-
-    template <>
-    struct isVulkanRAIIHandleType<BufferCollectionFUCHSIA>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-    // wrapper class for handle VkBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferView.html
     class BufferView
     {
     public:
       using CType   = VkBufferView;
       using CppType = VULKAN_HPP_NAMESPACE::BufferView;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eBufferView;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eBufferView;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eBufferView;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eBufferView;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      BufferView( Device const & device, BufferViewCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      BufferView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                  VULKAN_HPP_NAMESPACE::BufferViewCreateInfo const &                              createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createBufferView( createInfo, allocator );
       }
 #  endif
 
-      BufferView( Device const & device, VkBufferView bufferView, Optional<const AllocationCallbacks> allocator = nullptr )
+      BufferView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                  VkBufferView                                                                    bufferView,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_bufferView( bufferView )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -6372,10 +5136,10 @@ namespace VULKAN_HPP_NAMESPACE
       BufferView( BufferView const & ) = delete;
 
       BufferView( BufferView && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_bufferView( exchange( rhs.m_bufferView, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_bufferView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_bufferView, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -6393,16 +5157,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::BufferView const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::BufferView const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_bufferView;
       }
 
-      VULKAN_HPP_NAMESPACE::BufferView const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_bufferView );
-      }
-
       operator VULKAN_HPP_NAMESPACE::BufferView() const VULKAN_HPP_NOEXCEPT
       {
         return m_bufferView;
@@ -6426,7 +5185,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_bufferView, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_bufferView, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6434,13 +5193,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( BufferView & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferView & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_bufferView, rhs.m_bufferView );
@@ -6449,40 +5208,38 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::BufferView m_bufferView = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::BufferView                                          m_bufferView = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<BufferView>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPool.html
     class CommandPool
     {
     public:
       using CType   = VkCommandPool;
       using CppType = VULKAN_HPP_NAMESPACE::CommandPool;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCommandPool;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCommandPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCommandPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandPool;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CommandPool( Device const & device, CommandPoolCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CommandPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo const &                             createInfo,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createCommandPool( createInfo, allocator );
       }
 #  endif
 
-      CommandPool( Device const & device, VkCommandPool commandPool, Optional<const AllocationCallbacks> allocator = nullptr )
+      CommandPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VkCommandPool                                                                   commandPool,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_commandPool( commandPool )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -6498,10 +5255,10 @@ namespace VULKAN_HPP_NAMESPACE
       CommandPool( CommandPool const & ) = delete;
 
       CommandPool( CommandPool && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_commandPool( exchange( rhs.m_commandPool, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_commandPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_commandPool, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -6519,16 +5276,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CommandPool const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CommandPool const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_commandPool;
       }
 
-      VULKAN_HPP_NAMESPACE::CommandPool const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_commandPool );
-      }
-
       operator VULKAN_HPP_NAMESPACE::CommandPool() const VULKAN_HPP_NOEXCEPT
       {
         return m_commandPool;
@@ -6552,7 +5304,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_commandPool, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_commandPool, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6560,13 +5312,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CommandPool & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandPool & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_commandPool, rhs.m_commandPool );
@@ -6576,44 +5328,35 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-      typename ResultValueType<void>::type reset( CommandPoolResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void reset( VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkTrimCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPool.html
-      void trim( CommandPoolTrimFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void trim( VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_maintenance1 ===
 
-      // wrapper function for command vkTrimCommandPoolKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPoolKHR.html
-      void trimKHR( CommandPoolTrimFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void trimKHR( VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device      m_device      = {};
-      VULKAN_HPP_NAMESPACE::CommandPool m_commandPool = {};
-      const AllocationCallbacks *       m_allocator   = {};
-      detail::DeviceDispatcher const *  m_dispatcher  = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device      = {};
+      VULKAN_HPP_NAMESPACE::CommandPool                                         m_commandPool = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator   = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher  = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<CommandPool>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBuffer.html
     class CommandBuffer
     {
     public:
       using CType   = VkCommandBuffer;
       using CppType = VULKAN_HPP_NAMESPACE::CommandBuffer;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCommandBuffer;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCommandBuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCommandBuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCommandBuffer;
 
     public:
-      CommandBuffer( Device const & device, VkCommandBuffer commandBuffer, VkCommandPool commandPool )
+      CommandBuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, VkCommandBuffer commandBuffer, VkCommandPool commandPool )
         : m_device( device ), m_commandPool( commandPool ), m_commandBuffer( commandBuffer ), m_dispatcher( device.getDispatcher() )
       {
       }
@@ -6629,10 +5372,10 @@ namespace VULKAN_HPP_NAMESPACE
       CommandBuffer( CommandBuffer const & ) = delete;
 
       CommandBuffer( CommandBuffer && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_commandPool( exchange( rhs.m_commandPool, {} ) )
-        , m_commandBuffer( exchange( rhs.m_commandBuffer, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_commandPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_commandPool, {} ) )
+        , m_commandBuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_commandBuffer, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -6650,16 +5393,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CommandBuffer const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CommandBuffer const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_commandBuffer;
       }
 
-      VULKAN_HPP_NAMESPACE::CommandBuffer const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_commandBuffer );
-      }
-
       operator VULKAN_HPP_NAMESPACE::CommandBuffer() const VULKAN_HPP_NOEXCEPT
       {
         return m_commandBuffer;
@@ -6683,7 +5421,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device      = nullptr;
         m_commandPool = nullptr;
         m_dispatcher  = nullptr;
-        return exchange( m_commandBuffer, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_commandBuffer, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -6691,13 +5429,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CommandBuffer & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_commandPool, rhs.m_commandPool );
@@ -6707,492 +5445,373 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-      typename ResultValueType<void>::type begin( const CommandBufferBeginInfo & beginInfo ) const;
+      void begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo & beginInfo ) const;
 
-      // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-      typename ResultValueType<void>::type end() const;
+      void end() const;
 
-      // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-      typename ResultValueType<void>::type reset( CommandBufferResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-      void copyBuffer( VULKAN_HPP_NAMESPACE::Buffer         srcBuffer,
-                       VULKAN_HPP_NAMESPACE::Buffer         dstBuffer,
-                       ArrayProxy<const BufferCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
+      void bindPipeline( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint, VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-      void copyImage( VULKAN_HPP_NAMESPACE::Image         srcImage,
-                      ImageLayout                         srcImageLayout,
-                      VULKAN_HPP_NAMESPACE::Image         dstImage,
-                      ImageLayout                         dstImageLayout,
-                      ArrayProxy<const ImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
+      void setViewport( uint32_t                                                                       firstViewport,
+                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-      void copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer              srcBuffer,
-                              VULKAN_HPP_NAMESPACE::Image               dstImage,
-                              ImageLayout                               dstImageLayout,
-                              ArrayProxy<const BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
+      void setScissor( uint32_t firstScissor, VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-      void copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image               srcImage,
-                              ImageLayout                               srcImageLayout,
-                              VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
-                              ArrayProxy<const BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-      template <typename DataType>
-      void updateBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer, DeviceSize dstOffset, ArrayProxy<const DataType> const & data ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdFillBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdFillBuffer.html
-      void fillBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer, DeviceSize dstOffset, DeviceSize size, uint32_t data ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-      void pipelineBarrier( PipelineStageFlags                            srcStageMask,
-                            PipelineStageFlags                            dstStageMask,
-                            DependencyFlags                               dependencyFlags,
-                            ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                            ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                            ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBeginQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQuery.html
-      void beginQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
-                       uint32_t                        query,
-                       QueryControlFlags flags         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdEndQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQuery.html
-      void endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetQueryPool.html
-      void resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdWriteTimestamp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp.html
-      void writeTimestamp( PipelineStageFlagBits pipelineStage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdCopyQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyQueryPoolResults.html
-      void copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
-                                 uint32_t                        firstQuery,
-                                 uint32_t                        queryCount,
-                                 VULKAN_HPP_NAMESPACE::Buffer    dstBuffer,
-                                 DeviceSize                      dstOffset,
-                                 DeviceSize                      stride,
-                                 QueryResultFlags flags          VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-      void executeCommands( ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBindPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipeline.html
-      void bindPipeline( PipelineBindPoint pipelineBindPoint, VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-      void bindDescriptorSets( PipelineBindPoint                                             pipelineBindPoint,
-                               VULKAN_HPP_NAMESPACE::PipelineLayout                          layout,
-                               uint32_t                                                      firstSet,
-                               ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
-                               ArrayProxy<const uint32_t> const &                            dynamicOffsets ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-      void clearColorImage( VULKAN_HPP_NAMESPACE::Image                     image,
-                            ImageLayout                                     imageLayout,
-                            const ClearColorValue &                         color,
-                            ArrayProxy<const ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdDispatch, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatch.html
-      void dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdDispatchIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchIndirect.html
-      void dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent.html
-      void setEvent( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags stageMask VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent.html
-      void resetEvent( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags stageMask VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-      void waitEvents( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
-                       PipelineStageFlags                                    srcStageMask,
-                       PipelineStageFlags                                    dstStageMask,
-                       ArrayProxy<const MemoryBarrier> const &               memoryBarriers,
-                       ArrayProxy<const BufferMemoryBarrier> const &         bufferMemoryBarriers,
-                       ArrayProxy<const ImageMemoryBarrier> const &          imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-      template <typename ValuesType>
-      void pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                          ShaderStageFlags                     stageFlags,
-                          uint32_t                             offset,
-                          ArrayProxy<const ValuesType> const & values ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-      void setViewport( uint32_t firstViewport, ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-      void setScissor( uint32_t firstScissor, ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetLineWidth, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineWidth.html
       void setLineWidth( float lineWidth ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBias, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias.html
       void setDepthBias( float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetBlendConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetBlendConstants.html
       void setBlendConstants( const float blendConstants[4] ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBounds, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBounds.html
       void setDepthBounds( float minDepthBounds, float maxDepthBounds ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilCompareMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilCompareMask.html
-      void setStencilCompareMask( StencilFaceFlags faceMask, uint32_t compareMask ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilCompareMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t compareMask ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilWriteMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilWriteMask.html
-      void setStencilWriteMask( StencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilWriteMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilReference, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilReference.html
-      void setStencilReference( StencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilReference( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBindIndexBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer.html
-      void bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, IndexType indexType ) const VULKAN_HPP_NOEXCEPT;
+      void bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                             pipelineBindPoint,
+                               VULKAN_HPP_NAMESPACE::PipelineLayout                                                layout,
+                               uint32_t                                                                            firstSet,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                               VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                            dynamicOffsets ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-      void bindVertexBuffers( uint32_t                                               firstBinding,
-                              ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                              ArrayProxy<const DeviceSize> const &                   offsets ) const;
+      void bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                            VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                            VULKAN_HPP_NAMESPACE::IndexType  indexType ) const VULKAN_HPP_NOEXCEPT;
+
+      void bindVertexBuffers( uint32_t                                                                         firstBinding,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const;
 
-      // wrapper function for command vkCmdDraw, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDraw.html
       void draw( uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndexed, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexed.html
       void
         drawIndexed( uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirect.html
-      void drawIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                         VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                         uint32_t                         drawCount,
+                         uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndexedIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirect.html
-      void drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                uint32_t                         drawCount,
+                                uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-      void blitImage( VULKAN_HPP_NAMESPACE::Image         srcImage,
-                      ImageLayout                         srcImageLayout,
-                      VULKAN_HPP_NAMESPACE::Image         dstImage,
-                      ImageLayout                         dstImageLayout,
-                      ArrayProxy<const ImageBlit> const & regions,
-                      Filter                              filter ) const VULKAN_HPP_NOEXCEPT;
+      void dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdClearDepthStencilImage, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-      void clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                     image,
-                                   ImageLayout                                     imageLayout,
-                                   const ClearDepthStencilValue &                  depthStencil,
-                                   ArrayProxy<const ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT;
+      void dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, VULKAN_HPP_NAMESPACE::DeviceSize offset ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-      void clearAttachments( ArrayProxy<const ClearAttachment> const & attachments, ArrayProxy<const ClearRect> const & rects ) const VULKAN_HPP_NOEXCEPT;
+      void copyBuffer( VULKAN_HPP_NAMESPACE::Buffer                                                     srcBuffer,
+                       VULKAN_HPP_NAMESPACE::Buffer                                                     dstBuffer,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-      void resolveImage( VULKAN_HPP_NAMESPACE::Image            srcImage,
-                         ImageLayout                            srcImageLayout,
-                         VULKAN_HPP_NAMESPACE::Image            dstImage,
-                         ImageLayout                            dstImageLayout,
-                         ArrayProxy<const ImageResolve> const & regions ) const VULKAN_HPP_NOEXCEPT;
+      void copyImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                      VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                      VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                      VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-      void beginRenderPass( const RenderPassBeginInfo & renderPassBegin, SubpassContents contents ) const VULKAN_HPP_NOEXCEPT;
+      void blitImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                      VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                      VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                      VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageBlit> const & regions,
+                      VULKAN_HPP_NAMESPACE::Filter                                                    filter ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdNextSubpass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass.html
-      void nextSubpass( SubpassContents contents ) const VULKAN_HPP_NOEXCEPT;
+      void copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer                                                          srcBuffer,
+                              VULKAN_HPP_NAMESPACE::Image                                                           dstImage,
+                              VULKAN_HPP_NAMESPACE::ImageLayout                                                     dstImageLayout,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
+
+      void copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image                                                           srcImage,
+                              VULKAN_HPP_NAMESPACE::ImageLayout                                                     srcImageLayout,
+                              VULKAN_HPP_NAMESPACE::Buffer                                                          dstBuffer,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT;
+
+      template <typename DataType>
+      void updateBuffer( VULKAN_HPP_NAMESPACE::Buffer                             dstBuffer,
+                         VULKAN_HPP_NAMESPACE::DeviceSize                         dstOffset,
+                         VULKAN_HPP_NAMESPACE::ArrayProxy<const DataType> const & data ) const VULKAN_HPP_NOEXCEPT;
+
+      void fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                       VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                       VULKAN_HPP_NAMESPACE::DeviceSize size,
+                       uint32_t                         data ) const VULKAN_HPP_NOEXCEPT;
+
+      void clearColorImage( VULKAN_HPP_NAMESPACE::Image                                                                 image,
+                            VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+                            const VULKAN_HPP_NAMESPACE::ClearColorValue &                                               color,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT;
+
+      void
+        clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                                                                 image,
+                                VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+                                const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue &                                        depthStencil,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT;
+
+      void clearAttachments( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearAttachment> const & attachments,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearRect> const &       rects ) const VULKAN_HPP_NOEXCEPT;
+
+      void resolveImage( VULKAN_HPP_NAMESPACE::Image                                                        srcImage,
+                         VULKAN_HPP_NAMESPACE::ImageLayout                                                  srcImageLayout,
+                         VULKAN_HPP_NAMESPACE::Image                                                        dstImage,
+                         VULKAN_HPP_NAMESPACE::ImageLayout                                                  dstImageLayout,
+                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageResolve> const & regions ) const VULKAN_HPP_NOEXCEPT;
+
+      void setEvent( VULKAN_HPP_NAMESPACE::Event                        event,
+                     VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+      void resetEvent( VULKAN_HPP_NAMESPACE::Event                        event,
+                       VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+      void waitEvents( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &               events,
+                       VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                       VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const & imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT;
+
+      void pipelineBarrier( VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+                            VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+                            VULKAN_HPP_NAMESPACE::DependencyFlags                                                     dependencyFlags,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers ) const
+        VULKAN_HPP_NOEXCEPT;
+
+      void beginQuery( VULKAN_HPP_NAMESPACE::QueryPool               queryPool,
+                       uint32_t                                      query,
+                       VULKAN_HPP_NAMESPACE::QueryControlFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+      void endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
+
+      void resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT;
+
+      void writeTimestamp( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                           VULKAN_HPP_NAMESPACE::QueryPool             queryPool,
+                           uint32_t                                    query ) const VULKAN_HPP_NOEXCEPT;
+
+      void copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool              queryPool,
+                                 uint32_t                                     firstQuery,
+                                 uint32_t                                     queryCount,
+                                 VULKAN_HPP_NAMESPACE::Buffer                 dstBuffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize             dstOffset,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize             stride,
+                                 VULKAN_HPP_NAMESPACE::QueryResultFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+
+      template <typename ValuesType>
+      void pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout                       layout,
+                          VULKAN_HPP_NAMESPACE::ShaderStageFlags                     stageFlags,
+                          uint32_t                                                   offset,
+                          VULKAN_HPP_NAMESPACE::ArrayProxy<const ValuesType> const & values ) const VULKAN_HPP_NOEXCEPT;
+
+      void beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                            VULKAN_HPP_NAMESPACE::SubpassContents             contents ) const VULKAN_HPP_NOEXCEPT;
+
+      void nextSubpass( VULKAN_HPP_NAMESPACE::SubpassContents contents ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass.html
       void endRenderPass() const VULKAN_HPP_NOEXCEPT;
 
+      void executeCommands( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers ) const VULKAN_HPP_NOEXCEPT;
+
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkCmdSetDeviceMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMask.html
       void setDeviceMask( uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDispatchBase, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBase.html
       void dispatchBase( uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const
         VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_2 ===
 
-      // wrapper function for command vkCmdDrawIndirectCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCount.html
-      void drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                              DeviceSize                   offset,
-                              VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                              DeviceSize                   countBufferOffset,
-                              uint32_t                     maxDrawCount,
-                              uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                              VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                              VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                              VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                              uint32_t                         maxDrawCount,
+                              uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndexedIndirectCount, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCount.html
-      void drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                     DeviceSize                   offset,
-                                     VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                     DeviceSize                   countBufferOffset,
-                                     uint32_t                     maxDrawCount,
-                                     uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                     VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                     VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                     VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                     uint32_t                         maxDrawCount,
+                                     uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-      void beginRenderPass2( const RenderPassBeginInfo & renderPassBegin, const SubpassBeginInfo & subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                             const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-      void nextSubpass2( const SubpassBeginInfo & subpassBeginInfo, const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
+      void nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                         const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-      void endRenderPass2( const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
+      void endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VERSION_1_3 ===
 
-      // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-      void pipelineBarrier2( const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setEvent2( VULKAN_HPP_NAMESPACE::Event event, const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWriteTimestamp2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2.html
-      void writeTimestamp2( PipelineStageFlags2 stage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
+      void resetEvent2( VULKAN_HPP_NAMESPACE::Event                         event,
+                        VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-      void copyBuffer2( const CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      void waitEvents2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const;
 
-      // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-      void copyImage2( const CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-      void copyBufferToImage2( const CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void
+        writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-      void copyImageToBuffer2( const CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-      void setEvent2( VULKAN_HPP_NAMESPACE::Event event, const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdResetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2.html
-      void resetEvent2( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-      void waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events, ArrayProxy<const DependencyInfo> const & dependencyInfos ) const;
+      void copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-      void blitImage2( const BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-      void resolveImage2( const ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-      void beginRendering( const RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering.html
       void endRendering() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCullMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullMode.html
-      void setCullMode( CullModeFlags cullMode VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void setCullMode( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetFrontFace, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFace.html
-      void setFrontFace( FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT;
+      void setFrontFace( VULKAN_HPP_NAMESPACE::FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetPrimitiveTopology, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopology.html
-      void setPrimitiveTopology( PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT;
+      void setPrimitiveTopology( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-      void setViewportWithCount( ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-      void setScissorWithCount( ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
+      void setScissorWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-      void bindVertexBuffers2( uint32_t                                               firstBinding,
-                               ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                               ArrayProxy<const DeviceSize> const &                   offsets,
-                               ArrayProxy<const DeviceSize> const & sizes             VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                               ArrayProxy<const DeviceSize> const & strides           VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void bindVertexBuffers2(
+        uint32_t                                                                                 firstBinding,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &             buffers,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const &         offsets,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdSetDepthTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnable.html
-      void setDepthTestEnable( Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthWriteEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnable.html
-      void setDepthWriteEnable( Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthCompareOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOp.html
-      void setDepthCompareOp( CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthCompareOp( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBoundsTestEnable, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnable.html
-      void setDepthBoundsTestEnable( Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthBoundsTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnable.html
-      void setStencilTestEnable( Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilTestEnable( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOp.html
-      void setStencilOp( StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilOp( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                         VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                         VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                         VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                         VULKAN_HPP_NAMESPACE::CompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRasterizerDiscardEnable, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnable.html
-      void setRasterizerDiscardEnable( Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setRasterizerDiscardEnable( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBiasEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnable.html
-      void setDepthBiasEnable( Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthBiasEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetPrimitiveRestartEnable, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnable.html
-      void setPrimitiveRestartEnable( Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_VERSION_1_4 ===
-
-      // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-      void pushDescriptorSet( PipelineBindPoint                            pipelineBindPoint,
-                              VULKAN_HPP_NAMESPACE::PipelineLayout         layout,
-                              uint32_t                                     set,
-                              ArrayProxy<const WriteDescriptorSet> const & descriptorWrites ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-      template <typename DataType>
-      void pushDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                          VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
-                                          uint32_t                                       set,
-                                          DataType const &                               data ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-      void bindDescriptorSets2( const BindDescriptorSetsInfo & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-      void pushConstants2( const PushConstantsInfo & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-      void pushDescriptorSet2( const PushDescriptorSetInfo & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-      void pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetLineStipple, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStipple.html
-      void setLineStipple( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBindIndexBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2.html
-      void bindIndexBuffer2( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-      void setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo & locationInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-      void setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setPrimitiveRestartEnable( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_debug_marker ===
 
-      // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-      void debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT;
+      void debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDebugMarkerEndEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerEndEXT.html
       void debugMarkerEndEXT() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-      void debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT;
+      void debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_video_queue ===
 
-      // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-      void beginVideoCodingKHR( const VideoBeginCodingInfoKHR & beginInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR & beginInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-      void endVideoCodingKHR( const VideoEndCodingInfoKHR & endCodingInfo ) const VULKAN_HPP_NOEXCEPT;
+      void endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR & endCodingInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-      void controlVideoCodingKHR( const VideoCodingControlInfoKHR & codingControlInfo ) const VULKAN_HPP_NOEXCEPT;
+      void controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR & codingControlInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_video_decode_queue ===
 
-      // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-      void decodeVideoKHR( const VideoDecodeInfoKHR & decodeInfo ) const VULKAN_HPP_NOEXCEPT;
+      void decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR & decodeInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_transform_feedback ===
 
-      // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-      void bindTransformFeedbackBuffersEXT( uint32_t                                               firstBinding,
-                                            ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                            ArrayProxy<const DeviceSize> const &                   offsets,
-                                            ArrayProxy<const DeviceSize> const & sizes             VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void bindTransformFeedbackBuffersEXT( uint32_t                                                                         firstBinding,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes
+                                              VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-      void beginTransformFeedbackEXT( uint32_t                                                  firstCounterBuffer,
-                                      ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &    counterBuffers,
-                                      ArrayProxy<const DeviceSize> const & counterBufferOffsets VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void beginTransformFeedbackEXT( uint32_t                                                                     firstCounterBuffer,
+                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
+                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
+                                        VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdEndTransformFeedbackEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-      void endTransformFeedbackEXT( uint32_t                                                  firstCounterBuffer,
-                                    ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &    counterBuffers,
-                                    ArrayProxy<const DeviceSize> const & counterBufferOffsets VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void endTransformFeedbackEXT( uint32_t                                                                     firstCounterBuffer,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets
+                                      VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdBeginQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQueryIndexedEXT.html
-      void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, QueryControlFlags flags, uint32_t index ) const VULKAN_HPP_NOEXCEPT;
+      void beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                                 uint32_t                                query,
+                                 VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                                 uint32_t                                index ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQueryIndexedEXT.html
       void endQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, uint32_t index ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndirectByteCountEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectByteCountEXT.html
-      void drawIndirectByteCountEXT( uint32_t                     instanceCount,
-                                     uint32_t                     firstInstance,
-                                     VULKAN_HPP_NAMESPACE::Buffer counterBuffer,
-                                     DeviceSize                   counterBufferOffset,
-                                     uint32_t                     counterOffset,
-                                     uint32_t                     vertexStride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndirectByteCountEXT( uint32_t                         instanceCount,
+                                     uint32_t                         firstInstance,
+                                     VULKAN_HPP_NAMESPACE::Buffer     counterBuffer,
+                                     VULKAN_HPP_NAMESPACE::DeviceSize counterBufferOffset,
+                                     uint32_t                         counterOffset,
+                                     uint32_t                         vertexStride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NVX_binary_import ===
 
-      // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-      void cuLaunchKernelNVX( const CuLaunchInfoNVX & launchInfo ) const VULKAN_HPP_NOEXCEPT;
+      void cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX & launchInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_AMD_draw_indirect_count ===
 
-      // wrapper function for command vkCmdDrawIndirectCountAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountAMD.html
-      void drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                 DeviceSize                   offset,
-                                 VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                 DeviceSize                   countBufferOffset,
-                                 uint32_t                     maxDrawCount,
-                                 uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                 VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                 uint32_t                         maxDrawCount,
+                                 uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndexedIndirectCountAMD, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountAMD.html
-      void drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                        DeviceSize                   offset,
-                                        VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                        DeviceSize                   countBufferOffset,
-                                        uint32_t                     maxDrawCount,
-                                        uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                        VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                        uint32_t                         maxDrawCount,
+                                        uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_dynamic_rendering ===
 
-      // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-      void beginRenderingKHR( const RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderingKHR.html
       void endRenderingKHR() const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_device_group ===
 
-      // wrapper function for command vkCmdSetDeviceMaskKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMaskKHR.html
       void setDeviceMaskKHR( uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDispatchBaseKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBaseKHR.html
       void dispatchBaseKHR( uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ )
         const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_push_descriptor ===
 
-      // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-      void pushDescriptorSetKHR( PipelineBindPoint                            pipelineBindPoint,
-                                 VULKAN_HPP_NAMESPACE::PipelineLayout         layout,
-                                 uint32_t                                     set,
-                                 ArrayProxy<const WriteDescriptorSet> const & descriptorWrites ) const VULKAN_HPP_NOEXCEPT;
+      void pushDescriptorSetKHR( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                  pipelineBindPoint,
+                                 VULKAN_HPP_NAMESPACE::PipelineLayout                                                     layout,
+                                 uint32_t                                                                                 set,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
       template <typename DataType>
       void pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
                                              VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
@@ -7201,871 +5820,581 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_EXT_conditional_rendering ===
 
-      // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-      void beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT;
+      void beginConditionalRenderingEXT( const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndConditionalRenderingEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndConditionalRenderingEXT.html
       void endConditionalRenderingEXT() const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_clip_space_w_scaling ===
 
-      // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-      void setViewportWScalingNV( uint32_t firstViewport, ArrayProxy<const ViewportWScalingNV> const & viewportWScalings ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportWScalingNV( uint32_t                                                                                 firstViewport,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings ) const
+        VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_discard_rectangles ===
 
-      // wrapper function for command vkCmdSetDiscardRectangleEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-      void setDiscardRectangleEXT( uint32_t firstDiscardRectangle, ArrayProxy<const Rect2D> const & discardRectangles ) const VULKAN_HPP_NOEXCEPT;
+      void setDiscardRectangleEXT( uint32_t                                                                     firstDiscardRectangle,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDiscardRectangleEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEnableEXT.html
-      void setDiscardRectangleEnableEXT( Bool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDiscardRectangleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDiscardRectangleModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleModeEXT.html
-      void setDiscardRectangleModeEXT( DiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT;
+      void setDiscardRectangleModeEXT( VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_create_renderpass2 ===
 
-      // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-      void beginRenderPass2KHR( const RenderPassBeginInfo & renderPassBegin, const SubpassBeginInfo & subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-      void nextSubpass2KHR( const SubpassBeginInfo & subpassBeginInfo, const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
+      void nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                            const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-      void endRenderPass2KHR( const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
+      void endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_debug_utils ===
 
-      // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-      void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdEndDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndDebugUtilsLabelEXT.html
       void endDebugUtilsLabelEXT() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-      void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
+      void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_AMDX_shader_enqueue ===
 
-      // wrapper function for command vkCmdInitializeGraphScratchMemoryAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInitializeGraphScratchMemoryAMDX.html
-      void initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::Pipeline executionGraph,
-                                             DeviceAddress                  scratch,
-                                             DeviceSize                     scratchSize ) const VULKAN_HPP_NOEXCEPT;
+      void initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-      void dispatchGraphAMDX( DeviceAddress scratch, DeviceSize scratchSize, const DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT;
+      void dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                              const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-      void dispatchGraphIndirectAMDX( DeviceAddress scratch, DeviceSize scratchSize, const DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT;
+      void dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                      const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDispatchGraphIndirectCountAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectCountAMDX.html
-      void dispatchGraphIndirectCountAMDX( DeviceAddress scratch, DeviceSize scratchSize, DeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT;
+      void dispatchGraphIndirectCountAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                           VULKAN_HPP_NAMESPACE::DeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
       //=== VK_EXT_sample_locations ===
 
-      // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-      void setSampleLocationsEXT( const SampleLocationsInfoEXT & sampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT & sampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_acceleration_structure ===
 
-      // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-      void buildAccelerationStructuresKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                           ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const;
+      void buildAccelerationStructuresKHR(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const;
 
-      // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-      void buildAccelerationStructuresIndirectKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const & infos,
-                                                   ArrayProxy<const DeviceAddress> const &                             indirectDeviceAddresses,
-                                                   ArrayProxy<const uint32_t> const &                                  indirectStrides,
-                                                   ArrayProxy<const uint32_t * const> const &                          pMaxPrimitiveCounts ) const;
+      void buildAccelerationStructuresIndirectKHR(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const &                             indirectDeviceAddresses,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                                                        indirectStrides,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t * const> const &                                                pMaxPrimitiveCounts ) const;
 
-      // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-      void copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-      void copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyAccelerationStructureToMemoryKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-      void copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyMemoryToAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-      void writeAccelerationStructuresPropertiesKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
-                                                     QueryType                                                                queryType,
-                                                     VULKAN_HPP_NAMESPACE::QueryPool                                          queryPool,
-                                                     uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT;
+      void writeAccelerationStructuresPropertiesKHR(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+        VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+        VULKAN_HPP_NAMESPACE::QueryPool                                                                queryPool,
+        uint32_t                                                                                       firstQuery ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_ray_tracing_pipeline ===
 
-      // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-      void traceRaysKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                         const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                         const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                         const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                         uint32_t                              width,
-                         uint32_t                              height,
-                         uint32_t                              depth ) const VULKAN_HPP_NOEXCEPT;
+      void traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                         const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                         const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                         const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                         uint32_t                                                    width,
+                         uint32_t                                                    height,
+                         uint32_t                                                    depth ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-      void traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                                 const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                                 const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                                 const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                                 DeviceAddress                         indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT;
+      void traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                                 const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                                 const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                                 const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                                 VULKAN_HPP_NAMESPACE::DeviceAddress                         indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRayTracingPipelineStackSizeKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRayTracingPipelineStackSizeKHR.html
       void setRayTracingPipelineStackSizeKHR( uint32_t pipelineStackSize ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_shading_rate_image ===
 
-      // wrapper function for command vkCmdBindShadingRateImageNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadingRateImageNV.html
-      void bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView imageView, ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT;
+      void bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView imageView, VULKAN_HPP_NAMESPACE::ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-      void setViewportShadingRatePaletteNV( uint32_t                                       firstViewport,
-                                            ArrayProxy<const ShadingRatePaletteNV> const & shadingRatePalettes ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportShadingRatePaletteNV(
+        uint32_t                                                                                   firstViewport,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoarseSampleOrderNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-      void setCoarseSampleOrderNV( CoarseSampleOrderTypeNV                             sampleOrderType,
-                                   ArrayProxy<const CoarseSampleOrderCustomNV> const & customSampleOrders ) const VULKAN_HPP_NOEXCEPT;
+      void setCoarseSampleOrderNV( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV                                                   sampleOrderType,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders ) const
+        VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_ray_tracing ===
 
-      // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-      void buildAccelerationStructureNV( const AccelerationStructureInfoNV &           info,
-                                         VULKAN_HPP_NAMESPACE::Buffer                  instanceData,
-                                         DeviceSize                                    instanceOffset,
-                                         Bool32                                        update,
-                                         VULKAN_HPP_NAMESPACE::AccelerationStructureNV dst,
-                                         VULKAN_HPP_NAMESPACE::AccelerationStructureNV src,
-                                         VULKAN_HPP_NAMESPACE::Buffer                  scratch,
-                                         DeviceSize                                    scratchOffset ) const VULKAN_HPP_NOEXCEPT;
+      void buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV & info,
+                                         VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                         VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                         VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                         VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                         VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                         VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                         VULKAN_HPP_NAMESPACE::DeviceSize                          scratchOffset ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyAccelerationStructureNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureNV.html
-      void copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV dst,
-                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV src,
-                                        CopyAccelerationStructureModeKHR              mode ) const VULKAN_HPP_NOEXCEPT;
+      void copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
+                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV          src,
+                                        VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdTraceRaysNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysNV.html
-      void traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer raygenShaderBindingTableBuffer,
-                        DeviceSize                   raygenShaderBindingOffset,
-                        VULKAN_HPP_NAMESPACE::Buffer missShaderBindingTableBuffer,
-                        DeviceSize                   missShaderBindingOffset,
-                        DeviceSize                   missShaderBindingStride,
-                        VULKAN_HPP_NAMESPACE::Buffer hitShaderBindingTableBuffer,
-                        DeviceSize                   hitShaderBindingOffset,
-                        DeviceSize                   hitShaderBindingStride,
-                        VULKAN_HPP_NAMESPACE::Buffer callableShaderBindingTableBuffer,
-                        DeviceSize                   callableShaderBindingOffset,
-                        DeviceSize                   callableShaderBindingStride,
-                        uint32_t                     width,
-                        uint32_t                     height,
-                        uint32_t                     depth ) const VULKAN_HPP_NOEXCEPT;
+      void traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer     raygenShaderBindingTableBuffer,
+                        VULKAN_HPP_NAMESPACE::DeviceSize raygenShaderBindingOffset,
+                        VULKAN_HPP_NAMESPACE::Buffer     missShaderBindingTableBuffer,
+                        VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingOffset,
+                        VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingStride,
+                        VULKAN_HPP_NAMESPACE::Buffer     hitShaderBindingTableBuffer,
+                        VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingOffset,
+                        VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingStride,
+                        VULKAN_HPP_NAMESPACE::Buffer     callableShaderBindingTableBuffer,
+                        VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingOffset,
+                        VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingStride,
+                        uint32_t                         width,
+                        uint32_t                         height,
+                        uint32_t                         depth ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-      void writeAccelerationStructuresPropertiesNV( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
-                                                    QueryType                                                               queryType,
-                                                    VULKAN_HPP_NAMESPACE::QueryPool                                         queryPool,
-                                                    uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT;
+      void writeAccelerationStructuresPropertiesNV(
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
+        VULKAN_HPP_NAMESPACE::QueryType                                                               queryType,
+        VULKAN_HPP_NAMESPACE::QueryPool                                                               queryPool,
+        uint32_t                                                                                      firstQuery ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_draw_indirect_count ===
 
-      // wrapper function for command vkCmdDrawIndirectCountKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountKHR.html
-      void drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                 DeviceSize                   offset,
-                                 VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                 DeviceSize                   countBufferOffset,
-                                 uint32_t                     maxDrawCount,
-                                 uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                 VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                 uint32_t                         maxDrawCount,
+                                 uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawIndexedIndirectCountKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountKHR.html
-      void drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                        DeviceSize                   offset,
-                                        VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                        DeviceSize                   countBufferOffset,
-                                        uint32_t                     maxDrawCount,
-                                        uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                        VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                        VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                        uint32_t                         maxDrawCount,
+                                        uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_AMD_buffer_marker ===
 
-      // wrapper function for command vkCmdWriteBufferMarkerAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarkerAMD.html
-      void writeBufferMarkerAMD( PipelineStageFlagBits        pipelineStage,
-                                 VULKAN_HPP_NAMESPACE::Buffer dstBuffer,
-                                 DeviceSize                   dstOffset,
-                                 uint32_t                     marker ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdWriteBufferMarker2AMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarker2AMD.html
-      void writeBufferMarker2AMD( PipelineStageFlags2          stage,
-                                  VULKAN_HPP_NAMESPACE::Buffer dstBuffer,
-                                  DeviceSize                   dstOffset,
-                                  uint32_t                     marker ) const VULKAN_HPP_NOEXCEPT;
+      void writeBufferMarkerAMD( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                                 VULKAN_HPP_NAMESPACE::Buffer                dstBuffer,
+                                 VULKAN_HPP_NAMESPACE::DeviceSize            dstOffset,
+                                 uint32_t                                    marker ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_mesh_shader ===
 
-      // wrapper function for command vkCmdDrawMeshTasksNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksNV.html
       void drawMeshTasksNV( uint32_t taskCount, uint32_t firstTask ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawMeshTasksIndirectNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectNV.html
-      void drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                    VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                    uint32_t                         drawCount,
+                                    uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawMeshTasksIndirectCountNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountNV.html
-      void drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                         DeviceSize                   offset,
-                                         VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                         DeviceSize                   countBufferOffset,
-                                         uint32_t                     maxDrawCount,
-                                         uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                         VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                         VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                         VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                         uint32_t                         maxDrawCount,
+                                         uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_scissor_exclusive ===
 
-      // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-      void setExclusiveScissorEnableNV( uint32_t firstExclusiveScissor, ArrayProxy<const Bool32> const & exclusiveScissorEnables ) const VULKAN_HPP_NOEXCEPT;
+      void setExclusiveScissorEnableNV( uint32_t                                                                     firstExclusiveScissor,
+                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & exclusiveScissorEnables ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-      void setExclusiveScissorNV( uint32_t firstExclusiveScissor, ArrayProxy<const Rect2D> const & exclusiveScissors ) const VULKAN_HPP_NOEXCEPT;
+      void setExclusiveScissorNV( uint32_t                                                                     firstExclusiveScissor,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_device_diagnostic_checkpoints ===
 
-      // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
       template <typename CheckpointMarkerType>
       void setCheckpointNV( CheckpointMarkerType const & checkpointMarker ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_INTEL_performance_query ===
 
-      // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-      typename ResultValueType<void>::type setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL & markerInfo ) const;
+      void setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL & markerInfo ) const;
 
-      // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-      typename ResultValueType<void>::type setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL & markerInfo ) const;
+      void setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL & markerInfo ) const;
 
-      // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-      typename ResultValueType<void>::type setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL & overrideInfo ) const;
+      void setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL & overrideInfo ) const;
 
       //=== VK_KHR_fragment_shading_rate ===
 
-      // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-      void setFragmentShadingRateKHR( const Extent2D & fragmentSize, const FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT;
+      void setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D &                       fragmentSize,
+                                      const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_dynamic_rendering_local_read ===
 
-      // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-      void setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo & locationInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setRenderingAttachmentLocationsKHR( const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR & locationInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-      void setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setRenderingInputAttachmentIndicesKHR( const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR & locationInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_line_rasterization ===
 
-      // wrapper function for command vkCmdSetLineStippleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEXT.html
       void setLineStippleEXT( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_extended_dynamic_state ===
 
-      // wrapper function for command vkCmdSetCullModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullModeEXT.html
-      void setCullModeEXT( CullModeFlags cullMode VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void setCullModeEXT( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetFrontFaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFaceEXT.html
-      void setFrontFaceEXT( FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT;
+      void setFrontFaceEXT( VULKAN_HPP_NAMESPACE::FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetPrimitiveTopologyEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopologyEXT.html
-      void setPrimitiveTopologyEXT( PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT;
+      void setPrimitiveTopologyEXT( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetViewportWithCountEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-      void setViewportWithCountEXT( ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetScissorWithCountEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-      void setScissorWithCountEXT( ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
+      void setScissorWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-      void bindVertexBuffers2EXT( uint32_t                                               firstBinding,
-                                  ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                  ArrayProxy<const DeviceSize> const &                   offsets,
-                                  ArrayProxy<const DeviceSize> const & sizes             VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                                  ArrayProxy<const DeviceSize> const & strides           VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void bindVertexBuffers2EXT(
+        uint32_t                                                                                 firstBinding,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &             buffers,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const &         offsets,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes   VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const;
 
-      // wrapper function for command vkCmdSetDepthTestEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnableEXT.html
-      void setDepthTestEnableEXT( Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthWriteEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnableEXT.html
-      void setDepthWriteEnableEXT( Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthWriteEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthCompareOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOpEXT.html
-      void setDepthCompareOpEXT( CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthCompareOpEXT( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBoundsTestEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnableEXT.html
-      void setDepthBoundsTestEnableEXT( Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthBoundsTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilTestEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnableEXT.html
-      void setStencilTestEnableEXT( Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetStencilOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOpEXT.html
-      void
-        setStencilOpEXT( StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp ) const VULKAN_HPP_NOEXCEPT;
+      void setStencilOpEXT( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                            VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                            VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                            VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                            VULKAN_HPP_NAMESPACE::CompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_device_generated_commands ===
 
-      // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-      void preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT;
+      void preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-      void executeGeneratedCommandsNV( Bool32 isPreprocessed, const GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT;
+      void executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                       const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBindPipelineShaderGroupNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipelineShaderGroupNV.html
-      void bindPipelineShaderGroupNV( PipelineBindPoint              pipelineBindPoint,
-                                      VULKAN_HPP_NAMESPACE::Pipeline pipeline,
-                                      uint32_t                       groupIndex ) const VULKAN_HPP_NOEXCEPT;
+      void bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                      VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                      uint32_t                                groupIndex ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_depth_bias_control ===
 
-      // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-      void setDepthBias2EXT( const DepthBiasInfoEXT & depthBiasInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT & depthBiasInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_video_encode_queue ===
 
-      // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-      void encodeVideoKHR( const VideoEncodeInfoKHR & encodeInfo ) const VULKAN_HPP_NOEXCEPT;
+      void encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR & encodeInfo ) const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_NV_cuda_kernel_launch ===
 
-      // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-      void cudaLaunchKernelNV( const CudaLaunchInfoNV & launchInfo ) const VULKAN_HPP_NOEXCEPT;
+      void cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV & launchInfo ) const VULKAN_HPP_NOEXCEPT;
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-      //=== VK_QCOM_tile_shading ===
-
-      // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-      void dispatchTileQCOM( const DispatchTileInfoQCOM & dispatchTileInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-      void beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM & perTileBeginInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdEndPerTileExecutionQCOM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-      void endPerTileExecutionQCOM( const PerTileEndInfoQCOM & perTileEndInfo ) const VULKAN_HPP_NOEXCEPT;
-
       //=== VK_KHR_synchronization2 ===
 
-      // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-      void setEvent2KHR( VULKAN_HPP_NAMESPACE::Event event, const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setEvent2KHR( VULKAN_HPP_NAMESPACE::Event event, const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdResetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2KHR.html
-      void resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event                         event,
+                           VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-      void waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events, ArrayProxy<const DependencyInfo> const & dependencyInfos ) const;
+      void waitEvents2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const;
 
-      // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-      void pipelineBarrier2KHR( const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
+      void pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWriteTimestamp2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2KHR.html
-      void writeTimestamp2KHR( PipelineStageFlags2 stage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT;
+      void writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                               VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                               uint32_t                                  query ) const VULKAN_HPP_NOEXCEPT;
+
+      void writeBufferMarker2AMD( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                  VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
+                                  VULKAN_HPP_NAMESPACE::DeviceSize          dstOffset,
+                                  uint32_t                                  marker ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_descriptor_buffer ===
 
-      // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-      void bindDescriptorBuffersEXT( ArrayProxy<const DescriptorBufferBindingInfoEXT> const & bindingInfos ) const VULKAN_HPP_NOEXCEPT;
+      void bindDescriptorBuffersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT> const & bindingInfos ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-      void setDescriptorBufferOffsetsEXT( PipelineBindPoint                    pipelineBindPoint,
-                                          VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                                          uint32_t                             firstSet,
-                                          ArrayProxy<const uint32_t> const &   bufferIndices,
-                                          ArrayProxy<const DeviceSize> const & offsets ) const;
+      void setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                          pipelineBindPoint,
+                                          VULKAN_HPP_NAMESPACE::PipelineLayout                                             layout,
+                                          uint32_t                                                                         firstSet,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                         bufferIndices,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const;
 
-      // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplersEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplersEXT.html
-      void bindDescriptorBufferEmbeddedSamplersEXT( PipelineBindPoint                    pipelineBindPoint,
-                                                    VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                                                    uint32_t                             set ) const VULKAN_HPP_NOEXCEPT;
+      void bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                    VULKAN_HPP_NAMESPACE::PipelineLayout    layout,
+                                                    uint32_t                                set ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_fragment_shading_rate_enums ===
 
-      // wrapper function for command vkCmdSetFragmentShadingRateEnumNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateEnumNV.html
-      void setFragmentShadingRateEnumNV( FragmentShadingRateNV shadingRate, const FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT;
+      void setFragmentShadingRateEnumNV( VULKAN_HPP_NAMESPACE::FragmentShadingRateNV                  shadingRate,
+                                         const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_mesh_shader ===
 
-      // wrapper function for command vkCmdDrawMeshTasksEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksEXT.html
       void drawMeshTasksEXT( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawMeshTasksIndirectEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectEXT.html
-      void drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                     VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                     uint32_t                         drawCount,
+                                     uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawMeshTasksIndirectCountEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountEXT.html
-      void drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                          DeviceSize                   offset,
-                                          VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                          DeviceSize                   countBufferOffset,
-                                          uint32_t                     maxDrawCount,
-                                          uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT;
+      void drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                          VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                          VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                          VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                          uint32_t                         maxDrawCount,
+                                          uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_copy_commands2 ===
 
-      // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-      void copyBuffer2KHR( const CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-      void copyImage2KHR( const CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-      void copyBufferToImage2KHR( const CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-      void copyImageToBuffer2KHR( const CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT;
+      void copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-      void blitImage2KHR( const BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-      void resolveImage2KHR( const ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT;
+      void resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_vertex_input_dynamic_state ===
 
-      // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-      void setVertexInputEXT( ArrayProxy<const VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
-                              ArrayProxy<const VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions ) const VULKAN_HPP_NOEXCEPT;
+      void setVertexInputEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT> const & vertexBindingDescriptions,
+                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT> const &
+                                vertexAttributeDescriptions ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_HUAWEI_subpass_shading ===
 
-      // wrapper function for command vkCmdSubpassShadingHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSubpassShadingHUAWEI.html
       void subpassShadingHUAWEI() const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_HUAWEI_invocation_mask ===
 
-      // wrapper function for command vkCmdBindInvocationMaskHUAWEI, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindInvocationMaskHUAWEI.html
-      void bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView imageView, ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT;
+      void bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView imageView, VULKAN_HPP_NAMESPACE::ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_extended_dynamic_state2 ===
 
-      // wrapper function for command vkCmdSetPatchControlPointsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPatchControlPointsEXT.html
       void setPatchControlPointsEXT( uint32_t patchControlPoints ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRasterizerDiscardEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnableEXT.html
-      void setRasterizerDiscardEnableEXT( Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setRasterizerDiscardEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthBiasEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnableEXT.html
-      void setDepthBiasEnableEXT( Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthBiasEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetLogicOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEXT.html
-      void setLogicOpEXT( LogicOp logicOp ) const VULKAN_HPP_NOEXCEPT;
+      void setLogicOpEXT( VULKAN_HPP_NAMESPACE::LogicOp logicOp ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetPrimitiveRestartEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnableEXT.html
-      void setPrimitiveRestartEnableEXT( Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setPrimitiveRestartEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_color_write_enable ===
 
-      // wrapper function for command vkCmdSetColorWriteEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-      void setColorWriteEnableEXT( ArrayProxy<const Bool32> const & colorWriteEnables ) const VULKAN_HPP_NOEXCEPT;
+      void setColorWriteEnableEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_ray_tracing_maintenance1 ===
 
-      // wrapper function for command vkCmdTraceRaysIndirect2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirect2KHR.html
-      void traceRaysIndirect2KHR( DeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT;
+      void traceRaysIndirect2KHR( VULKAN_HPP_NAMESPACE::DeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_multi_draw ===
 
-      // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-      void
-        drawMultiEXT( StridedArrayProxy<const MultiDrawInfoEXT> const & vertexInfo, uint32_t instanceCount, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
+      void drawMultiEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT> const & vertexInfo,
+                         uint32_t                                                                                      instanceCount,
+                         uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-      void drawMultiIndexedEXT( StridedArrayProxy<const MultiDrawIndexedInfoEXT> const & indexInfo,
-                                uint32_t                                                 instanceCount,
-                                uint32_t                                                 firstInstance,
-                                Optional<const int32_t> vertexOffset                     VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void drawMultiIndexedEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT> const & indexInfo,
+                                uint32_t                                                                                             instanceCount,
+                                uint32_t                                                                                             firstInstance,
+                                Optional<const int32_t> vertexOffset VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_opacity_micromap ===
 
-      // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-      void buildMicromapsEXT( ArrayProxy<const MicromapBuildInfoEXT> const & infos ) const VULKAN_HPP_NOEXCEPT;
+      void buildMicromapsEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-      void copyMicromapEXT( const CopyMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-      void copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-      void copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
+      void copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-      void writeMicromapsPropertiesEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
-                                        QueryType                                                   queryType,
-                                        VULKAN_HPP_NAMESPACE::QueryPool                             queryPool,
-                                        uint32_t                                                    firstQuery ) const VULKAN_HPP_NOEXCEPT;
+      void writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                        VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                        VULKAN_HPP_NAMESPACE::QueryPool                                                   queryPool,
+                                        uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_HUAWEI_cluster_culling_shader ===
 
-      // wrapper function for command vkCmdDrawClusterHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterHUAWEI.html
       void drawClusterHUAWEI( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDrawClusterIndirectHUAWEI, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterIndirectHUAWEI.html
-      void drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset ) const VULKAN_HPP_NOEXCEPT;
+      void drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer buffer, VULKAN_HPP_NAMESPACE::DeviceSize offset ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_copy_memory_indirect ===
 
-      // wrapper function for command vkCmdCopyMemoryIndirectNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectNV.html
-      void copyMemoryIndirectNV( DeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
+      void copyMemoryIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-      void copyMemoryToImageIndirectNV( DeviceAddress                                    copyBufferAddress,
-                                        uint32_t                                         stride,
-                                        VULKAN_HPP_NAMESPACE::Image                      dstImage,
-                                        ImageLayout                                      dstImageLayout,
-                                        ArrayProxy<const ImageSubresourceLayers> const & imageSubresources ) const VULKAN_HPP_NOEXCEPT;
+      void copyMemoryToImageIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress                                                          copyBufferAddress,
+                                        uint32_t                                                                                     stride,
+                                        VULKAN_HPP_NAMESPACE::Image                                                                  dstImage,
+                                        VULKAN_HPP_NAMESPACE::ImageLayout                                                            dstImageLayout,
+                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers> const & imageSubresources ) const
+        VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_memory_decompression ===
 
-      // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-      void decompressMemoryNV( ArrayProxy<const DecompressMemoryRegionNV> const & decompressMemoryRegions ) const VULKAN_HPP_NOEXCEPT;
+      void decompressMemoryNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV> const & decompressMemoryRegions ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdDecompressMemoryIndirectCountNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountNV.html
-      void decompressMemoryIndirectCountNV( DeviceAddress indirectCommandsAddress,
-                                            DeviceAddress indirectCommandsCountAddress,
-                                            uint32_t      stride ) const VULKAN_HPP_NOEXCEPT;
+      void decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
+                                            VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsCountAddress,
+                                            uint32_t                            stride ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_device_generated_commands_compute ===
 
-      // wrapper function for command vkCmdUpdatePipelineIndirectBufferNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdatePipelineIndirectBufferNV.html
-      void updatePipelineIndirectBufferNV( PipelineBindPoint pipelineBindPoint, VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT;
+      void updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                           VULKAN_HPP_NAMESPACE::Pipeline          pipeline ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_extended_dynamic_state3 ===
 
-      // wrapper function for command vkCmdSetDepthClampEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampEnableEXT.html
-      void setDepthClampEnableEXT( Bool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthClampEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetPolygonModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPolygonModeEXT.html
-      void setPolygonModeEXT( PolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT;
+      void setPolygonModeEXT( VULKAN_HPP_NAMESPACE::PolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRasterizationSamplesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationSamplesEXT.html
-      void setRasterizationSamplesEXT( SampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT;
+      void setRasterizationSamplesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-      void setSampleMaskEXT( SampleCountFlagBits samples, ArrayProxy<const SampleMask> const & sampleMask VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const;
+      void setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits                                        samples,
+                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SampleMask> const & sampleMask ) const;
 
-      // wrapper function for command vkCmdSetAlphaToCoverageEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToCoverageEnableEXT.html
-      void setAlphaToCoverageEnableEXT( Bool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetAlphaToOneEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToOneEnableEXT.html
-      void setAlphaToOneEnableEXT( Bool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setAlphaToOneEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetLogicOpEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEnableEXT.html
-      void setLogicOpEnableEXT( Bool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setLogicOpEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetColorBlendEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-      void setColorBlendEnableEXT( uint32_t firstAttachment, ArrayProxy<const Bool32> const & colorBlendEnables ) const VULKAN_HPP_NOEXCEPT;
+      void setColorBlendEnableEXT( uint32_t                                                                     firstAttachment,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorBlendEnables ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-      void setColorBlendEquationEXT( uint32_t firstAttachment, ArrayProxy<const ColorBlendEquationEXT> const & colorBlendEquations ) const VULKAN_HPP_NOEXCEPT;
+      void setColorBlendEquationEXT( uint32_t                                                                                    firstAttachment,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT> const & colorBlendEquations ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-      void setColorWriteMaskEXT( uint32_t firstAttachment, ArrayProxy<const ColorComponentFlags> const & colorWriteMasks ) const VULKAN_HPP_NOEXCEPT;
+      void setColorWriteMaskEXT( uint32_t                                                                                  firstAttachment,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorComponentFlags> const & colorWriteMasks ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetTessellationDomainOriginEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetTessellationDomainOriginEXT.html
-      void setTessellationDomainOriginEXT( TessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT;
+      void setTessellationDomainOriginEXT( VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRasterizationStreamEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationStreamEXT.html
       void setRasterizationStreamEXT( uint32_t rasterizationStream ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetConservativeRasterizationModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetConservativeRasterizationModeEXT.html
-      void setConservativeRasterizationModeEXT( ConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT;
+      void
+        setConservativeRasterizationModeEXT( VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetExtraPrimitiveOverestimationSizeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExtraPrimitiveOverestimationSizeEXT.html
       void setExtraPrimitiveOverestimationSizeEXT( float extraPrimitiveOverestimationSize ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthClipEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipEnableEXT.html
-      void setDepthClipEnableEXT( Bool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthClipEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetSampleLocationsEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEnableEXT.html
-      void setSampleLocationsEnableEXT( Bool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setSampleLocationsEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-      void setColorBlendAdvancedEXT( uint32_t firstAttachment, ArrayProxy<const ColorBlendAdvancedEXT> const & colorBlendAdvanced ) const VULKAN_HPP_NOEXCEPT;
+      void setColorBlendAdvancedEXT( uint32_t                                                                                    firstAttachment,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT> const & colorBlendAdvanced ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetProvokingVertexModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetProvokingVertexModeEXT.html
-      void setProvokingVertexModeEXT( ProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT;
+      void setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetLineRasterizationModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineRasterizationModeEXT.html
-      void setLineRasterizationModeEXT( LineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT;
+      void setLineRasterizationModeEXT( VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetLineStippleEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEnableEXT.html
-      void setLineStippleEnableEXT( Bool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setLineStippleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetDepthClipNegativeOneToOneEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipNegativeOneToOneEXT.html
-      void setDepthClipNegativeOneToOneEXT( Bool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT;
+      void setDepthClipNegativeOneToOneEXT( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetViewportWScalingEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingEnableNV.html
-      void setViewportWScalingEnableNV( Bool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportWScalingEnableNV( VULKAN_HPP_NAMESPACE::Bool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-      void setViewportSwizzleNV( uint32_t firstViewport, ArrayProxy<const ViewportSwizzleNV> const & viewportSwizzles ) const VULKAN_HPP_NOEXCEPT;
+      void setViewportSwizzleNV( uint32_t                                                                                firstViewport,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles ) const
+        VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageToColorEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorEnableNV.html
-      void setCoverageToColorEnableNV( Bool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageToColorLocationNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorLocationNV.html
       void setCoverageToColorLocationNV( uint32_t coverageToColorLocation ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageModulationModeNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationModeNV.html
-      void setCoverageModulationModeNV( CoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT;
+      void setCoverageModulationModeNV( VULKAN_HPP_NAMESPACE::CoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageModulationTableEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableEnableNV.html
-      void setCoverageModulationTableEnableNV( Bool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setCoverageModulationTableEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-      void setCoverageModulationTableNV( ArrayProxy<const float> const & coverageModulationTable ) const VULKAN_HPP_NOEXCEPT;
+      void setCoverageModulationTableNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const float> const & coverageModulationTable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetShadingRateImageEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetShadingRateImageEnableNV.html
-      void setShadingRateImageEnableNV( Bool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetRepresentativeFragmentTestEnableNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRepresentativeFragmentTestEnableNV.html
-      void setRepresentativeFragmentTestEnableNV( Bool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setRepresentativeFragmentTestEnableNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdSetCoverageReductionModeNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageReductionModeNV.html
-      void setCoverageReductionModeNV( CoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_ARM_tensors ===
-
-      // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-      void copyTensorARM( const CopyTensorInfoARM & copyTensorInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setCoverageReductionModeNV( VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_optical_flow ===
 
-      // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-      void opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV session, const OpticalFlowExecuteInfoNV & executeInfo ) const VULKAN_HPP_NOEXCEPT;
+      void opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                 const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV & executeInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_maintenance5 ===
 
-      // wrapper function for command vkCmdBindIndexBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2KHR.html
-      void bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType ) const VULKAN_HPP_NOEXCEPT;
+      void bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                VULKAN_HPP_NAMESPACE::DeviceSize size,
+                                VULKAN_HPP_NAMESPACE::IndexType  indexType ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_shader_object ===
 
-      // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-      void bindShadersEXT( ArrayProxy<const ShaderStageFlagBits> const & stages, ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const & shaders ) const;
-
-      // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-      void setDepthClampRangeEXT( DepthClampModeEXT                                  depthClampMode,
-                                  Optional<const DepthClampRangeEXT> depthClampRange VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_NV_cooperative_vector ===
-
-      // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-      void convertCooperativeVectorMatrixNV( ArrayProxy<const ConvertCooperativeVectorMatrixInfoNV> const & infos ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_ARM_data_graph ===
-
-      // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-      void dispatchDataGraphARM( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM     session,
-                                 Optional<const DataGraphPipelineDispatchInfoARM> info VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void bindShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits> const & stages,
+                           VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const &           shaders ) const;
 
       //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
 
-      // wrapper function for command vkCmdSetAttachmentFeedbackLoopEnableEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAttachmentFeedbackLoopEnableEXT.html
-      void setAttachmentFeedbackLoopEnableEXT( ImageAspectFlags aspectMask VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const VULKAN_HPP_NOEXCEPT;
+      void setAttachmentFeedbackLoopEnableEXT( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const
+        VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_line_rasterization ===
 
-      // wrapper function for command vkCmdSetLineStippleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleKHR.html
       void setLineStippleKHR( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_maintenance6 ===
 
-      // wrapper function for command vkCmdBindDescriptorSets2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-      void bindDescriptorSets2KHR( const BindDescriptorSetsInfo & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT;
+      void bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-      void pushConstants2KHR( const PushConstantsInfo & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT;
+      void pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-      void pushDescriptorSet2KHR( const PushDescriptorSetInfo & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT;
+      void pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-      void pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-      void setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
-      void bindDescriptorBufferEmbeddedSamplers2EXT( const BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo ) const
+      void pushDescriptorSetWithTemplate2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR & pushDescriptorSetWithTemplateInfo ) const
         VULKAN_HPP_NOEXCEPT;
 
-      //=== VK_QCOM_tile_memory_heap ===
-
-      // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-      void bindTileMemoryQCOM( Optional<const TileMemoryBindInfoQCOM> tileMemoryBindInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_KHR_copy_memory_indirect ===
-
-      // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-      void copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR & copyMemoryIndirectInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-      void copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR & copyMemoryToImageIndirectInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_EXT_memory_decompression ===
-
-      // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-      void decompressMemoryEXT( const DecompressMemoryInfoEXT & decompressMemoryInfoEXT ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdDecompressMemoryIndirectCountEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountEXT.html
-      void decompressMemoryIndirectCountEXT( MemoryDecompressionMethodFlagsEXT decompressionMethod,
-                                             DeviceAddress                     indirectCommandsAddress,
-                                             DeviceAddress                     indirectCommandsCountAddress,
-                                             uint32_t                          maxDecompressionCount,
-                                             uint32_t                          stride ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_NV_cluster_acceleration_structure ===
-
-      // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-      void buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV & commandInfos ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_NV_partitioned_acceleration_structure ===
-
-      // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-      void buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV & buildInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_EXT_device_generated_commands ===
-
-      // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-      void preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT &    generatedCommandsInfo,
-                                           VULKAN_HPP_NAMESPACE::CommandBuffer stateCommandBuffer ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-      void executeGeneratedCommandsEXT( Bool32 isPreprocessed, const GeneratedCommandsInfoEXT & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_EXT_fragment_density_map_offset ===
-
-      // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-      void endRendering2EXT( Optional<const RenderingEndInfoKHR> renderingEndInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_EXT_custom_resolve ===
-
-      // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-      void beginCustomResolveEXT( Optional<const BeginCustomResolveInfoEXT> beginCustomResolveInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const
+      void setDescriptorBufferOffsets2EXT( const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo ) const
         VULKAN_HPP_NOEXCEPT;
 
-      //=== VK_KHR_maintenance10 ===
-
-      // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-      void endRendering2KHR( Optional<const RenderingEndInfoKHR> renderingEndInfo VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ) ) const VULKAN_HPP_NOEXCEPT;
+      void bindDescriptorBufferEmbeddedSamplers2EXT(
+        const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device        m_device        = {};
-      VULKAN_HPP_NAMESPACE::CommandPool   m_commandPool   = {};
-      VULKAN_HPP_NAMESPACE::CommandBuffer m_commandBuffer = {};
-      detail::DeviceDispatcher const *    m_dispatcher    = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device        = {};
+      VULKAN_HPP_NAMESPACE::CommandPool                                         m_commandPool   = {};
+      VULKAN_HPP_NAMESPACE::CommandBuffer                                       m_commandBuffer = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher    = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<CommandBuffer>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class CommandBuffers : public std::vector<CommandBuffer>
+    class CommandBuffers : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CommandBuffers( Device const & device, CommandBufferAllocateInfo const & allocateInfo )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CommandBuffers( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device,
+                      VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo const &         allocateInfo )
       {
         *this = device.allocateCommandBuffers( allocateInfo );
       }
@@ -8080,34 +6409,38 @@ namespace VULKAN_HPP_NAMESPACE
       CommandBuffers & operator=( CommandBuffers && rhs )  = default;
 
     private:
-      CommandBuffers( std::vector<CommandBuffer> && rhs )
+      CommandBuffers( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuFunctionNVX.html
     class CuFunctionNVX
     {
     public:
       using CType   = VkCuFunctionNVX;
       using CppType = VULKAN_HPP_NAMESPACE::CuFunctionNVX;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCuFunctionNVX;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCuFunctionNVX;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCuFunctionNVX;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuFunctionNVX;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CuFunctionNVX( Device const & device, CuFunctionCreateInfoNVX const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CuFunctionNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                     VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX const &                           createInfo,
+                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createCuFunctionNVX( createInfo, allocator );
       }
 #  endif
 
-      CuFunctionNVX( Device const & device, VkCuFunctionNVX function, Optional<const AllocationCallbacks> allocator = nullptr )
+      CuFunctionNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                     VkCuFunctionNVX                                                                 function,
+                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_cuFunctionNVX( function )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_function( function )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -8123,10 +6456,10 @@ namespace VULKAN_HPP_NAMESPACE
       CuFunctionNVX( CuFunctionNVX const & ) = delete;
 
       CuFunctionNVX( CuFunctionNVX && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_cuFunctionNVX( exchange( rhs.m_cuFunctionNVX, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_function( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_function, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8137,40 +6470,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_cuFunctionNVX, rhs.m_cuFunctionNVX );
+          std::swap( m_function, rhs.m_function );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CuFunctionNVX const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CuFunctionNVX const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cuFunctionNVX;
-      }
-
-      VULKAN_HPP_NAMESPACE::CuFunctionNVX const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_cuFunctionNVX );
+        return m_function;
       }
 
       operator VULKAN_HPP_NAMESPACE::CuFunctionNVX() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cuFunctionNVX;
+        return m_function;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_cuFunctionNVX )
+        if ( m_function )
         {
-          getDispatcher()->vkDestroyCuFunctionNVX( static_cast<VkDevice>( m_device ),
-                                                   static_cast<VkCuFunctionNVX>( m_cuFunctionNVX ),
-                                                   reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+          getDispatcher()->vkDestroyCuFunctionNVX(
+            static_cast<VkDevice>( m_device ), static_cast<VkCuFunctionNVX>( m_function ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device        = nullptr;
-        m_cuFunctionNVX = nullptr;
-        m_allocator     = nullptr;
-        m_dispatcher    = nullptr;
+        m_device     = nullptr;
+        m_function   = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::CuFunctionNVX release()
@@ -8178,7 +6505,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_cuFunctionNVX, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_function, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -8186,55 +6513,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CuFunctionNVX & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuFunctionNVX & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_cuFunctionNVX, rhs.m_cuFunctionNVX );
+        std::swap( m_function, rhs.m_function );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device        m_device        = {};
-      VULKAN_HPP_NAMESPACE::CuFunctionNVX m_cuFunctionNVX = {};
-      const AllocationCallbacks *         m_allocator     = {};
-      detail::DeviceDispatcher const *    m_dispatcher    = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::CuFunctionNVX                                       m_function   = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<CuFunctionNVX>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuModuleNVX.html
     class CuModuleNVX
     {
     public:
       using CType   = VkCuModuleNVX;
       using CppType = VULKAN_HPP_NAMESPACE::CuModuleNVX;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCuModuleNVX;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCuModuleNVX;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCuModuleNVX;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCuModuleNVX;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CuModuleNVX( Device const & device, CuModuleCreateInfoNVX const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CuModuleNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX const &                             createInfo,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createCuModuleNVX( createInfo, allocator );
       }
 #  endif
 
-      CuModuleNVX( Device const & device, VkCuModuleNVX module, Optional<const AllocationCallbacks> allocator = nullptr )
+      CuModuleNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VkCuModuleNVX                                                                   module,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_cuModuleNVX( module )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_module( module )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -8250,10 +6575,10 @@ namespace VULKAN_HPP_NAMESPACE
       CuModuleNVX( CuModuleNVX const & ) = delete;
 
       CuModuleNVX( CuModuleNVX && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_cuModuleNVX( exchange( rhs.m_cuModuleNVX, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_module( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_module, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8264,39 +6589,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_cuModuleNVX, rhs.m_cuModuleNVX );
+          std::swap( m_module, rhs.m_module );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CuModuleNVX const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CuModuleNVX const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cuModuleNVX;
-      }
-
-      VULKAN_HPP_NAMESPACE::CuModuleNVX const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_cuModuleNVX );
+        return m_module;
       }
 
       operator VULKAN_HPP_NAMESPACE::CuModuleNVX() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cuModuleNVX;
+        return m_module;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_cuModuleNVX )
+        if ( m_module )
         {
           getDispatcher()->vkDestroyCuModuleNVX(
-            static_cast<VkDevice>( m_device ), static_cast<VkCuModuleNVX>( m_cuModuleNVX ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkCuModuleNVX>( m_module ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device      = nullptr;
-        m_cuModuleNVX = nullptr;
-        m_allocator   = nullptr;
-        m_dispatcher  = nullptr;
+        m_device     = nullptr;
+        m_module     = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::CuModuleNVX release()
@@ -8304,7 +6624,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_cuModuleNVX, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_module, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -8312,34 +6632,27 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CuModuleNVX & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuModuleNVX & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_cuModuleNVX, rhs.m_cuModuleNVX );
+        std::swap( m_module, rhs.m_module );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device      m_device      = {};
-      VULKAN_HPP_NAMESPACE::CuModuleNVX m_cuModuleNVX = {};
-      const AllocationCallbacks *       m_allocator   = {};
-      detail::DeviceDispatcher const *  m_dispatcher  = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::CuModuleNVX                                         m_module     = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<CuModuleNVX>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaFunctionNV.html
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     class CudaFunctionNV
     {
@@ -8347,21 +6660,26 @@ namespace VULKAN_HPP_NAMESPACE
       using CType   = VkCudaFunctionNV;
       using CppType = VULKAN_HPP_NAMESPACE::CudaFunctionNV;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCudaFunctionNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCudaFunctionNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCudaFunctionNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaFunctionNV;
 
     public:
-#    if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CudaFunctionNV( Device const & device, CudaFunctionCreateInfoNV const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#    if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CudaFunctionNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV const &                          createInfo,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createCudaFunctionNV( createInfo, allocator );
       }
 #    endif
 
-      CudaFunctionNV( Device const & device, VkCudaFunctionNV function, Optional<const AllocationCallbacks> allocator = nullptr )
+      CudaFunctionNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VkCudaFunctionNV                                                                function,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_cudaFunctionNV( function )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_function( function )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -8377,10 +6695,10 @@ namespace VULKAN_HPP_NAMESPACE
       CudaFunctionNV( CudaFunctionNV const & ) = delete;
 
       CudaFunctionNV( CudaFunctionNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_cudaFunctionNV( exchange( rhs.m_cudaFunctionNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_function( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_function, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8391,40 +6709,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_cudaFunctionNV, rhs.m_cudaFunctionNV );
+          std::swap( m_function, rhs.m_function );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CudaFunctionNV const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CudaFunctionNV const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cudaFunctionNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::CudaFunctionNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_cudaFunctionNV );
+        return m_function;
       }
 
       operator VULKAN_HPP_NAMESPACE::CudaFunctionNV() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cudaFunctionNV;
+        return m_function;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_cudaFunctionNV )
+        if ( m_function )
         {
-          getDispatcher()->vkDestroyCudaFunctionNV( static_cast<VkDevice>( m_device ),
-                                                    static_cast<VkCudaFunctionNV>( m_cudaFunctionNV ),
-                                                    reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+          getDispatcher()->vkDestroyCudaFunctionNV(
+            static_cast<VkDevice>( m_device ), static_cast<VkCudaFunctionNV>( m_function ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device         = nullptr;
-        m_cudaFunctionNV = nullptr;
-        m_allocator      = nullptr;
-        m_dispatcher     = nullptr;
+        m_device     = nullptr;
+        m_function   = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::CudaFunctionNV release()
@@ -8432,7 +6744,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_cudaFunctionNV, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_function, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -8440,36 +6752,28 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CudaFunctionNV & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaFunctionNV & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_cudaFunctionNV, rhs.m_cudaFunctionNV );
+        std::swap( m_function, rhs.m_function );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device         m_device         = {};
-      VULKAN_HPP_NAMESPACE::CudaFunctionNV m_cudaFunctionNV = {};
-      const AllocationCallbacks *          m_allocator      = {};
-      detail::DeviceDispatcher const *     m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::CudaFunctionNV                                      m_function   = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
-
-    template <>
-    struct isVulkanRAIIHandleType<CudaFunctionNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-    // wrapper class for handle VkCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaModuleNV.html
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     class CudaModuleNV
     {
@@ -8477,21 +6781,26 @@ namespace VULKAN_HPP_NAMESPACE
       using CType   = VkCudaModuleNV;
       using CppType = VULKAN_HPP_NAMESPACE::CudaModuleNV;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eCudaModuleNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eCudaModuleNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eCudaModuleNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eCudaModuleNV;
 
     public:
-#    if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      CudaModuleNV( Device const & device, CudaModuleCreateInfoNV const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#    if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      CudaModuleNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV const &                            createInfo,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createCudaModuleNV( createInfo, allocator );
       }
 #    endif
 
-      CudaModuleNV( Device const & device, VkCudaModuleNV module, Optional<const AllocationCallbacks> allocator = nullptr )
+      CudaModuleNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VkCudaModuleNV                                                                  module,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_cudaModuleNV( module )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_module( module )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -8507,10 +6816,10 @@ namespace VULKAN_HPP_NAMESPACE
       CudaModuleNV( CudaModuleNV const & ) = delete;
 
       CudaModuleNV( CudaModuleNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_cudaModuleNV( exchange( rhs.m_cudaModuleNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_module( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_module, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8521,39 +6830,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_cudaModuleNV, rhs.m_cudaModuleNV );
+          std::swap( m_module, rhs.m_module );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::CudaModuleNV const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::CudaModuleNV const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cudaModuleNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::CudaModuleNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_cudaModuleNV );
+        return m_module;
       }
 
       operator VULKAN_HPP_NAMESPACE::CudaModuleNV() const VULKAN_HPP_NOEXCEPT
       {
-        return m_cudaModuleNV;
+        return m_module;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_cudaModuleNV )
+        if ( m_module )
         {
           getDispatcher()->vkDestroyCudaModuleNV(
-            static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_cudaModuleNV ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_module ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device       = nullptr;
-        m_cudaModuleNV = nullptr;
-        m_allocator    = nullptr;
-        m_dispatcher   = nullptr;
+        m_device     = nullptr;
+        m_module     = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::CudaModuleNV release()
@@ -8561,7 +6865,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_cudaModuleNV, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_module, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -8569,193 +6873,58 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( CudaModuleNV & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaModuleNV & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_cudaModuleNV, rhs.m_cudaModuleNV );
+        std::swap( m_module, rhs.m_module );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_NV_cuda_kernel_launch ===
 
-      // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t>>::type getCache() const;
+      VULKAN_HPP_NODISCARD std::vector<uint8_t> getCache() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device       m_device       = {};
-      VULKAN_HPP_NAMESPACE::CudaModuleNV m_cudaModuleNV = {};
-      const AllocationCallbacks *        m_allocator    = {};
-      detail::DeviceDispatcher const *   m_dispatcher   = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::CudaModuleNV                                        m_module     = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
-
-    template <>
-    struct isVulkanRAIIHandleType<CudaModuleNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-    // wrapper class for handle VkDataGraphPipelineSessionARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionARM.html
-    class DataGraphPipelineSessionARM
-    {
-    public:
-      using CType   = VkDataGraphPipelineSessionARM;
-      using CppType = VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDataGraphPipelineSessionARM;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DataGraphPipelineSessionARM( Device const &                                device,
-                                   DataGraphPipelineSessionCreateInfoARM const & createInfo,
-                                   Optional<const AllocationCallbacks>           allocator = nullptr )
-      {
-        *this = device.createDataGraphPipelineSessionARM( createInfo, allocator );
-      }
-#  endif
-
-      DataGraphPipelineSessionARM( Device const & device, VkDataGraphPipelineSessionARM session, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_dataGraphPipelineSessionARM( session )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      DataGraphPipelineSessionARM( std::nullptr_t ) {}
-
-      ~DataGraphPipelineSessionARM()
-      {
-        clear();
-      }
-
-      DataGraphPipelineSessionARM()                                      = delete;
-      DataGraphPipelineSessionARM( DataGraphPipelineSessionARM const & ) = delete;
-
-      DataGraphPipelineSessionARM( DataGraphPipelineSessionARM && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_dataGraphPipelineSessionARM( exchange( rhs.m_dataGraphPipelineSessionARM, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      DataGraphPipelineSessionARM & operator=( DataGraphPipelineSessionARM const & ) = delete;
-
-      DataGraphPipelineSessionARM & operator=( DataGraphPipelineSessionARM && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_dataGraphPipelineSessionARM, rhs.m_dataGraphPipelineSessionARM );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_dataGraphPipelineSessionARM;
-      }
-
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_dataGraphPipelineSessionARM );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_dataGraphPipelineSessionARM;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_dataGraphPipelineSessionARM )
-        {
-          getDispatcher()->vkDestroyDataGraphPipelineSessionARM( static_cast<VkDevice>( m_device ),
-                                                                 static_cast<VkDataGraphPipelineSessionARM>( m_dataGraphPipelineSessionARM ),
-                                                                 reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device                      = nullptr;
-        m_dataGraphPipelineSessionARM = nullptr;
-        m_allocator                   = nullptr;
-        m_dispatcher                  = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_dataGraphPipelineSessionARM, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( DataGraphPipelineSessionARM & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_dataGraphPipelineSessionARM, rhs.m_dataGraphPipelineSessionARM );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device                      m_device                      = {};
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM m_dataGraphPipelineSessionARM = {};
-      const AllocationCallbacks *                       m_allocator                   = {};
-      detail::DeviceDispatcher const *                  m_dispatcher                  = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<DataGraphPipelineSessionARM>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDebugReportCallbackEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportCallbackEXT.html
     class DebugReportCallbackEXT
     {
     public:
       using CType   = VkDebugReportCallbackEXT;
       using CppType = VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDebugReportCallbackEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDebugReportCallbackEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDebugReportCallbackEXT;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DebugReportCallbackEXT( Instance const &                         instance,
-                              DebugReportCallbackCreateInfoEXT const & createInfo,
-                              Optional<const AllocationCallbacks>      allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                              VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT const &                  createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createDebugReportCallbackEXT( createInfo, allocator );
       }
 #  endif
 
-      DebugReportCallbackEXT( Instance const & instance, VkDebugReportCallbackEXT callback, Optional<const AllocationCallbacks> allocator = nullptr )
+      DebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                              VkDebugReportCallbackEXT                                                        callback,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_instance( instance )
-        , m_debugReportCallbackEXT( callback )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_callback( callback )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( instance.getDispatcher() )
       {
       }
@@ -8771,10 +6940,10 @@ namespace VULKAN_HPP_NAMESPACE
       DebugReportCallbackEXT( DebugReportCallbackEXT const & ) = delete;
 
       DebugReportCallbackEXT( DebugReportCallbackEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_instance( exchange( rhs.m_instance, {} ) )
-        , m_debugReportCallbackEXT( exchange( rhs.m_debugReportCallbackEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_instance, {} ) )
+        , m_callback( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_callback, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8785,40 +6954,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_instance, rhs.m_instance );
-          std::swap( m_debugReportCallbackEXT, rhs.m_debugReportCallbackEXT );
+          std::swap( m_callback, rhs.m_callback );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_debugReportCallbackEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_debugReportCallbackEXT );
+        return m_callback;
       }
 
       operator VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT() const VULKAN_HPP_NOEXCEPT
       {
-        return m_debugReportCallbackEXT;
+        return m_callback;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_debugReportCallbackEXT )
+        if ( m_callback )
         {
           getDispatcher()->vkDestroyDebugReportCallbackEXT( static_cast<VkInstance>( m_instance ),
-                                                            static_cast<VkDebugReportCallbackEXT>( m_debugReportCallbackEXT ),
+                                                            static_cast<VkDebugReportCallbackEXT>( m_callback ),
                                                             reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_instance               = nullptr;
-        m_debugReportCallbackEXT = nullptr;
-        m_allocator              = nullptr;
-        m_dispatcher             = nullptr;
+        m_instance   = nullptr;
+        m_callback   = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT release()
@@ -8826,7 +6990,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_instance   = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_debugReportCallbackEXT, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_callback, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Instance getInstance() const
@@ -8834,57 +6998,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_instance;
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DebugReportCallbackEXT & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugReportCallbackEXT & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_instance, rhs.m_instance );
-        std::swap( m_debugReportCallbackEXT, rhs.m_debugReportCallbackEXT );
+        std::swap( m_callback, rhs.m_callback );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Instance               m_instance               = {};
-      VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT m_debugReportCallbackEXT = {};
-      const AllocationCallbacks *                  m_allocator              = {};
-      detail::InstanceDispatcher const *           m_dispatcher             = nullptr;
+      VULKAN_HPP_NAMESPACE::Instance                                              m_instance   = {};
+      VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT                                m_callback   = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                           m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DebugReportCallbackEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDebugUtilsMessengerEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerEXT.html
     class DebugUtilsMessengerEXT
     {
     public:
       using CType   = VkDebugUtilsMessengerEXT;
       using CppType = VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDebugUtilsMessengerEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDebugUtilsMessengerEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DebugUtilsMessengerEXT( Instance const &                         instance,
-                              DebugUtilsMessengerCreateInfoEXT const & createInfo,
-                              Optional<const AllocationCallbacks>      allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                              VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT const &                  createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createDebugUtilsMessengerEXT( createInfo, allocator );
       }
 #  endif
 
-      DebugUtilsMessengerEXT( Instance const & instance, VkDebugUtilsMessengerEXT messenger, Optional<const AllocationCallbacks> allocator = nullptr )
+      DebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                              VkDebugUtilsMessengerEXT                                                        messenger,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_instance( instance )
-        , m_debugUtilsMessengerEXT( messenger )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_messenger( messenger )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( instance.getDispatcher() )
       {
       }
@@ -8900,10 +7060,10 @@ namespace VULKAN_HPP_NAMESPACE
       DebugUtilsMessengerEXT( DebugUtilsMessengerEXT const & ) = delete;
 
       DebugUtilsMessengerEXT( DebugUtilsMessengerEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_instance( exchange( rhs.m_instance, {} ) )
-        , m_debugUtilsMessengerEXT( exchange( rhs.m_debugUtilsMessengerEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_instance, {} ) )
+        , m_messenger( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_messenger, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -8914,40 +7074,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_instance, rhs.m_instance );
-          std::swap( m_debugUtilsMessengerEXT, rhs.m_debugUtilsMessengerEXT );
+          std::swap( m_messenger, rhs.m_messenger );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_debugUtilsMessengerEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_debugUtilsMessengerEXT );
+        return m_messenger;
       }
 
       operator VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT() const VULKAN_HPP_NOEXCEPT
       {
-        return m_debugUtilsMessengerEXT;
+        return m_messenger;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_debugUtilsMessengerEXT )
+        if ( m_messenger )
         {
           getDispatcher()->vkDestroyDebugUtilsMessengerEXT( static_cast<VkInstance>( m_instance ),
-                                                            static_cast<VkDebugUtilsMessengerEXT>( m_debugUtilsMessengerEXT ),
+                                                            static_cast<VkDebugUtilsMessengerEXT>( m_messenger ),
                                                             reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_instance               = nullptr;
-        m_debugUtilsMessengerEXT = nullptr;
-        m_allocator              = nullptr;
-        m_dispatcher             = nullptr;
+        m_instance   = nullptr;
+        m_messenger  = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT release()
@@ -8955,7 +7110,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_instance   = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_debugUtilsMessengerEXT, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_messenger, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Instance getInstance() const
@@ -8963,55 +7118,52 @@ namespace VULKAN_HPP_NAMESPACE
         return m_instance;
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DebugUtilsMessengerEXT & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugUtilsMessengerEXT & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_instance, rhs.m_instance );
-        std::swap( m_debugUtilsMessengerEXT, rhs.m_debugUtilsMessengerEXT );
+        std::swap( m_messenger, rhs.m_messenger );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Instance               m_instance               = {};
-      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT m_debugUtilsMessengerEXT = {};
-      const AllocationCallbacks *                  m_allocator              = {};
-      detail::InstanceDispatcher const *           m_dispatcher             = nullptr;
+      VULKAN_HPP_NAMESPACE::Instance                                              m_instance   = {};
+      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT                                m_messenger  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                           m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DebugUtilsMessengerEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDeferredOperationKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeferredOperationKHR.html
     class DeferredOperationKHR
     {
     public:
       using CType   = VkDeferredOperationKHR;
       using CppType = VULKAN_HPP_NAMESPACE::DeferredOperationKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDeferredOperationKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDeferredOperationKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DeferredOperationKHR( Device const & device, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DeferredOperationKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createDeferredOperationKHR( allocator );
       }
 #  endif
 
-      DeferredOperationKHR( Device const & device, VkDeferredOperationKHR operation, Optional<const AllocationCallbacks> allocator = nullptr )
+      DeferredOperationKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                            VkDeferredOperationKHR                                                          operation,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_deferredOperationKHR( operation )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_operation( operation )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9027,10 +7179,10 @@ namespace VULKAN_HPP_NAMESPACE
       DeferredOperationKHR( DeferredOperationKHR const & ) = delete;
 
       DeferredOperationKHR( DeferredOperationKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_deferredOperationKHR( exchange( rhs.m_deferredOperationKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_operation( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_operation, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9041,40 +7193,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_deferredOperationKHR, rhs.m_deferredOperationKHR );
+          std::swap( m_operation, rhs.m_operation );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DeferredOperationKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_deferredOperationKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::DeferredOperationKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_deferredOperationKHR );
+        return m_operation;
       }
 
       operator VULKAN_HPP_NAMESPACE::DeferredOperationKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_deferredOperationKHR;
+        return m_operation;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_deferredOperationKHR )
+        if ( m_operation )
         {
           getDispatcher()->vkDestroyDeferredOperationKHR( static_cast<VkDevice>( m_device ),
-                                                          static_cast<VkDeferredOperationKHR>( m_deferredOperationKHR ),
+                                                          static_cast<VkDeferredOperationKHR>( m_operation ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device               = nullptr;
-        m_deferredOperationKHR = nullptr;
-        m_allocator            = nullptr;
-        m_dispatcher           = nullptr;
+        m_device     = nullptr;
+        m_operation  = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::DeferredOperationKHR release()
@@ -9082,7 +7229,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_deferredOperationKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_operation, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9090,68 +7237,61 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DeferredOperationKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_deferredOperationKHR, rhs.m_deferredOperationKHR );
+        std::swap( m_operation, rhs.m_operation );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_KHR_deferred_host_operations ===
 
-      // wrapper function for command vkGetDeferredOperationMaxConcurrencyKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationMaxConcurrencyKHR.html
       VULKAN_HPP_NODISCARD uint32_t getMaxConcurrency() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeferredOperationResultKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-      VULKAN_HPP_NODISCARD Result getResult() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getResult() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-      VULKAN_HPP_NODISCARD Result join() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result join() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device               m_device               = {};
-      VULKAN_HPP_NAMESPACE::DeferredOperationKHR m_deferredOperationKHR = {};
-      const AllocationCallbacks *                m_allocator            = {};
-      detail::DeviceDispatcher const *           m_dispatcher           = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                m_operation  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DeferredOperationKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPool.html
     class DescriptorPool
     {
     public:
       using CType   = VkDescriptorPool;
       using CppType = VULKAN_HPP_NAMESPACE::DescriptorPool;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorPool;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorPool;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DescriptorPool( Device const & device, DescriptorPoolCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DescriptorPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo const &                          createInfo,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createDescriptorPool( createInfo, allocator );
       }
 #  endif
 
-      DescriptorPool( Device const & device, VkDescriptorPool descriptorPool, Optional<const AllocationCallbacks> allocator = nullptr )
+      DescriptorPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VkDescriptorPool                                                                descriptorPool,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_descriptorPool( descriptorPool )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9167,10 +7307,10 @@ namespace VULKAN_HPP_NAMESPACE
       DescriptorPool( DescriptorPool const & ) = delete;
 
       DescriptorPool( DescriptorPool && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_descriptorPool( exchange( rhs.m_descriptorPool, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_descriptorPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorPool, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9188,16 +7328,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorPool const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DescriptorPool const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorPool;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorPool const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_descriptorPool );
-      }
-
       operator VULKAN_HPP_NAMESPACE::DescriptorPool() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorPool;
@@ -9222,7 +7357,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_descriptorPool, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_descriptorPool, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9230,13 +7365,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DescriptorPool & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorPool & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_descriptorPool, rhs.m_descriptorPool );
@@ -9246,34 +7381,27 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-      typename ResultValueType<void>::type reset( DescriptorPoolResetFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void reset( VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device         m_device         = {};
-      VULKAN_HPP_NAMESPACE::DescriptorPool m_descriptorPool = {};
-      const AllocationCallbacks *          m_allocator      = {};
-      detail::DeviceDispatcher const *     m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device         = {};
+      VULKAN_HPP_NAMESPACE::DescriptorPool                                      m_descriptorPool = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator      = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DescriptorPool>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSet.html
     class DescriptorSet
     {
     public:
       using CType   = VkDescriptorSet;
       using CppType = VULKAN_HPP_NAMESPACE::DescriptorSet;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorSet;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorSet;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSet;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSet;
 
     public:
-      DescriptorSet( Device const & device, VkDescriptorSet descriptorSet, VkDescriptorPool descriptorPool )
+      DescriptorSet( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, VkDescriptorSet descriptorSet, VkDescriptorPool descriptorPool )
         : m_device( device ), m_descriptorPool( descriptorPool ), m_descriptorSet( descriptorSet ), m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9289,10 +7417,10 @@ namespace VULKAN_HPP_NAMESPACE
       DescriptorSet( DescriptorSet const & ) = delete;
 
       DescriptorSet( DescriptorSet && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_descriptorPool( exchange( rhs.m_descriptorPool, {} ) )
-        , m_descriptorSet( exchange( rhs.m_descriptorSet, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_descriptorPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorPool, {} ) )
+        , m_descriptorSet( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorSet, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9310,16 +7438,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorSet const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DescriptorSet const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorSet;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorSet const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_descriptorSet );
-      }
-
       operator VULKAN_HPP_NAMESPACE::DescriptorSet() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorSet;
@@ -9345,7 +7468,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device         = nullptr;
         m_descriptorPool = nullptr;
         m_dispatcher     = nullptr;
-        return exchange( m_descriptorSet, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_descriptorSet, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9353,13 +7476,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DescriptorSet & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_descriptorPool, rhs.m_descriptorPool );
@@ -9369,42 +7492,31 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_1 ===
 
-      // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
       template <typename DataType>
       void updateWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate, DataType const & data ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_descriptor_update_template ===
 
-      // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
       template <typename DataType>
       void updateWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate, DataType const & data ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_VALVE_descriptor_set_host_mapping ===
 
-      // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
       VULKAN_HPP_NODISCARD void * getHostMappingVALVE() const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device         m_device         = {};
-      VULKAN_HPP_NAMESPACE::DescriptorPool m_descriptorPool = {};
-      VULKAN_HPP_NAMESPACE::DescriptorSet  m_descriptorSet  = {};
-      detail::DeviceDispatcher const *     m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device         = {};
+      VULKAN_HPP_NAMESPACE::DescriptorPool                                      m_descriptorPool = {};
+      VULKAN_HPP_NAMESPACE::DescriptorSet                                       m_descriptorSet  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DescriptorSet>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class DescriptorSets : public std::vector<DescriptorSet>
+    class DescriptorSets : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DescriptorSets( Device const & device, DescriptorSetAllocateInfo const & allocateInfo )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DescriptorSets( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device,
+                      VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo const &         allocateInfo )
       {
         *this = device.allocateDescriptorSets( allocateInfo );
       }
@@ -9419,34 +7531,38 @@ namespace VULKAN_HPP_NAMESPACE
       DescriptorSets & operator=( DescriptorSets && rhs )  = default;
 
     private:
-      DescriptorSets( std::vector<DescriptorSet> && rhs )
+      DescriptorSets( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayout.html
     class DescriptorSetLayout
     {
     public:
       using CType   = VkDescriptorSetLayout;
       using CppType = VULKAN_HPP_NAMESPACE::DescriptorSetLayout;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorSetLayout;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorSetLayout;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorSetLayout;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorSetLayout;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DescriptorSetLayout( Device const & device, DescriptorSetLayoutCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DescriptorSetLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                           VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo const &                     createInfo,
+                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createDescriptorSetLayout( createInfo, allocator );
       }
 #  endif
 
-      DescriptorSetLayout( Device const & device, VkDescriptorSetLayout descriptorSetLayout, Optional<const AllocationCallbacks> allocator = nullptr )
+      DescriptorSetLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                           VkDescriptorSetLayout                                                           descriptorSetLayout,
+                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_descriptorSetLayout( descriptorSetLayout )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9462,10 +7578,10 @@ namespace VULKAN_HPP_NAMESPACE
       DescriptorSetLayout( DescriptorSetLayout const & ) = delete;
 
       DescriptorSetLayout( DescriptorSetLayout && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_descriptorSetLayout( exchange( rhs.m_descriptorSetLayout, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_descriptorSetLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorSetLayout, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9483,16 +7599,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorSetLayout const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayout const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorSetLayout;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorSetLayout const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_descriptorSetLayout );
-      }
-
       operator VULKAN_HPP_NAMESPACE::DescriptorSetLayout() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorSetLayout;
@@ -9517,7 +7628,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_descriptorSetLayout, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_descriptorSetLayout, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9525,13 +7636,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DescriptorSetLayout & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSetLayout & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_descriptorSetLayout, rhs.m_descriptorSetLayout );
@@ -9541,53 +7652,43 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_EXT_descriptor_buffer ===
 
-      // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-      VULKAN_HPP_NODISCARD DeviceSize getSizeEXT() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize getSizeEXT() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-      VULKAN_HPP_NODISCARD DeviceSize getBindingOffsetEXT( uint32_t binding ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize getBindingOffsetEXT( uint32_t binding ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device              m_device              = {};
-      VULKAN_HPP_NAMESPACE::DescriptorSetLayout m_descriptorSetLayout = {};
-      const AllocationCallbacks *               m_allocator           = {};
-      detail::DeviceDispatcher const *          m_dispatcher          = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device              = {};
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayout                                 m_descriptorSetLayout = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator           = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher          = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DescriptorSetLayout>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDescriptorUpdateTemplate, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplate.html
     class DescriptorUpdateTemplate
     {
     public:
       using CType   = VkDescriptorUpdateTemplate;
       using CppType = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDescriptorUpdateTemplate;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDescriptorUpdateTemplate;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDescriptorUpdateTemplate;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DescriptorUpdateTemplate( Device const &                             device,
-                                DescriptorUpdateTemplateCreateInfo const & createInfo,
-                                Optional<const AllocationCallbacks>        allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const &                createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createDescriptorUpdateTemplate( createInfo, allocator );
       }
 #  endif
 
-      DescriptorUpdateTemplate( Device const &                      device,
-                                VkDescriptorUpdateTemplate          descriptorUpdateTemplate,
-                                Optional<const AllocationCallbacks> allocator = nullptr )
+      DescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VkDescriptorUpdateTemplate                                                      descriptorUpdateTemplate,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_descriptorUpdateTemplate( descriptorUpdateTemplate )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9603,10 +7704,10 @@ namespace VULKAN_HPP_NAMESPACE
       DescriptorUpdateTemplate( DescriptorUpdateTemplate const & ) = delete;
 
       DescriptorUpdateTemplate( DescriptorUpdateTemplate && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_descriptorUpdateTemplate( exchange( rhs.m_descriptorUpdateTemplate, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_descriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorUpdateTemplate, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9624,16 +7725,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorUpdateTemplate;
       }
 
-      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_descriptorUpdateTemplate );
-      }
-
       operator VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate() const VULKAN_HPP_NOEXCEPT
       {
         return m_descriptorUpdateTemplate;
@@ -9658,7 +7754,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_descriptorUpdateTemplate, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_descriptorUpdateTemplate, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9666,13 +7762,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DescriptorUpdateTemplate & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_descriptorUpdateTemplate, rhs.m_descriptorUpdateTemplate );
@@ -9681,40 +7777,38 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                   m_device                   = {};
-      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate m_descriptorUpdateTemplate = {};
-      const AllocationCallbacks *                    m_allocator                = {};
-      detail::DeviceDispatcher const *               m_dispatcher               = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                   = {};
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate                            m_descriptorUpdateTemplate = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator                = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher               = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DescriptorUpdateTemplate>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDeviceMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemory.html
     class DeviceMemory
     {
     public:
       using CType   = VkDeviceMemory;
       using CppType = VULKAN_HPP_NAMESPACE::DeviceMemory;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDeviceMemory;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDeviceMemory;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDeviceMemory;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDeviceMemory;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DeviceMemory( Device const & device, MemoryAllocateInfo const & allocateInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DeviceMemory( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VULKAN_HPP_NAMESPACE::MemoryAllocateInfo const &                                allocateInfo,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.allocateMemory( allocateInfo, allocator );
       }
 #  endif
 
-      DeviceMemory( Device const & device, VkDeviceMemory memory, Optional<const AllocationCallbacks> allocator = nullptr )
+      DeviceMemory( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VkDeviceMemory                                                                  memory,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_deviceMemory( memory )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_memory( memory )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -9730,10 +7824,10 @@ namespace VULKAN_HPP_NAMESPACE
       DeviceMemory( DeviceMemory const & ) = delete;
 
       DeviceMemory( DeviceMemory && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_deviceMemory( exchange( rhs.m_deviceMemory, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_memory( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_memory, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9744,39 +7838,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_deviceMemory, rhs.m_deviceMemory );
+          std::swap( m_memory, rhs.m_memory );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DeviceMemory const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DeviceMemory const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_deviceMemory;
-      }
-
-      VULKAN_HPP_NAMESPACE::DeviceMemory const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_deviceMemory );
+        return m_memory;
       }
 
       operator VULKAN_HPP_NAMESPACE::DeviceMemory() const VULKAN_HPP_NOEXCEPT
       {
-        return m_deviceMemory;
+        return m_memory;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_deviceMemory )
+        if ( m_memory )
         {
           getDispatcher()->vkFreeMemory(
-            static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_deviceMemory ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_memory ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device       = nullptr;
-        m_deviceMemory = nullptr;
-        m_allocator    = nullptr;
-        m_dispatcher   = nullptr;
+        m_device     = nullptr;
+        m_memory     = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::DeviceMemory release()
@@ -9784,7 +7873,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_deviceMemory, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_memory, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -9792,97 +7881,85 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DeviceMemory & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceMemory & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_deviceMemory, rhs.m_deviceMemory );
+        std::swap( m_memory, rhs.m_memory );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<void *>::type
-        mapMemory( DeviceSize offset, DeviceSize size, MemoryMapFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD void * mapMemory( VULKAN_HPP_NAMESPACE::DeviceSize           offset,
+                                             VULKAN_HPP_NAMESPACE::DeviceSize           size,
+                                             VULKAN_HPP_NAMESPACE::MemoryMapFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkUnmapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory.html
       void unmapMemory() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetDeviceMemoryCommitment, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-      VULKAN_HPP_NODISCARD DeviceSize getCommitment() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize getCommitment() const VULKAN_HPP_NOEXCEPT;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_NV_external_memory_win32 ===
 
-      // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<HANDLE>::type getMemoryWin32HandleNV( ExternalMemoryHandleTypeFlagsNV handleType ) const;
+      VULKAN_HPP_NODISCARD HANDLE getMemoryWin32HandleNV( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType ) const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
       //=== VK_EXT_pageable_device_local_memory ===
 
-      // wrapper function for command vkSetDeviceMemoryPriorityEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDeviceMemoryPriorityEXT.html
       void setPriorityEXT( float priority ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device       m_device       = {};
-      VULKAN_HPP_NAMESPACE::DeviceMemory m_deviceMemory = {};
-      const AllocationCallbacks *        m_allocator    = {};
-      detail::DeviceDispatcher const *   m_dispatcher   = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::DeviceMemory                                        m_memory     = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DeviceMemory>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkDisplayKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayKHR.html
     class DisplayKHR
     {
     public:
       using CType   = VkDisplayKHR;
       using CppType = VULKAN_HPP_NAMESPACE::DisplayKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDisplayKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDisplayKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDisplayKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayKHR;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DisplayKHR( PhysicalDevice const & physicalDevice, int32_t drmFd, uint32_t connectorId )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DisplayKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const & physicalDevice, int32_t drmFd, uint32_t connectorId )
       {
         *this = physicalDevice.getDrmDisplayEXT( drmFd, connectorId );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
-      DisplayKHR( PhysicalDevice const & physicalDevice, Display & dpy, RROutput rrOutput )
+      DisplayKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const & physicalDevice, Display & dpy, RROutput rrOutput )
       {
         *this = physicalDevice.getRandROutputDisplayEXT( dpy, rrOutput );
       }
 #    endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_WIN32_KHR )
-      DisplayKHR( PhysicalDevice const & physicalDevice, uint32_t deviceRelativeId )
+      DisplayKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const & physicalDevice, uint32_t deviceRelativeId )
       {
         *this = physicalDevice.getWinrtDisplayNV( deviceRelativeId );
       }
 #    endif /*VK_USE_PLATFORM_WIN32_KHR*/
 #  endif
 
-      DisplayKHR( PhysicalDevice const & physicalDevice, VkDisplayKHR display )
-        : m_physicalDevice( physicalDevice ), m_displayKHR( display ), m_dispatcher( physicalDevice.getDispatcher() )
+      DisplayKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const & physicalDevice, VkDisplayKHR display )
+        : m_physicalDevice( physicalDevice ), m_display( display ), m_dispatcher( physicalDevice.getDispatcher() )
       {
       }
 
@@ -9897,9 +7974,9 @@ namespace VULKAN_HPP_NAMESPACE
       DisplayKHR( DisplayKHR const & ) = delete;
 
       DisplayKHR( DisplayKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_physicalDevice( exchange( rhs.m_physicalDevice, {} ) )
-        , m_displayKHR( exchange( rhs.m_displayKHR, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_physicalDevice( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_physicalDevice, {} ) )
+        , m_display( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_display, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -9910,35 +7987,30 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_physicalDevice, rhs.m_physicalDevice );
-          std::swap( m_displayKHR, rhs.m_displayKHR );
+          std::swap( m_display, rhs.m_display );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DisplayKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DisplayKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_displayKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::DisplayKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_displayKHR );
+        return m_display;
       }
 
       operator VULKAN_HPP_NAMESPACE::DisplayKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_displayKHR;
+        return m_display;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_displayKHR )
+        if ( m_display )
         {
-          getDispatcher()->vkReleaseDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_displayKHR ) );
+          getDispatcher()->vkReleaseDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_display ) );
         }
         m_physicalDevice = nullptr;
-        m_displayKHR     = nullptr;
+        m_display        = nullptr;
         m_dispatcher     = nullptr;
       }
 
@@ -9946,7 +8018,7 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_physicalDevice = nullptr;
         m_dispatcher     = nullptr;
-        return exchange( m_displayKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_display, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::PhysicalDevice getPhysicalDevice() const
@@ -9954,65 +8026,49 @@ namespace VULKAN_HPP_NAMESPACE
         return m_physicalDevice;
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DisplayKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_physicalDevice, rhs.m_physicalDevice );
-        std::swap( m_displayKHR, rhs.m_displayKHR );
+        std::swap( m_display, rhs.m_display );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_KHR_display ===
 
-      // wrapper function for command vkGetDisplayModePropertiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModePropertiesKHR>>::type getModeProperties() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR> getModeProperties() const;
 
-      // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayModeKHR>::type
-        createMode( DisplayModeCreateInfoKHR const &    createInfo,
-                    Optional<const AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
+      VULKAN_HPP_NODISCARD
+        VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayModeKHR>::Type
+        createMode( VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR const &                          createInfo,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT;
 
       //=== VK_KHR_get_display_properties2 ===
 
-      // wrapper function for command vkGetDisplayModeProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DisplayModeProperties2KHR>>::type getModeProperties2() const;
-
-      // wrapper function for command vkGetDisplayModeProperties2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-      template <typename StructureChain>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<StructureChain>>::type getModeProperties2() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR> getModeProperties2() const;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_NV_acquire_winrt_display ===
 
-      // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-      typename ResultValueType<void>::type acquireWinrtNV() const;
+      void acquireWinrtNV() const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     private:
-      VULKAN_HPP_NAMESPACE::PhysicalDevice m_physicalDevice = {};
-      VULKAN_HPP_NAMESPACE::DisplayKHR     m_displayKHR     = {};
-      detail::InstanceDispatcher const *   m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::PhysicalDevice                                        m_physicalDevice = {};
+      VULKAN_HPP_NAMESPACE::DisplayKHR                                            m_display        = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DisplayKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class DisplayKHRs : public std::vector<DisplayKHR>
+    class DisplayKHRs : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DisplayKHRs( PhysicalDevice const & physicalDevice, uint32_t planeIndex )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DisplayKHRs( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice const & physicalDevice, uint32_t planeIndex )
       {
         *this = physicalDevice.getDisplayPlaneSupportedDisplaysKHR( planeIndex );
       }
@@ -10027,31 +8083,33 @@ namespace VULKAN_HPP_NAMESPACE
       DisplayKHRs & operator=( DisplayKHRs && rhs )  = default;
 
     private:
-      DisplayKHRs( std::vector<DisplayKHR> && rhs )
+      DisplayKHRs( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeKHR.html
     class DisplayModeKHR
     {
     public:
       using CType   = VkDisplayModeKHR;
       using CppType = VULKAN_HPP_NAMESPACE::DisplayModeKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eDisplayModeKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eDisplayModeKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eDisplayModeKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eDisplayModeKHR;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      DisplayModeKHR( DisplayKHR const & display, DisplayModeCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      DisplayModeKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR const &             display,
+                      VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR const &                          createInfo,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = display.createMode( createInfo, allocator );
       }
 #  endif
 
-      DisplayModeKHR( DisplayKHR const & display, VkDisplayModeKHR displayModeKHR )
+      DisplayModeKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR const & display, VkDisplayModeKHR displayModeKHR )
         : m_physicalDevice( display.getPhysicalDevice() ), m_displayModeKHR( displayModeKHR ), m_dispatcher( display.getDispatcher() )
       {
       }
@@ -10068,9 +8126,9 @@ namespace VULKAN_HPP_NAMESPACE
       DisplayModeKHR( DisplayModeKHR const & rhs ) : m_displayModeKHR( rhs.m_displayModeKHR ), m_dispatcher( rhs.m_dispatcher ) {}
 
       DisplayModeKHR( DisplayModeKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_physicalDevice( exchange( rhs.m_physicalDevice, {} ) )
-        , m_displayModeKHR( exchange( rhs.m_displayModeKHR, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_physicalDevice( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_physicalDevice, {} ) )
+        , m_displayModeKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_displayModeKHR, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10092,16 +8150,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::DisplayModeKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::DisplayModeKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_displayModeKHR;
       }
 
-      VULKAN_HPP_NAMESPACE::DisplayModeKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_displayModeKHR );
-      }
-
       operator VULKAN_HPP_NAMESPACE::DisplayModeKHR() const VULKAN_HPP_NOEXCEPT
       {
         return m_displayModeKHR;
@@ -10118,16 +8171,16 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_physicalDevice = nullptr;
         m_dispatcher     = nullptr;
-        return exchange( m_displayModeKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_displayModeKHR, nullptr );
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( DisplayModeKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayModeKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_physicalDevice, rhs.m_physicalDevice );
         std::swap( m_displayModeKHR, rhs.m_displayModeKHR );
@@ -10136,42 +8189,41 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_KHR_display ===
 
-      // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<DisplayPlaneCapabilitiesKHR>::type getDisplayPlaneCapabilities( uint32_t planeIndex ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR getDisplayPlaneCapabilities( uint32_t planeIndex ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::PhysicalDevice m_physicalDevice = {};
-      VULKAN_HPP_NAMESPACE::DisplayModeKHR m_displayModeKHR = {};
-      detail::InstanceDispatcher const *   m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::PhysicalDevice                                        m_physicalDevice = {};
+      VULKAN_HPP_NAMESPACE::DisplayModeKHR                                        m_displayModeKHR = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<DisplayModeKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkEvent.html
     class Event
     {
     public:
       using CType   = VkEvent;
       using CppType = VULKAN_HPP_NAMESPACE::Event;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eEvent;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eEvent;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eEvent;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eEvent;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Event( Device const & device, EventCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Event( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VULKAN_HPP_NAMESPACE::EventCreateInfo const &                                   createInfo,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createEvent( createInfo, allocator );
       }
 #  endif
 
-      Event( Device const & device, VkEvent event, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_event( event ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) ), m_dispatcher( device.getDispatcher() )
+      Event( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VkEvent                                                                         event,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device )
+        , m_event( event )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
+        , m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -10186,10 +8238,10 @@ namespace VULKAN_HPP_NAMESPACE
       Event( Event const & ) = delete;
 
       Event( Event && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_event( exchange( rhs.m_event, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_event( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_event, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10207,16 +8259,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Event const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Event const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_event;
       }
 
-      VULKAN_HPP_NAMESPACE::Event const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_event );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Event() const VULKAN_HPP_NOEXCEPT
       {
         return m_event;
@@ -10240,7 +8287,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_event, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_event, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -10248,13 +8295,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Event & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Event & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_event, rhs.m_event );
@@ -10264,201 +8311,65 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-      VULKAN_HPP_NODISCARD Result getStatus() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getStatus() const;
 
-      // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-      typename ResultValueType<void>::type set() const;
+      void set() const;
 
-      // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-      typename ResultValueType<void>::type reset() const;
+      void reset() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Event      m_event      = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Event                                               m_event      = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Event>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkExternalComputeQueueNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalComputeQueueNV.html
-    class ExternalComputeQueueNV
-    {
-    public:
-      using CType   = VkExternalComputeQueueNV;
-      using CppType = VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eExternalComputeQueueNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ExternalComputeQueueNV( Device const &                           device,
-                              ExternalComputeQueueCreateInfoNV const & createInfo,
-                              Optional<const AllocationCallbacks>      allocator = nullptr )
-      {
-        *this = device.createExternalComputeQueueNV( createInfo, allocator );
-      }
-#  endif
-
-      ExternalComputeQueueNV( Device const & device, VkExternalComputeQueueNV externalQueue, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_externalComputeQueueNV( externalQueue )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      ExternalComputeQueueNV( std::nullptr_t ) {}
-
-      ~ExternalComputeQueueNV()
-      {
-        clear();
-      }
-
-      ExternalComputeQueueNV()                                 = delete;
-      ExternalComputeQueueNV( ExternalComputeQueueNV const & ) = delete;
-
-      ExternalComputeQueueNV( ExternalComputeQueueNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_externalComputeQueueNV( exchange( rhs.m_externalComputeQueueNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      ExternalComputeQueueNV & operator=( ExternalComputeQueueNV const & ) = delete;
-
-      ExternalComputeQueueNV & operator=( ExternalComputeQueueNV && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_externalComputeQueueNV, rhs.m_externalComputeQueueNV );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_externalComputeQueueNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_externalComputeQueueNV );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_externalComputeQueueNV;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_externalComputeQueueNV )
-        {
-          getDispatcher()->vkDestroyExternalComputeQueueNV( static_cast<VkDevice>( m_device ),
-                                                            static_cast<VkExternalComputeQueueNV>( m_externalComputeQueueNV ),
-                                                            reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device                 = nullptr;
-        m_externalComputeQueueNV = nullptr;
-        m_allocator              = nullptr;
-        m_dispatcher             = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_externalComputeQueueNV, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( ExternalComputeQueueNV & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_externalComputeQueueNV, rhs.m_externalComputeQueueNV );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-      //=== VK_NV_external_compute_queue ===
-
-      // wrapper function for command vkGetExternalComputeQueueDataNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-      template <typename DataType>
-      VULKAN_HPP_NODISCARD std::pair<ExternalComputeQueueDataParamsNV, DataType> getData() const VULKAN_HPP_NOEXCEPT;
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device                 m_device                 = {};
-      VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV m_externalComputeQueueNV = {};
-      const AllocationCallbacks *                  m_allocator              = {};
-      detail::DeviceDispatcher const *             m_dispatcher             = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<ExternalComputeQueueNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFence.html
     class Fence
     {
     public:
       using CType   = VkFence;
       using CppType = VULKAN_HPP_NAMESPACE::Fence;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eFence;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eFence;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eFence;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFence;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Fence( Device const & device, FenceCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VULKAN_HPP_NAMESPACE::FenceCreateInfo const &                                   createInfo,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createFence( createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Fence( Device const & device, DeviceEventInfoEXT const & deviceEventInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT const &                                deviceEventInfo,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.registerEventEXT( deviceEventInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Fence( Device const &                      device,
-             DisplayKHR const &                  display,
-             DisplayEventInfoEXT const &         displayEventInfo,
-             Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR const &             display,
+             VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT const &                               displayEventInfo,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.registerDisplayEventEXT( display, displayEventInfo, allocator );
       }
 #  endif
 
-      Fence( Device const & device, VkFence fence, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_fence( fence ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) ), m_dispatcher( device.getDispatcher() )
+      Fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VkFence                                                                         fence,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device )
+        , m_fence( fence )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
+        , m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -10473,10 +8384,10 @@ namespace VULKAN_HPP_NAMESPACE
       Fence( Fence const & ) = delete;
 
       Fence( Fence && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_fence( exchange( rhs.m_fence, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_fence, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10494,16 +8405,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Fence const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Fence const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_fence;
       }
 
-      VULKAN_HPP_NAMESPACE::Fence const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_fence );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Fence() const VULKAN_HPP_NOEXCEPT
       {
         return m_fence;
@@ -10527,7 +8433,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_fence, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_fence, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -10535,13 +8441,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Fence & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_fence, rhs.m_fence );
@@ -10551,44 +8457,41 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-      VULKAN_HPP_NODISCARD Result getStatus() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getStatus() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Fence      m_fence      = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Fence                                               m_fence      = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Fence>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebuffer.html
     class Framebuffer
     {
     public:
       using CType   = VkFramebuffer;
       using CppType = VULKAN_HPP_NAMESPACE::Framebuffer;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eFramebuffer;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eFramebuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eFramebuffer;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eFramebuffer;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Framebuffer( Device const & device, FramebufferCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Framebuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VULKAN_HPP_NAMESPACE::FramebufferCreateInfo const &                             createInfo,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createFramebuffer( createInfo, allocator );
       }
 #  endif
 
-      Framebuffer( Device const & device, VkFramebuffer framebuffer, Optional<const AllocationCallbacks> allocator = nullptr )
+      Framebuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VkFramebuffer                                                                   framebuffer,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_framebuffer( framebuffer )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -10604,10 +8507,10 @@ namespace VULKAN_HPP_NAMESPACE
       Framebuffer( Framebuffer const & ) = delete;
 
       Framebuffer( Framebuffer && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_framebuffer( exchange( rhs.m_framebuffer, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_framebuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_framebuffer, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10625,16 +8528,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Framebuffer const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Framebuffer const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_framebuffer;
       }
 
-      VULKAN_HPP_NAMESPACE::Framebuffer const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_framebuffer );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Framebuffer() const VULKAN_HPP_NOEXCEPT
       {
         return m_framebuffer;
@@ -10658,7 +8556,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_framebuffer, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_framebuffer, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -10666,13 +8564,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Framebuffer & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Framebuffer & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_framebuffer, rhs.m_framebuffer );
@@ -10682,43 +8580,42 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_QCOM_tile_properties ===
 
-      // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<TilePropertiesQCOM>>::type getTilePropertiesQCOM() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM> getTilePropertiesQCOM() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device      m_device      = {};
-      VULKAN_HPP_NAMESPACE::Framebuffer m_framebuffer = {};
-      const AllocationCallbacks *       m_allocator   = {};
-      detail::DeviceDispatcher const *  m_dispatcher  = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device      = {};
+      VULKAN_HPP_NAMESPACE::Framebuffer                                         m_framebuffer = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator   = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher  = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Framebuffer>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImage.html
     class Image
     {
     public:
       using CType   = VkImage;
       using CppType = VULKAN_HPP_NAMESPACE::Image;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eImage;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eImage;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eImage;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImage;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Image( Device const & device, ImageCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Image( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VULKAN_HPP_NAMESPACE::ImageCreateInfo const &                                   createInfo,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createImage( createInfo, allocator );
       }
 #  endif
 
-      Image( Device const & device, VkImage image, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_image( image ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) ), m_dispatcher( device.getDispatcher() )
+      Image( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+             VkImage                                                                         image,
+             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device )
+        , m_image( image )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
+        , m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -10733,10 +8630,10 @@ namespace VULKAN_HPP_NAMESPACE
       Image( Image const & ) = delete;
 
       Image( Image && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_image( exchange( rhs.m_image, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_image( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_image, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10754,16 +8651,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Image const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Image const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_image;
       }
 
-      VULKAN_HPP_NAMESPACE::Image const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_image );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Image() const VULKAN_HPP_NOEXCEPT
       {
         return m_image;
@@ -10787,7 +8679,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_image, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_image, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -10795,13 +8687,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Image & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Image & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_image, rhs.m_image );
@@ -10811,116 +8703,70 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-      typename ResultValueType<void>::type bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, DeviceSize memoryOffset ) const;
+      void bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const;
 
-      // wrapper function for command vkGetImageMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-      VULKAN_HPP_NODISCARD MemoryRequirements getMemoryRequirements() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::MemoryRequirements getMemoryRequirements() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageSparseMemoryRequirements, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-      VULKAN_HPP_NODISCARD std::vector<SparseImageMemoryRequirements> getSparseMemoryRequirements() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements> getSparseMemoryRequirements() const;
 
-      // wrapper function for command vkGetImageSubresourceLayout, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-      VULKAN_HPP_NODISCARD SubresourceLayout getSubresourceLayout( const ImageSubresource & subresource ) const VULKAN_HPP_NOEXCEPT;
-
-      //=== VK_VERSION_1_4 ===
-
-      // wrapper function for command vkGetImageSubresourceLayout2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-      VULKAN_HPP_NODISCARD SubresourceLayout2 getSubresourceLayout2( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkGetImageSubresourceLayout2, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-      template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getSubresourceLayout2( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout
+                           getSubresourceLayout( const VULKAN_HPP_NAMESPACE::ImageSubresource & subresource ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_image_drm_format_modifier ===
 
-      // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageDrmFormatModifierPropertiesEXT>::type getDrmFormatModifierPropertiesEXT() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT getDrmFormatModifierPropertiesEXT() const;
 
       //=== VK_EXT_host_image_copy ===
 
-      // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-      VULKAN_HPP_NODISCARD SubresourceLayout2 getSubresourceLayout2EXT( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                           getSubresourceLayout2EXT( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getSubresourceLayout2EXT( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getSubresourceLayout2EXT( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_maintenance5 ===
 
-      // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-      VULKAN_HPP_NODISCARD SubresourceLayout2 getSubresourceLayout2KHR( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+                           getSubresourceLayout2KHR( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
       template <typename X, typename Y, typename... Z>
-      VULKAN_HPP_NODISCARD StructureChain<X, Y, Z...> getSubresourceLayout2KHR( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT;
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_native_buffer ===
-
-      // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-      typename ResultValueType<void>::type acquireOHOS( int32_t                                   nativeFenceFd,
-                                                        VULKAN_HPP_NAMESPACE::Semaphore semaphore VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                        VULKAN_HPP_NAMESPACE::Fence fence         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-    protected:
-      Image( VULKAN_HPP_NAMESPACE::Device     device,
-             VULKAN_HPP_NAMESPACE::Image      image,
-             const AllocationCallbacks *      allocator,
-             detail::DeviceDispatcher const * dispatcher ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( device, {} ) )
-        , m_image( exchange( image, {} ) )
-        , m_allocator( exchange( allocator, {} ) )
-        , m_dispatcher( exchange( dispatcher, nullptr ) )
-      {
-      }
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                           getSubresourceLayout2KHR( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Image      m_image      = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Image                                               m_image      = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Image>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageView.html
     class ImageView
     {
     public:
       using CType   = VkImageView;
       using CppType = VULKAN_HPP_NAMESPACE::ImageView;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eImageView;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eImageView;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eImageView;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eImageView;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ImageView( Device const & device, ImageViewCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      ImageView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VULKAN_HPP_NAMESPACE::ImageViewCreateInfo const &                               createInfo,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createImageView( createInfo, allocator );
       }
 #  endif
 
-      ImageView( Device const & device, VkImageView imageView, Optional<const AllocationCallbacks> allocator = nullptr )
+      ImageView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VkImageView                                                                     imageView,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_imageView( imageView )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -10936,10 +8782,10 @@ namespace VULKAN_HPP_NAMESPACE
       ImageView( ImageView const & ) = delete;
 
       ImageView( ImageView && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_imageView( exchange( rhs.m_imageView, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_imageView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_imageView, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -10957,16 +8803,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::ImageView const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::ImageView const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_imageView;
       }
 
-      VULKAN_HPP_NAMESPACE::ImageView const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_imageView );
-      }
-
       operator VULKAN_HPP_NAMESPACE::ImageView() const VULKAN_HPP_NOEXCEPT
       {
         return m_imageView;
@@ -10990,7 +8831,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_imageView, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_imageView, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -10998,13 +8839,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( ImageView & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ImageView & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_imageView, rhs.m_imageView );
@@ -11014,179 +8855,41 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_NVX_image_view_handle ===
 
-      // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ImageViewAddressPropertiesNVX>::type getAddressNVX() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX getAddressNVX() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::ImageView  m_imageView  = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::ImageView                                           m_imageView  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<ImageView>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkIndirectCommandsLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutEXT.html
-    class IndirectCommandsLayoutEXT
-    {
-    public:
-      using CType   = VkIndirectCommandsLayoutEXT;
-      using CppType = VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectCommandsLayoutEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      IndirectCommandsLayoutEXT( Device const &                              device,
-                                 IndirectCommandsLayoutCreateInfoEXT const & createInfo,
-                                 Optional<const AllocationCallbacks>         allocator = nullptr )
-      {
-        *this = device.createIndirectCommandsLayoutEXT( createInfo, allocator );
-      }
-#  endif
-
-      IndirectCommandsLayoutEXT( Device const &                      device,
-                                 VkIndirectCommandsLayoutEXT         indirectCommandsLayout,
-                                 Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_indirectCommandsLayoutEXT( indirectCommandsLayout )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      IndirectCommandsLayoutEXT( std::nullptr_t ) {}
-
-      ~IndirectCommandsLayoutEXT()
-      {
-        clear();
-      }
-
-      IndirectCommandsLayoutEXT()                                    = delete;
-      IndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT const & ) = delete;
-
-      IndirectCommandsLayoutEXT( IndirectCommandsLayoutEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_indirectCommandsLayoutEXT( exchange( rhs.m_indirectCommandsLayoutEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      IndirectCommandsLayoutEXT & operator=( IndirectCommandsLayoutEXT const & ) = delete;
-
-      IndirectCommandsLayoutEXT & operator=( IndirectCommandsLayoutEXT && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_indirectCommandsLayoutEXT, rhs.m_indirectCommandsLayoutEXT );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_indirectCommandsLayoutEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_indirectCommandsLayoutEXT );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_indirectCommandsLayoutEXT;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_indirectCommandsLayoutEXT )
-        {
-          getDispatcher()->vkDestroyIndirectCommandsLayoutEXT( static_cast<VkDevice>( m_device ),
-                                                               static_cast<VkIndirectCommandsLayoutEXT>( m_indirectCommandsLayoutEXT ),
-                                                               reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device                    = nullptr;
-        m_indirectCommandsLayoutEXT = nullptr;
-        m_allocator                 = nullptr;
-        m_dispatcher                = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_indirectCommandsLayoutEXT, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( IndirectCommandsLayoutEXT & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_indirectCommandsLayoutEXT, rhs.m_indirectCommandsLayoutEXT );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device                    m_device                    = {};
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT m_indirectCommandsLayoutEXT = {};
-      const AllocationCallbacks *                     m_allocator                 = {};
-      detail::DeviceDispatcher const *                m_dispatcher                = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<IndirectCommandsLayoutEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkIndirectCommandsLayoutNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutNV.html
     class IndirectCommandsLayoutNV
     {
     public:
       using CType   = VkIndirectCommandsLayoutNV;
       using CppType = VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectCommandsLayoutNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eIndirectCommandsLayoutNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      IndirectCommandsLayoutNV( Device const &                             device,
-                                IndirectCommandsLayoutCreateInfoNV const & createInfo,
-                                Optional<const AllocationCallbacks>        allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      IndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV const &                createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createIndirectCommandsLayoutNV( createInfo, allocator );
       }
 #  endif
 
-      IndirectCommandsLayoutNV( Device const &                      device,
-                                VkIndirectCommandsLayoutNV          indirectCommandsLayout,
-                                Optional<const AllocationCallbacks> allocator = nullptr )
+      IndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                VkIndirectCommandsLayoutNV                                                      indirectCommandsLayout,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_indirectCommandsLayoutNV( indirectCommandsLayout )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_indirectCommandsLayout( indirectCommandsLayout )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -11202,10 +8905,10 @@ namespace VULKAN_HPP_NAMESPACE
       IndirectCommandsLayoutNV( IndirectCommandsLayoutNV const & ) = delete;
 
       IndirectCommandsLayoutNV( IndirectCommandsLayoutNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_indirectCommandsLayoutNV( exchange( rhs.m_indirectCommandsLayoutNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_indirectCommandsLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_indirectCommandsLayout, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -11216,40 +8919,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_indirectCommandsLayoutNV, rhs.m_indirectCommandsLayoutNV );
+          std::swap( m_indirectCommandsLayout, rhs.m_indirectCommandsLayout );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_indirectCommandsLayoutNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_indirectCommandsLayoutNV );
+        return m_indirectCommandsLayout;
       }
 
       operator VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV() const VULKAN_HPP_NOEXCEPT
       {
-        return m_indirectCommandsLayoutNV;
+        return m_indirectCommandsLayout;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_indirectCommandsLayoutNV )
+        if ( m_indirectCommandsLayout )
         {
           getDispatcher()->vkDestroyIndirectCommandsLayoutNV( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkIndirectCommandsLayoutNV>( m_indirectCommandsLayoutNV ),
+                                                              static_cast<VkIndirectCommandsLayoutNV>( m_indirectCommandsLayout ),
                                                               reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                   = nullptr;
-        m_indirectCommandsLayoutNV = nullptr;
-        m_allocator                = nullptr;
-        m_dispatcher               = nullptr;
+        m_device                 = nullptr;
+        m_indirectCommandsLayout = nullptr;
+        m_allocator              = nullptr;
+        m_dispatcher             = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV release()
@@ -11257,7 +8955,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_indirectCommandsLayoutNV, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_indirectCommandsLayout, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -11265,194 +8963,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( IndirectCommandsLayoutNV & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutNV & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_indirectCommandsLayoutNV, rhs.m_indirectCommandsLayoutNV );
+        std::swap( m_indirectCommandsLayout, rhs.m_indirectCommandsLayout );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                   m_device                   = {};
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV m_indirectCommandsLayoutNV = {};
-      const AllocationCallbacks *                    m_allocator                = {};
-      detail::DeviceDispatcher const *               m_dispatcher               = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                 = {};
+      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV                            m_indirectCommandsLayout = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator              = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher             = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<IndirectCommandsLayoutNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkIndirectExecutionSetEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetEXT.html
-    class IndirectExecutionSetEXT
-    {
-    public:
-      using CType   = VkIndirectExecutionSetEXT;
-      using CppType = VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eIndirectExecutionSetEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      IndirectExecutionSetEXT( Device const &                            device,
-                               IndirectExecutionSetCreateInfoEXT const & createInfo,
-                               Optional<const AllocationCallbacks>       allocator = nullptr )
-      {
-        *this = device.createIndirectExecutionSetEXT( createInfo, allocator );
-      }
-#  endif
-
-      IndirectExecutionSetEXT( Device const & device, VkIndirectExecutionSetEXT indirectExecutionSet, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_indirectExecutionSetEXT( indirectExecutionSet )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      IndirectExecutionSetEXT( std::nullptr_t ) {}
-
-      ~IndirectExecutionSetEXT()
-      {
-        clear();
-      }
-
-      IndirectExecutionSetEXT()                                  = delete;
-      IndirectExecutionSetEXT( IndirectExecutionSetEXT const & ) = delete;
-
-      IndirectExecutionSetEXT( IndirectExecutionSetEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_indirectExecutionSetEXT( exchange( rhs.m_indirectExecutionSetEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      IndirectExecutionSetEXT & operator=( IndirectExecutionSetEXT const & ) = delete;
-
-      IndirectExecutionSetEXT & operator=( IndirectExecutionSetEXT && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_indirectExecutionSetEXT, rhs.m_indirectExecutionSetEXT );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_indirectExecutionSetEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_indirectExecutionSetEXT );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_indirectExecutionSetEXT;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_indirectExecutionSetEXT )
-        {
-          getDispatcher()->vkDestroyIndirectExecutionSetEXT( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkIndirectExecutionSetEXT>( m_indirectExecutionSetEXT ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device                  = nullptr;
-        m_indirectExecutionSetEXT = nullptr;
-        m_allocator               = nullptr;
-        m_dispatcher              = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_indirectExecutionSetEXT, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( IndirectExecutionSetEXT & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_indirectExecutionSetEXT, rhs.m_indirectExecutionSetEXT );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-      //=== VK_EXT_device_generated_commands ===
-
-      // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-      void updatePipeline( ArrayProxy<const WriteIndirectExecutionSetPipelineEXT> const & executionSetWrites ) const VULKAN_HPP_NOEXCEPT;
-
-      // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-      void updateShader( ArrayProxy<const WriteIndirectExecutionSetShaderEXT> const & executionSetWrites ) const VULKAN_HPP_NOEXCEPT;
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device                  m_device                  = {};
-      VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT m_indirectExecutionSetEXT = {};
-      const AllocationCallbacks *                   m_allocator               = {};
-      detail::DeviceDispatcher const *              m_dispatcher              = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<IndirectExecutionSetEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapEXT.html
     class MicromapEXT
     {
     public:
       using CType   = VkMicromapEXT;
       using CppType = VULKAN_HPP_NAMESPACE::MicromapEXT;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eMicromapEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eMicromapEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      MicromapEXT( Device const & device, MicromapCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      MicromapEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT const &                             createInfo,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createMicromapEXT( createInfo, allocator );
       }
 #  endif
 
-      MicromapEXT( Device const & device, VkMicromapEXT micromap, Optional<const AllocationCallbacks> allocator = nullptr )
+      MicromapEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                   VkMicromapEXT                                                                   micromap,
+                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_micromapEXT( micromap )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_micromap( micromap )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -11468,10 +9025,10 @@ namespace VULKAN_HPP_NAMESPACE
       MicromapEXT( MicromapEXT const & ) = delete;
 
       MicromapEXT( MicromapEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_micromapEXT( exchange( rhs.m_micromapEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_micromap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_micromap, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -11482,39 +9039,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_micromapEXT, rhs.m_micromapEXT );
+          std::swap( m_micromap, rhs.m_micromap );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::MicromapEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::MicromapEXT const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_micromapEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::MicromapEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_micromapEXT );
+        return m_micromap;
       }
 
       operator VULKAN_HPP_NAMESPACE::MicromapEXT() const VULKAN_HPP_NOEXCEPT
       {
-        return m_micromapEXT;
+        return m_micromap;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_micromapEXT )
+        if ( m_micromap )
         {
           getDispatcher()->vkDestroyMicromapEXT(
-            static_cast<VkDevice>( m_device ), static_cast<VkMicromapEXT>( m_micromapEXT ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkMicromapEXT>( m_micromap ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device      = nullptr;
-        m_micromapEXT = nullptr;
-        m_allocator   = nullptr;
-        m_dispatcher  = nullptr;
+        m_device     = nullptr;
+        m_micromap   = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::MicromapEXT release()
@@ -11522,7 +9074,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_micromapEXT, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_micromap, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -11530,55 +9082,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( MicromapEXT & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::MicromapEXT & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_micromapEXT, rhs.m_micromapEXT );
+        std::swap( m_micromap, rhs.m_micromap );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device      m_device      = {};
-      VULKAN_HPP_NAMESPACE::MicromapEXT m_micromapEXT = {};
-      const AllocationCallbacks *       m_allocator   = {};
-      detail::DeviceDispatcher const *  m_dispatcher  = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::MicromapEXT                                         m_micromap   = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<MicromapEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkOpticalFlowSessionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionNV.html
     class OpticalFlowSessionNV
     {
     public:
       using CType   = VkOpticalFlowSessionNV;
       using CppType = VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eOpticalFlowSessionNV;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eOpticalFlowSessionNV;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      OpticalFlowSessionNV( Device const & device, OpticalFlowSessionCreateInfoNV const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      OpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                            VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV const &                    createInfo,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createOpticalFlowSessionNV( createInfo, allocator );
       }
 #  endif
 
-      OpticalFlowSessionNV( Device const & device, VkOpticalFlowSessionNV session, Optional<const AllocationCallbacks> allocator = nullptr )
+      OpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                            VkOpticalFlowSessionNV                                                          session,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_opticalFlowSessionNV( session )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_session( session )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -11594,10 +9144,10 @@ namespace VULKAN_HPP_NAMESPACE
       OpticalFlowSessionNV( OpticalFlowSessionNV const & ) = delete;
 
       OpticalFlowSessionNV( OpticalFlowSessionNV && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_opticalFlowSessionNV( exchange( rhs.m_opticalFlowSessionNV, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_session( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_session, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -11608,40 +9158,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_opticalFlowSessionNV, rhs.m_opticalFlowSessionNV );
+          std::swap( m_session, rhs.m_session );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_opticalFlowSessionNV;
-      }
-
-      VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_opticalFlowSessionNV );
+        return m_session;
       }
 
       operator VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV() const VULKAN_HPP_NOEXCEPT
       {
-        return m_opticalFlowSessionNV;
+        return m_session;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_opticalFlowSessionNV )
+        if ( m_session )
         {
           getDispatcher()->vkDestroyOpticalFlowSessionNV( static_cast<VkDevice>( m_device ),
-                                                          static_cast<VkOpticalFlowSessionNV>( m_opticalFlowSessionNV ),
+                                                          static_cast<VkOpticalFlowSessionNV>( m_session ),
                                                           reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device               = nullptr;
-        m_opticalFlowSessionNV = nullptr;
-        m_allocator            = nullptr;
-        m_dispatcher           = nullptr;
+        m_device     = nullptr;
+        m_session    = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV release()
@@ -11649,7 +9194,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_opticalFlowSessionNV, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_session, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -11657,61 +9202,54 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( OpticalFlowSessionNV & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::OpticalFlowSessionNV & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_opticalFlowSessionNV, rhs.m_opticalFlowSessionNV );
+        std::swap( m_session, rhs.m_session );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_NV_optical_flow ===
 
-      // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-      typename ResultValueType<void>::type
-        bindImage( OpticalFlowSessionBindingPointNV bindingPoint, VULKAN_HPP_NAMESPACE::ImageView view, ImageLayout layout ) const;
+      void bindImage( VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                      VULKAN_HPP_NAMESPACE::ImageView                        view,
+                      VULKAN_HPP_NAMESPACE::ImageLayout                      layout ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device               m_device               = {};
-      VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV m_opticalFlowSessionNV = {};
-      const AllocationCallbacks *                m_allocator            = {};
-      detail::DeviceDispatcher const *           m_dispatcher           = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV                                m_session    = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<OpticalFlowSessionNV>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkPerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceConfigurationINTEL.html
     class PerformanceConfigurationINTEL
     {
     public:
       using CType   = VkPerformanceConfigurationINTEL;
       using CppType = VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePerformanceConfigurationINTEL;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePerformanceConfigurationINTEL;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PerformanceConfigurationINTEL( Device const & device, PerformanceConfigurationAcquireInfoINTEL const & acquireInfo )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      PerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &        device,
+                                     VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL const & acquireInfo )
       {
         *this = device.acquirePerformanceConfigurationINTEL( acquireInfo );
       }
 #  endif
 
-      PerformanceConfigurationINTEL( Device const & device, VkPerformanceConfigurationINTEL configuration )
-        : m_device( device ), m_performanceConfigurationINTEL( configuration ), m_dispatcher( device.getDispatcher() )
+      PerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, VkPerformanceConfigurationINTEL configuration )
+        : m_device( device ), m_configuration( configuration ), m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -11726,9 +9264,9 @@ namespace VULKAN_HPP_NAMESPACE
       PerformanceConfigurationINTEL( PerformanceConfigurationINTEL const & ) = delete;
 
       PerformanceConfigurationINTEL( PerformanceConfigurationINTEL && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_performanceConfigurationINTEL( exchange( rhs.m_performanceConfigurationINTEL, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_configuration( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_configuration, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -11739,44 +9277,39 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_performanceConfigurationINTEL, rhs.m_performanceConfigurationINTEL );
+          std::swap( m_configuration, rhs.m_configuration );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_performanceConfigurationINTEL;
-      }
-
-      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_performanceConfigurationINTEL );
+        return m_configuration;
       }
 
       operator VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL() const VULKAN_HPP_NOEXCEPT
       {
-        return m_performanceConfigurationINTEL;
+        return m_configuration;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_performanceConfigurationINTEL )
+        if ( m_configuration )
         {
           getDispatcher()->vkReleasePerformanceConfigurationINTEL( static_cast<VkDevice>( m_device ),
-                                                                   static_cast<VkPerformanceConfigurationINTEL>( m_performanceConfigurationINTEL ) );
+                                                                   static_cast<VkPerformanceConfigurationINTEL>( m_configuration ) );
         }
-        m_device                        = nullptr;
-        m_performanceConfigurationINTEL = nullptr;
-        m_dispatcher                    = nullptr;
+        m_device        = nullptr;
+        m_configuration = nullptr;
+        m_dispatcher    = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL release()
       {
         m_device     = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_performanceConfigurationINTEL, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_configuration, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -11784,53 +9317,51 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( PerformanceConfigurationINTEL & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PerformanceConfigurationINTEL & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_performanceConfigurationINTEL, rhs.m_performanceConfigurationINTEL );
+        std::swap( m_configuration, rhs.m_configuration );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                        m_device                        = {};
-      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL m_performanceConfigurationINTEL = {};
-      detail::DeviceDispatcher const *                    m_dispatcher                    = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device        = {};
+      VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL                       m_configuration = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher    = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<PerformanceConfigurationINTEL>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkPipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCache.html
     class PipelineCache
     {
     public:
       using CType   = VkPipelineCache;
       using CppType = VULKAN_HPP_NAMESPACE::PipelineCache;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineCache;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipelineCache;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipelineCache;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineCache;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PipelineCache( Device const & device, PipelineCacheCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      PipelineCache( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                     VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo const &                           createInfo,
+                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createPipelineCache( createInfo, allocator );
       }
 #  endif
 
-      PipelineCache( Device const & device, VkPipelineCache pipelineCache, Optional<const AllocationCallbacks> allocator = nullptr )
+      PipelineCache( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                     VkPipelineCache                                                                 pipelineCache,
+                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_pipelineCache( pipelineCache )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -11846,10 +9377,10 @@ namespace VULKAN_HPP_NAMESPACE
       PipelineCache( PipelineCache const & ) = delete;
 
       PipelineCache( PipelineCache && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_pipelineCache( exchange( rhs.m_pipelineCache, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_pipelineCache( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipelineCache, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -11867,16 +9398,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::PipelineCache const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::PipelineCache const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipelineCache;
       }
 
-      VULKAN_HPP_NAMESPACE::PipelineCache const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_pipelineCache );
-      }
-
       operator VULKAN_HPP_NAMESPACE::PipelineCache() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipelineCache;
@@ -11901,7 +9427,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_pipelineCache, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_pipelineCache, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -11909,13 +9435,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( PipelineCache & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_pipelineCache, rhs.m_pipelineCache );
@@ -11925,104 +9451,88 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t>>::type getData() const;
+      VULKAN_HPP_NODISCARD std::vector<uint8_t> getData() const;
 
-      // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-      typename ResultValueType<void>::type merge( ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches ) const;
+      void merge( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device        m_device        = {};
-      VULKAN_HPP_NAMESPACE::PipelineCache m_pipelineCache = {};
-      const AllocationCallbacks *         m_allocator     = {};
-      detail::DeviceDispatcher const *    m_dispatcher    = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device        = {};
+      VULKAN_HPP_NAMESPACE::PipelineCache                                       m_pipelineCache = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator     = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher    = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<PipelineCache>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipeline.html
     class Pipeline
     {
     public:
       using CType   = VkPipeline;
       using CppType = VULKAN_HPP_NAMESPACE::Pipeline;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipeline;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipeline;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipeline;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipeline;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipeline( Device const &                        device,
-                Optional<const PipelineCache> const & pipelineCache,
-                ComputePipelineCreateInfo const &     createInfo,
-                Optional<const AllocationCallbacks>   allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo const &                                                      createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createComputePipeline( pipelineCache, createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipeline( Device const &                               device,
-                Optional<const DeferredOperationKHR> const & deferredOperation,
-                Optional<const PipelineCache> const &        pipelineCache,
-                DataGraphPipelineCreateInfoARM const &       createInfo,
-                Optional<const AllocationCallbacks>          allocator = nullptr )
-      {
-        *this = device.createDataGraphPipelineARM( deferredOperation, pipelineCache, createInfo, allocator );
-      }
-#  endif
-
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_ENABLE_BETA_EXTENSIONS )
-      Pipeline( Device const &                               device,
-                Optional<const PipelineCache> const &        pipelineCache,
-                ExecutionGraphPipelineCreateInfoAMDX const & createInfo,
-                Optional<const AllocationCallbacks>          allocator = nullptr )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX const &                                           createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createExecutionGraphPipelineAMDX( pipelineCache, createInfo, allocator );
       }
 #    endif /*VK_ENABLE_BETA_EXTENSIONS*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipeline( Device const &                        device,
-                Optional<const PipelineCache> const & pipelineCache,
-                GraphicsPipelineCreateInfo const &    createInfo,
-                Optional<const AllocationCallbacks>   allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo const &                                                     createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createGraphicsPipeline( pipelineCache, createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipeline( Device const &                               device,
-                Optional<const DeferredOperationKHR> const & deferredOperation,
-                Optional<const PipelineCache> const &        pipelineCache,
-                RayTracingPipelineCreateInfoKHR const &      createInfo,
-                Optional<const AllocationCallbacks>          allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                                     device,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+                VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR const &                                                       createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                     allocator = nullptr )
       {
         *this = device.createRayTracingPipelineKHR( deferredOperation, pipelineCache, createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipeline( Device const &                         device,
-                Optional<const PipelineCache> const &  pipelineCache,
-                RayTracingPipelineCreateInfoNV const & createInfo,
-                Optional<const AllocationCallbacks>    allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV const &                                                 createInfo,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createRayTracingPipelineNV( pipelineCache, createInfo, allocator );
       }
 #  endif
 
-      Pipeline( Device const & device, VkPipeline pipeline, Optional<const AllocationCallbacks> allocator = nullptr, Result successCode = Result::eSuccess )
+      Pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                VkPipeline                                                                      pipeline,
+                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator   = nullptr,
+                VULKAN_HPP_NAMESPACE::Result                                                    successCode = VULKAN_HPP_NAMESPACE::Result::eSuccess )
         : m_device( device )
         , m_pipeline( pipeline )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_constructorSuccessCode( successCode )
         , m_dispatcher( device.getDispatcher() )
       {
@@ -12039,11 +9549,11 @@ namespace VULKAN_HPP_NAMESPACE
       Pipeline( Pipeline const & ) = delete;
 
       Pipeline( Pipeline && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_pipeline( exchange( rhs.m_pipeline, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_constructorSuccessCode( exchange( rhs.m_constructorSuccessCode, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipeline, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_constructorSuccessCode( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_constructorSuccessCode, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -12062,16 +9572,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Pipeline const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Pipeline const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipeline;
       }
 
-      VULKAN_HPP_NAMESPACE::Pipeline const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_pipeline );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Pipeline() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipeline;
@@ -12087,7 +9592,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device                 = nullptr;
         m_pipeline               = nullptr;
         m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
+        m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
         m_dispatcher             = nullptr;
       }
 
@@ -12095,12 +9600,12 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_device                 = nullptr;
         m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
+        m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
         m_dispatcher             = nullptr;
-        return exchange( m_pipeline, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_pipeline, nullptr );
       }
 
-      Result getConstructorSuccessCode() const
+      VULKAN_HPP_NAMESPACE::Result getConstructorSuccessCode() const
       {
         return m_constructorSuccessCode;
       }
@@ -12110,13 +9615,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Pipeline & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_pipeline, rhs.m_pipeline );
@@ -12127,144 +9632,104 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_AMD_shader_info ===
 
-      // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t>>::type getShaderInfoAMD( ShaderStageFlagBits shaderStage,
-                                                                                                  ShaderInfoTypeAMD   infoType ) const;
+      VULKAN_HPP_NODISCARD std::vector<uint8_t> getShaderInfoAMD( VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                                                                  VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType ) const;
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
       //=== VK_AMDX_shader_enqueue ===
 
-      // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<ExecutionGraphPipelineScratchSizeAMDX>::type getExecutionGraphScratchSizeAMDX() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX getExecutionGraphScratchSizeAMDX() const;
 
-      // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type
-        getExecutionGraphNodeIndexAMDX( const PipelineShaderStageNodeCreateInfoAMDX & nodeInfo ) const;
+      VULKAN_HPP_NODISCARD uint32_t getExecutionGraphNodeIndexAMDX( const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX & nodeInfo ) const;
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
       //=== VK_KHR_ray_tracing_pipeline ===
 
-      // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type
-        getRayTracingShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType> getRayTracingShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
 
-      // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const;
+      VULKAN_HPP_NODISCARD DataType getRayTracingShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const;
 
-      // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type
-        getRayTracingCaptureReplayShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType>
+                           getRayTracingCaptureReplayShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
 
-      // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingCaptureReplayShaderGroupHandleKHR( uint32_t firstGroup,
-                                                                                                                    uint32_t groupCount ) const;
+      VULKAN_HPP_NODISCARD DataType getRayTracingCaptureReplayShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const;
 
-      // wrapper function for command vkGetRayTracingShaderGroupStackSizeKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupStackSizeKHR.html
-      VULKAN_HPP_NODISCARD DeviceSize getRayTracingShaderGroupStackSizeKHR( uint32_t group, ShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DeviceSize
+        getRayTracingShaderGroupStackSizeKHR( uint32_t group, VULKAN_HPP_NAMESPACE::ShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_ray_tracing ===
 
-      // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<DataType>>::type
-        getRayTracingShaderGroupHandlesNV( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
+      VULKAN_HPP_NODISCARD std::vector<DataType> getRayTracingShaderGroupHandlesNV( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const;
 
-      // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD typename ResultValueType<DataType>::type getRayTracingShaderGroupHandleNV( uint32_t firstGroup, uint32_t groupCount ) const;
+      VULKAN_HPP_NODISCARD DataType getRayTracingShaderGroupHandleNV( uint32_t firstGroup, uint32_t groupCount ) const;
 
-      // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-      typename ResultValueType<void>::type compileDeferredNV( uint32_t shader ) const;
+      void compileDeferredNV( uint32_t shader ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device                 = {};
-      VULKAN_HPP_NAMESPACE::Pipeline   m_pipeline               = {};
-      const AllocationCallbacks *      m_allocator              = {};
-      Result                           m_constructorSuccessCode = Result::eErrorUnknown;
-      detail::DeviceDispatcher const * m_dispatcher             = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                 = {};
+      VULKAN_HPP_NAMESPACE::Pipeline                                            m_pipeline               = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator              = {};
+      VULKAN_HPP_NAMESPACE::Result                                              m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher             = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Pipeline>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class Pipelines : public std::vector<Pipeline>
+    class Pipelines : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipelines( Device const &                                device,
-                 Optional<const PipelineCache> const &         pipelineCache,
-                 ArrayProxy<ComputePipelineCreateInfo> const & createInfos,
-                 Optional<const AllocationCallbacks>           allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipelines( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const &                    createInfos,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createComputePipelines( pipelineCache, createInfos, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipelines( Device const &                                     device,
-                 Optional<const DeferredOperationKHR> const &       deferredOperation,
-                 Optional<const PipelineCache> const &              pipelineCache,
-                 ArrayProxy<DataGraphPipelineCreateInfoARM> const & createInfos,
-                 Optional<const AllocationCallbacks>                allocator = nullptr )
-      {
-        *this = device.createDataGraphPipelinesARM( deferredOperation, pipelineCache, createInfos, allocator );
-      }
-#  endif
-
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_ENABLE_BETA_EXTENSIONS )
-      Pipelines( Device const &                                           device,
-                 Optional<const PipelineCache> const &                    pipelineCache,
-                 ArrayProxy<ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                 Optional<const AllocationCallbacks>                      allocator = nullptr )
+      Pipelines( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const &         createInfos,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createExecutionGraphPipelinesAMDX( pipelineCache, createInfos, allocator );
       }
 #    endif /*VK_ENABLE_BETA_EXTENSIONS*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipelines( Device const &                                 device,
-                 Optional<const PipelineCache> const &          pipelineCache,
-                 ArrayProxy<GraphicsPipelineCreateInfo> const & createInfos,
-                 Optional<const AllocationCallbacks>            allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipelines( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const &                   createInfos,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createGraphicsPipelines( pipelineCache, createInfos, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipelines( Device const &                                      device,
-                 Optional<const DeferredOperationKHR> const &        deferredOperation,
-                 Optional<const PipelineCache> const &               pipelineCache,
-                 ArrayProxy<RayTracingPipelineCreateInfoKHR> const & createInfos,
-                 Optional<const AllocationCallbacks>                 allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipelines( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                                     device,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const &                     createInfos,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                     allocator = nullptr )
       {
         *this = device.createRayTracingPipelinesKHR( deferredOperation, pipelineCache, createInfos, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Pipelines( Device const &                                     device,
-                 Optional<const PipelineCache> const &              pipelineCache,
-                 ArrayProxy<RayTracingPipelineCreateInfoNV> const & createInfos,
-                 Optional<const AllocationCallbacks>                allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Pipelines( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                                              device,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                 VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const &               createInfos,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator = nullptr )
       {
         *this = device.createRayTracingPipelinesNV( pipelineCache, createInfos, allocator );
       }
@@ -12279,194 +9744,38 @@ namespace VULKAN_HPP_NAMESPACE
       Pipelines & operator=( Pipelines && rhs )  = default;
 
     private:
-      Pipelines( std::vector<Pipeline> && rhs )
+      Pipelines( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkPipelineBinaryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryKHR.html
-    class PipelineBinaryKHR
-    {
-    public:
-      using CType   = VkPipelineBinaryKHR;
-      using CppType = VULKAN_HPP_NAMESPACE::PipelineBinaryKHR;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineBinaryKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-      PipelineBinaryKHR( Device const &                      device,
-                         VkPipelineBinaryKHR                 pipelineBinary,
-                         Optional<const AllocationCallbacks> allocator   = nullptr,
-                         Result                              successCode = Result::eSuccess )
-        : m_device( device )
-        , m_pipelineBinaryKHR( pipelineBinary )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_constructorSuccessCode( successCode )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      PipelineBinaryKHR( std::nullptr_t ) {}
-
-      ~PipelineBinaryKHR()
-      {
-        clear();
-      }
-
-      PipelineBinaryKHR()                            = delete;
-      PipelineBinaryKHR( PipelineBinaryKHR const & ) = delete;
-
-      PipelineBinaryKHR( PipelineBinaryKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_pipelineBinaryKHR( exchange( rhs.m_pipelineBinaryKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_constructorSuccessCode( exchange( rhs.m_constructorSuccessCode, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      PipelineBinaryKHR & operator=( PipelineBinaryKHR const & ) = delete;
-
-      PipelineBinaryKHR & operator=( PipelineBinaryKHR && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_pipelineBinaryKHR, rhs.m_pipelineBinaryKHR );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_constructorSuccessCode, rhs.m_constructorSuccessCode );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::PipelineBinaryKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_pipelineBinaryKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::PipelineBinaryKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_pipelineBinaryKHR );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::PipelineBinaryKHR() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_pipelineBinaryKHR;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_pipelineBinaryKHR )
-        {
-          getDispatcher()->vkDestroyPipelineBinaryKHR( static_cast<VkDevice>( m_device ),
-                                                       static_cast<VkPipelineBinaryKHR>( m_pipelineBinaryKHR ),
-                                                       reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device                 = nullptr;
-        m_pipelineBinaryKHR      = nullptr;
-        m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
-        m_dispatcher             = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::PipelineBinaryKHR release()
-      {
-        m_device                 = nullptr;
-        m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
-        m_dispatcher             = nullptr;
-        return exchange( m_pipelineBinaryKHR, nullptr );
-      }
-
-      Result getConstructorSuccessCode() const
-      {
-        return m_constructorSuccessCode;
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( PipelineBinaryKHR & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_pipelineBinaryKHR, rhs.m_pipelineBinaryKHR );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_constructorSuccessCode, rhs.m_constructorSuccessCode );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device            m_device                 = {};
-      VULKAN_HPP_NAMESPACE::PipelineBinaryKHR m_pipelineBinaryKHR      = {};
-      const AllocationCallbacks *             m_allocator              = {};
-      Result                                  m_constructorSuccessCode = Result::eErrorUnknown;
-      detail::DeviceDispatcher const *        m_dispatcher             = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<PipelineBinaryKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class PipelineBinaryKHRs : public std::vector<PipelineBinaryKHR>
-    {
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PipelineBinaryKHRs( Device const & device, PipelineBinaryCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
-      {
-        *this = device.createPipelineBinariesKHR( createInfo, allocator );
-      }
-#  endif
-
-      PipelineBinaryKHRs( std::nullptr_t ) {}
-
-      PipelineBinaryKHRs()                                         = delete;
-      PipelineBinaryKHRs( PipelineBinaryKHRs const & )             = delete;
-      PipelineBinaryKHRs( PipelineBinaryKHRs && rhs )              = default;
-      PipelineBinaryKHRs & operator=( PipelineBinaryKHRs const & ) = delete;
-      PipelineBinaryKHRs & operator=( PipelineBinaryKHRs && rhs )  = default;
-
-    private:
-      PipelineBinaryKHRs( std::vector<PipelineBinaryKHR> && rhs )
-      {
-        std::swap( *this, rhs );
-      }
-    };
-
-    // wrapper class for handle VkPipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLayout.html
     class PipelineLayout
     {
     public:
       using CType   = VkPipelineLayout;
       using CppType = VULKAN_HPP_NAMESPACE::PipelineLayout;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePipelineLayout;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::ePipelineLayout;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePipelineLayout;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::ePipelineLayout;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PipelineLayout( Device const & device, PipelineLayoutCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      PipelineLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo const &                          createInfo,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createPipelineLayout( createInfo, allocator );
       }
 #  endif
 
-      PipelineLayout( Device const & device, VkPipelineLayout pipelineLayout, Optional<const AllocationCallbacks> allocator = nullptr )
+      PipelineLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                      VkPipelineLayout                                                                pipelineLayout,
+                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_pipelineLayout( pipelineLayout )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -12482,10 +9791,10 @@ namespace VULKAN_HPP_NAMESPACE
       PipelineLayout( PipelineLayout const & ) = delete;
 
       PipelineLayout( PipelineLayout && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_pipelineLayout( exchange( rhs.m_pipelineLayout, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_pipelineLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipelineLayout, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -12503,16 +9812,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::PipelineLayout const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::PipelineLayout const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipelineLayout;
       }
 
-      VULKAN_HPP_NAMESPACE::PipelineLayout const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_pipelineLayout );
-      }
-
       operator VULKAN_HPP_NAMESPACE::PipelineLayout() const VULKAN_HPP_NOEXCEPT
       {
         return m_pipelineLayout;
@@ -12537,7 +9841,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_pipelineLayout, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_pipelineLayout, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -12545,13 +9849,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( PipelineLayout & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineLayout & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_pipelineLayout, rhs.m_pipelineLayout );
@@ -12560,40 +9864,38 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device         m_device         = {};
-      VULKAN_HPP_NAMESPACE::PipelineLayout m_pipelineLayout = {};
-      const AllocationCallbacks *          m_allocator      = {};
-      detail::DeviceDispatcher const *     m_dispatcher     = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device         = {};
+      VULKAN_HPP_NAMESPACE::PipelineLayout                                      m_pipelineLayout = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator      = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher     = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<PipelineLayout>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkPrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPrivateDataSlot.html
     class PrivateDataSlot
     {
     public:
       using CType   = VkPrivateDataSlot;
       using CppType = VULKAN_HPP_NAMESPACE::PrivateDataSlot;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::ePrivateDataSlot;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::ePrivateDataSlot;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      PrivateDataSlot( Device const & device, PrivateDataSlotCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      PrivateDataSlot( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                       VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const &                         createInfo,
+                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createPrivateDataSlot( createInfo, allocator );
       }
 #  endif
 
-      PrivateDataSlot( Device const & device, VkPrivateDataSlot privateDataSlot, Optional<const AllocationCallbacks> allocator = nullptr )
+      PrivateDataSlot( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                       VkPrivateDataSlot                                                               privateDataSlot,
+                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_privateDataSlot( privateDataSlot )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -12609,10 +9911,10 @@ namespace VULKAN_HPP_NAMESPACE
       PrivateDataSlot( PrivateDataSlot const & ) = delete;
 
       PrivateDataSlot( PrivateDataSlot && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_privateDataSlot( exchange( rhs.m_privateDataSlot, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_privateDataSlot( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_privateDataSlot, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -12630,16 +9932,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::PrivateDataSlot const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::PrivateDataSlot const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_privateDataSlot;
       }
 
-      VULKAN_HPP_NAMESPACE::PrivateDataSlot const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_privateDataSlot );
-      }
-
       operator VULKAN_HPP_NAMESPACE::PrivateDataSlot() const VULKAN_HPP_NOEXCEPT
       {
         return m_privateDataSlot;
@@ -12664,7 +9961,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_privateDataSlot, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_privateDataSlot, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -12672,13 +9969,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( PrivateDataSlot & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_privateDataSlot, rhs.m_privateDataSlot );
@@ -12687,40 +9984,38 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device          m_device          = {};
-      VULKAN_HPP_NAMESPACE::PrivateDataSlot m_privateDataSlot = {};
-      const AllocationCallbacks *           m_allocator       = {};
-      detail::DeviceDispatcher const *      m_dispatcher      = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device          = {};
+      VULKAN_HPP_NAMESPACE::PrivateDataSlot                                     m_privateDataSlot = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator       = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher      = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<PrivateDataSlot>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPool.html
     class QueryPool
     {
     public:
       using CType   = VkQueryPool;
       using CppType = VULKAN_HPP_NAMESPACE::QueryPool;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eQueryPool;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eQueryPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eQueryPool;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueryPool;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      QueryPool( Device const & device, QueryPoolCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      QueryPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo const &                               createInfo,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createQueryPool( createInfo, allocator );
       }
 #  endif
 
-      QueryPool( Device const & device, VkQueryPool queryPool, Optional<const AllocationCallbacks> allocator = nullptr )
+      QueryPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VkQueryPool                                                                     queryPool,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_queryPool( queryPool )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -12736,10 +10031,10 @@ namespace VULKAN_HPP_NAMESPACE
       QueryPool( QueryPool const & ) = delete;
 
       QueryPool( QueryPool && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_queryPool( exchange( rhs.m_queryPool, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_queryPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_queryPool, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -12757,16 +10052,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::QueryPool const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::QueryPool const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_queryPool;
       }
 
-      VULKAN_HPP_NAMESPACE::QueryPool const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_queryPool );
-      }
-
       operator VULKAN_HPP_NAMESPACE::QueryPool() const VULKAN_HPP_NOEXCEPT
       {
         return m_queryPool;
@@ -12790,7 +10080,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_queryPool, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_queryPool, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -12798,13 +10088,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( QueryPool & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::QueryPool & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_queryPool, rhs.m_queryPool );
@@ -12814,65 +10104,64 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD ResultValue<std::vector<DataType>> getResults(
-        uint32_t firstQuery, uint32_t queryCount, size_t dataSize, DeviceSize stride, QueryResultFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, std::vector<DataType>>
+                           getResults( uint32_t                                     firstQuery,
+                                       uint32_t                                     queryCount,
+                                       size_t                                       dataSize,
+                                       VULKAN_HPP_NAMESPACE::DeviceSize             stride,
+                                       VULKAN_HPP_NAMESPACE::QueryResultFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
       template <typename DataType>
-      VULKAN_HPP_NODISCARD ResultValue<DataType>
-        getResult( uint32_t firstQuery, uint32_t queryCount, DeviceSize stride, QueryResultFlags flags VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, DataType>
+                           getResult( uint32_t                                     firstQuery,
+                                      uint32_t                                     queryCount,
+                                      VULKAN_HPP_NAMESPACE::DeviceSize             stride,
+                                      VULKAN_HPP_NAMESPACE::QueryResultFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_VERSION_1_2 ===
 
-      // wrapper function for command vkResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPool.html
       void reset( uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_EXT_host_query_reset ===
 
-      // wrapper function for command vkResetQueryPoolEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPoolEXT.html
       void resetEXT( uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::QueryPool  m_queryPool  = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::QueryPool                                           m_queryPool  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<QueryPool>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueue.html
     class Queue
     {
     public:
       using CType   = VkQueue;
       using CppType = VULKAN_HPP_NAMESPACE::Queue;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eQueue;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eQueue;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eQueue;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eQueue;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Queue( Device const & device, uint32_t queueFamilyIndex, uint32_t queueIndex )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Queue( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, uint32_t queueFamilyIndex, uint32_t queueIndex )
       {
         *this = device.getQueue( queueFamilyIndex, queueIndex );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Queue( Device const & device, DeviceQueueInfo2 const & queueInfo )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Queue( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 const & queueInfo )
       {
         *this = device.getQueue2( queueInfo );
       }
 #  endif
 
-      Queue( Device const & device, VkQueue queue ) : m_queue( queue ), m_dispatcher( device.getDispatcher() ) {}
+      Queue( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const & device, VkQueue queue ) : m_queue( queue ), m_dispatcher( device.getDispatcher() )
+      {
+      }
 
       Queue( std::nullptr_t ) {}
 
@@ -12886,8 +10175,8 @@ namespace VULKAN_HPP_NAMESPACE
       Queue( Queue const & rhs ) : m_queue( rhs.m_queue ), m_dispatcher( rhs.m_dispatcher ) {}
 
       Queue( Queue && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_queue( exchange( rhs.m_queue, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_queue( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_queue, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -12908,16 +10197,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Queue const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Queue const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_queue;
       }
 
-      VULKAN_HPP_NAMESPACE::Queue const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_queue );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Queue() const VULKAN_HPP_NOEXCEPT
       {
         return m_queue;
@@ -12932,16 +10216,16 @@ namespace VULKAN_HPP_NAMESPACE
       VULKAN_HPP_NAMESPACE::Queue release()
       {
         m_dispatcher = nullptr;
-        return exchange( m_queue, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_queue, nullptr );
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Queue & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_queue, rhs.m_queue );
         std::swap( m_dispatcher, rhs.m_dispatcher );
@@ -12949,117 +10233,90 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-      typename ResultValueType<void>::type submit( ArrayProxy<const SubmitInfo> const & submits,
-                                                   VULKAN_HPP_NAMESPACE::Fence fence    VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void submit( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo> const & submits,
+                   VULKAN_HPP_NAMESPACE::Fence fence                                                VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
-      // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-      typename ResultValueType<void>::type waitIdle() const;
+      void waitIdle() const;
 
-      // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-      typename ResultValueType<void>::type bindSparse( ArrayProxy<const BindSparseInfo> const & bindInfo,
-                                                       VULKAN_HPP_NAMESPACE::Fence fence        VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void bindSparse( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindSparseInfo> const & bindInfo,
+                       VULKAN_HPP_NAMESPACE::Fence fence                                                    VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_VERSION_1_3 ===
 
-      // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-      typename ResultValueType<void>::type submit2( ArrayProxy<const SubmitInfo2> const & submits,
-                                                    VULKAN_HPP_NAMESPACE::Fence fence     VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void submit2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+                    VULKAN_HPP_NAMESPACE::Fence fence                                                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_KHR_swapchain ===
 
-      // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-      VULKAN_HPP_NODISCARD Result presentKHR( const PresentInfoKHR & presentInfo ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR & presentInfo ) const;
 
       //=== VK_EXT_debug_utils ===
 
-      // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-      void beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
+      void beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkQueueEndDebugUtilsLabelEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueEndDebugUtilsLabelEXT.html
       void endDebugUtilsLabelEXT() const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-      void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
+      void insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_NV_device_diagnostic_checkpoints ===
 
-      // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-      VULKAN_HPP_NODISCARD std::vector<CheckpointDataNV> getCheckpointDataNV() const;
-
-      // wrapper function for command vkGetQueueCheckpointData2NV, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-      VULKAN_HPP_NODISCARD std::vector<CheckpointData2NV> getCheckpointData2NV() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV> getCheckpointDataNV() const;
 
       //=== VK_INTEL_performance_query ===
 
-      // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-      typename ResultValueType<void>::type setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration ) const;
+      void setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration ) const;
 
       //=== VK_KHR_synchronization2 ===
 
-      // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-      typename ResultValueType<void>::type submit2KHR( ArrayProxy<const SubmitInfo2> const & submits,
-                                                       VULKAN_HPP_NAMESPACE::Fence fence     VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      void submit2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+                       VULKAN_HPP_NAMESPACE::Fence fence                                                 VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
+
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV> getCheckpointData2NV() const;
 
       //=== VK_NV_low_latency2 ===
 
-      // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-      void notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV & queueTypeInfo ) const VULKAN_HPP_NOEXCEPT;
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-      //=== VK_OHOS_native_buffer ===
-
-      // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<int32_t>::type
-        signalReleaseImageOHOS( ArrayProxy<const VULKAN_HPP_NAMESPACE::Semaphore> const & waitSemaphores, VULKAN_HPP_NAMESPACE::Image image ) const;
-#  endif /*VK_USE_PLATFORM_OHOS*/
+      void notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV & queueTypeInfo ) const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Queue      m_queue      = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Queue                                               m_queue      = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Queue>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPass.html
     class RenderPass
     {
     public:
       using CType   = VkRenderPass;
       using CppType = VULKAN_HPP_NAMESPACE::RenderPass;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eRenderPass;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eRenderPass;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eRenderPass;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eRenderPass;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      RenderPass( Device const & device, RenderPassCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      RenderPass( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                  VULKAN_HPP_NAMESPACE::RenderPassCreateInfo const &                              createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createRenderPass( createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      RenderPass( Device const & device, RenderPassCreateInfo2 const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      RenderPass( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                  VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const &                             createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createRenderPass2( createInfo, allocator );
       }
 #  endif
 
-      RenderPass( Device const & device, VkRenderPass renderPass, Optional<const AllocationCallbacks> allocator = nullptr )
+      RenderPass( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                  VkRenderPass                                                                    renderPass,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_renderPass( renderPass )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -13075,10 +10332,10 @@ namespace VULKAN_HPP_NAMESPACE
       RenderPass( RenderPass const & ) = delete;
 
       RenderPass( RenderPass && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_renderPass( exchange( rhs.m_renderPass, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_renderPass( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_renderPass, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13096,16 +10353,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::RenderPass const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::RenderPass const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_renderPass;
       }
 
-      VULKAN_HPP_NAMESPACE::RenderPass const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_renderPass );
-      }
-
       operator VULKAN_HPP_NAMESPACE::RenderPass() const VULKAN_HPP_NOEXCEPT
       {
         return m_renderPass;
@@ -13129,7 +10381,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_renderPass, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_renderPass, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -13137,13 +10389,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( RenderPass & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_renderPass, rhs.m_renderPass );
@@ -13153,48 +10405,46 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_0 ===
 
-      // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-      VULKAN_HPP_NODISCARD Extent2D getRenderAreaGranularity() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D getRenderAreaGranularity() const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_HUAWEI_subpass_shading ===
 
-      // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<Extent2D>::type getSubpassShadingMaxWorkgroupSizeHUAWEI() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D getSubpassShadingMaxWorkgroupSizeHUAWEI() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::RenderPass m_renderPass = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::RenderPass                                          m_renderPass = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<RenderPass>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampler.html
     class Sampler
     {
     public:
       using CType   = VkSampler;
       using CppType = VULKAN_HPP_NAMESPACE::Sampler;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSampler;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSampler;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSampler;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSampler;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Sampler( Device const & device, SamplerCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Sampler( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+               VULKAN_HPP_NAMESPACE::SamplerCreateInfo const &                                 createInfo,
+               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createSampler( createInfo, allocator );
       }
 #  endif
 
-      Sampler( Device const & device, VkSampler sampler, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device ), m_sampler( sampler ), m_allocator( static_cast<const AllocationCallbacks *>( allocator ) ), m_dispatcher( device.getDispatcher() )
+      Sampler( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+               VkSampler                                                                       sampler,
+               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
+        : m_device( device )
+        , m_sampler( sampler )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
+        , m_dispatcher( device.getDispatcher() )
       {
       }
 
@@ -13209,10 +10459,10 @@ namespace VULKAN_HPP_NAMESPACE
       Sampler( Sampler const & ) = delete;
 
       Sampler( Sampler && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_sampler( exchange( rhs.m_sampler, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_sampler( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_sampler, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13230,16 +10480,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Sampler const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Sampler const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_sampler;
       }
 
-      VULKAN_HPP_NAMESPACE::Sampler const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_sampler );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Sampler() const VULKAN_HPP_NOEXCEPT
       {
         return m_sampler;
@@ -13263,7 +10508,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_sampler, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_sampler, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -13271,13 +10516,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Sampler & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Sampler & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_sampler, rhs.m_sampler );
@@ -13286,42 +10531,38 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Sampler    m_sampler    = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Sampler                                             m_sampler    = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Sampler>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkSamplerYcbcrConversion, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversion.html
     class SamplerYcbcrConversion
     {
     public:
       using CType   = VkSamplerYcbcrConversion;
       using CppType = VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSamplerYcbcrConversion;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSamplerYcbcrConversion;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSamplerYcbcrConversion;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      SamplerYcbcrConversion( Device const &                           device,
-                              SamplerYcbcrConversionCreateInfo const & createInfo,
-                              Optional<const AllocationCallbacks>      allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      SamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                              VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const &                  createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createSamplerYcbcrConversion( createInfo, allocator );
       }
 #  endif
 
-      SamplerYcbcrConversion( Device const & device, VkSamplerYcbcrConversion ycbcrConversion, Optional<const AllocationCallbacks> allocator = nullptr )
+      SamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                              VkSamplerYcbcrConversion                                                        ycbcrConversion,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_samplerYcbcrConversion( ycbcrConversion )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_ycbcrConversion( ycbcrConversion )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -13337,10 +10578,10 @@ namespace VULKAN_HPP_NAMESPACE
       SamplerYcbcrConversion( SamplerYcbcrConversion const & ) = delete;
 
       SamplerYcbcrConversion( SamplerYcbcrConversion && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_samplerYcbcrConversion( exchange( rhs.m_samplerYcbcrConversion, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_ycbcrConversion( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_ycbcrConversion, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13351,40 +10592,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_samplerYcbcrConversion, rhs.m_samplerYcbcrConversion );
+          std::swap( m_ycbcrConversion, rhs.m_ycbcrConversion );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_samplerYcbcrConversion;
-      }
-
-      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_samplerYcbcrConversion );
+        return m_ycbcrConversion;
       }
 
       operator VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion() const VULKAN_HPP_NOEXCEPT
       {
-        return m_samplerYcbcrConversion;
+        return m_ycbcrConversion;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_samplerYcbcrConversion )
+        if ( m_ycbcrConversion )
         {
           getDispatcher()->vkDestroySamplerYcbcrConversion( static_cast<VkDevice>( m_device ),
-                                                            static_cast<VkSamplerYcbcrConversion>( m_samplerYcbcrConversion ),
+                                                            static_cast<VkSamplerYcbcrConversion>( m_ycbcrConversion ),
                                                             reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                 = nullptr;
-        m_samplerYcbcrConversion = nullptr;
-        m_allocator              = nullptr;
-        m_dispatcher             = nullptr;
+        m_device          = nullptr;
+        m_ycbcrConversion = nullptr;
+        m_allocator       = nullptr;
+        m_dispatcher      = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion release()
@@ -13392,7 +10628,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_samplerYcbcrConversion, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_ycbcrConversion, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -13400,55 +10636,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( SamplerYcbcrConversion & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_samplerYcbcrConversion, rhs.m_samplerYcbcrConversion );
+        std::swap( m_ycbcrConversion, rhs.m_ycbcrConversion );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                 m_device                 = {};
-      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion m_samplerYcbcrConversion = {};
-      const AllocationCallbacks *                  m_allocator              = {};
-      detail::DeviceDispatcher const *             m_dispatcher             = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device          = {};
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion                              m_ycbcrConversion = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator       = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher      = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<SamplerYcbcrConversion>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphore.html
     class Semaphore
     {
     public:
       using CType   = VkSemaphore;
       using CppType = VULKAN_HPP_NAMESPACE::Semaphore;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSemaphore;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSemaphore;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSemaphore;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSemaphore;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      Semaphore( Device const & device, SemaphoreCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      Semaphore( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo const &                               createInfo,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createSemaphore( createInfo, allocator );
       }
 #  endif
 
-      Semaphore( Device const & device, VkSemaphore semaphore, Optional<const AllocationCallbacks> allocator = nullptr )
+      Semaphore( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VkSemaphore                                                                     semaphore,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_semaphore( semaphore )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -13464,10 +10698,10 @@ namespace VULKAN_HPP_NAMESPACE
       Semaphore( Semaphore const & ) = delete;
 
       Semaphore( Semaphore && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_semaphore( exchange( rhs.m_semaphore, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_semaphore( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_semaphore, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13485,16 +10719,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::Semaphore const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::Semaphore const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_semaphore;
       }
 
-      VULKAN_HPP_NAMESPACE::Semaphore const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_semaphore );
-      }
-
       operator VULKAN_HPP_NAMESPACE::Semaphore() const VULKAN_HPP_NOEXCEPT
       {
         return m_semaphore;
@@ -13518,7 +10747,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_semaphore, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_semaphore, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -13526,13 +10755,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( Semaphore & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Semaphore & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_semaphore, rhs.m_semaphore );
@@ -13542,50 +10771,46 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_VERSION_1_2 ===
 
-      // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getCounterValue() const;
+      VULKAN_HPP_NODISCARD uint64_t getCounterValue() const;
 
       //=== VK_KHR_timeline_semaphore ===
 
-      // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<uint64_t>::type getCounterValueKHR() const;
+      VULKAN_HPP_NODISCARD uint64_t getCounterValueKHR() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::Semaphore  m_semaphore  = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::Semaphore                                           m_semaphore  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<Semaphore>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkShaderEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderEXT.html
     class ShaderEXT
     {
     public:
       using CType   = VkShaderEXT;
       using CppType = VULKAN_HPP_NAMESPACE::ShaderEXT;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eShaderEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eShaderEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ShaderEXT( Device const & device, ShaderCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      ShaderEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT const &                               createInfo,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createShaderEXT( createInfo, allocator );
       }
 #  endif
 
-      ShaderEXT( Device const & device, VkShaderEXT shader, Optional<const AllocationCallbacks> allocator = nullptr, Result successCode = Result::eSuccess )
+      ShaderEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                 VkShaderEXT                                                                     shader,
+                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator   = nullptr,
+                 VULKAN_HPP_NAMESPACE::Result                                                    successCode = VULKAN_HPP_NAMESPACE::Result::eSuccess )
         : m_device( device )
-        , m_shaderEXT( shader )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_shader( shader )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_constructorSuccessCode( successCode )
         , m_dispatcher( device.getDispatcher() )
       {
@@ -13602,11 +10827,11 @@ namespace VULKAN_HPP_NAMESPACE
       ShaderEXT( ShaderEXT const & ) = delete;
 
       ShaderEXT( ShaderEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_shaderEXT( exchange( rhs.m_shaderEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_constructorSuccessCode( exchange( rhs.m_constructorSuccessCode, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_shader( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_shader, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_constructorSuccessCode( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_constructorSuccessCode, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13617,7 +10842,7 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_shaderEXT, rhs.m_shaderEXT );
+          std::swap( m_shader, rhs.m_shader );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_constructorSuccessCode, rhs.m_constructorSuccessCode );
           std::swap( m_dispatcher, rhs.m_dispatcher );
@@ -13625,32 +10850,27 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::ShaderEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::ShaderEXT const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_shaderEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::ShaderEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_shaderEXT );
+        return m_shader;
       }
 
       operator VULKAN_HPP_NAMESPACE::ShaderEXT() const VULKAN_HPP_NOEXCEPT
       {
-        return m_shaderEXT;
+        return m_shader;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_shaderEXT )
+        if ( m_shader )
         {
           getDispatcher()->vkDestroyShaderEXT(
-            static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shaderEXT ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shader ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
         m_device                 = nullptr;
-        m_shaderEXT              = nullptr;
+        m_shader                 = nullptr;
         m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
+        m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
         m_dispatcher             = nullptr;
       }
 
@@ -13658,12 +10878,12 @@ namespace VULKAN_HPP_NAMESPACE
       {
         m_device                 = nullptr;
         m_allocator              = nullptr;
-        m_constructorSuccessCode = Result::eErrorUnknown;
+        m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
         m_dispatcher             = nullptr;
-        return exchange( m_shaderEXT, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_shader, nullptr );
       }
 
-      Result getConstructorSuccessCode() const
+      VULKAN_HPP_NAMESPACE::Result getConstructorSuccessCode() const
       {
         return m_constructorSuccessCode;
       }
@@ -13673,16 +10893,16 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( ShaderEXT & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_shaderEXT, rhs.m_shaderEXT );
+        std::swap( m_shader, rhs.m_shader );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_constructorSuccessCode, rhs.m_constructorSuccessCode );
         std::swap( m_dispatcher, rhs.m_dispatcher );
@@ -13690,28 +10910,23 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_EXT_shader_object ===
 
-      // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t>>::type getBinaryData() const;
+      VULKAN_HPP_NODISCARD std::vector<uint8_t> getBinaryData() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device     m_device                 = {};
-      VULKAN_HPP_NAMESPACE::ShaderEXT  m_shaderEXT              = {};
-      const AllocationCallbacks *      m_allocator              = {};
-      Result                           m_constructorSuccessCode = Result::eErrorUnknown;
-      detail::DeviceDispatcher const * m_dispatcher             = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                 = {};
+      VULKAN_HPP_NAMESPACE::ShaderEXT                                           m_shader                 = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator              = {};
+      VULKAN_HPP_NAMESPACE::Result                                              m_constructorSuccessCode = VULKAN_HPP_NAMESPACE::Result::eErrorUnknown;
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher             = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<ShaderEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class ShaderEXTs : public std::vector<ShaderEXT>
+    class ShaderEXTs : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ShaderEXTs( Device const & device, ArrayProxy<ShaderCreateInfoEXT> const & createInfos, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      ShaderEXTs( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                     device,
+                  VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>     allocator = nullptr )
       {
         *this = device.createShadersEXT( createInfos, allocator );
       }
@@ -13726,34 +10941,38 @@ namespace VULKAN_HPP_NAMESPACE
       ShaderEXTs & operator=( ShaderEXTs && rhs )  = default;
 
     private:
-      ShaderEXTs( std::vector<ShaderEXT> && rhs )
+      ShaderEXTs( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModule.html
     class ShaderModule
     {
     public:
       using CType   = VkShaderModule;
       using CppType = VULKAN_HPP_NAMESPACE::ShaderModule;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eShaderModule;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eShaderModule;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eShaderModule;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eShaderModule;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ShaderModule( Device const & device, ShaderModuleCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      ShaderModule( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo const &                            createInfo,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createShaderModule( createInfo, allocator );
       }
 #  endif
 
-      ShaderModule( Device const & device, VkShaderModule shaderModule, Optional<const AllocationCallbacks> allocator = nullptr )
+      ShaderModule( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VkShaderModule                                                                  shaderModule,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
         , m_shaderModule( shaderModule )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -13769,10 +10988,10 @@ namespace VULKAN_HPP_NAMESPACE
       ShaderModule( ShaderModule const & ) = delete;
 
       ShaderModule( ShaderModule && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_shaderModule( exchange( rhs.m_shaderModule, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_shaderModule( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_shaderModule, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -13790,16 +11009,11 @@ namespace VULKAN_HPP_NAMESPACE
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::ShaderModule const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::ShaderModule const & operator*() const VULKAN_HPP_NOEXCEPT
       {
         return m_shaderModule;
       }
 
-      VULKAN_HPP_NAMESPACE::ShaderModule const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_shaderModule );
-      }
-
       operator VULKAN_HPP_NAMESPACE::ShaderModule() const VULKAN_HPP_NOEXCEPT
       {
         return m_shaderModule;
@@ -13823,7 +11037,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_shaderModule, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_shaderModule, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -13831,13 +11045,13 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( ShaderModule & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderModule & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
         std::swap( m_shaderModule, rhs.m_shaderModule );
@@ -13847,178 +11061,193 @@ namespace VULKAN_HPP_NAMESPACE
 
       //=== VK_EXT_shader_module_identifier ===
 
-      // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-      VULKAN_HPP_NODISCARD ShaderModuleIdentifierEXT getIdentifierEXT() const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT getIdentifierEXT() const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device       m_device       = {};
-      VULKAN_HPP_NAMESPACE::ShaderModule m_shaderModule = {};
-      const AllocationCallbacks *        m_allocator    = {};
-      detail::DeviceDispatcher const *   m_dispatcher   = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device       = {};
+      VULKAN_HPP_NAMESPACE::ShaderModule                                        m_shaderModule = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator    = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher   = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<ShaderModule>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceKHR.html
     class SurfaceKHR
     {
     public:
       using CType   = VkSurfaceKHR;
       using CppType = VULKAN_HPP_NAMESPACE::SurfaceKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSurfaceKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSurfaceKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSurfaceKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSurfaceKHR;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      SurfaceKHR( Instance const & instance, AndroidSurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR const &                       createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createAndroidSurfaceKHR( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-      SurfaceKHR( Instance const & instance, DirectFBSurfaceCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT const &                      createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createDirectFBSurfaceEXT( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      SurfaceKHR( Instance const & instance, DisplaySurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR const &                       createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createDisplayPlaneSurfaceKHR( createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      SurfaceKHR( Instance const & instance, HeadlessSurfaceCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT const &                      createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createHeadlessSurfaceEXT( createInfo, allocator );
       }
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_IOS_MVK )
-      SurfaceKHR( Instance const & instance, IOSSurfaceCreateInfoMVK const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK const &                           createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createIOSSurfaceMVK( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_IOS_MVK*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_FUCHSIA )
-      SurfaceKHR( Instance const & instance, ImagePipeSurfaceCreateInfoFUCHSIA const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA const &                 createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createImagePipeSurfaceFUCHSIA( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_FUCHSIA*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_MACOS_MVK )
-      SurfaceKHR( Instance const & instance, MacOSSurfaceCreateInfoMVK const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK const &                         createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createMacOSSurfaceMVK( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_MACOS_MVK*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_METAL_EXT )
-      SurfaceKHR( Instance const & instance, MetalSurfaceCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT const &                         createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createMetalSurfaceEXT( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_METAL_EXT*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      SurfaceKHR( Instance const & instance, ScreenSurfaceCreateInfoQNX const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX const &                        createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createScreenSurfaceQNX( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_GGP )
-      SurfaceKHR( Instance const & instance, StreamDescriptorSurfaceCreateInfoGGP const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP const &              createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createStreamDescriptorSurfaceGGP( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_GGP*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-#    if defined( VK_USE_PLATFORM_OHOS )
-      SurfaceKHR( Instance const & instance, SurfaceCreateInfoOHOS const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
-      {
-        *this = instance.createSurfaceOHOS( createInfo, allocator );
-      }
-#    endif /*VK_USE_PLATFORM_OHOS*/
-#  endif
-
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_VI_NN )
-      SurfaceKHR( Instance const & instance, ViSurfaceCreateInfoNN const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN const &                             createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createViSurfaceNN( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_VI_NN*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-      SurfaceKHR( Instance const & instance, WaylandSurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR const &                       createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createWaylandSurfaceKHR( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_WIN32_KHR )
-      SurfaceKHR( Instance const & instance, Win32SurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR const &                         createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createWin32SurfaceKHR( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_WIN32_KHR*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_XCB_KHR )
-      SurfaceKHR( Instance const & instance, XcbSurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR const &                           createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createXcbSurfaceKHR( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_XCB_KHR*/
 #  endif
 
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
 #    if defined( VK_USE_PLATFORM_XLIB_KHR )
-      SurfaceKHR( Instance const & instance, XlibSurfaceCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR const &                          createInfo,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = instance.createXlibSurfaceKHR( createInfo, allocator );
       }
 #    endif /*VK_USE_PLATFORM_XLIB_KHR*/
 #  endif
 
-      SurfaceKHR( Instance const & instance, VkSurfaceKHR surface, Optional<const AllocationCallbacks> allocator = nullptr )
+      SurfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance const &               instance,
+                  VkSurfaceKHR                                                                    surface,
+                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_instance( instance )
-        , m_surfaceKHR( surface )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_surface( surface )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( instance.getDispatcher() )
       {
       }
@@ -14034,10 +11263,10 @@ namespace VULKAN_HPP_NAMESPACE
       SurfaceKHR( SurfaceKHR const & ) = delete;
 
       SurfaceKHR( SurfaceKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_instance( exchange( rhs.m_instance, {} ) )
-        , m_surfaceKHR( exchange( rhs.m_surfaceKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_instance, {} ) )
+        , m_surface( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_surface, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -14048,37 +11277,32 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_instance, rhs.m_instance );
-          std::swap( m_surfaceKHR, rhs.m_surfaceKHR );
+          std::swap( m_surface, rhs.m_surface );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::SurfaceKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::SurfaceKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_surfaceKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::SurfaceKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_surfaceKHR );
+        return m_surface;
       }
 
       operator VULKAN_HPP_NAMESPACE::SurfaceKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_surfaceKHR;
+        return m_surface;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_surfaceKHR )
+        if ( m_surface )
         {
           getDispatcher()->vkDestroySurfaceKHR(
-            static_cast<VkInstance>( m_instance ), static_cast<VkSurfaceKHR>( m_surfaceKHR ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkInstance>( m_instance ), static_cast<VkSurfaceKHR>( m_surface ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
         m_instance   = nullptr;
-        m_surfaceKHR = nullptr;
+        m_surface    = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
       }
@@ -14088,7 +11312,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_instance   = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_surfaceKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_surface, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Instance getInstance() const
@@ -14096,55 +11320,53 @@ namespace VULKAN_HPP_NAMESPACE
         return m_instance;
       }
 
-      detail::InstanceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( SurfaceKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_instance, rhs.m_instance );
-        std::swap( m_surfaceKHR, rhs.m_surfaceKHR );
+        std::swap( m_surface, rhs.m_surface );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
     private:
-      VULKAN_HPP_NAMESPACE::Instance     m_instance   = {};
-      VULKAN_HPP_NAMESPACE::SurfaceKHR   m_surfaceKHR = {};
-      const AllocationCallbacks *        m_allocator  = {};
-      detail::InstanceDispatcher const * m_dispatcher = nullptr;
+      VULKAN_HPP_NAMESPACE::Instance                                              m_instance   = {};
+      VULKAN_HPP_NAMESPACE::SurfaceKHR                                            m_surface    = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                           m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<SurfaceKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainKHR.html
     class SwapchainKHR
     {
     public:
       using CType   = VkSwapchainKHR;
       using CppType = VULKAN_HPP_NAMESPACE::SwapchainKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eSwapchainKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eSwapchainKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eSwapchainKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eSwapchainKHR;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      SwapchainKHR( Device const & device, SwapchainCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      SwapchainKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const &                            createInfo,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createSwapchainKHR( createInfo, allocator );
       }
 #  endif
 
-      SwapchainKHR( Device const & device, VkSwapchainKHR swapchain, Optional<const AllocationCallbacks> allocator = nullptr )
+      SwapchainKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                    VkSwapchainKHR                                                                  swapchain,
+                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_swapchainKHR( swapchain )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_swapchain( swapchain )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -14160,10 +11382,10 @@ namespace VULKAN_HPP_NAMESPACE
       SwapchainKHR( SwapchainKHR const & ) = delete;
 
       SwapchainKHR( SwapchainKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_swapchainKHR( exchange( rhs.m_swapchainKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_swapchain( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_swapchain, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -14174,39 +11396,34 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_swapchainKHR, rhs.m_swapchainKHR );
+          std::swap( m_swapchain, rhs.m_swapchain );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::SwapchainKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::SwapchainKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_swapchainKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::SwapchainKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_swapchainKHR );
+        return m_swapchain;
       }
 
       operator VULKAN_HPP_NAMESPACE::SwapchainKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_swapchainKHR;
+        return m_swapchain;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_swapchainKHR )
+        if ( m_swapchain )
         {
           getDispatcher()->vkDestroySwapchainKHR(
-            static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
+            static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device       = nullptr;
-        m_swapchainKHR = nullptr;
-        m_allocator    = nullptr;
-        m_dispatcher   = nullptr;
+        m_device     = nullptr;
+        m_swapchain  = nullptr;
+        m_allocator  = nullptr;
+        m_dispatcher = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::SwapchainKHR release()
@@ -14214,7 +11431,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_swapchainKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_swapchain, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -14222,136 +11439,83 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( SwapchainKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_swapchainKHR, rhs.m_swapchainKHR );
+        std::swap( m_swapchain, rhs.m_swapchain );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_KHR_swapchain ===
 
-      // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image>>::type getImages() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::Image> getImages() const;
 
-      // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-      VULKAN_HPP_NODISCARD ResultValue<uint32_t> acquireNextImage( uint64_t                                  timeout,
-                                                                   VULKAN_HPP_NAMESPACE::Semaphore semaphore VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ),
-                                                                   VULKAN_HPP_NAMESPACE::Fence fence         VULKAN_HPP_DEFAULT_ASSIGNMENT( {} ) ) const;
+      VULKAN_HPP_NODISCARD std::pair<VULKAN_HPP_NAMESPACE::Result, uint32_t>
+                           acquireNextImage( uint64_t                                  timeout,
+                                             VULKAN_HPP_NAMESPACE::Semaphore semaphore VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT,
+                                             VULKAN_HPP_NAMESPACE::Fence fence         VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const;
 
       //=== VK_EXT_display_control ===
 
-      // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-      VULKAN_HPP_NODISCARD
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<uint64_t>
-#  else
-      typename ResultValueType<uint64_t>::type
-#  endif
-        getCounterEXT( SurfaceCounterFlagBitsEXT counter ) const;
+      VULKAN_HPP_NODISCARD uint64_t getCounterEXT( VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter ) const;
 
       //=== VK_GOOGLE_display_timing ===
 
-      // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<RefreshCycleDurationGOOGLE>::type getRefreshCycleDurationGOOGLE() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE getRefreshCycleDurationGOOGLE() const;
 
-      // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-      VULKAN_HPP_NODISCARD
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<std::vector<PastPresentationTimingGOOGLE>>
-#  else
-      typename ResultValueType<std::vector<PastPresentationTimingGOOGLE>>::type
-#  endif
-        getPastPresentationTimingGOOGLE() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE> getPastPresentationTimingGOOGLE() const;
 
       //=== VK_KHR_shared_presentable_image ===
 
-      // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-      VULKAN_HPP_NODISCARD Result getStatus() const;
-
-      //=== VK_EXT_present_timing ===
-
-      // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-      VULKAN_HPP_NODISCARD Result setPresentTimingQueueSizeEXT( uint32_t size ) const;
-
-      // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-      VULKAN_HPP_NODISCARD ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>> getTimingPropertiesEXT() const;
-
-      // wrapper function for command vkGetSwapchainTimeDomainPropertiesEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimeDomainPropertiesEXT.html
-      VULKAN_HPP_NODISCARD Result getTimeDomainPropertiesEXT( SwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
-                                                              uint64_t *                         pTimeDomainsCounter ) const VULKAN_HPP_NOEXCEPT;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getStatus() const;
 
       //=== VK_AMD_display_native_hdr ===
 
-      // wrapper function for command vkSetLocalDimmingAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLocalDimmingAMD.html
-      void setLocalDimmingAMD( Bool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT;
+      void setLocalDimmingAMD( VULKAN_HPP_NAMESPACE::Bool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT;
 
       //=== VK_KHR_present_wait ===
 
-      // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-      VULKAN_HPP_NODISCARD Result waitForPresent( uint64_t presentId, uint64_t timeout ) const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result waitForPresent( uint64_t presentId, uint64_t timeout ) const;
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
       //=== VK_EXT_full_screen_exclusive ===
 
-      // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-      typename ResultValueType<void>::type acquireFullScreenExclusiveModeEXT() const;
+      void acquireFullScreenExclusiveModeEXT() const;
 
-      // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-      typename ResultValueType<void>::type releaseFullScreenExclusiveModeEXT() const;
+      void releaseFullScreenExclusiveModeEXT() const;
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-      //=== VK_KHR_present_wait2 ===
-
-      // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-      VULKAN_HPP_NODISCARD Result waitForPresent2( const PresentWait2InfoKHR & presentWait2Info ) const;
-
       //=== VK_NV_low_latency2 ===
 
-      // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-      typename ResultValueType<void>::type setLatencySleepModeNV( const LatencySleepModeInfoNV & sleepModeInfo ) const;
+      void setLatencySleepModeNV( const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV & sleepModeInfo ) const;
 
-      // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-      typename ResultValueType<void>::type latencySleepNV( const LatencySleepInfoNV & sleepInfo ) const;
+      void latencySleepNV( const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV & sleepInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-      void setLatencyMarkerNV( const SetLatencyMarkerInfoNV & latencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT;
+      void setLatencyMarkerNV( const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV & latencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT;
 
-      // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV> getLatencyTimingsNV() const;
+      VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV getLatencyTimingsNV() const VULKAN_HPP_NOEXCEPT;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device       m_device       = {};
-      VULKAN_HPP_NAMESPACE::SwapchainKHR m_swapchainKHR = {};
-      const AllocationCallbacks *        m_allocator    = {};
-      detail::DeviceDispatcher const *   m_dispatcher   = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device     = {};
+      VULKAN_HPP_NAMESPACE::SwapchainKHR                                        m_swapchain  = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<SwapchainKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    class SwapchainKHRs : public std::vector<SwapchainKHR>
+    class SwapchainKHRs : public std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>
     {
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      SwapchainKHRs( Device const & device, ArrayProxy<SwapchainCreateInfoKHR> const & createInfos, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      SwapchainKHRs( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                        device,
+                     VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator = nullptr )
       {
         *this = device.createSharedSwapchainsKHR( createInfos, allocator );
       }
@@ -14366,287 +11530,38 @@ namespace VULKAN_HPP_NAMESPACE
       SwapchainKHRs & operator=( SwapchainKHRs && rhs )  = default;
 
     private:
-      SwapchainKHRs( std::vector<SwapchainKHR> && rhs )
+      SwapchainKHRs( std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR> && rhs )
       {
         std::swap( *this, rhs );
       }
     };
 
-    // wrapper class for handle VkTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorARM.html
-    class TensorARM
-    {
-    public:
-      using CType   = VkTensorARM;
-      using CppType = VULKAN_HPP_NAMESPACE::TensorARM;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eTensorARM;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      TensorARM( Device const & device, TensorCreateInfoARM const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
-      {
-        *this = device.createTensorARM( createInfo, allocator );
-      }
-#  endif
-
-      TensorARM( Device const & device, VkTensorARM tensor, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_tensorARM( tensor )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      TensorARM( std::nullptr_t ) {}
-
-      ~TensorARM()
-      {
-        clear();
-      }
-
-      TensorARM()                    = delete;
-      TensorARM( TensorARM const & ) = delete;
-
-      TensorARM( TensorARM && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_tensorARM( exchange( rhs.m_tensorARM, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      TensorARM & operator=( TensorARM const & ) = delete;
-
-      TensorARM & operator=( TensorARM && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_tensorARM, rhs.m_tensorARM );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorARM const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_tensorARM;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorARM const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_tensorARM );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::TensorARM() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_tensorARM;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_tensorARM )
-        {
-          getDispatcher()->vkDestroyTensorARM(
-            static_cast<VkDevice>( m_device ), static_cast<VkTensorARM>( m_tensorARM ), reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device     = nullptr;
-        m_tensorARM  = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorARM release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_tensorARM, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( TensorARM & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_tensorARM, rhs.m_tensorARM );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device     m_device     = {};
-      VULKAN_HPP_NAMESPACE::TensorARM  m_tensorARM  = {};
-      const AllocationCallbacks *      m_allocator  = {};
-      detail::DeviceDispatcher const * m_dispatcher = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<TensorARM>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewARM.html
-    class TensorViewARM
-    {
-    public:
-      using CType   = VkTensorViewARM;
-      using CppType = VULKAN_HPP_NAMESPACE::TensorViewARM;
-
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eTensorViewARM;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
-
-    public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      TensorViewARM( Device const & device, TensorViewCreateInfoARM const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
-      {
-        *this = device.createTensorViewARM( createInfo, allocator );
-      }
-#  endif
-
-      TensorViewARM( Device const & device, VkTensorViewARM tensorView, Optional<const AllocationCallbacks> allocator = nullptr )
-        : m_device( device )
-        , m_tensorViewARM( tensorView )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
-        , m_dispatcher( device.getDispatcher() )
-      {
-      }
-
-      TensorViewARM( std::nullptr_t ) {}
-
-      ~TensorViewARM()
-      {
-        clear();
-      }
-
-      TensorViewARM()                        = delete;
-      TensorViewARM( TensorViewARM const & ) = delete;
-
-      TensorViewARM( TensorViewARM && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_tensorViewARM( exchange( rhs.m_tensorViewARM, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
-      {
-      }
-
-      TensorViewARM & operator=( TensorViewARM const & ) = delete;
-
-      TensorViewARM & operator=( TensorViewARM && rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        if ( this != &rhs )
-        {
-          std::swap( m_device, rhs.m_device );
-          std::swap( m_tensorViewARM, rhs.m_tensorViewARM );
-          std::swap( m_allocator, rhs.m_allocator );
-          std::swap( m_dispatcher, rhs.m_dispatcher );
-        }
-        return *this;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorViewARM const & operator*() const & VULKAN_HPP_NOEXCEPT
-      {
-        return m_tensorViewARM;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorViewARM const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_tensorViewARM );
-      }
-
-      operator VULKAN_HPP_NAMESPACE::TensorViewARM() const VULKAN_HPP_NOEXCEPT
-      {
-        return m_tensorViewARM;
-      }
-
-      void clear() VULKAN_HPP_NOEXCEPT
-      {
-        if ( m_tensorViewARM )
-        {
-          getDispatcher()->vkDestroyTensorViewARM( static_cast<VkDevice>( m_device ),
-                                                   static_cast<VkTensorViewARM>( m_tensorViewARM ),
-                                                   reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
-        }
-        m_device        = nullptr;
-        m_tensorViewARM = nullptr;
-        m_allocator     = nullptr;
-        m_dispatcher    = nullptr;
-      }
-
-      VULKAN_HPP_NAMESPACE::TensorViewARM release()
-      {
-        m_device     = nullptr;
-        m_allocator  = nullptr;
-        m_dispatcher = nullptr;
-        return exchange( m_tensorViewARM, nullptr );
-      }
-
-      VULKAN_HPP_NAMESPACE::Device getDevice() const
-      {
-        return m_device;
-      }
-
-      detail::DeviceDispatcher const * getDispatcher() const
-      {
-        VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
-        return m_dispatcher;
-      }
-
-      void swap( TensorViewARM & rhs ) VULKAN_HPP_NOEXCEPT
-      {
-        std::swap( m_device, rhs.m_device );
-        std::swap( m_tensorViewARM, rhs.m_tensorViewARM );
-        std::swap( m_allocator, rhs.m_allocator );
-        std::swap( m_dispatcher, rhs.m_dispatcher );
-      }
-
-    private:
-      VULKAN_HPP_NAMESPACE::Device        m_device        = {};
-      VULKAN_HPP_NAMESPACE::TensorViewARM m_tensorViewARM = {};
-      const AllocationCallbacks *         m_allocator     = {};
-      detail::DeviceDispatcher const *    m_dispatcher    = nullptr;
-    };
-
-    template <>
-    struct isVulkanRAIIHandleType<TensorViewARM>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCacheEXT.html
     class ValidationCacheEXT
     {
     public:
       using CType   = VkValidationCacheEXT;
       using CppType = VULKAN_HPP_NAMESPACE::ValidationCacheEXT;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eValidationCacheEXT;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eValidationCacheEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eValidationCacheEXT;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eValidationCacheEXT;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      ValidationCacheEXT( Device const & device, ValidationCacheCreateInfoEXT const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      ValidationCacheEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                          VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT const &                      createInfo,
+                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createValidationCacheEXT( createInfo, allocator );
       }
 #  endif
 
-      ValidationCacheEXT( Device const & device, VkValidationCacheEXT validationCache, Optional<const AllocationCallbacks> allocator = nullptr )
+      ValidationCacheEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                          VkValidationCacheEXT                                                            validationCache,
+                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_validationCacheEXT( validationCache )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_validationCache( validationCache )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -14662,10 +11577,10 @@ namespace VULKAN_HPP_NAMESPACE
       ValidationCacheEXT( ValidationCacheEXT const & ) = delete;
 
       ValidationCacheEXT( ValidationCacheEXT && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_validationCacheEXT( exchange( rhs.m_validationCacheEXT, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_validationCache( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_validationCache, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -14676,40 +11591,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_validationCacheEXT, rhs.m_validationCacheEXT );
+          std::swap( m_validationCache, rhs.m_validationCache );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::ValidationCacheEXT const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::ValidationCacheEXT const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_validationCacheEXT;
-      }
-
-      VULKAN_HPP_NAMESPACE::ValidationCacheEXT const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_validationCacheEXT );
+        return m_validationCache;
       }
 
       operator VULKAN_HPP_NAMESPACE::ValidationCacheEXT() const VULKAN_HPP_NOEXCEPT
       {
-        return m_validationCacheEXT;
+        return m_validationCache;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_validationCacheEXT )
+        if ( m_validationCache )
         {
           getDispatcher()->vkDestroyValidationCacheEXT( static_cast<VkDevice>( m_device ),
-                                                        static_cast<VkValidationCacheEXT>( m_validationCacheEXT ),
+                                                        static_cast<VkValidationCacheEXT>( m_validationCache ),
                                                         reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device             = nullptr;
-        m_validationCacheEXT = nullptr;
-        m_allocator          = nullptr;
-        m_dispatcher         = nullptr;
+        m_device          = nullptr;
+        m_validationCache = nullptr;
+        m_allocator       = nullptr;
+        m_dispatcher      = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::ValidationCacheEXT release()
@@ -14717,7 +11627,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_validationCacheEXT, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_validationCache, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -14725,64 +11635,59 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( ValidationCacheEXT & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ValidationCacheEXT & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_validationCacheEXT, rhs.m_validationCacheEXT );
+        std::swap( m_validationCache, rhs.m_validationCache );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_EXT_validation_cache ===
 
-      // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-      typename ResultValueType<void>::type merge( ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches ) const;
+      void merge( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches ) const;
 
-      // wrapper function for command vkGetValidationCacheDataEXT, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<uint8_t>>::type getData() const;
+      VULKAN_HPP_NODISCARD std::vector<uint8_t> getData() const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device             m_device             = {};
-      VULKAN_HPP_NAMESPACE::ValidationCacheEXT m_validationCacheEXT = {};
-      const AllocationCallbacks *              m_allocator          = {};
-      detail::DeviceDispatcher const *         m_dispatcher         = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device          = {};
+      VULKAN_HPP_NAMESPACE::ValidationCacheEXT                                  m_validationCache = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator       = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher      = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<ValidationCacheEXT>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionKHR.html
     class VideoSessionKHR
     {
     public:
       using CType   = VkVideoSessionKHR;
       using CppType = VULKAN_HPP_NAMESPACE::VideoSessionKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eVideoSessionKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      VideoSessionKHR( Device const & device, VideoSessionCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      VideoSessionKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                       VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR const &                         createInfo,
+                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createVideoSessionKHR( createInfo, allocator );
       }
 #  endif
 
-      VideoSessionKHR( Device const & device, VkVideoSessionKHR videoSession, Optional<const AllocationCallbacks> allocator = nullptr )
+      VideoSessionKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                       VkVideoSessionKHR                                                               videoSession,
+                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_videoSessionKHR( videoSession )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_videoSession( videoSession )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -14798,10 +11703,10 @@ namespace VULKAN_HPP_NAMESPACE
       VideoSessionKHR( VideoSessionKHR const & ) = delete;
 
       VideoSessionKHR( VideoSessionKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_videoSessionKHR( exchange( rhs.m_videoSessionKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_videoSession( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_videoSession, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -14812,40 +11717,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_videoSessionKHR, rhs.m_videoSessionKHR );
+          std::swap( m_videoSession, rhs.m_videoSession );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::VideoSessionKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::VideoSessionKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_videoSessionKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::VideoSessionKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_videoSessionKHR );
+        return m_videoSession;
       }
 
       operator VULKAN_HPP_NAMESPACE::VideoSessionKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_videoSessionKHR;
+        return m_videoSession;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_videoSessionKHR )
+        if ( m_videoSession )
         {
           getDispatcher()->vkDestroyVideoSessionKHR( static_cast<VkDevice>( m_device ),
-                                                     static_cast<VkVideoSessionKHR>( m_videoSessionKHR ),
+                                                     static_cast<VkVideoSessionKHR>( m_videoSession ),
                                                      reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device          = nullptr;
-        m_videoSessionKHR = nullptr;
-        m_allocator       = nullptr;
-        m_dispatcher      = nullptr;
+        m_device       = nullptr;
+        m_videoSession = nullptr;
+        m_allocator    = nullptr;
+        m_dispatcher   = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::VideoSessionKHR release()
@@ -14853,7 +11753,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_videoSessionKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_videoSession, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -14861,69 +11761,59 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( VideoSessionKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_videoSessionKHR, rhs.m_videoSessionKHR );
+        std::swap( m_videoSession, rhs.m_videoSession );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_KHR_video_queue ===
 
-      // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-      VULKAN_HPP_NODISCARD typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR>>::type getMemoryRequirements() const;
+      VULKAN_HPP_NODISCARD std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR> getMemoryRequirements() const;
 
-      // wrapper function for command vkBindVideoSessionMemoryKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-      typename ResultValueType<void>::type bindMemory( ArrayProxy<const BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos ) const;
+      void bindMemory( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device          m_device          = {};
-      VULKAN_HPP_NAMESPACE::VideoSessionKHR m_videoSessionKHR = {};
-      const AllocationCallbacks *           m_allocator       = {};
-      detail::DeviceDispatcher const *      m_dispatcher      = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device       = {};
+      VULKAN_HPP_NAMESPACE::VideoSessionKHR                                     m_videoSession = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator    = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher   = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<VideoSessionKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // wrapper class for handle VkVideoSessionParametersKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersKHR.html
     class VideoSessionParametersKHR
     {
     public:
       using CType   = VkVideoSessionParametersKHR;
       using CppType = VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR;
 
-      static VULKAN_HPP_CONST_OR_CONSTEXPR ObjectType               objectType            = ObjectType::eVideoSessionParametersKHR;
-      static VULKAN_HPP_CONST_OR_CONSTEXPR DebugReportObjectTypeEXT debugReportObjectType = DebugReportObjectTypeEXT::eUnknown;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::ObjectType objectType = VULKAN_HPP_NAMESPACE::ObjectType::eVideoSessionParametersKHR;
+      static VULKAN_HPP_CONST_OR_CONSTEXPR VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT debugReportObjectType =
+        VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
 
     public:
-#  if !defined( VULKAN_HPP_NO_EXCEPTIONS )
-      VideoSessionParametersKHR( Device const &                              device,
-                                 VideoSessionParametersCreateInfoKHR const & createInfo,
-                                 Optional<const AllocationCallbacks>         allocator = nullptr )
+#  if !defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+      VideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                 VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR const &               createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
       {
         *this = device.createVideoSessionParametersKHR( createInfo, allocator );
       }
 #  endif
 
-      VideoSessionParametersKHR( Device const &                      device,
-                                 VkVideoSessionParametersKHR         videoSessionParameters,
-                                 Optional<const AllocationCallbacks> allocator = nullptr )
+      VideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device const &                 device,
+                                 VkVideoSessionParametersKHR                                                     videoSessionParameters,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator = nullptr )
         : m_device( device )
-        , m_videoSessionParametersKHR( videoSessionParameters )
-        , m_allocator( static_cast<const AllocationCallbacks *>( allocator ) )
+        , m_videoSessionParameters( videoSessionParameters )
+        , m_allocator( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) )
         , m_dispatcher( device.getDispatcher() )
       {
       }
@@ -14939,10 +11829,10 @@ namespace VULKAN_HPP_NAMESPACE
       VideoSessionParametersKHR( VideoSessionParametersKHR const & ) = delete;
 
       VideoSessionParametersKHR( VideoSessionParametersKHR && rhs ) VULKAN_HPP_NOEXCEPT
-        : m_device( exchange( rhs.m_device, {} ) )
-        , m_videoSessionParametersKHR( exchange( rhs.m_videoSessionParametersKHR, {} ) )
-        , m_allocator( exchange( rhs.m_allocator, {} ) )
-        , m_dispatcher( exchange( rhs.m_dispatcher, nullptr ) )
+        : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) )
+        , m_videoSessionParameters( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_videoSessionParameters, {} ) )
+        , m_allocator( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_allocator, {} ) )
+        , m_dispatcher( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_dispatcher, nullptr ) )
       {
       }
 
@@ -14953,40 +11843,35 @@ namespace VULKAN_HPP_NAMESPACE
         if ( this != &rhs )
         {
           std::swap( m_device, rhs.m_device );
-          std::swap( m_videoSessionParametersKHR, rhs.m_videoSessionParametersKHR );
+          std::swap( m_videoSessionParameters, rhs.m_videoSessionParameters );
           std::swap( m_allocator, rhs.m_allocator );
           std::swap( m_dispatcher, rhs.m_dispatcher );
         }
         return *this;
       }
 
-      VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const & operator*() const & VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const & operator*() const VULKAN_HPP_NOEXCEPT
       {
-        return m_videoSessionParametersKHR;
-      }
-
-      VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const && operator*() const && VULKAN_HPP_NOEXCEPT
-      {
-        return std::move( m_videoSessionParametersKHR );
+        return m_videoSessionParameters;
       }
 
       operator VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR() const VULKAN_HPP_NOEXCEPT
       {
-        return m_videoSessionParametersKHR;
+        return m_videoSessionParameters;
       }
 
       void clear() VULKAN_HPP_NOEXCEPT
       {
-        if ( m_videoSessionParametersKHR )
+        if ( m_videoSessionParameters )
         {
           getDispatcher()->vkDestroyVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
-                                                               static_cast<VkVideoSessionParametersKHR>( m_videoSessionParametersKHR ),
+                                                               static_cast<VkVideoSessionParametersKHR>( m_videoSessionParameters ),
                                                                reinterpret_cast<const VkAllocationCallbacks *>( m_allocator ) );
         }
-        m_device                    = nullptr;
-        m_videoSessionParametersKHR = nullptr;
-        m_allocator                 = nullptr;
-        m_dispatcher                = nullptr;
+        m_device                 = nullptr;
+        m_videoSessionParameters = nullptr;
+        m_allocator              = nullptr;
+        m_dispatcher             = nullptr;
       }
 
       VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR release()
@@ -14994,7 +11879,7 @@ namespace VULKAN_HPP_NAMESPACE
         m_device     = nullptr;
         m_allocator  = nullptr;
         m_dispatcher = nullptr;
-        return exchange( m_videoSessionParametersKHR, nullptr );
+        return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( m_videoSessionParameters, nullptr );
       }
 
       VULKAN_HPP_NAMESPACE::Device getDevice() const
@@ -15002,173 +11887,130 @@ namespace VULKAN_HPP_NAMESPACE
         return m_device;
       }
 
-      detail::DeviceDispatcher const * getDispatcher() const
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * getDispatcher() const
       {
         VULKAN_HPP_ASSERT( m_dispatcher->getVkHeaderVersion() == VK_HEADER_VERSION );
         return m_dispatcher;
       }
 
-      void swap( VideoSessionParametersKHR & rhs ) VULKAN_HPP_NOEXCEPT
+      void swap( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionParametersKHR & rhs ) VULKAN_HPP_NOEXCEPT
       {
         std::swap( m_device, rhs.m_device );
-        std::swap( m_videoSessionParametersKHR, rhs.m_videoSessionParametersKHR );
+        std::swap( m_videoSessionParameters, rhs.m_videoSessionParameters );
         std::swap( m_allocator, rhs.m_allocator );
         std::swap( m_dispatcher, rhs.m_dispatcher );
       }
 
       //=== VK_KHR_video_queue ===
 
-      // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-      typename ResultValueType<void>::type update( const VideoSessionParametersUpdateInfoKHR & updateInfo ) const;
+      void update( const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR & updateInfo ) const;
 
     private:
-      VULKAN_HPP_NAMESPACE::Device                    m_device                    = {};
-      VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR m_videoSessionParametersKHR = {};
-      const AllocationCallbacks *                     m_allocator                 = {};
-      detail::DeviceDispatcher const *                m_dispatcher                = nullptr;
+      VULKAN_HPP_NAMESPACE::Device                                              m_device                 = {};
+      VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR                           m_videoSessionParameters = {};
+      const VULKAN_HPP_NAMESPACE::AllocationCallbacks *                         m_allocator              = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher             = nullptr;
     };
 
-    template <>
-    struct isVulkanRAIIHandleType<VideoSessionParametersKHR>
-    {
-      static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-    };
-
-    // operators to compare VULKAN_HPP_NAMESPACE::raii-handles
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    auto operator<=>( T const & a, T const & b ) VULKAN_HPP_NOEXCEPT
-    {
-      return *a <=> *b;
-    }
-#  else
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator<( T const & a, T const & b ) VULKAN_HPP_NOEXCEPT
-    {
-      return *a < *b;
-    }
-#  endif
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator==( T const & a, T const & b ) VULKAN_HPP_NOEXCEPT
-    {
-      return *a == *b;
-    }
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator!=( T const & a, T const & b ) VULKAN_HPP_NOEXCEPT
-    {
-      return *a != *b;
-    }
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator==( const T & v, std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      return !*v;
-    }
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator==( std::nullptr_t, const T & v ) VULKAN_HPP_NOEXCEPT
-    {
-      return !*v;
-    }
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator!=( const T & v, std::nullptr_t ) VULKAN_HPP_NOEXCEPT
-    {
-      return *v;
-    }
-
-    template <typename T, typename std::enable_if<isVulkanRAIIHandleType<T>::value, bool>::type = 0>
-    bool operator!=( std::nullptr_t, const T & v ) VULKAN_HPP_NOEXCEPT
-    {
-      return *v;
-    }
-
     //===========================
     //=== COMMAND Definitions ===
     //===========================
 
     //=== VK_VERSION_1_0 ===
 
-    // wrapper function for command vkCreateInstance, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateInstance.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Instance>::type
-                         Context::createInstance( InstanceCreateInfo const &          createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance>::Type
+                        Context::createInstance( VULKAN_HPP_NAMESPACE::InstanceCreateInfo const &                                createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Instance instance;
-      Result result = static_cast<Result>( getDispatcher()->vkCreateInstance( reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkInstance *>( &instance ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Context::createInstance" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Instance( *this, *reinterpret_cast<VkInstance *>( &instance ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateInstance(
+        reinterpret_cast<const VkInstanceCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkInstance *>( &instance ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Context::createInstance" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Instance( *this, *reinterpret_cast<VkInstance *>( &instance ), allocator );
     }
 
-    // wrapper function for command vkEnumeratePhysicalDevices, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDevices.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDevice>>::type Instance::enumeratePhysicalDevices() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice>>::Type
+      Instance::enumeratePhysicalDevices() const
     {
       std::vector<VULKAN_HPP_NAMESPACE::PhysicalDevice> physicalDevices;
       uint32_t                                          physicalDeviceCount;
-      Result                                            result;
+      VULKAN_HPP_NAMESPACE::Result                      result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDevices( static_cast<VkInstance>( m_instance ), &physicalDeviceCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && physicalDeviceCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkEnumeratePhysicalDevices( static_cast<VkInstance>( m_instance ), &physicalDeviceCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceCount )
         {
           physicalDevices.resize( physicalDeviceCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDevices(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumeratePhysicalDevices(
             static_cast<VkInstance>( m_instance ), &physicalDeviceCount, reinterpret_cast<VkPhysicalDevice *>( physicalDevices.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::enumeratePhysicalDevices" );
-      std::vector<PhysicalDevice> physicalDevicesRAII;
-      if ( result == Result::eSuccess )
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eIncomplete ) )
       {
-        physicalDevicesRAII.reserve( physicalDevices.size() );
-        for ( auto & physicalDevice : physicalDevices )
-        {
-          physicalDevicesRAII.emplace_back( *this, *reinterpret_cast<VkPhysicalDevice *>( &physicalDevice ) );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::enumeratePhysicalDevices" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDevicesRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PhysicalDevice> physicalDevicesRAII;
+      physicalDevicesRAII.reserve( physicalDevices.size() );
+      for ( auto & physicalDevice : physicalDevices )
+      {
+        physicalDevicesRAII.emplace_back( *this, *reinterpret_cast<VkPhysicalDevice *>( &physicalDevice ) );
+      }
+      return physicalDevicesRAII;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures PhysicalDevice::getFeatures() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures PhysicalDevice::getFeatures() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFeatures && "Function <vkGetPhysicalDeviceFeatures> requires <VK_VERSION_1_0>" );
 
-      PhysicalDeviceFeatures features;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures features;
       getDispatcher()->vkGetPhysicalDeviceFeatures( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                     reinterpret_cast<VkPhysicalDeviceFeatures *>( &features ) );
 
       return features;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties PhysicalDevice::getFormatProperties( Format format ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties
+                                           PhysicalDevice::getFormatProperties( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFormatProperties && "Function <vkGetPhysicalDeviceFormatProperties> requires <VK_VERSION_1_0>" );
 
-      FormatProperties formatProperties;
+      VULKAN_HPP_NAMESPACE::FormatProperties formatProperties;
       getDispatcher()->vkGetPhysicalDeviceFormatProperties(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties *>( &formatProperties ) );
 
       return formatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties>::type
-      PhysicalDevice::getImageFormatProperties( Format format, ImageType type, ImageTiling tiling, ImageUsageFlags usage, ImageCreateFlags flags ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ImageFormatProperties
+                                           PhysicalDevice::getImageFormatProperties( VULKAN_HPP_NAMESPACE::Format           format,
+                                                VULKAN_HPP_NAMESPACE::ImageType        type,
+                                                VULKAN_HPP_NAMESPACE::ImageTiling      tiling,
+                                                VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage,
+                                                VULKAN_HPP_NAMESPACE::ImageCreateFlags flags ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties &&
                          "Function <vkGetPhysicalDeviceImageFormatProperties> requires <VK_VERSION_1_0>" );
 
-      ImageFormatProperties imageFormatProperties;
-      Result                result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::ImageFormatProperties imageFormatProperties;
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceImageFormatProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                    static_cast<VkFormat>( format ),
                                                                    static_cast<VkImageType>( type ),
@@ -15176,33 +12018,29 @@ namespace VULKAN_HPP_NAMESPACE
                                                                    static_cast<VkImageUsageFlags>( usage ),
                                                                    static_cast<VkImageCreateFlags>( flags ),
                                                                    reinterpret_cast<VkImageFormatProperties *>( &imageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
+      return imageFormatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties PhysicalDevice::getProperties() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties PhysicalDevice::getProperties() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceProperties && "Function <vkGetPhysicalDeviceProperties> requires <VK_VERSION_1_0>" );
 
-      PhysicalDeviceProperties properties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties properties;
       getDispatcher()->vkGetPhysicalDeviceProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                       reinterpret_cast<VkPhysicalDeviceProperties *>( &properties ) );
 
       return properties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties> PhysicalDevice::getQueueFamilyProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties> PhysicalDevice::getQueueFamilyProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties &&
                          "Function <vkGetPhysicalDeviceQueueFamilyProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<QueueFamilyProperties> queueFamilyProperties;
-      uint32_t                           queueFamilyPropertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties> queueFamilyProperties;
+      uint32_t                                                 queueFamilyPropertyCount;
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ), &queueFamilyPropertyCount, nullptr );
       queueFamilyProperties.resize( queueFamilyPropertyCount );
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
@@ -15217,21 +12055,18 @@ namespace VULKAN_HPP_NAMESPACE
       return queueFamilyProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties PhysicalDevice::getMemoryProperties() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties PhysicalDevice::getMemoryProperties() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMemoryProperties && "Function <vkGetPhysicalDeviceMemoryProperties> requires <VK_VERSION_1_0>" );
 
-      PhysicalDeviceMemoryProperties memoryProperties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties memoryProperties;
       getDispatcher()->vkGetPhysicalDeviceMemoryProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                             reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( &memoryProperties ) );
 
       return memoryProperties;
     }
 
-    // wrapper function for command vkGetInstanceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetInstanceProcAddr.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PFN_VoidFunction Instance::getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PFN_vkVoidFunction Instance::getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetInstanceProcAddr && "Function <vkGetInstanceProcAddr> requires <VK_VERSION_1_0>" );
 
@@ -15240,8 +12075,7 @@ namespace VULKAN_HPP_NAMESPACE
       return result;
     }
 
-    // wrapper function for command vkGetDeviceProcAddr, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceProcAddr.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PFN_VoidFunction Device::getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PFN_vkVoidFunction Device::getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceProcAddr && "Function <vkGetDeviceProcAddr> requires <VK_VERSION_1_0>" );
 
@@ -15250,325 +12084,310 @@ namespace VULKAN_HPP_NAMESPACE
       return result;
     }
 
-    // wrapper function for command vkCreateDevice, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDevice.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Device>::type
-                         PhysicalDevice::createDevice( DeviceCreateInfo const &            createInfo,
-                                    Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device>::Type
+                        PhysicalDevice::createDevice( VULKAN_HPP_NAMESPACE::DeviceCreateInfo const &                                  createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Device device;
-      Result                       result = static_cast<Result>( getDispatcher()->vkCreateDevice( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                            reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkDevice *>( &device ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::createDevice" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Device( *this, *reinterpret_cast<VkDevice *>( &device ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDevice(
+        static_cast<VkPhysicalDevice>( m_physicalDevice ),
+        reinterpret_cast<const VkDeviceCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDevice *>( &device ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "PhysicalDevice::createDevice" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Device( *this, *reinterpret_cast<VkDevice *>( &device ), allocator );
     }
 
-    // wrapper function for command vkEnumerateInstanceExtensionProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceExtensionProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties>>::type
-                         Context::enumerateInstanceExtensionProperties( Optional<const std::string> layerName ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties>
+                                           Context::enumerateInstanceExtensionProperties( Optional<const std::string> layerName ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumerateInstanceExtensionProperties &&
                          "Function <vkEnumerateInstanceExtensionProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<ExtensionProperties> properties;
-      uint32_t                         propertyCount;
-      Result                           result;
+      std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties> properties;
+      uint32_t                                               propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                           result;
       do
       {
-        result =
-          static_cast<Result>( getDispatcher()->vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkEnumerateInstanceExtensionProperties( layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumerateInstanceExtensionProperties(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumerateInstanceExtensionProperties(
             layerName ? layerName->c_str() : nullptr, &propertyCount, reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Context::enumerateInstanceExtensionProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Context::enumerateInstanceExtensionProperties" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkEnumerateDeviceExtensionProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceExtensionProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ExtensionProperties>>::type
-                         PhysicalDevice::enumerateDeviceExtensionProperties( Optional<const std::string> layerName ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties>
+                                           PhysicalDevice::enumerateDeviceExtensionProperties( Optional<const std::string> layerName ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumerateDeviceExtensionProperties && "Function <vkEnumerateDeviceExtensionProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<ExtensionProperties> properties;
-      uint32_t                         propertyCount;
-      Result                           result;
+      std::vector<VULKAN_HPP_NAMESPACE::ExtensionProperties> properties;
+      uint32_t                                               propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                           result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkEnumerateDeviceExtensionProperties(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumerateDeviceExtensionProperties(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), layerName ? layerName->c_str() : nullptr, &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result =
-            static_cast<Result>( getDispatcher()->vkEnumerateDeviceExtensionProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                        layerName ? layerName->c_str() : nullptr,
-                                                                                        &propertyCount,
-                                                                                        reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkEnumerateDeviceExtensionProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                   layerName ? layerName->c_str() : nullptr,
+                                                                   &propertyCount,
+                                                                   reinterpret_cast<VkExtensionProperties *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceExtensionProperties" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkEnumerateInstanceLayerProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceLayerProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties>>::type Context::enumerateInstanceLayerProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> Context::enumerateInstanceLayerProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumerateInstanceLayerProperties && "Function <vkEnumerateInstanceLayerProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<LayerProperties> properties;
-      uint32_t                     propertyCount;
-      Result                       result;
+      std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> properties;
+      uint32_t                                           propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                       result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumerateInstanceLayerProperties( &propertyCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkEnumerateInstanceLayerProperties( &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Context::enumerateInstanceLayerProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Context::enumerateInstanceLayerProperties" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkEnumerateDeviceLayerProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateDeviceLayerProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<LayerProperties>>::type PhysicalDevice::enumerateDeviceLayerProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> PhysicalDevice::enumerateDeviceLayerProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumerateDeviceLayerProperties && "Function <vkEnumerateDeviceLayerProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<LayerProperties> properties;
-      uint32_t                     propertyCount;
-      Result                       result;
+      std::vector<VULKAN_HPP_NAMESPACE::LayerProperties> properties;
+      uint32_t                                           propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                       result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkEnumerateDeviceLayerProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumerateDeviceLayerProperties(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumerateDeviceLayerProperties(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkLayerProperties *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateDeviceLayerProperties" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetDeviceQueue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Queue Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue>::Type
+                        Device::getQueue( uint32_t queueFamilyIndex, uint32_t queueIndex ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Queue queue;
       getDispatcher()->vkGetDeviceQueue( static_cast<VkDevice>( m_device ), queueFamilyIndex, queueIndex, reinterpret_cast<VkQueue *>( &queue ) );
 
-      return Queue( *this, *reinterpret_cast<VkQueue *>( &queue ) );
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue( *this, *reinterpret_cast<VkQueue *>( &queue ) );
     }
 
-    // wrapper function for command vkQueueSubmit, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit( ArrayProxy<const SubmitInfo> const & submits,
-                                                                          VULKAN_HPP_NAMESPACE::Fence          fence ) const
+    VULKAN_HPP_INLINE void Queue::submit( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo> const & submits,
+                                          VULKAN_HPP_NAMESPACE::Fence                                                      fence ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSubmit && "Function <vkQueueSubmit> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkQueueSubmit(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueSubmit(
         static_cast<VkQueue>( m_queue ), submits.size(), reinterpret_cast<const VkSubmitInfo *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::submit" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit" );
     }
 
-    // wrapper function for command vkQueueWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueWaitIdle.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::waitIdle() const
+    VULKAN_HPP_INLINE void Queue::waitIdle() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueWaitIdle && "Function <vkQueueWaitIdle> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkQueueWaitIdle( static_cast<VkQueue>( m_queue ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::waitIdle" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueWaitIdle( static_cast<VkQueue>( m_queue ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::waitIdle" );
     }
 
-    // wrapper function for command vkDeviceWaitIdle, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeviceWaitIdle.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::waitIdle() const
+    VULKAN_HPP_INLINE void Device::waitIdle() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDeviceWaitIdle && "Function <vkDeviceWaitIdle> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkDeviceWaitIdle( static_cast<VkDevice>( m_device ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::waitIdle" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkDeviceWaitIdle( static_cast<VkDevice>( m_device ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitIdle" );
     }
 
-    // wrapper function for command vkAllocateMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateMemory.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceMemory>::type
-                         Device::allocateMemory( MemoryAllocateInfo const &          allocateInfo,
-                              Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceMemory>::Type
+                        Device::allocateMemory( VULKAN_HPP_NAMESPACE::MemoryAllocateInfo const &                                allocateInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DeviceMemory memory;
-      Result                             result = static_cast<Result>( getDispatcher()->vkAllocateMemory( static_cast<VkDevice>( m_device ),
-                                                                              reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::allocateMemory" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, DeviceMemory( *this, *reinterpret_cast<VkDeviceMemory *>( &memory ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkAllocateMemory(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkMemoryAllocateInfo *>( &allocateInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDeviceMemory *>( &memory ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::allocateMemory" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceMemory( *this, *reinterpret_cast<VkDeviceMemory *>( &memory ), allocator );
     }
 
-    // wrapper function for command vkMapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type
-                         DeviceMemory::mapMemory( DeviceSize offset, DeviceSize size, MemoryMapFlags flags ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE void * DeviceMemory::mapMemory( VULKAN_HPP_NAMESPACE::DeviceSize     offset,
+                                                                           VULKAN_HPP_NAMESPACE::DeviceSize     size,
+                                                                           VULKAN_HPP_NAMESPACE::MemoryMapFlags flags ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkMapMemory && "Function <vkMapMemory> requires <VK_VERSION_1_0>" );
 
-      void * pData;
-      Result result = static_cast<Result>( getDispatcher()->vkMapMemory( static_cast<VkDevice>( m_device ),
-                                                                         static_cast<VkDeviceMemory>( m_deviceMemory ),
-                                                                         static_cast<VkDeviceSize>( offset ),
-                                                                         static_cast<VkDeviceSize>( size ),
-                                                                         static_cast<VkMemoryMapFlags>( flags ),
-                                                                         &pData ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DeviceMemory::mapMemory" );
+      void *                       pData;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkMapMemory( static_cast<VkDevice>( m_device ),
+                                                                                                                     static_cast<VkDeviceMemory>( m_memory ),
+                                                                                                                     static_cast<VkDeviceSize>( offset ),
+                                                                                                                     static_cast<VkDeviceSize>( size ),
+                                                                                                                     static_cast<VkMemoryMapFlags>( flags ),
+                                                                                                                     &pData ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DeviceMemory::mapMemory" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pData ) );
+      return pData;
     }
 
-    // wrapper function for command vkUnmapMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory.html
     VULKAN_HPP_INLINE void DeviceMemory::unmapMemory() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkUnmapMemory && "Function <vkUnmapMemory> requires <VK_VERSION_1_0>" );
 
-      getDispatcher()->vkUnmapMemory( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_deviceMemory ) );
+      getDispatcher()->vkUnmapMemory( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_memory ) );
     }
 
-    // wrapper function for command vkFlushMappedMemoryRanges, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkFlushMappedMemoryRanges.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::flushMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges ) const
+    VULKAN_HPP_INLINE void
+      Device::flushMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkFlushMappedMemoryRanges && "Function <vkFlushMappedMemoryRanges> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkFlushMappedMemoryRanges(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkFlushMappedMemoryRanges(
         static_cast<VkDevice>( m_device ), memoryRanges.size(), reinterpret_cast<const VkMappedMemoryRange *>( memoryRanges.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::flushMappedMemoryRanges" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::flushMappedMemoryRanges" );
     }
 
-    // wrapper function for command vkInvalidateMappedMemoryRanges, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInvalidateMappedMemoryRanges.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::invalidateMappedMemoryRanges( ArrayProxy<const MappedMemoryRange> const & memoryRanges ) const
+    VULKAN_HPP_INLINE void
+      Device::invalidateMappedMemoryRanges( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MappedMemoryRange> const & memoryRanges ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkInvalidateMappedMemoryRanges && "Function <vkInvalidateMappedMemoryRanges> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkInvalidateMappedMemoryRanges(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkInvalidateMappedMemoryRanges(
         static_cast<VkDevice>( m_device ), memoryRanges.size(), reinterpret_cast<const VkMappedMemoryRange *>( memoryRanges.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::invalidateMappedMemoryRanges" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::invalidateMappedMemoryRanges" );
     }
 
-    // wrapper function for command vkGetDeviceMemoryCommitment, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryCommitment.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize DeviceMemory::getCommitment() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize DeviceMemory::getCommitment() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceMemoryCommitment && "Function <vkGetDeviceMemoryCommitment> requires <VK_VERSION_1_0>" );
 
-      DeviceSize committedMemoryInBytes;
+      VULKAN_HPP_NAMESPACE::DeviceSize committedMemoryInBytes;
       getDispatcher()->vkGetDeviceMemoryCommitment(
-        static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_deviceMemory ), reinterpret_cast<VkDeviceSize *>( &committedMemoryInBytes ) );
+        static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_memory ), reinterpret_cast<VkDeviceSize *>( &committedMemoryInBytes ) );
 
       return committedMemoryInBytes;
     }
 
-    // wrapper function for command vkBindBufferMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Buffer::bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, DeviceSize memoryOffset ) const
+    VULKAN_HPP_INLINE void Buffer::bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindBufferMemory && "Function <vkBindBufferMemory> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindBufferMemory( static_cast<VkDevice>( m_device ),
-                                                                                static_cast<VkBuffer>( m_buffer ),
-                                                                                static_cast<VkDeviceMemory>( memory ),
-                                                                                static_cast<VkDeviceSize>( memoryOffset ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Buffer::bindMemory" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindBufferMemory( static_cast<VkDevice>( m_device ),
+                                                                                        static_cast<VkBuffer>( m_buffer ),
+                                                                                        static_cast<VkDeviceMemory>( memory ),
+                                                                                        static_cast<VkDeviceSize>( memoryOffset ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Buffer::bindMemory" );
     }
 
-    // wrapper function for command vkBindImageMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Image::bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, DeviceSize memoryOffset ) const
+    VULKAN_HPP_INLINE void Image::bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindImageMemory && "Function <vkBindImageMemory> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindImageMemory( static_cast<VkDevice>( m_device ),
-                                                                               static_cast<VkImage>( m_image ),
-                                                                               static_cast<VkDeviceMemory>( memory ),
-                                                                               static_cast<VkDeviceSize>( memoryOffset ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Image::bindMemory" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindImageMemory( static_cast<VkDevice>( m_device ),
+                                                                                       static_cast<VkImage>( m_image ),
+                                                                                       static_cast<VkDeviceMemory>( memory ),
+                                                                                       static_cast<VkDeviceSize>( memoryOffset ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Image::bindMemory" );
     }
 
-    // wrapper function for command vkGetBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements Buffer::getMemoryRequirements() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements Buffer::getMemoryRequirements() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferMemoryRequirements && "Function <vkGetBufferMemoryRequirements> requires <VK_VERSION_1_0>" );
 
-      MemoryRequirements memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements;
       getDispatcher()->vkGetBufferMemoryRequirements(
         static_cast<VkDevice>( m_device ), static_cast<VkBuffer>( m_buffer ), reinterpret_cast<VkMemoryRequirements *>( &memoryRequirements ) );
 
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements Image::getMemoryRequirements() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements Image::getMemoryRequirements() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageMemoryRequirements && "Function <vkGetImageMemoryRequirements> requires <VK_VERSION_1_0>" );
 
-      MemoryRequirements memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements;
       getDispatcher()->vkGetImageMemoryRequirements(
         static_cast<VkDevice>( m_device ), static_cast<VkImage>( m_image ), reinterpret_cast<VkMemoryRequirements *>( &memoryRequirements ) );
 
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements> Image::getSparseMemoryRequirements() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements> Image::getSparseMemoryRequirements() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageSparseMemoryRequirements && "Function <vkGetImageSparseMemoryRequirements> requires <VK_VERSION_1_0>" );
 
-      std::vector<SparseImageMemoryRequirements> sparseMemoryRequirements;
-      uint32_t                                   sparseMemoryRequirementCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements> sparseMemoryRequirements;
+      uint32_t                                                         sparseMemoryRequirementCount;
       getDispatcher()->vkGetImageSparseMemoryRequirements(
         static_cast<VkDevice>( m_device ), static_cast<VkImage>( m_image ), &sparseMemoryRequirementCount, nullptr );
       sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -15585,16 +12404,18 @@ namespace VULKAN_HPP_NAMESPACE
       return sparseMemoryRequirements;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties> PhysicalDevice::getSparseImageFormatProperties(
-      Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties>
+                                           PhysicalDevice::getSparseImageFormatProperties( VULKAN_HPP_NAMESPACE::Format              format,
+                                                      VULKAN_HPP_NAMESPACE::ImageType           type,
+                                                      VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples,
+                                                      VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage,
+                                                      VULKAN_HPP_NAMESPACE::ImageTiling         tiling ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties &&
                          "Function <vkGetPhysicalDeviceSparseImageFormatProperties> requires <VK_VERSION_1_0>" );
 
-      std::vector<SparseImageFormatProperties> properties;
-      uint32_t                                 propertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties> properties;
+      uint32_t                                                       propertyCount;
       getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                        static_cast<VkFormat>( format ),
                                                                        static_cast<VkImageType>( type ),
@@ -15621,172 +12442,293 @@ namespace VULKAN_HPP_NAMESPACE
       return properties;
     }
 
-    // wrapper function for command vkQueueBindSparse, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBindSparse.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::bindSparse( ArrayProxy<const BindSparseInfo> const & bindInfo,
-                                                                              VULKAN_HPP_NAMESPACE::Fence              fence ) const
+    VULKAN_HPP_INLINE void Queue::bindSparse( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindSparseInfo> const & bindInfo,
+                                              VULKAN_HPP_NAMESPACE::Fence                                                          fence ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueBindSparse && "Function <vkQueueBindSparse> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkQueueBindSparse(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueBindSparse(
         static_cast<VkQueue>( m_queue ), bindInfo.size(), reinterpret_cast<const VkBindSparseInfo *>( bindInfo.data() ), static_cast<VkFence>( fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::bindSparse" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::bindSparse" );
     }
 
-    // wrapper function for command vkCreateFence, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFence.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type
-      Device::createFence( FenceCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                        Device::createFence( VULKAN_HPP_NAMESPACE::FenceCreateInfo const &                                   createInfo,
+                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
-      VULKAN_HPP_NAMESPACE::Fence fence;
-      Result                      result = static_cast<Result>( getDispatcher()->vkCreateFence( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkFence *>( &fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createFence" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Fence  fence;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateFence(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkFenceCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkFence *>( &fence ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createFence" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator );
     }
 
-    // wrapper function for command vkResetFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetFences.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::resetFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences ) const
+    VULKAN_HPP_INLINE void Device::resetFences( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkResetFences && "Function <vkResetFences> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkResetFences( static_cast<VkDevice>( m_device ), fences.size(), reinterpret_cast<const VkFence *>( fences.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::resetFences" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::resetFences" );
     }
 
-    // wrapper function for command vkGetFenceStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceStatus.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Fence::getStatus() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Fence::getStatus() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetFenceStatus && "Function <vkGetFenceStatus> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkGetFenceStatus( static_cast<VkDevice>( m_device ), static_cast<VkFence>( m_fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Fence::getStatus", { Result::eSuccess, Result::eNotReady } );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetFenceStatus( static_cast<VkDevice>( m_device ), static_cast<VkFence>( m_fence ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::Fence::getStatus", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkWaitForFences, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForFences.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitForFences( ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences,
-                                                                         Bool32                                                waitAll,
-                                                                         uint64_t                                              timeout ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::waitForFences(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Fence> const & fences, VULKAN_HPP_NAMESPACE::Bool32 waitAll, uint64_t timeout ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWaitForFences && "Function <vkWaitForFences> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkWaitForFences(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkWaitForFences(
         static_cast<VkDevice>( m_device ), fences.size(), reinterpret_cast<const VkFence *>( fences.data() ), static_cast<VkBool32>( waitAll ), timeout ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::waitForFences", { Result::eSuccess, Result::eTimeout } );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitForFences", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCreateSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSemaphore.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Semaphore>::type
-                         Device::createSemaphore( SemaphoreCreateInfo const &         createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Semaphore>::Type
+                        Device::createSemaphore( VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo const &                               createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Semaphore semaphore;
-      Result                          result = static_cast<Result>( getDispatcher()->vkCreateSemaphore( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSemaphore" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Semaphore( *this, *reinterpret_cast<VkSemaphore *>( &semaphore ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSemaphore(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkSemaphoreCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSemaphore *>( &semaphore ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSemaphore" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Semaphore( *this, *reinterpret_cast<VkSemaphore *>( &semaphore ), allocator );
     }
 
-    // wrapper function for command vkCreateQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateQueryPool.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<QueryPool>::type
-                         Device::createQueryPool( QueryPoolCreateInfo const &         createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Event>::Type
+                        Device::createEvent( VULKAN_HPP_NAMESPACE::EventCreateInfo const &                                   createInfo,
+                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::Event  event;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateEvent(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkEvent *>( &event ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createEvent" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Event( *this, *reinterpret_cast<VkEvent *>( &event ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Event::getStatus() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetEventStatus && "Function <vkGetEventStatus> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEventStatus( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::Event::getStatus", { VULKAN_HPP_NAMESPACE::Result::eEventSet, VULKAN_HPP_NAMESPACE::Result::eEventReset } );
+
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
+    }
+
+    VULKAN_HPP_INLINE void Event::set() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkSetEvent && "Function <vkSetEvent> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkSetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Event::set" );
+    }
+
+    VULKAN_HPP_INLINE void Event::reset() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkResetEvent && "Function <vkResetEvent> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkResetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Event::reset" );
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::QueryPool>::Type
+                        Device::createQueryPool( VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo const &                               createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::QueryPool queryPool;
-      Result                          result = static_cast<Result>( getDispatcher()->vkCreateQueryPool( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createQueryPool" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, QueryPool( *this, *reinterpret_cast<VkQueryPool *>( &queryPool ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateQueryPool(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkQueryPoolCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkQueryPool *>( &queryPool ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createQueryPool" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::QueryPool( *this, *reinterpret_cast<VkQueryPool *>( &queryPool ), allocator );
     }
 
-    // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::vector<DataType>>
-      QueryPool::getResults( uint32_t firstQuery, uint32_t queryCount, size_t dataSize, DeviceSize stride, QueryResultFlags flags ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, std::vector<DataType>> QueryPool::getResults(
+      uint32_t firstQuery, uint32_t queryCount, size_t dataSize, VULKAN_HPP_NAMESPACE::DeviceSize stride, VULKAN_HPP_NAMESPACE::QueryResultFlags flags ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetQueryPoolResults && "Function <vkGetQueryPoolResults> requires <VK_VERSION_1_0>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>( getDispatcher()->vkGetQueryPoolResults( static_cast<VkDevice>( m_device ),
-                                                                                   static_cast<VkQueryPool>( m_queryPool ),
-                                                                                   firstQuery,
-                                                                                   queryCount,
-                                                                                   data.size() * sizeof( DataType ),
-                                                                                   reinterpret_cast<void *>( data.data() ),
-                                                                                   static_cast<VkDeviceSize>( stride ),
-                                                                                   static_cast<VkQueryResultFlags>( flags ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::QueryPool::getResults", { Result::eSuccess, Result::eNotReady } );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetQueryPoolResults( static_cast<VkDevice>( m_device ),
+                                                                                           static_cast<VkQueryPool>( m_queryPool ),
+                                                                                           firstQuery,
+                                                                                           queryCount,
+                                                                                           data.size() * sizeof( DataType ),
+                                                                                           reinterpret_cast<void *>( data.data() ),
+                                                                                           static_cast<VkDeviceSize>( stride ),
+                                                                                           static_cast<VkQueryResultFlags>( flags ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::QueryPool::getResults", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
-      return ResultValue<std::vector<DataType>>( result, std::move( data ) );
+      return std::make_pair( result, std::move( data ) );
     }
 
-    // wrapper function for command vkGetQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueryPoolResults.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<DataType>
-                                           QueryPool::getResult( uint32_t firstQuery, uint32_t queryCount, DeviceSize stride, QueryResultFlags flags ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, DataType> QueryPool::getResult(
+      uint32_t firstQuery, uint32_t queryCount, VULKAN_HPP_NAMESPACE::DeviceSize stride, VULKAN_HPP_NAMESPACE::QueryResultFlags flags ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetQueryPoolResults && "Function <vkGetQueryPoolResults> requires <VK_VERSION_1_0>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetQueryPoolResults( static_cast<VkDevice>( m_device ),
-                                                                                   static_cast<VkQueryPool>( m_queryPool ),
-                                                                                   firstQuery,
-                                                                                   queryCount,
-                                                                                   sizeof( DataType ),
-                                                                                   reinterpret_cast<void *>( &data ),
-                                                                                   static_cast<VkDeviceSize>( stride ),
-                                                                                   static_cast<VkQueryResultFlags>( flags ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::QueryPool::getResult", { Result::eSuccess, Result::eNotReady } );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetQueryPoolResults( static_cast<VkDevice>( m_device ),
+                                                                                           static_cast<VkQueryPool>( m_queryPool ),
+                                                                                           firstQuery,
+                                                                                           queryCount,
+                                                                                           sizeof( DataType ),
+                                                                                           reinterpret_cast<void *>( &data ),
+                                                                                           static_cast<VkDeviceSize>( stride ),
+                                                                                           static_cast<VkQueryResultFlags>( flags ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::QueryPool::getResult", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eNotReady } );
 
-      return ResultValue<DataType>( result, std::move( data ) );
+      return std::make_pair( result, std::move( data ) );
     }
 
-    // wrapper function for command vkCreateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBuffer.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Buffer>::type
-      Device::createBuffer( BufferCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Buffer>::Type
+                        Device::createBuffer( VULKAN_HPP_NAMESPACE::BufferCreateInfo const &                                  createInfo,
+                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Buffer buffer;
-      Result                       result = static_cast<Result>( getDispatcher()->vkCreateBuffer( static_cast<VkDevice>( m_device ),
-                                                                            reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkBuffer *>( &buffer ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createBuffer" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Buffer( *this, *reinterpret_cast<VkBuffer *>( &buffer ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateBuffer(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkBufferCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkBuffer *>( &buffer ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createBuffer" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Buffer( *this, *reinterpret_cast<VkBuffer *>( &buffer ), allocator );
     }
 
-    // wrapper function for command vkCreateImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImage.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Image>::type
-      Device::createImage( ImageCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferView>::Type
+                        Device::createBufferView( VULKAN_HPP_NAMESPACE::BufferViewCreateInfo const &                              createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
-      VULKAN_HPP_NAMESPACE::Image image;
-      Result                      result = static_cast<Result>( getDispatcher()->vkCreateImage( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkImage *>( &image ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createImage" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Image( *this, *reinterpret_cast<VkImage *>( &image ), allocator ) );
+      VULKAN_HPP_NAMESPACE::BufferView view;
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateBufferView(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkBufferView *>( &view ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createBufferView" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferView( *this, *reinterpret_cast<VkBufferView *>( &view ), allocator );
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout Image::getSubresourceLayout( const ImageSubresource & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Image>::Type
+                        Device::createImage( VULKAN_HPP_NAMESPACE::ImageCreateInfo const &                                   createInfo,
+                           VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::Image  image;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateImage(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkImageCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkImage *>( &image ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createImage" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Image( *this, *reinterpret_cast<VkImage *>( &image ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout
+                                           Image::getSubresourceLayout( const VULKAN_HPP_NAMESPACE::ImageSubresource & subresource ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageSubresourceLayout && "Function <vkGetImageSubresourceLayout> requires <VK_VERSION_1_0>" );
 
-      SubresourceLayout layout;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout layout;
       getDispatcher()->vkGetImageSubresourceLayout( static_cast<VkDevice>( m_device ),
                                                     static_cast<VkImage>( m_image ),
                                                     reinterpret_cast<const VkImageSubresource *>( &subresource ),
@@ -15795,559 +12737,370 @@ namespace VULKAN_HPP_NAMESPACE
       return layout;
     }
 
-    // wrapper function for command vkCreateImageView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImageView.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageView>::type
-                         Device::createImageView( ImageViewCreateInfo const &         createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ImageView>::Type
+                        Device::createImageView( VULKAN_HPP_NAMESPACE::ImageViewCreateInfo const &                               createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::ImageView view;
-      Result                          result = static_cast<Result>( getDispatcher()->vkCreateImageView( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkImageView *>( &view ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createImageView" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, ImageView( *this, *reinterpret_cast<VkImageView *>( &view ), allocator ) );
-    }
-
-    // wrapper function for command vkCreateCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCommandPool.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CommandPool>::type
-                         Device::createCommandPool( CommandPoolCreateInfo const &       createInfo,
-                                 Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::CommandPool commandPool;
-      Result                            result = static_cast<Result>( getDispatcher()->vkCreateCommandPool( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createCommandPool" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, CommandPool( *this, *reinterpret_cast<VkCommandPool *>( &commandPool ), allocator ) );
-    }
-
-    // wrapper function for command vkResetCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandPool.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandPool::reset( CommandPoolResetFlags flags ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkResetCommandPool && "Function <vkResetCommandPool> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkResetCommandPool(
-        static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( m_commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandPool::reset" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkAllocateCommandBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateCommandBuffers.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CommandBuffer>>::type
-                         Device::allocateCommandBuffers( CommandBufferAllocateInfo const & allocateInfo ) const
-    {
-      std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
-      Result result = static_cast<Result>( getDispatcher()->vkAllocateCommandBuffers( static_cast<VkDevice>( m_device ),
-                                                                                      reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ),
-                                                                                      reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::allocateCommandBuffers" );
-      std::vector<CommandBuffer> commandBuffersRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateImageView(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkImageViewCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkImageView *>( &view ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
       {
-        commandBuffersRAII.reserve( commandBuffers.size() );
-        for ( auto & commandBuffer : commandBuffers )
-        {
-          commandBuffersRAII.emplace_back(
-            *this, *reinterpret_cast<VkCommandBuffer *>( &commandBuffer ), static_cast<VkCommandPool>( allocateInfo.commandPool ) );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createImageView" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( commandBuffersRAII ) );
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ImageView( *this, *reinterpret_cast<VkImageView *>( &view ), allocator );
     }
 
-    // wrapper function for command vkBeginCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBeginCommandBuffer.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::begin( const CommandBufferBeginInfo & beginInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkBeginCommandBuffer && "Function <vkBeginCommandBuffer> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkBeginCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                                  reinterpret_cast<const VkCommandBufferBeginInfo *>( &beginInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::begin" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkEndCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEndCommandBuffer.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::end() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkEndCommandBuffer && "Function <vkEndCommandBuffer> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkEndCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::end" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkResetCommandBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetCommandBuffer.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::reset( CommandBufferResetFlags flags ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkResetCommandBuffer && "Function <vkResetCommandBuffer> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkResetCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCommandBufferResetFlags>( flags ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::reset" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCmdCopyBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBuffer( VULKAN_HPP_NAMESPACE::Buffer         srcBuffer,
-                                                      VULKAN_HPP_NAMESPACE::Buffer         dstBuffer,
-                                                      ArrayProxy<const BufferCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBuffer && "Function <vkCmdCopyBuffer> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdCopyBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                        static_cast<VkBuffer>( srcBuffer ),
-                                        static_cast<VkBuffer>( dstBuffer ),
-                                        regions.size(),
-                                        reinterpret_cast<const VkBufferCopy *>( regions.data() ) );
-    }
-
-    // wrapper function for command vkCmdCopyImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImage( VULKAN_HPP_NAMESPACE::Image         srcImage,
-                                                     ImageLayout                         srcImageLayout,
-                                                     VULKAN_HPP_NAMESPACE::Image         dstImage,
-                                                     ImageLayout                         dstImageLayout,
-                                                     ArrayProxy<const ImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImage && "Function <vkCmdCopyImage> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdCopyImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                       static_cast<VkImage>( srcImage ),
-                                       static_cast<VkImageLayout>( srcImageLayout ),
-                                       static_cast<VkImage>( dstImage ),
-                                       static_cast<VkImageLayout>( dstImageLayout ),
-                                       regions.size(),
-                                       reinterpret_cast<const VkImageCopy *>( regions.data() ) );
-    }
-
-    // wrapper function for command vkCmdCopyBufferToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage( VULKAN_HPP_NAMESPACE::Buffer              srcBuffer,
-                                                             VULKAN_HPP_NAMESPACE::Image               dstImage,
-                                                             ImageLayout                               dstImageLayout,
-                                                             ArrayProxy<const BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBufferToImage && "Function <vkCmdCopyBufferToImage> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdCopyBufferToImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               static_cast<VkBuffer>( srcBuffer ),
-                                               static_cast<VkImage>( dstImage ),
-                                               static_cast<VkImageLayout>( dstImageLayout ),
-                                               regions.size(),
-                                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
-    }
-
-    // wrapper function for command vkCmdCopyImageToBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer( VULKAN_HPP_NAMESPACE::Image               srcImage,
-                                                             ImageLayout                               srcImageLayout,
-                                                             VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
-                                                             ArrayProxy<const BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImageToBuffer && "Function <vkCmdCopyImageToBuffer> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdCopyImageToBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               static_cast<VkImage>( srcImage ),
-                                               static_cast<VkImageLayout>( srcImageLayout ),
-                                               static_cast<VkBuffer>( dstBuffer ),
-                                               regions.size(),
-                                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
-    }
-
-    // wrapper function for command vkCmdUpdateBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdateBuffer.html
-    template <typename DataType>
-    VULKAN_HPP_INLINE void CommandBuffer::updateBuffer( VULKAN_HPP_NAMESPACE::Buffer       dstBuffer,
-                                                        DeviceSize                         dstOffset,
-                                                        ArrayProxy<const DataType> const & data ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdUpdateBuffer && "Function <vkCmdUpdateBuffer> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdUpdateBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                          static_cast<VkBuffer>( dstBuffer ),
-                                          static_cast<VkDeviceSize>( dstOffset ),
-                                          data.size() * sizeof( DataType ),
-                                          reinterpret_cast<const void *>( data.data() ) );
-    }
-
-    // wrapper function for command vkCmdFillBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdFillBuffer.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::fillBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer, DeviceSize dstOffset, DeviceSize size, uint32_t data ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdFillBuffer && "Function <vkCmdFillBuffer> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdFillBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                        static_cast<VkBuffer>( dstBuffer ),
-                                        static_cast<VkDeviceSize>( dstOffset ),
-                                        static_cast<VkDeviceSize>( size ),
-                                        data );
-    }
-
-    // wrapper function for command vkCmdPipelineBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier.html
-    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier( PipelineStageFlags                            srcStageMask,
-                                                           PipelineStageFlags                            dstStageMask,
-                                                           DependencyFlags                               dependencyFlags,
-                                                           ArrayProxy<const MemoryBarrier> const &       memoryBarriers,
-                                                           ArrayProxy<const BufferMemoryBarrier> const & bufferMemoryBarriers,
-                                                           ArrayProxy<const ImageMemoryBarrier> const &  imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPipelineBarrier && "Function <vkCmdPipelineBarrier> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdPipelineBarrier( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                             static_cast<VkPipelineStageFlags>( srcStageMask ),
-                                             static_cast<VkPipelineStageFlags>( dstStageMask ),
-                                             static_cast<VkDependencyFlags>( dependencyFlags ),
-                                             memoryBarriers.size(),
-                                             reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
-                                             bufferMemoryBarriers.size(),
-                                             reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
-                                             imageMemoryBarriers.size(),
-                                             reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
-    }
-
-    // wrapper function for command vkCmdBeginQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQuery.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::beginQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, QueryControlFlags flags ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginQuery && "Function <vkCmdBeginQuery> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdBeginQuery(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ) );
-    }
-
-    // wrapper function for command vkCmdEndQuery, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQuery.html
-    VULKAN_HPP_INLINE void CommandBuffer::endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndQuery && "Function <vkCmdEndQuery> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdEndQuery( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query );
-    }
-
-    // wrapper function for command vkCmdResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetQueryPool.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetQueryPool && "Function <vkCmdResetQueryPool> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdResetQueryPool( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
-    }
-
-    // wrapper function for command vkCmdWriteTimestamp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::writeTimestamp( PipelineStageFlagBits pipelineStage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteTimestamp && "Function <vkCmdWriteTimestamp> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdWriteTimestamp(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlagBits>( pipelineStage ), static_cast<VkQueryPool>( queryPool ), query );
-    }
-
-    // wrapper function for command vkCmdCopyQueryPoolResults, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyQueryPoolResults.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
-                                                                uint32_t                        firstQuery,
-                                                                uint32_t                        queryCount,
-                                                                VULKAN_HPP_NAMESPACE::Buffer    dstBuffer,
-                                                                DeviceSize                      dstOffset,
-                                                                DeviceSize                      stride,
-                                                                QueryResultFlags                flags ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyQueryPoolResults && "Function <vkCmdCopyQueryPoolResults> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdCopyQueryPoolResults( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                  static_cast<VkQueryPool>( queryPool ),
-                                                  firstQuery,
-                                                  queryCount,
-                                                  static_cast<VkBuffer>( dstBuffer ),
-                                                  static_cast<VkDeviceSize>( dstOffset ),
-                                                  static_cast<VkDeviceSize>( stride ),
-                                                  static_cast<VkQueryResultFlags>( flags ) );
-    }
-
-    // wrapper function for command vkCmdExecuteCommands, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteCommands.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::executeCommands( ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdExecuteCommands && "Function <vkCmdExecuteCommands> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdExecuteCommands(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
-    }
-
-    // wrapper function for command vkCreateEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateEvent.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Event>::type
-      Device::createEvent( EventCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::Event event;
-      Result                      result = static_cast<Result>( getDispatcher()->vkCreateEvent( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkEventCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkEvent *>( &event ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createEvent" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Event( *this, *reinterpret_cast<VkEvent *>( &event ), allocator ) );
-    }
-
-    // wrapper function for command vkGetEventStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEventStatus.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Event::getStatus() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetEventStatus && "Function <vkGetEventStatus> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkGetEventStatus( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Event::getStatus", { Result::eEventSet, Result::eEventReset } );
-
-      return static_cast<Result>( result );
-    }
-
-    // wrapper function for command vkSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetEvent.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Event::set() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkSetEvent && "Function <vkSetEvent> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkSetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Event::set" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetEvent.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Event::reset() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkResetEvent && "Function <vkResetEvent> requires <VK_VERSION_1_0>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkResetEvent( static_cast<VkDevice>( m_device ), static_cast<VkEvent>( m_event ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Event::reset" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCreateBufferView, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferView.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferView>::type
-                         Device::createBufferView( BufferViewCreateInfo const &        createInfo,
-                                Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::BufferView view;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateBufferView( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkBufferViewCreateInfo *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkBufferView *>( &view ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createBufferView" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, BufferView( *this, *reinterpret_cast<VkBufferView *>( &view ), allocator ) );
-    }
-
-    // wrapper function for command vkCreateShaderModule, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShaderModule.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ShaderModule>::type
-                         Device::createShaderModule( ShaderModuleCreateInfo const &      createInfo,
-                                  Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderModule>::Type
+                        Device::createShaderModule( VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo const &                            createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::ShaderModule shaderModule;
-      Result                             result = static_cast<Result>( getDispatcher()->vkCreateShaderModule( static_cast<VkDevice>( m_device ),
-                                                                                  reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
-                                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                  reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createShaderModule" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
-                                                                  ShaderModule( *this, *reinterpret_cast<VkShaderModule *>( &shaderModule ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateShaderModule(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkShaderModule *>( &shaderModule ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createShaderModule" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderModule( *this, *reinterpret_cast<VkShaderModule *>( &shaderModule ), allocator );
     }
 
-    // wrapper function for command vkCreatePipelineCache, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineCache.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineCache>::type
-                         Device::createPipelineCache( PipelineCacheCreateInfo const &     createInfo,
-                                   Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache>::Type
+                        Device::createPipelineCache( VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo const &                           createInfo,
+                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::PipelineCache pipelineCache;
-      Result                              result = static_cast<Result>( getDispatcher()->vkCreatePipelineCache( static_cast<VkDevice>( m_device ),
-                                                                                   reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
-                                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                   reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createPipelineCache" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
-                                                                  PipelineCache( *this, *reinterpret_cast<VkPipelineCache *>( &pipelineCache ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreatePipelineCache(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkPipelineCacheCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipelineCache *>( &pipelineCache ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createPipelineCache" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache( *this, *reinterpret_cast<VkPipelineCache *>( &pipelineCache ), allocator );
     }
 
-    // wrapper function for command vkGetPipelineCacheData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineCacheData.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t>>::type PipelineCache::getData() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<uint8_t> PipelineCache::getData() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineCacheData && "Function <vkGetPipelineCacheData> requires <VK_VERSION_1_0>" );
 
-      std::vector<uint8_t> data;
-      size_t               dataSize;
-      Result               result;
+      std::vector<uint8_t>         data;
+      size_t                       dataSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPipelineCacheData( static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( m_pipelineCache ), &dataSize, nullptr ) );
-        if ( ( result == Result::eSuccess ) && dataSize )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
         {
           data.resize( dataSize );
-          result = static_cast<Result>( getDispatcher()->vkGetPipelineCacheData(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPipelineCacheData(
             static_cast<VkDevice>( m_device ), static_cast<VkPipelineCache>( m_pipelineCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PipelineCache::getData" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PipelineCache::getData" );
       VULKAN_HPP_ASSERT( dataSize <= data.size() );
       if ( dataSize < data.size() )
       {
         data.resize( dataSize );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkMergePipelineCaches, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergePipelineCaches.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type PipelineCache::merge( ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches ) const
+    VULKAN_HPP_INLINE void PipelineCache::merge( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::PipelineCache> const & srcCaches ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkMergePipelineCaches && "Function <vkMergePipelineCaches> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkMergePipelineCaches( static_cast<VkDevice>( m_device ),
-                                                                                   static_cast<VkPipelineCache>( m_pipelineCache ),
-                                                                                   srcCaches.size(),
-                                                                                   reinterpret_cast<const VkPipelineCache *>( srcCaches.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PipelineCache::merge" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkMergePipelineCaches( static_cast<VkDevice>( m_device ),
+                                                                                           static_cast<VkPipelineCache>( m_pipelineCache ),
+                                                                                           srcCaches.size(),
+                                                                                           reinterpret_cast<const VkPipelineCache *>( srcCaches.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PipelineCache::merge" );
     }
 
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createComputePipelines( Optional<const PipelineCache> const &         pipelineCache,
-                                      ArrayProxy<ComputePipelineCreateInfo> const & createInfos,
-                                      Optional<const AllocationCallbacks>           allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+      Device::createGraphicsPipelines(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo> const &                   createInfos,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result =
-        static_cast<Result>( getDispatcher()->vkCreateComputePipelines( static_cast<VkDevice>( m_device ),
-                                                                        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                        createInfos.size(),
-                                                                        reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
-                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createComputePipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateGraphicsPipelines(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        createInfos.size(),
+        reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
       {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createGraphicsPipelines" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> pipelinesRAII;
+      pipelinesRAII.reserve( pipelines.size() );
+      for ( auto & pipeline : pipelines )
+      {
+        pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
+      }
+      return pipelinesRAII;
     }
 
-    // wrapper function for command vkCreateComputePipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateComputePipelines.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createComputePipeline( Optional<const PipelineCache> const & pipelineCache,
-                                     ComputePipelineCreateInfo const &     createInfo,
-                                     Optional<const AllocationCallbacks>   allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                        Device::createGraphicsPipeline(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo const &                                                     createInfo,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result = static_cast<Result>( getDispatcher()->vkCreateComputePipelines( static_cast<VkDevice>( m_device ),
-                                                                                      pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                                      1,
-                                                                                      reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
-                                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                      reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createComputePipeline", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateGraphicsPipelines(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        1,
+        reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createGraphicsPipeline" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator );
     }
 
-    // wrapper function for command vkCreatePipelineLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineLayout.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineLayout>::type
-                         Device::createPipelineLayout( PipelineLayoutCreateInfo const &    createInfo,
-                                    Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+      Device::createComputePipelines(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo> const &                    createInfos,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator ) const
+    {
+      std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateComputePipelines(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        createInfos.size(),
+        reinterpret_cast<const VkComputePipelineCreateInfo *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createComputePipelines" );
+#  endif
+      }
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> pipelinesRAII;
+      pipelinesRAII.reserve( pipelines.size() );
+      for ( auto & pipeline : pipelines )
+      {
+        pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
+      }
+      return pipelinesRAII;
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+      Device::createComputePipeline( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+                                     VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo const &                                                      createInfo,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::Pipeline pipeline;
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateComputePipelines(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        1,
+        reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createComputePipeline" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineLayout>::Type
+                        Device::createPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo const &                          createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::PipelineLayout pipelineLayout;
-      Result                               result = static_cast<Result>( getDispatcher()->vkCreatePipelineLayout( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createPipelineLayout" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, PipelineLayout( *this, *reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreatePipelineLayout(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkPipelineLayoutCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createPipelineLayout" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineLayout( *this, *reinterpret_cast<VkPipelineLayout *>( &pipelineLayout ), allocator );
     }
 
-    // wrapper function for command vkCreateSampler, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSampler.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Sampler>::type
-      Device::createSampler( SamplerCreateInfo const & createInfo, Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Sampler>::Type
+                        Device::createSampler( VULKAN_HPP_NAMESPACE::SamplerCreateInfo const &                                 createInfo,
+                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Sampler sampler;
-      Result                        result = static_cast<Result>( getDispatcher()->vkCreateSampler( static_cast<VkDevice>( m_device ),
-                                                                             reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkSampler *>( &sampler ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSampler" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Sampler( *this, *reinterpret_cast<VkSampler *>( &sampler ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSampler(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkSamplerCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSampler *>( &sampler ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSampler" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Sampler( *this, *reinterpret_cast<VkSampler *>( &sampler ), allocator );
     }
 
-    // wrapper function for command vkCreateDescriptorSetLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorSetLayout.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorSetLayout>::type
-                         Device::createDescriptorSetLayout( DescriptorSetLayoutCreateInfo const & createInfo,
-                                         Optional<const AllocationCallbacks>   allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSetLayout>::Type
+      Device::createDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo const &                     createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DescriptorSetLayout setLayout;
-      Result                                    result =
-        static_cast<Result>( getDispatcher()->vkCreateDescriptorSetLayout( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDescriptorSetLayout" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DescriptorSetLayout( *this, *reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result              result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDescriptorSetLayout(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createDescriptorSetLayout" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSetLayout( *this, *reinterpret_cast<VkDescriptorSetLayout *>( &setLayout ), allocator );
     }
 
-    // wrapper function for command vkCreateDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorPool.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorPool>::type
-                         Device::createDescriptorPool( DescriptorPoolCreateInfo const &    createInfo,
-                                    Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorPool>::Type
+                        Device::createDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo const &                          createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool;
-      Result                               result = static_cast<Result>( getDispatcher()->vkCreateDescriptorPool( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDescriptorPool" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DescriptorPool( *this, *reinterpret_cast<VkDescriptorPool *>( &descriptorPool ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDescriptorPool(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkDescriptorPoolCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDescriptorPool *>( &descriptorPool ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createDescriptorPool" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorPool( *this, *reinterpret_cast<VkDescriptorPool *>( &descriptorPool ), allocator );
     }
 
-    // wrapper function for command vkResetDescriptorPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetDescriptorPool.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type DescriptorPool::reset( DescriptorPoolResetFlags flags ) const
+    VULKAN_HPP_INLINE void DescriptorPool::reset( VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkResetDescriptorPool && "Function <vkResetDescriptorPool> requires <VK_VERSION_1_0>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkResetDescriptorPool(
-        static_cast<VkDevice>( m_device ), static_cast<VkDescriptorPool>( m_descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DescriptorPool::reset" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      getDispatcher()->vkResetDescriptorPool(
+        static_cast<VkDevice>( m_device ), static_cast<VkDescriptorPool>( m_descriptorPool ), static_cast<VkDescriptorPoolResetFlags>( flags ) );
     }
 
-    // wrapper function for command vkAllocateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAllocateDescriptorSets.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DescriptorSet>>::type
-                         Device::allocateDescriptorSets( DescriptorSetAllocateInfo const & allocateInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet>>::Type
+      Device::allocateDescriptorSets( VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo const & allocateInfo ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::DescriptorSet> descriptorSets( allocateInfo.descriptorSetCount );
-      Result result = static_cast<Result>( getDispatcher()->vkAllocateDescriptorSets( static_cast<VkDevice>( m_device ),
-                                                                                      reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ),
-                                                                                      reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::allocateDescriptorSets" );
-      std::vector<DescriptorSet> descriptorSetsRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkAllocateDescriptorSets( static_cast<VkDevice>( m_device ),
+                                                   reinterpret_cast<const VkDescriptorSetAllocateInfo *>( &allocateInfo ),
+                                                   reinterpret_cast<VkDescriptorSet *>( descriptorSets.data() ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
       {
-        descriptorSetsRAII.reserve( descriptorSets.size() );
-        for ( auto & descriptorSet : descriptorSets )
-        {
-          descriptorSetsRAII.emplace_back(
-            *this, *reinterpret_cast<VkDescriptorSet *>( &descriptorSet ), static_cast<VkDescriptorPool>( allocateInfo.descriptorPool ) );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::allocateDescriptorSets" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( descriptorSetsRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorSet> descriptorSetsRAII;
+      descriptorSetsRAII.reserve( descriptorSets.size() );
+      for ( auto & descriptorSet : descriptorSets )
+      {
+        descriptorSetsRAII.emplace_back(
+          *this, *reinterpret_cast<VkDescriptorSet *>( &descriptorSet ), static_cast<VkDescriptorPool>( allocateInfo.descriptorPool ) );
+      }
+      return descriptorSetsRAII;
     }
 
-    // wrapper function for command vkUpdateDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSets.html
-    VULKAN_HPP_INLINE void Device::updateDescriptorSets( ArrayProxy<const WriteDescriptorSet> const & descriptorWrites,
-                                                         ArrayProxy<const CopyDescriptorSet> const &  descriptorCopies ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Device::updateDescriptorSets(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CopyDescriptorSet> const &  descriptorCopies ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkUpdateDescriptorSets && "Function <vkUpdateDescriptorSets> requires <VK_VERSION_1_0>" );
 
@@ -16358,8 +13111,155 @@ namespace VULKAN_HPP_NAMESPACE
                                                reinterpret_cast<const VkCopyDescriptorSet *>( descriptorCopies.data() ) );
     }
 
-    // wrapper function for command vkCmdBindPipeline, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipeline.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindPipeline( PipelineBindPoint pipelineBindPoint, VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Framebuffer>::Type
+                        Device::createFramebuffer( VULKAN_HPP_NAMESPACE::FramebufferCreateInfo const &                             createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::Framebuffer framebuffer;
+      VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateFramebuffer(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createFramebuffer" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Framebuffer( *this, *reinterpret_cast<VkFramebuffer *>( &framebuffer ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                        Device::createRenderPass( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo const &                              createInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::RenderPass renderPass;
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRenderPass(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRenderPass" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Extent2D RenderPass::getRenderAreaGranularity() const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetRenderAreaGranularity && "Function <vkGetRenderAreaGranularity> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Extent2D granularity;
+      getDispatcher()->vkGetRenderAreaGranularity(
+        static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( m_renderPass ), reinterpret_cast<VkExtent2D *>( &granularity ) );
+
+      return granularity;
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandPool>::Type
+                        Device::createCommandPool( VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo const &                             createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::CommandPool commandPool;
+      VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateCommandPool(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkCommandPoolCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkCommandPool *>( &commandPool ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createCommandPool" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandPool( *this, *reinterpret_cast<VkCommandPool *>( &commandPool ), allocator );
+    }
+
+    VULKAN_HPP_INLINE void CommandPool::reset( VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkResetCommandPool && "Function <vkResetCommandPool> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkResetCommandPool(
+        static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( m_commandPool ), static_cast<VkCommandPoolResetFlags>( flags ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandPool::reset" );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer>>::Type
+      Device::allocateCommandBuffers( VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo const & allocateInfo ) const
+    {
+      std::vector<VULKAN_HPP_NAMESPACE::CommandBuffer> commandBuffers( allocateInfo.commandBufferCount );
+      VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkAllocateCommandBuffers( static_cast<VkDevice>( m_device ),
+                                                   reinterpret_cast<const VkCommandBufferAllocateInfo *>( &allocateInfo ),
+                                                   reinterpret_cast<VkCommandBuffer *>( commandBuffers.data() ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::allocateCommandBuffers" );
+#  endif
+      }
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CommandBuffer> commandBuffersRAII;
+      commandBuffersRAII.reserve( commandBuffers.size() );
+      for ( auto & commandBuffer : commandBuffers )
+      {
+        commandBuffersRAII.emplace_back(
+          *this, *reinterpret_cast<VkCommandBuffer *>( &commandBuffer ), static_cast<VkCommandPool>( allocateInfo.commandPool ) );
+      }
+      return commandBuffersRAII;
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo & beginInfo ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkBeginCommandBuffer && "Function <vkBeginCommandBuffer> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBeginCommandBuffer(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCommandBufferBeginInfo *>( &beginInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::begin" );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::end() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkEndCommandBuffer && "Function <vkEndCommandBuffer> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEndCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::end" );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::reset( VULKAN_HPP_NAMESPACE::CommandBufferResetFlags flags ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkResetCommandBuffer && "Function <vkResetCommandBuffer> requires <VK_VERSION_1_0>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkResetCommandBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCommandBufferResetFlags>( flags ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::reset" );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::bindPipeline( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                        VULKAN_HPP_NAMESPACE::Pipeline          pipeline ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindPipeline && "Function <vkCmdBindPipeline> requires <VK_VERSION_1_0>" );
 
@@ -16367,12 +13267,83 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
     }
 
-    // wrapper function for command vkCmdBindDescriptorSets, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets( PipelineBindPoint                                             pipelineBindPoint,
-                                                              VULKAN_HPP_NAMESPACE::PipelineLayout                          layout,
-                                                              uint32_t                                                      firstSet,
-                                                              ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
-                                                              ArrayProxy<const uint32_t> const & dynamicOffsets ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setViewport( uint32_t                                                                       firstViewport,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewport && "Function <vkCmdSetViewport> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetViewport(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setScissor( uint32_t                                                                     firstScissor,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetScissor && "Function <vkCmdSetScissor> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetScissor(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), firstScissor, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setLineWidth( float lineWidth ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineWidth && "Function <vkCmdSetLineWidth> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetLineWidth( static_cast<VkCommandBuffer>( m_commandBuffer ), lineWidth );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setDepthBias( float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBias && "Function <vkCmdSetDepthBias> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetDepthBias( static_cast<VkCommandBuffer>( m_commandBuffer ), depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setBlendConstants( const float blendConstants[4] ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetBlendConstants && "Function <vkCmdSetBlendConstants> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetBlendConstants( static_cast<VkCommandBuffer>( m_commandBuffer ), blendConstants );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBounds( float minDepthBounds, float maxDepthBounds ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBounds && "Function <vkCmdSetDepthBounds> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetDepthBounds( static_cast<VkCommandBuffer>( m_commandBuffer ), minDepthBounds, maxDepthBounds );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilCompareMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                                                 uint32_t                               compareMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilCompareMask && "Function <vkCmdSetStencilCompareMask> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetStencilCompareMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), compareMask );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilWriteMask( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilWriteMask && "Function <vkCmdSetStencilWriteMask> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetStencilWriteMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), writeMask );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilReference( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilReference && "Function <vkCmdSetStencilReference> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetStencilReference( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), reference );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::bindDescriptorSets( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                             pipelineBindPoint,
+                                         VULKAN_HPP_NAMESPACE::PipelineLayout                                                layout,
+                                         uint32_t                                                                            firstSet,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const & dynamicOffsets ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorSets && "Function <vkCmdBindDescriptorSets> requires <VK_VERSION_1_0>" );
 
@@ -16386,261 +13357,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                 dynamicOffsets.data() );
     }
 
-    // wrapper function for command vkCmdClearColorImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearColorImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::clearColorImage( VULKAN_HPP_NAMESPACE::Image                     image,
-                                                           ImageLayout                                     imageLayout,
-                                                           const ClearColorValue &                         color,
-                                                           ArrayProxy<const ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdClearColorImage && "Function <vkCmdClearColorImage> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdClearColorImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                             static_cast<VkImage>( image ),
-                                             static_cast<VkImageLayout>( imageLayout ),
-                                             reinterpret_cast<const VkClearColorValue *>( &color ),
-                                             ranges.size(),
-                                             reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
-    }
-
-    // wrapper function for command vkCmdDispatch, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatch.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatch && "Function <vkCmdDispatch> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdDispatch( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
-    }
-
-    // wrapper function for command vkCmdDispatchIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchIndirect.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchIndirect && "Function <vkCmdDispatchIndirect> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdDispatchIndirect(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
-    }
-
-    // wrapper function for command vkCmdSetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent.html
-    VULKAN_HPP_INLINE void CommandBuffer::setEvent( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetEvent && "Function <vkCmdSetEvent> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetEvent(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
-    }
-
-    // wrapper function for command vkCmdResetEvent, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent.html
-    VULKAN_HPP_INLINE void CommandBuffer::resetEvent( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetEvent && "Function <vkCmdResetEvent> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdResetEvent(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
-    }
-
-    // wrapper function for command vkCmdWaitEvents, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents.html
-    VULKAN_HPP_INLINE void CommandBuffer::waitEvents( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
-                                                      PipelineStageFlags                                    srcStageMask,
-                                                      PipelineStageFlags                                    dstStageMask,
-                                                      ArrayProxy<const MemoryBarrier> const &               memoryBarriers,
-                                                      ArrayProxy<const BufferMemoryBarrier> const &         bufferMemoryBarriers,
-                                                      ArrayProxy<const ImageMemoryBarrier> const &          imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents && "Function <vkCmdWaitEvents> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdWaitEvents( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                        events.size(),
-                                        reinterpret_cast<const VkEvent *>( events.data() ),
-                                        static_cast<VkPipelineStageFlags>( srcStageMask ),
-                                        static_cast<VkPipelineStageFlags>( dstStageMask ),
-                                        memoryBarriers.size(),
-                                        reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
-                                        bufferMemoryBarriers.size(),
-                                        reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
-                                        imageMemoryBarriers.size(),
-                                        reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
-    }
-
-    // wrapper function for command vkCmdPushConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants.html
-    template <typename ValuesType>
-    VULKAN_HPP_INLINE void CommandBuffer::pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                                                         ShaderStageFlags                     stageFlags,
-                                                         uint32_t                             offset,
-                                                         ArrayProxy<const ValuesType> const & values ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushConstants && "Function <vkCmdPushConstants> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdPushConstants( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                           static_cast<VkPipelineLayout>( layout ),
-                                           static_cast<VkShaderStageFlags>( stageFlags ),
-                                           offset,
-                                           values.size() * sizeof( ValuesType ),
-                                           reinterpret_cast<const void *>( values.data() ) );
-    }
-
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createGraphicsPipelines( Optional<const PipelineCache> const &          pipelineCache,
-                                       ArrayProxy<GraphicsPipelineCreateInfo> const & createInfos,
-                                       Optional<const AllocationCallbacks>            allocator ) const
-    {
-      std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result =
-        static_cast<Result>( getDispatcher()->vkCreateGraphicsPipelines( static_cast<VkDevice>( m_device ),
-                                                                         pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                         createInfos.size(),
-                                                                         reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( createInfos.data() ),
-                                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                         reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createGraphicsPipelines", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
-      {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
-    }
-
-    // wrapper function for command vkCreateGraphicsPipelines, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateGraphicsPipelines.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createGraphicsPipeline( Optional<const PipelineCache> const & pipelineCache,
-                                      GraphicsPipelineCreateInfo const &    createInfo,
-                                      Optional<const AllocationCallbacks>   allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result = static_cast<Result>( getDispatcher()->vkCreateGraphicsPipelines( static_cast<VkDevice>( m_device ),
-                                                                                       pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                                       1,
-                                                                                       reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( &createInfo ),
-                                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                       reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createGraphicsPipeline", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
-    }
-
-    // wrapper function for command vkCreateFramebuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateFramebuffer.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Framebuffer>::type
-                         Device::createFramebuffer( FramebufferCreateInfo const &       createInfo,
-                                 Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::Framebuffer framebuffer;
-      Result                            result = static_cast<Result>( getDispatcher()->vkCreateFramebuffer( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkFramebufferCreateInfo *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkFramebuffer *>( &framebuffer ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createFramebuffer" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Framebuffer( *this, *reinterpret_cast<VkFramebuffer *>( &framebuffer ), allocator ) );
-    }
-
-    // wrapper function for command vkCreateRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-                         Device::createRenderPass( RenderPassCreateInfo const &        createInfo,
-                                Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::RenderPass renderPass;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateRenderPass( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkRenderPassCreateInfo *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRenderPass" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator ) );
-    }
-
-    // wrapper function for command vkGetRenderAreaGranularity, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderAreaGranularity.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D RenderPass::getRenderAreaGranularity() const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetRenderAreaGranularity && "Function <vkGetRenderAreaGranularity> requires <VK_VERSION_1_0>" );
-
-      Extent2D granularity;
-      getDispatcher()->vkGetRenderAreaGranularity(
-        static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( m_renderPass ), reinterpret_cast<VkExtent2D *>( &granularity ) );
-
-      return granularity;
-    }
-
-    // wrapper function for command vkCmdSetViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewport.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewport( uint32_t firstViewport, ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewport && "Function <vkCmdSetViewport> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetViewport(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), firstViewport, viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
-    }
-
-    // wrapper function for command vkCmdSetScissor, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissor.html
-    VULKAN_HPP_INLINE void CommandBuffer::setScissor( uint32_t firstScissor, ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetScissor && "Function <vkCmdSetScissor> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetScissor(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), firstScissor, scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
-    }
-
-    // wrapper function for command vkCmdSetLineWidth, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineWidth.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLineWidth( float lineWidth ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineWidth && "Function <vkCmdSetLineWidth> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetLineWidth( static_cast<VkCommandBuffer>( m_commandBuffer ), lineWidth );
-    }
-
-    // wrapper function for command vkCmdSetDepthBias, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setDepthBias( float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBias && "Function <vkCmdSetDepthBias> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetDepthBias( static_cast<VkCommandBuffer>( m_commandBuffer ), depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
-    }
-
-    // wrapper function for command vkCmdSetBlendConstants, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetBlendConstants.html
-    VULKAN_HPP_INLINE void CommandBuffer::setBlendConstants( const float blendConstants[4] ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetBlendConstants && "Function <vkCmdSetBlendConstants> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetBlendConstants( static_cast<VkCommandBuffer>( m_commandBuffer ), blendConstants );
-    }
-
-    // wrapper function for command vkCmdSetDepthBounds, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBounds.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBounds( float minDepthBounds, float maxDepthBounds ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBounds && "Function <vkCmdSetDepthBounds> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetDepthBounds( static_cast<VkCommandBuffer>( m_commandBuffer ), minDepthBounds, maxDepthBounds );
-    }
-
-    // wrapper function for command vkCmdSetStencilCompareMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilCompareMask.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilCompareMask( StencilFaceFlags faceMask, uint32_t compareMask ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilCompareMask && "Function <vkCmdSetStencilCompareMask> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetStencilCompareMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), compareMask );
-    }
-
-    // wrapper function for command vkCmdSetStencilWriteMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilWriteMask.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilWriteMask( StencilFaceFlags faceMask, uint32_t writeMask ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilWriteMask && "Function <vkCmdSetStencilWriteMask> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetStencilWriteMask( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), writeMask );
-    }
-
-    // wrapper function for command vkCmdSetStencilReference, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilReference.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilReference( StencilFaceFlags faceMask, uint32_t reference ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilReference && "Function <vkCmdSetStencilReference> requires <VK_VERSION_1_0>" );
-
-      getDispatcher()->vkCmdSetStencilReference( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkStencilFaceFlags>( faceMask ), reference );
-    }
-
-    // wrapper function for command vkCmdBindIndexBuffer, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, IndexType indexType ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                           VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                           VULKAN_HPP_NAMESPACE::IndexType  indexType ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindIndexBuffer && "Function <vkCmdBindIndexBuffer> requires <VK_VERSION_1_0>" );
 
@@ -16650,10 +13369,9 @@ namespace VULKAN_HPP_NAMESPACE
                                              static_cast<VkIndexType>( indexType ) );
     }
 
-    // wrapper function for command vkCmdBindVertexBuffers, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t                                               firstBinding,
-                                                             ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                                             ArrayProxy<const DeviceSize> const &                   offsets ) const
+    VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers( uint32_t                                                                         firstBinding,
+                                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                             VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindVertexBuffers && "Function <vkCmdBindVertexBuffers> requires <VK_VERSION_1_0>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -16672,7 +13390,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                reinterpret_cast<const VkDeviceSize *>( offsets.data() ) );
     }
 
-    // wrapper function for command vkCmdDraw, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDraw.html
     VULKAN_HPP_INLINE void
       CommandBuffer::draw( uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT
     {
@@ -16681,7 +13398,6 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDraw( static_cast<VkCommandBuffer>( m_commandBuffer ), vertexCount, instanceCount, firstVertex, firstInstance );
     }
 
-    // wrapper function for command vkCmdDrawIndexed, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexed.html
     VULKAN_HPP_INLINE void CommandBuffer::drawIndexed(
       uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT
     {
@@ -16690,9 +13406,10 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDrawIndexed( static_cast<VkCommandBuffer>( m_commandBuffer ), indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
     }
 
-    // wrapper function for command vkCmdDrawIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirect.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::drawIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, uint32_t drawCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                        uint32_t                         drawCount,
+                                                        uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndirect && "Function <vkCmdDrawIndirect> requires <VK_VERSION_1_0>" );
 
@@ -16700,11 +13417,10 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
     }
 
-    // wrapper function for command vkCmdDrawIndexedIndirect, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirect.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                               DeviceSize                   offset,
-                                                               uint32_t                     drawCount,
-                                                               uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                               VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                               uint32_t                         drawCount,
+                                                               uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndexedIndirect && "Function <vkCmdDrawIndexedIndirect> requires <VK_VERSION_1_0>" );
 
@@ -16712,13 +13428,60 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
     }
 
-    // wrapper function for command vkCmdBlitImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::blitImage( VULKAN_HPP_NAMESPACE::Image         srcImage,
-                                                     ImageLayout                         srcImageLayout,
-                                                     VULKAN_HPP_NAMESPACE::Image         dstImage,
-                                                     ImageLayout                         dstImageLayout,
-                                                     ArrayProxy<const ImageBlit> const & regions,
-                                                     Filter                              filter ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::dispatch( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatch && "Function <vkCmdDispatch> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdDispatch( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::dispatchIndirect( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                            VULKAN_HPP_NAMESPACE::DeviceSize offset ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchIndirect && "Function <vkCmdDispatchIndirect> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdDispatchIndirect(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ) );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyBuffer( VULKAN_HPP_NAMESPACE::Buffer                                                     srcBuffer,
+                                 VULKAN_HPP_NAMESPACE::Buffer                                                     dstBuffer,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBuffer && "Function <vkCmdCopyBuffer> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdCopyBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                        static_cast<VkBuffer>( srcBuffer ),
+                                        static_cast<VkBuffer>( dstBuffer ),
+                                        regions.size(),
+                                        reinterpret_cast<const VkBufferCopy *>( regions.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                                VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                                VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                                VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImage && "Function <vkCmdCopyImage> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdCopyImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                       static_cast<VkImage>( srcImage ),
+                                       static_cast<VkImageLayout>( srcImageLayout ),
+                                       static_cast<VkImage>( dstImage ),
+                                       static_cast<VkImageLayout>( dstImageLayout ),
+                                       regions.size(),
+                                       reinterpret_cast<const VkImageCopy *>( regions.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::blitImage( VULKAN_HPP_NAMESPACE::Image                                                     srcImage,
+                                                     VULKAN_HPP_NAMESPACE::ImageLayout                                               srcImageLayout,
+                                                     VULKAN_HPP_NAMESPACE::Image                                                     dstImage,
+                                                     VULKAN_HPP_NAMESPACE::ImageLayout                                               dstImageLayout,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageBlit> const & regions,
+                                                     VULKAN_HPP_NAMESPACE::Filter filter ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBlitImage && "Function <vkCmdBlitImage> requires <VK_VERSION_1_0>" );
 
@@ -16732,11 +13495,87 @@ namespace VULKAN_HPP_NAMESPACE
                                        static_cast<VkFilter>( filter ) );
     }
 
-    // wrapper function for command vkCmdClearDepthStencilImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearDepthStencilImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage( VULKAN_HPP_NAMESPACE::Image                     image,
-                                                                  ImageLayout                                     imageLayout,
-                                                                  const ClearDepthStencilValue &                  depthStencil,
-                                                                  ArrayProxy<const ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage(
+      VULKAN_HPP_NAMESPACE::Buffer                                                          srcBuffer,
+      VULKAN_HPP_NAMESPACE::Image                                                           dstImage,
+      VULKAN_HPP_NAMESPACE::ImageLayout                                                     dstImageLayout,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBufferToImage && "Function <vkCmdCopyBufferToImage> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdCopyBufferToImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                               static_cast<VkBuffer>( srcBuffer ),
+                                               static_cast<VkImage>( dstImage ),
+                                               static_cast<VkImageLayout>( dstImageLayout ),
+                                               regions.size(),
+                                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer(
+      VULKAN_HPP_NAMESPACE::Image                                                           srcImage,
+      VULKAN_HPP_NAMESPACE::ImageLayout                                                     srcImageLayout,
+      VULKAN_HPP_NAMESPACE::Buffer                                                          dstBuffer,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferImageCopy> const & regions ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImageToBuffer && "Function <vkCmdCopyImageToBuffer> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdCopyImageToBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                               static_cast<VkImage>( srcImage ),
+                                               static_cast<VkImageLayout>( srcImageLayout ),
+                                               static_cast<VkBuffer>( dstBuffer ),
+                                               regions.size(),
+                                               reinterpret_cast<const VkBufferImageCopy *>( regions.data() ) );
+    }
+
+    template <typename DataType>
+    VULKAN_HPP_INLINE void CommandBuffer::updateBuffer( VULKAN_HPP_NAMESPACE::Buffer                             dstBuffer,
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize                         dstOffset,
+                                                        VULKAN_HPP_NAMESPACE::ArrayProxy<const DataType> const & data ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdUpdateBuffer && "Function <vkCmdUpdateBuffer> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdUpdateBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                          static_cast<VkBuffer>( dstBuffer ),
+                                          static_cast<VkDeviceSize>( dstOffset ),
+                                          data.size() * sizeof( DataType ),
+                                          reinterpret_cast<const void *>( data.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::fillBuffer( VULKAN_HPP_NAMESPACE::Buffer     dstBuffer,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize dstOffset,
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize size,
+                                                      uint32_t                         data ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdFillBuffer && "Function <vkCmdFillBuffer> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdFillBuffer( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                        static_cast<VkBuffer>( dstBuffer ),
+                                        static_cast<VkDeviceSize>( dstOffset ),
+                                        static_cast<VkDeviceSize>( size ),
+                                        data );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::clearColorImage(
+      VULKAN_HPP_NAMESPACE::Image                                                                 image,
+      VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+      const VULKAN_HPP_NAMESPACE::ClearColorValue &                                               color,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdClearColorImage && "Function <vkCmdClearColorImage> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdClearColorImage( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                             static_cast<VkImage>( image ),
+                                             static_cast<VkImageLayout>( imageLayout ),
+                                             reinterpret_cast<const VkClearColorValue *>( &color ),
+                                             ranges.size(),
+                                             reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::clearDepthStencilImage(
+      VULKAN_HPP_NAMESPACE::Image                                                                 image,
+      VULKAN_HPP_NAMESPACE::ImageLayout                                                           imageLayout,
+      const VULKAN_HPP_NAMESPACE::ClearDepthStencilValue &                                        depthStencil,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceRange> const & ranges ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdClearDepthStencilImage && "Function <vkCmdClearDepthStencilImage> requires <VK_VERSION_1_0>" );
 
@@ -16748,9 +13587,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                     reinterpret_cast<const VkImageSubresourceRange *>( ranges.data() ) );
     }
 
-    // wrapper function for command vkCmdClearAttachments, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdClearAttachments.html
-    VULKAN_HPP_INLINE void CommandBuffer::clearAttachments( ArrayProxy<const ClearAttachment> const & attachments,
-                                                            ArrayProxy<const ClearRect> const &       rects ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::clearAttachments( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearAttachment> const & attachments,
+                                       VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ClearRect> const &       rects ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdClearAttachments && "Function <vkCmdClearAttachments> requires <VK_VERSION_1_0>" );
 
@@ -16761,12 +13600,12 @@ namespace VULKAN_HPP_NAMESPACE
                                               reinterpret_cast<const VkClearRect *>( rects.data() ) );
     }
 
-    // wrapper function for command vkCmdResolveImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage.html
-    VULKAN_HPP_INLINE void CommandBuffer::resolveImage( VULKAN_HPP_NAMESPACE::Image            srcImage,
-                                                        ImageLayout                            srcImageLayout,
-                                                        VULKAN_HPP_NAMESPACE::Image            dstImage,
-                                                        ImageLayout                            dstImageLayout,
-                                                        ArrayProxy<const ImageResolve> const & regions ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::resolveImage( VULKAN_HPP_NAMESPACE::Image                                                        srcImage,
+                                   VULKAN_HPP_NAMESPACE::ImageLayout                                                  srcImageLayout,
+                                   VULKAN_HPP_NAMESPACE::Image                                                        dstImage,
+                                   VULKAN_HPP_NAMESPACE::ImageLayout                                                  dstImageLayout,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageResolve> const & regions ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResolveImage && "Function <vkCmdResolveImage> requires <VK_VERSION_1_0>" );
 
@@ -16779,8 +13618,142 @@ namespace VULKAN_HPP_NAMESPACE
                                           reinterpret_cast<const VkImageResolve *>( regions.data() ) );
     }
 
-    // wrapper function for command vkCmdBeginRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass( const RenderPassBeginInfo & renderPassBegin, SubpassContents contents ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                                                    VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetEvent && "Function <vkCmdSetEvent> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdSetEvent(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::resetEvent( VULKAN_HPP_NAMESPACE::Event              event,
+                                                      VULKAN_HPP_NAMESPACE::PipelineStageFlags stageMask ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetEvent && "Function <vkCmdResetEvent> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdResetEvent(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags>( stageMask ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::waitEvents(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &               events,
+      VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+      VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents && "Function <vkCmdWaitEvents> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdWaitEvents( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                        events.size(),
+                                        reinterpret_cast<const VkEvent *>( events.data() ),
+                                        static_cast<VkPipelineStageFlags>( srcStageMask ),
+                                        static_cast<VkPipelineStageFlags>( dstStageMask ),
+                                        memoryBarriers.size(),
+                                        reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
+                                        bufferMemoryBarriers.size(),
+                                        reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
+                                        imageMemoryBarriers.size(),
+                                        reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier(
+      VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  srcStageMask,
+      VULKAN_HPP_NAMESPACE::PipelineStageFlags                                                  dstStageMask,
+      VULKAN_HPP_NAMESPACE::DependencyFlags                                                     dependencyFlags,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MemoryBarrier> const &       memoryBarriers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier> const & bufferMemoryBarriers,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier> const &  imageMemoryBarriers ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPipelineBarrier && "Function <vkCmdPipelineBarrier> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdPipelineBarrier( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                             static_cast<VkPipelineStageFlags>( srcStageMask ),
+                                             static_cast<VkPipelineStageFlags>( dstStageMask ),
+                                             static_cast<VkDependencyFlags>( dependencyFlags ),
+                                             memoryBarriers.size(),
+                                             reinterpret_cast<const VkMemoryBarrier *>( memoryBarriers.data() ),
+                                             bufferMemoryBarriers.size(),
+                                             reinterpret_cast<const VkBufferMemoryBarrier *>( bufferMemoryBarriers.data() ),
+                                             imageMemoryBarriers.size(),
+                                             reinterpret_cast<const VkImageMemoryBarrier *>( imageMemoryBarriers.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::beginQuery( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                                                      uint32_t                                query,
+                                                      VULKAN_HPP_NAMESPACE::QueryControlFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginQuery && "Function <vkCmdBeginQuery> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdBeginQuery(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::endQuery( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndQuery && "Function <vkCmdEndQuery> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdEndQuery( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::resetQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetQueryPool && "Function <vkCmdResetQueryPool> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdResetQueryPool( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), firstQuery, queryCount );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                                                          VULKAN_HPP_NAMESPACE::QueryPool             queryPool,
+                                                          uint32_t                                    query ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteTimestamp && "Function <vkCmdWriteTimestamp> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdWriteTimestamp(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlagBits>( pipelineStage ), static_cast<VkQueryPool>( queryPool ), query );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::copyQueryPoolResults( VULKAN_HPP_NAMESPACE::QueryPool        queryPool,
+                                                                uint32_t                               firstQuery,
+                                                                uint32_t                               queryCount,
+                                                                VULKAN_HPP_NAMESPACE::Buffer           dstBuffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize       dstOffset,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize       stride,
+                                                                VULKAN_HPP_NAMESPACE::QueryResultFlags flags ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyQueryPoolResults && "Function <vkCmdCopyQueryPoolResults> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdCopyQueryPoolResults( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                                  static_cast<VkQueryPool>( queryPool ),
+                                                  firstQuery,
+                                                  queryCount,
+                                                  static_cast<VkBuffer>( dstBuffer ),
+                                                  static_cast<VkDeviceSize>( dstOffset ),
+                                                  static_cast<VkDeviceSize>( stride ),
+                                                  static_cast<VkQueryResultFlags>( flags ) );
+    }
+
+    template <typename ValuesType>
+    VULKAN_HPP_INLINE void CommandBuffer::pushConstants( VULKAN_HPP_NAMESPACE::PipelineLayout                       layout,
+                                                         VULKAN_HPP_NAMESPACE::ShaderStageFlags                     stageFlags,
+                                                         uint32_t                                                   offset,
+                                                         VULKAN_HPP_NAMESPACE::ArrayProxy<const ValuesType> const & values ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushConstants && "Function <vkCmdPushConstants> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdPushConstants( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                           static_cast<VkPipelineLayout>( layout ),
+                                           static_cast<VkShaderStageFlags>( stageFlags ),
+                                           offset,
+                                           values.size() * sizeof( ValuesType ),
+                                           reinterpret_cast<const void *>( values.data() ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                           VULKAN_HPP_NAMESPACE::SubpassContents             contents ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginRenderPass && "Function <vkCmdBeginRenderPass> requires <VK_VERSION_1_0>" );
 
@@ -16789,15 +13762,13 @@ namespace VULKAN_HPP_NAMESPACE
                                              static_cast<VkSubpassContents>( contents ) );
     }
 
-    // wrapper function for command vkCmdNextSubpass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass.html
-    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass( SubpassContents contents ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass( VULKAN_HPP_NAMESPACE::SubpassContents contents ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdNextSubpass && "Function <vkCmdNextSubpass> requires <VK_VERSION_1_0>" );
 
       getDispatcher()->vkCmdNextSubpass( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkSubpassContents>( contents ) );
     }
 
-    // wrapper function for command vkCmdEndRenderPass, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass.html
     VULKAN_HPP_INLINE void CommandBuffer::endRenderPass() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRenderPass && "Function <vkCmdEndRenderPass> requires <VK_VERSION_1_0>" );
@@ -16805,54 +13776,54 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdEndRenderPass( static_cast<VkCommandBuffer>( m_commandBuffer ) );
     }
 
+    VULKAN_HPP_INLINE void CommandBuffer::executeCommands(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdExecuteCommands && "Function <vkCmdExecuteCommands> requires <VK_VERSION_1_0>" );
+
+      getDispatcher()->vkCmdExecuteCommands(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), commandBuffers.size(), reinterpret_cast<const VkCommandBuffer *>( commandBuffers.data() ) );
+    }
+
     //=== VK_VERSION_1_1 ===
 
-    // wrapper function for command vkEnumerateInstanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumerateInstanceVersion.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint32_t>::type Context::enumerateInstanceVersion() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t Context::enumerateInstanceVersion() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumerateInstanceVersion && "Function <vkEnumerateInstanceVersion> requires <VK_VERSION_1_1>" );
 
-      uint32_t apiVersion;
-      Result   result = static_cast<Result>( getDispatcher()->vkEnumerateInstanceVersion( &apiVersion ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Context::enumerateInstanceVersion" );
+      uint32_t                     apiVersion;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumerateInstanceVersion( &apiVersion ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Context::enumerateInstanceVersion" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( apiVersion ) );
+      return apiVersion;
     }
 
-    // wrapper function for command vkBindBufferMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindBufferMemory2( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos ) const
+    VULKAN_HPP_INLINE void
+      Device::bindBufferMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindBufferMemory2 && "Function <vkBindBufferMemory2> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindBufferMemory2(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindBufferMemory2(
         static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindBufferMemory2" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2" );
     }
 
-    // wrapper function for command vkBindImageMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindImageMemory2( ArrayProxy<const BindImageMemoryInfo> const & bindInfos ) const
+    VULKAN_HPP_INLINE void Device::bindImageMemory2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindImageMemory2 && "Function <vkBindImageMemory2> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindImageMemory2(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindImageMemory2(
         static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindImageMemory2" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2" );
     }
 
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeatures, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeatures.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeatures( uint32_t heapIndex,
-                                                                                                      uint32_t localDeviceIndex,
-                                                                                                      uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+      Device::getGroupPeerMemoryFeatures( uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceGroupPeerMemoryFeatures &&
                          "Function <vkGetDeviceGroupPeerMemoryFeatures> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
 
-      PeerMemoryFeatureFlags peerMemoryFeatures;
+      VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags peerMemoryFeatures;
       getDispatcher()->vkGetDeviceGroupPeerMemoryFeatures( static_cast<VkDevice>( m_device ),
                                                            heapIndex,
                                                            localDeviceIndex,
@@ -16862,7 +13833,6 @@ namespace VULKAN_HPP_NAMESPACE
       return peerMemoryFeatures;
     }
 
-    // wrapper function for command vkCmdSetDeviceMask, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMask.html
     VULKAN_HPP_INLINE void CommandBuffer::setDeviceMask( uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDeviceMask && "Function <vkCmdSetDeviceMask> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
@@ -16870,48 +13840,56 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDeviceMask( static_cast<VkCommandBuffer>( m_commandBuffer ), deviceMask );
     }
 
-    // wrapper function for command vkEnumeratePhysicalDeviceGroups, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroups.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties>>::type
-                         Instance::enumeratePhysicalDeviceGroups() const
+    VULKAN_HPP_INLINE void CommandBuffer::dispatchBase( uint32_t baseGroupX,
+                                                        uint32_t baseGroupY,
+                                                        uint32_t baseGroupZ,
+                                                        uint32_t groupCountX,
+                                                        uint32_t groupCountY,
+                                                        uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchBase && "Function <vkCmdDispatchBase> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
+
+      getDispatcher()->vkCmdDispatchBase(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> Instance::enumeratePhysicalDeviceGroups() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceGroups &&
                          "Function <vkEnumeratePhysicalDeviceGroups> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
 
-      std::vector<PhysicalDeviceGroupProperties> physicalDeviceGroupProperties;
-      uint32_t                                   physicalDeviceGroupCount;
-      Result                                     result;
+      std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> physicalDeviceGroupProperties;
+      uint32_t                                                         physicalDeviceGroupCount;
+      VULKAN_HPP_NAMESPACE::Result                                     result;
       do
       {
-        result =
-          static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceGroups( static_cast<VkInstance>( m_instance ), &physicalDeviceGroupCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkEnumeratePhysicalDeviceGroups( static_cast<VkInstance>( m_instance ), &physicalDeviceGroupCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
         {
           physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkEnumeratePhysicalDeviceGroups( static_cast<VkInstance>( m_instance ),
                                                               &physicalDeviceGroupCount,
                                                               reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroups" );
       VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
       if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
       {
         physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+      return physicalDeviceGroupProperties;
     }
 
-    // wrapper function for command vkGetImageMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageMemoryRequirements2 &&
                          "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetImageMemoryRequirements2( static_cast<VkDevice>( m_device ),
                                                       reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ),
                                                       reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -16919,17 +13897,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetImageMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageMemoryRequirements2( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getImageMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageMemoryRequirements2 &&
                          "Function <vkGetImageMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetImageMemoryRequirements2( static_cast<VkDevice>( m_device ),
                                                       reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ),
                                                       reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -16937,15 +13913,13 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetBufferMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferMemoryRequirements2 &&
                          "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetBufferMemoryRequirements2( static_cast<VkDevice>( m_device ),
                                                        reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ),
                                                        reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -16953,17 +13927,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetBufferMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getBufferMemoryRequirements2( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getBufferMemoryRequirements2( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferMemoryRequirements2 &&
                          "Function <vkGetBufferMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetBufferMemoryRequirements2( static_cast<VkDevice>( m_device ),
                                                        reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ),
                                                        reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -16971,16 +13943,14 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetImageSparseMemoryRequirements2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2>
-                                           Device::getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+      Device::getImageSparseMemoryRequirements2( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageSparseMemoryRequirements2 &&
                          "Function <vkGetImageSparseMemoryRequirements2> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      std::vector<SparseImageMemoryRequirements2> sparseMemoryRequirements;
-      uint32_t                                    sparseMemoryRequirementCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2> sparseMemoryRequirements;
+      uint32_t                                                          sparseMemoryRequirementCount;
       getDispatcher()->vkGetImageSparseMemoryRequirements2(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
       sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -16997,156 +13967,127 @@ namespace VULKAN_HPP_NAMESPACE
       return sparseMemoryRequirements;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFeatures2 &&
                          "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceFeatures2 features;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 features;
       getDispatcher()->vkGetPhysicalDeviceFeatures2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                      reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
       return features;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFeatures2 &&
                          "Function <vkGetPhysicalDeviceFeatures2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      PhysicalDeviceFeatures2 &  features = structureChain.template get<PhysicalDeviceFeatures2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 &  features = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2>();
       getDispatcher()->vkGetPhysicalDeviceFeatures2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                      reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties2 PhysicalDevice::getProperties2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 PhysicalDevice::getProperties2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceProperties2 &&
                          "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceProperties2 properties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 properties;
       getDispatcher()->vkGetPhysicalDeviceProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                        reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
       return properties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getProperties2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getProperties2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceProperties2 &&
                          "Function <vkGetPhysicalDeviceProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>  structureChain;
-      PhysicalDeviceProperties2 & properties = structureChain.template get<PhysicalDeviceProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>();
       getDispatcher()->vkGetPhysicalDeviceProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                        reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties2 PhysicalDevice::getFormatProperties2( Format format ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties2
+                                           PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFormatProperties2 &&
                          "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      FormatProperties2 formatProperties;
+      VULKAN_HPP_NAMESPACE::FormatProperties2 formatProperties;
       getDispatcher()->vkGetPhysicalDeviceFormatProperties2(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
       return formatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFormatProperties2( Format format ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                           PhysicalDevice::getFormatProperties2( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFormatProperties2 &&
                          "Function <vkGetPhysicalDeviceFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      FormatProperties2 &        formatProperties = structureChain.template get<FormatProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::FormatProperties2 &        formatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::FormatProperties2>();
       getDispatcher()->vkGetPhysicalDeviceFormatProperties2(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties2(
-      const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo, ImageFormatProperties2 * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2 &&
-                         "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                    reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( pImageFormatInfo ),
-                                                                    reinterpret_cast<VkImageFormatProperties2 *>( pImageFormatProperties ) ) );
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties2>::type
-                         PhysicalDevice::getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ImageFormatProperties2
+      PhysicalDevice::getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2 &&
                          "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      ImageFormatProperties2 imageFormatProperties;
-      Result                 result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::ImageFormatProperties2 imageFormatProperties;
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
                                                                     reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
+      return imageFormatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         PhysicalDevice::getImageFormatProperties2( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      PhysicalDevice::getImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2 &&
                          "Function <vkGetPhysicalDeviceImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      ImageFormatProperties2 &   imageFormatProperties = structureChain.template get<ImageFormatProperties2>();
-      Result                     result                = static_cast<Result>(
+      StructureChain<X, Y, Z...>                     structureChain;
+      VULKAN_HPP_NAMESPACE::ImageFormatProperties2 & imageFormatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>();
+      VULKAN_HPP_NAMESPACE::Result                   result                = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
                                                                     reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2> PhysicalDevice::getQueueFamilyProperties2() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> PhysicalDevice::getQueueFamilyProperties2() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2 &&
                          "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<QueueFamilyProperties2> queueFamilyProperties;
-      uint32_t                            queueFamilyPropertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+      uint32_t                                                  queueFamilyPropertyCount;
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ), &queueFamilyPropertyCount, nullptr );
       queueFamilyProperties.resize( queueFamilyPropertyCount );
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
@@ -17161,23 +14102,21 @@ namespace VULKAN_HPP_NAMESPACE
       return queueFamilyProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2.html
     template <typename StructureChain>
     VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain> PhysicalDevice::getQueueFamilyProperties2() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2 &&
                          "Function <vkGetPhysicalDeviceQueueFamilyProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<StructureChain>         structureChains;
-      std::vector<QueueFamilyProperties2> queueFamilyProperties;
-      uint32_t                            queueFamilyPropertyCount;
+      std::vector<StructureChain>                               structureChains;
+      std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+      uint32_t                                                  queueFamilyPropertyCount;
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ), &queueFamilyPropertyCount, nullptr );
       structureChains.resize( queueFamilyPropertyCount );
       queueFamilyProperties.resize( queueFamilyPropertyCount );
       for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
       {
-        queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
+        queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
       }
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                   &queueFamilyPropertyCount,
@@ -17190,51 +14129,47 @@ namespace VULKAN_HPP_NAMESPACE
       }
       for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
       {
-        structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
+        structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
       }
       return structureChains;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties2 PhysicalDevice::getMemoryProperties2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                                           PhysicalDevice::getMemoryProperties2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMemoryProperties2 &&
                          "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceMemoryProperties2 memoryProperties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 memoryProperties;
       getDispatcher()->vkGetPhysicalDeviceMemoryProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                              reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
       return memoryProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMemoryProperties2 &&
                          "Function <vkGetPhysicalDeviceMemoryProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>        structureChain;
-      PhysicalDeviceMemoryProperties2 & memoryProperties = structureChain.template get<PhysicalDeviceMemoryProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>        structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 & memoryProperties =
+        structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2>();
       getDispatcher()->vkGetPhysicalDeviceMemoryProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                              reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2>
-                                           PhysicalDevice::getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>
+      PhysicalDevice::getSparseImageFormatProperties2( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties2 &&
                          "Function <vkGetPhysicalDeviceSparseImageFormatProperties2> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<SparseImageFormatProperties2> properties;
-      uint32_t                                  propertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2> properties;
+      uint32_t                                                        propertyCount;
       getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties2( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                         reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
                                                                         &propertyCount,
@@ -17253,8 +14188,7 @@ namespace VULKAN_HPP_NAMESPACE
       return properties;
     }
 
-    // wrapper function for command vkTrimCommandPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPool.html
-    VULKAN_HPP_INLINE void CommandPool::trim( CommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandPool::trim( VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkTrimCommandPool && "Function <vkTrimCommandPool> requires <VK_KHR_maintenance1> or <VK_VERSION_1_1>" );
 
@@ -17262,98 +14196,67 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkDevice>( m_device ), static_cast<VkCommandPool>( m_commandPool ), static_cast<VkCommandPoolTrimFlags>( flags ) );
     }
 
-    // wrapper function for command vkGetDeviceQueue2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceQueue2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Queue Device::getQueue2( DeviceQueueInfo2 const & queueInfo ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue>::Type
+                        Device::getQueue2( VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 const & queueInfo ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Queue queue;
       getDispatcher()->vkGetDeviceQueue2(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceQueueInfo2 *>( &queueInfo ), reinterpret_cast<VkQueue *>( &queue ) );
 
-      return Queue( *this, *reinterpret_cast<VkQueue *>( &queue ) );
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Queue( *this, *reinterpret_cast<VkQueue *>( &queue ) );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalBufferProperties
-      PhysicalDevice::getExternalBufferProperties( const PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion>::Type
+      Device::createSamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const &                  createInfo,
+                                            VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalBufferProperties &&
-                         "Function <vkGetPhysicalDeviceExternalBufferProperties> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSamplerYcbcrConversion(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSamplerYcbcrConversion" );
+#  endif
+      }
 
-      ExternalBufferProperties externalBufferProperties;
-      getDispatcher()->vkGetPhysicalDeviceExternalBufferProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                    reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
-                                                                    reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
-
-      return externalBufferProperties;
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion(
+        *this, *reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceExternalFenceProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFenceProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalFenceProperties
-      PhysicalDevice::getExternalFenceProperties( const PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalFenceProperties &&
-                         "Function <vkGetPhysicalDeviceExternalFenceProperties> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
-
-      ExternalFenceProperties externalFenceProperties;
-      getDispatcher()->vkGetPhysicalDeviceExternalFenceProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                   reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
-                                                                   reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
-
-      return externalFenceProperties;
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphoreProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphoreProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalSemaphoreProperties
-      PhysicalDevice::getExternalSemaphoreProperties( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalSemaphoreProperties &&
-                         "Function <vkGetPhysicalDeviceExternalSemaphoreProperties> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
-
-      ExternalSemaphoreProperties externalSemaphoreProperties;
-      getDispatcher()->vkGetPhysicalDeviceExternalSemaphoreProperties(
-        static_cast<VkPhysicalDevice>( m_physicalDevice ),
-        reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
-        reinterpret_cast<VkExternalSemaphoreProperties *>( &externalSemaphoreProperties ) );
-
-      return externalSemaphoreProperties;
-    }
-
-    // wrapper function for command vkCmdDispatchBase, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBase.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatchBase( uint32_t baseGroupX,
-                                                        uint32_t baseGroupY,
-                                                        uint32_t baseGroupZ,
-                                                        uint32_t groupCountX,
-                                                        uint32_t groupCountY,
-                                                        uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchBase && "Function <vkCmdDispatchBase> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
-
-      getDispatcher()->vkCmdDispatchBase(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ );
-    }
-
-    // wrapper function for command vkCreateDescriptorUpdateTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplate.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorUpdateTemplate>::type
-                         Device::createDescriptorUpdateTemplate( DescriptorUpdateTemplateCreateInfo const & createInfo,
-                                              Optional<const AllocationCallbacks>        allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate>::Type
+      Device::createDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const &                createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
-      Result                                         result =
-        static_cast<Result>( getDispatcher()->vkCreateDescriptorUpdateTemplate( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplate" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DescriptorUpdateTemplate( *this, *reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDescriptorUpdateTemplate(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createDescriptorUpdateTemplate" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate(
+        *this, *reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ), allocator );
     }
 
-    // wrapper function for command vkUpdateDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplate.html
     template <typename DataType>
     VULKAN_HPP_INLINE void DescriptorSet::updateWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
                                                               DataType const &                               data ) const VULKAN_HPP_NOEXCEPT
@@ -17367,15 +14270,56 @@ namespace VULKAN_HPP_NAMESPACE
                                                           reinterpret_cast<const void *>( &data ) );
     }
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutSupport
-      Device::getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalBufferProperties
+      PhysicalDevice::getExternalBufferProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalBufferProperties &&
+                         "Function <vkGetPhysicalDeviceExternalBufferProperties> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
+
+      VULKAN_HPP_NAMESPACE::ExternalBufferProperties externalBufferProperties;
+      getDispatcher()->vkGetPhysicalDeviceExternalBufferProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                    reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
+                                                                    reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
+
+      return externalBufferProperties;
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+      PhysicalDevice::getExternalFenceProperties( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalFenceProperties &&
+                         "Function <vkGetPhysicalDeviceExternalFenceProperties> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
+
+      VULKAN_HPP_NAMESPACE::ExternalFenceProperties externalFenceProperties;
+      getDispatcher()->vkGetPhysicalDeviceExternalFenceProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                   reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
+                                                                   reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
+
+      return externalFenceProperties;
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties PhysicalDevice::getExternalSemaphoreProperties(
+      const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalSemaphoreProperties &&
+                         "Function <vkGetPhysicalDeviceExternalSemaphoreProperties> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
+
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties externalSemaphoreProperties;
+      getDispatcher()->vkGetPhysicalDeviceExternalSemaphoreProperties(
+        static_cast<VkPhysicalDevice>( m_physicalDevice ),
+        reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
+        reinterpret_cast<VkExternalSemaphoreProperties *>( &externalSemaphoreProperties ) );
+
+      return externalSemaphoreProperties;
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+      Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutSupport &&
                          "Function <vkGetDescriptorSetLayoutSupport> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 
-      DescriptorSetLayoutSupport support;
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport support;
       getDispatcher()->vkGetDescriptorSetLayoutSupport( static_cast<VkDevice>( m_device ),
                                                         reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
                                                         reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
@@ -17383,17 +14327,15 @@ namespace VULKAN_HPP_NAMESPACE
       return support;
     }
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupport, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupport.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getDescriptorSetLayoutSupport( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getDescriptorSetLayoutSupport( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutSupport &&
                          "Function <vkGetDescriptorSetLayoutSupport> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>   structureChain;
-      DescriptorSetLayoutSupport & support = structureChain.template get<DescriptorSetLayoutSupport>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>   structureChain;
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport & support = structureChain.template get<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>();
       getDispatcher()->vkGetDescriptorSetLayoutSupport( static_cast<VkDevice>( m_device ),
                                                         reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
                                                         reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
@@ -17401,117 +14343,14 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkCreateSamplerYcbcrConversion, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversion.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SamplerYcbcrConversion>::type
-                         Device::createSamplerYcbcrConversion( SamplerYcbcrConversionCreateInfo const & createInfo,
-                                            Optional<const AllocationCallbacks>      allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
-      Result                                       result =
-        static_cast<Result>( getDispatcher()->vkCreateSamplerYcbcrConversion( static_cast<VkDevice>( m_device ),
-                                                                              reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSamplerYcbcrConversion" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, SamplerYcbcrConversion( *this, *reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ), allocator ) );
-    }
-
     //=== VK_VERSION_1_2 ===
 
-    // wrapper function for command vkResetQueryPool, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPool.html
-    VULKAN_HPP_INLINE void QueryPool::reset( uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkResetQueryPool && "Function <vkResetQueryPool> requires <VK_EXT_host_query_reset> or <VK_VERSION_1_2>" );
-
-      getDispatcher()->vkResetQueryPool( static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( m_queryPool ), firstQuery, queryCount );
-    }
-
-    // wrapper function for command vkGetSemaphoreCounterValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValue.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Semaphore::getCounterValue() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreCounterValue &&
-                         "Function <vkGetSemaphoreCounterValue> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
-
-      uint64_t value;
-      Result   result = static_cast<Result>(
-        getDispatcher()->vkGetSemaphoreCounterValue( static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( m_semaphore ), &value ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Semaphore::getCounterValue" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
-    }
-
-    // wrapper function for command vkWaitSemaphores, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphores.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphores( const SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkWaitSemaphores && "Function <vkWaitSemaphores> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkWaitSemaphores( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::waitSemaphores", { Result::eSuccess, Result::eTimeout } );
-
-      return static_cast<Result>( result );
-    }
-
-    // wrapper function for command vkSignalSemaphore, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphore.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::signalSemaphore( const SemaphoreSignalInfo & signalInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkSignalSemaphore && "Function <vkSignalSemaphore> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkSignalSemaphore( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::signalSemaphore" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkGetBufferDeviceAddress, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddress.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddress( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferDeviceAddress &&
-                         "Function <vkGetBufferDeviceAddress> requires <VK_EXT_buffer_device_address> or <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
-
-      VkDeviceAddress result =
-        getDispatcher()->vkGetBufferDeviceAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
-
-      return static_cast<DeviceAddress>( result );
-    }
-
-    // wrapper function for command vkGetBufferOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddress.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddress( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferOpaqueCaptureAddress &&
-                         "Function <vkGetBufferOpaqueCaptureAddress> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
-
-      uint64_t result =
-        getDispatcher()->vkGetBufferOpaqueCaptureAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
-
-      return result;
-    }
-
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddress, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddress.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
-      Device::getMemoryOpaqueCaptureAddress( const DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceMemoryOpaqueCaptureAddress &&
-                         "Function <vkGetDeviceMemoryOpaqueCaptureAddress> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
-
-      uint64_t result = getDispatcher()->vkGetDeviceMemoryOpaqueCaptureAddress( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( &info ) );
-
-      return result;
-    }
-
-    // wrapper function for command vkCmdDrawIndirectCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCount.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                             DeviceSize                   offset,
-                                                             VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                             DeviceSize                   countBufferOffset,
-                                                             uint32_t                     maxDrawCount,
-                                                             uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                             VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                             VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                             VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                             uint32_t                         maxDrawCount,
+                                                             uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndirectCount &&
                          "Function <vkCmdDrawIndirectCount> requires <VK_AMD_draw_indirect_count> or <VK_KHR_draw_indirect_count> or <VK_VERSION_1_2>" );
@@ -17525,14 +14364,12 @@ namespace VULKAN_HPP_NAMESPACE
                                                stride );
     }
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCount, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCount.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                    DeviceSize                   offset,
-                                                                    VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                    DeviceSize                   countBufferOffset,
-                                                                    uint32_t                     maxDrawCount,
-                                                                    uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCount( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                    VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                    VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                    VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                    uint32_t                         maxDrawCount,
+                                                                    uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndexedIndirectCount &&
                          "Function <vkCmdDrawIndexedIndirectCount> requires <VK_AMD_draw_indirect_count> or <VK_KHR_draw_indirect_count> or <VK_VERSION_1_2>" );
@@ -17546,23 +14383,32 @@ namespace VULKAN_HPP_NAMESPACE
                                                       stride );
     }
 
-    // wrapper function for command vkCreateRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-                         Device::createRenderPass2( RenderPassCreateInfo2 const &       createInfo,
-                                 Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                        Device::createRenderPass2( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const &                             createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::RenderPass renderPass;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateRenderPass2( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRenderPass2" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRenderPass2(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRenderPass2" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator );
     }
 
-    // wrapper function for command vkCmdBeginRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const RenderPassBeginInfo & renderPassBegin,
-                                                            const SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                            const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginRenderPass2 &&
                          "Function <vkCmdBeginRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
@@ -17572,9 +14418,8 @@ namespace VULKAN_HPP_NAMESPACE
                                               reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
     }
 
-    // wrapper function for command vkCmdNextSubpass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2.html
-    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const SubpassBeginInfo & subpassBeginInfo,
-                                                        const SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                                                        const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdNextSubpass2 && "Function <vkCmdNextSubpass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 
@@ -17583,76 +14428,158 @@ namespace VULKAN_HPP_NAMESPACE
                                           reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
     }
 
-    // wrapper function for command vkCmdEndRenderPass2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2.html
-    VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRenderPass2 && "Function <vkCmdEndRenderPass2> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 
       getDispatcher()->vkCmdEndRenderPass2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
     }
 
+    VULKAN_HPP_INLINE void QueryPool::reset( uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkResetQueryPool && "Function <vkResetQueryPool> requires <VK_EXT_host_query_reset> or <VK_VERSION_1_2>" );
+
+      getDispatcher()->vkResetQueryPool( static_cast<VkDevice>( m_device ), static_cast<VkQueryPool>( m_queryPool ), firstQuery, queryCount );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Semaphore::getCounterValue() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreCounterValue &&
+                         "Function <vkGetSemaphoreCounterValue> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
+
+      uint64_t                     value;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetSemaphoreCounterValue( static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( m_semaphore ), &value ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Semaphore::getCounterValue" );
+
+      return value;
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::waitSemaphores( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
+                                                                                                uint64_t                                        timeout ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkWaitSemaphores && "Function <vkWaitSemaphores> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkWaitSemaphores( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck(
+        result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphores", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
+
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
+    }
+
+    VULKAN_HPP_INLINE void Device::signalSemaphore( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkSignalSemaphore && "Function <vkSignalSemaphore> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkSignalSemaphore( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphore" );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+                                           Device::getBufferAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferDeviceAddress &&
+                         "Function <vkGetBufferDeviceAddress> requires <VK_EXT_buffer_device_address> or <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
+
+      VkDeviceAddress result =
+        getDispatcher()->vkGetBufferDeviceAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
+
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
+      Device::getBufferOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferOpaqueCaptureAddress &&
+                         "Function <vkGetBufferOpaqueCaptureAddress> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
+
+      uint64_t result =
+        getDispatcher()->vkGetBufferOpaqueCaptureAddress( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
+
+      return result;
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
+      Device::getMemoryOpaqueCaptureAddress( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceMemoryOpaqueCaptureAddress &&
+                         "Function <vkGetDeviceMemoryOpaqueCaptureAddress> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
+
+      uint64_t result = getDispatcher()->vkGetDeviceMemoryOpaqueCaptureAddress( static_cast<VkDevice>( m_device ),
+                                                                                reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( &info ) );
+
+      return result;
+    }
+
     //=== VK_VERSION_1_3 ===
 
-    // wrapper function for command vkGetPhysicalDeviceToolProperties, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolProperties.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties>>::type PhysicalDevice::getToolProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> PhysicalDevice::getToolProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceToolProperties &&
                          "Function <vkGetPhysicalDeviceToolProperties> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 
-      std::vector<PhysicalDeviceToolProperties> toolProperties;
-      uint32_t                                  toolCount;
-      Result                                    result;
+      std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> toolProperties;
+      uint32_t                                                        toolCount;
+      VULKAN_HPP_NAMESPACE::Result                                    result;
       do
       {
-        result =
-          static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceToolProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ), &toolCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && toolCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkGetPhysicalDeviceToolProperties( static_cast<VkPhysicalDevice>( m_physicalDevice ), &toolCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
         {
           toolProperties.resize( toolCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceToolProperties(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceToolProperties(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolProperties" );
       VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
       if ( toolCount < toolProperties.size() )
       {
         toolProperties.resize( toolCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
+      return toolProperties;
     }
 
-    // wrapper function for command vkCreatePrivateDataSlot, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlot.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PrivateDataSlot>::type
-                         Device::createPrivateDataSlot( PrivateDataSlotCreateInfo const &   createInfo,
-                                     Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot>::Type
+      Device::createPrivateDataSlot( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const &                         createInfo,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
-      Result                                result = static_cast<Result>( getDispatcher()->vkCreatePrivateDataSlot( static_cast<VkDevice>( m_device ),
-                                                                                     reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                     reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createPrivateDataSlot" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, PrivateDataSlot( *this, *reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreatePrivateDataSlot(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createPrivateDataSlot" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot( *this, *reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ), allocator );
     }
 
-    // wrapper function for command vkSetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateData.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::setPrivateData( ObjectType objectType_, uint64_t objectHandle, VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot, uint64_t data ) const
+    VULKAN_HPP_INLINE void Device::setPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                   uint64_t                              objectHandle,
+                                                   VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                   uint64_t                              data ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetPrivateData && "Function <vkSetPrivateData> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkSetPrivateData(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkSetPrivateData(
         static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::setPrivateData" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateData" );
     }
 
-    // wrapper function for command vkGetPrivateData, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateData.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateData( ObjectType                            objectType_,
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateData( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
                                                                             uint64_t                              objectHandle,
                                                                             VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot ) const VULKAN_HPP_NOEXCEPT
     {
@@ -17665,169 +14592,8 @@ namespace VULKAN_HPP_NAMESPACE
       return data;
     }
 
-    // wrapper function for command vkCmdPipelineBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2.html
-    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPipelineBarrier2 && "Function <vkCmdPipelineBarrier2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdPipelineBarrier2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
-    }
-
-    // wrapper function for command vkCmdWriteTimestamp2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::writeTimestamp2( PipelineStageFlags2 stage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteTimestamp2 && "Function <vkCmdWriteTimestamp2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdWriteTimestamp2(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
-    }
-
-    // wrapper function for command vkQueueSubmit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit2( ArrayProxy<const SubmitInfo2> const & submits,
-                                                                           VULKAN_HPP_NAMESPACE::Fence           fence ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSubmit2 && "Function <vkQueueSubmit2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkQueueSubmit2(
-        static_cast<VkQueue>( m_queue ), submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::submit2" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCmdCopyBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBuffer2 && "Function <vkCmdCopyBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdCopyBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
-    }
-
-    // wrapper function for command vkCmdCopyImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImage2 && "Function <vkCmdCopyImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdCopyImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
-    }
-
-    // wrapper function for command vkCmdCopyBufferToImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2( const CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBufferToImage2 &&
-                         "Function <vkCmdCopyBufferToImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdCopyBufferToImage2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
-    }
-
-    // wrapper function for command vkCmdCopyImageToBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2( const CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImageToBuffer2 &&
-                         "Function <vkCmdCopyImageToBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
-
-      getDispatcher()->vkCmdCopyImageToBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
-    }
-
-    // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirements &&
-                         "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetDeviceBufferMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                            reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
-                                                            reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetDeviceBufferMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirements.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getBufferMemoryRequirements( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirements &&
-                         "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetDeviceBufferMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                            reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
-                                                            reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getImageMemoryRequirements( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirements &&
-                         "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetDeviceImageMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                           reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
-                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetDeviceImageMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirements.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageMemoryRequirements( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirements &&
-                         "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetDeviceImageMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                           reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
-                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirements, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirements.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2>
-                                           Device::getImageSparseMemoryRequirements( const DeviceImageMemoryRequirements & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSparseMemoryRequirements &&
-                         "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
-
-      std::vector<SparseImageMemoryRequirements2> sparseMemoryRequirements;
-      uint32_t                                    sparseMemoryRequirementCount;
-      getDispatcher()->vkGetDeviceImageSparseMemoryRequirements(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
-      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-      getDispatcher()->vkGetDeviceImageSparseMemoryRequirements( static_cast<VkDevice>( m_device ),
-                                                                 reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
-                                                                 &sparseMemoryRequirementCount,
-                                                                 reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
-
-      VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
-      if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
-      {
-        sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
-      }
-      return sparseMemoryRequirements;
-    }
-
-    // wrapper function for command vkCmdSetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2.html
-    VULKAN_HPP_INLINE void CommandBuffer::setEvent2( VULKAN_HPP_NAMESPACE::Event event, const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setEvent2( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                     const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetEvent2 && "Function <vkCmdSetEvent2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 
@@ -17835,8 +14601,8 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
     }
 
-    // wrapper function for command vkCmdResetEvent2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2.html
-    VULKAN_HPP_INLINE void CommandBuffer::resetEvent2( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::resetEvent2( VULKAN_HPP_NAMESPACE::Event               event,
+                                                       VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetEvent2 && "Function <vkCmdResetEvent2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 
@@ -17844,9 +14610,9 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
     }
 
-    // wrapper function for command vkCmdWaitEvents2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2.html
-    VULKAN_HPP_INLINE void CommandBuffer::waitEvents2( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
-                                                       ArrayProxy<const DependencyInfo> const &              dependencyInfos ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::waitEvents2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents2 && "Function <vkCmdWaitEvents2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -17864,16 +14630,75 @@ namespace VULKAN_HPP_NAMESPACE
                                          reinterpret_cast<const VkDependencyInfo *>( dependencyInfos.data() ) );
     }
 
-    // wrapper function for command vkCmdBlitImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2.html
-    VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPipelineBarrier2 && "Function <vkCmdPipelineBarrier2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdPipelineBarrier2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                           VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                                           uint32_t                                  query ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteTimestamp2 && "Function <vkCmdWriteTimestamp2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdWriteTimestamp2(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
+    }
+
+    VULKAN_HPP_INLINE void Queue::submit2( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+                                           VULKAN_HPP_NAMESPACE::Fence                                                       fence ) const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSubmit2 && "Function <vkQueueSubmit2> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
+
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueSubmit2(
+        static_cast<VkQueue>( m_queue ), submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2" );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBuffer2 && "Function <vkCmdCopyBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdCopyBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::copyImage2( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImage2 && "Function <vkCmdCopyImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdCopyImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyBufferToImage2( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBufferToImage2 &&
+                         "Function <vkCmdCopyBufferToImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdCopyBufferToImage2( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                                reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
+    }
+
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyImageToBuffer2( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImageToBuffer2 &&
+                         "Function <vkCmdCopyImageToBuffer2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
+
+      getDispatcher()->vkCmdCopyImageToBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                                reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
+    }
+
+    VULKAN_HPP_INLINE void CommandBuffer::blitImage2( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBlitImage2 && "Function <vkCmdBlitImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
       getDispatcher()->vkCmdBlitImage2( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkBlitImageInfo2 *>( &blitImageInfo ) );
     }
 
-    // wrapper function for command vkCmdResolveImage2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2.html
-    VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::resolveImage2( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResolveImage2 && "Function <vkCmdResolveImage2> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
@@ -17881,15 +14706,13 @@ namespace VULKAN_HPP_NAMESPACE
                                            reinterpret_cast<const VkResolveImageInfo2 *>( &resolveImageInfo ) );
     }
 
-    // wrapper function for command vkCmdBeginRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRendering.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginRendering( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginRendering && "Function <vkCmdBeginRendering> requires <VK_KHR_dynamic_rendering> or <VK_VERSION_1_3>" );
 
       getDispatcher()->vkCmdBeginRendering( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ) );
     }
 
-    // wrapper function for command vkCmdEndRendering, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering.html
     VULKAN_HPP_INLINE void CommandBuffer::endRendering() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRendering && "Function <vkCmdEndRendering> requires <VK_KHR_dynamic_rendering> or <VK_VERSION_1_3>" );
@@ -17897,8 +14720,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdEndRendering( static_cast<VkCommandBuffer>( m_commandBuffer ) );
     }
 
-    // wrapper function for command vkCmdSetCullMode, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullMode.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCullMode( CullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setCullMode( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCullMode &&
                          "Function <vkCmdSetCullMode> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17906,8 +14728,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetCullMode( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCullModeFlags>( cullMode ) );
     }
 
-    // wrapper function for command vkCmdSetFrontFace, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFace.html
-    VULKAN_HPP_INLINE void CommandBuffer::setFrontFace( FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setFrontFace( VULKAN_HPP_NAMESPACE::FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetFrontFace &&
                          "Function <vkCmdSetFrontFace> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17915,8 +14736,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetFrontFace( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkFrontFace>( frontFace ) );
     }
 
-    // wrapper function for command vkCmdSetPrimitiveTopology, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopology.html
-    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopology( PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopology( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPrimitiveTopology &&
                          "Function <vkCmdSetPrimitiveTopology> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17924,8 +14744,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetPrimitiveTopology( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPrimitiveTopology>( primitiveTopology ) );
     }
 
-    // wrapper function for command vkCmdSetViewportWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCount.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCount( ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setViewportWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportWithCount &&
                          "Function <vkCmdSetViewportWithCount> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17934,8 +14754,8 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
     }
 
-    // wrapper function for command vkCmdSetScissorWithCount, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCount.html
-    VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCount( ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setScissorWithCount( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetScissorWithCount &&
                          "Function <vkCmdSetScissorWithCount> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17944,12 +14764,11 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
     }
 
-    // wrapper function for command vkCmdBindVertexBuffers2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                                               firstBinding,
-                                                              ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                                              ArrayProxy<const DeviceSize> const &                   offsets,
-                                                              ArrayProxy<const DeviceSize> const &                   sizes,
-                                                              ArrayProxy<const DeviceSize> const &                   strides ) const
+    VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2( uint32_t                                                                         firstBinding,
+                                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
+                                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindVertexBuffers2 &&
                          "Function <vkCmdBindVertexBuffers2> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17981,8 +14800,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                 reinterpret_cast<const VkDeviceSize *>( strides.data() ) );
     }
 
-    // wrapper function for command vkCmdSetDepthTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnable( Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthTestEnable &&
                          "Function <vkCmdSetDepthTestEnable> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17990,8 +14808,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthWriteEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnable( Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthWriteEnable &&
                          "Function <vkCmdSetDepthWriteEnable> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -17999,8 +14816,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthWriteEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthWriteEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthCompareOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOp.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOp( CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOp( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthCompareOp &&
                          "Function <vkCmdSetDepthCompareOp> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18008,9 +14824,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthCompareOp( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCompareOp>( depthCompareOp ) );
     }
 
-    // wrapper function for command vkCmdSetDepthBoundsTestEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnable( Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBoundsTestEnable &&
                          "Function <vkCmdSetDepthBoundsTestEnable> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18018,8 +14832,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthBoundsTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBoundsTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetStencilTestEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnable( Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnable( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilTestEnable &&
                          "Function <vkCmdSetStencilTestEnable> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18027,9 +14840,11 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetStencilTestEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stencilTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetStencilOp, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOp.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilOp(
-      StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilOp( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                                        VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                                                        VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                                                        VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                                                        VULKAN_HPP_NAMESPACE::CompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilOp &&
                          "Function <vkCmdSetStencilOp> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18042,9 +14857,7 @@ namespace VULKAN_HPP_NAMESPACE
                                           static_cast<VkCompareOp>( compareOp ) );
     }
 
-    // wrapper function for command vkCmdSetRasterizerDiscardEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnable( Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnable( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRasterizerDiscardEnable &&
                          "Function <vkCmdSetRasterizerDiscardEnable> requires <VK_EXT_extended_dynamic_state2> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18052,8 +14865,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetRasterizerDiscardEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( rasterizerDiscardEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthBiasEnable, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnable( Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBiasEnable &&
                          "Function <vkCmdSetDepthBiasEnable> requires <VK_EXT_extended_dynamic_state2> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18061,9 +14873,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthBiasEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBiasEnable ) );
     }
 
-    // wrapper function for command vkCmdSetPrimitiveRestartEnable, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnable.html
-    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnable( Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnable( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPrimitiveRestartEnable &&
                          "Function <vkCmdSetPrimitiveRestartEnable> requires <VK_EXT_extended_dynamic_state2> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -18071,810 +14881,629 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetPrimitiveRestartEnable( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( primitiveRestartEnable ) );
     }
 
-    //=== VK_VERSION_1_4 ===
-
-    // wrapper function for command vkMapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type Device::mapMemory2( const MemoryMapInfo & memoryMapInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkMapMemory2 && "Function <vkMapMemory2> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirements &&
+                         "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      void * pData;
-      Result result = static_cast<Result>(
-        getDispatcher()->vkMapMemory2( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryMapInfo *>( &memoryMapInfo ), &pData ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::mapMemory2" );
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+      getDispatcher()->vkGetDeviceBufferMemoryRequirements( static_cast<VkDevice>( m_device ),
+                                                            reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
+                                                            reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pData ) );
+      return memoryRequirements;
     }
 
-    // wrapper function for command vkUnmapMemory2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::unmapMemory2( const MemoryUnmapInfo & memoryUnmapInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkUnmapMemory2 && "Function <vkUnmapMemory2> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkUnmapMemory2( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryUnmapInfo *>( &memoryUnmapInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::unmapMemory2" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2
-      Device::getImageSubresourceLayout( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSubresourceLayout &&
-                         "Function <vkGetDeviceImageSubresourceLayout> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-
-      SubresourceLayout2 layout;
-      getDispatcher()->vkGetDeviceImageSubresourceLayout( static_cast<VkDevice>( m_device ),
-                                                          reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ),
-                                                          reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
-
-      return layout;
-    }
-
-    // wrapper function for command vkGetDeviceImageSubresourceLayout, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayout.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageSubresourceLayout( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSubresourceLayout &&
-                         "Function <vkGetDeviceImageSubresourceLayout> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirements &&
+                         "Function <vkGetDeviceBufferMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
-      getDispatcher()->vkGetDeviceImageSubresourceLayout( static_cast<VkDevice>( m_device ),
-                                                          reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ),
-                                                          reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+      getDispatcher()->vkGetDeviceBufferMemoryRequirements( static_cast<VkDevice>( m_device ),
+                                                            reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
+                                                            reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Image::getSubresourceLayout2( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT(
-        getDispatcher()->vkGetImageSubresourceLayout2 &&
-        "Function <vkGetImageSubresourceLayout2> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirements &&
+                         "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      SubresourceLayout2 layout;
-      getDispatcher()->vkGetImageSubresourceLayout2( static_cast<VkDevice>( m_device ),
-                                                     static_cast<VkImage>( m_image ),
-                                                     reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                     reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
+      getDispatcher()->vkGetDeviceImageMemoryRequirements( static_cast<VkDevice>( m_device ),
+                                                           reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
+                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
-      return layout;
+      return memoryRequirements;
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Image::getSubresourceLayout2( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT(
-        getDispatcher()->vkGetImageSubresourceLayout2 &&
-        "Function <vkGetImageSubresourceLayout2> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirements &&
+                         "Function <vkGetDeviceImageMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
-      getDispatcher()->vkGetImageSubresourceLayout2( static_cast<VkDevice>( m_device ),
-                                                     static_cast<VkImage>( m_image ),
-                                                     reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                     reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
+      getDispatcher()->vkGetDeviceImageMemoryRequirements( static_cast<VkDevice>( m_device ),
+                                                           reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
+                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkCopyMemoryToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImage.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyMemoryToImage( const CopyMemoryToImageInfo & copyMemoryToImageInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                                           Device::getImageSparseMemoryRequirements( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToImage && "Function <vkCopyMemoryToImage> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSparseMemoryRequirements &&
+                         "Function <vkGetDeviceImageSparseMemoryRequirements> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyMemoryToImage(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyMemoryToImageInfo *>( &copyMemoryToImageInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMemoryToImage" );
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2> sparseMemoryRequirements;
+      uint32_t                                                          sparseMemoryRequirementCount;
+      getDispatcher()->vkGetDeviceImageSparseMemoryRequirements(
+        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
+      sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+      getDispatcher()->vkGetDeviceImageSparseMemoryRequirements( static_cast<VkDevice>( m_device ),
+                                                                 reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
+                                                                 &sparseMemoryRequirementCount,
+                                                                 reinterpret_cast<VkSparseImageMemoryRequirements2 *>( sparseMemoryRequirements.data() ) );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCopyImageToMemory, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemory.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyImageToMemory( const CopyImageToMemoryInfo & copyImageToMemoryInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToMemory && "Function <vkCopyImageToMemory> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkCopyImageToMemory(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToMemoryInfo *>( &copyImageToMemoryInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyImageToMemory" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCopyImageToImage, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImage.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyImageToImage( const CopyImageToImageInfo & copyImageToImageInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToImage && "Function <vkCopyImageToImage> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkCopyImageToImage( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToImageInfo *>( &copyImageToImageInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyImageToImage" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkTransitionImageLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayout.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::transitionImageLayout( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkTransitionImageLayout &&
-                         "Function <vkTransitionImageLayout> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkTransitionImageLayout(
-        static_cast<VkDevice>( m_device ), transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( transitions.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::transitionImageLayout" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCmdPushDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet( PipelineBindPoint                            pipelineBindPoint,
-                                                             VULKAN_HPP_NAMESPACE::PipelineLayout         layout,
-                                                             uint32_t                                     set,
-                                                             ArrayProxy<const WriteDescriptorSet> const & descriptorWrites ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSet && "Function <vkCmdPushDescriptorSet> requires <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdPushDescriptorSet( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
-                                               static_cast<VkPipelineLayout>( layout ),
-                                               set,
-                                               descriptorWrites.size(),
-                                               reinterpret_cast<const VkWriteDescriptorSet *>( descriptorWrites.data() ) );
-    }
-
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate.html
-    template <typename DataType>
-    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                         VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
-                                                                         uint32_t                                       set,
-                                                                         DataType const &                               data ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT(
-        getDispatcher()->vkCmdPushDescriptorSetWithTemplate &&
-        "Function <vkCmdPushDescriptorSetWithTemplate> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdPushDescriptorSetWithTemplate( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                           static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                                           static_cast<VkPipelineLayout>( layout ),
-                                                           set,
-                                                           reinterpret_cast<const void *>( &data ) );
-    }
-
-    // wrapper function for command vkCmdBindDescriptorSets2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2( const BindDescriptorSetsInfo & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorSets2 &&
-                         "Function <vkCmdBindDescriptorSets2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdBindDescriptorSets2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                 reinterpret_cast<const VkBindDescriptorSetsInfo *>( &bindDescriptorSetsInfo ) );
-    }
-
-    // wrapper function for command vkCmdPushConstants2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushConstants2( const PushConstantsInfo & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushConstants2 && "Function <vkCmdPushConstants2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdPushConstants2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                            reinterpret_cast<const VkPushConstantsInfo *>( &pushConstantsInfo ) );
-    }
-
-    // wrapper function for command vkCmdPushDescriptorSet2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2( const PushDescriptorSetInfo & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSet2 && "Function <vkCmdPushDescriptorSet2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdPushDescriptorSet2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                reinterpret_cast<const VkPushDescriptorSetInfo *>( &pushDescriptorSetInfo ) );
-    }
-
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::pushDescriptorSetWithTemplate2( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSetWithTemplate2 &&
-                         "Function <vkCmdPushDescriptorSetWithTemplate2> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdPushDescriptorSetWithTemplate2(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( &pushDescriptorSetWithTemplateInfo ) );
-    }
-
-    // wrapper function for command vkCmdSetLineStipple, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStipple.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLineStipple( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineStipple &&
-                         "Function <vkCmdSetLineStipple> requires <VK_EXT_line_rasterization> or <VK_KHR_line_rasterization> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdSetLineStipple( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
-    }
-
-    // wrapper function for command vkCmdBindIndexBuffer2, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::bindIndexBuffer2( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset, DeviceSize size, IndexType indexType ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindIndexBuffer2 && "Function <vkCmdBindIndexBuffer2> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdBindIndexBuffer2( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                              static_cast<VkBuffer>( buffer ),
-                                              static_cast<VkDeviceSize>( offset ),
-                                              static_cast<VkDeviceSize>( size ),
-                                              static_cast<VkIndexType>( indexType ) );
-    }
-
-    // wrapper function for command vkGetRenderingAreaGranularity, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularity.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D Device::getRenderingAreaGranularity( const RenderingAreaInfo & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetRenderingAreaGranularity &&
-                         "Function <vkGetRenderingAreaGranularity> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
-
-      Extent2D granularity;
-      getDispatcher()->vkGetRenderingAreaGranularity( static_cast<VkDevice>( m_device ),
-                                                      reinterpret_cast<const VkRenderingAreaInfo *>( &renderingAreaInfo ),
-                                                      reinterpret_cast<VkExtent2D *>( &granularity ) );
-
-      return granularity;
-    }
-
-    // wrapper function for command vkCmdSetRenderingAttachmentLocations, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocations.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocations( const RenderingAttachmentLocationInfo & locationInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRenderingAttachmentLocations &&
-                         "Function <vkCmdSetRenderingAttachmentLocations> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdSetRenderingAttachmentLocations( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                             reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( &locationInfo ) );
-    }
-
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndices, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndices.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setRenderingInputAttachmentIndices( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRenderingInputAttachmentIndices &&
-                         "Function <vkCmdSetRenderingInputAttachmentIndices> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
-
-      getDispatcher()->vkCmdSetRenderingInputAttachmentIndices( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( &inputAttachmentIndexInfo ) );
+      VULKAN_HPP_ASSERT( sparseMemoryRequirementCount <= sparseMemoryRequirements.size() );
+      if ( sparseMemoryRequirementCount < sparseMemoryRequirements.size() )
+      {
+        sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
+      }
+      return sparseMemoryRequirements;
     }
 
     //=== VK_KHR_surface ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Bool32>::type
-                         PhysicalDevice::getSurfaceSupportKHR( uint32_t queueFamilyIndex, VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32 PhysicalDevice::getSurfaceSupportKHR( uint32_t                         queueFamilyIndex,
+                                                                                                              VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceSupportKHR && "Function <vkGetPhysicalDeviceSurfaceSupportKHR> requires <VK_KHR_surface>" );
 
-      Bool32 supported;
-      Result result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSurfaceSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                                  queueFamilyIndex,
-                                                                                                  static_cast<VkSurfaceKHR>( surface ),
-                                                                                                  reinterpret_cast<VkBool32 *>( &supported ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceSupportKHR" );
+      VULKAN_HPP_NAMESPACE::Bool32 supported;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceSurfaceSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                                                          queueFamilyIndex,
+                                                                                                          static_cast<VkSurfaceKHR>( surface ),
+                                                                                                          reinterpret_cast<VkBool32 *>( &supported ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceSupportKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( supported ) );
+      return supported;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilitiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilitiesKHR>::type
-                         PhysicalDevice::getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR
+                                           PhysicalDevice::getSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilitiesKHR &&
                          "Function <vkGetPhysicalDeviceSurfaceCapabilitiesKHR> requires <VK_KHR_surface>" );
 
-      SurfaceCapabilitiesKHR surfaceCapabilities;
-      Result                 result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR surfaceCapabilities;
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     static_cast<VkSurfaceKHR>( surface ),
                                                                     reinterpret_cast<VkSurfaceCapabilitiesKHR *>( &surfaceCapabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilitiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilitiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+      return surfaceCapabilities;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormatsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormatsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormatKHR>>::type
-                         PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR>
+                                           PhysicalDevice::getSurfaceFormatsKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceFormatsKHR && "Function <vkGetPhysicalDeviceSurfaceFormatsKHR> requires <VK_KHR_surface>" );
 
-      std::vector<SurfaceFormatKHR> surfaceFormats;
-      uint32_t                      surfaceFormatCount;
-      Result                        result;
+      std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR> surfaceFormats;
+      uint32_t                                            surfaceFormatCount;
+      VULKAN_HPP_NAMESPACE::Result                        result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSurfaceFormatsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceSurfaceFormatsKHR(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkSurfaceKHR>( surface ), &surfaceFormatCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
         {
           surfaceFormats.resize( surfaceFormatCount );
-          result =
-            static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSurfaceFormatsKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                        static_cast<VkSurfaceKHR>( surface ),
-                                                                                        &surfaceFormatCount,
-                                                                                        reinterpret_cast<VkSurfaceFormatKHR *>( surfaceFormats.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetPhysicalDeviceSurfaceFormatsKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                   static_cast<VkSurfaceKHR>( surface ),
+                                                                   &surfaceFormatCount,
+                                                                   reinterpret_cast<VkSurfaceFormatKHR *>( surfaceFormats.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormatsKHR" );
       VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
       if ( surfaceFormatCount < surfaceFormats.size() )
       {
         surfaceFormats.resize( surfaceFormatCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
+      return surfaceFormats;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR>>::type
-                         PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR>
+                                           PhysicalDevice::getSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfacePresentModesKHR &&
                          "Function <vkGetPhysicalDeviceSurfacePresentModesKHR> requires <VK_KHR_surface>" );
 
-      std::vector<PresentModeKHR> presentModes;
-      uint32_t                    presentModeCount;
-      Result                      result;
+      std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR> presentModes;
+      uint32_t                                          presentModeCount;
+      VULKAN_HPP_NAMESPACE::Result                      result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSurfacePresentModesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceSurfacePresentModesKHR(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkSurfaceKHR>( surface ), &presentModeCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && presentModeCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
         {
           presentModes.resize( presentModeCount );
-          result =
-            static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSurfacePresentModesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                             static_cast<VkSurfaceKHR>( surface ),
-                                                                                             &presentModeCount,
-                                                                                             reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetPhysicalDeviceSurfacePresentModesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                        static_cast<VkSurfaceKHR>( surface ),
+                                                                        &presentModeCount,
+                                                                        reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModesKHR" );
       VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
       if ( presentModeCount < presentModes.size() )
       {
         presentModes.resize( presentModeCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
+      return presentModes;
     }
 
     //=== VK_KHR_swapchain ===
 
-    // wrapper function for command vkCreateSwapchainKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSwapchainKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SwapchainKHR>::type
-                         Device::createSwapchainKHR( SwapchainCreateInfoKHR const &      createInfo,
-                                  Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>::Type
+                        Device::createSwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const &                            createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
-      Result                             result = static_cast<Result>( getDispatcher()->vkCreateSwapchainKHR( static_cast<VkDevice>( m_device ),
-                                                                                  reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                  reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSwapchainKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SwapchainKHR( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSwapchainKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSwapchainKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator );
     }
 
-    // wrapper function for command vkGetSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainImagesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VULKAN_HPP_NAMESPACE::Image>>::type SwapchainKHR::getImages() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::Image> SwapchainKHR::getImages() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainImagesKHR && "Function <vkGetSwapchainImagesKHR> requires <VK_KHR_swapchain>" );
 
       std::vector<VULKAN_HPP_NAMESPACE::Image> swapchainImages;
       uint32_t                                 swapchainImageCount;
-      Result                                   result;
+      VULKAN_HPP_NAMESPACE::Result             result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetSwapchainImagesKHR(
-          static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), &swapchainImageCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && swapchainImageCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSwapchainImagesKHR(
+          static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), &swapchainImageCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && swapchainImageCount )
         {
           swapchainImages.resize( swapchainImageCount );
-          result = static_cast<Result>( getDispatcher()->vkGetSwapchainImagesKHR( static_cast<VkDevice>( m_device ),
-                                                                                  static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                                  &swapchainImageCount,
-                                                                                  reinterpret_cast<VkImage *>( swapchainImages.data() ) ) );
+          result =
+            static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSwapchainImagesKHR( static_cast<VkDevice>( m_device ),
+                                                                                                 static_cast<VkSwapchainKHR>( m_swapchain ),
+                                                                                                 &swapchainImageCount,
+                                                                                                 reinterpret_cast<VkImage *>( swapchainImages.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getImages" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getImages" );
       VULKAN_HPP_ASSERT( swapchainImageCount <= swapchainImages.size() );
       if ( swapchainImageCount < swapchainImages.size() )
       {
         swapchainImages.resize( swapchainImageCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchainImages ) );
+      return swapchainImages;
     }
 
-    // wrapper function for command vkAcquireNextImageKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImageKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, uint32_t>
       SwapchainKHR::acquireNextImage( uint64_t timeout, VULKAN_HPP_NAMESPACE::Semaphore semaphore, VULKAN_HPP_NAMESPACE::Fence fence ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireNextImageKHR && "Function <vkAcquireNextImageKHR> requires <VK_KHR_swapchain>" );
 
-      uint32_t imageIndex;
-      Result   result = static_cast<Result>( getDispatcher()->vkAcquireNextImageKHR( static_cast<VkDevice>( m_device ),
-                                                                                   static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                                   timeout,
-                                                                                   static_cast<VkSemaphore>( semaphore ),
-                                                                                   static_cast<VkFence>( fence ),
-                                                                                   &imageIndex ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result,
-        VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::acquireNextImage",
-        { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
+      uint32_t                     imageIndex;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkAcquireNextImageKHR( static_cast<VkDevice>( m_device ),
+                                                                                           static_cast<VkSwapchainKHR>( m_swapchain ),
+                                                                                           timeout,
+                                                                                           static_cast<VkSemaphore>( semaphore ),
+                                                                                           static_cast<VkFence>( fence ),
+                                                                                           &imageIndex ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::acquireNextImage",
-                                                 { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR } );
-#  endif
+                                                 VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::acquireNextImage",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eTimeout,
+                                                   VULKAN_HPP_NAMESPACE::Result::eNotReady,
+                                                   VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-      return ResultValue<uint32_t>( result, std::move( imageIndex ) );
+      return std::make_pair( result, std::move( imageIndex ) );
     }
 
-    // wrapper function for command vkQueuePresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueuePresentKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Queue::presentKHR( const PresentInfoKHR & presentInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Queue::presentKHR( const VULKAN_HPP_NAMESPACE::PresentInfoKHR & presentInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueuePresentKHR && "Function <vkQueuePresentKHR> requires <VK_KHR_swapchain>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkQueuePresentKHR( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkPresentInfoKHR *>( &presentInfo ) ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
       VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::presentKHR", { Result::eSuccess, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::presentKHR", { Result::eSuccess, Result::eSuboptimalKHR } );
-#  endif
+        result, VULKAN_HPP_NAMESPACE_STRING "::Queue::presentKHR", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkGetDeviceGroupPresentCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPresentCapabilitiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentCapabilitiesKHR>::type Device::getGroupPresentCapabilitiesKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR Device::getGroupPresentCapabilitiesKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceGroupPresentCapabilitiesKHR &&
                          "Function <vkGetDeviceGroupPresentCapabilitiesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 
-      DeviceGroupPresentCapabilitiesKHR deviceGroupPresentCapabilities;
-      Result                            result = static_cast<Result>( getDispatcher()->vkGetDeviceGroupPresentCapabilitiesKHR(
+      VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR deviceGroupPresentCapabilities;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDeviceGroupPresentCapabilitiesKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( &deviceGroupPresentCapabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getGroupPresentCapabilitiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupPresentCapabilitiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( deviceGroupPresentCapabilities ) );
+      return deviceGroupPresentCapabilities;
     }
 
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-                         Device::getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR
+                                           Device::getGroupSurfacePresentModesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceGroupSurfacePresentModesKHR &&
                          "Function <vkGetDeviceGroupSurfacePresentModesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 
-      DeviceGroupPresentModeFlagsKHR modes;
-      Result                         result = static_cast<Result>( getDispatcher()->vkGetDeviceGroupSurfacePresentModesKHR(
+      VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDeviceGroupSurfacePresentModesKHR(
         static_cast<VkDevice>( m_device ), static_cast<VkSurfaceKHR>( surface ), reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( &modes ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getGroupSurfacePresentModesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( modes ) );
+      return modes;
     }
 
-    // wrapper function for command vkGetPhysicalDevicePresentRectanglesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDevicePresentRectanglesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Rect2D>>::type
-                         PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::Rect2D>
+                                           PhysicalDevice::getPresentRectanglesKHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDevicePresentRectanglesKHR &&
                          "Function <vkGetPhysicalDevicePresentRectanglesKHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 
-      std::vector<Rect2D> rects;
-      uint32_t            rectCount;
-      Result              result;
+      std::vector<VULKAN_HPP_NAMESPACE::Rect2D> rects;
+      uint32_t                                  rectCount;
+      VULKAN_HPP_NAMESPACE::Result              result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDevicePresentRectanglesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDevicePresentRectanglesKHR(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkSurfaceKHR>( surface ), &rectCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && rectCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && rectCount )
         {
           rects.resize( rectCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDevicePresentRectanglesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                                  static_cast<VkSurfaceKHR>( surface ),
-                                                                                                  &rectCount,
-                                                                                                  reinterpret_cast<VkRect2D *>( rects.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetPhysicalDevicePresentRectanglesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                      static_cast<VkSurfaceKHR>( surface ),
+                                                                      &rectCount,
+                                                                      reinterpret_cast<VkRect2D *>( rects.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getPresentRectanglesKHR" );
       VULKAN_HPP_ASSERT( rectCount <= rects.size() );
       if ( rectCount < rects.size() )
       {
         rects.resize( rectCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( rects ) );
+      return rects;
     }
 
-    // wrapper function for command vkAcquireNextImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireNextImage2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<uint32_t> Device::acquireNextImage2KHR( const AcquireNextImageInfoKHR & acquireInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::Result, uint32_t>
+                                           Device::acquireNextImage2KHR( const VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR & acquireInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireNextImage2KHR && "Function <vkAcquireNextImage2KHR> requires <VK_KHR_device_group> or <VK_KHR_swapchain>" );
 
-      uint32_t imageIndex;
-      Result   result = static_cast<Result>( getDispatcher()->vkAcquireNextImage2KHR(
+      uint32_t                     imageIndex;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkAcquireNextImage2KHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAcquireNextImageInfoKHR *>( &acquireInfo ), &imageIndex ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result,
-        VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::acquireNextImage2KHR",
-        { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::acquireNextImage2KHR",
-                                                 { Result::eSuccess, Result::eTimeout, Result::eNotReady, Result::eSuboptimalKHR } );
-#  endif
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::acquireNextImage2KHR",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eTimeout,
+                                                   VULKAN_HPP_NAMESPACE::Result::eNotReady,
+                                                   VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-      return ResultValue<uint32_t>( result, std::move( imageIndex ) );
+      return std::make_pair( result, std::move( imageIndex ) );
     }
 
     //=== VK_KHR_display ===
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPropertiesKHR>>::type PhysicalDevice::getDisplayPropertiesKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR> PhysicalDevice::getDisplayPropertiesKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceDisplayPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceDisplayPropertiesKHR> requires <VK_KHR_display>" );
 
-      std::vector<DisplayPropertiesKHR> properties;
-      uint32_t                          propertyCount;
-      Result                            result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR> properties;
+      uint32_t                                                propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                            result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceDisplayPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPropertiesKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPropertiesKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkDisplayPropertiesKHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPropertiesKHR" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlanePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlanePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlanePropertiesKHR>>::type
-                         PhysicalDevice::getDisplayPlanePropertiesKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR> PhysicalDevice::getDisplayPlanePropertiesKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceDisplayPlanePropertiesKHR &&
                          "Function <vkGetPhysicalDeviceDisplayPlanePropertiesKHR> requires <VK_KHR_display>" );
 
-      std::vector<DisplayPlanePropertiesKHR> properties;
-      uint32_t                               propertyCount;
-      Result                                 result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR> properties;
+      uint32_t                                                     propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                 result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceDisplayPlanePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPlanePropertiesKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkDisplayPlanePropertiesKHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlanePropertiesKHR" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetDisplayPlaneSupportedDisplaysKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneSupportedDisplaysKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayKHR>>::type
-                         PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>>::Type
+      PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::DisplayKHR> displays;
       uint32_t                                      displayCount;
-      Result                                        result;
+      VULKAN_HPP_NAMESPACE::Result                  result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetDisplayPlaneSupportedDisplaysKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), planeIndex, &displayCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && displayCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && displayCount )
         {
           displays.resize( displayCount );
-          result = static_cast<Result>( getDispatcher()->vkGetDisplayPlaneSupportedDisplaysKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDisplayPlaneSupportedDisplaysKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), planeIndex, &displayCount, reinterpret_cast<VkDisplayKHR *>( displays.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
-      std::vector<DisplayKHR> displaysRAII;
-      if ( result == Result::eSuccess )
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eIncomplete ) )
       {
-        displaysRAII.reserve( displays.size() );
-        for ( auto & display : displays )
-        {
-          displaysRAII.emplace_back( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( displaysRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR> displaysRAII;
+      displaysRAII.reserve( displays.size() );
+      for ( auto & display : displays )
+      {
+        displaysRAII.emplace_back( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) );
+      }
+      return displaysRAII;
     }
 
-    // wrapper function for command vkGetDisplayModePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModePropertiesKHR>>::type DisplayKHR::getModeProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR> DisplayKHR::getModeProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDisplayModePropertiesKHR && "Function <vkGetDisplayModePropertiesKHR> requires <VK_KHR_display>" );
 
-      std::vector<DisplayModePropertiesKHR> properties;
-      uint32_t                              propertyCount;
-      Result                                result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR> properties;
+      uint32_t                                                    propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetDisplayModePropertiesKHR(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_displayKHR ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDisplayModePropertiesKHR(
+          static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_display ), &propertyCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetDisplayModePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                        static_cast<VkDisplayKHR>( m_displayKHR ),
-                                                                                        &propertyCount,
-                                                                                        reinterpret_cast<VkDisplayModePropertiesKHR *>( properties.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetDisplayModePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                            static_cast<VkDisplayKHR>( m_display ),
+                                                            &propertyCount,
+                                                            reinterpret_cast<VkDisplayModePropertiesKHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayKHR::getModeProperties" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DisplayKHR::getModeProperties" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkCreateDisplayModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayModeKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayModeKHR>::type
-                         DisplayKHR::createMode( DisplayModeCreateInfoKHR const &    createInfo,
-                              Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayModeKHR>::Type
+                        DisplayKHR::createMode( VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR const &                          createInfo,
+                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DisplayModeKHR mode;
-      Result result = static_cast<Result>( getDispatcher()->vkCreateDisplayModeKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                    static_cast<VkDisplayKHR>( m_displayKHR ),
-                                                                                    reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayKHR::createMode" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, DisplayModeKHR( *this, *reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
+      VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDisplayModeKHR(
+        static_cast<VkPhysicalDevice>( m_physicalDevice ),
+        static_cast<VkDisplayKHR>( m_display ),
+        reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDisplayModeKHR *>( &mode ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "DisplayKHR::createMode" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayModeKHR( *this, *reinterpret_cast<VkDisplayModeKHR *>( &mode ) );
     }
 
-    // wrapper function for command vkGetDisplayPlaneCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilitiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayPlaneCapabilitiesKHR>::type
-                         DisplayModeKHR::getDisplayPlaneCapabilities( uint32_t planeIndex ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR
+                                           DisplayModeKHR::getDisplayPlaneCapabilities( uint32_t planeIndex ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDisplayPlaneCapabilitiesKHR && "Function <vkGetDisplayPlaneCapabilitiesKHR> requires <VK_KHR_display>" );
 
-      DisplayPlaneCapabilitiesKHR capabilities;
-      Result                      result =
-        static_cast<Result>( getDispatcher()->vkGetDisplayPlaneCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                static_cast<VkDisplayModeKHR>( m_displayModeKHR ),
-                                                                                planeIndex,
-                                                                                reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( &capabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayModeKHR::getDisplayPlaneCapabilities" );
+      VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR capabilities;
+      VULKAN_HPP_NAMESPACE::Result                      result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetDisplayPlaneCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                           static_cast<VkDisplayModeKHR>( m_displayModeKHR ),
+                                                           planeIndex,
+                                                           reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( &capabilities ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DisplayModeKHR::getDisplayPlaneCapabilities" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
+      return capabilities;
     }
 
-    // wrapper function for command vkCreateDisplayPlaneSurfaceKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDisplayPlaneSurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createDisplayPlaneSurfaceKHR( DisplaySurfaceCreateInfoKHR const & createInfo,
-                                              Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createDisplayPlaneSurfaceKHR( VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR const &                       createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result =
-        static_cast<Result>( getDispatcher()->vkCreateDisplayPlaneSurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                              reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createDisplayPlaneSurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDisplayPlaneSurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createDisplayPlaneSurfaceKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
     //=== VK_KHR_display_swapchain ===
 
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SwapchainKHR>>::type
-      Device::createSharedSwapchainsKHR( ArrayProxy<SwapchainCreateInfoKHR> const & createInfos, Optional<const AllocationCallbacks> allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>>::Type
+      Device::createSharedSwapchainsKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR> const & createInfos,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>        allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::SwapchainKHR> swapchains( createInfos.size() );
-      Result                                          result =
-        static_cast<Result>( getDispatcher()->vkCreateSharedSwapchainsKHR( static_cast<VkDevice>( m_device ),
-                                                                           createInfos.size(),
-                                                                           reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
-                                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                           reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSharedSwapchainsKHR" );
-      std::vector<SwapchainKHR> swapchainsRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSharedSwapchainsKHR(
+        static_cast<VkDevice>( m_device ),
+        createInfos.size(),
+        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSwapchainKHR *>( swapchains.data() ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
       {
-        swapchainsRAII.reserve( swapchains.size() );
-        for ( auto & swapchain : swapchains )
-        {
-          swapchainsRAII.emplace_back( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSharedSwapchainsKHR" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( swapchainsRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR> swapchainsRAII;
+      swapchainsRAII.reserve( swapchains.size() );
+      for ( auto & swapchain : swapchains )
+      {
+        swapchainsRAII.emplace_back( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator );
+      }
+      return swapchainsRAII;
     }
 
-    // wrapper function for command vkCreateSharedSwapchainsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSharedSwapchainsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SwapchainKHR>::type
-                         Device::createSharedSwapchainKHR( SwapchainCreateInfoKHR const &      createInfo,
-                                        Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR>::Type
+                        Device::createSharedSwapchainKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const &                            createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain;
-      Result                             result = static_cast<Result>( getDispatcher()->vkCreateSharedSwapchainsKHR( static_cast<VkDevice>( m_device ),
-                                                                                         1,
-                                                                                         reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
-                                                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                         reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSharedSwapchainKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SwapchainKHR( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSharedSwapchainsKHR(
+        static_cast<VkDevice>( m_device ),
+        1,
+        reinterpret_cast<const VkSwapchainCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSwapchainKHR *>( &swapchain ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSharedSwapchainKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SwapchainKHR( *this, *reinterpret_cast<VkSwapchainKHR *>( &swapchain ), allocator );
     }
 
 #  if defined( VK_USE_PLATFORM_XLIB_KHR )
     //=== VK_KHR_xlib_surface ===
 
-    // wrapper function for command vkCreateXlibSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXlibSurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createXlibSurfaceKHR( XlibSurfaceCreateInfoKHR const &    createInfo,
-                                      Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createXlibSurfaceKHR( VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR const &                          createInfo,
+                                      VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateXlibSurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                                    reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createXlibSurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateXlibSurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createXlibSurfaceKHR" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceXlibPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXlibPresentationSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getXlibPresentationSupportKHR( uint32_t  queueFamilyIndex,
-                                                                                                 Display & dpy,
-                                                                                                 VisualID  visualID ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+      PhysicalDevice::getXlibPresentationSupportKHR( uint32_t queueFamilyIndex, Display & dpy, VisualID visualID ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceXlibPresentationSupportKHR &&
                          "Function <vkGetPhysicalDeviceXlibPresentationSupportKHR> requires <VK_KHR_xlib_surface>" );
@@ -18882,32 +15511,39 @@ namespace VULKAN_HPP_NAMESPACE
       VkBool32 result =
         getDispatcher()->vkGetPhysicalDeviceXlibPresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &dpy, visualID );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_XLIB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_XCB_KHR )
     //=== VK_KHR_xcb_surface ===
 
-    // wrapper function for command vkCreateXcbSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateXcbSurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createXcbSurfaceKHR( XcbSurfaceCreateInfoKHR const &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createXcbSurfaceKHR( VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR const &                           createInfo,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateXcbSurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                                   reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                   reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createXcbSurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateXcbSurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createXcbSurfaceKHR" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceXcbPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceXcbPresentationSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getXcbPresentationSupportKHR( uint32_t           queueFamilyIndex,
-                                                                                                xcb_connection_t & connection,
-                                                                                                xcb_visualid_t     visual_id ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32 PhysicalDevice::getXcbPresentationSupportKHR(
+      uint32_t queueFamilyIndex, xcb_connection_t & connection, xcb_visualid_t visual_id ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceXcbPresentationSupportKHR &&
                          "Function <vkGetPhysicalDeviceXcbPresentationSupportKHR> requires <VK_KHR_xcb_surface>" );
@@ -18915,31 +15551,39 @@ namespace VULKAN_HPP_NAMESPACE
       VkBool32 result = getDispatcher()->vkGetPhysicalDeviceXcbPresentationSupportKHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &connection, visual_id );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WAYLAND_KHR )
     //=== VK_KHR_wayland_surface ===
 
-    // wrapper function for command vkCreateWaylandSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWaylandSurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createWaylandSurfaceKHR( WaylandSurfaceCreateInfoKHR const & createInfo,
-                                         Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createWaylandSurfaceKHR( VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR const &                       createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateWaylandSurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                                       reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createWaylandSurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateWaylandSurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createWaylandSurfaceKHR" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceWaylandPresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWaylandPresentationSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t            queueFamilyIndex,
-                                                                                                    struct wl_display & display ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+      PhysicalDevice::getWaylandPresentationSupportKHR( uint32_t queueFamilyIndex, struct wl_display & display ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceWaylandPresentationSupportKHR &&
                          "Function <vkGetPhysicalDeviceWaylandPresentationSupportKHR> requires <VK_KHR_wayland_surface>" );
@@ -18947,85 +15591,111 @@ namespace VULKAN_HPP_NAMESPACE
       VkBool32 result =
         getDispatcher()->vkGetPhysicalDeviceWaylandPresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &display );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
     //=== VK_KHR_android_surface ===
 
-    // wrapper function for command vkCreateAndroidSurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAndroidSurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createAndroidSurfaceKHR( AndroidSurfaceCreateInfoKHR const & createInfo,
-                                         Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createAndroidSurfaceKHR( VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR const &                       createInfo,
+                                         VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateAndroidSurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                                       reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
-                                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                       reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createAndroidSurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateAndroidSurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createAndroidSurfaceKHR" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_win32_surface ===
 
-    // wrapper function for command vkCreateWin32SurfaceKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateWin32SurfaceKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createWin32SurfaceKHR( Win32SurfaceCreateInfoKHR const &   createInfo,
-                                       Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createWin32SurfaceKHR( VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR const &                         createInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateWin32SurfaceKHR( static_cast<VkInstance>( m_instance ),
-                                                                                     reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
-                                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                     reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createWin32SurfaceKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateWin32SurfaceKHR(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createWin32SurfaceKHR" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceWin32PresentationSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceWin32PresentationSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getWin32PresentationSupportKHR( uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+                                           PhysicalDevice::getWin32PresentationSupportKHR( uint32_t queueFamilyIndex ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceWin32PresentationSupportKHR &&
                          "Function <vkGetPhysicalDeviceWin32PresentationSupportKHR> requires <VK_KHR_win32_surface>" );
 
       VkBool32 result = getDispatcher()->vkGetPhysicalDeviceWin32PresentationSupportKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_debug_report ===
 
-    // wrapper function for command vkCreateDebugReportCallbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugReportCallbackEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DebugReportCallbackEXT>::type
-                         Instance::createDebugReportCallbackEXT( DebugReportCallbackCreateInfoEXT const & createInfo,
-                                              Optional<const AllocationCallbacks>      allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugReportCallbackEXT>::Type
+      Instance::createDebugReportCallbackEXT( VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT const &                  createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT callback;
-      Result                                       result =
-        static_cast<Result>( getDispatcher()->vkCreateDebugReportCallbackEXT( static_cast<VkInstance>( m_instance ),
-                                                                              reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createDebugReportCallbackEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DebugReportCallbackEXT( *this, *reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDebugReportCallbackEXT(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createDebugReportCallbackEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugReportCallbackEXT(
+        *this, *reinterpret_cast<VkDebugReportCallbackEXT *>( &callback ), allocator );
     }
 
-    // wrapper function for command vkDebugReportMessageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugReportMessageEXT.html
-    VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( DebugReportFlagsEXT      flags,
-                                                            DebugReportObjectTypeEXT objectType_,
-                                                            uint64_t                 object,
-                                                            size_t                   location,
-                                                            int32_t                  messageCode,
-                                                            const std::string &      layerPrefix,
-                                                            const std::string &      message ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Instance::debugReportMessageEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT      flags,
+                                                            VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_,
+                                                            uint64_t                                       object,
+                                                            size_t                                         location,
+                                                            int32_t                                        messageCode,
+                                                            const std::string &                            layerPrefix,
+                                                            const std::string &                            message ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDebugReportMessageEXT && "Function <vkDebugReportMessageEXT> requires <VK_EXT_debug_report>" );
 
@@ -19041,34 +15711,25 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_debug_marker ===
 
-    // wrapper function for command vkDebugMarkerSetObjectTagEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectTagEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::debugMarkerSetObjectTagEXT( const DebugMarkerObjectTagInfoEXT & tagInfo ) const
+    VULKAN_HPP_INLINE void Device::debugMarkerSetObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT & tagInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDebugMarkerSetObjectTagEXT && "Function <vkDebugMarkerSetObjectTagEXT> requires <VK_EXT_debug_marker>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkDebugMarkerSetObjectTagEXT(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkDebugMarkerSetObjectTagEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( &tagInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::debugMarkerSetObjectTagEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectTagEXT" );
     }
 
-    // wrapper function for command vkDebugMarkerSetObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDebugMarkerSetObjectNameEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::debugMarkerSetObjectNameEXT( const DebugMarkerObjectNameInfoEXT & nameInfo ) const
+    VULKAN_HPP_INLINE void Device::debugMarkerSetObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT & nameInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDebugMarkerSetObjectNameEXT && "Function <vkDebugMarkerSetObjectNameEXT> requires <VK_EXT_debug_marker>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkDebugMarkerSetObjectNameEXT(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkDebugMarkerSetObjectNameEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( &nameInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::debugMarkerSetObjectNameEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::debugMarkerSetObjectNameEXT" );
     }
 
-    // wrapper function for command vkCmdDebugMarkerBeginEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerBeginEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::debugMarkerBeginEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDebugMarkerBeginEXT && "Function <vkCmdDebugMarkerBeginEXT> requires <VK_EXT_debug_marker>" );
 
@@ -19076,7 +15737,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                  reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( &markerInfo ) );
     }
 
-    // wrapper function for command vkCmdDebugMarkerEndEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerEndEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::debugMarkerEndEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDebugMarkerEndEXT && "Function <vkCmdDebugMarkerEndEXT> requires <VK_EXT_debug_marker>" );
@@ -19084,8 +15744,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDebugMarkerEndEXT( static_cast<VkCommandBuffer>( m_commandBuffer ) );
     }
 
-    // wrapper function for command vkCmdDebugMarkerInsertEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDebugMarkerInsertEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::debugMarkerInsertEXT( const VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT & markerInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDebugMarkerInsertEXT && "Function <vkCmdDebugMarkerInsertEXT> requires <VK_EXT_debug_marker>" );
 
@@ -19094,240 +15753,181 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     //=== VK_KHR_video_queue ===
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR * pVideoProfile,
-                                                                                           VideoCapabilitiesKHR *      pCapabilities ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR &&
-                         "Function <vkGetPhysicalDeviceVideoCapabilitiesKHR> requires <VK_KHR_video_queue>" );
-      return static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                            reinterpret_cast<const VkVideoProfileInfoKHR *>( pVideoProfile ),
-                                                                                            reinterpret_cast<VkVideoCapabilitiesKHR *>( pCapabilities ) ) );
-    }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoCapabilitiesKHR>::type
-                         PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR
+                                           PhysicalDevice::getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR &&
                          "Function <vkGetPhysicalDeviceVideoCapabilitiesKHR> requires <VK_KHR_video_queue>" );
 
-      VideoCapabilitiesKHR capabilities;
-      Result               result =
-        static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                       reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ),
-                                                                                       reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
+      VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR capabilities;
+      VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                  reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ),
+                                                                  reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
+      return capabilities;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoCapabilitiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoCapabilitiesKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         PhysicalDevice::getVideoCapabilitiesKHR( const VideoProfileInfoKHR & videoProfile ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                           PhysicalDevice::getVideoCapabilitiesKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR & videoProfile ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR &&
                          "Function <vkGetPhysicalDeviceVideoCapabilitiesKHR> requires <VK_KHR_video_queue>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      VideoCapabilitiesKHR &     capabilities = structureChain.template get<VideoCapabilitiesKHR>();
-      Result                     result =
-        static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                       reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ),
-                                                                                       reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
+      StructureChain<X, Y, Z...>                   structureChain;
+      VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR & capabilities = structureChain.template get<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR>();
+      VULKAN_HPP_NAMESPACE::Result                 result       = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetPhysicalDeviceVideoCapabilitiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                                  reinterpret_cast<const VkVideoProfileInfoKHR *>( &videoProfile ),
+                                                                  reinterpret_cast<VkVideoCapabilitiesKHR *>( &capabilities ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoCapabilitiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VideoFormatPropertiesKHR>>::type
-                         PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR>
+      PhysicalDevice::getVideoFormatPropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
 
-      std::vector<VideoFormatPropertiesKHR> videoFormatProperties;
-      uint32_t                              videoFormatPropertyCount;
-      Result                                result;
+      std::vector<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR> videoFormatProperties;
+      uint32_t                                                    videoFormatPropertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                         reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
                                                                         &videoFormatPropertyCount,
                                                                         nullptr ) );
-        if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && videoFormatPropertyCount )
         {
           videoFormatProperties.resize( videoFormatPropertyCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                           reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
                                                                           &videoFormatPropertyCount,
                                                                           reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
       VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
       if ( videoFormatPropertyCount < videoFormatProperties.size() )
       {
         videoFormatProperties.resize( videoFormatPropertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( videoFormatProperties ) );
+      return videoFormatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoFormatPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoFormatPropertiesKHR.html
-    template <typename StructureChain>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain>>::type
-                         PhysicalDevice::getVideoFormatPropertiesKHR( const PhysicalDeviceVideoFormatInfoKHR & videoFormatInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR &&
-                         "Function <vkGetPhysicalDeviceVideoFormatPropertiesKHR> requires <VK_KHR_video_queue>" );
-
-      std::vector<StructureChain>           structureChains;
-      std::vector<VideoFormatPropertiesKHR> videoFormatProperties;
-      uint32_t                              videoFormatPropertyCount;
-      Result                                result;
-      do
-      {
-        result = static_cast<Result>(
-          getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                        reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
-                                                                        &videoFormatPropertyCount,
-                                                                        nullptr ) );
-        if ( ( result == Result::eSuccess ) && videoFormatPropertyCount )
-        {
-          structureChains.resize( videoFormatPropertyCount );
-          videoFormatProperties.resize( videoFormatPropertyCount );
-          for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-          {
-            videoFormatProperties[i].pNext = structureChains[i].template get<VideoFormatPropertiesKHR>().pNext;
-          }
-          result = static_cast<Result>(
-            getDispatcher()->vkGetPhysicalDeviceVideoFormatPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                          reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( &videoFormatInfo ),
-                                                                          &videoFormatPropertyCount,
-                                                                          reinterpret_cast<VkVideoFormatPropertiesKHR *>( videoFormatProperties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoFormatPropertiesKHR" );
-      VULKAN_HPP_ASSERT( videoFormatPropertyCount <= videoFormatProperties.size() );
-      if ( videoFormatPropertyCount < videoFormatProperties.size() )
-      {
-        structureChains.resize( videoFormatPropertyCount );
-      }
-      for ( uint32_t i = 0; i < videoFormatPropertyCount; i++ )
-      {
-        structureChains[i].template get<VideoFormatPropertiesKHR>() = videoFormatProperties[i];
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChains ) );
-    }
-
-    // wrapper function for command vkCreateVideoSessionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoSessionKHR>::type
-                         Device::createVideoSessionKHR( VideoSessionCreateInfoKHR const &   createInfo,
-                                     Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionKHR>::Type
+      Device::createVideoSessionKHR( VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR const &                         createInfo,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession;
-      Result                                result = static_cast<Result>( getDispatcher()->vkCreateVideoSessionKHR( static_cast<VkDevice>( m_device ),
-                                                                                     reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
-                                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                     reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createVideoSessionKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, VideoSessionKHR( *this, *reinterpret_cast<VkVideoSessionKHR *>( &videoSession ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateVideoSessionKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkVideoSessionKHR *>( &videoSession ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createVideoSessionKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionKHR( *this, *reinterpret_cast<VkVideoSessionKHR *>( &videoSession ), allocator );
     }
 
-    // wrapper function for command vkGetVideoSessionMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetVideoSessionMemoryRequirementsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<VideoSessionMemoryRequirementsKHR>>::type
-                         VideoSessionKHR::getMemoryRequirements() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR> VideoSessionKHR::getMemoryRequirements() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetVideoSessionMemoryRequirementsKHR &&
                          "Function <vkGetVideoSessionMemoryRequirementsKHR> requires <VK_KHR_video_queue>" );
 
-      std::vector<VideoSessionMemoryRequirementsKHR> memoryRequirements;
-      uint32_t                                       memoryRequirementsCount;
-      Result                                         result;
+      std::vector<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR> memoryRequirements;
+      uint32_t                                                             memoryRequirementsCount;
+      VULKAN_HPP_NAMESPACE::Result                                         result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetVideoSessionMemoryRequirementsKHR(
-          static_cast<VkDevice>( m_device ), static_cast<VkVideoSessionKHR>( m_videoSessionKHR ), &memoryRequirementsCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && memoryRequirementsCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetVideoSessionMemoryRequirementsKHR(
+          static_cast<VkDevice>( m_device ), static_cast<VkVideoSessionKHR>( m_videoSession ), &memoryRequirementsCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && memoryRequirementsCount )
         {
           memoryRequirements.resize( memoryRequirementsCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetVideoSessionMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
-                                                                     static_cast<VkVideoSessionKHR>( m_videoSessionKHR ),
+                                                                     static_cast<VkVideoSessionKHR>( m_videoSession ),
                                                                      &memoryRequirementsCount,
                                                                      reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( memoryRequirements.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::VideoSessionKHR::getMemoryRequirements" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
       VULKAN_HPP_ASSERT( memoryRequirementsCount <= memoryRequirements.size() );
       if ( memoryRequirementsCount < memoryRequirements.size() )
       {
         memoryRequirements.resize( memoryRequirementsCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryRequirements ) );
+      return memoryRequirements;
     }
 
-    // wrapper function for command vkBindVideoSessionMemoryKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindVideoSessionMemoryKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      VideoSessionKHR::bindMemory( ArrayProxy<const BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos ) const
+    VULKAN_HPP_INLINE void VideoSessionKHR::bindMemory(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR> const & bindSessionMemoryInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindVideoSessionMemoryKHR && "Function <vkBindVideoSessionMemoryKHR> requires <VK_KHR_video_queue>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkBindVideoSessionMemoryKHR( static_cast<VkDevice>( m_device ),
-                                                      static_cast<VkVideoSessionKHR>( m_videoSessionKHR ),
+                                                      static_cast<VkVideoSessionKHR>( m_videoSession ),
                                                       bindSessionMemoryInfos.size(),
                                                       reinterpret_cast<const VkBindVideoSessionMemoryInfoKHR *>( bindSessionMemoryInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::VideoSessionKHR::bindMemory" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::VideoSessionKHR::bindMemory" );
     }
 
-    // wrapper function for command vkCreateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateVideoSessionParametersKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoSessionParametersKHR>::type
-                         Device::createVideoSessionParametersKHR( VideoSessionParametersCreateInfoKHR const & createInfo,
-                                               Optional<const AllocationCallbacks>         allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionParametersKHR>::Type
+      Device::createVideoSessionParametersKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR const &               createInfo,
+                                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters;
-      Result                                          result =
-        static_cast<Result>( getDispatcher()->vkCreateVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createVideoSessionParametersKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, VideoSessionParametersKHR( *this, *reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateVideoSessionParametersKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createVideoSessionParametersKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::VideoSessionParametersKHR(
+        *this, *reinterpret_cast<VkVideoSessionParametersKHR *>( &videoSessionParameters ), allocator );
     }
 
-    // wrapper function for command vkUpdateVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateVideoSessionParametersKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type VideoSessionParametersKHR::update( const VideoSessionParametersUpdateInfoKHR & updateInfo ) const
+    VULKAN_HPP_INLINE void VideoSessionParametersKHR::update( const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR & updateInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkUpdateVideoSessionParametersKHR && "Function <vkUpdateVideoSessionParametersKHR> requires <VK_KHR_video_queue>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkUpdateVideoSessionParametersKHR( static_cast<VkDevice>( m_device ),
-                                                            static_cast<VkVideoSessionParametersKHR>( m_videoSessionParametersKHR ),
+                                                            static_cast<VkVideoSessionParametersKHR>( m_videoSessionParameters ),
                                                             reinterpret_cast<const VkVideoSessionParametersUpdateInfoKHR *>( &updateInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::VideoSessionParametersKHR::update" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::VideoSessionParametersKHR::update" );
     }
 
-    // wrapper function for command vkCmdBeginVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginVideoCodingKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VideoBeginCodingInfoKHR & beginInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR & beginInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginVideoCodingKHR && "Function <vkCmdBeginVideoCodingKHR> requires <VK_KHR_video_queue>" );
 
@@ -19335,8 +15935,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                  reinterpret_cast<const VkVideoBeginCodingInfoKHR *>( &beginInfo ) );
     }
 
-    // wrapper function for command vkCmdEndVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndVideoCodingKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VideoEndCodingInfoKHR & endCodingInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::endVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR & endCodingInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndVideoCodingKHR && "Function <vkCmdEndVideoCodingKHR> requires <VK_KHR_video_queue>" );
 
@@ -19344,8 +15943,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                reinterpret_cast<const VkVideoEndCodingInfoKHR *>( &endCodingInfo ) );
     }
 
-    // wrapper function for command vkCmdControlVideoCodingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdControlVideoCodingKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::controlVideoCodingKHR( const VideoCodingControlInfoKHR & codingControlInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::controlVideoCodingKHR( const VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR & codingControlInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdControlVideoCodingKHR && "Function <vkCmdControlVideoCodingKHR> requires <VK_KHR_video_queue>" );
 
@@ -19355,8 +15954,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_video_decode_queue ===
 
-    // wrapper function for command vkCmdDecodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecodeVideoKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VideoDecodeInfoKHR & decodeInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::decodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR & decodeInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDecodeVideoKHR && "Function <vkCmdDecodeVideoKHR> requires <VK_KHR_video_decode_queue>" );
 
@@ -19365,12 +15963,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_transform_feedback ===
 
-    // wrapper function for command vkCmdBindTransformFeedbackBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTransformFeedbackBuffersEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t                                               firstBinding,
-                                                                           ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                                                           ArrayProxy<const DeviceSize> const &                   offsets,
-                                                                           ArrayProxy<const DeviceSize> const &                   sizes ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::bindTransformFeedbackBuffersEXT( uint32_t                                                                         firstBinding,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindTransformFeedbackBuffersEXT &&
                          "Function <vkCmdBindTransformFeedbackBuffersEXT> requires <VK_EXT_transform_feedback>" );
@@ -19396,11 +15993,10 @@ namespace VULKAN_HPP_NAMESPACE
                                                              reinterpret_cast<const VkDeviceSize *>( sizes.data() ) );
     }
 
-    // wrapper function for command vkCmdBeginTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginTransformFeedbackEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginTransformFeedbackEXT( uint32_t                                               firstCounterBuffer,
-                                                                     ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
-                                                                     ArrayProxy<const DeviceSize> const &                   counterBufferOffsets ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::beginTransformFeedbackEXT( uint32_t                                                                         firstCounterBuffer,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     counterBuffers,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginTransformFeedbackEXT && "Function <vkCmdBeginTransformFeedbackEXT> requires <VK_EXT_transform_feedback>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -19419,11 +16015,10 @@ namespace VULKAN_HPP_NAMESPACE
                                                        reinterpret_cast<const VkDeviceSize *>( counterBufferOffsets.data() ) );
     }
 
-    // wrapper function for command vkCmdEndTransformFeedbackEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndTransformFeedbackEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::endTransformFeedbackEXT( uint32_t                                               firstCounterBuffer,
-                                                                   ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & counterBuffers,
-                                                                   ArrayProxy<const DeviceSize> const &                   counterBufferOffsets ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::endTransformFeedbackEXT( uint32_t                                                                         firstCounterBuffer,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     counterBuffers,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & counterBufferOffsets ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndTransformFeedbackEXT && "Function <vkCmdEndTransformFeedbackEXT> requires <VK_EXT_transform_feedback>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -19442,11 +16037,10 @@ namespace VULKAN_HPP_NAMESPACE
                                                      reinterpret_cast<const VkDeviceSize *>( counterBufferOffsets.data() ) );
     }
 
-    // wrapper function for command vkCmdBeginQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginQueryIndexedEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool,
-                                                                uint32_t                        query,
-                                                                QueryControlFlags               flags,
-                                                                uint32_t                        index ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool         queryPool,
+                                                                uint32_t                                query,
+                                                                VULKAN_HPP_NAMESPACE::QueryControlFlags flags,
+                                                                uint32_t                                index ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginQueryIndexedEXT && "Function <vkCmdBeginQueryIndexedEXT> requires <VK_EXT_transform_feedback>" );
 
@@ -19454,7 +16048,6 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, static_cast<VkQueryControlFlags>( flags ), index );
     }
 
-    // wrapper function for command vkCmdEndQueryIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndQueryIndexedEXT.html
     VULKAN_HPP_INLINE void
       CommandBuffer::endQueryIndexedEXT( VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query, uint32_t index ) const VULKAN_HPP_NOEXCEPT
     {
@@ -19463,14 +16056,12 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdEndQueryIndexedEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkQueryPool>( queryPool ), query, index );
     }
 
-    // wrapper function for command vkCmdDrawIndirectByteCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectByteCountEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectByteCountEXT( uint32_t                     instanceCount,
-                                                                    uint32_t                     firstInstance,
-                                                                    VULKAN_HPP_NAMESPACE::Buffer counterBuffer,
-                                                                    DeviceSize                   counterBufferOffset,
-                                                                    uint32_t                     counterOffset,
-                                                                    uint32_t                     vertexStride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectByteCountEXT( uint32_t                         instanceCount,
+                                                                    uint32_t                         firstInstance,
+                                                                    VULKAN_HPP_NAMESPACE::Buffer     counterBuffer,
+                                                                    VULKAN_HPP_NAMESPACE::DeviceSize counterBufferOffset,
+                                                                    uint32_t                         counterOffset,
+                                                                    uint32_t                         vertexStride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndirectByteCountEXT && "Function <vkCmdDrawIndirectByteCountEXT> requires <VK_EXT_transform_feedback>" );
 
@@ -19485,37 +16076,55 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NVX_binary_import ===
 
-    // wrapper function for command vkCreateCuModuleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuModuleNVX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CuModuleNVX>::type
-                         Device::createCuModuleNVX( CuModuleCreateInfoNVX const &       createInfo,
-                                 Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuModuleNVX>::Type
+                        Device::createCuModuleNVX( VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX const &                             createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::CuModuleNVX module;
-      Result                            result = static_cast<Result>( getDispatcher()->vkCreateCuModuleNVX( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createCuModuleNVX" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, CuModuleNVX( *this, *reinterpret_cast<VkCuModuleNVX *>( &module ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateCuModuleNVX(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkCuModuleCreateInfoNVX *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkCuModuleNVX *>( &module ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createCuModuleNVX" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuModuleNVX( *this, *reinterpret_cast<VkCuModuleNVX *>( &module ), allocator );
     }
 
-    // wrapper function for command vkCreateCuFunctionNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCuFunctionNVX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CuFunctionNVX>::type
-                         Device::createCuFunctionNVX( CuFunctionCreateInfoNVX const &     createInfo,
-                                   Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuFunctionNVX>::Type
+                        Device::createCuFunctionNVX( VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX const &                           createInfo,
+                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::CuFunctionNVX function;
-      Result                              result = static_cast<Result>( getDispatcher()->vkCreateCuFunctionNVX( static_cast<VkDevice>( m_device ),
-                                                                                   reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
-                                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                   reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createCuFunctionNVX" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
-                                                                  CuFunctionNVX( *this, *reinterpret_cast<VkCuFunctionNVX *>( &function ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateCuFunctionNVX(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkCuFunctionNVX *>( &function ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createCuFunctionNVX" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CuFunctionNVX( *this, *reinterpret_cast<VkCuFunctionNVX *>( &function ), allocator );
     }
 
-    // wrapper function for command vkCmdCuLaunchKernelNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCuLaunchKernelNVX.html
-    VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const CuLaunchInfoNVX & launchInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::cuLaunchKernelNVX( const VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX & launchInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCuLaunchKernelNVX && "Function <vkCmdCuLaunchKernelNVX> requires <VK_NVX_binary_import>" );
 
@@ -19524,8 +16133,8 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NVX_image_view_handle ===
 
-    // wrapper function for command vkGetImageViewHandleNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandleNVX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t Device::getImageViewHandleNVX( const ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t
+      Device::getImageViewHandleNVX( const VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageViewHandleNVX && "Function <vkGetImageViewHandleNVX> requires <VK_NVX_image_view_handle>" );
 
@@ -19535,39 +16144,26 @@ namespace VULKAN_HPP_NAMESPACE
       return result;
     }
 
-    // wrapper function for command vkGetImageViewHandle64NVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewHandle64NVX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getImageViewHandle64NVX( const ImageViewHandleInfoNVX & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageViewHandle64NVX && "Function <vkGetImageViewHandle64NVX> requires <VK_NVX_image_view_handle>" );
-
-      uint64_t result =
-        getDispatcher()->vkGetImageViewHandle64NVX( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageViewHandleInfoNVX *>( &info ) );
-
-      return result;
-    }
-
-    // wrapper function for command vkGetImageViewAddressNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewAddressNVX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageViewAddressPropertiesNVX>::type ImageView::getAddressNVX() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX ImageView::getAddressNVX() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageViewAddressNVX && "Function <vkGetImageViewAddressNVX> requires <VK_NVX_image_view_handle>" );
 
-      ImageViewAddressPropertiesNVX properties;
-      Result                        result = static_cast<Result>( getDispatcher()->vkGetImageViewAddressNVX(
+      VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX properties;
+      VULKAN_HPP_NAMESPACE::Result                        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetImageViewAddressNVX(
         static_cast<VkDevice>( m_device ), static_cast<VkImageView>( m_imageView ), reinterpret_cast<VkImageViewAddressPropertiesNVX *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::ImageView::getAddressNVX" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::ImageView::getAddressNVX" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
     //=== VK_AMD_draw_indirect_count ===
 
-    // wrapper function for command vkCmdDrawIndirectCountAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountAMD.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                DeviceSize                   offset,
-                                                                VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                DeviceSize                   countBufferOffset,
-                                                                uint32_t                     maxDrawCount,
-                                                                uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                uint32_t                         maxDrawCount,
+                                                                uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndirectCountAMD &&
                          "Function <vkCmdDrawIndirectCountAMD> requires <VK_AMD_draw_indirect_count> or <VK_KHR_draw_indirect_count> or <VK_VERSION_1_2>" );
@@ -19581,14 +16177,12 @@ namespace VULKAN_HPP_NAMESPACE
                                                   stride );
     }
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCountAMD, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountAMD.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                       DeviceSize                   offset,
-                                                                       VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                       DeviceSize                   countBufferOffset,
-                                                                       uint32_t                     maxDrawCount,
-                                                                       uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountAMD( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                       VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                       uint32_t                         maxDrawCount,
+                                                                       uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkCmdDrawIndexedIndirectCountAMD &&
@@ -19605,47 +16199,45 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_AMD_shader_info ===
 
-    // wrapper function for command vkGetShaderInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderInfoAMD.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t>>::type Pipeline::getShaderInfoAMD( ShaderStageFlagBits shaderStage,
-                                                                                                                            ShaderInfoTypeAMD   infoType ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<uint8_t> Pipeline::getShaderInfoAMD( VULKAN_HPP_NAMESPACE::ShaderStageFlagBits shaderStage,
+                                                                                            VULKAN_HPP_NAMESPACE::ShaderInfoTypeAMD   infoType ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetShaderInfoAMD && "Function <vkGetShaderInfoAMD> requires <VK_AMD_shader_info>" );
 
-      std::vector<uint8_t> info;
-      size_t               infoSize;
-      Result               result;
+      std::vector<uint8_t>         info;
+      size_t                       infoSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetShaderInfoAMD( static_cast<VkDevice>( m_device ),
-                                                                           static_cast<VkPipeline>( m_pipeline ),
-                                                                           static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                                           static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                                           &infoSize,
-                                                                           nullptr ) );
-        if ( ( result == Result::eSuccess ) && infoSize )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetShaderInfoAMD( static_cast<VkDevice>( m_device ),
+                                                                                                 static_cast<VkPipeline>( m_pipeline ),
+                                                                                                 static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                                 static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                                 &infoSize,
+                                                                                                 nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && infoSize )
         {
           info.resize( infoSize );
-          result = static_cast<Result>( getDispatcher()->vkGetShaderInfoAMD( static_cast<VkDevice>( m_device ),
-                                                                             static_cast<VkPipeline>( m_pipeline ),
-                                                                             static_cast<VkShaderStageFlagBits>( shaderStage ),
-                                                                             static_cast<VkShaderInfoTypeAMD>( infoType ),
-                                                                             &infoSize,
-                                                                             reinterpret_cast<void *>( info.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetShaderInfoAMD( static_cast<VkDevice>( m_device ),
+                                                                                                   static_cast<VkPipeline>( m_pipeline ),
+                                                                                                   static_cast<VkShaderStageFlagBits>( shaderStage ),
+                                                                                                   static_cast<VkShaderInfoTypeAMD>( infoType ),
+                                                                                                   &infoSize,
+                                                                                                   reinterpret_cast<void *>( info.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getShaderInfoAMD" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getShaderInfoAMD" );
       VULKAN_HPP_ASSERT( infoSize <= info.size() );
       if ( infoSize < info.size() )
       {
         info.resize( infoSize );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( info ) );
+      return info;
     }
 
     //=== VK_KHR_dynamic_rendering ===
 
-    // wrapper function for command vkCmdBeginRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderingKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginRenderingKHR( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginRenderingKHR &&
                          "Function <vkCmdBeginRenderingKHR> requires <VK_KHR_dynamic_rendering> or <VK_VERSION_1_3>" );
@@ -19653,7 +16245,6 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdBeginRenderingKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ) );
     }
 
-    // wrapper function for command vkCmdEndRenderingKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderingKHR.html
     VULKAN_HPP_INLINE void CommandBuffer::endRenderingKHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRenderingKHR && "Function <vkCmdEndRenderingKHR> requires <VK_KHR_dynamic_rendering> or <VK_VERSION_1_3>" );
@@ -19664,40 +16255,46 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_GGP )
     //=== VK_GGP_stream_descriptor_surface ===
 
-    // wrapper function for command vkCreateStreamDescriptorSurfaceGGP, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateStreamDescriptorSurfaceGGP.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createStreamDescriptorSurfaceGGP( StreamDescriptorSurfaceCreateInfoGGP const & createInfo,
-                                                  Optional<const AllocationCallbacks>          allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createStreamDescriptorSurfaceGGP( VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP const &              createInfo,
+                                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>(
-        getDispatcher()->vkCreateStreamDescriptorSurfaceGGP( static_cast<VkInstance>( m_instance ),
-                                                             reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                             reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createStreamDescriptorSurfaceGGP" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateStreamDescriptorSurfaceGGP(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createStreamDescriptorSurfaceGGP" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_GGP*/
 
     //=== VK_NV_external_memory_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalImageFormatPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalImageFormatPropertiesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExternalImageFormatPropertiesNV>::type
-                         PhysicalDevice::getExternalImageFormatPropertiesNV( Format                          format,
-                                                          ImageType                       type,
-                                                          ImageTiling                     tiling,
-                                                          ImageUsageFlags                 usage,
-                                                          ImageCreateFlags                flags,
-                                                          ExternalMemoryHandleTypeFlagsNV externalHandleType ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV
+                                           PhysicalDevice::getExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format                          format,
+                                                          VULKAN_HPP_NAMESPACE::ImageType                       type,
+                                                          VULKAN_HPP_NAMESPACE::ImageTiling                     tiling,
+                                                          VULKAN_HPP_NAMESPACE::ImageUsageFlags                 usage,
+                                                          VULKAN_HPP_NAMESPACE::ImageCreateFlags                flags,
+                                                          VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV externalHandleType ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalImageFormatPropertiesNV &&
                          "Function <vkGetPhysicalDeviceExternalImageFormatPropertiesNV> requires <VK_NV_external_memory_capabilities>" );
 
-      ExternalImageFormatPropertiesNV externalImageFormatProperties;
-      Result                          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
+      VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV externalImageFormatProperties;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceExternalImageFormatPropertiesNV(
         static_cast<VkPhysicalDevice>( m_physicalDevice ),
         static_cast<VkFormat>( format ),
         static_cast<VkImageType>( type ),
@@ -19706,183 +16303,150 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkImageCreateFlags>( flags ),
         static_cast<VkExternalMemoryHandleTypeFlagsNV>( externalHandleType ),
         reinterpret_cast<VkExternalImageFormatPropertiesNV *>( &externalImageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getExternalImageFormatPropertiesNV" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getExternalImageFormatPropertiesNV" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( externalImageFormatProperties ) );
+      return externalImageFormatProperties;
     }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_external_memory_win32 ===
 
-    // wrapper function for command vkGetMemoryWin32HandleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                         DeviceMemory::getMemoryWin32HandleNV( ExternalMemoryHandleTypeFlagsNV handleType ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE HANDLE DeviceMemory::getMemoryWin32HandleNV( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryWin32HandleNV && "Function <vkGetMemoryWin32HandleNV> requires <VK_NV_external_memory_win32>" );
 
-      HANDLE handle;
-      Result result = static_cast<Result>( getDispatcher()->vkGetMemoryWin32HandleNV( static_cast<VkDevice>( m_device ),
-                                                                                      static_cast<VkDeviceMemory>( m_deviceMemory ),
-                                                                                      static_cast<VkExternalMemoryHandleTypeFlagsNV>( handleType ),
-                                                                                      &handle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DeviceMemory::getMemoryWin32HandleNV" );
+      HANDLE                       handle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetMemoryWin32HandleNV(
+        static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_memory ), static_cast<VkExternalMemoryHandleTypeFlagsNV>( handleType ), &handle ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DeviceMemory::getMemoryWin32HandleNV" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
+      return handle;
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_get_physical_device_properties2 ===
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 PhysicalDevice::getFeatures2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFeatures2KHR &&
                          "Function <vkGetPhysicalDeviceFeatures2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceFeatures2 features;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 features;
       getDispatcher()->vkGetPhysicalDeviceFeatures2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                         reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
       return features;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFeatures2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFeatures2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getFeatures2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFeatures2KHR &&
                          "Function <vkGetPhysicalDeviceFeatures2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      PhysicalDeviceFeatures2 &  features = structureChain.template get<PhysicalDeviceFeatures2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 &  features = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2>();
       getDispatcher()->vkGetPhysicalDeviceFeatures2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                         reinterpret_cast<VkPhysicalDeviceFeatures2 *>( &features ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceProperties2 PhysicalDevice::getProperties2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 PhysicalDevice::getProperties2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceProperties2KHR &&
                          "Function <vkGetPhysicalDeviceProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceProperties2 properties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 properties;
       getDispatcher()->vkGetPhysicalDeviceProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                           reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
       return properties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceProperties2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getProperties2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getProperties2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceProperties2KHR &&
                          "Function <vkGetPhysicalDeviceProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>  structureChain;
-      PhysicalDeviceProperties2 & properties = structureChain.template get<PhysicalDeviceProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2>();
       getDispatcher()->vkGetPhysicalDeviceProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                           reinterpret_cast<VkPhysicalDeviceProperties2 *>( &properties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE FormatProperties2 PhysicalDevice::getFormatProperties2KHR( Format format ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::FormatProperties2
+                                           PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFormatProperties2KHR &&
                          "Function <vkGetPhysicalDeviceFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      FormatProperties2 formatProperties;
+      VULKAN_HPP_NAMESPACE::FormatProperties2 formatProperties;
       getDispatcher()->vkGetPhysicalDeviceFormatProperties2KHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
       return formatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFormatProperties2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getFormatProperties2KHR( Format format ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                           PhysicalDevice::getFormatProperties2KHR( VULKAN_HPP_NAMESPACE::Format format ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFormatProperties2KHR &&
                          "Function <vkGetPhysicalDeviceFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      FormatProperties2 &        formatProperties = structureChain.template get<FormatProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::FormatProperties2 &        formatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::FormatProperties2>();
       getDispatcher()->vkGetPhysicalDeviceFormatProperties2KHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkFormat>( format ), reinterpret_cast<VkFormatProperties2 *>( &formatProperties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getImageFormatProperties2KHR(
-      const PhysicalDeviceImageFormatInfo2 * pImageFormatInfo, ImageFormatProperties2 * pImageFormatProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR &&
-                         "Function <vkGetPhysicalDeviceImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                       reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( pImageFormatInfo ),
-                                                                       reinterpret_cast<VkImageFormatProperties2 *>( pImageFormatProperties ) ) );
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageFormatProperties2>::type
-                         PhysicalDevice::getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ImageFormatProperties2
+      PhysicalDevice::getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR &&
                          "Function <vkGetPhysicalDeviceImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      ImageFormatProperties2 imageFormatProperties;
-      Result                 result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::ImageFormatProperties2 imageFormatProperties;
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                        reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
                                                                        reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
+      return imageFormatProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceImageFormatProperties2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         PhysicalDevice::getImageFormatProperties2KHR( const PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      PhysicalDevice::getImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 & imageFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR &&
                          "Function <vkGetPhysicalDeviceImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      ImageFormatProperties2 &   imageFormatProperties = structureChain.template get<ImageFormatProperties2>();
-      Result                     result                = static_cast<Result>(
+      StructureChain<X, Y, Z...>                     structureChain;
+      VULKAN_HPP_NAMESPACE::ImageFormatProperties2 & imageFormatProperties = structureChain.template get<VULKAN_HPP_NAMESPACE::ImageFormatProperties2>();
+      VULKAN_HPP_NAMESPACE::Result                   result                = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                        reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( &imageFormatInfo ),
                                                                        reinterpret_cast<VkImageFormatProperties2 *>( &imageFormatProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getImageFormatProperties2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<QueueFamilyProperties2> PhysicalDevice::getQueueFamilyProperties2KHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> PhysicalDevice::getQueueFamilyProperties2KHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR &&
                          "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<QueueFamilyProperties2> queueFamilyProperties;
-      uint32_t                            queueFamilyPropertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+      uint32_t                                                  queueFamilyPropertyCount;
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &queueFamilyPropertyCount, nullptr );
       queueFamilyProperties.resize( queueFamilyPropertyCount );
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
@@ -19897,23 +16461,21 @@ namespace VULKAN_HPP_NAMESPACE
       return queueFamilyProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyProperties2KHR.html
     template <typename StructureChain>
     VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain> PhysicalDevice::getQueueFamilyProperties2KHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR &&
                          "Function <vkGetPhysicalDeviceQueueFamilyProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<StructureChain>         structureChains;
-      std::vector<QueueFamilyProperties2> queueFamilyProperties;
-      uint32_t                            queueFamilyPropertyCount;
+      std::vector<StructureChain>                               structureChains;
+      std::vector<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2> queueFamilyProperties;
+      uint32_t                                                  queueFamilyPropertyCount;
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &queueFamilyPropertyCount, nullptr );
       structureChains.resize( queueFamilyPropertyCount );
       queueFamilyProperties.resize( queueFamilyPropertyCount );
       for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
       {
-        queueFamilyProperties[i].pNext = structureChains[i].template get<QueueFamilyProperties2>().pNext;
+        queueFamilyProperties[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>().pNext;
       }
       getDispatcher()->vkGetPhysicalDeviceQueueFamilyProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                      &queueFamilyPropertyCount,
@@ -19926,52 +16488,48 @@ namespace VULKAN_HPP_NAMESPACE
       }
       for ( uint32_t i = 0; i < queueFamilyPropertyCount; i++ )
       {
-        structureChains[i].template get<QueueFamilyProperties2>() = queueFamilyProperties[i];
+        structureChains[i].template get<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2>() = queueFamilyProperties[i];
       }
       return structureChains;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PhysicalDeviceMemoryProperties2 PhysicalDevice::getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2
+                                           PhysicalDevice::getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMemoryProperties2KHR &&
                          "Function <vkGetPhysicalDeviceMemoryProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      PhysicalDeviceMemoryProperties2 memoryProperties;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 memoryProperties;
       getDispatcher()->vkGetPhysicalDeviceMemoryProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                 reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
       return memoryProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMemoryProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMemoryProperties2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getMemoryProperties2KHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMemoryProperties2KHR &&
                          "Function <vkGetPhysicalDeviceMemoryProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>        structureChain;
-      PhysicalDeviceMemoryProperties2 & memoryProperties = structureChain.template get<PhysicalDeviceMemoryProperties2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>        structureChain;
+      VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 & memoryProperties =
+        structureChain.template get<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2>();
       getDispatcher()->vkGetPhysicalDeviceMemoryProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                 reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( &memoryProperties ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSparseImageFormatProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSparseImageFormatProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageFormatProperties2>
-                                           PhysicalDevice::getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2>
+      PhysicalDevice::getSparseImageFormatProperties2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 & formatInfo ) const
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties2KHR &&
         "Function <vkGetPhysicalDeviceSparseImageFormatProperties2KHR> requires <VK_KHR_get_physical_device_properties2> or <VK_VERSION_1_1>" );
 
-      std::vector<SparseImageFormatProperties2> properties;
-      uint32_t                                  propertyCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2> properties;
+      uint32_t                                                        propertyCount;
       getDispatcher()->vkGetPhysicalDeviceSparseImageFormatProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                            reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( &formatInfo ),
                                                                            &propertyCount,
@@ -19992,16 +16550,13 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_device_group ===
 
-    // wrapper function for command vkGetDeviceGroupPeerMemoryFeaturesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupPeerMemoryFeaturesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE PeerMemoryFeatureFlags Device::getGroupPeerMemoryFeaturesKHR( uint32_t heapIndex,
-                                                                                                         uint32_t localDeviceIndex,
-                                                                                                         uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags
+      Device::getGroupPeerMemoryFeaturesKHR( uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceGroupPeerMemoryFeaturesKHR &&
                          "Function <vkGetDeviceGroupPeerMemoryFeaturesKHR> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
 
-      PeerMemoryFeatureFlags peerMemoryFeatures;
+      VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags peerMemoryFeatures;
       getDispatcher()->vkGetDeviceGroupPeerMemoryFeaturesKHR( static_cast<VkDevice>( m_device ),
                                                               heapIndex,
                                                               localDeviceIndex,
@@ -20011,7 +16566,6 @@ namespace VULKAN_HPP_NAMESPACE
       return peerMemoryFeatures;
     }
 
-    // wrapper function for command vkCmdSetDeviceMaskKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDeviceMaskKHR.html
     VULKAN_HPP_INLINE void CommandBuffer::setDeviceMaskKHR( uint32_t deviceMask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDeviceMaskKHR && "Function <vkCmdSetDeviceMaskKHR> requires <VK_KHR_device_group> or <VK_VERSION_1_1>" );
@@ -20019,7 +16573,6 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDeviceMaskKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), deviceMask );
     }
 
-    // wrapper function for command vkCmdDispatchBaseKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchBaseKHR.html
     VULKAN_HPP_INLINE void CommandBuffer::dispatchBaseKHR( uint32_t baseGroupX,
                                                            uint32_t baseGroupY,
                                                            uint32_t baseGroupZ,
@@ -20036,25 +16589,34 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_VI_NN )
     //=== VK_NN_vi_surface ===
 
-    // wrapper function for command vkCreateViSurfaceNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateViSurfaceNN.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createViSurfaceNN( ViSurfaceCreateInfoNN const &       createInfo,
-                                   Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createViSurfaceNN( VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN const &                             createInfo,
+                                   VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateViSurfaceNN( static_cast<VkInstance>( m_instance ),
-                                                                                 reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createViSurfaceNN" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateViSurfaceNN(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkViSurfaceCreateInfoNN *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createViSurfaceNN" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_VI_NN*/
 
     //=== VK_KHR_maintenance1 ===
 
-    // wrapper function for command vkTrimCommandPoolKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTrimCommandPoolKHR.html
-    VULKAN_HPP_INLINE void CommandPool::trimKHR( CommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandPool::trimKHR( VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags flags ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkTrimCommandPoolKHR && "Function <vkTrimCommandPoolKHR> requires <VK_KHR_maintenance1> or <VK_VERSION_1_1>" );
 
@@ -20064,50 +16626,45 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_device_group_creation ===
 
-    // wrapper function for command vkEnumeratePhysicalDeviceGroupsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceGroupsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceGroupProperties>>::type
-                         Instance::enumeratePhysicalDeviceGroupsKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> Instance::enumeratePhysicalDeviceGroupsKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceGroupsKHR &&
                          "Function <vkEnumeratePhysicalDeviceGroupsKHR> requires <VK_KHR_device_group_creation> or <VK_VERSION_1_1>" );
 
-      std::vector<PhysicalDeviceGroupProperties> physicalDeviceGroupProperties;
-      uint32_t                                   physicalDeviceGroupCount;
-      Result                                     result;
+      std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties> physicalDeviceGroupProperties;
+      uint32_t                                                         physicalDeviceGroupCount;
+      VULKAN_HPP_NAMESPACE::Result                                     result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkEnumeratePhysicalDeviceGroupsKHR( static_cast<VkInstance>( m_instance ), &physicalDeviceGroupCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && physicalDeviceGroupCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && physicalDeviceGroupCount )
         {
           physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceGroupsKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumeratePhysicalDeviceGroupsKHR(
             static_cast<VkInstance>( m_instance ),
             &physicalDeviceGroupCount,
             reinterpret_cast<VkPhysicalDeviceGroupProperties *>( physicalDeviceGroupProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Instance::enumeratePhysicalDeviceGroupsKHR" );
       VULKAN_HPP_ASSERT( physicalDeviceGroupCount <= physicalDeviceGroupProperties.size() );
       if ( physicalDeviceGroupCount < physicalDeviceGroupProperties.size() )
       {
         physicalDeviceGroupProperties.resize( physicalDeviceGroupCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( physicalDeviceGroupProperties ) );
+      return physicalDeviceGroupProperties;
     }
 
     //=== VK_KHR_external_memory_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalBufferPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalBufferPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalBufferProperties
-      PhysicalDevice::getExternalBufferPropertiesKHR( const PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalBufferProperties PhysicalDevice::getExternalBufferPropertiesKHR(
+      const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo & externalBufferInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalBufferPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceExternalBufferPropertiesKHR> requires <VK_KHR_external_memory_capabilities> or <VK_VERSION_1_1>" );
 
-      ExternalBufferProperties externalBufferProperties;
+      VULKAN_HPP_NAMESPACE::ExternalBufferProperties externalBufferProperties;
       getDispatcher()->vkGetPhysicalDeviceExternalBufferPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                        reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( &externalBufferInfo ),
                                                                        reinterpret_cast<VkExternalBufferProperties *>( &externalBufferProperties ) );
@@ -20118,82 +16675,76 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_memory_win32 ===
 
-    // wrapper function for command vkGetMemoryWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandleKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                         Device::getMemoryWin32HandleKHR( const MemoryGetWin32HandleInfoKHR & getWin32HandleInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE HANDLE
+      Device::getMemoryWin32HandleKHR( const VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR & getWin32HandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryWin32HandleKHR && "Function <vkGetMemoryWin32HandleKHR> requires <VK_KHR_external_memory_win32>" );
 
-      HANDLE handle;
-      Result result = static_cast<Result>( getDispatcher()->vkGetMemoryWin32HandleKHR(
+      HANDLE                       handle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetMemoryWin32HandleKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryWin32HandleKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandleKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
+      return handle;
     }
 
-    // wrapper function for command vkGetMemoryWin32HandlePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryWin32HandlePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryWin32HandlePropertiesKHR>::type
-                         Device::getMemoryWin32HandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR
+      Device::getMemoryWin32HandlePropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, HANDLE handle ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryWin32HandlePropertiesKHR &&
                          "Function <vkGetMemoryWin32HandlePropertiesKHR> requires <VK_KHR_external_memory_win32>" );
 
-      MemoryWin32HandlePropertiesKHR memoryWin32HandleProperties;
-      Result                         result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR memoryWin32HandleProperties;
+      VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetMemoryWin32HandlePropertiesKHR( static_cast<VkDevice>( m_device ),
                                                               static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                               handle,
                                                               reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( &memoryWin32HandleProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryWin32HandlePropertiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryWin32HandlePropertiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryWin32HandleProperties ) );
+      return memoryWin32HandleProperties;
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_memory_fd ===
 
-    // wrapper function for command vkGetMemoryFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getMemoryFdKHR( const MemoryGetFdInfoKHR & getFdInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE int Device::getMemoryFdKHR( const VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR & getFdInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryFdKHR && "Function <vkGetMemoryFdKHR> requires <VK_KHR_external_memory_fd>" );
 
-      int    fd;
-      Result result = static_cast<Result>(
+      int                          fd;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetMemoryFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryFdKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
+      return fd;
     }
 
-    // wrapper function for command vkGetMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryFdPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryFdPropertiesKHR>::type
-                         Device::getMemoryFdPropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, int fd ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR
+                                           Device::getMemoryFdPropertiesKHR( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, int fd ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryFdPropertiesKHR && "Function <vkGetMemoryFdPropertiesKHR> requires <VK_KHR_external_memory_fd>" );
 
-      MemoryFdPropertiesKHR memoryFdProperties;
-      Result                result = static_cast<Result>( getDispatcher()->vkGetMemoryFdPropertiesKHR( static_cast<VkDevice>( m_device ),
-                                                                                        static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                                                        fd,
-                                                                                        reinterpret_cast<VkMemoryFdPropertiesKHR *>( &memoryFdProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryFdPropertiesKHR" );
+      VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR memoryFdProperties;
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetMemoryFdPropertiesKHR( static_cast<VkDevice>( m_device ),
+                                                     static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
+                                                     fd,
+                                                     reinterpret_cast<VkMemoryFdPropertiesKHR *>( &memoryFdProperties ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryFdPropertiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryFdProperties ) );
+      return memoryFdProperties;
     }
 
     //=== VK_KHR_external_semaphore_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalSemaphorePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalSemaphoreProperties
-      PhysicalDevice::getExternalSemaphorePropertiesKHR( const PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties PhysicalDevice::getExternalSemaphorePropertiesKHR(
+      const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo & externalSemaphoreInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR &&
                          "Function <vkGetPhysicalDeviceExternalSemaphorePropertiesKHR> requires <VK_KHR_external_semaphore_capabilities> or <VK_VERSION_1_1>" );
 
-      ExternalSemaphoreProperties externalSemaphoreProperties;
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties externalSemaphoreProperties;
       getDispatcher()->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ),
         reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( &externalSemaphoreInfo ),
@@ -20205,75 +16756,64 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_semaphore_win32 ===
 
-    // wrapper function for command vkImportSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreWin32HandleKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::importSemaphoreWin32HandleKHR( const ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo ) const
+    VULKAN_HPP_INLINE void
+      Device::importSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR & importSemaphoreWin32HandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkImportSemaphoreWin32HandleKHR &&
                          "Function <vkImportSemaphoreWin32HandleKHR> requires <VK_KHR_external_semaphore_win32>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkImportSemaphoreWin32HandleKHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkImportSemaphoreWin32HandleKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreWin32HandleInfoKHR *>( &importSemaphoreWin32HandleInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::importSemaphoreWin32HandleKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreWin32HandleKHR" );
     }
 
-    // wrapper function for command vkGetSemaphoreWin32HandleKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreWin32HandleKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                         Device::getSemaphoreWin32HandleKHR( const SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE HANDLE
+      Device::getSemaphoreWin32HandleKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR & getWin32HandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreWin32HandleKHR &&
                          "Function <vkGetSemaphoreWin32HandleKHR> requires <VK_KHR_external_semaphore_win32>" );
 
-      HANDLE handle;
-      Result result = static_cast<Result>( getDispatcher()->vkGetSemaphoreWin32HandleKHR(
+      HANDLE                       handle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSemaphoreWin32HandleKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getSemaphoreWin32HandleKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreWin32HandleKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
+      return handle;
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_semaphore_fd ===
 
-    // wrapper function for command vkImportSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreFdKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::importSemaphoreFdKHR( const ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo ) const
+    VULKAN_HPP_INLINE void Device::importSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR & importSemaphoreFdInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkImportSemaphoreFdKHR && "Function <vkImportSemaphoreFdKHR> requires <VK_KHR_external_semaphore_fd>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkImportSemaphoreFdKHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkImportSemaphoreFdKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( &importSemaphoreFdInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::importSemaphoreFdKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreFdKHR" );
     }
 
-    // wrapper function for command vkGetSemaphoreFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreFdKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getSemaphoreFdKHR( const SemaphoreGetFdInfoKHR & getFdInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE int Device::getSemaphoreFdKHR( const VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR & getFdInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreFdKHR && "Function <vkGetSemaphoreFdKHR> requires <VK_KHR_external_semaphore_fd>" );
 
-      int    fd;
-      Result result = static_cast<Result>(
+      int                          fd;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetSemaphoreFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getSemaphoreFdKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreFdKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
+      return fd;
     }
 
     //=== VK_KHR_push_descriptor ===
 
-    // wrapper function for command vkCmdPushDescriptorSetKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetKHR( PipelineBindPoint                            pipelineBindPoint,
-                                                                VULKAN_HPP_NAMESPACE::PipelineLayout         layout,
-                                                                uint32_t                                     set,
-                                                                ArrayProxy<const WriteDescriptorSet> const & descriptorWrites ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetKHR(
+      VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                  pipelineBindPoint,
+      VULKAN_HPP_NAMESPACE::PipelineLayout                                                     layout,
+      uint32_t                                                                                 set,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSetKHR &&
-                         "Function <vkCmdPushDescriptorSetKHR> requires <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSetKHR && "Function <vkCmdPushDescriptorSetKHR> requires <VK_KHR_push_descriptor>" );
 
       getDispatcher()->vkCmdPushDescriptorSetKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
                                                   static_cast<VkPipelineBindPoint>( pipelineBindPoint ),
@@ -20283,17 +16823,14 @@ namespace VULKAN_HPP_NAMESPACE
                                                   reinterpret_cast<const VkWriteDescriptorSet *>( descriptorWrites.data() ) );
     }
 
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplateKHR.html
     template <typename DataType>
     VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
                                                                             VULKAN_HPP_NAMESPACE::PipelineLayout           layout,
                                                                             uint32_t                                       set,
                                                                             DataType const &                               data ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT(
-        getDispatcher()->vkCmdPushDescriptorSetWithTemplateKHR &&
-        "Function <vkCmdPushDescriptorSetWithTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSetWithTemplateKHR &&
+                         "Function <vkCmdPushDescriptorSetWithTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_KHR_push_descriptor>" );
 
       getDispatcher()->vkCmdPushDescriptorSetWithTemplateKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
                                                               static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
@@ -20304,10 +16841,8 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_conditional_rendering ===
 
-    // wrapper function for command vkCmdBeginConditionalRenderingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginConditionalRenderingEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::beginConditionalRenderingEXT( const ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginConditionalRenderingEXT(
+      const VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT & conditionalRenderingBegin ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginConditionalRenderingEXT &&
                          "Function <vkCmdBeginConditionalRenderingEXT> requires <VK_EXT_conditional_rendering>" );
@@ -20316,8 +16851,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                           reinterpret_cast<const VkConditionalRenderingBeginInfoEXT *>( &conditionalRenderingBegin ) );
     }
 
-    // wrapper function for command vkCmdEndConditionalRenderingEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndConditionalRenderingEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::endConditionalRenderingEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndConditionalRenderingEXT &&
@@ -20328,38 +16861,44 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_descriptor_update_template ===
 
-    // wrapper function for command vkCreateDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDescriptorUpdateTemplateKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DescriptorUpdateTemplate>::type
-                         Device::createDescriptorUpdateTemplateKHR( DescriptorUpdateTemplateCreateInfo const & createInfo,
-                                                 Optional<const AllocationCallbacks>        allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate>::Type
+      Device::createDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const &                createInfo,
+                                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate;
-      Result                                         result = static_cast<Result>(
-        getDispatcher()->vkCreateDescriptorUpdateTemplateKHR( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDescriptorUpdateTemplateKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DescriptorUpdateTemplate( *this, *reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDescriptorUpdateTemplateKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createDescriptorUpdateTemplateKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DescriptorUpdateTemplate(
+        *this, *reinterpret_cast<VkDescriptorUpdateTemplate *>( &descriptorUpdateTemplate ), allocator );
     }
 
-    // wrapper function for command vkDestroyDescriptorUpdateTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyDescriptorUpdateTemplateKHR.html
-    VULKAN_HPP_INLINE void Device::destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
-                                                                       Optional<const AllocationCallbacks>            allocator ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      Device::destroyDescriptorUpdateTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate            descriptorUpdateTemplate,
+                                                  Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDestroyDescriptorUpdateTemplateKHR &&
                          "Function <vkDestroyDescriptorUpdateTemplateKHR> requires <VK_KHR_descriptor_update_template> or <VK_VERSION_1_1>" );
 
-      getDispatcher()->vkDestroyDescriptorUpdateTemplateKHR( static_cast<VkDevice>( m_device ),
-                                                             static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
-                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      getDispatcher()->vkDestroyDescriptorUpdateTemplateKHR(
+        static_cast<VkDevice>( m_device ),
+        static_cast<VkDescriptorUpdateTemplate>( descriptorUpdateTemplate ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
     }
 
-    // wrapper function for command vkUpdateDescriptorSetWithTemplateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateDescriptorSetWithTemplateKHR.html
     template <typename DataType>
     VULKAN_HPP_INLINE void DescriptorSet::updateWithTemplateKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate,
                                                                  DataType const &                               data ) const VULKAN_HPP_NOEXCEPT
@@ -20375,9 +16914,9 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_clip_space_w_scaling ===
 
-    // wrapper function for command vkCmdSetViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingNV( uint32_t                                     firstViewport,
-                                                                 ArrayProxy<const ViewportWScalingNV> const & viewportWScalings ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingNV(
+      uint32_t                                                                                 firstViewport,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportWScalingNV && "Function <vkCmdSetViewportWScalingNV> requires <VK_NV_clip_space_w_scaling>" );
 
@@ -20390,202 +16929,178 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
     //=== VK_EXT_acquire_xlib_display ===
 
-    // wrapper function for command vkAcquireXlibDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireXlibDisplayEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type PhysicalDevice::acquireXlibDisplayEXT( Display &                        dpy,
-                                                                                                  VULKAN_HPP_NAMESPACE::DisplayKHR display ) const
+    VULKAN_HPP_INLINE void PhysicalDevice::acquireXlibDisplayEXT( Display & dpy, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireXlibDisplayEXT && "Function <vkAcquireXlibDisplayEXT> requires <VK_EXT_acquire_xlib_display>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkAcquireXlibDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), &dpy, static_cast<VkDisplayKHR>( display ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::acquireXlibDisplayEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireXlibDisplayEXT" );
     }
 
-    // wrapper function for command vkGetRandROutputDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRandROutputDisplayEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type
-                         PhysicalDevice::getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                        PhysicalDevice::getRandROutputDisplayEXT( Display & dpy, RROutput rrOutput ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DisplayKHR display;
-      Result                           result = static_cast<Result>( getDispatcher()->vkGetRandROutputDisplayEXT(
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRandROutputDisplayEXT(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), &dpy, rrOutput, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getRandROutputDisplayEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "PhysicalDevice::getRandROutputDisplayEXT" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) );
     }
 #  endif /*VK_USE_PLATFORM_XLIB_XRANDR_EXT*/
 
     //=== VK_EXT_display_surface_counter ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2EXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilities2EXT>::type
-                         PhysicalDevice::getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT
+                                           PhysicalDevice::getSurfaceCapabilities2EXT( VULKAN_HPP_NAMESPACE::SurfaceKHR surface ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2EXT &&
                          "Function <vkGetPhysicalDeviceSurfaceCapabilities2EXT> requires <VK_EXT_display_surface_counter>" );
 
-      SurfaceCapabilities2EXT surfaceCapabilities;
-      Result                  result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT surfaceCapabilities;
+      VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2EXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                      static_cast<VkSurfaceKHR>( surface ),
                                                                      reinterpret_cast<VkSurfaceCapabilities2EXT *>( &surfaceCapabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2EXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2EXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+      return surfaceCapabilities;
     }
 
     //=== VK_EXT_display_control ===
 
-    // wrapper function for command vkDisplayPowerControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDisplayPowerControlEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR display,
-                                                                                           const DisplayPowerInfoEXT &      displayPowerInfo ) const
+    VULKAN_HPP_INLINE void Device::displayPowerControlEXT( VULKAN_HPP_NAMESPACE::DisplayKHR                  display,
+                                                           const VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT & displayPowerInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDisplayPowerControlEXT && "Function <vkDisplayPowerControlEXT> requires <VK_EXT_display_control>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkDisplayPowerControlEXT(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkDisplayPowerControlEXT(
         static_cast<VkDevice>( m_device ), static_cast<VkDisplayKHR>( display ), reinterpret_cast<const VkDisplayPowerInfoEXT *>( &displayPowerInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::displayPowerControlEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::displayPowerControlEXT" );
     }
 
-    // wrapper function for command vkRegisterDeviceEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDeviceEventEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type
-                         Device::registerEventEXT( DeviceEventInfoEXT const &          deviceEventInfo,
-                                Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                        Device::registerEventEXT( VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT const &                                deviceEventInfo,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
-      VULKAN_HPP_NAMESPACE::Fence fence;
-      Result                      result = static_cast<Result>( getDispatcher()->vkRegisterDeviceEventEXT( static_cast<VkDevice>( m_device ),
-                                                                                      reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
-                                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                      reinterpret_cast<VkFence *>( &fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::registerEventEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator ) );
-    }
-
-    // wrapper function for command vkRegisterDisplayEventEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkRegisterDisplayEventEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Fence>::type
-                         Device::registerDisplayEventEXT( DisplayKHR const &                  display,
-                                       DisplayEventInfoEXT const &         displayEventInfo,
-                                       Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::Fence fence;
-      Result                      result = static_cast<Result>( getDispatcher()->vkRegisterDisplayEventEXT( static_cast<VkDevice>( m_device ),
-                                                                                       static_cast<VkDisplayKHR>( *display ),
-                                                                                       reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
-                                                                                       reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                       reinterpret_cast<VkFence *>( &fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::registerDisplayEventEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator ) );
-    }
-
-    // wrapper function for command vkGetSwapchainCounterEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainCounterEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<uint64_t>
+      VULKAN_HPP_NAMESPACE::Fence  fence;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkRegisterDeviceEventEXT(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkDeviceEventInfoEXT *>( &deviceEventInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkFence *>( &fence ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
 #  else
-      typename ResultValueType<uint64_t>::type
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::registerEventEXT" );
 #  endif
-      SwapchainKHR::getCounterEXT( SurfaceCounterFlagBitsEXT counter ) const
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence>::Type
+                        Device::registerDisplayEventEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR const &             display,
+                                       VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT const &                               displayEventInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
+    {
+      VULKAN_HPP_NAMESPACE::Fence  fence;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkRegisterDisplayEventEXT(
+        static_cast<VkDevice>( m_device ),
+        static_cast<VkDisplayKHR>( *display ),
+        reinterpret_cast<const VkDisplayEventInfoEXT *>( &displayEventInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkFence *>( &fence ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::registerDisplayEventEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Fence( *this, *reinterpret_cast<VkFence *>( &fence ), allocator );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t SwapchainKHR::getCounterEXT( VULKAN_HPP_NAMESPACE::SurfaceCounterFlagBitsEXT counter ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainCounterEXT && "Function <vkGetSwapchainCounterEXT> requires <VK_EXT_display_control>" );
 
-      uint64_t counterValue;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetSwapchainCounterEXT( static_cast<VkDevice>( m_device ),
-                                                                                      static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                                      static_cast<VkSurfaceCounterFlagBitsEXT>( counter ),
-                                                                                      &counterValue ) );
+      uint64_t                     counterValue;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSwapchainCounterEXT(
+        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), static_cast<VkSurfaceCounterFlagBitsEXT>( counter ), &counterValue ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getCounterEXT" );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getCounterEXT", { Result::eSuccess, Result::eErrorOutOfDateKHR } );
-#  else
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getCounterEXT" );
-#  endif
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      return ResultValue<uint64_t>( result, std::move( counterValue ) );
-#  else
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( counterValue ) );
-#  endif
+      return counterValue;
     }
 
     //=== VK_GOOGLE_display_timing ===
 
-    // wrapper function for command vkGetRefreshCycleDurationGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRefreshCycleDurationGOOGLE.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RefreshCycleDurationGOOGLE>::type SwapchainKHR::getRefreshCycleDurationGOOGLE() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE SwapchainKHR::getRefreshCycleDurationGOOGLE() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRefreshCycleDurationGOOGLE && "Function <vkGetRefreshCycleDurationGOOGLE> requires <VK_GOOGLE_display_timing>" );
 
-      RefreshCycleDurationGOOGLE displayTimingProperties;
-      Result                     result =
-        static_cast<Result>( getDispatcher()->vkGetRefreshCycleDurationGOOGLE( static_cast<VkDevice>( m_device ),
-                                                                               static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                               reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( &displayTimingProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getRefreshCycleDurationGOOGLE" );
+      VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE displayTimingProperties;
+      VULKAN_HPP_NAMESPACE::Result                     result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetRefreshCycleDurationGOOGLE( static_cast<VkDevice>( m_device ),
+                                                          static_cast<VkSwapchainKHR>( m_swapchain ),
+                                                          reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( &displayTimingProperties ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getRefreshCycleDurationGOOGLE" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( displayTimingProperties ) );
+      return displayTimingProperties;
     }
 
-    // wrapper function for command vkGetPastPresentationTimingGOOGLE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingGOOGLE.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      ResultValue<std::vector<PastPresentationTimingGOOGLE>>
-#  else
-      typename ResultValueType<std::vector<PastPresentationTimingGOOGLE>>::type
-#  endif
-      SwapchainKHR::getPastPresentationTimingGOOGLE() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE> SwapchainKHR::getPastPresentationTimingGOOGLE() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPastPresentationTimingGOOGLE &&
                          "Function <vkGetPastPresentationTimingGOOGLE> requires <VK_GOOGLE_display_timing>" );
 
-      std::vector<PastPresentationTimingGOOGLE> presentationTimings;
-      uint32_t                                  presentationTimingCount;
-      Result                                    result;
+      std::vector<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE> presentationTimings;
+      uint32_t                                                        presentationTimingCount;
+      VULKAN_HPP_NAMESPACE::Result                                    result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPastPresentationTimingGOOGLE(
-          static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), &presentationTimingCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && presentationTimingCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPastPresentationTimingGOOGLE(
+          static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), &presentationTimingCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentationTimingCount )
         {
           presentationTimings.resize( presentationTimingCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPastPresentationTimingGOOGLE( static_cast<VkDevice>( m_device ),
-                                                                static_cast<VkSwapchainKHR>( m_swapchainKHR ),
+                                                                static_cast<VkSwapchainKHR>( m_swapchain ),
                                                                 &presentationTimingCount,
                                                                 reinterpret_cast<VkPastPresentationTimingGOOGLE *>( presentationTimings.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getPastPresentationTimingGOOGLE",
-                                                 { Result::eSuccess, Result::eIncomplete, Result::eErrorOutOfDateKHR } );
-#  else
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getPastPresentationTimingGOOGLE" );
-#  endif
-
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getPastPresentationTimingGOOGLE" );
       VULKAN_HPP_ASSERT( presentationTimingCount <= presentationTimings.size() );
       if ( presentationTimingCount < presentationTimings.size() )
       {
         presentationTimings.resize( presentationTimingCount );
       }
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      return ResultValue<std::vector<PastPresentationTimingGOOGLE>>( result, std::move( presentationTimings ) );
-#  else
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentationTimings ) );
-#  endif
+      return presentationTimings;
     }
 
     //=== VK_EXT_discard_rectangles ===
 
-    // wrapper function for command vkCmdSetDiscardRectangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT( uint32_t                         firstDiscardRectangle,
-                                                                  ArrayProxy<const Rect2D> const & discardRectangles ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEXT(
+      uint32_t firstDiscardRectangle, VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDiscardRectangleEXT && "Function <vkCmdSetDiscardRectangleEXT> requires <VK_EXT_discard_rectangles>" );
 
@@ -20595,9 +17110,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                     reinterpret_cast<const VkRect2D *>( discardRectangles.data() ) );
     }
 
-    // wrapper function for command vkCmdSetDiscardRectangleEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEnableEXT( Bool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 discardRectangleEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDiscardRectangleEnableEXT &&
                          "Function <vkCmdSetDiscardRectangleEnableEXT> requires <VK_EXT_discard_rectangles>" );
@@ -20605,9 +17118,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDiscardRectangleEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( discardRectangleEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDiscardRectangleModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDiscardRectangleModeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDiscardRectangleModeEXT( DiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setDiscardRectangleModeEXT( VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT discardRectangleMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDiscardRectangleModeEXT &&
                          "Function <vkCmdSetDiscardRectangleModeEXT> requires <VK_EXT_discard_rectangles>" );
@@ -20618,9 +17130,8 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_hdr_metadata ===
 
-    // wrapper function for command vkSetHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetHdrMetadataEXT.html
-    VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains,
-                                                      ArrayProxy<const HdrMetadataEXT> const &                     metadata ) const
+    VULKAN_HPP_INLINE void Device::setHdrMetadataEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const &   swapchains,
+                                                      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HdrMetadataEXT> const & metadata ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetHdrMetadataEXT && "Function <vkSetHdrMetadataEXT> requires <VK_EXT_hdr_metadata>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -20640,23 +17151,32 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_create_renderpass2 ===
 
-    // wrapper function for command vkCreateRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRenderPass2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RenderPass>::type
-                         Device::createRenderPass2KHR( RenderPassCreateInfo2 const &       createInfo,
-                                    Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass>::Type
+                        Device::createRenderPass2KHR( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const &                             createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::RenderPass renderPass;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateRenderPass2KHR( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRenderPass2KHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRenderPass2KHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkRenderPassCreateInfo2 *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkRenderPass *>( &renderPass ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRenderPass2KHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::RenderPass( *this, *reinterpret_cast<VkRenderPass *>( &renderPass ), allocator );
     }
 
-    // wrapper function for command vkCmdBeginRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginRenderPass2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const RenderPassBeginInfo & renderPassBegin,
-                                                               const SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginRenderPass2KHR( const VULKAN_HPP_NAMESPACE::RenderPassBeginInfo & renderPassBegin,
+                                                               const VULKAN_HPP_NAMESPACE::SubpassBeginInfo &    subpassBeginInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginRenderPass2KHR &&
                          "Function <vkCmdBeginRenderPass2KHR> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
@@ -20666,9 +17186,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                  reinterpret_cast<const VkSubpassBeginInfo *>( &subpassBeginInfo ) );
     }
 
-    // wrapper function for command vkCmdNextSubpass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdNextSubpass2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const SubpassBeginInfo & subpassBeginInfo,
-                                                           const SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::nextSubpass2KHR( const VULKAN_HPP_NAMESPACE::SubpassBeginInfo & subpassBeginInfo,
+                                                           const VULKAN_HPP_NAMESPACE::SubpassEndInfo &   subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdNextSubpass2KHR && "Function <vkCmdNextSubpass2KHR> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
 
@@ -20677,8 +17196,7 @@ namespace VULKAN_HPP_NAMESPACE
                                              reinterpret_cast<const VkSubpassEndInfo *>( &subpassEndInfo ) );
     }
 
-    // wrapper function for command vkCmdEndRenderPass2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRenderPass2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::endRenderPass2KHR( const VULKAN_HPP_NAMESPACE::SubpassEndInfo & subpassEndInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRenderPass2KHR &&
                          "Function <vkCmdEndRenderPass2KHR> requires <VK_KHR_create_renderpass2> or <VK_VERSION_1_2>" );
@@ -20688,36 +17206,28 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_shared_presentable_image ===
 
-    // wrapper function for command vkGetSwapchainStatusKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainStatusKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result SwapchainKHR::getStatus() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result SwapchainKHR::getStatus() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainStatusKHR && "Function <vkGetSwapchainStatusKHR> requires <VK_KHR_shared_presentable_image>" );
 
-      Result result =
-        static_cast<Result>( getDispatcher()->vkGetSwapchainStatusKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ) ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetSwapchainStatusKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                                 VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::getStatus",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getStatus", { Result::eSuccess, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getStatus", { Result::eSuccess, Result::eSuboptimalKHR } );
-#  endif
-
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
     //=== VK_KHR_external_fence_capabilities ===
 
-    // wrapper function for command vkGetPhysicalDeviceExternalFencePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalFencePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalFenceProperties
-      PhysicalDevice::getExternalFencePropertiesKHR( const PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExternalFenceProperties
+      PhysicalDevice::getExternalFencePropertiesKHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo & externalFenceInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalFencePropertiesKHR &&
                          "Function <vkGetPhysicalDeviceExternalFencePropertiesKHR> requires <VK_KHR_external_fence_capabilities> or <VK_VERSION_1_1>" );
 
-      ExternalFenceProperties externalFenceProperties;
+      VULKAN_HPP_NAMESPACE::ExternalFenceProperties externalFenceProperties;
       getDispatcher()->vkGetPhysicalDeviceExternalFencePropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                       reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( &externalFenceInfo ),
                                                                       reinterpret_cast<VkExternalFenceProperties *>( &externalFenceProperties ) );
@@ -20728,107 +17238,94 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_KHR_external_fence_win32 ===
 
-    // wrapper function for command vkImportFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceWin32HandleKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::importFenceWin32HandleKHR( const ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo ) const
+    VULKAN_HPP_INLINE void Device::importFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR & importFenceWin32HandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkImportFenceWin32HandleKHR && "Function <vkImportFenceWin32HandleKHR> requires <VK_KHR_external_fence_win32>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkImportFenceWin32HandleKHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkImportFenceWin32HandleKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportFenceWin32HandleInfoKHR *>( &importFenceWin32HandleInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::importFenceWin32HandleKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceWin32HandleKHR" );
     }
 
-    // wrapper function for command vkGetFenceWin32HandleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceWin32HandleKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<HANDLE>::type
-                         Device::getFenceWin32HandleKHR( const FenceGetWin32HandleInfoKHR & getWin32HandleInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE HANDLE
+      Device::getFenceWin32HandleKHR( const VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR & getWin32HandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetFenceWin32HandleKHR && "Function <vkGetFenceWin32HandleKHR> requires <VK_KHR_external_fence_win32>" );
 
-      HANDLE handle;
-      Result result = static_cast<Result>( getDispatcher()->vkGetFenceWin32HandleKHR(
+      HANDLE                       handle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetFenceWin32HandleKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( &getWin32HandleInfo ), &handle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getFenceWin32HandleKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceWin32HandleKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
+      return handle;
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_KHR_external_fence_fd ===
 
-    // wrapper function for command vkImportFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportFenceFdKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::importFenceFdKHR( const ImportFenceFdInfoKHR & importFenceFdInfo ) const
+    VULKAN_HPP_INLINE void Device::importFenceFdKHR( const VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR & importFenceFdInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkImportFenceFdKHR && "Function <vkImportFenceFdKHR> requires <VK_KHR_external_fence_fd>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkImportFenceFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportFenceFdInfoKHR *>( &importFenceFdInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::importFenceFdKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importFenceFdKHR" );
     }
 
-    // wrapper function for command vkGetFenceFdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFenceFdKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int>::type Device::getFenceFdKHR( const FenceGetFdInfoKHR & getFdInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE int Device::getFenceFdKHR( const VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR & getFdInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetFenceFdKHR && "Function <vkGetFenceFdKHR> requires <VK_KHR_external_fence_fd>" );
 
-      int    fd;
-      Result result = static_cast<Result>(
+      int                          fd;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetFenceFdKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkFenceGetFdInfoKHR *>( &getFdInfo ), &fd ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getFenceFdKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getFenceFdKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fd ) );
+      return fd;
     }
 
     //=== VK_KHR_performance_query ===
 
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-      typename ResultValueType<std::pair<std::vector<PerformanceCounterKHR>, std::vector<PerformanceCounterDescriptionKHR>>>::type
-      PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t queueFamilyIndex ) const
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>, std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>>
+                        PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR( uint32_t queueFamilyIndex ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR &&
                          "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR> requires <VK_KHR_performance_query>" );
 
-      std::pair<std::vector<PerformanceCounterKHR>, std::vector<PerformanceCounterDescriptionKHR>> data_;
-      std::vector<PerformanceCounterKHR> &                                                         counters            = data_.first;
-      std::vector<PerformanceCounterDescriptionKHR> &                                              counterDescriptions = data_.second;
-      uint32_t                                                                                     counterCount;
-      Result                                                                                       result;
+      std::pair<std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR>, std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR>> data_;
+      std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR> &            counters            = data_.first;
+      std::vector<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR> & counterDescriptions = data_.second;
+      uint32_t                                                              counterCount;
+      VULKAN_HPP_NAMESPACE::Result                                          result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-        if ( ( result == Result::eSuccess ) && counterCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && counterCount )
         {
           counters.resize( counterCount );
           counterDescriptions.resize( counterCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ),
             queueFamilyIndex,
             &counterCount,
             reinterpret_cast<VkPerformanceCounterKHR *>( counters.data() ),
             reinterpret_cast<VkPerformanceCounterDescriptionKHR *>( counterDescriptions.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceQueryCountersKHR" );
       VULKAN_HPP_ASSERT( counterCount <= counters.size() );
       if ( counterCount < counters.size() )
       {
         counters.resize( counterCount );
         counterDescriptions.resize( counterCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t
-      PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR( const QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR(
+      const VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR & performanceQueryCreateInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR &&
                          "Function <vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR> requires <VK_KHR_performance_query>" );
@@ -20842,19 +17339,15 @@ namespace VULKAN_HPP_NAMESPACE
       return numPasses;
     }
 
-    // wrapper function for command vkAcquireProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireProfilingLockKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::acquireProfilingLockKHR( const AcquireProfilingLockInfoKHR & info ) const
+    VULKAN_HPP_INLINE void Device::acquireProfilingLockKHR( const VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireProfilingLockKHR && "Function <vkAcquireProfilingLockKHR> requires <VK_KHR_performance_query>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkAcquireProfilingLockKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( &info ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::acquireProfilingLockKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::acquireProfilingLockKHR" );
     }
 
-    // wrapper function for command vkReleaseProfilingLockKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseProfilingLockKHR.html
     VULKAN_HPP_INLINE void Device::releaseProfilingLockKHR() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseProfilingLockKHR && "Function <vkReleaseProfilingLockKHR> requires <VK_KHR_performance_query>" );
@@ -20863,130 +17356,110 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     //=== VK_KHR_get_surface_capabilities2 ===
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::getSurfaceCapabilities2KHR(
-      const PhysicalDeviceSurfaceInfo2KHR * pSurfaceInfo, SurfaceCapabilities2KHR * pSurfaceCapabilities ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR &&
-                         "Function <vkGetPhysicalDeviceSurfaceCapabilities2KHR> requires <VK_KHR_get_surface_capabilities2>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                     reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( pSurfaceInfo ),
-                                                                     reinterpret_cast<VkSurfaceCapabilities2KHR *>( pSurfaceCapabilities ) ) );
-    }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceCapabilities2KHR>::type
-                         PhysicalDevice::getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR
+      PhysicalDevice::getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR &&
                          "Function <vkGetPhysicalDeviceSurfaceCapabilities2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 
-      SurfaceCapabilities2KHR surfaceCapabilities;
-      Result                  result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR surfaceCapabilities;
+      VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                      reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                      reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceCapabilities ) );
+      return surfaceCapabilities;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         PhysicalDevice::getSurfaceCapabilities2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      PhysicalDevice::getSurfaceCapabilities2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR &&
                          "Function <vkGetPhysicalDeviceSurfaceCapabilities2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SurfaceCapabilities2KHR &  surfaceCapabilities = structureChain.template get<SurfaceCapabilities2KHR>();
-      Result                     result              = static_cast<Result>(
+      StructureChain<X, Y, Z...>                      structureChain;
+      VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR & surfaceCapabilities = structureChain.template get<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR>();
+      VULKAN_HPP_NAMESPACE::Result                    result              = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetPhysicalDeviceSurfaceCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                      reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                      reinterpret_cast<VkSurfaceCapabilities2KHR *>( &surfaceCapabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceCapabilities2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<SurfaceFormat2KHR>>::type
-                         PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>
+      PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR &&
                          "Function <vkGetPhysicalDeviceSurfaceFormats2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 
-      std::vector<SurfaceFormat2KHR> surfaceFormats;
-      uint32_t                       surfaceFormatCount;
-      Result                         result;
+      std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR> surfaceFormats;
+      uint32_t                                             surfaceFormatCount;
+      VULKAN_HPP_NAMESPACE::Result                         result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                   &surfaceFormatCount,
                                                                   nullptr ) );
-        if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
         {
           surfaceFormats.resize( surfaceFormatCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                     &surfaceFormatCount,
                                                                     reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
       VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
       if ( surfaceFormatCount < surfaceFormats.size() )
       {
         surfaceFormats.resize( surfaceFormatCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( surfaceFormats ) );
+      return surfaceFormats;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceSurfaceFormats2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html
     template <typename StructureChain>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain>>::type
-                         PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<StructureChain>
+      PhysicalDevice::getSurfaceFormats2KHR( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR &&
                          "Function <vkGetPhysicalDeviceSurfaceFormats2KHR> requires <VK_KHR_get_surface_capabilities2>" );
 
-      std::vector<StructureChain>    structureChains;
-      std::vector<SurfaceFormat2KHR> surfaceFormats;
-      uint32_t                       surfaceFormatCount;
-      Result                         result;
+      std::vector<StructureChain>                          structureChains;
+      std::vector<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR> surfaceFormats;
+      uint32_t                                             surfaceFormatCount;
+      VULKAN_HPP_NAMESPACE::Result                         result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                   &surfaceFormatCount,
                                                                   nullptr ) );
-        if ( ( result == Result::eSuccess ) && surfaceFormatCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && surfaceFormatCount )
         {
           structureChains.resize( surfaceFormatCount );
           surfaceFormats.resize( surfaceFormatCount );
           for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
           {
-            surfaceFormats[i].pNext = structureChains[i].template get<SurfaceFormat2KHR>().pNext;
+            surfaceFormats[i].pNext = structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>().pNext;
           }
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPhysicalDeviceSurfaceFormats2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                     &surfaceFormatCount,
                                                                     reinterpret_cast<VkSurfaceFormat2KHR *>( surfaceFormats.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfaceFormats2KHR" );
       VULKAN_HPP_ASSERT( surfaceFormatCount <= surfaceFormats.size() );
       if ( surfaceFormatCount < surfaceFormats.size() )
       {
@@ -20994,274 +17467,199 @@ namespace VULKAN_HPP_NAMESPACE
       }
       for ( uint32_t i = 0; i < surfaceFormatCount; i++ )
       {
-        structureChains[i].template get<SurfaceFormat2KHR>() = surfaceFormats[i];
+        structureChains[i].template get<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR>() = surfaceFormats[i];
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChains ) );
+      return structureChains;
     }
 
     //=== VK_KHR_get_display_properties2 ===
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayProperties2KHR>>::type PhysicalDevice::getDisplayProperties2KHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR> PhysicalDevice::getDisplayProperties2KHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceDisplayProperties2KHR &&
                          "Function <vkGetPhysicalDeviceDisplayProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 
-      std::vector<DisplayProperties2KHR> properties;
-      uint32_t                           propertyCount;
-      Result                             result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR> properties;
+      uint32_t                                                 propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                             result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceDisplayProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceDisplayProperties2KHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceDisplayProperties2KHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkDisplayProperties2KHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayProperties2KHR" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceDisplayPlaneProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDisplayPlaneProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayPlaneProperties2KHR>>::type
-                         PhysicalDevice::getDisplayPlaneProperties2KHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR> PhysicalDevice::getDisplayPlaneProperties2KHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceDisplayPlaneProperties2KHR &&
                          "Function <vkGetPhysicalDeviceDisplayPlaneProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 
-      std::vector<DisplayPlaneProperties2KHR> properties;
-      uint32_t                                propertyCount;
-      Result                                  result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR> properties;
+      uint32_t                                                      propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                  result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceDisplayPlaneProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceDisplayPlaneProperties2KHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkDisplayPlaneProperties2KHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneProperties2KHR" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DisplayModeProperties2KHR>>::type DisplayKHR::getModeProperties2() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR> DisplayKHR::getModeProperties2() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDisplayModeProperties2KHR &&
                          "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
 
-      std::vector<DisplayModeProperties2KHR> properties;
-      uint32_t                               propertyCount;
-      Result                                 result;
+      std::vector<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR> properties;
+      uint32_t                                                     propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                 result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetDisplayModeProperties2KHR(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_displayKHR ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDisplayModeProperties2KHR(
+          static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_display ), &propertyCount, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result =
-            static_cast<Result>( getDispatcher()->vkGetDisplayModeProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                  static_cast<VkDisplayKHR>( m_displayKHR ),
-                                                                                  &propertyCount,
-                                                                                  reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetDisplayModeProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                             static_cast<VkDisplayKHR>( m_display ),
+                                                             &propertyCount,
+                                                             reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayKHR::getModeProperties2" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DisplayKHR::getModeProperties2" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetDisplayModeProperties2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayModeProperties2KHR.html
-    template <typename StructureChain>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<StructureChain>>::type DisplayKHR::getModeProperties2() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDisplayModeProperties2KHR &&
-                         "Function <vkGetDisplayModeProperties2KHR> requires <VK_KHR_get_display_properties2>" );
-
-      std::vector<StructureChain>            structureChains;
-      std::vector<DisplayModeProperties2KHR> properties;
-      uint32_t                               propertyCount;
-      Result                                 result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkGetDisplayModeProperties2KHR(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_displayKHR ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
-        {
-          structureChains.resize( propertyCount );
-          properties.resize( propertyCount );
-          for ( uint32_t i = 0; i < propertyCount; i++ )
-          {
-            properties[i].pNext = structureChains[i].template get<DisplayModeProperties2KHR>().pNext;
-          }
-          result =
-            static_cast<Result>( getDispatcher()->vkGetDisplayModeProperties2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                  static_cast<VkDisplayKHR>( m_displayKHR ),
-                                                                                  &propertyCount,
-                                                                                  reinterpret_cast<VkDisplayModeProperties2KHR *>( properties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayKHR::getModeProperties2" );
-      VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-      if ( propertyCount < properties.size() )
-      {
-        structureChains.resize( propertyCount );
-      }
-      for ( uint32_t i = 0; i < propertyCount; i++ )
-      {
-        structureChains[i].template get<DisplayModeProperties2KHR>() = properties[i];
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChains ) );
-    }
-
-    // wrapper function for command vkGetDisplayPlaneCapabilities2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDisplayPlaneCapabilities2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayPlaneCapabilities2KHR>::type
-                         PhysicalDevice::getDisplayPlaneCapabilities2KHR( const DisplayPlaneInfo2KHR & displayPlaneInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR
+      PhysicalDevice::getDisplayPlaneCapabilities2KHR( const VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR & displayPlaneInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDisplayPlaneCapabilities2KHR &&
                          "Function <vkGetDisplayPlaneCapabilities2KHR> requires <VK_KHR_get_display_properties2>" );
 
-      DisplayPlaneCapabilities2KHR capabilities;
-      Result                       result =
-        static_cast<Result>( getDispatcher()->vkGetDisplayPlaneCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                                 reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( &displayPlaneInfo ),
-                                                                                 reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( &capabilities ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilities2KHR" );
+      VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR capabilities;
+      VULKAN_HPP_NAMESPACE::Result                       result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetDisplayPlaneCapabilities2KHR( static_cast<VkPhysicalDevice>( m_physicalDevice ),
+                                                            reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( &displayPlaneInfo ),
+                                                            reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( &capabilities ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getDisplayPlaneCapabilities2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( capabilities ) );
+      return capabilities;
     }
 
 #  if defined( VK_USE_PLATFORM_IOS_MVK )
     //=== VK_MVK_ios_surface ===
 
-    // wrapper function for command vkCreateIOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIOSSurfaceMVK.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createIOSSurfaceMVK( IOSSurfaceCreateInfoMVK const &     createInfo,
-                                     Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createIOSSurfaceMVK( VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK const &                           createInfo,
+                                     VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateIOSSurfaceMVK( static_cast<VkInstance>( m_instance ),
-                                                                                   reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                   reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createIOSSurfaceMVK" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateIOSSurfaceMVK(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createIOSSurfaceMVK" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_IOS_MVK*/
 
 #  if defined( VK_USE_PLATFORM_MACOS_MVK )
     //=== VK_MVK_macos_surface ===
 
-    // wrapper function for command vkCreateMacOSSurfaceMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMacOSSurfaceMVK.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createMacOSSurfaceMVK( MacOSSurfaceCreateInfoMVK const &   createInfo,
-                                       Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createMacOSSurfaceMVK( VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK const &                         createInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateMacOSSurfaceMVK( static_cast<VkInstance>( m_instance ),
-                                                                                     reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
-                                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                     reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createMacOSSurfaceMVK" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateMacOSSurfaceMVK(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createMacOSSurfaceMVK" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
     //=== VK_EXT_debug_utils ===
 
-    // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setDebugUtilsObjectNameEXT( const DebugUtilsObjectNameInfoEXT & nameInfo ) const
+    VULKAN_HPP_INLINE void Device::setDebugUtilsObjectNameEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT & nameInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetDebugUtilsObjectNameEXT && "Function <vkSetDebugUtilsObjectNameEXT> requires <VK_EXT_debug_utils>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkSetDebugUtilsObjectNameEXT(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkSetDebugUtilsObjectNameEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( &nameInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::setDebugUtilsObjectNameEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectNameEXT" );
     }
 
-    // wrapper function for command vkSetDebugUtilsObjectNameEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectNameEXT.html
-    template <typename HandleType>
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setDebugUtilsObjectNameEXT( HandleType const & handle, std::string const & name ) const
-    {
-      VULKAN_HPP_STATIC_ASSERT( VULKAN_HPP_NAMESPACE::isVulkanHandleType<HandleType>::value, "HandleType must be a Vulkan handle type" );
-      // It might be, that neither constructors, nor setters, nor designated initializers are available... need to explicitly set member by member
-      VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT nameInfo;
-      nameInfo.objectType   = handle.objectType;
-      nameInfo.objectHandle = reinterpret_cast<uint64_t>( static_cast<typename HandleType::CType>( handle ) );
-      nameInfo.pObjectName  = name.c_str();
-      return setDebugUtilsObjectNameEXT( nameInfo );
-    }
-
-    // wrapper function for command vkSetDebugUtilsObjectTagEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::setDebugUtilsObjectTagEXT( const DebugUtilsObjectTagInfoEXT & tagInfo ) const
+    VULKAN_HPP_INLINE void Device::setDebugUtilsObjectTagEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT & tagInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetDebugUtilsObjectTagEXT && "Function <vkSetDebugUtilsObjectTagEXT> requires <VK_EXT_debug_utils>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkSetDebugUtilsObjectTagEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( &tagInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::setDebugUtilsObjectTagEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setDebugUtilsObjectTagEXT" );
     }
 
-    // wrapper function for command vkSetDebugUtilsObjectTagEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDebugUtilsObjectTagEXT.html
-    template <typename HandleType, typename TagType>
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::setDebugUtilsObjectTagEXT( HandleType const & handle, uint64_t name, TagType const & tag ) const
-    {
-      VULKAN_HPP_STATIC_ASSERT( VULKAN_HPP_NAMESPACE::isVulkanHandleType<HandleType>::value, "HandleType must be a Vulkan handle type" );
-      // It might be, that neither constructors, nor setters, nor designated initializers are available... need to explicitly set member by member
-      VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT tagInfo;
-      tagInfo.objectType   = handle.objectType;
-      tagInfo.objectHandle = reinterpret_cast<uint64_t>( static_cast<typename HandleType::CType>( handle ) );
-      tagInfo.tagName      = name;
-      tagInfo.tagSize      = sizeof( TagType );
-      tagInfo.pTag         = &tag;
-      return setDebugUtilsObjectTagEXT( tagInfo );
-    }
-
-    // wrapper function for command vkQueueBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueBeginDebugUtilsLabelEXT.html
-    VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Queue::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueBeginDebugUtilsLabelEXT && "Function <vkQueueBeginDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
 
       getDispatcher()->vkQueueBeginDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
     }
 
-    // wrapper function for command vkQueueEndDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueEndDebugUtilsLabelEXT.html
     VULKAN_HPP_INLINE void Queue::endDebugUtilsLabelEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueEndDebugUtilsLabelEXT && "Function <vkQueueEndDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
@@ -21269,18 +17667,14 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkQueueEndDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ) );
     }
 
-    // wrapper function for command vkQueueInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueInsertDebugUtilsLabelEXT.html
-    VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Queue::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueInsertDebugUtilsLabelEXT && "Function <vkQueueInsertDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
 
       getDispatcher()->vkQueueInsertDebugUtilsLabelEXT( static_cast<VkQueue>( m_queue ), reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
     }
 
-    // wrapper function for command vkCmdBeginDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginDebugUtilsLabelEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::beginDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginDebugUtilsLabelEXT && "Function <vkCmdBeginDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
 
@@ -21288,7 +17682,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                      reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
     }
 
-    // wrapper function for command vkCmdEndDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndDebugUtilsLabelEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::endDebugUtilsLabelEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndDebugUtilsLabelEXT && "Function <vkCmdEndDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
@@ -21296,9 +17689,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdEndDebugUtilsLabelEXT( static_cast<VkCommandBuffer>( m_commandBuffer ) );
     }
 
-    // wrapper function for command vkCmdInsertDebugUtilsLabelEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInsertDebugUtilsLabelEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::insertDebugUtilsLabelEXT( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT & labelInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdInsertDebugUtilsLabelEXT && "Function <vkCmdInsertDebugUtilsLabelEXT> requires <VK_EXT_debug_utils>" );
 
@@ -21306,28 +17697,35 @@ namespace VULKAN_HPP_NAMESPACE
                                                       reinterpret_cast<const VkDebugUtilsLabelEXT *>( &labelInfo ) );
     }
 
-    // wrapper function for command vkCreateDebugUtilsMessengerEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDebugUtilsMessengerEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DebugUtilsMessengerEXT>::type
-                         Instance::createDebugUtilsMessengerEXT( DebugUtilsMessengerCreateInfoEXT const & createInfo,
-                                              Optional<const AllocationCallbacks>      allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugUtilsMessengerEXT>::Type
+      Instance::createDebugUtilsMessengerEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT const &                  createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT messenger;
-      Result                                       result =
-        static_cast<Result>( getDispatcher()->vkCreateDebugUtilsMessengerEXT( static_cast<VkInstance>( m_instance ),
-                                                                              reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createDebugUtilsMessengerEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DebugUtilsMessengerEXT( *this, *reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDebugUtilsMessengerEXT(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createDebugUtilsMessengerEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DebugUtilsMessengerEXT(
+        *this, *reinterpret_cast<VkDebugUtilsMessengerEXT *>( &messenger ), allocator );
     }
 
-    // wrapper function for command vkSubmitDebugUtilsMessageEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSubmitDebugUtilsMessageEXT.html
-    VULKAN_HPP_INLINE void Instance::submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                                                 DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                                                 const DebugUtilsMessengerCallbackDataEXT & callbackData ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      Instance::submitDebugUtilsMessageEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
+                                            VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT              messageTypes,
+                                            const VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT & callbackData ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSubmitDebugUtilsMessageEXT && "Function <vkSubmitDebugUtilsMessageEXT> requires <VK_EXT_debug_utils>" );
 
@@ -21339,215 +17737,190 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if defined( VK_USE_PLATFORM_ANDROID_KHR )
     //=== VK_ANDROID_external_memory_android_hardware_buffer ===
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getAndroidHardwareBufferPropertiesANDROID(
-      const struct AHardwareBuffer * buffer, AndroidHardwareBufferPropertiesANDROID * pProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID &&
-                         "Function <vkGetAndroidHardwareBufferPropertiesANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
-      return static_cast<Result>( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID(
-        static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( pProperties ) ) );
-    }
 
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AndroidHardwareBufferPropertiesANDROID>::type
-                         Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID
+                                           Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID &&
                          "Function <vkGetAndroidHardwareBufferPropertiesANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 
-      AndroidHardwareBufferPropertiesANDROID properties;
-      Result                                 result = static_cast<Result>( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID(
+      VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID properties;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID(
         static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetAndroidHardwareBufferPropertiesANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAndroidHardwareBufferPropertiesANDROID.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                           Device::getAndroidHardwareBufferPropertiesANDROID( const struct AHardwareBuffer & buffer ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID &&
                          "Function <vkGetAndroidHardwareBufferPropertiesANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 
-      StructureChain<X, Y, Z...>               structureChain;
-      AndroidHardwareBufferPropertiesANDROID & properties = structureChain.template get<AndroidHardwareBufferPropertiesANDROID>();
-      Result                                   result     = static_cast<Result>( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID(
+      StructureChain<X, Y, Z...>                                     structureChain;
+      VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID & properties =
+        structureChain.template get<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID>();
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetAndroidHardwareBufferPropertiesANDROID(
         static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAndroidHardwareBufferPropertiesANDROID" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetMemoryAndroidHardwareBufferANDROID, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryAndroidHardwareBufferANDROID.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<struct AHardwareBuffer *>::type
-                         Device::getMemoryAndroidHardwareBufferANDROID( const MemoryGetAndroidHardwareBufferInfoANDROID & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE struct AHardwareBuffer *
+      Device::getMemoryAndroidHardwareBufferANDROID( const VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryAndroidHardwareBufferANDROID &&
                          "Function <vkGetMemoryAndroidHardwareBufferANDROID> requires <VK_ANDROID_external_memory_android_hardware_buffer>" );
 
-      struct AHardwareBuffer * buffer;
-      Result                   result = static_cast<Result>( getDispatcher()->vkGetMemoryAndroidHardwareBufferANDROID(
+      struct AHardwareBuffer *     buffer;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetMemoryAndroidHardwareBufferANDROID(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetAndroidHardwareBufferInfoANDROID *>( &info ), &buffer ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryAndroidHardwareBufferANDROID" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryAndroidHardwareBufferANDROID" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( buffer ) );
+      return buffer;
     }
 #  endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_AMDX_shader_enqueue ===
 
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createExecutionGraphPipelinesAMDX( Optional<const PipelineCache> const &                    pipelineCache,
-                                                 ArrayProxy<ExecutionGraphPipelineCreateInfoAMDX> const & createInfos,
-                                                 Optional<const AllocationCallbacks>                      allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+      Device::createExecutionGraphPipelinesAMDX(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX> const &         createInfos,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result = static_cast<Result>(
-        getDispatcher()->vkCreateExecutionGraphPipelinesAMDX( static_cast<VkDevice>( m_device ),
-                                                              pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                              createInfos.size(),
-                                                              reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createExecutionGraphPipelinesAMDX", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateExecutionGraphPipelinesAMDX(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        createInfos.size(),
+        reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
       {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createExecutionGraphPipelinesAMDX" );
+#    endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> pipelinesRAII;
+      pipelinesRAII.reserve( pipelines.size() );
+      for ( auto & pipeline : pipelines )
+      {
+        pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
+      }
+      return pipelinesRAII;
     }
 
-    // wrapper function for command vkCreateExecutionGraphPipelinesAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExecutionGraphPipelinesAMDX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createExecutionGraphPipelineAMDX( Optional<const PipelineCache> const &        pipelineCache,
-                                                ExecutionGraphPipelineCreateInfoAMDX const & createInfo,
-                                                Optional<const AllocationCallbacks>          allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                        Device::createExecutionGraphPipelineAMDX(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX const &                                           createInfo,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result = static_cast<Result>(
-        getDispatcher()->vkCreateExecutionGraphPipelinesAMDX( static_cast<VkDevice>( m_device ),
-                                                              pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                              1,
-                                                              reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createExecutionGraphPipelineAMDX", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateExecutionGraphPipelinesAMDX(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        1,
+        reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createExecutionGraphPipelineAMDX" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator );
     }
 
-    // wrapper function for command vkGetExecutionGraphPipelineScratchSizeAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineScratchSizeAMDX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExecutionGraphPipelineScratchSizeAMDX>::type
-                         Pipeline::getExecutionGraphScratchSizeAMDX() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX Pipeline::getExecutionGraphScratchSizeAMDX() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetExecutionGraphPipelineScratchSizeAMDX &&
                          "Function <vkGetExecutionGraphPipelineScratchSizeAMDX> requires <VK_AMDX_shader_enqueue>" );
 
-      ExecutionGraphPipelineScratchSizeAMDX sizeInfo;
-      Result                                result = static_cast<Result>( getDispatcher()->vkGetExecutionGraphPipelineScratchSizeAMDX(
+      VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX sizeInfo;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetExecutionGraphPipelineScratchSizeAMDX(
         static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( m_pipeline ), reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( &sizeInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getExecutionGraphScratchSizeAMDX" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getExecutionGraphScratchSizeAMDX" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( sizeInfo ) );
+      return sizeInfo;
     }
 
-    // wrapper function for command vkGetExecutionGraphPipelineNodeIndexAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExecutionGraphPipelineNodeIndexAMDX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint32_t>::type
-                         Pipeline::getExecutionGraphNodeIndexAMDX( const PipelineShaderStageNodeCreateInfoAMDX & nodeInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t
+      Pipeline::getExecutionGraphNodeIndexAMDX( const VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX & nodeInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetExecutionGraphPipelineNodeIndexAMDX &&
                          "Function <vkGetExecutionGraphPipelineNodeIndexAMDX> requires <VK_AMDX_shader_enqueue>" );
 
-      uint32_t nodeIndex;
-      Result   result = static_cast<Result>(
+      uint32_t                     nodeIndex;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetExecutionGraphPipelineNodeIndexAMDX( static_cast<VkDevice>( m_device ),
                                                                    static_cast<VkPipeline>( m_pipeline ),
                                                                    reinterpret_cast<const VkPipelineShaderStageNodeCreateInfoAMDX *>( &nodeInfo ),
                                                                    &nodeIndex ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getExecutionGraphNodeIndexAMDX" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getExecutionGraphNodeIndexAMDX" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( nodeIndex ) );
+      return nodeIndex;
     }
 
-    // wrapper function for command vkCmdInitializeGraphScratchMemoryAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdInitializeGraphScratchMemoryAMDX.html
-    VULKAN_HPP_INLINE void CommandBuffer::initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::Pipeline executionGraph,
-                                                                            DeviceAddress                  scratch,
-                                                                            DeviceSize                     scratchSize ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::initializeGraphScratchMemoryAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdInitializeGraphScratchMemoryAMDX &&
                          "Function <vkCmdInitializeGraphScratchMemoryAMDX> requires <VK_AMDX_shader_enqueue>" );
 
-      getDispatcher()->vkCmdInitializeGraphScratchMemoryAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                              static_cast<VkPipeline>( executionGraph ),
-                                                              static_cast<VkDeviceAddress>( scratch ),
-                                                              static_cast<VkDeviceSize>( scratchSize ) );
+      getDispatcher()->vkCmdInitializeGraphScratchMemoryAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDeviceAddress>( scratch ) );
     }
 
-    // wrapper function for command vkCmdDispatchGraphAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphAMDX.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::dispatchGraphAMDX( DeviceAddress scratch, DeviceSize scratchSize, const DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                             const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchGraphAMDX && "Function <vkCmdDispatchGraphAMDX> requires <VK_AMDX_shader_enqueue>" );
 
       getDispatcher()->vkCmdDispatchGraphAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
                                                static_cast<VkDeviceAddress>( scratch ),
-                                               static_cast<VkDeviceSize>( scratchSize ),
                                                reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
     }
 
-    // wrapper function for command vkCmdDispatchGraphIndirectAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectAMDX.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectAMDX( DeviceAddress                      scratch,
-                                                                     DeviceSize                         scratchSize,
-                                                                     const DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::dispatchGraphIndirectAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress                      scratch,
+                                                const VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX & countInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchGraphIndirectAMDX && "Function <vkCmdDispatchGraphIndirectAMDX> requires <VK_AMDX_shader_enqueue>" );
 
       getDispatcher()->vkCmdDispatchGraphIndirectAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
                                                        static_cast<VkDeviceAddress>( scratch ),
-                                                       static_cast<VkDeviceSize>( scratchSize ),
                                                        reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( &countInfo ) );
     }
 
-    // wrapper function for command vkCmdDispatchGraphIndirectCountAMDX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchGraphIndirectCountAMDX.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::dispatchGraphIndirectCountAMDX( DeviceAddress scratch, DeviceSize scratchSize, DeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::dispatchGraphIndirectCountAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress scratch,
+                                                                          VULKAN_HPP_NAMESPACE::DeviceAddress countInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchGraphIndirectCountAMDX &&
                          "Function <vkCmdDispatchGraphIndirectCountAMDX> requires <VK_AMDX_shader_enqueue>" );
 
-      getDispatcher()->vkCmdDispatchGraphIndirectCountAMDX( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                            static_cast<VkDeviceAddress>( scratch ),
-                                                            static_cast<VkDeviceSize>( scratchSize ),
-                                                            static_cast<VkDeviceAddress>( countInfo ) );
+      getDispatcher()->vkCmdDispatchGraphIndirectCountAMDX(
+        static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDeviceAddress>( scratch ), static_cast<VkDeviceAddress>( countInfo ) );
     }
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
     //=== VK_EXT_sample_locations ===
 
-    // wrapper function for command vkCmdSetSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEXT( const SampleLocationsInfoEXT & sampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setSampleLocationsEXT( const VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT & sampleLocationsInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetSampleLocationsEXT && "Function <vkCmdSetSampleLocationsEXT> requires <VK_EXT_sample_locations>" );
 
@@ -21555,15 +17928,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                    reinterpret_cast<const VkSampleLocationsInfoEXT *>( &sampleLocationsInfo ) );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceMultisamplePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceMultisamplePropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MultisamplePropertiesEXT
-      PhysicalDevice::getMultisamplePropertiesEXT( SampleCountFlagBits samples ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT
+      PhysicalDevice::getMultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceMultisamplePropertiesEXT &&
                          "Function <vkGetPhysicalDeviceMultisamplePropertiesEXT> requires <VK_EXT_sample_locations>" );
 
-      MultisamplePropertiesEXT multisampleProperties;
+      VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT multisampleProperties;
       getDispatcher()->vkGetPhysicalDeviceMultisamplePropertiesEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                     static_cast<VkSampleCountFlagBits>( samples ),
                                                                     reinterpret_cast<VkMultisamplePropertiesEXT *>( &multisampleProperties ) );
@@ -21573,15 +17944,13 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_get_memory_requirements2 ===
 
-    // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageMemoryRequirements2KHR &&
                          "Function <vkGetImageMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetImageMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
                                                          reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ),
                                                          reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -21589,17 +17958,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetImageMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageMemoryRequirements2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageMemoryRequirements2KHR( const ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getImageMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageMemoryRequirements2KHR &&
                          "Function <vkGetImageMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetImageMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
                                                          reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( &info ),
                                                          reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -21607,15 +17974,13 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferMemoryRequirements2KHR &&
                          "Function <vkGetBufferMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetBufferMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
                                                           reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ),
                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -21623,17 +17988,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetBufferMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferMemoryRequirements2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getBufferMemoryRequirements2KHR( const BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getBufferMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferMemoryRequirements2KHR &&
                          "Function <vkGetBufferMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetBufferMemoryRequirements2KHR( static_cast<VkDevice>( m_device ),
                                                           reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( &info ),
                                                           reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -21641,16 +18004,14 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetImageSparseMemoryRequirements2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSparseMemoryRequirements2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2>
-                                           Device::getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+      Device::getImageSparseMemoryRequirements2KHR( const VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageSparseMemoryRequirements2KHR &&
                          "Function <vkGetImageSparseMemoryRequirements2KHR> requires <VK_KHR_get_memory_requirements2> or <VK_VERSION_1_1>" );
 
-      std::vector<SparseImageMemoryRequirements2> sparseMemoryRequirements;
-      uint32_t                                    sparseMemoryRequirementCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2> sparseMemoryRequirements;
+      uint32_t                                                          sparseMemoryRequirementCount;
       getDispatcher()->vkGetImageSparseMemoryRequirements2KHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( &info ), &sparseMemoryRequirementCount, nullptr );
       sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -21669,28 +18030,34 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_acceleration_structure ===
 
-    // wrapper function for command vkCreateAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AccelerationStructureKHR>::type
-                         Device::createAccelerationStructureKHR( AccelerationStructureCreateInfoKHR const & createInfo,
-                                              Optional<const AllocationCallbacks>        allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureKHR>::Type
+      Device::createAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR const &                createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure;
-      Result                                         result =
-        static_cast<Result>( getDispatcher()->vkCreateAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createAccelerationStructureKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, AccelerationStructureKHR( *this, *reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateAccelerationStructureKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createAccelerationStructureKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureKHR(
+        *this, *reinterpret_cast<VkAccelerationStructureKHR *>( &accelerationStructure ), allocator );
     }
 
-    // wrapper function for command vkCmdBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::buildAccelerationStructuresKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                                     ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
+    VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresKHR &&
                          "Function <vkCmdBuildAccelerationStructuresKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21710,12 +18077,11 @@ namespace VULKAN_HPP_NAMESPACE
         reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) );
     }
 
-    // wrapper function for command vkCmdBuildAccelerationStructuresIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructuresIndirectKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR( ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const & infos,
-                                                                                  ArrayProxy<const DeviceAddress> const &    indirectDeviceAddresses,
-                                                                                  ArrayProxy<const uint32_t> const &         indirectStrides,
-                                                                                  ArrayProxy<const uint32_t * const> const & pMaxPrimitiveCounts ) const
+    VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructuresIndirectKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const & infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceAddress> const &                             indirectDeviceAddresses,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                                                        indirectStrides,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t * const> const &                                                pMaxPrimitiveCounts ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructuresIndirectKHR &&
                          "Function <vkCmdBuildAccelerationStructuresIndirectKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21747,12 +18113,10 @@ namespace VULKAN_HPP_NAMESPACE
                                                                     pMaxPrimitiveCounts.data() );
     }
 
-    // wrapper function for command vkBuildAccelerationStructuresKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildAccelerationStructuresKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-      Device::buildAccelerationStructuresKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                               deferredOperation,
-                                              ArrayProxy<const AccelerationStructureBuildGeometryInfoKHR> const &      infos,
-                                              ArrayProxy<const AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::buildAccelerationStructuresKHR(
+      VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                                           deferredOperation,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR> const &      infos,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR * const> const & pBuildRangeInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBuildAccelerationStructuresKHR &&
                          "Function <vkBuildAccelerationStructuresKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21765,91 +18129,94 @@ namespace VULKAN_HPP_NAMESPACE
       }
 #  endif /*VULKAN_HPP_NO_EXCEPTIONS*/
 
-      Result result = static_cast<Result>( getDispatcher()->vkBuildAccelerationStructuresKHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBuildAccelerationStructuresKHR(
         static_cast<VkDevice>( m_device ),
         static_cast<VkDeferredOperationKHR>( deferredOperation ),
         infos.size(),
         reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( infos.data() ),
         reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR * const *>( pBuildRangeInfos.data() ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::buildAccelerationStructuresKHR",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                                        const CopyAccelerationStructureInfoKHR &   info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::copyAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                     deferredOperation,
+                                            const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureKHR &&
                          "Function <vkCopyAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 
-      Result result =
-        static_cast<Result>( getDispatcher()->vkCopyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
-                                                                              static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                              reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkCopyAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
+                                                         static_cast<VkDeferredOperationKHR>( deferredOperation ),
+                                                         reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureKHR",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyAccelerationStructureToMemoryKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                                                const CopyAccelerationStructureToMemoryInfoKHR & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::copyAccelerationStructureToMemoryKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                    const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyAccelerationStructureToMemoryKHR &&
                          "Function <vkCopyAccelerationStructureToMemoryKHR> requires <VK_KHR_acceleration_structure>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkCopyAccelerationStructureToMemoryKHR( static_cast<VkDevice>( m_device ),
                                                                  static_cast<VkDeferredOperationKHR>( deferredOperation ),
                                                                  reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyAccelerationStructureToMemoryKHR",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToAccelerationStructureKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                                                const CopyMemoryToAccelerationStructureInfoKHR & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::copyMemoryToAccelerationStructureKHR( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                             deferredOperation,
+                                                    const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToAccelerationStructureKHR &&
                          "Function <vkCopyMemoryToAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkCopyMemoryToAccelerationStructureKHR( static_cast<VkDevice>( m_device ),
                                                                  static_cast<VkDeferredOperationKHR>( deferredOperation ),
                                                                  reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToAccelerationStructureKHR",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type
-      Device::writeAccelerationStructuresPropertiesKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
-                                                        QueryType                                                                queryType,
-                                                        size_t                                                                   dataSize,
-                                                        size_t                                                                   stride ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType> Device::writeAccelerationStructuresPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      size_t                                                                                         dataSize,
+      size_t                                                                                         stride ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWriteAccelerationStructuresPropertiesKHR &&
                          "Function <vkWriteAccelerationStructuresPropertiesKHR> requires <VK_KHR_acceleration_structure>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>(
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkWriteAccelerationStructuresPropertiesKHR( static_cast<VkDevice>( m_device ),
                                                                      accelerationStructures.size(),
                                                                      reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
@@ -21857,22 +18224,22 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      data.size() * sizeof( DataType ),
                                                                      reinterpret_cast<void *>( data.data() ),
                                                                      stride ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteAccelerationStructuresPropertiesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type Device::writeAccelerationStructuresPropertyKHR(
-      ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures, QueryType queryType, size_t stride ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType Device::writeAccelerationStructuresPropertyKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      size_t                                                                                         stride ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWriteAccelerationStructuresPropertiesKHR &&
                          "Function <vkWriteAccelerationStructuresPropertiesKHR> requires <VK_KHR_acceleration_structure>" );
 
-      DataType data;
-      Result   result = static_cast<Result>(
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkWriteAccelerationStructuresPropertiesKHR( static_cast<VkDevice>( m_device ),
                                                                      accelerationStructures.size(),
                                                                      reinterpret_cast<const VkAccelerationStructureKHR *>( accelerationStructures.data() ),
@@ -21880,14 +18247,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      sizeof( DataType ),
                                                                      reinterpret_cast<void *>( &data ),
                                                                      stride ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertyKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeAccelerationStructuresPropertyKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkCmdCopyAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureKHR( const CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyAccelerationStructureKHR( const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyAccelerationStructureKHR &&
                          "Function <vkCmdCopyAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21896,10 +18262,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                           reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( &info ) );
     }
 
-    // wrapper function for command vkCmdCopyAccelerationStructureToMemoryKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureToMemoryKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::copyAccelerationStructureToMemoryKHR( const CopyAccelerationStructureToMemoryInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureToMemoryKHR(
+      const VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyAccelerationStructureToMemoryKHR &&
                          "Function <vkCmdCopyAccelerationStructureToMemoryKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21908,10 +18272,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                                   reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( &info ) );
     }
 
-    // wrapper function for command vkCmdCopyMemoryToAccelerationStructureKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToAccelerationStructureKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::copyMemoryToAccelerationStructureKHR( const CopyMemoryToAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToAccelerationStructureKHR(
+      const VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryToAccelerationStructureKHR &&
                          "Function <vkCmdCopyMemoryToAccelerationStructureKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21920,10 +18282,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                                   reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( &info ) );
     }
 
-    // wrapper function for command vkGetAccelerationStructureDeviceAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureDeviceAddressKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceAddress
-      Device::getAccelerationStructureAddressKHR( const AccelerationStructureDeviceAddressInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+      Device::getAccelerationStructureAddressKHR( const VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureDeviceAddressKHR &&
                          "Function <vkGetAccelerationStructureDeviceAddressKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21931,16 +18291,14 @@ namespace VULKAN_HPP_NAMESPACE
       VkDeviceAddress result = getDispatcher()->vkGetAccelerationStructureDeviceAddressKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAccelerationStructureDeviceAddressInfoKHR *>( &info ) );
 
-      return static_cast<DeviceAddress>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
     }
 
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::writeAccelerationStructuresPropertiesKHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
-                                                               QueryType                                                                queryType,
-                                                               VULKAN_HPP_NAMESPACE::QueryPool                                          queryPool,
-                                                               uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                                queryType,
+      VULKAN_HPP_NAMESPACE::QueryPool                                                                queryPool,
+      uint32_t                                                                                       firstQuery ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteAccelerationStructuresPropertiesKHR &&
                          "Function <vkCmdWriteAccelerationStructuresPropertiesKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21953,15 +18311,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                                       firstQuery );
     }
 
-    // wrapper function for command vkGetDeviceAccelerationStructureCompatibilityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceAccelerationStructureCompatibilityKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureCompatibilityKHR
-      Device::getAccelerationStructureCompatibilityKHR( const AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR Device::getAccelerationStructureCompatibilityKHR(
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR & versionInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceAccelerationStructureCompatibilityKHR &&
                          "Function <vkGetDeviceAccelerationStructureCompatibilityKHR> requires <VK_KHR_acceleration_structure>" );
 
-      AccelerationStructureCompatibilityKHR compatibility;
+      VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR compatibility;
       getDispatcher()->vkGetDeviceAccelerationStructureCompatibilityKHR( static_cast<VkDevice>( m_device ),
                                                                          reinterpret_cast<const VkAccelerationStructureVersionInfoKHR *>( &versionInfo ),
                                                                          reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( &compatibility ) );
@@ -21969,12 +18325,10 @@ namespace VULKAN_HPP_NAMESPACE
       return compatibility;
     }
 
-    // wrapper function for command vkGetAccelerationStructureBuildSizesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR
-      Device::getAccelerationStructureBuildSizesKHR( AccelerationStructureBuildTypeKHR                 buildType,
-                                                     const AccelerationStructureBuildGeometryInfoKHR & buildInfo,
-                                                     ArrayProxy<const uint32_t> const &                maxPrimitiveCounts ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR
+                                           Device::getAccelerationStructureBuildSizesKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR                 buildType,
+                                                     const VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR & buildInfo,
+                                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                maxPrimitiveCounts ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureBuildSizesKHR &&
                          "Function <vkGetAccelerationStructureBuildSizesKHR> requires <VK_KHR_acceleration_structure>" );
@@ -21987,7 +18341,7 @@ namespace VULKAN_HPP_NAMESPACE
       }
 #  endif /*VULKAN_HPP_NO_EXCEPTIONS*/
 
-      AccelerationStructureBuildSizesInfoKHR sizeInfo;
+      VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR sizeInfo;
       getDispatcher()->vkGetAccelerationStructureBuildSizesKHR( static_cast<VkDevice>( m_device ),
                                                                 static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                                                 reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( &buildInfo ),
@@ -21999,14 +18353,13 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_ray_tracing_pipeline ===
 
-    // wrapper function for command vkCmdTraceRaysKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                                                        const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                                                        const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                                                        const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                                                        uint32_t                              width,
-                                                        uint32_t                              height,
-                                                        uint32_t                              depth ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::traceRaysKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                                                        const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                                                        const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                                                        const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                                                        uint32_t                                                    width,
+                                                        uint32_t                                                    height,
+                                                        uint32_t                                                    depth ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdTraceRaysKHR && "Function <vkCmdTraceRaysKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 
@@ -22020,155 +18373,157 @@ namespace VULKAN_HPP_NAMESPACE
                                           depth );
     }
 
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createRayTracingPipelinesKHR( Optional<const DeferredOperationKHR> const &        deferredOperation,
-                                            Optional<const PipelineCache> const &               pipelineCache,
-                                            ArrayProxy<RayTracingPipelineCreateInfoKHR> const & createInfos,
-                                            Optional<const AllocationCallbacks>                 allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+      Device::createRayTracingPipelinesKHR(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR> const &                     createInfos,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                                     allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result = static_cast<Result>(
-        getDispatcher()->vkCreateRayTracingPipelinesKHR( static_cast<VkDevice>( m_device ),
-                                                         deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
-                                                         pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                         createInfos.size(),
-                                                         reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
-                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                         reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result,
-        VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRayTracingPipelinesKHR",
-        { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRayTracingPipelinesKHR(
+        static_cast<VkDevice>( m_device ),
+        deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        createInfos.size(),
+        reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
+           ( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
       {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRayTracingPipelinesKHR" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> pipelinesRAII;
+      pipelinesRAII.reserve( pipelines.size() );
+      for ( auto & pipeline : pipelines )
+      {
+        pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
+      }
+      return pipelinesRAII;
     }
 
-    // wrapper function for command vkCreateRayTracingPipelinesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createRayTracingPipelineKHR( Optional<const DeferredOperationKHR> const & deferredOperation,
-                                           Optional<const PipelineCache> const &        pipelineCache,
-                                           RayTracingPipelineCreateInfoKHR const &      createInfo,
-                                           Optional<const AllocationCallbacks>          allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                        Device::createRayTracingPipelineKHR(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR> const & deferredOperation,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const &        pipelineCache,
+        VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR const &                                                       createInfo,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result = static_cast<Result>(
-        getDispatcher()->vkCreateRayTracingPipelinesKHR( static_cast<VkDevice>( m_device ),
-                                                         deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
-                                                         pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                         1,
-                                                         reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
-                                                         reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                         reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result,
-        VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRayTracingPipelineKHR",
-        { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRayTracingPipelinesKHR(
+        static_cast<VkDevice>( m_device ),
+        deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        1,
+        reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR ) &&
+           ( result != VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRayTracingPipelineKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator );
     }
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type
-                         Pipeline::getRayTracingShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType>
+                                           Pipeline::getRayTracingShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR &&
                          "Function <vkGetRayTracingShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
-                                                                                                  static_cast<VkPipeline>( m_pipeline ),
-                                                                                                  firstGroup,
-                                                                                                  groupCount,
-                                                                                                  data.size() * sizeof( DataType ),
-                                                                                                  reinterpret_cast<void *>( data.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandlesKHR" );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
+                                                                                                          static_cast<VkPipeline>( m_pipeline ),
+                                                                                                          firstGroup,
+                                                                                                          groupCount,
+                                                                                                          data.size() * sizeof( DataType ),
+                                                                                                          reinterpret_cast<void *>( data.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandlesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type Pipeline::getRayTracingShaderGroupHandleKHR( uint32_t firstGroup,
-                                                                                                                                 uint32_t groupCount ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType Pipeline::getRayTracingShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR &&
                          "Function <vkGetRayTracingShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
-                                                                                                  static_cast<VkPipeline>( m_pipeline ),
-                                                                                                  firstGroup,
-                                                                                                  groupCount,
-                                                                                                  sizeof( DataType ),
-                                                                                                  reinterpret_cast<void *>( &data ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandleKHR" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
+                                                                                                          static_cast<VkPipeline>( m_pipeline ),
+                                                                                                          firstGroup,
+                                                                                                          groupCount,
+                                                                                                          sizeof( DataType ),
+                                                                                                          reinterpret_cast<void *>( &data ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandleKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type
-                         Pipeline::getRayTracingCaptureReplayShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType>
+      Pipeline::getRayTracingCaptureReplayShaderGroupHandlesKHR( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR &&
                          "Function <vkGetRayTracingCaptureReplayShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>( getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
-                                                                                                               static_cast<VkPipeline>( m_pipeline ),
-                                                                                                               firstGroup,
-                                                                                                               groupCount,
-                                                                                                               data.size() * sizeof( DataType ),
-                                                                                                               reinterpret_cast<void *>( data.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingCaptureReplayShaderGroupHandlesKHR" );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
+                                                                            static_cast<VkPipeline>( m_pipeline ),
+                                                                            firstGroup,
+                                                                            groupCount,
+                                                                            data.size() * sizeof( DataType ),
+                                                                            reinterpret_cast<void *>( data.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingCaptureReplayShaderGroupHandlesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingCaptureReplayShaderGroupHandlesKHR.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Pipeline::getRayTracingCaptureReplayShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType Pipeline::getRayTracingCaptureReplayShaderGroupHandleKHR( uint32_t firstGroup, uint32_t groupCount ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR &&
                          "Function <vkGetRayTracingCaptureReplayShaderGroupHandlesKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
-                                                                                                               static_cast<VkPipeline>( m_pipeline ),
-                                                                                                               firstGroup,
-                                                                                                               groupCount,
-                                                                                                               sizeof( DataType ),
-                                                                                                               reinterpret_cast<void *>( &data ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingCaptureReplayShaderGroupHandleKHR" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRayTracingCaptureReplayShaderGroupHandlesKHR( static_cast<VkDevice>( m_device ),
+                                                                                                                       static_cast<VkPipeline>( m_pipeline ),
+                                                                                                                       firstGroup,
+                                                                                                                       groupCount,
+                                                                                                                       sizeof( DataType ),
+                                                                                                                       reinterpret_cast<void *>( &data ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingCaptureReplayShaderGroupHandleKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkCmdTraceRaysIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirectKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
-                                                                const StridedDeviceAddressRegionKHR & missShaderBindingTable,
-                                                                const StridedDeviceAddressRegionKHR & hitShaderBindingTable,
-                                                                const StridedDeviceAddressRegionKHR & callableShaderBindingTable,
-                                                                DeviceAddress                         indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirectKHR( const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & raygenShaderBindingTable,
+                                                                const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & missShaderBindingTable,
+                                                                const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & hitShaderBindingTable,
+                                                                const VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR & callableShaderBindingTable,
+                                                                VULKAN_HPP_NAMESPACE::DeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdTraceRaysIndirectKHR && "Function <vkCmdTraceRaysIndirectKHR> requires <VK_KHR_ray_tracing_pipeline>" );
 
@@ -22180,10 +18535,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                   static_cast<VkDeviceAddress>( indirectDeviceAddress ) );
     }
 
-    // wrapper function for command vkGetRayTracingShaderGroupStackSizeKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupStackSizeKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize
-      Pipeline::getRayTracingShaderGroupStackSizeKHR( uint32_t group, ShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize
+      Pipeline::getRayTracingShaderGroupStackSizeKHR( uint32_t group, VULKAN_HPP_NAMESPACE::ShaderGroupShaderKHR groupShader ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingShaderGroupStackSizeKHR &&
                          "Function <vkGetRayTracingShaderGroupStackSizeKHR> requires <VK_KHR_ray_tracing_pipeline>" );
@@ -22191,11 +18544,9 @@ namespace VULKAN_HPP_NAMESPACE
       VkDeviceSize result = getDispatcher()->vkGetRayTracingShaderGroupStackSizeKHR(
         static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( m_pipeline ), group, static_cast<VkShaderGroupShaderKHR>( groupShader ) );
 
-      return static_cast<DeviceSize>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceSize>( result );
     }
 
-    // wrapper function for command vkCmdSetRayTracingPipelineStackSizeKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRayTracingPipelineStackSizeKHR.html
     VULKAN_HPP_INLINE void CommandBuffer::setRayTracingPipelineStackSizeKHR( uint32_t pipelineStackSize ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRayTracingPipelineStackSizeKHR &&
@@ -22206,145 +18557,151 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_sampler_ycbcr_conversion ===
 
-    // wrapper function for command vkCreateSamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSamplerYcbcrConversionKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SamplerYcbcrConversion>::type
-                         Device::createSamplerYcbcrConversionKHR( SamplerYcbcrConversionCreateInfo const & createInfo,
-                                               Optional<const AllocationCallbacks>      allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion>::Type
+      Device::createSamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const &                  createInfo,
+                                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion;
-      Result                                       result =
-        static_cast<Result>( getDispatcher()->vkCreateSamplerYcbcrConversionKHR( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createSamplerYcbcrConversionKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, SamplerYcbcrConversion( *this, *reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateSamplerYcbcrConversionKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createSamplerYcbcrConversionKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SamplerYcbcrConversion(
+        *this, *reinterpret_cast<VkSamplerYcbcrConversion *>( &ycbcrConversion ), allocator );
     }
 
-    // wrapper function for command vkDestroySamplerYcbcrConversionKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroySamplerYcbcrConversionKHR.html
-    VULKAN_HPP_INLINE void Device::destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ycbcrConversion,
-                                                                     Optional<const AllocationCallbacks>          allocator ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      Device::destroySamplerYcbcrConversionKHR( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion              ycbcrConversion,
+                                                Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDestroySamplerYcbcrConversionKHR &&
                          "Function <vkDestroySamplerYcbcrConversionKHR> requires <VK_KHR_sampler_ycbcr_conversion> or <VK_VERSION_1_1>" );
 
-      getDispatcher()->vkDestroySamplerYcbcrConversionKHR( static_cast<VkDevice>( m_device ),
-                                                           static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
-                                                           reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      getDispatcher()->vkDestroySamplerYcbcrConversionKHR(
+        static_cast<VkDevice>( m_device ),
+        static_cast<VkSamplerYcbcrConversion>( ycbcrConversion ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
     }
 
     //=== VK_KHR_bind_memory2 ===
 
-    // wrapper function for command vkBindBufferMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindBufferMemory2KHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindBufferMemory2KHR( ArrayProxy<const BindBufferMemoryInfo> const & bindInfos ) const
+    VULKAN_HPP_INLINE void
+      Device::bindBufferMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo> const & bindInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindBufferMemory2KHR && "Function <vkBindBufferMemory2KHR> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindBufferMemory2KHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindBufferMemory2KHR(
         static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindBufferMemoryInfo *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindBufferMemory2KHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindBufferMemory2KHR" );
     }
 
-    // wrapper function for command vkBindImageMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindImageMemory2KHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindImageMemory2KHR( ArrayProxy<const BindImageMemoryInfo> const & bindInfos ) const
+    VULKAN_HPP_INLINE void
+      Device::bindImageMemory2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindImageMemoryInfo> const & bindInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindImageMemory2KHR && "Function <vkBindImageMemory2KHR> requires <VK_KHR_bind_memory2> or <VK_VERSION_1_1>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindImageMemory2KHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindImageMemory2KHR(
         static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindImageMemoryInfo *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindImageMemory2KHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindImageMemory2KHR" );
     }
 
     //=== VK_EXT_image_drm_format_modifier ===
 
-    // wrapper function for command vkGetImageDrmFormatModifierPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageDrmFormatModifierPropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ImageDrmFormatModifierPropertiesEXT>::type Image::getDrmFormatModifierPropertiesEXT() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT Image::getDrmFormatModifierPropertiesEXT() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageDrmFormatModifierPropertiesEXT &&
                          "Function <vkGetImageDrmFormatModifierPropertiesEXT> requires <VK_EXT_image_drm_format_modifier>" );
 
-      ImageDrmFormatModifierPropertiesEXT properties;
-      Result                              result = static_cast<Result>( getDispatcher()->vkGetImageDrmFormatModifierPropertiesEXT(
+      VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT properties;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetImageDrmFormatModifierPropertiesEXT(
         static_cast<VkDevice>( m_device ), static_cast<VkImage>( m_image ), reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Image::getDrmFormatModifierPropertiesEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Image::getDrmFormatModifierPropertiesEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
     //=== VK_EXT_validation_cache ===
 
-    // wrapper function for command vkCreateValidationCacheEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateValidationCacheEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ValidationCacheEXT>::type
-                         Device::createValidationCacheEXT( ValidationCacheCreateInfoEXT const & createInfo,
-                                        Optional<const AllocationCallbacks>  allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ValidationCacheEXT>::Type
+      Device::createValidationCacheEXT( VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT const &                      createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache;
-      Result                                   result = static_cast<Result>( getDispatcher()->vkCreateValidationCacheEXT( static_cast<VkDevice>( m_device ),
-                                                                                        reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
-                                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                        reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createValidationCacheEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, ValidationCacheEXT( *this, *reinterpret_cast<VkValidationCacheEXT *>( &validationCache ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result             result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateValidationCacheEXT(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkValidationCacheEXT *>( &validationCache ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createValidationCacheEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ValidationCacheEXT(
+        *this, *reinterpret_cast<VkValidationCacheEXT *>( &validationCache ), allocator );
     }
 
-    // wrapper function for command vkMergeValidationCachesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMergeValidationCachesEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      ValidationCacheEXT::merge( ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches ) const
+    VULKAN_HPP_INLINE void ValidationCacheEXT::merge( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ValidationCacheEXT> const & srcCaches ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkMergeValidationCachesEXT && "Function <vkMergeValidationCachesEXT> requires <VK_EXT_validation_cache>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkMergeValidationCachesEXT( static_cast<VkDevice>( m_device ),
-                                                                                        static_cast<VkValidationCacheEXT>( m_validationCacheEXT ),
-                                                                                        srcCaches.size(),
-                                                                                        reinterpret_cast<const VkValidationCacheEXT *>( srcCaches.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::ValidationCacheEXT::merge" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkMergeValidationCachesEXT( static_cast<VkDevice>( m_device ),
+                                                     static_cast<VkValidationCacheEXT>( m_validationCache ),
+                                                     srcCaches.size(),
+                                                     reinterpret_cast<const VkValidationCacheEXT *>( srcCaches.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::ValidationCacheEXT::merge" );
     }
 
-    // wrapper function for command vkGetValidationCacheDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetValidationCacheDataEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t>>::type ValidationCacheEXT::getData() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<uint8_t> ValidationCacheEXT::getData() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetValidationCacheDataEXT && "Function <vkGetValidationCacheDataEXT> requires <VK_EXT_validation_cache>" );
 
-      std::vector<uint8_t> data;
-      size_t               dataSize;
-      Result               result;
+      std::vector<uint8_t>         data;
+      size_t                       dataSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetValidationCacheDataEXT(
-          static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( m_validationCacheEXT ), &dataSize, nullptr ) );
-        if ( ( result == Result::eSuccess ) && dataSize )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetValidationCacheDataEXT(
+          static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( m_validationCache ), &dataSize, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
         {
           data.resize( dataSize );
-          result = static_cast<Result>( getDispatcher()->vkGetValidationCacheDataEXT( static_cast<VkDevice>( m_device ),
-                                                                                      static_cast<VkValidationCacheEXT>( m_validationCacheEXT ),
-                                                                                      &dataSize,
-                                                                                      reinterpret_cast<void *>( data.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetValidationCacheDataEXT(
+            static_cast<VkDevice>( m_device ), static_cast<VkValidationCacheEXT>( m_validationCache ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::ValidationCacheEXT::getData" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::ValidationCacheEXT::getData" );
       VULKAN_HPP_ASSERT( dataSize <= data.size() );
       if ( dataSize < data.size() )
       {
         data.resize( dataSize );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
     //=== VK_NV_shading_rate_image ===
 
-    // wrapper function for command vkCmdBindShadingRateImageNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadingRateImageNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView imageView, ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindShadingRateImageNV( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                                                  VULKAN_HPP_NAMESPACE::ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindShadingRateImageNV && "Function <vkCmdBindShadingRateImageNV> requires <VK_NV_shading_rate_image>" );
 
@@ -22352,11 +18709,9 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkImageView>( imageView ), static_cast<VkImageLayout>( imageLayout ) );
     }
 
-    // wrapper function for command vkCmdSetViewportShadingRatePaletteNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportShadingRatePaletteNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setViewportShadingRatePaletteNV( uint32_t                                       firstViewport,
-                                                      ArrayProxy<const ShadingRatePaletteNV> const & shadingRatePalettes ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setViewportShadingRatePaletteNV(
+      uint32_t                                                                                   firstViewport,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportShadingRatePaletteNV &&
                          "Function <vkCmdSetViewportShadingRatePaletteNV> requires <VK_NV_shading_rate_image>" );
@@ -22367,10 +18722,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                              reinterpret_cast<const VkShadingRatePaletteNV *>( shadingRatePalettes.data() ) );
     }
 
-    // wrapper function for command vkCmdSetCoarseSampleOrderNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoarseSampleOrderNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setCoarseSampleOrderNV( CoarseSampleOrderTypeNV                             sampleOrderType,
-                                             ArrayProxy<const CoarseSampleOrderCustomNV> const & customSampleOrders ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setCoarseSampleOrderNV(
+      VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV                                                   sampleOrderType,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoarseSampleOrderNV && "Function <vkCmdSetCoarseSampleOrderNV> requires <VK_NV_shading_rate_image>" );
 
@@ -22382,32 +18736,38 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_ray_tracing ===
 
-    // wrapper function for command vkCreateAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateAccelerationStructureNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<AccelerationStructureNV>::type
-                         Device::createAccelerationStructureNV( AccelerationStructureCreateInfoNV const & createInfo,
-                                             Optional<const AllocationCallbacks>       allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureNV>::Type
+      Device::createAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV const &                 createInfo,
+                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure;
-      Result                                        result =
-        static_cast<Result>( getDispatcher()->vkCreateAccelerationStructureNV( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createAccelerationStructureNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, AccelerationStructureNV( *this, *reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateAccelerationStructureNV(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createAccelerationStructureNV" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::AccelerationStructureNV(
+        *this, *reinterpret_cast<VkAccelerationStructureNV *>( &accelerationStructure ), allocator );
     }
 
-    // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2KHR
-      Device::getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR Device::getAccelerationStructureMemoryRequirementsNV(
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureMemoryRequirementsNV &&
                          "Function <vkGetAccelerationStructureMemoryRequirementsNV> requires <VK_NV_ray_tracing>" );
 
-      MemoryRequirements2KHR memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR memoryRequirements;
       getDispatcher()->vkGetAccelerationStructureMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                        reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( &info ),
                                                                        reinterpret_cast<VkMemoryRequirements2KHR *>( &memoryRequirements ) );
@@ -22415,17 +18775,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetAccelerationStructureMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureMemoryRequirementsNV.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getAccelerationStructureMemoryRequirementsNV( const AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> Device::getAccelerationStructureMemoryRequirementsNV(
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureMemoryRequirementsNV &&
                          "Function <vkGetAccelerationStructureMemoryRequirementsNV> requires <VK_NV_ray_tracing>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2KHR &   memoryRequirements = structureChain.template get<MemoryRequirements2KHR>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR &   memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2KHR>();
       getDispatcher()->vkGetAccelerationStructureMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                        reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( &info ),
                                                                        reinterpret_cast<VkMemoryRequirements2KHR *>( &memoryRequirements ) );
@@ -22433,31 +18791,25 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkBindAccelerationStructureMemoryNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindAccelerationStructureMemoryNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::bindAccelerationStructureMemoryNV( ArrayProxy<const BindAccelerationStructureMemoryInfoNV> const & bindInfos ) const
+    VULKAN_HPP_INLINE void Device::bindAccelerationStructureMemoryNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV> const & bindInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindAccelerationStructureMemoryNV &&
                          "Function <vkBindAccelerationStructureMemoryNV> requires <VK_NV_ray_tracing>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindAccelerationStructureMemoryNV(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBindAccelerationStructureMemoryNV(
         static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindAccelerationStructureMemoryInfoNV *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindAccelerationStructureMemoryNV" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::bindAccelerationStructureMemoryNV" );
     }
 
-    // wrapper function for command vkCmdBuildAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildAccelerationStructureNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const AccelerationStructureInfoNV &           info,
-                                                                        VULKAN_HPP_NAMESPACE::Buffer                  instanceData,
-                                                                        DeviceSize                                    instanceOffset,
-                                                                        Bool32                                        update,
-                                                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV dst,
-                                                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV src,
-                                                                        VULKAN_HPP_NAMESPACE::Buffer                  scratch,
-                                                                        DeviceSize                                    scratchOffset ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::buildAccelerationStructureNV( const VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV & info,
+                                                                        VULKAN_HPP_NAMESPACE::Buffer                              instanceData,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceSize                          instanceOffset,
+                                                                        VULKAN_HPP_NAMESPACE::Bool32                              update,
+                                                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV             dst,
+                                                                        VULKAN_HPP_NAMESPACE::AccelerationStructureNV             src,
+                                                                        VULKAN_HPP_NAMESPACE::Buffer                              scratch,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceSize scratchOffset ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildAccelerationStructureNV && "Function <vkCmdBuildAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
 
@@ -22472,11 +18824,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                           static_cast<VkDeviceSize>( scratchOffset ) );
     }
 
-    // wrapper function for command vkCmdCopyAccelerationStructureNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyAccelerationStructureNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV dst,
-                                                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV src,
-                                                                       CopyAccelerationStructureModeKHR              mode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV          dst,
+                                                                       VULKAN_HPP_NAMESPACE::AccelerationStructureNV          src,
+                                                                       VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyAccelerationStructureNV && "Function <vkCmdCopyAccelerationStructureNV> requires <VK_NV_ray_tracing>" );
 
@@ -22486,21 +18836,20 @@ namespace VULKAN_HPP_NAMESPACE
                                                          static_cast<VkCopyAccelerationStructureModeKHR>( mode ) );
     }
 
-    // wrapper function for command vkCmdTraceRaysNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer raygenShaderBindingTableBuffer,
-                                                       DeviceSize                   raygenShaderBindingOffset,
-                                                       VULKAN_HPP_NAMESPACE::Buffer missShaderBindingTableBuffer,
-                                                       DeviceSize                   missShaderBindingOffset,
-                                                       DeviceSize                   missShaderBindingStride,
-                                                       VULKAN_HPP_NAMESPACE::Buffer hitShaderBindingTableBuffer,
-                                                       DeviceSize                   hitShaderBindingOffset,
-                                                       DeviceSize                   hitShaderBindingStride,
-                                                       VULKAN_HPP_NAMESPACE::Buffer callableShaderBindingTableBuffer,
-                                                       DeviceSize                   callableShaderBindingOffset,
-                                                       DeviceSize                   callableShaderBindingStride,
-                                                       uint32_t                     width,
-                                                       uint32_t                     height,
-                                                       uint32_t                     depth ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::traceRaysNV( VULKAN_HPP_NAMESPACE::Buffer     raygenShaderBindingTableBuffer,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize raygenShaderBindingOffset,
+                                                       VULKAN_HPP_NAMESPACE::Buffer     missShaderBindingTableBuffer,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingOffset,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingStride,
+                                                       VULKAN_HPP_NAMESPACE::Buffer     hitShaderBindingTableBuffer,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingOffset,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingStride,
+                                                       VULKAN_HPP_NAMESPACE::Buffer     callableShaderBindingTableBuffer,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingOffset,
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingStride,
+                                                       uint32_t                         width,
+                                                       uint32_t                         height,
+                                                       uint32_t                         depth ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdTraceRaysNV && "Function <vkCmdTraceRaysNV> requires <VK_NV_ray_tracing>" );
 
@@ -22521,142 +18870,144 @@ namespace VULKAN_HPP_NAMESPACE
                                          depth );
     }
 
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createRayTracingPipelinesNV( Optional<const PipelineCache> const &              pipelineCache,
-                                           ArrayProxy<RayTracingPipelineCreateInfoNV> const & createInfos,
-                                           Optional<const AllocationCallbacks>                allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>>::Type
+      Device::createRayTracingPipelinesNV(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV> const &               createInfos,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>                              allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result =
-        static_cast<Result>( getDispatcher()->vkCreateRayTracingPipelinesNV( static_cast<VkDevice>( m_device ),
-                                                                             pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                             createInfos.size(),
-                                                                             reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRayTracingPipelinesNV", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRayTracingPipelinesNV(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        createInfos.size(),
+        reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
       {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRayTracingPipelinesNV" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline> pipelinesRAII;
+      pipelinesRAII.reserve( pipelines.size() );
+      for ( auto & pipeline : pipelines )
+      {
+        pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
+      }
+      return pipelinesRAII;
     }
 
-    // wrapper function for command vkCreateRayTracingPipelinesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateRayTracingPipelinesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createRayTracingPipelineNV( Optional<const PipelineCache> const &  pipelineCache,
-                                          RayTracingPipelineCreateInfoNV const & createInfo,
-                                          Optional<const AllocationCallbacks>    allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline>::Type
+                        Device::createRayTracingPipelineNV(
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PipelineCache> const & pipelineCache,
+        VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV const &                                                 createInfo,
+        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result =
-        static_cast<Result>( getDispatcher()->vkCreateRayTracingPipelinesNV( static_cast<VkDevice>( m_device ),
-                                                                             pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                             1,
-                                                                             reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createRayTracingPipelineNV", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateRayTracingPipelinesNV(
+        static_cast<VkDevice>( m_device ),
+        pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
+        1,
+        reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPipeline *>( &pipeline ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::ePipelineCompileRequiredEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createRayTracingPipelineNV" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator );
     }
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type
-                         Pipeline::getRayTracingShaderGroupHandlesNV( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType>
+                                           Pipeline::getRayTracingShaderGroupHandlesNV( uint32_t firstGroup, uint32_t groupCount, size_t dataSize ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV &&
                          "Function <vkGetRayTracingShaderGroupHandlesNV> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV( static_cast<VkDevice>( m_device ),
-                                                                                                 static_cast<VkPipeline>( m_pipeline ),
-                                                                                                 firstGroup,
-                                                                                                 groupCount,
-                                                                                                 data.size() * sizeof( DataType ),
-                                                                                                 reinterpret_cast<void *>( data.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandlesNV" );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV( static_cast<VkDevice>( m_device ),
+                                                                                                         static_cast<VkPipeline>( m_pipeline ),
+                                                                                                         firstGroup,
+                                                                                                         groupCount,
+                                                                                                         data.size() * sizeof( DataType ),
+                                                                                                         reinterpret_cast<void *>( data.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandlesNV" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetRayTracingShaderGroupHandlesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRayTracingShaderGroupHandlesNV.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type Pipeline::getRayTracingShaderGroupHandleNV( uint32_t firstGroup,
-                                                                                                                                uint32_t groupCount ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType Pipeline::getRayTracingShaderGroupHandleNV( uint32_t firstGroup, uint32_t groupCount ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV &&
                          "Function <vkGetRayTracingShaderGroupHandlesNV> requires <VK_KHR_ray_tracing_pipeline> or <VK_NV_ray_tracing>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV( static_cast<VkDevice>( m_device ),
-                                                                                                 static_cast<VkPipeline>( m_pipeline ),
-                                                                                                 firstGroup,
-                                                                                                 groupCount,
-                                                                                                 sizeof( DataType ),
-                                                                                                 reinterpret_cast<void *>( &data ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandleNV" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetRayTracingShaderGroupHandlesNV( static_cast<VkDevice>( m_device ),
+                                                                                                         static_cast<VkPipeline>( m_pipeline ),
+                                                                                                         firstGroup,
+                                                                                                         groupCount,
+                                                                                                         sizeof( DataType ),
+                                                                                                         reinterpret_cast<void *>( &data ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::getRayTracingShaderGroupHandleNV" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetAccelerationStructureHandleNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type AccelerationStructureNV::getHandle( size_t dataSize ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType> AccelerationStructureNV::getHandle( size_t dataSize ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureHandleNV && "Function <vkGetAccelerationStructureHandleNV> requires <VK_NV_ray_tracing>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result =
-        static_cast<Result>( getDispatcher()->vkGetAccelerationStructureHandleNV( static_cast<VkDevice>( m_device ),
-                                                                                  static_cast<VkAccelerationStructureNV>( m_accelerationStructureNV ),
-                                                                                  data.size() * sizeof( DataType ),
-                                                                                  reinterpret_cast<void *>( data.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::AccelerationStructureNV::getHandle" );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetAccelerationStructureHandleNV( static_cast<VkDevice>( m_device ),
+                                                             static_cast<VkAccelerationStructureNV>( m_accelerationStructure ),
+                                                             data.size() * sizeof( DataType ),
+                                                             reinterpret_cast<void *>( data.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::AccelerationStructureNV::getHandle" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetAccelerationStructureHandleNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureHandleNV.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type AccelerationStructureNV::getHandle() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType AccelerationStructureNV::getHandle() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureHandleNV && "Function <vkGetAccelerationStructureHandleNV> requires <VK_NV_ray_tracing>" );
 
-      DataType data;
-      Result   result =
-        static_cast<Result>( getDispatcher()->vkGetAccelerationStructureHandleNV( static_cast<VkDevice>( m_device ),
-                                                                                  static_cast<VkAccelerationStructureNV>( m_accelerationStructureNV ),
-                                                                                  sizeof( DataType ),
-                                                                                  reinterpret_cast<void *>( &data ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::AccelerationStructureNV::getHandle" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetAccelerationStructureHandleNV( static_cast<VkDevice>( m_device ),
+                                                             static_cast<VkAccelerationStructureNV>( m_accelerationStructure ),
+                                                             sizeof( DataType ),
+                                                             reinterpret_cast<void *>( &data ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::AccelerationStructureNV::getHandle" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkCmdWriteAccelerationStructuresPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteAccelerationStructuresPropertiesNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::writeAccelerationStructuresPropertiesNV( ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
-                                                              QueryType                                                               queryType,
-                                                              VULKAN_HPP_NAMESPACE::QueryPool                                         queryPool,
-                                                              uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::writeAccelerationStructuresPropertiesNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures,
+      VULKAN_HPP_NAMESPACE::QueryType                                                               queryType,
+      VULKAN_HPP_NAMESPACE::QueryPool                                                               queryPool,
+      uint32_t                                                                                      firstQuery ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteAccelerationStructuresPropertiesNV &&
                          "Function <vkCmdWriteAccelerationStructuresPropertiesNV> requires <VK_NV_ray_tracing>" );
@@ -22669,29 +19020,24 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      firstQuery );
     }
 
-    // wrapper function for command vkCompileDeferredNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCompileDeferredNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Pipeline::compileDeferredNV( uint32_t shader ) const
+    VULKAN_HPP_INLINE void Pipeline::compileDeferredNV( uint32_t shader ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCompileDeferredNV && "Function <vkCompileDeferredNV> requires <VK_NV_ray_tracing>" );
 
-      Result result =
-        static_cast<Result>( getDispatcher()->vkCompileDeferredNV( static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( m_pipeline ), shader ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Pipeline::compileDeferredNV" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkCompileDeferredNV( static_cast<VkDevice>( m_device ), static_cast<VkPipeline>( m_pipeline ), shader ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Pipeline::compileDeferredNV" );
     }
 
     //=== VK_KHR_maintenance3 ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutSupport
-      Device::getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport
+      Device::getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutSupportKHR &&
                          "Function <vkGetDescriptorSetLayoutSupportKHR> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 
-      DescriptorSetLayoutSupport support;
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport support;
       getDispatcher()->vkGetDescriptorSetLayoutSupportKHR( static_cast<VkDevice>( m_device ),
                                                            reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
                                                            reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
@@ -22699,17 +19045,15 @@ namespace VULKAN_HPP_NAMESPACE
       return support;
     }
 
-    // wrapper function for command vkGetDescriptorSetLayoutSupportKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSupportKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getDescriptorSetLayoutSupportKHR( const DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getDescriptorSetLayoutSupportKHR( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutSupportKHR &&
                          "Function <vkGetDescriptorSetLayoutSupportKHR> requires <VK_KHR_maintenance3> or <VK_VERSION_1_1>" );
 
-      StructureChain<X, Y, Z...>   structureChain;
-      DescriptorSetLayoutSupport & support = structureChain.template get<DescriptorSetLayoutSupport>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>   structureChain;
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport & support = structureChain.template get<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>();
       getDispatcher()->vkGetDescriptorSetLayoutSupportKHR( static_cast<VkDevice>( m_device ),
                                                            reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( &createInfo ),
                                                            reinterpret_cast<VkDescriptorSetLayoutSupport *>( &support ) );
@@ -22719,13 +19063,12 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_draw_indirect_count ===
 
-    // wrapper function for command vkCmdDrawIndirectCountKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndirectCountKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                DeviceSize                   offset,
-                                                                VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                DeviceSize                   countBufferOffset,
-                                                                uint32_t                     maxDrawCount,
-                                                                uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                uint32_t                         maxDrawCount,
+                                                                uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawIndirectCountKHR &&
                          "Function <vkCmdDrawIndirectCountKHR> requires <VK_AMD_draw_indirect_count> or <VK_KHR_draw_indirect_count> or <VK_VERSION_1_2>" );
@@ -22739,14 +19082,12 @@ namespace VULKAN_HPP_NAMESPACE
                                                   stride );
     }
 
-    // wrapper function for command vkCmdDrawIndexedIndirectCountKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawIndexedIndirectCountKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                       DeviceSize                   offset,
-                                                                       VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                       DeviceSize                   countBufferOffset,
-                                                                       uint32_t                     maxDrawCount,
-                                                                       uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawIndexedIndirectCountKHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                       VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                       uint32_t                         maxDrawCount,
+                                                                       uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkCmdDrawIndexedIndirectCountKHR &&
@@ -22763,32 +19104,29 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_external_memory_host ===
 
-    // wrapper function for command vkGetMemoryHostPointerPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryHostPointerPropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryHostPointerPropertiesEXT>::type
-                         Device::getMemoryHostPointerPropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT
+      Device::getMemoryHostPointerPropertiesEXT( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, const void * pHostPointer ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryHostPointerPropertiesEXT &&
                          "Function <vkGetMemoryHostPointerPropertiesEXT> requires <VK_EXT_external_memory_host>" );
 
-      MemoryHostPointerPropertiesEXT memoryHostPointerProperties;
-      Result                         result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT memoryHostPointerProperties;
+      VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetMemoryHostPointerPropertiesEXT( static_cast<VkDevice>( m_device ),
                                                               static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
                                                               pHostPointer,
                                                               reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( &memoryHostPointerProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryHostPointerPropertiesEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryHostPointerPropertiesEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryHostPointerProperties ) );
+      return memoryHostPointerProperties;
     }
 
     //=== VK_AMD_buffer_marker ===
 
-    // wrapper function for command vkCmdWriteBufferMarkerAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarkerAMD.html
-    VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarkerAMD( PipelineStageFlagBits        pipelineStage,
-                                                                VULKAN_HPP_NAMESPACE::Buffer dstBuffer,
-                                                                DeviceSize                   dstOffset,
-                                                                uint32_t                     marker ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarkerAMD( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits pipelineStage,
+                                                                VULKAN_HPP_NAMESPACE::Buffer                dstBuffer,
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize            dstOffset,
+                                                                uint32_t                                    marker ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteBufferMarkerAMD && "Function <vkCmdWriteBufferMarkerAMD> requires <VK_AMD_buffer_marker>" );
 
@@ -22799,58 +19137,39 @@ namespace VULKAN_HPP_NAMESPACE
                                                   marker );
     }
 
-    // wrapper function for command vkCmdWriteBufferMarker2AMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteBufferMarker2AMD.html
-    VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarker2AMD( PipelineStageFlags2          stage,
-                                                                 VULKAN_HPP_NAMESPACE::Buffer dstBuffer,
-                                                                 DeviceSize                   dstOffset,
-                                                                 uint32_t                     marker ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteBufferMarker2AMD && "Function <vkCmdWriteBufferMarker2AMD> requires <VK_AMD_buffer_marker>" );
-
-      getDispatcher()->vkCmdWriteBufferMarker2AMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                   static_cast<VkPipelineStageFlags2>( stage ),
-                                                   static_cast<VkBuffer>( dstBuffer ),
-                                                   static_cast<VkDeviceSize>( dstOffset ),
-                                                   marker );
-    }
-
     //=== VK_EXT_calibrated_timestamps ===
 
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR>>::type PhysicalDevice::getCalibrateableTimeDomainsEXT() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> PhysicalDevice::getCalibrateableTimeDomainsEXT() const
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsEXT &&
         "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsEXT> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 
-      std::vector<TimeDomainKHR> timeDomains;
-      uint32_t                   timeDomainCount;
-      Result                     result;
+      std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> timeDomains;
+      uint32_t                                         timeDomainCount;
+      VULKAN_HPP_NAMESPACE::Result                     result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), &timeDomainCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && timeDomainCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
         {
           timeDomains.resize( timeDomainCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsEXT" );
       VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
       if ( timeDomainCount < timeDomains.size() )
       {
         timeDomains.resize( timeDomainCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
+      return timeDomains;
     }
 
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t>, uint64_t>>::type
-                         Device::getCalibratedTimestampsEXT( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<std::vector<uint64_t>, uint64_t> Device::getCalibratedTimestampsEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT &&
                          "Function <vkGetCalibratedTimestampsEXT> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
@@ -22858,21 +19177,19 @@ namespace VULKAN_HPP_NAMESPACE
       std::pair<std::vector<uint64_t>, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) );
       std::vector<uint64_t> &                    timestamps   = data_.first;
       uint64_t &                                 maxDeviation = data_.second;
-      Result                                     result =
-        static_cast<Result>( getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast<VkDevice>( m_device ),
-                                                                            timestampInfos.size(),
-                                                                            reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ),
-                                                                            timestamps.data(),
-                                                                            &maxDeviation ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
+      VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast<VkDevice>( m_device ),
+                                                       timestampInfos.size(),
+                                                       reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ),
+                                                       timestamps.data(),
+                                                       &maxDeviation ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
-    // wrapper function for command vkGetCalibratedTimestampsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-                         Device::getCalibratedTimestampEXT( const CalibratedTimestampInfoKHR & timestampInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<uint64_t, uint64_t>
+                                           Device::getCalibratedTimestampEXT( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT &&
                          "Function <vkGetCalibratedTimestampsEXT> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
@@ -22880,16 +19197,15 @@ namespace VULKAN_HPP_NAMESPACE
       std::pair<uint64_t, uint64_t> data_;
       uint64_t &                    timestamp    = data_.first;
       uint64_t &                    maxDeviation = data_.second;
-      Result                        result       = static_cast<Result>( getDispatcher()->vkGetCalibratedTimestampsEXT(
+      VULKAN_HPP_NAMESPACE::Result  result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetCalibratedTimestampsEXT(
         static_cast<VkDevice>( m_device ), 1, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( &timestampInfo ), &timestamp, &maxDeviation ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
     //=== VK_NV_mesh_shader ===
 
-    // wrapper function for command vkCmdDrawMeshTasksNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksNV.html
     VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksNV( uint32_t taskCount, uint32_t firstTask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksNV && "Function <vkCmdDrawMeshTasksNV> requires <VK_NV_mesh_shader>" );
@@ -22897,12 +19213,10 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDrawMeshTasksNV( static_cast<VkCommandBuffer>( m_commandBuffer ), taskCount, firstTask );
     }
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                   DeviceSize                   offset,
-                                                                   uint32_t                     drawCount,
-                                                                   uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                   VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                   uint32_t                         drawCount,
+                                                                   uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksIndirectNV && "Function <vkCmdDrawMeshTasksIndirectNV> requires <VK_NV_mesh_shader>" );
 
@@ -22910,14 +19224,12 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
     }
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectCountNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                        DeviceSize                   offset,
-                                                                        VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                        DeviceSize                   countBufferOffset,
-                                                                        uint32_t                     maxDrawCount,
-                                                                        uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountNV( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                        VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                        VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                        uint32_t                         maxDrawCount,
+                                                                        uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksIndirectCountNV && "Function <vkCmdDrawMeshTasksIndirectCountNV> requires <VK_NV_mesh_shader>" );
 
@@ -22932,10 +19244,9 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_scissor_exclusive ===
 
-    // wrapper function for command vkCmdSetExclusiveScissorEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorEnableNV( uint32_t                         firstExclusiveScissor,
-                                                                       ArrayProxy<const Bool32> const & exclusiveScissorEnables ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorEnableNV(
+      uint32_t                                                                     firstExclusiveScissor,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & exclusiveScissorEnables ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetExclusiveScissorEnableNV &&
                          "Function <vkCmdSetExclusiveScissorEnableNV> requires <VK_NV_scissor_exclusive>" );
@@ -22946,9 +19257,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                          reinterpret_cast<const VkBool32 *>( exclusiveScissorEnables.data() ) );
     }
 
-    // wrapper function for command vkCmdSetExclusiveScissorNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExclusiveScissorNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV( uint32_t                         firstExclusiveScissor,
-                                                                 ArrayProxy<const Rect2D> const & exclusiveScissors ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setExclusiveScissorNV(
+      uint32_t firstExclusiveScissor, VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetExclusiveScissorNV && "Function <vkCmdSetExclusiveScissorNV> requires <VK_NV_scissor_exclusive>" );
 
@@ -22960,7 +19270,6 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_device_diagnostic_checkpoints ===
 
-    // wrapper function for command vkCmdSetCheckpointNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCheckpointNV.html
     template <typename CheckpointMarkerType>
     VULKAN_HPP_INLINE void CommandBuffer::setCheckpointNV( CheckpointMarkerType const & checkpointMarker ) const VULKAN_HPP_NOEXCEPT
     {
@@ -22969,14 +19278,13 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetCheckpointNV( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const void *>( &checkpointMarker ) );
     }
 
-    // wrapper function for command vkGetQueueCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointDataNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointDataNV> Queue::getCheckpointDataNV() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV> Queue::getCheckpointDataNV() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetQueueCheckpointDataNV &&
                          "Function <vkGetQueueCheckpointDataNV> requires <VK_NV_device_diagnostic_checkpoints>" );
 
-      std::vector<CheckpointDataNV> checkpointData;
-      uint32_t                      checkpointDataCount;
+      std::vector<VULKAN_HPP_NAMESPACE::CheckpointDataNV> checkpointData;
+      uint32_t                                            checkpointDataCount;
       getDispatcher()->vkGetQueueCheckpointDataNV( static_cast<VkQueue>( m_queue ), &checkpointDataCount, nullptr );
       checkpointData.resize( checkpointDataCount );
       getDispatcher()->vkGetQueueCheckpointDataNV(
@@ -22990,152 +19298,55 @@ namespace VULKAN_HPP_NAMESPACE
       return checkpointData;
     }
 
-    // wrapper function for command vkGetQueueCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetQueueCheckpointData2NV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<CheckpointData2NV> Queue::getCheckpointData2NV() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetQueueCheckpointData2NV &&
-                         "Function <vkGetQueueCheckpointData2NV> requires <VK_NV_device_diagnostic_checkpoints>" );
-
-      std::vector<CheckpointData2NV> checkpointData;
-      uint32_t                       checkpointDataCount;
-      getDispatcher()->vkGetQueueCheckpointData2NV( static_cast<VkQueue>( m_queue ), &checkpointDataCount, nullptr );
-      checkpointData.resize( checkpointDataCount );
-      getDispatcher()->vkGetQueueCheckpointData2NV(
-        static_cast<VkQueue>( m_queue ), &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
-
-      VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
-      if ( checkpointDataCount < checkpointData.size() )
-      {
-        checkpointData.resize( checkpointDataCount );
-      }
-      return checkpointData;
-    }
-
     //=== VK_KHR_timeline_semaphore ===
 
-    // wrapper function for command vkGetSemaphoreCounterValueKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreCounterValueKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Semaphore::getCounterValueKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Semaphore::getCounterValueKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreCounterValueKHR &&
                          "Function <vkGetSemaphoreCounterValueKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 
-      uint64_t value;
-      Result   result = static_cast<Result>(
+      uint64_t                     value;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetSemaphoreCounterValueKHR( static_cast<VkDevice>( m_device ), static_cast<VkSemaphore>( m_semaphore ), &value ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Semaphore::getCounterValueKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Semaphore::getCounterValueKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
+      return value;
     }
 
-    // wrapper function for command vkWaitSemaphoresKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitSemaphoresKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::waitSemaphoresKHR( const SemaphoreWaitInfo & waitInfo, uint64_t timeout ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::waitSemaphoresKHR( const VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo & waitInfo,
+                                                                                                   uint64_t timeout ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWaitSemaphoresKHR && "Function <vkWaitSemaphoresKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkWaitSemaphoresKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreWaitInfo *>( &waitInfo ), timeout ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::waitSemaphoresKHR", { Result::eSuccess, Result::eTimeout } );
+        result, VULKAN_HPP_NAMESPACE_STRING "::Device::waitSemaphoresKHR", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkSignalSemaphoreKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSignalSemaphoreKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::signalSemaphoreKHR( const SemaphoreSignalInfo & signalInfo ) const
+    VULKAN_HPP_INLINE void Device::signalSemaphoreKHR( const VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo & signalInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSignalSemaphoreKHR && "Function <vkSignalSemaphoreKHR> requires <VK_KHR_timeline_semaphore> or <VK_VERSION_1_2>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkSignalSemaphoreKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreSignalInfo *>( &signalInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::signalSemaphoreKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    //=== VK_EXT_present_timing ===
-
-    // wrapper function for command vkSetSwapchainPresentTimingQueueSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetSwapchainPresentTimingQueueSizeEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result SwapchainKHR::setPresentTimingQueueSizeEXT( uint32_t size ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkSetSwapchainPresentTimingQueueSizeEXT &&
-                         "Function <vkSetSwapchainPresentTimingQueueSizeEXT> requires <VK_EXT_present_timing>" );
-
-      Result result = static_cast<Result>(
-        getDispatcher()->vkSetSwapchainPresentTimingQueueSizeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), size ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::setPresentTimingQueueSizeEXT", { Result::eSuccess, Result::eNotReady } );
-
-      return static_cast<Result>( result );
-    }
-
-    // wrapper function for command vkGetSwapchainTimingPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimingPropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>> SwapchainKHR::getTimingPropertiesEXT() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainTimingPropertiesEXT &&
-                         "Function <vkGetSwapchainTimingPropertiesEXT> requires <VK_EXT_present_timing>" );
-
-      std::pair<SwapchainTimingPropertiesEXT, uint64_t> data_;
-      SwapchainTimingPropertiesEXT &                    swapchainTimingProperties        = data_.first;
-      uint64_t &                                        swapchainTimingPropertiesCounter = data_.second;
-      Result                                            result                           = static_cast<Result>(
-        getDispatcher()->vkGetSwapchainTimingPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                            static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                            reinterpret_cast<VkSwapchainTimingPropertiesEXT *>( &swapchainTimingProperties ),
-                                                            &swapchainTimingPropertiesCounter ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::getTimingPropertiesEXT", { Result::eSuccess, Result::eNotReady } );
-
-      return ResultValue<std::pair<SwapchainTimingPropertiesEXT, uint64_t>>( result, std::move( data_ ) );
-    }
-
-    // wrapper function for command vkGetSwapchainTimeDomainPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainTimeDomainPropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result SwapchainKHR::getTimeDomainPropertiesEXT( SwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
-                                                                                            uint64_t * pTimeDomainsCounter ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainTimeDomainPropertiesEXT &&
-                         "Function <vkGetSwapchainTimeDomainPropertiesEXT> requires <VK_EXT_present_timing>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetSwapchainTimeDomainPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                reinterpret_cast<VkSwapchainTimeDomainPropertiesEXT *>( pSwapchainTimeDomainProperties ),
-                                                                pTimeDomainsCounter ) );
-    }  // wrapper function for command vkGetPastPresentationTimingEXT, see
-       // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPastPresentationTimingEXT.html
-
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-      Device::getPastPresentationTimingEXT( const PastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
-                                            PastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPastPresentationTimingEXT && "Function <vkGetPastPresentationTimingEXT> requires <VK_EXT_present_timing>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetPastPresentationTimingEXT( static_cast<VkDevice>( m_device ),
-                                                         reinterpret_cast<const VkPastPresentationTimingInfoEXT *>( pPastPresentationTimingInfo ),
-                                                         reinterpret_cast<VkPastPresentationTimingPropertiesEXT *>( pPastPresentationTimingProperties ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::signalSemaphoreKHR" );
     }
 
     //=== VK_INTEL_performance_query ===
 
-    // wrapper function for command vkInitializePerformanceApiINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkInitializePerformanceApiINTEL.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::initializePerformanceApiINTEL( const InitializePerformanceApiInfoINTEL & initializeInfo ) const
+    VULKAN_HPP_INLINE void Device::initializePerformanceApiINTEL( const VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL & initializeInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkInitializePerformanceApiINTEL &&
                          "Function <vkInitializePerformanceApiINTEL> requires <VK_INTEL_performance_query>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkInitializePerformanceApiINTEL(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkInitializePerformanceApiINTEL(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( &initializeInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::initializePerformanceApiINTEL" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::initializePerformanceApiINTEL" );
     }
 
-    // wrapper function for command vkUninitializePerformanceApiINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUninitializePerformanceApiINTEL.html
     VULKAN_HPP_INLINE void Device::uninitializePerformanceApiINTEL() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkUninitializePerformanceApiINTEL &&
@@ -23144,181 +19355,183 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkUninitializePerformanceApiINTEL( static_cast<VkDevice>( m_device ) );
     }
 
-    // wrapper function for command vkCmdSetPerformanceMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceMarkerINTEL.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::setPerformanceMarkerINTEL( const PerformanceMarkerInfoINTEL & markerInfo ) const
+    VULKAN_HPP_INLINE void CommandBuffer::setPerformanceMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL & markerInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPerformanceMarkerINTEL && "Function <vkCmdSetPerformanceMarkerINTEL> requires <VK_INTEL_performance_query>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCmdSetPerformanceMarkerINTEL(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCmdSetPerformanceMarkerINTEL(
         static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( &markerInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::setPerformanceMarkerINTEL" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceMarkerINTEL" );
     }
 
-    // wrapper function for command vkCmdSetPerformanceStreamMarkerINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceStreamMarkerINTEL.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      CommandBuffer::setPerformanceStreamMarkerINTEL( const PerformanceStreamMarkerInfoINTEL & markerInfo ) const
+    VULKAN_HPP_INLINE void CommandBuffer::setPerformanceStreamMarkerINTEL( const VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL & markerInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPerformanceStreamMarkerINTEL &&
                          "Function <vkCmdSetPerformanceStreamMarkerINTEL> requires <VK_INTEL_performance_query>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCmdSetPerformanceStreamMarkerINTEL(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCmdSetPerformanceStreamMarkerINTEL(
         static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPerformanceStreamMarkerInfoINTEL *>( &markerInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::setPerformanceStreamMarkerINTEL" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceStreamMarkerINTEL" );
     }
 
-    // wrapper function for command vkCmdSetPerformanceOverrideINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPerformanceOverrideINTEL.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type CommandBuffer::setPerformanceOverrideINTEL( const PerformanceOverrideInfoINTEL & overrideInfo ) const
+    VULKAN_HPP_INLINE void CommandBuffer::setPerformanceOverrideINTEL( const VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL & overrideInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPerformanceOverrideINTEL &&
                          "Function <vkCmdSetPerformanceOverrideINTEL> requires <VK_INTEL_performance_query>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCmdSetPerformanceOverrideINTEL(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCmdSetPerformanceOverrideINTEL(
         static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( &overrideInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CommandBuffer::setPerformanceOverrideINTEL" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CommandBuffer::setPerformanceOverrideINTEL" );
     }
 
-    // wrapper function for command vkAcquirePerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquirePerformanceConfigurationINTEL.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PerformanceConfigurationINTEL>::type
-      Device::acquirePerformanceConfigurationINTEL( PerformanceConfigurationAcquireInfoINTEL const & acquireInfo ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PerformanceConfigurationINTEL>::Type
+      Device::acquirePerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL const & acquireInfo ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration;
-      Result                                              result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result                        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkAcquirePerformanceConfigurationINTEL( static_cast<VkDevice>( m_device ),
                                                                  reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( &acquireInfo ),
                                                                  reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::acquirePerformanceConfigurationINTEL" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, PerformanceConfigurationINTEL( *this, *reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::acquirePerformanceConfigurationINTEL" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PerformanceConfigurationINTEL(
+        *this, *reinterpret_cast<VkPerformanceConfigurationINTEL *>( &configuration ) );
     }
 
-    // wrapper function for command vkQueueSetPerformanceConfigurationINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSetPerformanceConfigurationINTEL.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Queue::setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration ) const
+    VULKAN_HPP_INLINE void Queue::setPerformanceConfigurationINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL configuration ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSetPerformanceConfigurationINTEL &&
                          "Function <vkQueueSetPerformanceConfigurationINTEL> requires <VK_INTEL_performance_query>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkQueueSetPerformanceConfigurationINTEL(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueSetPerformanceConfigurationINTEL(
         static_cast<VkQueue>( m_queue ), static_cast<VkPerformanceConfigurationINTEL>( configuration ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::setPerformanceConfigurationINTEL" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::setPerformanceConfigurationINTEL" );
     }
 
-    // wrapper function for command vkGetPerformanceParameterINTEL, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPerformanceParameterINTEL.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PerformanceValueINTEL>::type
-                         Device::getPerformanceParameterINTEL( PerformanceParameterTypeINTEL parameter ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::PerformanceValueINTEL
+                                           Device::getPerformanceParameterINTEL( VULKAN_HPP_NAMESPACE::PerformanceParameterTypeINTEL parameter ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPerformanceParameterINTEL && "Function <vkGetPerformanceParameterINTEL> requires <VK_INTEL_performance_query>" );
 
-      PerformanceValueINTEL value;
-      Result                result = static_cast<Result>( getDispatcher()->vkGetPerformanceParameterINTEL(
+      VULKAN_HPP_NAMESPACE::PerformanceValueINTEL value;
+      VULKAN_HPP_NAMESPACE::Result                result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPerformanceParameterINTEL(
         static_cast<VkDevice>( m_device ), static_cast<VkPerformanceParameterTypeINTEL>( parameter ), reinterpret_cast<VkPerformanceValueINTEL *>( &value ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPerformanceParameterINTEL" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPerformanceParameterINTEL" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( value ) );
+      return value;
     }
 
     //=== VK_AMD_display_native_hdr ===
 
-    // wrapper function for command vkSetLocalDimmingAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLocalDimmingAMD.html
-    VULKAN_HPP_INLINE void SwapchainKHR::setLocalDimmingAMD( Bool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void SwapchainKHR::setLocalDimmingAMD( VULKAN_HPP_NAMESPACE::Bool32 localDimmingEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetLocalDimmingAMD && "Function <vkSetLocalDimmingAMD> requires <VK_AMD_display_native_hdr>" );
 
       getDispatcher()->vkSetLocalDimmingAMD(
-        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), static_cast<VkBool32>( localDimmingEnable ) );
+        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), static_cast<VkBool32>( localDimmingEnable ) );
     }
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_imagepipe_surface ===
 
-    // wrapper function for command vkCreateImagePipeSurfaceFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateImagePipeSurfaceFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createImagePipeSurfaceFUCHSIA( ImagePipeSurfaceCreateInfoFUCHSIA const & createInfo,
-                                               Optional<const AllocationCallbacks>       allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createImagePipeSurfaceFUCHSIA( VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA const &                 createInfo,
+                                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result =
-        static_cast<Result>( getDispatcher()->vkCreateImagePipeSurfaceFUCHSIA( static_cast<VkInstance>( m_instance ),
-                                                                               reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createImagePipeSurfaceFUCHSIA" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateImagePipeSurfaceFUCHSIA(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createImagePipeSurfaceFUCHSIA" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
     //=== VK_EXT_metal_surface ===
 
-    // wrapper function for command vkCreateMetalSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMetalSurfaceEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createMetalSurfaceEXT( MetalSurfaceCreateInfoEXT const &   createInfo,
-                                       Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createMetalSurfaceEXT( VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT const &                         createInfo,
+                                       VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateMetalSurfaceEXT( static_cast<VkInstance>( m_instance ),
-                                                                                     reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                                     reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                     reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createMetalSurfaceEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateMetalSurfaceEXT(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createMetalSurfaceEXT" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_KHR_fragment_shading_rate ===
 
-    // wrapper function for command vkGetPhysicalDeviceFragmentShadingRatesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceFragmentShadingRatesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceFragmentShadingRateKHR>>::type
-                         PhysicalDevice::getFragmentShadingRatesKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>
+                                           PhysicalDevice::getFragmentShadingRatesKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceFragmentShadingRatesKHR &&
                          "Function <vkGetPhysicalDeviceFragmentShadingRatesKHR> requires <VK_KHR_fragment_shading_rate>" );
 
-      std::vector<PhysicalDeviceFragmentShadingRateKHR> fragmentShadingRates;
-      uint32_t                                          fragmentShadingRateCount;
-      Result                                            result;
+      std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR> fragmentShadingRates;
+      uint32_t                                                                fragmentShadingRateCount;
+      VULKAN_HPP_NAMESPACE::Result                                            result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceFragmentShadingRatesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceFragmentShadingRatesKHR(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), &fragmentShadingRateCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && fragmentShadingRateCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && fragmentShadingRateCount )
         {
           fragmentShadingRates.resize( fragmentShadingRateCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceFragmentShadingRatesKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceFragmentShadingRatesKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ),
             &fragmentShadingRateCount,
             reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( fragmentShadingRates.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getFragmentShadingRatesKHR" );
       VULKAN_HPP_ASSERT( fragmentShadingRateCount <= fragmentShadingRates.size() );
       if ( fragmentShadingRateCount < fragmentShadingRates.size() )
       {
         fragmentShadingRates.resize( fragmentShadingRateCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( fragmentShadingRates ) );
+      return fragmentShadingRates;
     }
 
-    // wrapper function for command vkCmdSetFragmentShadingRateKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateKHR( const Extent2D &                       fragmentSize,
-                                                                     const FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setFragmentShadingRateKHR( const VULKAN_HPP_NAMESPACE::Extent2D &                       fragmentSize,
+                                                const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetFragmentShadingRateKHR &&
                          "Function <vkCmdSetFragmentShadingRateKHR> requires <VK_KHR_fragment_shading_rate>" );
@@ -23330,33 +19543,30 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_dynamic_rendering_local_read ===
 
-    // wrapper function for command vkCmdSetRenderingAttachmentLocationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingAttachmentLocationsKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR( const RenderingAttachmentLocationInfo & locationInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setRenderingAttachmentLocationsKHR(
+      const VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR & locationInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRenderingAttachmentLocationsKHR &&
-                         "Function <vkCmdSetRenderingAttachmentLocationsKHR> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
+                         "Function <vkCmdSetRenderingAttachmentLocationsKHR> requires <VK_KHR_dynamic_rendering_local_read>" );
 
       getDispatcher()->vkCmdSetRenderingAttachmentLocationsKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( &locationInfo ) );
+                                                                reinterpret_cast<const VkRenderingAttachmentLocationInfoKHR *>( &locationInfo ) );
     }
 
-    // wrapper function for command vkCmdSetRenderingInputAttachmentIndicesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRenderingInputAttachmentIndicesKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setRenderingInputAttachmentIndicesKHR( const RenderingInputAttachmentIndexInfo & inputAttachmentIndexInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setRenderingInputAttachmentIndicesKHR(
+      const VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR & locationInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRenderingInputAttachmentIndicesKHR &&
-                         "Function <vkCmdSetRenderingInputAttachmentIndicesKHR> requires <VK_KHR_dynamic_rendering_local_read> or <VK_VERSION_1_4>" );
+                         "Function <vkCmdSetRenderingInputAttachmentIndicesKHR> requires <VK_KHR_dynamic_rendering_local_read>" );
 
       getDispatcher()->vkCmdSetRenderingInputAttachmentIndicesKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                   reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( &inputAttachmentIndexInfo ) );
+                                                                   reinterpret_cast<const VkRenderingInputAttachmentIndexInfoKHR *>( &locationInfo ) );
     }
 
     //=== VK_EXT_buffer_device_address ===
 
-    // wrapper function for command vkGetBufferDeviceAddressEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressEXT( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+                                           Device::getBufferAddressEXT( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetBufferDeviceAddressEXT &&
@@ -23365,240 +19575,224 @@ namespace VULKAN_HPP_NAMESPACE
       VkDeviceAddress result =
         getDispatcher()->vkGetBufferDeviceAddressEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
 
-      return static_cast<DeviceAddress>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
     }
 
     //=== VK_EXT_tooling_info ===
 
-    // wrapper function for command vkGetPhysicalDeviceToolPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceToolPropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PhysicalDeviceToolProperties>>::type
-                         PhysicalDevice::getToolPropertiesEXT() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> PhysicalDevice::getToolPropertiesEXT() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceToolPropertiesEXT &&
                          "Function <vkGetPhysicalDeviceToolPropertiesEXT> requires <VK_EXT_tooling_info> or <VK_VERSION_1_3>" );
 
-      std::vector<PhysicalDeviceToolProperties> toolProperties;
-      uint32_t                                  toolCount;
-      Result                                    result;
+      std::vector<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties> toolProperties;
+      uint32_t                                                        toolCount;
+      VULKAN_HPP_NAMESPACE::Result                                    result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceToolPropertiesEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), &toolCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && toolCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && toolCount )
         {
           toolProperties.resize( toolCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceToolPropertiesEXT(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceToolPropertiesEXT(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &toolCount, reinterpret_cast<VkPhysicalDeviceToolProperties *>( toolProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getToolPropertiesEXT" );
       VULKAN_HPP_ASSERT( toolCount <= toolProperties.size() );
       if ( toolCount < toolProperties.size() )
       {
         toolProperties.resize( toolCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( toolProperties ) );
+      return toolProperties;
     }
 
     //=== VK_KHR_present_wait ===
 
-    // wrapper function for command vkWaitForPresentKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresentKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result SwapchainKHR::waitForPresent( uint64_t presentId, uint64_t timeout ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result SwapchainKHR::waitForPresent( uint64_t presentId, uint64_t timeout ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWaitForPresentKHR && "Function <vkWaitForPresentKHR> requires <VK_KHR_present_wait>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkWaitForPresentKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), presentId, timeout ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::waitForPresent",
-                                                 { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkWaitForPresentKHR( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), presentId, timeout ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::waitForPresent", { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR } );
-#  endif
+        result,
+        VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::waitForPresent",
+        { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eTimeout, VULKAN_HPP_NAMESPACE::Result::eSuboptimalKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
     //=== VK_NV_cooperative_matrix ===
 
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesNV>>::type
-                         PhysicalDevice::getCooperativeMatrixPropertiesNV() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV>
+                                           PhysicalDevice::getCooperativeMatrixPropertiesNV() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesNV &&
                          "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesNV> requires <VK_NV_cooperative_matrix>" );
 
-      std::vector<CooperativeMatrixPropertiesNV> properties;
-      uint32_t                                   propertyCount;
-      Result                                     result;
+      std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV> properties;
+      uint32_t                                                         propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                     result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesNV" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
     //=== VK_NV_coverage_reduction_mode ===
 
-    // wrapper function for command vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<FramebufferMixedSamplesCombinationNV>>::type
-                         PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV>
+                                           PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV &&
                          "Function <vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV> requires <VK_NV_coverage_reduction_mode>" );
 
-      std::vector<FramebufferMixedSamplesCombinationNV> combinations;
-      uint32_t                                          combinationCount;
-      Result                                            result;
+      std::vector<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV> combinations;
+      uint32_t                                                                combinationCount;
+      VULKAN_HPP_NAMESPACE::Result                                            result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
           static_cast<VkPhysicalDevice>( m_physicalDevice ), &combinationCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && combinationCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && combinationCount )
         {
           combinations.resize( combinationCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(
             static_cast<VkPhysicalDevice>( m_physicalDevice ),
             &combinationCount,
             reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( combinations.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSupportedFramebufferMixedSamplesCombinationsNV" );
       VULKAN_HPP_ASSERT( combinationCount <= combinations.size() );
       if ( combinationCount < combinations.size() )
       {
         combinations.resize( combinationCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( combinations ) );
+      return combinations;
     }
 
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_EXT_full_screen_exclusive ===
 
-    // wrapper function for command vkGetPhysicalDeviceSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceSurfacePresentModes2EXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PresentModeKHR>>::type
-                         PhysicalDevice::getSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR>
+      PhysicalDevice::getSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceSurfacePresentModes2EXT &&
                          "Function <vkGetPhysicalDeviceSurfacePresentModes2EXT> requires <VK_EXT_full_screen_exclusive>" );
 
-      std::vector<PresentModeKHR> presentModes;
-      uint32_t                    presentModeCount;
-      Result                      result;
+      std::vector<VULKAN_HPP_NAMESPACE::PresentModeKHR> presentModes;
+      uint32_t                                          presentModeCount;
+      VULKAN_HPP_NAMESPACE::Result                      result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceSurfacePresentModes2EXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                        reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                        &presentModeCount,
                                                                        nullptr ) );
-        if ( ( result == Result::eSuccess ) && presentModeCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && presentModeCount )
         {
           presentModes.resize( presentModeCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPhysicalDeviceSurfacePresentModes2EXT( static_cast<VkPhysicalDevice>( m_physicalDevice ),
                                                                          reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                          &presentModeCount,
                                                                          reinterpret_cast<VkPresentModeKHR *>( presentModes.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getSurfacePresentModes2EXT" );
       VULKAN_HPP_ASSERT( presentModeCount <= presentModes.size() );
       if ( presentModeCount < presentModes.size() )
       {
         presentModes.resize( presentModeCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( presentModes ) );
+      return presentModes;
     }
 
-    // wrapper function for command vkAcquireFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireFullScreenExclusiveModeEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type SwapchainKHR::acquireFullScreenExclusiveModeEXT() const
+    VULKAN_HPP_INLINE void SwapchainKHR::acquireFullScreenExclusiveModeEXT() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireFullScreenExclusiveModeEXT &&
                          "Function <vkAcquireFullScreenExclusiveModeEXT> requires <VK_EXT_full_screen_exclusive>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkAcquireFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::acquireFullScreenExclusiveModeEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkAcquireFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::acquireFullScreenExclusiveModeEXT" );
     }
 
-    // wrapper function for command vkReleaseFullScreenExclusiveModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseFullScreenExclusiveModeEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type SwapchainKHR::releaseFullScreenExclusiveModeEXT() const
+    VULKAN_HPP_INLINE void SwapchainKHR::releaseFullScreenExclusiveModeEXT() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseFullScreenExclusiveModeEXT &&
                          "Function <vkReleaseFullScreenExclusiveModeEXT> requires <VK_EXT_full_screen_exclusive>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkReleaseFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::releaseFullScreenExclusiveModeEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkReleaseFullScreenExclusiveModeEXT( static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::releaseFullScreenExclusiveModeEXT" );
     }
 
-    // wrapper function for command vkGetDeviceGroupSurfacePresentModes2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceGroupSurfacePresentModes2EXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeviceGroupPresentModeFlagsKHR>::type
-                         Device::getGroupSurfacePresentModes2EXT( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR
+      Device::getGroupSurfacePresentModes2EXT( const VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR & surfaceInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceGroupSurfacePresentModes2EXT &&
                          "Function <vkGetDeviceGroupSurfacePresentModes2EXT> requires <VK_EXT_full_screen_exclusive>" );
 
-      DeviceGroupPresentModeFlagsKHR modes;
-      Result                         result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes;
+      VULKAN_HPP_NAMESPACE::Result                         result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetDeviceGroupSurfacePresentModes2EXT( static_cast<VkDevice>( m_device ),
                                                                   reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( &surfaceInfo ),
                                                                   reinterpret_cast<VkDeviceGroupPresentModeFlagsKHR *>( &modes ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getGroupSurfacePresentModes2EXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getGroupSurfacePresentModes2EXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( modes ) );
+      return modes;
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
     //=== VK_EXT_headless_surface ===
 
-    // wrapper function for command vkCreateHeadlessSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateHeadlessSurfaceEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createHeadlessSurfaceEXT( HeadlessSurfaceCreateInfoEXT const & createInfo,
-                                          Optional<const AllocationCallbacks>  allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createHeadlessSurfaceEXT( VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT const &                      createInfo,
+                                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateHeadlessSurfaceEXT( static_cast<VkInstance>( m_instance ),
-                                                                                        reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createHeadlessSurfaceEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateHeadlessSurfaceEXT(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createHeadlessSurfaceEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
     //=== VK_KHR_buffer_device_address ===
 
-    // wrapper function for command vkGetBufferDeviceAddressKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferDeviceAddressKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceAddress Device::getBufferAddressKHR( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+                                           Device::getBufferAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetBufferDeviceAddressKHR &&
@@ -23607,12 +19801,11 @@ namespace VULKAN_HPP_NAMESPACE
       VkDeviceAddress result =
         getDispatcher()->vkGetBufferDeviceAddressKHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferDeviceAddressInfo *>( &info ) );
 
-      return static_cast<DeviceAddress>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
     }
 
-    // wrapper function for command vkGetBufferOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureAddressKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getBufferOpaqueCaptureAddressKHR( const BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
+      Device::getBufferOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferOpaqueCaptureAddressKHR &&
                          "Function <vkGetBufferOpaqueCaptureAddressKHR> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
@@ -23623,10 +19816,8 @@ namespace VULKAN_HPP_NAMESPACE
       return result;
     }
 
-    // wrapper function for command vkGetDeviceMemoryOpaqueCaptureAddressKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMemoryOpaqueCaptureAddressKHR.html
     VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t
-      Device::getMemoryOpaqueCaptureAddressKHR( const DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
+      Device::getMemoryOpaqueCaptureAddressKHR( const VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceMemoryOpaqueCaptureAddressKHR &&
                          "Function <vkGetDeviceMemoryOpaqueCaptureAddressKHR> requires <VK_KHR_buffer_device_address> or <VK_VERSION_1_2>" );
@@ -23639,18 +19830,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_line_rasterization ===
 
-    // wrapper function for command vkCmdSetLineStippleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::setLineStippleEXT( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineStippleEXT &&
-                         "Function <vkCmdSetLineStippleEXT> requires <VK_EXT_line_rasterization> or <VK_KHR_line_rasterization> or <VK_VERSION_1_4>" );
+                         "Function <vkCmdSetLineStippleEXT> requires <VK_EXT_line_rasterization> or <VK_KHR_line_rasterization>" );
 
       getDispatcher()->vkCmdSetLineStippleEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
     }
 
     //=== VK_EXT_host_query_reset ===
 
-    // wrapper function for command vkResetQueryPoolEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkResetQueryPoolEXT.html
     VULKAN_HPP_INLINE void QueryPool::resetEXT( uint32_t firstQuery, uint32_t queryCount ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkResetQueryPoolEXT && "Function <vkResetQueryPoolEXT> requires <VK_EXT_host_query_reset> or <VK_VERSION_1_2>" );
@@ -23660,8 +19849,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_extended_dynamic_state ===
 
-    // wrapper function for command vkCmdSetCullModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCullModeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCullModeEXT( CullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setCullModeEXT( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCullModeEXT &&
                          "Function <vkCmdSetCullModeEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23669,8 +19857,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetCullModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCullModeFlags>( cullMode ) );
     }
 
-    // wrapper function for command vkCmdSetFrontFaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFrontFaceEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setFrontFaceEXT( FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setFrontFaceEXT( VULKAN_HPP_NAMESPACE::FrontFace frontFace ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetFrontFaceEXT &&
                          "Function <vkCmdSetFrontFaceEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23678,9 +19865,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetFrontFaceEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkFrontFace>( frontFace ) );
     }
 
-    // wrapper function for command vkCmdSetPrimitiveTopologyEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveTopologyEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopologyEXT( PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveTopologyEXT( VULKAN_HPP_NAMESPACE::PrimitiveTopology primitiveTopology ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPrimitiveTopologyEXT &&
                          "Function <vkCmdSetPrimitiveTopologyEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23688,9 +19873,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetPrimitiveTopologyEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPrimitiveTopology>( primitiveTopology ) );
     }
 
-    // wrapper function for command vkCmdSetViewportWithCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWithCountEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCountEXT( ArrayProxy<const Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setViewportWithCountEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportWithCountEXT &&
                          "Function <vkCmdSetViewportWithCountEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23699,8 +19883,8 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), viewports.size(), reinterpret_cast<const VkViewport *>( viewports.data() ) );
     }
 
-    // wrapper function for command vkCmdSetScissorWithCountEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetScissorWithCountEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setScissorWithCountEXT( ArrayProxy<const Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setScissorWithCountEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetScissorWithCountEXT &&
                          "Function <vkCmdSetScissorWithCountEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23709,12 +19893,12 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), scissors.size(), reinterpret_cast<const VkRect2D *>( scissors.data() ) );
     }
 
-    // wrapper function for command vkCmdBindVertexBuffers2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindVertexBuffers2EXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindVertexBuffers2EXT( uint32_t                                               firstBinding,
-                                                                 ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers,
-                                                                 ArrayProxy<const DeviceSize> const &                   offsets,
-                                                                 ArrayProxy<const DeviceSize> const &                   sizes,
-                                                                 ArrayProxy<const DeviceSize> const &                   strides ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::bindVertexBuffers2EXT( uint32_t                                                                         firstBinding,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Buffer> const &     buffers,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & sizes,
+                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & strides ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindVertexBuffers2EXT &&
                          "Function <vkCmdBindVertexBuffers2EXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23746,8 +19930,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                    reinterpret_cast<const VkDeviceSize *>( strides.data() ) );
     }
 
-    // wrapper function for command vkCmdSetDepthTestEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthTestEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnableEXT( Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthTestEnableEXT &&
                          "Function <vkCmdSetDepthTestEnableEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23755,8 +19938,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthWriteEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnableEXT( Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthWriteEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthWriteEnableEXT &&
                          "Function <vkCmdSetDepthWriteEnableEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23764,8 +19946,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthWriteEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthWriteEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthCompareOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthCompareOpEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOpEXT( CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthCompareOpEXT( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthCompareOpEXT &&
                          "Function <vkCmdSetDepthCompareOpEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23773,9 +19954,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthCompareOpEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkCompareOp>( depthCompareOp ) );
     }
 
-    // wrapper function for command vkCmdSetDepthBoundsTestEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBoundsTestEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnableEXT( Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBoundsTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBoundsTestEnableEXT &&
                          "Function <vkCmdSetDepthBoundsTestEnableEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23783,9 +19962,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthBoundsTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBoundsTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetStencilTestEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilTestEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnableEXT( Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilTestEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilTestEnableEXT &&
                          "Function <vkCmdSetStencilTestEnableEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23793,9 +19970,11 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetStencilTestEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stencilTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetStencilOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetStencilOpEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setStencilOpEXT(
-      StencilFaceFlags faceMask, StencilOp failOp, StencilOp passOp, StencilOp depthFailOp, CompareOp compareOp ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setStencilOpEXT( VULKAN_HPP_NAMESPACE::StencilFaceFlags faceMask,
+                                                           VULKAN_HPP_NAMESPACE::StencilOp        failOp,
+                                                           VULKAN_HPP_NAMESPACE::StencilOp        passOp,
+                                                           VULKAN_HPP_NAMESPACE::StencilOp        depthFailOp,
+                                                           VULKAN_HPP_NAMESPACE::CompareOp        compareOp ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetStencilOpEXT &&
                          "Function <vkCmdSetStencilOpEXT> requires <VK_EXT_extended_dynamic_state> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -23810,310 +19989,282 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_deferred_host_operations ===
 
-    // wrapper function for command vkCreateDeferredOperationKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDeferredOperationKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DeferredOperationKHR>::type
-                         Device::createDeferredOperationKHR( Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR>::Type
+      Device::createDeferredOperationKHR( VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation;
-      Result                                     result = static_cast<Result>( getDispatcher()->vkCreateDeferredOperationKHR( static_cast<VkDevice>( m_device ),
-                                                                                          reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                          reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDeferredOperationKHR" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DeferredOperationKHR( *this, *reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDeferredOperationKHR(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createDeferredOperationKHR" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeferredOperationKHR(
+        *this, *reinterpret_cast<VkDeferredOperationKHR *>( &deferredOperation ), allocator );
     }
 
-    // wrapper function for command vkGetDeferredOperationMaxConcurrencyKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationMaxConcurrencyKHR.html
     VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t DeferredOperationKHR::getMaxConcurrency() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeferredOperationMaxConcurrencyKHR &&
                          "Function <vkGetDeferredOperationMaxConcurrencyKHR> requires <VK_KHR_deferred_host_operations>" );
 
-      uint32_t result = getDispatcher()->vkGetDeferredOperationMaxConcurrencyKHR( static_cast<VkDevice>( m_device ),
-                                                                                  static_cast<VkDeferredOperationKHR>( m_deferredOperationKHR ) );
+      uint32_t result =
+        getDispatcher()->vkGetDeferredOperationMaxConcurrencyKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_operation ) );
 
       return result;
     }
 
-    // wrapper function for command vkGetDeferredOperationResultKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeferredOperationResultKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result DeferredOperationKHR::getResult() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result DeferredOperationKHR::getResult() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeferredOperationResultKHR &&
                          "Function <vkGetDeferredOperationResultKHR> requires <VK_KHR_deferred_host_operations>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkGetDeferredOperationResultKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_deferredOperationKHR ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DeferredOperationKHR::getResult", { Result::eSuccess, Result::eNotReady } );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetDeferredOperationResultKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_operation ) ) );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkDeferredOperationJoinKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDeferredOperationJoinKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result DeferredOperationKHR::join() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result DeferredOperationKHR::join() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDeferredOperationJoinKHR && "Function <vkDeferredOperationJoinKHR> requires <VK_KHR_deferred_host_operations>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkDeferredOperationJoinKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_deferredOperationKHR ) ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkDeferredOperationJoinKHR( static_cast<VkDevice>( m_device ), static_cast<VkDeferredOperationKHR>( m_operation ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DeferredOperationKHR::join", { Result::eSuccess, Result::eThreadDoneKHR, Result::eThreadIdleKHR } );
+        result,
+        VULKAN_HPP_NAMESPACE_STRING "::DeferredOperationKHR::join",
+        { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eThreadDoneKHR, VULKAN_HPP_NAMESPACE::Result::eThreadIdleKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
     //=== VK_KHR_pipeline_executable_properties ===
 
-    // wrapper function for command vkGetPipelineExecutablePropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutablePropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutablePropertiesKHR>>::type
-                         Device::getPipelineExecutablePropertiesKHR( const PipelineInfoKHR & pipelineInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR>
+                                           Device::getPipelineExecutablePropertiesKHR( const VULKAN_HPP_NAMESPACE::PipelineInfoKHR & pipelineInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineExecutablePropertiesKHR &&
                          "Function <vkGetPipelineExecutablePropertiesKHR> requires <VK_KHR_pipeline_executable_properties>" );
 
-      std::vector<PipelineExecutablePropertiesKHR> properties;
-      uint32_t                                     executableCount;
-      Result                                       result;
+      std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR> properties;
+      uint32_t                                                           executableCount;
+      VULKAN_HPP_NAMESPACE::Result                                       result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPipelineExecutablePropertiesKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPipelineExecutablePropertiesKHR(
           static_cast<VkDevice>( m_device ), reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ), &executableCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && executableCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && executableCount )
         {
           properties.resize( executableCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPipelineExecutablePropertiesKHR( static_cast<VkDevice>( m_device ),
                                                                    reinterpret_cast<const VkPipelineInfoKHR *>( &pipelineInfo ),
                                                                    &executableCount,
                                                                    reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutablePropertiesKHR" );
       VULKAN_HPP_ASSERT( executableCount <= properties.size() );
       if ( executableCount < properties.size() )
       {
         properties.resize( executableCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetPipelineExecutableStatisticsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableStatisticsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutableStatisticKHR>>::type
-                         Device::getPipelineExecutableStatisticsKHR( const PipelineExecutableInfoKHR & executableInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR>
+      Device::getPipelineExecutableStatisticsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineExecutableStatisticsKHR &&
                          "Function <vkGetPipelineExecutableStatisticsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 
-      std::vector<PipelineExecutableStatisticKHR> statistics;
-      uint32_t                                    statisticCount;
-      Result                                      result;
+      std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR> statistics;
+      uint32_t                                                          statisticCount;
+      VULKAN_HPP_NAMESPACE::Result                                      result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPipelineExecutableStatisticsKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPipelineExecutableStatisticsKHR(
           static_cast<VkDevice>( m_device ), reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ), &statisticCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && statisticCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && statisticCount )
         {
           statistics.resize( statisticCount );
-          result = static_cast<Result>(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
             getDispatcher()->vkGetPipelineExecutableStatisticsKHR( static_cast<VkDevice>( m_device ),
                                                                    reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
                                                                    &statisticCount,
                                                                    reinterpret_cast<VkPipelineExecutableStatisticKHR *>( statistics.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableStatisticsKHR" );
       VULKAN_HPP_ASSERT( statisticCount <= statistics.size() );
       if ( statisticCount < statistics.size() )
       {
         statistics.resize( statisticCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( statistics ) );
+      return statistics;
     }
 
-    // wrapper function for command vkGetPipelineExecutableInternalRepresentationsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineExecutableInternalRepresentationsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineExecutableInternalRepresentationKHR>>::type
-                         Device::getPipelineExecutableInternalRepresentationsKHR( const PipelineExecutableInfoKHR & executableInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>
+      Device::getPipelineExecutableInternalRepresentationsKHR( const VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR & executableInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineExecutableInternalRepresentationsKHR &&
                          "Function <vkGetPipelineExecutableInternalRepresentationsKHR> requires <VK_KHR_pipeline_executable_properties>" );
 
-      std::vector<PipelineExecutableInternalRepresentationKHR> internalRepresentations;
-      uint32_t                                                 internalRepresentationCount;
-      Result                                                   result;
+      std::vector<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR> internalRepresentations;
+      uint32_t                                                                       internalRepresentationCount;
+      VULKAN_HPP_NAMESPACE::Result                                                   result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPipelineExecutableInternalRepresentationsKHR( static_cast<VkDevice>( m_device ),
                                                                               reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
                                                                               &internalRepresentationCount,
                                                                               nullptr ) );
-        if ( ( result == Result::eSuccess ) && internalRepresentationCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && internalRepresentationCount )
         {
           internalRepresentations.resize( internalRepresentationCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPipelineExecutableInternalRepresentationsKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPipelineExecutableInternalRepresentationsKHR(
             static_cast<VkDevice>( m_device ),
             reinterpret_cast<const VkPipelineExecutableInfoKHR *>( &executableInfo ),
             &internalRepresentationCount,
             reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( internalRepresentations.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelineExecutableInternalRepresentationsKHR" );
       VULKAN_HPP_ASSERT( internalRepresentationCount <= internalRepresentations.size() );
       if ( internalRepresentationCount < internalRepresentations.size() )
       {
         internalRepresentations.resize( internalRepresentationCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( internalRepresentations ) );
+      return internalRepresentations;
     }
 
     //=== VK_EXT_host_image_copy ===
 
-    // wrapper function for command vkCopyMemoryToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToImageEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyMemoryToImageEXT( const CopyMemoryToImageInfo & copyMemoryToImageInfo ) const
+    VULKAN_HPP_INLINE void Device::copyMemoryToImageEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT & copyMemoryToImageInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToImageEXT && "Function <vkCopyMemoryToImageEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToImageEXT && "Function <vkCopyMemoryToImageEXT> requires <VK_EXT_host_image_copy>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyMemoryToImageEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyMemoryToImageInfo *>( &copyMemoryToImageInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMemoryToImageEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCopyMemoryToImageEXT(
+        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyMemoryToImageInfoEXT *>( &copyMemoryToImageInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToImageEXT" );
     }
 
-    // wrapper function for command vkCopyImageToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToMemoryEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyImageToMemoryEXT( const CopyImageToMemoryInfo & copyImageToMemoryInfo ) const
+    VULKAN_HPP_INLINE void Device::copyImageToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT & copyImageToMemoryInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToMemoryEXT && "Function <vkCopyImageToMemoryEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToMemoryEXT && "Function <vkCopyImageToMemoryEXT> requires <VK_EXT_host_image_copy>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyImageToMemoryEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToMemoryInfo *>( &copyImageToMemoryInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyImageToMemoryEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCopyImageToMemoryEXT(
+        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToMemoryInfoEXT *>( &copyImageToMemoryInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToMemoryEXT" );
     }
 
-    // wrapper function for command vkCopyImageToImageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyImageToImageEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::copyImageToImageEXT( const CopyImageToImageInfo & copyImageToImageInfo ) const
+    VULKAN_HPP_INLINE void Device::copyImageToImageEXT( const VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT & copyImageToImageInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToImageEXT && "Function <vkCopyImageToImageEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCopyImageToImageEXT && "Function <vkCopyImageToImageEXT> requires <VK_EXT_host_image_copy>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyImageToImageEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToImageInfo *>( &copyImageToImageInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyImageToImageEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCopyImageToImageEXT(
+        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkCopyImageToImageInfoEXT *>( &copyImageToImageInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::copyImageToImageEXT" );
     }
 
-    // wrapper function for command vkTransitionImageLayoutEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkTransitionImageLayoutEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::transitionImageLayoutEXT( ArrayProxy<const HostImageLayoutTransitionInfo> const & transitions ) const
+    VULKAN_HPP_INLINE void Device::transitionImageLayoutEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT> const & transitions ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkTransitionImageLayoutEXT &&
-                         "Function <vkTransitionImageLayoutEXT> requires <VK_EXT_host_image_copy> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkTransitionImageLayoutEXT && "Function <vkTransitionImageLayoutEXT> requires <VK_EXT_host_image_copy>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkTransitionImageLayoutEXT(
-        static_cast<VkDevice>( m_device ), transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( transitions.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::transitionImageLayoutEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkTransitionImageLayoutEXT(
+        static_cast<VkDevice>( m_device ), transitions.size(), reinterpret_cast<const VkHostImageLayoutTransitionInfoEXT *>( transitions.data() ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::transitionImageLayoutEXT" );
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Image::getSubresourceLayout2EXT( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+      Image::getSubresourceLayout2EXT( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetImageSubresourceLayout2EXT &&
-        "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+        "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 
-      SubresourceLayout2 layout;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
       getDispatcher()->vkGetImageSubresourceLayout2EXT( static_cast<VkDevice>( m_device ),
                                                         static_cast<VkImage>( m_image ),
-                                                        reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                        reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                        reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                                        reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return layout;
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2EXT.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Image::getSubresourceLayout2EXT( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Image::getSubresourceLayout2EXT( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetImageSubresourceLayout2EXT &&
-        "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+        "Function <vkGetImageSubresourceLayout2EXT> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
       getDispatcher()->vkGetImageSubresourceLayout2EXT( static_cast<VkDevice>( m_device ),
                                                         static_cast<VkImage>( m_image ),
-                                                        reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                        reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                        reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                                        reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return structureChain;
     }
 
     //=== VK_KHR_map_memory2 ===
 
-    // wrapper function for command vkMapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkMapMemory2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type Device::mapMemory2KHR( const MemoryMapInfo & memoryMapInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE void * Device::mapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR & memoryMapInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkMapMemory2KHR && "Function <vkMapMemory2KHR> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkMapMemory2KHR && "Function <vkMapMemory2KHR> requires <VK_KHR_map_memory2>" );
 
-      void * pData;
-      Result result = static_cast<Result>(
-        getDispatcher()->vkMapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryMapInfo *>( &memoryMapInfo ), &pData ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::mapMemory2KHR" );
+      void *                       pData;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkMapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryMapInfoKHR *>( &memoryMapInfo ), &pData ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::mapMemory2KHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pData ) );
+      return pData;
     }
 
-    // wrapper function for command vkUnmapMemory2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkUnmapMemory2KHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::unmapMemory2KHR( const MemoryUnmapInfo & memoryUnmapInfo ) const
+    VULKAN_HPP_INLINE void Device::unmapMemory2KHR( const VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR & memoryUnmapInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkUnmapMemory2KHR && "Function <vkUnmapMemory2KHR> requires <VK_KHR_map_memory2> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkUnmapMemory2KHR && "Function <vkUnmapMemory2KHR> requires <VK_KHR_map_memory2>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkUnmapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryUnmapInfo *>( &memoryUnmapInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::unmapMemory2KHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkUnmapMemory2KHR( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryUnmapInfoKHR *>( &memoryUnmapInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::unmapMemory2KHR" );
     }
 
     //=== VK_EXT_swapchain_maintenance1 ===
 
-    // wrapper function for command vkReleaseSwapchainImagesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::releaseSwapchainImagesEXT( const ReleaseSwapchainImagesInfoKHR & releaseInfo ) const
+    VULKAN_HPP_INLINE void Device::releaseSwapchainImagesEXT( const VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT & releaseInfo ) const
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseSwapchainImagesEXT &&
-                         "Function <vkReleaseSwapchainImagesEXT> requires <VK_EXT_swapchain_maintenance1> or <VK_KHR_swapchain_maintenance1>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseSwapchainImagesEXT && "Function <vkReleaseSwapchainImagesEXT> requires <VK_EXT_swapchain_maintenance1>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkReleaseSwapchainImagesEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( &releaseInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::releaseSwapchainImagesEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkReleaseSwapchainImagesEXT(
+        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkReleaseSwapchainImagesInfoEXT *>( &releaseInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::releaseSwapchainImagesEXT" );
     }
 
     //=== VK_NV_device_generated_commands ===
 
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsNV &&
                          "Function <vkGetGeneratedCommandsMemoryRequirementsNV> requires <VK_NV_device_generated_commands>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                    reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( &info ),
                                                                    reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -24121,17 +20272,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsNV.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getGeneratedCommandsMemoryRequirementsNV( const GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getGeneratedCommandsMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsNV &&
                          "Function <vkGetGeneratedCommandsMemoryRequirementsNV> requires <VK_NV_device_generated_commands>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                    reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( &info ),
                                                                    reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -24139,9 +20288,8 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsNV( const GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::preprocessGeneratedCommandsNV( const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPreprocessGeneratedCommandsNV &&
                          "Function <vkCmdPreprocessGeneratedCommandsNV> requires <VK_NV_device_generated_commands>" );
@@ -24150,10 +20298,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                            reinterpret_cast<const VkGeneratedCommandsInfoNV *>( &generatedCommandsInfo ) );
     }
 
-    // wrapper function for command vkCmdExecuteGeneratedCommandsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsNV( Bool32                          isPreprocessed,
-                                                                      const GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::executeGeneratedCommandsNV( VULKAN_HPP_NAMESPACE::Bool32                          isPreprocessed,
+                                                 const VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdExecuteGeneratedCommandsNV &&
                          "Function <vkCmdExecuteGeneratedCommandsNV> requires <VK_NV_device_generated_commands>" );
@@ -24163,11 +20310,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                         reinterpret_cast<const VkGeneratedCommandsInfoNV *>( &generatedCommandsInfo ) );
     }
 
-    // wrapper function for command vkCmdBindPipelineShaderGroupNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindPipelineShaderGroupNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindPipelineShaderGroupNV( PipelineBindPoint              pipelineBindPoint,
-                                                                     VULKAN_HPP_NAMESPACE::Pipeline pipeline,
-                                                                     uint32_t                       groupIndex ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindPipelineShaderGroupNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                     VULKAN_HPP_NAMESPACE::Pipeline          pipeline,
+                                                                     uint32_t                                groupIndex ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindPipelineShaderGroupNV &&
                          "Function <vkCmdBindPipelineShaderGroupNV> requires <VK_NV_device_generated_commands>" );
@@ -24178,27 +20323,34 @@ namespace VULKAN_HPP_NAMESPACE
                                                        groupIndex );
     }
 
-    // wrapper function for command vkCreateIndirectCommandsLayoutNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectCommandsLayoutNV>::type
-                         Device::createIndirectCommandsLayoutNV( IndirectCommandsLayoutCreateInfoNV const & createInfo,
-                                              Optional<const AllocationCallbacks>        allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutNV>::Type
+      Device::createIndirectCommandsLayoutNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV const &                createInfo,
+                                              VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout;
-      Result                                         result =
-        static_cast<Result>( getDispatcher()->vkCreateIndirectCommandsLayoutNV( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, IndirectCommandsLayoutNV( *this, *reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateIndirectCommandsLayoutNV(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createIndirectCommandsLayoutNV" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::IndirectCommandsLayoutNV(
+        *this, *reinterpret_cast<VkIndirectCommandsLayoutNV *>( &indirectCommandsLayout ), allocator );
     }
 
     //=== VK_EXT_depth_bias_control ===
 
-    // wrapper function for command vkCmdSetDepthBias2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBias2EXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const DepthBiasInfoEXT & depthBiasInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBias2EXT( const VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT & depthBiasInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBias2EXT && "Function <vkCmdSetDepthBias2EXT> requires <VK_EXT_depth_bias_control>" );
 
@@ -24207,73 +20359,85 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_acquire_drm_display ===
 
-    // wrapper function for command vkAcquireDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireDrmDisplayEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type PhysicalDevice::acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const
+    VULKAN_HPP_INLINE void PhysicalDevice::acquireDrmDisplayEXT( int32_t drmFd, VULKAN_HPP_NAMESPACE::DisplayKHR display ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireDrmDisplayEXT && "Function <vkAcquireDrmDisplayEXT> requires <VK_EXT_acquire_drm_display>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkAcquireDrmDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), drmFd, static_cast<VkDisplayKHR>( display ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::acquireDrmDisplayEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::acquireDrmDisplayEXT" );
     }
 
-    // wrapper function for command vkGetDrmDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDrmDisplayEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type
-                         PhysicalDevice::getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                        PhysicalDevice::getDrmDisplayEXT( int32_t drmFd, uint32_t connectorId ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DisplayKHR display;
-      Result                           result = static_cast<Result>( getDispatcher()->vkGetDrmDisplayEXT(
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDrmDisplayEXT(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), drmFd, connectorId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getDrmDisplayEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "PhysicalDevice::getDrmDisplayEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) );
     }
 
     //=== VK_EXT_private_data ===
 
-    // wrapper function for command vkCreatePrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePrivateDataSlotEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PrivateDataSlot>::type
-                         Device::createPrivateDataSlotEXT( PrivateDataSlotCreateInfo const &   createInfo,
-                                        Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot>::Type
+      Device::createPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const &                         createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot;
-      Result                                result = static_cast<Result>( getDispatcher()->vkCreatePrivateDataSlotEXT( static_cast<VkDevice>( m_device ),
-                                                                                        reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
-                                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                        reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createPrivateDataSlotEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, PrivateDataSlot( *this, *reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreatePrivateDataSlotEXT(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createPrivateDataSlotEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::PrivateDataSlot( *this, *reinterpret_cast<VkPrivateDataSlot *>( &privateDataSlot ), allocator );
     }
 
-    // wrapper function for command vkDestroyPrivateDataSlotEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkDestroyPrivateDataSlotEXT.html
-    VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
-                                                              Optional<const AllocationCallbacks>   allocator ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Device::destroyPrivateDataSlotEXT( VULKAN_HPP_NAMESPACE::PrivateDataSlot                     privateDataSlot,
+                                                              Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkDestroyPrivateDataSlotEXT &&
                          "Function <vkDestroyPrivateDataSlotEXT> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 
-      getDispatcher()->vkDestroyPrivateDataSlotEXT( static_cast<VkDevice>( m_device ),
-                                                    static_cast<VkPrivateDataSlot>( privateDataSlot ),
-                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) );
+      getDispatcher()->vkDestroyPrivateDataSlotEXT(
+        static_cast<VkDevice>( m_device ),
+        static_cast<VkPrivateDataSlot>( privateDataSlot ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ) );
     }
 
-    // wrapper function for command vkSetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetPrivateDataEXT.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::setPrivateDataEXT( ObjectType objectType_, uint64_t objectHandle, VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot, uint64_t data ) const
+    VULKAN_HPP_INLINE void Device::setPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
+                                                      uint64_t                              objectHandle,
+                                                      VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot,
+                                                      uint64_t                              data ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetPrivateDataEXT && "Function <vkSetPrivateDataEXT> requires <VK_EXT_private_data> or <VK_VERSION_1_3>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkSetPrivateDataEXT(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkSetPrivateDataEXT(
         static_cast<VkDevice>( m_device ), static_cast<VkObjectType>( objectType_ ), objectHandle, static_cast<VkPrivateDataSlot>( privateDataSlot ), data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::setPrivateDataEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::setPrivateDataEXT" );
     }
 
-    // wrapper function for command vkGetPrivateDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPrivateDataEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateDataEXT( ObjectType                            objectType_,
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint64_t Device::getPrivateDataEXT( VULKAN_HPP_NAMESPACE::ObjectType      objectType_,
                                                                                uint64_t                              objectHandle,
                                                                                VULKAN_HPP_NAMESPACE::PrivateDataSlot privateDataSlot ) const VULKAN_HPP_NOEXCEPT
     {
@@ -24287,135 +20451,115 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     //=== VK_KHR_video_encode_queue ===
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-      PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR * pQualityLevelInfo,
-                                                               VideoEncodeQualityLevelPropertiesKHR * pQualityLevelProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR &&
-                         "Function <vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR> requires <VK_KHR_video_encode_queue>" );
-      return static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
-        static_cast<VkPhysicalDevice>( m_physicalDevice ),
-        reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( pQualityLevelInfo ),
-        reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( pQualityLevelProperties ) ) );
-    }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<VideoEncodeQualityLevelPropertiesKHR>::type
-                         PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR(
+      const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR> requires <VK_KHR_video_encode_queue>" );
 
-      VideoEncodeQualityLevelPropertiesKHR qualityLevelProperties;
-      Result                               result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+      VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR qualityLevelProperties;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ),
         reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( &qualityLevelInfo ),
         reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( &qualityLevelProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( qualityLevelProperties ) );
+      return qualityLevelProperties;
     }
 
-    // wrapper function for command vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR( const PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR(
+      const VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR & qualityLevelInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR> requires <VK_KHR_video_encode_queue>" );
 
-      StructureChain<X, Y, Z...>             structureChain;
-      VideoEncodeQualityLevelPropertiesKHR & qualityLevelProperties = structureChain.template get<VideoEncodeQualityLevelPropertiesKHR>();
-      Result                                 result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
+      StructureChain<X, Y, Z...>                                   structureChain;
+      VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR & qualityLevelProperties =
+        structureChain.template get<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR>();
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR(
         static_cast<VkPhysicalDevice>( m_physicalDevice ),
         reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( &qualityLevelInfo ),
         reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( &qualityLevelProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getVideoEncodeQualityLevelPropertiesKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>>>::type
-                         Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>>
+      Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetEncodedVideoSessionParametersKHR &&
                          "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
 
-      std::pair<VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>> data_;
-      VideoEncodeSessionParametersFeedbackInfoKHR &                                feedbackInfo = data_.first;
-      std::vector<uint8_t> &                                                       data         = data_.second;
-      size_t                                                                       dataSize;
-      Result                                                                       result;
+      std::pair<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR, std::vector<uint8_t>> data_;
+      VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR &                                feedbackInfo = data_.first;
+      std::vector<uint8_t> &                                                                             data         = data_.second;
+      size_t                                                                                             dataSize;
+      VULKAN_HPP_NAMESPACE::Result                                                                       result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
           static_cast<VkDevice>( m_device ),
           reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
           reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
           &dataSize,
           nullptr ) );
-        if ( ( result == Result::eSuccess ) && dataSize )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
         {
           data.resize( dataSize );
-          result = static_cast<Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
             static_cast<VkDevice>( m_device ),
             reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
             reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
             &dataSize,
             reinterpret_cast<void *>( data.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
-    // wrapper function for command vkGetEncodedVideoSessionParametersKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetEncodedVideoSessionParametersKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t>>>::type
-                         Device::getEncodedVideoSessionParametersKHR( const VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t>>
+      Device::getEncodedVideoSessionParametersKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR & videoSessionParametersInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetEncodedVideoSessionParametersKHR &&
                          "Function <vkGetEncodedVideoSessionParametersKHR> requires <VK_KHR_video_encode_queue>" );
 
-      std::pair<StructureChain<X, Y, Z...>, std::vector<uint8_t>> data_;
-      VideoEncodeSessionParametersFeedbackInfoKHR &               feedbackInfo = data_.first.template get<VideoEncodeSessionParametersFeedbackInfoKHR>();
-      std::vector<uint8_t> &                                      data         = data_.second;
-      size_t                                                      dataSize;
-      Result                                                      result;
+      std::pair<VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>, std::vector<uint8_t>> data_;
+      VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR &               feedbackInfo =
+        data_.first.template get<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR>();
+      std::vector<uint8_t> &       data = data_.second;
+      size_t                       dataSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
           static_cast<VkDevice>( m_device ),
           reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
           reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
           &dataSize,
           nullptr ) );
-        if ( ( result == Result::eSuccess ) && dataSize )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
         {
           data.resize( dataSize );
-          result = static_cast<Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetEncodedVideoSessionParametersKHR(
             static_cast<VkDevice>( m_device ),
             reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( &videoSessionParametersInfo ),
             reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( &feedbackInfo ),
             &dataSize,
             reinterpret_cast<void *>( data.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getEncodedVideoSessionParametersKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
-    // wrapper function for command vkCmdEncodeVideoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEncodeVideoKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VideoEncodeInfoKHR & encodeInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::encodeVideoKHR( const VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR & encodeInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEncodeVideoKHR && "Function <vkCmdEncodeVideoKHR> requires <VK_KHR_video_encode_queue>" );
 
@@ -24425,65 +20569,82 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_NV_cuda_kernel_launch ===
 
-    // wrapper function for command vkCreateCudaModuleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaModuleNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CudaModuleNV>::type
-                         Device::createCudaModuleNV( CudaModuleCreateInfoNV const &      createInfo,
-                                  Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaModuleNV>::Type
+                        Device::createCudaModuleNV( VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV const &                            createInfo,
+                                  VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::CudaModuleNV module;
-      Result                             result = static_cast<Result>( getDispatcher()->vkCreateCudaModuleNV( static_cast<VkDevice>( m_device ),
-                                                                                  reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
-                                                                                  reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                  reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createCudaModuleNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, CudaModuleNV( *this, *reinterpret_cast<VkCudaModuleNV *>( &module ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result       result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateCudaModuleNV(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkCudaModuleCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkCudaModuleNV *>( &module ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createCudaModuleNV" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaModuleNV( *this, *reinterpret_cast<VkCudaModuleNV *>( &module ), allocator );
     }
 
-    // wrapper function for command vkGetCudaModuleCacheNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCudaModuleCacheNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t>>::type CudaModuleNV::getCache() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<uint8_t> CudaModuleNV::getCache() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetCudaModuleCacheNV && "Function <vkGetCudaModuleCacheNV> requires <VK_NV_cuda_kernel_launch>" );
 
-      std::vector<uint8_t> cacheData;
-      size_t               cacheSize;
-      Result               result;
+      std::vector<uint8_t>         cacheData;
+      size_t                       cacheSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>(
-          getDispatcher()->vkGetCudaModuleCacheNV( static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_cudaModuleNV ), &cacheSize, nullptr ) );
-        if ( ( result == Result::eSuccess ) && cacheSize )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkGetCudaModuleCacheNV( static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_module ), &cacheSize, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && cacheSize )
         {
           cacheData.resize( cacheSize );
-          result = static_cast<Result>( getDispatcher()->vkGetCudaModuleCacheNV(
-            static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_cudaModuleNV ), &cacheSize, reinterpret_cast<void *>( cacheData.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetCudaModuleCacheNV(
+            static_cast<VkDevice>( m_device ), static_cast<VkCudaModuleNV>( m_module ), &cacheSize, reinterpret_cast<void *>( cacheData.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::CudaModuleNV::getCache" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::CudaModuleNV::getCache" );
       VULKAN_HPP_ASSERT( cacheSize <= cacheData.size() );
       if ( cacheSize < cacheData.size() )
       {
         cacheData.resize( cacheSize );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( cacheData ) );
+      return cacheData;
     }
 
-    // wrapper function for command vkCreateCudaFunctionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateCudaFunctionNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<CudaFunctionNV>::type
-                         Device::createCudaFunctionNV( CudaFunctionCreateInfoNV const &    createInfo,
-                                    Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaFunctionNV>::Type
+                        Device::createCudaFunctionNV( VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV const &                          createInfo,
+                                    VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::CudaFunctionNV function;
-      Result                               result = static_cast<Result>( getDispatcher()->vkCreateCudaFunctionNV( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createCudaFunctionNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result,
-                                                                  CudaFunctionNV( *this, *reinterpret_cast<VkCudaFunctionNV *>( &function ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result         result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateCudaFunctionNV(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkCudaFunctionNV *>( &function ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createCudaFunctionNV" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CudaFunctionNV( *this, *reinterpret_cast<VkCudaFunctionNV *>( &function ), allocator );
     }
 
-    // wrapper function for command vkCmdCudaLaunchKernelNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCudaLaunchKernelNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const CudaLaunchInfoNV & launchInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::cudaLaunchKernelNV( const VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV & launchInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCudaLaunchKernelNV && "Function <vkCmdCudaLaunchKernelNV> requires <VK_NV_cuda_kernel_launch>" );
 
@@ -24491,53 +20652,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-    //=== VK_QCOM_tile_shading ===
-
-    // wrapper function for command vkCmdDispatchTileQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchTileQCOM.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatchTileQCOM( const DispatchTileInfoQCOM & dispatchTileInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchTileQCOM && "Function <vkCmdDispatchTileQCOM> requires <VK_QCOM_tile_shading>" );
-
-      getDispatcher()->vkCmdDispatchTileQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                              reinterpret_cast<const VkDispatchTileInfoQCOM *>( &dispatchTileInfo ) );
-    }
-
-    // wrapper function for command vkCmdBeginPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginPerTileExecutionQCOM.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginPerTileExecutionQCOM( const PerTileBeginInfoQCOM & perTileBeginInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginPerTileExecutionQCOM && "Function <vkCmdBeginPerTileExecutionQCOM> requires <VK_QCOM_tile_shading>" );
-
-      getDispatcher()->vkCmdBeginPerTileExecutionQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                       reinterpret_cast<const VkPerTileBeginInfoQCOM *>( &perTileBeginInfo ) );
-    }
-
-    // wrapper function for command vkCmdEndPerTileExecutionQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndPerTileExecutionQCOM.html
-    VULKAN_HPP_INLINE void CommandBuffer::endPerTileExecutionQCOM( const PerTileEndInfoQCOM & perTileEndInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndPerTileExecutionQCOM && "Function <vkCmdEndPerTileExecutionQCOM> requires <VK_QCOM_tile_shading>" );
-
-      getDispatcher()->vkCmdEndPerTileExecutionQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                     reinterpret_cast<const VkPerTileEndInfoQCOM *>( &perTileEndInfo ) );
-    }
-
 #  if defined( VK_USE_PLATFORM_METAL_EXT )
     //=== VK_EXT_metal_objects ===
 
-    // wrapper function for command vkExportMetalObjectsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkExportMetalObjectsEXT.html
-    VULKAN_HPP_INLINE void Device::exportMetalObjectsEXT( ExportMetalObjectsInfoEXT & metalObjectsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT Device::exportMetalObjectsEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkExportMetalObjectsEXT && "Function <vkExportMetalObjectsEXT> requires <VK_EXT_metal_objects>" );
 
+      VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT metalObjectsInfo;
       getDispatcher()->vkExportMetalObjectsEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<VkExportMetalObjectsInfoEXT *>( &metalObjectsInfo ) );
+
+      return metalObjectsInfo;
+    }
+
+    template <typename X, typename Y, typename... Z>
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> Device::exportMetalObjectsEXT() const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkExportMetalObjectsEXT && "Function <vkExportMetalObjectsEXT> requires <VK_EXT_metal_objects>" );
+
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>  structureChain;
+      VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT & metalObjectsInfo = structureChain.template get<VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT>();
+      getDispatcher()->vkExportMetalObjectsEXT( static_cast<VkDevice>( m_device ), reinterpret_cast<VkExportMetalObjectsInfoEXT *>( &metalObjectsInfo ) );
+
+      return structureChain;
     }
 #  endif /*VK_USE_PLATFORM_METAL_EXT*/
 
     //=== VK_KHR_synchronization2 ===
 
-    // wrapper function for command vkCmdSetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetEvent2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( VULKAN_HPP_NAMESPACE::Event event, const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setEvent2KHR( VULKAN_HPP_NAMESPACE::Event                  event,
+                                                        const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetEvent2KHR && "Function <vkCmdSetEvent2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 
@@ -24545,8 +20689,8 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
     }
 
-    // wrapper function for command vkCmdResetEvent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResetEvent2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event event, PipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::resetEvent2KHR( VULKAN_HPP_NAMESPACE::Event               event,
+                                                          VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResetEvent2KHR && "Function <vkCmdResetEvent2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 
@@ -24554,9 +20698,9 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkEvent>( event ), static_cast<VkPipelineStageFlags2>( stageMask ) );
     }
 
-    // wrapper function for command vkCmdWaitEvents2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWaitEvents2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::waitEvents2KHR( ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const & events,
-                                                          ArrayProxy<const DependencyInfo> const &              dependencyInfos ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::waitEvents2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Event> const &          events,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DependencyInfo> const & dependencyInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWaitEvents2KHR && "Function <vkCmdWaitEvents2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -24574,8 +20718,7 @@ namespace VULKAN_HPP_NAMESPACE
                                             reinterpret_cast<const VkDependencyInfo *>( dependencyInfos.data() ) );
     }
 
-    // wrapper function for command vkCmdPipelineBarrier2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPipelineBarrier2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::pipelineBarrier2KHR( const VULKAN_HPP_NAMESPACE::DependencyInfo & dependencyInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPipelineBarrier2KHR &&
                          "Function <vkCmdPipelineBarrier2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
@@ -24584,9 +20727,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                  reinterpret_cast<const VkDependencyInfo *>( &dependencyInfo ) );
     }
 
-    // wrapper function for command vkCmdWriteTimestamp2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteTimestamp2KHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::writeTimestamp2KHR( PipelineStageFlags2 stage, VULKAN_HPP_NAMESPACE::QueryPool queryPool, uint32_t query ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::writeTimestamp2KHR( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                              VULKAN_HPP_NAMESPACE::QueryPool           queryPool,
+                                                              uint32_t                                  query ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteTimestamp2KHR &&
                          "Function <vkCmdWriteTimestamp2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
@@ -24595,28 +20738,56 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineStageFlags2>( stage ), static_cast<VkQueryPool>( queryPool ), query );
     }
 
-    // wrapper function for command vkQueueSubmit2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSubmit2KHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Queue::submit2KHR( ArrayProxy<const SubmitInfo2> const & submits,
-                                                                              VULKAN_HPP_NAMESPACE::Fence           fence ) const
+    VULKAN_HPP_INLINE void Queue::submit2KHR( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SubmitInfo2> const & submits,
+                                              VULKAN_HPP_NAMESPACE::Fence                                                       fence ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSubmit2KHR && "Function <vkQueueSubmit2KHR> requires <VK_KHR_synchronization2> or <VK_VERSION_1_3>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkQueueSubmit2KHR(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkQueueSubmit2KHR(
         static_cast<VkQueue>( m_queue ), submits.size(), reinterpret_cast<const VkSubmitInfo2 *>( submits.data() ), static_cast<VkFence>( fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::submit2KHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Queue::submit2KHR" );
+    }
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+    VULKAN_HPP_INLINE void CommandBuffer::writeBufferMarker2AMD( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage,
+                                                                 VULKAN_HPP_NAMESPACE::Buffer              dstBuffer,
+                                                                 VULKAN_HPP_NAMESPACE::DeviceSize          dstOffset,
+                                                                 uint32_t                                  marker ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteBufferMarker2AMD && "Function <vkCmdWriteBufferMarker2AMD> requires <VK_KHR_synchronization2>" );
+
+      getDispatcher()->vkCmdWriteBufferMarker2AMD( static_cast<VkCommandBuffer>( m_commandBuffer ),
+                                                   static_cast<VkPipelineStageFlags2>( stage ),
+                                                   static_cast<VkBuffer>( dstBuffer ),
+                                                   static_cast<VkDeviceSize>( dstOffset ),
+                                                   marker );
+    }
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV> Queue::getCheckpointData2NV() const
+    {
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetQueueCheckpointData2NV && "Function <vkGetQueueCheckpointData2NV> requires <VK_KHR_synchronization2>" );
+
+      std::vector<VULKAN_HPP_NAMESPACE::CheckpointData2NV> checkpointData;
+      uint32_t                                             checkpointDataCount;
+      getDispatcher()->vkGetQueueCheckpointData2NV( static_cast<VkQueue>( m_queue ), &checkpointDataCount, nullptr );
+      checkpointData.resize( checkpointDataCount );
+      getDispatcher()->vkGetQueueCheckpointData2NV(
+        static_cast<VkQueue>( m_queue ), &checkpointDataCount, reinterpret_cast<VkCheckpointData2NV *>( checkpointData.data() ) );
+
+      VULKAN_HPP_ASSERT( checkpointDataCount <= checkpointData.size() );
+      if ( checkpointDataCount < checkpointData.size() )
+      {
+        checkpointData.resize( checkpointDataCount );
+      }
+      return checkpointData;
     }
 
     //=== VK_EXT_descriptor_buffer ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutSizeEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize DescriptorSetLayout::getSizeEXT() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize DescriptorSetLayout::getSizeEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutSizeEXT && "Function <vkGetDescriptorSetLayoutSizeEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DeviceSize layoutSizeInBytes;
+      VULKAN_HPP_NAMESPACE::DeviceSize layoutSizeInBytes;
       getDispatcher()->vkGetDescriptorSetLayoutSizeEXT( static_cast<VkDevice>( m_device ),
                                                         static_cast<VkDescriptorSetLayout>( m_descriptorSetLayout ),
                                                         reinterpret_cast<VkDeviceSize *>( &layoutSizeInBytes ) );
@@ -24624,23 +20795,22 @@ namespace VULKAN_HPP_NAMESPACE
       return layoutSizeInBytes;
     }
 
-    // wrapper function for command vkGetDescriptorSetLayoutBindingOffsetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutBindingOffsetEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceSize DescriptorSetLayout::getBindingOffsetEXT( uint32_t binding ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceSize
+                                           DescriptorSetLayout::getBindingOffsetEXT( uint32_t binding ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutBindingOffsetEXT &&
                          "Function <vkGetDescriptorSetLayoutBindingOffsetEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DeviceSize offset;
+      VULKAN_HPP_NAMESPACE::DeviceSize offset;
       getDispatcher()->vkGetDescriptorSetLayoutBindingOffsetEXT(
         static_cast<VkDevice>( m_device ), static_cast<VkDescriptorSetLayout>( m_descriptorSetLayout ), binding, reinterpret_cast<VkDeviceSize *>( &offset ) );
 
       return offset;
     }
 
-    // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
-    VULKAN_HPP_INLINE void
-      Device::getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo, size_t dataSize, void * pDescriptor ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo,
+                                                     size_t                                             dataSize,
+                                                     void *                                             pDescriptor ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorEXT && "Function <vkGetDescriptorEXT> requires <VK_EXT_descriptor_buffer>" );
 
@@ -24648,9 +20818,9 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDescriptorGetInfoEXT *>( &descriptorInfo ), dataSize, pDescriptor );
     }
 
-    // wrapper function for command vkGetDescriptorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorEXT.html
     template <typename DescriptorType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorType Device::getDescriptorEXT( const DescriptorGetInfoEXT & descriptorInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorType
+      Device::getDescriptorEXT( const VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT & descriptorInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorEXT && "Function <vkGetDescriptorEXT> requires <VK_EXT_descriptor_buffer>" );
 
@@ -24663,10 +20833,8 @@ namespace VULKAN_HPP_NAMESPACE
       return descriptor;
     }
 
-    // wrapper function for command vkCmdBindDescriptorBuffersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBuffersEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::bindDescriptorBuffersEXT( ArrayProxy<const DescriptorBufferBindingInfoEXT> const & bindingInfos ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBuffersEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT> const & bindingInfos ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorBuffersEXT && "Function <vkCmdBindDescriptorBuffersEXT> requires <VK_EXT_descriptor_buffer>" );
 
@@ -24675,13 +20843,12 @@ namespace VULKAN_HPP_NAMESPACE
                                                       reinterpret_cast<const VkDescriptorBufferBindingInfoEXT *>( bindingInfos.data() ) );
     }
 
-    // wrapper function for command vkCmdSetDescriptorBufferOffsetsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsetsEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsetsEXT( PipelineBindPoint                    pipelineBindPoint,
-                                                                         VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                                                                         uint32_t                             firstSet,
-                                                                         ArrayProxy<const uint32_t> const &   bufferIndices,
-                                                                         ArrayProxy<const DeviceSize> const & offsets ) const
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setDescriptorBufferOffsetsEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint                                          pipelineBindPoint,
+                                                    VULKAN_HPP_NAMESPACE::PipelineLayout                                             layout,
+                                                    uint32_t                                                                         firstSet,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const uint32_t> const &                         bufferIndices,
+                                                    VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDescriptorBufferOffsetsEXT &&
                          "Function <vkCmdSetDescriptorBufferOffsetsEXT> requires <VK_EXT_descriptor_buffer>" );
@@ -24703,11 +20870,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                            reinterpret_cast<const VkDeviceSize *>( offsets.data() ) );
     }
 
-    // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplersEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplersEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplersEXT( PipelineBindPoint                    pipelineBindPoint,
-                                                                                   VULKAN_HPP_NAMESPACE::PipelineLayout layout,
-                                                                                   uint32_t                             set ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplersEXT( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                                   VULKAN_HPP_NAMESPACE::PipelineLayout    layout,
+                                                                                   uint32_t                                set ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorBufferEmbeddedSamplersEXT &&
                          "Function <vkCmdBindDescriptorBufferEmbeddedSamplersEXT> requires <VK_EXT_descriptor_buffer>" );
@@ -24716,97 +20881,87 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipelineLayout>( layout ), set );
     }
 
-    // wrapper function for command vkGetBufferOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferOpaqueCaptureDescriptorDataEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getBufferOpaqueCaptureDescriptorDataEXT( const BufferCaptureDescriptorDataInfoEXT & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType
+      Device::getBufferOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferOpaqueCaptureDescriptorDataEXT &&
                          "Function <vkGetBufferOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetBufferOpaqueCaptureDescriptorDataEXT(
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetBufferOpaqueCaptureDescriptorDataEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkBufferCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getBufferOpaqueCaptureDescriptorDataEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getBufferOpaqueCaptureDescriptorDataEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetImageOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageOpaqueCaptureDescriptorDataEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getImageOpaqueCaptureDescriptorDataEXT( const ImageCaptureDescriptorDataInfoEXT & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType
+      Device::getImageOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageOpaqueCaptureDescriptorDataEXT &&
                          "Function <vkGetImageOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetImageOpaqueCaptureDescriptorDataEXT(
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetImageOpaqueCaptureDescriptorDataEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getImageOpaqueCaptureDescriptorDataEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageOpaqueCaptureDescriptorDataEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetImageViewOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageViewOpaqueCaptureDescriptorDataEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getImageViewOpaqueCaptureDescriptorDataEXT( const ImageViewCaptureDescriptorDataInfoEXT & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType
+      Device::getImageViewOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetImageViewOpaqueCaptureDescriptorDataEXT &&
                          "Function <vkGetImageViewOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetImageViewOpaqueCaptureDescriptorDataEXT(
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetImageViewOpaqueCaptureDescriptorDataEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImageViewCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getImageViewOpaqueCaptureDescriptorDataEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getImageViewOpaqueCaptureDescriptorDataEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetSamplerOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSamplerOpaqueCaptureDescriptorDataEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getSamplerOpaqueCaptureDescriptorDataEXT( const SamplerCaptureDescriptorDataInfoEXT & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType
+      Device::getSamplerOpaqueCaptureDescriptorDataEXT( const VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSamplerOpaqueCaptureDescriptorDataEXT &&
                          "Function <vkGetSamplerOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetSamplerOpaqueCaptureDescriptorDataEXT(
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSamplerOpaqueCaptureDescriptorDataEXT(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSamplerCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getSamplerOpaqueCaptureDescriptorDataEXT" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSamplerOpaqueCaptureDescriptorDataEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT( const AccelerationStructureCaptureDescriptorDataInfoEXT & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT &&
                          "Function <vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT> requires <VK_EXT_descriptor_buffer>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT(
+          static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( &info ), &data ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getAccelerationStructureOpaqueCaptureDescriptorDataEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
     //=== VK_NV_fragment_shading_rate_enums ===
 
-    // wrapper function for command vkCmdSetFragmentShadingRateEnumNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetFragmentShadingRateEnumNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setFragmentShadingRateEnumNV( FragmentShadingRateNV                  shadingRate,
-                                                                        const FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setFragmentShadingRateEnumNV( VULKAN_HPP_NAMESPACE::FragmentShadingRateNV                  shadingRate,
+                                                   const VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR combinerOps[2] ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetFragmentShadingRateEnumNV &&
                          "Function <vkCmdSetFragmentShadingRateEnumNV> requires <VK_NV_fragment_shading_rate_enums>" );
@@ -24818,7 +20973,6 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_mesh_shader ===
 
-    // wrapper function for command vkCmdDrawMeshTasksEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksEXT( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksEXT && "Function <vkCmdDrawMeshTasksEXT> requires <VK_EXT_mesh_shader>" );
@@ -24826,12 +20980,10 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDrawMeshTasksEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
     }
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                    DeviceSize                   offset,
-                                                                    uint32_t                     drawCount,
-                                                                    uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                    VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                    uint32_t                         drawCount,
+                                                                    uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksIndirectEXT && "Function <vkCmdDrawMeshTasksIndirectEXT> requires <VK_EXT_mesh_shader>" );
 
@@ -24839,14 +20991,12 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBuffer>( buffer ), static_cast<VkDeviceSize>( offset ), drawCount, stride );
     }
 
-    // wrapper function for command vkCmdDrawMeshTasksIndirectCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMeshTasksIndirectCountEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                                         DeviceSize                   offset,
-                                                                         VULKAN_HPP_NAMESPACE::Buffer countBuffer,
-                                                                         DeviceSize                   countBufferOffset,
-                                                                         uint32_t                     maxDrawCount,
-                                                                         uint32_t                     stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawMeshTasksIndirectCountEXT( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                                         VULKAN_HPP_NAMESPACE::Buffer     countBuffer,
+                                                                         VULKAN_HPP_NAMESPACE::DeviceSize countBufferOffset,
+                                                                         uint32_t                         maxDrawCount,
+                                                                         uint32_t                         stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMeshTasksIndirectCountEXT && "Function <vkCmdDrawMeshTasksIndirectCountEXT> requires <VK_EXT_mesh_shader>" );
 
@@ -24861,24 +21011,22 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_copy_commands2 ===
 
-    // wrapper function for command vkCmdCopyBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBuffer2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferInfo2 & copyBufferInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBuffer2KHR && "Function <vkCmdCopyBuffer2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
       getDispatcher()->vkCmdCopyBuffer2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyBufferInfo2 *>( &copyBufferInfo ) );
     }
 
-    // wrapper function for command vkCmdCopyImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImage2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyImage2KHR( const VULKAN_HPP_NAMESPACE::CopyImageInfo2 & copyImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImage2KHR && "Function <vkCmdCopyImage2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
       getDispatcher()->vkCmdCopyImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyImageInfo2 *>( &copyImageInfo ) );
     }
 
-    // wrapper function for command vkCmdCopyBufferToImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyBufferToImage2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyBufferToImage2KHR( const CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyBufferToImage2KHR( const VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 & copyBufferToImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyBufferToImage2KHR &&
                          "Function <vkCmdCopyBufferToImage2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
@@ -24887,8 +21035,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                    reinterpret_cast<const VkCopyBufferToImageInfo2 *>( &copyBufferToImageInfo ) );
     }
 
-    // wrapper function for command vkCmdCopyImageToBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyImageToBuffer2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyImageToBuffer2KHR( const CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::copyImageToBuffer2KHR( const VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 & copyImageToBufferInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyImageToBuffer2KHR &&
                          "Function <vkCmdCopyImageToBuffer2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
@@ -24897,16 +21045,14 @@ namespace VULKAN_HPP_NAMESPACE
                                                    reinterpret_cast<const VkCopyImageToBufferInfo2 *>( &copyImageToBufferInfo ) );
     }
 
-    // wrapper function for command vkCmdBlitImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBlitImage2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::blitImage2KHR( const VULKAN_HPP_NAMESPACE::BlitImageInfo2 & blitImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBlitImage2KHR && "Function <vkCmdBlitImage2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
       getDispatcher()->vkCmdBlitImage2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkBlitImageInfo2 *>( &blitImageInfo ) );
     }
 
-    // wrapper function for command vkCmdResolveImage2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdResolveImage2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::resolveImage2KHR( const VULKAN_HPP_NAMESPACE::ResolveImageInfo2 & resolveImageInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdResolveImage2KHR && "Function <vkCmdResolveImage2KHR> requires <VK_KHR_copy_commands2> or <VK_VERSION_1_3>" );
 
@@ -24915,63 +21061,111 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     //=== VK_EXT_device_fault ===
-    // wrapper function for command vkGetDeviceFaultInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceFaultInfoEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getFaultInfoEXT( DeviceFaultCountsEXT * pFaultCounts,
-                                                                           DeviceFaultInfoEXT *   pFaultInfo ) const VULKAN_HPP_NOEXCEPT
+
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT>
+                                           Device::getFaultInfoEXT() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceFaultInfoEXT && "Function <vkGetDeviceFaultInfoEXT> requires <VK_EXT_device_fault>" );
-      return static_cast<Result>( getDispatcher()->vkGetDeviceFaultInfoEXT( static_cast<VkDevice>( m_device ),
-                                                                            reinterpret_cast<VkDeviceFaultCountsEXT *>( pFaultCounts ),
-                                                                            reinterpret_cast<VkDeviceFaultInfoEXT *>( pFaultInfo ) ) );
+
+      std::pair<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT, VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT> data_;
+      VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT &                                                    faultCounts = data_.first;
+      VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT &                                                      faultInfo   = data_.second;
+      VULKAN_HPP_NAMESPACE::Result                                                                    result;
+      do
+      {
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkGetDeviceFaultInfoEXT( m_device, reinterpret_cast<VkDeviceFaultCountsEXT *>( &faultCounts ), nullptr ) );
+        if ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess )
+        {
+          std::free( faultInfo.pAddressInfos );
+          if ( faultCounts.addressInfoCount )
+          {
+            faultInfo.pAddressInfos = reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT *>(
+              std::malloc( faultCounts.addressInfoCount * sizeof( VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT ) ) );
+          }
+          std::free( faultInfo.pVendorInfos );
+          if ( faultCounts.vendorInfoCount )
+          {
+            faultInfo.pVendorInfos = reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT *>(
+              std::malloc( faultCounts.vendorInfoCount * sizeof( VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT ) ) );
+          }
+          std::free( faultInfo.pVendorBinaryData );
+          if ( faultCounts.vendorBinarySize )
+          {
+            faultInfo.pVendorBinaryData = std::malloc( faultCounts.vendorBinarySize );
+          }
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDeviceFaultInfoEXT(
+            m_device, reinterpret_cast<VkDeviceFaultCountsEXT *>( &faultCounts ), reinterpret_cast<VkDeviceFaultInfoEXT *>( &faultInfo ) ) );
+        }
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultInfoEXT",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncomplete } );
+
+      return data_;
     }
+
 #  if defined( VK_USE_PLATFORM_WIN32_KHR )
     //=== VK_NV_acquire_winrt_display ===
 
-    // wrapper function for command vkAcquireWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireWinrtDisplayNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type DisplayKHR::acquireWinrtNV() const
+    VULKAN_HPP_INLINE void DisplayKHR::acquireWinrtNV() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireWinrtDisplayNV && "Function <vkAcquireWinrtDisplayNV> requires <VK_NV_acquire_winrt_display>" );
 
-      Result result = static_cast<Result>(
-        getDispatcher()->vkAcquireWinrtDisplayNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_displayKHR ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::DisplayKHR::acquireWinrtNV" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkAcquireWinrtDisplayNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( m_display ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::DisplayKHR::acquireWinrtNV" );
     }
 
-    // wrapper function for command vkGetWinrtDisplayNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetWinrtDisplayNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DisplayKHR>::type
-                         PhysicalDevice::getWinrtDisplayNV( uint32_t deviceRelativeId ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR>::Type
+                        PhysicalDevice::getWinrtDisplayNV( uint32_t deviceRelativeId ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::DisplayKHR display;
-      Result                           result = static_cast<Result>( getDispatcher()->vkGetWinrtDisplayNV(
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetWinrtDisplayNV(
         static_cast<VkPhysicalDevice>( m_physicalDevice ), deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "PhysicalDevice::getWinrtDisplayNV" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DisplayKHR( *this, *reinterpret_cast<VkDisplayKHR *>( &display ) );
     }
 #  endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #  if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
     //=== VK_EXT_directfb_surface ===
 
-    // wrapper function for command vkCreateDirectFBSurfaceEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDirectFBSurfaceEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createDirectFBSurfaceEXT( DirectFBSurfaceCreateInfoEXT const & createInfo,
-                                          Optional<const AllocationCallbacks>  allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createDirectFBSurfaceEXT( VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT const &                      createInfo,
+                                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateDirectFBSurfaceEXT( static_cast<VkInstance>( m_instance ),
-                                                                                        reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
-                                                                                        reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createDirectFBSurfaceEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateDirectFBSurfaceEXT(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createDirectFBSurfaceEXT" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceDirectFBPresentationSupportEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceDirectFBPresentationSupportEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t    queueFamilyIndex,
-                                                                                                     IDirectFB & dfb ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+      PhysicalDevice::getDirectFBPresentationSupportEXT( uint32_t queueFamilyIndex, IDirectFB & dfb ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceDirectFBPresentationSupportEXT &&
                          "Function <vkGetPhysicalDeviceDirectFBPresentationSupportEXT> requires <VK_EXT_directfb_surface>" );
@@ -24979,16 +21173,16 @@ namespace VULKAN_HPP_NAMESPACE
       VkBool32 result =
         getDispatcher()->vkGetPhysicalDeviceDirectFBPresentationSupportEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &dfb );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
     //=== VK_EXT_vertex_input_dynamic_state ===
 
-    // wrapper function for command vkCmdSetVertexInputEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetVertexInputEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setVertexInputEXT( ArrayProxy<const VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
-                                        ArrayProxy<const VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setVertexInputEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT> const &   vertexBindingDescriptions,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT> const & vertexAttributeDescriptions ) const
+      VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetVertexInputEXT &&
                          "Function <vkCmdSetVertexInputEXT> requires <VK_EXT_shader_object> or <VK_EXT_vertex_input_dynamic_state>" );
@@ -25003,166 +21197,150 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_external_memory ===
 
-    // wrapper function for command vkGetMemoryZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandleFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<zx_handle_t>::type
-                         Device::getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE zx_handle_t
+      Device::getMemoryZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryZirconHandleFUCHSIA && "Function <vkGetMemoryZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_memory>" );
 
-      zx_handle_t zirconHandle;
-      Result      result = static_cast<Result>( getDispatcher()->vkGetMemoryZirconHandleFUCHSIA(
+      zx_handle_t                  zirconHandle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetMemoryZirconHandleFUCHSIA(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA *>( &getZirconHandleInfo ), &zirconHandle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryZirconHandleFUCHSIA" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandleFUCHSIA" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( zirconHandle ) );
+      return zirconHandle;
     }
 
-    // wrapper function for command vkGetMemoryZirconHandlePropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryZirconHandlePropertiesFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryZirconHandlePropertiesFUCHSIA>::type
-                         Device::getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA
+      Device::getMemoryZirconHandlePropertiesFUCHSIA( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t zirconHandle ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryZirconHandlePropertiesFUCHSIA &&
                          "Function <vkGetMemoryZirconHandlePropertiesFUCHSIA> requires <VK_FUCHSIA_external_memory>" );
 
-      MemoryZirconHandlePropertiesFUCHSIA memoryZirconHandleProperties;
-      Result                              result = static_cast<Result>( getDispatcher()->vkGetMemoryZirconHandlePropertiesFUCHSIA(
+      VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA memoryZirconHandleProperties;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetMemoryZirconHandlePropertiesFUCHSIA(
         static_cast<VkDevice>( m_device ),
         static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
         zirconHandle,
         reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA *>( &memoryZirconHandleProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryZirconHandlePropertiesFUCHSIA" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryZirconHandlePropertiesFUCHSIA" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryZirconHandleProperties ) );
+      return memoryZirconHandleProperties;
     }
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_external_semaphore ===
 
-    // wrapper function for command vkImportSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkImportSemaphoreZirconHandleFUCHSIA.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo ) const
+    VULKAN_HPP_INLINE void
+      Device::importSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA & importSemaphoreZirconHandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkImportSemaphoreZirconHandleFUCHSIA &&
                          "Function <vkImportSemaphoreZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_semaphore>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkImportSemaphoreZirconHandleFUCHSIA(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkImportSemaphoreZirconHandleFUCHSIA(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA *>( &importSemaphoreZirconHandleInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::importSemaphoreZirconHandleFUCHSIA" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::importSemaphoreZirconHandleFUCHSIA" );
     }
 
-    // wrapper function for command vkGetSemaphoreZirconHandleFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSemaphoreZirconHandleFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<zx_handle_t>::type
-                         Device::getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE zx_handle_t
+      Device::getSemaphoreZirconHandleFUCHSIA( const VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA & getZirconHandleInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetSemaphoreZirconHandleFUCHSIA &&
                          "Function <vkGetSemaphoreZirconHandleFUCHSIA> requires <VK_FUCHSIA_external_semaphore>" );
 
-      zx_handle_t zirconHandle;
-      Result      result = static_cast<Result>( getDispatcher()->vkGetSemaphoreZirconHandleFUCHSIA(
+      zx_handle_t                  zirconHandle;
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetSemaphoreZirconHandleFUCHSIA(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA *>( &getZirconHandleInfo ), &zirconHandle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getSemaphoreZirconHandleFUCHSIA" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getSemaphoreZirconHandleFUCHSIA" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( zirconHandle ) );
+      return zirconHandle;
     }
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #  if defined( VK_USE_PLATFORM_FUCHSIA )
     //=== VK_FUCHSIA_buffer_collection ===
 
-    // wrapper function for command vkCreateBufferCollectionFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateBufferCollectionFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferCollectionFUCHSIA>::type
-                         Device::createBufferCollectionFUCHSIA( BufferCollectionCreateInfoFUCHSIA const & createInfo,
-                                             Optional<const AllocationCallbacks>       allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferCollectionFUCHSIA>::Type
+      Device::createBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA const &                 createInfo,
+                                             VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection;
-      Result                                        result =
-        static_cast<Result>( getDispatcher()->vkCreateBufferCollectionFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createBufferCollectionFUCHSIA" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, BufferCollectionFUCHSIA( *this, *reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result                  result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateBufferCollectionFUCHSIA(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createBufferCollectionFUCHSIA" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::BufferCollectionFUCHSIA(
+        *this, *reinterpret_cast<VkBufferCollectionFUCHSIA *>( &collection ), allocator );
     }
 
-    // wrapper function for command vkSetBufferCollectionImageConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionImageConstraintsFUCHSIA.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      BufferCollectionFUCHSIA::setImageConstraints( const ImageConstraintsInfoFUCHSIA & imageConstraintsInfo ) const
+    VULKAN_HPP_INLINE void BufferCollectionFUCHSIA::setImageConstraints( const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA & imageConstraintsInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetBufferCollectionImageConstraintsFUCHSIA &&
                          "Function <vkSetBufferCollectionImageConstraintsFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkSetBufferCollectionImageConstraintsFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                                       static_cast<VkBufferCollectionFUCHSIA>( m_bufferCollectionFUCHSIA ),
+                                                                       static_cast<VkBufferCollectionFUCHSIA>( m_collection ),
                                                                        reinterpret_cast<const VkImageConstraintsInfoFUCHSIA *>( &imageConstraintsInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::BufferCollectionFUCHSIA::setImageConstraints" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::BufferCollectionFUCHSIA::setImageConstraints" );
     }
 
-    // wrapper function for command vkSetBufferCollectionBufferConstraintsFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetBufferCollectionBufferConstraintsFUCHSIA.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      BufferCollectionFUCHSIA::setBufferConstraints( const BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo ) const
+    VULKAN_HPP_INLINE void
+      BufferCollectionFUCHSIA::setBufferConstraints( const VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA & bufferConstraintsInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetBufferCollectionBufferConstraintsFUCHSIA &&
                          "Function <vkSetBufferCollectionBufferConstraintsFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 
-      Result result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkSetBufferCollectionBufferConstraintsFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                                        static_cast<VkBufferCollectionFUCHSIA>( m_bufferCollectionFUCHSIA ),
+                                                                        static_cast<VkBufferCollectionFUCHSIA>( m_collection ),
                                                                         reinterpret_cast<const VkBufferConstraintsInfoFUCHSIA *>( &bufferConstraintsInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::BufferCollectionFUCHSIA::setBufferConstraints" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::BufferCollectionFUCHSIA::setBufferConstraints" );
     }
 
-    // wrapper function for command vkGetBufferCollectionPropertiesFUCHSIA, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetBufferCollectionPropertiesFUCHSIA.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BufferCollectionPropertiesFUCHSIA>::type BufferCollectionFUCHSIA::getProperties() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA BufferCollectionFUCHSIA::getProperties() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetBufferCollectionPropertiesFUCHSIA &&
                          "Function <vkGetBufferCollectionPropertiesFUCHSIA> requires <VK_FUCHSIA_buffer_collection>" );
 
-      BufferCollectionPropertiesFUCHSIA properties;
-      Result                            result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA properties;
+      VULKAN_HPP_NAMESPACE::Result                            result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetBufferCollectionPropertiesFUCHSIA( static_cast<VkDevice>( m_device ),
-                                                                 static_cast<VkBufferCollectionFUCHSIA>( m_bufferCollectionFUCHSIA ),
+                                                                 static_cast<VkBufferCollectionFUCHSIA>( m_collection ),
                                                                  reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::BufferCollectionFUCHSIA::getProperties" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::BufferCollectionFUCHSIA::getProperties" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 #  endif /*VK_USE_PLATFORM_FUCHSIA*/
 
     //=== VK_HUAWEI_subpass_shading ===
 
-    // wrapper function for command vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Extent2D>::type RenderPass::getSubpassShadingMaxWorkgroupSizeHUAWEI() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Extent2D RenderPass::getSubpassShadingMaxWorkgroupSizeHUAWEI() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI &&
                          "Function <vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI> requires <VK_HUAWEI_subpass_shading>" );
 
-      Extent2D maxWorkgroupSize;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
+      VULKAN_HPP_NAMESPACE::Extent2D maxWorkgroupSize;
+      VULKAN_HPP_NAMESPACE::Result   result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(
         static_cast<VkDevice>( m_device ), static_cast<VkRenderPass>( m_renderPass ), reinterpret_cast<VkExtent2D *>( &maxWorkgroupSize ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::RenderPass::getSubpassShadingMaxWorkgroupSizeHUAWEI" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::RenderPass::getSubpassShadingMaxWorkgroupSizeHUAWEI" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( maxWorkgroupSize ) );
+      return maxWorkgroupSize;
     }
 
-    // wrapper function for command vkCmdSubpassShadingHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSubpassShadingHUAWEI.html
     VULKAN_HPP_INLINE void CommandBuffer::subpassShadingHUAWEI() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSubpassShadingHUAWEI && "Function <vkCmdSubpassShadingHUAWEI> requires <VK_HUAWEI_subpass_shading>" );
@@ -25172,10 +21350,8 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_HUAWEI_invocation_mask ===
 
-    // wrapper function for command vkCmdBindInvocationMaskHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindInvocationMaskHUAWEI.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView imageView,
-                                                                    ImageLayout                     imageLayout ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindInvocationMaskHUAWEI( VULKAN_HPP_NAMESPACE::ImageView   imageView,
+                                                                    VULKAN_HPP_NAMESPACE::ImageLayout imageLayout ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindInvocationMaskHUAWEI && "Function <vkCmdBindInvocationMaskHUAWEI> requires <VK_HUAWEI_invocation_mask>" );
 
@@ -25185,43 +21361,40 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_external_memory_rdma ===
 
-    // wrapper function for command vkGetMemoryRemoteAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryRemoteAddressNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<RemoteAddressNV>::type
-                         Device::getMemoryRemoteAddressNV( const MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::RemoteAddressNV
+      Device::getMemoryRemoteAddressNV( const VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV & memoryGetRemoteAddressInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryRemoteAddressNV && "Function <vkGetMemoryRemoteAddressNV> requires <VK_NV_external_memory_rdma>" );
 
-      RemoteAddressNV address;
-      Result          result = static_cast<Result>(
+      VULKAN_HPP_NAMESPACE::RemoteAddressNV address;
+      VULKAN_HPP_NAMESPACE::Result          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
         getDispatcher()->vkGetMemoryRemoteAddressNV( static_cast<VkDevice>( m_device ),
                                                      reinterpret_cast<const VkMemoryGetRemoteAddressInfoNV *>( &memoryGetRemoteAddressInfo ),
                                                      reinterpret_cast<VkRemoteAddressNV *>( &address ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryRemoteAddressNV" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getMemoryRemoteAddressNV" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( address ) );
+      return address;
     }
 
     //=== VK_EXT_pipeline_properties ===
 
-    // wrapper function for command vkGetPipelinePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelinePropertiesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<BaseOutStructure>::type
-                         Device::getPipelinePropertiesEXT( const PipelineInfoEXT & pipelineInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::BaseOutStructure
+                                           Device::getPipelinePropertiesEXT( const VULKAN_HPP_NAMESPACE::PipelineInfoEXT & pipelineInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelinePropertiesEXT && "Function <vkGetPipelinePropertiesEXT> requires <VK_EXT_pipeline_properties>" );
 
-      BaseOutStructure pipelineProperties;
-      Result           result = static_cast<Result>( getDispatcher()->vkGetPipelinePropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                                        reinterpret_cast<const VkPipelineInfoEXT *>( &pipelineInfo ),
-                                                                                        reinterpret_cast<VkBaseOutStructure *>( &pipelineProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelinePropertiesEXT" );
+      VULKAN_HPP_NAMESPACE::BaseOutStructure pipelineProperties;
+      VULKAN_HPP_NAMESPACE::Result           result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetPipelinePropertiesEXT( static_cast<VkDevice>( m_device ),
+                                                     reinterpret_cast<const VkPipelineInfoEXT *>( &pipelineInfo ),
+                                                     reinterpret_cast<VkBaseOutStructure *>( &pipelineProperties ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getPipelinePropertiesEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineProperties ) );
+      return pipelineProperties;
     }
 
     //=== VK_EXT_extended_dynamic_state2 ===
 
-    // wrapper function for command vkCmdSetPatchControlPointsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPatchControlPointsEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::setPatchControlPointsEXT( uint32_t patchControlPoints ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPatchControlPointsEXT &&
@@ -25230,9 +21403,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetPatchControlPointsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), patchControlPoints );
     }
 
-    // wrapper function for command vkCmdSetRasterizerDiscardEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizerDiscardEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnableEXT( Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setRasterizerDiscardEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkCmdSetRasterizerDiscardEnableEXT &&
@@ -25241,8 +21412,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetRasterizerDiscardEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( rasterizerDiscardEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthBiasEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthBiasEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnableEXT( Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthBiasEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthBiasEnableEXT &&
                          "Function <vkCmdSetDepthBiasEnableEXT> requires <VK_EXT_extended_dynamic_state2> or <VK_EXT_shader_object> or <VK_VERSION_1_3>" );
@@ -25250,8 +21420,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthBiasEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthBiasEnable ) );
     }
 
-    // wrapper function for command vkCmdSetLogicOpEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEXT( LogicOp logicOp ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEXT( VULKAN_HPP_NAMESPACE::LogicOp logicOp ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLogicOpEXT &&
                          "Function <vkCmdSetLogicOpEXT> requires <VK_EXT_extended_dynamic_state2> or <VK_EXT_shader_object>" );
@@ -25259,9 +21428,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetLogicOpEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkLogicOp>( logicOp ) );
     }
 
-    // wrapper function for command vkCmdSetPrimitiveRestartEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPrimitiveRestartEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnableEXT( Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setPrimitiveRestartEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkCmdSetPrimitiveRestartEnableEXT &&
@@ -25273,24 +21440,32 @@ namespace VULKAN_HPP_NAMESPACE
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
     //=== VK_QNX_screen_surface ===
 
-    // wrapper function for command vkCreateScreenSurfaceQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateScreenSurfaceQNX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createScreenSurfaceQNX( ScreenSurfaceCreateInfoQNX const &  createInfo,
-                                        Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR>::Type
+                        Instance::createScreenSurfaceQNX( VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX const &                        createInfo,
+                                        VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateScreenSurfaceQNX( static_cast<VkInstance>( m_instance ),
-                                                                                      reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
-                                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                      reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createScreenSurfaceQNX" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result     result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateScreenSurfaceQNX(
+        static_cast<VkInstance>( m_instance ),
+        reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#    if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#    else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Instance::createScreenSurfaceQNX" );
+#    endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator );
     }
 
-    // wrapper function for command vkGetPhysicalDeviceScreenPresentationSupportQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceScreenPresentationSupportQNX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Bool32 PhysicalDevice::getScreenPresentationSupportQNX( uint32_t                queueFamilyIndex,
-                                                                                                   struct _screen_window & window ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Bool32
+      PhysicalDevice::getScreenPresentationSupportQNX( uint32_t queueFamilyIndex, struct _screen_window & window ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceScreenPresentationSupportQNX &&
                          "Function <vkGetPhysicalDeviceScreenPresentationSupportQNX> requires <VK_QNX_screen_surface>" );
@@ -25298,14 +21473,14 @@ namespace VULKAN_HPP_NAMESPACE
       VkBool32 result =
         getDispatcher()->vkGetPhysicalDeviceScreenPresentationSupportQNX( static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &window );
 
-      return static_cast<Bool32>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Bool32>( result );
     }
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
     //=== VK_EXT_color_write_enable ===
 
-    // wrapper function for command vkCmdSetColorWriteEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setColorWriteEnableEXT( ArrayProxy<const Bool32> const & colorWriteEnables ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setColorWriteEnableEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetColorWriteEnableEXT && "Function <vkCmdSetColorWriteEnableEXT> requires <VK_EXT_color_write_enable>" );
 
@@ -25315,8 +21490,7 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_ray_tracing_maintenance1 ===
 
-    // wrapper function for command vkCmdTraceRaysIndirect2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdTraceRaysIndirect2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirect2KHR( DeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::traceRaysIndirect2KHR( VULKAN_HPP_NAMESPACE::DeviceAddress indirectDeviceAddress ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdTraceRaysIndirect2KHR && "Function <vkCmdTraceRaysIndirect2KHR> requires <VK_KHR_ray_tracing_maintenance1>" );
 
@@ -25325,10 +21499,10 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_multi_draw ===
 
-    // wrapper function for command vkCmdDrawMultiEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMultiEXT( StridedArrayProxy<const MultiDrawInfoEXT> const & vertexInfo,
-                                                        uint32_t                                          instanceCount,
-                                                        uint32_t                                          firstInstance ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::drawMultiEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT> const & vertexInfo,
+                                   uint32_t                                                                                      instanceCount,
+                                   uint32_t firstInstance ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMultiEXT && "Function <vkCmdDrawMultiEXT> requires <VK_EXT_multi_draw>" );
 
@@ -25340,11 +21514,11 @@ namespace VULKAN_HPP_NAMESPACE
                                           vertexInfo.stride() );
     }
 
-    // wrapper function for command vkCmdDrawMultiIndexedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawMultiIndexedEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawMultiIndexedEXT( StridedArrayProxy<const MultiDrawIndexedInfoEXT> const & indexInfo,
-                                                               uint32_t                                                 instanceCount,
-                                                               uint32_t                                                 firstInstance,
-                                                               Optional<const int32_t>                                  vertexOffset ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::drawMultiIndexedEXT( VULKAN_HPP_NAMESPACE::StridedArrayProxy<const VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT> const & indexInfo,
+                                          uint32_t                                                                                             instanceCount,
+                                          uint32_t                                                                                             firstInstance,
+                                          Optional<const int32_t> vertexOffset ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawMultiIndexedEXT && "Function <vkCmdDrawMultiIndexedEXT> requires <VK_EXT_multi_draw>" );
 
@@ -25354,27 +21528,37 @@ namespace VULKAN_HPP_NAMESPACE
                                                  instanceCount,
                                                  firstInstance,
                                                  indexInfo.stride(),
-                                                 vertexOffset.get() );
+                                                 static_cast<const int32_t *>( vertexOffset ) );
     }
 
     //=== VK_EXT_opacity_micromap ===
 
-    // wrapper function for command vkCreateMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateMicromapEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MicromapEXT>::type
-                         Device::createMicromapEXT( MicromapCreateInfoEXT const &       createInfo,
-                                 Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::MicromapEXT>::Type
+                        Device::createMicromapEXT( VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT const &                             createInfo,
+                                 VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::MicromapEXT micromap;
-      Result                            result = static_cast<Result>( getDispatcher()->vkCreateMicromapEXT( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createMicromapEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, MicromapEXT( *this, *reinterpret_cast<VkMicromapEXT *>( &micromap ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result      result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateMicromapEXT(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkMicromapCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkMicromapEXT *>( &micromap ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createMicromapEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::MicromapEXT( *this, *reinterpret_cast<VkMicromapEXT *>( &micromap ), allocator );
     }
 
-    // wrapper function for command vkCmdBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildMicromapsEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT( ArrayProxy<const MicromapBuildInfoEXT> const & infos ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::buildMicromapsEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildMicromapsEXT && "Function <vkCmdBuildMicromapsEXT> requires <VK_EXT_opacity_micromap>" );
 
@@ -25382,125 +21566,136 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), infos.size(), reinterpret_cast<const VkMicromapBuildInfoEXT *>( infos.data() ) );
     }
 
-    // wrapper function for command vkBuildMicromapsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBuildMicromapsEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR     deferredOperation,
-                                                                             ArrayProxy<const MicromapBuildInfoEXT> const & infos ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::buildMicromapsEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                                                 deferredOperation,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT> const & infos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBuildMicromapsEXT && "Function <vkBuildMicromapsEXT> requires <VK_EXT_opacity_micromap>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBuildMicromapsEXT( static_cast<VkDevice>( m_device ),
-                                                                                 static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                                 infos.size(),
-                                                                                 reinterpret_cast<const VkMicromapBuildInfoEXT *>( infos.data() ) ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkBuildMicromapsEXT( static_cast<VkDevice>( m_device ),
+                                                                                         static_cast<VkDeferredOperationKHR>( deferredOperation ),
+                                                                                         infos.size(),
+                                                                                         reinterpret_cast<const VkMicromapBuildInfoEXT *>( infos.data() ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::buildMicromapsEXT",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::buildMicromapsEXT",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                           const CopyMicromapInfoEXT &                info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result Device::copyMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
+                                                                                                 const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMicromapEXT && "Function <vkCopyMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyMicromapEXT( static_cast<VkDevice>( m_device ),
-                                                                               static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                               reinterpret_cast<const VkCopyMicromapInfoEXT *>( &info ) ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCopyMicromapEXT( static_cast<VkDevice>( m_device ),
+                                                                                       static_cast<VkDeferredOperationKHR>( deferredOperation ),
+                                                                                       reinterpret_cast<const VkCopyMicromapInfoEXT *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMicromapEXT",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapEXT",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyMicromapToMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMicromapToMemoryEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                                   const CopyMicromapToMemoryInfoEXT &        info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::copyMicromapToMemoryEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                       const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMicromapToMemoryEXT && "Function <vkCopyMicromapToMemoryEXT> requires <VK_EXT_opacity_micromap>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyMicromapToMemoryEXT( static_cast<VkDevice>( m_device ),
-                                                                                       static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                                       reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( &info ) ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkCopyMicromapToMemoryEXT( static_cast<VkDevice>( m_device ),
+                                                    static_cast<VkDeferredOperationKHR>( deferredOperation ),
+                                                    reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMicromapToMemoryEXT",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyMicromapToMemoryEXT",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkCopyMemoryToMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCopyMemoryToMicromapEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR deferredOperation,
-                                                                                   const CopyMemoryToMicromapInfoEXT &        info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Result
+                                           Device::copyMemoryToMicromapEXT( VULKAN_HPP_NAMESPACE::DeferredOperationKHR                deferredOperation,
+                                       const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCopyMemoryToMicromapEXT && "Function <vkCopyMemoryToMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkCopyMemoryToMicromapEXT( static_cast<VkDevice>( m_device ),
-                                                                                       static_cast<VkDeferredOperationKHR>( deferredOperation ),
-                                                                                       reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( &info ) ) );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkCopyMemoryToMicromapEXT( static_cast<VkDevice>( m_device ),
+                                                    static_cast<VkDeferredOperationKHR>( deferredOperation ),
+                                                    reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( &info ) ) );
       VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::copyMemoryToMicromapEXT",
-                                                 { Result::eSuccess, Result::eOperationDeferredKHR, Result::eOperationNotDeferredKHR } );
+                                                 VULKAN_HPP_NAMESPACE_STRING "::Device::copyMemoryToMicromapEXT",
+                                                 { VULKAN_HPP_NAMESPACE::Result::eSuccess,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationDeferredKHR,
+                                                   VULKAN_HPP_NAMESPACE::Result::eOperationNotDeferredKHR } );
 
-      return static_cast<Result>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::Result>( result );
     }
 
-    // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataType>>::type Device::writeMicromapsPropertiesEXT(
-      ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps, QueryType queryType, size_t dataSize, size_t stride ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<DataType>
+      Device::writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                           VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                           size_t                                                                            dataSize,
+                                           size_t                                                                            stride ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWriteMicromapsPropertiesEXT && "Function <vkWriteMicromapsPropertiesEXT> requires <VK_EXT_opacity_micromap>" );
 
       VULKAN_HPP_ASSERT( dataSize % sizeof( DataType ) == 0 );
-      std::vector<DataType> data( dataSize / sizeof( DataType ) );
-      Result                result = static_cast<Result>( getDispatcher()->vkWriteMicromapsPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                                           micromaps.size(),
-                                                                                           reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
-                                                                                           static_cast<VkQueryType>( queryType ),
-                                                                                           data.size() * sizeof( DataType ),
-                                                                                           reinterpret_cast<void *>( data.data() ),
-                                                                                           stride ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::writeMicromapsPropertiesEXT" );
+      std::vector<DataType>        data( dataSize / sizeof( DataType ) );
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkWriteMicromapsPropertiesEXT( static_cast<VkDevice>( m_device ),
+                                                                                                   micromaps.size(),
+                                                                                                   reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
+                                                                                                   static_cast<VkQueryType>( queryType ),
+                                                                                                   data.size() * sizeof( DataType ),
+                                                                                                   reinterpret_cast<void *>( data.data() ),
+                                                                                                   stride ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertiesEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkWriteMicromapsPropertiesEXT.html
     template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-      Device::writeMicromapsPropertyEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps, QueryType queryType, size_t stride ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DataType
+      Device::writeMicromapsPropertyEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                         VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                         size_t                                                                            stride ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkWriteMicromapsPropertiesEXT && "Function <vkWriteMicromapsPropertiesEXT> requires <VK_EXT_opacity_micromap>" );
 
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkWriteMicromapsPropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                                                           micromaps.size(),
-                                                                                           reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
-                                                                                           static_cast<VkQueryType>( queryType ),
-                                                                                           sizeof( DataType ),
-                                                                                           reinterpret_cast<void *>( &data ),
-                                                                                           stride ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::writeMicromapsPropertyEXT" );
+      DataType                     data;
+      VULKAN_HPP_NAMESPACE::Result result =
+        static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkWriteMicromapsPropertiesEXT( static_cast<VkDevice>( m_device ),
+                                                                                                   micromaps.size(),
+                                                                                                   reinterpret_cast<const VkMicromapEXT *>( micromaps.data() ),
+                                                                                                   static_cast<VkQueryType>( queryType ),
+                                                                                                   sizeof( DataType ),
+                                                                                                   reinterpret_cast<void *>( &data ),
+                                                                                                   stride ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::writeMicromapsPropertyEXT" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkCmdCopyMicromapEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const CopyMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMicromapEXT && "Function <vkCmdCopyMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 
       getDispatcher()->vkCmdCopyMicromapEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyMicromapInfoEXT *>( &info ) );
     }
 
-    // wrapper function for command vkCmdCopyMicromapToMemoryEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMicromapToMemoryEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const CopyMicromapToMemoryInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMicromapToMemoryEXT( const VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMicromapToMemoryEXT && "Function <vkCmdCopyMicromapToMemoryEXT> requires <VK_EXT_opacity_micromap>" );
 
@@ -25508,9 +21703,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                      reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( &info ) );
     }
 
-    // wrapper function for command vkCmdCopyMemoryToMicromapEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToMicromapEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const CopyMemoryToMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToMicromapEXT( const VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryToMicromapEXT && "Function <vkCmdCopyMemoryToMicromapEXT> requires <VK_EXT_opacity_micromap>" );
 
@@ -25518,12 +21711,11 @@ namespace VULKAN_HPP_NAMESPACE
                                                      reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( &info ) );
     }
 
-    // wrapper function for command vkCmdWriteMicromapsPropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdWriteMicromapsPropertiesEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::writeMicromapsPropertiesEXT( ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
-                                                                       QueryType                                                   queryType,
-                                                                       VULKAN_HPP_NAMESPACE::QueryPool                             queryPool,
-                                                                       uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::writeMicromapsPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::MicromapEXT> const & micromaps,
+                                                  VULKAN_HPP_NAMESPACE::QueryType                                                   queryType,
+                                                  VULKAN_HPP_NAMESPACE::QueryPool                                                   queryPool,
+                                                  uint32_t firstQuery ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdWriteMicromapsPropertiesEXT &&
                          "Function <vkCmdWriteMicromapsPropertiesEXT> requires <VK_EXT_opacity_micromap>" );
@@ -25536,15 +21728,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                          firstQuery );
     }
 
-    // wrapper function for command vkGetDeviceMicromapCompatibilityEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceMicromapCompatibilityEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureCompatibilityKHR
-      Device::getMicromapCompatibilityEXT( const MicromapVersionInfoEXT & versionInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR
+      Device::getMicromapCompatibilityEXT( const VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT & versionInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceMicromapCompatibilityEXT &&
                          "Function <vkGetDeviceMicromapCompatibilityEXT> requires <VK_EXT_opacity_micromap>" );
 
-      AccelerationStructureCompatibilityKHR compatibility;
+      VULKAN_HPP_NAMESPACE::AccelerationStructureCompatibilityKHR compatibility;
       getDispatcher()->vkGetDeviceMicromapCompatibilityEXT( static_cast<VkDevice>( m_device ),
                                                             reinterpret_cast<const VkMicromapVersionInfoEXT *>( &versionInfo ),
                                                             reinterpret_cast<VkAccelerationStructureCompatibilityKHR *>( &compatibility ) );
@@ -25552,13 +21742,13 @@ namespace VULKAN_HPP_NAMESPACE
       return compatibility;
     }
 
-    // wrapper function for command vkGetMicromapBuildSizesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMicromapBuildSizesEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MicromapBuildSizesInfoEXT
-      Device::getMicromapBuildSizesEXT( AccelerationStructureBuildTypeKHR buildType, const MicromapBuildInfoEXT & buildInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT
+                                           Device::getMicromapBuildSizesEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureBuildTypeKHR buildType,
+                                        const VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT &      buildInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetMicromapBuildSizesEXT && "Function <vkGetMicromapBuildSizesEXT> requires <VK_EXT_opacity_micromap>" );
 
-      MicromapBuildSizesInfoEXT sizeInfo;
+      VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT sizeInfo;
       getDispatcher()->vkGetMicromapBuildSizesEXT( static_cast<VkDevice>( m_device ),
                                                    static_cast<VkAccelerationStructureBuildTypeKHR>( buildType ),
                                                    reinterpret_cast<const VkMicromapBuildInfoEXT *>( &buildInfo ),
@@ -25569,7 +21759,6 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_HUAWEI_cluster_culling_shader ===
 
-    // wrapper function for command vkCmdDrawClusterHUAWEI, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterHUAWEI.html
     VULKAN_HPP_INLINE void CommandBuffer::drawClusterHUAWEI( uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawClusterHUAWEI && "Function <vkCmdDrawClusterHUAWEI> requires <VK_HUAWEI_cluster_culling_shader>" );
@@ -25577,9 +21766,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdDrawClusterHUAWEI( static_cast<VkCommandBuffer>( m_commandBuffer ), groupCountX, groupCountY, groupCountZ );
     }
 
-    // wrapper function for command vkCmdDrawClusterIndirectHUAWEI, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDrawClusterIndirectHUAWEI.html
-    VULKAN_HPP_INLINE void CommandBuffer::drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer buffer, DeviceSize offset ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::drawClusterIndirectHUAWEI( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                                     VULKAN_HPP_NAMESPACE::DeviceSize offset ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDrawClusterIndirectHUAWEI &&
                          "Function <vkCmdDrawClusterIndirectHUAWEI> requires <VK_HUAWEI_cluster_culling_shader>" );
@@ -25590,27 +21778,23 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_EXT_pageable_device_local_memory ===
 
-    // wrapper function for command vkSetDeviceMemoryPriorityEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetDeviceMemoryPriorityEXT.html
     VULKAN_HPP_INLINE void DeviceMemory::setPriorityEXT( float priority ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetDeviceMemoryPriorityEXT &&
                          "Function <vkSetDeviceMemoryPriorityEXT> requires <VK_EXT_pageable_device_local_memory>" );
 
-      getDispatcher()->vkSetDeviceMemoryPriorityEXT( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_deviceMemory ), priority );
+      getDispatcher()->vkSetDeviceMemoryPriorityEXT( static_cast<VkDevice>( m_device ), static_cast<VkDeviceMemory>( m_memory ), priority );
     }
 
     //=== VK_KHR_maintenance4 ===
 
-    // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirementsKHR &&
                          "Function <vkGetDeviceBufferMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetDeviceBufferMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
                                                                reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
                                                                reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25618,17 +21802,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetDeviceBufferMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceBufferMemoryRequirementsKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getBufferMemoryRequirementsKHR( const DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getBufferMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceBufferMemoryRequirementsKHR &&
                          "Function <vkGetDeviceBufferMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetDeviceBufferMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
                                                                reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( &info ),
                                                                reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25636,15 +21818,13 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirementsKHR &&
                          "Function <vkGetDeviceImageMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetDeviceImageMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
                                                               reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
                                                               reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25652,17 +21832,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetDeviceImageMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageMemoryRequirementsKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getImageMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageMemoryRequirementsKHR &&
                          "Function <vkGetDeviceImageMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetDeviceImageMemoryRequirementsKHR( static_cast<VkDevice>( m_device ),
                                                               reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ),
                                                               reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25670,16 +21848,14 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkGetDeviceImageSparseMemoryRequirementsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSparseMemoryRequirementsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<SparseImageMemoryRequirements2>
-                                           Device::getImageSparseMemoryRequirementsKHR( const DeviceImageMemoryRequirements & info ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2>
+                                           Device::getImageSparseMemoryRequirementsKHR( const VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements & info ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSparseMemoryRequirementsKHR &&
                          "Function <vkGetDeviceImageSparseMemoryRequirementsKHR> requires <VK_KHR_maintenance4> or <VK_VERSION_1_3>" );
 
-      std::vector<SparseImageMemoryRequirements2> sparseMemoryRequirements;
-      uint32_t                                    sparseMemoryRequirementCount;
+      std::vector<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2> sparseMemoryRequirements;
+      uint32_t                                                          sparseMemoryRequirementCount;
       getDispatcher()->vkGetDeviceImageSparseMemoryRequirementsKHR(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDeviceImageMemoryRequirements *>( &info ), &sparseMemoryRequirementCount, nullptr );
       sparseMemoryRequirements.resize( sparseMemoryRequirementCount );
@@ -25698,15 +21874,13 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_VALVE_descriptor_set_host_mapping ===
 
-    // wrapper function for command vkGetDescriptorSetLayoutHostMappingInfoVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetLayoutHostMappingInfoVALVE.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DescriptorSetLayoutHostMappingInfoVALVE
-      Device::getDescriptorSetLayoutHostMappingInfoVALVE( const DescriptorSetBindingReferenceVALVE & bindingReference ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE Device::getDescriptorSetLayoutHostMappingInfoVALVE(
+      const VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE & bindingReference ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetLayoutHostMappingInfoVALVE &&
                          "Function <vkGetDescriptorSetLayoutHostMappingInfoVALVE> requires <VK_VALVE_descriptor_set_host_mapping>" );
 
-      DescriptorSetLayoutHostMappingInfoVALVE hostMapping;
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE hostMapping;
       getDispatcher()->vkGetDescriptorSetLayoutHostMappingInfoVALVE( static_cast<VkDevice>( m_device ),
                                                                      reinterpret_cast<const VkDescriptorSetBindingReferenceVALVE *>( &bindingReference ),
                                                                      reinterpret_cast<VkDescriptorSetLayoutHostMappingInfoVALVE *>( &hostMapping ) );
@@ -25714,8 +21888,6 @@ namespace VULKAN_HPP_NAMESPACE
       return hostMapping;
     }
 
-    // wrapper function for command vkGetDescriptorSetHostMappingVALVE, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDescriptorSetHostMappingVALVE.html
     VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE void * DescriptorSet::getHostMappingVALVE() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDescriptorSetHostMappingVALVE &&
@@ -25729,8 +21901,9 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_copy_memory_indirect ===
 
-    // wrapper function for command vkCmdCopyMemoryIndirectNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectNV( DeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectNV( VULKAN_HPP_NAMESPACE::DeviceAddress copyBufferAddress,
+                                                                uint32_t                            copyCount,
+                                                                uint32_t                            stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryIndirectNV && "Function <vkCmdCopyMemoryIndirectNV> requires <VK_NV_copy_memory_indirect>" );
 
@@ -25738,14 +21911,12 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkDeviceAddress>( copyBufferAddress ), copyCount, stride );
     }
 
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::copyMemoryToImageIndirectNV( DeviceAddress                                    copyBufferAddress,
-                                                  uint32_t                                         stride,
-                                                  VULKAN_HPP_NAMESPACE::Image                      dstImage,
-                                                  ImageLayout                                      dstImageLayout,
-                                                  ArrayProxy<const ImageSubresourceLayers> const & imageSubresources ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryToImageIndirectNV(
+      VULKAN_HPP_NAMESPACE::DeviceAddress                                                          copyBufferAddress,
+      uint32_t                                                                                     stride,
+      VULKAN_HPP_NAMESPACE::Image                                                                  dstImage,
+      VULKAN_HPP_NAMESPACE::ImageLayout                                                            dstImageLayout,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ImageSubresourceLayers> const & imageSubresources ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryToImageIndirectNV &&
                          "Function <vkCmdCopyMemoryToImageIndirectNV> requires <VK_NV_copy_memory_indirect>" );
@@ -25761,9 +21932,8 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_memory_decompression ===
 
-    // wrapper function for command vkCmdDecompressMemoryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::decompressMemoryNV( ArrayProxy<const DecompressMemoryRegionNV> const & decompressMemoryRegions ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV> const & decompressMemoryRegions ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDecompressMemoryNV && "Function <vkCmdDecompressMemoryNV> requires <VK_NV_memory_decompression>" );
 
@@ -25772,11 +21942,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                 reinterpret_cast<const VkDecompressMemoryRegionNV *>( decompressMemoryRegions.data() ) );
     }
 
-    // wrapper function for command vkCmdDecompressMemoryIndirectCountNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountNV( DeviceAddress indirectCommandsAddress,
-                                                                           DeviceAddress indirectCommandsCountAddress,
-                                                                           uint32_t      stride ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountNV( VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsAddress,
+                                                                           VULKAN_HPP_NAMESPACE::DeviceAddress indirectCommandsCountAddress,
+                                                                           uint32_t                            stride ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDecompressMemoryIndirectCountNV &&
                          "Function <vkCmdDecompressMemoryIndirectCountNV> requires <VK_NV_memory_decompression>" );
@@ -25789,15 +21957,13 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_device_generated_commands_compute ===
 
-    // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::MemoryRequirements2
+      Device::getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineIndirectMemoryRequirementsNV &&
                          "Function <vkGetPipelineIndirectMemoryRequirementsNV> requires <VK_NV_device_generated_commands_compute>" );
 
-      MemoryRequirements2 memoryRequirements;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 memoryRequirements;
       getDispatcher()->vkGetPipelineIndirectMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                   reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
                                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25805,17 +21971,15 @@ namespace VULKAN_HPP_NAMESPACE
       return memoryRequirements;
     }
 
-    // wrapper function for command vkGetPipelineIndirectMemoryRequirementsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectMemoryRequirementsNV.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getPipelineIndirectMemoryRequirementsNV( const ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getPipelineIndirectMemoryRequirementsNV( const VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineIndirectMemoryRequirementsNV &&
                          "Function <vkGetPipelineIndirectMemoryRequirementsNV> requires <VK_NV_device_generated_commands_compute>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::MemoryRequirements2 &      memoryRequirements = structureChain.template get<VULKAN_HPP_NAMESPACE::MemoryRequirements2>();
       getDispatcher()->vkGetPipelineIndirectMemoryRequirementsNV( static_cast<VkDevice>( m_device ),
                                                                   reinterpret_cast<const VkComputePipelineCreateInfo *>( &createInfo ),
                                                                   reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
@@ -25823,10 +21987,8 @@ namespace VULKAN_HPP_NAMESPACE
       return structureChain;
     }
 
-    // wrapper function for command vkCmdUpdatePipelineIndirectBufferNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdUpdatePipelineIndirectBufferNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBufferNV( PipelineBindPoint              pipelineBindPoint,
-                                                                          VULKAN_HPP_NAMESPACE::Pipeline pipeline ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::updatePipelineIndirectBufferNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint,
+                                                                          VULKAN_HPP_NAMESPACE::Pipeline          pipeline ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdUpdatePipelineIndirectBufferNV &&
                          "Function <vkCmdUpdatePipelineIndirectBufferNV> requires <VK_NV_device_generated_commands_compute>" );
@@ -25835,10 +21997,8 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPipelineBindPoint>( pipelineBindPoint ), static_cast<VkPipeline>( pipeline ) );
     }
 
-    // wrapper function for command vkGetPipelineIndirectDeviceAddressNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineIndirectDeviceAddressNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE DeviceAddress
-      Device::getPipelineIndirectAddressNV( const PipelineIndirectDeviceAddressInfoNV & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::DeviceAddress
+      Device::getPipelineIndirectAddressNV( const VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineIndirectDeviceAddressNV &&
                          "Function <vkGetPipelineIndirectDeviceAddressNV> requires <VK_NV_device_generated_commands_compute>" );
@@ -25846,72 +22006,12 @@ namespace VULKAN_HPP_NAMESPACE
       VkDeviceAddress result = getDispatcher()->vkGetPipelineIndirectDeviceAddressNV(
         static_cast<VkDevice>( m_device ), reinterpret_cast<const VkPipelineIndirectDeviceAddressInfoNV *>( &info ) );
 
-      return static_cast<DeviceAddress>( result );
+      return static_cast<VULKAN_HPP_NAMESPACE::DeviceAddress>( result );
     }
 
-#  if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_external_memory ===
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer * buffer,
-                                                                                         NativeBufferPropertiesOHOS *   pProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetNativeBufferPropertiesOHOS && "Function <vkGetNativeBufferPropertiesOHOS> requires <VK_OHOS_external_memory>" );
-      return static_cast<Result>( getDispatcher()->vkGetNativeBufferPropertiesOHOS(
-        static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( pProperties ) ) );
-    }
-
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<NativeBufferPropertiesOHOS>::type
-                         Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetNativeBufferPropertiesOHOS && "Function <vkGetNativeBufferPropertiesOHOS> requires <VK_OHOS_external_memory>" );
-
-      NativeBufferPropertiesOHOS properties;
-      Result                     result = static_cast<Result>( getDispatcher()->vkGetNativeBufferPropertiesOHOS(
-        static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getNativeBufferPropertiesOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-    // wrapper function for command vkGetNativeBufferPropertiesOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetNativeBufferPropertiesOHOS.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         Device::getNativeBufferPropertiesOHOS( const struct OH_NativeBuffer & buffer ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetNativeBufferPropertiesOHOS && "Function <vkGetNativeBufferPropertiesOHOS> requires <VK_OHOS_external_memory>" );
-
-      StructureChain<X, Y, Z...>   structureChain;
-      NativeBufferPropertiesOHOS & properties = structureChain.template get<NativeBufferPropertiesOHOS>();
-      Result                       result     = static_cast<Result>( getDispatcher()->vkGetNativeBufferPropertiesOHOS(
-        static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkNativeBufferPropertiesOHOS *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getNativeBufferPropertiesOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
-    }
-
-    // wrapper function for command vkGetMemoryNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryNativeBufferOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<struct OH_NativeBuffer *>::type
-                         Device::getMemoryNativeBufferOHOS( const MemoryGetNativeBufferInfoOHOS & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryNativeBufferOHOS && "Function <vkGetMemoryNativeBufferOHOS> requires <VK_OHOS_external_memory>" );
-
-      struct OH_NativeBuffer * buffer;
-      Result                   result = static_cast<Result>( getDispatcher()->vkGetMemoryNativeBufferOHOS(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetNativeBufferInfoOHOS *>( &info ), &buffer ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryNativeBufferOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( buffer ) );
-    }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
     //=== VK_EXT_extended_dynamic_state3 ===
 
-    // wrapper function for command vkCmdSetDepthClampEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthClampEnableEXT( Bool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthClampEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClampEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthClampEnableEXT &&
                          "Function <vkCmdSetDepthClampEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25919,8 +22019,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthClampEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthClampEnable ) );
     }
 
-    // wrapper function for command vkCmdSetPolygonModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetPolygonModeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setPolygonModeEXT( PolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setPolygonModeEXT( VULKAN_HPP_NAMESPACE::PolygonMode polygonMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetPolygonModeEXT &&
                          "Function <vkCmdSetPolygonModeEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25928,9 +22027,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetPolygonModeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkPolygonMode>( polygonMode ) );
     }
 
-    // wrapper function for command vkCmdSetRasterizationSamplesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationSamplesEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRasterizationSamplesEXT( SampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setRasterizationSamplesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRasterizationSamplesEXT &&
                          "Function <vkCmdSetRasterizationSamplesEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25939,8 +22036,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                         static_cast<VkSampleCountFlagBits>( rasterizationSamples ) );
     }
 
-    // wrapper function for command vkCmdSetSampleMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleMaskEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setSampleMaskEXT( SampleCountFlagBits samples, ArrayProxy<const SampleMask> const & sampleMask ) const
+    VULKAN_HPP_INLINE void CommandBuffer::setSampleMaskEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits                                        samples,
+                                                            VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::SampleMask> const & sampleMask ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetSampleMaskEXT &&
                          "Function <vkCmdSetSampleMaskEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25959,9 +22056,7 @@ namespace VULKAN_HPP_NAMESPACE
                                               reinterpret_cast<const VkSampleMask *>( sampleMask.data() ) );
     }
 
-    // wrapper function for command vkCmdSetAlphaToCoverageEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToCoverageEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setAlphaToCoverageEnableEXT( Bool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setAlphaToCoverageEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetAlphaToCoverageEnableEXT &&
                          "Function <vkCmdSetAlphaToCoverageEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25969,8 +22064,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetAlphaToCoverageEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( alphaToCoverageEnable ) );
     }
 
-    // wrapper function for command vkCmdSetAlphaToOneEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAlphaToOneEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setAlphaToOneEnableEXT( Bool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setAlphaToOneEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 alphaToOneEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetAlphaToOneEnableEXT &&
                          "Function <vkCmdSetAlphaToOneEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25978,8 +22072,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetAlphaToOneEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( alphaToOneEnable ) );
     }
 
-    // wrapper function for command vkCmdSetLogicOpEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLogicOpEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEnableEXT( Bool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setLogicOpEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 logicOpEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLogicOpEnableEXT &&
                          "Function <vkCmdSetLogicOpEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -25987,9 +22080,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetLogicOpEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( logicOpEnable ) );
     }
 
-    // wrapper function for command vkCmdSetColorBlendEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT( uint32_t                         firstAttachment,
-                                                                  ArrayProxy<const Bool32> const & colorBlendEnables ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEnableEXT(
+      uint32_t firstAttachment, VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::Bool32> const & colorBlendEnables ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetColorBlendEnableEXT &&
                          "Function <vkCmdSetColorBlendEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26000,11 +22092,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                     reinterpret_cast<const VkBool32 *>( colorBlendEnables.data() ) );
     }
 
-    // wrapper function for command vkCmdSetColorBlendEquationEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendEquationEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setColorBlendEquationEXT( uint32_t                                        firstAttachment,
-                                               ArrayProxy<const ColorBlendEquationEXT> const & colorBlendEquations ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setColorBlendEquationEXT(
+      uint32_t                                                                                    firstAttachment,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT> const & colorBlendEquations ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetColorBlendEquationEXT &&
                          "Function <vkCmdSetColorBlendEquationEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26015,9 +22105,9 @@ namespace VULKAN_HPP_NAMESPACE
                                                       reinterpret_cast<const VkColorBlendEquationEXT *>( colorBlendEquations.data() ) );
     }
 
-    // wrapper function for command vkCmdSetColorWriteMaskEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorWriteMaskEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT( uint32_t                                      firstAttachment,
-                                                                ArrayProxy<const ColorComponentFlags> const & colorWriteMasks ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setColorWriteMaskEXT(
+      uint32_t                                                                                  firstAttachment,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorComponentFlags> const & colorWriteMasks ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetColorWriteMaskEXT &&
                          "Function <vkCmdSetColorWriteMaskEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26028,9 +22118,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                   reinterpret_cast<const VkColorComponentFlags *>( colorWriteMasks.data() ) );
     }
 
-    // wrapper function for command vkCmdSetTessellationDomainOriginEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetTessellationDomainOriginEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setTessellationDomainOriginEXT( TessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setTessellationDomainOriginEXT( VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetTessellationDomainOriginEXT &&
                          "Function <vkCmdSetTessellationDomainOriginEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26039,8 +22128,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                             static_cast<VkTessellationDomainOrigin>( domainOrigin ) );
     }
 
-    // wrapper function for command vkCmdSetRasterizationStreamEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRasterizationStreamEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::setRasterizationStreamEXT( uint32_t rasterizationStream ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRasterizationStreamEXT &&
@@ -26049,10 +22136,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetRasterizationStreamEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), rasterizationStream );
     }
 
-    // wrapper function for command vkCmdSetConservativeRasterizationModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetConservativeRasterizationModeEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setConservativeRasterizationModeEXT( ConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setConservativeRasterizationModeEXT(
+      VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetConservativeRasterizationModeEXT &&
                          "Function <vkCmdSetConservativeRasterizationModeEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26061,8 +22146,6 @@ namespace VULKAN_HPP_NAMESPACE
                                                                  static_cast<VkConservativeRasterizationModeEXT>( conservativeRasterizationMode ) );
     }
 
-    // wrapper function for command vkCmdSetExtraPrimitiveOverestimationSizeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetExtraPrimitiveOverestimationSizeEXT.html
     VULKAN_HPP_INLINE void CommandBuffer::setExtraPrimitiveOverestimationSizeEXT( float extraPrimitiveOverestimationSize ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetExtraPrimitiveOverestimationSizeEXT &&
@@ -26071,8 +22154,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetExtraPrimitiveOverestimationSizeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), extraPrimitiveOverestimationSize );
     }
 
-    // wrapper function for command vkCmdSetDepthClipEnableEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthClipEnableEXT( Bool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthClipEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthClipEnableEXT &&
                          "Function <vkCmdSetDepthClipEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26080,9 +22162,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthClipEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( depthClipEnable ) );
     }
 
-    // wrapper function for command vkCmdSetSampleLocationsEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetSampleLocationsEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEnableEXT( Bool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setSampleLocationsEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 sampleLocationsEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetSampleLocationsEnableEXT &&
                          "Function <vkCmdSetSampleLocationsEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26090,11 +22170,9 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetSampleLocationsEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( sampleLocationsEnable ) );
     }
 
-    // wrapper function for command vkCmdSetColorBlendAdvancedEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetColorBlendAdvancedEXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setColorBlendAdvancedEXT( uint32_t                                        firstAttachment,
-                                               ArrayProxy<const ColorBlendAdvancedEXT> const & colorBlendAdvanced ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setColorBlendAdvancedEXT(
+      uint32_t                                                                                    firstAttachment,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT> const & colorBlendAdvanced ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetColorBlendAdvancedEXT &&
                          "Function <vkCmdSetColorBlendAdvancedEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26105,9 +22183,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                       reinterpret_cast<const VkColorBlendAdvancedEXT *>( colorBlendAdvanced.data() ) );
     }
 
-    // wrapper function for command vkCmdSetProvokingVertexModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetProvokingVertexModeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setProvokingVertexModeEXT( ProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setProvokingVertexModeEXT( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetProvokingVertexModeEXT &&
                          "Function <vkCmdSetProvokingVertexModeEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26116,9 +22193,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                        static_cast<VkProvokingVertexModeEXT>( provokingVertexMode ) );
     }
 
-    // wrapper function for command vkCmdSetLineRasterizationModeEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineRasterizationModeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLineRasterizationModeEXT( LineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setLineRasterizationModeEXT( VULKAN_HPP_NAMESPACE::LineRasterizationModeEXT lineRasterizationMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineRasterizationModeEXT &&
                          "Function <vkCmdSetLineRasterizationModeEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26127,9 +22203,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                          static_cast<VkLineRasterizationModeEXT>( lineRasterizationMode ) );
     }
 
-    // wrapper function for command vkCmdSetLineStippleEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setLineStippleEnableEXT( Bool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setLineStippleEnableEXT( VULKAN_HPP_NAMESPACE::Bool32 stippledLineEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineStippleEnableEXT &&
                          "Function <vkCmdSetLineStippleEnableEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26137,9 +22211,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetLineStippleEnableEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( stippledLineEnable ) );
     }
 
-    // wrapper function for command vkCmdSetDepthClipNegativeOneToOneEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClipNegativeOneToOneEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthClipNegativeOneToOneEXT( Bool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDepthClipNegativeOneToOneEXT( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthClipNegativeOneToOneEXT &&
                          "Function <vkCmdSetDepthClipNegativeOneToOneEXT> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26147,9 +22219,7 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetDepthClipNegativeOneToOneEXT( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( negativeOneToOne ) );
     }
 
-    // wrapper function for command vkCmdSetViewportWScalingEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportWScalingEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingEnableNV( Bool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setViewportWScalingEnableNV( VULKAN_HPP_NAMESPACE::Bool32 viewportWScalingEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportWScalingEnableNV &&
                          "Function <vkCmdSetViewportWScalingEnableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26157,9 +22227,9 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetViewportWScalingEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( viewportWScalingEnable ) );
     }
 
-    // wrapper function for command vkCmdSetViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetViewportSwizzleNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setViewportSwizzleNV( uint32_t                                    firstViewport,
-                                                                ArrayProxy<const ViewportSwizzleNV> const & viewportSwizzles ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setViewportSwizzleNV(
+      uint32_t                                                                                firstViewport,
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetViewportSwizzleNV &&
                          "Function <vkCmdSetViewportSwizzleNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26170,9 +22240,7 @@ namespace VULKAN_HPP_NAMESPACE
                                                   reinterpret_cast<const VkViewportSwizzleNV *>( viewportSwizzles.data() ) );
     }
 
-    // wrapper function for command vkCmdSetCoverageToColorEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorEnableNV( Bool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageToColorEnableNV &&
                          "Function <vkCmdSetCoverageToColorEnableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26180,8 +22248,6 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetCoverageToColorEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( coverageToColorEnable ) );
     }
 
-    // wrapper function for command vkCmdSetCoverageToColorLocationNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageToColorLocationNV.html
     VULKAN_HPP_INLINE void CommandBuffer::setCoverageToColorLocationNV( uint32_t coverageToColorLocation ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageToColorLocationNV &&
@@ -26190,9 +22256,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetCoverageToColorLocationNV( static_cast<VkCommandBuffer>( m_commandBuffer ), coverageToColorLocation );
     }
 
-    // wrapper function for command vkCmdSetCoverageModulationModeNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationModeNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationModeNV( CoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setCoverageModulationModeNV( VULKAN_HPP_NAMESPACE::CoverageModulationModeNV coverageModulationMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageModulationModeNV &&
                          "Function <vkCmdSetCoverageModulationModeNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26201,9 +22266,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                          static_cast<VkCoverageModulationModeNV>( coverageModulationMode ) );
     }
 
-    // wrapper function for command vkCmdSetCoverageModulationTableEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableEnableNV( Bool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setCoverageModulationTableEnableNV( VULKAN_HPP_NAMESPACE::Bool32 coverageModulationTableEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageModulationTableEnableNV &&
                          "Function <vkCmdSetCoverageModulationTableEnableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26212,9 +22276,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                                 static_cast<VkBool32>( coverageModulationTableEnable ) );
     }
 
-    // wrapper function for command vkCmdSetCoverageModulationTableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageModulationTableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCoverageModulationTableNV( ArrayProxy<const float> const & coverageModulationTable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setCoverageModulationTableNV( VULKAN_HPP_NAMESPACE::ArrayProxy<const float> const & coverageModulationTable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageModulationTableNV &&
                          "Function <vkCmdSetCoverageModulationTableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26223,9 +22286,7 @@ namespace VULKAN_HPP_NAMESPACE
         static_cast<VkCommandBuffer>( m_commandBuffer ), coverageModulationTable.size(), coverageModulationTable.data() );
     }
 
-    // wrapper function for command vkCmdSetShadingRateImageEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetShadingRateImageEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setShadingRateImageEnableNV( Bool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setShadingRateImageEnableNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetShadingRateImageEnableNV &&
                          "Function <vkCmdSetShadingRateImageEnableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26233,9 +22294,8 @@ namespace VULKAN_HPP_NAMESPACE
       getDispatcher()->vkCmdSetShadingRateImageEnableNV( static_cast<VkCommandBuffer>( m_commandBuffer ), static_cast<VkBool32>( shadingRateImageEnable ) );
     }
 
-    // wrapper function for command vkCmdSetRepresentativeFragmentTestEnableNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetRepresentativeFragmentTestEnableNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setRepresentativeFragmentTestEnableNV( Bool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setRepresentativeFragmentTestEnableNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetRepresentativeFragmentTestEnableNV &&
                          "Function <vkCmdSetRepresentativeFragmentTestEnableNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26244,9 +22304,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                                    static_cast<VkBool32>( representativeFragmentTestEnable ) );
     }
 
-    // wrapper function for command vkCmdSetCoverageReductionModeNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetCoverageReductionModeNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::setCoverageReductionModeNV( CoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::setCoverageReductionModeNV( VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetCoverageReductionModeNV &&
                          "Function <vkCmdSetCoverageReductionModeNV> requires <VK_EXT_extended_dynamic_state3> or <VK_EXT_shader_object>" );
@@ -26255,197 +22314,27 @@ namespace VULKAN_HPP_NAMESPACE
                                                         static_cast<VkCoverageReductionModeNV>( coverageReductionMode ) );
     }
 
-    //=== VK_ARM_tensors ===
-
-    // wrapper function for command vkCreateTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TensorARM>::type
-                         Device::createTensorARM( TensorCreateInfoARM const &         createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::TensorARM tensor;
-      Result                          result = static_cast<Result>( getDispatcher()->vkCreateTensorARM( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkTensorCreateInfoARM *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkTensorARM *>( &tensor ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createTensorARM" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, TensorARM( *this, *reinterpret_cast<VkTensorARM *>( &tensor ), allocator ) );
-    }
-
-    // wrapper function for command vkCreateTensorViewARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateTensorViewARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TensorViewARM>::type
-                         Device::createTensorViewARM( TensorViewCreateInfoARM const &     createInfo,
-                                   Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::TensorViewARM view;
-      Result                              result = static_cast<Result>( getDispatcher()->vkCreateTensorViewARM( static_cast<VkDevice>( m_device ),
-                                                                                   reinterpret_cast<const VkTensorViewCreateInfoARM *>( &createInfo ),
-                                                                                   reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                   reinterpret_cast<VkTensorViewARM *>( &view ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createTensorViewARM" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, TensorViewARM( *this, *reinterpret_cast<VkTensorViewARM *>( &view ), allocator ) );
-    }
-
-    // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetTensorMemoryRequirementsARM && "Function <vkGetTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                                         reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( &info ),
-                                                         reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorMemoryRequirementsARM.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getTensorMemoryRequirementsARM( const TensorMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetTensorMemoryRequirementsARM && "Function <vkGetTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                                         reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( &info ),
-                                                         reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkBindTensorMemoryARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindTensorMemoryARM.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::bindTensorMemoryARM( ArrayProxy<const BindTensorMemoryInfoARM> const & bindInfos ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkBindTensorMemoryARM && "Function <vkBindTensorMemoryARM> requires <VK_ARM_tensors>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkBindTensorMemoryARM(
-        static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindTensorMemoryInfoARM *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindTensorMemoryARM" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceTensorMemoryRequirementsARM &&
-                         "Function <vkGetDeviceTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetDeviceTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                                               reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( &info ),
-                                                               reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetDeviceTensorMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceTensorMemoryRequirementsARM.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getTensorMemoryRequirementsARM( const DeviceTensorMemoryRequirementsARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceTensorMemoryRequirementsARM &&
-                         "Function <vkGetDeviceTensorMemoryRequirementsARM> requires <VK_ARM_tensors>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetDeviceTensorMemoryRequirementsARM( static_cast<VkDevice>( m_device ),
-                                                               reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( &info ),
-                                                               reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkCmdCopyTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyTensorARM.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyTensorARM( const CopyTensorInfoARM & copyTensorInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyTensorARM && "Function <vkCmdCopyTensorARM> requires <VK_ARM_tensors>" );
-
-      getDispatcher()->vkCmdCopyTensorARM( static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkCopyTensorInfoARM *>( &copyTensorInfo ) );
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceExternalTensorPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceExternalTensorPropertiesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ExternalTensorPropertiesARM
-      PhysicalDevice::getExternalTensorPropertiesARM( const PhysicalDeviceExternalTensorInfoARM & externalTensorInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceExternalTensorPropertiesARM &&
-                         "Function <vkGetPhysicalDeviceExternalTensorPropertiesARM> requires <VK_ARM_tensors>" );
-
-      ExternalTensorPropertiesARM externalTensorProperties;
-      getDispatcher()->vkGetPhysicalDeviceExternalTensorPropertiesARM( static_cast<VkPhysicalDevice>( m_physicalDevice ),
-                                                                       reinterpret_cast<const VkPhysicalDeviceExternalTensorInfoARM *>( &externalTensorInfo ),
-                                                                       reinterpret_cast<VkExternalTensorPropertiesARM *>( &externalTensorProperties ) );
-
-      return externalTensorProperties;
-    }
-
-    // wrapper function for command vkGetTensorOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorOpaqueCaptureDescriptorDataARM.html
-    template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getTensorOpaqueCaptureDescriptorDataARM( const TensorCaptureDescriptorDataInfoARM & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetTensorOpaqueCaptureDescriptorDataARM &&
-                         "Function <vkGetTensorOpaqueCaptureDescriptorDataARM> requires <VK_ARM_tensors>" );
-
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetTensorOpaqueCaptureDescriptorDataARM(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkTensorCaptureDescriptorDataInfoARM *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getTensorOpaqueCaptureDescriptorDataARM" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
-    }
-
-    // wrapper function for command vkGetTensorViewOpaqueCaptureDescriptorDataARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetTensorViewOpaqueCaptureDescriptorDataARM.html
-    template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataType>::type
-                         Device::getTensorViewOpaqueCaptureDescriptorDataARM( const TensorViewCaptureDescriptorDataInfoARM & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetTensorViewOpaqueCaptureDescriptorDataARM &&
-                         "Function <vkGetTensorViewOpaqueCaptureDescriptorDataARM> requires <VK_ARM_tensors>" );
-
-      DataType data;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetTensorViewOpaqueCaptureDescriptorDataARM(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkTensorViewCaptureDescriptorDataInfoARM *>( &info ), &data ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getTensorViewOpaqueCaptureDescriptorDataARM" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
-    }
-
     //=== VK_EXT_shader_module_identifier ===
 
-    // wrapper function for command vkGetShaderModuleIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleIdentifierEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ShaderModuleIdentifierEXT ShaderModule::getIdentifierEXT() const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT ShaderModule::getIdentifierEXT() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetShaderModuleIdentifierEXT &&
                          "Function <vkGetShaderModuleIdentifierEXT> requires <VK_EXT_shader_module_identifier>" );
 
-      ShaderModuleIdentifierEXT identifier;
+      VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT identifier;
       getDispatcher()->vkGetShaderModuleIdentifierEXT(
         static_cast<VkDevice>( m_device ), static_cast<VkShaderModule>( m_shaderModule ), reinterpret_cast<VkShaderModuleIdentifierEXT *>( &identifier ) );
 
       return identifier;
     }
 
-    // wrapper function for command vkGetShaderModuleCreateInfoIdentifierEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderModuleCreateInfoIdentifierEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE ShaderModuleIdentifierEXT
-      Device::getShaderModuleCreateInfoIdentifierEXT( const ShaderModuleCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT
+      Device::getShaderModuleCreateInfoIdentifierEXT( const VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo & createInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetShaderModuleCreateInfoIdentifierEXT &&
                          "Function <vkGetShaderModuleCreateInfoIdentifierEXT> requires <VK_EXT_shader_module_identifier>" );
 
-      ShaderModuleIdentifierEXT identifier;
+      VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT identifier;
       getDispatcher()->vkGetShaderModuleCreateInfoIdentifierEXT( static_cast<VkDevice>( m_device ),
                                                                  reinterpret_cast<const VkShaderModuleCreateInfo *>( &createInfo ),
                                                                  reinterpret_cast<VkShaderModuleIdentifierEXT *>( &identifier ) );
@@ -26455,80 +22344,82 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_NV_optical_flow ===
 
-    // wrapper function for command vkGetPhysicalDeviceOpticalFlowImageFormatsNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceOpticalFlowImageFormatsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<OpticalFlowImageFormatPropertiesNV>>::type
-                         PhysicalDevice::getOpticalFlowImageFormatsNV( const OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>
+      PhysicalDevice::getOpticalFlowImageFormatsNV( const VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV & opticalFlowImageFormatInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceOpticalFlowImageFormatsNV &&
                          "Function <vkGetPhysicalDeviceOpticalFlowImageFormatsNV> requires <VK_NV_optical_flow>" );
 
-      std::vector<OpticalFlowImageFormatPropertiesNV> imageFormatProperties;
-      uint32_t                                        formatCount;
-      Result                                          result;
+      std::vector<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV> imageFormatProperties;
+      uint32_t                                                              formatCount;
+      VULKAN_HPP_NAMESPACE::Result                                          result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
           static_cast<VkPhysicalDevice>( m_physicalDevice ),
           reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ),
           &formatCount,
           nullptr ) );
-        if ( ( result == Result::eSuccess ) && formatCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && formatCount )
         {
           imageFormatProperties.resize( formatCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceOpticalFlowImageFormatsNV(
             static_cast<VkPhysicalDevice>( m_physicalDevice ),
             reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( &opticalFlowImageFormatInfo ),
             &formatCount,
             reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( imageFormatProperties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getOpticalFlowImageFormatsNV" );
       VULKAN_HPP_ASSERT( formatCount <= imageFormatProperties.size() );
       if ( formatCount < imageFormatProperties.size() )
       {
         imageFormatProperties.resize( formatCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( imageFormatProperties ) );
+      return imageFormatProperties;
     }
 
-    // wrapper function for command vkCreateOpticalFlowSessionNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateOpticalFlowSessionNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<OpticalFlowSessionNV>::type
-                         Device::createOpticalFlowSessionNV( OpticalFlowSessionCreateInfoNV const & createInfo,
-                                          Optional<const AllocationCallbacks>    allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::OpticalFlowSessionNV>::Type
+      Device::createOpticalFlowSessionNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV const &                    createInfo,
+                                          VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const
+      VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV session;
-      Result                                     result =
-        static_cast<Result>( getDispatcher()->vkCreateOpticalFlowSessionNV( static_cast<VkDevice>( m_device ),
-                                                                            reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
-                                                                            reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                            reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createOpticalFlowSessionNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, OpticalFlowSessionNV( *this, *reinterpret_cast<VkOpticalFlowSessionNV *>( &session ), allocator ) );
+      VULKAN_HPP_NAMESPACE::Result               result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateOpticalFlowSessionNV(
+        static_cast<VkDevice>( m_device ),
+        reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkOpticalFlowSessionNV *>( &session ) ) );
+      if ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createOpticalFlowSessionNV" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::OpticalFlowSessionNV( *this, *reinterpret_cast<VkOpticalFlowSessionNV *>( &session ), allocator );
     }
 
-    // wrapper function for command vkBindOpticalFlowSessionImageNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindOpticalFlowSessionImageNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      OpticalFlowSessionNV::bindImage( OpticalFlowSessionBindingPointNV bindingPoint, VULKAN_HPP_NAMESPACE::ImageView view, ImageLayout layout ) const
+    VULKAN_HPP_INLINE void OpticalFlowSessionNV::bindImage( VULKAN_HPP_NAMESPACE::OpticalFlowSessionBindingPointNV bindingPoint,
+                                                            VULKAN_HPP_NAMESPACE::ImageView                        view,
+                                                            VULKAN_HPP_NAMESPACE::ImageLayout                      layout ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkBindOpticalFlowSessionImageNV && "Function <vkBindOpticalFlowSessionImageNV> requires <VK_NV_optical_flow>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkBindOpticalFlowSessionImageNV( static_cast<VkDevice>( m_device ),
-                                                                                             static_cast<VkOpticalFlowSessionNV>( m_opticalFlowSessionNV ),
-                                                                                             static_cast<VkOpticalFlowSessionBindingPointNV>( bindingPoint ),
-                                                                                             static_cast<VkImageView>( view ),
-                                                                                             static_cast<VkImageLayout>( layout ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::OpticalFlowSessionNV::bindImage" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkBindOpticalFlowSessionImageNV( static_cast<VkDevice>( m_device ),
+                                                          static_cast<VkOpticalFlowSessionNV>( m_session ),
+                                                          static_cast<VkOpticalFlowSessionBindingPointNV>( bindingPoint ),
+                                                          static_cast<VkImageView>( view ),
+                                                          static_cast<VkImageLayout>( layout ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::OpticalFlowSessionNV::bindImage" );
     }
 
-    // wrapper function for command vkCmdOpticalFlowExecuteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdOpticalFlowExecuteNV.html
-    VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV session,
-                                                                const OpticalFlowExecuteInfoNV &           executeInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::opticalFlowExecuteNV( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV             session,
+                                                                const VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV & executeInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdOpticalFlowExecuteNV && "Function <vkCmdOpticalFlowExecuteNV> requires <VK_NV_optical_flow>" );
 
@@ -26539,14 +22430,12 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_maintenance5 ===
 
-    // wrapper function for command vkCmdBindIndexBuffer2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindIndexBuffer2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer buffer,
-                                                               DeviceSize                   offset,
-                                                               DeviceSize                   size,
-                                                               IndexType                    indexType ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::bindIndexBuffer2KHR( VULKAN_HPP_NAMESPACE::Buffer     buffer,
+                                                               VULKAN_HPP_NAMESPACE::DeviceSize offset,
+                                                               VULKAN_HPP_NAMESPACE::DeviceSize size,
+                                                               VULKAN_HPP_NAMESPACE::IndexType  indexType ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindIndexBuffer2KHR &&
-                         "Function <vkCmdBindIndexBuffer2KHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindIndexBuffer2KHR && "Function <vkCmdBindIndexBuffer2KHR> requires <VK_KHR_maintenance5>" );
 
       getDispatcher()->vkCmdBindIndexBuffer2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
                                                  static_cast<VkBuffer>( buffer ),
@@ -26555,199 +22444,168 @@ namespace VULKAN_HPP_NAMESPACE
                                                  static_cast<VkIndexType>( indexType ) );
     }
 
-    // wrapper function for command vkGetRenderingAreaGranularityKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetRenderingAreaGranularityKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Extent2D
-      Device::getRenderingAreaGranularityKHR( const RenderingAreaInfo & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::Extent2D
+      Device::getRenderingAreaGranularityKHR( const VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR & renderingAreaInfo ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetRenderingAreaGranularityKHR &&
-                         "Function <vkGetRenderingAreaGranularityKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkGetRenderingAreaGranularityKHR && "Function <vkGetRenderingAreaGranularityKHR> requires <VK_KHR_maintenance5>" );
 
-      Extent2D granularity;
+      VULKAN_HPP_NAMESPACE::Extent2D granularity;
       getDispatcher()->vkGetRenderingAreaGranularityKHR( static_cast<VkDevice>( m_device ),
-                                                         reinterpret_cast<const VkRenderingAreaInfo *>( &renderingAreaInfo ),
+                                                         reinterpret_cast<const VkRenderingAreaInfoKHR *>( &renderingAreaInfo ),
                                                          reinterpret_cast<VkExtent2D *>( &granularity ) );
 
       return granularity;
     }
 
-    // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2
-      Device::getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+      Device::getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSubresourceLayoutKHR &&
-                         "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+                         "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5>" );
 
-      SubresourceLayout2 layout;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
       getDispatcher()->vkGetDeviceImageSubresourceLayoutKHR( static_cast<VkDevice>( m_device ),
-                                                             reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ),
-                                                             reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                             reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( &info ),
+                                                             reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return layout;
     }
 
-    // wrapper function for command vkGetDeviceImageSubresourceLayoutKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDeviceImageSubresourceLayoutKHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Device::getImageSubresourceLayoutKHR( const DeviceImageSubresourceInfo & info ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Device::getImageSubresourceLayoutKHR( const VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR & info ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceImageSubresourceLayoutKHR &&
-                         "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+                         "Function <vkGetDeviceImageSubresourceLayoutKHR> requires <VK_KHR_maintenance5>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
       getDispatcher()->vkGetDeviceImageSubresourceLayoutKHR( static_cast<VkDevice>( m_device ),
-                                                             reinterpret_cast<const VkDeviceImageSubresourceInfo *>( &info ),
-                                                             reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                             reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( &info ),
+                                                             reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return structureChain;
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE SubresourceLayout2 Image::getSubresourceLayout2KHR( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR
+      Image::getSubresourceLayout2KHR( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetImageSubresourceLayout2KHR &&
-        "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+        "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 
-      SubresourceLayout2 layout;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR layout;
       getDispatcher()->vkGetImageSubresourceLayout2KHR( static_cast<VkDevice>( m_device ),
                                                         static_cast<VkImage>( m_image ),
-                                                        reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                        reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                        reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                                        reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return layout;
     }
 
-    // wrapper function for command vkGetImageSubresourceLayout2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetImageSubresourceLayout2KHR.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-                                           Image::getSubresourceLayout2KHR( const ImageSubresource2 & subresource ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+      Image::getSubresourceLayout2KHR( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR & subresource ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetImageSubresourceLayout2KHR &&
-        "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5> or <VK_VERSION_1_4>" );
+        "Function <vkGetImageSubresourceLayout2KHR> requires <VK_EXT_host_image_copy> or <VK_EXT_image_compression_control> or <VK_KHR_maintenance5>" );
 
-      StructureChain<X, Y, Z...> structureChain;
-      SubresourceLayout2 &       layout = structureChain.template get<SubresourceLayout2>();
+      VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...> structureChain;
+      VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR &    layout = structureChain.template get<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>();
       getDispatcher()->vkGetImageSubresourceLayout2KHR( static_cast<VkDevice>( m_device ),
                                                         static_cast<VkImage>( m_image ),
-                                                        reinterpret_cast<const VkImageSubresource2 *>( &subresource ),
-                                                        reinterpret_cast<VkSubresourceLayout2 *>( &layout ) );
+                                                        reinterpret_cast<const VkImageSubresource2KHR *>( &subresource ),
+                                                        reinterpret_cast<VkSubresourceLayout2KHR *>( &layout ) );
 
       return structureChain;
     }
 
-    //=== VK_AMD_anti_lag ===
-
-    // wrapper function for command vkAntiLagUpdateAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAntiLagUpdateAMD.html
-    VULKAN_HPP_INLINE void Device::antiLagUpdateAMD( const AntiLagDataAMD & data ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkAntiLagUpdateAMD && "Function <vkAntiLagUpdateAMD> requires <VK_AMD_anti_lag>" );
-
-      getDispatcher()->vkAntiLagUpdateAMD( static_cast<VkDevice>( m_device ), reinterpret_cast<const VkAntiLagDataAMD *>( &data ) );
-    }
-
-    //=== VK_KHR_present_wait2 ===
-
-    // wrapper function for command vkWaitForPresent2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkWaitForPresent2KHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result SwapchainKHR::waitForPresent2( const PresentWait2InfoKHR & presentWait2Info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkWaitForPresent2KHR && "Function <vkWaitForPresent2KHR> requires <VK_KHR_present_wait2>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkWaitForPresent2KHR( static_cast<VkDevice>( m_device ),
-                                                                                  static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                                  reinterpret_cast<const VkPresentWait2InfoKHR *>( &presentWait2Info ) ) );
-
-#  if defined( VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS )
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::waitForPresent2",
-                                                 { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR, Result::eErrorOutOfDateKHR } );
-#  else
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::waitForPresent2", { Result::eSuccess, Result::eTimeout, Result::eSuboptimalKHR } );
-#  endif
-
-      return static_cast<Result>( result );
-    }
-
     //=== VK_EXT_shader_object ===
 
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<ShaderEXT>>::type
-                         Device::createShadersEXT( ArrayProxy<ShaderCreateInfoEXT> const & createInfos, Optional<const AllocationCallbacks> allocator ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT>>::Type
+      Device::createShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT> const & createInfos,
+                                VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks>     allocator ) const
     {
       std::vector<VULKAN_HPP_NAMESPACE::ShaderEXT> shaders( createInfos.size() );
-      Result                                       result = static_cast<Result>( getDispatcher()->vkCreateShadersEXT( static_cast<VkDevice>( m_device ),
-                                                                                createInfos.size(),
-                                                                                reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createShadersEXT", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
-      std::vector<ShaderEXT> shadersRAII;
-      if ( result == Result::eSuccess )
+      VULKAN_HPP_NAMESPACE::Result                 result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateShadersEXT(
+        static_cast<VkDevice>( m_device ),
+        createInfos.size(),
+        reinterpret_cast<const VkShaderCreateInfoEXT *>( createInfos.data() ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkShaderEXT *>( shaders.data() ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT ) )
       {
-        shadersRAII.reserve( shaders.size() );
-        for ( auto & shader : shaders )
-        {
-          shadersRAII.emplace_back( *this, *reinterpret_cast<VkShaderEXT *>( &shader ), allocator, result );
-        }
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createShadersEXT" );
+#  endif
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( shadersRAII ) );
+
+      std::vector<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT> shadersRAII;
+      shadersRAII.reserve( shaders.size() );
+      for ( auto & shader : shaders )
+      {
+        shadersRAII.emplace_back( *this, *reinterpret_cast<VkShaderEXT *>( &shader ), allocator, result );
+      }
+      return shadersRAII;
     }
 
-    // wrapper function for command vkCreateShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateShadersEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ShaderEXT>::type
-                         Device::createShaderEXT( ShaderCreateInfoEXT const &         createInfo,
-                               Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
+    VULKAN_HPP_NODISCARD
+      VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::CreateReturnType<VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT>::Type
+                        Device::createShaderEXT( VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT const &                               createInfo,
+                               VULKAN_HPP_NAMESPACE::Optional<const VULKAN_HPP_NAMESPACE::AllocationCallbacks> allocator ) const VULKAN_HPP_RAII_CREATE_NOEXCEPT
     {
       VULKAN_HPP_NAMESPACE::ShaderEXT shader;
-      Result                          result = static_cast<Result>( getDispatcher()->vkCreateShadersEXT( static_cast<VkDevice>( m_device ),
-                                                                                1,
-                                                                                reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                reinterpret_cast<VkShaderEXT *>( &shader ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createShaderEXT", { Result::eSuccess, Result::eIncompatibleShaderBinaryEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, ShaderEXT( *this, *reinterpret_cast<VkShaderEXT *>( &shader ), allocator, result ) );
+      VULKAN_HPP_NAMESPACE::Result    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkCreateShadersEXT(
+        static_cast<VkDevice>( m_device ),
+        1,
+        reinterpret_cast<const VkShaderCreateInfoEXT *>( &createInfo ),
+        reinterpret_cast<const VkAllocationCallbacks *>( static_cast<const VULKAN_HPP_NAMESPACE::AllocationCallbacks *>( allocator ) ),
+        reinterpret_cast<VkShaderEXT *>( &shader ) ) );
+      if ( ( result != VULKAN_HPP_NAMESPACE::Result::eSuccess ) && ( result != VULKAN_HPP_NAMESPACE::Result::eIncompatibleShaderBinaryEXT ) )
+      {
+#  if defined( VULKAN_HPP_RAII_NO_EXCEPTIONS )
+        return VULKAN_HPP_UNEXPECTED( result );
+#  else
+        VULKAN_HPP_NAMESPACE::detail::throwResultException( result, "Device::createShaderEXT" );
+#  endif
+      }
+
+      return VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::ShaderEXT( *this, *reinterpret_cast<VkShaderEXT *>( &shader ), allocator );
     }
 
-    // wrapper function for command vkGetShaderBinaryDataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetShaderBinaryDataEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<uint8_t>>::type ShaderEXT::getBinaryData() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<uint8_t> ShaderEXT::getBinaryData() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetShaderBinaryDataEXT && "Function <vkGetShaderBinaryDataEXT> requires <VK_EXT_shader_object>" );
 
-      std::vector<uint8_t> data;
-      size_t               dataSize;
-      Result               result;
+      std::vector<uint8_t>         data;
+      size_t                       dataSize;
+      VULKAN_HPP_NAMESPACE::Result result;
       do
       {
-        result = static_cast<Result>(
-          getDispatcher()->vkGetShaderBinaryDataEXT( static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shaderEXT ), &dataSize, nullptr ) );
-        if ( ( result == Result::eSuccess ) && dataSize )
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+          getDispatcher()->vkGetShaderBinaryDataEXT( static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shader ), &dataSize, nullptr ) );
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && dataSize )
         {
           data.resize( dataSize );
-          result = static_cast<Result>( getDispatcher()->vkGetShaderBinaryDataEXT(
-            static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shaderEXT ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetShaderBinaryDataEXT(
+            static_cast<VkDevice>( m_device ), static_cast<VkShaderEXT>( m_shader ), &dataSize, reinterpret_cast<void *>( data.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::ShaderEXT::getBinaryData" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::ShaderEXT::getBinaryData" );
       VULKAN_HPP_ASSERT( dataSize <= data.size() );
       if ( dataSize < data.size() )
       {
         data.resize( dataSize );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data ) );
+      return data;
     }
 
-    // wrapper function for command vkCmdBindShadersEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindShadersEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( ArrayProxy<const ShaderStageFlagBits> const &             stages,
-                                                          ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const & shaders ) const
+    VULKAN_HPP_INLINE void CommandBuffer::bindShadersEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderStageFlagBits> const & stages,
+                                                          VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::ShaderEXT> const & shaders ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindShadersEXT && "Function <vkCmdBindShadersEXT> requires <VK_EXT_shader_object>" );
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
@@ -26765,315 +22623,93 @@ namespace VULKAN_HPP_NAMESPACE
                                             reinterpret_cast<const VkShaderEXT *>( shaders.data() ) );
     }
 
-    // wrapper function for command vkCmdSetDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDepthClampRangeEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setDepthClampRangeEXT( DepthClampModeEXT                  depthClampMode,
-                                                                 Optional<const DepthClampRangeEXT> depthClampRange ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDepthClampRangeEXT &&
-                         "Function <vkCmdSetDepthClampRangeEXT> requires <VK_EXT_depth_clamp_control> or <VK_EXT_shader_object>" );
-
-      getDispatcher()->vkCmdSetDepthClampRangeEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                   static_cast<VkDepthClampModeEXT>( depthClampMode ),
-                                                   reinterpret_cast<const VkDepthClampRangeEXT *>( depthClampRange.get() ) );
-    }
-
-    //=== VK_KHR_pipeline_binary ===
-
-    // wrapper function for command vkCreatePipelineBinariesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreatePipelineBinariesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<PipelineBinaryKHR>>::type
-      Device::createPipelineBinariesKHR( PipelineBinaryCreateInfoKHR const & createInfo, Optional<const AllocationCallbacks> allocator ) const
-    {
-      std::vector<VULKAN_HPP_NAMESPACE::PipelineBinaryKHR> pipelineBinaries;
-      PipelineBinaryHandlesInfoKHR                         binaries;
-      Result                                               result;
-      if ( createInfo.pKeysAndDataInfo )
-      {
-        VULKAN_HPP_ASSERT( !createInfo.pipeline && !createInfo.pPipelineCreateInfo );
-        pipelineBinaries.resize( createInfo.pKeysAndDataInfo->binaryCount );
-        binaries.pipelineBinaryCount = createInfo.pKeysAndDataInfo->binaryCount;
-        binaries.pPipelineBinaries   = pipelineBinaries.data();
-        result                       = static_cast<Result>( getDispatcher()->vkCreatePipelineBinariesKHR( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-      }
-      else
-      {
-        VULKAN_HPP_ASSERT( !createInfo.pipeline ^ !createInfo.pPipelineCreateInfo );
-        result = static_cast<Result>( getDispatcher()->vkCreatePipelineBinariesKHR( static_cast<VkDevice>( m_device ),
-                                                                                    reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                                    reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                    reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-        if ( result == Result::eSuccess )
-        {
-          pipelineBinaries.resize( binaries.pipelineBinaryCount );
-          binaries.pPipelineBinaries = pipelineBinaries.data();
-          result                     = static_cast<Result>( getDispatcher()->vkCreatePipelineBinariesKHR( static_cast<VkDevice>( m_device ),
-                                                                                      reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( &createInfo ),
-                                                                                      reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                      reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( &binaries ) ) );
-        }
-      }
-
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createPipelineBinariesKHR",
-                                                 { Result::eSuccess, Result::eIncomplete, Result::ePipelineBinaryMissingKHR } );
-      std::vector<PipelineBinaryKHR> pipelineBinariesRAII;
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinariesRAII.reserve( pipelineBinaries.size() );
-        for ( auto & pipelineBinary : pipelineBinaries )
-        {
-          pipelineBinariesRAII.emplace_back( *this, *reinterpret_cast<VkPipelineBinaryKHR *>( &pipelineBinary ), allocator, result );
-        }
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineBinariesRAII ) );
-    }
-
-    // wrapper function for command vkGetPipelineKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineKeyKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<PipelineBinaryKeyKHR>::type
-                         Device::getPipelineKeyKHR( Optional<const PipelineCreateInfoKHR> pipelineCreateInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineKeyKHR && "Function <vkGetPipelineKeyKHR> requires <VK_KHR_pipeline_binary>" );
-
-      PipelineBinaryKeyKHR pipelineKey;
-      Result               result = static_cast<Result>( getDispatcher()->vkGetPipelineKeyKHR( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkPipelineCreateInfoKHR *>( pipelineCreateInfo.get() ),
-                                                                                 reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineKey ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelineKeyKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelineKey ) );
-    }
-
-    // wrapper function for command vkGetPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPipelineBinaryDataKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t>>>::type
-                         Device::getPipelineBinaryDataKHR( const PipelineBinaryDataInfoKHR & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPipelineBinaryDataKHR && "Function <vkGetPipelineBinaryDataKHR> requires <VK_KHR_pipeline_binary>" );
-
-      std::pair<PipelineBinaryKeyKHR, std::vector<uint8_t>> data_;
-      PipelineBinaryKeyKHR &                                pipelineBinaryKey  = data_.first;
-      std::vector<uint8_t> &                                pipelineBinaryData = data_.second;
-      size_t                                                pipelineBinaryDataSize;
-      Result result = static_cast<Result>( getDispatcher()->vkGetPipelineBinaryDataKHR( static_cast<VkDevice>( m_device ),
-                                                                                        reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                                        reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                                        &pipelineBinaryDataSize,
-                                                                                        nullptr ) );
-      if ( result == Result::eSuccess )
-      {
-        pipelineBinaryData.resize( pipelineBinaryDataSize );
-        result = static_cast<Result>( getDispatcher()->vkGetPipelineBinaryDataKHR( static_cast<VkDevice>( m_device ),
-                                                                                   reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( &info ),
-                                                                                   reinterpret_cast<VkPipelineBinaryKeyKHR *>( &pipelineBinaryKey ),
-                                                                                   &pipelineBinaryDataSize,
-                                                                                   reinterpret_cast<void *>( pipelineBinaryData.data() ) ) );
-      }
-
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getPipelineBinaryDataKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
-    }
-
-    // wrapper function for command vkReleaseCapturedPipelineDataKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseCapturedPipelineDataKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::releaseCapturedPipelineDataKHR( const ReleaseCapturedPipelineDataInfoKHR & info,
-                                                                                                   Optional<const AllocationCallbacks>        allocator ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseCapturedPipelineDataKHR && "Function <vkReleaseCapturedPipelineDataKHR> requires <VK_KHR_pipeline_binary>" );
-
-      Result result =
-        static_cast<Result>( getDispatcher()->vkReleaseCapturedPipelineDataKHR( static_cast<VkDevice>( m_device ),
-                                                                                reinterpret_cast<const VkReleaseCapturedPipelineDataInfoKHR *>( &info ),
-                                                                                reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::releaseCapturedPipelineDataKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
     //=== VK_QCOM_tile_properties ===
 
-    // wrapper function for command vkGetFramebufferTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetFramebufferTilePropertiesQCOM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TilePropertiesQCOM>>::type Framebuffer::getTilePropertiesQCOM() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM> Framebuffer::getTilePropertiesQCOM() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetFramebufferTilePropertiesQCOM &&
                          "Function <vkGetFramebufferTilePropertiesQCOM> requires <VK_QCOM_tile_properties>" );
 
-      std::vector<TilePropertiesQCOM> properties;
-      uint32_t                        propertiesCount;
-      Result                          result;
+      std::vector<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM> properties;
+      uint32_t                                              propertiesCount;
+      VULKAN_HPP_NAMESPACE::Result                          result;
       do
       {
-        result = static_cast<Result>( getDispatcher()->vkGetFramebufferTilePropertiesQCOM(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetFramebufferTilePropertiesQCOM(
           static_cast<VkDevice>( m_device ), static_cast<VkFramebuffer>( m_framebuffer ), &propertiesCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertiesCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertiesCount )
         {
           properties.resize( propertiesCount );
-          result = static_cast<Result>( getDispatcher()->vkGetFramebufferTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
-                                                                                             static_cast<VkFramebuffer>( m_framebuffer ),
-                                                                                             &propertiesCount,
-                                                                                             reinterpret_cast<VkTilePropertiesQCOM *>( properties.data() ) ) );
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+            getDispatcher()->vkGetFramebufferTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
+                                                                 static_cast<VkFramebuffer>( m_framebuffer ),
+                                                                 &propertiesCount,
+                                                                 reinterpret_cast<VkTilePropertiesQCOM *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Framebuffer::getTilePropertiesQCOM" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+
       VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
       if ( propertiesCount < properties.size() )
       {
         properties.resize( propertiesCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetDynamicRenderingTilePropertiesQCOM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDynamicRenderingTilePropertiesQCOM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<TilePropertiesQCOM>::type
-                         Device::getDynamicRenderingTilePropertiesQCOM( const RenderingInfo & renderingInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::TilePropertiesQCOM
+      Device::getDynamicRenderingTilePropertiesQCOM( const VULKAN_HPP_NAMESPACE::RenderingInfo & renderingInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetDynamicRenderingTilePropertiesQCOM &&
                          "Function <vkGetDynamicRenderingTilePropertiesQCOM> requires <VK_QCOM_tile_properties>" );
 
-      TilePropertiesQCOM properties;
-      Result             result =
-        static_cast<Result>( getDispatcher()->vkGetDynamicRenderingTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
-                                                                                       reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ),
-                                                                                       reinterpret_cast<VkTilePropertiesQCOM *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getDynamicRenderingTilePropertiesQCOM" );
+      VULKAN_HPP_NAMESPACE::TilePropertiesQCOM properties;
+      getDispatcher()->vkGetDynamicRenderingTilePropertiesQCOM( static_cast<VkDevice>( m_device ),
+                                                                reinterpret_cast<const VkRenderingInfo *>( &renderingInfo ),
+                                                                reinterpret_cast<VkTilePropertiesQCOM *>( &properties ) );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-    //=== VK_KHR_swapchain_maintenance1 ===
-
-    // wrapper function for command vkReleaseSwapchainImagesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseSwapchainImagesKHR.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type Device::releaseSwapchainImagesKHR( const ReleaseSwapchainImagesInfoKHR & releaseInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkReleaseSwapchainImagesKHR &&
-                         "Function <vkReleaseSwapchainImagesKHR> requires <VK_EXT_swapchain_maintenance1> or <VK_KHR_swapchain_maintenance1>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkReleaseSwapchainImagesKHR(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( &releaseInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::releaseSwapchainImagesKHR" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    //=== VK_NV_cooperative_vector ===
-
-    // wrapper function for command vkGetPhysicalDeviceCooperativeVectorPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeVectorPropertiesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeVectorPropertiesNV>>::type
-                         PhysicalDevice::getCooperativeVectorPropertiesNV() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceCooperativeVectorPropertiesNV &&
-                         "Function <vkGetPhysicalDeviceCooperativeVectorPropertiesNV> requires <VK_NV_cooperative_vector>" );
-
-      std::vector<CooperativeVectorPropertiesNV> properties;
-      uint32_t                                   propertyCount;
-      Result                                     result;
-      do
-      {
-        result = static_cast<Result>(
-          getDispatcher()->vkGetPhysicalDeviceCooperativeVectorPropertiesNV( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
-        {
-          properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeVectorPropertiesNV(
-            static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkCooperativeVectorPropertiesNV *>( properties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCooperativeVectorPropertiesNV" );
-      VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-      if ( propertyCount < properties.size() )
-      {
-        properties.resize( propertyCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-    // wrapper function for command vkConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkConvertCooperativeVectorMatrixNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::convertCooperativeVectorMatrixNV( const ConvertCooperativeVectorMatrixInfoNV & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkConvertCooperativeVectorMatrixNV &&
-                         "Function <vkConvertCooperativeVectorMatrixNV> requires <VK_NV_cooperative_vector>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkConvertCooperativeVectorMatrixNV(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( &info ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::convertCooperativeVectorMatrixNV", { Result::eSuccess, Result::eIncomplete } );
-
-      return static_cast<Result>( result );
-    }
-
-    // wrapper function for command vkCmdConvertCooperativeVectorMatrixNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdConvertCooperativeVectorMatrixNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::convertCooperativeVectorMatrixNV( ArrayProxy<const ConvertCooperativeVectorMatrixInfoNV> const & infos ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdConvertCooperativeVectorMatrixNV &&
-                         "Function <vkCmdConvertCooperativeVectorMatrixNV> requires <VK_NV_cooperative_vector>" );
-
-      getDispatcher()->vkCmdConvertCooperativeVectorMatrixNV(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), infos.size(), reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( infos.data() ) );
+      return properties;
     }
 
     //=== VK_NV_low_latency2 ===
 
-    // wrapper function for command vkSetLatencySleepModeNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencySleepModeNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type SwapchainKHR::setLatencySleepModeNV( const LatencySleepModeInfoNV & sleepModeInfo ) const
+    VULKAN_HPP_INLINE void SwapchainKHR::setLatencySleepModeNV( const VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV & sleepModeInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetLatencySleepModeNV && "Function <vkSetLatencySleepModeNV> requires <VK_NV_low_latency2>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkSetLatencySleepModeNV( static_cast<VkDevice>( m_device ),
-                                                                                     static_cast<VkSwapchainKHR>( m_swapchainKHR ),
-                                                                                     reinterpret_cast<const VkLatencySleepModeInfoNV *>( &sleepModeInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::setLatencySleepModeNV" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      VULKAN_HPP_NAMESPACE::Result result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkSetLatencySleepModeNV(
+        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), reinterpret_cast<const VkLatencySleepModeInfoNV *>( &sleepModeInfo ) ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::SwapchainKHR::setLatencySleepModeNV" );
     }
 
-    // wrapper function for command vkLatencySleepNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkLatencySleepNV.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type SwapchainKHR::latencySleepNV( const LatencySleepInfoNV & sleepInfo ) const
+    VULKAN_HPP_INLINE void SwapchainKHR::latencySleepNV( const VULKAN_HPP_NAMESPACE::LatencySleepInfoNV & sleepInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkLatencySleepNV && "Function <vkLatencySleepNV> requires <VK_NV_low_latency2>" );
 
-      Result result = static_cast<Result>( getDispatcher()->vkLatencySleepNV(
-        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), reinterpret_cast<const VkLatencySleepInfoNV *>( &sleepInfo ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::SwapchainKHR::latencySleepNV" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
+      getDispatcher()->vkLatencySleepNV(
+        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), reinterpret_cast<const VkLatencySleepInfoNV *>( &sleepInfo ) );
     }
 
-    // wrapper function for command vkSetLatencyMarkerNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkSetLatencyMarkerNV.html
-    VULKAN_HPP_INLINE void SwapchainKHR::setLatencyMarkerNV( const SetLatencyMarkerInfoNV & latencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void SwapchainKHR::setLatencyMarkerNV( const VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV & latencyMarkerInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkSetLatencyMarkerNV && "Function <vkSetLatencyMarkerNV> requires <VK_NV_low_latency2>" );
 
       getDispatcher()->vkSetLatencyMarkerNV( static_cast<VkDevice>( m_device ),
-                                             static_cast<VkSwapchainKHR>( m_swapchainKHR ),
+                                             static_cast<VkSwapchainKHR>( m_swapchain ),
                                              reinterpret_cast<const VkSetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
     }
 
-    // wrapper function for command vkGetLatencyTimingsNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetLatencyTimingsNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV> SwapchainKHR::getLatencyTimingsNV() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV SwapchainKHR::getLatencyTimingsNV() const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetLatencyTimingsNV && "Function <vkGetLatencyTimingsNV> requires <VK_NV_low_latency2>" );
 
-      std::vector<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV> timings;
-      GetLatencyMarkerInfoNV                                         latencyMarkerInfo;
+      VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV latencyMarkerInfo;
       getDispatcher()->vkGetLatencyTimingsNV(
-        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
-      timings.resize( latencyMarkerInfo.timingCount );
-      latencyMarkerInfo.pTimings = timings.data();
-      getDispatcher()->vkGetLatencyTimingsNV(
-        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchainKHR ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
+        static_cast<VkDevice>( m_device ), static_cast<VkSwapchainKHR>( m_swapchain ), reinterpret_cast<VkGetLatencyMarkerInfoNV *>( &latencyMarkerInfo ) );
 
-      return timings;
+      return latencyMarkerInfo;
     }
 
-    // wrapper function for command vkQueueNotifyOutOfBandNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueNotifyOutOfBandNV.html
-    VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const OutOfBandQueueTypeInfoNV & queueTypeInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void Queue::notifyOutOfBandNV( const VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV & queueTypeInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkQueueNotifyOutOfBandNV && "Function <vkQueueNotifyOutOfBandNV> requires <VK_NV_low_latency2>" );
 
@@ -27082,315 +22718,38 @@ namespace VULKAN_HPP_NAMESPACE
 
     //=== VK_KHR_cooperative_matrix ===
 
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixPropertiesKHR>>::type
-                         PhysicalDevice::getCooperativeMatrixPropertiesKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR>
+                                           PhysicalDevice::getCooperativeMatrixPropertiesKHR() const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR &&
                          "Function <vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR> requires <VK_KHR_cooperative_matrix>" );
 
-      std::vector<CooperativeMatrixPropertiesKHR> properties;
-      uint32_t                                    propertyCount;
-      Result                                      result;
+      std::vector<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR> properties;
+      uint32_t                                                          propertyCount;
+      VULKAN_HPP_NAMESPACE::Result                                      result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && propertyCount )
         {
           properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( properties.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixPropertiesKHR" );
       VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
       if ( propertyCount < properties.size() )
       {
         properties.resize( propertyCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-    //=== VK_ARM_data_graph ===
-
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<Pipeline>>::type
-                         Device::createDataGraphPipelinesARM( Optional<const DeferredOperationKHR> const &       deferredOperation,
-                                           Optional<const PipelineCache> const &              pipelineCache,
-                                           ArrayProxy<DataGraphPipelineCreateInfoARM> const & createInfos,
-                                           Optional<const AllocationCallbacks>                allocator ) const
-    {
-      std::vector<VULKAN_HPP_NAMESPACE::Pipeline> pipelines( createInfos.size() );
-      Result                                      result =
-        static_cast<Result>( getDispatcher()->vkCreateDataGraphPipelinesARM( static_cast<VkDevice>( m_device ),
-                                                                             deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
-                                                                             pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                             createInfos.size(),
-                                                                             reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( createInfos.data() ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkPipeline *>( pipelines.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDataGraphPipelinesARM", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      std::vector<Pipeline> pipelinesRAII;
-      if ( result == Result::eSuccess )
-      {
-        pipelinesRAII.reserve( pipelines.size() );
-        for ( auto & pipeline : pipelines )
-        {
-          pipelinesRAII.emplace_back( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result );
-        }
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( pipelinesRAII ) );
-    }
-
-    // wrapper function for command vkCreateDataGraphPipelinesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelinesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<Pipeline>::type
-                         Device::createDataGraphPipelineARM( Optional<const DeferredOperationKHR> const & deferredOperation,
-                                          Optional<const PipelineCache> const &        pipelineCache,
-                                          DataGraphPipelineCreateInfoARM const &       createInfo,
-                                          Optional<const AllocationCallbacks>          allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::Pipeline pipeline;
-      Result                         result =
-        static_cast<Result>( getDispatcher()->vkCreateDataGraphPipelinesARM( static_cast<VkDevice>( m_device ),
-                                                                             deferredOperation ? static_cast<VkDeferredOperationKHR>( **deferredOperation ) : 0,
-                                                                             pipelineCache ? static_cast<VkPipelineCache>( **pipelineCache ) : 0,
-                                                                             1,
-                                                                             reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( &createInfo ),
-                                                                             reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                             reinterpret_cast<VkPipeline *>( &pipeline ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck(
-        result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDataGraphPipelineARM", { Result::eSuccess, Result::ePipelineCompileRequiredEXT } );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, Pipeline( *this, *reinterpret_cast<VkPipeline *>( &pipeline ), allocator, result ) );
-    }
-
-    // wrapper function for command vkCreateDataGraphPipelineSessionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateDataGraphPipelineSessionARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<DataGraphPipelineSessionARM>::type
-                         Device::createDataGraphPipelineSessionARM( DataGraphPipelineSessionCreateInfoARM const & createInfo,
-                                                 Optional<const AllocationCallbacks>           allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM session;
-      Result                                            result = static_cast<Result>(
-        getDispatcher()->vkCreateDataGraphPipelineSessionARM( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( &createInfo ),
-                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                              reinterpret_cast<VkDataGraphPipelineSessionARM *>( &session ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createDataGraphPipelineSessionARM" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, DataGraphPipelineSessionARM( *this, *reinterpret_cast<VkDataGraphPipelineSessionARM *>( &session ), allocator ) );
-    }
-
-    // wrapper function for command vkGetDataGraphPipelineSessionBindPointRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionBindPointRequirementsARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataGraphPipelineSessionBindPointRequirementARM>>::type
-                         Device::getDataGraphPipelineSessionBindPointRequirementsARM( const DataGraphPipelineSessionBindPointRequirementsInfoARM & info ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDataGraphPipelineSessionBindPointRequirementsARM &&
-                         "Function <vkGetDataGraphPipelineSessionBindPointRequirementsARM> requires <VK_ARM_data_graph>" );
-
-      std::vector<DataGraphPipelineSessionBindPointRequirementARM> bindPointRequirements;
-      uint32_t                                                     bindPointRequirementCount;
-      Result                                                       result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-          static_cast<VkDevice>( m_device ),
-          reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ),
-          &bindPointRequirementCount,
-          nullptr ) );
-        if ( ( result == Result::eSuccess ) && bindPointRequirementCount )
-        {
-          bindPointRequirements.resize( bindPointRequirementCount );
-          result = static_cast<Result>( getDispatcher()->vkGetDataGraphPipelineSessionBindPointRequirementsARM(
-            static_cast<VkDevice>( m_device ),
-            reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( &info ),
-            &bindPointRequirementCount,
-            reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( bindPointRequirements.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getDataGraphPipelineSessionBindPointRequirementsARM" );
-      VULKAN_HPP_ASSERT( bindPointRequirementCount <= bindPointRequirements.size() );
-      if ( bindPointRequirementCount < bindPointRequirements.size() )
-      {
-        bindPointRequirements.resize( bindPointRequirementCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( bindPointRequirements ) );
-    }
-
-    // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDataGraphPipelineSessionMemoryRequirementsARM &&
-                         "Function <vkGetDataGraphPipelineSessionMemoryRequirementsARM> requires <VK_ARM_data_graph>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetDataGraphPipelineSessionMemoryRequirementsARM(
-        static_cast<VkDevice>( m_device ),
-        reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( &info ),
-        reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetDataGraphPipelineSessionMemoryRequirementsARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineSessionMemoryRequirementsARM.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getDataGraphPipelineSessionMemoryRequirementsARM( const DataGraphPipelineSessionMemoryRequirementsInfoARM & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDataGraphPipelineSessionMemoryRequirementsARM &&
-                         "Function <vkGetDataGraphPipelineSessionMemoryRequirementsARM> requires <VK_ARM_data_graph>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetDataGraphPipelineSessionMemoryRequirementsARM(
-        static_cast<VkDevice>( m_device ),
-        reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( &info ),
-        reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkBindDataGraphPipelineSessionMemoryARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkBindDataGraphPipelineSessionMemoryARM.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Device::bindDataGraphPipelineSessionMemoryARM( ArrayProxy<const BindDataGraphPipelineSessionMemoryInfoARM> const & bindInfos ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkBindDataGraphPipelineSessionMemoryARM &&
-                         "Function <vkBindDataGraphPipelineSessionMemoryARM> requires <VK_ARM_data_graph>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkBindDataGraphPipelineSessionMemoryARM(
-        static_cast<VkDevice>( m_device ), bindInfos.size(), reinterpret_cast<const VkBindDataGraphPipelineSessionMemoryInfoARM *>( bindInfos.data() ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::bindDataGraphPipelineSessionMemoryARM" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkCmdDispatchDataGraphARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDispatchDataGraphARM.html
-    VULKAN_HPP_INLINE void CommandBuffer::dispatchDataGraphARM( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM session,
-                                                                Optional<const DataGraphPipelineDispatchInfoARM>  info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDispatchDataGraphARM && "Function <vkCmdDispatchDataGraphARM> requires <VK_ARM_data_graph>" );
-
-      getDispatcher()->vkCmdDispatchDataGraphARM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                  static_cast<VkDataGraphPipelineSessionARM>( session ),
-                                                  reinterpret_cast<const VkDataGraphPipelineDispatchInfoARM *>( info.get() ) );
-    }
-
-    // wrapper function for command vkGetDataGraphPipelineAvailablePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelineAvailablePropertiesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<DataGraphPipelinePropertyARM>>::type
-                         Device::getDataGraphPipelineAvailablePropertiesARM( const DataGraphPipelineInfoARM & pipelineInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDataGraphPipelineAvailablePropertiesARM &&
-                         "Function <vkGetDataGraphPipelineAvailablePropertiesARM> requires <VK_ARM_data_graph>" );
-
-      std::vector<DataGraphPipelinePropertyARM> properties;
-      uint32_t                                  propertiesCount;
-      Result                                    result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkGetDataGraphPipelineAvailablePropertiesARM(
-          static_cast<VkDevice>( m_device ), reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ), &propertiesCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertiesCount )
-        {
-          properties.resize( propertiesCount );
-          result = static_cast<Result>(
-            getDispatcher()->vkGetDataGraphPipelineAvailablePropertiesARM( static_cast<VkDevice>( m_device ),
-                                                                           reinterpret_cast<const VkDataGraphPipelineInfoARM *>( &pipelineInfo ),
-                                                                           &propertiesCount,
-                                                                           reinterpret_cast<VkDataGraphPipelinePropertyARM *>( properties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getDataGraphPipelineAvailablePropertiesARM" );
-      VULKAN_HPP_ASSERT( propertiesCount <= properties.size() );
-      if ( propertiesCount < properties.size() )
-      {
-        properties.resize( propertiesCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-    // wrapper function for command vkGetDataGraphPipelinePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetDataGraphPipelinePropertiesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result
-      Device::getDataGraphPipelinePropertiesARM( const DataGraphPipelineInfoARM *          pPipelineInfo,
-                                                 uint32_t                                  propertiesCount,
-                                                 DataGraphPipelinePropertyQueryResultARM * pProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetDataGraphPipelinePropertiesARM &&
-                         "Function <vkGetDataGraphPipelinePropertiesARM> requires <VK_ARM_data_graph>" );
-      return static_cast<Result>(
-        getDispatcher()->vkGetDataGraphPipelinePropertiesARM( static_cast<VkDevice>( m_device ),
-                                                              reinterpret_cast<const VkDataGraphPipelineInfoARM *>( pPipelineInfo ),
-                                                              propertiesCount,
-                                                              reinterpret_cast<VkDataGraphPipelinePropertyQueryResultARM *>( pProperties ) ) );
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<QueueFamilyDataGraphPropertiesARM>>::type
-                         PhysicalDevice::getQueueFamilyDataGraphPropertiesARM( uint32_t queueFamilyIndex ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM &&
-                         "Function <vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM> requires <VK_ARM_data_graph>" );
-
-      std::vector<QueueFamilyDataGraphPropertiesARM> queueFamilyDataGraphProperties;
-      uint32_t                                       queueFamilyDataGraphPropertyCount;
-      Result                                         result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &queueFamilyDataGraphPropertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && queueFamilyDataGraphPropertyCount )
-        {
-          queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM(
-            static_cast<VkPhysicalDevice>( m_physicalDevice ),
-            queueFamilyIndex,
-            &queueFamilyDataGraphPropertyCount,
-            reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( queueFamilyDataGraphProperties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getQueueFamilyDataGraphPropertiesARM" );
-      VULKAN_HPP_ASSERT( queueFamilyDataGraphPropertyCount <= queueFamilyDataGraphProperties.size() );
-      if ( queueFamilyDataGraphPropertyCount < queueFamilyDataGraphProperties.size() )
-      {
-        queueFamilyDataGraphProperties.resize( queueFamilyDataGraphPropertyCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( queueFamilyDataGraphProperties ) );
-    }
-
-    // wrapper function for command vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE QueueFamilyDataGraphProcessingEnginePropertiesARM
-      PhysicalDevice::getQueueFamilyDataGraphProcessingEnginePropertiesARM(
-        const PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & queueFamilyDataGraphProcessingEngineInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM &&
-                         "Function <vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM> requires <VK_ARM_data_graph>" );
-
-      QueueFamilyDataGraphProcessingEnginePropertiesARM queueFamilyDataGraphProcessingEngineProperties;
-      getDispatcher()->vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM(
-        static_cast<VkPhysicalDevice>( m_physicalDevice ),
-        reinterpret_cast<const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( &queueFamilyDataGraphProcessingEngineInfo ),
-        reinterpret_cast<VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( &queueFamilyDataGraphProcessingEngineProperties ) );
-
-      return queueFamilyDataGraphProcessingEngineProperties;
+      return properties;
     }
 
     //=== VK_EXT_attachment_feedback_loop_dynamic_state ===
 
-    // wrapper function for command vkCmdSetAttachmentFeedbackLoopEnableEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetAttachmentFeedbackLoopEnableEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::setAttachmentFeedbackLoopEnableEXT( ImageAspectFlags aspectMask ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setAttachmentFeedbackLoopEnableEXT( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetAttachmentFeedbackLoopEnableEXT &&
                          "Function <vkCmdSetAttachmentFeedbackLoopEnableEXT> requires <VK_EXT_attachment_feedback_loop_dynamic_state>" );
@@ -27401,100 +22760,81 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if defined( VK_USE_PLATFORM_SCREEN_QNX )
     //=== VK_QNX_external_memory_screen_buffer ===
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result Device::getScreenBufferPropertiesQNX( const struct _screen_buffer * buffer,
-                                                                                        ScreenBufferPropertiesQNX *   pProperties ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetScreenBufferPropertiesQNX &&
-                         "Function <vkGetScreenBufferPropertiesQNX> requires <VK_QNX_external_memory_screen_buffer>" );
-      return static_cast<Result>( getDispatcher()->vkGetScreenBufferPropertiesQNX(
-        static_cast<VkDevice>( m_device ), buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( pProperties ) ) );
-    }
 
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ScreenBufferPropertiesQNX>::type
-                         Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX
+                                           Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetScreenBufferPropertiesQNX &&
                          "Function <vkGetScreenBufferPropertiesQNX> requires <VK_QNX_external_memory_screen_buffer>" );
 
-      ScreenBufferPropertiesQNX properties;
-      Result                    result = static_cast<Result>( getDispatcher()->vkGetScreenBufferPropertiesQNX(
+      VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX properties;
+      VULKAN_HPP_NAMESPACE::Result                    result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetScreenBufferPropertiesQNX(
         static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
+      return properties;
     }
 
-    // wrapper function for command vkGetScreenBufferPropertiesQNX, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetScreenBufferPropertiesQNX.html
     template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<StructureChain<X, Y, Z...>>::type
-                         Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE VULKAN_HPP_NAMESPACE::StructureChain<X, Y, Z...>
+                                           Device::getScreenBufferPropertiesQNX( const struct _screen_buffer & buffer ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetScreenBufferPropertiesQNX &&
                          "Function <vkGetScreenBufferPropertiesQNX> requires <VK_QNX_external_memory_screen_buffer>" );
 
-      StructureChain<X, Y, Z...>  structureChain;
-      ScreenBufferPropertiesQNX & properties = structureChain.template get<ScreenBufferPropertiesQNX>();
-      Result                      result     = static_cast<Result>( getDispatcher()->vkGetScreenBufferPropertiesQNX(
+      StructureChain<X, Y, Z...>                        structureChain;
+      VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX & properties = structureChain.template get<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX>();
+      VULKAN_HPP_NAMESPACE::Result                      result     = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetScreenBufferPropertiesQNX(
         static_cast<VkDevice>( m_device ), &buffer, reinterpret_cast<VkScreenBufferPropertiesQNX *>( &properties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getScreenBufferPropertiesQNX" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( structureChain ) );
+      return structureChain;
     }
 #  endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
     //=== VK_KHR_line_rasterization ===
 
-    // wrapper function for command vkCmdSetLineStippleKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetLineStippleKHR.html
     VULKAN_HPP_INLINE void CommandBuffer::setLineStippleKHR( uint32_t lineStippleFactor, uint16_t lineStipplePattern ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetLineStippleKHR &&
-                         "Function <vkCmdSetLineStippleKHR> requires <VK_EXT_line_rasterization> or <VK_KHR_line_rasterization> or <VK_VERSION_1_4>" );
+                         "Function <vkCmdSetLineStippleKHR> requires <VK_EXT_line_rasterization> or <VK_KHR_line_rasterization>" );
 
       getDispatcher()->vkCmdSetLineStippleKHR( static_cast<VkCommandBuffer>( m_commandBuffer ), lineStippleFactor, lineStipplePattern );
     }
 
     //=== VK_KHR_calibrated_timestamps ===
 
-    // wrapper function for command vkGetPhysicalDeviceCalibrateableTimeDomainsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCalibrateableTimeDomainsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<TimeDomainKHR>>::type PhysicalDevice::getCalibrateableTimeDomainsKHR() const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> PhysicalDevice::getCalibrateableTimeDomainsKHR() const
     {
       VULKAN_HPP_ASSERT(
         getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsKHR &&
         "Function <vkGetPhysicalDeviceCalibrateableTimeDomainsKHR> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
 
-      std::vector<TimeDomainKHR> timeDomains;
-      uint32_t                   timeDomainCount;
-      Result                     result;
+      std::vector<VULKAN_HPP_NAMESPACE::TimeDomainKHR> timeDomains;
+      uint32_t                                         timeDomainCount;
+      VULKAN_HPP_NAMESPACE::Result                     result;
       do
       {
-        result = static_cast<Result>(
+        result = static_cast<VULKAN_HPP_NAMESPACE::Result>(
           getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsKHR( static_cast<VkPhysicalDevice>( m_physicalDevice ), &timeDomainCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && timeDomainCount )
+        if ( ( result == VULKAN_HPP_NAMESPACE::Result::eSuccess ) && timeDomainCount )
         {
           timeDomains.resize( timeDomainCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
+          result = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
             static_cast<VkPhysicalDevice>( m_physicalDevice ), &timeDomainCount, reinterpret_cast<VkTimeDomainKHR *>( timeDomains.data() ) ) );
         }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
+      } while ( result == VULKAN_HPP_NAMESPACE::Result::eIncomplete );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getCalibrateableTimeDomainsKHR" );
       VULKAN_HPP_ASSERT( timeDomainCount <= timeDomains.size() );
       if ( timeDomainCount < timeDomains.size() )
       {
         timeDomains.resize( timeDomainCount );
       }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( timeDomains ) );
+      return timeDomains;
     }
 
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<std::vector<uint64_t>, uint64_t>>::type
-                         Device::getCalibratedTimestampsKHR( ArrayProxy<const CalibratedTimestampInfoKHR> const & timestampInfos ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<std::vector<uint64_t>, uint64_t> Device::getCalibratedTimestampsKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxy<const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR> const & timestampInfos ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsKHR &&
                          "Function <vkGetCalibratedTimestampsKHR> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
@@ -27502,21 +22842,19 @@ namespace VULKAN_HPP_NAMESPACE
       std::pair<std::vector<uint64_t>, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) );
       std::vector<uint64_t> &                    timestamps   = data_.first;
       uint64_t &                                 maxDeviation = data_.second;
-      Result                                     result =
-        static_cast<Result>( getDispatcher()->vkGetCalibratedTimestampsKHR( static_cast<VkDevice>( m_device ),
-                                                                            timestampInfos.size(),
-                                                                            reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ),
-                                                                            timestamps.data(),
-                                                                            &maxDeviation ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
+      VULKAN_HPP_NAMESPACE::Result               result       = static_cast<VULKAN_HPP_NAMESPACE::Result>(
+        getDispatcher()->vkGetCalibratedTimestampsKHR( static_cast<VkDevice>( m_device ),
+                                                       timestampInfos.size(),
+                                                       reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( timestampInfos.data() ),
+                                                       timestamps.data(),
+                                                       &maxDeviation ) );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
-    // wrapper function for command vkGetCalibratedTimestampsKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetCalibratedTimestampsKHR.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::pair<uint64_t, uint64_t>>::type
-                         Device::getCalibratedTimestampKHR( const CalibratedTimestampInfoKHR & timestampInfo ) const
+    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<uint64_t, uint64_t>
+                                           Device::getCalibratedTimestampKHR( const VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR & timestampInfo ) const
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsKHR &&
                          "Function <vkGetCalibratedTimestampsKHR> requires <VK_EXT_calibrated_timestamps> or <VK_KHR_calibrated_timestamps>" );
@@ -27524,60 +22862,54 @@ namespace VULKAN_HPP_NAMESPACE
       std::pair<uint64_t, uint64_t> data_;
       uint64_t &                    timestamp    = data_.first;
       uint64_t &                    maxDeviation = data_.second;
-      Result                        result       = static_cast<Result>( getDispatcher()->vkGetCalibratedTimestampsKHR(
+      VULKAN_HPP_NAMESPACE::Result  result       = static_cast<VULKAN_HPP_NAMESPACE::Result>( getDispatcher()->vkGetCalibratedTimestampsKHR(
         static_cast<VkDevice>( m_device ), 1, reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( &timestampInfo ), &timestamp, &maxDeviation ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getCalibratedTimestampKHR" );
+      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampKHR" );
 
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
+      return data_;
     }
 
     //=== VK_KHR_maintenance6 ===
 
-    // wrapper function for command vkCmdBindDescriptorSets2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorSets2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorSets2KHR( const BindDescriptorSetsInfo & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::bindDescriptorSets2KHR( const VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR & bindDescriptorSetsInfo ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorSets2KHR &&
-                         "Function <vkCmdBindDescriptorSets2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorSets2KHR && "Function <vkCmdBindDescriptorSets2KHR> requires <VK_KHR_maintenance6>" );
 
       getDispatcher()->vkCmdBindDescriptorSets2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                    reinterpret_cast<const VkBindDescriptorSetsInfo *>( &bindDescriptorSetsInfo ) );
+                                                    reinterpret_cast<const VkBindDescriptorSetsInfoKHR *>( &bindDescriptorSetsInfo ) );
     }
 
-    // wrapper function for command vkCmdPushConstants2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushConstants2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const PushConstantsInfo & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::pushConstants2KHR( const VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR & pushConstantsInfo ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushConstants2KHR && "Function <vkCmdPushConstants2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushConstants2KHR && "Function <vkCmdPushConstants2KHR> requires <VK_KHR_maintenance6>" );
 
       getDispatcher()->vkCmdPushConstants2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                               reinterpret_cast<const VkPushConstantsInfo *>( &pushConstantsInfo ) );
+                                               reinterpret_cast<const VkPushConstantsInfoKHR *>( &pushConstantsInfo ) );
     }
 
-    // wrapper function for command vkCmdPushDescriptorSet2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSet2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSet2KHR( const PushDescriptorSetInfo & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void
+      CommandBuffer::pushDescriptorSet2KHR( const VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR & pushDescriptorSetInfo ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSet2KHR &&
-                         "Function <vkCmdPushDescriptorSet2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSet2KHR && "Function <vkCmdPushDescriptorSet2KHR> requires <VK_KHR_maintenance6>" );
 
       getDispatcher()->vkCmdPushDescriptorSet2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                   reinterpret_cast<const VkPushDescriptorSetInfo *>( &pushDescriptorSetInfo ) );
+                                                   reinterpret_cast<const VkPushDescriptorSetInfoKHR *>( &pushDescriptorSetInfo ) );
     }
 
-    // wrapper function for command vkCmdPushDescriptorSetWithTemplate2KHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPushDescriptorSetWithTemplate2KHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::pushDescriptorSetWithTemplate2KHR( const PushDescriptorSetWithTemplateInfo & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::pushDescriptorSetWithTemplate2KHR(
+      const VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR & pushDescriptorSetWithTemplateInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPushDescriptorSetWithTemplate2KHR &&
-                         "Function <vkCmdPushDescriptorSetWithTemplate2KHR> requires <VK_KHR_maintenance6> or <VK_VERSION_1_4>" );
+                         "Function <vkCmdPushDescriptorSetWithTemplate2KHR> requires <VK_KHR_maintenance6>" );
 
       getDispatcher()->vkCmdPushDescriptorSetWithTemplate2KHR(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( &pushDescriptorSetWithTemplateInfo ) );
+        static_cast<VkCommandBuffer>( m_commandBuffer ),
+        reinterpret_cast<const VkPushDescriptorSetWithTemplateInfoKHR *>( &pushDescriptorSetWithTemplateInfo ) );
     }
 
-    // wrapper function for command vkCmdSetDescriptorBufferOffsets2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdSetDescriptorBufferOffsets2EXT.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::setDescriptorBufferOffsets2EXT( const SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo ) const VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_INLINE void CommandBuffer::setDescriptorBufferOffsets2EXT(
+      const VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT & setDescriptorBufferOffsetsInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdSetDescriptorBufferOffsets2EXT &&
                          "Function <vkCmdSetDescriptorBufferOffsets2EXT> requires <VK_KHR_maintenance6>" );
@@ -27586,10 +22918,8 @@ namespace VULKAN_HPP_NAMESPACE
                                                             reinterpret_cast<const VkSetDescriptorBufferOffsetsInfoEXT *>( &setDescriptorBufferOffsetsInfo ) );
     }
 
-    // wrapper function for command vkCmdBindDescriptorBufferEmbeddedSamplers2EXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindDescriptorBufferEmbeddedSamplers2EXT.html
     VULKAN_HPP_INLINE void CommandBuffer::bindDescriptorBufferEmbeddedSamplers2EXT(
-      const BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo ) const VULKAN_HPP_NOEXCEPT
+      const VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT & bindDescriptorBufferEmbeddedSamplersInfo ) const VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindDescriptorBufferEmbeddedSamplers2EXT &&
                          "Function <vkCmdBindDescriptorBufferEmbeddedSamplers2EXT> requires <VK_KHR_maintenance6>" );
@@ -27599,514 +22929,6 @@ namespace VULKAN_HPP_NAMESPACE
         reinterpret_cast<const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( &bindDescriptorBufferEmbeddedSamplersInfo ) );
     }
 
-    //=== VK_QCOM_tile_memory_heap ===
-
-    // wrapper function for command vkCmdBindTileMemoryQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBindTileMemoryQCOM.html
-    VULKAN_HPP_INLINE void CommandBuffer::bindTileMemoryQCOM( Optional<const TileMemoryBindInfoQCOM> tileMemoryBindInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBindTileMemoryQCOM && "Function <vkCmdBindTileMemoryQCOM> requires <VK_QCOM_tile_memory_heap>" );
-
-      getDispatcher()->vkCmdBindTileMemoryQCOM( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                reinterpret_cast<const VkTileMemoryBindInfoQCOM *>( tileMemoryBindInfo.get() ) );
-    }
-
-    //=== VK_KHR_copy_memory_indirect ===
-
-    // wrapper function for command vkCmdCopyMemoryIndirectKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryIndirectKHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::copyMemoryIndirectKHR( const CopyMemoryIndirectInfoKHR & copyMemoryIndirectInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryIndirectKHR && "Function <vkCmdCopyMemoryIndirectKHR> requires <VK_KHR_copy_memory_indirect>" );
-
-      getDispatcher()->vkCmdCopyMemoryIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                   reinterpret_cast<const VkCopyMemoryIndirectInfoKHR *>( &copyMemoryIndirectInfo ) );
-    }
-
-    // wrapper function for command vkCmdCopyMemoryToImageIndirectKHR, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdCopyMemoryToImageIndirectKHR.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::copyMemoryToImageIndirectKHR( const CopyMemoryToImageIndirectInfoKHR & copyMemoryToImageIndirectInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdCopyMemoryToImageIndirectKHR &&
-                         "Function <vkCmdCopyMemoryToImageIndirectKHR> requires <VK_KHR_copy_memory_indirect>" );
-
-      getDispatcher()->vkCmdCopyMemoryToImageIndirectKHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                          reinterpret_cast<const VkCopyMemoryToImageIndirectInfoKHR *>( &copyMemoryToImageIndirectInfo ) );
-    }
-
-    //=== VK_EXT_memory_decompression ===
-
-    // wrapper function for command vkCmdDecompressMemoryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryEXT( const DecompressMemoryInfoEXT & decompressMemoryInfoEXT ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDecompressMemoryEXT && "Function <vkCmdDecompressMemoryEXT> requires <VK_EXT_memory_decompression>" );
-
-      getDispatcher()->vkCmdDecompressMemoryEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                 reinterpret_cast<const VkDecompressMemoryInfoEXT *>( &decompressMemoryInfoEXT ) );
-    }
-
-    // wrapper function for command vkCmdDecompressMemoryIndirectCountEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdDecompressMemoryIndirectCountEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::decompressMemoryIndirectCountEXT( MemoryDecompressionMethodFlagsEXT decompressionMethod,
-                                                                            DeviceAddress                     indirectCommandsAddress,
-                                                                            DeviceAddress                     indirectCommandsCountAddress,
-                                                                            uint32_t                          maxDecompressionCount,
-                                                                            uint32_t                          stride ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdDecompressMemoryIndirectCountEXT &&
-                         "Function <vkCmdDecompressMemoryIndirectCountEXT> requires <VK_EXT_memory_decompression>" );
-
-      getDispatcher()->vkCmdDecompressMemoryIndirectCountEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                              static_cast<VkMemoryDecompressionMethodFlagsEXT>( decompressionMethod ),
-                                                              static_cast<VkDeviceAddress>( indirectCommandsAddress ),
-                                                              static_cast<VkDeviceAddress>( indirectCommandsCountAddress ),
-                                                              maxDecompressionCount,
-                                                              stride );
-    }
-
-    //=== VK_NV_external_compute_queue ===
-
-    // wrapper function for command vkCreateExternalComputeQueueNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateExternalComputeQueueNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<ExternalComputeQueueNV>::type
-                         Device::createExternalComputeQueueNV( ExternalComputeQueueCreateInfoNV const & createInfo,
-                                            Optional<const AllocationCallbacks>      allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV externalQueue;
-      Result                                       result =
-        static_cast<Result>( getDispatcher()->vkCreateExternalComputeQueueNV( static_cast<VkDevice>( m_device ),
-                                                                              reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( &createInfo ),
-                                                                              reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                              reinterpret_cast<VkExternalComputeQueueNV *>( &externalQueue ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createExternalComputeQueueNV" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, ExternalComputeQueueNV( *this, *reinterpret_cast<VkExternalComputeQueueNV *>( &externalQueue ), allocator ) );
-    }
-
-    // wrapper function for command vkGetExternalComputeQueueDataNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetExternalComputeQueueDataNV.html
-    template <typename DataType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair<ExternalComputeQueueDataParamsNV, DataType> ExternalComputeQueueNV::getData() const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetExternalComputeQueueDataNV &&
-                         "Function <vkGetExternalComputeQueueDataNV> requires <VK_NV_external_compute_queue>" );
-
-      std::pair<ExternalComputeQueueDataParamsNV, DataType> data_;
-      ExternalComputeQueueDataParamsNV &                    arams = data_.first;
-      DataType &                                            data  = data_.second;
-      getDispatcher()->vkGetExternalComputeQueueDataNV(
-        static_cast<VkExternalComputeQueueNV>( m_externalComputeQueueNV ), reinterpret_cast<VkExternalComputeQueueDataParamsNV *>( &arams ), &data );
-
-      return data_;
-    }
-
-    //=== VK_NV_cluster_acceleration_structure ===
-
-    // wrapper function for command vkGetClusterAccelerationStructureBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetClusterAccelerationStructureBuildSizesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR
-      Device::getClusterAccelerationStructureBuildSizesNV( const ClusterAccelerationStructureInputInfoNV & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetClusterAccelerationStructureBuildSizesNV &&
-                         "Function <vkGetClusterAccelerationStructureBuildSizesNV> requires <VK_NV_cluster_acceleration_structure>" );
-
-      AccelerationStructureBuildSizesInfoKHR sizeInfo;
-      getDispatcher()->vkGetClusterAccelerationStructureBuildSizesNV( static_cast<VkDevice>( m_device ),
-                                                                      reinterpret_cast<const VkClusterAccelerationStructureInputInfoNV *>( &info ),
-                                                                      reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( &sizeInfo ) );
-
-      return sizeInfo;
-    }
-
-    // wrapper function for command vkCmdBuildClusterAccelerationStructureIndirectNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildClusterAccelerationStructureIndirectNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::buildClusterAccelerationStructureIndirectNV( const ClusterAccelerationStructureCommandsInfoNV & commandInfos ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildClusterAccelerationStructureIndirectNV &&
-                         "Function <vkCmdBuildClusterAccelerationStructureIndirectNV> requires <VK_NV_cluster_acceleration_structure>" );
-
-      getDispatcher()->vkCmdBuildClusterAccelerationStructureIndirectNV(
-        static_cast<VkCommandBuffer>( m_commandBuffer ), reinterpret_cast<const VkClusterAccelerationStructureCommandsInfoNV *>( &commandInfos ) );
-    }
-
-    //=== VK_NV_partitioned_acceleration_structure ===
-
-    // wrapper function for command vkGetPartitionedAccelerationStructuresBuildSizesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPartitionedAccelerationStructuresBuildSizesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE AccelerationStructureBuildSizesInfoKHR
-      Device::getPartitionedAccelerationStructuresBuildSizesNV( const PartitionedAccelerationStructureInstancesInputNV & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPartitionedAccelerationStructuresBuildSizesNV &&
-                         "Function <vkGetPartitionedAccelerationStructuresBuildSizesNV> requires <VK_NV_partitioned_acceleration_structure>" );
-
-      AccelerationStructureBuildSizesInfoKHR sizeInfo;
-      getDispatcher()->vkGetPartitionedAccelerationStructuresBuildSizesNV(
-        static_cast<VkDevice>( m_device ),
-        reinterpret_cast<const VkPartitionedAccelerationStructureInstancesInputNV *>( &info ),
-        reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( &sizeInfo ) );
-
-      return sizeInfo;
-    }
-
-    // wrapper function for command vkCmdBuildPartitionedAccelerationStructuresNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBuildPartitionedAccelerationStructuresNV.html
-    VULKAN_HPP_INLINE void
-      CommandBuffer::buildPartitionedAccelerationStructuresNV( const BuildPartitionedAccelerationStructureInfoNV & buildInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBuildPartitionedAccelerationStructuresNV &&
-                         "Function <vkCmdBuildPartitionedAccelerationStructuresNV> requires <VK_NV_partitioned_acceleration_structure>" );
-
-      getDispatcher()->vkCmdBuildPartitionedAccelerationStructuresNV( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                                      reinterpret_cast<const VkBuildPartitionedAccelerationStructureInfoNV *>( &buildInfo ) );
-    }
-
-    //=== VK_EXT_device_generated_commands ===
-
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE MemoryRequirements2
-      Device::getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsEXT &&
-                         "Function <vkGetGeneratedCommandsMemoryRequirementsEXT> requires <VK_EXT_device_generated_commands>" );
-
-      MemoryRequirements2 memoryRequirements;
-      getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsEXT( static_cast<VkDevice>( m_device ),
-                                                                    reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( &info ),
-                                                                    reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return memoryRequirements;
-    }
-
-    // wrapper function for command vkGetGeneratedCommandsMemoryRequirementsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetGeneratedCommandsMemoryRequirementsEXT.html
-    template <typename X, typename Y, typename... Z>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE StructureChain<X, Y, Z...>
-      Device::getGeneratedCommandsMemoryRequirementsEXT( const GeneratedCommandsMemoryRequirementsInfoEXT & info ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsEXT &&
-                         "Function <vkGetGeneratedCommandsMemoryRequirementsEXT> requires <VK_EXT_device_generated_commands>" );
-
-      StructureChain<X, Y, Z...> structureChain;
-      MemoryRequirements2 &      memoryRequirements = structureChain.template get<MemoryRequirements2>();
-      getDispatcher()->vkGetGeneratedCommandsMemoryRequirementsEXT( static_cast<VkDevice>( m_device ),
-                                                                    reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( &info ),
-                                                                    reinterpret_cast<VkMemoryRequirements2 *>( &memoryRequirements ) );
-
-      return structureChain;
-    }
-
-    // wrapper function for command vkCmdPreprocessGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdPreprocessGeneratedCommandsEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::preprocessGeneratedCommandsEXT( const GeneratedCommandsInfoEXT &    generatedCommandsInfo,
-                                                                          VULKAN_HPP_NAMESPACE::CommandBuffer stateCommandBuffer ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdPreprocessGeneratedCommandsEXT &&
-                         "Function <vkCmdPreprocessGeneratedCommandsEXT> requires <VK_EXT_device_generated_commands>" );
-
-      getDispatcher()->vkCmdPreprocessGeneratedCommandsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                            reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( &generatedCommandsInfo ),
-                                                            static_cast<VkCommandBuffer>( stateCommandBuffer ) );
-    }
-
-    // wrapper function for command vkCmdExecuteGeneratedCommandsEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdExecuteGeneratedCommandsEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::executeGeneratedCommandsEXT( Bool32                           isPreprocessed,
-                                                                       const GeneratedCommandsInfoEXT & generatedCommandsInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdExecuteGeneratedCommandsEXT &&
-                         "Function <vkCmdExecuteGeneratedCommandsEXT> requires <VK_EXT_device_generated_commands>" );
-
-      getDispatcher()->vkCmdExecuteGeneratedCommandsEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                         static_cast<VkBool32>( isPreprocessed ),
-                                                         reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( &generatedCommandsInfo ) );
-    }
-
-    // wrapper function for command vkCreateIndirectCommandsLayoutEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectCommandsLayoutEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectCommandsLayoutEXT>::type
-                         Device::createIndirectCommandsLayoutEXT( IndirectCommandsLayoutCreateInfoEXT const & createInfo,
-                                               Optional<const AllocationCallbacks>         allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT indirectCommandsLayout;
-      Result                                          result =
-        static_cast<Result>( getDispatcher()->vkCreateIndirectCommandsLayoutEXT( static_cast<VkDevice>( m_device ),
-                                                                                 reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkIndirectCommandsLayoutEXT *>( &indirectCommandsLayout ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createIndirectCommandsLayoutEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, IndirectCommandsLayoutEXT( *this, *reinterpret_cast<VkIndirectCommandsLayoutEXT *>( &indirectCommandsLayout ), allocator ) );
-    }
-
-    // wrapper function for command vkCreateIndirectExecutionSetEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateIndirectExecutionSetEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<IndirectExecutionSetEXT>::type
-                         Device::createIndirectExecutionSetEXT( IndirectExecutionSetCreateInfoEXT const & createInfo,
-                                             Optional<const AllocationCallbacks>       allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT indirectExecutionSet;
-      Result                                        result =
-        static_cast<Result>( getDispatcher()->vkCreateIndirectExecutionSetEXT( static_cast<VkDevice>( m_device ),
-                                                                               reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( &createInfo ),
-                                                                               reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                               reinterpret_cast<VkIndirectExecutionSetEXT *>( &indirectExecutionSet ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::createIndirectExecutionSetEXT" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType(
-        result, IndirectExecutionSetEXT( *this, *reinterpret_cast<VkIndirectExecutionSetEXT *>( &indirectExecutionSet ), allocator ) );
-    }
-
-    // wrapper function for command vkUpdateIndirectExecutionSetPipelineEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetPipelineEXT.html
-    VULKAN_HPP_INLINE void
-      IndirectExecutionSetEXT::updatePipeline( ArrayProxy<const WriteIndirectExecutionSetPipelineEXT> const & executionSetWrites ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkUpdateIndirectExecutionSetPipelineEXT &&
-                         "Function <vkUpdateIndirectExecutionSetPipelineEXT> requires <VK_EXT_device_generated_commands>" );
-
-      getDispatcher()->vkUpdateIndirectExecutionSetPipelineEXT( static_cast<VkDevice>( m_device ),
-                                                                static_cast<VkIndirectExecutionSetEXT>( m_indirectExecutionSetEXT ),
-                                                                executionSetWrites.size(),
-                                                                reinterpret_cast<const VkWriteIndirectExecutionSetPipelineEXT *>( executionSetWrites.data() ) );
-    }
-
-    // wrapper function for command vkUpdateIndirectExecutionSetShaderEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkUpdateIndirectExecutionSetShaderEXT.html
-    VULKAN_HPP_INLINE void
-      IndirectExecutionSetEXT::updateShader( ArrayProxy<const WriteIndirectExecutionSetShaderEXT> const & executionSetWrites ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkUpdateIndirectExecutionSetShaderEXT &&
-                         "Function <vkUpdateIndirectExecutionSetShaderEXT> requires <VK_EXT_device_generated_commands>" );
-
-      getDispatcher()->vkUpdateIndirectExecutionSetShaderEXT( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkIndirectExecutionSetEXT>( m_indirectExecutionSetEXT ),
-                                                              executionSetWrites.size(),
-                                                              reinterpret_cast<const VkWriteIndirectExecutionSetShaderEXT *>( executionSetWrites.data() ) );
-    }
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_surface ===
-
-    // wrapper function for command vkCreateSurfaceOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCreateSurfaceOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<SurfaceKHR>::type
-                         Instance::createSurfaceOHOS( SurfaceCreateInfoOHOS const &       createInfo,
-                                   Optional<const AllocationCallbacks> allocator ) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS
-    {
-      VULKAN_HPP_NAMESPACE::SurfaceKHR surface;
-      Result                           result = static_cast<Result>( getDispatcher()->vkCreateSurfaceOHOS( static_cast<VkInstance>( m_instance ),
-                                                                                 reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( &createInfo ),
-                                                                                 reinterpret_cast<const VkAllocationCallbacks *>( allocator.get() ),
-                                                                                 reinterpret_cast<VkSurfaceKHR *>( &surface ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Instance::createSurfaceOHOS" );
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, SurfaceKHR( *this, *reinterpret_cast<VkSurfaceKHR *>( &surface ), allocator ) );
-    }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-#  if defined( VK_USE_PLATFORM_OHOS )
-    //=== VK_OHOS_native_buffer ===
-
-    // wrapper function for command vkGetSwapchainGrallocUsageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetSwapchainGrallocUsageOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<uint64_t>::type Device::getSwapchainGrallocUsageOHOS( Format          format,
-                                                                                                                          ImageUsageFlags imageUsage ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetSwapchainGrallocUsageOHOS && "Function <vkGetSwapchainGrallocUsageOHOS> requires <VK_OHOS_native_buffer>" );
-
-      uint64_t grallocUsage;
-      Result   result = static_cast<Result>( getDispatcher()->vkGetSwapchainGrallocUsageOHOS(
-        static_cast<VkDevice>( m_device ), static_cast<VkFormat>( format ), static_cast<VkImageUsageFlags>( imageUsage ), &grallocUsage ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getSwapchainGrallocUsageOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( grallocUsage ) );
-    }
-
-    // wrapper function for command vkAcquireImageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkAcquireImageOHOS.html
-    VULKAN_HPP_INLINE typename ResultValueType<void>::type
-      Image::acquireOHOS( int32_t nativeFenceFd, VULKAN_HPP_NAMESPACE::Semaphore semaphore, VULKAN_HPP_NAMESPACE::Fence fence ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkAcquireImageOHOS && "Function <vkAcquireImageOHOS> requires <VK_OHOS_native_buffer>" );
-
-      Result result = static_cast<Result>( getDispatcher()->vkAcquireImageOHOS( static_cast<VkDevice>( m_device ),
-                                                                                static_cast<VkImage>( m_image ),
-                                                                                nativeFenceFd,
-                                                                                static_cast<VkSemaphore>( semaphore ),
-                                                                                static_cast<VkFence>( fence ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Image::acquireOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result );
-    }
-
-    // wrapper function for command vkQueueSignalReleaseImageOHOS, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkQueueSignalReleaseImageOHOS.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<int32_t>::type
-      Queue::signalReleaseImageOHOS( ArrayProxy<const VULKAN_HPP_NAMESPACE::Semaphore> const & waitSemaphores, VULKAN_HPP_NAMESPACE::Image image ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkQueueSignalReleaseImageOHOS && "Function <vkQueueSignalReleaseImageOHOS> requires <VK_OHOS_native_buffer>" );
-
-      int32_t nativeFenceFd;
-      Result  result = static_cast<Result>( getDispatcher()->vkQueueSignalReleaseImageOHOS( static_cast<VkQueue>( m_queue ),
-                                                                                           waitSemaphores.size(),
-                                                                                           reinterpret_cast<const VkSemaphore *>( waitSemaphores.data() ),
-                                                                                           static_cast<VkImage>( image ),
-                                                                                           &nativeFenceFd ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Queue::signalReleaseImageOHOS" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( nativeFenceFd ) );
-    }
-#  endif /*VK_USE_PLATFORM_OHOS*/
-
-    //=== VK_NV_cooperative_matrix2 ===
-
-    // wrapper function for command vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV>>::type
-                         PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV() const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV &&
-                         "Function <vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV> requires <VK_NV_cooperative_matrix2>" );
-
-      std::vector<CooperativeMatrixFlexibleDimensionsPropertiesNV> properties;
-      uint32_t                                                     propertyCount;
-      Result                                                       result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), &propertyCount, nullptr ) );
-        if ( ( result == Result::eSuccess ) && propertyCount )
-        {
-          properties.resize( propertyCount );
-          result = static_cast<Result>( getDispatcher()->vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
-            static_cast<VkPhysicalDevice>( m_physicalDevice ),
-            &propertyCount,
-            reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( properties.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::getCooperativeMatrixFlexibleDimensionsPropertiesNV" );
-      VULKAN_HPP_ASSERT( propertyCount <= properties.size() );
-      if ( propertyCount < properties.size() )
-      {
-        properties.resize( propertyCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( properties ) );
-    }
-
-#  if defined( VK_USE_PLATFORM_METAL_EXT )
-    //=== VK_EXT_external_memory_metal ===
-
-    // wrapper function for command vkGetMemoryMetalHandleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandleEXT.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<void *>::type
-                         Device::getMemoryMetalHandleEXT( const MemoryGetMetalHandleInfoEXT & getMetalHandleInfo ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryMetalHandleEXT && "Function <vkGetMemoryMetalHandleEXT> requires <VK_EXT_external_memory_metal>" );
-
-      void * handle;
-      Result result = static_cast<Result>( getDispatcher()->vkGetMemoryMetalHandleEXT(
-        static_cast<VkDevice>( m_device ), reinterpret_cast<const VkMemoryGetMetalHandleInfoEXT *>( &getMetalHandleInfo ), &handle ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryMetalHandleEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( handle ) );
-    }
-
-    // wrapper function for command vkGetMemoryMetalHandlePropertiesEXT, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetMemoryMetalHandlePropertiesEXT.html
-    template <typename HandleType>
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE typename ResultValueType<MemoryMetalHandlePropertiesEXT>::type
-                         Device::getMemoryMetalHandlePropertiesEXT( ExternalMemoryHandleTypeFlagBits handleType, HandleType const & handle ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkGetMemoryMetalHandlePropertiesEXT &&
-                         "Function <vkGetMemoryMetalHandlePropertiesEXT> requires <VK_EXT_external_memory_metal>" );
-
-      MemoryMetalHandlePropertiesEXT memoryMetalHandleProperties;
-      Result                         result = static_cast<Result>(
-        getDispatcher()->vkGetMemoryMetalHandlePropertiesEXT( static_cast<VkDevice>( m_device ),
-                                                              static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ),
-                                                              reinterpret_cast<const void *>( &handle ),
-                                                              reinterpret_cast<VkMemoryMetalHandlePropertiesEXT *>( &memoryMetalHandleProperties ) ) );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result, VULKAN_HPP_RAII_NAMESPACE_STRING "::Device::getMemoryMetalHandlePropertiesEXT" );
-
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( memoryMetalHandleProperties ) );
-    }
-#  endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-    //=== VK_ARM_performance_counters_by_region ===
-
-    // wrapper function for command vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM, see
-    // https://registry.khronos.org/vulkan/specs/latest/man/html/vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM.html
-    VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE
-      typename ResultValueType<std::pair<std::vector<PerformanceCounterARM>, std::vector<PerformanceCounterDescriptionARM>>>::type
-      PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM( uint32_t queueFamilyIndex ) const
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM &&
-                         "Function <vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM> requires <VK_ARM_performance_counters_by_region>" );
-
-      std::pair<std::vector<PerformanceCounterARM>, std::vector<PerformanceCounterDescriptionARM>> data_;
-      std::vector<PerformanceCounterARM> &                                                         counters            = data_.first;
-      std::vector<PerformanceCounterDescriptionARM> &                                              counterDescriptions = data_.second;
-      uint32_t                                                                                     counterCount;
-      Result                                                                                       result;
-      do
-      {
-        result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-          static_cast<VkPhysicalDevice>( m_physicalDevice ), queueFamilyIndex, &counterCount, nullptr, nullptr ) );
-        if ( ( result == Result::eSuccess ) && counterCount )
-        {
-          counters.resize( counterCount );
-          counterDescriptions.resize( counterCount );
-          result = static_cast<Result>( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
-            static_cast<VkPhysicalDevice>( m_physicalDevice ),
-            queueFamilyIndex,
-            &counterCount,
-            reinterpret_cast<VkPerformanceCounterARM *>( counters.data() ),
-            reinterpret_cast<VkPerformanceCounterDescriptionARM *>( counterDescriptions.data() ) ) );
-        }
-      } while ( result == Result::eIncomplete );
-      VULKAN_HPP_NAMESPACE::detail::resultCheck( result,
-                                                 VULKAN_HPP_RAII_NAMESPACE_STRING "::PhysicalDevice::enumerateQueueFamilyPerformanceCountersByRegionARM" );
-      VULKAN_HPP_ASSERT( counterCount <= counters.size() );
-      if ( counterCount < counters.size() )
-      {
-        counters.resize( counterCount );
-        counterDescriptions.resize( counterCount );
-      }
-      return VULKAN_HPP_NAMESPACE::detail::createResultValueType( result, std::move( data_ ) );
-    }
-
-    //=== VK_EXT_fragment_density_map_offset ===
-
-    // wrapper function for command vkCmdEndRendering2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2EXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::endRendering2EXT( Optional<const RenderingEndInfoKHR> renderingEndInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRendering2EXT &&
-                         "Function <vkCmdEndRendering2EXT> requires <VK_EXT_fragment_density_map_offset> or <VK_KHR_maintenance10>" );
-
-      getDispatcher()->vkCmdEndRendering2EXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                              reinterpret_cast<const VkRenderingEndInfoKHR *>( renderingEndInfo.get() ) );
-    }
-
-    //=== VK_EXT_custom_resolve ===
-
-    // wrapper function for command vkCmdBeginCustomResolveEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdBeginCustomResolveEXT.html
-    VULKAN_HPP_INLINE void CommandBuffer::beginCustomResolveEXT( Optional<const BeginCustomResolveInfoEXT> beginCustomResolveInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdBeginCustomResolveEXT && "Function <vkCmdBeginCustomResolveEXT> requires <VK_EXT_custom_resolve>" );
-
-      getDispatcher()->vkCmdBeginCustomResolveEXT( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                                   reinterpret_cast<const VkBeginCustomResolveInfoEXT *>( beginCustomResolveInfo.get() ) );
-    }
-
-    //=== VK_KHR_maintenance10 ===
-
-    // wrapper function for command vkCmdEndRendering2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkCmdEndRendering2KHR.html
-    VULKAN_HPP_INLINE void CommandBuffer::endRendering2KHR( Optional<const RenderingEndInfoKHR> renderingEndInfo ) const VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( getDispatcher()->vkCmdEndRendering2KHR &&
-                         "Function <vkCmdEndRendering2KHR> requires <VK_EXT_fragment_density_map_offset> or <VK_KHR_maintenance10>" );
-
-      getDispatcher()->vkCmdEndRendering2KHR( static_cast<VkCommandBuffer>( m_commandBuffer ),
-                                              reinterpret_cast<const VkRenderingEndInfoKHR *>( renderingEndInfo.get() ) );
-    }
-
     //====================
     //=== RAII Helpers ===
     //====================
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_screen.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_screen.h
index 79b04f05..7e84d4d9 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_screen.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_screen.h
@@ -2,7 +2,7 @@
 #define VULKAN_SCREEN_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,21 +36,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateScreenSurfaceQNX)(VkInstance instance,
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct _screen_window* window);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateScreenSurfaceQNX(
     VkInstance                                  instance,
     const VkScreenSurfaceCreateInfoQNX*         pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceScreenPresentationSupportQNX(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     struct _screen_window*                      window);
 #endif
-#endif
 
 
 // VK_QNX_external_memory_screen_buffer is a preprocessor guard. Do not pass it to API calls.
@@ -99,13 +95,11 @@ typedef struct VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX {
 typedef VkResult (VKAPI_PTR *PFN_vkGetScreenBufferPropertiesQNX)(VkDevice device, const struct _screen_buffer* buffer, VkScreenBufferPropertiesQNX* pProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetScreenBufferPropertiesQNX(
     VkDevice                                    device,
     const struct _screen_buffer*                buffer,
     VkScreenBufferPropertiesQNX*                pProperties);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_shared.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_shared.hpp
index df5ca626..8b2697a1 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_shared.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_shared.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,15 +8,13 @@
 #ifndef VULKAN_SHARED_HPP
 #define VULKAN_SHARED_HPP
 
+#include <atomic>  // std::atomic_size_t
 #include <vulkan/vulkan.hpp>
 
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <atomic>  // std::atomic_size_t
-#endif
-
 namespace VULKAN_HPP_NAMESPACE
 {
 #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
+
   template <typename HandleType>
   class SharedHandleTraits;
 
@@ -54,28 +52,6 @@ namespace VULKAN_HPP_NAMESPACE
   {
   };
 
-  template <typename HandleType, typename = void>
-  struct HasPoolType : std::false_type
-  {
-  };
-
-  template <typename HandleType>
-  struct HasPoolType<HandleType, decltype( (void)typename SharedHandleTraits<HandleType>::deleter::PoolTypeExport() )> : std::true_type
-  {
-  };
-
-  template <typename HandleType, typename Enable = void>
-  struct GetPoolType
-  {
-    using type = NoDestructor;
-  };
-
-  template <typename HandleType>
-  struct GetPoolType<HandleType, typename std::enable_if<HasPoolType<HandleType>::value>::type>
-  {
-    using type = typename SharedHandleTraits<HandleType>::deleter::PoolTypeExport;
-  };
-
   //=====================================================================================================================
 
   template <typename HandleType>
@@ -84,7 +60,7 @@ namespace VULKAN_HPP_NAMESPACE
   template <typename DestructorType, typename Deleter>
   struct SharedHeader
   {
-    SharedHeader( SharedHandle<DestructorType> parent, Deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( Deleter() ) ) VULKAN_HPP_NOEXCEPT
+    SharedHeader( SharedHandle<DestructorType> parent, Deleter deleter = Deleter() ) VULKAN_HPP_NOEXCEPT
       : parent( std::move( parent ) )
       , deleter( std::move( deleter ) )
     {
@@ -97,7 +73,7 @@ namespace VULKAN_HPP_NAMESPACE
   template <typename Deleter>
   struct SharedHeader<NoDestructor, Deleter>
   {
-    SharedHeader( Deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( Deleter() ) ) VULKAN_HPP_NOEXCEPT : deleter( std::move( deleter ) ) {}
+    SharedHeader( Deleter deleter = Deleter() ) VULKAN_HPP_NOEXCEPT : deleter( std::move( deleter ) ) {}
 
     Deleter deleter;
   };
@@ -131,7 +107,7 @@ namespace VULKAN_HPP_NAMESPACE
 
   public:
     std::atomic_size_t m_ref_cnt{ 1 };
-    HeaderType         m_header;
+    HeaderType         m_header{};
   };
 
   //=====================================================================================================================
@@ -281,28 +257,14 @@ namespace VULKAN_HPP_NAMESPACE
   public:
     SharedHandle() = default;
 
-    template <typename T = HandleType, typename = typename std::enable_if<HasDestructor<T>::value && !HasPoolType<T>::value>::type>
-    explicit SharedHandle( HandleType                                 handle,
-                           SharedHandle<DestructorTypeOf<HandleType>> parent,
-                           DeleterType deleter                        VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+    template <typename T = HandleType, typename = typename std::enable_if<HasDestructor<T>::value>::type>
+    explicit SharedHandle( HandleType handle, SharedHandle<DestructorTypeOf<HandleType>> parent, DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
       : BaseType( handle, std::move( parent ), std::move( deleter ) )
     {
     }
 
-    template <typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE,
-              typename T          = HandleType,
-              typename            = typename std::enable_if<HasDestructor<T>::value && HasPoolType<T>::value>::type>
-    explicit SharedHandle( HandleType                                           handle,
-                           SharedHandle<DestructorTypeOf<HandleType>>           parent,
-                           SharedHandle<typename GetPoolType<HandleType>::type> pool,
-                           const Dispatcher & dispatch                          VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
-      : BaseType( handle, std::move( parent ), DeleterType{ std::move( pool ), dispatch } )
-    {
-    }
-
     template <typename T = HandleType, typename = typename std::enable_if<!HasDestructor<T>::value>::type>
-    explicit SharedHandle( HandleType handle, DeleterType deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
-      : BaseType( handle, std::move( deleter ) )
+    explicit SharedHandle( HandleType handle, DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT : BaseType( handle, std::move( deleter ) )
     {
     }
 
@@ -310,153 +272,156 @@ namespace VULKAN_HPP_NAMESPACE
     using BaseType::internalDestroy;
   };
 
-  namespace detail
-  {
+  template <typename HandleType>
+  class SharedHandleTraits;
+
 // Silence the function cast warnings.
 #  if defined( __GNUC__ ) && !defined( __clang__ ) && !defined( __INTEL_COMPILER )
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  elif defined( __clang__ ) && ( __clang_major__ >= 13 ) && !defined( __INTEL_COMPILER )
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wcast-function-type"
 #  endif
 
-    template <typename HandleType, typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
-    class ObjectDestroyShared
+  template <typename HandleType>
+  class ObjectDestroyShared
+  {
+  public:
+    using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+
+    template <class Dispatcher>
+    using DestroyFunctionPointerType =
+      typename std::conditional<HasDestructor<HandleType>::value,
+                                void ( DestructorType::* )( HandleType, const AllocationCallbacks *, const Dispatcher & ) const,
+                                void ( HandleType::* )( const AllocationCallbacks *, const Dispatcher & ) const>::type;
+
+    using SelectorType = typename std::conditional<HasDestructor<HandleType>::value, DestructorType, HandleType>::type;
+
+    template <typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    ObjectDestroyShared( Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                         const Dispatcher & dispatch                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
+      : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType<Dispatcher>>( &SelectorType::destroy ) ) )
+      , m_dispatch( &dispatch )
+      , m_allocationCallbacks( allocationCallbacks )
     {
-    public:
-      using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+    }
 
-      using DestroyFunctionPointerType =
-        typename std::conditional<HasDestructor<HandleType>::value,
-                                  void ( DestructorType::* )( HandleType, const AllocationCallbacks *, const Dispatcher & ) const,
-                                  void ( HandleType::* )( const AllocationCallbacks *, const Dispatcher & ) const>::type;
-
-      using SelectorType = typename std::conditional<HasDestructor<HandleType>::value, DestructorType, HandleType>::type;
-
-      ObjectDestroyShared( Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                           const Dispatcher & dispatch                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-        : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType>( &SelectorType::destroy ) ) )
-        , m_dispatch( &dispatch )
-        , m_allocationCallbacks( allocationCallbacks )
-      {
-      }
-
-    public:
-      template <typename T = HandleType>
-      typename std::enable_if<HasDestructor<T>::value, void>::type destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-        ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
-      }
-
-      template <typename T = HandleType>
-      typename std::enable_if<!HasDestructor<T>::value, void>::type destroy( HandleType handle ) const VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-        ( handle.*m_destroy )( m_allocationCallbacks, *m_dispatch );
-      }
-
-    private:
-      DestroyFunctionPointerType          m_destroy             = nullptr;
-      const Dispatcher *                  m_dispatch            = nullptr;
-      Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
-    };
-
-    template <typename HandleType, typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
-    class ObjectFreeShared
+  public:
+    template <typename T = HandleType>
+    typename std::enable_if<HasDestructor<T>::value, void>::type destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
+      ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
+    }
 
-      using DestroyFunctionPointerType = void ( DestructorType::* )( HandleType, const AllocationCallbacks *, const Dispatcher & ) const;
-
-      ObjectFreeShared( Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ASSIGNMENT( nullptr ),
-                        const Dispatcher & dispatch                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-        : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType>( &DestructorType::free ) ) )
-        , m_dispatch( &dispatch )
-        , m_allocationCallbacks( allocationCallbacks )
-      {
-      }
-
-    public:
-      void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-        ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
-      }
-
-    private:
-      DestroyFunctionPointerType          m_destroy             = nullptr;
-      const Dispatcher *                  m_dispatch            = nullptr;
-      Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
-    };
-
-    template <typename HandleType, typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
-    class ObjectReleaseShared
+    template <typename T = HandleType>
+    typename std::enable_if<!HasDestructor<T>::value, void>::type destroy( HandleType handle ) const VULKAN_HPP_NOEXCEPT
     {
-    public:
-      using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
+      ( handle.*m_destroy )( m_allocationCallbacks, *m_dispatch );
+    }
 
-      using DestroyFunctionPointerType = void ( DestructorType::* )( HandleType, const Dispatcher & ) const;
+  private:
+    DestroyFunctionPointerType<DispatchLoaderBase> m_destroy             = nullptr;
+    const DispatchLoaderBase *                     m_dispatch            = nullptr;
+    Optional<const AllocationCallbacks>            m_allocationCallbacks = nullptr;
+  };
 
-      ObjectReleaseShared( const Dispatcher & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-        : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType>( &DestructorType::release ) ) ), m_dispatch( &dispatch )
-      {
-      }
+  template <typename HandleType>
+  class ObjectFreeShared
+  {
+  public:
+    using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
 
-    public:
-      void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-        ( parent.*m_destroy )( handle, *m_dispatch );
-      }
+    template <class Dispatcher>
+    using DestroyFunctionPointerType = void ( DestructorType::* )( HandleType, const AllocationCallbacks *, const Dispatcher & ) const;
 
-    private:
-      DestroyFunctionPointerType m_destroy  = nullptr;
-      const Dispatcher *         m_dispatch = nullptr;
-    };
-
-    template <typename HandleType, typename PoolType, typename Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
-    class PoolFreeShared
+    template <class Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    ObjectFreeShared( Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
+                      const Dispatcher & dispatch                             VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
+      : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType<Dispatcher>>( &DestructorType::free ) ) )
+      , m_dispatch( &dispatch )
+      , m_allocationCallbacks( allocationCallbacks )
     {
-    public:
-      using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+    }
 
-      using PoolTypeExport = PoolType;
+  public:
+    void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
+      ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
+    }
 
-      using ReturnType = decltype( std::declval<DestructorType>().free( PoolType(), 0u, nullptr, Dispatcher() ) );
+  private:
+    DestroyFunctionPointerType<DispatchLoaderBase> m_destroy             = nullptr;
+    const DispatchLoaderBase *                     m_dispatch            = nullptr;
+    Optional<const AllocationCallbacks>            m_allocationCallbacks = nullptr;
+  };
 
-      using DestroyFunctionPointerType = ReturnType ( DestructorType::* )( PoolType, uint32_t, const HandleType *, const Dispatcher & ) const;
+  template <typename HandleType>
+  class ObjectReleaseShared
+  {
+  public:
+    using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
 
-      PoolFreeShared() = default;
+    template <class Dispatcher>
+    using DestroyFunctionPointerType = void ( DestructorType::* )( HandleType, const Dispatcher & ) const;
 
-      PoolFreeShared( SharedHandle<PoolType> pool, const Dispatcher & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
-        : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType>( &DestructorType::free ) ) )
-        , m_dispatch( &dispatch )
-        , m_pool( std::move( pool ) )
-      {
-      }
+    template <class Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    ObjectReleaseShared( const Dispatcher & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
+      : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType<Dispatcher>>( &DestructorType::release ) ) )
+      , m_dispatch( &dispatch )
+    {
+    }
 
-    public:
-      void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
-      {
-        VULKAN_HPP_ASSERT( m_destroy && m_dispatch && m_pool );
-        ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
-      }
+  public:
+    void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
+      ( parent.*m_destroy )( handle, *m_dispatch );
+    }
 
-    private:
-      DestroyFunctionPointerType m_destroy  = nullptr;
-      const Dispatcher *         m_dispatch = nullptr;
-      SharedHandle<PoolType>     m_pool{};
-    };
+  private:
+    DestroyFunctionPointerType<DispatchLoaderBase> m_destroy  = nullptr;
+    const DispatchLoaderBase *                     m_dispatch = nullptr;
+  };
+
+  template <typename HandleType, typename PoolType>
+  class PoolFreeShared
+  {
+  public:
+    using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;
+
+    template <class Dispatcher>
+    using ReturnType = decltype( std::declval<DestructorType>().free( PoolType(), 0u, nullptr, Dispatcher() ) );
+
+    template <class Dispatcher>
+    using DestroyFunctionPointerType = ReturnType<Dispatcher> ( DestructorType::* )( PoolType, uint32_t, const HandleType *, const Dispatcher & ) const;
+
+    PoolFreeShared() = default;
+
+    template <class Dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>
+    PoolFreeShared( SharedHandle<PoolType> pool, const Dispatcher & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT )
+      : m_destroy( reinterpret_cast<decltype( m_destroy )>( static_cast<DestroyFunctionPointerType<Dispatcher>>( &DestructorType::free ) ) )
+      , m_dispatch( &dispatch )
+      , m_pool( std::move( pool ) )
+    {
+    }
+
+  public:
+    void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
+    {
+      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
+      ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
+    }
+
+  private:
+    DestroyFunctionPointerType<DispatchLoaderBase> m_destroy  = nullptr;
+    const DispatchLoaderBase *                     m_dispatch = nullptr;
+    SharedHandle<PoolType>                         m_pool{};
+  };
 
 #  if defined( __GNUC__ ) && !defined( __clang__ ) && !defined( __INTEL_COMPILER )
 #    pragma GCC diagnostic pop
-#  elif defined( __clang__ ) && ( __clang_major__ >= 13 ) && !defined( __INTEL_COMPILER )
-#    pragma clang diagnostic pop
 #  endif
-  }  // namespace detail
 
   //======================
   //=== SHARED HANDLEs ===
@@ -468,7 +433,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = NoDestructor;
-    using deleter        = detail::ObjectDestroyShared<Instance>;
+    using deleter        = ObjectDestroyShared<Instance>;
   };
 
   using SharedInstance = SharedHandle<Instance>;
@@ -478,7 +443,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = NoDestructor;
-    using deleter        = detail::ObjectDestroyShared<Device>;
+    using deleter        = ObjectDestroyShared<Device>;
   };
 
   using SharedDevice = SharedHandle<Device>;
@@ -488,7 +453,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectFreeShared<DeviceMemory>;
+    using deleter        = ObjectFreeShared<DeviceMemory>;
   };
 
   using SharedDeviceMemory = SharedHandle<DeviceMemory>;
@@ -498,7 +463,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Fence>;
+    using deleter        = ObjectDestroyShared<Fence>;
   };
 
   using SharedFence = SharedHandle<Fence>;
@@ -508,17 +473,27 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Semaphore>;
+    using deleter        = ObjectDestroyShared<Semaphore>;
   };
 
   using SharedSemaphore = SharedHandle<Semaphore>;
 
+  template <>
+  class SharedHandleTraits<Event>
+  {
+  public:
+    using DestructorType = Device;
+    using deleter        = ObjectDestroyShared<Event>;
+  };
+
+  using SharedEvent = SharedHandle<Event>;
+
   template <>
   class SharedHandleTraits<QueryPool>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<QueryPool>;
+    using deleter        = ObjectDestroyShared<QueryPool>;
   };
 
   using SharedQueryPool = SharedHandle<QueryPool>;
@@ -528,17 +503,27 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Buffer>;
+    using deleter        = ObjectDestroyShared<Buffer>;
   };
 
   using SharedBuffer = SharedHandle<Buffer>;
 
+  template <>
+  class SharedHandleTraits<BufferView>
+  {
+  public:
+    using DestructorType = Device;
+    using deleter        = ObjectDestroyShared<BufferView>;
+  };
+
+  using SharedBufferView = SharedHandle<BufferView>;
+
   template <>
   class SharedHandleTraits<Image>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Image>;
+    using deleter        = ObjectDestroyShared<Image>;
   };
 
   using SharedImage = SharedHandle<Image>;
@@ -548,57 +533,17 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<ImageView>;
+    using deleter        = ObjectDestroyShared<ImageView>;
   };
 
   using SharedImageView = SharedHandle<ImageView>;
 
-  template <>
-  class SharedHandleTraits<CommandPool>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<CommandPool>;
-  };
-
-  using SharedCommandPool = SharedHandle<CommandPool>;
-
-  template <>
-  class SharedHandleTraits<CommandBuffer>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::PoolFreeShared<CommandBuffer, CommandPool>;
-  };
-
-  using SharedCommandBuffer = SharedHandle<CommandBuffer>;
-
-  template <>
-  class SharedHandleTraits<Event>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Event>;
-  };
-
-  using SharedEvent = SharedHandle<Event>;
-
-  template <>
-  class SharedHandleTraits<BufferView>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<BufferView>;
-  };
-
-  using SharedBufferView = SharedHandle<BufferView>;
-
   template <>
   class SharedHandleTraits<ShaderModule>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<ShaderModule>;
+    using deleter        = ObjectDestroyShared<ShaderModule>;
   };
 
   using SharedShaderModule = SharedHandle<ShaderModule>;
@@ -608,7 +553,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<PipelineCache>;
+    using deleter        = ObjectDestroyShared<PipelineCache>;
   };
 
   using SharedPipelineCache = SharedHandle<PipelineCache>;
@@ -618,7 +563,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Pipeline>;
+    using deleter        = ObjectDestroyShared<Pipeline>;
   };
 
   using SharedPipeline = SharedHandle<Pipeline>;
@@ -628,7 +573,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<PipelineLayout>;
+    using deleter        = ObjectDestroyShared<PipelineLayout>;
   };
 
   using SharedPipelineLayout = SharedHandle<PipelineLayout>;
@@ -638,7 +583,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Sampler>;
+    using deleter        = ObjectDestroyShared<Sampler>;
   };
 
   using SharedSampler = SharedHandle<Sampler>;
@@ -648,7 +593,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<DescriptorPool>;
+    using deleter        = ObjectDestroyShared<DescriptorPool>;
   };
 
   using SharedDescriptorPool = SharedHandle<DescriptorPool>;
@@ -658,7 +603,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::PoolFreeShared<DescriptorSet, DescriptorPool>;
+    using deleter        = PoolFreeShared<DescriptorSet, DescriptorPool>;
   };
 
   using SharedDescriptorSet = SharedHandle<DescriptorSet>;
@@ -668,7 +613,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<DescriptorSetLayout>;
+    using deleter        = ObjectDestroyShared<DescriptorSetLayout>;
   };
 
   using SharedDescriptorSetLayout = SharedHandle<DescriptorSetLayout>;
@@ -678,7 +623,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<Framebuffer>;
+    using deleter        = ObjectDestroyShared<Framebuffer>;
   };
 
   using SharedFramebuffer = SharedHandle<Framebuffer>;
@@ -688,41 +633,61 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<RenderPass>;
+    using deleter        = ObjectDestroyShared<RenderPass>;
   };
 
   using SharedRenderPass = SharedHandle<RenderPass>;
 
-  //=== VK_VERSION_1_1 ===
   template <>
-  class SharedHandleTraits<DescriptorUpdateTemplate>
+  class SharedHandleTraits<CommandPool>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<DescriptorUpdateTemplate>;
+    using deleter        = ObjectDestroyShared<CommandPool>;
   };
 
-  using SharedDescriptorUpdateTemplate    = SharedHandle<DescriptorUpdateTemplate>;
-  using SharedDescriptorUpdateTemplateKHR = SharedHandle<DescriptorUpdateTemplate>;
+  using SharedCommandPool = SharedHandle<CommandPool>;
 
+  template <>
+  class SharedHandleTraits<CommandBuffer>
+  {
+  public:
+    using DestructorType = Device;
+    using deleter        = PoolFreeShared<CommandBuffer, CommandPool>;
+  };
+
+  using SharedCommandBuffer = SharedHandle<CommandBuffer>;
+
+  //=== VK_VERSION_1_1 ===
   template <>
   class SharedHandleTraits<SamplerYcbcrConversion>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<SamplerYcbcrConversion>;
+    using deleter        = ObjectDestroyShared<SamplerYcbcrConversion>;
   };
 
   using SharedSamplerYcbcrConversion    = SharedHandle<SamplerYcbcrConversion>;
   using SharedSamplerYcbcrConversionKHR = SharedHandle<SamplerYcbcrConversion>;
 
+  template <>
+  class SharedHandleTraits<DescriptorUpdateTemplate>
+  {
+  public:
+    using DestructorType = Device;
+    using deleter        = ObjectDestroyShared<DescriptorUpdateTemplate>;
+  };
+
+  using SharedDescriptorUpdateTemplate    = SharedHandle<DescriptorUpdateTemplate>;
+  using SharedDescriptorUpdateTemplateKHR = SharedHandle<DescriptorUpdateTemplate>;
+
   //=== VK_VERSION_1_3 ===
   template <>
   class SharedHandleTraits<PrivateDataSlot>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<PrivateDataSlot>;
+    using deleter        = ObjectDestroyShared<PrivateDataSlot>;
   };
 
   using SharedPrivateDataSlot    = SharedHandle<PrivateDataSlot>;
@@ -734,7 +699,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Instance;
-    using deleter        = detail::ObjectDestroyShared<SurfaceKHR>;
+    using deleter        = ObjectDestroyShared<SurfaceKHR>;
   };
 
   using SharedSurfaceKHR = SharedHandle<SurfaceKHR>;
@@ -745,7 +710,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<SwapchainKHR>;
+    using deleter        = ObjectDestroyShared<SwapchainKHR>;
   };
 
   using SharedSwapchainKHR = SharedHandle<SwapchainKHR>;
@@ -756,7 +721,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = PhysicalDevice;
-    using deleter        = detail::ObjectDestroyShared<DisplayKHR>;
+    using deleter        = ObjectDestroyShared<DisplayKHR>;
   };
 
   using SharedDisplayKHR = SharedHandle<DisplayKHR>;
@@ -767,7 +732,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Instance;
-    using deleter        = detail::ObjectDestroyShared<DebugReportCallbackEXT>;
+    using deleter        = ObjectDestroyShared<DebugReportCallbackEXT>;
   };
 
   using SharedDebugReportCallbackEXT = SharedHandle<DebugReportCallbackEXT>;
@@ -778,7 +743,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<VideoSessionKHR>;
+    using deleter        = ObjectDestroyShared<VideoSessionKHR>;
   };
 
   using SharedVideoSessionKHR = SharedHandle<VideoSessionKHR>;
@@ -788,7 +753,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<VideoSessionParametersKHR>;
+    using deleter        = ObjectDestroyShared<VideoSessionParametersKHR>;
   };
 
   using SharedVideoSessionParametersKHR = SharedHandle<VideoSessionParametersKHR>;
@@ -799,7 +764,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<CuModuleNVX>;
+    using deleter        = ObjectDestroyShared<CuModuleNVX>;
   };
 
   using SharedCuModuleNVX = SharedHandle<CuModuleNVX>;
@@ -809,7 +774,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<CuFunctionNVX>;
+    using deleter        = ObjectDestroyShared<CuFunctionNVX>;
   };
 
   using SharedCuFunctionNVX = SharedHandle<CuFunctionNVX>;
@@ -820,7 +785,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Instance;
-    using deleter        = detail::ObjectDestroyShared<DebugUtilsMessengerEXT>;
+    using deleter        = ObjectDestroyShared<DebugUtilsMessengerEXT>;
   };
 
   using SharedDebugUtilsMessengerEXT = SharedHandle<DebugUtilsMessengerEXT>;
@@ -831,7 +796,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<AccelerationStructureKHR>;
+    using deleter        = ObjectDestroyShared<AccelerationStructureKHR>;
   };
 
   using SharedAccelerationStructureKHR = SharedHandle<AccelerationStructureKHR>;
@@ -842,7 +807,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<ValidationCacheEXT>;
+    using deleter        = ObjectDestroyShared<ValidationCacheEXT>;
   };
 
   using SharedValidationCacheEXT = SharedHandle<ValidationCacheEXT>;
@@ -853,7 +818,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<AccelerationStructureNV>;
+    using deleter        = ObjectDestroyShared<AccelerationStructureNV>;
   };
 
   using SharedAccelerationStructureNV = SharedHandle<AccelerationStructureNV>;
@@ -864,7 +829,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<PerformanceConfigurationINTEL>;
+    using deleter        = ObjectDestroyShared<PerformanceConfigurationINTEL>;
   };
 
   using SharedPerformanceConfigurationINTEL = SharedHandle<PerformanceConfigurationINTEL>;
@@ -875,7 +840,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<DeferredOperationKHR>;
+    using deleter        = ObjectDestroyShared<DeferredOperationKHR>;
   };
 
   using SharedDeferredOperationKHR = SharedHandle<DeferredOperationKHR>;
@@ -886,7 +851,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<IndirectCommandsLayoutNV>;
+    using deleter        = ObjectDestroyShared<IndirectCommandsLayoutNV>;
   };
 
   using SharedIndirectCommandsLayoutNV = SharedHandle<IndirectCommandsLayoutNV>;
@@ -898,7 +863,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<CudaModuleNV>;
+    using deleter        = ObjectDestroyShared<CudaModuleNV>;
   };
 
   using SharedCudaModuleNV = SharedHandle<CudaModuleNV>;
@@ -908,7 +873,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<CudaFunctionNV>;
+    using deleter        = ObjectDestroyShared<CudaFunctionNV>;
   };
 
   using SharedCudaFunctionNV = SharedHandle<CudaFunctionNV>;
@@ -921,7 +886,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<BufferCollectionFUCHSIA>;
+    using deleter        = ObjectDestroyShared<BufferCollectionFUCHSIA>;
   };
 
   using SharedBufferCollectionFUCHSIA = SharedHandle<BufferCollectionFUCHSIA>;
@@ -933,39 +898,18 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<MicromapEXT>;
+    using deleter        = ObjectDestroyShared<MicromapEXT>;
   };
 
   using SharedMicromapEXT = SharedHandle<MicromapEXT>;
 
-  //=== VK_ARM_tensors ===
-  template <>
-  class SharedHandleTraits<TensorARM>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<TensorARM>;
-  };
-
-  using SharedTensorARM = SharedHandle<TensorARM>;
-
-  template <>
-  class SharedHandleTraits<TensorViewARM>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<TensorViewARM>;
-  };
-
-  using SharedTensorViewARM = SharedHandle<TensorViewARM>;
-
   //=== VK_NV_optical_flow ===
   template <>
   class SharedHandleTraits<OpticalFlowSessionNV>
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<OpticalFlowSessionNV>;
+    using deleter        = ObjectDestroyShared<OpticalFlowSessionNV>;
   };
 
   using SharedOpticalFlowSessionNV = SharedHandle<OpticalFlowSessionNV>;
@@ -976,78 +920,25 @@ namespace VULKAN_HPP_NAMESPACE
   {
   public:
     using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<ShaderEXT>;
+    using deleter        = ObjectDestroyShared<ShaderEXT>;
   };
 
   using SharedShaderEXT = SharedHandle<ShaderEXT>;
 
-  //=== VK_KHR_pipeline_binary ===
-  template <>
-  class SharedHandleTraits<PipelineBinaryKHR>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<PipelineBinaryKHR>;
-  };
-
-  using SharedPipelineBinaryKHR = SharedHandle<PipelineBinaryKHR>;
-
-  //=== VK_ARM_data_graph ===
-  template <>
-  class SharedHandleTraits<DataGraphPipelineSessionARM>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<DataGraphPipelineSessionARM>;
-  };
-
-  using SharedDataGraphPipelineSessionARM = SharedHandle<DataGraphPipelineSessionARM>;
-
-  //=== VK_NV_external_compute_queue ===
-  template <>
-  class SharedHandleTraits<ExternalComputeQueueNV>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<ExternalComputeQueueNV>;
-  };
-
-  using SharedExternalComputeQueueNV = SharedHandle<ExternalComputeQueueNV>;
-
-  //=== VK_EXT_device_generated_commands ===
-  template <>
-  class SharedHandleTraits<IndirectCommandsLayoutEXT>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<IndirectCommandsLayoutEXT>;
-  };
-
-  using SharedIndirectCommandsLayoutEXT = SharedHandle<IndirectCommandsLayoutEXT>;
-
-  template <>
-  class SharedHandleTraits<IndirectExecutionSetEXT>
-  {
-  public:
-    using DestructorType = Device;
-    using deleter        = detail::ObjectDestroyShared<IndirectExecutionSetEXT>;
-  };
-
-  using SharedIndirectExecutionSetEXT = SharedHandle<IndirectExecutionSetEXT>;
-
-  // a number of SharedHandle specializations
   enum class SwapchainOwns
   {
     no,
     yes,
   };
 
-  struct ImageHeader : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>
+  struct ImageHeader : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>
   {
-    ImageHeader( SharedHandle<DestructorTypeOf<Image>>               parent,
-                 typename SharedHandleTraits<Image>::deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( typename SharedHandleTraits<Image>::deleter() ),
-                 SwapchainOwns                                       swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT
-      : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>( std::move( parent ), std::move( deleter ) )
+    ImageHeader(
+      SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>>       parent,
+      typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter deleter        = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter(),
+      SwapchainOwns                                                     swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT
+      : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>( std::move( parent ),
+                                                                                                                                        std::move( deleter ) )
       , swapchainOwned( swapchainOwned )
     {
     }
@@ -1056,25 +947,25 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
   template <>
-  class SharedHandle<Image> : public SharedHandleBase<Image, ImageHeader>
+  class SharedHandle<VULKAN_HPP_NAMESPACE::Image> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>
   {
-    using BaseType    = SharedHandleBase<Image, ImageHeader>;
-    using DeleterType = typename SharedHandleTraits<Image>::deleter;
+    using BaseType    = SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>;
+    using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter;
     friend BaseType;
 
   public:
     SharedHandle() = default;
 
-    explicit SharedHandle( Image                                 handle,
-                           SharedHandle<DestructorTypeOf<Image>> parent,
-                           SwapchainOwns swapchain_owned         VULKAN_HPP_DEFAULT_ASSIGNMENT( SwapchainOwns::no ),
-                           DeleterType deleter                   VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+    explicit SharedHandle( VULKAN_HPP_NAMESPACE::Image                                 handle,
+                           SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent,
+                           SwapchainOwns                                               swapchain_owned = SwapchainOwns::no,
+                           DeleterType                                                 deleter         = DeleterType() ) VULKAN_HPP_NOEXCEPT
       : BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned )
     {
     }
 
   protected:
-    static void internalDestroy( const ImageHeader & control, Image handle ) VULKAN_HPP_NOEXCEPT
+    static void internalDestroy( const ImageHeader & control, VULKAN_HPP_NAMESPACE::Image handle ) VULKAN_HPP_NOEXCEPT
     {
       if ( control.swapchainOwned == SwapchainOwns::no )
       {
@@ -1085,41 +976,41 @@ namespace VULKAN_HPP_NAMESPACE
 
   struct SwapchainHeader
   {
-    SwapchainHeader( SharedHandle<SurfaceKHR>                     surface,
-                     SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
-                     typename SharedHandleTraits<SwapchainKHR>::deleter deleter
-                       VULKAN_HPP_DEFAULT_ASSIGNMENT( typename SharedHandleTraits<SwapchainKHR>::deleter() ) ) VULKAN_HPP_NOEXCEPT
+    SwapchainHeader( SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                           surface,
+                     SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>>       parent,
+                     typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter =
+                       typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT
       : surface( std::move( surface ) )
       , parent( std::move( parent ) )
       , deleter( std::move( deleter ) )
     {
     }
 
-    SharedHandle<SurfaceKHR>                           surface;
-    SharedHandle<DestructorTypeOf<SwapchainKHR>>       parent;
-    typename SharedHandleTraits<SwapchainKHR>::deleter deleter;
+    SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                           surface{};
+    SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>>       parent{};
+    typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter{};
   };
 
   template <>
-  class SharedHandle<SwapchainKHR> : public SharedHandleBase<SwapchainKHR, SwapchainHeader>
+  class SharedHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>
   {
-    using BaseType    = SharedHandleBase<SwapchainKHR, SwapchainHeader>;
-    using DeleterType = typename SharedHandleTraits<SwapchainKHR>::deleter;
+    using BaseType    = SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>;
+    using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter;
     friend BaseType;
 
   public:
     SharedHandle() = default;
 
-    explicit SharedHandle( SwapchainKHR                                 handle,
-                           SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
-                           SharedHandle<SurfaceKHR>                     surface,
-                           DeleterType deleter                          VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+    explicit SharedHandle( VULKAN_HPP_NAMESPACE::SwapchainKHR                                 handle,
+                           SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent,
+                           SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                     surface,
+                           DeleterType                                                        deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
       : BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) )
     {
     }
 
   public:
-    const SharedHandle<SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
+    const SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
     {
       return getHeader().surface;
     }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_static_assertions.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_static_assertions.hpp
index 67c86a0b..693977cf 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_static_assertions.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_static_assertions.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -16,110 +16,6 @@
 
 //=== VK_VERSION_1_0 ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Instance ) == sizeof( VkInstance ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Instance>::value, "Instance is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Instance>::value, "Instance is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice ) == sizeof( VkPhysicalDevice ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice>::value, "PhysicalDevice is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice>::value,
-                          "PhysicalDevice is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Device ) == sizeof( VkDevice ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Device>::value, "Device is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Device>::value, "Device is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Queue ) == sizeof( VkQueue ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Queue>::value, "Queue is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Queue>::value, "Queue is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceMemory ) == sizeof( VkDeviceMemory ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DeviceMemory>::value, "DeviceMemory is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceMemory>::value, "DeviceMemory is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Fence ) == sizeof( VkFence ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Fence>::value, "Fence is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Fence>::value, "Fence is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Semaphore ) == sizeof( VkSemaphore ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Semaphore>::value, "Semaphore is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Semaphore>::value, "Semaphore is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueryPool ) == sizeof( VkQueryPool ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::QueryPool>::value, "QueryPool is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueryPool>::value, "QueryPool is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Buffer ) == sizeof( VkBuffer ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Buffer>::value, "Buffer is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Buffer>::value, "Buffer is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Image ) == sizeof( VkImage ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Image>::value, "Image is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Image>::value, "Image is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageView ) == sizeof( VkImageView ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::ImageView>::value, "ImageView is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageView>::value, "ImageView is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandPool ) == sizeof( VkCommandPool ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CommandPool>::value, "CommandPool is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandPool>::value, "CommandPool is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBuffer ) == sizeof( VkCommandBuffer ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CommandBuffer>::value, "CommandBuffer is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBuffer>::value, "CommandBuffer is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Event ) == sizeof( VkEvent ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Event>::value, "Event is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Event>::value, "Event is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferView ) == sizeof( VkBufferView ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::BufferView>::value, "BufferView is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferView>::value, "BufferView is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ShaderModule ) == sizeof( VkShaderModule ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::ShaderModule>::value, "ShaderModule is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderModule>::value, "ShaderModule is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCache ) == sizeof( VkPipelineCache ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PipelineCache>::value, "PipelineCache is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCache>::value, "PipelineCache is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Pipeline ) == sizeof( VkPipeline ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Pipeline>::value, "Pipeline is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Pipeline>::value, "Pipeline is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineLayout ) == sizeof( VkPipelineLayout ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PipelineLayout>::value, "PipelineLayout is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineLayout>::value,
-                          "PipelineLayout is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Sampler ) == sizeof( VkSampler ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Sampler>::value, "Sampler is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Sampler>::value, "Sampler is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPool ) == sizeof( VkDescriptorPool ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DescriptorPool>::value, "DescriptorPool is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPool>::value,
-                          "DescriptorPool is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSet ) == sizeof( VkDescriptorSet ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DescriptorSet>::value, "DescriptorSet is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSet>::value, "DescriptorSet is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayout ) == sizeof( VkDescriptorSetLayout ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>::value, "DescriptorSetLayout is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>::value,
-                          "DescriptorSetLayout is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Framebuffer ) == sizeof( VkFramebuffer ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::Framebuffer>::value, "Framebuffer is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Framebuffer>::value, "Framebuffer is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPass ) == sizeof( VkRenderPass ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::RenderPass>::value, "RenderPass is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPass>::value, "RenderPass is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Extent2D ) == sizeof( VkExtent2D ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Extent2D>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Extent2D>::value, "Extent2D is not nothrow_move_constructible!" );
@@ -155,6 +51,23 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferMe
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferMemoryBarrier>::value,
                           "BufferMemoryBarrier is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DispatchIndirectCommand ) == sizeof( VkDispatchIndirectCommand ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand>::value,
+                          "DispatchIndirectCommand is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand ) == sizeof( VkDrawIndexedIndirectCommand ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>::value,
+                          "DrawIndexedIndirectCommand is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DrawIndirectCommand ) == sizeof( VkDrawIndirectCommand ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DrawIndirectCommand>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DrawIndirectCommand>::value,
+                          "DrawIndirectCommand is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageMemoryBarrier ) == sizeof( VkImageMemoryBarrier ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier>::value,
@@ -164,6 +77,12 @@ VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryBarrier ) == sizeo
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryBarrier>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryBarrier>::value, "MemoryBarrier is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne ) == sizeof( VkPipelineCacheHeaderVersionOne ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>::value,
+                          "PipelineCacheHeaderVersionOne is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AllocationCallbacks ) == sizeof( VkAllocationCallbacks ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AllocationCallbacks>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AllocationCallbacks>::value,
@@ -185,6 +104,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageFor
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageFormatProperties>::value,
                           "ImageFormatProperties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Instance ) == sizeof( VkInstance ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Instance>::value, "Instance is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::InstanceCreateInfo ) == sizeof( VkInstanceCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::InstanceCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::InstanceCreateInfo>::value,
@@ -198,6 +120,10 @@ VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryType ) == sizeof(
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryType>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryType>::value, "MemoryType is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice ) == sizeof( VkPhysicalDevice ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice>::value,
+                          "PhysicalDevice is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures ) == sizeof( VkPhysicalDeviceFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures>::value, "struct wrapper is not a standard layout!" );
@@ -233,6 +159,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFam
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyProperties>::value,
                           "QueueFamilyProperties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Device ) == sizeof( VkDevice ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Device>::value, "Device is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceCreateInfo ) == sizeof( VkDeviceCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceCreateInfo>::value,
@@ -254,6 +183,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::LayerPro
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::LayerProperties>::value,
                           "LayerProperties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Queue ) == sizeof( VkQueue ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Queue>::value, "Queue is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubmitInfo ) == sizeof( VkSubmitInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubmitInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubmitInfo>::value, "SubmitInfo is not nothrow_move_constructible!" );
@@ -268,6 +200,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryAl
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryAllocateInfo>::value,
                           "MemoryAllocateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceMemory ) == sizeof( VkDeviceMemory ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceMemory>::value, "DeviceMemory is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryRequirements ) == sizeof( VkMemoryRequirements ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryRequirements>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryRequirements>::value,
@@ -324,26 +259,57 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SparseMe
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SparseMemoryBind>::value,
                           "SparseMemoryBind is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Fence ) == sizeof( VkFence ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Fence>::value, "Fence is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FenceCreateInfo ) == sizeof( VkFenceCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FenceCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FenceCreateInfo>::value,
                           "FenceCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Semaphore ) == sizeof( VkSemaphore ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Semaphore>::value, "Semaphore is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo ) == sizeof( VkSemaphoreCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo>::value,
                           "SemaphoreCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Event ) == sizeof( VkEvent ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Event>::value, "Event is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::EventCreateInfo ) == sizeof( VkEventCreateInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::EventCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::EventCreateInfo>::value,
+                          "EventCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueryPool ) == sizeof( VkQueryPool ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueryPool>::value, "QueryPool is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo ) == sizeof( VkQueryPoolCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo>::value,
                           "QueryPoolCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Buffer ) == sizeof( VkBuffer ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Buffer>::value, "Buffer is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferCreateInfo ) == sizeof( VkBufferCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferCreateInfo>::value,
                           "BufferCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferView ) == sizeof( VkBufferView ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferView>::value, "BufferView is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferViewCreateInfo ) == sizeof( VkBufferViewCreateInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo>::value,
+                          "BufferViewCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Image ) == sizeof( VkImage ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Image>::value, "Image is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageCreateInfo ) == sizeof( VkImageCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageCreateInfo>::value,
@@ -365,75 +331,16 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageSub
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageSubresourceRange>::value,
                           "ImageSubresourceRange is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageView ) == sizeof( VkImageView ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageView>::value, "ImageView is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageViewCreateInfo ) == sizeof( VkImageViewCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageViewCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageViewCreateInfo>::value,
                           "ImageViewCreateInfo is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo ) == sizeof( VkCommandPoolCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo>::value,
-                          "CommandPoolCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo ) == sizeof( VkCommandBufferAllocateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo>::value,
-                          "CommandBufferAllocateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo ) == sizeof( VkCommandBufferBeginInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo>::value,
-                          "CommandBufferBeginInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo ) == sizeof( VkCommandBufferInheritanceInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo>::value,
-                          "CommandBufferInheritanceInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferCopy ) == sizeof( VkBufferCopy ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferCopy>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferCopy>::value, "BufferCopy is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferImageCopy ) == sizeof( VkBufferImageCopy ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferImageCopy>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferImageCopy>::value,
-                          "BufferImageCopy is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageCopy ) == sizeof( VkImageCopy ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageCopy>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageCopy>::value, "ImageCopy is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers ) == sizeof( VkImageSubresourceLayers ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers>::value,
-                          "ImageSubresourceLayers is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DispatchIndirectCommand ) == sizeof( VkDispatchIndirectCommand ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand>::value,
-                          "DispatchIndirectCommand is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne ) == sizeof( VkPipelineCacheHeaderVersionOne ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne>::value,
-                          "PipelineCacheHeaderVersionOne is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::EventCreateInfo ) == sizeof( VkEventCreateInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::EventCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::EventCreateInfo>::value,
-                          "EventCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferViewCreateInfo ) == sizeof( VkBufferViewCreateInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo>::value,
-                          "BufferViewCreateInfo is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ShaderModule ) == sizeof( VkShaderModule ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderModule>::value, "ShaderModule is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo ) == sizeof( VkShaderModuleCreateInfo ),
                           "struct and wrapper have different size!" );
@@ -441,6 +348,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ShaderMo
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo>::value,
                           "ShaderModuleCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCache ) == sizeof( VkPipelineCache ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCache>::value, "PipelineCache is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo ) == sizeof( VkPipelineCacheCreateInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo>::value, "struct wrapper is not a standard layout!" );
@@ -453,110 +363,15 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ComputeP
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo>::value,
                           "ComputePipelineCreateInfo is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo ) == sizeof( VkPipelineShaderStageCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo>::value,
-                          "PipelineShaderStageCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SpecializationInfo ) == sizeof( VkSpecializationInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SpecializationInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SpecializationInfo>::value,
-                          "SpecializationInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SpecializationMapEntry ) == sizeof( VkSpecializationMapEntry ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SpecializationMapEntry>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SpecializationMapEntry>::value,
-                          "SpecializationMapEntry is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo ) == sizeof( VkPipelineLayoutCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>::value,
-                          "PipelineLayoutCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushConstantRange ) == sizeof( VkPushConstantRange ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushConstantRange>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushConstantRange>::value,
-                          "PushConstantRange is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerCreateInfo ) == sizeof( VkSamplerCreateInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerCreateInfo>::value,
-                          "SamplerCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyDescriptorSet ) == sizeof( VkCopyDescriptorSet ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyDescriptorSet>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyDescriptorSet>::value,
-                          "CopyDescriptorSet is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorBufferInfo ) == sizeof( VkDescriptorBufferInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo>::value,
-                          "DescriptorBufferInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorImageInfo ) == sizeof( VkDescriptorImageInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorImageInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorImageInfo>::value,
-                          "DescriptorImageInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo ) == sizeof( VkDescriptorPoolCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo>::value,
-                          "DescriptorPoolCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPoolSize ) == sizeof( VkDescriptorPoolSize ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>::value,
-                          "DescriptorPoolSize is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo ) == sizeof( VkDescriptorSetAllocateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo>::value,
-                          "DescriptorSetAllocateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding ) == sizeof( VkDescriptorSetLayoutBinding ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding>::value,
-                          "DescriptorSetLayoutBinding is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo ) == sizeof( VkDescriptorSetLayoutCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo>::value,
-                          "DescriptorSetLayoutCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteDescriptorSet ) == sizeof( VkWriteDescriptorSet ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteDescriptorSet>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteDescriptorSet>::value,
-                          "WriteDescriptorSet is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClearColorValue ) == sizeof( VkClearColorValue ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClearColorValue>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClearColorValue>::value,
-                          "ClearColorValue is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand ) == sizeof( VkDrawIndexedIndirectCommand ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand>::value,
-                          "DrawIndexedIndirectCommand is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DrawIndirectCommand ) == sizeof( VkDrawIndirectCommand ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DrawIndirectCommand>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DrawIndirectCommand>::value,
-                          "DrawIndirectCommand is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo ) == sizeof( VkGraphicsPipelineCreateInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo>::value,
                           "GraphicsPipelineCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Pipeline ) == sizeof( VkPipeline ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Pipeline>::value, "Pipeline is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState ) == sizeof( VkPipelineColorBlendAttachmentState ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState>::value, "struct wrapper is not a standard layout!" );
@@ -603,6 +418,12 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Pipeline
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo>::value,
                           "PipelineRasterizationStateCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo ) == sizeof( VkPipelineShaderStageCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo>::value,
+                          "PipelineShaderStageCreateInfo is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo ) == sizeof( VkPipelineTessellationStateCreateInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo>::value,
@@ -623,6 +444,17 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Pipeline
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo>::value,
                           "PipelineViewportStateCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SpecializationInfo ) == sizeof( VkSpecializationInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SpecializationInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SpecializationInfo>::value,
+                          "SpecializationInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SpecializationMapEntry ) == sizeof( VkSpecializationMapEntry ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SpecializationMapEntry>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SpecializationMapEntry>::value,
+                          "SpecializationMapEntry is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::StencilOpState ) == sizeof( VkStencilOpState ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::StencilOpState>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::StencilOpState>::value,
@@ -644,6 +476,89 @@ VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Viewport ) == sizeof( Vk
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Viewport>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Viewport>::value, "Viewport is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineLayout ) == sizeof( VkPipelineLayout ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineLayout>::value,
+                          "PipelineLayout is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo ) == sizeof( VkPipelineLayoutCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo>::value,
+                          "PipelineLayoutCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushConstantRange ) == sizeof( VkPushConstantRange ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushConstantRange>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushConstantRange>::value,
+                          "PushConstantRange is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Sampler ) == sizeof( VkSampler ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Sampler>::value, "Sampler is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerCreateInfo ) == sizeof( VkSamplerCreateInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerCreateInfo>::value,
+                          "SamplerCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyDescriptorSet ) == sizeof( VkCopyDescriptorSet ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyDescriptorSet>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyDescriptorSet>::value,
+                          "CopyDescriptorSet is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorBufferInfo ) == sizeof( VkDescriptorBufferInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo>::value,
+                          "DescriptorBufferInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorImageInfo ) == sizeof( VkDescriptorImageInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorImageInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorImageInfo>::value,
+                          "DescriptorImageInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPool ) == sizeof( VkDescriptorPool ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPool>::value,
+                          "DescriptorPool is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo ) == sizeof( VkDescriptorPoolCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo>::value,
+                          "DescriptorPoolCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorPoolSize ) == sizeof( VkDescriptorPoolSize ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPoolSize>::value,
+                          "DescriptorPoolSize is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSet ) == sizeof( VkDescriptorSet ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSet>::value, "DescriptorSet is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo ) == sizeof( VkDescriptorSetAllocateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo>::value,
+                          "DescriptorSetAllocateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayout ) == sizeof( VkDescriptorSetLayout ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayout>::value,
+                          "DescriptorSetLayout is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding ) == sizeof( VkDescriptorSetLayoutBinding ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding>::value,
+                          "DescriptorSetLayoutBinding is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo ) == sizeof( VkDescriptorSetLayoutCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo>::value,
+                          "DescriptorSetLayoutCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteDescriptorSet ) == sizeof( VkWriteDescriptorSet ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteDescriptorSet>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteDescriptorSet>::value,
+                          "WriteDescriptorSet is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentDescription ) == sizeof( VkAttachmentDescription ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentDescription>::value, "struct wrapper is not a standard layout!" );
@@ -655,12 +570,18 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Attachme
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentReference>::value,
                           "AttachmentReference is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::Framebuffer ) == sizeof( VkFramebuffer ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::Framebuffer>::value, "Framebuffer is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FramebufferCreateInfo ) == sizeof( VkFramebufferCreateInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FramebufferCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FramebufferCreateInfo>::value,
                           "FramebufferCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPass ) == sizeof( VkRenderPass ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPass>::value, "RenderPass is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo ) == sizeof( VkRenderPassCreateInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo>::value,
@@ -676,11 +597,55 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassD
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDescription>::value,
                           "SubpassDescription is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandPool ) == sizeof( VkCommandPool ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandPool>::value, "CommandPool is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo ) == sizeof( VkCommandPoolCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo>::value,
+                          "CommandPoolCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBuffer ) == sizeof( VkCommandBuffer ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBuffer>::value, "CommandBuffer is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo ) == sizeof( VkCommandBufferAllocateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo>::value,
+                          "CommandBufferAllocateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo ) == sizeof( VkCommandBufferBeginInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo>::value,
+                          "CommandBufferBeginInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo ) == sizeof( VkCommandBufferInheritanceInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo>::value,
+                          "CommandBufferInheritanceInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferCopy ) == sizeof( VkBufferCopy ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferCopy>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferCopy>::value, "BufferCopy is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferImageCopy ) == sizeof( VkBufferImageCopy ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferImageCopy>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferImageCopy>::value,
+                          "BufferImageCopy is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClearAttachment ) == sizeof( VkClearAttachment ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClearAttachment>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClearAttachment>::value,
                           "ClearAttachment is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClearColorValue ) == sizeof( VkClearColorValue ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClearColorValue>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClearColorValue>::value,
+                          "ClearColorValue is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClearDepthStencilValue ) == sizeof( VkClearDepthStencilValue ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClearDepthStencilValue>::value, "struct wrapper is not a standard layout!" );
@@ -699,10 +664,20 @@ VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageBlit ) == sizeof( V
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageBlit>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageBlit>::value, "ImageBlit is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageCopy ) == sizeof( VkImageCopy ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageCopy>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageCopy>::value, "ImageCopy is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageResolve ) == sizeof( VkImageResolve ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageResolve>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageResolve>::value, "ImageResolve is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers ) == sizeof( VkImageSubresourceLayers ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers>::value,
+                          "ImageSubresourceLayers is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassBeginInfo ) == sizeof( VkRenderPassBeginInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassBeginInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassBeginInfo>::value,
@@ -710,19 +685,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_VERSION_1_1 ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate ) == sizeof( VkDescriptorUpdateTemplate ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::value,
-                          "DescriptorUpdateTemplate is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::value,
-                          "DescriptorUpdateTemplate is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ) == sizeof( VkSamplerYcbcrConversion ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::value,
-                          "SamplerYcbcrConversion is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::value,
-                          "SamplerYcbcrConversion is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties ) == sizeof( VkPhysicalDeviceSubgroupProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties>::value,
+                          "PhysicalDeviceSubgroupProperties is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo ) == sizeof( VkBindBufferMemoryInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo>::value, "struct wrapper is not a standard layout!" );
@@ -734,6 +701,13 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindImag
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindImageMemoryInfo>::value,
                           "BindImageMemoryInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures ) == sizeof( VkPhysicalDevice16BitStorageFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures>::value,
+                          "PhysicalDevice16BitStorageFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryDedicatedRequirements ) == sizeof( VkMemoryDedicatedRequirements ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryDedicatedRequirements>::value, "struct wrapper is not a standard layout!" );
@@ -752,6 +726,12 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryAl
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsInfo>::value,
                           "MemoryAllocateFlagsInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo ) == sizeof( VkDeviceGroupRenderPassBeginInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo>::value,
+                          "DeviceGroupRenderPassBeginInfo is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceGroupCommandBufferBeginInfo ) == sizeof( VkDeviceGroupCommandBufferBeginInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceGroupCommandBufferBeginInfo>::value, "struct wrapper is not a standard layout!" );
@@ -878,12 +858,65 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2>::value,
                           "PhysicalDeviceSparseImageFormatInfo2 is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties ) == sizeof( VkPhysicalDevicePointClippingProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties>::value,
+                          "PhysicalDevicePointClippingProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo ) == sizeof( VkRenderPassInputAttachmentAspectCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>::value,
+                          "RenderPassInputAttachmentAspectCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference ) == sizeof( VkInputAttachmentAspectReference ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference>::value,
+                          "InputAttachmentAspectReference is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageViewUsageCreateInfo ) == sizeof( VkImageViewUsageCreateInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageViewUsageCreateInfo>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageViewUsageCreateInfo>::value,
                           "ImageViewUsageCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo ) ==
+                            sizeof( VkPipelineTessellationDomainOriginStateCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo>::value,
+                          "PipelineTessellationDomainOriginStateCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo ) == sizeof( VkRenderPassMultiviewCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo>::value,
+                          "RenderPassMultiviewCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures ) == sizeof( VkPhysicalDeviceMultiviewFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures>::value,
+                          "PhysicalDeviceMultiviewFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties ) == sizeof( VkPhysicalDeviceMultiviewProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>::value,
+                          "PhysicalDeviceMultiviewProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures ) == sizeof( VkPhysicalDeviceVariablePointersFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures>::value,
+                          "PhysicalDeviceVariablePointersFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryFeatures ) == sizeof( VkPhysicalDeviceProtectedMemoryFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryFeatures>::value,
@@ -908,6 +941,18 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Protecte
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ProtectedSubmitInfo>::value,
                           "ProtectedSubmitInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo ) == sizeof( VkSamplerYcbcrConversionCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo>::value,
+                          "SamplerYcbcrConversionCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo ) == sizeof( VkSamplerYcbcrConversionInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo>::value,
+                          "SamplerYcbcrConversionInfo is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindImagePlaneMemoryInfo ) == sizeof( VkBindImagePlaneMemoryInfo ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindImagePlaneMemoryInfo>::value, "struct wrapper is not a standard layout!" );
@@ -920,6 +965,45 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImagePla
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImagePlaneMemoryRequirementsInfo>::value,
                           "ImagePlaneMemoryRequirementsInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures ) ==
+                            sizeof( VkPhysicalDeviceSamplerYcbcrConversionFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures>::value,
+                          "PhysicalDeviceSamplerYcbcrConversionFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties ) ==
+                            sizeof( VkSamplerYcbcrConversionImageFormatProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties>::value,
+                          "SamplerYcbcrConversionImageFormatProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion ) == sizeof( VkSamplerYcbcrConversion ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion>::value,
+                          "SamplerYcbcrConversion is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate ) == sizeof( VkDescriptorUpdateTemplate ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate>::value,
+                          "DescriptorUpdateTemplate is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry ) == sizeof( VkDescriptorUpdateTemplateEntry ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry>::value,
+                          "DescriptorUpdateTemplateEntry is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo ) == sizeof( VkDescriptorUpdateTemplateCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo>::value,
+                          "DescriptorUpdateTemplateCreateInfo is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalMemoryProperties ) == sizeof( VkExternalMemoryProperties ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalMemoryProperties>::value, "struct wrapper is not a standard layout!" );
@@ -1012,39 +1096,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::External
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties>::value,
                           "ExternalSemaphoreProperties is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties ) == sizeof( VkPhysicalDeviceSubgroupProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties>::value,
-                          "PhysicalDeviceSubgroupProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures ) == sizeof( VkPhysicalDevice16BitStorageFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures>::value,
-                          "PhysicalDevice16BitStorageFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures ) == sizeof( VkPhysicalDeviceVariablePointersFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures>::value,
-                          "PhysicalDeviceVariablePointersFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry ) == sizeof( VkDescriptorUpdateTemplateEntry ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry>::value,
-                          "DescriptorUpdateTemplateEntry is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo ) == sizeof( VkDescriptorUpdateTemplateCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo>::value,
-                          "DescriptorUpdateTemplateCreateInfo is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance3Properties ) == sizeof( VkPhysicalDeviceMaintenance3Properties ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance3Properties>::value,
@@ -1058,86 +1109,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Descript
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport>::value,
                           "DescriptorSetLayoutSupport is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo ) == sizeof( VkSamplerYcbcrConversionCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo>::value,
-                          "SamplerYcbcrConversionCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo ) == sizeof( VkSamplerYcbcrConversionInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo>::value,
-                          "SamplerYcbcrConversionInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures ) ==
-                            sizeof( VkPhysicalDeviceSamplerYcbcrConversionFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures>::value,
-                          "PhysicalDeviceSamplerYcbcrConversionFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties ) ==
-                            sizeof( VkSamplerYcbcrConversionImageFormatProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties>::value,
-                          "SamplerYcbcrConversionImageFormatProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo ) == sizeof( VkDeviceGroupRenderPassBeginInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo>::value,
-                          "DeviceGroupRenderPassBeginInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties ) == sizeof( VkPhysicalDevicePointClippingProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties>::value,
-                          "PhysicalDevicePointClippingProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo ) == sizeof( VkRenderPassInputAttachmentAspectCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo>::value,
-                          "RenderPassInputAttachmentAspectCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference ) == sizeof( VkInputAttachmentAspectReference ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference>::value,
-                          "InputAttachmentAspectReference is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo ) ==
-                            sizeof( VkPipelineTessellationDomainOriginStateCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo>::value,
-                          "PipelineTessellationDomainOriginStateCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo ) == sizeof( VkRenderPassMultiviewCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo>::value,
-                          "RenderPassMultiviewCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures ) == sizeof( VkPhysicalDeviceMultiviewFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures>::value,
-                          "PhysicalDeviceMultiviewFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties ) == sizeof( VkPhysicalDeviceMultiviewProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties>::value,
-                          "PhysicalDeviceMultiviewProperties is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDrawParametersFeatures ) == sizeof( VkPhysicalDeviceShaderDrawParametersFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDrawParametersFeatures>::value,
@@ -1177,6 +1148,49 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageFor
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageFormatListCreateInfo>::value,
                           "ImageFormatListCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 ) == sizeof( VkRenderPassCreateInfo2 ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2>::value,
+                          "RenderPassCreateInfo2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentDescription2 ) == sizeof( VkAttachmentDescription2 ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentDescription2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentDescription2>::value,
+                          "AttachmentDescription2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentReference2 ) == sizeof( VkAttachmentReference2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentReference2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentReference2>::value,
+                          "AttachmentReference2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDescription2 ) == sizeof( VkSubpassDescription2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDescription2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDescription2>::value,
+                          "SubpassDescription2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDependency2 ) == sizeof( VkSubpassDependency2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDependency2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDependency2>::value,
+                          "SubpassDependency2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassBeginInfo ) == sizeof( VkSubpassBeginInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassBeginInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassBeginInfo>::value,
+                          "SubpassBeginInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassEndInfo ) == sizeof( VkSubpassEndInfo ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassEndInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassEndInfo>::value,
+                          "SubpassEndInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures ) == sizeof( VkPhysicalDevice8BitStorageFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures>::value,
+                          "PhysicalDevice8BitStorageFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ConformanceVersion ) == sizeof( VkConformanceVersion ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ConformanceVersion>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ConformanceVersion>::value,
@@ -1188,6 +1202,106 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDriverProperties>::value,
                           "PhysicalDeviceDriverProperties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features ) == sizeof( VkPhysicalDeviceShaderAtomicInt64Features ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features>::value,
+                          "PhysicalDeviceShaderAtomicInt64Features is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features ) == sizeof( VkPhysicalDeviceShaderFloat16Int8Features ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features>::value,
+                          "PhysicalDeviceShaderFloat16Int8Features is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties ) == sizeof( VkPhysicalDeviceFloatControlsProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties>::value,
+                          "PhysicalDeviceFloatControlsProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo ) == sizeof( VkDescriptorSetLayoutBindingFlagsCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo>::value,
+                          "DescriptorSetLayoutBindingFlagsCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures ) == sizeof( VkPhysicalDeviceDescriptorIndexingFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>::value,
+                          "PhysicalDeviceDescriptorIndexingFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties ) == sizeof( VkPhysicalDeviceDescriptorIndexingProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties>::value,
+                          "PhysicalDeviceDescriptorIndexingProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo ) ==
+                            sizeof( VkDescriptorSetVariableDescriptorCountAllocateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo>::value,
+                          "DescriptorSetVariableDescriptorCountAllocateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport ) ==
+                            sizeof( VkDescriptorSetVariableDescriptorCountLayoutSupport ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport>::value,
+                          "DescriptorSetVariableDescriptorCountLayoutSupport is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve ) == sizeof( VkSubpassDescriptionDepthStencilResolve ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve>::value,
+                          "SubpassDescriptionDepthStencilResolve is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties ) ==
+                            sizeof( VkPhysicalDeviceDepthStencilResolveProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties>::value,
+                          "PhysicalDeviceDepthStencilResolveProperties is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures ) == sizeof( VkPhysicalDeviceScalarBlockLayoutFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures>::value,
+                          "PhysicalDeviceScalarBlockLayoutFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo ) == sizeof( VkImageStencilUsageCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo>::value,
+                          "ImageStencilUsageCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo ) == sizeof( VkSamplerReductionModeCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo>::value,
+                          "SamplerReductionModeCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties ) ==
+                            sizeof( VkPhysicalDeviceSamplerFilterMinmaxProperties ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties>::value,
+                          "PhysicalDeviceSamplerFilterMinmaxProperties is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures ) == sizeof( VkPhysicalDeviceVulkanMemoryModelFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures>::value,
@@ -1195,6 +1309,68 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures>::value,
                           "PhysicalDeviceVulkanMemoryModelFeatures is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures ) == sizeof( VkPhysicalDeviceImagelessFramebufferFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures>::value,
+                          "PhysicalDeviceImagelessFramebufferFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo ) == sizeof( VkFramebufferAttachmentsCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo>::value,
+                          "FramebufferAttachmentsCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo ) == sizeof( VkFramebufferAttachmentImageInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>::value,
+                          "FramebufferAttachmentImageInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo ) == sizeof( VkRenderPassAttachmentBeginInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo>::value,
+                          "RenderPassAttachmentBeginInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures ) ==
+                            sizeof( VkPhysicalDeviceUniformBufferStandardLayoutFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>::value,
+                          "PhysicalDeviceUniformBufferStandardLayoutFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures ) ==
+                            sizeof( VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures>::value,
+                          "PhysicalDeviceShaderSubgroupExtendedTypesFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures ) ==
+                            sizeof( VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures>::value,
+                          "PhysicalDeviceSeparateDepthStencilLayoutsFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout ) == sizeof( VkAttachmentReferenceStencilLayout ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout>::value,
+                          "AttachmentReferenceStencilLayout is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout ) == sizeof( VkAttachmentDescriptionStencilLayout ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout>::value,
+                          "AttachmentDescriptionStencilLayout is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostQueryResetFeatures ) == sizeof( VkPhysicalDeviceHostQueryResetFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostQueryResetFeatures>::value,
@@ -1272,218 +1448,8 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceMe
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo>::value,
                           "DeviceMemoryOpaqueCaptureAddressInfo is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures ) == sizeof( VkPhysicalDevice8BitStorageFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures>::value,
-                          "PhysicalDevice8BitStorageFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features ) == sizeof( VkPhysicalDeviceShaderAtomicInt64Features ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features>::value,
-                          "PhysicalDeviceShaderAtomicInt64Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features ) == sizeof( VkPhysicalDeviceShaderFloat16Int8Features ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features>::value,
-                          "PhysicalDeviceShaderFloat16Int8Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties ) == sizeof( VkPhysicalDeviceFloatControlsProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties>::value,
-                          "PhysicalDeviceFloatControlsProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo ) == sizeof( VkDescriptorSetLayoutBindingFlagsCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo>::value,
-                          "DescriptorSetLayoutBindingFlagsCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures ) == sizeof( VkPhysicalDeviceDescriptorIndexingFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures>::value,
-                          "PhysicalDeviceDescriptorIndexingFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties ) == sizeof( VkPhysicalDeviceDescriptorIndexingProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties>::value,
-                          "PhysicalDeviceDescriptorIndexingProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo ) ==
-                            sizeof( VkDescriptorSetVariableDescriptorCountAllocateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo>::value,
-                          "DescriptorSetVariableDescriptorCountAllocateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport ) ==
-                            sizeof( VkDescriptorSetVariableDescriptorCountLayoutSupport ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport>::value,
-                          "DescriptorSetVariableDescriptorCountLayoutSupport is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures ) == sizeof( VkPhysicalDeviceScalarBlockLayoutFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures>::value,
-                          "PhysicalDeviceScalarBlockLayoutFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo ) == sizeof( VkSamplerReductionModeCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo>::value,
-                          "SamplerReductionModeCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties ) ==
-                            sizeof( VkPhysicalDeviceSamplerFilterMinmaxProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties>::value,
-                          "PhysicalDeviceSamplerFilterMinmaxProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures ) ==
-                            sizeof( VkPhysicalDeviceUniformBufferStandardLayoutFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures>::value,
-                          "PhysicalDeviceUniformBufferStandardLayoutFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures ) ==
-                            sizeof( VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures>::value,
-                          "PhysicalDeviceShaderSubgroupExtendedTypesFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 ) == sizeof( VkRenderPassCreateInfo2 ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2>::value,
-                          "RenderPassCreateInfo2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentDescription2 ) == sizeof( VkAttachmentDescription2 ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentDescription2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentDescription2>::value,
-                          "AttachmentDescription2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentReference2 ) == sizeof( VkAttachmentReference2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentReference2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentReference2>::value,
-                          "AttachmentReference2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDescription2 ) == sizeof( VkSubpassDescription2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDescription2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDescription2>::value,
-                          "SubpassDescription2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDependency2 ) == sizeof( VkSubpassDependency2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDependency2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDependency2>::value,
-                          "SubpassDependency2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassBeginInfo ) == sizeof( VkSubpassBeginInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassBeginInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassBeginInfo>::value,
-                          "SubpassBeginInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassEndInfo ) == sizeof( VkSubpassEndInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassEndInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassEndInfo>::value,
-                          "SubpassEndInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve ) == sizeof( VkSubpassDescriptionDepthStencilResolve ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve>::value,
-                          "SubpassDescriptionDepthStencilResolve is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties ) ==
-                            sizeof( VkPhysicalDeviceDepthStencilResolveProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties>::value,
-                          "PhysicalDeviceDepthStencilResolveProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo ) == sizeof( VkImageStencilUsageCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo>::value,
-                          "ImageStencilUsageCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures ) == sizeof( VkPhysicalDeviceImagelessFramebufferFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures>::value,
-                          "PhysicalDeviceImagelessFramebufferFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo ) == sizeof( VkFramebufferAttachmentsCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo>::value,
-                          "FramebufferAttachmentsCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo ) == sizeof( VkFramebufferAttachmentImageInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo>::value,
-                          "FramebufferAttachmentImageInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo ) == sizeof( VkRenderPassAttachmentBeginInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo>::value,
-                          "RenderPassAttachmentBeginInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures ) ==
-                            sizeof( VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures>::value,
-                          "PhysicalDeviceSeparateDepthStencilLayoutsFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout ) == sizeof( VkAttachmentReferenceStencilLayout ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout>::value,
-                          "AttachmentReferenceStencilLayout is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout ) == sizeof( VkAttachmentDescriptionStencilLayout ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout>::value,
-                          "AttachmentDescriptionStencilLayout is not nothrow_move_constructible!" );
-
 //=== VK_VERSION_1_3 ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PrivateDataSlot ) == sizeof( VkPrivateDataSlot ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::value, "PrivateDataSlot is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::value,
-                          "PrivateDataSlot is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Features ) == sizeof( VkPhysicalDeviceVulkan13Features ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Features>::value, "struct wrapper is not a standard layout!" );
@@ -1496,12 +1462,41 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Properties>::value,
                           "PhysicalDeviceVulkan13Properties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo ) == sizeof( VkPipelineCreationFeedbackCreateInfo ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo>::value,
+                          "PipelineCreationFeedbackCreateInfo is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreationFeedback ) == sizeof( VkPipelineCreationFeedback ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback>::value,
+                          "PipelineCreationFeedback is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures ) ==
+                            sizeof( VkPhysicalDeviceShaderTerminateInvocationFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures>::value,
+                          "PhysicalDeviceShaderTerminateInvocationFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties ) == sizeof( VkPhysicalDeviceToolProperties ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties>::value,
                           "PhysicalDeviceToolProperties is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures ) ==
+                            sizeof( VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures>::value,
+                          "PhysicalDeviceShaderDemoteToHelperInvocationFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePrivateDataFeatures ) == sizeof( VkPhysicalDevicePrivateDataFeatures ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePrivateDataFeatures>::value, "struct wrapper is not a standard layout!" );
@@ -1520,6 +1515,18 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PrivateD
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo>::value,
                           "PrivateDataSlotCreateInfo is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PrivateDataSlot ) == sizeof( VkPrivateDataSlot ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PrivateDataSlot>::value,
+                          "PrivateDataSlot is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures ) ==
+                            sizeof( VkPhysicalDevicePipelineCreationCacheControlFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>::value,
+                          "PhysicalDevicePipelineCreationCacheControlFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryBarrier2 ) == sizeof( VkMemoryBarrier2 ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryBarrier2>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryBarrier2>::value,
@@ -1562,6 +1569,21 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSynchronization2Features>::value,
                           "PhysicalDeviceSynchronization2Features is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures ) ==
+                            sizeof( VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>::value,
+                          "PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures ) == sizeof( VkPhysicalDeviceImageRobustnessFeatures ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures>::value,
+                          "PhysicalDeviceImageRobustnessFeatures is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyBufferInfo2 ) == sizeof( VkCopyBufferInfo2 ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyBufferInfo2>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyBufferInfo2>::value,
@@ -1584,6 +1606,16 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyImag
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2>::value,
                           "CopyImageToBufferInfo2 is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BlitImageInfo2 ) == sizeof( VkBlitImageInfo2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BlitImageInfo2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BlitImageInfo2>::value,
+                          "BlitImageInfo2 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ResolveImageInfo2 ) == sizeof( VkResolveImageInfo2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ResolveImageInfo2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ResolveImageInfo2>::value,
+                          "ResolveImageInfo2 is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferCopy2 ) == sizeof( VkBufferCopy2 ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferCopy2>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferCopy2>::value, "BufferCopy2 is not nothrow_move_constructible!" );
@@ -1592,101 +1624,18 @@ VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageCopy2 ) == sizeof(
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageCopy2>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageCopy2>::value, "ImageCopy2 is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageBlit2 ) == sizeof( VkImageBlit2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageBlit2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageBlit2>::value, "ImageBlit2 is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferImageCopy2 ) == sizeof( VkBufferImageCopy2 ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferImageCopy2>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferImageCopy2>::value,
                           "BufferImageCopy2 is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures ) ==
-                            sizeof( VkPhysicalDeviceTextureCompressionASTCHDRFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures>::value,
-                          "PhysicalDeviceTextureCompressionASTCHDRFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FormatProperties3 ) == sizeof( VkFormatProperties3 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FormatProperties3>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FormatProperties3>::value,
-                          "FormatProperties3 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features ) == sizeof( VkPhysicalDeviceMaintenance4Features ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features>::value,
-                          "PhysicalDeviceMaintenance4Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties ) == sizeof( VkPhysicalDeviceMaintenance4Properties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties>::value,
-                          "PhysicalDeviceMaintenance4Properties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements ) == sizeof( VkDeviceBufferMemoryRequirements ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements>::value,
-                          "DeviceBufferMemoryRequirements is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements ) == sizeof( VkDeviceImageMemoryRequirements ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements>::value,
-                          "DeviceImageMemoryRequirements is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo ) == sizeof( VkPipelineCreationFeedbackCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo>::value,
-                          "PipelineCreationFeedbackCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreationFeedback ) == sizeof( VkPipelineCreationFeedback ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback>::value,
-                          "PipelineCreationFeedback is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures ) ==
-                            sizeof( VkPhysicalDeviceShaderTerminateInvocationFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures>::value,
-                          "PhysicalDeviceShaderTerminateInvocationFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures ) ==
-                            sizeof( VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures>::value,
-                          "PhysicalDeviceShaderDemoteToHelperInvocationFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures ) ==
-                            sizeof( VkPhysicalDevicePipelineCreationCacheControlFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures>::value,
-                          "PhysicalDevicePipelineCreationCacheControlFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures ) ==
-                            sizeof( VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>::value,
-                          "PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures ) == sizeof( VkPhysicalDeviceImageRobustnessFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures>::value,
-                          "PhysicalDeviceImageRobustnessFeatures is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageResolve2 ) == sizeof( VkImageResolve2 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageResolve2>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageResolve2>::value, "ImageResolve2 is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupSizeControlFeatures ) == sizeof( VkPhysicalDeviceSubgroupSizeControlFeatures ),
                           "struct and wrapper have different size!" );
@@ -1739,47 +1688,13 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Descript
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorPoolInlineUniformBlockCreateInfo>::value,
                           "DescriptorPoolInlineUniformBlockCreateInfo is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures ) ==
-                            sizeof( VkPhysicalDeviceShaderIntegerDotProductFeatures ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures ) ==
+                            sizeof( VkPhysicalDeviceTextureCompressionASTCHDRFeatures ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures>::value,
-                          "PhysicalDeviceShaderIntegerDotProductFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties ) ==
-                            sizeof( VkPhysicalDeviceShaderIntegerDotProductProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties>::value,
-                          "PhysicalDeviceShaderIntegerDotProductProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties ) ==
-                            sizeof( VkPhysicalDeviceTexelBufferAlignmentProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties>::value,
-                          "PhysicalDeviceTexelBufferAlignmentProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BlitImageInfo2 ) == sizeof( VkBlitImageInfo2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BlitImageInfo2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BlitImageInfo2>::value,
-                          "BlitImageInfo2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageBlit2 ) == sizeof( VkImageBlit2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageBlit2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageBlit2>::value, "ImageBlit2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ResolveImageInfo2 ) == sizeof( VkResolveImageInfo2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ResolveImageInfo2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ResolveImageInfo2>::value,
-                          "ResolveImageInfo2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageResolve2 ) == sizeof( VkImageResolve2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageResolve2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageResolve2>::value, "ImageResolve2 is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures>::value,
+                          "PhysicalDeviceTextureCompressionASTCHDRFeatures is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingInfo ) == sizeof( VkRenderingInfo ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingInfo>::value, "struct wrapper is not a standard layout!" );
@@ -1811,337 +1726,64 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CommandB
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceRenderingInfo>::value,
                           "CommandBufferInheritanceRenderingInfo is not nothrow_move_constructible!" );
 
-//=== VK_VERSION_1_4 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features ) == sizeof( VkPhysicalDeviceVulkan14Features ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures ) ==
+                            sizeof( VkPhysicalDeviceShaderIntegerDotProductFeatures ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Features>::value,
-                          "PhysicalDeviceVulkan14Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties ) == sizeof( VkPhysicalDeviceVulkan14Properties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan14Properties>::value,
-                          "PhysicalDeviceVulkan14Properties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo ) == sizeof( VkDeviceQueueGlobalPriorityCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfo>::value,
-                          "DeviceQueueGlobalPriorityCreateInfo is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures>::value,
+                          "PhysicalDeviceShaderIntegerDotProductFeatures is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures ) == sizeof( VkPhysicalDeviceGlobalPriorityQueryFeatures ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties ) ==
+                            sizeof( VkPhysicalDeviceShaderIntegerDotProductProperties ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeatures>::value,
-                          "PhysicalDeviceGlobalPriorityQueryFeatures is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties>::value,
+                          "PhysicalDeviceShaderIntegerDotProductProperties is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties ) == sizeof( VkQueueFamilyGlobalPriorityProperties ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties ) ==
+                            sizeof( VkPhysicalDeviceTexelBufferAlignmentProperties ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityProperties>::value,
-                          "QueueFamilyGlobalPriorityProperties is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties>::value,
+                          "PhysicalDeviceTexelBufferAlignmentProperties is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features ) == sizeof( VkPhysicalDeviceIndexTypeUint8Features ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FormatProperties3 ) == sizeof( VkFormatProperties3 ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FormatProperties3>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FormatProperties3>::value,
+                          "FormatProperties3 is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features ) == sizeof( VkPhysicalDeviceMaintenance4Features ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8Features>::value,
-                          "PhysicalDeviceIndexTypeUint8Features is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features>::value,
+                          "PhysicalDeviceMaintenance4Features is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryMapInfo ) == sizeof( VkMemoryMapInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryMapInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryMapInfo>::value, "MemoryMapInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryUnmapInfo ) == sizeof( VkMemoryUnmapInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryUnmapInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryUnmapInfo>::value,
-                          "MemoryUnmapInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features ) == sizeof( VkPhysicalDeviceMaintenance5Features ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties ) == sizeof( VkPhysicalDeviceMaintenance4Properties ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Features>::value,
-                          "PhysicalDeviceMaintenance5Features is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties>::value,
+                          "PhysicalDeviceMaintenance4Properties is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties ) == sizeof( VkPhysicalDeviceMaintenance5Properties ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements ) == sizeof( VkDeviceBufferMemoryRequirements ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5Properties>::value,
-                          "PhysicalDeviceMaintenance5Properties is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements>::value,
+                          "DeviceBufferMemoryRequirements is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo ) == sizeof( VkDeviceImageSubresourceInfo ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements ) == sizeof( VkDeviceImageMemoryRequirements ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfo>::value,
-                          "DeviceImageSubresourceInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageSubresource2 ) == sizeof( VkImageSubresource2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageSubresource2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageSubresource2>::value,
-                          "ImageSubresource2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubresourceLayout2 ) == sizeof( VkSubresourceLayout2 ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubresourceLayout2>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubresourceLayout2>::value,
-                          "SubresourceLayout2 is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo ) == sizeof( VkBufferUsageFlags2CreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfo>::value,
-                          "BufferUsageFlags2CreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features ) == sizeof( VkPhysicalDeviceMaintenance6Features ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Features>::value,
-                          "PhysicalDeviceMaintenance6Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties ) == sizeof( VkPhysicalDeviceMaintenance6Properties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6Properties>::value,
-                          "PhysicalDeviceMaintenance6Properties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindMemoryStatus ) == sizeof( VkBindMemoryStatus ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindMemoryStatus>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindMemoryStatus>::value,
-                          "BindMemoryStatus is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures ) == sizeof( VkPhysicalDeviceHostImageCopyFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeatures>::value,
-                          "PhysicalDeviceHostImageCopyFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties ) == sizeof( VkPhysicalDeviceHostImageCopyProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyProperties>::value,
-                          "PhysicalDeviceHostImageCopyProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryToImageCopy ) == sizeof( VkMemoryToImageCopy ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryToImageCopy>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryToImageCopy>::value,
-                          "MemoryToImageCopy is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageToMemoryCopy ) == sizeof( VkImageToMemoryCopy ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageToMemoryCopy>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageToMemoryCopy>::value,
-                          "ImageToMemoryCopy is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo ) == sizeof( VkCopyMemoryToImageInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfo>::value,
-                          "CopyMemoryToImageInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo ) == sizeof( VkCopyImageToMemoryInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfo>::value,
-                          "CopyImageToMemoryInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyImageToImageInfo ) == sizeof( VkCopyImageToImageInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyImageToImageInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyImageToImageInfo>::value,
-                          "CopyImageToImageInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo ) == sizeof( VkHostImageLayoutTransitionInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfo>::value,
-                          "HostImageLayoutTransitionInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize ) == sizeof( VkSubresourceHostMemcpySize ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySize>::value,
-                          "SubresourceHostMemcpySize is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery ) == sizeof( VkHostImageCopyDevicePerformanceQuery ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQuery>::value,
-                          "HostImageCopyDevicePerformanceQuery is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures ) == sizeof( VkPhysicalDeviceShaderSubgroupRotateFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeatures>::value,
-                          "PhysicalDeviceShaderSubgroupRotateFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features ) == sizeof( VkPhysicalDeviceShaderFloatControls2Features ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2Features>::value,
-                          "PhysicalDeviceShaderFloatControls2Features is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures ) == sizeof( VkPhysicalDeviceShaderExpectAssumeFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeatures>::value,
-                          "PhysicalDeviceShaderExpectAssumeFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo ) == sizeof( VkPipelineCreateFlags2CreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfo>::value,
-                          "PipelineCreateFlags2CreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties ) == sizeof( VkPhysicalDevicePushDescriptorProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorProperties>::value,
-                          "PhysicalDevicePushDescriptorProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo ) == sizeof( VkBindDescriptorSetsInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfo>::value,
-                          "BindDescriptorSetsInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushConstantsInfo ) == sizeof( VkPushConstantsInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushConstantsInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushConstantsInfo>::value,
-                          "PushConstantsInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo ) == sizeof( VkPushDescriptorSetInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfo>::value,
-                          "PushDescriptorSetInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo ) == sizeof( VkPushDescriptorSetWithTemplateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfo>::value,
-                          "PushDescriptorSetWithTemplateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures ) ==
-                            sizeof( VkPhysicalDevicePipelineProtectedAccessFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeatures>::value,
-                          "PhysicalDevicePipelineProtectedAccessFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures ) == sizeof( VkPhysicalDevicePipelineRobustnessFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeatures>::value,
-                          "PhysicalDevicePipelineRobustnessFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties ) == sizeof( VkPhysicalDevicePipelineRobustnessProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessProperties>::value,
-                          "PhysicalDevicePipelineRobustnessProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo ) == sizeof( VkPipelineRobustnessCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfo>::value,
-                          "PipelineRobustnessCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures ) == sizeof( VkPhysicalDeviceLineRasterizationFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeatures>::value,
-                          "PhysicalDeviceLineRasterizationFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties ) == sizeof( VkPhysicalDeviceLineRasterizationProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationProperties>::value,
-                          "PhysicalDeviceLineRasterizationProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo ) == sizeof( VkPipelineRasterizationLineStateCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfo>::value,
-                          "PipelineRasterizationLineStateCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties ) ==
-                            sizeof( VkPhysicalDeviceVertexAttributeDivisorProperties ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorProperties>::value,
-                          "PhysicalDeviceVertexAttributeDivisorProperties is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription ) == sizeof( VkVertexInputBindingDivisorDescription ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescription>::value,
-                          "VertexInputBindingDivisorDescription is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo ) == sizeof( VkPipelineVertexInputDivisorStateCreateInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfo>::value,
-                          "PipelineVertexInputDivisorStateCreateInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures ) ==
-                            sizeof( VkPhysicalDeviceVertexAttributeDivisorFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeatures>::value,
-                          "PhysicalDeviceVertexAttributeDivisorFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingAreaInfo ) == sizeof( VkRenderingAreaInfo ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingAreaInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingAreaInfo>::value,
-                          "RenderingAreaInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures ) ==
-                            sizeof( VkPhysicalDeviceDynamicRenderingLocalReadFeatures ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeatures>::value,
-                          "PhysicalDeviceDynamicRenderingLocalReadFeatures is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo ) == sizeof( VkRenderingAttachmentLocationInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfo>::value,
-                          "RenderingAttachmentLocationInfo is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo ) == sizeof( VkRenderingInputAttachmentIndexInfo ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfo>::value,
-                          "RenderingInputAttachmentIndexInfo is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements>::value,
+                          "DeviceImageMemoryRequirements is not nothrow_move_constructible!" );
 
 //=== VK_KHR_surface ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfaceKHR ) == sizeof( VkSurfaceKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::SurfaceKHR>::value, "SurfaceKHR is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfaceKHR>::value, "SurfaceKHR is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR ) == sizeof( VkSurfaceCapabilitiesKHR ),
@@ -2157,16 +1799,15 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_KHR_swapchain ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainKHR ) == sizeof( VkSwapchainKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::SwapchainKHR>::value, "SwapchainKHR is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainKHR>::value, "SwapchainKHR is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR ) == sizeof( VkSwapchainCreateInfoKHR ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR>::value,
                           "SwapchainCreateInfoKHR is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainKHR ) == sizeof( VkSwapchainKHR ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainKHR>::value, "SwapchainKHR is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentInfoKHR ) == sizeof( VkPresentInfoKHR ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentInfoKHR>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentInfoKHR>::value,
@@ -2211,20 +1852,18 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_KHR_display ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayKHR ) == sizeof( VkDisplayKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DisplayKHR>::value, "DisplayKHR is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplayKHR>::value, "DisplayKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayModeKHR ) == sizeof( VkDisplayModeKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DisplayModeKHR>::value, "DisplayModeKHR is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplayModeKHR>::value,
-                          "DisplayModeKHR is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR ) == sizeof( VkDisplayModeCreateInfoKHR ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR>::value,
                           "DisplayModeCreateInfoKHR is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayModeKHR ) == sizeof( VkDisplayModeKHR ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplayModeKHR>::value,
+                          "DisplayModeKHR is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR ) == sizeof( VkDisplayModeParametersKHR ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR>::value, "struct wrapper is not a standard layout!" );
@@ -2322,8 +1961,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT ) == sizeof( VkDebugReportCallbackEXT ),
                           "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>::value,
-                          "DebugReportCallbackEXT is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT>::value,
                           "DebugReportCallbackEXT is not nothrow_move_constructible!" );
 
@@ -2366,14 +2003,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_KHR_video_queue ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoSessionKHR ) == sizeof( VkVideoSessionKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::VideoSessionKHR>::value, "VideoSessionKHR is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoSessionKHR>::value,
                           "VideoSessionKHR is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR ) == sizeof( VkVideoSessionParametersKHR ),
                           "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>::value,
-                          "VideoSessionParametersKHR is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR>::value,
                           "VideoSessionParametersKHR is not nothrow_move_constructible!" );
 
@@ -2550,11 +2184,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_NVX_binary_import ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CuModuleNVX ) == sizeof( VkCuModuleNVX ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CuModuleNVX>::value, "CuModuleNVX is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CuModuleNVX>::value, "CuModuleNVX is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CuFunctionNVX ) == sizeof( VkCuFunctionNVX ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CuFunctionNVX>::value, "CuFunctionNVX is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CuFunctionNVX>::value, "CuFunctionNVX is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX ) == sizeof( VkCuModuleCreateInfoNVX ),
@@ -2563,13 +2195,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CuModule
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX>::value,
                           "CuModuleCreateInfoNVX is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX ) == sizeof( VkCuModuleTexturingModeCreateInfoNVX ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CuModuleTexturingModeCreateInfoNVX>::value,
-                          "CuModuleTexturingModeCreateInfoNVX is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX ) == sizeof( VkCuFunctionCreateInfoNVX ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX>::value, "struct wrapper is not a standard layout!" );
@@ -2874,6 +2499,36 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ShaderSt
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderStatisticsInfoAMD>::value,
                           "ShaderStatisticsInfoAMD is not nothrow_move_constructible!" );
 
+//=== VK_KHR_dynamic_rendering ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR ) ==
+                            sizeof( VkRenderingFragmentShadingRateAttachmentInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR>::value,
+                          "RenderingFragmentShadingRateAttachmentInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT ) ==
+                            sizeof( VkRenderingFragmentDensityMapAttachmentInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT>::value,
+                          "RenderingFragmentDensityMapAttachmentInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD ) == sizeof( VkAttachmentSampleCountInfoAMD ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD>::value,
+                          "AttachmentSampleCountInfoAMD is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX ) == sizeof( VkMultiviewPerViewAttributesInfoNVX ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX>::value,
+                          "MultiviewPerViewAttributesInfoNVX is not nothrow_move_constructible!" );
+
 #if defined( VK_USE_PLATFORM_GGP )
 //=== VK_GGP_stream_descriptor_surface ===
 
@@ -2975,6 +2630,30 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceASTCDecodeFeaturesEXT>::value,
                           "PhysicalDeviceASTCDecodeFeaturesEXT is not nothrow_move_constructible!" );
 
+//=== VK_EXT_pipeline_robustness ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT ) ==
+                            sizeof( VkPhysicalDevicePipelineRobustnessFeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT>::value,
+                          "PhysicalDevicePipelineRobustnessFeaturesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT ) ==
+                            sizeof( VkPhysicalDevicePipelineRobustnessPropertiesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT>::value,
+                          "PhysicalDevicePipelineRobustnessPropertiesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT ) == sizeof( VkPipelineRobustnessCreateInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT>::value,
+                          "PipelineRobustnessCreateInfoEXT is not nothrow_move_constructible!" );
+
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
 //=== VK_KHR_external_memory_win32 ===
 
@@ -3075,6 +2754,15 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Semaphor
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR>::value,
                           "SemaphoreGetFdInfoKHR is not nothrow_move_constructible!" );
 
+//=== VK_KHR_push_descriptor ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR ) == sizeof( VkPhysicalDevicePushDescriptorPropertiesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR>::value,
+                          "PhysicalDevicePushDescriptorPropertiesKHR is not nothrow_move_constructible!" );
+
 //=== VK_EXT_conditional_rendering ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT ) == sizeof( VkConditionalRenderingBeginInfoEXT ),
@@ -3195,12 +2883,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>::value,
                           "PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX ) == sizeof( VkMultiviewPerViewAttributesInfoNVX ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX>::value,
-                          "MultiviewPerViewAttributesInfoNVX is not nothrow_move_constructible!" );
-
 //=== VK_NV_viewport_swizzle ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ViewportSwizzleNV ) == sizeof( VkViewportSwizzleNV ), "struct and wrapper have different size!" );
@@ -3456,13 +3138,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_EXT_debug_utils ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT ) == sizeof( VkDebugUtilsMessengerEXT ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>::value,
-                          "DebugUtilsMessengerEXT is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>::value,
-                          "DebugUtilsMessengerEXT is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT ) == sizeof( VkDebugUtilsLabelEXT ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT>::value,
@@ -3481,6 +3156,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DebugUti
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT>::value,
                           "DebugUtilsMessengerCreateInfoEXT is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT ) == sizeof( VkDebugUtilsMessengerEXT ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT>::value,
+                          "DebugUtilsMessengerEXT is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT ) == sizeof( VkDebugUtilsObjectNameInfoEXT ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT>::value, "struct wrapper is not a standard layout!" );
@@ -3603,23 +3283,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
                           "DeviceOrHostAddressConstAMDX is not nothrow_move_constructible!" );
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-//=== VK_AMD_mixed_attachment_samples ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD ) == sizeof( VkAttachmentSampleCountInfoAMD ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD>::value,
-                          "AttachmentSampleCountInfoAMD is not nothrow_move_constructible!" );
-
-//=== VK_KHR_shader_bfloat16 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR ) == sizeof( VkPhysicalDeviceShaderBfloat16FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderBfloat16FeaturesKHR>::value,
-                          "PhysicalDeviceShaderBfloat16FeaturesKHR is not nothrow_move_constructible!" );
-
 //=== VK_EXT_sample_locations ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SampleLocationEXT ) == sizeof( VkSampleLocationEXT ), "struct and wrapper have different size!" );
@@ -3709,13 +3372,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_KHR_acceleration_structure ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR ) == sizeof( VkAccelerationStructureKHR ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>::value,
-                          "AccelerationStructureKHR is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>::value,
-                          "AccelerationStructureKHR is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR ) == sizeof( VkDeviceOrHostAddressKHR ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR>::value, "struct wrapper is not a standard layout!" );
@@ -3801,6 +3457,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Accelera
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR>::value,
                           "AccelerationStructureCreateInfoKHR is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR ) == sizeof( VkAccelerationStructureKHR ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureKHR>::value,
+                          "AccelerationStructureKHR is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureKHR ) == sizeof( VkWriteDescriptorSetAccelerationStructureKHR ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureKHR>::value,
@@ -4010,7 +3671,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_EXT_validation_cache ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ValidationCacheEXT ) == sizeof( VkValidationCacheEXT ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>::value, "ValidationCacheEXT is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ValidationCacheEXT>::value,
                           "ValidationCacheEXT is not nothrow_move_constructible!" );
 
@@ -4097,13 +3757,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_NV_ray_tracing ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureNV ) == sizeof( VkAccelerationStructureNV ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>::value,
-                          "AccelerationStructureNV is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>::value,
-                          "AccelerationStructureNV is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV ) == sizeof( VkRayTracingShaderGroupCreateInfoNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV>::value, "struct wrapper is not a standard layout!" );
@@ -4147,6 +3800,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Accelera
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV>::value,
                           "AccelerationStructureCreateInfoNV is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureNV ) == sizeof( VkAccelerationStructureNV ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureNV>::value,
+                          "AccelerationStructureNV is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV ) == sizeof( VkBindAccelerationStructureMemoryInfoNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV>::value,
@@ -4301,6 +3959,30 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDec
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeH265DpbSlotInfoKHR>::value,
                           "VideoDecodeH265DpbSlotInfoKHR is not nothrow_move_constructible!" );
 
+//=== VK_KHR_global_priority ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR ) == sizeof( VkDeviceQueueGlobalPriorityCreateInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR>::value,
+                          "DeviceQueueGlobalPriorityCreateInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR>::value,
+                          "PhysicalDeviceGlobalPriorityQueryFeaturesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR ) == sizeof( VkQueueFamilyGlobalPriorityPropertiesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR>::value,
+                          "QueueFamilyGlobalPriorityPropertiesKHR is not nothrow_move_constructible!" );
+
 //=== VK_AMD_memory_overallocation_behavior ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceMemoryOverallocationCreateInfoAMD ) == sizeof( VkDeviceMemoryOverallocationCreateInfoAMD ),
@@ -4329,6 +4011,16 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
                           "PresentFrameTokenGGP is not nothrow_move_constructible!" );
 #endif /*VK_USE_PLATFORM_GGP*/
 
+//=== VK_NV_compute_shader_derivatives ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV ) ==
+                            sizeof( VkPhysicalDeviceComputeShaderDerivativesFeaturesNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV>::value,
+                          "PhysicalDeviceComputeShaderDerivativesFeaturesNV is not nothrow_move_constructible!" );
+
 //=== VK_NV_mesh_shader ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesNV ) == sizeof( VkPhysicalDeviceMeshShaderFeaturesNV ),
@@ -4391,88 +4083,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Checkpoi
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CheckpointDataNV>::value,
                           "CheckpointDataNV is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV ) == sizeof( VkQueueFamilyCheckpointProperties2NV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV>::value,
-                          "QueueFamilyCheckpointProperties2NV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CheckpointData2NV ) == sizeof( VkCheckpointData2NV ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value,
-                          "CheckpointData2NV is not nothrow_move_constructible!" );
-
-//=== VK_EXT_present_timing ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT ) == sizeof( VkPhysicalDevicePresentTimingFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT>::value,
-                          "PhysicalDevicePresentTimingFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT ) == sizeof( VkPresentTimingSurfaceCapabilitiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT>::value,
-                          "PresentTimingSurfaceCapabilitiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT ) == sizeof( VkSwapchainCalibratedTimestampInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT>::value,
-                          "SwapchainCalibratedTimestampInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT ) == sizeof( VkSwapchainTimingPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT>::value,
-                          "SwapchainTimingPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT ) == sizeof( VkSwapchainTimeDomainPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT>::value,
-                          "SwapchainTimeDomainPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT ) == sizeof( VkPastPresentationTimingInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT>::value,
-                          "PastPresentationTimingInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT ) == sizeof( VkPastPresentationTimingPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT>::value,
-                          "PastPresentationTimingPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT ) == sizeof( VkPastPresentationTimingEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT>::value,
-                          "PastPresentationTimingEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT ) == sizeof( VkPresentTimingsInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT>::value,
-                          "PresentTimingsInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT ) == sizeof( VkPresentTimingInfoEXT ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT>::value,
-                          "PresentTimingInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentStageTimeEXT ) == sizeof( VkPresentStageTimeEXT ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentStageTimeEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentStageTimeEXT>::value,
-                          "PresentStageTimeEXT is not nothrow_move_constructible!" );
-
 //=== VK_INTEL_shader_integer_functions2 ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL ) ==
@@ -4485,13 +4095,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_INTEL_performance_query ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL ) == sizeof( VkPerformanceConfigurationINTEL ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>::value,
-                          "PerformanceConfigurationINTEL is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>::value,
-                          "PerformanceConfigurationINTEL is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL ) == sizeof( VkPerformanceValueDataINTEL ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL>::value, "struct wrapper is not a standard layout!" );
@@ -4542,6 +4145,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Performa
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL>::value,
                           "PerformanceConfigurationAcquireInfoINTEL is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL ) == sizeof( VkPerformanceConfigurationINTEL ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL>::value,
+                          "PerformanceConfigurationINTEL is not nothrow_move_constructible!" );
+
 //=== VK_EXT_pci_bus_info ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePCIBusInfoPropertiesEXT ) == sizeof( VkPhysicalDevicePCIBusInfoPropertiesEXT ),
@@ -4612,14 +4220,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPa
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapCreateInfoEXT>::value,
                           "RenderPassFragmentDensityMapCreateInfoEXT is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT ) ==
-                            sizeof( VkRenderingFragmentDensityMapAttachmentInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT>::value,
-                          "RenderingFragmentDensityMapAttachmentInfoEXT is not nothrow_move_constructible!" );
-
 //=== VK_KHR_fragment_shading_rate ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FragmentShadingRateAttachmentInfoKHR ) == sizeof( VkFragmentShadingRateAttachmentInfoKHR ),
@@ -4660,14 +4260,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR>::value,
                           "PhysicalDeviceFragmentShadingRateKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR ) ==
-                            sizeof( VkRenderingFragmentShadingRateAttachmentInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR>::value,
-                          "RenderingFragmentShadingRateAttachmentInfoKHR is not nothrow_move_constructible!" );
-
 //=== VK_AMD_shader_core_properties2 ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreProperties2AMD ) == sizeof( VkPhysicalDeviceShaderCoreProperties2AMD ),
@@ -4686,6 +4278,30 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCoherentMemoryFeaturesAMD>::value,
                           "PhysicalDeviceCoherentMemoryFeaturesAMD is not nothrow_move_constructible!" );
 
+//=== VK_KHR_dynamic_rendering_local_read ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR>::value,
+                          "PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR ) == sizeof( VkRenderingAttachmentLocationInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR>::value,
+                          "RenderingAttachmentLocationInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR ) == sizeof( VkRenderingInputAttachmentIndexInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR>::value,
+                          "RenderingInputAttachmentIndexInfoKHR is not nothrow_move_constructible!" );
+
 //=== VK_EXT_shader_image_atomic_int64 ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageAtomicInt64FeaturesEXT ) ==
@@ -4924,7 +4540,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_KHR_deferred_host_operations ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeferredOperationKHR ) == sizeof( VkDeferredOperationKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>::value, "DeferredOperationKHR is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeferredOperationKHR>::value,
                           "DeferredOperationKHR is not nothrow_move_constructible!" );
 
@@ -4976,6 +4591,81 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Pipeline
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR>::value,
                           "PipelineExecutableInternalRepresentationKHR is not nothrow_move_constructible!" );
 
+//=== VK_EXT_host_image_copy ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT ) == sizeof( VkPhysicalDeviceHostImageCopyFeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT>::value,
+                          "PhysicalDeviceHostImageCopyFeaturesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT ) == sizeof( VkPhysicalDeviceHostImageCopyPropertiesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT>::value,
+                          "PhysicalDeviceHostImageCopyPropertiesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT ) == sizeof( VkMemoryToImageCopyEXT ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT>::value,
+                          "MemoryToImageCopyEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT ) == sizeof( VkImageToMemoryCopyEXT ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT>::value,
+                          "ImageToMemoryCopyEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT ) == sizeof( VkCopyMemoryToImageInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT>::value,
+                          "CopyMemoryToImageInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT ) == sizeof( VkCopyImageToMemoryInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT>::value,
+                          "CopyImageToMemoryInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT ) == sizeof( VkCopyImageToImageInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT>::value,
+                          "CopyImageToImageInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT ) == sizeof( VkHostImageLayoutTransitionInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT>::value,
+                          "HostImageLayoutTransitionInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT ) == sizeof( VkSubresourceHostMemcpySizeEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT>::value,
+                          "SubresourceHostMemcpySizeEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT ) == sizeof( VkHostImageCopyDevicePerformanceQueryEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT>::value,
+                          "HostImageCopyDevicePerformanceQueryEXT is not nothrow_move_constructible!" );
+
+//=== VK_KHR_map_memory2 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR ) == sizeof( VkMemoryMapInfoKHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR>::value,
+                          "MemoryMapInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR ) == sizeof( VkMemoryUnmapInfoKHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR>::value,
+                          "MemoryUnmapInfoKHR is not nothrow_move_constructible!" );
+
 //=== VK_EXT_map_memory_placed ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedFeaturesEXT ) == sizeof( VkPhysicalDeviceMapMemoryPlacedFeaturesEXT ),
@@ -5008,14 +4698,71 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat2FeaturesEXT>::value,
                           "PhysicalDeviceShaderAtomicFloat2FeaturesEXT is not nothrow_move_constructible!" );
 
-//=== VK_NV_device_generated_commands ===
+//=== VK_EXT_surface_maintenance1 ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV ) == sizeof( VkIndirectCommandsLayoutNV ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>::value,
-                          "IndirectCommandsLayoutNV is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>::value,
-                          "IndirectCommandsLayoutNV is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT ) == sizeof( VkSurfacePresentModeEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT>::value,
+                          "SurfacePresentModeEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT ) == sizeof( VkSurfacePresentScalingCapabilitiesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT>::value,
+                          "SurfacePresentScalingCapabilitiesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT ) == sizeof( VkSurfacePresentModeCompatibilityEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT>::value,
+                          "SurfacePresentModeCompatibilityEXT is not nothrow_move_constructible!" );
+
+//=== VK_EXT_swapchain_maintenance1 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT ) ==
+                            sizeof( VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT>::value,
+                          "PhysicalDeviceSwapchainMaintenance1FeaturesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT ) == sizeof( VkSwapchainPresentFenceInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT>::value,
+                          "SwapchainPresentFenceInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT ) == sizeof( VkSwapchainPresentModesCreateInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT>::value,
+                          "SwapchainPresentModesCreateInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT ) == sizeof( VkSwapchainPresentModeInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT>::value,
+                          "SwapchainPresentModeInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT ) == sizeof( VkSwapchainPresentScalingCreateInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT>::value,
+                          "SwapchainPresentScalingCreateInfoEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT ) == sizeof( VkReleaseSwapchainImagesInfoEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT>::value,
+                          "ReleaseSwapchainImagesInfoEXT is not nothrow_move_constructible!" );
+
+//=== VK_NV_device_generated_commands ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesNV ) ==
                             sizeof( VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV ),
@@ -5070,6 +4817,11 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SetState
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SetStateFlagsIndirectCommandNV>::value,
                           "SetStateFlagsIndirectCommandNV is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV ) == sizeof( VkIndirectCommandsLayoutNV ),
+                          "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV>::value,
+                          "IndirectCommandsLayoutNV is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV ) == sizeof( VkIndirectCommandsStreamNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV>::value, "struct wrapper is not a standard layout!" );
@@ -5189,6 +4941,22 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceMe
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceMemoryReportCallbackDataEXT>::value,
                           "DeviceMemoryReportCallbackDataEXT is not nothrow_move_constructible!" );
 
+//=== VK_EXT_robustness2 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT ) == sizeof( VkPhysicalDeviceRobustness2FeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT>::value,
+                          "PhysicalDeviceRobustness2FeaturesEXT is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT ) == sizeof( VkPhysicalDeviceRobustness2PropertiesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT>::value,
+                          "PhysicalDeviceRobustness2PropertiesEXT is not nothrow_move_constructible!" );
+
 //=== VK_EXT_custom_border_color ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SamplerCustomBorderColorCreateInfoEXT ) == sizeof( VkSamplerCustomBorderColorCreateInfoEXT ),
@@ -5352,11 +5120,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_NV_cuda_kernel_launch ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CudaModuleNV ) == sizeof( VkCudaModuleNV ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CudaModuleNV>::value, "CudaModuleNV is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CudaModuleNV>::value, "CudaModuleNV is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CudaFunctionNV ) == sizeof( VkCudaFunctionNV ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::CudaFunctionNV>::value, "CudaFunctionNV is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CudaFunctionNV>::value,
                           "CudaFunctionNV is not nothrow_move_constructible!" );
 
@@ -5392,44 +5158,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
                           "PhysicalDeviceCudaKernelLaunchPropertiesNV is not nothrow_move_constructible!" );
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-//=== VK_QCOM_tile_shading ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM ) == sizeof( VkPhysicalDeviceTileShadingFeaturesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingFeaturesQCOM>::value,
-                          "PhysicalDeviceTileShadingFeaturesQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM ) == sizeof( VkPhysicalDeviceTileShadingPropertiesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileShadingPropertiesQCOM>::value,
-                          "PhysicalDeviceTileShadingPropertiesQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM ) == sizeof( VkRenderPassTileShadingCreateInfoQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassTileShadingCreateInfoQCOM>::value,
-                          "RenderPassTileShadingCreateInfoQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM ) == sizeof( VkPerTileBeginInfoQCOM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerTileBeginInfoQCOM>::value,
-                          "PerTileBeginInfoQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM ) == sizeof( VkPerTileEndInfoQCOM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerTileEndInfoQCOM>::value,
-                          "PerTileEndInfoQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM ) == sizeof( VkDispatchTileInfoQCOM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DispatchTileInfoQCOM>::value,
-                          "DispatchTileInfoQCOM is not nothrow_move_constructible!" );
-
 //=== VK_NV_low_latency ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueryLowLatencySupportNV ) == sizeof( VkQueryLowLatencySupportNV ),
@@ -5514,6 +5242,20 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
                           "ImportMetalSharedEventInfoEXT is not nothrow_move_constructible!" );
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
+//=== VK_KHR_synchronization2 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV ) == sizeof( VkQueueFamilyCheckpointProperties2NV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV>::value,
+                          "QueueFamilyCheckpointProperties2NV is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CheckpointData2NV ) == sizeof( VkCheckpointData2NV ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CheckpointData2NV>::value,
+                          "CheckpointData2NV is not nothrow_move_constructible!" );
+
 //=== VK_EXT_descriptor_buffer ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferPropertiesEXT ) ==
@@ -6044,8 +5786,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA ) == sizeof( VkBufferCollectionFUCHSIA ),
                           "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>::value,
-                          "BufferCollectionFUCHSIA is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA>::value,
                           "BufferCollectionFUCHSIA is not nothrow_move_constructible!" );
 
@@ -6276,48 +6016,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TraceRay
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommand2KHR>::value,
                           "TraceRaysIndirectCommand2KHR is not nothrow_move_constructible!" );
 
-//=== VK_KHR_shader_untyped_pointers ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceShaderUntypedPointersFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUntypedPointersFeaturesKHR>::value,
-                          "PhysicalDeviceShaderUntypedPointersFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_VALVE_video_encode_rgb_conversion ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE ) ==
-                            sizeof( VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>::value,
-                          "PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE ) == sizeof( VkVideoEncodeRgbConversionCapabilitiesVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeRgbConversionCapabilitiesVALVE>::value,
-                          "VideoEncodeRgbConversionCapabilitiesVALVE is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE ) == sizeof( VkVideoEncodeProfileRgbConversionInfoVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeProfileRgbConversionInfoVALVE>::value,
-                          "VideoEncodeProfileRgbConversionInfoVALVE is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE ) ==
-                            sizeof( VkVideoEncodeSessionRgbConversionCreateInfoVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeSessionRgbConversionCreateInfoVALVE>::value,
-                          "VideoEncodeSessionRgbConversionCreateInfoVALVE is not nothrow_move_constructible!" );
-
 //=== VK_EXT_image_view_min_lod ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewMinLodFeaturesEXT ) == sizeof( VkPhysicalDeviceImageViewMinLodFeaturesEXT ),
@@ -6387,10 +6085,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_EXT_opacity_micromap ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MicromapEXT ) == sizeof( VkMicromapEXT ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::MicromapEXT>::value, "MicromapEXT is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MicromapEXT>::value, "MicromapEXT is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT ) == sizeof( VkMicromapBuildInfoEXT ), "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT>::value, "struct wrapper is not a standard layout!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT>::value,
@@ -6407,6 +6101,9 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Micromap
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT>::value,
                           "MicromapCreateInfoEXT is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MicromapEXT ) == sizeof( VkMicromapEXT ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MicromapEXT>::value, "MicromapEXT is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapFeaturesEXT ) == sizeof( VkPhysicalDeviceOpacityMicromapFeaturesEXT ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapFeaturesEXT>::value,
@@ -6554,6 +6251,16 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesARM>::value,
                           "PhysicalDeviceShaderCorePropertiesARM is not nothrow_move_constructible!" );
 
+//=== VK_KHR_shader_subgroup_rotate ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR>::value,
+                          "PhysicalDeviceShaderSubgroupRotateFeaturesKHR is not nothrow_move_constructible!" );
+
 //=== VK_ARM_scheduling_controls ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceQueueShaderCoreControlCreateInfoARM ) == sizeof( VkDeviceQueueShaderCoreControlCreateInfoARM ),
@@ -6619,6 +6326,15 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Descript
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE>::value,
                           "DescriptorSetLayoutHostMappingInfoVALVE is not nothrow_move_constructible!" );
 
+//=== VK_EXT_depth_clamp_zero_one ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT ) == sizeof( VkPhysicalDeviceDepthClampZeroOneFeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT>::value,
+                          "PhysicalDeviceDepthClampZeroOneFeaturesEXT is not nothrow_move_constructible!" );
+
 //=== VK_EXT_non_seamless_cube_map ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceNonSeamlessCubeMapFeaturesEXT ) ==
@@ -6664,8 +6380,46 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPa
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassStripeSubmitInfoARM>::value,
                           "RenderPassStripeSubmitInfoARM is not nothrow_move_constructible!" );
 
+//=== VK_QCOM_fragment_density_map_offset ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM ) ==
+                            sizeof( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM>::value,
+                          "PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM ) ==
+                            sizeof( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM>::value,
+                          "PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM ) == sizeof( VkSubpassFragmentDensityMapOffsetEndInfoQCOM ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM>::value,
+                          "SubpassFragmentDensityMapOffsetEndInfoQCOM is not nothrow_move_constructible!" );
+
 //=== VK_NV_copy_memory_indirect ===
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV ) == sizeof( VkCopyMemoryIndirectCommandNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV>::value,
+                          "CopyMemoryIndirectCommandNV is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV ) == sizeof( VkCopyMemoryToImageIndirectCommandNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV>::value,
+                          "CopyMemoryToImageIndirectCommandNV is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV ) == sizeof( VkPhysicalDeviceCopyMemoryIndirectFeaturesNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV>::value,
@@ -6673,6 +6427,14 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV>::value,
                           "PhysicalDeviceCopyMemoryIndirectFeaturesNV is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV ) ==
+                            sizeof( VkPhysicalDeviceCopyMemoryIndirectPropertiesNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV>::value,
+                          "PhysicalDeviceCopyMemoryIndirectPropertiesNV is not nothrow_move_constructible!" );
+
 //=== VK_NV_memory_decompression ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV ) == sizeof( VkDecompressMemoryRegionNV ),
@@ -6681,6 +6443,22 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Decompre
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV>::value,
                           "DecompressMemoryRegionNV is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV ) ==
+                            sizeof( VkPhysicalDeviceMemoryDecompressionFeaturesNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV>::value,
+                          "PhysicalDeviceMemoryDecompressionFeaturesNV is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV ) ==
+                            sizeof( VkPhysicalDeviceMemoryDecompressionPropertiesNV ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV>::value,
+                          "PhysicalDeviceMemoryDecompressionPropertiesNV is not nothrow_move_constructible!" );
+
 //=== VK_NV_device_generated_commands_compute ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV ) ==
@@ -6711,31 +6489,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindPipe
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindPipelineIndirectCommandNV>::value,
                           "BindPipelineIndirectCommandNV is not nothrow_move_constructible!" );
 
-//=== VK_NV_ray_tracing_linear_swept_spheres ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV ) ==
-                            sizeof( VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>::value,
-                          "PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryLinearSweptSpheresDataNV ) ==
-                            sizeof( VkAccelerationStructureGeometryLinearSweptSpheresDataNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryLinearSweptSpheresDataNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryLinearSweptSpheresDataNV>::value,
-                          "AccelerationStructureGeometryLinearSweptSpheresDataNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometrySpheresDataNV ) == sizeof( VkAccelerationStructureGeometrySpheresDataNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometrySpheresDataNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometrySpheresDataNV>::value,
-                          "AccelerationStructureGeometrySpheresDataNV is not nothrow_move_constructible!" );
-
 //=== VK_NV_linear_color_attachment ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLinearColorAttachmentFeaturesNV ) ==
@@ -6808,45 +6561,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferPropertiesEXT>::value,
                           "PhysicalDeviceNestedCommandBufferPropertiesEXT is not nothrow_move_constructible!" );
 
-#if defined( VK_USE_PLATFORM_OHOS )
-//=== VK_OHOS_external_memory ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS ) == sizeof( VkNativeBufferUsageOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::NativeBufferUsageOHOS>::value,
-                          "NativeBufferUsageOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS ) == sizeof( VkNativeBufferPropertiesOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::NativeBufferPropertiesOHOS>::value,
-                          "NativeBufferPropertiesOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS ) == sizeof( VkNativeBufferFormatPropertiesOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::NativeBufferFormatPropertiesOHOS>::value,
-                          "NativeBufferFormatPropertiesOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS ) == sizeof( VkImportNativeBufferInfoOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImportNativeBufferInfoOHOS>::value,
-                          "ImportNativeBufferInfoOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS ) == sizeof( VkMemoryGetNativeBufferInfoOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryGetNativeBufferInfoOHOS>::value,
-                          "MemoryGetNativeBufferInfoOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalFormatOHOS ) == sizeof( VkExternalFormatOHOS ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalFormatOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalFormatOHOS>::value,
-                          "ExternalFormatOHOS is not nothrow_move_constructible!" );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
 //=== VK_EXT_external_memory_acquire_unmodified ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalMemoryAcquireUnmodifiedEXT ) == sizeof( VkExternalMemoryAcquireUnmodifiedEXT ),
@@ -6942,163 +6656,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DirectDr
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG>::value,
                           "DirectDriverLoadingListLUNARG is not nothrow_move_constructible!" );
 
-//=== VK_ARM_tensors ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorARM ) == sizeof( VkTensorARM ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::TensorARM>::value, "TensorARM is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorARM>::value, "TensorARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorViewARM ) == sizeof( VkTensorViewARM ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::TensorViewARM>::value, "TensorViewARM is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorViewARM>::value, "TensorViewARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorDescriptionARM ) == sizeof( VkTensorDescriptionARM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorDescriptionARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorDescriptionARM>::value,
-                          "TensorDescriptionARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorCreateInfoARM ) == sizeof( VkTensorCreateInfoARM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorCreateInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorCreateInfoARM>::value,
-                          "TensorCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM ) == sizeof( VkTensorViewCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorViewCreateInfoARM>::value,
-                          "TensorViewCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM ) == sizeof( VkTensorMemoryRequirementsInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorMemoryRequirementsInfoARM>::value,
-                          "TensorMemoryRequirementsInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM ) == sizeof( VkBindTensorMemoryInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindTensorMemoryInfoARM>::value,
-                          "BindTensorMemoryInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM ) == sizeof( VkWriteDescriptorSetTensorARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteDescriptorSetTensorARM>::value,
-                          "WriteDescriptorSetTensorARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM ) == sizeof( VkTensorFormatPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorFormatPropertiesARM>::value,
-                          "TensorFormatPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM ) == sizeof( VkPhysicalDeviceTensorPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorPropertiesARM>::value,
-                          "PhysicalDeviceTensorPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM ) == sizeof( VkTensorMemoryBarrierARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorMemoryBarrierARM>::value,
-                          "TensorMemoryBarrierARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM ) == sizeof( VkTensorDependencyInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorDependencyInfoARM>::value,
-                          "TensorDependencyInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM ) == sizeof( VkPhysicalDeviceTensorFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTensorFeaturesARM>::value,
-                          "PhysicalDeviceTensorFeaturesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM ) == sizeof( VkDeviceTensorMemoryRequirementsARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceTensorMemoryRequirementsARM>::value,
-                          "DeviceTensorMemoryRequirementsARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyTensorInfoARM ) == sizeof( VkCopyTensorInfoARM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyTensorInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyTensorInfoARM>::value,
-                          "CopyTensorInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorCopyARM ) == sizeof( VkTensorCopyARM ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorCopyARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorCopyARM>::value, "TensorCopyARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM ) == sizeof( VkMemoryDedicatedAllocateInfoTensorARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfoTensorARM>::value,
-                          "MemoryDedicatedAllocateInfoTensorARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM ) == sizeof( VkPhysicalDeviceExternalTensorInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalTensorInfoARM>::value,
-                          "PhysicalDeviceExternalTensorInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM ) == sizeof( VkExternalTensorPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalTensorPropertiesARM>::value,
-                          "ExternalTensorPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM ) == sizeof( VkExternalMemoryTensorCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalMemoryTensorCreateInfoARM>::value,
-                          "ExternalMemoryTensorCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM ) ==
-                            sizeof( VkPhysicalDeviceDescriptorBufferTensorFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorFeaturesARM>::value,
-                          "PhysicalDeviceDescriptorBufferTensorFeaturesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM ) ==
-                            sizeof( VkPhysicalDeviceDescriptorBufferTensorPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferTensorPropertiesARM>::value,
-                          "PhysicalDeviceDescriptorBufferTensorPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM ) == sizeof( VkDescriptorGetTensorInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DescriptorGetTensorInfoARM>::value,
-                          "DescriptorGetTensorInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM ) == sizeof( VkTensorCaptureDescriptorDataInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorCaptureDescriptorDataInfoARM>::value,
-                          "TensorCaptureDescriptorDataInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM ) == sizeof( VkTensorViewCaptureDescriptorDataInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TensorViewCaptureDescriptorDataInfoARM>::value,
-                          "TensorViewCaptureDescriptorDataInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM ) == sizeof( VkFrameBoundaryTensorsARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::FrameBoundaryTensorsARM>::value,
-                          "FrameBoundaryTensorsARM is not nothrow_move_constructible!" );
-
 //=== VK_EXT_shader_module_identifier ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierFeaturesEXT ) ==
@@ -7143,11 +6700,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 
 //=== VK_NV_optical_flow ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV ) == sizeof( VkOpticalFlowSessionNV ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>::value, "OpticalFlowSessionNV is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>::value,
-                          "OpticalFlowSessionNV is not nothrow_move_constructible!" );
-
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowFeaturesNV ) == sizeof( VkPhysicalDeviceOpticalFlowFeaturesNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowFeaturesNV>::value,
@@ -7175,6 +6727,10 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::OpticalF
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV>::value,
                           "OpticalFlowImageFormatPropertiesNV is not nothrow_move_constructible!" );
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV ) == sizeof( VkOpticalFlowSessionNV ), "handle and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::OpticalFlowSessionNV>::value,
+                          "OpticalFlowSessionNV is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV ) == sizeof( VkOpticalFlowSessionCreateInfoNV ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV>::value, "struct wrapper is not a standard layout!" );
@@ -7203,6 +6759,16 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT>::value,
                           "PhysicalDeviceLegacyDitheringFeaturesEXT is not nothrow_move_constructible!" );
 
+//=== VK_EXT_pipeline_protected_access ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT ) ==
+                            sizeof( VkPhysicalDevicePipelineProtectedAccessFeaturesEXT ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT>::value,
+                          "PhysicalDevicePipelineProtectedAccessFeaturesEXT is not nothrow_move_constructible!" );
+
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
 //=== VK_ANDROID_external_format_resolve ===
 
@@ -7231,84 +6797,55 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
                           "AndroidHardwareBufferFormatResolvePropertiesANDROID is not nothrow_move_constructible!" );
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-//=== VK_AMD_anti_lag ===
+//=== VK_KHR_maintenance5 ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD ) == sizeof( VkPhysicalDeviceAntiLagFeaturesAMD ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance5FeaturesKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceAntiLagFeaturesAMD>::value,
-                          "PhysicalDeviceAntiLagFeaturesAMD is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AntiLagDataAMD ) == sizeof( VkAntiLagDataAMD ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AntiLagDataAMD>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AntiLagDataAMD>::value,
-                          "AntiLagDataAMD is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD ) == sizeof( VkAntiLagPresentationInfoAMD ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AntiLagPresentationInfoAMD>::value,
-                          "AntiLagPresentationInfoAMD is not nothrow_move_constructible!" );
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-//=== VK_AMDX_dense_geometry_format ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX ) ==
-                            sizeof( VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDenseGeometryFormatFeaturesAMDX>::value,
-                          "PhysicalDeviceDenseGeometryFormatFeaturesAMDX is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR>::value,
+                          "PhysicalDeviceMaintenance5FeaturesKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AccelerationStructureDenseGeometryFormatTrianglesDataAMDX ) ==
-                            sizeof( VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR ) == sizeof( VkPhysicalDeviceMaintenance5PropertiesKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AccelerationStructureDenseGeometryFormatTrianglesDataAMDX>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AccelerationStructureDenseGeometryFormatTrianglesDataAMDX>::value,
-                          "AccelerationStructureDenseGeometryFormatTrianglesDataAMDX is not nothrow_move_constructible!" );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR>::value,
+                          "PhysicalDeviceMaintenance5PropertiesKHR is not nothrow_move_constructible!" );
 
-//=== VK_KHR_present_id2 ===
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR ) == sizeof( VkRenderingAreaInfoKHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR>::value,
+                          "RenderingAreaInfoKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR ) == sizeof( VkSurfaceCapabilitiesPresentId2KHR ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR ) == sizeof( VkDeviceImageSubresourceInfoKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentId2KHR>::value,
-                          "SurfaceCapabilitiesPresentId2KHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR>::value,
+                          "DeviceImageSubresourceInfoKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentId2KHR ) == sizeof( VkPresentId2KHR ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentId2KHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentId2KHR>::value, "PresentId2KHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageSubresource2KHR ) == sizeof( VkImageSubresource2KHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageSubresource2KHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageSubresource2KHR>::value,
+                          "ImageSubresource2KHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR ) == sizeof( VkPhysicalDevicePresentId2FeaturesKHR ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR ) == sizeof( VkSubresourceLayout2KHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentId2FeaturesKHR>::value,
-                          "PhysicalDevicePresentId2FeaturesKHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR>::value,
+                          "SubresourceLayout2KHR is not nothrow_move_constructible!" );
 
-//=== VK_KHR_present_wait2 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR ) == sizeof( VkSurfaceCapabilitiesPresentWait2KHR ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR ) == sizeof( VkPipelineCreateFlags2CreateInfoKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentWait2KHR>::value,
-                          "SurfaceCapabilitiesPresentWait2KHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR>::value,
+                          "PipelineCreateFlags2CreateInfoKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR ) == sizeof( VkPhysicalDevicePresentWait2FeaturesKHR ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR ) == sizeof( VkBufferUsageFlags2CreateInfoKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWait2FeaturesKHR>::value,
-                          "PhysicalDevicePresentWait2FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR ) == sizeof( VkPresentWait2InfoKHR ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PresentWait2InfoKHR>::value,
-                          "PresentWait2InfoKHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR>::value,
+                          "BufferUsageFlags2CreateInfoKHR is not nothrow_move_constructible!" );
 
 //=== VK_KHR_ray_tracing_position_fetch ===
 
@@ -7323,7 +6860,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPAC
 //=== VK_EXT_shader_object ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ShaderEXT ) == sizeof( VkShaderEXT ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::ShaderEXT>::value, "ShaderEXT is not copy_constructible!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderEXT>::value, "ShaderEXT is not nothrow_move_constructible!" );
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectFeaturesEXT ) == sizeof( VkPhysicalDeviceShaderObjectFeaturesEXT ),
@@ -7345,89 +6881,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ShaderCr
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT>::value,
                           "ShaderCreateInfoEXT is not nothrow_move_constructible!" );
 
-//=== VK_KHR_pipeline_binary ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryKHR ) == sizeof( VkPipelineBinaryKHR ), "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryKHR>::value, "PipelineBinaryKHR is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryKHR>::value,
-                          "PipelineBinaryKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR ) == sizeof( VkPhysicalDevicePipelineBinaryFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryFeaturesKHR>::value,
-                          "PhysicalDevicePipelineBinaryFeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR ) == sizeof( VkPhysicalDevicePipelineBinaryPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineBinaryPropertiesKHR>::value,
-                          "PhysicalDevicePipelineBinaryPropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR ) ==
-                            sizeof( VkDevicePipelineBinaryInternalCacheControlKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DevicePipelineBinaryInternalCacheControlKHR>::value,
-                          "DevicePipelineBinaryInternalCacheControlKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR ) == sizeof( VkPipelineBinaryKeyKHR ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryKeyKHR>::value,
-                          "PipelineBinaryKeyKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR ) == sizeof( VkPipelineBinaryDataKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryDataKHR>::value,
-                          "PipelineBinaryDataKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR ) == sizeof( VkPipelineBinaryKeysAndDataKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryKeysAndDataKHR>::value,
-                          "PipelineBinaryKeysAndDataKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR ) == sizeof( VkPipelineBinaryCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryCreateInfoKHR>::value,
-                          "PipelineBinaryCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR ) == sizeof( VkPipelineBinaryInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryInfoKHR>::value,
-                          "PipelineBinaryInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR ) == sizeof( VkReleaseCapturedPipelineDataInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ReleaseCapturedPipelineDataInfoKHR>::value,
-                          "ReleaseCapturedPipelineDataInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR ) == sizeof( VkPipelineBinaryDataInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryDataInfoKHR>::value,
-                          "PipelineBinaryDataInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR ) == sizeof( VkPipelineCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCreateInfoKHR>::value,
-                          "PipelineCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR ) == sizeof( VkPipelineBinaryHandlesInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineBinaryHandlesInfoKHR>::value,
-                          "PipelineBinaryHandlesInfoKHR is not nothrow_move_constructible!" );
-
 //=== VK_QCOM_tile_properties ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTilePropertiesFeaturesQCOM ) == sizeof( VkPhysicalDeviceTilePropertiesFeaturesQCOM ),
@@ -7457,70 +6910,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AmigoPro
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AmigoProfilingSubmitInfoSEC>::value,
                           "AmigoProfilingSubmitInfoSEC is not nothrow_move_constructible!" );
 
-//=== VK_KHR_surface_maintenance1 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR ) == sizeof( VkSurfacePresentModeKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentModeKHR>::value,
-                          "SurfacePresentModeKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR ) == sizeof( VkSurfacePresentScalingCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesKHR>::value,
-                          "SurfacePresentScalingCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR ) == sizeof( VkSurfacePresentModeCompatibilityKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityKHR>::value,
-                          "SurfacePresentModeCompatibilityKHR is not nothrow_move_constructible!" );
-
-//=== VK_KHR_swapchain_maintenance1 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesKHR>::value,
-                          "PhysicalDeviceSwapchainMaintenance1FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR ) == sizeof( VkSwapchainPresentFenceInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoKHR>::value,
-                          "SwapchainPresentFenceInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR ) == sizeof( VkSwapchainPresentModesCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoKHR>::value,
-                          "SwapchainPresentModesCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR ) == sizeof( VkSwapchainPresentModeInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoKHR>::value,
-                          "SwapchainPresentModeInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR ) == sizeof( VkSwapchainPresentScalingCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoKHR>::value,
-                          "SwapchainPresentScalingCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR ) == sizeof( VkReleaseSwapchainImagesInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoKHR>::value,
-                          "ReleaseSwapchainImagesInfoKHR is not nothrow_move_constructible!" );
-
 //=== VK_QCOM_multiview_per_view_viewports ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM ) ==
@@ -7549,36 +6938,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesNV>::value,
                           "PhysicalDeviceRayTracingInvocationReorderFeaturesNV is not nothrow_move_constructible!" );
 
-//=== VK_NV_cooperative_vector ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV ) ==
-                            sizeof( VkPhysicalDeviceCooperativeVectorPropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorPropertiesNV>::value,
-                          "PhysicalDeviceCooperativeVectorPropertiesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV ) == sizeof( VkPhysicalDeviceCooperativeVectorFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeVectorFeaturesNV>::value,
-                          "PhysicalDeviceCooperativeVectorFeaturesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV ) == sizeof( VkCooperativeVectorPropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CooperativeVectorPropertiesNV>::value,
-                          "CooperativeVectorPropertiesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ConvertCooperativeVectorMatrixInfoNV ) == sizeof( VkConvertCooperativeVectorMatrixInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ConvertCooperativeVectorMatrixInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ConvertCooperativeVectorMatrixInfoNV>::value,
-                          "ConvertCooperativeVectorMatrixInfoNV is not nothrow_move_constructible!" );
-
 //=== VK_NV_extended_sparse_address_space ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV ) ==
@@ -7620,24 +6979,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MutableD
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MutableDescriptorTypeCreateInfoEXT>::value,
                           "MutableDescriptorTypeCreateInfoEXT is not nothrow_move_constructible!" );
 
-//=== VK_EXT_legacy_vertex_attributes ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesFeaturesEXT>::value,
-                          "PhysicalDeviceLegacyVertexAttributesFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT ) ==
-                            sizeof( VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyVertexAttributesPropertiesEXT>::value,
-                          "PhysicalDeviceLegacyVertexAttributesPropertiesEXT is not nothrow_move_constructible!" );
-
 //=== VK_EXT_layer_settings ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::LayerSettingsCreateInfoEXT ) == sizeof( VkLayerSettingsCreateInfoEXT ),
@@ -7767,170 +7108,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesKHR>::value,
                           "PhysicalDeviceCooperativeMatrixPropertiesKHR is not nothrow_move_constructible!" );
 
-//=== VK_ARM_data_graph ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM ) == sizeof( VkDataGraphPipelineSessionARM ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM>::value,
-                          "DataGraphPipelineSessionARM is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM>::value,
-                          "DataGraphPipelineSessionARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM ) == sizeof( VkPhysicalDeviceDataGraphFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphFeaturesARM>::value,
-                          "PhysicalDeviceDataGraphFeaturesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM ) == sizeof( VkDataGraphPipelineConstantARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantARM>::value,
-                          "DataGraphPipelineConstantARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM ) == sizeof( VkDataGraphPipelineResourceInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineResourceInfoARM>::value,
-                          "DataGraphPipelineResourceInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM ) ==
-                            sizeof( VkDataGraphPipelineCompilerControlCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineCompilerControlCreateInfoARM>::value,
-                          "DataGraphPipelineCompilerControlCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM ) == sizeof( VkDataGraphPipelineCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineCreateInfoARM>::value,
-                          "DataGraphPipelineCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM ) == sizeof( VkDataGraphPipelineShaderModuleCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineShaderModuleCreateInfoARM>::value,
-                          "DataGraphPipelineShaderModuleCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM ) == sizeof( VkDataGraphPipelineSessionCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionCreateInfoARM>::value,
-                          "DataGraphPipelineSessionCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM ) ==
-                            sizeof( VkDataGraphPipelineSessionBindPointRequirementsInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementsInfoARM>::value,
-                          "DataGraphPipelineSessionBindPointRequirementsInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM ) ==
-                            sizeof( VkDataGraphPipelineSessionBindPointRequirementARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionBindPointRequirementARM>::value,
-                          "DataGraphPipelineSessionBindPointRequirementARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM ) ==
-                            sizeof( VkDataGraphPipelineSessionMemoryRequirementsInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionMemoryRequirementsInfoARM>::value,
-                          "DataGraphPipelineSessionMemoryRequirementsInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM ) == sizeof( VkBindDataGraphPipelineSessionMemoryInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindDataGraphPipelineSessionMemoryInfoARM>::value,
-                          "BindDataGraphPipelineSessionMemoryInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM ) == sizeof( VkDataGraphPipelineInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineInfoARM>::value,
-                          "DataGraphPipelineInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM ) == sizeof( VkDataGraphPipelinePropertyQueryResultARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelinePropertyQueryResultARM>::value,
-                          "DataGraphPipelinePropertyQueryResultARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM ) == sizeof( VkDataGraphPipelineIdentifierCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineIdentifierCreateInfoARM>::value,
-                          "DataGraphPipelineIdentifierCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM ) == sizeof( VkDataGraphPipelineDispatchInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineDispatchInfoARM>::value,
-                          "DataGraphPipelineDispatchInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM ) == sizeof( VkPhysicalDeviceDataGraphProcessingEngineARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphProcessingEngineARM>::value,
-                          "PhysicalDeviceDataGraphProcessingEngineARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM ) == sizeof( VkQueueFamilyDataGraphPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphPropertiesARM>::value,
-                          "QueueFamilyDataGraphPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM ) == sizeof( VkDataGraphProcessingEngineCreateInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphProcessingEngineCreateInfoARM>::value,
-                          "DataGraphProcessingEngineCreateInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM ) ==
-                            sizeof( VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>::value,
-                          "PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM ) ==
-                            sizeof( VkQueueFamilyDataGraphProcessingEnginePropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyDataGraphProcessingEnginePropertiesARM>::value,
-                          "QueueFamilyDataGraphProcessingEnginePropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM ) == sizeof( VkPhysicalDeviceDataGraphOperationSupportARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphOperationSupportARM>::value,
-                          "PhysicalDeviceDataGraphOperationSupportARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM ) ==
-                            sizeof( VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>::value,
-                          "DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM is not nothrow_move_constructible!" );
-
 //=== VK_QCOM_multiview_per_view_render_areas ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM ) ==
@@ -7949,24 +7126,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Multivie
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM>::value,
                           "MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM is not nothrow_move_constructible!" );
 
-//=== VK_KHR_compute_shader_derivatives ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesKHR>::value,
-                          "PhysicalDeviceComputeShaderDerivativesFeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR ) ==
-                            sizeof( VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesPropertiesKHR>::value,
-                          "PhysicalDeviceComputeShaderDerivativesPropertiesKHR is not nothrow_move_constructible!" );
-
 //=== VK_KHR_video_decode_av1 ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeAV1ProfileInfoKHR ) == sizeof( VkVideoDecodeAV1ProfileInfoKHR ),
@@ -8001,120 +7160,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDec
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeAV1DpbSlotInfoKHR>::value,
                           "VideoDecodeAV1DpbSlotInfoKHR is not nothrow_move_constructible!" );
 
-//=== VK_KHR_video_encode_av1 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR ) == sizeof( VkPhysicalDeviceVideoEncodeAV1FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeAV1FeaturesKHR>::value,
-                          "PhysicalDeviceVideoEncodeAV1FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR ) == sizeof( VkVideoEncodeAV1CapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1CapabilitiesKHR>::value,
-                          "VideoEncodeAV1CapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR ) == sizeof( VkVideoEncodeAV1QualityLevelPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QualityLevelPropertiesKHR>::value,
-                          "VideoEncodeAV1QualityLevelPropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR ) == sizeof( VkVideoEncodeAV1SessionCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionCreateInfoKHR>::value,
-                          "VideoEncodeAV1SessionCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR ) ==
-                            sizeof( VkVideoEncodeAV1SessionParametersCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1SessionParametersCreateInfoKHR>::value,
-                          "VideoEncodeAV1SessionParametersCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR ) == sizeof( VkVideoEncodeAV1PictureInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1PictureInfoKHR>::value,
-                          "VideoEncodeAV1PictureInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR ) == sizeof( VkVideoEncodeAV1DpbSlotInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1DpbSlotInfoKHR>::value,
-                          "VideoEncodeAV1DpbSlotInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR ) == sizeof( VkVideoEncodeAV1ProfileInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1ProfileInfoKHR>::value,
-                          "VideoEncodeAV1ProfileInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR ) == sizeof( VkVideoEncodeAV1QIndexKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QIndexKHR>::value,
-                          "VideoEncodeAV1QIndexKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR ) == sizeof( VkVideoEncodeAV1FrameSizeKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1FrameSizeKHR>::value,
-                          "VideoEncodeAV1FrameSizeKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR ) == sizeof( VkVideoEncodeAV1GopRemainingFrameInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1GopRemainingFrameInfoKHR>::value,
-                          "VideoEncodeAV1GopRemainingFrameInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR ) == sizeof( VkVideoEncodeAV1RateControlInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlInfoKHR>::value,
-                          "VideoEncodeAV1RateControlInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR ) == sizeof( VkVideoEncodeAV1RateControlLayerInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1RateControlLayerInfoKHR>::value,
-                          "VideoEncodeAV1RateControlLayerInfoKHR is not nothrow_move_constructible!" );
-
-//=== VK_KHR_video_decode_vp9 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR ) == sizeof( VkPhysicalDeviceVideoDecodeVP9FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoDecodeVP9FeaturesKHR>::value,
-                          "PhysicalDeviceVideoDecodeVP9FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR ) == sizeof( VkVideoDecodeVP9ProfileInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeVP9ProfileInfoKHR>::value,
-                          "VideoDecodeVP9ProfileInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR ) == sizeof( VkVideoDecodeVP9CapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeVP9CapabilitiesKHR>::value,
-                          "VideoDecodeVP9CapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR ) == sizeof( VkVideoDecodeVP9PictureInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeVP9PictureInfoKHR>::value,
-                          "VideoDecodeVP9PictureInfoKHR is not nothrow_move_constructible!" );
-
 //=== VK_KHR_video_maintenance1 ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance1FeaturesKHR ) == sizeof( VkPhysicalDeviceVideoMaintenance1FeaturesKHR ),
@@ -8221,21 +7266,48 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT>::value,
                           "PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT is not nothrow_move_constructible!" );
 
-//=== VK_KHR_unified_image_layouts ===
+//=== VK_KHR_vertex_attribute_divisor ===
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR ) ==
+                            sizeof( VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR>::value,
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR>::value,
                           "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceUnifiedImageLayoutsFeaturesKHR>::value,
-                          "PhysicalDeviceUnifiedImageLayoutsFeaturesKHR is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR>::value,
+                          "PhysicalDeviceVertexAttributeDivisorPropertiesKHR is not nothrow_move_constructible!" );
 
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT ) == sizeof( VkAttachmentFeedbackLoopInfoEXT ),
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR ) == sizeof( VkVertexInputBindingDivisorDescriptionKHR ),
                           "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::AttachmentFeedbackLoopInfoEXT>::value,
-                          "AttachmentFeedbackLoopInfoEXT is not nothrow_move_constructible!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR>::value,
+                          "VertexInputBindingDivisorDescriptionKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR ) ==
+                            sizeof( VkPipelineVertexInputDivisorStateCreateInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR>::value,
+                          "PipelineVertexInputDivisorStateCreateInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR>::value,
+                          "PhysicalDeviceVertexAttributeDivisorFeaturesKHR is not nothrow_move_constructible!" );
+
+//=== VK_KHR_shader_float_controls2 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceShaderFloatControls2FeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR>::value,
+                          "PhysicalDeviceShaderFloatControls2FeaturesKHR is not nothrow_move_constructible!" );
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
 //=== VK_QNX_external_memory_screen_buffer ===
@@ -8281,6 +7353,40 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT>::value,
                           "PhysicalDeviceLayeredDriverPropertiesMSFT is not nothrow_move_constructible!" );
 
+//=== VK_KHR_index_type_uint8 ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR ) == sizeof( VkPhysicalDeviceIndexTypeUint8FeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR>::value,
+                          "PhysicalDeviceIndexTypeUint8FeaturesKHR is not nothrow_move_constructible!" );
+
+//=== VK_KHR_line_rasterization ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR ) == sizeof( VkPhysicalDeviceLineRasterizationFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR>::value,
+                          "PhysicalDeviceLineRasterizationFeaturesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR ) ==
+                            sizeof( VkPhysicalDeviceLineRasterizationPropertiesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR>::value,
+                          "PhysicalDeviceLineRasterizationPropertiesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR ) ==
+                            sizeof( VkPipelineRasterizationLineStateCreateInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR>::value,
+                          "PipelineRasterizationLineStateCreateInfoKHR is not nothrow_move_constructible!" );
+
 //=== VK_KHR_calibrated_timestamps ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR ) == sizeof( VkCalibratedTimestampInfoKHR ),
@@ -8289,8 +7395,61 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Calibrat
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR>::value,
                           "CalibratedTimestampInfoKHR is not nothrow_move_constructible!" );
 
+//=== VK_KHR_shader_expect_assume ===
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR ) ==
+                            sizeof( VkPhysicalDeviceShaderExpectAssumeFeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR>::value,
+                          "PhysicalDeviceShaderExpectAssumeFeaturesKHR is not nothrow_move_constructible!" );
+
 //=== VK_KHR_maintenance6 ===
 
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance6FeaturesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR>::value,
+                          "PhysicalDeviceMaintenance6FeaturesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR ) == sizeof( VkPhysicalDeviceMaintenance6PropertiesKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR>::value,
+                          "PhysicalDeviceMaintenance6PropertiesKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR ) == sizeof( VkBindMemoryStatusKHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR>::value,
+                          "BindMemoryStatusKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR ) == sizeof( VkBindDescriptorSetsInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR>::value,
+                          "BindDescriptorSetsInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR ) == sizeof( VkPushConstantsInfoKHR ), "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR>::value,
+                          "PushConstantsInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR ) == sizeof( VkPushDescriptorSetInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR>::value, "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR>::value,
+                          "PushDescriptorSetInfoKHR is not nothrow_move_constructible!" );
+
+VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR ) == sizeof( VkPushDescriptorSetWithTemplateInfoKHR ),
+                          "struct and wrapper have different size!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR>::value,
+                          "struct wrapper is not a standard layout!" );
+VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR>::value,
+                          "PushDescriptorSetWithTemplateInfoKHR is not nothrow_move_constructible!" );
+
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT ) == sizeof( VkSetDescriptorBufferOffsetsInfoEXT ),
                           "struct and wrapper have different size!" );
 VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT>::value, "struct wrapper is not a standard layout!" );
@@ -8315,247 +7474,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorPoolOverallocationFeaturesNV>::value,
                           "PhysicalDeviceDescriptorPoolOverallocationFeaturesNV is not nothrow_move_constructible!" );
 
-//=== VK_QCOM_tile_memory_heap ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM ) == sizeof( VkPhysicalDeviceTileMemoryHeapFeaturesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapFeaturesQCOM>::value,
-                          "PhysicalDeviceTileMemoryHeapFeaturesQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM ) == sizeof( VkPhysicalDeviceTileMemoryHeapPropertiesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceTileMemoryHeapPropertiesQCOM>::value,
-                          "PhysicalDeviceTileMemoryHeapPropertiesQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM ) == sizeof( VkTileMemoryRequirementsQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TileMemoryRequirementsQCOM>::value,
-                          "TileMemoryRequirementsQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM ) == sizeof( VkTileMemoryBindInfoQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TileMemoryBindInfoQCOM>::value,
-                          "TileMemoryBindInfoQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM ) == sizeof( VkTileMemorySizeInfoQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::TileMemorySizeInfoQCOM>::value,
-                          "TileMemorySizeInfoQCOM is not nothrow_move_constructible!" );
-
-//=== VK_KHR_copy_memory_indirect ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR ) == sizeof( VkStridedDeviceAddressRangeKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRangeKHR>::value,
-                          "StridedDeviceAddressRangeKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR ) == sizeof( VkCopyMemoryIndirectCommandKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandKHR>::value,
-                          "CopyMemoryIndirectCommandKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR ) == sizeof( VkCopyMemoryIndirectInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectInfoKHR>::value,
-                          "CopyMemoryIndirectInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR ) == sizeof( VkCopyMemoryToImageIndirectCommandKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandKHR>::value,
-                          "CopyMemoryToImageIndirectCommandKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR ) == sizeof( VkCopyMemoryToImageIndirectInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectInfoKHR>::value,
-                          "CopyMemoryToImageIndirectInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesKHR>::value,
-                          "PhysicalDeviceCopyMemoryIndirectFeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR ) ==
-                            sizeof( VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesKHR>::value,
-                          "PhysicalDeviceCopyMemoryIndirectPropertiesKHR is not nothrow_move_constructible!" );
-
-//=== VK_EXT_memory_decompression ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT ) == sizeof( VkDecompressMemoryInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DecompressMemoryInfoEXT>::value,
-                          "DecompressMemoryInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT ) == sizeof( VkDecompressMemoryRegionEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionEXT>::value,
-                          "DecompressMemoryRegionEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceMemoryDecompressionFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesEXT>::value,
-                          "PhysicalDeviceMemoryDecompressionFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT ) ==
-                            sizeof( VkPhysicalDeviceMemoryDecompressionPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesEXT>::value,
-                          "PhysicalDeviceMemoryDecompressionPropertiesEXT is not nothrow_move_constructible!" );
-
-//=== VK_NV_display_stereo ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV ) == sizeof( VkDisplaySurfaceStereoCreateInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplaySurfaceStereoCreateInfoNV>::value,
-                          "DisplaySurfaceStereoCreateInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV ) == sizeof( VkDisplayModeStereoPropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DisplayModeStereoPropertiesNV>::value,
-                          "DisplayModeStereoPropertiesNV is not nothrow_move_constructible!" );
-
-//=== VK_KHR_video_encode_intra_refresh ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR ) == sizeof( VkVideoEncodeIntraRefreshCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshCapabilitiesKHR>::value,
-                          "VideoEncodeIntraRefreshCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR ) ==
-                            sizeof( VkVideoEncodeSessionIntraRefreshCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeSessionIntraRefreshCreateInfoKHR>::value,
-                          "VideoEncodeSessionIntraRefreshCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR ) == sizeof( VkVideoEncodeIntraRefreshInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeIntraRefreshInfoKHR>::value,
-                          "VideoEncodeIntraRefreshInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR ) == sizeof( VkVideoReferenceIntraRefreshInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoReferenceIntraRefreshInfoKHR>::value,
-                          "VideoReferenceIntraRefreshInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>::value,
-                          "PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_KHR_video_encode_quantization_map ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR ) == sizeof( VkVideoEncodeQuantizationMapCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapCapabilitiesKHR>::value,
-                          "VideoEncodeQuantizationMapCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR ) == sizeof( VkVideoFormatQuantizationMapPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoFormatQuantizationMapPropertiesKHR>::value,
-                          "VideoFormatQuantizationMapPropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR ) == sizeof( VkVideoEncodeQuantizationMapInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapInfoKHR>::value,
-                          "VideoEncodeQuantizationMapInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR ) ==
-                            sizeof( VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeQuantizationMapSessionParametersCreateInfoKHR>::value,
-                          "VideoEncodeQuantizationMapSessionParametersCreateInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>::value,
-                          "PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR ) ==
-                            sizeof( VkVideoEncodeH264QuantizationMapCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeH264QuantizationMapCapabilitiesKHR>::value,
-                          "VideoEncodeH264QuantizationMapCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR ) ==
-                            sizeof( VkVideoEncodeH265QuantizationMapCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeH265QuantizationMapCapabilitiesKHR>::value,
-                          "VideoEncodeH265QuantizationMapCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR ) ==
-                            sizeof( VkVideoFormatH265QuantizationMapPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoFormatH265QuantizationMapPropertiesKHR>::value,
-                          "VideoFormatH265QuantizationMapPropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR ) ==
-                            sizeof( VkVideoEncodeAV1QuantizationMapCapabilitiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoEncodeAV1QuantizationMapCapabilitiesKHR>::value,
-                          "VideoEncodeAV1QuantizationMapCapabilitiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR ) == sizeof( VkVideoFormatAV1QuantizationMapPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoFormatAV1QuantizationMapPropertiesKHR>::value,
-                          "VideoFormatAV1QuantizationMapPropertiesKHR is not nothrow_move_constructible!" );
-
 //=== VK_NV_raw_access_chains ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRawAccessChainsFeaturesNV ) == sizeof( VkPhysicalDeviceRawAccessChainsFeaturesNV ),
@@ -8565,100 +7483,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRawAccessChainsFeaturesNV>::value,
                           "PhysicalDeviceRawAccessChainsFeaturesNV is not nothrow_move_constructible!" );
 
-//=== VK_NV_external_compute_queue ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV ) == sizeof( VkExternalComputeQueueNV ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV>::value,
-                          "ExternalComputeQueueNV is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalComputeQueueNV>::value,
-                          "ExternalComputeQueueNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV ) == sizeof( VkExternalComputeQueueDeviceCreateInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDeviceCreateInfoNV>::value,
-                          "ExternalComputeQueueDeviceCreateInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV ) == sizeof( VkExternalComputeQueueCreateInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalComputeQueueCreateInfoNV>::value,
-                          "ExternalComputeQueueCreateInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV ) == sizeof( VkExternalComputeQueueDataParamsNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ExternalComputeQueueDataParamsNV>::value,
-                          "ExternalComputeQueueDataParamsNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV ) ==
-                            sizeof( VkPhysicalDeviceExternalComputeQueuePropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalComputeQueuePropertiesNV>::value,
-                          "PhysicalDeviceExternalComputeQueuePropertiesNV is not nothrow_move_constructible!" );
-
-//=== VK_KHR_shader_relaxed_extended_instruction ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR ) ==
-                            sizeof( VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>::value,
-                          "PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_NV_command_buffer_inheritance ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV ) ==
-                            sizeof( VkPhysicalDeviceCommandBufferInheritanceFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCommandBufferInheritanceFeaturesNV>::value,
-                          "PhysicalDeviceCommandBufferInheritanceFeaturesNV is not nothrow_move_constructible!" );
-
-//=== VK_KHR_maintenance7 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance7FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7FeaturesKHR>::value,
-                          "PhysicalDeviceMaintenance7FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR ) == sizeof( VkPhysicalDeviceMaintenance7PropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance7PropertiesKHR>::value,
-                          "PhysicalDeviceMaintenance7PropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR ) == sizeof( VkPhysicalDeviceLayeredApiPropertiesListKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesListKHR>::value,
-                          "PhysicalDeviceLayeredApiPropertiesListKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR ) == sizeof( VkPhysicalDeviceLayeredApiPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiPropertiesKHR>::value,
-                          "PhysicalDeviceLayeredApiPropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR ) ==
-                            sizeof( VkPhysicalDeviceLayeredApiVulkanPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredApiVulkanPropertiesKHR>::value,
-                          "PhysicalDeviceLayeredApiVulkanPropertiesKHR is not nothrow_move_constructible!" );
-
 //=== VK_NV_shader_atomic_float16_vector ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV ) ==
@@ -8669,25 +7493,6 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>::value,
                           "PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV is not nothrow_move_constructible!" );
 
-//=== VK_EXT_shader_replicated_composites ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderReplicatedCompositesFeaturesEXT>::value,
-                          "PhysicalDeviceShaderReplicatedCompositesFeaturesEXT is not nothrow_move_constructible!" );
-
-//=== VK_EXT_shader_float8 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT ) == sizeof( VkPhysicalDeviceShaderFloat8FeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat8FeaturesEXT>::value,
-                          "PhysicalDeviceShaderFloat8FeaturesEXT is not nothrow_move_constructible!" );
-
 //=== VK_NV_ray_tracing_validation ===
 
 VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingValidationFeaturesNV ) ==
@@ -8698,915 +7503,4 @@ VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::Physical
 VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingValidationFeaturesNV>::value,
                           "PhysicalDeviceRayTracingValidationFeaturesNV is not nothrow_move_constructible!" );
 
-//=== VK_NV_cluster_acceleration_structure ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV ) ==
-                            sizeof( VkPhysicalDeviceClusterAccelerationStructureFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructureFeaturesNV>::value,
-                          "PhysicalDeviceClusterAccelerationStructureFeaturesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV ) ==
-                            sizeof( VkPhysicalDeviceClusterAccelerationStructurePropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterAccelerationStructurePropertiesNV>::value,
-                          "PhysicalDeviceClusterAccelerationStructurePropertiesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV ) ==
-                            sizeof( VkClusterAccelerationStructureClustersBottomLevelInputNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureClustersBottomLevelInputNV>::value,
-                          "ClusterAccelerationStructureClustersBottomLevelInputNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV ) ==
-                            sizeof( VkClusterAccelerationStructureTriangleClusterInputNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureTriangleClusterInputNV>::value,
-                          "ClusterAccelerationStructureTriangleClusterInputNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV ) ==
-                            sizeof( VkClusterAccelerationStructureMoveObjectsInputNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInputNV>::value,
-                          "ClusterAccelerationStructureMoveObjectsInputNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpInputNV ) == sizeof( VkClusterAccelerationStructureOpInputNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpInputNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureOpInputNV>::value,
-                          "ClusterAccelerationStructureOpInputNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInputInfoNV ) == sizeof( VkClusterAccelerationStructureInputInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInputInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInputInfoNV>::value,
-                          "ClusterAccelerationStructureInputInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureCommandsInfoNV ) == sizeof( VkClusterAccelerationStructureCommandsInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureCommandsInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureCommandsInfoNV>::value,
-                          "ClusterAccelerationStructureCommandsInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV ) == sizeof( VkStridedDeviceAddressNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::StridedDeviceAddressNV>::value,
-                          "StridedDeviceAddressNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV ) ==
-                            sizeof( VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV>::value,
-                          "ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureMoveObjectsInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureMoveObjectsInfoNV>::value,
-                          "ClusterAccelerationStructureMoveObjectsInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildClustersBottomLevelInfoNV>::value,
-                          "ClusterAccelerationStructureBuildClustersBottomLevelInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureBuildTriangleClusterInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterInfoNV>::value,
-                          "ClusterAccelerationStructureBuildTriangleClusterInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV>::value,
-                          "ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureInstantiateClusterInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureInstantiateClusterInfoNV>::value,
-                          "ClusterAccelerationStructureInstantiateClusterInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV ) ==
-                            sizeof( VkClusterAccelerationStructureGetTemplateIndicesInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ClusterAccelerationStructureGetTemplateIndicesInfoNV>::value,
-                          "ClusterAccelerationStructureGetTemplateIndicesInfoNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV ) ==
-                            sizeof( VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RayTracingPipelineClusterAccelerationStructureCreateInfoNV>::value,
-                          "RayTracingPipelineClusterAccelerationStructureCreateInfoNV is not nothrow_move_constructible!" );
-
-//=== VK_NV_partitioned_acceleration_structure ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV ) ==
-                            sizeof( VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructureFeaturesNV>::value,
-                          "PhysicalDevicePartitionedAccelerationStructureFeaturesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV ) ==
-                            sizeof( VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePartitionedAccelerationStructurePropertiesNV>::value,
-                          "PhysicalDevicePartitionedAccelerationStructurePropertiesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV ) == sizeof( VkPartitionedAccelerationStructureFlagsNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureFlagsNV>::value,
-                          "PartitionedAccelerationStructureFlagsNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV ) ==
-                            sizeof( VkBuildPartitionedAccelerationStructureIndirectCommandNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureIndirectCommandNV>::value,
-                          "BuildPartitionedAccelerationStructureIndirectCommandNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV ) ==
-                            sizeof( VkPartitionedAccelerationStructureWriteInstanceDataNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWriteInstanceDataNV>::value,
-                          "PartitionedAccelerationStructureWriteInstanceDataNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV ) ==
-                            sizeof( VkPartitionedAccelerationStructureUpdateInstanceDataNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureUpdateInstanceDataNV>::value,
-                          "PartitionedAccelerationStructureUpdateInstanceDataNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV ) ==
-                            sizeof( VkPartitionedAccelerationStructureWritePartitionTranslationDataNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureWritePartitionTranslationDataNV>::value,
-                          "PartitionedAccelerationStructureWritePartitionTranslationDataNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV ) ==
-                            sizeof( VkWriteDescriptorSetPartitionedAccelerationStructureNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteDescriptorSetPartitionedAccelerationStructureNV>::value,
-                          "WriteDescriptorSetPartitionedAccelerationStructureNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV ) ==
-                            sizeof( VkPartitionedAccelerationStructureInstancesInputNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PartitionedAccelerationStructureInstancesInputNV>::value,
-                          "PartitionedAccelerationStructureInstancesInputNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV ) ==
-                            sizeof( VkBuildPartitionedAccelerationStructureInfoNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BuildPartitionedAccelerationStructureInfoNV>::value,
-                          "BuildPartitionedAccelerationStructureInfoNV is not nothrow_move_constructible!" );
-
-//=== VK_EXT_device_generated_commands ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT ) == sizeof( VkIndirectCommandsLayoutEXT ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT>::value,
-                          "IndirectCommandsLayoutEXT is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutEXT>::value,
-                          "IndirectCommandsLayoutEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT ) == sizeof( VkIndirectExecutionSetEXT ),
-                          "handle and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_copy_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT>::value,
-                          "IndirectExecutionSetEXT is not copy_constructible!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetEXT>::value,
-                          "IndirectExecutionSetEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>::value,
-                          "PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT ) ==
-                            sizeof( VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>::value,
-                          "PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT ) == sizeof( VkGeneratedCommandsMemoryRequirementsInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoEXT>::value,
-                          "GeneratedCommandsMemoryRequirementsInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetCreateInfoEXT ) == sizeof( VkIndirectExecutionSetCreateInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectExecutionSetCreateInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetCreateInfoEXT>::value,
-                          "IndirectExecutionSetCreateInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoEXT ) == sizeof( VkIndirectExecutionSetInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetInfoEXT>::value,
-                          "IndirectExecutionSetInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT ) == sizeof( VkIndirectExecutionSetPipelineInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetPipelineInfoEXT>::value,
-                          "IndirectExecutionSetPipelineInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT ) == sizeof( VkIndirectExecutionSetShaderInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderInfoEXT>::value,
-                          "IndirectExecutionSetShaderInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT ) == sizeof( VkGeneratedCommandsInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoEXT>::value,
-                          "GeneratedCommandsInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT ) == sizeof( VkWriteIndirectExecutionSetPipelineEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetPipelineEXT>::value,
-                          "WriteIndirectExecutionSetPipelineEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT ) == sizeof( VkIndirectCommandsLayoutCreateInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoEXT>::value,
-                          "IndirectCommandsLayoutCreateInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenEXT ) == sizeof( VkIndirectCommandsLayoutTokenEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenEXT>::value,
-                          "IndirectCommandsLayoutTokenEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT ) == sizeof( VkDrawIndirectCountIndirectCommandEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DrawIndirectCountIndirectCommandEXT>::value,
-                          "DrawIndirectCountIndirectCommandEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT ) == sizeof( VkIndirectCommandsVertexBufferTokenEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsVertexBufferTokenEXT>::value,
-                          "IndirectCommandsVertexBufferTokenEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT ) == sizeof( VkBindVertexBufferIndirectCommandEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandEXT>::value,
-                          "BindVertexBufferIndirectCommandEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT ) == sizeof( VkIndirectCommandsIndexBufferTokenEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsIndexBufferTokenEXT>::value,
-                          "IndirectCommandsIndexBufferTokenEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT ) == sizeof( VkBindIndexBufferIndirectCommandEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandEXT>::value,
-                          "BindIndexBufferIndirectCommandEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT ) == sizeof( VkIndirectCommandsPushConstantTokenEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsPushConstantTokenEXT>::value,
-                          "IndirectCommandsPushConstantTokenEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT ) == sizeof( VkIndirectCommandsExecutionSetTokenEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsExecutionSetTokenEXT>::value,
-                          "IndirectCommandsExecutionSetTokenEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectCommandsTokenDataEXT ) == sizeof( VkIndirectCommandsTokenDataEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectCommandsTokenDataEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectCommandsTokenDataEXT>::value,
-                          "IndirectCommandsTokenDataEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT ) == sizeof( VkIndirectExecutionSetShaderLayoutInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::IndirectExecutionSetShaderLayoutInfoEXT>::value,
-                          "IndirectExecutionSetShaderLayoutInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT ) == sizeof( VkGeneratedCommandsPipelineInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::GeneratedCommandsPipelineInfoEXT>::value,
-                          "GeneratedCommandsPipelineInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT ) == sizeof( VkGeneratedCommandsShaderInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::GeneratedCommandsShaderInfoEXT>::value,
-                          "GeneratedCommandsShaderInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT ) == sizeof( VkWriteIndirectExecutionSetShaderEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::WriteIndirectExecutionSetShaderEXT>::value,
-                          "WriteIndirectExecutionSetShaderEXT is not nothrow_move_constructible!" );
-
-//=== VK_KHR_maintenance8 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR ) == sizeof( VkMemoryBarrierAccessFlags3KHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryBarrierAccessFlags3KHR>::value,
-                          "MemoryBarrierAccessFlags3KHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance8FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance8FeaturesKHR>::value,
-                          "PhysicalDeviceMaintenance8FeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_MESA_image_alignment_control ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA ) ==
-                            sizeof( VkPhysicalDeviceImageAlignmentControlFeaturesMESA ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlFeaturesMESA>::value,
-                          "PhysicalDeviceImageAlignmentControlFeaturesMESA is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA ) ==
-                            sizeof( VkPhysicalDeviceImageAlignmentControlPropertiesMESA ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageAlignmentControlPropertiesMESA>::value,
-                          "PhysicalDeviceImageAlignmentControlPropertiesMESA is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA ) == sizeof( VkImageAlignmentControlCreateInfoMESA ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImageAlignmentControlCreateInfoMESA>::value,
-                          "ImageAlignmentControlCreateInfoMESA is not nothrow_move_constructible!" );
-
-//=== VK_KHR_shader_fma ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR ) == sizeof( VkPhysicalDeviceShaderFmaFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFmaFeaturesKHR>::value,
-                          "PhysicalDeviceShaderFmaFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_EXT_ray_tracing_invocation_reorder ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT ) ==
-                            sizeof( VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesEXT>::value,
-                          "PhysicalDeviceRayTracingInvocationReorderPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesEXT>::value,
-                          "PhysicalDeviceRayTracingInvocationReorderFeaturesEXT is not nothrow_move_constructible!" );
-
-//=== VK_EXT_depth_clamp_control ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT ) == sizeof( VkPhysicalDeviceDepthClampControlFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampControlFeaturesEXT>::value,
-                          "PhysicalDeviceDepthClampControlFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT ) ==
-                            sizeof( VkPipelineViewportDepthClampControlCreateInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClampControlCreateInfoEXT>::value,
-                          "PipelineViewportDepthClampControlCreateInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DepthClampRangeEXT ) == sizeof( VkDepthClampRangeEXT ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DepthClampRangeEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DepthClampRangeEXT>::value,
-                          "DepthClampRangeEXT is not nothrow_move_constructible!" );
-
-//=== VK_KHR_maintenance9 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance9FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9FeaturesKHR>::value,
-                          "PhysicalDeviceMaintenance9FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR ) == sizeof( VkPhysicalDeviceMaintenance9PropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance9PropertiesKHR>::value,
-                          "PhysicalDeviceMaintenance9PropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR ) == sizeof( VkQueueFamilyOwnershipTransferPropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::QueueFamilyOwnershipTransferPropertiesKHR>::value,
-                          "QueueFamilyOwnershipTransferPropertiesKHR is not nothrow_move_constructible!" );
-
-//=== VK_KHR_video_maintenance2 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR ) == sizeof( VkPhysicalDeviceVideoMaintenance2FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance2FeaturesKHR>::value,
-                          "PhysicalDeviceVideoMaintenance2FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR ) ==
-                            sizeof( VkVideoDecodeH264InlineSessionParametersInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeH264InlineSessionParametersInfoKHR>::value,
-                          "VideoDecodeH264InlineSessionParametersInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR ) ==
-                            sizeof( VkVideoDecodeH265InlineSessionParametersInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeH265InlineSessionParametersInfoKHR>::value,
-                          "VideoDecodeH265InlineSessionParametersInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR ) ==
-                            sizeof( VkVideoDecodeAV1InlineSessionParametersInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::VideoDecodeAV1InlineSessionParametersInfoKHR>::value,
-                          "VideoDecodeAV1InlineSessionParametersInfoKHR is not nothrow_move_constructible!" );
-
-#if defined( VK_USE_PLATFORM_OHOS )
-//=== VK_OHOS_surface ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS ) == sizeof( VkSurfaceCreateInfoOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SurfaceCreateInfoOHOS>::value,
-                          "SurfaceCreateInfoOHOS is not nothrow_move_constructible!" );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-//=== VK_OHOS_native_buffer ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::NativeBufferOHOS ) == sizeof( VkNativeBufferOHOS ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::NativeBufferOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::NativeBufferOHOS>::value,
-                          "NativeBufferOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS ) == sizeof( VkSwapchainImageCreateInfoOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SwapchainImageCreateInfoOHOS>::value,
-                          "SwapchainImageCreateInfoOHOS is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS ) == sizeof( VkPhysicalDevicePresentationPropertiesOHOS ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentationPropertiesOHOS>::value,
-                          "PhysicalDevicePresentationPropertiesOHOS is not nothrow_move_constructible!" );
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-//=== VK_HUAWEI_hdr_vivid ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI ) == sizeof( VkPhysicalDeviceHdrVividFeaturesHUAWEI ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceHdrVividFeaturesHUAWEI>::value,
-                          "PhysicalDeviceHdrVividFeaturesHUAWEI is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI ) == sizeof( VkHdrVividDynamicMetadataHUAWEI ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::HdrVividDynamicMetadataHUAWEI>::value,
-                          "HdrVividDynamicMetadataHUAWEI is not nothrow_move_constructible!" );
-
-//=== VK_NV_cooperative_matrix2 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV ) ==
-                            sizeof( VkCooperativeMatrixFlexibleDimensionsPropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CooperativeMatrixFlexibleDimensionsPropertiesNV>::value,
-                          "CooperativeMatrixFlexibleDimensionsPropertiesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV ) == sizeof( VkPhysicalDeviceCooperativeMatrix2FeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2FeaturesNV>::value,
-                          "PhysicalDeviceCooperativeMatrix2FeaturesNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV ) ==
-                            sizeof( VkPhysicalDeviceCooperativeMatrix2PropertiesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrix2PropertiesNV>::value,
-                          "PhysicalDeviceCooperativeMatrix2PropertiesNV is not nothrow_move_constructible!" );
-
-//=== VK_ARM_pipeline_opacity_micromap ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM ) ==
-                            sizeof( VkPhysicalDevicePipelineOpacityMicromapFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineOpacityMicromapFeaturesARM>::value,
-                          "PhysicalDevicePipelineOpacityMicromapFeaturesARM is not nothrow_move_constructible!" );
-
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-//=== VK_EXT_external_memory_metal ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT ) == sizeof( VkImportMemoryMetalHandleInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ImportMemoryMetalHandleInfoEXT>::value,
-                          "ImportMemoryMetalHandleInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT ) == sizeof( VkMemoryMetalHandlePropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryMetalHandlePropertiesEXT>::value,
-                          "MemoryMetalHandlePropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT ) == sizeof( VkMemoryGetMetalHandleInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::MemoryGetMetalHandleInfoEXT>::value,
-                          "MemoryGetMetalHandleInfoEXT is not nothrow_move_constructible!" );
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-//=== VK_KHR_depth_clamp_zero_one ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR ) == sizeof( VkPhysicalDeviceDepthClampZeroOneFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesKHR>::value,
-                          "PhysicalDeviceDepthClampZeroOneFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_ARM_performance_counters_by_region ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM ) ==
-                            sizeof( VkPhysicalDevicePerformanceCountersByRegionFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionFeaturesARM>::value,
-                          "PhysicalDevicePerformanceCountersByRegionFeaturesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM ) ==
-                            sizeof( VkPhysicalDevicePerformanceCountersByRegionPropertiesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceCountersByRegionPropertiesARM>::value,
-                          "PhysicalDevicePerformanceCountersByRegionPropertiesARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerformanceCounterARM ) == sizeof( VkPerformanceCounterARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PerformanceCounterARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerformanceCounterARM>::value,
-                          "PerformanceCounterARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM ) == sizeof( VkPerformanceCounterDescriptionARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionARM>::value,
-                          "PerformanceCounterDescriptionARM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM ) ==
-                            sizeof( VkRenderPassPerformanceCountersByRegionBeginInfoARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassPerformanceCountersByRegionBeginInfoARM>::value,
-                          "RenderPassPerformanceCountersByRegionBeginInfoARM is not nothrow_move_constructible!" );
-
-//=== VK_EXT_vertex_attribute_robustness ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeRobustnessFeaturesEXT>::value,
-                          "PhysicalDeviceVertexAttributeRobustnessFeaturesEXT is not nothrow_move_constructible!" );
-
-//=== VK_ARM_format_pack ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM ) == sizeof( VkPhysicalDeviceFormatPackFeaturesARM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFormatPackFeaturesARM>::value,
-                          "PhysicalDeviceFormatPackFeaturesARM is not nothrow_move_constructible!" );
-
-//=== VK_VALVE_fragment_density_map_layered ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE ) ==
-                            sizeof( VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>::value,
-                          "PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE ) ==
-                            sizeof( VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>::value,
-                          "PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE ) ==
-                            sizeof( VkPipelineFragmentDensityMapLayeredCreateInfoVALVE ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineFragmentDensityMapLayeredCreateInfoVALVE>::value,
-                          "PipelineFragmentDensityMapLayeredCreateInfoVALVE is not nothrow_move_constructible!" );
-
-//=== VK_KHR_robustness2 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR ) == sizeof( VkPhysicalDeviceRobustness2FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesKHR>::value,
-                          "PhysicalDeviceRobustness2FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR ) == sizeof( VkPhysicalDeviceRobustness2PropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesKHR>::value,
-                          "PhysicalDeviceRobustness2PropertiesKHR is not nothrow_move_constructible!" );
-
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-//=== VK_NV_present_metering ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::SetPresentConfigNV ) == sizeof( VkSetPresentConfigNV ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::SetPresentConfigNV>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::SetPresentConfigNV>::value,
-                          "SetPresentConfigNV is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV ) == sizeof( VkPhysicalDevicePresentMeteringFeaturesNV ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentMeteringFeaturesNV>::value,
-                          "PhysicalDevicePresentMeteringFeaturesNV is not nothrow_move_constructible!" );
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-//=== VK_EXT_fragment_density_map_offset ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>::value,
-                          "PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT ) ==
-                            sizeof( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>::value,
-                          "PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT ) ==
-                            sizeof( VkRenderPassFragmentDensityMapOffsetEndInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapOffsetEndInfoEXT>::value,
-                          "RenderPassFragmentDensityMapOffsetEndInfoEXT is not nothrow_move_constructible!" );
-
-//=== VK_EXT_zero_initialize_device_memory ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>::value,
-                          "PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT is not nothrow_move_constructible!" );
-
-//=== VK_KHR_present_mode_fifo_latest_ready ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR ) ==
-                            sizeof( VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>::value,
-                          "PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR is not nothrow_move_constructible!" );
-
-//=== VK_EXT_shader_64bit_indexing ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceShader64BitIndexingFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShader64BitIndexingFeaturesEXT>::value,
-                          "PhysicalDeviceShader64BitIndexingFeaturesEXT is not nothrow_move_constructible!" );
-
-//=== VK_EXT_custom_resolve ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT ) == sizeof( VkPhysicalDeviceCustomResolveFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomResolveFeaturesEXT>::value,
-                          "PhysicalDeviceCustomResolveFeaturesEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT ) == sizeof( VkBeginCustomResolveInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::BeginCustomResolveInfoEXT>::value,
-                          "BeginCustomResolveInfoEXT is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT ) == sizeof( VkCustomResolveCreateInfoEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::CustomResolveCreateInfoEXT>::value,
-                          "CustomResolveCreateInfoEXT is not nothrow_move_constructible!" );
-
-//=== VK_QCOM_data_graph_model ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM ) == sizeof( VkPipelineCacheHeaderVersionDataGraphQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionDataGraphQCOM>::value,
-                          "PipelineCacheHeaderVersionDataGraphQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM ) ==
-                            sizeof( VkDataGraphPipelineBuiltinModelCreateInfoQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::DataGraphPipelineBuiltinModelCreateInfoQCOM>::value,
-                          "DataGraphPipelineBuiltinModelCreateInfoQCOM is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM ) == sizeof( VkPhysicalDeviceDataGraphModelFeaturesQCOM ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceDataGraphModelFeaturesQCOM>::value,
-                          "PhysicalDeviceDataGraphModelFeaturesQCOM is not nothrow_move_constructible!" );
-
-//=== VK_KHR_maintenance10 ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR ) == sizeof( VkPhysicalDeviceMaintenance10FeaturesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10FeaturesKHR>::value,
-                          "PhysicalDeviceMaintenance10FeaturesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR ) == sizeof( VkPhysicalDeviceMaintenance10PropertiesKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance10PropertiesKHR>::value,
-                          "PhysicalDeviceMaintenance10PropertiesKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR ) == sizeof( VkRenderingEndInfoKHR ), "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingEndInfoKHR>::value,
-                          "RenderingEndInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR ) == sizeof( VkRenderingAttachmentFlagsInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::RenderingAttachmentFlagsInfoKHR>::value,
-                          "RenderingAttachmentFlagsInfoKHR is not nothrow_move_constructible!" );
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR ) == sizeof( VkResolveImageModeInfoKHR ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR>::value, "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::ResolveImageModeInfoKHR>::value,
-                          "ResolveImageModeInfoKHR is not nothrow_move_constructible!" );
-
-//=== VK_SEC_pipeline_cache_incremental_mode ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC ) ==
-                            sizeof( VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>::value,
-                          "PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC is not nothrow_move_constructible!" );
-
-//=== VK_EXT_shader_uniform_buffer_unsized_array ===
-
-VULKAN_HPP_STATIC_ASSERT( sizeof( VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT ) ==
-                            sizeof( VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT ),
-                          "struct and wrapper have different size!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_standard_layout<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>::value,
-                          "struct wrapper is not a standard layout!" );
-VULKAN_HPP_STATIC_ASSERT( std::is_nothrow_move_constructible<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>::value,
-                          "PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT is not nothrow_move_constructible!" );
-
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_structs.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_structs.hpp
index 8a84998b..45d9c2b9 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_structs.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_structs.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,12 +8,7 @@
 #ifndef VULKAN_STRUCTS_HPP
 #define VULKAN_STRUCTS_HPP
 
-// include-what-you-use: make sure, vulkan.hpp is used by code-completers
-// IWYU pragma: private, include "vulkan/vulkan.hpp"
-
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <cstring>  // strcmp
-#endif
+#include <cstring>  // strcmp
 
 namespace VULKAN_HPP_NAMESPACE
 {
@@ -22,20 +17,19 @@ namespace VULKAN_HPP_NAMESPACE
   //=== STRUCTS ===
   //===============
 
-  // wrapper struct for struct VkAabbPositionsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAabbPositionsKHR.html
   struct AabbPositionsKHR
   {
     using NativeType = VkAabbPositionsKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       AabbPositionsKHR( float minX_ = {}, float minY_ = {}, float minZ_ = {}, float maxX_ = {}, float maxY_ = {}, float maxZ_ = {} ) VULKAN_HPP_NOEXCEPT
-      : minX{ minX_ }
-      , minY{ minY_ }
-      , minZ{ minZ_ }
-      , maxX{ maxX_ }
-      , maxY{ maxY_ }
-      , maxZ{ maxZ_ }
+      : minX( minX_ )
+      , minY( minY_ )
+      , minZ( minZ_ )
+      , maxX( maxX_ )
+      , maxY( maxY_ )
+      , maxZ( maxZ_ )
     {
     }
 
@@ -44,15 +38,15 @@ namespace VULKAN_HPP_NAMESPACE
     AabbPositionsKHR( VkAabbPositionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT : AabbPositionsKHR( *reinterpret_cast<AabbPositionsKHR const *>( &rhs ) ) {}
 
     AabbPositionsKHR & operator=( AabbPositionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AabbPositionsKHR & operator=( VkAabbPositionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AabbPositionsKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AabbPositionsKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AabbPositionsKHR & setMinX( float minX_ ) VULKAN_HPP_NOEXCEPT
     {
       minX = minX_;
@@ -88,7 +82,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxZ = maxZ_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAabbPositionsKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -100,18 +94,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAabbPositionsKHR *>( this );
     }
 
-    operator VkAabbPositionsKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAabbPositionsKHR *>( this );
-    }
-
-    operator VkAabbPositionsKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAabbPositionsKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &, float const &, float const &, float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, float const &, float const &, float const &, float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( minX, minY, minZ, maxX, maxY, maxZ );
     }
@@ -144,27 +133,20 @@ namespace VULKAN_HPP_NAMESPACE
     float maxZ = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAabbPositionsKHR>
-  {
-    using Type = AabbPositionsKHR;
-  };
-#endif
   using AabbPositionsNV = AabbPositionsKHR;
 
   union DeviceOrHostAddressConstKHR
   {
     using NativeType = VkDeviceOrHostAddressConstKHR;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstKHR( DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstKHR( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstKHR( const void * hostAddress_ ) : hostAddress( hostAddress_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstKHR & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstKHR & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
@@ -175,7 +157,7 @@ namespace VULKAN_HPP_NAMESPACE
       hostAddress = hostAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkDeviceOrHostAddressConstKHR const &() const
     {
@@ -188,24 +170,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    DeviceAddress deviceAddress;
-    const void *  hostAddress;
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress;
+    const void *                        hostAddress;
 #else
-    VkDeviceAddress deviceAddress;
-    const void *    hostAddress;
+    VkDeviceAddress                                 deviceAddress;
+    const void *                                    hostAddress;
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceOrHostAddressConstKHR>
-  {
-    using Type = DeviceOrHostAddressConstKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureGeometryTrianglesDataKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryTrianglesDataKHR.html
   struct AccelerationStructureGeometryTrianglesDataKHR
   {
     using NativeType = VkAccelerationStructureGeometryTrianglesDataKHR;
@@ -213,23 +185,24 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryTrianglesDataKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR( Format                      vertexFormat_  = Format::eUndefined,
-                                                                           DeviceOrHostAddressConstKHR vertexData_    = {},
-                                                                           DeviceSize                  vertexStride_  = {},
-                                                                           uint32_t                    maxVertex_     = {},
-                                                                           IndexType                   indexType_     = IndexType::eUint16,
-                                                                           DeviceOrHostAddressConstKHR indexData_     = {},
-                                                                           DeviceOrHostAddressConstKHR transformData_ = {},
-                                                                           const void *                pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexFormat{ vertexFormat_ }
-      , vertexData{ vertexData_ }
-      , vertexStride{ vertexStride_ }
-      , maxVertex{ maxVertex_ }
-      , indexType{ indexType_ }
-      , indexData{ indexData_ }
-      , transformData{ transformData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      AccelerationStructureGeometryTrianglesDataKHR( VULKAN_HPP_NAMESPACE::Format                      vertexFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                     VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR vertexData_   = {},
+                                                     VULKAN_HPP_NAMESPACE::DeviceSize                  vertexStride_ = {},
+                                                     uint32_t                                          maxVertex_    = {},
+                                                     VULKAN_HPP_NAMESPACE::IndexType                   indexType_    = VULKAN_HPP_NAMESPACE::IndexType::eUint16,
+                                                     VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR indexData_    = {},
+                                                     VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR transformData_ = {},
+                                                     const void *                                      pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexFormat( vertexFormat_ )
+      , vertexData( vertexData_ )
+      , vertexStride( vertexStride_ )
+      , maxVertex( maxVertex_ )
+      , indexType( indexType_ )
+      , indexData( indexData_ )
+      , transformData( transformData_ )
     {
     }
 
@@ -242,34 +215,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureGeometryTrianglesDataKHR & operator=( AccelerationStructureGeometryTrianglesDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureGeometryTrianglesDataKHR & operator=( VkAccelerationStructureGeometryTrianglesDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureGeometryTrianglesDataKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryTrianglesDataKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setVertexFormat( Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setVertexFormat( VULKAN_HPP_NAMESPACE::Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexFormat = vertexFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setVertexData( DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR &
+      setVertexData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexData = vertexData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setVertexStride( DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR &
+      setVertexStride( VULKAN_HPP_NAMESPACE::DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexStride = vertexStride_;
       return *this;
@@ -281,25 +256,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setIndexType( VULKAN_HPP_NAMESPACE::IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
     {
       indexType = indexType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR & setIndexData( DeviceOrHostAddressConstKHR const & indexData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR &
+      setIndexData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & indexData_ ) VULKAN_HPP_NOEXCEPT
     {
       indexData = indexData_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryTrianglesDataKHR &
-      setTransformData( DeviceOrHostAddressConstKHR const & transformData_ ) VULKAN_HPP_NOEXCEPT
+      setTransformData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & transformData_ ) VULKAN_HPP_NOEXCEPT
     {
       transformData = transformData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureGeometryTrianglesDataKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -311,26 +287,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureGeometryTrianglesDataKHR *>( this );
     }
 
-    operator VkAccelerationStructureGeometryTrianglesDataKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryTrianglesDataKHR *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryTrianglesDataKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryTrianglesDataKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
-               IndexType const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceOrHostAddressConstKHR const &>
+               VULKAN_HPP_NAMESPACE::IndexType const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vertexFormat, vertexData, vertexStride, maxVertex, indexType, indexData, transformData );
@@ -338,33 +308,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType         = StructureType::eAccelerationStructureGeometryTrianglesDataKHR;
-    const void *                pNext         = {};
-    Format                      vertexFormat  = Format::eUndefined;
-    DeviceOrHostAddressConstKHR vertexData    = {};
-    DeviceSize                  vertexStride  = {};
-    uint32_t                    maxVertex     = {};
-    IndexType                   indexType     = IndexType::eUint16;
-    DeviceOrHostAddressConstKHR indexData     = {};
-    DeviceOrHostAddressConstKHR transformData = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType         = StructureType::eAccelerationStructureGeometryTrianglesDataKHR;
+    const void *                                      pNext         = {};
+    VULKAN_HPP_NAMESPACE::Format                      vertexFormat  = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR vertexData    = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  vertexStride  = {};
+    uint32_t                                          maxVertex     = {};
+    VULKAN_HPP_NAMESPACE::IndexType                   indexType     = VULKAN_HPP_NAMESPACE::IndexType::eUint16;
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR indexData     = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR transformData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryTrianglesDataKHR>
-  {
-    using Type = AccelerationStructureGeometryTrianglesDataKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureGeometryTrianglesDataKHR>
   {
     using Type = AccelerationStructureGeometryTrianglesDataKHR;
   };
 
-  // wrapper struct for struct VkAccelerationStructureGeometryAabbsDataKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryAabbsDataKHR.html
   struct AccelerationStructureGeometryAabbsDataKHR
   {
     using NativeType = VkAccelerationStructureGeometryAabbsDataKHR;
@@ -372,13 +332,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryAabbsDataKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR( DeviceOrHostAddressConstKHR data_   = {},
-                                                                       DeviceSize                  stride_ = {},
-                                                                       const void *                pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , data{ data_ }
-      , stride{ stride_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR data_   = {},
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize                  stride_ = {},
+                                                                       const void *                                      pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , data( data_ )
+      , stride( stride_ )
     {
     }
 
@@ -390,33 +350,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureGeometryAabbsDataKHR & operator=( AccelerationStructureGeometryAabbsDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureGeometryAabbsDataKHR & operator=( VkAccelerationStructureGeometryAabbsDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureGeometryAabbsDataKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryAabbsDataKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR & setData( DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR &
+      setData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR & setStride( DeviceSize stride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryAabbsDataKHR & setStride( VULKAN_HPP_NAMESPACE::DeviceSize stride_ ) VULKAN_HPP_NOEXCEPT
     {
       stride = stride_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureGeometryAabbsDataKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -428,46 +389,34 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureGeometryAabbsDataKHR *>( this );
     }
 
-    operator VkAccelerationStructureGeometryAabbsDataKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryAabbsDataKHR *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryAabbsDataKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryAabbsDataKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceOrHostAddressConstKHR const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, data, stride );
     }
 #endif
 
   public:
-    StructureType               sType  = StructureType::eAccelerationStructureGeometryAabbsDataKHR;
-    const void *                pNext  = {};
-    DeviceOrHostAddressConstKHR data   = {};
-    DeviceSize                  stride = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType  = StructureType::eAccelerationStructureGeometryAabbsDataKHR;
+    const void *                                      pNext  = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR data   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  stride = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryAabbsDataKHR>
-  {
-    using Type = AccelerationStructureGeometryAabbsDataKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureGeometryAabbsDataKHR>
   {
     using Type = AccelerationStructureGeometryAabbsDataKHR;
   };
 
-  // wrapper struct for struct VkAccelerationStructureGeometryInstancesDataKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryInstancesDataKHR.html
   struct AccelerationStructureGeometryInstancesDataKHR
   {
     using NativeType = VkAccelerationStructureGeometryInstancesDataKHR;
@@ -475,13 +424,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryInstancesDataKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR( Bool32                      arrayOfPointers_ = {},
-                                                                           DeviceOrHostAddressConstKHR data_            = {},
-                                                                           const void *                pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , arrayOfPointers{ arrayOfPointers_ }
-      , data{ data_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR( VULKAN_HPP_NAMESPACE::Bool32                      arrayOfPointers_ = {},
+                                                                           VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR data_            = {},
+                                                                           const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , arrayOfPointers( arrayOfPointers_ )
+      , data( data_ )
     {
     }
 
@@ -494,33 +443,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureGeometryInstancesDataKHR & operator=( AccelerationStructureGeometryInstancesDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureGeometryInstancesDataKHR & operator=( VkAccelerationStructureGeometryInstancesDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureGeometryInstancesDataKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryInstancesDataKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR & setArrayOfPointers( Bool32 arrayOfPointers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR &
+      setArrayOfPointers( VULKAN_HPP_NAMESPACE::Bool32 arrayOfPointers_ ) VULKAN_HPP_NOEXCEPT
     {
       arrayOfPointers = arrayOfPointers_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR & setData( DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryInstancesDataKHR &
+      setData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureGeometryInstancesDataKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -532,38 +483,28 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureGeometryInstancesDataKHR *>( this );
     }
 
-    operator VkAccelerationStructureGeometryInstancesDataKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryInstancesDataKHR *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryInstancesDataKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryInstancesDataKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, DeviceOrHostAddressConstKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, arrayOfPointers, data );
     }
 #endif
 
   public:
-    StructureType               sType           = StructureType::eAccelerationStructureGeometryInstancesDataKHR;
-    const void *                pNext           = {};
-    Bool32                      arrayOfPointers = {};
-    DeviceOrHostAddressConstKHR data            = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType           = StructureType::eAccelerationStructureGeometryInstancesDataKHR;
+    const void *                                      pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      arrayOfPointers = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR data            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryInstancesDataKHR>
-  {
-    using Type = AccelerationStructureGeometryInstancesDataKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureGeometryInstancesDataKHR>
   {
@@ -573,36 +514,43 @@ namespace VULKAN_HPP_NAMESPACE
   union AccelerationStructureGeometryDataKHR
   {
     using NativeType = VkAccelerationStructureGeometryDataKHR;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( AccelerationStructureGeometryTrianglesDataKHR triangles_ = {} ) : triangles( triangles_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryTrianglesDataKHR triangles_ = {} )
+      : triangles( triangles_ )
+    {
+    }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( AccelerationStructureGeometryAabbsDataKHR aabbs_ ) : aabbs( aabbs_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryAabbsDataKHR aabbs_ ) : aabbs( aabbs_ ) {}
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( AccelerationStructureGeometryInstancesDataKHR instances_ ) : instances( instances_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryInstancesDataKHR instances_ )
+      : instances( instances_ )
+    {
+    }
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR &
-      setTriangles( AccelerationStructureGeometryTrianglesDataKHR const & triangles_ ) VULKAN_HPP_NOEXCEPT
+      setTriangles( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryTrianglesDataKHR const & triangles_ ) VULKAN_HPP_NOEXCEPT
     {
       triangles = triangles_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR & setAabbs( AccelerationStructureGeometryAabbsDataKHR const & aabbs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR &
+      setAabbs( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryAabbsDataKHR const & aabbs_ ) VULKAN_HPP_NOEXCEPT
     {
       aabbs = aabbs_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryDataKHR &
-      setInstances( AccelerationStructureGeometryInstancesDataKHR const & instances_ ) VULKAN_HPP_NOEXCEPT
+      setInstances( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryInstancesDataKHR const & instances_ ) VULKAN_HPP_NOEXCEPT
     {
       instances = instances_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkAccelerationStructureGeometryDataKHR const &() const
     {
@@ -615,9 +563,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    AccelerationStructureGeometryTrianglesDataKHR triangles;
-    AccelerationStructureGeometryAabbsDataKHR     aabbs;
-    AccelerationStructureGeometryInstancesDataKHR instances;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryTrianglesDataKHR triangles;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryAabbsDataKHR     aabbs;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryInstancesDataKHR instances;
 #else
     VkAccelerationStructureGeometryTrianglesDataKHR triangles;
     VkAccelerationStructureGeometryAabbsDataKHR     aabbs;
@@ -625,16 +573,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryDataKHR>
-  {
-    using Type = AccelerationStructureGeometryDataKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureGeometryKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryKHR.html
   struct AccelerationStructureGeometryKHR
   {
     using NativeType = VkAccelerationStructureGeometryKHR;
@@ -642,15 +580,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR( GeometryTypeKHR                      geometryType_ = GeometryTypeKHR::eTriangles,
-                                                              AccelerationStructureGeometryDataKHR geometry_     = {},
-                                                              GeometryFlagsKHR                     flags_        = {},
-                                                              const void *                         pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , geometryType{ geometryType_ }
-      , geometry{ geometry_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      AccelerationStructureGeometryKHR( VULKAN_HPP_NAMESPACE::GeometryTypeKHR geometryType_ = VULKAN_HPP_NAMESPACE::GeometryTypeKHR::eTriangles,
+                                        VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryDataKHR geometry_ = {},
+                                        VULKAN_HPP_NAMESPACE::GeometryFlagsKHR                     flags_    = {},
+                                        const void *                                               pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , geometryType( geometryType_ )
+      , geometry( geometry_ )
+      , flags( flags_ )
     {
     }
 
@@ -662,39 +601,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureGeometryKHR & operator=( AccelerationStructureGeometryKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureGeometryKHR & operator=( VkAccelerationStructureGeometryKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureGeometryKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setGeometryType( GeometryTypeKHR geometryType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setGeometryType( VULKAN_HPP_NAMESPACE::GeometryTypeKHR geometryType_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryType = geometryType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setGeometry( AccelerationStructureGeometryDataKHR const & geometry_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR &
+      setGeometry( VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryDataKHR const & geometry_ ) VULKAN_HPP_NOEXCEPT
     {
       geometry = geometry_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setFlags( GeometryFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryKHR & setFlags( VULKAN_HPP_NAMESPACE::GeometryFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureGeometryKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -706,18 +646,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureGeometryKHR *>( this );
     }
 
-    operator VkAccelerationStructureGeometryKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryKHR *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, GeometryTypeKHR const &, AccelerationStructureGeometryDataKHR const &, GeometryFlagsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::GeometryTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryDataKHR const &,
+               VULKAN_HPP_NAMESPACE::GeometryFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, geometryType, geometry, flags );
@@ -725,21 +663,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType        = StructureType::eAccelerationStructureGeometryKHR;
-    const void *                         pNext        = {};
-    GeometryTypeKHR                      geometryType = GeometryTypeKHR::eTriangles;
-    AccelerationStructureGeometryDataKHR geometry     = {};
-    GeometryFlagsKHR                     flags        = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType        = StructureType::eAccelerationStructureGeometryKHR;
+    const void *                                               pNext        = {};
+    VULKAN_HPP_NAMESPACE::GeometryTypeKHR                      geometryType = VULKAN_HPP_NAMESPACE::GeometryTypeKHR::eTriangles;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryDataKHR geometry     = {};
+    VULKAN_HPP_NAMESPACE::GeometryFlagsKHR                     flags        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryKHR>
-  {
-    using Type = AccelerationStructureGeometryKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureGeometryKHR>
   {
@@ -749,15 +679,15 @@ namespace VULKAN_HPP_NAMESPACE
   union DeviceOrHostAddressKHR
   {
     using NativeType = VkDeviceOrHostAddressKHR;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressKHR( DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressKHR( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressKHR( void * hostAddress_ ) : hostAddress( hostAddress_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressKHR & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressKHR & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
@@ -768,7 +698,7 @@ namespace VULKAN_HPP_NAMESPACE
       hostAddress = hostAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkDeviceOrHostAddressKHR const &() const
     {
@@ -781,24 +711,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    DeviceAddress deviceAddress;
-    void *        hostAddress;
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress;
+    void *                              hostAddress;
 #else
-    VkDeviceAddress deviceAddress;
-    void *          hostAddress;
+    VkDeviceAddress                                 deviceAddress;
+    void *                                          hostAddress;
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceOrHostAddressKHR>
-  {
-    using Type = DeviceOrHostAddressKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureBuildGeometryInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureBuildGeometryInfoKHR.html
   struct AccelerationStructureBuildGeometryInfoKHR
   {
     using NativeType = VkAccelerationStructureBuildGeometryInfoKHR;
@@ -806,27 +726,28 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureBuildGeometryInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR( AccelerationStructureTypeKHR       type_  = AccelerationStructureTypeKHR::eTopLevel,
-                                                                       BuildAccelerationStructureFlagsKHR flags_ = {},
-                                                                       BuildAccelerationStructureModeKHR  mode_  = BuildAccelerationStructureModeKHR::eBuild,
-                                                                       AccelerationStructureKHR           srcAccelerationStructure_   = {},
-                                                                       AccelerationStructureKHR           dstAccelerationStructure_   = {},
-                                                                       uint32_t                           geometryCount_              = {},
-                                                                       const AccelerationStructureGeometryKHR *         pGeometries_  = {},
-                                                                       const AccelerationStructureGeometryKHR * const * ppGeometries_ = {},
-                                                                       DeviceOrHostAddressKHR                           scratchData_  = {},
-                                                                       const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , flags{ flags_ }
-      , mode{ mode_ }
-      , srcAccelerationStructure{ srcAccelerationStructure_ }
-      , dstAccelerationStructure{ dstAccelerationStructure_ }
-      , geometryCount{ geometryCount_ }
-      , pGeometries{ pGeometries_ }
-      , ppGeometries{ ppGeometries_ }
-      , scratchData{ scratchData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR                     type_  = VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR::eTopLevel,
+      VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR               flags_ = {},
+      VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR                mode_  = VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR::eBuild,
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                         srcAccelerationStructure_ = {},
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                         dstAccelerationStructure_ = {},
+      uint32_t                                                               geometryCount_            = {},
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR *         pGeometries_              = {},
+      const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const * ppGeometries_             = {},
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR                           scratchData_              = {},
+      const void *                                                           pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , flags( flags_ )
+      , mode( mode_ )
+      , srcAccelerationStructure( srcAccelerationStructure_ )
+      , dstAccelerationStructure( dstAccelerationStructure_ )
+      , geometryCount( geometryCount_ )
+      , pGeometries( pGeometries_ )
+      , ppGeometries( ppGeometries_ )
+      , scratchData( scratchData_ )
     {
     }
 
@@ -838,15 +759,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureBuildGeometryInfoKHR( AccelerationStructureTypeKHR                                                    type_,
-                                               BuildAccelerationStructureFlagsKHR                                              flags_,
-                                               BuildAccelerationStructureModeKHR                                               mode_,
-                                               AccelerationStructureKHR                                                        srcAccelerationStructure_,
-                                               AccelerationStructureKHR                                                        dstAccelerationStructure_,
-                                               ArrayProxyNoTemporaries<const AccelerationStructureGeometryKHR> const &         geometries_,
-                                               ArrayProxyNoTemporaries<const AccelerationStructureGeometryKHR * const> const & pGeometries_ = {},
-                                               DeviceOrHostAddressKHR                                                          scratchData_ = {},
-                                               const void *                                                                    pNext_       = nullptr )
+    AccelerationStructureBuildGeometryInfoKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR                                                                          type_,
+      VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR                                                                    flags_,
+      VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR                                                                     mode_,
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                                                                              srcAccelerationStructure_,
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                                                                              dstAccelerationStructure_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR> const &         geometries_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const> const & pGeometries_ = {},
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR                                                                                scratchData_ = {},
+      const void *                                                                                                                pNext_       = nullptr )
       : pNext( pNext_ )
       , type( type_ )
       , flags( flags_ )
@@ -872,48 +794,50 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     AccelerationStructureBuildGeometryInfoKHR & operator=( AccelerationStructureBuildGeometryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureBuildGeometryInfoKHR & operator=( VkAccelerationStructureBuildGeometryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureBuildGeometryInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildGeometryInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setType( AccelerationStructureTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setType( VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setFlags( BuildAccelerationStructureFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
+      setFlags( VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setMode( BuildAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
+      setMode( VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
-      setSrcAccelerationStructure( AccelerationStructureKHR srcAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setSrcAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR srcAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccelerationStructure = srcAccelerationStructure_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
-      setDstAccelerationStructure( AccelerationStructureKHR dstAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setDstAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR dstAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccelerationStructure = dstAccelerationStructure_;
       return *this;
@@ -926,15 +850,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
-      setPGeometries( const AccelerationStructureGeometryKHR * pGeometries_ ) VULKAN_HPP_NOEXCEPT
+      setPGeometries( const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * pGeometries_ ) VULKAN_HPP_NOEXCEPT
     {
       pGeometries = pGeometries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureBuildGeometryInfoKHR &
-      setGeometries( ArrayProxyNoTemporaries<const AccelerationStructureGeometryKHR> const & geometries_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureBuildGeometryInfoKHR & setGeometries(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR> const & geometries_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryCount = static_cast<uint32_t>( geometries_.size() );
       pGeometries   = geometries_.data();
@@ -943,7 +867,7 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
-      setPpGeometries( const AccelerationStructureGeometryKHR * const * ppGeometries_ ) VULKAN_HPP_NOEXCEPT
+      setPpGeometries( const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const * ppGeometries_ ) VULKAN_HPP_NOEXCEPT
     {
       ppGeometries = ppGeometries_;
       return *this;
@@ -951,7 +875,8 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     AccelerationStructureBuildGeometryInfoKHR &
-      setPGeometries( ArrayProxyNoTemporaries<const AccelerationStructureGeometryKHR * const> const & pGeometries_ ) VULKAN_HPP_NOEXCEPT
+      setPGeometries( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const> const & pGeometries_ )
+        VULKAN_HPP_NOEXCEPT
     {
       geometryCount = static_cast<uint32_t>( pGeometries_.size() );
       ppGeometries  = pGeometries_.data();
@@ -959,12 +884,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR & setScratchData( DeviceOrHostAddressKHR const & scratchData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildGeometryInfoKHR &
+      setScratchData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const & scratchData_ ) VULKAN_HPP_NOEXCEPT
     {
       scratchData = scratchData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureBuildGeometryInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -976,28 +902,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureBuildGeometryInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureBuildGeometryInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureBuildGeometryInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureBuildGeometryInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureBuildGeometryInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureTypeKHR const &,
-               BuildAccelerationStructureFlagsKHR const &,
-               BuildAccelerationStructureModeKHR const &,
-               AccelerationStructureKHR const &,
-               AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
                uint32_t const &,
-               const AccelerationStructureGeometryKHR * const &,
-               const AccelerationStructureGeometryKHR * const * const &,
-               DeviceOrHostAddressKHR const &>
+               const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const &,
+               const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const * const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -1006,48 +926,38 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                    sType                    = StructureType::eAccelerationStructureBuildGeometryInfoKHR;
-    const void *                                     pNext                    = {};
-    AccelerationStructureTypeKHR                     type                     = AccelerationStructureTypeKHR::eTopLevel;
-    BuildAccelerationStructureFlagsKHR               flags                    = {};
-    BuildAccelerationStructureModeKHR                mode                     = BuildAccelerationStructureModeKHR::eBuild;
-    AccelerationStructureKHR                         srcAccelerationStructure = {};
-    AccelerationStructureKHR                         dstAccelerationStructure = {};
-    uint32_t                                         geometryCount            = {};
-    const AccelerationStructureGeometryKHR *         pGeometries              = {};
-    const AccelerationStructureGeometryKHR * const * ppGeometries             = {};
-    DeviceOrHostAddressKHR                           scratchData              = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                    sType = StructureType::eAccelerationStructureBuildGeometryInfoKHR;
+    const void *                                                           pNext = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR                     type  = VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR::eTopLevel;
+    VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR               flags = {};
+    VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR                mode  = VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR::eBuild;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                         srcAccelerationStructure = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR                         dstAccelerationStructure = {};
+    uint32_t                                                               geometryCount            = {};
+    const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR *         pGeometries              = {};
+    const VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryKHR * const * ppGeometries             = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR                           scratchData              = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureBuildGeometryInfoKHR>
-  {
-    using Type = AccelerationStructureBuildGeometryInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureBuildGeometryInfoKHR>
   {
     using Type = AccelerationStructureBuildGeometryInfoKHR;
   };
 
-  // wrapper struct for struct VkAccelerationStructureBuildRangeInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureBuildRangeInfoKHR.html
   struct AccelerationStructureBuildRangeInfoKHR
   {
     using NativeType = VkAccelerationStructureBuildRangeInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR AccelerationStructureBuildRangeInfoKHR( uint32_t primitiveCount_  = {},
                                                                  uint32_t primitiveOffset_ = {},
                                                                  uint32_t firstVertex_     = {},
                                                                  uint32_t transformOffset_ = {} ) VULKAN_HPP_NOEXCEPT
-      : primitiveCount{ primitiveCount_ }
-      , primitiveOffset{ primitiveOffset_ }
-      , firstVertex{ firstVertex_ }
-      , transformOffset{ transformOffset_ }
+      : primitiveCount( primitiveCount_ )
+      , primitiveOffset( primitiveOffset_ )
+      , firstVertex( firstVertex_ )
+      , transformOffset( transformOffset_ )
     {
     }
 
@@ -1059,15 +969,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureBuildRangeInfoKHR & operator=( AccelerationStructureBuildRangeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureBuildRangeInfoKHR & operator=( VkAccelerationStructureBuildRangeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureBuildRangeInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildRangeInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureBuildRangeInfoKHR & setPrimitiveCount( uint32_t primitiveCount_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveCount = primitiveCount_;
@@ -1091,7 +1001,7 @@ namespace VULKAN_HPP_NAMESPACE
       transformOffset = transformOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureBuildRangeInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1103,18 +1013,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureBuildRangeInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureBuildRangeInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureBuildRangeInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureBuildRangeInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureBuildRangeInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( primitiveCount, primitiveOffset, firstVertex, transformOffset );
     }
@@ -1123,7 +1028,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( AccelerationStructureBuildRangeInfoKHR const & ) const = default;
 #else
-    bool operator==( AccelerationStructureBuildRangeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool                                            operator==( AccelerationStructureBuildRangeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -1146,16 +1051,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t transformOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureBuildRangeInfoKHR>
-  {
-    using Type = AccelerationStructureBuildRangeInfoKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureBuildSizesInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureBuildSizesInfoKHR.html
   struct AccelerationStructureBuildSizesInfoKHR
   {
     using NativeType = VkAccelerationStructureBuildSizesInfoKHR;
@@ -1163,15 +1058,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureBuildSizesInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureBuildSizesInfoKHR( DeviceSize accelerationStructureSize_ = {},
-                                                                 DeviceSize updateScratchSize_         = {},
-                                                                 DeviceSize buildScratchSize_          = {},
-                                                                 void *     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructureSize{ accelerationStructureSize_ }
-      , updateScratchSize{ updateScratchSize_ }
-      , buildScratchSize{ buildScratchSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureBuildSizesInfoKHR( VULKAN_HPP_NAMESPACE::DeviceSize accelerationStructureSize_ = {},
+                                                                 VULKAN_HPP_NAMESPACE::DeviceSize updateScratchSize_         = {},
+                                                                 VULKAN_HPP_NAMESPACE::DeviceSize buildScratchSize_          = {},
+                                                                 const void *                     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructureSize( accelerationStructureSize_ )
+      , updateScratchSize( updateScratchSize_ )
+      , buildScratchSize( buildScratchSize_ )
     {
     }
 
@@ -1183,11 +1078,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureBuildSizesInfoKHR & operator=( AccelerationStructureBuildSizesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureBuildSizesInfoKHR & operator=( VkAccelerationStructureBuildSizesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureBuildSizesInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureBuildSizesInfoKHR const *>( &rhs );
       return *this;
     }
 
@@ -1201,18 +1096,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureBuildSizesInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureBuildSizesInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureBuildSizesInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureBuildSizesInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructureSize, updateScratchSize, buildScratchSize );
     }
@@ -1238,29 +1132,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::eAccelerationStructureBuildSizesInfoKHR;
-    void *        pNext                     = {};
-    DeviceSize    accelerationStructureSize = {};
-    DeviceSize    updateScratchSize         = {};
-    DeviceSize    buildScratchSize          = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::eAccelerationStructureBuildSizesInfoKHR;
+    const void *                        pNext                     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    accelerationStructureSize = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    updateScratchSize         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    buildScratchSize          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureBuildSizesInfoKHR>
-  {
-    using Type = AccelerationStructureBuildSizesInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureBuildSizesInfoKHR>
   {
     using Type = AccelerationStructureBuildSizesInfoKHR;
   };
 
-  // wrapper struct for struct VkAccelerationStructureCaptureDescriptorDataInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCaptureDescriptorDataInfoEXT.html
   struct AccelerationStructureCaptureDescriptorDataInfoEXT
   {
     using NativeType = VkAccelerationStructureCaptureDescriptorDataInfoEXT;
@@ -1268,13 +1152,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureCaptureDescriptorDataInfoEXT( AccelerationStructureKHR accelerationStructure_   = {},
-                                                                            AccelerationStructureNV  accelerationStructureNV_ = {},
-                                                                            const void *             pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructure{ accelerationStructure_ }
-      , accelerationStructureNV{ accelerationStructureNV_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureCaptureDescriptorDataInfoEXT( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure_   = {},
+                                                                            VULKAN_HPP_NAMESPACE::AccelerationStructureNV  accelerationStructureNV_ = {},
+                                                                            const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructure( accelerationStructure_ )
+      , accelerationStructureNV( accelerationStructureNV_ )
     {
     }
 
@@ -1288,15 +1172,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     AccelerationStructureCaptureDescriptorDataInfoEXT &
       operator=( AccelerationStructureCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureCaptureDescriptorDataInfoEXT & operator=( VkAccelerationStructureCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureCaptureDescriptorDataInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureCaptureDescriptorDataInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCaptureDescriptorDataInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -1304,19 +1188,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCaptureDescriptorDataInfoEXT &
-      setAccelerationStructure( AccelerationStructureKHR accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCaptureDescriptorDataInfoEXT &
-      setAccelerationStructureNV( AccelerationStructureNV accelerationStructureNV_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructureNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructureNV_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureNV = accelerationStructureNV_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureCaptureDescriptorDataInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1328,18 +1212,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( this );
     }
 
-    operator VkAccelerationStructureCaptureDescriptorDataInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( this );
-    }
-
-    operator VkAccelerationStructureCaptureDescriptorDataInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureCaptureDescriptorDataInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AccelerationStructureKHR const &, AccelerationStructureNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructure, accelerationStructureNV );
@@ -1366,28 +1247,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                   = StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT;
-    const void *             pNext                   = {};
-    AccelerationStructureKHR accelerationStructure   = {};
-    AccelerationStructureNV  accelerationStructureNV = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                   = StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT;
+    const void *                                   pNext                   = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure   = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureNV  accelerationStructureNV = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureCaptureDescriptorDataInfoEXT>
-  {
-    using Type = AccelerationStructureCaptureDescriptorDataInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT>
   {
     using Type = AccelerationStructureCaptureDescriptorDataInfoEXT;
   };
 
-  // wrapper struct for struct VkAccelerationStructureCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCreateInfoKHR.html
   struct AccelerationStructureCreateInfoKHR
   {
     using NativeType = VkAccelerationStructureCreateInfoKHR;
@@ -1395,21 +1266,22 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureCreateInfoKHR( AccelerationStructureCreateFlagsKHR createFlags_   = {},
-                                                             Buffer                              buffer_        = {},
-                                                             DeviceSize                          offset_        = {},
-                                                             DeviceSize                          size_          = {},
-                                                             AccelerationStructureTypeKHR        type_          = AccelerationStructureTypeKHR::eTopLevel,
-                                                             DeviceAddress                       deviceAddress_ = {},
-                                                             const void *                        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , createFlags{ createFlags_ }
-      , buffer{ buffer_ }
-      , offset{ offset_ }
-      , size{ size_ }
-      , type{ type_ }
-      , deviceAddress{ deviceAddress_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureCreateInfoKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureCreateFlagsKHR createFlags_   = {},
+      VULKAN_HPP_NAMESPACE::Buffer                              buffer_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                          offset_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                          size_          = {},
+      VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR        type_          = VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR::eTopLevel,
+      VULKAN_HPP_NAMESPACE::DeviceAddress                       deviceAddress_ = {},
+      const void *                                              pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , createFlags( createFlags_ )
+      , buffer( buffer_ )
+      , offset( offset_ )
+      , size( size_ )
+      , type( type_ )
+      , deviceAddress( deviceAddress_ )
     {
     }
 
@@ -1421,57 +1293,58 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureCreateInfoKHR & operator=( AccelerationStructureCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureCreateInfoKHR & operator=( VkAccelerationStructureCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setCreateFlags( AccelerationStructureCreateFlagsKHR createFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR &
+      setCreateFlags( VULKAN_HPP_NAMESPACE::AccelerationStructureCreateFlagsKHR createFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       createFlags = createFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setType( AccelerationStructureTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setType( VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoKHR & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1483,25 +1356,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureCreateInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureCreateInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureCreateFlagsKHR const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               AccelerationStructureTypeKHR const &,
-               DeviceAddress const &>
+               VULKAN_HPP_NAMESPACE::AccelerationStructureCreateFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, createFlags, buffer, offset, size, type, deviceAddress );
@@ -1528,31 +1395,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType         = StructureType::eAccelerationStructureCreateInfoKHR;
-    const void *                        pNext         = {};
-    AccelerationStructureCreateFlagsKHR createFlags   = {};
-    Buffer                              buffer        = {};
-    DeviceSize                          offset        = {};
-    DeviceSize                          size          = {};
-    AccelerationStructureTypeKHR        type          = AccelerationStructureTypeKHR::eTopLevel;
-    DeviceAddress                       deviceAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType         = StructureType::eAccelerationStructureCreateInfoKHR;
+    const void *                                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureCreateFlagsKHR createFlags   = {};
+    VULKAN_HPP_NAMESPACE::Buffer                              buffer        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                          offset        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                          size          = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR        type          = VULKAN_HPP_NAMESPACE::AccelerationStructureTypeKHR::eTopLevel;
+    VULKAN_HPP_NAMESPACE::DeviceAddress                       deviceAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureCreateInfoKHR>
-  {
-    using Type = AccelerationStructureCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureCreateInfoKHR>
   {
     using Type = AccelerationStructureCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkGeometryTrianglesNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryTrianglesNV.html
   struct GeometryTrianglesNV
   {
     using NativeType = VkGeometryTrianglesNV;
@@ -1560,31 +1418,31 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeometryTrianglesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeometryTrianglesNV( Buffer       vertexData_      = {},
-                                              DeviceSize   vertexOffset_    = {},
-                                              uint32_t     vertexCount_     = {},
-                                              DeviceSize   vertexStride_    = {},
-                                              Format       vertexFormat_    = Format::eUndefined,
-                                              Buffer       indexData_       = {},
-                                              DeviceSize   indexOffset_     = {},
-                                              uint32_t     indexCount_      = {},
-                                              IndexType    indexType_       = IndexType::eUint16,
-                                              Buffer       transformData_   = {},
-                                              DeviceSize   transformOffset_ = {},
-                                              const void * pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexData{ vertexData_ }
-      , vertexOffset{ vertexOffset_ }
-      , vertexCount{ vertexCount_ }
-      , vertexStride{ vertexStride_ }
-      , vertexFormat{ vertexFormat_ }
-      , indexData{ indexData_ }
-      , indexOffset{ indexOffset_ }
-      , indexCount{ indexCount_ }
-      , indexType{ indexType_ }
-      , transformData{ transformData_ }
-      , transformOffset{ transformOffset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GeometryTrianglesNV( VULKAN_HPP_NAMESPACE::Buffer     vertexData_      = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize vertexOffset_    = {},
+                                              uint32_t                         vertexCount_     = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize vertexStride_    = {},
+                                              VULKAN_HPP_NAMESPACE::Format     vertexFormat_    = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                              VULKAN_HPP_NAMESPACE::Buffer     indexData_       = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize indexOffset_     = {},
+                                              uint32_t                         indexCount_      = {},
+                                              VULKAN_HPP_NAMESPACE::IndexType  indexType_       = VULKAN_HPP_NAMESPACE::IndexType::eUint16,
+                                              VULKAN_HPP_NAMESPACE::Buffer     transformData_   = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize transformOffset_ = {},
+                                              const void *                     pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexData( vertexData_ )
+      , vertexOffset( vertexOffset_ )
+      , vertexCount( vertexCount_ )
+      , vertexStride( vertexStride_ )
+      , vertexFormat( vertexFormat_ )
+      , indexData( indexData_ )
+      , indexOffset( indexOffset_ )
+      , indexCount( indexCount_ )
+      , indexType( indexType_ )
+      , transformData( transformData_ )
+      , transformOffset( transformOffset_ )
     {
     }
 
@@ -1595,28 +1453,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     GeometryTrianglesNV & operator=( GeometryTrianglesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeometryTrianglesNV & operator=( VkGeometryTrianglesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeometryTrianglesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeometryTrianglesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexData( Buffer vertexData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexData( VULKAN_HPP_NAMESPACE::Buffer vertexData_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexData = vertexData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexOffset( DeviceSize vertexOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexOffset( VULKAN_HPP_NAMESPACE::DeviceSize vertexOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexOffset = vertexOffset_;
       return *this;
@@ -1628,25 +1486,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexStride( DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexStride( VULKAN_HPP_NAMESPACE::DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexStride = vertexStride_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexFormat( Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setVertexFormat( VULKAN_HPP_NAMESPACE::Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexFormat = vertexFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexData( Buffer indexData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexData( VULKAN_HPP_NAMESPACE::Buffer indexData_ ) VULKAN_HPP_NOEXCEPT
     {
       indexData = indexData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexOffset( DeviceSize indexOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexOffset( VULKAN_HPP_NAMESPACE::DeviceSize indexOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       indexOffset = indexOffset_;
       return *this;
@@ -1658,24 +1516,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setIndexType( VULKAN_HPP_NAMESPACE::IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
     {
       indexType = indexType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setTransformData( Buffer transformData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setTransformData( VULKAN_HPP_NAMESPACE::Buffer transformData_ ) VULKAN_HPP_NOEXCEPT
     {
       transformData = transformData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setTransformOffset( DeviceSize transformOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryTrianglesNV & setTransformOffset( VULKAN_HPP_NAMESPACE::DeviceSize transformOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       transformOffset = transformOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeometryTrianglesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1687,30 +1545,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeometryTrianglesNV *>( this );
     }
 
-    operator VkGeometryTrianglesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeometryTrianglesNV *>( this );
-    }
-
-    operator VkGeometryTrianglesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeometryTrianglesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Buffer const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
-               DeviceSize const &,
-               Format const &,
-               Buffer const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
-               IndexType const &,
-               Buffer const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::IndexType const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -1751,36 +1603,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eGeometryTrianglesNV;
-    const void *  pNext           = {};
-    Buffer        vertexData      = {};
-    DeviceSize    vertexOffset    = {};
-    uint32_t      vertexCount     = {};
-    DeviceSize    vertexStride    = {};
-    Format        vertexFormat    = Format::eUndefined;
-    Buffer        indexData       = {};
-    DeviceSize    indexOffset     = {};
-    uint32_t      indexCount      = {};
-    IndexType     indexType       = IndexType::eUint16;
-    Buffer        transformData   = {};
-    DeviceSize    transformOffset = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eGeometryTrianglesNV;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Buffer        vertexData      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    vertexOffset    = {};
+    uint32_t                            vertexCount     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    vertexStride    = {};
+    VULKAN_HPP_NAMESPACE::Format        vertexFormat    = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Buffer        indexData       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    indexOffset     = {};
+    uint32_t                            indexCount      = {};
+    VULKAN_HPP_NAMESPACE::IndexType     indexType       = VULKAN_HPP_NAMESPACE::IndexType::eUint16;
+    VULKAN_HPP_NAMESPACE::Buffer        transformData   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    transformOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeometryTrianglesNV>
-  {
-    using Type = GeometryTrianglesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGeometryTrianglesNV>
   {
     using Type = GeometryTrianglesNV;
   };
 
-  // wrapper struct for struct VkGeometryAABBNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryAABBNV.html
   struct GeometryAABBNV
   {
     using NativeType = VkGeometryAABBNV;
@@ -1788,14 +1631,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeometryAabbNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeometryAABBNV(
-      Buffer aabbData_ = {}, uint32_t numAABBs_ = {}, uint32_t stride_ = {}, DeviceSize offset_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , aabbData{ aabbData_ }
-      , numAABBs{ numAABBs_ }
-      , stride{ stride_ }
-      , offset{ offset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GeometryAABBNV( VULKAN_HPP_NAMESPACE::Buffer     aabbData_ = {},
+                                         uint32_t                         numAABBs_ = {},
+                                         uint32_t                         stride_   = {},
+                                         VULKAN_HPP_NAMESPACE::DeviceSize offset_   = {},
+                                         const void *                     pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , aabbData( aabbData_ )
+      , numAABBs( numAABBs_ )
+      , stride( stride_ )
+      , offset( offset_ )
     {
     }
 
@@ -1804,22 +1650,22 @@ namespace VULKAN_HPP_NAMESPACE
     GeometryAABBNV( VkGeometryAABBNV const & rhs ) VULKAN_HPP_NOEXCEPT : GeometryAABBNV( *reinterpret_cast<GeometryAABBNV const *>( &rhs ) ) {}
 
     GeometryAABBNV & operator=( GeometryAABBNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeometryAABBNV & operator=( VkGeometryAABBNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeometryAABBNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeometryAABBNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GeometryAABBNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryAABBNV & setAabbData( Buffer aabbData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryAABBNV & setAabbData( VULKAN_HPP_NAMESPACE::Buffer aabbData_ ) VULKAN_HPP_NOEXCEPT
     {
       aabbData = aabbData_;
       return *this;
@@ -1837,12 +1683,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryAABBNV & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryAABBNV & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeometryAABBNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1854,18 +1700,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeometryAABBNV *>( this );
     }
 
-    operator VkGeometryAABBNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeometryAABBNV *>( this );
-    }
-
-    operator VkGeometryAABBNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeometryAABBNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &, uint32_t const &, uint32_t const &, DeviceSize const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, aabbData, numAABBs, stride, offset );
@@ -1892,37 +1737,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::eGeometryAabbNV;
-    const void *  pNext    = {};
-    Buffer        aabbData = {};
-    uint32_t      numAABBs = {};
-    uint32_t      stride   = {};
-    DeviceSize    offset   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eGeometryAabbNV;
+    const void *                        pNext    = {};
+    VULKAN_HPP_NAMESPACE::Buffer        aabbData = {};
+    uint32_t                            numAABBs = {};
+    uint32_t                            stride   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    offset   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeometryAABBNV>
-  {
-    using Type = GeometryAABBNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGeometryAabbNV>
   {
     using Type = GeometryAABBNV;
   };
 
-  // wrapper struct for struct VkGeometryDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryDataNV.html
   struct GeometryDataNV
   {
     using NativeType = VkGeometryDataNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeometryDataNV( GeometryTrianglesNV triangles_ = {}, GeometryAABBNV aabbs_ = {} ) VULKAN_HPP_NOEXCEPT
-      : triangles{ triangles_ }
-      , aabbs{ aabbs_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GeometryDataNV( VULKAN_HPP_NAMESPACE::GeometryTrianglesNV triangles_ = {},
+                                         VULKAN_HPP_NAMESPACE::GeometryAABBNV      aabbs_     = {} ) VULKAN_HPP_NOEXCEPT
+      : triangles( triangles_ )
+      , aabbs( aabbs_ )
     {
     }
 
@@ -1931,27 +1768,27 @@ namespace VULKAN_HPP_NAMESPACE
     GeometryDataNV( VkGeometryDataNV const & rhs ) VULKAN_HPP_NOEXCEPT : GeometryDataNV( *reinterpret_cast<GeometryDataNV const *>( &rhs ) ) {}
 
     GeometryDataNV & operator=( GeometryDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeometryDataNV & operator=( VkGeometryDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeometryDataNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeometryDataNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 GeometryDataNV & setTriangles( GeometryTrianglesNV const & triangles_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 GeometryDataNV & setTriangles( VULKAN_HPP_NAMESPACE::GeometryTrianglesNV const & triangles_ ) VULKAN_HPP_NOEXCEPT
     {
       triangles = triangles_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryDataNV & setAabbs( GeometryAABBNV const & aabbs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryDataNV & setAabbs( VULKAN_HPP_NAMESPACE::GeometryAABBNV const & aabbs_ ) VULKAN_HPP_NOEXCEPT
     {
       aabbs = aabbs_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeometryDataNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -1963,18 +1800,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeometryDataNV *>( this );
     }
 
-    operator VkGeometryDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeometryDataNV *>( this );
-    }
-
-    operator VkGeometryDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeometryDataNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<GeometryTrianglesNV const &, GeometryAABBNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::GeometryTrianglesNV const &, VULKAN_HPP_NAMESPACE::GeometryAABBNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( triangles, aabbs );
     }
@@ -1999,19 +1831,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    GeometryTrianglesNV triangles = {};
-    GeometryAABBNV      aabbs     = {};
+    VULKAN_HPP_NAMESPACE::GeometryTrianglesNV triangles = {};
+    VULKAN_HPP_NAMESPACE::GeometryAABBNV      aabbs     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeometryDataNV>
-  {
-    using Type = GeometryDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkGeometryNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeometryNV.html
   struct GeometryNV
   {
     using NativeType = VkGeometryNV;
@@ -2019,15 +1842,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeometryNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeometryNV( GeometryTypeKHR  geometryType_ = GeometryTypeKHR::eTriangles,
-                                     GeometryDataNV   geometry_     = {},
-                                     GeometryFlagsKHR flags_        = {},
-                                     const void *     pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , geometryType{ geometryType_ }
-      , geometry{ geometry_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GeometryNV( VULKAN_HPP_NAMESPACE::GeometryTypeKHR  geometryType_ = VULKAN_HPP_NAMESPACE::GeometryTypeKHR::eTriangles,
+                                     VULKAN_HPP_NAMESPACE::GeometryDataNV   geometry_     = {},
+                                     VULKAN_HPP_NAMESPACE::GeometryFlagsKHR flags_        = {},
+                                     const void *                           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , geometryType( geometryType_ )
+      , geometry( geometry_ )
+      , flags( flags_ )
     {
     }
 
@@ -2036,39 +1859,39 @@ namespace VULKAN_HPP_NAMESPACE
     GeometryNV( VkGeometryNV const & rhs ) VULKAN_HPP_NOEXCEPT : GeometryNV( *reinterpret_cast<GeometryNV const *>( &rhs ) ) {}
 
     GeometryNV & operator=( GeometryNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeometryNV & operator=( VkGeometryNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeometryNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeometryNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GeometryNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setGeometryType( GeometryTypeKHR geometryType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setGeometryType( VULKAN_HPP_NAMESPACE::GeometryTypeKHR geometryType_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryType = geometryType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setGeometry( GeometryDataNV const & geometry_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setGeometry( VULKAN_HPP_NAMESPACE::GeometryDataNV const & geometry_ ) VULKAN_HPP_NOEXCEPT
     {
       geometry = geometry_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setFlags( GeometryFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeometryNV & setFlags( VULKAN_HPP_NAMESPACE::GeometryFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeometryNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -2080,18 +1903,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeometryNV *>( this );
     }
 
-    operator VkGeometryNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeometryNV *>( this );
-    }
-
-    operator VkGeometryNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeometryNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, GeometryTypeKHR const &, GeometryDataNV const &, GeometryFlagsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::GeometryTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::GeometryDataNV const &,
+               VULKAN_HPP_NAMESPACE::GeometryFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, geometryType, geometry, flags );
@@ -2117,28 +1938,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType        = StructureType::eGeometryNV;
-    const void *     pNext        = {};
-    GeometryTypeKHR  geometryType = GeometryTypeKHR::eTriangles;
-    GeometryDataNV   geometry     = {};
-    GeometryFlagsKHR flags        = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType        = StructureType::eGeometryNV;
+    const void *                           pNext        = {};
+    VULKAN_HPP_NAMESPACE::GeometryTypeKHR  geometryType = VULKAN_HPP_NAMESPACE::GeometryTypeKHR::eTriangles;
+    VULKAN_HPP_NAMESPACE::GeometryDataNV   geometry     = {};
+    VULKAN_HPP_NAMESPACE::GeometryFlagsKHR flags        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeometryNV>
-  {
-    using Type = GeometryNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGeometryNV>
   {
     using Type = GeometryNV;
   };
 
-  // wrapper struct for struct VkAccelerationStructureInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureInfoNV.html
   struct AccelerationStructureInfoNV
   {
     using NativeType = VkAccelerationStructureInfoNV;
@@ -2146,19 +1958,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureInfoNV( AccelerationStructureTypeNV       type_          = {},
-                                                      BuildAccelerationStructureFlagsNV flags_         = {},
-                                                      uint32_t                          instanceCount_ = {},
-                                                      uint32_t                          geometryCount_ = {},
-                                                      const GeometryNV *                pGeometries_   = {},
-                                                      const void *                      pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , flags{ flags_ }
-      , instanceCount{ instanceCount_ }
-      , geometryCount{ geometryCount_ }
-      , pGeometries{ pGeometries_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureInfoNV( VULKAN_HPP_NAMESPACE::AccelerationStructureTypeNV       type_          = {},
+                                                      VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV flags_         = {},
+                                                      uint32_t                                                instanceCount_ = {},
+                                                      uint32_t                                                geometryCount_ = {},
+                                                      const VULKAN_HPP_NAMESPACE::GeometryNV *                pGeometries_   = {},
+                                                      const void *                                            pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , flags( flags_ )
+      , instanceCount( instanceCount_ )
+      , geometryCount( geometryCount_ )
+      , pGeometries( pGeometries_ )
     {
     }
 
@@ -2170,11 +1982,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureInfoNV( AccelerationStructureTypeNV                       type_,
-                                 BuildAccelerationStructureFlagsNV                 flags_,
-                                 uint32_t                                          instanceCount_,
-                                 ArrayProxyNoTemporaries<const GeometryNV> const & geometries_,
-                                 const void *                                      pNext_ = nullptr )
+    AccelerationStructureInfoNV( VULKAN_HPP_NAMESPACE::AccelerationStructureTypeNV                                             type_,
+                                 VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV                                       flags_,
+                                 uint32_t                                                                                      instanceCount_,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::GeometryNV> const & geometries_,
+                                 const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , type( type_ )
       , flags( flags_ )
@@ -2186,28 +1998,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     AccelerationStructureInfoNV & operator=( AccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureInfoNV & operator=( VkAccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setType( AccelerationStructureTypeNV type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setType( VULKAN_HPP_NAMESPACE::AccelerationStructureTypeNV type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setFlags( BuildAccelerationStructureFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setFlags( VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -2225,21 +2037,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setPGeometries( const GeometryNV * pGeometries_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInfoNV & setPGeometries( const VULKAN_HPP_NAMESPACE::GeometryNV * pGeometries_ ) VULKAN_HPP_NOEXCEPT
     {
       pGeometries = pGeometries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureInfoNV & setGeometries( ArrayProxyNoTemporaries<const GeometryNV> const & geometries_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureInfoNV &
+      setGeometries( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::GeometryNV> const & geometries_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryCount = static_cast<uint32_t>( geometries_.size() );
       pGeometries   = geometries_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -2251,24 +2064,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureInfoNV *>( this );
     }
 
-    operator VkAccelerationStructureInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureInfoNV *>( this );
-    }
-
-    operator VkAccelerationStructureInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureTypeNV const &,
-               BuildAccelerationStructureFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureTypeNV const &,
+               VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV const &,
                uint32_t const &,
                uint32_t const &,
-               const GeometryNV * const &>
+               const VULKAN_HPP_NAMESPACE::GeometryNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, flags, instanceCount, geometryCount, pGeometries );
@@ -2295,31 +2102,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType         = StructureType::eAccelerationStructureInfoNV;
-    const void *                      pNext         = {};
-    AccelerationStructureTypeNV       type          = {};
-    BuildAccelerationStructureFlagsNV flags         = {};
-    uint32_t                          instanceCount = {};
-    uint32_t                          geometryCount = {};
-    const GeometryNV *                pGeometries   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType         = StructureType::eAccelerationStructureInfoNV;
+    const void *                                            pNext         = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureTypeNV       type          = {};
+    VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV flags         = {};
+    uint32_t                                                instanceCount = {};
+    uint32_t                                                geometryCount = {};
+    const VULKAN_HPP_NAMESPACE::GeometryNV *                pGeometries   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureInfoNV>
-  {
-    using Type = AccelerationStructureInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureInfoNV>
   {
     using Type = AccelerationStructureInfoNV;
   };
 
-  // wrapper struct for struct VkAccelerationStructureCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureCreateInfoNV.html
   struct AccelerationStructureCreateInfoNV
   {
     using NativeType = VkAccelerationStructureCreateInfoNV;
@@ -2327,13 +2124,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureCreateInfoNV( DeviceSize                  compactedSize_ = {},
-                                                            AccelerationStructureInfoNV info_          = {},
-                                                            const void *                pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , compactedSize{ compactedSize_ }
-      , info{ info_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureCreateInfoNV( VULKAN_HPP_NAMESPACE::DeviceSize                  compactedSize_ = {},
+                                                            VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV info_          = {},
+                                                            const void *                                      pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , compactedSize( compactedSize_ )
+      , info( info_ )
     {
     }
 
@@ -2345,33 +2142,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureCreateInfoNV & operator=( AccelerationStructureCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureCreateInfoNV & operator=( VkAccelerationStructureCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoNV & setCompactedSize( DeviceSize compactedSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoNV & setCompactedSize( VULKAN_HPP_NAMESPACE::DeviceSize compactedSize_ ) VULKAN_HPP_NOEXCEPT
     {
       compactedSize = compactedSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoNV & setInfo( AccelerationStructureInfoNV const & info_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureCreateInfoNV & setInfo( VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV const & info_ ) VULKAN_HPP_NOEXCEPT
     {
       info = info_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -2383,18 +2180,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureCreateInfoNV *>( this );
     }
 
-    operator VkAccelerationStructureCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureCreateInfoNV *>( this );
-    }
-
-    operator VkAccelerationStructureCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceSize const &, AccelerationStructureInfoNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, compactedSize, info );
     }
@@ -2419,193 +2214,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType         = StructureType::eAccelerationStructureCreateInfoNV;
-    const void *                pNext         = {};
-    DeviceSize                  compactedSize = {};
-    AccelerationStructureInfoNV info          = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType         = StructureType::eAccelerationStructureCreateInfoNV;
+    const void *                                      pNext         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  compactedSize = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureInfoNV info          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureCreateInfoNV>
-  {
-    using Type = AccelerationStructureCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureCreateInfoNV>
   {
     using Type = AccelerationStructureCreateInfoNV;
   };
 
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX.html
-  struct AccelerationStructureDenseGeometryFormatTrianglesDataAMDX
-  {
-    using NativeType = VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      AccelerationStructureDenseGeometryFormatTrianglesDataAMDX( DeviceOrHostAddressConstKHR  compressedData_    = {},
-                                                                 DeviceSize                   dataSize_          = {},
-                                                                 uint32_t                     numTriangles_      = {},
-                                                                 uint32_t                     numVertices_       = {},
-                                                                 uint32_t                     maxPrimitiveIndex_ = {},
-                                                                 uint32_t                     maxGeometryIndex_  = {},
-                                                                 CompressedTriangleFormatAMDX format_            = CompressedTriangleFormatAMDX::eDgf1,
-                                                                 const void *                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , compressedData{ compressedData_ }
-      , dataSize{ dataSize_ }
-      , numTriangles{ numTriangles_ }
-      , numVertices{ numVertices_ }
-      , maxPrimitiveIndex{ maxPrimitiveIndex_ }
-      , maxGeometryIndex{ maxGeometryIndex_ }
-      , format{ format_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX( AccelerationStructureDenseGeometryFormatTrianglesDataAMDX const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    AccelerationStructureDenseGeometryFormatTrianglesDataAMDX( VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
-      : AccelerationStructureDenseGeometryFormatTrianglesDataAMDX(
-          *reinterpret_cast<AccelerationStructureDenseGeometryFormatTrianglesDataAMDX const *>( &rhs ) )
-    {
-    }
-
-    AccelerationStructureDenseGeometryFormatTrianglesDataAMDX &
-      operator=( AccelerationStructureDenseGeometryFormatTrianglesDataAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AccelerationStructureDenseGeometryFormatTrianglesDataAMDX &
-      operator=( VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AccelerationStructureDenseGeometryFormatTrianglesDataAMDX const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX &
-      setCompressedData( DeviceOrHostAddressConstKHR const & compressedData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      compressedData = compressedData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setDataSize( DeviceSize dataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataSize = dataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setNumTriangles( uint32_t numTriangles_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numTriangles = numTriangles_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setNumVertices( uint32_t numVertices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numVertices = numVertices_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setMaxPrimitiveIndex( uint32_t maxPrimitiveIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxPrimitiveIndex = maxPrimitiveIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setMaxGeometryIndex( uint32_t maxGeometryIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxGeometryIndex = maxGeometryIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDenseGeometryFormatTrianglesDataAMDX & setFormat( CompressedTriangleFormatAMDX format_ ) VULKAN_HPP_NOEXCEPT
-    {
-      format = format_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX *>( this );
-    }
-
-    operator VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX *>( this );
-    }
-
-    operator VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX *>( this );
-    }
-
-    operator VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               CompressedTriangleFormatAMDX const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, compressedData, dataSize, numTriangles, numVertices, maxPrimitiveIndex, maxGeometryIndex, format );
-    }
-#  endif
-
-  public:
-    StructureType                sType             = StructureType::eAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-    const void *                 pNext             = {};
-    DeviceOrHostAddressConstKHR  compressedData    = {};
-    DeviceSize                   dataSize          = {};
-    uint32_t                     numTriangles      = {};
-    uint32_t                     numVertices       = {};
-    uint32_t                     maxPrimitiveIndex = {};
-    uint32_t                     maxGeometryIndex  = {};
-    CompressedTriangleFormatAMDX format            = CompressedTriangleFormatAMDX::eDgf1;
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX>
-  {
-    using Type = AccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAccelerationStructureDenseGeometryFormatTrianglesDataAMDX>
-  {
-    using Type = AccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-  };
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  // wrapper struct for struct VkAccelerationStructureDeviceAddressInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureDeviceAddressInfoKHR.html
   struct AccelerationStructureDeviceAddressInfoKHR
   {
     using NativeType = VkAccelerationStructureDeviceAddressInfoKHR;
@@ -2613,11 +2233,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureDeviceAddressInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureDeviceAddressInfoKHR( AccelerationStructureKHR accelerationStructure_ = {},
-                                                                    const void *             pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructure{ accelerationStructure_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureDeviceAddressInfoKHR( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure_ = {},
+                                                                    const void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructure( accelerationStructure_ )
     {
     }
 
@@ -2629,15 +2249,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureDeviceAddressInfoKHR & operator=( AccelerationStructureDeviceAddressInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureDeviceAddressInfoKHR & operator=( VkAccelerationStructureDeviceAddressInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureDeviceAddressInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureDeviceAddressInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDeviceAddressInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -2645,12 +2265,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureDeviceAddressInfoKHR &
-      setAccelerationStructure( AccelerationStructureKHR accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureDeviceAddressInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -2662,18 +2282,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureDeviceAddressInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureDeviceAddressInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureDeviceAddressInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureDeviceAddressInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureDeviceAddressInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AccelerationStructureKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructure );
     }
@@ -2698,244 +2313,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                 = StructureType::eAccelerationStructureDeviceAddressInfoKHR;
-    const void *             pNext                 = {};
-    AccelerationStructureKHR accelerationStructure = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                 = StructureType::eAccelerationStructureDeviceAddressInfoKHR;
+    const void *                                   pNext                 = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR accelerationStructure = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureDeviceAddressInfoKHR>
-  {
-    using Type = AccelerationStructureDeviceAddressInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureDeviceAddressInfoKHR>
   {
     using Type = AccelerationStructureDeviceAddressInfoKHR;
   };
 
-  // wrapper struct for struct VkAccelerationStructureGeometryLinearSweptSpheresDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryLinearSweptSpheresDataNV.html
-  struct AccelerationStructureGeometryLinearSweptSpheresDataNV
-  {
-    using NativeType = VkAccelerationStructureGeometryLinearSweptSpheresDataNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryLinearSweptSpheresDataNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      AccelerationStructureGeometryLinearSweptSpheresDataNV( Format                              vertexFormat_ = Format::eUndefined,
-                                                             DeviceOrHostAddressConstKHR         vertexData_   = {},
-                                                             DeviceSize                          vertexStride_ = {},
-                                                             Format                              radiusFormat_ = Format::eUndefined,
-                                                             DeviceOrHostAddressConstKHR         radiusData_   = {},
-                                                             DeviceSize                          radiusStride_ = {},
-                                                             IndexType                           indexType_    = IndexType::eUint16,
-                                                             DeviceOrHostAddressConstKHR         indexData_    = {},
-                                                             DeviceSize                          indexStride_  = {},
-                                                             RayTracingLssIndexingModeNV         indexingMode_ = RayTracingLssIndexingModeNV::eList,
-                                                             RayTracingLssPrimitiveEndCapsModeNV endCapsMode_  = RayTracingLssPrimitiveEndCapsModeNV::eNone,
-                                                             const void *                        pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexFormat{ vertexFormat_ }
-      , vertexData{ vertexData_ }
-      , vertexStride{ vertexStride_ }
-      , radiusFormat{ radiusFormat_ }
-      , radiusData{ radiusData_ }
-      , radiusStride{ radiusStride_ }
-      , indexType{ indexType_ }
-      , indexData{ indexData_ }
-      , indexStride{ indexStride_ }
-      , indexingMode{ indexingMode_ }
-      , endCapsMode{ endCapsMode_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14
-      AccelerationStructureGeometryLinearSweptSpheresDataNV( AccelerationStructureGeometryLinearSweptSpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    AccelerationStructureGeometryLinearSweptSpheresDataNV( VkAccelerationStructureGeometryLinearSweptSpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : AccelerationStructureGeometryLinearSweptSpheresDataNV( *reinterpret_cast<AccelerationStructureGeometryLinearSweptSpheresDataNV const *>( &rhs ) )
-    {
-    }
-
-    AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      operator=( AccelerationStructureGeometryLinearSweptSpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AccelerationStructureGeometryLinearSweptSpheresDataNV & operator=( VkAccelerationStructureGeometryLinearSweptSpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AccelerationStructureGeometryLinearSweptSpheresDataNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setVertexFormat( Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexFormat = vertexFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      setVertexData( DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexData = vertexData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setVertexStride( DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexStride = vertexStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setRadiusFormat( Format radiusFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusFormat = radiusFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      setRadiusData( DeviceOrHostAddressConstKHR const & radiusData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusData = radiusData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setRadiusStride( DeviceSize radiusStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusStride = radiusStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexType = indexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      setIndexData( DeviceOrHostAddressConstKHR const & indexData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexData = indexData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV & setIndexStride( DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexStride = indexStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      setIndexingMode( RayTracingLssIndexingModeNV indexingMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexingMode = indexingMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryLinearSweptSpheresDataNV &
-      setEndCapsMode( RayTracingLssPrimitiveEndCapsModeNV endCapsMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      endCapsMode = endCapsMode_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAccelerationStructureGeometryLinearSweptSpheresDataNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAccelerationStructureGeometryLinearSweptSpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryLinearSweptSpheresDataNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAccelerationStructureGeometryLinearSweptSpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryLinearSweptSpheresDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryLinearSweptSpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryLinearSweptSpheresDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryLinearSweptSpheresDataNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               IndexType const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               RayTracingLssIndexingModeNV const &,
-               RayTracingLssPrimitiveEndCapsModeNV const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       vertexFormat,
-                       vertexData,
-                       vertexStride,
-                       radiusFormat,
-                       radiusData,
-                       radiusStride,
-                       indexType,
-                       indexData,
-                       indexStride,
-                       indexingMode,
-                       endCapsMode );
-    }
-#endif
-
-  public:
-    StructureType                       sType        = StructureType::eAccelerationStructureGeometryLinearSweptSpheresDataNV;
-    const void *                        pNext        = {};
-    Format                              vertexFormat = Format::eUndefined;
-    DeviceOrHostAddressConstKHR         vertexData   = {};
-    DeviceSize                          vertexStride = {};
-    Format                              radiusFormat = Format::eUndefined;
-    DeviceOrHostAddressConstKHR         radiusData   = {};
-    DeviceSize                          radiusStride = {};
-    IndexType                           indexType    = IndexType::eUint16;
-    DeviceOrHostAddressConstKHR         indexData    = {};
-    DeviceSize                          indexStride  = {};
-    RayTracingLssIndexingModeNV         indexingMode = RayTracingLssIndexingModeNV::eList;
-    RayTracingLssPrimitiveEndCapsModeNV endCapsMode  = RayTracingLssPrimitiveEndCapsModeNV::eNone;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryLinearSweptSpheresDataNV>
-  {
-    using Type = AccelerationStructureGeometryLinearSweptSpheresDataNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAccelerationStructureGeometryLinearSweptSpheresDataNV>
-  {
-    using Type = AccelerationStructureGeometryLinearSweptSpheresDataNV;
-  };
-
-  // wrapper struct for struct VkAccelerationStructureGeometryMotionTrianglesDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometryMotionTrianglesDataNV.html
   struct AccelerationStructureGeometryMotionTrianglesDataNV
   {
     using NativeType = VkAccelerationStructureGeometryMotionTrianglesDataNV;
@@ -2943,11 +2331,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryMotionTrianglesDataNV( DeviceOrHostAddressConstKHR vertexData_ = {},
-                                                                                const void *                pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexData{ vertexData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryMotionTrianglesDataNV( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR vertexData_ = {},
+                                                                                const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexData( vertexData_ )
     {
     }
 
@@ -2961,15 +2349,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     AccelerationStructureGeometryMotionTrianglesDataNV &
       operator=( AccelerationStructureGeometryMotionTrianglesDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureGeometryMotionTrianglesDataNV & operator=( VkAccelerationStructureGeometryMotionTrianglesDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureGeometryMotionTrianglesDataNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureGeometryMotionTrianglesDataNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryMotionTrianglesDataNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -2977,12 +2365,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometryMotionTrianglesDataNV &
-      setVertexData( DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
+      setVertexData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexData = vertexData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureGeometryMotionTrianglesDataNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -2994,248 +2382,57 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureGeometryMotionTrianglesDataNV *>( this );
     }
 
-    operator VkAccelerationStructureGeometryMotionTrianglesDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometryMotionTrianglesDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometryMotionTrianglesDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometryMotionTrianglesDataNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceOrHostAddressConstKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vertexData );
     }
 #endif
 
   public:
-    StructureType               sType      = StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV;
-    const void *                pNext      = {};
-    DeviceOrHostAddressConstKHR vertexData = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType      = StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV;
+    const void *                                      pNext      = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR vertexData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometryMotionTrianglesDataNV>
-  {
-    using Type = AccelerationStructureGeometryMotionTrianglesDataNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV>
   {
     using Type = AccelerationStructureGeometryMotionTrianglesDataNV;
   };
 
-  // wrapper struct for struct VkAccelerationStructureGeometrySpheresDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureGeometrySpheresDataNV.html
-  struct AccelerationStructureGeometrySpheresDataNV
-  {
-    using NativeType = VkAccelerationStructureGeometrySpheresDataNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureGeometrySpheresDataNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV( Format                      vertexFormat_ = Format::eUndefined,
-                                                                        DeviceOrHostAddressConstKHR vertexData_   = {},
-                                                                        DeviceSize                  vertexStride_ = {},
-                                                                        Format                      radiusFormat_ = Format::eUndefined,
-                                                                        DeviceOrHostAddressConstKHR radiusData_   = {},
-                                                                        DeviceSize                  radiusStride_ = {},
-                                                                        IndexType                   indexType_    = IndexType::eUint16,
-                                                                        DeviceOrHostAddressConstKHR indexData_    = {},
-                                                                        DeviceSize                  indexStride_  = {},
-                                                                        const void *                pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexFormat{ vertexFormat_ }
-      , vertexData{ vertexData_ }
-      , vertexStride{ vertexStride_ }
-      , radiusFormat{ radiusFormat_ }
-      , radiusData{ radiusData_ }
-      , radiusStride{ radiusStride_ }
-      , indexType{ indexType_ }
-      , indexData{ indexData_ }
-      , indexStride{ indexStride_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV( AccelerationStructureGeometrySpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    AccelerationStructureGeometrySpheresDataNV( VkAccelerationStructureGeometrySpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : AccelerationStructureGeometrySpheresDataNV( *reinterpret_cast<AccelerationStructureGeometrySpheresDataNV const *>( &rhs ) )
-    {
-    }
-
-    AccelerationStructureGeometrySpheresDataNV & operator=( AccelerationStructureGeometrySpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AccelerationStructureGeometrySpheresDataNV & operator=( VkAccelerationStructureGeometrySpheresDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AccelerationStructureGeometrySpheresDataNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setVertexFormat( Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexFormat = vertexFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setVertexData( DeviceOrHostAddressConstKHR const & vertexData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexData = vertexData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setVertexStride( DeviceSize vertexStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexStride = vertexStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setRadiusFormat( Format radiusFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusFormat = radiusFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setRadiusData( DeviceOrHostAddressConstKHR const & radiusData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusData = radiusData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setRadiusStride( DeviceSize radiusStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      radiusStride = radiusStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexType = indexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setIndexData( DeviceOrHostAddressConstKHR const & indexData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexData = indexData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureGeometrySpheresDataNV & setIndexStride( DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexStride = indexStride_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAccelerationStructureGeometrySpheresDataNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAccelerationStructureGeometrySpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometrySpheresDataNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAccelerationStructureGeometrySpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometrySpheresDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureGeometrySpheresDataNV *>( this );
-    }
-
-    operator VkAccelerationStructureGeometrySpheresDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureGeometrySpheresDataNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               IndexType const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, vertexFormat, vertexData, vertexStride, radiusFormat, radiusData, radiusStride, indexType, indexData, indexStride );
-    }
-#endif
-
-  public:
-    StructureType               sType        = StructureType::eAccelerationStructureGeometrySpheresDataNV;
-    const void *                pNext        = {};
-    Format                      vertexFormat = Format::eUndefined;
-    DeviceOrHostAddressConstKHR vertexData   = {};
-    DeviceSize                  vertexStride = {};
-    Format                      radiusFormat = Format::eUndefined;
-    DeviceOrHostAddressConstKHR radiusData   = {};
-    DeviceSize                  radiusStride = {};
-    IndexType                   indexType    = IndexType::eUint16;
-    DeviceOrHostAddressConstKHR indexData    = {};
-    DeviceSize                  indexStride  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureGeometrySpheresDataNV>
-  {
-    using Type = AccelerationStructureGeometrySpheresDataNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAccelerationStructureGeometrySpheresDataNV>
-  {
-    using Type = AccelerationStructureGeometrySpheresDataNV;
-  };
-
-  // wrapper struct for struct VkTransformMatrixKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTransformMatrixKHR.html
   struct TransformMatrixKHR
   {
     using NativeType = VkTransformMatrixKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 TransformMatrixKHR( std::array<std::array<float, 4>, 3> const & matrix_ = {} ) VULKAN_HPP_NOEXCEPT : matrix{ matrix_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 TransformMatrixKHR( std::array<std::array<float, 4>, 3> const & matrix_ = {} ) VULKAN_HPP_NOEXCEPT : matrix( matrix_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 TransformMatrixKHR( TransformMatrixKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
     TransformMatrixKHR( VkTransformMatrixKHR const & rhs ) VULKAN_HPP_NOEXCEPT : TransformMatrixKHR( *reinterpret_cast<TransformMatrixKHR const *>( &rhs ) ) {}
 
     TransformMatrixKHR & operator=( TransformMatrixKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TransformMatrixKHR & operator=( VkTransformMatrixKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TransformMatrixKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TransformMatrixKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 TransformMatrixKHR & setMatrix( std::array<std::array<float, 4>, 3> matrix_ ) VULKAN_HPP_NOEXCEPT
     {
       matrix = matrix_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkTransformMatrixKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -3247,18 +2444,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTransformMatrixKHR *>( this );
     }
 
-    operator VkTransformMatrixKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTransformMatrixKHR *>( this );
-    }
-
-    operator VkTransformMatrixKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTransformMatrixKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ArrayWrapper2D<float, 3, 4> const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ArrayWrapper2D<float, 3, 4> const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( matrix );
     }
@@ -3283,37 +2475,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ArrayWrapper2D<float, 3, 4> matrix = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper2D<float, 3, 4> matrix = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTransformMatrixKHR>
-  {
-    using Type = TransformMatrixKHR;
-  };
-#endif
   using TransformMatrixNV = TransformMatrixKHR;
 
-  // wrapper struct for struct VkAccelerationStructureInstanceKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureInstanceKHR.html
   struct AccelerationStructureInstanceKHR
   {
     using NativeType = VkAccelerationStructureInstanceKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInstanceKHR( TransformMatrixKHR       transform_                              = {},
-                                                              uint32_t                 instanceCustomIndex_                    = {},
-                                                              uint32_t                 mask_                                   = {},
-                                                              uint32_t                 instanceShaderBindingTableRecordOffset_ = {},
-                                                              GeometryInstanceFlagsKHR flags_                                  = {},
-                                                              uint64_t                 accelerationStructureReference_         = {} ) VULKAN_HPP_NOEXCEPT
-      : transform{ transform_ }
-      , instanceCustomIndex{ instanceCustomIndex_ }
-      , mask{ mask_ }
-      , instanceShaderBindingTableRecordOffset{ instanceShaderBindingTableRecordOffset_ }
-      , flags{ flags_ }
-      , accelerationStructureReference{ accelerationStructureReference_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInstanceKHR( VULKAN_HPP_NAMESPACE::TransformMatrixKHR       transform_                              = {},
+                                                              uint32_t                                       instanceCustomIndex_                    = {},
+                                                              uint32_t                                       mask_                                   = {},
+                                                              uint32_t                                       instanceShaderBindingTableRecordOffset_ = {},
+                                                              VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_                                  = {},
+                                                              uint64_t accelerationStructureReference_ = {} ) VULKAN_HPP_NOEXCEPT
+      : transform( transform_ )
+      , instanceCustomIndex( instanceCustomIndex_ )
+      , mask( mask_ )
+      , instanceShaderBindingTableRecordOffset( instanceShaderBindingTableRecordOffset_ )
+      , flags( flags_ )
+      , accelerationStructureReference( accelerationStructureReference_ )
     {
     }
 
@@ -3325,16 +2508,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureInstanceKHR & operator=( AccelerationStructureInstanceKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureInstanceKHR & operator=( VkAccelerationStructureInstanceKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureInstanceKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureInstanceKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInstanceKHR & setTransform( TransformMatrixKHR const & transform_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureInstanceKHR & setTransform( VULKAN_HPP_NAMESPACE::TransformMatrixKHR const & transform_ ) VULKAN_HPP_NOEXCEPT
     {
       transform = transform_;
       return *this;
@@ -3359,7 +2542,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    AccelerationStructureInstanceKHR & setFlags( GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureInstanceKHR & setFlags( VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = *reinterpret_cast<VkGeometryInstanceFlagsKHR *>( &flags_ );
       return *this;
@@ -3370,7 +2553,7 @@ namespace VULKAN_HPP_NAMESPACE
       accelerationStructureReference = accelerationStructureReference_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureInstanceKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -3382,18 +2565,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureInstanceKHR *>( this );
     }
 
-    operator VkAccelerationStructureInstanceKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureInstanceKHR *>( this );
-    }
-
-    operator VkAccelerationStructureInstanceKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureInstanceKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<TransformMatrixKHR const &, uint32_t const &, uint32_t const &, uint32_t const &, VkGeometryInstanceFlagsKHR const &, uint64_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::TransformMatrixKHR const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               VkGeometryInstanceFlagsKHR const &,
+               uint64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( transform, instanceCustomIndex, mask, instanceShaderBindingTableRecordOffset, flags, accelerationStructureReference );
@@ -3421,44 +2603,35 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    TransformMatrixKHR         transform = {};
-    uint32_t                   instanceCustomIndex                    : 24;
-    uint32_t                   mask                                   : 8;
-    uint32_t                   instanceShaderBindingTableRecordOffset : 24;
-    VkGeometryInstanceFlagsKHR flags                                  : 8;
-    uint64_t                   accelerationStructureReference = {};
+    VULKAN_HPP_NAMESPACE::TransformMatrixKHR transform = {};
+    uint32_t                                 instanceCustomIndex                    : 24;
+    uint32_t                                 mask                                   : 8;
+    uint32_t                                 instanceShaderBindingTableRecordOffset : 24;
+    VkGeometryInstanceFlagsKHR               flags                                  : 8;
+    uint64_t                                 accelerationStructureReference = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureInstanceKHR>
-  {
-    using Type = AccelerationStructureInstanceKHR;
-  };
-#endif
   using AccelerationStructureInstanceNV = AccelerationStructureInstanceKHR;
 
-  // wrapper struct for struct VkAccelerationStructureMatrixMotionInstanceNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMatrixMotionInstanceNV.html
   struct AccelerationStructureMatrixMotionInstanceNV
   {
     using NativeType = VkAccelerationStructureMatrixMotionInstanceNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV( TransformMatrixKHR       transformT0_                            = {},
-                                                                         TransformMatrixKHR       transformT1_                            = {},
-                                                                         uint32_t                 instanceCustomIndex_                    = {},
-                                                                         uint32_t                 mask_                                   = {},
-                                                                         uint32_t                 instanceShaderBindingTableRecordOffset_ = {},
-                                                                         GeometryInstanceFlagsKHR flags_                                  = {},
-                                                                         uint64_t                 accelerationStructureReference_ = {} ) VULKAN_HPP_NOEXCEPT
-      : transformT0{ transformT0_ }
-      , transformT1{ transformT1_ }
-      , instanceCustomIndex{ instanceCustomIndex_ }
-      , mask{ mask_ }
-      , instanceShaderBindingTableRecordOffset{ instanceShaderBindingTableRecordOffset_ }
-      , flags{ flags_ }
-      , accelerationStructureReference{ accelerationStructureReference_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV( VULKAN_HPP_NAMESPACE::TransformMatrixKHR transformT0_                            = {},
+                                                                         VULKAN_HPP_NAMESPACE::TransformMatrixKHR transformT1_                            = {},
+                                                                         uint32_t                                 instanceCustomIndex_                    = {},
+                                                                         uint32_t                                 mask_                                   = {},
+                                                                         uint32_t                                 instanceShaderBindingTableRecordOffset_ = {},
+                                                                         VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_                            = {},
+                                                                         uint64_t accelerationStructureReference_ = {} ) VULKAN_HPP_NOEXCEPT
+      : transformT0( transformT0_ )
+      , transformT1( transformT1_ )
+      , instanceCustomIndex( instanceCustomIndex_ )
+      , mask( mask_ )
+      , instanceShaderBindingTableRecordOffset( instanceShaderBindingTableRecordOffset_ )
+      , flags( flags_ )
+      , accelerationStructureReference( accelerationStructureReference_ )
     {
     }
 
@@ -3471,22 +2644,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureMatrixMotionInstanceNV & operator=( AccelerationStructureMatrixMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureMatrixMotionInstanceNV & operator=( VkAccelerationStructureMatrixMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureMatrixMotionInstanceNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureMatrixMotionInstanceNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV & setTransformT0( TransformMatrixKHR const & transformT0_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV &
+      setTransformT0( VULKAN_HPP_NAMESPACE::TransformMatrixKHR const & transformT0_ ) VULKAN_HPP_NOEXCEPT
     {
       transformT0 = transformT0_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV & setTransformT1( TransformMatrixKHR const & transformT1_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMatrixMotionInstanceNV &
+      setTransformT1( VULKAN_HPP_NAMESPACE::TransformMatrixKHR const & transformT1_ ) VULKAN_HPP_NOEXCEPT
     {
       transformT1 = transformT1_;
       return *this;
@@ -3511,7 +2686,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    AccelerationStructureMatrixMotionInstanceNV & setFlags( GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureMatrixMotionInstanceNV & setFlags( VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = *reinterpret_cast<VkGeometryInstanceFlagsKHR *>( &flags_ );
       return *this;
@@ -3523,7 +2698,7 @@ namespace VULKAN_HPP_NAMESPACE
       accelerationStructureReference = accelerationStructureReference_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureMatrixMotionInstanceNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -3535,24 +2710,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureMatrixMotionInstanceNV *>( this );
     }
 
-    operator VkAccelerationStructureMatrixMotionInstanceNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureMatrixMotionInstanceNV *>( this );
-    }
-
-    operator VkAccelerationStructureMatrixMotionInstanceNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureMatrixMotionInstanceNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<TransformMatrixKHR const &,
-               TransformMatrixKHR const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::TransformMatrixKHR const &,
+               VULKAN_HPP_NAMESPACE::TransformMatrixKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                VkGeometryInstanceFlagsKHR const &,
                uint64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( transformT0, transformT1, instanceCustomIndex, mask, instanceShaderBindingTableRecordOffset, flags, accelerationStructureReference );
@@ -3580,25 +2749,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    TransformMatrixKHR         transformT0 = {};
-    TransformMatrixKHR         transformT1 = {};
-    uint32_t                   instanceCustomIndex                    : 24;
-    uint32_t                   mask                                   : 8;
-    uint32_t                   instanceShaderBindingTableRecordOffset : 24;
-    VkGeometryInstanceFlagsKHR flags                                  : 8;
-    uint64_t                   accelerationStructureReference = {};
+    VULKAN_HPP_NAMESPACE::TransformMatrixKHR transformT0 = {};
+    VULKAN_HPP_NAMESPACE::TransformMatrixKHR transformT1 = {};
+    uint32_t                                 instanceCustomIndex                    : 24;
+    uint32_t                                 mask                                   : 8;
+    uint32_t                                 instanceShaderBindingTableRecordOffset : 24;
+    VkGeometryInstanceFlagsKHR               flags                                  : 8;
+    uint64_t                                 accelerationStructureReference = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureMatrixMotionInstanceNV>
-  {
-    using Type = AccelerationStructureMatrixMotionInstanceNV;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureMemoryRequirementsInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMemoryRequirementsInfoNV.html
   struct AccelerationStructureMemoryRequirementsInfoNV
   {
     using NativeType = VkAccelerationStructureMemoryRequirementsInfoNV;
@@ -3606,14 +2765,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureMemoryRequirementsInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR AccelerationStructureMemoryRequirementsInfoNV(
-      AccelerationStructureMemoryRequirementsTypeNV type_                  = AccelerationStructureMemoryRequirementsTypeNV::eObject,
-      AccelerationStructureNV                       accelerationStructure_ = {},
-      const void *                                  pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , accelerationStructure{ accelerationStructure_ }
+      VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV type_ = VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV::eObject,
+      VULKAN_HPP_NAMESPACE::AccelerationStructureNV                       accelerationStructure_ = {},
+      const void *                                                        pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , accelerationStructure( accelerationStructure_ )
     {
     }
 
@@ -3626,34 +2785,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureMemoryRequirementsInfoNV & operator=( AccelerationStructureMemoryRequirementsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureMemoryRequirementsInfoNV & operator=( VkAccelerationStructureMemoryRequirementsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureMemoryRequirementsInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMemoryRequirementsInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMemoryRequirementsInfoNV & setType( AccelerationStructureMemoryRequirementsTypeNV type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMemoryRequirementsInfoNV &
+      setType( VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMemoryRequirementsInfoNV &
-      setAccelerationStructure( AccelerationStructureNV accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureMemoryRequirementsInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -3665,18 +2825,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureMemoryRequirementsInfoNV *>( this );
     }
 
-    operator VkAccelerationStructureMemoryRequirementsInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureMemoryRequirementsInfoNV *>( this );
-    }
-
-    operator VkAccelerationStructureMemoryRequirementsInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureMemoryRequirementsInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AccelerationStructureMemoryRequirementsTypeNV const &, AccelerationStructureNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, accelerationStructure );
@@ -3702,28 +2859,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                 sType                 = StructureType::eAccelerationStructureMemoryRequirementsInfoNV;
-    const void *                                  pNext                 = {};
-    AccelerationStructureMemoryRequirementsTypeNV type                  = AccelerationStructureMemoryRequirementsTypeNV::eObject;
-    AccelerationStructureNV                       accelerationStructure = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType = StructureType::eAccelerationStructureMemoryRequirementsInfoNV;
+    const void *                                                        pNext = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV type  = VULKAN_HPP_NAMESPACE::AccelerationStructureMemoryRequirementsTypeNV::eObject;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureNV                       accelerationStructure = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureMemoryRequirementsInfoNV>
-  {
-    using Type = AccelerationStructureMemoryRequirementsInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureMemoryRequirementsInfoNV>
   {
     using Type = AccelerationStructureMemoryRequirementsInfoNV;
   };
 
-  // wrapper struct for struct VkAccelerationStructureMotionInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMotionInfoNV.html
   struct AccelerationStructureMotionInfoNV
   {
     using NativeType = VkAccelerationStructureMotionInfoNV;
@@ -3731,13 +2878,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureMotionInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureMotionInfoNV( uint32_t                               maxInstances_ = {},
-                                                            AccelerationStructureMotionInfoFlagsNV flags_        = {},
-                                                            const void *                           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxInstances{ maxInstances_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureMotionInfoNV( uint32_t                                                     maxInstances_ = {},
+                                                            VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoFlagsNV flags_        = {},
+                                                            const void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxInstances( maxInstances_ )
+      , flags( flags_ )
     {
     }
 
@@ -3749,15 +2896,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureMotionInfoNV & operator=( AccelerationStructureMotionInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureMotionInfoNV & operator=( VkAccelerationStructureMotionInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureMotionInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -3770,12 +2917,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInfoNV & setFlags( AccelerationStructureMotionInfoFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInfoNV &
+      setFlags( VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureMotionInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -3787,18 +2935,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureMotionInfoNV *>( this );
     }
 
-    operator VkAccelerationStructureMotionInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureMotionInfoNV *>( this );
-    }
-
-    operator VkAccelerationStructureMotionInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureMotionInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, AccelerationStructureMotionInfoFlagsNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoFlagsNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxInstances, flags );
@@ -3824,32 +2969,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                          sType        = StructureType::eAccelerationStructureMotionInfoNV;
-    const void *                           pNext        = {};
-    uint32_t                               maxInstances = {};
-    AccelerationStructureMotionInfoFlagsNV flags        = {};
+    VULKAN_HPP_NAMESPACE::StructureType                          sType        = StructureType::eAccelerationStructureMotionInfoNV;
+    const void *                                                 pNext        = {};
+    uint32_t                                                     maxInstances = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInfoFlagsNV flags        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureMotionInfoNV>
-  {
-    using Type = AccelerationStructureMotionInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureMotionInfoNV>
   {
     using Type = AccelerationStructureMotionInfoNV;
   };
 
-  // wrapper struct for struct VkSRTDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSRTDataNV.html
   struct SRTDataNV
   {
     using NativeType = VkSRTDataNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SRTDataNV( float sx_  = {},
                                     float a_   = {},
                                     float b_   = {},
@@ -3866,22 +3002,22 @@ namespace VULKAN_HPP_NAMESPACE
                                     float tx_  = {},
                                     float ty_  = {},
                                     float tz_  = {} ) VULKAN_HPP_NOEXCEPT
-      : sx{ sx_ }
-      , a{ a_ }
-      , b{ b_ }
-      , pvx{ pvx_ }
-      , sy{ sy_ }
-      , c{ c_ }
-      , pvy{ pvy_ }
-      , sz{ sz_ }
-      , pvz{ pvz_ }
-      , qx{ qx_ }
-      , qy{ qy_ }
-      , qz{ qz_ }
-      , qw{ qw_ }
-      , tx{ tx_ }
-      , ty{ ty_ }
-      , tz{ tz_ }
+      : sx( sx_ )
+      , a( a_ )
+      , b( b_ )
+      , pvx( pvx_ )
+      , sy( sy_ )
+      , c( c_ )
+      , pvy( pvy_ )
+      , sz( sz_ )
+      , pvz( pvz_ )
+      , qx( qx_ )
+      , qy( qy_ )
+      , qz( qz_ )
+      , qw( qw_ )
+      , tx( tx_ )
+      , ty( ty_ )
+      , tz( tz_ )
     {
     }
 
@@ -3890,15 +3026,15 @@ namespace VULKAN_HPP_NAMESPACE
     SRTDataNV( VkSRTDataNV const & rhs ) VULKAN_HPP_NOEXCEPT : SRTDataNV( *reinterpret_cast<SRTDataNV const *>( &rhs ) ) {}
 
     SRTDataNV & operator=( SRTDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SRTDataNV & operator=( VkSRTDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SRTDataNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SRTDataNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SRTDataNV & setSx( float sx_ ) VULKAN_HPP_NOEXCEPT
     {
       sx = sx_;
@@ -3994,7 +3130,7 @@ namespace VULKAN_HPP_NAMESPACE
       tz = tz_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSRTDataNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -4006,17 +3142,10 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSRTDataNV *>( this );
     }
 
-    operator VkSRTDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSRTDataNV *>( this );
-    }
-
-    operator VkSRTDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSRTDataNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<float const &,
                float const &,
                float const &,
@@ -4033,6 +3162,7 @@ namespace VULKAN_HPP_NAMESPACE
                float const &,
                float const &,
                float const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sx, a, b, pvx, sy, c, pvy, sz, pvz, qx, qy, qz, qw, tx, ty, tz );
@@ -4078,35 +3208,25 @@ namespace VULKAN_HPP_NAMESPACE
     float tz  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSRTDataNV>
-  {
-    using Type = SRTDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureSRTMotionInstanceNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureSRTMotionInstanceNV.html
   struct AccelerationStructureSRTMotionInstanceNV
   {
     using NativeType = VkAccelerationStructureSRTMotionInstanceNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AccelerationStructureSRTMotionInstanceNV( SRTDataNV                transformT0_                            = {},
-                                                                   SRTDataNV                transformT1_                            = {},
-                                                                   uint32_t                 instanceCustomIndex_                    = {},
-                                                                   uint32_t                 mask_                                   = {},
-                                                                   uint32_t                 instanceShaderBindingTableRecordOffset_ = {},
-                                                                   GeometryInstanceFlagsKHR flags_                                  = {},
-                                                                   uint64_t                 accelerationStructureReference_         = {} ) VULKAN_HPP_NOEXCEPT
-      : transformT0{ transformT0_ }
-      , transformT1{ transformT1_ }
-      , instanceCustomIndex{ instanceCustomIndex_ }
-      , mask{ mask_ }
-      , instanceShaderBindingTableRecordOffset{ instanceShaderBindingTableRecordOffset_ }
-      , flags{ flags_ }
-      , accelerationStructureReference{ accelerationStructureReference_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AccelerationStructureSRTMotionInstanceNV( VULKAN_HPP_NAMESPACE::SRTDataNV                transformT0_                            = {},
+                                                                   VULKAN_HPP_NAMESPACE::SRTDataNV                transformT1_                            = {},
+                                                                   uint32_t                                       instanceCustomIndex_                    = {},
+                                                                   uint32_t                                       mask_                                   = {},
+                                                                   uint32_t                                       instanceShaderBindingTableRecordOffset_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_                                  = {},
+                                                                   uint64_t accelerationStructureReference_ = {} ) VULKAN_HPP_NOEXCEPT
+      : transformT0( transformT0_ )
+      , transformT1( transformT1_ )
+      , instanceCustomIndex( instanceCustomIndex_ )
+      , mask( mask_ )
+      , instanceShaderBindingTableRecordOffset( instanceShaderBindingTableRecordOffset_ )
+      , flags( flags_ )
+      , accelerationStructureReference( accelerationStructureReference_ )
     {
     }
 
@@ -4118,22 +3238,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureSRTMotionInstanceNV & operator=( AccelerationStructureSRTMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureSRTMotionInstanceNV & operator=( VkAccelerationStructureSRTMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureSRTMotionInstanceNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureSRTMotionInstanceNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureSRTMotionInstanceNV & setTransformT0( SRTDataNV const & transformT0_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureSRTMotionInstanceNV &
+      setTransformT0( VULKAN_HPP_NAMESPACE::SRTDataNV const & transformT0_ ) VULKAN_HPP_NOEXCEPT
     {
       transformT0 = transformT0_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureSRTMotionInstanceNV & setTransformT1( SRTDataNV const & transformT1_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureSRTMotionInstanceNV &
+      setTransformT1( VULKAN_HPP_NAMESPACE::SRTDataNV const & transformT1_ ) VULKAN_HPP_NOEXCEPT
     {
       transformT1 = transformT1_;
       return *this;
@@ -4158,7 +3280,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    AccelerationStructureSRTMotionInstanceNV & setFlags( GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureSRTMotionInstanceNV & setFlags( VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = *reinterpret_cast<VkGeometryInstanceFlagsKHR *>( &flags_ );
       return *this;
@@ -4170,7 +3292,7 @@ namespace VULKAN_HPP_NAMESPACE
       accelerationStructureReference = accelerationStructureReference_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureSRTMotionInstanceNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -4182,18 +3304,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureSRTMotionInstanceNV *>( this );
     }
 
-    operator VkAccelerationStructureSRTMotionInstanceNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureSRTMotionInstanceNV *>( this );
-    }
-
-    operator VkAccelerationStructureSRTMotionInstanceNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureSRTMotionInstanceNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<SRTDataNV const &, SRTDataNV const &, uint32_t const &, uint32_t const &, uint32_t const &, VkGeometryInstanceFlagsKHR const &, uint64_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::SRTDataNV const &,
+               VULKAN_HPP_NAMESPACE::SRTDataNV const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               VkGeometryInstanceFlagsKHR const &,
+               uint64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( transformT0, transformT1, instanceCustomIndex, mask, instanceShaderBindingTableRecordOffset, flags, accelerationStructureReference );
@@ -4221,66 +3343,58 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    SRTDataNV                  transformT0 = {};
-    SRTDataNV                  transformT1 = {};
-    uint32_t                   instanceCustomIndex                    : 24;
-    uint32_t                   mask                                   : 8;
-    uint32_t                   instanceShaderBindingTableRecordOffset : 24;
-    VkGeometryInstanceFlagsKHR flags                                  : 8;
-    uint64_t                   accelerationStructureReference = {};
+    VULKAN_HPP_NAMESPACE::SRTDataNV transformT0 = {};
+    VULKAN_HPP_NAMESPACE::SRTDataNV transformT1 = {};
+    uint32_t                        instanceCustomIndex                    : 24;
+    uint32_t                        mask                                   : 8;
+    uint32_t                        instanceShaderBindingTableRecordOffset : 24;
+    VkGeometryInstanceFlagsKHR      flags                                  : 8;
+    uint64_t                        accelerationStructureReference = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureSRTMotionInstanceNV>
-  {
-    using Type = AccelerationStructureSRTMotionInstanceNV;
-  };
-#endif
-
   union AccelerationStructureMotionInstanceDataNV
   {
     using NativeType = VkAccelerationStructureMotionInstanceDataNV;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( AccelerationStructureInstanceKHR staticInstance_ = {} )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( VULKAN_HPP_NAMESPACE::AccelerationStructureInstanceKHR staticInstance_ = {} )
       : staticInstance( staticInstance_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( AccelerationStructureMatrixMotionInstanceNV matrixMotionInstance_ )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( VULKAN_HPP_NAMESPACE::AccelerationStructureMatrixMotionInstanceNV matrixMotionInstance_ )
       : matrixMotionInstance( matrixMotionInstance_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( AccelerationStructureSRTMotionInstanceNV srtMotionInstance_ )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV( VULKAN_HPP_NAMESPACE::AccelerationStructureSRTMotionInstanceNV srtMotionInstance_ )
       : srtMotionInstance( srtMotionInstance_ )
     {
     }
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV &
-      setStaticInstance( AccelerationStructureInstanceKHR const & staticInstance_ ) VULKAN_HPP_NOEXCEPT
+      setStaticInstance( VULKAN_HPP_NAMESPACE::AccelerationStructureInstanceKHR const & staticInstance_ ) VULKAN_HPP_NOEXCEPT
     {
       staticInstance = staticInstance_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV &
-      setMatrixMotionInstance( AccelerationStructureMatrixMotionInstanceNV const & matrixMotionInstance_ ) VULKAN_HPP_NOEXCEPT
+      setMatrixMotionInstance( VULKAN_HPP_NAMESPACE::AccelerationStructureMatrixMotionInstanceNV const & matrixMotionInstance_ ) VULKAN_HPP_NOEXCEPT
     {
       matrixMotionInstance = matrixMotionInstance_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceDataNV &
-      setSrtMotionInstance( AccelerationStructureSRTMotionInstanceNV const & srtMotionInstance_ ) VULKAN_HPP_NOEXCEPT
+      setSrtMotionInstance( VULKAN_HPP_NAMESPACE::AccelerationStructureSRTMotionInstanceNV const & srtMotionInstance_ ) VULKAN_HPP_NOEXCEPT
     {
       srtMotionInstance = srtMotionInstance_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkAccelerationStructureMotionInstanceDataNV const &() const
     {
@@ -4293,9 +3407,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    AccelerationStructureInstanceKHR            staticInstance;
-    AccelerationStructureMatrixMotionInstanceNV matrixMotionInstance;
-    AccelerationStructureSRTMotionInstanceNV    srtMotionInstance;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureInstanceKHR            staticInstance;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMatrixMotionInstanceNV matrixMotionInstance;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureSRTMotionInstanceNV    srtMotionInstance;
 #else
     VkAccelerationStructureInstanceKHR            staticInstance;
     VkAccelerationStructureMatrixMotionInstanceNV matrixMotionInstance;
@@ -4303,28 +3417,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureMotionInstanceDataNV>
-  {
-    using Type = AccelerationStructureMotionInstanceDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkAccelerationStructureMotionInstanceNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureMotionInstanceNV.html
   struct AccelerationStructureMotionInstanceNV
   {
     using NativeType = VkAccelerationStructureMotionInstanceNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      AccelerationStructureMotionInstanceNV( AccelerationStructureMotionInstanceTypeNV  type_  = AccelerationStructureMotionInstanceTypeNV::eStatic,
-                                             AccelerationStructureMotionInstanceFlagsNV flags_ = {},
-                                             AccelerationStructureMotionInstanceDataNV  data_  = {} ) VULKAN_HPP_NOEXCEPT
-      : type{ type_ }
-      , flags{ flags_ }
-      , data{ data_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV  type_  = VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV::eStatic,
+      VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceFlagsNV flags_ = {},
+      VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceDataNV  data_  = {} ) VULKAN_HPP_NOEXCEPT
+      : type( type_ )
+      , flags( flags_ )
+      , data( data_ )
     {
     }
 
@@ -4336,33 +3440,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureMotionInstanceNV & operator=( AccelerationStructureMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureMotionInstanceNV & operator=( VkAccelerationStructureMotionInstanceNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureMotionInstanceNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV & setType( AccelerationStructureMotionInstanceTypeNV type_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV &
+      setType( VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV & setFlags( AccelerationStructureMotionInstanceFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV &
+      setFlags( VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV & setData( AccelerationStructureMotionInstanceDataNV const & data_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureMotionInstanceNV &
+      setData( VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceDataNV const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureMotionInstanceNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -4374,20 +3481,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureMotionInstanceNV *>( this );
     }
 
-    operator VkAccelerationStructureMotionInstanceNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureMotionInstanceNV *>( this );
-    }
-
-    operator VkAccelerationStructureMotionInstanceNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureMotionInstanceNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<AccelerationStructureMotionInstanceTypeNV const &,
-               AccelerationStructureMotionInstanceFlagsNV const &,
-               AccelerationStructureMotionInstanceDataNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceDataNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( type, flags, data );
@@ -4395,29 +3496,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    AccelerationStructureMotionInstanceTypeNV  type  = AccelerationStructureMotionInstanceTypeNV::eStatic;
-    AccelerationStructureMotionInstanceFlagsNV flags = {};
-    AccelerationStructureMotionInstanceDataNV  data  = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV  type  = VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceTypeNV::eStatic;
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceFlagsNV flags = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureMotionInstanceDataNV  data  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureMotionInstanceNV>
-  {
-    using Type = AccelerationStructureMotionInstanceNV;
-  };
-#endif
-
-  // wrapper struct for struct VkMicromapUsageEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapUsageEXT.html
   struct MicromapUsageEXT
   {
     using NativeType = VkMicromapUsageEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MicromapUsageEXT( uint32_t count_ = {}, uint32_t subdivisionLevel_ = {}, uint32_t format_ = {} ) VULKAN_HPP_NOEXCEPT
-      : count{ count_ }
-      , subdivisionLevel{ subdivisionLevel_ }
-      , format{ format_ }
+      : count( count_ )
+      , subdivisionLevel( subdivisionLevel_ )
+      , format( format_ )
     {
     }
 
@@ -4426,15 +3518,15 @@ namespace VULKAN_HPP_NAMESPACE
     MicromapUsageEXT( VkMicromapUsageEXT const & rhs ) VULKAN_HPP_NOEXCEPT : MicromapUsageEXT( *reinterpret_cast<MicromapUsageEXT const *>( &rhs ) ) {}
 
     MicromapUsageEXT & operator=( MicromapUsageEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapUsageEXT & operator=( VkMicromapUsageEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapUsageEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapUsageEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapUsageEXT & setCount( uint32_t count_ ) VULKAN_HPP_NOEXCEPT
     {
       count = count_;
@@ -4452,7 +3544,7 @@ namespace VULKAN_HPP_NAMESPACE
       format = format_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapUsageEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -4464,18 +3556,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapUsageEXT *>( this );
     }
 
-    operator VkMicromapUsageEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapUsageEXT *>( this );
-    }
-
-    operator VkMicromapUsageEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapUsageEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( count, subdivisionLevel, format );
     }
@@ -4484,7 +3571,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( MicromapUsageEXT const & ) const = default;
 #else
-    bool operator==( MicromapUsageEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool                                          operator==( MicromapUsageEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -4505,17 +3592,7 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t format           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapUsageEXT>
-  {
-    using Type = MicromapUsageEXT;
-  };
-#endif
-
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkAccelerationStructureTrianglesDisplacementMicromapNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureTrianglesDisplacementMicromapNV.html
   struct AccelerationStructureTrianglesDisplacementMicromapNV
   {
     using NativeType = VkAccelerationStructureTrianglesDisplacementMicromapNV;
@@ -4523,41 +3600,42 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureTrianglesDisplacementMicromapNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV( Format displacementBiasAndScaleFormat_ = Format::eUndefined,
-                                                                                  Format displacementVectorFormat_       = Format::eUndefined,
-                                                                                  DeviceOrHostAddressConstKHR      displacementBiasAndScaleBuffer_        = {},
-                                                                                  DeviceSize                       displacementBiasAndScaleStride_        = {},
-                                                                                  DeviceOrHostAddressConstKHR      displacementVectorBuffer_              = {},
-                                                                                  DeviceSize                       displacementVectorStride_              = {},
-                                                                                  DeviceOrHostAddressConstKHR      displacedMicromapPrimitiveFlags_       = {},
-                                                                                  DeviceSize                       displacedMicromapPrimitiveFlagsStride_ = {},
-                                                                                  IndexType                        indexType_        = IndexType::eUint16,
-                                                                                  DeviceOrHostAddressConstKHR      indexBuffer_      = {},
-                                                                                  DeviceSize                       indexStride_      = {},
-                                                                                  uint32_t                         baseTriangle_     = {},
-                                                                                  uint32_t                         usageCountsCount_ = {},
-                                                                                  const MicromapUsageEXT *         pUsageCounts_     = {},
-                                                                                  const MicromapUsageEXT * const * ppUsageCounts_    = {},
-                                                                                  MicromapEXT                      micromap_         = {},
-                                                                                  void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displacementBiasAndScaleFormat{ displacementBiasAndScaleFormat_ }
-      , displacementVectorFormat{ displacementVectorFormat_ }
-      , displacementBiasAndScaleBuffer{ displacementBiasAndScaleBuffer_ }
-      , displacementBiasAndScaleStride{ displacementBiasAndScaleStride_ }
-      , displacementVectorBuffer{ displacementVectorBuffer_ }
-      , displacementVectorStride{ displacementVectorStride_ }
-      , displacedMicromapPrimitiveFlags{ displacedMicromapPrimitiveFlags_ }
-      , displacedMicromapPrimitiveFlagsStride{ displacedMicromapPrimitiveFlagsStride_ }
-      , indexType{ indexType_ }
-      , indexBuffer{ indexBuffer_ }
-      , indexStride{ indexStride_ }
-      , baseTriangle{ baseTriangle_ }
-      , usageCountsCount{ usageCountsCount_ }
-      , pUsageCounts{ pUsageCounts_ }
-      , ppUsageCounts{ ppUsageCounts_ }
-      , micromap{ micromap_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV(
+      VULKAN_HPP_NAMESPACE::Format                           displacementBiasAndScaleFormat_        = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::Format                           displacementVectorFormat_              = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacementBiasAndScaleBuffer_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                       displacementBiasAndScaleStride_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacementVectorBuffer_              = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                       displacementVectorStride_              = {},
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacedMicromapPrimitiveFlags_       = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                       displacedMicromapPrimitiveFlagsStride_ = {},
+      VULKAN_HPP_NAMESPACE::IndexType                        indexType_                             = VULKAN_HPP_NAMESPACE::IndexType::eUint16,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      indexBuffer_                           = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                       indexStride_                           = {},
+      uint32_t                                               baseTriangle_                          = {},
+      uint32_t                                               usageCountsCount_                      = {},
+      const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *         pUsageCounts_                          = {},
+      const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_                         = {},
+      VULKAN_HPP_NAMESPACE::MicromapEXT                      micromap_                              = {},
+      void *                                                 pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displacementBiasAndScaleFormat( displacementBiasAndScaleFormat_ )
+      , displacementVectorFormat( displacementVectorFormat_ )
+      , displacementBiasAndScaleBuffer( displacementBiasAndScaleBuffer_ )
+      , displacementBiasAndScaleStride( displacementBiasAndScaleStride_ )
+      , displacementVectorBuffer( displacementVectorBuffer_ )
+      , displacementVectorStride( displacementVectorStride_ )
+      , displacedMicromapPrimitiveFlags( displacedMicromapPrimitiveFlags_ )
+      , displacedMicromapPrimitiveFlagsStride( displacedMicromapPrimitiveFlagsStride_ )
+      , indexType( indexType_ )
+      , indexBuffer( indexBuffer_ )
+      , indexStride( indexStride_ )
+      , baseTriangle( baseTriangle_ )
+      , usageCountsCount( usageCountsCount_ )
+      , pUsageCounts( pUsageCounts_ )
+      , ppUsageCounts( ppUsageCounts_ )
+      , micromap( micromap_ )
     {
     }
 
@@ -4570,22 +3648,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureTrianglesDisplacementMicromapNV( Format                                                  displacementBiasAndScaleFormat_,
-                                                          Format                                                  displacementVectorFormat_,
-                                                          DeviceOrHostAddressConstKHR                             displacementBiasAndScaleBuffer_,
-                                                          DeviceSize                                              displacementBiasAndScaleStride_,
-                                                          DeviceOrHostAddressConstKHR                             displacementVectorBuffer_,
-                                                          DeviceSize                                              displacementVectorStride_,
-                                                          DeviceOrHostAddressConstKHR                             displacedMicromapPrimitiveFlags_,
-                                                          DeviceSize                                              displacedMicromapPrimitiveFlagsStride_,
-                                                          IndexType                                               indexType_,
-                                                          DeviceOrHostAddressConstKHR                             indexBuffer_,
-                                                          DeviceSize                                              indexStride_,
-                                                          uint32_t                                                baseTriangle_,
-                                                          ArrayProxyNoTemporaries<const MicromapUsageEXT> const & usageCounts_,
-                                                          ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_ = {},
-                                                          MicromapEXT                                                     micromap_     = {},
-                                                          void *                                                          pNext_        = nullptr )
+    AccelerationStructureTrianglesDisplacementMicromapNV(
+      VULKAN_HPP_NAMESPACE::Format                                                                                displacementBiasAndScaleFormat_,
+      VULKAN_HPP_NAMESPACE::Format                                                                                displacementVectorFormat_,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           displacementBiasAndScaleBuffer_,
+      VULKAN_HPP_NAMESPACE::DeviceSize                                                                            displacementBiasAndScaleStride_,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           displacementVectorBuffer_,
+      VULKAN_HPP_NAMESPACE::DeviceSize                                                                            displacementVectorStride_,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           displacedMicromapPrimitiveFlags_,
+      VULKAN_HPP_NAMESPACE::DeviceSize                                                                            displacedMicromapPrimitiveFlagsStride_,
+      VULKAN_HPP_NAMESPACE::IndexType                                                                             indexType_,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           indexBuffer_,
+      VULKAN_HPP_NAMESPACE::DeviceSize                                                                            indexStride_,
+      uint32_t                                                                                                    baseTriangle_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const &         usageCounts_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_ = {},
+      VULKAN_HPP_NAMESPACE::MicromapEXT                                                                           micromap_     = {},
+      void *                                                                                                      pNext_        = nullptr )
       : pNext( pNext_ )
       , displacementBiasAndScaleFormat( displacementBiasAndScaleFormat_ )
       , displacementVectorFormat( displacementVectorFormat_ )
@@ -4619,15 +3698,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     AccelerationStructureTrianglesDisplacementMicromapNV &
       operator=( AccelerationStructureTrianglesDisplacementMicromapNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureTrianglesDisplacementMicromapNV & operator=( VkAccelerationStructureTrianglesDisplacementMicromapNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureTrianglesDisplacementMicromapNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureTrianglesDisplacementMicromapNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -4635,75 +3714,77 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementBiasAndScaleFormat( Format displacementBiasAndScaleFormat_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementBiasAndScaleFormat( VULKAN_HPP_NAMESPACE::Format displacementBiasAndScaleFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementBiasAndScaleFormat = displacementBiasAndScaleFormat_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementVectorFormat( Format displacementVectorFormat_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementVectorFormat( VULKAN_HPP_NAMESPACE::Format displacementVectorFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementVectorFormat = displacementVectorFormat_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementBiasAndScaleBuffer( DeviceOrHostAddressConstKHR const & displacementBiasAndScaleBuffer_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementBiasAndScaleBuffer( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & displacementBiasAndScaleBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementBiasAndScaleBuffer = displacementBiasAndScaleBuffer_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementBiasAndScaleStride( DeviceSize displacementBiasAndScaleStride_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementBiasAndScaleStride( VULKAN_HPP_NAMESPACE::DeviceSize displacementBiasAndScaleStride_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementBiasAndScaleStride = displacementBiasAndScaleStride_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementVectorBuffer( DeviceOrHostAddressConstKHR const & displacementVectorBuffer_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementVectorBuffer( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & displacementVectorBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementVectorBuffer = displacementVectorBuffer_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacementVectorStride( DeviceSize displacementVectorStride_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacementVectorStride( VULKAN_HPP_NAMESPACE::DeviceSize displacementVectorStride_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementVectorStride = displacementVectorStride_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacedMicromapPrimitiveFlags( DeviceOrHostAddressConstKHR const & displacedMicromapPrimitiveFlags_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacedMicromapPrimitiveFlags( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & displacedMicromapPrimitiveFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       displacedMicromapPrimitiveFlags = displacedMicromapPrimitiveFlags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setDisplacedMicromapPrimitiveFlagsStride( DeviceSize displacedMicromapPrimitiveFlagsStride_ ) VULKAN_HPP_NOEXCEPT
+      setDisplacedMicromapPrimitiveFlagsStride( VULKAN_HPP_NAMESPACE::DeviceSize displacedMicromapPrimitiveFlagsStride_ ) VULKAN_HPP_NOEXCEPT
     {
       displacedMicromapPrimitiveFlagsStride = displacedMicromapPrimitiveFlagsStride_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
+      setIndexType( VULKAN_HPP_NAMESPACE::IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
     {
       indexType = indexType_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setIndexBuffer( DeviceOrHostAddressConstKHR const & indexBuffer_ ) VULKAN_HPP_NOEXCEPT
+      setIndexBuffer( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & indexBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       indexBuffer = indexBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV & setIndexStride( DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
+      setIndexStride( VULKAN_HPP_NAMESPACE::DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
     {
       indexStride = indexStride_;
       return *this;
@@ -4721,7 +3802,8 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV & setPUsageCounts( const MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
+      setPUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       pUsageCounts = pUsageCounts_;
       return *this;
@@ -4729,7 +3811,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     AccelerationStructureTrianglesDisplacementMicromapNV &
-      setUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
+      setUsageCounts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( usageCounts_.size() );
       pUsageCounts     = usageCounts_.data();
@@ -4738,15 +3820,15 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
-      setPpUsageCounts( const MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+      setPpUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       ppUsageCounts = ppUsageCounts_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureTrianglesDisplacementMicromapNV &
-      setPUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureTrianglesDisplacementMicromapNV & setPUsageCounts(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( pUsageCounts_.size() );
       ppUsageCounts    = pUsageCounts_.data();
@@ -4754,12 +3836,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV & setMicromap( MicromapEXT micromap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesDisplacementMicromapNV &
+      setMicromap( VULKAN_HPP_NAMESPACE::MicromapEXT micromap_ ) VULKAN_HPP_NOEXCEPT
     {
       micromap = micromap_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureTrianglesDisplacementMicromapNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -4771,35 +3854,29 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureTrianglesDisplacementMicromapNV *>( this );
     }
 
-    operator VkAccelerationStructureTrianglesDisplacementMicromapNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureTrianglesDisplacementMicromapNV *>( this );
-    }
-
-    operator VkAccelerationStructureTrianglesDisplacementMicromapNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureTrianglesDisplacementMicromapNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Format const &,
-               Format const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
-               IndexType const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::IndexType const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
-               const MicromapUsageEXT * const &,
-               const MicromapUsageEXT * const * const &,
-               MicromapEXT const &>
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const &,
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -4824,34 +3901,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                    sType                                 = StructureType::eAccelerationStructureTrianglesDisplacementMicromapNV;
-    void *                           pNext                                 = {};
-    Format                           displacementBiasAndScaleFormat        = Format::eUndefined;
-    Format                           displacementVectorFormat              = Format::eUndefined;
-    DeviceOrHostAddressConstKHR      displacementBiasAndScaleBuffer        = {};
-    DeviceSize                       displacementBiasAndScaleStride        = {};
-    DeviceOrHostAddressConstKHR      displacementVectorBuffer              = {};
-    DeviceSize                       displacementVectorStride              = {};
-    DeviceOrHostAddressConstKHR      displacedMicromapPrimitiveFlags       = {};
-    DeviceSize                       displacedMicromapPrimitiveFlagsStride = {};
-    IndexType                        indexType                             = IndexType::eUint16;
-    DeviceOrHostAddressConstKHR      indexBuffer                           = {};
-    DeviceSize                       indexStride                           = {};
-    uint32_t                         baseTriangle                          = {};
-    uint32_t                         usageCountsCount                      = {};
-    const MicromapUsageEXT *         pUsageCounts                          = {};
-    const MicromapUsageEXT * const * ppUsageCounts                         = {};
-    MicromapEXT                      micromap                              = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType = StructureType::eAccelerationStructureTrianglesDisplacementMicromapNV;
+    void *                                                 pNext = {};
+    VULKAN_HPP_NAMESPACE::Format                           displacementBiasAndScaleFormat        = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format                           displacementVectorFormat              = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacementBiasAndScaleBuffer        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       displacementBiasAndScaleStride        = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacementVectorBuffer              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       displacementVectorStride              = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      displacedMicromapPrimitiveFlags       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       displacedMicromapPrimitiveFlagsStride = {};
+    VULKAN_HPP_NAMESPACE::IndexType                        indexType                             = VULKAN_HPP_NAMESPACE::IndexType::eUint16;
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      indexBuffer                           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       indexStride                           = {};
+    uint32_t                                               baseTriangle                          = {};
+    uint32_t                                               usageCountsCount                      = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *         pUsageCounts                          = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts                         = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT                      micromap                              = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureTrianglesDisplacementMicromapNV>
-  {
-    using Type = AccelerationStructureTrianglesDisplacementMicromapNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureTrianglesDisplacementMicromapNV>
   {
@@ -4859,8 +3928,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkAccelerationStructureTrianglesOpacityMicromapEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureTrianglesOpacityMicromapEXT.html
   struct AccelerationStructureTrianglesOpacityMicromapEXT
   {
     using NativeType = VkAccelerationStructureTrianglesOpacityMicromapEXT;
@@ -4868,25 +3935,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT( IndexType                        indexType_        = IndexType::eUint16,
-                                                                              DeviceOrHostAddressConstKHR      indexBuffer_      = {},
-                                                                              DeviceSize                       indexStride_      = {},
-                                                                              uint32_t                         baseTriangle_     = {},
-                                                                              uint32_t                         usageCountsCount_ = {},
-                                                                              const MicromapUsageEXT *         pUsageCounts_     = {},
-                                                                              const MicromapUsageEXT * const * ppUsageCounts_    = {},
-                                                                              MicromapEXT                      micromap_         = {},
-                                                                              void *                           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , indexType{ indexType_ }
-      , indexBuffer{ indexBuffer_ }
-      , indexStride{ indexStride_ }
-      , baseTriangle{ baseTriangle_ }
-      , usageCountsCount{ usageCountsCount_ }
-      , pUsageCounts{ pUsageCounts_ }
-      , ppUsageCounts{ ppUsageCounts_ }
-      , micromap{ micromap_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      AccelerationStructureTrianglesOpacityMicromapEXT( VULKAN_HPP_NAMESPACE::IndexType                   indexType_ = VULKAN_HPP_NAMESPACE::IndexType::eUint16,
+                                                        VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR indexBuffer_        = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize                  indexStride_        = {},
+                                                        uint32_t                                          baseTriangle_       = {},
+                                                        uint32_t                                          usageCountsCount_   = {},
+                                                        const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *    pUsageCounts_       = {},
+                                                        const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_ = {},
+                                                        VULKAN_HPP_NAMESPACE::MicromapEXT                      micromap_      = {},
+                                                        void *                                                 pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , indexType( indexType_ )
+      , indexBuffer( indexBuffer_ )
+      , indexStride( indexStride_ )
+      , baseTriangle( baseTriangle_ )
+      , usageCountsCount( usageCountsCount_ )
+      , pUsageCounts( pUsageCounts_ )
+      , ppUsageCounts( ppUsageCounts_ )
+      , micromap( micromap_ )
     {
     }
 
@@ -4899,14 +3967,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureTrianglesOpacityMicromapEXT( IndexType                                                       indexType_,
-                                                      DeviceOrHostAddressConstKHR                                     indexBuffer_,
-                                                      DeviceSize                                                      indexStride_,
-                                                      uint32_t                                                        baseTriangle_,
-                                                      ArrayProxyNoTemporaries<const MicromapUsageEXT> const &         usageCounts_,
-                                                      ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_ = {},
-                                                      MicromapEXT                                                     micromap_     = {},
-                                                      void *                                                          pNext_        = nullptr )
+    AccelerationStructureTrianglesOpacityMicromapEXT(
+      VULKAN_HPP_NAMESPACE::IndexType                                                                             indexType_,
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           indexBuffer_,
+      VULKAN_HPP_NAMESPACE::DeviceSize                                                                            indexStride_,
+      uint32_t                                                                                                    baseTriangle_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const &         usageCounts_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_ = {},
+      VULKAN_HPP_NAMESPACE::MicromapEXT                                                                           micromap_     = {},
+      void *                                                                                                      pNext_        = nullptr )
       : pNext( pNext_ )
       , indexType( indexType_ )
       , indexBuffer( indexBuffer_ )
@@ -4931,35 +4000,36 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     AccelerationStructureTrianglesOpacityMicromapEXT & operator=( AccelerationStructureTrianglesOpacityMicromapEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureTrianglesOpacityMicromapEXT & operator=( VkAccelerationStructureTrianglesOpacityMicromapEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureTrianglesOpacityMicromapEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureTrianglesOpacityMicromapEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setIndexType( VULKAN_HPP_NAMESPACE::IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
     {
       indexType = indexType_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT &
-      setIndexBuffer( DeviceOrHostAddressConstKHR const & indexBuffer_ ) VULKAN_HPP_NOEXCEPT
+      setIndexBuffer( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & indexBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       indexBuffer = indexBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setIndexStride( DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT &
+      setIndexStride( VULKAN_HPP_NAMESPACE::DeviceSize indexStride_ ) VULKAN_HPP_NOEXCEPT
     {
       indexStride = indexStride_;
       return *this;
@@ -4977,7 +4047,8 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setPUsageCounts( const MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT &
+      setPUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       pUsageCounts = pUsageCounts_;
       return *this;
@@ -4985,7 +4056,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     AccelerationStructureTrianglesOpacityMicromapEXT &
-      setUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
+      setUsageCounts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( usageCounts_.size() );
       pUsageCounts     = usageCounts_.data();
@@ -4994,15 +4065,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT &
-      setPpUsageCounts( const MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+      setPpUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       ppUsageCounts = ppUsageCounts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AccelerationStructureTrianglesOpacityMicromapEXT &
-      setPUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    AccelerationStructureTrianglesOpacityMicromapEXT & setPUsageCounts(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( pUsageCounts_.size() );
       ppUsageCounts    = pUsageCounts_.data();
@@ -5010,12 +4081,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setMicromap( MicromapEXT micromap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AccelerationStructureTrianglesOpacityMicromapEXT & setMicromap( VULKAN_HPP_NAMESPACE::MicromapEXT micromap_ ) VULKAN_HPP_NOEXCEPT
     {
       micromap = micromap_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureTrianglesOpacityMicromapEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5027,27 +4098,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureTrianglesOpacityMicromapEXT *>( this );
     }
 
-    operator VkAccelerationStructureTrianglesOpacityMicromapEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureTrianglesOpacityMicromapEXT *>( this );
-    }
-
-    operator VkAccelerationStructureTrianglesOpacityMicromapEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureTrianglesOpacityMicromapEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               IndexType const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::IndexType const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
-               const MicromapUsageEXT * const &,
-               const MicromapUsageEXT * const * const &,
-               MicromapEXT const &>
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const &,
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, indexType, indexBuffer, indexStride, baseTriangle, usageCountsCount, pUsageCounts, ppUsageCounts, micromap );
@@ -5055,34 +4120,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType            = StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT;
-    void *                           pNext            = {};
-    IndexType                        indexType        = IndexType::eUint16;
-    DeviceOrHostAddressConstKHR      indexBuffer      = {};
-    DeviceSize                       indexStride      = {};
-    uint32_t                         baseTriangle     = {};
-    uint32_t                         usageCountsCount = {};
-    const MicromapUsageEXT *         pUsageCounts     = {};
-    const MicromapUsageEXT * const * ppUsageCounts    = {};
-    MicromapEXT                      micromap         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType            = StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT;
+    void *                                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::IndexType                        indexType        = VULKAN_HPP_NAMESPACE::IndexType::eUint16;
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      indexBuffer      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       indexStride      = {};
+    uint32_t                                               baseTriangle     = {};
+    uint32_t                                               usageCountsCount = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *         pUsageCounts     = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts    = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT                      micromap         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureTrianglesOpacityMicromapEXT>
-  {
-    using Type = AccelerationStructureTrianglesOpacityMicromapEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT>
   {
     using Type = AccelerationStructureTrianglesOpacityMicromapEXT;
   };
 
-  // wrapper struct for struct VkAccelerationStructureVersionInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureVersionInfoKHR.html
   struct AccelerationStructureVersionInfoKHR
   {
     using NativeType = VkAccelerationStructureVersionInfoKHR;
@@ -5090,10 +4145,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAccelerationStructureVersionInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR AccelerationStructureVersionInfoKHR( const uint8_t * pVersionData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pVersionData{ pVersionData_ }
+      : pNext( pNext_ )
+      , pVersionData( pVersionData_ )
     {
     }
 
@@ -5105,15 +4160,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AccelerationStructureVersionInfoKHR & operator=( AccelerationStructureVersionInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AccelerationStructureVersionInfoKHR & operator=( VkAccelerationStructureVersionInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AccelerationStructureVersionInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AccelerationStructureVersionInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AccelerationStructureVersionInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -5125,7 +4180,7 @@ namespace VULKAN_HPP_NAMESPACE
       pVersionData = pVersionData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAccelerationStructureVersionInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5137,18 +4192,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAccelerationStructureVersionInfoKHR *>( this );
     }
 
-    operator VkAccelerationStructureVersionInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAccelerationStructureVersionInfoKHR *>( this );
-    }
-
-    operator VkAccelerationStructureVersionInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAccelerationStructureVersionInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const uint8_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const uint8_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pVersionData );
     }
@@ -5173,26 +4223,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType        = StructureType::eAccelerationStructureVersionInfoKHR;
-    const void *    pNext        = {};
-    const uint8_t * pVersionData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eAccelerationStructureVersionInfoKHR;
+    const void *                        pNext        = {};
+    const uint8_t *                     pVersionData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAccelerationStructureVersionInfoKHR>
-  {
-    using Type = AccelerationStructureVersionInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAccelerationStructureVersionInfoKHR>
   {
     using Type = AccelerationStructureVersionInfoKHR;
   };
 
-  // wrapper struct for struct VkAcquireNextImageInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAcquireNextImageInfoKHR.html
   struct AcquireNextImageInfoKHR
   {
     using NativeType = VkAcquireNextImageInfoKHR;
@@ -5200,19 +4241,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAcquireNextImageInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AcquireNextImageInfoKHR( SwapchainKHR swapchain_  = {},
-                                                  uint64_t     timeout_    = {},
-                                                  Semaphore    semaphore_  = {},
-                                                  Fence        fence_      = {},
-                                                  uint32_t     deviceMask_ = {},
-                                                  const void * pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchain{ swapchain_ }
-      , timeout{ timeout_ }
-      , semaphore{ semaphore_ }
-      , fence{ fence_ }
-      , deviceMask{ deviceMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AcquireNextImageInfoKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_  = {},
+                                                  uint64_t                           timeout_    = {},
+                                                  VULKAN_HPP_NAMESPACE::Semaphore    semaphore_  = {},
+                                                  VULKAN_HPP_NAMESPACE::Fence        fence_      = {},
+                                                  uint32_t                           deviceMask_ = {},
+                                                  const void *                       pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchain( swapchain_ )
+      , timeout( timeout_ )
+      , semaphore( semaphore_ )
+      , fence( fence_ )
+      , deviceMask( deviceMask_ )
     {
     }
 
@@ -5224,22 +4265,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AcquireNextImageInfoKHR & operator=( AcquireNextImageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AcquireNextImageInfoKHR & operator=( VkAcquireNextImageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AcquireNextImageInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AcquireNextImageInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setSwapchain( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
       return *this;
@@ -5251,13 +4292,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setFence( Fence fence_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AcquireNextImageInfoKHR & setFence( VULKAN_HPP_NAMESPACE::Fence fence_ ) VULKAN_HPP_NOEXCEPT
     {
       fence = fence_;
       return *this;
@@ -5268,7 +4309,7 @@ namespace VULKAN_HPP_NAMESPACE
       deviceMask = deviceMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAcquireNextImageInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5280,18 +4321,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAcquireNextImageInfoKHR *>( this );
     }
 
-    operator VkAcquireNextImageInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAcquireNextImageInfoKHR *>( this );
-    }
-
-    operator VkAcquireNextImageInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAcquireNextImageInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainKHR const &, uint64_t const &, Semaphore const &, Fence const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::SwapchainKHR const &,
+               uint64_t const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::Fence const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchain, timeout, semaphore, fence, deviceMask );
@@ -5318,30 +4359,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eAcquireNextImageInfoKHR;
-    const void *  pNext      = {};
-    SwapchainKHR  swapchain  = {};
-    uint64_t      timeout    = {};
-    Semaphore     semaphore  = {};
-    Fence         fence      = {};
-    uint32_t      deviceMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eAcquireNextImageInfoKHR;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::SwapchainKHR  swapchain  = {};
+    uint64_t                            timeout    = {};
+    VULKAN_HPP_NAMESPACE::Semaphore     semaphore  = {};
+    VULKAN_HPP_NAMESPACE::Fence         fence      = {};
+    uint32_t                            deviceMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAcquireNextImageInfoKHR>
-  {
-    using Type = AcquireNextImageInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAcquireNextImageInfoKHR>
   {
     using Type = AcquireNextImageInfoKHR;
   };
 
-  // wrapper struct for struct VkAcquireProfilingLockInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAcquireProfilingLockInfoKHR.html
   struct AcquireProfilingLockInfoKHR
   {
     using NativeType = VkAcquireProfilingLockInfoKHR;
@@ -5349,12 +4381,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAcquireProfilingLockInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      AcquireProfilingLockInfoKHR( AcquireProfilingLockFlagsKHR flags_ = {}, uint64_t timeout_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , timeout{ timeout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AcquireProfilingLockInfoKHR( VULKAN_HPP_NAMESPACE::AcquireProfilingLockFlagsKHR flags_   = {},
+                                                      uint64_t                                           timeout_ = {},
+                                                      const void *                                       pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , timeout( timeout_ )
     {
     }
 
@@ -5366,22 +4399,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AcquireProfilingLockInfoKHR & operator=( AcquireProfilingLockInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AcquireProfilingLockInfoKHR & operator=( VkAcquireProfilingLockInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AcquireProfilingLockInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AcquireProfilingLockInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AcquireProfilingLockInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AcquireProfilingLockInfoKHR & setFlags( AcquireProfilingLockFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AcquireProfilingLockInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::AcquireProfilingLockFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -5392,7 +4425,7 @@ namespace VULKAN_HPP_NAMESPACE
       timeout = timeout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAcquireProfilingLockInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5404,18 +4437,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAcquireProfilingLockInfoKHR *>( this );
     }
 
-    operator VkAcquireProfilingLockInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAcquireProfilingLockInfoKHR *>( this );
-    }
-
-    operator VkAcquireProfilingLockInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAcquireProfilingLockInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AcquireProfilingLockFlagsKHR const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::AcquireProfilingLockFlagsKHR const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, timeout );
     }
@@ -5440,61 +4468,35 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType   = StructureType::eAcquireProfilingLockInfoKHR;
-    const void *                 pNext   = {};
-    AcquireProfilingLockFlagsKHR flags   = {};
-    uint64_t                     timeout = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType   = StructureType::eAcquireProfilingLockInfoKHR;
+    const void *                                       pNext   = {};
+    VULKAN_HPP_NAMESPACE::AcquireProfilingLockFlagsKHR flags   = {};
+    uint64_t                                           timeout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAcquireProfilingLockInfoKHR>
-  {
-    using Type = AcquireProfilingLockInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAcquireProfilingLockInfoKHR>
   {
     using Type = AcquireProfilingLockInfoKHR;
   };
 
-  typedef void *( VKAPI_PTR * PFN_AllocationFunction )( void * pUserData, size_t size, size_t alignment, SystemAllocationScope allocationScope );
-
-  typedef void *( VKAPI_PTR * PFN_ReallocationFunction )(
-    void * pUserData, void * pOriginal, size_t size, size_t alignment, SystemAllocationScope allocationScope );
-
-  typedef void( VKAPI_PTR * PFN_FreeFunction )( void * pUserData, void * pMemory );
-
-  typedef void( VKAPI_PTR * PFN_InternalAllocationNotification )( void *                 pUserData,
-                                                                  size_t                 size,
-                                                                  InternalAllocationType allocationType,
-                                                                  SystemAllocationScope  allocationScope );
-
-  typedef void( VKAPI_PTR * PFN_InternalFreeNotification )( void *                 pUserData,
-                                                            size_t                 size,
-                                                            InternalAllocationType allocationType,
-                                                            SystemAllocationScope  allocationScope );
-
-  // wrapper struct for struct VkAllocationCallbacks, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAllocationCallbacks.html
   struct AllocationCallbacks
   {
     using NativeType = VkAllocationCallbacks;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AllocationCallbacks( void *                             pUserData_             = {},
-                                              PFN_AllocationFunction             pfnAllocation_         = {},
-                                              PFN_ReallocationFunction           pfnReallocation_       = {},
-                                              PFN_FreeFunction                   pfnFree_               = {},
-                                              PFN_InternalAllocationNotification pfnInternalAllocation_ = {},
-                                              PFN_InternalFreeNotification       pfnInternalFree_       = {} ) VULKAN_HPP_NOEXCEPT
-      : pUserData{ pUserData_ }
-      , pfnAllocation{ pfnAllocation_ }
-      , pfnReallocation{ pfnReallocation_ }
-      , pfnFree{ pfnFree_ }
-      , pfnInternalAllocation{ pfnInternalAllocation_ }
-      , pfnInternalFree{ pfnInternalFree_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AllocationCallbacks( void *                               pUserData_             = {},
+                                              PFN_vkAllocationFunction             pfnAllocation_         = {},
+                                              PFN_vkReallocationFunction           pfnReallocation_       = {},
+                                              PFN_vkFreeFunction                   pfnFree_               = {},
+                                              PFN_vkInternalAllocationNotification pfnInternalAllocation_ = {},
+                                              PFN_vkInternalFreeNotification       pfnInternalFree_       = {} ) VULKAN_HPP_NOEXCEPT
+      : pUserData( pUserData_ )
+      , pfnAllocation( pfnAllocation_ )
+      , pfnReallocation( pfnReallocation_ )
+      , pfnFree( pfnFree_ )
+      , pfnInternalAllocation( pfnInternalAllocation_ )
+      , pfnInternalFree( pfnInternalFree_ )
     {
     }
 
@@ -5504,117 +4506,52 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This constructor is deprecated. Use the one taking function pointer types from the vk-namespace instead." )
-
-    AllocationCallbacks( void *                               pUserData_,
-                         PFN_vkAllocationFunction             pfnAllocation_,
-                         PFN_vkReallocationFunction           pfnReallocation_       = {},
-                         PFN_vkFreeFunction                   pfnFree_               = {},
-                         PFN_vkInternalAllocationNotification pfnInternalAllocation_ = {},
-                         PFN_vkInternalFreeNotification       pfnInternalFree_       = {} ) VULKAN_HPP_NOEXCEPT
-      : AllocationCallbacks( pUserData_,
-                             reinterpret_cast<PFN_AllocationFunction>( pfnAllocation_ ),
-                             reinterpret_cast<PFN_ReallocationFunction>( pfnReallocation_ ),
-                             reinterpret_cast<PFN_FreeFunction>( pfnFree_ ),
-                             reinterpret_cast<PFN_InternalAllocationNotification>( pfnInternalAllocation_ ),
-                             reinterpret_cast<PFN_InternalFreeNotification>( pfnInternalFree_ ) )
-    {
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-
     AllocationCallbacks & operator=( AllocationCallbacks const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AllocationCallbacks & operator=( VkAllocationCallbacks const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AllocationCallbacks const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AllocationCallbacks const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPUserData( void * pUserData_ ) VULKAN_HPP_NOEXCEPT
     {
       pUserData = pUserData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnAllocation( PFN_AllocationFunction pfnAllocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnAllocation( PFN_vkAllocationFunction pfnAllocation_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnAllocation = pfnAllocation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnReallocation( PFN_ReallocationFunction pfnReallocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnReallocation( PFN_vkReallocationFunction pfnReallocation_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnReallocation = pfnReallocation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnFree( PFN_FreeFunction pfnFree_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnFree( PFN_vkFreeFunction pfnFree_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnFree = pfnFree_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnInternalAllocation( PFN_InternalAllocationNotification pfnInternalAllocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnInternalAllocation( PFN_vkInternalAllocationNotification pfnInternalAllocation_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnInternalAllocation = pfnInternalAllocation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnInternalFree( PFN_InternalFreeNotification pfnInternalFree_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AllocationCallbacks & setPfnInternalFree( PFN_vkInternalFreeNotification pfnInternalFree_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnInternalFree = pfnInternalFree_;
       return *this;
     }
-
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    AllocationCallbacks & setPfnAllocation( PFN_vkAllocationFunction pfnAllocation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnAllocation( reinterpret_cast<PFN_AllocationFunction>( pfnAllocation_ ) );
-    }
-
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    AllocationCallbacks & setPfnReallocation( PFN_vkReallocationFunction pfnReallocation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnReallocation( reinterpret_cast<PFN_ReallocationFunction>( pfnReallocation_ ) );
-    }
-
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    AllocationCallbacks & setPfnInternalAllocation( PFN_vkInternalAllocationNotification pfnInternalAllocation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnInternalAllocation( reinterpret_cast<PFN_InternalAllocationNotification>( pfnInternalAllocation_ ) );
-    }
-
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    AllocationCallbacks & setPfnInternalFree( PFN_vkInternalFreeNotification pfnInternalFree_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnInternalFree( reinterpret_cast<PFN_InternalFreeNotification>( pfnInternalFree_ ) );
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAllocationCallbacks const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5626,23 +4563,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAllocationCallbacks *>( this );
     }
 
-    operator VkAllocationCallbacks const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAllocationCallbacks *>( this );
-    }
-
-    operator VkAllocationCallbacks *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAllocationCallbacks *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<void * const &,
-               PFN_AllocationFunction const &,
-               PFN_ReallocationFunction const &,
-               PFN_FreeFunction const &,
-               PFN_InternalAllocationNotification const &,
-               PFN_InternalFreeNotification const &>
+               PFN_vkAllocationFunction const &,
+               PFN_vkReallocationFunction const &,
+               PFN_vkFreeFunction const &,
+               PFN_vkInternalAllocationNotification const &,
+               PFN_vkInternalFreeNotification const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( pUserData, pfnAllocation, pfnReallocation, pfnFree, pfnInternalAllocation, pfnInternalFree );
@@ -5665,23 +4596,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    void *                             pUserData             = {};
-    PFN_AllocationFunction             pfnAllocation         = {};
-    PFN_ReallocationFunction           pfnReallocation       = {};
-    PFN_FreeFunction                   pfnFree               = {};
-    PFN_InternalAllocationNotification pfnInternalAllocation = {};
-    PFN_InternalFreeNotification       pfnInternalFree       = {};
+    void *                               pUserData             = {};
+    PFN_vkAllocationFunction             pfnAllocation         = {};
+    PFN_vkReallocationFunction           pfnReallocation       = {};
+    PFN_vkFreeFunction                   pfnFree               = {};
+    PFN_vkInternalAllocationNotification pfnInternalAllocation = {};
+    PFN_vkInternalFreeNotification       pfnInternalFree       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAllocationCallbacks>
-  {
-    using Type = AllocationCallbacks;
-  };
-#endif
-
-  // wrapper struct for struct VkAmigoProfilingSubmitInfoSEC, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAmigoProfilingSubmitInfoSEC.html
   struct AmigoProfilingSubmitInfoSEC
   {
     using NativeType = VkAmigoProfilingSubmitInfoSEC;
@@ -5689,12 +4611,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAmigoProfilingSubmitInfoSEC;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       AmigoProfilingSubmitInfoSEC( uint64_t firstDrawTimestamp_ = {}, uint64_t swapBufferTimestamp_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , firstDrawTimestamp{ firstDrawTimestamp_ }
-      , swapBufferTimestamp{ swapBufferTimestamp_ }
+      : pNext( pNext_ )
+      , firstDrawTimestamp( firstDrawTimestamp_ )
+      , swapBufferTimestamp( swapBufferTimestamp_ )
     {
     }
 
@@ -5706,15 +4628,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AmigoProfilingSubmitInfoSEC & operator=( AmigoProfilingSubmitInfoSEC const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AmigoProfilingSubmitInfoSEC & operator=( VkAmigoProfilingSubmitInfoSEC const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AmigoProfilingSubmitInfoSEC const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AmigoProfilingSubmitInfoSEC const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AmigoProfilingSubmitInfoSEC & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -5732,7 +4654,7 @@ namespace VULKAN_HPP_NAMESPACE
       swapBufferTimestamp = swapBufferTimestamp_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAmigoProfilingSubmitInfoSEC const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5744,18 +4666,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAmigoProfilingSubmitInfoSEC *>( this );
     }
 
-    operator VkAmigoProfilingSubmitInfoSEC const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAmigoProfilingSubmitInfoSEC *>( this );
-    }
-
-    operator VkAmigoProfilingSubmitInfoSEC *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAmigoProfilingSubmitInfoSEC *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, firstDrawTimestamp, swapBufferTimestamp );
     }
@@ -5781,40 +4698,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eAmigoProfilingSubmitInfoSEC;
-    const void *  pNext               = {};
-    uint64_t      firstDrawTimestamp  = {};
-    uint64_t      swapBufferTimestamp = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eAmigoProfilingSubmitInfoSEC;
+    const void *                        pNext               = {};
+    uint64_t                            firstDrawTimestamp  = {};
+    uint64_t                            swapBufferTimestamp = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAmigoProfilingSubmitInfoSEC>
-  {
-    using Type = AmigoProfilingSubmitInfoSEC;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAmigoProfilingSubmitInfoSEC>
   {
     using Type = AmigoProfilingSubmitInfoSEC;
   };
 
-  // wrapper struct for struct VkComponentMapping, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkComponentMapping.html
   struct ComponentMapping
   {
     using NativeType = VkComponentMapping;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ComponentMapping( ComponentSwizzle r_ = ComponentSwizzle::eIdentity,
-                                           ComponentSwizzle g_ = ComponentSwizzle::eIdentity,
-                                           ComponentSwizzle b_ = ComponentSwizzle::eIdentity,
-                                           ComponentSwizzle a_ = ComponentSwizzle::eIdentity ) VULKAN_HPP_NOEXCEPT
-      : r{ r_ }
-      , g{ g_ }
-      , b{ b_ }
-      , a{ a_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ComponentMapping( VULKAN_HPP_NAMESPACE::ComponentSwizzle r_ = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity,
+                                           VULKAN_HPP_NAMESPACE::ComponentSwizzle g_ = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity,
+                                           VULKAN_HPP_NAMESPACE::ComponentSwizzle b_ = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity,
+                                           VULKAN_HPP_NAMESPACE::ComponentSwizzle a_ = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity ) VULKAN_HPP_NOEXCEPT
+      : r( r_ )
+      , g( g_ )
+      , b( b_ )
+      , a( a_ )
     {
     }
 
@@ -5823,39 +4731,39 @@ namespace VULKAN_HPP_NAMESPACE
     ComponentMapping( VkComponentMapping const & rhs ) VULKAN_HPP_NOEXCEPT : ComponentMapping( *reinterpret_cast<ComponentMapping const *>( &rhs ) ) {}
 
     ComponentMapping & operator=( ComponentMapping const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ComponentMapping & operator=( VkComponentMapping const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ComponentMapping const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ComponentMapping const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setR( ComponentSwizzle r_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setR( VULKAN_HPP_NAMESPACE::ComponentSwizzle r_ ) VULKAN_HPP_NOEXCEPT
     {
       r = r_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setG( ComponentSwizzle g_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setG( VULKAN_HPP_NAMESPACE::ComponentSwizzle g_ ) VULKAN_HPP_NOEXCEPT
     {
       g = g_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setB( ComponentSwizzle b_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setB( VULKAN_HPP_NAMESPACE::ComponentSwizzle b_ ) VULKAN_HPP_NOEXCEPT
     {
       b = b_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setA( ComponentSwizzle a_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComponentMapping & setA( VULKAN_HPP_NAMESPACE::ComponentSwizzle a_ ) VULKAN_HPP_NOEXCEPT
     {
       a = a_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkComponentMapping const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -5867,18 +4775,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkComponentMapping *>( this );
     }
 
-    operator VkComponentMapping const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkComponentMapping *>( this );
-    }
-
-    operator VkComponentMapping *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkComponentMapping *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ComponentSwizzle const &, ComponentSwizzle const &, ComponentSwizzle const &, ComponentSwizzle const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ComponentSwizzle const &,
+               VULKAN_HPP_NAMESPACE::ComponentSwizzle const &,
+               VULKAN_HPP_NAMESPACE::ComponentSwizzle const &,
+               VULKAN_HPP_NAMESPACE::ComponentSwizzle const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( r, g, b, a );
     }
@@ -5903,23 +4809,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ComponentSwizzle r = ComponentSwizzle::eIdentity;
-    ComponentSwizzle g = ComponentSwizzle::eIdentity;
-    ComponentSwizzle b = ComponentSwizzle::eIdentity;
-    ComponentSwizzle a = ComponentSwizzle::eIdentity;
+    VULKAN_HPP_NAMESPACE::ComponentSwizzle r = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity;
+    VULKAN_HPP_NAMESPACE::ComponentSwizzle g = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity;
+    VULKAN_HPP_NAMESPACE::ComponentSwizzle b = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity;
+    VULKAN_HPP_NAMESPACE::ComponentSwizzle a = VULKAN_HPP_NAMESPACE::ComponentSwizzle::eIdentity;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkComponentMapping>
-  {
-    using Type = ComponentMapping;
-  };
-#endif
-
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidHardwareBufferFormatProperties2ANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidHardwareBufferFormatProperties2ANDROID.html
   struct AndroidHardwareBufferFormatProperties2ANDROID
   {
     using NativeType = VkAndroidHardwareBufferFormatProperties2ANDROID;
@@ -5927,26 +4823,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidHardwareBufferFormatProperties2ANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      AndroidHardwareBufferFormatProperties2ANDROID( Format                      format_                           = Format::eUndefined,
-                                                     uint64_t                    externalFormat_                   = {},
-                                                     FormatFeatureFlags2         formatFeatures_                   = {},
-                                                     ComponentMapping            samplerYcbcrConversionComponents_ = {},
-                                                     SamplerYcbcrModelConversion suggestedYcbcrModel_              = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                     SamplerYcbcrRange           suggestedYcbcrRange_              = SamplerYcbcrRange::eItuFull,
-                                                     ChromaLocation              suggestedXChromaOffset_           = ChromaLocation::eCositedEven,
-                                                     ChromaLocation              suggestedYChromaOffset_           = ChromaLocation::eCositedEven,
-                                                     void *                      pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , externalFormat{ externalFormat_ }
-      , formatFeatures{ formatFeatures_ }
-      , samplerYcbcrConversionComponents{ samplerYcbcrConversionComponents_ }
-      , suggestedYcbcrModel{ suggestedYcbcrModel_ }
-      , suggestedYcbcrRange{ suggestedYcbcrRange_ }
-      , suggestedXChromaOffset{ suggestedXChromaOffset_ }
-      , suggestedYChromaOffset{ suggestedYChromaOffset_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AndroidHardwareBufferFormatProperties2ANDROID(
+      VULKAN_HPP_NAMESPACE::Format                      format_                           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      uint64_t                                          externalFormat_                   = {},
+      VULKAN_HPP_NAMESPACE::FormatFeatureFlags2         formatFeatures_                   = {},
+      VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents_ = {},
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      void *                                            pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , externalFormat( externalFormat_ )
+      , formatFeatures( formatFeatures_ )
+      , samplerYcbcrConversionComponents( samplerYcbcrConversionComponents_ )
+      , suggestedYcbcrModel( suggestedYcbcrModel_ )
+      , suggestedYcbcrRange( suggestedYcbcrRange_ )
+      , suggestedXChromaOffset( suggestedXChromaOffset_ )
+      , suggestedYChromaOffset( suggestedYChromaOffset_ )
     {
     }
 
@@ -5959,11 +4855,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AndroidHardwareBufferFormatProperties2ANDROID & operator=( AndroidHardwareBufferFormatProperties2ANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidHardwareBufferFormatProperties2ANDROID & operator=( VkAndroidHardwareBufferFormatProperties2ANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidHardwareBufferFormatProperties2ANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatProperties2ANDROID const *>( &rhs );
       return *this;
     }
 
@@ -5977,27 +4873,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidHardwareBufferFormatProperties2ANDROID *>( this );
     }
 
-    operator VkAndroidHardwareBufferFormatProperties2ANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidHardwareBufferFormatProperties2ANDROID *>( this );
-    }
-
-    operator VkAndroidHardwareBufferFormatProperties2ANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidHardwareBufferFormatProperties2ANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
                uint64_t const &,
-               FormatFeatureFlags2 const &,
-               ComponentMapping const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ChromaLocation const &,
-               ChromaLocation const &>
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrRange const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -6035,26 +4925,18 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType                            = StructureType::eAndroidHardwareBufferFormatProperties2ANDROID;
-    void *                      pNext                            = {};
-    Format                      format                           = Format::eUndefined;
-    uint64_t                    externalFormat                   = {};
-    FormatFeatureFlags2         formatFeatures                   = {};
-    ComponentMapping            samplerYcbcrConversionComponents = {};
-    SamplerYcbcrModelConversion suggestedYcbcrModel              = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           suggestedYcbcrRange              = SamplerYcbcrRange::eItuFull;
-    ChromaLocation              suggestedXChromaOffset           = ChromaLocation::eCositedEven;
-    ChromaLocation              suggestedYChromaOffset           = ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::StructureType               sType                            = StructureType::eAndroidHardwareBufferFormatProperties2ANDROID;
+    void *                                            pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Format                      format                           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint64_t                                          externalFormat                   = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags2         formatFeatures                   = {};
+    VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents = {};
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidHardwareBufferFormatProperties2ANDROID>
-  {
-    using Type = AndroidHardwareBufferFormatProperties2ANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidHardwareBufferFormatProperties2ANDROID>
   {
@@ -6063,8 +4945,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidHardwareBufferFormatPropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidHardwareBufferFormatPropertiesANDROID.html
   struct AndroidHardwareBufferFormatPropertiesANDROID
   {
     using NativeType = VkAndroidHardwareBufferFormatPropertiesANDROID;
@@ -6072,26 +4952,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidHardwareBufferFormatPropertiesANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      AndroidHardwareBufferFormatPropertiesANDROID( Format                      format_                           = Format::eUndefined,
-                                                    uint64_t                    externalFormat_                   = {},
-                                                    FormatFeatureFlags          formatFeatures_                   = {},
-                                                    ComponentMapping            samplerYcbcrConversionComponents_ = {},
-                                                    SamplerYcbcrModelConversion suggestedYcbcrModel_              = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                    SamplerYcbcrRange           suggestedYcbcrRange_              = SamplerYcbcrRange::eItuFull,
-                                                    ChromaLocation              suggestedXChromaOffset_           = ChromaLocation::eCositedEven,
-                                                    ChromaLocation              suggestedYChromaOffset_           = ChromaLocation::eCositedEven,
-                                                    void *                      pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , externalFormat{ externalFormat_ }
-      , formatFeatures{ formatFeatures_ }
-      , samplerYcbcrConversionComponents{ samplerYcbcrConversionComponents_ }
-      , suggestedYcbcrModel{ suggestedYcbcrModel_ }
-      , suggestedYcbcrRange{ suggestedYcbcrRange_ }
-      , suggestedXChromaOffset{ suggestedXChromaOffset_ }
-      , suggestedYChromaOffset{ suggestedYChromaOffset_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AndroidHardwareBufferFormatPropertiesANDROID(
+      VULKAN_HPP_NAMESPACE::Format                      format_                           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      uint64_t                                          externalFormat_                   = {},
+      VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures_                   = {},
+      VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents_ = {},
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      void *                                            pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , externalFormat( externalFormat_ )
+      , formatFeatures( formatFeatures_ )
+      , samplerYcbcrConversionComponents( samplerYcbcrConversionComponents_ )
+      , suggestedYcbcrModel( suggestedYcbcrModel_ )
+      , suggestedYcbcrRange( suggestedYcbcrRange_ )
+      , suggestedXChromaOffset( suggestedXChromaOffset_ )
+      , suggestedYChromaOffset( suggestedYChromaOffset_ )
     {
     }
 
@@ -6103,11 +4983,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AndroidHardwareBufferFormatPropertiesANDROID & operator=( AndroidHardwareBufferFormatPropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidHardwareBufferFormatPropertiesANDROID & operator=( VkAndroidHardwareBufferFormatPropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidHardwareBufferFormatPropertiesANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatPropertiesANDROID const *>( &rhs );
       return *this;
     }
 
@@ -6121,27 +5001,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidHardwareBufferFormatPropertiesANDROID *>( this );
     }
 
-    operator VkAndroidHardwareBufferFormatPropertiesANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidHardwareBufferFormatPropertiesANDROID *>( this );
-    }
-
-    operator VkAndroidHardwareBufferFormatPropertiesANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidHardwareBufferFormatPropertiesANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
                uint64_t const &,
-               FormatFeatureFlags const &,
-               ComponentMapping const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ChromaLocation const &,
-               ChromaLocation const &>
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrRange const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -6179,26 +5053,18 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType                            = StructureType::eAndroidHardwareBufferFormatPropertiesANDROID;
-    void *                      pNext                            = {};
-    Format                      format                           = Format::eUndefined;
-    uint64_t                    externalFormat                   = {};
-    FormatFeatureFlags          formatFeatures                   = {};
-    ComponentMapping            samplerYcbcrConversionComponents = {};
-    SamplerYcbcrModelConversion suggestedYcbcrModel              = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           suggestedYcbcrRange              = SamplerYcbcrRange::eItuFull;
-    ChromaLocation              suggestedXChromaOffset           = ChromaLocation::eCositedEven;
-    ChromaLocation              suggestedYChromaOffset           = ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::StructureType               sType                            = StructureType::eAndroidHardwareBufferFormatPropertiesANDROID;
+    void *                                            pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Format                      format                           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint64_t                                          externalFormat                   = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures                   = {};
+    VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents = {};
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidHardwareBufferFormatPropertiesANDROID>
-  {
-    using Type = AndroidHardwareBufferFormatPropertiesANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidHardwareBufferFormatPropertiesANDROID>
   {
@@ -6207,8 +5073,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidHardwareBufferFormatResolvePropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidHardwareBufferFormatResolvePropertiesANDROID.html
   struct AndroidHardwareBufferFormatResolvePropertiesANDROID
   {
     using NativeType = VkAndroidHardwareBufferFormatResolvePropertiesANDROID;
@@ -6216,11 +5080,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AndroidHardwareBufferFormatResolvePropertiesANDROID( Format colorAttachmentFormat_ = Format::eUndefined,
-                                                                              void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorAttachmentFormat{ colorAttachmentFormat_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      AndroidHardwareBufferFormatResolvePropertiesANDROID( VULKAN_HPP_NAMESPACE::Format colorAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                           void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , colorAttachmentFormat( colorAttachmentFormat_ )
     {
     }
 
@@ -6234,11 +5099,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     AndroidHardwareBufferFormatResolvePropertiesANDROID &
       operator=( AndroidHardwareBufferFormatResolvePropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidHardwareBufferFormatResolvePropertiesANDROID & operator=( VkAndroidHardwareBufferFormatResolvePropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidHardwareBufferFormatResolvePropertiesANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferFormatResolvePropertiesANDROID const *>( &rhs );
       return *this;
     }
 
@@ -6252,18 +5117,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidHardwareBufferFormatResolvePropertiesANDROID *>( this );
     }
 
-    operator VkAndroidHardwareBufferFormatResolvePropertiesANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidHardwareBufferFormatResolvePropertiesANDROID *>( this );
-    }
-
-    operator VkAndroidHardwareBufferFormatResolvePropertiesANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidHardwareBufferFormatResolvePropertiesANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Format const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Format const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorAttachmentFormat );
     }
@@ -6288,19 +5148,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                 = StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID;
-    void *        pNext                 = {};
-    Format        colorAttachmentFormat = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Format        colorAttachmentFormat = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidHardwareBufferFormatResolvePropertiesANDROID>
-  {
-    using Type = AndroidHardwareBufferFormatResolvePropertiesANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID>
   {
@@ -6309,8 +5161,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidHardwareBufferPropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidHardwareBufferPropertiesANDROID.html
   struct AndroidHardwareBufferPropertiesANDROID
   {
     using NativeType = VkAndroidHardwareBufferPropertiesANDROID;
@@ -6318,12 +5168,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidHardwareBufferPropertiesANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      AndroidHardwareBufferPropertiesANDROID( DeviceSize allocationSize_ = {}, uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allocationSize{ allocationSize_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AndroidHardwareBufferPropertiesANDROID( VULKAN_HPP_NAMESPACE::DeviceSize allocationSize_ = {},
+                                                                 uint32_t                         memoryTypeBits_ = {},
+                                                                 void *                           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , allocationSize( allocationSize_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -6335,11 +5186,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AndroidHardwareBufferPropertiesANDROID & operator=( AndroidHardwareBufferPropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidHardwareBufferPropertiesANDROID & operator=( VkAndroidHardwareBufferPropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidHardwareBufferPropertiesANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferPropertiesANDROID const *>( &rhs );
       return *this;
     }
 
@@ -6353,18 +5204,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( this );
     }
 
-    operator VkAndroidHardwareBufferPropertiesANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidHardwareBufferPropertiesANDROID *>( this );
-    }
-
-    operator VkAndroidHardwareBufferPropertiesANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidHardwareBufferPropertiesANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, allocationSize, memoryTypeBits );
     }
@@ -6389,20 +5235,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eAndroidHardwareBufferPropertiesANDROID;
-    void *        pNext          = {};
-    DeviceSize    allocationSize = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eAndroidHardwareBufferPropertiesANDROID;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    allocationSize = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidHardwareBufferPropertiesANDROID>
-  {
-    using Type = AndroidHardwareBufferPropertiesANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidHardwareBufferPropertiesANDROID>
   {
@@ -6411,8 +5249,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidHardwareBufferUsageANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidHardwareBufferUsageANDROID.html
   struct AndroidHardwareBufferUsageANDROID
   {
     using NativeType = VkAndroidHardwareBufferUsageANDROID;
@@ -6420,10 +5256,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidHardwareBufferUsageANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR AndroidHardwareBufferUsageANDROID( uint64_t androidHardwareBufferUsage_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , androidHardwareBufferUsage{ androidHardwareBufferUsage_ }
+      : pNext( pNext_ )
+      , androidHardwareBufferUsage( androidHardwareBufferUsage_ )
     {
     }
 
@@ -6435,11 +5271,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AndroidHardwareBufferUsageANDROID & operator=( AndroidHardwareBufferUsageANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidHardwareBufferUsageANDROID & operator=( VkAndroidHardwareBufferUsageANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidHardwareBufferUsageANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidHardwareBufferUsageANDROID const *>( &rhs );
       return *this;
     }
 
@@ -6453,18 +5289,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidHardwareBufferUsageANDROID *>( this );
     }
 
-    operator VkAndroidHardwareBufferUsageANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidHardwareBufferUsageANDROID *>( this );
-    }
-
-    operator VkAndroidHardwareBufferUsageANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidHardwareBufferUsageANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, androidHardwareBufferUsage );
     }
@@ -6489,19 +5320,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                      = StructureType::eAndroidHardwareBufferUsageANDROID;
-    void *        pNext                      = {};
-    uint64_t      androidHardwareBufferUsage = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::eAndroidHardwareBufferUsageANDROID;
+    void *                              pNext                      = {};
+    uint64_t                            androidHardwareBufferUsage = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidHardwareBufferUsageANDROID>
-  {
-    using Type = AndroidHardwareBufferUsageANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidHardwareBufferUsageANDROID>
   {
@@ -6510,7 +5333,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkAndroidSurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAndroidSurfaceCreateInfoKHR.html
   struct AndroidSurfaceCreateInfoKHR
   {
     using NativeType = VkAndroidSurfaceCreateInfoKHR;
@@ -6518,13 +5340,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAndroidSurfaceCreateInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AndroidSurfaceCreateInfoKHR( AndroidSurfaceCreateFlagsKHR flags_  = {},
-                                                      struct ANativeWindow *       window_ = {},
-                                                      const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , window{ window_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AndroidSurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateFlagsKHR flags_  = {},
+                                                      struct ANativeWindow *                             window_ = {},
+                                                      const void *                                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , window( window_ )
     {
     }
 
@@ -6536,22 +5358,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AndroidSurfaceCreateInfoKHR & operator=( AndroidSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AndroidSurfaceCreateInfoKHR & operator=( VkAndroidSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AndroidSurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AndroidSurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AndroidSurfaceCreateInfoKHR & setFlags( AndroidSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AndroidSurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -6562,7 +5384,7 @@ namespace VULKAN_HPP_NAMESPACE
       window = window_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAndroidSurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -6574,18 +5396,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAndroidSurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkAndroidSurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAndroidSurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkAndroidSurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAndroidSurfaceCreateInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AndroidSurfaceCreateFlagsKHR const &, struct ANativeWindow * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateFlagsKHR const &,
+               struct ANativeWindow * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, window );
@@ -6611,20 +5430,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                sType  = StructureType::eAndroidSurfaceCreateInfoKHR;
-    const void *                 pNext  = {};
-    AndroidSurfaceCreateFlagsKHR flags  = {};
-    struct ANativeWindow *       window = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType  = StructureType::eAndroidSurfaceCreateInfoKHR;
+    const void *                                       pNext  = {};
+    VULKAN_HPP_NAMESPACE::AndroidSurfaceCreateFlagsKHR flags  = {};
+    struct ANativeWindow *                             window = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAndroidSurfaceCreateInfoKHR>
-  {
-    using Type = AndroidSurfaceCreateInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eAndroidSurfaceCreateInfoKHR>
   {
@@ -6632,254 +5443,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  // wrapper struct for struct VkAntiLagPresentationInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAntiLagPresentationInfoAMD.html
-  struct AntiLagPresentationInfoAMD
-  {
-    using NativeType = VkAntiLagPresentationInfoAMD;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAntiLagPresentationInfoAMD;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      AntiLagPresentationInfoAMD( AntiLagStageAMD stage_ = AntiLagStageAMD::eInput, uint64_t frameIndex_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stage{ stage_ }
-      , frameIndex{ frameIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR AntiLagPresentationInfoAMD( AntiLagPresentationInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    AntiLagPresentationInfoAMD( VkAntiLagPresentationInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
-      : AntiLagPresentationInfoAMD( *reinterpret_cast<AntiLagPresentationInfoAMD const *>( &rhs ) )
-    {
-    }
-
-    AntiLagPresentationInfoAMD & operator=( AntiLagPresentationInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AntiLagPresentationInfoAMD & operator=( VkAntiLagPresentationInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AntiLagPresentationInfoAMD const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AntiLagPresentationInfoAMD & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AntiLagPresentationInfoAMD & setStage( AntiLagStageAMD stage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stage = stage_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AntiLagPresentationInfoAMD & setFrameIndex( uint64_t frameIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      frameIndex = frameIndex_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAntiLagPresentationInfoAMD const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAntiLagPresentationInfoAMD *>( this );
-    }
-
-    operator VkAntiLagPresentationInfoAMD &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAntiLagPresentationInfoAMD *>( this );
-    }
-
-    operator VkAntiLagPresentationInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAntiLagPresentationInfoAMD *>( this );
-    }
-
-    operator VkAntiLagPresentationInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAntiLagPresentationInfoAMD *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, AntiLagStageAMD const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, stage, frameIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( AntiLagPresentationInfoAMD const & ) const = default;
-#else
-    bool operator==( AntiLagPresentationInfoAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( stage == rhs.stage ) && ( frameIndex == rhs.frameIndex );
-#  endif
-    }
-
-    bool operator!=( AntiLagPresentationInfoAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType   sType      = StructureType::eAntiLagPresentationInfoAMD;
-    void *          pNext      = {};
-    AntiLagStageAMD stage      = AntiLagStageAMD::eInput;
-    uint64_t        frameIndex = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAntiLagPresentationInfoAMD>
-  {
-    using Type = AntiLagPresentationInfoAMD;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAntiLagPresentationInfoAMD>
-  {
-    using Type = AntiLagPresentationInfoAMD;
-  };
-
-  // wrapper struct for struct VkAntiLagDataAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAntiLagDataAMD.html
-  struct AntiLagDataAMD
-  {
-    using NativeType = VkAntiLagDataAMD;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAntiLagDataAMD;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AntiLagDataAMD( AntiLagModeAMD                     mode_              = AntiLagModeAMD::eDriverControl,
-                                         uint32_t                           maxFPS_            = {},
-                                         const AntiLagPresentationInfoAMD * pPresentationInfo_ = {},
-                                         const void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mode{ mode_ }
-      , maxFPS{ maxFPS_ }
-      , pPresentationInfo{ pPresentationInfo_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR AntiLagDataAMD( AntiLagDataAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    AntiLagDataAMD( VkAntiLagDataAMD const & rhs ) VULKAN_HPP_NOEXCEPT : AntiLagDataAMD( *reinterpret_cast<AntiLagDataAMD const *>( &rhs ) ) {}
-
-    AntiLagDataAMD & operator=( AntiLagDataAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AntiLagDataAMD & operator=( VkAntiLagDataAMD const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AntiLagDataAMD const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AntiLagDataAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AntiLagDataAMD & setMode( AntiLagModeAMD mode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      mode = mode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AntiLagDataAMD & setMaxFPS( uint32_t maxFPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxFPS = maxFPS_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AntiLagDataAMD & setPPresentationInfo( const AntiLagPresentationInfoAMD * pPresentationInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPresentationInfo = pPresentationInfo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAntiLagDataAMD const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAntiLagDataAMD *>( this );
-    }
-
-    operator VkAntiLagDataAMD &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAntiLagDataAMD *>( this );
-    }
-
-    operator VkAntiLagDataAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAntiLagDataAMD *>( this );
-    }
-
-    operator VkAntiLagDataAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAntiLagDataAMD *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AntiLagModeAMD const &, uint32_t const &, const AntiLagPresentationInfoAMD * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, mode, maxFPS, pPresentationInfo );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( AntiLagDataAMD const & ) const = default;
-#else
-    bool operator==( AntiLagDataAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( mode == rhs.mode ) && ( maxFPS == rhs.maxFPS ) &&
-             ( pPresentationInfo == rhs.pPresentationInfo );
-#  endif
-    }
-
-    bool operator!=( AntiLagDataAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                      sType             = StructureType::eAntiLagDataAMD;
-    const void *                       pNext             = {};
-    AntiLagModeAMD                     mode              = AntiLagModeAMD::eDriverControl;
-    uint32_t                           maxFPS            = {};
-    const AntiLagPresentationInfoAMD * pPresentationInfo = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAntiLagDataAMD>
-  {
-    using Type = AntiLagDataAMD;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAntiLagDataAMD>
-  {
-    using Type = AntiLagDataAMD;
-  };
-
-  // wrapper struct for struct VkApplicationInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkApplicationInfo.html
   struct ApplicationInfo
   {
     using NativeType = VkApplicationInfo;
@@ -6887,19 +5450,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eApplicationInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ApplicationInfo( const char * pApplicationName_   = {},
                                           uint32_t     applicationVersion_ = {},
                                           const char * pEngineName_        = {},
                                           uint32_t     engineVersion_      = {},
                                           uint32_t     apiVersion_         = {},
                                           const void * pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pApplicationName{ pApplicationName_ }
-      , applicationVersion{ applicationVersion_ }
-      , pEngineName{ pEngineName_ }
-      , engineVersion{ engineVersion_ }
-      , apiVersion{ apiVersion_ }
+      : pNext( pNext_ )
+      , pApplicationName( pApplicationName_ )
+      , applicationVersion( applicationVersion_ )
+      , pEngineName( pEngineName_ )
+      , engineVersion( engineVersion_ )
+      , apiVersion( apiVersion_ )
     {
     }
 
@@ -6908,15 +5471,15 @@ namespace VULKAN_HPP_NAMESPACE
     ApplicationInfo( VkApplicationInfo const & rhs ) VULKAN_HPP_NOEXCEPT : ApplicationInfo( *reinterpret_cast<ApplicationInfo const *>( &rhs ) ) {}
 
     ApplicationInfo & operator=( ApplicationInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ApplicationInfo & operator=( VkApplicationInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ApplicationInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ApplicationInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ApplicationInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -6952,7 +5515,7 @@ namespace VULKAN_HPP_NAMESPACE
       apiVersion = apiVersion_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkApplicationInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -6964,18 +5527,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkApplicationInfo *>( this );
     }
 
-    operator VkApplicationInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkApplicationInfo *>( this );
-    }
-
-    operator VkApplicationInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkApplicationInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const char * const &, uint32_t const &, const char * const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const char * const &,
+               uint32_t const &,
+               const char * const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pApplicationName, applicationVersion, pEngineName, engineVersion, apiVersion );
@@ -7020,53 +5583,45 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType              = StructureType::eApplicationInfo;
-    const void *  pNext              = {};
-    const char *  pApplicationName   = {};
-    uint32_t      applicationVersion = {};
-    const char *  pEngineName        = {};
-    uint32_t      engineVersion      = {};
-    uint32_t      apiVersion         = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eApplicationInfo;
+    const void *                        pNext              = {};
+    const char *                        pApplicationName   = {};
+    uint32_t                            applicationVersion = {};
+    const char *                        pEngineName        = {};
+    uint32_t                            engineVersion      = {};
+    uint32_t                            apiVersion         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkApplicationInfo>
-  {
-    using Type = ApplicationInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eApplicationInfo>
   {
     using Type = ApplicationInfo;
   };
 
-  // wrapper struct for struct VkAttachmentDescription, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentDescription.html
   struct AttachmentDescription
   {
     using NativeType = VkAttachmentDescription;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentDescription( AttachmentDescriptionFlags flags_          = {},
-                                                Format                     format_         = Format::eUndefined,
-                                                SampleCountFlagBits        samples_        = SampleCountFlagBits::e1,
-                                                AttachmentLoadOp           loadOp_         = AttachmentLoadOp::eLoad,
-                                                AttachmentStoreOp          storeOp_        = AttachmentStoreOp::eStore,
-                                                AttachmentLoadOp           stencilLoadOp_  = AttachmentLoadOp::eLoad,
-                                                AttachmentStoreOp          stencilStoreOp_ = AttachmentStoreOp::eStore,
-                                                ImageLayout                initialLayout_  = ImageLayout::eUndefined,
-                                                ImageLayout                finalLayout_    = ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
-      : flags{ flags_ }
-      , format{ format_ }
-      , samples{ samples_ }
-      , loadOp{ loadOp_ }
-      , storeOp{ storeOp_ }
-      , stencilLoadOp{ stencilLoadOp_ }
-      , stencilStoreOp{ stencilStoreOp_ }
-      , initialLayout{ initialLayout_ }
-      , finalLayout{ finalLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      AttachmentDescription( VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags_          = {},
+                             VULKAN_HPP_NAMESPACE::Format                     format_         = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                             VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples_        = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                             VULKAN_HPP_NAMESPACE::AttachmentLoadOp           loadOp_         = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad,
+                             VULKAN_HPP_NAMESPACE::AttachmentStoreOp          storeOp_        = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore,
+                             VULKAN_HPP_NAMESPACE::AttachmentLoadOp           stencilLoadOp_  = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad,
+                             VULKAN_HPP_NAMESPACE::AttachmentStoreOp          stencilStoreOp_ = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore,
+                             VULKAN_HPP_NAMESPACE::ImageLayout                initialLayout_  = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                             VULKAN_HPP_NAMESPACE::ImageLayout                finalLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
+      : flags( flags_ )
+      , format( format_ )
+      , samples( samples_ )
+      , loadOp( loadOp_ )
+      , storeOp( storeOp_ )
+      , stencilLoadOp( stencilLoadOp_ )
+      , stencilStoreOp( stencilStoreOp_ )
+      , initialLayout( initialLayout_ )
+      , finalLayout( finalLayout_ )
     {
     }
 
@@ -7078,69 +5633,69 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentDescription & operator=( AttachmentDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentDescription & operator=( VkAttachmentDescription const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentDescription const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentDescription const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFlags( AttachmentDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFlags( VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setSamples( SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
     {
       samples = samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setLoadOp( AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setLoadOp( VULKAN_HPP_NAMESPACE::AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
     {
       loadOp = loadOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStoreOp( AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStoreOp( VULKAN_HPP_NAMESPACE::AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
     {
       storeOp = storeOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStencilLoadOp( AttachmentLoadOp stencilLoadOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStencilLoadOp( VULKAN_HPP_NAMESPACE::AttachmentLoadOp stencilLoadOp_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilLoadOp = stencilLoadOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStencilStoreOp( AttachmentStoreOp stencilStoreOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setStencilStoreOp( VULKAN_HPP_NAMESPACE::AttachmentStoreOp stencilStoreOp_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilStoreOp = stencilStoreOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setInitialLayout( ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setInitialLayout( VULKAN_HPP_NAMESPACE::ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       initialLayout = initialLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFinalLayout( ImageLayout finalLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription & setFinalLayout( VULKAN_HPP_NAMESPACE::ImageLayout finalLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       finalLayout = finalLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentDescription const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7152,26 +5707,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentDescription *>( this );
     }
 
-    operator VkAttachmentDescription const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentDescription *>( this );
-    }
-
-    operator VkAttachmentDescription *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentDescription *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<AttachmentDescriptionFlags const &,
-               Format const &,
-               SampleCountFlagBits const &,
-               AttachmentLoadOp const &,
-               AttachmentStoreOp const &,
-               AttachmentLoadOp const &,
-               AttachmentStoreOp const &,
-               ImageLayout const &,
-               ImageLayout const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::AttachmentLoadOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentStoreOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentLoadOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentStoreOp const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( flags, format, samples, loadOp, storeOp, stencilLoadOp, stencilStoreOp, initialLayout, finalLayout );
@@ -7199,26 +5748,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    AttachmentDescriptionFlags flags          = {};
-    Format                     format         = Format::eUndefined;
-    SampleCountFlagBits        samples        = SampleCountFlagBits::e1;
-    AttachmentLoadOp           loadOp         = AttachmentLoadOp::eLoad;
-    AttachmentStoreOp          storeOp        = AttachmentStoreOp::eStore;
-    AttachmentLoadOp           stencilLoadOp  = AttachmentLoadOp::eLoad;
-    AttachmentStoreOp          stencilStoreOp = AttachmentStoreOp::eStore;
-    ImageLayout                initialLayout  = ImageLayout::eUndefined;
-    ImageLayout                finalLayout    = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags          = {};
+    VULKAN_HPP_NAMESPACE::Format                     format         = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples        = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::AttachmentLoadOp           loadOp         = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad;
+    VULKAN_HPP_NAMESPACE::AttachmentStoreOp          storeOp        = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore;
+    VULKAN_HPP_NAMESPACE::AttachmentLoadOp           stencilLoadOp  = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad;
+    VULKAN_HPP_NAMESPACE::AttachmentStoreOp          stencilStoreOp = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore;
+    VULKAN_HPP_NAMESPACE::ImageLayout                initialLayout  = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout                finalLayout    = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentDescription>
-  {
-    using Type = AttachmentDescription;
-  };
-#endif
-
-  // wrapper struct for struct VkAttachmentDescription2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentDescription2.html
   struct AttachmentDescription2
   {
     using NativeType = VkAttachmentDescription2;
@@ -7226,27 +5766,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentDescription2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentDescription2( AttachmentDescriptionFlags flags_          = {},
-                                                 Format                     format_         = Format::eUndefined,
-                                                 SampleCountFlagBits        samples_        = SampleCountFlagBits::e1,
-                                                 AttachmentLoadOp           loadOp_         = AttachmentLoadOp::eLoad,
-                                                 AttachmentStoreOp          storeOp_        = AttachmentStoreOp::eStore,
-                                                 AttachmentLoadOp           stencilLoadOp_  = AttachmentLoadOp::eLoad,
-                                                 AttachmentStoreOp          stencilStoreOp_ = AttachmentStoreOp::eStore,
-                                                 ImageLayout                initialLayout_  = ImageLayout::eUndefined,
-                                                 ImageLayout                finalLayout_    = ImageLayout::eUndefined,
-                                                 const void *               pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , format{ format_ }
-      , samples{ samples_ }
-      , loadOp{ loadOp_ }
-      , storeOp{ storeOp_ }
-      , stencilLoadOp{ stencilLoadOp_ }
-      , stencilStoreOp{ stencilStoreOp_ }
-      , initialLayout{ initialLayout_ }
-      , finalLayout{ finalLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AttachmentDescription2( VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags_   = {},
+                                                 VULKAN_HPP_NAMESPACE::Format                     format_  = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                 VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                                 VULKAN_HPP_NAMESPACE::AttachmentLoadOp           loadOp_  = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad,
+                                                 VULKAN_HPP_NAMESPACE::AttachmentStoreOp          storeOp_ = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore,
+                                                 VULKAN_HPP_NAMESPACE::AttachmentLoadOp  stencilLoadOp_    = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad,
+                                                 VULKAN_HPP_NAMESPACE::AttachmentStoreOp stencilStoreOp_   = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore,
+                                                 VULKAN_HPP_NAMESPACE::ImageLayout       initialLayout_    = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                 VULKAN_HPP_NAMESPACE::ImageLayout       finalLayout_      = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                 const void *                            pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , format( format_ )
+      , samples( samples_ )
+      , loadOp( loadOp_ )
+      , storeOp( storeOp_ )
+      , stencilLoadOp( stencilLoadOp_ )
+      , stencilStoreOp( stencilStoreOp_ )
+      , initialLayout( initialLayout_ )
+      , finalLayout( finalLayout_ )
     {
     }
 
@@ -7258,75 +5798,75 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentDescription2 & operator=( AttachmentDescription2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentDescription2 & operator=( VkAttachmentDescription2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentDescription2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentDescription2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFlags( AttachmentDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFlags( VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setSamples( SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
     {
       samples = samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setLoadOp( AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setLoadOp( VULKAN_HPP_NAMESPACE::AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
     {
       loadOp = loadOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStoreOp( AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStoreOp( VULKAN_HPP_NAMESPACE::AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
     {
       storeOp = storeOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStencilLoadOp( AttachmentLoadOp stencilLoadOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStencilLoadOp( VULKAN_HPP_NAMESPACE::AttachmentLoadOp stencilLoadOp_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilLoadOp = stencilLoadOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStencilStoreOp( AttachmentStoreOp stencilStoreOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setStencilStoreOp( VULKAN_HPP_NAMESPACE::AttachmentStoreOp stencilStoreOp_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilStoreOp = stencilStoreOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setInitialLayout( ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setInitialLayout( VULKAN_HPP_NAMESPACE::ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       initialLayout = initialLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFinalLayout( ImageLayout finalLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescription2 & setFinalLayout( VULKAN_HPP_NAMESPACE::ImageLayout finalLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       finalLayout = finalLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentDescription2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7338,28 +5878,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentDescription2 *>( this );
     }
 
-    operator VkAttachmentDescription2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentDescription2 *>( this );
-    }
-
-    operator VkAttachmentDescription2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentDescription2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AttachmentDescriptionFlags const &,
-               Format const &,
-               SampleCountFlagBits const &,
-               AttachmentLoadOp const &,
-               AttachmentStoreOp const &,
-               AttachmentLoadOp const &,
-               AttachmentStoreOp const &,
-               ImageLayout const &,
-               ImageLayout const &>
+               VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::AttachmentLoadOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentStoreOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentLoadOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentStoreOp const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, format, samples, loadOp, storeOp, stencilLoadOp, stencilStoreOp, initialLayout, finalLayout );
@@ -7387,27 +5921,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType          = StructureType::eAttachmentDescription2;
-    const void *               pNext          = {};
-    AttachmentDescriptionFlags flags          = {};
-    Format                     format         = Format::eUndefined;
-    SampleCountFlagBits        samples        = SampleCountFlagBits::e1;
-    AttachmentLoadOp           loadOp         = AttachmentLoadOp::eLoad;
-    AttachmentStoreOp          storeOp        = AttachmentStoreOp::eStore;
-    AttachmentLoadOp           stencilLoadOp  = AttachmentLoadOp::eLoad;
-    AttachmentStoreOp          stencilStoreOp = AttachmentStoreOp::eStore;
-    ImageLayout                initialLayout  = ImageLayout::eUndefined;
-    ImageLayout                finalLayout    = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType              sType          = StructureType::eAttachmentDescription2;
+    const void *                                     pNext          = {};
+    VULKAN_HPP_NAMESPACE::AttachmentDescriptionFlags flags          = {};
+    VULKAN_HPP_NAMESPACE::Format                     format         = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits        samples        = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::AttachmentLoadOp           loadOp         = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad;
+    VULKAN_HPP_NAMESPACE::AttachmentStoreOp          storeOp        = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore;
+    VULKAN_HPP_NAMESPACE::AttachmentLoadOp           stencilLoadOp  = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad;
+    VULKAN_HPP_NAMESPACE::AttachmentStoreOp          stencilStoreOp = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore;
+    VULKAN_HPP_NAMESPACE::ImageLayout                initialLayout  = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout                finalLayout    = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentDescription2>
-  {
-    using Type = AttachmentDescription2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAttachmentDescription2>
   {
@@ -7416,8 +5942,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using AttachmentDescription2KHR = AttachmentDescription2;
 
-  // wrapper struct for struct VkAttachmentDescriptionStencilLayout, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentDescriptionStencilLayout.html
   struct AttachmentDescriptionStencilLayout
   {
     using NativeType = VkAttachmentDescriptionStencilLayout;
@@ -7425,13 +5949,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentDescriptionStencilLayout;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentDescriptionStencilLayout( ImageLayout stencilInitialLayout_ = ImageLayout::eUndefined,
-                                                             ImageLayout stencilFinalLayout_   = ImageLayout::eUndefined,
-                                                             void *      pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stencilInitialLayout{ stencilInitialLayout_ }
-      , stencilFinalLayout{ stencilFinalLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      AttachmentDescriptionStencilLayout( VULKAN_HPP_NAMESPACE::ImageLayout stencilInitialLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                          VULKAN_HPP_NAMESPACE::ImageLayout stencilFinalLayout_   = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                          void *                            pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stencilInitialLayout( stencilInitialLayout_ )
+      , stencilFinalLayout( stencilFinalLayout_ )
     {
     }
 
@@ -7443,33 +5968,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentDescriptionStencilLayout & operator=( AttachmentDescriptionStencilLayout const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentDescriptionStencilLayout & operator=( VkAttachmentDescriptionStencilLayout const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentDescriptionStencilLayout const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentDescriptionStencilLayout const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentDescriptionStencilLayout & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescriptionStencilLayout & setStencilInitialLayout( ImageLayout stencilInitialLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescriptionStencilLayout &
+      setStencilInitialLayout( VULKAN_HPP_NAMESPACE::ImageLayout stencilInitialLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilInitialLayout = stencilInitialLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentDescriptionStencilLayout & setStencilFinalLayout( ImageLayout stencilFinalLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentDescriptionStencilLayout &
+      setStencilFinalLayout( VULKAN_HPP_NAMESPACE::ImageLayout stencilFinalLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilFinalLayout = stencilFinalLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentDescriptionStencilLayout const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7481,18 +6008,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentDescriptionStencilLayout *>( this );
     }
 
-    operator VkAttachmentDescriptionStencilLayout const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentDescriptionStencilLayout *>( this );
-    }
-
-    operator VkAttachmentDescriptionStencilLayout *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentDescriptionStencilLayout *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageLayout const &, ImageLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageLayout const &, VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stencilInitialLayout, stencilFinalLayout );
     }
@@ -7518,20 +6041,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::eAttachmentDescriptionStencilLayout;
-    void *        pNext                = {};
-    ImageLayout   stencilInitialLayout = ImageLayout::eUndefined;
-    ImageLayout   stencilFinalLayout   = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eAttachmentDescriptionStencilLayout;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout   stencilInitialLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout   stencilFinalLayout   = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentDescriptionStencilLayout>
-  {
-    using Type = AttachmentDescriptionStencilLayout;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAttachmentDescriptionStencilLayout>
   {
@@ -7540,126 +6055,15 @@ namespace VULKAN_HPP_NAMESPACE
 
   using AttachmentDescriptionStencilLayoutKHR = AttachmentDescriptionStencilLayout;
 
-  // wrapper struct for struct VkAttachmentFeedbackLoopInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentFeedbackLoopInfoEXT.html
-  struct AttachmentFeedbackLoopInfoEXT
-  {
-    using NativeType = VkAttachmentFeedbackLoopInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentFeedbackLoopInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentFeedbackLoopInfoEXT( Bool32 feedbackLoopEnable_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , feedbackLoopEnable{ feedbackLoopEnable_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR AttachmentFeedbackLoopInfoEXT( AttachmentFeedbackLoopInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    AttachmentFeedbackLoopInfoEXT( VkAttachmentFeedbackLoopInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : AttachmentFeedbackLoopInfoEXT( *reinterpret_cast<AttachmentFeedbackLoopInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    AttachmentFeedbackLoopInfoEXT & operator=( AttachmentFeedbackLoopInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    AttachmentFeedbackLoopInfoEXT & operator=( VkAttachmentFeedbackLoopInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<AttachmentFeedbackLoopInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 AttachmentFeedbackLoopInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 AttachmentFeedbackLoopInfoEXT & setFeedbackLoopEnable( Bool32 feedbackLoopEnable_ ) VULKAN_HPP_NOEXCEPT
-    {
-      feedbackLoopEnable = feedbackLoopEnable_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkAttachmentFeedbackLoopInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkAttachmentFeedbackLoopInfoEXT *>( this );
-    }
-
-    operator VkAttachmentFeedbackLoopInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkAttachmentFeedbackLoopInfoEXT *>( this );
-    }
-
-    operator VkAttachmentFeedbackLoopInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentFeedbackLoopInfoEXT *>( this );
-    }
-
-    operator VkAttachmentFeedbackLoopInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentFeedbackLoopInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, feedbackLoopEnable );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( AttachmentFeedbackLoopInfoEXT const & ) const = default;
-#else
-    bool operator==( AttachmentFeedbackLoopInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( feedbackLoopEnable == rhs.feedbackLoopEnable );
-#  endif
-    }
-
-    bool operator!=( AttachmentFeedbackLoopInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType              = StructureType::eAttachmentFeedbackLoopInfoEXT;
-    const void *  pNext              = {};
-    Bool32        feedbackLoopEnable = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentFeedbackLoopInfoEXT>
-  {
-    using Type = AttachmentFeedbackLoopInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eAttachmentFeedbackLoopInfoEXT>
-  {
-    using Type = AttachmentFeedbackLoopInfoEXT;
-  };
-
-  // wrapper struct for struct VkAttachmentReference, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentReference.html
   struct AttachmentReference
   {
     using NativeType = VkAttachmentReference;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentReference( uint32_t attachment_ = {}, ImageLayout layout_ = ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
-      : attachment{ attachment_ }
-      , layout{ layout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AttachmentReference( uint32_t                          attachment_ = {},
+                                              VULKAN_HPP_NAMESPACE::ImageLayout layout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
+      : attachment( attachment_ )
+      , layout( layout_ )
     {
     }
 
@@ -7670,27 +6074,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentReference & operator=( AttachmentReference const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentReference & operator=( VkAttachmentReference const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentReference const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentReference const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentReference & setAttachment( uint32_t attachment_ ) VULKAN_HPP_NOEXCEPT
     {
       attachment = attachment_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentReference & setLayout( ImageLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentReference & setLayout( VULKAN_HPP_NAMESPACE::ImageLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentReference const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7702,18 +6106,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentReference *>( this );
     }
 
-    operator VkAttachmentReference const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentReference *>( this );
-    }
-
-    operator VkAttachmentReference *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentReference *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, ImageLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( attachment, layout );
     }
@@ -7738,19 +6137,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t    attachment = {};
-    ImageLayout layout     = ImageLayout::eUndefined;
+    uint32_t                          attachment = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout layout     = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentReference>
-  {
-    using Type = AttachmentReference;
-  };
-#endif
-
-  // wrapper struct for struct VkAttachmentReference2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentReference2.html
   struct AttachmentReference2
   {
     using NativeType = VkAttachmentReference2;
@@ -7758,15 +6148,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentReference2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentReference2( uint32_t         attachment_ = {},
-                                               ImageLayout      layout_     = ImageLayout::eUndefined,
-                                               ImageAspectFlags aspectMask_ = {},
-                                               const void *     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachment{ attachment_ }
-      , layout{ layout_ }
-      , aspectMask{ aspectMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AttachmentReference2( uint32_t                               attachment_ = {},
+                                               VULKAN_HPP_NAMESPACE::ImageLayout      layout_     = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                               VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ = {},
+                                               const void *                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachment( attachment_ )
+      , layout( layout_ )
+      , aspectMask( aspectMask_ )
     {
     }
 
@@ -7778,15 +6168,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentReference2 & operator=( AttachmentReference2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentReference2 & operator=( VkAttachmentReference2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentReference2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentReference2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentReference2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -7799,18 +6189,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentReference2 & setLayout( ImageLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentReference2 & setLayout( VULKAN_HPP_NAMESPACE::ImageLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentReference2 & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentReference2 & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentReference2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7822,18 +6212,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentReference2 *>( this );
     }
 
-    operator VkAttachmentReference2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentReference2 *>( this );
-    }
-
-    operator VkAttachmentReference2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentReference2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, ImageLayout const &, ImageAspectFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageAspectFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachment, layout, aspectMask );
     }
@@ -7859,21 +6248,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType      = StructureType::eAttachmentReference2;
-    const void *     pNext      = {};
-    uint32_t         attachment = {};
-    ImageLayout      layout     = ImageLayout::eUndefined;
-    ImageAspectFlags aspectMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType      = StructureType::eAttachmentReference2;
+    const void *                           pNext      = {};
+    uint32_t                               attachment = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout      layout     = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentReference2>
-  {
-    using Type = AttachmentReference2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAttachmentReference2>
   {
@@ -7882,8 +6263,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using AttachmentReference2KHR = AttachmentReference2;
 
-  // wrapper struct for struct VkAttachmentReferenceStencilLayout, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentReferenceStencilLayout.html
   struct AttachmentReferenceStencilLayout
   {
     using NativeType = VkAttachmentReferenceStencilLayout;
@@ -7891,10 +6270,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentReferenceStencilLayout;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentReferenceStencilLayout( ImageLayout stencilLayout_ = ImageLayout::eUndefined, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stencilLayout{ stencilLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AttachmentReferenceStencilLayout( VULKAN_HPP_NAMESPACE::ImageLayout stencilLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                           void *                            pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stencilLayout( stencilLayout_ )
     {
     }
 
@@ -7906,27 +6286,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentReferenceStencilLayout & operator=( AttachmentReferenceStencilLayout const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentReferenceStencilLayout & operator=( VkAttachmentReferenceStencilLayout const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentReferenceStencilLayout const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentReferenceStencilLayout const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentReferenceStencilLayout & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentReferenceStencilLayout & setStencilLayout( ImageLayout stencilLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentReferenceStencilLayout & setStencilLayout( VULKAN_HPP_NAMESPACE::ImageLayout stencilLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilLayout = stencilLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentReferenceStencilLayout const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -7938,18 +6318,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentReferenceStencilLayout *>( this );
     }
 
-    operator VkAttachmentReferenceStencilLayout const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentReferenceStencilLayout *>( this );
-    }
-
-    operator VkAttachmentReferenceStencilLayout *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentReferenceStencilLayout *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stencilLayout );
     }
@@ -7974,19 +6349,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eAttachmentReferenceStencilLayout;
-    void *        pNext         = {};
-    ImageLayout   stencilLayout = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eAttachmentReferenceStencilLayout;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout   stencilLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentReferenceStencilLayout>
-  {
-    using Type = AttachmentReferenceStencilLayout;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAttachmentReferenceStencilLayout>
   {
@@ -7995,7 +6362,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using AttachmentReferenceStencilLayoutKHR = AttachmentReferenceStencilLayout;
 
-  // wrapper struct for struct VkAttachmentSampleCountInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentSampleCountInfoAMD.html
   struct AttachmentSampleCountInfoAMD
   {
     using NativeType = VkAttachmentSampleCountInfoAMD;
@@ -8003,15 +6369,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eAttachmentSampleCountInfoAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentSampleCountInfoAMD( uint32_t                    colorAttachmentCount_          = {},
-                                                       const SampleCountFlagBits * pColorAttachmentSamples_       = {},
-                                                       SampleCountFlagBits         depthStencilAttachmentSamples_ = SampleCountFlagBits::e1,
-                                                       const void *                pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentSamples{ pColorAttachmentSamples_ }
-      , depthStencilAttachmentSamples{ depthStencilAttachmentSamples_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      AttachmentSampleCountInfoAMD( uint32_t                                          colorAttachmentCount_    = {},
+                                    const VULKAN_HPP_NAMESPACE::SampleCountFlagBits * pColorAttachmentSamples_ = {},
+                                    VULKAN_HPP_NAMESPACE::SampleCountFlagBits depthStencilAttachmentSamples_   = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                    const void *                              pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentSamples( pColorAttachmentSamples_ )
+      , depthStencilAttachmentSamples( depthStencilAttachmentSamples_ )
     {
     }
 
@@ -8023,9 +6390,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AttachmentSampleCountInfoAMD( ArrayProxyNoTemporaries<const SampleCountFlagBits> const & colorAttachmentSamples_,
-                                  SampleCountFlagBits                                        depthStencilAttachmentSamples_ = SampleCountFlagBits::e1,
-                                  const void *                                               pNext_                         = nullptr )
+    AttachmentSampleCountInfoAMD(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SampleCountFlagBits> const & colorAttachmentSamples_,
+      VULKAN_HPP_NAMESPACE::SampleCountFlagBits depthStencilAttachmentSamples_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+      const void *                              pNext_                         = nullptr )
       : pNext( pNext_ )
       , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentSamples_.size() ) )
       , pColorAttachmentSamples( colorAttachmentSamples_.data() )
@@ -8035,15 +6403,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     AttachmentSampleCountInfoAMD & operator=( AttachmentSampleCountInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentSampleCountInfoAMD & operator=( VkAttachmentSampleCountInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentSampleCountInfoAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentSampleCountInfoAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentSampleCountInfoAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -8057,15 +6425,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 AttachmentSampleCountInfoAMD &
-      setPColorAttachmentSamples( const SampleCountFlagBits * pColorAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
+      setPColorAttachmentSamples( const VULKAN_HPP_NAMESPACE::SampleCountFlagBits * pColorAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentSamples = pColorAttachmentSamples_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    AttachmentSampleCountInfoAMD &
-      setColorAttachmentSamples( ArrayProxyNoTemporaries<const SampleCountFlagBits> const & colorAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
+    AttachmentSampleCountInfoAMD & setColorAttachmentSamples(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SampleCountFlagBits> const & colorAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount    = static_cast<uint32_t>( colorAttachmentSamples_.size() );
       pColorAttachmentSamples = colorAttachmentSamples_.data();
@@ -8074,12 +6442,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 AttachmentSampleCountInfoAMD &
-      setDepthStencilAttachmentSamples( SampleCountFlagBits depthStencilAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
+      setDepthStencilAttachmentSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits depthStencilAttachmentSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       depthStencilAttachmentSamples = depthStencilAttachmentSamples_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentSampleCountInfoAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8091,18 +6459,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentSampleCountInfoAMD *>( this );
     }
 
-    operator VkAttachmentSampleCountInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentSampleCountInfoAMD *>( this );
-    }
-
-    operator VkAttachmentSampleCountInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentSampleCountInfoAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const SampleCountFlagBits * const &, SampleCountFlagBits const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::SampleCountFlagBits * const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorAttachmentCount, pColorAttachmentSamples, depthStencilAttachmentSamples );
@@ -8129,21 +6495,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                         = StructureType::eAttachmentSampleCountInfoAMD;
-    const void *                pNext                         = {};
-    uint32_t                    colorAttachmentCount          = {};
-    const SampleCountFlagBits * pColorAttachmentSamples       = {};
-    SampleCountFlagBits         depthStencilAttachmentSamples = SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::StructureType               sType                         = StructureType::eAttachmentSampleCountInfoAMD;
+    const void *                                      pNext                         = {};
+    uint32_t                                          colorAttachmentCount          = {};
+    const VULKAN_HPP_NAMESPACE::SampleCountFlagBits * pColorAttachmentSamples       = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits         depthStencilAttachmentSamples = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentSampleCountInfoAMD>
-  {
-    using Type = AttachmentSampleCountInfoAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eAttachmentSampleCountInfoAMD>
   {
@@ -8152,15 +6510,14 @@ namespace VULKAN_HPP_NAMESPACE
 
   using AttachmentSampleCountInfoNV = AttachmentSampleCountInfoAMD;
 
-  // wrapper struct for struct VkExtent2D, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExtent2D.html
   struct Extent2D
   {
     using NativeType = VkExtent2D;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR Extent2D( uint32_t width_ = {}, uint32_t height_ = {} ) VULKAN_HPP_NOEXCEPT
-      : width{ width_ }
-      , height{ height_ }
+      : width( width_ )
+      , height( height_ )
     {
     }
 
@@ -8169,15 +6526,15 @@ namespace VULKAN_HPP_NAMESPACE
     Extent2D( VkExtent2D const & rhs ) VULKAN_HPP_NOEXCEPT : Extent2D( *reinterpret_cast<Extent2D const *>( &rhs ) ) {}
 
     Extent2D & operator=( Extent2D const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Extent2D & operator=( VkExtent2D const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Extent2D const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Extent2D const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Extent2D & setWidth( uint32_t width_ ) VULKAN_HPP_NOEXCEPT
     {
       width = width_;
@@ -8189,7 +6546,7 @@ namespace VULKAN_HPP_NAMESPACE
       height = height_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExtent2D const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8201,18 +6558,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExtent2D *>( this );
     }
 
-    operator VkExtent2D const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExtent2D *>( this );
-    }
-
-    operator VkExtent2D *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExtent2D *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( width, height );
     }
@@ -8241,23 +6593,14 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t height = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExtent2D>
-  {
-    using Type = Extent2D;
-  };
-#endif
-
-  // wrapper struct for struct VkSampleLocationEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampleLocationEXT.html
   struct SampleLocationEXT
   {
     using NativeType = VkSampleLocationEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SampleLocationEXT( float x_ = {}, float y_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
+      : x( x_ )
+      , y( y_ )
     {
     }
 
@@ -8266,15 +6609,15 @@ namespace VULKAN_HPP_NAMESPACE
     SampleLocationEXT( VkSampleLocationEXT const & rhs ) VULKAN_HPP_NOEXCEPT : SampleLocationEXT( *reinterpret_cast<SampleLocationEXT const *>( &rhs ) ) {}
 
     SampleLocationEXT & operator=( SampleLocationEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SampleLocationEXT & operator=( VkSampleLocationEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SampleLocationEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SampleLocationEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SampleLocationEXT & setX( float x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -8286,7 +6629,7 @@ namespace VULKAN_HPP_NAMESPACE
       y = y_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSampleLocationEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8298,18 +6641,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSampleLocationEXT *>( this );
     }
 
-    operator VkSampleLocationEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSampleLocationEXT *>( this );
-    }
-
-    operator VkSampleLocationEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSampleLocationEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y );
     }
@@ -8338,15 +6676,6 @@ namespace VULKAN_HPP_NAMESPACE
     float y = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSampleLocationEXT>
-  {
-    using Type = SampleLocationEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkSampleLocationsInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSampleLocationsInfoEXT.html
   struct SampleLocationsInfoEXT
   {
     using NativeType = VkSampleLocationsInfoEXT;
@@ -8354,17 +6683,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSampleLocationsInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SampleLocationsInfoEXT( SampleCountFlagBits       sampleLocationsPerPixel_ = SampleCountFlagBits::e1,
-                                                 Extent2D                  sampleLocationGridSize_  = {},
-                                                 uint32_t                  sampleLocationsCount_    = {},
-                                                 const SampleLocationEXT * pSampleLocations_        = {},
-                                                 const void *              pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampleLocationsPerPixel{ sampleLocationsPerPixel_ }
-      , sampleLocationGridSize{ sampleLocationGridSize_ }
-      , sampleLocationsCount{ sampleLocationsCount_ }
-      , pSampleLocations{ pSampleLocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SampleLocationsInfoEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits       sampleLocationsPerPixel_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                              VULKAN_HPP_NAMESPACE::Extent2D                  sampleLocationGridSize_  = {},
+                              uint32_t                                        sampleLocationsCount_    = {},
+                              const VULKAN_HPP_NAMESPACE::SampleLocationEXT * pSampleLocations_        = {},
+                              const void *                                    pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampleLocationsPerPixel( sampleLocationsPerPixel_ )
+      , sampleLocationGridSize( sampleLocationGridSize_ )
+      , sampleLocationsCount( sampleLocationsCount_ )
+      , pSampleLocations( pSampleLocations_ )
     {
     }
 
@@ -8376,10 +6706,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SampleLocationsInfoEXT( SampleCountFlagBits                                      sampleLocationsPerPixel_,
-                            Extent2D                                                 sampleLocationGridSize_,
-                            ArrayProxyNoTemporaries<const SampleLocationEXT> const & sampleLocations_,
-                            const void *                                             pNext_ = nullptr )
+    SampleLocationsInfoEXT( VULKAN_HPP_NAMESPACE::SampleCountFlagBits                                                            sampleLocationsPerPixel_,
+                            VULKAN_HPP_NAMESPACE::Extent2D                                                                       sampleLocationGridSize_,
+                            VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SampleLocationEXT> const & sampleLocations_,
+                            const void *                                                                                         pNext_ = nullptr )
       : pNext( pNext_ )
       , sampleLocationsPerPixel( sampleLocationsPerPixel_ )
       , sampleLocationGridSize( sampleLocationGridSize_ )
@@ -8390,28 +6720,30 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SampleLocationsInfoEXT & operator=( SampleLocationsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SampleLocationsInfoEXT & operator=( VkSampleLocationsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SampleLocationsInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT & setSampleLocationsPerPixel( SampleCountFlagBits sampleLocationsPerPixel_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT &
+      setSampleLocationsPerPixel( VULKAN_HPP_NAMESPACE::SampleCountFlagBits sampleLocationsPerPixel_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsPerPixel = sampleLocationsPerPixel_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT & setSampleLocationGridSize( Extent2D const & sampleLocationGridSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT &
+      setSampleLocationGridSize( VULKAN_HPP_NAMESPACE::Extent2D const & sampleLocationGridSize_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationGridSize = sampleLocationGridSize_;
       return *this;
@@ -8423,21 +6755,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT & setPSampleLocations( const SampleLocationEXT * pSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SampleLocationsInfoEXT &
+      setPSampleLocations( const VULKAN_HPP_NAMESPACE::SampleLocationEXT * pSampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       pSampleLocations = pSampleLocations_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SampleLocationsInfoEXT & setSampleLocations( ArrayProxyNoTemporaries<const SampleLocationEXT> const & sampleLocations_ ) VULKAN_HPP_NOEXCEPT
+    SampleLocationsInfoEXT & setSampleLocations(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SampleLocationEXT> const & sampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsCount = static_cast<uint32_t>( sampleLocations_.size() );
       pSampleLocations     = sampleLocations_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSampleLocationsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8449,18 +6783,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSampleLocationsInfoEXT *>( this );
     }
 
-    operator VkSampleLocationsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSampleLocationsInfoEXT *>( this );
-    }
-
-    operator VkSampleLocationsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSampleLocationsInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SampleCountFlagBits const &, Extent2D const &, uint32_t const &, const SampleLocationEXT * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::SampleLocationEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sampleLocationsPerPixel, sampleLocationGridSize, sampleLocationsCount, pSampleLocations );
@@ -8488,37 +6821,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType                   = StructureType::eSampleLocationsInfoEXT;
-    const void *              pNext                   = {};
-    SampleCountFlagBits       sampleLocationsPerPixel = SampleCountFlagBits::e1;
-    Extent2D                  sampleLocationGridSize  = {};
-    uint32_t                  sampleLocationsCount    = {};
-    const SampleLocationEXT * pSampleLocations        = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType                   = StructureType::eSampleLocationsInfoEXT;
+    const void *                                    pNext                   = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits       sampleLocationsPerPixel = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::Extent2D                  sampleLocationGridSize  = {};
+    uint32_t                                        sampleLocationsCount    = {};
+    const VULKAN_HPP_NAMESPACE::SampleLocationEXT * pSampleLocations        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSampleLocationsInfoEXT>
-  {
-    using Type = SampleLocationsInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSampleLocationsInfoEXT>
   {
     using Type = SampleLocationsInfoEXT;
   };
 
-  // wrapper struct for struct VkAttachmentSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkAttachmentSampleLocationsEXT.html
   struct AttachmentSampleLocationsEXT
   {
     using NativeType = VkAttachmentSampleLocationsEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR AttachmentSampleLocationsEXT( uint32_t attachmentIndex_ = {}, SampleLocationsInfoEXT sampleLocationsInfo_ = {} ) VULKAN_HPP_NOEXCEPT
-      : attachmentIndex{ attachmentIndex_ }
-      , sampleLocationsInfo{ sampleLocationsInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR AttachmentSampleLocationsEXT( uint32_t                                     attachmentIndex_     = {},
+                                                       VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo_ = {} ) VULKAN_HPP_NOEXCEPT
+      : attachmentIndex( attachmentIndex_ )
+      , sampleLocationsInfo( sampleLocationsInfo_ )
     {
     }
 
@@ -8530,27 +6855,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     AttachmentSampleLocationsEXT & operator=( AttachmentSampleLocationsEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     AttachmentSampleLocationsEXT & operator=( VkAttachmentSampleLocationsEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<AttachmentSampleLocationsEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 AttachmentSampleLocationsEXT & setAttachmentIndex( uint32_t attachmentIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentIndex = attachmentIndex_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 AttachmentSampleLocationsEXT & setSampleLocationsInfo( SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 AttachmentSampleLocationsEXT &
+      setSampleLocationsInfo( VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsInfo = sampleLocationsInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkAttachmentSampleLocationsEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8562,18 +6888,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkAttachmentSampleLocationsEXT *>( this );
     }
 
-    operator VkAttachmentSampleLocationsEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkAttachmentSampleLocationsEXT *>( this );
-    }
-
-    operator VkAttachmentSampleLocationsEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkAttachmentSampleLocationsEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, SampleLocationsInfoEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( attachmentIndex, sampleLocationsInfo );
     }
@@ -8598,27 +6919,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t               attachmentIndex     = {};
-    SampleLocationsInfoEXT sampleLocationsInfo = {};
+    uint32_t                                     attachmentIndex     = {};
+    VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkAttachmentSampleLocationsEXT>
-  {
-    using Type = AttachmentSampleLocationsEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkBaseInStructure, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBaseInStructure.html
   struct BaseInStructure
   {
     using NativeType = VkBaseInStructure;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    BaseInStructure( StructureType sType_ = StructureType::eApplicationInfo, const struct BaseInStructure * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : sType{ sType_ }
-      , pNext{ pNext_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    BaseInStructure( VULKAN_HPP_NAMESPACE::StructureType                  sType_ = VULKAN_HPP_NAMESPACE::StructureType::eApplicationInfo,
+                     const struct VULKAN_HPP_NAMESPACE::BaseInStructure * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : sType( sType_ )
+      , pNext( pNext_ )
     {
     }
 
@@ -8627,21 +6940,21 @@ namespace VULKAN_HPP_NAMESPACE
     BaseInStructure( VkBaseInStructure const & rhs ) VULKAN_HPP_NOEXCEPT : BaseInStructure( *reinterpret_cast<BaseInStructure const *>( &rhs ) ) {}
 
     BaseInStructure & operator=( BaseInStructure const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BaseInStructure & operator=( VkBaseInStructure const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BaseInStructure const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BaseInStructure const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BaseInStructure & setPNext( const struct BaseInStructure * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BaseInStructure & setPNext( const struct VULKAN_HPP_NAMESPACE::BaseInStructure * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBaseInStructure const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8653,18 +6966,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBaseInStructure *>( this );
     }
 
-    operator VkBaseInStructure const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBaseInStructure *>( this );
-    }
-
-    operator VkBaseInStructure *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBaseInStructure *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const struct BaseInStructure * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const struct VULKAN_HPP_NAMESPACE::BaseInStructure * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext );
     }
@@ -8689,27 +6997,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType = StructureType::eApplicationInfo;
-    const struct BaseInStructure * pNext = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType = VULKAN_HPP_NAMESPACE::StructureType::eApplicationInfo;
+    const struct VULKAN_HPP_NAMESPACE::BaseInStructure * pNext = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBaseInStructure>
-  {
-    using Type = BaseInStructure;
-  };
-#endif
-
-  // wrapper struct for struct VkBaseOutStructure, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBaseOutStructure.html
   struct BaseOutStructure
   {
     using NativeType = VkBaseOutStructure;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    BaseOutStructure( StructureType sType_ = StructureType::eApplicationInfo, struct BaseOutStructure * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : sType{ sType_ }
-      , pNext{ pNext_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    BaseOutStructure( VULKAN_HPP_NAMESPACE::StructureType             sType_ = VULKAN_HPP_NAMESPACE::StructureType::eApplicationInfo,
+                      struct VULKAN_HPP_NAMESPACE::BaseOutStructure * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : sType( sType_ )
+      , pNext( pNext_ )
     {
     }
 
@@ -8718,21 +7018,21 @@ namespace VULKAN_HPP_NAMESPACE
     BaseOutStructure( VkBaseOutStructure const & rhs ) VULKAN_HPP_NOEXCEPT : BaseOutStructure( *reinterpret_cast<BaseOutStructure const *>( &rhs ) ) {}
 
     BaseOutStructure & operator=( BaseOutStructure const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BaseOutStructure & operator=( VkBaseOutStructure const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BaseOutStructure const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BaseOutStructure const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BaseOutStructure & setPNext( struct BaseOutStructure * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BaseOutStructure & setPNext( struct VULKAN_HPP_NAMESPACE::BaseOutStructure * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBaseOutStructure const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -8744,18 +7044,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBaseOutStructure *>( this );
     }
 
-    operator VkBaseOutStructure const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBaseOutStructure *>( this );
-    }
-
-    operator VkBaseOutStructure *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBaseOutStructure *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, struct BaseOutStructure * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, struct VULKAN_HPP_NAMESPACE::BaseOutStructure * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext );
     }
@@ -8780,119 +7075,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType = StructureType::eApplicationInfo;
-    struct BaseOutStructure * pNext = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType = VULKAN_HPP_NAMESPACE::StructureType::eApplicationInfo;
+    struct VULKAN_HPP_NAMESPACE::BaseOutStructure * pNext = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBaseOutStructure>
-  {
-    using Type = BaseOutStructure;
-  };
-#endif
-
-  // wrapper struct for struct VkBeginCustomResolveInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBeginCustomResolveInfoEXT.html
-  struct BeginCustomResolveInfoEXT
-  {
-    using NativeType = VkBeginCustomResolveInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBeginCustomResolveInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BeginCustomResolveInfoEXT( void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR BeginCustomResolveInfoEXT( BeginCustomResolveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BeginCustomResolveInfoEXT( VkBeginCustomResolveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BeginCustomResolveInfoEXT( *reinterpret_cast<BeginCustomResolveInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    BeginCustomResolveInfoEXT & operator=( BeginCustomResolveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BeginCustomResolveInfoEXT & operator=( VkBeginCustomResolveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BeginCustomResolveInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BeginCustomResolveInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBeginCustomResolveInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBeginCustomResolveInfoEXT *>( this );
-    }
-
-    operator VkBeginCustomResolveInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBeginCustomResolveInfoEXT *>( this );
-    }
-
-    operator VkBeginCustomResolveInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBeginCustomResolveInfoEXT *>( this );
-    }
-
-    operator VkBeginCustomResolveInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBeginCustomResolveInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BeginCustomResolveInfoEXT const & ) const = default;
-#else
-    bool operator==( BeginCustomResolveInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( BeginCustomResolveInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::eBeginCustomResolveInfoEXT;
-    void *        pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBeginCustomResolveInfoEXT>
-  {
-    using Type = BeginCustomResolveInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eBeginCustomResolveInfoEXT>
-  {
-    using Type = BeginCustomResolveInfoEXT;
-  };
-
-  // wrapper struct for struct VkBindAccelerationStructureMemoryInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindAccelerationStructureMemoryInfoNV.html
   struct BindAccelerationStructureMemoryInfoNV
   {
     using NativeType = VkBindAccelerationStructureMemoryInfoNV;
@@ -8900,19 +7086,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindAccelerationStructureMemoryInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindAccelerationStructureMemoryInfoNV( AccelerationStructureNV accelerationStructure_ = {},
-                                                                DeviceMemory            memory_                = {},
-                                                                DeviceSize              memoryOffset_          = {},
-                                                                uint32_t                deviceIndexCount_      = {},
-                                                                const uint32_t *        pDeviceIndices_        = {},
-                                                                const void *            pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructure{ accelerationStructure_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-      , deviceIndexCount{ deviceIndexCount_ }
-      , pDeviceIndices{ pDeviceIndices_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindAccelerationStructureMemoryInfoNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure_ = {},
+                                                                VULKAN_HPP_NAMESPACE::DeviceMemory            memory_                = {},
+                                                                VULKAN_HPP_NAMESPACE::DeviceSize              memoryOffset_          = {},
+                                                                uint32_t                                      deviceIndexCount_      = {},
+                                                                const uint32_t *                              pDeviceIndices_        = {},
+                                                                const void *                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructure( accelerationStructure_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
+      , deviceIndexCount( deviceIndexCount_ )
+      , pDeviceIndices( pDeviceIndices_ )
     {
     }
 
@@ -8924,11 +7110,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindAccelerationStructureMemoryInfoNV( AccelerationStructureNV                         accelerationStructure_,
-                                           DeviceMemory                                    memory_,
-                                           DeviceSize                                      memoryOffset_,
-                                           ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_,
-                                           const void *                                    pNext_ = nullptr )
+    BindAccelerationStructureMemoryInfoNV( VULKAN_HPP_NAMESPACE::AccelerationStructureNV                         accelerationStructure_,
+                                           VULKAN_HPP_NAMESPACE::DeviceMemory                                    memory_,
+                                           VULKAN_HPP_NAMESPACE::DeviceSize                                      memoryOffset_,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_,
+                                           const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , accelerationStructure( accelerationStructure_ )
       , memory( memory_ )
@@ -8940,15 +7126,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BindAccelerationStructureMemoryInfoNV & operator=( BindAccelerationStructureMemoryInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindAccelerationStructureMemoryInfoNV & operator=( VkBindAccelerationStructureMemoryInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindAccelerationStructureMemoryInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindAccelerationStructureMemoryInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -8956,19 +7142,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV &
-      setAccelerationStructure( AccelerationStructureNV accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructure( VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindAccelerationStructureMemoryInfoNV & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
@@ -8987,14 +7173,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindAccelerationStructureMemoryInfoNV & setDeviceIndices( ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
+    BindAccelerationStructureMemoryInfoNV &
+      setDeviceIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceIndexCount = static_cast<uint32_t>( deviceIndices_.size() );
       pDeviceIndices   = deviceIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindAccelerationStructureMemoryInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9006,24 +7193,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindAccelerationStructureMemoryInfoNV *>( this );
     }
 
-    operator VkBindAccelerationStructureMemoryInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindAccelerationStructureMemoryInfoNV *>( this );
-    }
-
-    operator VkBindAccelerationStructureMemoryInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindAccelerationStructureMemoryInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureNV const &,
-               DeviceMemory const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureNV const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructure, memory, memoryOffset, deviceIndexCount, pDeviceIndices );
@@ -9050,31 +7231,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType                 = StructureType::eBindAccelerationStructureMemoryInfoNV;
-    const void *            pNext                 = {};
-    AccelerationStructureNV accelerationStructure = {};
-    DeviceMemory            memory                = {};
-    DeviceSize              memoryOffset          = {};
-    uint32_t                deviceIndexCount      = {};
-    const uint32_t *        pDeviceIndices        = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType                 = StructureType::eBindAccelerationStructureMemoryInfoNV;
+    const void *                                  pNext                 = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureNV accelerationStructure = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory            memory                = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize              memoryOffset          = {};
+    uint32_t                                      deviceIndexCount      = {};
+    const uint32_t *                              pDeviceIndices        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindAccelerationStructureMemoryInfoNV>
-  {
-    using Type = BindAccelerationStructureMemoryInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindAccelerationStructureMemoryInfoNV>
   {
     using Type = BindAccelerationStructureMemoryInfoNV;
   };
 
-  // wrapper struct for struct VkBindBufferMemoryDeviceGroupInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindBufferMemoryDeviceGroupInfo.html
   struct BindBufferMemoryDeviceGroupInfo
   {
     using NativeType = VkBindBufferMemoryDeviceGroupInfo;
@@ -9082,13 +7253,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindBufferMemoryDeviceGroupInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR BindBufferMemoryDeviceGroupInfo( uint32_t         deviceIndexCount_ = {},
                                                           const uint32_t * pDeviceIndices_   = {},
                                                           const void *     pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceIndexCount{ deviceIndexCount_ }
-      , pDeviceIndices{ pDeviceIndices_ }
+      : pNext( pNext_ )
+      , deviceIndexCount( deviceIndexCount_ )
+      , pDeviceIndices( pDeviceIndices_ )
     {
     }
 
@@ -9100,22 +7271,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindBufferMemoryDeviceGroupInfo( ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_, const void * pNext_ = nullptr )
+    BindBufferMemoryDeviceGroupInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), deviceIndexCount( static_cast<uint32_t>( deviceIndices_.size() ) ), pDeviceIndices( deviceIndices_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BindBufferMemoryDeviceGroupInfo & operator=( BindBufferMemoryDeviceGroupInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindBufferMemoryDeviceGroupInfo & operator=( VkBindBufferMemoryDeviceGroupInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindBufferMemoryDeviceGroupInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindBufferMemoryDeviceGroupInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryDeviceGroupInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -9135,14 +7306,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindBufferMemoryDeviceGroupInfo & setDeviceIndices( ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
+    BindBufferMemoryDeviceGroupInfo &
+      setDeviceIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceIndexCount = static_cast<uint32_t>( deviceIndices_.size() );
       pDeviceIndices   = deviceIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindBufferMemoryDeviceGroupInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9154,18 +7326,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindBufferMemoryDeviceGroupInfo *>( this );
     }
 
-    operator VkBindBufferMemoryDeviceGroupInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindBufferMemoryDeviceGroupInfo *>( this );
-    }
-
-    operator VkBindBufferMemoryDeviceGroupInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindBufferMemoryDeviceGroupInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceIndexCount, pDeviceIndices );
     }
@@ -9190,20 +7357,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType            = StructureType::eBindBufferMemoryDeviceGroupInfo;
-    const void *     pNext            = {};
-    uint32_t         deviceIndexCount = {};
-    const uint32_t * pDeviceIndices   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eBindBufferMemoryDeviceGroupInfo;
+    const void *                        pNext            = {};
+    uint32_t                            deviceIndexCount = {};
+    const uint32_t *                    pDeviceIndices   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindBufferMemoryDeviceGroupInfo>
-  {
-    using Type = BindBufferMemoryDeviceGroupInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindBufferMemoryDeviceGroupInfo>
   {
@@ -9212,7 +7371,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BindBufferMemoryDeviceGroupInfoKHR = BindBufferMemoryDeviceGroupInfo;
 
-  // wrapper struct for struct VkBindBufferMemoryInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindBufferMemoryInfo.html
   struct BindBufferMemoryInfo
   {
     using NativeType = VkBindBufferMemoryInfo;
@@ -9220,13 +7378,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindBufferMemoryInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BindBufferMemoryInfo( Buffer buffer_ = {}, DeviceMemory memory_ = {}, DeviceSize memoryOffset_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindBufferMemoryInfo( VULKAN_HPP_NAMESPACE::Buffer       buffer_       = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceMemory memory_       = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset_ = {},
+                                               const void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
     {
     }
 
@@ -9238,39 +7398,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindBufferMemoryInfo & operator=( BindBufferMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindBufferMemoryInfo & operator=( VkBindBufferMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindBufferMemoryInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindBufferMemoryInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindBufferMemoryInfo & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindBufferMemoryInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9282,18 +7442,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindBufferMemoryInfo *>( this );
     }
 
-    operator VkBindBufferMemoryInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindBufferMemoryInfo *>( this );
-    }
-
-    operator VkBindBufferMemoryInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindBufferMemoryInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &, DeviceMemory const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer, memory, memoryOffset );
     }
@@ -9318,21 +7477,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eBindBufferMemoryInfo;
-    const void *  pNext        = {};
-    Buffer        buffer       = {};
-    DeviceMemory  memory       = {};
-    DeviceSize    memoryOffset = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eBindBufferMemoryInfo;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer       = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    memoryOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindBufferMemoryInfo>
-  {
-    using Type = BindBufferMemoryInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindBufferMemoryInfo>
   {
@@ -9341,165 +7492,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BindBufferMemoryInfoKHR = BindBufferMemoryInfo;
 
-  // wrapper struct for struct VkBindDataGraphPipelineSessionMemoryInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindDataGraphPipelineSessionMemoryInfoARM.html
-  struct BindDataGraphPipelineSessionMemoryInfoARM
-  {
-    using NativeType = VkBindDataGraphPipelineSessionMemoryInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindDataGraphPipelineSessionMemoryInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BindDataGraphPipelineSessionMemoryInfoARM( DataGraphPipelineSessionARM          session_      = {},
-                                                 DataGraphPipelineSessionBindPointARM bindPoint_    = DataGraphPipelineSessionBindPointARM::eTransient,
-                                                 uint32_t                             objectIndex_  = {},
-                                                 DeviceMemory                         memory_       = {},
-                                                 DeviceSize                           memoryOffset_ = {},
-                                                 const void *                         pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , session{ session_ }
-      , bindPoint{ bindPoint_ }
-      , objectIndex{ objectIndex_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BindDataGraphPipelineSessionMemoryInfoARM( BindDataGraphPipelineSessionMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BindDataGraphPipelineSessionMemoryInfoARM( VkBindDataGraphPipelineSessionMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BindDataGraphPipelineSessionMemoryInfoARM( *reinterpret_cast<BindDataGraphPipelineSessionMemoryInfoARM const *>( &rhs ) )
-    {
-    }
-
-    BindDataGraphPipelineSessionMemoryInfoARM & operator=( BindDataGraphPipelineSessionMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BindDataGraphPipelineSessionMemoryInfoARM & operator=( VkBindDataGraphPipelineSessionMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BindDataGraphPipelineSessionMemoryInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setSession( DataGraphPipelineSessionARM session_ ) VULKAN_HPP_NOEXCEPT
-    {
-      session = session_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setBindPoint( DataGraphPipelineSessionBindPointARM bindPoint_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bindPoint = bindPoint_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setObjectIndex( uint32_t objectIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      objectIndex = objectIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memory = memory_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindDataGraphPipelineSessionMemoryInfoARM & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memoryOffset = memoryOffset_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBindDataGraphPipelineSessionMemoryInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBindDataGraphPipelineSessionMemoryInfoARM *>( this );
-    }
-
-    operator VkBindDataGraphPipelineSessionMemoryInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBindDataGraphPipelineSessionMemoryInfoARM *>( this );
-    }
-
-    operator VkBindDataGraphPipelineSessionMemoryInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindDataGraphPipelineSessionMemoryInfoARM *>( this );
-    }
-
-    operator VkBindDataGraphPipelineSessionMemoryInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindDataGraphPipelineSessionMemoryInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               DataGraphPipelineSessionARM const &,
-               DataGraphPipelineSessionBindPointARM const &,
-               uint32_t const &,
-               DeviceMemory const &,
-               DeviceSize const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, session, bindPoint, objectIndex, memory, memoryOffset );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindDataGraphPipelineSessionMemoryInfoARM const & ) const = default;
-#else
-    bool operator==( BindDataGraphPipelineSessionMemoryInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( session == rhs.session ) && ( bindPoint == rhs.bindPoint ) &&
-             ( objectIndex == rhs.objectIndex ) && ( memory == rhs.memory ) && ( memoryOffset == rhs.memoryOffset );
-#  endif
-    }
-
-    bool operator!=( BindDataGraphPipelineSessionMemoryInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                        sType        = StructureType::eBindDataGraphPipelineSessionMemoryInfoARM;
-    const void *                         pNext        = {};
-    DataGraphPipelineSessionARM          session      = {};
-    DataGraphPipelineSessionBindPointARM bindPoint    = DataGraphPipelineSessionBindPointARM::eTransient;
-    uint32_t                             objectIndex  = {};
-    DeviceMemory                         memory       = {};
-    DeviceSize                           memoryOffset = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindDataGraphPipelineSessionMemoryInfoARM>
-  {
-    using Type = BindDataGraphPipelineSessionMemoryInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eBindDataGraphPipelineSessionMemoryInfoARM>
-  {
-    using Type = BindDataGraphPipelineSessionMemoryInfoARM;
-  };
-
-  // wrapper struct for struct VkBindDescriptorBufferEmbeddedSamplersInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindDescriptorBufferEmbeddedSamplersInfoEXT.html
   struct BindDescriptorBufferEmbeddedSamplersInfoEXT
   {
     using NativeType = VkBindDescriptorBufferEmbeddedSamplersInfoEXT;
@@ -9507,15 +7499,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindDescriptorBufferEmbeddedSamplersInfoEXT( ShaderStageFlags stageFlags_ = {},
-                                                                      PipelineLayout   layout_     = {},
-                                                                      uint32_t         set_        = {},
-                                                                      const void *     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stageFlags{ stageFlags_ }
-      , layout{ layout_ }
-      , set{ set_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindDescriptorBufferEmbeddedSamplersInfoEXT( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::PipelineLayout   layout_     = {},
+                                                                      uint32_t                               set_        = {},
+                                                                      const void *                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stageFlags( stageFlags_ )
+      , layout( layout_ )
+      , set( set_ )
     {
     }
 
@@ -9527,28 +7519,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindDescriptorBufferEmbeddedSamplersInfoEXT & operator=( BindDescriptorBufferEmbeddedSamplersInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindDescriptorBufferEmbeddedSamplersInfoEXT & operator=( VkBindDescriptorBufferEmbeddedSamplersInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindDescriptorBufferEmbeddedSamplersInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindDescriptorBufferEmbeddedSamplersInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindDescriptorBufferEmbeddedSamplersInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorBufferEmbeddedSamplersInfoEXT & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorBufferEmbeddedSamplersInfoEXT &
+      setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorBufferEmbeddedSamplersInfoEXT & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorBufferEmbeddedSamplersInfoEXT & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
@@ -9559,7 +7552,7 @@ namespace VULKAN_HPP_NAMESPACE
       set = set_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindDescriptorBufferEmbeddedSamplersInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9571,18 +7564,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( this );
     }
 
-    operator VkBindDescriptorBufferEmbeddedSamplersInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( this );
-    }
-
-    operator VkBindDescriptorBufferEmbeddedSamplersInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindDescriptorBufferEmbeddedSamplersInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ShaderStageFlags const &, PipelineLayout const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stageFlags, layout, set );
@@ -9608,69 +7599,60 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType      = StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT;
-    const void *     pNext      = {};
-    ShaderStageFlags stageFlags = {};
-    PipelineLayout   layout     = {};
-    uint32_t         set        = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType      = StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT;
+    const void *                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout   layout     = {};
+    uint32_t                               set        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindDescriptorBufferEmbeddedSamplersInfoEXT>
-  {
-    using Type = BindDescriptorBufferEmbeddedSamplersInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT>
   {
     using Type = BindDescriptorBufferEmbeddedSamplersInfoEXT;
   };
 
-  // wrapper struct for struct VkBindDescriptorSetsInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindDescriptorSetsInfo.html
-  struct BindDescriptorSetsInfo
+  struct BindDescriptorSetsInfoKHR
   {
-    using NativeType = VkBindDescriptorSetsInfo;
+    using NativeType = VkBindDescriptorSetsInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindDescriptorSetsInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindDescriptorSetsInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindDescriptorSetsInfo( ShaderStageFlags      stageFlags_         = {},
-                                                 PipelineLayout        layout_             = {},
-                                                 uint32_t              firstSet_           = {},
-                                                 uint32_t              descriptorSetCount_ = {},
-                                                 const DescriptorSet * pDescriptorSets_    = {},
-                                                 uint32_t              dynamicOffsetCount_ = {},
-                                                 const uint32_t *      pDynamicOffsets_    = {},
-                                                 const void *          pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stageFlags{ stageFlags_ }
-      , layout{ layout_ }
-      , firstSet{ firstSet_ }
-      , descriptorSetCount{ descriptorSetCount_ }
-      , pDescriptorSets{ pDescriptorSets_ }
-      , dynamicOffsetCount{ dynamicOffsetCount_ }
-      , pDynamicOffsets{ pDynamicOffsets_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindDescriptorSetsInfoKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags      stageFlags_         = {},
+                                                    VULKAN_HPP_NAMESPACE::PipelineLayout        layout_             = {},
+                                                    uint32_t                                    firstSet_           = {},
+                                                    uint32_t                                    descriptorSetCount_ = {},
+                                                    const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets_    = {},
+                                                    uint32_t                                    dynamicOffsetCount_ = {},
+                                                    const uint32_t *                            pDynamicOffsets_    = {},
+                                                    const void *                                pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stageFlags( stageFlags_ )
+      , layout( layout_ )
+      , firstSet( firstSet_ )
+      , descriptorSetCount( descriptorSetCount_ )
+      , pDescriptorSets( pDescriptorSets_ )
+      , dynamicOffsetCount( dynamicOffsetCount_ )
+      , pDynamicOffsets( pDynamicOffsets_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR BindDescriptorSetsInfo( BindDescriptorSetsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR BindDescriptorSetsInfoKHR( BindDescriptorSetsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    BindDescriptorSetsInfo( VkBindDescriptorSetsInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BindDescriptorSetsInfo( *reinterpret_cast<BindDescriptorSetsInfo const *>( &rhs ) )
+    BindDescriptorSetsInfoKHR( VkBindDescriptorSetsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : BindDescriptorSetsInfoKHR( *reinterpret_cast<BindDescriptorSetsInfoKHR const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindDescriptorSetsInfo( ShaderStageFlags                                     stageFlags_,
-                            PipelineLayout                                       layout_,
-                            uint32_t                                             firstSet_,
-                            ArrayProxyNoTemporaries<const DescriptorSet> const & descriptorSets_,
-                            ArrayProxyNoTemporaries<const uint32_t> const &      dynamicOffsets_ = {},
-                            const void *                                         pNext_          = nullptr )
+    BindDescriptorSetsInfoKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                           stageFlags_,
+                               VULKAN_HPP_NAMESPACE::PipelineLayout                                                             layout_,
+                               uint32_t                                                                                         firstSet_,
+                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets_,
+                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                            dynamicOffsets_ = {},
+                               const void *                                                                                     pNext_          = nullptr )
       : pNext( pNext_ )
       , stageFlags( stageFlags_ )
       , layout( layout_ )
@@ -9683,54 +7665,55 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    BindDescriptorSetsInfo & operator=( BindDescriptorSetsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    BindDescriptorSetsInfoKHR & operator=( BindDescriptorSetsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    BindDescriptorSetsInfo & operator=( VkBindDescriptorSetsInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    BindDescriptorSetsInfoKHR & operator=( VkBindDescriptorSetsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindDescriptorSetsInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindDescriptorSetsInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setFirstSet( uint32_t firstSet_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setFirstSet( uint32_t firstSet_ ) VULKAN_HPP_NOEXCEPT
     {
       firstSet = firstSet_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setDescriptorSetCount( uint32_t descriptorSetCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setDescriptorSetCount( uint32_t descriptorSetCount_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetCount = descriptorSetCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setPDescriptorSets( const DescriptorSet * pDescriptorSets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setPDescriptorSets( const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets_ ) VULKAN_HPP_NOEXCEPT
     {
       pDescriptorSets = pDescriptorSets_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindDescriptorSetsInfo & setDescriptorSets( ArrayProxyNoTemporaries<const DescriptorSet> const & descriptorSets_ ) VULKAN_HPP_NOEXCEPT
+    BindDescriptorSetsInfoKHR &
+      setDescriptorSets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSet> const & descriptorSets_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetCount = static_cast<uint32_t>( descriptorSets_.size() );
       pDescriptorSets    = descriptorSets_.data();
@@ -9738,58 +7721,52 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setDynamicOffsetCount( uint32_t dynamicOffsetCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setDynamicOffsetCount( uint32_t dynamicOffsetCount_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicOffsetCount = dynamicOffsetCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfo & setPDynamicOffsets( const uint32_t * pDynamicOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindDescriptorSetsInfoKHR & setPDynamicOffsets( const uint32_t * pDynamicOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       pDynamicOffsets = pDynamicOffsets_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindDescriptorSetsInfo & setDynamicOffsets( ArrayProxyNoTemporaries<const uint32_t> const & dynamicOffsets_ ) VULKAN_HPP_NOEXCEPT
+    BindDescriptorSetsInfoKHR & setDynamicOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & dynamicOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicOffsetCount = static_cast<uint32_t>( dynamicOffsets_.size() );
       pDynamicOffsets    = dynamicOffsets_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkBindDescriptorSetsInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkBindDescriptorSetsInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkBindDescriptorSetsInfo *>( this );
+      return *reinterpret_cast<const VkBindDescriptorSetsInfoKHR *>( this );
     }
 
-    operator VkBindDescriptorSetsInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkBindDescriptorSetsInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkBindDescriptorSetsInfo *>( this );
-    }
-
-    operator VkBindDescriptorSetsInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindDescriptorSetsInfo *>( this );
-    }
-
-    operator VkBindDescriptorSetsInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindDescriptorSetsInfo *>( this );
+      return *reinterpret_cast<VkBindDescriptorSetsInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ShaderStageFlags const &,
-               PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
                uint32_t const &,
                uint32_t const &,
-               const DescriptorSet * const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorSet * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stageFlags, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets );
@@ -9797,9 +7774,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindDescriptorSetsInfo const & ) const = default;
+    auto operator<=>( BindDescriptorSetsInfoKHR const & ) const = default;
 #else
-    bool operator==( BindDescriptorSetsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( BindDescriptorSetsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -9810,49 +7787,38 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( BindDescriptorSetsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( BindDescriptorSetsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType         sType              = StructureType::eBindDescriptorSetsInfo;
-    const void *          pNext              = {};
-    ShaderStageFlags      stageFlags         = {};
-    PipelineLayout        layout             = {};
-    uint32_t              firstSet           = {};
-    uint32_t              descriptorSetCount = {};
-    const DescriptorSet * pDescriptorSets    = {};
-    uint32_t              dynamicOffsetCount = {};
-    const uint32_t *      pDynamicOffsets    = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType              = StructureType::eBindDescriptorSetsInfoKHR;
+    const void *                                pNext              = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags      stageFlags         = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout        layout             = {};
+    uint32_t                                    firstSet           = {};
+    uint32_t                                    descriptorSetCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorSet * pDescriptorSets    = {};
+    uint32_t                                    dynamicOffsetCount = {};
+    const uint32_t *                            pDynamicOffsets    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindDescriptorSetsInfo>
-  {
-    using Type = BindDescriptorSetsInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eBindDescriptorSetsInfo>
+  struct CppType<StructureType, StructureType::eBindDescriptorSetsInfoKHR>
   {
-    using Type = BindDescriptorSetsInfo;
+    using Type = BindDescriptorSetsInfoKHR;
   };
 
-  using BindDescriptorSetsInfoKHR = BindDescriptorSetsInfo;
-
-  // wrapper struct for struct VkOffset2D, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOffset2D.html
   struct Offset2D
   {
     using NativeType = VkOffset2D;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR Offset2D( int32_t x_ = {}, int32_t y_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
+      : x( x_ )
+      , y( y_ )
     {
     }
 
@@ -9861,15 +7827,15 @@ namespace VULKAN_HPP_NAMESPACE
     Offset2D( VkOffset2D const & rhs ) VULKAN_HPP_NOEXCEPT : Offset2D( *reinterpret_cast<Offset2D const *>( &rhs ) ) {}
 
     Offset2D & operator=( Offset2D const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Offset2D & operator=( VkOffset2D const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Offset2D const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Offset2D const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Offset2D & setX( int32_t x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -9881,7 +7847,7 @@ namespace VULKAN_HPP_NAMESPACE
       y = y_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOffset2D const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9893,18 +7859,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOffset2D *>( this );
     }
 
-    operator VkOffset2D const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOffset2D *>( this );
-    }
-
-    operator VkOffset2D *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOffset2D *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<int32_t const &, int32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y );
     }
@@ -9933,23 +7894,14 @@ namespace VULKAN_HPP_NAMESPACE
     int32_t y = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOffset2D>
-  {
-    using Type = Offset2D;
-  };
-#endif
-
-  // wrapper struct for struct VkRect2D, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRect2D.html
   struct Rect2D
   {
     using NativeType = VkRect2D;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR Rect2D( Offset2D offset_ = {}, Extent2D extent_ = {} ) VULKAN_HPP_NOEXCEPT
-      : offset{ offset_ }
-      , extent{ extent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR Rect2D( VULKAN_HPP_NAMESPACE::Offset2D offset_ = {}, VULKAN_HPP_NAMESPACE::Extent2D extent_ = {} ) VULKAN_HPP_NOEXCEPT
+      : offset( offset_ )
+      , extent( extent_ )
     {
     }
 
@@ -9958,27 +7910,27 @@ namespace VULKAN_HPP_NAMESPACE
     Rect2D( VkRect2D const & rhs ) VULKAN_HPP_NOEXCEPT : Rect2D( *reinterpret_cast<Rect2D const *>( &rhs ) ) {}
 
     Rect2D & operator=( Rect2D const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Rect2D & operator=( VkRect2D const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Rect2D const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Rect2D const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 Rect2D & setOffset( Offset2D const & offset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 Rect2D & setOffset( VULKAN_HPP_NAMESPACE::Offset2D const & offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Rect2D & setExtent( Extent2D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Rect2D & setExtent( VULKAN_HPP_NAMESPACE::Extent2D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRect2D const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -9990,18 +7942,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRect2D *>( this );
     }
 
-    operator VkRect2D const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRect2D *>( this );
-    }
-
-    operator VkRect2D *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRect2D *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Offset2D const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Offset2D const &, VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( offset, extent );
     }
@@ -10026,20 +7973,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Offset2D offset = {};
-    Extent2D extent = {};
+    VULKAN_HPP_NAMESPACE::Offset2D offset = {};
+    VULKAN_HPP_NAMESPACE::Extent2D extent = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRect2D>
-  {
-    using Type = Rect2D;
-  };
-#endif
-
-  // wrapper struct for struct VkBindImageMemoryDeviceGroupInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindImageMemoryDeviceGroupInfo.html
   struct BindImageMemoryDeviceGroupInfo
   {
     using NativeType = VkBindImageMemoryDeviceGroupInfo;
@@ -10047,17 +7984,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindImageMemoryDeviceGroupInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindImageMemoryDeviceGroupInfo( uint32_t         deviceIndexCount_             = {},
-                                                         const uint32_t * pDeviceIndices_               = {},
-                                                         uint32_t         splitInstanceBindRegionCount_ = {},
-                                                         const Rect2D *   pSplitInstanceBindRegions_    = {},
-                                                         const void *     pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceIndexCount{ deviceIndexCount_ }
-      , pDeviceIndices{ pDeviceIndices_ }
-      , splitInstanceBindRegionCount{ splitInstanceBindRegionCount_ }
-      , pSplitInstanceBindRegions{ pSplitInstanceBindRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindImageMemoryDeviceGroupInfo( uint32_t                             deviceIndexCount_             = {},
+                                                         const uint32_t *                     pDeviceIndices_               = {},
+                                                         uint32_t                             splitInstanceBindRegionCount_ = {},
+                                                         const VULKAN_HPP_NAMESPACE::Rect2D * pSplitInstanceBindRegions_    = {},
+                                                         const void *                         pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceIndexCount( deviceIndexCount_ )
+      , pDeviceIndices( pDeviceIndices_ )
+      , splitInstanceBindRegionCount( splitInstanceBindRegionCount_ )
+      , pSplitInstanceBindRegions( pSplitInstanceBindRegions_ )
     {
     }
 
@@ -10069,9 +8006,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindImageMemoryDeviceGroupInfo( ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_,
-                                    ArrayProxyNoTemporaries<const Rect2D> const &   splitInstanceBindRegions_ = {},
-                                    const void *                                    pNext_                    = nullptr )
+    BindImageMemoryDeviceGroupInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                     deviceIndices_,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & splitInstanceBindRegions_ = {},
+                                    const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ )
       , deviceIndexCount( static_cast<uint32_t>( deviceIndices_.size() ) )
       , pDeviceIndices( deviceIndices_.data() )
@@ -10082,15 +8019,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BindImageMemoryDeviceGroupInfo & operator=( BindImageMemoryDeviceGroupInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindImageMemoryDeviceGroupInfo & operator=( VkBindImageMemoryDeviceGroupInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindImageMemoryDeviceGroupInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindImageMemoryDeviceGroupInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindImageMemoryDeviceGroupInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -10110,7 +8047,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindImageMemoryDeviceGroupInfo & setDeviceIndices( ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
+    BindImageMemoryDeviceGroupInfo &
+      setDeviceIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceIndexCount = static_cast<uint32_t>( deviceIndices_.size() );
       pDeviceIndices   = deviceIndices_.data();
@@ -10124,21 +8062,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryDeviceGroupInfo & setPSplitInstanceBindRegions( const Rect2D * pSplitInstanceBindRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryDeviceGroupInfo &
+      setPSplitInstanceBindRegions( const VULKAN_HPP_NAMESPACE::Rect2D * pSplitInstanceBindRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pSplitInstanceBindRegions = pSplitInstanceBindRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindImageMemoryDeviceGroupInfo & setSplitInstanceBindRegions( ArrayProxyNoTemporaries<const Rect2D> const & splitInstanceBindRegions_ ) VULKAN_HPP_NOEXCEPT
+    BindImageMemoryDeviceGroupInfo & setSplitInstanceBindRegions(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & splitInstanceBindRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       splitInstanceBindRegionCount = static_cast<uint32_t>( splitInstanceBindRegions_.size() );
       pSplitInstanceBindRegions    = splitInstanceBindRegions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindImageMemoryDeviceGroupInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10150,18 +8090,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindImageMemoryDeviceGroupInfo *>( this );
     }
 
-    operator VkBindImageMemoryDeviceGroupInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindImageMemoryDeviceGroupInfo *>( this );
-    }
-
-    operator VkBindImageMemoryDeviceGroupInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindImageMemoryDeviceGroupInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &, uint32_t const &, const Rect2D * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const uint32_t * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceIndexCount, pDeviceIndices, splitInstanceBindRegionCount, pSplitInstanceBindRegions );
@@ -10188,22 +8127,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                        = StructureType::eBindImageMemoryDeviceGroupInfo;
-    const void *     pNext                        = {};
-    uint32_t         deviceIndexCount             = {};
-    const uint32_t * pDeviceIndices               = {};
-    uint32_t         splitInstanceBindRegionCount = {};
-    const Rect2D *   pSplitInstanceBindRegions    = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType                        = StructureType::eBindImageMemoryDeviceGroupInfo;
+    const void *                         pNext                        = {};
+    uint32_t                             deviceIndexCount             = {};
+    const uint32_t *                     pDeviceIndices               = {};
+    uint32_t                             splitInstanceBindRegionCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D * pSplitInstanceBindRegions    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindImageMemoryDeviceGroupInfo>
-  {
-    using Type = BindImageMemoryDeviceGroupInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindImageMemoryDeviceGroupInfo>
   {
@@ -10212,7 +8143,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BindImageMemoryDeviceGroupInfoKHR = BindImageMemoryDeviceGroupInfo;
 
-  // wrapper struct for struct VkBindImageMemoryInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindImageMemoryInfo.html
   struct BindImageMemoryInfo
   {
     using NativeType = VkBindImageMemoryInfo;
@@ -10220,13 +8150,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindImageMemoryInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BindImageMemoryInfo( Image image_ = {}, DeviceMemory memory_ = {}, DeviceSize memoryOffset_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindImageMemoryInfo( VULKAN_HPP_NAMESPACE::Image        image_        = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceMemory memory_       = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset_ = {},
+                                              const void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
     {
     }
 
@@ -10237,39 +8169,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindImageMemoryInfo & operator=( BindImageMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindImageMemoryInfo & operator=( VkBindImageMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindImageMemoryInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindImageMemoryInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImageMemoryInfo & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindImageMemoryInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10281,18 +8213,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindImageMemoryInfo *>( this );
     }
 
-    operator VkBindImageMemoryInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindImageMemoryInfo *>( this );
-    }
-
-    operator VkBindImageMemoryInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindImageMemoryInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &, DeviceMemory const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, memory, memoryOffset );
     }
@@ -10317,21 +8248,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eBindImageMemoryInfo;
-    const void *  pNext        = {};
-    Image         image        = {};
-    DeviceMemory  memory       = {};
-    DeviceSize    memoryOffset = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eBindImageMemoryInfo;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::Image         image        = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    memoryOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindImageMemoryInfo>
-  {
-    using Type = BindImageMemoryInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindImageMemoryInfo>
   {
@@ -10340,8 +8263,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BindImageMemoryInfoKHR = BindImageMemoryInfo;
 
-  // wrapper struct for struct VkBindImageMemorySwapchainInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindImageMemorySwapchainInfoKHR.html
   struct BindImageMemorySwapchainInfoKHR
   {
     using NativeType = VkBindImageMemorySwapchainInfoKHR;
@@ -10349,12 +8270,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindImageMemorySwapchainInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BindImageMemorySwapchainInfoKHR( SwapchainKHR swapchain_ = {}, uint32_t imageIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchain{ swapchain_ }
-      , imageIndex{ imageIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindImageMemorySwapchainInfoKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_  = {},
+                                                          uint32_t                           imageIndex_ = {},
+                                                          const void *                       pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchain( swapchain_ )
+      , imageIndex( imageIndex_ )
     {
     }
 
@@ -10366,22 +8288,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindImageMemorySwapchainInfoKHR & operator=( BindImageMemorySwapchainInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindImageMemorySwapchainInfoKHR & operator=( VkBindImageMemorySwapchainInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindImageMemorySwapchainInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindImageMemorySwapchainInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindImageMemorySwapchainInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImageMemorySwapchainInfoKHR & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImageMemorySwapchainInfoKHR & setSwapchain( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
       return *this;
@@ -10392,7 +8314,7 @@ namespace VULKAN_HPP_NAMESPACE
       imageIndex = imageIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindImageMemorySwapchainInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10404,18 +8326,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindImageMemorySwapchainInfoKHR *>( this );
     }
 
-    operator VkBindImageMemorySwapchainInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindImageMemorySwapchainInfoKHR *>( this );
-    }
-
-    operator VkBindImageMemorySwapchainInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindImageMemorySwapchainInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainKHR const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SwapchainKHR const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchain, imageIndex );
     }
@@ -10440,27 +8357,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eBindImageMemorySwapchainInfoKHR;
-    const void *  pNext      = {};
-    SwapchainKHR  swapchain  = {};
-    uint32_t      imageIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eBindImageMemorySwapchainInfoKHR;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::SwapchainKHR  swapchain  = {};
+    uint32_t                            imageIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindImageMemorySwapchainInfoKHR>
-  {
-    using Type = BindImageMemorySwapchainInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindImageMemorySwapchainInfoKHR>
   {
     using Type = BindImageMemorySwapchainInfoKHR;
   };
 
-  // wrapper struct for struct VkBindImagePlaneMemoryInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindImagePlaneMemoryInfo.html
   struct BindImagePlaneMemoryInfo
   {
     using NativeType = VkBindImagePlaneMemoryInfo;
@@ -10468,11 +8376,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindImagePlaneMemoryInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindImagePlaneMemoryInfo( ImageAspectFlagBits planeAspect_ = ImageAspectFlagBits::eColor,
-                                                   const void *        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , planeAspect{ planeAspect_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindImagePlaneMemoryInfo( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect_ = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor,
+                                                   const void *                              pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , planeAspect( planeAspect_ )
     {
     }
 
@@ -10484,27 +8392,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindImagePlaneMemoryInfo & operator=( BindImagePlaneMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindImagePlaneMemoryInfo & operator=( VkBindImagePlaneMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindImagePlaneMemoryInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindImagePlaneMemoryInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindImagePlaneMemoryInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindImagePlaneMemoryInfo & setPlaneAspect( ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindImagePlaneMemoryInfo & setPlaneAspect( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
     {
       planeAspect = planeAspect_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindImagePlaneMemoryInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10516,18 +8424,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindImagePlaneMemoryInfo *>( this );
     }
 
-    operator VkBindImagePlaneMemoryInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindImagePlaneMemoryInfo *>( this );
-    }
-
-    operator VkBindImagePlaneMemoryInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindImagePlaneMemoryInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageAspectFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageAspectFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, planeAspect );
     }
@@ -10552,19 +8455,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType       = StructureType::eBindImagePlaneMemoryInfo;
-    const void *        pNext       = {};
-    ImageAspectFlagBits planeAspect = ImageAspectFlagBits::eColor;
+    VULKAN_HPP_NAMESPACE::StructureType       sType       = StructureType::eBindImagePlaneMemoryInfo;
+    const void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindImagePlaneMemoryInfo>
-  {
-    using Type = BindImagePlaneMemoryInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindImagePlaneMemoryInfo>
   {
@@ -10573,128 +8468,18 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BindImagePlaneMemoryInfoKHR = BindImagePlaneMemoryInfo;
 
-  // wrapper struct for struct VkBindIndexBufferIndirectCommandEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindIndexBufferIndirectCommandEXT.html
-  struct BindIndexBufferIndirectCommandEXT
-  {
-    using NativeType = VkBindIndexBufferIndirectCommandEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BindIndexBufferIndirectCommandEXT( DeviceAddress bufferAddress_ = {}, uint32_t size_ = {}, IndexType indexType_ = IndexType::eUint16 ) VULKAN_HPP_NOEXCEPT
-      : bufferAddress{ bufferAddress_ }
-      , size{ size_ }
-      , indexType{ indexType_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BindIndexBufferIndirectCommandEXT( BindIndexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BindIndexBufferIndirectCommandEXT( VkBindIndexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BindIndexBufferIndirectCommandEXT( *reinterpret_cast<BindIndexBufferIndirectCommandEXT const *>( &rhs ) )
-    {
-    }
-
-    BindIndexBufferIndirectCommandEXT & operator=( BindIndexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BindIndexBufferIndirectCommandEXT & operator=( VkBindIndexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BindIndexBufferIndirectCommandEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandEXT & setBufferAddress( DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bufferAddress = bufferAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandEXT & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandEXT & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexType = indexType_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBindIndexBufferIndirectCommandEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBindIndexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindIndexBufferIndirectCommandEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBindIndexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindIndexBufferIndirectCommandEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindIndexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindIndexBufferIndirectCommandEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindIndexBufferIndirectCommandEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, IndexType const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( bufferAddress, size, indexType );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindIndexBufferIndirectCommandEXT const & ) const = default;
-#else
-    bool operator==( BindIndexBufferIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( bufferAddress == rhs.bufferAddress ) && ( size == rhs.size ) && ( indexType == rhs.indexType );
-#  endif
-    }
-
-    bool operator!=( BindIndexBufferIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress bufferAddress = {};
-    uint32_t      size          = {};
-    IndexType     indexType     = IndexType::eUint16;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindIndexBufferIndirectCommandEXT>
-  {
-    using Type = BindIndexBufferIndirectCommandEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkBindIndexBufferIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindIndexBufferIndirectCommandNV.html
   struct BindIndexBufferIndirectCommandNV
   {
     using NativeType = VkBindIndexBufferIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
-      BindIndexBufferIndirectCommandNV( DeviceAddress bufferAddress_ = {}, uint32_t size_ = {}, IndexType indexType_ = IndexType::eUint16 ) VULKAN_HPP_NOEXCEPT
-      : bufferAddress{ bufferAddress_ }
-      , size{ size_ }
-      , indexType{ indexType_ }
+      BindIndexBufferIndirectCommandNV( VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress_ = {},
+                                        uint32_t                            size_          = {},
+                                        VULKAN_HPP_NAMESPACE::IndexType     indexType_     = VULKAN_HPP_NAMESPACE::IndexType::eUint16 ) VULKAN_HPP_NOEXCEPT
+      : bufferAddress( bufferAddress_ )
+      , size( size_ )
+      , indexType( indexType_ )
     {
     }
 
@@ -10706,16 +8491,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindIndexBufferIndirectCommandNV & operator=( BindIndexBufferIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindIndexBufferIndirectCommandNV & operator=( VkBindIndexBufferIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindIndexBufferIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindIndexBufferIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandNV & setBufferAddress( DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandNV & setBufferAddress( VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferAddress = bufferAddress_;
       return *this;
@@ -10727,12 +8512,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandNV & setIndexType( IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindIndexBufferIndirectCommandNV & setIndexType( VULKAN_HPP_NAMESPACE::IndexType indexType_ ) VULKAN_HPP_NOEXCEPT
     {
       indexType = indexType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindIndexBufferIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10744,18 +8529,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindIndexBufferIndirectCommandNV *>( this );
     }
 
-    operator VkBindIndexBufferIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindIndexBufferIndirectCommandNV *>( this );
-    }
-
-    operator VkBindIndexBufferIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindIndexBufferIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, IndexType const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &, uint32_t const &, VULKAN_HPP_NAMESPACE::IndexType const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( bufferAddress, size, indexType );
     }
@@ -10780,92 +8560,80 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceAddress bufferAddress = {};
-    uint32_t      size          = {};
-    IndexType     indexType     = IndexType::eUint16;
+    VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress = {};
+    uint32_t                            size          = {};
+    VULKAN_HPP_NAMESPACE::IndexType     indexType     = VULKAN_HPP_NAMESPACE::IndexType::eUint16;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindIndexBufferIndirectCommandNV>
+  struct BindMemoryStatusKHR
   {
-    using Type = BindIndexBufferIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkBindMemoryStatus, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindMemoryStatus.html
-  struct BindMemoryStatus
-  {
-    using NativeType = VkBindMemoryStatus;
+    using NativeType = VkBindMemoryStatusKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindMemoryStatus;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindMemoryStatusKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindMemoryStatus( Result * pResult_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pResult{ pResult_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindMemoryStatusKHR( VULKAN_HPP_NAMESPACE::Result * pResult_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pResult( pResult_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR BindMemoryStatus( BindMemoryStatus const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR BindMemoryStatusKHR( BindMemoryStatusKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    BindMemoryStatus( VkBindMemoryStatus const & rhs ) VULKAN_HPP_NOEXCEPT : BindMemoryStatus( *reinterpret_cast<BindMemoryStatus const *>( &rhs ) ) {}
-
-    BindMemoryStatus & operator=( BindMemoryStatus const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BindMemoryStatus & operator=( VkBindMemoryStatus const & rhs ) VULKAN_HPP_NOEXCEPT
+    BindMemoryStatusKHR( VkBindMemoryStatusKHR const & rhs ) VULKAN_HPP_NOEXCEPT : BindMemoryStatusKHR( *reinterpret_cast<BindMemoryStatusKHR const *>( &rhs ) )
     {
-      *this = *reinterpret_cast<BindMemoryStatus const *>( &rhs );
+    }
+
+    BindMemoryStatusKHR & operator=( BindMemoryStatusKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    BindMemoryStatusKHR & operator=( VkBindMemoryStatusKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindMemoryStatusKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindMemoryStatus & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BindMemoryStatusKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindMemoryStatus & setPResult( Result * pResult_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindMemoryStatusKHR & setPResult( VULKAN_HPP_NAMESPACE::Result * pResult_ ) VULKAN_HPP_NOEXCEPT
     {
       pResult = pResult_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkBindMemoryStatus const &() const VULKAN_HPP_NOEXCEPT
+    operator VkBindMemoryStatusKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkBindMemoryStatus *>( this );
+      return *reinterpret_cast<const VkBindMemoryStatusKHR *>( this );
     }
 
-    operator VkBindMemoryStatus &() VULKAN_HPP_NOEXCEPT
+    operator VkBindMemoryStatusKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkBindMemoryStatus *>( this );
-    }
-
-    operator VkBindMemoryStatus const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindMemoryStatus *>( this );
-    }
-
-    operator VkBindMemoryStatus *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindMemoryStatus *>( this );
+      return *reinterpret_cast<VkBindMemoryStatusKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Result * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Result * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pResult );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindMemoryStatus const & ) const = default;
+    auto operator<=>( BindMemoryStatusKHR const & ) const = default;
 #else
-    bool operator==( BindMemoryStatus const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( BindMemoryStatusKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -10874,42 +8642,33 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( BindMemoryStatus const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( BindMemoryStatusKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType   = StructureType::eBindMemoryStatus;
-    const void *  pNext   = {};
-    Result *      pResult = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType   = StructureType::eBindMemoryStatusKHR;
+    const void *                        pNext   = {};
+    VULKAN_HPP_NAMESPACE::Result *      pResult = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindMemoryStatus>
-  {
-    using Type = BindMemoryStatus;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eBindMemoryStatus>
+  struct CppType<StructureType, StructureType::eBindMemoryStatusKHR>
   {
-    using Type = BindMemoryStatus;
+    using Type = BindMemoryStatusKHR;
   };
 
-  using BindMemoryStatusKHR = BindMemoryStatus;
-
-  // wrapper struct for struct VkBindPipelineIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindPipelineIndirectCommandNV.html
   struct BindPipelineIndirectCommandNV
   {
     using NativeType = VkBindPipelineIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindPipelineIndirectCommandNV( DeviceAddress pipelineAddress_ = {} ) VULKAN_HPP_NOEXCEPT : pipelineAddress{ pipelineAddress_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindPipelineIndirectCommandNV( VULKAN_HPP_NAMESPACE::DeviceAddress pipelineAddress_ = {} ) VULKAN_HPP_NOEXCEPT
+      : pipelineAddress( pipelineAddress_ )
+    {
+    }
 
     VULKAN_HPP_CONSTEXPR BindPipelineIndirectCommandNV( BindPipelineIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
@@ -10919,21 +8678,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindPipelineIndirectCommandNV & operator=( BindPipelineIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindPipelineIndirectCommandNV & operator=( VkBindPipelineIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindPipelineIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindPipelineIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindPipelineIndirectCommandNV & setPipelineAddress( DeviceAddress pipelineAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BindPipelineIndirectCommandNV & setPipelineAddress( VULKAN_HPP_NAMESPACE::DeviceAddress pipelineAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineAddress = pipelineAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindPipelineIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -10945,18 +8704,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindPipelineIndirectCommandNV *>( this );
     }
 
-    operator VkBindPipelineIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindPipelineIndirectCommandNV *>( this );
-    }
-
-    operator VkBindPipelineIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindPipelineIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( pipelineAddress );
     }
@@ -10981,25 +8735,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceAddress pipelineAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress pipelineAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindPipelineIndirectCommandNV>
-  {
-    using Type = BindPipelineIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkBindShaderGroupIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindShaderGroupIndirectCommandNV.html
   struct BindShaderGroupIndirectCommandNV
   {
     using NativeType = VkBindShaderGroupIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindShaderGroupIndirectCommandNV( uint32_t groupIndex_ = {} ) VULKAN_HPP_NOEXCEPT : groupIndex{ groupIndex_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindShaderGroupIndirectCommandNV( uint32_t groupIndex_ = {} ) VULKAN_HPP_NOEXCEPT : groupIndex( groupIndex_ ) {}
 
     VULKAN_HPP_CONSTEXPR BindShaderGroupIndirectCommandNV( BindShaderGroupIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
@@ -11009,21 +8753,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindShaderGroupIndirectCommandNV & operator=( BindShaderGroupIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindShaderGroupIndirectCommandNV & operator=( VkBindShaderGroupIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindShaderGroupIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindShaderGroupIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindShaderGroupIndirectCommandNV & setGroupIndex( uint32_t groupIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       groupIndex = groupIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindShaderGroupIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11035,18 +8779,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindShaderGroupIndirectCommandNV *>( this );
     }
 
-    operator VkBindShaderGroupIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindShaderGroupIndirectCommandNV *>( this );
-    }
-
-    operator VkBindShaderGroupIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindShaderGroupIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( groupIndex );
     }
@@ -11074,30 +8813,21 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t groupIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindShaderGroupIndirectCommandNV>
-  {
-    using Type = BindShaderGroupIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseMemoryBind, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseMemoryBind.html
   struct SparseMemoryBind
   {
     using NativeType = VkSparseMemoryBind;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseMemoryBind( DeviceSize            resourceOffset_ = {},
-                                           DeviceSize            size_           = {},
-                                           DeviceMemory          memory_         = {},
-                                           DeviceSize            memoryOffset_   = {},
-                                           SparseMemoryBindFlags flags_          = {} ) VULKAN_HPP_NOEXCEPT
-      : resourceOffset{ resourceOffset_ }
-      , size{ size_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseMemoryBind( VULKAN_HPP_NAMESPACE::DeviceSize            resourceOffset_ = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceSize            size_           = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceMemory          memory_         = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceSize            memoryOffset_   = {},
+                                           VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags_          = {} ) VULKAN_HPP_NOEXCEPT
+      : resourceOffset( resourceOffset_ )
+      , size( size_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
+      , flags( flags_ )
     {
     }
 
@@ -11106,45 +8836,45 @@ namespace VULKAN_HPP_NAMESPACE
     SparseMemoryBind( VkSparseMemoryBind const & rhs ) VULKAN_HPP_NOEXCEPT : SparseMemoryBind( *reinterpret_cast<SparseMemoryBind const *>( &rhs ) ) {}
 
     SparseMemoryBind & operator=( SparseMemoryBind const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseMemoryBind & operator=( VkSparseMemoryBind const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseMemoryBind const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseMemoryBind const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setResourceOffset( DeviceSize resourceOffset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setResourceOffset( VULKAN_HPP_NAMESPACE::DeviceSize resourceOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       resourceOffset = resourceOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setFlags( SparseMemoryBindFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseMemoryBind & setFlags( VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSparseMemoryBind const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11156,18 +8886,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseMemoryBind *>( this );
     }
 
-    operator VkSparseMemoryBind const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseMemoryBind *>( this );
-    }
-
-    operator VkSparseMemoryBind *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseMemoryBind *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, DeviceSize const &, DeviceMemory const &, DeviceSize const &, SparseMemoryBindFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( resourceOffset, size, memory, memoryOffset, flags );
@@ -11194,31 +8922,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize            resourceOffset = {};
-    DeviceSize            size           = {};
-    DeviceMemory          memory         = {};
-    DeviceSize            memoryOffset   = {};
-    SparseMemoryBindFlags flags          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize            resourceOffset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize            size           = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory          memory         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize            memoryOffset   = {};
+    VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseMemoryBind>
-  {
-    using Type = SparseMemoryBind;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseBufferMemoryBindInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseBufferMemoryBindInfo.html
   struct SparseBufferMemoryBindInfo
   {
     using NativeType = VkSparseBufferMemoryBindInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseBufferMemoryBindInfo( Buffer buffer_ = {}, uint32_t bindCount_ = {}, const SparseMemoryBind * pBinds_ = {} ) VULKAN_HPP_NOEXCEPT
-      : buffer{ buffer_ }
-      , bindCount{ bindCount_ }
-      , pBinds{ pBinds_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseBufferMemoryBindInfo( VULKAN_HPP_NAMESPACE::Buffer                   buffer_    = {},
+                                                     uint32_t                                       bindCount_ = {},
+                                                     const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds_    = {} ) VULKAN_HPP_NOEXCEPT
+      : buffer( buffer_ )
+      , bindCount( bindCount_ )
+      , pBinds( pBinds_ )
     {
     }
 
@@ -11230,23 +8951,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseBufferMemoryBindInfo( Buffer buffer_, ArrayProxyNoTemporaries<const SparseMemoryBind> const & binds_ )
+    SparseBufferMemoryBindInfo( VULKAN_HPP_NAMESPACE::Buffer                                                                        buffer_,
+                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseMemoryBind> const & binds_ )
       : buffer( buffer_ ), bindCount( static_cast<uint32_t>( binds_.size() ) ), pBinds( binds_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SparseBufferMemoryBindInfo & operator=( SparseBufferMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseBufferMemoryBindInfo & operator=( VkSparseBufferMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseBufferMemoryBindInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SparseBufferMemoryBindInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SparseBufferMemoryBindInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
@@ -11258,21 +8980,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseBufferMemoryBindInfo & setPBinds( const SparseMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseBufferMemoryBindInfo & setPBinds( const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pBinds = pBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseBufferMemoryBindInfo & setBinds( ArrayProxyNoTemporaries<const SparseMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
+    SparseBufferMemoryBindInfo &
+      setBinds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
     {
       bindCount = static_cast<uint32_t>( binds_.size() );
       pBinds    = binds_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSparseBufferMemoryBindInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11284,18 +9007,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseBufferMemoryBindInfo *>( this );
     }
 
-    operator VkSparseBufferMemoryBindInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseBufferMemoryBindInfo *>( this );
-    }
-
-    operator VkSparseBufferMemoryBindInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseBufferMemoryBindInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Buffer const &, uint32_t const &, const SparseMemoryBind * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Buffer const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::SparseMemoryBind * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( buffer, bindCount, pBinds );
     }
@@ -11320,31 +9038,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Buffer                   buffer    = {};
-    uint32_t                 bindCount = {};
-    const SparseMemoryBind * pBinds    = {};
+    VULKAN_HPP_NAMESPACE::Buffer                   buffer    = {};
+    uint32_t                                       bindCount = {};
+    const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseBufferMemoryBindInfo>
-  {
-    using Type = SparseBufferMemoryBindInfo;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseImageOpaqueMemoryBindInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageOpaqueMemoryBindInfo.html
   struct SparseImageOpaqueMemoryBindInfo
   {
     using NativeType = VkSparseImageOpaqueMemoryBindInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SparseImageOpaqueMemoryBindInfo( Image image_ = {}, uint32_t bindCount_ = {}, const SparseMemoryBind * pBinds_ = {} ) VULKAN_HPP_NOEXCEPT
-      : image{ image_ }
-      , bindCount{ bindCount_ }
-      , pBinds{ pBinds_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageOpaqueMemoryBindInfo( VULKAN_HPP_NAMESPACE::Image                    image_     = {},
+                                                          uint32_t                                       bindCount_ = {},
+                                                          const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds_    = {} ) VULKAN_HPP_NOEXCEPT
+      : image( image_ )
+      , bindCount( bindCount_ )
+      , pBinds( pBinds_ )
     {
     }
 
@@ -11356,23 +9065,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseImageOpaqueMemoryBindInfo( Image image_, ArrayProxyNoTemporaries<const SparseMemoryBind> const & binds_ )
+    SparseImageOpaqueMemoryBindInfo( VULKAN_HPP_NAMESPACE::Image                                                                         image_,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseMemoryBind> const & binds_ )
       : image( image_ ), bindCount( static_cast<uint32_t>( binds_.size() ) ), pBinds( binds_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SparseImageOpaqueMemoryBindInfo & operator=( SparseImageOpaqueMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageOpaqueMemoryBindInfo & operator=( VkSparseImageOpaqueMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageOpaqueMemoryBindInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SparseImageOpaqueMemoryBindInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SparseImageOpaqueMemoryBindInfo & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
@@ -11384,21 +9094,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageOpaqueMemoryBindInfo & setPBinds( const SparseMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageOpaqueMemoryBindInfo & setPBinds( const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pBinds = pBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseImageOpaqueMemoryBindInfo & setBinds( ArrayProxyNoTemporaries<const SparseMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
+    SparseImageOpaqueMemoryBindInfo &
+      setBinds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
     {
       bindCount = static_cast<uint32_t>( binds_.size() );
       pBinds    = binds_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSparseImageOpaqueMemoryBindInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11410,18 +9121,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageOpaqueMemoryBindInfo *>( this );
     }
 
-    operator VkSparseImageOpaqueMemoryBindInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageOpaqueMemoryBindInfo *>( this );
-    }
-
-    operator VkSparseImageOpaqueMemoryBindInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageOpaqueMemoryBindInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Image const &, uint32_t const &, const SparseMemoryBind * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Image const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::SparseMemoryBind * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( image, bindCount, pBinds );
     }
@@ -11446,29 +9152,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Image                    image     = {};
-    uint32_t                 bindCount = {};
-    const SparseMemoryBind * pBinds    = {};
+    VULKAN_HPP_NAMESPACE::Image                    image     = {};
+    uint32_t                                       bindCount = {};
+    const VULKAN_HPP_NAMESPACE::SparseMemoryBind * pBinds    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageOpaqueMemoryBindInfo>
-  {
-    using Type = SparseImageOpaqueMemoryBindInfo;
-  };
-#endif
-
-  // wrapper struct for struct VkImageSubresource, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSubresource.html
   struct ImageSubresource
   {
     using NativeType = VkImageSubresource;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSubresource( ImageAspectFlags aspectMask_ = {}, uint32_t mipLevel_ = {}, uint32_t arrayLayer_ = {} ) VULKAN_HPP_NOEXCEPT
-      : aspectMask{ aspectMask_ }
-      , mipLevel{ mipLevel_ }
-      , arrayLayer{ arrayLayer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      ImageSubresource( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ = {}, uint32_t mipLevel_ = {}, uint32_t arrayLayer_ = {} ) VULKAN_HPP_NOEXCEPT
+      : aspectMask( aspectMask_ )
+      , mipLevel( mipLevel_ )
+      , arrayLayer( arrayLayer_ )
     {
     }
 
@@ -11477,16 +9175,16 @@ namespace VULKAN_HPP_NAMESPACE
     ImageSubresource( VkImageSubresource const & rhs ) VULKAN_HPP_NOEXCEPT : ImageSubresource( *reinterpret_cast<ImageSubresource const *>( &rhs ) ) {}
 
     ImageSubresource & operator=( ImageSubresource const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageSubresource & operator=( VkImageSubresource const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageSubresource const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSubresource const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageSubresource & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageSubresource & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
@@ -11503,7 +9201,7 @@ namespace VULKAN_HPP_NAMESPACE
       arrayLayer = arrayLayer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageSubresource const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11515,18 +9213,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageSubresource *>( this );
     }
 
-    operator VkImageSubresource const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSubresource *>( this );
-    }
-
-    operator VkImageSubresource *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSubresource *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageAspectFlags const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageAspectFlags const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( aspectMask, mipLevel, arrayLayer );
     }
@@ -11551,29 +9244,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageAspectFlags aspectMask = {};
-    uint32_t         mipLevel   = {};
-    uint32_t         arrayLayer = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask = {};
+    uint32_t                               mipLevel   = {};
+    uint32_t                               arrayLayer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSubresource>
-  {
-    using Type = ImageSubresource;
-  };
-#endif
-
-  // wrapper struct for struct VkOffset3D, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOffset3D.html
   struct Offset3D
   {
     using NativeType = VkOffset3D;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR Offset3D( int32_t x_ = {}, int32_t y_ = {}, int32_t z_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
-      , z{ z_ }
+      : x( x_ )
+      , y( y_ )
+      , z( z_ )
     {
     }
 
@@ -11584,15 +9268,15 @@ namespace VULKAN_HPP_NAMESPACE
     explicit Offset3D( Offset2D const & offset2D, int32_t z_ = {} ) : x( offset2D.x ), y( offset2D.y ), z( z_ ) {}
 
     Offset3D & operator=( Offset3D const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Offset3D & operator=( VkOffset3D const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Offset3D const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Offset3D const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Offset3D & setX( int32_t x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -11610,7 +9294,7 @@ namespace VULKAN_HPP_NAMESPACE
       z = z_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOffset3D const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11622,18 +9306,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOffset3D *>( this );
     }
 
-    operator VkOffset3D const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOffset3D *>( this );
-    }
-
-    operator VkOffset3D *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOffset3D *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<int32_t const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<int32_t const &, int32_t const &, int32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y, z );
     }
@@ -11663,24 +9342,15 @@ namespace VULKAN_HPP_NAMESPACE
     int32_t z = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOffset3D>
-  {
-    using Type = Offset3D;
-  };
-#endif
-
-  // wrapper struct for struct VkExtent3D, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExtent3D.html
   struct Extent3D
   {
     using NativeType = VkExtent3D;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR Extent3D( uint32_t width_ = {}, uint32_t height_ = {}, uint32_t depth_ = {} ) VULKAN_HPP_NOEXCEPT
-      : width{ width_ }
-      , height{ height_ }
-      , depth{ depth_ }
+      : width( width_ )
+      , height( height_ )
+      , depth( depth_ )
     {
     }
 
@@ -11691,15 +9361,15 @@ namespace VULKAN_HPP_NAMESPACE
     explicit Extent3D( Extent2D const & extent2D, uint32_t depth_ = {} ) : width( extent2D.width ), height( extent2D.height ), depth( depth_ ) {}
 
     Extent3D & operator=( Extent3D const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Extent3D & operator=( VkExtent3D const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Extent3D const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Extent3D const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Extent3D & setWidth( uint32_t width_ ) VULKAN_HPP_NOEXCEPT
     {
       width = width_;
@@ -11717,7 +9387,7 @@ namespace VULKAN_HPP_NAMESPACE
       depth = depth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExtent3D const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11729,18 +9399,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExtent3D *>( this );
     }
 
-    operator VkExtent3D const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExtent3D *>( this );
-    }
-
-    operator VkExtent3D *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExtent3D *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( width, height, depth );
     }
@@ -11770,32 +9435,23 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t depth  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExtent3D>
-  {
-    using Type = Extent3D;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseImageMemoryBind, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageMemoryBind.html
   struct SparseImageMemoryBind
   {
     using NativeType = VkSparseImageMemoryBind;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseImageMemoryBind( ImageSubresource      subresource_  = {},
-                                                Offset3D              offset_       = {},
-                                                Extent3D              extent_       = {},
-                                                DeviceMemory          memory_       = {},
-                                                DeviceSize            memoryOffset_ = {},
-                                                SparseMemoryBindFlags flags_        = {} ) VULKAN_HPP_NOEXCEPT
-      : subresource{ subresource_ }
-      , offset{ offset_ }
-      , extent{ extent_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageMemoryBind( VULKAN_HPP_NAMESPACE::ImageSubresource      subresource_  = {},
+                                                VULKAN_HPP_NAMESPACE::Offset3D              offset_       = {},
+                                                VULKAN_HPP_NAMESPACE::Extent3D              extent_       = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceMemory          memory_       = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceSize            memoryOffset_ = {},
+                                                VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags_        = {} ) VULKAN_HPP_NOEXCEPT
+      : subresource( subresource_ )
+      , offset( offset_ )
+      , extent( extent_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
+      , flags( flags_ )
     {
     }
 
@@ -11807,51 +9463,51 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SparseImageMemoryBind & operator=( SparseImageMemoryBind const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageMemoryBind & operator=( VkSparseImageMemoryBind const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageMemoryBind const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageMemoryBind const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setSubresource( ImageSubresource const & subresource_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setSubresource( VULKAN_HPP_NAMESPACE::ImageSubresource const & subresource_ ) VULKAN_HPP_NOEXCEPT
     {
       subresource = subresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setOffset( Offset3D const & offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setOffset( VULKAN_HPP_NAMESPACE::Offset3D const & offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setFlags( SparseMemoryBindFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBind & setFlags( VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSparseImageMemoryBind const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11863,18 +9519,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageMemoryBind *>( this );
     }
 
-    operator VkSparseImageMemoryBind const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageMemoryBind *>( this );
-    }
-
-    operator VkSparseImageMemoryBind *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageMemoryBind *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageSubresource const &, Offset3D const &, Extent3D const &, DeviceMemory const &, DeviceSize const &, SparseMemoryBindFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageSubresource const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( subresource, offset, extent, memory, memoryOffset, flags );
@@ -11901,33 +9556,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageSubresource      subresource  = {};
-    Offset3D              offset       = {};
-    Extent3D              extent       = {};
-    DeviceMemory          memory       = {};
-    DeviceSize            memoryOffset = {};
-    SparseMemoryBindFlags flags        = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresource      subresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D              offset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D              extent       = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory          memory       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize            memoryOffset = {};
+    VULKAN_HPP_NAMESPACE::SparseMemoryBindFlags flags        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageMemoryBind>
-  {
-    using Type = SparseImageMemoryBind;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseImageMemoryBindInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageMemoryBindInfo.html
   struct SparseImageMemoryBindInfo
   {
     using NativeType = VkSparseImageMemoryBindInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SparseImageMemoryBindInfo( Image image_ = {}, uint32_t bindCount_ = {}, const SparseImageMemoryBind * pBinds_ = {} ) VULKAN_HPP_NOEXCEPT
-      : image{ image_ }
-      , bindCount{ bindCount_ }
-      , pBinds{ pBinds_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageMemoryBindInfo( VULKAN_HPP_NAMESPACE::Image                         image_     = {},
+                                                    uint32_t                                            bindCount_ = {},
+                                                    const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind * pBinds_    = {} ) VULKAN_HPP_NOEXCEPT
+      : image( image_ )
+      , bindCount( bindCount_ )
+      , pBinds( pBinds_ )
     {
     }
 
@@ -11939,23 +9586,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseImageMemoryBindInfo( Image image_, ArrayProxyNoTemporaries<const SparseImageMemoryBind> const & binds_ )
+    SparseImageMemoryBindInfo( VULKAN_HPP_NAMESPACE::Image                                                                              image_,
+                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind> const & binds_ )
       : image( image_ ), bindCount( static_cast<uint32_t>( binds_.size() ) ), pBinds( binds_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SparseImageMemoryBindInfo & operator=( SparseImageMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageMemoryBindInfo & operator=( VkSparseImageMemoryBindInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageMemoryBindInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBindInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBindInfo & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
@@ -11967,21 +9615,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBindInfo & setPBinds( const SparseImageMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SparseImageMemoryBindInfo & setPBinds( const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind * pBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pBinds = pBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SparseImageMemoryBindInfo & setBinds( ArrayProxyNoTemporaries<const SparseImageMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
+    SparseImageMemoryBindInfo &
+      setBinds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind> const & binds_ ) VULKAN_HPP_NOEXCEPT
     {
       bindCount = static_cast<uint32_t>( binds_.size() );
       pBinds    = binds_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSparseImageMemoryBindInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -11993,18 +9642,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageMemoryBindInfo *>( this );
     }
 
-    operator VkSparseImageMemoryBindInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageMemoryBindInfo *>( this );
-    }
-
-    operator VkSparseImageMemoryBindInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageMemoryBindInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Image const &, uint32_t const &, const SparseImageMemoryBind * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Image const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( image, bindCount, pBinds );
     }
@@ -12029,20 +9673,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Image                         image     = {};
-    uint32_t                      bindCount = {};
-    const SparseImageMemoryBind * pBinds    = {};
+    VULKAN_HPP_NAMESPACE::Image                         image     = {};
+    uint32_t                                            bindCount = {};
+    const VULKAN_HPP_NAMESPACE::SparseImageMemoryBind * pBinds    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageMemoryBindInfo>
-  {
-    using Type = SparseImageMemoryBindInfo;
-  };
-#endif
-
-  // wrapper struct for struct VkBindSparseInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindSparseInfo.html
   struct BindSparseInfo
   {
     using NativeType = VkBindSparseInfo;
@@ -12050,29 +9685,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindSparseInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindSparseInfo( uint32_t                                waitSemaphoreCount_   = {},
-                                         const Semaphore *                       pWaitSemaphores_      = {},
-                                         uint32_t                                bufferBindCount_      = {},
-                                         const SparseBufferMemoryBindInfo *      pBufferBinds_         = {},
-                                         uint32_t                                imageOpaqueBindCount_ = {},
-                                         const SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds_    = {},
-                                         uint32_t                                imageBindCount_       = {},
-                                         const SparseImageMemoryBindInfo *       pImageBinds_          = {},
-                                         uint32_t                                signalSemaphoreCount_ = {},
-                                         const Semaphore *                       pSignalSemaphores_    = {},
-                                         const void *                            pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreCount{ waitSemaphoreCount_ }
-      , pWaitSemaphores{ pWaitSemaphores_ }
-      , bufferBindCount{ bufferBindCount_ }
-      , pBufferBinds{ pBufferBinds_ }
-      , imageOpaqueBindCount{ imageOpaqueBindCount_ }
-      , pImageOpaqueBinds{ pImageOpaqueBinds_ }
-      , imageBindCount{ imageBindCount_ }
-      , pImageBinds{ pImageBinds_ }
-      , signalSemaphoreCount{ signalSemaphoreCount_ }
-      , pSignalSemaphores{ pSignalSemaphores_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindSparseInfo( uint32_t                                                      waitSemaphoreCount_   = {},
+                                         const VULKAN_HPP_NAMESPACE::Semaphore *                       pWaitSemaphores_      = {},
+                                         uint32_t                                                      bufferBindCount_      = {},
+                                         const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo *      pBufferBinds_         = {},
+                                         uint32_t                                                      imageOpaqueBindCount_ = {},
+                                         const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds_    = {},
+                                         uint32_t                                                      imageBindCount_       = {},
+                                         const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo *       pImageBinds_          = {},
+                                         uint32_t                                                      signalSemaphoreCount_ = {},
+                                         const VULKAN_HPP_NAMESPACE::Semaphore *                       pSignalSemaphores_    = {},
+                                         const void *                                                  pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , waitSemaphoreCount( waitSemaphoreCount_ )
+      , pWaitSemaphores( pWaitSemaphores_ )
+      , bufferBindCount( bufferBindCount_ )
+      , pBufferBinds( pBufferBinds_ )
+      , imageOpaqueBindCount( imageOpaqueBindCount_ )
+      , pImageOpaqueBinds( pImageOpaqueBinds_ )
+      , imageBindCount( imageBindCount_ )
+      , pImageBinds( pImageBinds_ )
+      , signalSemaphoreCount( signalSemaphoreCount_ )
+      , pSignalSemaphores( pSignalSemaphores_ )
     {
     }
 
@@ -12081,12 +9716,12 @@ namespace VULKAN_HPP_NAMESPACE
     BindSparseInfo( VkBindSparseInfo const & rhs ) VULKAN_HPP_NOEXCEPT : BindSparseInfo( *reinterpret_cast<BindSparseInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo( ArrayProxyNoTemporaries<const Semaphore> const &                       waitSemaphores_,
-                    ArrayProxyNoTemporaries<const SparseBufferMemoryBindInfo> const &      bufferBinds_      = {},
-                    ArrayProxyNoTemporaries<const SparseImageOpaqueMemoryBindInfo> const & imageOpaqueBinds_ = {},
-                    ArrayProxyNoTemporaries<const SparseImageMemoryBindInfo> const &       imageBinds_       = {},
-                    ArrayProxyNoTemporaries<const Semaphore> const &                       signalSemaphores_ = {},
-                    const void *                                                           pNext_            = nullptr )
+    BindSparseInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const &                       waitSemaphores_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo> const &      bufferBinds_      = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo> const & imageOpaqueBinds_ = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo> const &       imageBinds_       = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const &                       signalSemaphores_ = {},
+                    const void *                                                                                                       pNext_ = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreCount( static_cast<uint32_t>( waitSemaphores_.size() ) )
       , pWaitSemaphores( waitSemaphores_.data() )
@@ -12103,15 +9738,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BindSparseInfo & operator=( BindSparseInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindSparseInfo & operator=( VkBindSparseInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindSparseInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindSparseInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -12124,14 +9759,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPWaitSemaphores( const Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPWaitSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pWaitSemaphores = pWaitSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo & setWaitSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    BindSparseInfo &
+      setWaitSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreCount = static_cast<uint32_t>( waitSemaphores_.size() );
       pWaitSemaphores    = waitSemaphores_.data();
@@ -12145,14 +9781,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPBufferBinds( const SparseBufferMemoryBindInfo * pBufferBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPBufferBinds( const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo * pBufferBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pBufferBinds = pBufferBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo & setBufferBinds( ArrayProxyNoTemporaries<const SparseBufferMemoryBindInfo> const & bufferBinds_ ) VULKAN_HPP_NOEXCEPT
+    BindSparseInfo & setBufferBinds(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo> const & bufferBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferBindCount = static_cast<uint32_t>( bufferBinds_.size() );
       pBufferBinds    = bufferBinds_.data();
@@ -12166,14 +9803,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPImageOpaqueBinds( const SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo &
+      setPImageOpaqueBinds( const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pImageOpaqueBinds = pImageOpaqueBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo & setImageOpaqueBinds( ArrayProxyNoTemporaries<const SparseImageOpaqueMemoryBindInfo> const & imageOpaqueBinds_ ) VULKAN_HPP_NOEXCEPT
+    BindSparseInfo & setImageOpaqueBinds(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo> const & imageOpaqueBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOpaqueBindCount = static_cast<uint32_t>( imageOpaqueBinds_.size() );
       pImageOpaqueBinds    = imageOpaqueBinds_.data();
@@ -12187,14 +9826,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPImageBinds( const SparseImageMemoryBindInfo * pImageBinds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPImageBinds( const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo * pImageBinds_ ) VULKAN_HPP_NOEXCEPT
     {
       pImageBinds = pImageBinds_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo & setImageBinds( ArrayProxyNoTemporaries<const SparseImageMemoryBindInfo> const & imageBinds_ ) VULKAN_HPP_NOEXCEPT
+    BindSparseInfo & setImageBinds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo> const & imageBinds_ )
+      VULKAN_HPP_NOEXCEPT
     {
       imageBindCount = static_cast<uint32_t>( imageBinds_.size() );
       pImageBinds    = imageBinds_.data();
@@ -12208,21 +9848,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPSignalSemaphores( const Semaphore * pSignalSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindSparseInfo & setPSignalSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pSignalSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pSignalSemaphores = pSignalSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BindSparseInfo & setSignalSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & signalSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    BindSparseInfo &
+      setSignalSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & signalSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreCount = static_cast<uint32_t>( signalSemaphores_.size() );
       pSignalSemaphores    = signalSemaphores_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindSparseInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -12234,29 +9875,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindSparseInfo *>( this );
     }
 
-    operator VkBindSparseInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindSparseInfo *>( this );
-    }
-
-    operator VkBindSparseInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindSparseInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const Semaphore * const &,
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &,
                uint32_t const &,
-               const SparseBufferMemoryBindInfo * const &,
+               const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo * const &,
                uint32_t const &,
-               const SparseImageOpaqueMemoryBindInfo * const &,
+               const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo * const &,
                uint32_t const &,
-               const SparseImageMemoryBindInfo * const &,
+               const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo * const &,
                uint32_t const &,
-               const Semaphore * const &>
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -12297,283 +9932,37 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType                = StructureType::eBindSparseInfo;
-    const void *                            pNext                = {};
-    uint32_t                                waitSemaphoreCount   = {};
-    const Semaphore *                       pWaitSemaphores      = {};
-    uint32_t                                bufferBindCount      = {};
-    const SparseBufferMemoryBindInfo *      pBufferBinds         = {};
-    uint32_t                                imageOpaqueBindCount = {};
-    const SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds    = {};
-    uint32_t                                imageBindCount       = {};
-    const SparseImageMemoryBindInfo *       pImageBinds          = {};
-    uint32_t                                signalSemaphoreCount = {};
-    const Semaphore *                       pSignalSemaphores    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                           sType                = StructureType::eBindSparseInfo;
+    const void *                                                  pNext                = {};
+    uint32_t                                                      waitSemaphoreCount   = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *                       pWaitSemaphores      = {};
+    uint32_t                                                      bufferBindCount      = {};
+    const VULKAN_HPP_NAMESPACE::SparseBufferMemoryBindInfo *      pBufferBinds         = {};
+    uint32_t                                                      imageOpaqueBindCount = {};
+    const VULKAN_HPP_NAMESPACE::SparseImageOpaqueMemoryBindInfo * pImageOpaqueBinds    = {};
+    uint32_t                                                      imageBindCount       = {};
+    const VULKAN_HPP_NAMESPACE::SparseImageMemoryBindInfo *       pImageBinds          = {};
+    uint32_t                                                      signalSemaphoreCount = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *                       pSignalSemaphores    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindSparseInfo>
-  {
-    using Type = BindSparseInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindSparseInfo>
   {
     using Type = BindSparseInfo;
   };
 
-  // wrapper struct for struct VkBindTensorMemoryInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindTensorMemoryInfoARM.html
-  struct BindTensorMemoryInfoARM
-  {
-    using NativeType = VkBindTensorMemoryInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindTensorMemoryInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindTensorMemoryInfoARM( TensorARM    tensor_       = {},
-                                                  DeviceMemory memory_       = {},
-                                                  DeviceSize   memoryOffset_ = {},
-                                                  const void * pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensor{ tensor_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BindTensorMemoryInfoARM( BindTensorMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BindTensorMemoryInfoARM( VkBindTensorMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BindTensorMemoryInfoARM( *reinterpret_cast<BindTensorMemoryInfoARM const *>( &rhs ) )
-    {
-    }
-
-    BindTensorMemoryInfoARM & operator=( BindTensorMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BindTensorMemoryInfoARM & operator=( VkBindTensorMemoryInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BindTensorMemoryInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindTensorMemoryInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindTensorMemoryInfoARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindTensorMemoryInfoARM & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memory = memory_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindTensorMemoryInfoARM & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memoryOffset = memoryOffset_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBindTensorMemoryInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBindTensorMemoryInfoARM *>( this );
-    }
-
-    operator VkBindTensorMemoryInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBindTensorMemoryInfoARM *>( this );
-    }
-
-    operator VkBindTensorMemoryInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindTensorMemoryInfoARM *>( this );
-    }
-
-    operator VkBindTensorMemoryInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindTensorMemoryInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorARM const &, DeviceMemory const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensor, memory, memoryOffset );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindTensorMemoryInfoARM const & ) const = default;
-#else
-    bool operator==( BindTensorMemoryInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensor == rhs.tensor ) && ( memory == rhs.memory ) && ( memoryOffset == rhs.memoryOffset );
-#  endif
-    }
-
-    bool operator!=( BindTensorMemoryInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType        = StructureType::eBindTensorMemoryInfoARM;
-    const void *  pNext        = {};
-    TensorARM     tensor       = {};
-    DeviceMemory  memory       = {};
-    DeviceSize    memoryOffset = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindTensorMemoryInfoARM>
-  {
-    using Type = BindTensorMemoryInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eBindTensorMemoryInfoARM>
-  {
-    using Type = BindTensorMemoryInfoARM;
-  };
-
-  // wrapper struct for struct VkBindVertexBufferIndirectCommandEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindVertexBufferIndirectCommandEXT.html
-  struct BindVertexBufferIndirectCommandEXT
-  {
-    using NativeType = VkBindVertexBufferIndirectCommandEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindVertexBufferIndirectCommandEXT( DeviceAddress bufferAddress_ = {}, uint32_t size_ = {}, uint32_t stride_ = {} ) VULKAN_HPP_NOEXCEPT
-      : bufferAddress{ bufferAddress_ }
-      , size{ size_ }
-      , stride{ stride_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BindVertexBufferIndirectCommandEXT( BindVertexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BindVertexBufferIndirectCommandEXT( VkBindVertexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BindVertexBufferIndirectCommandEXT( *reinterpret_cast<BindVertexBufferIndirectCommandEXT const *>( &rhs ) )
-    {
-    }
-
-    BindVertexBufferIndirectCommandEXT & operator=( BindVertexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BindVertexBufferIndirectCommandEXT & operator=( VkBindVertexBufferIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BindVertexBufferIndirectCommandEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindVertexBufferIndirectCommandEXT & setBufferAddress( DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bufferAddress = bufferAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindVertexBufferIndirectCommandEXT & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BindVertexBufferIndirectCommandEXT & setStride( uint32_t stride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stride = stride_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBindVertexBufferIndirectCommandEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBindVertexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindVertexBufferIndirectCommandEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBindVertexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindVertexBufferIndirectCommandEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindVertexBufferIndirectCommandEXT *>( this );
-    }
-
-    operator VkBindVertexBufferIndirectCommandEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindVertexBufferIndirectCommandEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( bufferAddress, size, stride );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BindVertexBufferIndirectCommandEXT const & ) const = default;
-#else
-    bool operator==( BindVertexBufferIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( bufferAddress == rhs.bufferAddress ) && ( size == rhs.size ) && ( stride == rhs.stride );
-#  endif
-    }
-
-    bool operator!=( BindVertexBufferIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress bufferAddress = {};
-    uint32_t      size          = {};
-    uint32_t      stride        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindVertexBufferIndirectCommandEXT>
-  {
-    using Type = BindVertexBufferIndirectCommandEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkBindVertexBufferIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindVertexBufferIndirectCommandNV.html
   struct BindVertexBufferIndirectCommandNV
   {
     using NativeType = VkBindVertexBufferIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindVertexBufferIndirectCommandNV( DeviceAddress bufferAddress_ = {}, uint32_t size_ = {}, uint32_t stride_ = {} ) VULKAN_HPP_NOEXCEPT
-      : bufferAddress{ bufferAddress_ }
-      , size{ size_ }
-      , stride{ stride_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindVertexBufferIndirectCommandNV( VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress_ = {},
+                                                            uint32_t                            size_          = {},
+                                                            uint32_t                            stride_        = {} ) VULKAN_HPP_NOEXCEPT
+      : bufferAddress( bufferAddress_ )
+      , size( size_ )
+      , stride( stride_ )
     {
     }
 
@@ -12585,16 +9974,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindVertexBufferIndirectCommandNV & operator=( BindVertexBufferIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindVertexBufferIndirectCommandNV & operator=( VkBindVertexBufferIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindVertexBufferIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindVertexBufferIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BindVertexBufferIndirectCommandNV & setBufferAddress( DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BindVertexBufferIndirectCommandNV & setBufferAddress( VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferAddress = bufferAddress_;
       return *this;
@@ -12611,7 +10000,7 @@ namespace VULKAN_HPP_NAMESPACE
       stride = stride_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindVertexBufferIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -12623,18 +10012,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindVertexBufferIndirectCommandNV *>( this );
     }
 
-    operator VkBindVertexBufferIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindVertexBufferIndirectCommandNV *>( this );
-    }
-
-    operator VkBindVertexBufferIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindVertexBufferIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( bufferAddress, size, stride );
     }
@@ -12659,21 +10043,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceAddress bufferAddress = {};
-    uint32_t      size          = {};
-    uint32_t      stride        = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress bufferAddress = {};
+    uint32_t                            size          = {};
+    uint32_t                            stride        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindVertexBufferIndirectCommandNV>
-  {
-    using Type = BindVertexBufferIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkBindVideoSessionMemoryInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBindVideoSessionMemoryInfoKHR.html
   struct BindVideoSessionMemoryInfoKHR
   {
     using NativeType = VkBindVideoSessionMemoryInfoKHR;
@@ -12681,17 +10055,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBindVideoSessionMemoryInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BindVideoSessionMemoryInfoKHR( uint32_t     memoryBindIndex_ = {},
-                                                        DeviceMemory memory_          = {},
-                                                        DeviceSize   memoryOffset_    = {},
-                                                        DeviceSize   memorySize_      = {},
-                                                        const void * pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryBindIndex{ memoryBindIndex_ }
-      , memory{ memory_ }
-      , memoryOffset{ memoryOffset_ }
-      , memorySize{ memorySize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BindVideoSessionMemoryInfoKHR( uint32_t                           memoryBindIndex_ = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceMemory memory_          = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize   memoryOffset_    = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize   memorySize_      = {},
+                                                        const void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryBindIndex( memoryBindIndex_ )
+      , memory( memory_ )
+      , memoryOffset( memoryOffset_ )
+      , memorySize( memorySize_ )
     {
     }
 
@@ -12703,15 +10077,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BindVideoSessionMemoryInfoKHR & operator=( BindVideoSessionMemoryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BindVideoSessionMemoryInfoKHR & operator=( VkBindVideoSessionMemoryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BindVideoSessionMemoryInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BindVideoSessionMemoryInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -12724,24 +10098,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemoryOffset( DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemoryOffset( VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryOffset = memoryOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemorySize( DeviceSize memorySize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BindVideoSessionMemoryInfoKHR & setMemorySize( VULKAN_HPP_NAMESPACE::DeviceSize memorySize_ ) VULKAN_HPP_NOEXCEPT
     {
       memorySize = memorySize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBindVideoSessionMemoryInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -12753,18 +10127,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBindVideoSessionMemoryInfoKHR *>( this );
     }
 
-    operator VkBindVideoSessionMemoryInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBindVideoSessionMemoryInfoKHR *>( this );
-    }
-
-    operator VkBindVideoSessionMemoryInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBindVideoSessionMemoryInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, DeviceMemory const &, DeviceSize const &, DeviceSize const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryBindIndex, memory, memoryOffset, memorySize );
@@ -12791,30 +10164,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eBindVideoSessionMemoryInfoKHR;
-    const void *  pNext           = {};
-    uint32_t      memoryBindIndex = {};
-    DeviceMemory  memory          = {};
-    DeviceSize    memoryOffset    = {};
-    DeviceSize    memorySize      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eBindVideoSessionMemoryInfoKHR;
+    const void *                        pNext           = {};
+    uint32_t                            memoryBindIndex = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    memoryOffset    = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    memorySize      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBindVideoSessionMemoryInfoKHR>
-  {
-    using Type = BindVideoSessionMemoryInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBindVideoSessionMemoryInfoKHR>
   {
     using Type = BindVideoSessionMemoryInfoKHR;
   };
 
-  // wrapper struct for struct VkBlitImageCubicWeightsInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlitImageCubicWeightsInfoQCOM.html
   struct BlitImageCubicWeightsInfoQCOM
   {
     using NativeType = VkBlitImageCubicWeightsInfoQCOM;
@@ -12822,11 +10185,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBlitImageCubicWeightsInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BlitImageCubicWeightsInfoQCOM( CubicFilterWeightsQCOM cubicWeights_ = CubicFilterWeightsQCOM::eCatmullRom,
-                                                        const void *           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cubicWeights{ cubicWeights_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      BlitImageCubicWeightsInfoQCOM( VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights_ = VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM::eCatmullRom,
+                                     const void *                                 pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cubicWeights( cubicWeights_ )
     {
     }
 
@@ -12838,27 +10202,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BlitImageCubicWeightsInfoQCOM & operator=( BlitImageCubicWeightsInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BlitImageCubicWeightsInfoQCOM & operator=( VkBlitImageCubicWeightsInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BlitImageCubicWeightsInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BlitImageCubicWeightsInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BlitImageCubicWeightsInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageCubicWeightsInfoQCOM & setCubicWeights( CubicFilterWeightsQCOM cubicWeights_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageCubicWeightsInfoQCOM & setCubicWeights( VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights_ ) VULKAN_HPP_NOEXCEPT
     {
       cubicWeights = cubicWeights_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBlitImageCubicWeightsInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -12870,18 +10234,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBlitImageCubicWeightsInfoQCOM *>( this );
     }
 
-    operator VkBlitImageCubicWeightsInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBlitImageCubicWeightsInfoQCOM *>( this );
-    }
-
-    operator VkBlitImageCubicWeightsInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBlitImageCubicWeightsInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CubicFilterWeightsQCOM const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cubicWeights );
     }
@@ -12906,39 +10265,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType        = StructureType::eBlitImageCubicWeightsInfoQCOM;
-    const void *           pNext        = {};
-    CubicFilterWeightsQCOM cubicWeights = CubicFilterWeightsQCOM::eCatmullRom;
+    VULKAN_HPP_NAMESPACE::StructureType          sType        = StructureType::eBlitImageCubicWeightsInfoQCOM;
+    const void *                                 pNext        = {};
+    VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights = VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM::eCatmullRom;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBlitImageCubicWeightsInfoQCOM>
-  {
-    using Type = BlitImageCubicWeightsInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBlitImageCubicWeightsInfoQCOM>
   {
     using Type = BlitImageCubicWeightsInfoQCOM;
   };
 
-  // wrapper struct for struct VkImageSubresourceLayers, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSubresourceLayers.html
   struct ImageSubresourceLayers
   {
     using NativeType = VkImageSubresourceLayers;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSubresourceLayers( ImageAspectFlags aspectMask_     = {},
-                                                 uint32_t         mipLevel_       = {},
-                                                 uint32_t         baseArrayLayer_ = {},
-                                                 uint32_t         layerCount_     = {} ) VULKAN_HPP_NOEXCEPT
-      : aspectMask{ aspectMask_ }
-      , mipLevel{ mipLevel_ }
-      , baseArrayLayer{ baseArrayLayer_ }
-      , layerCount{ layerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageSubresourceLayers( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_     = {},
+                                                 uint32_t                               mipLevel_       = {},
+                                                 uint32_t                               baseArrayLayer_ = {},
+                                                 uint32_t                               layerCount_     = {} ) VULKAN_HPP_NOEXCEPT
+      : aspectMask( aspectMask_ )
+      , mipLevel( mipLevel_ )
+      , baseArrayLayer( baseArrayLayer_ )
+      , layerCount( layerCount_ )
     {
     }
 
@@ -12950,16 +10300,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageSubresourceLayers & operator=( ImageSubresourceLayers const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageSubresourceLayers & operator=( VkImageSubresourceLayers const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageSubresourceLayers const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageSubresourceLayers & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageSubresourceLayers & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
@@ -12982,7 +10332,7 @@ namespace VULKAN_HPP_NAMESPACE
       layerCount = layerCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageSubresourceLayers const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -12994,18 +10344,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageSubresourceLayers *>( this );
     }
 
-    operator VkImageSubresourceLayers const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSubresourceLayers *>( this );
-    }
-
-    operator VkImageSubresourceLayers *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSubresourceLayers *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageAspectFlags const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageAspectFlags const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( aspectMask, mipLevel, baseArrayLayer, layerCount );
     }
@@ -13030,21 +10375,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageAspectFlags aspectMask     = {};
-    uint32_t         mipLevel       = {};
-    uint32_t         baseArrayLayer = {};
-    uint32_t         layerCount     = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask     = {};
+    uint32_t                               mipLevel       = {};
+    uint32_t                               baseArrayLayer = {};
+    uint32_t                               layerCount     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSubresourceLayers>
-  {
-    using Type = ImageSubresourceLayers;
-  };
-#endif
-
-  // wrapper struct for struct VkImageBlit2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageBlit2.html
   struct ImageBlit2
   {
     using NativeType = VkImageBlit2;
@@ -13052,17 +10388,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageBlit2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit2( ImageSubresourceLayers          srcSubresource_ = {},
-                                        std::array<Offset3D, 2> const & srcOffsets_     = {},
-                                        ImageSubresourceLayers          dstSubresource_ = {},
-                                        std::array<Offset3D, 2> const & dstOffsets_     = {},
-                                        const void *                    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSubresource{ srcSubresource_ }
-      , srcOffsets{ srcOffsets_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffsets{ dstOffsets_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit2( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers          srcSubresource_ = {},
+                                        std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & srcOffsets_     = {},
+                                        VULKAN_HPP_NAMESPACE::ImageSubresourceLayers          dstSubresource_ = {},
+                                        std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & dstOffsets_     = {},
+                                        const void *                                          pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcSubresource( srcSubresource_ )
+      , srcOffsets( srcOffsets_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffsets( dstOffsets_ )
     {
     }
 
@@ -13071,45 +10407,45 @@ namespace VULKAN_HPP_NAMESPACE
     ImageBlit2( VkImageBlit2 const & rhs ) VULKAN_HPP_NOEXCEPT : ImageBlit2( *reinterpret_cast<ImageBlit2 const *>( &rhs ) ) {}
 
     ImageBlit2 & operator=( ImageBlit2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageBlit2 & operator=( VkImageBlit2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageBlit2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageBlit2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setSrcOffsets( std::array<Offset3D, 2> const & srcOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setSrcOffsets( std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & srcOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffsets = srcOffsets_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setDstOffsets( std::array<Offset3D, 2> const & dstOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit2 & setDstOffsets( std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & dstOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffsets = dstOffsets_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageBlit2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13121,23 +10457,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageBlit2 *>( this );
     }
 
-    operator VkImageBlit2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageBlit2 *>( this );
-    }
-
-    operator VkImageBlit2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageBlit2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageSubresourceLayers const &,
-               ArrayWrapper1D<Offset3D, 2> const &,
-               ImageSubresourceLayers const &,
-               ArrayWrapper1D<Offset3D, 2> const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcSubresource, srcOffsets, dstSubresource, dstOffsets );
@@ -13164,22 +10494,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType          = StructureType::eImageBlit2;
-    const void *                pNext          = {};
-    ImageSubresourceLayers      srcSubresource = {};
-    ArrayWrapper1D<Offset3D, 2> srcOffsets     = {};
-    ImageSubresourceLayers      dstSubresource = {};
-    ArrayWrapper1D<Offset3D, 2> dstOffsets     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                     sType          = StructureType::eImageBlit2;
+    const void *                                                            pNext          = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers                            srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> srcOffsets     = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers                            dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> dstOffsets     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageBlit2>
-  {
-    using Type = ImageBlit2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageBlit2>
   {
@@ -13188,7 +10510,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageBlit2KHR = ImageBlit2;
 
-  // wrapper struct for struct VkBlitImageInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBlitImageInfo2.html
   struct BlitImageInfo2
   {
     using NativeType = VkBlitImageInfo2;
@@ -13196,23 +10517,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBlitImageInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2( Image              srcImage_       = {},
-                                            ImageLayout        srcImageLayout_ = ImageLayout::eUndefined,
-                                            Image              dstImage_       = {},
-                                            ImageLayout        dstImageLayout_ = ImageLayout::eUndefined,
-                                            uint32_t           regionCount_    = {},
-                                            const ImageBlit2 * pRegions_       = {},
-                                            Filter             filter_         = Filter::eNearest,
-                                            const void *       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
-      , filter{ filter_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2( VULKAN_HPP_NAMESPACE::Image              srcImage_       = {},
+                                            VULKAN_HPP_NAMESPACE::ImageLayout        srcImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                            VULKAN_HPP_NAMESPACE::Image              dstImage_       = {},
+                                            VULKAN_HPP_NAMESPACE::ImageLayout        dstImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                            uint32_t                                 regionCount_    = {},
+                                            const VULKAN_HPP_NAMESPACE::ImageBlit2 * pRegions_       = {},
+                                            VULKAN_HPP_NAMESPACE::Filter             filter_         = VULKAN_HPP_NAMESPACE::Filter::eNearest,
+                                            const void *                             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
+      , filter( filter_ )
     {
     }
 
@@ -13221,13 +10542,13 @@ namespace VULKAN_HPP_NAMESPACE
     BlitImageInfo2( VkBlitImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : BlitImageInfo2( *reinterpret_cast<BlitImageInfo2 const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BlitImageInfo2( Image                                             srcImage_,
-                    ImageLayout                                       srcImageLayout_,
-                    Image                                             dstImage_,
-                    ImageLayout                                       dstImageLayout_,
-                    ArrayProxyNoTemporaries<const ImageBlit2> const & regions_,
-                    Filter                                            filter_ = Filter::eNearest,
-                    const void *                                      pNext_  = nullptr )
+    BlitImageInfo2( VULKAN_HPP_NAMESPACE::Image                                                                   srcImage_,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                                             srcImageLayout_,
+                    VULKAN_HPP_NAMESPACE::Image                                                                   dstImage_,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                                             dstImageLayout_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageBlit2> const & regions_,
+                    VULKAN_HPP_NAMESPACE::Filter filter_ = VULKAN_HPP_NAMESPACE::Filter::eNearest,
+                    const void *                 pNext_  = nullptr )
       : pNext( pNext_ )
       , srcImage( srcImage_ )
       , srcImageLayout( srcImageLayout_ )
@@ -13241,40 +10562,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BlitImageInfo2 & operator=( BlitImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BlitImageInfo2 & operator=( VkBlitImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BlitImageInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BlitImageInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
@@ -13286,14 +10607,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setPRegions( const ImageBlit2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::ImageBlit2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BlitImageInfo2 & setRegions( ArrayProxyNoTemporaries<const ImageBlit2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    BlitImageInfo2 & setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageBlit2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
@@ -13301,12 +10622,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setFilter( Filter filter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BlitImageInfo2 & setFilter( VULKAN_HPP_NAMESPACE::Filter filter_ ) VULKAN_HPP_NOEXCEPT
     {
       filter = filter_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBlitImageInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13318,26 +10639,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBlitImageInfo2 *>( this );
     }
 
-    operator VkBlitImageInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBlitImageInfo2 *>( this );
-    }
-
-    operator VkBlitImageInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBlitImageInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Image const &,
-               ImageLayout const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const ImageBlit2 * const &,
-               Filter const &>
+               const VULKAN_HPP_NAMESPACE::ImageBlit2 * const &,
+               VULKAN_HPP_NAMESPACE::Filter const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter );
@@ -13365,25 +10680,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType          = StructureType::eBlitImageInfo2;
-    const void *       pNext          = {};
-    Image              srcImage       = {};
-    ImageLayout        srcImageLayout = ImageLayout::eUndefined;
-    Image              dstImage       = {};
-    ImageLayout        dstImageLayout = ImageLayout::eUndefined;
-    uint32_t           regionCount    = {};
-    const ImageBlit2 * pRegions       = {};
-    Filter             filter         = Filter::eNearest;
+    VULKAN_HPP_NAMESPACE::StructureType      sType          = StructureType::eBlitImageInfo2;
+    const void *                             pNext          = {};
+    VULKAN_HPP_NAMESPACE::Image              srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout        srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Image              dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout        dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                 regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::ImageBlit2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::Filter             filter         = VULKAN_HPP_NAMESPACE::Filter::eNearest;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBlitImageInfo2>
-  {
-    using Type = BlitImageInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBlitImageInfo2>
   {
@@ -13392,8 +10699,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BlitImageInfo2KHR = BlitImageInfo2;
 
-  // wrapper struct for struct VkBufferCaptureDescriptorDataInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCaptureDescriptorDataInfoEXT.html
   struct BufferCaptureDescriptorDataInfoEXT
   {
     using NativeType = VkBufferCaptureDescriptorDataInfoEXT;
@@ -13401,10 +10706,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCaptureDescriptorDataInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCaptureDescriptorDataInfoEXT( Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCaptureDescriptorDataInfoEXT( VULKAN_HPP_NAMESPACE::Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -13416,27 +10721,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCaptureDescriptorDataInfoEXT & operator=( BufferCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCaptureDescriptorDataInfoEXT & operator=( VkBufferCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCaptureDescriptorDataInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCaptureDescriptorDataInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCaptureDescriptorDataInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCaptureDescriptorDataInfoEXT & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCaptureDescriptorDataInfoEXT & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCaptureDescriptorDataInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13448,18 +10753,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCaptureDescriptorDataInfoEXT *>( this );
     }
 
-    operator VkBufferCaptureDescriptorDataInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCaptureDescriptorDataInfoEXT *>( this );
-    }
-
-    operator VkBufferCaptureDescriptorDataInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCaptureDescriptorDataInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -13484,19 +10784,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eBufferCaptureDescriptorDataInfoEXT;
-    const void *  pNext  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eBufferCaptureDescriptorDataInfoEXT;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCaptureDescriptorDataInfoEXT>
-  {
-    using Type = BufferCaptureDescriptorDataInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCaptureDescriptorDataInfoEXT>
   {
@@ -13504,8 +10796,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferCollectionBufferCreateInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionBufferCreateInfoFUCHSIA.html
   struct BufferCollectionBufferCreateInfoFUCHSIA
   {
     using NativeType = VkBufferCollectionBufferCreateInfoFUCHSIA;
@@ -13513,13 +10803,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCollectionBufferCreateInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCollectionBufferCreateInfoFUCHSIA( BufferCollectionFUCHSIA collection_ = {},
-                                                                  uint32_t                index_      = {},
-                                                                  const void *            pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , collection{ collection_ }
-      , index{ index_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCollectionBufferCreateInfoFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ = {},
+                                                                  uint32_t                                      index_      = {},
+                                                                  const void *                                  pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , collection( collection_ )
+      , index( index_ )
     {
     }
 
@@ -13531,22 +10821,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCollectionBufferCreateInfoFUCHSIA & operator=( BufferCollectionBufferCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCollectionBufferCreateInfoFUCHSIA & operator=( VkBufferCollectionBufferCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCollectionBufferCreateInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCollectionBufferCreateInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCollectionBufferCreateInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCollectionBufferCreateInfoFUCHSIA & setCollection( BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCollectionBufferCreateInfoFUCHSIA &
+      setCollection( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
     {
       collection = collection_;
       return *this;
@@ -13557,7 +10848,7 @@ namespace VULKAN_HPP_NAMESPACE
       index = index_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCollectionBufferCreateInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13569,18 +10860,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCollectionBufferCreateInfoFUCHSIA *>( this );
     }
 
-    operator VkBufferCollectionBufferCreateInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCollectionBufferCreateInfoFUCHSIA *>( this );
-    }
-
-    operator VkBufferCollectionBufferCreateInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCollectionBufferCreateInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, BufferCollectionFUCHSIA const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, collection, index );
     }
@@ -13605,20 +10891,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType           sType      = StructureType::eBufferCollectionBufferCreateInfoFUCHSIA;
-    const void *            pNext      = {};
-    BufferCollectionFUCHSIA collection = {};
-    uint32_t                index      = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType      = StructureType::eBufferCollectionBufferCreateInfoFUCHSIA;
+    const void *                                  pNext      = {};
+    VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection = {};
+    uint32_t                                      index      = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCollectionBufferCreateInfoFUCHSIA>
-  {
-    using Type = BufferCollectionBufferCreateInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCollectionBufferCreateInfoFUCHSIA>
   {
@@ -13627,8 +10905,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferCollectionConstraintsInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionConstraintsInfoFUCHSIA.html
   struct BufferCollectionConstraintsInfoFUCHSIA
   {
     using NativeType = VkBufferCollectionConstraintsInfoFUCHSIA;
@@ -13636,19 +10912,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCollectionConstraintsInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR BufferCollectionConstraintsInfoFUCHSIA( uint32_t     minBufferCount_                  = {},
                                                                  uint32_t     maxBufferCount_                  = {},
                                                                  uint32_t     minBufferCountForCamping_        = {},
                                                                  uint32_t     minBufferCountForDedicatedSlack_ = {},
                                                                  uint32_t     minBufferCountForSharedSlack_    = {},
                                                                  const void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minBufferCount{ minBufferCount_ }
-      , maxBufferCount{ maxBufferCount_ }
-      , minBufferCountForCamping{ minBufferCountForCamping_ }
-      , minBufferCountForDedicatedSlack{ minBufferCountForDedicatedSlack_ }
-      , minBufferCountForSharedSlack{ minBufferCountForSharedSlack_ }
+      : pNext( pNext_ )
+      , minBufferCount( minBufferCount_ )
+      , maxBufferCount( maxBufferCount_ )
+      , minBufferCountForCamping( minBufferCountForCamping_ )
+      , minBufferCountForDedicatedSlack( minBufferCountForDedicatedSlack_ )
+      , minBufferCountForSharedSlack( minBufferCountForSharedSlack_ )
     {
     }
 
@@ -13660,15 +10936,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCollectionConstraintsInfoFUCHSIA & operator=( BufferCollectionConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCollectionConstraintsInfoFUCHSIA & operator=( VkBufferCollectionConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCollectionConstraintsInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCollectionConstraintsInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -13706,7 +10982,7 @@ namespace VULKAN_HPP_NAMESPACE
       minBufferCountForSharedSlack = minBufferCountForSharedSlack_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCollectionConstraintsInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13718,18 +10994,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCollectionConstraintsInfoFUCHSIA *>( this );
     }
 
-    operator VkBufferCollectionConstraintsInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCollectionConstraintsInfoFUCHSIA *>( this );
-    }
-
-    operator VkBufferCollectionConstraintsInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCollectionConstraintsInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minBufferCount, maxBufferCount, minBufferCountForCamping, minBufferCountForDedicatedSlack, minBufferCountForSharedSlack );
@@ -13757,23 +11033,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                           = StructureType::eBufferCollectionConstraintsInfoFUCHSIA;
-    const void *  pNext                           = {};
-    uint32_t      minBufferCount                  = {};
-    uint32_t      maxBufferCount                  = {};
-    uint32_t      minBufferCountForCamping        = {};
-    uint32_t      minBufferCountForDedicatedSlack = {};
-    uint32_t      minBufferCountForSharedSlack    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::eBufferCollectionConstraintsInfoFUCHSIA;
+    const void *                        pNext                           = {};
+    uint32_t                            minBufferCount                  = {};
+    uint32_t                            maxBufferCount                  = {};
+    uint32_t                            minBufferCountForCamping        = {};
+    uint32_t                            minBufferCountForDedicatedSlack = {};
+    uint32_t                            minBufferCountForSharedSlack    = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCollectionConstraintsInfoFUCHSIA>
-  {
-    using Type = BufferCollectionConstraintsInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCollectionConstraintsInfoFUCHSIA>
   {
@@ -13782,8 +11050,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferCollectionCreateInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionCreateInfoFUCHSIA.html
   struct BufferCollectionCreateInfoFUCHSIA
   {
     using NativeType = VkBufferCollectionCreateInfoFUCHSIA;
@@ -13791,10 +11057,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCollectionCreateInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR BufferCollectionCreateInfoFUCHSIA( zx_handle_t collectionToken_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , collectionToken{ collectionToken_ }
+      : pNext( pNext_ )
+      , collectionToken( collectionToken_ )
     {
     }
 
@@ -13806,15 +11072,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCollectionCreateInfoFUCHSIA & operator=( BufferCollectionCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCollectionCreateInfoFUCHSIA & operator=( VkBufferCollectionCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCollectionCreateInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCollectionCreateInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCollectionCreateInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -13826,7 +11092,7 @@ namespace VULKAN_HPP_NAMESPACE
       collectionToken = collectionToken_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCollectionCreateInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13838,18 +11104,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCollectionCreateInfoFUCHSIA *>( this );
     }
 
-    operator VkBufferCollectionCreateInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCollectionCreateInfoFUCHSIA *>( this );
-    }
-
-    operator VkBufferCollectionCreateInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCollectionCreateInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, zx_handle_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, zx_handle_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, collectionToken );
     }
@@ -13880,19 +11141,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType           = StructureType::eBufferCollectionCreateInfoFUCHSIA;
-    const void *  pNext           = {};
-    zx_handle_t   collectionToken = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eBufferCollectionCreateInfoFUCHSIA;
+    const void *                        pNext           = {};
+    zx_handle_t                         collectionToken = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCollectionCreateInfoFUCHSIA>
-  {
-    using Type = BufferCollectionCreateInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCollectionCreateInfoFUCHSIA>
   {
@@ -13901,8 +11154,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferCollectionImageCreateInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionImageCreateInfoFUCHSIA.html
   struct BufferCollectionImageCreateInfoFUCHSIA
   {
     using NativeType = VkBufferCollectionImageCreateInfoFUCHSIA;
@@ -13910,13 +11161,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCollectionImageCreateInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCollectionImageCreateInfoFUCHSIA( BufferCollectionFUCHSIA collection_ = {},
-                                                                 uint32_t                index_      = {},
-                                                                 const void *            pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , collection{ collection_ }
-      , index{ index_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCollectionImageCreateInfoFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ = {},
+                                                                 uint32_t                                      index_      = {},
+                                                                 const void *                                  pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , collection( collection_ )
+      , index( index_ )
     {
     }
 
@@ -13928,22 +11179,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCollectionImageCreateInfoFUCHSIA & operator=( BufferCollectionImageCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCollectionImageCreateInfoFUCHSIA & operator=( VkBufferCollectionImageCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCollectionImageCreateInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCollectionImageCreateInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCollectionImageCreateInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCollectionImageCreateInfoFUCHSIA & setCollection( BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCollectionImageCreateInfoFUCHSIA &
+      setCollection( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
     {
       collection = collection_;
       return *this;
@@ -13954,7 +11206,7 @@ namespace VULKAN_HPP_NAMESPACE
       index = index_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCollectionImageCreateInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -13966,18 +11218,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCollectionImageCreateInfoFUCHSIA *>( this );
     }
 
-    operator VkBufferCollectionImageCreateInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCollectionImageCreateInfoFUCHSIA *>( this );
-    }
-
-    operator VkBufferCollectionImageCreateInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCollectionImageCreateInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, BufferCollectionFUCHSIA const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, collection, index );
     }
@@ -14002,20 +11249,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType           sType      = StructureType::eBufferCollectionImageCreateInfoFUCHSIA;
-    const void *            pNext      = {};
-    BufferCollectionFUCHSIA collection = {};
-    uint32_t                index      = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType      = StructureType::eBufferCollectionImageCreateInfoFUCHSIA;
+    const void *                                  pNext      = {};
+    VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection = {};
+    uint32_t                                      index      = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCollectionImageCreateInfoFUCHSIA>
-  {
-    using Type = BufferCollectionImageCreateInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCollectionImageCreateInfoFUCHSIA>
   {
@@ -14024,7 +11263,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkSysmemColorSpaceFUCHSIA, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSysmemColorSpaceFUCHSIA.html
   struct SysmemColorSpaceFUCHSIA
   {
     using NativeType = VkSysmemColorSpaceFUCHSIA;
@@ -14032,10 +11270,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSysmemColorSpaceFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SysmemColorSpaceFUCHSIA( uint32_t colorSpace_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorSpace{ colorSpace_ }
+      : pNext( pNext_ )
+      , colorSpace( colorSpace_ )
     {
     }
 
@@ -14047,15 +11285,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SysmemColorSpaceFUCHSIA & operator=( SysmemColorSpaceFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SysmemColorSpaceFUCHSIA & operator=( VkSysmemColorSpaceFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SysmemColorSpaceFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SysmemColorSpaceFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -14067,7 +11305,7 @@ namespace VULKAN_HPP_NAMESPACE
       colorSpace = colorSpace_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSysmemColorSpaceFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14079,18 +11317,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSysmemColorSpaceFUCHSIA *>( this );
     }
 
-    operator VkSysmemColorSpaceFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSysmemColorSpaceFUCHSIA *>( this );
-    }
-
-    operator VkSysmemColorSpaceFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSysmemColorSpaceFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorSpace );
     }
@@ -14115,19 +11348,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType      = StructureType::eSysmemColorSpaceFUCHSIA;
-    const void *  pNext      = {};
-    uint32_t      colorSpace = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eSysmemColorSpaceFUCHSIA;
+    const void *                        pNext      = {};
+    uint32_t                            colorSpace = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSysmemColorSpaceFUCHSIA>
-  {
-    using Type = SysmemColorSpaceFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSysmemColorSpaceFUCHSIA>
   {
@@ -14136,8 +11361,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferCollectionPropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCollectionPropertiesFUCHSIA.html
   struct BufferCollectionPropertiesFUCHSIA
   {
     using NativeType = VkBufferCollectionPropertiesFUCHSIA;
@@ -14145,31 +11368,32 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCollectionPropertiesFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCollectionPropertiesFUCHSIA( uint32_t                    memoryTypeBits_                   = {},
-                                                            uint32_t                    bufferCount_                      = {},
-                                                            uint32_t                    createInfoIndex_                  = {},
-                                                            uint64_t                    sysmemPixelFormat_                = {},
-                                                            FormatFeatureFlags          formatFeatures_                   = {},
-                                                            SysmemColorSpaceFUCHSIA     sysmemColorSpaceIndex_            = {},
-                                                            ComponentMapping            samplerYcbcrConversionComponents_ = {},
-                                                            SamplerYcbcrModelConversion suggestedYcbcrModel_    = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                            SamplerYcbcrRange           suggestedYcbcrRange_    = SamplerYcbcrRange::eItuFull,
-                                                            ChromaLocation              suggestedXChromaOffset_ = ChromaLocation::eCositedEven,
-                                                            ChromaLocation              suggestedYChromaOffset_ = ChromaLocation::eCositedEven,
-                                                            void *                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
-      , bufferCount{ bufferCount_ }
-      , createInfoIndex{ createInfoIndex_ }
-      , sysmemPixelFormat{ sysmemPixelFormat_ }
-      , formatFeatures{ formatFeatures_ }
-      , sysmemColorSpaceIndex{ sysmemColorSpaceIndex_ }
-      , samplerYcbcrConversionComponents{ samplerYcbcrConversionComponents_ }
-      , suggestedYcbcrModel{ suggestedYcbcrModel_ }
-      , suggestedYcbcrRange{ suggestedYcbcrRange_ }
-      , suggestedXChromaOffset{ suggestedXChromaOffset_ }
-      , suggestedYChromaOffset{ suggestedYChromaOffset_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCollectionPropertiesFUCHSIA(
+      uint32_t                                          memoryTypeBits_                   = {},
+      uint32_t                                          bufferCount_                      = {},
+      uint32_t                                          createInfoIndex_                  = {},
+      uint64_t                                          sysmemPixelFormat_                = {},
+      VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures_                   = {},
+      VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA     sysmemColorSpaceIndex_            = {},
+      VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents_ = {},
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      void *                                            pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryTypeBits( memoryTypeBits_ )
+      , bufferCount( bufferCount_ )
+      , createInfoIndex( createInfoIndex_ )
+      , sysmemPixelFormat( sysmemPixelFormat_ )
+      , formatFeatures( formatFeatures_ )
+      , sysmemColorSpaceIndex( sysmemColorSpaceIndex_ )
+      , samplerYcbcrConversionComponents( samplerYcbcrConversionComponents_ )
+      , suggestedYcbcrModel( suggestedYcbcrModel_ )
+      , suggestedYcbcrRange( suggestedYcbcrRange_ )
+      , suggestedXChromaOffset( suggestedXChromaOffset_ )
+      , suggestedYChromaOffset( suggestedYChromaOffset_ )
     {
     }
 
@@ -14181,11 +11405,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferCollectionPropertiesFUCHSIA & operator=( BufferCollectionPropertiesFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCollectionPropertiesFUCHSIA & operator=( VkBufferCollectionPropertiesFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCollectionPropertiesFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCollectionPropertiesFUCHSIA const *>( &rhs );
       return *this;
     }
 
@@ -14199,30 +11423,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( this );
     }
 
-    operator VkBufferCollectionPropertiesFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCollectionPropertiesFUCHSIA *>( this );
-    }
-
-    operator VkBufferCollectionPropertiesFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCollectionPropertiesFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint64_t const &,
-               FormatFeatureFlags const &,
-               SysmemColorSpaceFUCHSIA const &,
-               ComponentMapping const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ChromaLocation const &,
-               ChromaLocation const &>
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrRange const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -14264,29 +11482,21 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType                            = StructureType::eBufferCollectionPropertiesFUCHSIA;
-    void *                      pNext                            = {};
-    uint32_t                    memoryTypeBits                   = {};
-    uint32_t                    bufferCount                      = {};
-    uint32_t                    createInfoIndex                  = {};
-    uint64_t                    sysmemPixelFormat                = {};
-    FormatFeatureFlags          formatFeatures                   = {};
-    SysmemColorSpaceFUCHSIA     sysmemColorSpaceIndex            = {};
-    ComponentMapping            samplerYcbcrConversionComponents = {};
-    SamplerYcbcrModelConversion suggestedYcbcrModel              = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           suggestedYcbcrRange              = SamplerYcbcrRange::eItuFull;
-    ChromaLocation              suggestedXChromaOffset           = ChromaLocation::eCositedEven;
-    ChromaLocation              suggestedYChromaOffset           = ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::StructureType               sType                            = StructureType::eBufferCollectionPropertiesFUCHSIA;
+    void *                                            pNext                            = {};
+    uint32_t                                          memoryTypeBits                   = {};
+    uint32_t                                          bufferCount                      = {};
+    uint32_t                                          createInfoIndex                  = {};
+    uint64_t                                          sysmemPixelFormat                = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures                   = {};
+    VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA     sysmemColorSpaceIndex            = {};
+    VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents = {};
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCollectionPropertiesFUCHSIA>
-  {
-    using Type = BufferCollectionPropertiesFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCollectionPropertiesFUCHSIA>
   {
@@ -14294,7 +11504,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkBufferCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCreateInfo.html
   struct BufferCreateInfo
   {
     using NativeType = VkBufferCreateInfo;
@@ -14302,21 +11511,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCreateInfo( BufferCreateFlags flags_                 = {},
-                                           DeviceSize        size_                  = {},
-                                           BufferUsageFlags  usage_                 = {},
-                                           SharingMode       sharingMode_           = SharingMode::eExclusive,
-                                           uint32_t          queueFamilyIndexCount_ = {},
-                                           const uint32_t *  pQueueFamilyIndices_   = {},
-                                           const void *      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , size{ size_ }
-      , usage{ usage_ }
-      , sharingMode{ sharingMode_ }
-      , queueFamilyIndexCount{ queueFamilyIndexCount_ }
-      , pQueueFamilyIndices{ pQueueFamilyIndices_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCreateInfo( VULKAN_HPP_NAMESPACE::BufferCreateFlags flags_                 = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceSize        size_                  = {},
+                                           VULKAN_HPP_NAMESPACE::BufferUsageFlags  usage_                 = {},
+                                           VULKAN_HPP_NAMESPACE::SharingMode       sharingMode_           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive,
+                                           uint32_t                                queueFamilyIndexCount_ = {},
+                                           const uint32_t *                        pQueueFamilyIndices_   = {},
+                                           const void *                            pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , size( size_ )
+      , usage( usage_ )
+      , sharingMode( sharingMode_ )
+      , queueFamilyIndexCount( queueFamilyIndexCount_ )
+      , pQueueFamilyIndices( pQueueFamilyIndices_ )
     {
     }
 
@@ -14325,12 +11534,12 @@ namespace VULKAN_HPP_NAMESPACE
     BufferCreateInfo( VkBufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : BufferCreateInfo( *reinterpret_cast<BufferCreateInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BufferCreateInfo( BufferCreateFlags                               flags_,
-                      DeviceSize                                      size_,
-                      BufferUsageFlags                                usage_,
-                      SharingMode                                     sharingMode_,
-                      ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
-                      const void *                                    pNext_ = nullptr )
+    BufferCreateInfo( VULKAN_HPP_NAMESPACE::BufferCreateFlags                               flags_,
+                      VULKAN_HPP_NAMESPACE::DeviceSize                                      size_,
+                      VULKAN_HPP_NAMESPACE::BufferUsageFlags                                usage_,
+                      VULKAN_HPP_NAMESPACE::SharingMode                                     sharingMode_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
+                      const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , size( size_ )
@@ -14343,40 +11552,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     BufferCreateInfo & operator=( BufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCreateInfo & operator=( VkBufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setFlags( BufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::BufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setUsage( BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setUsage( VULKAN_HPP_NAMESPACE::BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setSharingMode( SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCreateInfo & setSharingMode( VULKAN_HPP_NAMESPACE::SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
     {
       sharingMode = sharingMode_;
       return *this;
@@ -14395,14 +11604,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    BufferCreateInfo & setQueueFamilyIndices( ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
+    BufferCreateInfo & setQueueFamilyIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       queueFamilyIndexCount = static_cast<uint32_t>( queueFamilyIndices_.size() );
       pQueueFamilyIndices   = queueFamilyIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14414,25 +11623,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCreateInfo *>( this );
     }
 
-    operator VkBufferCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCreateInfo *>( this );
-    }
-
-    operator VkBufferCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               BufferCreateFlags const &,
-               DeviceSize const &,
-               BufferUsageFlags const &,
-               SharingMode const &,
+               VULKAN_HPP_NAMESPACE::BufferCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::BufferUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::SharingMode const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, size, usage, sharingMode, queueFamilyIndexCount, pQueueFamilyIndices );
@@ -14459,24 +11662,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType     sType                 = StructureType::eBufferCreateInfo;
-    const void *      pNext                 = {};
-    BufferCreateFlags flags                 = {};
-    DeviceSize        size                  = {};
-    BufferUsageFlags  usage                 = {};
-    SharingMode       sharingMode           = SharingMode::eExclusive;
-    uint32_t          queueFamilyIndexCount = {};
-    const uint32_t *  pQueueFamilyIndices   = {};
+    VULKAN_HPP_NAMESPACE::StructureType     sType                 = StructureType::eBufferCreateInfo;
+    const void *                            pNext                 = {};
+    VULKAN_HPP_NAMESPACE::BufferCreateFlags flags                 = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize        size                  = {};
+    VULKAN_HPP_NAMESPACE::BufferUsageFlags  usage                 = {};
+    VULKAN_HPP_NAMESPACE::SharingMode       sharingMode           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive;
+    uint32_t                                queueFamilyIndexCount = {};
+    const uint32_t *                        pQueueFamilyIndices   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCreateInfo>
-  {
-    using Type = BufferCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCreateInfo>
   {
@@ -14484,7 +11679,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkBufferConstraintsInfoFUCHSIA, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferConstraintsInfoFUCHSIA.html
   struct BufferConstraintsInfoFUCHSIA
   {
     using NativeType = VkBufferConstraintsInfoFUCHSIA;
@@ -14492,15 +11686,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferConstraintsInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferConstraintsInfoFUCHSIA( BufferCreateInfo                       createInfo_                  = {},
-                                                       FormatFeatureFlags                     requiredFormatFeatures_      = {},
-                                                       BufferCollectionConstraintsInfoFUCHSIA bufferCollectionConstraints_ = {},
-                                                       const void *                           pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , createInfo{ createInfo_ }
-      , requiredFormatFeatures{ requiredFormatFeatures_ }
-      , bufferCollectionConstraints{ bufferCollectionConstraints_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferConstraintsInfoFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCreateInfo                       createInfo_                  = {},
+                                                       VULKAN_HPP_NAMESPACE::FormatFeatureFlags                     requiredFormatFeatures_      = {},
+                                                       VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA bufferCollectionConstraints_ = {},
+                                                       const void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , createInfo( createInfo_ )
+      , requiredFormatFeatures( requiredFormatFeatures_ )
+      , bufferCollectionConstraints( bufferCollectionConstraints_ )
     {
     }
 
@@ -14512,40 +11706,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferConstraintsInfoFUCHSIA & operator=( BufferConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferConstraintsInfoFUCHSIA & operator=( VkBufferConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferConstraintsInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferConstraintsInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA & setCreateInfo( BufferCreateInfo const & createInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA & setCreateInfo( VULKAN_HPP_NAMESPACE::BufferCreateInfo const & createInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       createInfo = createInfo_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA & setRequiredFormatFeatures( FormatFeatureFlags requiredFormatFeatures_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA &
+      setRequiredFormatFeatures( VULKAN_HPP_NAMESPACE::FormatFeatureFlags requiredFormatFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       requiredFormatFeatures = requiredFormatFeatures_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 BufferConstraintsInfoFUCHSIA &
-      setBufferCollectionConstraints( BufferCollectionConstraintsInfoFUCHSIA const & bufferCollectionConstraints_ ) VULKAN_HPP_NOEXCEPT
+      setBufferCollectionConstraints( VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA const & bufferCollectionConstraints_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferCollectionConstraints = bufferCollectionConstraints_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferConstraintsInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14557,19 +11752,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferConstraintsInfoFUCHSIA *>( this );
     }
 
-    operator VkBufferConstraintsInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferConstraintsInfoFUCHSIA *>( this );
-    }
-
-    operator VkBufferConstraintsInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferConstraintsInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, BufferCreateInfo const &, FormatFeatureFlags const &, BufferCollectionConstraintsInfoFUCHSIA const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::BufferCreateInfo const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, createInfo, requiredFormatFeatures, bufferCollectionConstraints );
@@ -14596,21 +11788,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                          sType                       = StructureType::eBufferConstraintsInfoFUCHSIA;
-    const void *                           pNext                       = {};
-    BufferCreateInfo                       createInfo                  = {};
-    FormatFeatureFlags                     requiredFormatFeatures      = {};
-    BufferCollectionConstraintsInfoFUCHSIA bufferCollectionConstraints = {};
+    VULKAN_HPP_NAMESPACE::StructureType                          sType                       = StructureType::eBufferConstraintsInfoFUCHSIA;
+    const void *                                                 pNext                       = {};
+    VULKAN_HPP_NAMESPACE::BufferCreateInfo                       createInfo                  = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags                     requiredFormatFeatures      = {};
+    VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA bufferCollectionConstraints = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferConstraintsInfoFUCHSIA>
-  {
-    using Type = BufferConstraintsInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferConstraintsInfoFUCHSIA>
   {
@@ -14618,16 +11802,17 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkBufferCopy, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCopy.html
   struct BufferCopy
   {
     using NativeType = VkBufferCopy;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferCopy( DeviceSize srcOffset_ = {}, DeviceSize dstOffset_ = {}, DeviceSize size_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcOffset{ srcOffset_ }
-      , dstOffset{ dstOffset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCopy( VULKAN_HPP_NAMESPACE::DeviceSize srcOffset_ = {},
+                                     VULKAN_HPP_NAMESPACE::DeviceSize dstOffset_ = {},
+                                     VULKAN_HPP_NAMESPACE::DeviceSize size_      = {} ) VULKAN_HPP_NOEXCEPT
+      : srcOffset( srcOffset_ )
+      , dstOffset( dstOffset_ )
+      , size( size_ )
     {
     }
 
@@ -14636,33 +11821,33 @@ namespace VULKAN_HPP_NAMESPACE
     BufferCopy( VkBufferCopy const & rhs ) VULKAN_HPP_NOEXCEPT : BufferCopy( *reinterpret_cast<BufferCopy const *>( &rhs ) ) {}
 
     BufferCopy & operator=( BufferCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCopy & operator=( VkBufferCopy const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCopy const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCopy const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setSrcOffset( DeviceSize srcOffset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setSrcOffset( VULKAN_HPP_NAMESPACE::DeviceSize srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setDstOffset( DeviceSize dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setDstOffset( VULKAN_HPP_NAMESPACE::DeviceSize dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCopy const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14674,18 +11859,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCopy *>( this );
     }
 
-    operator VkBufferCopy const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCopy *>( this );
-    }
-
-    operator VkBufferCopy *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCopy *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcOffset, dstOffset, size );
     }
@@ -14710,20 +11890,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize srcOffset = {};
-    DeviceSize dstOffset = {};
-    DeviceSize size      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize srcOffset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize dstOffset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize size      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCopy>
-  {
-    using Type = BufferCopy;
-  };
-#endif
-
-  // wrapper struct for struct VkBufferCopy2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferCopy2.html
   struct BufferCopy2
   {
     using NativeType = VkBufferCopy2;
@@ -14731,13 +11902,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferCopy2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      BufferCopy2( DeviceSize srcOffset_ = {}, DeviceSize dstOffset_ = {}, DeviceSize size_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcOffset{ srcOffset_ }
-      , dstOffset{ dstOffset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferCopy2( VULKAN_HPP_NAMESPACE::DeviceSize srcOffset_ = {},
+                                      VULKAN_HPP_NAMESPACE::DeviceSize dstOffset_ = {},
+                                      VULKAN_HPP_NAMESPACE::DeviceSize size_      = {},
+                                      const void *                     pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcOffset( srcOffset_ )
+      , dstOffset( dstOffset_ )
+      , size( size_ )
     {
     }
 
@@ -14746,39 +11919,39 @@ namespace VULKAN_HPP_NAMESPACE
     BufferCopy2( VkBufferCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT : BufferCopy2( *reinterpret_cast<BufferCopy2 const *>( &rhs ) ) {}
 
     BufferCopy2 & operator=( BufferCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferCopy2 & operator=( VkBufferCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferCopy2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferCopy2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setSrcOffset( DeviceSize srcOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setSrcOffset( VULKAN_HPP_NAMESPACE::DeviceSize srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setDstOffset( DeviceSize dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setDstOffset( VULKAN_HPP_NAMESPACE::DeviceSize dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferCopy2 & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferCopy2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14790,18 +11963,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferCopy2 *>( this );
     }
 
-    operator VkBufferCopy2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferCopy2 *>( this );
-    }
-
-    operator VkBufferCopy2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferCopy2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceSize const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcOffset, dstOffset, size );
     }
@@ -14826,21 +11998,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eBufferCopy2;
-    const void *  pNext     = {};
-    DeviceSize    srcOffset = {};
-    DeviceSize    dstOffset = {};
-    DeviceSize    size      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eBufferCopy2;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    srcOffset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    dstOffset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferCopy2>
-  {
-    using Type = BufferCopy2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferCopy2>
   {
@@ -14849,8 +12013,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BufferCopy2KHR = BufferCopy2;
 
-  // wrapper struct for struct VkBufferDeviceAddressCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferDeviceAddressCreateInfoEXT.html
   struct BufferDeviceAddressCreateInfoEXT
   {
     using NativeType = VkBufferDeviceAddressCreateInfoEXT;
@@ -14858,10 +12020,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferDeviceAddressCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferDeviceAddressCreateInfoEXT( DeviceAddress deviceAddress_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceAddress{ deviceAddress_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferDeviceAddressCreateInfoEXT( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {},
+                                                           const void *                        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceAddress( deviceAddress_ )
     {
     }
 
@@ -14873,27 +12036,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferDeviceAddressCreateInfoEXT & operator=( BufferDeviceAddressCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferDeviceAddressCreateInfoEXT & operator=( VkBufferDeviceAddressCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferDeviceAddressCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferDeviceAddressCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressCreateInfoEXT & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressCreateInfoEXT & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferDeviceAddressCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -14905,18 +12068,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferDeviceAddressCreateInfoEXT *>( this );
     }
 
-    operator VkBufferDeviceAddressCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferDeviceAddressCreateInfoEXT *>( this );
-    }
-
-    operator VkBufferDeviceAddressCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferDeviceAddressCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceAddress const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceAddress );
     }
@@ -14941,26 +12099,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eBufferDeviceAddressCreateInfoEXT;
-    const void *  pNext         = {};
-    DeviceAddress deviceAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eBufferDeviceAddressCreateInfoEXT;
+    const void *                        pNext         = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferDeviceAddressCreateInfoEXT>
-  {
-    using Type = BufferDeviceAddressCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferDeviceAddressCreateInfoEXT>
   {
     using Type = BufferDeviceAddressCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkBufferDeviceAddressInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferDeviceAddressInfo.html
   struct BufferDeviceAddressInfo
   {
     using NativeType = VkBufferDeviceAddressInfo;
@@ -14968,10 +12117,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferDeviceAddressInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferDeviceAddressInfo( Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferDeviceAddressInfo( VULKAN_HPP_NAMESPACE::Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -14983,27 +12132,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferDeviceAddressInfo & operator=( BufferDeviceAddressInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferDeviceAddressInfo & operator=( VkBufferDeviceAddressInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferDeviceAddressInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferDeviceAddressInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferDeviceAddressInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferDeviceAddressInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15015,18 +12164,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferDeviceAddressInfo *>( this );
     }
 
-    operator VkBufferDeviceAddressInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferDeviceAddressInfo *>( this );
-    }
-
-    operator VkBufferDeviceAddressInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferDeviceAddressInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -15051,19 +12195,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eBufferDeviceAddressInfo;
-    const void *  pNext  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eBufferDeviceAddressInfo;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferDeviceAddressInfo>
-  {
-    using Type = BufferDeviceAddressInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferDeviceAddressInfo>
   {
@@ -15073,24 +12209,23 @@ namespace VULKAN_HPP_NAMESPACE
   using BufferDeviceAddressInfoEXT = BufferDeviceAddressInfo;
   using BufferDeviceAddressInfoKHR = BufferDeviceAddressInfo;
 
-  // wrapper struct for struct VkBufferImageCopy, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferImageCopy.html
   struct BufferImageCopy
   {
     using NativeType = VkBufferImageCopy;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferImageCopy( DeviceSize             bufferOffset_      = {},
-                                          uint32_t               bufferRowLength_   = {},
-                                          uint32_t               bufferImageHeight_ = {},
-                                          ImageSubresourceLayers imageSubresource_  = {},
-                                          Offset3D               imageOffset_       = {},
-                                          Extent3D               imageExtent_       = {} ) VULKAN_HPP_NOEXCEPT
-      : bufferOffset{ bufferOffset_ }
-      , bufferRowLength{ bufferRowLength_ }
-      , bufferImageHeight{ bufferImageHeight_ }
-      , imageSubresource{ imageSubresource_ }
-      , imageOffset{ imageOffset_ }
-      , imageExtent{ imageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferImageCopy( VULKAN_HPP_NAMESPACE::DeviceSize             bufferOffset_      = {},
+                                          uint32_t                                     bufferRowLength_   = {},
+                                          uint32_t                                     bufferImageHeight_ = {},
+                                          VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource_  = {},
+                                          VULKAN_HPP_NAMESPACE::Offset3D               imageOffset_       = {},
+                                          VULKAN_HPP_NAMESPACE::Extent3D               imageExtent_       = {} ) VULKAN_HPP_NOEXCEPT
+      : bufferOffset( bufferOffset_ )
+      , bufferRowLength( bufferRowLength_ )
+      , bufferImageHeight( bufferImageHeight_ )
+      , imageSubresource( imageSubresource_ )
+      , imageOffset( imageOffset_ )
+      , imageExtent( imageExtent_ )
     {
     }
 
@@ -15099,16 +12234,16 @@ namespace VULKAN_HPP_NAMESPACE
     BufferImageCopy( VkBufferImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT : BufferImageCopy( *reinterpret_cast<BufferImageCopy const *>( &rhs ) ) {}
 
     BufferImageCopy & operator=( BufferImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferImageCopy & operator=( VkBufferImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferImageCopy const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferImageCopy const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setBufferOffset( DeviceSize bufferOffset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setBufferOffset( VULKAN_HPP_NAMESPACE::DeviceSize bufferOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferOffset = bufferOffset_;
       return *this;
@@ -15126,24 +12261,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageSubresource( ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageOffset( Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageOffset( VULKAN_HPP_NAMESPACE::Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOffset = imageOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageExtent( Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy & setImageExtent( VULKAN_HPP_NAMESPACE::Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferImageCopy const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15155,18 +12290,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferImageCopy *>( this );
     }
 
-    operator VkBufferImageCopy const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferImageCopy *>( this );
-    }
-
-    operator VkBufferImageCopy *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferImageCopy *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, uint32_t const &, uint32_t const &, ImageSubresourceLayers const &, Offset3D const &, Extent3D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( bufferOffset, bufferRowLength, bufferImageHeight, imageSubresource, imageOffset, imageExtent );
@@ -15193,23 +12327,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize             bufferOffset      = {};
-    uint32_t               bufferRowLength   = {};
-    uint32_t               bufferImageHeight = {};
-    ImageSubresourceLayers imageSubresource  = {};
-    Offset3D               imageOffset       = {};
-    Extent3D               imageExtent       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize             bufferOffset      = {};
+    uint32_t                                     bufferRowLength   = {};
+    uint32_t                                     bufferImageHeight = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               imageOffset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageExtent       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferImageCopy>
-  {
-    using Type = BufferImageCopy;
-  };
-#endif
-
-  // wrapper struct for struct VkBufferImageCopy2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferImageCopy2.html
   struct BufferImageCopy2
   {
     using NativeType = VkBufferImageCopy2;
@@ -15217,21 +12342,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferImageCopy2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferImageCopy2( DeviceSize             bufferOffset_      = {},
-                                           uint32_t               bufferRowLength_   = {},
-                                           uint32_t               bufferImageHeight_ = {},
-                                           ImageSubresourceLayers imageSubresource_  = {},
-                                           Offset3D               imageOffset_       = {},
-                                           Extent3D               imageExtent_       = {},
-                                           const void *           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , bufferOffset{ bufferOffset_ }
-      , bufferRowLength{ bufferRowLength_ }
-      , bufferImageHeight{ bufferImageHeight_ }
-      , imageSubresource{ imageSubresource_ }
-      , imageOffset{ imageOffset_ }
-      , imageExtent{ imageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferImageCopy2( VULKAN_HPP_NAMESPACE::DeviceSize             bufferOffset_      = {},
+                                           uint32_t                                     bufferRowLength_   = {},
+                                           uint32_t                                     bufferImageHeight_ = {},
+                                           VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource_  = {},
+                                           VULKAN_HPP_NAMESPACE::Offset3D               imageOffset_       = {},
+                                           VULKAN_HPP_NAMESPACE::Extent3D               imageExtent_       = {},
+                                           const void *                                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , bufferOffset( bufferOffset_ )
+      , bufferRowLength( bufferRowLength_ )
+      , bufferImageHeight( bufferImageHeight_ )
+      , imageSubresource( imageSubresource_ )
+      , imageOffset( imageOffset_ )
+      , imageExtent( imageExtent_ )
     {
     }
 
@@ -15240,22 +12365,22 @@ namespace VULKAN_HPP_NAMESPACE
     BufferImageCopy2( VkBufferImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT : BufferImageCopy2( *reinterpret_cast<BufferImageCopy2 const *>( &rhs ) ) {}
 
     BufferImageCopy2 & operator=( BufferImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferImageCopy2 & operator=( VkBufferImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferImageCopy2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferImageCopy2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setBufferOffset( DeviceSize bufferOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setBufferOffset( VULKAN_HPP_NAMESPACE::DeviceSize bufferOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferOffset = bufferOffset_;
       return *this;
@@ -15273,24 +12398,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageSubresource( ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageOffset( Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageOffset( VULKAN_HPP_NAMESPACE::Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOffset = imageOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageExtent( Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferImageCopy2 & setImageExtent( VULKAN_HPP_NAMESPACE::Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferImageCopy2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15302,25 +12427,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferImageCopy2 *>( this );
     }
 
-    operator VkBufferImageCopy2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferImageCopy2 *>( this );
-    }
-
-    operator VkBufferImageCopy2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferImageCopy2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               Extent3D const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, bufferOffset, bufferRowLength, bufferImageHeight, imageSubresource, imageOffset, imageExtent );
@@ -15348,24 +12467,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType             = StructureType::eBufferImageCopy2;
-    const void *           pNext             = {};
-    DeviceSize             bufferOffset      = {};
-    uint32_t               bufferRowLength   = {};
-    uint32_t               bufferImageHeight = {};
-    ImageSubresourceLayers imageSubresource  = {};
-    Offset3D               imageOffset       = {};
-    Extent3D               imageExtent       = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType             = StructureType::eBufferImageCopy2;
+    const void *                                 pNext             = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize             bufferOffset      = {};
+    uint32_t                                     bufferRowLength   = {};
+    uint32_t                                     bufferImageHeight = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               imageOffset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageExtent       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferImageCopy2>
-  {
-    using Type = BufferImageCopy2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferImageCopy2>
   {
@@ -15374,7 +12485,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BufferImageCopy2KHR = BufferImageCopy2;
 
-  // wrapper struct for struct VkBufferMemoryBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferMemoryBarrier.html
   struct BufferMemoryBarrier
   {
     using NativeType = VkBufferMemoryBarrier;
@@ -15382,23 +12492,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferMemoryBarrier;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferMemoryBarrier( AccessFlags  srcAccessMask_       = {},
-                                              AccessFlags  dstAccessMask_       = {},
-                                              uint32_t     srcQueueFamilyIndex_ = {},
-                                              uint32_t     dstQueueFamilyIndex_ = {},
-                                              Buffer       buffer_              = {},
-                                              DeviceSize   offset_              = {},
-                                              DeviceSize   size_                = {},
-                                              const void * pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , srcQueueFamilyIndex{ srcQueueFamilyIndex_ }
-      , dstQueueFamilyIndex{ dstQueueFamilyIndex_ }
-      , buffer{ buffer_ }
-      , offset{ offset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferMemoryBarrier( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_       = {},
+                                              VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_       = {},
+                                              uint32_t                          srcQueueFamilyIndex_ = {},
+                                              uint32_t                          dstQueueFamilyIndex_ = {},
+                                              VULKAN_HPP_NAMESPACE::Buffer      buffer_              = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize  offset_              = {},
+                                              VULKAN_HPP_NAMESPACE::DeviceSize  size_                = {},
+                                              const void *                      pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , srcQueueFamilyIndex( srcQueueFamilyIndex_ )
+      , dstQueueFamilyIndex( dstQueueFamilyIndex_ )
+      , buffer( buffer_ )
+      , offset( offset_ )
+      , size( size_ )
     {
     }
 
@@ -15409,28 +12519,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferMemoryBarrier & operator=( BufferMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferMemoryBarrier & operator=( VkBufferMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferMemoryBarrier const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferMemoryBarrier const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setSrcAccessMask( AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setDstAccessMask( AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
@@ -15448,24 +12558,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferMemoryBarrier const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15477,26 +12587,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferMemoryBarrier *>( this );
     }
 
-    operator VkBufferMemoryBarrier const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferMemoryBarrier *>( this );
-    }
-
-    operator VkBufferMemoryBarrier *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferMemoryBarrier *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccessFlags const &,
-               AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
                uint32_t const &,
                uint32_t const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcAccessMask, dstAccessMask, srcQueueFamilyIndex, dstQueueFamilyIndex, buffer, offset, size );
@@ -15524,32 +12628,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eBufferMemoryBarrier;
-    const void *  pNext               = {};
-    AccessFlags   srcAccessMask       = {};
-    AccessFlags   dstAccessMask       = {};
-    uint32_t      srcQueueFamilyIndex = {};
-    uint32_t      dstQueueFamilyIndex = {};
-    Buffer        buffer              = {};
-    DeviceSize    offset              = {};
-    DeviceSize    size                = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eBufferMemoryBarrier;
+    const void *                        pNext               = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags   srcAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags   dstAccessMask       = {};
+    uint32_t                            srcQueueFamilyIndex = {};
+    uint32_t                            dstQueueFamilyIndex = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    offset              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size                = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferMemoryBarrier>
-  {
-    using Type = BufferMemoryBarrier;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferMemoryBarrier>
   {
     using Type = BufferMemoryBarrier;
   };
 
-  // wrapper struct for struct VkBufferMemoryBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferMemoryBarrier2.html
   struct BufferMemoryBarrier2
   {
     using NativeType = VkBufferMemoryBarrier2;
@@ -15557,27 +12652,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferMemoryBarrier2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferMemoryBarrier2( PipelineStageFlags2 srcStageMask_        = {},
-                                               AccessFlags2        srcAccessMask_       = {},
-                                               PipelineStageFlags2 dstStageMask_        = {},
-                                               AccessFlags2        dstAccessMask_       = {},
-                                               uint32_t            srcQueueFamilyIndex_ = {},
-                                               uint32_t            dstQueueFamilyIndex_ = {},
-                                               Buffer              buffer_              = {},
-                                               DeviceSize          offset_              = {},
-                                               DeviceSize          size_                = {},
-                                               const void *        pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcStageMask{ srcStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , srcQueueFamilyIndex{ srcQueueFamilyIndex_ }
-      , dstQueueFamilyIndex{ dstQueueFamilyIndex_ }
-      , buffer{ buffer_ }
-      , offset{ offset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferMemoryBarrier2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask_        = {},
+                                               VULKAN_HPP_NAMESPACE::AccessFlags2        srcAccessMask_       = {},
+                                               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask_        = {},
+                                               VULKAN_HPP_NAMESPACE::AccessFlags2        dstAccessMask_       = {},
+                                               uint32_t                                  srcQueueFamilyIndex_ = {},
+                                               uint32_t                                  dstQueueFamilyIndex_ = {},
+                                               VULKAN_HPP_NAMESPACE::Buffer              buffer_              = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize          offset_              = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize          size_                = {},
+                                               const void *                              pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcStageMask( srcStageMask_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstStageMask( dstStageMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , srcQueueFamilyIndex( srcQueueFamilyIndex_ )
+      , dstQueueFamilyIndex( dstQueueFamilyIndex_ )
+      , buffer( buffer_ )
+      , offset( offset_ )
+      , size( size_ )
     {
     }
 
@@ -15589,40 +12684,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferMemoryBarrier2 & operator=( BufferMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferMemoryBarrier2 & operator=( VkBufferMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferMemoryBarrier2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSrcStageMask( PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSrcStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcStageMask = srcStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSrcAccessMask( AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setDstStageMask( PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setDstStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstStageMask = dstStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setDstAccessMask( AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
@@ -15640,24 +12735,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryBarrier2 & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferMemoryBarrier2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15669,28 +12764,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferMemoryBarrier2 *>( this );
     }
 
-    operator VkBufferMemoryBarrier2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferMemoryBarrier2 *>( this );
-    }
-
-    operator VkBufferMemoryBarrier2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferMemoryBarrier2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &,
                uint32_t const &,
                uint32_t const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcStageMask, srcAccessMask, dstStageMask, dstAccessMask, srcQueueFamilyIndex, dstQueueFamilyIndex, buffer, offset, size );
@@ -15718,27 +12807,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType               = StructureType::eBufferMemoryBarrier2;
-    const void *        pNext               = {};
-    PipelineStageFlags2 srcStageMask        = {};
-    AccessFlags2        srcAccessMask       = {};
-    PipelineStageFlags2 dstStageMask        = {};
-    AccessFlags2        dstAccessMask       = {};
-    uint32_t            srcQueueFamilyIndex = {};
-    uint32_t            dstQueueFamilyIndex = {};
-    Buffer              buffer              = {};
-    DeviceSize          offset              = {};
-    DeviceSize          size                = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType               = StructureType::eBufferMemoryBarrier2;
+    const void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask        = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2        srcAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask        = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2        dstAccessMask       = {};
+    uint32_t                                  srcQueueFamilyIndex = {};
+    uint32_t                                  dstQueueFamilyIndex = {};
+    VULKAN_HPP_NAMESPACE::Buffer              buffer              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize          offset              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize          size                = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferMemoryBarrier2>
-  {
-    using Type = BufferMemoryBarrier2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferMemoryBarrier2>
   {
@@ -15747,8 +12828,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BufferMemoryBarrier2KHR = BufferMemoryBarrier2;
 
-  // wrapper struct for struct VkBufferMemoryRequirementsInfo2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferMemoryRequirementsInfo2.html
   struct BufferMemoryRequirementsInfo2
   {
     using NativeType = VkBufferMemoryRequirementsInfo2;
@@ -15756,10 +12835,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferMemoryRequirementsInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferMemoryRequirementsInfo2( Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferMemoryRequirementsInfo2( VULKAN_HPP_NAMESPACE::Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -15771,27 +12850,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferMemoryRequirementsInfo2 & operator=( BufferMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferMemoryRequirementsInfo2 & operator=( VkBufferMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferMemoryRequirementsInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferMemoryRequirementsInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferMemoryRequirementsInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferMemoryRequirementsInfo2 & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferMemoryRequirementsInfo2 & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferMemoryRequirementsInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15803,18 +12882,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferMemoryRequirementsInfo2 *>( this );
     }
 
-    operator VkBufferMemoryRequirementsInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferMemoryRequirementsInfo2 *>( this );
-    }
-
-    operator VkBufferMemoryRequirementsInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferMemoryRequirementsInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -15839,19 +12913,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eBufferMemoryRequirementsInfo2;
-    const void *  pNext  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eBufferMemoryRequirementsInfo2;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferMemoryRequirementsInfo2>
-  {
-    using Type = BufferMemoryRequirementsInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferMemoryRequirementsInfo2>
   {
@@ -15860,8 +12926,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BufferMemoryRequirementsInfo2KHR = BufferMemoryRequirementsInfo2;
 
-  // wrapper struct for struct VkBufferOpaqueCaptureAddressCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferOpaqueCaptureAddressCreateInfo.html
   struct BufferOpaqueCaptureAddressCreateInfo
   {
     using NativeType = VkBufferOpaqueCaptureAddressCreateInfo;
@@ -15869,10 +12933,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferOpaqueCaptureAddressCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR BufferOpaqueCaptureAddressCreateInfo( uint64_t opaqueCaptureAddress_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , opaqueCaptureAddress{ opaqueCaptureAddress_ }
+      : pNext( pNext_ )
+      , opaqueCaptureAddress( opaqueCaptureAddress_ )
     {
     }
 
@@ -15884,15 +12948,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferOpaqueCaptureAddressCreateInfo & operator=( BufferOpaqueCaptureAddressCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferOpaqueCaptureAddressCreateInfo & operator=( VkBufferOpaqueCaptureAddressCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferOpaqueCaptureAddressCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferOpaqueCaptureAddressCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferOpaqueCaptureAddressCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -15904,7 +12968,7 @@ namespace VULKAN_HPP_NAMESPACE
       opaqueCaptureAddress = opaqueCaptureAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferOpaqueCaptureAddressCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -15916,18 +12980,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferOpaqueCaptureAddressCreateInfo *>( this );
     }
 
-    operator VkBufferOpaqueCaptureAddressCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferOpaqueCaptureAddressCreateInfo *>( this );
-    }
-
-    operator VkBufferOpaqueCaptureAddressCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferOpaqueCaptureAddressCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, opaqueCaptureAddress );
     }
@@ -15952,19 +13011,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::eBufferOpaqueCaptureAddressCreateInfo;
-    const void *  pNext                = {};
-    uint64_t      opaqueCaptureAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eBufferOpaqueCaptureAddressCreateInfo;
+    const void *                        pNext                = {};
+    uint64_t                            opaqueCaptureAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferOpaqueCaptureAddressCreateInfo>
-  {
-    using Type = BufferOpaqueCaptureAddressCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferOpaqueCaptureAddressCreateInfo>
   {
@@ -15973,82 +13024,77 @@ namespace VULKAN_HPP_NAMESPACE
 
   using BufferOpaqueCaptureAddressCreateInfoKHR = BufferOpaqueCaptureAddressCreateInfo;
 
-  // wrapper struct for struct VkBufferUsageFlags2CreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferUsageFlags2CreateInfo.html
-  struct BufferUsageFlags2CreateInfo
+  struct BufferUsageFlags2CreateInfoKHR
   {
-    using NativeType = VkBufferUsageFlags2CreateInfo;
+    using NativeType = VkBufferUsageFlags2CreateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferUsageFlags2CreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferUsageFlags2CreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferUsageFlags2CreateInfo( BufferUsageFlags2 usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , usage{ usage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferUsageFlags2CreateInfoKHR( VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR usage_ = {},
+                                                         const void *                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , usage( usage_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR BufferUsageFlags2CreateInfo( BufferUsageFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR BufferUsageFlags2CreateInfoKHR( BufferUsageFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    BufferUsageFlags2CreateInfo( VkBufferUsageFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BufferUsageFlags2CreateInfo( *reinterpret_cast<BufferUsageFlags2CreateInfo const *>( &rhs ) )
+    BufferUsageFlags2CreateInfoKHR( VkBufferUsageFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : BufferUsageFlags2CreateInfoKHR( *reinterpret_cast<BufferUsageFlags2CreateInfoKHR const *>( &rhs ) )
     {
     }
 
-    BufferUsageFlags2CreateInfo & operator=( BufferUsageFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    BufferUsageFlags2CreateInfoKHR & operator=( BufferUsageFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    BufferUsageFlags2CreateInfo & operator=( VkBufferUsageFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    BufferUsageFlags2CreateInfoKHR & operator=( VkBufferUsageFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferUsageFlags2CreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferUsageFlags2CreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BufferUsageFlags2CreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 BufferUsageFlags2CreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferUsageFlags2CreateInfo & setUsage( BufferUsageFlags2 usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferUsageFlags2CreateInfoKHR & setUsage( VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkBufferUsageFlags2CreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkBufferUsageFlags2CreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkBufferUsageFlags2CreateInfo *>( this );
+      return *reinterpret_cast<const VkBufferUsageFlags2CreateInfoKHR *>( this );
     }
 
-    operator VkBufferUsageFlags2CreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkBufferUsageFlags2CreateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkBufferUsageFlags2CreateInfo *>( this );
-    }
-
-    operator VkBufferUsageFlags2CreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferUsageFlags2CreateInfo *>( this );
-    }
-
-    operator VkBufferUsageFlags2CreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferUsageFlags2CreateInfo *>( this );
+      return *reinterpret_cast<VkBufferUsageFlags2CreateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, BufferUsageFlags2 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, usage );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BufferUsageFlags2CreateInfo const & ) const = default;
+    auto operator<=>( BufferUsageFlags2CreateInfoKHR const & ) const = default;
 #else
-    bool operator==( BufferUsageFlags2CreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( BufferUsageFlags2CreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -16057,35 +13103,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( BufferUsageFlags2CreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( BufferUsageFlags2CreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType     sType = StructureType::eBufferUsageFlags2CreateInfo;
-    const void *      pNext = {};
-    BufferUsageFlags2 usage = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType = StructureType::eBufferUsageFlags2CreateInfoKHR;
+    const void *                               pNext = {};
+    VULKAN_HPP_NAMESPACE::BufferUsageFlags2KHR usage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferUsageFlags2CreateInfo>
-  {
-    using Type = BufferUsageFlags2CreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eBufferUsageFlags2CreateInfo>
+  struct CppType<StructureType, StructureType::eBufferUsageFlags2CreateInfoKHR>
   {
-    using Type = BufferUsageFlags2CreateInfo;
+    using Type = BufferUsageFlags2CreateInfoKHR;
   };
 
-  using BufferUsageFlags2CreateInfoKHR = BufferUsageFlags2CreateInfo;
-
-  // wrapper struct for struct VkBufferViewCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkBufferViewCreateInfo.html
   struct BufferViewCreateInfo
   {
     using NativeType = VkBufferViewCreateInfo;
@@ -16093,19 +13128,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBufferViewCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BufferViewCreateInfo( BufferViewCreateFlags flags_  = {},
-                                               Buffer                buffer_ = {},
-                                               Format                format_ = Format::eUndefined,
-                                               DeviceSize            offset_ = {},
-                                               DeviceSize            range_  = {},
-                                               const void *          pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , buffer{ buffer_ }
-      , format{ format_ }
-      , offset{ offset_ }
-      , range{ range_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR BufferViewCreateInfo( VULKAN_HPP_NAMESPACE::BufferViewCreateFlags flags_  = {},
+                                               VULKAN_HPP_NAMESPACE::Buffer                buffer_ = {},
+                                               VULKAN_HPP_NAMESPACE::Format                format_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                               VULKAN_HPP_NAMESPACE::DeviceSize            offset_ = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize            range_  = {},
+                                               const void *                                pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , buffer( buffer_ )
+      , format( format_ )
+      , offset( offset_ )
+      , range( range_ )
     {
     }
 
@@ -16117,51 +13152,51 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     BufferViewCreateInfo & operator=( BufferViewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     BufferViewCreateInfo & operator=( VkBufferViewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<BufferViewCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::BufferViewCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setFlags( BufferViewCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::BufferViewCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setRange( DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 BufferViewCreateInfo & setRange( VULKAN_HPP_NAMESPACE::DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
     {
       range = range_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkBufferViewCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -16173,19 +13208,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkBufferViewCreateInfo *>( this );
     }
 
-    operator VkBufferViewCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBufferViewCreateInfo *>( this );
-    }
-
-    operator VkBufferViewCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBufferViewCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, BufferViewCreateFlags const &, Buffer const &, Format const &, DeviceSize const &, DeviceSize const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::BufferViewCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, buffer, format, offset, range );
@@ -16212,576 +13246,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType  = StructureType::eBufferViewCreateInfo;
-    const void *          pNext  = {};
-    BufferViewCreateFlags flags  = {};
-    Buffer                buffer = {};
-    Format                format = Format::eUndefined;
-    DeviceSize            offset = {};
-    DeviceSize            range  = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType  = StructureType::eBufferViewCreateInfo;
+    const void *                                pNext  = {};
+    VULKAN_HPP_NAMESPACE::BufferViewCreateFlags flags  = {};
+    VULKAN_HPP_NAMESPACE::Buffer                buffer = {};
+    VULKAN_HPP_NAMESPACE::Format                format = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::DeviceSize            offset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize            range  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBufferViewCreateInfo>
-  {
-    using Type = BufferViewCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eBufferViewCreateInfo>
   {
     using Type = BufferViewCreateInfo;
   };
 
-  // wrapper struct for struct VkStridedDeviceAddressNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStridedDeviceAddressNV.html
-  struct StridedDeviceAddressNV
-  {
-    using NativeType = VkStridedDeviceAddressNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressNV( DeviceAddress startAddress_ = {}, DeviceSize strideInBytes_ = {} ) VULKAN_HPP_NOEXCEPT
-      : startAddress{ startAddress_ }
-      , strideInBytes{ strideInBytes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressNV( StridedDeviceAddressNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    StridedDeviceAddressNV( VkStridedDeviceAddressNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : StridedDeviceAddressNV( *reinterpret_cast<StridedDeviceAddressNV const *>( &rhs ) )
-    {
-    }
-
-    StridedDeviceAddressNV & operator=( StridedDeviceAddressNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    StridedDeviceAddressNV & operator=( VkStridedDeviceAddressNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<StridedDeviceAddressNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressNV & setStartAddress( DeviceAddress startAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      startAddress = startAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressNV & setStrideInBytes( DeviceSize strideInBytes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      strideInBytes = strideInBytes_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkStridedDeviceAddressNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkStridedDeviceAddressNV *>( this );
-    }
-
-    operator VkStridedDeviceAddressNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkStridedDeviceAddressNV *>( this );
-    }
-
-    operator VkStridedDeviceAddressNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkStridedDeviceAddressNV *>( this );
-    }
-
-    operator VkStridedDeviceAddressNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkStridedDeviceAddressNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( startAddress, strideInBytes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( StridedDeviceAddressNV const & ) const = default;
-#else
-    bool operator==( StridedDeviceAddressNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( startAddress == rhs.startAddress ) && ( strideInBytes == rhs.strideInBytes );
-#  endif
-    }
-
-    bool operator!=( StridedDeviceAddressNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress startAddress  = {};
-    DeviceSize    strideInBytes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkStridedDeviceAddressNV>
-  {
-    using Type = StridedDeviceAddressNV;
-  };
-#endif
-
-  // wrapper struct for struct VkBuildPartitionedAccelerationStructureIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildPartitionedAccelerationStructureIndirectCommandNV.html
-  struct BuildPartitionedAccelerationStructureIndirectCommandNV
-  {
-    using NativeType = VkBuildPartitionedAccelerationStructureIndirectCommandNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BuildPartitionedAccelerationStructureIndirectCommandNV(
-      PartitionedAccelerationStructureOpTypeNV opType_   = PartitionedAccelerationStructureOpTypeNV::eWriteInstance,
-      uint32_t                                 argCount_ = {},
-      StridedDeviceAddressNV                   argData_  = {} ) VULKAN_HPP_NOEXCEPT
-      : opType{ opType_ }
-      , argCount{ argCount_ }
-      , argData{ argData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BuildPartitionedAccelerationStructureIndirectCommandNV( BuildPartitionedAccelerationStructureIndirectCommandNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    BuildPartitionedAccelerationStructureIndirectCommandNV( VkBuildPartitionedAccelerationStructureIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BuildPartitionedAccelerationStructureIndirectCommandNV( *reinterpret_cast<BuildPartitionedAccelerationStructureIndirectCommandNV const *>( &rhs ) )
-    {
-    }
-
-    BuildPartitionedAccelerationStructureIndirectCommandNV &
-      operator=( BuildPartitionedAccelerationStructureIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BuildPartitionedAccelerationStructureIndirectCommandNV &
-      operator=( VkBuildPartitionedAccelerationStructureIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BuildPartitionedAccelerationStructureIndirectCommandNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureIndirectCommandNV &
-      setOpType( PartitionedAccelerationStructureOpTypeNV opType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opType = opType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureIndirectCommandNV & setArgCount( uint32_t argCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      argCount = argCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureIndirectCommandNV & setArgData( StridedDeviceAddressNV const & argData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      argData = argData_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBuildPartitionedAccelerationStructureIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBuildPartitionedAccelerationStructureIndirectCommandNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureIndirectCommandNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBuildPartitionedAccelerationStructureIndirectCommandNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBuildPartitionedAccelerationStructureIndirectCommandNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBuildPartitionedAccelerationStructureIndirectCommandNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PartitionedAccelerationStructureOpTypeNV const &, uint32_t const &, StridedDeviceAddressNV const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( opType, argCount, argData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BuildPartitionedAccelerationStructureIndirectCommandNV const & ) const = default;
-#else
-    bool operator==( BuildPartitionedAccelerationStructureIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( opType == rhs.opType ) && ( argCount == rhs.argCount ) && ( argData == rhs.argData );
-#  endif
-    }
-
-    bool operator!=( BuildPartitionedAccelerationStructureIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    PartitionedAccelerationStructureOpTypeNV opType   = PartitionedAccelerationStructureOpTypeNV::eWriteInstance;
-    uint32_t                                 argCount = {};
-    StridedDeviceAddressNV                   argData  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBuildPartitionedAccelerationStructureIndirectCommandNV>
-  {
-    using Type = BuildPartitionedAccelerationStructureIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPartitionedAccelerationStructureInstancesInputNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureInstancesInputNV.html
-  struct PartitionedAccelerationStructureInstancesInputNV
-  {
-    using NativeType = VkPartitionedAccelerationStructureInstancesInputNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePartitionedAccelerationStructureInstancesInputNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PartitionedAccelerationStructureInstancesInputNV( BuildAccelerationStructureFlagsKHR flags_                             = {},
-                                                                           uint32_t                           instanceCount_                     = {},
-                                                                           uint32_t                           maxInstancePerPartitionCount_      = {},
-                                                                           uint32_t                           partitionCount_                    = {},
-                                                                           uint32_t                           maxInstanceInGlobalPartitionCount_ = {},
-                                                                           void *                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , instanceCount{ instanceCount_ }
-      , maxInstancePerPartitionCount{ maxInstancePerPartitionCount_ }
-      , partitionCount{ partitionCount_ }
-      , maxInstanceInGlobalPartitionCount{ maxInstanceInGlobalPartitionCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PartitionedAccelerationStructureInstancesInputNV( PartitionedAccelerationStructureInstancesInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PartitionedAccelerationStructureInstancesInputNV( VkPartitionedAccelerationStructureInstancesInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PartitionedAccelerationStructureInstancesInputNV( *reinterpret_cast<PartitionedAccelerationStructureInstancesInputNV const *>( &rhs ) )
-    {
-    }
-
-    PartitionedAccelerationStructureInstancesInputNV & operator=( PartitionedAccelerationStructureInstancesInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PartitionedAccelerationStructureInstancesInputNV & operator=( VkPartitionedAccelerationStructureInstancesInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PartitionedAccelerationStructureInstancesInputNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV & setFlags( BuildAccelerationStructureFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV & setInstanceCount( uint32_t instanceCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceCount = instanceCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV &
-      setMaxInstancePerPartitionCount( uint32_t maxInstancePerPartitionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxInstancePerPartitionCount = maxInstancePerPartitionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV & setPartitionCount( uint32_t partitionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      partitionCount = partitionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureInstancesInputNV &
-      setMaxInstanceInGlobalPartitionCount( uint32_t maxInstanceInGlobalPartitionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxInstanceInGlobalPartitionCount = maxInstanceInGlobalPartitionCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPartitionedAccelerationStructureInstancesInputNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPartitionedAccelerationStructureInstancesInputNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureInstancesInputNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPartitionedAccelerationStructureInstancesInputNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureInstancesInputNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPartitionedAccelerationStructureInstancesInputNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureInstancesInputNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPartitionedAccelerationStructureInstancesInputNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               BuildAccelerationStructureFlagsKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, instanceCount, maxInstancePerPartitionCount, partitionCount, maxInstanceInGlobalPartitionCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PartitionedAccelerationStructureInstancesInputNV const & ) const = default;
-#else
-    bool operator==( PartitionedAccelerationStructureInstancesInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( instanceCount == rhs.instanceCount ) &&
-             ( maxInstancePerPartitionCount == rhs.maxInstancePerPartitionCount ) && ( partitionCount == rhs.partitionCount ) &&
-             ( maxInstanceInGlobalPartitionCount == rhs.maxInstanceInGlobalPartitionCount );
-#  endif
-    }
-
-    bool operator!=( PartitionedAccelerationStructureInstancesInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                      sType                             = StructureType::ePartitionedAccelerationStructureInstancesInputNV;
-    void *                             pNext                             = {};
-    BuildAccelerationStructureFlagsKHR flags                             = {};
-    uint32_t                           instanceCount                     = {};
-    uint32_t                           maxInstancePerPartitionCount      = {};
-    uint32_t                           partitionCount                    = {};
-    uint32_t                           maxInstanceInGlobalPartitionCount = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPartitionedAccelerationStructureInstancesInputNV>
-  {
-    using Type = PartitionedAccelerationStructureInstancesInputNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePartitionedAccelerationStructureInstancesInputNV>
-  {
-    using Type = PartitionedAccelerationStructureInstancesInputNV;
-  };
-
-  // wrapper struct for struct VkBuildPartitionedAccelerationStructureInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkBuildPartitionedAccelerationStructureInfoNV.html
-  struct BuildPartitionedAccelerationStructureInfoNV
-  {
-    using NativeType = VkBuildPartitionedAccelerationStructureInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eBuildPartitionedAccelerationStructureInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR BuildPartitionedAccelerationStructureInfoNV( PartitionedAccelerationStructureInstancesInputNV input_                        = {},
-                                                                      DeviceAddress                                    srcAccelerationStructureData_ = {},
-                                                                      DeviceAddress                                    dstAccelerationStructureData_ = {},
-                                                                      DeviceAddress                                    scratchData_                  = {},
-                                                                      DeviceAddress                                    srcInfos_                     = {},
-                                                                      DeviceAddress                                    srcInfosCount_                = {},
-                                                                      void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , input{ input_ }
-      , srcAccelerationStructureData{ srcAccelerationStructureData_ }
-      , dstAccelerationStructureData{ dstAccelerationStructureData_ }
-      , scratchData{ scratchData_ }
-      , srcInfos{ srcInfos_ }
-      , srcInfosCount{ srcInfosCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR BuildPartitionedAccelerationStructureInfoNV( BuildPartitionedAccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    BuildPartitionedAccelerationStructureInfoNV( VkBuildPartitionedAccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : BuildPartitionedAccelerationStructureInfoNV( *reinterpret_cast<BuildPartitionedAccelerationStructureInfoNV const *>( &rhs ) )
-    {
-    }
-
-    BuildPartitionedAccelerationStructureInfoNV & operator=( BuildPartitionedAccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    BuildPartitionedAccelerationStructureInfoNV & operator=( VkBuildPartitionedAccelerationStructureInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<BuildPartitionedAccelerationStructureInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV &
-      setInput( PartitionedAccelerationStructureInstancesInputNV const & input_ ) VULKAN_HPP_NOEXCEPT
-    {
-      input = input_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV &
-      setSrcAccelerationStructureData( DeviceAddress srcAccelerationStructureData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcAccelerationStructureData = srcAccelerationStructureData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV &
-      setDstAccelerationStructureData( DeviceAddress dstAccelerationStructureData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstAccelerationStructureData = dstAccelerationStructureData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV & setScratchData( DeviceAddress scratchData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      scratchData = scratchData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV & setSrcInfos( DeviceAddress srcInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcInfos = srcInfos_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 BuildPartitionedAccelerationStructureInfoNV & setSrcInfosCount( DeviceAddress srcInfosCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcInfosCount = srcInfosCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkBuildPartitionedAccelerationStructureInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkBuildPartitionedAccelerationStructureInfoNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkBuildPartitionedAccelerationStructureInfoNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkBuildPartitionedAccelerationStructureInfoNV *>( this );
-    }
-
-    operator VkBuildPartitionedAccelerationStructureInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkBuildPartitionedAccelerationStructureInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               PartitionedAccelerationStructureInstancesInputNV const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, input, srcAccelerationStructureData, dstAccelerationStructureData, scratchData, srcInfos, srcInfosCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( BuildPartitionedAccelerationStructureInfoNV const & ) const = default;
-#else
-    bool operator==( BuildPartitionedAccelerationStructureInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( input == rhs.input ) &&
-             ( srcAccelerationStructureData == rhs.srcAccelerationStructureData ) && ( dstAccelerationStructureData == rhs.dstAccelerationStructureData ) &&
-             ( scratchData == rhs.scratchData ) && ( srcInfos == rhs.srcInfos ) && ( srcInfosCount == rhs.srcInfosCount );
-#  endif
-    }
-
-    bool operator!=( BuildPartitionedAccelerationStructureInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                    sType                        = StructureType::eBuildPartitionedAccelerationStructureInfoNV;
-    void *                                           pNext                        = {};
-    PartitionedAccelerationStructureInstancesInputNV input                        = {};
-    DeviceAddress                                    srcAccelerationStructureData = {};
-    DeviceAddress                                    dstAccelerationStructureData = {};
-    DeviceAddress                                    scratchData                  = {};
-    DeviceAddress                                    srcInfos                     = {};
-    DeviceAddress                                    srcInfosCount                = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkBuildPartitionedAccelerationStructureInfoNV>
-  {
-    using Type = BuildPartitionedAccelerationStructureInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eBuildPartitionedAccelerationStructureInfoNV>
-  {
-    using Type = BuildPartitionedAccelerationStructureInfoNV;
-  };
-
-  // wrapper struct for struct VkCalibratedTimestampInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCalibratedTimestampInfoKHR.html
   struct CalibratedTimestampInfoKHR
   {
     using NativeType = VkCalibratedTimestampInfoKHR;
@@ -16789,10 +13268,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCalibratedTimestampInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CalibratedTimestampInfoKHR( TimeDomainKHR timeDomain_ = TimeDomainKHR::eDevice, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , timeDomain{ timeDomain_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CalibratedTimestampInfoKHR( VULKAN_HPP_NAMESPACE::TimeDomainKHR timeDomain_ = VULKAN_HPP_NAMESPACE::TimeDomainKHR::eDevice,
+                                                     const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , timeDomain( timeDomain_ )
     {
     }
 
@@ -16804,27 +13284,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CalibratedTimestampInfoKHR & operator=( CalibratedTimestampInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CalibratedTimestampInfoKHR & operator=( VkCalibratedTimestampInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CalibratedTimestampInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CalibratedTimestampInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CalibratedTimestampInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CalibratedTimestampInfoKHR & setTimeDomain( TimeDomainKHR timeDomain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CalibratedTimestampInfoKHR & setTimeDomain( VULKAN_HPP_NAMESPACE::TimeDomainKHR timeDomain_ ) VULKAN_HPP_NOEXCEPT
     {
       timeDomain = timeDomain_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCalibratedTimestampInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -16836,18 +13316,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCalibratedTimestampInfoKHR *>( this );
     }
 
-    operator VkCalibratedTimestampInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCalibratedTimestampInfoKHR *>( this );
-    }
-
-    operator VkCalibratedTimestampInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCalibratedTimestampInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TimeDomainKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::TimeDomainKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, timeDomain );
     }
@@ -16872,19 +13347,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eCalibratedTimestampInfoKHR;
-    const void *  pNext      = {};
-    TimeDomainKHR timeDomain = TimeDomainKHR::eDevice;
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eCalibratedTimestampInfoKHR;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::TimeDomainKHR timeDomain = VULKAN_HPP_NAMESPACE::TimeDomainKHR::eDevice;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCalibratedTimestampInfoKHR>
-  {
-    using Type = CalibratedTimestampInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCalibratedTimestampInfoKHR>
   {
@@ -16893,7 +13360,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CalibratedTimestampInfoEXT = CalibratedTimestampInfoKHR;
 
-  // wrapper struct for struct VkCheckpointData2NV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCheckpointData2NV.html
   struct CheckpointData2NV
   {
     using NativeType = VkCheckpointData2NV;
@@ -16901,11 +13367,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCheckpointData2NV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CheckpointData2NV( PipelineStageFlags2 stage_ = {}, void * pCheckpointMarker_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stage{ stage_ }
-      , pCheckpointMarker{ pCheckpointMarker_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CheckpointData2NV( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage_ = {}, void * pCheckpointMarker_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stage( stage_ )
+      , pCheckpointMarker( pCheckpointMarker_ )
     {
     }
 
@@ -16914,11 +13381,11 @@ namespace VULKAN_HPP_NAMESPACE
     CheckpointData2NV( VkCheckpointData2NV const & rhs ) VULKAN_HPP_NOEXCEPT : CheckpointData2NV( *reinterpret_cast<CheckpointData2NV const *>( &rhs ) ) {}
 
     CheckpointData2NV & operator=( CheckpointData2NV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CheckpointData2NV & operator=( VkCheckpointData2NV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CheckpointData2NV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CheckpointData2NV const *>( &rhs );
       return *this;
     }
 
@@ -16932,18 +13399,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCheckpointData2NV *>( this );
     }
 
-    operator VkCheckpointData2NV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCheckpointData2NV *>( this );
-    }
-
-    operator VkCheckpointData2NV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCheckpointData2NV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PipelineStageFlags2 const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stage, pCheckpointMarker );
     }
@@ -16968,27 +13430,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType             = StructureType::eCheckpointData2NV;
-    void *              pNext             = {};
-    PipelineStageFlags2 stage             = {};
-    void *              pCheckpointMarker = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType             = StructureType::eCheckpointData2NV;
+    void *                                    pNext             = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stage             = {};
+    void *                                    pCheckpointMarker = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCheckpointData2NV>
-  {
-    using Type = CheckpointData2NV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCheckpointData2NV>
   {
     using Type = CheckpointData2NV;
   };
 
-  // wrapper struct for struct VkCheckpointDataNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCheckpointDataNV.html
   struct CheckpointDataNV
   {
     using NativeType = VkCheckpointDataNV;
@@ -16996,13 +13449,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCheckpointDataNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CheckpointDataNV( PipelineStageFlagBits stage_             = PipelineStageFlagBits::eTopOfPipe,
-                                           void *                pCheckpointMarker_ = {},
-                                           void *                pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stage{ stage_ }
-      , pCheckpointMarker{ pCheckpointMarker_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CheckpointDataNV( VULKAN_HPP_NAMESPACE::PipelineStageFlagBits stage_ = VULKAN_HPP_NAMESPACE::PipelineStageFlagBits::eTopOfPipe,
+                                           void *                                      pCheckpointMarker_ = {},
+                                           void *                                      pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stage( stage_ )
+      , pCheckpointMarker( pCheckpointMarker_ )
     {
     }
 
@@ -17011,11 +13464,11 @@ namespace VULKAN_HPP_NAMESPACE
     CheckpointDataNV( VkCheckpointDataNV const & rhs ) VULKAN_HPP_NOEXCEPT : CheckpointDataNV( *reinterpret_cast<CheckpointDataNV const *>( &rhs ) ) {}
 
     CheckpointDataNV & operator=( CheckpointDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CheckpointDataNV & operator=( VkCheckpointDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CheckpointDataNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CheckpointDataNV const *>( &rhs );
       return *this;
     }
 
@@ -17029,18 +13482,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCheckpointDataNV *>( this );
     }
 
-    operator VkCheckpointDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCheckpointDataNV *>( this );
-    }
-
-    operator VkCheckpointDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCheckpointDataNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PipelineStageFlagBits const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PipelineStageFlagBits const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stage, pCheckpointMarker );
     }
@@ -17065,20 +13513,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType             = StructureType::eCheckpointDataNV;
-    void *                pNext             = {};
-    PipelineStageFlagBits stage             = PipelineStageFlagBits::eTopOfPipe;
-    void *                pCheckpointMarker = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType             = StructureType::eCheckpointDataNV;
+    void *                                      pNext             = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlagBits stage             = VULKAN_HPP_NAMESPACE::PipelineStageFlagBits::eTopOfPipe;
+    void *                                      pCheckpointMarker = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCheckpointDataNV>
-  {
-    using Type = CheckpointDataNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCheckpointDataNV>
   {
@@ -17088,7 +13528,7 @@ namespace VULKAN_HPP_NAMESPACE
   union ClearColorValue
   {
     using NativeType = VkClearColorValue;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
     VULKAN_HPP_CONSTEXPR_14 ClearColorValue( const std::array<float, 4> & float32_ = {} ) : float32( float32_ ) {}
 
@@ -17110,9 +13550,9 @@ namespace VULKAN_HPP_NAMESPACE
       : uint32{ { { uint32_0, uint32_1, uint32_2, uint32_3 } } }
     {
     }
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ClearColorValue & setFloat32( std::array<float, 4> float32_ ) VULKAN_HPP_NOEXCEPT
     {
       float32 = float32_;
@@ -17130,7 +13570,7 @@ namespace VULKAN_HPP_NAMESPACE
       uint32 = uint32_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkClearColorValue const &() const
     {
@@ -17142,28 +13582,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkClearColorValue *>( this );
     }
 
-    ArrayWrapper1D<float, 4>    float32;
-    ArrayWrapper1D<int32_t, 4>  int32;
-    ArrayWrapper1D<uint32_t, 4> uint32;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4>    float32;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, 4>  int32;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 4> uint32;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClearColorValue>
-  {
-    using Type = ClearColorValue;
-  };
-#endif
-
-  // wrapper struct for struct VkClearDepthStencilValue, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkClearDepthStencilValue.html
   struct ClearDepthStencilValue
   {
     using NativeType = VkClearDepthStencilValue;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ClearDepthStencilValue( float depth_ = {}, uint32_t stencil_ = {} ) VULKAN_HPP_NOEXCEPT
-      : depth{ depth_ }
-      , stencil{ stencil_ }
+      : depth( depth_ )
+      , stencil( stencil_ )
     {
     }
 
@@ -17175,15 +13606,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ClearDepthStencilValue & operator=( ClearDepthStencilValue const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ClearDepthStencilValue & operator=( VkClearDepthStencilValue const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ClearDepthStencilValue const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ClearDepthStencilValue const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ClearDepthStencilValue & setDepth( float depth_ ) VULKAN_HPP_NOEXCEPT
     {
       depth = depth_;
@@ -17195,7 +13626,7 @@ namespace VULKAN_HPP_NAMESPACE
       stencil = stencil_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkClearDepthStencilValue const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -17207,18 +13638,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkClearDepthStencilValue *>( this );
     }
 
-    operator VkClearDepthStencilValue const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClearDepthStencilValue *>( this );
-    }
-
-    operator VkClearDepthStencilValue *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClearDepthStencilValue *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( depth, stencil );
     }
@@ -17247,37 +13673,29 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t stencil = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClearDepthStencilValue>
-  {
-    using Type = ClearDepthStencilValue;
-  };
-#endif
-
   union ClearValue
   {
     using NativeType = VkClearValue;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 ClearValue( ClearColorValue color_ = {} ) : color( color_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 ClearValue( VULKAN_HPP_NAMESPACE::ClearColorValue color_ = {} ) : color( color_ ) {}
 
-    VULKAN_HPP_CONSTEXPR_14 ClearValue( ClearDepthStencilValue depthStencil_ ) : depthStencil( depthStencil_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    VULKAN_HPP_CONSTEXPR_14 ClearValue( VULKAN_HPP_NAMESPACE::ClearDepthStencilValue depthStencil_ ) : depthStencil( depthStencil_ ) {}
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClearValue & setColor( ClearColorValue const & color_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ClearValue & setColor( VULKAN_HPP_NAMESPACE::ClearColorValue const & color_ ) VULKAN_HPP_NOEXCEPT
     {
       color = color_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ClearValue & setDepthStencil( ClearDepthStencilValue const & depthStencil_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ClearValue & setDepthStencil( VULKAN_HPP_NAMESPACE::ClearDepthStencilValue const & depthStencil_ ) VULKAN_HPP_NOEXCEPT
     {
       depthStencil = depthStencil_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkClearValue const &() const
     {
@@ -17290,33 +13708,25 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    ClearColorValue        color;
-    ClearDepthStencilValue depthStencil;
+    VULKAN_HPP_NAMESPACE::ClearColorValue        color;
+    VULKAN_HPP_NAMESPACE::ClearDepthStencilValue depthStencil;
 #else
     VkClearColorValue        color;
     VkClearDepthStencilValue depthStencil;
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClearValue>
-  {
-    using Type = ClearValue;
-  };
-#endif
-
-  // wrapper struct for struct VkClearAttachment, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkClearAttachment.html
   struct ClearAttachment
   {
     using NativeType = VkClearAttachment;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      ClearAttachment( ImageAspectFlags aspectMask_ = {}, uint32_t colorAttachment_ = {}, ClearValue clearValue_ = {} ) VULKAN_HPP_NOEXCEPT
-      : aspectMask{ aspectMask_ }
-      , colorAttachment{ colorAttachment_ }
-      , clearValue{ clearValue_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 ClearAttachment( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_      = {},
+                                             uint32_t                               colorAttachment_ = {},
+                                             VULKAN_HPP_NAMESPACE::ClearValue       clearValue_      = {} ) VULKAN_HPP_NOEXCEPT
+      : aspectMask( aspectMask_ )
+      , colorAttachment( colorAttachment_ )
+      , clearValue( clearValue_ )
     {
     }
 
@@ -17325,16 +13735,16 @@ namespace VULKAN_HPP_NAMESPACE
     ClearAttachment( VkClearAttachment const & rhs ) VULKAN_HPP_NOEXCEPT : ClearAttachment( *reinterpret_cast<ClearAttachment const *>( &rhs ) ) {}
 
     ClearAttachment & operator=( ClearAttachment const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ClearAttachment & operator=( VkClearAttachment const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ClearAttachment const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ClearAttachment const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClearAttachment & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ClearAttachment & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
@@ -17346,12 +13756,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ClearAttachment & setClearValue( ClearValue const & clearValue_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ClearAttachment & setClearValue( VULKAN_HPP_NAMESPACE::ClearValue const & clearValue_ ) VULKAN_HPP_NOEXCEPT
     {
       clearValue = clearValue_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkClearAttachment const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -17363,47 +13773,33 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkClearAttachment *>( this );
     }
 
-    operator VkClearAttachment const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClearAttachment *>( this );
-    }
-
-    operator VkClearAttachment *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClearAttachment *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageAspectFlags const &, uint32_t const &, ClearValue const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageAspectFlags const &, uint32_t const &, VULKAN_HPP_NAMESPACE::ClearValue const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( aspectMask, colorAttachment, clearValue );
     }
 #endif
 
   public:
-    ImageAspectFlags aspectMask      = {};
-    uint32_t         colorAttachment = {};
-    ClearValue       clearValue      = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask      = {};
+    uint32_t                               colorAttachment = {};
+    VULKAN_HPP_NAMESPACE::ClearValue       clearValue      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClearAttachment>
-  {
-    using Type = ClearAttachment;
-  };
-#endif
-
-  // wrapper struct for struct VkClearRect, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkClearRect.html
   struct ClearRect
   {
     using NativeType = VkClearRect;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClearRect( Rect2D rect_ = {}, uint32_t baseArrayLayer_ = {}, uint32_t layerCount_ = {} ) VULKAN_HPP_NOEXCEPT
-      : rect{ rect_ }
-      , baseArrayLayer{ baseArrayLayer_ }
-      , layerCount{ layerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ClearRect( VULKAN_HPP_NAMESPACE::Rect2D rect_ = {}, uint32_t baseArrayLayer_ = {}, uint32_t layerCount_ = {} ) VULKAN_HPP_NOEXCEPT
+      : rect( rect_ )
+      , baseArrayLayer( baseArrayLayer_ )
+      , layerCount( layerCount_ )
     {
     }
 
@@ -17412,16 +13808,16 @@ namespace VULKAN_HPP_NAMESPACE
     ClearRect( VkClearRect const & rhs ) VULKAN_HPP_NOEXCEPT : ClearRect( *reinterpret_cast<ClearRect const *>( &rhs ) ) {}
 
     ClearRect & operator=( ClearRect const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ClearRect & operator=( VkClearRect const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ClearRect const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ClearRect const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClearRect & setRect( Rect2D const & rect_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ClearRect & setRect( VULKAN_HPP_NAMESPACE::Rect2D const & rect_ ) VULKAN_HPP_NOEXCEPT
     {
       rect = rect_;
       return *this;
@@ -17438,7 +13834,7 @@ namespace VULKAN_HPP_NAMESPACE
       layerCount = layerCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkClearRect const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -17450,18 +13846,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkClearRect *>( this );
     }
 
-    operator VkClearRect const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClearRect *>( this );
-    }
-
-    operator VkClearRect *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClearRect *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Rect2D const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Rect2D const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( rect, baseArrayLayer, layerCount );
     }
@@ -17470,7 +13861,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( ClearRect const & ) const = default;
 #else
-    bool operator==( ClearRect const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool                     operator==( ClearRect const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -17486,2166 +13877,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Rect2D   rect           = {};
-    uint32_t baseArrayLayer = {};
-    uint32_t layerCount     = {};
+    VULKAN_HPP_NAMESPACE::Rect2D rect           = {};
+    uint32_t                     baseArrayLayer = {};
+    uint32_t                     layerCount     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClearRect>
-  {
-    using Type = ClearRect;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV.html
-  struct ClusterAccelerationStructureBuildClustersBottomLevelInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildClustersBottomLevelInfoNV( uint32_t      clusterReferencesCount_  = {},
-                                                                                     uint32_t      clusterReferencesStride_ = {},
-                                                                                     DeviceAddress clusterReferences_       = {} ) VULKAN_HPP_NOEXCEPT
-      : clusterReferencesCount{ clusterReferencesCount_ }
-      , clusterReferencesStride{ clusterReferencesStride_ }
-      , clusterReferences{ clusterReferences_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildClustersBottomLevelInfoNV( ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureBuildClustersBottomLevelInfoNV( VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureBuildClustersBottomLevelInfoNV(
-          *reinterpret_cast<ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureBuildClustersBottomLevelInfoNV &
-      operator=( ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureBuildClustersBottomLevelInfoNV &
-      operator=( VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildClustersBottomLevelInfoNV &
-      setClusterReferencesCount( uint32_t clusterReferencesCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterReferencesCount = clusterReferencesCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildClustersBottomLevelInfoNV &
-      setClusterReferencesStride( uint32_t clusterReferencesStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterReferencesStride = clusterReferencesStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildClustersBottomLevelInfoNV &
-      setClusterReferences( DeviceAddress clusterReferences_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterReferences = clusterReferences_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( clusterReferencesCount, clusterReferencesStride, clusterReferences );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( clusterReferencesCount == rhs.clusterReferencesCount ) && ( clusterReferencesStride == rhs.clusterReferencesStride ) &&
-             ( clusterReferences == rhs.clusterReferences );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureBuildClustersBottomLevelInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t      clusterReferencesCount  = {};
-    uint32_t      clusterReferencesStride = {};
-    DeviceAddress clusterReferences       = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureBuildClustersBottomLevelInfoNV>
-  {
-    using Type = ClusterAccelerationStructureBuildClustersBottomLevelInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV.html
-  struct ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV
-  {
-    using NativeType = VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV( uint32_t geometryIndex_ = {},
-                                                                                      uint32_t reserved_      = {},
-                                                                                      uint32_t geometryFlags_ = {} ) VULKAN_HPP_NOEXCEPT
-      : geometryIndex{ geometryIndex_ }
-      , reserved{ reserved_ }
-      , geometryFlags{ geometryFlags_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV( ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV( VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV(
-          *reinterpret_cast<ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV &
-      operator=( ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV &
-      operator=( VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV & setGeometryIndex( uint32_t geometryIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndex = geometryIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV & setReserved( uint32_t reserved_ ) VULKAN_HPP_NOEXCEPT
-    {
-      reserved = reserved_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV & setGeometryFlags( uint32_t geometryFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryFlags = geometryFlags_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( geometryIndex, reserved, geometryFlags );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( geometryIndex == rhs.geometryIndex ) && ( reserved == rhs.reserved ) && ( geometryFlags == rhs.geometryFlags );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t geometryIndex : 24;
-    uint32_t reserved      : 5;
-    uint32_t geometryFlags : 3;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV>
-  {
-    using Type = ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureBuildTriangleClusterInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureBuildTriangleClusterInfoNV.html
-  struct ClusterAccelerationStructureBuildTriangleClusterInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureBuildTriangleClusterInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildTriangleClusterInfoNV(
-      uint32_t                                                    clusterID_                         = {},
-      ClusterAccelerationStructureClusterFlagsNV                  clusterFlags_                      = {},
-      uint32_t                                                    triangleCount_                     = {},
-      uint32_t                                                    vertexCount_                       = {},
-      uint32_t                                                    positionTruncateBitCount_          = {},
-      uint32_t                                                    indexType_                         = {},
-      uint32_t                                                    opacityMicromapIndexType_          = {},
-      ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV baseGeometryIndexAndGeometryFlags_ = {},
-      uint16_t                                                    indexBufferStride_                 = {},
-      uint16_t                                                    vertexBufferStride_                = {},
-      uint16_t                                                    geometryIndexAndFlagsBufferStride_ = {},
-      uint16_t                                                    opacityMicromapIndexBufferStride_  = {},
-      DeviceAddress                                               indexBuffer_                       = {},
-      DeviceAddress                                               vertexBuffer_                      = {},
-      DeviceAddress                                               geometryIndexAndFlagsBuffer_       = {},
-      DeviceAddress                                               opacityMicromapArray_              = {},
-      DeviceAddress                                               opacityMicromapIndexBuffer_        = {} ) VULKAN_HPP_NOEXCEPT
-      : clusterID{ clusterID_ }
-      , clusterFlags{ clusterFlags_ }
-      , triangleCount{ triangleCount_ }
-      , vertexCount{ vertexCount_ }
-      , positionTruncateBitCount{ positionTruncateBitCount_ }
-      , indexType{ indexType_ }
-      , opacityMicromapIndexType{ opacityMicromapIndexType_ }
-      , baseGeometryIndexAndGeometryFlags{ baseGeometryIndexAndGeometryFlags_ }
-      , indexBufferStride{ indexBufferStride_ }
-      , vertexBufferStride{ vertexBufferStride_ }
-      , geometryIndexAndFlagsBufferStride{ geometryIndexAndFlagsBufferStride_ }
-      , opacityMicromapIndexBufferStride{ opacityMicromapIndexBufferStride_ }
-      , indexBuffer{ indexBuffer_ }
-      , vertexBuffer{ vertexBuffer_ }
-      , geometryIndexAndFlagsBuffer{ geometryIndexAndFlagsBuffer_ }
-      , opacityMicromapArray{ opacityMicromapArray_ }
-      , opacityMicromapIndexBuffer{ opacityMicromapIndexBuffer_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildTriangleClusterInfoNV( ClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureBuildTriangleClusterInfoNV( VkClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureBuildTriangleClusterInfoNV( *reinterpret_cast<ClusterAccelerationStructureBuildTriangleClusterInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      operator=( ClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      operator=( VkClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureBuildTriangleClusterInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setClusterID( uint32_t clusterID_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterID = clusterID_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setClusterFlags( ClusterAccelerationStructureClusterFlagsNV clusterFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterFlags = clusterFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setTriangleCount( uint32_t triangleCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      triangleCount = triangleCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setVertexCount( uint32_t vertexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexCount = vertexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setPositionTruncateBitCount( uint32_t positionTruncateBitCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      positionTruncateBitCount = positionTruncateBitCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setIndexType( uint32_t indexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexType = indexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setOpacityMicromapIndexType( uint32_t opacityMicromapIndexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexType = opacityMicromapIndexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setBaseGeometryIndexAndGeometryFlags(
-      ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & baseGeometryIndexAndGeometryFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      baseGeometryIndexAndGeometryFlags = baseGeometryIndexAndGeometryFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setIndexBufferStride( uint16_t indexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexBufferStride = indexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setVertexBufferStride( uint16_t vertexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBufferStride = vertexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setGeometryIndexAndFlagsBufferStride( uint16_t geometryIndexAndFlagsBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndexAndFlagsBufferStride = geometryIndexAndFlagsBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setOpacityMicromapIndexBufferStride( uint16_t opacityMicromapIndexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexBufferStride = opacityMicromapIndexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setIndexBuffer( DeviceAddress indexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexBuffer = indexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV & setVertexBuffer( DeviceAddress vertexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBuffer = vertexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setGeometryIndexAndFlagsBuffer( DeviceAddress geometryIndexAndFlagsBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndexAndFlagsBuffer = geometryIndexAndFlagsBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setOpacityMicromapArray( DeviceAddress opacityMicromapArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapArray = opacityMicromapArray_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterInfoNV &
-      setOpacityMicromapIndexBuffer( DeviceAddress opacityMicromapIndexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexBuffer = opacityMicromapIndexBuffer_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureBuildTriangleClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureBuildTriangleClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureBuildTriangleClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureBuildTriangleClusterInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &,
-               ClusterAccelerationStructureClusterFlagsNV const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const &,
-               uint16_t const &,
-               uint16_t const &,
-               uint16_t const &,
-               uint16_t const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( clusterID,
-                       clusterFlags,
-                       triangleCount,
-                       vertexCount,
-                       positionTruncateBitCount,
-                       indexType,
-                       opacityMicromapIndexType,
-                       baseGeometryIndexAndGeometryFlags,
-                       indexBufferStride,
-                       vertexBufferStride,
-                       geometryIndexAndFlagsBufferStride,
-                       opacityMicromapIndexBufferStride,
-                       indexBuffer,
-                       vertexBuffer,
-                       geometryIndexAndFlagsBuffer,
-                       opacityMicromapArray,
-                       opacityMicromapIndexBuffer );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureBuildTriangleClusterInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( clusterID == rhs.clusterID ) && ( clusterFlags == rhs.clusterFlags ) && ( triangleCount == rhs.triangleCount ) &&
-             ( vertexCount == rhs.vertexCount ) && ( positionTruncateBitCount == rhs.positionTruncateBitCount ) && ( indexType == rhs.indexType ) &&
-             ( opacityMicromapIndexType == rhs.opacityMicromapIndexType ) && ( baseGeometryIndexAndGeometryFlags == rhs.baseGeometryIndexAndGeometryFlags ) &&
-             ( indexBufferStride == rhs.indexBufferStride ) && ( vertexBufferStride == rhs.vertexBufferStride ) &&
-             ( geometryIndexAndFlagsBufferStride == rhs.geometryIndexAndFlagsBufferStride ) &&
-             ( opacityMicromapIndexBufferStride == rhs.opacityMicromapIndexBufferStride ) && ( indexBuffer == rhs.indexBuffer ) &&
-             ( vertexBuffer == rhs.vertexBuffer ) && ( geometryIndexAndFlagsBuffer == rhs.geometryIndexAndFlagsBuffer ) &&
-             ( opacityMicromapArray == rhs.opacityMicromapArray ) && ( opacityMicromapIndexBuffer == rhs.opacityMicromapIndexBuffer );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureBuildTriangleClusterInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t                                                    clusterID    = {};
-    ClusterAccelerationStructureClusterFlagsNV                  clusterFlags = {};
-    uint32_t                                                    triangleCount            : 9;
-    uint32_t                                                    vertexCount              : 9;
-    uint32_t                                                    positionTruncateBitCount : 6;
-    uint32_t                                                    indexType                : 4;
-    uint32_t                                                    opacityMicromapIndexType : 4;
-    ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV baseGeometryIndexAndGeometryFlags = {};
-    uint16_t                                                    indexBufferStride                 = {};
-    uint16_t                                                    vertexBufferStride                = {};
-    uint16_t                                                    geometryIndexAndFlagsBufferStride = {};
-    uint16_t                                                    opacityMicromapIndexBufferStride  = {};
-    DeviceAddress                                               indexBuffer                       = {};
-    DeviceAddress                                               vertexBuffer                      = {};
-    DeviceAddress                                               geometryIndexAndFlagsBuffer       = {};
-    DeviceAddress                                               opacityMicromapArray              = {};
-    DeviceAddress                                               opacityMicromapIndexBuffer        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureBuildTriangleClusterInfoNV>
-  {
-    using Type = ClusterAccelerationStructureBuildTriangleClusterInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV.html
-  struct ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV(
-      uint32_t                                                    clusterID_                         = {},
-      ClusterAccelerationStructureClusterFlagsNV                  clusterFlags_                      = {},
-      uint32_t                                                    triangleCount_                     = {},
-      uint32_t                                                    vertexCount_                       = {},
-      uint32_t                                                    positionTruncateBitCount_          = {},
-      uint32_t                                                    indexType_                         = {},
-      uint32_t                                                    opacityMicromapIndexType_          = {},
-      ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV baseGeometryIndexAndGeometryFlags_ = {},
-      uint16_t                                                    indexBufferStride_                 = {},
-      uint16_t                                                    vertexBufferStride_                = {},
-      uint16_t                                                    geometryIndexAndFlagsBufferStride_ = {},
-      uint16_t                                                    opacityMicromapIndexBufferStride_  = {},
-      DeviceAddress                                               indexBuffer_                       = {},
-      DeviceAddress                                               vertexBuffer_                      = {},
-      DeviceAddress                                               geometryIndexAndFlagsBuffer_       = {},
-      DeviceAddress                                               opacityMicromapArray_              = {},
-      DeviceAddress                                               opacityMicromapIndexBuffer_        = {},
-      DeviceAddress                                               instantiationBoundingBoxLimit_     = {} ) VULKAN_HPP_NOEXCEPT
-      : clusterID{ clusterID_ }
-      , clusterFlags{ clusterFlags_ }
-      , triangleCount{ triangleCount_ }
-      , vertexCount{ vertexCount_ }
-      , positionTruncateBitCount{ positionTruncateBitCount_ }
-      , indexType{ indexType_ }
-      , opacityMicromapIndexType{ opacityMicromapIndexType_ }
-      , baseGeometryIndexAndGeometryFlags{ baseGeometryIndexAndGeometryFlags_ }
-      , indexBufferStride{ indexBufferStride_ }
-      , vertexBufferStride{ vertexBufferStride_ }
-      , geometryIndexAndFlagsBufferStride{ geometryIndexAndFlagsBufferStride_ }
-      , opacityMicromapIndexBufferStride{ opacityMicromapIndexBufferStride_ }
-      , indexBuffer{ indexBuffer_ }
-      , vertexBuffer{ vertexBuffer_ }
-      , geometryIndexAndFlagsBuffer{ geometryIndexAndFlagsBuffer_ }
-      , opacityMicromapArray{ opacityMicromapArray_ }
-      , opacityMicromapIndexBuffer{ opacityMicromapIndexBuffer_ }
-      , instantiationBoundingBoxLimit{ instantiationBoundingBoxLimit_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV(
-      ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV( VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs )
-      VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV(
-          *reinterpret_cast<ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const *>( &rhs ) )
-    {
-    }
-
-    explicit ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV(
-      ClusterAccelerationStructureBuildTriangleClusterInfoNV const & clusterAccelerationStructureBuildTriangleClusterInfoNV,
-      DeviceAddress                                                  instantiationBoundingBoxLimit_ = {} )
-      : clusterID( clusterAccelerationStructureBuildTriangleClusterInfoNV.clusterID )
-      , clusterFlags( clusterAccelerationStructureBuildTriangleClusterInfoNV.clusterFlags )
-      , triangleCount( clusterAccelerationStructureBuildTriangleClusterInfoNV.triangleCount )
-      , vertexCount( clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexCount )
-      , positionTruncateBitCount( clusterAccelerationStructureBuildTriangleClusterInfoNV.positionTruncateBitCount )
-      , indexType( clusterAccelerationStructureBuildTriangleClusterInfoNV.indexType )
-      , opacityMicromapIndexType( clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexType )
-      , baseGeometryIndexAndGeometryFlags( clusterAccelerationStructureBuildTriangleClusterInfoNV.baseGeometryIndexAndGeometryFlags )
-      , indexBufferStride( clusterAccelerationStructureBuildTriangleClusterInfoNV.indexBufferStride )
-      , vertexBufferStride( clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexBufferStride )
-      , geometryIndexAndFlagsBufferStride( clusterAccelerationStructureBuildTriangleClusterInfoNV.geometryIndexAndFlagsBufferStride )
-      , opacityMicromapIndexBufferStride( clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexBufferStride )
-      , indexBuffer( clusterAccelerationStructureBuildTriangleClusterInfoNV.indexBuffer )
-      , vertexBuffer( clusterAccelerationStructureBuildTriangleClusterInfoNV.vertexBuffer )
-      , geometryIndexAndFlagsBuffer( clusterAccelerationStructureBuildTriangleClusterInfoNV.geometryIndexAndFlagsBuffer )
-      , opacityMicromapArray( clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapArray )
-      , opacityMicromapIndexBuffer( clusterAccelerationStructureBuildTriangleClusterInfoNV.opacityMicromapIndexBuffer )
-      , instantiationBoundingBoxLimit( instantiationBoundingBoxLimit_ )
-    {
-    }
-
-    ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      operator=( ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      operator=( VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setClusterID( uint32_t clusterID_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterID = clusterID_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setClusterFlags( ClusterAccelerationStructureClusterFlagsNV clusterFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterFlags = clusterFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setTriangleCount( uint32_t triangleCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      triangleCount = triangleCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setVertexCount( uint32_t vertexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexCount = vertexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setPositionTruncateBitCount( uint32_t positionTruncateBitCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      positionTruncateBitCount = positionTruncateBitCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setIndexType( uint32_t indexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexType = indexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setOpacityMicromapIndexType( uint32_t opacityMicromapIndexType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexType = opacityMicromapIndexType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setBaseGeometryIndexAndGeometryFlags(
-      ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const & baseGeometryIndexAndGeometryFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      baseGeometryIndexAndGeometryFlags = baseGeometryIndexAndGeometryFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setIndexBufferStride( uint16_t indexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexBufferStride = indexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setVertexBufferStride( uint16_t vertexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBufferStride = vertexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setGeometryIndexAndFlagsBufferStride( uint16_t geometryIndexAndFlagsBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndexAndFlagsBufferStride = geometryIndexAndFlagsBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setOpacityMicromapIndexBufferStride( uint16_t opacityMicromapIndexBufferStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexBufferStride = opacityMicromapIndexBufferStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setIndexBuffer( DeviceAddress indexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexBuffer = indexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV & setVertexBuffer( DeviceAddress vertexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBuffer = vertexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setGeometryIndexAndFlagsBuffer( DeviceAddress geometryIndexAndFlagsBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndexAndFlagsBuffer = geometryIndexAndFlagsBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setOpacityMicromapArray( DeviceAddress opacityMicromapArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapArray = opacityMicromapArray_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setOpacityMicromapIndexBuffer( DeviceAddress opacityMicromapIndexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opacityMicromapIndexBuffer = opacityMicromapIndexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &
-      setInstantiationBoundingBoxLimit( DeviceAddress instantiationBoundingBoxLimit_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instantiationBoundingBoxLimit = instantiationBoundingBoxLimit_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &,
-               ClusterAccelerationStructureClusterFlagsNV const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV const &,
-               uint16_t const &,
-               uint16_t const &,
-               uint16_t const &,
-               uint16_t const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               DeviceAddress const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( clusterID,
-                       clusterFlags,
-                       triangleCount,
-                       vertexCount,
-                       positionTruncateBitCount,
-                       indexType,
-                       opacityMicromapIndexType,
-                       baseGeometryIndexAndGeometryFlags,
-                       indexBufferStride,
-                       vertexBufferStride,
-                       geometryIndexAndFlagsBufferStride,
-                       opacityMicromapIndexBufferStride,
-                       indexBuffer,
-                       vertexBuffer,
-                       geometryIndexAndFlagsBuffer,
-                       opacityMicromapArray,
-                       opacityMicromapIndexBuffer,
-                       instantiationBoundingBoxLimit );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( clusterID == rhs.clusterID ) && ( clusterFlags == rhs.clusterFlags ) && ( triangleCount == rhs.triangleCount ) &&
-             ( vertexCount == rhs.vertexCount ) && ( positionTruncateBitCount == rhs.positionTruncateBitCount ) && ( indexType == rhs.indexType ) &&
-             ( opacityMicromapIndexType == rhs.opacityMicromapIndexType ) && ( baseGeometryIndexAndGeometryFlags == rhs.baseGeometryIndexAndGeometryFlags ) &&
-             ( indexBufferStride == rhs.indexBufferStride ) && ( vertexBufferStride == rhs.vertexBufferStride ) &&
-             ( geometryIndexAndFlagsBufferStride == rhs.geometryIndexAndFlagsBufferStride ) &&
-             ( opacityMicromapIndexBufferStride == rhs.opacityMicromapIndexBufferStride ) && ( indexBuffer == rhs.indexBuffer ) &&
-             ( vertexBuffer == rhs.vertexBuffer ) && ( geometryIndexAndFlagsBuffer == rhs.geometryIndexAndFlagsBuffer ) &&
-             ( opacityMicromapArray == rhs.opacityMicromapArray ) && ( opacityMicromapIndexBuffer == rhs.opacityMicromapIndexBuffer ) &&
-             ( instantiationBoundingBoxLimit == rhs.instantiationBoundingBoxLimit );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t                                                    clusterID    = {};
-    ClusterAccelerationStructureClusterFlagsNV                  clusterFlags = {};
-    uint32_t                                                    triangleCount            : 9;
-    uint32_t                                                    vertexCount              : 9;
-    uint32_t                                                    positionTruncateBitCount : 6;
-    uint32_t                                                    indexType                : 4;
-    uint32_t                                                    opacityMicromapIndexType : 4;
-    ClusterAccelerationStructureGeometryIndexAndGeometryFlagsNV baseGeometryIndexAndGeometryFlags = {};
-    uint16_t                                                    indexBufferStride                 = {};
-    uint16_t                                                    vertexBufferStride                = {};
-    uint16_t                                                    geometryIndexAndFlagsBufferStride = {};
-    uint16_t                                                    opacityMicromapIndexBufferStride  = {};
-    DeviceAddress                                               indexBuffer                       = {};
-    DeviceAddress                                               vertexBuffer                      = {};
-    DeviceAddress                                               geometryIndexAndFlagsBuffer       = {};
-    DeviceAddress                                               opacityMicromapArray              = {};
-    DeviceAddress                                               opacityMicromapIndexBuffer        = {};
-    DeviceAddress                                               instantiationBoundingBoxLimit     = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV>
-  {
-    using Type = ClusterAccelerationStructureBuildTriangleClusterTemplateInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureClustersBottomLevelInputNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureClustersBottomLevelInputNV.html
-  struct ClusterAccelerationStructureClustersBottomLevelInputNV
-  {
-    using NativeType = VkClusterAccelerationStructureClustersBottomLevelInputNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eClusterAccelerationStructureClustersBottomLevelInputNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureClustersBottomLevelInputNV( uint32_t maxTotalClusterCount_                    = {},
-                                                                                 uint32_t maxClusterCountPerAccelerationStructure_ = {},
-                                                                                 void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxTotalClusterCount{ maxTotalClusterCount_ }
-      , maxClusterCountPerAccelerationStructure{ maxClusterCountPerAccelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureClustersBottomLevelInputNV( ClusterAccelerationStructureClustersBottomLevelInputNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureClustersBottomLevelInputNV( VkClusterAccelerationStructureClustersBottomLevelInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureClustersBottomLevelInputNV( *reinterpret_cast<ClusterAccelerationStructureClustersBottomLevelInputNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureClustersBottomLevelInputNV &
-      operator=( ClusterAccelerationStructureClustersBottomLevelInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureClustersBottomLevelInputNV &
-      operator=( VkClusterAccelerationStructureClustersBottomLevelInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureClustersBottomLevelInputNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureClustersBottomLevelInputNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureClustersBottomLevelInputNV &
-      setMaxTotalClusterCount( uint32_t maxTotalClusterCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxTotalClusterCount = maxTotalClusterCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureClustersBottomLevelInputNV &
-      setMaxClusterCountPerAccelerationStructure( uint32_t maxClusterCountPerAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxClusterCountPerAccelerationStructure = maxClusterCountPerAccelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureClustersBottomLevelInputNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureClustersBottomLevelInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureClustersBottomLevelInputNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureClustersBottomLevelInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureClustersBottomLevelInputNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureClustersBottomLevelInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureClustersBottomLevelInputNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureClustersBottomLevelInputNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxTotalClusterCount, maxClusterCountPerAccelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureClustersBottomLevelInputNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureClustersBottomLevelInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxTotalClusterCount == rhs.maxTotalClusterCount ) &&
-             ( maxClusterCountPerAccelerationStructure == rhs.maxClusterCountPerAccelerationStructure );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureClustersBottomLevelInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                   = StructureType::eClusterAccelerationStructureClustersBottomLevelInputNV;
-    void *        pNext                                   = {};
-    uint32_t      maxTotalClusterCount                    = {};
-    uint32_t      maxClusterCountPerAccelerationStructure = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureClustersBottomLevelInputNV>
-  {
-    using Type = ClusterAccelerationStructureClustersBottomLevelInputNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eClusterAccelerationStructureClustersBottomLevelInputNV>
-  {
-    using Type = ClusterAccelerationStructureClustersBottomLevelInputNV;
-  };
-
-  // wrapper struct for struct VkClusterAccelerationStructureTriangleClusterInputNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureTriangleClusterInputNV.html
-  struct ClusterAccelerationStructureTriangleClusterInputNV
-  {
-    using NativeType = VkClusterAccelerationStructureTriangleClusterInputNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eClusterAccelerationStructureTriangleClusterInputNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureTriangleClusterInputNV( Format   vertexFormat_                  = Format::eUndefined,
-                                                                             uint32_t maxGeometryIndexValue_         = {},
-                                                                             uint32_t maxClusterUniqueGeometryCount_ = {},
-                                                                             uint32_t maxClusterTriangleCount_       = {},
-                                                                             uint32_t maxClusterVertexCount_         = {},
-                                                                             uint32_t maxTotalTriangleCount_         = {},
-                                                                             uint32_t maxTotalVertexCount_           = {},
-                                                                             uint32_t minPositionTruncateBitCount_   = {},
-                                                                             void *   pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexFormat{ vertexFormat_ }
-      , maxGeometryIndexValue{ maxGeometryIndexValue_ }
-      , maxClusterUniqueGeometryCount{ maxClusterUniqueGeometryCount_ }
-      , maxClusterTriangleCount{ maxClusterTriangleCount_ }
-      , maxClusterVertexCount{ maxClusterVertexCount_ }
-      , maxTotalTriangleCount{ maxTotalTriangleCount_ }
-      , maxTotalVertexCount{ maxTotalVertexCount_ }
-      , minPositionTruncateBitCount{ minPositionTruncateBitCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureTriangleClusterInputNV( ClusterAccelerationStructureTriangleClusterInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureTriangleClusterInputNV( VkClusterAccelerationStructureTriangleClusterInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureTriangleClusterInputNV( *reinterpret_cast<ClusterAccelerationStructureTriangleClusterInputNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureTriangleClusterInputNV &
-      operator=( ClusterAccelerationStructureTriangleClusterInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureTriangleClusterInputNV & operator=( VkClusterAccelerationStructureTriangleClusterInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureTriangleClusterInputNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setVertexFormat( Format vertexFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexFormat = vertexFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setMaxGeometryIndexValue( uint32_t maxGeometryIndexValue_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxGeometryIndexValue = maxGeometryIndexValue_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV &
-      setMaxClusterUniqueGeometryCount( uint32_t maxClusterUniqueGeometryCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxClusterUniqueGeometryCount = maxClusterUniqueGeometryCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV &
-      setMaxClusterTriangleCount( uint32_t maxClusterTriangleCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxClusterTriangleCount = maxClusterTriangleCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setMaxClusterVertexCount( uint32_t maxClusterVertexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxClusterVertexCount = maxClusterVertexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setMaxTotalTriangleCount( uint32_t maxTotalTriangleCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxTotalTriangleCount = maxTotalTriangleCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV & setMaxTotalVertexCount( uint32_t maxTotalVertexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxTotalVertexCount = maxTotalVertexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureTriangleClusterInputNV &
-      setMinPositionTruncateBitCount( uint32_t minPositionTruncateBitCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      minPositionTruncateBitCount = minPositionTruncateBitCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureTriangleClusterInputNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureTriangleClusterInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureTriangleClusterInputNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureTriangleClusterInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureTriangleClusterInputNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureTriangleClusterInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureTriangleClusterInputNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureTriangleClusterInputNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Format const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       vertexFormat,
-                       maxGeometryIndexValue,
-                       maxClusterUniqueGeometryCount,
-                       maxClusterTriangleCount,
-                       maxClusterVertexCount,
-                       maxTotalTriangleCount,
-                       maxTotalVertexCount,
-                       minPositionTruncateBitCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureTriangleClusterInputNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureTriangleClusterInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( vertexFormat == rhs.vertexFormat ) &&
-             ( maxGeometryIndexValue == rhs.maxGeometryIndexValue ) && ( maxClusterUniqueGeometryCount == rhs.maxClusterUniqueGeometryCount ) &&
-             ( maxClusterTriangleCount == rhs.maxClusterTriangleCount ) && ( maxClusterVertexCount == rhs.maxClusterVertexCount ) &&
-             ( maxTotalTriangleCount == rhs.maxTotalTriangleCount ) && ( maxTotalVertexCount == rhs.maxTotalVertexCount ) &&
-             ( minPositionTruncateBitCount == rhs.minPositionTruncateBitCount );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureTriangleClusterInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                         = StructureType::eClusterAccelerationStructureTriangleClusterInputNV;
-    void *        pNext                         = {};
-    Format        vertexFormat                  = Format::eUndefined;
-    uint32_t      maxGeometryIndexValue         = {};
-    uint32_t      maxClusterUniqueGeometryCount = {};
-    uint32_t      maxClusterTriangleCount       = {};
-    uint32_t      maxClusterVertexCount         = {};
-    uint32_t      maxTotalTriangleCount         = {};
-    uint32_t      maxTotalVertexCount           = {};
-    uint32_t      minPositionTruncateBitCount   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureTriangleClusterInputNV>
-  {
-    using Type = ClusterAccelerationStructureTriangleClusterInputNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eClusterAccelerationStructureTriangleClusterInputNV>
-  {
-    using Type = ClusterAccelerationStructureTriangleClusterInputNV;
-  };
-
-  // wrapper struct for struct VkClusterAccelerationStructureMoveObjectsInputNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureMoveObjectsInputNV.html
-  struct ClusterAccelerationStructureMoveObjectsInputNV
-  {
-    using NativeType = VkClusterAccelerationStructureMoveObjectsInputNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eClusterAccelerationStructureMoveObjectsInputNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureMoveObjectsInputNV( ClusterAccelerationStructureTypeNV type_ = ClusterAccelerationStructureTypeNV::eClustersBottomLevel,
-                                                      Bool32                             noMoveOverlap_ = {},
-                                                      DeviceSize                         maxMovedBytes_ = {},
-                                                      void *                             pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , noMoveOverlap{ noMoveOverlap_ }
-      , maxMovedBytes{ maxMovedBytes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureMoveObjectsInputNV( ClusterAccelerationStructureMoveObjectsInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureMoveObjectsInputNV( VkClusterAccelerationStructureMoveObjectsInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureMoveObjectsInputNV( *reinterpret_cast<ClusterAccelerationStructureMoveObjectsInputNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureMoveObjectsInputNV & operator=( ClusterAccelerationStructureMoveObjectsInputNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureMoveObjectsInputNV & operator=( VkClusterAccelerationStructureMoveObjectsInputNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureMoveObjectsInputNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureMoveObjectsInputNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureMoveObjectsInputNV & setType( ClusterAccelerationStructureTypeNV type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      type = type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureMoveObjectsInputNV & setNoMoveOverlap( Bool32 noMoveOverlap_ ) VULKAN_HPP_NOEXCEPT
-    {
-      noMoveOverlap = noMoveOverlap_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureMoveObjectsInputNV & setMaxMovedBytes( DeviceSize maxMovedBytes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxMovedBytes = maxMovedBytes_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureMoveObjectsInputNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureMoveObjectsInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInputNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureMoveObjectsInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInputNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureMoveObjectsInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInputNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureMoveObjectsInputNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ClusterAccelerationStructureTypeNV const &, Bool32 const &, DeviceSize const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, type, noMoveOverlap, maxMovedBytes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureMoveObjectsInputNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureMoveObjectsInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( type == rhs.type ) && ( noMoveOverlap == rhs.noMoveOverlap ) &&
-             ( maxMovedBytes == rhs.maxMovedBytes );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureMoveObjectsInputNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                      sType         = StructureType::eClusterAccelerationStructureMoveObjectsInputNV;
-    void *                             pNext         = {};
-    ClusterAccelerationStructureTypeNV type          = ClusterAccelerationStructureTypeNV::eClustersBottomLevel;
-    Bool32                             noMoveOverlap = {};
-    DeviceSize                         maxMovedBytes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureMoveObjectsInputNV>
-  {
-    using Type = ClusterAccelerationStructureMoveObjectsInputNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eClusterAccelerationStructureMoveObjectsInputNV>
-  {
-    using Type = ClusterAccelerationStructureMoveObjectsInputNV;
-  };
-
-  union ClusterAccelerationStructureOpInputNV
-  {
-    using NativeType = VkClusterAccelerationStructureOpInputNV;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV( ClusterAccelerationStructureClustersBottomLevelInputNV * pClustersBottomLevel_ = {} )
-      : pClustersBottomLevel( pClustersBottomLevel_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV( ClusterAccelerationStructureTriangleClusterInputNV * pTriangleClusters_ )
-      : pTriangleClusters( pTriangleClusters_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV( ClusterAccelerationStructureMoveObjectsInputNV * pMoveObjects_ )
-      : pMoveObjects( pMoveObjects_ )
-    {
-    }
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV &
-      setPClustersBottomLevel( ClusterAccelerationStructureClustersBottomLevelInputNV * pClustersBottomLevel_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pClustersBottomLevel = pClustersBottomLevel_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV &
-      setPTriangleClusters( ClusterAccelerationStructureTriangleClusterInputNV * pTriangleClusters_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTriangleClusters = pTriangleClusters_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureOpInputNV &
-      setPMoveObjects( ClusterAccelerationStructureMoveObjectsInputNV * pMoveObjects_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pMoveObjects = pMoveObjects_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureOpInputNV const &() const
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureOpInputNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureOpInputNV &()
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureOpInputNV *>( this );
-    }
-
-#ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    ClusterAccelerationStructureClustersBottomLevelInputNV * pClustersBottomLevel;
-    ClusterAccelerationStructureTriangleClusterInputNV *     pTriangleClusters;
-    ClusterAccelerationStructureMoveObjectsInputNV *         pMoveObjects;
-#else
-    VkClusterAccelerationStructureClustersBottomLevelInputNV * pClustersBottomLevel;
-    VkClusterAccelerationStructureTriangleClusterInputNV *     pTriangleClusters;
-    VkClusterAccelerationStructureMoveObjectsInputNV *         pMoveObjects;
-#endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureOpInputNV>
-  {
-    using Type = ClusterAccelerationStructureOpInputNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureInputInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureInputInfoNV.html
-  struct ClusterAccelerationStructureInputInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureInputInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eClusterAccelerationStructureInputInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      ClusterAccelerationStructureInputInfoNV( uint32_t                              maxAccelerationStructureCount_ = {},
-                                               BuildAccelerationStructureFlagsKHR    flags_                         = {},
-                                               ClusterAccelerationStructureOpTypeNV  opType_  = ClusterAccelerationStructureOpTypeNV::eMoveObjects,
-                                               ClusterAccelerationStructureOpModeNV  opMode_  = ClusterAccelerationStructureOpModeNV::eImplicitDestinations,
-                                               ClusterAccelerationStructureOpInputNV opInput_ = {},
-                                               void *                                pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxAccelerationStructureCount{ maxAccelerationStructureCount_ }
-      , flags{ flags_ }
-      , opType{ opType_ }
-      , opMode{ opMode_ }
-      , opInput{ opInput_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV( ClusterAccelerationStructureInputInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureInputInfoNV( VkClusterAccelerationStructureInputInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureInputInfoNV( *reinterpret_cast<ClusterAccelerationStructureInputInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureInputInfoNV & operator=( ClusterAccelerationStructureInputInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureInputInfoNV & operator=( VkClusterAccelerationStructureInputInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureInputInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV &
-      setMaxAccelerationStructureCount( uint32_t maxAccelerationStructureCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxAccelerationStructureCount = maxAccelerationStructureCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV & setFlags( BuildAccelerationStructureFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV & setOpType( ClusterAccelerationStructureOpTypeNV opType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opType = opType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV & setOpMode( ClusterAccelerationStructureOpModeNV opMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opMode = opMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInputInfoNV & setOpInput( ClusterAccelerationStructureOpInputNV const & opInput_ ) VULKAN_HPP_NOEXCEPT
-    {
-      opInput = opInput_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureInputInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureInputInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInputInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureInputInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInputInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureInputInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInputInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureInputInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               BuildAccelerationStructureFlagsKHR const &,
-               ClusterAccelerationStructureOpTypeNV const &,
-               ClusterAccelerationStructureOpModeNV const &,
-               ClusterAccelerationStructureOpInputNV const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxAccelerationStructureCount, flags, opType, opMode, opInput );
-    }
-#endif
-
-  public:
-    StructureType                         sType                         = StructureType::eClusterAccelerationStructureInputInfoNV;
-    void *                                pNext                         = {};
-    uint32_t                              maxAccelerationStructureCount = {};
-    BuildAccelerationStructureFlagsKHR    flags                         = {};
-    ClusterAccelerationStructureOpTypeNV  opType                        = ClusterAccelerationStructureOpTypeNV::eMoveObjects;
-    ClusterAccelerationStructureOpModeNV  opMode                        = ClusterAccelerationStructureOpModeNV::eImplicitDestinations;
-    ClusterAccelerationStructureOpInputNV opInput                       = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureInputInfoNV>
-  {
-    using Type = ClusterAccelerationStructureInputInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eClusterAccelerationStructureInputInfoNV>
-  {
-    using Type = ClusterAccelerationStructureInputInfoNV;
-  };
-
-  // wrapper struct for struct VkStridedDeviceAddressRegionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkStridedDeviceAddressRegionKHR.html
-  struct StridedDeviceAddressRegionKHR
-  {
-    using NativeType = VkStridedDeviceAddressRegionKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRegionKHR( DeviceAddress deviceAddress_ = {}, DeviceSize stride_ = {}, DeviceSize size_ = {} ) VULKAN_HPP_NOEXCEPT
-      : deviceAddress{ deviceAddress_ }
-      , stride{ stride_ }
-      , size{ size_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRegionKHR( StridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    StridedDeviceAddressRegionKHR( VkStridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : StridedDeviceAddressRegionKHR( *reinterpret_cast<StridedDeviceAddressRegionKHR const *>( &rhs ) )
-    {
-    }
-
-    StridedDeviceAddressRegionKHR & operator=( StridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    StridedDeviceAddressRegionKHR & operator=( VkStridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<StridedDeviceAddressRegionKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      deviceAddress = deviceAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setStride( DeviceSize stride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stride = stride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkStridedDeviceAddressRegionKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRegionKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkStridedDeviceAddressRegionKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRegionKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRegionKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkStridedDeviceAddressRegionKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( deviceAddress, stride, size );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( StridedDeviceAddressRegionKHR const & ) const = default;
-#else
-    bool operator==( StridedDeviceAddressRegionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( deviceAddress == rhs.deviceAddress ) && ( stride == rhs.stride ) && ( size == rhs.size );
-#  endif
-    }
-
-    bool operator!=( StridedDeviceAddressRegionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress deviceAddress = {};
-    DeviceSize    stride        = {};
-    DeviceSize    size          = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkStridedDeviceAddressRegionKHR>
-  {
-    using Type = StridedDeviceAddressRegionKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureCommandsInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureCommandsInfoNV.html
-  struct ClusterAccelerationStructureCommandsInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureCommandsInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eClusterAccelerationStructureCommandsInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV( ClusterAccelerationStructureInputInfoNV              input_                  = {},
-                                                                        DeviceAddress                                        dstImplicitData_        = {},
-                                                                        DeviceAddress                                        scratchData_            = {},
-                                                                        StridedDeviceAddressRegionKHR                        dstAddressesArray_      = {},
-                                                                        StridedDeviceAddressRegionKHR                        dstSizesArray_          = {},
-                                                                        StridedDeviceAddressRegionKHR                        srcInfosArray_          = {},
-                                                                        DeviceAddress                                        srcInfosCount_          = {},
-                                                                        ClusterAccelerationStructureAddressResolutionFlagsNV addressResolutionFlags_ = {},
-                                                                        void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , input{ input_ }
-      , dstImplicitData{ dstImplicitData_ }
-      , scratchData{ scratchData_ }
-      , dstAddressesArray{ dstAddressesArray_ }
-      , dstSizesArray{ dstSizesArray_ }
-      , srcInfosArray{ srcInfosArray_ }
-      , srcInfosCount{ srcInfosCount_ }
-      , addressResolutionFlags{ addressResolutionFlags_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV( ClusterAccelerationStructureCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureCommandsInfoNV( VkClusterAccelerationStructureCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureCommandsInfoNV( *reinterpret_cast<ClusterAccelerationStructureCommandsInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureCommandsInfoNV & operator=( ClusterAccelerationStructureCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureCommandsInfoNV & operator=( VkClusterAccelerationStructureCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureCommandsInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV & setInput( ClusterAccelerationStructureInputInfoNV const & input_ ) VULKAN_HPP_NOEXCEPT
-    {
-      input = input_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV & setDstImplicitData( DeviceAddress dstImplicitData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstImplicitData = dstImplicitData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV & setScratchData( DeviceAddress scratchData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      scratchData = scratchData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV &
-      setDstAddressesArray( StridedDeviceAddressRegionKHR const & dstAddressesArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstAddressesArray = dstAddressesArray_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV &
-      setDstSizesArray( StridedDeviceAddressRegionKHR const & dstSizesArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstSizesArray = dstSizesArray_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV &
-      setSrcInfosArray( StridedDeviceAddressRegionKHR const & srcInfosArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcInfosArray = srcInfosArray_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV & setSrcInfosCount( DeviceAddress srcInfosCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcInfosCount = srcInfosCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureCommandsInfoNV &
-      setAddressResolutionFlags( ClusterAccelerationStructureAddressResolutionFlagsNV addressResolutionFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      addressResolutionFlags = addressResolutionFlags_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureCommandsInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureCommandsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureCommandsInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureCommandsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureCommandsInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureCommandsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureCommandsInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureCommandsInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               ClusterAccelerationStructureInputInfoNV const &,
-               DeviceAddress const &,
-               DeviceAddress const &,
-               StridedDeviceAddressRegionKHR const &,
-               StridedDeviceAddressRegionKHR const &,
-               StridedDeviceAddressRegionKHR const &,
-               DeviceAddress const &,
-               ClusterAccelerationStructureAddressResolutionFlagsNV const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie(
-        sType, pNext, input, dstImplicitData, scratchData, dstAddressesArray, dstSizesArray, srcInfosArray, srcInfosCount, addressResolutionFlags );
-    }
-#endif
-
-  public:
-    StructureType                                        sType                  = StructureType::eClusterAccelerationStructureCommandsInfoNV;
-    void *                                               pNext                  = {};
-    ClusterAccelerationStructureInputInfoNV              input                  = {};
-    DeviceAddress                                        dstImplicitData        = {};
-    DeviceAddress                                        scratchData            = {};
-    StridedDeviceAddressRegionKHR                        dstAddressesArray      = {};
-    StridedDeviceAddressRegionKHR                        dstSizesArray          = {};
-    StridedDeviceAddressRegionKHR                        srcInfosArray          = {};
-    DeviceAddress                                        srcInfosCount          = {};
-    ClusterAccelerationStructureAddressResolutionFlagsNV addressResolutionFlags = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureCommandsInfoNV>
-  {
-    using Type = ClusterAccelerationStructureCommandsInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eClusterAccelerationStructureCommandsInfoNV>
-  {
-    using Type = ClusterAccelerationStructureCommandsInfoNV;
-  };
-
-  // wrapper struct for struct VkClusterAccelerationStructureGetTemplateIndicesInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureGetTemplateIndicesInfoNV.html
-  struct ClusterAccelerationStructureGetTemplateIndicesInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureGetTemplateIndicesInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureGetTemplateIndicesInfoNV( DeviceAddress clusterTemplateAddress_ = {} ) VULKAN_HPP_NOEXCEPT
-      : clusterTemplateAddress{ clusterTemplateAddress_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureGetTemplateIndicesInfoNV( ClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureGetTemplateIndicesInfoNV( VkClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureGetTemplateIndicesInfoNV( *reinterpret_cast<ClusterAccelerationStructureGetTemplateIndicesInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureGetTemplateIndicesInfoNV &
-      operator=( ClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureGetTemplateIndicesInfoNV & operator=( VkClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureGetTemplateIndicesInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureGetTemplateIndicesInfoNV &
-      setClusterTemplateAddress( DeviceAddress clusterTemplateAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterTemplateAddress = clusterTemplateAddress_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureGetTemplateIndicesInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureGetTemplateIndicesInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGetTemplateIndicesInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureGetTemplateIndicesInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGetTemplateIndicesInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureGetTemplateIndicesInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureGetTemplateIndicesInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureGetTemplateIndicesInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( clusterTemplateAddress );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureGetTemplateIndicesInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( clusterTemplateAddress == rhs.clusterTemplateAddress );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureGetTemplateIndicesInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress clusterTemplateAddress = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureGetTemplateIndicesInfoNV>
-  {
-    using Type = ClusterAccelerationStructureGetTemplateIndicesInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureInstantiateClusterInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureInstantiateClusterInfoNV.html
-  struct ClusterAccelerationStructureInstantiateClusterInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureInstantiateClusterInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureInstantiateClusterInfoNV( uint32_t               clusterIdOffset_        = {},
-                                                                               uint32_t               geometryIndexOffset_    = {},
-                                                                               uint32_t               reserved_               = {},
-                                                                               DeviceAddress          clusterTemplateAddress_ = {},
-                                                                               StridedDeviceAddressNV vertexBuffer_           = {} ) VULKAN_HPP_NOEXCEPT
-      : clusterIdOffset{ clusterIdOffset_ }
-      , geometryIndexOffset{ geometryIndexOffset_ }
-      , reserved{ reserved_ }
-      , clusterTemplateAddress{ clusterTemplateAddress_ }
-      , vertexBuffer{ vertexBuffer_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureInstantiateClusterInfoNV( ClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureInstantiateClusterInfoNV( VkClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureInstantiateClusterInfoNV( *reinterpret_cast<ClusterAccelerationStructureInstantiateClusterInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureInstantiateClusterInfoNV &
-      operator=( ClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureInstantiateClusterInfoNV & operator=( VkClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureInstantiateClusterInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInstantiateClusterInfoNV & setClusterIdOffset( uint32_t clusterIdOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterIdOffset = clusterIdOffset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInstantiateClusterInfoNV & setGeometryIndexOffset( uint32_t geometryIndexOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      geometryIndexOffset = geometryIndexOffset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInstantiateClusterInfoNV & setReserved( uint32_t reserved_ ) VULKAN_HPP_NOEXCEPT
-    {
-      reserved = reserved_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInstantiateClusterInfoNV &
-      setClusterTemplateAddress( DeviceAddress clusterTemplateAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterTemplateAddress = clusterTemplateAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureInstantiateClusterInfoNV &
-      setVertexBuffer( StridedDeviceAddressNV const & vertexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBuffer = vertexBuffer_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureInstantiateClusterInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureInstantiateClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInstantiateClusterInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureInstantiateClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInstantiateClusterInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureInstantiateClusterInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureInstantiateClusterInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureInstantiateClusterInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, DeviceAddress const &, StridedDeviceAddressNV const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( clusterIdOffset, geometryIndexOffset, reserved, clusterTemplateAddress, vertexBuffer );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureInstantiateClusterInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( clusterIdOffset == rhs.clusterIdOffset ) && ( geometryIndexOffset == rhs.geometryIndexOffset ) && ( reserved == rhs.reserved ) &&
-             ( clusterTemplateAddress == rhs.clusterTemplateAddress ) && ( vertexBuffer == rhs.vertexBuffer );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureInstantiateClusterInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t               clusterIdOffset = {};
-    uint32_t               geometryIndexOffset : 24;
-    uint32_t               reserved            : 8;
-    DeviceAddress          clusterTemplateAddress = {};
-    StridedDeviceAddressNV vertexBuffer           = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureInstantiateClusterInfoNV>
-  {
-    using Type = ClusterAccelerationStructureInstantiateClusterInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkClusterAccelerationStructureMoveObjectsInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkClusterAccelerationStructureMoveObjectsInfoNV.html
-  struct ClusterAccelerationStructureMoveObjectsInfoNV
-  {
-    using NativeType = VkClusterAccelerationStructureMoveObjectsInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ClusterAccelerationStructureMoveObjectsInfoNV( DeviceAddress srcAccelerationStructure_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcAccelerationStructure{ srcAccelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      ClusterAccelerationStructureMoveObjectsInfoNV( ClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ClusterAccelerationStructureMoveObjectsInfoNV( VkClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ClusterAccelerationStructureMoveObjectsInfoNV( *reinterpret_cast<ClusterAccelerationStructureMoveObjectsInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ClusterAccelerationStructureMoveObjectsInfoNV & operator=( ClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ClusterAccelerationStructureMoveObjectsInfoNV & operator=( VkClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ClusterAccelerationStructureMoveObjectsInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ClusterAccelerationStructureMoveObjectsInfoNV &
-      setSrcAccelerationStructure( DeviceAddress srcAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcAccelerationStructure = srcAccelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkClusterAccelerationStructureMoveObjectsInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkClusterAccelerationStructureMoveObjectsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkClusterAccelerationStructureMoveObjectsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkClusterAccelerationStructureMoveObjectsInfoNV *>( this );
-    }
-
-    operator VkClusterAccelerationStructureMoveObjectsInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkClusterAccelerationStructureMoveObjectsInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( srcAccelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ClusterAccelerationStructureMoveObjectsInfoNV const & ) const = default;
-#else
-    bool operator==( ClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( srcAccelerationStructure == rhs.srcAccelerationStructure );
-#  endif
-    }
-
-    bool operator!=( ClusterAccelerationStructureMoveObjectsInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress srcAccelerationStructure = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkClusterAccelerationStructureMoveObjectsInfoNV>
-  {
-    using Type = ClusterAccelerationStructureMoveObjectsInfoNV;
-  };
-#endif
-
-  // wrapper struct for struct VkCoarseSampleLocationNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCoarseSampleLocationNV.html
   struct CoarseSampleLocationNV
   {
     using NativeType = VkCoarseSampleLocationNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR CoarseSampleLocationNV( uint32_t pixelX_ = {}, uint32_t pixelY_ = {}, uint32_t sample_ = {} ) VULKAN_HPP_NOEXCEPT
-      : pixelX{ pixelX_ }
-      , pixelY{ pixelY_ }
-      , sample{ sample_ }
+      : pixelX( pixelX_ )
+      , pixelY( pixelY_ )
+      , sample( sample_ )
     {
     }
 
@@ -19657,15 +13902,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CoarseSampleLocationNV & operator=( CoarseSampleLocationNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CoarseSampleLocationNV & operator=( VkCoarseSampleLocationNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CoarseSampleLocationNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CoarseSampleLocationNV & setPixelX( uint32_t pixelX_ ) VULKAN_HPP_NOEXCEPT
     {
       pixelX = pixelX_;
@@ -19683,7 +13928,7 @@ namespace VULKAN_HPP_NAMESPACE
       sample = sample_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCoarseSampleLocationNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -19695,18 +13940,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCoarseSampleLocationNV *>( this );
     }
 
-    operator VkCoarseSampleLocationNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCoarseSampleLocationNV *>( this );
-    }
-
-    operator VkCoarseSampleLocationNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCoarseSampleLocationNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( pixelX, pixelY, sample );
     }
@@ -19736,28 +13976,20 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t sample = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCoarseSampleLocationNV>
-  {
-    using Type = CoarseSampleLocationNV;
-  };
-#endif
-
-  // wrapper struct for struct VkCoarseSampleOrderCustomNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCoarseSampleOrderCustomNV.html
   struct CoarseSampleOrderCustomNV
   {
     using NativeType = VkCoarseSampleOrderCustomNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CoarseSampleOrderCustomNV( ShadingRatePaletteEntryNV      shadingRate_         = ShadingRatePaletteEntryNV::eNoInvocations,
-                                                    uint32_t                       sampleCount_         = {},
-                                                    uint32_t                       sampleLocationCount_ = {},
-                                                    const CoarseSampleLocationNV * pSampleLocations_    = {} ) VULKAN_HPP_NOEXCEPT
-      : shadingRate{ shadingRate_ }
-      , sampleCount{ sampleCount_ }
-      , sampleLocationCount{ sampleLocationCount_ }
-      , pSampleLocations{ pSampleLocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CoarseSampleOrderCustomNV( VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV shadingRate_ = VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV::eNoInvocations,
+                                 uint32_t                                        sampleCount_ = {},
+                                 uint32_t                                        sampleLocationCount_   = {},
+                                 const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV * pSampleLocations_ = {} ) VULKAN_HPP_NOEXCEPT
+      : shadingRate( shadingRate_ )
+      , sampleCount( sampleCount_ )
+      , sampleLocationCount( sampleLocationCount_ )
+      , pSampleLocations( pSampleLocations_ )
     {
     }
 
@@ -19769,9 +14001,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CoarseSampleOrderCustomNV( ShadingRatePaletteEntryNV                                     shadingRate_,
-                               uint32_t                                                      sampleCount_,
-                               ArrayProxyNoTemporaries<const CoarseSampleLocationNV> const & sampleLocations_ )
+    CoarseSampleOrderCustomNV( VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV                                                           shadingRate_,
+                               uint32_t                                                                                                  sampleCount_,
+                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV> const & sampleLocations_ )
       : shadingRate( shadingRate_ )
       , sampleCount( sampleCount_ )
       , sampleLocationCount( static_cast<uint32_t>( sampleLocations_.size() ) )
@@ -19781,16 +14013,16 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CoarseSampleOrderCustomNV & operator=( CoarseSampleOrderCustomNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CoarseSampleOrderCustomNV & operator=( VkCoarseSampleOrderCustomNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CoarseSampleOrderCustomNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CoarseSampleOrderCustomNV & setShadingRate( ShadingRatePaletteEntryNV shadingRate_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CoarseSampleOrderCustomNV & setShadingRate( VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV shadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRate = shadingRate_;
       return *this;
@@ -19808,21 +14040,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CoarseSampleOrderCustomNV & setPSampleLocations( const CoarseSampleLocationNV * pSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CoarseSampleOrderCustomNV &
+      setPSampleLocations( const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV * pSampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       pSampleLocations = pSampleLocations_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CoarseSampleOrderCustomNV & setSampleLocations( ArrayProxyNoTemporaries<const CoarseSampleLocationNV> const & sampleLocations_ ) VULKAN_HPP_NOEXCEPT
+    CoarseSampleOrderCustomNV & setSampleLocations(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV> const & sampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationCount = static_cast<uint32_t>( sampleLocations_.size() );
       pSampleLocations    = sampleLocations_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCoarseSampleOrderCustomNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -19834,18 +14068,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCoarseSampleOrderCustomNV *>( this );
     }
 
-    operator VkCoarseSampleOrderCustomNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCoarseSampleOrderCustomNV *>( this );
-    }
-
-    operator VkCoarseSampleOrderCustomNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCoarseSampleOrderCustomNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ShadingRatePaletteEntryNV const &, uint32_t const &, uint32_t const &, const CoarseSampleLocationNV * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV const &,
+               uint32_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( shadingRate, sampleCount, sampleLocationCount, pSampleLocations );
@@ -19872,36 +14103,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ShadingRatePaletteEntryNV      shadingRate         = ShadingRatePaletteEntryNV::eNoInvocations;
-    uint32_t                       sampleCount         = {};
-    uint32_t                       sampleLocationCount = {};
-    const CoarseSampleLocationNV * pSampleLocations    = {};
+    VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV      shadingRate         = VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV::eNoInvocations;
+    uint32_t                                             sampleCount         = {};
+    uint32_t                                             sampleLocationCount = {};
+    const VULKAN_HPP_NAMESPACE::CoarseSampleLocationNV * pSampleLocations    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCoarseSampleOrderCustomNV>
-  {
-    using Type = CoarseSampleOrderCustomNV;
-  };
-#endif
-
-  // wrapper struct for struct VkColorBlendAdvancedEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkColorBlendAdvancedEXT.html
   struct ColorBlendAdvancedEXT
   {
     using NativeType = VkColorBlendAdvancedEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ColorBlendAdvancedEXT( BlendOp         advancedBlendOp_  = BlendOp::eAdd,
-                                                Bool32          srcPremultiplied_ = {},
-                                                Bool32          dstPremultiplied_ = {},
-                                                BlendOverlapEXT blendOverlap_     = BlendOverlapEXT::eUncorrelated,
-                                                Bool32          clampResults_     = {} ) VULKAN_HPP_NOEXCEPT
-      : advancedBlendOp{ advancedBlendOp_ }
-      , srcPremultiplied{ srcPremultiplied_ }
-      , dstPremultiplied{ dstPremultiplied_ }
-      , blendOverlap{ blendOverlap_ }
-      , clampResults{ clampResults_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ColorBlendAdvancedEXT( VULKAN_HPP_NAMESPACE::BlendOp         advancedBlendOp_  = VULKAN_HPP_NAMESPACE::BlendOp::eAdd,
+                                                VULKAN_HPP_NAMESPACE::Bool32          srcPremultiplied_ = {},
+                                                VULKAN_HPP_NAMESPACE::Bool32          dstPremultiplied_ = {},
+                                                VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap_     = VULKAN_HPP_NAMESPACE::BlendOverlapEXT::eUncorrelated,
+                                                VULKAN_HPP_NAMESPACE::Bool32          clampResults_     = {} ) VULKAN_HPP_NOEXCEPT
+      : advancedBlendOp( advancedBlendOp_ )
+      , srcPremultiplied( srcPremultiplied_ )
+      , dstPremultiplied( dstPremultiplied_ )
+      , blendOverlap( blendOverlap_ )
+      , clampResults( clampResults_ )
     {
     }
 
@@ -19913,45 +14135,45 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ColorBlendAdvancedEXT & operator=( ColorBlendAdvancedEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ColorBlendAdvancedEXT & operator=( VkColorBlendAdvancedEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ColorBlendAdvancedEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ColorBlendAdvancedEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setAdvancedBlendOp( BlendOp advancedBlendOp_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setAdvancedBlendOp( VULKAN_HPP_NAMESPACE::BlendOp advancedBlendOp_ ) VULKAN_HPP_NOEXCEPT
     {
       advancedBlendOp = advancedBlendOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setSrcPremultiplied( Bool32 srcPremultiplied_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setSrcPremultiplied( VULKAN_HPP_NAMESPACE::Bool32 srcPremultiplied_ ) VULKAN_HPP_NOEXCEPT
     {
       srcPremultiplied = srcPremultiplied_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setDstPremultiplied( Bool32 dstPremultiplied_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setDstPremultiplied( VULKAN_HPP_NAMESPACE::Bool32 dstPremultiplied_ ) VULKAN_HPP_NOEXCEPT
     {
       dstPremultiplied = dstPremultiplied_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setBlendOverlap( BlendOverlapEXT blendOverlap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setBlendOverlap( VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap_ ) VULKAN_HPP_NOEXCEPT
     {
       blendOverlap = blendOverlap_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setClampResults( Bool32 clampResults_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendAdvancedEXT & setClampResults( VULKAN_HPP_NAMESPACE::Bool32 clampResults_ ) VULKAN_HPP_NOEXCEPT
     {
       clampResults = clampResults_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkColorBlendAdvancedEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -19963,18 +14185,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkColorBlendAdvancedEXT *>( this );
     }
 
-    operator VkColorBlendAdvancedEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkColorBlendAdvancedEXT *>( this );
-    }
-
-    operator VkColorBlendAdvancedEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkColorBlendAdvancedEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<BlendOp const &, Bool32 const &, Bool32 const &, BlendOverlapEXT const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::BlendOp const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::BlendOverlapEXT const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( advancedBlendOp, srcPremultiplied, dstPremultiplied, blendOverlap, clampResults );
     }
@@ -20000,39 +14221,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    BlendOp         advancedBlendOp  = BlendOp::eAdd;
-    Bool32          srcPremultiplied = {};
-    Bool32          dstPremultiplied = {};
-    BlendOverlapEXT blendOverlap     = BlendOverlapEXT::eUncorrelated;
-    Bool32          clampResults     = {};
+    VULKAN_HPP_NAMESPACE::BlendOp         advancedBlendOp  = VULKAN_HPP_NAMESPACE::BlendOp::eAdd;
+    VULKAN_HPP_NAMESPACE::Bool32          srcPremultiplied = {};
+    VULKAN_HPP_NAMESPACE::Bool32          dstPremultiplied = {};
+    VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap     = VULKAN_HPP_NAMESPACE::BlendOverlapEXT::eUncorrelated;
+    VULKAN_HPP_NAMESPACE::Bool32          clampResults     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkColorBlendAdvancedEXT>
-  {
-    using Type = ColorBlendAdvancedEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkColorBlendEquationEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkColorBlendEquationEXT.html
   struct ColorBlendEquationEXT
   {
     using NativeType = VkColorBlendEquationEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ColorBlendEquationEXT( BlendFactor srcColorBlendFactor_ = BlendFactor::eZero,
-                                                BlendFactor dstColorBlendFactor_ = BlendFactor::eZero,
-                                                BlendOp     colorBlendOp_        = BlendOp::eAdd,
-                                                BlendFactor srcAlphaBlendFactor_ = BlendFactor::eZero,
-                                                BlendFactor dstAlphaBlendFactor_ = BlendFactor::eZero,
-                                                BlendOp     alphaBlendOp_        = BlendOp::eAdd ) VULKAN_HPP_NOEXCEPT
-      : srcColorBlendFactor{ srcColorBlendFactor_ }
-      , dstColorBlendFactor{ dstColorBlendFactor_ }
-      , colorBlendOp{ colorBlendOp_ }
-      , srcAlphaBlendFactor{ srcAlphaBlendFactor_ }
-      , dstAlphaBlendFactor{ dstAlphaBlendFactor_ }
-      , alphaBlendOp{ alphaBlendOp_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ColorBlendEquationEXT( VULKAN_HPP_NAMESPACE::BlendFactor srcColorBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                VULKAN_HPP_NAMESPACE::BlendFactor dstColorBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                VULKAN_HPP_NAMESPACE::BlendOp     colorBlendOp_        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd,
+                                                VULKAN_HPP_NAMESPACE::BlendFactor srcAlphaBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                VULKAN_HPP_NAMESPACE::BlendFactor dstAlphaBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                VULKAN_HPP_NAMESPACE::BlendOp     alphaBlendOp_ = VULKAN_HPP_NAMESPACE::BlendOp::eAdd ) VULKAN_HPP_NOEXCEPT
+      : srcColorBlendFactor( srcColorBlendFactor_ )
+      , dstColorBlendFactor( dstColorBlendFactor_ )
+      , colorBlendOp( colorBlendOp_ )
+      , srcAlphaBlendFactor( srcAlphaBlendFactor_ )
+      , dstAlphaBlendFactor( dstAlphaBlendFactor_ )
+      , alphaBlendOp( alphaBlendOp_ )
     {
     }
 
@@ -20044,51 +14256,51 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ColorBlendEquationEXT & operator=( ColorBlendEquationEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ColorBlendEquationEXT & operator=( VkColorBlendEquationEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ColorBlendEquationEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ColorBlendEquationEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setSrcColorBlendFactor( BlendFactor srcColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setSrcColorBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor srcColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       srcColorBlendFactor = srcColorBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setDstColorBlendFactor( BlendFactor dstColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setDstColorBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor dstColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       dstColorBlendFactor = dstColorBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setColorBlendOp( BlendOp colorBlendOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setColorBlendOp( VULKAN_HPP_NAMESPACE::BlendOp colorBlendOp_ ) VULKAN_HPP_NOEXCEPT
     {
       colorBlendOp = colorBlendOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setSrcAlphaBlendFactor( BlendFactor srcAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setSrcAlphaBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor srcAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAlphaBlendFactor = srcAlphaBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setDstAlphaBlendFactor( BlendFactor dstAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setDstAlphaBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor dstAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAlphaBlendFactor = dstAlphaBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setAlphaBlendOp( BlendOp alphaBlendOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ColorBlendEquationEXT & setAlphaBlendOp( VULKAN_HPP_NAMESPACE::BlendOp alphaBlendOp_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaBlendOp = alphaBlendOp_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkColorBlendEquationEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20100,18 +14312,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkColorBlendEquationEXT *>( this );
     }
 
-    operator VkColorBlendEquationEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkColorBlendEquationEXT *>( this );
-    }
-
-    operator VkColorBlendEquationEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkColorBlendEquationEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<BlendFactor const &, BlendFactor const &, BlendOp const &, BlendFactor const &, BlendFactor const &, BlendOp const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendOp const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendOp const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcColorBlendFactor, dstColorBlendFactor, colorBlendOp, srcAlphaBlendFactor, dstAlphaBlendFactor, alphaBlendOp );
@@ -20138,23 +14349,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    BlendFactor srcColorBlendFactor = BlendFactor::eZero;
-    BlendFactor dstColorBlendFactor = BlendFactor::eZero;
-    BlendOp     colorBlendOp        = BlendOp::eAdd;
-    BlendFactor srcAlphaBlendFactor = BlendFactor::eZero;
-    BlendFactor dstAlphaBlendFactor = BlendFactor::eZero;
-    BlendOp     alphaBlendOp        = BlendOp::eAdd;
+    VULKAN_HPP_NAMESPACE::BlendFactor srcColorBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendFactor dstColorBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendOp     colorBlendOp        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd;
+    VULKAN_HPP_NAMESPACE::BlendFactor srcAlphaBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendFactor dstAlphaBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendOp     alphaBlendOp        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkColorBlendEquationEXT>
-  {
-    using Type = ColorBlendEquationEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkCommandBufferAllocateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferAllocateInfo.html
   struct CommandBufferAllocateInfo
   {
     using NativeType = VkCommandBufferAllocateInfo;
@@ -20162,15 +14364,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferAllocateInfo( CommandPool        commandPool_        = {},
-                                                    CommandBufferLevel level_              = CommandBufferLevel::ePrimary,
-                                                    uint32_t           commandBufferCount_ = {},
-                                                    const void *       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , commandPool{ commandPool_ }
-      , level{ level_ }
-      , commandBufferCount{ commandBufferCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferAllocateInfo( VULKAN_HPP_NAMESPACE::CommandPool        commandPool_ = {},
+                                                    VULKAN_HPP_NAMESPACE::CommandBufferLevel level_       = VULKAN_HPP_NAMESPACE::CommandBufferLevel::ePrimary,
+                                                    uint32_t                                 commandBufferCount_ = {},
+                                                    const void *                             pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , commandPool( commandPool_ )
+      , level( level_ )
+      , commandBufferCount( commandBufferCount_ )
     {
     }
 
@@ -20182,28 +14384,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandBufferAllocateInfo & operator=( CommandBufferAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferAllocateInfo & operator=( VkCommandBufferAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferAllocateInfo & setCommandPool( CommandPool commandPool_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferAllocateInfo & setCommandPool( VULKAN_HPP_NAMESPACE::CommandPool commandPool_ ) VULKAN_HPP_NOEXCEPT
     {
       commandPool = commandPool_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferAllocateInfo & setLevel( CommandBufferLevel level_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferAllocateInfo & setLevel( VULKAN_HPP_NAMESPACE::CommandBufferLevel level_ ) VULKAN_HPP_NOEXCEPT
     {
       level = level_;
       return *this;
@@ -20214,7 +14416,7 @@ namespace VULKAN_HPP_NAMESPACE
       commandBufferCount = commandBufferCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20226,18 +14428,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferAllocateInfo *>( this );
     }
 
-    operator VkCommandBufferAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferAllocateInfo *>( this );
-    }
-
-    operator VkCommandBufferAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CommandPool const &, CommandBufferLevel const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::CommandPool const &,
+               VULKAN_HPP_NAMESPACE::CommandBufferLevel const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, commandPool, level, commandBufferCount );
@@ -20264,28 +14464,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType              = StructureType::eCommandBufferAllocateInfo;
-    const void *       pNext              = {};
-    CommandPool        commandPool        = {};
-    CommandBufferLevel level              = CommandBufferLevel::ePrimary;
-    uint32_t           commandBufferCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType              = StructureType::eCommandBufferAllocateInfo;
+    const void *                             pNext              = {};
+    VULKAN_HPP_NAMESPACE::CommandPool        commandPool        = {};
+    VULKAN_HPP_NAMESPACE::CommandBufferLevel level              = VULKAN_HPP_NAMESPACE::CommandBufferLevel::ePrimary;
+    uint32_t                                 commandBufferCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferAllocateInfo>
-  {
-    using Type = CommandBufferAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferAllocateInfo>
   {
     using Type = CommandBufferAllocateInfo;
   };
 
-  // wrapper struct for struct VkCommandBufferInheritanceInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferInheritanceInfo.html
   struct CommandBufferInheritanceInfo
   {
     using NativeType = VkCommandBufferInheritanceInfo;
@@ -20293,21 +14484,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferInheritanceInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceInfo( RenderPass                  renderPass_           = {},
-                                                       uint32_t                    subpass_              = {},
-                                                       Framebuffer                 framebuffer_          = {},
-                                                       Bool32                      occlusionQueryEnable_ = {},
-                                                       QueryControlFlags           queryFlags_           = {},
-                                                       QueryPipelineStatisticFlags pipelineStatistics_   = {},
-                                                       const void *                pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , renderPass{ renderPass_ }
-      , subpass{ subpass_ }
-      , framebuffer{ framebuffer_ }
-      , occlusionQueryEnable{ occlusionQueryEnable_ }
-      , queryFlags{ queryFlags_ }
-      , pipelineStatistics{ pipelineStatistics_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceInfo( VULKAN_HPP_NAMESPACE::RenderPass                  renderPass_           = {},
+                                                       uint32_t                                          subpass_              = {},
+                                                       VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer_          = {},
+                                                       VULKAN_HPP_NAMESPACE::Bool32                      occlusionQueryEnable_ = {},
+                                                       VULKAN_HPP_NAMESPACE::QueryControlFlags           queryFlags_           = {},
+                                                       VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics_   = {},
+                                                       const void *                                      pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , renderPass( renderPass_ )
+      , subpass( subpass_ )
+      , framebuffer( framebuffer_ )
+      , occlusionQueryEnable( occlusionQueryEnable_ )
+      , queryFlags( queryFlags_ )
+      , pipelineStatistics( pipelineStatistics_ )
     {
     }
 
@@ -20319,22 +14510,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandBufferInheritanceInfo & operator=( CommandBufferInheritanceInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferInheritanceInfo & operator=( VkCommandBufferInheritanceInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferInheritanceInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setRenderPass( RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPass = renderPass_;
       return *this;
@@ -20346,30 +14537,31 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setFramebuffer( Framebuffer framebuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       framebuffer = framebuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setOcclusionQueryEnable( Bool32 occlusionQueryEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setOcclusionQueryEnable( VULKAN_HPP_NAMESPACE::Bool32 occlusionQueryEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       occlusionQueryEnable = occlusionQueryEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setQueryFlags( QueryControlFlags queryFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setQueryFlags( VULKAN_HPP_NAMESPACE::QueryControlFlags queryFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       queryFlags = queryFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo & setPipelineStatistics( QueryPipelineStatisticFlags pipelineStatistics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceInfo &
+      setPipelineStatistics( VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineStatistics = pipelineStatistics_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferInheritanceInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20381,25 +14573,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferInheritanceInfo *>( this );
     }
 
-    operator VkCommandBufferInheritanceInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferInheritanceInfo *>( this );
-    }
-
-    operator VkCommandBufferInheritanceInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferInheritanceInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RenderPass const &,
+               VULKAN_HPP_NAMESPACE::RenderPass const &,
                uint32_t const &,
-               Framebuffer const &,
-               Bool32 const &,
-               QueryControlFlags const &,
-               QueryPipelineStatisticFlags const &>
+               VULKAN_HPP_NAMESPACE::Framebuffer const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::QueryControlFlags const &,
+               VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, renderPass, subpass, framebuffer, occlusionQueryEnable, queryFlags, pipelineStatistics );
@@ -20427,31 +14613,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                = StructureType::eCommandBufferInheritanceInfo;
-    const void *                pNext                = {};
-    RenderPass                  renderPass           = {};
-    uint32_t                    subpass              = {};
-    Framebuffer                 framebuffer          = {};
-    Bool32                      occlusionQueryEnable = {};
-    QueryControlFlags           queryFlags           = {};
-    QueryPipelineStatisticFlags pipelineStatistics   = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                = StructureType::eCommandBufferInheritanceInfo;
+    const void *                                      pNext                = {};
+    VULKAN_HPP_NAMESPACE::RenderPass                  renderPass           = {};
+    uint32_t                                          subpass              = {};
+    VULKAN_HPP_NAMESPACE::Framebuffer                 framebuffer          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      occlusionQueryEnable = {};
+    VULKAN_HPP_NAMESPACE::QueryControlFlags           queryFlags           = {};
+    VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferInheritanceInfo>
-  {
-    using Type = CommandBufferInheritanceInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferInheritanceInfo>
   {
     using Type = CommandBufferInheritanceInfo;
   };
 
-  // wrapper struct for struct VkCommandBufferBeginInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferBeginInfo.html
   struct CommandBufferBeginInfo
   {
     using NativeType = VkCommandBufferBeginInfo;
@@ -20459,13 +14636,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferBeginInfo( CommandBufferUsageFlags              flags_            = {},
-                                                 const CommandBufferInheritanceInfo * pInheritanceInfo_ = {},
-                                                 const void *                         pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pInheritanceInfo{ pInheritanceInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferBeginInfo( VULKAN_HPP_NAMESPACE::CommandBufferUsageFlags              flags_            = {},
+                                                 const VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo * pInheritanceInfo_ = {},
+                                                 const void *                                               pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pInheritanceInfo( pInheritanceInfo_ )
     {
     }
 
@@ -20477,33 +14654,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandBufferBeginInfo & operator=( CommandBufferBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferBeginInfo & operator=( VkCommandBufferBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferBeginInfo & setFlags( CommandBufferUsageFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferBeginInfo & setFlags( VULKAN_HPP_NAMESPACE::CommandBufferUsageFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferBeginInfo & setPInheritanceInfo( const CommandBufferInheritanceInfo * pInheritanceInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferBeginInfo &
+      setPInheritanceInfo( const VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo * pInheritanceInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pInheritanceInfo = pInheritanceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20515,18 +14693,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferBeginInfo *>( this );
     }
 
-    operator VkCommandBufferBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferBeginInfo *>( this );
-    }
-
-    operator VkCommandBufferBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CommandBufferUsageFlags const &, const CommandBufferInheritanceInfo * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::CommandBufferUsageFlags const &,
+               const VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pInheritanceInfo );
@@ -20552,28 +14727,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType            = StructureType::eCommandBufferBeginInfo;
-    const void *                         pNext            = {};
-    CommandBufferUsageFlags              flags            = {};
-    const CommandBufferInheritanceInfo * pInheritanceInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType            = StructureType::eCommandBufferBeginInfo;
+    const void *                                               pNext            = {};
+    VULKAN_HPP_NAMESPACE::CommandBufferUsageFlags              flags            = {};
+    const VULKAN_HPP_NAMESPACE::CommandBufferInheritanceInfo * pInheritanceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferBeginInfo>
-  {
-    using Type = CommandBufferBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferBeginInfo>
   {
     using Type = CommandBufferBeginInfo;
   };
 
-  // wrapper struct for struct VkCommandBufferInheritanceConditionalRenderingInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferInheritanceConditionalRenderingInfoEXT.html
   struct CommandBufferInheritanceConditionalRenderingInfoEXT
   {
     using NativeType = VkCommandBufferInheritanceConditionalRenderingInfoEXT;
@@ -20581,11 +14746,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceConditionalRenderingInfoEXT( Bool32       conditionalRenderingEnable_ = {},
-                                                                              const void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , conditionalRenderingEnable{ conditionalRenderingEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceConditionalRenderingInfoEXT( VULKAN_HPP_NAMESPACE::Bool32 conditionalRenderingEnable_ = {},
+                                                                              const void *                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , conditionalRenderingEnable( conditionalRenderingEnable_ )
     {
     }
 
@@ -20599,15 +14764,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     CommandBufferInheritanceConditionalRenderingInfoEXT &
       operator=( CommandBufferInheritanceConditionalRenderingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferInheritanceConditionalRenderingInfoEXT & operator=( VkCommandBufferInheritanceConditionalRenderingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferInheritanceConditionalRenderingInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceConditionalRenderingInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceConditionalRenderingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -20615,12 +14780,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceConditionalRenderingInfoEXT &
-      setConditionalRenderingEnable( Bool32 conditionalRenderingEnable_ ) VULKAN_HPP_NOEXCEPT
+      setConditionalRenderingEnable( VULKAN_HPP_NAMESPACE::Bool32 conditionalRenderingEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       conditionalRenderingEnable = conditionalRenderingEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferInheritanceConditionalRenderingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20632,18 +14797,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferInheritanceConditionalRenderingInfoEXT *>( this );
     }
 
-    operator VkCommandBufferInheritanceConditionalRenderingInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferInheritanceConditionalRenderingInfoEXT *>( this );
-    }
-
-    operator VkCommandBufferInheritanceConditionalRenderingInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferInheritanceConditionalRenderingInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, conditionalRenderingEnable );
     }
@@ -20668,27 +14828,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT;
-    const void *  pNext                      = {};
-    Bool32        conditionalRenderingEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT;
+    const void *                        pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        conditionalRenderingEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferInheritanceConditionalRenderingInfoEXT>
-  {
-    using Type = CommandBufferInheritanceConditionalRenderingInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT>
   {
     using Type = CommandBufferInheritanceConditionalRenderingInfoEXT;
   };
 
-  // wrapper struct for struct VkCommandBufferInheritanceRenderPassTransformInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferInheritanceRenderPassTransformInfoQCOM.html
   struct CommandBufferInheritanceRenderPassTransformInfoQCOM
   {
     using NativeType = VkCommandBufferInheritanceRenderPassTransformInfoQCOM;
@@ -20696,13 +14846,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceRenderPassTransformInfoQCOM( SurfaceTransformFlagBitsKHR transform_  = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                                              Rect2D                      renderArea_ = {},
-                                                                              const void *                pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , transform{ transform_ }
-      , renderArea{ renderArea_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceRenderPassTransformInfoQCOM(
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_  = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+      VULKAN_HPP_NAMESPACE::Rect2D                      renderArea_ = {},
+      void *                                            pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , transform( transform_ )
+      , renderArea( renderArea_ )
     {
     }
 
@@ -20716,33 +14867,35 @@ namespace VULKAN_HPP_NAMESPACE
 
     CommandBufferInheritanceRenderPassTransformInfoQCOM &
       operator=( CommandBufferInheritanceRenderPassTransformInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferInheritanceRenderPassTransformInfoQCOM & operator=( VkCommandBufferInheritanceRenderPassTransformInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferInheritanceRenderPassTransformInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceRenderPassTransformInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM & setTransform( SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM &
+      setTransform( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
     {
       transform = transform_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM & setRenderArea( Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderPassTransformInfoQCOM &
+      setRenderArea( VULKAN_HPP_NAMESPACE::Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
     {
       renderArea = renderArea_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferInheritanceRenderPassTransformInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20754,18 +14907,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferInheritanceRenderPassTransformInfoQCOM *>( this );
     }
 
-    operator VkCommandBufferInheritanceRenderPassTransformInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferInheritanceRenderPassTransformInfoQCOM *>( this );
-    }
-
-    operator VkCommandBufferInheritanceRenderPassTransformInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferInheritanceRenderPassTransformInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceTransformFlagBitsKHR const &, Rect2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::Rect2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, transform, renderArea );
     }
@@ -20790,28 +14941,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType      = StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM;
-    const void *                pNext      = {};
-    SurfaceTransformFlagBitsKHR transform  = SurfaceTransformFlagBitsKHR::eIdentity;
-    Rect2D                      renderArea = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType      = StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM;
+    void *                                            pNext      = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform  = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::Rect2D                      renderArea = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferInheritanceRenderPassTransformInfoQCOM>
-  {
-    using Type = CommandBufferInheritanceRenderPassTransformInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM>
   {
     using Type = CommandBufferInheritanceRenderPassTransformInfoQCOM;
   };
 
-  // wrapper struct for struct VkCommandBufferInheritanceRenderingInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferInheritanceRenderingInfo.html
   struct CommandBufferInheritanceRenderingInfo
   {
     using NativeType = VkCommandBufferInheritanceRenderingInfo;
@@ -20819,23 +14960,24 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferInheritanceRenderingInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceRenderingInfo( RenderingFlags      flags_                   = {},
-                                                                uint32_t            viewMask_                = {},
-                                                                uint32_t            colorAttachmentCount_    = {},
-                                                                const Format *      pColorAttachmentFormats_ = {},
-                                                                Format              depthAttachmentFormat_   = Format::eUndefined,
-                                                                Format              stencilAttachmentFormat_ = Format::eUndefined,
-                                                                SampleCountFlagBits rasterizationSamples_    = SampleCountFlagBits::e1,
-                                                                const void *        pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , viewMask{ viewMask_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentFormats{ pColorAttachmentFormats_ }
-      , depthAttachmentFormat{ depthAttachmentFormat_ }
-      , stencilAttachmentFormat{ stencilAttachmentFormat_ }
-      , rasterizationSamples{ rasterizationSamples_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CommandBufferInheritanceRenderingInfo( VULKAN_HPP_NAMESPACE::RenderingFlags      flags_                   = {},
+                                             uint32_t                                  viewMask_                = {},
+                                             uint32_t                                  colorAttachmentCount_    = {},
+                                             const VULKAN_HPP_NAMESPACE::Format *      pColorAttachmentFormats_ = {},
+                                             VULKAN_HPP_NAMESPACE::Format              depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                             VULKAN_HPP_NAMESPACE::Format              stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                             VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_    = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                             const void *                              pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , viewMask( viewMask_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentFormats( pColorAttachmentFormats_ )
+      , depthAttachmentFormat( depthAttachmentFormat_ )
+      , stencilAttachmentFormat( stencilAttachmentFormat_ )
+      , rasterizationSamples( rasterizationSamples_ )
     {
     }
 
@@ -20847,13 +14989,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CommandBufferInheritanceRenderingInfo( RenderingFlags                                flags_,
-                                           uint32_t                                      viewMask_,
-                                           ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_,
-                                           Format                                        depthAttachmentFormat_   = Format::eUndefined,
-                                           Format                                        stencilAttachmentFormat_ = Format::eUndefined,
-                                           SampleCountFlagBits                           rasterizationSamples_    = SampleCountFlagBits::e1,
-                                           const void *                                  pNext_                   = nullptr )
+    CommandBufferInheritanceRenderingInfo( VULKAN_HPP_NAMESPACE::RenderingFlags                                                      flags_,
+                                           uint32_t                                                                                  viewMask_,
+                                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_,
+                                           VULKAN_HPP_NAMESPACE::Format              depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                           VULKAN_HPP_NAMESPACE::Format              stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                           VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_    = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                           const void *                              pNext_                   = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , viewMask( viewMask_ )
@@ -20867,22 +15009,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CommandBufferInheritanceRenderingInfo & operator=( CommandBufferInheritanceRenderingInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferInheritanceRenderingInfo & operator=( VkCommandBufferInheritanceRenderingInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferInheritanceRenderingInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceRenderingInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setFlags( RenderingFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setFlags( VULKAN_HPP_NAMESPACE::RenderingFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -20900,15 +15042,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setPColorAttachmentFormats( const Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo &
+      setPColorAttachmentFormats( const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentFormats = pColorAttachmentFormats_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CommandBufferInheritanceRenderingInfo &
-      setColorAttachmentFormats( ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    CommandBufferInheritanceRenderingInfo & setColorAttachmentFormats(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount    = static_cast<uint32_t>( colorAttachmentFormats_.size() );
       pColorAttachmentFormats = colorAttachmentFormats_.data();
@@ -20916,24 +15059,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setDepthAttachmentFormat( Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo &
+      setDepthAttachmentFormat( VULKAN_HPP_NAMESPACE::Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       depthAttachmentFormat = depthAttachmentFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setStencilAttachmentFormat( Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo &
+      setStencilAttachmentFormat( VULKAN_HPP_NAMESPACE::Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilAttachmentFormat = stencilAttachmentFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo & setRasterizationSamples( SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceRenderingInfo &
+      setRasterizationSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationSamples = rasterizationSamples_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferInheritanceRenderingInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -20945,26 +15091,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferInheritanceRenderingInfo *>( this );
     }
 
-    operator VkCommandBufferInheritanceRenderingInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferInheritanceRenderingInfo *>( this );
-    }
-
-    operator VkCommandBufferInheritanceRenderingInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferInheritanceRenderingInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RenderingFlags const &,
+               VULKAN_HPP_NAMESPACE::RenderingFlags const &,
                uint32_t const &,
                uint32_t const &,
-               const Format * const &,
-               Format const &,
-               Format const &,
-               SampleCountFlagBits const &>
+               const VULKAN_HPP_NAMESPACE::Format * const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -20994,25 +15134,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                   = StructureType::eCommandBufferInheritanceRenderingInfo;
-    const void *        pNext                   = {};
-    RenderingFlags      flags                   = {};
-    uint32_t            viewMask                = {};
-    uint32_t            colorAttachmentCount    = {};
-    const Format *      pColorAttachmentFormats = {};
-    Format              depthAttachmentFormat   = Format::eUndefined;
-    Format              stencilAttachmentFormat = Format::eUndefined;
-    SampleCountFlagBits rasterizationSamples    = SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::StructureType       sType                   = StructureType::eCommandBufferInheritanceRenderingInfo;
+    const void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::RenderingFlags      flags                   = {};
+    uint32_t                                  viewMask                = {};
+    uint32_t                                  colorAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::Format *      pColorAttachmentFormats = {};
+    VULKAN_HPP_NAMESPACE::Format              depthAttachmentFormat   = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format              stencilAttachmentFormat = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples    = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferInheritanceRenderingInfo>
-  {
-    using Type = CommandBufferInheritanceRenderingInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferInheritanceRenderingInfo>
   {
@@ -21021,20 +15153,19 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CommandBufferInheritanceRenderingInfoKHR = CommandBufferInheritanceRenderingInfo;
 
-  // wrapper struct for struct VkViewport, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViewport.html
   struct Viewport
   {
     using NativeType = VkViewport;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       Viewport( float x_ = {}, float y_ = {}, float width_ = {}, float height_ = {}, float minDepth_ = {}, float maxDepth_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
-      , width{ width_ }
-      , height{ height_ }
-      , minDepth{ minDepth_ }
-      , maxDepth{ maxDepth_ }
+      : x( x_ )
+      , y( y_ )
+      , width( width_ )
+      , height( height_ )
+      , minDepth( minDepth_ )
+      , maxDepth( maxDepth_ )
     {
     }
 
@@ -21043,15 +15174,15 @@ namespace VULKAN_HPP_NAMESPACE
     Viewport( VkViewport const & rhs ) VULKAN_HPP_NOEXCEPT : Viewport( *reinterpret_cast<Viewport const *>( &rhs ) ) {}
 
     Viewport & operator=( Viewport const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Viewport & operator=( VkViewport const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Viewport const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Viewport const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Viewport & setX( float x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -21087,7 +15218,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxDepth = maxDepth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkViewport const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21099,18 +15230,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkViewport *>( this );
     }
 
-    operator VkViewport const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkViewport *>( this );
-    }
-
-    operator VkViewport *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkViewport *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &, float const &, float const &, float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, float const &, float const &, float const &, float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y, width, height, minDepth, maxDepth );
     }
@@ -21144,16 +15270,6 @@ namespace VULKAN_HPP_NAMESPACE
     float maxDepth = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkViewport>
-  {
-    using Type = Viewport;
-  };
-#endif
-
-  // wrapper struct for struct VkCommandBufferInheritanceViewportScissorInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferInheritanceViewportScissorInfoNV.html
   struct CommandBufferInheritanceViewportScissorInfoNV
   {
     using NativeType = VkCommandBufferInheritanceViewportScissorInfoNV;
@@ -21161,15 +15277,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferInheritanceViewportScissorInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceViewportScissorInfoNV( Bool32           viewportScissor2D_  = {},
-                                                                        uint32_t         viewportDepthCount_ = {},
-                                                                        const Viewport * pViewportDepths_    = {},
-                                                                        const void *     pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , viewportScissor2D{ viewportScissor2D_ }
-      , viewportDepthCount{ viewportDepthCount_ }
-      , pViewportDepths{ pViewportDepths_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferInheritanceViewportScissorInfoNV( VULKAN_HPP_NAMESPACE::Bool32           viewportScissor2D_  = {},
+                                                                        uint32_t                               viewportDepthCount_ = {},
+                                                                        const VULKAN_HPP_NAMESPACE::Viewport * pViewportDepths_    = {},
+                                                                        const void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , viewportScissor2D( viewportScissor2D_ )
+      , viewportDepthCount( viewportDepthCount_ )
+      , pViewportDepths( pViewportDepths_ )
     {
     }
 
@@ -21182,22 +15298,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandBufferInheritanceViewportScissorInfoNV & operator=( CommandBufferInheritanceViewportScissorInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferInheritanceViewportScissorInfoNV & operator=( VkCommandBufferInheritanceViewportScissorInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferInheritanceViewportScissorInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferInheritanceViewportScissorInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceViewportScissorInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceViewportScissorInfoNV & setViewportScissor2D( Bool32 viewportScissor2D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceViewportScissorInfoNV &
+      setViewportScissor2D( VULKAN_HPP_NAMESPACE::Bool32 viewportScissor2D_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportScissor2D = viewportScissor2D_;
       return *this;
@@ -21209,12 +15326,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceViewportScissorInfoNV & setPViewportDepths( const Viewport * pViewportDepths_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferInheritanceViewportScissorInfoNV &
+      setPViewportDepths( const VULKAN_HPP_NAMESPACE::Viewport * pViewportDepths_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewportDepths = pViewportDepths_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferInheritanceViewportScissorInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21226,18 +15344,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferInheritanceViewportScissorInfoNV *>( this );
     }
 
-    operator VkCommandBufferInheritanceViewportScissorInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferInheritanceViewportScissorInfoNV *>( this );
-    }
-
-    operator VkCommandBufferInheritanceViewportScissorInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferInheritanceViewportScissorInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, const Viewport * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Viewport * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, viewportScissor2D, viewportDepthCount, pViewportDepths );
     }
@@ -21263,28 +15380,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType              = StructureType::eCommandBufferInheritanceViewportScissorInfoNV;
-    const void *     pNext              = {};
-    Bool32           viewportScissor2D  = {};
-    uint32_t         viewportDepthCount = {};
-    const Viewport * pViewportDepths    = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType              = StructureType::eCommandBufferInheritanceViewportScissorInfoNV;
+    const void *                           pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32           viewportScissor2D  = {};
+    uint32_t                               viewportDepthCount = {};
+    const VULKAN_HPP_NAMESPACE::Viewport * pViewportDepths    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferInheritanceViewportScissorInfoNV>
-  {
-    using Type = CommandBufferInheritanceViewportScissorInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferInheritanceViewportScissorInfoNV>
   {
     using Type = CommandBufferInheritanceViewportScissorInfoNV;
   };
 
-  // wrapper struct for struct VkCommandBufferSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandBufferSubmitInfo.html
   struct CommandBufferSubmitInfo
   {
     using NativeType = VkCommandBufferSubmitInfo;
@@ -21292,12 +15400,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandBufferSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      CommandBufferSubmitInfo( CommandBuffer commandBuffer_ = {}, uint32_t deviceMask_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , commandBuffer{ commandBuffer_ }
-      , deviceMask{ deviceMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandBufferSubmitInfo( VULKAN_HPP_NAMESPACE::CommandBuffer commandBuffer_ = {},
+                                                  uint32_t                            deviceMask_    = {},
+                                                  const void *                        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , commandBuffer( commandBuffer_ )
+      , deviceMask( deviceMask_ )
     {
     }
 
@@ -21309,22 +15418,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandBufferSubmitInfo & operator=( CommandBufferSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandBufferSubmitInfo & operator=( VkCommandBufferSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandBufferSubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandBufferSubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandBufferSubmitInfo & setCommandBuffer( CommandBuffer commandBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandBufferSubmitInfo & setCommandBuffer( VULKAN_HPP_NAMESPACE::CommandBuffer commandBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       commandBuffer = commandBuffer_;
       return *this;
@@ -21335,7 +15444,7 @@ namespace VULKAN_HPP_NAMESPACE
       deviceMask = deviceMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandBufferSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21347,18 +15456,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandBufferSubmitInfo *>( this );
     }
 
-    operator VkCommandBufferSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandBufferSubmitInfo *>( this );
-    }
-
-    operator VkCommandBufferSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandBufferSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CommandBuffer const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CommandBuffer const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, commandBuffer, deviceMask );
     }
@@ -21383,20 +15487,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eCommandBufferSubmitInfo;
-    const void *  pNext         = {};
-    CommandBuffer commandBuffer = {};
-    uint32_t      deviceMask    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eCommandBufferSubmitInfo;
+    const void *                        pNext         = {};
+    VULKAN_HPP_NAMESPACE::CommandBuffer commandBuffer = {};
+    uint32_t                            deviceMask    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandBufferSubmitInfo>
-  {
-    using Type = CommandBufferSubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandBufferSubmitInfo>
   {
@@ -21405,7 +15501,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CommandBufferSubmitInfoKHR = CommandBufferSubmitInfo;
 
-  // wrapper struct for struct VkCommandPoolCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCommandPoolCreateInfo.html
   struct CommandPoolCreateInfo
   {
     using NativeType = VkCommandPoolCreateInfo;
@@ -21413,12 +15508,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCommandPoolCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      CommandPoolCreateInfo( CommandPoolCreateFlags flags_ = {}, uint32_t queueFamilyIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CommandPoolCreateInfo( VULKAN_HPP_NAMESPACE::CommandPoolCreateFlags flags_            = {},
+                                                uint32_t                                     queueFamilyIndex_ = {},
+                                                const void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , queueFamilyIndex( queueFamilyIndex_ )
     {
     }
 
@@ -21430,22 +15526,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CommandPoolCreateInfo & operator=( CommandPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CommandPoolCreateInfo & operator=( VkCommandPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CommandPoolCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CommandPoolCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CommandPoolCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CommandPoolCreateInfo & setFlags( CommandPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CommandPoolCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::CommandPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -21456,7 +15552,7 @@ namespace VULKAN_HPP_NAMESPACE
       queueFamilyIndex = queueFamilyIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCommandPoolCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21468,18 +15564,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCommandPoolCreateInfo *>( this );
     }
 
-    operator VkCommandPoolCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCommandPoolCreateInfo *>( this );
-    }
-
-    operator VkCommandPoolCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCommandPoolCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CommandPoolCreateFlags const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CommandPoolCreateFlags const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, queueFamilyIndex );
     }
@@ -21504,36 +15595,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType            = StructureType::eCommandPoolCreateInfo;
-    const void *           pNext            = {};
-    CommandPoolCreateFlags flags            = {};
-    uint32_t               queueFamilyIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType            = StructureType::eCommandPoolCreateInfo;
+    const void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::CommandPoolCreateFlags flags            = {};
+    uint32_t                                     queueFamilyIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCommandPoolCreateInfo>
-  {
-    using Type = CommandPoolCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCommandPoolCreateInfo>
   {
     using Type = CommandPoolCreateInfo;
   };
 
-  // wrapper struct for struct VkSpecializationMapEntry, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSpecializationMapEntry.html
   struct SpecializationMapEntry
   {
     using NativeType = VkSpecializationMapEntry;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SpecializationMapEntry( uint32_t constantID_ = {}, uint32_t offset_ = {}, size_t size_ = {} ) VULKAN_HPP_NOEXCEPT
-      : constantID{ constantID_ }
-      , offset{ offset_ }
-      , size{ size_ }
+      : constantID( constantID_ )
+      , offset( offset_ )
+      , size( size_ )
     {
     }
 
@@ -21545,15 +15627,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SpecializationMapEntry & operator=( SpecializationMapEntry const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SpecializationMapEntry & operator=( VkSpecializationMapEntry const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SpecializationMapEntry const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SpecializationMapEntry const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SpecializationMapEntry & setConstantID( uint32_t constantID_ ) VULKAN_HPP_NOEXCEPT
     {
       constantID = constantID_;
@@ -21571,7 +15653,7 @@ namespace VULKAN_HPP_NAMESPACE
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSpecializationMapEntry const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21583,18 +15665,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSpecializationMapEntry *>( this );
     }
 
-    operator VkSpecializationMapEntry const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSpecializationMapEntry *>( this );
-    }
-
-    operator VkSpecializationMapEntry *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSpecializationMapEntry *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, size_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, size_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( constantID, offset, size );
     }
@@ -21624,28 +15701,19 @@ namespace VULKAN_HPP_NAMESPACE
     size_t   size       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSpecializationMapEntry>
-  {
-    using Type = SpecializationMapEntry;
-  };
-#endif
-
-  // wrapper struct for struct VkSpecializationInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSpecializationInfo.html
   struct SpecializationInfo
   {
     using NativeType = VkSpecializationInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SpecializationInfo( uint32_t                       mapEntryCount_ = {},
-                                             const SpecializationMapEntry * pMapEntries_   = {},
-                                             size_t                         dataSize_      = {},
-                                             const void *                   pData_         = {} ) VULKAN_HPP_NOEXCEPT
-      : mapEntryCount{ mapEntryCount_ }
-      , pMapEntries{ pMapEntries_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SpecializationInfo( uint32_t                                             mapEntryCount_ = {},
+                                             const VULKAN_HPP_NAMESPACE::SpecializationMapEntry * pMapEntries_   = {},
+                                             size_t                                               dataSize_      = {},
+                                             const void *                                         pData_         = {} ) VULKAN_HPP_NOEXCEPT
+      : mapEntryCount( mapEntryCount_ )
+      , pMapEntries( pMapEntries_ )
+      , dataSize( dataSize_ )
+      , pData( pData_ )
     {
     }
 
@@ -21655,7 +15723,8 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    SpecializationInfo( ArrayProxyNoTemporaries<const SpecializationMapEntry> const & mapEntries_, ArrayProxyNoTemporaries<const T> const & data_ = {} )
+    SpecializationInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SpecializationMapEntry> const & mapEntries_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const &                                            data_ = {} )
       : mapEntryCount( static_cast<uint32_t>( mapEntries_.size() ) )
       , pMapEntries( mapEntries_.data() )
       , dataSize( data_.size() * sizeof( T ) )
@@ -21665,29 +15734,30 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SpecializationInfo & operator=( SpecializationInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SpecializationInfo & operator=( VkSpecializationInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SpecializationInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SpecializationInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SpecializationInfo & setMapEntryCount( uint32_t mapEntryCount_ ) VULKAN_HPP_NOEXCEPT
     {
       mapEntryCount = mapEntryCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SpecializationInfo & setPMapEntries( const SpecializationMapEntry * pMapEntries_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SpecializationInfo & setPMapEntries( const VULKAN_HPP_NAMESPACE::SpecializationMapEntry * pMapEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       pMapEntries = pMapEntries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SpecializationInfo & setMapEntries( ArrayProxyNoTemporaries<const SpecializationMapEntry> const & mapEntries_ ) VULKAN_HPP_NOEXCEPT
+    SpecializationInfo &
+      setMapEntries( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SpecializationMapEntry> const & mapEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       mapEntryCount = static_cast<uint32_t>( mapEntries_.size() );
       pMapEntries   = mapEntries_.data();
@@ -21709,14 +15779,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    SpecializationInfo & setData( ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
+    SpecializationInfo & setData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       dataSize = data_.size() * sizeof( T );
       pData    = data_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSpecializationInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21728,18 +15798,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSpecializationInfo *>( this );
     }
 
-    operator VkSpecializationInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSpecializationInfo *>( this );
-    }
-
-    operator VkSpecializationInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSpecializationInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, const SpecializationMapEntry * const &, size_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, const VULKAN_HPP_NAMESPACE::SpecializationMapEntry * const &, size_t const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( mapEntryCount, pMapEntries, dataSize, pData );
     }
@@ -21764,22 +15829,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                       mapEntryCount = {};
-    const SpecializationMapEntry * pMapEntries   = {};
-    size_t                         dataSize      = {};
-    const void *                   pData         = {};
+    uint32_t                                             mapEntryCount = {};
+    const VULKAN_HPP_NAMESPACE::SpecializationMapEntry * pMapEntries   = {};
+    size_t                                               dataSize      = {};
+    const void *                                         pData         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSpecializationInfo>
-  {
-    using Type = SpecializationInfo;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineShaderStageCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageCreateInfo.html
   struct PipelineShaderStageCreateInfo
   {
     using NativeType = VkPipelineShaderStageCreateInfo;
@@ -21787,19 +15842,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineShaderStageCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineShaderStageCreateInfo( PipelineShaderStageCreateFlags flags_               = {},
-                                                        ShaderStageFlagBits            stage_               = ShaderStageFlagBits::eVertex,
-                                                        ShaderModule                   module_              = {},
-                                                        const char *                   pName_               = {},
-                                                        const SpecializationInfo *     pSpecializationInfo_ = {},
-                                                        const void *                   pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stage{ stage_ }
-      , module{ module_ }
-      , pName{ pName_ }
-      , pSpecializationInfo{ pSpecializationInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineShaderStageCreateInfo( VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateFlags flags_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ShaderStageFlagBits stage_  = VULKAN_HPP_NAMESPACE::ShaderStageFlagBits::eVertex,
+                                                        VULKAN_HPP_NAMESPACE::ShaderModule        module_ = {},
+                                                        const char *                              pName_  = {},
+                                                        const VULKAN_HPP_NAMESPACE::SpecializationInfo * pSpecializationInfo_ = {},
+                                                        const void *                                     pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stage( stage_ )
+      , module( module_ )
+      , pName( pName_ )
+      , pSpecializationInfo( pSpecializationInfo_ )
     {
     }
 
@@ -21811,34 +15866,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineShaderStageCreateInfo & operator=( PipelineShaderStageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineShaderStageCreateInfo & operator=( VkPipelineShaderStageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineShaderStageCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setFlags( PipelineShaderStageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setStage( ShaderStageFlagBits stage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setStage( VULKAN_HPP_NAMESPACE::ShaderStageFlagBits stage_ ) VULKAN_HPP_NOEXCEPT
     {
       stage = stage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setModule( ShaderModule module_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setModule( VULKAN_HPP_NAMESPACE::ShaderModule module_ ) VULKAN_HPP_NOEXCEPT
     {
       module = module_;
       return *this;
@@ -21850,12 +15905,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo & setPSpecializationInfo( const SpecializationInfo * pSpecializationInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageCreateInfo &
+      setPSpecializationInfo( const VULKAN_HPP_NAMESPACE::SpecializationInfo * pSpecializationInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pSpecializationInfo = pSpecializationInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineShaderStageCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -21867,24 +15923,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineShaderStageCreateInfo *>( this );
     }
 
-    operator VkPipelineShaderStageCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineShaderStageCreateInfo *>( this );
-    }
-
-    operator VkPipelineShaderStageCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineShaderStageCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineShaderStageCreateFlags const &,
-               ShaderStageFlagBits const &,
-               ShaderModule const &,
+               VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ShaderModule const &,
                const char * const &,
-               const SpecializationInfo * const &>
+               const VULKAN_HPP_NAMESPACE::SpecializationInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, stage, module, pName, pSpecializationInfo );
@@ -21926,30 +15976,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                  sType               = StructureType::ePipelineShaderStageCreateInfo;
-    const void *                   pNext               = {};
-    PipelineShaderStageCreateFlags flags               = {};
-    ShaderStageFlagBits            stage               = ShaderStageFlagBits::eVertex;
-    ShaderModule                   module              = {};
-    const char *                   pName               = {};
-    const SpecializationInfo *     pSpecializationInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType               = StructureType::ePipelineShaderStageCreateInfo;
+    const void *                                         pNext               = {};
+    VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateFlags flags               = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlagBits            stage               = VULKAN_HPP_NAMESPACE::ShaderStageFlagBits::eVertex;
+    VULKAN_HPP_NAMESPACE::ShaderModule                   module              = {};
+    const char *                                         pName               = {};
+    const VULKAN_HPP_NAMESPACE::SpecializationInfo *     pSpecializationInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineShaderStageCreateInfo>
-  {
-    using Type = PipelineShaderStageCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineShaderStageCreateInfo>
   {
     using Type = PipelineShaderStageCreateInfo;
   };
 
-  // wrapper struct for struct VkComputePipelineCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkComputePipelineCreateInfo.html
   struct ComputePipelineCreateInfo
   {
     using NativeType = VkComputePipelineCreateInfo;
@@ -21957,19 +15998,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eComputePipelineCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ComputePipelineCreateInfo( PipelineCreateFlags           flags_              = {},
-                                                    PipelineShaderStageCreateInfo stage_              = {},
-                                                    PipelineLayout                layout_             = {},
-                                                    Pipeline                      basePipelineHandle_ = {},
-                                                    int32_t                       basePipelineIndex_  = {},
-                                                    const void *                  pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stage{ stage_ }
-      , layout{ layout_ }
-      , basePipelineHandle{ basePipelineHandle_ }
-      , basePipelineIndex{ basePipelineIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ComputePipelineCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCreateFlags           flags_              = {},
+                                                    VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo stage_              = {},
+                                                    VULKAN_HPP_NAMESPACE::PipelineLayout                layout_             = {},
+                                                    VULKAN_HPP_NAMESPACE::Pipeline                      basePipelineHandle_ = {},
+                                                    int32_t                                             basePipelineIndex_  = {},
+                                                    const void *                                        pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stage( stage_ )
+      , layout( layout_ )
+      , basePipelineHandle( basePipelineHandle_ )
+      , basePipelineIndex( basePipelineIndex_ )
     {
     }
 
@@ -21981,40 +16022,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ComputePipelineCreateInfo & operator=( ComputePipelineCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ComputePipelineCreateInfo & operator=( VkComputePipelineCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ComputePipelineCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ComputePipelineCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setFlags( PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setStage( PipelineShaderStageCreateInfo const & stage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setStage( VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo const & stage_ ) VULKAN_HPP_NOEXCEPT
     {
       stage = stage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setBasePipelineHandle( Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineCreateInfo & setBasePipelineHandle( VULKAN_HPP_NAMESPACE::Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
     {
       basePipelineHandle = basePipelineHandle_;
       return *this;
@@ -22025,7 +16066,7 @@ namespace VULKAN_HPP_NAMESPACE
       basePipelineIndex = basePipelineIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkComputePipelineCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -22037,24 +16078,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkComputePipelineCreateInfo *>( this );
     }
 
-    operator VkComputePipelineCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkComputePipelineCreateInfo *>( this );
-    }
-
-    operator VkComputePipelineCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkComputePipelineCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCreateFlags const &,
-               PipelineShaderStageCreateInfo const &,
-               PipelineLayout const &,
-               Pipeline const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
                int32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, stage, layout, basePipelineHandle, basePipelineIndex );
@@ -22081,31 +16116,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType              = StructureType::eComputePipelineCreateInfo;
-    const void *                  pNext              = {};
-    PipelineCreateFlags           flags              = {};
-    PipelineShaderStageCreateInfo stage              = {};
-    PipelineLayout                layout             = {};
-    Pipeline                      basePipelineHandle = {};
-    int32_t                       basePipelineIndex  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType              = StructureType::eComputePipelineCreateInfo;
+    const void *                                        pNext              = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags           flags              = {};
+    VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo stage              = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout                layout             = {};
+    VULKAN_HPP_NAMESPACE::Pipeline                      basePipelineHandle = {};
+    int32_t                                             basePipelineIndex  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkComputePipelineCreateInfo>
-  {
-    using Type = ComputePipelineCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eComputePipelineCreateInfo>
   {
     using Type = ComputePipelineCreateInfo;
   };
 
-  // wrapper struct for struct VkComputePipelineIndirectBufferInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkComputePipelineIndirectBufferInfoNV.html
   struct ComputePipelineIndirectBufferInfoNV
   {
     using NativeType = VkComputePipelineIndirectBufferInfoNV;
@@ -22113,15 +16138,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eComputePipelineIndirectBufferInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ComputePipelineIndirectBufferInfoNV( DeviceAddress deviceAddress_                      = {},
-                                                              DeviceSize    size_                               = {},
-                                                              DeviceAddress pipelineDeviceAddressCaptureReplay_ = {},
-                                                              const void *  pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceAddress{ deviceAddress_ }
-      , size{ size_ }
-      , pipelineDeviceAddressCaptureReplay{ pipelineDeviceAddressCaptureReplay_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ComputePipelineIndirectBufferInfoNV( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_                      = {},
+                                                              VULKAN_HPP_NAMESPACE::DeviceSize    size_                               = {},
+                                                              VULKAN_HPP_NAMESPACE::DeviceAddress pipelineDeviceAddressCaptureReplay_ = {},
+                                                              const void *                        pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceAddress( deviceAddress_ )
+      , size( size_ )
+      , pipelineDeviceAddressCaptureReplay( pipelineDeviceAddressCaptureReplay_ )
     {
     }
 
@@ -22133,40 +16158,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ComputePipelineIndirectBufferInfoNV & operator=( ComputePipelineIndirectBufferInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ComputePipelineIndirectBufferInfoNV & operator=( VkComputePipelineIndirectBufferInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ComputePipelineIndirectBufferInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ComputePipelineIndirectBufferInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 ComputePipelineIndirectBufferInfoNV &
-      setPipelineDeviceAddressCaptureReplay( DeviceAddress pipelineDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setPipelineDeviceAddressCaptureReplay( VULKAN_HPP_NAMESPACE::DeviceAddress pipelineDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineDeviceAddressCaptureReplay = pipelineDeviceAddressCaptureReplay_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkComputePipelineIndirectBufferInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -22178,18 +16203,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkComputePipelineIndirectBufferInfoNV *>( this );
     }
 
-    operator VkComputePipelineIndirectBufferInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkComputePipelineIndirectBufferInfoNV *>( this );
-    }
-
-    operator VkComputePipelineIndirectBufferInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkComputePipelineIndirectBufferInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceAddress const &, DeviceSize const &, DeviceAddress const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceAddress, size, pipelineDeviceAddressCaptureReplay );
@@ -22216,29 +16239,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::eComputePipelineIndirectBufferInfoNV;
-    const void *  pNext                              = {};
-    DeviceAddress deviceAddress                      = {};
-    DeviceSize    size                               = {};
-    DeviceAddress pipelineDeviceAddressCaptureReplay = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::eComputePipelineIndirectBufferInfoNV;
+    const void *                        pNext                              = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress                      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size                               = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress pipelineDeviceAddressCaptureReplay = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkComputePipelineIndirectBufferInfoNV>
-  {
-    using Type = ComputePipelineIndirectBufferInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eComputePipelineIndirectBufferInfoNV>
   {
     using Type = ComputePipelineIndirectBufferInfoNV;
   };
 
-  // wrapper struct for struct VkConditionalRenderingBeginInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkConditionalRenderingBeginInfoEXT.html
   struct ConditionalRenderingBeginInfoEXT
   {
     using NativeType = VkConditionalRenderingBeginInfoEXT;
@@ -22246,15 +16259,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eConditionalRenderingBeginInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ConditionalRenderingBeginInfoEXT( Buffer                       buffer_ = {},
-                                                           DeviceSize                   offset_ = {},
-                                                           ConditionalRenderingFlagsEXT flags_  = {},
-                                                           const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
-      , offset{ offset_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ConditionalRenderingBeginInfoEXT( VULKAN_HPP_NAMESPACE::Buffer                       buffer_ = {},
+                                                           VULKAN_HPP_NAMESPACE::DeviceSize                   offset_ = {},
+                                                           VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagsEXT flags_  = {},
+                                                           const void *                                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
+      , offset( offset_ )
+      , flags( flags_ )
     {
     }
 
@@ -22266,39 +16279,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ConditionalRenderingBeginInfoEXT & operator=( ConditionalRenderingBeginInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ConditionalRenderingBeginInfoEXT & operator=( VkConditionalRenderingBeginInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ConditionalRenderingBeginInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ConditionalRenderingBeginInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setFlags( ConditionalRenderingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ConditionalRenderingBeginInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkConditionalRenderingBeginInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -22310,18 +16323,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkConditionalRenderingBeginInfoEXT *>( this );
     }
 
-    operator VkConditionalRenderingBeginInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkConditionalRenderingBeginInfoEXT *>( this );
-    }
-
-    operator VkConditionalRenderingBeginInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkConditionalRenderingBeginInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &, DeviceSize const &, ConditionalRenderingFlagsEXT const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagsEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer, offset, flags );
@@ -22347,38 +16358,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType  = StructureType::eConditionalRenderingBeginInfoEXT;
-    const void *                 pNext  = {};
-    Buffer                       buffer = {};
-    DeviceSize                   offset = {};
-    ConditionalRenderingFlagsEXT flags  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType  = StructureType::eConditionalRenderingBeginInfoEXT;
+    const void *                                       pNext  = {};
+    VULKAN_HPP_NAMESPACE::Buffer                       buffer = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                   offset = {};
+    VULKAN_HPP_NAMESPACE::ConditionalRenderingFlagsEXT flags  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkConditionalRenderingBeginInfoEXT>
-  {
-    using Type = ConditionalRenderingBeginInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eConditionalRenderingBeginInfoEXT>
   {
     using Type = ConditionalRenderingBeginInfoEXT;
   };
 
-  // wrapper struct for struct VkConformanceVersion, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkConformanceVersion.html
   struct ConformanceVersion
   {
     using NativeType = VkConformanceVersion;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ConformanceVersion( uint8_t major_ = {}, uint8_t minor_ = {}, uint8_t subminor_ = {}, uint8_t patch_ = {} ) VULKAN_HPP_NOEXCEPT
-      : major{ major_ }
-      , minor{ minor_ }
-      , subminor{ subminor_ }
-      , patch{ patch_ }
+      : major( major_ )
+      , minor( minor_ )
+      , subminor( subminor_ )
+      , patch( patch_ )
     {
     }
 
@@ -22387,15 +16389,15 @@ namespace VULKAN_HPP_NAMESPACE
     ConformanceVersion( VkConformanceVersion const & rhs ) VULKAN_HPP_NOEXCEPT : ConformanceVersion( *reinterpret_cast<ConformanceVersion const *>( &rhs ) ) {}
 
     ConformanceVersion & operator=( ConformanceVersion const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ConformanceVersion & operator=( VkConformanceVersion const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ConformanceVersion const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ConformanceVersion const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ConformanceVersion & setMajor( uint8_t major_ ) VULKAN_HPP_NOEXCEPT
     {
       major = major_;
@@ -22419,7 +16421,7 @@ namespace VULKAN_HPP_NAMESPACE
       patch = patch_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkConformanceVersion const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -22431,18 +16433,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkConformanceVersion *>( this );
     }
 
-    operator VkConformanceVersion const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkConformanceVersion *>( this );
-    }
-
-    operator VkConformanceVersion *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkConformanceVersion *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint8_t const &, uint8_t const &, uint8_t const &, uint8_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint8_t const &, uint8_t const &, uint8_t const &, uint8_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( major, minor, subminor, patch );
     }
@@ -22473,379 +16470,8 @@ namespace VULKAN_HPP_NAMESPACE
     uint8_t patch    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkConformanceVersion>
-  {
-    using Type = ConformanceVersion;
-  };
-#endif
   using ConformanceVersionKHR = ConformanceVersion;
 
-  // wrapper struct for struct VkConvertCooperativeVectorMatrixInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkConvertCooperativeVectorMatrixInfoNV.html
-  struct ConvertCooperativeVectorMatrixInfoNV
-  {
-    using NativeType = VkConvertCooperativeVectorMatrixInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eConvertCooperativeVectorMatrixInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV( size_t                          srcSize_          = {},
-                                                                  DeviceOrHostAddressConstKHR     srcData_          = {},
-                                                                  size_t *                        pDstSize_         = {},
-                                                                  DeviceOrHostAddressKHR          dstData_          = {},
-                                                                  ComponentTypeKHR                srcComponentType_ = ComponentTypeKHR::eFloat16,
-                                                                  ComponentTypeKHR                dstComponentType_ = ComponentTypeKHR::eFloat16,
-                                                                  uint32_t                        numRows_          = {},
-                                                                  uint32_t                        numColumns_       = {},
-                                                                  CooperativeVectorMatrixLayoutNV srcLayout_ = CooperativeVectorMatrixLayoutNV::eRowMajor,
-                                                                  size_t                          srcStride_ = {},
-                                                                  CooperativeVectorMatrixLayoutNV dstLayout_ = CooperativeVectorMatrixLayoutNV::eRowMajor,
-                                                                  size_t                          dstStride_ = {},
-                                                                  const void *                    pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSize{ srcSize_ }
-      , srcData{ srcData_ }
-      , pDstSize{ pDstSize_ }
-      , dstData{ dstData_ }
-      , srcComponentType{ srcComponentType_ }
-      , dstComponentType{ dstComponentType_ }
-      , numRows{ numRows_ }
-      , numColumns{ numColumns_ }
-      , srcLayout{ srcLayout_ }
-      , srcStride{ srcStride_ }
-      , dstLayout{ dstLayout_ }
-      , dstStride{ dstStride_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV( ConvertCooperativeVectorMatrixInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ConvertCooperativeVectorMatrixInfoNV( VkConvertCooperativeVectorMatrixInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ConvertCooperativeVectorMatrixInfoNV( *reinterpret_cast<ConvertCooperativeVectorMatrixInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ConvertCooperativeVectorMatrixInfoNV & operator=( ConvertCooperativeVectorMatrixInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ConvertCooperativeVectorMatrixInfoNV & operator=( VkConvertCooperativeVectorMatrixInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ConvertCooperativeVectorMatrixInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setSrcSize( size_t srcSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcSize = srcSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setSrcData( DeviceOrHostAddressConstKHR const & srcData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcData = srcData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setPDstSize( size_t * pDstSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDstSize = pDstSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setDstData( DeviceOrHostAddressKHR const & dstData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstData = dstData_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setSrcComponentType( ComponentTypeKHR srcComponentType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcComponentType = srcComponentType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setDstComponentType( ComponentTypeKHR dstComponentType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstComponentType = dstComponentType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setNumRows( uint32_t numRows_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numRows = numRows_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setNumColumns( uint32_t numColumns_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numColumns = numColumns_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setSrcLayout( CooperativeVectorMatrixLayoutNV srcLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcLayout = srcLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setSrcStride( size_t srcStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcStride = srcStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setDstLayout( CooperativeVectorMatrixLayoutNV dstLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstLayout = dstLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ConvertCooperativeVectorMatrixInfoNV & setDstStride( size_t dstStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstStride = dstStride_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkConvertCooperativeVectorMatrixInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( this );
-    }
-
-    operator VkConvertCooperativeVectorMatrixInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkConvertCooperativeVectorMatrixInfoNV *>( this );
-    }
-
-    operator VkConvertCooperativeVectorMatrixInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkConvertCooperativeVectorMatrixInfoNV *>( this );
-    }
-
-    operator VkConvertCooperativeVectorMatrixInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkConvertCooperativeVectorMatrixInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               size_t const &,
-               DeviceOrHostAddressConstKHR const &,
-               size_t * const &,
-               DeviceOrHostAddressKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               CooperativeVectorMatrixLayoutNV const &,
-               size_t const &,
-               CooperativeVectorMatrixLayoutNV const &,
-               size_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       srcSize,
-                       srcData,
-                       pDstSize,
-                       dstData,
-                       srcComponentType,
-                       dstComponentType,
-                       numRows,
-                       numColumns,
-                       srcLayout,
-                       srcStride,
-                       dstLayout,
-                       dstStride );
-    }
-#endif
-
-  public:
-    StructureType                   sType            = StructureType::eConvertCooperativeVectorMatrixInfoNV;
-    const void *                    pNext            = {};
-    size_t                          srcSize          = {};
-    DeviceOrHostAddressConstKHR     srcData          = {};
-    size_t *                        pDstSize         = {};
-    DeviceOrHostAddressKHR          dstData          = {};
-    ComponentTypeKHR                srcComponentType = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR                dstComponentType = ComponentTypeKHR::eFloat16;
-    uint32_t                        numRows          = {};
-    uint32_t                        numColumns       = {};
-    CooperativeVectorMatrixLayoutNV srcLayout        = CooperativeVectorMatrixLayoutNV::eRowMajor;
-    size_t                          srcStride        = {};
-    CooperativeVectorMatrixLayoutNV dstLayout        = CooperativeVectorMatrixLayoutNV::eRowMajor;
-    size_t                          dstStride        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkConvertCooperativeVectorMatrixInfoNV>
-  {
-    using Type = ConvertCooperativeVectorMatrixInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eConvertCooperativeVectorMatrixInfoNV>
-  {
-    using Type = ConvertCooperativeVectorMatrixInfoNV;
-  };
-
-  // wrapper struct for struct VkCooperativeMatrixFlexibleDimensionsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCooperativeMatrixFlexibleDimensionsPropertiesNV.html
-  struct CooperativeMatrixFlexibleDimensionsPropertiesNV
-  {
-    using NativeType = VkCooperativeMatrixFlexibleDimensionsPropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCooperativeMatrixFlexibleDimensionsPropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CooperativeMatrixFlexibleDimensionsPropertiesNV( uint32_t         MGranularity_           = {},
-                                                                          uint32_t         NGranularity_           = {},
-                                                                          uint32_t         KGranularity_           = {},
-                                                                          ComponentTypeKHR AType_                  = ComponentTypeKHR::eFloat16,
-                                                                          ComponentTypeKHR BType_                  = ComponentTypeKHR::eFloat16,
-                                                                          ComponentTypeKHR CType_                  = ComponentTypeKHR::eFloat16,
-                                                                          ComponentTypeKHR ResultType_             = ComponentTypeKHR::eFloat16,
-                                                                          Bool32           saturatingAccumulation_ = {},
-                                                                          ScopeKHR         scope_                  = ScopeKHR::eDevice,
-                                                                          uint32_t         workgroupInvocations_   = {},
-                                                                          void *           pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , MGranularity{ MGranularity_ }
-      , NGranularity{ NGranularity_ }
-      , KGranularity{ KGranularity_ }
-      , AType{ AType_ }
-      , BType{ BType_ }
-      , CType{ CType_ }
-      , ResultType{ ResultType_ }
-      , saturatingAccumulation{ saturatingAccumulation_ }
-      , scope{ scope_ }
-      , workgroupInvocations{ workgroupInvocations_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      CooperativeMatrixFlexibleDimensionsPropertiesNV( CooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CooperativeMatrixFlexibleDimensionsPropertiesNV( VkCooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CooperativeMatrixFlexibleDimensionsPropertiesNV( *reinterpret_cast<CooperativeMatrixFlexibleDimensionsPropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    CooperativeMatrixFlexibleDimensionsPropertiesNV & operator=( CooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CooperativeMatrixFlexibleDimensionsPropertiesNV & operator=( VkCooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CooperativeMatrixFlexibleDimensionsPropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkCooperativeMatrixFlexibleDimensionsPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeMatrixFlexibleDimensionsPropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeMatrixFlexibleDimensionsPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeMatrixFlexibleDimensionsPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCooperativeMatrixFlexibleDimensionsPropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               Bool32 const &,
-               ScopeKHR const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie(
-        sType, pNext, MGranularity, NGranularity, KGranularity, AType, BType, CType, ResultType, saturatingAccumulation, scope, workgroupInvocations );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CooperativeMatrixFlexibleDimensionsPropertiesNV const & ) const = default;
-#else
-    bool operator==( CooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( MGranularity == rhs.MGranularity ) && ( NGranularity == rhs.NGranularity ) &&
-             ( KGranularity == rhs.KGranularity ) && ( AType == rhs.AType ) && ( BType == rhs.BType ) && ( CType == rhs.CType ) &&
-             ( ResultType == rhs.ResultType ) && ( saturatingAccumulation == rhs.saturatingAccumulation ) && ( scope == rhs.scope ) &&
-             ( workgroupInvocations == rhs.workgroupInvocations );
-#  endif
-    }
-
-    bool operator!=( CooperativeMatrixFlexibleDimensionsPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType                  = StructureType::eCooperativeMatrixFlexibleDimensionsPropertiesNV;
-    void *           pNext                  = {};
-    uint32_t         MGranularity           = {};
-    uint32_t         NGranularity           = {};
-    uint32_t         KGranularity           = {};
-    ComponentTypeKHR AType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR BType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR CType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR ResultType             = ComponentTypeKHR::eFloat16;
-    Bool32           saturatingAccumulation = {};
-    ScopeKHR         scope                  = ScopeKHR::eDevice;
-    uint32_t         workgroupInvocations   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCooperativeMatrixFlexibleDimensionsPropertiesNV>
-  {
-    using Type = CooperativeMatrixFlexibleDimensionsPropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCooperativeMatrixFlexibleDimensionsPropertiesNV>
-  {
-    using Type = CooperativeMatrixFlexibleDimensionsPropertiesNV;
-  };
-
-  // wrapper struct for struct VkCooperativeMatrixPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCooperativeMatrixPropertiesKHR.html
   struct CooperativeMatrixPropertiesKHR
   {
     using NativeType = VkCooperativeMatrixPropertiesKHR;
@@ -22853,27 +16479,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCooperativeMatrixPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CooperativeMatrixPropertiesKHR( uint32_t         MSize_                  = {},
-                                                         uint32_t         NSize_                  = {},
-                                                         uint32_t         KSize_                  = {},
-                                                         ComponentTypeKHR AType_                  = ComponentTypeKHR::eFloat16,
-                                                         ComponentTypeKHR BType_                  = ComponentTypeKHR::eFloat16,
-                                                         ComponentTypeKHR CType_                  = ComponentTypeKHR::eFloat16,
-                                                         ComponentTypeKHR ResultType_             = ComponentTypeKHR::eFloat16,
-                                                         Bool32           saturatingAccumulation_ = {},
-                                                         ScopeKHR         scope_                  = ScopeKHR::eDevice,
-                                                         void *           pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , MSize{ MSize_ }
-      , NSize{ NSize_ }
-      , KSize{ KSize_ }
-      , AType{ AType_ }
-      , BType{ BType_ }
-      , CType{ CType_ }
-      , ResultType{ ResultType_ }
-      , saturatingAccumulation{ saturatingAccumulation_ }
-      , scope{ scope_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CooperativeMatrixPropertiesKHR( uint32_t                               MSize_      = {},
+                                                         uint32_t                               NSize_      = {},
+                                                         uint32_t                               KSize_      = {},
+                                                         VULKAN_HPP_NAMESPACE::ComponentTypeKHR AType_      = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16,
+                                                         VULKAN_HPP_NAMESPACE::ComponentTypeKHR BType_      = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16,
+                                                         VULKAN_HPP_NAMESPACE::ComponentTypeKHR CType_      = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16,
+                                                         VULKAN_HPP_NAMESPACE::ComponentTypeKHR ResultType_ = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16,
+                                                         VULKAN_HPP_NAMESPACE::Bool32           saturatingAccumulation_ = {},
+                                                         VULKAN_HPP_NAMESPACE::ScopeKHR         scope_ = VULKAN_HPP_NAMESPACE::ScopeKHR::eDevice,
+                                                         void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , MSize( MSize_ )
+      , NSize( NSize_ )
+      , KSize( KSize_ )
+      , AType( AType_ )
+      , BType( BType_ )
+      , CType( CType_ )
+      , ResultType( ResultType_ )
+      , saturatingAccumulation( saturatingAccumulation_ )
+      , scope( scope_ )
     {
     }
 
@@ -22885,11 +16511,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CooperativeMatrixPropertiesKHR & operator=( CooperativeMatrixPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CooperativeMatrixPropertiesKHR & operator=( VkCooperativeMatrixPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CooperativeMatrixPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -22903,28 +16529,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( this );
     }
 
-    operator VkCooperativeMatrixPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCooperativeMatrixPropertiesKHR *>( this );
-    }
-
-    operator VkCooperativeMatrixPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCooperativeMatrixPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               Bool32 const &,
-               ScopeKHR const &>
+               VULKAN_HPP_NAMESPACE::ComponentTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::ScopeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, MSize, NSize, KSize, AType, BType, CType, ResultType, saturatingAccumulation, scope );
@@ -22952,35 +16572,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                  = StructureType::eCooperativeMatrixPropertiesKHR;
-    void *           pNext                  = {};
-    uint32_t         MSize                  = {};
-    uint32_t         NSize                  = {};
-    uint32_t         KSize                  = {};
-    ComponentTypeKHR AType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR BType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR CType                  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR ResultType             = ComponentTypeKHR::eFloat16;
-    Bool32           saturatingAccumulation = {};
-    ScopeKHR         scope                  = ScopeKHR::eDevice;
+    VULKAN_HPP_NAMESPACE::StructureType    sType                  = StructureType::eCooperativeMatrixPropertiesKHR;
+    void *                                 pNext                  = {};
+    uint32_t                               MSize                  = {};
+    uint32_t                               NSize                  = {};
+    uint32_t                               KSize                  = {};
+    VULKAN_HPP_NAMESPACE::ComponentTypeKHR AType                  = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16;
+    VULKAN_HPP_NAMESPACE::ComponentTypeKHR BType                  = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16;
+    VULKAN_HPP_NAMESPACE::ComponentTypeKHR CType                  = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16;
+    VULKAN_HPP_NAMESPACE::ComponentTypeKHR ResultType             = VULKAN_HPP_NAMESPACE::ComponentTypeKHR::eFloat16;
+    VULKAN_HPP_NAMESPACE::Bool32           saturatingAccumulation = {};
+    VULKAN_HPP_NAMESPACE::ScopeKHR         scope                  = VULKAN_HPP_NAMESPACE::ScopeKHR::eDevice;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCooperativeMatrixPropertiesKHR>
-  {
-    using Type = CooperativeMatrixPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCooperativeMatrixPropertiesKHR>
   {
     using Type = CooperativeMatrixPropertiesKHR;
   };
 
-  // wrapper struct for struct VkCooperativeMatrixPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCooperativeMatrixPropertiesNV.html
   struct CooperativeMatrixPropertiesNV
   {
     using NativeType = VkCooperativeMatrixPropertiesNV;
@@ -22988,25 +16598,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCooperativeMatrixPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CooperativeMatrixPropertiesNV( uint32_t        MSize_ = {},
-                                                        uint32_t        NSize_ = {},
-                                                        uint32_t        KSize_ = {},
-                                                        ComponentTypeNV AType_ = {},
-                                                        ComponentTypeNV BType_ = {},
-                                                        ComponentTypeNV CType_ = {},
-                                                        ComponentTypeNV DType_ = {},
-                                                        ScopeNV         scope_ = {},
-                                                        void *          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , MSize{ MSize_ }
-      , NSize{ NSize_ }
-      , KSize{ KSize_ }
-      , AType{ AType_ }
-      , BType{ BType_ }
-      , CType{ CType_ }
-      , DType{ DType_ }
-      , scope{ scope_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CooperativeMatrixPropertiesNV( uint32_t                              MSize_ = {},
+                                                        uint32_t                              NSize_ = {},
+                                                        uint32_t                              KSize_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ComponentTypeNV AType_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ComponentTypeNV BType_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ComponentTypeNV CType_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ComponentTypeNV DType_ = {},
+                                                        VULKAN_HPP_NAMESPACE::ScopeNV         scope_ = {},
+                                                        void *                                pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , MSize( MSize_ )
+      , NSize( NSize_ )
+      , KSize( KSize_ )
+      , AType( AType_ )
+      , BType( BType_ )
+      , CType( CType_ )
+      , DType( DType_ )
+      , scope( scope_ )
     {
     }
 
@@ -23018,11 +16628,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CooperativeMatrixPropertiesNV & operator=( CooperativeMatrixPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CooperativeMatrixPropertiesNV & operator=( VkCooperativeMatrixPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CooperativeMatrixPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CooperativeMatrixPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -23036,27 +16646,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( this );
     }
 
-    operator VkCooperativeMatrixPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCooperativeMatrixPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeMatrixPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCooperativeMatrixPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ComponentTypeNV const &,
-               ComponentTypeNV const &,
-               ComponentTypeNV const &,
-               ComponentTypeNV const &,
-               ScopeNV const &>
+               VULKAN_HPP_NAMESPACE::ComponentTypeNV const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeNV const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeNV const &,
+               VULKAN_HPP_NAMESPACE::ComponentTypeNV const &,
+               VULKAN_HPP_NAMESPACE::ScopeNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, MSize, NSize, KSize, AType, BType, CType, DType, scope );
@@ -23083,201 +16687,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType = StructureType::eCooperativeMatrixPropertiesNV;
-    void *          pNext = {};
-    uint32_t        MSize = {};
-    uint32_t        NSize = {};
-    uint32_t        KSize = {};
-    ComponentTypeNV AType = {};
-    ComponentTypeNV BType = {};
-    ComponentTypeNV CType = {};
-    ComponentTypeNV DType = {};
-    ScopeNV         scope = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType = StructureType::eCooperativeMatrixPropertiesNV;
+    void *                                pNext = {};
+    uint32_t                              MSize = {};
+    uint32_t                              NSize = {};
+    uint32_t                              KSize = {};
+    VULKAN_HPP_NAMESPACE::ComponentTypeNV AType = {};
+    VULKAN_HPP_NAMESPACE::ComponentTypeNV BType = {};
+    VULKAN_HPP_NAMESPACE::ComponentTypeNV CType = {};
+    VULKAN_HPP_NAMESPACE::ComponentTypeNV DType = {};
+    VULKAN_HPP_NAMESPACE::ScopeNV         scope = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCooperativeMatrixPropertiesNV>
-  {
-    using Type = CooperativeMatrixPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCooperativeMatrixPropertiesNV>
   {
     using Type = CooperativeMatrixPropertiesNV;
   };
 
-  // wrapper struct for struct VkCooperativeVectorPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCooperativeVectorPropertiesNV.html
-  struct CooperativeVectorPropertiesNV
-  {
-    using NativeType = VkCooperativeVectorPropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCooperativeVectorPropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CooperativeVectorPropertiesNV( ComponentTypeKHR inputType_            = ComponentTypeKHR::eFloat16,
-                                                        ComponentTypeKHR inputInterpretation_  = ComponentTypeKHR::eFloat16,
-                                                        ComponentTypeKHR matrixInterpretation_ = ComponentTypeKHR::eFloat16,
-                                                        ComponentTypeKHR biasInterpretation_   = ComponentTypeKHR::eFloat16,
-                                                        ComponentTypeKHR resultType_           = ComponentTypeKHR::eFloat16,
-                                                        Bool32           transpose_            = {},
-                                                        void *           pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , inputType{ inputType_ }
-      , inputInterpretation{ inputInterpretation_ }
-      , matrixInterpretation{ matrixInterpretation_ }
-      , biasInterpretation{ biasInterpretation_ }
-      , resultType{ resultType_ }
-      , transpose{ transpose_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CooperativeVectorPropertiesNV( CooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CooperativeVectorPropertiesNV( VkCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CooperativeVectorPropertiesNV( *reinterpret_cast<CooperativeVectorPropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    CooperativeVectorPropertiesNV & operator=( CooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CooperativeVectorPropertiesNV & operator=( VkCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CooperativeVectorPropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setInputType( ComponentTypeKHR inputType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      inputType = inputType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setInputInterpretation( ComponentTypeKHR inputInterpretation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      inputInterpretation = inputInterpretation_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setMatrixInterpretation( ComponentTypeKHR matrixInterpretation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      matrixInterpretation = matrixInterpretation_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setBiasInterpretation( ComponentTypeKHR biasInterpretation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      biasInterpretation = biasInterpretation_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setResultType( ComponentTypeKHR resultType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      resultType = resultType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CooperativeVectorPropertiesNV & setTranspose( Bool32 transpose_ ) VULKAN_HPP_NOEXCEPT
-    {
-      transpose = transpose_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCooperativeVectorPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeVectorPropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeVectorPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkCooperativeVectorPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCooperativeVectorPropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               ComponentTypeKHR const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, inputType, inputInterpretation, matrixInterpretation, biasInterpretation, resultType, transpose );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CooperativeVectorPropertiesNV const & ) const = default;
-#else
-    bool operator==( CooperativeVectorPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( inputType == rhs.inputType ) && ( inputInterpretation == rhs.inputInterpretation ) &&
-             ( matrixInterpretation == rhs.matrixInterpretation ) && ( biasInterpretation == rhs.biasInterpretation ) && ( resultType == rhs.resultType ) &&
-             ( transpose == rhs.transpose );
-#  endif
-    }
-
-    bool operator!=( CooperativeVectorPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType                = StructureType::eCooperativeVectorPropertiesNV;
-    void *           pNext                = {};
-    ComponentTypeKHR inputType            = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR inputInterpretation  = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR matrixInterpretation = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR biasInterpretation   = ComponentTypeKHR::eFloat16;
-    ComponentTypeKHR resultType           = ComponentTypeKHR::eFloat16;
-    Bool32           transpose            = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCooperativeVectorPropertiesNV>
-  {
-    using Type = CooperativeVectorPropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCooperativeVectorPropertiesNV>
-  {
-    using Type = CooperativeVectorPropertiesNV;
-  };
-
-  // wrapper struct for struct VkCopyAccelerationStructureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyAccelerationStructureInfoKHR.html
   struct CopyAccelerationStructureInfoKHR
   {
     using NativeType = VkCopyAccelerationStructureInfoKHR;
@@ -23285,15 +16712,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyAccelerationStructureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyAccelerationStructureInfoKHR( AccelerationStructureKHR         src_   = {},
-                                                           AccelerationStructureKHR         dst_   = {},
-                                                           CopyAccelerationStructureModeKHR mode_  = CopyAccelerationStructureModeKHR::eClone,
-                                                           const void *                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyAccelerationStructureInfoKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         src_   = {},
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         dst_   = {},
+      VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone,
+      const void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -23305,39 +16733,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyAccelerationStructureInfoKHR & operator=( CopyAccelerationStructureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyAccelerationStructureInfoKHR & operator=( VkCopyAccelerationStructureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyAccelerationStructureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyAccelerationStructureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setSrc( AccelerationStructureKHR src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setSrc( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setDst( AccelerationStructureKHR dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setDst( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setMode( CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureInfoKHR & setMode( VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyAccelerationStructureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -23349,22 +16777,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyAccelerationStructureInfoKHR *>( this );
     }
 
-    operator VkCopyAccelerationStructureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyAccelerationStructureInfoKHR *>( this );
-    }
-
-    operator VkCopyAccelerationStructureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyAccelerationStructureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureKHR const &,
-               AccelerationStructureKHR const &,
-               CopyAccelerationStructureModeKHR const &>
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -23390,29 +16812,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType = StructureType::eCopyAccelerationStructureInfoKHR;
-    const void *                     pNext = {};
-    AccelerationStructureKHR         src   = {};
-    AccelerationStructureKHR         dst   = {};
-    CopyAccelerationStructureModeKHR mode  = CopyAccelerationStructureModeKHR::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType = StructureType::eCopyAccelerationStructureInfoKHR;
+    const void *                                           pNext = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         src   = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyAccelerationStructureInfoKHR>
-  {
-    using Type = CopyAccelerationStructureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyAccelerationStructureInfoKHR>
   {
     using Type = CopyAccelerationStructureInfoKHR;
   };
 
-  // wrapper struct for struct VkCopyAccelerationStructureToMemoryInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyAccelerationStructureToMemoryInfoKHR.html
   struct CopyAccelerationStructureToMemoryInfoKHR
   {
     using NativeType = VkCopyAccelerationStructureToMemoryInfoKHR;
@@ -23420,15 +16832,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyAccelerationStructureToMemoryInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR( AccelerationStructureKHR         src_   = {},
-                                                                      DeviceOrHostAddressKHR           dst_   = {},
-                                                                      CopyAccelerationStructureModeKHR mode_  = CopyAccelerationStructureModeKHR::eClone,
-                                                                      const void *                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR(
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         src_   = {},
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR           dst_   = {},
+      VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone,
+      const void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -23440,39 +16853,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyAccelerationStructureToMemoryInfoKHR & operator=( CopyAccelerationStructureToMemoryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyAccelerationStructureToMemoryInfoKHR & operator=( VkCopyAccelerationStructureToMemoryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyAccelerationStructureToMemoryInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyAccelerationStructureToMemoryInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setSrc( AccelerationStructureKHR src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setSrc( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setDst( DeviceOrHostAddressKHR const & dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setDst( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const & dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR & setMode( CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyAccelerationStructureToMemoryInfoKHR &
+      setMode( VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyAccelerationStructureToMemoryInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -23484,22 +16898,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyAccelerationStructureToMemoryInfoKHR *>( this );
     }
 
-    operator VkCopyAccelerationStructureToMemoryInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyAccelerationStructureToMemoryInfoKHR *>( this );
-    }
-
-    operator VkCopyAccelerationStructureToMemoryInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyAccelerationStructureToMemoryInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccelerationStructureKHR const &,
-               DeviceOrHostAddressKHR const &,
-               CopyAccelerationStructureModeKHR const &>
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const &,
+               VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -23507,28 +16915,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType = StructureType::eCopyAccelerationStructureToMemoryInfoKHR;
-    const void *                     pNext = {};
-    AccelerationStructureKHR         src   = {};
-    DeviceOrHostAddressKHR           dst   = {};
-    CopyAccelerationStructureModeKHR mode  = CopyAccelerationStructureModeKHR::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType = StructureType::eCopyAccelerationStructureToMemoryInfoKHR;
+    const void *                                           pNext = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         src   = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR           dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyAccelerationStructureToMemoryInfoKHR>
-  {
-    using Type = CopyAccelerationStructureToMemoryInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyAccelerationStructureToMemoryInfoKHR>
   {
     using Type = CopyAccelerationStructureToMemoryInfoKHR;
   };
 
-  // wrapper struct for struct VkCopyBufferInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyBufferInfo2.html
   struct CopyBufferInfo2
   {
     using NativeType = VkCopyBufferInfo2;
@@ -23536,17 +16935,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyBufferInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyBufferInfo2( Buffer              srcBuffer_   = {},
-                                          Buffer              dstBuffer_   = {},
-                                          uint32_t            regionCount_ = {},
-                                          const BufferCopy2 * pRegions_    = {},
-                                          const void *        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcBuffer{ srcBuffer_ }
-      , dstBuffer{ dstBuffer_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyBufferInfo2( VULKAN_HPP_NAMESPACE::Buffer              srcBuffer_   = {},
+                                          VULKAN_HPP_NAMESPACE::Buffer              dstBuffer_   = {},
+                                          uint32_t                                  regionCount_ = {},
+                                          const VULKAN_HPP_NAMESPACE::BufferCopy2 * pRegions_    = {},
+                                          const void *                              pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcBuffer( srcBuffer_ )
+      , dstBuffer( dstBuffer_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -23555,35 +16954,38 @@ namespace VULKAN_HPP_NAMESPACE
     CopyBufferInfo2( VkCopyBufferInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : CopyBufferInfo2( *reinterpret_cast<CopyBufferInfo2 const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyBufferInfo2( Buffer srcBuffer_, Buffer dstBuffer_, ArrayProxyNoTemporaries<const BufferCopy2> const & regions_, const void * pNext_ = nullptr )
+    CopyBufferInfo2( VULKAN_HPP_NAMESPACE::Buffer                                                                   srcBuffer_,
+                     VULKAN_HPP_NAMESPACE::Buffer                                                                   dstBuffer_,
+                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferCopy2> const & regions_,
+                     const void *                                                                                   pNext_ = nullptr )
       : pNext( pNext_ ), srcBuffer( srcBuffer_ ), dstBuffer( dstBuffer_ ), regionCount( static_cast<uint32_t>( regions_.size() ) ), pRegions( regions_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CopyBufferInfo2 & operator=( CopyBufferInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyBufferInfo2 & operator=( VkCopyBufferInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyBufferInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyBufferInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setSrcBuffer( Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setSrcBuffer( VULKAN_HPP_NAMESPACE::Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       srcBuffer = srcBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setDstBuffer( Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setDstBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBuffer = dstBuffer_;
       return *this;
@@ -23595,21 +16997,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setPRegions( const BufferCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::BufferCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyBufferInfo2 & setRegions( ArrayProxyNoTemporaries<const BufferCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyBufferInfo2 & setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyBufferInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -23621,18 +17023,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyBufferInfo2 *>( this );
     }
 
-    operator VkCopyBufferInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyBufferInfo2 *>( this );
-    }
-
-    operator VkCopyBufferInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyBufferInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &, Buffer const &, uint32_t const &, const BufferCopy2 * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::BufferCopy2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcBuffer, dstBuffer, regionCount, pRegions );
@@ -23659,22 +17060,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType       = StructureType::eCopyBufferInfo2;
-    const void *        pNext       = {};
-    Buffer              srcBuffer   = {};
-    Buffer              dstBuffer   = {};
-    uint32_t            regionCount = {};
-    const BufferCopy2 * pRegions    = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType       = StructureType::eCopyBufferInfo2;
+    const void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::Buffer              srcBuffer   = {};
+    VULKAN_HPP_NAMESPACE::Buffer              dstBuffer   = {};
+    uint32_t                                  regionCount = {};
+    const VULKAN_HPP_NAMESPACE::BufferCopy2 * pRegions    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyBufferInfo2>
-  {
-    using Type = CopyBufferInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyBufferInfo2>
   {
@@ -23683,7 +17076,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CopyBufferInfo2KHR = CopyBufferInfo2;
 
-  // wrapper struct for struct VkCopyBufferToImageInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyBufferToImageInfo2.html
   struct CopyBufferToImageInfo2
   {
     using NativeType = VkCopyBufferToImageInfo2;
@@ -23691,19 +17083,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyBufferToImageInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyBufferToImageInfo2( Buffer                   srcBuffer_      = {},
-                                                 Image                    dstImage_       = {},
-                                                 ImageLayout              dstImageLayout_ = ImageLayout::eUndefined,
-                                                 uint32_t                 regionCount_    = {},
-                                                 const BufferImageCopy2 * pRegions_       = {},
-                                                 const void *             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcBuffer{ srcBuffer_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyBufferToImageInfo2( VULKAN_HPP_NAMESPACE::Buffer                   srcBuffer_      = {},
+                                                 VULKAN_HPP_NAMESPACE::Image                    dstImage_       = {},
+                                                 VULKAN_HPP_NAMESPACE::ImageLayout              dstImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                 uint32_t                                       regionCount_    = {},
+                                                 const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions_       = {},
+                                                 const void *                                   pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcBuffer( srcBuffer_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -23715,11 +17107,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyBufferToImageInfo2( Buffer                                                  srcBuffer_,
-                            Image                                                   dstImage_,
-                            ImageLayout                                             dstImageLayout_,
-                            ArrayProxyNoTemporaries<const BufferImageCopy2> const & regions_,
-                            const void *                                            pNext_ = nullptr )
+    CopyBufferToImageInfo2( VULKAN_HPP_NAMESPACE::Buffer                                                                        srcBuffer_,
+                            VULKAN_HPP_NAMESPACE::Image                                                                         dstImage_,
+                            VULKAN_HPP_NAMESPACE::ImageLayout                                                                   dstImageLayout_,
+                            VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferImageCopy2> const & regions_,
+                            const void *                                                                                        pNext_ = nullptr )
       : pNext( pNext_ )
       , srcBuffer( srcBuffer_ )
       , dstImage( dstImage_ )
@@ -23731,34 +17123,34 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CopyBufferToImageInfo2 & operator=( CopyBufferToImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyBufferToImageInfo2 & operator=( VkCopyBufferToImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyBufferToImageInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyBufferToImageInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setSrcBuffer( Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setSrcBuffer( VULKAN_HPP_NAMESPACE::Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       srcBuffer = srcBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
@@ -23770,21 +17162,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setPRegions( const BufferImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyBufferToImageInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyBufferToImageInfo2 & setRegions( ArrayProxyNoTemporaries<const BufferImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyBufferToImageInfo2 &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyBufferToImageInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -23796,19 +17189,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyBufferToImageInfo2 *>( this );
     }
 
-    operator VkCopyBufferToImageInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyBufferToImageInfo2 *>( this );
-    }
-
-    operator VkCopyBufferToImageInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyBufferToImageInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, Buffer const &, Image const &, ImageLayout const &, uint32_t const &, const BufferImageCopy2 * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions );
@@ -23835,23 +17227,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType          = StructureType::eCopyBufferToImageInfo2;
-    const void *             pNext          = {};
-    Buffer                   srcBuffer      = {};
-    Image                    dstImage       = {};
-    ImageLayout              dstImageLayout = ImageLayout::eUndefined;
-    uint32_t                 regionCount    = {};
-    const BufferImageCopy2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType          = StructureType::eCopyBufferToImageInfo2;
+    const void *                                   pNext          = {};
+    VULKAN_HPP_NAMESPACE::Buffer                   srcBuffer      = {};
+    VULKAN_HPP_NAMESPACE::Image                    dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout              dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                       regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyBufferToImageInfo2>
-  {
-    using Type = CopyBufferToImageInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyBufferToImageInfo2>
   {
@@ -23860,7 +17244,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CopyBufferToImageInfo2KHR = CopyBufferToImageInfo2;
 
-  // wrapper struct for struct VkCopyCommandTransformInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyCommandTransformInfoQCOM.html
   struct CopyCommandTransformInfoQCOM
   {
     using NativeType = VkCopyCommandTransformInfoQCOM;
@@ -23868,11 +17251,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyCommandTransformInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyCommandTransformInfoQCOM( SurfaceTransformFlagBitsKHR transform_ = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                       const void *                pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , transform{ transform_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CopyCommandTransformInfoQCOM( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+                                    const void *                                      pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , transform( transform_ )
     {
     }
 
@@ -23884,27 +17268,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyCommandTransformInfoQCOM & operator=( CopyCommandTransformInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyCommandTransformInfoQCOM & operator=( VkCopyCommandTransformInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyCommandTransformInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyCommandTransformInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyCommandTransformInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyCommandTransformInfoQCOM & setTransform( SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyCommandTransformInfoQCOM & setTransform( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
     {
       transform = transform_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyCommandTransformInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -23916,18 +17300,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyCommandTransformInfoQCOM *>( this );
     }
 
-    operator VkCopyCommandTransformInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyCommandTransformInfoQCOM *>( this );
-    }
-
-    operator VkCopyCommandTransformInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyCommandTransformInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceTransformFlagBitsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, transform );
     }
@@ -23952,26 +17331,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType     = StructureType::eCopyCommandTransformInfoQCOM;
-    const void *                pNext     = {};
-    SurfaceTransformFlagBitsKHR transform = SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::StructureType               sType     = StructureType::eCopyCommandTransformInfoQCOM;
+    const void *                                      pNext     = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyCommandTransformInfoQCOM>
-  {
-    using Type = CopyCommandTransformInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyCommandTransformInfoQCOM>
   {
     using Type = CopyCommandTransformInfoQCOM;
   };
 
-  // wrapper struct for struct VkCopyDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyDescriptorSet.html
   struct CopyDescriptorSet
   {
     using NativeType = VkCopyDescriptorSet;
@@ -23979,23 +17349,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyDescriptorSet;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyDescriptorSet( DescriptorSet srcSet_          = {},
-                                            uint32_t      srcBinding_      = {},
-                                            uint32_t      srcArrayElement_ = {},
-                                            DescriptorSet dstSet_          = {},
-                                            uint32_t      dstBinding_      = {},
-                                            uint32_t      dstArrayElement_ = {},
-                                            uint32_t      descriptorCount_ = {},
-                                            const void *  pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSet{ srcSet_ }
-      , srcBinding{ srcBinding_ }
-      , srcArrayElement{ srcArrayElement_ }
-      , dstSet{ dstSet_ }
-      , dstBinding{ dstBinding_ }
-      , dstArrayElement{ dstArrayElement_ }
-      , descriptorCount{ descriptorCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyDescriptorSet( VULKAN_HPP_NAMESPACE::DescriptorSet srcSet_          = {},
+                                            uint32_t                            srcBinding_      = {},
+                                            uint32_t                            srcArrayElement_ = {},
+                                            VULKAN_HPP_NAMESPACE::DescriptorSet dstSet_          = {},
+                                            uint32_t                            dstBinding_      = {},
+                                            uint32_t                            dstArrayElement_ = {},
+                                            uint32_t                            descriptorCount_ = {},
+                                            const void *                        pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcSet( srcSet_ )
+      , srcBinding( srcBinding_ )
+      , srcArrayElement( srcArrayElement_ )
+      , dstSet( dstSet_ )
+      , dstBinding( dstBinding_ )
+      , dstArrayElement( dstArrayElement_ )
+      , descriptorCount( descriptorCount_ )
     {
     }
 
@@ -24004,22 +17374,22 @@ namespace VULKAN_HPP_NAMESPACE
     CopyDescriptorSet( VkCopyDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT : CopyDescriptorSet( *reinterpret_cast<CopyDescriptorSet const *>( &rhs ) ) {}
 
     CopyDescriptorSet & operator=( CopyDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyDescriptorSet & operator=( VkCopyDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyDescriptorSet const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyDescriptorSet const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyDescriptorSet & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyDescriptorSet & setSrcSet( DescriptorSet srcSet_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyDescriptorSet & setSrcSet( VULKAN_HPP_NAMESPACE::DescriptorSet srcSet_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSet = srcSet_;
       return *this;
@@ -24037,7 +17407,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyDescriptorSet & setDstSet( DescriptorSet dstSet_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyDescriptorSet & setDstSet( VULKAN_HPP_NAMESPACE::DescriptorSet dstSet_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSet = dstSet_;
       return *this;
@@ -24060,7 +17430,7 @@ namespace VULKAN_HPP_NAMESPACE
       descriptorCount = descriptorCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyDescriptorSet const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -24072,26 +17442,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyDescriptorSet *>( this );
     }
 
-    operator VkCopyDescriptorSet const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyDescriptorSet *>( this );
-    }
-
-    operator VkCopyDescriptorSet *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyDescriptorSet *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DescriptorSet const &,
+               VULKAN_HPP_NAMESPACE::DescriptorSet const &,
                uint32_t const &,
                uint32_t const &,
-               DescriptorSet const &,
+               VULKAN_HPP_NAMESPACE::DescriptorSet const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcSet, srcBinding, srcArrayElement, dstSet, dstBinding, dstArrayElement, descriptorCount );
@@ -24119,32 +17483,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eCopyDescriptorSet;
-    const void *  pNext           = {};
-    DescriptorSet srcSet          = {};
-    uint32_t      srcBinding      = {};
-    uint32_t      srcArrayElement = {};
-    DescriptorSet dstSet          = {};
-    uint32_t      dstBinding      = {};
-    uint32_t      dstArrayElement = {};
-    uint32_t      descriptorCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eCopyDescriptorSet;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::DescriptorSet srcSet          = {};
+    uint32_t                            srcBinding      = {};
+    uint32_t                            srcArrayElement = {};
+    VULKAN_HPP_NAMESPACE::DescriptorSet dstSet          = {};
+    uint32_t                            dstBinding      = {};
+    uint32_t                            dstArrayElement = {};
+    uint32_t                            descriptorCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyDescriptorSet>
-  {
-    using Type = CopyDescriptorSet;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyDescriptorSet>
   {
     using Type = CopyDescriptorSet;
   };
 
-  // wrapper struct for struct VkImageCopy2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCopy2.html
   struct ImageCopy2
   {
     using NativeType = VkImageCopy2;
@@ -24152,19 +17507,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageCopy2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCopy2( ImageSubresourceLayers srcSubresource_ = {},
-                                     Offset3D               srcOffset_      = {},
-                                     ImageSubresourceLayers dstSubresource_ = {},
-                                     Offset3D               dstOffset_      = {},
-                                     Extent3D               extent_         = {},
-                                     const void *           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSubresource{ srcSubresource_ }
-      , srcOffset{ srcOffset_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffset{ dstOffset_ }
-      , extent{ extent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCopy2( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource_ = {},
+                                     VULKAN_HPP_NAMESPACE::Offset3D               srcOffset_      = {},
+                                     VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource_ = {},
+                                     VULKAN_HPP_NAMESPACE::Offset3D               dstOffset_      = {},
+                                     VULKAN_HPP_NAMESPACE::Extent3D               extent_         = {},
+                                     const void *                                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcSubresource( srcSubresource_ )
+      , srcOffset( srcOffset_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffset( dstOffset_ )
+      , extent( extent_ )
     {
     }
 
@@ -24173,51 +17528,51 @@ namespace VULKAN_HPP_NAMESPACE
     ImageCopy2( VkImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT : ImageCopy2( *reinterpret_cast<ImageCopy2 const *>( &rhs ) ) {}
 
     ImageCopy2 & operator=( ImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCopy2 & operator=( VkImageCopy2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCopy2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCopy2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setSrcOffset( Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setSrcOffset( VULKAN_HPP_NAMESPACE::Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setDstOffset( Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setDstOffset( VULKAN_HPP_NAMESPACE::Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy2 & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageCopy2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -24229,24 +17584,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCopy2 *>( this );
     }
 
-    operator VkImageCopy2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCopy2 *>( this );
-    }
-
-    operator VkImageCopy2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCopy2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               Extent3D const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcSubresource, srcOffset, dstSubresource, dstOffset, extent );
@@ -24273,23 +17622,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType          = StructureType::eImageCopy2;
-    const void *           pNext          = {};
-    ImageSubresourceLayers srcSubresource = {};
-    Offset3D               srcOffset      = {};
-    ImageSubresourceLayers dstSubresource = {};
-    Offset3D               dstOffset      = {};
-    Extent3D               extent         = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType          = StructureType::eImageCopy2;
+    const void *                                 pNext          = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               srcOffset      = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               dstOffset      = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               extent         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCopy2>
-  {
-    using Type = ImageCopy2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageCopy2>
   {
@@ -24298,7 +17639,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageCopy2KHR = ImageCopy2;
 
-  // wrapper struct for struct VkCopyImageInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyImageInfo2.html
   struct CopyImageInfo2
   {
     using NativeType = VkCopyImageInfo2;
@@ -24306,21 +17646,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyImageInfo2( Image              srcImage_       = {},
-                                         ImageLayout        srcImageLayout_ = ImageLayout::eUndefined,
-                                         Image              dstImage_       = {},
-                                         ImageLayout        dstImageLayout_ = ImageLayout::eUndefined,
-                                         uint32_t           regionCount_    = {},
-                                         const ImageCopy2 * pRegions_       = {},
-                                         const void *       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyImageInfo2( VULKAN_HPP_NAMESPACE::Image              srcImage_       = {},
+                                         VULKAN_HPP_NAMESPACE::ImageLayout        srcImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                         VULKAN_HPP_NAMESPACE::Image              dstImage_       = {},
+                                         VULKAN_HPP_NAMESPACE::ImageLayout        dstImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                         uint32_t                                 regionCount_    = {},
+                                         const VULKAN_HPP_NAMESPACE::ImageCopy2 * pRegions_       = {},
+                                         const void *                             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -24329,12 +17669,12 @@ namespace VULKAN_HPP_NAMESPACE
     CopyImageInfo2( VkCopyImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : CopyImageInfo2( *reinterpret_cast<CopyImageInfo2 const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageInfo2( Image                                             srcImage_,
-                    ImageLayout                                       srcImageLayout_,
-                    Image                                             dstImage_,
-                    ImageLayout                                       dstImageLayout_,
-                    ArrayProxyNoTemporaries<const ImageCopy2> const & regions_,
-                    const void *                                      pNext_ = nullptr )
+    CopyImageInfo2( VULKAN_HPP_NAMESPACE::Image                                                                   srcImage_,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                                             srcImageLayout_,
+                    VULKAN_HPP_NAMESPACE::Image                                                                   dstImage_,
+                    VULKAN_HPP_NAMESPACE::ImageLayout                                                             dstImageLayout_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageCopy2> const & regions_,
+                    const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , srcImage( srcImage_ )
       , srcImageLayout( srcImageLayout_ )
@@ -24347,40 +17687,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CopyImageInfo2 & operator=( CopyImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyImageInfo2 & operator=( VkCopyImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyImageInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyImageInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
@@ -24392,21 +17732,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setPRegions( const ImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::ImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageInfo2 & setRegions( ArrayProxyNoTemporaries<const ImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyImageInfo2 & setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyImageInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -24418,25 +17758,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyImageInfo2 *>( this );
     }
 
-    operator VkCopyImageInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyImageInfo2 *>( this );
-    }
-
-    operator VkCopyImageInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyImageInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Image const &,
-               ImageLayout const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const ImageCopy2 * const &>
+               const VULKAN_HPP_NAMESPACE::ImageCopy2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
@@ -24463,24 +17797,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType          = StructureType::eCopyImageInfo2;
-    const void *       pNext          = {};
-    Image              srcImage       = {};
-    ImageLayout        srcImageLayout = ImageLayout::eUndefined;
-    Image              dstImage       = {};
-    ImageLayout        dstImageLayout = ImageLayout::eUndefined;
-    uint32_t           regionCount    = {};
-    const ImageCopy2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType          = StructureType::eCopyImageInfo2;
+    const void *                             pNext          = {};
+    VULKAN_HPP_NAMESPACE::Image              srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout        srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Image              dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout        dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                 regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::ImageCopy2 * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyImageInfo2>
-  {
-    using Type = CopyImageInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyImageInfo2>
   {
@@ -24489,7 +17815,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CopyImageInfo2KHR = CopyImageInfo2;
 
-  // wrapper struct for struct VkCopyImageToBufferInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyImageToBufferInfo2.html
   struct CopyImageToBufferInfo2
   {
     using NativeType = VkCopyImageToBufferInfo2;
@@ -24497,19 +17822,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageToBufferInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyImageToBufferInfo2( Image                    srcImage_       = {},
-                                                 ImageLayout              srcImageLayout_ = ImageLayout::eUndefined,
-                                                 Buffer                   dstBuffer_      = {},
-                                                 uint32_t                 regionCount_    = {},
-                                                 const BufferImageCopy2 * pRegions_       = {},
-                                                 const void *             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , dstBuffer{ dstBuffer_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyImageToBufferInfo2( VULKAN_HPP_NAMESPACE::Image                    srcImage_       = {},
+                                                 VULKAN_HPP_NAMESPACE::ImageLayout              srcImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                 VULKAN_HPP_NAMESPACE::Buffer                   dstBuffer_      = {},
+                                                 uint32_t                                       regionCount_    = {},
+                                                 const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions_       = {},
+                                                 const void *                                   pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , dstBuffer( dstBuffer_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -24521,11 +17846,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToBufferInfo2( Image                                                   srcImage_,
-                            ImageLayout                                             srcImageLayout_,
-                            Buffer                                                  dstBuffer_,
-                            ArrayProxyNoTemporaries<const BufferImageCopy2> const & regions_,
-                            const void *                                            pNext_ = nullptr )
+    CopyImageToBufferInfo2( VULKAN_HPP_NAMESPACE::Image                                                                         srcImage_,
+                            VULKAN_HPP_NAMESPACE::ImageLayout                                                                   srcImageLayout_,
+                            VULKAN_HPP_NAMESPACE::Buffer                                                                        dstBuffer_,
+                            VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferImageCopy2> const & regions_,
+                            const void *                                                                                        pNext_ = nullptr )
       : pNext( pNext_ )
       , srcImage( srcImage_ )
       , srcImageLayout( srcImageLayout_ )
@@ -24537,34 +17862,34 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CopyImageToBufferInfo2 & operator=( CopyImageToBufferInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyImageToBufferInfo2 & operator=( VkCopyImageToBufferInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyImageToBufferInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyImageToBufferInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setDstBuffer( Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setDstBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBuffer = dstBuffer_;
       return *this;
@@ -24576,21 +17901,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setPRegions( const BufferImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToBufferInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToBufferInfo2 & setRegions( ArrayProxyNoTemporaries<const BufferImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyImageToBufferInfo2 &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyImageToBufferInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -24602,19 +17928,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyImageToBufferInfo2 *>( this );
     }
 
-    operator VkCopyImageToBufferInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyImageToBufferInfo2 *>( this );
-    }
-
-    operator VkCopyImageToBufferInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyImageToBufferInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, Image const &, ImageLayout const &, Buffer const &, uint32_t const &, const BufferImageCopy2 * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions );
@@ -24641,23 +17966,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType          = StructureType::eCopyImageToBufferInfo2;
-    const void *             pNext          = {};
-    Image                    srcImage       = {};
-    ImageLayout              srcImageLayout = ImageLayout::eUndefined;
-    Buffer                   dstBuffer      = {};
-    uint32_t                 regionCount    = {};
-    const BufferImageCopy2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType          = StructureType::eCopyImageToBufferInfo2;
+    const void *                                   pNext          = {};
+    VULKAN_HPP_NAMESPACE::Image                    srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout              srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Buffer                   dstBuffer      = {};
+    uint32_t                                       regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::BufferImageCopy2 * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyImageToBufferInfo2>
-  {
-    using Type = CopyImageToBufferInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyImageToBufferInfo2>
   {
@@ -24666,49 +17983,48 @@ namespace VULKAN_HPP_NAMESPACE
 
   using CopyImageToBufferInfo2KHR = CopyImageToBufferInfo2;
 
-  // wrapper struct for struct VkCopyImageToImageInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyImageToImageInfo.html
-  struct CopyImageToImageInfo
+  struct CopyImageToImageInfoEXT
   {
-    using NativeType = VkCopyImageToImageInfo;
+    using NativeType = VkCopyImageToImageInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageToImageInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageToImageInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyImageToImageInfo( HostImageCopyFlags flags_          = {},
-                                               Image              srcImage_       = {},
-                                               ImageLayout        srcImageLayout_ = ImageLayout::eUndefined,
-                                               Image              dstImage_       = {},
-                                               ImageLayout        dstImageLayout_ = ImageLayout::eUndefined,
-                                               uint32_t           regionCount_    = {},
-                                               const ImageCopy2 * pRegions_       = {},
-                                               const void *       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyImageToImageInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_          = {},
+                                                  VULKAN_HPP_NAMESPACE::Image                 srcImage_       = {},
+                                                  VULKAN_HPP_NAMESPACE::ImageLayout           srcImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                  VULKAN_HPP_NAMESPACE::Image                 dstImage_       = {},
+                                                  VULKAN_HPP_NAMESPACE::ImageLayout           dstImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                  uint32_t                                    regionCount_    = {},
+                                                  const VULKAN_HPP_NAMESPACE::ImageCopy2 *    pRegions_       = {},
+                                                  const void *                                pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR CopyImageToImageInfo( CopyImageToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR CopyImageToImageInfoEXT( CopyImageToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyImageToImageInfo( VkCopyImageToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyImageToImageInfo( *reinterpret_cast<CopyImageToImageInfo const *>( &rhs ) )
+    CopyImageToImageInfoEXT( VkCopyImageToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : CopyImageToImageInfoEXT( *reinterpret_cast<CopyImageToImageInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToImageInfo( HostImageCopyFlags                                flags_,
-                          Image                                             srcImage_,
-                          ImageLayout                                       srcImageLayout_,
-                          Image                                             dstImage_,
-                          ImageLayout                                       dstImageLayout_,
-                          ArrayProxyNoTemporaries<const ImageCopy2> const & regions_,
-                          const void *                                      pNext_ = nullptr )
+    CopyImageToImageInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT                                                   flags_,
+                             VULKAN_HPP_NAMESPACE::Image                                                                   srcImage_,
+                             VULKAN_HPP_NAMESPACE::ImageLayout                                                             srcImageLayout_,
+                             VULKAN_HPP_NAMESPACE::Image                                                                   dstImage_,
+                             VULKAN_HPP_NAMESPACE::ImageLayout                                                             dstImageLayout_,
+                             VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageCopy2> const & regions_,
+                             const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , srcImage( srcImage_ )
@@ -24721,104 +18037,99 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    CopyImageToImageInfo & operator=( CopyImageToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    CopyImageToImageInfoEXT & operator=( CopyImageToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    CopyImageToImageInfo & operator=( VkCopyImageToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    CopyImageToImageInfoEXT & operator=( VkCopyImageToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyImageToImageInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyImageToImageInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setFlags( HostImageCopyFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = regionCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfo & setPRegions( const ImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToImageInfoEXT & setPRegions( const VULKAN_HPP_NAMESPACE::ImageCopy2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToImageInfo & setRegions( ArrayProxyNoTemporaries<const ImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyImageToImageInfoEXT &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageCopy2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkCopyImageToImageInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkCopyImageToImageInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkCopyImageToImageInfo *>( this );
+      return *reinterpret_cast<const VkCopyImageToImageInfoEXT *>( this );
     }
 
-    operator VkCopyImageToImageInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkCopyImageToImageInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkCopyImageToImageInfo *>( this );
-    }
-
-    operator VkCopyImageToImageInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyImageToImageInfo *>( this );
-    }
-
-    operator VkCopyImageToImageInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyImageToImageInfo *>( this );
+      return *reinterpret_cast<VkCopyImageToImageInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               HostImageCopyFlags const &,
-               Image const &,
-               ImageLayout const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const ImageCopy2 * const &>
+               const VULKAN_HPP_NAMESPACE::ImageCopy2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
@@ -24826,9 +18137,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyImageToImageInfo const & ) const = default;
+    auto operator<=>( CopyImageToImageInfoEXT const & ) const = default;
 #else
-    bool operator==( CopyImageToImageInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( CopyImageToImageInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -24839,152 +18150,139 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( CopyImageToImageInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( CopyImageToImageInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType      sType          = StructureType::eCopyImageToImageInfo;
-    const void *       pNext          = {};
-    HostImageCopyFlags flags          = {};
-    Image              srcImage       = {};
-    ImageLayout        srcImageLayout = ImageLayout::eUndefined;
-    Image              dstImage       = {};
-    ImageLayout        dstImageLayout = ImageLayout::eUndefined;
-    uint32_t           regionCount    = {};
-    const ImageCopy2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType          = StructureType::eCopyImageToImageInfoEXT;
+    const void *                                pNext          = {};
+    VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags          = {};
+    VULKAN_HPP_NAMESPACE::Image                 srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Image                 dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                    regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::ImageCopy2 *    pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyImageToImageInfo>
-  {
-    using Type = CopyImageToImageInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eCopyImageToImageInfo>
+  struct CppType<StructureType, StructureType::eCopyImageToImageInfoEXT>
   {
-    using Type = CopyImageToImageInfo;
+    using Type = CopyImageToImageInfoEXT;
   };
 
-  using CopyImageToImageInfoEXT = CopyImageToImageInfo;
-
-  // wrapper struct for struct VkImageToMemoryCopy, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageToMemoryCopy.html
-  struct ImageToMemoryCopy
+  struct ImageToMemoryCopyEXT
   {
-    using NativeType = VkImageToMemoryCopy;
+    using NativeType = VkImageToMemoryCopyEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageToMemoryCopy;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageToMemoryCopyEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageToMemoryCopy( void *                 pHostPointer_      = {},
-                                            uint32_t               memoryRowLength_   = {},
-                                            uint32_t               memoryImageHeight_ = {},
-                                            ImageSubresourceLayers imageSubresource_  = {},
-                                            Offset3D               imageOffset_       = {},
-                                            Extent3D               imageExtent_       = {},
-                                            const void *           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pHostPointer{ pHostPointer_ }
-      , memoryRowLength{ memoryRowLength_ }
-      , memoryImageHeight{ memoryImageHeight_ }
-      , imageSubresource{ imageSubresource_ }
-      , imageOffset{ imageOffset_ }
-      , imageExtent{ imageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageToMemoryCopyEXT( void *                                       pHostPointer_      = {},
+                                               uint32_t                                     memoryRowLength_   = {},
+                                               uint32_t                                     memoryImageHeight_ = {},
+                                               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource_  = {},
+                                               VULKAN_HPP_NAMESPACE::Offset3D               imageOffset_       = {},
+                                               VULKAN_HPP_NAMESPACE::Extent3D               imageExtent_       = {},
+                                               const void *                                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pHostPointer( pHostPointer_ )
+      , memoryRowLength( memoryRowLength_ )
+      , memoryImageHeight( memoryImageHeight_ )
+      , imageSubresource( imageSubresource_ )
+      , imageOffset( imageOffset_ )
+      , imageExtent( imageExtent_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR ImageToMemoryCopy( ImageToMemoryCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR ImageToMemoryCopyEXT( ImageToMemoryCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    ImageToMemoryCopy( VkImageToMemoryCopy const & rhs ) VULKAN_HPP_NOEXCEPT : ImageToMemoryCopy( *reinterpret_cast<ImageToMemoryCopy const *>( &rhs ) ) {}
-
-    ImageToMemoryCopy & operator=( ImageToMemoryCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ImageToMemoryCopy & operator=( VkImageToMemoryCopy const & rhs ) VULKAN_HPP_NOEXCEPT
+    ImageToMemoryCopyEXT( VkImageToMemoryCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : ImageToMemoryCopyEXT( *reinterpret_cast<ImageToMemoryCopyEXT const *>( &rhs ) )
     {
-      *this = *reinterpret_cast<ImageToMemoryCopy const *>( &rhs );
+    }
+
+    ImageToMemoryCopyEXT & operator=( ImageToMemoryCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    ImageToMemoryCopyEXT & operator=( VkImageToMemoryCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setPHostPointer( void * pHostPointer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setPHostPointer( void * pHostPointer_ ) VULKAN_HPP_NOEXCEPT
     {
       pHostPointer = pHostPointer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setMemoryRowLength( uint32_t memoryRowLength_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setMemoryRowLength( uint32_t memoryRowLength_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryRowLength = memoryRowLength_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setMemoryImageHeight( uint32_t memoryImageHeight_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setMemoryImageHeight( uint32_t memoryImageHeight_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryImageHeight = memoryImageHeight_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setImageSubresource( ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT &
+      setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setImageOffset( Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setImageOffset( VULKAN_HPP_NAMESPACE::Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOffset = imageOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopy & setImageExtent( Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageToMemoryCopyEXT & setImageExtent( VULKAN_HPP_NAMESPACE::Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkImageToMemoryCopy const &() const VULKAN_HPP_NOEXCEPT
+    operator VkImageToMemoryCopyEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkImageToMemoryCopy *>( this );
+      return *reinterpret_cast<const VkImageToMemoryCopyEXT *>( this );
     }
 
-    operator VkImageToMemoryCopy &() VULKAN_HPP_NOEXCEPT
+    operator VkImageToMemoryCopyEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkImageToMemoryCopy *>( this );
-    }
-
-    operator VkImageToMemoryCopy const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageToMemoryCopy *>( this );
-    }
-
-    operator VkImageToMemoryCopy *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageToMemoryCopy *>( this );
+      return *reinterpret_cast<VkImageToMemoryCopyEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               Extent3D const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pHostPointer, memoryRowLength, memoryImageHeight, imageSubresource, imageOffset, imageExtent );
@@ -24992,9 +18290,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ImageToMemoryCopy const & ) const = default;
+    auto operator<=>( ImageToMemoryCopyEXT const & ) const = default;
 #else
-    bool operator==( ImageToMemoryCopy const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( ImageToMemoryCopyEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -25005,76 +18303,65 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( ImageToMemoryCopy const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( ImageToMemoryCopyEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType             = StructureType::eImageToMemoryCopy;
-    const void *           pNext             = {};
-    void *                 pHostPointer      = {};
-    uint32_t               memoryRowLength   = {};
-    uint32_t               memoryImageHeight = {};
-    ImageSubresourceLayers imageSubresource  = {};
-    Offset3D               imageOffset       = {};
-    Extent3D               imageExtent       = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType             = StructureType::eImageToMemoryCopyEXT;
+    const void *                                 pNext             = {};
+    void *                                       pHostPointer      = {};
+    uint32_t                                     memoryRowLength   = {};
+    uint32_t                                     memoryImageHeight = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               imageOffset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageExtent       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageToMemoryCopy>
-  {
-    using Type = ImageToMemoryCopy;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eImageToMemoryCopy>
+  struct CppType<StructureType, StructureType::eImageToMemoryCopyEXT>
   {
-    using Type = ImageToMemoryCopy;
+    using Type = ImageToMemoryCopyEXT;
   };
 
-  using ImageToMemoryCopyEXT = ImageToMemoryCopy;
-
-  // wrapper struct for struct VkCopyImageToMemoryInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyImageToMemoryInfo.html
-  struct CopyImageToMemoryInfo
+  struct CopyImageToMemoryInfoEXT
   {
-    using NativeType = VkCopyImageToMemoryInfo;
+    using NativeType = VkCopyImageToMemoryInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageToMemoryInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyImageToMemoryInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyImageToMemoryInfo( HostImageCopyFlags        flags_          = {},
-                                                Image                     srcImage_       = {},
-                                                ImageLayout               srcImageLayout_ = ImageLayout::eUndefined,
-                                                uint32_t                  regionCount_    = {},
-                                                const ImageToMemoryCopy * pRegions_       = {},
-                                                const void *              pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyImageToMemoryInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_           = {},
+                                                   VULKAN_HPP_NAMESPACE::Image                 srcImage_        = {},
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout           srcImageLayout_  = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                   uint32_t                                    regionCount_     = {},
+                                                   const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT * pRegions_ = {},
+                                                   const void *                                       pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR CopyImageToMemoryInfo( CopyImageToMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR CopyImageToMemoryInfoEXT( CopyImageToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyImageToMemoryInfo( VkCopyImageToMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyImageToMemoryInfo( *reinterpret_cast<CopyImageToMemoryInfo const *>( &rhs ) )
+    CopyImageToMemoryInfoEXT( VkCopyImageToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : CopyImageToMemoryInfoEXT( *reinterpret_cast<CopyImageToMemoryInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToMemoryInfo( HostImageCopyFlags                                       flags_,
-                           Image                                                    srcImage_,
-                           ImageLayout                                              srcImageLayout_,
-                           ArrayProxyNoTemporaries<const ImageToMemoryCopy> const & regions_,
-                           const void *                                             pNext_ = nullptr )
+    CopyImageToMemoryInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT                                                             flags_,
+                              VULKAN_HPP_NAMESPACE::Image                                                                             srcImage_,
+                              VULKAN_HPP_NAMESPACE::ImageLayout                                                                       srcImageLayout_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT> const & regions_,
+                              const void *                                                                                            pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , srcImage( srcImage_ )
@@ -25085,90 +18372,85 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    CopyImageToMemoryInfo & operator=( CopyImageToMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    CopyImageToMemoryInfoEXT & operator=( CopyImageToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    CopyImageToMemoryInfo & operator=( VkCopyImageToMemoryInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    CopyImageToMemoryInfoEXT & operator=( VkCopyImageToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyImageToMemoryInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyImageToMemoryInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setFlags( HostImageCopyFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = regionCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfo & setPRegions( const ImageToMemoryCopy * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyImageToMemoryInfoEXT & setPRegions( const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyImageToMemoryInfo & setRegions( ArrayProxyNoTemporaries<const ImageToMemoryCopy> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyImageToMemoryInfoEXT &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkCopyImageToMemoryInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkCopyImageToMemoryInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkCopyImageToMemoryInfo *>( this );
+      return *reinterpret_cast<const VkCopyImageToMemoryInfoEXT *>( this );
     }
 
-    operator VkCopyImageToMemoryInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkCopyImageToMemoryInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkCopyImageToMemoryInfo *>( this );
-    }
-
-    operator VkCopyImageToMemoryInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyImageToMemoryInfo *>( this );
-    }
-
-    operator VkCopyImageToMemoryInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyImageToMemoryInfo *>( this );
+      return *reinterpret_cast<VkCopyImageToMemoryInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               HostImageCopyFlags const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const ImageToMemoryCopy * const &>
+               const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, srcImage, srcImageLayout, regionCount, pRegions );
@@ -25176,9 +18458,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyImageToMemoryInfo const & ) const = default;
+    auto operator<=>( CopyImageToMemoryInfoEXT const & ) const = default;
 #else
-    bool operator==( CopyImageToMemoryInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( CopyImageToMemoryInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -25188,119 +18470,104 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( CopyImageToMemoryInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( CopyImageToMemoryInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType             sType          = StructureType::eCopyImageToMemoryInfo;
-    const void *              pNext          = {};
-    HostImageCopyFlags        flags          = {};
-    Image                     srcImage       = {};
-    ImageLayout               srcImageLayout = ImageLayout::eUndefined;
-    uint32_t                  regionCount    = {};
-    const ImageToMemoryCopy * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType          = StructureType::eCopyImageToMemoryInfoEXT;
+    const void *                                       pNext          = {};
+    VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT        flags          = {};
+    VULKAN_HPP_NAMESPACE::Image                        srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout                  srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                           regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::ImageToMemoryCopyEXT * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyImageToMemoryInfo>
-  {
-    using Type = CopyImageToMemoryInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eCopyImageToMemoryInfo>
+  struct CppType<StructureType, StructureType::eCopyImageToMemoryInfoEXT>
   {
-    using Type = CopyImageToMemoryInfo;
+    using Type = CopyImageToMemoryInfoEXT;
   };
 
-  using CopyImageToMemoryInfoEXT = CopyImageToMemoryInfo;
-
-  // wrapper struct for struct VkCopyMemoryIndirectCommandKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryIndirectCommandKHR.html
-  struct CopyMemoryIndirectCommandKHR
+  struct CopyMemoryIndirectCommandNV
   {
-    using NativeType = VkCopyMemoryIndirectCommandKHR;
+    using NativeType = VkCopyMemoryIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      CopyMemoryIndirectCommandKHR( DeviceAddress srcAddress_ = {}, DeviceAddress dstAddress_ = {}, DeviceSize size_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcAddress{ srcAddress_ }
-      , dstAddress{ dstAddress_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyMemoryIndirectCommandNV( VULKAN_HPP_NAMESPACE::DeviceAddress srcAddress_ = {},
+                                                      VULKAN_HPP_NAMESPACE::DeviceAddress dstAddress_ = {},
+                                                      VULKAN_HPP_NAMESPACE::DeviceSize    size_       = {} ) VULKAN_HPP_NOEXCEPT
+      : srcAddress( srcAddress_ )
+      , dstAddress( dstAddress_ )
+      , size( size_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR CopyMemoryIndirectCommandKHR( CopyMemoryIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR CopyMemoryIndirectCommandNV( CopyMemoryIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyMemoryIndirectCommandKHR( VkCopyMemoryIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyMemoryIndirectCommandKHR( *reinterpret_cast<CopyMemoryIndirectCommandKHR const *>( &rhs ) )
+    CopyMemoryIndirectCommandNV( VkCopyMemoryIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : CopyMemoryIndirectCommandNV( *reinterpret_cast<CopyMemoryIndirectCommandNV const *>( &rhs ) )
     {
     }
 
-    CopyMemoryIndirectCommandKHR & operator=( CopyMemoryIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    CopyMemoryIndirectCommandNV & operator=( CopyMemoryIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    CopyMemoryIndirectCommandKHR & operator=( VkCopyMemoryIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    CopyMemoryIndirectCommandNV & operator=( VkCopyMemoryIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMemoryIndirectCommandKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMemoryIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandKHR & setSrcAddress( DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandNV & setSrcAddress( VULKAN_HPP_NAMESPACE::DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAddress = srcAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandKHR & setDstAddress( DeviceAddress dstAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandNV & setDstAddress( VULKAN_HPP_NAMESPACE::DeviceAddress dstAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAddress = dstAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandKHR & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectCommandNV & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkCopyMemoryIndirectCommandKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkCopyMemoryIndirectCommandKHR *>( this );
+      return *reinterpret_cast<const VkCopyMemoryIndirectCommandNV *>( this );
     }
 
-    operator VkCopyMemoryIndirectCommandKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryIndirectCommandNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkCopyMemoryIndirectCommandKHR *>( this );
-    }
-
-    operator VkCopyMemoryIndirectCommandKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryIndirectCommandKHR *>( this );
-    }
-
-    operator VkCopyMemoryIndirectCommandKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryIndirectCommandKHR *>( this );
+      return *reinterpret_cast<VkCopyMemoryIndirectCommandNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceAddress const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &, VULKAN_HPP_NAMESPACE::DeviceAddress const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcAddress, dstAddress, size );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyMemoryIndirectCommandKHR const & ) const = default;
+    auto operator<=>( CopyMemoryIndirectCommandNV const & ) const = default;
 #else
-    bool operator==( CopyMemoryIndirectCommandKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( CopyMemoryIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -25309,282 +18576,18 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( CopyMemoryIndirectCommandKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( CopyMemoryIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    DeviceAddress srcAddress = {};
-    DeviceAddress dstAddress = {};
-    DeviceSize    size       = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress srcAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress dstAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryIndirectCommandKHR>
-  {
-    using Type = CopyMemoryIndirectCommandKHR;
-  };
-#endif
-  using CopyMemoryIndirectCommandNV = CopyMemoryIndirectCommandKHR;
-
-  // wrapper struct for struct VkStridedDeviceAddressRangeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStridedDeviceAddressRangeKHR.html
-  struct StridedDeviceAddressRangeKHR
-  {
-    using NativeType = VkStridedDeviceAddressRangeKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRangeKHR( DeviceAddress address_ = {}, DeviceSize size_ = {}, DeviceSize stride_ = {} ) VULKAN_HPP_NOEXCEPT
-      : address{ address_ }
-      , size{ size_ }
-      , stride{ stride_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRangeKHR( StridedDeviceAddressRangeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    StridedDeviceAddressRangeKHR( VkStridedDeviceAddressRangeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : StridedDeviceAddressRangeKHR( *reinterpret_cast<StridedDeviceAddressRangeKHR const *>( &rhs ) )
-    {
-    }
-
-    StridedDeviceAddressRangeKHR & operator=( StridedDeviceAddressRangeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    StridedDeviceAddressRangeKHR & operator=( VkStridedDeviceAddressRangeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<StridedDeviceAddressRangeKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRangeKHR & setAddress( DeviceAddress address_ ) VULKAN_HPP_NOEXCEPT
-    {
-      address = address_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRangeKHR & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRangeKHR & setStride( DeviceSize stride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stride = stride_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkStridedDeviceAddressRangeKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkStridedDeviceAddressRangeKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRangeKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkStridedDeviceAddressRangeKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRangeKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkStridedDeviceAddressRangeKHR *>( this );
-    }
-
-    operator VkStridedDeviceAddressRangeKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkStridedDeviceAddressRangeKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( address, size, stride );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( StridedDeviceAddressRangeKHR const & ) const = default;
-#else
-    bool operator==( StridedDeviceAddressRangeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( address == rhs.address ) && ( size == rhs.size ) && ( stride == rhs.stride );
-#  endif
-    }
-
-    bool operator!=( StridedDeviceAddressRangeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress address = {};
-    DeviceSize    size    = {};
-    DeviceSize    stride  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkStridedDeviceAddressRangeKHR>
-  {
-    using Type = StridedDeviceAddressRangeKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkCopyMemoryIndirectInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryIndirectInfoKHR.html
-  struct CopyMemoryIndirectInfoKHR
-  {
-    using NativeType = VkCopyMemoryIndirectInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryIndirectInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyMemoryIndirectInfoKHR( AddressCopyFlagsKHR          srcCopyFlags_     = {},
-                                                    AddressCopyFlagsKHR          dstCopyFlags_     = {},
-                                                    uint32_t                     copyCount_        = {},
-                                                    StridedDeviceAddressRangeKHR copyAddressRange_ = {},
-                                                    const void *                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcCopyFlags{ srcCopyFlags_ }
-      , dstCopyFlags{ dstCopyFlags_ }
-      , copyCount{ copyCount_ }
-      , copyAddressRange{ copyAddressRange_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CopyMemoryIndirectInfoKHR( CopyMemoryIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CopyMemoryIndirectInfoKHR( VkCopyMemoryIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyMemoryIndirectInfoKHR( *reinterpret_cast<CopyMemoryIndirectInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    CopyMemoryIndirectInfoKHR & operator=( CopyMemoryIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CopyMemoryIndirectInfoKHR & operator=( VkCopyMemoryIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CopyMemoryIndirectInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectInfoKHR & setSrcCopyFlags( AddressCopyFlagsKHR srcCopyFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcCopyFlags = srcCopyFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectInfoKHR & setDstCopyFlags( AddressCopyFlagsKHR dstCopyFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstCopyFlags = dstCopyFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectInfoKHR & setCopyCount( uint32_t copyCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      copyCount = copyCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryIndirectInfoKHR & setCopyAddressRange( StridedDeviceAddressRangeKHR const & copyAddressRange_ ) VULKAN_HPP_NOEXCEPT
-    {
-      copyAddressRange = copyAddressRange_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCopyMemoryIndirectInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCopyMemoryIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryIndirectInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCopyMemoryIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryIndirectInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryIndirectInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryIndirectInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               AddressCopyFlagsKHR const &,
-               AddressCopyFlagsKHR const &,
-               uint32_t const &,
-               StridedDeviceAddressRangeKHR const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, srcCopyFlags, dstCopyFlags, copyCount, copyAddressRange );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyMemoryIndirectInfoKHR const & ) const = default;
-#else
-    bool operator==( CopyMemoryIndirectInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( srcCopyFlags == rhs.srcCopyFlags ) && ( dstCopyFlags == rhs.dstCopyFlags ) &&
-             ( copyCount == rhs.copyCount ) && ( copyAddressRange == rhs.copyAddressRange );
-#  endif
-    }
-
-    bool operator!=( CopyMemoryIndirectInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                sType            = StructureType::eCopyMemoryIndirectInfoKHR;
-    const void *                 pNext            = {};
-    AddressCopyFlagsKHR          srcCopyFlags     = {};
-    AddressCopyFlagsKHR          dstCopyFlags     = {};
-    uint32_t                     copyCount        = {};
-    StridedDeviceAddressRangeKHR copyAddressRange = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryIndirectInfoKHR>
-  {
-    using Type = CopyMemoryIndirectInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCopyMemoryIndirectInfoKHR>
-  {
-    using Type = CopyMemoryIndirectInfoKHR;
-  };
-
-  // wrapper struct for struct VkCopyMemoryToAccelerationStructureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryToAccelerationStructureInfoKHR.html
   struct CopyMemoryToAccelerationStructureInfoKHR
   {
     using NativeType = VkCopyMemoryToAccelerationStructureInfoKHR;
@@ -25592,15 +18595,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryToAccelerationStructureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR( DeviceOrHostAddressConstKHR      src_   = {},
-                                                                      AccelerationStructureKHR         dst_   = {},
-                                                                      CopyAccelerationStructureModeKHR mode_  = CopyAccelerationStructureModeKHR::eClone,
-                                                                      const void *                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR(
+      VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      src_   = {},
+      VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         dst_   = {},
+      VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone,
+      const void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -25612,39 +18616,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyMemoryToAccelerationStructureInfoKHR & operator=( CopyMemoryToAccelerationStructureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyMemoryToAccelerationStructureInfoKHR & operator=( VkCopyMemoryToAccelerationStructureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMemoryToAccelerationStructureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMemoryToAccelerationStructureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR & setSrc( DeviceOrHostAddressConstKHR const & src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR &
+      setSrc( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR & setDst( AccelerationStructureKHR dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR & setDst( VULKAN_HPP_NAMESPACE::AccelerationStructureKHR dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR & setMode( CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToAccelerationStructureInfoKHR &
+      setMode( VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyMemoryToAccelerationStructureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -25656,22 +18662,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyMemoryToAccelerationStructureInfoKHR *>( this );
     }
 
-    operator VkCopyMemoryToAccelerationStructureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryToAccelerationStructureInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryToAccelerationStructureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryToAccelerationStructureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DeviceOrHostAddressConstKHR const &,
-               AccelerationStructureKHR const &,
-               CopyAccelerationStructureModeKHR const &>
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::AccelerationStructureKHR const &,
+               VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -25679,125 +18679,115 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType = StructureType::eCopyMemoryToAccelerationStructureInfoKHR;
-    const void *                     pNext = {};
-    DeviceOrHostAddressConstKHR      src   = {};
-    AccelerationStructureKHR         dst   = {};
-    CopyAccelerationStructureModeKHR mode  = CopyAccelerationStructureModeKHR::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType = StructureType::eCopyMemoryToAccelerationStructureInfoKHR;
+    const void *                                           pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      src   = {};
+    VULKAN_HPP_NAMESPACE::AccelerationStructureKHR         dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR mode  = VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryToAccelerationStructureInfoKHR>
-  {
-    using Type = CopyMemoryToAccelerationStructureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyMemoryToAccelerationStructureInfoKHR>
   {
     using Type = CopyMemoryToAccelerationStructureInfoKHR;
   };
 
-  // wrapper struct for struct VkCopyMemoryToImageIndirectCommandKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryToImageIndirectCommandKHR.html
-  struct CopyMemoryToImageIndirectCommandKHR
+  struct CopyMemoryToImageIndirectCommandNV
   {
-    using NativeType = VkCopyMemoryToImageIndirectCommandKHR;
+    using NativeType = VkCopyMemoryToImageIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectCommandKHR( DeviceAddress          srcAddress_        = {},
-                                                              uint32_t               bufferRowLength_   = {},
-                                                              uint32_t               bufferImageHeight_ = {},
-                                                              ImageSubresourceLayers imageSubresource_  = {},
-                                                              Offset3D               imageOffset_       = {},
-                                                              Extent3D               imageExtent_       = {} ) VULKAN_HPP_NOEXCEPT
-      : srcAddress{ srcAddress_ }
-      , bufferRowLength{ bufferRowLength_ }
-      , bufferImageHeight{ bufferImageHeight_ }
-      , imageSubresource{ imageSubresource_ }
-      , imageOffset{ imageOffset_ }
-      , imageExtent{ imageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectCommandNV( VULKAN_HPP_NAMESPACE::DeviceAddress          srcAddress_        = {},
+                                                             uint32_t                                     bufferRowLength_   = {},
+                                                             uint32_t                                     bufferImageHeight_ = {},
+                                                             VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource_  = {},
+                                                             VULKAN_HPP_NAMESPACE::Offset3D               imageOffset_       = {},
+                                                             VULKAN_HPP_NAMESPACE::Extent3D               imageExtent_       = {} ) VULKAN_HPP_NOEXCEPT
+      : srcAddress( srcAddress_ )
+      , bufferRowLength( bufferRowLength_ )
+      , bufferImageHeight( bufferImageHeight_ )
+      , imageSubresource( imageSubresource_ )
+      , imageOffset( imageOffset_ )
+      , imageExtent( imageExtent_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectCommandKHR( CopyMemoryToImageIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectCommandNV( CopyMemoryToImageIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyMemoryToImageIndirectCommandKHR( VkCopyMemoryToImageIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyMemoryToImageIndirectCommandKHR( *reinterpret_cast<CopyMemoryToImageIndirectCommandKHR const *>( &rhs ) )
+    CopyMemoryToImageIndirectCommandNV( VkCopyMemoryToImageIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : CopyMemoryToImageIndirectCommandNV( *reinterpret_cast<CopyMemoryToImageIndirectCommandNV const *>( &rhs ) )
     {
     }
 
-    CopyMemoryToImageIndirectCommandKHR & operator=( CopyMemoryToImageIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    CopyMemoryToImageIndirectCommandNV & operator=( CopyMemoryToImageIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    CopyMemoryToImageIndirectCommandKHR & operator=( VkCopyMemoryToImageIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    CopyMemoryToImageIndirectCommandNV & operator=( VkCopyMemoryToImageIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMemoryToImageIndirectCommandKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMemoryToImageIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setSrcAddress( DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV & setSrcAddress( VULKAN_HPP_NAMESPACE::DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAddress = srcAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setBufferRowLength( uint32_t bufferRowLength_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV & setBufferRowLength( uint32_t bufferRowLength_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferRowLength = bufferRowLength_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setBufferImageHeight( uint32_t bufferImageHeight_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV & setBufferImageHeight( uint32_t bufferImageHeight_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferImageHeight = bufferImageHeight_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setImageSubresource( ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV &
+      setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setImageOffset( Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV & setImageOffset( VULKAN_HPP_NAMESPACE::Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOffset = imageOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandKHR & setImageExtent( Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectCommandNV & setImageExtent( VULKAN_HPP_NAMESPACE::Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkCopyMemoryToImageIndirectCommandKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryToImageIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkCopyMemoryToImageIndirectCommandKHR *>( this );
+      return *reinterpret_cast<const VkCopyMemoryToImageIndirectCommandNV *>( this );
     }
 
-    operator VkCopyMemoryToImageIndirectCommandKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryToImageIndirectCommandNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkCopyMemoryToImageIndirectCommandKHR *>( this );
-    }
-
-    operator VkCopyMemoryToImageIndirectCommandKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryToImageIndirectCommandKHR *>( this );
-    }
-
-    operator VkCopyMemoryToImageIndirectCommandKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryToImageIndirectCommandKHR *>( this );
+      return *reinterpret_cast<VkCopyMemoryToImageIndirectCommandNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, uint32_t const &, ImageSubresourceLayers const &, Offset3D const &, Extent3D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcAddress, bufferRowLength, bufferImageHeight, imageSubresource, imageOffset, imageExtent );
@@ -25805,9 +18795,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyMemoryToImageIndirectCommandKHR const & ) const = default;
+    auto operator<=>( CopyMemoryToImageIndirectCommandNV const & ) const = default;
 #else
-    bool operator==( CopyMemoryToImageIndirectCommandKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( CopyMemoryToImageIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -25817,337 +18807,130 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( CopyMemoryToImageIndirectCommandKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( CopyMemoryToImageIndirectCommandNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    DeviceAddress          srcAddress        = {};
-    uint32_t               bufferRowLength   = {};
-    uint32_t               bufferImageHeight = {};
-    ImageSubresourceLayers imageSubresource  = {};
-    Offset3D               imageOffset       = {};
-    Extent3D               imageExtent       = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress          srcAddress        = {};
+    uint32_t                                     bufferRowLength   = {};
+    uint32_t                                     bufferImageHeight = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               imageOffset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageExtent       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryToImageIndirectCommandKHR>
+  struct MemoryToImageCopyEXT
   {
-    using Type = CopyMemoryToImageIndirectCommandKHR;
-  };
-#endif
-  using CopyMemoryToImageIndirectCommandNV = CopyMemoryToImageIndirectCommandKHR;
-
-  // wrapper struct for struct VkCopyMemoryToImageIndirectInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryToImageIndirectInfoKHR.html
-  struct CopyMemoryToImageIndirectInfoKHR
-  {
-    using NativeType = VkCopyMemoryToImageIndirectInfoKHR;
+    using NativeType = VkMemoryToImageCopyEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryToImageIndirectInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryToImageCopyEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectInfoKHR( AddressCopyFlagsKHR            srcCopyFlags_       = {},
-                                                           uint32_t                       copyCount_          = {},
-                                                           StridedDeviceAddressRangeKHR   copyAddressRange_   = {},
-                                                           Image                          dstImage_           = {},
-                                                           ImageLayout                    dstImageLayout_     = ImageLayout::eUndefined,
-                                                           const ImageSubresourceLayers * pImageSubresources_ = {},
-                                                           const void *                   pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcCopyFlags{ srcCopyFlags_ }
-      , copyCount{ copyCount_ }
-      , copyAddressRange{ copyAddressRange_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , pImageSubresources{ pImageSubresources_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageIndirectInfoKHR( CopyMemoryToImageIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CopyMemoryToImageIndirectInfoKHR( VkCopyMemoryToImageIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyMemoryToImageIndirectInfoKHR( *reinterpret_cast<CopyMemoryToImageIndirectInfoKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyMemoryToImageIndirectInfoKHR( AddressCopyFlagsKHR                                           srcCopyFlags_,
-                                      StridedDeviceAddressRangeKHR                                  copyAddressRange_,
-                                      Image                                                         dstImage_,
-                                      ImageLayout                                                   dstImageLayout_,
-                                      ArrayProxyNoTemporaries<const ImageSubresourceLayers> const & imageSubresources_,
-                                      const void *                                                  pNext_ = nullptr )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryToImageCopyEXT( const void *                                 pHostPointer_      = {},
+                                               uint32_t                                     memoryRowLength_   = {},
+                                               uint32_t                                     memoryImageHeight_ = {},
+                                               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource_  = {},
+                                               VULKAN_HPP_NAMESPACE::Offset3D               imageOffset_       = {},
+                                               VULKAN_HPP_NAMESPACE::Extent3D               imageExtent_       = {},
+                                               const void *                                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
       : pNext( pNext_ )
-      , srcCopyFlags( srcCopyFlags_ )
-      , copyCount( static_cast<uint32_t>( imageSubresources_.size() ) )
-      , copyAddressRange( copyAddressRange_ )
-      , dstImage( dstImage_ )
-      , dstImageLayout( dstImageLayout_ )
-      , pImageSubresources( imageSubresources_.data() )
+      , pHostPointer( pHostPointer_ )
+      , memoryRowLength( memoryRowLength_ )
+      , memoryImageHeight( memoryImageHeight_ )
+      , imageSubresource( imageSubresource_ )
+      , imageOffset( imageOffset_ )
+      , imageExtent( imageExtent_ )
     {
     }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    CopyMemoryToImageIndirectInfoKHR & operator=( CopyMemoryToImageIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    VULKAN_HPP_CONSTEXPR MemoryToImageCopyEXT( MemoryToImageCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyMemoryToImageIndirectInfoKHR & operator=( VkCopyMemoryToImageIndirectInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    MemoryToImageCopyEXT( VkMemoryToImageCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : MemoryToImageCopyEXT( *reinterpret_cast<MemoryToImageCopyEXT const *>( &rhs ) )
     {
-      *this = *reinterpret_cast<CopyMemoryToImageIndirectInfoKHR const *>( &rhs );
+    }
+
+    MemoryToImageCopyEXT & operator=( MemoryToImageCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    MemoryToImageCopyEXT & operator=( VkMemoryToImageCopyEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setSrcCopyFlags( AddressCopyFlagsKHR srcCopyFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcCopyFlags = srcCopyFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setCopyCount( uint32_t copyCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      copyCount = copyCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setCopyAddressRange( StridedDeviceAddressRangeKHR const & copyAddressRange_ ) VULKAN_HPP_NOEXCEPT
-    {
-      copyAddressRange = copyAddressRange_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstImage = dstImage_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstImageLayout = dstImageLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageIndirectInfoKHR & setPImageSubresources( const ImageSubresourceLayers * pImageSubresources_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pImageSubresources = pImageSubresources_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyMemoryToImageIndirectInfoKHR &
-      setImageSubresources( ArrayProxyNoTemporaries<const ImageSubresourceLayers> const & imageSubresources_ ) VULKAN_HPP_NOEXCEPT
-    {
-      copyCount          = static_cast<uint32_t>( imageSubresources_.size() );
-      pImageSubresources = imageSubresources_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCopyMemoryToImageIndirectInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCopyMemoryToImageIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryToImageIndirectInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCopyMemoryToImageIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryToImageIndirectInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryToImageIndirectInfoKHR *>( this );
-    }
-
-    operator VkCopyMemoryToImageIndirectInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryToImageIndirectInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               AddressCopyFlagsKHR const &,
-               uint32_t const &,
-               StridedDeviceAddressRangeKHR const &,
-               Image const &,
-               ImageLayout const &,
-               const ImageSubresourceLayers * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, srcCopyFlags, copyCount, copyAddressRange, dstImage, dstImageLayout, pImageSubresources );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyMemoryToImageIndirectInfoKHR const & ) const = default;
-#else
-    bool operator==( CopyMemoryToImageIndirectInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( srcCopyFlags == rhs.srcCopyFlags ) && ( copyCount == rhs.copyCount ) &&
-             ( copyAddressRange == rhs.copyAddressRange ) && ( dstImage == rhs.dstImage ) && ( dstImageLayout == rhs.dstImageLayout ) &&
-             ( pImageSubresources == rhs.pImageSubresources );
-#  endif
-    }
-
-    bool operator!=( CopyMemoryToImageIndirectInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType              = StructureType::eCopyMemoryToImageIndirectInfoKHR;
-    const void *                   pNext              = {};
-    AddressCopyFlagsKHR            srcCopyFlags       = {};
-    uint32_t                       copyCount          = {};
-    StridedDeviceAddressRangeKHR   copyAddressRange   = {};
-    Image                          dstImage           = {};
-    ImageLayout                    dstImageLayout     = ImageLayout::eUndefined;
-    const ImageSubresourceLayers * pImageSubresources = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryToImageIndirectInfoKHR>
-  {
-    using Type = CopyMemoryToImageIndirectInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCopyMemoryToImageIndirectInfoKHR>
-  {
-    using Type = CopyMemoryToImageIndirectInfoKHR;
-  };
-
-  // wrapper struct for struct VkMemoryToImageCopy, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryToImageCopy.html
-  struct MemoryToImageCopy
-  {
-    using NativeType = VkMemoryToImageCopy;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryToImageCopy;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryToImageCopy( const void *           pHostPointer_      = {},
-                                            uint32_t               memoryRowLength_   = {},
-                                            uint32_t               memoryImageHeight_ = {},
-                                            ImageSubresourceLayers imageSubresource_  = {},
-                                            Offset3D               imageOffset_       = {},
-                                            Extent3D               imageExtent_       = {},
-                                            const void *           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pHostPointer{ pHostPointer_ }
-      , memoryRowLength{ memoryRowLength_ }
-      , memoryImageHeight{ memoryImageHeight_ }
-      , imageSubresource{ imageSubresource_ }
-      , imageOffset{ imageOffset_ }
-      , imageExtent{ imageExtent_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryToImageCopy( MemoryToImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryToImageCopy( VkMemoryToImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryToImageCopy( *reinterpret_cast<MemoryToImageCopy const *>( &rhs ) ) {}
-
-    MemoryToImageCopy & operator=( MemoryToImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryToImageCopy & operator=( VkMemoryToImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryToImageCopy const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setPHostPointer( const void * pHostPointer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setPHostPointer( const void * pHostPointer_ ) VULKAN_HPP_NOEXCEPT
     {
       pHostPointer = pHostPointer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setMemoryRowLength( uint32_t memoryRowLength_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setMemoryRowLength( uint32_t memoryRowLength_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryRowLength = memoryRowLength_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setMemoryImageHeight( uint32_t memoryImageHeight_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setMemoryImageHeight( uint32_t memoryImageHeight_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryImageHeight = memoryImageHeight_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setImageSubresource( ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT &
+      setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setImageOffset( Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setImageOffset( VULKAN_HPP_NAMESPACE::Offset3D const & imageOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       imageOffset = imageOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopy & setImageExtent( Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryToImageCopyEXT & setImageExtent( VULKAN_HPP_NAMESPACE::Extent3D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkMemoryToImageCopy const &() const VULKAN_HPP_NOEXCEPT
+    operator VkMemoryToImageCopyEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkMemoryToImageCopy *>( this );
+      return *reinterpret_cast<const VkMemoryToImageCopyEXT *>( this );
     }
 
-    operator VkMemoryToImageCopy &() VULKAN_HPP_NOEXCEPT
+    operator VkMemoryToImageCopyEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkMemoryToImageCopy *>( this );
-    }
-
-    operator VkMemoryToImageCopy const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryToImageCopy *>( this );
-    }
-
-    operator VkMemoryToImageCopy *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryToImageCopy *>( this );
+      return *reinterpret_cast<VkMemoryToImageCopyEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                const void * const &,
                uint32_t const &,
                uint32_t const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               Extent3D const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pHostPointer, memoryRowLength, memoryImageHeight, imageSubresource, imageOffset, imageExtent );
@@ -26155,9 +18938,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryToImageCopy const & ) const = default;
+    auto operator<=>( MemoryToImageCopyEXT const & ) const = default;
 #else
-    bool operator==( MemoryToImageCopy const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( MemoryToImageCopyEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -26168,76 +18951,65 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( MemoryToImageCopy const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( MemoryToImageCopyEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType             = StructureType::eMemoryToImageCopy;
-    const void *           pNext             = {};
-    const void *           pHostPointer      = {};
-    uint32_t               memoryRowLength   = {};
-    uint32_t               memoryImageHeight = {};
-    ImageSubresourceLayers imageSubresource  = {};
-    Offset3D               imageOffset       = {};
-    Extent3D               imageExtent       = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType             = StructureType::eMemoryToImageCopyEXT;
+    const void *                                 pNext             = {};
+    const void *                                 pHostPointer      = {};
+    uint32_t                                     memoryRowLength   = {};
+    uint32_t                                     memoryImageHeight = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers imageSubresource  = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               imageOffset       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageExtent       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryToImageCopy>
-  {
-    using Type = MemoryToImageCopy;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eMemoryToImageCopy>
+  struct CppType<StructureType, StructureType::eMemoryToImageCopyEXT>
   {
-    using Type = MemoryToImageCopy;
+    using Type = MemoryToImageCopyEXT;
   };
 
-  using MemoryToImageCopyEXT = MemoryToImageCopy;
-
-  // wrapper struct for struct VkCopyMemoryToImageInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryToImageInfo.html
-  struct CopyMemoryToImageInfo
+  struct CopyMemoryToImageInfoEXT
   {
-    using NativeType = VkCopyMemoryToImageInfo;
+    using NativeType = VkCopyMemoryToImageInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryToImageInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryToImageInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageInfo( HostImageCopyFlags        flags_          = {},
-                                                Image                     dstImage_       = {},
-                                                ImageLayout               dstImageLayout_ = ImageLayout::eUndefined,
-                                                uint32_t                  regionCount_    = {},
-                                                const MemoryToImageCopy * pRegions_       = {},
-                                                const void *              pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyMemoryToImageInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_           = {},
+                                                   VULKAN_HPP_NAMESPACE::Image                 dstImage_        = {},
+                                                   VULKAN_HPP_NAMESPACE::ImageLayout           dstImageLayout_  = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                   uint32_t                                    regionCount_     = {},
+                                                   const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT * pRegions_ = {},
+                                                   const void *                                       pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR CopyMemoryToImageInfo( CopyMemoryToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR CopyMemoryToImageInfoEXT( CopyMemoryToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    CopyMemoryToImageInfo( VkCopyMemoryToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CopyMemoryToImageInfo( *reinterpret_cast<CopyMemoryToImageInfo const *>( &rhs ) )
+    CopyMemoryToImageInfoEXT( VkCopyMemoryToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : CopyMemoryToImageInfoEXT( *reinterpret_cast<CopyMemoryToImageInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyMemoryToImageInfo( HostImageCopyFlags                                       flags_,
-                           Image                                                    dstImage_,
-                           ImageLayout                                              dstImageLayout_,
-                           ArrayProxyNoTemporaries<const MemoryToImageCopy> const & regions_,
-                           const void *                                             pNext_ = nullptr )
+    CopyMemoryToImageInfoEXT( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT                                                             flags_,
+                              VULKAN_HPP_NAMESPACE::Image                                                                             dstImage_,
+                              VULKAN_HPP_NAMESPACE::ImageLayout                                                                       dstImageLayout_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT> const & regions_,
+                              const void *                                                                                            pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , dstImage( dstImage_ )
@@ -26248,90 +19020,85 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    CopyMemoryToImageInfo & operator=( CopyMemoryToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    CopyMemoryToImageInfoEXT & operator=( CopyMemoryToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    CopyMemoryToImageInfo & operator=( VkCopyMemoryToImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    CopyMemoryToImageInfoEXT & operator=( VkCopyMemoryToImageInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMemoryToImageInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMemoryToImageInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setFlags( HostImageCopyFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = regionCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfo & setPRegions( const MemoryToImageCopy * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToImageInfoEXT & setPRegions( const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyMemoryToImageInfo & setRegions( ArrayProxyNoTemporaries<const MemoryToImageCopy> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    CopyMemoryToImageInfoEXT &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkCopyMemoryToImageInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryToImageInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkCopyMemoryToImageInfo *>( this );
+      return *reinterpret_cast<const VkCopyMemoryToImageInfoEXT *>( this );
     }
 
-    operator VkCopyMemoryToImageInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkCopyMemoryToImageInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkCopyMemoryToImageInfo *>( this );
-    }
-
-    operator VkCopyMemoryToImageInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryToImageInfo *>( this );
-    }
-
-    operator VkCopyMemoryToImageInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryToImageInfo *>( this );
+      return *reinterpret_cast<VkCopyMemoryToImageInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               HostImageCopyFlags const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const MemoryToImageCopy * const &>
+               const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, dstImage, dstImageLayout, regionCount, pRegions );
@@ -26339,9 +19106,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyMemoryToImageInfo const & ) const = default;
+    auto operator<=>( CopyMemoryToImageInfoEXT const & ) const = default;
 #else
-    bool operator==( CopyMemoryToImageInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( CopyMemoryToImageInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -26351,39 +19118,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( CopyMemoryToImageInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( CopyMemoryToImageInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType             sType          = StructureType::eCopyMemoryToImageInfo;
-    const void *              pNext          = {};
-    HostImageCopyFlags        flags          = {};
-    Image                     dstImage       = {};
-    ImageLayout               dstImageLayout = ImageLayout::eUndefined;
-    uint32_t                  regionCount    = {};
-    const MemoryToImageCopy * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType          = StructureType::eCopyMemoryToImageInfoEXT;
+    const void *                                       pNext          = {};
+    VULKAN_HPP_NAMESPACE::HostImageCopyFlagsEXT        flags          = {};
+    VULKAN_HPP_NAMESPACE::Image                        dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout                  dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                           regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::MemoryToImageCopyEXT * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryToImageInfo>
-  {
-    using Type = CopyMemoryToImageInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eCopyMemoryToImageInfo>
+  struct CppType<StructureType, StructureType::eCopyMemoryToImageInfoEXT>
   {
-    using Type = CopyMemoryToImageInfo;
+    using Type = CopyMemoryToImageInfoEXT;
   };
 
-  using CopyMemoryToImageInfoEXT = CopyMemoryToImageInfo;
-
-  // wrapper struct for struct VkCopyMemoryToMicromapInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMemoryToMicromapInfoEXT.html
   struct CopyMemoryToMicromapInfoEXT
   {
     using NativeType = VkCopyMemoryToMicromapInfoEXT;
@@ -26391,15 +19147,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMemoryToMicromapInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT( DeviceOrHostAddressConstKHR src_   = {},
-                                                         MicromapEXT                 dst_   = {},
-                                                         CopyMicromapModeEXT         mode_  = CopyMicromapModeEXT::eClone,
-                                                         const void *                pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR src_ = {},
+                                                         VULKAN_HPP_NAMESPACE::MicromapEXT                 dst_ = {},
+                                                         VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode_  = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone,
+                                                         const void *                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -26411,39 +19167,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyMemoryToMicromapInfoEXT & operator=( CopyMemoryToMicromapInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyMemoryToMicromapInfoEXT & operator=( VkCopyMemoryToMicromapInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMemoryToMicromapInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMemoryToMicromapInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setSrc( DeviceOrHostAddressConstKHR const & src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setSrc( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setDst( MicromapEXT dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setDst( VULKAN_HPP_NAMESPACE::MicromapEXT dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setMode( CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMemoryToMicromapInfoEXT & setMode( VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyMemoryToMicromapInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -26455,18 +19211,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyMemoryToMicromapInfoEXT *>( this );
     }
 
-    operator VkCopyMemoryToMicromapInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMemoryToMicromapInfoEXT *>( this );
-    }
-
-    operator VkCopyMemoryToMicromapInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMemoryToMicromapInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceOrHostAddressConstKHR const &, MicromapEXT const &, CopyMicromapModeEXT const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &,
+               VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -26474,28 +19228,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType = StructureType::eCopyMemoryToMicromapInfoEXT;
-    const void *                pNext = {};
-    DeviceOrHostAddressConstKHR src   = {};
-    MicromapEXT                 dst   = {};
-    CopyMicromapModeEXT         mode  = CopyMicromapModeEXT::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType               sType = StructureType::eCopyMemoryToMicromapInfoEXT;
+    const void *                                      pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR src   = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT                 dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT         mode  = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMemoryToMicromapInfoEXT>
-  {
-    using Type = CopyMemoryToMicromapInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyMemoryToMicromapInfoEXT>
   {
     using Type = CopyMemoryToMicromapInfoEXT;
   };
 
-  // wrapper struct for struct VkCopyMicromapInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMicromapInfoEXT.html
   struct CopyMicromapInfoEXT
   {
     using NativeType = VkCopyMicromapInfoEXT;
@@ -26503,15 +19248,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMicromapInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyMicromapInfoEXT( MicromapEXT         src_   = {},
-                                              MicromapEXT         dst_   = {},
-                                              CopyMicromapModeEXT mode_  = CopyMicromapModeEXT::eClone,
-                                              const void *        pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CopyMicromapInfoEXT( VULKAN_HPP_NAMESPACE::MicromapEXT         src_   = {},
+                                              VULKAN_HPP_NAMESPACE::MicromapEXT         dst_   = {},
+                                              VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode_  = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone,
+                                              const void *                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -26522,39 +19267,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyMicromapInfoEXT & operator=( CopyMicromapInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyMicromapInfoEXT & operator=( VkCopyMicromapInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMicromapInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMicromapInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setSrc( MicromapEXT src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setSrc( VULKAN_HPP_NAMESPACE::MicromapEXT src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setDst( MicromapEXT dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setDst( VULKAN_HPP_NAMESPACE::MicromapEXT dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setMode( CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapInfoEXT & setMode( VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyMicromapInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -26566,18 +19311,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyMicromapInfoEXT *>( this );
     }
 
-    operator VkCopyMicromapInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMicromapInfoEXT *>( this );
-    }
-
-    operator VkCopyMicromapInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMicromapInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MicromapEXT const &, MicromapEXT const &, CopyMicromapModeEXT const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &,
+               VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -26603,28 +19346,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType = StructureType::eCopyMicromapInfoEXT;
-    const void *        pNext = {};
-    MicromapEXT         src   = {};
-    MicromapEXT         dst   = {};
-    CopyMicromapModeEXT mode  = CopyMicromapModeEXT::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType       sType = StructureType::eCopyMicromapInfoEXT;
+    const void *                              pNext = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT         src   = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT         dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode  = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMicromapInfoEXT>
-  {
-    using Type = CopyMicromapInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyMicromapInfoEXT>
   {
     using Type = CopyMicromapInfoEXT;
   };
 
-  // wrapper struct for struct VkCopyMicromapToMemoryInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyMicromapToMemoryInfoEXT.html
   struct CopyMicromapToMemoryInfoEXT
   {
     using NativeType = VkCopyMicromapToMemoryInfoEXT;
@@ -26632,15 +19366,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyMicromapToMemoryInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT( MicromapEXT            src_   = {},
-                                                         DeviceOrHostAddressKHR dst_   = {},
-                                                         CopyMicromapModeEXT    mode_  = CopyMicromapModeEXT::eClone,
-                                                         const void *           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , src{ src_ }
-      , dst{ dst_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT( VULKAN_HPP_NAMESPACE::MicromapEXT            src_  = {},
+                                                         VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR dst_  = {},
+                                                         VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT    mode_ = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone,
+                                                         const void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , src( src_ )
+      , dst( dst_ )
+      , mode( mode_ )
     {
     }
 
@@ -26652,39 +19386,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CopyMicromapToMemoryInfoEXT & operator=( CopyMicromapToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CopyMicromapToMemoryInfoEXT & operator=( VkCopyMicromapToMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CopyMicromapToMemoryInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CopyMicromapToMemoryInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setSrc( MicromapEXT src_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setSrc( VULKAN_HPP_NAMESPACE::MicromapEXT src_ ) VULKAN_HPP_NOEXCEPT
     {
       src = src_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setDst( DeviceOrHostAddressKHR const & dst_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setDst( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const & dst_ ) VULKAN_HPP_NOEXCEPT
     {
       dst = dst_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setMode( CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CopyMicromapToMemoryInfoEXT & setMode( VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCopyMicromapToMemoryInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -26696,18 +19430,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCopyMicromapToMemoryInfoEXT *>( this );
     }
 
-    operator VkCopyMicromapToMemoryInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyMicromapToMemoryInfoEXT *>( this );
-    }
-
-    operator VkCopyMicromapToMemoryInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyMicromapToMemoryInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MicromapEXT const &, DeviceOrHostAddressKHR const &, CopyMicromapModeEXT const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const &,
+               VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, src, dst, mode );
@@ -26715,383 +19447,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType = StructureType::eCopyMicromapToMemoryInfoEXT;
-    const void *           pNext = {};
-    MicromapEXT            src   = {};
-    DeviceOrHostAddressKHR dst   = {};
-    CopyMicromapModeEXT    mode  = CopyMicromapModeEXT::eClone;
+    VULKAN_HPP_NAMESPACE::StructureType          sType = StructureType::eCopyMicromapToMemoryInfoEXT;
+    const void *                                 pNext = {};
+    VULKAN_HPP_NAMESPACE::MicromapEXT            src   = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR dst   = {};
+    VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT    mode  = VULKAN_HPP_NAMESPACE::CopyMicromapModeEXT::eClone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyMicromapToMemoryInfoEXT>
-  {
-    using Type = CopyMicromapToMemoryInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCopyMicromapToMemoryInfoEXT>
   {
     using Type = CopyMicromapToMemoryInfoEXT;
   };
 
-  // wrapper struct for struct VkTensorCopyARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorCopyARM.html
-  struct TensorCopyARM
-  {
-    using NativeType = VkTensorCopyARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorCopyARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorCopyARM( uint32_t         dimensionCount_ = {},
-                                        const uint64_t * pSrcOffset_     = {},
-                                        const uint64_t * pDstOffset_     = {},
-                                        const uint64_t * pExtent_        = {},
-                                        const void *     pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dimensionCount{ dimensionCount_ }
-      , pSrcOffset{ pSrcOffset_ }
-      , pDstOffset{ pDstOffset_ }
-      , pExtent{ pExtent_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorCopyARM( TensorCopyARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorCopyARM( VkTensorCopyARM const & rhs ) VULKAN_HPP_NOEXCEPT : TensorCopyARM( *reinterpret_cast<TensorCopyARM const *>( &rhs ) ) {}
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCopyARM( ArrayProxyNoTemporaries<const uint64_t> const & srcOffset_,
-                   ArrayProxyNoTemporaries<const uint64_t> const & dstOffset_ = {},
-                   ArrayProxyNoTemporaries<const uint64_t> const & extent_    = {},
-                   const void *                                    pNext_     = nullptr )
-      : pNext( pNext_ )
-      , dimensionCount( static_cast<uint32_t>( srcOffset_.size() ) )
-      , pSrcOffset( srcOffset_.data() )
-      , pDstOffset( dstOffset_.data() )
-      , pExtent( extent_.data() )
-    {
-#    ifdef VULKAN_HPP_NO_EXCEPTIONS
-      VULKAN_HPP_ASSERT( srcOffset_.empty() || dstOffset_.empty() || ( srcOffset_.size() == dstOffset_.size() ) );
-      VULKAN_HPP_ASSERT( srcOffset_.empty() || extent_.empty() || ( srcOffset_.size() == extent_.size() ) );
-      VULKAN_HPP_ASSERT( dstOffset_.empty() || extent_.empty() || ( dstOffset_.size() == extent_.size() ) );
-#    else
-      if ( !srcOffset_.empty() && !dstOffset_.empty() && ( srcOffset_.size() != dstOffset_.size() ) )
-      {
-        throw LogicError( VULKAN_HPP_NAMESPACE_STRING
-                          "::TensorCopyARM::TensorCopyARM: !srcOffset_.empty() && !dstOffset_.empty() && ( srcOffset_.size() != dstOffset_.size() )" );
-      }
-      if ( !srcOffset_.empty() && !extent_.empty() && ( srcOffset_.size() != extent_.size() ) )
-      {
-        throw LogicError( VULKAN_HPP_NAMESPACE_STRING
-                          "::TensorCopyARM::TensorCopyARM: !srcOffset_.empty() && !extent_.empty() && ( srcOffset_.size() != extent_.size() )" );
-      }
-      if ( !dstOffset_.empty() && !extent_.empty() && ( dstOffset_.size() != extent_.size() ) )
-      {
-        throw LogicError( VULKAN_HPP_NAMESPACE_STRING
-                          "::TensorCopyARM::TensorCopyARM: !dstOffset_.empty() && !extent_.empty() && ( dstOffset_.size() != extent_.size() )" );
-      }
-#    endif /*VULKAN_HPP_NO_EXCEPTIONS*/
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    TensorCopyARM & operator=( TensorCopyARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorCopyARM & operator=( VkTensorCopyARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorCopyARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorCopyARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCopyARM & setDimensionCount( uint32_t dimensionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = dimensionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCopyARM & setPSrcOffset( const uint64_t * pSrcOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pSrcOffset = pSrcOffset_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCopyARM & setSrcOffset( ArrayProxyNoTemporaries<const uint64_t> const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = static_cast<uint32_t>( srcOffset_.size() );
-      pSrcOffset     = srcOffset_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCopyARM & setPDstOffset( const uint64_t * pDstOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDstOffset = pDstOffset_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCopyARM & setDstOffset( ArrayProxyNoTemporaries<const uint64_t> const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = static_cast<uint32_t>( dstOffset_.size() );
-      pDstOffset     = dstOffset_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCopyARM & setPExtent( const uint64_t * pExtent_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pExtent = pExtent_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCopyARM & setExtent( ArrayProxyNoTemporaries<const uint64_t> const & extent_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = static_cast<uint32_t>( extent_.size() );
-      pExtent        = extent_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorCopyARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorCopyARM *>( this );
-    }
-
-    operator VkTensorCopyARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorCopyARM *>( this );
-    }
-
-    operator VkTensorCopyARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorCopyARM *>( this );
-    }
-
-    operator VkTensorCopyARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorCopyARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &, const uint64_t * const &, const uint64_t * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dimensionCount, pSrcOffset, pDstOffset, pExtent );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorCopyARM const & ) const = default;
-#else
-    bool operator==( TensorCopyARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dimensionCount == rhs.dimensionCount ) && ( pSrcOffset == rhs.pSrcOffset ) &&
-             ( pDstOffset == rhs.pDstOffset ) && ( pExtent == rhs.pExtent );
-#  endif
-    }
-
-    bool operator!=( TensorCopyARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType          = StructureType::eTensorCopyARM;
-    const void *     pNext          = {};
-    uint32_t         dimensionCount = {};
-    const uint64_t * pSrcOffset     = {};
-    const uint64_t * pDstOffset     = {};
-    const uint64_t * pExtent        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorCopyARM>
-  {
-    using Type = TensorCopyARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorCopyARM>
-  {
-    using Type = TensorCopyARM;
-  };
-
-  // wrapper struct for struct VkCopyTensorInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCopyTensorInfoARM.html
-  struct CopyTensorInfoARM
-  {
-    using NativeType = VkCopyTensorInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCopyTensorInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CopyTensorInfoARM( TensorARM             srcTensor_   = {},
-                                            TensorARM             dstTensor_   = {},
-                                            uint32_t              regionCount_ = {},
-                                            const TensorCopyARM * pRegions_    = {},
-                                            const void *          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcTensor{ srcTensor_ }
-      , dstTensor{ dstTensor_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CopyTensorInfoARM( CopyTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CopyTensorInfoARM( VkCopyTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT : CopyTensorInfoARM( *reinterpret_cast<CopyTensorInfoARM const *>( &rhs ) ) {}
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyTensorInfoARM( TensorARM                                            srcTensor_,
-                       TensorARM                                            dstTensor_,
-                       ArrayProxyNoTemporaries<const TensorCopyARM> const & regions_,
-                       const void *                                         pNext_ = nullptr )
-      : pNext( pNext_ ), srcTensor( srcTensor_ ), dstTensor( dstTensor_ ), regionCount( static_cast<uint32_t>( regions_.size() ) ), pRegions( regions_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    CopyTensorInfoARM & operator=( CopyTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CopyTensorInfoARM & operator=( VkCopyTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CopyTensorInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CopyTensorInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyTensorInfoARM & setSrcTensor( TensorARM srcTensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcTensor = srcTensor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyTensorInfoARM & setDstTensor( TensorARM dstTensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstTensor = dstTensor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyTensorInfoARM & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      regionCount = regionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CopyTensorInfoARM & setPRegions( const TensorCopyARM * pRegions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pRegions = pRegions_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CopyTensorInfoARM & setRegions( ArrayProxyNoTemporaries<const TensorCopyARM> const & regions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      regionCount = static_cast<uint32_t>( regions_.size() );
-      pRegions    = regions_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCopyTensorInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCopyTensorInfoARM *>( this );
-    }
-
-    operator VkCopyTensorInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCopyTensorInfoARM *>( this );
-    }
-
-    operator VkCopyTensorInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCopyTensorInfoARM *>( this );
-    }
-
-    operator VkCopyTensorInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCopyTensorInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorARM const &, TensorARM const &, uint32_t const &, const TensorCopyARM * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, srcTensor, dstTensor, regionCount, pRegions );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CopyTensorInfoARM const & ) const = default;
-#else
-    bool operator==( CopyTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( srcTensor == rhs.srcTensor ) && ( dstTensor == rhs.dstTensor ) &&
-             ( regionCount == rhs.regionCount ) && ( pRegions == rhs.pRegions );
-#  endif
-    }
-
-    bool operator!=( CopyTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType         sType       = StructureType::eCopyTensorInfoARM;
-    const void *          pNext       = {};
-    TensorARM             srcTensor   = {};
-    TensorARM             dstTensor   = {};
-    uint32_t              regionCount = {};
-    const TensorCopyARM * pRegions    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCopyTensorInfoARM>
-  {
-    using Type = CopyTensorInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCopyTensorInfoARM>
-  {
-    using Type = CopyTensorInfoARM;
-  };
-
-  // wrapper struct for struct VkCuFunctionCreateInfoNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuFunctionCreateInfoNVX.html
   struct CuFunctionCreateInfoNVX
   {
     using NativeType = VkCuFunctionCreateInfoNVX;
@@ -27099,11 +19467,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCuFunctionCreateInfoNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CuFunctionCreateInfoNVX( CuModuleNVX module_ = {}, const char * pName_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , module{ module_ }
-      , pName{ pName_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CuFunctionCreateInfoNVX( VULKAN_HPP_NAMESPACE::CuModuleNVX module_ = {}, const char * pName_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , module( module_ )
+      , pName( pName_ )
     {
     }
 
@@ -27115,22 +19484,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CuFunctionCreateInfoNVX & operator=( CuFunctionCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CuFunctionCreateInfoNVX & operator=( VkCuFunctionCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CuFunctionCreateInfoNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CuFunctionCreateInfoNVX const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CuFunctionCreateInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CuFunctionCreateInfoNVX & setModule( CuModuleNVX module_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CuFunctionCreateInfoNVX & setModule( VULKAN_HPP_NAMESPACE::CuModuleNVX module_ ) VULKAN_HPP_NOEXCEPT
     {
       module = module_;
       return *this;
@@ -27141,7 +19510,7 @@ namespace VULKAN_HPP_NAMESPACE
       pName = pName_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCuFunctionCreateInfoNVX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -27153,18 +19522,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCuFunctionCreateInfoNVX *>( this );
     }
 
-    operator VkCuFunctionCreateInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCuFunctionCreateInfoNVX *>( this );
-    }
-
-    operator VkCuFunctionCreateInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCuFunctionCreateInfoNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CuModuleNVX const &, const char * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CuModuleNVX const &, const char * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, module, pName );
     }
@@ -27198,27 +19562,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType  = StructureType::eCuFunctionCreateInfoNVX;
-    const void *  pNext  = {};
-    CuModuleNVX   module = {};
-    const char *  pName  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eCuFunctionCreateInfoNVX;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::CuModuleNVX   module = {};
+    const char *                        pName  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCuFunctionCreateInfoNVX>
-  {
-    using Type = CuFunctionCreateInfoNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCuFunctionCreateInfoNVX>
   {
     using Type = CuFunctionCreateInfoNVX;
   };
 
-  // wrapper struct for struct VkCuLaunchInfoNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuLaunchInfoNVX.html
   struct CuLaunchInfoNVX
   {
     using NativeType = VkCuLaunchInfoNVX;
@@ -27226,33 +19581,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCuLaunchInfoNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CuLaunchInfoNVX( CuFunctionNVX        function_       = {},
-                                          uint32_t             gridDimX_       = {},
-                                          uint32_t             gridDimY_       = {},
-                                          uint32_t             gridDimZ_       = {},
-                                          uint32_t             blockDimX_      = {},
-                                          uint32_t             blockDimY_      = {},
-                                          uint32_t             blockDimZ_      = {},
-                                          uint32_t             sharedMemBytes_ = {},
-                                          size_t               paramCount_     = {},
-                                          const void * const * pParams_        = {},
-                                          size_t               extraCount_     = {},
-                                          const void * const * pExtras_        = {},
-                                          const void *         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , function{ function_ }
-      , gridDimX{ gridDimX_ }
-      , gridDimY{ gridDimY_ }
-      , gridDimZ{ gridDimZ_ }
-      , blockDimX{ blockDimX_ }
-      , blockDimY{ blockDimY_ }
-      , blockDimZ{ blockDimZ_ }
-      , sharedMemBytes{ sharedMemBytes_ }
-      , paramCount{ paramCount_ }
-      , pParams{ pParams_ }
-      , extraCount{ extraCount_ }
-      , pExtras{ pExtras_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CuLaunchInfoNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX function_       = {},
+                                          uint32_t                            gridDimX_       = {},
+                                          uint32_t                            gridDimY_       = {},
+                                          uint32_t                            gridDimZ_       = {},
+                                          uint32_t                            blockDimX_      = {},
+                                          uint32_t                            blockDimY_      = {},
+                                          uint32_t                            blockDimZ_      = {},
+                                          uint32_t                            sharedMemBytes_ = {},
+                                          size_t                              paramCount_     = {},
+                                          const void * const *                pParams_        = {},
+                                          size_t                              extraCount_     = {},
+                                          const void * const *                pExtras_        = {},
+                                          const void *                        pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , function( function_ )
+      , gridDimX( gridDimX_ )
+      , gridDimY( gridDimY_ )
+      , gridDimZ( gridDimZ_ )
+      , blockDimX( blockDimX_ )
+      , blockDimY( blockDimY_ )
+      , blockDimZ( blockDimZ_ )
+      , sharedMemBytes( sharedMemBytes_ )
+      , paramCount( paramCount_ )
+      , pParams( pParams_ )
+      , extraCount( extraCount_ )
+      , pExtras( pExtras_ )
     {
     }
 
@@ -27261,17 +19616,17 @@ namespace VULKAN_HPP_NAMESPACE
     CuLaunchInfoNVX( VkCuLaunchInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT : CuLaunchInfoNVX( *reinterpret_cast<CuLaunchInfoNVX const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CuLaunchInfoNVX( CuFunctionNVX                                       function_,
-                     uint32_t                                            gridDimX_,
-                     uint32_t                                            gridDimY_,
-                     uint32_t                                            gridDimZ_,
-                     uint32_t                                            blockDimX_,
-                     uint32_t                                            blockDimY_,
-                     uint32_t                                            blockDimZ_,
-                     uint32_t                                            sharedMemBytes_,
-                     ArrayProxyNoTemporaries<const void * const> const & params_,
-                     ArrayProxyNoTemporaries<const void * const> const & extras_ = {},
-                     const void *                                        pNext_  = nullptr )
+    CuLaunchInfoNVX( VULKAN_HPP_NAMESPACE::CuFunctionNVX                                       function_,
+                     uint32_t                                                                  gridDimX_,
+                     uint32_t                                                                  gridDimY_,
+                     uint32_t                                                                  gridDimZ_,
+                     uint32_t                                                                  blockDimX_,
+                     uint32_t                                                                  blockDimY_,
+                     uint32_t                                                                  blockDimZ_,
+                     uint32_t                                                                  sharedMemBytes_,
+                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & params_,
+                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & extras_ = {},
+                     const void *                                                              pNext_  = nullptr )
       : pNext( pNext_ )
       , function( function_ )
       , gridDimX( gridDimX_ )
@@ -27290,22 +19645,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CuLaunchInfoNVX & operator=( CuLaunchInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CuLaunchInfoNVX & operator=( VkCuLaunchInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CuLaunchInfoNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CuLaunchInfoNVX const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CuLaunchInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CuLaunchInfoNVX & setFunction( CuFunctionNVX function_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CuLaunchInfoNVX & setFunction( VULKAN_HPP_NAMESPACE::CuFunctionNVX function_ ) VULKAN_HPP_NOEXCEPT
     {
       function = function_;
       return *this;
@@ -27366,7 +19721,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CuLaunchInfoNVX & setParams( ArrayProxyNoTemporaries<const void * const> const & params_ ) VULKAN_HPP_NOEXCEPT
+    CuLaunchInfoNVX & setParams( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & params_ ) VULKAN_HPP_NOEXCEPT
     {
       paramCount = params_.size();
       pParams    = params_.data();
@@ -27387,14 +19742,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CuLaunchInfoNVX & setExtras( ArrayProxyNoTemporaries<const void * const> const & extras_ ) VULKAN_HPP_NOEXCEPT
+    CuLaunchInfoNVX & setExtras( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & extras_ ) VULKAN_HPP_NOEXCEPT
     {
       extraCount = extras_.size();
       pExtras    = extras_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCuLaunchInfoNVX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -27406,20 +19761,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCuLaunchInfoNVX *>( this );
     }
 
-    operator VkCuLaunchInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCuLaunchInfoNVX *>( this );
-    }
-
-    operator VkCuLaunchInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCuLaunchInfoNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               CuFunctionNVX const &,
+               VULKAN_HPP_NAMESPACE::CuFunctionNVX const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -27431,6 +19779,7 @@ namespace VULKAN_HPP_NAMESPACE
                const void * const * const &,
                size_t const &,
                const void * const * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -27460,37 +19809,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType          = StructureType::eCuLaunchInfoNVX;
-    const void *         pNext          = {};
-    CuFunctionNVX        function       = {};
-    uint32_t             gridDimX       = {};
-    uint32_t             gridDimY       = {};
-    uint32_t             gridDimZ       = {};
-    uint32_t             blockDimX      = {};
-    uint32_t             blockDimY      = {};
-    uint32_t             blockDimZ      = {};
-    uint32_t             sharedMemBytes = {};
-    size_t               paramCount     = {};
-    const void * const * pParams        = {};
-    size_t               extraCount     = {};
-    const void * const * pExtras        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eCuLaunchInfoNVX;
+    const void *                        pNext          = {};
+    VULKAN_HPP_NAMESPACE::CuFunctionNVX function       = {};
+    uint32_t                            gridDimX       = {};
+    uint32_t                            gridDimY       = {};
+    uint32_t                            gridDimZ       = {};
+    uint32_t                            blockDimX      = {};
+    uint32_t                            blockDimY      = {};
+    uint32_t                            blockDimZ      = {};
+    uint32_t                            sharedMemBytes = {};
+    size_t                              paramCount     = {};
+    const void * const *                pParams        = {};
+    size_t                              extraCount     = {};
+    const void * const *                pExtras        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCuLaunchInfoNVX>
-  {
-    using Type = CuLaunchInfoNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCuLaunchInfoNVX>
   {
     using Type = CuLaunchInfoNVX;
   };
 
-  // wrapper struct for struct VkCuModuleCreateInfoNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuModuleCreateInfoNVX.html
   struct CuModuleCreateInfoNVX
   {
     using NativeType = VkCuModuleCreateInfoNVX;
@@ -27498,11 +19838,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCuModuleCreateInfoNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR CuModuleCreateInfoNVX( size_t dataSize_ = {}, const void * pData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
+      : pNext( pNext_ )
+      , dataSize( dataSize_ )
+      , pData( pData_ )
     {
     }
 
@@ -27515,22 +19855,22 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    CuModuleCreateInfoNVX( ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
+    CuModuleCreateInfoNVX( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), dataSize( data_.size() * sizeof( T ) ), pData( data_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CuModuleCreateInfoNVX & operator=( CuModuleCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CuModuleCreateInfoNVX & operator=( VkCuModuleCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CuModuleCreateInfoNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CuModuleCreateInfoNVX const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CuModuleCreateInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -27551,14 +19891,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    CuModuleCreateInfoNVX & setData( ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
+    CuModuleCreateInfoNVX & setData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       dataSize = data_.size() * sizeof( T );
       pData    = data_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCuModuleCreateInfoNVX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -27570,18 +19910,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCuModuleCreateInfoNVX *>( this );
     }
 
-    operator VkCuModuleCreateInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCuModuleCreateInfoNVX *>( this );
-    }
-
-    operator VkCuModuleCreateInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCuModuleCreateInfoNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, size_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, size_t const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dataSize, pData );
     }
@@ -27606,139 +19941,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::eCuModuleCreateInfoNVX;
-    const void *  pNext    = {};
-    size_t        dataSize = {};
-    const void *  pData    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eCuModuleCreateInfoNVX;
+    const void *                        pNext    = {};
+    size_t                              dataSize = {};
+    const void *                        pData    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCuModuleCreateInfoNVX>
-  {
-    using Type = CuModuleCreateInfoNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eCuModuleCreateInfoNVX>
   {
     using Type = CuModuleCreateInfoNVX;
   };
 
-  // wrapper struct for struct VkCuModuleTexturingModeCreateInfoNVX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkCuModuleTexturingModeCreateInfoNVX.html
-  struct CuModuleTexturingModeCreateInfoNVX
-  {
-    using NativeType = VkCuModuleTexturingModeCreateInfoNVX;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCuModuleTexturingModeCreateInfoNVX;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CuModuleTexturingModeCreateInfoNVX( Bool32 use64bitTexturing_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , use64bitTexturing{ use64bitTexturing_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CuModuleTexturingModeCreateInfoNVX( CuModuleTexturingModeCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CuModuleTexturingModeCreateInfoNVX( VkCuModuleTexturingModeCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CuModuleTexturingModeCreateInfoNVX( *reinterpret_cast<CuModuleTexturingModeCreateInfoNVX const *>( &rhs ) )
-    {
-    }
-
-    CuModuleTexturingModeCreateInfoNVX & operator=( CuModuleTexturingModeCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CuModuleTexturingModeCreateInfoNVX & operator=( VkCuModuleTexturingModeCreateInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CuModuleTexturingModeCreateInfoNVX const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CuModuleTexturingModeCreateInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CuModuleTexturingModeCreateInfoNVX & setUse64bitTexturing( Bool32 use64bitTexturing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      use64bitTexturing = use64bitTexturing_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCuModuleTexturingModeCreateInfoNVX const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCuModuleTexturingModeCreateInfoNVX *>( this );
-    }
-
-    operator VkCuModuleTexturingModeCreateInfoNVX &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCuModuleTexturingModeCreateInfoNVX *>( this );
-    }
-
-    operator VkCuModuleTexturingModeCreateInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCuModuleTexturingModeCreateInfoNVX *>( this );
-    }
-
-    operator VkCuModuleTexturingModeCreateInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCuModuleTexturingModeCreateInfoNVX *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, use64bitTexturing );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CuModuleTexturingModeCreateInfoNVX const & ) const = default;
-#else
-    bool operator==( CuModuleTexturingModeCreateInfoNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( use64bitTexturing == rhs.use64bitTexturing );
-#  endif
-    }
-
-    bool operator!=( CuModuleTexturingModeCreateInfoNVX const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::eCuModuleTexturingModeCreateInfoNVX;
-    const void *  pNext             = {};
-    Bool32        use64bitTexturing = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCuModuleTexturingModeCreateInfoNVX>
-  {
-    using Type = CuModuleTexturingModeCreateInfoNVX;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCuModuleTexturingModeCreateInfoNVX>
-  {
-    using Type = CuModuleTexturingModeCreateInfoNVX;
-  };
-
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkCudaFunctionCreateInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaFunctionCreateInfoNV.html
   struct CudaFunctionCreateInfoNV
   {
     using NativeType = VkCudaFunctionCreateInfoNV;
@@ -27746,11 +19961,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCudaFunctionCreateInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CudaFunctionCreateInfoNV( CudaModuleNV module_ = {}, const char * pName_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , module{ module_ }
-      , pName{ pName_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      CudaFunctionCreateInfoNV( VULKAN_HPP_NAMESPACE::CudaModuleNV module_ = {}, const char * pName_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , module( module_ )
+      , pName( pName_ )
     {
     }
 
@@ -27762,22 +19978,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     CudaFunctionCreateInfoNV & operator=( CudaFunctionCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CudaFunctionCreateInfoNV & operator=( VkCudaFunctionCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CudaFunctionCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CudaFunctionCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CudaFunctionCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CudaFunctionCreateInfoNV & setModule( CudaModuleNV module_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CudaFunctionCreateInfoNV & setModule( VULKAN_HPP_NAMESPACE::CudaModuleNV module_ ) VULKAN_HPP_NOEXCEPT
     {
       module = module_;
       return *this;
@@ -27788,7 +20004,7 @@ namespace VULKAN_HPP_NAMESPACE
       pName = pName_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCudaFunctionCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -27800,18 +20016,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCudaFunctionCreateInfoNV *>( this );
     }
 
-    operator VkCudaFunctionCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCudaFunctionCreateInfoNV *>( this );
-    }
-
-    operator VkCudaFunctionCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCudaFunctionCreateInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CudaModuleNV const &, const char * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CudaModuleNV const &, const char * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, module, pName );
     }
@@ -27845,20 +20056,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType  = StructureType::eCudaFunctionCreateInfoNV;
-    const void *  pNext  = {};
-    CudaModuleNV  module = {};
-    const char *  pName  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eCudaFunctionCreateInfoNV;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::CudaModuleNV  module = {};
+    const char *                        pName  = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCudaFunctionCreateInfoNV>
-  {
-    using Type = CudaFunctionCreateInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eCudaFunctionCreateInfoNV>
   {
@@ -27867,7 +20070,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkCudaLaunchInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaLaunchInfoNV.html
   struct CudaLaunchInfoNV
   {
     using NativeType = VkCudaLaunchInfoNV;
@@ -27875,33 +20077,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCudaLaunchInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CudaLaunchInfoNV( CudaFunctionNV       function_       = {},
-                                           uint32_t             gridDimX_       = {},
-                                           uint32_t             gridDimY_       = {},
-                                           uint32_t             gridDimZ_       = {},
-                                           uint32_t             blockDimX_      = {},
-                                           uint32_t             blockDimY_      = {},
-                                           uint32_t             blockDimZ_      = {},
-                                           uint32_t             sharedMemBytes_ = {},
-                                           size_t               paramCount_     = {},
-                                           const void * const * pParams_        = {},
-                                           size_t               extraCount_     = {},
-                                           const void * const * pExtras_        = {},
-                                           const void *         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , function{ function_ }
-      , gridDimX{ gridDimX_ }
-      , gridDimY{ gridDimY_ }
-      , gridDimZ{ gridDimZ_ }
-      , blockDimX{ blockDimX_ }
-      , blockDimY{ blockDimY_ }
-      , blockDimZ{ blockDimZ_ }
-      , sharedMemBytes{ sharedMemBytes_ }
-      , paramCount{ paramCount_ }
-      , pParams{ pParams_ }
-      , extraCount{ extraCount_ }
-      , pExtras{ pExtras_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR CudaLaunchInfoNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV function_       = {},
+                                           uint32_t                             gridDimX_       = {},
+                                           uint32_t                             gridDimY_       = {},
+                                           uint32_t                             gridDimZ_       = {},
+                                           uint32_t                             blockDimX_      = {},
+                                           uint32_t                             blockDimY_      = {},
+                                           uint32_t                             blockDimZ_      = {},
+                                           uint32_t                             sharedMemBytes_ = {},
+                                           size_t                               paramCount_     = {},
+                                           const void * const *                 pParams_        = {},
+                                           size_t                               extraCount_     = {},
+                                           const void * const *                 pExtras_        = {},
+                                           const void *                         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , function( function_ )
+      , gridDimX( gridDimX_ )
+      , gridDimY( gridDimY_ )
+      , gridDimZ( gridDimZ_ )
+      , blockDimX( blockDimX_ )
+      , blockDimY( blockDimY_ )
+      , blockDimZ( blockDimZ_ )
+      , sharedMemBytes( sharedMemBytes_ )
+      , paramCount( paramCount_ )
+      , pParams( pParams_ )
+      , extraCount( extraCount_ )
+      , pExtras( pExtras_ )
     {
     }
 
@@ -27910,17 +20112,17 @@ namespace VULKAN_HPP_NAMESPACE
     CudaLaunchInfoNV( VkCudaLaunchInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT : CudaLaunchInfoNV( *reinterpret_cast<CudaLaunchInfoNV const *>( &rhs ) ) {}
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CudaLaunchInfoNV( CudaFunctionNV                                      function_,
-                      uint32_t                                            gridDimX_,
-                      uint32_t                                            gridDimY_,
-                      uint32_t                                            gridDimZ_,
-                      uint32_t                                            blockDimX_,
-                      uint32_t                                            blockDimY_,
-                      uint32_t                                            blockDimZ_,
-                      uint32_t                                            sharedMemBytes_,
-                      ArrayProxyNoTemporaries<const void * const> const & params_,
-                      ArrayProxyNoTemporaries<const void * const> const & extras_ = {},
-                      const void *                                        pNext_  = nullptr )
+    CudaLaunchInfoNV( VULKAN_HPP_NAMESPACE::CudaFunctionNV                                      function_,
+                      uint32_t                                                                  gridDimX_,
+                      uint32_t                                                                  gridDimY_,
+                      uint32_t                                                                  gridDimZ_,
+                      uint32_t                                                                  blockDimX_,
+                      uint32_t                                                                  blockDimY_,
+                      uint32_t                                                                  blockDimZ_,
+                      uint32_t                                                                  sharedMemBytes_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & params_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & extras_ = {},
+                      const void *                                                              pNext_  = nullptr )
       : pNext( pNext_ )
       , function( function_ )
       , gridDimX( gridDimX_ )
@@ -27939,22 +20141,22 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CudaLaunchInfoNV & operator=( CudaLaunchInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CudaLaunchInfoNV & operator=( VkCudaLaunchInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CudaLaunchInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CudaLaunchInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CudaLaunchInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 CudaLaunchInfoNV & setFunction( CudaFunctionNV function_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 CudaLaunchInfoNV & setFunction( VULKAN_HPP_NAMESPACE::CudaFunctionNV function_ ) VULKAN_HPP_NOEXCEPT
     {
       function = function_;
       return *this;
@@ -28015,7 +20217,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CudaLaunchInfoNV & setParams( ArrayProxyNoTemporaries<const void * const> const & params_ ) VULKAN_HPP_NOEXCEPT
+    CudaLaunchInfoNV & setParams( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & params_ ) VULKAN_HPP_NOEXCEPT
     {
       paramCount = params_.size();
       pParams    = params_.data();
@@ -28036,14 +20238,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CudaLaunchInfoNV & setExtras( ArrayProxyNoTemporaries<const void * const> const & extras_ ) VULKAN_HPP_NOEXCEPT
+    CudaLaunchInfoNV & setExtras( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const void * const> const & extras_ ) VULKAN_HPP_NOEXCEPT
     {
       extraCount = extras_.size();
       pExtras    = extras_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCudaLaunchInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -28055,20 +20257,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCudaLaunchInfoNV *>( this );
     }
 
-    operator VkCudaLaunchInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCudaLaunchInfoNV *>( this );
-    }
-
-    operator VkCudaLaunchInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCudaLaunchInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               CudaFunctionNV const &,
+               VULKAN_HPP_NAMESPACE::CudaFunctionNV const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -28080,6 +20275,7 @@ namespace VULKAN_HPP_NAMESPACE
                const void * const * const &,
                size_t const &,
                const void * const * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -28109,30 +20305,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType        sType          = StructureType::eCudaLaunchInfoNV;
-    const void *         pNext          = {};
-    CudaFunctionNV       function       = {};
-    uint32_t             gridDimX       = {};
-    uint32_t             gridDimY       = {};
-    uint32_t             gridDimZ       = {};
-    uint32_t             blockDimX      = {};
-    uint32_t             blockDimY      = {};
-    uint32_t             blockDimZ      = {};
-    uint32_t             sharedMemBytes = {};
-    size_t               paramCount     = {};
-    const void * const * pParams        = {};
-    size_t               extraCount     = {};
-    const void * const * pExtras        = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType          = StructureType::eCudaLaunchInfoNV;
+    const void *                         pNext          = {};
+    VULKAN_HPP_NAMESPACE::CudaFunctionNV function       = {};
+    uint32_t                             gridDimX       = {};
+    uint32_t                             gridDimY       = {};
+    uint32_t                             gridDimZ       = {};
+    uint32_t                             blockDimX      = {};
+    uint32_t                             blockDimY      = {};
+    uint32_t                             blockDimZ      = {};
+    uint32_t                             sharedMemBytes = {};
+    size_t                               paramCount     = {};
+    const void * const *                 pParams        = {};
+    size_t                               extraCount     = {};
+    const void * const *                 pExtras        = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCudaLaunchInfoNV>
-  {
-    using Type = CudaLaunchInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eCudaLaunchInfoNV>
   {
@@ -28141,7 +20329,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkCudaModuleCreateInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCudaModuleCreateInfoNV.html
   struct CudaModuleCreateInfoNV
   {
     using NativeType = VkCudaModuleCreateInfoNV;
@@ -28149,11 +20336,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCudaModuleCreateInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR CudaModuleCreateInfoNV( size_t dataSize_ = {}, const void * pData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
+      : pNext( pNext_ )
+      , dataSize( dataSize_ )
+      , pData( pData_ )
     {
     }
 
@@ -28166,22 +20353,22 @@ namespace VULKAN_HPP_NAMESPACE
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    CudaModuleCreateInfoNV( ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
+    CudaModuleCreateInfoNV( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), dataSize( data_.size() * sizeof( T ) ), pData( data_.data() )
     {
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     CudaModuleCreateInfoNV & operator=( CudaModuleCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     CudaModuleCreateInfoNV & operator=( VkCudaModuleCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<CudaModuleCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::CudaModuleCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 CudaModuleCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -28202,14 +20389,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    CudaModuleCreateInfoNV & setData( ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
+    CudaModuleCreateInfoNV & setData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       dataSize = data_.size() * sizeof( T );
       pData    = data_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkCudaModuleCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -28221,18 +20408,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkCudaModuleCreateInfoNV *>( this );
     }
 
-    operator VkCudaModuleCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCudaModuleCreateInfoNV *>( this );
-    }
-
-    operator VkCudaModuleCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCudaModuleCreateInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, size_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, size_t const &, const void * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dataSize, pData );
     }
@@ -28257,20 +20439,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType    = StructureType::eCudaModuleCreateInfoNV;
-    const void *  pNext    = {};
-    size_t        dataSize = {};
-    const void *  pData    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eCudaModuleCreateInfoNV;
+    const void *                        pNext    = {};
+    size_t                              dataSize = {};
+    const void *                        pData    = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCudaModuleCreateInfoNV>
-  {
-    using Type = CudaModuleCreateInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eCudaModuleCreateInfoNV>
   {
@@ -28278,183 +20452,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkCustomResolveCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkCustomResolveCreateInfoEXT.html
-  struct CustomResolveCreateInfoEXT
-  {
-    using NativeType = VkCustomResolveCreateInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eCustomResolveCreateInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR CustomResolveCreateInfoEXT( Bool32         customResolve_           = {},
-                                                     uint32_t       colorAttachmentCount_    = {},
-                                                     const Format * pColorAttachmentFormats_ = {},
-                                                     Format         depthAttachmentFormat_   = Format::eUndefined,
-                                                     Format         stencilAttachmentFormat_ = Format::eUndefined,
-                                                     const void *   pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , customResolve{ customResolve_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentFormats{ pColorAttachmentFormats_ }
-      , depthAttachmentFormat{ depthAttachmentFormat_ }
-      , stencilAttachmentFormat{ stencilAttachmentFormat_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR CustomResolveCreateInfoEXT( CustomResolveCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    CustomResolveCreateInfoEXT( VkCustomResolveCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : CustomResolveCreateInfoEXT( *reinterpret_cast<CustomResolveCreateInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CustomResolveCreateInfoEXT( Bool32                                        customResolve_,
-                                ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_,
-                                Format                                        depthAttachmentFormat_   = Format::eUndefined,
-                                Format                                        stencilAttachmentFormat_ = Format::eUndefined,
-                                const void *                                  pNext_                   = nullptr )
-      : pNext( pNext_ )
-      , customResolve( customResolve_ )
-      , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentFormats_.size() ) )
-      , pColorAttachmentFormats( colorAttachmentFormats_.data() )
-      , depthAttachmentFormat( depthAttachmentFormat_ )
-      , stencilAttachmentFormat( stencilAttachmentFormat_ )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    CustomResolveCreateInfoEXT & operator=( CustomResolveCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    CustomResolveCreateInfoEXT & operator=( VkCustomResolveCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<CustomResolveCreateInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setCustomResolve( Bool32 customResolve_ ) VULKAN_HPP_NOEXCEPT
-    {
-      customResolve = customResolve_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      colorAttachmentCount = colorAttachmentCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setPColorAttachmentFormats( const Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pColorAttachmentFormats = pColorAttachmentFormats_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    CustomResolveCreateInfoEXT & setColorAttachmentFormats( ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
-    {
-      colorAttachmentCount    = static_cast<uint32_t>( colorAttachmentFormats_.size() );
-      pColorAttachmentFormats = colorAttachmentFormats_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setDepthAttachmentFormat( Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      depthAttachmentFormat = depthAttachmentFormat_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 CustomResolveCreateInfoEXT & setStencilAttachmentFormat( Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stencilAttachmentFormat = stencilAttachmentFormat_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkCustomResolveCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkCustomResolveCreateInfoEXT *>( this );
-    }
-
-    operator VkCustomResolveCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkCustomResolveCreateInfoEXT *>( this );
-    }
-
-    operator VkCustomResolveCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkCustomResolveCreateInfoEXT *>( this );
-    }
-
-    operator VkCustomResolveCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkCustomResolveCreateInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, const Format * const &, Format const &, Format const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, customResolve, colorAttachmentCount, pColorAttachmentFormats, depthAttachmentFormat, stencilAttachmentFormat );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( CustomResolveCreateInfoEXT const & ) const = default;
-#else
-    bool operator==( CustomResolveCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( customResolve == rhs.customResolve ) &&
-             ( colorAttachmentCount == rhs.colorAttachmentCount ) && ( pColorAttachmentFormats == rhs.pColorAttachmentFormats ) &&
-             ( depthAttachmentFormat == rhs.depthAttachmentFormat ) && ( stencilAttachmentFormat == rhs.stencilAttachmentFormat );
-#  endif
-    }
-
-    bool operator!=( CustomResolveCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType  sType                   = StructureType::eCustomResolveCreateInfoEXT;
-    const void *   pNext                   = {};
-    Bool32         customResolve           = {};
-    uint32_t       colorAttachmentCount    = {};
-    const Format * pColorAttachmentFormats = {};
-    Format         depthAttachmentFormat   = Format::eUndefined;
-    Format         stencilAttachmentFormat = Format::eUndefined;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkCustomResolveCreateInfoEXT>
-  {
-    using Type = CustomResolveCreateInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eCustomResolveCreateInfoEXT>
-  {
-    using Type = CustomResolveCreateInfoEXT;
-  };
-
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkD3D12FenceSubmitInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkD3D12FenceSubmitInfoKHR.html
   struct D3D12FenceSubmitInfoKHR
   {
     using NativeType = VkD3D12FenceSubmitInfoKHR;
@@ -28462,17 +20460,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eD3D12FenceSubmitInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR D3D12FenceSubmitInfoKHR( uint32_t         waitSemaphoreValuesCount_   = {},
                                                   const uint64_t * pWaitSemaphoreValues_       = {},
                                                   uint32_t         signalSemaphoreValuesCount_ = {},
                                                   const uint64_t * pSignalSemaphoreValues_     = {},
                                                   const void *     pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreValuesCount{ waitSemaphoreValuesCount_ }
-      , pWaitSemaphoreValues{ pWaitSemaphoreValues_ }
-      , signalSemaphoreValuesCount{ signalSemaphoreValuesCount_ }
-      , pSignalSemaphoreValues{ pSignalSemaphoreValues_ }
+      : pNext( pNext_ )
+      , waitSemaphoreValuesCount( waitSemaphoreValuesCount_ )
+      , pWaitSemaphoreValues( pWaitSemaphoreValues_ )
+      , signalSemaphoreValuesCount( signalSemaphoreValuesCount_ )
+      , pSignalSemaphoreValues( pSignalSemaphoreValues_ )
     {
     }
 
@@ -28484,9 +20482,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    D3D12FenceSubmitInfoKHR( ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_,
-                             ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ = {},
-                             const void *                                    pNext_                 = nullptr )
+    D3D12FenceSubmitInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_,
+                             VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ = {},
+                             const void *                                                          pNext_                 = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreValuesCount( static_cast<uint32_t>( waitSemaphoreValues_.size() ) )
       , pWaitSemaphoreValues( waitSemaphoreValues_.data() )
@@ -28497,15 +20495,15 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     D3D12FenceSubmitInfoKHR & operator=( D3D12FenceSubmitInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     D3D12FenceSubmitInfoKHR & operator=( VkD3D12FenceSubmitInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<D3D12FenceSubmitInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::D3D12FenceSubmitInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 D3D12FenceSubmitInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -28525,7 +20523,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    D3D12FenceSubmitInfoKHR & setWaitSemaphoreValues( ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
+    D3D12FenceSubmitInfoKHR &
+      setWaitSemaphoreValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreValuesCount = static_cast<uint32_t>( waitSemaphoreValues_.size() );
       pWaitSemaphoreValues     = waitSemaphoreValues_.data();
@@ -28546,14 +20545,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    D3D12FenceSubmitInfoKHR & setSignalSemaphoreValues( ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
+    D3D12FenceSubmitInfoKHR &
+      setSignalSemaphoreValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreValuesCount = static_cast<uint32_t>( signalSemaphoreValues_.size() );
       pSignalSemaphoreValues     = signalSemaphoreValues_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkD3D12FenceSubmitInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -28565,18 +20565,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkD3D12FenceSubmitInfoKHR *>( this );
     }
 
-    operator VkD3D12FenceSubmitInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkD3D12FenceSubmitInfoKHR *>( this );
-    }
-
-    operator VkD3D12FenceSubmitInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkD3D12FenceSubmitInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &, uint32_t const &, const uint64_t * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const uint64_t * const &,
+               uint32_t const &,
+               const uint64_t * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, waitSemaphoreValuesCount, pWaitSemaphoreValues, signalSemaphoreValuesCount, pSignalSemaphoreValues );
@@ -28604,22 +20603,14 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType    sType                      = StructureType::eD3D12FenceSubmitInfoKHR;
-    const void *     pNext                      = {};
-    uint32_t         waitSemaphoreValuesCount   = {};
-    const uint64_t * pWaitSemaphoreValues       = {};
-    uint32_t         signalSemaphoreValuesCount = {};
-    const uint64_t * pSignalSemaphoreValues     = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::eD3D12FenceSubmitInfoKHR;
+    const void *                        pNext                      = {};
+    uint32_t                            waitSemaphoreValuesCount   = {};
+    const uint64_t *                    pWaitSemaphoreValues       = {};
+    uint32_t                            signalSemaphoreValuesCount = {};
+    const uint64_t *                    pSignalSemaphoreValues     = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkD3D12FenceSubmitInfoKHR>
-  {
-    using Type = D3D12FenceSubmitInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eD3D12FenceSubmitInfoKHR>
   {
@@ -28627,2421 +20618,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkPhysicalDeviceDataGraphOperationSupportARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphOperationSupportARM.html
-  struct PhysicalDeviceDataGraphOperationSupportARM
-  {
-    using NativeType = VkPhysicalDeviceDataGraphOperationSupportARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphOperationSupportARM(
-      PhysicalDeviceDataGraphOperationTypeARM operationType_ = PhysicalDeviceDataGraphOperationTypeARM::eSpirvExtendedInstructionSet,
-      std::array<char, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM> const & name_    = {},
-      uint32_t                                                                                version_ = {} ) VULKAN_HPP_NOEXCEPT
-      : operationType{ operationType_ }
-      , name{ name_ }
-      , version{ version_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphOperationSupportARM( PhysicalDeviceDataGraphOperationSupportARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDataGraphOperationSupportARM( VkPhysicalDeviceDataGraphOperationSupportARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDataGraphOperationSupportARM( *reinterpret_cast<PhysicalDeviceDataGraphOperationSupportARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceDataGraphOperationSupportARM( PhysicalDeviceDataGraphOperationTypeARM operationType_, std::string const & name_, uint32_t version_ = {} )
-      : operationType( operationType_ ), version( version_ )
-    {
-      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM );
-#    if defined( _WIN32 )
-      strncpy_s( name, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM, name_.data(), name_.size() );
-#    else
-      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM, name_.size() ) );
-#    endif
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PhysicalDeviceDataGraphOperationSupportARM & operator=( PhysicalDeviceDataGraphOperationSupportARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDataGraphOperationSupportARM & operator=( VkPhysicalDeviceDataGraphOperationSupportARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDataGraphOperationSupportARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphOperationSupportARM &
-      setOperationType( PhysicalDeviceDataGraphOperationTypeARM operationType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      operationType = operationType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphOperationSupportARM &
-      setName( std::array<char, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM> name_ ) VULKAN_HPP_NOEXCEPT
-    {
-      name = name_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceDataGraphOperationSupportARM & setName( std::string const & name_ ) VULKAN_HPP_NOEXCEPT
-    {
-      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM );
-#    if defined( _WIN32 )
-      strncpy_s( name, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM, name_.data(), name_.size() );
-#    else
-      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM, name_.size() ) );
-#    endif
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphOperationSupportARM & setVersion( uint32_t version_ ) VULKAN_HPP_NOEXCEPT
-    {
-      version = version_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDataGraphOperationSupportARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDataGraphOperationSupportARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphOperationSupportARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDataGraphOperationSupportARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphOperationSupportARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDataGraphOperationSupportARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphOperationSupportARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDataGraphOperationSupportARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PhysicalDeviceDataGraphOperationTypeARM const &,
-               ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM> const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( operationType, name, version );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( PhysicalDeviceDataGraphOperationSupportARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = operationType <=> rhs.operationType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = strcmp( name, rhs.name ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-      if ( auto cmp = version <=> rhs.version; cmp != 0 )
-        return cmp;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( PhysicalDeviceDataGraphOperationSupportARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( operationType == rhs.operationType ) && ( strcmp( name, rhs.name ) == 0 ) && ( version == rhs.version );
-    }
-
-    bool operator!=( PhysicalDeviceDataGraphOperationSupportARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    PhysicalDeviceDataGraphOperationTypeARM operationType = PhysicalDeviceDataGraphOperationTypeARM::eSpirvExtendedInstructionSet;
-    ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_SET_NAME_SIZE_ARM> name    = {};
-    uint32_t                                                                            version = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDataGraphOperationSupportARM>
-  {
-    using Type = PhysicalDeviceDataGraphOperationSupportARM;
-  };
-#endif
-
-  // wrapper struct for struct VkDataGraphPipelineBuiltinModelCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineBuiltinModelCreateInfoQCOM.html
-  struct DataGraphPipelineBuiltinModelCreateInfoQCOM
-  {
-    using NativeType = VkDataGraphPipelineBuiltinModelCreateInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineBuiltinModelCreateInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineBuiltinModelCreateInfoQCOM( const PhysicalDeviceDataGraphOperationSupportARM * pOperation_ = {},
-                                                                         const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pOperation{ pOperation_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14
-      DataGraphPipelineBuiltinModelCreateInfoQCOM( DataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineBuiltinModelCreateInfoQCOM( VkDataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineBuiltinModelCreateInfoQCOM( *reinterpret_cast<DataGraphPipelineBuiltinModelCreateInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineBuiltinModelCreateInfoQCOM & operator=( DataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineBuiltinModelCreateInfoQCOM & operator=( VkDataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineBuiltinModelCreateInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineBuiltinModelCreateInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineBuiltinModelCreateInfoQCOM &
-      setPOperation( const PhysicalDeviceDataGraphOperationSupportARM * pOperation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pOperation = pOperation_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineBuiltinModelCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineBuiltinModelCreateInfoQCOM *>( this );
-    }
-
-    operator VkDataGraphPipelineBuiltinModelCreateInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineBuiltinModelCreateInfoQCOM *>( this );
-    }
-
-    operator VkDataGraphPipelineBuiltinModelCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineBuiltinModelCreateInfoQCOM *>( this );
-    }
-
-    operator VkDataGraphPipelineBuiltinModelCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineBuiltinModelCreateInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const PhysicalDeviceDataGraphOperationSupportARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pOperation );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineBuiltinModelCreateInfoQCOM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pOperation == rhs.pOperation );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineBuiltinModelCreateInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                      sType      = StructureType::eDataGraphPipelineBuiltinModelCreateInfoQCOM;
-    const void *                                       pNext      = {};
-    const PhysicalDeviceDataGraphOperationSupportARM * pOperation = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineBuiltinModelCreateInfoQCOM>
-  {
-    using Type = DataGraphPipelineBuiltinModelCreateInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineBuiltinModelCreateInfoQCOM>
-  {
-    using Type = DataGraphPipelineBuiltinModelCreateInfoQCOM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineCompilerControlCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineCompilerControlCreateInfoARM.html
-  struct DataGraphPipelineCompilerControlCreateInfoARM
-  {
-    using NativeType = VkDataGraphPipelineCompilerControlCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineCompilerControlCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineCompilerControlCreateInfoARM( const char * pVendorOptions_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pVendorOptions{ pVendorOptions_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      DataGraphPipelineCompilerControlCreateInfoARM( DataGraphPipelineCompilerControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineCompilerControlCreateInfoARM( VkDataGraphPipelineCompilerControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineCompilerControlCreateInfoARM( *reinterpret_cast<DataGraphPipelineCompilerControlCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineCompilerControlCreateInfoARM & operator=( DataGraphPipelineCompilerControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineCompilerControlCreateInfoARM & operator=( VkDataGraphPipelineCompilerControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineCompilerControlCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCompilerControlCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCompilerControlCreateInfoARM & setPVendorOptions( const char * pVendorOptions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pVendorOptions = pVendorOptions_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineCompilerControlCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineCompilerControlCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCompilerControlCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineCompilerControlCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCompilerControlCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineCompilerControlCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCompilerControlCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineCompilerControlCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const char * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pVendorOptions );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( DataGraphPipelineCompilerControlCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( pVendorOptions != rhs.pVendorOptions )
-        if ( auto cmp = strcmp( pVendorOptions, rhs.pVendorOptions ); cmp != 0 )
-          return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( DataGraphPipelineCompilerControlCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) &&
-             ( ( pVendorOptions == rhs.pVendorOptions ) || ( strcmp( pVendorOptions, rhs.pVendorOptions ) == 0 ) );
-    }
-
-    bool operator!=( DataGraphPipelineCompilerControlCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType sType          = StructureType::eDataGraphPipelineCompilerControlCreateInfoARM;
-    const void *  pNext          = {};
-    const char *  pVendorOptions = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineCompilerControlCreateInfoARM>
-  {
-    using Type = DataGraphPipelineCompilerControlCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineCompilerControlCreateInfoARM>
-  {
-    using Type = DataGraphPipelineCompilerControlCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineConstantARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineConstantARM.html
-  struct DataGraphPipelineConstantARM
-  {
-    using NativeType = VkDataGraphPipelineConstantARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineConstantARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineConstantARM( uint32_t id_ = {}, const void * pConstantData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , id{ id_ }
-      , pConstantData{ pConstantData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineConstantARM( DataGraphPipelineConstantARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineConstantARM( VkDataGraphPipelineConstantARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineConstantARM( *reinterpret_cast<DataGraphPipelineConstantARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineConstantARM & operator=( DataGraphPipelineConstantARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineConstantARM & operator=( VkDataGraphPipelineConstantARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineConstantARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantARM & setId( uint32_t id_ ) VULKAN_HPP_NOEXCEPT
-    {
-      id = id_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantARM & setPConstantData( const void * pConstantData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pConstantData = pConstantData_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineConstantARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineConstantARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineConstantARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineConstantARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineConstantARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, id, pConstantData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineConstantARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineConstantARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( id == rhs.id ) && ( pConstantData == rhs.pConstantData );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineConstantARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType         = StructureType::eDataGraphPipelineConstantARM;
-    const void *  pNext         = {};
-    uint32_t      id            = {};
-    const void *  pConstantData = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineConstantARM>
-  {
-    using Type = DataGraphPipelineConstantARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineConstantARM>
-  {
-    using Type = DataGraphPipelineConstantARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM.html
-  struct DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM
-  {
-    using NativeType = VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-
-    static const bool                                  allowDuplicate = true;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM( uint32_t     dimension_ = {},
-                                                                                       uint32_t     zeroCount_ = {},
-                                                                                       uint32_t     groupSize_ = {},
-                                                                                       const void * pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dimension{ dimension_ }
-      , zeroCount{ zeroCount_ }
-      , groupSize{ groupSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM(
-      DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM( VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs )
-      VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM(
-          *reinterpret_cast<DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM &
-      operator=( DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM &
-      operator=( VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM & setDimension( uint32_t dimension_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimension = dimension_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM & setZeroCount( uint32_t zeroCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      zeroCount = zeroCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM & setGroupSize( uint32_t groupSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      groupSize = groupSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dimension, zeroCount, groupSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dimension == rhs.dimension ) && ( zeroCount == rhs.zeroCount ) &&
-             ( groupSize == rhs.groupSize );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType     = StructureType::eDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-    const void *  pNext     = {};
-    uint32_t      dimension = {};
-    uint32_t      zeroCount = {};
-    uint32_t      groupSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>
-  {
-    using Type = DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM>
-  {
-    using Type = DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineResourceInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineResourceInfoARM.html
-  struct DataGraphPipelineResourceInfoARM
-  {
-    using NativeType = VkDataGraphPipelineResourceInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineResourceInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineResourceInfoARM( uint32_t     descriptorSet_ = {},
-                                                           uint32_t     binding_       = {},
-                                                           uint32_t     arrayElement_  = {},
-                                                           const void * pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorSet{ descriptorSet_ }
-      , binding{ binding_ }
-      , arrayElement{ arrayElement_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineResourceInfoARM( DataGraphPipelineResourceInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineResourceInfoARM( VkDataGraphPipelineResourceInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineResourceInfoARM( *reinterpret_cast<DataGraphPipelineResourceInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineResourceInfoARM & operator=( DataGraphPipelineResourceInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineResourceInfoARM & operator=( VkDataGraphPipelineResourceInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineResourceInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineResourceInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineResourceInfoARM & setDescriptorSet( uint32_t descriptorSet_ ) VULKAN_HPP_NOEXCEPT
-    {
-      descriptorSet = descriptorSet_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineResourceInfoARM & setBinding( uint32_t binding_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binding = binding_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineResourceInfoARM & setArrayElement( uint32_t arrayElement_ ) VULKAN_HPP_NOEXCEPT
-    {
-      arrayElement = arrayElement_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineResourceInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineResourceInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineResourceInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineResourceInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineResourceInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineResourceInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineResourceInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineResourceInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, descriptorSet, binding, arrayElement );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineResourceInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineResourceInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( descriptorSet == rhs.descriptorSet ) && ( binding == rhs.binding ) &&
-             ( arrayElement == rhs.arrayElement );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineResourceInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType         = StructureType::eDataGraphPipelineResourceInfoARM;
-    const void *  pNext         = {};
-    uint32_t      descriptorSet = {};
-    uint32_t      binding       = {};
-    uint32_t      arrayElement  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineResourceInfoARM>
-  {
-    using Type = DataGraphPipelineResourceInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineResourceInfoARM>
-  {
-    using Type = DataGraphPipelineResourceInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineCreateInfoARM.html
-  struct DataGraphPipelineCreateInfoARM
-  {
-    using NativeType = VkDataGraphPipelineCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineCreateInfoARM( PipelineCreateFlags2KHR                  flags_             = {},
-                                                         PipelineLayout                           layout_            = {},
-                                                         uint32_t                                 resourceInfoCount_ = {},
-                                                         const DataGraphPipelineResourceInfoARM * pResourceInfos_    = {},
-                                                         const void *                             pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , layout{ layout_ }
-      , resourceInfoCount{ resourceInfoCount_ }
-      , pResourceInfos{ pResourceInfos_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineCreateInfoARM( DataGraphPipelineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineCreateInfoARM( VkDataGraphPipelineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineCreateInfoARM( *reinterpret_cast<DataGraphPipelineCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineCreateInfoARM( PipelineCreateFlags2KHR                                                 flags_,
-                                    PipelineLayout                                                          layout_,
-                                    ArrayProxyNoTemporaries<const DataGraphPipelineResourceInfoARM> const & resourceInfos_,
-                                    const void *                                                            pNext_ = nullptr )
-      : pNext( pNext_ )
-      , flags( flags_ )
-      , layout( layout_ )
-      , resourceInfoCount( static_cast<uint32_t>( resourceInfos_.size() ) )
-      , pResourceInfos( resourceInfos_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DataGraphPipelineCreateInfoARM & operator=( DataGraphPipelineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineCreateInfoARM & operator=( VkDataGraphPipelineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCreateInfoARM & setFlags( PipelineCreateFlags2KHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCreateInfoARM & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      layout = layout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCreateInfoARM & setResourceInfoCount( uint32_t resourceInfoCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      resourceInfoCount = resourceInfoCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineCreateInfoARM & setPResourceInfos( const DataGraphPipelineResourceInfoARM * pResourceInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pResourceInfos = pResourceInfos_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineCreateInfoARM &
-      setResourceInfos( ArrayProxyNoTemporaries<const DataGraphPipelineResourceInfoARM> const & resourceInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      resourceInfoCount = static_cast<uint32_t>( resourceInfos_.size() );
-      pResourceInfos    = resourceInfos_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               PipelineCreateFlags2KHR const &,
-               PipelineLayout const &,
-               uint32_t const &,
-               const DataGraphPipelineResourceInfoARM * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, layout, resourceInfoCount, pResourceInfos );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineCreateInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( layout == rhs.layout ) &&
-             ( resourceInfoCount == rhs.resourceInfoCount ) && ( pResourceInfos == rhs.pResourceInfos );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                            sType             = StructureType::eDataGraphPipelineCreateInfoARM;
-    const void *                             pNext             = {};
-    PipelineCreateFlags2KHR                  flags             = {};
-    PipelineLayout                           layout            = {};
-    uint32_t                                 resourceInfoCount = {};
-    const DataGraphPipelineResourceInfoARM * pResourceInfos    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineCreateInfoARM>
-  {
-    using Type = DataGraphPipelineCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineCreateInfoARM>
-  {
-    using Type = DataGraphPipelineCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineDispatchInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineDispatchInfoARM.html
-  struct DataGraphPipelineDispatchInfoARM
-  {
-    using NativeType = VkDataGraphPipelineDispatchInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineDispatchInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineDispatchInfoARM( DataGraphPipelineDispatchFlagsARM flags_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineDispatchInfoARM( DataGraphPipelineDispatchInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineDispatchInfoARM( VkDataGraphPipelineDispatchInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineDispatchInfoARM( *reinterpret_cast<DataGraphPipelineDispatchInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineDispatchInfoARM & operator=( DataGraphPipelineDispatchInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineDispatchInfoARM & operator=( VkDataGraphPipelineDispatchInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineDispatchInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineDispatchInfoARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineDispatchInfoARM & setFlags( DataGraphPipelineDispatchFlagsARM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineDispatchInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineDispatchInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineDispatchInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineDispatchInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineDispatchInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineDispatchInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineDispatchInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineDispatchInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DataGraphPipelineDispatchFlagsARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineDispatchInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineDispatchInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineDispatchInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType = StructureType::eDataGraphPipelineDispatchInfoARM;
-    void *                            pNext = {};
-    DataGraphPipelineDispatchFlagsARM flags = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineDispatchInfoARM>
-  {
-    using Type = DataGraphPipelineDispatchInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineDispatchInfoARM>
-  {
-    using Type = DataGraphPipelineDispatchInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineIdentifierCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineIdentifierCreateInfoARM.html
-  struct DataGraphPipelineIdentifierCreateInfoARM
-  {
-    using NativeType = VkDataGraphPipelineIdentifierCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineIdentifierCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineIdentifierCreateInfoARM( uint32_t        identifierSize_ = {},
-                                                                   const uint8_t * pIdentifier_    = {},
-                                                                   const void *    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , identifierSize{ identifierSize_ }
-      , pIdentifier{ pIdentifier_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineIdentifierCreateInfoARM( DataGraphPipelineIdentifierCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineIdentifierCreateInfoARM( VkDataGraphPipelineIdentifierCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineIdentifierCreateInfoARM( *reinterpret_cast<DataGraphPipelineIdentifierCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineIdentifierCreateInfoARM( ArrayProxyNoTemporaries<const uint8_t> const & identifier_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), identifierSize( static_cast<uint32_t>( identifier_.size() ) ), pIdentifier( identifier_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DataGraphPipelineIdentifierCreateInfoARM & operator=( DataGraphPipelineIdentifierCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineIdentifierCreateInfoARM & operator=( VkDataGraphPipelineIdentifierCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineIdentifierCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineIdentifierCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineIdentifierCreateInfoARM & setIdentifierSize( uint32_t identifierSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      identifierSize = identifierSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineIdentifierCreateInfoARM & setPIdentifier( const uint8_t * pIdentifier_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pIdentifier = pIdentifier_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineIdentifierCreateInfoARM & setIdentifier( ArrayProxyNoTemporaries<const uint8_t> const & identifier_ ) VULKAN_HPP_NOEXCEPT
-    {
-      identifierSize = static_cast<uint32_t>( identifier_.size() );
-      pIdentifier    = identifier_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineIdentifierCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineIdentifierCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineIdentifierCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineIdentifierCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineIdentifierCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineIdentifierCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineIdentifierCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineIdentifierCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint8_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, identifierSize, pIdentifier );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineIdentifierCreateInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineIdentifierCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( identifierSize == rhs.identifierSize ) && ( pIdentifier == rhs.pIdentifier );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineIdentifierCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType   sType          = StructureType::eDataGraphPipelineIdentifierCreateInfoARM;
-    const void *    pNext          = {};
-    uint32_t        identifierSize = {};
-    const uint8_t * pIdentifier    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineIdentifierCreateInfoARM>
-  {
-    using Type = DataGraphPipelineIdentifierCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineIdentifierCreateInfoARM>
-  {
-    using Type = DataGraphPipelineIdentifierCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineInfoARM.html
-  struct DataGraphPipelineInfoARM
-  {
-    using NativeType = VkDataGraphPipelineInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineInfoARM( Pipeline dataGraphPipeline_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataGraphPipeline{ dataGraphPipeline_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineInfoARM( DataGraphPipelineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineInfoARM( VkDataGraphPipelineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineInfoARM( *reinterpret_cast<DataGraphPipelineInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineInfoARM & operator=( DataGraphPipelineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineInfoARM & operator=( VkDataGraphPipelineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineInfoARM & setDataGraphPipeline( Pipeline dataGraphPipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphPipeline = dataGraphPipeline_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dataGraphPipeline );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dataGraphPipeline == rhs.dataGraphPipeline );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::eDataGraphPipelineInfoARM;
-    const void *  pNext             = {};
-    Pipeline      dataGraphPipeline = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineInfoARM>
-  {
-    using Type = DataGraphPipelineInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineInfoARM>
-  {
-    using Type = DataGraphPipelineInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelinePropertyQueryResultARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelinePropertyQueryResultARM.html
-  struct DataGraphPipelinePropertyQueryResultARM
-  {
-    using NativeType = VkDataGraphPipelinePropertyQueryResultARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelinePropertyQueryResultARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelinePropertyQueryResultARM( DataGraphPipelinePropertyARM property_ = DataGraphPipelinePropertyARM::eCreationLog,
-                                                                  Bool32                       isText_   = {},
-                                                                  size_t                       dataSize_ = {},
-                                                                  void *                       pData_    = {},
-                                                                  const void *                 pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , property{ property_ }
-      , isText{ isText_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelinePropertyQueryResultARM( DataGraphPipelinePropertyQueryResultARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelinePropertyQueryResultARM( VkDataGraphPipelinePropertyQueryResultARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelinePropertyQueryResultARM( *reinterpret_cast<DataGraphPipelinePropertyQueryResultARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    DataGraphPipelinePropertyQueryResultARM( DataGraphPipelinePropertyARM       property_,
-                                             Bool32                             isText_,
-                                             ArrayProxyNoTemporaries<T> const & data_,
-                                             const void *                       pNext_ = nullptr )
-      : pNext( pNext_ ), property( property_ ), isText( isText_ ), dataSize( data_.size() * sizeof( T ) ), pData( data_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DataGraphPipelinePropertyQueryResultARM & operator=( DataGraphPipelinePropertyQueryResultARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelinePropertyQueryResultARM & operator=( VkDataGraphPipelinePropertyQueryResultARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelinePropertyQueryResultARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelinePropertyQueryResultARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelinePropertyQueryResultARM & setProperty( DataGraphPipelinePropertyARM property_ ) VULKAN_HPP_NOEXCEPT
-    {
-      property = property_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelinePropertyQueryResultARM & setIsText( Bool32 isText_ ) VULKAN_HPP_NOEXCEPT
-    {
-      isText = isText_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelinePropertyQueryResultARM & setDataSize( size_t dataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataSize = dataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelinePropertyQueryResultARM & setPData( void * pData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pData = pData_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    DataGraphPipelinePropertyQueryResultARM & setData( ArrayProxyNoTemporaries<T> const & data_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataSize = data_.size() * sizeof( T );
-      pData    = data_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelinePropertyQueryResultARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelinePropertyQueryResultARM *>( this );
-    }
-
-    operator VkDataGraphPipelinePropertyQueryResultARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelinePropertyQueryResultARM *>( this );
-    }
-
-    operator VkDataGraphPipelinePropertyQueryResultARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelinePropertyQueryResultARM *>( this );
-    }
-
-    operator VkDataGraphPipelinePropertyQueryResultARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelinePropertyQueryResultARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DataGraphPipelinePropertyARM const &, Bool32 const &, size_t const &, void * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, property, isText, dataSize, pData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelinePropertyQueryResultARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelinePropertyQueryResultARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( property == rhs.property ) && ( isText == rhs.isText ) && ( dataSize == rhs.dataSize ) &&
-             ( pData == rhs.pData );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelinePropertyQueryResultARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                sType    = StructureType::eDataGraphPipelinePropertyQueryResultARM;
-    const void *                 pNext    = {};
-    DataGraphPipelinePropertyARM property = DataGraphPipelinePropertyARM::eCreationLog;
-    Bool32                       isText   = {};
-    size_t                       dataSize = {};
-    void *                       pData    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelinePropertyQueryResultARM>
-  {
-    using Type = DataGraphPipelinePropertyQueryResultARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelinePropertyQueryResultARM>
-  {
-    using Type = DataGraphPipelinePropertyQueryResultARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineSessionBindPointRequirementARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionBindPointRequirementARM.html
-  struct DataGraphPipelineSessionBindPointRequirementARM
-  {
-    using NativeType = VkDataGraphPipelineSessionBindPointRequirementARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineSessionBindPointRequirementARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineSessionBindPointRequirementARM(
-      DataGraphPipelineSessionBindPointARM     bindPoint_     = DataGraphPipelineSessionBindPointARM::eTransient,
-      DataGraphPipelineSessionBindPointTypeARM bindPointType_ = DataGraphPipelineSessionBindPointTypeARM::eMemory,
-      uint32_t                                 numObjects_    = {},
-      const void *                             pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , bindPoint{ bindPoint_ }
-      , bindPointType{ bindPointType_ }
-      , numObjects{ numObjects_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      DataGraphPipelineSessionBindPointRequirementARM( DataGraphPipelineSessionBindPointRequirementARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineSessionBindPointRequirementARM( VkDataGraphPipelineSessionBindPointRequirementARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineSessionBindPointRequirementARM( *reinterpret_cast<DataGraphPipelineSessionBindPointRequirementARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineSessionBindPointRequirementARM & operator=( DataGraphPipelineSessionBindPointRequirementARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineSessionBindPointRequirementARM & operator=( VkDataGraphPipelineSessionBindPointRequirementARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineSessionBindPointRequirementARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementARM &
-      setBindPoint( DataGraphPipelineSessionBindPointARM bindPoint_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bindPoint = bindPoint_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementARM &
-      setBindPointType( DataGraphPipelineSessionBindPointTypeARM bindPointType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bindPointType = bindPointType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementARM & setNumObjects( uint32_t numObjects_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numObjects = numObjects_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineSessionBindPointRequirementARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               DataGraphPipelineSessionBindPointARM const &,
-               DataGraphPipelineSessionBindPointTypeARM const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, bindPoint, bindPointType, numObjects );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineSessionBindPointRequirementARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineSessionBindPointRequirementARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( bindPoint == rhs.bindPoint ) && ( bindPointType == rhs.bindPointType ) &&
-             ( numObjects == rhs.numObjects );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineSessionBindPointRequirementARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                            sType         = StructureType::eDataGraphPipelineSessionBindPointRequirementARM;
-    const void *                             pNext         = {};
-    DataGraphPipelineSessionBindPointARM     bindPoint     = DataGraphPipelineSessionBindPointARM::eTransient;
-    DataGraphPipelineSessionBindPointTypeARM bindPointType = DataGraphPipelineSessionBindPointTypeARM::eMemory;
-    uint32_t                                 numObjects    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineSessionBindPointRequirementARM>
-  {
-    using Type = DataGraphPipelineSessionBindPointRequirementARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineSessionBindPointRequirementARM>
-  {
-    using Type = DataGraphPipelineSessionBindPointRequirementARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineSessionBindPointRequirementsInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionBindPointRequirementsInfoARM.html
-  struct DataGraphPipelineSessionBindPointRequirementsInfoARM
-  {
-    using NativeType = VkDataGraphPipelineSessionBindPointRequirementsInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineSessionBindPointRequirementsInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineSessionBindPointRequirementsInfoARM( DataGraphPipelineSessionARM session_ = {},
-                                                                               const void *                pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , session{ session_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      DataGraphPipelineSessionBindPointRequirementsInfoARM( DataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineSessionBindPointRequirementsInfoARM( VkDataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineSessionBindPointRequirementsInfoARM( *reinterpret_cast<DataGraphPipelineSessionBindPointRequirementsInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineSessionBindPointRequirementsInfoARM &
-      operator=( DataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineSessionBindPointRequirementsInfoARM & operator=( VkDataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineSessionBindPointRequirementsInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementsInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionBindPointRequirementsInfoARM & setSession( DataGraphPipelineSessionARM session_ ) VULKAN_HPP_NOEXCEPT
-    {
-      session = session_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineSessionBindPointRequirementsInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementsInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementsInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionBindPointRequirementsInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineSessionBindPointRequirementsInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DataGraphPipelineSessionARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, session );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineSessionBindPointRequirementsInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( session == rhs.session );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineSessionBindPointRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType               sType   = StructureType::eDataGraphPipelineSessionBindPointRequirementsInfoARM;
-    const void *                pNext   = {};
-    DataGraphPipelineSessionARM session = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineSessionBindPointRequirementsInfoARM>
-  {
-    using Type = DataGraphPipelineSessionBindPointRequirementsInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineSessionBindPointRequirementsInfoARM>
-  {
-    using Type = DataGraphPipelineSessionBindPointRequirementsInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineSessionCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionCreateInfoARM.html
-  struct DataGraphPipelineSessionCreateInfoARM
-  {
-    using NativeType = VkDataGraphPipelineSessionCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineSessionCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineSessionCreateInfoARM( DataGraphPipelineSessionCreateFlagsARM flags_             = {},
-                                                                Pipeline                               dataGraphPipeline_ = {},
-                                                                const void *                           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dataGraphPipeline{ dataGraphPipeline_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineSessionCreateInfoARM( DataGraphPipelineSessionCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineSessionCreateInfoARM( VkDataGraphPipelineSessionCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineSessionCreateInfoARM( *reinterpret_cast<DataGraphPipelineSessionCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineSessionCreateInfoARM & operator=( DataGraphPipelineSessionCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineSessionCreateInfoARM & operator=( VkDataGraphPipelineSessionCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineSessionCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionCreateInfoARM & setFlags( DataGraphPipelineSessionCreateFlagsARM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionCreateInfoARM & setDataGraphPipeline( Pipeline dataGraphPipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphPipeline = dataGraphPipeline_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineSessionCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineSessionCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineSessionCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineSessionCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DataGraphPipelineSessionCreateFlagsARM const &, Pipeline const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, dataGraphPipeline );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineSessionCreateInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineSessionCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( dataGraphPipeline == rhs.dataGraphPipeline );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineSessionCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                          sType             = StructureType::eDataGraphPipelineSessionCreateInfoARM;
-    const void *                           pNext             = {};
-    DataGraphPipelineSessionCreateFlagsARM flags             = {};
-    Pipeline                               dataGraphPipeline = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineSessionCreateInfoARM>
-  {
-    using Type = DataGraphPipelineSessionCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineSessionCreateInfoARM>
-  {
-    using Type = DataGraphPipelineSessionCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineSessionMemoryRequirementsInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineSessionMemoryRequirementsInfoARM.html
-  struct DataGraphPipelineSessionMemoryRequirementsInfoARM
-  {
-    using NativeType = VkDataGraphPipelineSessionMemoryRequirementsInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineSessionMemoryRequirementsInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DataGraphPipelineSessionMemoryRequirementsInfoARM( DataGraphPipelineSessionARM          session_     = {},
-                                                         DataGraphPipelineSessionBindPointARM bindPoint_   = DataGraphPipelineSessionBindPointARM::eTransient,
-                                                         uint32_t                             objectIndex_ = {},
-                                                         const void *                         pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , session{ session_ }
-      , bindPoint{ bindPoint_ }
-      , objectIndex{ objectIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      DataGraphPipelineSessionMemoryRequirementsInfoARM( DataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineSessionMemoryRequirementsInfoARM( VkDataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineSessionMemoryRequirementsInfoARM( *reinterpret_cast<DataGraphPipelineSessionMemoryRequirementsInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DataGraphPipelineSessionMemoryRequirementsInfoARM &
-      operator=( DataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineSessionMemoryRequirementsInfoARM & operator=( VkDataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineSessionMemoryRequirementsInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionMemoryRequirementsInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionMemoryRequirementsInfoARM & setSession( DataGraphPipelineSessionARM session_ ) VULKAN_HPP_NOEXCEPT
-    {
-      session = session_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionMemoryRequirementsInfoARM &
-      setBindPoint( DataGraphPipelineSessionBindPointARM bindPoint_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bindPoint = bindPoint_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineSessionMemoryRequirementsInfoARM & setObjectIndex( uint32_t objectIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      objectIndex = objectIndex_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineSessionMemoryRequirementsInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionMemoryRequirementsInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionMemoryRequirementsInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineSessionMemoryRequirementsInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineSessionMemoryRequirementsInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DataGraphPipelineSessionARM const &, DataGraphPipelineSessionBindPointARM const &, uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, session, bindPoint, objectIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphPipelineSessionMemoryRequirementsInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( session == rhs.session ) && ( bindPoint == rhs.bindPoint ) &&
-             ( objectIndex == rhs.objectIndex );
-#  endif
-    }
-
-    bool operator!=( DataGraphPipelineSessionMemoryRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                        sType       = StructureType::eDataGraphPipelineSessionMemoryRequirementsInfoARM;
-    const void *                         pNext       = {};
-    DataGraphPipelineSessionARM          session     = {};
-    DataGraphPipelineSessionBindPointARM bindPoint   = DataGraphPipelineSessionBindPointARM::eTransient;
-    uint32_t                             objectIndex = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineSessionMemoryRequirementsInfoARM>
-  {
-    using Type = DataGraphPipelineSessionMemoryRequirementsInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineSessionMemoryRequirementsInfoARM>
-  {
-    using Type = DataGraphPipelineSessionMemoryRequirementsInfoARM;
-  };
-
-  // wrapper struct for struct VkDataGraphPipelineShaderModuleCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphPipelineShaderModuleCreateInfoARM.html
-  struct DataGraphPipelineShaderModuleCreateInfoARM
-  {
-    using NativeType = VkDataGraphPipelineShaderModuleCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphPipelineShaderModuleCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineShaderModuleCreateInfoARM( ShaderModule                         module_              = {},
-                                                                     const char *                         pName_               = {},
-                                                                     const SpecializationInfo *           pSpecializationInfo_ = {},
-                                                                     uint32_t                             constantCount_       = {},
-                                                                     const DataGraphPipelineConstantARM * pConstants_          = {},
-                                                                     const void *                         pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , module{ module_ }
-      , pName{ pName_ }
-      , pSpecializationInfo{ pSpecializationInfo_ }
-      , constantCount{ constantCount_ }
-      , pConstants{ pConstants_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphPipelineShaderModuleCreateInfoARM( DataGraphPipelineShaderModuleCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphPipelineShaderModuleCreateInfoARM( VkDataGraphPipelineShaderModuleCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphPipelineShaderModuleCreateInfoARM( *reinterpret_cast<DataGraphPipelineShaderModuleCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineShaderModuleCreateInfoARM( ShaderModule                                                        module_,
-                                                const char *                                                        pName_,
-                                                const SpecializationInfo *                                          pSpecializationInfo_,
-                                                ArrayProxyNoTemporaries<const DataGraphPipelineConstantARM> const & constants_,
-                                                const void *                                                        pNext_ = nullptr )
-      : pNext( pNext_ )
-      , module( module_ )
-      , pName( pName_ )
-      , pSpecializationInfo( pSpecializationInfo_ )
-      , constantCount( static_cast<uint32_t>( constants_.size() ) )
-      , pConstants( constants_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DataGraphPipelineShaderModuleCreateInfoARM & operator=( DataGraphPipelineShaderModuleCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphPipelineShaderModuleCreateInfoARM & operator=( VkDataGraphPipelineShaderModuleCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphPipelineShaderModuleCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM & setModule( ShaderModule module_ ) VULKAN_HPP_NOEXCEPT
-    {
-      module = module_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM & setPName( const char * pName_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pName = pName_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM &
-      setPSpecializationInfo( const SpecializationInfo * pSpecializationInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pSpecializationInfo = pSpecializationInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM & setConstantCount( uint32_t constantCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      constantCount = constantCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphPipelineShaderModuleCreateInfoARM & setPConstants( const DataGraphPipelineConstantARM * pConstants_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pConstants = pConstants_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphPipelineShaderModuleCreateInfoARM &
-      setConstants( ArrayProxyNoTemporaries<const DataGraphPipelineConstantARM> const & constants_ ) VULKAN_HPP_NOEXCEPT
-    {
-      constantCount = static_cast<uint32_t>( constants_.size() );
-      pConstants    = constants_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphPipelineShaderModuleCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphPipelineShaderModuleCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineShaderModuleCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphPipelineShaderModuleCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineShaderModuleCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphPipelineShaderModuleCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphPipelineShaderModuleCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphPipelineShaderModuleCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               ShaderModule const &,
-               const char * const &,
-               const SpecializationInfo * const &,
-               uint32_t const &,
-               const DataGraphPipelineConstantARM * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, module, pName, pSpecializationInfo, constantCount, pConstants );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( DataGraphPipelineShaderModuleCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = module <=> rhs.module; cmp != 0 )
-        return cmp;
-      if ( pName != rhs.pName )
-        if ( auto cmp = strcmp( pName, rhs.pName ); cmp != 0 )
-          return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-      if ( auto cmp = pSpecializationInfo <=> rhs.pSpecializationInfo; cmp != 0 )
-        return cmp;
-      if ( auto cmp = constantCount <=> rhs.constantCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pConstants <=> rhs.pConstants; cmp != 0 )
-        return cmp;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( DataGraphPipelineShaderModuleCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( module == rhs.module ) &&
-             ( ( pName == rhs.pName ) || ( strcmp( pName, rhs.pName ) == 0 ) ) && ( pSpecializationInfo == rhs.pSpecializationInfo ) &&
-             ( constantCount == rhs.constantCount ) && ( pConstants == rhs.pConstants );
-    }
-
-    bool operator!=( DataGraphPipelineShaderModuleCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType                        sType               = StructureType::eDataGraphPipelineShaderModuleCreateInfoARM;
-    const void *                         pNext               = {};
-    ShaderModule                         module              = {};
-    const char *                         pName               = {};
-    const SpecializationInfo *           pSpecializationInfo = {};
-    uint32_t                             constantCount       = {};
-    const DataGraphPipelineConstantARM * pConstants          = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphPipelineShaderModuleCreateInfoARM>
-  {
-    using Type = DataGraphPipelineShaderModuleCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphPipelineShaderModuleCreateInfoARM>
-  {
-    using Type = DataGraphPipelineShaderModuleCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDataGraphProcessingEngineARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphProcessingEngineARM.html
-  struct PhysicalDeviceDataGraphProcessingEngineARM
-  {
-    using NativeType = VkPhysicalDeviceDataGraphProcessingEngineARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphProcessingEngineARM(
-      PhysicalDeviceDataGraphProcessingEngineTypeARM type_      = PhysicalDeviceDataGraphProcessingEngineTypeARM::eDefault,
-      Bool32                                         isForeign_ = {} ) VULKAN_HPP_NOEXCEPT
-      : type{ type_ }
-      , isForeign{ isForeign_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphProcessingEngineARM( PhysicalDeviceDataGraphProcessingEngineARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDataGraphProcessingEngineARM( VkPhysicalDeviceDataGraphProcessingEngineARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDataGraphProcessingEngineARM( *reinterpret_cast<PhysicalDeviceDataGraphProcessingEngineARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDataGraphProcessingEngineARM & operator=( PhysicalDeviceDataGraphProcessingEngineARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDataGraphProcessingEngineARM & operator=( VkPhysicalDeviceDataGraphProcessingEngineARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDataGraphProcessingEngineARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphProcessingEngineARM & setType( PhysicalDeviceDataGraphProcessingEngineTypeARM type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      type = type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphProcessingEngineARM & setIsForeign( Bool32 isForeign_ ) VULKAN_HPP_NOEXCEPT
-    {
-      isForeign = isForeign_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDataGraphProcessingEngineARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDataGraphProcessingEngineARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphProcessingEngineARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDataGraphProcessingEngineARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphProcessingEngineARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDataGraphProcessingEngineARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphProcessingEngineARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDataGraphProcessingEngineARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PhysicalDeviceDataGraphProcessingEngineTypeARM const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( type, isForeign );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDataGraphProcessingEngineARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDataGraphProcessingEngineARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( type == rhs.type ) && ( isForeign == rhs.isForeign );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDataGraphProcessingEngineARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    PhysicalDeviceDataGraphProcessingEngineTypeARM type      = PhysicalDeviceDataGraphProcessingEngineTypeARM::eDefault;
-    Bool32                                         isForeign = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDataGraphProcessingEngineARM>
-  {
-    using Type = PhysicalDeviceDataGraphProcessingEngineARM;
-  };
-#endif
-
-  // wrapper struct for struct VkDataGraphProcessingEngineCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDataGraphProcessingEngineCreateInfoARM.html
-  struct DataGraphProcessingEngineCreateInfoARM
-  {
-    using NativeType = VkDataGraphProcessingEngineCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDataGraphProcessingEngineCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DataGraphProcessingEngineCreateInfoARM( uint32_t                                     processingEngineCount_ = {},
-                                                                 PhysicalDeviceDataGraphProcessingEngineARM * pProcessingEngines_    = {},
-                                                                 const void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , processingEngineCount{ processingEngineCount_ }
-      , pProcessingEngines{ pProcessingEngines_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DataGraphProcessingEngineCreateInfoARM( DataGraphProcessingEngineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DataGraphProcessingEngineCreateInfoARM( VkDataGraphProcessingEngineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DataGraphProcessingEngineCreateInfoARM( *reinterpret_cast<DataGraphProcessingEngineCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphProcessingEngineCreateInfoARM( ArrayProxyNoTemporaries<PhysicalDeviceDataGraphProcessingEngineARM> const & processingEngines_,
-                                            const void *                                                                pNext_ = nullptr )
-      : pNext( pNext_ ), processingEngineCount( static_cast<uint32_t>( processingEngines_.size() ) ), pProcessingEngines( processingEngines_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DataGraphProcessingEngineCreateInfoARM & operator=( DataGraphProcessingEngineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DataGraphProcessingEngineCreateInfoARM & operator=( VkDataGraphProcessingEngineCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DataGraphProcessingEngineCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DataGraphProcessingEngineCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphProcessingEngineCreateInfoARM & setProcessingEngineCount( uint32_t processingEngineCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      processingEngineCount = processingEngineCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DataGraphProcessingEngineCreateInfoARM &
-      setPProcessingEngines( PhysicalDeviceDataGraphProcessingEngineARM * pProcessingEngines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pProcessingEngines = pProcessingEngines_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DataGraphProcessingEngineCreateInfoARM &
-      setProcessingEngines( ArrayProxyNoTemporaries<PhysicalDeviceDataGraphProcessingEngineARM> const & processingEngines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      processingEngineCount = static_cast<uint32_t>( processingEngines_.size() );
-      pProcessingEngines    = processingEngines_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDataGraphProcessingEngineCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDataGraphProcessingEngineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphProcessingEngineCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDataGraphProcessingEngineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphProcessingEngineCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDataGraphProcessingEngineCreateInfoARM *>( this );
-    }
-
-    operator VkDataGraphProcessingEngineCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDataGraphProcessingEngineCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, PhysicalDeviceDataGraphProcessingEngineARM * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, processingEngineCount, pProcessingEngines );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DataGraphProcessingEngineCreateInfoARM const & ) const = default;
-#else
-    bool operator==( DataGraphProcessingEngineCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( processingEngineCount == rhs.processingEngineCount ) &&
-             ( pProcessingEngines == rhs.pProcessingEngines );
-#  endif
-    }
-
-    bool operator!=( DataGraphProcessingEngineCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                sType                 = StructureType::eDataGraphProcessingEngineCreateInfoARM;
-    const void *                                 pNext                 = {};
-    uint32_t                                     processingEngineCount = {};
-    PhysicalDeviceDataGraphProcessingEngineARM * pProcessingEngines    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDataGraphProcessingEngineCreateInfoARM>
-  {
-    using Type = DataGraphProcessingEngineCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDataGraphProcessingEngineCreateInfoARM>
-  {
-    using Type = DataGraphProcessingEngineCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDebugMarkerMarkerInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugMarkerMarkerInfoEXT.html
   struct DebugMarkerMarkerInfoEXT
   {
     using NativeType = VkDebugMarkerMarkerInfoEXT;
@@ -31049,12 +20625,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugMarkerMarkerInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14
       DebugMarkerMarkerInfoEXT( const char * pMarkerName_ = {}, std::array<float, 4> const & color_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pMarkerName{ pMarkerName_ }
-      , color{ color_ }
+      : pNext( pNext_ )
+      , pMarkerName( pMarkerName_ )
+      , color( color_ )
     {
     }
 
@@ -31066,15 +20642,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DebugMarkerMarkerInfoEXT & operator=( DebugMarkerMarkerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugMarkerMarkerInfoEXT & operator=( VkDebugMarkerMarkerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugMarkerMarkerInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugMarkerMarkerInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugMarkerMarkerInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -31092,7 +20668,7 @@ namespace VULKAN_HPP_NAMESPACE
       color = color_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugMarkerMarkerInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31104,18 +20680,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugMarkerMarkerInfoEXT *>( this );
     }
 
-    operator VkDebugMarkerMarkerInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugMarkerMarkerInfoEXT *>( this );
-    }
-
-    operator VkDebugMarkerMarkerInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugMarkerMarkerInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const char * const &, ArrayWrapper1D<float, 4> const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const char * const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4> const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pMarkerName, color );
     }
@@ -31150,27 +20721,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType            sType       = StructureType::eDebugMarkerMarkerInfoEXT;
-    const void *             pNext       = {};
-    const char *             pMarkerName = {};
-    ArrayWrapper1D<float, 4> color       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType       = StructureType::eDebugMarkerMarkerInfoEXT;
+    const void *                                   pNext       = {};
+    const char *                                   pMarkerName = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4> color       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugMarkerMarkerInfoEXT>
-  {
-    using Type = DebugMarkerMarkerInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugMarkerMarkerInfoEXT>
   {
     using Type = DebugMarkerMarkerInfoEXT;
   };
 
-  // wrapper struct for struct VkDebugMarkerObjectNameInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugMarkerObjectNameInfoEXT.html
   struct DebugMarkerObjectNameInfoEXT
   {
     using NativeType = VkDebugMarkerObjectNameInfoEXT;
@@ -31178,15 +20740,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugMarkerObjectNameInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugMarkerObjectNameInfoEXT( DebugReportObjectTypeEXT objectType_  = DebugReportObjectTypeEXT::eUnknown,
-                                                       uint64_t                 object_      = {},
-                                                       const char *             pObjectName_ = {},
-                                                       const void *             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , objectType{ objectType_ }
-      , object{ object_ }
-      , pObjectName{ pObjectName_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DebugMarkerObjectNameInfoEXT( VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_  = VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown,
+                                    uint64_t                                       object_      = {},
+                                    const char *                                   pObjectName_ = {},
+                                    const void *                                   pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , objectType( objectType_ )
+      , object( object_ )
+      , pObjectName( pObjectName_ )
     {
     }
 
@@ -31198,22 +20761,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DebugMarkerObjectNameInfoEXT & operator=( DebugMarkerObjectNameInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugMarkerObjectNameInfoEXT & operator=( VkDebugMarkerObjectNameInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugMarkerObjectNameInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugMarkerObjectNameInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectNameInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectNameInfoEXT & setObjectType( DebugReportObjectTypeEXT objectType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectNameInfoEXT & setObjectType( VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_ ) VULKAN_HPP_NOEXCEPT
     {
       objectType = objectType_;
       return *this;
@@ -31230,7 +20793,7 @@ namespace VULKAN_HPP_NAMESPACE
       pObjectName = pObjectName_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugMarkerObjectNameInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31242,18 +20805,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugMarkerObjectNameInfoEXT *>( this );
     }
 
-    operator VkDebugMarkerObjectNameInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugMarkerObjectNameInfoEXT *>( this );
-    }
-
-    operator VkDebugMarkerObjectNameInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugMarkerObjectNameInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DebugReportObjectTypeEXT const &, uint64_t const &, const char * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT const &,
+               uint64_t const &,
+               const char * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, objectType, object, pObjectName );
@@ -31291,28 +20852,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType            sType       = StructureType::eDebugMarkerObjectNameInfoEXT;
-    const void *             pNext       = {};
-    DebugReportObjectTypeEXT objectType  = DebugReportObjectTypeEXT::eUnknown;
-    uint64_t                 object      = {};
-    const char *             pObjectName = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType       = StructureType::eDebugMarkerObjectNameInfoEXT;
+    const void *                                   pNext       = {};
+    VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType  = VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
+    uint64_t                                       object      = {};
+    const char *                                   pObjectName = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugMarkerObjectNameInfoEXT>
-  {
-    using Type = DebugMarkerObjectNameInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugMarkerObjectNameInfoEXT>
   {
     using Type = DebugMarkerObjectNameInfoEXT;
   };
 
-  // wrapper struct for struct VkDebugMarkerObjectTagInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugMarkerObjectTagInfoEXT.html
   struct DebugMarkerObjectTagInfoEXT
   {
     using NativeType = VkDebugMarkerObjectTagInfoEXT;
@@ -31320,19 +20872,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugMarkerObjectTagInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugMarkerObjectTagInfoEXT( DebugReportObjectTypeEXT objectType_ = DebugReportObjectTypeEXT::eUnknown,
-                                                      uint64_t                 object_     = {},
-                                                      uint64_t                 tagName_    = {},
-                                                      size_t                   tagSize_    = {},
-                                                      const void *             pTag_       = {},
-                                                      const void *             pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , objectType{ objectType_ }
-      , object{ object_ }
-      , tagName{ tagName_ }
-      , tagSize{ tagSize_ }
-      , pTag{ pTag_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DebugMarkerObjectTagInfoEXT( VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_ = VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown,
+                                   uint64_t                                       object_     = {},
+                                   uint64_t                                       tagName_    = {},
+                                   size_t                                         tagSize_    = {},
+                                   const void *                                   pTag_       = {},
+                                   const void *                                   pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , objectType( objectType_ )
+      , object( object_ )
+      , tagName( tagName_ )
+      , tagSize( tagSize_ )
+      , pTag( pTag_ )
     {
     }
 
@@ -31345,30 +20898,33 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    DebugMarkerObjectTagInfoEXT(
-      DebugReportObjectTypeEXT objectType_, uint64_t object_, uint64_t tagName_, ArrayProxyNoTemporaries<const T> const & tag_, const void * pNext_ = nullptr )
+    DebugMarkerObjectTagInfoEXT( VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT                 objectType_,
+                                 uint64_t                                                       object_,
+                                 uint64_t                                                       tagName_,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & tag_,
+                                 const void *                                                   pNext_ = nullptr )
       : pNext( pNext_ ), objectType( objectType_ ), object( object_ ), tagName( tagName_ ), tagSize( tag_.size() * sizeof( T ) ), pTag( tag_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DebugMarkerObjectTagInfoEXT & operator=( DebugMarkerObjectTagInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugMarkerObjectTagInfoEXT & operator=( VkDebugMarkerObjectTagInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugMarkerObjectTagInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugMarkerObjectTagInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectTagInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectTagInfoEXT & setObjectType( DebugReportObjectTypeEXT objectType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugMarkerObjectTagInfoEXT & setObjectType( VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType_ ) VULKAN_HPP_NOEXCEPT
     {
       objectType = objectType_;
       return *this;
@@ -31400,14 +20956,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    DebugMarkerObjectTagInfoEXT & setTag( ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
+    DebugMarkerObjectTagInfoEXT & setTag( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
     {
       tagSize = tag_.size() * sizeof( T );
       pTag    = tag_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugMarkerObjectTagInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31419,24 +20975,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugMarkerObjectTagInfoEXT *>( this );
     }
 
-    operator VkDebugMarkerObjectTagInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugMarkerObjectTagInfoEXT *>( this );
-    }
-
-    operator VkDebugMarkerObjectTagInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugMarkerObjectTagInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DebugReportObjectTypeEXT const &,
+               VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT const &,
                uint64_t const &,
                uint64_t const &,
                size_t const &,
                const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, objectType, object, tagName, tagSize, pTag );
@@ -31463,40 +21013,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType      = StructureType::eDebugMarkerObjectTagInfoEXT;
-    const void *             pNext      = {};
-    DebugReportObjectTypeEXT objectType = DebugReportObjectTypeEXT::eUnknown;
-    uint64_t                 object     = {};
-    uint64_t                 tagName    = {};
-    size_t                   tagSize    = {};
-    const void *             pTag       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType      = StructureType::eDebugMarkerObjectTagInfoEXT;
+    const void *                                   pNext      = {};
+    VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT objectType = VULKAN_HPP_NAMESPACE::DebugReportObjectTypeEXT::eUnknown;
+    uint64_t                                       object     = {};
+    uint64_t                                       tagName    = {};
+    size_t                                         tagSize    = {};
+    const void *                                   pTag       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugMarkerObjectTagInfoEXT>
-  {
-    using Type = DebugMarkerObjectTagInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugMarkerObjectTagInfoEXT>
   {
     using Type = DebugMarkerObjectTagInfoEXT;
   };
 
-  typedef Bool32( VKAPI_PTR * PFN_DebugReportCallbackEXT )( DebugReportFlagsEXT      flags,
-                                                            DebugReportObjectTypeEXT objectType,
-                                                            uint64_t                 object,
-                                                            size_t                   location,
-                                                            int32_t                  messageCode,
-                                                            const char *             pLayerPrefix,
-                                                            const char *             pMessage,
-                                                            void *                   pUserData );
-
-  // wrapper struct for struct VkDebugReportCallbackCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugReportCallbackCreateInfoEXT.html
   struct DebugReportCallbackCreateInfoEXT
   {
     using NativeType = VkDebugReportCallbackCreateInfoEXT;
@@ -31504,15 +21035,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugReportCallbackCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugReportCallbackCreateInfoEXT( DebugReportFlagsEXT        flags_       = {},
-                                                           PFN_DebugReportCallbackEXT pfnCallback_ = {},
-                                                           void *                     pUserData_   = {},
-                                                           const void *               pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pfnCallback{ pfnCallback_ }
-      , pUserData{ pUserData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DebugReportCallbackCreateInfoEXT( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT flags_       = {},
+                                                           PFN_vkDebugReportCallbackEXT              pfnCallback_ = {},
+                                                           void *                                    pUserData_   = {},
+                                                           const void *                              pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pfnCallback( pfnCallback_ )
+      , pUserData( pUserData_ )
     {
     }
 
@@ -31523,49 +21054,29 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This constructor is deprecated. Use the one taking function pointer types from the vk-namespace instead." )
-
-    DebugReportCallbackCreateInfoEXT( DebugReportFlagsEXT          flags_,
-                                      PFN_vkDebugReportCallbackEXT pfnCallback_,
-                                      void *                       pUserData_ = {},
-                                      const void *                 pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : DebugReportCallbackCreateInfoEXT( flags_, reinterpret_cast<PFN_DebugReportCallbackEXT>( pfnCallback_ ), pUserData_, pNext_ )
-    {
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-
     DebugReportCallbackCreateInfoEXT & operator=( DebugReportCallbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugReportCallbackCreateInfoEXT & operator=( VkDebugReportCallbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugReportCallbackCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugReportCallbackCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugReportCallbackCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugReportCallbackCreateInfoEXT & setFlags( DebugReportFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugReportCallbackCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugReportCallbackCreateInfoEXT & setPfnCallback( PFN_DebugReportCallbackEXT pfnCallback_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugReportCallbackCreateInfoEXT & setPfnCallback( PFN_vkDebugReportCallbackEXT pfnCallback_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnCallback = pfnCallback_;
       return *this;
@@ -31576,24 +21087,7 @@ namespace VULKAN_HPP_NAMESPACE
       pUserData = pUserData_;
       return *this;
     }
-
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    DebugReportCallbackCreateInfoEXT & setPfnCallback( PFN_vkDebugReportCallbackEXT pfnCallback_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnCallback( reinterpret_cast<PFN_DebugReportCallbackEXT>( pfnCallback_ ) );
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugReportCallbackCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31605,18 +21099,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugReportCallbackCreateInfoEXT *>( this );
     }
 
-    operator VkDebugReportCallbackCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT *>( this );
-    }
-
-    operator VkDebugReportCallbackCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugReportCallbackCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DebugReportFlagsEXT const &, PFN_DebugReportCallbackEXT const &, void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT const &,
+               PFN_vkDebugReportCallbackEXT const &,
+               void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pfnCallback, pUserData );
@@ -31638,28 +21130,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType              sType       = StructureType::eDebugReportCallbackCreateInfoEXT;
-    const void *               pNext       = {};
-    DebugReportFlagsEXT        flags       = {};
-    PFN_DebugReportCallbackEXT pfnCallback = {};
-    void *                     pUserData   = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType       = StructureType::eDebugReportCallbackCreateInfoEXT;
+    const void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::DebugReportFlagsEXT flags       = {};
+    PFN_vkDebugReportCallbackEXT              pfnCallback = {};
+    void *                                    pUserData   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugReportCallbackCreateInfoEXT>
-  {
-    using Type = DebugReportCallbackCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugReportCallbackCreateInfoEXT>
   {
     using Type = DebugReportCallbackCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkDebugUtilsLabelEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsLabelEXT.html
   struct DebugUtilsLabelEXT
   {
     using NativeType = VkDebugUtilsLabelEXT;
@@ -31667,12 +21150,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugUtilsLabelEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14
       DebugUtilsLabelEXT( const char * pLabelName_ = {}, std::array<float, 4> const & color_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pLabelName{ pLabelName_ }
-      , color{ color_ }
+      : pNext( pNext_ )
+      , pLabelName( pLabelName_ )
+      , color( color_ )
     {
     }
 
@@ -31681,15 +21164,15 @@ namespace VULKAN_HPP_NAMESPACE
     DebugUtilsLabelEXT( VkDebugUtilsLabelEXT const & rhs ) VULKAN_HPP_NOEXCEPT : DebugUtilsLabelEXT( *reinterpret_cast<DebugUtilsLabelEXT const *>( &rhs ) ) {}
 
     DebugUtilsLabelEXT & operator=( DebugUtilsLabelEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugUtilsLabelEXT & operator=( VkDebugUtilsLabelEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugUtilsLabelEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugUtilsLabelEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -31707,7 +21190,7 @@ namespace VULKAN_HPP_NAMESPACE
       color = color_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugUtilsLabelEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31719,18 +21202,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugUtilsLabelEXT *>( this );
     }
 
-    operator VkDebugUtilsLabelEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugUtilsLabelEXT *>( this );
-    }
-
-    operator VkDebugUtilsLabelEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugUtilsLabelEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const char * const &, ArrayWrapper1D<float, 4> const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const char * const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4> const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pLabelName, color );
     }
@@ -31765,27 +21243,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType            sType      = StructureType::eDebugUtilsLabelEXT;
-    const void *             pNext      = {};
-    const char *             pLabelName = {};
-    ArrayWrapper1D<float, 4> color      = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType      = StructureType::eDebugUtilsLabelEXT;
+    const void *                                   pNext      = {};
+    const char *                                   pLabelName = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4> color      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugUtilsLabelEXT>
-  {
-    using Type = DebugUtilsLabelEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugUtilsLabelEXT>
   {
     using Type = DebugUtilsLabelEXT;
   };
 
-  // wrapper struct for struct VkDebugUtilsObjectNameInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsObjectNameInfoEXT.html
   struct DebugUtilsObjectNameInfoEXT
   {
     using NativeType = VkDebugUtilsObjectNameInfoEXT;
@@ -31793,15 +21262,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugUtilsObjectNameInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugUtilsObjectNameInfoEXT( ObjectType   objectType_   = ObjectType::eUnknown,
-                                                      uint64_t     objectHandle_ = {},
-                                                      const char * pObjectName_  = {},
-                                                      const void * pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , objectType{ objectType_ }
-      , objectHandle{ objectHandle_ }
-      , pObjectName{ pObjectName_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DebugUtilsObjectNameInfoEXT( VULKAN_HPP_NAMESPACE::ObjectType objectType_   = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown,
+                                                      uint64_t                         objectHandle_ = {},
+                                                      const char *                     pObjectName_  = {},
+                                                      const void *                     pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , objectType( objectType_ )
+      , objectHandle( objectHandle_ )
+      , pObjectName( pObjectName_ )
     {
     }
 
@@ -31813,22 +21282,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DebugUtilsObjectNameInfoEXT & operator=( DebugUtilsObjectNameInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugUtilsObjectNameInfoEXT & operator=( VkDebugUtilsObjectNameInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugUtilsObjectNameInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectNameInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectNameInfoEXT & setObjectType( ObjectType objectType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectNameInfoEXT & setObjectType( VULKAN_HPP_NAMESPACE::ObjectType objectType_ ) VULKAN_HPP_NOEXCEPT
     {
       objectType = objectType_;
       return *this;
@@ -31845,7 +21314,7 @@ namespace VULKAN_HPP_NAMESPACE
       pObjectName = pObjectName_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugUtilsObjectNameInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -31857,18 +21326,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugUtilsObjectNameInfoEXT *>( this );
     }
 
-    operator VkDebugUtilsObjectNameInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugUtilsObjectNameInfoEXT *>( this );
-    }
-
-    operator VkDebugUtilsObjectNameInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugUtilsObjectNameInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ObjectType const &, uint64_t const &, const char * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ObjectType const &, uint64_t const &, const char * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, objectType, objectHandle, pObjectName );
     }
@@ -31905,29 +21370,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType        = StructureType::eDebugUtilsObjectNameInfoEXT;
-    const void *  pNext        = {};
-    ObjectType    objectType   = ObjectType::eUnknown;
-    uint64_t      objectHandle = {};
-    const char *  pObjectName  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eDebugUtilsObjectNameInfoEXT;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::ObjectType    objectType   = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown;
+    uint64_t                            objectHandle = {};
+    const char *                        pObjectName  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugUtilsObjectNameInfoEXT>
-  {
-    using Type = DebugUtilsObjectNameInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugUtilsObjectNameInfoEXT>
   {
     using Type = DebugUtilsObjectNameInfoEXT;
   };
 
-  // wrapper struct for struct VkDebugUtilsMessengerCallbackDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerCallbackDataEXT.html
   struct DebugUtilsMessengerCallbackDataEXT
   {
     using NativeType = VkDebugUtilsMessengerCallbackDataEXT;
@@ -31935,29 +21390,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugUtilsMessengerCallbackDataEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT( DebugUtilsMessengerCallbackDataFlagsEXT flags_            = {},
-                                                                const char *                            pMessageIdName_   = {},
-                                                                int32_t                                 messageIdNumber_  = {},
-                                                                const char *                            pMessage_         = {},
-                                                                uint32_t                                queueLabelCount_  = {},
-                                                                const DebugUtilsLabelEXT *              pQueueLabels_     = {},
-                                                                uint32_t                                cmdBufLabelCount_ = {},
-                                                                const DebugUtilsLabelEXT *              pCmdBufLabels_    = {},
-                                                                uint32_t                                objectCount_      = {},
-                                                                const DebugUtilsObjectNameInfoEXT *     pObjects_         = {},
-                                                                const void *                            pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pMessageIdName{ pMessageIdName_ }
-      , messageIdNumber{ messageIdNumber_ }
-      , pMessage{ pMessage_ }
-      , queueLabelCount{ queueLabelCount_ }
-      , pQueueLabels{ pQueueLabels_ }
-      , cmdBufLabelCount{ cmdBufLabelCount_ }
-      , pCmdBufLabels{ pCmdBufLabels_ }
-      , objectCount{ objectCount_ }
-      , pObjects{ pObjects_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataFlagsEXT flags_            = {},
+                                                                const char *                                                  pMessageIdName_   = {},
+                                                                int32_t                                                       messageIdNumber_  = {},
+                                                                const char *                                                  pMessage_         = {},
+                                                                uint32_t                                                      queueLabelCount_  = {},
+                                                                const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT *              pQueueLabels_     = {},
+                                                                uint32_t                                                      cmdBufLabelCount_ = {},
+                                                                const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT *              pCmdBufLabels_    = {},
+                                                                uint32_t                                                      objectCount_      = {},
+                                                                const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT *     pObjects_         = {},
+                                                                const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pMessageIdName( pMessageIdName_ )
+      , messageIdNumber( messageIdNumber_ )
+      , pMessage( pMessage_ )
+      , queueLabelCount( queueLabelCount_ )
+      , pQueueLabels( pQueueLabels_ )
+      , cmdBufLabelCount( cmdBufLabelCount_ )
+      , pCmdBufLabels( pCmdBufLabels_ )
+      , objectCount( objectCount_ )
+      , pObjects( pObjects_ )
     {
     }
 
@@ -31969,14 +21424,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DebugUtilsMessengerCallbackDataEXT( DebugUtilsMessengerCallbackDataFlagsEXT                            flags_,
-                                        const char *                                                       pMessageIdName_,
-                                        int32_t                                                            messageIdNumber_,
-                                        const char *                                                       pMessage_,
-                                        ArrayProxyNoTemporaries<const DebugUtilsLabelEXT> const &          queueLabels_,
-                                        ArrayProxyNoTemporaries<const DebugUtilsLabelEXT> const &          cmdBufLabels_ = {},
-                                        ArrayProxyNoTemporaries<const DebugUtilsObjectNameInfoEXT> const & objects_      = {},
-                                        const void *                                                       pNext_        = nullptr )
+    DebugUtilsMessengerCallbackDataEXT(
+      VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataFlagsEXT                                                  flags_,
+      const char *                                                                                                   pMessageIdName_,
+      int32_t                                                                                                        messageIdNumber_,
+      const char *                                                                                                   pMessage_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT> const &          queueLabels_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT> const &          cmdBufLabels_ = {},
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT> const & objects_      = {},
+      const void *                                                                                                   pNext_        = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , pMessageIdName( pMessageIdName_ )
@@ -31993,22 +21449,23 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DebugUtilsMessengerCallbackDataEXT & operator=( DebugUtilsMessengerCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugUtilsMessengerCallbackDataEXT & operator=( VkDebugUtilsMessengerCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugUtilsMessengerCallbackDataEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT & setFlags( DebugUtilsMessengerCallbackDataFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT &
+      setFlags( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -32038,14 +21495,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT & setPQueueLabels( const DebugUtilsLabelEXT * pQueueLabels_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT &
+      setPQueueLabels( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pQueueLabels_ ) VULKAN_HPP_NOEXCEPT
     {
       pQueueLabels = pQueueLabels_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DebugUtilsMessengerCallbackDataEXT & setQueueLabels( ArrayProxyNoTemporaries<const DebugUtilsLabelEXT> const & queueLabels_ ) VULKAN_HPP_NOEXCEPT
+    DebugUtilsMessengerCallbackDataEXT &
+      setQueueLabels( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT> const & queueLabels_ ) VULKAN_HPP_NOEXCEPT
     {
       queueLabelCount = static_cast<uint32_t>( queueLabels_.size() );
       pQueueLabels    = queueLabels_.data();
@@ -32059,14 +21518,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT & setPCmdBufLabels( const DebugUtilsLabelEXT * pCmdBufLabels_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT &
+      setPCmdBufLabels( const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * pCmdBufLabels_ ) VULKAN_HPP_NOEXCEPT
     {
       pCmdBufLabels = pCmdBufLabels_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DebugUtilsMessengerCallbackDataEXT & setCmdBufLabels( ArrayProxyNoTemporaries<const DebugUtilsLabelEXT> const & cmdBufLabels_ ) VULKAN_HPP_NOEXCEPT
+    DebugUtilsMessengerCallbackDataEXT &
+      setCmdBufLabels( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT> const & cmdBufLabels_ ) VULKAN_HPP_NOEXCEPT
     {
       cmdBufLabelCount = static_cast<uint32_t>( cmdBufLabels_.size() );
       pCmdBufLabels    = cmdBufLabels_.data();
@@ -32080,21 +21541,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT & setPObjects( const DebugUtilsObjectNameInfoEXT * pObjects_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCallbackDataEXT &
+      setPObjects( const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT * pObjects_ ) VULKAN_HPP_NOEXCEPT
     {
       pObjects = pObjects_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DebugUtilsMessengerCallbackDataEXT & setObjects( ArrayProxyNoTemporaries<const DebugUtilsObjectNameInfoEXT> const & objects_ ) VULKAN_HPP_NOEXCEPT
+    DebugUtilsMessengerCallbackDataEXT &
+      setObjects( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT> const & objects_ ) VULKAN_HPP_NOEXCEPT
     {
       objectCount = static_cast<uint32_t>( objects_.size() );
       pObjects    = objects_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugUtilsMessengerCallbackDataEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -32106,29 +21569,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugUtilsMessengerCallbackDataEXT *>( this );
     }
 
-    operator VkDebugUtilsMessengerCallbackDataEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugUtilsMessengerCallbackDataEXT *>( this );
-    }
-
-    operator VkDebugUtilsMessengerCallbackDataEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugUtilsMessengerCallbackDataEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DebugUtilsMessengerCallbackDataFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataFlagsEXT const &,
                const char * const &,
                int32_t const &,
                const char * const &,
                uint32_t const &,
-               const DebugUtilsLabelEXT * const &,
+               const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * const &,
                uint32_t const &,
-               const DebugUtilsLabelEXT * const &,
+               const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT * const &,
                uint32_t const &,
-               const DebugUtilsObjectNameInfoEXT * const &>
+               const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -32185,41 +21642,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                           sType            = StructureType::eDebugUtilsMessengerCallbackDataEXT;
-    const void *                            pNext            = {};
-    DebugUtilsMessengerCallbackDataFlagsEXT flags            = {};
-    const char *                            pMessageIdName   = {};
-    int32_t                                 messageIdNumber  = {};
-    const char *                            pMessage         = {};
-    uint32_t                                queueLabelCount  = {};
-    const DebugUtilsLabelEXT *              pQueueLabels     = {};
-    uint32_t                                cmdBufLabelCount = {};
-    const DebugUtilsLabelEXT *              pCmdBufLabels    = {};
-    uint32_t                                objectCount      = {};
-    const DebugUtilsObjectNameInfoEXT *     pObjects         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                           sType            = StructureType::eDebugUtilsMessengerCallbackDataEXT;
+    const void *                                                  pNext            = {};
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCallbackDataFlagsEXT flags            = {};
+    const char *                                                  pMessageIdName   = {};
+    int32_t                                                       messageIdNumber  = {};
+    const char *                                                  pMessage         = {};
+    uint32_t                                                      queueLabelCount  = {};
+    const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT *              pQueueLabels     = {};
+    uint32_t                                                      cmdBufLabelCount = {};
+    const VULKAN_HPP_NAMESPACE::DebugUtilsLabelEXT *              pCmdBufLabels    = {};
+    uint32_t                                                      objectCount      = {};
+    const VULKAN_HPP_NAMESPACE::DebugUtilsObjectNameInfoEXT *     pObjects         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugUtilsMessengerCallbackDataEXT>
-  {
-    using Type = DebugUtilsMessengerCallbackDataEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugUtilsMessengerCallbackDataEXT>
   {
     using Type = DebugUtilsMessengerCallbackDataEXT;
   };
 
-  typedef Bool32( VKAPI_PTR * PFN_DebugUtilsMessengerCallbackEXT )( DebugUtilsMessageSeverityFlagBitsEXT       messageSeverity,
-                                                                    DebugUtilsMessageTypeFlagsEXT              messageTypes,
-                                                                    const DebugUtilsMessengerCallbackDataEXT * pCallbackData,
-                                                                    void *                                     pUserData );
-
-  // wrapper struct for struct VkDebugUtilsMessengerCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsMessengerCreateInfoEXT.html
   struct DebugUtilsMessengerCreateInfoEXT
   {
     using NativeType = VkDebugUtilsMessengerCreateInfoEXT;
@@ -32227,19 +21669,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugUtilsMessengerCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugUtilsMessengerCreateInfoEXT( DebugUtilsMessengerCreateFlagsEXT  flags_           = {},
-                                                           DebugUtilsMessageSeverityFlagsEXT  messageSeverity_ = {},
-                                                           DebugUtilsMessageTypeFlagsEXT      messageType_     = {},
-                                                           PFN_DebugUtilsMessengerCallbackEXT pfnUserCallback_ = {},
-                                                           void *                             pUserData_       = {},
-                                                           const void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , messageSeverity{ messageSeverity_ }
-      , messageType{ messageType_ }
-      , pfnUserCallback{ pfnUserCallback_ }
-      , pUserData{ pUserData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DebugUtilsMessengerCreateInfoEXT( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateFlagsEXT flags_           = {},
+                                                           VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagsEXT messageSeverity_ = {},
+                                                           VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT     messageType_     = {},
+                                                           PFN_vkDebugUtilsMessengerCallbackEXT                    pfnUserCallback_ = {},
+                                                           void *                                                  pUserData_       = {},
+                                                           const void *                                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , messageSeverity( messageSeverity_ )
+      , messageType( messageType_ )
+      , pfnUserCallback( pfnUserCallback_ )
+      , pUserData( pUserData_ )
     {
     }
 
@@ -32250,64 +21692,43 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This constructor is deprecated. Use the one taking function pointer types from the vk-namespace instead." )
-
-    DebugUtilsMessengerCreateInfoEXT( DebugUtilsMessengerCreateFlagsEXT    flags_,
-                                      DebugUtilsMessageSeverityFlagsEXT    messageSeverity_,
-                                      DebugUtilsMessageTypeFlagsEXT        messageType_,
-                                      PFN_vkDebugUtilsMessengerCallbackEXT pfnUserCallback_,
-                                      void *                               pUserData_ = {},
-                                      const void *                         pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : DebugUtilsMessengerCreateInfoEXT(
-          flags_, messageSeverity_, messageType_, reinterpret_cast<PFN_DebugUtilsMessengerCallbackEXT>( pfnUserCallback_ ), pUserData_, pNext_ )
-    {
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-
     DebugUtilsMessengerCreateInfoEXT & operator=( DebugUtilsMessengerCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugUtilsMessengerCreateInfoEXT & operator=( VkDebugUtilsMessengerCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugUtilsMessengerCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setFlags( DebugUtilsMessengerCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setMessageSeverity( DebugUtilsMessageSeverityFlagsEXT messageSeverity_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT &
+      setMessageSeverity( VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagsEXT messageSeverity_ ) VULKAN_HPP_NOEXCEPT
     {
       messageSeverity = messageSeverity_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setMessageType( DebugUtilsMessageTypeFlagsEXT messageType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT &
+      setMessageType( VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT messageType_ ) VULKAN_HPP_NOEXCEPT
     {
       messageType = messageType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setPfnUserCallback( PFN_DebugUtilsMessengerCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsMessengerCreateInfoEXT & setPfnUserCallback( PFN_vkDebugUtilsMessengerCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnUserCallback = pfnUserCallback_;
       return *this;
@@ -32318,24 +21739,7 @@ namespace VULKAN_HPP_NAMESPACE
       pUserData = pUserData_;
       return *this;
     }
-
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    DebugUtilsMessengerCreateInfoEXT & setPfnUserCallback( PFN_vkDebugUtilsMessengerCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnUserCallback( reinterpret_cast<PFN_DebugUtilsMessengerCallbackEXT>( pfnUserCallback_ ) );
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugUtilsMessengerCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -32347,24 +21751,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugUtilsMessengerCreateInfoEXT *>( this );
     }
 
-    operator VkDebugUtilsMessengerCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugUtilsMessengerCreateInfoEXT *>( this );
-    }
-
-    operator VkDebugUtilsMessengerCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugUtilsMessengerCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DebugUtilsMessengerCreateFlagsEXT const &,
-               DebugUtilsMessageSeverityFlagsEXT const &,
-               DebugUtilsMessageTypeFlagsEXT const &,
-               PFN_DebugUtilsMessengerCallbackEXT const &,
+               VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT const &,
+               PFN_vkDebugUtilsMessengerCallbackEXT const &,
                void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, messageSeverity, messageType, pfnUserCallback, pUserData );
@@ -32387,30 +21785,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                      sType           = StructureType::eDebugUtilsMessengerCreateInfoEXT;
-    const void *                       pNext           = {};
-    DebugUtilsMessengerCreateFlagsEXT  flags           = {};
-    DebugUtilsMessageSeverityFlagsEXT  messageSeverity = {};
-    DebugUtilsMessageTypeFlagsEXT      messageType     = {};
-    PFN_DebugUtilsMessengerCallbackEXT pfnUserCallback = {};
-    void *                             pUserData       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType           = StructureType::eDebugUtilsMessengerCreateInfoEXT;
+    const void *                                            pNext           = {};
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessengerCreateFlagsEXT flags           = {};
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessageSeverityFlagsEXT messageSeverity = {};
+    VULKAN_HPP_NAMESPACE::DebugUtilsMessageTypeFlagsEXT     messageType     = {};
+    PFN_vkDebugUtilsMessengerCallbackEXT                    pfnUserCallback = {};
+    void *                                                  pUserData       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugUtilsMessengerCreateInfoEXT>
-  {
-    using Type = DebugUtilsMessengerCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugUtilsMessengerCreateInfoEXT>
   {
     using Type = DebugUtilsMessengerCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkDebugUtilsObjectTagInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDebugUtilsObjectTagInfoEXT.html
   struct DebugUtilsObjectTagInfoEXT
   {
     using NativeType = VkDebugUtilsObjectTagInfoEXT;
@@ -32418,19 +21807,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDebugUtilsObjectTagInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DebugUtilsObjectTagInfoEXT( ObjectType   objectType_   = ObjectType::eUnknown,
-                                                     uint64_t     objectHandle_ = {},
-                                                     uint64_t     tagName_      = {},
-                                                     size_t       tagSize_      = {},
-                                                     const void * pTag_         = {},
-                                                     const void * pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , objectType{ objectType_ }
-      , objectHandle{ objectHandle_ }
-      , tagName{ tagName_ }
-      , tagSize{ tagSize_ }
-      , pTag{ pTag_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DebugUtilsObjectTagInfoEXT( VULKAN_HPP_NAMESPACE::ObjectType objectType_   = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown,
+                                                     uint64_t                         objectHandle_ = {},
+                                                     uint64_t                         tagName_      = {},
+                                                     size_t                           tagSize_      = {},
+                                                     const void *                     pTag_         = {},
+                                                     const void *                     pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , objectType( objectType_ )
+      , objectHandle( objectHandle_ )
+      , tagName( tagName_ )
+      , tagSize( tagSize_ )
+      , pTag( pTag_ )
     {
     }
 
@@ -32443,8 +21832,11 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    DebugUtilsObjectTagInfoEXT(
-      ObjectType objectType_, uint64_t objectHandle_, uint64_t tagName_, ArrayProxyNoTemporaries<const T> const & tag_, const void * pNext_ = nullptr )
+    DebugUtilsObjectTagInfoEXT( VULKAN_HPP_NAMESPACE::ObjectType                               objectType_,
+                                uint64_t                                                       objectHandle_,
+                                uint64_t                                                       tagName_,
+                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & tag_,
+                                const void *                                                   pNext_ = nullptr )
       : pNext( pNext_ )
       , objectType( objectType_ )
       , objectHandle( objectHandle_ )
@@ -32456,22 +21848,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DebugUtilsObjectTagInfoEXT & operator=( DebugUtilsObjectTagInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DebugUtilsObjectTagInfoEXT & operator=( VkDebugUtilsObjectTagInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DebugUtilsObjectTagInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DebugUtilsObjectTagInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectTagInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectTagInfoEXT & setObjectType( ObjectType objectType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DebugUtilsObjectTagInfoEXT & setObjectType( VULKAN_HPP_NAMESPACE::ObjectType objectType_ ) VULKAN_HPP_NOEXCEPT
     {
       objectType = objectType_;
       return *this;
@@ -32503,14 +21895,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    DebugUtilsObjectTagInfoEXT & setTag( ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
+    DebugUtilsObjectTagInfoEXT & setTag( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
     {
       tagSize = tag_.size() * sizeof( T );
       pTag    = tag_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDebugUtilsObjectTagInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -32522,18 +21914,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDebugUtilsObjectTagInfoEXT *>( this );
     }
 
-    operator VkDebugUtilsObjectTagInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDebugUtilsObjectTagInfoEXT *>( this );
-    }
-
-    operator VkDebugUtilsObjectTagInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDebugUtilsObjectTagInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ObjectType const &, uint64_t const &, uint64_t const &, size_t const &, const void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ObjectType const &,
+               uint64_t const &,
+               uint64_t const &,
+               size_t const &,
+               const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, objectType, objectHandle, tagName, tagSize, pTag );
@@ -32560,315 +21952,36 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eDebugUtilsObjectTagInfoEXT;
-    const void *  pNext        = {};
-    ObjectType    objectType   = ObjectType::eUnknown;
-    uint64_t      objectHandle = {};
-    uint64_t      tagName      = {};
-    size_t        tagSize      = {};
-    const void *  pTag         = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eDebugUtilsObjectTagInfoEXT;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::ObjectType    objectType   = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown;
+    uint64_t                            objectHandle = {};
+    uint64_t                            tagName      = {};
+    size_t                              tagSize      = {};
+    const void *                        pTag         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDebugUtilsObjectTagInfoEXT>
-  {
-    using Type = DebugUtilsObjectTagInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDebugUtilsObjectTagInfoEXT>
   {
     using Type = DebugUtilsObjectTagInfoEXT;
   };
 
-  // wrapper struct for struct VkDecompressMemoryRegionEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDecompressMemoryRegionEXT.html
-  struct DecompressMemoryRegionEXT
-  {
-    using NativeType = VkDecompressMemoryRegionEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DecompressMemoryRegionEXT( DeviceAddress srcAddress_       = {},
-                                                    DeviceAddress dstAddress_       = {},
-                                                    DeviceSize    compressedSize_   = {},
-                                                    DeviceSize    decompressedSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcAddress{ srcAddress_ }
-      , dstAddress{ dstAddress_ }
-      , compressedSize{ compressedSize_ }
-      , decompressedSize{ decompressedSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DecompressMemoryRegionEXT( DecompressMemoryRegionEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DecompressMemoryRegionEXT( VkDecompressMemoryRegionEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DecompressMemoryRegionEXT( *reinterpret_cast<DecompressMemoryRegionEXT const *>( &rhs ) )
-    {
-    }
-
-    DecompressMemoryRegionEXT & operator=( DecompressMemoryRegionEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DecompressMemoryRegionEXT & operator=( VkDecompressMemoryRegionEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DecompressMemoryRegionEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionEXT & setSrcAddress( DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcAddress = srcAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionEXT & setDstAddress( DeviceAddress dstAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstAddress = dstAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionEXT & setCompressedSize( DeviceSize compressedSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      compressedSize = compressedSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionEXT & setDecompressedSize( DeviceSize decompressedSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      decompressedSize = decompressedSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDecompressMemoryRegionEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDecompressMemoryRegionEXT *>( this );
-    }
-
-    operator VkDecompressMemoryRegionEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDecompressMemoryRegionEXT *>( this );
-    }
-
-    operator VkDecompressMemoryRegionEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDecompressMemoryRegionEXT *>( this );
-    }
-
-    operator VkDecompressMemoryRegionEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDecompressMemoryRegionEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceAddress const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( srcAddress, dstAddress, compressedSize, decompressedSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DecompressMemoryRegionEXT const & ) const = default;
-#else
-    bool operator==( DecompressMemoryRegionEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( srcAddress == rhs.srcAddress ) && ( dstAddress == rhs.dstAddress ) && ( compressedSize == rhs.compressedSize ) &&
-             ( decompressedSize == rhs.decompressedSize );
-#  endif
-    }
-
-    bool operator!=( DecompressMemoryRegionEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress srcAddress       = {};
-    DeviceAddress dstAddress       = {};
-    DeviceSize    compressedSize   = {};
-    DeviceSize    decompressedSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDecompressMemoryRegionEXT>
-  {
-    using Type = DecompressMemoryRegionEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDecompressMemoryInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDecompressMemoryInfoEXT.html
-  struct DecompressMemoryInfoEXT
-  {
-    using NativeType = VkDecompressMemoryInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDecompressMemoryInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DecompressMemoryInfoEXT( MemoryDecompressionMethodFlagsEXT decompressionMethod_ = {},
-                                                  uint32_t                          regionCount_         = {},
-                                                  const DecompressMemoryRegionEXT * pRegions_            = {},
-                                                  const void *                      pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , decompressionMethod{ decompressionMethod_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DecompressMemoryInfoEXT( DecompressMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DecompressMemoryInfoEXT( VkDecompressMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DecompressMemoryInfoEXT( *reinterpret_cast<DecompressMemoryInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DecompressMemoryInfoEXT( MemoryDecompressionMethodFlagsEXT                                decompressionMethod_,
-                             ArrayProxyNoTemporaries<const DecompressMemoryRegionEXT> const & regions_,
-                             const void *                                                     pNext_ = nullptr )
-      : pNext( pNext_ ), decompressionMethod( decompressionMethod_ ), regionCount( static_cast<uint32_t>( regions_.size() ) ), pRegions( regions_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    DecompressMemoryInfoEXT & operator=( DecompressMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DecompressMemoryInfoEXT & operator=( VkDecompressMemoryInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DecompressMemoryInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryInfoEXT & setDecompressionMethod( MemoryDecompressionMethodFlagsEXT decompressionMethod_ ) VULKAN_HPP_NOEXCEPT
-    {
-      decompressionMethod = decompressionMethod_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryInfoEXT & setRegionCount( uint32_t regionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      regionCount = regionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryInfoEXT & setPRegions( const DecompressMemoryRegionEXT * pRegions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pRegions = pRegions_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DecompressMemoryInfoEXT & setRegions( ArrayProxyNoTemporaries<const DecompressMemoryRegionEXT> const & regions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      regionCount = static_cast<uint32_t>( regions_.size() );
-      pRegions    = regions_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDecompressMemoryInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDecompressMemoryInfoEXT *>( this );
-    }
-
-    operator VkDecompressMemoryInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDecompressMemoryInfoEXT *>( this );
-    }
-
-    operator VkDecompressMemoryInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDecompressMemoryInfoEXT *>( this );
-    }
-
-    operator VkDecompressMemoryInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDecompressMemoryInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, MemoryDecompressionMethodFlagsEXT const &, uint32_t const &, const DecompressMemoryRegionEXT * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, decompressionMethod, regionCount, pRegions );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DecompressMemoryInfoEXT const & ) const = default;
-#else
-    bool operator==( DecompressMemoryInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( decompressionMethod == rhs.decompressionMethod ) && ( regionCount == rhs.regionCount ) &&
-             ( pRegions == rhs.pRegions );
-#  endif
-    }
-
-    bool operator!=( DecompressMemoryInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType               = StructureType::eDecompressMemoryInfoEXT;
-    const void *                      pNext               = {};
-    MemoryDecompressionMethodFlagsEXT decompressionMethod = {};
-    uint32_t                          regionCount         = {};
-    const DecompressMemoryRegionEXT * pRegions            = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDecompressMemoryInfoEXT>
-  {
-    using Type = DecompressMemoryInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDecompressMemoryInfoEXT>
-  {
-    using Type = DecompressMemoryInfoEXT;
-  };
-
-  // wrapper struct for struct VkDecompressMemoryRegionNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDecompressMemoryRegionNV.html
   struct DecompressMemoryRegionNV
   {
     using NativeType = VkDecompressMemoryRegionNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DecompressMemoryRegionNV( DeviceAddress                    srcAddress_          = {},
-                                                   DeviceAddress                    dstAddress_          = {},
-                                                   DeviceSize                       compressedSize_      = {},
-                                                   DeviceSize                       decompressedSize_    = {},
-                                                   MemoryDecompressionMethodFlagsNV decompressionMethod_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcAddress{ srcAddress_ }
-      , dstAddress{ dstAddress_ }
-      , compressedSize{ compressedSize_ }
-      , decompressedSize{ decompressedSize_ }
-      , decompressionMethod{ decompressionMethod_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DecompressMemoryRegionNV( VULKAN_HPP_NAMESPACE::DeviceAddress                    srcAddress_          = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceAddress                    dstAddress_          = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceSize                       compressedSize_      = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceSize                       decompressedSize_    = {},
+                                                   VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV decompressionMethod_ = {} ) VULKAN_HPP_NOEXCEPT
+      : srcAddress( srcAddress_ )
+      , dstAddress( dstAddress_ )
+      , compressedSize( compressedSize_ )
+      , decompressedSize( decompressedSize_ )
+      , decompressionMethod( decompressionMethod_ )
     {
     }
 
@@ -32880,45 +21993,46 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DecompressMemoryRegionNV & operator=( DecompressMemoryRegionNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DecompressMemoryRegionNV & operator=( VkDecompressMemoryRegionNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DecompressMemoryRegionNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DecompressMemoryRegionNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setSrcAddress( DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setSrcAddress( VULKAN_HPP_NAMESPACE::DeviceAddress srcAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAddress = srcAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setDstAddress( DeviceAddress dstAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setDstAddress( VULKAN_HPP_NAMESPACE::DeviceAddress dstAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAddress = dstAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setCompressedSize( DeviceSize compressedSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setCompressedSize( VULKAN_HPP_NAMESPACE::DeviceSize compressedSize_ ) VULKAN_HPP_NOEXCEPT
     {
       compressedSize = compressedSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setDecompressedSize( DeviceSize decompressedSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setDecompressedSize( VULKAN_HPP_NAMESPACE::DeviceSize decompressedSize_ ) VULKAN_HPP_NOEXCEPT
     {
       decompressedSize = decompressedSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV & setDecompressionMethod( MemoryDecompressionMethodFlagsNV decompressionMethod_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DecompressMemoryRegionNV &
+      setDecompressionMethod( VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV decompressionMethod_ ) VULKAN_HPP_NOEXCEPT
     {
       decompressionMethod = decompressionMethod_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDecompressMemoryRegionNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -32930,18 +22044,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDecompressMemoryRegionNV *>( this );
     }
 
-    operator VkDecompressMemoryRegionNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDecompressMemoryRegionNV *>( this );
-    }
-
-    operator VkDecompressMemoryRegionNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDecompressMemoryRegionNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, DeviceAddress const &, DeviceSize const &, DeviceSize const &, MemoryDecompressionMethodFlagsNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcAddress, dstAddress, compressedSize, decompressedSize, decompressionMethod );
@@ -32968,23 +22080,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceAddress                    srcAddress          = {};
-    DeviceAddress                    dstAddress          = {};
-    DeviceSize                       compressedSize      = {};
-    DeviceSize                       decompressedSize    = {};
-    MemoryDecompressionMethodFlagsNV decompressionMethod = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress                    srcAddress          = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress                    dstAddress          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       compressedSize      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       decompressedSize    = {};
+    VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV decompressionMethod = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDecompressMemoryRegionNV>
-  {
-    using Type = DecompressMemoryRegionNV;
-  };
-#endif
-
-  // wrapper struct for struct VkDedicatedAllocationBufferCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDedicatedAllocationBufferCreateInfoNV.html
   struct DedicatedAllocationBufferCreateInfoNV
   {
     using NativeType = VkDedicatedAllocationBufferCreateInfoNV;
@@ -32992,10 +22094,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDedicatedAllocationBufferCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DedicatedAllocationBufferCreateInfoNV( Bool32 dedicatedAllocation_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dedicatedAllocation{ dedicatedAllocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DedicatedAllocationBufferCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocation_ = {},
+                                                                const void *                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dedicatedAllocation( dedicatedAllocation_ )
     {
     }
 
@@ -33007,27 +22110,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DedicatedAllocationBufferCreateInfoNV & operator=( DedicatedAllocationBufferCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DedicatedAllocationBufferCreateInfoNV & operator=( VkDedicatedAllocationBufferCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DedicatedAllocationBufferCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DedicatedAllocationBufferCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationBufferCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationBufferCreateInfoNV & setDedicatedAllocation( Bool32 dedicatedAllocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationBufferCreateInfoNV &
+      setDedicatedAllocation( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocation_ ) VULKAN_HPP_NOEXCEPT
     {
       dedicatedAllocation = dedicatedAllocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDedicatedAllocationBufferCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33039,18 +22143,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDedicatedAllocationBufferCreateInfoNV *>( this );
     }
 
-    operator VkDedicatedAllocationBufferCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDedicatedAllocationBufferCreateInfoNV *>( this );
-    }
-
-    operator VkDedicatedAllocationBufferCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDedicatedAllocationBufferCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dedicatedAllocation );
     }
@@ -33075,27 +22174,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eDedicatedAllocationBufferCreateInfoNV;
-    const void *  pNext               = {};
-    Bool32        dedicatedAllocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eDedicatedAllocationBufferCreateInfoNV;
+    const void *                        pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dedicatedAllocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDedicatedAllocationBufferCreateInfoNV>
-  {
-    using Type = DedicatedAllocationBufferCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDedicatedAllocationBufferCreateInfoNV>
   {
     using Type = DedicatedAllocationBufferCreateInfoNV;
   };
 
-  // wrapper struct for struct VkDedicatedAllocationImageCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDedicatedAllocationImageCreateInfoNV.html
   struct DedicatedAllocationImageCreateInfoNV
   {
     using NativeType = VkDedicatedAllocationImageCreateInfoNV;
@@ -33103,10 +22192,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDedicatedAllocationImageCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DedicatedAllocationImageCreateInfoNV( Bool32 dedicatedAllocation_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dedicatedAllocation{ dedicatedAllocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DedicatedAllocationImageCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocation_ = {},
+                                                               const void *                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dedicatedAllocation( dedicatedAllocation_ )
     {
     }
 
@@ -33118,27 +22208,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DedicatedAllocationImageCreateInfoNV & operator=( DedicatedAllocationImageCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DedicatedAllocationImageCreateInfoNV & operator=( VkDedicatedAllocationImageCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DedicatedAllocationImageCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DedicatedAllocationImageCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationImageCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationImageCreateInfoNV & setDedicatedAllocation( Bool32 dedicatedAllocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationImageCreateInfoNV &
+      setDedicatedAllocation( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocation_ ) VULKAN_HPP_NOEXCEPT
     {
       dedicatedAllocation = dedicatedAllocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDedicatedAllocationImageCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33150,18 +22241,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDedicatedAllocationImageCreateInfoNV *>( this );
     }
 
-    operator VkDedicatedAllocationImageCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDedicatedAllocationImageCreateInfoNV *>( this );
-    }
-
-    operator VkDedicatedAllocationImageCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDedicatedAllocationImageCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dedicatedAllocation );
     }
@@ -33186,27 +22272,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eDedicatedAllocationImageCreateInfoNV;
-    const void *  pNext               = {};
-    Bool32        dedicatedAllocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eDedicatedAllocationImageCreateInfoNV;
+    const void *                        pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dedicatedAllocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDedicatedAllocationImageCreateInfoNV>
-  {
-    using Type = DedicatedAllocationImageCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDedicatedAllocationImageCreateInfoNV>
   {
     using Type = DedicatedAllocationImageCreateInfoNV;
   };
 
-  // wrapper struct for struct VkDedicatedAllocationMemoryAllocateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDedicatedAllocationMemoryAllocateInfoNV.html
   struct DedicatedAllocationMemoryAllocateInfoNV
   {
     using NativeType = VkDedicatedAllocationMemoryAllocateInfoNV;
@@ -33214,11 +22290,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDedicatedAllocationMemoryAllocateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DedicatedAllocationMemoryAllocateInfoNV( Image image_ = {}, Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DedicatedAllocationMemoryAllocateInfoNV( VULKAN_HPP_NAMESPACE::Image  image_  = {},
+                                                                  VULKAN_HPP_NAMESPACE::Buffer buffer_ = {},
+                                                                  const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -33230,33 +22308,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DedicatedAllocationMemoryAllocateInfoNV & operator=( DedicatedAllocationMemoryAllocateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DedicatedAllocationMemoryAllocateInfoNV & operator=( VkDedicatedAllocationMemoryAllocateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DedicatedAllocationMemoryAllocateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DedicatedAllocationMemoryAllocateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationMemoryAllocateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationMemoryAllocateInfoNV & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationMemoryAllocateInfoNV & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationMemoryAllocateInfoNV & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DedicatedAllocationMemoryAllocateInfoNV & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDedicatedAllocationMemoryAllocateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33268,18 +22346,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDedicatedAllocationMemoryAllocateInfoNV *>( this );
     }
 
-    operator VkDedicatedAllocationMemoryAllocateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDedicatedAllocationMemoryAllocateInfoNV *>( this );
-    }
-
-    operator VkDedicatedAllocationMemoryAllocateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDedicatedAllocationMemoryAllocateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, buffer );
     }
@@ -33304,27 +22377,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eDedicatedAllocationMemoryAllocateInfoNV;
-    const void *  pNext  = {};
-    Image         image  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eDedicatedAllocationMemoryAllocateInfoNV;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Image         image  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDedicatedAllocationMemoryAllocateInfoNV>
-  {
-    using Type = DedicatedAllocationMemoryAllocateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDedicatedAllocationMemoryAllocateInfoNV>
   {
     using Type = DedicatedAllocationMemoryAllocateInfoNV;
   };
 
-  // wrapper struct for struct VkMemoryBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryBarrier2.html
   struct MemoryBarrier2
   {
     using NativeType = VkMemoryBarrier2;
@@ -33332,17 +22396,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryBarrier2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryBarrier2( PipelineStageFlags2 srcStageMask_  = {},
-                                         AccessFlags2        srcAccessMask_ = {},
-                                         PipelineStageFlags2 dstStageMask_  = {},
-                                         AccessFlags2        dstAccessMask_ = {},
-                                         const void *        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcStageMask{ srcStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , dstAccessMask{ dstAccessMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryBarrier2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask_  = {},
+                                         VULKAN_HPP_NAMESPACE::AccessFlags2        srcAccessMask_ = {},
+                                         VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask_  = {},
+                                         VULKAN_HPP_NAMESPACE::AccessFlags2        dstAccessMask_ = {},
+                                         const void *                              pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcStageMask( srcStageMask_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstStageMask( dstStageMask_ )
+      , dstAccessMask( dstAccessMask_ )
     {
     }
 
@@ -33351,45 +22415,45 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryBarrier2( VkMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryBarrier2( *reinterpret_cast<MemoryBarrier2 const *>( &rhs ) ) {}
 
     MemoryBarrier2 & operator=( MemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryBarrier2 & operator=( VkMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryBarrier2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryBarrier2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setSrcStageMask( PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setSrcStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcStageMask = srcStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setSrcAccessMask( AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setDstStageMask( PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setDstStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstStageMask = dstStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setDstAccessMask( AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier2 & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryBarrier2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33401,19 +22465,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryBarrier2 *>( this );
     }
 
-    operator VkMemoryBarrier2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryBarrier2 *>( this );
-    }
-
-    operator VkMemoryBarrier2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryBarrier2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, PipelineStageFlags2 const &, AccessFlags2 const &, PipelineStageFlags2 const &, AccessFlags2 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcStageMask, srcAccessMask, dstStageMask, dstAccessMask );
@@ -33440,22 +22502,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType         = StructureType::eMemoryBarrier2;
-    const void *        pNext         = {};
-    PipelineStageFlags2 srcStageMask  = {};
-    AccessFlags2        srcAccessMask = {};
-    PipelineStageFlags2 dstStageMask  = {};
-    AccessFlags2        dstAccessMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType         = StructureType::eMemoryBarrier2;
+    const void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask  = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2        srcAccessMask = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask  = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2        dstAccessMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryBarrier2>
-  {
-    using Type = MemoryBarrier2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryBarrier2>
   {
@@ -33464,22 +22518,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryBarrier2KHR = MemoryBarrier2;
 
-  // wrapper struct for struct VkImageSubresourceRange, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSubresourceRange.html
   struct ImageSubresourceRange
   {
     using NativeType = VkImageSubresourceRange;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSubresourceRange( ImageAspectFlags aspectMask_     = {},
-                                                uint32_t         baseMipLevel_   = {},
-                                                uint32_t         levelCount_     = {},
-                                                uint32_t         baseArrayLayer_ = {},
-                                                uint32_t         layerCount_     = {} ) VULKAN_HPP_NOEXCEPT
-      : aspectMask{ aspectMask_ }
-      , baseMipLevel{ baseMipLevel_ }
-      , levelCount{ levelCount_ }
-      , baseArrayLayer{ baseArrayLayer_ }
-      , layerCount{ layerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageSubresourceRange( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_     = {},
+                                                uint32_t                               baseMipLevel_   = {},
+                                                uint32_t                               levelCount_     = {},
+                                                uint32_t                               baseArrayLayer_ = {},
+                                                uint32_t                               layerCount_     = {} ) VULKAN_HPP_NOEXCEPT
+      : aspectMask( aspectMask_ )
+      , baseMipLevel( baseMipLevel_ )
+      , levelCount( levelCount_ )
+      , baseArrayLayer( baseArrayLayer_ )
+      , layerCount( layerCount_ )
     {
     }
 
@@ -33491,16 +22544,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageSubresourceRange & operator=( ImageSubresourceRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageSubresourceRange & operator=( VkImageSubresourceRange const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageSubresourceRange const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSubresourceRange const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageSubresourceRange & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageSubresourceRange & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
@@ -33529,7 +22582,7 @@ namespace VULKAN_HPP_NAMESPACE
       layerCount = layerCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageSubresourceRange const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33541,18 +22594,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageSubresourceRange *>( this );
     }
 
-    operator VkImageSubresourceRange const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSubresourceRange *>( this );
-    }
-
-    operator VkImageSubresourceRange *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSubresourceRange *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageAspectFlags const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageAspectFlags const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( aspectMask, baseMipLevel, levelCount, baseArrayLayer, layerCount );
     }
@@ -33578,22 +22626,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageAspectFlags aspectMask     = {};
-    uint32_t         baseMipLevel   = {};
-    uint32_t         levelCount     = {};
-    uint32_t         baseArrayLayer = {};
-    uint32_t         layerCount     = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask     = {};
+    uint32_t                               baseMipLevel   = {};
+    uint32_t                               levelCount     = {};
+    uint32_t                               baseArrayLayer = {};
+    uint32_t                               layerCount     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSubresourceRange>
-  {
-    using Type = ImageSubresourceRange;
-  };
-#endif
-
-  // wrapper struct for struct VkImageMemoryBarrier2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageMemoryBarrier2.html
   struct ImageMemoryBarrier2
   {
     using NativeType = VkImageMemoryBarrier2;
@@ -33601,29 +22640,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageMemoryBarrier2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageMemoryBarrier2( PipelineStageFlags2   srcStageMask_        = {},
-                                              AccessFlags2          srcAccessMask_       = {},
-                                              PipelineStageFlags2   dstStageMask_        = {},
-                                              AccessFlags2          dstAccessMask_       = {},
-                                              ImageLayout           oldLayout_           = ImageLayout::eUndefined,
-                                              ImageLayout           newLayout_           = ImageLayout::eUndefined,
-                                              uint32_t              srcQueueFamilyIndex_ = {},
-                                              uint32_t              dstQueueFamilyIndex_ = {},
-                                              Image                 image_               = {},
-                                              ImageSubresourceRange subresourceRange_    = {},
-                                              const void *          pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcStageMask{ srcStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , oldLayout{ oldLayout_ }
-      , newLayout{ newLayout_ }
-      , srcQueueFamilyIndex{ srcQueueFamilyIndex_ }
-      , dstQueueFamilyIndex{ dstQueueFamilyIndex_ }
-      , image{ image_ }
-      , subresourceRange{ subresourceRange_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageMemoryBarrier2( VULKAN_HPP_NAMESPACE::PipelineStageFlags2   srcStageMask_        = {},
+                                              VULKAN_HPP_NAMESPACE::AccessFlags2          srcAccessMask_       = {},
+                                              VULKAN_HPP_NAMESPACE::PipelineStageFlags2   dstStageMask_        = {},
+                                              VULKAN_HPP_NAMESPACE::AccessFlags2          dstAccessMask_       = {},
+                                              VULKAN_HPP_NAMESPACE::ImageLayout           oldLayout_           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                              VULKAN_HPP_NAMESPACE::ImageLayout           newLayout_           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                              uint32_t                                    srcQueueFamilyIndex_ = {},
+                                              uint32_t                                    dstQueueFamilyIndex_ = {},
+                                              VULKAN_HPP_NAMESPACE::Image                 image_               = {},
+                                              VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange_    = {},
+                                              const void *                                pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcStageMask( srcStageMask_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstStageMask( dstStageMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , oldLayout( oldLayout_ )
+      , newLayout( newLayout_ )
+      , srcQueueFamilyIndex( srcQueueFamilyIndex_ )
+      , dstQueueFamilyIndex( dstQueueFamilyIndex_ )
+      , image( image_ )
+      , subresourceRange( subresourceRange_ )
     {
     }
 
@@ -33634,52 +22673,52 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageMemoryBarrier2 & operator=( ImageMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageMemoryBarrier2 & operator=( VkImageMemoryBarrier2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageMemoryBarrier2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setSrcStageMask( PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setSrcStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcStageMask = srcStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setSrcAccessMask( AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setDstStageMask( PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setDstStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstStageMask = dstStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setDstAccessMask( AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setOldLayout( ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setOldLayout( VULKAN_HPP_NAMESPACE::ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       oldLayout = oldLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setNewLayout( ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setNewLayout( VULKAN_HPP_NAMESPACE::ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       newLayout = newLayout_;
       return *this;
@@ -33697,18 +22736,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 & setSubresourceRange( ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier2 &
+      setSubresourceRange( VULKAN_HPP_NAMESPACE::ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
     {
       subresourceRange = subresourceRange_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageMemoryBarrier2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33720,29 +22760,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageMemoryBarrier2 *>( this );
     }
 
-    operator VkImageMemoryBarrier2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageMemoryBarrier2 *>( this );
-    }
-
-    operator VkImageMemoryBarrier2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageMemoryBarrier2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
-               ImageLayout const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags2 const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
                uint32_t const &,
-               Image const &,
-               ImageSubresourceRange const &>
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceRange const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -33782,28 +22816,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType               = StructureType::eImageMemoryBarrier2;
-    const void *          pNext               = {};
-    PipelineStageFlags2   srcStageMask        = {};
-    AccessFlags2          srcAccessMask       = {};
-    PipelineStageFlags2   dstStageMask        = {};
-    AccessFlags2          dstAccessMask       = {};
-    ImageLayout           oldLayout           = ImageLayout::eUndefined;
-    ImageLayout           newLayout           = ImageLayout::eUndefined;
-    uint32_t              srcQueueFamilyIndex = {};
-    uint32_t              dstQueueFamilyIndex = {};
-    Image                 image               = {};
-    ImageSubresourceRange subresourceRange    = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType               = StructureType::eImageMemoryBarrier2;
+    const void *                                pNext               = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2   srcStageMask        = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2          srcAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2   dstStageMask        = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags2          dstAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           oldLayout           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout           newLayout           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                    srcQueueFamilyIndex = {};
+    uint32_t                                    dstQueueFamilyIndex = {};
+    VULKAN_HPP_NAMESPACE::Image                 image               = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageMemoryBarrier2>
-  {
-    using Type = ImageMemoryBarrier2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageMemoryBarrier2>
   {
@@ -33812,7 +22838,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageMemoryBarrier2KHR = ImageMemoryBarrier2;
 
-  // wrapper struct for struct VkDependencyInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDependencyInfo.html
   struct DependencyInfo
   {
     using NativeType = VkDependencyInfo;
@@ -33820,23 +22845,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDependencyInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DependencyInfo( DependencyFlags              dependencyFlags_          = {},
-                                         uint32_t                     memoryBarrierCount_       = {},
-                                         const MemoryBarrier2 *       pMemoryBarriers_          = {},
-                                         uint32_t                     bufferMemoryBarrierCount_ = {},
-                                         const BufferMemoryBarrier2 * pBufferMemoryBarriers_    = {},
-                                         uint32_t                     imageMemoryBarrierCount_  = {},
-                                         const ImageMemoryBarrier2 *  pImageMemoryBarriers_     = {},
-                                         const void *                 pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dependencyFlags{ dependencyFlags_ }
-      , memoryBarrierCount{ memoryBarrierCount_ }
-      , pMemoryBarriers{ pMemoryBarriers_ }
-      , bufferMemoryBarrierCount{ bufferMemoryBarrierCount_ }
-      , pBufferMemoryBarriers{ pBufferMemoryBarriers_ }
-      , imageMemoryBarrierCount{ imageMemoryBarrierCount_ }
-      , pImageMemoryBarriers{ pImageMemoryBarriers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DependencyInfo( VULKAN_HPP_NAMESPACE::DependencyFlags              dependencyFlags_          = {},
+                                         uint32_t                                           memoryBarrierCount_       = {},
+                                         const VULKAN_HPP_NAMESPACE::MemoryBarrier2 *       pMemoryBarriers_          = {},
+                                         uint32_t                                           bufferMemoryBarrierCount_ = {},
+                                         const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2 * pBufferMemoryBarriers_    = {},
+                                         uint32_t                                           imageMemoryBarrierCount_  = {},
+                                         const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2 *  pImageMemoryBarriers_     = {},
+                                         const void *                                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dependencyFlags( dependencyFlags_ )
+      , memoryBarrierCount( memoryBarrierCount_ )
+      , pMemoryBarriers( pMemoryBarriers_ )
+      , bufferMemoryBarrierCount( bufferMemoryBarrierCount_ )
+      , pBufferMemoryBarriers( pBufferMemoryBarriers_ )
+      , imageMemoryBarrierCount( imageMemoryBarrierCount_ )
+      , pImageMemoryBarriers( pImageMemoryBarriers_ )
     {
     }
 
@@ -33845,11 +22870,11 @@ namespace VULKAN_HPP_NAMESPACE
     DependencyInfo( VkDependencyInfo const & rhs ) VULKAN_HPP_NOEXCEPT : DependencyInfo( *reinterpret_cast<DependencyInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DependencyInfo( DependencyFlags                                             dependencyFlags_,
-                    ArrayProxyNoTemporaries<const MemoryBarrier2> const &       memoryBarriers_,
-                    ArrayProxyNoTemporaries<const BufferMemoryBarrier2> const & bufferMemoryBarriers_ = {},
-                    ArrayProxyNoTemporaries<const ImageMemoryBarrier2> const &  imageMemoryBarriers_  = {},
-                    const void *                                                pNext_                = nullptr )
+    DependencyInfo( VULKAN_HPP_NAMESPACE::DependencyFlags                                                                   dependencyFlags_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MemoryBarrier2> const &       memoryBarriers_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2> const & bufferMemoryBarriers_ = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2> const &  imageMemoryBarriers_  = {},
+                    const void *                                                                                            pNext_                = nullptr )
       : pNext( pNext_ )
       , dependencyFlags( dependencyFlags_ )
       , memoryBarrierCount( static_cast<uint32_t>( memoryBarriers_.size() ) )
@@ -33863,22 +22888,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DependencyInfo & operator=( DependencyInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DependencyInfo & operator=( VkDependencyInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DependencyInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DependencyInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setDependencyFlags( DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setDependencyFlags( VULKAN_HPP_NAMESPACE::DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyFlags = dependencyFlags_;
       return *this;
@@ -33890,14 +22915,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setPMemoryBarriers( const MemoryBarrier2 * pMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setPMemoryBarriers( const VULKAN_HPP_NAMESPACE::MemoryBarrier2 * pMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       pMemoryBarriers = pMemoryBarriers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DependencyInfo & setMemoryBarriers( ArrayProxyNoTemporaries<const MemoryBarrier2> const & memoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    DependencyInfo &
+      setMemoryBarriers( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MemoryBarrier2> const & memoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryBarrierCount = static_cast<uint32_t>( memoryBarriers_.size() );
       pMemoryBarriers    = memoryBarriers_.data();
@@ -33911,14 +22937,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setPBufferMemoryBarriers( const BufferMemoryBarrier2 * pBufferMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DependencyInfo &
+      setPBufferMemoryBarriers( const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2 * pBufferMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       pBufferMemoryBarriers = pBufferMemoryBarriers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DependencyInfo & setBufferMemoryBarriers( ArrayProxyNoTemporaries<const BufferMemoryBarrier2> const & bufferMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    DependencyInfo & setBufferMemoryBarriers(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2> const & bufferMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferMemoryBarrierCount = static_cast<uint32_t>( bufferMemoryBarriers_.size() );
       pBufferMemoryBarriers    = bufferMemoryBarriers_.data();
@@ -33932,21 +22960,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DependencyInfo & setPImageMemoryBarriers( const ImageMemoryBarrier2 * pImageMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DependencyInfo &
+      setPImageMemoryBarriers( const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2 * pImageMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       pImageMemoryBarriers = pImageMemoryBarriers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DependencyInfo & setImageMemoryBarriers( ArrayProxyNoTemporaries<const ImageMemoryBarrier2> const & imageMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
+    DependencyInfo & setImageMemoryBarriers(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2> const & imageMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
     {
       imageMemoryBarrierCount = static_cast<uint32_t>( imageMemoryBarriers_.size() );
       pImageMemoryBarriers    = imageMemoryBarriers_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDependencyInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -33958,26 +22988,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDependencyInfo *>( this );
     }
 
-    operator VkDependencyInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDependencyInfo *>( this );
-    }
-
-    operator VkDependencyInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDependencyInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DependencyFlags const &,
+               VULKAN_HPP_NAMESPACE::DependencyFlags const &,
                uint32_t const &,
-               const MemoryBarrier2 * const &,
+               const VULKAN_HPP_NAMESPACE::MemoryBarrier2 * const &,
                uint32_t const &,
-               const BufferMemoryBarrier2 * const &,
+               const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2 * const &,
                uint32_t const &,
-               const ImageMemoryBarrier2 * const &>
+               const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -34014,25 +23038,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                    = StructureType::eDependencyInfo;
-    const void *                 pNext                    = {};
-    DependencyFlags              dependencyFlags          = {};
-    uint32_t                     memoryBarrierCount       = {};
-    const MemoryBarrier2 *       pMemoryBarriers          = {};
-    uint32_t                     bufferMemoryBarrierCount = {};
-    const BufferMemoryBarrier2 * pBufferMemoryBarriers    = {};
-    uint32_t                     imageMemoryBarrierCount  = {};
-    const ImageMemoryBarrier2 *  pImageMemoryBarriers     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                    = StructureType::eDependencyInfo;
+    const void *                                       pNext                    = {};
+    VULKAN_HPP_NAMESPACE::DependencyFlags              dependencyFlags          = {};
+    uint32_t                                           memoryBarrierCount       = {};
+    const VULKAN_HPP_NAMESPACE::MemoryBarrier2 *       pMemoryBarriers          = {};
+    uint32_t                                           bufferMemoryBarrierCount = {};
+    const VULKAN_HPP_NAMESPACE::BufferMemoryBarrier2 * pBufferMemoryBarriers    = {};
+    uint32_t                                           imageMemoryBarrierCount  = {};
+    const VULKAN_HPP_NAMESPACE::ImageMemoryBarrier2 *  pImageMemoryBarriers     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDependencyInfo>
-  {
-    using Type = DependencyInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDependencyInfo>
   {
@@ -34041,7 +23057,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DependencyInfoKHR = DependencyInfo;
 
-  // wrapper struct for struct VkDepthBiasInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDepthBiasInfoEXT.html
   struct DepthBiasInfoEXT
   {
     using NativeType = VkDepthBiasInfoEXT;
@@ -34049,15 +23064,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDepthBiasInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DepthBiasInfoEXT( float        depthBiasConstantFactor_ = {},
                                            float        depthBiasClamp_          = {},
                                            float        depthBiasSlopeFactor_    = {},
                                            const void * pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthBiasConstantFactor{ depthBiasConstantFactor_ }
-      , depthBiasClamp{ depthBiasClamp_ }
-      , depthBiasSlopeFactor{ depthBiasSlopeFactor_ }
+      : pNext( pNext_ )
+      , depthBiasConstantFactor( depthBiasConstantFactor_ )
+      , depthBiasClamp( depthBiasClamp_ )
+      , depthBiasSlopeFactor( depthBiasSlopeFactor_ )
     {
     }
 
@@ -34066,15 +23081,15 @@ namespace VULKAN_HPP_NAMESPACE
     DepthBiasInfoEXT( VkDepthBiasInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT : DepthBiasInfoEXT( *reinterpret_cast<DepthBiasInfoEXT const *>( &rhs ) ) {}
 
     DepthBiasInfoEXT & operator=( DepthBiasInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DepthBiasInfoEXT & operator=( VkDepthBiasInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DepthBiasInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DepthBiasInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DepthBiasInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -34098,7 +23113,7 @@ namespace VULKAN_HPP_NAMESPACE
       depthBiasSlopeFactor = depthBiasSlopeFactor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDepthBiasInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34110,18 +23125,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDepthBiasInfoEXT *>( this );
     }
 
-    operator VkDepthBiasInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDepthBiasInfoEXT *>( this );
-    }
-
-    operator VkDepthBiasInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDepthBiasInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, float const &, float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, float const &, float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor );
     }
@@ -34147,29 +23157,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::eDepthBiasInfoEXT;
-    const void *  pNext                   = {};
-    float         depthBiasConstantFactor = {};
-    float         depthBiasClamp          = {};
-    float         depthBiasSlopeFactor    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::eDepthBiasInfoEXT;
+    const void *                        pNext                   = {};
+    float                               depthBiasConstantFactor = {};
+    float                               depthBiasClamp          = {};
+    float                               depthBiasSlopeFactor    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDepthBiasInfoEXT>
-  {
-    using Type = DepthBiasInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDepthBiasInfoEXT>
   {
     using Type = DepthBiasInfoEXT;
   };
 
-  // wrapper struct for struct VkDepthBiasRepresentationInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDepthBiasRepresentationInfoEXT.html
   struct DepthBiasRepresentationInfoEXT
   {
     using NativeType = VkDepthBiasRepresentationInfoEXT;
@@ -34177,14 +23177,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDepthBiasRepresentationInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DepthBiasRepresentationInfoEXT( DepthBiasRepresentationEXT depthBiasRepresentation_ = DepthBiasRepresentationEXT::eLeastRepresentableValueFormat,
-                                      Bool32                     depthBiasExact_          = {},
-                                      const void *               pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthBiasRepresentation{ depthBiasRepresentation_ }
-      , depthBiasExact{ depthBiasExact_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DepthBiasRepresentationInfoEXT( VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT depthBiasRepresentation_ =
+                                                           VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT::eLeastRepresentableValueFormat,
+                                                         VULKAN_HPP_NAMESPACE::Bool32 depthBiasExact_ = {},
+                                                         const void *                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthBiasRepresentation( depthBiasRepresentation_ )
+      , depthBiasExact( depthBiasExact_ )
     {
     }
 
@@ -34196,15 +23196,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DepthBiasRepresentationInfoEXT & operator=( DepthBiasRepresentationInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DepthBiasRepresentationInfoEXT & operator=( VkDepthBiasRepresentationInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DepthBiasRepresentationInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DepthBiasRepresentationInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DepthBiasRepresentationInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -34212,18 +23212,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 DepthBiasRepresentationInfoEXT &
-      setDepthBiasRepresentation( DepthBiasRepresentationEXT depthBiasRepresentation_ ) VULKAN_HPP_NOEXCEPT
+      setDepthBiasRepresentation( VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT depthBiasRepresentation_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasRepresentation = depthBiasRepresentation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DepthBiasRepresentationInfoEXT & setDepthBiasExact( Bool32 depthBiasExact_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DepthBiasRepresentationInfoEXT & setDepthBiasExact( VULKAN_HPP_NAMESPACE::Bool32 depthBiasExact_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasExact = depthBiasExact_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDepthBiasRepresentationInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34235,18 +23235,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDepthBiasRepresentationInfoEXT *>( this );
     }
 
-    operator VkDepthBiasRepresentationInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDepthBiasRepresentationInfoEXT *>( this );
-    }
-
-    operator VkDepthBiasRepresentationInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDepthBiasRepresentationInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DepthBiasRepresentationEXT const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthBiasRepresentation, depthBiasExact );
     }
@@ -34272,124 +23270,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                   = StructureType::eDepthBiasRepresentationInfoEXT;
-    const void *               pNext                   = {};
-    DepthBiasRepresentationEXT depthBiasRepresentation = DepthBiasRepresentationEXT::eLeastRepresentableValueFormat;
-    Bool32                     depthBiasExact          = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                   = StructureType::eDepthBiasRepresentationInfoEXT;
+    const void *                                     pNext                   = {};
+    VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT depthBiasRepresentation = VULKAN_HPP_NAMESPACE::DepthBiasRepresentationEXT::eLeastRepresentableValueFormat;
+    VULKAN_HPP_NAMESPACE::Bool32                     depthBiasExact          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDepthBiasRepresentationInfoEXT>
-  {
-    using Type = DepthBiasRepresentationInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDepthBiasRepresentationInfoEXT>
   {
     using Type = DepthBiasRepresentationInfoEXT;
   };
 
-  // wrapper struct for struct VkDepthClampRangeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDepthClampRangeEXT.html
-  struct DepthClampRangeEXT
-  {
-    using NativeType = VkDepthClampRangeEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DepthClampRangeEXT( float minDepthClamp_ = {}, float maxDepthClamp_ = {} ) VULKAN_HPP_NOEXCEPT
-      : minDepthClamp{ minDepthClamp_ }
-      , maxDepthClamp{ maxDepthClamp_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DepthClampRangeEXT( DepthClampRangeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DepthClampRangeEXT( VkDepthClampRangeEXT const & rhs ) VULKAN_HPP_NOEXCEPT : DepthClampRangeEXT( *reinterpret_cast<DepthClampRangeEXT const *>( &rhs ) ) {}
-
-    DepthClampRangeEXT & operator=( DepthClampRangeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DepthClampRangeEXT & operator=( VkDepthClampRangeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DepthClampRangeEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DepthClampRangeEXT & setMinDepthClamp( float minDepthClamp_ ) VULKAN_HPP_NOEXCEPT
-    {
-      minDepthClamp = minDepthClamp_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DepthClampRangeEXT & setMaxDepthClamp( float maxDepthClamp_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxDepthClamp = maxDepthClamp_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDepthClampRangeEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDepthClampRangeEXT *>( this );
-    }
-
-    operator VkDepthClampRangeEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDepthClampRangeEXT *>( this );
-    }
-
-    operator VkDepthClampRangeEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDepthClampRangeEXT *>( this );
-    }
-
-    operator VkDepthClampRangeEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDepthClampRangeEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( minDepthClamp, maxDepthClamp );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DepthClampRangeEXT const & ) const = default;
-#else
-    bool operator==( DepthClampRangeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( minDepthClamp == rhs.minDepthClamp ) && ( maxDepthClamp == rhs.maxDepthClamp );
-#  endif
-    }
-
-    bool operator!=( DepthClampRangeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    float minDepthClamp = {};
-    float maxDepthClamp = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDepthClampRangeEXT>
-  {
-    using Type = DepthClampRangeEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDescriptorAddressInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorAddressInfoEXT.html
   struct DescriptorAddressInfoEXT
   {
     using NativeType = VkDescriptorAddressInfoEXT;
@@ -34397,15 +23289,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorAddressInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorAddressInfoEXT( DeviceAddress address_ = {},
-                                                   DeviceSize    range_   = {},
-                                                   Format        format_  = Format::eUndefined,
-                                                   void *        pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , address{ address_ }
-      , range{ range_ }
-      , format{ format_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorAddressInfoEXT( VULKAN_HPP_NAMESPACE::DeviceAddress address_ = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceSize    range_   = {},
+                                                   VULKAN_HPP_NAMESPACE::Format        format_  = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                   void *                              pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , address( address_ )
+      , range( range_ )
+      , format( format_ )
     {
     }
 
@@ -34417,39 +23309,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorAddressInfoEXT & operator=( DescriptorAddressInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorAddressInfoEXT & operator=( VkDescriptorAddressInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorAddressInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setAddress( DeviceAddress address_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setAddress( VULKAN_HPP_NAMESPACE::DeviceAddress address_ ) VULKAN_HPP_NOEXCEPT
     {
       address = address_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setRange( DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setRange( VULKAN_HPP_NAMESPACE::DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
     {
       range = range_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorAddressInfoEXT & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorAddressInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34461,18 +23353,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorAddressInfoEXT *>( this );
     }
 
-    operator VkDescriptorAddressInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorAddressInfoEXT *>( this );
-    }
-
-    operator VkDescriptorAddressInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorAddressInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceAddress const &, DeviceSize const &, Format const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, address, range, format );
     }
@@ -34497,29 +23388,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType   = StructureType::eDescriptorAddressInfoEXT;
-    void *        pNext   = {};
-    DeviceAddress address = {};
-    DeviceSize    range   = {};
-    Format        format  = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType   = StructureType::eDescriptorAddressInfoEXT;
+    void *                              pNext   = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress address = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    range   = {};
+    VULKAN_HPP_NAMESPACE::Format        format  = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorAddressInfoEXT>
-  {
-    using Type = DescriptorAddressInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorAddressInfoEXT>
   {
     using Type = DescriptorAddressInfoEXT;
   };
 
-  // wrapper struct for struct VkDescriptorBufferBindingInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorBufferBindingInfoEXT.html
   struct DescriptorBufferBindingInfoEXT
   {
     using NativeType = VkDescriptorBufferBindingInfoEXT;
@@ -34527,12 +23408,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorBufferBindingInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DescriptorBufferBindingInfoEXT( DeviceAddress address_ = {}, BufferUsageFlags usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , address{ address_ }
-      , usage{ usage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorBufferBindingInfoEXT( VULKAN_HPP_NAMESPACE::DeviceAddress    address_ = {},
+                                                         VULKAN_HPP_NAMESPACE::BufferUsageFlags usage_   = {},
+                                                         void *                                 pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , address( address_ )
+      , usage( usage_ )
     {
     }
 
@@ -34544,33 +23426,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorBufferBindingInfoEXT & operator=( DescriptorBufferBindingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorBufferBindingInfoEXT & operator=( VkDescriptorBufferBindingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorBufferBindingInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorBufferBindingInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setAddress( DeviceAddress address_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setAddress( VULKAN_HPP_NAMESPACE::DeviceAddress address_ ) VULKAN_HPP_NOEXCEPT
     {
       address = address_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setUsage( BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingInfoEXT & setUsage( VULKAN_HPP_NAMESPACE::BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorBufferBindingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34582,18 +23464,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorBufferBindingInfoEXT *>( this );
     }
 
-    operator VkDescriptorBufferBindingInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorBufferBindingInfoEXT *>( this );
-    }
-
-    operator VkDescriptorBufferBindingInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorBufferBindingInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceAddress const &, BufferUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::BufferUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, address, usage );
     }
@@ -34618,28 +23498,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType   = StructureType::eDescriptorBufferBindingInfoEXT;
-    const void *     pNext   = {};
-    DeviceAddress    address = {};
-    BufferUsageFlags usage   = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType   = StructureType::eDescriptorBufferBindingInfoEXT;
+    void *                                 pNext   = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress    address = {};
+    VULKAN_HPP_NAMESPACE::BufferUsageFlags usage   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorBufferBindingInfoEXT>
-  {
-    using Type = DescriptorBufferBindingInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorBufferBindingInfoEXT>
   {
     using Type = DescriptorBufferBindingInfoEXT;
   };
 
-  // wrapper struct for struct VkDescriptorBufferBindingPushDescriptorBufferHandleEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorBufferBindingPushDescriptorBufferHandleEXT.html
   struct DescriptorBufferBindingPushDescriptorBufferHandleEXT
   {
     using NativeType = VkDescriptorBufferBindingPushDescriptorBufferHandleEXT;
@@ -34647,10 +23517,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorBufferBindingPushDescriptorBufferHandleEXT( Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorBufferBindingPushDescriptorBufferHandleEXT( VULKAN_HPP_NAMESPACE::Buffer buffer_ = {},
+                                                                               void *                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -34664,27 +23535,27 @@ namespace VULKAN_HPP_NAMESPACE
 
     DescriptorBufferBindingPushDescriptorBufferHandleEXT &
       operator=( DescriptorBufferBindingPushDescriptorBufferHandleEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorBufferBindingPushDescriptorBufferHandleEXT & operator=( VkDescriptorBufferBindingPushDescriptorBufferHandleEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorBufferBindingPushDescriptorBufferHandleEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorBufferBindingPushDescriptorBufferHandleEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingPushDescriptorBufferHandleEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingPushDescriptorBufferHandleEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingPushDescriptorBufferHandleEXT & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferBindingPushDescriptorBufferHandleEXT & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorBufferBindingPushDescriptorBufferHandleEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34696,18 +23567,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorBufferBindingPushDescriptorBufferHandleEXT *>( this );
     }
 
-    operator VkDescriptorBufferBindingPushDescriptorBufferHandleEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorBufferBindingPushDescriptorBufferHandleEXT *>( this );
-    }
-
-    operator VkDescriptorBufferBindingPushDescriptorBufferHandleEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorBufferBindingPushDescriptorBufferHandleEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -34732,35 +23598,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT;
-    const void *  pNext  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT;
+    void *                              pNext  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorBufferBindingPushDescriptorBufferHandleEXT>
-  {
-    using Type = DescriptorBufferBindingPushDescriptorBufferHandleEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT>
   {
     using Type = DescriptorBufferBindingPushDescriptorBufferHandleEXT;
   };
 
-  // wrapper struct for struct VkDescriptorBufferInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorBufferInfo.html
   struct DescriptorBufferInfo
   {
     using NativeType = VkDescriptorBufferInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorBufferInfo( Buffer buffer_ = {}, DeviceSize offset_ = {}, DeviceSize range_ = {} ) VULKAN_HPP_NOEXCEPT
-      : buffer{ buffer_ }
-      , offset{ offset_ }
-      , range{ range_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorBufferInfo( VULKAN_HPP_NAMESPACE::Buffer     buffer_ = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize offset_ = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize range_  = {} ) VULKAN_HPP_NOEXCEPT
+      : buffer( buffer_ )
+      , offset( offset_ )
+      , range( range_ )
     {
     }
 
@@ -34772,33 +23631,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorBufferInfo & operator=( DescriptorBufferInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorBufferInfo & operator=( VkDescriptorBufferInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorBufferInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorBufferInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setRange( DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorBufferInfo & setRange( VULKAN_HPP_NAMESPACE::DeviceSize range_ ) VULKAN_HPP_NOEXCEPT
     {
       range = range_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorBufferInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34810,18 +23669,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorBufferInfo *>( this );
     }
 
-    operator VkDescriptorBufferInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorBufferInfo *>( this );
-    }
-
-    operator VkDescriptorBufferInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorBufferInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Buffer const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Buffer const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( buffer, offset, range );
     }
@@ -34846,30 +23700,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Buffer     buffer = {};
-    DeviceSize offset = {};
-    DeviceSize range  = {};
+    VULKAN_HPP_NAMESPACE::Buffer     buffer = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize offset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize range  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorBufferInfo>
-  {
-    using Type = DescriptorBufferInfo;
-  };
-#endif
-
-  // wrapper struct for struct VkDescriptorImageInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorImageInfo.html
   struct DescriptorImageInfo
   {
     using NativeType = VkDescriptorImageInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
-      DescriptorImageInfo( Sampler sampler_ = {}, ImageView imageView_ = {}, ImageLayout imageLayout_ = ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
-      : sampler{ sampler_ }
-      , imageView{ imageView_ }
-      , imageLayout{ imageLayout_ }
+      DescriptorImageInfo( VULKAN_HPP_NAMESPACE::Sampler     sampler_     = {},
+                           VULKAN_HPP_NAMESPACE::ImageView   imageView_   = {},
+                           VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined ) VULKAN_HPP_NOEXCEPT
+      : sampler( sampler_ )
+      , imageView( imageView_ )
+      , imageLayout( imageLayout_ )
     {
     }
 
@@ -34880,33 +23727,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorImageInfo & operator=( DescriptorImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorImageInfo & operator=( VkDescriptorImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorImageInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorImageInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setSampler( Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setSampler( VULKAN_HPP_NAMESPACE::Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
     {
       sampler = sampler_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setImageLayout( ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorImageInfo & setImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       imageLayout = imageLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorImageInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -34918,18 +23765,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorImageInfo *>( this );
     }
 
-    operator VkDescriptorImageInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorImageInfo *>( this );
-    }
-
-    operator VkDescriptorImageInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorImageInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Sampler const &, ImageView const &, ImageLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Sampler const &, VULKAN_HPP_NAMESPACE::ImageView const &, VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sampler, imageView, imageLayout );
     }
@@ -34954,96 +23796,96 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Sampler     sampler     = {};
-    ImageView   imageView   = {};
-    ImageLayout imageLayout = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Sampler     sampler     = {};
+    VULKAN_HPP_NAMESPACE::ImageView   imageView   = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout imageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorImageInfo>
-  {
-    using Type = DescriptorImageInfo;
-  };
-#endif
-
   union DescriptorDataEXT
   {
     using NativeType = VkDescriptorDataEXT;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const Sampler * pSampler_ = {} ) : pSampler( pSampler_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const VULKAN_HPP_NAMESPACE::Sampler * pSampler_ = {} ) : pSampler( pSampler_ ) {}
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const DescriptorImageInfo * pDescriptorImageInfo_ ) : pCombinedImageSampler( pDescriptorImageInfo_ ) {}
-
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const DescriptorAddressInfoEXT * pDescriptorAddressInfoEXT_ ) : pUniformTexelBuffer( pDescriptorAddressInfoEXT_ )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pDescriptorImageInfo_ )
+      : pCombinedImageSampler( pDescriptorImageInfo_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( DeviceAddress accelerationStructure_ ) : accelerationStructure( accelerationStructure_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pDescriptorAddressInfoEXT_ )
+      : pUniformTexelBuffer( pDescriptorAddressInfoEXT_ )
+    {
+    }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPSampler( const Sampler * pSampler_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT( VULKAN_HPP_NAMESPACE::DeviceAddress accelerationStructure_ ) : accelerationStructure( accelerationStructure_ ) {}
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
+
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPSampler( const VULKAN_HPP_NAMESPACE::Sampler * pSampler_ ) VULKAN_HPP_NOEXCEPT
     {
       pSampler = pSampler_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPCombinedImageSampler( const DescriptorImageInfo * pCombinedImageSampler_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT &
+      setPCombinedImageSampler( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pCombinedImageSampler_ ) VULKAN_HPP_NOEXCEPT
     {
       pCombinedImageSampler = pCombinedImageSampler_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPInputAttachmentImage( const DescriptorImageInfo * pInputAttachmentImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT &
+      setPInputAttachmentImage( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pInputAttachmentImage_ ) VULKAN_HPP_NOEXCEPT
     {
       pInputAttachmentImage = pInputAttachmentImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPSampledImage( const DescriptorImageInfo * pSampledImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPSampledImage( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pSampledImage_ ) VULKAN_HPP_NOEXCEPT
     {
       pSampledImage = pSampledImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPStorageImage( const DescriptorImageInfo * pStorageImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPStorageImage( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pStorageImage_ ) VULKAN_HPP_NOEXCEPT
     {
       pStorageImage = pStorageImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPUniformTexelBuffer( const DescriptorAddressInfoEXT * pUniformTexelBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT &
+      setPUniformTexelBuffer( const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pUniformTexelBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       pUniformTexelBuffer = pUniformTexelBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPStorageTexelBuffer( const DescriptorAddressInfoEXT * pStorageTexelBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT &
+      setPStorageTexelBuffer( const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pStorageTexelBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       pStorageTexelBuffer = pStorageTexelBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPUniformBuffer( const DescriptorAddressInfoEXT * pUniformBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPUniformBuffer( const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pUniformBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       pUniformBuffer = pUniformBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPStorageBuffer( const DescriptorAddressInfoEXT * pStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setPStorageBuffer( const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       pStorageBuffer = pStorageBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setAccelerationStructure( DeviceAddress accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorDataEXT & setAccelerationStructure( VULKAN_HPP_NAMESPACE::DeviceAddress accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkDescriptorDataEXT const &() const
     {
@@ -35056,16 +23898,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    const Sampler *                  pSampler;
-    const DescriptorImageInfo *      pCombinedImageSampler;
-    const DescriptorImageInfo *      pInputAttachmentImage;
-    const DescriptorImageInfo *      pSampledImage;
-    const DescriptorImageInfo *      pStorageImage;
-    const DescriptorAddressInfoEXT * pUniformTexelBuffer;
-    const DescriptorAddressInfoEXT * pStorageTexelBuffer;
-    const DescriptorAddressInfoEXT * pUniformBuffer;
-    const DescriptorAddressInfoEXT * pStorageBuffer;
-    DeviceAddress                    accelerationStructure;
+    const VULKAN_HPP_NAMESPACE::Sampler *                  pSampler;
+    const VULKAN_HPP_NAMESPACE::DescriptorImageInfo *      pCombinedImageSampler;
+    const VULKAN_HPP_NAMESPACE::DescriptorImageInfo *      pInputAttachmentImage;
+    const VULKAN_HPP_NAMESPACE::DescriptorImageInfo *      pSampledImage;
+    const VULKAN_HPP_NAMESPACE::DescriptorImageInfo *      pStorageImage;
+    const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pUniformTexelBuffer;
+    const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pStorageTexelBuffer;
+    const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pUniformBuffer;
+    const VULKAN_HPP_NAMESPACE::DescriptorAddressInfoEXT * pStorageBuffer;
+    VULKAN_HPP_NAMESPACE::DeviceAddress                    accelerationStructure;
 #else
     const VkSampler *                  pSampler;
     const VkDescriptorImageInfo *      pCombinedImageSampler;
@@ -35080,15 +23922,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorDataEXT>
-  {
-    using Type = DescriptorDataEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDescriptorGetInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorGetInfoEXT.html
   struct DescriptorGetInfoEXT
   {
     using NativeType = VkDescriptorGetInfoEXT;
@@ -35096,12 +23929,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorGetInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      DescriptorGetInfoEXT( DescriptorType type_ = DescriptorType::eSampler, DescriptorDataEXT data_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , data{ data_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT( VULKAN_HPP_NAMESPACE::DescriptorType    type_  = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                                  VULKAN_HPP_NAMESPACE::DescriptorDataEXT data_  = {},
+                                                  const void *                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , data( data_ )
     {
     }
 
@@ -35113,33 +23947,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorGetInfoEXT & operator=( DescriptorGetInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorGetInfoEXT & operator=( VkDescriptorGetInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorGetInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorGetInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT & setType( DescriptorType type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT & setType( VULKAN_HPP_NAMESPACE::DescriptorType type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT & setData( DescriptorDataEXT const & data_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorGetInfoEXT & setData( VULKAN_HPP_NAMESPACE::DescriptorDataEXT const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorGetInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35151,163 +23985,43 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorGetInfoEXT *>( this );
     }
 
-    operator VkDescriptorGetInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorGetInfoEXT *>( this );
-    }
-
-    operator VkDescriptorGetInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorGetInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DescriptorType const &, DescriptorDataEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DescriptorType const &,
+               VULKAN_HPP_NAMESPACE::DescriptorDataEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, data );
     }
 #endif
 
   public:
-    StructureType     sType = StructureType::eDescriptorGetInfoEXT;
-    const void *      pNext = {};
-    DescriptorType    type  = DescriptorType::eSampler;
-    DescriptorDataEXT data  = {};
+    VULKAN_HPP_NAMESPACE::StructureType     sType = StructureType::eDescriptorGetInfoEXT;
+    const void *                            pNext = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType    type  = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    VULKAN_HPP_NAMESPACE::DescriptorDataEXT data  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorGetInfoEXT>
-  {
-    using Type = DescriptorGetInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorGetInfoEXT>
   {
     using Type = DescriptorGetInfoEXT;
   };
 
-  // wrapper struct for struct VkDescriptorGetTensorInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorGetTensorInfoARM.html
-  struct DescriptorGetTensorInfoARM
-  {
-    using NativeType = VkDescriptorGetTensorInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorGetTensorInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorGetTensorInfoARM( TensorViewARM tensorView_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorView{ tensorView_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DescriptorGetTensorInfoARM( DescriptorGetTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DescriptorGetTensorInfoARM( VkDescriptorGetTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DescriptorGetTensorInfoARM( *reinterpret_cast<DescriptorGetTensorInfoARM const *>( &rhs ) )
-    {
-    }
-
-    DescriptorGetTensorInfoARM & operator=( DescriptorGetTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DescriptorGetTensorInfoARM & operator=( VkDescriptorGetTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DescriptorGetTensorInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorGetTensorInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DescriptorGetTensorInfoARM & setTensorView( TensorViewARM tensorView_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorView = tensorView_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDescriptorGetTensorInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDescriptorGetTensorInfoARM *>( this );
-    }
-
-    operator VkDescriptorGetTensorInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDescriptorGetTensorInfoARM *>( this );
-    }
-
-    operator VkDescriptorGetTensorInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorGetTensorInfoARM *>( this );
-    }
-
-    operator VkDescriptorGetTensorInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorGetTensorInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorViewARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorView );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DescriptorGetTensorInfoARM const & ) const = default;
-#else
-    bool operator==( DescriptorGetTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorView == rhs.tensorView );
-#  endif
-    }
-
-    bool operator!=( DescriptorGetTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::eDescriptorGetTensorInfoARM;
-    const void *  pNext      = {};
-    TensorViewARM tensorView = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorGetTensorInfoARM>
-  {
-    using Type = DescriptorGetTensorInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDescriptorGetTensorInfoARM>
-  {
-    using Type = DescriptorGetTensorInfoARM;
-  };
-
-  // wrapper struct for struct VkDescriptorPoolSize, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolSize.html
   struct DescriptorPoolSize
   {
     using NativeType = VkDescriptorPoolSize;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorPoolSize( DescriptorType type_ = DescriptorType::eSampler, uint32_t descriptorCount_ = {} ) VULKAN_HPP_NOEXCEPT
-      : type{ type_ }
-      , descriptorCount{ descriptorCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorPoolSize( VULKAN_HPP_NAMESPACE::DescriptorType type_            = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                             uint32_t                             descriptorCount_ = {} ) VULKAN_HPP_NOEXCEPT
+      : type( type_ )
+      , descriptorCount( descriptorCount_ )
     {
     }
 
@@ -35316,16 +24030,16 @@ namespace VULKAN_HPP_NAMESPACE
     DescriptorPoolSize( VkDescriptorPoolSize const & rhs ) VULKAN_HPP_NOEXCEPT : DescriptorPoolSize( *reinterpret_cast<DescriptorPoolSize const *>( &rhs ) ) {}
 
     DescriptorPoolSize & operator=( DescriptorPoolSize const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorPoolSize & operator=( VkDescriptorPoolSize const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorPoolSize const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorPoolSize const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolSize & setType( DescriptorType type_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolSize & setType( VULKAN_HPP_NAMESPACE::DescriptorType type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
@@ -35336,7 +24050,7 @@ namespace VULKAN_HPP_NAMESPACE
       descriptorCount = descriptorCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorPoolSize const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35348,18 +24062,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorPoolSize *>( this );
     }
 
-    operator VkDescriptorPoolSize const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorPoolSize *>( this );
-    }
-
-    operator VkDescriptorPoolSize *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorPoolSize *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DescriptorType const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DescriptorType const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( type, descriptorCount );
     }
@@ -35368,7 +24077,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( DescriptorPoolSize const & ) const = default;
 #else
-    bool operator==( DescriptorPoolSize const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool                               operator==( DescriptorPoolSize const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -35384,19 +24093,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DescriptorType type            = DescriptorType::eSampler;
-    uint32_t       descriptorCount = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType type            = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    uint32_t                             descriptorCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorPoolSize>
-  {
-    using Type = DescriptorPoolSize;
-  };
-#endif
-
-  // wrapper struct for struct VkDescriptorPoolCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolCreateInfo.html
   struct DescriptorPoolCreateInfo
   {
     using NativeType = VkDescriptorPoolCreateInfo;
@@ -35404,17 +24104,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorPoolCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorPoolCreateInfo( DescriptorPoolCreateFlags  flags_         = {},
-                                                   uint32_t                   maxSets_       = {},
-                                                   uint32_t                   poolSizeCount_ = {},
-                                                   const DescriptorPoolSize * pPoolSizes_    = {},
-                                                   const void *               pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , maxSets{ maxSets_ }
-      , poolSizeCount{ poolSizeCount_ }
-      , pPoolSizes{ pPoolSizes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorPoolCreateInfo( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateFlags  flags_         = {},
+                                                   uint32_t                                         maxSets_       = {},
+                                                   uint32_t                                         poolSizeCount_ = {},
+                                                   const VULKAN_HPP_NAMESPACE::DescriptorPoolSize * pPoolSizes_    = {},
+                                                   const void *                                     pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , maxSets( maxSets_ )
+      , poolSizeCount( poolSizeCount_ )
+      , pPoolSizes( pPoolSizes_ )
     {
     }
 
@@ -35426,32 +24126,32 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorPoolCreateInfo( DescriptorPoolCreateFlags                                 flags_,
-                              uint32_t                                                  maxSets_,
-                              ArrayProxyNoTemporaries<const DescriptorPoolSize> const & poolSizes_,
-                              const void *                                              pNext_ = nullptr )
+    DescriptorPoolCreateInfo( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateFlags                                                       flags_,
+                              uint32_t                                                                                              maxSets_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorPoolSize> const & poolSizes_,
+                              const void *                                                                                          pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), maxSets( maxSets_ ), poolSizeCount( static_cast<uint32_t>( poolSizes_.size() ) ), pPoolSizes( poolSizes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorPoolCreateInfo & operator=( DescriptorPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorPoolCreateInfo & operator=( VkDescriptorPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorPoolCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorPoolCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorPoolCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolCreateInfo & setFlags( DescriptorPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::DescriptorPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -35469,21 +24169,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolCreateInfo & setPPoolSizes( const DescriptorPoolSize * pPoolSizes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorPoolCreateInfo & setPPoolSizes( const VULKAN_HPP_NAMESPACE::DescriptorPoolSize * pPoolSizes_ ) VULKAN_HPP_NOEXCEPT
     {
       pPoolSizes = pPoolSizes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorPoolCreateInfo & setPoolSizes( ArrayProxyNoTemporaries<const DescriptorPoolSize> const & poolSizes_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorPoolCreateInfo &
+      setPoolSizes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorPoolSize> const & poolSizes_ ) VULKAN_HPP_NOEXCEPT
     {
       poolSizeCount = static_cast<uint32_t>( poolSizes_.size() );
       pPoolSizes    = poolSizes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorPoolCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35495,23 +24196,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorPoolCreateInfo *>( this );
     }
 
-    operator VkDescriptorPoolCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorPoolCreateInfo *>( this );
-    }
-
-    operator VkDescriptorPoolCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorPoolCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DescriptorPoolCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::DescriptorPoolCreateFlags const &,
                uint32_t const &,
                uint32_t const &,
-               const DescriptorPoolSize * const &>
+               const VULKAN_HPP_NAMESPACE::DescriptorPoolSize * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, maxSets, poolSizeCount, pPoolSizes );
@@ -35538,30 +24233,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType         = StructureType::eDescriptorPoolCreateInfo;
-    const void *               pNext         = {};
-    DescriptorPoolCreateFlags  flags         = {};
-    uint32_t                   maxSets       = {};
-    uint32_t                   poolSizeCount = {};
-    const DescriptorPoolSize * pPoolSizes    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType         = StructureType::eDescriptorPoolCreateInfo;
+    const void *                                     pNext         = {};
+    VULKAN_HPP_NAMESPACE::DescriptorPoolCreateFlags  flags         = {};
+    uint32_t                                         maxSets       = {};
+    uint32_t                                         poolSizeCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorPoolSize * pPoolSizes    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorPoolCreateInfo>
-  {
-    using Type = DescriptorPoolCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorPoolCreateInfo>
   {
     using Type = DescriptorPoolCreateInfo;
   };
 
-  // wrapper struct for struct VkDescriptorPoolInlineUniformBlockCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorPoolInlineUniformBlockCreateInfo.html
   struct DescriptorPoolInlineUniformBlockCreateInfo
   {
     using NativeType = VkDescriptorPoolInlineUniformBlockCreateInfo;
@@ -35569,11 +24254,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorPoolInlineUniformBlockCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DescriptorPoolInlineUniformBlockCreateInfo( uint32_t     maxInlineUniformBlockBindings_ = {},
                                                                      const void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxInlineUniformBlockBindings{ maxInlineUniformBlockBindings_ }
+      : pNext( pNext_ )
+      , maxInlineUniformBlockBindings( maxInlineUniformBlockBindings_ )
     {
     }
 
@@ -35585,15 +24270,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorPoolInlineUniformBlockCreateInfo & operator=( DescriptorPoolInlineUniformBlockCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorPoolInlineUniformBlockCreateInfo & operator=( VkDescriptorPoolInlineUniformBlockCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorPoolInlineUniformBlockCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorPoolInlineUniformBlockCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorPoolInlineUniformBlockCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -35606,7 +24291,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxInlineUniformBlockBindings = maxInlineUniformBlockBindings_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorPoolInlineUniformBlockCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35618,18 +24303,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorPoolInlineUniformBlockCreateInfo *>( this );
     }
 
-    operator VkDescriptorPoolInlineUniformBlockCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorPoolInlineUniformBlockCreateInfo *>( this );
-    }
-
-    operator VkDescriptorPoolInlineUniformBlockCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorPoolInlineUniformBlockCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxInlineUniformBlockBindings );
     }
@@ -35654,19 +24334,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::eDescriptorPoolInlineUniformBlockCreateInfo;
-    const void *  pNext                         = {};
-    uint32_t      maxInlineUniformBlockBindings = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::eDescriptorPoolInlineUniformBlockCreateInfo;
+    const void *                        pNext                         = {};
+    uint32_t                            maxInlineUniformBlockBindings = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorPoolInlineUniformBlockCreateInfo>
-  {
-    using Type = DescriptorPoolInlineUniformBlockCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorPoolInlineUniformBlockCreateInfo>
   {
@@ -35675,7 +24347,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorPoolInlineUniformBlockCreateInfoEXT = DescriptorPoolInlineUniformBlockCreateInfo;
 
-  // wrapper struct for struct VkDescriptorSetAllocateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetAllocateInfo.html
   struct DescriptorSetAllocateInfo
   {
     using NativeType = VkDescriptorSetAllocateInfo;
@@ -35683,15 +24354,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetAllocateInfo( DescriptorPool              descriptorPool_     = {},
-                                                    uint32_t                    descriptorSetCount_ = {},
-                                                    const DescriptorSetLayout * pSetLayouts_        = {},
-                                                    const void *                pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorPool{ descriptorPool_ }
-      , descriptorSetCount{ descriptorSetCount_ }
-      , pSetLayouts{ pSetLayouts_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetAllocateInfo( VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool_     = {},
+                                                    uint32_t                                          descriptorSetCount_ = {},
+                                                    const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_        = {},
+                                                    const void *                                      pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorPool( descriptorPool_ )
+      , descriptorSetCount( descriptorSetCount_ )
+      , pSetLayouts( pSetLayouts_ )
     {
     }
 
@@ -35703,31 +24374,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetAllocateInfo( DescriptorPool                                             descriptorPool_,
-                               ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_,
-                               const void *                                               pNext_ = nullptr )
+    DescriptorSetAllocateInfo( VULKAN_HPP_NAMESPACE::DescriptorPool                                                                   descriptorPool_,
+                               VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_,
+                               const void *                                                                                           pNext_ = nullptr )
       : pNext( pNext_ ), descriptorPool( descriptorPool_ ), descriptorSetCount( static_cast<uint32_t>( setLayouts_.size() ) ), pSetLayouts( setLayouts_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorSetAllocateInfo & operator=( DescriptorSetAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetAllocateInfo & operator=( VkDescriptorSetAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetAllocateInfo & setDescriptorPool( DescriptorPool descriptorPool_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetAllocateInfo & setDescriptorPool( VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorPool = descriptorPool_;
       return *this;
@@ -35739,21 +24410,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetAllocateInfo & setPSetLayouts( const DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetAllocateInfo & setPSetLayouts( const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pSetLayouts = pSetLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetAllocateInfo & setSetLayouts( ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorSetAllocateInfo &
+      setSetLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetCount = static_cast<uint32_t>( setLayouts_.size() );
       pSetLayouts        = setLayouts_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35765,18 +24437,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetAllocateInfo *>( this );
     }
 
-    operator VkDescriptorSetAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetAllocateInfo *>( this );
-    }
-
-    operator VkDescriptorSetAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DescriptorPool const &, uint32_t const &, const DescriptorSetLayout * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DescriptorPool const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorPool, descriptorSetCount, pSetLayouts );
@@ -35803,29 +24473,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType              = StructureType::eDescriptorSetAllocateInfo;
-    const void *                pNext              = {};
-    DescriptorPool              descriptorPool     = {};
-    uint32_t                    descriptorSetCount = {};
-    const DescriptorSetLayout * pSetLayouts        = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType              = StructureType::eDescriptorSetAllocateInfo;
+    const void *                                      pNext              = {};
+    VULKAN_HPP_NAMESPACE::DescriptorPool              descriptorPool     = {};
+    uint32_t                                          descriptorSetCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetAllocateInfo>
-  {
-    using Type = DescriptorSetAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetAllocateInfo>
   {
     using Type = DescriptorSetAllocateInfo;
   };
 
-  // wrapper struct for struct VkDescriptorSetBindingReferenceVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetBindingReferenceVALVE.html
   struct DescriptorSetBindingReferenceVALVE
   {
     using NativeType = VkDescriptorSetBindingReferenceVALVE;
@@ -35833,13 +24493,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetBindingReferenceVALVE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetBindingReferenceVALVE( DescriptorSetLayout descriptorSetLayout_ = {},
-                                                             uint32_t            binding_             = {},
-                                                             const void *        pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorSetLayout{ descriptorSetLayout_ }
-      , binding{ binding_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetBindingReferenceVALVE( VULKAN_HPP_NAMESPACE::DescriptorSetLayout descriptorSetLayout_ = {},
+                                                             uint32_t                                  binding_             = {},
+                                                             const void *                              pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorSetLayout( descriptorSetLayout_ )
+      , binding( binding_ )
     {
     }
 
@@ -35851,22 +24511,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorSetBindingReferenceVALVE & operator=( DescriptorSetBindingReferenceVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetBindingReferenceVALVE & operator=( VkDescriptorSetBindingReferenceVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetBindingReferenceVALVE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetBindingReferenceVALVE const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetBindingReferenceVALVE & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetBindingReferenceVALVE & setDescriptorSetLayout( DescriptorSetLayout descriptorSetLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetBindingReferenceVALVE &
+      setDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout descriptorSetLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetLayout = descriptorSetLayout_;
       return *this;
@@ -35877,7 +24538,7 @@ namespace VULKAN_HPP_NAMESPACE
       binding = binding_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetBindingReferenceVALVE const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -35889,18 +24550,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetBindingReferenceVALVE *>( this );
     }
 
-    operator VkDescriptorSetBindingReferenceVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetBindingReferenceVALVE *>( this );
-    }
-
-    operator VkDescriptorSetBindingReferenceVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetBindingReferenceVALVE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DescriptorSetLayout const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DescriptorSetLayout const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorSetLayout, binding );
     }
@@ -35925,42 +24581,33 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType               = StructureType::eDescriptorSetBindingReferenceVALVE;
-    const void *        pNext               = {};
-    DescriptorSetLayout descriptorSetLayout = {};
-    uint32_t            binding             = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType               = StructureType::eDescriptorSetBindingReferenceVALVE;
+    const void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayout descriptorSetLayout = {};
+    uint32_t                                  binding             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetBindingReferenceVALVE>
-  {
-    using Type = DescriptorSetBindingReferenceVALVE;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetBindingReferenceVALVE>
   {
     using Type = DescriptorSetBindingReferenceVALVE;
   };
 
-  // wrapper struct for struct VkDescriptorSetLayoutBinding, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutBinding.html
   struct DescriptorSetLayoutBinding
   {
     using NativeType = VkDescriptorSetLayoutBinding;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutBinding( uint32_t         binding_            = {},
-                                                     DescriptorType   descriptorType_     = DescriptorType::eSampler,
-                                                     uint32_t         descriptorCount_    = {},
-                                                     ShaderStageFlags stageFlags_         = {},
-                                                     const Sampler *  pImmutableSamplers_ = {} ) VULKAN_HPP_NOEXCEPT
-      : binding{ binding_ }
-      , descriptorType{ descriptorType_ }
-      , descriptorCount{ descriptorCount_ }
-      , stageFlags{ stageFlags_ }
-      , pImmutableSamplers{ pImmutableSamplers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutBinding( uint32_t                               binding_         = {},
+                                                     VULKAN_HPP_NAMESPACE::DescriptorType   descriptorType_  = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                                     uint32_t                               descriptorCount_ = {},
+                                                     VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_      = {},
+                                                     const VULKAN_HPP_NAMESPACE::Sampler *  pImmutableSamplers_ = {} ) VULKAN_HPP_NOEXCEPT
+      : binding( binding_ )
+      , descriptorType( descriptorType_ )
+      , descriptorCount( descriptorCount_ )
+      , stageFlags( stageFlags_ )
+      , pImmutableSamplers( pImmutableSamplers_ )
     {
     }
 
@@ -35972,10 +24619,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutBinding( uint32_t                                       binding_,
-                                DescriptorType                                 descriptorType_,
-                                ShaderStageFlags                               stageFlags_,
-                                ArrayProxyNoTemporaries<const Sampler> const & immutableSamplers_ )
+    DescriptorSetLayoutBinding( uint32_t                                                                                   binding_,
+                                VULKAN_HPP_NAMESPACE::DescriptorType                                                       descriptorType_,
+                                VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                     stageFlags_,
+                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Sampler> const & immutableSamplers_ )
       : binding( binding_ )
       , descriptorType( descriptorType_ )
       , descriptorCount( static_cast<uint32_t>( immutableSamplers_.size() ) )
@@ -35986,22 +24633,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorSetLayoutBinding & operator=( DescriptorSetLayoutBinding const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetLayoutBinding & operator=( VkDescriptorSetLayoutBinding const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetLayoutBinding const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setBinding( uint32_t binding_ ) VULKAN_HPP_NOEXCEPT
     {
       binding = binding_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setDescriptorType( DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setDescriptorType( VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorType = descriptorType_;
       return *this;
@@ -36013,27 +24660,28 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setPImmutableSamplers( const Sampler * pImmutableSamplers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBinding & setPImmutableSamplers( const VULKAN_HPP_NAMESPACE::Sampler * pImmutableSamplers_ ) VULKAN_HPP_NOEXCEPT
     {
       pImmutableSamplers = pImmutableSamplers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutBinding & setImmutableSamplers( ArrayProxyNoTemporaries<const Sampler> const & immutableSamplers_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorSetLayoutBinding &
+      setImmutableSamplers( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Sampler> const & immutableSamplers_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorCount    = static_cast<uint32_t>( immutableSamplers_.size() );
       pImmutableSamplers = immutableSamplers_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetLayoutBinding const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36045,18 +24693,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetLayoutBinding *>( this );
     }
 
-    operator VkDescriptorSetLayoutBinding const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetLayoutBinding *>( this );
-    }
-
-    operator VkDescriptorSetLayoutBinding *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetLayoutBinding *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, DescriptorType const &, uint32_t const &, ShaderStageFlags const &, const Sampler * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &,
+               VULKAN_HPP_NAMESPACE::DescriptorType const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               const VULKAN_HPP_NAMESPACE::Sampler * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( binding, descriptorType, descriptorCount, stageFlags, pImmutableSamplers );
@@ -36083,23 +24729,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t         binding            = {};
-    DescriptorType   descriptorType     = DescriptorType::eSampler;
-    uint32_t         descriptorCount    = {};
-    ShaderStageFlags stageFlags         = {};
-    const Sampler *  pImmutableSamplers = {};
+    uint32_t                               binding            = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType   descriptorType     = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    uint32_t                               descriptorCount    = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags         = {};
+    const VULKAN_HPP_NAMESPACE::Sampler *  pImmutableSamplers = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetLayoutBinding>
-  {
-    using Type = DescriptorSetLayoutBinding;
-  };
-#endif
-
-  // wrapper struct for struct VkDescriptorSetLayoutBindingFlagsCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutBindingFlagsCreateInfo.html
   struct DescriptorSetLayoutBindingFlagsCreateInfo
   {
     using NativeType = VkDescriptorSetLayoutBindingFlagsCreateInfo;
@@ -36107,13 +24743,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutBindingFlagsCreateInfo( uint32_t                       bindingCount_  = {},
-                                                                    const DescriptorBindingFlags * pBindingFlags_ = {},
-                                                                    const void *                   pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , bindingCount{ bindingCount_ }
-      , pBindingFlags{ pBindingFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutBindingFlagsCreateInfo( uint32_t                                             bindingCount_  = {},
+                                                                    const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags * pBindingFlags_ = {},
+                                                                    const void *                                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , bindingCount( bindingCount_ )
+      , pBindingFlags( pBindingFlags_ )
     {
     }
 
@@ -36125,22 +24761,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutBindingFlagsCreateInfo( ArrayProxyNoTemporaries<const DescriptorBindingFlags> const & bindingFlags_, const void * pNext_ = nullptr )
+    DescriptorSetLayoutBindingFlagsCreateInfo(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags> const & bindingFlags_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), bindingCount( static_cast<uint32_t>( bindingFlags_.size() ) ), pBindingFlags( bindingFlags_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorSetLayoutBindingFlagsCreateInfo & operator=( DescriptorSetLayoutBindingFlagsCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetLayoutBindingFlagsCreateInfo & operator=( VkDescriptorSetLayoutBindingFlagsCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetLayoutBindingFlagsCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBindingFlagsCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBindingFlagsCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -36153,22 +24790,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBindingFlagsCreateInfo & setPBindingFlags( const DescriptorBindingFlags * pBindingFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutBindingFlagsCreateInfo &
+      setPBindingFlags( const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags * pBindingFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       pBindingFlags = pBindingFlags_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutBindingFlagsCreateInfo &
-      setBindingFlags( ArrayProxyNoTemporaries<const DescriptorBindingFlags> const & bindingFlags_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorSetLayoutBindingFlagsCreateInfo & setBindingFlags(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags> const & bindingFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       bindingCount  = static_cast<uint32_t>( bindingFlags_.size() );
       pBindingFlags = bindingFlags_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetLayoutBindingFlagsCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36180,18 +24818,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetLayoutBindingFlagsCreateInfo *>( this );
     }
 
-    operator VkDescriptorSetLayoutBindingFlagsCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetLayoutBindingFlagsCreateInfo *>( this );
-    }
-
-    operator VkDescriptorSetLayoutBindingFlagsCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetLayoutBindingFlagsCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const DescriptorBindingFlags * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, bindingCount, pBindingFlags );
     }
@@ -36216,20 +24850,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType         = StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo;
-    const void *                   pNext         = {};
-    uint32_t                       bindingCount  = {};
-    const DescriptorBindingFlags * pBindingFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType         = StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo;
+    const void *                                         pNext         = {};
+    uint32_t                                             bindingCount  = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorBindingFlags * pBindingFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetLayoutBindingFlagsCreateInfo>
-  {
-    using Type = DescriptorSetLayoutBindingFlagsCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo>
   {
@@ -36238,8 +24864,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorSetLayoutBindingFlagsCreateInfoEXT = DescriptorSetLayoutBindingFlagsCreateInfo;
 
-  // wrapper struct for struct VkDescriptorSetLayoutCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutCreateInfo.html
   struct DescriptorSetLayoutCreateInfo
   {
     using NativeType = VkDescriptorSetLayoutCreateInfo;
@@ -36247,15 +24871,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetLayoutCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutCreateInfo( DescriptorSetLayoutCreateFlags     flags_        = {},
-                                                        uint32_t                           bindingCount_ = {},
-                                                        const DescriptorSetLayoutBinding * pBindings_    = {},
-                                                        const void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , bindingCount{ bindingCount_ }
-      , pBindings{ pBindings_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutCreateInfo( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateFlags     flags_        = {},
+                                                        uint32_t                                                 bindingCount_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding * pBindings_    = {},
+                                                        const void *                                             pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , bindingCount( bindingCount_ )
+      , pBindings( pBindings_ )
     {
     }
 
@@ -36267,31 +24891,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutCreateInfo( DescriptorSetLayoutCreateFlags                                    flags_,
-                                   ArrayProxyNoTemporaries<const DescriptorSetLayoutBinding> const & bindings_,
-                                   const void *                                                      pNext_ = nullptr )
+    DescriptorSetLayoutCreateInfo( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateFlags                                                          flags_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding> const & bindings_,
+                                   const void * pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), bindingCount( static_cast<uint32_t>( bindings_.size() ) ), pBindings( bindings_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorSetLayoutCreateInfo & operator=( DescriptorSetLayoutCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetLayoutCreateInfo & operator=( VkDescriptorSetLayoutCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetLayoutCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutCreateInfo & setFlags( DescriptorSetLayoutCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -36303,21 +24927,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutCreateInfo & setPBindings( const DescriptorSetLayoutBinding * pBindings_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutCreateInfo &
+      setPBindings( const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding * pBindings_ ) VULKAN_HPP_NOEXCEPT
     {
       pBindings = pBindings_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetLayoutCreateInfo & setBindings( ArrayProxyNoTemporaries<const DescriptorSetLayoutBinding> const & bindings_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorSetLayoutCreateInfo &
+      setBindings( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding> const & bindings_ ) VULKAN_HPP_NOEXCEPT
     {
       bindingCount = static_cast<uint32_t>( bindings_.size() );
       pBindings    = bindings_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetLayoutCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36329,19 +24955,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetLayoutCreateInfo *>( this );
     }
 
-    operator VkDescriptorSetLayoutCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetLayoutCreateInfo *>( this );
-    }
-
-    operator VkDescriptorSetLayoutCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetLayoutCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, DescriptorSetLayoutCreateFlags const &, uint32_t const &, const DescriptorSetLayoutBinding * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateFlags const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, bindingCount, pBindings );
@@ -36368,29 +24991,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType        = StructureType::eDescriptorSetLayoutCreateInfo;
-    const void *                       pNext        = {};
-    DescriptorSetLayoutCreateFlags     flags        = {};
-    uint32_t                           bindingCount = {};
-    const DescriptorSetLayoutBinding * pBindings    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType        = StructureType::eDescriptorSetLayoutCreateInfo;
+    const void *                                             pNext        = {};
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayoutCreateFlags     flags        = {};
+    uint32_t                                                 bindingCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorSetLayoutBinding * pBindings    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetLayoutCreateInfo>
-  {
-    using Type = DescriptorSetLayoutCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetLayoutCreateInfo>
   {
     using Type = DescriptorSetLayoutCreateInfo;
   };
 
-  // wrapper struct for struct VkDescriptorSetLayoutHostMappingInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutHostMappingInfoVALVE.html
   struct DescriptorSetLayoutHostMappingInfoVALVE
   {
     using NativeType = VkDescriptorSetLayoutHostMappingInfoVALVE;
@@ -36398,12 +25011,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetLayoutHostMappingInfoVALVE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       DescriptorSetLayoutHostMappingInfoVALVE( size_t descriptorOffset_ = {}, uint32_t descriptorSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorOffset{ descriptorOffset_ }
-      , descriptorSize{ descriptorSize_ }
+      : pNext( pNext_ )
+      , descriptorOffset( descriptorOffset_ )
+      , descriptorSize( descriptorSize_ )
     {
     }
 
@@ -36415,15 +25028,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorSetLayoutHostMappingInfoVALVE & operator=( DescriptorSetLayoutHostMappingInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetLayoutHostMappingInfoVALVE & operator=( VkDescriptorSetLayoutHostMappingInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetLayoutHostMappingInfoVALVE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutHostMappingInfoVALVE const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetLayoutHostMappingInfoVALVE & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -36441,7 +25054,7 @@ namespace VULKAN_HPP_NAMESPACE
       descriptorSize = descriptorSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetLayoutHostMappingInfoVALVE const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36453,18 +25066,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetLayoutHostMappingInfoVALVE *>( this );
     }
 
-    operator VkDescriptorSetLayoutHostMappingInfoVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetLayoutHostMappingInfoVALVE *>( this );
-    }
-
-    operator VkDescriptorSetLayoutHostMappingInfoVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetLayoutHostMappingInfoVALVE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, size_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, size_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorOffset, descriptorSize );
     }
@@ -36489,27 +25097,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::eDescriptorSetLayoutHostMappingInfoVALVE;
-    void *        pNext            = {};
-    size_t        descriptorOffset = {};
-    uint32_t      descriptorSize   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eDescriptorSetLayoutHostMappingInfoVALVE;
+    void *                              pNext            = {};
+    size_t                              descriptorOffset = {};
+    uint32_t                            descriptorSize   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetLayoutHostMappingInfoVALVE>
-  {
-    using Type = DescriptorSetLayoutHostMappingInfoVALVE;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetLayoutHostMappingInfoVALVE>
   {
     using Type = DescriptorSetLayoutHostMappingInfoVALVE;
   };
 
-  // wrapper struct for struct VkDescriptorSetLayoutSupport, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetLayoutSupport.html
   struct DescriptorSetLayoutSupport
   {
     using NativeType = VkDescriptorSetLayoutSupport;
@@ -36517,10 +25116,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetLayoutSupport;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutSupport( Bool32 supported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supported{ supported_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorSetLayoutSupport( VULKAN_HPP_NAMESPACE::Bool32 supported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supported( supported_ )
     {
     }
 
@@ -36532,11 +25131,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorSetLayoutSupport & operator=( DescriptorSetLayoutSupport const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetLayoutSupport & operator=( VkDescriptorSetLayoutSupport const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetLayoutSupport const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetLayoutSupport const *>( &rhs );
       return *this;
     }
 
@@ -36550,18 +25149,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetLayoutSupport *>( this );
     }
 
-    operator VkDescriptorSetLayoutSupport const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetLayoutSupport *>( this );
-    }
-
-    operator VkDescriptorSetLayoutSupport *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetLayoutSupport *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supported );
     }
@@ -36586,19 +25180,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eDescriptorSetLayoutSupport;
-    void *        pNext     = {};
-    Bool32        supported = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eDescriptorSetLayoutSupport;
+    void *                              pNext     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        supported = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetLayoutSupport>
-  {
-    using Type = DescriptorSetLayoutSupport;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetLayoutSupport>
   {
@@ -36607,8 +25193,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorSetLayoutSupportKHR = DescriptorSetLayoutSupport;
 
-  // wrapper struct for struct VkDescriptorSetVariableDescriptorCountAllocateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetVariableDescriptorCountAllocateInfo.html
   struct DescriptorSetVariableDescriptorCountAllocateInfo
   {
     using NativeType = VkDescriptorSetVariableDescriptorCountAllocateInfo;
@@ -36616,13 +25200,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DescriptorSetVariableDescriptorCountAllocateInfo( uint32_t         descriptorSetCount_ = {},
                                                                            const uint32_t * pDescriptorCounts_  = {},
                                                                            const void *     pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorSetCount{ descriptorSetCount_ }
-      , pDescriptorCounts{ pDescriptorCounts_ }
+      : pNext( pNext_ )
+      , descriptorSetCount( descriptorSetCount_ )
+      , pDescriptorCounts( pDescriptorCounts_ )
     {
     }
 
@@ -36635,22 +25219,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorSetVariableDescriptorCountAllocateInfo( ArrayProxyNoTemporaries<const uint32_t> const & descriptorCounts_, const void * pNext_ = nullptr )
+    DescriptorSetVariableDescriptorCountAllocateInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & descriptorCounts_,
+                                                      const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ ), descriptorSetCount( static_cast<uint32_t>( descriptorCounts_.size() ) ), pDescriptorCounts( descriptorCounts_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorSetVariableDescriptorCountAllocateInfo & operator=( DescriptorSetVariableDescriptorCountAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetVariableDescriptorCountAllocateInfo & operator=( VkDescriptorSetVariableDescriptorCountAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetVariableDescriptorCountAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorSetVariableDescriptorCountAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -36671,14 +25256,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     DescriptorSetVariableDescriptorCountAllocateInfo &
-      setDescriptorCounts( ArrayProxyNoTemporaries<const uint32_t> const & descriptorCounts_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorCounts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & descriptorCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetCount = static_cast<uint32_t>( descriptorCounts_.size() );
       pDescriptorCounts  = descriptorCounts_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorSetVariableDescriptorCountAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36690,18 +25275,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetVariableDescriptorCountAllocateInfo *>( this );
     }
 
-    operator VkDescriptorSetVariableDescriptorCountAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetVariableDescriptorCountAllocateInfo *>( this );
-    }
-
-    operator VkDescriptorSetVariableDescriptorCountAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetVariableDescriptorCountAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorSetCount, pDescriptorCounts );
     }
@@ -36727,20 +25307,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType              = StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo;
-    const void *     pNext              = {};
-    uint32_t         descriptorSetCount = {};
-    const uint32_t * pDescriptorCounts  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo;
+    const void *                        pNext              = {};
+    uint32_t                            descriptorSetCount = {};
+    const uint32_t *                    pDescriptorCounts  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetVariableDescriptorCountAllocateInfo>
-  {
-    using Type = DescriptorSetVariableDescriptorCountAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo>
   {
@@ -36749,8 +25321,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorSetVariableDescriptorCountAllocateInfoEXT = DescriptorSetVariableDescriptorCountAllocateInfo;
 
-  // wrapper struct for struct VkDescriptorSetVariableDescriptorCountLayoutSupport, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorSetVariableDescriptorCountLayoutSupport.html
   struct DescriptorSetVariableDescriptorCountLayoutSupport
   {
     using NativeType = VkDescriptorSetVariableDescriptorCountLayoutSupport;
@@ -36758,11 +25328,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DescriptorSetVariableDescriptorCountLayoutSupport( uint32_t maxVariableDescriptorCount_ = {},
                                                                             void *   pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxVariableDescriptorCount{ maxVariableDescriptorCount_ }
+      : pNext( pNext_ )
+      , maxVariableDescriptorCount( maxVariableDescriptorCount_ )
     {
     }
 
@@ -36776,11 +25346,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     DescriptorSetVariableDescriptorCountLayoutSupport &
       operator=( DescriptorSetVariableDescriptorCountLayoutSupport const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorSetVariableDescriptorCountLayoutSupport & operator=( VkDescriptorSetVariableDescriptorCountLayoutSupport const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorSetVariableDescriptorCountLayoutSupport const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorSetVariableDescriptorCountLayoutSupport const *>( &rhs );
       return *this;
     }
 
@@ -36794,18 +25364,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorSetVariableDescriptorCountLayoutSupport *>( this );
     }
 
-    operator VkDescriptorSetVariableDescriptorCountLayoutSupport const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorSetVariableDescriptorCountLayoutSupport *>( this );
-    }
-
-    operator VkDescriptorSetVariableDescriptorCountLayoutSupport *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorSetVariableDescriptorCountLayoutSupport *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxVariableDescriptorCount );
     }
@@ -36830,19 +25395,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport;
-    void *        pNext                      = {};
-    uint32_t      maxVariableDescriptorCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport;
+    void *                              pNext                      = {};
+    uint32_t                            maxVariableDescriptorCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorSetVariableDescriptorCountLayoutSupport>
-  {
-    using Type = DescriptorSetVariableDescriptorCountLayoutSupport;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport>
   {
@@ -36851,25 +25408,23 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorSetVariableDescriptorCountLayoutSupportEXT = DescriptorSetVariableDescriptorCountLayoutSupport;
 
-  // wrapper struct for struct VkDescriptorUpdateTemplateEntry, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplateEntry.html
   struct DescriptorUpdateTemplateEntry
   {
     using NativeType = VkDescriptorUpdateTemplateEntry;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplateEntry( uint32_t       dstBinding_      = {},
-                                                        uint32_t       dstArrayElement_ = {},
-                                                        uint32_t       descriptorCount_ = {},
-                                                        DescriptorType descriptorType_  = DescriptorType::eSampler,
-                                                        size_t         offset_          = {},
-                                                        size_t         stride_          = {} ) VULKAN_HPP_NOEXCEPT
-      : dstBinding{ dstBinding_ }
-      , dstArrayElement{ dstArrayElement_ }
-      , descriptorCount{ descriptorCount_ }
-      , descriptorType{ descriptorType_ }
-      , offset{ offset_ }
-      , stride{ stride_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplateEntry( uint32_t                             dstBinding_      = {},
+                                                        uint32_t                             dstArrayElement_ = {},
+                                                        uint32_t                             descriptorCount_ = {},
+                                                        VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_  = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                                        size_t                               offset_          = {},
+                                                        size_t                               stride_          = {} ) VULKAN_HPP_NOEXCEPT
+      : dstBinding( dstBinding_ )
+      , dstArrayElement( dstArrayElement_ )
+      , descriptorCount( descriptorCount_ )
+      , descriptorType( descriptorType_ )
+      , offset( offset_ )
+      , stride( stride_ )
     {
     }
 
@@ -36881,15 +25436,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DescriptorUpdateTemplateEntry & operator=( DescriptorUpdateTemplateEntry const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorUpdateTemplateEntry & operator=( VkDescriptorUpdateTemplateEntry const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorUpdateTemplateEntry const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateEntry & setDstBinding( uint32_t dstBinding_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBinding = dstBinding_;
@@ -36908,7 +25463,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateEntry & setDescriptorType( DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateEntry & setDescriptorType( VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorType = descriptorType_;
       return *this;
@@ -36925,7 +25480,7 @@ namespace VULKAN_HPP_NAMESPACE
       stride = stride_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorUpdateTemplateEntry const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -36937,18 +25492,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorUpdateTemplateEntry *>( this );
     }
 
-    operator VkDescriptorUpdateTemplateEntry const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorUpdateTemplateEntry *>( this );
-    }
-
-    operator VkDescriptorUpdateTemplateEntry *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorUpdateTemplateEntry *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, DescriptorType const &, size_t const &, size_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DescriptorType const &, size_t const &, size_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( dstBinding, dstArrayElement, descriptorCount, descriptorType, offset, stride );
     }
@@ -36974,25 +25524,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t       dstBinding      = {};
-    uint32_t       dstArrayElement = {};
-    uint32_t       descriptorCount = {};
-    DescriptorType descriptorType  = DescriptorType::eSampler;
-    size_t         offset          = {};
-    size_t         stride          = {};
+    uint32_t                             dstBinding      = {};
+    uint32_t                             dstArrayElement = {};
+    uint32_t                             descriptorCount = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType descriptorType  = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    size_t                               offset          = {};
+    size_t                               stride          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorUpdateTemplateEntry>
-  {
-    using Type = DescriptorUpdateTemplateEntry;
-  };
-#endif
   using DescriptorUpdateTemplateEntryKHR = DescriptorUpdateTemplateEntry;
 
-  // wrapper struct for struct VkDescriptorUpdateTemplateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDescriptorUpdateTemplateCreateInfo.html
   struct DescriptorUpdateTemplateCreateInfo
   {
     using NativeType = VkDescriptorUpdateTemplateCreateInfo;
@@ -37000,25 +25541,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDescriptorUpdateTemplateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplateCreateInfo( DescriptorUpdateTemplateCreateFlags   flags_                      = {},
-                                                             uint32_t                              descriptorUpdateEntryCount_ = {},
-                                                             const DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries_   = {},
-                                                             DescriptorUpdateTemplateType          templateType_ = DescriptorUpdateTemplateType::eDescriptorSet,
-                                                             DescriptorSetLayout                   descriptorSetLayout_ = {},
-                                                             PipelineBindPoint                     pipelineBindPoint_   = PipelineBindPoint::eGraphics,
-                                                             PipelineLayout                        pipelineLayout_      = {},
-                                                             uint32_t                              set_                 = {},
-                                                             const void *                          pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , descriptorUpdateEntryCount{ descriptorUpdateEntryCount_ }
-      , pDescriptorUpdateEntries{ pDescriptorUpdateEntries_ }
-      , templateType{ templateType_ }
-      , descriptorSetLayout{ descriptorSetLayout_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , pipelineLayout{ pipelineLayout_ }
-      , set{ set_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DescriptorUpdateTemplateCreateInfo(
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags   flags_                      = {},
+      uint32_t                                                    descriptorUpdateEntryCount_ = {},
+      const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries_   = {},
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType          templateType_        = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType::eDescriptorSet,
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayout                   descriptorSetLayout_ = {},
+      VULKAN_HPP_NAMESPACE::PipelineBindPoint                     pipelineBindPoint_   = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+      VULKAN_HPP_NAMESPACE::PipelineLayout                        pipelineLayout_      = {},
+      uint32_t                                                    set_                 = {},
+      const void *                                                pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , descriptorUpdateEntryCount( descriptorUpdateEntryCount_ )
+      , pDescriptorUpdateEntries( pDescriptorUpdateEntries_ )
+      , templateType( templateType_ )
+      , descriptorSetLayout( descriptorSetLayout_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , pipelineLayout( pipelineLayout_ )
+      , set( set_ )
     {
     }
 
@@ -37030,14 +25572,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorUpdateTemplateCreateInfo( DescriptorUpdateTemplateCreateFlags                                  flags_,
-                                        ArrayProxyNoTemporaries<const DescriptorUpdateTemplateEntry> const & descriptorUpdateEntries_,
-                                        DescriptorUpdateTemplateType templateType_        = DescriptorUpdateTemplateType::eDescriptorSet,
-                                        DescriptorSetLayout          descriptorSetLayout_ = {},
-                                        PipelineBindPoint            pipelineBindPoint_   = PipelineBindPoint::eGraphics,
-                                        PipelineLayout               pipelineLayout_      = {},
-                                        uint32_t                     set_                 = {},
-                                        const void *                 pNext_               = nullptr )
+    DescriptorUpdateTemplateCreateInfo(
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags                                                        flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry> const & descriptorUpdateEntries_,
+      VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType templateType_        = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType::eDescriptorSet,
+      VULKAN_HPP_NAMESPACE::DescriptorSetLayout          descriptorSetLayout_ = {},
+      VULKAN_HPP_NAMESPACE::PipelineBindPoint            pipelineBindPoint_   = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+      VULKAN_HPP_NAMESPACE::PipelineLayout               pipelineLayout_      = {},
+      uint32_t                                           set_                 = {},
+      const void *                                       pNext_               = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , descriptorUpdateEntryCount( static_cast<uint32_t>( descriptorUpdateEntries_.size() ) )
@@ -37052,22 +25595,23 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DescriptorUpdateTemplateCreateInfo & operator=( DescriptorUpdateTemplateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DescriptorUpdateTemplateCreateInfo & operator=( VkDescriptorUpdateTemplateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DescriptorUpdateTemplateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setFlags( DescriptorUpdateTemplateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -37080,15 +25624,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo &
-      setPDescriptorUpdateEntries( const DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries_ ) VULKAN_HPP_NOEXCEPT
+      setPDescriptorUpdateEntries( const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       pDescriptorUpdateEntries = pDescriptorUpdateEntries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DescriptorUpdateTemplateCreateInfo &
-      setDescriptorUpdateEntries( ArrayProxyNoTemporaries<const DescriptorUpdateTemplateEntry> const & descriptorUpdateEntries_ ) VULKAN_HPP_NOEXCEPT
+    DescriptorUpdateTemplateCreateInfo & setDescriptorUpdateEntries(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry> const & descriptorUpdateEntries_ )
+      VULKAN_HPP_NOEXCEPT
     {
       descriptorUpdateEntryCount = static_cast<uint32_t>( descriptorUpdateEntries_.size() );
       pDescriptorUpdateEntries   = descriptorUpdateEntries_.data();
@@ -37096,25 +25641,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setTemplateType( DescriptorUpdateTemplateType templateType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo &
+      setTemplateType( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType templateType_ ) VULKAN_HPP_NOEXCEPT
     {
       templateType = templateType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setDescriptorSetLayout( DescriptorSetLayout descriptorSetLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo &
+      setDescriptorSetLayout( VULKAN_HPP_NAMESPACE::DescriptorSetLayout descriptorSetLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetLayout = descriptorSetLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo &
+      setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setPipelineLayout( PipelineLayout pipelineLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DescriptorUpdateTemplateCreateInfo & setPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout pipelineLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineLayout = pipelineLayout_;
       return *this;
@@ -37125,7 +25673,7 @@ namespace VULKAN_HPP_NAMESPACE
       set = set_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDescriptorUpdateTemplateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -37137,27 +25685,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDescriptorUpdateTemplateCreateInfo *>( this );
     }
 
-    operator VkDescriptorUpdateTemplateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDescriptorUpdateTemplateCreateInfo *>( this );
-    }
-
-    operator VkDescriptorUpdateTemplateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDescriptorUpdateTemplateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DescriptorUpdateTemplateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags const &,
                uint32_t const &,
-               const DescriptorUpdateTemplateEntry * const &,
-               DescriptorUpdateTemplateType const &,
-               DescriptorSetLayout const &,
-               PipelineBindPoint const &,
-               PipelineLayout const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry * const &,
+               VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType const &,
+               VULKAN_HPP_NAMESPACE::DescriptorSetLayout const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -37187,26 +25729,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                      = StructureType::eDescriptorUpdateTemplateCreateInfo;
-    const void *                          pNext                      = {};
-    DescriptorUpdateTemplateCreateFlags   flags                      = {};
-    uint32_t                              descriptorUpdateEntryCount = {};
-    const DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries   = {};
-    DescriptorUpdateTemplateType          templateType               = DescriptorUpdateTemplateType::eDescriptorSet;
-    DescriptorSetLayout                   descriptorSetLayout        = {};
-    PipelineBindPoint                     pipelineBindPoint          = PipelineBindPoint::eGraphics;
-    PipelineLayout                        pipelineLayout             = {};
-    uint32_t                              set                        = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType                      = StructureType::eDescriptorUpdateTemplateCreateInfo;
+    const void *                                                pNext                      = {};
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags   flags                      = {};
+    uint32_t                                                    descriptorUpdateEntryCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateEntry * pDescriptorUpdateEntries   = {};
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType          templateType               = VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType::eDescriptorSet;
+    VULKAN_HPP_NAMESPACE::DescriptorSetLayout                   descriptorSetLayout        = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint                     pipelineBindPoint          = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    VULKAN_HPP_NAMESPACE::PipelineLayout                        pipelineLayout             = {};
+    uint32_t                                                    set                        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDescriptorUpdateTemplateCreateInfo>
-  {
-    using Type = DescriptorUpdateTemplateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDescriptorUpdateTemplateCreateInfo>
   {
@@ -37215,8 +25749,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DescriptorUpdateTemplateCreateInfoKHR = DescriptorUpdateTemplateCreateInfo;
 
-  // wrapper struct for struct VkDeviceAddressBindingCallbackDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceAddressBindingCallbackDataEXT.html
   struct DeviceAddressBindingCallbackDataEXT
   {
     using NativeType = VkDeviceAddressBindingCallbackDataEXT;
@@ -37224,17 +25756,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceAddressBindingCallbackDataEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceAddressBindingCallbackDataEXT( DeviceAddressBindingFlagsEXT flags_       = {},
-                                                              DeviceAddress                baseAddress_ = {},
-                                                              DeviceSize                   size_        = {},
-                                                              DeviceAddressBindingTypeEXT  bindingType_ = DeviceAddressBindingTypeEXT::eBind,
-                                                              void *                       pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , baseAddress{ baseAddress_ }
-      , size{ size_ }
-      , bindingType{ bindingType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceAddressBindingCallbackDataEXT(
+      VULKAN_HPP_NAMESPACE::DeviceAddressBindingFlagsEXT flags_       = {},
+      VULKAN_HPP_NAMESPACE::DeviceAddress                baseAddress_ = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                   size_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT  bindingType_ = VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT::eBind,
+      void *                                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , baseAddress( baseAddress_ )
+      , size( size_ )
+      , bindingType( bindingType_ )
     {
     }
 
@@ -37246,45 +25779,46 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceAddressBindingCallbackDataEXT & operator=( DeviceAddressBindingCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceAddressBindingCallbackDataEXT & operator=( VkDeviceAddressBindingCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceAddressBindingCallbackDataEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceAddressBindingCallbackDataEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setFlags( DeviceAddressBindingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setFlags( VULKAN_HPP_NAMESPACE::DeviceAddressBindingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setBaseAddress( DeviceAddress baseAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setBaseAddress( VULKAN_HPP_NAMESPACE::DeviceAddress baseAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       baseAddress = baseAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT & setBindingType( DeviceAddressBindingTypeEXT bindingType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceAddressBindingCallbackDataEXT &
+      setBindingType( VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT bindingType_ ) VULKAN_HPP_NOEXCEPT
     {
       bindingType = bindingType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceAddressBindingCallbackDataEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -37296,23 +25830,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceAddressBindingCallbackDataEXT *>( this );
     }
 
-    operator VkDeviceAddressBindingCallbackDataEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceAddressBindingCallbackDataEXT *>( this );
-    }
-
-    operator VkDeviceAddressBindingCallbackDataEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceAddressBindingCallbackDataEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               DeviceAddressBindingFlagsEXT const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               DeviceAddressBindingTypeEXT const &>
+               VULKAN_HPP_NAMESPACE::DeviceAddressBindingFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, baseAddress, size, bindingType );
@@ -37339,30 +25867,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType       = StructureType::eDeviceAddressBindingCallbackDataEXT;
-    void *                       pNext       = {};
-    DeviceAddressBindingFlagsEXT flags       = {};
-    DeviceAddress                baseAddress = {};
-    DeviceSize                   size        = {};
-    DeviceAddressBindingTypeEXT  bindingType = DeviceAddressBindingTypeEXT::eBind;
+    VULKAN_HPP_NAMESPACE::StructureType                sType       = StructureType::eDeviceAddressBindingCallbackDataEXT;
+    void *                                             pNext       = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddressBindingFlagsEXT flags       = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress                baseAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                   size        = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT  bindingType = VULKAN_HPP_NAMESPACE::DeviceAddressBindingTypeEXT::eBind;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceAddressBindingCallbackDataEXT>
-  {
-    using Type = DeviceAddressBindingCallbackDataEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceAddressBindingCallbackDataEXT>
   {
     using Type = DeviceAddressBindingCallbackDataEXT;
   };
 
-  // wrapper struct for struct VkDeviceBufferMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceBufferMemoryRequirements.html
   struct DeviceBufferMemoryRequirements
   {
     using NativeType = VkDeviceBufferMemoryRequirements;
@@ -37370,10 +25888,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceBufferMemoryRequirements;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceBufferMemoryRequirements( const BufferCreateInfo * pCreateInfo_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pCreateInfo{ pCreateInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceBufferMemoryRequirements( const VULKAN_HPP_NAMESPACE::BufferCreateInfo * pCreateInfo_ = {},
+                                                         const void *                                   pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pCreateInfo( pCreateInfo_ )
     {
     }
 
@@ -37385,27 +25904,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceBufferMemoryRequirements & operator=( DeviceBufferMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceBufferMemoryRequirements & operator=( VkDeviceBufferMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceBufferMemoryRequirements const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceBufferMemoryRequirements const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceBufferMemoryRequirements & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceBufferMemoryRequirements & setPCreateInfo( const BufferCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceBufferMemoryRequirements & setPCreateInfo( const VULKAN_HPP_NAMESPACE::BufferCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pCreateInfo = pCreateInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceBufferMemoryRequirements const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -37417,18 +25936,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceBufferMemoryRequirements *>( this );
     }
 
-    operator VkDeviceBufferMemoryRequirements const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceBufferMemoryRequirements *>( this );
-    }
-
-    operator VkDeviceBufferMemoryRequirements *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceBufferMemoryRequirements *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const BufferCreateInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const VULKAN_HPP_NAMESPACE::BufferCreateInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pCreateInfo );
     }
@@ -37453,19 +25967,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType       = StructureType::eDeviceBufferMemoryRequirements;
-    const void *             pNext       = {};
-    const BufferCreateInfo * pCreateInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType       = StructureType::eDeviceBufferMemoryRequirements;
+    const void *                                   pNext       = {};
+    const VULKAN_HPP_NAMESPACE::BufferCreateInfo * pCreateInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceBufferMemoryRequirements>
-  {
-    using Type = DeviceBufferMemoryRequirements;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceBufferMemoryRequirements>
   {
@@ -37474,7 +25980,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceBufferMemoryRequirementsKHR = DeviceBufferMemoryRequirements;
 
-  // wrapper struct for struct VkDeviceQueueCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueCreateInfo.html
   struct DeviceQueueCreateInfo
   {
     using NativeType = VkDeviceQueueCreateInfo;
@@ -37482,17 +25987,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceQueueCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceQueueCreateInfo( DeviceQueueCreateFlags flags_            = {},
-                                                uint32_t               queueFamilyIndex_ = {},
-                                                uint32_t               queueCount_       = {},
-                                                const float *          pQueuePriorities_ = {},
-                                                const void *           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
-      , queueCount{ queueCount_ }
-      , pQueuePriorities{ pQueuePriorities_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceQueueCreateInfo( VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags_            = {},
+                                                uint32_t                                     queueFamilyIndex_ = {},
+                                                uint32_t                                     queueCount_       = {},
+                                                const float *                                pQueuePriorities_ = {},
+                                                const void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , queueFamilyIndex( queueFamilyIndex_ )
+      , queueCount( queueCount_ )
+      , pQueuePriorities( pQueuePriorities_ )
     {
     }
 
@@ -37504,10 +26009,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceQueueCreateInfo( DeviceQueueCreateFlags                       flags_,
-                           uint32_t                                     queueFamilyIndex_,
-                           ArrayProxyNoTemporaries<const float> const & queuePriorities_,
-                           const void *                                 pNext_ = nullptr )
+    DeviceQueueCreateInfo( VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags                       flags_,
+                           uint32_t                                                           queueFamilyIndex_,
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const float> const & queuePriorities_,
+                           const void *                                                       pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , queueFamilyIndex( queueFamilyIndex_ )
@@ -37518,22 +26023,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceQueueCreateInfo & operator=( DeviceQueueCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceQueueCreateInfo & operator=( VkDeviceQueueCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceQueueCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceQueueCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceQueueCreateInfo & setFlags( DeviceQueueCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceQueueCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -37558,14 +26063,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceQueueCreateInfo & setQueuePriorities( ArrayProxyNoTemporaries<const float> const & queuePriorities_ ) VULKAN_HPP_NOEXCEPT
+    DeviceQueueCreateInfo & setQueuePriorities( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const float> const & queuePriorities_ ) VULKAN_HPP_NOEXCEPT
     {
       queueCount       = static_cast<uint32_t>( queuePriorities_.size() );
       pQueuePriorities = queuePriorities_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceQueueCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -37577,18 +26082,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceQueueCreateInfo *>( this );
     }
 
-    operator VkDeviceQueueCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceQueueCreateInfo *>( this );
-    }
-
-    operator VkDeviceQueueCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceQueueCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceQueueCreateFlags const &, uint32_t const &, uint32_t const &, const float * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags const &,
+               uint32_t const &,
+               uint32_t const &,
+               const float * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, queueFamilyIndex, queueCount, pQueuePriorities );
@@ -37615,144 +26119,135 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType            = StructureType::eDeviceQueueCreateInfo;
-    const void *           pNext            = {};
-    DeviceQueueCreateFlags flags            = {};
-    uint32_t               queueFamilyIndex = {};
-    uint32_t               queueCount       = {};
-    const float *          pQueuePriorities = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType            = StructureType::eDeviceQueueCreateInfo;
+    const void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags            = {};
+    uint32_t                                     queueFamilyIndex = {};
+    uint32_t                                     queueCount       = {};
+    const float *                                pQueuePriorities = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceQueueCreateInfo>
-  {
-    using Type = DeviceQueueCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceQueueCreateInfo>
   {
     using Type = DeviceQueueCreateInfo;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFeatures, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFeatures.html
   struct PhysicalDeviceFeatures
   {
     using NativeType = VkPhysicalDeviceFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFeatures( Bool32 robustBufferAccess_                      = {},
-                                                 Bool32 fullDrawIndexUint32_                     = {},
-                                                 Bool32 imageCubeArray_                          = {},
-                                                 Bool32 independentBlend_                        = {},
-                                                 Bool32 geometryShader_                          = {},
-                                                 Bool32 tessellationShader_                      = {},
-                                                 Bool32 sampleRateShading_                       = {},
-                                                 Bool32 dualSrcBlend_                            = {},
-                                                 Bool32 logicOp_                                 = {},
-                                                 Bool32 multiDrawIndirect_                       = {},
-                                                 Bool32 drawIndirectFirstInstance_               = {},
-                                                 Bool32 depthClamp_                              = {},
-                                                 Bool32 depthBiasClamp_                          = {},
-                                                 Bool32 fillModeNonSolid_                        = {},
-                                                 Bool32 depthBounds_                             = {},
-                                                 Bool32 wideLines_                               = {},
-                                                 Bool32 largePoints_                             = {},
-                                                 Bool32 alphaToOne_                              = {},
-                                                 Bool32 multiViewport_                           = {},
-                                                 Bool32 samplerAnisotropy_                       = {},
-                                                 Bool32 textureCompressionETC2_                  = {},
-                                                 Bool32 textureCompressionASTC_LDR_              = {},
-                                                 Bool32 textureCompressionBC_                    = {},
-                                                 Bool32 occlusionQueryPrecise_                   = {},
-                                                 Bool32 pipelineStatisticsQuery_                 = {},
-                                                 Bool32 vertexPipelineStoresAndAtomics_          = {},
-                                                 Bool32 fragmentStoresAndAtomics_                = {},
-                                                 Bool32 shaderTessellationAndGeometryPointSize_  = {},
-                                                 Bool32 shaderImageGatherExtended_               = {},
-                                                 Bool32 shaderStorageImageExtendedFormats_       = {},
-                                                 Bool32 shaderStorageImageMultisample_           = {},
-                                                 Bool32 shaderStorageImageReadWithoutFormat_     = {},
-                                                 Bool32 shaderStorageImageWriteWithoutFormat_    = {},
-                                                 Bool32 shaderUniformBufferArrayDynamicIndexing_ = {},
-                                                 Bool32 shaderSampledImageArrayDynamicIndexing_  = {},
-                                                 Bool32 shaderStorageBufferArrayDynamicIndexing_ = {},
-                                                 Bool32 shaderStorageImageArrayDynamicIndexing_  = {},
-                                                 Bool32 shaderClipDistance_                      = {},
-                                                 Bool32 shaderCullDistance_                      = {},
-                                                 Bool32 shaderFloat64_                           = {},
-                                                 Bool32 shaderInt64_                             = {},
-                                                 Bool32 shaderInt16_                             = {},
-                                                 Bool32 shaderResourceResidency_                 = {},
-                                                 Bool32 shaderResourceMinLod_                    = {},
-                                                 Bool32 sparseBinding_                           = {},
-                                                 Bool32 sparseResidencyBuffer_                   = {},
-                                                 Bool32 sparseResidencyImage2D_                  = {},
-                                                 Bool32 sparseResidencyImage3D_                  = {},
-                                                 Bool32 sparseResidency2Samples_                 = {},
-                                                 Bool32 sparseResidency4Samples_                 = {},
-                                                 Bool32 sparseResidency8Samples_                 = {},
-                                                 Bool32 sparseResidency16Samples_                = {},
-                                                 Bool32 sparseResidencyAliased_                  = {},
-                                                 Bool32 variableMultisampleRate_                 = {},
-                                                 Bool32 inheritedQueries_                        = {} ) VULKAN_HPP_NOEXCEPT
-      : robustBufferAccess{ robustBufferAccess_ }
-      , fullDrawIndexUint32{ fullDrawIndexUint32_ }
-      , imageCubeArray{ imageCubeArray_ }
-      , independentBlend{ independentBlend_ }
-      , geometryShader{ geometryShader_ }
-      , tessellationShader{ tessellationShader_ }
-      , sampleRateShading{ sampleRateShading_ }
-      , dualSrcBlend{ dualSrcBlend_ }
-      , logicOp{ logicOp_ }
-      , multiDrawIndirect{ multiDrawIndirect_ }
-      , drawIndirectFirstInstance{ drawIndirectFirstInstance_ }
-      , depthClamp{ depthClamp_ }
-      , depthBiasClamp{ depthBiasClamp_ }
-      , fillModeNonSolid{ fillModeNonSolid_ }
-      , depthBounds{ depthBounds_ }
-      , wideLines{ wideLines_ }
-      , largePoints{ largePoints_ }
-      , alphaToOne{ alphaToOne_ }
-      , multiViewport{ multiViewport_ }
-      , samplerAnisotropy{ samplerAnisotropy_ }
-      , textureCompressionETC2{ textureCompressionETC2_ }
-      , textureCompressionASTC_LDR{ textureCompressionASTC_LDR_ }
-      , textureCompressionBC{ textureCompressionBC_ }
-      , occlusionQueryPrecise{ occlusionQueryPrecise_ }
-      , pipelineStatisticsQuery{ pipelineStatisticsQuery_ }
-      , vertexPipelineStoresAndAtomics{ vertexPipelineStoresAndAtomics_ }
-      , fragmentStoresAndAtomics{ fragmentStoresAndAtomics_ }
-      , shaderTessellationAndGeometryPointSize{ shaderTessellationAndGeometryPointSize_ }
-      , shaderImageGatherExtended{ shaderImageGatherExtended_ }
-      , shaderStorageImageExtendedFormats{ shaderStorageImageExtendedFormats_ }
-      , shaderStorageImageMultisample{ shaderStorageImageMultisample_ }
-      , shaderStorageImageReadWithoutFormat{ shaderStorageImageReadWithoutFormat_ }
-      , shaderStorageImageWriteWithoutFormat{ shaderStorageImageWriteWithoutFormat_ }
-      , shaderUniformBufferArrayDynamicIndexing{ shaderUniformBufferArrayDynamicIndexing_ }
-      , shaderSampledImageArrayDynamicIndexing{ shaderSampledImageArrayDynamicIndexing_ }
-      , shaderStorageBufferArrayDynamicIndexing{ shaderStorageBufferArrayDynamicIndexing_ }
-      , shaderStorageImageArrayDynamicIndexing{ shaderStorageImageArrayDynamicIndexing_ }
-      , shaderClipDistance{ shaderClipDistance_ }
-      , shaderCullDistance{ shaderCullDistance_ }
-      , shaderFloat64{ shaderFloat64_ }
-      , shaderInt64{ shaderInt64_ }
-      , shaderInt16{ shaderInt16_ }
-      , shaderResourceResidency{ shaderResourceResidency_ }
-      , shaderResourceMinLod{ shaderResourceMinLod_ }
-      , sparseBinding{ sparseBinding_ }
-      , sparseResidencyBuffer{ sparseResidencyBuffer_ }
-      , sparseResidencyImage2D{ sparseResidencyImage2D_ }
-      , sparseResidencyImage3D{ sparseResidencyImage3D_ }
-      , sparseResidency2Samples{ sparseResidency2Samples_ }
-      , sparseResidency4Samples{ sparseResidency4Samples_ }
-      , sparseResidency8Samples{ sparseResidency8Samples_ }
-      , sparseResidency16Samples{ sparseResidency16Samples_ }
-      , sparseResidencyAliased{ sparseResidencyAliased_ }
-      , variableMultisampleRate{ variableMultisampleRate_ }
-      , inheritedQueries{ inheritedQueries_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFeatures( VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccess_                      = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 fullDrawIndexUint32_                     = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 imageCubeArray_                          = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 independentBlend_                        = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 geometryShader_                          = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 tessellationShader_                      = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sampleRateShading_                       = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 dualSrcBlend_                            = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 logicOp_                                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 multiDrawIndirect_                       = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 drawIndirectFirstInstance_               = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 depthClamp_                              = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 depthBiasClamp_                          = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 fillModeNonSolid_                        = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 depthBounds_                             = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 wideLines_                               = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 largePoints_                             = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 alphaToOne_                              = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 multiViewport_                           = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 samplerAnisotropy_                       = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 textureCompressionETC2_                  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_LDR_              = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 textureCompressionBC_                    = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 occlusionQueryPrecise_                   = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 pipelineStatisticsQuery_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 vertexPipelineStoresAndAtomics_          = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 fragmentStoresAndAtomics_                = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderTessellationAndGeometryPointSize_  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderImageGatherExtended_               = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageExtendedFormats_       = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageMultisample_           = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageReadWithoutFormat_     = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageWriteWithoutFormat_    = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayDynamicIndexing_ = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayDynamicIndexing_  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayDynamicIndexing_ = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayDynamicIndexing_  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderClipDistance_                      = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderCullDistance_                      = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderFloat64_                           = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderInt64_                             = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderInt16_                             = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderResourceResidency_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 shaderResourceMinLod_                    = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseBinding_                           = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyBuffer_                   = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage2D_                  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage3D_                  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidency2Samples_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidency4Samples_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidency8Samples_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidency16Samples_                = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyAliased_                  = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 variableMultisampleRate_                 = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 inheritedQueries_                        = {} ) VULKAN_HPP_NOEXCEPT
+      : robustBufferAccess( robustBufferAccess_ )
+      , fullDrawIndexUint32( fullDrawIndexUint32_ )
+      , imageCubeArray( imageCubeArray_ )
+      , independentBlend( independentBlend_ )
+      , geometryShader( geometryShader_ )
+      , tessellationShader( tessellationShader_ )
+      , sampleRateShading( sampleRateShading_ )
+      , dualSrcBlend( dualSrcBlend_ )
+      , logicOp( logicOp_ )
+      , multiDrawIndirect( multiDrawIndirect_ )
+      , drawIndirectFirstInstance( drawIndirectFirstInstance_ )
+      , depthClamp( depthClamp_ )
+      , depthBiasClamp( depthBiasClamp_ )
+      , fillModeNonSolid( fillModeNonSolid_ )
+      , depthBounds( depthBounds_ )
+      , wideLines( wideLines_ )
+      , largePoints( largePoints_ )
+      , alphaToOne( alphaToOne_ )
+      , multiViewport( multiViewport_ )
+      , samplerAnisotropy( samplerAnisotropy_ )
+      , textureCompressionETC2( textureCompressionETC2_ )
+      , textureCompressionASTC_LDR( textureCompressionASTC_LDR_ )
+      , textureCompressionBC( textureCompressionBC_ )
+      , occlusionQueryPrecise( occlusionQueryPrecise_ )
+      , pipelineStatisticsQuery( pipelineStatisticsQuery_ )
+      , vertexPipelineStoresAndAtomics( vertexPipelineStoresAndAtomics_ )
+      , fragmentStoresAndAtomics( fragmentStoresAndAtomics_ )
+      , shaderTessellationAndGeometryPointSize( shaderTessellationAndGeometryPointSize_ )
+      , shaderImageGatherExtended( shaderImageGatherExtended_ )
+      , shaderStorageImageExtendedFormats( shaderStorageImageExtendedFormats_ )
+      , shaderStorageImageMultisample( shaderStorageImageMultisample_ )
+      , shaderStorageImageReadWithoutFormat( shaderStorageImageReadWithoutFormat_ )
+      , shaderStorageImageWriteWithoutFormat( shaderStorageImageWriteWithoutFormat_ )
+      , shaderUniformBufferArrayDynamicIndexing( shaderUniformBufferArrayDynamicIndexing_ )
+      , shaderSampledImageArrayDynamicIndexing( shaderSampledImageArrayDynamicIndexing_ )
+      , shaderStorageBufferArrayDynamicIndexing( shaderStorageBufferArrayDynamicIndexing_ )
+      , shaderStorageImageArrayDynamicIndexing( shaderStorageImageArrayDynamicIndexing_ )
+      , shaderClipDistance( shaderClipDistance_ )
+      , shaderCullDistance( shaderCullDistance_ )
+      , shaderFloat64( shaderFloat64_ )
+      , shaderInt64( shaderInt64_ )
+      , shaderInt16( shaderInt16_ )
+      , shaderResourceResidency( shaderResourceResidency_ )
+      , shaderResourceMinLod( shaderResourceMinLod_ )
+      , sparseBinding( sparseBinding_ )
+      , sparseResidencyBuffer( sparseResidencyBuffer_ )
+      , sparseResidencyImage2D( sparseResidencyImage2D_ )
+      , sparseResidencyImage3D( sparseResidencyImage3D_ )
+      , sparseResidency2Samples( sparseResidency2Samples_ )
+      , sparseResidency4Samples( sparseResidency4Samples_ )
+      , sparseResidency8Samples( sparseResidency8Samples_ )
+      , sparseResidency16Samples( sparseResidency16Samples_ )
+      , sparseResidencyAliased( sparseResidencyAliased_ )
+      , variableMultisampleRate( variableMultisampleRate_ )
+      , inheritedQueries( inheritedQueries_ )
     {
     }
 
@@ -37764,350 +26259,356 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFeatures & operator=( PhysicalDeviceFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFeatures & operator=( VkPhysicalDeviceFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setRobustBufferAccess( Bool32 robustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setRobustBufferAccess( VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       robustBufferAccess = robustBufferAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFullDrawIndexUint32( Bool32 fullDrawIndexUint32_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFullDrawIndexUint32( VULKAN_HPP_NAMESPACE::Bool32 fullDrawIndexUint32_ ) VULKAN_HPP_NOEXCEPT
     {
       fullDrawIndexUint32 = fullDrawIndexUint32_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setImageCubeArray( Bool32 imageCubeArray_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setImageCubeArray( VULKAN_HPP_NAMESPACE::Bool32 imageCubeArray_ ) VULKAN_HPP_NOEXCEPT
     {
       imageCubeArray = imageCubeArray_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setIndependentBlend( Bool32 independentBlend_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setIndependentBlend( VULKAN_HPP_NAMESPACE::Bool32 independentBlend_ ) VULKAN_HPP_NOEXCEPT
     {
       independentBlend = independentBlend_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setGeometryShader( Bool32 geometryShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setGeometryShader( VULKAN_HPP_NAMESPACE::Bool32 geometryShader_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryShader = geometryShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTessellationShader( Bool32 tessellationShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTessellationShader( VULKAN_HPP_NAMESPACE::Bool32 tessellationShader_ ) VULKAN_HPP_NOEXCEPT
     {
       tessellationShader = tessellationShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSampleRateShading( Bool32 sampleRateShading_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSampleRateShading( VULKAN_HPP_NAMESPACE::Bool32 sampleRateShading_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleRateShading = sampleRateShading_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDualSrcBlend( Bool32 dualSrcBlend_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDualSrcBlend( VULKAN_HPP_NAMESPACE::Bool32 dualSrcBlend_ ) VULKAN_HPP_NOEXCEPT
     {
       dualSrcBlend = dualSrcBlend_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setLogicOp( Bool32 logicOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setLogicOp( VULKAN_HPP_NAMESPACE::Bool32 logicOp_ ) VULKAN_HPP_NOEXCEPT
     {
       logicOp = logicOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setMultiDrawIndirect( Bool32 multiDrawIndirect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setMultiDrawIndirect( VULKAN_HPP_NAMESPACE::Bool32 multiDrawIndirect_ ) VULKAN_HPP_NOEXCEPT
     {
       multiDrawIndirect = multiDrawIndirect_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDrawIndirectFirstInstance( Bool32 drawIndirectFirstInstance_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDrawIndirectFirstInstance( VULKAN_HPP_NAMESPACE::Bool32 drawIndirectFirstInstance_ ) VULKAN_HPP_NOEXCEPT
     {
       drawIndirectFirstInstance = drawIndirectFirstInstance_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthClamp( Bool32 depthClamp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthClamp( VULKAN_HPP_NAMESPACE::Bool32 depthClamp_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClamp = depthClamp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthBiasClamp( Bool32 depthBiasClamp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthBiasClamp( VULKAN_HPP_NAMESPACE::Bool32 depthBiasClamp_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasClamp = depthBiasClamp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFillModeNonSolid( Bool32 fillModeNonSolid_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFillModeNonSolid( VULKAN_HPP_NAMESPACE::Bool32 fillModeNonSolid_ ) VULKAN_HPP_NOEXCEPT
     {
       fillModeNonSolid = fillModeNonSolid_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthBounds( Bool32 depthBounds_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setDepthBounds( VULKAN_HPP_NAMESPACE::Bool32 depthBounds_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBounds = depthBounds_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setWideLines( Bool32 wideLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setWideLines( VULKAN_HPP_NAMESPACE::Bool32 wideLines_ ) VULKAN_HPP_NOEXCEPT
     {
       wideLines = wideLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setLargePoints( Bool32 largePoints_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setLargePoints( VULKAN_HPP_NAMESPACE::Bool32 largePoints_ ) VULKAN_HPP_NOEXCEPT
     {
       largePoints = largePoints_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setAlphaToOne( Bool32 alphaToOne_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setAlphaToOne( VULKAN_HPP_NAMESPACE::Bool32 alphaToOne_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaToOne = alphaToOne_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setMultiViewport( Bool32 multiViewport_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setMultiViewport( VULKAN_HPP_NAMESPACE::Bool32 multiViewport_ ) VULKAN_HPP_NOEXCEPT
     {
       multiViewport = multiViewport_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSamplerAnisotropy( Bool32 samplerAnisotropy_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSamplerAnisotropy( VULKAN_HPP_NAMESPACE::Bool32 samplerAnisotropy_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerAnisotropy = samplerAnisotropy_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTextureCompressionETC2( Bool32 textureCompressionETC2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTextureCompressionETC2( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionETC2_ ) VULKAN_HPP_NOEXCEPT
     {
       textureCompressionETC2 = textureCompressionETC2_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTextureCompressionASTC_LDR( Bool32 textureCompressionASTC_LDR_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setTextureCompressionASTC_LDR( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_LDR_ ) VULKAN_HPP_NOEXCEPT
     {
       textureCompressionASTC_LDR = textureCompressionASTC_LDR_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTextureCompressionBC( Bool32 textureCompressionBC_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setTextureCompressionBC( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionBC_ ) VULKAN_HPP_NOEXCEPT
     {
       textureCompressionBC = textureCompressionBC_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setOcclusionQueryPrecise( Bool32 occlusionQueryPrecise_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setOcclusionQueryPrecise( VULKAN_HPP_NAMESPACE::Bool32 occlusionQueryPrecise_ ) VULKAN_HPP_NOEXCEPT
     {
       occlusionQueryPrecise = occlusionQueryPrecise_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setPipelineStatisticsQuery( Bool32 pipelineStatisticsQuery_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setPipelineStatisticsQuery( VULKAN_HPP_NAMESPACE::Bool32 pipelineStatisticsQuery_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineStatisticsQuery = pipelineStatisticsQuery_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setVertexPipelineStoresAndAtomics( Bool32 vertexPipelineStoresAndAtomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setVertexPipelineStoresAndAtomics( VULKAN_HPP_NAMESPACE::Bool32 vertexPipelineStoresAndAtomics_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexPipelineStoresAndAtomics = vertexPipelineStoresAndAtomics_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFragmentStoresAndAtomics( Bool32 fragmentStoresAndAtomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setFragmentStoresAndAtomics( VULKAN_HPP_NAMESPACE::Bool32 fragmentStoresAndAtomics_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentStoresAndAtomics = fragmentStoresAndAtomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
-      setShaderTessellationAndGeometryPointSize( Bool32 shaderTessellationAndGeometryPointSize_ ) VULKAN_HPP_NOEXCEPT
+      setShaderTessellationAndGeometryPointSize( VULKAN_HPP_NAMESPACE::Bool32 shaderTessellationAndGeometryPointSize_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTessellationAndGeometryPointSize = shaderTessellationAndGeometryPointSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderImageGatherExtended( Bool32 shaderImageGatherExtended_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderImageGatherExtended( VULKAN_HPP_NAMESPACE::Bool32 shaderImageGatherExtended_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderImageGatherExtended = shaderImageGatherExtended_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderStorageImageExtendedFormats( Bool32 shaderStorageImageExtendedFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setShaderStorageImageExtendedFormats( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageExtendedFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageExtendedFormats = shaderStorageImageExtendedFormats_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderStorageImageMultisample( Bool32 shaderStorageImageMultisample_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setShaderStorageImageMultisample( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageMultisample_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageMultisample = shaderStorageImageMultisample_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderStorageImageReadWithoutFormat( Bool32 shaderStorageImageReadWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setShaderStorageImageReadWithoutFormat( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageReadWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageReadWithoutFormat = shaderStorageImageReadWithoutFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderStorageImageWriteWithoutFormat( Bool32 shaderStorageImageWriteWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
+      setShaderStorageImageWriteWithoutFormat( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageWriteWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageWriteWithoutFormat = shaderStorageImageWriteWithoutFormat_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
-      setShaderUniformBufferArrayDynamicIndexing( Bool32 shaderUniformBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformBufferArrayDynamicIndexing = shaderUniformBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
-      setShaderSampledImageArrayDynamicIndexing( Bool32 shaderSampledImageArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSampledImageArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSampledImageArrayDynamicIndexing = shaderSampledImageArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
-      setShaderStorageBufferArrayDynamicIndexing( Bool32 shaderStorageBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageBufferArrayDynamicIndexing = shaderStorageBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures &
-      setShaderStorageImageArrayDynamicIndexing( Bool32 shaderStorageImageArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageImageArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageArrayDynamicIndexing = shaderStorageImageArrayDynamicIndexing_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderClipDistance( Bool32 shaderClipDistance_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderClipDistance( VULKAN_HPP_NAMESPACE::Bool32 shaderClipDistance_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderClipDistance = shaderClipDistance_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderCullDistance( Bool32 shaderCullDistance_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderCullDistance( VULKAN_HPP_NAMESPACE::Bool32 shaderCullDistance_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderCullDistance = shaderCullDistance_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderFloat64( Bool32 shaderFloat64_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderFloat64( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat64_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderFloat64 = shaderFloat64_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderInt64( Bool32 shaderInt64_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderInt64( VULKAN_HPP_NAMESPACE::Bool32 shaderInt64_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInt64 = shaderInt64_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderInt16( Bool32 shaderInt16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderInt16( VULKAN_HPP_NAMESPACE::Bool32 shaderInt16_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInt16 = shaderInt16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderResourceResidency( Bool32 shaderResourceResidency_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderResourceResidency( VULKAN_HPP_NAMESPACE::Bool32 shaderResourceResidency_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderResourceResidency = shaderResourceResidency_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderResourceMinLod( Bool32 shaderResourceMinLod_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setShaderResourceMinLod( VULKAN_HPP_NAMESPACE::Bool32 shaderResourceMinLod_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderResourceMinLod = shaderResourceMinLod_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseBinding( Bool32 sparseBinding_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseBinding( VULKAN_HPP_NAMESPACE::Bool32 sparseBinding_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseBinding = sparseBinding_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyBuffer( Bool32 sparseResidencyBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyBuffer( VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidencyBuffer = sparseResidencyBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyImage2D( Bool32 sparseResidencyImage2D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyImage2D( VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage2D_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidencyImage2D = sparseResidencyImage2D_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyImage3D( Bool32 sparseResidencyImage3D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyImage3D( VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage3D_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidencyImage3D = sparseResidencyImage3D_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency2Samples( Bool32 sparseResidency2Samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency2Samples( VULKAN_HPP_NAMESPACE::Bool32 sparseResidency2Samples_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidency2Samples = sparseResidency2Samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency4Samples( Bool32 sparseResidency4Samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency4Samples( VULKAN_HPP_NAMESPACE::Bool32 sparseResidency4Samples_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidency4Samples = sparseResidency4Samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency8Samples( Bool32 sparseResidency8Samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency8Samples( VULKAN_HPP_NAMESPACE::Bool32 sparseResidency8Samples_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidency8Samples = sparseResidency8Samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency16Samples( Bool32 sparseResidency16Samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidency16Samples( VULKAN_HPP_NAMESPACE::Bool32 sparseResidency16Samples_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidency16Samples = sparseResidency16Samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyAliased( Bool32 sparseResidencyAliased_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setSparseResidencyAliased( VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyAliased_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseResidencyAliased = sparseResidencyAliased_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setVariableMultisampleRate( Bool32 variableMultisampleRate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setVariableMultisampleRate( VULKAN_HPP_NAMESPACE::Bool32 variableMultisampleRate_ ) VULKAN_HPP_NOEXCEPT
     {
       variableMultisampleRate = variableMultisampleRate_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setInheritedQueries( Bool32 inheritedQueries_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures & setInheritedQueries( VULKAN_HPP_NAMESPACE::Bool32 inheritedQueries_ ) VULKAN_HPP_NOEXCEPT
     {
       inheritedQueries = inheritedQueries_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -38119,72 +26620,66 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( robustBufferAccess,
@@ -38291,72 +26786,63 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Bool32 robustBufferAccess                      = {};
-    Bool32 fullDrawIndexUint32                     = {};
-    Bool32 imageCubeArray                          = {};
-    Bool32 independentBlend                        = {};
-    Bool32 geometryShader                          = {};
-    Bool32 tessellationShader                      = {};
-    Bool32 sampleRateShading                       = {};
-    Bool32 dualSrcBlend                            = {};
-    Bool32 logicOp                                 = {};
-    Bool32 multiDrawIndirect                       = {};
-    Bool32 drawIndirectFirstInstance               = {};
-    Bool32 depthClamp                              = {};
-    Bool32 depthBiasClamp                          = {};
-    Bool32 fillModeNonSolid                        = {};
-    Bool32 depthBounds                             = {};
-    Bool32 wideLines                               = {};
-    Bool32 largePoints                             = {};
-    Bool32 alphaToOne                              = {};
-    Bool32 multiViewport                           = {};
-    Bool32 samplerAnisotropy                       = {};
-    Bool32 textureCompressionETC2                  = {};
-    Bool32 textureCompressionASTC_LDR              = {};
-    Bool32 textureCompressionBC                    = {};
-    Bool32 occlusionQueryPrecise                   = {};
-    Bool32 pipelineStatisticsQuery                 = {};
-    Bool32 vertexPipelineStoresAndAtomics          = {};
-    Bool32 fragmentStoresAndAtomics                = {};
-    Bool32 shaderTessellationAndGeometryPointSize  = {};
-    Bool32 shaderImageGatherExtended               = {};
-    Bool32 shaderStorageImageExtendedFormats       = {};
-    Bool32 shaderStorageImageMultisample           = {};
-    Bool32 shaderStorageImageReadWithoutFormat     = {};
-    Bool32 shaderStorageImageWriteWithoutFormat    = {};
-    Bool32 shaderUniformBufferArrayDynamicIndexing = {};
-    Bool32 shaderSampledImageArrayDynamicIndexing  = {};
-    Bool32 shaderStorageBufferArrayDynamicIndexing = {};
-    Bool32 shaderStorageImageArrayDynamicIndexing  = {};
-    Bool32 shaderClipDistance                      = {};
-    Bool32 shaderCullDistance                      = {};
-    Bool32 shaderFloat64                           = {};
-    Bool32 shaderInt64                             = {};
-    Bool32 shaderInt16                             = {};
-    Bool32 shaderResourceResidency                 = {};
-    Bool32 shaderResourceMinLod                    = {};
-    Bool32 sparseBinding                           = {};
-    Bool32 sparseResidencyBuffer                   = {};
-    Bool32 sparseResidencyImage2D                  = {};
-    Bool32 sparseResidencyImage3D                  = {};
-    Bool32 sparseResidency2Samples                 = {};
-    Bool32 sparseResidency4Samples                 = {};
-    Bool32 sparseResidency8Samples                 = {};
-    Bool32 sparseResidency16Samples                = {};
-    Bool32 sparseResidencyAliased                  = {};
-    Bool32 variableMultisampleRate                 = {};
-    Bool32 inheritedQueries                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccess                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32 fullDrawIndexUint32                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32 imageCubeArray                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32 independentBlend                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32 geometryShader                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32 tessellationShader                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sampleRateShading                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32 dualSrcBlend                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32 logicOp                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 multiDrawIndirect                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32 drawIndirectFirstInstance               = {};
+    VULKAN_HPP_NAMESPACE::Bool32 depthClamp                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32 depthBiasClamp                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32 fillModeNonSolid                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32 depthBounds                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32 wideLines                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32 largePoints                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32 alphaToOne                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32 multiViewport                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32 samplerAnisotropy                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32 textureCompressionETC2                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_LDR              = {};
+    VULKAN_HPP_NAMESPACE::Bool32 textureCompressionBC                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32 occlusionQueryPrecise                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32 pipelineStatisticsQuery                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 vertexPipelineStoresAndAtomics          = {};
+    VULKAN_HPP_NAMESPACE::Bool32 fragmentStoresAndAtomics                = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderTessellationAndGeometryPointSize  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderImageGatherExtended               = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageExtendedFormats       = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageMultisample           = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageReadWithoutFormat     = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageWriteWithoutFormat    = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayDynamicIndexing = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayDynamicIndexing  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayDynamicIndexing = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayDynamicIndexing  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderClipDistance                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderCullDistance                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderFloat64                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderInt64                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderInt16                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderResourceResidency                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 shaderResourceMinLod                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseBinding                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyBuffer                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage2D                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyImage3D                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidency2Samples                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidency4Samples                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidency8Samples                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidency16Samples                = {};
+    VULKAN_HPP_NAMESPACE::Bool32 sparseResidencyAliased                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 variableMultisampleRate                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32 inheritedQueries                        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFeatures>
-  {
-    using Type = PhysicalDeviceFeatures;
-  };
-#endif
-
-  // wrapper struct for struct VkDeviceCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceCreateInfo.html
   struct DeviceCreateInfo
   {
     using NativeType = VkDeviceCreateInfo;
@@ -38364,53 +26850,39 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-
-#  if defined( _MSC_VER )
-#    pragma warning( push )
-#    pragma warning( disable : 4996 )  // 'function': was declared deprecated
-#  elif defined( __clang__ )
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#  elif defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#  else
-// unknown compiler... just ignore the warnings for yourselves ;)
-#  endif
-
-    VULKAN_HPP_CONSTEXPR_17 DeviceCreateInfo( DeviceCreateFlags              flags_                   = {},
-                                              uint32_t                       queueCreateInfoCount_    = {},
-                                              const DeviceQueueCreateInfo *  pQueueCreateInfos_       = {},
-                                              uint32_t                       enabledLayerCount_       = {},
-                                              const char * const *           ppEnabledLayerNames_     = {},
-                                              uint32_t                       enabledExtensionCount_   = {},
-                                              const char * const *           ppEnabledExtensionNames_ = {},
-                                              const PhysicalDeviceFeatures * pEnabledFeatures_        = {},
-                                              const void *                   pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , queueCreateInfoCount{ queueCreateInfoCount_ }
-      , pQueueCreateInfos{ pQueueCreateInfos_ }
-      , enabledLayerCount{ enabledLayerCount_ }
-      , ppEnabledLayerNames{ ppEnabledLayerNames_ }
-      , enabledExtensionCount{ enabledExtensionCount_ }
-      , ppEnabledExtensionNames{ ppEnabledExtensionNames_ }
-      , pEnabledFeatures{ pEnabledFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceCreateInfo( VULKAN_HPP_NAMESPACE::DeviceCreateFlags              flags_                   = {},
+                                           uint32_t                                             queueCreateInfoCount_    = {},
+                                           const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo *  pQueueCreateInfos_       = {},
+                                           uint32_t                                             enabledLayerCount_       = {},
+                                           const char * const *                                 ppEnabledLayerNames_     = {},
+                                           uint32_t                                             enabledExtensionCount_   = {},
+                                           const char * const *                                 ppEnabledExtensionNames_ = {},
+                                           const VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pEnabledFeatures_        = {},
+                                           const void *                                         pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , queueCreateInfoCount( queueCreateInfoCount_ )
+      , pQueueCreateInfos( pQueueCreateInfos_ )
+      , enabledLayerCount( enabledLayerCount_ )
+      , ppEnabledLayerNames( ppEnabledLayerNames_ )
+      , enabledExtensionCount( enabledExtensionCount_ )
+      , ppEnabledExtensionNames( ppEnabledExtensionNames_ )
+      , pEnabledFeatures( pEnabledFeatures_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_17 DeviceCreateInfo( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR DeviceCreateInfo( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
     DeviceCreateInfo( VkDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : DeviceCreateInfo( *reinterpret_cast<DeviceCreateInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceCreateInfo( DeviceCreateFlags                                            flags_,
-                      ArrayProxyNoTemporaries<const DeviceQueueCreateInfo> const & queueCreateInfos_,
-                      ArrayProxyNoTemporaries<const char * const> const &          pEnabledLayerNames_     = {},
-                      ArrayProxyNoTemporaries<const char * const> const &          pEnabledExtensionNames_ = {},
-                      const PhysicalDeviceFeatures *                               pEnabledFeatures_       = {},
-                      const void *                                                 pNext_                  = nullptr )
+    DeviceCreateInfo( VULKAN_HPP_NAMESPACE::DeviceCreateFlags                                                                  flags_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo> const & queueCreateInfos_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const &                                pEnabledLayerNames_     = {},
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const &                                pEnabledExtensionNames_ = {},
+                      const VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures *                                                     pEnabledFeatures_       = {},
+                      const void *                                                                                             pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , queueCreateInfoCount( static_cast<uint32_t>( queueCreateInfos_.size() ) )
@@ -38425,39 +26897,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceCreateInfo & operator=( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-#  if defined( _MSC_VER )
-#    pragma warning( pop )
-#  elif defined( __clang__ )
-#    pragma clang diagnostic pop
-#  elif defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  else
-// unknown compiler... just ignore the warnings for yourselves ;)
-#  endif
-
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceCreateInfo & operator=( VkDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      pNext                   = rhs.pNext;
-      flags                   = static_cast<DeviceCreateFlags>( rhs.flags );
-      queueCreateInfoCount    = rhs.queueCreateInfoCount;
-      pQueueCreateInfos       = reinterpret_cast<const DeviceQueueCreateInfo *>( rhs.pQueueCreateInfos );
-      enabledExtensionCount   = rhs.enabledExtensionCount;
-      ppEnabledExtensionNames = rhs.ppEnabledExtensionNames;
-      pEnabledFeatures        = reinterpret_cast<const PhysicalDeviceFeatures *>( rhs.pEnabledFeatures );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setFlags( DeviceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::DeviceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -38469,14 +26924,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setPQueueCreateInfos( const DeviceQueueCreateInfo * pQueueCreateInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo &
+      setPQueueCreateInfos( const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo * pQueueCreateInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pQueueCreateInfos = pQueueCreateInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceCreateInfo & setQueueCreateInfos( ArrayProxyNoTemporaries<const DeviceQueueCreateInfo> const & queueCreateInfos_ ) VULKAN_HPP_NOEXCEPT
+    DeviceCreateInfo & setQueueCreateInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo> const & queueCreateInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       queueCreateInfoCount = static_cast<uint32_t>( queueCreateInfos_.size() );
       pQueueCreateInfos    = queueCreateInfos_.data();
@@ -38484,24 +26941,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_DEPRECATED( "ignored" ) VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setEnabledLayerCount( uint32_t enabledLayerCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setEnabledLayerCount( uint32_t enabledLayerCount_ ) VULKAN_HPP_NOEXCEPT
     {
-      detail::ignore( enabledLayerCount_ );
+      enabledLayerCount = enabledLayerCount_;
       return *this;
     }
 
-    VULKAN_HPP_DEPRECATED( "ignored" )
     VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setPpEnabledLayerNames( const char * const * ppEnabledLayerNames_ ) VULKAN_HPP_NOEXCEPT
     {
-      detail::ignore( ppEnabledLayerNames_ );
+      ppEnabledLayerNames = ppEnabledLayerNames_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VULKAN_HPP_DEPRECATED( "ignored" )
-    DeviceCreateInfo & setPEnabledLayerNames( ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_ ) VULKAN_HPP_NOEXCEPT
+    DeviceCreateInfo &
+      setPEnabledLayerNames( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_ ) VULKAN_HPP_NOEXCEPT
     {
-      detail::ignore( pEnabledLayerNames_ );
+      enabledLayerCount   = static_cast<uint32_t>( pEnabledLayerNames_.size() );
+      ppEnabledLayerNames = pEnabledLayerNames_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
@@ -38519,7 +26976,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceCreateInfo & setPEnabledExtensionNames( ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ ) VULKAN_HPP_NOEXCEPT
+    DeviceCreateInfo &
+      setPEnabledExtensionNames( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ ) VULKAN_HPP_NOEXCEPT
     {
       enabledExtensionCount   = static_cast<uint32_t>( pEnabledExtensionNames_.size() );
       ppEnabledExtensionNames = pEnabledExtensionNames_.data();
@@ -38527,12 +26985,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setPEnabledFeatures( const PhysicalDeviceFeatures * pEnabledFeatures_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceCreateInfo & setPEnabledFeatures( const VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pEnabledFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       pEnabledFeatures = pEnabledFeatures_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -38544,27 +27002,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceCreateInfo *>( this );
     }
 
-    operator VkDeviceCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceCreateInfo *>( this );
-    }
-
-    operator VkDeviceCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DeviceCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::DeviceCreateFlags const &,
                uint32_t const &,
-               const DeviceQueueCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo * const &,
                uint32_t const &,
                const char * const * const &,
                uint32_t const &,
                const char * const * const &,
-               const PhysicalDeviceFeatures * const &>
+               const VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -38593,6 +27045,14 @@ namespace VULKAN_HPP_NAMESPACE
         return cmp;
       if ( auto cmp = pQueueCreateInfos <=> rhs.pQueueCreateInfos; cmp != 0 )
         return cmp;
+      if ( auto cmp = enabledLayerCount <=> rhs.enabledLayerCount; cmp != 0 )
+        return cmp;
+      for ( size_t i = 0; i < enabledLayerCount; ++i )
+      {
+        if ( ppEnabledLayerNames[i] != rhs.ppEnabledLayerNames[i] )
+          if ( auto cmp = strcmp( ppEnabledLayerNames[i], rhs.ppEnabledLayerNames[i] ); cmp != 0 )
+            return cmp < 0 ? std::strong_ordering::less : std::strong_ordering::greater;
+      }
       if ( auto cmp = enabledExtensionCount <=> rhs.enabledExtensionCount; cmp != 0 )
         return cmp;
       for ( size_t i = 0; i < enabledExtensionCount; ++i )
@@ -38611,7 +27071,12 @@ namespace VULKAN_HPP_NAMESPACE
     bool operator==( DeviceCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( queueCreateInfoCount == rhs.queueCreateInfoCount ) &&
-             ( pQueueCreateInfos == rhs.pQueueCreateInfos ) && ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
+             ( pQueueCreateInfos == rhs.pQueueCreateInfos ) && ( enabledLayerCount == rhs.enabledLayerCount ) &&
+             std::equal( ppEnabledLayerNames,
+                         ppEnabledLayerNames + enabledLayerCount,
+                         rhs.ppEnabledLayerNames,
+                         []( char const * left, char const * right ) { return ( left == right ) || ( strcmp( left, right ) == 0 ); } ) &&
+             ( enabledExtensionCount == rhs.enabledExtensionCount ) &&
              std::equal( ppEnabledExtensionNames,
                          ppEnabledExtensionNames + enabledExtensionCount,
                          rhs.ppEnabledExtensionNames,
@@ -38625,162 +27090,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                 sType                                         = StructureType::eDeviceCreateInfo;
-    const void *                  pNext                                         = {};
-    DeviceCreateFlags             flags                                         = {};
-    uint32_t                      queueCreateInfoCount                          = {};
-    const DeviceQueueCreateInfo * pQueueCreateInfos                             = {};
-    VULKAN_HPP_DEPRECATED( "ignored" ) uint32_t enabledLayerCount               = {};
-    VULKAN_HPP_DEPRECATED( "ignored" ) const char * const * ppEnabledLayerNames = {};
-    uint32_t                       enabledExtensionCount                        = {};
-    const char * const *           ppEnabledExtensionNames                      = {};
-    const PhysicalDeviceFeatures * pEnabledFeatures                             = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType                   = StructureType::eDeviceCreateInfo;
+    const void *                                         pNext                   = {};
+    VULKAN_HPP_NAMESPACE::DeviceCreateFlags              flags                   = {};
+    uint32_t                                             queueCreateInfoCount    = {};
+    const VULKAN_HPP_NAMESPACE::DeviceQueueCreateInfo *  pQueueCreateInfos       = {};
+    uint32_t                                             enabledLayerCount       = {};
+    const char * const *                                 ppEnabledLayerNames     = {};
+    uint32_t                                             enabledExtensionCount   = {};
+    const char * const *                                 ppEnabledExtensionNames = {};
+    const VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures * pEnabledFeatures        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceCreateInfo>
-  {
-    using Type = DeviceCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceCreateInfo>
   {
     using Type = DeviceCreateInfo;
   };
 
-  // wrapper struct for struct VkDeviceMemoryReportCallbackDataEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemoryReportCallbackDataEXT.html
-  struct DeviceMemoryReportCallbackDataEXT
-  {
-    using NativeType = VkDeviceMemoryReportCallbackDataEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceMemoryReportCallbackDataEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceMemoryReportCallbackDataEXT( DeviceMemoryReportFlagsEXT     flags_          = {},
-                                                            DeviceMemoryReportEventTypeEXT type_           = DeviceMemoryReportEventTypeEXT::eAllocate,
-                                                            uint64_t                       memoryObjectId_ = {},
-                                                            DeviceSize                     size_           = {},
-                                                            ObjectType                     objectType_     = ObjectType::eUnknown,
-                                                            uint64_t                       objectHandle_   = {},
-                                                            uint32_t                       heapIndex_      = {},
-                                                            void *                         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , type{ type_ }
-      , memoryObjectId{ memoryObjectId_ }
-      , size{ size_ }
-      , objectType{ objectType_ }
-      , objectHandle{ objectHandle_ }
-      , heapIndex{ heapIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DeviceMemoryReportCallbackDataEXT( DeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DeviceMemoryReportCallbackDataEXT( VkDeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DeviceMemoryReportCallbackDataEXT( *reinterpret_cast<DeviceMemoryReportCallbackDataEXT const *>( &rhs ) )
-    {
-    }
-
-    DeviceMemoryReportCallbackDataEXT & operator=( DeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DeviceMemoryReportCallbackDataEXT & operator=( VkDeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DeviceMemoryReportCallbackDataEXT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkDeviceMemoryReportCallbackDataEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDeviceMemoryReportCallbackDataEXT *>( this );
-    }
-
-    operator VkDeviceMemoryReportCallbackDataEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDeviceMemoryReportCallbackDataEXT *>( this );
-    }
-
-    operator VkDeviceMemoryReportCallbackDataEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceMemoryReportCallbackDataEXT *>( this );
-    }
-
-    operator VkDeviceMemoryReportCallbackDataEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceMemoryReportCallbackDataEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               DeviceMemoryReportFlagsEXT const &,
-               DeviceMemoryReportEventTypeEXT const &,
-               uint64_t const &,
-               DeviceSize const &,
-               ObjectType const &,
-               uint64_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, type, memoryObjectId, size, objectType, objectHandle, heapIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DeviceMemoryReportCallbackDataEXT const & ) const = default;
-#else
-    bool operator==( DeviceMemoryReportCallbackDataEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( type == rhs.type ) && ( memoryObjectId == rhs.memoryObjectId ) &&
-             ( size == rhs.size ) && ( objectType == rhs.objectType ) && ( objectHandle == rhs.objectHandle ) && ( heapIndex == rhs.heapIndex );
-#  endif
-    }
-
-    bool operator!=( DeviceMemoryReportCallbackDataEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType          = StructureType::eDeviceMemoryReportCallbackDataEXT;
-    void *                         pNext          = {};
-    DeviceMemoryReportFlagsEXT     flags          = {};
-    DeviceMemoryReportEventTypeEXT type           = DeviceMemoryReportEventTypeEXT::eAllocate;
-    uint64_t                       memoryObjectId = {};
-    DeviceSize                     size           = {};
-    ObjectType                     objectType     = ObjectType::eUnknown;
-    uint64_t                       objectHandle   = {};
-    uint32_t                       heapIndex      = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceMemoryReportCallbackDataEXT>
-  {
-    using Type = DeviceMemoryReportCallbackDataEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDeviceMemoryReportCallbackDataEXT>
-  {
-    using Type = DeviceMemoryReportCallbackDataEXT;
-  };
-
-  typedef void( VKAPI_PTR * PFN_DeviceMemoryReportCallbackEXT )( const DeviceMemoryReportCallbackDataEXT * pCallbackData, void * pUserData );
-
-  // wrapper struct for struct VkDeviceDeviceMemoryReportCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceDeviceMemoryReportCreateInfoEXT.html
   struct DeviceDeviceMemoryReportCreateInfoEXT
   {
     using NativeType = VkDeviceDeviceMemoryReportCreateInfoEXT;
@@ -38788,15 +27115,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceDeviceMemoryReportCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceDeviceMemoryReportCreateInfoEXT( DeviceMemoryReportFlagsEXT        flags_           = {},
-                                                                PFN_DeviceMemoryReportCallbackEXT pfnUserCallback_ = {},
-                                                                void *                            pUserData_       = {},
-                                                                const void *                      pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pfnUserCallback{ pfnUserCallback_ }
-      , pUserData{ pUserData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceDeviceMemoryReportCreateInfoEXT( VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT flags_           = {},
+                                                                PFN_vkDeviceMemoryReportCallbackEXT              pfnUserCallback_ = {},
+                                                                void *                                           pUserData_       = {},
+                                                                const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pfnUserCallback( pfnUserCallback_ )
+      , pUserData( pUserData_ )
     {
     }
 
@@ -38807,49 +27134,30 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This constructor is deprecated. Use the one taking function pointer types from the vk-namespace instead." )
-
-    DeviceDeviceMemoryReportCreateInfoEXT( DeviceMemoryReportFlagsEXT          flags_,
-                                           PFN_vkDeviceMemoryReportCallbackEXT pfnUserCallback_,
-                                           void *                              pUserData_ = {},
-                                           const void *                        pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : DeviceDeviceMemoryReportCreateInfoEXT( flags_, reinterpret_cast<PFN_DeviceMemoryReportCallbackEXT>( pfnUserCallback_ ), pUserData_, pNext_ )
-    {
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-
     DeviceDeviceMemoryReportCreateInfoEXT & operator=( DeviceDeviceMemoryReportCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceDeviceMemoryReportCreateInfoEXT & operator=( VkDeviceDeviceMemoryReportCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceDeviceMemoryReportCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceDeviceMemoryReportCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceDeviceMemoryReportCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceDeviceMemoryReportCreateInfoEXT & setFlags( DeviceMemoryReportFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceDeviceMemoryReportCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceDeviceMemoryReportCreateInfoEXT & setPfnUserCallback( PFN_DeviceMemoryReportCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceDeviceMemoryReportCreateInfoEXT &
+      setPfnUserCallback( PFN_vkDeviceMemoryReportCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnUserCallback = pfnUserCallback_;
       return *this;
@@ -38860,24 +27168,7 @@ namespace VULKAN_HPP_NAMESPACE
       pUserData = pUserData_;
       return *this;
     }
-
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic push
-#    if defined( __clang__ )
-#      pragma clang diagnostic ignored "-Wunknown-warning-option"
-#    endif
-#    pragma GCC diagnostic ignored "-Wcast-function-type"
-#  endif
-    VULKAN_HPP_DEPRECATED( "This setter is deprecated. Use the one taking a function pointer type from the vk-namespace instead." )
-
-    DeviceDeviceMemoryReportCreateInfoEXT & setPfnUserCallback( PFN_vkDeviceMemoryReportCallbackEXT pfnUserCallback_ ) VULKAN_HPP_NOEXCEPT
-    {
-      return setPfnUserCallback( reinterpret_cast<PFN_DeviceMemoryReportCallbackEXT>( pfnUserCallback_ ) );
-    }
-#  if defined( __clang__ ) || defined( __GNUC__ )
-#    pragma GCC diagnostic pop
-#  endif
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceDeviceMemoryReportCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -38889,18 +27180,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceDeviceMemoryReportCreateInfoEXT *>( this );
     }
 
-    operator VkDeviceDeviceMemoryReportCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceDeviceMemoryReportCreateInfoEXT *>( this );
-    }
-
-    operator VkDeviceDeviceMemoryReportCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceDeviceMemoryReportCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemoryReportFlagsEXT const &, PFN_DeviceMemoryReportCallbackEXT const &, void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT const &,
+               PFN_vkDeviceMemoryReportCallbackEXT const &,
+               void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pfnUserCallback, pUserData );
@@ -38923,29 +27212,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                     sType           = StructureType::eDeviceDeviceMemoryReportCreateInfoEXT;
-    const void *                      pNext           = {};
-    DeviceMemoryReportFlagsEXT        flags           = {};
-    PFN_DeviceMemoryReportCallbackEXT pfnUserCallback = {};
-    void *                            pUserData       = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType           = StructureType::eDeviceDeviceMemoryReportCreateInfoEXT;
+    const void *                                     pNext           = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT flags           = {};
+    PFN_vkDeviceMemoryReportCallbackEXT              pfnUserCallback = {};
+    void *                                           pUserData       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceDeviceMemoryReportCreateInfoEXT>
-  {
-    using Type = DeviceDeviceMemoryReportCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceDeviceMemoryReportCreateInfoEXT>
   {
     using Type = DeviceDeviceMemoryReportCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkDeviceDiagnosticsConfigCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceDiagnosticsConfigCreateInfoNV.html
   struct DeviceDiagnosticsConfigCreateInfoNV
   {
     using NativeType = VkDeviceDiagnosticsConfigCreateInfoNV;
@@ -38953,10 +27232,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceDiagnosticsConfigCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceDiagnosticsConfigCreateInfoNV( DeviceDiagnosticsConfigFlagsNV flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceDiagnosticsConfigCreateInfoNV( VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagsNV flags_ = {},
+                                                              const void *                                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -38968,27 +27248,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceDiagnosticsConfigCreateInfoNV & operator=( DeviceDiagnosticsConfigCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceDiagnosticsConfigCreateInfoNV & operator=( VkDeviceDiagnosticsConfigCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceDiagnosticsConfigCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceDiagnosticsConfigCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceDiagnosticsConfigCreateInfoNV & setFlags( DeviceDiagnosticsConfigFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceDiagnosticsConfigCreateInfoNV & setFlags( VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceDiagnosticsConfigCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39000,18 +27280,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceDiagnosticsConfigCreateInfoNV *>( this );
     }
 
-    operator VkDeviceDiagnosticsConfigCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceDiagnosticsConfigCreateInfoNV *>( this );
-    }
-
-    operator VkDeviceDiagnosticsConfigCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceDiagnosticsConfigCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceDiagnosticsConfigFlagsNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagsNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -39036,26 +27311,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType = StructureType::eDeviceDiagnosticsConfigCreateInfoNV;
-    const void *                   pNext = {};
-    DeviceDiagnosticsConfigFlagsNV flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType = StructureType::eDeviceDiagnosticsConfigCreateInfoNV;
+    const void *                                         pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceDiagnosticsConfigFlagsNV flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceDiagnosticsConfigCreateInfoNV>
-  {
-    using Type = DeviceDiagnosticsConfigCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceDiagnosticsConfigCreateInfoNV>
   {
     using Type = DeviceDiagnosticsConfigCreateInfoNV;
   };
 
-  // wrapper struct for struct VkDeviceEventInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceEventInfoEXT.html
   struct DeviceEventInfoEXT
   {
     using NativeType = VkDeviceEventInfoEXT;
@@ -39063,11 +27329,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceEventInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceEventInfoEXT( DeviceEventTypeEXT deviceEvent_ = DeviceEventTypeEXT::eDisplayHotplug,
-                                             const void *       pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceEvent{ deviceEvent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceEventInfoEXT( VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT deviceEvent_ = VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT::eDisplayHotplug,
+                                             const void *                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceEvent( deviceEvent_ )
     {
     }
 
@@ -39076,27 +27342,27 @@ namespace VULKAN_HPP_NAMESPACE
     DeviceEventInfoEXT( VkDeviceEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT : DeviceEventInfoEXT( *reinterpret_cast<DeviceEventInfoEXT const *>( &rhs ) ) {}
 
     DeviceEventInfoEXT & operator=( DeviceEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceEventInfoEXT & operator=( VkDeviceEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceEventInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceEventInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceEventInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceEventInfoEXT & setDeviceEvent( DeviceEventTypeEXT deviceEvent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceEventInfoEXT & setDeviceEvent( VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT deviceEvent_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceEvent = deviceEvent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceEventInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39108,18 +27374,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceEventInfoEXT *>( this );
     }
 
-    operator VkDeviceEventInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceEventInfoEXT *>( this );
-    }
-
-    operator VkDeviceEventInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceEventInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceEventTypeEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceEvent );
     }
@@ -39144,37 +27405,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType       = StructureType::eDeviceEventInfoEXT;
-    const void *       pNext       = {};
-    DeviceEventTypeEXT deviceEvent = DeviceEventTypeEXT::eDisplayHotplug;
+    VULKAN_HPP_NAMESPACE::StructureType      sType       = StructureType::eDeviceEventInfoEXT;
+    const void *                             pNext       = {};
+    VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT deviceEvent = VULKAN_HPP_NAMESPACE::DeviceEventTypeEXT::eDisplayHotplug;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceEventInfoEXT>
-  {
-    using Type = DeviceEventInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceEventInfoEXT>
   {
     using Type = DeviceEventInfoEXT;
   };
 
-  // wrapper struct for struct VkDeviceFaultAddressInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultAddressInfoEXT.html
   struct DeviceFaultAddressInfoEXT
   {
     using NativeType = VkDeviceFaultAddressInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceFaultAddressInfoEXT( DeviceFaultAddressTypeEXT addressType_      = DeviceFaultAddressTypeEXT::eNone,
-                                                    DeviceAddress             reportedAddress_  = {},
-                                                    DeviceSize                addressPrecision_ = {} ) VULKAN_HPP_NOEXCEPT
-      : addressType{ addressType_ }
-      , reportedAddress{ reportedAddress_ }
-      , addressPrecision{ addressPrecision_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DeviceFaultAddressInfoEXT( VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT addressType_      = VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT::eNone,
+                                 VULKAN_HPP_NAMESPACE::DeviceAddress             reportedAddress_  = {},
+                                 VULKAN_HPP_NAMESPACE::DeviceSize                addressPrecision_ = {} ) VULKAN_HPP_NOEXCEPT
+      : addressType( addressType_ )
+      , reportedAddress( reportedAddress_ )
+      , addressPrecision( addressPrecision_ )
     {
     }
 
@@ -39186,33 +27439,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceFaultAddressInfoEXT & operator=( DeviceFaultAddressInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceFaultAddressInfoEXT & operator=( VkDeviceFaultAddressInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceFaultAddressInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setAddressType( DeviceFaultAddressTypeEXT addressType_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setAddressType( VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT addressType_ ) VULKAN_HPP_NOEXCEPT
     {
       addressType = addressType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setReportedAddress( DeviceAddress reportedAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setReportedAddress( VULKAN_HPP_NAMESPACE::DeviceAddress reportedAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       reportedAddress = reportedAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setAddressPrecision( DeviceSize addressPrecision_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceFaultAddressInfoEXT & setAddressPrecision( VULKAN_HPP_NAMESPACE::DeviceSize addressPrecision_ ) VULKAN_HPP_NOEXCEPT
     {
       addressPrecision = addressPrecision_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceFaultAddressInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39224,18 +27477,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceFaultAddressInfoEXT *>( this );
     }
 
-    operator VkDeviceFaultAddressInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceFaultAddressInfoEXT *>( this );
-    }
-
-    operator VkDeviceFaultAddressInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceFaultAddressInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceFaultAddressTypeEXT const &, DeviceAddress const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT const &, VULKAN_HPP_NAMESPACE::DeviceAddress const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( addressType, reportedAddress, addressPrecision );
     }
@@ -39260,20 +27508,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceFaultAddressTypeEXT addressType      = DeviceFaultAddressTypeEXT::eNone;
-    DeviceAddress             reportedAddress  = {};
-    DeviceSize                addressPrecision = {};
+    VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT addressType      = VULKAN_HPP_NAMESPACE::DeviceFaultAddressTypeEXT::eNone;
+    VULKAN_HPP_NAMESPACE::DeviceAddress             reportedAddress  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                addressPrecision = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceFaultAddressInfoEXT>
-  {
-    using Type = DeviceFaultAddressInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDeviceFaultCountsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultCountsEXT.html
   struct DeviceFaultCountsEXT
   {
     using NativeType = VkDeviceFaultCountsEXT;
@@ -39281,15 +27520,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceFaultCountsEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceFaultCountsEXT( uint32_t   addressInfoCount_ = {},
-                                               uint32_t   vendorInfoCount_  = {},
-                                               DeviceSize vendorBinarySize_ = {},
-                                               void *     pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , addressInfoCount{ addressInfoCount_ }
-      , vendorInfoCount{ vendorInfoCount_ }
-      , vendorBinarySize{ vendorBinarySize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceFaultCountsEXT( uint32_t                         addressInfoCount_ = {},
+                                               uint32_t                         vendorInfoCount_  = {},
+                                               VULKAN_HPP_NAMESPACE::DeviceSize vendorBinarySize_ = {},
+                                               void *                           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , addressInfoCount( addressInfoCount_ )
+      , vendorInfoCount( vendorInfoCount_ )
+      , vendorBinarySize( vendorBinarySize_ )
     {
     }
 
@@ -39301,15 +27540,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceFaultCountsEXT & operator=( DeviceFaultCountsEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceFaultCountsEXT & operator=( VkDeviceFaultCountsEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceFaultCountsEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultCountsEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -39328,12 +27567,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceFaultCountsEXT & setVendorBinarySize( DeviceSize vendorBinarySize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceFaultCountsEXT & setVendorBinarySize( VULKAN_HPP_NAMESPACE::DeviceSize vendorBinarySize_ ) VULKAN_HPP_NOEXCEPT
     {
       vendorBinarySize = vendorBinarySize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceFaultCountsEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39345,18 +27584,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceFaultCountsEXT *>( this );
     }
 
-    operator VkDeviceFaultCountsEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceFaultCountsEXT *>( this );
-    }
-
-    operator VkDeviceFaultCountsEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceFaultCountsEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, addressInfoCount, vendorInfoCount, vendorBinarySize );
     }
@@ -39382,39 +27616,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::eDeviceFaultCountsEXT;
-    void *        pNext            = {};
-    uint32_t      addressInfoCount = {};
-    uint32_t      vendorInfoCount  = {};
-    DeviceSize    vendorBinarySize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eDeviceFaultCountsEXT;
+    void *                              pNext            = {};
+    uint32_t                            addressInfoCount = {};
+    uint32_t                            vendorInfoCount  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    vendorBinarySize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceFaultCountsEXT>
-  {
-    using Type = DeviceFaultCountsEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceFaultCountsEXT>
   {
     using Type = DeviceFaultCountsEXT;
   };
 
-  // wrapper struct for struct VkDeviceFaultVendorInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultVendorInfoEXT.html
   struct DeviceFaultVendorInfoEXT
   {
     using NativeType = VkDeviceFaultVendorInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultVendorInfoEXT( std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_     = {},
                                                       uint64_t                                          vendorFaultCode_ = {},
                                                       uint64_t                                          vendorFaultData_ = {} ) VULKAN_HPP_NOEXCEPT
-      : description{ description_ }
-      , vendorFaultCode{ vendorFaultCode_ }
-      , vendorFaultData{ vendorFaultData_ }
+      : description( description_ )
+      , vendorFaultCode( vendorFaultCode_ )
+      , vendorFaultData( vendorFaultData_ )
     {
     }
 
@@ -39430,7 +27655,7 @@ namespace VULKAN_HPP_NAMESPACE
       : vendorFaultCode( vendorFaultCode_ ), vendorFaultData( vendorFaultData_ )
     {
       VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
-#    if defined( _WIN32 )
+#    if defined( WIN32 )
       strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
 #    else
       strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
@@ -39439,15 +27664,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceFaultVendorInfoEXT & operator=( DeviceFaultVendorInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceFaultVendorInfoEXT & operator=( VkDeviceFaultVendorInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceFaultVendorInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultVendorInfoEXT & setDescription( std::array<char, VK_MAX_DESCRIPTION_SIZE> description_ ) VULKAN_HPP_NOEXCEPT
     {
       description = description_;
@@ -39458,7 +27683,7 @@ namespace VULKAN_HPP_NAMESPACE
     DeviceFaultVendorInfoEXT & setDescription( std::string const & description_ ) VULKAN_HPP_NOEXCEPT
     {
       VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
-#    if defined( _WIN32 )
+#    if defined( WIN32 )
       strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
 #    else
       strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
@@ -39478,7 +27703,7 @@ namespace VULKAN_HPP_NAMESPACE
       vendorFaultData = vendorFaultData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceFaultVendorInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39490,18 +27715,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceFaultVendorInfoEXT *>( this );
     }
 
-    operator VkDeviceFaultVendorInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceFaultVendorInfoEXT *>( this );
-    }
-
-    operator VkDeviceFaultVendorInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceFaultVendorInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &, uint64_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &, uint64_t const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( description, vendorFaultCode, vendorFaultData );
     }
@@ -39532,20 +27752,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description     = {};
-    uint64_t                                      vendorFaultCode = {};
-    uint64_t                                      vendorFaultData = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description     = {};
+    uint64_t                                                            vendorFaultCode = {};
+    uint64_t                                                            vendorFaultData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceFaultVendorInfoEXT>
-  {
-    using Type = DeviceFaultVendorInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDeviceFaultInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultInfoEXT.html
   struct DeviceFaultInfoEXT
   {
     using NativeType = VkDeviceFaultInfoEXT;
@@ -39553,33 +27764,75 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceFaultInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultInfoEXT( std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_       = {},
-                                                DeviceFaultAddressInfoEXT *                       pAddressInfos_     = {},
-                                                DeviceFaultVendorInfoEXT *                        pVendorInfos_      = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT * pAddressInfos_     = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT *  pVendorInfos_      = {},
                                                 void *                                            pVendorBinaryData_ = {},
                                                 void *                                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , description{ description_ }
-      , pAddressInfos{ pAddressInfos_ }
-      , pVendorInfos{ pVendorInfos_ }
-      , pVendorBinaryData{ pVendorBinaryData_ }
+      : pNext( pNext_ )
+      , description( description_ )
+      , pAddressInfos( pAddressInfos_ )
+      , pVendorInfos( pVendorInfos_ )
+      , pVendorBinaryData( pVendorBinaryData_ )
     {
     }
 
+#  ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultInfoEXT( DeviceFaultInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
     DeviceFaultInfoEXT( VkDeviceFaultInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT : DeviceFaultInfoEXT( *reinterpret_cast<DeviceFaultInfoEXT const *>( &rhs ) ) {}
 
     DeviceFaultInfoEXT & operator=( DeviceFaultInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  else
+    DeviceFaultInfoEXT( DeviceFaultInfoEXT const & )             = delete;
+    DeviceFaultInfoEXT & operator=( DeviceFaultInfoEXT const & ) = delete;
 
-    DeviceFaultInfoEXT & operator=( VkDeviceFaultInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    DeviceFaultInfoEXT( DeviceFaultInfoEXT && rhs ) VULKAN_HPP_NOEXCEPT
+      : pNext( rhs.pNext )
+      , pAddressInfos( rhs.pAddressInfos )
+      , pVendorInfos( rhs.pVendorInfos )
+      , pVendorBinaryData( rhs.pVendorBinaryData )
     {
-      *this = *reinterpret_cast<DeviceFaultInfoEXT const *>( &rhs );
+      memcpy( description, rhs.description, VK_MAX_DESCRIPTION_SIZE );
+
+      rhs.pNext = nullptr;
+      memset( rhs.description, 0, VK_MAX_DESCRIPTION_SIZE );
+      rhs.pAddressInfos     = nullptr;
+      rhs.pVendorInfos      = nullptr;
+      rhs.pVendorBinaryData = nullptr;
+    }
+
+    DeviceFaultInfoEXT & operator=( DeviceFaultInfoEXT && rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      free( pAddressInfos );
+      free( pVendorInfos );
+      free( pVendorBinaryData );
+
+      pNext = rhs.pNext;
+      memcpy( description, rhs.description, VK_MAX_DESCRIPTION_SIZE );
+      pAddressInfos     = rhs.pAddressInfos;
+      pVendorInfos      = rhs.pVendorInfos;
+      pVendorBinaryData = rhs.pVendorBinaryData;
+
+      rhs.pNext = nullptr;
+      memset( rhs.description, 0, VK_MAX_DESCRIPTION_SIZE );
+      rhs.pAddressInfos     = nullptr;
+      rhs.pVendorInfos      = nullptr;
+      rhs.pVendorBinaryData = nullptr;
+
       return *this;
     }
 
+    ~DeviceFaultInfoEXT() VULKAN_HPP_NOEXCEPT
+    {
+      free( pAddressInfos );
+      free( pVendorInfos );
+      free( pVendorBinaryData );
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+#endif   /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
     operator VkDeviceFaultInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkDeviceFaultInfoEXT *>( this );
@@ -39590,23 +27843,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceFaultInfoEXT *>( this );
     }
 
-    operator VkDeviceFaultInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceFaultInfoEXT *>( this );
-    }
-
-    operator VkDeviceFaultInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceFaultInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               DeviceFaultAddressInfoEXT * const &,
-               DeviceFaultVendorInfoEXT * const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT * const &,
+               VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT * const &,
                void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, description, pAddressInfos, pVendorInfos, pVendorBinaryData );
@@ -39645,58 +27892,48 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType             = StructureType::eDeviceFaultInfoEXT;
-    void *                                        pNext             = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description       = {};
-    DeviceFaultAddressInfoEXT *                   pAddressInfos     = {};
-    DeviceFaultVendorInfoEXT *                    pVendorInfos      = {};
-    void *                                        pVendorBinaryData = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType             = StructureType::eDeviceFaultInfoEXT;
+    void *                                                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description       = {};
+    VULKAN_HPP_NAMESPACE::DeviceFaultAddressInfoEXT *                   pAddressInfos     = {};
+    VULKAN_HPP_NAMESPACE::DeviceFaultVendorInfoEXT *                    pVendorInfos      = {};
+    void *                                                              pVendorBinaryData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceFaultInfoEXT>
-  {
-    using Type = DeviceFaultInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceFaultInfoEXT>
   {
     using Type = DeviceFaultInfoEXT;
   };
 
-  // wrapper struct for struct VkDeviceFaultVendorBinaryHeaderVersionOneEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceFaultVendorBinaryHeaderVersionOneEXT.html
   struct DeviceFaultVendorBinaryHeaderVersionOneEXT
   {
     using NativeType = VkDeviceFaultVendorBinaryHeaderVersionOneEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      DeviceFaultVendorBinaryHeaderVersionOneEXT( uint32_t                                  headerSize_        = {},
-                                                  DeviceFaultVendorBinaryHeaderVersionEXT   headerVersion_     = DeviceFaultVendorBinaryHeaderVersionEXT::eOne,
-                                                  uint32_t                                  vendorID_          = {},
-                                                  uint32_t                                  deviceID_          = {},
-                                                  uint32_t                                  driverVersion_     = {},
-                                                  std::array<uint8_t, VK_UUID_SIZE> const & pipelineCacheUUID_ = {},
-                                                  uint32_t                                  applicationNameOffset_ = {},
-                                                  uint32_t                                  applicationVersion_    = {},
-                                                  uint32_t                                  engineNameOffset_      = {},
-                                                  uint32_t                                  engineVersion_         = {},
-                                                  uint32_t                                  apiVersion_            = {} ) VULKAN_HPP_NOEXCEPT
-      : headerSize{ headerSize_ }
-      , headerVersion{ headerVersion_ }
-      , vendorID{ vendorID_ }
-      , deviceID{ deviceID_ }
-      , driverVersion{ driverVersion_ }
-      , pipelineCacheUUID{ pipelineCacheUUID_ }
-      , applicationNameOffset{ applicationNameOffset_ }
-      , applicationVersion{ applicationVersion_ }
-      , engineNameOffset{ engineNameOffset_ }
-      , engineVersion{ engineVersion_ }
-      , apiVersion{ apiVersion_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceFaultVendorBinaryHeaderVersionOneEXT(
+      uint32_t                                                      headerSize_        = {},
+      VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT headerVersion_     = VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT::eOne,
+      uint32_t                                                      vendorID_          = {},
+      uint32_t                                                      deviceID_          = {},
+      uint32_t                                                      driverVersion_     = {},
+      std::array<uint8_t, VK_UUID_SIZE> const &                     pipelineCacheUUID_ = {},
+      uint32_t                                                      applicationNameOffset_ = {},
+      uint32_t                                                      applicationVersion_    = {},
+      uint32_t                                                      engineNameOffset_      = {},
+      uint32_t                                                      engineVersion_         = {},
+      uint32_t                                                      apiVersion_            = {} ) VULKAN_HPP_NOEXCEPT
+      : headerSize( headerSize_ )
+      , headerVersion( headerVersion_ )
+      , vendorID( vendorID_ )
+      , deviceID( deviceID_ )
+      , driverVersion( driverVersion_ )
+      , pipelineCacheUUID( pipelineCacheUUID_ )
+      , applicationNameOffset( applicationNameOffset_ )
+      , applicationVersion( applicationVersion_ )
+      , engineNameOffset( engineNameOffset_ )
+      , engineVersion( engineVersion_ )
+      , apiVersion( apiVersion_ )
     {
     }
 
@@ -39708,15 +27945,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceFaultVendorBinaryHeaderVersionOneEXT & operator=( DeviceFaultVendorBinaryHeaderVersionOneEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceFaultVendorBinaryHeaderVersionOneEXT & operator=( VkDeviceFaultVendorBinaryHeaderVersionOneEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceFaultVendorBinaryHeaderVersionOneEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionOneEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultVendorBinaryHeaderVersionOneEXT & setHeaderSize( uint32_t headerSize_ ) VULKAN_HPP_NOEXCEPT
     {
       headerSize = headerSize_;
@@ -39724,7 +27961,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 DeviceFaultVendorBinaryHeaderVersionOneEXT &
-      setHeaderVersion( DeviceFaultVendorBinaryHeaderVersionEXT headerVersion_ ) VULKAN_HPP_NOEXCEPT
+      setHeaderVersion( VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT headerVersion_ ) VULKAN_HPP_NOEXCEPT
     {
       headerVersion = headerVersion_;
       return *this;
@@ -39784,7 +28021,7 @@ namespace VULKAN_HPP_NAMESPACE
       apiVersion = apiVersion_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceFaultVendorBinaryHeaderVersionOneEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39796,28 +28033,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceFaultVendorBinaryHeaderVersionOneEXT *>( this );
     }
 
-    operator VkDeviceFaultVendorBinaryHeaderVersionOneEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceFaultVendorBinaryHeaderVersionOneEXT *>( this );
-    }
-
-    operator VkDeviceFaultVendorBinaryHeaderVersionOneEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceFaultVendorBinaryHeaderVersionOneEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<uint32_t const &,
-               DeviceFaultVendorBinaryHeaderVersionEXT const &,
+               VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( headerSize,
@@ -39856,28 +28087,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                                headerSize            = {};
-    DeviceFaultVendorBinaryHeaderVersionEXT headerVersion         = DeviceFaultVendorBinaryHeaderVersionEXT::eOne;
-    uint32_t                                vendorID              = {};
-    uint32_t                                deviceID              = {};
-    uint32_t                                driverVersion         = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE>   pipelineCacheUUID     = {};
-    uint32_t                                applicationNameOffset = {};
-    uint32_t                                applicationVersion    = {};
-    uint32_t                                engineNameOffset      = {};
-    uint32_t                                engineVersion         = {};
-    uint32_t                                apiVersion            = {};
+    uint32_t                                                      headerSize            = {};
+    VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT headerVersion         = VULKAN_HPP_NAMESPACE::DeviceFaultVendorBinaryHeaderVersionEXT::eOne;
+    uint32_t                                                      vendorID              = {};
+    uint32_t                                                      deviceID              = {};
+    uint32_t                                                      driverVersion         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE>   pipelineCacheUUID     = {};
+    uint32_t                                                      applicationNameOffset = {};
+    uint32_t                                                      applicationVersion    = {};
+    uint32_t                                                      engineNameOffset      = {};
+    uint32_t                                                      engineVersion         = {};
+    uint32_t                                                      apiVersion            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceFaultVendorBinaryHeaderVersionOneEXT>
-  {
-    using Type = DeviceFaultVendorBinaryHeaderVersionOneEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDeviceGroupBindSparseInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupBindSparseInfo.html
   struct DeviceGroupBindSparseInfo
   {
     using NativeType = VkDeviceGroupBindSparseInfo;
@@ -39885,12 +28107,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupBindSparseInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       DeviceGroupBindSparseInfo( uint32_t resourceDeviceIndex_ = {}, uint32_t memoryDeviceIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , resourceDeviceIndex{ resourceDeviceIndex_ }
-      , memoryDeviceIndex{ memoryDeviceIndex_ }
+      : pNext( pNext_ )
+      , resourceDeviceIndex( resourceDeviceIndex_ )
+      , memoryDeviceIndex( memoryDeviceIndex_ )
     {
     }
 
@@ -39902,15 +28124,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceGroupBindSparseInfo & operator=( DeviceGroupBindSparseInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupBindSparseInfo & operator=( VkDeviceGroupBindSparseInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupBindSparseInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupBindSparseInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupBindSparseInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -39928,7 +28150,7 @@ namespace VULKAN_HPP_NAMESPACE
       memoryDeviceIndex = memoryDeviceIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupBindSparseInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -39940,18 +28162,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupBindSparseInfo *>( this );
     }
 
-    operator VkDeviceGroupBindSparseInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupBindSparseInfo *>( this );
-    }
-
-    operator VkDeviceGroupBindSparseInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupBindSparseInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, resourceDeviceIndex, memoryDeviceIndex );
     }
@@ -39977,20 +28194,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eDeviceGroupBindSparseInfo;
-    const void *  pNext               = {};
-    uint32_t      resourceDeviceIndex = {};
-    uint32_t      memoryDeviceIndex   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eDeviceGroupBindSparseInfo;
+    const void *                        pNext               = {};
+    uint32_t                            resourceDeviceIndex = {};
+    uint32_t                            memoryDeviceIndex   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupBindSparseInfo>
-  {
-    using Type = DeviceGroupBindSparseInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupBindSparseInfo>
   {
@@ -39999,8 +28208,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceGroupBindSparseInfoKHR = DeviceGroupBindSparseInfo;
 
-  // wrapper struct for struct VkDeviceGroupCommandBufferBeginInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupCommandBufferBeginInfo.html
   struct DeviceGroupCommandBufferBeginInfo
   {
     using NativeType = VkDeviceGroupCommandBufferBeginInfo;
@@ -40008,10 +28215,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupCommandBufferBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DeviceGroupCommandBufferBeginInfo( uint32_t deviceMask_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceMask{ deviceMask_ }
+      : pNext( pNext_ )
+      , deviceMask( deviceMask_ )
     {
     }
 
@@ -40023,15 +28230,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceGroupCommandBufferBeginInfo & operator=( DeviceGroupCommandBufferBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupCommandBufferBeginInfo & operator=( VkDeviceGroupCommandBufferBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupCommandBufferBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupCommandBufferBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupCommandBufferBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -40043,7 +28250,7 @@ namespace VULKAN_HPP_NAMESPACE
       deviceMask = deviceMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupCommandBufferBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40055,18 +28262,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupCommandBufferBeginInfo *>( this );
     }
 
-    operator VkDeviceGroupCommandBufferBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupCommandBufferBeginInfo *>( this );
-    }
-
-    operator VkDeviceGroupCommandBufferBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupCommandBufferBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceMask );
     }
@@ -40091,19 +28293,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eDeviceGroupCommandBufferBeginInfo;
-    const void *  pNext      = {};
-    uint32_t      deviceMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eDeviceGroupCommandBufferBeginInfo;
+    const void *                        pNext      = {};
+    uint32_t                            deviceMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupCommandBufferBeginInfo>
-  {
-    using Type = DeviceGroupCommandBufferBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupCommandBufferBeginInfo>
   {
@@ -40112,7 +28306,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceGroupCommandBufferBeginInfoKHR = DeviceGroupCommandBufferBeginInfo;
 
-  // wrapper struct for struct VkDeviceGroupDeviceCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupDeviceCreateInfo.html
   struct DeviceGroupDeviceCreateInfo
   {
     using NativeType = VkDeviceGroupDeviceCreateInfo;
@@ -40120,13 +28313,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupDeviceCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceGroupDeviceCreateInfo( uint32_t               physicalDeviceCount_ = {},
-                                                      const PhysicalDevice * pPhysicalDevices_    = {},
-                                                      const void *           pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , physicalDeviceCount{ physicalDeviceCount_ }
-      , pPhysicalDevices{ pPhysicalDevices_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceGroupDeviceCreateInfo( uint32_t                                     physicalDeviceCount_ = {},
+                                                      const VULKAN_HPP_NAMESPACE::PhysicalDevice * pPhysicalDevices_    = {},
+                                                      const void *                                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , physicalDeviceCount( physicalDeviceCount_ )
+      , pPhysicalDevices( pPhysicalDevices_ )
     {
     }
 
@@ -40138,22 +28331,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupDeviceCreateInfo( ArrayProxyNoTemporaries<const PhysicalDevice> const & physicalDevices_, const void * pNext_ = nullptr )
+    DeviceGroupDeviceCreateInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PhysicalDevice> const & physicalDevices_,
+                                 const void *                                                                                      pNext_ = nullptr )
       : pNext( pNext_ ), physicalDeviceCount( static_cast<uint32_t>( physicalDevices_.size() ) ), pPhysicalDevices( physicalDevices_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceGroupDeviceCreateInfo & operator=( DeviceGroupDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupDeviceCreateInfo & operator=( VkDeviceGroupDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupDeviceCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupDeviceCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupDeviceCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -40166,21 +28360,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceGroupDeviceCreateInfo & setPPhysicalDevices( const PhysicalDevice * pPhysicalDevices_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceGroupDeviceCreateInfo &
+      setPPhysicalDevices( const VULKAN_HPP_NAMESPACE::PhysicalDevice * pPhysicalDevices_ ) VULKAN_HPP_NOEXCEPT
     {
       pPhysicalDevices = pPhysicalDevices_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupDeviceCreateInfo & setPhysicalDevices( ArrayProxyNoTemporaries<const PhysicalDevice> const & physicalDevices_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupDeviceCreateInfo & setPhysicalDevices(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PhysicalDevice> const & physicalDevices_ ) VULKAN_HPP_NOEXCEPT
     {
       physicalDeviceCount = static_cast<uint32_t>( physicalDevices_.size() );
       pPhysicalDevices    = physicalDevices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupDeviceCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40192,18 +28388,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupDeviceCreateInfo *>( this );
     }
 
-    operator VkDeviceGroupDeviceCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupDeviceCreateInfo *>( this );
-    }
-
-    operator VkDeviceGroupDeviceCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupDeviceCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PhysicalDevice * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::PhysicalDevice * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, physicalDeviceCount, pPhysicalDevices );
     }
@@ -40229,20 +28420,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType               = StructureType::eDeviceGroupDeviceCreateInfo;
-    const void *           pNext               = {};
-    uint32_t               physicalDeviceCount = {};
-    const PhysicalDevice * pPhysicalDevices    = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType               = StructureType::eDeviceGroupDeviceCreateInfo;
+    const void *                                 pNext               = {};
+    uint32_t                                     physicalDeviceCount = {};
+    const VULKAN_HPP_NAMESPACE::PhysicalDevice * pPhysicalDevices    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupDeviceCreateInfo>
-  {
-    using Type = DeviceGroupDeviceCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupDeviceCreateInfo>
   {
@@ -40251,8 +28434,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceGroupDeviceCreateInfoKHR = DeviceGroupDeviceCreateInfo;
 
-  // wrapper struct for struct VkDeviceGroupPresentCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupPresentCapabilitiesKHR.html
   struct DeviceGroupPresentCapabilitiesKHR
   {
     using NativeType = VkDeviceGroupPresentCapabilitiesKHR;
@@ -40260,13 +28441,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupPresentCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupPresentCapabilitiesKHR( std::array<uint32_t, VK_MAX_DEVICE_GROUP_SIZE> const & presentMask_ = {},
-                                                               DeviceGroupPresentModeFlagsKHR                         modes_       = {},
+                                                               VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR   modes_       = {},
                                                                void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentMask{ presentMask_ }
-      , modes{ modes_ }
+      : pNext( pNext_ )
+      , presentMask( presentMask_ )
+      , modes( modes_ )
     {
     }
 
@@ -40278,11 +28459,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceGroupPresentCapabilitiesKHR & operator=( DeviceGroupPresentCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupPresentCapabilitiesKHR & operator=( VkDeviceGroupPresentCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupPresentCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupPresentCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -40296,18 +28477,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( this );
     }
 
-    operator VkDeviceGroupPresentCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupPresentCapabilitiesKHR *>( this );
-    }
-
-    operator VkDeviceGroupPresentCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupPresentCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ArrayWrapper1D<uint32_t, VK_MAX_DEVICE_GROUP_SIZE> const &, DeviceGroupPresentModeFlagsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, VK_MAX_DEVICE_GROUP_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentMask, modes );
@@ -40333,27 +28511,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                      sType       = StructureType::eDeviceGroupPresentCapabilitiesKHR;
-    void *                                             pNext       = {};
-    ArrayWrapper1D<uint32_t, VK_MAX_DEVICE_GROUP_SIZE> presentMask = {};
-    DeviceGroupPresentModeFlagsKHR                     modes       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                      sType       = StructureType::eDeviceGroupPresentCapabilitiesKHR;
+    void *                                                                   pNext       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, VK_MAX_DEVICE_GROUP_SIZE> presentMask = {};
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR                     modes       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupPresentCapabilitiesKHR>
-  {
-    using Type = DeviceGroupPresentCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupPresentCapabilitiesKHR>
   {
     using Type = DeviceGroupPresentCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkDeviceGroupPresentInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupPresentInfoKHR.html
   struct DeviceGroupPresentInfoKHR
   {
     using NativeType = VkDeviceGroupPresentInfoKHR;
@@ -40361,15 +28530,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupPresentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceGroupPresentInfoKHR( uint32_t                          swapchainCount_ = {},
-                                                    const uint32_t *                  pDeviceMasks_   = {},
-                                                    DeviceGroupPresentModeFlagBitsKHR mode_           = DeviceGroupPresentModeFlagBitsKHR::eLocal,
-                                                    const void *                      pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pDeviceMasks{ pDeviceMasks_ }
-      , mode{ mode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceGroupPresentInfoKHR(
+      uint32_t                                                swapchainCount_ = {},
+      const uint32_t *                                        pDeviceMasks_   = {},
+      VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR mode_           = VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR::eLocal,
+      const void *                                            pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pDeviceMasks( pDeviceMasks_ )
+      , mode( mode_ )
     {
     }
 
@@ -40381,24 +28551,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupPresentInfoKHR( ArrayProxyNoTemporaries<const uint32_t> const & deviceMasks_,
-                               DeviceGroupPresentModeFlagBitsKHR               mode_  = DeviceGroupPresentModeFlagBitsKHR::eLocal,
-                               const void *                                    pNext_ = nullptr )
+    DeviceGroupPresentInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceMasks_,
+                               VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR mode_  = VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR::eLocal,
+                               const void *                                            pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( deviceMasks_.size() ) ), pDeviceMasks( deviceMasks_.data() ), mode( mode_ )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceGroupPresentInfoKHR & operator=( DeviceGroupPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupPresentInfoKHR & operator=( VkDeviceGroupPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupPresentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupPresentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupPresentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -40418,7 +28588,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupPresentInfoKHR & setDeviceMasks( ArrayProxyNoTemporaries<const uint32_t> const & deviceMasks_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupPresentInfoKHR & setDeviceMasks( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & deviceMasks_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( deviceMasks_.size() );
       pDeviceMasks   = deviceMasks_.data();
@@ -40426,12 +28596,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceGroupPresentInfoKHR & setMode( DeviceGroupPresentModeFlagBitsKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceGroupPresentInfoKHR & setMode( VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupPresentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40443,18 +28613,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupPresentInfoKHR *>( this );
     }
 
-    operator VkDeviceGroupPresentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupPresentInfoKHR *>( this );
-    }
-
-    operator VkDeviceGroupPresentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupPresentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &, DeviceGroupPresentModeFlagBitsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const uint32_t * const &,
+               VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pDeviceMasks, mode );
@@ -40481,29 +28649,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType          = StructureType::eDeviceGroupPresentInfoKHR;
-    const void *                      pNext          = {};
-    uint32_t                          swapchainCount = {};
-    const uint32_t *                  pDeviceMasks   = {};
-    DeviceGroupPresentModeFlagBitsKHR mode           = DeviceGroupPresentModeFlagBitsKHR::eLocal;
+    VULKAN_HPP_NAMESPACE::StructureType                     sType          = StructureType::eDeviceGroupPresentInfoKHR;
+    const void *                                            pNext          = {};
+    uint32_t                                                swapchainCount = {};
+    const uint32_t *                                        pDeviceMasks   = {};
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR mode           = VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagBitsKHR::eLocal;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupPresentInfoKHR>
-  {
-    using Type = DeviceGroupPresentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupPresentInfoKHR>
   {
     using Type = DeviceGroupPresentInfoKHR;
   };
 
-  // wrapper struct for struct VkDeviceGroupRenderPassBeginInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupRenderPassBeginInfo.html
   struct DeviceGroupRenderPassBeginInfo
   {
     using NativeType = VkDeviceGroupRenderPassBeginInfo;
@@ -40511,15 +28669,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupRenderPassBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceGroupRenderPassBeginInfo( uint32_t       deviceMask_            = {},
-                                                         uint32_t       deviceRenderAreaCount_ = {},
-                                                         const Rect2D * pDeviceRenderAreas_    = {},
-                                                         const void *   pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceMask{ deviceMask_ }
-      , deviceRenderAreaCount{ deviceRenderAreaCount_ }
-      , pDeviceRenderAreas{ pDeviceRenderAreas_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceGroupRenderPassBeginInfo( uint32_t                             deviceMask_            = {},
+                                                         uint32_t                             deviceRenderAreaCount_ = {},
+                                                         const VULKAN_HPP_NAMESPACE::Rect2D * pDeviceRenderAreas_    = {},
+                                                         const void *                         pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceMask( deviceMask_ )
+      , deviceRenderAreaCount( deviceRenderAreaCount_ )
+      , pDeviceRenderAreas( pDeviceRenderAreas_ )
     {
     }
 
@@ -40531,7 +28689,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupRenderPassBeginInfo( uint32_t deviceMask_, ArrayProxyNoTemporaries<const Rect2D> const & deviceRenderAreas_, const void * pNext_ = nullptr )
+    DeviceGroupRenderPassBeginInfo( uint32_t                                                                                  deviceMask_,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & deviceRenderAreas_,
+                                    const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ )
       , deviceMask( deviceMask_ )
       , deviceRenderAreaCount( static_cast<uint32_t>( deviceRenderAreas_.size() ) )
@@ -40541,15 +28701,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceGroupRenderPassBeginInfo & operator=( DeviceGroupRenderPassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupRenderPassBeginInfo & operator=( VkDeviceGroupRenderPassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupRenderPassBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupRenderPassBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupRenderPassBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -40568,21 +28728,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceGroupRenderPassBeginInfo & setPDeviceRenderAreas( const Rect2D * pDeviceRenderAreas_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceGroupRenderPassBeginInfo &
+      setPDeviceRenderAreas( const VULKAN_HPP_NAMESPACE::Rect2D * pDeviceRenderAreas_ ) VULKAN_HPP_NOEXCEPT
     {
       pDeviceRenderAreas = pDeviceRenderAreas_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupRenderPassBeginInfo & setDeviceRenderAreas( ArrayProxyNoTemporaries<const Rect2D> const & deviceRenderAreas_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupRenderPassBeginInfo &
+      setDeviceRenderAreas( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & deviceRenderAreas_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceRenderAreaCount = static_cast<uint32_t>( deviceRenderAreas_.size() );
       pDeviceRenderAreas    = deviceRenderAreas_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupRenderPassBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40594,18 +28756,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupRenderPassBeginInfo *>( this );
     }
 
-    operator VkDeviceGroupRenderPassBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupRenderPassBeginInfo *>( this );
-    }
-
-    operator VkDeviceGroupRenderPassBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupRenderPassBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const Rect2D * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceMask, deviceRenderAreaCount, pDeviceRenderAreas );
     }
@@ -40631,21 +28789,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType                 = StructureType::eDeviceGroupRenderPassBeginInfo;
-    const void *   pNext                 = {};
-    uint32_t       deviceMask            = {};
-    uint32_t       deviceRenderAreaCount = {};
-    const Rect2D * pDeviceRenderAreas    = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType                 = StructureType::eDeviceGroupRenderPassBeginInfo;
+    const void *                         pNext                 = {};
+    uint32_t                             deviceMask            = {};
+    uint32_t                             deviceRenderAreaCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D * pDeviceRenderAreas    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupRenderPassBeginInfo>
-  {
-    using Type = DeviceGroupRenderPassBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupRenderPassBeginInfo>
   {
@@ -40654,7 +28804,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceGroupRenderPassBeginInfoKHR = DeviceGroupRenderPassBeginInfo;
 
-  // wrapper struct for struct VkDeviceGroupSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupSubmitInfo.html
   struct DeviceGroupSubmitInfo
   {
     using NativeType = VkDeviceGroupSubmitInfo;
@@ -40662,7 +28811,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DeviceGroupSubmitInfo( uint32_t         waitSemaphoreCount_            = {},
                                                 const uint32_t * pWaitSemaphoreDeviceIndices_   = {},
                                                 uint32_t         commandBufferCount_            = {},
@@ -40670,13 +28819,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                 uint32_t         signalSemaphoreCount_          = {},
                                                 const uint32_t * pSignalSemaphoreDeviceIndices_ = {},
                                                 const void *     pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreCount{ waitSemaphoreCount_ }
-      , pWaitSemaphoreDeviceIndices{ pWaitSemaphoreDeviceIndices_ }
-      , commandBufferCount{ commandBufferCount_ }
-      , pCommandBufferDeviceMasks{ pCommandBufferDeviceMasks_ }
-      , signalSemaphoreCount{ signalSemaphoreCount_ }
-      , pSignalSemaphoreDeviceIndices{ pSignalSemaphoreDeviceIndices_ }
+      : pNext( pNext_ )
+      , waitSemaphoreCount( waitSemaphoreCount_ )
+      , pWaitSemaphoreDeviceIndices( pWaitSemaphoreDeviceIndices_ )
+      , commandBufferCount( commandBufferCount_ )
+      , pCommandBufferDeviceMasks( pCommandBufferDeviceMasks_ )
+      , signalSemaphoreCount( signalSemaphoreCount_ )
+      , pSignalSemaphoreDeviceIndices( pSignalSemaphoreDeviceIndices_ )
     {
     }
 
@@ -40688,10 +28837,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupSubmitInfo( ArrayProxyNoTemporaries<const uint32_t> const & waitSemaphoreDeviceIndices_,
-                           ArrayProxyNoTemporaries<const uint32_t> const & commandBufferDeviceMasks_     = {},
-                           ArrayProxyNoTemporaries<const uint32_t> const & signalSemaphoreDeviceIndices_ = {},
-                           const void *                                    pNext_                        = nullptr )
+    DeviceGroupSubmitInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & waitSemaphoreDeviceIndices_,
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & commandBufferDeviceMasks_     = {},
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & signalSemaphoreDeviceIndices_ = {},
+                           const void *                                                          pNext_                        = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreCount( static_cast<uint32_t>( waitSemaphoreDeviceIndices_.size() ) )
       , pWaitSemaphoreDeviceIndices( waitSemaphoreDeviceIndices_.data() )
@@ -40704,15 +28853,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DeviceGroupSubmitInfo & operator=( DeviceGroupSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupSubmitInfo & operator=( VkDeviceGroupSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupSubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupSubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupSubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -40732,7 +28881,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupSubmitInfo & setWaitSemaphoreDeviceIndices( ArrayProxyNoTemporaries<const uint32_t> const & waitSemaphoreDeviceIndices_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupSubmitInfo &
+      setWaitSemaphoreDeviceIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & waitSemaphoreDeviceIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreCount          = static_cast<uint32_t>( waitSemaphoreDeviceIndices_.size() );
       pWaitSemaphoreDeviceIndices = waitSemaphoreDeviceIndices_.data();
@@ -40753,7 +28903,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupSubmitInfo & setCommandBufferDeviceMasks( ArrayProxyNoTemporaries<const uint32_t> const & commandBufferDeviceMasks_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupSubmitInfo &
+      setCommandBufferDeviceMasks( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & commandBufferDeviceMasks_ ) VULKAN_HPP_NOEXCEPT
     {
       commandBufferCount        = static_cast<uint32_t>( commandBufferDeviceMasks_.size() );
       pCommandBufferDeviceMasks = commandBufferDeviceMasks_.data();
@@ -40774,14 +28925,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DeviceGroupSubmitInfo & setSignalSemaphoreDeviceIndices( ArrayProxyNoTemporaries<const uint32_t> const & signalSemaphoreDeviceIndices_ ) VULKAN_HPP_NOEXCEPT
+    DeviceGroupSubmitInfo &
+      setSignalSemaphoreDeviceIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & signalSemaphoreDeviceIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreCount          = static_cast<uint32_t>( signalSemaphoreDeviceIndices_.size() );
       pSignalSemaphoreDeviceIndices = signalSemaphoreDeviceIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40793,18 +28945,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupSubmitInfo *>( this );
     }
 
-    operator VkDeviceGroupSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupSubmitInfo *>( this );
-    }
-
-    operator VkDeviceGroupSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const uint32_t * const &,
@@ -40812,6 +28957,7 @@ namespace VULKAN_HPP_NAMESPACE
                const uint32_t * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -40847,24 +28993,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                         = StructureType::eDeviceGroupSubmitInfo;
-    const void *     pNext                         = {};
-    uint32_t         waitSemaphoreCount            = {};
-    const uint32_t * pWaitSemaphoreDeviceIndices   = {};
-    uint32_t         commandBufferCount            = {};
-    const uint32_t * pCommandBufferDeviceMasks     = {};
-    uint32_t         signalSemaphoreCount          = {};
-    const uint32_t * pSignalSemaphoreDeviceIndices = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::eDeviceGroupSubmitInfo;
+    const void *                        pNext                         = {};
+    uint32_t                            waitSemaphoreCount            = {};
+    const uint32_t *                    pWaitSemaphoreDeviceIndices   = {};
+    uint32_t                            commandBufferCount            = {};
+    const uint32_t *                    pCommandBufferDeviceMasks     = {};
+    uint32_t                            signalSemaphoreCount          = {};
+    const uint32_t *                    pSignalSemaphoreDeviceIndices = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupSubmitInfo>
-  {
-    using Type = DeviceGroupSubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupSubmitInfo>
   {
@@ -40873,8 +29011,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceGroupSubmitInfoKHR = DeviceGroupSubmitInfo;
 
-  // wrapper struct for struct VkDeviceGroupSwapchainCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceGroupSwapchainCreateInfoKHR.html
   struct DeviceGroupSwapchainCreateInfoKHR
   {
     using NativeType = VkDeviceGroupSwapchainCreateInfoKHR;
@@ -40882,10 +29018,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceGroupSwapchainCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceGroupSwapchainCreateInfoKHR( DeviceGroupPresentModeFlagsKHR modes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , modes{ modes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceGroupSwapchainCreateInfoKHR( VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes_ = {},
+                                                            const void *                                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , modes( modes_ )
     {
     }
 
@@ -40897,27 +29034,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceGroupSwapchainCreateInfoKHR & operator=( DeviceGroupSwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceGroupSwapchainCreateInfoKHR & operator=( VkDeviceGroupSwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceGroupSwapchainCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceGroupSwapchainCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceGroupSwapchainCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceGroupSwapchainCreateInfoKHR & setModes( DeviceGroupPresentModeFlagsKHR modes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceGroupSwapchainCreateInfoKHR & setModes( VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes_ ) VULKAN_HPP_NOEXCEPT
     {
       modes = modes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceGroupSwapchainCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -40929,18 +29066,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceGroupSwapchainCreateInfoKHR *>( this );
     }
 
-    operator VkDeviceGroupSwapchainCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceGroupSwapchainCreateInfoKHR *>( this );
-    }
-
-    operator VkDeviceGroupSwapchainCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceGroupSwapchainCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceGroupPresentModeFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, modes );
     }
@@ -40965,26 +29097,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType = StructureType::eDeviceGroupSwapchainCreateInfoKHR;
-    const void *                   pNext = {};
-    DeviceGroupPresentModeFlagsKHR modes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType = StructureType::eDeviceGroupSwapchainCreateInfoKHR;
+    const void *                                         pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceGroupPresentModeFlagsKHR modes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceGroupSwapchainCreateInfoKHR>
-  {
-    using Type = DeviceGroupSwapchainCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceGroupSwapchainCreateInfoKHR>
   {
     using Type = DeviceGroupSwapchainCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkImageCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCreateInfo.html
   struct ImageCreateInfo
   {
     using NativeType = VkImageCreateInfo;
@@ -40992,35 +29115,35 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCreateInfo( ImageCreateFlags    flags_                 = {},
-                                          ImageType           imageType_             = ImageType::e1D,
-                                          Format              format_                = Format::eUndefined,
-                                          Extent3D            extent_                = {},
-                                          uint32_t            mipLevels_             = {},
-                                          uint32_t            arrayLayers_           = {},
-                                          SampleCountFlagBits samples_               = SampleCountFlagBits::e1,
-                                          ImageTiling         tiling_                = ImageTiling::eOptimal,
-                                          ImageUsageFlags     usage_                 = {},
-                                          SharingMode         sharingMode_           = SharingMode::eExclusive,
-                                          uint32_t            queueFamilyIndexCount_ = {},
-                                          const uint32_t *    pQueueFamilyIndices_   = {},
-                                          ImageLayout         initialLayout_         = ImageLayout::eUndefined,
-                                          const void *        pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , imageType{ imageType_ }
-      , format{ format_ }
-      , extent{ extent_ }
-      , mipLevels{ mipLevels_ }
-      , arrayLayers{ arrayLayers_ }
-      , samples{ samples_ }
-      , tiling{ tiling_ }
-      , usage{ usage_ }
-      , sharingMode{ sharingMode_ }
-      , queueFamilyIndexCount{ queueFamilyIndexCount_ }
-      , pQueueFamilyIndices{ pQueueFamilyIndices_ }
-      , initialLayout{ initialLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCreateInfo( VULKAN_HPP_NAMESPACE::ImageCreateFlags    flags_                 = {},
+                                          VULKAN_HPP_NAMESPACE::ImageType           imageType_             = VULKAN_HPP_NAMESPACE::ImageType::e1D,
+                                          VULKAN_HPP_NAMESPACE::Format              format_                = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                          VULKAN_HPP_NAMESPACE::Extent3D            extent_                = {},
+                                          uint32_t                                  mipLevels_             = {},
+                                          uint32_t                                  arrayLayers_           = {},
+                                          VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_               = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                          VULKAN_HPP_NAMESPACE::ImageTiling         tiling_                = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal,
+                                          VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage_                 = {},
+                                          VULKAN_HPP_NAMESPACE::SharingMode         sharingMode_           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive,
+                                          uint32_t                                  queueFamilyIndexCount_ = {},
+                                          const uint32_t *                          pQueueFamilyIndices_   = {},
+                                          VULKAN_HPP_NAMESPACE::ImageLayout         initialLayout_         = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                          const void *                              pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , imageType( imageType_ )
+      , format( format_ )
+      , extent( extent_ )
+      , mipLevels( mipLevels_ )
+      , arrayLayers( arrayLayers_ )
+      , samples( samples_ )
+      , tiling( tiling_ )
+      , usage( usage_ )
+      , sharingMode( sharingMode_ )
+      , queueFamilyIndexCount( queueFamilyIndexCount_ )
+      , pQueueFamilyIndices( pQueueFamilyIndices_ )
+      , initialLayout( initialLayout_ )
     {
     }
 
@@ -41029,19 +29152,19 @@ namespace VULKAN_HPP_NAMESPACE
     ImageCreateInfo( VkImageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : ImageCreateInfo( *reinterpret_cast<ImageCreateInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageCreateInfo( ImageCreateFlags                                flags_,
-                     ImageType                                       imageType_,
-                     Format                                          format_,
-                     Extent3D                                        extent_,
-                     uint32_t                                        mipLevels_,
-                     uint32_t                                        arrayLayers_,
-                     SampleCountFlagBits                             samples_,
-                     ImageTiling                                     tiling_,
-                     ImageUsageFlags                                 usage_,
-                     SharingMode                                     sharingMode_,
-                     ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
-                     ImageLayout                                     initialLayout_ = ImageLayout::eUndefined,
-                     const void *                                    pNext_         = nullptr )
+    ImageCreateInfo( VULKAN_HPP_NAMESPACE::ImageCreateFlags                                flags_,
+                     VULKAN_HPP_NAMESPACE::ImageType                                       imageType_,
+                     VULKAN_HPP_NAMESPACE::Format                                          format_,
+                     VULKAN_HPP_NAMESPACE::Extent3D                                        extent_,
+                     uint32_t                                                              mipLevels_,
+                     uint32_t                                                              arrayLayers_,
+                     VULKAN_HPP_NAMESPACE::SampleCountFlagBits                             samples_,
+                     VULKAN_HPP_NAMESPACE::ImageTiling                                     tiling_,
+                     VULKAN_HPP_NAMESPACE::ImageUsageFlags                                 usage_,
+                     VULKAN_HPP_NAMESPACE::SharingMode                                     sharingMode_,
+                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
+                     VULKAN_HPP_NAMESPACE::ImageLayout                                     initialLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                     const void *                                                          pNext_         = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , imageType( imageType_ )
@@ -41061,40 +29184,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageCreateInfo & operator=( ImageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCreateInfo & operator=( VkImageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setFlags( ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setImageType( ImageType imageType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setImageType( VULKAN_HPP_NAMESPACE::ImageType imageType_ ) VULKAN_HPP_NOEXCEPT
     {
       imageType = imageType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
@@ -41112,25 +29235,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setSamples( SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
     {
       samples = samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setTiling( ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setTiling( VULKAN_HPP_NAMESPACE::ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
     {
       tiling = tiling_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setUsage( ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setSharingMode( SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setSharingMode( VULKAN_HPP_NAMESPACE::SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
     {
       sharingMode = sharingMode_;
       return *this;
@@ -41149,7 +29272,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageCreateInfo & setQueueFamilyIndices( ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
+    ImageCreateInfo & setQueueFamilyIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       queueFamilyIndexCount = static_cast<uint32_t>( queueFamilyIndices_.size() );
       pQueueFamilyIndices   = queueFamilyIndices_.data();
@@ -41157,12 +29280,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setInitialLayout( ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCreateInfo & setInitialLayout( VULKAN_HPP_NAMESPACE::ImageLayout initialLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       initialLayout = initialLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -41174,32 +29297,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCreateInfo *>( this );
     }
 
-    operator VkImageCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCreateInfo *>( this );
-    }
-
-    operator VkImageCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageCreateFlags const &,
-               ImageType const &,
-               Format const &,
-               Extent3D const &,
+               VULKAN_HPP_NAMESPACE::ImageCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageType const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &,
                uint32_t const &,
                uint32_t const &,
-               SampleCountFlagBits const &,
-               ImageTiling const &,
-               ImageUsageFlags const &,
-               SharingMode const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ImageTiling const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::SharingMode const &,
                uint32_t const &,
                const uint32_t * const &,
-               ImageLayout const &>
+               VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -41243,39 +29360,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                 = StructureType::eImageCreateInfo;
-    const void *        pNext                 = {};
-    ImageCreateFlags    flags                 = {};
-    ImageType           imageType             = ImageType::e1D;
-    Format              format                = Format::eUndefined;
-    Extent3D            extent                = {};
-    uint32_t            mipLevels             = {};
-    uint32_t            arrayLayers           = {};
-    SampleCountFlagBits samples               = SampleCountFlagBits::e1;
-    ImageTiling         tiling                = ImageTiling::eOptimal;
-    ImageUsageFlags     usage                 = {};
-    SharingMode         sharingMode           = SharingMode::eExclusive;
-    uint32_t            queueFamilyIndexCount = {};
-    const uint32_t *    pQueueFamilyIndices   = {};
-    ImageLayout         initialLayout         = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType       sType                 = StructureType::eImageCreateInfo;
+    const void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::ImageCreateFlags    flags                 = {};
+    VULKAN_HPP_NAMESPACE::ImageType           imageType             = VULKAN_HPP_NAMESPACE::ImageType::e1D;
+    VULKAN_HPP_NAMESPACE::Format              format                = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Extent3D            extent                = {};
+    uint32_t                                  mipLevels             = {};
+    uint32_t                                  arrayLayers           = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples               = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::ImageTiling         tiling                = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal;
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage                 = {};
+    VULKAN_HPP_NAMESPACE::SharingMode         sharingMode           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive;
+    uint32_t                                  queueFamilyIndexCount = {};
+    const uint32_t *                          pQueueFamilyIndices   = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout         initialLayout         = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCreateInfo>
-  {
-    using Type = ImageCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageCreateInfo>
   {
     using Type = ImageCreateInfo;
   };
 
-  // wrapper struct for struct VkDeviceImageMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceImageMemoryRequirements.html
   struct DeviceImageMemoryRequirements
   {
     using NativeType = VkDeviceImageMemoryRequirements;
@@ -41283,13 +29390,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceImageMemoryRequirements;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceImageMemoryRequirements( const ImageCreateInfo * pCreateInfo_ = {},
-                                                        ImageAspectFlagBits     planeAspect_ = ImageAspectFlagBits::eColor,
-                                                        const void *            pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pCreateInfo{ pCreateInfo_ }
-      , planeAspect{ planeAspect_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DeviceImageMemoryRequirements( const VULKAN_HPP_NAMESPACE::ImageCreateInfo * pCreateInfo_ = {},
+                                     VULKAN_HPP_NAMESPACE::ImageAspectFlagBits     planeAspect_ = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor,
+                                     const void *                                  pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pCreateInfo( pCreateInfo_ )
+      , planeAspect( planeAspect_ )
     {
     }
 
@@ -41301,33 +29409,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceImageMemoryRequirements & operator=( DeviceImageMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceImageMemoryRequirements & operator=( VkDeviceImageMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceImageMemoryRequirements const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceImageMemoryRequirements const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceImageMemoryRequirements & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceImageMemoryRequirements & setPCreateInfo( const ImageCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceImageMemoryRequirements & setPCreateInfo( const VULKAN_HPP_NAMESPACE::ImageCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pCreateInfo = pCreateInfo_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceImageMemoryRequirements & setPlaneAspect( ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceImageMemoryRequirements & setPlaneAspect( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
     {
       planeAspect = planeAspect_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceImageMemoryRequirements const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -41339,18 +29447,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceImageMemoryRequirements *>( this );
     }
 
-    operator VkDeviceImageMemoryRequirements const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceImageMemoryRequirements *>( this );
-    }
-
-    operator VkDeviceImageMemoryRequirements *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceImageMemoryRequirements *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const ImageCreateInfo * const &, ImageAspectFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const VULKAN_HPP_NAMESPACE::ImageCreateInfo * const &,
+               VULKAN_HPP_NAMESPACE::ImageAspectFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pCreateInfo, planeAspect );
     }
@@ -41375,20 +29481,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType       = StructureType::eDeviceImageMemoryRequirements;
-    const void *            pNext       = {};
-    const ImageCreateInfo * pCreateInfo = {};
-    ImageAspectFlagBits     planeAspect = ImageAspectFlagBits::eColor;
+    VULKAN_HPP_NAMESPACE::StructureType           sType       = StructureType::eDeviceImageMemoryRequirements;
+    const void *                                  pNext       = {};
+    const VULKAN_HPP_NAMESPACE::ImageCreateInfo * pCreateInfo = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits     planeAspect = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceImageMemoryRequirements>
-  {
-    using Type = DeviceImageMemoryRequirements;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceImageMemoryRequirements>
   {
@@ -41397,79 +29495,76 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceImageMemoryRequirementsKHR = DeviceImageMemoryRequirements;
 
-  // wrapper struct for struct VkImageSubresource2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSubresource2.html
-  struct ImageSubresource2
+  struct ImageSubresource2KHR
   {
-    using NativeType = VkImageSubresource2;
+    using NativeType = VkImageSubresource2KHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageSubresource2;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageSubresource2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSubresource2( ImageSubresource imageSubresource_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageSubresource{ imageSubresource_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageSubresource2KHR( VULKAN_HPP_NAMESPACE::ImageSubresource imageSubresource_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageSubresource( imageSubresource_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR ImageSubresource2( ImageSubresource2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR ImageSubresource2KHR( ImageSubresource2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    ImageSubresource2( VkImageSubresource2 const & rhs ) VULKAN_HPP_NOEXCEPT : ImageSubresource2( *reinterpret_cast<ImageSubresource2 const *>( &rhs ) ) {}
-
-    ImageSubresource2 & operator=( ImageSubresource2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ImageSubresource2 & operator=( VkImageSubresource2 const & rhs ) VULKAN_HPP_NOEXCEPT
+    ImageSubresource2KHR( VkImageSubresource2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : ImageSubresource2KHR( *reinterpret_cast<ImageSubresource2KHR const *>( &rhs ) )
     {
-      *this = *reinterpret_cast<ImageSubresource2 const *>( &rhs );
+    }
+
+    ImageSubresource2KHR & operator=( ImageSubresource2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    ImageSubresource2KHR & operator=( VkImageSubresource2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSubresource2KHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageSubresource2 & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageSubresource2KHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageSubresource2 & setImageSubresource( ImageSubresource const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageSubresource2KHR & setImageSubresource( VULKAN_HPP_NAMESPACE::ImageSubresource const & imageSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSubresource = imageSubresource_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkImageSubresource2 const &() const VULKAN_HPP_NOEXCEPT
+    operator VkImageSubresource2KHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkImageSubresource2 *>( this );
+      return *reinterpret_cast<const VkImageSubresource2KHR *>( this );
     }
 
-    operator VkImageSubresource2 &() VULKAN_HPP_NOEXCEPT
+    operator VkImageSubresource2KHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkImageSubresource2 *>( this );
-    }
-
-    operator VkImageSubresource2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSubresource2 *>( this );
-    }
-
-    operator VkImageSubresource2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSubresource2 *>( this );
+      return *reinterpret_cast<VkImageSubresource2KHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageSubresource const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageSubresource const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageSubresource );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ImageSubresource2 const & ) const = default;
+    auto operator<=>( ImageSubresource2KHR const & ) const = default;
 #else
-    bool operator==( ImageSubresource2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( ImageSubresource2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -41478,111 +29573,99 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( ImageSubresource2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( ImageSubresource2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType            = StructureType::eImageSubresource2;
-    void *           pNext            = {};
-    ImageSubresource imageSubresource = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType            = StructureType::eImageSubresource2KHR;
+    void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresource imageSubresource = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSubresource2>
-  {
-    using Type = ImageSubresource2;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eImageSubresource2>
+  struct CppType<StructureType, StructureType::eImageSubresource2KHR>
   {
-    using Type = ImageSubresource2;
+    using Type = ImageSubresource2KHR;
   };
 
-  using ImageSubresource2EXT = ImageSubresource2;
-  using ImageSubresource2KHR = ImageSubresource2;
+  using ImageSubresource2EXT = ImageSubresource2KHR;
 
-  // wrapper struct for struct VkDeviceImageSubresourceInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceImageSubresourceInfo.html
-  struct DeviceImageSubresourceInfo
+  struct DeviceImageSubresourceInfoKHR
   {
-    using NativeType = VkDeviceImageSubresourceInfo;
+    using NativeType = VkDeviceImageSubresourceInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceImageSubresourceInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceImageSubresourceInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceImageSubresourceInfo( const ImageCreateInfo *   pCreateInfo_  = {},
-                                                     const ImageSubresource2 * pSubresource_ = {},
-                                                     const void *              pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pCreateInfo{ pCreateInfo_ }
-      , pSubresource{ pSubresource_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceImageSubresourceInfoKHR( const VULKAN_HPP_NAMESPACE::ImageCreateInfo *      pCreateInfo_  = {},
+                                                        const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource_ = {},
+                                                        const void *                                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pCreateInfo( pCreateInfo_ )
+      , pSubresource( pSubresource_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR DeviceImageSubresourceInfo( DeviceImageSubresourceInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR DeviceImageSubresourceInfoKHR( DeviceImageSubresourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    DeviceImageSubresourceInfo( VkDeviceImageSubresourceInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DeviceImageSubresourceInfo( *reinterpret_cast<DeviceImageSubresourceInfo const *>( &rhs ) )
+    DeviceImageSubresourceInfoKHR( VkDeviceImageSubresourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : DeviceImageSubresourceInfoKHR( *reinterpret_cast<DeviceImageSubresourceInfoKHR const *>( &rhs ) )
     {
     }
 
-    DeviceImageSubresourceInfo & operator=( DeviceImageSubresourceInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    DeviceImageSubresourceInfoKHR & operator=( DeviceImageSubresourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    DeviceImageSubresourceInfo & operator=( VkDeviceImageSubresourceInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    DeviceImageSubresourceInfoKHR & operator=( VkDeviceImageSubresourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceImageSubresourceInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceImageSubresourceInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfo & setPCreateInfo( const ImageCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfoKHR & setPCreateInfo( const VULKAN_HPP_NAMESPACE::ImageCreateInfo * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pCreateInfo = pCreateInfo_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfo & setPSubresource( const ImageSubresource2 * pSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceImageSubresourceInfoKHR &
+      setPSubresource( const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       pSubresource = pSubresource_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkDeviceImageSubresourceInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkDeviceImageSubresourceInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkDeviceImageSubresourceInfo *>( this );
+      return *reinterpret_cast<const VkDeviceImageSubresourceInfoKHR *>( this );
     }
 
-    operator VkDeviceImageSubresourceInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkDeviceImageSubresourceInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkDeviceImageSubresourceInfo *>( this );
-    }
-
-    operator VkDeviceImageSubresourceInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceImageSubresourceInfo *>( this );
-    }
-
-    operator VkDeviceImageSubresourceInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceImageSubresourceInfo *>( this );
+      return *reinterpret_cast<VkDeviceImageSubresourceInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const ImageCreateInfo * const &, const ImageSubresource2 * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const VULKAN_HPP_NAMESPACE::ImageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pCreateInfo, pSubresource );
@@ -41590,9 +29673,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DeviceImageSubresourceInfo const & ) const = default;
+    auto operator<=>( DeviceImageSubresourceInfoKHR const & ) const = default;
 #else
-    bool operator==( DeviceImageSubresourceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( DeviceImageSubresourceInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -41601,37 +29684,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( DeviceImageSubresourceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( DeviceImageSubresourceInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType             sType        = StructureType::eDeviceImageSubresourceInfo;
-    const void *              pNext        = {};
-    const ImageCreateInfo *   pCreateInfo  = {};
-    const ImageSubresource2 * pSubresource = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType        = StructureType::eDeviceImageSubresourceInfoKHR;
+    const void *                                       pNext        = {};
+    const VULKAN_HPP_NAMESPACE::ImageCreateInfo *      pCreateInfo  = {};
+    const VULKAN_HPP_NAMESPACE::ImageSubresource2KHR * pSubresource = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceImageSubresourceInfo>
-  {
-    using Type = DeviceImageSubresourceInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eDeviceImageSubresourceInfo>
+  struct CppType<StructureType, StructureType::eDeviceImageSubresourceInfoKHR>
   {
-    using Type = DeviceImageSubresourceInfo;
+    using Type = DeviceImageSubresourceInfoKHR;
   };
 
-  using DeviceImageSubresourceInfoKHR = DeviceImageSubresourceInfo;
-
-  // wrapper struct for struct VkDeviceMemoryOpaqueCaptureAddressInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemoryOpaqueCaptureAddressInfo.html
   struct DeviceMemoryOpaqueCaptureAddressInfo
   {
     using NativeType = VkDeviceMemoryOpaqueCaptureAddressInfo;
@@ -41639,10 +29710,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceMemoryOpaqueCaptureAddressInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceMemoryOpaqueCaptureAddressInfo( DeviceMemory memory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceMemoryOpaqueCaptureAddressInfo( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ = {},
+                                                               const void *                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
     {
     }
 
@@ -41654,27 +29726,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceMemoryOpaqueCaptureAddressInfo & operator=( DeviceMemoryOpaqueCaptureAddressInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceMemoryOpaqueCaptureAddressInfo & operator=( VkDeviceMemoryOpaqueCaptureAddressInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceMemoryOpaqueCaptureAddressInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceMemoryOpaqueCaptureAddressInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceMemoryOpaqueCaptureAddressInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceMemoryOpaqueCaptureAddressInfo & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceMemoryOpaqueCaptureAddressInfo & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceMemoryOpaqueCaptureAddressInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -41686,18 +29758,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceMemoryOpaqueCaptureAddressInfo *>( this );
     }
 
-    operator VkDeviceMemoryOpaqueCaptureAddressInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceMemoryOpaqueCaptureAddressInfo *>( this );
-    }
-
-    operator VkDeviceMemoryOpaqueCaptureAddressInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceMemoryOpaqueCaptureAddressInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceMemory const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory );
     }
@@ -41722,19 +29789,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eDeviceMemoryOpaqueCaptureAddressInfo;
-    const void *  pNext  = {};
-    DeviceMemory  memory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eDeviceMemoryOpaqueCaptureAddressInfo;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceMemoryOpaqueCaptureAddressInfo>
-  {
-    using Type = DeviceMemoryOpaqueCaptureAddressInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceMemoryOpaqueCaptureAddressInfo>
   {
@@ -41743,8 +29802,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DeviceMemoryOpaqueCaptureAddressInfoKHR = DeviceMemoryOpaqueCaptureAddressInfo;
 
-  // wrapper struct for struct VkDeviceMemoryOverallocationCreateInfoAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceMemoryOverallocationCreateInfoAMD.html
   struct DeviceMemoryOverallocationCreateInfoAMD
   {
     using NativeType = VkDeviceMemoryOverallocationCreateInfoAMD;
@@ -41752,12 +29809,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceMemoryOverallocationCreateInfoAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DeviceMemoryOverallocationCreateInfoAMD( MemoryOverallocationBehaviorAMD overallocationBehavior_ = MemoryOverallocationBehaviorAMD::eDefault,
-                                               const void *                    pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , overallocationBehavior{ overallocationBehavior_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceMemoryOverallocationCreateInfoAMD(
+      VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD overallocationBehavior_ = VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD::eDefault,
+      const void *                                          pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , overallocationBehavior( overallocationBehavior_ )
     {
     }
 
@@ -41769,15 +29826,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceMemoryOverallocationCreateInfoAMD & operator=( DeviceMemoryOverallocationCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceMemoryOverallocationCreateInfoAMD & operator=( VkDeviceMemoryOverallocationCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceMemoryOverallocationCreateInfoAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceMemoryOverallocationCreateInfoAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceMemoryOverallocationCreateInfoAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -41785,12 +29842,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 DeviceMemoryOverallocationCreateInfoAMD &
-      setOverallocationBehavior( MemoryOverallocationBehaviorAMD overallocationBehavior_ ) VULKAN_HPP_NOEXCEPT
+      setOverallocationBehavior( VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD overallocationBehavior_ ) VULKAN_HPP_NOEXCEPT
     {
       overallocationBehavior = overallocationBehavior_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceMemoryOverallocationCreateInfoAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -41802,18 +29859,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceMemoryOverallocationCreateInfoAMD *>( this );
     }
 
-    operator VkDeviceMemoryOverallocationCreateInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceMemoryOverallocationCreateInfoAMD *>( this );
-    }
-
-    operator VkDeviceMemoryOverallocationCreateInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceMemoryOverallocationCreateInfoAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MemoryOverallocationBehaviorAMD const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, overallocationBehavior );
     }
@@ -41838,38 +29890,141 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                  = StructureType::eDeviceMemoryOverallocationCreateInfoAMD;
-    const void *                    pNext                  = {};
-    MemoryOverallocationBehaviorAMD overallocationBehavior = MemoryOverallocationBehaviorAMD::eDefault;
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                  = StructureType::eDeviceMemoryOverallocationCreateInfoAMD;
+    const void *                                          pNext                  = {};
+    VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD overallocationBehavior = VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD::eDefault;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceMemoryOverallocationCreateInfoAMD>
-  {
-    using Type = DeviceMemoryOverallocationCreateInfoAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceMemoryOverallocationCreateInfoAMD>
   {
     using Type = DeviceMemoryOverallocationCreateInfoAMD;
   };
 
+  struct DeviceMemoryReportCallbackDataEXT
+  {
+    using NativeType = VkDeviceMemoryReportCallbackDataEXT;
+
+    static const bool                                  allowDuplicate = false;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceMemoryReportCallbackDataEXT;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceMemoryReportCallbackDataEXT(
+      VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT     flags_          = {},
+      VULKAN_HPP_NAMESPACE::DeviceMemoryReportEventTypeEXT type_           = VULKAN_HPP_NAMESPACE::DeviceMemoryReportEventTypeEXT::eAllocate,
+      uint64_t                                             memoryObjectId_ = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize                     size_           = {},
+      VULKAN_HPP_NAMESPACE::ObjectType                     objectType_     = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown,
+      uint64_t                                             objectHandle_   = {},
+      uint32_t                                             heapIndex_      = {},
+      void *                                               pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , type( type_ )
+      , memoryObjectId( memoryObjectId_ )
+      , size( size_ )
+      , objectType( objectType_ )
+      , objectHandle( objectHandle_ )
+      , heapIndex( heapIndex_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR DeviceMemoryReportCallbackDataEXT( DeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    DeviceMemoryReportCallbackDataEXT( VkDeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : DeviceMemoryReportCallbackDataEXT( *reinterpret_cast<DeviceMemoryReportCallbackDataEXT const *>( &rhs ) )
+    {
+    }
+
+    DeviceMemoryReportCallbackDataEXT & operator=( DeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    DeviceMemoryReportCallbackDataEXT & operator=( VkDeviceMemoryReportCallbackDataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceMemoryReportCallbackDataEXT const *>( &rhs );
+      return *this;
+    }
+
+    operator VkDeviceMemoryReportCallbackDataEXT const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkDeviceMemoryReportCallbackDataEXT *>( this );
+    }
+
+    operator VkDeviceMemoryReportCallbackDataEXT &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkDeviceMemoryReportCallbackDataEXT *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemoryReportEventTypeEXT const &,
+               uint64_t const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::ObjectType const &,
+               uint64_t const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( sType, pNext, flags, type, memoryObjectId, size, objectType, objectHandle, heapIndex );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( DeviceMemoryReportCallbackDataEXT const & ) const = default;
+#else
+    bool operator==( DeviceMemoryReportCallbackDataEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( type == rhs.type ) && ( memoryObjectId == rhs.memoryObjectId ) &&
+             ( size == rhs.size ) && ( objectType == rhs.objectType ) && ( objectHandle == rhs.objectHandle ) && ( heapIndex == rhs.heapIndex );
+#  endif
+    }
+
+    bool operator!=( DeviceMemoryReportCallbackDataEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::StructureType                  sType          = StructureType::eDeviceMemoryReportCallbackDataEXT;
+    void *                                               pNext          = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemoryReportFlagsEXT     flags          = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemoryReportEventTypeEXT type           = VULKAN_HPP_NAMESPACE::DeviceMemoryReportEventTypeEXT::eAllocate;
+    uint64_t                                             memoryObjectId = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                     size           = {};
+    VULKAN_HPP_NAMESPACE::ObjectType                     objectType     = VULKAN_HPP_NAMESPACE::ObjectType::eUnknown;
+    uint64_t                                             objectHandle   = {};
+    uint32_t                                             heapIndex      = {};
+  };
+
+  template <>
+  struct CppType<StructureType, StructureType::eDeviceMemoryReportCallbackDataEXT>
+  {
+    using Type = DeviceMemoryReportCallbackDataEXT;
+  };
+
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   union DeviceOrHostAddressConstAMDX
   {
     using NativeType = VkDeviceOrHostAddressConstAMDX;
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstAMDX( DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstAMDX( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {} ) : deviceAddress( deviceAddress_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstAMDX( const void * hostAddress_ ) : hostAddress( hostAddress_ ) {}
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstAMDX & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+#  if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceOrHostAddressConstAMDX & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
@@ -41880,7 +30035,7 @@ namespace VULKAN_HPP_NAMESPACE
       hostAddress = hostAddress_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkDeviceOrHostAddressConstAMDX const &() const
     {
@@ -41893,135 +30048,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    DeviceAddress deviceAddress;
-    const void *  hostAddress;
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress;
+    const void *                        hostAddress;
 #  else
     VkDeviceAddress deviceAddress;
     const void *    hostAddress;
 #  endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceOrHostAddressConstAMDX>
-  {
-    using Type = DeviceOrHostAddressConstAMDX;
-  };
-#  endif
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkDevicePipelineBinaryInternalCacheControlKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDevicePipelineBinaryInternalCacheControlKHR.html
-  struct DevicePipelineBinaryInternalCacheControlKHR
-  {
-    using NativeType = VkDevicePipelineBinaryInternalCacheControlKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDevicePipelineBinaryInternalCacheControlKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DevicePipelineBinaryInternalCacheControlKHR( Bool32 disableInternalCache_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , disableInternalCache{ disableInternalCache_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DevicePipelineBinaryInternalCacheControlKHR( DevicePipelineBinaryInternalCacheControlKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DevicePipelineBinaryInternalCacheControlKHR( VkDevicePipelineBinaryInternalCacheControlKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DevicePipelineBinaryInternalCacheControlKHR( *reinterpret_cast<DevicePipelineBinaryInternalCacheControlKHR const *>( &rhs ) )
-    {
-    }
-
-    DevicePipelineBinaryInternalCacheControlKHR & operator=( DevicePipelineBinaryInternalCacheControlKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DevicePipelineBinaryInternalCacheControlKHR & operator=( VkDevicePipelineBinaryInternalCacheControlKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DevicePipelineBinaryInternalCacheControlKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DevicePipelineBinaryInternalCacheControlKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DevicePipelineBinaryInternalCacheControlKHR & setDisableInternalCache( Bool32 disableInternalCache_ ) VULKAN_HPP_NOEXCEPT
-    {
-      disableInternalCache = disableInternalCache_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDevicePipelineBinaryInternalCacheControlKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDevicePipelineBinaryInternalCacheControlKHR *>( this );
-    }
-
-    operator VkDevicePipelineBinaryInternalCacheControlKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDevicePipelineBinaryInternalCacheControlKHR *>( this );
-    }
-
-    operator VkDevicePipelineBinaryInternalCacheControlKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDevicePipelineBinaryInternalCacheControlKHR *>( this );
-    }
-
-    operator VkDevicePipelineBinaryInternalCacheControlKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDevicePipelineBinaryInternalCacheControlKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, disableInternalCache );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DevicePipelineBinaryInternalCacheControlKHR const & ) const = default;
-#else
-    bool operator==( DevicePipelineBinaryInternalCacheControlKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( disableInternalCache == rhs.disableInternalCache );
-#  endif
-    }
-
-    bool operator!=( DevicePipelineBinaryInternalCacheControlKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                = StructureType::eDevicePipelineBinaryInternalCacheControlKHR;
-    const void *  pNext                = {};
-    Bool32        disableInternalCache = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDevicePipelineBinaryInternalCacheControlKHR>
-  {
-    using Type = DevicePipelineBinaryInternalCacheControlKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDevicePipelineBinaryInternalCacheControlKHR>
-  {
-    using Type = DevicePipelineBinaryInternalCacheControlKHR;
-  };
-
-  // wrapper struct for struct VkDevicePrivateDataCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDevicePrivateDataCreateInfo.html
   struct DevicePrivateDataCreateInfo
   {
     using NativeType = VkDevicePrivateDataCreateInfo;
@@ -42029,10 +30064,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDevicePrivateDataCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DevicePrivateDataCreateInfo( uint32_t privateDataSlotRequestCount_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , privateDataSlotRequestCount{ privateDataSlotRequestCount_ }
+      : pNext( pNext_ )
+      , privateDataSlotRequestCount( privateDataSlotRequestCount_ )
     {
     }
 
@@ -42044,15 +30079,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DevicePrivateDataCreateInfo & operator=( DevicePrivateDataCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DevicePrivateDataCreateInfo & operator=( VkDevicePrivateDataCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DevicePrivateDataCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DevicePrivateDataCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DevicePrivateDataCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -42064,7 +30099,7 @@ namespace VULKAN_HPP_NAMESPACE
       privateDataSlotRequestCount = privateDataSlotRequestCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDevicePrivateDataCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -42076,18 +30111,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDevicePrivateDataCreateInfo *>( this );
     }
 
-    operator VkDevicePrivateDataCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDevicePrivateDataCreateInfo *>( this );
-    }
-
-    operator VkDevicePrivateDataCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDevicePrivateDataCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, privateDataSlotRequestCount );
     }
@@ -42112,19 +30142,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::eDevicePrivateDataCreateInfo;
-    const void *  pNext                       = {};
-    uint32_t      privateDataSlotRequestCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::eDevicePrivateDataCreateInfo;
+    const void *                        pNext                       = {};
+    uint32_t                            privateDataSlotRequestCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDevicePrivateDataCreateInfo>
-  {
-    using Type = DevicePrivateDataCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDevicePrivateDataCreateInfo>
   {
@@ -42133,84 +30155,79 @@ namespace VULKAN_HPP_NAMESPACE
 
   using DevicePrivateDataCreateInfoEXT = DevicePrivateDataCreateInfo;
 
-  // wrapper struct for struct VkDeviceQueueGlobalPriorityCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueGlobalPriorityCreateInfo.html
-  struct DeviceQueueGlobalPriorityCreateInfo
+  struct DeviceQueueGlobalPriorityCreateInfoKHR
   {
-    using NativeType = VkDeviceQueueGlobalPriorityCreateInfo;
+    using NativeType = VkDeviceQueueGlobalPriorityCreateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceQueueGlobalPriorityCreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceQueueGlobalPriorityCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceQueueGlobalPriorityCreateInfo( QueueGlobalPriority globalPriority_ = QueueGlobalPriority::eLow,
-                                                              const void *        pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , globalPriority{ globalPriority_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DeviceQueueGlobalPriorityCreateInfoKHR( VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR globalPriority_ = VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                              const void *                                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , globalPriority( globalPriority_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR DeviceQueueGlobalPriorityCreateInfo( DeviceQueueGlobalPriorityCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR DeviceQueueGlobalPriorityCreateInfoKHR( DeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    DeviceQueueGlobalPriorityCreateInfo( VkDeviceQueueGlobalPriorityCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DeviceQueueGlobalPriorityCreateInfo( *reinterpret_cast<DeviceQueueGlobalPriorityCreateInfo const *>( &rhs ) )
+    DeviceQueueGlobalPriorityCreateInfoKHR( VkDeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : DeviceQueueGlobalPriorityCreateInfoKHR( *reinterpret_cast<DeviceQueueGlobalPriorityCreateInfoKHR const *>( &rhs ) )
     {
     }
 
-    DeviceQueueGlobalPriorityCreateInfo & operator=( DeviceQueueGlobalPriorityCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    DeviceQueueGlobalPriorityCreateInfoKHR & operator=( DeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    DeviceQueueGlobalPriorityCreateInfo & operator=( VkDeviceQueueGlobalPriorityCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    DeviceQueueGlobalPriorityCreateInfoKHR & operator=( VkDeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceQueueGlobalPriorityCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceQueueGlobalPriorityCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceQueueGlobalPriorityCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DeviceQueueGlobalPriorityCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceQueueGlobalPriorityCreateInfo & setGlobalPriority( QueueGlobalPriority globalPriority_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceQueueGlobalPriorityCreateInfoKHR &
+      setGlobalPriority( VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR globalPriority_ ) VULKAN_HPP_NOEXCEPT
     {
       globalPriority = globalPriority_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkDeviceQueueGlobalPriorityCreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkDeviceQueueGlobalPriorityCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkDeviceQueueGlobalPriorityCreateInfo *>( this );
+      return *reinterpret_cast<const VkDeviceQueueGlobalPriorityCreateInfoKHR *>( this );
     }
 
-    operator VkDeviceQueueGlobalPriorityCreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkDeviceQueueGlobalPriorityCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkDeviceQueueGlobalPriorityCreateInfo *>( this );
-    }
-
-    operator VkDeviceQueueGlobalPriorityCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceQueueGlobalPriorityCreateInfo *>( this );
-    }
-
-    operator VkDeviceQueueGlobalPriorityCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceQueueGlobalPriorityCreateInfo *>( this );
+      return *reinterpret_cast<VkDeviceQueueGlobalPriorityCreateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, QueueGlobalPriority const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, globalPriority );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DeviceQueueGlobalPriorityCreateInfo const & ) const = default;
+    auto operator<=>( DeviceQueueGlobalPriorityCreateInfoKHR const & ) const = default;
 #else
-    bool operator==( DeviceQueueGlobalPriorityCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( DeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -42219,36 +30236,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( DeviceQueueGlobalPriorityCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( DeviceQueueGlobalPriorityCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType       sType          = StructureType::eDeviceQueueGlobalPriorityCreateInfo;
-    const void *        pNext          = {};
-    QueueGlobalPriority globalPriority = QueueGlobalPriority::eLow;
+    VULKAN_HPP_NAMESPACE::StructureType          sType          = StructureType::eDeviceQueueGlobalPriorityCreateInfoKHR;
+    const void *                                 pNext          = {};
+    VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR globalPriority = VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceQueueGlobalPriorityCreateInfo>
-  {
-    using Type = DeviceQueueGlobalPriorityCreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eDeviceQueueGlobalPriorityCreateInfo>
+  struct CppType<StructureType, StructureType::eDeviceQueueGlobalPriorityCreateInfoKHR>
   {
-    using Type = DeviceQueueGlobalPriorityCreateInfo;
+    using Type = DeviceQueueGlobalPriorityCreateInfoKHR;
   };
 
-  using DeviceQueueGlobalPriorityCreateInfoEXT = DeviceQueueGlobalPriorityCreateInfo;
-  using DeviceQueueGlobalPriorityCreateInfoKHR = DeviceQueueGlobalPriorityCreateInfo;
+  using DeviceQueueGlobalPriorityCreateInfoEXT = DeviceQueueGlobalPriorityCreateInfoKHR;
 
-  // wrapper struct for struct VkDeviceQueueInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueInfo2.html
   struct DeviceQueueInfo2
   {
     using NativeType = VkDeviceQueueInfo2;
@@ -42256,15 +30263,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceQueueInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceQueueInfo2( DeviceQueueCreateFlags flags_            = {},
-                                           uint32_t               queueFamilyIndex_ = {},
-                                           uint32_t               queueIndex_       = {},
-                                           const void *           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
-      , queueIndex{ queueIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DeviceQueueInfo2( VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags_            = {},
+                                           uint32_t                                     queueFamilyIndex_ = {},
+                                           uint32_t                                     queueIndex_       = {},
+                                           const void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , queueFamilyIndex( queueFamilyIndex_ )
+      , queueIndex( queueIndex_ )
     {
     }
 
@@ -42273,22 +30280,22 @@ namespace VULKAN_HPP_NAMESPACE
     DeviceQueueInfo2( VkDeviceQueueInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : DeviceQueueInfo2( *reinterpret_cast<DeviceQueueInfo2 const *>( &rhs ) ) {}
 
     DeviceQueueInfo2 & operator=( DeviceQueueInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceQueueInfo2 & operator=( VkDeviceQueueInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceQueueInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceQueueInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceQueueInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DeviceQueueInfo2 & setFlags( DeviceQueueCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DeviceQueueInfo2 & setFlags( VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -42305,7 +30312,7 @@ namespace VULKAN_HPP_NAMESPACE
       queueIndex = queueIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceQueueInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -42317,18 +30324,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceQueueInfo2 *>( this );
     }
 
-    operator VkDeviceQueueInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceQueueInfo2 *>( this );
-    }
-
-    operator VkDeviceQueueInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceQueueInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceQueueCreateFlags const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, queueFamilyIndex, queueIndex );
@@ -42355,29 +30360,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType            = StructureType::eDeviceQueueInfo2;
-    const void *           pNext            = {};
-    DeviceQueueCreateFlags flags            = {};
-    uint32_t               queueFamilyIndex = {};
-    uint32_t               queueIndex       = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType            = StructureType::eDeviceQueueInfo2;
+    const void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::DeviceQueueCreateFlags flags            = {};
+    uint32_t                                     queueFamilyIndex = {};
+    uint32_t                                     queueIndex       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceQueueInfo2>
-  {
-    using Type = DeviceQueueInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceQueueInfo2>
   {
     using Type = DeviceQueueInfo2;
   };
 
-  // wrapper struct for struct VkDeviceQueueShaderCoreControlCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceQueueShaderCoreControlCreateInfoARM.html
   struct DeviceQueueShaderCoreControlCreateInfoARM
   {
     using NativeType = VkDeviceQueueShaderCoreControlCreateInfoARM;
@@ -42385,10 +30380,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceQueueShaderCoreControlCreateInfoARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DeviceQueueShaderCoreControlCreateInfoARM( uint32_t shaderCoreCount_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCoreCount{ shaderCoreCount_ }
+      : pNext( pNext_ )
+      , shaderCoreCount( shaderCoreCount_ )
     {
     }
 
@@ -42400,15 +30395,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DeviceQueueShaderCoreControlCreateInfoARM & operator=( DeviceQueueShaderCoreControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DeviceQueueShaderCoreControlCreateInfoARM & operator=( VkDeviceQueueShaderCoreControlCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DeviceQueueShaderCoreControlCreateInfoARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DeviceQueueShaderCoreControlCreateInfoARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DeviceQueueShaderCoreControlCreateInfoARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -42420,7 +30415,7 @@ namespace VULKAN_HPP_NAMESPACE
       shaderCoreCount = shaderCoreCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDeviceQueueShaderCoreControlCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -42432,18 +30427,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDeviceQueueShaderCoreControlCreateInfoARM *>( this );
     }
 
-    operator VkDeviceQueueShaderCoreControlCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceQueueShaderCoreControlCreateInfoARM *>( this );
-    }
-
-    operator VkDeviceQueueShaderCoreControlCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceQueueShaderCoreControlCreateInfoARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderCoreCount );
     }
@@ -42468,529 +30458,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eDeviceQueueShaderCoreControlCreateInfoARM;
-    void *        pNext           = {};
-    uint32_t      shaderCoreCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eDeviceQueueShaderCoreControlCreateInfoARM;
+    void *                              pNext           = {};
+    uint32_t                            shaderCoreCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceQueueShaderCoreControlCreateInfoARM>
-  {
-    using Type = DeviceQueueShaderCoreControlCreateInfoARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDeviceQueueShaderCoreControlCreateInfoARM>
   {
     using Type = DeviceQueueShaderCoreControlCreateInfoARM;
   };
 
-  // wrapper struct for struct VkTensorDescriptionARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorDescriptionARM.html
-  struct TensorDescriptionARM
-  {
-    using NativeType = VkTensorDescriptionARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorDescriptionARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorDescriptionARM( TensorTilingARM     tiling_         = TensorTilingARM::eOptimal,
-                                               Format              format_         = Format::eUndefined,
-                                               uint32_t            dimensionCount_ = {},
-                                               const int64_t *     pDimensions_    = {},
-                                               const int64_t *     pStrides_       = {},
-                                               TensorUsageFlagsARM usage_          = {},
-                                               const void *        pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tiling{ tiling_ }
-      , format{ format_ }
-      , dimensionCount{ dimensionCount_ }
-      , pDimensions{ pDimensions_ }
-      , pStrides{ pStrides_ }
-      , usage{ usage_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorDescriptionARM( TensorDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorDescriptionARM( VkTensorDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorDescriptionARM( *reinterpret_cast<TensorDescriptionARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorDescriptionARM( TensorTilingARM                                tiling_,
-                          Format                                         format_,
-                          ArrayProxyNoTemporaries<const int64_t> const & dimensions_,
-                          ArrayProxyNoTemporaries<const int64_t> const & strides_ = {},
-                          TensorUsageFlagsARM                            usage_   = {},
-                          const void *                                   pNext_   = nullptr )
-      : pNext( pNext_ )
-      , tiling( tiling_ )
-      , format( format_ )
-      , dimensionCount( static_cast<uint32_t>( dimensions_.size() ) )
-      , pDimensions( dimensions_.data() )
-      , pStrides( strides_.data() )
-      , usage( usage_ )
-    {
-#    ifdef VULKAN_HPP_NO_EXCEPTIONS
-      VULKAN_HPP_ASSERT( strides_.empty() || ( dimensions_.size() == strides_.size() ) );
-#    else
-      if ( !strides_.empty() && ( dimensions_.size() != strides_.size() ) )
-      {
-        throw LogicError( VULKAN_HPP_NAMESPACE_STRING
-                          "::TensorDescriptionARM::TensorDescriptionARM: !strides_.empty() && ( dimensions_.size() != strides_.size() )" );
-      }
-#    endif /*VULKAN_HPP_NO_EXCEPTIONS*/
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    TensorDescriptionARM & operator=( TensorDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorDescriptionARM & operator=( VkTensorDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorDescriptionARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setTiling( TensorTilingARM tiling_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tiling = tiling_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
-    {
-      format = format_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setDimensionCount( uint32_t dimensionCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = dimensionCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setPDimensions( const int64_t * pDimensions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDimensions = pDimensions_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorDescriptionARM & setDimensions( ArrayProxyNoTemporaries<const int64_t> const & dimensions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = static_cast<uint32_t>( dimensions_.size() );
-      pDimensions    = dimensions_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setPStrides( const int64_t * pStrides_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStrides = pStrides_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorDescriptionARM & setStrides( ArrayProxyNoTemporaries<const int64_t> const & strides_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dimensionCount = static_cast<uint32_t>( strides_.size() );
-      pStrides       = strides_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDescriptionARM & setUsage( TensorUsageFlagsARM usage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      usage = usage_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorDescriptionARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorDescriptionARM *>( this );
-    }
-
-    operator VkTensorDescriptionARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorDescriptionARM *>( this );
-    }
-
-    operator VkTensorDescriptionARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorDescriptionARM *>( this );
-    }
-
-    operator VkTensorDescriptionARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorDescriptionARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               TensorTilingARM const &,
-               Format const &,
-               uint32_t const &,
-               const int64_t * const &,
-               const int64_t * const &,
-               TensorUsageFlagsARM const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tiling, format, dimensionCount, pDimensions, pStrides, usage );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorDescriptionARM const & ) const = default;
-#else
-    bool operator==( TensorDescriptionARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tiling == rhs.tiling ) && ( format == rhs.format ) &&
-             ( dimensionCount == rhs.dimensionCount ) && ( pDimensions == rhs.pDimensions ) && ( pStrides == rhs.pStrides ) && ( usage == rhs.usage );
-#  endif
-    }
-
-    bool operator!=( TensorDescriptionARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType       sType          = StructureType::eTensorDescriptionARM;
-    const void *        pNext          = {};
-    TensorTilingARM     tiling         = TensorTilingARM::eOptimal;
-    Format              format         = Format::eUndefined;
-    uint32_t            dimensionCount = {};
-    const int64_t *     pDimensions    = {};
-    const int64_t *     pStrides       = {};
-    TensorUsageFlagsARM usage          = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorDescriptionARM>
-  {
-    using Type = TensorDescriptionARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorDescriptionARM>
-  {
-    using Type = TensorDescriptionARM;
-  };
-
-  // wrapper struct for struct VkTensorCreateInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorCreateInfoARM.html
-  struct TensorCreateInfoARM
-  {
-    using NativeType = VkTensorCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorCreateInfoARM( TensorCreateFlagsARM         flags_                 = {},
-                                              const TensorDescriptionARM * pDescription_          = {},
-                                              SharingMode                  sharingMode_           = SharingMode::eExclusive,
-                                              uint32_t                     queueFamilyIndexCount_ = {},
-                                              const uint32_t *             pQueueFamilyIndices_   = {},
-                                              const void *                 pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pDescription{ pDescription_ }
-      , sharingMode{ sharingMode_ }
-      , queueFamilyIndexCount{ queueFamilyIndexCount_ }
-      , pQueueFamilyIndices{ pQueueFamilyIndices_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorCreateInfoARM( TensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorCreateInfoARM( VkTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT : TensorCreateInfoARM( *reinterpret_cast<TensorCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCreateInfoARM( TensorCreateFlagsARM                            flags_,
-                         const TensorDescriptionARM *                    pDescription_,
-                         SharingMode                                     sharingMode_,
-                         ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
-                         const void *                                    pNext_ = nullptr )
-      : pNext( pNext_ )
-      , flags( flags_ )
-      , pDescription( pDescription_ )
-      , sharingMode( sharingMode_ )
-      , queueFamilyIndexCount( static_cast<uint32_t>( queueFamilyIndices_.size() ) )
-      , pQueueFamilyIndices( queueFamilyIndices_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    TensorCreateInfoARM & operator=( TensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorCreateInfoARM & operator=( VkTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setFlags( TensorCreateFlagsARM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setPDescription( const TensorDescriptionARM * pDescription_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDescription = pDescription_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setSharingMode( SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      sharingMode = sharingMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setQueueFamilyIndexCount( uint32_t queueFamilyIndexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      queueFamilyIndexCount = queueFamilyIndexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCreateInfoARM & setPQueueFamilyIndices( const uint32_t * pQueueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pQueueFamilyIndices = pQueueFamilyIndices_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TensorCreateInfoARM & setQueueFamilyIndices( ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      queueFamilyIndexCount = static_cast<uint32_t>( queueFamilyIndices_.size() );
-      pQueueFamilyIndices   = queueFamilyIndices_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorCreateInfoARM *>( this );
-    }
-
-    operator VkTensorCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorCreateInfoARM *>( this );
-    }
-
-    operator VkTensorCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorCreateInfoARM *>( this );
-    }
-
-    operator VkTensorCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               TensorCreateFlagsARM const &,
-               const TensorDescriptionARM * const &,
-               SharingMode const &,
-               uint32_t const &,
-               const uint32_t * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, pDescription, sharingMode, queueFamilyIndexCount, pQueueFamilyIndices );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorCreateInfoARM const & ) const = default;
-#else
-    bool operator==( TensorCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( pDescription == rhs.pDescription ) &&
-             ( sharingMode == rhs.sharingMode ) && ( queueFamilyIndexCount == rhs.queueFamilyIndexCount ) && ( pQueueFamilyIndices == rhs.pQueueFamilyIndices );
-#  endif
-    }
-
-    bool operator!=( TensorCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                sType                 = StructureType::eTensorCreateInfoARM;
-    const void *                 pNext                 = {};
-    TensorCreateFlagsARM         flags                 = {};
-    const TensorDescriptionARM * pDescription          = {};
-    SharingMode                  sharingMode           = SharingMode::eExclusive;
-    uint32_t                     queueFamilyIndexCount = {};
-    const uint32_t *             pQueueFamilyIndices   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorCreateInfoARM>
-  {
-    using Type = TensorCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorCreateInfoARM>
-  {
-    using Type = TensorCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkDeviceTensorMemoryRequirementsARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDeviceTensorMemoryRequirementsARM.html
-  struct DeviceTensorMemoryRequirementsARM
-  {
-    using NativeType = VkDeviceTensorMemoryRequirementsARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDeviceTensorMemoryRequirementsARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DeviceTensorMemoryRequirementsARM( const TensorCreateInfoARM * pCreateInfo_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pCreateInfo{ pCreateInfo_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DeviceTensorMemoryRequirementsARM( DeviceTensorMemoryRequirementsARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DeviceTensorMemoryRequirementsARM( VkDeviceTensorMemoryRequirementsARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DeviceTensorMemoryRequirementsARM( *reinterpret_cast<DeviceTensorMemoryRequirementsARM const *>( &rhs ) )
-    {
-    }
-
-    DeviceTensorMemoryRequirementsARM & operator=( DeviceTensorMemoryRequirementsARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DeviceTensorMemoryRequirementsARM & operator=( VkDeviceTensorMemoryRequirementsARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DeviceTensorMemoryRequirementsARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DeviceTensorMemoryRequirementsARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DeviceTensorMemoryRequirementsARM & setPCreateInfo( const TensorCreateInfoARM * pCreateInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pCreateInfo = pCreateInfo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDeviceTensorMemoryRequirementsARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( this );
-    }
-
-    operator VkDeviceTensorMemoryRequirementsARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDeviceTensorMemoryRequirementsARM *>( this );
-    }
-
-    operator VkDeviceTensorMemoryRequirementsARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDeviceTensorMemoryRequirementsARM *>( this );
-    }
-
-    operator VkDeviceTensorMemoryRequirementsARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDeviceTensorMemoryRequirementsARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const TensorCreateInfoARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pCreateInfo );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DeviceTensorMemoryRequirementsARM const & ) const = default;
-#else
-    bool operator==( DeviceTensorMemoryRequirementsARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pCreateInfo == rhs.pCreateInfo );
-#  endif
-    }
-
-    bool operator!=( DeviceTensorMemoryRequirementsARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType               sType       = StructureType::eDeviceTensorMemoryRequirementsARM;
-    const void *                pNext       = {};
-    const TensorCreateInfoARM * pCreateInfo = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDeviceTensorMemoryRequirementsARM>
-  {
-    using Type = DeviceTensorMemoryRequirementsARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDeviceTensorMemoryRequirementsARM>
-  {
-    using Type = DeviceTensorMemoryRequirementsARM;
-  };
-
-  typedef PFN_vkVoidFunction( VKAPI_PTR * PFN_GetInstanceProcAddrLUNARG )( Instance instance, const char * pName );
-
-  // wrapper struct for struct VkDirectDriverLoadingInfoLUNARG, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectDriverLoadingInfoLUNARG.html
   struct DirectDriverLoadingInfoLUNARG
   {
     using NativeType = VkDirectDriverLoadingInfoLUNARG;
@@ -42998,13 +30476,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDirectDriverLoadingInfoLUNARG;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DirectDriverLoadingInfoLUNARG( DirectDriverLoadingFlagsLUNARG flags_                  = {},
-                                                        PFN_GetInstanceProcAddrLUNARG  pfnGetInstanceProcAddr_ = {},
-                                                        void *                         pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pfnGetInstanceProcAddr{ pfnGetInstanceProcAddr_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DirectDriverLoadingInfoLUNARG( VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags_                  = {},
+                                                        PFN_vkGetInstanceProcAddrLUNARG                      pfnGetInstanceProcAddr_ = {},
+                                                        void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pfnGetInstanceProcAddr( pfnGetInstanceProcAddr_ )
     {
     }
 
@@ -43016,34 +30494,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DirectDriverLoadingInfoLUNARG & operator=( DirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DirectDriverLoadingInfoLUNARG & operator=( VkDirectDriverLoadingInfoLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DirectDriverLoadingInfoLUNARG const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingInfoLUNARG & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingInfoLUNARG & setFlags( DirectDriverLoadingFlagsLUNARG flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingInfoLUNARG & setFlags( VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingInfoLUNARG &
-      setPfnGetInstanceProcAddr( PFN_GetInstanceProcAddrLUNARG pfnGetInstanceProcAddr_ ) VULKAN_HPP_NOEXCEPT
+      setPfnGetInstanceProcAddr( PFN_vkGetInstanceProcAddrLUNARG pfnGetInstanceProcAddr_ ) VULKAN_HPP_NOEXCEPT
     {
       pfnGetInstanceProcAddr = pfnGetInstanceProcAddr_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDirectDriverLoadingInfoLUNARG const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43055,18 +30533,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDirectDriverLoadingInfoLUNARG *>( this );
     }
 
-    operator VkDirectDriverLoadingInfoLUNARG const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDirectDriverLoadingInfoLUNARG *>( this );
-    }
-
-    operator VkDirectDriverLoadingInfoLUNARG *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDirectDriverLoadingInfoLUNARG *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DirectDriverLoadingFlagsLUNARG const &, PFN_GetInstanceProcAddrLUNARG const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG const &,
+               PFN_vkGetInstanceProcAddrLUNARG const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pfnGetInstanceProcAddr );
@@ -43088,28 +30563,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                  sType                  = StructureType::eDirectDriverLoadingInfoLUNARG;
-    void *                         pNext                  = {};
-    DirectDriverLoadingFlagsLUNARG flags                  = {};
-    PFN_GetInstanceProcAddrLUNARG  pfnGetInstanceProcAddr = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType                  = StructureType::eDirectDriverLoadingInfoLUNARG;
+    void *                                               pNext                  = {};
+    VULKAN_HPP_NAMESPACE::DirectDriverLoadingFlagsLUNARG flags                  = {};
+    PFN_vkGetInstanceProcAddrLUNARG                      pfnGetInstanceProcAddr = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDirectDriverLoadingInfoLUNARG>
-  {
-    using Type = DirectDriverLoadingInfoLUNARG;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDirectDriverLoadingInfoLUNARG>
   {
     using Type = DirectDriverLoadingInfoLUNARG;
   };
 
-  // wrapper struct for struct VkDirectDriverLoadingListLUNARG, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectDriverLoadingListLUNARG.html
   struct DirectDriverLoadingListLUNARG
   {
     using NativeType = VkDirectDriverLoadingListLUNARG;
@@ -43117,15 +30582,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDirectDriverLoadingListLUNARG;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DirectDriverLoadingListLUNARG( DirectDriverLoadingModeLUNARG         mode_        = DirectDriverLoadingModeLUNARG::eExclusive,
-                                                        uint32_t                              driverCount_ = {},
-                                                        const DirectDriverLoadingInfoLUNARG * pDrivers_    = {},
-                                                        const void *                          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mode{ mode_ }
-      , driverCount{ driverCount_ }
-      , pDrivers{ pDrivers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DirectDriverLoadingListLUNARG(
+      VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG         mode_        = VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG::eExclusive,
+      uint32_t                                                    driverCount_ = {},
+      const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG * pDrivers_    = {},
+      const void *                                                pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , mode( mode_ )
+      , driverCount( driverCount_ )
+      , pDrivers( pDrivers_ )
     {
     }
 
@@ -43137,31 +30603,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DirectDriverLoadingListLUNARG( DirectDriverLoadingModeLUNARG                                        mode_,
-                                   ArrayProxyNoTemporaries<const DirectDriverLoadingInfoLUNARG> const & drivers_,
-                                   const void *                                                         pNext_ = nullptr )
+    DirectDriverLoadingListLUNARG( VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG                                                              mode_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG> const & drivers_,
+                                   const void * pNext_ = nullptr )
       : pNext( pNext_ ), mode( mode_ ), driverCount( static_cast<uint32_t>( drivers_.size() ) ), pDrivers( drivers_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     DirectDriverLoadingListLUNARG & operator=( DirectDriverLoadingListLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DirectDriverLoadingListLUNARG & operator=( VkDirectDriverLoadingListLUNARG const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DirectDriverLoadingListLUNARG const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DirectDriverLoadingListLUNARG const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setMode( DirectDriverLoadingModeLUNARG mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setMode( VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
@@ -43173,21 +30639,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG & setPDrivers( const DirectDriverLoadingInfoLUNARG * pDrivers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DirectDriverLoadingListLUNARG &
+      setPDrivers( const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG * pDrivers_ ) VULKAN_HPP_NOEXCEPT
     {
       pDrivers = pDrivers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    DirectDriverLoadingListLUNARG & setDrivers( ArrayProxyNoTemporaries<const DirectDriverLoadingInfoLUNARG> const & drivers_ ) VULKAN_HPP_NOEXCEPT
+    DirectDriverLoadingListLUNARG & setDrivers(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG> const & drivers_ ) VULKAN_HPP_NOEXCEPT
     {
       driverCount = static_cast<uint32_t>( drivers_.size() );
       pDrivers    = drivers_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDirectDriverLoadingListLUNARG const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43199,19 +30667,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDirectDriverLoadingListLUNARG *>( this );
     }
 
-    operator VkDirectDriverLoadingListLUNARG const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDirectDriverLoadingListLUNARG *>( this );
-    }
-
-    operator VkDirectDriverLoadingListLUNARG *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDirectDriverLoadingListLUNARG *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, DirectDriverLoadingModeLUNARG const &, uint32_t const &, const DirectDriverLoadingInfoLUNARG * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mode, driverCount, pDrivers );
@@ -43233,21 +30698,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                         sType       = StructureType::eDirectDriverLoadingListLUNARG;
-    const void *                          pNext       = {};
-    DirectDriverLoadingModeLUNARG         mode        = DirectDriverLoadingModeLUNARG::eExclusive;
-    uint32_t                              driverCount = {};
-    const DirectDriverLoadingInfoLUNARG * pDrivers    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType       = StructureType::eDirectDriverLoadingListLUNARG;
+    const void *                                                pNext       = {};
+    VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG         mode        = VULKAN_HPP_NAMESPACE::DirectDriverLoadingModeLUNARG::eExclusive;
+    uint32_t                                                    driverCount = {};
+    const VULKAN_HPP_NAMESPACE::DirectDriverLoadingInfoLUNARG * pDrivers    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDirectDriverLoadingListLUNARG>
-  {
-    using Type = DirectDriverLoadingListLUNARG;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDirectDriverLoadingListLUNARG>
   {
@@ -43255,7 +30712,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
-  // wrapper struct for struct VkDirectFBSurfaceCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDirectFBSurfaceCreateInfoEXT.html
   struct DirectFBSurfaceCreateInfoEXT
   {
     using NativeType = VkDirectFBSurfaceCreateInfoEXT;
@@ -43263,15 +30719,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDirectfbSurfaceCreateInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DirectFBSurfaceCreateInfoEXT( DirectFBSurfaceCreateFlagsEXT flags_   = {},
-                                                       IDirectFB *                   dfb_     = {},
-                                                       IDirectFBSurface *            surface_ = {},
-                                                       const void *                  pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dfb{ dfb_ }
-      , surface{ surface_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DirectFBSurfaceCreateInfoEXT( VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateFlagsEXT flags_   = {},
+                                                       IDirectFB *                                         dfb_     = {},
+                                                       IDirectFBSurface *                                  surface_ = {},
+                                                       const void *                                        pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , dfb( dfb_ )
+      , surface( surface_ )
     {
     }
 
@@ -43283,22 +30739,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DirectFBSurfaceCreateInfoEXT & operator=( DirectFBSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DirectFBSurfaceCreateInfoEXT & operator=( VkDirectFBSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DirectFBSurfaceCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DirectFBSurfaceCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DirectFBSurfaceCreateInfoEXT & setFlags( DirectFBSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DirectFBSurfaceCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -43315,7 +30771,7 @@ namespace VULKAN_HPP_NAMESPACE
       surface = surface_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDirectFBSurfaceCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43327,18 +30783,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDirectFBSurfaceCreateInfoEXT *>( this );
     }
 
-    operator VkDirectFBSurfaceCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDirectFBSurfaceCreateInfoEXT *>( this );
-    }
-
-    operator VkDirectFBSurfaceCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDirectFBSurfaceCreateInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DirectFBSurfaceCreateFlagsEXT const &, IDirectFB * const &, IDirectFBSurface * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateFlagsEXT const &,
+               IDirectFB * const &,
+               IDirectFBSurface * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, dfb, surface );
@@ -43364,21 +30818,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                 sType   = StructureType::eDirectfbSurfaceCreateInfoEXT;
-    const void *                  pNext   = {};
-    DirectFBSurfaceCreateFlagsEXT flags   = {};
-    IDirectFB *                   dfb     = {};
-    IDirectFBSurface *            surface = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType   = StructureType::eDirectfbSurfaceCreateInfoEXT;
+    const void *                                        pNext   = {};
+    VULKAN_HPP_NAMESPACE::DirectFBSurfaceCreateFlagsEXT flags   = {};
+    IDirectFB *                                         dfb     = {};
+    IDirectFBSurface *                                  surface = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDirectFBSurfaceCreateInfoEXT>
-  {
-    using Type = DirectFBSurfaceCreateInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eDirectfbSurfaceCreateInfoEXT>
   {
@@ -43387,17 +30833,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkDispatchGraphCountInfoAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDispatchGraphCountInfoAMDX.html
   struct DispatchGraphCountInfoAMDX
   {
     using NativeType = VkDispatchGraphCountInfoAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      DispatchGraphCountInfoAMDX( uint32_t count_ = {}, DeviceOrHostAddressConstAMDX infos_ = {}, uint64_t stride_ = {} ) VULKAN_HPP_NOEXCEPT
-      : count{ count_ }
-      , infos{ infos_ }
-      , stride{ stride_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 DispatchGraphCountInfoAMDX( uint32_t                                           count_  = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX infos_  = {},
+                                                        uint64_t                                           stride_ = {} ) VULKAN_HPP_NOEXCEPT
+      : count( count_ )
+      , infos( infos_ )
+      , stride( stride_ )
     {
     }
 
@@ -43409,22 +30855,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DispatchGraphCountInfoAMDX & operator=( DispatchGraphCountInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DispatchGraphCountInfoAMDX & operator=( VkDispatchGraphCountInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DispatchGraphCountInfoAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DispatchGraphCountInfoAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DispatchGraphCountInfoAMDX & setCount( uint32_t count_ ) VULKAN_HPP_NOEXCEPT
     {
       count = count_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DispatchGraphCountInfoAMDX & setInfos( DeviceOrHostAddressConstAMDX const & infos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DispatchGraphCountInfoAMDX & setInfos( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX const & infos_ ) VULKAN_HPP_NOEXCEPT
     {
       infos = infos_;
       return *this;
@@ -43435,7 +30881,7 @@ namespace VULKAN_HPP_NAMESPACE
       stride = stride_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDispatchGraphCountInfoAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43447,53 +30893,39 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDispatchGraphCountInfoAMDX *>( this );
     }
 
-    operator VkDispatchGraphCountInfoAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDispatchGraphCountInfoAMDX *>( this );
-    }
-
-    operator VkDispatchGraphCountInfoAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDispatchGraphCountInfoAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, DeviceOrHostAddressConstAMDX const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<uint32_t const &, VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX const &, uint64_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( count, infos, stride );
     }
 #  endif
 
   public:
-    uint32_t                     count  = {};
-    DeviceOrHostAddressConstAMDX infos  = {};
-    uint64_t                     stride = {};
+    uint32_t                                           count  = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX infos  = {};
+    uint64_t                                           stride = {};
   };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDispatchGraphCountInfoAMDX>
-  {
-    using Type = DispatchGraphCountInfoAMDX;
-  };
-#  endif
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkDispatchGraphInfoAMDX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDispatchGraphInfoAMDX.html
   struct DispatchGraphInfoAMDX
   {
     using NativeType = VkDispatchGraphInfoAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 DispatchGraphInfoAMDX( uint32_t                     nodeIndex_     = {},
-                                                   uint32_t                     payloadCount_  = {},
-                                                   DeviceOrHostAddressConstAMDX payloads_      = {},
-                                                   uint64_t                     payloadStride_ = {} ) VULKAN_HPP_NOEXCEPT
-      : nodeIndex{ nodeIndex_ }
-      , payloadCount{ payloadCount_ }
-      , payloads{ payloads_ }
-      , payloadStride{ payloadStride_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 DispatchGraphInfoAMDX( uint32_t                                           nodeIndex_     = {},
+                                                   uint32_t                                           payloadCount_  = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX payloads_      = {},
+                                                   uint64_t                                           payloadStride_ = {} ) VULKAN_HPP_NOEXCEPT
+      : nodeIndex( nodeIndex_ )
+      , payloadCount( payloadCount_ )
+      , payloads( payloads_ )
+      , payloadStride( payloadStride_ )
     {
     }
 
@@ -43505,15 +30937,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DispatchGraphInfoAMDX & operator=( DispatchGraphInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DispatchGraphInfoAMDX & operator=( VkDispatchGraphInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DispatchGraphInfoAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DispatchGraphInfoAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DispatchGraphInfoAMDX & setNodeIndex( uint32_t nodeIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       nodeIndex = nodeIndex_;
@@ -43526,7 +30958,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DispatchGraphInfoAMDX & setPayloads( DeviceOrHostAddressConstAMDX const & payloads_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DispatchGraphInfoAMDX & setPayloads( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX const & payloads_ ) VULKAN_HPP_NOEXCEPT
     {
       payloads = payloads_;
       return *this;
@@ -43537,7 +30969,7 @@ namespace VULKAN_HPP_NAMESPACE
       payloadStride = payloadStride_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDispatchGraphInfoAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43549,49 +30981,35 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDispatchGraphInfoAMDX *>( this );
     }
 
-    operator VkDispatchGraphInfoAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDispatchGraphInfoAMDX *>( this );
-    }
-
-    operator VkDispatchGraphInfoAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDispatchGraphInfoAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, DeviceOrHostAddressConstAMDX const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX const &, uint64_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( nodeIndex, payloadCount, payloads, payloadStride );
     }
 #  endif
 
   public:
-    uint32_t                     nodeIndex     = {};
-    uint32_t                     payloadCount  = {};
-    DeviceOrHostAddressConstAMDX payloads      = {};
-    uint64_t                     payloadStride = {};
+    uint32_t                                           nodeIndex     = {};
+    uint32_t                                           payloadCount  = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstAMDX payloads      = {};
+    uint64_t                                           payloadStride = {};
   };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDispatchGraphInfoAMDX>
-  {
-    using Type = DispatchGraphInfoAMDX;
-  };
-#  endif
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkDispatchIndirectCommand, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDispatchIndirectCommand.html
   struct DispatchIndirectCommand
   {
     using NativeType = VkDispatchIndirectCommand;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DispatchIndirectCommand( uint32_t x_ = {}, uint32_t y_ = {}, uint32_t z_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
-      , z{ z_ }
+      : x( x_ )
+      , y( y_ )
+      , z( z_ )
     {
     }
 
@@ -43603,15 +31021,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DispatchIndirectCommand & operator=( DispatchIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DispatchIndirectCommand & operator=( VkDispatchIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DispatchIndirectCommand const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DispatchIndirectCommand const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DispatchIndirectCommand & setX( uint32_t x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -43629,7 +31047,7 @@ namespace VULKAN_HPP_NAMESPACE
       z = z_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDispatchIndirectCommand const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43641,18 +31059,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDispatchIndirectCommand *>( this );
     }
 
-    operator VkDispatchIndirectCommand const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDispatchIndirectCommand *>( this );
-    }
-
-    operator VkDispatchIndirectCommand *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDispatchIndirectCommand *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y, z );
     }
@@ -43682,114 +31095,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t z = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDispatchIndirectCommand>
-  {
-    using Type = DispatchIndirectCommand;
-  };
-#endif
-
-  // wrapper struct for struct VkDispatchTileInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDispatchTileInfoQCOM.html
-  struct DispatchTileInfoQCOM
-  {
-    using NativeType = VkDispatchTileInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDispatchTileInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DispatchTileInfoQCOM( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR DispatchTileInfoQCOM( DispatchTileInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DispatchTileInfoQCOM( VkDispatchTileInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DispatchTileInfoQCOM( *reinterpret_cast<DispatchTileInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    DispatchTileInfoQCOM & operator=( DispatchTileInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DispatchTileInfoQCOM & operator=( VkDispatchTileInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DispatchTileInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DispatchTileInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDispatchTileInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDispatchTileInfoQCOM *>( this );
-    }
-
-    operator VkDispatchTileInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDispatchTileInfoQCOM *>( this );
-    }
-
-    operator VkDispatchTileInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDispatchTileInfoQCOM *>( this );
-    }
-
-    operator VkDispatchTileInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDispatchTileInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DispatchTileInfoQCOM const & ) const = default;
-#else
-    bool operator==( DispatchTileInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( DispatchTileInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::eDispatchTileInfoQCOM;
-    const void *  pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDispatchTileInfoQCOM>
-  {
-    using Type = DispatchTileInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDispatchTileInfoQCOM>
-  {
-    using Type = DispatchTileInfoQCOM;
-  };
-
-  // wrapper struct for struct VkDisplayEventInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayEventInfoEXT.html
   struct DisplayEventInfoEXT
   {
     using NativeType = VkDisplayEventInfoEXT;
@@ -43797,11 +31102,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayEventInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayEventInfoEXT( DisplayEventTypeEXT displayEvent_ = DisplayEventTypeEXT::eFirstPixelOut,
-                                              const void *        pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displayEvent{ displayEvent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DisplayEventInfoEXT( VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT displayEvent_ = VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT::eFirstPixelOut,
+                           const void *                              pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displayEvent( displayEvent_ )
     {
     }
 
@@ -43812,27 +31118,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayEventInfoEXT & operator=( DisplayEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayEventInfoEXT & operator=( VkDisplayEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayEventInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayEventInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplayEventInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayEventInfoEXT & setDisplayEvent( DisplayEventTypeEXT displayEvent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayEventInfoEXT & setDisplayEvent( VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT displayEvent_ ) VULKAN_HPP_NOEXCEPT
     {
       displayEvent = displayEvent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayEventInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43844,18 +31150,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayEventInfoEXT *>( this );
     }
 
-    operator VkDisplayEventInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayEventInfoEXT *>( this );
-    }
-
-    operator VkDisplayEventInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayEventInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DisplayEventTypeEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, displayEvent );
     }
@@ -43880,34 +31181,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType        = StructureType::eDisplayEventInfoEXT;
-    const void *        pNext        = {};
-    DisplayEventTypeEXT displayEvent = DisplayEventTypeEXT::eFirstPixelOut;
+    VULKAN_HPP_NAMESPACE::StructureType       sType        = StructureType::eDisplayEventInfoEXT;
+    const void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT displayEvent = VULKAN_HPP_NAMESPACE::DisplayEventTypeEXT::eFirstPixelOut;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayEventInfoEXT>
-  {
-    using Type = DisplayEventInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayEventInfoEXT>
   {
     using Type = DisplayEventInfoEXT;
   };
 
-  // wrapper struct for struct VkDisplayModeParametersKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeParametersKHR.html
   struct DisplayModeParametersKHR
   {
     using NativeType = VkDisplayModeParametersKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayModeParametersKHR( Extent2D visibleRegion_ = {}, uint32_t refreshRate_ = {} ) VULKAN_HPP_NOEXCEPT
-      : visibleRegion{ visibleRegion_ }
-      , refreshRate{ refreshRate_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayModeParametersKHR( VULKAN_HPP_NAMESPACE::Extent2D visibleRegion_ = {}, uint32_t refreshRate_ = {} ) VULKAN_HPP_NOEXCEPT
+      : visibleRegion( visibleRegion_ )
+      , refreshRate( refreshRate_ )
     {
     }
 
@@ -43919,16 +31211,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayModeParametersKHR & operator=( DisplayModeParametersKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayModeParametersKHR & operator=( VkDisplayModeParametersKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayModeParametersKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DisplayModeParametersKHR & setVisibleRegion( Extent2D const & visibleRegion_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 DisplayModeParametersKHR & setVisibleRegion( VULKAN_HPP_NAMESPACE::Extent2D const & visibleRegion_ ) VULKAN_HPP_NOEXCEPT
     {
       visibleRegion = visibleRegion_;
       return *this;
@@ -43939,7 +31231,7 @@ namespace VULKAN_HPP_NAMESPACE
       refreshRate = refreshRate_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayModeParametersKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -43951,18 +31243,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayModeParametersKHR *>( this );
     }
 
-    operator VkDisplayModeParametersKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayModeParametersKHR *>( this );
-    }
-
-    operator VkDisplayModeParametersKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayModeParametersKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Extent2D const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Extent2D const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( visibleRegion, refreshRate );
     }
@@ -43987,19 +31274,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Extent2D visibleRegion = {};
-    uint32_t refreshRate   = {};
+    VULKAN_HPP_NAMESPACE::Extent2D visibleRegion = {};
+    uint32_t                       refreshRate   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayModeParametersKHR>
-  {
-    using Type = DisplayModeParametersKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkDisplayModeCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeCreateInfoKHR.html
   struct DisplayModeCreateInfoKHR
   {
     using NativeType = VkDisplayModeCreateInfoKHR;
@@ -44007,13 +31285,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayModeCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayModeCreateInfoKHR( DisplayModeCreateFlagsKHR flags_      = {},
-                                                   DisplayModeParametersKHR  parameters_ = {},
-                                                   const void *              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , parameters{ parameters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayModeCreateInfoKHR( VULKAN_HPP_NAMESPACE::DisplayModeCreateFlagsKHR flags_      = {},
+                                                   VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR  parameters_ = {},
+                                                   const void *                                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , parameters( parameters_ )
     {
     }
 
@@ -44025,33 +31303,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayModeCreateInfoKHR & operator=( DisplayModeCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayModeCreateInfoKHR & operator=( VkDisplayModeCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayModeCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayModeCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplayModeCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayModeCreateInfoKHR & setFlags( DisplayModeCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayModeCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::DisplayModeCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayModeCreateInfoKHR & setParameters( DisplayModeParametersKHR const & parameters_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayModeCreateInfoKHR & setParameters( VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR const & parameters_ ) VULKAN_HPP_NOEXCEPT
     {
       parameters = parameters_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayModeCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -44063,18 +31341,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayModeCreateInfoKHR *>( this );
     }
 
-    operator VkDisplayModeCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayModeCreateInfoKHR *>( this );
-    }
-
-    operator VkDisplayModeCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayModeCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DisplayModeCreateFlagsKHR const &, DisplayModeParametersKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DisplayModeCreateFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, parameters );
@@ -44100,35 +31375,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType      = StructureType::eDisplayModeCreateInfoKHR;
-    const void *              pNext      = {};
-    DisplayModeCreateFlagsKHR flags      = {};
-    DisplayModeParametersKHR  parameters = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType      = StructureType::eDisplayModeCreateInfoKHR;
+    const void *                                    pNext      = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeCreateFlagsKHR flags      = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR  parameters = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayModeCreateInfoKHR>
-  {
-    using Type = DisplayModeCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayModeCreateInfoKHR>
   {
     using Type = DisplayModeCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkDisplayModePropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModePropertiesKHR.html
   struct DisplayModePropertiesKHR
   {
     using NativeType = VkDisplayModePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayModePropertiesKHR( DisplayModeKHR displayMode_ = {}, DisplayModeParametersKHR parameters_ = {} ) VULKAN_HPP_NOEXCEPT
-      : displayMode{ displayMode_ }
-      , parameters{ parameters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayModePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR           displayMode_ = {},
+                                                   VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR parameters_  = {} ) VULKAN_HPP_NOEXCEPT
+      : displayMode( displayMode_ )
+      , parameters( parameters_ )
     {
     }
 
@@ -44140,11 +31407,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayModePropertiesKHR & operator=( DisplayModePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayModePropertiesKHR & operator=( VkDisplayModePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayModePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -44158,18 +31425,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayModePropertiesKHR *>( this );
     }
 
-    operator VkDisplayModePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayModePropertiesKHR *>( this );
-    }
-
-    operator VkDisplayModePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayModePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DisplayModeKHR const &, DisplayModeParametersKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DisplayModeKHR const &, VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( displayMode, parameters );
     }
@@ -44194,19 +31456,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DisplayModeKHR           displayMode = {};
-    DisplayModeParametersKHR parameters  = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeKHR           displayMode = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeParametersKHR parameters  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayModePropertiesKHR>
-  {
-    using Type = DisplayModePropertiesKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkDisplayModeProperties2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeProperties2KHR.html
   struct DisplayModeProperties2KHR
   {
     using NativeType = VkDisplayModeProperties2KHR;
@@ -44214,10 +31467,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayModeProperties2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayModeProperties2KHR( DisplayModePropertiesKHR displayModeProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displayModeProperties{ displayModeProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayModeProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR displayModeProperties_ = {},
+                                                    void *                                         pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displayModeProperties( displayModeProperties_ )
     {
     }
 
@@ -44229,11 +31483,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayModeProperties2KHR & operator=( DisplayModeProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayModeProperties2KHR & operator=( VkDisplayModeProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayModeProperties2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayModeProperties2KHR const *>( &rhs );
       return *this;
     }
 
@@ -44247,18 +31501,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayModeProperties2KHR *>( this );
     }
 
-    operator VkDisplayModeProperties2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayModeProperties2KHR *>( this );
-    }
-
-    operator VkDisplayModeProperties2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayModeProperties2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DisplayModePropertiesKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, displayModeProperties );
     }
@@ -44283,124 +31532,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                 = StructureType::eDisplayModeProperties2KHR;
-    void *                   pNext                 = {};
-    DisplayModePropertiesKHR displayModeProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                 = StructureType::eDisplayModeProperties2KHR;
+    void *                                         pNext                 = {};
+    VULKAN_HPP_NAMESPACE::DisplayModePropertiesKHR displayModeProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayModeProperties2KHR>
-  {
-    using Type = DisplayModeProperties2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayModeProperties2KHR>
   {
     using Type = DisplayModeProperties2KHR;
   };
 
-  // wrapper struct for struct VkDisplayModeStereoPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayModeStereoPropertiesNV.html
-  struct DisplayModeStereoPropertiesNV
-  {
-    using NativeType = VkDisplayModeStereoPropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayModeStereoPropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayModeStereoPropertiesNV( Bool32 hdmi3DSupported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hdmi3DSupported{ hdmi3DSupported_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DisplayModeStereoPropertiesNV( DisplayModeStereoPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DisplayModeStereoPropertiesNV( VkDisplayModeStereoPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DisplayModeStereoPropertiesNV( *reinterpret_cast<DisplayModeStereoPropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    DisplayModeStereoPropertiesNV & operator=( DisplayModeStereoPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DisplayModeStereoPropertiesNV & operator=( VkDisplayModeStereoPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DisplayModeStereoPropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkDisplayModeStereoPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDisplayModeStereoPropertiesNV *>( this );
-    }
-
-    operator VkDisplayModeStereoPropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDisplayModeStereoPropertiesNV *>( this );
-    }
-
-    operator VkDisplayModeStereoPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayModeStereoPropertiesNV *>( this );
-    }
-
-    operator VkDisplayModeStereoPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayModeStereoPropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, hdmi3DSupported );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DisplayModeStereoPropertiesNV const & ) const = default;
-#else
-    bool operator==( DisplayModeStereoPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( hdmi3DSupported == rhs.hdmi3DSupported );
-#  endif
-    }
-
-    bool operator!=( DisplayModeStereoPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType           = StructureType::eDisplayModeStereoPropertiesNV;
-    void *        pNext           = {};
-    Bool32        hdmi3DSupported = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayModeStereoPropertiesNV>
-  {
-    using Type = DisplayModeStereoPropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDisplayModeStereoPropertiesNV>
-  {
-    using Type = DisplayModeStereoPropertiesNV;
-  };
-
-  // wrapper struct for struct VkDisplayNativeHdrSurfaceCapabilitiesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayNativeHdrSurfaceCapabilitiesAMD.html
   struct DisplayNativeHdrSurfaceCapabilitiesAMD
   {
     using NativeType = VkDisplayNativeHdrSurfaceCapabilitiesAMD;
@@ -44408,10 +31550,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayNativeHdrSurfaceCapabilitiesAMD( Bool32 localDimmingSupport_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , localDimmingSupport{ localDimmingSupport_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayNativeHdrSurfaceCapabilitiesAMD( VULKAN_HPP_NAMESPACE::Bool32 localDimmingSupport_ = {},
+                                                                 void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , localDimmingSupport( localDimmingSupport_ )
     {
     }
 
@@ -44423,11 +31566,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayNativeHdrSurfaceCapabilitiesAMD & operator=( DisplayNativeHdrSurfaceCapabilitiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayNativeHdrSurfaceCapabilitiesAMD & operator=( VkDisplayNativeHdrSurfaceCapabilitiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayNativeHdrSurfaceCapabilitiesAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayNativeHdrSurfaceCapabilitiesAMD const *>( &rhs );
       return *this;
     }
 
@@ -44441,18 +31584,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayNativeHdrSurfaceCapabilitiesAMD *>( this );
     }
 
-    operator VkDisplayNativeHdrSurfaceCapabilitiesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayNativeHdrSurfaceCapabilitiesAMD *>( this );
-    }
-
-    operator VkDisplayNativeHdrSurfaceCapabilitiesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayNativeHdrSurfaceCapabilitiesAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, localDimmingSupport );
     }
@@ -44477,49 +31615,40 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD;
-    void *        pNext               = {};
-    Bool32        localDimmingSupport = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        localDimmingSupport = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayNativeHdrSurfaceCapabilitiesAMD>
-  {
-    using Type = DisplayNativeHdrSurfaceCapabilitiesAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD>
   {
     using Type = DisplayNativeHdrSurfaceCapabilitiesAMD;
   };
 
-  // wrapper struct for struct VkDisplayPlaneCapabilitiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneCapabilitiesKHR.html
   struct DisplayPlaneCapabilitiesKHR
   {
     using NativeType = VkDisplayPlaneCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPlaneCapabilitiesKHR( DisplayPlaneAlphaFlagsKHR supportedAlpha_ = {},
-                                                      Offset2D                  minSrcPosition_ = {},
-                                                      Offset2D                  maxSrcPosition_ = {},
-                                                      Extent2D                  minSrcExtent_   = {},
-                                                      Extent2D                  maxSrcExtent_   = {},
-                                                      Offset2D                  minDstPosition_ = {},
-                                                      Offset2D                  maxDstPosition_ = {},
-                                                      Extent2D                  minDstExtent_   = {},
-                                                      Extent2D                  maxDstExtent_   = {} ) VULKAN_HPP_NOEXCEPT
-      : supportedAlpha{ supportedAlpha_ }
-      , minSrcPosition{ minSrcPosition_ }
-      , maxSrcPosition{ maxSrcPosition_ }
-      , minSrcExtent{ minSrcExtent_ }
-      , maxSrcExtent{ maxSrcExtent_ }
-      , minDstPosition{ minDstPosition_ }
-      , maxDstPosition{ maxDstPosition_ }
-      , minDstExtent{ minDstExtent_ }
-      , maxDstExtent{ maxDstExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPlaneCapabilitiesKHR( VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagsKHR supportedAlpha_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Offset2D                  minSrcPosition_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Offset2D                  maxSrcPosition_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent2D                  minSrcExtent_   = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent2D                  maxSrcExtent_   = {},
+                                                      VULKAN_HPP_NAMESPACE::Offset2D                  minDstPosition_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Offset2D                  maxDstPosition_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent2D                  minDstExtent_   = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent2D                  maxDstExtent_   = {} ) VULKAN_HPP_NOEXCEPT
+      : supportedAlpha( supportedAlpha_ )
+      , minSrcPosition( minSrcPosition_ )
+      , maxSrcPosition( maxSrcPosition_ )
+      , minSrcExtent( minSrcExtent_ )
+      , maxSrcExtent( maxSrcExtent_ )
+      , minDstPosition( minDstPosition_ )
+      , maxDstPosition( maxDstPosition_ )
+      , minDstExtent( minDstExtent_ )
+      , maxDstExtent( maxDstExtent_ )
     {
     }
 
@@ -44531,11 +31660,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPlaneCapabilitiesKHR & operator=( DisplayPlaneCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPlaneCapabilitiesKHR & operator=( VkDisplayPlaneCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPlaneCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -44549,26 +31678,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( this );
     }
 
-    operator VkDisplayPlaneCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPlaneCapabilitiesKHR *>( this );
-    }
-
-    operator VkDisplayPlaneCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPlaneCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DisplayPlaneAlphaFlagsKHR const &,
-               Offset2D const &,
-               Offset2D const &,
-               Extent2D const &,
-               Extent2D const &,
-               Offset2D const &,
-               Offset2D const &,
-               Extent2D const &,
-               Extent2D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( supportedAlpha, minSrcPosition, maxSrcPosition, minSrcExtent, maxSrcExtent, minDstPosition, maxDstPosition, minDstExtent, maxDstExtent );
@@ -44596,26 +31719,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DisplayPlaneAlphaFlagsKHR supportedAlpha = {};
-    Offset2D                  minSrcPosition = {};
-    Offset2D                  maxSrcPosition = {};
-    Extent2D                  minSrcExtent   = {};
-    Extent2D                  maxSrcExtent   = {};
-    Offset2D                  minDstPosition = {};
-    Offset2D                  maxDstPosition = {};
-    Extent2D                  minDstExtent   = {};
-    Extent2D                  maxDstExtent   = {};
+    VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagsKHR supportedAlpha = {};
+    VULKAN_HPP_NAMESPACE::Offset2D                  minSrcPosition = {};
+    VULKAN_HPP_NAMESPACE::Offset2D                  maxSrcPosition = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                  minSrcExtent   = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                  maxSrcExtent   = {};
+    VULKAN_HPP_NAMESPACE::Offset2D                  minDstPosition = {};
+    VULKAN_HPP_NAMESPACE::Offset2D                  maxDstPosition = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                  minDstExtent   = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                  maxDstExtent   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPlaneCapabilitiesKHR>
-  {
-    using Type = DisplayPlaneCapabilitiesKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkDisplayPlaneCapabilities2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneCapabilities2KHR.html
   struct DisplayPlaneCapabilities2KHR
   {
     using NativeType = VkDisplayPlaneCapabilities2KHR;
@@ -44623,10 +31737,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayPlaneCapabilities2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPlaneCapabilities2KHR( DisplayPlaneCapabilitiesKHR capabilities_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , capabilities{ capabilities_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPlaneCapabilities2KHR( VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR capabilities_ = {},
+                                                       void *                                            pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , capabilities( capabilities_ )
     {
     }
 
@@ -44638,11 +31753,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPlaneCapabilities2KHR & operator=( DisplayPlaneCapabilities2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPlaneCapabilities2KHR & operator=( VkDisplayPlaneCapabilities2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPlaneCapabilities2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilities2KHR const *>( &rhs );
       return *this;
     }
 
@@ -44656,18 +31771,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( this );
     }
 
-    operator VkDisplayPlaneCapabilities2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPlaneCapabilities2KHR *>( this );
-    }
-
-    operator VkDisplayPlaneCapabilities2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPlaneCapabilities2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DisplayPlaneCapabilitiesKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, capabilities );
     }
@@ -44692,26 +31802,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType        = StructureType::eDisplayPlaneCapabilities2KHR;
-    void *                      pNext        = {};
-    DisplayPlaneCapabilitiesKHR capabilities = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType        = StructureType::eDisplayPlaneCapabilities2KHR;
+    void *                                            pNext        = {};
+    VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR capabilities = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPlaneCapabilities2KHR>
-  {
-    using Type = DisplayPlaneCapabilities2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayPlaneCapabilities2KHR>
   {
     using Type = DisplayPlaneCapabilities2KHR;
   };
 
-  // wrapper struct for struct VkDisplayPlaneInfo2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneInfo2KHR.html
   struct DisplayPlaneInfo2KHR
   {
     using NativeType = VkDisplayPlaneInfo2KHR;
@@ -44719,11 +31820,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayPlaneInfo2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPlaneInfo2KHR( DisplayModeKHR mode_ = {}, uint32_t planeIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mode{ mode_ }
-      , planeIndex{ planeIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DisplayPlaneInfo2KHR( VULKAN_HPP_NAMESPACE::DisplayModeKHR mode_ = {}, uint32_t planeIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , mode( mode_ )
+      , planeIndex( planeIndex_ )
     {
     }
 
@@ -44735,22 +31837,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPlaneInfo2KHR & operator=( DisplayPlaneInfo2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPlaneInfo2KHR & operator=( VkDisplayPlaneInfo2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPlaneInfo2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPlaneInfo2KHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplayPlaneInfo2KHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayPlaneInfo2KHR & setMode( DisplayModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayPlaneInfo2KHR & setMode( VULKAN_HPP_NAMESPACE::DisplayModeKHR mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
@@ -44761,7 +31863,7 @@ namespace VULKAN_HPP_NAMESPACE
       planeIndex = planeIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayPlaneInfo2KHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -44773,18 +31875,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPlaneInfo2KHR *>( this );
     }
 
-    operator VkDisplayPlaneInfo2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPlaneInfo2KHR *>( this );
-    }
-
-    operator VkDisplayPlaneInfo2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPlaneInfo2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DisplayModeKHR const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DisplayModeKHR const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mode, planeIndex );
     }
@@ -44809,35 +31906,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType      = StructureType::eDisplayPlaneInfo2KHR;
-    const void *   pNext      = {};
-    DisplayModeKHR mode       = {};
-    uint32_t       planeIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType      = StructureType::eDisplayPlaneInfo2KHR;
+    const void *                         pNext      = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeKHR mode       = {};
+    uint32_t                             planeIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPlaneInfo2KHR>
-  {
-    using Type = DisplayPlaneInfo2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayPlaneInfo2KHR>
   {
     using Type = DisplayPlaneInfo2KHR;
   };
 
-  // wrapper struct for struct VkDisplayPlanePropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlanePropertiesKHR.html
   struct DisplayPlanePropertiesKHR
   {
     using NativeType = VkDisplayPlanePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPlanePropertiesKHR( DisplayKHR currentDisplay_ = {}, uint32_t currentStackIndex_ = {} ) VULKAN_HPP_NOEXCEPT
-      : currentDisplay{ currentDisplay_ }
-      , currentStackIndex{ currentStackIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPlanePropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR currentDisplay_    = {},
+                                                    uint32_t                         currentStackIndex_ = {} ) VULKAN_HPP_NOEXCEPT
+      : currentDisplay( currentDisplay_ )
+      , currentStackIndex( currentStackIndex_ )
     {
     }
 
@@ -44849,11 +31938,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPlanePropertiesKHR & operator=( DisplayPlanePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPlanePropertiesKHR & operator=( VkDisplayPlanePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPlanePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -44867,18 +31956,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPlanePropertiesKHR *>( this );
     }
 
-    operator VkDisplayPlanePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPlanePropertiesKHR *>( this );
-    }
-
-    operator VkDisplayPlanePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPlanePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DisplayKHR const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DisplayKHR const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( currentDisplay, currentStackIndex );
     }
@@ -44903,19 +31987,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DisplayKHR currentDisplay    = {};
-    uint32_t   currentStackIndex = {};
+    VULKAN_HPP_NAMESPACE::DisplayKHR currentDisplay    = {};
+    uint32_t                         currentStackIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPlanePropertiesKHR>
-  {
-    using Type = DisplayPlanePropertiesKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkDisplayPlaneProperties2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPlaneProperties2KHR.html
   struct DisplayPlaneProperties2KHR
   {
     using NativeType = VkDisplayPlaneProperties2KHR;
@@ -44923,10 +31998,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayPlaneProperties2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPlaneProperties2KHR( DisplayPlanePropertiesKHR displayPlaneProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displayPlaneProperties{ displayPlaneProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPlaneProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR displayPlaneProperties_ = {},
+                                                     void *                                          pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displayPlaneProperties( displayPlaneProperties_ )
     {
     }
 
@@ -44938,11 +32014,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPlaneProperties2KHR & operator=( DisplayPlaneProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPlaneProperties2KHR & operator=( VkDisplayPlaneProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPlaneProperties2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPlaneProperties2KHR const *>( &rhs );
       return *this;
     }
 
@@ -44956,18 +32032,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPlaneProperties2KHR *>( this );
     }
 
-    operator VkDisplayPlaneProperties2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPlaneProperties2KHR *>( this );
-    }
-
-    operator VkDisplayPlaneProperties2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPlaneProperties2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DisplayPlanePropertiesKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, displayPlaneProperties );
     }
@@ -44992,26 +32063,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType                  = StructureType::eDisplayPlaneProperties2KHR;
-    void *                    pNext                  = {};
-    DisplayPlanePropertiesKHR displayPlaneProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType                  = StructureType::eDisplayPlaneProperties2KHR;
+    void *                                          pNext                  = {};
+    VULKAN_HPP_NAMESPACE::DisplayPlanePropertiesKHR displayPlaneProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPlaneProperties2KHR>
-  {
-    using Type = DisplayPlaneProperties2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayPlaneProperties2KHR>
   {
     using Type = DisplayPlaneProperties2KHR;
   };
 
-  // wrapper struct for struct VkDisplayPowerInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPowerInfoEXT.html
   struct DisplayPowerInfoEXT
   {
     using NativeType = VkDisplayPowerInfoEXT;
@@ -45019,10 +32081,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayPowerInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPowerInfoEXT( DisplayPowerStateEXT powerState_ = DisplayPowerStateEXT::eOff, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , powerState{ powerState_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPowerInfoEXT( VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT powerState_ = VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT::eOff,
+                                              const void *                               pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , powerState( powerState_ )
     {
     }
 
@@ -45033,27 +32096,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPowerInfoEXT & operator=( DisplayPowerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPowerInfoEXT & operator=( VkDisplayPowerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPowerInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPowerInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplayPowerInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayPowerInfoEXT & setPowerState( DisplayPowerStateEXT powerState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayPowerInfoEXT & setPowerState( VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT powerState_ ) VULKAN_HPP_NOEXCEPT
     {
       powerState = powerState_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayPowerInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -45065,18 +32128,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPowerInfoEXT *>( this );
     }
 
-    operator VkDisplayPowerInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPowerInfoEXT *>( this );
-    }
-
-    operator VkDisplayPowerInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPowerInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DisplayPowerStateEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, powerState );
     }
@@ -45101,26 +32159,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType      = StructureType::eDisplayPowerInfoEXT;
-    const void *         pNext      = {};
-    DisplayPowerStateEXT powerState = DisplayPowerStateEXT::eOff;
+    VULKAN_HPP_NAMESPACE::StructureType        sType      = StructureType::eDisplayPowerInfoEXT;
+    const void *                               pNext      = {};
+    VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT powerState = VULKAN_HPP_NAMESPACE::DisplayPowerStateEXT::eOff;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPowerInfoEXT>
-  {
-    using Type = DisplayPowerInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayPowerInfoEXT>
   {
     using Type = DisplayPowerInfoEXT;
   };
 
-  // wrapper struct for struct VkDisplayPresentInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPresentInfoKHR.html
   struct DisplayPresentInfoKHR
   {
     using NativeType = VkDisplayPresentInfoKHR;
@@ -45128,13 +32177,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayPresentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DisplayPresentInfoKHR( Rect2D srcRect_ = {}, Rect2D dstRect_ = {}, Bool32 persistent_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcRect{ srcRect_ }
-      , dstRect{ dstRect_ }
-      , persistent{ persistent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPresentInfoKHR( VULKAN_HPP_NAMESPACE::Rect2D srcRect_    = {},
+                                                VULKAN_HPP_NAMESPACE::Rect2D dstRect_    = {},
+                                                VULKAN_HPP_NAMESPACE::Bool32 persistent_ = {},
+                                                const void *                 pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcRect( srcRect_ )
+      , dstRect( dstRect_ )
+      , persistent( persistent_ )
     {
     }
 
@@ -45146,39 +32197,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPresentInfoKHR & operator=( DisplayPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPresentInfoKHR & operator=( VkDisplayPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPresentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPresentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setSrcRect( Rect2D const & srcRect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setSrcRect( VULKAN_HPP_NAMESPACE::Rect2D const & srcRect_ ) VULKAN_HPP_NOEXCEPT
     {
       srcRect = srcRect_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setDstRect( Rect2D const & dstRect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setDstRect( VULKAN_HPP_NAMESPACE::Rect2D const & dstRect_ ) VULKAN_HPP_NOEXCEPT
     {
       dstRect = dstRect_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setPersistent( Bool32 persistent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplayPresentInfoKHR & setPersistent( VULKAN_HPP_NAMESPACE::Bool32 persistent_ ) VULKAN_HPP_NOEXCEPT
     {
       persistent = persistent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplayPresentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -45190,18 +32241,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPresentInfoKHR *>( this );
     }
 
-    operator VkDisplayPresentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPresentInfoKHR *>( this );
-    }
-
-    operator VkDisplayPresentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPresentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Rect2D const &, Rect2D const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Rect2D const &,
+               VULKAN_HPP_NAMESPACE::Rect2D const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcRect, dstRect, persistent );
     }
@@ -45226,47 +32276,38 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eDisplayPresentInfoKHR;
-    const void *  pNext      = {};
-    Rect2D        srcRect    = {};
-    Rect2D        dstRect    = {};
-    Bool32        persistent = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eDisplayPresentInfoKHR;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::Rect2D        srcRect    = {};
+    VULKAN_HPP_NAMESPACE::Rect2D        dstRect    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        persistent = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPresentInfoKHR>
-  {
-    using Type = DisplayPresentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayPresentInfoKHR>
   {
     using Type = DisplayPresentInfoKHR;
   };
 
-  // wrapper struct for struct VkDisplayPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayPropertiesKHR.html
   struct DisplayPropertiesKHR
   {
     using NativeType = VkDisplayPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayPropertiesKHR( DisplayKHR               display_              = {},
-                                               const char *             displayName_          = {},
-                                               Extent2D                 physicalDimensions_   = {},
-                                               Extent2D                 physicalResolution_   = {},
-                                               SurfaceTransformFlagsKHR supportedTransforms_  = {},
-                                               Bool32                   planeReorderPossible_ = {},
-                                               Bool32                   persistentContent_    = {} ) VULKAN_HPP_NOEXCEPT
-      : display{ display_ }
-      , displayName{ displayName_ }
-      , physicalDimensions{ physicalDimensions_ }
-      , physicalResolution{ physicalResolution_ }
-      , supportedTransforms{ supportedTransforms_ }
-      , planeReorderPossible{ planeReorderPossible_ }
-      , persistentContent{ persistentContent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayPropertiesKHR( VULKAN_HPP_NAMESPACE::DisplayKHR               display_              = {},
+                                               const char *                                   displayName_          = {},
+                                               VULKAN_HPP_NAMESPACE::Extent2D                 physicalDimensions_   = {},
+                                               VULKAN_HPP_NAMESPACE::Extent2D                 physicalResolution_   = {},
+                                               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR supportedTransforms_  = {},
+                                               VULKAN_HPP_NAMESPACE::Bool32                   planeReorderPossible_ = {},
+                                               VULKAN_HPP_NAMESPACE::Bool32                   persistentContent_    = {} ) VULKAN_HPP_NOEXCEPT
+      : display( display_ )
+      , displayName( displayName_ )
+      , physicalDimensions( physicalDimensions_ )
+      , physicalResolution( physicalResolution_ )
+      , supportedTransforms( supportedTransforms_ )
+      , planeReorderPossible( planeReorderPossible_ )
+      , persistentContent( persistentContent_ )
     {
     }
 
@@ -45278,11 +32319,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayPropertiesKHR & operator=( DisplayPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayPropertiesKHR & operator=( VkDisplayPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -45296,18 +32337,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayPropertiesKHR *>( this );
     }
 
-    operator VkDisplayPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayPropertiesKHR *>( this );
-    }
-
-    operator VkDisplayPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DisplayKHR const &, const char * const &, Extent2D const &, Extent2D const &, SurfaceTransformFlagsKHR const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DisplayKHR const &,
+               const char * const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( display, displayName, physicalDimensions, physicalResolution, supportedTransforms, planeReorderPossible, persistentContent );
@@ -45351,24 +32392,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    DisplayKHR               display              = {};
-    const char *             displayName          = {};
-    Extent2D                 physicalDimensions   = {};
-    Extent2D                 physicalResolution   = {};
-    SurfaceTransformFlagsKHR supportedTransforms  = {};
-    Bool32                   planeReorderPossible = {};
-    Bool32                   persistentContent    = {};
+    VULKAN_HPP_NAMESPACE::DisplayKHR               display              = {};
+    const char *                                   displayName          = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                 physicalDimensions   = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                 physicalResolution   = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR supportedTransforms  = {};
+    VULKAN_HPP_NAMESPACE::Bool32                   planeReorderPossible = {};
+    VULKAN_HPP_NAMESPACE::Bool32                   persistentContent    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayPropertiesKHR>
-  {
-    using Type = DisplayPropertiesKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkDisplayProperties2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplayProperties2KHR.html
   struct DisplayProperties2KHR
   {
     using NativeType = VkDisplayProperties2KHR;
@@ -45376,10 +32408,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplayProperties2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplayProperties2KHR( DisplayPropertiesKHR displayProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displayProperties{ displayProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DisplayProperties2KHR( VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR displayProperties_ = {},
+                                                void *                                     pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displayProperties( displayProperties_ )
     {
     }
 
@@ -45391,11 +32424,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplayProperties2KHR & operator=( DisplayProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplayProperties2KHR & operator=( VkDisplayProperties2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplayProperties2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplayProperties2KHR const *>( &rhs );
       return *this;
     }
 
@@ -45409,18 +32442,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplayProperties2KHR *>( this );
     }
 
-    operator VkDisplayProperties2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplayProperties2KHR *>( this );
-    }
-
-    operator VkDisplayProperties2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplayProperties2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DisplayPropertiesKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, displayProperties );
     }
@@ -45445,26 +32473,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType             = StructureType::eDisplayProperties2KHR;
-    void *               pNext             = {};
-    DisplayPropertiesKHR displayProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType             = StructureType::eDisplayProperties2KHR;
+    void *                                     pNext             = {};
+    VULKAN_HPP_NAMESPACE::DisplayPropertiesKHR displayProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplayProperties2KHR>
-  {
-    using Type = DisplayProperties2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplayProperties2KHR>
   {
     using Type = DisplayProperties2KHR;
   };
 
-  // wrapper struct for struct VkDisplaySurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplaySurfaceCreateInfoKHR.html
   struct DisplaySurfaceCreateInfoKHR
   {
     using NativeType = VkDisplaySurfaceCreateInfoKHR;
@@ -45472,25 +32491,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplaySurfaceCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplaySurfaceCreateInfoKHR( DisplaySurfaceCreateFlagsKHR flags_           = {},
-                                                      DisplayModeKHR               displayMode_     = {},
-                                                      uint32_t                     planeIndex_      = {},
-                                                      uint32_t                     planeStackIndex_ = {},
-                                                      SurfaceTransformFlagBitsKHR  transform_       = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                      float                        globalAlpha_     = {},
-                                                      DisplayPlaneAlphaFlagBitsKHR alphaMode_       = DisplayPlaneAlphaFlagBitsKHR::eOpaque,
-                                                      Extent2D                     imageExtent_     = {},
-                                                      const void *                 pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , displayMode{ displayMode_ }
-      , planeIndex{ planeIndex_ }
-      , planeStackIndex{ planeStackIndex_ }
-      , transform{ transform_ }
-      , globalAlpha{ globalAlpha_ }
-      , alphaMode{ alphaMode_ }
-      , imageExtent{ imageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      DisplaySurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateFlagsKHR flags_           = {},
+                                   VULKAN_HPP_NAMESPACE::DisplayModeKHR               displayMode_     = {},
+                                   uint32_t                                           planeIndex_      = {},
+                                   uint32_t                                           planeStackIndex_ = {},
+                                   VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR  transform_ = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+                                   float                                              globalAlpha_ = {},
+                                   VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR alphaMode_ = VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR::eOpaque,
+                                   VULKAN_HPP_NAMESPACE::Extent2D                     imageExtent_ = {},
+                                   const void *                                       pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , displayMode( displayMode_ )
+      , planeIndex( planeIndex_ )
+      , planeStackIndex( planeStackIndex_ )
+      , transform( transform_ )
+      , globalAlpha( globalAlpha_ )
+      , alphaMode( alphaMode_ )
+      , imageExtent( imageExtent_ )
     {
     }
 
@@ -45502,28 +32522,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DisplaySurfaceCreateInfoKHR & operator=( DisplaySurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DisplaySurfaceCreateInfoKHR & operator=( VkDisplaySurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DisplaySurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setFlags( DisplaySurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setDisplayMode( DisplayModeKHR displayMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setDisplayMode( VULKAN_HPP_NAMESPACE::DisplayModeKHR displayMode_ ) VULKAN_HPP_NOEXCEPT
     {
       displayMode = displayMode_;
       return *this;
@@ -45541,7 +32561,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setTransform( SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setTransform( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
     {
       transform = transform_;
       return *this;
@@ -45553,18 +32573,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setAlphaMode( DisplayPlaneAlphaFlagBitsKHR alphaMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setAlphaMode( VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR alphaMode_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaMode = alphaMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setImageExtent( Extent2D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceCreateInfoKHR & setImageExtent( VULKAN_HPP_NAMESPACE::Extent2D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDisplaySurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -45576,27 +32596,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDisplaySurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkDisplaySurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplaySurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkDisplaySurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplaySurfaceCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DisplaySurfaceCreateFlagsKHR const &,
-               DisplayModeKHR const &,
+               VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::DisplayModeKHR const &,
                uint32_t const &,
                uint32_t const &,
-               SurfaceTransformFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &,
                float const &,
-               DisplayPlaneAlphaFlagBitsKHR const &,
-               Extent2D const &>
+               VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, displayMode, planeIndex, planeStackIndex, transform, globalAlpha, alphaMode, imageExtent );
@@ -45624,160 +32638,39 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType           = StructureType::eDisplaySurfaceCreateInfoKHR;
-    const void *                 pNext           = {};
-    DisplaySurfaceCreateFlagsKHR flags           = {};
-    DisplayModeKHR               displayMode     = {};
-    uint32_t                     planeIndex      = {};
-    uint32_t                     planeStackIndex = {};
-    SurfaceTransformFlagBitsKHR  transform       = SurfaceTransformFlagBitsKHR::eIdentity;
-    float                        globalAlpha     = {};
-    DisplayPlaneAlphaFlagBitsKHR alphaMode       = DisplayPlaneAlphaFlagBitsKHR::eOpaque;
-    Extent2D                     imageExtent     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType           = StructureType::eDisplaySurfaceCreateInfoKHR;
+    const void *                                       pNext           = {};
+    VULKAN_HPP_NAMESPACE::DisplaySurfaceCreateFlagsKHR flags           = {};
+    VULKAN_HPP_NAMESPACE::DisplayModeKHR               displayMode     = {};
+    uint32_t                                           planeIndex      = {};
+    uint32_t                                           planeStackIndex = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR  transform       = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
+    float                                              globalAlpha     = {};
+    VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR alphaMode       = VULKAN_HPP_NAMESPACE::DisplayPlaneAlphaFlagBitsKHR::eOpaque;
+    VULKAN_HPP_NAMESPACE::Extent2D                     imageExtent     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplaySurfaceCreateInfoKHR>
-  {
-    using Type = DisplaySurfaceCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDisplaySurfaceCreateInfoKHR>
   {
     using Type = DisplaySurfaceCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkDisplaySurfaceStereoCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDisplaySurfaceStereoCreateInfoNV.html
-  struct DisplaySurfaceStereoCreateInfoNV
-  {
-    using NativeType = VkDisplaySurfaceStereoCreateInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDisplaySurfaceStereoCreateInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DisplaySurfaceStereoCreateInfoNV( DisplaySurfaceStereoTypeNV stereoType_ = DisplaySurfaceStereoTypeNV::eNone,
-                                                           const void *               pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stereoType{ stereoType_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DisplaySurfaceStereoCreateInfoNV( DisplaySurfaceStereoCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DisplaySurfaceStereoCreateInfoNV( VkDisplaySurfaceStereoCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DisplaySurfaceStereoCreateInfoNV( *reinterpret_cast<DisplaySurfaceStereoCreateInfoNV const *>( &rhs ) )
-    {
-    }
-
-    DisplaySurfaceStereoCreateInfoNV & operator=( DisplaySurfaceStereoCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DisplaySurfaceStereoCreateInfoNV & operator=( VkDisplaySurfaceStereoCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DisplaySurfaceStereoCreateInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceStereoCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DisplaySurfaceStereoCreateInfoNV & setStereoType( DisplaySurfaceStereoTypeNV stereoType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stereoType = stereoType_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDisplaySurfaceStereoCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDisplaySurfaceStereoCreateInfoNV *>( this );
-    }
-
-    operator VkDisplaySurfaceStereoCreateInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDisplaySurfaceStereoCreateInfoNV *>( this );
-    }
-
-    operator VkDisplaySurfaceStereoCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDisplaySurfaceStereoCreateInfoNV *>( this );
-    }
-
-    operator VkDisplaySurfaceStereoCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDisplaySurfaceStereoCreateInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DisplaySurfaceStereoTypeNV const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, stereoType );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DisplaySurfaceStereoCreateInfoNV const & ) const = default;
-#else
-    bool operator==( DisplaySurfaceStereoCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( stereoType == rhs.stereoType );
-#  endif
-    }
-
-    bool operator!=( DisplaySurfaceStereoCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType              sType      = StructureType::eDisplaySurfaceStereoCreateInfoNV;
-    const void *               pNext      = {};
-    DisplaySurfaceStereoTypeNV stereoType = DisplaySurfaceStereoTypeNV::eNone;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDisplaySurfaceStereoCreateInfoNV>
-  {
-    using Type = DisplaySurfaceStereoCreateInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eDisplaySurfaceStereoCreateInfoNV>
-  {
-    using Type = DisplaySurfaceStereoCreateInfoNV;
-  };
-
-  // wrapper struct for struct VkDrawIndexedIndirectCommand, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrawIndexedIndirectCommand.html
   struct DrawIndexedIndirectCommand
   {
     using NativeType = VkDrawIndexedIndirectCommand;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DrawIndexedIndirectCommand( uint32_t indexCount_    = {},
                                                      uint32_t instanceCount_ = {},
                                                      uint32_t firstIndex_    = {},
                                                      int32_t  vertexOffset_  = {},
                                                      uint32_t firstInstance_ = {} ) VULKAN_HPP_NOEXCEPT
-      : indexCount{ indexCount_ }
-      , instanceCount{ instanceCount_ }
-      , firstIndex{ firstIndex_ }
-      , vertexOffset{ vertexOffset_ }
-      , firstInstance{ firstInstance_ }
+      : indexCount( indexCount_ )
+      , instanceCount( instanceCount_ )
+      , firstIndex( firstIndex_ )
+      , vertexOffset( vertexOffset_ )
+      , firstInstance( firstInstance_ )
     {
     }
 
@@ -45789,15 +32682,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrawIndexedIndirectCommand & operator=( DrawIndexedIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrawIndexedIndirectCommand & operator=( VkDrawIndexedIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrawIndexedIndirectCommand const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrawIndexedIndirectCommand const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DrawIndexedIndirectCommand & setIndexCount( uint32_t indexCount_ ) VULKAN_HPP_NOEXCEPT
     {
       indexCount = indexCount_;
@@ -45827,7 +32720,7 @@ namespace VULKAN_HPP_NAMESPACE
       firstInstance = firstInstance_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDrawIndexedIndirectCommand const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -45839,18 +32732,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrawIndexedIndirectCommand *>( this );
     }
 
-    operator VkDrawIndexedIndirectCommand const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrawIndexedIndirectCommand *>( this );
-    }
-
-    operator VkDrawIndexedIndirectCommand *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrawIndexedIndirectCommand *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, int32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, int32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( indexCount, instanceCount, firstIndex, vertexOffset, firstInstance );
     }
@@ -45883,28 +32771,19 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t firstInstance = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrawIndexedIndirectCommand>
-  {
-    using Type = DrawIndexedIndirectCommand;
-  };
-#endif
-
-  // wrapper struct for struct VkDrawIndirectCommand, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrawIndirectCommand.html
   struct DrawIndirectCommand
   {
     using NativeType = VkDrawIndirectCommand;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DrawIndirectCommand( uint32_t vertexCount_   = {},
                                               uint32_t instanceCount_ = {},
                                               uint32_t firstVertex_   = {},
                                               uint32_t firstInstance_ = {} ) VULKAN_HPP_NOEXCEPT
-      : vertexCount{ vertexCount_ }
-      , instanceCount{ instanceCount_ }
-      , firstVertex{ firstVertex_ }
-      , firstInstance{ firstInstance_ }
+      : vertexCount( vertexCount_ )
+      , instanceCount( instanceCount_ )
+      , firstVertex( firstVertex_ )
+      , firstInstance( firstInstance_ )
     {
     }
 
@@ -45915,15 +32794,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrawIndirectCommand & operator=( DrawIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrawIndirectCommand & operator=( VkDrawIndirectCommand const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrawIndirectCommand const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrawIndirectCommand const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DrawIndirectCommand & setVertexCount( uint32_t vertexCount_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexCount = vertexCount_;
@@ -45947,7 +32826,7 @@ namespace VULKAN_HPP_NAMESPACE
       firstInstance = firstInstance_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDrawIndirectCommand const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -45959,18 +32838,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrawIndirectCommand *>( this );
     }
 
-    operator VkDrawIndirectCommand const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrawIndirectCommand *>( this );
-    }
-
-    operator VkDrawIndirectCommand *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrawIndirectCommand *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( vertexCount, instanceCount, firstVertex, firstInstance );
     }
@@ -46002,136 +32876,16 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t firstInstance = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrawIndirectCommand>
-  {
-    using Type = DrawIndirectCommand;
-  };
-#endif
-
-  // wrapper struct for struct VkDrawIndirectCountIndirectCommandEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrawIndirectCountIndirectCommandEXT.html
-  struct DrawIndirectCountIndirectCommandEXT
-  {
-    using NativeType = VkDrawIndirectCountIndirectCommandEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      DrawIndirectCountIndirectCommandEXT( DeviceAddress bufferAddress_ = {}, uint32_t stride_ = {}, uint32_t commandCount_ = {} ) VULKAN_HPP_NOEXCEPT
-      : bufferAddress{ bufferAddress_ }
-      , stride{ stride_ }
-      , commandCount{ commandCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR DrawIndirectCountIndirectCommandEXT( DrawIndirectCountIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    DrawIndirectCountIndirectCommandEXT( VkDrawIndirectCountIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : DrawIndirectCountIndirectCommandEXT( *reinterpret_cast<DrawIndirectCountIndirectCommandEXT const *>( &rhs ) )
-    {
-    }
-
-    DrawIndirectCountIndirectCommandEXT & operator=( DrawIndirectCountIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    DrawIndirectCountIndirectCommandEXT & operator=( VkDrawIndirectCountIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<DrawIndirectCountIndirectCommandEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 DrawIndirectCountIndirectCommandEXT & setBufferAddress( DeviceAddress bufferAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bufferAddress = bufferAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DrawIndirectCountIndirectCommandEXT & setStride( uint32_t stride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stride = stride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 DrawIndirectCountIndirectCommandEXT & setCommandCount( uint32_t commandCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      commandCount = commandCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkDrawIndirectCountIndirectCommandEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkDrawIndirectCountIndirectCommandEXT *>( this );
-    }
-
-    operator VkDrawIndirectCountIndirectCommandEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkDrawIndirectCountIndirectCommandEXT *>( this );
-    }
-
-    operator VkDrawIndirectCountIndirectCommandEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrawIndirectCountIndirectCommandEXT *>( this );
-    }
-
-    operator VkDrawIndirectCountIndirectCommandEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrawIndirectCountIndirectCommandEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( bufferAddress, stride, commandCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( DrawIndirectCountIndirectCommandEXT const & ) const = default;
-#else
-    bool operator==( DrawIndirectCountIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( bufferAddress == rhs.bufferAddress ) && ( stride == rhs.stride ) && ( commandCount == rhs.commandCount );
-#  endif
-    }
-
-    bool operator!=( DrawIndirectCountIndirectCommandEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    DeviceAddress bufferAddress = {};
-    uint32_t      stride        = {};
-    uint32_t      commandCount  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrawIndirectCountIndirectCommandEXT>
-  {
-    using Type = DrawIndirectCountIndirectCommandEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDrawMeshTasksIndirectCommandEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrawMeshTasksIndirectCommandEXT.html
   struct DrawMeshTasksIndirectCommandEXT
   {
     using NativeType = VkDrawMeshTasksIndirectCommandEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       DrawMeshTasksIndirectCommandEXT( uint32_t groupCountX_ = {}, uint32_t groupCountY_ = {}, uint32_t groupCountZ_ = {} ) VULKAN_HPP_NOEXCEPT
-      : groupCountX{ groupCountX_ }
-      , groupCountY{ groupCountY_ }
-      , groupCountZ{ groupCountZ_ }
+      : groupCountX( groupCountX_ )
+      , groupCountY( groupCountY_ )
+      , groupCountZ( groupCountZ_ )
     {
     }
 
@@ -46143,15 +32897,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrawMeshTasksIndirectCommandEXT & operator=( DrawMeshTasksIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrawMeshTasksIndirectCommandEXT & operator=( VkDrawMeshTasksIndirectCommandEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrawMeshTasksIndirectCommandEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DrawMeshTasksIndirectCommandEXT & setGroupCountX( uint32_t groupCountX_ ) VULKAN_HPP_NOEXCEPT
     {
       groupCountX = groupCountX_;
@@ -46169,7 +32923,7 @@ namespace VULKAN_HPP_NAMESPACE
       groupCountZ = groupCountZ_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDrawMeshTasksIndirectCommandEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -46181,18 +32935,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrawMeshTasksIndirectCommandEXT *>( this );
     }
 
-    operator VkDrawMeshTasksIndirectCommandEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrawMeshTasksIndirectCommandEXT *>( this );
-    }
-
-    operator VkDrawMeshTasksIndirectCommandEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrawMeshTasksIndirectCommandEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( groupCountX, groupCountY, groupCountZ );
     }
@@ -46222,24 +32971,14 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t groupCountZ = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrawMeshTasksIndirectCommandEXT>
-  {
-    using Type = DrawMeshTasksIndirectCommandEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDrawMeshTasksIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrawMeshTasksIndirectCommandNV.html
   struct DrawMeshTasksIndirectCommandNV
   {
     using NativeType = VkDrawMeshTasksIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR DrawMeshTasksIndirectCommandNV( uint32_t taskCount_ = {}, uint32_t firstTask_ = {} ) VULKAN_HPP_NOEXCEPT
-      : taskCount{ taskCount_ }
-      , firstTask{ firstTask_ }
+      : taskCount( taskCount_ )
+      , firstTask( firstTask_ )
     {
     }
 
@@ -46251,15 +32990,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrawMeshTasksIndirectCommandNV & operator=( DrawMeshTasksIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrawMeshTasksIndirectCommandNV & operator=( VkDrawMeshTasksIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrawMeshTasksIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrawMeshTasksIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 DrawMeshTasksIndirectCommandNV & setTaskCount( uint32_t taskCount_ ) VULKAN_HPP_NOEXCEPT
     {
       taskCount = taskCount_;
@@ -46271,7 +33010,7 @@ namespace VULKAN_HPP_NAMESPACE
       firstTask = firstTask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkDrawMeshTasksIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -46283,18 +33022,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrawMeshTasksIndirectCommandNV *>( this );
     }
 
-    operator VkDrawMeshTasksIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrawMeshTasksIndirectCommandNV *>( this );
-    }
-
-    operator VkDrawMeshTasksIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrawMeshTasksIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( taskCount, firstTask );
     }
@@ -46323,27 +33057,17 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t firstTask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrawMeshTasksIndirectCommandNV>
-  {
-    using Type = DrawMeshTasksIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkDrmFormatModifierProperties2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrmFormatModifierProperties2EXT.html
   struct DrmFormatModifierProperties2EXT
   {
     using NativeType = VkDrmFormatModifierProperties2EXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DrmFormatModifierProperties2EXT( uint64_t            drmFormatModifier_               = {},
-                                                          uint32_t            drmFormatModifierPlaneCount_     = {},
-                                                          FormatFeatureFlags2 drmFormatModifierTilingFeatures_ = {} ) VULKAN_HPP_NOEXCEPT
-      : drmFormatModifier{ drmFormatModifier_ }
-      , drmFormatModifierPlaneCount{ drmFormatModifierPlaneCount_ }
-      , drmFormatModifierTilingFeatures{ drmFormatModifierTilingFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DrmFormatModifierProperties2EXT( uint64_t                                  drmFormatModifier_               = {},
+                                                          uint32_t                                  drmFormatModifierPlaneCount_     = {},
+                                                          VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 drmFormatModifierTilingFeatures_ = {} ) VULKAN_HPP_NOEXCEPT
+      : drmFormatModifier( drmFormatModifier_ )
+      , drmFormatModifierPlaneCount( drmFormatModifierPlaneCount_ )
+      , drmFormatModifierTilingFeatures( drmFormatModifierTilingFeatures_ )
     {
     }
 
@@ -46355,11 +33079,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrmFormatModifierProperties2EXT & operator=( DrmFormatModifierProperties2EXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrmFormatModifierProperties2EXT & operator=( VkDrmFormatModifierProperties2EXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrmFormatModifierProperties2EXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT const *>( &rhs );
       return *this;
     }
 
@@ -46373,18 +33097,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrmFormatModifierProperties2EXT *>( this );
     }
 
-    operator VkDrmFormatModifierProperties2EXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrmFormatModifierProperties2EXT *>( this );
-    }
-
-    operator VkDrmFormatModifierProperties2EXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrmFormatModifierProperties2EXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint64_t const &, uint32_t const &, FormatFeatureFlags2 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint64_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( drmFormatModifier, drmFormatModifierPlaneCount, drmFormatModifierTilingFeatures );
     }
@@ -46410,32 +33129,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint64_t            drmFormatModifier               = {};
-    uint32_t            drmFormatModifierPlaneCount     = {};
-    FormatFeatureFlags2 drmFormatModifierTilingFeatures = {};
+    uint64_t                                  drmFormatModifier               = {};
+    uint32_t                                  drmFormatModifierPlaneCount     = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 drmFormatModifierTilingFeatures = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrmFormatModifierProperties2EXT>
-  {
-    using Type = DrmFormatModifierProperties2EXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDrmFormatModifierPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrmFormatModifierPropertiesEXT.html
   struct DrmFormatModifierPropertiesEXT
   {
     using NativeType = VkDrmFormatModifierPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesEXT( uint64_t           drmFormatModifier_               = {},
-                                                         uint32_t           drmFormatModifierPlaneCount_     = {},
-                                                         FormatFeatureFlags drmFormatModifierTilingFeatures_ = {} ) VULKAN_HPP_NOEXCEPT
-      : drmFormatModifier{ drmFormatModifier_ }
-      , drmFormatModifierPlaneCount{ drmFormatModifierPlaneCount_ }
-      , drmFormatModifierTilingFeatures{ drmFormatModifierTilingFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesEXT( uint64_t                                 drmFormatModifier_               = {},
+                                                         uint32_t                                 drmFormatModifierPlaneCount_     = {},
+                                                         VULKAN_HPP_NAMESPACE::FormatFeatureFlags drmFormatModifierTilingFeatures_ = {} ) VULKAN_HPP_NOEXCEPT
+      : drmFormatModifier( drmFormatModifier_ )
+      , drmFormatModifierPlaneCount( drmFormatModifierPlaneCount_ )
+      , drmFormatModifierTilingFeatures( drmFormatModifierTilingFeatures_ )
     {
     }
 
@@ -46447,11 +33156,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     DrmFormatModifierPropertiesEXT & operator=( DrmFormatModifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrmFormatModifierPropertiesEXT & operator=( VkDrmFormatModifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrmFormatModifierPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -46465,18 +33174,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrmFormatModifierPropertiesEXT *>( this );
     }
 
-    operator VkDrmFormatModifierPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrmFormatModifierPropertiesEXT *>( this );
-    }
-
-    operator VkDrmFormatModifierPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrmFormatModifierPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint64_t const &, uint32_t const &, FormatFeatureFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint64_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( drmFormatModifier, drmFormatModifierPlaneCount, drmFormatModifierTilingFeatures );
     }
@@ -46502,21 +33206,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint64_t           drmFormatModifier               = {};
-    uint32_t           drmFormatModifierPlaneCount     = {};
-    FormatFeatureFlags drmFormatModifierTilingFeatures = {};
+    uint64_t                                 drmFormatModifier               = {};
+    uint32_t                                 drmFormatModifierPlaneCount     = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags drmFormatModifierTilingFeatures = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrmFormatModifierPropertiesEXT>
-  {
-    using Type = DrmFormatModifierPropertiesEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkDrmFormatModifierPropertiesList2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrmFormatModifierPropertiesList2EXT.html
   struct DrmFormatModifierPropertiesList2EXT
   {
     using NativeType = VkDrmFormatModifierPropertiesList2EXT;
@@ -46524,13 +33218,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDrmFormatModifierPropertiesList2EXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesList2EXT( uint32_t                          drmFormatModifierCount_       = {},
-                                                              DrmFormatModifierProperties2EXT * pDrmFormatModifierProperties_ = {},
-                                                              void *                            pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifierCount{ drmFormatModifierCount_ }
-      , pDrmFormatModifierProperties{ pDrmFormatModifierProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesList2EXT( uint32_t                                                drmFormatModifierCount_       = {},
+                                                              VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT * pDrmFormatModifierProperties_ = {},
+                                                              void *                                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , drmFormatModifierCount( drmFormatModifierCount_ )
+      , pDrmFormatModifierProperties( pDrmFormatModifierProperties_ )
     {
     }
 
@@ -46541,12 +33235,23 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    DrmFormatModifierPropertiesList2EXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT> const & drmFormatModifierProperties_,
+      void *                                                                                                       pNext_ = nullptr )
+      : pNext( pNext_ )
+      , drmFormatModifierCount( static_cast<uint32_t>( drmFormatModifierProperties_.size() ) )
+      , pDrmFormatModifierProperties( drmFormatModifierProperties_.data() )
+    {
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     DrmFormatModifierPropertiesList2EXT & operator=( DrmFormatModifierPropertiesList2EXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrmFormatModifierPropertiesList2EXT & operator=( VkDrmFormatModifierPropertiesList2EXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrmFormatModifierPropertiesList2EXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesList2EXT const *>( &rhs );
       return *this;
     }
 
@@ -46560,18 +33265,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrmFormatModifierPropertiesList2EXT *>( this );
     }
 
-    operator VkDrmFormatModifierPropertiesList2EXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrmFormatModifierPropertiesList2EXT *>( this );
-    }
-
-    operator VkDrmFormatModifierPropertiesList2EXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrmFormatModifierPropertiesList2EXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, DrmFormatModifierProperties2EXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifierCount, pDrmFormatModifierProperties );
     }
@@ -46597,28 +33297,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType                        = StructureType::eDrmFormatModifierPropertiesList2EXT;
-    void *                            pNext                        = {};
-    uint32_t                          drmFormatModifierCount       = {};
-    DrmFormatModifierProperties2EXT * pDrmFormatModifierProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                        = StructureType::eDrmFormatModifierPropertiesList2EXT;
+    void *                                                  pNext                        = {};
+    uint32_t                                                drmFormatModifierCount       = {};
+    VULKAN_HPP_NAMESPACE::DrmFormatModifierProperties2EXT * pDrmFormatModifierProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrmFormatModifierPropertiesList2EXT>
-  {
-    using Type = DrmFormatModifierPropertiesList2EXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDrmFormatModifierPropertiesList2EXT>
   {
     using Type = DrmFormatModifierPropertiesList2EXT;
   };
 
-  // wrapper struct for struct VkDrmFormatModifierPropertiesListEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkDrmFormatModifierPropertiesListEXT.html
   struct DrmFormatModifierPropertiesListEXT
   {
     using NativeType = VkDrmFormatModifierPropertiesListEXT;
@@ -46626,13 +33316,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eDrmFormatModifierPropertiesListEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesListEXT( uint32_t                         drmFormatModifierCount_       = {},
-                                                             DrmFormatModifierPropertiesEXT * pDrmFormatModifierProperties_ = {},
-                                                             void *                           pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifierCount{ drmFormatModifierCount_ }
-      , pDrmFormatModifierProperties{ pDrmFormatModifierProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR DrmFormatModifierPropertiesListEXT( uint32_t                                               drmFormatModifierCount_       = {},
+                                                             VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT * pDrmFormatModifierProperties_ = {},
+                                                             void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , drmFormatModifierCount( drmFormatModifierCount_ )
+      , pDrmFormatModifierProperties( pDrmFormatModifierProperties_ )
     {
     }
 
@@ -46643,12 +33333,23 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    DrmFormatModifierPropertiesListEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT> const & drmFormatModifierProperties_,
+      void *                                                                                                      pNext_ = nullptr )
+      : pNext( pNext_ )
+      , drmFormatModifierCount( static_cast<uint32_t>( drmFormatModifierProperties_.size() ) )
+      , pDrmFormatModifierProperties( drmFormatModifierProperties_.data() )
+    {
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     DrmFormatModifierPropertiesListEXT & operator=( DrmFormatModifierPropertiesListEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     DrmFormatModifierPropertiesListEXT & operator=( VkDrmFormatModifierPropertiesListEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<DrmFormatModifierPropertiesListEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesListEXT const *>( &rhs );
       return *this;
     }
 
@@ -46662,18 +33363,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkDrmFormatModifierPropertiesListEXT *>( this );
     }
 
-    operator VkDrmFormatModifierPropertiesListEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkDrmFormatModifierPropertiesListEXT *>( this );
-    }
-
-    operator VkDrmFormatModifierPropertiesListEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkDrmFormatModifierPropertiesListEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, DrmFormatModifierPropertiesEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifierCount, pDrmFormatModifierProperties );
     }
@@ -46699,27 +33395,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType                        = StructureType::eDrmFormatModifierPropertiesListEXT;
-    void *                           pNext                        = {};
-    uint32_t                         drmFormatModifierCount       = {};
-    DrmFormatModifierPropertiesEXT * pDrmFormatModifierProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType                        = StructureType::eDrmFormatModifierPropertiesListEXT;
+    void *                                                 pNext                        = {};
+    uint32_t                                               drmFormatModifierCount       = {};
+    VULKAN_HPP_NAMESPACE::DrmFormatModifierPropertiesEXT * pDrmFormatModifierProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkDrmFormatModifierPropertiesListEXT>
-  {
-    using Type = DrmFormatModifierPropertiesListEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eDrmFormatModifierPropertiesListEXT>
   {
     using Type = DrmFormatModifierPropertiesListEXT;
   };
 
-  // wrapper struct for struct VkEventCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkEventCreateInfo.html
   struct EventCreateInfo
   {
     using NativeType = VkEventCreateInfo;
@@ -46727,10 +33414,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eEventCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR EventCreateInfo( EventCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR EventCreateInfo( VULKAN_HPP_NAMESPACE::EventCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -46739,27 +33426,27 @@ namespace VULKAN_HPP_NAMESPACE
     EventCreateInfo( VkEventCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : EventCreateInfo( *reinterpret_cast<EventCreateInfo const *>( &rhs ) ) {}
 
     EventCreateInfo & operator=( EventCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     EventCreateInfo & operator=( VkEventCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<EventCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::EventCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 EventCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 EventCreateInfo & setFlags( EventCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 EventCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::EventCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkEventCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -46771,18 +33458,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkEventCreateInfo *>( this );
     }
 
-    operator VkEventCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkEventCreateInfo *>( this );
-    }
-
-    operator VkEventCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkEventCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, EventCreateFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::EventCreateFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -46807,26 +33489,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType = StructureType::eEventCreateInfo;
-    const void *     pNext = {};
-    EventCreateFlags flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType = StructureType::eEventCreateInfo;
+    const void *                           pNext = {};
+    VULKAN_HPP_NAMESPACE::EventCreateFlags flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkEventCreateInfo>
-  {
-    using Type = EventCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eEventCreateInfo>
   {
     using Type = EventCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineLibraryCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLibraryCreateInfoKHR.html
   struct PipelineLibraryCreateInfoKHR
   {
     using NativeType = VkPipelineLibraryCreateInfoKHR;
@@ -46834,12 +33507,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineLibraryCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PipelineLibraryCreateInfoKHR( uint32_t libraryCount_ = {}, const Pipeline * pLibraries_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , libraryCount{ libraryCount_ }
-      , pLibraries{ pLibraries_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineLibraryCreateInfoKHR( uint32_t                               libraryCount_ = {},
+                                                       const VULKAN_HPP_NAMESPACE::Pipeline * pLibraries_   = {},
+                                                       const void *                           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , libraryCount( libraryCount_ )
+      , pLibraries( pLibraries_ )
     {
     }
 
@@ -46851,22 +33525,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineLibraryCreateInfoKHR( ArrayProxyNoTemporaries<const Pipeline> const & libraries_, const void * pNext_ = nullptr )
+    PipelineLibraryCreateInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Pipeline> const & libraries_,
+                                  const void *                                                                                pNext_ = nullptr )
       : pNext( pNext_ ), libraryCount( static_cast<uint32_t>( libraries_.size() ) ), pLibraries( libraries_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineLibraryCreateInfoKHR & operator=( PipelineLibraryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineLibraryCreateInfoKHR & operator=( VkPipelineLibraryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineLibraryCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineLibraryCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -46879,21 +33554,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineLibraryCreateInfoKHR & setPLibraries( const Pipeline * pLibraries_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineLibraryCreateInfoKHR & setPLibraries( const VULKAN_HPP_NAMESPACE::Pipeline * pLibraries_ ) VULKAN_HPP_NOEXCEPT
     {
       pLibraries = pLibraries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineLibraryCreateInfoKHR & setLibraries( ArrayProxyNoTemporaries<const Pipeline> const & libraries_ ) VULKAN_HPP_NOEXCEPT
+    PipelineLibraryCreateInfoKHR &
+      setLibraries( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Pipeline> const & libraries_ ) VULKAN_HPP_NOEXCEPT
     {
       libraryCount = static_cast<uint32_t>( libraries_.size() );
       pLibraries   = libraries_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineLibraryCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -46905,18 +33581,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineLibraryCreateInfoKHR *>( this );
     }
 
-    operator VkPipelineLibraryCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineLibraryCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineLibraryCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineLibraryCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Pipeline * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Pipeline * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, libraryCount, pLibraries );
     }
@@ -46941,20 +33612,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType        = StructureType::ePipelineLibraryCreateInfoKHR;
-    const void *     pNext        = {};
-    uint32_t         libraryCount = {};
-    const Pipeline * pLibraries   = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType        = StructureType::ePipelineLibraryCreateInfoKHR;
+    const void *                           pNext        = {};
+    uint32_t                               libraryCount = {};
+    const VULKAN_HPP_NAMESPACE::Pipeline * pLibraries   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineLibraryCreateInfoKHR>
-  {
-    using Type = PipelineLibraryCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineLibraryCreateInfoKHR>
   {
@@ -46962,8 +33625,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkExecutionGraphPipelineCreateInfoAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExecutionGraphPipelineCreateInfoAMDX.html
   struct ExecutionGraphPipelineCreateInfoAMDX
   {
     using NativeType = VkExecutionGraphPipelineCreateInfoAMDX;
@@ -46971,23 +33632,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExecutionGraphPipelineCreateInfoAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExecutionGraphPipelineCreateInfoAMDX( PipelineCreateFlags                   flags_              = {},
-                                                               uint32_t                              stageCount_         = {},
-                                                               const PipelineShaderStageCreateInfo * pStages_            = {},
-                                                               const PipelineLibraryCreateInfoKHR *  pLibraryInfo_       = {},
-                                                               PipelineLayout                        layout_             = {},
-                                                               Pipeline                              basePipelineHandle_ = {},
-                                                               int32_t                               basePipelineIndex_  = {},
-                                                               const void *                          pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stageCount{ stageCount_ }
-      , pStages{ pStages_ }
-      , pLibraryInfo{ pLibraryInfo_ }
-      , layout{ layout_ }
-      , basePipelineHandle{ basePipelineHandle_ }
-      , basePipelineIndex{ basePipelineIndex_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExecutionGraphPipelineCreateInfoAMDX( VULKAN_HPP_NAMESPACE::PipelineCreateFlags                   flags_              = {},
+                                                               uint32_t                                                    stageCount_         = {},
+                                                               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_            = {},
+                                                               const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *  pLibraryInfo_       = {},
+                                                               VULKAN_HPP_NAMESPACE::PipelineLayout                        layout_             = {},
+                                                               VULKAN_HPP_NAMESPACE::Pipeline                              basePipelineHandle_ = {},
+                                                               int32_t                                                     basePipelineIndex_  = {},
+                                                               const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stageCount( stageCount_ )
+      , pStages( pStages_ )
+      , pLibraryInfo( pLibraryInfo_ )
+      , layout( layout_ )
+      , basePipelineHandle( basePipelineHandle_ )
+      , basePipelineIndex( basePipelineIndex_ )
     {
     }
 
@@ -46999,13 +33660,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ExecutionGraphPipelineCreateInfoAMDX( PipelineCreateFlags                                                  flags_,
-                                          ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_,
-                                          const PipelineLibraryCreateInfoKHR *                                 pLibraryInfo_       = {},
-                                          PipelineLayout                                                       layout_             = {},
-                                          Pipeline                                                             basePipelineHandle_ = {},
-                                          int32_t                                                              basePipelineIndex_  = {},
-                                          const void *                                                         pNext_              = nullptr )
+    ExecutionGraphPipelineCreateInfoAMDX(
+      VULKAN_HPP_NAMESPACE::PipelineCreateFlags                                                                        flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_,
+      const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *                                                       pLibraryInfo_       = {},
+      VULKAN_HPP_NAMESPACE::PipelineLayout                                                                             layout_             = {},
+      VULKAN_HPP_NAMESPACE::Pipeline                                                                                   basePipelineHandle_ = {},
+      int32_t                                                                                                          basePipelineIndex_  = {},
+      const void *                                                                                                     pNext_              = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , stageCount( static_cast<uint32_t>( stages_.size() ) )
@@ -47019,22 +33681,22 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ExecutionGraphPipelineCreateInfoAMDX & operator=( ExecutionGraphPipelineCreateInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExecutionGraphPipelineCreateInfoAMDX & operator=( VkExecutionGraphPipelineCreateInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExecutionGraphPipelineCreateInfoAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineCreateInfoAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setFlags( PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -47046,14 +33708,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setPStages( const PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX &
+      setPStages( const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
     {
       pStages = pStages_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ExecutionGraphPipelineCreateInfoAMDX & setStages( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
+    ExecutionGraphPipelineCreateInfoAMDX &
+      setStages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
     {
       stageCount = static_cast<uint32_t>( stages_.size() );
       pStages    = stages_.data();
@@ -47061,19 +33725,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setPLibraryInfo( const PipelineLibraryCreateInfoKHR * pLibraryInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX &
+      setPLibraryInfo( const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR * pLibraryInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pLibraryInfo = pLibraryInfo_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX & setBasePipelineHandle( Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineCreateInfoAMDX &
+      setBasePipelineHandle( VULKAN_HPP_NAMESPACE::Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
     {
       basePipelineHandle = basePipelineHandle_;
       return *this;
@@ -47084,7 +33750,7 @@ namespace VULKAN_HPP_NAMESPACE
       basePipelineIndex = basePipelineIndex_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExecutionGraphPipelineCreateInfoAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47096,26 +33762,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExecutionGraphPipelineCreateInfoAMDX *>( this );
     }
 
-    operator VkExecutionGraphPipelineCreateInfoAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExecutionGraphPipelineCreateInfoAMDX *>( this );
-    }
-
-    operator VkExecutionGraphPipelineCreateInfoAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExecutionGraphPipelineCreateInfoAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreateFlags const &,
                uint32_t const &,
-               const PipelineShaderStageCreateInfo * const &,
-               const PipelineLibraryCreateInfoKHR * const &,
-               PipelineLayout const &,
-               Pipeline const &,
+               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR * const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
                int32_t const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, stageCount, pStages, pLibraryInfo, layout, basePipelineHandle, basePipelineIndex );
@@ -47143,25 +33803,17 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                         sType              = StructureType::eExecutionGraphPipelineCreateInfoAMDX;
-    const void *                          pNext              = {};
-    PipelineCreateFlags                   flags              = {};
-    uint32_t                              stageCount         = {};
-    const PipelineShaderStageCreateInfo * pStages            = {};
-    const PipelineLibraryCreateInfoKHR *  pLibraryInfo       = {};
-    PipelineLayout                        layout             = {};
-    Pipeline                              basePipelineHandle = {};
-    int32_t                               basePipelineIndex  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType              = StructureType::eExecutionGraphPipelineCreateInfoAMDX;
+    const void *                                                pNext              = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags                   flags              = {};
+    uint32_t                                                    stageCount         = {};
+    const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages            = {};
+    const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *  pLibraryInfo       = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout                        layout             = {};
+    VULKAN_HPP_NAMESPACE::Pipeline                              basePipelineHandle = {};
+    int32_t                                                     basePipelineIndex  = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExecutionGraphPipelineCreateInfoAMDX>
-  {
-    using Type = ExecutionGraphPipelineCreateInfoAMDX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExecutionGraphPipelineCreateInfoAMDX>
   {
@@ -47170,8 +33822,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkExecutionGraphPipelineScratchSizeAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExecutionGraphPipelineScratchSizeAMDX.html
   struct ExecutionGraphPipelineScratchSizeAMDX
   {
     using NativeType = VkExecutionGraphPipelineScratchSizeAMDX;
@@ -47179,15 +33829,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExecutionGraphPipelineScratchSizeAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExecutionGraphPipelineScratchSizeAMDX( DeviceSize minSize_         = {},
-                                                                DeviceSize maxSize_         = {},
-                                                                DeviceSize sizeGranularity_ = {},
-                                                                void *     pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minSize{ minSize_ }
-      , maxSize{ maxSize_ }
-      , sizeGranularity{ sizeGranularity_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExecutionGraphPipelineScratchSizeAMDX( VULKAN_HPP_NAMESPACE::DeviceSize size_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , size( size_ )
     {
     }
 
@@ -47199,39 +33844,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExecutionGraphPipelineScratchSizeAMDX & operator=( ExecutionGraphPipelineScratchSizeAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExecutionGraphPipelineScratchSizeAMDX & operator=( VkExecutionGraphPipelineScratchSizeAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExecutionGraphPipelineScratchSizeAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExecutionGraphPipelineScratchSizeAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineScratchSizeAMDX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineScratchSizeAMDX & setMinSize( DeviceSize minSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineScratchSizeAMDX & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
-      minSize = minSize_;
+      size = size_;
       return *this;
     }
-
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineScratchSizeAMDX & setMaxSize( DeviceSize maxSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxSize = maxSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExecutionGraphPipelineScratchSizeAMDX & setSizeGranularity( DeviceSize sizeGranularity_ ) VULKAN_HPP_NOEXCEPT
-    {
-      sizeGranularity = sizeGranularity_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExecutionGraphPipelineScratchSizeAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47243,20 +33876,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( this );
     }
 
-    operator VkExecutionGraphPipelineScratchSizeAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExecutionGraphPipelineScratchSizeAMDX *>( this );
-    }
-
-    operator VkExecutionGraphPipelineScratchSizeAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExecutionGraphPipelineScratchSizeAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, minSize, maxSize, sizeGranularity );
+      return std::tie( sType, pNext, size );
     }
 #  endif
 
@@ -47268,8 +33896,7 @@ namespace VULKAN_HPP_NAMESPACE
 #    if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( minSize == rhs.minSize ) && ( maxSize == rhs.maxSize ) &&
-             ( sizeGranularity == rhs.sizeGranularity );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( size == rhs.size );
 #    endif
     }
 
@@ -47280,21 +33907,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType           = StructureType::eExecutionGraphPipelineScratchSizeAMDX;
-    void *        pNext           = {};
-    DeviceSize    minSize         = {};
-    DeviceSize    maxSize         = {};
-    DeviceSize    sizeGranularity = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eExecutionGraphPipelineScratchSizeAMDX;
+    void *                              pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size  = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExecutionGraphPipelineScratchSizeAMDX>
-  {
-    using Type = ExecutionGraphPipelineScratchSizeAMDX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExecutionGraphPipelineScratchSizeAMDX>
   {
@@ -47302,7 +33919,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkExportFenceCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportFenceCreateInfo.html
   struct ExportFenceCreateInfo
   {
     using NativeType = VkExportFenceCreateInfo;
@@ -47310,10 +33926,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportFenceCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportFenceCreateInfo( ExternalFenceHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportFenceCreateInfo( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags handleTypes_ = {},
+                                                const void *                                       pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -47325,27 +33942,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportFenceCreateInfo & operator=( ExportFenceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportFenceCreateInfo & operator=( VkExportFenceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportFenceCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportFenceCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportFenceCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportFenceCreateInfo & setHandleTypes( ExternalFenceHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportFenceCreateInfo & setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportFenceCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47357,18 +33974,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportFenceCreateInfo *>( this );
     }
 
-    operator VkExportFenceCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportFenceCreateInfo *>( this );
-    }
-
-    operator VkExportFenceCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportFenceCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalFenceHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -47393,19 +34005,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType       = StructureType::eExportFenceCreateInfo;
-    const void *                 pNext       = {};
-    ExternalFenceHandleTypeFlags handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType       = StructureType::eExportFenceCreateInfo;
+    const void *                                       pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportFenceCreateInfo>
-  {
-    using Type = ExportFenceCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportFenceCreateInfo>
   {
@@ -47415,8 +34019,6 @@ namespace VULKAN_HPP_NAMESPACE
   using ExportFenceCreateInfoKHR = ExportFenceCreateInfo;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkExportFenceWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportFenceWin32HandleInfoKHR.html
   struct ExportFenceWin32HandleInfoKHR
   {
     using NativeType = VkExportFenceWin32HandleInfoKHR;
@@ -47424,15 +34026,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportFenceWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExportFenceWin32HandleInfoKHR( const SECURITY_ATTRIBUTES * pAttributes_ = {},
                                                         DWORD                       dwAccess_    = {},
                                                         LPCWSTR                     name_        = {},
                                                         const void *                pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pAttributes{ pAttributes_ }
-      , dwAccess{ dwAccess_ }
-      , name{ name_ }
+      : pNext( pNext_ )
+      , pAttributes( pAttributes_ )
+      , dwAccess( dwAccess_ )
+      , name( name_ )
     {
     }
 
@@ -47444,15 +34046,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportFenceWin32HandleInfoKHR & operator=( ExportFenceWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportFenceWin32HandleInfoKHR & operator=( VkExportFenceWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportFenceWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportFenceWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportFenceWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -47476,7 +34078,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportFenceWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47488,18 +34090,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportFenceWin32HandleInfoKHR *>( this );
     }
 
-    operator VkExportFenceWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportFenceWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkExportFenceWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportFenceWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pAttributes, dwAccess, name );
@@ -47525,21 +34121,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType       = StructureType::eExportFenceWin32HandleInfoKHR;
-    const void *                pNext       = {};
-    const SECURITY_ATTRIBUTES * pAttributes = {};
-    DWORD                       dwAccess    = {};
-    LPCWSTR                     name        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eExportFenceWin32HandleInfoKHR;
+    const void *                        pNext       = {};
+    const SECURITY_ATTRIBUTES *         pAttributes = {};
+    DWORD                               dwAccess    = {};
+    LPCWSTR                             name        = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportFenceWin32HandleInfoKHR>
-  {
-    using Type = ExportFenceWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportFenceWin32HandleInfoKHR>
   {
@@ -47547,7 +34135,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkExportMemoryAllocateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMemoryAllocateInfo.html
   struct ExportMemoryAllocateInfo
   {
     using NativeType = VkExportMemoryAllocateInfo;
@@ -47555,10 +34142,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMemoryAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMemoryAllocateInfo( ExternalMemoryHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMemoryAllocateInfo( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ = {},
+                                                   const void *                                        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -47570,27 +34158,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMemoryAllocateInfo & operator=( ExportMemoryAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMemoryAllocateInfo & operator=( VkExportMemoryAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMemoryAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMemoryAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfo & setHandleTypes( ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfo & setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMemoryAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47602,18 +34190,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMemoryAllocateInfo *>( this );
     }
 
-    operator VkExportMemoryAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMemoryAllocateInfo *>( this );
-    }
-
-    operator VkExportMemoryAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMemoryAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -47638,19 +34221,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType       = StructureType::eExportMemoryAllocateInfo;
-    const void *                  pNext       = {};
-    ExternalMemoryHandleTypeFlags handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType       = StructureType::eExportMemoryAllocateInfo;
+    const void *                                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMemoryAllocateInfo>
-  {
-    using Type = ExportMemoryAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMemoryAllocateInfo>
   {
@@ -47659,7 +34234,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExportMemoryAllocateInfoKHR = ExportMemoryAllocateInfo;
 
-  // wrapper struct for struct VkExportMemoryAllocateInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMemoryAllocateInfoNV.html
   struct ExportMemoryAllocateInfoNV
   {
     using NativeType = VkExportMemoryAllocateInfoNV;
@@ -47667,10 +34241,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMemoryAllocateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMemoryAllocateInfoNV( ExternalMemoryHandleTypeFlagsNV handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMemoryAllocateInfoNV( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes_ = {},
+                                                     const void *                                          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -47682,27 +34257,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMemoryAllocateInfoNV & operator=( ExportMemoryAllocateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMemoryAllocateInfoNV & operator=( VkExportMemoryAllocateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMemoryAllocateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMemoryAllocateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfoNV & setHandleTypes( ExternalMemoryHandleTypeFlagsNV handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMemoryAllocateInfoNV &
+      setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMemoryAllocateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47714,18 +34290,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMemoryAllocateInfoNV *>( this );
     }
 
-    operator VkExportMemoryAllocateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMemoryAllocateInfoNV *>( this );
-    }
-
-    operator VkExportMemoryAllocateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMemoryAllocateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagsNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -47750,19 +34321,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType       = StructureType::eExportMemoryAllocateInfoNV;
-    const void *                    pNext       = {};
-    ExternalMemoryHandleTypeFlagsNV handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType       = StructureType::eExportMemoryAllocateInfoNV;
+    const void *                                          pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMemoryAllocateInfoNV>
-  {
-    using Type = ExportMemoryAllocateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMemoryAllocateInfoNV>
   {
@@ -47770,8 +34333,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkExportMemoryWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMemoryWin32HandleInfoKHR.html
   struct ExportMemoryWin32HandleInfoKHR
   {
     using NativeType = VkExportMemoryWin32HandleInfoKHR;
@@ -47779,15 +34340,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMemoryWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExportMemoryWin32HandleInfoKHR( const SECURITY_ATTRIBUTES * pAttributes_ = {},
                                                          DWORD                       dwAccess_    = {},
                                                          LPCWSTR                     name_        = {},
                                                          const void *                pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pAttributes{ pAttributes_ }
-      , dwAccess{ dwAccess_ }
-      , name{ name_ }
+      : pNext( pNext_ )
+      , pAttributes( pAttributes_ )
+      , dwAccess( dwAccess_ )
+      , name( name_ )
     {
     }
 
@@ -47799,15 +34360,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMemoryWin32HandleInfoKHR & operator=( ExportMemoryWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMemoryWin32HandleInfoKHR & operator=( VkExportMemoryWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMemoryWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMemoryWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMemoryWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -47831,7 +34392,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMemoryWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47843,18 +34404,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMemoryWin32HandleInfoKHR *>( this );
     }
 
-    operator VkExportMemoryWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMemoryWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkExportMemoryWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMemoryWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pAttributes, dwAccess, name );
@@ -47880,21 +34435,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType       = StructureType::eExportMemoryWin32HandleInfoKHR;
-    const void *                pNext       = {};
-    const SECURITY_ATTRIBUTES * pAttributes = {};
-    DWORD                       dwAccess    = {};
-    LPCWSTR                     name        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eExportMemoryWin32HandleInfoKHR;
+    const void *                        pNext       = {};
+    const SECURITY_ATTRIBUTES *         pAttributes = {};
+    DWORD                               dwAccess    = {};
+    LPCWSTR                             name        = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMemoryWin32HandleInfoKHR>
-  {
-    using Type = ExportMemoryWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMemoryWin32HandleInfoKHR>
   {
@@ -47903,8 +34450,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkExportMemoryWin32HandleInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMemoryWin32HandleInfoNV.html
   struct ExportMemoryWin32HandleInfoNV
   {
     using NativeType = VkExportMemoryWin32HandleInfoNV;
@@ -47912,12 +34457,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMemoryWin32HandleInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       ExportMemoryWin32HandleInfoNV( const SECURITY_ATTRIBUTES * pAttributes_ = {}, DWORD dwAccess_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pAttributes{ pAttributes_ }
-      , dwAccess{ dwAccess_ }
+      : pNext( pNext_ )
+      , pAttributes( pAttributes_ )
+      , dwAccess( dwAccess_ )
     {
     }
 
@@ -47929,15 +34474,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMemoryWin32HandleInfoNV & operator=( ExportMemoryWin32HandleInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMemoryWin32HandleInfoNV & operator=( VkExportMemoryWin32HandleInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMemoryWin32HandleInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMemoryWin32HandleInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMemoryWin32HandleInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -47955,7 +34500,7 @@ namespace VULKAN_HPP_NAMESPACE
       dwAccess = dwAccess_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMemoryWin32HandleInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -47967,18 +34512,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMemoryWin32HandleInfoNV *>( this );
     }
 
-    operator VkExportMemoryWin32HandleInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMemoryWin32HandleInfoNV *>( this );
-    }
-
-    operator VkExportMemoryWin32HandleInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMemoryWin32HandleInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pAttributes, dwAccess );
     }
@@ -48003,20 +34543,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType       = StructureType::eExportMemoryWin32HandleInfoNV;
-    const void *                pNext       = {};
-    const SECURITY_ATTRIBUTES * pAttributes = {};
-    DWORD                       dwAccess    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eExportMemoryWin32HandleInfoNV;
+    const void *                        pNext       = {};
+    const SECURITY_ATTRIBUTES *         pAttributes = {};
+    DWORD                               dwAccess    = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMemoryWin32HandleInfoNV>
-  {
-    using Type = ExportMemoryWin32HandleInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMemoryWin32HandleInfoNV>
   {
@@ -48025,7 +34557,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalBufferInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalBufferInfoEXT.html
   struct ExportMetalBufferInfoEXT
   {
     using NativeType = VkExportMetalBufferInfoEXT;
@@ -48033,11 +34564,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalBufferInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalBufferInfoEXT( DeviceMemory memory_ = {}, MTLBuffer_id mtlBuffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , mtlBuffer{ mtlBuffer_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalBufferInfoEXT( VULKAN_HPP_NAMESPACE::DeviceMemory memory_    = {},
+                                                   MTLBuffer_id                       mtlBuffer_ = {},
+                                                   const void *                       pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , mtlBuffer( mtlBuffer_ )
     {
     }
 
@@ -48049,22 +34582,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalBufferInfoEXT & operator=( ExportMetalBufferInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalBufferInfoEXT & operator=( VkExportMetalBufferInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalBufferInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalBufferInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalBufferInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalBufferInfoEXT & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalBufferInfoEXT & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
@@ -48075,7 +34608,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlBuffer = mtlBuffer_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalBufferInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48087,18 +34620,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalBufferInfoEXT *>( this );
     }
 
-    operator VkExportMetalBufferInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalBufferInfoEXT *>( this );
-    }
-
-    operator VkExportMetalBufferInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalBufferInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, MTLBuffer_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceMemory const &, MTLBuffer_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, mtlBuffer );
     }
@@ -48123,20 +34651,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType     = StructureType::eExportMetalBufferInfoEXT;
-    const void *  pNext     = {};
-    DeviceMemory  memory    = {};
-    MTLBuffer_id  mtlBuffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eExportMetalBufferInfoEXT;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory    = {};
+    MTLBuffer_id                        mtlBuffer = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalBufferInfoEXT>
-  {
-    using Type = ExportMetalBufferInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalBufferInfoEXT>
   {
@@ -48145,8 +34665,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalCommandQueueInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalCommandQueueInfoEXT.html
   struct ExportMetalCommandQueueInfoEXT
   {
     using NativeType = VkExportMetalCommandQueueInfoEXT;
@@ -48154,12 +34672,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalCommandQueueInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ExportMetalCommandQueueInfoEXT( Queue queue_ = {}, MTLCommandQueue_id mtlCommandQueue_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queue{ queue_ }
-      , mtlCommandQueue{ mtlCommandQueue_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalCommandQueueInfoEXT( VULKAN_HPP_NAMESPACE::Queue queue_           = {},
+                                                         MTLCommandQueue_id          mtlCommandQueue_ = {},
+                                                         const void *                pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queue( queue_ )
+      , mtlCommandQueue( mtlCommandQueue_ )
     {
     }
 
@@ -48171,22 +34690,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalCommandQueueInfoEXT & operator=( ExportMetalCommandQueueInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalCommandQueueInfoEXT & operator=( VkExportMetalCommandQueueInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalCommandQueueInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalCommandQueueInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalCommandQueueInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalCommandQueueInfoEXT & setQueue( Queue queue_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalCommandQueueInfoEXT & setQueue( VULKAN_HPP_NAMESPACE::Queue queue_ ) VULKAN_HPP_NOEXCEPT
     {
       queue = queue_;
       return *this;
@@ -48197,7 +34716,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlCommandQueue = mtlCommandQueue_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalCommandQueueInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48209,18 +34728,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalCommandQueueInfoEXT *>( this );
     }
 
-    operator VkExportMetalCommandQueueInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalCommandQueueInfoEXT *>( this );
-    }
-
-    operator VkExportMetalCommandQueueInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalCommandQueueInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Queue const &, MTLCommandQueue_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Queue const &, MTLCommandQueue_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queue, mtlCommandQueue );
     }
@@ -48245,20 +34759,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType      sType           = StructureType::eExportMetalCommandQueueInfoEXT;
-    const void *       pNext           = {};
-    Queue              queue           = {};
-    MTLCommandQueue_id mtlCommandQueue = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eExportMetalCommandQueueInfoEXT;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Queue         queue           = {};
+    MTLCommandQueue_id                  mtlCommandQueue = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalCommandQueueInfoEXT>
-  {
-    using Type = ExportMetalCommandQueueInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalCommandQueueInfoEXT>
   {
@@ -48267,7 +34773,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalDeviceInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalDeviceInfoEXT.html
   struct ExportMetalDeviceInfoEXT
   {
     using NativeType = VkExportMetalDeviceInfoEXT;
@@ -48275,10 +34780,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalDeviceInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExportMetalDeviceInfoEXT( MTLDevice_id mtlDevice_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mtlDevice{ mtlDevice_ }
+      : pNext( pNext_ )
+      , mtlDevice( mtlDevice_ )
     {
     }
 
@@ -48290,15 +34795,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalDeviceInfoEXT & operator=( ExportMetalDeviceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalDeviceInfoEXT & operator=( VkExportMetalDeviceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalDeviceInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalDeviceInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalDeviceInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -48310,7 +34815,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlDevice = mtlDevice_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalDeviceInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48322,18 +34827,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalDeviceInfoEXT *>( this );
     }
 
-    operator VkExportMetalDeviceInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalDeviceInfoEXT *>( this );
-    }
-
-    operator VkExportMetalDeviceInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalDeviceInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MTLDevice_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, MTLDevice_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mtlDevice );
     }
@@ -48358,19 +34858,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType     = StructureType::eExportMetalDeviceInfoEXT;
-    const void *  pNext     = {};
-    MTLDevice_id  mtlDevice = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eExportMetalDeviceInfoEXT;
+    const void *                        pNext     = {};
+    MTLDevice_id                        mtlDevice = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalDeviceInfoEXT>
-  {
-    using Type = ExportMetalDeviceInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalDeviceInfoEXT>
   {
@@ -48379,7 +34871,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalIOSurfaceInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalIOSurfaceInfoEXT.html
   struct ExportMetalIOSurfaceInfoEXT
   {
     using NativeType = VkExportMetalIOSurfaceInfoEXT;
@@ -48387,11 +34878,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalIoSurfaceInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalIOSurfaceInfoEXT( Image image_ = {}, IOSurfaceRef ioSurface_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , ioSurface{ ioSurface_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      ExportMetalIOSurfaceInfoEXT( VULKAN_HPP_NAMESPACE::Image image_ = {}, IOSurfaceRef ioSurface_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , ioSurface( ioSurface_ )
     {
     }
 
@@ -48403,22 +34895,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalIOSurfaceInfoEXT & operator=( ExportMetalIOSurfaceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalIOSurfaceInfoEXT & operator=( VkExportMetalIOSurfaceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalIOSurfaceInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalIOSurfaceInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalIOSurfaceInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalIOSurfaceInfoEXT & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalIOSurfaceInfoEXT & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
@@ -48429,7 +34921,7 @@ namespace VULKAN_HPP_NAMESPACE
       ioSurface = ioSurface_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalIOSurfaceInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48441,18 +34933,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalIOSurfaceInfoEXT *>( this );
     }
 
-    operator VkExportMetalIOSurfaceInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalIOSurfaceInfoEXT *>( this );
-    }
-
-    operator VkExportMetalIOSurfaceInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalIOSurfaceInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &, IOSurfaceRef const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &, IOSurfaceRef const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, ioSurface );
     }
@@ -48477,20 +34964,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType     = StructureType::eExportMetalIoSurfaceInfoEXT;
-    const void *  pNext     = {};
-    Image         image     = {};
-    IOSurfaceRef  ioSurface = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eExportMetalIoSurfaceInfoEXT;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::Image         image     = {};
+    IOSurfaceRef                        ioSurface = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalIOSurfaceInfoEXT>
-  {
-    using Type = ExportMetalIOSurfaceInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalIoSurfaceInfoEXT>
   {
@@ -48499,8 +34978,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalObjectCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalObjectCreateInfoEXT.html
   struct ExportMetalObjectCreateInfoEXT
   {
     using NativeType = VkExportMetalObjectCreateInfoEXT;
@@ -48508,11 +34985,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalObjectCreateInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalObjectCreateInfoEXT( ExportMetalObjectTypeFlagBitsEXT exportObjectType_ = ExportMetalObjectTypeFlagBitsEXT::eMetalDevice,
-                                                         const void *                     pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , exportObjectType{ exportObjectType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalObjectCreateInfoEXT(
+      VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT exportObjectType_ = VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT::eMetalDevice,
+      const void *                                           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , exportObjectType( exportObjectType_ )
     {
     }
 
@@ -48524,27 +35002,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalObjectCreateInfoEXT & operator=( ExportMetalObjectCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalObjectCreateInfoEXT & operator=( VkExportMetalObjectCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalObjectCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalObjectCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalObjectCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalObjectCreateInfoEXT & setExportObjectType( ExportMetalObjectTypeFlagBitsEXT exportObjectType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalObjectCreateInfoEXT &
+      setExportObjectType( VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT exportObjectType_ ) VULKAN_HPP_NOEXCEPT
     {
       exportObjectType = exportObjectType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalObjectCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48556,18 +35035,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalObjectCreateInfoEXT *>( this );
     }
 
-    operator VkExportMetalObjectCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalObjectCreateInfoEXT *>( this );
-    }
-
-    operator VkExportMetalObjectCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalObjectCreateInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExportMetalObjectTypeFlagBitsEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, exportObjectType );
     }
@@ -48592,19 +35066,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                    sType            = StructureType::eExportMetalObjectCreateInfoEXT;
-    const void *                     pNext            = {};
-    ExportMetalObjectTypeFlagBitsEXT exportObjectType = ExportMetalObjectTypeFlagBitsEXT::eMetalDevice;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType            = StructureType::eExportMetalObjectCreateInfoEXT;
+    const void *                                           pNext            = {};
+    VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT exportObjectType = VULKAN_HPP_NAMESPACE::ExportMetalObjectTypeFlagBitsEXT::eMetalDevice;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalObjectCreateInfoEXT>
-  {
-    using Type = ExportMetalObjectCreateInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalObjectCreateInfoEXT>
   {
@@ -48613,7 +35079,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalObjectsInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalObjectsInfoEXT.html
   struct ExportMetalObjectsInfoEXT
   {
     using NativeType = VkExportMetalObjectsInfoEXT;
@@ -48621,8 +35086,8 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalObjectsInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalObjectsInfoEXT( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalObjectsInfoEXT( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext( pNext_ ) {}
 
     VULKAN_HPP_CONSTEXPR ExportMetalObjectsInfoEXT( ExportMetalObjectsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
@@ -48632,21 +35097,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalObjectsInfoEXT & operator=( ExportMetalObjectsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalObjectsInfoEXT & operator=( VkExportMetalObjectsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalObjectsInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalObjectsInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalObjectsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalObjectsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48658,18 +35123,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalObjectsInfoEXT *>( this );
     }
 
-    operator VkExportMetalObjectsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalObjectsInfoEXT *>( this );
-    }
-
-    operator VkExportMetalObjectsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalObjectsInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext );
     }
@@ -48694,18 +35154,10 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType = StructureType::eExportMetalObjectsInfoEXT;
-    const void *  pNext = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eExportMetalObjectsInfoEXT;
+    const void *                        pNext = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalObjectsInfoEXT>
-  {
-    using Type = ExportMetalObjectsInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalObjectsInfoEXT>
   {
@@ -48714,8 +35166,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalSharedEventInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalSharedEventInfoEXT.html
   struct ExportMetalSharedEventInfoEXT
   {
     using NativeType = VkExportMetalSharedEventInfoEXT;
@@ -48723,15 +35173,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalSharedEventInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalSharedEventInfoEXT( Semaphore         semaphore_      = {},
-                                                        Event             event_          = {},
-                                                        MTLSharedEvent_id mtlSharedEvent_ = {},
-                                                        const void *      pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , event{ event_ }
-      , mtlSharedEvent{ mtlSharedEvent_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalSharedEventInfoEXT( VULKAN_HPP_NAMESPACE::Semaphore semaphore_      = {},
+                                                        VULKAN_HPP_NAMESPACE::Event     event_          = {},
+                                                        MTLSharedEvent_id               mtlSharedEvent_ = {},
+                                                        const void *                    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , event( event_ )
+      , mtlSharedEvent( mtlSharedEvent_ )
     {
     }
 
@@ -48743,28 +35193,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalSharedEventInfoEXT & operator=( ExportMetalSharedEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalSharedEventInfoEXT & operator=( VkExportMetalSharedEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalSharedEventInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalSharedEventInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalSharedEventInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalSharedEventInfoEXT & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalSharedEventInfoEXT & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalSharedEventInfoEXT & setEvent( Event event_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalSharedEventInfoEXT & setEvent( VULKAN_HPP_NAMESPACE::Event event_ ) VULKAN_HPP_NOEXCEPT
     {
       event = event_;
       return *this;
@@ -48775,7 +35225,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlSharedEvent = mtlSharedEvent_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalSharedEventInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48787,18 +35237,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalSharedEventInfoEXT *>( this );
     }
 
-    operator VkExportMetalSharedEventInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalSharedEventInfoEXT *>( this );
-    }
-
-    operator VkExportMetalSharedEventInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalSharedEventInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, Event const &, MTLSharedEvent_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::Event const &,
+               MTLSharedEvent_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, event, mtlSharedEvent );
     }
@@ -48824,21 +35273,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType     sType          = StructureType::eExportMetalSharedEventInfoEXT;
-    const void *      pNext          = {};
-    Semaphore         semaphore      = {};
-    Event             event          = {};
-    MTLSharedEvent_id mtlSharedEvent = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eExportMetalSharedEventInfoEXT;
+    const void *                        pNext          = {};
+    VULKAN_HPP_NAMESPACE::Semaphore     semaphore      = {};
+    VULKAN_HPP_NAMESPACE::Event         event          = {};
+    MTLSharedEvent_id                   mtlSharedEvent = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalSharedEventInfoEXT>
-  {
-    using Type = ExportMetalSharedEventInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalSharedEventInfoEXT>
   {
@@ -48847,7 +35288,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkExportMetalTextureInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportMetalTextureInfoEXT.html
   struct ExportMetalTextureInfoEXT
   {
     using NativeType = VkExportMetalTextureInfoEXT;
@@ -48855,19 +35295,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportMetalTextureInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportMetalTextureInfoEXT( Image               image_      = {},
-                                                    ImageView           imageView_  = {},
-                                                    BufferView          bufferView_ = {},
-                                                    ImageAspectFlagBits plane_      = ImageAspectFlagBits::eColor,
-                                                    MTLTexture_id       mtlTexture_ = {},
-                                                    const void *        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , imageView{ imageView_ }
-      , bufferView{ bufferView_ }
-      , plane{ plane_ }
-      , mtlTexture{ mtlTexture_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportMetalTextureInfoEXT( VULKAN_HPP_NAMESPACE::Image               image_      = {},
+                                                    VULKAN_HPP_NAMESPACE::ImageView           imageView_  = {},
+                                                    VULKAN_HPP_NAMESPACE::BufferView          bufferView_ = {},
+                                                    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane_      = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor,
+                                                    MTLTexture_id                             mtlTexture_ = {},
+                                                    const void *                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , imageView( imageView_ )
+      , bufferView( bufferView_ )
+      , plane( plane_ )
+      , mtlTexture( mtlTexture_ )
     {
     }
 
@@ -48879,40 +35319,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportMetalTextureInfoEXT & operator=( ExportMetalTextureInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportMetalTextureInfoEXT & operator=( VkExportMetalTextureInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportMetalTextureInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportMetalTextureInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setBufferView( BufferView bufferView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setBufferView( VULKAN_HPP_NAMESPACE::BufferView bufferView_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferView = bufferView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setPlane( ImageAspectFlagBits plane_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportMetalTextureInfoEXT & setPlane( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane_ ) VULKAN_HPP_NOEXCEPT
     {
       plane = plane_;
       return *this;
@@ -48923,7 +35363,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlTexture = mtlTexture_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportMetalTextureInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -48935,24 +35375,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportMetalTextureInfoEXT *>( this );
     }
 
-    operator VkExportMetalTextureInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportMetalTextureInfoEXT *>( this );
-    }
-
-    operator VkExportMetalTextureInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportMetalTextureInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Image const &,
-               ImageView const &,
-               BufferView const &,
-               ImageAspectFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::BufferView const &,
+               VULKAN_HPP_NAMESPACE::ImageAspectFlagBits const &,
                MTLTexture_id const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, imageView, bufferView, plane, mtlTexture );
@@ -48979,23 +35413,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType       sType      = StructureType::eExportMetalTextureInfoEXT;
-    const void *        pNext      = {};
-    Image               image      = {};
-    ImageView           imageView  = {};
-    BufferView          bufferView = {};
-    ImageAspectFlagBits plane      = ImageAspectFlagBits::eColor;
-    MTLTexture_id       mtlTexture = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType      = StructureType::eExportMetalTextureInfoEXT;
+    const void *                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Image               image      = {};
+    VULKAN_HPP_NAMESPACE::ImageView           imageView  = {};
+    VULKAN_HPP_NAMESPACE::BufferView          bufferView = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane      = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor;
+    MTLTexture_id                             mtlTexture = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportMetalTextureInfoEXT>
-  {
-    using Type = ExportMetalTextureInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportMetalTextureInfoEXT>
   {
@@ -49003,7 +35429,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-  // wrapper struct for struct VkExportSemaphoreCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportSemaphoreCreateInfo.html
   struct ExportSemaphoreCreateInfo
   {
     using NativeType = VkExportSemaphoreCreateInfo;
@@ -49011,10 +35436,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportSemaphoreCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExportSemaphoreCreateInfo( ExternalSemaphoreHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExportSemaphoreCreateInfo( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags handleTypes_ = {},
+                                                    const void *                                           pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -49026,27 +35452,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportSemaphoreCreateInfo & operator=( ExportSemaphoreCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportSemaphoreCreateInfo & operator=( VkExportSemaphoreCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportSemaphoreCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportSemaphoreCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportSemaphoreCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExportSemaphoreCreateInfo & setHandleTypes( ExternalSemaphoreHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExportSemaphoreCreateInfo &
+      setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportSemaphoreCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -49058,18 +35485,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportSemaphoreCreateInfo *>( this );
     }
 
-    operator VkExportSemaphoreCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportSemaphoreCreateInfo *>( this );
-    }
-
-    operator VkExportSemaphoreCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportSemaphoreCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalSemaphoreHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -49094,19 +35516,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType       = StructureType::eExportSemaphoreCreateInfo;
-    const void *                     pNext       = {};
-    ExternalSemaphoreHandleTypeFlags handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType       = StructureType::eExportSemaphoreCreateInfo;
+    const void *                                           pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportSemaphoreCreateInfo>
-  {
-    using Type = ExportSemaphoreCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportSemaphoreCreateInfo>
   {
@@ -49116,8 +35530,6 @@ namespace VULKAN_HPP_NAMESPACE
   using ExportSemaphoreCreateInfoKHR = ExportSemaphoreCreateInfo;
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkExportSemaphoreWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExportSemaphoreWin32HandleInfoKHR.html
   struct ExportSemaphoreWin32HandleInfoKHR
   {
     using NativeType = VkExportSemaphoreWin32HandleInfoKHR;
@@ -49125,15 +35537,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExportSemaphoreWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExportSemaphoreWin32HandleInfoKHR( const SECURITY_ATTRIBUTES * pAttributes_ = {},
                                                             DWORD                       dwAccess_    = {},
                                                             LPCWSTR                     name_        = {},
                                                             const void *                pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pAttributes{ pAttributes_ }
-      , dwAccess{ dwAccess_ }
-      , name{ name_ }
+      : pNext( pNext_ )
+      , pAttributes( pAttributes_ )
+      , dwAccess( dwAccess_ )
+      , name( name_ )
     {
     }
 
@@ -49145,15 +35557,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExportSemaphoreWin32HandleInfoKHR & operator=( ExportSemaphoreWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExportSemaphoreWin32HandleInfoKHR & operator=( VkExportSemaphoreWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExportSemaphoreWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExportSemaphoreWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExportSemaphoreWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -49177,7 +35589,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExportSemaphoreWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -49189,18 +35601,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExportSemaphoreWin32HandleInfoKHR *>( this );
     }
 
-    operator VkExportSemaphoreWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExportSemaphoreWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkExportSemaphoreWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExportSemaphoreWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const SECURITY_ATTRIBUTES * const &, DWORD const &, LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pAttributes, dwAccess, name );
@@ -49226,21 +35632,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType       = StructureType::eExportSemaphoreWin32HandleInfoKHR;
-    const void *                pNext       = {};
-    const SECURITY_ATTRIBUTES * pAttributes = {};
-    DWORD                       dwAccess    = {};
-    LPCWSTR                     name        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eExportSemaphoreWin32HandleInfoKHR;
+    const void *                        pNext       = {};
+    const SECURITY_ATTRIBUTES *         pAttributes = {};
+    DWORD                               dwAccess    = {};
+    LPCWSTR                             name        = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExportSemaphoreWin32HandleInfoKHR>
-  {
-    using Type = ExportSemaphoreWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExportSemaphoreWin32HandleInfoKHR>
   {
@@ -49248,16 +35646,15 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkExtensionProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExtensionProperties.html
   struct ExtensionProperties
   {
     using NativeType = VkExtensionProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 ExtensionProperties( std::array<char, VK_MAX_EXTENSION_NAME_SIZE> const & extensionName_ = {},
                                                  uint32_t                                             specVersion_   = {} ) VULKAN_HPP_NOEXCEPT
-      : extensionName{ extensionName_ }
-      , specVersion{ specVersion_ }
+      : extensionName( extensionName_ )
+      , specVersion( specVersion_ )
     {
     }
 
@@ -49267,12 +35664,24 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    ExtensionProperties( std::string const & extensionName_, uint32_t specVersion_ = {} ) : specVersion( specVersion_ )
+    {
+      VULKAN_HPP_ASSERT( extensionName_.size() < VK_MAX_EXTENSION_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( extensionName, VK_MAX_EXTENSION_NAME_SIZE, extensionName_.data(), extensionName_.size() );
+#    else
+      strncpy( extensionName, extensionName_.data(), std::min<size_t>( VK_MAX_EXTENSION_NAME_SIZE, extensionName_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     ExtensionProperties & operator=( ExtensionProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExtensionProperties & operator=( VkExtensionProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExtensionProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExtensionProperties const *>( &rhs );
       return *this;
     }
 
@@ -49286,18 +35695,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExtensionProperties *>( this );
     }
 
-    operator VkExtensionProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExtensionProperties *>( this );
-    }
-
-    operator VkExtensionProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExtensionProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( extensionName, specVersion );
     }
@@ -49326,30 +35730,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> extensionName = {};
-    uint32_t                                         specVersion   = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> extensionName = {};
+    uint32_t                                                               specVersion   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExtensionProperties>
-  {
-    using Type = ExtensionProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkExternalMemoryProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryProperties.html
   struct ExternalMemoryProperties
   {
     using NativeType = VkExternalMemoryProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryProperties( ExternalMemoryFeatureFlags    externalMemoryFeatures_        = {},
-                                                   ExternalMemoryHandleTypeFlags exportFromImportedHandleTypes_ = {},
-                                                   ExternalMemoryHandleTypeFlags compatibleHandleTypes_         = {} ) VULKAN_HPP_NOEXCEPT
-      : externalMemoryFeatures{ externalMemoryFeatures_ }
-      , exportFromImportedHandleTypes{ exportFromImportedHandleTypes_ }
-      , compatibleHandleTypes{ compatibleHandleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalMemoryProperties( VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags    externalMemoryFeatures_        = {},
+                                                   VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags exportFromImportedHandleTypes_ = {},
+                                                   VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags compatibleHandleTypes_         = {} ) VULKAN_HPP_NOEXCEPT
+      : externalMemoryFeatures( externalMemoryFeatures_ )
+      , exportFromImportedHandleTypes( exportFromImportedHandleTypes_ )
+      , compatibleHandleTypes( compatibleHandleTypes_ )
     {
     }
 
@@ -49361,11 +35756,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalMemoryProperties & operator=( ExternalMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalMemoryProperties & operator=( VkExternalMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalMemoryProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalMemoryProperties const *>( &rhs );
       return *this;
     }
 
@@ -49379,18 +35774,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalMemoryProperties *>( this );
     }
 
-    operator VkExternalMemoryProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryProperties *>( this );
-    }
-
-    operator VkExternalMemoryProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ExternalMemoryFeatureFlags const &, ExternalMemoryHandleTypeFlags const &, ExternalMemoryHandleTypeFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( externalMemoryFeatures, exportFromImportedHandleTypes, compatibleHandleTypes );
@@ -49417,21 +35808,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ExternalMemoryFeatureFlags    externalMemoryFeatures        = {};
-    ExternalMemoryHandleTypeFlags exportFromImportedHandleTypes = {};
-    ExternalMemoryHandleTypeFlags compatibleHandleTypes         = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags    externalMemoryFeatures        = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags exportFromImportedHandleTypes = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags compatibleHandleTypes         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryProperties>
-  {
-    using Type = ExternalMemoryProperties;
-  };
-#endif
   using ExternalMemoryPropertiesKHR = ExternalMemoryProperties;
 
-  // wrapper struct for struct VkExternalBufferProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalBufferProperties.html
   struct ExternalBufferProperties
   {
     using NativeType = VkExternalBufferProperties;
@@ -49439,10 +35822,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalBufferProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalBufferProperties( ExternalMemoryProperties externalMemoryProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalMemoryProperties{ externalMemoryProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalBufferProperties( VULKAN_HPP_NAMESPACE::ExternalMemoryProperties externalMemoryProperties_ = {},
+                                                   void *                                         pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , externalMemoryProperties( externalMemoryProperties_ )
     {
     }
 
@@ -49454,11 +35838,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalBufferProperties & operator=( ExternalBufferProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalBufferProperties & operator=( VkExternalBufferProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalBufferProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalBufferProperties const *>( &rhs );
       return *this;
     }
 
@@ -49472,18 +35856,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalBufferProperties *>( this );
     }
 
-    operator VkExternalBufferProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalBufferProperties *>( this );
-    }
-
-    operator VkExternalBufferProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalBufferProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ExternalMemoryProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalMemoryProperties );
     }
@@ -49508,19 +35887,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                    = StructureType::eExternalBufferProperties;
-    void *                   pNext                    = {};
-    ExternalMemoryProperties externalMemoryProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                    = StructureType::eExternalBufferProperties;
+    void *                                         pNext                    = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryProperties externalMemoryProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalBufferProperties>
-  {
-    using Type = ExternalBufferProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalBufferProperties>
   {
@@ -49529,340 +35900,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExternalBufferPropertiesKHR = ExternalBufferProperties;
 
-  // wrapper struct for struct VkExternalComputeQueueCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalComputeQueueCreateInfoNV.html
-  struct ExternalComputeQueueCreateInfoNV
-  {
-    using NativeType = VkExternalComputeQueueCreateInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalComputeQueueCreateInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueCreateInfoNV( Queue preferredQueue_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , preferredQueue{ preferredQueue_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueCreateInfoNV( ExternalComputeQueueCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalComputeQueueCreateInfoNV( VkExternalComputeQueueCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ExternalComputeQueueCreateInfoNV( *reinterpret_cast<ExternalComputeQueueCreateInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ExternalComputeQueueCreateInfoNV & operator=( ExternalComputeQueueCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalComputeQueueCreateInfoNV & operator=( VkExternalComputeQueueCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalComputeQueueCreateInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueCreateInfoNV & setPreferredQueue( Queue preferredQueue_ ) VULKAN_HPP_NOEXCEPT
-    {
-      preferredQueue = preferredQueue_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalComputeQueueCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueCreateInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalComputeQueueCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalComputeQueueCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalComputeQueueCreateInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Queue const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, preferredQueue );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalComputeQueueCreateInfoNV const & ) const = default;
-#else
-    bool operator==( ExternalComputeQueueCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( preferredQueue == rhs.preferredQueue );
-#  endif
-    }
-
-    bool operator!=( ExternalComputeQueueCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::eExternalComputeQueueCreateInfoNV;
-    const void *  pNext          = {};
-    Queue         preferredQueue = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalComputeQueueCreateInfoNV>
-  {
-    using Type = ExternalComputeQueueCreateInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalComputeQueueCreateInfoNV>
-  {
-    using Type = ExternalComputeQueueCreateInfoNV;
-  };
-
-  // wrapper struct for struct VkExternalComputeQueueDataParamsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalComputeQueueDataParamsNV.html
-  struct ExternalComputeQueueDataParamsNV
-  {
-    using NativeType = VkExternalComputeQueueDataParamsNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalComputeQueueDataParamsNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueDataParamsNV( uint32_t deviceIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceIndex{ deviceIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueDataParamsNV( ExternalComputeQueueDataParamsNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalComputeQueueDataParamsNV( VkExternalComputeQueueDataParamsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ExternalComputeQueueDataParamsNV( *reinterpret_cast<ExternalComputeQueueDataParamsNV const *>( &rhs ) )
-    {
-    }
-
-    ExternalComputeQueueDataParamsNV & operator=( ExternalComputeQueueDataParamsNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalComputeQueueDataParamsNV & operator=( VkExternalComputeQueueDataParamsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalComputeQueueDataParamsNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueDataParamsNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueDataParamsNV & setDeviceIndex( uint32_t deviceIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      deviceIndex = deviceIndex_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalComputeQueueDataParamsNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalComputeQueueDataParamsNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDataParamsNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalComputeQueueDataParamsNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDataParamsNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalComputeQueueDataParamsNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDataParamsNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalComputeQueueDataParamsNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, deviceIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalComputeQueueDataParamsNV const & ) const = default;
-#else
-    bool operator==( ExternalComputeQueueDataParamsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( deviceIndex == rhs.deviceIndex );
-#  endif
-    }
-
-    bool operator!=( ExternalComputeQueueDataParamsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType       = StructureType::eExternalComputeQueueDataParamsNV;
-    const void *  pNext       = {};
-    uint32_t      deviceIndex = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalComputeQueueDataParamsNV>
-  {
-    using Type = ExternalComputeQueueDataParamsNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalComputeQueueDataParamsNV>
-  {
-    using Type = ExternalComputeQueueDataParamsNV;
-  };
-
-  // wrapper struct for struct VkExternalComputeQueueDeviceCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalComputeQueueDeviceCreateInfoNV.html
-  struct ExternalComputeQueueDeviceCreateInfoNV
-  {
-    using NativeType = VkExternalComputeQueueDeviceCreateInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalComputeQueueDeviceCreateInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueDeviceCreateInfoNV( uint32_t reservedExternalQueues_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , reservedExternalQueues{ reservedExternalQueues_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalComputeQueueDeviceCreateInfoNV( ExternalComputeQueueDeviceCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalComputeQueueDeviceCreateInfoNV( VkExternalComputeQueueDeviceCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ExternalComputeQueueDeviceCreateInfoNV( *reinterpret_cast<ExternalComputeQueueDeviceCreateInfoNV const *>( &rhs ) )
-    {
-    }
-
-    ExternalComputeQueueDeviceCreateInfoNV & operator=( ExternalComputeQueueDeviceCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalComputeQueueDeviceCreateInfoNV & operator=( VkExternalComputeQueueDeviceCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalComputeQueueDeviceCreateInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueDeviceCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalComputeQueueDeviceCreateInfoNV & setReservedExternalQueues( uint32_t reservedExternalQueues_ ) VULKAN_HPP_NOEXCEPT
-    {
-      reservedExternalQueues = reservedExternalQueues_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalComputeQueueDeviceCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalComputeQueueDeviceCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDeviceCreateInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalComputeQueueDeviceCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDeviceCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalComputeQueueDeviceCreateInfoNV *>( this );
-    }
-
-    operator VkExternalComputeQueueDeviceCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalComputeQueueDeviceCreateInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, reservedExternalQueues );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalComputeQueueDeviceCreateInfoNV const & ) const = default;
-#else
-    bool operator==( ExternalComputeQueueDeviceCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( reservedExternalQueues == rhs.reservedExternalQueues );
-#  endif
-    }
-
-    bool operator!=( ExternalComputeQueueDeviceCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                  = StructureType::eExternalComputeQueueDeviceCreateInfoNV;
-    const void *  pNext                  = {};
-    uint32_t      reservedExternalQueues = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalComputeQueueDeviceCreateInfoNV>
-  {
-    using Type = ExternalComputeQueueDeviceCreateInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalComputeQueueDeviceCreateInfoNV>
-  {
-    using Type = ExternalComputeQueueDeviceCreateInfoNV;
-  };
-
-  // wrapper struct for struct VkExternalFenceProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFenceProperties.html
   struct ExternalFenceProperties
   {
     using NativeType = VkExternalFenceProperties;
@@ -49870,15 +35907,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalFenceProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalFenceProperties( ExternalFenceHandleTypeFlags exportFromImportedHandleTypes_ = {},
-                                                  ExternalFenceHandleTypeFlags compatibleHandleTypes_         = {},
-                                                  ExternalFenceFeatureFlags    externalFenceFeatures_         = {},
-                                                  void *                       pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , exportFromImportedHandleTypes{ exportFromImportedHandleTypes_ }
-      , compatibleHandleTypes{ compatibleHandleTypes_ }
-      , externalFenceFeatures{ externalFenceFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalFenceProperties( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags exportFromImportedHandleTypes_ = {},
+                                                  VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags compatibleHandleTypes_         = {},
+                                                  VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags    externalFenceFeatures_         = {},
+                                                  void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , exportFromImportedHandleTypes( exportFromImportedHandleTypes_ )
+      , compatibleHandleTypes( compatibleHandleTypes_ )
+      , externalFenceFeatures( externalFenceFeatures_ )
     {
     }
 
@@ -49890,11 +35927,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalFenceProperties & operator=( ExternalFenceProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalFenceProperties & operator=( VkExternalFenceProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalFenceProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalFenceProperties const *>( &rhs );
       return *this;
     }
 
@@ -49908,22 +35945,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalFenceProperties *>( this );
     }
 
-    operator VkExternalFenceProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalFenceProperties *>( this );
-    }
-
-    operator VkExternalFenceProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalFenceProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ExternalFenceHandleTypeFlags const &,
-               ExternalFenceHandleTypeFlags const &,
-               ExternalFenceFeatureFlags const &>
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, exportFromImportedHandleTypes, compatibleHandleTypes, externalFenceFeatures );
@@ -49950,21 +35981,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                         = StructureType::eExternalFenceProperties;
-    void *                       pNext                         = {};
-    ExternalFenceHandleTypeFlags exportFromImportedHandleTypes = {};
-    ExternalFenceHandleTypeFlags compatibleHandleTypes         = {};
-    ExternalFenceFeatureFlags    externalFenceFeatures         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                         = StructureType::eExternalFenceProperties;
+    void *                                             pNext                         = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags exportFromImportedHandleTypes = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags compatibleHandleTypes         = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags    externalFenceFeatures         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalFenceProperties>
-  {
-    using Type = ExternalFenceProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalFenceProperties>
   {
@@ -49974,7 +35997,6 @@ namespace VULKAN_HPP_NAMESPACE
   using ExternalFencePropertiesKHR = ExternalFenceProperties;
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkExternalFormatANDROID, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFormatANDROID.html
   struct ExternalFormatANDROID
   {
     using NativeType = VkExternalFormatANDROID;
@@ -49982,10 +36004,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalFormatANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExternalFormatANDROID( uint64_t externalFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalFormat{ externalFormat_ }
+      : pNext( pNext_ )
+      , externalFormat( externalFormat_ )
     {
     }
 
@@ -49997,15 +36019,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalFormatANDROID & operator=( ExternalFormatANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalFormatANDROID & operator=( VkExternalFormatANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalFormatANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalFormatANDROID const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalFormatANDROID & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -50017,7 +36039,7 @@ namespace VULKAN_HPP_NAMESPACE
       externalFormat = externalFormat_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalFormatANDROID const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50029,18 +36051,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalFormatANDROID *>( this );
     }
 
-    operator VkExternalFormatANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalFormatANDROID *>( this );
-    }
-
-    operator VkExternalFormatANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalFormatANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalFormat );
     }
@@ -50065,19 +36082,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eExternalFormatANDROID;
-    void *        pNext          = {};
-    uint64_t      externalFormat = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eExternalFormatANDROID;
+    void *                              pNext          = {};
+    uint64_t                            externalFormat = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalFormatANDROID>
-  {
-    using Type = ExternalFormatANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalFormatANDROID>
   {
@@ -50085,117 +36094,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkExternalFormatOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFormatOHOS.html
-  struct ExternalFormatOHOS
-  {
-    using NativeType = VkExternalFormatOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalFormatOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalFormatOHOS( uint64_t externalFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalFormat{ externalFormat_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalFormatOHOS( ExternalFormatOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalFormatOHOS( VkExternalFormatOHOS const & rhs ) VULKAN_HPP_NOEXCEPT : ExternalFormatOHOS( *reinterpret_cast<ExternalFormatOHOS const *>( &rhs ) ) {}
-
-    ExternalFormatOHOS & operator=( ExternalFormatOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalFormatOHOS & operator=( VkExternalFormatOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalFormatOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalFormatOHOS & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalFormatOHOS & setExternalFormat( uint64_t externalFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      externalFormat = externalFormat_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalFormatOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalFormatOHOS *>( this );
-    }
-
-    operator VkExternalFormatOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalFormatOHOS *>( this );
-    }
-
-    operator VkExternalFormatOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalFormatOHOS *>( this );
-    }
-
-    operator VkExternalFormatOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalFormatOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, externalFormat );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalFormatOHOS const & ) const = default;
-#  else
-    bool operator==( ExternalFormatOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( externalFormat == rhs.externalFormat );
-#    endif
-    }
-
-    bool operator!=( ExternalFormatOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType          = StructureType::eExternalFormatOHOS;
-    void *        pNext          = {};
-    uint64_t      externalFormat = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalFormatOHOS>
-  {
-    using Type = ExternalFormatOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalFormatOHOS>
-  {
-    using Type = ExternalFormatOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkExternalFormatQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalFormatQNX.html
   struct ExternalFormatQNX
   {
     using NativeType = VkExternalFormatQNX;
@@ -50203,10 +36102,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalFormatQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ExternalFormatQNX( uint64_t externalFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalFormat{ externalFormat_ }
+      : pNext( pNext_ )
+      , externalFormat( externalFormat_ )
     {
     }
 
@@ -50215,15 +36114,15 @@ namespace VULKAN_HPP_NAMESPACE
     ExternalFormatQNX( VkExternalFormatQNX const & rhs ) VULKAN_HPP_NOEXCEPT : ExternalFormatQNX( *reinterpret_cast<ExternalFormatQNX const *>( &rhs ) ) {}
 
     ExternalFormatQNX & operator=( ExternalFormatQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalFormatQNX & operator=( VkExternalFormatQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalFormatQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalFormatQNX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalFormatQNX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -50235,7 +36134,7 @@ namespace VULKAN_HPP_NAMESPACE
       externalFormat = externalFormat_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalFormatQNX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50247,18 +36146,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalFormatQNX *>( this );
     }
 
-    operator VkExternalFormatQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalFormatQNX *>( this );
-    }
-
-    operator VkExternalFormatQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalFormatQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalFormat );
     }
@@ -50283,19 +36177,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eExternalFormatQNX;
-    void *        pNext          = {};
-    uint64_t      externalFormat = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eExternalFormatQNX;
+    void *                              pNext          = {};
+    uint64_t                            externalFormat = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalFormatQNX>
-  {
-    using Type = ExternalFormatQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalFormatQNX>
   {
@@ -50303,8 +36189,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  // wrapper struct for struct VkExternalImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalImageFormatProperties.html
   struct ExternalImageFormatProperties
   {
     using NativeType = VkExternalImageFormatProperties;
@@ -50312,10 +36196,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalImageFormatProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalImageFormatProperties( ExternalMemoryProperties externalMemoryProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalMemoryProperties{ externalMemoryProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalImageFormatProperties( VULKAN_HPP_NAMESPACE::ExternalMemoryProperties externalMemoryProperties_ = {},
+                                                        void *                                         pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , externalMemoryProperties( externalMemoryProperties_ )
     {
     }
 
@@ -50327,11 +36212,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalImageFormatProperties & operator=( ExternalImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalImageFormatProperties & operator=( VkExternalImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalImageFormatProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalImageFormatProperties const *>( &rhs );
       return *this;
     }
 
@@ -50345,18 +36230,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalImageFormatProperties *>( this );
     }
 
-    operator VkExternalImageFormatProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalImageFormatProperties *>( this );
-    }
-
-    operator VkExternalImageFormatProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalImageFormatProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ExternalMemoryProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalMemoryProperties );
     }
@@ -50381,19 +36261,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                    = StructureType::eExternalImageFormatProperties;
-    void *                   pNext                    = {};
-    ExternalMemoryProperties externalMemoryProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                    = StructureType::eExternalImageFormatProperties;
+    void *                                         pNext                    = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryProperties externalMemoryProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalImageFormatProperties>
-  {
-    using Type = ExternalImageFormatProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalImageFormatProperties>
   {
@@ -50402,22 +36274,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExternalImageFormatPropertiesKHR = ExternalImageFormatProperties;
 
-  // wrapper struct for struct VkImageFormatProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageFormatProperties.html
   struct ImageFormatProperties
   {
     using NativeType = VkImageFormatProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageFormatProperties( Extent3D         maxExtent_       = {},
-                                                uint32_t         maxMipLevels_    = {},
-                                                uint32_t         maxArrayLayers_  = {},
-                                                SampleCountFlags sampleCounts_    = {},
-                                                DeviceSize       maxResourceSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : maxExtent{ maxExtent_ }
-      , maxMipLevels{ maxMipLevels_ }
-      , maxArrayLayers{ maxArrayLayers_ }
-      , sampleCounts{ sampleCounts_ }
-      , maxResourceSize{ maxResourceSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageFormatProperties( VULKAN_HPP_NAMESPACE::Extent3D         maxExtent_       = {},
+                                                uint32_t                               maxMipLevels_    = {},
+                                                uint32_t                               maxArrayLayers_  = {},
+                                                VULKAN_HPP_NAMESPACE::SampleCountFlags sampleCounts_    = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceSize       maxResourceSize_ = {} ) VULKAN_HPP_NOEXCEPT
+      : maxExtent( maxExtent_ )
+      , maxMipLevels( maxMipLevels_ )
+      , maxArrayLayers( maxArrayLayers_ )
+      , sampleCounts( sampleCounts_ )
+      , maxResourceSize( maxResourceSize_ )
     {
     }
 
@@ -50429,11 +36300,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageFormatProperties & operator=( ImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageFormatProperties & operator=( VkImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageFormatProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageFormatProperties const *>( &rhs );
       return *this;
     }
 
@@ -50447,18 +36318,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageFormatProperties *>( this );
     }
 
-    operator VkImageFormatProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageFormatProperties *>( this );
-    }
-
-    operator VkImageFormatProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageFormatProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Extent3D const &, uint32_t const &, uint32_t const &, SampleCountFlags const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Extent3D const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( maxExtent, maxMipLevels, maxArrayLayers, sampleCounts, maxResourceSize );
     }
@@ -50484,36 +36354,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Extent3D         maxExtent       = {};
-    uint32_t         maxMipLevels    = {};
-    uint32_t         maxArrayLayers  = {};
-    SampleCountFlags sampleCounts    = {};
-    DeviceSize       maxResourceSize = {};
+    VULKAN_HPP_NAMESPACE::Extent3D         maxExtent       = {};
+    uint32_t                               maxMipLevels    = {};
+    uint32_t                               maxArrayLayers  = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags sampleCounts    = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize       maxResourceSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageFormatProperties>
-  {
-    using Type = ImageFormatProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkExternalImageFormatPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalImageFormatPropertiesNV.html
   struct ExternalImageFormatPropertiesNV
   {
     using NativeType = VkExternalImageFormatPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalImageFormatPropertiesNV( ImageFormatProperties           imageFormatProperties_         = {},
-                                                          ExternalMemoryFeatureFlagsNV    externalMemoryFeatures_        = {},
-                                                          ExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes_ = {},
-                                                          ExternalMemoryHandleTypeFlagsNV compatibleHandleTypes_         = {} ) VULKAN_HPP_NOEXCEPT
-      : imageFormatProperties{ imageFormatProperties_ }
-      , externalMemoryFeatures{ externalMemoryFeatures_ }
-      , exportFromImportedHandleTypes{ exportFromImportedHandleTypes_ }
-      , compatibleHandleTypes{ compatibleHandleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      ExternalImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::ImageFormatProperties           imageFormatProperties_         = {},
+                                       VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsNV    externalMemoryFeatures_        = {},
+                                       VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes_ = {},
+                                       VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV compatibleHandleTypes_         = {} ) VULKAN_HPP_NOEXCEPT
+      : imageFormatProperties( imageFormatProperties_ )
+      , externalMemoryFeatures( externalMemoryFeatures_ )
+      , exportFromImportedHandleTypes( exportFromImportedHandleTypes_ )
+      , compatibleHandleTypes( compatibleHandleTypes_ )
     {
     }
 
@@ -50525,11 +36386,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalImageFormatPropertiesNV & operator=( ExternalImageFormatPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalImageFormatPropertiesNV & operator=( VkExternalImageFormatPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalImageFormatPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalImageFormatPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -50543,21 +36404,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalImageFormatPropertiesNV *>( this );
     }
 
-    operator VkExternalImageFormatPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalImageFormatPropertiesNV *>( this );
-    }
-
-    operator VkExternalImageFormatPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalImageFormatPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageFormatProperties const &,
-               ExternalMemoryFeatureFlagsNV const &,
-               ExternalMemoryHandleTypeFlagsNV const &,
-               ExternalMemoryHandleTypeFlagsNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageFormatProperties const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( imageFormatProperties, externalMemoryFeatures, exportFromImportedHandleTypes, compatibleHandleTypes );
@@ -50584,22 +36439,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageFormatProperties           imageFormatProperties         = {};
-    ExternalMemoryFeatureFlagsNV    externalMemoryFeatures        = {};
-    ExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes = {};
-    ExternalMemoryHandleTypeFlagsNV compatibleHandleTypes         = {};
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties           imageFormatProperties         = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsNV    externalMemoryFeatures        = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV exportFromImportedHandleTypes = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV compatibleHandleTypes         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalImageFormatPropertiesNV>
-  {
-    using Type = ExternalImageFormatPropertiesNV;
-  };
-#endif
-
-  // wrapper struct for struct VkExternalMemoryAcquireUnmodifiedEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryAcquireUnmodifiedEXT.html
   struct ExternalMemoryAcquireUnmodifiedEXT
   {
     using NativeType = VkExternalMemoryAcquireUnmodifiedEXT;
@@ -50607,10 +36452,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalMemoryAcquireUnmodifiedEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryAcquireUnmodifiedEXT( Bool32 acquireUnmodifiedMemory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , acquireUnmodifiedMemory{ acquireUnmodifiedMemory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalMemoryAcquireUnmodifiedEXT( VULKAN_HPP_NAMESPACE::Bool32 acquireUnmodifiedMemory_ = {},
+                                                             const void *                 pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , acquireUnmodifiedMemory( acquireUnmodifiedMemory_ )
     {
     }
 
@@ -50622,27 +36468,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalMemoryAcquireUnmodifiedEXT & operator=( ExternalMemoryAcquireUnmodifiedEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalMemoryAcquireUnmodifiedEXT & operator=( VkExternalMemoryAcquireUnmodifiedEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalMemoryAcquireUnmodifiedEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalMemoryAcquireUnmodifiedEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalMemoryAcquireUnmodifiedEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryAcquireUnmodifiedEXT & setAcquireUnmodifiedMemory( Bool32 acquireUnmodifiedMemory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryAcquireUnmodifiedEXT &
+      setAcquireUnmodifiedMemory( VULKAN_HPP_NAMESPACE::Bool32 acquireUnmodifiedMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireUnmodifiedMemory = acquireUnmodifiedMemory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalMemoryAcquireUnmodifiedEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50654,18 +36501,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalMemoryAcquireUnmodifiedEXT *>( this );
     }
 
-    operator VkExternalMemoryAcquireUnmodifiedEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryAcquireUnmodifiedEXT *>( this );
-    }
-
-    operator VkExternalMemoryAcquireUnmodifiedEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryAcquireUnmodifiedEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, acquireUnmodifiedMemory );
     }
@@ -50690,27 +36532,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::eExternalMemoryAcquireUnmodifiedEXT;
-    const void *  pNext                   = {};
-    Bool32        acquireUnmodifiedMemory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::eExternalMemoryAcquireUnmodifiedEXT;
+    const void *                        pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        acquireUnmodifiedMemory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryAcquireUnmodifiedEXT>
-  {
-    using Type = ExternalMemoryAcquireUnmodifiedEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalMemoryAcquireUnmodifiedEXT>
   {
     using Type = ExternalMemoryAcquireUnmodifiedEXT;
   };
 
-  // wrapper struct for struct VkExternalMemoryBufferCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryBufferCreateInfo.html
   struct ExternalMemoryBufferCreateInfo
   {
     using NativeType = VkExternalMemoryBufferCreateInfo;
@@ -50718,10 +36550,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalMemoryBufferCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryBufferCreateInfo( ExternalMemoryHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalMemoryBufferCreateInfo( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ = {},
+                                                         const void *                                        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -50733,27 +36566,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalMemoryBufferCreateInfo & operator=( ExternalMemoryBufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalMemoryBufferCreateInfo & operator=( VkExternalMemoryBufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalMemoryBufferCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalMemoryBufferCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalMemoryBufferCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryBufferCreateInfo & setHandleTypes( ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryBufferCreateInfo &
+      setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalMemoryBufferCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50765,18 +36599,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalMemoryBufferCreateInfo *>( this );
     }
 
-    operator VkExternalMemoryBufferCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryBufferCreateInfo *>( this );
-    }
-
-    operator VkExternalMemoryBufferCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryBufferCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -50801,19 +36630,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType       = StructureType::eExternalMemoryBufferCreateInfo;
-    const void *                  pNext       = {};
-    ExternalMemoryHandleTypeFlags handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType       = StructureType::eExternalMemoryBufferCreateInfo;
+    const void *                                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryBufferCreateInfo>
-  {
-    using Type = ExternalMemoryBufferCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalMemoryBufferCreateInfo>
   {
@@ -50822,8 +36643,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExternalMemoryBufferCreateInfoKHR = ExternalMemoryBufferCreateInfo;
 
-  // wrapper struct for struct VkExternalMemoryImageCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryImageCreateInfo.html
   struct ExternalMemoryImageCreateInfo
   {
     using NativeType = VkExternalMemoryImageCreateInfo;
@@ -50831,10 +36650,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalMemoryImageCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryImageCreateInfo( ExternalMemoryHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalMemoryImageCreateInfo( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ = {},
+                                                        const void *                                        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -50846,27 +36666,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalMemoryImageCreateInfo & operator=( ExternalMemoryImageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalMemoryImageCreateInfo & operator=( VkExternalMemoryImageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalMemoryImageCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalMemoryImageCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfo & setHandleTypes( ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfo &
+      setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalMemoryImageCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50878,18 +36699,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalMemoryImageCreateInfo *>( this );
     }
 
-    operator VkExternalMemoryImageCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryImageCreateInfo *>( this );
-    }
-
-    operator VkExternalMemoryImageCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryImageCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -50914,19 +36730,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType       = StructureType::eExternalMemoryImageCreateInfo;
-    const void *                  pNext       = {};
-    ExternalMemoryHandleTypeFlags handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType       = StructureType::eExternalMemoryImageCreateInfo;
+    const void *                                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryImageCreateInfo>
-  {
-    using Type = ExternalMemoryImageCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalMemoryImageCreateInfo>
   {
@@ -50935,8 +36743,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExternalMemoryImageCreateInfoKHR = ExternalMemoryImageCreateInfo;
 
-  // wrapper struct for struct VkExternalMemoryImageCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryImageCreateInfoNV.html
   struct ExternalMemoryImageCreateInfoNV
   {
     using NativeType = VkExternalMemoryImageCreateInfoNV;
@@ -50944,10 +36750,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalMemoryImageCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryImageCreateInfoNV( ExternalMemoryHandleTypeFlagsNV handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalMemoryImageCreateInfoNV( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes_ = {},
+                                                          const void *                                          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleTypes( handleTypes_ )
     {
     }
 
@@ -50959,27 +36766,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalMemoryImageCreateInfoNV & operator=( ExternalMemoryImageCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalMemoryImageCreateInfoNV & operator=( VkExternalMemoryImageCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalMemoryImageCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalMemoryImageCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfoNV & setHandleTypes( ExternalMemoryHandleTypeFlagsNV handleTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryImageCreateInfoNV &
+      setHandleTypes( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       handleTypes = handleTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkExternalMemoryImageCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -50991,18 +36799,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalMemoryImageCreateInfoNV *>( this );
     }
 
-    operator VkExternalMemoryImageCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryImageCreateInfoNV *>( this );
-    }
-
-    operator VkExternalMemoryImageCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryImageCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagsNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleTypes );
     }
@@ -51027,137 +36830,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType       = StructureType::eExternalMemoryImageCreateInfoNV;
-    const void *                    pNext       = {};
-    ExternalMemoryHandleTypeFlagsNV handleTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType       = StructureType::eExternalMemoryImageCreateInfoNV;
+    const void *                                          pNext       = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryImageCreateInfoNV>
-  {
-    using Type = ExternalMemoryImageCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalMemoryImageCreateInfoNV>
   {
     using Type = ExternalMemoryImageCreateInfoNV;
   };
 
-  // wrapper struct for struct VkExternalMemoryTensorCreateInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalMemoryTensorCreateInfoARM.html
-  struct ExternalMemoryTensorCreateInfoARM
-  {
-    using NativeType = VkExternalMemoryTensorCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalMemoryTensorCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalMemoryTensorCreateInfoARM( ExternalMemoryHandleTypeFlags handleTypes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleTypes{ handleTypes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalMemoryTensorCreateInfoARM( ExternalMemoryTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalMemoryTensorCreateInfoARM( VkExternalMemoryTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ExternalMemoryTensorCreateInfoARM( *reinterpret_cast<ExternalMemoryTensorCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-    ExternalMemoryTensorCreateInfoARM & operator=( ExternalMemoryTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalMemoryTensorCreateInfoARM & operator=( VkExternalMemoryTensorCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalMemoryTensorCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryTensorCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalMemoryTensorCreateInfoARM & setHandleTypes( ExternalMemoryHandleTypeFlags handleTypes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handleTypes = handleTypes_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalMemoryTensorCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalMemoryTensorCreateInfoARM *>( this );
-    }
-
-    operator VkExternalMemoryTensorCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalMemoryTensorCreateInfoARM *>( this );
-    }
-
-    operator VkExternalMemoryTensorCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalMemoryTensorCreateInfoARM *>( this );
-    }
-
-    operator VkExternalMemoryTensorCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalMemoryTensorCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, handleTypes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalMemoryTensorCreateInfoARM const & ) const = default;
-#else
-    bool operator==( ExternalMemoryTensorCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( handleTypes == rhs.handleTypes );
-#  endif
-    }
-
-    bool operator!=( ExternalMemoryTensorCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                 sType       = StructureType::eExternalMemoryTensorCreateInfoARM;
-    const void *                  pNext       = {};
-    ExternalMemoryHandleTypeFlags handleTypes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalMemoryTensorCreateInfoARM>
-  {
-    using Type = ExternalMemoryTensorCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalMemoryTensorCreateInfoARM>
-  {
-    using Type = ExternalMemoryTensorCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkExternalSemaphoreProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalSemaphoreProperties.html
   struct ExternalSemaphoreProperties
   {
     using NativeType = VkExternalSemaphoreProperties;
@@ -51165,15 +36848,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalSemaphoreProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalSemaphoreProperties( ExternalSemaphoreHandleTypeFlags exportFromImportedHandleTypes_ = {},
-                                                      ExternalSemaphoreHandleTypeFlags compatibleHandleTypes_         = {},
-                                                      ExternalSemaphoreFeatureFlags    externalSemaphoreFeatures_     = {},
-                                                      void *                           pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , exportFromImportedHandleTypes{ exportFromImportedHandleTypes_ }
-      , compatibleHandleTypes{ compatibleHandleTypes_ }
-      , externalSemaphoreFeatures{ externalSemaphoreFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ExternalSemaphoreProperties( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags exportFromImportedHandleTypes_ = {},
+                                                      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags compatibleHandleTypes_         = {},
+                                                      VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags    externalSemaphoreFeatures_     = {},
+                                                      void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , exportFromImportedHandleTypes( exportFromImportedHandleTypes_ )
+      , compatibleHandleTypes( compatibleHandleTypes_ )
+      , externalSemaphoreFeatures( externalSemaphoreFeatures_ )
     {
     }
 
@@ -51185,11 +36868,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ExternalSemaphoreProperties & operator=( ExternalSemaphoreProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ExternalSemaphoreProperties & operator=( VkExternalSemaphoreProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ExternalSemaphoreProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ExternalSemaphoreProperties const *>( &rhs );
       return *this;
     }
 
@@ -51203,22 +36886,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkExternalSemaphoreProperties *>( this );
     }
 
-    operator VkExternalSemaphoreProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalSemaphoreProperties *>( this );
-    }
-
-    operator VkExternalSemaphoreProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalSemaphoreProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ExternalSemaphoreHandleTypeFlags const &,
-               ExternalSemaphoreHandleTypeFlags const &,
-               ExternalSemaphoreFeatureFlags const &>
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, exportFromImportedHandleTypes, compatibleHandleTypes, externalSemaphoreFeatures );
@@ -51245,21 +36922,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType                         = StructureType::eExternalSemaphoreProperties;
-    void *                           pNext                         = {};
-    ExternalSemaphoreHandleTypeFlags exportFromImportedHandleTypes = {};
-    ExternalSemaphoreHandleTypeFlags compatibleHandleTypes         = {};
-    ExternalSemaphoreFeatureFlags    externalSemaphoreFeatures     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType                         = StructureType::eExternalSemaphoreProperties;
+    void *                                                 pNext                         = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags exportFromImportedHandleTypes = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags compatibleHandleTypes         = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags    externalSemaphoreFeatures     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalSemaphoreProperties>
-  {
-    using Type = ExternalSemaphoreProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eExternalSemaphoreProperties>
   {
@@ -51268,119 +36937,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ExternalSemaphorePropertiesKHR = ExternalSemaphoreProperties;
 
-  // wrapper struct for struct VkExternalTensorPropertiesARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkExternalTensorPropertiesARM.html
-  struct ExternalTensorPropertiesARM
-  {
-    using NativeType = VkExternalTensorPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eExternalTensorPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ExternalTensorPropertiesARM( ExternalMemoryProperties externalMemoryProperties_ = {},
-                                                      const void *             pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalMemoryProperties{ externalMemoryProperties_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ExternalTensorPropertiesARM( ExternalTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ExternalTensorPropertiesARM( VkExternalTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ExternalTensorPropertiesARM( *reinterpret_cast<ExternalTensorPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    ExternalTensorPropertiesARM & operator=( ExternalTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ExternalTensorPropertiesARM & operator=( VkExternalTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ExternalTensorPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ExternalTensorPropertiesARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ExternalTensorPropertiesARM &
-      setExternalMemoryProperties( ExternalMemoryProperties const & externalMemoryProperties_ ) VULKAN_HPP_NOEXCEPT
-    {
-      externalMemoryProperties = externalMemoryProperties_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkExternalTensorPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkExternalTensorPropertiesARM *>( this );
-    }
-
-    operator VkExternalTensorPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkExternalTensorPropertiesARM *>( this );
-    }
-
-    operator VkExternalTensorPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkExternalTensorPropertiesARM *>( this );
-    }
-
-    operator VkExternalTensorPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkExternalTensorPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, externalMemoryProperties );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ExternalTensorPropertiesARM const & ) const = default;
-#else
-    bool operator==( ExternalTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( externalMemoryProperties == rhs.externalMemoryProperties );
-#  endif
-    }
-
-    bool operator!=( ExternalTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType            sType                    = StructureType::eExternalTensorPropertiesARM;
-    const void *             pNext                    = {};
-    ExternalMemoryProperties externalMemoryProperties = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkExternalTensorPropertiesARM>
-  {
-    using Type = ExternalTensorPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eExternalTensorPropertiesARM>
-  {
-    using Type = ExternalTensorPropertiesARM;
-  };
-
-  // wrapper struct for struct VkFenceCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceCreateInfo.html
   struct FenceCreateInfo
   {
     using NativeType = VkFenceCreateInfo;
@@ -51388,10 +36944,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFenceCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FenceCreateInfo( FenceCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FenceCreateInfo( VULKAN_HPP_NAMESPACE::FenceCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -51400,27 +36956,27 @@ namespace VULKAN_HPP_NAMESPACE
     FenceCreateInfo( VkFenceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : FenceCreateInfo( *reinterpret_cast<FenceCreateInfo const *>( &rhs ) ) {}
 
     FenceCreateInfo & operator=( FenceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FenceCreateInfo & operator=( VkFenceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FenceCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FenceCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FenceCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FenceCreateInfo & setFlags( FenceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FenceCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::FenceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFenceCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -51432,18 +36988,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFenceCreateInfo *>( this );
     }
 
-    operator VkFenceCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFenceCreateInfo *>( this );
-    }
-
-    operator VkFenceCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFenceCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, FenceCreateFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::FenceCreateFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -51468,26 +37019,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType = StructureType::eFenceCreateInfo;
-    const void *     pNext = {};
-    FenceCreateFlags flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType = StructureType::eFenceCreateInfo;
+    const void *                           pNext = {};
+    VULKAN_HPP_NAMESPACE::FenceCreateFlags flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFenceCreateInfo>
-  {
-    using Type = FenceCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFenceCreateInfo>
   {
     using Type = FenceCreateInfo;
   };
 
-  // wrapper struct for struct VkFenceGetFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceGetFdInfoKHR.html
   struct FenceGetFdInfoKHR
   {
     using NativeType = VkFenceGetFdInfoKHR;
@@ -51495,13 +37037,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFenceGetFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FenceGetFdInfoKHR( Fence                           fence_      = {},
-                                            ExternalFenceHandleTypeFlagBits handleType_ = ExternalFenceHandleTypeFlagBits::eOpaqueFd,
-                                            const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fence{ fence_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      FenceGetFdInfoKHR( VULKAN_HPP_NAMESPACE::Fence                           fence_      = {},
+                         VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd,
+                         const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fence( fence_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -51510,33 +37053,33 @@ namespace VULKAN_HPP_NAMESPACE
     FenceGetFdInfoKHR( VkFenceGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : FenceGetFdInfoKHR( *reinterpret_cast<FenceGetFdInfoKHR const *>( &rhs ) ) {}
 
     FenceGetFdInfoKHR & operator=( FenceGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FenceGetFdInfoKHR & operator=( VkFenceGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FenceGetFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FenceGetFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FenceGetFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FenceGetFdInfoKHR & setFence( Fence fence_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FenceGetFdInfoKHR & setFence( VULKAN_HPP_NAMESPACE::Fence fence_ ) VULKAN_HPP_NOEXCEPT
     {
       fence = fence_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FenceGetFdInfoKHR & setHandleType( ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FenceGetFdInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFenceGetFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -51548,18 +37091,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFenceGetFdInfoKHR *>( this );
     }
 
-    operator VkFenceGetFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFenceGetFdInfoKHR *>( this );
-    }
-
-    operator VkFenceGetFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFenceGetFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Fence const &, ExternalFenceHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Fence const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fence, handleType );
     }
@@ -51584,20 +37125,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType      = StructureType::eFenceGetFdInfoKHR;
-    const void *                    pNext      = {};
-    Fence                           fence      = {};
-    ExternalFenceHandleTypeFlagBits handleType = ExternalFenceHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::eFenceGetFdInfoKHR;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::Fence                           fence      = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFenceGetFdInfoKHR>
-  {
-    using Type = FenceGetFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFenceGetFdInfoKHR>
   {
@@ -51605,7 +37138,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkFenceGetWin32HandleInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFenceGetWin32HandleInfoKHR.html
   struct FenceGetWin32HandleInfoKHR
   {
     using NativeType = VkFenceGetWin32HandleInfoKHR;
@@ -51613,13 +37145,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFenceGetWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FenceGetWin32HandleInfoKHR( Fence                           fence_      = {},
-                                                     ExternalFenceHandleTypeFlagBits handleType_ = ExternalFenceHandleTypeFlagBits::eOpaqueFd,
-                                                     const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fence{ fence_ }
-      , handleType{ handleType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FenceGetWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::Fence                           fence_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd,
+      const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fence( fence_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -51631,33 +37164,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     FenceGetWin32HandleInfoKHR & operator=( FenceGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FenceGetWin32HandleInfoKHR & operator=( VkFenceGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FenceGetWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FenceGetWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FenceGetWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FenceGetWin32HandleInfoKHR & setFence( Fence fence_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FenceGetWin32HandleInfoKHR & setFence( VULKAN_HPP_NAMESPACE::Fence fence_ ) VULKAN_HPP_NOEXCEPT
     {
       fence = fence_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FenceGetWin32HandleInfoKHR & setHandleType( ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FenceGetWin32HandleInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFenceGetWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -51669,18 +37202,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFenceGetWin32HandleInfoKHR *>( this );
     }
 
-    operator VkFenceGetWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFenceGetWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkFenceGetWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFenceGetWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Fence const &, ExternalFenceHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Fence const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fence, handleType );
     }
@@ -51705,20 +37236,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                   sType      = StructureType::eFenceGetWin32HandleInfoKHR;
-    const void *                    pNext      = {};
-    Fence                           fence      = {};
-    ExternalFenceHandleTypeFlagBits handleType = ExternalFenceHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::eFenceGetWin32HandleInfoKHR;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::Fence                           fence      = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFenceGetWin32HandleInfoKHR>
-  {
-    using Type = FenceGetWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eFenceGetWin32HandleInfoKHR>
   {
@@ -51726,8 +37249,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkFilterCubicImageViewImageFormatPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFilterCubicImageViewImageFormatPropertiesEXT.html
   struct FilterCubicImageViewImageFormatPropertiesEXT
   {
     using NativeType = VkFilterCubicImageViewImageFormatPropertiesEXT;
@@ -51735,12 +37256,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFilterCubicImageViewImageFormatPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      FilterCubicImageViewImageFormatPropertiesEXT( Bool32 filterCubic_ = {}, Bool32 filterCubicMinmax_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , filterCubic{ filterCubic_ }
-      , filterCubicMinmax{ filterCubicMinmax_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FilterCubicImageViewImageFormatPropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 filterCubic_       = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 filterCubicMinmax_ = {},
+                                                                       void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , filterCubic( filterCubic_ )
+      , filterCubicMinmax( filterCubicMinmax_ )
     {
     }
 
@@ -51752,11 +37274,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     FilterCubicImageViewImageFormatPropertiesEXT & operator=( FilterCubicImageViewImageFormatPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FilterCubicImageViewImageFormatPropertiesEXT & operator=( VkFilterCubicImageViewImageFormatPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FilterCubicImageViewImageFormatPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FilterCubicImageViewImageFormatPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -51770,18 +37292,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFilterCubicImageViewImageFormatPropertiesEXT *>( this );
     }
 
-    operator VkFilterCubicImageViewImageFormatPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFilterCubicImageViewImageFormatPropertiesEXT *>( this );
-    }
-
-    operator VkFilterCubicImageViewImageFormatPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFilterCubicImageViewImageFormatPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, filterCubic, filterCubicMinmax );
     }
@@ -51806,38 +37323,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eFilterCubicImageViewImageFormatPropertiesEXT;
-    void *        pNext             = {};
-    Bool32        filterCubic       = {};
-    Bool32        filterCubicMinmax = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eFilterCubicImageViewImageFormatPropertiesEXT;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        filterCubic       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        filterCubicMinmax = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFilterCubicImageViewImageFormatPropertiesEXT>
-  {
-    using Type = FilterCubicImageViewImageFormatPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFilterCubicImageViewImageFormatPropertiesEXT>
   {
     using Type = FilterCubicImageViewImageFormatPropertiesEXT;
   };
 
-  // wrapper struct for struct VkFormatProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatProperties.html
   struct FormatProperties
   {
     using NativeType = VkFormatProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FormatProperties( FormatFeatureFlags linearTilingFeatures_  = {},
-                                           FormatFeatureFlags optimalTilingFeatures_ = {},
-                                           FormatFeatureFlags bufferFeatures_        = {} ) VULKAN_HPP_NOEXCEPT
-      : linearTilingFeatures{ linearTilingFeatures_ }
-      , optimalTilingFeatures{ optimalTilingFeatures_ }
-      , bufferFeatures{ bufferFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FormatProperties( VULKAN_HPP_NAMESPACE::FormatFeatureFlags linearTilingFeatures_  = {},
+                                           VULKAN_HPP_NAMESPACE::FormatFeatureFlags optimalTilingFeatures_ = {},
+                                           VULKAN_HPP_NAMESPACE::FormatFeatureFlags bufferFeatures_        = {} ) VULKAN_HPP_NOEXCEPT
+      : linearTilingFeatures( linearTilingFeatures_ )
+      , optimalTilingFeatures( optimalTilingFeatures_ )
+      , bufferFeatures( bufferFeatures_ )
     {
     }
 
@@ -51846,11 +37354,11 @@ namespace VULKAN_HPP_NAMESPACE
     FormatProperties( VkFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT : FormatProperties( *reinterpret_cast<FormatProperties const *>( &rhs ) ) {}
 
     FormatProperties & operator=( FormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FormatProperties & operator=( VkFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FormatProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FormatProperties const *>( &rhs );
       return *this;
     }
 
@@ -51864,18 +37372,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFormatProperties *>( this );
     }
 
-    operator VkFormatProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFormatProperties *>( this );
-    }
-
-    operator VkFormatProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFormatProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<FormatFeatureFlags const &, FormatFeatureFlags const &, FormatFeatureFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( linearTilingFeatures, optimalTilingFeatures, bufferFeatures );
     }
@@ -51901,20 +37406,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    FormatFeatureFlags linearTilingFeatures  = {};
-    FormatFeatureFlags optimalTilingFeatures = {};
-    FormatFeatureFlags bufferFeatures        = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags linearTilingFeatures  = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags optimalTilingFeatures = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags bufferFeatures        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFormatProperties>
-  {
-    using Type = FormatProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkFormatProperties2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatProperties2.html
   struct FormatProperties2
   {
     using NativeType = VkFormatProperties2;
@@ -51922,10 +37418,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFormatProperties2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FormatProperties2( FormatProperties formatProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , formatProperties{ formatProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FormatProperties2( VULKAN_HPP_NAMESPACE::FormatProperties formatProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , formatProperties( formatProperties_ )
     {
     }
 
@@ -51934,11 +37430,11 @@ namespace VULKAN_HPP_NAMESPACE
     FormatProperties2( VkFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT : FormatProperties2( *reinterpret_cast<FormatProperties2 const *>( &rhs ) ) {}
 
     FormatProperties2 & operator=( FormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FormatProperties2 & operator=( VkFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FormatProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FormatProperties2 const *>( &rhs );
       return *this;
     }
 
@@ -51952,18 +37448,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFormatProperties2 *>( this );
     }
 
-    operator VkFormatProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFormatProperties2 *>( this );
-    }
-
-    operator VkFormatProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFormatProperties2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, FormatProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::FormatProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, formatProperties );
     }
@@ -51988,19 +37479,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType            = StructureType::eFormatProperties2;
-    void *           pNext            = {};
-    FormatProperties formatProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType            = StructureType::eFormatProperties2;
+    void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::FormatProperties formatProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFormatProperties2>
-  {
-    using Type = FormatProperties2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFormatProperties2>
   {
@@ -52009,7 +37492,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using FormatProperties2KHR = FormatProperties2;
 
-  // wrapper struct for struct VkFormatProperties3, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFormatProperties3.html
   struct FormatProperties3
   {
     using NativeType = VkFormatProperties3;
@@ -52017,15 +37499,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFormatProperties3;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FormatProperties3( FormatFeatureFlags2 linearTilingFeatures_  = {},
-                                            FormatFeatureFlags2 optimalTilingFeatures_ = {},
-                                            FormatFeatureFlags2 bufferFeatures_        = {},
-                                            void *              pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , linearTilingFeatures{ linearTilingFeatures_ }
-      , optimalTilingFeatures{ optimalTilingFeatures_ }
-      , bufferFeatures{ bufferFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FormatProperties3( VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 linearTilingFeatures_  = {},
+                                            VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 optimalTilingFeatures_ = {},
+                                            VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 bufferFeatures_        = {},
+                                            void *                                    pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , linearTilingFeatures( linearTilingFeatures_ )
+      , optimalTilingFeatures( optimalTilingFeatures_ )
+      , bufferFeatures( bufferFeatures_ )
     {
     }
 
@@ -52034,11 +37516,11 @@ namespace VULKAN_HPP_NAMESPACE
     FormatProperties3( VkFormatProperties3 const & rhs ) VULKAN_HPP_NOEXCEPT : FormatProperties3( *reinterpret_cast<FormatProperties3 const *>( &rhs ) ) {}
 
     FormatProperties3 & operator=( FormatProperties3 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FormatProperties3 & operator=( VkFormatProperties3 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FormatProperties3 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FormatProperties3 const *>( &rhs );
       return *this;
     }
 
@@ -52052,18 +37534,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFormatProperties3 *>( this );
     }
 
-    operator VkFormatProperties3 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFormatProperties3 *>( this );
-    }
-
-    operator VkFormatProperties3 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFormatProperties3 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, FormatFeatureFlags2 const &, FormatFeatureFlags2 const &, FormatFeatureFlags2 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, linearTilingFeatures, optimalTilingFeatures, bufferFeatures );
@@ -52090,21 +37570,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                 = StructureType::eFormatProperties3;
-    void *              pNext                 = {};
-    FormatFeatureFlags2 linearTilingFeatures  = {};
-    FormatFeatureFlags2 optimalTilingFeatures = {};
-    FormatFeatureFlags2 bufferFeatures        = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType                 = StructureType::eFormatProperties3;
+    void *                                    pNext                 = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 linearTilingFeatures  = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 optimalTilingFeatures = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags2 bufferFeatures        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFormatProperties3>
-  {
-    using Type = FormatProperties3;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFormatProperties3>
   {
@@ -52113,8 +37585,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using FormatProperties3KHR = FormatProperties3;
 
-  // wrapper struct for struct VkFragmentShadingRateAttachmentInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFragmentShadingRateAttachmentInfoKHR.html
   struct FragmentShadingRateAttachmentInfoKHR
   {
     using NativeType = VkFragmentShadingRateAttachmentInfoKHR;
@@ -52122,13 +37592,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFragmentShadingRateAttachmentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FragmentShadingRateAttachmentInfoKHR( const AttachmentReference2 * pFragmentShadingRateAttachment_ = {},
-                                                               Extent2D                     shadingRateAttachmentTexelSize_ = {},
-                                                               const void *                 pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pFragmentShadingRateAttachment{ pFragmentShadingRateAttachment_ }
-      , shadingRateAttachmentTexelSize{ shadingRateAttachmentTexelSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FragmentShadingRateAttachmentInfoKHR( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pFragmentShadingRateAttachment_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Extent2D                     shadingRateAttachmentTexelSize_ = {},
+                                                               const void *                                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pFragmentShadingRateAttachment( pFragmentShadingRateAttachment_ )
+      , shadingRateAttachmentTexelSize( shadingRateAttachmentTexelSize_ )
     {
     }
 
@@ -52140,15 +37610,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     FragmentShadingRateAttachmentInfoKHR & operator=( FragmentShadingRateAttachmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FragmentShadingRateAttachmentInfoKHR & operator=( VkFragmentShadingRateAttachmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FragmentShadingRateAttachmentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FragmentShadingRateAttachmentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FragmentShadingRateAttachmentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -52156,19 +37626,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 FragmentShadingRateAttachmentInfoKHR &
-      setPFragmentShadingRateAttachment( const AttachmentReference2 * pFragmentShadingRateAttachment_ ) VULKAN_HPP_NOEXCEPT
+      setPFragmentShadingRateAttachment( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pFragmentShadingRateAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pFragmentShadingRateAttachment = pFragmentShadingRateAttachment_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 FragmentShadingRateAttachmentInfoKHR &
-      setShadingRateAttachmentTexelSize( Extent2D const & shadingRateAttachmentTexelSize_ ) VULKAN_HPP_NOEXCEPT
+      setShadingRateAttachmentTexelSize( VULKAN_HPP_NAMESPACE::Extent2D const & shadingRateAttachmentTexelSize_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateAttachmentTexelSize = shadingRateAttachmentTexelSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFragmentShadingRateAttachmentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -52180,18 +37650,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFragmentShadingRateAttachmentInfoKHR *>( this );
     }
 
-    operator VkFragmentShadingRateAttachmentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFragmentShadingRateAttachmentInfoKHR *>( this );
-    }
-
-    operator VkFragmentShadingRateAttachmentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFragmentShadingRateAttachmentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const AttachmentReference2 * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pFragmentShadingRateAttachment, shadingRateAttachmentTexelSize );
     }
@@ -52217,27 +37685,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                          = StructureType::eFragmentShadingRateAttachmentInfoKHR;
-    const void *                 pNext                          = {};
-    const AttachmentReference2 * pFragmentShadingRateAttachment = {};
-    Extent2D                     shadingRateAttachmentTexelSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                          = StructureType::eFragmentShadingRateAttachmentInfoKHR;
+    const void *                                       pNext                          = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pFragmentShadingRateAttachment = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                     shadingRateAttachmentTexelSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFragmentShadingRateAttachmentInfoKHR>
-  {
-    using Type = FragmentShadingRateAttachmentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFragmentShadingRateAttachmentInfoKHR>
   {
     using Type = FragmentShadingRateAttachmentInfoKHR;
   };
 
-  // wrapper struct for struct VkFrameBoundaryEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFrameBoundaryEXT.html
   struct FrameBoundaryEXT
   {
     using NativeType = VkFrameBoundaryEXT;
@@ -52245,27 +37704,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFrameBoundaryEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FrameBoundaryEXT( FrameBoundaryFlagsEXT flags_       = {},
-                                           uint64_t              frameID_     = {},
-                                           uint32_t              imageCount_  = {},
-                                           const Image *         pImages_     = {},
-                                           uint32_t              bufferCount_ = {},
-                                           const Buffer *        pBuffers_    = {},
-                                           uint64_t              tagName_     = {},
-                                           size_t                tagSize_     = {},
-                                           const void *          pTag_        = {},
-                                           const void *          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , frameID{ frameID_ }
-      , imageCount{ imageCount_ }
-      , pImages{ pImages_ }
-      , bufferCount{ bufferCount_ }
-      , pBuffers{ pBuffers_ }
-      , tagName{ tagName_ }
-      , tagSize{ tagSize_ }
-      , pTag{ pTag_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FrameBoundaryEXT( VULKAN_HPP_NAMESPACE::FrameBoundaryFlagsEXT flags_       = {},
+                                           uint64_t                                    frameID_     = {},
+                                           uint32_t                                    imageCount_  = {},
+                                           const VULKAN_HPP_NAMESPACE::Image *         pImages_     = {},
+                                           uint32_t                                    bufferCount_ = {},
+                                           const VULKAN_HPP_NAMESPACE::Buffer *        pBuffers_    = {},
+                                           uint64_t                                    tagName_     = {},
+                                           size_t                                      tagSize_     = {},
+                                           const void *                                pTag_        = {},
+                                           const void *                                pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , frameID( frameID_ )
+      , imageCount( imageCount_ )
+      , pImages( pImages_ )
+      , bufferCount( bufferCount_ )
+      , pBuffers( pBuffers_ )
+      , tagName( tagName_ )
+      , tagSize( tagSize_ )
+      , pTag( pTag_ )
     {
     }
 
@@ -52275,13 +37734,13 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    FrameBoundaryEXT( FrameBoundaryFlagsEXT                         flags_,
-                      uint64_t                                      frameID_,
-                      ArrayProxyNoTemporaries<const Image> const &  images_,
-                      ArrayProxyNoTemporaries<const Buffer> const & buffers_ = {},
-                      uint64_t                                      tagName_ = {},
-                      ArrayProxyNoTemporaries<const T> const &      tag_     = {},
-                      const void *                                  pNext_   = nullptr )
+    FrameBoundaryEXT( VULKAN_HPP_NAMESPACE::FrameBoundaryFlagsEXT                                               flags_,
+                      uint64_t                                                                                  frameID_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Image> const &  images_,
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers_ = {},
+                      uint64_t                                                                                  tagName_ = {},
+                      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const &                            tag_     = {},
+                      const void *                                                                              pNext_   = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , frameID( frameID_ )
@@ -52297,22 +37756,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     FrameBoundaryEXT & operator=( FrameBoundaryEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FrameBoundaryEXT & operator=( VkFrameBoundaryEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FrameBoundaryEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FrameBoundaryEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setFlags( FrameBoundaryFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setFlags( VULKAN_HPP_NAMESPACE::FrameBoundaryFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -52330,14 +37789,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setPImages( const Image * pImages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setPImages( const VULKAN_HPP_NAMESPACE::Image * pImages_ ) VULKAN_HPP_NOEXCEPT
     {
       pImages = pImages_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FrameBoundaryEXT & setImages( ArrayProxyNoTemporaries<const Image> const & images_ ) VULKAN_HPP_NOEXCEPT
+    FrameBoundaryEXT & setImages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Image> const & images_ ) VULKAN_HPP_NOEXCEPT
     {
       imageCount = static_cast<uint32_t>( images_.size() );
       pImages    = images_.data();
@@ -52351,14 +37810,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setPBuffers( const Buffer * pBuffers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryEXT & setPBuffers( const VULKAN_HPP_NAMESPACE::Buffer * pBuffers_ ) VULKAN_HPP_NOEXCEPT
     {
       pBuffers = pBuffers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FrameBoundaryEXT & setBuffers( ArrayProxyNoTemporaries<const Buffer> const & buffers_ ) VULKAN_HPP_NOEXCEPT
+    FrameBoundaryEXT & setBuffers( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Buffer> const & buffers_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferCount = static_cast<uint32_t>( buffers_.size() );
       pBuffers    = buffers_.data();
@@ -52386,14 +37845,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    FrameBoundaryEXT & setTag( ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
+    FrameBoundaryEXT & setTag( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & tag_ ) VULKAN_HPP_NOEXCEPT
     {
       tagSize = tag_.size() * sizeof( T );
       pTag    = tag_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFrameBoundaryEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -52405,28 +37864,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFrameBoundaryEXT *>( this );
     }
 
-    operator VkFrameBoundaryEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFrameBoundaryEXT *>( this );
-    }
-
-    operator VkFrameBoundaryEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFrameBoundaryEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               FrameBoundaryFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::FrameBoundaryFlagsEXT const &,
                uint64_t const &,
                uint32_t const &,
-               const Image * const &,
+               const VULKAN_HPP_NAMESPACE::Image * const &,
                uint32_t const &,
-               const Buffer * const &,
+               const VULKAN_HPP_NAMESPACE::Buffer * const &,
                uint64_t const &,
                size_t const &,
                const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, frameID, imageCount, pImages, bufferCount, pBuffers, tagName, tagSize, pTag );
@@ -52454,170 +37907,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType       = StructureType::eFrameBoundaryEXT;
-    const void *          pNext       = {};
-    FrameBoundaryFlagsEXT flags       = {};
-    uint64_t              frameID     = {};
-    uint32_t              imageCount  = {};
-    const Image *         pImages     = {};
-    uint32_t              bufferCount = {};
-    const Buffer *        pBuffers    = {};
-    uint64_t              tagName     = {};
-    size_t                tagSize     = {};
-    const void *          pTag        = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType       = StructureType::eFrameBoundaryEXT;
+    const void *                                pNext       = {};
+    VULKAN_HPP_NAMESPACE::FrameBoundaryFlagsEXT flags       = {};
+    uint64_t                                    frameID     = {};
+    uint32_t                                    imageCount  = {};
+    const VULKAN_HPP_NAMESPACE::Image *         pImages     = {};
+    uint32_t                                    bufferCount = {};
+    const VULKAN_HPP_NAMESPACE::Buffer *        pBuffers    = {};
+    uint64_t                                    tagName     = {};
+    size_t                                      tagSize     = {};
+    const void *                                pTag        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFrameBoundaryEXT>
-  {
-    using Type = FrameBoundaryEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFrameBoundaryEXT>
   {
     using Type = FrameBoundaryEXT;
   };
 
-  // wrapper struct for struct VkFrameBoundaryTensorsARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFrameBoundaryTensorsARM.html
-  struct FrameBoundaryTensorsARM
-  {
-    using NativeType = VkFrameBoundaryTensorsARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFrameBoundaryTensorsARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      FrameBoundaryTensorsARM( uint32_t tensorCount_ = {}, const TensorARM * pTensors_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorCount{ tensorCount_ }
-      , pTensors{ pTensors_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR FrameBoundaryTensorsARM( FrameBoundaryTensorsARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    FrameBoundaryTensorsARM( VkFrameBoundaryTensorsARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : FrameBoundaryTensorsARM( *reinterpret_cast<FrameBoundaryTensorsARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FrameBoundaryTensorsARM( ArrayProxyNoTemporaries<const TensorARM> const & tensors_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), tensorCount( static_cast<uint32_t>( tensors_.size() ) ), pTensors( tensors_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    FrameBoundaryTensorsARM & operator=( FrameBoundaryTensorsARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    FrameBoundaryTensorsARM & operator=( VkFrameBoundaryTensorsARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<FrameBoundaryTensorsARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryTensorsARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryTensorsARM & setTensorCount( uint32_t tensorCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorCount = tensorCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 FrameBoundaryTensorsARM & setPTensors( const TensorARM * pTensors_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTensors = pTensors_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FrameBoundaryTensorsARM & setTensors( ArrayProxyNoTemporaries<const TensorARM> const & tensors_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorCount = static_cast<uint32_t>( tensors_.size() );
-      pTensors    = tensors_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkFrameBoundaryTensorsARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkFrameBoundaryTensorsARM *>( this );
-    }
-
-    operator VkFrameBoundaryTensorsARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkFrameBoundaryTensorsARM *>( this );
-    }
-
-    operator VkFrameBoundaryTensorsARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFrameBoundaryTensorsARM *>( this );
-    }
-
-    operator VkFrameBoundaryTensorsARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFrameBoundaryTensorsARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const TensorARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorCount, pTensors );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( FrameBoundaryTensorsARM const & ) const = default;
-#else
-    bool operator==( FrameBoundaryTensorsARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorCount == rhs.tensorCount ) && ( pTensors == rhs.pTensors );
-#  endif
-    }
-
-    bool operator!=( FrameBoundaryTensorsARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType     sType       = StructureType::eFrameBoundaryTensorsARM;
-    const void *      pNext       = {};
-    uint32_t          tensorCount = {};
-    const TensorARM * pTensors    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFrameBoundaryTensorsARM>
-  {
-    using Type = FrameBoundaryTensorsARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eFrameBoundaryTensorsARM>
-  {
-    using Type = FrameBoundaryTensorsARM;
-  };
-
-  // wrapper struct for struct VkFramebufferAttachmentImageInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferAttachmentImageInfo.html
   struct FramebufferAttachmentImageInfo
   {
     using NativeType = VkFramebufferAttachmentImageInfo;
@@ -52625,23 +37933,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFramebufferAttachmentImageInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FramebufferAttachmentImageInfo( ImageCreateFlags flags_           = {},
-                                                         ImageUsageFlags  usage_           = {},
-                                                         uint32_t         width_           = {},
-                                                         uint32_t         height_          = {},
-                                                         uint32_t         layerCount_      = {},
-                                                         uint32_t         viewFormatCount_ = {},
-                                                         const Format *   pViewFormats_    = {},
-                                                         const void *     pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , usage{ usage_ }
-      , width{ width_ }
-      , height{ height_ }
-      , layerCount{ layerCount_ }
-      , viewFormatCount{ viewFormatCount_ }
-      , pViewFormats{ pViewFormats_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FramebufferAttachmentImageInfo( VULKAN_HPP_NAMESPACE::ImageCreateFlags flags_           = {},
+                                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage_           = {},
+                                                         uint32_t                               width_           = {},
+                                                         uint32_t                               height_          = {},
+                                                         uint32_t                               layerCount_      = {},
+                                                         uint32_t                               viewFormatCount_ = {},
+                                                         const VULKAN_HPP_NAMESPACE::Format *   pViewFormats_    = {},
+                                                         const void *                           pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , usage( usage_ )
+      , width( width_ )
+      , height( height_ )
+      , layerCount( layerCount_ )
+      , viewFormatCount( viewFormatCount_ )
+      , pViewFormats( pViewFormats_ )
     {
     }
 
@@ -52653,13 +37961,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferAttachmentImageInfo( ImageCreateFlags                              flags_,
-                                    ImageUsageFlags                               usage_,
-                                    uint32_t                                      width_,
-                                    uint32_t                                      height_,
-                                    uint32_t                                      layerCount_,
-                                    ArrayProxyNoTemporaries<const Format> const & viewFormats_,
-                                    const void *                                  pNext_ = nullptr )
+    FramebufferAttachmentImageInfo( VULKAN_HPP_NAMESPACE::ImageCreateFlags                                                    flags_,
+                                    VULKAN_HPP_NAMESPACE::ImageUsageFlags                                                     usage_,
+                                    uint32_t                                                                                  width_,
+                                    uint32_t                                                                                  height_,
+                                    uint32_t                                                                                  layerCount_,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & viewFormats_,
+                                    const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , usage( usage_ )
@@ -52673,28 +37981,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     FramebufferAttachmentImageInfo & operator=( FramebufferAttachmentImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FramebufferAttachmentImageInfo & operator=( VkFramebufferAttachmentImageInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FramebufferAttachmentImageInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setFlags( ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setFlags( VULKAN_HPP_NAMESPACE::ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setUsage( ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
@@ -52724,21 +38032,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setPViewFormats( const Format * pViewFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentImageInfo & setPViewFormats( const VULKAN_HPP_NAMESPACE::Format * pViewFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewFormats = pViewFormats_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferAttachmentImageInfo & setViewFormats( ArrayProxyNoTemporaries<const Format> const & viewFormats_ ) VULKAN_HPP_NOEXCEPT
+    FramebufferAttachmentImageInfo &
+      setViewFormats( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & viewFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       viewFormatCount = static_cast<uint32_t>( viewFormats_.size() );
       pViewFormats    = viewFormats_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFramebufferAttachmentImageInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -52750,26 +38059,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFramebufferAttachmentImageInfo *>( this );
     }
 
-    operator VkFramebufferAttachmentImageInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFramebufferAttachmentImageInfo *>( this );
-    }
-
-    operator VkFramebufferAttachmentImageInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFramebufferAttachmentImageInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageCreateFlags const &,
-               ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               const Format * const &>
+               const VULKAN_HPP_NAMESPACE::Format * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, usage, width, height, layerCount, viewFormatCount, pViewFormats );
@@ -52796,25 +38099,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType           = StructureType::eFramebufferAttachmentImageInfo;
-    const void *     pNext           = {};
-    ImageCreateFlags flags           = {};
-    ImageUsageFlags  usage           = {};
-    uint32_t         width           = {};
-    uint32_t         height          = {};
-    uint32_t         layerCount      = {};
-    uint32_t         viewFormatCount = {};
-    const Format *   pViewFormats    = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType           = StructureType::eFramebufferAttachmentImageInfo;
+    const void *                           pNext           = {};
+    VULKAN_HPP_NAMESPACE::ImageCreateFlags flags           = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage           = {};
+    uint32_t                               width           = {};
+    uint32_t                               height          = {};
+    uint32_t                               layerCount      = {};
+    uint32_t                               viewFormatCount = {};
+    const VULKAN_HPP_NAMESPACE::Format *   pViewFormats    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFramebufferAttachmentImageInfo>
-  {
-    using Type = FramebufferAttachmentImageInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFramebufferAttachmentImageInfo>
   {
@@ -52823,8 +38118,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using FramebufferAttachmentImageInfoKHR = FramebufferAttachmentImageInfo;
 
-  // wrapper struct for struct VkFramebufferAttachmentsCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferAttachmentsCreateInfo.html
   struct FramebufferAttachmentsCreateInfo
   {
     using NativeType = VkFramebufferAttachmentsCreateInfo;
@@ -52832,13 +38125,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFramebufferAttachmentsCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FramebufferAttachmentsCreateInfo( uint32_t                               attachmentImageInfoCount_ = {},
-                                                           const FramebufferAttachmentImageInfo * pAttachmentImageInfos_    = {},
-                                                           const void *                           pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentImageInfoCount{ attachmentImageInfoCount_ }
-      , pAttachmentImageInfos{ pAttachmentImageInfos_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FramebufferAttachmentsCreateInfo( uint32_t                                                     attachmentImageInfoCount_ = {},
+                                                           const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo * pAttachmentImageInfos_    = {},
+                                                           const void *                                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentImageInfoCount( attachmentImageInfoCount_ )
+      , pAttachmentImageInfos( pAttachmentImageInfos_ )
     {
     }
 
@@ -52850,8 +38143,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferAttachmentsCreateInfo( ArrayProxyNoTemporaries<const FramebufferAttachmentImageInfo> const & attachmentImageInfos_,
-                                      const void *                                                          pNext_ = nullptr )
+    FramebufferAttachmentsCreateInfo(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo> const & attachmentImageInfos_,
+      const void *                                                                                                      pNext_ = nullptr )
       : pNext( pNext_ )
       , attachmentImageInfoCount( static_cast<uint32_t>( attachmentImageInfos_.size() ) )
       , pAttachmentImageInfos( attachmentImageInfos_.data() )
@@ -52860,15 +38154,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     FramebufferAttachmentsCreateInfo & operator=( FramebufferAttachmentsCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FramebufferAttachmentsCreateInfo & operator=( VkFramebufferAttachmentsCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FramebufferAttachmentsCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FramebufferAttachmentsCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentsCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -52882,22 +38176,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 FramebufferAttachmentsCreateInfo &
-      setPAttachmentImageInfos( const FramebufferAttachmentImageInfo * pAttachmentImageInfos_ ) VULKAN_HPP_NOEXCEPT
+      setPAttachmentImageInfos( const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo * pAttachmentImageInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachmentImageInfos = pAttachmentImageInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferAttachmentsCreateInfo &
-      setAttachmentImageInfos( ArrayProxyNoTemporaries<const FramebufferAttachmentImageInfo> const & attachmentImageInfos_ ) VULKAN_HPP_NOEXCEPT
+    FramebufferAttachmentsCreateInfo & setAttachmentImageInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo> const & attachmentImageInfos_ )
+      VULKAN_HPP_NOEXCEPT
     {
       attachmentImageInfoCount = static_cast<uint32_t>( attachmentImageInfos_.size() );
       pAttachmentImageInfos    = attachmentImageInfos_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFramebufferAttachmentsCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -52909,18 +38204,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFramebufferAttachmentsCreateInfo *>( this );
     }
 
-    operator VkFramebufferAttachmentsCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFramebufferAttachmentsCreateInfo *>( this );
-    }
-
-    operator VkFramebufferAttachmentsCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFramebufferAttachmentsCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const FramebufferAttachmentImageInfo * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachmentImageInfoCount, pAttachmentImageInfos );
@@ -52947,20 +38239,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                          sType                    = StructureType::eFramebufferAttachmentsCreateInfo;
-    const void *                           pNext                    = {};
-    uint32_t                               attachmentImageInfoCount = {};
-    const FramebufferAttachmentImageInfo * pAttachmentImageInfos    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                          sType                    = StructureType::eFramebufferAttachmentsCreateInfo;
+    const void *                                                 pNext                    = {};
+    uint32_t                                                     attachmentImageInfoCount = {};
+    const VULKAN_HPP_NAMESPACE::FramebufferAttachmentImageInfo * pAttachmentImageInfos    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFramebufferAttachmentsCreateInfo>
-  {
-    using Type = FramebufferAttachmentsCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFramebufferAttachmentsCreateInfo>
   {
@@ -52969,7 +38253,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using FramebufferAttachmentsCreateInfoKHR = FramebufferAttachmentsCreateInfo;
 
-  // wrapper struct for struct VkFramebufferCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferCreateInfo.html
   struct FramebufferCreateInfo
   {
     using NativeType = VkFramebufferCreateInfo;
@@ -52977,23 +38260,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFramebufferCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FramebufferCreateInfo( FramebufferCreateFlags flags_           = {},
-                                                RenderPass             renderPass_      = {},
-                                                uint32_t               attachmentCount_ = {},
-                                                const ImageView *      pAttachments_    = {},
-                                                uint32_t               width_           = {},
-                                                uint32_t               height_          = {},
-                                                uint32_t               layers_          = {},
-                                                const void *           pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , renderPass{ renderPass_ }
-      , attachmentCount{ attachmentCount_ }
-      , pAttachments{ pAttachments_ }
-      , width{ width_ }
-      , height{ height_ }
-      , layers{ layers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FramebufferCreateInfo( VULKAN_HPP_NAMESPACE::FramebufferCreateFlags flags_           = {},
+                                                VULKAN_HPP_NAMESPACE::RenderPass             renderPass_      = {},
+                                                uint32_t                                     attachmentCount_ = {},
+                                                const VULKAN_HPP_NAMESPACE::ImageView *      pAttachments_    = {},
+                                                uint32_t                                     width_           = {},
+                                                uint32_t                                     height_          = {},
+                                                uint32_t                                     layers_          = {},
+                                                const void *                                 pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , renderPass( renderPass_ )
+      , attachmentCount( attachmentCount_ )
+      , pAttachments( pAttachments_ )
+      , width( width_ )
+      , height( height_ )
+      , layers( layers_ )
     {
     }
 
@@ -53005,13 +38288,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferCreateInfo( FramebufferCreateFlags                           flags_,
-                           RenderPass                                       renderPass_,
-                           ArrayProxyNoTemporaries<const ImageView> const & attachments_,
-                           uint32_t                                         width_  = {},
-                           uint32_t                                         height_ = {},
-                           uint32_t                                         layers_ = {},
-                           const void *                                     pNext_  = nullptr )
+    FramebufferCreateInfo( VULKAN_HPP_NAMESPACE::FramebufferCreateFlags                                                 flags_,
+                           VULKAN_HPP_NAMESPACE::RenderPass                                                             renderPass_,
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageView> const & attachments_,
+                           uint32_t                                                                                     width_  = {},
+                           uint32_t                                                                                     height_ = {},
+                           uint32_t                                                                                     layers_ = {},
+                           const void *                                                                                 pNext_  = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , renderPass( renderPass_ )
@@ -53025,28 +38308,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     FramebufferCreateInfo & operator=( FramebufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FramebufferCreateInfo & operator=( VkFramebufferCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FramebufferCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FramebufferCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setFlags( FramebufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::FramebufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setRenderPass( RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPass = renderPass_;
       return *this;
@@ -53058,14 +38341,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setPAttachments( const ImageView * pAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 FramebufferCreateInfo & setPAttachments( const VULKAN_HPP_NAMESPACE::ImageView * pAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachments = pAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    FramebufferCreateInfo & setAttachments( ArrayProxyNoTemporaries<const ImageView> const & attachments_ ) VULKAN_HPP_NOEXCEPT
+    FramebufferCreateInfo &
+      setAttachments( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageView> const & attachments_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount = static_cast<uint32_t>( attachments_.size() );
       pAttachments    = attachments_.data();
@@ -53090,7 +38374,7 @@ namespace VULKAN_HPP_NAMESPACE
       layers = layers_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkFramebufferCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -53102,26 +38386,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFramebufferCreateInfo *>( this );
     }
 
-    operator VkFramebufferCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFramebufferCreateInfo *>( this );
-    }
-
-    operator VkFramebufferCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFramebufferCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               FramebufferCreateFlags const &,
-               RenderPass const &,
+               VULKAN_HPP_NAMESPACE::FramebufferCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::RenderPass const &,
                uint32_t const &,
-               const ImageView * const &,
+               const VULKAN_HPP_NAMESPACE::ImageView * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, renderPass, attachmentCount, pAttachments, width, height, layers );
@@ -53149,33 +38427,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType           = StructureType::eFramebufferCreateInfo;
-    const void *           pNext           = {};
-    FramebufferCreateFlags flags           = {};
-    RenderPass             renderPass      = {};
-    uint32_t               attachmentCount = {};
-    const ImageView *      pAttachments    = {};
-    uint32_t               width           = {};
-    uint32_t               height          = {};
-    uint32_t               layers          = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType           = StructureType::eFramebufferCreateInfo;
+    const void *                                 pNext           = {};
+    VULKAN_HPP_NAMESPACE::FramebufferCreateFlags flags           = {};
+    VULKAN_HPP_NAMESPACE::RenderPass             renderPass      = {};
+    uint32_t                                     attachmentCount = {};
+    const VULKAN_HPP_NAMESPACE::ImageView *      pAttachments    = {};
+    uint32_t                                     width           = {};
+    uint32_t                                     height          = {};
+    uint32_t                                     layers          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFramebufferCreateInfo>
-  {
-    using Type = FramebufferCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFramebufferCreateInfo>
   {
     using Type = FramebufferCreateInfo;
   };
 
-  // wrapper struct for struct VkFramebufferMixedSamplesCombinationNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkFramebufferMixedSamplesCombinationNV.html
   struct FramebufferMixedSamplesCombinationNV
   {
     using NativeType = VkFramebufferMixedSamplesCombinationNV;
@@ -53183,17 +38451,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eFramebufferMixedSamplesCombinationNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR FramebufferMixedSamplesCombinationNV( CoverageReductionModeNV coverageReductionMode_ = CoverageReductionModeNV::eMerge,
-                                                               SampleCountFlagBits     rasterizationSamples_  = SampleCountFlagBits::e1,
-                                                               SampleCountFlags        depthStencilSamples_   = {},
-                                                               SampleCountFlags        colorSamples_          = {},
-                                                               void *                  pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , coverageReductionMode{ coverageReductionMode_ }
-      , rasterizationSamples{ rasterizationSamples_ }
-      , depthStencilSamples{ depthStencilSamples_ }
-      , colorSamples{ colorSamples_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR FramebufferMixedSamplesCombinationNV(
+      VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode_ = VULKAN_HPP_NAMESPACE::CoverageReductionModeNV::eMerge,
+      VULKAN_HPP_NAMESPACE::SampleCountFlagBits     rasterizationSamples_  = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+      VULKAN_HPP_NAMESPACE::SampleCountFlags        depthStencilSamples_   = {},
+      VULKAN_HPP_NAMESPACE::SampleCountFlags        colorSamples_          = {},
+      void *                                        pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , coverageReductionMode( coverageReductionMode_ )
+      , rasterizationSamples( rasterizationSamples_ )
+      , depthStencilSamples( depthStencilSamples_ )
+      , colorSamples( colorSamples_ )
     {
     }
 
@@ -53205,11 +38474,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     FramebufferMixedSamplesCombinationNV & operator=( FramebufferMixedSamplesCombinationNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     FramebufferMixedSamplesCombinationNV & operator=( VkFramebufferMixedSamplesCombinationNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<FramebufferMixedSamplesCombinationNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::FramebufferMixedSamplesCombinationNV const *>( &rhs );
       return *this;
     }
 
@@ -53223,23 +38492,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( this );
     }
 
-    operator VkFramebufferMixedSamplesCombinationNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkFramebufferMixedSamplesCombinationNV *>( this );
-    }
-
-    operator VkFramebufferMixedSamplesCombinationNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkFramebufferMixedSamplesCombinationNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               CoverageReductionModeNV const &,
-               SampleCountFlagBits const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &>
+               VULKAN_HPP_NAMESPACE::CoverageReductionModeNV const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, coverageReductionMode, rasterizationSamples, depthStencilSamples, colorSamples );
@@ -53266,255 +38529,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType                 = StructureType::eFramebufferMixedSamplesCombinationNV;
-    void *                  pNext                 = {};
-    CoverageReductionModeNV coverageReductionMode = CoverageReductionModeNV::eMerge;
-    SampleCountFlagBits     rasterizationSamples  = SampleCountFlagBits::e1;
-    SampleCountFlags        depthStencilSamples   = {};
-    SampleCountFlags        colorSamples          = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType                 = StructureType::eFramebufferMixedSamplesCombinationNV;
+    void *                                        pNext                 = {};
+    VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode = VULKAN_HPP_NAMESPACE::CoverageReductionModeNV::eMerge;
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits     rasterizationSamples  = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::SampleCountFlags        depthStencilSamples   = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags        colorSamples          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkFramebufferMixedSamplesCombinationNV>
-  {
-    using Type = FramebufferMixedSamplesCombinationNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eFramebufferMixedSamplesCombinationNV>
   {
     using Type = FramebufferMixedSamplesCombinationNV;
   };
 
-  // wrapper struct for struct VkGeneratedCommandsInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsInfoEXT.html
-  struct GeneratedCommandsInfoEXT
-  {
-    using NativeType = VkGeneratedCommandsInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsInfoEXT( ShaderStageFlags          shaderStages_           = {},
-                                                   IndirectExecutionSetEXT   indirectExecutionSet_   = {},
-                                                   IndirectCommandsLayoutEXT indirectCommandsLayout_ = {},
-                                                   DeviceAddress             indirectAddress_        = {},
-                                                   DeviceSize                indirectAddressSize_    = {},
-                                                   DeviceAddress             preprocessAddress_      = {},
-                                                   DeviceSize                preprocessSize_         = {},
-                                                   uint32_t                  maxSequenceCount_       = {},
-                                                   DeviceAddress             sequenceCountAddress_   = {},
-                                                   uint32_t                  maxDrawCount_           = {},
-                                                   const void *              pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderStages{ shaderStages_ }
-      , indirectExecutionSet{ indirectExecutionSet_ }
-      , indirectCommandsLayout{ indirectCommandsLayout_ }
-      , indirectAddress{ indirectAddress_ }
-      , indirectAddressSize{ indirectAddressSize_ }
-      , preprocessAddress{ preprocessAddress_ }
-      , preprocessSize{ preprocessSize_ }
-      , maxSequenceCount{ maxSequenceCount_ }
-      , sequenceCountAddress{ sequenceCountAddress_ }
-      , maxDrawCount{ maxDrawCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsInfoEXT( GeneratedCommandsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    GeneratedCommandsInfoEXT( VkGeneratedCommandsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : GeneratedCommandsInfoEXT( *reinterpret_cast<GeneratedCommandsInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    GeneratedCommandsInfoEXT & operator=( GeneratedCommandsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    GeneratedCommandsInfoEXT & operator=( VkGeneratedCommandsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<GeneratedCommandsInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setShaderStages( ShaderStageFlags shaderStages_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderStages = shaderStages_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setIndirectExecutionSet( IndirectExecutionSetEXT indirectExecutionSet_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectExecutionSet = indirectExecutionSet_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setIndirectCommandsLayout( IndirectCommandsLayoutEXT indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectCommandsLayout = indirectCommandsLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setIndirectAddress( DeviceAddress indirectAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectAddress = indirectAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setIndirectAddressSize( DeviceSize indirectAddressSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectAddressSize = indirectAddressSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setPreprocessAddress( DeviceAddress preprocessAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      preprocessAddress = preprocessAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setPreprocessSize( DeviceSize preprocessSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      preprocessSize = preprocessSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setMaxSequenceCount( uint32_t maxSequenceCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxSequenceCount = maxSequenceCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setSequenceCountAddress( DeviceAddress sequenceCountAddress_ ) VULKAN_HPP_NOEXCEPT
-    {
-      sequenceCountAddress = sequenceCountAddress_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoEXT & setMaxDrawCount( uint32_t maxDrawCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxDrawCount = maxDrawCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkGeneratedCommandsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkGeneratedCommandsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               ShaderStageFlags const &,
-               IndirectExecutionSetEXT const &,
-               IndirectCommandsLayoutEXT const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               uint32_t const &,
-               DeviceAddress const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       shaderStages,
-                       indirectExecutionSet,
-                       indirectCommandsLayout,
-                       indirectAddress,
-                       indirectAddressSize,
-                       preprocessAddress,
-                       preprocessSize,
-                       maxSequenceCount,
-                       sequenceCountAddress,
-                       maxDrawCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( GeneratedCommandsInfoEXT const & ) const = default;
-#else
-    bool operator==( GeneratedCommandsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderStages == rhs.shaderStages ) && ( indirectExecutionSet == rhs.indirectExecutionSet ) &&
-             ( indirectCommandsLayout == rhs.indirectCommandsLayout ) && ( indirectAddress == rhs.indirectAddress ) &&
-             ( indirectAddressSize == rhs.indirectAddressSize ) && ( preprocessAddress == rhs.preprocessAddress ) && ( preprocessSize == rhs.preprocessSize ) &&
-             ( maxSequenceCount == rhs.maxSequenceCount ) && ( sequenceCountAddress == rhs.sequenceCountAddress ) && ( maxDrawCount == rhs.maxDrawCount );
-#  endif
-    }
-
-    bool operator!=( GeneratedCommandsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType             sType                  = StructureType::eGeneratedCommandsInfoEXT;
-    const void *              pNext                  = {};
-    ShaderStageFlags          shaderStages           = {};
-    IndirectExecutionSetEXT   indirectExecutionSet   = {};
-    IndirectCommandsLayoutEXT indirectCommandsLayout = {};
-    DeviceAddress             indirectAddress        = {};
-    DeviceSize                indirectAddressSize    = {};
-    DeviceAddress             preprocessAddress      = {};
-    DeviceSize                preprocessSize         = {};
-    uint32_t                  maxSequenceCount       = {};
-    DeviceAddress             sequenceCountAddress   = {};
-    uint32_t                  maxDrawCount           = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsInfoEXT>
-  {
-    using Type = GeneratedCommandsInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eGeneratedCommandsInfoEXT>
-  {
-    using Type = GeneratedCommandsInfoEXT;
-  };
-
-  // wrapper struct for struct VkIndirectCommandsStreamNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsStreamNV.html
   struct IndirectCommandsStreamNV
   {
     using NativeType = VkIndirectCommandsStreamNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsStreamNV( Buffer buffer_ = {}, DeviceSize offset_ = {} ) VULKAN_HPP_NOEXCEPT
-      : buffer{ buffer_ }
-      , offset{ offset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR IndirectCommandsStreamNV( VULKAN_HPP_NAMESPACE::Buffer     buffer_ = {},
+                                                   VULKAN_HPP_NAMESPACE::DeviceSize offset_ = {} ) VULKAN_HPP_NOEXCEPT
+      : buffer( buffer_ )
+      , offset( offset_ )
     {
     }
 
@@ -53526,27 +38563,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     IndirectCommandsStreamNV & operator=( IndirectCommandsStreamNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     IndirectCommandsStreamNV & operator=( VkIndirectCommandsStreamNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<IndirectCommandsStreamNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsStreamNV & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsStreamNV & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsStreamNV & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsStreamNV & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkIndirectCommandsStreamNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -53558,18 +38595,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkIndirectCommandsStreamNV *>( this );
     }
 
-    operator VkIndirectCommandsStreamNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsStreamNV *>( this );
-    }
-
-    operator VkIndirectCommandsStreamNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsStreamNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Buffer const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Buffer const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( buffer, offset );
     }
@@ -53594,19 +38626,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Buffer     buffer = {};
-    DeviceSize offset = {};
+    VULKAN_HPP_NAMESPACE::Buffer     buffer = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize offset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsStreamNV>
-  {
-    using Type = IndirectCommandsStreamNV;
-  };
-#endif
-
-  // wrapper struct for struct VkGeneratedCommandsInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsInfoNV.html
   struct GeneratedCommandsInfoNV
   {
     using NativeType = VkGeneratedCommandsInfoNV;
@@ -53614,35 +38637,36 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsInfoNV( PipelineBindPoint                pipelineBindPoint_      = PipelineBindPoint::eGraphics,
-                                                  Pipeline                         pipeline_               = {},
-                                                  IndirectCommandsLayoutNV         indirectCommandsLayout_ = {},
-                                                  uint32_t                         streamCount_            = {},
-                                                  const IndirectCommandsStreamNV * pStreams_               = {},
-                                                  uint32_t                         sequencesCount_         = {},
-                                                  Buffer                           preprocessBuffer_       = {},
-                                                  DeviceSize                       preprocessOffset_       = {},
-                                                  DeviceSize                       preprocessSize_         = {},
-                                                  Buffer                           sequencesCountBuffer_   = {},
-                                                  DeviceSize                       sequencesCountOffset_   = {},
-                                                  Buffer                           sequencesIndexBuffer_   = {},
-                                                  DeviceSize                       sequencesIndexOffset_   = {},
-                                                  const void *                     pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , pipeline{ pipeline_ }
-      , indirectCommandsLayout{ indirectCommandsLayout_ }
-      , streamCount{ streamCount_ }
-      , pStreams{ pStreams_ }
-      , sequencesCount{ sequencesCount_ }
-      , preprocessBuffer{ preprocessBuffer_ }
-      , preprocessOffset{ preprocessOffset_ }
-      , preprocessSize{ preprocessSize_ }
-      , sequencesCountBuffer{ sequencesCountBuffer_ }
-      , sequencesCountOffset{ sequencesCountOffset_ }
-      , sequencesIndexBuffer{ sequencesIndexBuffer_ }
-      , sequencesIndexOffset{ sequencesIndexOffset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      GeneratedCommandsInfoNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint                pipelineBindPoint_ = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+                               VULKAN_HPP_NAMESPACE::Pipeline                         pipeline_          = {},
+                               VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV         indirectCommandsLayout_ = {},
+                               uint32_t                                               streamCount_            = {},
+                               const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV * pStreams_               = {},
+                               uint32_t                                               sequencesCount_         = {},
+                               VULKAN_HPP_NAMESPACE::Buffer                           preprocessBuffer_       = {},
+                               VULKAN_HPP_NAMESPACE::DeviceSize                       preprocessOffset_       = {},
+                               VULKAN_HPP_NAMESPACE::DeviceSize                       preprocessSize_         = {},
+                               VULKAN_HPP_NAMESPACE::Buffer                           sequencesCountBuffer_   = {},
+                               VULKAN_HPP_NAMESPACE::DeviceSize                       sequencesCountOffset_   = {},
+                               VULKAN_HPP_NAMESPACE::Buffer                           sequencesIndexBuffer_   = {},
+                               VULKAN_HPP_NAMESPACE::DeviceSize                       sequencesIndexOffset_   = {},
+                               const void *                                           pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , pipeline( pipeline_ )
+      , indirectCommandsLayout( indirectCommandsLayout_ )
+      , streamCount( streamCount_ )
+      , pStreams( pStreams_ )
+      , sequencesCount( sequencesCount_ )
+      , preprocessBuffer( preprocessBuffer_ )
+      , preprocessOffset( preprocessOffset_ )
+      , preprocessSize( preprocessSize_ )
+      , sequencesCountBuffer( sequencesCountBuffer_ )
+      , sequencesCountOffset( sequencesCountOffset_ )
+      , sequencesIndexBuffer( sequencesIndexBuffer_ )
+      , sequencesIndexOffset( sequencesIndexOffset_ )
     {
     }
 
@@ -53654,19 +38678,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GeneratedCommandsInfoNV( PipelineBindPoint                                               pipelineBindPoint_,
-                             Pipeline                                                        pipeline_,
-                             IndirectCommandsLayoutNV                                        indirectCommandsLayout_,
-                             ArrayProxyNoTemporaries<const IndirectCommandsStreamNV> const & streams_,
-                             uint32_t                                                        sequencesCount_       = {},
-                             Buffer                                                          preprocessBuffer_     = {},
-                             DeviceSize                                                      preprocessOffset_     = {},
-                             DeviceSize                                                      preprocessSize_       = {},
-                             Buffer                                                          sequencesCountBuffer_ = {},
-                             DeviceSize                                                      sequencesCountOffset_ = {},
-                             Buffer                                                          sequencesIndexBuffer_ = {},
-                             DeviceSize                                                      sequencesIndexOffset_ = {},
-                             const void *                                                    pNext_                = nullptr )
+    GeneratedCommandsInfoNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint        pipelineBindPoint_,
+                             VULKAN_HPP_NAMESPACE::Pipeline                 pipeline_,
+                             VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout_,
+                             VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV> const & streams_,
+                             uint32_t                                                                                                    sequencesCount_   = {},
+                             VULKAN_HPP_NAMESPACE::Buffer                                                                                preprocessBuffer_ = {},
+                             VULKAN_HPP_NAMESPACE::DeviceSize                                                                            preprocessOffset_ = {},
+                             VULKAN_HPP_NAMESPACE::DeviceSize                                                                            preprocessSize_   = {},
+                             VULKAN_HPP_NAMESPACE::Buffer     sequencesCountBuffer_                                                                        = {},
+                             VULKAN_HPP_NAMESPACE::DeviceSize sequencesCountOffset_                                                                        = {},
+                             VULKAN_HPP_NAMESPACE::Buffer     sequencesIndexBuffer_                                                                        = {},
+                             VULKAN_HPP_NAMESPACE::DeviceSize sequencesIndexOffset_                                                                        = {},
+                             const void *                     pNext_ = nullptr )
       : pNext( pNext_ )
       , pipelineBindPoint( pipelineBindPoint_ )
       , pipeline( pipeline_ )
@@ -53686,34 +38710,35 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     GeneratedCommandsInfoNV & operator=( GeneratedCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeneratedCommandsInfoNV & operator=( VkGeneratedCommandsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeneratedCommandsInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeneratedCommandsInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       pipeline = pipeline_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setIndirectCommandsLayout( IndirectCommandsLayoutNV indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV &
+      setIndirectCommandsLayout( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       indirectCommandsLayout = indirectCommandsLayout_;
       return *this;
@@ -53725,14 +38750,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPStreams( const IndirectCommandsStreamNV * pStreams_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPStreams( const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV * pStreams_ ) VULKAN_HPP_NOEXCEPT
     {
       pStreams = pStreams_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GeneratedCommandsInfoNV & setStreams( ArrayProxyNoTemporaries<const IndirectCommandsStreamNV> const & streams_ ) VULKAN_HPP_NOEXCEPT
+    GeneratedCommandsInfoNV &
+      setStreams( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV> const & streams_ ) VULKAN_HPP_NOEXCEPT
     {
       streamCount = static_cast<uint32_t>( streams_.size() );
       pStreams    = streams_.data();
@@ -53746,48 +38772,48 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessBuffer( Buffer preprocessBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessBuffer( VULKAN_HPP_NAMESPACE::Buffer preprocessBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       preprocessBuffer = preprocessBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessOffset( DeviceSize preprocessOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessOffset( VULKAN_HPP_NAMESPACE::DeviceSize preprocessOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       preprocessOffset = preprocessOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessSize( DeviceSize preprocessSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setPreprocessSize( VULKAN_HPP_NAMESPACE::DeviceSize preprocessSize_ ) VULKAN_HPP_NOEXCEPT
     {
       preprocessSize = preprocessSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesCountBuffer( Buffer sequencesCountBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesCountBuffer( VULKAN_HPP_NAMESPACE::Buffer sequencesCountBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       sequencesCountBuffer = sequencesCountBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesCountOffset( DeviceSize sequencesCountOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesCountOffset( VULKAN_HPP_NAMESPACE::DeviceSize sequencesCountOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       sequencesCountOffset = sequencesCountOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesIndexBuffer( Buffer sequencesIndexBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesIndexBuffer( VULKAN_HPP_NAMESPACE::Buffer sequencesIndexBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       sequencesIndexBuffer = sequencesIndexBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesIndexOffset( DeviceSize sequencesIndexOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsInfoNV & setSequencesIndexOffset( VULKAN_HPP_NAMESPACE::DeviceSize sequencesIndexOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       sequencesIndexOffset = sequencesIndexOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeneratedCommandsInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -53799,32 +38825,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeneratedCommandsInfoNV *>( this );
     }
 
-    operator VkGeneratedCommandsInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsInfoNV *>( this );
-    }
-
-    operator VkGeneratedCommandsInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineBindPoint const &,
-               Pipeline const &,
-               IndirectCommandsLayoutNV const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
+               VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV const &,
                uint32_t const &,
-               const IndirectCommandsStreamNV * const &,
+               const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV * const &,
                uint32_t const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               Buffer const &,
-               DeviceSize const &,
-               Buffer const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -53869,183 +38889,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType                  = StructureType::eGeneratedCommandsInfoNV;
-    const void *                     pNext                  = {};
-    PipelineBindPoint                pipelineBindPoint      = PipelineBindPoint::eGraphics;
-    Pipeline                         pipeline               = {};
-    IndirectCommandsLayoutNV         indirectCommandsLayout = {};
-    uint32_t                         streamCount            = {};
-    const IndirectCommandsStreamNV * pStreams               = {};
-    uint32_t                         sequencesCount         = {};
-    Buffer                           preprocessBuffer       = {};
-    DeviceSize                       preprocessOffset       = {};
-    DeviceSize                       preprocessSize         = {};
-    Buffer                           sequencesCountBuffer   = {};
-    DeviceSize                       sequencesCountOffset   = {};
-    Buffer                           sequencesIndexBuffer   = {};
-    DeviceSize                       sequencesIndexOffset   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType                  = StructureType::eGeneratedCommandsInfoNV;
+    const void *                                           pNext                  = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint                pipelineBindPoint      = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    VULKAN_HPP_NAMESPACE::Pipeline                         pipeline               = {};
+    VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV         indirectCommandsLayout = {};
+    uint32_t                                               streamCount            = {};
+    const VULKAN_HPP_NAMESPACE::IndirectCommandsStreamNV * pStreams               = {};
+    uint32_t                                               sequencesCount         = {};
+    VULKAN_HPP_NAMESPACE::Buffer                           preprocessBuffer       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       preprocessOffset       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       preprocessSize         = {};
+    VULKAN_HPP_NAMESPACE::Buffer                           sequencesCountBuffer   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       sequencesCountOffset   = {};
+    VULKAN_HPP_NAMESPACE::Buffer                           sequencesIndexBuffer   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       sequencesIndexOffset   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsInfoNV>
-  {
-    using Type = GeneratedCommandsInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGeneratedCommandsInfoNV>
   {
     using Type = GeneratedCommandsInfoNV;
   };
 
-  // wrapper struct for struct VkGeneratedCommandsMemoryRequirementsInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsMemoryRequirementsInfoEXT.html
-  struct GeneratedCommandsMemoryRequirementsInfoEXT
-  {
-    using NativeType = VkGeneratedCommandsMemoryRequirementsInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsMemoryRequirementsInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsMemoryRequirementsInfoEXT( IndirectExecutionSetEXT   indirectExecutionSet_   = {},
-                                                                     IndirectCommandsLayoutEXT indirectCommandsLayout_ = {},
-                                                                     uint32_t                  maxSequenceCount_       = {},
-                                                                     uint32_t                  maxDrawCount_           = {},
-                                                                     const void *              pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , indirectExecutionSet{ indirectExecutionSet_ }
-      , indirectCommandsLayout{ indirectCommandsLayout_ }
-      , maxSequenceCount{ maxSequenceCount_ }
-      , maxDrawCount{ maxDrawCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsMemoryRequirementsInfoEXT( GeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    GeneratedCommandsMemoryRequirementsInfoEXT( VkGeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : GeneratedCommandsMemoryRequirementsInfoEXT( *reinterpret_cast<GeneratedCommandsMemoryRequirementsInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    GeneratedCommandsMemoryRequirementsInfoEXT & operator=( GeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    GeneratedCommandsMemoryRequirementsInfoEXT & operator=( VkGeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<GeneratedCommandsMemoryRequirementsInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoEXT &
-      setIndirectExecutionSet( IndirectExecutionSetEXT indirectExecutionSet_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectExecutionSet = indirectExecutionSet_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoEXT &
-      setIndirectCommandsLayout( IndirectCommandsLayoutEXT indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectCommandsLayout = indirectCommandsLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoEXT & setMaxSequenceCount( uint32_t maxSequenceCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxSequenceCount = maxSequenceCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoEXT & setMaxDrawCount( uint32_t maxDrawCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxDrawCount = maxDrawCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkGeneratedCommandsMemoryRequirementsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsMemoryRequirementsInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkGeneratedCommandsMemoryRequirementsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsMemoryRequirementsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsMemoryRequirementsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsMemoryRequirementsInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, IndirectExecutionSetEXT const &, IndirectCommandsLayoutEXT const &, uint32_t const &, uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, indirectExecutionSet, indirectCommandsLayout, maxSequenceCount, maxDrawCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( GeneratedCommandsMemoryRequirementsInfoEXT const & ) const = default;
-#else
-    bool operator==( GeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( indirectExecutionSet == rhs.indirectExecutionSet ) &&
-             ( indirectCommandsLayout == rhs.indirectCommandsLayout ) && ( maxSequenceCount == rhs.maxSequenceCount ) && ( maxDrawCount == rhs.maxDrawCount );
-#  endif
-    }
-
-    bool operator!=( GeneratedCommandsMemoryRequirementsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType             sType                  = StructureType::eGeneratedCommandsMemoryRequirementsInfoEXT;
-    const void *              pNext                  = {};
-    IndirectExecutionSetEXT   indirectExecutionSet   = {};
-    IndirectCommandsLayoutEXT indirectCommandsLayout = {};
-    uint32_t                  maxSequenceCount       = {};
-    uint32_t                  maxDrawCount           = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsMemoryRequirementsInfoEXT>
-  {
-    using Type = GeneratedCommandsMemoryRequirementsInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eGeneratedCommandsMemoryRequirementsInfoEXT>
-  {
-    using Type = GeneratedCommandsMemoryRequirementsInfoEXT;
-  };
-
-  // wrapper struct for struct VkGeneratedCommandsMemoryRequirementsInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsMemoryRequirementsInfoNV.html
   struct GeneratedCommandsMemoryRequirementsInfoNV
   {
     using NativeType = VkGeneratedCommandsMemoryRequirementsInfoNV;
@@ -54053,17 +38919,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsMemoryRequirementsInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsMemoryRequirementsInfoNV( PipelineBindPoint        pipelineBindPoint_      = PipelineBindPoint::eGraphics,
-                                                                    Pipeline                 pipeline_               = {},
-                                                                    IndirectCommandsLayoutNV indirectCommandsLayout_ = {},
-                                                                    uint32_t                 maxSequencesCount_      = {},
-                                                                    const void *             pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , pipeline{ pipeline_ }
-      , indirectCommandsLayout{ indirectCommandsLayout_ }
-      , maxSequencesCount{ maxSequencesCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GeneratedCommandsMemoryRequirementsInfoNV(
+      VULKAN_HPP_NAMESPACE::PipelineBindPoint        pipelineBindPoint_      = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+      VULKAN_HPP_NAMESPACE::Pipeline                 pipeline_               = {},
+      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout_ = {},
+      uint32_t                                       maxSequencesCount_      = {},
+      const void *                                   pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , pipeline( pipeline_ )
+      , indirectCommandsLayout( indirectCommandsLayout_ )
+      , maxSequencesCount( maxSequencesCount_ )
     {
     }
 
@@ -54075,35 +38942,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     GeneratedCommandsMemoryRequirementsInfoNV & operator=( GeneratedCommandsMemoryRequirementsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GeneratedCommandsMemoryRequirementsInfoNV & operator=( VkGeneratedCommandsMemoryRequirementsInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GeneratedCommandsMemoryRequirementsInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GeneratedCommandsMemoryRequirementsInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV &
+      setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV & setPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       pipeline = pipeline_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsMemoryRequirementsInfoNV &
-      setIndirectCommandsLayout( IndirectCommandsLayoutNV indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
+      setIndirectCommandsLayout( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       indirectCommandsLayout = indirectCommandsLayout_;
       return *this;
@@ -54114,7 +38982,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxSequencesCount = maxSequencesCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGeneratedCommandsMemoryRequirementsInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -54126,18 +38994,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGeneratedCommandsMemoryRequirementsInfoNV *>( this );
     }
 
-    operator VkGeneratedCommandsMemoryRequirementsInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsMemoryRequirementsInfoNV *>( this );
-    }
-
-    operator VkGeneratedCommandsMemoryRequirementsInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsMemoryRequirementsInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineBindPoint const &, Pipeline const &, IndirectCommandsLayoutNV const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
+               VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineBindPoint, pipeline, indirectCommandsLayout, maxSequencesCount );
@@ -54164,276 +39031,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                  = StructureType::eGeneratedCommandsMemoryRequirementsInfoNV;
-    const void *             pNext                  = {};
-    PipelineBindPoint        pipelineBindPoint      = PipelineBindPoint::eGraphics;
-    Pipeline                 pipeline               = {};
-    IndirectCommandsLayoutNV indirectCommandsLayout = {};
-    uint32_t                 maxSequencesCount      = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                  = StructureType::eGeneratedCommandsMemoryRequirementsInfoNV;
+    const void *                                   pNext                  = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint        pipelineBindPoint      = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    VULKAN_HPP_NAMESPACE::Pipeline                 pipeline               = {};
+    VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV indirectCommandsLayout = {};
+    uint32_t                                       maxSequencesCount      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsMemoryRequirementsInfoNV>
-  {
-    using Type = GeneratedCommandsMemoryRequirementsInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGeneratedCommandsMemoryRequirementsInfoNV>
   {
     using Type = GeneratedCommandsMemoryRequirementsInfoNV;
   };
 
-  // wrapper struct for struct VkGeneratedCommandsPipelineInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsPipelineInfoEXT.html
-  struct GeneratedCommandsPipelineInfoEXT
-  {
-    using NativeType = VkGeneratedCommandsPipelineInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsPipelineInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsPipelineInfoEXT( Pipeline pipeline_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipeline{ pipeline_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsPipelineInfoEXT( GeneratedCommandsPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    GeneratedCommandsPipelineInfoEXT( VkGeneratedCommandsPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : GeneratedCommandsPipelineInfoEXT( *reinterpret_cast<GeneratedCommandsPipelineInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    GeneratedCommandsPipelineInfoEXT & operator=( GeneratedCommandsPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    GeneratedCommandsPipelineInfoEXT & operator=( VkGeneratedCommandsPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<GeneratedCommandsPipelineInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsPipelineInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsPipelineInfoEXT & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipeline = pipeline_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkGeneratedCommandsPipelineInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkGeneratedCommandsPipelineInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsPipelineInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkGeneratedCommandsPipelineInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsPipelineInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsPipelineInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsPipelineInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsPipelineInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipeline );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( GeneratedCommandsPipelineInfoEXT const & ) const = default;
-#else
-    bool operator==( GeneratedCommandsPipelineInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipeline == rhs.pipeline );
-#  endif
-    }
-
-    bool operator!=( GeneratedCommandsPipelineInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType    = StructureType::eGeneratedCommandsPipelineInfoEXT;
-    void *        pNext    = {};
-    Pipeline      pipeline = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsPipelineInfoEXT>
-  {
-    using Type = GeneratedCommandsPipelineInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eGeneratedCommandsPipelineInfoEXT>
-  {
-    using Type = GeneratedCommandsPipelineInfoEXT;
-  };
-
-  // wrapper struct for struct VkGeneratedCommandsShaderInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGeneratedCommandsShaderInfoEXT.html
-  struct GeneratedCommandsShaderInfoEXT
-  {
-    using NativeType = VkGeneratedCommandsShaderInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGeneratedCommandsShaderInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      GeneratedCommandsShaderInfoEXT( uint32_t shaderCount_ = {}, const ShaderEXT * pShaders_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCount{ shaderCount_ }
-      , pShaders{ pShaders_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR GeneratedCommandsShaderInfoEXT( GeneratedCommandsShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    GeneratedCommandsShaderInfoEXT( VkGeneratedCommandsShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : GeneratedCommandsShaderInfoEXT( *reinterpret_cast<GeneratedCommandsShaderInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GeneratedCommandsShaderInfoEXT( ArrayProxyNoTemporaries<const ShaderEXT> const & shaders_, void * pNext_ = nullptr )
-      : pNext( pNext_ ), shaderCount( static_cast<uint32_t>( shaders_.size() ) ), pShaders( shaders_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    GeneratedCommandsShaderInfoEXT & operator=( GeneratedCommandsShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    GeneratedCommandsShaderInfoEXT & operator=( VkGeneratedCommandsShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<GeneratedCommandsShaderInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsShaderInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsShaderInfoEXT & setShaderCount( uint32_t shaderCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderCount = shaderCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 GeneratedCommandsShaderInfoEXT & setPShaders( const ShaderEXT * pShaders_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pShaders = pShaders_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GeneratedCommandsShaderInfoEXT & setShaders( ArrayProxyNoTemporaries<const ShaderEXT> const & shaders_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderCount = static_cast<uint32_t>( shaders_.size() );
-      pShaders    = shaders_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkGeneratedCommandsShaderInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkGeneratedCommandsShaderInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsShaderInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkGeneratedCommandsShaderInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsShaderInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGeneratedCommandsShaderInfoEXT *>( this );
-    }
-
-    operator VkGeneratedCommandsShaderInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGeneratedCommandsShaderInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, const ShaderEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderCount, pShaders );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( GeneratedCommandsShaderInfoEXT const & ) const = default;
-#else
-    bool operator==( GeneratedCommandsShaderInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderCount == rhs.shaderCount ) && ( pShaders == rhs.pShaders );
-#  endif
-    }
-
-    bool operator!=( GeneratedCommandsShaderInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType     sType       = StructureType::eGeneratedCommandsShaderInfoEXT;
-    void *            pNext       = {};
-    uint32_t          shaderCount = {};
-    const ShaderEXT * pShaders    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGeneratedCommandsShaderInfoEXT>
-  {
-    using Type = GeneratedCommandsShaderInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eGeneratedCommandsShaderInfoEXT>
-  {
-    using Type = GeneratedCommandsShaderInfoEXT;
-  };
-
-  // wrapper struct for struct VkLatencyTimingsFrameReportNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencyTimingsFrameReportNV.html
   struct LatencyTimingsFrameReportNV
   {
     using NativeType = VkLatencyTimingsFrameReportNV;
@@ -54441,37 +39052,37 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLatencyTimingsFrameReportNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR LatencyTimingsFrameReportNV( uint64_t presentID_                = {},
-                                                      uint64_t inputSampleTimeUs_        = {},
-                                                      uint64_t simStartTimeUs_           = {},
-                                                      uint64_t simEndTimeUs_             = {},
-                                                      uint64_t renderSubmitStartTimeUs_  = {},
-                                                      uint64_t renderSubmitEndTimeUs_    = {},
-                                                      uint64_t presentStartTimeUs_       = {},
-                                                      uint64_t presentEndTimeUs_         = {},
-                                                      uint64_t driverStartTimeUs_        = {},
-                                                      uint64_t driverEndTimeUs_          = {},
-                                                      uint64_t osRenderQueueStartTimeUs_ = {},
-                                                      uint64_t osRenderQueueEndTimeUs_   = {},
-                                                      uint64_t gpuRenderStartTimeUs_     = {},
-                                                      uint64_t gpuRenderEndTimeUs_       = {},
-                                                      void *   pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentID{ presentID_ }
-      , inputSampleTimeUs{ inputSampleTimeUs_ }
-      , simStartTimeUs{ simStartTimeUs_ }
-      , simEndTimeUs{ simEndTimeUs_ }
-      , renderSubmitStartTimeUs{ renderSubmitStartTimeUs_ }
-      , renderSubmitEndTimeUs{ renderSubmitEndTimeUs_ }
-      , presentStartTimeUs{ presentStartTimeUs_ }
-      , presentEndTimeUs{ presentEndTimeUs_ }
-      , driverStartTimeUs{ driverStartTimeUs_ }
-      , driverEndTimeUs{ driverEndTimeUs_ }
-      , osRenderQueueStartTimeUs{ osRenderQueueStartTimeUs_ }
-      , osRenderQueueEndTimeUs{ osRenderQueueEndTimeUs_ }
-      , gpuRenderStartTimeUs{ gpuRenderStartTimeUs_ }
-      , gpuRenderEndTimeUs{ gpuRenderEndTimeUs_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR LatencyTimingsFrameReportNV( uint64_t     presentID_                = {},
+                                                      uint64_t     inputSampleTimeUs_        = {},
+                                                      uint64_t     simStartTimeUs_           = {},
+                                                      uint64_t     simEndTimeUs_             = {},
+                                                      uint64_t     renderSubmitStartTimeUs_  = {},
+                                                      uint64_t     renderSubmitEndTimeUs_    = {},
+                                                      uint64_t     presentStartTimeUs_       = {},
+                                                      uint64_t     presentEndTimeUs_         = {},
+                                                      uint64_t     driverStartTimeUs_        = {},
+                                                      uint64_t     driverEndTimeUs_          = {},
+                                                      uint64_t     osRenderQueueStartTimeUs_ = {},
+                                                      uint64_t     osRenderQueueEndTimeUs_   = {},
+                                                      uint64_t     gpuRenderStartTimeUs_     = {},
+                                                      uint64_t     gpuRenderEndTimeUs_       = {},
+                                                      const void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentID( presentID_ )
+      , inputSampleTimeUs( inputSampleTimeUs_ )
+      , simStartTimeUs( simStartTimeUs_ )
+      , simEndTimeUs( simEndTimeUs_ )
+      , renderSubmitStartTimeUs( renderSubmitStartTimeUs_ )
+      , renderSubmitEndTimeUs( renderSubmitEndTimeUs_ )
+      , presentStartTimeUs( presentStartTimeUs_ )
+      , presentEndTimeUs( presentEndTimeUs_ )
+      , driverStartTimeUs( driverStartTimeUs_ )
+      , driverEndTimeUs( driverEndTimeUs_ )
+      , osRenderQueueStartTimeUs( osRenderQueueStartTimeUs_ )
+      , osRenderQueueEndTimeUs( osRenderQueueEndTimeUs_ )
+      , gpuRenderStartTimeUs( gpuRenderStartTimeUs_ )
+      , gpuRenderEndTimeUs( gpuRenderEndTimeUs_ )
     {
     }
 
@@ -54483,11 +39094,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     LatencyTimingsFrameReportNV & operator=( LatencyTimingsFrameReportNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LatencyTimingsFrameReportNV & operator=( VkLatencyTimingsFrameReportNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LatencyTimingsFrameReportNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV const *>( &rhs );
       return *this;
     }
 
@@ -54501,19 +39112,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLatencyTimingsFrameReportNV *>( this );
     }
 
-    operator VkLatencyTimingsFrameReportNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLatencyTimingsFrameReportNV *>( this );
-    }
-
-    operator VkLatencyTimingsFrameReportNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLatencyTimingsFrameReportNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
                uint64_t const &,
                uint64_t const &,
                uint64_t const &,
@@ -54528,6 +39132,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint64_t const &,
                uint64_t const &,
                uint64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -54573,39 +39178,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::eLatencyTimingsFrameReportNV;
-    void *        pNext                    = {};
-    uint64_t      presentID                = {};
-    uint64_t      inputSampleTimeUs        = {};
-    uint64_t      simStartTimeUs           = {};
-    uint64_t      simEndTimeUs             = {};
-    uint64_t      renderSubmitStartTimeUs  = {};
-    uint64_t      renderSubmitEndTimeUs    = {};
-    uint64_t      presentStartTimeUs       = {};
-    uint64_t      presentEndTimeUs         = {};
-    uint64_t      driverStartTimeUs        = {};
-    uint64_t      driverEndTimeUs          = {};
-    uint64_t      osRenderQueueStartTimeUs = {};
-    uint64_t      osRenderQueueEndTimeUs   = {};
-    uint64_t      gpuRenderStartTimeUs     = {};
-    uint64_t      gpuRenderEndTimeUs       = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::eLatencyTimingsFrameReportNV;
+    const void *                        pNext                    = {};
+    uint64_t                            presentID                = {};
+    uint64_t                            inputSampleTimeUs        = {};
+    uint64_t                            simStartTimeUs           = {};
+    uint64_t                            simEndTimeUs             = {};
+    uint64_t                            renderSubmitStartTimeUs  = {};
+    uint64_t                            renderSubmitEndTimeUs    = {};
+    uint64_t                            presentStartTimeUs       = {};
+    uint64_t                            presentEndTimeUs         = {};
+    uint64_t                            driverStartTimeUs        = {};
+    uint64_t                            driverEndTimeUs          = {};
+    uint64_t                            osRenderQueueStartTimeUs = {};
+    uint64_t                            osRenderQueueEndTimeUs   = {};
+    uint64_t                            gpuRenderStartTimeUs     = {};
+    uint64_t                            gpuRenderEndTimeUs       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLatencyTimingsFrameReportNV>
-  {
-    using Type = LatencyTimingsFrameReportNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLatencyTimingsFrameReportNV>
   {
     using Type = LatencyTimingsFrameReportNV;
   };
 
-  // wrapper struct for struct VkGetLatencyMarkerInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGetLatencyMarkerInfoNV.html
   struct GetLatencyMarkerInfoNV
   {
     using NativeType = VkGetLatencyMarkerInfoNV;
@@ -54613,12 +39209,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGetLatencyMarkerInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      GetLatencyMarkerInfoNV( uint32_t timingCount_ = {}, LatencyTimingsFrameReportNV * pTimings_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , timingCount{ timingCount_ }
-      , pTimings{ pTimings_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GetLatencyMarkerInfoNV( uint32_t                                            timingCount_ = {},
+                                                 VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV * pTimings_    = {},
+                                                 const void *                                        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , timingCount( timingCount_ )
+      , pTimings( pTimings_ )
     {
     }
 
@@ -54630,22 +39227,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GetLatencyMarkerInfoNV( ArrayProxyNoTemporaries<LatencyTimingsFrameReportNV> const & timings_, const void * pNext_ = nullptr )
+    GetLatencyMarkerInfoNV( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV> const & timings_,
+                            const void *                                                                                             pNext_ = nullptr )
       : pNext( pNext_ ), timingCount( static_cast<uint32_t>( timings_.size() ) ), pTimings( timings_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     GetLatencyMarkerInfoNV & operator=( GetLatencyMarkerInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GetLatencyMarkerInfoNV & operator=( VkGetLatencyMarkerInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GetLatencyMarkerInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GetLatencyMarkerInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GetLatencyMarkerInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -54658,21 +39256,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GetLatencyMarkerInfoNV & setPTimings( LatencyTimingsFrameReportNV * pTimings_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GetLatencyMarkerInfoNV & setPTimings( VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV * pTimings_ ) VULKAN_HPP_NOEXCEPT
     {
       pTimings = pTimings_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GetLatencyMarkerInfoNV & setTimings( ArrayProxyNoTemporaries<LatencyTimingsFrameReportNV> const & timings_ ) VULKAN_HPP_NOEXCEPT
+    GetLatencyMarkerInfoNV &
+      setTimings( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV> const & timings_ ) VULKAN_HPP_NOEXCEPT
     {
       timingCount = static_cast<uint32_t>( timings_.size() );
       pTimings    = timings_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGetLatencyMarkerInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -54684,18 +39283,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGetLatencyMarkerInfoNV *>( this );
     }
 
-    operator VkGetLatencyMarkerInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGetLatencyMarkerInfoNV *>( this );
-    }
-
-    operator VkGetLatencyMarkerInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGetLatencyMarkerInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, LatencyTimingsFrameReportNV * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, timingCount, pTimings );
     }
@@ -54720,38 +39314,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType       = StructureType::eGetLatencyMarkerInfoNV;
-    const void *                  pNext       = {};
-    uint32_t                      timingCount = {};
-    LatencyTimingsFrameReportNV * pTimings    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType       = StructureType::eGetLatencyMarkerInfoNV;
+    const void *                                        pNext       = {};
+    uint32_t                                            timingCount = {};
+    VULKAN_HPP_NAMESPACE::LatencyTimingsFrameReportNV * pTimings    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGetLatencyMarkerInfoNV>
-  {
-    using Type = GetLatencyMarkerInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGetLatencyMarkerInfoNV>
   {
     using Type = GetLatencyMarkerInfoNV;
   };
 
-  // wrapper struct for struct VkVertexInputBindingDescription, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputBindingDescription.html
   struct VertexInputBindingDescription
   {
     using NativeType = VkVertexInputBindingDescription;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
-      VertexInputBindingDescription( uint32_t binding_ = {}, uint32_t stride_ = {}, VertexInputRate inputRate_ = VertexInputRate::eVertex ) VULKAN_HPP_NOEXCEPT
-      : binding{ binding_ }
-      , stride{ stride_ }
-      , inputRate{ inputRate_ }
+      VertexInputBindingDescription( uint32_t                              binding_   = {},
+                                     uint32_t                              stride_    = {},
+                                     VULKAN_HPP_NAMESPACE::VertexInputRate inputRate_ = VULKAN_HPP_NAMESPACE::VertexInputRate::eVertex ) VULKAN_HPP_NOEXCEPT
+      : binding( binding_ )
+      , stride( stride_ )
+      , inputRate( inputRate_ )
     {
     }
 
@@ -54763,15 +39349,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VertexInputBindingDescription & operator=( VertexInputBindingDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VertexInputBindingDescription & operator=( VkVertexInputBindingDescription const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VertexInputBindingDescription const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VertexInputBindingDescription const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription & setBinding( uint32_t binding_ ) VULKAN_HPP_NOEXCEPT
     {
       binding = binding_;
@@ -54784,12 +39370,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription & setInputRate( VertexInputRate inputRate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription & setInputRate( VULKAN_HPP_NAMESPACE::VertexInputRate inputRate_ ) VULKAN_HPP_NOEXCEPT
     {
       inputRate = inputRate_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVertexInputBindingDescription const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -54801,18 +39387,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVertexInputBindingDescription *>( this );
     }
 
-    operator VkVertexInputBindingDescription const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVertexInputBindingDescription *>( this );
-    }
-
-    operator VkVertexInputBindingDescription *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVertexInputBindingDescription *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, VertexInputRate const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::VertexInputRate const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( binding, stride, inputRate );
     }
@@ -54837,34 +39418,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t        binding   = {};
-    uint32_t        stride    = {};
-    VertexInputRate inputRate = VertexInputRate::eVertex;
+    uint32_t                              binding   = {};
+    uint32_t                              stride    = {};
+    VULKAN_HPP_NAMESPACE::VertexInputRate inputRate = VULKAN_HPP_NAMESPACE::VertexInputRate::eVertex;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVertexInputBindingDescription>
-  {
-    using Type = VertexInputBindingDescription;
-  };
-#endif
-
-  // wrapper struct for struct VkVertexInputAttributeDescription, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputAttributeDescription.html
   struct VertexInputAttributeDescription
   {
     using NativeType = VkVertexInputAttributeDescription;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VertexInputAttributeDescription( uint32_t location_ = {},
-                                                          uint32_t binding_  = {},
-                                                          Format   format_   = Format::eUndefined,
-                                                          uint32_t offset_   = {} ) VULKAN_HPP_NOEXCEPT
-      : location{ location_ }
-      , binding{ binding_ }
-      , format{ format_ }
-      , offset{ offset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VertexInputAttributeDescription( uint32_t                     location_ = {},
+                                                          uint32_t                     binding_  = {},
+                                                          VULKAN_HPP_NAMESPACE::Format format_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                          uint32_t                     offset_   = {} ) VULKAN_HPP_NOEXCEPT
+      : location( location_ )
+      , binding( binding_ )
+      , format( format_ )
+      , offset( offset_ )
     {
     }
 
@@ -54876,15 +39447,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VertexInputAttributeDescription & operator=( VertexInputAttributeDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VertexInputAttributeDescription & operator=( VkVertexInputAttributeDescription const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VertexInputAttributeDescription const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription & setLocation( uint32_t location_ ) VULKAN_HPP_NOEXCEPT
     {
       location = location_;
@@ -54897,7 +39468,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
@@ -54908,7 +39479,7 @@ namespace VULKAN_HPP_NAMESPACE
       offset = offset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVertexInputAttributeDescription const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -54920,18 +39491,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVertexInputAttributeDescription *>( this );
     }
 
-    operator VkVertexInputAttributeDescription const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVertexInputAttributeDescription *>( this );
-    }
-
-    operator VkVertexInputAttributeDescription *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVertexInputAttributeDescription *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, Format const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::Format const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( location, binding, format, offset );
     }
@@ -54956,22 +39522,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t location = {};
-    uint32_t binding  = {};
-    Format   format   = Format::eUndefined;
-    uint32_t offset   = {};
+    uint32_t                     location = {};
+    uint32_t                     binding  = {};
+    VULKAN_HPP_NAMESPACE::Format format   = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint32_t                     offset   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVertexInputAttributeDescription>
-  {
-    using Type = VertexInputAttributeDescription;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineVertexInputStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineVertexInputStateCreateInfo.html
   struct PipelineVertexInputStateCreateInfo
   {
     using NativeType = VkPipelineVertexInputStateCreateInfo;
@@ -54979,19 +39535,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineVertexInputStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineVertexInputStateCreateInfo( PipelineVertexInputStateCreateFlags     flags_                           = {},
-                                                             uint32_t                                vertexBindingDescriptionCount_   = {},
-                                                             const VertexInputBindingDescription *   pVertexBindingDescriptions_      = {},
-                                                             uint32_t                                vertexAttributeDescriptionCount_ = {},
-                                                             const VertexInputAttributeDescription * pVertexAttributeDescriptions_    = {},
-                                                             const void *                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , vertexBindingDescriptionCount{ vertexBindingDescriptionCount_ }
-      , pVertexBindingDescriptions{ pVertexBindingDescriptions_ }
-      , vertexAttributeDescriptionCount{ vertexAttributeDescriptionCount_ }
-      , pVertexAttributeDescriptions{ pVertexAttributeDescriptions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineVertexInputStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateFlags   flags_                           = {},
+                                                             uint32_t                                                    vertexBindingDescriptionCount_   = {},
+                                                             const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription * pVertexBindingDescriptions_      = {},
+                                                             uint32_t                                                    vertexAttributeDescriptionCount_ = {},
+                                                             const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription * pVertexAttributeDescriptions_  = {},
+                                                             const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , vertexBindingDescriptionCount( vertexBindingDescriptionCount_ )
+      , pVertexBindingDescriptions( pVertexBindingDescriptions_ )
+      , vertexAttributeDescriptionCount( vertexAttributeDescriptionCount_ )
+      , pVertexAttributeDescriptions( pVertexAttributeDescriptions_ )
     {
     }
 
@@ -55003,10 +39559,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineVertexInputStateCreateInfo( PipelineVertexInputStateCreateFlags                                    flags_,
-                                        ArrayProxyNoTemporaries<const VertexInputBindingDescription> const &   vertexBindingDescriptions_,
-                                        ArrayProxyNoTemporaries<const VertexInputAttributeDescription> const & vertexAttributeDescriptions_ = {},
-                                        const void *                                                           pNext_                       = nullptr )
+    PipelineVertexInputStateCreateInfo(
+      VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateFlags                                                          flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription> const &   vertexBindingDescriptions_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription> const & vertexAttributeDescriptions_ = {},
+      const void *                                                                                                       pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , vertexBindingDescriptionCount( static_cast<uint32_t>( vertexBindingDescriptions_.size() ) )
@@ -55018,22 +39575,23 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineVertexInputStateCreateInfo & operator=( PipelineVertexInputStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineVertexInputStateCreateInfo & operator=( VkPipelineVertexInputStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineVertexInputStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputStateCreateInfo & setFlags( PipelineVertexInputStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -55046,15 +39604,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputStateCreateInfo &
-      setPVertexBindingDescriptions( const VertexInputBindingDescription * pVertexBindingDescriptions_ ) VULKAN_HPP_NOEXCEPT
+      setPVertexBindingDescriptions( const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription * pVertexBindingDescriptions_ ) VULKAN_HPP_NOEXCEPT
     {
       pVertexBindingDescriptions = pVertexBindingDescriptions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineVertexInputStateCreateInfo &
-      setVertexBindingDescriptions( ArrayProxyNoTemporaries<const VertexInputBindingDescription> const & vertexBindingDescriptions_ ) VULKAN_HPP_NOEXCEPT
+    PipelineVertexInputStateCreateInfo & setVertexBindingDescriptions(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription> const & vertexBindingDescriptions_ )
+      VULKAN_HPP_NOEXCEPT
     {
       vertexBindingDescriptionCount = static_cast<uint32_t>( vertexBindingDescriptions_.size() );
       pVertexBindingDescriptions    = vertexBindingDescriptions_.data();
@@ -55070,22 +39629,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputStateCreateInfo &
-      setPVertexAttributeDescriptions( const VertexInputAttributeDescription * pVertexAttributeDescriptions_ ) VULKAN_HPP_NOEXCEPT
+      setPVertexAttributeDescriptions( const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription * pVertexAttributeDescriptions_ ) VULKAN_HPP_NOEXCEPT
     {
       pVertexAttributeDescriptions = pVertexAttributeDescriptions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineVertexInputStateCreateInfo &
-      setVertexAttributeDescriptions( ArrayProxyNoTemporaries<const VertexInputAttributeDescription> const & vertexAttributeDescriptions_ ) VULKAN_HPP_NOEXCEPT
+    PipelineVertexInputStateCreateInfo & setVertexAttributeDescriptions(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription> const & vertexAttributeDescriptions_ )
+      VULKAN_HPP_NOEXCEPT
     {
       vertexAttributeDescriptionCount = static_cast<uint32_t>( vertexAttributeDescriptions_.size() );
       pVertexAttributeDescriptions    = vertexAttributeDescriptions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineVertexInputStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55097,24 +39657,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineVertexInputStateCreateInfo *>( this );
     }
 
-    operator VkPipelineVertexInputStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineVertexInputStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineVertexInputStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineVertexInputStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineVertexInputStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateFlags const &,
                uint32_t const &,
-               const VertexInputBindingDescription * const &,
+               const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription * const &,
                uint32_t const &,
-               const VertexInputAttributeDescription * const &>
+               const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -55143,31 +39697,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType                           = StructureType::ePipelineVertexInputStateCreateInfo;
-    const void *                            pNext                           = {};
-    PipelineVertexInputStateCreateFlags     flags                           = {};
-    uint32_t                                vertexBindingDescriptionCount   = {};
-    const VertexInputBindingDescription *   pVertexBindingDescriptions      = {};
-    uint32_t                                vertexAttributeDescriptionCount = {};
-    const VertexInputAttributeDescription * pVertexAttributeDescriptions    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                           sType                           = StructureType::ePipelineVertexInputStateCreateInfo;
+    const void *                                                  pNext                           = {};
+    VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateFlags     flags                           = {};
+    uint32_t                                                      vertexBindingDescriptionCount   = {};
+    const VULKAN_HPP_NAMESPACE::VertexInputBindingDescription *   pVertexBindingDescriptions      = {};
+    uint32_t                                                      vertexAttributeDescriptionCount = {};
+    const VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription * pVertexAttributeDescriptions    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineVertexInputStateCreateInfo>
-  {
-    using Type = PipelineVertexInputStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineVertexInputStateCreateInfo>
   {
     using Type = PipelineVertexInputStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineInputAssemblyStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineInputAssemblyStateCreateInfo.html
   struct PipelineInputAssemblyStateCreateInfo
   {
     using NativeType = VkPipelineInputAssemblyStateCreateInfo;
@@ -55175,15 +39719,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineInputAssemblyStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineInputAssemblyStateCreateInfo( PipelineInputAssemblyStateCreateFlags flags_                  = {},
-                                                               PrimitiveTopology                     topology_               = PrimitiveTopology::ePointList,
-                                                               Bool32                                primitiveRestartEnable_ = {},
-                                                               const void *                          pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , topology{ topology_ }
-      , primitiveRestartEnable{ primitiveRestartEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PipelineInputAssemblyStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateFlags flags_ = {},
+                                            VULKAN_HPP_NAMESPACE::PrimitiveTopology topology_ = VULKAN_HPP_NAMESPACE::PrimitiveTopology::ePointList,
+                                            VULKAN_HPP_NAMESPACE::Bool32            primitiveRestartEnable_ = {},
+                                            const void *                            pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , topology( topology_ )
+      , primitiveRestartEnable( primitiveRestartEnable_ )
     {
     }
 
@@ -55195,39 +39740,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineInputAssemblyStateCreateInfo & operator=( PipelineInputAssemblyStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineInputAssemblyStateCreateInfo & operator=( VkPipelineInputAssemblyStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineInputAssemblyStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo & setFlags( PipelineInputAssemblyStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo & setTopology( PrimitiveTopology topology_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo & setTopology( VULKAN_HPP_NAMESPACE::PrimitiveTopology topology_ ) VULKAN_HPP_NOEXCEPT
     {
       topology = topology_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo & setPrimitiveRestartEnable( Bool32 primitiveRestartEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineInputAssemblyStateCreateInfo &
+      setPrimitiveRestartEnable( VULKAN_HPP_NAMESPACE::Bool32 primitiveRestartEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveRestartEnable = primitiveRestartEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineInputAssemblyStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55239,18 +39786,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineInputAssemblyStateCreateInfo *>( this );
     }
 
-    operator VkPipelineInputAssemblyStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineInputAssemblyStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineInputAssemblyStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineInputAssemblyStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineInputAssemblyStateCreateFlags const &, PrimitiveTopology const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PrimitiveTopology const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, topology, primitiveRestartEnable );
@@ -55277,29 +39822,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                  = StructureType::ePipelineInputAssemblyStateCreateInfo;
-    const void *                          pNext                  = {};
-    PipelineInputAssemblyStateCreateFlags flags                  = {};
-    PrimitiveTopology                     topology               = PrimitiveTopology::ePointList;
-    Bool32                                primitiveRestartEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType                  = StructureType::ePipelineInputAssemblyStateCreateInfo;
+    const void *                                                pNext                  = {};
+    VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateFlags flags                  = {};
+    VULKAN_HPP_NAMESPACE::PrimitiveTopology                     topology               = VULKAN_HPP_NAMESPACE::PrimitiveTopology::ePointList;
+    VULKAN_HPP_NAMESPACE::Bool32                                primitiveRestartEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineInputAssemblyStateCreateInfo>
-  {
-    using Type = PipelineInputAssemblyStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineInputAssemblyStateCreateInfo>
   {
     using Type = PipelineInputAssemblyStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineTessellationStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineTessellationStateCreateInfo.html
   struct PipelineTessellationStateCreateInfo
   {
     using NativeType = VkPipelineTessellationStateCreateInfo;
@@ -55307,13 +39842,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineTessellationStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineTessellationStateCreateInfo( PipelineTessellationStateCreateFlags flags_              = {},
-                                                              uint32_t                             patchControlPoints_ = {},
-                                                              const void *                         pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , patchControlPoints{ patchControlPoints_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineTessellationStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateFlags flags_              = {},
+                                                              uint32_t                                                   patchControlPoints_ = {},
+                                                              const void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , patchControlPoints( patchControlPoints_ )
     {
     }
 
@@ -55325,22 +39860,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineTessellationStateCreateInfo & operator=( PipelineTessellationStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineTessellationStateCreateInfo & operator=( VkPipelineTessellationStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineTessellationStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineTessellationStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineTessellationStateCreateInfo & setFlags( PipelineTessellationStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineTessellationStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -55351,7 +39887,7 @@ namespace VULKAN_HPP_NAMESPACE
       patchControlPoints = patchControlPoints_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineTessellationStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55363,18 +39899,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineTessellationStateCreateInfo *>( this );
     }
 
-    operator VkPipelineTessellationStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineTessellationStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineTessellationStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineTessellationStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineTessellationStateCreateFlags const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateFlags const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, patchControlPoints );
     }
@@ -55399,28 +39933,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType              = StructureType::ePipelineTessellationStateCreateInfo;
-    const void *                         pNext              = {};
-    PipelineTessellationStateCreateFlags flags              = {};
-    uint32_t                             patchControlPoints = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType              = StructureType::ePipelineTessellationStateCreateInfo;
+    const void *                                               pNext              = {};
+    VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateFlags flags              = {};
+    uint32_t                                                   patchControlPoints = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineTessellationStateCreateInfo>
-  {
-    using Type = PipelineTessellationStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineTessellationStateCreateInfo>
   {
     using Type = PipelineTessellationStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineViewportStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportStateCreateInfo.html
   struct PipelineViewportStateCreateInfo
   {
     using NativeType = VkPipelineViewportStateCreateInfo;
@@ -55428,19 +39952,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportStateCreateInfo( PipelineViewportStateCreateFlags flags_         = {},
-                                                          uint32_t                         viewportCount_ = {},
-                                                          const Viewport *                 pViewports_    = {},
-                                                          uint32_t                         scissorCount_  = {},
-                                                          const Rect2D *                   pScissors_     = {},
-                                                          const void *                     pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , viewportCount{ viewportCount_ }
-      , pViewports{ pViewports_ }
-      , scissorCount{ scissorCount_ }
-      , pScissors{ pScissors_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateFlags flags_         = {},
+                                                          uint32_t                                               viewportCount_ = {},
+                                                          const VULKAN_HPP_NAMESPACE::Viewport *                 pViewports_    = {},
+                                                          uint32_t                                               scissorCount_  = {},
+                                                          const VULKAN_HPP_NAMESPACE::Rect2D *                   pScissors_     = {},
+                                                          const void *                                           pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , viewportCount( viewportCount_ )
+      , pViewports( pViewports_ )
+      , scissorCount( scissorCount_ )
+      , pScissors( pScissors_ )
     {
     }
 
@@ -55452,10 +39976,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportStateCreateInfo( PipelineViewportStateCreateFlags                flags_,
-                                     ArrayProxyNoTemporaries<const Viewport> const & viewports_,
-                                     ArrayProxyNoTemporaries<const Rect2D> const &   scissors_ = {},
-                                     const void *                                    pNext_    = nullptr )
+    PipelineViewportStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateFlags                                      flags_,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports_,
+                                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const &   scissors_ = {},
+                                     const void *                                                                                pNext_    = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , viewportCount( static_cast<uint32_t>( viewports_.size() ) )
@@ -55467,22 +39991,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineViewportStateCreateInfo & operator=( PipelineViewportStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportStateCreateInfo & operator=( VkPipelineViewportStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setFlags( PipelineViewportStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -55494,14 +40018,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setPViewports( const Viewport * pViewports_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setPViewports( const VULKAN_HPP_NAMESPACE::Viewport * pViewports_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewports = pViewports_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportStateCreateInfo & setViewports( ArrayProxyNoTemporaries<const Viewport> const & viewports_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportStateCreateInfo &
+      setViewports( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Viewport> const & viewports_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportCount = static_cast<uint32_t>( viewports_.size() );
       pViewports    = viewports_.data();
@@ -55515,21 +40040,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setPScissors( const Rect2D * pScissors_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportStateCreateInfo & setPScissors( const VULKAN_HPP_NAMESPACE::Rect2D * pScissors_ ) VULKAN_HPP_NOEXCEPT
     {
       pScissors = pScissors_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportStateCreateInfo & setScissors( ArrayProxyNoTemporaries<const Rect2D> const & scissors_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportStateCreateInfo &
+      setScissors( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & scissors_ ) VULKAN_HPP_NOEXCEPT
     {
       scissorCount = static_cast<uint32_t>( scissors_.size() );
       pScissors    = scissors_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55541,24 +40067,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportStateCreateInfo *>( this );
     }
 
-    operator VkPipelineViewportStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineViewportStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineViewportStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateFlags const &,
                uint32_t const &,
-               const Viewport * const &,
+               const VULKAN_HPP_NAMESPACE::Viewport * const &,
                uint32_t const &,
-               const Rect2D * const &>
+               const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, viewportCount, pViewports, scissorCount, pScissors );
@@ -55585,31 +40105,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType         = StructureType::ePipelineViewportStateCreateInfo;
-    const void *                     pNext         = {};
-    PipelineViewportStateCreateFlags flags         = {};
-    uint32_t                         viewportCount = {};
-    const Viewport *                 pViewports    = {};
-    uint32_t                         scissorCount  = {};
-    const Rect2D *                   pScissors     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType         = StructureType::ePipelineViewportStateCreateInfo;
+    const void *                                           pNext         = {};
+    VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateFlags flags         = {};
+    uint32_t                                               viewportCount = {};
+    const VULKAN_HPP_NAMESPACE::Viewport *                 pViewports    = {};
+    uint32_t                                               scissorCount  = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D *                   pScissors     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportStateCreateInfo>
-  {
-    using Type = PipelineViewportStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportStateCreateInfo>
   {
     using Type = PipelineViewportStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationStateCreateInfo.html
   struct PipelineRasterizationStateCreateInfo
   {
     using NativeType = VkPipelineRasterizationStateCreateInfo;
@@ -55617,31 +40127,31 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateCreateInfo( PipelineRasterizationStateCreateFlags flags_                   = {},
-                                                               Bool32                                depthClampEnable_        = {},
-                                                               Bool32                                rasterizerDiscardEnable_ = {},
-                                                               PolygonMode                           polygonMode_             = PolygonMode::eFill,
-                                                               CullModeFlags                         cullMode_                = {},
-                                                               FrontFace                             frontFace_               = FrontFace::eCounterClockwise,
-                                                               Bool32                                depthBiasEnable_         = {},
-                                                               float                                 depthBiasConstantFactor_ = {},
-                                                               float                                 depthBiasClamp_          = {},
-                                                               float                                 depthBiasSlopeFactor_    = {},
-                                                               float                                 lineWidth_               = {},
-                                                               const void *                          pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , depthClampEnable{ depthClampEnable_ }
-      , rasterizerDiscardEnable{ rasterizerDiscardEnable_ }
-      , polygonMode{ polygonMode_ }
-      , cullMode{ cullMode_ }
-      , frontFace{ frontFace_ }
-      , depthBiasEnable{ depthBiasEnable_ }
-      , depthBiasConstantFactor{ depthBiasConstantFactor_ }
-      , depthBiasClamp{ depthBiasClamp_ }
-      , depthBiasSlopeFactor{ depthBiasSlopeFactor_ }
-      , lineWidth{ lineWidth_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateFlags flags_                   = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32                                depthClampEnable_        = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32                                rasterizerDiscardEnable_ = {},
+                                                               VULKAN_HPP_NAMESPACE::PolygonMode   polygonMode_ = VULKAN_HPP_NAMESPACE::PolygonMode::eFill,
+                                                               VULKAN_HPP_NAMESPACE::CullModeFlags cullMode_    = {},
+                                                               VULKAN_HPP_NAMESPACE::FrontFace frontFace_ = VULKAN_HPP_NAMESPACE::FrontFace::eCounterClockwise,
+                                                               VULKAN_HPP_NAMESPACE::Bool32    depthBiasEnable_         = {},
+                                                               float                           depthBiasConstantFactor_ = {},
+                                                               float                           depthBiasClamp_          = {},
+                                                               float                           depthBiasSlopeFactor_    = {},
+                                                               float                           lineWidth_               = {},
+                                                               const void *                    pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , depthClampEnable( depthClampEnable_ )
+      , rasterizerDiscardEnable( rasterizerDiscardEnable_ )
+      , polygonMode( polygonMode_ )
+      , cullMode( cullMode_ )
+      , frontFace( frontFace_ )
+      , depthBiasEnable( depthBiasEnable_ )
+      , depthBiasConstantFactor( depthBiasConstantFactor_ )
+      , depthBiasClamp( depthBiasClamp_ )
+      , depthBiasSlopeFactor( depthBiasSlopeFactor_ )
+      , lineWidth( lineWidth_ )
     {
     }
 
@@ -55653,58 +40163,60 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineRasterizationStateCreateInfo & operator=( PipelineRasterizationStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationStateCreateInfo & operator=( VkPipelineRasterizationStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setFlags( PipelineRasterizationStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setDepthClampEnable( Bool32 depthClampEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setDepthClampEnable( VULKAN_HPP_NAMESPACE::Bool32 depthClampEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClampEnable = depthClampEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setRasterizerDiscardEnable( Bool32 rasterizerDiscardEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo &
+      setRasterizerDiscardEnable( VULKAN_HPP_NAMESPACE::Bool32 rasterizerDiscardEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizerDiscardEnable = rasterizerDiscardEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setPolygonMode( PolygonMode polygonMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setPolygonMode( VULKAN_HPP_NAMESPACE::PolygonMode polygonMode_ ) VULKAN_HPP_NOEXCEPT
     {
       polygonMode = polygonMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setCullMode( CullModeFlags cullMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setCullMode( VULKAN_HPP_NAMESPACE::CullModeFlags cullMode_ ) VULKAN_HPP_NOEXCEPT
     {
       cullMode = cullMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setFrontFace( FrontFace frontFace_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setFrontFace( VULKAN_HPP_NAMESPACE::FrontFace frontFace_ ) VULKAN_HPP_NOEXCEPT
     {
       frontFace = frontFace_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setDepthBiasEnable( Bool32 depthBiasEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateCreateInfo & setDepthBiasEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBiasEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasEnable = depthBiasEnable_;
       return *this;
@@ -55733,7 +40245,7 @@ namespace VULKAN_HPP_NAMESPACE
       lineWidth = lineWidth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55745,30 +40257,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationStateCreateInfo *>( this );
     }
 
-    operator VkPipelineRasterizationStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineRasterizationStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineRasterizationStateCreateFlags const &,
-               Bool32 const &,
-               Bool32 const &,
-               PolygonMode const &,
-               CullModeFlags const &,
-               FrontFace const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PolygonMode const &,
+               VULKAN_HPP_NAMESPACE::CullModeFlags const &,
+               VULKAN_HPP_NAMESPACE::FrontFace const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                float const &,
                float const &,
                float const &,
                float const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -55809,37 +40315,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                   = StructureType::ePipelineRasterizationStateCreateInfo;
-    const void *                          pNext                   = {};
-    PipelineRasterizationStateCreateFlags flags                   = {};
-    Bool32                                depthClampEnable        = {};
-    Bool32                                rasterizerDiscardEnable = {};
-    PolygonMode                           polygonMode             = PolygonMode::eFill;
-    CullModeFlags                         cullMode                = {};
-    FrontFace                             frontFace               = FrontFace::eCounterClockwise;
-    Bool32                                depthBiasEnable         = {};
-    float                                 depthBiasConstantFactor = {};
-    float                                 depthBiasClamp          = {};
-    float                                 depthBiasSlopeFactor    = {};
-    float                                 lineWidth               = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType                   = StructureType::ePipelineRasterizationStateCreateInfo;
+    const void *                                                pNext                   = {};
+    VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateFlags flags                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                depthClampEnable        = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                rasterizerDiscardEnable = {};
+    VULKAN_HPP_NAMESPACE::PolygonMode                           polygonMode             = VULKAN_HPP_NAMESPACE::PolygonMode::eFill;
+    VULKAN_HPP_NAMESPACE::CullModeFlags                         cullMode                = {};
+    VULKAN_HPP_NAMESPACE::FrontFace                             frontFace               = VULKAN_HPP_NAMESPACE::FrontFace::eCounterClockwise;
+    VULKAN_HPP_NAMESPACE::Bool32                                depthBiasEnable         = {};
+    float                                                       depthBiasConstantFactor = {};
+    float                                                       depthBiasClamp          = {};
+    float                                                       depthBiasSlopeFactor    = {};
+    float                                                       lineWidth               = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationStateCreateInfo>
-  {
-    using Type = PipelineRasterizationStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationStateCreateInfo>
   {
     using Type = PipelineRasterizationStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineMultisampleStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineMultisampleStateCreateInfo.html
   struct PipelineMultisampleStateCreateInfo
   {
     using NativeType = VkPipelineMultisampleStateCreateInfo;
@@ -55847,23 +40343,24 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineMultisampleStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineMultisampleStateCreateInfo( PipelineMultisampleStateCreateFlags flags_                 = {},
-                                                             SampleCountFlagBits                 rasterizationSamples_  = SampleCountFlagBits::e1,
-                                                             Bool32                              sampleShadingEnable_   = {},
-                                                             float                               minSampleShading_      = {},
-                                                             const SampleMask *                  pSampleMask_           = {},
-                                                             Bool32                              alphaToCoverageEnable_ = {},
-                                                             Bool32                              alphaToOneEnable_      = {},
-                                                             const void *                        pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , rasterizationSamples{ rasterizationSamples_ }
-      , sampleShadingEnable{ sampleShadingEnable_ }
-      , minSampleShading{ minSampleShading_ }
-      , pSampleMask{ pSampleMask_ }
-      , alphaToCoverageEnable{ alphaToCoverageEnable_ }
-      , alphaToOneEnable{ alphaToOneEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PipelineMultisampleStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateFlags flags_ = {},
+                                          VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_  = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                          VULKAN_HPP_NAMESPACE::Bool32              sampleShadingEnable_   = {},
+                                          float                                     minSampleShading_      = {},
+                                          const VULKAN_HPP_NAMESPACE::SampleMask *  pSampleMask_           = {},
+                                          VULKAN_HPP_NAMESPACE::Bool32              alphaToCoverageEnable_ = {},
+                                          VULKAN_HPP_NAMESPACE::Bool32              alphaToOneEnable_      = {},
+                                          const void *                              pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , rasterizationSamples( rasterizationSamples_ )
+      , sampleShadingEnable( sampleShadingEnable_ )
+      , minSampleShading( minSampleShading_ )
+      , pSampleMask( pSampleMask_ )
+      , alphaToCoverageEnable( alphaToCoverageEnable_ )
+      , alphaToOneEnable( alphaToOneEnable_ )
     {
     }
 
@@ -55875,34 +40372,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineMultisampleStateCreateInfo & operator=( PipelineMultisampleStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineMultisampleStateCreateInfo & operator=( VkPipelineMultisampleStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineMultisampleStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setFlags( PipelineMultisampleStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setRasterizationSamples( SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo &
+      setRasterizationSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationSamples = rasterizationSamples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setSampleShadingEnable( Bool32 sampleShadingEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setSampleShadingEnable( VULKAN_HPP_NAMESPACE::Bool32 sampleShadingEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleShadingEnable = sampleShadingEnable_;
       return *this;
@@ -55914,24 +40413,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setPSampleMask( const SampleMask * pSampleMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setPSampleMask( const VULKAN_HPP_NAMESPACE::SampleMask * pSampleMask_ ) VULKAN_HPP_NOEXCEPT
     {
       pSampleMask = pSampleMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setAlphaToCoverageEnable( Bool32 alphaToCoverageEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo &
+      setAlphaToCoverageEnable( VULKAN_HPP_NAMESPACE::Bool32 alphaToCoverageEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaToCoverageEnable = alphaToCoverageEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setAlphaToOneEnable( Bool32 alphaToOneEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineMultisampleStateCreateInfo & setAlphaToOneEnable( VULKAN_HPP_NAMESPACE::Bool32 alphaToOneEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaToOneEnable = alphaToOneEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineMultisampleStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -55943,26 +40443,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineMultisampleStateCreateInfo *>( this );
     }
 
-    operator VkPipelineMultisampleStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineMultisampleStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineMultisampleStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineMultisampleStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineMultisampleStateCreateFlags const &,
-               SampleCountFlagBits const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                float const &,
-               const SampleMask * const &,
-               Bool32 const &,
-               Bool32 const &>
+               const VULKAN_HPP_NAMESPACE::SampleMask * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, rasterizationSamples, sampleShadingEnable, minSampleShading, pSampleMask, alphaToCoverageEnable, alphaToOneEnable );
@@ -55990,51 +40484,42 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType                 = StructureType::ePipelineMultisampleStateCreateInfo;
-    const void *                        pNext                 = {};
-    PipelineMultisampleStateCreateFlags flags                 = {};
-    SampleCountFlagBits                 rasterizationSamples  = SampleCountFlagBits::e1;
-    Bool32                              sampleShadingEnable   = {};
-    float                               minSampleShading      = {};
-    const SampleMask *                  pSampleMask           = {};
-    Bool32                              alphaToCoverageEnable = {};
-    Bool32                              alphaToOneEnable      = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType                 = StructureType::ePipelineMultisampleStateCreateInfo;
+    const void *                                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateFlags flags                 = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits                 rasterizationSamples  = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::Bool32                              sampleShadingEnable   = {};
+    float                                                     minSampleShading      = {};
+    const VULKAN_HPP_NAMESPACE::SampleMask *                  pSampleMask           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                              alphaToCoverageEnable = {};
+    VULKAN_HPP_NAMESPACE::Bool32                              alphaToOneEnable      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineMultisampleStateCreateInfo>
-  {
-    using Type = PipelineMultisampleStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineMultisampleStateCreateInfo>
   {
     using Type = PipelineMultisampleStateCreateInfo;
   };
 
-  // wrapper struct for struct VkStencilOpState, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkStencilOpState.html
   struct StencilOpState
   {
     using NativeType = VkStencilOpState;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR StencilOpState( StencilOp failOp_      = StencilOp::eKeep,
-                                         StencilOp passOp_      = StencilOp::eKeep,
-                                         StencilOp depthFailOp_ = StencilOp::eKeep,
-                                         CompareOp compareOp_   = CompareOp::eNever,
-                                         uint32_t  compareMask_ = {},
-                                         uint32_t  writeMask_   = {},
-                                         uint32_t  reference_   = {} ) VULKAN_HPP_NOEXCEPT
-      : failOp{ failOp_ }
-      , passOp{ passOp_ }
-      , depthFailOp{ depthFailOp_ }
-      , compareOp{ compareOp_ }
-      , compareMask{ compareMask_ }
-      , writeMask{ writeMask_ }
-      , reference{ reference_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR StencilOpState( VULKAN_HPP_NAMESPACE::StencilOp failOp_      = VULKAN_HPP_NAMESPACE::StencilOp::eKeep,
+                                         VULKAN_HPP_NAMESPACE::StencilOp passOp_      = VULKAN_HPP_NAMESPACE::StencilOp::eKeep,
+                                         VULKAN_HPP_NAMESPACE::StencilOp depthFailOp_ = VULKAN_HPP_NAMESPACE::StencilOp::eKeep,
+                                         VULKAN_HPP_NAMESPACE::CompareOp compareOp_   = VULKAN_HPP_NAMESPACE::CompareOp::eNever,
+                                         uint32_t                        compareMask_ = {},
+                                         uint32_t                        writeMask_   = {},
+                                         uint32_t                        reference_   = {} ) VULKAN_HPP_NOEXCEPT
+      : failOp( failOp_ )
+      , passOp( passOp_ )
+      , depthFailOp( depthFailOp_ )
+      , compareOp( compareOp_ )
+      , compareMask( compareMask_ )
+      , writeMask( writeMask_ )
+      , reference( reference_ )
     {
     }
 
@@ -56043,34 +40528,34 @@ namespace VULKAN_HPP_NAMESPACE
     StencilOpState( VkStencilOpState const & rhs ) VULKAN_HPP_NOEXCEPT : StencilOpState( *reinterpret_cast<StencilOpState const *>( &rhs ) ) {}
 
     StencilOpState & operator=( StencilOpState const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     StencilOpState & operator=( VkStencilOpState const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<StencilOpState const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::StencilOpState const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setFailOp( StencilOp failOp_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setFailOp( VULKAN_HPP_NAMESPACE::StencilOp failOp_ ) VULKAN_HPP_NOEXCEPT
     {
       failOp = failOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setPassOp( StencilOp passOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setPassOp( VULKAN_HPP_NAMESPACE::StencilOp passOp_ ) VULKAN_HPP_NOEXCEPT
     {
       passOp = passOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setDepthFailOp( StencilOp depthFailOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setDepthFailOp( VULKAN_HPP_NAMESPACE::StencilOp depthFailOp_ ) VULKAN_HPP_NOEXCEPT
     {
       depthFailOp = depthFailOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setCompareOp( CompareOp compareOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 StencilOpState & setCompareOp( VULKAN_HPP_NAMESPACE::CompareOp compareOp_ ) VULKAN_HPP_NOEXCEPT
     {
       compareOp = compareOp_;
       return *this;
@@ -56093,7 +40578,7 @@ namespace VULKAN_HPP_NAMESPACE
       reference = reference_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkStencilOpState const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -56105,18 +40590,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkStencilOpState *>( this );
     }
 
-    operator VkStencilOpState const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkStencilOpState *>( this );
-    }
-
-    operator VkStencilOpState *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkStencilOpState *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StencilOp const &, StencilOp const &, StencilOp const &, CompareOp const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StencilOp const &,
+               VULKAN_HPP_NAMESPACE::StencilOp const &,
+               VULKAN_HPP_NAMESPACE::StencilOp const &,
+               VULKAN_HPP_NAMESPACE::CompareOp const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( failOp, passOp, depthFailOp, compareOp, compareMask, writeMask, reference );
@@ -56143,25 +40628,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StencilOp failOp      = StencilOp::eKeep;
-    StencilOp passOp      = StencilOp::eKeep;
-    StencilOp depthFailOp = StencilOp::eKeep;
-    CompareOp compareOp   = CompareOp::eNever;
-    uint32_t  compareMask = {};
-    uint32_t  writeMask   = {};
-    uint32_t  reference   = {};
+    VULKAN_HPP_NAMESPACE::StencilOp failOp      = VULKAN_HPP_NAMESPACE::StencilOp::eKeep;
+    VULKAN_HPP_NAMESPACE::StencilOp passOp      = VULKAN_HPP_NAMESPACE::StencilOp::eKeep;
+    VULKAN_HPP_NAMESPACE::StencilOp depthFailOp = VULKAN_HPP_NAMESPACE::StencilOp::eKeep;
+    VULKAN_HPP_NAMESPACE::CompareOp compareOp   = VULKAN_HPP_NAMESPACE::CompareOp::eNever;
+    uint32_t                        compareMask = {};
+    uint32_t                        writeMask   = {};
+    uint32_t                        reference   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkStencilOpState>
-  {
-    using Type = StencilOpState;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineDepthStencilStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDepthStencilStateCreateInfo.html
   struct PipelineDepthStencilStateCreateInfo
   {
     using NativeType = VkPipelineDepthStencilStateCreateInfo;
@@ -56169,29 +40644,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineDepthStencilStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineDepthStencilStateCreateInfo( PipelineDepthStencilStateCreateFlags flags_                 = {},
-                                                              Bool32                               depthTestEnable_       = {},
-                                                              Bool32                               depthWriteEnable_      = {},
-                                                              CompareOp                            depthCompareOp_        = CompareOp::eNever,
-                                                              Bool32                               depthBoundsTestEnable_ = {},
-                                                              Bool32                               stencilTestEnable_     = {},
-                                                              StencilOpState                       front_                 = {},
-                                                              StencilOpState                       back_                  = {},
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineDepthStencilStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateFlags flags_            = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32                               depthTestEnable_  = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32                               depthWriteEnable_ = {},
+                                                              VULKAN_HPP_NAMESPACE::CompareOp      depthCompareOp_ = VULKAN_HPP_NAMESPACE::CompareOp::eNever,
+                                                              VULKAN_HPP_NAMESPACE::Bool32         depthBoundsTestEnable_ = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32         stencilTestEnable_     = {},
+                                                              VULKAN_HPP_NAMESPACE::StencilOpState front_                 = {},
+                                                              VULKAN_HPP_NAMESPACE::StencilOpState back_                  = {},
                                                               float                                minDepthBounds_        = {},
                                                               float                                maxDepthBounds_        = {},
                                                               const void *                         pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , depthTestEnable{ depthTestEnable_ }
-      , depthWriteEnable{ depthWriteEnable_ }
-      , depthCompareOp{ depthCompareOp_ }
-      , depthBoundsTestEnable{ depthBoundsTestEnable_ }
-      , stencilTestEnable{ stencilTestEnable_ }
-      , front{ front_ }
-      , back{ back_ }
-      , minDepthBounds{ minDepthBounds_ }
-      , maxDepthBounds{ maxDepthBounds_ }
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , depthTestEnable( depthTestEnable_ )
+      , depthWriteEnable( depthWriteEnable_ )
+      , depthCompareOp( depthCompareOp_ )
+      , depthBoundsTestEnable( depthBoundsTestEnable_ )
+      , stencilTestEnable( stencilTestEnable_ )
+      , front( front_ )
+      , back( back_ )
+      , minDepthBounds( minDepthBounds_ )
+      , maxDepthBounds( maxDepthBounds_ )
     {
     }
 
@@ -56203,64 +40678,66 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineDepthStencilStateCreateInfo & operator=( PipelineDepthStencilStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineDepthStencilStateCreateInfo & operator=( VkPipelineDepthStencilStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineDepthStencilStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setFlags( PipelineDepthStencilStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthTestEnable( Bool32 depthTestEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthTestEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthTestEnable = depthTestEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthWriteEnable( Bool32 depthWriteEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 depthWriteEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthWriteEnable = depthWriteEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthCompareOp( CompareOp depthCompareOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthCompareOp( VULKAN_HPP_NAMESPACE::CompareOp depthCompareOp_ ) VULKAN_HPP_NOEXCEPT
     {
       depthCompareOp = depthCompareOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setDepthBoundsTestEnable( Bool32 depthBoundsTestEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo &
+      setDepthBoundsTestEnable( VULKAN_HPP_NAMESPACE::Bool32 depthBoundsTestEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBoundsTestEnable = depthBoundsTestEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setStencilTestEnable( Bool32 stencilTestEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setStencilTestEnable( VULKAN_HPP_NAMESPACE::Bool32 stencilTestEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilTestEnable = stencilTestEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setFront( StencilOpState const & front_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setFront( VULKAN_HPP_NAMESPACE::StencilOpState const & front_ ) VULKAN_HPP_NOEXCEPT
     {
       front = front_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setBack( StencilOpState const & back_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDepthStencilStateCreateInfo & setBack( VULKAN_HPP_NAMESPACE::StencilOpState const & back_ ) VULKAN_HPP_NOEXCEPT
     {
       back = back_;
       return *this;
@@ -56277,7 +40754,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxDepthBounds = maxDepthBounds_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineDepthStencilStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -56289,29 +40766,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineDepthStencilStateCreateInfo *>( this );
     }
 
-    operator VkPipelineDepthStencilStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineDepthStencilStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineDepthStencilStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineDepthStencilStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineDepthStencilStateCreateFlags const &,
-               Bool32 const &,
-               Bool32 const &,
-               CompareOp const &,
-               Bool32 const &,
-               Bool32 const &,
-               StencilOpState const &,
-               StencilOpState const &,
+               VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::CompareOp const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::StencilOpState const &,
+               VULKAN_HPP_NAMESPACE::StencilOpState const &,
                float const &,
                float const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -56351,57 +40822,47 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType                 = StructureType::ePipelineDepthStencilStateCreateInfo;
-    const void *                         pNext                 = {};
-    PipelineDepthStencilStateCreateFlags flags                 = {};
-    Bool32                               depthTestEnable       = {};
-    Bool32                               depthWriteEnable      = {};
-    CompareOp                            depthCompareOp        = CompareOp::eNever;
-    Bool32                               depthBoundsTestEnable = {};
-    Bool32                               stencilTestEnable     = {};
-    StencilOpState                       front                 = {};
-    StencilOpState                       back                  = {};
-    float                                minDepthBounds        = {};
-    float                                maxDepthBounds        = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType                 = StructureType::ePipelineDepthStencilStateCreateInfo;
+    const void *                                               pNext                 = {};
+    VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateFlags flags                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32                               depthTestEnable       = {};
+    VULKAN_HPP_NAMESPACE::Bool32                               depthWriteEnable      = {};
+    VULKAN_HPP_NAMESPACE::CompareOp                            depthCompareOp        = VULKAN_HPP_NAMESPACE::CompareOp::eNever;
+    VULKAN_HPP_NAMESPACE::Bool32                               depthBoundsTestEnable = {};
+    VULKAN_HPP_NAMESPACE::Bool32                               stencilTestEnable     = {};
+    VULKAN_HPP_NAMESPACE::StencilOpState                       front                 = {};
+    VULKAN_HPP_NAMESPACE::StencilOpState                       back                  = {};
+    float                                                      minDepthBounds        = {};
+    float                                                      maxDepthBounds        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineDepthStencilStateCreateInfo>
-  {
-    using Type = PipelineDepthStencilStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineDepthStencilStateCreateInfo>
   {
     using Type = PipelineDepthStencilStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineColorBlendAttachmentState, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorBlendAttachmentState.html
   struct PipelineColorBlendAttachmentState
   {
     using NativeType = VkPipelineColorBlendAttachmentState;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineColorBlendAttachmentState( Bool32              blendEnable_         = {},
-                                                            BlendFactor         srcColorBlendFactor_ = BlendFactor::eZero,
-                                                            BlendFactor         dstColorBlendFactor_ = BlendFactor::eZero,
-                                                            BlendOp             colorBlendOp_        = BlendOp::eAdd,
-                                                            BlendFactor         srcAlphaBlendFactor_ = BlendFactor::eZero,
-                                                            BlendFactor         dstAlphaBlendFactor_ = BlendFactor::eZero,
-                                                            BlendOp             alphaBlendOp_        = BlendOp::eAdd,
-                                                            ColorComponentFlags colorWriteMask_      = {} ) VULKAN_HPP_NOEXCEPT
-      : blendEnable{ blendEnable_ }
-      , srcColorBlendFactor{ srcColorBlendFactor_ }
-      , dstColorBlendFactor{ dstColorBlendFactor_ }
-      , colorBlendOp{ colorBlendOp_ }
-      , srcAlphaBlendFactor{ srcAlphaBlendFactor_ }
-      , dstAlphaBlendFactor{ dstAlphaBlendFactor_ }
-      , alphaBlendOp{ alphaBlendOp_ }
-      , colorWriteMask{ colorWriteMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineColorBlendAttachmentState( VULKAN_HPP_NAMESPACE::Bool32      blendEnable_         = {},
+                                                            VULKAN_HPP_NAMESPACE::BlendFactor srcColorBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                            VULKAN_HPP_NAMESPACE::BlendFactor dstColorBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                            VULKAN_HPP_NAMESPACE::BlendOp     colorBlendOp_        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd,
+                                                            VULKAN_HPP_NAMESPACE::BlendFactor srcAlphaBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                            VULKAN_HPP_NAMESPACE::BlendFactor dstAlphaBlendFactor_ = VULKAN_HPP_NAMESPACE::BlendFactor::eZero,
+                                                            VULKAN_HPP_NAMESPACE::BlendOp     alphaBlendOp_        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd,
+                                                            VULKAN_HPP_NAMESPACE::ColorComponentFlags colorWriteMask_ = {} ) VULKAN_HPP_NOEXCEPT
+      : blendEnable( blendEnable_ )
+      , srcColorBlendFactor( srcColorBlendFactor_ )
+      , dstColorBlendFactor( dstColorBlendFactor_ )
+      , colorBlendOp( colorBlendOp_ )
+      , srcAlphaBlendFactor( srcAlphaBlendFactor_ )
+      , dstAlphaBlendFactor( dstAlphaBlendFactor_ )
+      , alphaBlendOp( alphaBlendOp_ )
+      , colorWriteMask( colorWriteMask_ )
     {
     }
 
@@ -56413,63 +40874,68 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineColorBlendAttachmentState & operator=( PipelineColorBlendAttachmentState const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineColorBlendAttachmentState & operator=( VkPipelineColorBlendAttachmentState const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineColorBlendAttachmentState const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setBlendEnable( Bool32 blendEnable_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setBlendEnable( VULKAN_HPP_NAMESPACE::Bool32 blendEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       blendEnable = blendEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setSrcColorBlendFactor( BlendFactor srcColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState &
+      setSrcColorBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor srcColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       srcColorBlendFactor = srcColorBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setDstColorBlendFactor( BlendFactor dstColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState &
+      setDstColorBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor dstColorBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       dstColorBlendFactor = dstColorBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setColorBlendOp( BlendOp colorBlendOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setColorBlendOp( VULKAN_HPP_NAMESPACE::BlendOp colorBlendOp_ ) VULKAN_HPP_NOEXCEPT
     {
       colorBlendOp = colorBlendOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setSrcAlphaBlendFactor( BlendFactor srcAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState &
+      setSrcAlphaBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor srcAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAlphaBlendFactor = srcAlphaBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setDstAlphaBlendFactor( BlendFactor dstAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState &
+      setDstAlphaBlendFactor( VULKAN_HPP_NAMESPACE::BlendFactor dstAlphaBlendFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAlphaBlendFactor = dstAlphaBlendFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setAlphaBlendOp( BlendOp alphaBlendOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setAlphaBlendOp( VULKAN_HPP_NAMESPACE::BlendOp alphaBlendOp_ ) VULKAN_HPP_NOEXCEPT
     {
       alphaBlendOp = alphaBlendOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState & setColorWriteMask( ColorComponentFlags colorWriteMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAttachmentState &
+      setColorWriteMask( VULKAN_HPP_NAMESPACE::ColorComponentFlags colorWriteMask_ ) VULKAN_HPP_NOEXCEPT
     {
       colorWriteMask = colorWriteMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineColorBlendAttachmentState const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -56481,25 +40947,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineColorBlendAttachmentState *>( this );
     }
 
-    operator VkPipelineColorBlendAttachmentState const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineColorBlendAttachmentState *>( this );
-    }
-
-    operator VkPipelineColorBlendAttachmentState *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineColorBlendAttachmentState *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Bool32 const &,
-               BlendFactor const &,
-               BlendFactor const &,
-               BlendOp const &,
-               BlendFactor const &,
-               BlendFactor const &,
-               BlendOp const &,
-               ColorComponentFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendOp const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendFactor const &,
+               VULKAN_HPP_NAMESPACE::BlendOp const &,
+               VULKAN_HPP_NAMESPACE::ColorComponentFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -56528,26 +40988,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Bool32              blendEnable         = {};
-    BlendFactor         srcColorBlendFactor = BlendFactor::eZero;
-    BlendFactor         dstColorBlendFactor = BlendFactor::eZero;
-    BlendOp             colorBlendOp        = BlendOp::eAdd;
-    BlendFactor         srcAlphaBlendFactor = BlendFactor::eZero;
-    BlendFactor         dstAlphaBlendFactor = BlendFactor::eZero;
-    BlendOp             alphaBlendOp        = BlendOp::eAdd;
-    ColorComponentFlags colorWriteMask      = {};
+    VULKAN_HPP_NAMESPACE::Bool32              blendEnable         = {};
+    VULKAN_HPP_NAMESPACE::BlendFactor         srcColorBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendFactor         dstColorBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendOp             colorBlendOp        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd;
+    VULKAN_HPP_NAMESPACE::BlendFactor         srcAlphaBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendFactor         dstAlphaBlendFactor = VULKAN_HPP_NAMESPACE::BlendFactor::eZero;
+    VULKAN_HPP_NAMESPACE::BlendOp             alphaBlendOp        = VULKAN_HPP_NAMESPACE::BlendOp::eAdd;
+    VULKAN_HPP_NAMESPACE::ColorComponentFlags colorWriteMask      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineColorBlendAttachmentState>
-  {
-    using Type = PipelineColorBlendAttachmentState;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineColorBlendStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorBlendStateCreateInfo.html
   struct PipelineColorBlendStateCreateInfo
   {
     using NativeType = VkPipelineColorBlendStateCreateInfo;
@@ -56555,21 +41005,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineColorBlendStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo( PipelineColorBlendStateCreateFlags        flags_           = {},
-                                                               Bool32                                    logicOpEnable_   = {},
-                                                               LogicOp                                   logicOp_         = LogicOp::eClear,
-                                                               uint32_t                                  attachmentCount_ = {},
-                                                               const PipelineColorBlendAttachmentState * pAttachments_    = {},
-                                                               std::array<float, 4> const &              blendConstants_  = {},
-                                                               const void *                              pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , logicOpEnable{ logicOpEnable_ }
-      , logicOp{ logicOp_ }
-      , attachmentCount{ attachmentCount_ }
-      , pAttachments{ pAttachments_ }
-      , blendConstants{ blendConstants_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateFlags flags_         = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32                             logicOpEnable_ = {},
+                                                               VULKAN_HPP_NAMESPACE::LogicOp logicOp_         = VULKAN_HPP_NAMESPACE::LogicOp::eClear,
+                                                               uint32_t                      attachmentCount_ = {},
+                                                               const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState * pAttachments_   = {},
+                                                               std::array<float, 4> const &                                    blendConstants_ = {},
+                                                               const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , logicOpEnable( logicOpEnable_ )
+      , logicOp( logicOp_ )
+      , attachmentCount( attachmentCount_ )
+      , pAttachments( pAttachments_ )
+      , blendConstants( blendConstants_ )
     {
     }
 
@@ -56581,12 +41031,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineColorBlendStateCreateInfo( PipelineColorBlendStateCreateFlags                                       flags_,
-                                       Bool32                                                                   logicOpEnable_,
-                                       LogicOp                                                                  logicOp_,
-                                       ArrayProxyNoTemporaries<const PipelineColorBlendAttachmentState> const & attachments_,
-                                       std::array<float, 4> const &                                             blendConstants_ = {},
-                                       const void *                                                             pNext_          = nullptr )
+    PipelineColorBlendStateCreateInfo(
+      VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateFlags                                                             flags_,
+      VULKAN_HPP_NAMESPACE::Bool32                                                                                         logicOpEnable_,
+      VULKAN_HPP_NAMESPACE::LogicOp                                                                                        logicOp_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState> const & attachments_,
+      std::array<float, 4> const &                                                                                         blendConstants_ = {},
+      const void *                                                                                                         pNext_          = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , logicOpEnable( logicOpEnable_ )
@@ -56599,34 +41050,34 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineColorBlendStateCreateInfo & operator=( PipelineColorBlendStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineColorBlendStateCreateInfo & operator=( VkPipelineColorBlendStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineColorBlendStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setFlags( PipelineColorBlendStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setLogicOpEnable( Bool32 logicOpEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setLogicOpEnable( VULKAN_HPP_NAMESPACE::Bool32 logicOpEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       logicOpEnable = logicOpEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setLogicOp( LogicOp logicOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setLogicOp( VULKAN_HPP_NAMESPACE::LogicOp logicOp_ ) VULKAN_HPP_NOEXCEPT
     {
       logicOp = logicOp_;
       return *this;
@@ -56638,15 +41089,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo & setPAttachments( const PipelineColorBlendAttachmentState * pAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendStateCreateInfo &
+      setPAttachments( const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState * pAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachments = pAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineColorBlendStateCreateInfo &
-      setAttachments( ArrayProxyNoTemporaries<const PipelineColorBlendAttachmentState> const & attachments_ ) VULKAN_HPP_NOEXCEPT
+    PipelineColorBlendStateCreateInfo & setAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState> const & attachments_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount = static_cast<uint32_t>( attachments_.size() );
       pAttachments    = attachments_.data();
@@ -56659,7 +41111,7 @@ namespace VULKAN_HPP_NAMESPACE
       blendConstants = blendConstants_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineColorBlendStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -56671,25 +41123,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineColorBlendStateCreateInfo *>( this );
     }
 
-    operator VkPipelineColorBlendStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineColorBlendStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineColorBlendStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineColorBlendStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineColorBlendStateCreateFlags const &,
-               Bool32 const &,
-               LogicOp const &,
+               VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::LogicOp const &,
                uint32_t const &,
-               const PipelineColorBlendAttachmentState * const &,
-               ArrayWrapper1D<float, 4> const &>
+               const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState * const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, logicOpEnable, logicOp, attachmentCount, pAttachments, blendConstants );
@@ -56717,32 +41163,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                             sType           = StructureType::ePipelineColorBlendStateCreateInfo;
-    const void *                              pNext           = {};
-    PipelineColorBlendStateCreateFlags        flags           = {};
-    Bool32                                    logicOpEnable   = {};
-    LogicOp                                   logicOp         = LogicOp::eClear;
-    uint32_t                                  attachmentCount = {};
-    const PipelineColorBlendAttachmentState * pAttachments    = {};
-    ArrayWrapper1D<float, 4>                  blendConstants  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType           = StructureType::ePipelineColorBlendStateCreateInfo;
+    const void *                                                    pNext           = {};
+    VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateFlags        flags           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                    logicOpEnable   = {};
+    VULKAN_HPP_NAMESPACE::LogicOp                                   logicOp         = VULKAN_HPP_NAMESPACE::LogicOp::eClear;
+    uint32_t                                                        attachmentCount = {};
+    const VULKAN_HPP_NAMESPACE::PipelineColorBlendAttachmentState * pAttachments    = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 4>                  blendConstants  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineColorBlendStateCreateInfo>
-  {
-    using Type = PipelineColorBlendStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineColorBlendStateCreateInfo>
   {
     using Type = PipelineColorBlendStateCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineDynamicStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDynamicStateCreateInfo.html
   struct PipelineDynamicStateCreateInfo
   {
     using NativeType = VkPipelineDynamicStateCreateInfo;
@@ -56750,15 +41186,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineDynamicStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineDynamicStateCreateInfo( PipelineDynamicStateCreateFlags flags_             = {},
-                                                         uint32_t                        dynamicStateCount_ = {},
-                                                         const DynamicState *            pDynamicStates_    = {},
-                                                         const void *                    pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dynamicStateCount{ dynamicStateCount_ }
-      , pDynamicStates{ pDynamicStates_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineDynamicStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateFlags flags_             = {},
+                                                         uint32_t                                              dynamicStateCount_ = {},
+                                                         const VULKAN_HPP_NAMESPACE::DynamicState *            pDynamicStates_    = {},
+                                                         const void *                                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , dynamicStateCount( dynamicStateCount_ )
+      , pDynamicStates( pDynamicStates_ )
     {
     }
 
@@ -56770,31 +41206,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineDynamicStateCreateInfo( PipelineDynamicStateCreateFlags                     flags_,
-                                    ArrayProxyNoTemporaries<const DynamicState> const & dynamicStates_,
-                                    const void *                                        pNext_ = nullptr )
+    PipelineDynamicStateCreateInfo( VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateFlags                                           flags_,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DynamicState> const & dynamicStates_,
+                                    const void *                                                                                    pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), dynamicStateCount( static_cast<uint32_t>( dynamicStates_.size() ) ), pDynamicStates( dynamicStates_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineDynamicStateCreateInfo & operator=( PipelineDynamicStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineDynamicStateCreateInfo & operator=( VkPipelineDynamicStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineDynamicStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineDynamicStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDynamicStateCreateInfo & setFlags( PipelineDynamicStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDynamicStateCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -56806,21 +41242,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDynamicStateCreateInfo & setPDynamicStates( const DynamicState * pDynamicStates_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDynamicStateCreateInfo & setPDynamicStates( const VULKAN_HPP_NAMESPACE::DynamicState * pDynamicStates_ ) VULKAN_HPP_NOEXCEPT
     {
       pDynamicStates = pDynamicStates_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineDynamicStateCreateInfo & setDynamicStates( ArrayProxyNoTemporaries<const DynamicState> const & dynamicStates_ ) VULKAN_HPP_NOEXCEPT
+    PipelineDynamicStateCreateInfo &
+      setDynamicStates( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DynamicState> const & dynamicStates_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicStateCount = static_cast<uint32_t>( dynamicStates_.size() );
       pDynamicStates    = dynamicStates_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineDynamicStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -56832,18 +41269,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineDynamicStateCreateInfo *>( this );
     }
 
-    operator VkPipelineDynamicStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineDynamicStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineDynamicStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineDynamicStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineDynamicStateCreateFlags const &, uint32_t const &, const DynamicState * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateFlags const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::DynamicState * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, dynamicStateCount, pDynamicStates );
@@ -56870,28 +41305,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType             = StructureType::ePipelineDynamicStateCreateInfo;
-    const void *                    pNext             = {};
-    PipelineDynamicStateCreateFlags flags             = {};
-    uint32_t                        dynamicStateCount = {};
-    const DynamicState *            pDynamicStates    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType             = StructureType::ePipelineDynamicStateCreateInfo;
+    const void *                                          pNext             = {};
+    VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateFlags flags             = {};
+    uint32_t                                              dynamicStateCount = {};
+    const VULKAN_HPP_NAMESPACE::DynamicState *            pDynamicStates    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineDynamicStateCreateInfo>
-  {
-    using Type = PipelineDynamicStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineDynamicStateCreateInfo>
   {
     using Type = PipelineDynamicStateCreateInfo;
   };
 
-  // wrapper struct for struct VkGraphicsPipelineCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsPipelineCreateInfo.html
   struct GraphicsPipelineCreateInfo
   {
     using NativeType = VkGraphicsPipelineCreateInfo;
@@ -56899,43 +41325,43 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGraphicsPipelineCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo( PipelineCreateFlags                          flags_               = {},
-                                                        uint32_t                                     stageCount_          = {},
-                                                        const PipelineShaderStageCreateInfo *        pStages_             = {},
-                                                        const PipelineVertexInputStateCreateInfo *   pVertexInputState_   = {},
-                                                        const PipelineInputAssemblyStateCreateInfo * pInputAssemblyState_ = {},
-                                                        const PipelineTessellationStateCreateInfo *  pTessellationState_  = {},
-                                                        const PipelineViewportStateCreateInfo *      pViewportState_      = {},
-                                                        const PipelineRasterizationStateCreateInfo * pRasterizationState_ = {},
-                                                        const PipelineMultisampleStateCreateInfo *   pMultisampleState_   = {},
-                                                        const PipelineDepthStencilStateCreateInfo *  pDepthStencilState_  = {},
-                                                        const PipelineColorBlendStateCreateInfo *    pColorBlendState_    = {},
-                                                        const PipelineDynamicStateCreateInfo *       pDynamicState_       = {},
-                                                        PipelineLayout                               layout_              = {},
-                                                        RenderPass                                   renderPass_          = {},
-                                                        uint32_t                                     subpass_             = {},
-                                                        Pipeline                                     basePipelineHandle_  = {},
-                                                        int32_t                                      basePipelineIndex_   = {},
-                                                        const void *                                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stageCount{ stageCount_ }
-      , pStages{ pStages_ }
-      , pVertexInputState{ pVertexInputState_ }
-      , pInputAssemblyState{ pInputAssemblyState_ }
-      , pTessellationState{ pTessellationState_ }
-      , pViewportState{ pViewportState_ }
-      , pRasterizationState{ pRasterizationState_ }
-      , pMultisampleState{ pMultisampleState_ }
-      , pDepthStencilState{ pDepthStencilState_ }
-      , pColorBlendState{ pColorBlendState_ }
-      , pDynamicState{ pDynamicState_ }
-      , layout{ layout_ }
-      , renderPass{ renderPass_ }
-      , subpass{ subpass_ }
-      , basePipelineHandle{ basePipelineHandle_ }
-      , basePipelineIndex{ basePipelineIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCreateFlags                          flags_               = {},
+                                                        uint32_t                                                           stageCount_          = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *        pStages_             = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *   pVertexInputState_   = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo * pInputAssemblyState_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo *  pTessellationState_  = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo *      pViewportState_      = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo * pRasterizationState_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo *   pMultisampleState_   = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo *  pDepthStencilState_  = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo *    pColorBlendState_    = {},
+                                                        const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *       pDynamicState_       = {},
+                                                        VULKAN_HPP_NAMESPACE::PipelineLayout                               layout_              = {},
+                                                        VULKAN_HPP_NAMESPACE::RenderPass                                   renderPass_          = {},
+                                                        uint32_t                                                           subpass_             = {},
+                                                        VULKAN_HPP_NAMESPACE::Pipeline                                     basePipelineHandle_  = {},
+                                                        int32_t                                                            basePipelineIndex_   = {},
+                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stageCount( stageCount_ )
+      , pStages( pStages_ )
+      , pVertexInputState( pVertexInputState_ )
+      , pInputAssemblyState( pInputAssemblyState_ )
+      , pTessellationState( pTessellationState_ )
+      , pViewportState( pViewportState_ )
+      , pRasterizationState( pRasterizationState_ )
+      , pMultisampleState( pMultisampleState_ )
+      , pDepthStencilState( pDepthStencilState_ )
+      , pColorBlendState( pColorBlendState_ )
+      , pDynamicState( pDynamicState_ )
+      , layout( layout_ )
+      , renderPass( renderPass_ )
+      , subpass( subpass_ )
+      , basePipelineHandle( basePipelineHandle_ )
+      , basePipelineIndex( basePipelineIndex_ )
     {
     }
 
@@ -56947,23 +41373,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsPipelineCreateInfo( PipelineCreateFlags                                                  flags_,
-                                ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_,
-                                const PipelineVertexInputStateCreateInfo *                           pVertexInputState_   = {},
-                                const PipelineInputAssemblyStateCreateInfo *                         pInputAssemblyState_ = {},
-                                const PipelineTessellationStateCreateInfo *                          pTessellationState_  = {},
-                                const PipelineViewportStateCreateInfo *                              pViewportState_      = {},
-                                const PipelineRasterizationStateCreateInfo *                         pRasterizationState_ = {},
-                                const PipelineMultisampleStateCreateInfo *                           pMultisampleState_   = {},
-                                const PipelineDepthStencilStateCreateInfo *                          pDepthStencilState_  = {},
-                                const PipelineColorBlendStateCreateInfo *                            pColorBlendState_    = {},
-                                const PipelineDynamicStateCreateInfo *                               pDynamicState_       = {},
-                                PipelineLayout                                                       layout_              = {},
-                                RenderPass                                                           renderPass_          = {},
-                                uint32_t                                                             subpass_             = {},
-                                Pipeline                                                             basePipelineHandle_  = {},
-                                int32_t                                                              basePipelineIndex_   = {},
-                                const void *                                                         pNext_               = nullptr )
+    GraphicsPipelineCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCreateFlags                                                                        flags_,
+                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_,
+                                const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *   pVertexInputState_   = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo * pInputAssemblyState_ = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo *  pTessellationState_  = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo *      pViewportState_      = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo * pRasterizationState_ = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo *   pMultisampleState_   = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo *  pDepthStencilState_  = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo *    pColorBlendState_    = {},
+                                const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *       pDynamicState_       = {},
+                                VULKAN_HPP_NAMESPACE::PipelineLayout                               layout_              = {},
+                                VULKAN_HPP_NAMESPACE::RenderPass                                   renderPass_          = {},
+                                uint32_t                                                           subpass_             = {},
+                                VULKAN_HPP_NAMESPACE::Pipeline                                     basePipelineHandle_  = {},
+                                int32_t                                                            basePipelineIndex_   = {},
+                                const void *                                                       pNext_               = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , stageCount( static_cast<uint32_t>( stages_.size() ) )
@@ -56987,22 +41413,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     GraphicsPipelineCreateInfo & operator=( GraphicsPipelineCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GraphicsPipelineCreateInfo & operator=( VkGraphicsPipelineCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GraphicsPipelineCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GraphicsPipelineCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setFlags( PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -57014,14 +41440,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPStages( const PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPStages( const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
     {
       pStages = pStages_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsPipelineCreateInfo & setStages( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
+    GraphicsPipelineCreateInfo &
+      setStages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
     {
       stageCount = static_cast<uint32_t>( stages_.size() );
       pStages    = stages_.data();
@@ -57030,72 +41457,75 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPVertexInputState( const PipelineVertexInputStateCreateInfo * pVertexInputState_ ) VULKAN_HPP_NOEXCEPT
+      setPVertexInputState( const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo * pVertexInputState_ ) VULKAN_HPP_NOEXCEPT
     {
       pVertexInputState = pVertexInputState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPInputAssemblyState( const PipelineInputAssemblyStateCreateInfo * pInputAssemblyState_ ) VULKAN_HPP_NOEXCEPT
+      setPInputAssemblyState( const VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo * pInputAssemblyState_ ) VULKAN_HPP_NOEXCEPT
     {
       pInputAssemblyState = pInputAssemblyState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPTessellationState( const PipelineTessellationStateCreateInfo * pTessellationState_ ) VULKAN_HPP_NOEXCEPT
+      setPTessellationState( const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * pTessellationState_ ) VULKAN_HPP_NOEXCEPT
     {
       pTessellationState = pTessellationState_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPViewportState( const PipelineViewportStateCreateInfo * pViewportState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
+      setPViewportState( const VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo * pViewportState_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewportState = pViewportState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPRasterizationState( const PipelineRasterizationStateCreateInfo * pRasterizationState_ ) VULKAN_HPP_NOEXCEPT
+      setPRasterizationState( const VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo * pRasterizationState_ ) VULKAN_HPP_NOEXCEPT
     {
       pRasterizationState = pRasterizationState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPMultisampleState( const PipelineMultisampleStateCreateInfo * pMultisampleState_ ) VULKAN_HPP_NOEXCEPT
+      setPMultisampleState( const VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo * pMultisampleState_ ) VULKAN_HPP_NOEXCEPT
     {
       pMultisampleState = pMultisampleState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
-      setPDepthStencilState( const PipelineDepthStencilStateCreateInfo * pDepthStencilState_ ) VULKAN_HPP_NOEXCEPT
+      setPDepthStencilState( const VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo * pDepthStencilState_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthStencilState = pDepthStencilState_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPColorBlendState( const PipelineColorBlendStateCreateInfo * pColorBlendState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
+      setPColorBlendState( const VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo * pColorBlendState_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorBlendState = pColorBlendState_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setPDynamicState( const PipelineDynamicStateCreateInfo * pDynamicState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo &
+      setPDynamicState( const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo * pDynamicState_ ) VULKAN_HPP_NOEXCEPT
     {
       pDynamicState = pDynamicState_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setRenderPass( RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPass = renderPass_;
       return *this;
@@ -57107,7 +41537,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setBasePipelineHandle( Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineCreateInfo & setBasePipelineHandle( VULKAN_HPP_NAMESPACE::Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
     {
       basePipelineHandle = basePipelineHandle_;
       return *this;
@@ -57118,7 +41548,7 @@ namespace VULKAN_HPP_NAMESPACE
       basePipelineIndex = basePipelineIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGraphicsPipelineCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57130,36 +41560,30 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGraphicsPipelineCreateInfo *>( this );
     }
 
-    operator VkGraphicsPipelineCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGraphicsPipelineCreateInfo *>( this );
-    }
-
-    operator VkGraphicsPipelineCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGraphicsPipelineCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreateFlags const &,
                uint32_t const &,
-               const PipelineShaderStageCreateInfo * const &,
-               const PipelineVertexInputStateCreateInfo * const &,
-               const PipelineInputAssemblyStateCreateInfo * const &,
-               const PipelineTessellationStateCreateInfo * const &,
-               const PipelineViewportStateCreateInfo * const &,
-               const PipelineRasterizationStateCreateInfo * const &,
-               const PipelineMultisampleStateCreateInfo * const &,
-               const PipelineDepthStencilStateCreateInfo * const &,
-               const PipelineColorBlendStateCreateInfo * const &,
-               const PipelineDynamicStateCreateInfo * const &,
-               PipelineLayout const &,
-               RenderPass const &,
+               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo * const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::RenderPass const &,
                uint32_t const &,
-               Pipeline const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
                int32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -57209,43 +41633,33 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                sType               = StructureType::eGraphicsPipelineCreateInfo;
-    const void *                                 pNext               = {};
-    PipelineCreateFlags                          flags               = {};
-    uint32_t                                     stageCount          = {};
-    const PipelineShaderStageCreateInfo *        pStages             = {};
-    const PipelineVertexInputStateCreateInfo *   pVertexInputState   = {};
-    const PipelineInputAssemblyStateCreateInfo * pInputAssemblyState = {};
-    const PipelineTessellationStateCreateInfo *  pTessellationState  = {};
-    const PipelineViewportStateCreateInfo *      pViewportState      = {};
-    const PipelineRasterizationStateCreateInfo * pRasterizationState = {};
-    const PipelineMultisampleStateCreateInfo *   pMultisampleState   = {};
-    const PipelineDepthStencilStateCreateInfo *  pDepthStencilState  = {};
-    const PipelineColorBlendStateCreateInfo *    pColorBlendState    = {};
-    const PipelineDynamicStateCreateInfo *       pDynamicState       = {};
-    PipelineLayout                               layout              = {};
-    RenderPass                                   renderPass          = {};
-    uint32_t                                     subpass             = {};
-    Pipeline                                     basePipelineHandle  = {};
-    int32_t                                      basePipelineIndex   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                sType               = StructureType::eGraphicsPipelineCreateInfo;
+    const void *                                                       pNext               = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags                          flags               = {};
+    uint32_t                                                           stageCount          = {};
+    const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *        pStages             = {};
+    const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *   pVertexInputState   = {};
+    const VULKAN_HPP_NAMESPACE::PipelineInputAssemblyStateCreateInfo * pInputAssemblyState = {};
+    const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo *  pTessellationState  = {};
+    const VULKAN_HPP_NAMESPACE::PipelineViewportStateCreateInfo *      pViewportState      = {};
+    const VULKAN_HPP_NAMESPACE::PipelineRasterizationStateCreateInfo * pRasterizationState = {};
+    const VULKAN_HPP_NAMESPACE::PipelineMultisampleStateCreateInfo *   pMultisampleState   = {};
+    const VULKAN_HPP_NAMESPACE::PipelineDepthStencilStateCreateInfo *  pDepthStencilState  = {};
+    const VULKAN_HPP_NAMESPACE::PipelineColorBlendStateCreateInfo *    pColorBlendState    = {};
+    const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *       pDynamicState       = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout                               layout              = {};
+    VULKAN_HPP_NAMESPACE::RenderPass                                   renderPass          = {};
+    uint32_t                                                           subpass             = {};
+    VULKAN_HPP_NAMESPACE::Pipeline                                     basePipelineHandle  = {};
+    int32_t                                                            basePipelineIndex   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGraphicsPipelineCreateInfo>
-  {
-    using Type = GraphicsPipelineCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGraphicsPipelineCreateInfo>
   {
     using Type = GraphicsPipelineCreateInfo;
   };
 
-  // wrapper struct for struct VkGraphicsPipelineLibraryCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsPipelineLibraryCreateInfoEXT.html
   struct GraphicsPipelineLibraryCreateInfoEXT
   {
     using NativeType = VkGraphicsPipelineLibraryCreateInfoEXT;
@@ -57253,10 +41667,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGraphicsPipelineLibraryCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GraphicsPipelineLibraryCreateInfoEXT( GraphicsPipelineLibraryFlagsEXT flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GraphicsPipelineLibraryCreateInfoEXT( VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryFlagsEXT flags_ = {},
+                                                               const void *                                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -57268,27 +41683,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     GraphicsPipelineLibraryCreateInfoEXT & operator=( GraphicsPipelineLibraryCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GraphicsPipelineLibraryCreateInfoEXT & operator=( VkGraphicsPipelineLibraryCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GraphicsPipelineLibraryCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineLibraryCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineLibraryCreateInfoEXT & setFlags( GraphicsPipelineLibraryFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineLibraryCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGraphicsPipelineLibraryCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57300,18 +41715,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGraphicsPipelineLibraryCreateInfoEXT *>( this );
     }
 
-    operator VkGraphicsPipelineLibraryCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGraphicsPipelineLibraryCreateInfoEXT *>( this );
-    }
-
-    operator VkGraphicsPipelineLibraryCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGraphicsPipelineLibraryCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, GraphicsPipelineLibraryFlagsEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryFlagsEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -57336,27 +41746,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType = StructureType::eGraphicsPipelineLibraryCreateInfoEXT;
-    const void *                    pNext = {};
-    GraphicsPipelineLibraryFlagsEXT flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType = StructureType::eGraphicsPipelineLibraryCreateInfoEXT;
+    const void *                                          pNext = {};
+    VULKAN_HPP_NAMESPACE::GraphicsPipelineLibraryFlagsEXT flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGraphicsPipelineLibraryCreateInfoEXT>
-  {
-    using Type = GraphicsPipelineLibraryCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGraphicsPipelineLibraryCreateInfoEXT>
   {
     using Type = GraphicsPipelineLibraryCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkGraphicsShaderGroupCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsShaderGroupCreateInfoNV.html
   struct GraphicsShaderGroupCreateInfoNV
   {
     using NativeType = VkGraphicsShaderGroupCreateInfoNV;
@@ -57364,17 +41764,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGraphicsShaderGroupCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GraphicsShaderGroupCreateInfoNV( uint32_t                                    stageCount_         = {},
-                                                          const PipelineShaderStageCreateInfo *       pStages_            = {},
-                                                          const PipelineVertexInputStateCreateInfo *  pVertexInputState_  = {},
-                                                          const PipelineTessellationStateCreateInfo * pTessellationState_ = {},
-                                                          const void *                                pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stageCount{ stageCount_ }
-      , pStages{ pStages_ }
-      , pVertexInputState{ pVertexInputState_ }
-      , pTessellationState{ pTessellationState_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GraphicsShaderGroupCreateInfoNV( uint32_t                                                          stageCount_         = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *       pStages_            = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *  pVertexInputState_  = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * pTessellationState_ = {},
+                                                          const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stageCount( stageCount_ )
+      , pStages( pStages_ )
+      , pVertexInputState( pVertexInputState_ )
+      , pTessellationState( pTessellationState_ )
     {
     }
 
@@ -57386,10 +41786,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsShaderGroupCreateInfoNV( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_,
-                                     const PipelineVertexInputStateCreateInfo *                           pVertexInputState_  = {},
-                                     const PipelineTessellationStateCreateInfo *                          pTessellationState_ = {},
-                                     const void *                                                         pNext_              = nullptr )
+    GraphicsShaderGroupCreateInfoNV( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_,
+                                     const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *  pVertexInputState_  = {},
+                                     const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * pTessellationState_ = {},
+                                     const void *                                                      pNext_              = nullptr )
       : pNext( pNext_ )
       , stageCount( static_cast<uint32_t>( stages_.size() ) )
       , pStages( stages_.data() )
@@ -57400,15 +41800,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     GraphicsShaderGroupCreateInfoNV & operator=( GraphicsShaderGroupCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GraphicsShaderGroupCreateInfoNV & operator=( VkGraphicsShaderGroupCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GraphicsShaderGroupCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GraphicsShaderGroupCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -57421,14 +41821,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsShaderGroupCreateInfoNV & setPStages( const PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsShaderGroupCreateInfoNV &
+      setPStages( const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
     {
       pStages = pStages_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsShaderGroupCreateInfoNV & setStages( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
+    GraphicsShaderGroupCreateInfoNV &
+      setStages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
     {
       stageCount = static_cast<uint32_t>( stages_.size() );
       pStages    = stages_.data();
@@ -57437,19 +41839,19 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsShaderGroupCreateInfoNV &
-      setPVertexInputState( const PipelineVertexInputStateCreateInfo * pVertexInputState_ ) VULKAN_HPP_NOEXCEPT
+      setPVertexInputState( const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo * pVertexInputState_ ) VULKAN_HPP_NOEXCEPT
     {
       pVertexInputState = pVertexInputState_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 GraphicsShaderGroupCreateInfoNV &
-      setPTessellationState( const PipelineTessellationStateCreateInfo * pTessellationState_ ) VULKAN_HPP_NOEXCEPT
+      setPTessellationState( const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * pTessellationState_ ) VULKAN_HPP_NOEXCEPT
     {
       pTessellationState = pTessellationState_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGraphicsShaderGroupCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57461,23 +41863,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGraphicsShaderGroupCreateInfoNV *>( this );
     }
 
-    operator VkGraphicsShaderGroupCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGraphicsShaderGroupCreateInfoNV *>( this );
-    }
-
-    operator VkGraphicsShaderGroupCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGraphicsShaderGroupCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const PipelineShaderStageCreateInfo * const &,
-               const PipelineVertexInputStateCreateInfo * const &,
-               const PipelineTessellationStateCreateInfo * const &>
+               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stageCount, pStages, pVertexInputState, pTessellationState );
@@ -57504,30 +41900,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                               sType              = StructureType::eGraphicsShaderGroupCreateInfoNV;
-    const void *                                pNext              = {};
-    uint32_t                                    stageCount         = {};
-    const PipelineShaderStageCreateInfo *       pStages            = {};
-    const PipelineVertexInputStateCreateInfo *  pVertexInputState  = {};
-    const PipelineTessellationStateCreateInfo * pTessellationState = {};
+    VULKAN_HPP_NAMESPACE::StructureType                               sType              = StructureType::eGraphicsShaderGroupCreateInfoNV;
+    const void *                                                      pNext              = {};
+    uint32_t                                                          stageCount         = {};
+    const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *       pStages            = {};
+    const VULKAN_HPP_NAMESPACE::PipelineVertexInputStateCreateInfo *  pVertexInputState  = {};
+    const VULKAN_HPP_NAMESPACE::PipelineTessellationStateCreateInfo * pTessellationState = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGraphicsShaderGroupCreateInfoNV>
-  {
-    using Type = GraphicsShaderGroupCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGraphicsShaderGroupCreateInfoNV>
   {
     using Type = GraphicsShaderGroupCreateInfoNV;
   };
 
-  // wrapper struct for struct VkGraphicsPipelineShaderGroupsCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkGraphicsPipelineShaderGroupsCreateInfoNV.html
   struct GraphicsPipelineShaderGroupsCreateInfoNV
   {
     using NativeType = VkGraphicsPipelineShaderGroupsCreateInfoNV;
@@ -57535,17 +41921,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR GraphicsPipelineShaderGroupsCreateInfoNV( uint32_t                                groupCount_    = {},
-                                                                   const GraphicsShaderGroupCreateInfoNV * pGroups_       = {},
-                                                                   uint32_t                                pipelineCount_ = {},
-                                                                   const Pipeline *                        pPipelines_    = {},
-                                                                   const void *                            pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , groupCount{ groupCount_ }
-      , pGroups{ pGroups_ }
-      , pipelineCount{ pipelineCount_ }
-      , pPipelines{ pPipelines_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR GraphicsPipelineShaderGroupsCreateInfoNV( uint32_t                                                      groupCount_    = {},
+                                                                   const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV * pGroups_       = {},
+                                                                   uint32_t                                                      pipelineCount_ = {},
+                                                                   const VULKAN_HPP_NAMESPACE::Pipeline *                        pPipelines_    = {},
+                                                                   const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , groupCount( groupCount_ )
+      , pGroups( pGroups_ )
+      , pipelineCount( pipelineCount_ )
+      , pPipelines( pPipelines_ )
     {
     }
 
@@ -57557,9 +41943,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsPipelineShaderGroupsCreateInfoNV( ArrayProxyNoTemporaries<const GraphicsShaderGroupCreateInfoNV> const & groups_,
-                                              ArrayProxyNoTemporaries<const Pipeline> const &                        pipelines_ = {},
-                                              const void *                                                           pNext_     = nullptr )
+    GraphicsPipelineShaderGroupsCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV> const & groups_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Pipeline> const &                        pipelines_ = {},
+      const void *                                                                                                       pNext_     = nullptr )
       : pNext( pNext_ )
       , groupCount( static_cast<uint32_t>( groups_.size() ) )
       , pGroups( groups_.data() )
@@ -57570,15 +41957,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     GraphicsPipelineShaderGroupsCreateInfoNV & operator=( GraphicsPipelineShaderGroupsCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     GraphicsPipelineShaderGroupsCreateInfoNV & operator=( VkGraphicsPipelineShaderGroupsCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<GraphicsPipelineShaderGroupsCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::GraphicsPipelineShaderGroupsCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineShaderGroupsCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -57591,14 +41978,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineShaderGroupsCreateInfoNV & setPGroups( const GraphicsShaderGroupCreateInfoNV * pGroups_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineShaderGroupsCreateInfoNV &
+      setPGroups( const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV * pGroups_ ) VULKAN_HPP_NOEXCEPT
     {
       pGroups = pGroups_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsPipelineShaderGroupsCreateInfoNV & setGroups( ArrayProxyNoTemporaries<const GraphicsShaderGroupCreateInfoNV> const & groups_ ) VULKAN_HPP_NOEXCEPT
+    GraphicsPipelineShaderGroupsCreateInfoNV & setGroups(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV> const & groups_ ) VULKAN_HPP_NOEXCEPT
     {
       groupCount = static_cast<uint32_t>( groups_.size() );
       pGroups    = groups_.data();
@@ -57612,21 +42001,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineShaderGroupsCreateInfoNV & setPPipelines( const Pipeline * pPipelines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 GraphicsPipelineShaderGroupsCreateInfoNV & setPPipelines( const VULKAN_HPP_NAMESPACE::Pipeline * pPipelines_ ) VULKAN_HPP_NOEXCEPT
     {
       pPipelines = pPipelines_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    GraphicsPipelineShaderGroupsCreateInfoNV & setPipelines( ArrayProxyNoTemporaries<const Pipeline> const & pipelines_ ) VULKAN_HPP_NOEXCEPT
+    GraphicsPipelineShaderGroupsCreateInfoNV &
+      setPipelines( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Pipeline> const & pipelines_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineCount = static_cast<uint32_t>( pipelines_.size() );
       pPipelines    = pipelines_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkGraphicsPipelineShaderGroupsCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57638,23 +42028,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkGraphicsPipelineShaderGroupsCreateInfoNV *>( this );
     }
 
-    operator VkGraphicsPipelineShaderGroupsCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkGraphicsPipelineShaderGroupsCreateInfoNV *>( this );
-    }
-
-    operator VkGraphicsPipelineShaderGroupsCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkGraphicsPipelineShaderGroupsCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const GraphicsShaderGroupCreateInfoNV * const &,
+               const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV * const &,
                uint32_t const &,
-               const Pipeline * const &>
+               const VULKAN_HPP_NAMESPACE::Pipeline * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, groupCount, pGroups, pipelineCount, pPipelines );
@@ -57681,37 +42065,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType         = StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV;
-    const void *                            pNext         = {};
-    uint32_t                                groupCount    = {};
-    const GraphicsShaderGroupCreateInfoNV * pGroups       = {};
-    uint32_t                                pipelineCount = {};
-    const Pipeline *                        pPipelines    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                           sType         = StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV;
+    const void *                                                  pNext         = {};
+    uint32_t                                                      groupCount    = {};
+    const VULKAN_HPP_NAMESPACE::GraphicsShaderGroupCreateInfoNV * pGroups       = {};
+    uint32_t                                                      pipelineCount = {};
+    const VULKAN_HPP_NAMESPACE::Pipeline *                        pPipelines    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkGraphicsPipelineShaderGroupsCreateInfoNV>
-  {
-    using Type = GraphicsPipelineShaderGroupsCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV>
   {
     using Type = GraphicsPipelineShaderGroupsCreateInfoNV;
   };
 
-  // wrapper struct for struct VkXYColorEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkXYColorEXT.html
   struct XYColorEXT
   {
     using NativeType = VkXYColorEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR XYColorEXT( float x_ = {}, float y_ = {} ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
+      : x( x_ )
+      , y( y_ )
     {
     }
 
@@ -57720,15 +42095,15 @@ namespace VULKAN_HPP_NAMESPACE
     XYColorEXT( VkXYColorEXT const & rhs ) VULKAN_HPP_NOEXCEPT : XYColorEXT( *reinterpret_cast<XYColorEXT const *>( &rhs ) ) {}
 
     XYColorEXT & operator=( XYColorEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     XYColorEXT & operator=( VkXYColorEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<XYColorEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::XYColorEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 XYColorEXT & setX( float x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
@@ -57740,7 +42115,7 @@ namespace VULKAN_HPP_NAMESPACE
       y = y_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkXYColorEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57752,18 +42127,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkXYColorEXT *>( this );
     }
 
-    operator VkXYColorEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkXYColorEXT *>( this );
-    }
-
-    operator VkXYColorEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkXYColorEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y );
     }
@@ -57792,15 +42162,6 @@ namespace VULKAN_HPP_NAMESPACE
     float y = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkXYColorEXT>
-  {
-    using Type = XYColorEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkHdrMetadataEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkHdrMetadataEXT.html
   struct HdrMetadataEXT
   {
     using NativeType = VkHdrMetadataEXT;
@@ -57808,25 +42169,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHdrMetadataEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR HdrMetadataEXT( XYColorEXT   displayPrimaryRed_         = {},
-                                         XYColorEXT   displayPrimaryGreen_       = {},
-                                         XYColorEXT   displayPrimaryBlue_        = {},
-                                         XYColorEXT   whitePoint_                = {},
-                                         float        maxLuminance_              = {},
-                                         float        minLuminance_              = {},
-                                         float        maxContentLightLevel_      = {},
-                                         float        maxFrameAverageLightLevel_ = {},
-                                         const void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displayPrimaryRed{ displayPrimaryRed_ }
-      , displayPrimaryGreen{ displayPrimaryGreen_ }
-      , displayPrimaryBlue{ displayPrimaryBlue_ }
-      , whitePoint{ whitePoint_ }
-      , maxLuminance{ maxLuminance_ }
-      , minLuminance{ minLuminance_ }
-      , maxContentLightLevel{ maxContentLightLevel_ }
-      , maxFrameAverageLightLevel{ maxFrameAverageLightLevel_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR HdrMetadataEXT( VULKAN_HPP_NAMESPACE::XYColorEXT displayPrimaryRed_         = {},
+                                         VULKAN_HPP_NAMESPACE::XYColorEXT displayPrimaryGreen_       = {},
+                                         VULKAN_HPP_NAMESPACE::XYColorEXT displayPrimaryBlue_        = {},
+                                         VULKAN_HPP_NAMESPACE::XYColorEXT whitePoint_                = {},
+                                         float                            maxLuminance_              = {},
+                                         float                            minLuminance_              = {},
+                                         float                            maxContentLightLevel_      = {},
+                                         float                            maxFrameAverageLightLevel_ = {},
+                                         const void *                     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displayPrimaryRed( displayPrimaryRed_ )
+      , displayPrimaryGreen( displayPrimaryGreen_ )
+      , displayPrimaryBlue( displayPrimaryBlue_ )
+      , whitePoint( whitePoint_ )
+      , maxLuminance( maxLuminance_ )
+      , minLuminance( minLuminance_ )
+      , maxContentLightLevel( maxContentLightLevel_ )
+      , maxFrameAverageLightLevel( maxFrameAverageLightLevel_ )
     {
     }
 
@@ -57835,40 +42196,40 @@ namespace VULKAN_HPP_NAMESPACE
     HdrMetadataEXT( VkHdrMetadataEXT const & rhs ) VULKAN_HPP_NOEXCEPT : HdrMetadataEXT( *reinterpret_cast<HdrMetadataEXT const *>( &rhs ) ) {}
 
     HdrMetadataEXT & operator=( HdrMetadataEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     HdrMetadataEXT & operator=( VkHdrMetadataEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<HdrMetadataEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::HdrMetadataEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryRed( XYColorEXT const & displayPrimaryRed_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryRed( VULKAN_HPP_NAMESPACE::XYColorEXT const & displayPrimaryRed_ ) VULKAN_HPP_NOEXCEPT
     {
       displayPrimaryRed = displayPrimaryRed_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryGreen( XYColorEXT const & displayPrimaryGreen_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryGreen( VULKAN_HPP_NAMESPACE::XYColorEXT const & displayPrimaryGreen_ ) VULKAN_HPP_NOEXCEPT
     {
       displayPrimaryGreen = displayPrimaryGreen_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryBlue( XYColorEXT const & displayPrimaryBlue_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setDisplayPrimaryBlue( VULKAN_HPP_NAMESPACE::XYColorEXT const & displayPrimaryBlue_ ) VULKAN_HPP_NOEXCEPT
     {
       displayPrimaryBlue = displayPrimaryBlue_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setWhitePoint( XYColorEXT const & whitePoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HdrMetadataEXT & setWhitePoint( VULKAN_HPP_NAMESPACE::XYColorEXT const & whitePoint_ ) VULKAN_HPP_NOEXCEPT
     {
       whitePoint = whitePoint_;
       return *this;
@@ -57897,7 +42258,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxFrameAverageLightLevel = maxFrameAverageLightLevel_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkHdrMetadataEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -57909,27 +42270,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkHdrMetadataEXT *>( this );
     }
 
-    operator VkHdrMetadataEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkHdrMetadataEXT *>( this );
-    }
-
-    operator VkHdrMetadataEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkHdrMetadataEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               XYColorEXT const &,
-               XYColorEXT const &,
-               XYColorEXT const &,
-               XYColorEXT const &,
+               VULKAN_HPP_NAMESPACE::XYColorEXT const &,
+               VULKAN_HPP_NAMESPACE::XYColorEXT const &,
+               VULKAN_HPP_NAMESPACE::XYColorEXT const &,
+               VULKAN_HPP_NAMESPACE::XYColorEXT const &,
                float const &,
                float const &,
                float const &,
                float const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -57967,172 +42322,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::eHdrMetadataEXT;
-    const void *  pNext                     = {};
-    XYColorEXT    displayPrimaryRed         = {};
-    XYColorEXT    displayPrimaryGreen       = {};
-    XYColorEXT    displayPrimaryBlue        = {};
-    XYColorEXT    whitePoint                = {};
-    float         maxLuminance              = {};
-    float         minLuminance              = {};
-    float         maxContentLightLevel      = {};
-    float         maxFrameAverageLightLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::eHdrMetadataEXT;
+    const void *                        pNext                     = {};
+    VULKAN_HPP_NAMESPACE::XYColorEXT    displayPrimaryRed         = {};
+    VULKAN_HPP_NAMESPACE::XYColorEXT    displayPrimaryGreen       = {};
+    VULKAN_HPP_NAMESPACE::XYColorEXT    displayPrimaryBlue        = {};
+    VULKAN_HPP_NAMESPACE::XYColorEXT    whitePoint                = {};
+    float                               maxLuminance              = {};
+    float                               minLuminance              = {};
+    float                               maxContentLightLevel      = {};
+    float                               maxFrameAverageLightLevel = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkHdrMetadataEXT>
-  {
-    using Type = HdrMetadataEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eHdrMetadataEXT>
   {
     using Type = HdrMetadataEXT;
   };
 
-  // wrapper struct for struct VkHdrVividDynamicMetadataHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkHdrVividDynamicMetadataHUAWEI.html
-  struct HdrVividDynamicMetadataHUAWEI
-  {
-    using NativeType = VkHdrVividDynamicMetadataHUAWEI;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHdrVividDynamicMetadataHUAWEI;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      HdrVividDynamicMetadataHUAWEI( size_t dynamicMetadataSize_ = {}, const void * pDynamicMetadata_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dynamicMetadataSize{ dynamicMetadataSize_ }
-      , pDynamicMetadata{ pDynamicMetadata_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR HdrVividDynamicMetadataHUAWEI( HdrVividDynamicMetadataHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    HdrVividDynamicMetadataHUAWEI( VkHdrVividDynamicMetadataHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
-      : HdrVividDynamicMetadataHUAWEI( *reinterpret_cast<HdrVividDynamicMetadataHUAWEI const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    HdrVividDynamicMetadataHUAWEI( ArrayProxyNoTemporaries<const T> const & dynamicMetadata_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), dynamicMetadataSize( dynamicMetadata_.size() * sizeof( T ) ), pDynamicMetadata( dynamicMetadata_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    HdrVividDynamicMetadataHUAWEI & operator=( HdrVividDynamicMetadataHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    HdrVividDynamicMetadataHUAWEI & operator=( VkHdrVividDynamicMetadataHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<HdrVividDynamicMetadataHUAWEI const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 HdrVividDynamicMetadataHUAWEI & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 HdrVividDynamicMetadataHUAWEI & setDynamicMetadataSize( size_t dynamicMetadataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dynamicMetadataSize = dynamicMetadataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 HdrVividDynamicMetadataHUAWEI & setPDynamicMetadata( const void * pDynamicMetadata_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDynamicMetadata = pDynamicMetadata_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    HdrVividDynamicMetadataHUAWEI & setDynamicMetadata( ArrayProxyNoTemporaries<const T> const & dynamicMetadata_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dynamicMetadataSize = dynamicMetadata_.size() * sizeof( T );
-      pDynamicMetadata    = dynamicMetadata_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkHdrVividDynamicMetadataHUAWEI const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkHdrVividDynamicMetadataHUAWEI *>( this );
-    }
-
-    operator VkHdrVividDynamicMetadataHUAWEI &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkHdrVividDynamicMetadataHUAWEI *>( this );
-    }
-
-    operator VkHdrVividDynamicMetadataHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkHdrVividDynamicMetadataHUAWEI *>( this );
-    }
-
-    operator VkHdrVividDynamicMetadataHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkHdrVividDynamicMetadataHUAWEI *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, size_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dynamicMetadataSize, pDynamicMetadata );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( HdrVividDynamicMetadataHUAWEI const & ) const = default;
-#else
-    bool operator==( HdrVividDynamicMetadataHUAWEI const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dynamicMetadataSize == rhs.dynamicMetadataSize ) &&
-             ( pDynamicMetadata == rhs.pDynamicMetadata );
-#  endif
-    }
-
-    bool operator!=( HdrVividDynamicMetadataHUAWEI const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType               = StructureType::eHdrVividDynamicMetadataHUAWEI;
-    const void *  pNext               = {};
-    size_t        dynamicMetadataSize = {};
-    const void *  pDynamicMetadata    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkHdrVividDynamicMetadataHUAWEI>
-  {
-    using Type = HdrVividDynamicMetadataHUAWEI;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eHdrVividDynamicMetadataHUAWEI>
-  {
-    using Type = HdrVividDynamicMetadataHUAWEI;
-  };
-
-  // wrapper struct for struct VkHeadlessSurfaceCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkHeadlessSurfaceCreateInfoEXT.html
   struct HeadlessSurfaceCreateInfoEXT
   {
     using NativeType = VkHeadlessSurfaceCreateInfoEXT;
@@ -58140,10 +42347,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHeadlessSurfaceCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR HeadlessSurfaceCreateInfoEXT( HeadlessSurfaceCreateFlagsEXT flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR HeadlessSurfaceCreateInfoEXT( VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateFlagsEXT flags_ = {},
+                                                       const void *                                        pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -58155,27 +42363,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     HeadlessSurfaceCreateInfoEXT & operator=( HeadlessSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     HeadlessSurfaceCreateInfoEXT & operator=( VkHeadlessSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<HeadlessSurfaceCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 HeadlessSurfaceCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HeadlessSurfaceCreateInfoEXT & setFlags( HeadlessSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HeadlessSurfaceCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkHeadlessSurfaceCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -58187,18 +42395,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkHeadlessSurfaceCreateInfoEXT *>( this );
     }
 
-    operator VkHeadlessSurfaceCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkHeadlessSurfaceCreateInfoEXT *>( this );
-    }
-
-    operator VkHeadlessSurfaceCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkHeadlessSurfaceCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, HeadlessSurfaceCreateFlagsEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateFlagsEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -58223,90 +42426,76 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType = StructureType::eHeadlessSurfaceCreateInfoEXT;
-    const void *                  pNext = {};
-    HeadlessSurfaceCreateFlagsEXT flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType = StructureType::eHeadlessSurfaceCreateInfoEXT;
+    const void *                                        pNext = {};
+    VULKAN_HPP_NAMESPACE::HeadlessSurfaceCreateFlagsEXT flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkHeadlessSurfaceCreateInfoEXT>
-  {
-    using Type = HeadlessSurfaceCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eHeadlessSurfaceCreateInfoEXT>
   {
     using Type = HeadlessSurfaceCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkHostImageCopyDevicePerformanceQuery, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkHostImageCopyDevicePerformanceQuery.html
-  struct HostImageCopyDevicePerformanceQuery
+  struct HostImageCopyDevicePerformanceQueryEXT
   {
-    using NativeType = VkHostImageCopyDevicePerformanceQuery;
+    using NativeType = VkHostImageCopyDevicePerformanceQueryEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHostImageCopyDevicePerformanceQuery;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHostImageCopyDevicePerformanceQueryEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      HostImageCopyDevicePerformanceQuery( Bool32 optimalDeviceAccess_ = {}, Bool32 identicalMemoryLayout_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , optimalDeviceAccess{ optimalDeviceAccess_ }
-      , identicalMemoryLayout{ identicalMemoryLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR HostImageCopyDevicePerformanceQueryEXT( VULKAN_HPP_NAMESPACE::Bool32 optimalDeviceAccess_   = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32 identicalMemoryLayout_ = {},
+                                                                 void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , optimalDeviceAccess( optimalDeviceAccess_ )
+      , identicalMemoryLayout( identicalMemoryLayout_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR HostImageCopyDevicePerformanceQuery( HostImageCopyDevicePerformanceQuery const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR HostImageCopyDevicePerformanceQueryEXT( HostImageCopyDevicePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    HostImageCopyDevicePerformanceQuery( VkHostImageCopyDevicePerformanceQuery const & rhs ) VULKAN_HPP_NOEXCEPT
-      : HostImageCopyDevicePerformanceQuery( *reinterpret_cast<HostImageCopyDevicePerformanceQuery const *>( &rhs ) )
+    HostImageCopyDevicePerformanceQueryEXT( VkHostImageCopyDevicePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : HostImageCopyDevicePerformanceQueryEXT( *reinterpret_cast<HostImageCopyDevicePerformanceQueryEXT const *>( &rhs ) )
     {
     }
 
-    HostImageCopyDevicePerformanceQuery & operator=( HostImageCopyDevicePerformanceQuery const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    HostImageCopyDevicePerformanceQueryEXT & operator=( HostImageCopyDevicePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    HostImageCopyDevicePerformanceQuery & operator=( VkHostImageCopyDevicePerformanceQuery const & rhs ) VULKAN_HPP_NOEXCEPT
+    HostImageCopyDevicePerformanceQueryEXT & operator=( VkHostImageCopyDevicePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<HostImageCopyDevicePerformanceQuery const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::HostImageCopyDevicePerformanceQueryEXT const *>( &rhs );
       return *this;
     }
 
-    operator VkHostImageCopyDevicePerformanceQuery const &() const VULKAN_HPP_NOEXCEPT
+    operator VkHostImageCopyDevicePerformanceQueryEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkHostImageCopyDevicePerformanceQuery *>( this );
+      return *reinterpret_cast<const VkHostImageCopyDevicePerformanceQueryEXT *>( this );
     }
 
-    operator VkHostImageCopyDevicePerformanceQuery &() VULKAN_HPP_NOEXCEPT
+    operator VkHostImageCopyDevicePerformanceQueryEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkHostImageCopyDevicePerformanceQuery *>( this );
-    }
-
-    operator VkHostImageCopyDevicePerformanceQuery const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkHostImageCopyDevicePerformanceQuery *>( this );
-    }
-
-    operator VkHostImageCopyDevicePerformanceQuery *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkHostImageCopyDevicePerformanceQuery *>( this );
+      return *reinterpret_cast<VkHostImageCopyDevicePerformanceQueryEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, optimalDeviceAccess, identicalMemoryLayout );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( HostImageCopyDevicePerformanceQuery const & ) const = default;
+    auto operator<=>( HostImageCopyDevicePerformanceQueryEXT const & ) const = default;
 #else
-    bool operator==( HostImageCopyDevicePerformanceQuery const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( HostImageCopyDevicePerformanceQueryEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -58316,128 +42505,116 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( HostImageCopyDevicePerformanceQuery const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( HostImageCopyDevicePerformanceQueryEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                 = StructureType::eHostImageCopyDevicePerformanceQuery;
-    void *        pNext                 = {};
-    Bool32        optimalDeviceAccess   = {};
-    Bool32        identicalMemoryLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::eHostImageCopyDevicePerformanceQueryEXT;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        optimalDeviceAccess   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        identicalMemoryLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkHostImageCopyDevicePerformanceQuery>
-  {
-    using Type = HostImageCopyDevicePerformanceQuery;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eHostImageCopyDevicePerformanceQuery>
+  struct CppType<StructureType, StructureType::eHostImageCopyDevicePerformanceQueryEXT>
   {
-    using Type = HostImageCopyDevicePerformanceQuery;
+    using Type = HostImageCopyDevicePerformanceQueryEXT;
   };
 
-  using HostImageCopyDevicePerformanceQueryEXT = HostImageCopyDevicePerformanceQuery;
-
-  // wrapper struct for struct VkHostImageLayoutTransitionInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkHostImageLayoutTransitionInfo.html
-  struct HostImageLayoutTransitionInfo
+  struct HostImageLayoutTransitionInfoEXT
   {
-    using NativeType = VkHostImageLayoutTransitionInfo;
+    using NativeType = VkHostImageLayoutTransitionInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHostImageLayoutTransitionInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eHostImageLayoutTransitionInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR HostImageLayoutTransitionInfo( Image                 image_            = {},
-                                                        ImageLayout           oldLayout_        = ImageLayout::eUndefined,
-                                                        ImageLayout           newLayout_        = ImageLayout::eUndefined,
-                                                        ImageSubresourceRange subresourceRange_ = {},
-                                                        const void *          pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , oldLayout{ oldLayout_ }
-      , newLayout{ newLayout_ }
-      , subresourceRange{ subresourceRange_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR HostImageLayoutTransitionInfoEXT( VULKAN_HPP_NAMESPACE::Image       image_     = {},
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout oldLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                           VULKAN_HPP_NAMESPACE::ImageLayout newLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                           VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange_ = {},
+                                                           const void *                                pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , oldLayout( oldLayout_ )
+      , newLayout( newLayout_ )
+      , subresourceRange( subresourceRange_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR HostImageLayoutTransitionInfo( HostImageLayoutTransitionInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR HostImageLayoutTransitionInfoEXT( HostImageLayoutTransitionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    HostImageLayoutTransitionInfo( VkHostImageLayoutTransitionInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : HostImageLayoutTransitionInfo( *reinterpret_cast<HostImageLayoutTransitionInfo const *>( &rhs ) )
+    HostImageLayoutTransitionInfoEXT( VkHostImageLayoutTransitionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : HostImageLayoutTransitionInfoEXT( *reinterpret_cast<HostImageLayoutTransitionInfoEXT const *>( &rhs ) )
     {
     }
 
-    HostImageLayoutTransitionInfo & operator=( HostImageLayoutTransitionInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    HostImageLayoutTransitionInfoEXT & operator=( HostImageLayoutTransitionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    HostImageLayoutTransitionInfo & operator=( VkHostImageLayoutTransitionInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    HostImageLayoutTransitionInfoEXT & operator=( VkHostImageLayoutTransitionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<HostImageLayoutTransitionInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::HostImageLayoutTransitionInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfoEXT & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfo & setOldLayout( ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfoEXT & setOldLayout( VULKAN_HPP_NAMESPACE::ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       oldLayout = oldLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfo & setNewLayout( ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfoEXT & setNewLayout( VULKAN_HPP_NAMESPACE::ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       newLayout = newLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfo & setSubresourceRange( ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 HostImageLayoutTransitionInfoEXT &
+      setSubresourceRange( VULKAN_HPP_NAMESPACE::ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
     {
       subresourceRange = subresourceRange_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkHostImageLayoutTransitionInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkHostImageLayoutTransitionInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( this );
+      return *reinterpret_cast<const VkHostImageLayoutTransitionInfoEXT *>( this );
     }
 
-    operator VkHostImageLayoutTransitionInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkHostImageLayoutTransitionInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkHostImageLayoutTransitionInfo *>( this );
-    }
-
-    operator VkHostImageLayoutTransitionInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkHostImageLayoutTransitionInfo *>( this );
-    }
-
-    operator VkHostImageLayoutTransitionInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkHostImageLayoutTransitionInfo *>( this );
+      return *reinterpret_cast<VkHostImageLayoutTransitionInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &, ImageLayout const &, ImageLayout const &, ImageSubresourceRange const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceRange const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, oldLayout, newLayout, subresourceRange );
@@ -58445,9 +42622,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( HostImageLayoutTransitionInfo const & ) const = default;
+    auto operator<=>( HostImageLayoutTransitionInfoEXT const & ) const = default;
 #else
-    bool operator==( HostImageLayoutTransitionInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( HostImageLayoutTransitionInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -58457,39 +42634,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( HostImageLayoutTransitionInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( HostImageLayoutTransitionInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType         sType            = StructureType::eHostImageLayoutTransitionInfo;
-    const void *          pNext            = {};
-    Image                 image            = {};
-    ImageLayout           oldLayout        = ImageLayout::eUndefined;
-    ImageLayout           newLayout        = ImageLayout::eUndefined;
-    ImageSubresourceRange subresourceRange = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType            = StructureType::eHostImageLayoutTransitionInfoEXT;
+    const void *                                pNext            = {};
+    VULKAN_HPP_NAMESPACE::Image                 image            = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           oldLayout        = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout           newLayout        = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkHostImageLayoutTransitionInfo>
-  {
-    using Type = HostImageLayoutTransitionInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eHostImageLayoutTransitionInfo>
+  struct CppType<StructureType, StructureType::eHostImageLayoutTransitionInfoEXT>
   {
-    using Type = HostImageLayoutTransitionInfo;
+    using Type = HostImageLayoutTransitionInfoEXT;
   };
 
-  using HostImageLayoutTransitionInfoEXT = HostImageLayoutTransitionInfo;
-
 #if defined( VK_USE_PLATFORM_IOS_MVK )
-  // wrapper struct for struct VkIOSSurfaceCreateInfoMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkIOSSurfaceCreateInfoMVK.html
   struct IOSSurfaceCreateInfoMVK
   {
     using NativeType = VkIOSSurfaceCreateInfoMVK;
@@ -58497,12 +42663,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIosSurfaceCreateInfoMVK;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      IOSSurfaceCreateInfoMVK( IOSSurfaceCreateFlagsMVK flags_ = {}, const void * pView_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pView{ pView_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR IOSSurfaceCreateInfoMVK( VULKAN_HPP_NAMESPACE::IOSSurfaceCreateFlagsMVK flags_ = {},
+                                                  const void *                                   pView_ = {},
+                                                  const void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pView( pView_ )
     {
     }
 
@@ -58514,22 +42681,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     IOSSurfaceCreateInfoMVK & operator=( IOSSurfaceCreateInfoMVK const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     IOSSurfaceCreateInfoMVK & operator=( VkIOSSurfaceCreateInfoMVK const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<IOSSurfaceCreateInfoMVK const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::IOSSurfaceCreateInfoMVK const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 IOSSurfaceCreateInfoMVK & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IOSSurfaceCreateInfoMVK & setFlags( IOSSurfaceCreateFlagsMVK flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IOSSurfaceCreateInfoMVK & setFlags( VULKAN_HPP_NAMESPACE::IOSSurfaceCreateFlagsMVK flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -58540,7 +42707,7 @@ namespace VULKAN_HPP_NAMESPACE
       pView = pView_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkIOSSurfaceCreateInfoMVK const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -58552,18 +42719,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkIOSSurfaceCreateInfoMVK *>( this );
     }
 
-    operator VkIOSSurfaceCreateInfoMVK const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIOSSurfaceCreateInfoMVK *>( this );
-    }
-
-    operator VkIOSSurfaceCreateInfoMVK *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIOSSurfaceCreateInfoMVK *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, IOSSurfaceCreateFlagsMVK const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::IOSSurfaceCreateFlagsMVK const &, const void * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pView );
     }
@@ -58588,20 +42750,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType            sType = StructureType::eIosSurfaceCreateInfoMVK;
-    const void *             pNext = {};
-    IOSSurfaceCreateFlagsMVK flags = {};
-    const void *             pView = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType = StructureType::eIosSurfaceCreateInfoMVK;
+    const void *                                   pNext = {};
+    VULKAN_HPP_NAMESPACE::IOSSurfaceCreateFlagsMVK flags = {};
+    const void *                                   pView = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIOSSurfaceCreateInfoMVK>
-  {
-    using Type = IOSSurfaceCreateInfoMVK;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eIosSurfaceCreateInfoMVK>
   {
@@ -58609,131 +42763,19 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 
-  // wrapper struct for struct VkImageAlignmentControlCreateInfoMESA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageAlignmentControlCreateInfoMESA.html
-  struct ImageAlignmentControlCreateInfoMESA
-  {
-    using NativeType = VkImageAlignmentControlCreateInfoMESA;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageAlignmentControlCreateInfoMESA;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageAlignmentControlCreateInfoMESA( uint32_t maximumRequestedAlignment_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maximumRequestedAlignment{ maximumRequestedAlignment_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ImageAlignmentControlCreateInfoMESA( ImageAlignmentControlCreateInfoMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ImageAlignmentControlCreateInfoMESA( VkImageAlignmentControlCreateInfoMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ImageAlignmentControlCreateInfoMESA( *reinterpret_cast<ImageAlignmentControlCreateInfoMESA const *>( &rhs ) )
-    {
-    }
-
-    ImageAlignmentControlCreateInfoMESA & operator=( ImageAlignmentControlCreateInfoMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ImageAlignmentControlCreateInfoMESA & operator=( VkImageAlignmentControlCreateInfoMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ImageAlignmentControlCreateInfoMESA const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageAlignmentControlCreateInfoMESA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ImageAlignmentControlCreateInfoMESA & setMaximumRequestedAlignment( uint32_t maximumRequestedAlignment_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maximumRequestedAlignment = maximumRequestedAlignment_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkImageAlignmentControlCreateInfoMESA const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkImageAlignmentControlCreateInfoMESA *>( this );
-    }
-
-    operator VkImageAlignmentControlCreateInfoMESA &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkImageAlignmentControlCreateInfoMESA *>( this );
-    }
-
-    operator VkImageAlignmentControlCreateInfoMESA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageAlignmentControlCreateInfoMESA *>( this );
-    }
-
-    operator VkImageAlignmentControlCreateInfoMESA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageAlignmentControlCreateInfoMESA *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maximumRequestedAlignment );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ImageAlignmentControlCreateInfoMESA const & ) const = default;
-#else
-    bool operator==( ImageAlignmentControlCreateInfoMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maximumRequestedAlignment == rhs.maximumRequestedAlignment );
-#  endif
-    }
-
-    bool operator!=( ImageAlignmentControlCreateInfoMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                     = StructureType::eImageAlignmentControlCreateInfoMESA;
-    const void *  pNext                     = {};
-    uint32_t      maximumRequestedAlignment = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageAlignmentControlCreateInfoMESA>
-  {
-    using Type = ImageAlignmentControlCreateInfoMESA;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eImageAlignmentControlCreateInfoMESA>
-  {
-    using Type = ImageAlignmentControlCreateInfoMESA;
-  };
-
-  // wrapper struct for struct VkImageBlit, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageBlit.html
   struct ImageBlit
   {
     using NativeType = VkImageBlit;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit( ImageSubresourceLayers          srcSubresource_ = {},
-                                       std::array<Offset3D, 2> const & srcOffsets_     = {},
-                                       ImageSubresourceLayers          dstSubresource_ = {},
-                                       std::array<Offset3D, 2> const & dstOffsets_     = {} ) VULKAN_HPP_NOEXCEPT
-      : srcSubresource{ srcSubresource_ }
-      , srcOffsets{ srcOffsets_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffsets{ dstOffsets_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers          srcSubresource_ = {},
+                                       std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & srcOffsets_     = {},
+                                       VULKAN_HPP_NAMESPACE::ImageSubresourceLayers          dstSubresource_ = {},
+                                       std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & dstOffsets_     = {} ) VULKAN_HPP_NOEXCEPT
+      : srcSubresource( srcSubresource_ )
+      , srcOffsets( srcOffsets_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffsets( dstOffsets_ )
     {
     }
 
@@ -58742,39 +42784,39 @@ namespace VULKAN_HPP_NAMESPACE
     ImageBlit( VkImageBlit const & rhs ) VULKAN_HPP_NOEXCEPT : ImageBlit( *reinterpret_cast<ImageBlit const *>( &rhs ) ) {}
 
     ImageBlit & operator=( ImageBlit const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageBlit & operator=( VkImageBlit const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageBlit const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageBlit const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setSrcOffsets( std::array<Offset3D, 2> const & srcOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setSrcOffsets( std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & srcOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffsets = srcOffsets_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setDstOffsets( std::array<Offset3D, 2> const & dstOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageBlit & setDstOffsets( std::array<VULKAN_HPP_NAMESPACE::Offset3D, 2> const & dstOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffsets = dstOffsets_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageBlit const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -58786,18 +42828,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageBlit *>( this );
     }
 
-    operator VkImageBlit const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageBlit *>( this );
-    }
-
-    operator VkImageBlit *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageBlit *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageSubresourceLayers const &, ArrayWrapper1D<Offset3D, 2> const &, ImageSubresourceLayers const &, ArrayWrapper1D<Offset3D, 2> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcSubresource, srcOffsets, dstSubresource, dstOffsets );
@@ -58824,22 +42863,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageSubresourceLayers      srcSubresource = {};
-    ArrayWrapper1D<Offset3D, 2> srcOffsets     = {};
-    ImageSubresourceLayers      dstSubresource = {};
-    ArrayWrapper1D<Offset3D, 2> dstOffsets     = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers                            srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> srcOffsets     = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers                            dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::Offset3D, 2> dstOffsets     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageBlit>
-  {
-    using Type = ImageBlit;
-  };
-#endif
-
-  // wrapper struct for struct VkImageCaptureDescriptorDataInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCaptureDescriptorDataInfoEXT.html
   struct ImageCaptureDescriptorDataInfoEXT
   {
     using NativeType = VkImageCaptureDescriptorDataInfoEXT;
@@ -58847,10 +42876,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageCaptureDescriptorDataInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCaptureDescriptorDataInfoEXT( Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCaptureDescriptorDataInfoEXT( VULKAN_HPP_NAMESPACE::Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
     {
     }
 
@@ -58862,27 +42891,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageCaptureDescriptorDataInfoEXT & operator=( ImageCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCaptureDescriptorDataInfoEXT & operator=( VkImageCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCaptureDescriptorDataInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCaptureDescriptorDataInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageCaptureDescriptorDataInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCaptureDescriptorDataInfoEXT & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCaptureDescriptorDataInfoEXT & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageCaptureDescriptorDataInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -58894,18 +42923,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCaptureDescriptorDataInfoEXT *>( this );
     }
 
-    operator VkImageCaptureDescriptorDataInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCaptureDescriptorDataInfoEXT *>( this );
-    }
-
-    operator VkImageCaptureDescriptorDataInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCaptureDescriptorDataInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image );
     }
@@ -58930,26 +42954,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType = StructureType::eImageCaptureDescriptorDataInfoEXT;
-    const void *  pNext = {};
-    Image         image = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eImageCaptureDescriptorDataInfoEXT;
+    const void *                        pNext = {};
+    VULKAN_HPP_NAMESPACE::Image         image = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCaptureDescriptorDataInfoEXT>
-  {
-    using Type = ImageCaptureDescriptorDataInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageCaptureDescriptorDataInfoEXT>
   {
     using Type = ImageCaptureDescriptorDataInfoEXT;
   };
 
-  // wrapper struct for struct VkImageCompressionControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionControlEXT.html
   struct ImageCompressionControlEXT
   {
     using NativeType = VkImageCompressionControlEXT;
@@ -58957,15 +42972,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageCompressionControlEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCompressionControlEXT( ImageCompressionFlagsEXT            flags_                        = {},
-                                                     uint32_t                            compressionControlPlaneCount_ = {},
-                                                     ImageCompressionFixedRateFlagsEXT * pFixedRateFlags_              = {},
-                                                     const void *                        pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , compressionControlPlaneCount{ compressionControlPlaneCount_ }
-      , pFixedRateFlags{ pFixedRateFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCompressionControlEXT( VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT            flags_                        = {},
+                                                     uint32_t                                                  compressionControlPlaneCount_ = {},
+                                                     VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT * pFixedRateFlags_              = {},
+                                                     const void *                                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , compressionControlPlaneCount( compressionControlPlaneCount_ )
+      , pFixedRateFlags( pFixedRateFlags_ )
     {
     }
 
@@ -58977,9 +42992,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageCompressionControlEXT( ImageCompressionFlagsEXT                                           flags_,
-                                ArrayProxyNoTemporaries<ImageCompressionFixedRateFlagsEXT> const & fixedRateFlags_,
-                                const void *                                                       pNext_ = nullptr )
+    ImageCompressionControlEXT( VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT                                                                 flags_,
+                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT> const & fixedRateFlags_,
+                                const void * pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , compressionControlPlaneCount( static_cast<uint32_t>( fixedRateFlags_.size() ) )
@@ -58989,22 +43004,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageCompressionControlEXT & operator=( ImageCompressionControlEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCompressionControlEXT & operator=( VkImageCompressionControlEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCompressionControlEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCompressionControlEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageCompressionControlEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCompressionControlEXT & setFlags( ImageCompressionFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCompressionControlEXT & setFlags( VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -59016,21 +43031,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCompressionControlEXT & setPFixedRateFlags( ImageCompressionFixedRateFlagsEXT * pFixedRateFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCompressionControlEXT &
+      setPFixedRateFlags( VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT * pFixedRateFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       pFixedRateFlags = pFixedRateFlags_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageCompressionControlEXT & setFixedRateFlags( ArrayProxyNoTemporaries<ImageCompressionFixedRateFlagsEXT> const & fixedRateFlags_ ) VULKAN_HPP_NOEXCEPT
+    ImageCompressionControlEXT & setFixedRateFlags(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT> const & fixedRateFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       compressionControlPlaneCount = static_cast<uint32_t>( fixedRateFlags_.size() );
       pFixedRateFlags              = fixedRateFlags_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageCompressionControlEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59042,18 +43059,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCompressionControlEXT *>( this );
     }
 
-    operator VkImageCompressionControlEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCompressionControlEXT *>( this );
-    }
-
-    operator VkImageCompressionControlEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCompressionControlEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageCompressionFlagsEXT const &, uint32_t const &, ImageCompressionFixedRateFlagsEXT * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, compressionControlPlaneCount, pFixedRateFlags );
@@ -59080,29 +43095,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType                        = StructureType::eImageCompressionControlEXT;
-    const void *                        pNext                        = {};
-    ImageCompressionFlagsEXT            flags                        = {};
-    uint32_t                            compressionControlPlaneCount = {};
-    ImageCompressionFixedRateFlagsEXT * pFixedRateFlags              = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType                        = StructureType::eImageCompressionControlEXT;
+    const void *                                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT            flags                        = {};
+    uint32_t                                                  compressionControlPlaneCount = {};
+    VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT * pFixedRateFlags              = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCompressionControlEXT>
-  {
-    using Type = ImageCompressionControlEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageCompressionControlEXT>
   {
     using Type = ImageCompressionControlEXT;
   };
 
-  // wrapper struct for struct VkImageCompressionPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCompressionPropertiesEXT.html
   struct ImageCompressionPropertiesEXT
   {
     using NativeType = VkImageCompressionPropertiesEXT;
@@ -59110,13 +43115,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageCompressionPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCompressionPropertiesEXT( ImageCompressionFlagsEXT          imageCompressionFlags_          = {},
-                                                        ImageCompressionFixedRateFlagsEXT imageCompressionFixedRateFlags_ = {},
-                                                        void *                            pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageCompressionFlags{ imageCompressionFlags_ }
-      , imageCompressionFixedRateFlags{ imageCompressionFixedRateFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCompressionPropertiesEXT( VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT          imageCompressionFlags_          = {},
+                                                        VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT imageCompressionFixedRateFlags_ = {},
+                                                        void *                                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageCompressionFlags( imageCompressionFlags_ )
+      , imageCompressionFixedRateFlags( imageCompressionFixedRateFlags_ )
     {
     }
 
@@ -59128,11 +43133,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageCompressionPropertiesEXT & operator=( ImageCompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCompressionPropertiesEXT & operator=( VkImageCompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCompressionPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCompressionPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -59146,18 +43151,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCompressionPropertiesEXT *>( this );
     }
 
-    operator VkImageCompressionPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCompressionPropertiesEXT *>( this );
-    }
-
-    operator VkImageCompressionPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCompressionPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageCompressionFlagsEXT const &, ImageCompressionFixedRateFlagsEXT const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageCompressionFlags, imageCompressionFixedRateFlags );
@@ -59184,20 +43186,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType                          = StructureType::eImageCompressionPropertiesEXT;
-    void *                            pNext                          = {};
-    ImageCompressionFlagsEXT          imageCompressionFlags          = {};
-    ImageCompressionFixedRateFlagsEXT imageCompressionFixedRateFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                          = StructureType::eImageCompressionPropertiesEXT;
+    void *                                                  pNext                          = {};
+    VULKAN_HPP_NAMESPACE::ImageCompressionFlagsEXT          imageCompressionFlags          = {};
+    VULKAN_HPP_NAMESPACE::ImageCompressionFixedRateFlagsEXT imageCompressionFixedRateFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCompressionPropertiesEXT>
-  {
-    using Type = ImageCompressionPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageCompressionPropertiesEXT>
   {
@@ -59205,8 +43199,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImageFormatConstraintsInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageFormatConstraintsInfoFUCHSIA.html
   struct ImageFormatConstraintsInfoFUCHSIA
   {
     using NativeType = VkImageFormatConstraintsInfoFUCHSIA;
@@ -59214,21 +43206,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageFormatConstraintsInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageFormatConstraintsInfoFUCHSIA( ImageCreateInfo                    imageCreateInfo_        = {},
-                                                            FormatFeatureFlags                 requiredFormatFeatures_ = {},
-                                                            ImageFormatConstraintsFlagsFUCHSIA flags_                  = {},
-                                                            uint64_t                           sysmemPixelFormat_      = {},
-                                                            uint32_t                           colorSpaceCount_        = {},
-                                                            const SysmemColorSpaceFUCHSIA *    pColorSpaces_           = {},
-                                                            const void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageCreateInfo{ imageCreateInfo_ }
-      , requiredFormatFeatures{ requiredFormatFeatures_ }
-      , flags{ flags_ }
-      , sysmemPixelFormat{ sysmemPixelFormat_ }
-      , colorSpaceCount{ colorSpaceCount_ }
-      , pColorSpaces{ pColorSpaces_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageFormatConstraintsInfoFUCHSIA( VULKAN_HPP_NAMESPACE::ImageCreateInfo                    imageCreateInfo_        = {},
+                                                            VULKAN_HPP_NAMESPACE::FormatFeatureFlags                 requiredFormatFeatures_ = {},
+                                                            VULKAN_HPP_NAMESPACE::ImageFormatConstraintsFlagsFUCHSIA flags_                  = {},
+                                                            uint64_t                                                 sysmemPixelFormat_      = {},
+                                                            uint32_t                                                 colorSpaceCount_        = {},
+                                                            const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA *    pColorSpaces_           = {},
+                                                            const void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageCreateInfo( imageCreateInfo_ )
+      , requiredFormatFeatures( requiredFormatFeatures_ )
+      , flags( flags_ )
+      , sysmemPixelFormat( sysmemPixelFormat_ )
+      , colorSpaceCount( colorSpaceCount_ )
+      , pColorSpaces( pColorSpaces_ )
     {
     }
 
@@ -59240,12 +43232,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageFormatConstraintsInfoFUCHSIA( ImageCreateInfo                                                imageCreateInfo_,
-                                       FormatFeatureFlags                                             requiredFormatFeatures_,
-                                       ImageFormatConstraintsFlagsFUCHSIA                             flags_,
-                                       uint64_t                                                       sysmemPixelFormat_,
-                                       ArrayProxyNoTemporaries<const SysmemColorSpaceFUCHSIA> const & colorSpaces_,
-                                       const void *                                                   pNext_ = nullptr )
+    ImageFormatConstraintsInfoFUCHSIA( VULKAN_HPP_NAMESPACE::ImageCreateInfo                    imageCreateInfo_,
+                                       VULKAN_HPP_NAMESPACE::FormatFeatureFlags                 requiredFormatFeatures_,
+                                       VULKAN_HPP_NAMESPACE::ImageFormatConstraintsFlagsFUCHSIA flags_,
+                                       uint64_t                                                 sysmemPixelFormat_,
+                                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA> const & colorSpaces_,
+                                       const void * pNext_ = nullptr )
       : pNext( pNext_ )
       , imageCreateInfo( imageCreateInfo_ )
       , requiredFormatFeatures( requiredFormatFeatures_ )
@@ -59258,34 +43250,36 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageFormatConstraintsInfoFUCHSIA & operator=( ImageFormatConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageFormatConstraintsInfoFUCHSIA & operator=( VkImageFormatConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageFormatConstraintsInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setImageCreateInfo( ImageCreateInfo const & imageCreateInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA &
+      setImageCreateInfo( VULKAN_HPP_NAMESPACE::ImageCreateInfo const & imageCreateInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       imageCreateInfo = imageCreateInfo_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setRequiredFormatFeatures( FormatFeatureFlags requiredFormatFeatures_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA &
+      setRequiredFormatFeatures( VULKAN_HPP_NAMESPACE::FormatFeatureFlags requiredFormatFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       requiredFormatFeatures = requiredFormatFeatures_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setFlags( ImageFormatConstraintsFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setFlags( VULKAN_HPP_NAMESPACE::ImageFormatConstraintsFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -59303,21 +43297,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA & setPColorSpaces( const SysmemColorSpaceFUCHSIA * pColorSpaces_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageFormatConstraintsInfoFUCHSIA &
+      setPColorSpaces( const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA * pColorSpaces_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorSpaces = pColorSpaces_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageFormatConstraintsInfoFUCHSIA & setColorSpaces( ArrayProxyNoTemporaries<const SysmemColorSpaceFUCHSIA> const & colorSpaces_ ) VULKAN_HPP_NOEXCEPT
+    ImageFormatConstraintsInfoFUCHSIA & setColorSpaces(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA> const & colorSpaces_ ) VULKAN_HPP_NOEXCEPT
     {
       colorSpaceCount = static_cast<uint32_t>( colorSpaces_.size() );
       pColorSpaces    = colorSpaces_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageFormatConstraintsInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59329,25 +43325,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageFormatConstraintsInfoFUCHSIA *>( this );
     }
 
-    operator VkImageFormatConstraintsInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageFormatConstraintsInfoFUCHSIA *>( this );
-    }
-
-    operator VkImageFormatConstraintsInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageFormatConstraintsInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageCreateInfo const &,
-               FormatFeatureFlags const &,
-               ImageFormatConstraintsFlagsFUCHSIA const &,
+               VULKAN_HPP_NAMESPACE::ImageCreateInfo const &,
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageFormatConstraintsFlagsFUCHSIA const &,
                uint64_t const &,
                uint32_t const &,
-               const SysmemColorSpaceFUCHSIA * const &>
+               const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageCreateInfo, requiredFormatFeatures, flags, sysmemPixelFormat, colorSpaceCount, pColorSpaces );
@@ -59375,24 +43365,16 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                      sType                  = StructureType::eImageFormatConstraintsInfoFUCHSIA;
-    const void *                       pNext                  = {};
-    ImageCreateInfo                    imageCreateInfo        = {};
-    FormatFeatureFlags                 requiredFormatFeatures = {};
-    ImageFormatConstraintsFlagsFUCHSIA flags                  = {};
-    uint64_t                           sysmemPixelFormat      = {};
-    uint32_t                           colorSpaceCount        = {};
-    const SysmemColorSpaceFUCHSIA *    pColorSpaces           = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                  = StructureType::eImageFormatConstraintsInfoFUCHSIA;
+    const void *                                             pNext                  = {};
+    VULKAN_HPP_NAMESPACE::ImageCreateInfo                    imageCreateInfo        = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags                 requiredFormatFeatures = {};
+    VULKAN_HPP_NAMESPACE::ImageFormatConstraintsFlagsFUCHSIA flags                  = {};
+    uint64_t                                                 sysmemPixelFormat      = {};
+    uint32_t                                                 colorSpaceCount        = {};
+    const VULKAN_HPP_NAMESPACE::SysmemColorSpaceFUCHSIA *    pColorSpaces           = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageFormatConstraintsInfoFUCHSIA>
-  {
-    using Type = ImageFormatConstraintsInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageFormatConstraintsInfoFUCHSIA>
   {
@@ -59401,7 +43383,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImageConstraintsInfoFUCHSIA, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageConstraintsInfoFUCHSIA.html
   struct ImageConstraintsInfoFUCHSIA
   {
     using NativeType = VkImageConstraintsInfoFUCHSIA;
@@ -59409,17 +43390,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageConstraintsInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageConstraintsInfoFUCHSIA( uint32_t                                  formatConstraintsCount_      = {},
-                                                      const ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints_          = {},
-                                                      BufferCollectionConstraintsInfoFUCHSIA    bufferCollectionConstraints_ = {},
-                                                      ImageConstraintsInfoFlagsFUCHSIA          flags_                       = {},
-                                                      const void *                              pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , formatConstraintsCount{ formatConstraintsCount_ }
-      , pFormatConstraints{ pFormatConstraints_ }
-      , bufferCollectionConstraints{ bufferCollectionConstraints_ }
-      , flags{ flags_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageConstraintsInfoFUCHSIA( uint32_t                                                        formatConstraintsCount_      = {},
+                                                      const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints_          = {},
+                                                      VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA    bufferCollectionConstraints_ = {},
+                                                      VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFlagsFUCHSIA          flags_                       = {},
+                                                      const void *                                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , formatConstraintsCount( formatConstraintsCount_ )
+      , pFormatConstraints( pFormatConstraints_ )
+      , bufferCollectionConstraints( bufferCollectionConstraints_ )
+      , flags( flags_ )
     {
     }
 
@@ -59431,10 +43412,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageConstraintsInfoFUCHSIA( ArrayProxyNoTemporaries<const ImageFormatConstraintsInfoFUCHSIA> const & formatConstraints_,
-                                 BufferCollectionConstraintsInfoFUCHSIA                                   bufferCollectionConstraints_ = {},
-                                 ImageConstraintsInfoFlagsFUCHSIA                                         flags_                       = {},
-                                 const void *                                                             pNext_                       = nullptr )
+    ImageConstraintsInfoFUCHSIA(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA> const & formatConstraints_,
+      VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA                                                         bufferCollectionConstraints_ = {},
+      VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFlagsFUCHSIA                                                               flags_                       = {},
+      const void *                                                                                                         pNext_ = nullptr )
       : pNext( pNext_ )
       , formatConstraintsCount( static_cast<uint32_t>( formatConstraints_.size() ) )
       , pFormatConstraints( formatConstraints_.data() )
@@ -59445,15 +43427,15 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageConstraintsInfoFUCHSIA & operator=( ImageConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageConstraintsInfoFUCHSIA & operator=( VkImageConstraintsInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageConstraintsInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageConstraintsInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -59467,15 +43449,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 ImageConstraintsInfoFUCHSIA &
-      setPFormatConstraints( const ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints_ ) VULKAN_HPP_NOEXCEPT
+      setPFormatConstraints( const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints_ ) VULKAN_HPP_NOEXCEPT
     {
       pFormatConstraints = pFormatConstraints_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageConstraintsInfoFUCHSIA &
-      setFormatConstraints( ArrayProxyNoTemporaries<const ImageFormatConstraintsInfoFUCHSIA> const & formatConstraints_ ) VULKAN_HPP_NOEXCEPT
+    ImageConstraintsInfoFUCHSIA & setFormatConstraints(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA> const & formatConstraints_ )
+      VULKAN_HPP_NOEXCEPT
     {
       formatConstraintsCount = static_cast<uint32_t>( formatConstraints_.size() );
       pFormatConstraints     = formatConstraints_.data();
@@ -59484,18 +43467,18 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VULKAN_HPP_CONSTEXPR_14 ImageConstraintsInfoFUCHSIA &
-      setBufferCollectionConstraints( BufferCollectionConstraintsInfoFUCHSIA const & bufferCollectionConstraints_ ) VULKAN_HPP_NOEXCEPT
+      setBufferCollectionConstraints( VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA const & bufferCollectionConstraints_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferCollectionConstraints = bufferCollectionConstraints_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageConstraintsInfoFUCHSIA & setFlags( ImageConstraintsInfoFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageConstraintsInfoFUCHSIA & setFlags( VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageConstraintsInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59507,23 +43490,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageConstraintsInfoFUCHSIA *>( this );
     }
 
-    operator VkImageConstraintsInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageConstraintsInfoFUCHSIA *>( this );
-    }
-
-    operator VkImageConstraintsInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageConstraintsInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const ImageFormatConstraintsInfoFUCHSIA * const &,
-               BufferCollectionConstraintsInfoFUCHSIA const &,
-               ImageConstraintsInfoFlagsFUCHSIA const &>
+               const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA * const &,
+               VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA const &,
+               VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFlagsFUCHSIA const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, formatConstraintsCount, pFormatConstraints, bufferCollectionConstraints, flags );
@@ -59550,22 +43527,14 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                             sType                       = StructureType::eImageConstraintsInfoFUCHSIA;
-    const void *                              pNext                       = {};
-    uint32_t                                  formatConstraintsCount      = {};
-    const ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints          = {};
-    BufferCollectionConstraintsInfoFUCHSIA    bufferCollectionConstraints = {};
-    ImageConstraintsInfoFlagsFUCHSIA          flags                       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType                       = StructureType::eImageConstraintsInfoFUCHSIA;
+    const void *                                                    pNext                       = {};
+    uint32_t                                                        formatConstraintsCount      = {};
+    const VULKAN_HPP_NAMESPACE::ImageFormatConstraintsInfoFUCHSIA * pFormatConstraints          = {};
+    VULKAN_HPP_NAMESPACE::BufferCollectionConstraintsInfoFUCHSIA    bufferCollectionConstraints = {};
+    VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFlagsFUCHSIA          flags                       = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageConstraintsInfoFUCHSIA>
-  {
-    using Type = ImageConstraintsInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageConstraintsInfoFUCHSIA>
   {
@@ -59573,22 +43542,21 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkImageCopy, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageCopy.html
   struct ImageCopy
   {
     using NativeType = VkImageCopy;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageCopy( ImageSubresourceLayers srcSubresource_ = {},
-                                    Offset3D               srcOffset_      = {},
-                                    ImageSubresourceLayers dstSubresource_ = {},
-                                    Offset3D               dstOffset_      = {},
-                                    Extent3D               extent_         = {} ) VULKAN_HPP_NOEXCEPT
-      : srcSubresource{ srcSubresource_ }
-      , srcOffset{ srcOffset_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffset{ dstOffset_ }
-      , extent{ extent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageCopy( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource_ = {},
+                                    VULKAN_HPP_NAMESPACE::Offset3D               srcOffset_      = {},
+                                    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource_ = {},
+                                    VULKAN_HPP_NAMESPACE::Offset3D               dstOffset_      = {},
+                                    VULKAN_HPP_NAMESPACE::Extent3D               extent_         = {} ) VULKAN_HPP_NOEXCEPT
+      : srcSubresource( srcSubresource_ )
+      , srcOffset( srcOffset_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffset( dstOffset_ )
+      , extent( extent_ )
     {
     }
 
@@ -59597,45 +43565,45 @@ namespace VULKAN_HPP_NAMESPACE
     ImageCopy( VkImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT : ImageCopy( *reinterpret_cast<ImageCopy const *>( &rhs ) ) {}
 
     ImageCopy & operator=( ImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageCopy & operator=( VkImageCopy const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageCopy const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageCopy const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setSrcOffset( Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setSrcOffset( VULKAN_HPP_NAMESPACE::Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setDstOffset( Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setDstOffset( VULKAN_HPP_NAMESPACE::Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageCopy & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageCopy const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59647,18 +43615,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageCopy *>( this );
     }
 
-    operator VkImageCopy const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageCopy *>( this );
-    }
-
-    operator VkImageCopy *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageCopy *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageSubresourceLayers const &, Offset3D const &, ImageSubresourceLayers const &, Offset3D const &, Extent3D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcSubresource, srcOffset, dstSubresource, dstOffset, extent );
@@ -59685,34 +43651,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageSubresourceLayers srcSubresource = {};
-    Offset3D               srcOffset      = {};
-    ImageSubresourceLayers dstSubresource = {};
-    Offset3D               dstOffset      = {};
-    Extent3D               extent         = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               srcOffset      = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               dstOffset      = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               extent         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageCopy>
-  {
-    using Type = ImageCopy;
-  };
-#endif
-
-  // wrapper struct for struct VkSubresourceLayout, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubresourceLayout.html
   struct SubresourceLayout
   {
     using NativeType = VkSubresourceLayout;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubresourceLayout(
-      DeviceSize offset_ = {}, DeviceSize size_ = {}, DeviceSize rowPitch_ = {}, DeviceSize arrayPitch_ = {}, DeviceSize depthPitch_ = {} ) VULKAN_HPP_NOEXCEPT
-      : offset{ offset_ }
-      , size{ size_ }
-      , rowPitch{ rowPitch_ }
-      , arrayPitch{ arrayPitch_ }
-      , depthPitch{ depthPitch_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubresourceLayout( VULKAN_HPP_NAMESPACE::DeviceSize offset_     = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize size_       = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize rowPitch_   = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize arrayPitch_ = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize depthPitch_ = {} ) VULKAN_HPP_NOEXCEPT
+      : offset( offset_ )
+      , size( size_ )
+      , rowPitch( rowPitch_ )
+      , arrayPitch( arrayPitch_ )
+      , depthPitch( depthPitch_ )
     {
     }
 
@@ -59721,45 +43681,45 @@ namespace VULKAN_HPP_NAMESPACE
     SubresourceLayout( VkSubresourceLayout const & rhs ) VULKAN_HPP_NOEXCEPT : SubresourceLayout( *reinterpret_cast<SubresourceLayout const *>( &rhs ) ) {}
 
     SubresourceLayout & operator=( SubresourceLayout const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubresourceLayout & operator=( VkSubresourceLayout const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubresourceLayout const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubresourceLayout const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setRowPitch( DeviceSize rowPitch_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setRowPitch( VULKAN_HPP_NAMESPACE::DeviceSize rowPitch_ ) VULKAN_HPP_NOEXCEPT
     {
       rowPitch = rowPitch_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setArrayPitch( DeviceSize arrayPitch_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setArrayPitch( VULKAN_HPP_NAMESPACE::DeviceSize arrayPitch_ ) VULKAN_HPP_NOEXCEPT
     {
       arrayPitch = arrayPitch_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setDepthPitch( DeviceSize depthPitch_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubresourceLayout & setDepthPitch( VULKAN_HPP_NAMESPACE::DeviceSize depthPitch_ ) VULKAN_HPP_NOEXCEPT
     {
       depthPitch = depthPitch_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubresourceLayout const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59771,18 +43731,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubresourceLayout *>( this );
     }
 
-    operator VkSubresourceLayout const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubresourceLayout *>( this );
-    }
-
-    operator VkSubresourceLayout *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubresourceLayout *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, DeviceSize const &, DeviceSize const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( offset, size, rowPitch, arrayPitch, depthPitch );
     }
@@ -59808,23 +43767,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize offset     = {};
-    DeviceSize size       = {};
-    DeviceSize rowPitch   = {};
-    DeviceSize arrayPitch = {};
-    DeviceSize depthPitch = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize offset     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize size       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize rowPitch   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize arrayPitch = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize depthPitch = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubresourceLayout>
-  {
-    using Type = SubresourceLayout;
-  };
-#endif
-
-  // wrapper struct for struct VkImageDrmFormatModifierExplicitCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageDrmFormatModifierExplicitCreateInfoEXT.html
   struct ImageDrmFormatModifierExplicitCreateInfoEXT
   {
     using NativeType = VkImageDrmFormatModifierExplicitCreateInfoEXT;
@@ -59832,15 +43781,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageDrmFormatModifierExplicitCreateInfoEXT( uint64_t                  drmFormatModifier_           = {},
-                                                                      uint32_t                  drmFormatModifierPlaneCount_ = {},
-                                                                      const SubresourceLayout * pPlaneLayouts_               = {},
-                                                                      const void *              pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifier{ drmFormatModifier_ }
-      , drmFormatModifierPlaneCount{ drmFormatModifierPlaneCount_ }
-      , pPlaneLayouts{ pPlaneLayouts_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageDrmFormatModifierExplicitCreateInfoEXT( uint64_t                                        drmFormatModifier_           = {},
+                                                                      uint32_t                                        drmFormatModifierPlaneCount_ = {},
+                                                                      const VULKAN_HPP_NAMESPACE::SubresourceLayout * pPlaneLayouts_               = {},
+                                                                      const void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , drmFormatModifier( drmFormatModifier_ )
+      , drmFormatModifierPlaneCount( drmFormatModifierPlaneCount_ )
+      , pPlaneLayouts( pPlaneLayouts_ )
     {
     }
 
@@ -59852,9 +43801,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageDrmFormatModifierExplicitCreateInfoEXT( uint64_t                                                 drmFormatModifier_,
-                                                 ArrayProxyNoTemporaries<const SubresourceLayout> const & planeLayouts_,
-                                                 const void *                                             pNext_ = nullptr )
+    ImageDrmFormatModifierExplicitCreateInfoEXT(
+      uint64_t                                                                                             drmFormatModifier_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubresourceLayout> const & planeLayouts_,
+      const void *                                                                                         pNext_ = nullptr )
       : pNext( pNext_ )
       , drmFormatModifier( drmFormatModifier_ )
       , drmFormatModifierPlaneCount( static_cast<uint32_t>( planeLayouts_.size() ) )
@@ -59864,15 +43814,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageDrmFormatModifierExplicitCreateInfoEXT & operator=( ImageDrmFormatModifierExplicitCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageDrmFormatModifierExplicitCreateInfoEXT & operator=( VkImageDrmFormatModifierExplicitCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageDrmFormatModifierExplicitCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierExplicitCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageDrmFormatModifierExplicitCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -59892,21 +43842,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageDrmFormatModifierExplicitCreateInfoEXT & setPPlaneLayouts( const SubresourceLayout * pPlaneLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageDrmFormatModifierExplicitCreateInfoEXT &
+      setPPlaneLayouts( const VULKAN_HPP_NAMESPACE::SubresourceLayout * pPlaneLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pPlaneLayouts = pPlaneLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageDrmFormatModifierExplicitCreateInfoEXT & setPlaneLayouts( ArrayProxyNoTemporaries<const SubresourceLayout> const & planeLayouts_ ) VULKAN_HPP_NOEXCEPT
+    ImageDrmFormatModifierExplicitCreateInfoEXT &
+      setPlaneLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubresourceLayout> const & planeLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       drmFormatModifierPlaneCount = static_cast<uint32_t>( planeLayouts_.size() );
       pPlaneLayouts               = planeLayouts_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageDrmFormatModifierExplicitCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -59918,18 +43870,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageDrmFormatModifierExplicitCreateInfoEXT *>( this );
     }
 
-    operator VkImageDrmFormatModifierExplicitCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageDrmFormatModifierExplicitCreateInfoEXT *>( this );
-    }
-
-    operator VkImageDrmFormatModifierExplicitCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageDrmFormatModifierExplicitCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, uint32_t const &, const SubresourceLayout * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint64_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::SubresourceLayout * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifier, drmFormatModifierPlaneCount, pPlaneLayouts );
@@ -59956,29 +43906,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType                       = StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT;
-    const void *              pNext                       = {};
-    uint64_t                  drmFormatModifier           = {};
-    uint32_t                  drmFormatModifierPlaneCount = {};
-    const SubresourceLayout * pPlaneLayouts               = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType                       = StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT;
+    const void *                                    pNext                       = {};
+    uint64_t                                        drmFormatModifier           = {};
+    uint32_t                                        drmFormatModifierPlaneCount = {};
+    const VULKAN_HPP_NAMESPACE::SubresourceLayout * pPlaneLayouts               = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageDrmFormatModifierExplicitCreateInfoEXT>
-  {
-    using Type = ImageDrmFormatModifierExplicitCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT>
   {
     using Type = ImageDrmFormatModifierExplicitCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkImageDrmFormatModifierListCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageDrmFormatModifierListCreateInfoEXT.html
   struct ImageDrmFormatModifierListCreateInfoEXT
   {
     using NativeType = VkImageDrmFormatModifierListCreateInfoEXT;
@@ -59986,13 +43926,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageDrmFormatModifierListCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImageDrmFormatModifierListCreateInfoEXT( uint32_t         drmFormatModifierCount_ = {},
                                                                   const uint64_t * pDrmFormatModifiers_    = {},
                                                                   const void *     pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifierCount{ drmFormatModifierCount_ }
-      , pDrmFormatModifiers{ pDrmFormatModifiers_ }
+      : pNext( pNext_ )
+      , drmFormatModifierCount( drmFormatModifierCount_ )
+      , pDrmFormatModifiers( pDrmFormatModifiers_ )
     {
     }
 
@@ -60004,22 +43944,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageDrmFormatModifierListCreateInfoEXT( ArrayProxyNoTemporaries<const uint64_t> const & drmFormatModifiers_, const void * pNext_ = nullptr )
+    ImageDrmFormatModifierListCreateInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & drmFormatModifiers_,
+                                             const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ ), drmFormatModifierCount( static_cast<uint32_t>( drmFormatModifiers_.size() ) ), pDrmFormatModifiers( drmFormatModifiers_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageDrmFormatModifierListCreateInfoEXT & operator=( ImageDrmFormatModifierListCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageDrmFormatModifierListCreateInfoEXT & operator=( VkImageDrmFormatModifierListCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageDrmFormatModifierListCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierListCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageDrmFormatModifierListCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -60039,14 +43980,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageDrmFormatModifierListCreateInfoEXT & setDrmFormatModifiers( ArrayProxyNoTemporaries<const uint64_t> const & drmFormatModifiers_ ) VULKAN_HPP_NOEXCEPT
+    ImageDrmFormatModifierListCreateInfoEXT &
+      setDrmFormatModifiers( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & drmFormatModifiers_ ) VULKAN_HPP_NOEXCEPT
     {
       drmFormatModifierCount = static_cast<uint32_t>( drmFormatModifiers_.size() );
       pDrmFormatModifiers    = drmFormatModifiers_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageDrmFormatModifierListCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60058,18 +44000,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageDrmFormatModifierListCreateInfoEXT *>( this );
     }
 
-    operator VkImageDrmFormatModifierListCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageDrmFormatModifierListCreateInfoEXT *>( this );
-    }
-
-    operator VkImageDrmFormatModifierListCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageDrmFormatModifierListCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifierCount, pDrmFormatModifiers );
     }
@@ -60095,28 +44032,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                  = StructureType::eImageDrmFormatModifierListCreateInfoEXT;
-    const void *     pNext                  = {};
-    uint32_t         drmFormatModifierCount = {};
-    const uint64_t * pDrmFormatModifiers    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::eImageDrmFormatModifierListCreateInfoEXT;
+    const void *                        pNext                  = {};
+    uint32_t                            drmFormatModifierCount = {};
+    const uint64_t *                    pDrmFormatModifiers    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageDrmFormatModifierListCreateInfoEXT>
-  {
-    using Type = ImageDrmFormatModifierListCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageDrmFormatModifierListCreateInfoEXT>
   {
     using Type = ImageDrmFormatModifierListCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkImageDrmFormatModifierPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageDrmFormatModifierPropertiesEXT.html
   struct ImageDrmFormatModifierPropertiesEXT
   {
     using NativeType = VkImageDrmFormatModifierPropertiesEXT;
@@ -60124,10 +44051,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageDrmFormatModifierPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImageDrmFormatModifierPropertiesEXT( uint64_t drmFormatModifier_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifier{ drmFormatModifier_ }
+      : pNext( pNext_ )
+      , drmFormatModifier( drmFormatModifier_ )
     {
     }
 
@@ -60139,11 +44066,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageDrmFormatModifierPropertiesEXT & operator=( ImageDrmFormatModifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageDrmFormatModifierPropertiesEXT & operator=( VkImageDrmFormatModifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageDrmFormatModifierPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageDrmFormatModifierPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -60157,18 +44084,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( this );
     }
 
-    operator VkImageDrmFormatModifierPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageDrmFormatModifierPropertiesEXT *>( this );
-    }
-
-    operator VkImageDrmFormatModifierPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageDrmFormatModifierPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifier );
     }
@@ -60193,26 +44115,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eImageDrmFormatModifierPropertiesEXT;
-    void *        pNext             = {};
-    uint64_t      drmFormatModifier = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eImageDrmFormatModifierPropertiesEXT;
+    void *                              pNext             = {};
+    uint64_t                            drmFormatModifier = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageDrmFormatModifierPropertiesEXT>
-  {
-    using Type = ImageDrmFormatModifierPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageDrmFormatModifierPropertiesEXT>
   {
     using Type = ImageDrmFormatModifierPropertiesEXT;
   };
 
-  // wrapper struct for struct VkImageFormatListCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageFormatListCreateInfo.html
   struct ImageFormatListCreateInfo
   {
     using NativeType = VkImageFormatListCreateInfo;
@@ -60220,12 +44133,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageFormatListCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ImageFormatListCreateInfo( uint32_t viewFormatCount_ = {}, const Format * pViewFormats_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , viewFormatCount{ viewFormatCount_ }
-      , pViewFormats{ pViewFormats_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageFormatListCreateInfo( uint32_t                             viewFormatCount_ = {},
+                                                    const VULKAN_HPP_NAMESPACE::Format * pViewFormats_    = {},
+                                                    const void *                         pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , viewFormatCount( viewFormatCount_ )
+      , pViewFormats( pViewFormats_ )
     {
     }
 
@@ -60237,22 +44151,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageFormatListCreateInfo( ArrayProxyNoTemporaries<const Format> const & viewFormats_, const void * pNext_ = nullptr )
+    ImageFormatListCreateInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & viewFormats_,
+                               const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ ), viewFormatCount( static_cast<uint32_t>( viewFormats_.size() ) ), pViewFormats( viewFormats_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ImageFormatListCreateInfo & operator=( ImageFormatListCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageFormatListCreateInfo & operator=( VkImageFormatListCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageFormatListCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageFormatListCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageFormatListCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -60265,21 +44180,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageFormatListCreateInfo & setPViewFormats( const Format * pViewFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageFormatListCreateInfo & setPViewFormats( const VULKAN_HPP_NAMESPACE::Format * pViewFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewFormats = pViewFormats_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ImageFormatListCreateInfo & setViewFormats( ArrayProxyNoTemporaries<const Format> const & viewFormats_ ) VULKAN_HPP_NOEXCEPT
+    ImageFormatListCreateInfo &
+      setViewFormats( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & viewFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       viewFormatCount = static_cast<uint32_t>( viewFormats_.size() );
       pViewFormats    = viewFormats_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageFormatListCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60291,18 +44207,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageFormatListCreateInfo *>( this );
     }
 
-    operator VkImageFormatListCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageFormatListCreateInfo *>( this );
-    }
-
-    operator VkImageFormatListCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageFormatListCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Format * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Format * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, viewFormatCount, pViewFormats );
     }
@@ -60327,20 +44238,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType           = StructureType::eImageFormatListCreateInfo;
-    const void *   pNext           = {};
-    uint32_t       viewFormatCount = {};
-    const Format * pViewFormats    = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType           = StructureType::eImageFormatListCreateInfo;
+    const void *                         pNext           = {};
+    uint32_t                             viewFormatCount = {};
+    const VULKAN_HPP_NAMESPACE::Format * pViewFormats    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageFormatListCreateInfo>
-  {
-    using Type = ImageFormatListCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageFormatListCreateInfo>
   {
@@ -60349,7 +44252,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageFormatListCreateInfoKHR = ImageFormatListCreateInfo;
 
-  // wrapper struct for struct VkImageFormatProperties2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageFormatProperties2.html
   struct ImageFormatProperties2
   {
     using NativeType = VkImageFormatProperties2;
@@ -60357,10 +44259,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageFormatProperties2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageFormatProperties2( ImageFormatProperties imageFormatProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageFormatProperties{ imageFormatProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageFormatProperties2( VULKAN_HPP_NAMESPACE::ImageFormatProperties imageFormatProperties_ = {},
+                                                 void *                                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageFormatProperties( imageFormatProperties_ )
     {
     }
 
@@ -60372,11 +44275,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageFormatProperties2 & operator=( ImageFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageFormatProperties2 & operator=( VkImageFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageFormatProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageFormatProperties2 const *>( &rhs );
       return *this;
     }
 
@@ -60390,18 +44293,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageFormatProperties2 *>( this );
     }
 
-    operator VkImageFormatProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageFormatProperties2 *>( this );
-    }
-
-    operator VkImageFormatProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageFormatProperties2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageFormatProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageFormatProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageFormatProperties );
     }
@@ -60426,19 +44324,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType                 = StructureType::eImageFormatProperties2;
-    void *                pNext                 = {};
-    ImageFormatProperties imageFormatProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType                 = StructureType::eImageFormatProperties2;
+    void *                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::ImageFormatProperties imageFormatProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageFormatProperties2>
-  {
-    using Type = ImageFormatProperties2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageFormatProperties2>
   {
@@ -60447,7 +44337,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageFormatProperties2KHR = ImageFormatProperties2;
 
-  // wrapper struct for struct VkImageMemoryBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageMemoryBarrier.html
   struct ImageMemoryBarrier
   {
     using NativeType = VkImageMemoryBarrier;
@@ -60455,25 +44344,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageMemoryBarrier;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageMemoryBarrier( AccessFlags           srcAccessMask_       = {},
-                                             AccessFlags           dstAccessMask_       = {},
-                                             ImageLayout           oldLayout_           = ImageLayout::eUndefined,
-                                             ImageLayout           newLayout_           = ImageLayout::eUndefined,
-                                             uint32_t              srcQueueFamilyIndex_ = {},
-                                             uint32_t              dstQueueFamilyIndex_ = {},
-                                             Image                 image_               = {},
-                                             ImageSubresourceRange subresourceRange_    = {},
-                                             const void *          pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , oldLayout{ oldLayout_ }
-      , newLayout{ newLayout_ }
-      , srcQueueFamilyIndex{ srcQueueFamilyIndex_ }
-      , dstQueueFamilyIndex{ dstQueueFamilyIndex_ }
-      , image{ image_ }
-      , subresourceRange{ subresourceRange_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageMemoryBarrier( VULKAN_HPP_NAMESPACE::AccessFlags           srcAccessMask_       = {},
+                                             VULKAN_HPP_NAMESPACE::AccessFlags           dstAccessMask_       = {},
+                                             VULKAN_HPP_NAMESPACE::ImageLayout           oldLayout_           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                             VULKAN_HPP_NAMESPACE::ImageLayout           newLayout_           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                             uint32_t                                    srcQueueFamilyIndex_ = {},
+                                             uint32_t                                    dstQueueFamilyIndex_ = {},
+                                             VULKAN_HPP_NAMESPACE::Image                 image_               = {},
+                                             VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange_    = {},
+                                             const void *                                pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , oldLayout( oldLayout_ )
+      , newLayout( newLayout_ )
+      , srcQueueFamilyIndex( srcQueueFamilyIndex_ )
+      , dstQueueFamilyIndex( dstQueueFamilyIndex_ )
+      , image( image_ )
+      , subresourceRange( subresourceRange_ )
     {
     }
 
@@ -60482,40 +44371,40 @@ namespace VULKAN_HPP_NAMESPACE
     ImageMemoryBarrier( VkImageMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT : ImageMemoryBarrier( *reinterpret_cast<ImageMemoryBarrier const *>( &rhs ) ) {}
 
     ImageMemoryBarrier & operator=( ImageMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageMemoryBarrier & operator=( VkImageMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageMemoryBarrier const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageMemoryBarrier const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setSrcAccessMask( AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setDstAccessMask( AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setOldLayout( ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setOldLayout( VULKAN_HPP_NAMESPACE::ImageLayout oldLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       oldLayout = oldLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setNewLayout( ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setNewLayout( VULKAN_HPP_NAMESPACE::ImageLayout newLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       newLayout = newLayout_;
       return *this;
@@ -60533,18 +44422,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier & setSubresourceRange( ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryBarrier &
+      setSubresourceRange( VULKAN_HPP_NAMESPACE::ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
     {
       subresourceRange = subresourceRange_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageMemoryBarrier const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60556,27 +44446,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageMemoryBarrier *>( this );
     }
 
-    operator VkImageMemoryBarrier const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageMemoryBarrier *>( this );
-    }
-
-    operator VkImageMemoryBarrier *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageMemoryBarrier *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               AccessFlags const &,
-               AccessFlags const &,
-               ImageLayout const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
                uint32_t const &,
-               Image const &,
-               ImageSubresourceRange const &>
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceRange const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcAccessMask, dstAccessMask, oldLayout, newLayout, srcQueueFamilyIndex, dstQueueFamilyIndex, image, subresourceRange );
@@ -60604,33 +44488,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType               = StructureType::eImageMemoryBarrier;
-    const void *          pNext               = {};
-    AccessFlags           srcAccessMask       = {};
-    AccessFlags           dstAccessMask       = {};
-    ImageLayout           oldLayout           = ImageLayout::eUndefined;
-    ImageLayout           newLayout           = ImageLayout::eUndefined;
-    uint32_t              srcQueueFamilyIndex = {};
-    uint32_t              dstQueueFamilyIndex = {};
-    Image                 image               = {};
-    ImageSubresourceRange subresourceRange    = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType               = StructureType::eImageMemoryBarrier;
+    const void *                                pNext               = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags           srcAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags           dstAccessMask       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           oldLayout           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageLayout           newLayout           = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                    srcQueueFamilyIndex = {};
+    uint32_t                                    dstQueueFamilyIndex = {};
+    VULKAN_HPP_NAMESPACE::Image                 image               = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageMemoryBarrier>
-  {
-    using Type = ImageMemoryBarrier;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageMemoryBarrier>
   {
     using Type = ImageMemoryBarrier;
   };
 
-  // wrapper struct for struct VkImageMemoryRequirementsInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageMemoryRequirementsInfo2.html
   struct ImageMemoryRequirementsInfo2
   {
     using NativeType = VkImageMemoryRequirementsInfo2;
@@ -60638,10 +44513,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageMemoryRequirementsInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageMemoryRequirementsInfo2( Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageMemoryRequirementsInfo2( VULKAN_HPP_NAMESPACE::Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
     {
     }
 
@@ -60653,27 +44528,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageMemoryRequirementsInfo2 & operator=( ImageMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageMemoryRequirementsInfo2 & operator=( VkImageMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageMemoryRequirementsInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageMemoryRequirementsInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageMemoryRequirementsInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageMemoryRequirementsInfo2 & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageMemoryRequirementsInfo2 & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageMemoryRequirementsInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60685,18 +44560,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageMemoryRequirementsInfo2 *>( this );
     }
 
-    operator VkImageMemoryRequirementsInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageMemoryRequirementsInfo2 *>( this );
-    }
-
-    operator VkImageMemoryRequirementsInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageMemoryRequirementsInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image );
     }
@@ -60721,19 +44591,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType = StructureType::eImageMemoryRequirementsInfo2;
-    const void *  pNext = {};
-    Image         image = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eImageMemoryRequirementsInfo2;
+    const void *                        pNext = {};
+    VULKAN_HPP_NAMESPACE::Image         image = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageMemoryRequirementsInfo2>
-  {
-    using Type = ImageMemoryRequirementsInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageMemoryRequirementsInfo2>
   {
@@ -60743,8 +44605,6 @@ namespace VULKAN_HPP_NAMESPACE
   using ImageMemoryRequirementsInfo2KHR = ImageMemoryRequirementsInfo2;
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImagePipeSurfaceCreateInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImagePipeSurfaceCreateInfoFUCHSIA.html
   struct ImagePipeSurfaceCreateInfoFUCHSIA
   {
     using NativeType = VkImagePipeSurfaceCreateInfoFUCHSIA;
@@ -60752,13 +44612,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImagepipeSurfaceCreateInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImagePipeSurfaceCreateInfoFUCHSIA( ImagePipeSurfaceCreateFlagsFUCHSIA flags_           = {},
-                                                            zx_handle_t                        imagePipeHandle_ = {},
-                                                            const void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , imagePipeHandle{ imagePipeHandle_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImagePipeSurfaceCreateInfoFUCHSIA( VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateFlagsFUCHSIA flags_           = {},
+                                                            zx_handle_t                                              imagePipeHandle_ = {},
+                                                            const void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , imagePipeHandle( imagePipeHandle_ )
     {
     }
 
@@ -60770,22 +44630,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImagePipeSurfaceCreateInfoFUCHSIA & operator=( ImagePipeSurfaceCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImagePipeSurfaceCreateInfoFUCHSIA & operator=( VkImagePipeSurfaceCreateInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImagePipeSurfaceCreateInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImagePipeSurfaceCreateInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImagePipeSurfaceCreateInfoFUCHSIA & setFlags( ImagePipeSurfaceCreateFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImagePipeSurfaceCreateInfoFUCHSIA & setFlags( VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateFlagsFUCHSIA flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -60796,7 +44656,7 @@ namespace VULKAN_HPP_NAMESPACE
       imagePipeHandle = imagePipeHandle_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImagePipeSurfaceCreateInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60808,18 +44668,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImagePipeSurfaceCreateInfoFUCHSIA *>( this );
     }
 
-    operator VkImagePipeSurfaceCreateInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImagePipeSurfaceCreateInfoFUCHSIA *>( this );
-    }
-
-    operator VkImagePipeSurfaceCreateInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImagePipeSurfaceCreateInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImagePipeSurfaceCreateFlagsFUCHSIA const &, zx_handle_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateFlagsFUCHSIA const &,
+               zx_handle_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, imagePipeHandle );
     }
@@ -60853,20 +44711,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                      sType           = StructureType::eImagepipeSurfaceCreateInfoFUCHSIA;
-    const void *                       pNext           = {};
-    ImagePipeSurfaceCreateFlagsFUCHSIA flags           = {};
-    zx_handle_t                        imagePipeHandle = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType           = StructureType::eImagepipeSurfaceCreateInfoFUCHSIA;
+    const void *                                             pNext           = {};
+    VULKAN_HPP_NAMESPACE::ImagePipeSurfaceCreateFlagsFUCHSIA flags           = {};
+    zx_handle_t                                              imagePipeHandle = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImagePipeSurfaceCreateInfoFUCHSIA>
-  {
-    using Type = ImagePipeSurfaceCreateInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImagepipeSurfaceCreateInfoFUCHSIA>
   {
@@ -60874,8 +44724,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkImagePlaneMemoryRequirementsInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImagePlaneMemoryRequirementsInfo.html
   struct ImagePlaneMemoryRequirementsInfo
   {
     using NativeType = VkImagePlaneMemoryRequirementsInfo;
@@ -60883,11 +44731,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImagePlaneMemoryRequirementsInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImagePlaneMemoryRequirementsInfo( ImageAspectFlagBits planeAspect_ = ImageAspectFlagBits::eColor,
-                                                           const void *        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , planeAspect{ planeAspect_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      ImagePlaneMemoryRequirementsInfo( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect_ = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor,
+                                        const void *                              pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , planeAspect( planeAspect_ )
     {
     }
 
@@ -60899,27 +44748,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImagePlaneMemoryRequirementsInfo & operator=( ImagePlaneMemoryRequirementsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImagePlaneMemoryRequirementsInfo & operator=( VkImagePlaneMemoryRequirementsInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImagePlaneMemoryRequirementsInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImagePlaneMemoryRequirementsInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImagePlaneMemoryRequirementsInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImagePlaneMemoryRequirementsInfo & setPlaneAspect( ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImagePlaneMemoryRequirementsInfo & setPlaneAspect( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect_ ) VULKAN_HPP_NOEXCEPT
     {
       planeAspect = planeAspect_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImagePlaneMemoryRequirementsInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -60931,18 +44780,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImagePlaneMemoryRequirementsInfo *>( this );
     }
 
-    operator VkImagePlaneMemoryRequirementsInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImagePlaneMemoryRequirementsInfo *>( this );
-    }
-
-    operator VkImagePlaneMemoryRequirementsInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImagePlaneMemoryRequirementsInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageAspectFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageAspectFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, planeAspect );
     }
@@ -60967,19 +44811,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType       = StructureType::eImagePlaneMemoryRequirementsInfo;
-    const void *        pNext       = {};
-    ImageAspectFlagBits planeAspect = ImageAspectFlagBits::eColor;
+    VULKAN_HPP_NAMESPACE::StructureType       sType       = StructureType::eImagePlaneMemoryRequirementsInfo;
+    const void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits planeAspect = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImagePlaneMemoryRequirementsInfo>
-  {
-    using Type = ImagePlaneMemoryRequirementsInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImagePlaneMemoryRequirementsInfo>
   {
@@ -60988,22 +44824,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImagePlaneMemoryRequirementsInfoKHR = ImagePlaneMemoryRequirementsInfo;
 
-  // wrapper struct for struct VkImageResolve, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageResolve.html
   struct ImageResolve
   {
     using NativeType = VkImageResolve;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageResolve( ImageSubresourceLayers srcSubresource_ = {},
-                                       Offset3D               srcOffset_      = {},
-                                       ImageSubresourceLayers dstSubresource_ = {},
-                                       Offset3D               dstOffset_      = {},
-                                       Extent3D               extent_         = {} ) VULKAN_HPP_NOEXCEPT
-      : srcSubresource{ srcSubresource_ }
-      , srcOffset{ srcOffset_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffset{ dstOffset_ }
-      , extent{ extent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageResolve( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource_ = {},
+                                       VULKAN_HPP_NAMESPACE::Offset3D               srcOffset_      = {},
+                                       VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource_ = {},
+                                       VULKAN_HPP_NAMESPACE::Offset3D               dstOffset_      = {},
+                                       VULKAN_HPP_NAMESPACE::Extent3D               extent_         = {} ) VULKAN_HPP_NOEXCEPT
+      : srcSubresource( srcSubresource_ )
+      , srcOffset( srcOffset_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffset( dstOffset_ )
+      , extent( extent_ )
     {
     }
 
@@ -61012,45 +44847,45 @@ namespace VULKAN_HPP_NAMESPACE
     ImageResolve( VkImageResolve const & rhs ) VULKAN_HPP_NOEXCEPT : ImageResolve( *reinterpret_cast<ImageResolve const *>( &rhs ) ) {}
 
     ImageResolve & operator=( ImageResolve const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageResolve & operator=( VkImageResolve const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageResolve const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageResolve const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setSrcOffset( Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setSrcOffset( VULKAN_HPP_NAMESPACE::Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setDstOffset( Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setDstOffset( VULKAN_HPP_NAMESPACE::Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageResolve const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61062,18 +44897,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageResolve *>( this );
     }
 
-    operator VkImageResolve const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageResolve *>( this );
-    }
-
-    operator VkImageResolve *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageResolve *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageSubresourceLayers const &, Offset3D const &, ImageSubresourceLayers const &, Offset3D const &, Extent3D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcSubresource, srcOffset, dstSubresource, dstOffset, extent );
@@ -61100,22 +44933,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageSubresourceLayers srcSubresource = {};
-    Offset3D               srcOffset      = {};
-    ImageSubresourceLayers dstSubresource = {};
-    Offset3D               dstOffset      = {};
-    Extent3D               extent         = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               srcOffset      = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               dstOffset      = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               extent         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageResolve>
-  {
-    using Type = ImageResolve;
-  };
-#endif
-
-  // wrapper struct for struct VkImageResolve2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageResolve2.html
   struct ImageResolve2
   {
     using NativeType = VkImageResolve2;
@@ -61123,19 +44947,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageResolve2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageResolve2( ImageSubresourceLayers srcSubresource_ = {},
-                                        Offset3D               srcOffset_      = {},
-                                        ImageSubresourceLayers dstSubresource_ = {},
-                                        Offset3D               dstOffset_      = {},
-                                        Extent3D               extent_         = {},
-                                        const void *           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSubresource{ srcSubresource_ }
-      , srcOffset{ srcOffset_ }
-      , dstSubresource{ dstSubresource_ }
-      , dstOffset{ dstOffset_ }
-      , extent{ extent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageResolve2( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource_ = {},
+                                        VULKAN_HPP_NAMESPACE::Offset3D               srcOffset_      = {},
+                                        VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource_ = {},
+                                        VULKAN_HPP_NAMESPACE::Offset3D               dstOffset_      = {},
+                                        VULKAN_HPP_NAMESPACE::Extent3D               extent_         = {},
+                                        const void *                                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcSubresource( srcSubresource_ )
+      , srcOffset( srcOffset_ )
+      , dstSubresource( dstSubresource_ )
+      , dstOffset( dstOffset_ )
+      , extent( extent_ )
     {
     }
 
@@ -61144,51 +44968,51 @@ namespace VULKAN_HPP_NAMESPACE
     ImageResolve2( VkImageResolve2 const & rhs ) VULKAN_HPP_NOEXCEPT : ImageResolve2( *reinterpret_cast<ImageResolve2 const *>( &rhs ) ) {}
 
     ImageResolve2 & operator=( ImageResolve2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageResolve2 & operator=( VkImageResolve2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageResolve2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageResolve2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setSrcSubresource( ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setSrcSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & srcSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubresource = srcSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setSrcOffset( Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setSrcOffset( VULKAN_HPP_NAMESPACE::Offset3D const & srcOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcOffset = srcOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setDstSubresource( ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setDstSubresource( VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const & dstSubresource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSubresource = dstSubresource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setDstOffset( Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setDstOffset( VULKAN_HPP_NAMESPACE::Offset3D const & dstOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstOffset = dstOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setExtent( Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageResolve2 & setExtent( VULKAN_HPP_NAMESPACE::Extent3D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageResolve2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61200,24 +45024,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageResolve2 *>( this );
     }
 
-    operator VkImageResolve2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageResolve2 *>( this );
-    }
-
-    operator VkImageResolve2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageResolve2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               ImageSubresourceLayers const &,
-               Offset3D const &,
-               Extent3D const &>
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceLayers const &,
+               VULKAN_HPP_NAMESPACE::Offset3D const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcSubresource, srcOffset, dstSubresource, dstOffset, extent );
@@ -61244,23 +45062,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType          = StructureType::eImageResolve2;
-    const void *           pNext          = {};
-    ImageSubresourceLayers srcSubresource = {};
-    Offset3D               srcOffset      = {};
-    ImageSubresourceLayers dstSubresource = {};
-    Offset3D               dstOffset      = {};
-    Extent3D               extent         = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType          = StructureType::eImageResolve2;
+    const void *                                 pNext          = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers srcSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               srcOffset      = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceLayers dstSubresource = {};
+    VULKAN_HPP_NAMESPACE::Offset3D               dstOffset      = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               extent         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageResolve2>
-  {
-    using Type = ImageResolve2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageResolve2>
   {
@@ -61269,8 +45079,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageResolve2KHR = ImageResolve2;
 
-  // wrapper struct for struct VkImageSparseMemoryRequirementsInfo2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSparseMemoryRequirementsInfo2.html
   struct ImageSparseMemoryRequirementsInfo2
   {
     using NativeType = VkImageSparseMemoryRequirementsInfo2;
@@ -61278,10 +45086,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageSparseMemoryRequirementsInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSparseMemoryRequirementsInfo2( Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageSparseMemoryRequirementsInfo2( VULKAN_HPP_NAMESPACE::Image image_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
     {
     }
 
@@ -61293,27 +45101,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageSparseMemoryRequirementsInfo2 & operator=( ImageSparseMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageSparseMemoryRequirementsInfo2 & operator=( VkImageSparseMemoryRequirementsInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageSparseMemoryRequirementsInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSparseMemoryRequirementsInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageSparseMemoryRequirementsInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageSparseMemoryRequirementsInfo2 & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageSparseMemoryRequirementsInfo2 & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageSparseMemoryRequirementsInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61325,18 +45133,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageSparseMemoryRequirementsInfo2 *>( this );
     }
 
-    operator VkImageSparseMemoryRequirementsInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSparseMemoryRequirementsInfo2 *>( this );
-    }
-
-    operator VkImageSparseMemoryRequirementsInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSparseMemoryRequirementsInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image );
     }
@@ -61361,19 +45164,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType = StructureType::eImageSparseMemoryRequirementsInfo2;
-    const void *  pNext = {};
-    Image         image = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eImageSparseMemoryRequirementsInfo2;
+    const void *                        pNext = {};
+    VULKAN_HPP_NAMESPACE::Image         image = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSparseMemoryRequirementsInfo2>
-  {
-    using Type = ImageSparseMemoryRequirementsInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageSparseMemoryRequirementsInfo2>
   {
@@ -61382,7 +45177,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageSparseMemoryRequirementsInfo2KHR = ImageSparseMemoryRequirementsInfo2;
 
-  // wrapper struct for struct VkImageStencilUsageCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageStencilUsageCreateInfo.html
   struct ImageStencilUsageCreateInfo
   {
     using NativeType = VkImageStencilUsageCreateInfo;
@@ -61390,10 +45184,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageStencilUsageCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageStencilUsageCreateInfo( ImageUsageFlags stencilUsage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stencilUsage{ stencilUsage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageStencilUsageCreateInfo( VULKAN_HPP_NAMESPACE::ImageUsageFlags stencilUsage_ = {},
+                                                      const void *                          pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stencilUsage( stencilUsage_ )
     {
     }
 
@@ -61405,27 +45200,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageStencilUsageCreateInfo & operator=( ImageStencilUsageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageStencilUsageCreateInfo & operator=( VkImageStencilUsageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageStencilUsageCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageStencilUsageCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageStencilUsageCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageStencilUsageCreateInfo & setStencilUsage( ImageUsageFlags stencilUsage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageStencilUsageCreateInfo & setStencilUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags stencilUsage_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilUsage = stencilUsage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageStencilUsageCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61437,18 +45232,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageStencilUsageCreateInfo *>( this );
     }
 
-    operator VkImageStencilUsageCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageStencilUsageCreateInfo *>( this );
-    }
-
-    operator VkImageStencilUsageCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageStencilUsageCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stencilUsage );
     }
@@ -61473,19 +45263,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType        = StructureType::eImageStencilUsageCreateInfo;
-    const void *    pNext        = {};
-    ImageUsageFlags stencilUsage = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType        = StructureType::eImageStencilUsageCreateInfo;
+    const void *                          pNext        = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags stencilUsage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageStencilUsageCreateInfo>
-  {
-    using Type = ImageStencilUsageCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageStencilUsageCreateInfo>
   {
@@ -61494,7 +45276,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ImageStencilUsageCreateInfoEXT = ImageStencilUsageCreateInfo;
 
-  // wrapper struct for struct VkImageSwapchainCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageSwapchainCreateInfoKHR.html
   struct ImageSwapchainCreateInfoKHR
   {
     using NativeType = VkImageSwapchainCreateInfoKHR;
@@ -61502,10 +45283,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageSwapchainCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageSwapchainCreateInfoKHR( SwapchainKHR swapchain_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchain{ swapchain_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageSwapchainCreateInfoKHR( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchain( swapchain_ )
     {
     }
 
@@ -61517,27 +45298,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageSwapchainCreateInfoKHR & operator=( ImageSwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageSwapchainCreateInfoKHR & operator=( VkImageSwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageSwapchainCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageSwapchainCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageSwapchainCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageSwapchainCreateInfoKHR & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageSwapchainCreateInfoKHR & setSwapchain( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageSwapchainCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61549,18 +45330,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageSwapchainCreateInfoKHR *>( this );
     }
 
-    operator VkImageSwapchainCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageSwapchainCreateInfoKHR *>( this );
-    }
-
-    operator VkImageSwapchainCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageSwapchainCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SwapchainKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchain );
     }
@@ -61585,26 +45361,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eImageSwapchainCreateInfoKHR;
-    const void *  pNext     = {};
-    SwapchainKHR  swapchain = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eImageSwapchainCreateInfoKHR;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::SwapchainKHR  swapchain = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageSwapchainCreateInfoKHR>
-  {
-    using Type = ImageSwapchainCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageSwapchainCreateInfoKHR>
   {
     using Type = ImageSwapchainCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkImageViewASTCDecodeModeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewASTCDecodeModeEXT.html
   struct ImageViewASTCDecodeModeEXT
   {
     using NativeType = VkImageViewASTCDecodeModeEXT;
@@ -61612,10 +45379,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewAstcDecodeModeEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewASTCDecodeModeEXT( Format decodeMode_ = Format::eUndefined, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , decodeMode{ decodeMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewASTCDecodeModeEXT( VULKAN_HPP_NAMESPACE::Format decodeMode_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                     const void *                 pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , decodeMode( decodeMode_ )
     {
     }
 
@@ -61627,27 +45395,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewASTCDecodeModeEXT & operator=( ImageViewASTCDecodeModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewASTCDecodeModeEXT & operator=( VkImageViewASTCDecodeModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewASTCDecodeModeEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewASTCDecodeModeEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewASTCDecodeModeEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewASTCDecodeModeEXT & setDecodeMode( Format decodeMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewASTCDecodeModeEXT & setDecodeMode( VULKAN_HPP_NAMESPACE::Format decodeMode_ ) VULKAN_HPP_NOEXCEPT
     {
       decodeMode = decodeMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewASTCDecodeModeEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61659,18 +45427,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewASTCDecodeModeEXT *>( this );
     }
 
-    operator VkImageViewASTCDecodeModeEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewASTCDecodeModeEXT *>( this );
-    }
-
-    operator VkImageViewASTCDecodeModeEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewASTCDecodeModeEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Format const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, decodeMode );
     }
@@ -61695,27 +45458,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eImageViewAstcDecodeModeEXT;
-    const void *  pNext      = {};
-    Format        decodeMode = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eImageViewAstcDecodeModeEXT;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::Format        decodeMode = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewASTCDecodeModeEXT>
-  {
-    using Type = ImageViewASTCDecodeModeEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewAstcDecodeModeEXT>
   {
     using Type = ImageViewASTCDecodeModeEXT;
   };
 
-  // wrapper struct for struct VkImageViewAddressPropertiesNVX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewAddressPropertiesNVX.html
   struct ImageViewAddressPropertiesNVX
   {
     using NativeType = VkImageViewAddressPropertiesNVX;
@@ -61723,11 +45476,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewAddressPropertiesNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewAddressPropertiesNVX( DeviceAddress deviceAddress_ = {}, DeviceSize size_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceAddress{ deviceAddress_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewAddressPropertiesNVX( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize    size_          = {},
+                                                        void *                              pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceAddress( deviceAddress_ )
+      , size( size_ )
     {
     }
 
@@ -61739,11 +45494,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewAddressPropertiesNVX & operator=( ImageViewAddressPropertiesNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewAddressPropertiesNVX & operator=( VkImageViewAddressPropertiesNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewAddressPropertiesNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX const *>( &rhs );
       return *this;
     }
 
@@ -61757,18 +45512,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewAddressPropertiesNVX *>( this );
     }
 
-    operator VkImageViewAddressPropertiesNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewAddressPropertiesNVX *>( this );
-    }
-
-    operator VkImageViewAddressPropertiesNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewAddressPropertiesNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceAddress const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceAddress const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceAddress, size );
     }
@@ -61793,28 +45544,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eImageViewAddressPropertiesNVX;
-    void *        pNext         = {};
-    DeviceAddress deviceAddress = {};
-    DeviceSize    size          = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eImageViewAddressPropertiesNVX;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewAddressPropertiesNVX>
-  {
-    using Type = ImageViewAddressPropertiesNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewAddressPropertiesNVX>
   {
     using Type = ImageViewAddressPropertiesNVX;
   };
 
-  // wrapper struct for struct VkImageViewCaptureDescriptorDataInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewCaptureDescriptorDataInfoEXT.html
   struct ImageViewCaptureDescriptorDataInfoEXT
   {
     using NativeType = VkImageViewCaptureDescriptorDataInfoEXT;
@@ -61822,10 +45563,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewCaptureDescriptorDataInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewCaptureDescriptorDataInfoEXT( ImageView imageView_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageView{ imageView_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewCaptureDescriptorDataInfoEXT( VULKAN_HPP_NAMESPACE::ImageView imageView_ = {},
+                                                                const void *                    pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageView( imageView_ )
     {
     }
 
@@ -61837,27 +45579,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewCaptureDescriptorDataInfoEXT & operator=( ImageViewCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewCaptureDescriptorDataInfoEXT & operator=( VkImageViewCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewCaptureDescriptorDataInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewCaptureDescriptorDataInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewCaptureDescriptorDataInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCaptureDescriptorDataInfoEXT & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCaptureDescriptorDataInfoEXT & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewCaptureDescriptorDataInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -61869,18 +45611,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewCaptureDescriptorDataInfoEXT *>( this );
     }
 
-    operator VkImageViewCaptureDescriptorDataInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewCaptureDescriptorDataInfoEXT *>( this );
-    }
-
-    operator VkImageViewCaptureDescriptorDataInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewCaptureDescriptorDataInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageView const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageView const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageView );
     }
@@ -61905,26 +45642,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eImageViewCaptureDescriptorDataInfoEXT;
-    const void *  pNext     = {};
-    ImageView     imageView = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eImageViewCaptureDescriptorDataInfoEXT;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::ImageView     imageView = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewCaptureDescriptorDataInfoEXT>
-  {
-    using Type = ImageViewCaptureDescriptorDataInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewCaptureDescriptorDataInfoEXT>
   {
     using Type = ImageViewCaptureDescriptorDataInfoEXT;
   };
 
-  // wrapper struct for struct VkImageViewCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewCreateInfo.html
   struct ImageViewCreateInfo
   {
     using NativeType = VkImageViewCreateInfo;
@@ -61932,21 +45660,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewCreateInfo( ImageViewCreateFlags  flags_            = {},
-                                              Image                 image_            = {},
-                                              ImageViewType         viewType_         = ImageViewType::e1D,
-                                              Format                format_           = Format::eUndefined,
-                                              ComponentMapping      components_       = {},
-                                              ImageSubresourceRange subresourceRange_ = {},
-                                              const void *          pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , image{ image_ }
-      , viewType{ viewType_ }
-      , format{ format_ }
-      , components{ components_ }
-      , subresourceRange{ subresourceRange_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewCreateInfo( VULKAN_HPP_NAMESPACE::ImageViewCreateFlags  flags_            = {},
+                                              VULKAN_HPP_NAMESPACE::Image                 image_            = {},
+                                              VULKAN_HPP_NAMESPACE::ImageViewType         viewType_         = VULKAN_HPP_NAMESPACE::ImageViewType::e1D,
+                                              VULKAN_HPP_NAMESPACE::Format                format_           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                              VULKAN_HPP_NAMESPACE::ComponentMapping      components_       = {},
+                                              VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange_ = {},
+                                              const void *                                pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , image( image_ )
+      , viewType( viewType_ )
+      , format( format_ )
+      , components( components_ )
+      , subresourceRange( subresourceRange_ )
     {
     }
 
@@ -61957,57 +45685,58 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewCreateInfo & operator=( ImageViewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewCreateInfo & operator=( VkImageViewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setFlags( ImageViewCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::ImageViewCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setViewType( ImageViewType viewType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setViewType( VULKAN_HPP_NAMESPACE::ImageViewType viewType_ ) VULKAN_HPP_NOEXCEPT
     {
       viewType = viewType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setComponents( ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setComponents( VULKAN_HPP_NAMESPACE::ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
     {
       components = components_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo & setSubresourceRange( ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewCreateInfo &
+      setSubresourceRange( VULKAN_HPP_NAMESPACE::ImageSubresourceRange const & subresourceRange_ ) VULKAN_HPP_NOEXCEPT
     {
       subresourceRange = subresourceRange_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62019,25 +45748,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewCreateInfo *>( this );
     }
 
-    operator VkImageViewCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewCreateInfo *>( this );
-    }
-
-    operator VkImageViewCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageViewCreateFlags const &,
-               Image const &,
-               ImageViewType const &,
-               Format const &,
-               ComponentMapping const &,
-               ImageSubresourceRange const &>
+               VULKAN_HPP_NAMESPACE::ImageViewCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageViewType const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::ImageSubresourceRange const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, image, viewType, format, components, subresourceRange );
@@ -62064,31 +45787,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType            = StructureType::eImageViewCreateInfo;
-    const void *          pNext            = {};
-    ImageViewCreateFlags  flags            = {};
-    Image                 image            = {};
-    ImageViewType         viewType         = ImageViewType::e1D;
-    Format                format           = Format::eUndefined;
-    ComponentMapping      components       = {};
-    ImageSubresourceRange subresourceRange = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType            = StructureType::eImageViewCreateInfo;
+    const void *                                pNext            = {};
+    VULKAN_HPP_NAMESPACE::ImageViewCreateFlags  flags            = {};
+    VULKAN_HPP_NAMESPACE::Image                 image            = {};
+    VULKAN_HPP_NAMESPACE::ImageViewType         viewType         = VULKAN_HPP_NAMESPACE::ImageViewType::e1D;
+    VULKAN_HPP_NAMESPACE::Format                format           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ComponentMapping      components       = {};
+    VULKAN_HPP_NAMESPACE::ImageSubresourceRange subresourceRange = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewCreateInfo>
-  {
-    using Type = ImageViewCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewCreateInfo>
   {
     using Type = ImageViewCreateInfo;
   };
 
-  // wrapper struct for struct VkImageViewHandleInfoNVX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewHandleInfoNVX.html
   struct ImageViewHandleInfoNVX
   {
     using NativeType = VkImageViewHandleInfoNVX;
@@ -62096,15 +45810,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewHandleInfoNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewHandleInfoNVX( ImageView      imageView_      = {},
-                                                 DescriptorType descriptorType_ = DescriptorType::eSampler,
-                                                 Sampler        sampler_        = {},
-                                                 const void *   pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageView{ imageView_ }
-      , descriptorType{ descriptorType_ }
-      , sampler{ sampler_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewHandleInfoNVX( VULKAN_HPP_NAMESPACE::ImageView      imageView_      = {},
+                                                 VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_ = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                                 VULKAN_HPP_NAMESPACE::Sampler        sampler_        = {},
+                                                 const void *                         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageView( imageView_ )
+      , descriptorType( descriptorType_ )
+      , sampler( sampler_ )
     {
     }
 
@@ -62116,39 +45830,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewHandleInfoNVX & operator=( ImageViewHandleInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewHandleInfoNVX & operator=( VkImageViewHandleInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewHandleInfoNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewHandleInfoNVX const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setDescriptorType( DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setDescriptorType( VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorType = descriptorType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setSampler( Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewHandleInfoNVX & setSampler( VULKAN_HPP_NAMESPACE::Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
     {
       sampler = sampler_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewHandleInfoNVX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62160,18 +45874,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewHandleInfoNVX *>( this );
     }
 
-    operator VkImageViewHandleInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewHandleInfoNVX *>( this );
-    }
-
-    operator VkImageViewHandleInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewHandleInfoNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageView const &, DescriptorType const &, Sampler const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::DescriptorType const &,
+               VULKAN_HPP_NAMESPACE::Sampler const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageView, descriptorType, sampler );
     }
@@ -62197,28 +45910,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType          = StructureType::eImageViewHandleInfoNVX;
-    const void *   pNext          = {};
-    ImageView      imageView      = {};
-    DescriptorType descriptorType = DescriptorType::eSampler;
-    Sampler        sampler        = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType          = StructureType::eImageViewHandleInfoNVX;
+    const void *                         pNext          = {};
+    VULKAN_HPP_NAMESPACE::ImageView      imageView      = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType descriptorType = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    VULKAN_HPP_NAMESPACE::Sampler        sampler        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewHandleInfoNVX>
-  {
-    using Type = ImageViewHandleInfoNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewHandleInfoNVX>
   {
     using Type = ImageViewHandleInfoNVX;
   };
 
-  // wrapper struct for struct VkImageViewMinLodCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewMinLodCreateInfoEXT.html
   struct ImageViewMinLodCreateInfoEXT
   {
     using NativeType = VkImageViewMinLodCreateInfoEXT;
@@ -62226,10 +45930,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewMinLodCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImageViewMinLodCreateInfoEXT( float minLod_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minLod{ minLod_ }
+      : pNext( pNext_ )
+      , minLod( minLod_ )
     {
     }
 
@@ -62241,15 +45945,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewMinLodCreateInfoEXT & operator=( ImageViewMinLodCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewMinLodCreateInfoEXT & operator=( VkImageViewMinLodCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewMinLodCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewMinLodCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewMinLodCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -62261,7 +45965,7 @@ namespace VULKAN_HPP_NAMESPACE
       minLod = minLod_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewMinLodCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62273,18 +45977,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewMinLodCreateInfoEXT *>( this );
     }
 
-    operator VkImageViewMinLodCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewMinLodCreateInfoEXT *>( this );
-    }
-
-    operator VkImageViewMinLodCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewMinLodCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minLod );
     }
@@ -62309,27 +46008,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eImageViewMinLodCreateInfoEXT;
-    const void *  pNext  = {};
-    float         minLod = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eImageViewMinLodCreateInfoEXT;
+    const void *                        pNext  = {};
+    float                               minLod = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewMinLodCreateInfoEXT>
-  {
-    using Type = ImageViewMinLodCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewMinLodCreateInfoEXT>
   {
     using Type = ImageViewMinLodCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkImageViewSampleWeightCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewSampleWeightCreateInfoQCOM.html
   struct ImageViewSampleWeightCreateInfoQCOM
   {
     using NativeType = VkImageViewSampleWeightCreateInfoQCOM;
@@ -62337,15 +46026,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewSampleWeightCreateInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewSampleWeightCreateInfoQCOM( Offset2D     filterCenter_ = {},
-                                                              Extent2D     filterSize_   = {},
-                                                              uint32_t     numPhases_    = {},
-                                                              const void * pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , filterCenter{ filterCenter_ }
-      , filterSize{ filterSize_ }
-      , numPhases{ numPhases_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewSampleWeightCreateInfoQCOM( VULKAN_HPP_NAMESPACE::Offset2D filterCenter_ = {},
+                                                              VULKAN_HPP_NAMESPACE::Extent2D filterSize_   = {},
+                                                              uint32_t                       numPhases_    = {},
+                                                              const void *                   pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , filterCenter( filterCenter_ )
+      , filterSize( filterSize_ )
+      , numPhases( numPhases_ )
     {
     }
 
@@ -62357,28 +46046,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewSampleWeightCreateInfoQCOM & operator=( ImageViewSampleWeightCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewSampleWeightCreateInfoQCOM & operator=( VkImageViewSampleWeightCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewSampleWeightCreateInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewSampleWeightCreateInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewSampleWeightCreateInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewSampleWeightCreateInfoQCOM & setFilterCenter( Offset2D const & filterCenter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewSampleWeightCreateInfoQCOM & setFilterCenter( VULKAN_HPP_NAMESPACE::Offset2D const & filterCenter_ ) VULKAN_HPP_NOEXCEPT
     {
       filterCenter = filterCenter_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewSampleWeightCreateInfoQCOM & setFilterSize( Extent2D const & filterSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewSampleWeightCreateInfoQCOM & setFilterSize( VULKAN_HPP_NAMESPACE::Extent2D const & filterSize_ ) VULKAN_HPP_NOEXCEPT
     {
       filterSize = filterSize_;
       return *this;
@@ -62389,7 +46078,7 @@ namespace VULKAN_HPP_NAMESPACE
       numPhases = numPhases_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewSampleWeightCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62401,18 +46090,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewSampleWeightCreateInfoQCOM *>( this );
     }
 
-    operator VkImageViewSampleWeightCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewSampleWeightCreateInfoQCOM *>( this );
-    }
-
-    operator VkImageViewSampleWeightCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewSampleWeightCreateInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Offset2D const &, Extent2D const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, filterCenter, filterSize, numPhases );
     }
@@ -62438,28 +46126,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eImageViewSampleWeightCreateInfoQCOM;
-    const void *  pNext        = {};
-    Offset2D      filterCenter = {};
-    Extent2D      filterSize   = {};
-    uint32_t      numPhases    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eImageViewSampleWeightCreateInfoQCOM;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::Offset2D      filterCenter = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      filterSize   = {};
+    uint32_t                            numPhases    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewSampleWeightCreateInfoQCOM>
-  {
-    using Type = ImageViewSampleWeightCreateInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewSampleWeightCreateInfoQCOM>
   {
     using Type = ImageViewSampleWeightCreateInfoQCOM;
   };
 
-  // wrapper struct for struct VkImageViewSlicedCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewSlicedCreateInfoEXT.html
   struct ImageViewSlicedCreateInfoEXT
   {
     using NativeType = VkImageViewSlicedCreateInfoEXT;
@@ -62467,12 +46146,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewSlicedCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       ImageViewSlicedCreateInfoEXT( uint32_t sliceOffset_ = {}, uint32_t sliceCount_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sliceOffset{ sliceOffset_ }
-      , sliceCount{ sliceCount_ }
+      : pNext( pNext_ )
+      , sliceOffset( sliceOffset_ )
+      , sliceCount( sliceCount_ )
     {
     }
 
@@ -62484,15 +46163,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewSlicedCreateInfoEXT & operator=( ImageViewSlicedCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewSlicedCreateInfoEXT & operator=( VkImageViewSlicedCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewSlicedCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewSlicedCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewSlicedCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -62510,7 +46189,7 @@ namespace VULKAN_HPP_NAMESPACE
       sliceCount = sliceCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewSlicedCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62522,18 +46201,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewSlicedCreateInfoEXT *>( this );
     }
 
-    operator VkImageViewSlicedCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewSlicedCreateInfoEXT *>( this );
-    }
-
-    operator VkImageViewSlicedCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewSlicedCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sliceOffset, sliceCount );
     }
@@ -62558,27 +46232,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::eImageViewSlicedCreateInfoEXT;
-    const void *  pNext       = {};
-    uint32_t      sliceOffset = {};
-    uint32_t      sliceCount  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eImageViewSlicedCreateInfoEXT;
+    const void *                        pNext       = {};
+    uint32_t                            sliceOffset = {};
+    uint32_t                            sliceCount  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewSlicedCreateInfoEXT>
-  {
-    using Type = ImageViewSlicedCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewSlicedCreateInfoEXT>
   {
     using Type = ImageViewSlicedCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkImageViewUsageCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImageViewUsageCreateInfo.html
   struct ImageViewUsageCreateInfo
   {
     using NativeType = VkImageViewUsageCreateInfo;
@@ -62586,10 +46251,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImageViewUsageCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImageViewUsageCreateInfo( ImageUsageFlags usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , usage{ usage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImageViewUsageCreateInfo( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , usage( usage_ )
     {
     }
 
@@ -62601,27 +46266,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImageViewUsageCreateInfo & operator=( ImageViewUsageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImageViewUsageCreateInfo & operator=( VkImageViewUsageCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImageViewUsageCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImageViewUsageCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImageViewUsageCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImageViewUsageCreateInfo & setUsage( ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImageViewUsageCreateInfo & setUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImageViewUsageCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62633,18 +46298,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImageViewUsageCreateInfo *>( this );
     }
 
-    operator VkImageViewUsageCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImageViewUsageCreateInfo *>( this );
-    }
-
-    operator VkImageViewUsageCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImageViewUsageCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, usage );
     }
@@ -62669,19 +46329,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType = StructureType::eImageViewUsageCreateInfo;
-    const void *    pNext = {};
-    ImageUsageFlags usage = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType = StructureType::eImageViewUsageCreateInfo;
+    const void *                          pNext = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags usage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImageViewUsageCreateInfo>
-  {
-    using Type = ImageViewUsageCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImageViewUsageCreateInfo>
   {
@@ -62691,8 +46343,6 @@ namespace VULKAN_HPP_NAMESPACE
   using ImageViewUsageCreateInfoKHR = ImageViewUsageCreateInfo;
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkImportAndroidHardwareBufferInfoANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportAndroidHardwareBufferInfoANDROID.html
   struct ImportAndroidHardwareBufferInfoANDROID
   {
     using NativeType = VkImportAndroidHardwareBufferInfoANDROID;
@@ -62700,10 +46350,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportAndroidHardwareBufferInfoANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImportAndroidHardwareBufferInfoANDROID( struct AHardwareBuffer * buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -62715,15 +46365,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportAndroidHardwareBufferInfoANDROID & operator=( ImportAndroidHardwareBufferInfoANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportAndroidHardwareBufferInfoANDROID & operator=( VkImportAndroidHardwareBufferInfoANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportAndroidHardwareBufferInfoANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportAndroidHardwareBufferInfoANDROID const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportAndroidHardwareBufferInfoANDROID & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -62735,7 +46385,7 @@ namespace VULKAN_HPP_NAMESPACE
       buffer = buffer_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportAndroidHardwareBufferInfoANDROID const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62747,18 +46397,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportAndroidHardwareBufferInfoANDROID *>( this );
     }
 
-    operator VkImportAndroidHardwareBufferInfoANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportAndroidHardwareBufferInfoANDROID *>( this );
-    }
-
-    operator VkImportAndroidHardwareBufferInfoANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportAndroidHardwareBufferInfoANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, struct AHardwareBuffer * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, struct AHardwareBuffer * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -62783,19 +46428,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType            sType  = StructureType::eImportAndroidHardwareBufferInfoANDROID;
-    const void *             pNext  = {};
-    struct AHardwareBuffer * buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eImportAndroidHardwareBufferInfoANDROID;
+    const void *                        pNext  = {};
+    struct AHardwareBuffer *            buffer = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportAndroidHardwareBufferInfoANDROID>
-  {
-    using Type = ImportAndroidHardwareBufferInfoANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportAndroidHardwareBufferInfoANDROID>
   {
@@ -62803,7 +46440,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  // wrapper struct for struct VkImportFenceFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportFenceFdInfoKHR.html
   struct ImportFenceFdInfoKHR
   {
     using NativeType = VkImportFenceFdInfoKHR;
@@ -62811,17 +46447,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportFenceFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportFenceFdInfoKHR( Fence                           fence_      = {},
-                                               FenceImportFlags                flags_      = {},
-                                               ExternalFenceHandleTypeFlagBits handleType_ = ExternalFenceHandleTypeFlagBits::eOpaqueFd,
-                                               int                             fd_         = {},
-                                               const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fence{ fence_ }
-      , flags{ flags_ }
-      , handleType{ handleType_ }
-      , fd{ fd_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportFenceFdInfoKHR(
+      VULKAN_HPP_NAMESPACE::Fence                           fence_      = {},
+      VULKAN_HPP_NAMESPACE::FenceImportFlags                flags_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd,
+      int                                                   fd_         = {},
+      const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fence( fence_ )
+      , flags( flags_ )
+      , handleType( handleType_ )
+      , fd( fd_ )
     {
     }
 
@@ -62833,34 +46470,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportFenceFdInfoKHR & operator=( ImportFenceFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportFenceFdInfoKHR & operator=( VkImportFenceFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportFenceFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportFenceFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setFence( Fence fence_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setFence( VULKAN_HPP_NAMESPACE::Fence fence_ ) VULKAN_HPP_NOEXCEPT
     {
       fence = fence_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setFlags( FenceImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::FenceImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setHandleType( ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceFdInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -62871,7 +46508,7 @@ namespace VULKAN_HPP_NAMESPACE
       fd = fd_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportFenceFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -62883,18 +46520,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportFenceFdInfoKHR *>( this );
     }
 
-    operator VkImportFenceFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportFenceFdInfoKHR *>( this );
-    }
-
-    operator VkImportFenceFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportFenceFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Fence const &, FenceImportFlags const &, ExternalFenceHandleTypeFlagBits const &, int const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Fence const &,
+               VULKAN_HPP_NAMESPACE::FenceImportFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits const &,
+               int const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fence, flags, handleType, fd );
@@ -62921,22 +46557,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType      = StructureType::eImportFenceFdInfoKHR;
-    const void *                    pNext      = {};
-    Fence                           fence      = {};
-    FenceImportFlags                flags      = {};
-    ExternalFenceHandleTypeFlagBits handleType = ExternalFenceHandleTypeFlagBits::eOpaqueFd;
-    int                             fd         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::eImportFenceFdInfoKHR;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::Fence                           fence      = {};
+    VULKAN_HPP_NAMESPACE::FenceImportFlags                flags      = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd;
+    int                                                   fd         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportFenceFdInfoKHR>
-  {
-    using Type = ImportFenceFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportFenceFdInfoKHR>
   {
@@ -62944,8 +46572,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkImportFenceWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportFenceWin32HandleInfoKHR.html
   struct ImportFenceWin32HandleInfoKHR
   {
     using NativeType = VkImportFenceWin32HandleInfoKHR;
@@ -62953,19 +46579,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportFenceWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportFenceWin32HandleInfoKHR( Fence                           fence_      = {},
-                                                        FenceImportFlags                flags_      = {},
-                                                        ExternalFenceHandleTypeFlagBits handleType_ = ExternalFenceHandleTypeFlagBits::eOpaqueFd,
-                                                        HANDLE                          handle_     = {},
-                                                        LPCWSTR                         name_       = {},
-                                                        const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fence{ fence_ }
-      , flags{ flags_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
-      , name{ name_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportFenceWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::Fence                           fence_      = {},
+      VULKAN_HPP_NAMESPACE::FenceImportFlags                flags_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd,
+      HANDLE                                                handle_     = {},
+      LPCWSTR                                               name_       = {},
+      const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fence( fence_ )
+      , flags( flags_ )
+      , handleType( handleType_ )
+      , handle( handle_ )
+      , name( name_ )
     {
     }
 
@@ -62977,34 +46604,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportFenceWin32HandleInfoKHR & operator=( ImportFenceWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportFenceWin32HandleInfoKHR & operator=( VkImportFenceWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportFenceWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportFenceWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setFence( Fence fence_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setFence( VULKAN_HPP_NAMESPACE::Fence fence_ ) VULKAN_HPP_NOEXCEPT
     {
       fence = fence_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setFlags( FenceImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::FenceImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR & setHandleType( ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportFenceWin32HandleInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63021,7 +46649,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportFenceWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63033,24 +46661,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportFenceWin32HandleInfoKHR *>( this );
     }
 
-    operator VkImportFenceWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportFenceWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkImportFenceWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportFenceWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Fence const &,
-               FenceImportFlags const &,
-               ExternalFenceHandleTypeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Fence const &,
+               VULKAN_HPP_NAMESPACE::FenceImportFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits const &,
                HANDLE const &,
                LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fence, flags, handleType, handle, name );
@@ -63077,23 +46699,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                   sType      = StructureType::eImportFenceWin32HandleInfoKHR;
-    const void *                    pNext      = {};
-    Fence                           fence      = {};
-    FenceImportFlags                flags      = {};
-    ExternalFenceHandleTypeFlagBits handleType = ExternalFenceHandleTypeFlagBits::eOpaqueFd;
-    HANDLE                          handle     = {};
-    LPCWSTR                         name       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::eImportFenceWin32HandleInfoKHR;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::Fence                           fence      = {};
+    VULKAN_HPP_NAMESPACE::FenceImportFlags                flags      = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd;
+    HANDLE                                                handle     = {};
+    LPCWSTR                                               name       = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportFenceWin32HandleInfoKHR>
-  {
-    using Type = ImportFenceWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportFenceWin32HandleInfoKHR>
   {
@@ -63102,8 +46716,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImportMemoryBufferCollectionFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryBufferCollectionFUCHSIA.html
   struct ImportMemoryBufferCollectionFUCHSIA
   {
     using NativeType = VkImportMemoryBufferCollectionFUCHSIA;
@@ -63111,12 +46723,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryBufferCollectionFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ImportMemoryBufferCollectionFUCHSIA( BufferCollectionFUCHSIA collection_ = {}, uint32_t index_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , collection{ collection_ }
-      , index{ index_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryBufferCollectionFUCHSIA( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ = {},
+                                                              uint32_t                                      index_      = {},
+                                                              const void *                                  pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , collection( collection_ )
+      , index( index_ )
     {
     }
 
@@ -63128,22 +46741,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryBufferCollectionFUCHSIA & operator=( ImportMemoryBufferCollectionFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryBufferCollectionFUCHSIA & operator=( VkImportMemoryBufferCollectionFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryBufferCollectionFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryBufferCollectionFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryBufferCollectionFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryBufferCollectionFUCHSIA & setCollection( BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryBufferCollectionFUCHSIA & setCollection( VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection_ ) VULKAN_HPP_NOEXCEPT
     {
       collection = collection_;
       return *this;
@@ -63154,7 +46767,7 @@ namespace VULKAN_HPP_NAMESPACE
       index = index_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryBufferCollectionFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63166,18 +46779,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryBufferCollectionFUCHSIA *>( this );
     }
 
-    operator VkImportMemoryBufferCollectionFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryBufferCollectionFUCHSIA *>( this );
-    }
-
-    operator VkImportMemoryBufferCollectionFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryBufferCollectionFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, BufferCollectionFUCHSIA const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, collection, index );
     }
@@ -63202,20 +46810,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType           sType      = StructureType::eImportMemoryBufferCollectionFUCHSIA;
-    const void *            pNext      = {};
-    BufferCollectionFUCHSIA collection = {};
-    uint32_t                index      = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType      = StructureType::eImportMemoryBufferCollectionFUCHSIA;
+    const void *                                  pNext      = {};
+    VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA collection = {};
+    uint32_t                                      index      = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryBufferCollectionFUCHSIA>
-  {
-    using Type = ImportMemoryBufferCollectionFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryBufferCollectionFUCHSIA>
   {
@@ -63223,7 +46823,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkImportMemoryFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryFdInfoKHR.html
   struct ImportMemoryFdInfoKHR
   {
     using NativeType = VkImportMemoryFdInfoKHR;
@@ -63231,13 +46830,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMemoryFdInfoKHR( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                int                              fd_         = {},
-                                                const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , fd{ fd_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryFdInfoKHR(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      int                                                    fd_         = {},
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
+      , fd( fd_ )
     {
     }
 
@@ -63249,22 +46849,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryFdInfoKHR & operator=( ImportMemoryFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryFdInfoKHR & operator=( VkImportMemoryFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryFdInfoKHR & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryFdInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63275,7 +46875,7 @@ namespace VULKAN_HPP_NAMESPACE
       fd = fd_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63287,18 +46887,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryFdInfoKHR *>( this );
     }
 
-    operator VkImportMemoryFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryFdInfoKHR *>( this );
-    }
-
-    operator VkImportMemoryFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &, int const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &, int const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType, fd );
     }
@@ -63323,28 +46918,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType      = StructureType::eImportMemoryFdInfoKHR;
-    const void *                     pNext      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-    int                              fd         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eImportMemoryFdInfoKHR;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    int                                                    fd         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryFdInfoKHR>
-  {
-    using Type = ImportMemoryFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryFdInfoKHR>
   {
     using Type = ImportMemoryFdInfoKHR;
   };
 
-  // wrapper struct for struct VkImportMemoryHostPointerInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryHostPointerInfoEXT.html
   struct ImportMemoryHostPointerInfoEXT
   {
     using NativeType = VkImportMemoryHostPointerInfoEXT;
@@ -63352,13 +46937,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryHostPointerInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMemoryHostPointerInfoEXT( ExternalMemoryHandleTypeFlagBits handleType_   = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                         void *                           pHostPointer_ = {},
-                                                         const void *                     pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , pHostPointer{ pHostPointer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryHostPointerInfoEXT(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_   = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      void *                                                 pHostPointer_ = {},
+      const void *                                           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
+      , pHostPointer( pHostPointer_ )
     {
     }
 
@@ -63370,22 +46956,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryHostPointerInfoEXT & operator=( ImportMemoryHostPointerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryHostPointerInfoEXT & operator=( VkImportMemoryHostPointerInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryHostPointerInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryHostPointerInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryHostPointerInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryHostPointerInfoEXT & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryHostPointerInfoEXT &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63396,7 +46983,7 @@ namespace VULKAN_HPP_NAMESPACE
       pHostPointer = pHostPointer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryHostPointerInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63408,18 +46995,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryHostPointerInfoEXT *>( this );
     }
 
-    operator VkImportMemoryHostPointerInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryHostPointerInfoEXT *>( this );
-    }
-
-    operator VkImportMemoryHostPointerInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryHostPointerInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType, pHostPointer );
     }
@@ -63444,152 +47027,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType        = StructureType::eImportMemoryHostPointerInfoEXT;
-    const void *                     pNext        = {};
-    ExternalMemoryHandleTypeFlagBits handleType   = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-    void *                           pHostPointer = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType        = StructureType::eImportMemoryHostPointerInfoEXT;
+    const void *                                           pNext        = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType   = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    void *                                                 pHostPointer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryHostPointerInfoEXT>
-  {
-    using Type = ImportMemoryHostPointerInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryHostPointerInfoEXT>
   {
     using Type = ImportMemoryHostPointerInfoEXT;
   };
 
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkImportMemoryMetalHandleInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryMetalHandleInfoEXT.html
-  struct ImportMemoryMetalHandleInfoEXT
-  {
-    using NativeType = VkImportMemoryMetalHandleInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryMetalHandleInfoEXT;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMemoryMetalHandleInfoEXT( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                         void *                           handle_     = {},
-                                                         const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ImportMemoryMetalHandleInfoEXT( ImportMemoryMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ImportMemoryMetalHandleInfoEXT( VkImportMemoryMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ImportMemoryMetalHandleInfoEXT( *reinterpret_cast<ImportMemoryMetalHandleInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    ImportMemoryMetalHandleInfoEXT & operator=( ImportMemoryMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ImportMemoryMetalHandleInfoEXT & operator=( VkImportMemoryMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ImportMemoryMetalHandleInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryMetalHandleInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryMetalHandleInfoEXT & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handleType = handleType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryMetalHandleInfoEXT & setHandle( void * handle_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handle = handle_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkImportMemoryMetalHandleInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkImportMemoryMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkImportMemoryMetalHandleInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkImportMemoryMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkImportMemoryMetalHandleInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkImportMemoryMetalHandleInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryMetalHandleInfoEXT *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, handleType, handle );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ImportMemoryMetalHandleInfoEXT const & ) const = default;
-#  else
-    bool operator==( ImportMemoryMetalHandleInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( handleType == rhs.handleType ) && ( handle == rhs.handle );
-#    endif
-    }
-
-    bool operator!=( ImportMemoryMetalHandleInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType                    sType      = StructureType::eImportMemoryMetalHandleInfoEXT;
-    const void *                     pNext      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-    void *                           handle     = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryMetalHandleInfoEXT>
-  {
-    using Type = ImportMemoryMetalHandleInfoEXT;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eImportMemoryMetalHandleInfoEXT>
-  {
-    using Type = ImportMemoryMetalHandleInfoEXT;
-  };
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkImportMemoryWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryWin32HandleInfoKHR.html
   struct ImportMemoryWin32HandleInfoKHR
   {
     using NativeType = VkImportMemoryWin32HandleInfoKHR;
@@ -63597,15 +47047,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMemoryWin32HandleInfoKHR( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                         HANDLE                           handle_     = {},
-                                                         LPCWSTR                          name_       = {},
-                                                         const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
-      , name{ name_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      HANDLE                                                 handle_     = {},
+      LPCWSTR                                                name_       = {},
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
+      , handle( handle_ )
+      , name( name_ )
     {
     }
 
@@ -63617,22 +47068,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryWin32HandleInfoKHR & operator=( ImportMemoryWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryWin32HandleInfoKHR & operator=( VkImportMemoryWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoKHR & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63649,7 +47101,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63661,18 +47113,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryWin32HandleInfoKHR *>( this );
     }
 
-    operator VkImportMemoryWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkImportMemoryWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &, HANDLE const &, LPCWSTR const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &,
+               HANDLE const &,
+               LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType, handle, name );
@@ -63698,21 +47148,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                    sType      = StructureType::eImportMemoryWin32HandleInfoKHR;
-    const void *                     pNext      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-    HANDLE                           handle     = {};
-    LPCWSTR                          name       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eImportMemoryWin32HandleInfoKHR;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    HANDLE                                                 handle     = {};
+    LPCWSTR                                                name       = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryWin32HandleInfoKHR>
-  {
-    using Type = ImportMemoryWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryWin32HandleInfoKHR>
   {
@@ -63721,8 +47163,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkImportMemoryWin32HandleInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryWin32HandleInfoNV.html
   struct ImportMemoryWin32HandleInfoNV
   {
     using NativeType = VkImportMemoryWin32HandleInfoNV;
@@ -63730,12 +47170,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryWin32HandleInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ImportMemoryWin32HandleInfoNV( ExternalMemoryHandleTypeFlagsNV handleType_ = {}, HANDLE handle_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryWin32HandleInfoNV( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType_ = {},
+                                                        HANDLE                                                handle_     = {},
+                                                        const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
+      , handle( handle_ )
     {
     }
 
@@ -63747,22 +47188,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryWin32HandleInfoNV & operator=( ImportMemoryWin32HandleInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryWin32HandleInfoNV & operator=( VkImportMemoryWin32HandleInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryWin32HandleInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryWin32HandleInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoNV & setHandleType( ExternalMemoryHandleTypeFlagsNV handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryWin32HandleInfoNV &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63773,7 +47215,7 @@ namespace VULKAN_HPP_NAMESPACE
       handle = handle_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryWin32HandleInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63785,18 +47227,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryWin32HandleInfoNV *>( this );
     }
 
-    operator VkImportMemoryWin32HandleInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryWin32HandleInfoNV *>( this );
-    }
-
-    operator VkImportMemoryWin32HandleInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryWin32HandleInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagsNV const &, HANDLE const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV const &, HANDLE const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType, handle );
     }
@@ -63821,20 +47258,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                   sType      = StructureType::eImportMemoryWin32HandleInfoNV;
-    const void *                    pNext      = {};
-    ExternalMemoryHandleTypeFlagsNV handleType = {};
-    HANDLE                          handle     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::eImportMemoryWin32HandleInfoNV;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsNV handleType = {};
+    HANDLE                                                handle     = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryWin32HandleInfoNV>
-  {
-    using Type = ImportMemoryWin32HandleInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryWin32HandleInfoNV>
   {
@@ -63843,8 +47272,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImportMemoryZirconHandleInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMemoryZirconHandleInfoFUCHSIA.html
   struct ImportMemoryZirconHandleInfoFUCHSIA
   {
     using NativeType = VkImportMemoryZirconHandleInfoFUCHSIA;
@@ -63852,13 +47279,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMemoryZirconHandleInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMemoryZirconHandleInfoFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                              zx_handle_t                      handle_     = {},
-                                                              const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMemoryZirconHandleInfoFUCHSIA(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      zx_handle_t                                            handle_     = {},
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
+      , handle( handle_ )
     {
     }
 
@@ -63870,22 +47298,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMemoryZirconHandleInfoFUCHSIA & operator=( ImportMemoryZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMemoryZirconHandleInfoFUCHSIA & operator=( VkImportMemoryZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMemoryZirconHandleInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMemoryZirconHandleInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMemoryZirconHandleInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMemoryZirconHandleInfoFUCHSIA & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMemoryZirconHandleInfoFUCHSIA &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -63896,7 +47325,7 @@ namespace VULKAN_HPP_NAMESPACE
       handle = handle_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMemoryZirconHandleInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -63908,18 +47337,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMemoryZirconHandleInfoFUCHSIA *>( this );
     }
 
-    operator VkImportMemoryZirconHandleInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMemoryZirconHandleInfoFUCHSIA *>( this );
-    }
-
-    operator VkImportMemoryZirconHandleInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMemoryZirconHandleInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &, zx_handle_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &,
+               zx_handle_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType, handle );
     }
@@ -63953,20 +47380,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                    sType      = StructureType::eImportMemoryZirconHandleInfoFUCHSIA;
-    const void *                     pNext      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-    zx_handle_t                      handle     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eImportMemoryZirconHandleInfoFUCHSIA;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    zx_handle_t                                            handle     = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMemoryZirconHandleInfoFUCHSIA>
-  {
-    using Type = ImportMemoryZirconHandleInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMemoryZirconHandleInfoFUCHSIA>
   {
@@ -63975,7 +47394,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkImportMetalBufferInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMetalBufferInfoEXT.html
   struct ImportMetalBufferInfoEXT
   {
     using NativeType = VkImportMetalBufferInfoEXT;
@@ -63983,10 +47401,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMetalBufferInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImportMetalBufferInfoEXT( MTLBuffer_id mtlBuffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mtlBuffer{ mtlBuffer_ }
+      : pNext( pNext_ )
+      , mtlBuffer( mtlBuffer_ )
     {
     }
 
@@ -63998,15 +47416,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMetalBufferInfoEXT & operator=( ImportMetalBufferInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMetalBufferInfoEXT & operator=( VkImportMetalBufferInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMetalBufferInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMetalBufferInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMetalBufferInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -64018,7 +47436,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlBuffer = mtlBuffer_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMetalBufferInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64030,18 +47448,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMetalBufferInfoEXT *>( this );
     }
 
-    operator VkImportMetalBufferInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMetalBufferInfoEXT *>( this );
-    }
-
-    operator VkImportMetalBufferInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMetalBufferInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MTLBuffer_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, MTLBuffer_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mtlBuffer );
     }
@@ -64066,19 +47479,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType     = StructureType::eImportMetalBufferInfoEXT;
-    const void *  pNext     = {};
-    MTLBuffer_id  mtlBuffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eImportMetalBufferInfoEXT;
+    const void *                        pNext     = {};
+    MTLBuffer_id                        mtlBuffer = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMetalBufferInfoEXT>
-  {
-    using Type = ImportMetalBufferInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMetalBufferInfoEXT>
   {
@@ -64087,7 +47492,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkImportMetalIOSurfaceInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMetalIOSurfaceInfoEXT.html
   struct ImportMetalIOSurfaceInfoEXT
   {
     using NativeType = VkImportMetalIOSurfaceInfoEXT;
@@ -64095,10 +47499,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMetalIoSurfaceInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImportMetalIOSurfaceInfoEXT( IOSurfaceRef ioSurface_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , ioSurface{ ioSurface_ }
+      : pNext( pNext_ )
+      , ioSurface( ioSurface_ )
     {
     }
 
@@ -64110,15 +47514,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMetalIOSurfaceInfoEXT & operator=( ImportMetalIOSurfaceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMetalIOSurfaceInfoEXT & operator=( VkImportMetalIOSurfaceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMetalIOSurfaceInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMetalIOSurfaceInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMetalIOSurfaceInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -64130,7 +47534,7 @@ namespace VULKAN_HPP_NAMESPACE
       ioSurface = ioSurface_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMetalIOSurfaceInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64142,18 +47546,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMetalIOSurfaceInfoEXT *>( this );
     }
 
-    operator VkImportMetalIOSurfaceInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMetalIOSurfaceInfoEXT *>( this );
-    }
-
-    operator VkImportMetalIOSurfaceInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMetalIOSurfaceInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, IOSurfaceRef const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, IOSurfaceRef const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, ioSurface );
     }
@@ -64178,19 +47577,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType     = StructureType::eImportMetalIoSurfaceInfoEXT;
-    const void *  pNext     = {};
-    IOSurfaceRef  ioSurface = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eImportMetalIoSurfaceInfoEXT;
+    const void *                        pNext     = {};
+    IOSurfaceRef                        ioSurface = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMetalIOSurfaceInfoEXT>
-  {
-    using Type = ImportMetalIOSurfaceInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMetalIoSurfaceInfoEXT>
   {
@@ -64199,8 +47590,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkImportMetalSharedEventInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMetalSharedEventInfoEXT.html
   struct ImportMetalSharedEventInfoEXT
   {
     using NativeType = VkImportMetalSharedEventInfoEXT;
@@ -64208,10 +47597,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMetalSharedEventInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImportMetalSharedEventInfoEXT( MTLSharedEvent_id mtlSharedEvent_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mtlSharedEvent{ mtlSharedEvent_ }
+      : pNext( pNext_ )
+      , mtlSharedEvent( mtlSharedEvent_ )
     {
     }
 
@@ -64223,15 +47612,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMetalSharedEventInfoEXT & operator=( ImportMetalSharedEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMetalSharedEventInfoEXT & operator=( VkImportMetalSharedEventInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMetalSharedEventInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMetalSharedEventInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMetalSharedEventInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -64243,7 +47632,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlSharedEvent = mtlSharedEvent_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMetalSharedEventInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64255,18 +47644,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMetalSharedEventInfoEXT *>( this );
     }
 
-    operator VkImportMetalSharedEventInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMetalSharedEventInfoEXT *>( this );
-    }
-
-    operator VkImportMetalSharedEventInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMetalSharedEventInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MTLSharedEvent_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, MTLSharedEvent_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mtlSharedEvent );
     }
@@ -64291,19 +47675,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType     sType          = StructureType::eImportMetalSharedEventInfoEXT;
-    const void *      pNext          = {};
-    MTLSharedEvent_id mtlSharedEvent = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eImportMetalSharedEventInfoEXT;
+    const void *                        pNext          = {};
+    MTLSharedEvent_id                   mtlSharedEvent = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMetalSharedEventInfoEXT>
-  {
-    using Type = ImportMetalSharedEventInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMetalSharedEventInfoEXT>
   {
@@ -64312,7 +47688,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkImportMetalTextureInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportMetalTextureInfoEXT.html
   struct ImportMetalTextureInfoEXT
   {
     using NativeType = VkImportMetalTextureInfoEXT;
@@ -64320,13 +47695,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportMetalTextureInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportMetalTextureInfoEXT( ImageAspectFlagBits plane_      = ImageAspectFlagBits::eColor,
-                                                    MTLTexture_id       mtlTexture_ = {},
-                                                    const void *        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , plane{ plane_ }
-      , mtlTexture{ mtlTexture_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportMetalTextureInfoEXT( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane_      = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor,
+                                                    MTLTexture_id                             mtlTexture_ = {},
+                                                    const void *                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , plane( plane_ )
+      , mtlTexture( mtlTexture_ )
     {
     }
 
@@ -64338,22 +47713,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportMetalTextureInfoEXT & operator=( ImportMetalTextureInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportMetalTextureInfoEXT & operator=( VkImportMetalTextureInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportMetalTextureInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportMetalTextureInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportMetalTextureInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportMetalTextureInfoEXT & setPlane( ImageAspectFlagBits plane_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportMetalTextureInfoEXT & setPlane( VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane_ ) VULKAN_HPP_NOEXCEPT
     {
       plane = plane_;
       return *this;
@@ -64364,7 +47739,7 @@ namespace VULKAN_HPP_NAMESPACE
       mtlTexture = mtlTexture_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportMetalTextureInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64376,18 +47751,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportMetalTextureInfoEXT *>( this );
     }
 
-    operator VkImportMetalTextureInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportMetalTextureInfoEXT *>( this );
-    }
-
-    operator VkImportMetalTextureInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportMetalTextureInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageAspectFlagBits const &, MTLTexture_id const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageAspectFlagBits const &, MTLTexture_id const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, plane, mtlTexture );
     }
@@ -64412,20 +47782,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType       sType      = StructureType::eImportMetalTextureInfoEXT;
-    const void *        pNext      = {};
-    ImageAspectFlagBits plane      = ImageAspectFlagBits::eColor;
-    MTLTexture_id       mtlTexture = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType      = StructureType::eImportMetalTextureInfoEXT;
+    const void *                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlagBits plane      = VULKAN_HPP_NAMESPACE::ImageAspectFlagBits::eColor;
+    MTLTexture_id                             mtlTexture = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportMetalTextureInfoEXT>
-  {
-    using Type = ImportMetalTextureInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportMetalTextureInfoEXT>
   {
@@ -64433,120 +47795,7 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkImportNativeBufferInfoOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportNativeBufferInfoOHOS.html
-  struct ImportNativeBufferInfoOHOS
-  {
-    using NativeType = VkImportNativeBufferInfoOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportNativeBufferInfoOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportNativeBufferInfoOHOS( struct OH_NativeBuffer * buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ImportNativeBufferInfoOHOS( ImportNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ImportNativeBufferInfoOHOS( VkImportNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ImportNativeBufferInfoOHOS( *reinterpret_cast<ImportNativeBufferInfoOHOS const *>( &rhs ) )
-    {
-    }
-
-    ImportNativeBufferInfoOHOS & operator=( ImportNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ImportNativeBufferInfoOHOS & operator=( VkImportNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ImportNativeBufferInfoOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ImportNativeBufferInfoOHOS & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ImportNativeBufferInfoOHOS & setBuffer( struct OH_NativeBuffer * buffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      buffer = buffer_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkImportNativeBufferInfoOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkImportNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkImportNativeBufferInfoOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkImportNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkImportNativeBufferInfoOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkImportNativeBufferInfoOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportNativeBufferInfoOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, struct OH_NativeBuffer * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, buffer );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ImportNativeBufferInfoOHOS const & ) const = default;
-#  else
-    bool operator==( ImportNativeBufferInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( buffer == rhs.buffer );
-#    endif
-    }
-
-    bool operator!=( ImportNativeBufferInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType            sType  = StructureType::eImportNativeBufferInfoOHOS;
-    const void *             pNext  = {};
-    struct OH_NativeBuffer * buffer = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportNativeBufferInfoOHOS>
-  {
-    using Type = ImportNativeBufferInfoOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eImportNativeBufferInfoOHOS>
-  {
-    using Type = ImportNativeBufferInfoOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkImportScreenBufferInfoQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportScreenBufferInfoQNX.html
   struct ImportScreenBufferInfoQNX
   {
     using NativeType = VkImportScreenBufferInfoQNX;
@@ -64554,10 +47803,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportScreenBufferInfoQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ImportScreenBufferInfoQNX( struct _screen_buffer * buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , buffer{ buffer_ }
+      : pNext( pNext_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -64569,15 +47818,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportScreenBufferInfoQNX & operator=( ImportScreenBufferInfoQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportScreenBufferInfoQNX & operator=( VkImportScreenBufferInfoQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportScreenBufferInfoQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportScreenBufferInfoQNX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportScreenBufferInfoQNX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -64589,7 +47838,7 @@ namespace VULKAN_HPP_NAMESPACE
       buffer = buffer_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportScreenBufferInfoQNX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64601,18 +47850,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportScreenBufferInfoQNX *>( this );
     }
 
-    operator VkImportScreenBufferInfoQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportScreenBufferInfoQNX *>( this );
-    }
-
-    operator VkImportScreenBufferInfoQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportScreenBufferInfoQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, struct _screen_buffer * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, struct _screen_buffer * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, buffer );
     }
@@ -64637,19 +47881,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType           sType  = StructureType::eImportScreenBufferInfoQNX;
-    const void *            pNext  = {};
-    struct _screen_buffer * buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eImportScreenBufferInfoQNX;
+    const void *                        pNext  = {};
+    struct _screen_buffer *             buffer = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportScreenBufferInfoQNX>
-  {
-    using Type = ImportScreenBufferInfoQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportScreenBufferInfoQNX>
   {
@@ -64657,7 +47893,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  // wrapper struct for struct VkImportSemaphoreFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportSemaphoreFdInfoKHR.html
   struct ImportSemaphoreFdInfoKHR
   {
     using NativeType = VkImportSemaphoreFdInfoKHR;
@@ -64665,17 +47900,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportSemaphoreFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportSemaphoreFdInfoKHR( Semaphore                           semaphore_  = {},
-                                                   SemaphoreImportFlags                flags_      = {},
-                                                   ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                   int                                 fd_         = {},
-                                                   const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , flags{ flags_ }
-      , handleType{ handleType_ }
-      , fd{ fd_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportSemaphoreFdInfoKHR(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_  = {},
+      VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      int                                                       fd_         = {},
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , flags( flags_ )
+      , handleType( handleType_ )
+      , fd( fd_ )
     {
     }
 
@@ -64687,34 +47923,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportSemaphoreFdInfoKHR & operator=( ImportSemaphoreFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportSemaphoreFdInfoKHR & operator=( VkImportSemaphoreFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportSemaphoreFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportSemaphoreFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setFlags( SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreFdInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -64725,7 +47962,7 @@ namespace VULKAN_HPP_NAMESPACE
       fd = fd_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportSemaphoreFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64737,23 +47974,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportSemaphoreFdInfoKHR *>( this );
     }
 
-    operator VkImportSemaphoreFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportSemaphoreFdInfoKHR *>( this );
-    }
-
-    operator VkImportSemaphoreFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportSemaphoreFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Semaphore const &,
-               SemaphoreImportFlags const &,
-               ExternalSemaphoreHandleTypeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::SemaphoreImportFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &,
                int const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, flags, handleType, fd );
@@ -64780,22 +48011,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType      = StructureType::eImportSemaphoreFdInfoKHR;
-    const void *                        pNext      = {};
-    Semaphore                           semaphore  = {};
-    SemaphoreImportFlags                flags      = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
-    int                                 fd         = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::eImportSemaphoreFdInfoKHR;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore  = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags      = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    int                                                       fd         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportSemaphoreFdInfoKHR>
-  {
-    using Type = ImportSemaphoreFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportSemaphoreFdInfoKHR>
   {
@@ -64803,8 +48026,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkImportSemaphoreWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportSemaphoreWin32HandleInfoKHR.html
   struct ImportSemaphoreWin32HandleInfoKHR
   {
     using NativeType = VkImportSemaphoreWin32HandleInfoKHR;
@@ -64812,19 +48033,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportSemaphoreWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ImportSemaphoreWin32HandleInfoKHR( Semaphore                           semaphore_  = {},
-                                                            SemaphoreImportFlags                flags_      = {},
-                                                            ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                            HANDLE                              handle_     = {},
-                                                            LPCWSTR                             name_       = {},
-                                                            const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , flags{ flags_ }
-      , handleType{ handleType_ }
-      , handle{ handle_ }
-      , name{ name_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportSemaphoreWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_  = {},
+      VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      HANDLE                                                    handle_     = {},
+      LPCWSTR                                                   name_       = {},
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , flags( flags_ )
+      , handleType( handleType_ )
+      , handle( handle_ )
+      , name( name_ )
     {
     }
 
@@ -64836,34 +48058,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportSemaphoreWin32HandleInfoKHR & operator=( ImportSemaphoreWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportSemaphoreWin32HandleInfoKHR & operator=( VkImportSemaphoreWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportSemaphoreWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportSemaphoreWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setFlags( SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreWin32HandleInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -64880,7 +48103,7 @@ namespace VULKAN_HPP_NAMESPACE
       name = name_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportSemaphoreWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -64892,24 +48115,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportSemaphoreWin32HandleInfoKHR *>( this );
     }
 
-    operator VkImportSemaphoreWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportSemaphoreWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkImportSemaphoreWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportSemaphoreWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Semaphore const &,
-               SemaphoreImportFlags const &,
-               ExternalSemaphoreHandleTypeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::SemaphoreImportFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &,
                HANDLE const &,
                LPCWSTR const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, flags, handleType, handle, name );
@@ -64936,23 +48153,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                       sType      = StructureType::eImportSemaphoreWin32HandleInfoKHR;
-    const void *                        pNext      = {};
-    Semaphore                           semaphore  = {};
-    SemaphoreImportFlags                flags      = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
-    HANDLE                              handle     = {};
-    LPCWSTR                             name       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::eImportSemaphoreWin32HandleInfoKHR;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore  = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags      = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    HANDLE                                                    handle     = {};
+    LPCWSTR                                                   name       = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportSemaphoreWin32HandleInfoKHR>
-  {
-    using Type = ImportSemaphoreWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportSemaphoreWin32HandleInfoKHR>
   {
@@ -64961,8 +48170,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkImportSemaphoreZirconHandleInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkImportSemaphoreZirconHandleInfoFUCHSIA.html
   struct ImportSemaphoreZirconHandleInfoFUCHSIA
   {
     using NativeType = VkImportSemaphoreZirconHandleInfoFUCHSIA;
@@ -64970,18 +48177,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ImportSemaphoreZirconHandleInfoFUCHSIA( Semaphore                           semaphore_    = {},
-                                              SemaphoreImportFlags                flags_        = {},
-                                              ExternalSemaphoreHandleTypeFlagBits handleType_   = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                              zx_handle_t                         zirconHandle_ = {},
-                                              const void *                        pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , flags{ flags_ }
-      , handleType{ handleType_ }
-      , zirconHandle{ zirconHandle_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ImportSemaphoreZirconHandleInfoFUCHSIA(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_    = {},
+      VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags_        = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_   = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      zx_handle_t                                               zirconHandle_ = {},
+      const void *                                              pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , flags( flags_ )
+      , handleType( handleType_ )
+      , zirconHandle( zirconHandle_ )
     {
     }
 
@@ -64993,34 +48200,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ImportSemaphoreZirconHandleInfoFUCHSIA & operator=( ImportSemaphoreZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ImportSemaphoreZirconHandleInfoFUCHSIA & operator=( VkImportSemaphoreZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ImportSemaphoreZirconHandleInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ImportSemaphoreZirconHandleInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setFlags( SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setFlags( VULKAN_HPP_NAMESPACE::SemaphoreImportFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ImportSemaphoreZirconHandleInfoFUCHSIA &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
@@ -65031,7 +48239,7 @@ namespace VULKAN_HPP_NAMESPACE
       zirconHandle = zirconHandle_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkImportSemaphoreZirconHandleInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -65043,23 +48251,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkImportSemaphoreZirconHandleInfoFUCHSIA *>( this );
     }
 
-    operator VkImportSemaphoreZirconHandleInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA *>( this );
-    }
-
-    operator VkImportSemaphoreZirconHandleInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkImportSemaphoreZirconHandleInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Semaphore const &,
-               SemaphoreImportFlags const &,
-               ExternalSemaphoreHandleTypeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::SemaphoreImportFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &,
                zx_handle_t const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, flags, handleType, zirconHandle );
@@ -65098,22 +48300,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                       sType        = StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA;
-    const void *                        pNext        = {};
-    Semaphore                           semaphore    = {};
-    SemaphoreImportFlags                flags        = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType   = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
-    zx_handle_t                         zirconHandle = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType        = StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA;
+    const void *                                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore    = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreImportFlags                flags        = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType   = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    zx_handle_t                                               zirconHandle = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkImportSemaphoreZirconHandleInfoFUCHSIA>
-  {
-    using Type = ImportSemaphoreZirconHandleInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA>
   {
@@ -65121,870 +48315,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkIndirectCommandsExecutionSetTokenEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsExecutionSetTokenEXT.html
-  struct IndirectCommandsExecutionSetTokenEXT
-  {
-    using NativeType = VkIndirectCommandsExecutionSetTokenEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsExecutionSetTokenEXT( IndirectExecutionSetInfoTypeEXT type_         = IndirectExecutionSetInfoTypeEXT::ePipelines,
-                                                               ShaderStageFlags                shaderStages_ = {} ) VULKAN_HPP_NOEXCEPT
-      : type{ type_ }
-      , shaderStages{ shaderStages_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsExecutionSetTokenEXT( IndirectCommandsExecutionSetTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsExecutionSetTokenEXT( VkIndirectCommandsExecutionSetTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsExecutionSetTokenEXT( *reinterpret_cast<IndirectCommandsExecutionSetTokenEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectCommandsExecutionSetTokenEXT & operator=( IndirectCommandsExecutionSetTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsExecutionSetTokenEXT & operator=( VkIndirectCommandsExecutionSetTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsExecutionSetTokenEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsExecutionSetTokenEXT & setType( IndirectExecutionSetInfoTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      type = type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsExecutionSetTokenEXT & setShaderStages( ShaderStageFlags shaderStages_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderStages = shaderStages_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsExecutionSetTokenEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsExecutionSetTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsExecutionSetTokenEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsExecutionSetTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsExecutionSetTokenEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsExecutionSetTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsExecutionSetTokenEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsExecutionSetTokenEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<IndirectExecutionSetInfoTypeEXT const &, ShaderStageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( type, shaderStages );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectCommandsExecutionSetTokenEXT const & ) const = default;
-#else
-    bool operator==( IndirectCommandsExecutionSetTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( type == rhs.type ) && ( shaderStages == rhs.shaderStages );
-#  endif
-    }
-
-    bool operator!=( IndirectCommandsExecutionSetTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    IndirectExecutionSetInfoTypeEXT type         = IndirectExecutionSetInfoTypeEXT::ePipelines;
-    ShaderStageFlags                shaderStages = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsExecutionSetTokenEXT>
-  {
-    using Type = IndirectCommandsExecutionSetTokenEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkIndirectCommandsIndexBufferTokenEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsIndexBufferTokenEXT.html
-  struct IndirectCommandsIndexBufferTokenEXT
-  {
-    using NativeType = VkIndirectCommandsIndexBufferTokenEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsIndexBufferTokenEXT(
-      IndirectCommandsInputModeFlagBitsEXT mode_ = IndirectCommandsInputModeFlagBitsEXT::eVulkanIndexBuffer ) VULKAN_HPP_NOEXCEPT : mode{ mode_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsIndexBufferTokenEXT( IndirectCommandsIndexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsIndexBufferTokenEXT( VkIndirectCommandsIndexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsIndexBufferTokenEXT( *reinterpret_cast<IndirectCommandsIndexBufferTokenEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectCommandsIndexBufferTokenEXT & operator=( IndirectCommandsIndexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsIndexBufferTokenEXT & operator=( VkIndirectCommandsIndexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsIndexBufferTokenEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsIndexBufferTokenEXT & setMode( IndirectCommandsInputModeFlagBitsEXT mode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      mode = mode_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsIndexBufferTokenEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsIndexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsIndexBufferTokenEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsIndexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsIndexBufferTokenEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsIndexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsIndexBufferTokenEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsIndexBufferTokenEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<IndirectCommandsInputModeFlagBitsEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( mode );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectCommandsIndexBufferTokenEXT const & ) const = default;
-#else
-    bool operator==( IndirectCommandsIndexBufferTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( mode == rhs.mode );
-#  endif
-    }
-
-    bool operator!=( IndirectCommandsIndexBufferTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    IndirectCommandsInputModeFlagBitsEXT mode = IndirectCommandsInputModeFlagBitsEXT::eVulkanIndexBuffer;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsIndexBufferTokenEXT>
-  {
-    using Type = IndirectCommandsIndexBufferTokenEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkPushConstantRange, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPushConstantRange.html
-  struct PushConstantRange
-  {
-    using NativeType = VkPushConstantRange;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PushConstantRange( ShaderStageFlags stageFlags_ = {}, uint32_t offset_ = {}, uint32_t size_ = {} ) VULKAN_HPP_NOEXCEPT
-      : stageFlags{ stageFlags_ }
-      , offset{ offset_ }
-      , size{ size_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PushConstantRange( PushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PushConstantRange( VkPushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT : PushConstantRange( *reinterpret_cast<PushConstantRange const *>( &rhs ) ) {}
-
-    PushConstantRange & operator=( PushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PushConstantRange & operator=( VkPushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PushConstantRange const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stageFlags = stageFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setOffset( uint32_t offset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      offset = offset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPushConstantRange const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPushConstantRange *>( this );
-    }
-
-    operator VkPushConstantRange &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPushConstantRange *>( this );
-    }
-
-    operator VkPushConstantRange const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPushConstantRange *>( this );
-    }
-
-    operator VkPushConstantRange *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPushConstantRange *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ShaderStageFlags const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( stageFlags, offset, size );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PushConstantRange const & ) const = default;
-#else
-    bool operator==( PushConstantRange const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( stageFlags == rhs.stageFlags ) && ( offset == rhs.offset ) && ( size == rhs.size );
-#  endif
-    }
-
-    bool operator!=( PushConstantRange const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    ShaderStageFlags stageFlags = {};
-    uint32_t         offset     = {};
-    uint32_t         size       = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPushConstantRange>
-  {
-    using Type = PushConstantRange;
-  };
-#endif
-
-  // wrapper struct for struct VkIndirectCommandsPushConstantTokenEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsPushConstantTokenEXT.html
-  struct IndirectCommandsPushConstantTokenEXT
-  {
-    using NativeType = VkIndirectCommandsPushConstantTokenEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsPushConstantTokenEXT( PushConstantRange updateRange_ = {} ) VULKAN_HPP_NOEXCEPT : updateRange{ updateRange_ } {}
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsPushConstantTokenEXT( IndirectCommandsPushConstantTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsPushConstantTokenEXT( VkIndirectCommandsPushConstantTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsPushConstantTokenEXT( *reinterpret_cast<IndirectCommandsPushConstantTokenEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectCommandsPushConstantTokenEXT & operator=( IndirectCommandsPushConstantTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsPushConstantTokenEXT & operator=( VkIndirectCommandsPushConstantTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsPushConstantTokenEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsPushConstantTokenEXT & setUpdateRange( PushConstantRange const & updateRange_ ) VULKAN_HPP_NOEXCEPT
-    {
-      updateRange = updateRange_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsPushConstantTokenEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsPushConstantTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsPushConstantTokenEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsPushConstantTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsPushConstantTokenEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsPushConstantTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsPushConstantTokenEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsPushConstantTokenEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PushConstantRange const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( updateRange );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectCommandsPushConstantTokenEXT const & ) const = default;
-#else
-    bool operator==( IndirectCommandsPushConstantTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( updateRange == rhs.updateRange );
-#  endif
-    }
-
-    bool operator!=( IndirectCommandsPushConstantTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    PushConstantRange updateRange = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsPushConstantTokenEXT>
-  {
-    using Type = IndirectCommandsPushConstantTokenEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkIndirectCommandsVertexBufferTokenEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsVertexBufferTokenEXT.html
-  struct IndirectCommandsVertexBufferTokenEXT
-  {
-    using NativeType = VkIndirectCommandsVertexBufferTokenEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsVertexBufferTokenEXT( uint32_t vertexBindingUnit_ = {} ) VULKAN_HPP_NOEXCEPT : vertexBindingUnit{ vertexBindingUnit_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsVertexBufferTokenEXT( IndirectCommandsVertexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsVertexBufferTokenEXT( VkIndirectCommandsVertexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsVertexBufferTokenEXT( *reinterpret_cast<IndirectCommandsVertexBufferTokenEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectCommandsVertexBufferTokenEXT & operator=( IndirectCommandsVertexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsVertexBufferTokenEXT & operator=( VkIndirectCommandsVertexBufferTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsVertexBufferTokenEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsVertexBufferTokenEXT & setVertexBindingUnit( uint32_t vertexBindingUnit_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexBindingUnit = vertexBindingUnit_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsVertexBufferTokenEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsVertexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsVertexBufferTokenEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsVertexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsVertexBufferTokenEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsVertexBufferTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsVertexBufferTokenEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsVertexBufferTokenEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( vertexBindingUnit );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectCommandsVertexBufferTokenEXT const & ) const = default;
-#else
-    bool operator==( IndirectCommandsVertexBufferTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( vertexBindingUnit == rhs.vertexBindingUnit );
-#  endif
-    }
-
-    bool operator!=( IndirectCommandsVertexBufferTokenEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t vertexBindingUnit = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsVertexBufferTokenEXT>
-  {
-    using Type = IndirectCommandsVertexBufferTokenEXT;
-  };
-#endif
-
-  union IndirectCommandsTokenDataEXT
-  {
-    using NativeType = VkIndirectCommandsTokenDataEXT;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT( const IndirectCommandsPushConstantTokenEXT * pPushConstant_ = {} ) : pPushConstant( pPushConstant_ )
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT( const IndirectCommandsVertexBufferTokenEXT * pVertexBuffer_ ) : pVertexBuffer( pVertexBuffer_ ) {}
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT( const IndirectCommandsIndexBufferTokenEXT * pIndexBuffer_ ) : pIndexBuffer( pIndexBuffer_ ) {}
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT( const IndirectCommandsExecutionSetTokenEXT * pExecutionSet_ ) : pExecutionSet( pExecutionSet_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT & setPPushConstant( const IndirectCommandsPushConstantTokenEXT * pPushConstant_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPushConstant = pPushConstant_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT & setPVertexBuffer( const IndirectCommandsVertexBufferTokenEXT * pVertexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pVertexBuffer = pVertexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT & setPIndexBuffer( const IndirectCommandsIndexBufferTokenEXT * pIndexBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pIndexBuffer = pIndexBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsTokenDataEXT & setPExecutionSet( const IndirectCommandsExecutionSetTokenEXT * pExecutionSet_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pExecutionSet = pExecutionSet_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsTokenDataEXT const &() const
-    {
-      return *reinterpret_cast<const VkIndirectCommandsTokenDataEXT *>( this );
-    }
-
-    operator VkIndirectCommandsTokenDataEXT &()
-    {
-      return *reinterpret_cast<VkIndirectCommandsTokenDataEXT *>( this );
-    }
-
-#ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    const IndirectCommandsPushConstantTokenEXT * pPushConstant;
-    const IndirectCommandsVertexBufferTokenEXT * pVertexBuffer;
-    const IndirectCommandsIndexBufferTokenEXT *  pIndexBuffer;
-    const IndirectCommandsExecutionSetTokenEXT * pExecutionSet;
-#else
-    const VkIndirectCommandsPushConstantTokenEXT * pPushConstant;
-    const VkIndirectCommandsVertexBufferTokenEXT * pVertexBuffer;
-    const VkIndirectCommandsIndexBufferTokenEXT *  pIndexBuffer;
-    const VkIndirectCommandsExecutionSetTokenEXT * pExecutionSet;
-#endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsTokenDataEXT>
-  {
-    using Type = IndirectCommandsTokenDataEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkIndirectCommandsLayoutTokenEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutTokenEXT.html
-  struct IndirectCommandsLayoutTokenEXT
-  {
-    using NativeType = VkIndirectCommandsLayoutTokenEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectCommandsLayoutTokenEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT( IndirectCommandsTokenTypeEXT type_   = IndirectCommandsTokenTypeEXT::eExecutionSet,
-                                                            IndirectCommandsTokenDataEXT data_   = {},
-                                                            uint32_t                     offset_ = {},
-                                                            const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , data{ data_ }
-      , offset{ offset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT( IndirectCommandsLayoutTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsLayoutTokenEXT( VkIndirectCommandsLayoutTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsLayoutTokenEXT( *reinterpret_cast<IndirectCommandsLayoutTokenEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectCommandsLayoutTokenEXT & operator=( IndirectCommandsLayoutTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsLayoutTokenEXT & operator=( VkIndirectCommandsLayoutTokenEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsLayoutTokenEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT & setType( IndirectCommandsTokenTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      type = type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT & setData( IndirectCommandsTokenDataEXT const & data_ ) VULKAN_HPP_NOEXCEPT
-    {
-      data = data_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenEXT & setOffset( uint32_t offset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      offset = offset_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsLayoutTokenEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsLayoutTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutTokenEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsLayoutTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutTokenEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsLayoutTokenEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutTokenEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsLayoutTokenEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, IndirectCommandsTokenTypeEXT const &, IndirectCommandsTokenDataEXT const &, uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, type, data, offset );
-    }
-#endif
-
-  public:
-    StructureType                sType  = StructureType::eIndirectCommandsLayoutTokenEXT;
-    const void *                 pNext  = {};
-    IndirectCommandsTokenTypeEXT type   = IndirectCommandsTokenTypeEXT::eExecutionSet;
-    IndirectCommandsTokenDataEXT data   = {};
-    uint32_t                     offset = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsLayoutTokenEXT>
-  {
-    using Type = IndirectCommandsLayoutTokenEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectCommandsLayoutTokenEXT>
-  {
-    using Type = IndirectCommandsLayoutTokenEXT;
-  };
-
-  // wrapper struct for struct VkIndirectCommandsLayoutCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutCreateInfoEXT.html
-  struct IndirectCommandsLayoutCreateInfoEXT
-  {
-    using NativeType = VkIndirectCommandsLayoutCreateInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectCommandsLayoutCreateInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutCreateInfoEXT( IndirectCommandsLayoutUsageFlagsEXT    flags_          = {},
-                                                              ShaderStageFlags                       shaderStages_   = {},
-                                                              uint32_t                               indirectStride_ = {},
-                                                              PipelineLayout                         pipelineLayout_ = {},
-                                                              uint32_t                               tokenCount_     = {},
-                                                              const IndirectCommandsLayoutTokenEXT * pTokens_        = {},
-                                                              const void *                           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , shaderStages{ shaderStages_ }
-      , indirectStride{ indirectStride_ }
-      , pipelineLayout{ pipelineLayout_ }
-      , tokenCount{ tokenCount_ }
-      , pTokens{ pTokens_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutCreateInfoEXT( IndirectCommandsLayoutCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectCommandsLayoutCreateInfoEXT( VkIndirectCommandsLayoutCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectCommandsLayoutCreateInfoEXT( *reinterpret_cast<IndirectCommandsLayoutCreateInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutCreateInfoEXT( IndirectCommandsLayoutUsageFlagsEXT                                   flags_,
-                                         ShaderStageFlags                                                      shaderStages_,
-                                         uint32_t                                                              indirectStride_,
-                                         PipelineLayout                                                        pipelineLayout_,
-                                         ArrayProxyNoTemporaries<const IndirectCommandsLayoutTokenEXT> const & tokens_,
-                                         const void *                                                          pNext_ = nullptr )
-      : pNext( pNext_ )
-      , flags( flags_ )
-      , shaderStages( shaderStages_ )
-      , indirectStride( indirectStride_ )
-      , pipelineLayout( pipelineLayout_ )
-      , tokenCount( static_cast<uint32_t>( tokens_.size() ) )
-      , pTokens( tokens_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    IndirectCommandsLayoutCreateInfoEXT & operator=( IndirectCommandsLayoutCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectCommandsLayoutCreateInfoEXT & operator=( VkIndirectCommandsLayoutCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectCommandsLayoutCreateInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setFlags( IndirectCommandsLayoutUsageFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setShaderStages( ShaderStageFlags shaderStages_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderStages = shaderStages_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setIndirectStride( uint32_t indirectStride_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectStride = indirectStride_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setPipelineLayout( PipelineLayout pipelineLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineLayout = pipelineLayout_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setTokenCount( uint32_t tokenCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tokenCount = tokenCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoEXT & setPTokens( const IndirectCommandsLayoutTokenEXT * pTokens_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTokens = pTokens_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutCreateInfoEXT & setTokens( ArrayProxyNoTemporaries<const IndirectCommandsLayoutTokenEXT> const & tokens_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tokenCount = static_cast<uint32_t>( tokens_.size() );
-      pTokens    = tokens_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectCommandsLayoutCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectCommandsLayoutCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsLayoutCreateInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               IndirectCommandsLayoutUsageFlagsEXT const &,
-               ShaderStageFlags const &,
-               uint32_t const &,
-               PipelineLayout const &,
-               uint32_t const &,
-               const IndirectCommandsLayoutTokenEXT * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, shaderStages, indirectStride, pipelineLayout, tokenCount, pTokens );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectCommandsLayoutCreateInfoEXT const & ) const = default;
-#else
-    bool operator==( IndirectCommandsLayoutCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( shaderStages == rhs.shaderStages ) &&
-             ( indirectStride == rhs.indirectStride ) && ( pipelineLayout == rhs.pipelineLayout ) && ( tokenCount == rhs.tokenCount ) &&
-             ( pTokens == rhs.pTokens );
-#  endif
-    }
-
-    bool operator!=( IndirectCommandsLayoutCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                          sType          = StructureType::eIndirectCommandsLayoutCreateInfoEXT;
-    const void *                           pNext          = {};
-    IndirectCommandsLayoutUsageFlagsEXT    flags          = {};
-    ShaderStageFlags                       shaderStages   = {};
-    uint32_t                               indirectStride = {};
-    PipelineLayout                         pipelineLayout = {};
-    uint32_t                               tokenCount     = {};
-    const IndirectCommandsLayoutTokenEXT * pTokens        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsLayoutCreateInfoEXT>
-  {
-    using Type = IndirectCommandsLayoutCreateInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectCommandsLayoutCreateInfoEXT>
-  {
-    using Type = IndirectCommandsLayoutCreateInfoEXT;
-  };
-
-  // wrapper struct for struct VkIndirectCommandsLayoutTokenNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutTokenNV.html
   struct IndirectCommandsLayoutTokenNV
   {
     using NativeType = VkIndirectCommandsLayoutTokenNV;
@@ -65992,35 +48322,36 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectCommandsLayoutTokenNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutTokenNV( IndirectCommandsTokenTypeNV tokenType_                    = IndirectCommandsTokenTypeNV::eShaderGroup,
-                                                        uint32_t                    stream_                       = {},
-                                                        uint32_t                    offset_                       = {},
-                                                        uint32_t                    vertexBindingUnit_            = {},
-                                                        Bool32                      vertexDynamicStride_          = {},
-                                                        PipelineLayout              pushconstantPipelineLayout_   = {},
-                                                        ShaderStageFlags            pushconstantShaderStageFlags_ = {},
-                                                        uint32_t                    pushconstantOffset_           = {},
-                                                        uint32_t                    pushconstantSize_             = {},
-                                                        IndirectStateFlagsNV        indirectStateFlags_           = {},
-                                                        uint32_t                    indexTypeCount_               = {},
-                                                        const IndexType *           pIndexTypes_                  = {},
-                                                        const uint32_t *            pIndexTypeValues_             = {},
-                                                        const void *                pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tokenType{ tokenType_ }
-      , stream{ stream_ }
-      , offset{ offset_ }
-      , vertexBindingUnit{ vertexBindingUnit_ }
-      , vertexDynamicStride{ vertexDynamicStride_ }
-      , pushconstantPipelineLayout{ pushconstantPipelineLayout_ }
-      , pushconstantShaderStageFlags{ pushconstantShaderStageFlags_ }
-      , pushconstantOffset{ pushconstantOffset_ }
-      , pushconstantSize{ pushconstantSize_ }
-      , indirectStateFlags{ indirectStateFlags_ }
-      , indexTypeCount{ indexTypeCount_ }
-      , pIndexTypes{ pIndexTypes_ }
-      , pIndexTypeValues{ pIndexTypeValues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutTokenNV(
+      VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV tokenType_                    = VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV::eShaderGroup,
+      uint32_t                                          stream_                       = {},
+      uint32_t                                          offset_                       = {},
+      uint32_t                                          vertexBindingUnit_            = {},
+      VULKAN_HPP_NAMESPACE::Bool32                      vertexDynamicStride_          = {},
+      VULKAN_HPP_NAMESPACE::PipelineLayout              pushconstantPipelineLayout_   = {},
+      VULKAN_HPP_NAMESPACE::ShaderStageFlags            pushconstantShaderStageFlags_ = {},
+      uint32_t                                          pushconstantOffset_           = {},
+      uint32_t                                          pushconstantSize_             = {},
+      VULKAN_HPP_NAMESPACE::IndirectStateFlagsNV        indirectStateFlags_           = {},
+      uint32_t                                          indexTypeCount_               = {},
+      const VULKAN_HPP_NAMESPACE::IndexType *           pIndexTypes_                  = {},
+      const uint32_t *                                  pIndexTypeValues_             = {},
+      const void *                                      pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , tokenType( tokenType_ )
+      , stream( stream_ )
+      , offset( offset_ )
+      , vertexBindingUnit( vertexBindingUnit_ )
+      , vertexDynamicStride( vertexDynamicStride_ )
+      , pushconstantPipelineLayout( pushconstantPipelineLayout_ )
+      , pushconstantShaderStageFlags( pushconstantShaderStageFlags_ )
+      , pushconstantOffset( pushconstantOffset_ )
+      , pushconstantSize( pushconstantSize_ )
+      , indirectStateFlags( indirectStateFlags_ )
+      , indexTypeCount( indexTypeCount_ )
+      , pIndexTypes( pIndexTypes_ )
+      , pIndexTypeValues( pIndexTypeValues_ )
     {
     }
 
@@ -66032,19 +48363,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutTokenNV( IndirectCommandsTokenTypeNV                      tokenType_,
-                                   uint32_t                                         stream_,
-                                   uint32_t                                         offset_,
-                                   uint32_t                                         vertexBindingUnit_,
-                                   Bool32                                           vertexDynamicStride_,
-                                   PipelineLayout                                   pushconstantPipelineLayout_,
-                                   ShaderStageFlags                                 pushconstantShaderStageFlags_,
-                                   uint32_t                                         pushconstantOffset_,
-                                   uint32_t                                         pushconstantSize_,
-                                   IndirectStateFlagsNV                             indirectStateFlags_,
-                                   ArrayProxyNoTemporaries<const IndexType> const & indexTypes_,
-                                   ArrayProxyNoTemporaries<const uint32_t> const &  indexTypeValues_ = {},
-                                   const void *                                     pNext_           = nullptr )
+    IndirectCommandsLayoutTokenNV( VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV                                            tokenType_,
+                                   uint32_t                                                                                     stream_,
+                                   uint32_t                                                                                     offset_,
+                                   uint32_t                                                                                     vertexBindingUnit_,
+                                   VULKAN_HPP_NAMESPACE::Bool32                                                                 vertexDynamicStride_,
+                                   VULKAN_HPP_NAMESPACE::PipelineLayout                                                         pushconstantPipelineLayout_,
+                                   VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                       pushconstantShaderStageFlags_,
+                                   uint32_t                                                                                     pushconstantOffset_,
+                                   uint32_t                                                                                     pushconstantSize_,
+                                   VULKAN_HPP_NAMESPACE::IndirectStateFlagsNV                                                   indirectStateFlags_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndexType> const & indexTypes_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                        indexTypeValues_ = {},
+                                   const void *                                                                                 pNext_           = nullptr )
       : pNext( pNext_ )
       , tokenType( tokenType_ )
       , stream( stream_ )
@@ -66073,22 +48404,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     IndirectCommandsLayoutTokenNV & operator=( IndirectCommandsLayoutTokenNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     IndirectCommandsLayoutTokenNV & operator=( VkIndirectCommandsLayoutTokenNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<IndirectCommandsLayoutTokenNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setTokenType( IndirectCommandsTokenTypeNV tokenType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setTokenType( VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV tokenType_ ) VULKAN_HPP_NOEXCEPT
     {
       tokenType = tokenType_;
       return *this;
@@ -66112,20 +48443,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setVertexDynamicStride( Bool32 vertexDynamicStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setVertexDynamicStride( VULKAN_HPP_NAMESPACE::Bool32 vertexDynamicStride_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexDynamicStride = vertexDynamicStride_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setPushconstantPipelineLayout( PipelineLayout pushconstantPipelineLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV &
+      setPushconstantPipelineLayout( VULKAN_HPP_NAMESPACE::PipelineLayout pushconstantPipelineLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       pushconstantPipelineLayout = pushconstantPipelineLayout_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV &
-      setPushconstantShaderStageFlags( ShaderStageFlags pushconstantShaderStageFlags_ ) VULKAN_HPP_NOEXCEPT
+      setPushconstantShaderStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags pushconstantShaderStageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       pushconstantShaderStageFlags = pushconstantShaderStageFlags_;
       return *this;
@@ -66143,7 +48475,8 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setIndirectStateFlags( IndirectStateFlagsNV indirectStateFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV &
+      setIndirectStateFlags( VULKAN_HPP_NAMESPACE::IndirectStateFlagsNV indirectStateFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       indirectStateFlags = indirectStateFlags_;
       return *this;
@@ -66155,14 +48488,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setPIndexTypes( const IndexType * pIndexTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutTokenNV & setPIndexTypes( const VULKAN_HPP_NAMESPACE::IndexType * pIndexTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       pIndexTypes = pIndexTypes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutTokenNV & setIndexTypes( ArrayProxyNoTemporaries<const IndexType> const & indexTypes_ ) VULKAN_HPP_NOEXCEPT
+    IndirectCommandsLayoutTokenNV &
+      setIndexTypes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndexType> const & indexTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       indexTypeCount = static_cast<uint32_t>( indexTypes_.size() );
       pIndexTypes    = indexTypes_.data();
@@ -66177,14 +48511,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutTokenNV & setIndexTypeValues( ArrayProxyNoTemporaries<const uint32_t> const & indexTypeValues_ ) VULKAN_HPP_NOEXCEPT
+    IndirectCommandsLayoutTokenNV &
+      setIndexTypeValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & indexTypeValues_ ) VULKAN_HPP_NOEXCEPT
     {
       indexTypeCount   = static_cast<uint32_t>( indexTypeValues_.size() );
       pIndexTypeValues = indexTypeValues_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkIndirectCommandsLayoutTokenNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -66196,32 +48531,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkIndirectCommandsLayoutTokenNV *>( this );
     }
 
-    operator VkIndirectCommandsLayoutTokenNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsLayoutTokenNV *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutTokenNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsLayoutTokenNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               IndirectCommandsTokenTypeNV const &,
+               VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
-               PipelineLayout const &,
-               ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
                uint32_t const &,
                uint32_t const &,
-               IndirectStateFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::IndirectStateFlagsNV const &,
                uint32_t const &,
-               const IndexType * const &,
+               const VULKAN_HPP_NAMESPACE::IndexType * const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -66266,39 +48595,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                        = StructureType::eIndirectCommandsLayoutTokenNV;
-    const void *                pNext                        = {};
-    IndirectCommandsTokenTypeNV tokenType                    = IndirectCommandsTokenTypeNV::eShaderGroup;
-    uint32_t                    stream                       = {};
-    uint32_t                    offset                       = {};
-    uint32_t                    vertexBindingUnit            = {};
-    Bool32                      vertexDynamicStride          = {};
-    PipelineLayout              pushconstantPipelineLayout   = {};
-    ShaderStageFlags            pushconstantShaderStageFlags = {};
-    uint32_t                    pushconstantOffset           = {};
-    uint32_t                    pushconstantSize             = {};
-    IndirectStateFlagsNV        indirectStateFlags           = {};
-    uint32_t                    indexTypeCount               = {};
-    const IndexType *           pIndexTypes                  = {};
-    const uint32_t *            pIndexTypeValues             = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                        = StructureType::eIndirectCommandsLayoutTokenNV;
+    const void *                                      pNext                        = {};
+    VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV tokenType                    = VULKAN_HPP_NAMESPACE::IndirectCommandsTokenTypeNV::eShaderGroup;
+    uint32_t                                          stream                       = {};
+    uint32_t                                          offset                       = {};
+    uint32_t                                          vertexBindingUnit            = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      vertexDynamicStride          = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout              pushconstantPipelineLayout   = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags            pushconstantShaderStageFlags = {};
+    uint32_t                                          pushconstantOffset           = {};
+    uint32_t                                          pushconstantSize             = {};
+    VULKAN_HPP_NAMESPACE::IndirectStateFlagsNV        indirectStateFlags           = {};
+    uint32_t                                          indexTypeCount               = {};
+    const VULKAN_HPP_NAMESPACE::IndexType *           pIndexTypes                  = {};
+    const uint32_t *                                  pIndexTypeValues             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsLayoutTokenNV>
-  {
-    using Type = IndirectCommandsLayoutTokenNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eIndirectCommandsLayoutTokenNV>
   {
     using Type = IndirectCommandsLayoutTokenNV;
   };
 
-  // wrapper struct for struct VkIndirectCommandsLayoutCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectCommandsLayoutCreateInfoNV.html
   struct IndirectCommandsLayoutCreateInfoNV
   {
     using NativeType = VkIndirectCommandsLayoutCreateInfoNV;
@@ -66306,21 +48625,22 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectCommandsLayoutCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectCommandsLayoutCreateInfoNV( IndirectCommandsLayoutUsageFlagsNV    flags_             = {},
-                                                             PipelineBindPoint                     pipelineBindPoint_ = PipelineBindPoint::eGraphics,
-                                                             uint32_t                              tokenCount_        = {},
-                                                             const IndirectCommandsLayoutTokenNV * pTokens_           = {},
-                                                             uint32_t                              streamCount_       = {},
-                                                             const uint32_t *                      pStreamStrides_    = {},
-                                                             const void *                          pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , tokenCount{ tokenCount_ }
-      , pTokens{ pTokens_ }
-      , streamCount{ streamCount_ }
-      , pStreamStrides{ pStreamStrides_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      IndirectCommandsLayoutCreateInfoNV( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV flags_ = {},
+                                          VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_      = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+                                          uint32_t                                tokenCount_             = {},
+                                          const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV * pTokens_        = {},
+                                          uint32_t                                                    streamCount_    = {},
+                                          const uint32_t *                                            pStreamStrides_ = {},
+                                          const void *                                                pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , tokenCount( tokenCount_ )
+      , pTokens( pTokens_ )
+      , streamCount( streamCount_ )
+      , pStreamStrides( pStreamStrides_ )
     {
     }
 
@@ -66332,11 +48652,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutCreateInfoNV( IndirectCommandsLayoutUsageFlagsNV                                   flags_,
-                                        PipelineBindPoint                                                    pipelineBindPoint_,
-                                        ArrayProxyNoTemporaries<const IndirectCommandsLayoutTokenNV> const & tokens_,
-                                        ArrayProxyNoTemporaries<const uint32_t> const &                      streamStrides_ = {},
-                                        const void *                                                         pNext_         = nullptr )
+    IndirectCommandsLayoutCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV                                                         flags_,
+      VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                                          pipelineBindPoint_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV> const & tokens_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                                            streamStrides_ = {},
+      const void *                                                                                                     pNext_         = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , pipelineBindPoint( pipelineBindPoint_ )
@@ -66349,28 +48670,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     IndirectCommandsLayoutCreateInfoNV & operator=( IndirectCommandsLayoutCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     IndirectCommandsLayoutCreateInfoNV & operator=( VkIndirectCommandsLayoutCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<IndirectCommandsLayoutCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV & setFlags( IndirectCommandsLayoutUsageFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV & setFlags( VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV &
+      setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
@@ -66382,14 +48704,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV & setPTokens( const IndirectCommandsLayoutTokenNV * pTokens_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 IndirectCommandsLayoutCreateInfoNV &
+      setPTokens( const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV * pTokens_ ) VULKAN_HPP_NOEXCEPT
     {
       pTokens = pTokens_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutCreateInfoNV & setTokens( ArrayProxyNoTemporaries<const IndirectCommandsLayoutTokenNV> const & tokens_ ) VULKAN_HPP_NOEXCEPT
+    IndirectCommandsLayoutCreateInfoNV &
+      setTokens( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV> const & tokens_ ) VULKAN_HPP_NOEXCEPT
     {
       tokenCount = static_cast<uint32_t>( tokens_.size() );
       pTokens    = tokens_.data();
@@ -66410,14 +48734,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectCommandsLayoutCreateInfoNV & setStreamStrides( ArrayProxyNoTemporaries<const uint32_t> const & streamStrides_ ) VULKAN_HPP_NOEXCEPT
+    IndirectCommandsLayoutCreateInfoNV &
+      setStreamStrides( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & streamStrides_ ) VULKAN_HPP_NOEXCEPT
     {
       streamCount    = static_cast<uint32_t>( streamStrides_.size() );
       pStreamStrides = streamStrides_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkIndirectCommandsLayoutCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -66429,25 +48754,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkIndirectCommandsLayoutCreateInfoNV *>( this );
     }
 
-    operator VkIndirectCommandsLayoutCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNV *>( this );
-    }
-
-    operator VkIndirectCommandsLayoutCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectCommandsLayoutCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               IndirectCommandsLayoutUsageFlagsNV const &,
-               PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
                uint32_t const &,
-               const IndirectCommandsLayoutTokenNV * const &,
+               const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pipelineBindPoint, tokenCount, pTokens, streamCount, pStreamStrides );
@@ -66474,668 +48793,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType             = StructureType::eIndirectCommandsLayoutCreateInfoNV;
-    const void *                          pNext             = {};
-    IndirectCommandsLayoutUsageFlagsNV    flags             = {};
-    PipelineBindPoint                     pipelineBindPoint = PipelineBindPoint::eGraphics;
-    uint32_t                              tokenCount        = {};
-    const IndirectCommandsLayoutTokenNV * pTokens           = {};
-    uint32_t                              streamCount       = {};
-    const uint32_t *                      pStreamStrides    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType             = StructureType::eIndirectCommandsLayoutCreateInfoNV;
+    const void *                                                pNext             = {};
+    VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutUsageFlagsNV    flags             = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint                     pipelineBindPoint = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    uint32_t                                                    tokenCount        = {};
+    const VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutTokenNV * pTokens           = {};
+    uint32_t                                                    streamCount       = {};
+    const uint32_t *                                            pStreamStrides    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectCommandsLayoutCreateInfoNV>
-  {
-    using Type = IndirectCommandsLayoutCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eIndirectCommandsLayoutCreateInfoNV>
   {
     using Type = IndirectCommandsLayoutCreateInfoNV;
   };
 
-  // wrapper struct for struct VkIndirectExecutionSetPipelineInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetPipelineInfoEXT.html
-  struct IndirectExecutionSetPipelineInfoEXT
-  {
-    using NativeType = VkIndirectExecutionSetPipelineInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectExecutionSetPipelineInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      IndirectExecutionSetPipelineInfoEXT( Pipeline initialPipeline_ = {}, uint32_t maxPipelineCount_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , initialPipeline{ initialPipeline_ }
-      , maxPipelineCount{ maxPipelineCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetPipelineInfoEXT( IndirectExecutionSetPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectExecutionSetPipelineInfoEXT( VkIndirectExecutionSetPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectExecutionSetPipelineInfoEXT( *reinterpret_cast<IndirectExecutionSetPipelineInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectExecutionSetPipelineInfoEXT & operator=( IndirectExecutionSetPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectExecutionSetPipelineInfoEXT & operator=( VkIndirectExecutionSetPipelineInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectExecutionSetPipelineInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetPipelineInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetPipelineInfoEXT & setInitialPipeline( Pipeline initialPipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      initialPipeline = initialPipeline_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetPipelineInfoEXT & setMaxPipelineCount( uint32_t maxPipelineCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxPipelineCount = maxPipelineCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectExecutionSetPipelineInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectExecutionSetPipelineInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetPipelineInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectExecutionSetPipelineInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetPipelineInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectExecutionSetPipelineInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetPipelineInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectExecutionSetPipelineInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Pipeline const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, initialPipeline, maxPipelineCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectExecutionSetPipelineInfoEXT const & ) const = default;
-#else
-    bool operator==( IndirectExecutionSetPipelineInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( initialPipeline == rhs.initialPipeline ) && ( maxPipelineCount == rhs.maxPipelineCount );
-#  endif
-    }
-
-    bool operator!=( IndirectExecutionSetPipelineInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType            = StructureType::eIndirectExecutionSetPipelineInfoEXT;
-    const void *  pNext            = {};
-    Pipeline      initialPipeline  = {};
-    uint32_t      maxPipelineCount = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectExecutionSetPipelineInfoEXT>
-  {
-    using Type = IndirectExecutionSetPipelineInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectExecutionSetPipelineInfoEXT>
-  {
-    using Type = IndirectExecutionSetPipelineInfoEXT;
-  };
-
-  // wrapper struct for struct VkIndirectExecutionSetShaderLayoutInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetShaderLayoutInfoEXT.html
-  struct IndirectExecutionSetShaderLayoutInfoEXT
-  {
-    using NativeType = VkIndirectExecutionSetShaderLayoutInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectExecutionSetShaderLayoutInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetShaderLayoutInfoEXT( uint32_t                    setLayoutCount_ = {},
-                                                                  const DescriptorSetLayout * pSetLayouts_    = {},
-                                                                  const void *                pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , setLayoutCount{ setLayoutCount_ }
-      , pSetLayouts{ pSetLayouts_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetShaderLayoutInfoEXT( IndirectExecutionSetShaderLayoutInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectExecutionSetShaderLayoutInfoEXT( VkIndirectExecutionSetShaderLayoutInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectExecutionSetShaderLayoutInfoEXT( *reinterpret_cast<IndirectExecutionSetShaderLayoutInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderLayoutInfoEXT( ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), setLayoutCount( static_cast<uint32_t>( setLayouts_.size() ) ), pSetLayouts( setLayouts_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    IndirectExecutionSetShaderLayoutInfoEXT & operator=( IndirectExecutionSetShaderLayoutInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectExecutionSetShaderLayoutInfoEXT & operator=( VkIndirectExecutionSetShaderLayoutInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectExecutionSetShaderLayoutInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderLayoutInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderLayoutInfoEXT & setSetLayoutCount( uint32_t setLayoutCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      setLayoutCount = setLayoutCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderLayoutInfoEXT & setPSetLayouts( const DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pSetLayouts = pSetLayouts_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderLayoutInfoEXT & setSetLayouts( ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
-    {
-      setLayoutCount = static_cast<uint32_t>( setLayouts_.size() );
-      pSetLayouts    = setLayouts_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectExecutionSetShaderLayoutInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectExecutionSetShaderLayoutInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderLayoutInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectExecutionSetShaderLayoutInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderLayoutInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectExecutionSetShaderLayoutInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderLayoutInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectExecutionSetShaderLayoutInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const DescriptorSetLayout * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, setLayoutCount, pSetLayouts );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectExecutionSetShaderLayoutInfoEXT const & ) const = default;
-#else
-    bool operator==( IndirectExecutionSetShaderLayoutInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( setLayoutCount == rhs.setLayoutCount ) && ( pSetLayouts == rhs.pSetLayouts );
-#  endif
-    }
-
-    bool operator!=( IndirectExecutionSetShaderLayoutInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType               sType          = StructureType::eIndirectExecutionSetShaderLayoutInfoEXT;
-    const void *                pNext          = {};
-    uint32_t                    setLayoutCount = {};
-    const DescriptorSetLayout * pSetLayouts    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectExecutionSetShaderLayoutInfoEXT>
-  {
-    using Type = IndirectExecutionSetShaderLayoutInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectExecutionSetShaderLayoutInfoEXT>
-  {
-    using Type = IndirectExecutionSetShaderLayoutInfoEXT;
-  };
-
-  // wrapper struct for struct VkIndirectExecutionSetShaderInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetShaderInfoEXT.html
-  struct IndirectExecutionSetShaderInfoEXT
-  {
-    using NativeType = VkIndirectExecutionSetShaderInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectExecutionSetShaderInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetShaderInfoEXT( uint32_t                                        shaderCount_            = {},
-                                                            const ShaderEXT *                               pInitialShaders_        = {},
-                                                            const IndirectExecutionSetShaderLayoutInfoEXT * pSetLayoutInfos_        = {},
-                                                            uint32_t                                        maxShaderCount_         = {},
-                                                            uint32_t                                        pushConstantRangeCount_ = {},
-                                                            const PushConstantRange *                       pPushConstantRanges_    = {},
-                                                            const void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCount{ shaderCount_ }
-      , pInitialShaders{ pInitialShaders_ }
-      , pSetLayoutInfos{ pSetLayoutInfos_ }
-      , maxShaderCount{ maxShaderCount_ }
-      , pushConstantRangeCount{ pushConstantRangeCount_ }
-      , pPushConstantRanges{ pPushConstantRanges_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR IndirectExecutionSetShaderInfoEXT( IndirectExecutionSetShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectExecutionSetShaderInfoEXT( VkIndirectExecutionSetShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectExecutionSetShaderInfoEXT( *reinterpret_cast<IndirectExecutionSetShaderInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderInfoEXT( ArrayProxyNoTemporaries<const ShaderEXT> const &                               initialShaders_,
-                                       ArrayProxyNoTemporaries<const IndirectExecutionSetShaderLayoutInfoEXT> const & setLayoutInfos_     = {},
-                                       uint32_t                                                                       maxShaderCount_     = {},
-                                       ArrayProxyNoTemporaries<const PushConstantRange> const &                       pushConstantRanges_ = {},
-                                       const void *                                                                   pNext_              = nullptr )
-      : pNext( pNext_ )
-      , shaderCount( static_cast<uint32_t>( initialShaders_.size() ) )
-      , pInitialShaders( initialShaders_.data() )
-      , pSetLayoutInfos( setLayoutInfos_.data() )
-      , maxShaderCount( maxShaderCount_ )
-      , pushConstantRangeCount( static_cast<uint32_t>( pushConstantRanges_.size() ) )
-      , pPushConstantRanges( pushConstantRanges_.data() )
-    {
-#    ifdef VULKAN_HPP_NO_EXCEPTIONS
-      VULKAN_HPP_ASSERT( setLayoutInfos_.empty() || ( initialShaders_.size() == setLayoutInfos_.size() ) );
-#    else
-      if ( !setLayoutInfos_.empty() && ( initialShaders_.size() != setLayoutInfos_.size() ) )
-      {
-        throw LogicError(
-          VULKAN_HPP_NAMESPACE_STRING
-          "::IndirectExecutionSetShaderInfoEXT::IndirectExecutionSetShaderInfoEXT: !setLayoutInfos_.empty() && ( initialShaders_.size() != setLayoutInfos_.size() )" );
-      }
-#    endif /*VULKAN_HPP_NO_EXCEPTIONS*/
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    IndirectExecutionSetShaderInfoEXT & operator=( IndirectExecutionSetShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectExecutionSetShaderInfoEXT & operator=( VkIndirectExecutionSetShaderInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectExecutionSetShaderInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setShaderCount( uint32_t shaderCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderCount = shaderCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setPInitialShaders( const ShaderEXT * pInitialShaders_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pInitialShaders = pInitialShaders_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderInfoEXT & setInitialShaders( ArrayProxyNoTemporaries<const ShaderEXT> const & initialShaders_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderCount     = static_cast<uint32_t>( initialShaders_.size() );
-      pInitialShaders = initialShaders_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT &
-      setPSetLayoutInfos( const IndirectExecutionSetShaderLayoutInfoEXT * pSetLayoutInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pSetLayoutInfos = pSetLayoutInfos_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderInfoEXT &
-      setSetLayoutInfos( ArrayProxyNoTemporaries<const IndirectExecutionSetShaderLayoutInfoEXT> const & setLayoutInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderCount     = static_cast<uint32_t>( setLayoutInfos_.size() );
-      pSetLayoutInfos = setLayoutInfos_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setMaxShaderCount( uint32_t maxShaderCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxShaderCount = maxShaderCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setPushConstantRangeCount( uint32_t pushConstantRangeCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pushConstantRangeCount = pushConstantRangeCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetShaderInfoEXT & setPPushConstantRanges( const PushConstantRange * pPushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPushConstantRanges = pPushConstantRanges_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    IndirectExecutionSetShaderInfoEXT &
-      setPushConstantRanges( ArrayProxyNoTemporaries<const PushConstantRange> const & pushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pushConstantRangeCount = static_cast<uint32_t>( pushConstantRanges_.size() );
-      pPushConstantRanges    = pushConstantRanges_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectExecutionSetShaderInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectExecutionSetShaderInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectExecutionSetShaderInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectExecutionSetShaderInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetShaderInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectExecutionSetShaderInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               uint32_t const &,
-               const ShaderEXT * const &,
-               const IndirectExecutionSetShaderLayoutInfoEXT * const &,
-               uint32_t const &,
-               uint32_t const &,
-               const PushConstantRange * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderCount, pInitialShaders, pSetLayoutInfos, maxShaderCount, pushConstantRangeCount, pPushConstantRanges );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( IndirectExecutionSetShaderInfoEXT const & ) const = default;
-#else
-    bool operator==( IndirectExecutionSetShaderInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderCount == rhs.shaderCount ) && ( pInitialShaders == rhs.pInitialShaders ) &&
-             ( pSetLayoutInfos == rhs.pSetLayoutInfos ) && ( maxShaderCount == rhs.maxShaderCount ) &&
-             ( pushConstantRangeCount == rhs.pushConstantRangeCount ) && ( pPushConstantRanges == rhs.pPushConstantRanges );
-#  endif
-    }
-
-    bool operator!=( IndirectExecutionSetShaderInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                   sType                  = StructureType::eIndirectExecutionSetShaderInfoEXT;
-    const void *                                    pNext                  = {};
-    uint32_t                                        shaderCount            = {};
-    const ShaderEXT *                               pInitialShaders        = {};
-    const IndirectExecutionSetShaderLayoutInfoEXT * pSetLayoutInfos        = {};
-    uint32_t                                        maxShaderCount         = {};
-    uint32_t                                        pushConstantRangeCount = {};
-    const PushConstantRange *                       pPushConstantRanges    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectExecutionSetShaderInfoEXT>
-  {
-    using Type = IndirectExecutionSetShaderInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectExecutionSetShaderInfoEXT>
-  {
-    using Type = IndirectExecutionSetShaderInfoEXT;
-  };
-
-  union IndirectExecutionSetInfoEXT
-  {
-    using NativeType = VkIndirectExecutionSetInfoEXT;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetInfoEXT( const IndirectExecutionSetPipelineInfoEXT * pPipelineInfo_ = {} ) : pPipelineInfo( pPipelineInfo_ ) {}
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetInfoEXT( const IndirectExecutionSetShaderInfoEXT * pShaderInfo_ ) : pShaderInfo( pShaderInfo_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetInfoEXT & setPPipelineInfo( const IndirectExecutionSetPipelineInfoEXT * pPipelineInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineInfo = pPipelineInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetInfoEXT & setPShaderInfo( const IndirectExecutionSetShaderInfoEXT * pShaderInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pShaderInfo = pShaderInfo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectExecutionSetInfoEXT const &() const
-    {
-      return *reinterpret_cast<const VkIndirectExecutionSetInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetInfoEXT &()
-    {
-      return *reinterpret_cast<VkIndirectExecutionSetInfoEXT *>( this );
-    }
-
-#ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    const IndirectExecutionSetPipelineInfoEXT * pPipelineInfo;
-    const IndirectExecutionSetShaderInfoEXT *   pShaderInfo;
-#else
-    const VkIndirectExecutionSetPipelineInfoEXT * pPipelineInfo;
-    const VkIndirectExecutionSetShaderInfoEXT *   pShaderInfo;
-#endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectExecutionSetInfoEXT>
-  {
-    using Type = IndirectExecutionSetInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkIndirectExecutionSetCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkIndirectExecutionSetCreateInfoEXT.html
-  struct IndirectExecutionSetCreateInfoEXT
-  {
-    using NativeType = VkIndirectExecutionSetCreateInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eIndirectExecutionSetCreateInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetCreateInfoEXT( IndirectExecutionSetInfoTypeEXT type_  = IndirectExecutionSetInfoTypeEXT::ePipelines,
-                                                               IndirectExecutionSetInfoEXT     info_  = {},
-                                                               const void *                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , info{ info_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetCreateInfoEXT( IndirectExecutionSetCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    IndirectExecutionSetCreateInfoEXT( VkIndirectExecutionSetCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : IndirectExecutionSetCreateInfoEXT( *reinterpret_cast<IndirectExecutionSetCreateInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    IndirectExecutionSetCreateInfoEXT & operator=( IndirectExecutionSetCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    IndirectExecutionSetCreateInfoEXT & operator=( VkIndirectExecutionSetCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<IndirectExecutionSetCreateInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetCreateInfoEXT & setType( IndirectExecutionSetInfoTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      type = type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 IndirectExecutionSetCreateInfoEXT & setInfo( IndirectExecutionSetInfoEXT const & info_ ) VULKAN_HPP_NOEXCEPT
-    {
-      info = info_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkIndirectExecutionSetCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkIndirectExecutionSetCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkIndirectExecutionSetCreateInfoEXT *>( this );
-    }
-
-    operator VkIndirectExecutionSetCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkIndirectExecutionSetCreateInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, IndirectExecutionSetInfoTypeEXT const &, IndirectExecutionSetInfoEXT const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, type, info );
-    }
-#endif
-
-  public:
-    StructureType                   sType = StructureType::eIndirectExecutionSetCreateInfoEXT;
-    const void *                    pNext = {};
-    IndirectExecutionSetInfoTypeEXT type  = IndirectExecutionSetInfoTypeEXT::ePipelines;
-    IndirectExecutionSetInfoEXT     info  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkIndirectExecutionSetCreateInfoEXT>
-  {
-    using Type = IndirectExecutionSetCreateInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eIndirectExecutionSetCreateInfoEXT>
-  {
-    using Type = IndirectExecutionSetCreateInfoEXT;
-  };
-
-  // wrapper struct for struct VkInitializePerformanceApiInfoINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkInitializePerformanceApiInfoINTEL.html
   struct InitializePerformanceApiInfoINTEL
   {
     using NativeType = VkInitializePerformanceApiInfoINTEL;
@@ -67143,10 +48816,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eInitializePerformanceApiInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR InitializePerformanceApiInfoINTEL( void * pUserData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pUserData{ pUserData_ }
+      : pNext( pNext_ )
+      , pUserData( pUserData_ )
     {
     }
 
@@ -67158,15 +48831,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     InitializePerformanceApiInfoINTEL & operator=( InitializePerformanceApiInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     InitializePerformanceApiInfoINTEL & operator=( VkInitializePerformanceApiInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<InitializePerformanceApiInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::InitializePerformanceApiInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 InitializePerformanceApiInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -67178,7 +48851,7 @@ namespace VULKAN_HPP_NAMESPACE
       pUserData = pUserData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkInitializePerformanceApiInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67190,18 +48863,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkInitializePerformanceApiInfoINTEL *>( this );
     }
 
-    operator VkInitializePerformanceApiInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkInitializePerformanceApiInfoINTEL *>( this );
-    }
-
-    operator VkInitializePerformanceApiInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkInitializePerformanceApiInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pUserData );
     }
@@ -67226,37 +48894,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eInitializePerformanceApiInfoINTEL;
-    const void *  pNext     = {};
-    void *        pUserData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eInitializePerformanceApiInfoINTEL;
+    const void *                        pNext     = {};
+    void *                              pUserData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkInitializePerformanceApiInfoINTEL>
-  {
-    using Type = InitializePerformanceApiInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eInitializePerformanceApiInfoINTEL>
   {
     using Type = InitializePerformanceApiInfoINTEL;
   };
 
-  // wrapper struct for struct VkInputAttachmentAspectReference, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkInputAttachmentAspectReference.html
   struct InputAttachmentAspectReference
   {
     using NativeType = VkInputAttachmentAspectReference;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      InputAttachmentAspectReference( uint32_t subpass_ = {}, uint32_t inputAttachmentIndex_ = {}, ImageAspectFlags aspectMask_ = {} ) VULKAN_HPP_NOEXCEPT
-      : subpass{ subpass_ }
-      , inputAttachmentIndex{ inputAttachmentIndex_ }
-      , aspectMask{ aspectMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR InputAttachmentAspectReference( uint32_t                               subpass_              = {},
+                                                         uint32_t                               inputAttachmentIndex_ = {},
+                                                         VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_           = {} ) VULKAN_HPP_NOEXCEPT
+      : subpass( subpass_ )
+      , inputAttachmentIndex( inputAttachmentIndex_ )
+      , aspectMask( aspectMask_ )
     {
     }
 
@@ -67268,15 +48927,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     InputAttachmentAspectReference & operator=( InputAttachmentAspectReference const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     InputAttachmentAspectReference & operator=( VkInputAttachmentAspectReference const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<InputAttachmentAspectReference const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 InputAttachmentAspectReference & setSubpass( uint32_t subpass_ ) VULKAN_HPP_NOEXCEPT
     {
       subpass = subpass_;
@@ -67289,12 +48948,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 InputAttachmentAspectReference & setAspectMask( ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 InputAttachmentAspectReference & setAspectMask( VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectMask = aspectMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkInputAttachmentAspectReference const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67306,18 +48965,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkInputAttachmentAspectReference *>( this );
     }
 
-    operator VkInputAttachmentAspectReference const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkInputAttachmentAspectReference *>( this );
-    }
-
-    operator VkInputAttachmentAspectReference *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkInputAttachmentAspectReference *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, ImageAspectFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::ImageAspectFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( subpass, inputAttachmentIndex, aspectMask );
     }
@@ -67342,21 +48996,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t         subpass              = {};
-    uint32_t         inputAttachmentIndex = {};
-    ImageAspectFlags aspectMask           = {};
+    uint32_t                               subpass              = {};
+    uint32_t                               inputAttachmentIndex = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags aspectMask           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkInputAttachmentAspectReference>
-  {
-    using Type = InputAttachmentAspectReference;
-  };
-#endif
   using InputAttachmentAspectReferenceKHR = InputAttachmentAspectReference;
 
-  // wrapper struct for struct VkInstanceCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkInstanceCreateInfo.html
   struct InstanceCreateInfo
   {
     using NativeType = VkInstanceCreateInfo;
@@ -67364,21 +49010,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eInstanceCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR InstanceCreateInfo( InstanceCreateFlags     flags_                   = {},
-                                             const ApplicationInfo * pApplicationInfo_        = {},
-                                             uint32_t                enabledLayerCount_       = {},
-                                             const char * const *    ppEnabledLayerNames_     = {},
-                                             uint32_t                enabledExtensionCount_   = {},
-                                             const char * const *    ppEnabledExtensionNames_ = {},
-                                             const void *            pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pApplicationInfo{ pApplicationInfo_ }
-      , enabledLayerCount{ enabledLayerCount_ }
-      , ppEnabledLayerNames{ ppEnabledLayerNames_ }
-      , enabledExtensionCount{ enabledExtensionCount_ }
-      , ppEnabledExtensionNames{ ppEnabledExtensionNames_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR InstanceCreateInfo( VULKAN_HPP_NAMESPACE::InstanceCreateFlags     flags_                   = {},
+                                             const VULKAN_HPP_NAMESPACE::ApplicationInfo * pApplicationInfo_        = {},
+                                             uint32_t                                      enabledLayerCount_       = {},
+                                             const char * const *                          ppEnabledLayerNames_     = {},
+                                             uint32_t                                      enabledExtensionCount_   = {},
+                                             const char * const *                          ppEnabledExtensionNames_ = {},
+                                             const void *                                  pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pApplicationInfo( pApplicationInfo_ )
+      , enabledLayerCount( enabledLayerCount_ )
+      , ppEnabledLayerNames( ppEnabledLayerNames_ )
+      , enabledExtensionCount( enabledExtensionCount_ )
+      , ppEnabledExtensionNames( ppEnabledExtensionNames_ )
     {
     }
 
@@ -67387,11 +49033,11 @@ namespace VULKAN_HPP_NAMESPACE
     InstanceCreateInfo( VkInstanceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : InstanceCreateInfo( *reinterpret_cast<InstanceCreateInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    InstanceCreateInfo( InstanceCreateFlags                                 flags_,
-                        const ApplicationInfo *                             pApplicationInfo_,
-                        ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_,
-                        ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ = {},
-                        const void *                                        pNext_                  = nullptr )
+    InstanceCreateInfo( VULKAN_HPP_NAMESPACE::InstanceCreateFlags                                 flags_,
+                        const VULKAN_HPP_NAMESPACE::ApplicationInfo *                             pApplicationInfo_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ = {},
+                        const void *                                                              pNext_                  = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , pApplicationInfo( pApplicationInfo_ )
@@ -67404,28 +49050,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     InstanceCreateInfo & operator=( InstanceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     InstanceCreateInfo & operator=( VkInstanceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<InstanceCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::InstanceCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 InstanceCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 InstanceCreateInfo & setFlags( InstanceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 InstanceCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::InstanceCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 InstanceCreateInfo & setPApplicationInfo( const ApplicationInfo * pApplicationInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 InstanceCreateInfo & setPApplicationInfo( const VULKAN_HPP_NAMESPACE::ApplicationInfo * pApplicationInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pApplicationInfo = pApplicationInfo_;
       return *this;
@@ -67444,7 +49090,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    InstanceCreateInfo & setPEnabledLayerNames( ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_ ) VULKAN_HPP_NOEXCEPT
+    InstanceCreateInfo &
+      setPEnabledLayerNames( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledLayerNames_ ) VULKAN_HPP_NOEXCEPT
     {
       enabledLayerCount   = static_cast<uint32_t>( pEnabledLayerNames_.size() );
       ppEnabledLayerNames = pEnabledLayerNames_.data();
@@ -67465,14 +49112,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    InstanceCreateInfo & setPEnabledExtensionNames( ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ ) VULKAN_HPP_NOEXCEPT
+    InstanceCreateInfo &
+      setPEnabledExtensionNames( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const char * const> const & pEnabledExtensionNames_ ) VULKAN_HPP_NOEXCEPT
     {
       enabledExtensionCount   = static_cast<uint32_t>( pEnabledExtensionNames_.size() );
       ppEnabledExtensionNames = pEnabledExtensionNames_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkInstanceCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67484,25 +49132,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkInstanceCreateInfo *>( this );
     }
 
-    operator VkInstanceCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkInstanceCreateInfo *>( this );
-    }
-
-    operator VkInstanceCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkInstanceCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               InstanceCreateFlags const &,
-               const ApplicationInfo * const &,
+               VULKAN_HPP_NAMESPACE::InstanceCreateFlags const &,
+               const VULKAN_HPP_NAMESPACE::ApplicationInfo * const &,
                uint32_t const &,
                const char * const * const &,
                uint32_t const &,
                const char * const * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pApplicationInfo, enabledLayerCount, ppEnabledLayerNames, enabledExtensionCount, ppEnabledExtensionNames );
@@ -67562,31 +49204,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType           sType                   = StructureType::eInstanceCreateInfo;
-    const void *            pNext                   = {};
-    InstanceCreateFlags     flags                   = {};
-    const ApplicationInfo * pApplicationInfo        = {};
-    uint32_t                enabledLayerCount       = {};
-    const char * const *    ppEnabledLayerNames     = {};
-    uint32_t                enabledExtensionCount   = {};
-    const char * const *    ppEnabledExtensionNames = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType                   = StructureType::eInstanceCreateInfo;
+    const void *                                  pNext                   = {};
+    VULKAN_HPP_NAMESPACE::InstanceCreateFlags     flags                   = {};
+    const VULKAN_HPP_NAMESPACE::ApplicationInfo * pApplicationInfo        = {};
+    uint32_t                                      enabledLayerCount       = {};
+    const char * const *                          ppEnabledLayerNames     = {};
+    uint32_t                                      enabledExtensionCount   = {};
+    const char * const *                          ppEnabledExtensionNames = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkInstanceCreateInfo>
-  {
-    using Type = InstanceCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eInstanceCreateInfo>
   {
     using Type = InstanceCreateInfo;
   };
 
-  // wrapper struct for struct VkLatencySleepInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencySleepInfoNV.html
   struct LatencySleepInfoNV
   {
     using NativeType = VkLatencySleepInfoNV;
@@ -67594,11 +49227,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLatencySleepInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR LatencySleepInfoNV( Semaphore signalSemaphore_ = {}, uint64_t value_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , signalSemaphore{ signalSemaphore_ }
-      , value{ value_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      LatencySleepInfoNV( VULKAN_HPP_NAMESPACE::Semaphore signalSemaphore_ = {}, uint64_t value_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , signalSemaphore( signalSemaphore_ )
+      , value( value_ )
     {
     }
 
@@ -67607,22 +49241,22 @@ namespace VULKAN_HPP_NAMESPACE
     LatencySleepInfoNV( VkLatencySleepInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT : LatencySleepInfoNV( *reinterpret_cast<LatencySleepInfoNV const *>( &rhs ) ) {}
 
     LatencySleepInfoNV & operator=( LatencySleepInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LatencySleepInfoNV & operator=( VkLatencySleepInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LatencySleepInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LatencySleepInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LatencySleepInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LatencySleepInfoNV & setSignalSemaphore( Semaphore signalSemaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LatencySleepInfoNV & setSignalSemaphore( VULKAN_HPP_NAMESPACE::Semaphore signalSemaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphore = signalSemaphore_;
       return *this;
@@ -67633,7 +49267,7 @@ namespace VULKAN_HPP_NAMESPACE
       value = value_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLatencySleepInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67645,18 +49279,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLatencySleepInfoNV *>( this );
     }
 
-    operator VkLatencySleepInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLatencySleepInfoNV *>( this );
-    }
-
-    operator VkLatencySleepInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLatencySleepInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Semaphore const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, signalSemaphore, value );
     }
@@ -67681,27 +49310,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eLatencySleepInfoNV;
-    const void *  pNext           = {};
-    Semaphore     signalSemaphore = {};
-    uint64_t      value           = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eLatencySleepInfoNV;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Semaphore     signalSemaphore = {};
+    uint64_t                            value           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLatencySleepInfoNV>
-  {
-    using Type = LatencySleepInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLatencySleepInfoNV>
   {
     using Type = LatencySleepInfoNV;
   };
 
-  // wrapper struct for struct VkLatencySleepModeInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencySleepModeInfoNV.html
   struct LatencySleepModeInfoNV
   {
     using NativeType = VkLatencySleepModeInfoNV;
@@ -67709,15 +49329,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLatencySleepModeInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR LatencySleepModeInfoNV( Bool32       lowLatencyMode_    = {},
-                                                 Bool32       lowLatencyBoost_   = {},
-                                                 uint32_t     minimumIntervalUs_ = {},
-                                                 const void * pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , lowLatencyMode{ lowLatencyMode_ }
-      , lowLatencyBoost{ lowLatencyBoost_ }
-      , minimumIntervalUs{ minimumIntervalUs_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR LatencySleepModeInfoNV( VULKAN_HPP_NAMESPACE::Bool32 lowLatencyMode_    = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32 lowLatencyBoost_   = {},
+                                                 uint32_t                     minimumIntervalUs_ = {},
+                                                 const void *                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , lowLatencyMode( lowLatencyMode_ )
+      , lowLatencyBoost( lowLatencyBoost_ )
+      , minimumIntervalUs( minimumIntervalUs_ )
     {
     }
 
@@ -67729,28 +49349,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     LatencySleepModeInfoNV & operator=( LatencySleepModeInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LatencySleepModeInfoNV & operator=( VkLatencySleepModeInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LatencySleepModeInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LatencySleepModeInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LatencySleepModeInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LatencySleepModeInfoNV & setLowLatencyMode( Bool32 lowLatencyMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LatencySleepModeInfoNV & setLowLatencyMode( VULKAN_HPP_NAMESPACE::Bool32 lowLatencyMode_ ) VULKAN_HPP_NOEXCEPT
     {
       lowLatencyMode = lowLatencyMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LatencySleepModeInfoNV & setLowLatencyBoost( Bool32 lowLatencyBoost_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LatencySleepModeInfoNV & setLowLatencyBoost( VULKAN_HPP_NAMESPACE::Bool32 lowLatencyBoost_ ) VULKAN_HPP_NOEXCEPT
     {
       lowLatencyBoost = lowLatencyBoost_;
       return *this;
@@ -67761,7 +49381,7 @@ namespace VULKAN_HPP_NAMESPACE
       minimumIntervalUs = minimumIntervalUs_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLatencySleepModeInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67773,18 +49393,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLatencySleepModeInfoNV *>( this );
     }
 
-    operator VkLatencySleepModeInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLatencySleepModeInfoNV *>( this );
-    }
-
-    operator VkLatencySleepModeInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLatencySleepModeInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, Bool32 const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, lowLatencyMode, lowLatencyBoost, minimumIntervalUs );
     }
@@ -67810,28 +49429,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eLatencySleepModeInfoNV;
-    const void *  pNext             = {};
-    Bool32        lowLatencyMode    = {};
-    Bool32        lowLatencyBoost   = {};
-    uint32_t      minimumIntervalUs = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eLatencySleepModeInfoNV;
+    const void *                        pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        lowLatencyMode    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        lowLatencyBoost   = {};
+    uint32_t                            minimumIntervalUs = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLatencySleepModeInfoNV>
-  {
-    using Type = LatencySleepModeInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLatencySleepModeInfoNV>
   {
     using Type = LatencySleepModeInfoNV;
   };
 
-  // wrapper struct for struct VkLatencySubmissionPresentIdNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencySubmissionPresentIdNV.html
   struct LatencySubmissionPresentIdNV
   {
     using NativeType = VkLatencySubmissionPresentIdNV;
@@ -67839,10 +49449,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLatencySubmissionPresentIdNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR LatencySubmissionPresentIdNV( uint64_t presentID_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentID{ presentID_ }
+      : pNext( pNext_ )
+      , presentID( presentID_ )
     {
     }
 
@@ -67854,15 +49464,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     LatencySubmissionPresentIdNV & operator=( LatencySubmissionPresentIdNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LatencySubmissionPresentIdNV & operator=( VkLatencySubmissionPresentIdNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LatencySubmissionPresentIdNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LatencySubmissionPresentIdNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LatencySubmissionPresentIdNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -67874,7 +49484,7 @@ namespace VULKAN_HPP_NAMESPACE
       presentID = presentID_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLatencySubmissionPresentIdNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -67886,18 +49496,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLatencySubmissionPresentIdNV *>( this );
     }
 
-    operator VkLatencySubmissionPresentIdNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLatencySubmissionPresentIdNV *>( this );
-    }
-
-    operator VkLatencySubmissionPresentIdNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLatencySubmissionPresentIdNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentID );
     }
@@ -67922,26 +49527,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eLatencySubmissionPresentIdNV;
-    const void *  pNext     = {};
-    uint64_t      presentID = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eLatencySubmissionPresentIdNV;
+    const void *                        pNext     = {};
+    uint64_t                            presentID = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLatencySubmissionPresentIdNV>
-  {
-    using Type = LatencySubmissionPresentIdNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLatencySubmissionPresentIdNV>
   {
     using Type = LatencySubmissionPresentIdNV;
   };
 
-  // wrapper struct for struct VkLatencySurfaceCapabilitiesNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLatencySurfaceCapabilitiesNV.html
   struct LatencySurfaceCapabilitiesNV
   {
     using NativeType = VkLatencySurfaceCapabilitiesNV;
@@ -67949,12 +49545,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLatencySurfaceCapabilitiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      LatencySurfaceCapabilitiesNV( uint32_t presentModeCount_ = {}, PresentModeKHR * pPresentModes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentModeCount{ presentModeCount_ }
-      , pPresentModes{ pPresentModes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR LatencySurfaceCapabilitiesNV( uint32_t                               presentModeCount_ = {},
+                                                       VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_    = {},
+                                                       const void *                           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentModeCount( presentModeCount_ )
+      , pPresentModes( pPresentModes_ )
     {
     }
 
@@ -67966,22 +49563,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    LatencySurfaceCapabilitiesNV( ArrayProxyNoTemporaries<PresentModeKHR> const & presentModes_, const void * pNext_ = nullptr )
+    LatencySurfaceCapabilitiesNV( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_,
+                                  const void *                                                                                pNext_ = nullptr )
       : pNext( pNext_ ), presentModeCount( static_cast<uint32_t>( presentModes_.size() ) ), pPresentModes( presentModes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     LatencySurfaceCapabilitiesNV & operator=( LatencySurfaceCapabilitiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LatencySurfaceCapabilitiesNV & operator=( VkLatencySurfaceCapabilitiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LatencySurfaceCapabilitiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LatencySurfaceCapabilitiesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LatencySurfaceCapabilitiesNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -67994,21 +49592,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LatencySurfaceCapabilitiesNV & setPPresentModes( PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LatencySurfaceCapabilitiesNV & setPPresentModes( VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       pPresentModes = pPresentModes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    LatencySurfaceCapabilitiesNV & setPresentModes( ArrayProxyNoTemporaries<PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
+    LatencySurfaceCapabilitiesNV &
+      setPresentModes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       presentModeCount = static_cast<uint32_t>( presentModes_.size() );
       pPresentModes    = presentModes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLatencySurfaceCapabilitiesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68020,18 +49619,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLatencySurfaceCapabilitiesNV *>( this );
     }
 
-    operator VkLatencySurfaceCapabilitiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLatencySurfaceCapabilitiesNV *>( this );
-    }
-
-    operator VkLatencySurfaceCapabilitiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLatencySurfaceCapabilitiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, PresentModeKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::PresentModeKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentModeCount, pPresentModes );
     }
@@ -68056,40 +49650,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType            = StructureType::eLatencySurfaceCapabilitiesNV;
-    const void *     pNext            = {};
-    uint32_t         presentModeCount = {};
-    PresentModeKHR * pPresentModes    = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType            = StructureType::eLatencySurfaceCapabilitiesNV;
+    const void *                           pNext            = {};
+    uint32_t                               presentModeCount = {};
+    VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLatencySurfaceCapabilitiesNV>
-  {
-    using Type = LatencySurfaceCapabilitiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLatencySurfaceCapabilitiesNV>
   {
     using Type = LatencySurfaceCapabilitiesNV;
   };
 
-  // wrapper struct for struct VkLayerProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLayerProperties.html
   struct LayerProperties
   {
     using NativeType = VkLayerProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 LayerProperties( std::array<char, VK_MAX_EXTENSION_NAME_SIZE> const & layerName_             = {},
                                              uint32_t                                             specVersion_           = {},
                                              uint32_t                                             implementationVersion_ = {},
                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const &    description_           = {} ) VULKAN_HPP_NOEXCEPT
-      : layerName{ layerName_ }
-      , specVersion{ specVersion_ }
-      , implementationVersion{ implementationVersion_ }
-      , description{ description_ }
+      : layerName( layerName_ )
+      , specVersion( specVersion_ )
+      , implementationVersion( implementationVersion_ )
+      , description( description_ )
     {
     }
 
@@ -68097,12 +49682,32 @@ namespace VULKAN_HPP_NAMESPACE
 
     LayerProperties( VkLayerProperties const & rhs ) VULKAN_HPP_NOEXCEPT : LayerProperties( *reinterpret_cast<LayerProperties const *>( &rhs ) ) {}
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    LayerProperties( std::string const & layerName_, uint32_t specVersion_ = {}, uint32_t implementationVersion_ = {}, std::string const & description_ = {} )
+      : specVersion( specVersion_ ), implementationVersion( implementationVersion_ )
+    {
+      VULKAN_HPP_ASSERT( layerName_.size() < VK_MAX_EXTENSION_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( layerName, VK_MAX_EXTENSION_NAME_SIZE, layerName_.data(), layerName_.size() );
+#    else
+      strncpy( layerName, layerName_.data(), std::min<size_t>( VK_MAX_EXTENSION_NAME_SIZE, layerName_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     LayerProperties & operator=( LayerProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LayerProperties & operator=( VkLayerProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LayerProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LayerProperties const *>( &rhs );
       return *this;
     }
 
@@ -68116,19 +49721,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLayerProperties *>( this );
     }
 
-    operator VkLayerProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLayerProperties *>( this );
-    }
-
-    operator VkLayerProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLayerProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &, uint32_t const &, uint32_t const &, ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( layerName, specVersion, implementationVersion, description );
@@ -68163,36 +49764,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> layerName             = {};
-    uint32_t                                         specVersion           = {};
-    uint32_t                                         implementationVersion = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE>    description           = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> layerName             = {};
+    uint32_t                                                               specVersion           = {};
+    uint32_t                                                               implementationVersion = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE>    description           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLayerProperties>
-  {
-    using Type = LayerProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkLayerSettingEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLayerSettingEXT.html
   struct LayerSettingEXT
   {
     using NativeType = VkLayerSettingEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR LayerSettingEXT( const char *        pLayerName_   = {},
-                                          const char *        pSettingName_ = {},
-                                          LayerSettingTypeEXT type_         = LayerSettingTypeEXT::eBool32,
-                                          uint32_t            valueCount_   = {},
-                                          const void *        pValues_      = {} ) VULKAN_HPP_NOEXCEPT
-      : pLayerName{ pLayerName_ }
-      , pSettingName{ pSettingName_ }
-      , type{ type_ }
-      , valueCount{ valueCount_ }
-      , pValues{ pValues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR LayerSettingEXT( const char *                              pLayerName_   = {},
+                                          const char *                              pSettingName_ = {},
+                                          VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT type_         = VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT::eBool32,
+                                          uint32_t                                  valueCount_   = {},
+                                          const void *                              pValues_      = {} ) VULKAN_HPP_NOEXCEPT
+      : pLayerName( pLayerName_ )
+      , pSettingName( pSettingName_ )
+      , type( type_ )
+      , valueCount( valueCount_ )
+      , pValues( pValues_ )
     {
     }
 
@@ -68201,88 +49793,30 @@ namespace VULKAN_HPP_NAMESPACE
     LayerSettingEXT( VkLayerSettingEXT const & rhs ) VULKAN_HPP_NOEXCEPT : LayerSettingEXT( *reinterpret_cast<LayerSettingEXT const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    // NOTE: you need to provide the type because Bool32 and uint32_t are indistinguishable!
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const int32_t> const & values_ )
+    template <typename T>
+    LayerSettingEXT( const char *                                                   pLayerName_,
+                     const char *                                                   pSettingName_,
+                     VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT                      type_,
+                     VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & values_ )
       : pLayerName( pLayerName_ )
       , pSettingName( pSettingName_ )
       , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
+      , valueCount( static_cast<uint32_t>( values_.size() * sizeof( T ) ) )
       , pValues( values_.data() )
     {
-      VULKAN_HPP_ASSERT( isSameType<int32_t>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const int64_t> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<int64_t>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const uint32_t> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<uint32_t>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const uint64_t> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<uint64_t>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const float> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<float>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const double> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<double>( type ) );
-    }
-
-    LayerSettingEXT( char const * pLayerName_, char const * pSettingName_, LayerSettingTypeEXT type_, ArrayProxyNoTemporaries<const char *> const & values_ )
-      : pLayerName( pLayerName_ )
-      , pSettingName( pSettingName_ )
-      , type( type_ )
-      , valueCount( static_cast<uint32_t>( values_.size() ) )
-      , pValues( values_.data() )
-    {
-      VULKAN_HPP_ASSERT( isSameType<char *>( type ) );
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     LayerSettingEXT & operator=( LayerSettingEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LayerSettingEXT & operator=( VkLayerSettingEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LayerSettingEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LayerSettingEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LayerSettingEXT & setPLayerName( const char * pLayerName_ ) VULKAN_HPP_NOEXCEPT
     {
       pLayerName = pLayerName_;
@@ -68295,7 +49829,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LayerSettingEXT & setType( LayerSettingTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LayerSettingEXT & setType( VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
@@ -68307,57 +49841,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
+    VULKAN_HPP_CONSTEXPR_14 LayerSettingEXT & setPValues( const void * pValues_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pValues = pValues_;
+      return *this;
+    }
+
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const int32_t> const & values_ ) VULKAN_HPP_NOEXCEPT
+    template <typename T>
+    LayerSettingEXT & setValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & values_ ) VULKAN_HPP_NOEXCEPT
     {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const int64_t> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const uint32_t> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const uint64_t> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const float> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const double> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
-      pValues    = values_.data();
-      return *this;
-    }
-
-    LayerSettingEXT & setValues( ArrayProxyNoTemporaries<const char *> const & values_ ) VULKAN_HPP_NOEXCEPT
-    {
-      valueCount = static_cast<uint32_t>( values_.size() );
+      valueCount = static_cast<uint32_t>( values_.size() * sizeof( T ) );
       pValues    = values_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLayerSettingEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68369,18 +49868,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLayerSettingEXT *>( this );
     }
 
-    operator VkLayerSettingEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLayerSettingEXT *>( this );
-    }
-
-    operator VkLayerSettingEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLayerSettingEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<const char * const &, const char * const &, LayerSettingTypeEXT const &, uint32_t const &, const void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<const char * const &, const char * const &, VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT const &, uint32_t const &, const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( pLayerName, pSettingName, type, valueCount, pValues );
@@ -68420,22 +49913,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    const char *        pLayerName   = {};
-    const char *        pSettingName = {};
-    LayerSettingTypeEXT type         = LayerSettingTypeEXT::eBool32;
-    uint32_t            valueCount   = {};
-    const void *        pValues      = {};
+    const char *                              pLayerName   = {};
+    const char *                              pSettingName = {};
+    VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT type         = VULKAN_HPP_NAMESPACE::LayerSettingTypeEXT::eBool32;
+    uint32_t                                  valueCount   = {};
+    const void *                              pValues      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLayerSettingEXT>
-  {
-    using Type = LayerSettingEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkLayerSettingsCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkLayerSettingsCreateInfoEXT.html
   struct LayerSettingsCreateInfoEXT
   {
     using NativeType = VkLayerSettingsCreateInfoEXT;
@@ -68443,12 +49927,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = true;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eLayerSettingsCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      LayerSettingsCreateInfoEXT( uint32_t settingCount_ = {}, const LayerSettingEXT * pSettings_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , settingCount{ settingCount_ }
-      , pSettings{ pSettings_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR LayerSettingsCreateInfoEXT( uint32_t                                      settingCount_ = {},
+                                                     const VULKAN_HPP_NAMESPACE::LayerSettingEXT * pSettings_    = {},
+                                                     const void *                                  pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , settingCount( settingCount_ )
+      , pSettings( pSettings_ )
     {
     }
 
@@ -68460,22 +49945,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    LayerSettingsCreateInfoEXT( ArrayProxyNoTemporaries<const LayerSettingEXT> const & settings_, const void * pNext_ = nullptr )
+    LayerSettingsCreateInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::LayerSettingEXT> const & settings_,
+                                const void *                                                                                       pNext_ = nullptr )
       : pNext( pNext_ ), settingCount( static_cast<uint32_t>( settings_.size() ) ), pSettings( settings_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     LayerSettingsCreateInfoEXT & operator=( LayerSettingsCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     LayerSettingsCreateInfoEXT & operator=( VkLayerSettingsCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<LayerSettingsCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::LayerSettingsCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 LayerSettingsCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -68488,21 +49974,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 LayerSettingsCreateInfoEXT & setPSettings( const LayerSettingEXT * pSettings_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 LayerSettingsCreateInfoEXT & setPSettings( const VULKAN_HPP_NAMESPACE::LayerSettingEXT * pSettings_ ) VULKAN_HPP_NOEXCEPT
     {
       pSettings = pSettings_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    LayerSettingsCreateInfoEXT & setSettings( ArrayProxyNoTemporaries<const LayerSettingEXT> const & settings_ ) VULKAN_HPP_NOEXCEPT
+    LayerSettingsCreateInfoEXT &
+      setSettings( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::LayerSettingEXT> const & settings_ ) VULKAN_HPP_NOEXCEPT
     {
       settingCount = static_cast<uint32_t>( settings_.size() );
       pSettings    = settings_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkLayerSettingsCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68514,18 +50001,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkLayerSettingsCreateInfoEXT *>( this );
     }
 
-    operator VkLayerSettingsCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkLayerSettingsCreateInfoEXT *>( this );
-    }
-
-    operator VkLayerSettingsCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkLayerSettingsCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const LayerSettingEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::LayerSettingEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, settingCount, pSettings );
     }
@@ -68550,20 +50032,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType        = StructureType::eLayerSettingsCreateInfoEXT;
-    const void *            pNext        = {};
-    uint32_t                settingCount = {};
-    const LayerSettingEXT * pSettings    = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType        = StructureType::eLayerSettingsCreateInfoEXT;
+    const void *                                  pNext        = {};
+    uint32_t                                      settingCount = {};
+    const VULKAN_HPP_NAMESPACE::LayerSettingEXT * pSettings    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkLayerSettingsCreateInfoEXT>
-  {
-    using Type = LayerSettingsCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eLayerSettingsCreateInfoEXT>
   {
@@ -68571,7 +50045,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
-  // wrapper struct for struct VkMacOSSurfaceCreateInfoMVK, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMacOSSurfaceCreateInfoMVK.html
   struct MacOSSurfaceCreateInfoMVK
   {
     using NativeType = VkMacOSSurfaceCreateInfoMVK;
@@ -68579,12 +50052,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMacosSurfaceCreateInfoMVK;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      MacOSSurfaceCreateInfoMVK( MacOSSurfaceCreateFlagsMVK flags_ = {}, const void * pView_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pView{ pView_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MacOSSurfaceCreateInfoMVK( VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateFlagsMVK flags_ = {},
+                                                    const void *                                     pView_ = {},
+                                                    const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pView( pView_ )
     {
     }
 
@@ -68596,22 +50070,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MacOSSurfaceCreateInfoMVK & operator=( MacOSSurfaceCreateInfoMVK const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MacOSSurfaceCreateInfoMVK & operator=( VkMacOSSurfaceCreateInfoMVK const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MacOSSurfaceCreateInfoMVK const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateInfoMVK const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MacOSSurfaceCreateInfoMVK & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MacOSSurfaceCreateInfoMVK & setFlags( MacOSSurfaceCreateFlagsMVK flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MacOSSurfaceCreateInfoMVK & setFlags( VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateFlagsMVK flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -68622,7 +50096,7 @@ namespace VULKAN_HPP_NAMESPACE
       pView = pView_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMacOSSurfaceCreateInfoMVK const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68634,18 +50108,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMacOSSurfaceCreateInfoMVK *>( this );
     }
 
-    operator VkMacOSSurfaceCreateInfoMVK const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMacOSSurfaceCreateInfoMVK *>( this );
-    }
-
-    operator VkMacOSSurfaceCreateInfoMVK *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMacOSSurfaceCreateInfoMVK *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MacOSSurfaceCreateFlagsMVK const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateFlagsMVK const &, const void * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pView );
     }
@@ -68670,20 +50140,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType              sType = StructureType::eMacosSurfaceCreateInfoMVK;
-    const void *               pNext = {};
-    MacOSSurfaceCreateFlagsMVK flags = {};
-    const void *               pView = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType = StructureType::eMacosSurfaceCreateInfoMVK;
+    const void *                                     pNext = {};
+    VULKAN_HPP_NAMESPACE::MacOSSurfaceCreateFlagsMVK flags = {};
+    const void *                                     pView = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMacOSSurfaceCreateInfoMVK>
-  {
-    using Type = MacOSSurfaceCreateInfoMVK;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMacosSurfaceCreateInfoMVK>
   {
@@ -68691,7 +50153,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
 
-  // wrapper struct for struct VkMappedMemoryRange, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMappedMemoryRange.html
   struct MappedMemoryRange
   {
     using NativeType = VkMappedMemoryRange;
@@ -68699,13 +50160,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMappedMemoryRange;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      MappedMemoryRange( DeviceMemory memory_ = {}, DeviceSize offset_ = {}, DeviceSize size_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , offset{ offset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MappedMemoryRange( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize   offset_ = {},
+                                            VULKAN_HPP_NAMESPACE::DeviceSize   size_   = {},
+                                            const void *                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , offset( offset_ )
+      , size( size_ )
     {
     }
 
@@ -68714,39 +50177,39 @@ namespace VULKAN_HPP_NAMESPACE
     MappedMemoryRange( VkMappedMemoryRange const & rhs ) VULKAN_HPP_NOEXCEPT : MappedMemoryRange( *reinterpret_cast<MappedMemoryRange const *>( &rhs ) ) {}
 
     MappedMemoryRange & operator=( MappedMemoryRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MappedMemoryRange & operator=( VkMappedMemoryRange const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MappedMemoryRange const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MappedMemoryRange const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MappedMemoryRange & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMappedMemoryRange const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68758,18 +50221,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMappedMemoryRange *>( this );
     }
 
-    operator VkMappedMemoryRange const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMappedMemoryRange *>( this );
-    }
-
-    operator VkMappedMemoryRange *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMappedMemoryRange *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, offset, size );
     }
@@ -68794,28 +50256,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eMappedMemoryRange;
-    const void *  pNext  = {};
-    DeviceMemory  memory = {};
-    DeviceSize    offset = {};
-    DeviceSize    size   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eMappedMemoryRange;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    offset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMappedMemoryRange>
-  {
-    using Type = MappedMemoryRange;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMappedMemoryRange>
   {
     using Type = MappedMemoryRange;
   };
 
-  // wrapper struct for struct VkMemoryAllocateFlagsInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryAllocateFlagsInfo.html
   struct MemoryAllocateFlagsInfo
   {
     using NativeType = VkMemoryAllocateFlagsInfo;
@@ -68823,12 +50276,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryAllocateFlagsInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      MemoryAllocateFlagsInfo( MemoryAllocateFlags flags_ = {}, uint32_t deviceMask_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , deviceMask{ deviceMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryAllocateFlagsInfo( VULKAN_HPP_NAMESPACE::MemoryAllocateFlags flags_      = {},
+                                                  uint32_t                                  deviceMask_ = {},
+                                                  const void *                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , deviceMask( deviceMask_ )
     {
     }
 
@@ -68840,22 +50294,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryAllocateFlagsInfo & operator=( MemoryAllocateFlagsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryAllocateFlagsInfo & operator=( VkMemoryAllocateFlagsInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryAllocateFlagsInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryAllocateFlagsInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryAllocateFlagsInfo & setFlags( MemoryAllocateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryAllocateFlagsInfo & setFlags( VULKAN_HPP_NAMESPACE::MemoryAllocateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -68866,7 +50320,7 @@ namespace VULKAN_HPP_NAMESPACE
       deviceMask = deviceMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryAllocateFlagsInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68878,18 +50332,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryAllocateFlagsInfo *>( this );
     }
 
-    operator VkMemoryAllocateFlagsInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryAllocateFlagsInfo *>( this );
-    }
-
-    operator VkMemoryAllocateFlagsInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryAllocateFlagsInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MemoryAllocateFlags const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::MemoryAllocateFlags const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, deviceMask );
     }
@@ -68914,20 +50363,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType      = StructureType::eMemoryAllocateFlagsInfo;
-    const void *        pNext      = {};
-    MemoryAllocateFlags flags      = {};
-    uint32_t            deviceMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType      = StructureType::eMemoryAllocateFlagsInfo;
+    const void *                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::MemoryAllocateFlags flags      = {};
+    uint32_t                                  deviceMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryAllocateFlagsInfo>
-  {
-    using Type = MemoryAllocateFlagsInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryAllocateFlagsInfo>
   {
@@ -68936,7 +50377,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryAllocateFlagsInfoKHR = MemoryAllocateFlagsInfo;
 
-  // wrapper struct for struct VkMemoryAllocateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryAllocateInfo.html
   struct MemoryAllocateInfo
   {
     using NativeType = VkMemoryAllocateInfo;
@@ -68944,12 +50384,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      MemoryAllocateInfo( DeviceSize allocationSize_ = {}, uint32_t memoryTypeIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allocationSize{ allocationSize_ }
-      , memoryTypeIndex{ memoryTypeIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryAllocateInfo( VULKAN_HPP_NAMESPACE::DeviceSize allocationSize_  = {},
+                                             uint32_t                         memoryTypeIndex_ = {},
+                                             const void *                     pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , allocationSize( allocationSize_ )
+      , memoryTypeIndex( memoryTypeIndex_ )
     {
     }
 
@@ -68958,22 +50399,22 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryAllocateInfo( VkMemoryAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryAllocateInfo( *reinterpret_cast<MemoryAllocateInfo const *>( &rhs ) ) {}
 
     MemoryAllocateInfo & operator=( MemoryAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryAllocateInfo & operator=( VkMemoryAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryAllocateInfo & setAllocationSize( DeviceSize allocationSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryAllocateInfo & setAllocationSize( VULKAN_HPP_NAMESPACE::DeviceSize allocationSize_ ) VULKAN_HPP_NOEXCEPT
     {
       allocationSize = allocationSize_;
       return *this;
@@ -68984,7 +50425,7 @@ namespace VULKAN_HPP_NAMESPACE
       memoryTypeIndex = memoryTypeIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -68996,18 +50437,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryAllocateInfo *>( this );
     }
 
-    operator VkMemoryAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryAllocateInfo *>( this );
-    }
-
-    operator VkMemoryAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceSize const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, allocationSize, memoryTypeIndex );
     }
@@ -69032,27 +50468,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eMemoryAllocateInfo;
-    const void *  pNext           = {};
-    DeviceSize    allocationSize  = {};
-    uint32_t      memoryTypeIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eMemoryAllocateInfo;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    allocationSize  = {};
+    uint32_t                            memoryTypeIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryAllocateInfo>
-  {
-    using Type = MemoryAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryAllocateInfo>
   {
     using Type = MemoryAllocateInfo;
   };
 
-  // wrapper struct for struct VkMemoryBarrier, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryBarrier.html
   struct MemoryBarrier
   {
     using NativeType = VkMemoryBarrier;
@@ -69060,11 +50487,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryBarrier;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryBarrier( AccessFlags srcAccessMask_ = {}, AccessFlags dstAccessMask_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstAccessMask{ dstAccessMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryBarrier( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ = {},
+                                        VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ = {},
+                                        const void *                      pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstAccessMask( dstAccessMask_ )
     {
     }
 
@@ -69073,33 +50502,33 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryBarrier( VkMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryBarrier( *reinterpret_cast<MemoryBarrier const *>( &rhs ) ) {}
 
     MemoryBarrier & operator=( MemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryBarrier & operator=( VkMemoryBarrier const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryBarrier const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryBarrier const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryBarrier & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier & setSrcAccessMask( AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier & setDstAccessMask( AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryBarrier & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryBarrier const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -69111,18 +50540,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryBarrier *>( this );
     }
 
-    operator VkMemoryBarrier const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryBarrier *>( this );
-    }
-
-    operator VkMemoryBarrier *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryBarrier *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AccessFlags const &, AccessFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcAccessMask, dstAccessMask );
     }
@@ -69147,147 +50574,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eMemoryBarrier;
-    const void *  pNext         = {};
-    AccessFlags   srcAccessMask = {};
-    AccessFlags   dstAccessMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eMemoryBarrier;
+    const void *                        pNext         = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags   srcAccessMask = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags   dstAccessMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryBarrier>
-  {
-    using Type = MemoryBarrier;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryBarrier>
   {
     using Type = MemoryBarrier;
   };
 
-  // wrapper struct for struct VkMemoryBarrierAccessFlags3KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryBarrierAccessFlags3KHR.html
-  struct MemoryBarrierAccessFlags3KHR
-  {
-    using NativeType = VkMemoryBarrierAccessFlags3KHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryBarrierAccessFlags3KHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryBarrierAccessFlags3KHR( AccessFlags3KHR srcAccessMask3_ = {},
-                                                       AccessFlags3KHR dstAccessMask3_ = {},
-                                                       const void *    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcAccessMask3{ srcAccessMask3_ }
-      , dstAccessMask3{ dstAccessMask3_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryBarrierAccessFlags3KHR( MemoryBarrierAccessFlags3KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryBarrierAccessFlags3KHR( VkMemoryBarrierAccessFlags3KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : MemoryBarrierAccessFlags3KHR( *reinterpret_cast<MemoryBarrierAccessFlags3KHR const *>( &rhs ) )
-    {
-    }
-
-    MemoryBarrierAccessFlags3KHR & operator=( MemoryBarrierAccessFlags3KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryBarrierAccessFlags3KHR & operator=( VkMemoryBarrierAccessFlags3KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryBarrierAccessFlags3KHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrierAccessFlags3KHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrierAccessFlags3KHR & setSrcAccessMask3( AccessFlags3KHR srcAccessMask3_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcAccessMask3 = srcAccessMask3_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryBarrierAccessFlags3KHR & setDstAccessMask3( AccessFlags3KHR dstAccessMask3_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstAccessMask3 = dstAccessMask3_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkMemoryBarrierAccessFlags3KHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkMemoryBarrierAccessFlags3KHR *>( this );
-    }
-
-    operator VkMemoryBarrierAccessFlags3KHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkMemoryBarrierAccessFlags3KHR *>( this );
-    }
-
-    operator VkMemoryBarrierAccessFlags3KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryBarrierAccessFlags3KHR *>( this );
-    }
-
-    operator VkMemoryBarrierAccessFlags3KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryBarrierAccessFlags3KHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AccessFlags3KHR const &, AccessFlags3KHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, srcAccessMask3, dstAccessMask3 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryBarrierAccessFlags3KHR const & ) const = default;
-#else
-    bool operator==( MemoryBarrierAccessFlags3KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( srcAccessMask3 == rhs.srcAccessMask3 ) && ( dstAccessMask3 == rhs.dstAccessMask3 );
-#  endif
-    }
-
-    bool operator!=( MemoryBarrierAccessFlags3KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType   sType          = StructureType::eMemoryBarrierAccessFlags3KHR;
-    const void *    pNext          = {};
-    AccessFlags3KHR srcAccessMask3 = {};
-    AccessFlags3KHR dstAccessMask3 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryBarrierAccessFlags3KHR>
-  {
-    using Type = MemoryBarrierAccessFlags3KHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eMemoryBarrierAccessFlags3KHR>
-  {
-    using Type = MemoryBarrierAccessFlags3KHR;
-  };
-
-  // wrapper struct for struct VkMemoryDedicatedAllocateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryDedicatedAllocateInfo.html
   struct MemoryDedicatedAllocateInfo
   {
     using NativeType = VkMemoryDedicatedAllocateInfo;
@@ -69295,11 +50593,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryDedicatedAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryDedicatedAllocateInfo( Image image_ = {}, Buffer buffer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image{ image_ }
-      , buffer{ buffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryDedicatedAllocateInfo( VULKAN_HPP_NAMESPACE::Image  image_  = {},
+                                                      VULKAN_HPP_NAMESPACE::Buffer buffer_ = {},
+                                                      const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image( image_ )
+      , buffer( buffer_ )
     {
     }
 
@@ -69311,33 +50611,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryDedicatedAllocateInfo & operator=( MemoryDedicatedAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryDedicatedAllocateInfo & operator=( VkMemoryDedicatedAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryDedicatedAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryDedicatedAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfo & setImage( Image image_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfo & setImage( VULKAN_HPP_NAMESPACE::Image image_ ) VULKAN_HPP_NOEXCEPT
     {
       image = image_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfo & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfo & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryDedicatedAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -69349,18 +50649,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryDedicatedAllocateInfo *>( this );
     }
 
-    operator VkMemoryDedicatedAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryDedicatedAllocateInfo *>( this );
-    }
-
-    operator VkMemoryDedicatedAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryDedicatedAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Image const &, Buffer const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Image const &, VULKAN_HPP_NAMESPACE::Buffer const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image, buffer );
     }
@@ -69385,20 +50680,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eMemoryDedicatedAllocateInfo;
-    const void *  pNext  = {};
-    Image         image  = {};
-    Buffer        buffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eMemoryDedicatedAllocateInfo;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Image         image  = {};
+    VULKAN_HPP_NAMESPACE::Buffer        buffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryDedicatedAllocateInfo>
-  {
-    using Type = MemoryDedicatedAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryDedicatedAllocateInfo>
   {
@@ -69407,118 +50694,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryDedicatedAllocateInfoKHR = MemoryDedicatedAllocateInfo;
 
-  // wrapper struct for struct VkMemoryDedicatedAllocateInfoTensorARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryDedicatedAllocateInfoTensorARM.html
-  struct MemoryDedicatedAllocateInfoTensorARM
-  {
-    using NativeType = VkMemoryDedicatedAllocateInfoTensorARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryDedicatedAllocateInfoTensorARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryDedicatedAllocateInfoTensorARM( TensorARM tensor_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensor{ tensor_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryDedicatedAllocateInfoTensorARM( MemoryDedicatedAllocateInfoTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryDedicatedAllocateInfoTensorARM( VkMemoryDedicatedAllocateInfoTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : MemoryDedicatedAllocateInfoTensorARM( *reinterpret_cast<MemoryDedicatedAllocateInfoTensorARM const *>( &rhs ) )
-    {
-    }
-
-    MemoryDedicatedAllocateInfoTensorARM & operator=( MemoryDedicatedAllocateInfoTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryDedicatedAllocateInfoTensorARM & operator=( VkMemoryDedicatedAllocateInfoTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryDedicatedAllocateInfoTensorARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfoTensorARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryDedicatedAllocateInfoTensorARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkMemoryDedicatedAllocateInfoTensorARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkMemoryDedicatedAllocateInfoTensorARM *>( this );
-    }
-
-    operator VkMemoryDedicatedAllocateInfoTensorARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkMemoryDedicatedAllocateInfoTensorARM *>( this );
-    }
-
-    operator VkMemoryDedicatedAllocateInfoTensorARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryDedicatedAllocateInfoTensorARM *>( this );
-    }
-
-    operator VkMemoryDedicatedAllocateInfoTensorARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryDedicatedAllocateInfoTensorARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensor );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryDedicatedAllocateInfoTensorARM const & ) const = default;
-#else
-    bool operator==( MemoryDedicatedAllocateInfoTensorARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensor == rhs.tensor );
-#  endif
-    }
-
-    bool operator!=( MemoryDedicatedAllocateInfoTensorARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType  = StructureType::eMemoryDedicatedAllocateInfoTensorARM;
-    const void *  pNext  = {};
-    TensorARM     tensor = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryDedicatedAllocateInfoTensorARM>
-  {
-    using Type = MemoryDedicatedAllocateInfoTensorARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eMemoryDedicatedAllocateInfoTensorARM>
-  {
-    using Type = MemoryDedicatedAllocateInfoTensorARM;
-  };
-
-  // wrapper struct for struct VkMemoryDedicatedRequirements, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryDedicatedRequirements.html
   struct MemoryDedicatedRequirements
   {
     using NativeType = VkMemoryDedicatedRequirements;
@@ -69526,13 +50701,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryDedicatedRequirements;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryDedicatedRequirements( Bool32 prefersDedicatedAllocation_  = {},
-                                                      Bool32 requiresDedicatedAllocation_ = {},
-                                                      void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , prefersDedicatedAllocation{ prefersDedicatedAllocation_ }
-      , requiresDedicatedAllocation{ requiresDedicatedAllocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryDedicatedRequirements( VULKAN_HPP_NAMESPACE::Bool32 prefersDedicatedAllocation_  = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 requiresDedicatedAllocation_ = {},
+                                                      void *                       pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , prefersDedicatedAllocation( prefersDedicatedAllocation_ )
+      , requiresDedicatedAllocation( requiresDedicatedAllocation_ )
     {
     }
 
@@ -69544,11 +50719,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryDedicatedRequirements & operator=( MemoryDedicatedRequirements const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryDedicatedRequirements & operator=( VkMemoryDedicatedRequirements const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryDedicatedRequirements const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryDedicatedRequirements const *>( &rhs );
       return *this;
     }
 
@@ -69562,18 +50737,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryDedicatedRequirements *>( this );
     }
 
-    operator VkMemoryDedicatedRequirements const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryDedicatedRequirements *>( this );
-    }
-
-    operator VkMemoryDedicatedRequirements *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryDedicatedRequirements *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, prefersDedicatedAllocation, requiresDedicatedAllocation );
     }
@@ -69599,20 +50769,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::eMemoryDedicatedRequirements;
-    void *        pNext                       = {};
-    Bool32        prefersDedicatedAllocation  = {};
-    Bool32        requiresDedicatedAllocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::eMemoryDedicatedRequirements;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        prefersDedicatedAllocation  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        requiresDedicatedAllocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryDedicatedRequirements>
-  {
-    using Type = MemoryDedicatedRequirements;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryDedicatedRequirements>
   {
@@ -69621,7 +50783,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryDedicatedRequirementsKHR = MemoryDedicatedRequirements;
 
-  // wrapper struct for struct VkMemoryFdPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryFdPropertiesKHR.html
   struct MemoryFdPropertiesKHR
   {
     using NativeType = VkMemoryFdPropertiesKHR;
@@ -69629,10 +50790,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryFdPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryFdPropertiesKHR( uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+      : pNext( pNext_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -69644,11 +50805,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryFdPropertiesKHR & operator=( MemoryFdPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryFdPropertiesKHR & operator=( VkMemoryFdPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryFdPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryFdPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -69662,18 +50823,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryFdPropertiesKHR *>( this );
     }
 
-    operator VkMemoryFdPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryFdPropertiesKHR *>( this );
-    }
-
-    operator VkMemoryFdPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryFdPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryTypeBits );
     }
@@ -69698,19 +50854,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::eMemoryFdPropertiesKHR;
-    void *        pNext          = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eMemoryFdPropertiesKHR;
+    void *                              pNext          = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryFdPropertiesKHR>
-  {
-    using Type = MemoryFdPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryFdPropertiesKHR>
   {
@@ -69718,8 +50866,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkMemoryGetAndroidHardwareBufferInfoANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetAndroidHardwareBufferInfoANDROID.html
   struct MemoryGetAndroidHardwareBufferInfoANDROID
   {
     using NativeType = VkMemoryGetAndroidHardwareBufferInfoANDROID;
@@ -69727,10 +50873,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetAndroidHardwareBufferInfoANDROID( DeviceMemory memory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryGetAndroidHardwareBufferInfoANDROID( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ = {},
+                                                                    const void *                       pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
     {
     }
 
@@ -69742,27 +50889,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryGetAndroidHardwareBufferInfoANDROID & operator=( MemoryGetAndroidHardwareBufferInfoANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryGetAndroidHardwareBufferInfoANDROID & operator=( VkMemoryGetAndroidHardwareBufferInfoANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryGetAndroidHardwareBufferInfoANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryGetAndroidHardwareBufferInfoANDROID const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryGetAndroidHardwareBufferInfoANDROID & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetAndroidHardwareBufferInfoANDROID & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetAndroidHardwareBufferInfoANDROID & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryGetAndroidHardwareBufferInfoANDROID const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -69774,18 +50921,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryGetAndroidHardwareBufferInfoANDROID *>( this );
     }
 
-    operator VkMemoryGetAndroidHardwareBufferInfoANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetAndroidHardwareBufferInfoANDROID *>( this );
-    }
-
-    operator VkMemoryGetAndroidHardwareBufferInfoANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetAndroidHardwareBufferInfoANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::DeviceMemory const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory );
     }
@@ -69810,19 +50952,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType  = StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID;
-    const void *  pNext  = {};
-    DeviceMemory  memory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory  memory = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetAndroidHardwareBufferInfoANDROID>
-  {
-    using Type = MemoryGetAndroidHardwareBufferInfoANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID>
   {
@@ -69830,7 +50964,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  // wrapper struct for struct VkMemoryGetFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetFdInfoKHR.html
   struct MemoryGetFdInfoKHR
   {
     using NativeType = VkMemoryGetFdInfoKHR;
@@ -69838,13 +50971,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetFdInfoKHR( DeviceMemory                     memory_     = {},
-                                             ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                             const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryGetFdInfoKHR(
+      VULKAN_HPP_NAMESPACE::DeviceMemory                     memory_     = {},
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -69853,33 +50987,33 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryGetFdInfoKHR( VkMemoryGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryGetFdInfoKHR( *reinterpret_cast<MemoryGetFdInfoKHR const *>( &rhs ) ) {}
 
     MemoryGetFdInfoKHR & operator=( MemoryGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryGetFdInfoKHR & operator=( VkMemoryGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryGetFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryGetFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryGetFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetFdInfoKHR & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetFdInfoKHR & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetFdInfoKHR & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetFdInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryGetFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -69891,18 +51025,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryGetFdInfoKHR *>( this );
     }
 
-    operator VkMemoryGetFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetFdInfoKHR *>( this );
-    }
-
-    operator VkMemoryGetFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, handleType );
     }
@@ -69927,262 +51059,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType      = StructureType::eMemoryGetFdInfoKHR;
-    const void *                     pNext      = {};
-    DeviceMemory                     memory     = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eMemoryGetFdInfoKHR;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory                     memory     = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetFdInfoKHR>
-  {
-    using Type = MemoryGetFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryGetFdInfoKHR>
   {
     using Type = MemoryGetFdInfoKHR;
   };
 
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkMemoryGetMetalHandleInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetMetalHandleInfoEXT.html
-  struct MemoryGetMetalHandleInfoEXT
-  {
-    using NativeType = VkMemoryGetMetalHandleInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetMetalHandleInfoEXT;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetMetalHandleInfoEXT( DeviceMemory                     memory_     = {},
-                                                      ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                      const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , handleType{ handleType_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryGetMetalHandleInfoEXT( MemoryGetMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryGetMetalHandleInfoEXT( VkMemoryGetMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : MemoryGetMetalHandleInfoEXT( *reinterpret_cast<MemoryGetMetalHandleInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    MemoryGetMetalHandleInfoEXT & operator=( MemoryGetMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryGetMetalHandleInfoEXT & operator=( VkMemoryGetMetalHandleInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryGetMetalHandleInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetMetalHandleInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetMetalHandleInfoEXT & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memory = memory_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetMetalHandleInfoEXT & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handleType = handleType_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkMemoryGetMetalHandleInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkMemoryGetMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkMemoryGetMetalHandleInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkMemoryGetMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkMemoryGetMetalHandleInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetMetalHandleInfoEXT *>( this );
-    }
-
-    operator VkMemoryGetMetalHandleInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetMetalHandleInfoEXT *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, memory, handleType );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryGetMetalHandleInfoEXT const & ) const = default;
-#  else
-    bool operator==( MemoryGetMetalHandleInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memory == rhs.memory ) && ( handleType == rhs.handleType );
-#    endif
-    }
-
-    bool operator!=( MemoryGetMetalHandleInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType                    sType      = StructureType::eMemoryGetMetalHandleInfoEXT;
-    const void *                     pNext      = {};
-    DeviceMemory                     memory     = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetMetalHandleInfoEXT>
-  {
-    using Type = MemoryGetMetalHandleInfoEXT;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eMemoryGetMetalHandleInfoEXT>
-  {
-    using Type = MemoryGetMetalHandleInfoEXT;
-  };
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkMemoryGetNativeBufferInfoOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetNativeBufferInfoOHOS.html
-  struct MemoryGetNativeBufferInfoOHOS
-  {
-    using NativeType = VkMemoryGetNativeBufferInfoOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetNativeBufferInfoOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetNativeBufferInfoOHOS( DeviceMemory memory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryGetNativeBufferInfoOHOS( MemoryGetNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryGetNativeBufferInfoOHOS( VkMemoryGetNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : MemoryGetNativeBufferInfoOHOS( *reinterpret_cast<MemoryGetNativeBufferInfoOHOS const *>( &rhs ) )
-    {
-    }
-
-    MemoryGetNativeBufferInfoOHOS & operator=( MemoryGetNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryGetNativeBufferInfoOHOS & operator=( VkMemoryGetNativeBufferInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryGetNativeBufferInfoOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetNativeBufferInfoOHOS & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetNativeBufferInfoOHOS & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memory = memory_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkMemoryGetNativeBufferInfoOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkMemoryGetNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkMemoryGetNativeBufferInfoOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkMemoryGetNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkMemoryGetNativeBufferInfoOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetNativeBufferInfoOHOS *>( this );
-    }
-
-    operator VkMemoryGetNativeBufferInfoOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetNativeBufferInfoOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, memory );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryGetNativeBufferInfoOHOS const & ) const = default;
-#  else
-    bool operator==( MemoryGetNativeBufferInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memory == rhs.memory );
-#    endif
-    }
-
-    bool operator!=( MemoryGetNativeBufferInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType  = StructureType::eMemoryGetNativeBufferInfoOHOS;
-    const void *  pNext  = {};
-    DeviceMemory  memory = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetNativeBufferInfoOHOS>
-  {
-    using Type = MemoryGetNativeBufferInfoOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eMemoryGetNativeBufferInfoOHOS>
-  {
-    using Type = MemoryGetNativeBufferInfoOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  // wrapper struct for struct VkMemoryGetRemoteAddressInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetRemoteAddressInfoNV.html
   struct MemoryGetRemoteAddressInfoNV
   {
     using NativeType = VkMemoryGetRemoteAddressInfoNV;
@@ -70190,13 +51078,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetRemoteAddressInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetRemoteAddressInfoNV( DeviceMemory                     memory_     = {},
-                                                       ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                       const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryGetRemoteAddressInfoNV(
+      VULKAN_HPP_NAMESPACE::DeviceMemory                     memory_     = {},
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -70208,33 +51097,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryGetRemoteAddressInfoNV & operator=( MemoryGetRemoteAddressInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryGetRemoteAddressInfoNV & operator=( VkMemoryGetRemoteAddressInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryGetRemoteAddressInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryGetRemoteAddressInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryGetRemoteAddressInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetRemoteAddressInfoNV & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetRemoteAddressInfoNV & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetRemoteAddressInfoNV & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetRemoteAddressInfoNV &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryGetRemoteAddressInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -70246,18 +51136,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryGetRemoteAddressInfoNV *>( this );
     }
 
-    operator VkMemoryGetRemoteAddressInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetRemoteAddressInfoNV *>( this );
-    }
-
-    operator VkMemoryGetRemoteAddressInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetRemoteAddressInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, handleType );
     }
@@ -70282,20 +51170,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType      = StructureType::eMemoryGetRemoteAddressInfoNV;
-    const void *                     pNext      = {};
-    DeviceMemory                     memory     = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eMemoryGetRemoteAddressInfoNV;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory                     memory     = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetRemoteAddressInfoNV>
-  {
-    using Type = MemoryGetRemoteAddressInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryGetRemoteAddressInfoNV>
   {
@@ -70303,7 +51183,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkMemoryGetWin32HandleInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetWin32HandleInfoKHR.html
   struct MemoryGetWin32HandleInfoKHR
   {
     using NativeType = VkMemoryGetWin32HandleInfoKHR;
@@ -70311,13 +51190,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetWin32HandleInfoKHR( DeviceMemory                     memory_     = {},
-                                                      ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                      const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , handleType{ handleType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryGetWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::DeviceMemory                     memory_     = {},
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -70329,33 +51209,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryGetWin32HandleInfoKHR & operator=( MemoryGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryGetWin32HandleInfoKHR & operator=( VkMemoryGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryGetWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryGetWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryGetWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetWin32HandleInfoKHR & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetWin32HandleInfoKHR & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetWin32HandleInfoKHR & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetWin32HandleInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryGetWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -70367,18 +51248,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryGetWin32HandleInfoKHR *>( this );
     }
 
-    operator VkMemoryGetWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkMemoryGetWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, handleType );
     }
@@ -70403,20 +51282,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                    sType      = StructureType::eMemoryGetWin32HandleInfoKHR;
-    const void *                     pNext      = {};
-    DeviceMemory                     memory     = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eMemoryGetWin32HandleInfoKHR;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory                     memory     = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetWin32HandleInfoKHR>
-  {
-    using Type = MemoryGetWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryGetWin32HandleInfoKHR>
   {
@@ -70425,8 +51296,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkMemoryGetZirconHandleInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryGetZirconHandleInfoFUCHSIA.html
   struct MemoryGetZirconHandleInfoFUCHSIA
   {
     using NativeType = VkMemoryGetZirconHandleInfoFUCHSIA;
@@ -70434,13 +51303,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryGetZirconHandleInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryGetZirconHandleInfoFUCHSIA( DeviceMemory                     memory_     = {},
-                                                           ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                           const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-      , handleType{ handleType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryGetZirconHandleInfoFUCHSIA(
+      VULKAN_HPP_NAMESPACE::DeviceMemory                     memory_     = {},
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memory( memory_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -70452,33 +51322,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryGetZirconHandleInfoFUCHSIA & operator=( MemoryGetZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryGetZirconHandleInfoFUCHSIA & operator=( VkMemoryGetZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryGetZirconHandleInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryGetZirconHandleInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryGetZirconHandleInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetZirconHandleInfoFUCHSIA & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetZirconHandleInfoFUCHSIA & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryGetZirconHandleInfoFUCHSIA & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryGetZirconHandleInfoFUCHSIA &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryGetZirconHandleInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -70490,18 +51361,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryGetZirconHandleInfoFUCHSIA *>( this );
     }
 
-    operator VkMemoryGetZirconHandleInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA *>( this );
-    }
-
-    operator VkMemoryGetZirconHandleInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryGetZirconHandleInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memory, handleType );
     }
@@ -70526,20 +51395,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                    sType      = StructureType::eMemoryGetZirconHandleInfoFUCHSIA;
-    const void *                     pNext      = {};
-    DeviceMemory                     memory     = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::eMemoryGetZirconHandleInfoFUCHSIA;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory                     memory     = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryGetZirconHandleInfoFUCHSIA>
-  {
-    using Type = MemoryGetZirconHandleInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryGetZirconHandleInfoFUCHSIA>
   {
@@ -70547,15 +51408,14 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkMemoryHeap, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryHeap.html
   struct MemoryHeap
   {
     using NativeType = VkMemoryHeap;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryHeap( DeviceSize size_ = {}, MemoryHeapFlags flags_ = {} ) VULKAN_HPP_NOEXCEPT
-      : size{ size_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryHeap( VULKAN_HPP_NAMESPACE::DeviceSize size_ = {}, VULKAN_HPP_NAMESPACE::MemoryHeapFlags flags_ = {} ) VULKAN_HPP_NOEXCEPT
+      : size( size_ )
+      , flags( flags_ )
     {
     }
 
@@ -70564,11 +51424,11 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryHeap( VkMemoryHeap const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryHeap( *reinterpret_cast<MemoryHeap const *>( &rhs ) ) {}
 
     MemoryHeap & operator=( MemoryHeap const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryHeap & operator=( VkMemoryHeap const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryHeap const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryHeap const *>( &rhs );
       return *this;
     }
 
@@ -70582,18 +51442,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryHeap *>( this );
     }
 
-    operator VkMemoryHeap const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryHeap *>( this );
-    }
-
-    operator VkMemoryHeap *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryHeap *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, MemoryHeapFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::MemoryHeapFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( size, flags );
     }
@@ -70618,20 +51473,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize      size  = {};
-    MemoryHeapFlags flags = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize      size  = {};
+    VULKAN_HPP_NAMESPACE::MemoryHeapFlags flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryHeap>
-  {
-    using Type = MemoryHeap;
-  };
-#endif
-
-  // wrapper struct for struct VkMemoryHostPointerPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryHostPointerPropertiesEXT.html
   struct MemoryHostPointerPropertiesEXT
   {
     using NativeType = VkMemoryHostPointerPropertiesEXT;
@@ -70639,10 +51484,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryHostPointerPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryHostPointerPropertiesEXT( uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+      : pNext( pNext_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -70654,11 +51499,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryHostPointerPropertiesEXT & operator=( MemoryHostPointerPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryHostPointerPropertiesEXT & operator=( VkMemoryHostPointerPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryHostPointerPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryHostPointerPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -70672,18 +51517,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( this );
     }
 
-    operator VkMemoryHostPointerPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryHostPointerPropertiesEXT *>( this );
-    }
-
-    operator VkMemoryHostPointerPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryHostPointerPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryTypeBits );
     }
@@ -70708,111 +51548,104 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::eMemoryHostPointerPropertiesEXT;
-    void *        pNext          = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eMemoryHostPointerPropertiesEXT;
+    void *                              pNext          = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryHostPointerPropertiesEXT>
-  {
-    using Type = MemoryHostPointerPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryHostPointerPropertiesEXT>
   {
     using Type = MemoryHostPointerPropertiesEXT;
   };
 
-  // wrapper struct for struct VkMemoryMapInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryMapInfo.html
-  struct MemoryMapInfo
+  struct MemoryMapInfoKHR
   {
-    using NativeType = VkMemoryMapInfo;
+    using NativeType = VkMemoryMapInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryMapInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryMapInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryMapInfo(
-      MemoryMapFlags flags_ = {}, DeviceMemory memory_ = {}, DeviceSize offset_ = {}, DeviceSize size_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , memory{ memory_ }
-      , offset{ offset_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryMapInfoKHR( VULKAN_HPP_NAMESPACE::MemoryMapFlags flags_  = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceMemory   memory_ = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceSize     offset_ = {},
+                                           VULKAN_HPP_NAMESPACE::DeviceSize     size_   = {},
+                                           const void *                         pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , memory( memory_ )
+      , offset( offset_ )
+      , size( size_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR MemoryMapInfo( MemoryMapInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR MemoryMapInfoKHR( MemoryMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    MemoryMapInfo( VkMemoryMapInfo const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryMapInfo( *reinterpret_cast<MemoryMapInfo const *>( &rhs ) ) {}
+    MemoryMapInfoKHR( VkMemoryMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryMapInfoKHR( *reinterpret_cast<MemoryMapInfoKHR const *>( &rhs ) ) {}
 
-    MemoryMapInfo & operator=( MemoryMapInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    MemoryMapInfoKHR & operator=( MemoryMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    MemoryMapInfo & operator=( VkMemoryMapInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    MemoryMapInfoKHR & operator=( VkMemoryMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryMapInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryMapInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfo & setFlags( MemoryMapFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::MemoryMapFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfo & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfoKHR & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfo & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfoKHR & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfo & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryMapInfoKHR & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkMemoryMapInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkMemoryMapInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkMemoryMapInfo *>( this );
+      return *reinterpret_cast<const VkMemoryMapInfoKHR *>( this );
     }
 
-    operator VkMemoryMapInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkMemoryMapInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkMemoryMapInfo *>( this );
-    }
-
-    operator VkMemoryMapInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryMapInfo *>( this );
-    }
-
-    operator VkMemoryMapInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryMapInfo *>( this );
+      return *reinterpret_cast<VkMemoryMapInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MemoryMapFlags const &, DeviceMemory const &, DeviceSize const &, DeviceSize const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::MemoryMapFlags const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, memory, offset, size );
@@ -70820,9 +51653,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryMapInfo const & ) const = default;
+    auto operator<=>( MemoryMapInfoKHR const & ) const = default;
 #else
-    bool operator==( MemoryMapInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( MemoryMapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -70832,38 +51665,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( MemoryMapInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( MemoryMapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType  sType  = StructureType::eMemoryMapInfo;
-    const void *   pNext  = {};
-    MemoryMapFlags flags  = {};
-    DeviceMemory   memory = {};
-    DeviceSize     offset = {};
-    DeviceSize     size   = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType  = StructureType::eMemoryMapInfoKHR;
+    const void *                         pNext  = {};
+    VULKAN_HPP_NAMESPACE::MemoryMapFlags flags  = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory   memory = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize     offset = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize     size   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryMapInfo>
-  {
-    using Type = MemoryMapInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eMemoryMapInfo>
+  struct CppType<StructureType, StructureType::eMemoryMapInfoKHR>
   {
-    using Type = MemoryMapInfo;
+    using Type = MemoryMapInfoKHR;
   };
 
-  using MemoryMapInfoKHR = MemoryMapInfo;
-
-  // wrapper struct for struct VkMemoryMapPlacedInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryMapPlacedInfoEXT.html
   struct MemoryMapPlacedInfoEXT
   {
     using NativeType = VkMemoryMapPlacedInfoEXT;
@@ -70871,10 +51693,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryMapPlacedInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryMapPlacedInfoEXT( void * pPlacedAddress_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pPlacedAddress{ pPlacedAddress_ }
+      : pNext( pNext_ )
+      , pPlacedAddress( pPlacedAddress_ )
     {
     }
 
@@ -70886,15 +51708,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryMapPlacedInfoEXT & operator=( MemoryMapPlacedInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryMapPlacedInfoEXT & operator=( VkMemoryMapPlacedInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryMapPlacedInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryMapPlacedInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryMapPlacedInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -70906,7 +51728,7 @@ namespace VULKAN_HPP_NAMESPACE
       pPlacedAddress = pPlacedAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryMapPlacedInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -70918,18 +51740,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryMapPlacedInfoEXT *>( this );
     }
 
-    operator VkMemoryMapPlacedInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryMapPlacedInfoEXT *>( this );
-    }
-
-    operator VkMemoryMapPlacedInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryMapPlacedInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pPlacedAddress );
     }
@@ -70954,126 +51771,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::eMemoryMapPlacedInfoEXT;
-    const void *  pNext          = {};
-    void *        pPlacedAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eMemoryMapPlacedInfoEXT;
+    const void *                        pNext          = {};
+    void *                              pPlacedAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryMapPlacedInfoEXT>
-  {
-    using Type = MemoryMapPlacedInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryMapPlacedInfoEXT>
   {
     using Type = MemoryMapPlacedInfoEXT;
   };
 
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkMemoryMetalHandlePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryMetalHandlePropertiesEXT.html
-  struct MemoryMetalHandlePropertiesEXT
-  {
-    using NativeType = VkMemoryMetalHandlePropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryMetalHandlePropertiesEXT;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryMetalHandlePropertiesEXT( uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR MemoryMetalHandlePropertiesEXT( MemoryMetalHandlePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    MemoryMetalHandlePropertiesEXT( VkMemoryMetalHandlePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : MemoryMetalHandlePropertiesEXT( *reinterpret_cast<MemoryMetalHandlePropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-    MemoryMetalHandlePropertiesEXT & operator=( MemoryMetalHandlePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    MemoryMetalHandlePropertiesEXT & operator=( VkMemoryMetalHandlePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<MemoryMetalHandlePropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkMemoryMetalHandlePropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkMemoryMetalHandlePropertiesEXT *>( this );
-    }
-
-    operator VkMemoryMetalHandlePropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkMemoryMetalHandlePropertiesEXT *>( this );
-    }
-
-    operator VkMemoryMetalHandlePropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryMetalHandlePropertiesEXT *>( this );
-    }
-
-    operator VkMemoryMetalHandlePropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryMetalHandlePropertiesEXT *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, memoryTypeBits );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryMetalHandlePropertiesEXT const & ) const = default;
-#  else
-    bool operator==( MemoryMetalHandlePropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memoryTypeBits == rhs.memoryTypeBits );
-#    endif
-    }
-
-    bool operator!=( MemoryMetalHandlePropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType          = StructureType::eMemoryMetalHandlePropertiesEXT;
-    void *        pNext          = {};
-    uint32_t      memoryTypeBits = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryMetalHandlePropertiesEXT>
-  {
-    using Type = MemoryMetalHandlePropertiesEXT;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eMemoryMetalHandlePropertiesEXT>
-  {
-    using Type = MemoryMetalHandlePropertiesEXT;
-  };
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-
-  // wrapper struct for struct VkMemoryOpaqueCaptureAddressAllocateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryOpaqueCaptureAddressAllocateInfo.html
   struct MemoryOpaqueCaptureAddressAllocateInfo
   {
     using NativeType = VkMemoryOpaqueCaptureAddressAllocateInfo;
@@ -71081,10 +51789,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryOpaqueCaptureAddressAllocateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryOpaqueCaptureAddressAllocateInfo( uint64_t opaqueCaptureAddress_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , opaqueCaptureAddress{ opaqueCaptureAddress_ }
+      : pNext( pNext_ )
+      , opaqueCaptureAddress( opaqueCaptureAddress_ )
     {
     }
 
@@ -71096,15 +51804,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryOpaqueCaptureAddressAllocateInfo & operator=( MemoryOpaqueCaptureAddressAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryOpaqueCaptureAddressAllocateInfo & operator=( VkMemoryOpaqueCaptureAddressAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryOpaqueCaptureAddressAllocateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryOpaqueCaptureAddressAllocateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryOpaqueCaptureAddressAllocateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -71116,7 +51824,7 @@ namespace VULKAN_HPP_NAMESPACE
       opaqueCaptureAddress = opaqueCaptureAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryOpaqueCaptureAddressAllocateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -71128,18 +51836,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryOpaqueCaptureAddressAllocateInfo *>( this );
     }
 
-    operator VkMemoryOpaqueCaptureAddressAllocateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryOpaqueCaptureAddressAllocateInfo *>( this );
-    }
-
-    operator VkMemoryOpaqueCaptureAddressAllocateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryOpaqueCaptureAddressAllocateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, opaqueCaptureAddress );
     }
@@ -71164,19 +51867,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::eMemoryOpaqueCaptureAddressAllocateInfo;
-    const void *  pNext                = {};
-    uint64_t      opaqueCaptureAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eMemoryOpaqueCaptureAddressAllocateInfo;
+    const void *                        pNext                = {};
+    uint64_t                            opaqueCaptureAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryOpaqueCaptureAddressAllocateInfo>
-  {
-    using Type = MemoryOpaqueCaptureAddressAllocateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryOpaqueCaptureAddressAllocateInfo>
   {
@@ -71185,8 +51880,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryOpaqueCaptureAddressAllocateInfoKHR = MemoryOpaqueCaptureAddressAllocateInfo;
 
-  // wrapper struct for struct VkMemoryPriorityAllocateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryPriorityAllocateInfoEXT.html
   struct MemoryPriorityAllocateInfoEXT
   {
     using NativeType = VkMemoryPriorityAllocateInfoEXT;
@@ -71194,10 +51887,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryPriorityAllocateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryPriorityAllocateInfoEXT( float priority_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , priority{ priority_ }
+      : pNext( pNext_ )
+      , priority( priority_ )
     {
     }
 
@@ -71209,15 +51902,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryPriorityAllocateInfoEXT & operator=( MemoryPriorityAllocateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryPriorityAllocateInfoEXT & operator=( VkMemoryPriorityAllocateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryPriorityAllocateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryPriorityAllocateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MemoryPriorityAllocateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -71229,7 +51922,7 @@ namespace VULKAN_HPP_NAMESPACE
       priority = priority_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMemoryPriorityAllocateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -71241,18 +51934,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryPriorityAllocateInfoEXT *>( this );
     }
 
-    operator VkMemoryPriorityAllocateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryPriorityAllocateInfoEXT *>( this );
-    }
-
-    operator VkMemoryPriorityAllocateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryPriorityAllocateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, priority );
     }
@@ -71277,35 +51965,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::eMemoryPriorityAllocateInfoEXT;
-    const void *  pNext    = {};
-    float         priority = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eMemoryPriorityAllocateInfoEXT;
+    const void *                        pNext    = {};
+    float                               priority = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryPriorityAllocateInfoEXT>
-  {
-    using Type = MemoryPriorityAllocateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryPriorityAllocateInfoEXT>
   {
     using Type = MemoryPriorityAllocateInfoEXT;
   };
 
-  // wrapper struct for struct VkMemoryRequirements, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryRequirements.html
   struct MemoryRequirements
   {
     using NativeType = VkMemoryRequirements;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryRequirements( DeviceSize size_ = {}, DeviceSize alignment_ = {}, uint32_t memoryTypeBits_ = {} ) VULKAN_HPP_NOEXCEPT
-      : size{ size_ }
-      , alignment{ alignment_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryRequirements( VULKAN_HPP_NAMESPACE::DeviceSize size_           = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceSize alignment_      = {},
+                                             uint32_t                         memoryTypeBits_ = {} ) VULKAN_HPP_NOEXCEPT
+      : size( size_ )
+      , alignment( alignment_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -71314,11 +51995,11 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryRequirements( VkMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryRequirements( *reinterpret_cast<MemoryRequirements const *>( &rhs ) ) {}
 
     MemoryRequirements & operator=( MemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryRequirements & operator=( VkMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryRequirements const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryRequirements const *>( &rhs );
       return *this;
     }
 
@@ -71332,18 +52013,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryRequirements *>( this );
     }
 
-    operator VkMemoryRequirements const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryRequirements *>( this );
-    }
-
-    operator VkMemoryRequirements *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryRequirements *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceSize const &, DeviceSize const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( size, alignment, memoryTypeBits );
     }
@@ -71368,20 +52044,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceSize size           = {};
-    DeviceSize alignment      = {};
-    uint32_t   memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize size           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize alignment      = {};
+    uint32_t                         memoryTypeBits = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryRequirements>
-  {
-    using Type = MemoryRequirements;
-  };
-#endif
-
-  // wrapper struct for struct VkMemoryRequirements2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryRequirements2.html
   struct MemoryRequirements2
   {
     using NativeType = VkMemoryRequirements2;
@@ -71389,10 +52056,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryRequirements2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryRequirements2( MemoryRequirements memoryRequirements_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryRequirements{ memoryRequirements_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryRequirements2( VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryRequirements( memoryRequirements_ )
     {
     }
 
@@ -71403,11 +52070,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryRequirements2 & operator=( MemoryRequirements2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryRequirements2 & operator=( VkMemoryRequirements2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryRequirements2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryRequirements2 const *>( &rhs );
       return *this;
     }
 
@@ -71421,18 +52088,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryRequirements2 *>( this );
     }
 
-    operator VkMemoryRequirements2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryRequirements2 *>( this );
-    }
-
-    operator VkMemoryRequirements2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryRequirements2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, MemoryRequirements const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::MemoryRequirements const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryRequirements );
     }
@@ -71457,19 +52119,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType              = StructureType::eMemoryRequirements2;
-    void *             pNext              = {};
-    MemoryRequirements memoryRequirements = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType              = StructureType::eMemoryRequirements2;
+    void *                                   pNext              = {};
+    VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryRequirements2>
-  {
-    using Type = MemoryRequirements2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryRequirements2>
   {
@@ -71478,15 +52132,14 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MemoryRequirements2KHR = MemoryRequirements2;
 
-  // wrapper struct for struct VkMemoryType, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryType.html
   struct MemoryType
   {
     using NativeType = VkMemoryType;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryType( MemoryPropertyFlags propertyFlags_ = {}, uint32_t heapIndex_ = {} ) VULKAN_HPP_NOEXCEPT
-      : propertyFlags{ propertyFlags_ }
-      , heapIndex{ heapIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryType( VULKAN_HPP_NAMESPACE::MemoryPropertyFlags propertyFlags_ = {}, uint32_t heapIndex_ = {} ) VULKAN_HPP_NOEXCEPT
+      : propertyFlags( propertyFlags_ )
+      , heapIndex( heapIndex_ )
     {
     }
 
@@ -71495,11 +52148,11 @@ namespace VULKAN_HPP_NAMESPACE
     MemoryType( VkMemoryType const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryType( *reinterpret_cast<MemoryType const *>( &rhs ) ) {}
 
     MemoryType & operator=( MemoryType const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryType & operator=( VkMemoryType const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryType const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryType const *>( &rhs );
       return *this;
     }
 
@@ -71513,18 +52166,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryType *>( this );
     }
 
-    operator VkMemoryType const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryType *>( this );
-    }
-
-    operator VkMemoryType *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryType *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<MemoryPropertyFlags const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::MemoryPropertyFlags const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( propertyFlags, heapIndex );
     }
@@ -71549,98 +52197,89 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    MemoryPropertyFlags propertyFlags = {};
-    uint32_t            heapIndex     = {};
+    VULKAN_HPP_NAMESPACE::MemoryPropertyFlags propertyFlags = {};
+    uint32_t                                  heapIndex     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryType>
+  struct MemoryUnmapInfoKHR
   {
-    using Type = MemoryType;
-  };
-#endif
-
-  // wrapper struct for struct VkMemoryUnmapInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryUnmapInfo.html
-  struct MemoryUnmapInfo
-  {
-    using NativeType = VkMemoryUnmapInfo;
+    using NativeType = VkMemoryUnmapInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryUnmapInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryUnmapInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MemoryUnmapInfo( MemoryUnmapFlags flags_ = {}, DeviceMemory memory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , memory{ memory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MemoryUnmapInfoKHR( VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR flags_  = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceMemory        memory_ = {},
+                                             const void *                              pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , memory( memory_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR MemoryUnmapInfo( MemoryUnmapInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR MemoryUnmapInfoKHR( MemoryUnmapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    MemoryUnmapInfo( VkMemoryUnmapInfo const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryUnmapInfo( *reinterpret_cast<MemoryUnmapInfo const *>( &rhs ) ) {}
+    MemoryUnmapInfoKHR( VkMemoryUnmapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : MemoryUnmapInfoKHR( *reinterpret_cast<MemoryUnmapInfoKHR const *>( &rhs ) ) {}
 
-    MemoryUnmapInfo & operator=( MemoryUnmapInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    MemoryUnmapInfoKHR & operator=( MemoryUnmapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    MemoryUnmapInfo & operator=( VkMemoryUnmapInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    MemoryUnmapInfoKHR & operator=( VkMemoryUnmapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryUnmapInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryUnmapInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfo & setFlags( MemoryUnmapFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfo & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MemoryUnmapInfoKHR & setMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
     {
       memory = memory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkMemoryUnmapInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkMemoryUnmapInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkMemoryUnmapInfo *>( this );
+      return *reinterpret_cast<const VkMemoryUnmapInfoKHR *>( this );
     }
 
-    operator VkMemoryUnmapInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkMemoryUnmapInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkMemoryUnmapInfo *>( this );
-    }
-
-    operator VkMemoryUnmapInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryUnmapInfo *>( this );
-    }
-
-    operator VkMemoryUnmapInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryUnmapInfo *>( this );
+      return *reinterpret_cast<VkMemoryUnmapInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MemoryUnmapFlags const &, DeviceMemory const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceMemory const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, memory );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( MemoryUnmapInfo const & ) const = default;
+    auto operator<=>( MemoryUnmapInfoKHR const & ) const = default;
 #else
-    bool operator==( MemoryUnmapInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( MemoryUnmapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -71649,38 +52288,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( MemoryUnmapInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( MemoryUnmapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType  = StructureType::eMemoryUnmapInfo;
-    const void *     pNext  = {};
-    MemoryUnmapFlags flags  = {};
-    DeviceMemory     memory = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType  = StructureType::eMemoryUnmapInfoKHR;
+    const void *                              pNext  = {};
+    VULKAN_HPP_NAMESPACE::MemoryUnmapFlagsKHR flags  = {};
+    VULKAN_HPP_NAMESPACE::DeviceMemory        memory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryUnmapInfo>
-  {
-    using Type = MemoryUnmapInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eMemoryUnmapInfo>
+  struct CppType<StructureType, StructureType::eMemoryUnmapInfoKHR>
   {
-    using Type = MemoryUnmapInfo;
+    using Type = MemoryUnmapInfoKHR;
   };
 
-  using MemoryUnmapInfoKHR = MemoryUnmapInfo;
-
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkMemoryWin32HandlePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryWin32HandlePropertiesKHR.html
   struct MemoryWin32HandlePropertiesKHR
   {
     using NativeType = VkMemoryWin32HandlePropertiesKHR;
@@ -71688,10 +52315,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryWin32HandlePropertiesKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryWin32HandlePropertiesKHR( uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+      : pNext( pNext_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -71703,11 +52330,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryWin32HandlePropertiesKHR & operator=( MemoryWin32HandlePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryWin32HandlePropertiesKHR & operator=( VkMemoryWin32HandlePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryWin32HandlePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryWin32HandlePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -71721,18 +52348,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( this );
     }
 
-    operator VkMemoryWin32HandlePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryWin32HandlePropertiesKHR *>( this );
-    }
-
-    operator VkMemoryWin32HandlePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryWin32HandlePropertiesKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryTypeBits );
     }
@@ -71757,19 +52379,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eMemoryWin32HandlePropertiesKHR;
-    void *        pNext          = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eMemoryWin32HandlePropertiesKHR;
+    void *                              pNext          = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryWin32HandlePropertiesKHR>
-  {
-    using Type = MemoryWin32HandlePropertiesKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryWin32HandlePropertiesKHR>
   {
@@ -71778,8 +52392,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkMemoryZirconHandlePropertiesFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMemoryZirconHandlePropertiesFUCHSIA.html
   struct MemoryZirconHandlePropertiesFUCHSIA
   {
     using NativeType = VkMemoryZirconHandlePropertiesFUCHSIA;
@@ -71787,10 +52399,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMemoryZirconHandlePropertiesFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MemoryZirconHandlePropertiesFUCHSIA( uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+      : pNext( pNext_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -71802,11 +52414,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MemoryZirconHandlePropertiesFUCHSIA & operator=( MemoryZirconHandlePropertiesFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MemoryZirconHandlePropertiesFUCHSIA & operator=( VkMemoryZirconHandlePropertiesFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MemoryZirconHandlePropertiesFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MemoryZirconHandlePropertiesFUCHSIA const *>( &rhs );
       return *this;
     }
 
@@ -71820,18 +52432,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA *>( this );
     }
 
-    operator VkMemoryZirconHandlePropertiesFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMemoryZirconHandlePropertiesFUCHSIA *>( this );
-    }
-
-    operator VkMemoryZirconHandlePropertiesFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryTypeBits );
     }
@@ -71856,19 +52463,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eMemoryZirconHandlePropertiesFUCHSIA;
-    void *        pNext          = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eMemoryZirconHandlePropertiesFUCHSIA;
+    void *                              pNext          = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMemoryZirconHandlePropertiesFUCHSIA>
-  {
-    using Type = MemoryZirconHandlePropertiesFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMemoryZirconHandlePropertiesFUCHSIA>
   {
@@ -71877,7 +52476,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
-  // wrapper struct for struct VkMetalSurfaceCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMetalSurfaceCreateInfoEXT.html
   struct MetalSurfaceCreateInfoEXT
   {
     using NativeType = VkMetalSurfaceCreateInfoEXT;
@@ -71885,12 +52483,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMetalSurfaceCreateInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      MetalSurfaceCreateInfoEXT( MetalSurfaceCreateFlagsEXT flags_ = {}, const CAMetalLayer * pLayer_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pLayer{ pLayer_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MetalSurfaceCreateInfoEXT( VULKAN_HPP_NAMESPACE::MetalSurfaceCreateFlagsEXT flags_  = {},
+                                                    const CAMetalLayer *                             pLayer_ = {},
+                                                    const void *                                     pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pLayer( pLayer_ )
     {
     }
 
@@ -71902,22 +52501,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MetalSurfaceCreateInfoEXT & operator=( MetalSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MetalSurfaceCreateInfoEXT & operator=( VkMetalSurfaceCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MetalSurfaceCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MetalSurfaceCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MetalSurfaceCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MetalSurfaceCreateInfoEXT & setFlags( MetalSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MetalSurfaceCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::MetalSurfaceCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -71928,7 +52527,7 @@ namespace VULKAN_HPP_NAMESPACE
       pLayer = pLayer_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMetalSurfaceCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -71940,18 +52539,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMetalSurfaceCreateInfoEXT *>( this );
     }
 
-    operator VkMetalSurfaceCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMetalSurfaceCreateInfoEXT *>( this );
-    }
-
-    operator VkMetalSurfaceCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMetalSurfaceCreateInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, MetalSurfaceCreateFlagsEXT const &, const CAMetalLayer * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::MetalSurfaceCreateFlagsEXT const &,
+               const CAMetalLayer * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, pLayer );
@@ -71977,20 +52573,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType              sType  = StructureType::eMetalSurfaceCreateInfoEXT;
-    const void *               pNext  = {};
-    MetalSurfaceCreateFlagsEXT flags  = {};
-    const CAMetalLayer *       pLayer = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType  = StructureType::eMetalSurfaceCreateInfoEXT;
+    const void *                                     pNext  = {};
+    VULKAN_HPP_NAMESPACE::MetalSurfaceCreateFlagsEXT flags  = {};
+    const CAMetalLayer *                             pLayer = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMetalSurfaceCreateInfoEXT>
-  {
-    using Type = MetalSurfaceCreateInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eMetalSurfaceCreateInfoEXT>
   {
@@ -71998,7 +52586,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-  // wrapper struct for struct VkMicromapBuildInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapBuildInfoEXT.html
   struct MicromapBuildInfoEXT
   {
     using NativeType = VkMicromapBuildInfoEXT;
@@ -72006,31 +52593,31 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMicromapBuildInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT( MicromapTypeEXT                  type_                = MicromapTypeEXT::eOpacityMicromap,
-                                                  BuildMicromapFlagsEXT            flags_               = {},
-                                                  BuildMicromapModeEXT             mode_                = BuildMicromapModeEXT::eBuild,
-                                                  MicromapEXT                      dstMicromap_         = {},
-                                                  uint32_t                         usageCountsCount_    = {},
-                                                  const MicromapUsageEXT *         pUsageCounts_        = {},
-                                                  const MicromapUsageEXT * const * ppUsageCounts_       = {},
-                                                  DeviceOrHostAddressConstKHR      data_                = {},
-                                                  DeviceOrHostAddressKHR           scratchData_         = {},
-                                                  DeviceOrHostAddressConstKHR      triangleArray_       = {},
-                                                  DeviceSize                       triangleArrayStride_ = {},
-                                                  const void *                     pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , flags{ flags_ }
-      , mode{ mode_ }
-      , dstMicromap{ dstMicromap_ }
-      , usageCountsCount{ usageCountsCount_ }
-      , pUsageCounts{ pUsageCounts_ }
-      , ppUsageCounts{ ppUsageCounts_ }
-      , data{ data_ }
-      , scratchData{ scratchData_ }
-      , triangleArray{ triangleArray_ }
-      , triangleArrayStride{ triangleArrayStride_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT( VULKAN_HPP_NAMESPACE::MicromapTypeEXT       type_  = VULKAN_HPP_NAMESPACE::MicromapTypeEXT::eOpacityMicromap,
+                                                  VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT flags_ = {},
+                                                  VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT  mode_  = VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT::eBuild,
+                                                  VULKAN_HPP_NAMESPACE::MicromapEXT           dstMicromap_                    = {},
+                                                  uint32_t                                    usageCountsCount_               = {},
+                                                  const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *         pUsageCounts_        = {},
+                                                  const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_       = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      data_                = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR           scratchData_         = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      triangleArray_       = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize                       triangleArrayStride_ = {},
+                                                  const void *                                           pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , flags( flags_ )
+      , mode( mode_ )
+      , dstMicromap( dstMicromap_ )
+      , usageCountsCount( usageCountsCount_ )
+      , pUsageCounts( pUsageCounts_ )
+      , ppUsageCounts( ppUsageCounts_ )
+      , data( data_ )
+      , scratchData( scratchData_ )
+      , triangleArray( triangleArray_ )
+      , triangleArrayStride( triangleArrayStride_ )
     {
     }
 
@@ -72042,17 +52629,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MicromapBuildInfoEXT( MicromapTypeEXT                                                 type_,
-                          BuildMicromapFlagsEXT                                           flags_,
-                          BuildMicromapModeEXT                                            mode_,
-                          MicromapEXT                                                     dstMicromap_,
-                          ArrayProxyNoTemporaries<const MicromapUsageEXT> const &         usageCounts_,
-                          ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_        = {},
-                          DeviceOrHostAddressConstKHR                                     data_                = {},
-                          DeviceOrHostAddressKHR                                          scratchData_         = {},
-                          DeviceOrHostAddressConstKHR                                     triangleArray_       = {},
-                          DeviceSize                                                      triangleArrayStride_ = {},
-                          const void *                                                    pNext_               = nullptr )
+    MicromapBuildInfoEXT( VULKAN_HPP_NAMESPACE::MicromapTypeEXT                                                                       type_,
+                          VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT                                                                 flags_,
+                          VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT                                                                  mode_,
+                          VULKAN_HPP_NAMESPACE::MicromapEXT                                                                           dstMicromap_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const &         usageCounts_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_        = {},
+                          VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           data_                = {},
+                          VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR                                                                scratchData_         = {},
+                          VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR                                                           triangleArray_       = {},
+                          VULKAN_HPP_NAMESPACE::DeviceSize                                                                            triangleArrayStride_ = {},
+                          const void *                                                                                                pNext_ = nullptr )
       : pNext( pNext_ )
       , type( type_ )
       , flags( flags_ )
@@ -72078,40 +52665,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     MicromapBuildInfoEXT & operator=( MicromapBuildInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapBuildInfoEXT & operator=( VkMicromapBuildInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapBuildInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapBuildInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setType( MicromapTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setType( VULKAN_HPP_NAMESPACE::MicromapTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setFlags( BuildMicromapFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setMode( BuildMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setMode( VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT mode_ ) VULKAN_HPP_NOEXCEPT
     {
       mode = mode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setDstMicromap( MicromapEXT dstMicromap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setDstMicromap( VULKAN_HPP_NAMESPACE::MicromapEXT dstMicromap_ ) VULKAN_HPP_NOEXCEPT
     {
       dstMicromap = dstMicromap_;
       return *this;
@@ -72123,14 +52710,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setPUsageCounts( const MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setPUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       pUsageCounts = pUsageCounts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MicromapBuildInfoEXT & setUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
+    MicromapBuildInfoEXT &
+      setUsageCounts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT> const & usageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( usageCounts_.size() );
       pUsageCounts     = usageCounts_.data();
@@ -72138,14 +52726,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setPpUsageCounts( const MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setPpUsageCounts( const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       ppUsageCounts = ppUsageCounts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MicromapBuildInfoEXT & setPUsageCounts( ArrayProxyNoTemporaries<const MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
+    MicromapBuildInfoEXT & setPUsageCounts(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const> const & pUsageCounts_ ) VULKAN_HPP_NOEXCEPT
     {
       usageCountsCount = static_cast<uint32_t>( pUsageCounts_.size() );
       ppUsageCounts    = pUsageCounts_.data();
@@ -72153,30 +52742,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setData( DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setScratchData( DeviceOrHostAddressKHR const & scratchData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setScratchData( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const & scratchData_ ) VULKAN_HPP_NOEXCEPT
     {
       scratchData = scratchData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setTriangleArray( DeviceOrHostAddressConstKHR const & triangleArray_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT &
+      setTriangleArray( VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const & triangleArray_ ) VULKAN_HPP_NOEXCEPT
     {
       triangleArray = triangleArray_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setTriangleArrayStride( DeviceSize triangleArrayStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildInfoEXT & setTriangleArrayStride( VULKAN_HPP_NAMESPACE::DeviceSize triangleArrayStride_ ) VULKAN_HPP_NOEXCEPT
     {
       triangleArrayStride = triangleArrayStride_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapBuildInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72188,30 +52778,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapBuildInfoEXT *>( this );
     }
 
-    operator VkMicromapBuildInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapBuildInfoEXT *>( this );
-    }
-
-    operator VkMicromapBuildInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapBuildInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               MicromapTypeEXT const &,
-               BuildMicromapFlagsEXT const &,
-               BuildMicromapModeEXT const &,
-               MicromapEXT const &,
+               VULKAN_HPP_NAMESPACE::MicromapTypeEXT const &,
+               VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT const &,
+               VULKAN_HPP_NAMESPACE::MicromapEXT const &,
                uint32_t const &,
-               const MicromapUsageEXT * const &,
-               const MicromapUsageEXT * const * const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceOrHostAddressKHR const &,
-               DeviceOrHostAddressConstKHR const &,
-               DeviceSize const &>
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const &,
+               const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -72220,36 +52804,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType               = StructureType::eMicromapBuildInfoEXT;
-    const void *                     pNext               = {};
-    MicromapTypeEXT                  type                = MicromapTypeEXT::eOpacityMicromap;
-    BuildMicromapFlagsEXT            flags               = {};
-    BuildMicromapModeEXT             mode                = BuildMicromapModeEXT::eBuild;
-    MicromapEXT                      dstMicromap         = {};
-    uint32_t                         usageCountsCount    = {};
-    const MicromapUsageEXT *         pUsageCounts        = {};
-    const MicromapUsageEXT * const * ppUsageCounts       = {};
-    DeviceOrHostAddressConstKHR      data                = {};
-    DeviceOrHostAddressKHR           scratchData         = {};
-    DeviceOrHostAddressConstKHR      triangleArray       = {};
-    DeviceSize                       triangleArrayStride = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType               = StructureType::eMicromapBuildInfoEXT;
+    const void *                                           pNext               = {};
+    VULKAN_HPP_NAMESPACE::MicromapTypeEXT                  type                = VULKAN_HPP_NAMESPACE::MicromapTypeEXT::eOpacityMicromap;
+    VULKAN_HPP_NAMESPACE::BuildMicromapFlagsEXT            flags               = {};
+    VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT             mode                = VULKAN_HPP_NAMESPACE::BuildMicromapModeEXT::eBuild;
+    VULKAN_HPP_NAMESPACE::MicromapEXT                      dstMicromap         = {};
+    uint32_t                                               usageCountsCount    = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT *         pUsageCounts        = {};
+    const VULKAN_HPP_NAMESPACE::MicromapUsageEXT * const * ppUsageCounts       = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      data                = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressKHR           scratchData         = {};
+    VULKAN_HPP_NAMESPACE::DeviceOrHostAddressConstKHR      triangleArray       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                       triangleArrayStride = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapBuildInfoEXT>
-  {
-    using Type = MicromapBuildInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMicromapBuildInfoEXT>
   {
     using Type = MicromapBuildInfoEXT;
   };
 
-  // wrapper struct for struct VkMicromapBuildSizesInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapBuildSizesInfoEXT.html
   struct MicromapBuildSizesInfoEXT
   {
     using NativeType = VkMicromapBuildSizesInfoEXT;
@@ -72257,15 +52832,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMicromapBuildSizesInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MicromapBuildSizesInfoEXT( DeviceSize   micromapSize_     = {},
-                                                    DeviceSize   buildScratchSize_ = {},
-                                                    Bool32       discardable_      = {},
-                                                    const void * pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , micromapSize{ micromapSize_ }
-      , buildScratchSize{ buildScratchSize_ }
-      , discardable{ discardable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MicromapBuildSizesInfoEXT( VULKAN_HPP_NAMESPACE::DeviceSize micromapSize_     = {},
+                                                    VULKAN_HPP_NAMESPACE::DeviceSize buildScratchSize_ = {},
+                                                    VULKAN_HPP_NAMESPACE::Bool32     discardable_      = {},
+                                                    const void *                     pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , micromapSize( micromapSize_ )
+      , buildScratchSize( buildScratchSize_ )
+      , discardable( discardable_ )
     {
     }
 
@@ -72277,39 +52852,39 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MicromapBuildSizesInfoEXT & operator=( MicromapBuildSizesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapBuildSizesInfoEXT & operator=( VkMicromapBuildSizesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapBuildSizesInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapBuildSizesInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setMicromapSize( DeviceSize micromapSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setMicromapSize( VULKAN_HPP_NAMESPACE::DeviceSize micromapSize_ ) VULKAN_HPP_NOEXCEPT
     {
       micromapSize = micromapSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setBuildScratchSize( DeviceSize buildScratchSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setBuildScratchSize( VULKAN_HPP_NAMESPACE::DeviceSize buildScratchSize_ ) VULKAN_HPP_NOEXCEPT
     {
       buildScratchSize = buildScratchSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setDiscardable( Bool32 discardable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapBuildSizesInfoEXT & setDiscardable( VULKAN_HPP_NAMESPACE::Bool32 discardable_ ) VULKAN_HPP_NOEXCEPT
     {
       discardable = discardable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapBuildSizesInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72321,18 +52896,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapBuildSizesInfoEXT *>( this );
     }
 
-    operator VkMicromapBuildSizesInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapBuildSizesInfoEXT *>( this );
-    }
-
-    operator VkMicromapBuildSizesInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapBuildSizesInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceSize const &, DeviceSize const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, micromapSize, buildScratchSize, discardable );
     }
@@ -72358,28 +52932,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::eMicromapBuildSizesInfoEXT;
-    const void *  pNext            = {};
-    DeviceSize    micromapSize     = {};
-    DeviceSize    buildScratchSize = {};
-    Bool32        discardable      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eMicromapBuildSizesInfoEXT;
+    const void *                        pNext            = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    micromapSize     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    buildScratchSize = {};
+    VULKAN_HPP_NAMESPACE::Bool32        discardable      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapBuildSizesInfoEXT>
-  {
-    using Type = MicromapBuildSizesInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMicromapBuildSizesInfoEXT>
   {
     using Type = MicromapBuildSizesInfoEXT;
   };
 
-  // wrapper struct for struct VkMicromapCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapCreateInfoEXT.html
   struct MicromapCreateInfoEXT
   {
     using NativeType = VkMicromapCreateInfoEXT;
@@ -72387,21 +52952,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMicromapCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MicromapCreateInfoEXT( MicromapCreateFlagsEXT createFlags_   = {},
-                                                Buffer                 buffer_        = {},
-                                                DeviceSize             offset_        = {},
-                                                DeviceSize             size_          = {},
-                                                MicromapTypeEXT        type_          = MicromapTypeEXT::eOpacityMicromap,
-                                                DeviceAddress          deviceAddress_ = {},
-                                                const void *           pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , createFlags{ createFlags_ }
-      , buffer{ buffer_ }
-      , offset{ offset_ }
-      , size{ size_ }
-      , type{ type_ }
-      , deviceAddress{ deviceAddress_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MicromapCreateInfoEXT( VULKAN_HPP_NAMESPACE::MicromapCreateFlagsEXT createFlags_ = {},
+                                                VULKAN_HPP_NAMESPACE::Buffer                 buffer_      = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceSize             offset_      = {},
+                                                VULKAN_HPP_NAMESPACE::DeviceSize             size_        = {},
+                                                VULKAN_HPP_NAMESPACE::MicromapTypeEXT        type_ = VULKAN_HPP_NAMESPACE::MicromapTypeEXT::eOpacityMicromap,
+                                                VULKAN_HPP_NAMESPACE::DeviceAddress          deviceAddress_ = {},
+                                                const void *                                 pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , createFlags( createFlags_ )
+      , buffer( buffer_ )
+      , offset( offset_ )
+      , size( size_ )
+      , type( type_ )
+      , deviceAddress( deviceAddress_ )
     {
     }
 
@@ -72413,57 +52978,57 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MicromapCreateInfoEXT & operator=( MicromapCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapCreateInfoEXT & operator=( VkMicromapCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setCreateFlags( MicromapCreateFlagsEXT createFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setCreateFlags( VULKAN_HPP_NAMESPACE::MicromapCreateFlagsEXT createFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       createFlags = createFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setBuffer( Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setBuffer( VULKAN_HPP_NAMESPACE::Buffer buffer_ ) VULKAN_HPP_NOEXCEPT
     {
       buffer = buffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setOffset( DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setOffset( VULKAN_HPP_NAMESPACE::DeviceSize offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setType( MicromapTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setType( VULKAN_HPP_NAMESPACE::MicromapTypeEXT type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setDeviceAddress( DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MicromapCreateInfoEXT & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceAddress = deviceAddress_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72475,25 +53040,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapCreateInfoEXT *>( this );
     }
 
-    operator VkMicromapCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapCreateInfoEXT *>( this );
-    }
-
-    operator VkMicromapCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               MicromapCreateFlagsEXT const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               MicromapTypeEXT const &,
-               DeviceAddress const &>
+               VULKAN_HPP_NAMESPACE::MicromapCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::MicromapTypeEXT const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, createFlags, buffer, offset, size, type, deviceAddress );
@@ -72520,40 +53079,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType         = StructureType::eMicromapCreateInfoEXT;
-    const void *           pNext         = {};
-    MicromapCreateFlagsEXT createFlags   = {};
-    Buffer                 buffer        = {};
-    DeviceSize             offset        = {};
-    DeviceSize             size          = {};
-    MicromapTypeEXT        type          = MicromapTypeEXT::eOpacityMicromap;
-    DeviceAddress          deviceAddress = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType         = StructureType::eMicromapCreateInfoEXT;
+    const void *                                 pNext         = {};
+    VULKAN_HPP_NAMESPACE::MicromapCreateFlagsEXT createFlags   = {};
+    VULKAN_HPP_NAMESPACE::Buffer                 buffer        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize             offset        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize             size          = {};
+    VULKAN_HPP_NAMESPACE::MicromapTypeEXT        type          = VULKAN_HPP_NAMESPACE::MicromapTypeEXT::eOpacityMicromap;
+    VULKAN_HPP_NAMESPACE::DeviceAddress          deviceAddress = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapCreateInfoEXT>
-  {
-    using Type = MicromapCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMicromapCreateInfoEXT>
   {
     using Type = MicromapCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkMicromapTriangleEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapTriangleEXT.html
   struct MicromapTriangleEXT
   {
     using NativeType = VkMicromapTriangleEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MicromapTriangleEXT( uint32_t dataOffset_ = {}, uint16_t subdivisionLevel_ = {}, uint16_t format_ = {} ) VULKAN_HPP_NOEXCEPT
-      : dataOffset{ dataOffset_ }
-      , subdivisionLevel{ subdivisionLevel_ }
-      , format{ format_ }
+      : dataOffset( dataOffset_ )
+      , subdivisionLevel( subdivisionLevel_ )
+      , format( format_ )
     {
     }
 
@@ -72564,15 +53114,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MicromapTriangleEXT & operator=( MicromapTriangleEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapTriangleEXT & operator=( VkMicromapTriangleEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapTriangleEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapTriangleEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapTriangleEXT & setDataOffset( uint32_t dataOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dataOffset = dataOffset_;
@@ -72590,7 +53140,7 @@ namespace VULKAN_HPP_NAMESPACE
       format = format_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapTriangleEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72602,18 +53152,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapTriangleEXT *>( this );
     }
 
-    operator VkMicromapTriangleEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapTriangleEXT *>( this );
-    }
-
-    operator VkMicromapTriangleEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapTriangleEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint16_t const &, uint16_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint16_t const &, uint16_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( dataOffset, subdivisionLevel, format );
     }
@@ -72643,15 +53188,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint16_t format           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapTriangleEXT>
-  {
-    using Type = MicromapTriangleEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkMicromapVersionInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMicromapVersionInfoEXT.html
   struct MicromapVersionInfoEXT
   {
     using NativeType = VkMicromapVersionInfoEXT;
@@ -72659,10 +53195,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMicromapVersionInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MicromapVersionInfoEXT( const uint8_t * pVersionData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pVersionData{ pVersionData_ }
+      : pNext( pNext_ )
+      , pVersionData( pVersionData_ )
     {
     }
 
@@ -72674,15 +53210,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MicromapVersionInfoEXT & operator=( MicromapVersionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MicromapVersionInfoEXT & operator=( VkMicromapVersionInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MicromapVersionInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MicromapVersionInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MicromapVersionInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -72694,7 +53230,7 @@ namespace VULKAN_HPP_NAMESPACE
       pVersionData = pVersionData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMicromapVersionInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72706,18 +53242,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMicromapVersionInfoEXT *>( this );
     }
 
-    operator VkMicromapVersionInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMicromapVersionInfoEXT *>( this );
-    }
-
-    operator VkMicromapVersionInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMicromapVersionInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const uint8_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const uint8_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pVersionData );
     }
@@ -72742,35 +53273,26 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType        = StructureType::eMicromapVersionInfoEXT;
-    const void *    pNext        = {};
-    const uint8_t * pVersionData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eMicromapVersionInfoEXT;
+    const void *                        pNext        = {};
+    const uint8_t *                     pVersionData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMicromapVersionInfoEXT>
-  {
-    using Type = MicromapVersionInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMicromapVersionInfoEXT>
   {
     using Type = MicromapVersionInfoEXT;
   };
 
-  // wrapper struct for struct VkMultiDrawIndexedInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultiDrawIndexedInfoEXT.html
   struct MultiDrawIndexedInfoEXT
   {
     using NativeType = VkMultiDrawIndexedInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MultiDrawIndexedInfoEXT( uint32_t firstIndex_ = {}, uint32_t indexCount_ = {}, int32_t vertexOffset_ = {} ) VULKAN_HPP_NOEXCEPT
-      : firstIndex{ firstIndex_ }
-      , indexCount{ indexCount_ }
-      , vertexOffset{ vertexOffset_ }
+      : firstIndex( firstIndex_ )
+      , indexCount( indexCount_ )
+      , vertexOffset( vertexOffset_ )
     {
     }
 
@@ -72782,15 +53304,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MultiDrawIndexedInfoEXT & operator=( MultiDrawIndexedInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultiDrawIndexedInfoEXT & operator=( VkMultiDrawIndexedInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultiDrawIndexedInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultiDrawIndexedInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MultiDrawIndexedInfoEXT & setFirstIndex( uint32_t firstIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       firstIndex = firstIndex_;
@@ -72808,7 +53330,7 @@ namespace VULKAN_HPP_NAMESPACE
       vertexOffset = vertexOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMultiDrawIndexedInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72820,18 +53342,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultiDrawIndexedInfoEXT *>( this );
     }
 
-    operator VkMultiDrawIndexedInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultiDrawIndexedInfoEXT *>( this );
-    }
-
-    operator VkMultiDrawIndexedInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultiDrawIndexedInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, int32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( firstIndex, indexCount, vertexOffset );
     }
@@ -72861,23 +53378,14 @@ namespace VULKAN_HPP_NAMESPACE
     int32_t  vertexOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultiDrawIndexedInfoEXT>
-  {
-    using Type = MultiDrawIndexedInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkMultiDrawInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultiDrawInfoEXT.html
   struct MultiDrawInfoEXT
   {
     using NativeType = VkMultiDrawInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR MultiDrawInfoEXT( uint32_t firstVertex_ = {}, uint32_t vertexCount_ = {} ) VULKAN_HPP_NOEXCEPT
-      : firstVertex{ firstVertex_ }
-      , vertexCount{ vertexCount_ }
+      : firstVertex( firstVertex_ )
+      , vertexCount( vertexCount_ )
     {
     }
 
@@ -72886,15 +53394,15 @@ namespace VULKAN_HPP_NAMESPACE
     MultiDrawInfoEXT( VkMultiDrawInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT : MultiDrawInfoEXT( *reinterpret_cast<MultiDrawInfoEXT const *>( &rhs ) ) {}
 
     MultiDrawInfoEXT & operator=( MultiDrawInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultiDrawInfoEXT & operator=( VkMultiDrawInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultiDrawInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultiDrawInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MultiDrawInfoEXT & setFirstVertex( uint32_t firstVertex_ ) VULKAN_HPP_NOEXCEPT
     {
       firstVertex = firstVertex_;
@@ -72906,7 +53414,7 @@ namespace VULKAN_HPP_NAMESPACE
       vertexCount = vertexCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMultiDrawInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -72918,18 +53426,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultiDrawInfoEXT *>( this );
     }
 
-    operator VkMultiDrawInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultiDrawInfoEXT *>( this );
-    }
-
-    operator VkMultiDrawInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultiDrawInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( firstVertex, vertexCount );
     }
@@ -72958,15 +53461,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t vertexCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultiDrawInfoEXT>
-  {
-    using Type = MultiDrawInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkMultisamplePropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultisamplePropertiesEXT.html
   struct MultisamplePropertiesEXT
   {
     using NativeType = VkMultisamplePropertiesEXT;
@@ -72974,10 +53468,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMultisamplePropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MultisamplePropertiesEXT( Extent2D maxSampleLocationGridSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxSampleLocationGridSize{ maxSampleLocationGridSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MultisamplePropertiesEXT( VULKAN_HPP_NAMESPACE::Extent2D maxSampleLocationGridSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxSampleLocationGridSize( maxSampleLocationGridSize_ )
     {
     }
 
@@ -72989,11 +53483,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MultisamplePropertiesEXT & operator=( MultisamplePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultisamplePropertiesEXT & operator=( VkMultisamplePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultisamplePropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultisamplePropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -73007,18 +53501,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultisamplePropertiesEXT *>( this );
     }
 
-    operator VkMultisamplePropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultisamplePropertiesEXT *>( this );
-    }
-
-    operator VkMultisamplePropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultisamplePropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxSampleLocationGridSize );
     }
@@ -73043,27 +53532,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::eMultisamplePropertiesEXT;
-    void *        pNext                     = {};
-    Extent2D      maxSampleLocationGridSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::eMultisamplePropertiesEXT;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxSampleLocationGridSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultisamplePropertiesEXT>
-  {
-    using Type = MultisamplePropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMultisamplePropertiesEXT>
   {
     using Type = MultisamplePropertiesEXT;
   };
 
-  // wrapper struct for struct VkMultisampledRenderToSingleSampledInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultisampledRenderToSingleSampledInfoEXT.html
   struct MultisampledRenderToSingleSampledInfoEXT
   {
     using NativeType = VkMultisampledRenderToSingleSampledInfoEXT;
@@ -73071,13 +53550,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMultisampledRenderToSingleSampledInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MultisampledRenderToSingleSampledInfoEXT( Bool32              multisampledRenderToSingleSampledEnable_ = {},
-                                                                   SampleCountFlagBits rasterizationSamples_                    = SampleCountFlagBits::e1,
-                                                                   const void *        pNext_                                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multisampledRenderToSingleSampledEnable{ multisampledRenderToSingleSampledEnable_ }
-      , rasterizationSamples{ rasterizationSamples_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      MultisampledRenderToSingleSampledInfoEXT( VULKAN_HPP_NAMESPACE::Bool32              multisampledRenderToSingleSampledEnable_ = {},
+                                                VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                                const void *                              pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multisampledRenderToSingleSampledEnable( multisampledRenderToSingleSampledEnable_ )
+      , rasterizationSamples( rasterizationSamples_ )
     {
     }
 
@@ -73089,15 +53569,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MultisampledRenderToSingleSampledInfoEXT & operator=( MultisampledRenderToSingleSampledInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultisampledRenderToSingleSampledInfoEXT & operator=( VkMultisampledRenderToSingleSampledInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultisampledRenderToSingleSampledInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultisampledRenderToSingleSampledInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MultisampledRenderToSingleSampledInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -73105,18 +53585,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 MultisampledRenderToSingleSampledInfoEXT &
-      setMultisampledRenderToSingleSampledEnable( Bool32 multisampledRenderToSingleSampledEnable_ ) VULKAN_HPP_NOEXCEPT
+      setMultisampledRenderToSingleSampledEnable( VULKAN_HPP_NAMESPACE::Bool32 multisampledRenderToSingleSampledEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       multisampledRenderToSingleSampledEnable = multisampledRenderToSingleSampledEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MultisampledRenderToSingleSampledInfoEXT & setRasterizationSamples( SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MultisampledRenderToSingleSampledInfoEXT &
+      setRasterizationSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationSamples = rasterizationSamples_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMultisampledRenderToSingleSampledInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -73128,18 +53609,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultisampledRenderToSingleSampledInfoEXT *>( this );
     }
 
-    operator VkMultisampledRenderToSingleSampledInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultisampledRenderToSingleSampledInfoEXT *>( this );
-    }
-
-    operator VkMultisampledRenderToSingleSampledInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultisampledRenderToSingleSampledInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, SampleCountFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multisampledRenderToSingleSampledEnable, rasterizationSamples );
     }
@@ -73165,28 +53644,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                                   = StructureType::eMultisampledRenderToSingleSampledInfoEXT;
-    const void *        pNext                                   = {};
-    Bool32              multisampledRenderToSingleSampledEnable = {};
-    SampleCountFlagBits rasterizationSamples                    = SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::StructureType       sType                                   = StructureType::eMultisampledRenderToSingleSampledInfoEXT;
+    const void *                              pNext                                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32              multisampledRenderToSingleSampledEnable = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits rasterizationSamples                    = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultisampledRenderToSingleSampledInfoEXT>
-  {
-    using Type = MultisampledRenderToSingleSampledInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMultisampledRenderToSingleSampledInfoEXT>
   {
     using Type = MultisampledRenderToSingleSampledInfoEXT;
   };
 
-  // wrapper struct for struct VkMultiviewPerViewAttributesInfoNVX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultiviewPerViewAttributesInfoNVX.html
   struct MultiviewPerViewAttributesInfoNVX
   {
     using NativeType = VkMultiviewPerViewAttributesInfoNVX;
@@ -73194,13 +53663,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMultiviewPerViewAttributesInfoNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MultiviewPerViewAttributesInfoNVX( Bool32       perViewAttributes_              = {},
-                                                            Bool32       perViewAttributesPositionXOnly_ = {},
-                                                            const void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , perViewAttributes{ perViewAttributes_ }
-      , perViewAttributesPositionXOnly{ perViewAttributesPositionXOnly_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MultiviewPerViewAttributesInfoNVX( VULKAN_HPP_NAMESPACE::Bool32 perViewAttributes_              = {},
+                                                            VULKAN_HPP_NAMESPACE::Bool32 perViewAttributesPositionXOnly_ = {},
+                                                            const void *                 pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , perViewAttributes( perViewAttributes_ )
+      , perViewAttributesPositionXOnly( perViewAttributesPositionXOnly_ )
     {
     }
 
@@ -73212,33 +53681,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     MultiviewPerViewAttributesInfoNVX & operator=( MultiviewPerViewAttributesInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultiviewPerViewAttributesInfoNVX & operator=( VkMultiviewPerViewAttributesInfoNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultiviewPerViewAttributesInfoNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultiviewPerViewAttributesInfoNVX const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewAttributesInfoNVX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewAttributesInfoNVX & setPerViewAttributes( Bool32 perViewAttributes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewAttributesInfoNVX & setPerViewAttributes( VULKAN_HPP_NAMESPACE::Bool32 perViewAttributes_ ) VULKAN_HPP_NOEXCEPT
     {
       perViewAttributes = perViewAttributes_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewAttributesInfoNVX & setPerViewAttributesPositionXOnly( Bool32 perViewAttributesPositionXOnly_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewAttributesInfoNVX &
+      setPerViewAttributesPositionXOnly( VULKAN_HPP_NAMESPACE::Bool32 perViewAttributesPositionXOnly_ ) VULKAN_HPP_NOEXCEPT
     {
       perViewAttributesPositionXOnly = perViewAttributesPositionXOnly_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMultiviewPerViewAttributesInfoNVX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -73250,18 +53720,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultiviewPerViewAttributesInfoNVX *>( this );
     }
 
-    operator VkMultiviewPerViewAttributesInfoNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultiviewPerViewAttributesInfoNVX *>( this );
-    }
-
-    operator VkMultiviewPerViewAttributesInfoNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultiviewPerViewAttributesInfoNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, perViewAttributes, perViewAttributesPositionXOnly );
     }
@@ -73287,28 +53752,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                          = StructureType::eMultiviewPerViewAttributesInfoNVX;
-    const void *  pNext                          = {};
-    Bool32        perViewAttributes              = {};
-    Bool32        perViewAttributesPositionXOnly = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                          = StructureType::eMultiviewPerViewAttributesInfoNVX;
+    const void *                        pNext                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        perViewAttributes              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        perViewAttributesPositionXOnly = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultiviewPerViewAttributesInfoNVX>
-  {
-    using Type = MultiviewPerViewAttributesInfoNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMultiviewPerViewAttributesInfoNVX>
   {
     using Type = MultiviewPerViewAttributesInfoNVX;
   };
 
-  // wrapper struct for struct VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM.html
   struct MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM
   {
     using NativeType = VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
@@ -73316,13 +53771,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM( uint32_t       perViewRenderAreaCount_ = {},
-                                                                             const Rect2D * pPerViewRenderAreas_    = {},
-                                                                             const void *   pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , perViewRenderAreaCount{ perViewRenderAreaCount_ }
-      , pPerViewRenderAreas{ pPerViewRenderAreas_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM( uint32_t                             perViewRenderAreaCount_ = {},
+                                                                             const VULKAN_HPP_NAMESPACE::Rect2D * pPerViewRenderAreas_    = {},
+                                                                             const void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , perViewRenderAreaCount( perViewRenderAreaCount_ )
+      , pPerViewRenderAreas( pPerViewRenderAreas_ )
     {
     }
 
@@ -73335,7 +53790,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM( ArrayProxyNoTemporaries<const Rect2D> const & perViewRenderAreas_, const void * pNext_ = nullptr )
+    MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & perViewRenderAreas_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), perViewRenderAreaCount( static_cast<uint32_t>( perViewRenderAreas_.size() ) ), pPerViewRenderAreas( perViewRenderAreas_.data() )
     {
     }
@@ -73343,15 +53799,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM &
       operator=( MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM & operator=( VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -73366,7 +53822,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM &
-      setPPerViewRenderAreas( const Rect2D * pPerViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
+      setPPerViewRenderAreas( const VULKAN_HPP_NAMESPACE::Rect2D * pPerViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
     {
       pPerViewRenderAreas = pPerViewRenderAreas_;
       return *this;
@@ -73374,14 +53830,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM &
-      setPerViewRenderAreas( ArrayProxyNoTemporaries<const Rect2D> const & perViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
+      setPerViewRenderAreas( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & perViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
     {
       perViewRenderAreaCount = static_cast<uint32_t>( perViewRenderAreas_.size() );
       pPerViewRenderAreas    = perViewRenderAreas_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -73393,18 +53849,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM *>( this );
     }
 
-    operator VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM *>( this );
-    }
-
-    operator VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Rect2D * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, perViewRenderAreaCount, pPerViewRenderAreas );
     }
@@ -73430,35 +53881,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType                  = StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
-    const void *   pNext                  = {};
-    uint32_t       perViewRenderAreaCount = {};
-    const Rect2D * pPerViewRenderAreas    = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType                  = StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
+    const void *                         pNext                  = {};
+    uint32_t                             perViewRenderAreaCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D * pPerViewRenderAreas    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM>
-  {
-    using Type = MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM>
   {
     using Type = MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM;
   };
 
-  // wrapper struct for struct VkMutableDescriptorTypeListEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkMutableDescriptorTypeListEXT.html
   struct MutableDescriptorTypeListEXT
   {
     using NativeType = VkMutableDescriptorTypeListEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MutableDescriptorTypeListEXT( uint32_t descriptorTypeCount_ = {}, const DescriptorType * pDescriptorTypes_ = {} ) VULKAN_HPP_NOEXCEPT
-      : descriptorTypeCount{ descriptorTypeCount_ }
-      , pDescriptorTypes{ pDescriptorTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MutableDescriptorTypeListEXT( uint32_t                                     descriptorTypeCount_ = {},
+                                                       const VULKAN_HPP_NAMESPACE::DescriptorType * pDescriptorTypes_    = {} ) VULKAN_HPP_NOEXCEPT
+      : descriptorTypeCount( descriptorTypeCount_ )
+      , pDescriptorTypes( pDescriptorTypes_ )
     {
     }
 
@@ -73470,43 +53913,45 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MutableDescriptorTypeListEXT( ArrayProxyNoTemporaries<const DescriptorType> const & descriptorTypes_ )
+    MutableDescriptorTypeListEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorType> const & descriptorTypes_ )
       : descriptorTypeCount( static_cast<uint32_t>( descriptorTypes_.size() ) ), pDescriptorTypes( descriptorTypes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     MutableDescriptorTypeListEXT & operator=( MutableDescriptorTypeListEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MutableDescriptorTypeListEXT & operator=( VkMutableDescriptorTypeListEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MutableDescriptorTypeListEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MutableDescriptorTypeListEXT & setDescriptorTypeCount( uint32_t descriptorTypeCount_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorTypeCount = descriptorTypeCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 MutableDescriptorTypeListEXT & setPDescriptorTypes( const DescriptorType * pDescriptorTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 MutableDescriptorTypeListEXT &
+      setPDescriptorTypes( const VULKAN_HPP_NAMESPACE::DescriptorType * pDescriptorTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       pDescriptorTypes = pDescriptorTypes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MutableDescriptorTypeListEXT & setDescriptorTypes( ArrayProxyNoTemporaries<const DescriptorType> const & descriptorTypes_ ) VULKAN_HPP_NOEXCEPT
+    MutableDescriptorTypeListEXT & setDescriptorTypes(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorType> const & descriptorTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorTypeCount = static_cast<uint32_t>( descriptorTypes_.size() );
       pDescriptorTypes    = descriptorTypes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMutableDescriptorTypeListEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -73518,18 +53963,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMutableDescriptorTypeListEXT *>( this );
     }
 
-    operator VkMutableDescriptorTypeListEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMutableDescriptorTypeListEXT *>( this );
-    }
-
-    operator VkMutableDescriptorTypeListEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMutableDescriptorTypeListEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, const DescriptorType * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, const VULKAN_HPP_NAMESPACE::DescriptorType * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( descriptorTypeCount, pDescriptorTypes );
     }
@@ -73554,21 +53994,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t               descriptorTypeCount = {};
-    const DescriptorType * pDescriptorTypes    = {};
+    uint32_t                                     descriptorTypeCount = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorType * pDescriptorTypes    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMutableDescriptorTypeListEXT>
-  {
-    using Type = MutableDescriptorTypeListEXT;
-  };
-#endif
   using MutableDescriptorTypeListVALVE = MutableDescriptorTypeListEXT;
 
-  // wrapper struct for struct VkMutableDescriptorTypeCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkMutableDescriptorTypeCreateInfoEXT.html
   struct MutableDescriptorTypeCreateInfoEXT
   {
     using NativeType = VkMutableDescriptorTypeCreateInfoEXT;
@@ -73576,13 +54007,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eMutableDescriptorTypeCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR MutableDescriptorTypeCreateInfoEXT( uint32_t                             mutableDescriptorTypeListCount_ = {},
-                                                             const MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists_    = {},
-                                                             const void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mutableDescriptorTypeListCount{ mutableDescriptorTypeListCount_ }
-      , pMutableDescriptorTypeLists{ pMutableDescriptorTypeLists_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR MutableDescriptorTypeCreateInfoEXT( uint32_t                                                   mutableDescriptorTypeListCount_ = {},
+                                                             const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists_    = {},
+                                                             const void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , mutableDescriptorTypeListCount( mutableDescriptorTypeListCount_ )
+      , pMutableDescriptorTypeLists( pMutableDescriptorTypeLists_ )
     {
     }
 
@@ -73594,8 +54025,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MutableDescriptorTypeCreateInfoEXT( ArrayProxyNoTemporaries<const MutableDescriptorTypeListEXT> const & mutableDescriptorTypeLists_,
-                                        const void *                                                        pNext_ = nullptr )
+    MutableDescriptorTypeCreateInfoEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT> const & mutableDescriptorTypeLists_,
+      const void *                                                                                                    pNext_ = nullptr )
       : pNext( pNext_ )
       , mutableDescriptorTypeListCount( static_cast<uint32_t>( mutableDescriptorTypeLists_.size() ) )
       , pMutableDescriptorTypeLists( mutableDescriptorTypeLists_.data() )
@@ -73604,15 +54036,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     MutableDescriptorTypeCreateInfoEXT & operator=( MutableDescriptorTypeCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     MutableDescriptorTypeCreateInfoEXT & operator=( VkMutableDescriptorTypeCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<MutableDescriptorTypeCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::MutableDescriptorTypeCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 MutableDescriptorTypeCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -73627,22 +54059,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 MutableDescriptorTypeCreateInfoEXT &
-      setPMutableDescriptorTypeLists( const MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists_ ) VULKAN_HPP_NOEXCEPT
+      setPMutableDescriptorTypeLists( const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists_ ) VULKAN_HPP_NOEXCEPT
     {
       pMutableDescriptorTypeLists = pMutableDescriptorTypeLists_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    MutableDescriptorTypeCreateInfoEXT &
-      setMutableDescriptorTypeLists( ArrayProxyNoTemporaries<const MutableDescriptorTypeListEXT> const & mutableDescriptorTypeLists_ ) VULKAN_HPP_NOEXCEPT
+    MutableDescriptorTypeCreateInfoEXT & setMutableDescriptorTypeLists(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT> const & mutableDescriptorTypeLists_ )
+      VULKAN_HPP_NOEXCEPT
     {
       mutableDescriptorTypeListCount = static_cast<uint32_t>( mutableDescriptorTypeLists_.size() );
       pMutableDescriptorTypeLists    = mutableDescriptorTypeLists_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkMutableDescriptorTypeCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -73654,18 +54087,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkMutableDescriptorTypeCreateInfoEXT *>( this );
     }
 
-    operator VkMutableDescriptorTypeCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkMutableDescriptorTypeCreateInfoEXT *>( this );
-    }
-
-    operator VkMutableDescriptorTypeCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkMutableDescriptorTypeCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const MutableDescriptorTypeListEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mutableDescriptorTypeListCount, pMutableDescriptorTypeLists );
     }
@@ -73691,20 +54122,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType                          = StructureType::eMutableDescriptorTypeCreateInfoEXT;
-    const void *                         pNext                          = {};
-    uint32_t                             mutableDescriptorTypeListCount = {};
-    const MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType                          = StructureType::eMutableDescriptorTypeCreateInfoEXT;
+    const void *                                               pNext                          = {};
+    uint32_t                                                   mutableDescriptorTypeListCount = {};
+    const VULKAN_HPP_NAMESPACE::MutableDescriptorTypeListEXT * pMutableDescriptorTypeLists    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkMutableDescriptorTypeCreateInfoEXT>
-  {
-    using Type = MutableDescriptorTypeCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eMutableDescriptorTypeCreateInfoEXT>
   {
@@ -73713,459 +54136,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using MutableDescriptorTypeCreateInfoVALVE = MutableDescriptorTypeCreateInfoEXT;
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkNativeBufferFormatPropertiesOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkNativeBufferFormatPropertiesOHOS.html
-  struct NativeBufferFormatPropertiesOHOS
-  {
-    using NativeType = VkNativeBufferFormatPropertiesOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eNativeBufferFormatPropertiesOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR NativeBufferFormatPropertiesOHOS( Format                      format_                           = Format::eUndefined,
-                                                           uint64_t                    externalFormat_                   = {},
-                                                           FormatFeatureFlags          formatFeatures_                   = {},
-                                                           ComponentMapping            samplerYcbcrConversionComponents_ = {},
-                                                           SamplerYcbcrModelConversion suggestedYcbcrModel_    = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                           SamplerYcbcrRange           suggestedYcbcrRange_    = SamplerYcbcrRange::eItuFull,
-                                                           ChromaLocation              suggestedXChromaOffset_ = ChromaLocation::eCositedEven,
-                                                           ChromaLocation              suggestedYChromaOffset_ = ChromaLocation::eCositedEven,
-                                                           void *                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , externalFormat{ externalFormat_ }
-      , formatFeatures{ formatFeatures_ }
-      , samplerYcbcrConversionComponents{ samplerYcbcrConversionComponents_ }
-      , suggestedYcbcrModel{ suggestedYcbcrModel_ }
-      , suggestedYcbcrRange{ suggestedYcbcrRange_ }
-      , suggestedXChromaOffset{ suggestedXChromaOffset_ }
-      , suggestedYChromaOffset{ suggestedYChromaOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR NativeBufferFormatPropertiesOHOS( NativeBufferFormatPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    NativeBufferFormatPropertiesOHOS( VkNativeBufferFormatPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : NativeBufferFormatPropertiesOHOS( *reinterpret_cast<NativeBufferFormatPropertiesOHOS const *>( &rhs ) )
-    {
-    }
-
-    NativeBufferFormatPropertiesOHOS & operator=( NativeBufferFormatPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    NativeBufferFormatPropertiesOHOS & operator=( VkNativeBufferFormatPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<NativeBufferFormatPropertiesOHOS const *>( &rhs );
-      return *this;
-    }
-
-    operator VkNativeBufferFormatPropertiesOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkNativeBufferFormatPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferFormatPropertiesOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkNativeBufferFormatPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferFormatPropertiesOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkNativeBufferFormatPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferFormatPropertiesOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkNativeBufferFormatPropertiesOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Format const &,
-               uint64_t const &,
-               FormatFeatureFlags const &,
-               ComponentMapping const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ChromaLocation const &,
-               ChromaLocation const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       format,
-                       externalFormat,
-                       formatFeatures,
-                       samplerYcbcrConversionComponents,
-                       suggestedYcbcrModel,
-                       suggestedYcbcrRange,
-                       suggestedXChromaOffset,
-                       suggestedYChromaOffset );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( NativeBufferFormatPropertiesOHOS const & ) const = default;
-#  else
-    bool operator==( NativeBufferFormatPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( format == rhs.format ) && ( externalFormat == rhs.externalFormat ) &&
-             ( formatFeatures == rhs.formatFeatures ) && ( samplerYcbcrConversionComponents == rhs.samplerYcbcrConversionComponents ) &&
-             ( suggestedYcbcrModel == rhs.suggestedYcbcrModel ) && ( suggestedYcbcrRange == rhs.suggestedYcbcrRange ) &&
-             ( suggestedXChromaOffset == rhs.suggestedXChromaOffset ) && ( suggestedYChromaOffset == rhs.suggestedYChromaOffset );
-#    endif
-    }
-
-    bool operator!=( NativeBufferFormatPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType               sType                            = StructureType::eNativeBufferFormatPropertiesOHOS;
-    void *                      pNext                            = {};
-    Format                      format                           = Format::eUndefined;
-    uint64_t                    externalFormat                   = {};
-    FormatFeatureFlags          formatFeatures                   = {};
-    ComponentMapping            samplerYcbcrConversionComponents = {};
-    SamplerYcbcrModelConversion suggestedYcbcrModel              = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           suggestedYcbcrRange              = SamplerYcbcrRange::eItuFull;
-    ChromaLocation              suggestedXChromaOffset           = ChromaLocation::eCositedEven;
-    ChromaLocation              suggestedYChromaOffset           = ChromaLocation::eCositedEven;
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkNativeBufferFormatPropertiesOHOS>
-  {
-    using Type = NativeBufferFormatPropertiesOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eNativeBufferFormatPropertiesOHOS>
-  {
-    using Type = NativeBufferFormatPropertiesOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkNativeBufferOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkNativeBufferOHOS.html
-  struct NativeBufferOHOS
-  {
-    using NativeType = VkNativeBufferOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eNativeBufferOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR NativeBufferOHOS( struct OHBufferHandle * handle_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handle{ handle_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR NativeBufferOHOS( NativeBufferOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    NativeBufferOHOS( VkNativeBufferOHOS const & rhs ) VULKAN_HPP_NOEXCEPT : NativeBufferOHOS( *reinterpret_cast<NativeBufferOHOS const *>( &rhs ) ) {}
-
-    NativeBufferOHOS & operator=( NativeBufferOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    NativeBufferOHOS & operator=( VkNativeBufferOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<NativeBufferOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 NativeBufferOHOS & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 NativeBufferOHOS & setHandle( struct OHBufferHandle * handle_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handle = handle_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkNativeBufferOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkNativeBufferOHOS *>( this );
-    }
-
-    operator VkNativeBufferOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkNativeBufferOHOS *>( this );
-    }
-
-    operator VkNativeBufferOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkNativeBufferOHOS *>( this );
-    }
-
-    operator VkNativeBufferOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkNativeBufferOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, struct OHBufferHandle * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, handle );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( NativeBufferOHOS const & ) const = default;
-#  else
-    bool operator==( NativeBufferOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( handle == rhs.handle );
-#    endif
-    }
-
-    bool operator!=( NativeBufferOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType           sType  = StructureType::eNativeBufferOHOS;
-    const void *            pNext  = {};
-    struct OHBufferHandle * handle = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkNativeBufferOHOS>
-  {
-    using Type = NativeBufferOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eNativeBufferOHOS>
-  {
-    using Type = NativeBufferOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkNativeBufferPropertiesOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkNativeBufferPropertiesOHOS.html
-  struct NativeBufferPropertiesOHOS
-  {
-    using NativeType = VkNativeBufferPropertiesOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eNativeBufferPropertiesOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      NativeBufferPropertiesOHOS( DeviceSize allocationSize_ = {}, uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allocationSize{ allocationSize_ }
-      , memoryTypeBits{ memoryTypeBits_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR NativeBufferPropertiesOHOS( NativeBufferPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    NativeBufferPropertiesOHOS( VkNativeBufferPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : NativeBufferPropertiesOHOS( *reinterpret_cast<NativeBufferPropertiesOHOS const *>( &rhs ) )
-    {
-    }
-
-    NativeBufferPropertiesOHOS & operator=( NativeBufferPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    NativeBufferPropertiesOHOS & operator=( VkNativeBufferPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<NativeBufferPropertiesOHOS const *>( &rhs );
-      return *this;
-    }
-
-    operator VkNativeBufferPropertiesOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkNativeBufferPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferPropertiesOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkNativeBufferPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferPropertiesOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkNativeBufferPropertiesOHOS *>( this );
-    }
-
-    operator VkNativeBufferPropertiesOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkNativeBufferPropertiesOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, allocationSize, memoryTypeBits );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( NativeBufferPropertiesOHOS const & ) const = default;
-#  else
-    bool operator==( NativeBufferPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( allocationSize == rhs.allocationSize ) && ( memoryTypeBits == rhs.memoryTypeBits );
-#    endif
-    }
-
-    bool operator!=( NativeBufferPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType          = StructureType::eNativeBufferPropertiesOHOS;
-    void *        pNext          = {};
-    DeviceSize    allocationSize = {};
-    uint32_t      memoryTypeBits = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkNativeBufferPropertiesOHOS>
-  {
-    using Type = NativeBufferPropertiesOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eNativeBufferPropertiesOHOS>
-  {
-    using Type = NativeBufferPropertiesOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkNativeBufferUsageOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkNativeBufferUsageOHOS.html
-  struct NativeBufferUsageOHOS
-  {
-    using NativeType = VkNativeBufferUsageOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eNativeBufferUsageOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR NativeBufferUsageOHOS( uint64_t OHOSNativeBufferUsage_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , OHOSNativeBufferUsage{ OHOSNativeBufferUsage_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR NativeBufferUsageOHOS( NativeBufferUsageOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    NativeBufferUsageOHOS( VkNativeBufferUsageOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : NativeBufferUsageOHOS( *reinterpret_cast<NativeBufferUsageOHOS const *>( &rhs ) )
-    {
-    }
-
-    NativeBufferUsageOHOS & operator=( NativeBufferUsageOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    NativeBufferUsageOHOS & operator=( VkNativeBufferUsageOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<NativeBufferUsageOHOS const *>( &rhs );
-      return *this;
-    }
-
-    operator VkNativeBufferUsageOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkNativeBufferUsageOHOS *>( this );
-    }
-
-    operator VkNativeBufferUsageOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkNativeBufferUsageOHOS *>( this );
-    }
-
-    operator VkNativeBufferUsageOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkNativeBufferUsageOHOS *>( this );
-    }
-
-    operator VkNativeBufferUsageOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkNativeBufferUsageOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, OHOSNativeBufferUsage );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( NativeBufferUsageOHOS const & ) const = default;
-#  else
-    bool operator==( NativeBufferUsageOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( OHOSNativeBufferUsage == rhs.OHOSNativeBufferUsage );
-#    endif
-    }
-
-    bool operator!=( NativeBufferUsageOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType                 = StructureType::eNativeBufferUsageOHOS;
-    void *        pNext                 = {};
-    uint64_t      OHOSNativeBufferUsage = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkNativeBufferUsageOHOS>
-  {
-    using Type = NativeBufferUsageOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eNativeBufferUsageOHOS>
-  {
-    using Type = NativeBufferUsageOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  // wrapper struct for struct VkOpaqueCaptureDescriptorDataCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpaqueCaptureDescriptorDataCreateInfoEXT.html
   struct OpaqueCaptureDescriptorDataCreateInfoEXT
   {
     using NativeType = VkOpaqueCaptureDescriptorDataCreateInfoEXT;
@@ -74173,11 +54143,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR OpaqueCaptureDescriptorDataCreateInfoEXT( const void * opaqueCaptureDescriptorData_ = {},
                                                                    const void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , opaqueCaptureDescriptorData{ opaqueCaptureDescriptorData_ }
+      : pNext( pNext_ )
+      , opaqueCaptureDescriptorData( opaqueCaptureDescriptorData_ )
     {
     }
 
@@ -74189,15 +54159,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OpaqueCaptureDescriptorDataCreateInfoEXT & operator=( OpaqueCaptureDescriptorDataCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpaqueCaptureDescriptorDataCreateInfoEXT & operator=( VkOpaqueCaptureDescriptorDataCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpaqueCaptureDescriptorDataCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpaqueCaptureDescriptorDataCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OpaqueCaptureDescriptorDataCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -74210,7 +54180,7 @@ namespace VULKAN_HPP_NAMESPACE
       opaqueCaptureDescriptorData = opaqueCaptureDescriptorData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOpaqueCaptureDescriptorDataCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -74222,18 +54192,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpaqueCaptureDescriptorDataCreateInfoEXT *>( this );
     }
 
-    operator VkOpaqueCaptureDescriptorDataCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpaqueCaptureDescriptorDataCreateInfoEXT *>( this );
-    }
-
-    operator VkOpaqueCaptureDescriptorDataCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpaqueCaptureDescriptorDataCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, opaqueCaptureDescriptorData );
     }
@@ -74258,26 +54223,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT;
-    const void *  pNext                       = {};
-    const void *  opaqueCaptureDescriptorData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT;
+    const void *                        pNext                       = {};
+    const void *                        opaqueCaptureDescriptorData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpaqueCaptureDescriptorDataCreateInfoEXT>
-  {
-    using Type = OpaqueCaptureDescriptorDataCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT>
   {
     using Type = OpaqueCaptureDescriptorDataCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkOpticalFlowExecuteInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowExecuteInfoNV.html
   struct OpticalFlowExecuteInfoNV
   {
     using NativeType = VkOpticalFlowExecuteInfoNV;
@@ -74285,15 +54241,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpticalFlowExecuteInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR OpticalFlowExecuteInfoNV( OpticalFlowExecuteFlagsNV flags_       = {},
-                                                   uint32_t                  regionCount_ = {},
-                                                   const Rect2D *            pRegions_    = {},
-                                                   void *                    pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR OpticalFlowExecuteInfoNV( VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV flags_       = {},
+                                                   uint32_t                                        regionCount_ = {},
+                                                   const VULKAN_HPP_NAMESPACE::Rect2D *            pRegions_    = {},
+                                                   void *                                          pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -74305,29 +54261,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    OpticalFlowExecuteInfoNV( OpticalFlowExecuteFlagsNV flags_, ArrayProxyNoTemporaries<const Rect2D> const & regions_, void * pNext_ = nullptr )
+    OpticalFlowExecuteInfoNV( VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV                                           flags_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & regions_,
+                              void *                                                                                    pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), regionCount( static_cast<uint32_t>( regions_.size() ) ), pRegions( regions_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     OpticalFlowExecuteInfoNV & operator=( OpticalFlowExecuteInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpticalFlowExecuteInfoNV & operator=( VkOpticalFlowExecuteInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpticalFlowExecuteInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpticalFlowExecuteInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OpticalFlowExecuteInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowExecuteInfoNV & setFlags( OpticalFlowExecuteFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowExecuteInfoNV & setFlags( VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -74339,21 +54297,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowExecuteInfoNV & setPRegions( const Rect2D * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowExecuteInfoNV & setPRegions( const VULKAN_HPP_NAMESPACE::Rect2D * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    OpticalFlowExecuteInfoNV & setRegions( ArrayProxyNoTemporaries<const Rect2D> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    OpticalFlowExecuteInfoNV &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOpticalFlowExecuteInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -74365,18 +54324,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpticalFlowExecuteInfoNV *>( this );
     }
 
-    operator VkOpticalFlowExecuteInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpticalFlowExecuteInfoNV *>( this );
-    }
-
-    operator VkOpticalFlowExecuteInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpticalFlowExecuteInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, OpticalFlowExecuteFlagsNV const &, uint32_t const &, const Rect2D * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, regionCount, pRegions );
@@ -74402,28 +54359,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType       = StructureType::eOpticalFlowExecuteInfoNV;
-    void *                    pNext       = {};
-    OpticalFlowExecuteFlagsNV flags       = {};
-    uint32_t                  regionCount = {};
-    const Rect2D *            pRegions    = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType       = StructureType::eOpticalFlowExecuteInfoNV;
+    void *                                          pNext       = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowExecuteFlagsNV flags       = {};
+    uint32_t                                        regionCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D *            pRegions    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpticalFlowExecuteInfoNV>
-  {
-    using Type = OpticalFlowExecuteInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpticalFlowExecuteInfoNV>
   {
     using Type = OpticalFlowExecuteInfoNV;
   };
 
-  // wrapper struct for struct VkOpticalFlowImageFormatInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowImageFormatInfoNV.html
   struct OpticalFlowImageFormatInfoNV
   {
     using NativeType = VkOpticalFlowImageFormatInfoNV;
@@ -74431,10 +54379,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpticalFlowImageFormatInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR OpticalFlowImageFormatInfoNV( OpticalFlowUsageFlagsNV usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , usage{ usage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR OpticalFlowImageFormatInfoNV( VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagsNV usage_ = {},
+                                                       const void *                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , usage( usage_ )
     {
     }
 
@@ -74446,27 +54395,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OpticalFlowImageFormatInfoNV & operator=( OpticalFlowImageFormatInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpticalFlowImageFormatInfoNV & operator=( VkOpticalFlowImageFormatInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpticalFlowImageFormatInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OpticalFlowImageFormatInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowImageFormatInfoNV & setUsage( OpticalFlowUsageFlagsNV usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowImageFormatInfoNV & setUsage( VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagsNV usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOpticalFlowImageFormatInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -74478,18 +54427,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpticalFlowImageFormatInfoNV *>( this );
     }
 
-    operator VkOpticalFlowImageFormatInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpticalFlowImageFormatInfoNV *>( this );
-    }
-
-    operator VkOpticalFlowImageFormatInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpticalFlowImageFormatInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, OpticalFlowUsageFlagsNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagsNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, usage );
     }
@@ -74514,27 +54458,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType = StructureType::eOpticalFlowImageFormatInfoNV;
-    const void *            pNext = {};
-    OpticalFlowUsageFlagsNV usage = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType = StructureType::eOpticalFlowImageFormatInfoNV;
+    const void *                                  pNext = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowUsageFlagsNV usage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpticalFlowImageFormatInfoNV>
-  {
-    using Type = OpticalFlowImageFormatInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpticalFlowImageFormatInfoNV>
   {
     using Type = OpticalFlowImageFormatInfoNV;
   };
 
-  // wrapper struct for struct VkOpticalFlowImageFormatPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowImageFormatPropertiesNV.html
   struct OpticalFlowImageFormatPropertiesNV
   {
     using NativeType = VkOpticalFlowImageFormatPropertiesNV;
@@ -74542,10 +54476,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpticalFlowImageFormatPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR OpticalFlowImageFormatPropertiesNV( Format format_ = Format::eUndefined, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR OpticalFlowImageFormatPropertiesNV( VULKAN_HPP_NAMESPACE::Format format_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                             const void *                 pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
     {
     }
 
@@ -74557,11 +54492,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OpticalFlowImageFormatPropertiesNV & operator=( OpticalFlowImageFormatPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpticalFlowImageFormatPropertiesNV & operator=( VkOpticalFlowImageFormatPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpticalFlowImageFormatPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpticalFlowImageFormatPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -74575,18 +54510,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( this );
     }
 
-    operator VkOpticalFlowImageFormatPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpticalFlowImageFormatPropertiesNV *>( this );
-    }
-
-    operator VkOpticalFlowImageFormatPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpticalFlowImageFormatPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Format const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, format );
     }
@@ -74611,27 +54541,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::eOpticalFlowImageFormatPropertiesNV;
-    void *        pNext  = {};
-    Format        format = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::eOpticalFlowImageFormatPropertiesNV;
+    const void *                        pNext  = {};
+    VULKAN_HPP_NAMESPACE::Format        format = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpticalFlowImageFormatPropertiesNV>
-  {
-    using Type = OpticalFlowImageFormatPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpticalFlowImageFormatPropertiesNV>
   {
     using Type = OpticalFlowImageFormatPropertiesNV;
   };
 
-  // wrapper struct for struct VkOpticalFlowSessionCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionCreateInfoNV.html
   struct OpticalFlowSessionCreateInfoNV
   {
     using NativeType = VkOpticalFlowSessionCreateInfoNV;
@@ -74639,27 +54559,28 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpticalFlowSessionCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR OpticalFlowSessionCreateInfoNV( uint32_t                        width_            = {},
-                                                         uint32_t                        height_           = {},
-                                                         Format                          imageFormat_      = Format::eUndefined,
-                                                         Format                          flowVectorFormat_ = Format::eUndefined,
-                                                         Format                          costFormat_       = Format::eUndefined,
-                                                         OpticalFlowGridSizeFlagsNV      outputGridSize_   = {},
-                                                         OpticalFlowGridSizeFlagsNV      hintGridSize_     = {},
-                                                         OpticalFlowPerformanceLevelNV   performanceLevel_ = OpticalFlowPerformanceLevelNV::eUnknown,
-                                                         OpticalFlowSessionCreateFlagsNV flags_            = {},
-                                                         void *                          pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , width{ width_ }
-      , height{ height_ }
-      , imageFormat{ imageFormat_ }
-      , flowVectorFormat{ flowVectorFormat_ }
-      , costFormat{ costFormat_ }
-      , outputGridSize{ outputGridSize_ }
-      , hintGridSize{ hintGridSize_ }
-      , performanceLevel{ performanceLevel_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR OpticalFlowSessionCreateInfoNV(
+      uint32_t                                              width_            = {},
+      uint32_t                                              height_           = {},
+      VULKAN_HPP_NAMESPACE::Format                          imageFormat_      = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::Format                          flowVectorFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::Format                          costFormat_       = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV      outputGridSize_   = {},
+      VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV      hintGridSize_     = {},
+      VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV   performanceLevel_ = VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV::eUnknown,
+      VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateFlagsNV flags_            = {},
+      void *                                                pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , width( width_ )
+      , height( height_ )
+      , imageFormat( imageFormat_ )
+      , flowVectorFormat( flowVectorFormat_ )
+      , costFormat( costFormat_ )
+      , outputGridSize( outputGridSize_ )
+      , hintGridSize( hintGridSize_ )
+      , performanceLevel( performanceLevel_ )
+      , flags( flags_ )
     {
     }
 
@@ -74671,15 +54592,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OpticalFlowSessionCreateInfoNV & operator=( OpticalFlowSessionCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpticalFlowSessionCreateInfoNV & operator=( VkOpticalFlowSessionCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpticalFlowSessionCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -74698,48 +54619,51 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setImageFormat( Format imageFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setImageFormat( VULKAN_HPP_NAMESPACE::Format imageFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       imageFormat = imageFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setFlowVectorFormat( Format flowVectorFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setFlowVectorFormat( VULKAN_HPP_NAMESPACE::Format flowVectorFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       flowVectorFormat = flowVectorFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setCostFormat( Format costFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setCostFormat( VULKAN_HPP_NAMESPACE::Format costFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       costFormat = costFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setOutputGridSize( OpticalFlowGridSizeFlagsNV outputGridSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV &
+      setOutputGridSize( VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV outputGridSize_ ) VULKAN_HPP_NOEXCEPT
     {
       outputGridSize = outputGridSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setHintGridSize( OpticalFlowGridSizeFlagsNV hintGridSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV &
+      setHintGridSize( VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV hintGridSize_ ) VULKAN_HPP_NOEXCEPT
     {
       hintGridSize = hintGridSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setPerformanceLevel( OpticalFlowPerformanceLevelNV performanceLevel_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV &
+      setPerformanceLevel( VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV performanceLevel_ ) VULKAN_HPP_NOEXCEPT
     {
       performanceLevel = performanceLevel_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setFlags( OpticalFlowSessionCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreateInfoNV & setFlags( VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOpticalFlowSessionCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -74751,28 +54675,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpticalFlowSessionCreateInfoNV *>( this );
     }
 
-    operator VkOpticalFlowSessionCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpticalFlowSessionCreateInfoNV *>( this );
-    }
-
-    operator VkOpticalFlowSessionCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpticalFlowSessionCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
-               Format const &,
-               Format const &,
-               Format const &,
-               OpticalFlowGridSizeFlagsNV const &,
-               OpticalFlowGridSizeFlagsNV const &,
-               OpticalFlowPerformanceLevelNV const &,
-               OpticalFlowSessionCreateFlagsNV const &>
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateFlagsNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, width, height, imageFormat, flowVectorFormat, costFormat, outputGridSize, hintGridSize, performanceLevel, flags );
@@ -74800,35 +54718,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType            = StructureType::eOpticalFlowSessionCreateInfoNV;
-    void *                          pNext            = {};
-    uint32_t                        width            = {};
-    uint32_t                        height           = {};
-    Format                          imageFormat      = Format::eUndefined;
-    Format                          flowVectorFormat = Format::eUndefined;
-    Format                          costFormat       = Format::eUndefined;
-    OpticalFlowGridSizeFlagsNV      outputGridSize   = {};
-    OpticalFlowGridSizeFlagsNV      hintGridSize     = {};
-    OpticalFlowPerformanceLevelNV   performanceLevel = OpticalFlowPerformanceLevelNV::eUnknown;
-    OpticalFlowSessionCreateFlagsNV flags            = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType            = StructureType::eOpticalFlowSessionCreateInfoNV;
+    void *                                                pNext            = {};
+    uint32_t                                              width            = {};
+    uint32_t                                              height           = {};
+    VULKAN_HPP_NAMESPACE::Format                          imageFormat      = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format                          flowVectorFormat = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format                          costFormat       = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV      outputGridSize   = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV      hintGridSize     = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV   performanceLevel = VULKAN_HPP_NAMESPACE::OpticalFlowPerformanceLevelNV::eUnknown;
+    VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreateFlagsNV flags            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpticalFlowSessionCreateInfoNV>
-  {
-    using Type = OpticalFlowSessionCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpticalFlowSessionCreateInfoNV>
   {
     using Type = OpticalFlowSessionCreateInfoNV;
   };
 
-  // wrapper struct for struct VkOpticalFlowSessionCreatePrivateDataInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkOpticalFlowSessionCreatePrivateDataInfoNV.html
   struct OpticalFlowSessionCreatePrivateDataInfoNV
   {
     using NativeType = VkOpticalFlowSessionCreatePrivateDataInfoNV;
@@ -74836,15 +54744,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR OpticalFlowSessionCreatePrivateDataInfoNV( uint32_t     id_           = {},
                                                                     uint32_t     size_         = {},
                                                                     const void * pPrivateData_ = {},
                                                                     void *       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , id{ id_ }
-      , size{ size_ }
-      , pPrivateData{ pPrivateData_ }
+      : pNext( pNext_ )
+      , id( id_ )
+      , size( size_ )
+      , pPrivateData( pPrivateData_ )
     {
     }
 
@@ -74856,15 +54764,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OpticalFlowSessionCreatePrivateDataInfoNV & operator=( OpticalFlowSessionCreatePrivateDataInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OpticalFlowSessionCreatePrivateDataInfoNV & operator=( VkOpticalFlowSessionCreatePrivateDataInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OpticalFlowSessionCreatePrivateDataInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OpticalFlowSessionCreatePrivateDataInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OpticalFlowSessionCreatePrivateDataInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -74888,7 +54796,7 @@ namespace VULKAN_HPP_NAMESPACE
       pPrivateData = pPrivateData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOpticalFlowSessionCreatePrivateDataInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -74900,18 +54808,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOpticalFlowSessionCreatePrivateDataInfoNV *>( this );
     }
 
-    operator VkOpticalFlowSessionCreatePrivateDataInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOpticalFlowSessionCreatePrivateDataInfoNV *>( this );
-    }
-
-    operator VkOpticalFlowSessionCreatePrivateDataInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOpticalFlowSessionCreatePrivateDataInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, id, size, pPrivateData );
     }
@@ -74936,28 +54839,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV;
-    void *        pNext        = {};
-    uint32_t      id           = {};
-    uint32_t      size         = {};
-    const void *  pPrivateData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV;
+    void *                              pNext        = {};
+    uint32_t                            id           = {};
+    uint32_t                            size         = {};
+    const void *                        pPrivateData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOpticalFlowSessionCreatePrivateDataInfoNV>
-  {
-    using Type = OpticalFlowSessionCreatePrivateDataInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV>
   {
     using Type = OpticalFlowSessionCreatePrivateDataInfoNV;
   };
 
-  // wrapper struct for struct VkOutOfBandQueueTypeInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkOutOfBandQueueTypeInfoNV.html
   struct OutOfBandQueueTypeInfoNV
   {
     using NativeType = VkOutOfBandQueueTypeInfoNV;
@@ -74965,11 +54859,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eOutOfBandQueueTypeInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR OutOfBandQueueTypeInfoNV( OutOfBandQueueTypeNV queueType_ = OutOfBandQueueTypeNV::eRender,
-                                                   const void *         pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueType{ queueType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR OutOfBandQueueTypeInfoNV( VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV queueType_ = VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV::eRender,
+                                                   const void *                               pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queueType( queueType_ )
     {
     }
 
@@ -74981,27 +54875,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     OutOfBandQueueTypeInfoNV & operator=( OutOfBandQueueTypeInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     OutOfBandQueueTypeInfoNV & operator=( VkOutOfBandQueueTypeInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<OutOfBandQueueTypeInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 OutOfBandQueueTypeInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 OutOfBandQueueTypeInfoNV & setQueueType( OutOfBandQueueTypeNV queueType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 OutOfBandQueueTypeInfoNV & setQueueType( VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV queueType_ ) VULKAN_HPP_NOEXCEPT
     {
       queueType = queueType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkOutOfBandQueueTypeInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -75013,18 +54907,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkOutOfBandQueueTypeInfoNV *>( this );
     }
 
-    operator VkOutOfBandQueueTypeInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkOutOfBandQueueTypeInfoNV *>( this );
-    }
-
-    operator VkOutOfBandQueueTypeInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkOutOfBandQueueTypeInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, OutOfBandQueueTypeNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queueType );
     }
@@ -75049,871 +54938,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType     = StructureType::eOutOfBandQueueTypeInfoNV;
-    const void *         pNext     = {};
-    OutOfBandQueueTypeNV queueType = OutOfBandQueueTypeNV::eRender;
+    VULKAN_HPP_NAMESPACE::StructureType        sType     = StructureType::eOutOfBandQueueTypeInfoNV;
+    const void *                               pNext     = {};
+    VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV queueType = VULKAN_HPP_NAMESPACE::OutOfBandQueueTypeNV::eRender;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkOutOfBandQueueTypeInfoNV>
-  {
-    using Type = OutOfBandQueueTypeInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eOutOfBandQueueTypeInfoNV>
   {
     using Type = OutOfBandQueueTypeInfoNV;
   };
 
-  // wrapper struct for struct VkPartitionedAccelerationStructureFlagsNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureFlagsNV.html
-  struct PartitionedAccelerationStructureFlagsNV
-  {
-    using NativeType = VkPartitionedAccelerationStructureFlagsNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePartitionedAccelerationStructureFlagsNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PartitionedAccelerationStructureFlagsNV( Bool32 enablePartitionTranslation_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , enablePartitionTranslation{ enablePartitionTranslation_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PartitionedAccelerationStructureFlagsNV( PartitionedAccelerationStructureFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PartitionedAccelerationStructureFlagsNV( VkPartitionedAccelerationStructureFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PartitionedAccelerationStructureFlagsNV( *reinterpret_cast<PartitionedAccelerationStructureFlagsNV const *>( &rhs ) )
-    {
-    }
-
-    PartitionedAccelerationStructureFlagsNV & operator=( PartitionedAccelerationStructureFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PartitionedAccelerationStructureFlagsNV & operator=( VkPartitionedAccelerationStructureFlagsNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PartitionedAccelerationStructureFlagsNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureFlagsNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureFlagsNV & setEnablePartitionTranslation( Bool32 enablePartitionTranslation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      enablePartitionTranslation = enablePartitionTranslation_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPartitionedAccelerationStructureFlagsNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPartitionedAccelerationStructureFlagsNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureFlagsNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPartitionedAccelerationStructureFlagsNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureFlagsNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPartitionedAccelerationStructureFlagsNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureFlagsNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPartitionedAccelerationStructureFlagsNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, enablePartitionTranslation );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PartitionedAccelerationStructureFlagsNV const & ) const = default;
-#else
-    bool operator==( PartitionedAccelerationStructureFlagsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( enablePartitionTranslation == rhs.enablePartitionTranslation );
-#  endif
-    }
-
-    bool operator!=( PartitionedAccelerationStructureFlagsNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePartitionedAccelerationStructureFlagsNV;
-    void *        pNext                      = {};
-    Bool32        enablePartitionTranslation = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPartitionedAccelerationStructureFlagsNV>
-  {
-    using Type = PartitionedAccelerationStructureFlagsNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePartitionedAccelerationStructureFlagsNV>
-  {
-    using Type = PartitionedAccelerationStructureFlagsNV;
-  };
-
-  // wrapper struct for struct VkPartitionedAccelerationStructureUpdateInstanceDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureUpdateInstanceDataNV.html
-  struct PartitionedAccelerationStructureUpdateInstanceDataNV
-  {
-    using NativeType = VkPartitionedAccelerationStructureUpdateInstanceDataNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PartitionedAccelerationStructureUpdateInstanceDataNV( uint32_t      instanceIndex_                       = {},
-                                                                               uint32_t      instanceContributionToHitGroupIndex_ = {},
-                                                                               DeviceAddress accelerationStructure_               = {} ) VULKAN_HPP_NOEXCEPT
-      : instanceIndex{ instanceIndex_ }
-      , instanceContributionToHitGroupIndex{ instanceContributionToHitGroupIndex_ }
-      , accelerationStructure{ accelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PartitionedAccelerationStructureUpdateInstanceDataNV( PartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PartitionedAccelerationStructureUpdateInstanceDataNV( VkPartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PartitionedAccelerationStructureUpdateInstanceDataNV( *reinterpret_cast<PartitionedAccelerationStructureUpdateInstanceDataNV const *>( &rhs ) )
-    {
-    }
-
-    PartitionedAccelerationStructureUpdateInstanceDataNV &
-      operator=( PartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PartitionedAccelerationStructureUpdateInstanceDataNV & operator=( VkPartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PartitionedAccelerationStructureUpdateInstanceDataNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureUpdateInstanceDataNV & setInstanceIndex( uint32_t instanceIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceIndex = instanceIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureUpdateInstanceDataNV &
-      setInstanceContributionToHitGroupIndex( uint32_t instanceContributionToHitGroupIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceContributionToHitGroupIndex = instanceContributionToHitGroupIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureUpdateInstanceDataNV &
-      setAccelerationStructure( DeviceAddress accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      accelerationStructure = accelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPartitionedAccelerationStructureUpdateInstanceDataNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPartitionedAccelerationStructureUpdateInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureUpdateInstanceDataNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPartitionedAccelerationStructureUpdateInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureUpdateInstanceDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPartitionedAccelerationStructureUpdateInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureUpdateInstanceDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPartitionedAccelerationStructureUpdateInstanceDataNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, DeviceAddress const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( instanceIndex, instanceContributionToHitGroupIndex, accelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PartitionedAccelerationStructureUpdateInstanceDataNV const & ) const = default;
-#else
-    bool operator==( PartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( instanceIndex == rhs.instanceIndex ) && ( instanceContributionToHitGroupIndex == rhs.instanceContributionToHitGroupIndex ) &&
-             ( accelerationStructure == rhs.accelerationStructure );
-#  endif
-    }
-
-    bool operator!=( PartitionedAccelerationStructureUpdateInstanceDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t      instanceIndex                       = {};
-    uint32_t      instanceContributionToHitGroupIndex = {};
-    DeviceAddress accelerationStructure               = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPartitionedAccelerationStructureUpdateInstanceDataNV>
-  {
-    using Type = PartitionedAccelerationStructureUpdateInstanceDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPartitionedAccelerationStructureWriteInstanceDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureWriteInstanceDataNV.html
-  struct PartitionedAccelerationStructureWriteInstanceDataNV
-  {
-    using NativeType = VkPartitionedAccelerationStructureWriteInstanceDataNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV( TransformMatrixKHR           transform_                           = {},
-                                                                                 std::array<float, 6> const & explicitAABB_                        = {},
-                                                                                 uint32_t                     instanceID_                          = {},
-                                                                                 uint32_t                     instanceMask_                        = {},
-                                                                                 uint32_t                     instanceContributionToHitGroupIndex_ = {},
-                                                                                 PartitionedAccelerationStructureInstanceFlagsNV instanceFlags_    = {},
-                                                                                 uint32_t                                        instanceIndex_    = {},
-                                                                                 uint32_t                                        partitionIndex_   = {},
-                                                                                 DeviceAddress accelerationStructure_ = {} ) VULKAN_HPP_NOEXCEPT
-      : transform{ transform_ }
-      , explicitAABB{ explicitAABB_ }
-      , instanceID{ instanceID_ }
-      , instanceMask{ instanceMask_ }
-      , instanceContributionToHitGroupIndex{ instanceContributionToHitGroupIndex_ }
-      , instanceFlags{ instanceFlags_ }
-      , instanceIndex{ instanceIndex_ }
-      , partitionIndex{ partitionIndex_ }
-      , accelerationStructure{ accelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14
-      PartitionedAccelerationStructureWriteInstanceDataNV( PartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PartitionedAccelerationStructureWriteInstanceDataNV( VkPartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PartitionedAccelerationStructureWriteInstanceDataNV( *reinterpret_cast<PartitionedAccelerationStructureWriteInstanceDataNV const *>( &rhs ) )
-    {
-    }
-
-    PartitionedAccelerationStructureWriteInstanceDataNV &
-      operator=( PartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PartitionedAccelerationStructureWriteInstanceDataNV & operator=( VkPartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PartitionedAccelerationStructureWriteInstanceDataNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setTransform( TransformMatrixKHR const & transform_ ) VULKAN_HPP_NOEXCEPT
-    {
-      transform = transform_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setExplicitAABB( std::array<float, 6> explicitAABB_ ) VULKAN_HPP_NOEXCEPT
-    {
-      explicitAABB = explicitAABB_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setInstanceID( uint32_t instanceID_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceID = instanceID_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setInstanceMask( uint32_t instanceMask_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceMask = instanceMask_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV &
-      setInstanceContributionToHitGroupIndex( uint32_t instanceContributionToHitGroupIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceContributionToHitGroupIndex = instanceContributionToHitGroupIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV &
-      setInstanceFlags( PartitionedAccelerationStructureInstanceFlagsNV instanceFlags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceFlags = instanceFlags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setInstanceIndex( uint32_t instanceIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      instanceIndex = instanceIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV & setPartitionIndex( uint32_t partitionIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      partitionIndex = partitionIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWriteInstanceDataNV &
-      setAccelerationStructure( DeviceAddress accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      accelerationStructure = accelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPartitionedAccelerationStructureWriteInstanceDataNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPartitionedAccelerationStructureWriteInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWriteInstanceDataNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPartitionedAccelerationStructureWriteInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWriteInstanceDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPartitionedAccelerationStructureWriteInstanceDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWriteInstanceDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPartitionedAccelerationStructureWriteInstanceDataNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<TransformMatrixKHR const &,
-               ArrayWrapper1D<float, 6> const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               PartitionedAccelerationStructureInstanceFlagsNV const &,
-               uint32_t const &,
-               uint32_t const &,
-               DeviceAddress const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( transform,
-                       explicitAABB,
-                       instanceID,
-                       instanceMask,
-                       instanceContributionToHitGroupIndex,
-                       instanceFlags,
-                       instanceIndex,
-                       partitionIndex,
-                       accelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PartitionedAccelerationStructureWriteInstanceDataNV const & ) const = default;
-#else
-    bool operator==( PartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( transform == rhs.transform ) && ( explicitAABB == rhs.explicitAABB ) && ( instanceID == rhs.instanceID ) &&
-             ( instanceMask == rhs.instanceMask ) && ( instanceContributionToHitGroupIndex == rhs.instanceContributionToHitGroupIndex ) &&
-             ( instanceFlags == rhs.instanceFlags ) && ( instanceIndex == rhs.instanceIndex ) && ( partitionIndex == rhs.partitionIndex ) &&
-             ( accelerationStructure == rhs.accelerationStructure );
-#  endif
-    }
-
-    bool operator!=( PartitionedAccelerationStructureWriteInstanceDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    TransformMatrixKHR                              transform                           = {};
-    ArrayWrapper1D<float, 6>                        explicitAABB                        = {};
-    uint32_t                                        instanceID                          = {};
-    uint32_t                                        instanceMask                        = {};
-    uint32_t                                        instanceContributionToHitGroupIndex = {};
-    PartitionedAccelerationStructureInstanceFlagsNV instanceFlags                       = {};
-    uint32_t                                        instanceIndex                       = {};
-    uint32_t                                        partitionIndex                      = {};
-    DeviceAddress                                   accelerationStructure               = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPartitionedAccelerationStructureWriteInstanceDataNV>
-  {
-    using Type = PartitionedAccelerationStructureWriteInstanceDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPartitionedAccelerationStructureWritePartitionTranslationDataNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPartitionedAccelerationStructureWritePartitionTranslationDataNV.html
-  struct PartitionedAccelerationStructureWritePartitionTranslationDataNV
-  {
-    using NativeType = VkPartitionedAccelerationStructureWritePartitionTranslationDataNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      PartitionedAccelerationStructureWritePartitionTranslationDataNV( uint32_t                     partitionIndex_       = {},
-                                                                       std::array<float, 3> const & partitionTranslation_ = {} ) VULKAN_HPP_NOEXCEPT
-      : partitionIndex{ partitionIndex_ }
-      , partitionTranslation{ partitionTranslation_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWritePartitionTranslationDataNV(
-      PartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PartitionedAccelerationStructureWritePartitionTranslationDataNV( VkPartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs )
-      VULKAN_HPP_NOEXCEPT
-      : PartitionedAccelerationStructureWritePartitionTranslationDataNV(
-          *reinterpret_cast<PartitionedAccelerationStructureWritePartitionTranslationDataNV const *>( &rhs ) )
-    {
-    }
-
-    PartitionedAccelerationStructureWritePartitionTranslationDataNV &
-      operator=( PartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PartitionedAccelerationStructureWritePartitionTranslationDataNV &
-      operator=( VkPartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PartitionedAccelerationStructureWritePartitionTranslationDataNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWritePartitionTranslationDataNV & setPartitionIndex( uint32_t partitionIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      partitionIndex = partitionIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PartitionedAccelerationStructureWritePartitionTranslationDataNV &
-      setPartitionTranslation( std::array<float, 3> partitionTranslation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      partitionTranslation = partitionTranslation_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPartitionedAccelerationStructureWritePartitionTranslationDataNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPartitionedAccelerationStructureWritePartitionTranslationDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWritePartitionTranslationDataNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPartitionedAccelerationStructureWritePartitionTranslationDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWritePartitionTranslationDataNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPartitionedAccelerationStructureWritePartitionTranslationDataNV *>( this );
-    }
-
-    operator VkPartitionedAccelerationStructureWritePartitionTranslationDataNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPartitionedAccelerationStructureWritePartitionTranslationDataNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, ArrayWrapper1D<float, 3> const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( partitionIndex, partitionTranslation );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PartitionedAccelerationStructureWritePartitionTranslationDataNV const & ) const = default;
-#else
-    bool operator==( PartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( partitionIndex == rhs.partitionIndex ) && ( partitionTranslation == rhs.partitionTranslation );
-#  endif
-    }
-
-    bool operator!=( PartitionedAccelerationStructureWritePartitionTranslationDataNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t                 partitionIndex       = {};
-    ArrayWrapper1D<float, 3> partitionTranslation = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPartitionedAccelerationStructureWritePartitionTranslationDataNV>
-  {
-    using Type = PartitionedAccelerationStructureWritePartitionTranslationDataNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPresentStageTimeEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentStageTimeEXT.html
-  struct PresentStageTimeEXT
-  {
-    using NativeType = VkPresentStageTimeEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentStageTimeEXT( PresentStageFlagsEXT stage_ = {}, uint64_t time_ = {} ) VULKAN_HPP_NOEXCEPT
-      : stage{ stage_ }
-      , time{ time_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentStageTimeEXT( PresentStageTimeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentStageTimeEXT( VkPresentStageTimeEXT const & rhs ) VULKAN_HPP_NOEXCEPT : PresentStageTimeEXT( *reinterpret_cast<PresentStageTimeEXT const *>( &rhs ) )
-    {
-    }
-
-    PresentStageTimeEXT & operator=( PresentStageTimeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentStageTimeEXT & operator=( VkPresentStageTimeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentStageTimeEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setStage( PresentStageFlagsEXT stage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stage = stage_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setTime( uint64_t time_ ) VULKAN_HPP_NOEXCEPT
-    {
-      time = time_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentStageTimeEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentStageTimeEXT *>( this );
-    }
-
-    operator VkPresentStageTimeEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentStageTimeEXT *>( this );
-    }
-
-    operator VkPresentStageTimeEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentStageTimeEXT *>( this );
-    }
-
-    operator VkPresentStageTimeEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentStageTimeEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PresentStageFlagsEXT const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( stage, time );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentStageTimeEXT const & ) const = default;
-#else
-    bool operator==( PresentStageTimeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( stage == rhs.stage ) && ( time == rhs.time );
-#  endif
-    }
-
-    bool operator!=( PresentStageTimeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    PresentStageFlagsEXT stage = {};
-    uint64_t             time  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentStageTimeEXT>
-  {
-    using Type = PresentStageTimeEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkPastPresentationTimingEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingEXT.html
-  struct PastPresentationTimingEXT
-  {
-    using NativeType = VkPastPresentationTimingEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePastPresentationTimingEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingEXT( uint64_t              presentId_         = {},
-                                                    uint64_t              targetTime_        = {},
-                                                    uint32_t              presentStageCount_ = {},
-                                                    PresentStageTimeEXT * pPresentStages_    = {},
-                                                    TimeDomainKHR         timeDomain_        = TimeDomainKHR::eDevice,
-                                                    uint64_t              timeDomainId_      = {},
-                                                    Bool32                reportComplete_    = {},
-                                                    void *                pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentId{ presentId_ }
-      , targetTime{ targetTime_ }
-      , presentStageCount{ presentStageCount_ }
-      , pPresentStages{ pPresentStages_ }
-      , timeDomain{ timeDomain_ }
-      , timeDomainId{ timeDomainId_ }
-      , reportComplete{ reportComplete_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingEXT( PastPresentationTimingEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PastPresentationTimingEXT( VkPastPresentationTimingEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PastPresentationTimingEXT( *reinterpret_cast<PastPresentationTimingEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PastPresentationTimingEXT( uint64_t                                             presentId_,
-                               uint64_t                                             targetTime_,
-                               ArrayProxyNoTemporaries<PresentStageTimeEXT> const & presentStages_,
-                               TimeDomainKHR                                        timeDomain_     = TimeDomainKHR::eDevice,
-                               uint64_t                                             timeDomainId_   = {},
-                               Bool32                                               reportComplete_ = {},
-                               void *                                               pNext_          = nullptr )
-      : pNext( pNext_ )
-      , presentId( presentId_ )
-      , targetTime( targetTime_ )
-      , presentStageCount( static_cast<uint32_t>( presentStages_.size() ) )
-      , pPresentStages( presentStages_.data() )
-      , timeDomain( timeDomain_ )
-      , timeDomainId( timeDomainId_ )
-      , reportComplete( reportComplete_ )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PastPresentationTimingEXT & operator=( PastPresentationTimingEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PastPresentationTimingEXT & operator=( VkPastPresentationTimingEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PastPresentationTimingEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentId( uint64_t presentId_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentId = presentId_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTargetTime( uint64_t targetTime_ ) VULKAN_HPP_NOEXCEPT
-    {
-      targetTime = targetTime_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentStageCount( uint32_t presentStageCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentStageCount = presentStageCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPPresentStages( PresentStageTimeEXT * pPresentStages_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPresentStages = pPresentStages_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PastPresentationTimingEXT & setPresentStages( ArrayProxyNoTemporaries<PresentStageTimeEXT> const & presentStages_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentStageCount = static_cast<uint32_t>( presentStages_.size() );
-      pPresentStages    = presentStages_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomain( TimeDomainKHR timeDomain_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomain = timeDomain_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainId = timeDomainId_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setReportComplete( Bool32 reportComplete_ ) VULKAN_HPP_NOEXCEPT
-    {
-      reportComplete = reportComplete_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPastPresentationTimingEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPastPresentationTimingEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPastPresentationTimingEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPastPresentationTimingEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPastPresentationTimingEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint64_t const &,
-               uint64_t const &,
-               uint32_t const &,
-               PresentStageTimeEXT * const &,
-               TimeDomainKHR const &,
-               uint64_t const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentId, targetTime, presentStageCount, pPresentStages, timeDomain, timeDomainId, reportComplete );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PastPresentationTimingEXT const & ) const = default;
-#else
-    bool operator==( PastPresentationTimingEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentId == rhs.presentId ) && ( targetTime == rhs.targetTime ) &&
-             ( presentStageCount == rhs.presentStageCount ) && ( pPresentStages == rhs.pPresentStages ) && ( timeDomain == rhs.timeDomain ) &&
-             ( timeDomainId == rhs.timeDomainId ) && ( reportComplete == rhs.reportComplete );
-#  endif
-    }
-
-    bool operator!=( PastPresentationTimingEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType         sType             = StructureType::ePastPresentationTimingEXT;
-    void *                pNext             = {};
-    uint64_t              presentId         = {};
-    uint64_t              targetTime        = {};
-    uint32_t              presentStageCount = {};
-    PresentStageTimeEXT * pPresentStages    = {};
-    TimeDomainKHR         timeDomain        = TimeDomainKHR::eDevice;
-    uint64_t              timeDomainId      = {};
-    Bool32                reportComplete    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPastPresentationTimingEXT>
-  {
-    using Type = PastPresentationTimingEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePastPresentationTimingEXT>
-  {
-    using Type = PastPresentationTimingEXT;
-  };
-
-  // wrapper struct for struct VkPastPresentationTimingGOOGLE, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingGOOGLE.html
   struct PastPresentationTimingGOOGLE
   {
     using NativeType = VkPastPresentationTimingGOOGLE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PastPresentationTimingGOOGLE( uint32_t presentID_           = {},
                                                        uint64_t desiredPresentTime_  = {},
                                                        uint64_t actualPresentTime_   = {},
                                                        uint64_t earliestPresentTime_ = {},
                                                        uint64_t presentMargin_       = {} ) VULKAN_HPP_NOEXCEPT
-      : presentID{ presentID_ }
-      , desiredPresentTime{ desiredPresentTime_ }
-      , actualPresentTime{ actualPresentTime_ }
-      , earliestPresentTime{ earliestPresentTime_ }
-      , presentMargin{ presentMargin_ }
+      : presentID( presentID_ )
+      , desiredPresentTime( desiredPresentTime_ )
+      , actualPresentTime( actualPresentTime_ )
+      , earliestPresentTime( earliestPresentTime_ )
+      , presentMargin( presentMargin_ )
     {
     }
 
@@ -75925,11 +54975,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PastPresentationTimingGOOGLE & operator=( PastPresentationTimingGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PastPresentationTimingGOOGLE & operator=( VkPastPresentationTimingGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PastPresentationTimingGOOGLE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PastPresentationTimingGOOGLE const *>( &rhs );
       return *this;
     }
 
@@ -75943,18 +54993,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPastPresentationTimingGOOGLE *>( this );
     }
 
-    operator VkPastPresentationTimingGOOGLE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPastPresentationTimingGOOGLE *>( this );
-    }
-
-    operator VkPastPresentationTimingGOOGLE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPastPresentationTimingGOOGLE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint64_t const &, uint64_t const &, uint64_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint64_t const &, uint64_t const &, uint64_t const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( presentID, desiredPresentTime, actualPresentTime, earliestPresentTime, presentMargin );
     }
@@ -75987,499 +55032,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint64_t presentMargin       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPastPresentationTimingGOOGLE>
-  {
-    using Type = PastPresentationTimingGOOGLE;
-  };
-#endif
-
-  // wrapper struct for struct VkPastPresentationTimingInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingInfoEXT.html
-  struct PastPresentationTimingInfoEXT
-  {
-    using NativeType = VkPastPresentationTimingInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePastPresentationTimingInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingInfoEXT( PastPresentationTimingFlagsEXT flags_     = {},
-                                                        SwapchainKHR                   swapchain_ = {},
-                                                        const void *                   pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , swapchain{ swapchain_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingInfoEXT( PastPresentationTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PastPresentationTimingInfoEXT( VkPastPresentationTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PastPresentationTimingInfoEXT( *reinterpret_cast<PastPresentationTimingInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    PastPresentationTimingInfoEXT & operator=( PastPresentationTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PastPresentationTimingInfoEXT & operator=( VkPastPresentationTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PastPresentationTimingInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setFlags( PastPresentationTimingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchain = swapchain_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPastPresentationTimingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPastPresentationTimingInfoEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPastPresentationTimingInfoEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPastPresentationTimingInfoEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPastPresentationTimingInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PastPresentationTimingFlagsEXT const &, SwapchainKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, swapchain );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PastPresentationTimingInfoEXT const & ) const = default;
-#else
-    bool operator==( PastPresentationTimingInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( swapchain == rhs.swapchain );
-#  endif
-    }
-
-    bool operator!=( PastPresentationTimingInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType     = StructureType::ePastPresentationTimingInfoEXT;
-    const void *                   pNext     = {};
-    PastPresentationTimingFlagsEXT flags     = {};
-    SwapchainKHR                   swapchain = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPastPresentationTimingInfoEXT>
-  {
-    using Type = PastPresentationTimingInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePastPresentationTimingInfoEXT>
-  {
-    using Type = PastPresentationTimingInfoEXT;
-  };
-
-  // wrapper struct for struct VkPastPresentationTimingPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPastPresentationTimingPropertiesEXT.html
-  struct PastPresentationTimingPropertiesEXT
-  {
-    using NativeType = VkPastPresentationTimingPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePastPresentationTimingPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingPropertiesEXT( uint64_t                    timingPropertiesCounter_ = {},
-                                                              uint64_t                    timeDomainsCounter_      = {},
-                                                              uint32_t                    presentationTimingCount_ = {},
-                                                              PastPresentationTimingEXT * pPresentationTimings_    = {},
-                                                              void *                      pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , timingPropertiesCounter{ timingPropertiesCounter_ }
-      , timeDomainsCounter{ timeDomainsCounter_ }
-      , presentationTimingCount{ presentationTimingCount_ }
-      , pPresentationTimings{ pPresentationTimings_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PastPresentationTimingPropertiesEXT( PastPresentationTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PastPresentationTimingPropertiesEXT( VkPastPresentationTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PastPresentationTimingPropertiesEXT( *reinterpret_cast<PastPresentationTimingPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PastPresentationTimingPropertiesEXT( uint64_t                                                   timingPropertiesCounter_,
-                                         uint64_t                                                   timeDomainsCounter_,
-                                         ArrayProxyNoTemporaries<PastPresentationTimingEXT> const & presentationTimings_,
-                                         void *                                                     pNext_ = nullptr )
-      : pNext( pNext_ )
-      , timingPropertiesCounter( timingPropertiesCounter_ )
-      , timeDomainsCounter( timeDomainsCounter_ )
-      , presentationTimingCount( static_cast<uint32_t>( presentationTimings_.size() ) )
-      , pPresentationTimings( presentationTimings_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PastPresentationTimingPropertiesEXT & operator=( PastPresentationTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PastPresentationTimingPropertiesEXT & operator=( VkPastPresentationTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PastPresentationTimingPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimingPropertiesCounter( uint64_t timingPropertiesCounter_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timingPropertiesCounter = timingPropertiesCounter_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimeDomainsCounter( uint64_t timeDomainsCounter_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainsCounter = timeDomainsCounter_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPresentationTimingCount( uint32_t presentationTimingCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentationTimingCount = presentationTimingCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT &
-      setPPresentationTimings( PastPresentationTimingEXT * pPresentationTimings_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPresentationTimings = pPresentationTimings_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PastPresentationTimingPropertiesEXT &
-      setPresentationTimings( ArrayProxyNoTemporaries<PastPresentationTimingEXT> const & presentationTimings_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentationTimingCount = static_cast<uint32_t>( presentationTimings_.size() );
-      pPresentationTimings    = presentationTimings_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPastPresentationTimingPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPastPresentationTimingPropertiesEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPastPresentationTimingPropertiesEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPastPresentationTimingPropertiesEXT *>( this );
-    }
-
-    operator VkPastPresentationTimingPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPastPresentationTimingPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &, uint64_t const &, uint32_t const &, PastPresentationTimingEXT * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, timingPropertiesCounter, timeDomainsCounter, presentationTimingCount, pPresentationTimings );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PastPresentationTimingPropertiesEXT const & ) const = default;
-#else
-    bool operator==( PastPresentationTimingPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( timingPropertiesCounter == rhs.timingPropertiesCounter ) &&
-             ( timeDomainsCounter == rhs.timeDomainsCounter ) && ( presentationTimingCount == rhs.presentationTimingCount ) &&
-             ( pPresentationTimings == rhs.pPresentationTimings );
-#  endif
-    }
-
-    bool operator!=( PastPresentationTimingPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType               sType                   = StructureType::ePastPresentationTimingPropertiesEXT;
-    void *                      pNext                   = {};
-    uint64_t                    timingPropertiesCounter = {};
-    uint64_t                    timeDomainsCounter      = {};
-    uint32_t                    presentationTimingCount = {};
-    PastPresentationTimingEXT * pPresentationTimings    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPastPresentationTimingPropertiesEXT>
-  {
-    using Type = PastPresentationTimingPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePastPresentationTimingPropertiesEXT>
-  {
-    using Type = PastPresentationTimingPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkPerTileBeginInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerTileBeginInfoQCOM.html
-  struct PerTileBeginInfoQCOM
-  {
-    using NativeType = VkPerTileBeginInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerTileBeginInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PerTileBeginInfoQCOM( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR PerTileBeginInfoQCOM( PerTileBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PerTileBeginInfoQCOM( VkPerTileBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PerTileBeginInfoQCOM( *reinterpret_cast<PerTileBeginInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    PerTileBeginInfoQCOM & operator=( PerTileBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PerTileBeginInfoQCOM & operator=( VkPerTileBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PerTileBeginInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PerTileBeginInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPerTileBeginInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPerTileBeginInfoQCOM *>( this );
-    }
-
-    operator VkPerTileBeginInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPerTileBeginInfoQCOM *>( this );
-    }
-
-    operator VkPerTileBeginInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerTileBeginInfoQCOM *>( this );
-    }
-
-    operator VkPerTileBeginInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerTileBeginInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PerTileBeginInfoQCOM const & ) const = default;
-#else
-    bool operator==( PerTileBeginInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( PerTileBeginInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::ePerTileBeginInfoQCOM;
-    const void *  pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerTileBeginInfoQCOM>
-  {
-    using Type = PerTileBeginInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePerTileBeginInfoQCOM>
-  {
-    using Type = PerTileBeginInfoQCOM;
-  };
-
-  // wrapper struct for struct VkPerTileEndInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerTileEndInfoQCOM.html
-  struct PerTileEndInfoQCOM
-  {
-    using NativeType = VkPerTileEndInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerTileEndInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PerTileEndInfoQCOM( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR PerTileEndInfoQCOM( PerTileEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PerTileEndInfoQCOM( VkPerTileEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT : PerTileEndInfoQCOM( *reinterpret_cast<PerTileEndInfoQCOM const *>( &rhs ) ) {}
-
-    PerTileEndInfoQCOM & operator=( PerTileEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PerTileEndInfoQCOM & operator=( VkPerTileEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PerTileEndInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PerTileEndInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPerTileEndInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPerTileEndInfoQCOM *>( this );
-    }
-
-    operator VkPerTileEndInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPerTileEndInfoQCOM *>( this );
-    }
-
-    operator VkPerTileEndInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerTileEndInfoQCOM *>( this );
-    }
-
-    operator VkPerTileEndInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerTileEndInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PerTileEndInfoQCOM const & ) const = default;
-#else
-    bool operator==( PerTileEndInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( PerTileEndInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::ePerTileEndInfoQCOM;
-    const void *  pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerTileEndInfoQCOM>
-  {
-    using Type = PerTileEndInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePerTileEndInfoQCOM>
-  {
-    using Type = PerTileEndInfoQCOM;
-  };
-
-  // wrapper struct for struct VkPerformanceConfigurationAcquireInfoINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceConfigurationAcquireInfoINTEL.html
   struct PerformanceConfigurationAcquireInfoINTEL
   {
     using NativeType = VkPerformanceConfigurationAcquireInfoINTEL;
@@ -76487,12 +55039,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceConfigurationAcquireInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PerformanceConfigurationAcquireInfoINTEL(
-      PerformanceConfigurationTypeINTEL type_  = PerformanceConfigurationTypeINTEL::eCommandQueueMetricsDiscoveryActivated,
-      const void *                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PerformanceConfigurationAcquireInfoINTEL( VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL type_ =
+                                                  VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL::eCommandQueueMetricsDiscoveryActivated,
+                                                const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
     {
     }
 
@@ -76504,27 +55057,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceConfigurationAcquireInfoINTEL & operator=( PerformanceConfigurationAcquireInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceConfigurationAcquireInfoINTEL & operator=( VkPerformanceConfigurationAcquireInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceConfigurationAcquireInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceConfigurationAcquireInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceConfigurationAcquireInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PerformanceConfigurationAcquireInfoINTEL & setType( PerformanceConfigurationTypeINTEL type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PerformanceConfigurationAcquireInfoINTEL &
+      setType( VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPerformanceConfigurationAcquireInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -76536,18 +55090,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceConfigurationAcquireInfoINTEL *>( this );
     }
 
-    operator VkPerformanceConfigurationAcquireInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceConfigurationAcquireInfoINTEL *>( this );
-    }
-
-    operator VkPerformanceConfigurationAcquireInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceConfigurationAcquireInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PerformanceConfigurationTypeINTEL const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type );
     }
@@ -76572,233 +55121,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType = StructureType::ePerformanceConfigurationAcquireInfoINTEL;
-    const void *                      pNext = {};
-    PerformanceConfigurationTypeINTEL type  = PerformanceConfigurationTypeINTEL::eCommandQueueMetricsDiscoveryActivated;
+    VULKAN_HPP_NAMESPACE::StructureType                     sType = StructureType::ePerformanceConfigurationAcquireInfoINTEL;
+    const void *                                            pNext = {};
+    VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL type =
+      VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL::eCommandQueueMetricsDiscoveryActivated;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceConfigurationAcquireInfoINTEL>
-  {
-    using Type = PerformanceConfigurationAcquireInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceConfigurationAcquireInfoINTEL>
   {
     using Type = PerformanceConfigurationAcquireInfoINTEL;
   };
 
-  // wrapper struct for struct VkPerformanceCounterARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterARM.html
-  struct PerformanceCounterARM
-  {
-    using NativeType = VkPerformanceCounterARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceCounterARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PerformanceCounterARM( uint32_t counterID_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , counterID{ counterID_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PerformanceCounterARM( PerformanceCounterARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PerformanceCounterARM( VkPerformanceCounterARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PerformanceCounterARM( *reinterpret_cast<PerformanceCounterARM const *>( &rhs ) )
-    {
-    }
-
-    PerformanceCounterARM & operator=( PerformanceCounterARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PerformanceCounterARM & operator=( VkPerformanceCounterARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PerformanceCounterARM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPerformanceCounterARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPerformanceCounterARM *>( this );
-    }
-
-    operator VkPerformanceCounterARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPerformanceCounterARM *>( this );
-    }
-
-    operator VkPerformanceCounterARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceCounterARM *>( this );
-    }
-
-    operator VkPerformanceCounterARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceCounterARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, counterID );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PerformanceCounterARM const & ) const = default;
-#else
-    bool operator==( PerformanceCounterARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( counterID == rhs.counterID );
-#  endif
-    }
-
-    bool operator!=( PerformanceCounterARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType     = StructureType::ePerformanceCounterARM;
-    void *        pNext     = {};
-    uint32_t      counterID = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceCounterARM>
-  {
-    using Type = PerformanceCounterARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePerformanceCounterARM>
-  {
-    using Type = PerformanceCounterARM;
-  };
-
-  // wrapper struct for struct VkPerformanceCounterDescriptionARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterDescriptionARM.html
-  struct PerformanceCounterDescriptionARM
-  {
-    using NativeType = VkPerformanceCounterDescriptionARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceCounterDescriptionARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PerformanceCounterDescriptionARM( PerformanceCounterDescriptionFlagsARM             flags_ = {},
-                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & name_  = {},
-                                                              void *                                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , name{ name_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PerformanceCounterDescriptionARM( PerformanceCounterDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PerformanceCounterDescriptionARM( VkPerformanceCounterDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PerformanceCounterDescriptionARM( *reinterpret_cast<PerformanceCounterDescriptionARM const *>( &rhs ) )
-    {
-    }
-
-    PerformanceCounterDescriptionARM & operator=( PerformanceCounterDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PerformanceCounterDescriptionARM & operator=( VkPerformanceCounterDescriptionARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PerformanceCounterDescriptionARM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPerformanceCounterDescriptionARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPerformanceCounterDescriptionARM *>( this );
-    }
-
-    operator VkPerformanceCounterDescriptionARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPerformanceCounterDescriptionARM *>( this );
-    }
-
-    operator VkPerformanceCounterDescriptionARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceCounterDescriptionARM *>( this );
-    }
-
-    operator VkPerformanceCounterDescriptionARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceCounterDescriptionARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PerformanceCounterDescriptionFlagsARM const &, ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, name );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( PerformanceCounterDescriptionARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = flags <=> rhs.flags; cmp != 0 )
-        return cmp;
-      if ( auto cmp = strcmp( name, rhs.name ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( PerformanceCounterDescriptionARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( strcmp( name, rhs.name ) == 0 );
-    }
-
-    bool operator!=( PerformanceCounterDescriptionARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType                                 sType = StructureType::ePerformanceCounterDescriptionARM;
-    void *                                        pNext = {};
-    PerformanceCounterDescriptionFlagsARM         flags = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceCounterDescriptionARM>
-  {
-    using Type = PerformanceCounterDescriptionARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePerformanceCounterDescriptionARM>
-  {
-    using Type = PerformanceCounterDescriptionARM;
-  };
-
-  // wrapper struct for struct VkPerformanceCounterDescriptionKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterDescriptionKHR.html
   struct PerformanceCounterDescriptionKHR
   {
     using NativeType = VkPerformanceCounterDescriptionKHR;
@@ -76806,17 +55140,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceCounterDescriptionKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PerformanceCounterDescriptionKHR( PerformanceCounterDescriptionFlagsKHR             flags_       = {},
-                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & name_        = {},
-                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & category_    = {},
-                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_ = {},
-                                                              void *                                            pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , name{ name_ }
-      , category{ category_ }
-      , description{ description_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PerformanceCounterDescriptionKHR( VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagsKHR flags_       = {},
+                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const &           name_        = {},
+                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const &           category_    = {},
+                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const &           description_ = {},
+                                                              void *                                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , name( name_ )
+      , category( category_ )
+      , description( description_ )
     {
     }
 
@@ -76827,12 +55161,43 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PerformanceCounterDescriptionKHR( VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagsKHR flags_,
+                                      std::string const &                                         name_,
+                                      std::string const &                                         category_    = {},
+                                      std::string const &                                         description_ = {},
+                                      void *                                                      pNext_       = nullptr )
+      : pNext( pNext_ ), flags( flags_ )
+    {
+      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( name, VK_MAX_DESCRIPTION_SIZE, name_.data(), name_.size() );
+#    else
+      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, name_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( category_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( category, VK_MAX_DESCRIPTION_SIZE, category_.data(), category_.size() );
+#    else
+      strncpy( category, category_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, category_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PerformanceCounterDescriptionKHR & operator=( PerformanceCounterDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceCounterDescriptionKHR & operator=( VkPerformanceCounterDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceCounterDescriptionKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionKHR const *>( &rhs );
       return *this;
     }
 
@@ -76846,23 +55211,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceCounterDescriptionKHR *>( this );
     }
 
-    operator VkPerformanceCounterDescriptionKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceCounterDescriptionKHR *>( this );
-    }
-
-    operator VkPerformanceCounterDescriptionKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceCounterDescriptionKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               PerformanceCounterDescriptionFlagsKHR const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &>
+               VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, name, category, description );
@@ -76901,29 +55260,20 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType       = StructureType::ePerformanceCounterDescriptionKHR;
-    void *                                        pNext       = {};
-    PerformanceCounterDescriptionFlagsKHR         flags       = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> category    = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType       = StructureType::ePerformanceCounterDescriptionKHR;
+    void *                                                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::PerformanceCounterDescriptionFlagsKHR         flags       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> category    = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceCounterDescriptionKHR>
-  {
-    using Type = PerformanceCounterDescriptionKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceCounterDescriptionKHR>
   {
     using Type = PerformanceCounterDescriptionKHR;
   };
 
-  // wrapper struct for struct VkPerformanceCounterKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceCounterKHR.html
   struct PerformanceCounterKHR
   {
     using NativeType = VkPerformanceCounterKHR;
@@ -76931,17 +55281,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceCounterKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PerformanceCounterKHR( PerformanceCounterUnitKHR                 unit_    = PerformanceCounterUnitKHR::eGeneric,
-                                                   PerformanceCounterScopeKHR                scope_   = PerformanceCounterScopeKHR::eCommandBuffer,
-                                                   PerformanceCounterStorageKHR              storage_ = PerformanceCounterStorageKHR::eInt32,
-                                                   std::array<uint8_t, VK_UUID_SIZE> const & uuid_    = {},
-                                                   void *                                    pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , unit{ unit_ }
-      , scope{ scope_ }
-      , storage{ storage_ }
-      , uuid{ uuid_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      PerformanceCounterKHR( VULKAN_HPP_NAMESPACE::PerformanceCounterUnitKHR    unit_    = VULKAN_HPP_NAMESPACE::PerformanceCounterUnitKHR::eGeneric,
+                             VULKAN_HPP_NAMESPACE::PerformanceCounterScopeKHR   scope_   = VULKAN_HPP_NAMESPACE::PerformanceCounterScopeKHR::eCommandBuffer,
+                             VULKAN_HPP_NAMESPACE::PerformanceCounterStorageKHR storage_ = VULKAN_HPP_NAMESPACE::PerformanceCounterStorageKHR::eInt32,
+                             std::array<uint8_t, VK_UUID_SIZE> const &          uuid_    = {},
+                             void *                                             pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , unit( unit_ )
+      , scope( scope_ )
+      , storage( storage_ )
+      , uuid( uuid_ )
     {
     }
 
@@ -76953,11 +55304,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceCounterKHR & operator=( PerformanceCounterKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceCounterKHR & operator=( VkPerformanceCounterKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceCounterKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceCounterKHR const *>( &rhs );
       return *this;
     }
 
@@ -76971,23 +55322,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceCounterKHR *>( this );
     }
 
-    operator VkPerformanceCounterKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceCounterKHR *>( this );
-    }
-
-    operator VkPerformanceCounterKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceCounterKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               PerformanceCounterUnitKHR const &,
-               PerformanceCounterScopeKHR const &,
-               PerformanceCounterStorageKHR const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+               VULKAN_HPP_NAMESPACE::PerformanceCounterUnitKHR const &,
+               VULKAN_HPP_NAMESPACE::PerformanceCounterScopeKHR const &,
+               VULKAN_HPP_NAMESPACE::PerformanceCounterStorageKHR const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, unit, scope, storage, uuid );
@@ -77014,22 +55359,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType   = StructureType::ePerformanceCounterKHR;
-    void *                                pNext   = {};
-    PerformanceCounterUnitKHR             unit    = PerformanceCounterUnitKHR::eGeneric;
-    PerformanceCounterScopeKHR            scope   = PerformanceCounterScopeKHR::eCommandBuffer;
-    PerformanceCounterStorageKHR          storage = PerformanceCounterStorageKHR::eInt32;
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> uuid    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType   = StructureType::ePerformanceCounterKHR;
+    void *                                                      pNext   = {};
+    VULKAN_HPP_NAMESPACE::PerformanceCounterUnitKHR             unit    = VULKAN_HPP_NAMESPACE::PerformanceCounterUnitKHR::eGeneric;
+    VULKAN_HPP_NAMESPACE::PerformanceCounterScopeKHR            scope   = VULKAN_HPP_NAMESPACE::PerformanceCounterScopeKHR::eCommandBuffer;
+    VULKAN_HPP_NAMESPACE::PerformanceCounterStorageKHR          storage = VULKAN_HPP_NAMESPACE::PerformanceCounterStorageKHR::eInt32;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> uuid    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceCounterKHR>
-  {
-    using Type = PerformanceCounterKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceCounterKHR>
   {
@@ -77039,7 +55376,7 @@ namespace VULKAN_HPP_NAMESPACE
   union PerformanceCounterResultKHR
   {
     using NativeType = VkPerformanceCounterResultKHR;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
     VULKAN_HPP_CONSTEXPR_14 PerformanceCounterResultKHR( int32_t int32_ = {} ) : int32( int32_ ) {}
 
@@ -77052,9 +55389,9 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_CONSTEXPR_14 PerformanceCounterResultKHR( float float32_ ) : float32( float32_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 PerformanceCounterResultKHR( double float64_ ) : float64( float64_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceCounterResultKHR & setInt32( int32_t int32_ ) VULKAN_HPP_NOEXCEPT
     {
       int32 = int32_;
@@ -77090,7 +55427,7 @@ namespace VULKAN_HPP_NAMESPACE
       float64 = float64_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkPerformanceCounterResultKHR const &() const
     {
@@ -77110,15 +55447,6 @@ namespace VULKAN_HPP_NAMESPACE
     double   float64;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceCounterResultKHR>
-  {
-    using Type = PerformanceCounterResultKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPerformanceMarkerInfoINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceMarkerInfoINTEL.html
   struct PerformanceMarkerInfoINTEL
   {
     using NativeType = VkPerformanceMarkerInfoINTEL;
@@ -77126,10 +55454,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceMarkerInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PerformanceMarkerInfoINTEL( uint64_t marker_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , marker{ marker_ }
+      : pNext( pNext_ )
+      , marker( marker_ )
     {
     }
 
@@ -77141,15 +55469,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceMarkerInfoINTEL & operator=( PerformanceMarkerInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceMarkerInfoINTEL & operator=( VkPerformanceMarkerInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceMarkerInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceMarkerInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceMarkerInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -77161,7 +55489,7 @@ namespace VULKAN_HPP_NAMESPACE
       marker = marker_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPerformanceMarkerInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77173,18 +55501,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceMarkerInfoINTEL *>( this );
     }
 
-    operator VkPerformanceMarkerInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceMarkerInfoINTEL *>( this );
-    }
-
-    operator VkPerformanceMarkerInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceMarkerInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, marker );
     }
@@ -77209,26 +55532,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::ePerformanceMarkerInfoINTEL;
-    const void *  pNext  = {};
-    uint64_t      marker = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::ePerformanceMarkerInfoINTEL;
+    const void *                        pNext  = {};
+    uint64_t                            marker = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceMarkerInfoINTEL>
-  {
-    using Type = PerformanceMarkerInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceMarkerInfoINTEL>
   {
     using Type = PerformanceMarkerInfoINTEL;
   };
 
-  // wrapper struct for struct VkPerformanceOverrideInfoINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceOverrideInfoINTEL.html
   struct PerformanceOverrideInfoINTEL
   {
     using NativeType = VkPerformanceOverrideInfoINTEL;
@@ -77236,15 +55550,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceOverrideInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PerformanceOverrideInfoINTEL( PerformanceOverrideTypeINTEL type_      = PerformanceOverrideTypeINTEL::eNullHardware,
-                                                       Bool32                       enable_    = {},
-                                                       uint64_t                     parameter_ = {},
-                                                       const void *                 pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , enable{ enable_ }
-      , parameter{ parameter_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PerformanceOverrideInfoINTEL(
+      VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL type_      = VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL::eNullHardware,
+      VULKAN_HPP_NAMESPACE::Bool32                       enable_    = {},
+      uint64_t                                           parameter_ = {},
+      const void *                                       pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , enable( enable_ )
+      , parameter( parameter_ )
     {
     }
 
@@ -77256,28 +55571,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceOverrideInfoINTEL & operator=( PerformanceOverrideInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceOverrideInfoINTEL & operator=( VkPerformanceOverrideInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceOverrideInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceOverrideInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceOverrideInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PerformanceOverrideInfoINTEL & setType( PerformanceOverrideTypeINTEL type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PerformanceOverrideInfoINTEL & setType( VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PerformanceOverrideInfoINTEL & setEnable( Bool32 enable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PerformanceOverrideInfoINTEL & setEnable( VULKAN_HPP_NAMESPACE::Bool32 enable_ ) VULKAN_HPP_NOEXCEPT
     {
       enable = enable_;
       return *this;
@@ -77288,7 +55603,7 @@ namespace VULKAN_HPP_NAMESPACE
       parameter = parameter_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPerformanceOverrideInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77300,18 +55615,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceOverrideInfoINTEL *>( this );
     }
 
-    operator VkPerformanceOverrideInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceOverrideInfoINTEL *>( this );
-    }
-
-    operator VkPerformanceOverrideInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceOverrideInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PerformanceOverrideTypeINTEL const &, Bool32 const &, uint64_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, enable, parameter );
@@ -77337,29 +55650,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType     = StructureType::ePerformanceOverrideInfoINTEL;
-    const void *                 pNext     = {};
-    PerformanceOverrideTypeINTEL type      = PerformanceOverrideTypeINTEL::eNullHardware;
-    Bool32                       enable    = {};
-    uint64_t                     parameter = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType     = StructureType::ePerformanceOverrideInfoINTEL;
+    const void *                                       pNext     = {};
+    VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL type      = VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL::eNullHardware;
+    VULKAN_HPP_NAMESPACE::Bool32                       enable    = {};
+    uint64_t                                           parameter = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceOverrideInfoINTEL>
-  {
-    using Type = PerformanceOverrideInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceOverrideInfoINTEL>
   {
     using Type = PerformanceOverrideInfoINTEL;
   };
 
-  // wrapper struct for struct VkPerformanceQuerySubmitInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceQuerySubmitInfoKHR.html
   struct PerformanceQuerySubmitInfoKHR
   {
     using NativeType = VkPerformanceQuerySubmitInfoKHR;
@@ -77367,10 +55670,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceQuerySubmitInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PerformanceQuerySubmitInfoKHR( uint32_t counterPassIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , counterPassIndex{ counterPassIndex_ }
+      : pNext( pNext_ )
+      , counterPassIndex( counterPassIndex_ )
     {
     }
 
@@ -77382,15 +55685,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceQuerySubmitInfoKHR & operator=( PerformanceQuerySubmitInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceQuerySubmitInfoKHR & operator=( VkPerformanceQuerySubmitInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceQuerySubmitInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceQuerySubmitInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceQuerySubmitInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -77402,7 +55705,7 @@ namespace VULKAN_HPP_NAMESPACE
       counterPassIndex = counterPassIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPerformanceQuerySubmitInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77414,18 +55717,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceQuerySubmitInfoKHR *>( this );
     }
 
-    operator VkPerformanceQuerySubmitInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceQuerySubmitInfoKHR *>( this );
-    }
-
-    operator VkPerformanceQuerySubmitInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceQuerySubmitInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, counterPassIndex );
     }
@@ -77450,27 +55748,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePerformanceQuerySubmitInfoKHR;
-    const void *  pNext            = {};
-    uint32_t      counterPassIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePerformanceQuerySubmitInfoKHR;
+    const void *                        pNext            = {};
+    uint32_t                            counterPassIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceQuerySubmitInfoKHR>
-  {
-    using Type = PerformanceQuerySubmitInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceQuerySubmitInfoKHR>
   {
     using Type = PerformanceQuerySubmitInfoKHR;
   };
 
-  // wrapper struct for struct VkPerformanceStreamMarkerInfoINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceStreamMarkerInfoINTEL.html
   struct PerformanceStreamMarkerInfoINTEL
   {
     using NativeType = VkPerformanceStreamMarkerInfoINTEL;
@@ -77478,10 +55766,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePerformanceStreamMarkerInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PerformanceStreamMarkerInfoINTEL( uint32_t marker_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , marker{ marker_ }
+      : pNext( pNext_ )
+      , marker( marker_ )
     {
     }
 
@@ -77493,15 +55781,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceStreamMarkerInfoINTEL & operator=( PerformanceStreamMarkerInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceStreamMarkerInfoINTEL & operator=( VkPerformanceStreamMarkerInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceStreamMarkerInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceStreamMarkerInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceStreamMarkerInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -77513,7 +55801,7 @@ namespace VULKAN_HPP_NAMESPACE
       marker = marker_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPerformanceStreamMarkerInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77525,18 +55813,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceStreamMarkerInfoINTEL *>( this );
     }
 
-    operator VkPerformanceStreamMarkerInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceStreamMarkerInfoINTEL *>( this );
-    }
-
-    operator VkPerformanceStreamMarkerInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceStreamMarkerInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, marker );
     }
@@ -77561,19 +55844,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::ePerformanceStreamMarkerInfoINTEL;
-    const void *  pNext  = {};
-    uint32_t      marker = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::ePerformanceStreamMarkerInfoINTEL;
+    const void *                        pNext  = {};
+    uint32_t                            marker = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceStreamMarkerInfoINTEL>
-  {
-    using Type = PerformanceStreamMarkerInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePerformanceStreamMarkerInfoINTEL>
   {
@@ -77583,7 +55858,7 @@ namespace VULKAN_HPP_NAMESPACE
   union PerformanceValueDataINTEL
   {
     using NativeType = VkPerformanceValueDataINTEL;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
     VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL( uint32_t value32_ = {} ) : value32( value32_ ) {}
 
@@ -77592,9 +55867,9 @@ namespace VULKAN_HPP_NAMESPACE
     VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL( float valueFloat_ ) : valueFloat( valueFloat_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL( const char * valueString_ ) : valueString( valueString_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL & setValue32( uint32_t value32_ ) VULKAN_HPP_NOEXCEPT
     {
       value32 = value32_;
@@ -77613,7 +55888,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL & setValueBool( Bool32 valueBool_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PerformanceValueDataINTEL & setValueBool( VULKAN_HPP_NAMESPACE::Bool32 valueBool_ ) VULKAN_HPP_NOEXCEPT
     {
       valueBool = valueBool_;
       return *this;
@@ -77624,7 +55899,7 @@ namespace VULKAN_HPP_NAMESPACE
       valueString = valueString_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkPerformanceValueDataINTEL const &() const
     {
@@ -77637,11 +55912,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    uint32_t     value32;
-    uint64_t     value64;
-    float        valueFloat;
-    Bool32       valueBool;
-    const char * valueString;
+    uint32_t                     value32;
+    uint64_t                     value64;
+    float                        valueFloat;
+    VULKAN_HPP_NAMESPACE::Bool32 valueBool;
+    const char *                 valueString;
 #else
     uint32_t     value32;
     uint64_t     value64;
@@ -77651,24 +55926,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceValueDataINTEL>
-  {
-    using Type = PerformanceValueDataINTEL;
-  };
-#endif
-
-  // wrapper struct for struct VkPerformanceValueINTEL, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPerformanceValueINTEL.html
   struct PerformanceValueINTEL
   {
     using NativeType = VkPerformanceValueINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PerformanceValueINTEL( PerformanceValueTypeINTEL type_ = PerformanceValueTypeINTEL::eUint32,
-                                                   PerformanceValueDataINTEL data_ = {} ) VULKAN_HPP_NOEXCEPT
-      : type{ type_ }
-      , data{ data_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      PerformanceValueINTEL( VULKAN_HPP_NAMESPACE::PerformanceValueTypeINTEL type_ = VULKAN_HPP_NAMESPACE::PerformanceValueTypeINTEL::eUint32,
+                             VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL data_ = {} ) VULKAN_HPP_NOEXCEPT
+      : type( type_ )
+      , data( data_ )
     {
     }
 
@@ -77680,11 +55947,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PerformanceValueINTEL & operator=( PerformanceValueINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PerformanceValueINTEL & operator=( VkPerformanceValueINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PerformanceValueINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PerformanceValueINTEL const *>( &rhs );
       return *this;
     }
 
@@ -77698,38 +55965,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPerformanceValueINTEL *>( this );
     }
 
-    operator VkPerformanceValueINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPerformanceValueINTEL *>( this );
-    }
-
-    operator VkPerformanceValueINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPerformanceValueINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PerformanceValueTypeINTEL const &, PerformanceValueDataINTEL const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::PerformanceValueTypeINTEL const &, VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( type, data );
     }
 #endif
 
   public:
-    PerformanceValueTypeINTEL type = PerformanceValueTypeINTEL::eUint32;
-    PerformanceValueDataINTEL data = {};
+    VULKAN_HPP_NAMESPACE::PerformanceValueTypeINTEL type = VULKAN_HPP_NAMESPACE::PerformanceValueTypeINTEL::eUint32;
+    VULKAN_HPP_NAMESPACE::PerformanceValueDataINTEL data = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPerformanceValueINTEL>
-  {
-    using Type = PerformanceValueINTEL;
-  };
-#endif
-
-  // wrapper struct for struct VkPhysicalDevice16BitStorageFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevice16BitStorageFeatures.html
   struct PhysicalDevice16BitStorageFeatures
   {
     using NativeType = VkPhysicalDevice16BitStorageFeatures;
@@ -77737,17 +55989,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevice16BitStorageFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevice16BitStorageFeatures( Bool32 storageBuffer16BitAccess_           = {},
-                                                             Bool32 uniformAndStorageBuffer16BitAccess_ = {},
-                                                             Bool32 storagePushConstant16_              = {},
-                                                             Bool32 storageInputOutput16_               = {},
-                                                             void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , storageBuffer16BitAccess{ storageBuffer16BitAccess_ }
-      , uniformAndStorageBuffer16BitAccess{ uniformAndStorageBuffer16BitAccess_ }
-      , storagePushConstant16{ storagePushConstant16_ }
-      , storageInputOutput16{ storageInputOutput16_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevice16BitStorageFeatures( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer16BitAccess_           = {},
+                                                             VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer16BitAccess_ = {},
+                                                             VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant16_              = {},
+                                                             VULKAN_HPP_NAMESPACE::Bool32 storageInputOutput16_               = {},
+                                                             void *                       pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , storageBuffer16BitAccess( storageBuffer16BitAccess_ )
+      , uniformAndStorageBuffer16BitAccess( uniformAndStorageBuffer16BitAccess_ )
+      , storagePushConstant16( storagePushConstant16_ )
+      , storageInputOutput16( storageInputOutput16_ )
     {
     }
 
@@ -77759,46 +56011,49 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevice16BitStorageFeatures & operator=( PhysicalDevice16BitStorageFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevice16BitStorageFeatures & operator=( VkPhysicalDevice16BitStorageFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevice16BitStorageFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevice16BitStorageFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures & setStorageBuffer16BitAccess( Bool32 storageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures &
+      setStorageBuffer16BitAccess( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       storageBuffer16BitAccess = storageBuffer16BitAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures &
-      setUniformAndStorageBuffer16BitAccess( Bool32 uniformAndStorageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setUniformAndStorageBuffer16BitAccess( VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformAndStorageBuffer16BitAccess = uniformAndStorageBuffer16BitAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures & setStoragePushConstant16( Bool32 storagePushConstant16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures &
+      setStoragePushConstant16( VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant16_ ) VULKAN_HPP_NOEXCEPT
     {
       storagePushConstant16 = storagePushConstant16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures & setStorageInputOutput16( Bool32 storageInputOutput16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice16BitStorageFeatures &
+      setStorageInputOutput16( VULKAN_HPP_NAMESPACE::Bool32 storageInputOutput16_ ) VULKAN_HPP_NOEXCEPT
     {
       storageInputOutput16 = storageInputOutput16_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevice16BitStorageFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77810,18 +56065,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevice16BitStorageFeatures *>( this );
     }
 
-    operator VkPhysicalDevice16BitStorageFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevice16BitStorageFeatures *>( this );
-    }
-
-    operator VkPhysicalDevice16BitStorageFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevice16BitStorageFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, storageBuffer16BitAccess, uniformAndStorageBuffer16BitAccess, storagePushConstant16, storageInputOutput16 );
     }
@@ -77830,7 +56085,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( PhysicalDevice16BitStorageFeatures const & ) const = default;
 #else
-    bool operator==( PhysicalDevice16BitStorageFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool         operator==( PhysicalDevice16BitStorageFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -77848,22 +56103,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDevice16BitStorageFeatures;
-    void *        pNext                              = {};
-    Bool32        storageBuffer16BitAccess           = {};
-    Bool32        uniformAndStorageBuffer16BitAccess = {};
-    Bool32        storagePushConstant16              = {};
-    Bool32        storageInputOutput16               = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDevice16BitStorageFeatures;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageBuffer16BitAccess           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformAndStorageBuffer16BitAccess = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storagePushConstant16              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageInputOutput16               = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevice16BitStorageFeatures>
-  {
-    using Type = PhysicalDevice16BitStorageFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevice16BitStorageFeatures>
   {
@@ -77872,8 +56119,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDevice16BitStorageFeaturesKHR = PhysicalDevice16BitStorageFeatures;
 
-  // wrapper struct for struct VkPhysicalDevice4444FormatsFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevice4444FormatsFeaturesEXT.html
   struct PhysicalDevice4444FormatsFeaturesEXT
   {
     using NativeType = VkPhysicalDevice4444FormatsFeaturesEXT;
@@ -77881,12 +56126,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevice4444FormatsFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDevice4444FormatsFeaturesEXT( Bool32 formatA4R4G4B4_ = {}, Bool32 formatA4B4G4R4_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , formatA4R4G4B4{ formatA4R4G4B4_ }
-      , formatA4B4G4R4{ formatA4B4G4R4_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevice4444FormatsFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 formatA4R4G4B4_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32 formatA4B4G4R4_ = {},
+                                                               void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , formatA4R4G4B4( formatA4R4G4B4_ )
+      , formatA4B4G4R4( formatA4B4G4R4_ )
     {
     }
 
@@ -77898,33 +56144,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevice4444FormatsFeaturesEXT & operator=( PhysicalDevice4444FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevice4444FormatsFeaturesEXT & operator=( VkPhysicalDevice4444FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevice4444FormatsFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevice4444FormatsFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevice4444FormatsFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice4444FormatsFeaturesEXT & setFormatA4R4G4B4( Bool32 formatA4R4G4B4_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice4444FormatsFeaturesEXT & setFormatA4R4G4B4( VULKAN_HPP_NAMESPACE::Bool32 formatA4R4G4B4_ ) VULKAN_HPP_NOEXCEPT
     {
       formatA4R4G4B4 = formatA4R4G4B4_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice4444FormatsFeaturesEXT & setFormatA4B4G4R4( Bool32 formatA4B4G4R4_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice4444FormatsFeaturesEXT & setFormatA4B4G4R4( VULKAN_HPP_NAMESPACE::Bool32 formatA4B4G4R4_ ) VULKAN_HPP_NOEXCEPT
     {
       formatA4B4G4R4 = formatA4B4G4R4_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevice4444FormatsFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -77936,18 +56182,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevice4444FormatsFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevice4444FormatsFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevice4444FormatsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevice4444FormatsFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevice4444FormatsFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, formatA4R4G4B4, formatA4B4G4R4 );
     }
@@ -77972,28 +56213,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDevice4444FormatsFeaturesEXT;
-    void *        pNext          = {};
-    Bool32        formatA4R4G4B4 = {};
-    Bool32        formatA4B4G4R4 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDevice4444FormatsFeaturesEXT;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        formatA4R4G4B4 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        formatA4B4G4R4 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevice4444FormatsFeaturesEXT>
-  {
-    using Type = PhysicalDevice4444FormatsFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevice4444FormatsFeaturesEXT>
   {
     using Type = PhysicalDevice4444FormatsFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevice8BitStorageFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevice8BitStorageFeatures.html
   struct PhysicalDevice8BitStorageFeatures
   {
     using NativeType = VkPhysicalDevice8BitStorageFeatures;
@@ -78001,15 +56232,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevice8BitStorageFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevice8BitStorageFeatures( Bool32 storageBuffer8BitAccess_           = {},
-                                                            Bool32 uniformAndStorageBuffer8BitAccess_ = {},
-                                                            Bool32 storagePushConstant8_              = {},
-                                                            void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , storageBuffer8BitAccess{ storageBuffer8BitAccess_ }
-      , uniformAndStorageBuffer8BitAccess{ uniformAndStorageBuffer8BitAccess_ }
-      , storagePushConstant8{ storagePushConstant8_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevice8BitStorageFeatures( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer8BitAccess_           = {},
+                                                            VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer8BitAccess_ = {},
+                                                            VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant8_              = {},
+                                                            void *                       pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , storageBuffer8BitAccess( storageBuffer8BitAccess_ )
+      , uniformAndStorageBuffer8BitAccess( uniformAndStorageBuffer8BitAccess_ )
+      , storagePushConstant8( storagePushConstant8_ )
     {
     }
 
@@ -78021,40 +56252,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevice8BitStorageFeatures & operator=( PhysicalDevice8BitStorageFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevice8BitStorageFeatures & operator=( VkPhysicalDevice8BitStorageFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevice8BitStorageFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevice8BitStorageFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures & setStorageBuffer8BitAccess( Bool32 storageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures &
+      setStorageBuffer8BitAccess( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       storageBuffer8BitAccess = storageBuffer8BitAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures &
-      setUniformAndStorageBuffer8BitAccess( Bool32 uniformAndStorageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setUniformAndStorageBuffer8BitAccess( VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformAndStorageBuffer8BitAccess = uniformAndStorageBuffer8BitAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures & setStoragePushConstant8( Bool32 storagePushConstant8_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevice8BitStorageFeatures &
+      setStoragePushConstant8( VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant8_ ) VULKAN_HPP_NOEXCEPT
     {
       storagePushConstant8 = storagePushConstant8_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevice8BitStorageFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78066,18 +56299,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevice8BitStorageFeatures *>( this );
     }
 
-    operator VkPhysicalDevice8BitStorageFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevice8BitStorageFeatures *>( this );
-    }
-
-    operator VkPhysicalDevice8BitStorageFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevice8BitStorageFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, storageBuffer8BitAccess, uniformAndStorageBuffer8BitAccess, storagePushConstant8 );
     }
@@ -78103,21 +56335,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                             = StructureType::ePhysicalDevice8BitStorageFeatures;
-    void *        pNext                             = {};
-    Bool32        storageBuffer8BitAccess           = {};
-    Bool32        uniformAndStorageBuffer8BitAccess = {};
-    Bool32        storagePushConstant8              = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                             = StructureType::ePhysicalDevice8BitStorageFeatures;
+    void *                              pNext                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageBuffer8BitAccess           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformAndStorageBuffer8BitAccess = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storagePushConstant8              = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevice8BitStorageFeatures>
-  {
-    using Type = PhysicalDevice8BitStorageFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevice8BitStorageFeatures>
   {
@@ -78126,8 +56350,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDevice8BitStorageFeaturesKHR = PhysicalDevice8BitStorageFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceASTCDecodeFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceASTCDecodeFeaturesEXT.html
   struct PhysicalDeviceASTCDecodeFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceASTCDecodeFeaturesEXT;
@@ -78135,10 +56357,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAstcDecodeFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceASTCDecodeFeaturesEXT( Bool32 decodeModeSharedExponent_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , decodeModeSharedExponent{ decodeModeSharedExponent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceASTCDecodeFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 decodeModeSharedExponent_ = {},
+                                                              void *                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , decodeModeSharedExponent( decodeModeSharedExponent_ )
     {
     }
 
@@ -78150,27 +56373,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceASTCDecodeFeaturesEXT & operator=( PhysicalDeviceASTCDecodeFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceASTCDecodeFeaturesEXT & operator=( VkPhysicalDeviceASTCDecodeFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceASTCDecodeFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceASTCDecodeFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceASTCDecodeFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceASTCDecodeFeaturesEXT & setDecodeModeSharedExponent( Bool32 decodeModeSharedExponent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceASTCDecodeFeaturesEXT &
+      setDecodeModeSharedExponent( VULKAN_HPP_NAMESPACE::Bool32 decodeModeSharedExponent_ ) VULKAN_HPP_NOEXCEPT
     {
       decodeModeSharedExponent = decodeModeSharedExponent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceASTCDecodeFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78182,18 +56406,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceASTCDecodeFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceASTCDecodeFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceASTCDecodeFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceASTCDecodeFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceASTCDecodeFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, decodeModeSharedExponent );
     }
@@ -78218,27 +56437,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceAstcDecodeFeaturesEXT;
-    void *        pNext                    = {};
-    Bool32        decodeModeSharedExponent = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceAstcDecodeFeaturesEXT;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        decodeModeSharedExponent = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceASTCDecodeFeaturesEXT>
-  {
-    using Type = PhysicalDeviceASTCDecodeFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAstcDecodeFeaturesEXT>
   {
     using Type = PhysicalDeviceASTCDecodeFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAccelerationStructureFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAccelerationStructureFeaturesKHR.html
   struct PhysicalDeviceAccelerationStructureFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceAccelerationStructureFeaturesKHR;
@@ -78246,19 +56455,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAccelerationStructureFeaturesKHR( Bool32 accelerationStructure_                                 = {},
-                                                                         Bool32 accelerationStructureCaptureReplay_                    = {},
-                                                                         Bool32 accelerationStructureIndirectBuild_                    = {},
-                                                                         Bool32 accelerationStructureHostCommands_                     = {},
-                                                                         Bool32 descriptorBindingAccelerationStructureUpdateAfterBind_ = {},
-                                                                         void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructure{ accelerationStructure_ }
-      , accelerationStructureCaptureReplay{ accelerationStructureCaptureReplay_ }
-      , accelerationStructureIndirectBuild{ accelerationStructureIndirectBuild_ }
-      , accelerationStructureHostCommands{ accelerationStructureHostCommands_ }
-      , descriptorBindingAccelerationStructureUpdateAfterBind{ descriptorBindingAccelerationStructureUpdateAfterBind_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceAccelerationStructureFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 accelerationStructure_                                 = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureCaptureReplay_                    = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureIndirectBuild_                    = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureHostCommands_                     = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingAccelerationStructureUpdateAfterBind_ = {},
+                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructure( accelerationStructure_ )
+      , accelerationStructureCaptureReplay( accelerationStructureCaptureReplay_ )
+      , accelerationStructureIndirectBuild( accelerationStructureIndirectBuild_ )
+      , accelerationStructureHostCommands( accelerationStructureHostCommands_ )
+      , descriptorBindingAccelerationStructureUpdateAfterBind( descriptorBindingAccelerationStructureUpdateAfterBind_ )
     {
     }
 
@@ -78271,55 +56481,56 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceAccelerationStructureFeaturesKHR & operator=( PhysicalDeviceAccelerationStructureFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAccelerationStructureFeaturesKHR & operator=( VkPhysicalDeviceAccelerationStructureFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAccelerationStructureFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAccelerationStructureFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR & setAccelerationStructure( Bool32 accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR &
+      setAccelerationStructure( VULKAN_HPP_NAMESPACE::Bool32 accelerationStructure_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructure = accelerationStructure_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR &
-      setAccelerationStructureCaptureReplay( Bool32 accelerationStructureCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructureCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureCaptureReplay = accelerationStructureCaptureReplay_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR &
-      setAccelerationStructureIndirectBuild( Bool32 accelerationStructureIndirectBuild_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructureIndirectBuild( VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureIndirectBuild_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureIndirectBuild = accelerationStructureIndirectBuild_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR &
-      setAccelerationStructureHostCommands( Bool32 accelerationStructureHostCommands_ ) VULKAN_HPP_NOEXCEPT
+      setAccelerationStructureHostCommands( VULKAN_HPP_NAMESPACE::Bool32 accelerationStructureHostCommands_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureHostCommands = accelerationStructureHostCommands_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR &
-      setDescriptorBindingAccelerationStructureUpdateAfterBind( Bool32 descriptorBindingAccelerationStructureUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAccelerationStructureFeaturesKHR & setDescriptorBindingAccelerationStructureUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingAccelerationStructureUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingAccelerationStructureUpdateAfterBind = descriptorBindingAccelerationStructureUpdateAfterBind_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceAccelerationStructureFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78331,18 +56542,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAccelerationStructureFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceAccelerationStructureFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAccelerationStructureFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceAccelerationStructureFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAccelerationStructureFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -78378,31 +56589,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                 = StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR;
-    void *        pNext                                                 = {};
-    Bool32        accelerationStructure                                 = {};
-    Bool32        accelerationStructureCaptureReplay                    = {};
-    Bool32        accelerationStructureIndirectBuild                    = {};
-    Bool32        accelerationStructureHostCommands                     = {};
-    Bool32        descriptorBindingAccelerationStructureUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                 = StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR;
+    void *                              pNext                                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        accelerationStructure                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        accelerationStructureCaptureReplay                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        accelerationStructureIndirectBuild                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        accelerationStructureHostCommands                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingAccelerationStructureUpdateAfterBind = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAccelerationStructureFeaturesKHR>
-  {
-    using Type = PhysicalDeviceAccelerationStructureFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR>
   {
     using Type = PhysicalDeviceAccelerationStructureFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAccelerationStructurePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAccelerationStructurePropertiesKHR.html
   struct PhysicalDeviceAccelerationStructurePropertiesKHR
   {
     using NativeType = VkPhysicalDeviceAccelerationStructurePropertiesKHR;
@@ -78410,7 +56611,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceAccelerationStructurePropertiesKHR( uint64_t maxGeometryCount_                                           = {},
                                                                            uint64_t maxInstanceCount_                                           = {},
                                                                            uint64_t maxPrimitiveCount_                                          = {},
@@ -78420,15 +56621,15 @@ namespace VULKAN_HPP_NAMESPACE
                                                                            uint32_t maxDescriptorSetUpdateAfterBindAccelerationStructures_      = {},
                                                                            uint32_t minAccelerationStructureScratchOffsetAlignment_             = {},
                                                                            void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxGeometryCount{ maxGeometryCount_ }
-      , maxInstanceCount{ maxInstanceCount_ }
-      , maxPrimitiveCount{ maxPrimitiveCount_ }
-      , maxPerStageDescriptorAccelerationStructures{ maxPerStageDescriptorAccelerationStructures_ }
-      , maxPerStageDescriptorUpdateAfterBindAccelerationStructures{ maxPerStageDescriptorUpdateAfterBindAccelerationStructures_ }
-      , maxDescriptorSetAccelerationStructures{ maxDescriptorSetAccelerationStructures_ }
-      , maxDescriptorSetUpdateAfterBindAccelerationStructures{ maxDescriptorSetUpdateAfterBindAccelerationStructures_ }
-      , minAccelerationStructureScratchOffsetAlignment{ minAccelerationStructureScratchOffsetAlignment_ }
+      : pNext( pNext_ )
+      , maxGeometryCount( maxGeometryCount_ )
+      , maxInstanceCount( maxInstanceCount_ )
+      , maxPrimitiveCount( maxPrimitiveCount_ )
+      , maxPerStageDescriptorAccelerationStructures( maxPerStageDescriptorAccelerationStructures_ )
+      , maxPerStageDescriptorUpdateAfterBindAccelerationStructures( maxPerStageDescriptorUpdateAfterBindAccelerationStructures_ )
+      , maxDescriptorSetAccelerationStructures( maxDescriptorSetAccelerationStructures_ )
+      , maxDescriptorSetUpdateAfterBindAccelerationStructures( maxDescriptorSetUpdateAfterBindAccelerationStructures_ )
+      , minAccelerationStructureScratchOffsetAlignment( minAccelerationStructureScratchOffsetAlignment_ )
     {
     }
 
@@ -78441,11 +56642,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceAccelerationStructurePropertiesKHR & operator=( PhysicalDeviceAccelerationStructurePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAccelerationStructurePropertiesKHR & operator=( VkPhysicalDeviceAccelerationStructurePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAccelerationStructurePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAccelerationStructurePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -78459,18 +56660,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAccelerationStructurePropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceAccelerationStructurePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAccelerationStructurePropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceAccelerationStructurePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAccelerationStructurePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint64_t const &,
                uint64_t const &,
@@ -78480,6 +56674,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -78520,34 +56715,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                      = StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR;
-    void *        pNext                                                      = {};
-    uint64_t      maxGeometryCount                                           = {};
-    uint64_t      maxInstanceCount                                           = {};
-    uint64_t      maxPrimitiveCount                                          = {};
-    uint32_t      maxPerStageDescriptorAccelerationStructures                = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindAccelerationStructures = {};
-    uint32_t      maxDescriptorSetAccelerationStructures                     = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindAccelerationStructures      = {};
-    uint32_t      minAccelerationStructureScratchOffsetAlignment             = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                       = StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR;
+    void *                              pNext                                       = {};
+    uint64_t                            maxGeometryCount                            = {};
+    uint64_t                            maxInstanceCount                            = {};
+    uint64_t                            maxPrimitiveCount                           = {};
+    uint32_t                            maxPerStageDescriptorAccelerationStructures = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindAccelerationStructures = {};
+    uint32_t                            maxDescriptorSetAccelerationStructures                     = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindAccelerationStructures      = {};
+    uint32_t                            minAccelerationStructureScratchOffsetAlignment             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAccelerationStructurePropertiesKHR>
-  {
-    using Type = PhysicalDeviceAccelerationStructurePropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR>
   {
     using Type = PhysicalDeviceAccelerationStructurePropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAddressBindingReportFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAddressBindingReportFeaturesEXT.html
   struct PhysicalDeviceAddressBindingReportFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceAddressBindingReportFeaturesEXT;
@@ -78555,10 +56740,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAddressBindingReportFeaturesEXT( Bool32 reportAddressBinding_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , reportAddressBinding{ reportAddressBinding_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceAddressBindingReportFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 reportAddressBinding_ = {},
+                                                                        void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , reportAddressBinding( reportAddressBinding_ )
     {
     }
 
@@ -78571,27 +56757,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceAddressBindingReportFeaturesEXT & operator=( PhysicalDeviceAddressBindingReportFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAddressBindingReportFeaturesEXT & operator=( VkPhysicalDeviceAddressBindingReportFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAddressBindingReportFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAddressBindingReportFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAddressBindingReportFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAddressBindingReportFeaturesEXT & setReportAddressBinding( Bool32 reportAddressBinding_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAddressBindingReportFeaturesEXT &
+      setReportAddressBinding( VULKAN_HPP_NAMESPACE::Bool32 reportAddressBinding_ ) VULKAN_HPP_NOEXCEPT
     {
       reportAddressBinding = reportAddressBinding_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceAddressBindingReportFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78603,18 +56790,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAddressBindingReportFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceAddressBindingReportFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAddressBindingReportFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceAddressBindingReportFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAddressBindingReportFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, reportAddressBinding );
     }
@@ -78639,27 +56821,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT;
-    void *        pNext                = {};
-    Bool32        reportAddressBinding = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        reportAddressBinding = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAddressBindingReportFeaturesEXT>
-  {
-    using Type = PhysicalDeviceAddressBindingReportFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT>
   {
     using Type = PhysicalDeviceAddressBindingReportFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAmigoProfilingFeaturesSEC, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAmigoProfilingFeaturesSEC.html
   struct PhysicalDeviceAmigoProfilingFeaturesSEC
   {
     using NativeType = VkPhysicalDeviceAmigoProfilingFeaturesSEC;
@@ -78667,10 +56839,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAmigoProfilingFeaturesSEC( Bool32 amigoProfiling_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , amigoProfiling{ amigoProfiling_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceAmigoProfilingFeaturesSEC( VULKAN_HPP_NAMESPACE::Bool32 amigoProfiling_ = {},
+                                                                  void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , amigoProfiling( amigoProfiling_ )
     {
     }
 
@@ -78682,27 +56855,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceAmigoProfilingFeaturesSEC & operator=( PhysicalDeviceAmigoProfilingFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAmigoProfilingFeaturesSEC & operator=( VkPhysicalDeviceAmigoProfilingFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAmigoProfilingFeaturesSEC const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAmigoProfilingFeaturesSEC const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAmigoProfilingFeaturesSEC & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAmigoProfilingFeaturesSEC & setAmigoProfiling( Bool32 amigoProfiling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAmigoProfilingFeaturesSEC & setAmigoProfiling( VULKAN_HPP_NAMESPACE::Bool32 amigoProfiling_ ) VULKAN_HPP_NOEXCEPT
     {
       amigoProfiling = amigoProfiling_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceAmigoProfilingFeaturesSEC const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78714,18 +56887,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAmigoProfilingFeaturesSEC *>( this );
     }
 
-    operator VkPhysicalDeviceAmigoProfilingFeaturesSEC const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAmigoProfilingFeaturesSEC *>( this );
-    }
-
-    operator VkPhysicalDeviceAmigoProfilingFeaturesSEC *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAmigoProfilingFeaturesSEC *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, amigoProfiling );
     }
@@ -78750,138 +56918,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC;
-    void *        pNext          = {};
-    Bool32        amigoProfiling = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        amigoProfiling = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAmigoProfilingFeaturesSEC>
-  {
-    using Type = PhysicalDeviceAmigoProfilingFeaturesSEC;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC>
   {
     using Type = PhysicalDeviceAmigoProfilingFeaturesSEC;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAntiLagFeaturesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAntiLagFeaturesAMD.html
-  struct PhysicalDeviceAntiLagFeaturesAMD
-  {
-    using NativeType = VkPhysicalDeviceAntiLagFeaturesAMD;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAntiLagFeaturesAMD;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAntiLagFeaturesAMD( Bool32 antiLag_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , antiLag{ antiLag_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAntiLagFeaturesAMD( PhysicalDeviceAntiLagFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceAntiLagFeaturesAMD( VkPhysicalDeviceAntiLagFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceAntiLagFeaturesAMD( *reinterpret_cast<PhysicalDeviceAntiLagFeaturesAMD const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceAntiLagFeaturesAMD & operator=( PhysicalDeviceAntiLagFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceAntiLagFeaturesAMD & operator=( VkPhysicalDeviceAntiLagFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceAntiLagFeaturesAMD const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAntiLagFeaturesAMD & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAntiLagFeaturesAMD & setAntiLag( Bool32 antiLag_ ) VULKAN_HPP_NOEXCEPT
-    {
-      antiLag = antiLag_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceAntiLagFeaturesAMD const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceAntiLagFeaturesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceAntiLagFeaturesAMD &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceAntiLagFeaturesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceAntiLagFeaturesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAntiLagFeaturesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceAntiLagFeaturesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAntiLagFeaturesAMD *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, antiLag );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceAntiLagFeaturesAMD const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceAntiLagFeaturesAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( antiLag == rhs.antiLag );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceAntiLagFeaturesAMD const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType   = StructureType::ePhysicalDeviceAntiLagFeaturesAMD;
-    void *        pNext   = {};
-    Bool32        antiLag = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAntiLagFeaturesAMD>
-  {
-    using Type = PhysicalDeviceAntiLagFeaturesAMD;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceAntiLagFeaturesAMD>
-  {
-    using Type = PhysicalDeviceAntiLagFeaturesAMD;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT.html
   struct PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
@@ -78889,11 +56936,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT( Bool32 attachmentFeedbackLoopDynamicState_ = {},
-                                                                                      void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentFeedbackLoopDynamicState{ attachmentFeedbackLoopDynamicState_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 attachmentFeedbackLoopDynamicState_ = {},
+                                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentFeedbackLoopDynamicState( attachmentFeedbackLoopDynamicState_ )
     {
     }
 
@@ -78908,16 +56955,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT &
       operator=( PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT &
       operator=( VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -78925,12 +56972,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT &
-      setAttachmentFeedbackLoopDynamicState( Bool32 attachmentFeedbackLoopDynamicState_ ) VULKAN_HPP_NOEXCEPT
+      setAttachmentFeedbackLoopDynamicState( VULKAN_HPP_NAMESPACE::Bool32 attachmentFeedbackLoopDynamicState_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentFeedbackLoopDynamicState = attachmentFeedbackLoopDynamicState_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -78942,18 +56989,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachmentFeedbackLoopDynamicState );
     }
@@ -78978,27 +57020,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
-    void *        pNext                              = {};
-    Bool32        attachmentFeedbackLoopDynamicState = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        attachmentFeedbackLoopDynamicState = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT>
-  {
-    using Type = PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT>
   {
     using Type = PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT.html
   struct PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
@@ -79006,11 +57038,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT( Bool32 attachmentFeedbackLoopLayout_ = {},
-                                                                                void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentFeedbackLoopLayout{ attachmentFeedbackLoopLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 attachmentFeedbackLoopLayout_ = {},
+                                                                                void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentFeedbackLoopLayout( attachmentFeedbackLoopLayout_ )
     {
     }
 
@@ -79024,15 +57056,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT &
       operator=( PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT & operator=( VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -79040,12 +57072,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT &
-      setAttachmentFeedbackLoopLayout( Bool32 attachmentFeedbackLoopLayout_ ) VULKAN_HPP_NOEXCEPT
+      setAttachmentFeedbackLoopLayout( VULKAN_HPP_NAMESPACE::Bool32 attachmentFeedbackLoopLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentFeedbackLoopLayout = attachmentFeedbackLoopLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -79057,18 +57089,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachmentFeedbackLoopLayout );
     }
@@ -79093,27 +57120,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
-    void *        pNext                        = {};
-    Bool32        attachmentFeedbackLoopLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        attachmentFeedbackLoopLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT>
-  {
-    using Type = PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT>
   {
     using Type = PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT.html
   struct PhysicalDeviceBlendOperationAdvancedFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT;
@@ -79121,11 +57138,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceBlendOperationAdvancedFeaturesEXT( Bool32 advancedBlendCoherentOperations_ = {},
-                                                                          void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , advancedBlendCoherentOperations{ advancedBlendCoherentOperations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceBlendOperationAdvancedFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 advancedBlendCoherentOperations_ = {},
+                                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , advancedBlendCoherentOperations( advancedBlendCoherentOperations_ )
     {
     }
 
@@ -79138,15 +57155,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceBlendOperationAdvancedFeaturesEXT & operator=( PhysicalDeviceBlendOperationAdvancedFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceBlendOperationAdvancedFeaturesEXT & operator=( VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceBlendOperationAdvancedFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceBlendOperationAdvancedFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBlendOperationAdvancedFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -79154,12 +57171,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBlendOperationAdvancedFeaturesEXT &
-      setAdvancedBlendCoherentOperations( Bool32 advancedBlendCoherentOperations_ ) VULKAN_HPP_NOEXCEPT
+      setAdvancedBlendCoherentOperations( VULKAN_HPP_NAMESPACE::Bool32 advancedBlendCoherentOperations_ ) VULKAN_HPP_NOEXCEPT
     {
       advancedBlendCoherentOperations = advancedBlendCoherentOperations_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -79171,18 +57188,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, advancedBlendCoherentOperations );
     }
@@ -79207,27 +57219,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                           = StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT;
-    void *        pNext                           = {};
-    Bool32        advancedBlendCoherentOperations = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT;
+    void *                              pNext                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendCoherentOperations = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT>
-  {
-    using Type = PhysicalDeviceBlendOperationAdvancedFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT>
   {
     using Type = PhysicalDeviceBlendOperationAdvancedFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT.html
   struct PhysicalDeviceBlendOperationAdvancedPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT;
@@ -79235,21 +57237,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceBlendOperationAdvancedPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceBlendOperationAdvancedPropertiesEXT( uint32_t advancedBlendMaxColorAttachments_      = {},
-                                                                            Bool32   advancedBlendIndependentBlend_         = {},
-                                                                            Bool32   advancedBlendNonPremultipliedSrcColor_ = {},
-                                                                            Bool32   advancedBlendNonPremultipliedDstColor_ = {},
-                                                                            Bool32   advancedBlendCorrelatedOverlap_        = {},
-                                                                            Bool32   advancedBlendAllOperations_            = {},
-                                                                            void *   pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , advancedBlendMaxColorAttachments{ advancedBlendMaxColorAttachments_ }
-      , advancedBlendIndependentBlend{ advancedBlendIndependentBlend_ }
-      , advancedBlendNonPremultipliedSrcColor{ advancedBlendNonPremultipliedSrcColor_ }
-      , advancedBlendNonPremultipliedDstColor{ advancedBlendNonPremultipliedDstColor_ }
-      , advancedBlendCorrelatedOverlap{ advancedBlendCorrelatedOverlap_ }
-      , advancedBlendAllOperations{ advancedBlendAllOperations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceBlendOperationAdvancedPropertiesEXT( uint32_t                     advancedBlendMaxColorAttachments_      = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 advancedBlendIndependentBlend_         = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 advancedBlendNonPremultipliedSrcColor_ = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 advancedBlendNonPremultipliedDstColor_ = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 advancedBlendCorrelatedOverlap_        = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 advancedBlendAllOperations_            = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , advancedBlendMaxColorAttachments( advancedBlendMaxColorAttachments_ )
+      , advancedBlendIndependentBlend( advancedBlendIndependentBlend_ )
+      , advancedBlendNonPremultipliedSrcColor( advancedBlendNonPremultipliedSrcColor_ )
+      , advancedBlendNonPremultipliedDstColor( advancedBlendNonPremultipliedDstColor_ )
+      , advancedBlendCorrelatedOverlap( advancedBlendCorrelatedOverlap_ )
+      , advancedBlendAllOperations( advancedBlendAllOperations_ )
     {
     }
 
@@ -79263,11 +57265,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceBlendOperationAdvancedPropertiesEXT &
       operator=( PhysicalDeviceBlendOperationAdvancedPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceBlendOperationAdvancedPropertiesEXT & operator=( VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceBlendOperationAdvancedPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceBlendOperationAdvancedPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -79281,18 +57283,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -79329,32 +57332,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                 = StructureType::ePhysicalDeviceBlendOperationAdvancedPropertiesEXT;
-    void *        pNext                                 = {};
-    uint32_t      advancedBlendMaxColorAttachments      = {};
-    Bool32        advancedBlendIndependentBlend         = {};
-    Bool32        advancedBlendNonPremultipliedSrcColor = {};
-    Bool32        advancedBlendNonPremultipliedDstColor = {};
-    Bool32        advancedBlendCorrelatedOverlap        = {};
-    Bool32        advancedBlendAllOperations            = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                 = StructureType::ePhysicalDeviceBlendOperationAdvancedPropertiesEXT;
+    void *                              pNext                                 = {};
+    uint32_t                            advancedBlendMaxColorAttachments      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendIndependentBlend         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendNonPremultipliedSrcColor = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendNonPremultipliedDstColor = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendCorrelatedOverlap        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        advancedBlendAllOperations            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT>
-  {
-    using Type = PhysicalDeviceBlendOperationAdvancedPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceBlendOperationAdvancedPropertiesEXT>
   {
     using Type = PhysicalDeviceBlendOperationAdvancedPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceBorderColorSwizzleFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceBorderColorSwizzleFeaturesEXT.html
   struct PhysicalDeviceBorderColorSwizzleFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceBorderColorSwizzleFeaturesEXT;
@@ -79362,13 +57355,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceBorderColorSwizzleFeaturesEXT( Bool32 borderColorSwizzle_          = {},
-                                                                      Bool32 borderColorSwizzleFromImage_ = {},
-                                                                      void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , borderColorSwizzle{ borderColorSwizzle_ }
-      , borderColorSwizzleFromImage{ borderColorSwizzleFromImage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceBorderColorSwizzleFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 borderColorSwizzle_          = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 borderColorSwizzleFromImage_ = {},
+                                                                      void *                       pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , borderColorSwizzle( borderColorSwizzle_ )
+      , borderColorSwizzleFromImage( borderColorSwizzleFromImage_ )
     {
     }
 
@@ -79380,34 +57373,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceBorderColorSwizzleFeaturesEXT & operator=( PhysicalDeviceBorderColorSwizzleFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceBorderColorSwizzleFeaturesEXT & operator=( VkPhysicalDeviceBorderColorSwizzleFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceBorderColorSwizzleFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceBorderColorSwizzleFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBorderColorSwizzleFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBorderColorSwizzleFeaturesEXT & setBorderColorSwizzle( Bool32 borderColorSwizzle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBorderColorSwizzleFeaturesEXT &
+      setBorderColorSwizzle( VULKAN_HPP_NAMESPACE::Bool32 borderColorSwizzle_ ) VULKAN_HPP_NOEXCEPT
     {
       borderColorSwizzle = borderColorSwizzle_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBorderColorSwizzleFeaturesEXT &
-      setBorderColorSwizzleFromImage( Bool32 borderColorSwizzleFromImage_ ) VULKAN_HPP_NOEXCEPT
+      setBorderColorSwizzleFromImage( VULKAN_HPP_NAMESPACE::Bool32 borderColorSwizzleFromImage_ ) VULKAN_HPP_NOEXCEPT
     {
       borderColorSwizzleFromImage = borderColorSwizzleFromImage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceBorderColorSwizzleFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -79419,18 +57413,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceBorderColorSwizzleFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceBorderColorSwizzleFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceBorderColorSwizzleFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, borderColorSwizzle, borderColorSwizzleFromImage );
     }
@@ -79456,28 +57445,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT;
-    void *        pNext                       = {};
-    Bool32        borderColorSwizzle          = {};
-    Bool32        borderColorSwizzleFromImage = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        borderColorSwizzle          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        borderColorSwizzleFromImage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT>
-  {
-    using Type = PhysicalDeviceBorderColorSwizzleFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT>
   {
     using Type = PhysicalDeviceBorderColorSwizzleFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceBufferDeviceAddressFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceBufferDeviceAddressFeatures.html
   struct PhysicalDeviceBufferDeviceAddressFeatures
   {
     using NativeType = VkPhysicalDeviceBufferDeviceAddressFeatures;
@@ -79485,15 +57464,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceBufferDeviceAddressFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceBufferDeviceAddressFeatures( Bool32 bufferDeviceAddress_              = {},
-                                                                    Bool32 bufferDeviceAddressCaptureReplay_ = {},
-                                                                    Bool32 bufferDeviceAddressMultiDevice_   = {},
-                                                                    void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , bufferDeviceAddress{ bufferDeviceAddress_ }
-      , bufferDeviceAddressCaptureReplay{ bufferDeviceAddressCaptureReplay_ }
-      , bufferDeviceAddressMultiDevice{ bufferDeviceAddressMultiDevice_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceBufferDeviceAddressFeatures( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_              = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_ = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_   = {},
+                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , bufferDeviceAddress( bufferDeviceAddress_ )
+      , bufferDeviceAddressCaptureReplay( bufferDeviceAddressCaptureReplay_ )
+      , bufferDeviceAddressMultiDevice( bufferDeviceAddressMultiDevice_ )
     {
     }
 
@@ -79505,41 +57484,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceBufferDeviceAddressFeatures & operator=( PhysicalDeviceBufferDeviceAddressFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceBufferDeviceAddressFeatures & operator=( VkPhysicalDeviceBufferDeviceAddressFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceBufferDeviceAddressFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceBufferDeviceAddressFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeatures & setBufferDeviceAddress( Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeatures &
+      setBufferDeviceAddress( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddress = bufferDeviceAddress_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeatures &
-      setBufferDeviceAddressCaptureReplay( Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setBufferDeviceAddressCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressCaptureReplay = bufferDeviceAddressCaptureReplay_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeatures &
-      setBufferDeviceAddressMultiDevice( Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
+      setBufferDeviceAddressMultiDevice( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressMultiDevice = bufferDeviceAddressMultiDevice_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceBufferDeviceAddressFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -79551,18 +57531,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceBufferDeviceAddressFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceBufferDeviceAddressFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceBufferDeviceAddressFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceBufferDeviceAddressFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceBufferDeviceAddressFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, bufferDeviceAddress, bufferDeviceAddressCaptureReplay, bufferDeviceAddressMultiDevice );
     }
@@ -79589,21 +57568,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceBufferDeviceAddressFeatures;
-    void *        pNext                            = {};
-    Bool32        bufferDeviceAddress              = {};
-    Bool32        bufferDeviceAddressCaptureReplay = {};
-    Bool32        bufferDeviceAddressMultiDevice   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceBufferDeviceAddressFeatures;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddress              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressCaptureReplay = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressMultiDevice   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceBufferDeviceAddressFeatures>
-  {
-    using Type = PhysicalDeviceBufferDeviceAddressFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceBufferDeviceAddressFeatures>
   {
@@ -79612,8 +57583,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceBufferDeviceAddressFeaturesKHR = PhysicalDeviceBufferDeviceAddressFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceBufferDeviceAddressFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceBufferDeviceAddressFeaturesEXT.html
   struct PhysicalDeviceBufferDeviceAddressFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceBufferDeviceAddressFeaturesEXT;
@@ -79621,15 +57590,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceBufferDeviceAddressFeaturesEXT( Bool32 bufferDeviceAddress_              = {},
-                                                                       Bool32 bufferDeviceAddressCaptureReplay_ = {},
-                                                                       Bool32 bufferDeviceAddressMultiDevice_   = {},
-                                                                       void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , bufferDeviceAddress{ bufferDeviceAddress_ }
-      , bufferDeviceAddressCaptureReplay{ bufferDeviceAddressCaptureReplay_ }
-      , bufferDeviceAddressMultiDevice{ bufferDeviceAddressMultiDevice_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceBufferDeviceAddressFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_              = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_ = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_   = {},
+                                                                       void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , bufferDeviceAddress( bufferDeviceAddress_ )
+      , bufferDeviceAddressCaptureReplay( bufferDeviceAddressCaptureReplay_ )
+      , bufferDeviceAddressMultiDevice( bufferDeviceAddressMultiDevice_ )
     {
     }
 
@@ -79641,41 +57610,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceBufferDeviceAddressFeaturesEXT & operator=( PhysicalDeviceBufferDeviceAddressFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceBufferDeviceAddressFeaturesEXT & operator=( VkPhysicalDeviceBufferDeviceAddressFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceBufferDeviceAddressFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceBufferDeviceAddressFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeaturesEXT & setBufferDeviceAddress( Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeaturesEXT &
+      setBufferDeviceAddress( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddress = bufferDeviceAddress_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeaturesEXT &
-      setBufferDeviceAddressCaptureReplay( Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setBufferDeviceAddressCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressCaptureReplay = bufferDeviceAddressCaptureReplay_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceBufferDeviceAddressFeaturesEXT &
-      setBufferDeviceAddressMultiDevice( Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
+      setBufferDeviceAddressMultiDevice( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressMultiDevice = bufferDeviceAddressMultiDevice_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceBufferDeviceAddressFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -79687,18 +57657,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceBufferDeviceAddressFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceBufferDeviceAddressFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceBufferDeviceAddressFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceBufferDeviceAddressFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceBufferDeviceAddressFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, bufferDeviceAddress, bufferDeviceAddressCaptureReplay, bufferDeviceAddressMultiDevice );
     }
@@ -79725,21 +57694,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT;
-    void *        pNext                            = {};
-    Bool32        bufferDeviceAddress              = {};
-    Bool32        bufferDeviceAddressCaptureReplay = {};
-    Bool32        bufferDeviceAddressMultiDevice   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddress              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressCaptureReplay = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressMultiDevice   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceBufferDeviceAddressFeaturesEXT>
-  {
-    using Type = PhysicalDeviceBufferDeviceAddressFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT>
   {
@@ -79748,268 +57709,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceBufferAddressFeaturesEXT = PhysicalDeviceBufferDeviceAddressFeaturesEXT;
 
-  // wrapper struct for struct VkPhysicalDeviceClusterAccelerationStructureFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceClusterAccelerationStructureFeaturesNV.html
-  struct PhysicalDeviceClusterAccelerationStructureFeaturesNV
-  {
-    using NativeType = VkPhysicalDeviceClusterAccelerationStructureFeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceClusterAccelerationStructureFeaturesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterAccelerationStructureFeaturesNV( Bool32 clusterAccelerationStructure_ = {},
-                                                                               void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , clusterAccelerationStructure{ clusterAccelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceClusterAccelerationStructureFeaturesNV( PhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceClusterAccelerationStructureFeaturesNV( VkPhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceClusterAccelerationStructureFeaturesNV( *reinterpret_cast<PhysicalDeviceClusterAccelerationStructureFeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceClusterAccelerationStructureFeaturesNV &
-      operator=( PhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceClusterAccelerationStructureFeaturesNV & operator=( VkPhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceClusterAccelerationStructureFeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterAccelerationStructureFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterAccelerationStructureFeaturesNV &
-      setClusterAccelerationStructure( Bool32 clusterAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      clusterAccelerationStructure = clusterAccelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceClusterAccelerationStructureFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceClusterAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructureFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceClusterAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructureFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceClusterAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructureFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceClusterAccelerationStructureFeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, clusterAccelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceClusterAccelerationStructureFeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( clusterAccelerationStructure == rhs.clusterAccelerationStructure );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceClusterAccelerationStructureFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                        = StructureType::ePhysicalDeviceClusterAccelerationStructureFeaturesNV;
-    void *        pNext                        = {};
-    Bool32        clusterAccelerationStructure = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceClusterAccelerationStructureFeaturesNV>
-  {
-    using Type = PhysicalDeviceClusterAccelerationStructureFeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceClusterAccelerationStructureFeaturesNV>
-  {
-    using Type = PhysicalDeviceClusterAccelerationStructureFeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceClusterAccelerationStructurePropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceClusterAccelerationStructurePropertiesNV.html
-  struct PhysicalDeviceClusterAccelerationStructurePropertiesNV
-  {
-    using NativeType = VkPhysicalDeviceClusterAccelerationStructurePropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceClusterAccelerationStructurePropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterAccelerationStructurePropertiesNV( uint32_t maxVerticesPerCluster_              = {},
-                                                                                 uint32_t maxTrianglesPerCluster_             = {},
-                                                                                 uint32_t clusterScratchByteAlignment_        = {},
-                                                                                 uint32_t clusterByteAlignment_               = {},
-                                                                                 uint32_t clusterTemplateByteAlignment_       = {},
-                                                                                 uint32_t clusterBottomLevelByteAlignment_    = {},
-                                                                                 uint32_t clusterTemplateBoundsByteAlignment_ = {},
-                                                                                 uint32_t maxClusterGeometryIndex_            = {},
-                                                                                 void *   pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxVerticesPerCluster{ maxVerticesPerCluster_ }
-      , maxTrianglesPerCluster{ maxTrianglesPerCluster_ }
-      , clusterScratchByteAlignment{ clusterScratchByteAlignment_ }
-      , clusterByteAlignment{ clusterByteAlignment_ }
-      , clusterTemplateByteAlignment{ clusterTemplateByteAlignment_ }
-      , clusterBottomLevelByteAlignment{ clusterBottomLevelByteAlignment_ }
-      , clusterTemplateBoundsByteAlignment{ clusterTemplateBoundsByteAlignment_ }
-      , maxClusterGeometryIndex{ maxClusterGeometryIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterAccelerationStructurePropertiesNV( PhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceClusterAccelerationStructurePropertiesNV( VkPhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceClusterAccelerationStructurePropertiesNV( *reinterpret_cast<PhysicalDeviceClusterAccelerationStructurePropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceClusterAccelerationStructurePropertiesNV &
-      operator=( PhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceClusterAccelerationStructurePropertiesNV &
-      operator=( VkPhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceClusterAccelerationStructurePropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructurePropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceClusterAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructurePropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceClusterAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructurePropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceClusterAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterAccelerationStructurePropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceClusterAccelerationStructurePropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       maxVerticesPerCluster,
-                       maxTrianglesPerCluster,
-                       clusterScratchByteAlignment,
-                       clusterByteAlignment,
-                       clusterTemplateByteAlignment,
-                       clusterBottomLevelByteAlignment,
-                       clusterTemplateBoundsByteAlignment,
-                       maxClusterGeometryIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceClusterAccelerationStructurePropertiesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxVerticesPerCluster == rhs.maxVerticesPerCluster ) &&
-             ( maxTrianglesPerCluster == rhs.maxTrianglesPerCluster ) && ( clusterScratchByteAlignment == rhs.clusterScratchByteAlignment ) &&
-             ( clusterByteAlignment == rhs.clusterByteAlignment ) && ( clusterTemplateByteAlignment == rhs.clusterTemplateByteAlignment ) &&
-             ( clusterBottomLevelByteAlignment == rhs.clusterBottomLevelByteAlignment ) &&
-             ( clusterTemplateBoundsByteAlignment == rhs.clusterTemplateBoundsByteAlignment ) && ( maxClusterGeometryIndex == rhs.maxClusterGeometryIndex );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceClusterAccelerationStructurePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                              = StructureType::ePhysicalDeviceClusterAccelerationStructurePropertiesNV;
-    void *        pNext                              = {};
-    uint32_t      maxVerticesPerCluster              = {};
-    uint32_t      maxTrianglesPerCluster             = {};
-    uint32_t      clusterScratchByteAlignment        = {};
-    uint32_t      clusterByteAlignment               = {};
-    uint32_t      clusterTemplateByteAlignment       = {};
-    uint32_t      clusterBottomLevelByteAlignment    = {};
-    uint32_t      clusterTemplateBoundsByteAlignment = {};
-    uint32_t      maxClusterGeometryIndex            = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceClusterAccelerationStructurePropertiesNV>
-  {
-    using Type = PhysicalDeviceClusterAccelerationStructurePropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceClusterAccelerationStructurePropertiesNV>
-  {
-    using Type = PhysicalDeviceClusterAccelerationStructurePropertiesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI.html
   struct PhysicalDeviceClusterCullingShaderFeaturesHUAWEI
   {
     using NativeType = VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
@@ -80017,13 +57716,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterCullingShaderFeaturesHUAWEI( Bool32 clustercullingShader_          = {},
-                                                                           Bool32 multiviewClusterCullingShader_ = {},
-                                                                           void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , clustercullingShader{ clustercullingShader_ }
-      , multiviewClusterCullingShader{ multiviewClusterCullingShader_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterCullingShaderFeaturesHUAWEI( VULKAN_HPP_NAMESPACE::Bool32 clustercullingShader_          = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 multiviewClusterCullingShader_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , clustercullingShader( clustercullingShader_ )
+      , multiviewClusterCullingShader( multiviewClusterCullingShader_ )
     {
     }
 
@@ -80036,34 +57735,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceClusterCullingShaderFeaturesHUAWEI & operator=( PhysicalDeviceClusterCullingShaderFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceClusterCullingShaderFeaturesHUAWEI & operator=( VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceClusterCullingShaderFeaturesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderFeaturesHUAWEI const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderFeaturesHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderFeaturesHUAWEI & setClustercullingShader( Bool32 clustercullingShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderFeaturesHUAWEI &
+      setClustercullingShader( VULKAN_HPP_NAMESPACE::Bool32 clustercullingShader_ ) VULKAN_HPP_NOEXCEPT
     {
       clustercullingShader = clustercullingShader_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderFeaturesHUAWEI &
-      setMultiviewClusterCullingShader( Bool32 multiviewClusterCullingShader_ ) VULKAN_HPP_NOEXCEPT
+      setMultiviewClusterCullingShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewClusterCullingShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewClusterCullingShader = multiviewClusterCullingShader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -80075,18 +57775,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, clustercullingShader, multiviewClusterCullingShader );
     }
@@ -80112,28 +57807,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
-    void *        pNext                         = {};
-    Bool32        clustercullingShader          = {};
-    Bool32        multiviewClusterCullingShader = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        clustercullingShader          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewClusterCullingShader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI>
   {
     using Type = PhysicalDeviceClusterCullingShaderFeaturesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI.html
   struct PhysicalDeviceClusterCullingShaderPropertiesHUAWEI
   {
     using NativeType = VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
@@ -80141,17 +57826,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderPropertiesHUAWEI( std::array<uint32_t, 3> const & maxWorkGroupCount_             = {},
-                                                                                std::array<uint32_t, 3> const & maxWorkGroupSize_              = {},
-                                                                                uint32_t                        maxOutputClusterCount_         = {},
-                                                                                DeviceSize                      indirectBufferOffsetAlignment_ = {},
-                                                                                void *                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxWorkGroupCount{ maxWorkGroupCount_ }
-      , maxWorkGroupSize{ maxWorkGroupSize_ }
-      , maxOutputClusterCount{ maxOutputClusterCount_ }
-      , indirectBufferOffsetAlignment{ indirectBufferOffsetAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderPropertiesHUAWEI( std::array<uint32_t, 3> const &  maxWorkGroupCount_             = {},
+                                                                                std::array<uint32_t, 3> const &  maxWorkGroupSize_              = {},
+                                                                                uint32_t                         maxOutputClusterCount_         = {},
+                                                                                VULKAN_HPP_NAMESPACE::DeviceSize indirectBufferOffsetAlignment_ = {},
+                                                                                void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxWorkGroupCount( maxWorkGroupCount_ )
+      , maxWorkGroupSize( maxWorkGroupSize_ )
+      , maxOutputClusterCount( maxOutputClusterCount_ )
+      , indirectBufferOffsetAlignment( indirectBufferOffsetAlignment_ )
     {
     }
 
@@ -80165,11 +57850,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceClusterCullingShaderPropertiesHUAWEI &
       operator=( PhysicalDeviceClusterCullingShaderPropertiesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceClusterCullingShaderPropertiesHUAWEI & operator=( VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceClusterCullingShaderPropertiesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderPropertiesHUAWEI const *>( &rhs );
       return *this;
     }
 
@@ -80183,23 +57868,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxWorkGroupCount, maxWorkGroupSize, maxOutputClusterCount, indirectBufferOffsetAlignment );
@@ -80227,30 +57906,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                         = StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
-    void *                      pNext                         = {};
-    ArrayWrapper1D<uint32_t, 3> maxWorkGroupCount             = {};
-    ArrayWrapper1D<uint32_t, 3> maxWorkGroupSize              = {};
-    uint32_t                    maxOutputClusterCount         = {};
-    DeviceSize                  indirectBufferOffsetAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                         = StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
+    void *                                            pNext                         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxWorkGroupCount             = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxWorkGroupSize              = {};
+    uint32_t                                          maxOutputClusterCount         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  indirectBufferOffsetAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI>
-  {
-    using Type = PhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI>
   {
     using Type = PhysicalDeviceClusterCullingShaderPropertiesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI.html
   struct PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI
   {
     using NativeType = VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
@@ -80258,10 +57927,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI( Bool32 clusterShadingRate_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , clusterShadingRate{ clusterShadingRate_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI( VULKAN_HPP_NAMESPACE::Bool32 clusterShadingRate_ = {},
+                                                                              void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , clusterShadingRate( clusterShadingRate_ )
     {
     }
 
@@ -80275,27 +57945,28 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI &
       operator=( PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI & operator=( VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI & setClusterShadingRate( Bool32 clusterShadingRate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI &
+      setClusterShadingRate( VULKAN_HPP_NAMESPACE::Bool32 clusterShadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       clusterShadingRate = clusterShadingRate_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -80307,18 +57978,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, clusterShadingRate );
     }
@@ -80343,27 +58009,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
-    void *        pNext              = {};
-    Bool32        clusterShadingRate = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        clusterShadingRate = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI>
   {
     using Type = PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCoherentMemoryFeaturesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCoherentMemoryFeaturesAMD.html
   struct PhysicalDeviceCoherentMemoryFeaturesAMD
   {
     using NativeType = VkPhysicalDeviceCoherentMemoryFeaturesAMD;
@@ -80371,10 +58027,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCoherentMemoryFeaturesAMD( Bool32 deviceCoherentMemory_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceCoherentMemory{ deviceCoherentMemory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCoherentMemoryFeaturesAMD( VULKAN_HPP_NAMESPACE::Bool32 deviceCoherentMemory_ = {},
+                                                                  void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceCoherentMemory( deviceCoherentMemory_ )
     {
     }
 
@@ -80386,27 +58043,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCoherentMemoryFeaturesAMD & operator=( PhysicalDeviceCoherentMemoryFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCoherentMemoryFeaturesAMD & operator=( VkPhysicalDeviceCoherentMemoryFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCoherentMemoryFeaturesAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCoherentMemoryFeaturesAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoherentMemoryFeaturesAMD & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoherentMemoryFeaturesAMD & setDeviceCoherentMemory( Bool32 deviceCoherentMemory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoherentMemoryFeaturesAMD &
+      setDeviceCoherentMemory( VULKAN_HPP_NAMESPACE::Bool32 deviceCoherentMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceCoherentMemory = deviceCoherentMemory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCoherentMemoryFeaturesAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -80418,18 +58076,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCoherentMemoryFeaturesAMD *>( this );
     }
 
-    operator VkPhysicalDeviceCoherentMemoryFeaturesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCoherentMemoryFeaturesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceCoherentMemoryFeaturesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCoherentMemoryFeaturesAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceCoherentMemory );
     }
@@ -80454,27 +58107,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD;
-    void *        pNext                = {};
-    Bool32        deviceCoherentMemory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceCoherentMemory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCoherentMemoryFeaturesAMD>
-  {
-    using Type = PhysicalDeviceCoherentMemoryFeaturesAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD>
   {
     using Type = PhysicalDeviceCoherentMemoryFeaturesAMD;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceColorWriteEnableFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceColorWriteEnableFeaturesEXT.html
   struct PhysicalDeviceColorWriteEnableFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceColorWriteEnableFeaturesEXT;
@@ -80482,10 +58125,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceColorWriteEnableFeaturesEXT( Bool32 colorWriteEnable_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorWriteEnable{ colorWriteEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceColorWriteEnableFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 colorWriteEnable_ = {},
+                                                                    void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , colorWriteEnable( colorWriteEnable_ )
     {
     }
 
@@ -80497,27 +58141,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceColorWriteEnableFeaturesEXT & operator=( PhysicalDeviceColorWriteEnableFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceColorWriteEnableFeaturesEXT & operator=( VkPhysicalDeviceColorWriteEnableFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceColorWriteEnableFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceColorWriteEnableFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceColorWriteEnableFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceColorWriteEnableFeaturesEXT & setColorWriteEnable( Bool32 colorWriteEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceColorWriteEnableFeaturesEXT &
+      setColorWriteEnable( VULKAN_HPP_NAMESPACE::Bool32 colorWriteEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       colorWriteEnable = colorWriteEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceColorWriteEnableFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -80529,18 +58174,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceColorWriteEnableFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceColorWriteEnableFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceColorWriteEnableFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceColorWriteEnableFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceColorWriteEnableFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorWriteEnable );
     }
@@ -80565,228 +58205,99 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT;
-    void *        pNext            = {};
-    Bool32        colorWriteEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        colorWriteEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceColorWriteEnableFeaturesEXT>
-  {
-    using Type = PhysicalDeviceColorWriteEnableFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT>
   {
     using Type = PhysicalDeviceColorWriteEnableFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCommandBufferInheritanceFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCommandBufferInheritanceFeaturesNV.html
-  struct PhysicalDeviceCommandBufferInheritanceFeaturesNV
+  struct PhysicalDeviceComputeShaderDerivativesFeaturesNV
   {
-    using NativeType = VkPhysicalDeviceCommandBufferInheritanceFeaturesNV;
+    using NativeType = VkPhysicalDeviceComputeShaderDerivativesFeaturesNV;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCommandBufferInheritanceFeaturesNV;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCommandBufferInheritanceFeaturesNV( Bool32 commandBufferInheritance_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , commandBufferInheritance{ commandBufferInheritance_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceComputeShaderDerivativesFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 computeDerivativeGroupQuads_  = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 computeDerivativeGroupLinear_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , computeDerivativeGroupQuads( computeDerivativeGroupQuads_ )
+      , computeDerivativeGroupLinear( computeDerivativeGroupLinear_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceCommandBufferInheritanceFeaturesNV( PhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceComputeShaderDerivativesFeaturesNV( PhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceCommandBufferInheritanceFeaturesNV( VkPhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCommandBufferInheritanceFeaturesNV( *reinterpret_cast<PhysicalDeviceCommandBufferInheritanceFeaturesNV const *>( &rhs ) )
+    PhysicalDeviceComputeShaderDerivativesFeaturesNV( VkPhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceComputeShaderDerivativesFeaturesNV( *reinterpret_cast<PhysicalDeviceComputeShaderDerivativesFeaturesNV const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceCommandBufferInheritanceFeaturesNV & operator=( PhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceComputeShaderDerivativesFeaturesNV & operator=( PhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceCommandBufferInheritanceFeaturesNV & operator=( VkPhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceComputeShaderDerivativesFeaturesNV & operator=( VkPhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCommandBufferInheritanceFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceComputeShaderDerivativesFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCommandBufferInheritanceFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCommandBufferInheritanceFeaturesNV &
-      setCommandBufferInheritance( Bool32 commandBufferInheritance_ ) VULKAN_HPP_NOEXCEPT
-    {
-      commandBufferInheritance = commandBufferInheritance_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceCommandBufferInheritanceFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCommandBufferInheritanceFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCommandBufferInheritanceFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCommandBufferInheritanceFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCommandBufferInheritanceFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCommandBufferInheritanceFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCommandBufferInheritanceFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCommandBufferInheritanceFeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, commandBufferInheritance );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCommandBufferInheritanceFeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( commandBufferInheritance == rhs.commandBufferInheritance );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCommandBufferInheritanceFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::ePhysicalDeviceCommandBufferInheritanceFeaturesNV;
-    void *        pNext                    = {};
-    Bool32        commandBufferInheritance = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCommandBufferInheritanceFeaturesNV>
-  {
-    using Type = PhysicalDeviceCommandBufferInheritanceFeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCommandBufferInheritanceFeaturesNV>
-  {
-    using Type = PhysicalDeviceCommandBufferInheritanceFeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR.html
-  struct PhysicalDeviceComputeShaderDerivativesFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceComputeShaderDerivativesFeaturesKHR( Bool32 computeDerivativeGroupQuads_  = {},
-                                                                            Bool32 computeDerivativeGroupLinear_ = {},
-                                                                            void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , computeDerivativeGroupQuads{ computeDerivativeGroupQuads_ }
-      , computeDerivativeGroupLinear{ computeDerivativeGroupLinear_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceComputeShaderDerivativesFeaturesKHR( PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceComputeShaderDerivativesFeaturesKHR( VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceComputeShaderDerivativesFeaturesKHR( *reinterpret_cast<PhysicalDeviceComputeShaderDerivativesFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceComputeShaderDerivativesFeaturesKHR &
-      operator=( PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceComputeShaderDerivativesFeaturesKHR & operator=( VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceComputeShaderDerivativesFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesKHR &
-      setComputeDerivativeGroupQuads( Bool32 computeDerivativeGroupQuads_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesNV &
+      setComputeDerivativeGroupQuads( VULKAN_HPP_NAMESPACE::Bool32 computeDerivativeGroupQuads_ ) VULKAN_HPP_NOEXCEPT
     {
       computeDerivativeGroupQuads = computeDerivativeGroupQuads_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesKHR &
-      setComputeDerivativeGroupLinear( Bool32 computeDerivativeGroupLinear_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceComputeShaderDerivativesFeaturesNV &
+      setComputeDerivativeGroupLinear( VULKAN_HPP_NAMESPACE::Bool32 computeDerivativeGroupLinear_ ) VULKAN_HPP_NOEXCEPT
     {
       computeDerivativeGroupLinear = computeDerivativeGroupLinear_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, computeDerivativeGroupQuads, computeDerivativeGroupLinear );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceComputeShaderDerivativesFeaturesNV const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -80796,137 +58307,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceComputeShaderDerivativesFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceComputeShaderDerivativesFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-    void *        pNext                        = {};
-    Bool32        computeDerivativeGroupQuads  = {};
-    Bool32        computeDerivativeGroupLinear = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesNV;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        computeDerivativeGroupQuads  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        computeDerivativeGroupLinear = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR>
-  {
-    using Type = PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesNV>
   {
-    using Type = PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
+    using Type = PhysicalDeviceComputeShaderDerivativesFeaturesNV;
   };
 
-  using PhysicalDeviceComputeShaderDerivativesFeaturesNV = PhysicalDeviceComputeShaderDerivativesFeaturesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR.html
-  struct PhysicalDeviceComputeShaderDerivativesPropertiesKHR
-  {
-    using NativeType = VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceComputeShaderDerivativesPropertiesKHR( Bool32 meshAndTaskShaderDerivatives_ = {},
-                                                                              void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , meshAndTaskShaderDerivatives{ meshAndTaskShaderDerivatives_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceComputeShaderDerivativesPropertiesKHR( PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceComputeShaderDerivativesPropertiesKHR( VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceComputeShaderDerivativesPropertiesKHR( *reinterpret_cast<PhysicalDeviceComputeShaderDerivativesPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceComputeShaderDerivativesPropertiesKHR &
-      operator=( PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceComputeShaderDerivativesPropertiesKHR & operator=( VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceComputeShaderDerivativesPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, meshAndTaskShaderDerivatives );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( meshAndTaskShaderDerivatives == rhs.meshAndTaskShaderDerivatives );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceComputeShaderDerivativesPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                        = StructureType::ePhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-    void *        pNext                        = {};
-    Bool32        meshAndTaskShaderDerivatives = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR>
-  {
-    using Type = PhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceComputeShaderDerivativesPropertiesKHR>
-  {
-    using Type = PhysicalDeviceComputeShaderDerivativesPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceConditionalRenderingFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceConditionalRenderingFeaturesEXT.html
   struct PhysicalDeviceConditionalRenderingFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceConditionalRenderingFeaturesEXT;
@@ -80934,13 +58333,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceConditionalRenderingFeaturesEXT( Bool32 conditionalRendering_          = {},
-                                                                        Bool32 inheritedConditionalRendering_ = {},
-                                                                        void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , conditionalRendering{ conditionalRendering_ }
-      , inheritedConditionalRendering{ inheritedConditionalRendering_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceConditionalRenderingFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 conditionalRendering_          = {},
+                                                                        VULKAN_HPP_NAMESPACE::Bool32 inheritedConditionalRendering_ = {},
+                                                                        void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , conditionalRendering( conditionalRendering_ )
+      , inheritedConditionalRendering( inheritedConditionalRendering_ )
     {
     }
 
@@ -80953,34 +58352,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceConditionalRenderingFeaturesEXT & operator=( PhysicalDeviceConditionalRenderingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceConditionalRenderingFeaturesEXT & operator=( VkPhysicalDeviceConditionalRenderingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceConditionalRenderingFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceConditionalRenderingFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceConditionalRenderingFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceConditionalRenderingFeaturesEXT & setConditionalRendering( Bool32 conditionalRendering_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceConditionalRenderingFeaturesEXT &
+      setConditionalRendering( VULKAN_HPP_NAMESPACE::Bool32 conditionalRendering_ ) VULKAN_HPP_NOEXCEPT
     {
       conditionalRendering = conditionalRendering_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceConditionalRenderingFeaturesEXT &
-      setInheritedConditionalRendering( Bool32 inheritedConditionalRendering_ ) VULKAN_HPP_NOEXCEPT
+      setInheritedConditionalRendering( VULKAN_HPP_NAMESPACE::Bool32 inheritedConditionalRendering_ ) VULKAN_HPP_NOEXCEPT
     {
       inheritedConditionalRendering = inheritedConditionalRendering_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceConditionalRenderingFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -80992,18 +58392,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceConditionalRenderingFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceConditionalRenderingFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceConditionalRenderingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceConditionalRenderingFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceConditionalRenderingFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, conditionalRendering, inheritedConditionalRendering );
     }
@@ -81029,28 +58424,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT;
-    void *        pNext                         = {};
-    Bool32        conditionalRendering          = {};
-    Bool32        inheritedConditionalRendering = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        conditionalRendering          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        inheritedConditionalRendering = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceConditionalRenderingFeaturesEXT>
-  {
-    using Type = PhysicalDeviceConditionalRenderingFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT>
   {
     using Type = PhysicalDeviceConditionalRenderingFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceConservativeRasterizationPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceConservativeRasterizationPropertiesEXT.html
   struct PhysicalDeviceConservativeRasterizationPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceConservativeRasterizationPropertiesEXT;
@@ -81058,27 +58443,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceConservativeRasterizationPropertiesEXT( float  primitiveOverestimationSize_                 = {},
-                                                                               float  maxExtraPrimitiveOverestimationSize_         = {},
-                                                                               float  extraPrimitiveOverestimationSizeGranularity_ = {},
-                                                                               Bool32 primitiveUnderestimation_                    = {},
-                                                                               Bool32 conservativePointAndLineRasterization_       = {},
-                                                                               Bool32 degenerateTrianglesRasterized_               = {},
-                                                                               Bool32 degenerateLinesRasterized_                   = {},
-                                                                               Bool32 fullyCoveredFragmentShaderInputVariable_     = {},
-                                                                               Bool32 conservativeRasterizationPostDepthCoverage_  = {},
-                                                                               void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , primitiveOverestimationSize{ primitiveOverestimationSize_ }
-      , maxExtraPrimitiveOverestimationSize{ maxExtraPrimitiveOverestimationSize_ }
-      , extraPrimitiveOverestimationSizeGranularity{ extraPrimitiveOverestimationSizeGranularity_ }
-      , primitiveUnderestimation{ primitiveUnderestimation_ }
-      , conservativePointAndLineRasterization{ conservativePointAndLineRasterization_ }
-      , degenerateTrianglesRasterized{ degenerateTrianglesRasterized_ }
-      , degenerateLinesRasterized{ degenerateLinesRasterized_ }
-      , fullyCoveredFragmentShaderInputVariable{ fullyCoveredFragmentShaderInputVariable_ }
-      , conservativeRasterizationPostDepthCoverage{ conservativeRasterizationPostDepthCoverage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceConservativeRasterizationPropertiesEXT( float                        primitiveOverestimationSize_                 = {},
+                                                                               float                        maxExtraPrimitiveOverestimationSize_         = {},
+                                                                               float                        extraPrimitiveOverestimationSizeGranularity_ = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 primitiveUnderestimation_                    = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 conservativePointAndLineRasterization_       = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 degenerateTrianglesRasterized_               = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 degenerateLinesRasterized_                   = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 fullyCoveredFragmentShaderInputVariable_     = {},
+                                                                               VULKAN_HPP_NAMESPACE::Bool32 conservativeRasterizationPostDepthCoverage_  = {},
+                                                                               void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , primitiveOverestimationSize( primitiveOverestimationSize_ )
+      , maxExtraPrimitiveOverestimationSize( maxExtraPrimitiveOverestimationSize_ )
+      , extraPrimitiveOverestimationSizeGranularity( extraPrimitiveOverestimationSizeGranularity_ )
+      , primitiveUnderestimation( primitiveUnderestimation_ )
+      , conservativePointAndLineRasterization( conservativePointAndLineRasterization_ )
+      , degenerateTrianglesRasterized( degenerateTrianglesRasterized_ )
+      , degenerateLinesRasterized( degenerateLinesRasterized_ )
+      , fullyCoveredFragmentShaderInputVariable( fullyCoveredFragmentShaderInputVariable_ )
+      , conservativeRasterizationPostDepthCoverage( conservativeRasterizationPostDepthCoverage_ )
     {
     }
 
@@ -81092,11 +58477,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceConservativeRasterizationPropertiesEXT &
       operator=( PhysicalDeviceConservativeRasterizationPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceConservativeRasterizationPropertiesEXT & operator=( VkPhysicalDeviceConservativeRasterizationPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceConservativeRasterizationPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceConservativeRasterizationPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -81110,28 +58495,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceConservativeRasterizationPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceConservativeRasterizationPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceConservativeRasterizationPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceConservativeRasterizationPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceConservativeRasterizationPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                float const &,
                float const &,
                float const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -81174,341 +58553,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                       = StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT;
-    void *        pNext                                       = {};
-    float         primitiveOverestimationSize                 = {};
-    float         maxExtraPrimitiveOverestimationSize         = {};
-    float         extraPrimitiveOverestimationSizeGranularity = {};
-    Bool32        primitiveUnderestimation                    = {};
-    Bool32        conservativePointAndLineRasterization       = {};
-    Bool32        degenerateTrianglesRasterized               = {};
-    Bool32        degenerateLinesRasterized                   = {};
-    Bool32        fullyCoveredFragmentShaderInputVariable     = {};
-    Bool32        conservativeRasterizationPostDepthCoverage  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                       = StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT;
+    void *                              pNext                                       = {};
+    float                               primitiveOverestimationSize                 = {};
+    float                               maxExtraPrimitiveOverestimationSize         = {};
+    float                               extraPrimitiveOverestimationSizeGranularity = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitiveUnderestimation                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        conservativePointAndLineRasterization       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        degenerateTrianglesRasterized               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        degenerateLinesRasterized                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fullyCoveredFragmentShaderInputVariable     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        conservativeRasterizationPostDepthCoverage  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>
-  {
-    using Type = PhysicalDeviceConservativeRasterizationPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT>
   {
     using Type = PhysicalDeviceConservativeRasterizationPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrix2FeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrix2FeaturesNV.html
-  struct PhysicalDeviceCooperativeMatrix2FeaturesNV
-  {
-    using NativeType = VkPhysicalDeviceCooperativeMatrix2FeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrix2FeaturesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrix2FeaturesNV( Bool32 cooperativeMatrixWorkgroupScope_       = {},
-                                                                     Bool32 cooperativeMatrixFlexibleDimensions_   = {},
-                                                                     Bool32 cooperativeMatrixReductions_           = {},
-                                                                     Bool32 cooperativeMatrixConversions_          = {},
-                                                                     Bool32 cooperativeMatrixPerElementOperations_ = {},
-                                                                     Bool32 cooperativeMatrixTensorAddressing_     = {},
-                                                                     Bool32 cooperativeMatrixBlockLoads_           = {},
-                                                                     void * pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrixWorkgroupScope{ cooperativeMatrixWorkgroupScope_ }
-      , cooperativeMatrixFlexibleDimensions{ cooperativeMatrixFlexibleDimensions_ }
-      , cooperativeMatrixReductions{ cooperativeMatrixReductions_ }
-      , cooperativeMatrixConversions{ cooperativeMatrixConversions_ }
-      , cooperativeMatrixPerElementOperations{ cooperativeMatrixPerElementOperations_ }
-      , cooperativeMatrixTensorAddressing{ cooperativeMatrixTensorAddressing_ }
-      , cooperativeMatrixBlockLoads{ cooperativeMatrixBlockLoads_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrix2FeaturesNV( PhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCooperativeMatrix2FeaturesNV( VkPhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCooperativeMatrix2FeaturesNV( *reinterpret_cast<PhysicalDeviceCooperativeMatrix2FeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCooperativeMatrix2FeaturesNV & operator=( PhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCooperativeMatrix2FeaturesNV & operator=( VkPhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrix2FeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixWorkgroupScope( Bool32 cooperativeMatrixWorkgroupScope_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixWorkgroupScope = cooperativeMatrixWorkgroupScope_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixFlexibleDimensions( Bool32 cooperativeMatrixFlexibleDimensions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixFlexibleDimensions = cooperativeMatrixFlexibleDimensions_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixReductions( Bool32 cooperativeMatrixReductions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixReductions = cooperativeMatrixReductions_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixConversions( Bool32 cooperativeMatrixConversions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixConversions = cooperativeMatrixConversions_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixPerElementOperations( Bool32 cooperativeMatrixPerElementOperations_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixPerElementOperations = cooperativeMatrixPerElementOperations_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixTensorAddressing( Bool32 cooperativeMatrixTensorAddressing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixTensorAddressing = cooperativeMatrixTensorAddressing_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrix2FeaturesNV &
-      setCooperativeMatrixBlockLoads( Bool32 cooperativeMatrixBlockLoads_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeMatrixBlockLoads = cooperativeMatrixBlockLoads_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceCooperativeMatrix2FeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCooperativeMatrix2FeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2FeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrix2FeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2FeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrix2FeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2FeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrix2FeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       cooperativeMatrixWorkgroupScope,
-                       cooperativeMatrixFlexibleDimensions,
-                       cooperativeMatrixReductions,
-                       cooperativeMatrixConversions,
-                       cooperativeMatrixPerElementOperations,
-                       cooperativeMatrixTensorAddressing,
-                       cooperativeMatrixBlockLoads );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCooperativeMatrix2FeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( cooperativeMatrixWorkgroupScope == rhs.cooperativeMatrixWorkgroupScope ) &&
-             ( cooperativeMatrixFlexibleDimensions == rhs.cooperativeMatrixFlexibleDimensions ) &&
-             ( cooperativeMatrixReductions == rhs.cooperativeMatrixReductions ) && ( cooperativeMatrixConversions == rhs.cooperativeMatrixConversions ) &&
-             ( cooperativeMatrixPerElementOperations == rhs.cooperativeMatrixPerElementOperations ) &&
-             ( cooperativeMatrixTensorAddressing == rhs.cooperativeMatrixTensorAddressing ) &&
-             ( cooperativeMatrixBlockLoads == rhs.cooperativeMatrixBlockLoads );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCooperativeMatrix2FeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                 = StructureType::ePhysicalDeviceCooperativeMatrix2FeaturesNV;
-    void *        pNext                                 = {};
-    Bool32        cooperativeMatrixWorkgroupScope       = {};
-    Bool32        cooperativeMatrixFlexibleDimensions   = {};
-    Bool32        cooperativeMatrixReductions           = {};
-    Bool32        cooperativeMatrixConversions          = {};
-    Bool32        cooperativeMatrixPerElementOperations = {};
-    Bool32        cooperativeMatrixTensorAddressing     = {};
-    Bool32        cooperativeMatrixBlockLoads           = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrix2FeaturesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrix2FeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrix2FeaturesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrix2FeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrix2PropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrix2PropertiesNV.html
-  struct PhysicalDeviceCooperativeMatrix2PropertiesNV
-  {
-    using NativeType = VkPhysicalDeviceCooperativeMatrix2PropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrix2PropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrix2PropertiesNV( uint32_t cooperativeMatrixWorkgroupScopeMaxWorkgroupSize_     = {},
-                                                                       uint32_t cooperativeMatrixFlexibleDimensionsMaxDimension_     = {},
-                                                                       uint32_t cooperativeMatrixWorkgroupScopeReservedSharedMemory_ = {},
-                                                                       void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrixWorkgroupScopeMaxWorkgroupSize{ cooperativeMatrixWorkgroupScopeMaxWorkgroupSize_ }
-      , cooperativeMatrixFlexibleDimensionsMaxDimension{ cooperativeMatrixFlexibleDimensionsMaxDimension_ }
-      , cooperativeMatrixWorkgroupScopeReservedSharedMemory{ cooperativeMatrixWorkgroupScopeReservedSharedMemory_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrix2PropertiesNV( PhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCooperativeMatrix2PropertiesNV( VkPhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCooperativeMatrix2PropertiesNV( *reinterpret_cast<PhysicalDeviceCooperativeMatrix2PropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCooperativeMatrix2PropertiesNV & operator=( PhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCooperativeMatrix2PropertiesNV & operator=( VkPhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrix2PropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2PropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCooperativeMatrix2PropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2PropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrix2PropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2PropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrix2PropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrix2PropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrix2PropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       cooperativeMatrixWorkgroupScopeMaxWorkgroupSize,
-                       cooperativeMatrixFlexibleDimensionsMaxDimension,
-                       cooperativeMatrixWorkgroupScopeReservedSharedMemory );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCooperativeMatrix2PropertiesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) &&
-             ( cooperativeMatrixWorkgroupScopeMaxWorkgroupSize == rhs.cooperativeMatrixWorkgroupScopeMaxWorkgroupSize ) &&
-             ( cooperativeMatrixFlexibleDimensionsMaxDimension == rhs.cooperativeMatrixFlexibleDimensionsMaxDimension ) &&
-             ( cooperativeMatrixWorkgroupScopeReservedSharedMemory == rhs.cooperativeMatrixWorkgroupScopeReservedSharedMemory );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCooperativeMatrix2PropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                               = StructureType::ePhysicalDeviceCooperativeMatrix2PropertiesNV;
-    void *        pNext                                               = {};
-    uint32_t      cooperativeMatrixWorkgroupScopeMaxWorkgroupSize     = {};
-    uint32_t      cooperativeMatrixFlexibleDimensionsMaxDimension     = {};
-    uint32_t      cooperativeMatrixWorkgroupScopeReservedSharedMemory = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrix2PropertiesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrix2PropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrix2PropertiesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrix2PropertiesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrixFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrixFeaturesKHR.html
   struct PhysicalDeviceCooperativeMatrixFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceCooperativeMatrixFeaturesKHR;
@@ -81516,13 +58579,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixFeaturesKHR( Bool32 cooperativeMatrix_                   = {},
-                                                                     Bool32 cooperativeMatrixRobustBufferAccess_ = {},
-                                                                     void * pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrix{ cooperativeMatrix_ }
-      , cooperativeMatrixRobustBufferAccess{ cooperativeMatrixRobustBufferAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrix_                   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrixRobustBufferAccess_ = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cooperativeMatrix( cooperativeMatrix_ )
+      , cooperativeMatrixRobustBufferAccess( cooperativeMatrixRobustBufferAccess_ )
     {
     }
 
@@ -81534,34 +58597,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCooperativeMatrixFeaturesKHR & operator=( PhysicalDeviceCooperativeMatrixFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCooperativeMatrixFeaturesKHR & operator=( VkPhysicalDeviceCooperativeMatrixFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrixFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesKHR & setCooperativeMatrix( Bool32 cooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesKHR &
+      setCooperativeMatrix( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
     {
       cooperativeMatrix = cooperativeMatrix_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesKHR &
-      setCooperativeMatrixRobustBufferAccess( Bool32 cooperativeMatrixRobustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
+      setCooperativeMatrixRobustBufferAccess( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrixRobustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       cooperativeMatrixRobustBufferAccess = cooperativeMatrixRobustBufferAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCooperativeMatrixFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -81573,18 +58637,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrixFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceCooperativeMatrixFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrixFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrixFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrixFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cooperativeMatrix, cooperativeMatrixRobustBufferAccess );
     }
@@ -81610,28 +58669,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR;
-    void *        pNext                               = {};
-    Bool32        cooperativeMatrix                   = {};
-    Bool32        cooperativeMatrixRobustBufferAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR;
+    void *                              pNext                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cooperativeMatrix                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cooperativeMatrixRobustBufferAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrixFeaturesKHR>
-  {
-    using Type = PhysicalDeviceCooperativeMatrixFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR>
   {
     using Type = PhysicalDeviceCooperativeMatrixFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrixFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrixFeaturesNV.html
   struct PhysicalDeviceCooperativeMatrixFeaturesNV
   {
     using NativeType = VkPhysicalDeviceCooperativeMatrixFeaturesNV;
@@ -81639,13 +58688,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixFeaturesNV( Bool32 cooperativeMatrix_                   = {},
-                                                                    Bool32 cooperativeMatrixRobustBufferAccess_ = {},
-                                                                    void * pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrix{ cooperativeMatrix_ }
-      , cooperativeMatrixRobustBufferAccess{ cooperativeMatrixRobustBufferAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrix_                   = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrixRobustBufferAccess_ = {},
+                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cooperativeMatrix( cooperativeMatrix_ )
+      , cooperativeMatrixRobustBufferAccess( cooperativeMatrixRobustBufferAccess_ )
     {
     }
 
@@ -81657,34 +58706,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCooperativeMatrixFeaturesNV & operator=( PhysicalDeviceCooperativeMatrixFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCooperativeMatrixFeaturesNV & operator=( VkPhysicalDeviceCooperativeMatrixFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrixFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesNV & setCooperativeMatrix( Bool32 cooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesNV &
+      setCooperativeMatrix( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
     {
       cooperativeMatrix = cooperativeMatrix_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeMatrixFeaturesNV &
-      setCooperativeMatrixRobustBufferAccess( Bool32 cooperativeMatrixRobustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
+      setCooperativeMatrixRobustBufferAccess( VULKAN_HPP_NAMESPACE::Bool32 cooperativeMatrixRobustBufferAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       cooperativeMatrixRobustBufferAccess = cooperativeMatrixRobustBufferAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCooperativeMatrixFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -81696,18 +58746,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrixFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCooperativeMatrixFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrixFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrixFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrixFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cooperativeMatrix, cooperativeMatrixRobustBufferAccess );
     }
@@ -81733,28 +58778,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV;
-    void *        pNext                               = {};
-    Bool32        cooperativeMatrix                   = {};
-    Bool32        cooperativeMatrixRobustBufferAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV;
+    void *                              pNext                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cooperativeMatrix                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cooperativeMatrixRobustBufferAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrixFeaturesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrixFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV>
   {
     using Type = PhysicalDeviceCooperativeMatrixFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrixPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrixPropertiesKHR.html
   struct PhysicalDeviceCooperativeMatrixPropertiesKHR
   {
     using NativeType = VkPhysicalDeviceCooperativeMatrixPropertiesKHR;
@@ -81762,11 +58797,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixPropertiesKHR( ShaderStageFlags cooperativeMatrixSupportedStages_ = {},
-                                                                       void *           pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrixSupportedStages{ cooperativeMatrixSupportedStages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixPropertiesKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags cooperativeMatrixSupportedStages_ = {},
+                                                                       void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cooperativeMatrixSupportedStages( cooperativeMatrixSupportedStages_ )
     {
     }
 
@@ -81778,11 +58813,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCooperativeMatrixPropertiesKHR & operator=( PhysicalDeviceCooperativeMatrixPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCooperativeMatrixPropertiesKHR & operator=( VkPhysicalDeviceCooperativeMatrixPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrixPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -81796,18 +58831,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrixPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceCooperativeMatrixPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrixPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrixPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrixPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ShaderStageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ShaderStageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cooperativeMatrixSupportedStages );
     }
@@ -81832,27 +58862,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                            = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR;
-    void *           pNext                            = {};
-    ShaderStageFlags cooperativeMatrixSupportedStages = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                            = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR;
+    void *                                 pNext                            = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags cooperativeMatrixSupportedStages = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrixPropertiesKHR>
-  {
-    using Type = PhysicalDeviceCooperativeMatrixPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR>
   {
     using Type = PhysicalDeviceCooperativeMatrixPropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCooperativeMatrixPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeMatrixPropertiesNV.html
   struct PhysicalDeviceCooperativeMatrixPropertiesNV
   {
     using NativeType = VkPhysicalDeviceCooperativeMatrixPropertiesNV;
@@ -81860,11 +58880,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixPropertiesNV( ShaderStageFlags cooperativeMatrixSupportedStages_ = {},
-                                                                      void *           pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeMatrixSupportedStages{ cooperativeMatrixSupportedStages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeMatrixPropertiesNV( VULKAN_HPP_NAMESPACE::ShaderStageFlags cooperativeMatrixSupportedStages_ = {},
+                                                                      void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cooperativeMatrixSupportedStages( cooperativeMatrixSupportedStages_ )
     {
     }
 
@@ -81876,11 +58896,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCooperativeMatrixPropertiesNV & operator=( PhysicalDeviceCooperativeMatrixPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCooperativeMatrixPropertiesNV & operator=( VkPhysicalDeviceCooperativeMatrixPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeMatrixPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCooperativeMatrixPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -81894,18 +58914,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCooperativeMatrixPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCooperativeMatrixPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeMatrixPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeMatrixPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeMatrixPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ShaderStageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ShaderStageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cooperativeMatrixSupportedStages );
     }
@@ -81930,387 +58945,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                            = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV;
-    void *           pNext                            = {};
-    ShaderStageFlags cooperativeMatrixSupportedStages = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                            = StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV;
+    void *                                 pNext                            = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags cooperativeMatrixSupportedStages = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeMatrixPropertiesNV>
-  {
-    using Type = PhysicalDeviceCooperativeMatrixPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV>
   {
     using Type = PhysicalDeviceCooperativeMatrixPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCooperativeVectorFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeVectorFeaturesNV.html
-  struct PhysicalDeviceCooperativeVectorFeaturesNV
-  {
-    using NativeType = VkPhysicalDeviceCooperativeVectorFeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeVectorFeaturesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeVectorFeaturesNV( Bool32 cooperativeVector_         = {},
-                                                                    Bool32 cooperativeVectorTraining_ = {},
-                                                                    void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeVector{ cooperativeVector_ }
-      , cooperativeVectorTraining{ cooperativeVectorTraining_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeVectorFeaturesNV( PhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCooperativeVectorFeaturesNV( VkPhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCooperativeVectorFeaturesNV( *reinterpret_cast<PhysicalDeviceCooperativeVectorFeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCooperativeVectorFeaturesNV & operator=( PhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCooperativeVectorFeaturesNV & operator=( VkPhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeVectorFeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeVectorFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeVectorFeaturesNV & setCooperativeVector( Bool32 cooperativeVector_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeVector = cooperativeVector_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCooperativeVectorFeaturesNV & setCooperativeVectorTraining( Bool32 cooperativeVectorTraining_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cooperativeVectorTraining = cooperativeVectorTraining_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceCooperativeVectorFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCooperativeVectorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCooperativeVectorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeVectorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeVectorFeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, cooperativeVector, cooperativeVectorTraining );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCooperativeVectorFeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( cooperativeVector == rhs.cooperativeVector ) &&
-             ( cooperativeVectorTraining == rhs.cooperativeVectorTraining );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCooperativeVectorFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                     = StructureType::ePhysicalDeviceCooperativeVectorFeaturesNV;
-    void *        pNext                     = {};
-    Bool32        cooperativeVector         = {};
-    Bool32        cooperativeVectorTraining = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeVectorFeaturesNV>
-  {
-    using Type = PhysicalDeviceCooperativeVectorFeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeVectorFeaturesNV>
-  {
-    using Type = PhysicalDeviceCooperativeVectorFeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceCooperativeVectorPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCooperativeVectorPropertiesNV.html
-  struct PhysicalDeviceCooperativeVectorPropertiesNV
-  {
-    using NativeType = VkPhysicalDeviceCooperativeVectorPropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCooperativeVectorPropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeVectorPropertiesNV( ShaderStageFlags cooperativeVectorSupportedStages_             = {},
-                                                                      Bool32           cooperativeVectorTrainingFloat16Accumulation_ = {},
-                                                                      Bool32           cooperativeVectorTrainingFloat32Accumulation_ = {},
-                                                                      uint32_t         maxCooperativeVectorComponents_               = {},
-                                                                      void *           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cooperativeVectorSupportedStages{ cooperativeVectorSupportedStages_ }
-      , cooperativeVectorTrainingFloat16Accumulation{ cooperativeVectorTrainingFloat16Accumulation_ }
-      , cooperativeVectorTrainingFloat32Accumulation{ cooperativeVectorTrainingFloat32Accumulation_ }
-      , maxCooperativeVectorComponents{ maxCooperativeVectorComponents_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCooperativeVectorPropertiesNV( PhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCooperativeVectorPropertiesNV( VkPhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCooperativeVectorPropertiesNV( *reinterpret_cast<PhysicalDeviceCooperativeVectorPropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCooperativeVectorPropertiesNV & operator=( PhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCooperativeVectorPropertiesNV & operator=( VkPhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCooperativeVectorPropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorPropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCooperativeVectorPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCooperativeVectorPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCooperativeVectorPropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ShaderStageFlags const &, Bool32 const &, Bool32 const &, uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       cooperativeVectorSupportedStages,
-                       cooperativeVectorTrainingFloat16Accumulation,
-                       cooperativeVectorTrainingFloat32Accumulation,
-                       maxCooperativeVectorComponents );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCooperativeVectorPropertiesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( cooperativeVectorSupportedStages == rhs.cooperativeVectorSupportedStages ) &&
-             ( cooperativeVectorTrainingFloat16Accumulation == rhs.cooperativeVectorTrainingFloat16Accumulation ) &&
-             ( cooperativeVectorTrainingFloat32Accumulation == rhs.cooperativeVectorTrainingFloat32Accumulation ) &&
-             ( maxCooperativeVectorComponents == rhs.maxCooperativeVectorComponents );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCooperativeVectorPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType                                        = StructureType::ePhysicalDeviceCooperativeVectorPropertiesNV;
-    void *           pNext                                        = {};
-    ShaderStageFlags cooperativeVectorSupportedStages             = {};
-    Bool32           cooperativeVectorTrainingFloat16Accumulation = {};
-    Bool32           cooperativeVectorTrainingFloat32Accumulation = {};
-    uint32_t         maxCooperativeVectorComponents               = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCooperativeVectorPropertiesNV>
-  {
-    using Type = PhysicalDeviceCooperativeVectorPropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCooperativeVectorPropertiesNV>
-  {
-    using Type = PhysicalDeviceCooperativeVectorPropertiesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR.html
-  struct PhysicalDeviceCopyMemoryIndirectFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectFeaturesKHR( Bool32 indirectMemoryCopy_        = {},
-                                                                      Bool32 indirectMemoryToImageCopy_ = {},
-                                                                      void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , indirectMemoryCopy{ indirectMemoryCopy_ }
-      , indirectMemoryToImageCopy{ indirectMemoryToImageCopy_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectFeaturesKHR( PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCopyMemoryIndirectFeaturesKHR( VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCopyMemoryIndirectFeaturesKHR( *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCopyMemoryIndirectFeaturesKHR & operator=( PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCopyMemoryIndirectFeaturesKHR & operator=( VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesKHR & setIndirectMemoryCopy( Bool32 indirectMemoryCopy_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectMemoryCopy = indirectMemoryCopy_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesKHR & setIndirectMemoryToImageCopy( Bool32 indirectMemoryToImageCopy_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indirectMemoryToImageCopy = indirectMemoryToImageCopy_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, indirectMemoryCopy, indirectMemoryToImageCopy );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( indirectMemoryCopy == rhs.indirectMemoryCopy ) &&
-             ( indirectMemoryToImageCopy == rhs.indirectMemoryToImageCopy );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCopyMemoryIndirectFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                     = StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-    void *        pNext                     = {};
-    Bool32        indirectMemoryCopy        = {};
-    Bool32        indirectMemoryToImageCopy = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR>
-  {
-    using Type = PhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesKHR>
-  {
-    using Type = PhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceCopyMemoryIndirectFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCopyMemoryIndirectFeaturesNV.html
   struct PhysicalDeviceCopyMemoryIndirectFeaturesNV
   {
     using NativeType = VkPhysicalDeviceCopyMemoryIndirectFeaturesNV;
@@ -82318,10 +58963,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectFeaturesNV( Bool32 indirectCopy_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , indirectCopy{ indirectCopy_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 indirectCopy_ = {},
+                                                                     void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , indirectCopy( indirectCopy_ )
     {
     }
 
@@ -82333,27 +58979,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCopyMemoryIndirectFeaturesNV & operator=( PhysicalDeviceCopyMemoryIndirectFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCopyMemoryIndirectFeaturesNV & operator=( VkPhysicalDeviceCopyMemoryIndirectFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesNV & setIndirectCopy( Bool32 indirectCopy_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCopyMemoryIndirectFeaturesNV & setIndirectCopy( VULKAN_HPP_NAMESPACE::Bool32 indirectCopy_ ) VULKAN_HPP_NOEXCEPT
     {
       indirectCopy = indirectCopy_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCopyMemoryIndirectFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -82365,18 +59011,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, indirectCopy );
     }
@@ -82401,89 +59042,74 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV;
-    void *        pNext        = {};
-    Bool32        indirectCopy = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        indirectCopy = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCopyMemoryIndirectFeaturesNV>
-  {
-    using Type = PhysicalDeviceCopyMemoryIndirectFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV>
   {
     using Type = PhysicalDeviceCopyMemoryIndirectFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR.html
-  struct PhysicalDeviceCopyMemoryIndirectPropertiesKHR
+  struct PhysicalDeviceCopyMemoryIndirectPropertiesNV
   {
-    using NativeType = VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR;
+    using NativeType = VkPhysicalDeviceCopyMemoryIndirectPropertiesNV;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectPropertiesKHR( QueueFlags supportedQueues_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportedQueues{ supportedQueues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectPropertiesNV( VULKAN_HPP_NAMESPACE::QueueFlags supportedQueues_ = {},
+                                                                       void *                           pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportedQueues( supportedQueues_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceCopyMemoryIndirectPropertiesKHR( PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCopyMemoryIndirectPropertiesNV( PhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceCopyMemoryIndirectPropertiesKHR( VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCopyMemoryIndirectPropertiesKHR( *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectPropertiesKHR const *>( &rhs ) )
+    PhysicalDeviceCopyMemoryIndirectPropertiesNV( VkPhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceCopyMemoryIndirectPropertiesNV( *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectPropertiesNV const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceCopyMemoryIndirectPropertiesKHR & operator=( PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceCopyMemoryIndirectPropertiesNV & operator=( PhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceCopyMemoryIndirectPropertiesKHR & operator=( VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceCopyMemoryIndirectPropertiesNV & operator=( VkPhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCopyMemoryIndirectPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCopyMemoryIndirectPropertiesNV const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceCopyMemoryIndirectPropertiesNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, QueueFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::QueueFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supportedQueues );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceCopyMemoryIndirectPropertiesNV const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -82492,36 +59118,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceCopyMemoryIndirectPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceCopyMemoryIndirectPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType           = StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-    void *        pNext           = {};
-    QueueFlags    supportedQueues = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesNV;
+    void *                              pNext           = {};
+    VULKAN_HPP_NAMESPACE::QueueFlags    supportedQueues = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR>
-  {
-    using Type = PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesNV>
   {
-    using Type = PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
+    using Type = PhysicalDeviceCopyMemoryIndirectPropertiesNV;
   };
 
-  using PhysicalDeviceCopyMemoryIndirectPropertiesNV = PhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceCornerSampledImageFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCornerSampledImageFeaturesNV.html
   struct PhysicalDeviceCornerSampledImageFeaturesNV
   {
     using NativeType = VkPhysicalDeviceCornerSampledImageFeaturesNV;
@@ -82529,10 +59143,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCornerSampledImageFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCornerSampledImageFeaturesNV( Bool32 cornerSampledImage_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cornerSampledImage{ cornerSampledImage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCornerSampledImageFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 cornerSampledImage_ = {},
+                                                                     void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cornerSampledImage( cornerSampledImage_ )
     {
     }
 
@@ -82544,27 +59159,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCornerSampledImageFeaturesNV & operator=( PhysicalDeviceCornerSampledImageFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCornerSampledImageFeaturesNV & operator=( VkPhysicalDeviceCornerSampledImageFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCornerSampledImageFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCornerSampledImageFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCornerSampledImageFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCornerSampledImageFeaturesNV & setCornerSampledImage( Bool32 cornerSampledImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCornerSampledImageFeaturesNV &
+      setCornerSampledImage( VULKAN_HPP_NAMESPACE::Bool32 cornerSampledImage_ ) VULKAN_HPP_NOEXCEPT
     {
       cornerSampledImage = cornerSampledImage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCornerSampledImageFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -82576,18 +59192,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCornerSampledImageFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCornerSampledImageFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCornerSampledImageFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCornerSampledImageFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCornerSampledImageFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cornerSampledImage );
     }
@@ -82612,27 +59223,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceCornerSampledImageFeaturesNV;
-    void *        pNext              = {};
-    Bool32        cornerSampledImage = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceCornerSampledImageFeaturesNV;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cornerSampledImage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCornerSampledImageFeaturesNV>
-  {
-    using Type = PhysicalDeviceCornerSampledImageFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCornerSampledImageFeaturesNV>
   {
     using Type = PhysicalDeviceCornerSampledImageFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCoverageReductionModeFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCoverageReductionModeFeaturesNV.html
   struct PhysicalDeviceCoverageReductionModeFeaturesNV
   {
     using NativeType = VkPhysicalDeviceCoverageReductionModeFeaturesNV;
@@ -82640,10 +59241,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCoverageReductionModeFeaturesNV( Bool32 coverageReductionMode_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , coverageReductionMode{ coverageReductionMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCoverageReductionModeFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 coverageReductionMode_ = {},
+                                                                        void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , coverageReductionMode( coverageReductionMode_ )
     {
     }
 
@@ -82656,27 +59258,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCoverageReductionModeFeaturesNV & operator=( PhysicalDeviceCoverageReductionModeFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCoverageReductionModeFeaturesNV & operator=( VkPhysicalDeviceCoverageReductionModeFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCoverageReductionModeFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCoverageReductionModeFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoverageReductionModeFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoverageReductionModeFeaturesNV & setCoverageReductionMode( Bool32 coverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCoverageReductionModeFeaturesNV &
+      setCoverageReductionMode( VULKAN_HPP_NAMESPACE::Bool32 coverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageReductionMode = coverageReductionMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCoverageReductionModeFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -82688,18 +59291,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCoverageReductionModeFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCoverageReductionModeFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCoverageReductionModeFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCoverageReductionModeFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCoverageReductionModeFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, coverageReductionMode );
     }
@@ -82724,27 +59322,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV;
-    void *        pNext                 = {};
-    Bool32        coverageReductionMode = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        coverageReductionMode = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCoverageReductionModeFeaturesNV>
-  {
-    using Type = PhysicalDeviceCoverageReductionModeFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV>
   {
     using Type = PhysicalDeviceCoverageReductionModeFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCubicClampFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCubicClampFeaturesQCOM.html
   struct PhysicalDeviceCubicClampFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceCubicClampFeaturesQCOM;
@@ -82752,10 +59340,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCubicClampFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCubicClampFeaturesQCOM( Bool32 cubicRangeClamp_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cubicRangeClamp{ cubicRangeClamp_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCubicClampFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 cubicRangeClamp_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cubicRangeClamp( cubicRangeClamp_ )
     {
     }
 
@@ -82767,27 +59355,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCubicClampFeaturesQCOM & operator=( PhysicalDeviceCubicClampFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCubicClampFeaturesQCOM & operator=( VkPhysicalDeviceCubicClampFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCubicClampFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCubicClampFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicClampFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicClampFeaturesQCOM & setCubicRangeClamp( Bool32 cubicRangeClamp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicClampFeaturesQCOM & setCubicRangeClamp( VULKAN_HPP_NAMESPACE::Bool32 cubicRangeClamp_ ) VULKAN_HPP_NOEXCEPT
     {
       cubicRangeClamp = cubicRangeClamp_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCubicClampFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -82799,18 +59387,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCubicClampFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceCubicClampFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCubicClampFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceCubicClampFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCubicClampFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cubicRangeClamp );
     }
@@ -82835,27 +59418,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::ePhysicalDeviceCubicClampFeaturesQCOM;
-    void *        pNext           = {};
-    Bool32        cubicRangeClamp = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePhysicalDeviceCubicClampFeaturesQCOM;
+    void *                              pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cubicRangeClamp = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCubicClampFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceCubicClampFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCubicClampFeaturesQCOM>
   {
     using Type = PhysicalDeviceCubicClampFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCubicWeightsFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCubicWeightsFeaturesQCOM.html
   struct PhysicalDeviceCubicWeightsFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceCubicWeightsFeaturesQCOM;
@@ -82863,10 +59436,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCubicWeightsFeaturesQCOM( Bool32 selectableCubicWeights_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , selectableCubicWeights{ selectableCubicWeights_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCubicWeightsFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 selectableCubicWeights_ = {},
+                                                                 void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , selectableCubicWeights( selectableCubicWeights_ )
     {
     }
 
@@ -82878,27 +59452,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCubicWeightsFeaturesQCOM & operator=( PhysicalDeviceCubicWeightsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCubicWeightsFeaturesQCOM & operator=( VkPhysicalDeviceCubicWeightsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCubicWeightsFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCubicWeightsFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicWeightsFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicWeightsFeaturesQCOM & setSelectableCubicWeights( Bool32 selectableCubicWeights_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCubicWeightsFeaturesQCOM &
+      setSelectableCubicWeights( VULKAN_HPP_NAMESPACE::Bool32 selectableCubicWeights_ ) VULKAN_HPP_NOEXCEPT
     {
       selectableCubicWeights = selectableCubicWeights_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCubicWeightsFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -82910,18 +59485,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCubicWeightsFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceCubicWeightsFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCubicWeightsFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceCubicWeightsFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCubicWeightsFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, selectableCubicWeights );
     }
@@ -82946,19 +59516,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM;
-    void *        pNext                  = {};
-    Bool32        selectableCubicWeights = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM;
+    void *                              pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        selectableCubicWeights = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCubicWeightsFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceCubicWeightsFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM>
   {
@@ -82966,8 +59528,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceCudaKernelLaunchFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCudaKernelLaunchFeaturesNV.html
   struct PhysicalDeviceCudaKernelLaunchFeaturesNV
   {
     using NativeType = VkPhysicalDeviceCudaKernelLaunchFeaturesNV;
@@ -82975,10 +59535,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCudaKernelLaunchFeaturesNV( Bool32 cudaKernelLaunchFeatures_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cudaKernelLaunchFeatures{ cudaKernelLaunchFeatures_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCudaKernelLaunchFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 cudaKernelLaunchFeatures_ = {},
+                                                                   void *                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cudaKernelLaunchFeatures( cudaKernelLaunchFeatures_ )
     {
     }
 
@@ -82990,27 +59551,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCudaKernelLaunchFeaturesNV & operator=( PhysicalDeviceCudaKernelLaunchFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCudaKernelLaunchFeaturesNV & operator=( VkPhysicalDeviceCudaKernelLaunchFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCudaKernelLaunchFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCudaKernelLaunchFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCudaKernelLaunchFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCudaKernelLaunchFeaturesNV & setCudaKernelLaunchFeatures( Bool32 cudaKernelLaunchFeatures_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCudaKernelLaunchFeaturesNV &
+      setCudaKernelLaunchFeatures( VULKAN_HPP_NAMESPACE::Bool32 cudaKernelLaunchFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       cudaKernelLaunchFeatures = cudaKernelLaunchFeatures_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCudaKernelLaunchFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -83022,18 +59584,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCudaKernelLaunchFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCudaKernelLaunchFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCudaKernelLaunchFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCudaKernelLaunchFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCudaKernelLaunchFeaturesNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cudaKernelLaunchFeatures );
     }
@@ -83058,19 +59615,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV;
-    void *        pNext                    = {};
-    Bool32        cudaKernelLaunchFeatures = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        cudaKernelLaunchFeatures = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCudaKernelLaunchFeaturesNV>
-  {
-    using Type = PhysicalDeviceCudaKernelLaunchFeaturesNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV>
   {
@@ -83079,8 +59628,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceCudaKernelLaunchPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCudaKernelLaunchPropertiesNV.html
   struct PhysicalDeviceCudaKernelLaunchPropertiesNV
   {
     using NativeType = VkPhysicalDeviceCudaKernelLaunchPropertiesNV;
@@ -83088,13 +59635,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCudaKernelLaunchPropertiesNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceCudaKernelLaunchPropertiesNV( uint32_t computeCapabilityMinor_ = {},
                                                                      uint32_t computeCapabilityMajor_ = {},
                                                                      void *   pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , computeCapabilityMinor{ computeCapabilityMinor_ }
-      , computeCapabilityMajor{ computeCapabilityMajor_ }
+      : pNext( pNext_ )
+      , computeCapabilityMinor( computeCapabilityMinor_ )
+      , computeCapabilityMajor( computeCapabilityMajor_ )
     {
     }
 
@@ -83106,11 +59653,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCudaKernelLaunchPropertiesNV & operator=( PhysicalDeviceCudaKernelLaunchPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCudaKernelLaunchPropertiesNV & operator=( VkPhysicalDeviceCudaKernelLaunchPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCudaKernelLaunchPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCudaKernelLaunchPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -83124,18 +59671,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCudaKernelLaunchPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceCudaKernelLaunchPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCudaKernelLaunchPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceCudaKernelLaunchPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCudaKernelLaunchPropertiesNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, computeCapabilityMinor, computeCapabilityMajor );
     }
@@ -83161,20 +59703,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDeviceCudaKernelLaunchPropertiesNV;
-    void *        pNext                  = {};
-    uint32_t      computeCapabilityMinor = {};
-    uint32_t      computeCapabilityMajor = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDeviceCudaKernelLaunchPropertiesNV;
+    void *                              pNext                  = {};
+    uint32_t                            computeCapabilityMinor = {};
+    uint32_t                            computeCapabilityMajor = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCudaKernelLaunchPropertiesNV>
-  {
-    using Type = PhysicalDeviceCudaKernelLaunchPropertiesNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCudaKernelLaunchPropertiesNV>
   {
@@ -83182,8 +59716,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkPhysicalDeviceCustomBorderColorFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCustomBorderColorFeaturesEXT.html
   struct PhysicalDeviceCustomBorderColorFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceCustomBorderColorFeaturesEXT;
@@ -83191,13 +59723,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCustomBorderColorFeaturesEXT( Bool32 customBorderColors_             = {},
-                                                                     Bool32 customBorderColorWithoutFormat_ = {},
-                                                                     void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , customBorderColors{ customBorderColors_ }
-      , customBorderColorWithoutFormat{ customBorderColorWithoutFormat_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceCustomBorderColorFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 customBorderColors_             = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 customBorderColorWithoutFormat_ = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , customBorderColors( customBorderColors_ )
+      , customBorderColorWithoutFormat( customBorderColorWithoutFormat_ )
     {
     }
 
@@ -83209,34 +59741,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCustomBorderColorFeaturesEXT & operator=( PhysicalDeviceCustomBorderColorFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCustomBorderColorFeaturesEXT & operator=( VkPhysicalDeviceCustomBorderColorFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCustomBorderColorFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomBorderColorFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomBorderColorFeaturesEXT & setCustomBorderColors( Bool32 customBorderColors_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomBorderColorFeaturesEXT &
+      setCustomBorderColors( VULKAN_HPP_NAMESPACE::Bool32 customBorderColors_ ) VULKAN_HPP_NOEXCEPT
     {
       customBorderColors = customBorderColors_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomBorderColorFeaturesEXT &
-      setCustomBorderColorWithoutFormat( Bool32 customBorderColorWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
+      setCustomBorderColorWithoutFormat( VULKAN_HPP_NAMESPACE::Bool32 customBorderColorWithoutFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       customBorderColorWithoutFormat = customBorderColorWithoutFormat_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceCustomBorderColorFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -83248,18 +59781,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCustomBorderColorFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceCustomBorderColorFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCustomBorderColorFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceCustomBorderColorFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCustomBorderColorFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, customBorderColors, customBorderColorWithoutFormat );
     }
@@ -83285,28 +59813,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                          = StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT;
-    void *        pNext                          = {};
-    Bool32        customBorderColors             = {};
-    Bool32        customBorderColorWithoutFormat = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                          = StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT;
+    void *                              pNext                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        customBorderColors             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        customBorderColorWithoutFormat = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCustomBorderColorFeaturesEXT>
-  {
-    using Type = PhysicalDeviceCustomBorderColorFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT>
   {
     using Type = PhysicalDeviceCustomBorderColorFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCustomBorderColorPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCustomBorderColorPropertiesEXT.html
   struct PhysicalDeviceCustomBorderColorPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceCustomBorderColorPropertiesEXT;
@@ -83314,11 +59832,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceCustomBorderColorPropertiesEXT( uint32_t maxCustomBorderColorSamplers_ = {},
                                                                        void *   pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxCustomBorderColorSamplers{ maxCustomBorderColorSamplers_ }
+      : pNext( pNext_ )
+      , maxCustomBorderColorSamplers( maxCustomBorderColorSamplers_ )
     {
     }
 
@@ -83330,11 +59848,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceCustomBorderColorPropertiesEXT & operator=( PhysicalDeviceCustomBorderColorPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceCustomBorderColorPropertiesEXT & operator=( VkPhysicalDeviceCustomBorderColorPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceCustomBorderColorPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceCustomBorderColorPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -83348,18 +59866,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceCustomBorderColorPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceCustomBorderColorPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCustomBorderColorPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceCustomBorderColorPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCustomBorderColorPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxCustomBorderColorSamplers );
     }
@@ -83384,401 +59897,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT;
-    void *        pNext                        = {};
-    uint32_t      maxCustomBorderColorSamplers = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT;
+    void *                              pNext                        = {};
+    uint32_t                            maxCustomBorderColorSamplers = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCustomBorderColorPropertiesEXT>
-  {
-    using Type = PhysicalDeviceCustomBorderColorPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT>
   {
     using Type = PhysicalDeviceCustomBorderColorPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceCustomResolveFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceCustomResolveFeaturesEXT.html
-  struct PhysicalDeviceCustomResolveFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceCustomResolveFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceCustomResolveFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCustomResolveFeaturesEXT( Bool32 customResolve_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , customResolve{ customResolve_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceCustomResolveFeaturesEXT( PhysicalDeviceCustomResolveFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceCustomResolveFeaturesEXT( VkPhysicalDeviceCustomResolveFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceCustomResolveFeaturesEXT( *reinterpret_cast<PhysicalDeviceCustomResolveFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceCustomResolveFeaturesEXT & operator=( PhysicalDeviceCustomResolveFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceCustomResolveFeaturesEXT & operator=( VkPhysicalDeviceCustomResolveFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceCustomResolveFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomResolveFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceCustomResolveFeaturesEXT & setCustomResolve( Bool32 customResolve_ ) VULKAN_HPP_NOEXCEPT
-    {
-      customResolve = customResolve_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceCustomResolveFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceCustomResolveFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceCustomResolveFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceCustomResolveFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceCustomResolveFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceCustomResolveFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceCustomResolveFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceCustomResolveFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, customResolve );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceCustomResolveFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceCustomResolveFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( customResolve == rhs.customResolve );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceCustomResolveFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType         = StructureType::ePhysicalDeviceCustomResolveFeaturesEXT;
-    void *        pNext         = {};
-    Bool32        customResolve = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceCustomResolveFeaturesEXT>
-  {
-    using Type = PhysicalDeviceCustomResolveFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceCustomResolveFeaturesEXT>
-  {
-    using Type = PhysicalDeviceCustomResolveFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDataGraphFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphFeaturesARM.html
-  struct PhysicalDeviceDataGraphFeaturesARM
-  {
-    using NativeType = VkPhysicalDeviceDataGraphFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDataGraphFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphFeaturesARM( Bool32 dataGraph_                        = {},
-                                                             Bool32 dataGraphUpdateAfterBind_         = {},
-                                                             Bool32 dataGraphSpecializationConstants_ = {},
-                                                             Bool32 dataGraphDescriptorBuffer_        = {},
-                                                             Bool32 dataGraphShaderModule_            = {},
-                                                             void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataGraph{ dataGraph_ }
-      , dataGraphUpdateAfterBind{ dataGraphUpdateAfterBind_ }
-      , dataGraphSpecializationConstants{ dataGraphSpecializationConstants_ }
-      , dataGraphDescriptorBuffer{ dataGraphDescriptorBuffer_ }
-      , dataGraphShaderModule{ dataGraphShaderModule_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphFeaturesARM( PhysicalDeviceDataGraphFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDataGraphFeaturesARM( VkPhysicalDeviceDataGraphFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDataGraphFeaturesARM( *reinterpret_cast<PhysicalDeviceDataGraphFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDataGraphFeaturesARM & operator=( PhysicalDeviceDataGraphFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDataGraphFeaturesARM & operator=( VkPhysicalDeviceDataGraphFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDataGraphFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM & setDataGraph( Bool32 dataGraph_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraph = dataGraph_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM & setDataGraphUpdateAfterBind( Bool32 dataGraphUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphUpdateAfterBind = dataGraphUpdateAfterBind_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM &
-      setDataGraphSpecializationConstants( Bool32 dataGraphSpecializationConstants_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphSpecializationConstants = dataGraphSpecializationConstants_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM & setDataGraphDescriptorBuffer( Bool32 dataGraphDescriptorBuffer_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphDescriptorBuffer = dataGraphDescriptorBuffer_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphFeaturesARM & setDataGraphShaderModule( Bool32 dataGraphShaderModule_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphShaderModule = dataGraphShaderModule_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDataGraphFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDataGraphFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDataGraphFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDataGraphFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDataGraphFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dataGraph, dataGraphUpdateAfterBind, dataGraphSpecializationConstants, dataGraphDescriptorBuffer, dataGraphShaderModule );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDataGraphFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDataGraphFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dataGraph == rhs.dataGraph ) &&
-             ( dataGraphUpdateAfterBind == rhs.dataGraphUpdateAfterBind ) && ( dataGraphSpecializationConstants == rhs.dataGraphSpecializationConstants ) &&
-             ( dataGraphDescriptorBuffer == rhs.dataGraphDescriptorBuffer ) && ( dataGraphShaderModule == rhs.dataGraphShaderModule );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDataGraphFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                            = StructureType::ePhysicalDeviceDataGraphFeaturesARM;
-    void *        pNext                            = {};
-    Bool32        dataGraph                        = {};
-    Bool32        dataGraphUpdateAfterBind         = {};
-    Bool32        dataGraphSpecializationConstants = {};
-    Bool32        dataGraphDescriptorBuffer        = {};
-    Bool32        dataGraphShaderModule            = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDataGraphFeaturesARM>
-  {
-    using Type = PhysicalDeviceDataGraphFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDataGraphFeaturesARM>
-  {
-    using Type = PhysicalDeviceDataGraphFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDataGraphModelFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDataGraphModelFeaturesQCOM.html
-  struct PhysicalDeviceDataGraphModelFeaturesQCOM
-  {
-    using NativeType = VkPhysicalDeviceDataGraphModelFeaturesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDataGraphModelFeaturesQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphModelFeaturesQCOM( Bool32 dataGraphModel_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataGraphModel{ dataGraphModel_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDataGraphModelFeaturesQCOM( PhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDataGraphModelFeaturesQCOM( VkPhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDataGraphModelFeaturesQCOM( *reinterpret_cast<PhysicalDeviceDataGraphModelFeaturesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDataGraphModelFeaturesQCOM & operator=( PhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDataGraphModelFeaturesQCOM & operator=( VkPhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDataGraphModelFeaturesQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphModelFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDataGraphModelFeaturesQCOM & setDataGraphModel( Bool32 dataGraphModel_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataGraphModel = dataGraphModel_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDataGraphModelFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDataGraphModelFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphModelFeaturesQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDataGraphModelFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphModelFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDataGraphModelFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceDataGraphModelFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDataGraphModelFeaturesQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dataGraphModel );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDataGraphModelFeaturesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dataGraphModel == rhs.dataGraphModel );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDataGraphModelFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::ePhysicalDeviceDataGraphModelFeaturesQCOM;
-    void *        pNext          = {};
-    Bool32        dataGraphModel = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDataGraphModelFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceDataGraphModelFeaturesQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDataGraphModelFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceDataGraphModelFeaturesQCOM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV.html
   struct PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
@@ -83786,11 +59915,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV( Bool32 dedicatedAllocationImageAliasing_ = {},
-                                                                                   void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dedicatedAllocationImageAliasing{ dedicatedAllocationImageAliasing_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocationImageAliasing_ = {},
+                                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dedicatedAllocationImageAliasing( dedicatedAllocationImageAliasing_ )
     {
     }
 
@@ -83804,16 +59933,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV &
       operator=( PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV &
       operator=( VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -83821,12 +59950,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV &
-      setDedicatedAllocationImageAliasing( Bool32 dedicatedAllocationImageAliasing_ ) VULKAN_HPP_NOEXCEPT
+      setDedicatedAllocationImageAliasing( VULKAN_HPP_NAMESPACE::Bool32 dedicatedAllocationImageAliasing_ ) VULKAN_HPP_NOEXCEPT
     {
       dedicatedAllocationImageAliasing = dedicatedAllocationImageAliasing_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -83838,18 +59967,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dedicatedAllocationImageAliasing );
     }
@@ -83874,141 +59998,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
-    void *        pNext                            = {};
-    Bool32        dedicatedAllocationImageAliasing = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dedicatedAllocationImageAliasing = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV>
-  {
-    using Type = PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV>
   {
     using Type = PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV;
   };
 
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX.html
-  struct PhysicalDeviceDenseGeometryFormatFeaturesAMDX
-  {
-    using NativeType = VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDenseGeometryFormatFeaturesAMDX( Bool32 denseGeometryFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , denseGeometryFormat{ denseGeometryFormat_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDenseGeometryFormatFeaturesAMDX( PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDenseGeometryFormatFeaturesAMDX( VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDenseGeometryFormatFeaturesAMDX( *reinterpret_cast<PhysicalDeviceDenseGeometryFormatFeaturesAMDX const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDenseGeometryFormatFeaturesAMDX & operator=( PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDenseGeometryFormatFeaturesAMDX & operator=( VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDenseGeometryFormatFeaturesAMDX const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDenseGeometryFormatFeaturesAMDX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDenseGeometryFormatFeaturesAMDX & setDenseGeometryFormat( Bool32 denseGeometryFormat_ ) VULKAN_HPP_NOEXCEPT
-    {
-      denseGeometryFormat = denseGeometryFormat_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX *>( this );
-    }
-
-    operator VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX *>( this );
-    }
-
-    operator VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX *>( this );
-    }
-
-    operator VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, denseGeometryFormat );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & ) const = default;
-#  else
-    bool operator==( PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( denseGeometryFormat == rhs.denseGeometryFormat );
-#    endif
-    }
-
-    bool operator!=( PhysicalDeviceDenseGeometryFormatFeaturesAMDX const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType               = StructureType::ePhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-    void *        pNext               = {};
-    Bool32        denseGeometryFormat = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX>
-  {
-    using Type = PhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDenseGeometryFormatFeaturesAMDX>
-  {
-    using Type = PhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-  };
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  // wrapper struct for struct VkPhysicalDeviceDepthBiasControlFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthBiasControlFeaturesEXT.html
   struct PhysicalDeviceDepthBiasControlFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDepthBiasControlFeaturesEXT;
@@ -84016,17 +60016,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthBiasControlFeaturesEXT( Bool32 depthBiasControl_                                = {},
-                                                                    Bool32 leastRepresentableValueForceUnormRepresentation_ = {},
-                                                                    Bool32 floatRepresentation_                             = {},
-                                                                    Bool32 depthBiasExact_                                  = {},
-                                                                    void * pNext_                                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthBiasControl{ depthBiasControl_ }
-      , leastRepresentableValueForceUnormRepresentation{ leastRepresentableValueForceUnormRepresentation_ }
-      , floatRepresentation{ floatRepresentation_ }
-      , depthBiasExact{ depthBiasExact_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthBiasControlFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 depthBiasControl_                                = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 leastRepresentableValueForceUnormRepresentation_ = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 floatRepresentation_                             = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 depthBiasExact_                                  = {},
+                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthBiasControl( depthBiasControl_ )
+      , leastRepresentableValueForceUnormRepresentation( leastRepresentableValueForceUnormRepresentation_ )
+      , floatRepresentation( floatRepresentation_ )
+      , depthBiasExact( depthBiasExact_ )
     {
     }
 
@@ -84038,46 +60038,48 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDepthBiasControlFeaturesEXT & operator=( PhysicalDeviceDepthBiasControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDepthBiasControlFeaturesEXT & operator=( VkPhysicalDeviceDepthBiasControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDepthBiasControlFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthBiasControlFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT & setDepthBiasControl( Bool32 depthBiasControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT &
+      setDepthBiasControl( VULKAN_HPP_NAMESPACE::Bool32 depthBiasControl_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasControl = depthBiasControl_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT &
-      setLeastRepresentableValueForceUnormRepresentation( Bool32 leastRepresentableValueForceUnormRepresentation_ ) VULKAN_HPP_NOEXCEPT
+      setLeastRepresentableValueForceUnormRepresentation( VULKAN_HPP_NAMESPACE::Bool32 leastRepresentableValueForceUnormRepresentation_ ) VULKAN_HPP_NOEXCEPT
     {
       leastRepresentableValueForceUnormRepresentation = leastRepresentableValueForceUnormRepresentation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT & setFloatRepresentation( Bool32 floatRepresentation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT &
+      setFloatRepresentation( VULKAN_HPP_NAMESPACE::Bool32 floatRepresentation_ ) VULKAN_HPP_NOEXCEPT
     {
       floatRepresentation = floatRepresentation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT & setDepthBiasExact( Bool32 depthBiasExact_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthBiasControlFeaturesEXT & setDepthBiasExact( VULKAN_HPP_NAMESPACE::Bool32 depthBiasExact_ ) VULKAN_HPP_NOEXCEPT
     {
       depthBiasExact = depthBiasExact_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDepthBiasControlFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -84089,18 +60091,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDepthBiasControlFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDepthBiasControlFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthBiasControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthBiasControlFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthBiasControlFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthBiasControl, leastRepresentableValueForceUnormRepresentation, floatRepresentation, depthBiasExact );
     }
@@ -84127,216 +60129,92 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                           = StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT;
-    void *        pNext                                           = {};
-    Bool32        depthBiasControl                                = {};
-    Bool32        leastRepresentableValueForceUnormRepresentation = {};
-    Bool32        floatRepresentation                             = {};
-    Bool32        depthBiasExact                                  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                           = StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT;
+    void *                              pNext                                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthBiasControl                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        leastRepresentableValueForceUnormRepresentation = {};
+    VULKAN_HPP_NAMESPACE::Bool32        floatRepresentation                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthBiasExact                                  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthBiasControlFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDepthBiasControlFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT>
   {
     using Type = PhysicalDeviceDepthBiasControlFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDepthClampControlFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthClampControlFeaturesEXT.html
-  struct PhysicalDeviceDepthClampControlFeaturesEXT
+  struct PhysicalDeviceDepthClampZeroOneFeaturesEXT
   {
-    using NativeType = VkPhysicalDeviceDepthClampControlFeaturesEXT;
+    using NativeType = VkPhysicalDeviceDepthClampZeroOneFeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthClampControlFeaturesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampControlFeaturesEXT( Bool32 depthClampControl_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthClampControl{ depthClampControl_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampZeroOneFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClampZeroOne_ = {},
+                                                                     void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthClampZeroOne( depthClampZeroOne_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampControlFeaturesEXT( PhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampZeroOneFeaturesEXT( PhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceDepthClampControlFeaturesEXT( VkPhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDepthClampControlFeaturesEXT( *reinterpret_cast<PhysicalDeviceDepthClampControlFeaturesEXT const *>( &rhs ) )
+    PhysicalDeviceDepthClampZeroOneFeaturesEXT( VkPhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceDepthClampZeroOneFeaturesEXT( *reinterpret_cast<PhysicalDeviceDepthClampZeroOneFeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceDepthClampControlFeaturesEXT & operator=( PhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceDepthClampZeroOneFeaturesEXT & operator=( PhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceDepthClampControlFeaturesEXT & operator=( VkPhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceDepthClampZeroOneFeaturesEXT & operator=( VkPhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDepthClampControlFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClampZeroOneFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampControlFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampZeroOneFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampControlFeaturesEXT & setDepthClampControl( Bool32 depthClampControl_ ) VULKAN_HPP_NOEXCEPT
-    {
-      depthClampControl = depthClampControl_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDepthClampControlFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDepthClampControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClampControlFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDepthClampControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClampControlFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthClampControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClampControlFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthClampControlFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, depthClampControl );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDepthClampControlFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( depthClampControl == rhs.depthClampControl );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDepthClampControlFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::ePhysicalDeviceDepthClampControlFeaturesEXT;
-    void *        pNext             = {};
-    Bool32        depthClampControl = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthClampControlFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDepthClampControlFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDepthClampControlFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDepthClampControlFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDepthClampZeroOneFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthClampZeroOneFeaturesKHR.html
-  struct PhysicalDeviceDepthClampZeroOneFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampZeroOneFeaturesKHR( Bool32 depthClampZeroOne_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthClampZeroOne{ depthClampZeroOne_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClampZeroOneFeaturesKHR( PhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDepthClampZeroOneFeaturesKHR( VkPhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDepthClampZeroOneFeaturesKHR( *reinterpret_cast<PhysicalDeviceDepthClampZeroOneFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDepthClampZeroOneFeaturesKHR & operator=( PhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDepthClampZeroOneFeaturesKHR & operator=( VkPhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDepthClampZeroOneFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampZeroOneFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampZeroOneFeaturesKHR & setDepthClampZeroOne( Bool32 depthClampZeroOne_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClampZeroOneFeaturesEXT &
+      setDepthClampZeroOne( VULKAN_HPP_NAMESPACE::Bool32 depthClampZeroOne_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClampZeroOne = depthClampZeroOne_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceDepthClampZeroOneFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceDepthClampZeroOneFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceDepthClampZeroOneFeaturesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceDepthClampZeroOneFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDepthClampZeroOneFeaturesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceDepthClampZeroOneFeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceDepthClampZeroOneFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClampZeroOneFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthClampZeroOneFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClampZeroOneFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthClampZeroOneFeaturesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceDepthClampZeroOneFeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthClampZeroOne );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDepthClampZeroOneFeaturesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceDepthClampZeroOneFeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -84345,36 +60223,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceDepthClampZeroOneFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceDepthClampZeroOneFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesKHR;
-    void *        pNext             = {};
-    Bool32        depthClampZeroOne = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesEXT;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthClampZeroOne = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthClampZeroOneFeaturesKHR>
-  {
-    using Type = PhysicalDeviceDepthClampZeroOneFeaturesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesEXT>
   {
-    using Type = PhysicalDeviceDepthClampZeroOneFeaturesKHR;
+    using Type = PhysicalDeviceDepthClampZeroOneFeaturesEXT;
   };
 
-  using PhysicalDeviceDepthClampZeroOneFeaturesEXT = PhysicalDeviceDepthClampZeroOneFeaturesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceDepthClipControlFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthClipControlFeaturesEXT.html
   struct PhysicalDeviceDepthClipControlFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDepthClipControlFeaturesEXT;
@@ -84382,10 +60248,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClipControlFeaturesEXT( Bool32 depthClipControl_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthClipControl{ depthClipControl_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClipControlFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipControl_ = {},
+                                                                    void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthClipControl( depthClipControl_ )
     {
     }
 
@@ -84397,27 +60264,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDepthClipControlFeaturesEXT & operator=( PhysicalDeviceDepthClipControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDepthClipControlFeaturesEXT & operator=( VkPhysicalDeviceDepthClipControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDepthClipControlFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClipControlFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipControlFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipControlFeaturesEXT & setDepthClipControl( Bool32 depthClipControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipControlFeaturesEXT &
+      setDepthClipControl( VULKAN_HPP_NAMESPACE::Bool32 depthClipControl_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClipControl = depthClipControl_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDepthClipControlFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -84429,18 +60297,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDepthClipControlFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDepthClipControlFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthClipControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClipControlFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthClipControlFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthClipControl );
     }
@@ -84465,27 +60328,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT;
-    void *        pNext            = {};
-    Bool32        depthClipControl = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthClipControl = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthClipControlFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDepthClipControlFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT>
   {
     using Type = PhysicalDeviceDepthClipControlFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDepthClipEnableFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthClipEnableFeaturesEXT.html
   struct PhysicalDeviceDepthClipEnableFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDepthClipEnableFeaturesEXT;
@@ -84493,10 +60346,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClipEnableFeaturesEXT( Bool32 depthClipEnable_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthClipEnable{ depthClipEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthClipEnableFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable_ = {},
+                                                                   void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthClipEnable( depthClipEnable_ )
     {
     }
 
@@ -84508,27 +60362,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDepthClipEnableFeaturesEXT & operator=( PhysicalDeviceDepthClipEnableFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDepthClipEnableFeaturesEXT & operator=( VkPhysicalDeviceDepthClipEnableFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDepthClipEnableFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthClipEnableFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipEnableFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipEnableFeaturesEXT & setDepthClipEnable( Bool32 depthClipEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDepthClipEnableFeaturesEXT & setDepthClipEnable( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClipEnable = depthClipEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDepthClipEnableFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -84540,18 +60394,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDepthClipEnableFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDepthClipEnableFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthClipEnableFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthClipEnableFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthClipEnableFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthClipEnable );
     }
@@ -84576,27 +60425,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT;
-    void *        pNext           = {};
-    Bool32        depthClipEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT;
+    void *                              pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthClipEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthClipEnableFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDepthClipEnableFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT>
   {
     using Type = PhysicalDeviceDepthClipEnableFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDepthStencilResolveProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDepthStencilResolveProperties.html
   struct PhysicalDeviceDepthStencilResolveProperties
   {
     using NativeType = VkPhysicalDeviceDepthStencilResolveProperties;
@@ -84604,17 +60443,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDepthStencilResolveProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthStencilResolveProperties( ResolveModeFlags supportedDepthResolveModes_   = {},
-                                                                      ResolveModeFlags supportedStencilResolveModes_ = {},
-                                                                      Bool32           independentResolveNone_       = {},
-                                                                      Bool32           independentResolve_           = {},
-                                                                      void *           pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportedDepthResolveModes{ supportedDepthResolveModes_ }
-      , supportedStencilResolveModes{ supportedStencilResolveModes_ }
-      , independentResolveNone{ independentResolveNone_ }
-      , independentResolve{ independentResolve_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDepthStencilResolveProperties( VULKAN_HPP_NAMESPACE::ResolveModeFlags supportedDepthResolveModes_   = {},
+                                                                      VULKAN_HPP_NAMESPACE::ResolveModeFlags supportedStencilResolveModes_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32           independentResolveNone_       = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32           independentResolve_           = {},
+                                                                      void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportedDepthResolveModes( supportedDepthResolveModes_ )
+      , supportedStencilResolveModes( supportedStencilResolveModes_ )
+      , independentResolveNone( independentResolveNone_ )
+      , independentResolve( independentResolve_ )
     {
     }
 
@@ -84626,11 +60465,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDepthStencilResolveProperties & operator=( PhysicalDeviceDepthStencilResolveProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDepthStencilResolveProperties & operator=( VkPhysicalDeviceDepthStencilResolveProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDepthStencilResolveProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDepthStencilResolveProperties const *>( &rhs );
       return *this;
     }
 
@@ -84644,18 +60483,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDepthStencilResolveProperties *>( this );
     }
 
-    operator VkPhysicalDeviceDepthStencilResolveProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDepthStencilResolveProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceDepthStencilResolveProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDepthStencilResolveProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ResolveModeFlags const &, ResolveModeFlags const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlags const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supportedDepthResolveModes, supportedStencilResolveModes, independentResolveNone, independentResolve );
@@ -84683,22 +60521,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                        = StructureType::ePhysicalDeviceDepthStencilResolveProperties;
-    void *           pNext                        = {};
-    ResolveModeFlags supportedDepthResolveModes   = {};
-    ResolveModeFlags supportedStencilResolveModes = {};
-    Bool32           independentResolveNone       = {};
-    Bool32           independentResolve           = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                        = StructureType::ePhysicalDeviceDepthStencilResolveProperties;
+    void *                                 pNext                        = {};
+    VULKAN_HPP_NAMESPACE::ResolveModeFlags supportedDepthResolveModes   = {};
+    VULKAN_HPP_NAMESPACE::ResolveModeFlags supportedStencilResolveModes = {};
+    VULKAN_HPP_NAMESPACE::Bool32           independentResolveNone       = {};
+    VULKAN_HPP_NAMESPACE::Bool32           independentResolve           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDepthStencilResolveProperties>
-  {
-    using Type = PhysicalDeviceDepthStencilResolveProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDepthStencilResolveProperties>
   {
@@ -84707,8 +60537,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceDepthStencilResolvePropertiesKHR = PhysicalDeviceDepthStencilResolveProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT.html
   struct PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
@@ -84716,11 +60544,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT( size_t combinedImageSamplerDensityMapDescriptorSize_ = {},
                                                                                 void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , combinedImageSamplerDensityMapDescriptorSize{ combinedImageSamplerDensityMapDescriptorSize_ }
+      : pNext( pNext_ )
+      , combinedImageSamplerDensityMapDescriptorSize( combinedImageSamplerDensityMapDescriptorSize_ )
     {
     }
 
@@ -84734,11 +60562,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT &
       operator=( PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT & operator=( VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -84752,18 +60580,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, size_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, size_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, combinedImageSamplerDensityMapDescriptorSize );
     }
@@ -84789,27 +60612,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                        = StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
-    void *        pNext                                        = {};
-    size_t        combinedImageSamplerDensityMapDescriptorSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                        = StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
+    void *                              pNext                                        = {};
+    size_t                              combinedImageSamplerDensityMapDescriptorSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT>
-  {
-    using Type = PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT>
   {
     using Type = PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorBufferFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorBufferFeaturesEXT.html
   struct PhysicalDeviceDescriptorBufferFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDescriptorBufferFeaturesEXT;
@@ -84817,17 +60630,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferFeaturesEXT( Bool32 descriptorBuffer_                   = {},
-                                                                    Bool32 descriptorBufferCaptureReplay_      = {},
-                                                                    Bool32 descriptorBufferImageLayoutIgnored_ = {},
-                                                                    Bool32 descriptorBufferPushDescriptors_    = {},
-                                                                    void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorBuffer{ descriptorBuffer_ }
-      , descriptorBufferCaptureReplay{ descriptorBufferCaptureReplay_ }
-      , descriptorBufferImageLayoutIgnored{ descriptorBufferImageLayoutIgnored_ }
-      , descriptorBufferPushDescriptors{ descriptorBufferPushDescriptors_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 descriptorBuffer_                   = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferCaptureReplay_      = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferImageLayoutIgnored_ = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferPushDescriptors_    = {},
+                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorBuffer( descriptorBuffer_ )
+      , descriptorBufferCaptureReplay( descriptorBufferCaptureReplay_ )
+      , descriptorBufferImageLayoutIgnored( descriptorBufferImageLayoutIgnored_ )
+      , descriptorBufferPushDescriptors( descriptorBufferPushDescriptors_ )
     {
     }
 
@@ -84839,48 +60652,49 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDescriptorBufferFeaturesEXT & operator=( PhysicalDeviceDescriptorBufferFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorBufferFeaturesEXT & operator=( VkPhysicalDeviceDescriptorBufferFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorBufferFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT & setDescriptorBuffer( Bool32 descriptorBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT &
+      setDescriptorBuffer( VULKAN_HPP_NAMESPACE::Bool32 descriptorBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBuffer = descriptorBuffer_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT &
-      setDescriptorBufferCaptureReplay( Bool32 descriptorBufferCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBufferCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBufferCaptureReplay = descriptorBufferCaptureReplay_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT &
-      setDescriptorBufferImageLayoutIgnored( Bool32 descriptorBufferImageLayoutIgnored_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBufferImageLayoutIgnored( VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferImageLayoutIgnored_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBufferImageLayoutIgnored = descriptorBufferImageLayoutIgnored_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferFeaturesEXT &
-      setDescriptorBufferPushDescriptors( Bool32 descriptorBufferPushDescriptors_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBufferPushDescriptors( VULKAN_HPP_NAMESPACE::Bool32 descriptorBufferPushDescriptors_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBufferPushDescriptors = descriptorBufferPushDescriptors_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDescriptorBufferFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -84892,18 +60706,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorBufferFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorBufferFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorBufferFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorBufferFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorBuffer, descriptorBufferCaptureReplay, descriptorBufferImageLayoutIgnored, descriptorBufferPushDescriptors );
     }
@@ -84931,30 +60745,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT;
-    void *        pNext                              = {};
-    Bool32        descriptorBuffer                   = {};
-    Bool32        descriptorBufferCaptureReplay      = {};
-    Bool32        descriptorBufferImageLayoutIgnored = {};
-    Bool32        descriptorBufferPushDescriptors    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBuffer                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBufferCaptureReplay      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBufferImageLayoutIgnored = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBufferPushDescriptors    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorBufferFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDescriptorBufferFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT>
   {
     using Type = PhysicalDeviceDescriptorBufferFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorBufferPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorBufferPropertiesEXT.html
   struct PhysicalDeviceDescriptorBufferPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceDescriptorBufferPropertiesEXT;
@@ -84962,75 +60766,75 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferPropertiesEXT( Bool32     combinedImageSamplerDescriptorSingleArray_            = {},
-                                                                      Bool32     bufferlessPushDescriptors_                            = {},
-                                                                      Bool32     allowSamplerImageViewPostSubmitCreation_              = {},
-                                                                      DeviceSize descriptorBufferOffsetAlignment_                      = {},
-                                                                      uint32_t   maxDescriptorBufferBindings_                          = {},
-                                                                      uint32_t   maxResourceDescriptorBufferBindings_                  = {},
-                                                                      uint32_t   maxSamplerDescriptorBufferBindings_                   = {},
-                                                                      uint32_t   maxEmbeddedImmutableSamplerBindings_                  = {},
-                                                                      uint32_t   maxEmbeddedImmutableSamplers_                         = {},
-                                                                      size_t     bufferCaptureReplayDescriptorDataSize_                = {},
-                                                                      size_t     imageCaptureReplayDescriptorDataSize_                 = {},
-                                                                      size_t     imageViewCaptureReplayDescriptorDataSize_             = {},
-                                                                      size_t     samplerCaptureReplayDescriptorDataSize_               = {},
-                                                                      size_t     accelerationStructureCaptureReplayDescriptorDataSize_ = {},
-                                                                      size_t     samplerDescriptorSize_                                = {},
-                                                                      size_t     combinedImageSamplerDescriptorSize_                   = {},
-                                                                      size_t     sampledImageDescriptorSize_                           = {},
-                                                                      size_t     storageImageDescriptorSize_                           = {},
-                                                                      size_t     uniformTexelBufferDescriptorSize_                     = {},
-                                                                      size_t     robustUniformTexelBufferDescriptorSize_               = {},
-                                                                      size_t     storageTexelBufferDescriptorSize_                     = {},
-                                                                      size_t     robustStorageTexelBufferDescriptorSize_               = {},
-                                                                      size_t     uniformBufferDescriptorSize_                          = {},
-                                                                      size_t     robustUniformBufferDescriptorSize_                    = {},
-                                                                      size_t     storageBufferDescriptorSize_                          = {},
-                                                                      size_t     robustStorageBufferDescriptorSize_                    = {},
-                                                                      size_t     inputAttachmentDescriptorSize_                        = {},
-                                                                      size_t     accelerationStructureDescriptorSize_                  = {},
-                                                                      DeviceSize maxSamplerDescriptorBufferRange_                      = {},
-                                                                      DeviceSize maxResourceDescriptorBufferRange_                     = {},
-                                                                      DeviceSize samplerDescriptorBufferAddressSpaceSize_              = {},
-                                                                      DeviceSize resourceDescriptorBufferAddressSpaceSize_             = {},
-                                                                      DeviceSize descriptorBufferAddressSpaceSize_                     = {},
-                                                                      void *     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , combinedImageSamplerDescriptorSingleArray{ combinedImageSamplerDescriptorSingleArray_ }
-      , bufferlessPushDescriptors{ bufferlessPushDescriptors_ }
-      , allowSamplerImageViewPostSubmitCreation{ allowSamplerImageViewPostSubmitCreation_ }
-      , descriptorBufferOffsetAlignment{ descriptorBufferOffsetAlignment_ }
-      , maxDescriptorBufferBindings{ maxDescriptorBufferBindings_ }
-      , maxResourceDescriptorBufferBindings{ maxResourceDescriptorBufferBindings_ }
-      , maxSamplerDescriptorBufferBindings{ maxSamplerDescriptorBufferBindings_ }
-      , maxEmbeddedImmutableSamplerBindings{ maxEmbeddedImmutableSamplerBindings_ }
-      , maxEmbeddedImmutableSamplers{ maxEmbeddedImmutableSamplers_ }
-      , bufferCaptureReplayDescriptorDataSize{ bufferCaptureReplayDescriptorDataSize_ }
-      , imageCaptureReplayDescriptorDataSize{ imageCaptureReplayDescriptorDataSize_ }
-      , imageViewCaptureReplayDescriptorDataSize{ imageViewCaptureReplayDescriptorDataSize_ }
-      , samplerCaptureReplayDescriptorDataSize{ samplerCaptureReplayDescriptorDataSize_ }
-      , accelerationStructureCaptureReplayDescriptorDataSize{ accelerationStructureCaptureReplayDescriptorDataSize_ }
-      , samplerDescriptorSize{ samplerDescriptorSize_ }
-      , combinedImageSamplerDescriptorSize{ combinedImageSamplerDescriptorSize_ }
-      , sampledImageDescriptorSize{ sampledImageDescriptorSize_ }
-      , storageImageDescriptorSize{ storageImageDescriptorSize_ }
-      , uniformTexelBufferDescriptorSize{ uniformTexelBufferDescriptorSize_ }
-      , robustUniformTexelBufferDescriptorSize{ robustUniformTexelBufferDescriptorSize_ }
-      , storageTexelBufferDescriptorSize{ storageTexelBufferDescriptorSize_ }
-      , robustStorageTexelBufferDescriptorSize{ robustStorageTexelBufferDescriptorSize_ }
-      , uniformBufferDescriptorSize{ uniformBufferDescriptorSize_ }
-      , robustUniformBufferDescriptorSize{ robustUniformBufferDescriptorSize_ }
-      , storageBufferDescriptorSize{ storageBufferDescriptorSize_ }
-      , robustStorageBufferDescriptorSize{ robustStorageBufferDescriptorSize_ }
-      , inputAttachmentDescriptorSize{ inputAttachmentDescriptorSize_ }
-      , accelerationStructureDescriptorSize{ accelerationStructureDescriptorSize_ }
-      , maxSamplerDescriptorBufferRange{ maxSamplerDescriptorBufferRange_ }
-      , maxResourceDescriptorBufferRange{ maxResourceDescriptorBufferRange_ }
-      , samplerDescriptorBufferAddressSpaceSize{ samplerDescriptorBufferAddressSpaceSize_ }
-      , resourceDescriptorBufferAddressSpaceSize{ resourceDescriptorBufferAddressSpaceSize_ }
-      , descriptorBufferAddressSpaceSize{ descriptorBufferAddressSpaceSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferPropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32     combinedImageSamplerDescriptorSingleArray_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32     bufferlessPushDescriptors_                 = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32     allowSamplerImageViewPostSubmitCreation_   = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize descriptorBufferOffsetAlignment_           = {},
+                                                                      uint32_t                         maxDescriptorBufferBindings_               = {},
+                                                                      uint32_t                         maxResourceDescriptorBufferBindings_       = {},
+                                                                      uint32_t                         maxSamplerDescriptorBufferBindings_        = {},
+                                                                      uint32_t                         maxEmbeddedImmutableSamplerBindings_       = {},
+                                                                      uint32_t                         maxEmbeddedImmutableSamplers_              = {},
+                                                                      size_t                           bufferCaptureReplayDescriptorDataSize_     = {},
+                                                                      size_t                           imageCaptureReplayDescriptorDataSize_      = {},
+                                                                      size_t                           imageViewCaptureReplayDescriptorDataSize_  = {},
+                                                                      size_t                           samplerCaptureReplayDescriptorDataSize_    = {},
+                                                                      size_t accelerationStructureCaptureReplayDescriptorDataSize_                = {},
+                                                                      size_t samplerDescriptorSize_                                               = {},
+                                                                      size_t combinedImageSamplerDescriptorSize_                                  = {},
+                                                                      size_t sampledImageDescriptorSize_                                          = {},
+                                                                      size_t storageImageDescriptorSize_                                          = {},
+                                                                      size_t uniformTexelBufferDescriptorSize_                                    = {},
+                                                                      size_t robustUniformTexelBufferDescriptorSize_                              = {},
+                                                                      size_t storageTexelBufferDescriptorSize_                                    = {},
+                                                                      size_t robustStorageTexelBufferDescriptorSize_                              = {},
+                                                                      size_t uniformBufferDescriptorSize_                                         = {},
+                                                                      size_t robustUniformBufferDescriptorSize_                                   = {},
+                                                                      size_t storageBufferDescriptorSize_                                         = {},
+                                                                      size_t robustStorageBufferDescriptorSize_                                   = {},
+                                                                      size_t inputAttachmentDescriptorSize_                                       = {},
+                                                                      size_t accelerationStructureDescriptorSize_                                 = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize maxSamplerDescriptorBufferRange_           = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize maxResourceDescriptorBufferRange_          = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize samplerDescriptorBufferAddressSpaceSize_   = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize resourceDescriptorBufferAddressSpaceSize_  = {},
+                                                                      VULKAN_HPP_NAMESPACE::DeviceSize descriptorBufferAddressSpaceSize_          = {},
+                                                                      void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , combinedImageSamplerDescriptorSingleArray( combinedImageSamplerDescriptorSingleArray_ )
+      , bufferlessPushDescriptors( bufferlessPushDescriptors_ )
+      , allowSamplerImageViewPostSubmitCreation( allowSamplerImageViewPostSubmitCreation_ )
+      , descriptorBufferOffsetAlignment( descriptorBufferOffsetAlignment_ )
+      , maxDescriptorBufferBindings( maxDescriptorBufferBindings_ )
+      , maxResourceDescriptorBufferBindings( maxResourceDescriptorBufferBindings_ )
+      , maxSamplerDescriptorBufferBindings( maxSamplerDescriptorBufferBindings_ )
+      , maxEmbeddedImmutableSamplerBindings( maxEmbeddedImmutableSamplerBindings_ )
+      , maxEmbeddedImmutableSamplers( maxEmbeddedImmutableSamplers_ )
+      , bufferCaptureReplayDescriptorDataSize( bufferCaptureReplayDescriptorDataSize_ )
+      , imageCaptureReplayDescriptorDataSize( imageCaptureReplayDescriptorDataSize_ )
+      , imageViewCaptureReplayDescriptorDataSize( imageViewCaptureReplayDescriptorDataSize_ )
+      , samplerCaptureReplayDescriptorDataSize( samplerCaptureReplayDescriptorDataSize_ )
+      , accelerationStructureCaptureReplayDescriptorDataSize( accelerationStructureCaptureReplayDescriptorDataSize_ )
+      , samplerDescriptorSize( samplerDescriptorSize_ )
+      , combinedImageSamplerDescriptorSize( combinedImageSamplerDescriptorSize_ )
+      , sampledImageDescriptorSize( sampledImageDescriptorSize_ )
+      , storageImageDescriptorSize( storageImageDescriptorSize_ )
+      , uniformTexelBufferDescriptorSize( uniformTexelBufferDescriptorSize_ )
+      , robustUniformTexelBufferDescriptorSize( robustUniformTexelBufferDescriptorSize_ )
+      , storageTexelBufferDescriptorSize( storageTexelBufferDescriptorSize_ )
+      , robustStorageTexelBufferDescriptorSize( robustStorageTexelBufferDescriptorSize_ )
+      , uniformBufferDescriptorSize( uniformBufferDescriptorSize_ )
+      , robustUniformBufferDescriptorSize( robustUniformBufferDescriptorSize_ )
+      , storageBufferDescriptorSize( storageBufferDescriptorSize_ )
+      , robustStorageBufferDescriptorSize( robustStorageBufferDescriptorSize_ )
+      , inputAttachmentDescriptorSize( inputAttachmentDescriptorSize_ )
+      , accelerationStructureDescriptorSize( accelerationStructureDescriptorSize_ )
+      , maxSamplerDescriptorBufferRange( maxSamplerDescriptorBufferRange_ )
+      , maxResourceDescriptorBufferRange( maxResourceDescriptorBufferRange_ )
+      , samplerDescriptorBufferAddressSpaceSize( samplerDescriptorBufferAddressSpaceSize_ )
+      , resourceDescriptorBufferAddressSpaceSize( resourceDescriptorBufferAddressSpaceSize_ )
+      , descriptorBufferAddressSpaceSize( descriptorBufferAddressSpaceSize_ )
     {
     }
 
@@ -85042,11 +60846,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDescriptorBufferPropertiesEXT & operator=( PhysicalDeviceDescriptorBufferPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorBufferPropertiesEXT & operator=( VkPhysicalDeviceDescriptorBufferPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorBufferPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorBufferPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -85060,23 +60864,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorBufferPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorBufferPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorBufferPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorBufferPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -85101,11 +60898,12 @@ namespace VULKAN_HPP_NAMESPACE
                size_t const &,
                size_t const &,
                size_t const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -85195,309 +60993,49 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                = StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT;
-    void *        pNext                                                = {};
-    Bool32        combinedImageSamplerDescriptorSingleArray            = {};
-    Bool32        bufferlessPushDescriptors                            = {};
-    Bool32        allowSamplerImageViewPostSubmitCreation              = {};
-    DeviceSize    descriptorBufferOffsetAlignment                      = {};
-    uint32_t      maxDescriptorBufferBindings                          = {};
-    uint32_t      maxResourceDescriptorBufferBindings                  = {};
-    uint32_t      maxSamplerDescriptorBufferBindings                   = {};
-    uint32_t      maxEmbeddedImmutableSamplerBindings                  = {};
-    uint32_t      maxEmbeddedImmutableSamplers                         = {};
-    size_t        bufferCaptureReplayDescriptorDataSize                = {};
-    size_t        imageCaptureReplayDescriptorDataSize                 = {};
-    size_t        imageViewCaptureReplayDescriptorDataSize             = {};
-    size_t        samplerCaptureReplayDescriptorDataSize               = {};
-    size_t        accelerationStructureCaptureReplayDescriptorDataSize = {};
-    size_t        samplerDescriptorSize                                = {};
-    size_t        combinedImageSamplerDescriptorSize                   = {};
-    size_t        sampledImageDescriptorSize                           = {};
-    size_t        storageImageDescriptorSize                           = {};
-    size_t        uniformTexelBufferDescriptorSize                     = {};
-    size_t        robustUniformTexelBufferDescriptorSize               = {};
-    size_t        storageTexelBufferDescriptorSize                     = {};
-    size_t        robustStorageTexelBufferDescriptorSize               = {};
-    size_t        uniformBufferDescriptorSize                          = {};
-    size_t        robustUniformBufferDescriptorSize                    = {};
-    size_t        storageBufferDescriptorSize                          = {};
-    size_t        robustStorageBufferDescriptorSize                    = {};
-    size_t        inputAttachmentDescriptorSize                        = {};
-    size_t        accelerationStructureDescriptorSize                  = {};
-    DeviceSize    maxSamplerDescriptorBufferRange                      = {};
-    DeviceSize    maxResourceDescriptorBufferRange                     = {};
-    DeviceSize    samplerDescriptorBufferAddressSpaceSize              = {};
-    DeviceSize    resourceDescriptorBufferAddressSpaceSize             = {};
-    DeviceSize    descriptorBufferAddressSpaceSize                     = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                = StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT;
+    void *                              pNext                                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        combinedImageSamplerDescriptorSingleArray            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferlessPushDescriptors                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        allowSamplerImageViewPostSubmitCreation              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    descriptorBufferOffsetAlignment                      = {};
+    uint32_t                            maxDescriptorBufferBindings                          = {};
+    uint32_t                            maxResourceDescriptorBufferBindings                  = {};
+    uint32_t                            maxSamplerDescriptorBufferBindings                   = {};
+    uint32_t                            maxEmbeddedImmutableSamplerBindings                  = {};
+    uint32_t                            maxEmbeddedImmutableSamplers                         = {};
+    size_t                              bufferCaptureReplayDescriptorDataSize                = {};
+    size_t                              imageCaptureReplayDescriptorDataSize                 = {};
+    size_t                              imageViewCaptureReplayDescriptorDataSize             = {};
+    size_t                              samplerCaptureReplayDescriptorDataSize               = {};
+    size_t                              accelerationStructureCaptureReplayDescriptorDataSize = {};
+    size_t                              samplerDescriptorSize                                = {};
+    size_t                              combinedImageSamplerDescriptorSize                   = {};
+    size_t                              sampledImageDescriptorSize                           = {};
+    size_t                              storageImageDescriptorSize                           = {};
+    size_t                              uniformTexelBufferDescriptorSize                     = {};
+    size_t                              robustUniformTexelBufferDescriptorSize               = {};
+    size_t                              storageTexelBufferDescriptorSize                     = {};
+    size_t                              robustStorageTexelBufferDescriptorSize               = {};
+    size_t                              uniformBufferDescriptorSize                          = {};
+    size_t                              robustUniformBufferDescriptorSize                    = {};
+    size_t                              storageBufferDescriptorSize                          = {};
+    size_t                              robustStorageBufferDescriptorSize                    = {};
+    size_t                              inputAttachmentDescriptorSize                        = {};
+    size_t                              accelerationStructureDescriptorSize                  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    maxSamplerDescriptorBufferRange                      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    maxResourceDescriptorBufferRange                     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    samplerDescriptorBufferAddressSpaceSize              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    resourceDescriptorBufferAddressSpaceSize             = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    descriptorBufferAddressSpaceSize                     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorBufferPropertiesEXT>
-  {
-    using Type = PhysicalDeviceDescriptorBufferPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT>
   {
     using Type = PhysicalDeviceDescriptorBufferPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorBufferTensorFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorBufferTensorFeaturesARM.html
-  struct PhysicalDeviceDescriptorBufferTensorFeaturesARM
-  {
-    using NativeType = VkPhysicalDeviceDescriptorBufferTensorFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorBufferTensorFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferTensorFeaturesARM( Bool32 descriptorBufferTensorDescriptors_ = {},
-                                                                          void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorBufferTensorDescriptors{ descriptorBufferTensorDescriptors_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDescriptorBufferTensorFeaturesARM( PhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDescriptorBufferTensorFeaturesARM( VkPhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDescriptorBufferTensorFeaturesARM( *reinterpret_cast<PhysicalDeviceDescriptorBufferTensorFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDescriptorBufferTensorFeaturesARM & operator=( PhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDescriptorBufferTensorFeaturesARM & operator=( VkPhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorBufferTensorFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorFeaturesARM &
-      setDescriptorBufferTensorDescriptors( Bool32 descriptorBufferTensorDescriptors_ ) VULKAN_HPP_NOEXCEPT
-    {
-      descriptorBufferTensorDescriptors = descriptorBufferTensorDescriptors_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDescriptorBufferTensorFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDescriptorBufferTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDescriptorBufferTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorBufferTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorBufferTensorFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, descriptorBufferTensorDescriptors );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDescriptorBufferTensorFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( descriptorBufferTensorDescriptors == rhs.descriptorBufferTensorDescriptors );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDescriptorBufferTensorFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                             = StructureType::ePhysicalDeviceDescriptorBufferTensorFeaturesARM;
-    void *        pNext                             = {};
-    Bool32        descriptorBufferTensorDescriptors = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorBufferTensorFeaturesARM>
-  {
-    using Type = PhysicalDeviceDescriptorBufferTensorFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorBufferTensorFeaturesARM>
-  {
-    using Type = PhysicalDeviceDescriptorBufferTensorFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDescriptorBufferTensorPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorBufferTensorPropertiesARM.html
-  struct PhysicalDeviceDescriptorBufferTensorPropertiesARM
-  {
-    using NativeType = VkPhysicalDeviceDescriptorBufferTensorPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorBufferTensorPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorBufferTensorPropertiesARM( size_t tensorCaptureReplayDescriptorDataSize_     = {},
-                                                                            size_t tensorViewCaptureReplayDescriptorDataSize_ = {},
-                                                                            size_t tensorDescriptorSize_                      = {},
-                                                                            void * pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorCaptureReplayDescriptorDataSize{ tensorCaptureReplayDescriptorDataSize_ }
-      , tensorViewCaptureReplayDescriptorDataSize{ tensorViewCaptureReplayDescriptorDataSize_ }
-      , tensorDescriptorSize{ tensorDescriptorSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDescriptorBufferTensorPropertiesARM( PhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDescriptorBufferTensorPropertiesARM( VkPhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDescriptorBufferTensorPropertiesARM( *reinterpret_cast<PhysicalDeviceDescriptorBufferTensorPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDescriptorBufferTensorPropertiesARM &
-      operator=( PhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDescriptorBufferTensorPropertiesARM & operator=( VkPhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorBufferTensorPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorPropertiesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorPropertiesARM &
-      setTensorCaptureReplayDescriptorDataSize( size_t tensorCaptureReplayDescriptorDataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorCaptureReplayDescriptorDataSize = tensorCaptureReplayDescriptorDataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorPropertiesARM &
-      setTensorViewCaptureReplayDescriptorDataSize( size_t tensorViewCaptureReplayDescriptorDataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorViewCaptureReplayDescriptorDataSize = tensorViewCaptureReplayDescriptorDataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorBufferTensorPropertiesARM & setTensorDescriptorSize( size_t tensorDescriptorSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorDescriptorSize = tensorDescriptorSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDescriptorBufferTensorPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDescriptorBufferTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDescriptorBufferTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorBufferTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorBufferTensorPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorBufferTensorPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, size_t const &, size_t const &, size_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorCaptureReplayDescriptorDataSize, tensorViewCaptureReplayDescriptorDataSize, tensorDescriptorSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDescriptorBufferTensorPropertiesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorCaptureReplayDescriptorDataSize == rhs.tensorCaptureReplayDescriptorDataSize ) &&
-             ( tensorViewCaptureReplayDescriptorDataSize == rhs.tensorViewCaptureReplayDescriptorDataSize ) &&
-             ( tensorDescriptorSize == rhs.tensorDescriptorSize );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDescriptorBufferTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                     = StructureType::ePhysicalDeviceDescriptorBufferTensorPropertiesARM;
-    void *        pNext                                     = {};
-    size_t        tensorCaptureReplayDescriptorDataSize     = {};
-    size_t        tensorViewCaptureReplayDescriptorDataSize = {};
-    size_t        tensorDescriptorSize                      = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorBufferTensorPropertiesARM>
-  {
-    using Type = PhysicalDeviceDescriptorBufferTensorPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorBufferTensorPropertiesARM>
-  {
-    using Type = PhysicalDeviceDescriptorBufferTensorPropertiesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDescriptorIndexingFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorIndexingFeatures.html
   struct PhysicalDeviceDescriptorIndexingFeatures
   {
     using NativeType = VkPhysicalDeviceDescriptorIndexingFeatures;
@@ -85505,49 +61043,49 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorIndexingFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorIndexingFeatures( Bool32 shaderInputAttachmentArrayDynamicIndexing_          = {},
-                                                                   Bool32 shaderUniformTexelBufferArrayDynamicIndexing_       = {},
-                                                                   Bool32 shaderStorageTexelBufferArrayDynamicIndexing_       = {},
-                                                                   Bool32 shaderUniformBufferArrayNonUniformIndexing_         = {},
-                                                                   Bool32 shaderSampledImageArrayNonUniformIndexing_          = {},
-                                                                   Bool32 shaderStorageBufferArrayNonUniformIndexing_         = {},
-                                                                   Bool32 shaderStorageImageArrayNonUniformIndexing_          = {},
-                                                                   Bool32 shaderInputAttachmentArrayNonUniformIndexing_       = {},
-                                                                   Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_    = {},
-                                                                   Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_    = {},
-                                                                   Bool32 descriptorBindingUniformBufferUpdateAfterBind_      = {},
-                                                                   Bool32 descriptorBindingSampledImageUpdateAfterBind_       = {},
-                                                                   Bool32 descriptorBindingStorageImageUpdateAfterBind_       = {},
-                                                                   Bool32 descriptorBindingStorageBufferUpdateAfterBind_      = {},
-                                                                   Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ = {},
-                                                                   Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ = {},
-                                                                   Bool32 descriptorBindingUpdateUnusedWhilePending_          = {},
-                                                                   Bool32 descriptorBindingPartiallyBound_                    = {},
-                                                                   Bool32 descriptorBindingVariableDescriptorCount_           = {},
-                                                                   Bool32 runtimeDescriptorArray_                             = {},
-                                                                   void * pNext_                                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderInputAttachmentArrayDynamicIndexing{ shaderInputAttachmentArrayDynamicIndexing_ }
-      , shaderUniformTexelBufferArrayDynamicIndexing{ shaderUniformTexelBufferArrayDynamicIndexing_ }
-      , shaderStorageTexelBufferArrayDynamicIndexing{ shaderStorageTexelBufferArrayDynamicIndexing_ }
-      , shaderUniformBufferArrayNonUniformIndexing{ shaderUniformBufferArrayNonUniformIndexing_ }
-      , shaderSampledImageArrayNonUniformIndexing{ shaderSampledImageArrayNonUniformIndexing_ }
-      , shaderStorageBufferArrayNonUniformIndexing{ shaderStorageBufferArrayNonUniformIndexing_ }
-      , shaderStorageImageArrayNonUniformIndexing{ shaderStorageImageArrayNonUniformIndexing_ }
-      , shaderInputAttachmentArrayNonUniformIndexing{ shaderInputAttachmentArrayNonUniformIndexing_ }
-      , shaderUniformTexelBufferArrayNonUniformIndexing{ shaderUniformTexelBufferArrayNonUniformIndexing_ }
-      , shaderStorageTexelBufferArrayNonUniformIndexing{ shaderStorageTexelBufferArrayNonUniformIndexing_ }
-      , descriptorBindingUniformBufferUpdateAfterBind{ descriptorBindingUniformBufferUpdateAfterBind_ }
-      , descriptorBindingSampledImageUpdateAfterBind{ descriptorBindingSampledImageUpdateAfterBind_ }
-      , descriptorBindingStorageImageUpdateAfterBind{ descriptorBindingStorageImageUpdateAfterBind_ }
-      , descriptorBindingStorageBufferUpdateAfterBind{ descriptorBindingStorageBufferUpdateAfterBind_ }
-      , descriptorBindingUniformTexelBufferUpdateAfterBind{ descriptorBindingUniformTexelBufferUpdateAfterBind_ }
-      , descriptorBindingStorageTexelBufferUpdateAfterBind{ descriptorBindingStorageTexelBufferUpdateAfterBind_ }
-      , descriptorBindingUpdateUnusedWhilePending{ descriptorBindingUpdateUnusedWhilePending_ }
-      , descriptorBindingPartiallyBound{ descriptorBindingPartiallyBound_ }
-      , descriptorBindingVariableDescriptorCount{ descriptorBindingVariableDescriptorCount_ }
-      , runtimeDescriptorArray{ runtimeDescriptorArray_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorIndexingFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayDynamicIndexing_          = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayDynamicIndexing_       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayDynamicIndexing_       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayNonUniformIndexing_         = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayNonUniformIndexing_          = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayNonUniformIndexing_         = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayNonUniformIndexing_          = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayNonUniformIndexing_       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_    = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_    = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformBufferUpdateAfterBind_      = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingSampledImageUpdateAfterBind_       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageImageUpdateAfterBind_       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageBufferUpdateAfterBind_      = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUpdateUnusedWhilePending_          = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingPartiallyBound_                    = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingVariableDescriptorCount_           = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 runtimeDescriptorArray_                             = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderInputAttachmentArrayDynamicIndexing( shaderInputAttachmentArrayDynamicIndexing_ )
+      , shaderUniformTexelBufferArrayDynamicIndexing( shaderUniformTexelBufferArrayDynamicIndexing_ )
+      , shaderStorageTexelBufferArrayDynamicIndexing( shaderStorageTexelBufferArrayDynamicIndexing_ )
+      , shaderUniformBufferArrayNonUniformIndexing( shaderUniformBufferArrayNonUniformIndexing_ )
+      , shaderSampledImageArrayNonUniformIndexing( shaderSampledImageArrayNonUniformIndexing_ )
+      , shaderStorageBufferArrayNonUniformIndexing( shaderStorageBufferArrayNonUniformIndexing_ )
+      , shaderStorageImageArrayNonUniformIndexing( shaderStorageImageArrayNonUniformIndexing_ )
+      , shaderInputAttachmentArrayNonUniformIndexing( shaderInputAttachmentArrayNonUniformIndexing_ )
+      , shaderUniformTexelBufferArrayNonUniformIndexing( shaderUniformTexelBufferArrayNonUniformIndexing_ )
+      , shaderStorageTexelBufferArrayNonUniformIndexing( shaderStorageTexelBufferArrayNonUniformIndexing_ )
+      , descriptorBindingUniformBufferUpdateAfterBind( descriptorBindingUniformBufferUpdateAfterBind_ )
+      , descriptorBindingSampledImageUpdateAfterBind( descriptorBindingSampledImageUpdateAfterBind_ )
+      , descriptorBindingStorageImageUpdateAfterBind( descriptorBindingStorageImageUpdateAfterBind_ )
+      , descriptorBindingStorageBufferUpdateAfterBind( descriptorBindingStorageBufferUpdateAfterBind_ )
+      , descriptorBindingUniformTexelBufferUpdateAfterBind( descriptorBindingUniformTexelBufferUpdateAfterBind_ )
+      , descriptorBindingStorageTexelBufferUpdateAfterBind( descriptorBindingStorageTexelBufferUpdateAfterBind_ )
+      , descriptorBindingUpdateUnusedWhilePending( descriptorBindingUpdateUnusedWhilePending_ )
+      , descriptorBindingPartiallyBound( descriptorBindingPartiallyBound_ )
+      , descriptorBindingVariableDescriptorCount( descriptorBindingVariableDescriptorCount_ )
+      , runtimeDescriptorArray( runtimeDescriptorArray_ )
     {
     }
 
@@ -85559,15 +61097,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDescriptorIndexingFeatures & operator=( PhysicalDeviceDescriptorIndexingFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorIndexingFeatures & operator=( VkPhysicalDeviceDescriptorIndexingFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorIndexingFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -85575,144 +61113,145 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderInputAttachmentArrayDynamicIndexing( Bool32 shaderInputAttachmentArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderInputAttachmentArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInputAttachmentArrayDynamicIndexing = shaderInputAttachmentArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderUniformTexelBufferArrayDynamicIndexing( Bool32 shaderUniformTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformTexelBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformTexelBufferArrayDynamicIndexing = shaderUniformTexelBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderStorageTexelBufferArrayDynamicIndexing( Bool32 shaderStorageTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageTexelBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageTexelBufferArrayDynamicIndexing = shaderStorageTexelBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderUniformBufferArrayNonUniformIndexing( Bool32 shaderUniformBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformBufferArrayNonUniformIndexing = shaderUniformBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderSampledImageArrayNonUniformIndexing( Bool32 shaderSampledImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSampledImageArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSampledImageArrayNonUniformIndexing = shaderSampledImageArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderStorageBufferArrayNonUniformIndexing( Bool32 shaderStorageBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageBufferArrayNonUniformIndexing = shaderStorageBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderStorageImageArrayNonUniformIndexing( Bool32 shaderStorageImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageImageArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageArrayNonUniformIndexing = shaderStorageImageArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderInputAttachmentArrayNonUniformIndexing( Bool32 shaderInputAttachmentArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderInputAttachmentArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInputAttachmentArrayNonUniformIndexing = shaderInputAttachmentArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderUniformTexelBufferArrayNonUniformIndexing( Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformTexelBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformTexelBufferArrayNonUniformIndexing = shaderUniformTexelBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setShaderStorageTexelBufferArrayNonUniformIndexing( Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageTexelBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageTexelBufferArrayNonUniformIndexing = shaderStorageTexelBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingUniformBufferUpdateAfterBind( Bool32 descriptorBindingUniformBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingUniformBufferUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUniformBufferUpdateAfterBind = descriptorBindingUniformBufferUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingSampledImageUpdateAfterBind( Bool32 descriptorBindingSampledImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingSampledImageUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingSampledImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingSampledImageUpdateAfterBind = descriptorBindingSampledImageUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingStorageImageUpdateAfterBind( Bool32 descriptorBindingStorageImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingStorageImageUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageImageUpdateAfterBind = descriptorBindingStorageImageUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingStorageBufferUpdateAfterBind( Bool32 descriptorBindingStorageBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingStorageBufferUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageBufferUpdateAfterBind = descriptorBindingStorageBufferUpdateAfterBind_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingUniformTexelBufferUpdateAfterBind( Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures & setDescriptorBindingUniformTexelBufferUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUniformTexelBufferUpdateAfterBind = descriptorBindingUniformTexelBufferUpdateAfterBind_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingStorageTexelBufferUpdateAfterBind( Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures & setDescriptorBindingStorageTexelBufferUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageTexelBufferUpdateAfterBind = descriptorBindingStorageTexelBufferUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingUpdateUnusedWhilePending( Bool32 descriptorBindingUpdateUnusedWhilePending_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingUpdateUnusedWhilePending( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUpdateUnusedWhilePending_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUpdateUnusedWhilePending = descriptorBindingUpdateUnusedWhilePending_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingPartiallyBound( Bool32 descriptorBindingPartiallyBound_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingPartiallyBound( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingPartiallyBound_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingPartiallyBound = descriptorBindingPartiallyBound_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
-      setDescriptorBindingVariableDescriptorCount( Bool32 descriptorBindingVariableDescriptorCount_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingVariableDescriptorCount( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingVariableDescriptorCount_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingVariableDescriptorCount = descriptorBindingVariableDescriptorCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures & setRuntimeDescriptorArray( Bool32 runtimeDescriptorArray_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorIndexingFeatures &
+      setRuntimeDescriptorArray( VULKAN_HPP_NAMESPACE::Bool32 runtimeDescriptorArray_ ) VULKAN_HPP_NOEXCEPT
     {
       runtimeDescriptorArray = runtimeDescriptorArray_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDescriptorIndexingFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -85724,39 +61263,33 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorIndexingFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorIndexingFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorIndexingFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorIndexingFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorIndexingFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -85823,38 +61356,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                              = StructureType::ePhysicalDeviceDescriptorIndexingFeatures;
-    void *        pNext                                              = {};
-    Bool32        shaderInputAttachmentArrayDynamicIndexing          = {};
-    Bool32        shaderUniformTexelBufferArrayDynamicIndexing       = {};
-    Bool32        shaderStorageTexelBufferArrayDynamicIndexing       = {};
-    Bool32        shaderUniformBufferArrayNonUniformIndexing         = {};
-    Bool32        shaderSampledImageArrayNonUniformIndexing          = {};
-    Bool32        shaderStorageBufferArrayNonUniformIndexing         = {};
-    Bool32        shaderStorageImageArrayNonUniformIndexing          = {};
-    Bool32        shaderInputAttachmentArrayNonUniformIndexing       = {};
-    Bool32        shaderUniformTexelBufferArrayNonUniformIndexing    = {};
-    Bool32        shaderStorageTexelBufferArrayNonUniformIndexing    = {};
-    Bool32        descriptorBindingUniformBufferUpdateAfterBind      = {};
-    Bool32        descriptorBindingSampledImageUpdateAfterBind       = {};
-    Bool32        descriptorBindingStorageImageUpdateAfterBind       = {};
-    Bool32        descriptorBindingStorageBufferUpdateAfterBind      = {};
-    Bool32        descriptorBindingUniformTexelBufferUpdateAfterBind = {};
-    Bool32        descriptorBindingStorageTexelBufferUpdateAfterBind = {};
-    Bool32        descriptorBindingUpdateUnusedWhilePending          = {};
-    Bool32        descriptorBindingPartiallyBound                    = {};
-    Bool32        descriptorBindingVariableDescriptorCount           = {};
-    Bool32        runtimeDescriptorArray                             = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                              = StructureType::ePhysicalDeviceDescriptorIndexingFeatures;
+    void *                              pNext                                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInputAttachmentArrayDynamicIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformTexelBufferArrayDynamicIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageTexelBufferArrayDynamicIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformBufferArrayNonUniformIndexing         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSampledImageArrayNonUniformIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageBufferArrayNonUniformIndexing         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageImageArrayNonUniformIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInputAttachmentArrayNonUniformIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformTexelBufferArrayNonUniformIndexing    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageTexelBufferArrayNonUniformIndexing    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUniformBufferUpdateAfterBind      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingSampledImageUpdateAfterBind       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageImageUpdateAfterBind       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageBufferUpdateAfterBind      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUniformTexelBufferUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageTexelBufferUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUpdateUnusedWhilePending          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingPartiallyBound                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingVariableDescriptorCount           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        runtimeDescriptorArray                             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorIndexingFeatures>
-  {
-    using Type = PhysicalDeviceDescriptorIndexingFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorIndexingFeatures>
   {
@@ -85863,8 +61388,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceDescriptorIndexingFeaturesEXT = PhysicalDeviceDescriptorIndexingFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorIndexingProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorIndexingProperties.html
   struct PhysicalDeviceDescriptorIndexingProperties
   {
     using NativeType = VkPhysicalDeviceDescriptorIndexingProperties;
@@ -85872,55 +61395,55 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorIndexingProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorIndexingProperties( uint32_t maxUpdateAfterBindDescriptorsInAllPools_              = {},
-                                                                     Bool32   shaderUniformBufferArrayNonUniformIndexingNative_     = {},
-                                                                     Bool32   shaderSampledImageArrayNonUniformIndexingNative_      = {},
-                                                                     Bool32   shaderStorageBufferArrayNonUniformIndexingNative_     = {},
-                                                                     Bool32   shaderStorageImageArrayNonUniformIndexingNative_      = {},
-                                                                     Bool32   shaderInputAttachmentArrayNonUniformIndexingNative_   = {},
-                                                                     Bool32   robustBufferAccessUpdateAfterBind_                    = {},
-                                                                     Bool32   quadDivergentImplicitLod_                             = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindSamplers_         = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers_   = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers_   = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages_    = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages_    = {},
-                                                                     uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments_ = {},
-                                                                     uint32_t maxPerStageUpdateAfterBindResources_                  = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindSamplers_              = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers_        = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers_        = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindSampledImages_         = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindStorageImages_         = {},
-                                                                     uint32_t maxDescriptorSetUpdateAfterBindInputAttachments_      = {},
-                                                                     void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxUpdateAfterBindDescriptorsInAllPools{ maxUpdateAfterBindDescriptorsInAllPools_ }
-      , shaderUniformBufferArrayNonUniformIndexingNative{ shaderUniformBufferArrayNonUniformIndexingNative_ }
-      , shaderSampledImageArrayNonUniformIndexingNative{ shaderSampledImageArrayNonUniformIndexingNative_ }
-      , shaderStorageBufferArrayNonUniformIndexingNative{ shaderStorageBufferArrayNonUniformIndexingNative_ }
-      , shaderStorageImageArrayNonUniformIndexingNative{ shaderStorageImageArrayNonUniformIndexingNative_ }
-      , shaderInputAttachmentArrayNonUniformIndexingNative{ shaderInputAttachmentArrayNonUniformIndexingNative_ }
-      , robustBufferAccessUpdateAfterBind{ robustBufferAccessUpdateAfterBind_ }
-      , quadDivergentImplicitLod{ quadDivergentImplicitLod_ }
-      , maxPerStageDescriptorUpdateAfterBindSamplers{ maxPerStageDescriptorUpdateAfterBindSamplers_ }
-      , maxPerStageDescriptorUpdateAfterBindUniformBuffers{ maxPerStageDescriptorUpdateAfterBindUniformBuffers_ }
-      , maxPerStageDescriptorUpdateAfterBindStorageBuffers{ maxPerStageDescriptorUpdateAfterBindStorageBuffers_ }
-      , maxPerStageDescriptorUpdateAfterBindSampledImages{ maxPerStageDescriptorUpdateAfterBindSampledImages_ }
-      , maxPerStageDescriptorUpdateAfterBindStorageImages{ maxPerStageDescriptorUpdateAfterBindStorageImages_ }
-      , maxPerStageDescriptorUpdateAfterBindInputAttachments{ maxPerStageDescriptorUpdateAfterBindInputAttachments_ }
-      , maxPerStageUpdateAfterBindResources{ maxPerStageUpdateAfterBindResources_ }
-      , maxDescriptorSetUpdateAfterBindSamplers{ maxDescriptorSetUpdateAfterBindSamplers_ }
-      , maxDescriptorSetUpdateAfterBindUniformBuffers{ maxDescriptorSetUpdateAfterBindUniformBuffers_ }
-      , maxDescriptorSetUpdateAfterBindUniformBuffersDynamic{ maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindStorageBuffers{ maxDescriptorSetUpdateAfterBindStorageBuffers_ }
-      , maxDescriptorSetUpdateAfterBindStorageBuffersDynamic{ maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindSampledImages{ maxDescriptorSetUpdateAfterBindSampledImages_ }
-      , maxDescriptorSetUpdateAfterBindStorageImages{ maxDescriptorSetUpdateAfterBindStorageImages_ }
-      , maxDescriptorSetUpdateAfterBindInputAttachments{ maxDescriptorSetUpdateAfterBindInputAttachments_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorIndexingProperties( uint32_t                     maxUpdateAfterBindDescriptorsInAllPools_              = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayNonUniformIndexingNative_     = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayNonUniformIndexingNative_      = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayNonUniformIndexingNative_     = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayNonUniformIndexingNative_      = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayNonUniformIndexingNative_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccessUpdateAfterBind_                    = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 quadDivergentImplicitLod_                             = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindSamplers_         = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindUniformBuffers_   = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindStorageBuffers_   = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindSampledImages_    = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindStorageImages_    = {},
+                                                                     uint32_t                     maxPerStageDescriptorUpdateAfterBindInputAttachments_ = {},
+                                                                     uint32_t                     maxPerStageUpdateAfterBindResources_                  = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindSamplers_              = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindUniformBuffers_        = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindStorageBuffers_        = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindSampledImages_         = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindStorageImages_         = {},
+                                                                     uint32_t                     maxDescriptorSetUpdateAfterBindInputAttachments_      = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxUpdateAfterBindDescriptorsInAllPools( maxUpdateAfterBindDescriptorsInAllPools_ )
+      , shaderUniformBufferArrayNonUniformIndexingNative( shaderUniformBufferArrayNonUniformIndexingNative_ )
+      , shaderSampledImageArrayNonUniformIndexingNative( shaderSampledImageArrayNonUniformIndexingNative_ )
+      , shaderStorageBufferArrayNonUniformIndexingNative( shaderStorageBufferArrayNonUniformIndexingNative_ )
+      , shaderStorageImageArrayNonUniformIndexingNative( shaderStorageImageArrayNonUniformIndexingNative_ )
+      , shaderInputAttachmentArrayNonUniformIndexingNative( shaderInputAttachmentArrayNonUniformIndexingNative_ )
+      , robustBufferAccessUpdateAfterBind( robustBufferAccessUpdateAfterBind_ )
+      , quadDivergentImplicitLod( quadDivergentImplicitLod_ )
+      , maxPerStageDescriptorUpdateAfterBindSamplers( maxPerStageDescriptorUpdateAfterBindSamplers_ )
+      , maxPerStageDescriptorUpdateAfterBindUniformBuffers( maxPerStageDescriptorUpdateAfterBindUniformBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageBuffers( maxPerStageDescriptorUpdateAfterBindStorageBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindSampledImages( maxPerStageDescriptorUpdateAfterBindSampledImages_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageImages( maxPerStageDescriptorUpdateAfterBindStorageImages_ )
+      , maxPerStageDescriptorUpdateAfterBindInputAttachments( maxPerStageDescriptorUpdateAfterBindInputAttachments_ )
+      , maxPerStageUpdateAfterBindResources( maxPerStageUpdateAfterBindResources_ )
+      , maxDescriptorSetUpdateAfterBindSamplers( maxDescriptorSetUpdateAfterBindSamplers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffers( maxDescriptorSetUpdateAfterBindUniformBuffers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffersDynamic( maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffers( maxDescriptorSetUpdateAfterBindStorageBuffers_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffersDynamic( maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindSampledImages( maxDescriptorSetUpdateAfterBindSampledImages_ )
+      , maxDescriptorSetUpdateAfterBindStorageImages( maxDescriptorSetUpdateAfterBindStorageImages_ )
+      , maxDescriptorSetUpdateAfterBindInputAttachments( maxDescriptorSetUpdateAfterBindInputAttachments_ )
     {
     }
 
@@ -85932,11 +61455,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDescriptorIndexingProperties & operator=( PhysicalDeviceDescriptorIndexingProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorIndexingProperties & operator=( VkPhysicalDeviceDescriptorIndexingProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorIndexingProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorIndexingProperties const *>( &rhs );
       return *this;
     }
 
@@ -85950,27 +61473,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorIndexingProperties *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorIndexingProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorIndexingProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorIndexingProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorIndexingProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -85986,6 +61502,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -86056,41 +61573,33 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                = StructureType::ePhysicalDeviceDescriptorIndexingProperties;
-    void *        pNext                                                = {};
-    uint32_t      maxUpdateAfterBindDescriptorsInAllPools              = {};
-    Bool32        shaderUniformBufferArrayNonUniformIndexingNative     = {};
-    Bool32        shaderSampledImageArrayNonUniformIndexingNative      = {};
-    Bool32        shaderStorageBufferArrayNonUniformIndexingNative     = {};
-    Bool32        shaderStorageImageArrayNonUniformIndexingNative      = {};
-    Bool32        shaderInputAttachmentArrayNonUniformIndexingNative   = {};
-    Bool32        robustBufferAccessUpdateAfterBind                    = {};
-    Bool32        quadDivergentImplicitLod                             = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindSamplers         = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindUniformBuffers   = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindStorageBuffers   = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindSampledImages    = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindStorageImages    = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindInputAttachments = {};
-    uint32_t      maxPerStageUpdateAfterBindResources                  = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindSamplers              = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindUniformBuffers        = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindStorageBuffers        = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindSampledImages         = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindStorageImages         = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindInputAttachments      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                = StructureType::ePhysicalDeviceDescriptorIndexingProperties;
+    void *                              pNext                                                = {};
+    uint32_t                            maxUpdateAfterBindDescriptorsInAllPools              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformBufferArrayNonUniformIndexingNative     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSampledImageArrayNonUniformIndexingNative      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageBufferArrayNonUniformIndexingNative     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageImageArrayNonUniformIndexingNative      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInputAttachmentArrayNonUniformIndexingNative   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        robustBufferAccessUpdateAfterBind                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        quadDivergentImplicitLod                             = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindSamplers         = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindUniformBuffers   = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindStorageBuffers   = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindSampledImages    = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindStorageImages    = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindInputAttachments = {};
+    uint32_t                            maxPerStageUpdateAfterBindResources                  = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindSamplers              = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindUniformBuffers        = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindStorageBuffers        = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindSampledImages         = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindStorageImages         = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindInputAttachments      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorIndexingProperties>
-  {
-    using Type = PhysicalDeviceDescriptorIndexingProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorIndexingProperties>
   {
@@ -86099,8 +61608,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceDescriptorIndexingPropertiesEXT = PhysicalDeviceDescriptorIndexingProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV.html
   struct PhysicalDeviceDescriptorPoolOverallocationFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
@@ -86108,11 +61615,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorPoolOverallocationFeaturesNV( Bool32 descriptorPoolOverallocation_ = {},
-                                                                               void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorPoolOverallocation{ descriptorPoolOverallocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorPoolOverallocationFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 descriptorPoolOverallocation_ = {},
+                                                                               void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorPoolOverallocation( descriptorPoolOverallocation_ )
     {
     }
 
@@ -86126,15 +61633,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDescriptorPoolOverallocationFeaturesNV &
       operator=( PhysicalDeviceDescriptorPoolOverallocationFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorPoolOverallocationFeaturesNV & operator=( VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorPoolOverallocationFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorPoolOverallocationFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorPoolOverallocationFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -86142,12 +61649,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorPoolOverallocationFeaturesNV &
-      setDescriptorPoolOverallocation( Bool32 descriptorPoolOverallocation_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorPoolOverallocation( VULKAN_HPP_NAMESPACE::Bool32 descriptorPoolOverallocation_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorPoolOverallocation = descriptorPoolOverallocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -86159,18 +61666,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorPoolOverallocation );
     }
@@ -86195,27 +61697,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
-    void *        pNext                        = {};
-    Bool32        descriptorPoolOverallocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorPoolOverallocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV>
-  {
-    using Type = PhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV>
   {
     using Type = PhysicalDeviceDescriptorPoolOverallocationFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE.html
   struct PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE
   {
     using NativeType = VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
@@ -86223,11 +61715,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE( Bool32 descriptorSetHostMapping_ = {},
-                                                                              void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorSetHostMapping{ descriptorSetHostMapping_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE( VULKAN_HPP_NAMESPACE::Bool32 descriptorSetHostMapping_ = {},
+                                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorSetHostMapping( descriptorSetHostMapping_ )
     {
     }
 
@@ -86241,15 +61733,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE &
       operator=( PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE & operator=( VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -86257,12 +61749,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE &
-      setDescriptorSetHostMapping( Bool32 descriptorSetHostMapping_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorSetHostMapping( VULKAN_HPP_NAMESPACE::Bool32 descriptorSetHostMapping_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorSetHostMapping = descriptorSetHostMapping_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -86274,18 +61766,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE *>( this );
     }
 
-    operator VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorSetHostMapping );
     }
@@ -86310,27 +61797,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
-    void *        pNext                    = {};
-    Bool32        descriptorSetHostMapping = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorSetHostMapping = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE>
-  {
-    using Type = PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE>
   {
     using Type = PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV.html
   struct PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
@@ -86338,15 +61815,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV( Bool32 deviceGeneratedCompute_              = {},
-                                                                                 Bool32 deviceGeneratedComputePipelines_     = {},
-                                                                                 Bool32 deviceGeneratedComputeCaptureReplay_ = {},
-                                                                                 void * pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceGeneratedCompute{ deviceGeneratedCompute_ }
-      , deviceGeneratedComputePipelines{ deviceGeneratedComputePipelines_ }
-      , deviceGeneratedComputeCaptureReplay{ deviceGeneratedComputeCaptureReplay_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedCompute_              = {},
+                                                                                 VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedComputePipelines_     = {},
+                                                                                 VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedComputeCaptureReplay_ = {},
+                                                                                 void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceGeneratedCompute( deviceGeneratedCompute_ )
+      , deviceGeneratedComputePipelines( deviceGeneratedComputePipelines_ )
+      , deviceGeneratedComputeCaptureReplay( deviceGeneratedComputeCaptureReplay_ )
     {
     }
 
@@ -86360,16 +61837,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV &
       operator=( PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV &
       operator=( VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -86377,26 +61854,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV &
-      setDeviceGeneratedCompute( Bool32 deviceGeneratedCompute_ ) VULKAN_HPP_NOEXCEPT
+      setDeviceGeneratedCompute( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedCompute_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceGeneratedCompute = deviceGeneratedCompute_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV &
-      setDeviceGeneratedComputePipelines( Bool32 deviceGeneratedComputePipelines_ ) VULKAN_HPP_NOEXCEPT
+      setDeviceGeneratedComputePipelines( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedComputePipelines_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceGeneratedComputePipelines = deviceGeneratedComputePipelines_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV &
-      setDeviceGeneratedComputeCaptureReplay( Bool32 deviceGeneratedComputeCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setDeviceGeneratedComputeCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedComputeCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceGeneratedComputeCaptureReplay = deviceGeneratedComputeCaptureReplay_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -86408,18 +61885,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceGeneratedCompute, deviceGeneratedComputePipelines, deviceGeneratedComputeCaptureReplay );
     }
@@ -86446,153 +61922,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
-    void *        pNext                               = {};
-    Bool32        deviceGeneratedCompute              = {};
-    Bool32        deviceGeneratedComputePipelines     = {};
-    Bool32        deviceGeneratedComputeCaptureReplay = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
+    void *                              pNext                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceGeneratedCompute              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceGeneratedComputePipelines     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceGeneratedComputeCaptureReplay = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV>
   {
     using Type = PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT.html
-  struct PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT( Bool32 deviceGeneratedCommands_        = {},
-                                                                           Bool32 dynamicGeneratedPipelineLayout_ = {},
-                                                                           void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceGeneratedCommands{ deviceGeneratedCommands_ }
-      , dynamicGeneratedPipelineLayout{ dynamicGeneratedPipelineLayout_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT( PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT( VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT( *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT & operator=( PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT & operator=( VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT & setDeviceGeneratedCommands( Bool32 deviceGeneratedCommands_ ) VULKAN_HPP_NOEXCEPT
-    {
-      deviceGeneratedCommands = deviceGeneratedCommands_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT &
-      setDynamicGeneratedPipelineLayout( Bool32 dynamicGeneratedPipelineLayout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dynamicGeneratedPipelineLayout = dynamicGeneratedPipelineLayout_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, deviceGeneratedCommands, dynamicGeneratedPipelineLayout );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( deviceGeneratedCommands == rhs.deviceGeneratedCommands ) &&
-             ( dynamicGeneratedPipelineLayout == rhs.dynamicGeneratedPipelineLayout );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                          = StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-    void *        pNext                          = {};
-    Bool32        deviceGeneratedCommands        = {};
-    Bool32        dynamicGeneratedPipelineLayout = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV.html
   struct PhysicalDeviceDeviceGeneratedCommandsFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
@@ -86600,10 +61942,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsFeaturesNV( Bool32 deviceGeneratedCommands_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceGeneratedCommands{ deviceGeneratedCommands_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedCommands_ = {},
+                                                                          void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceGeneratedCommands( deviceGeneratedCommands_ )
     {
     }
 
@@ -86616,27 +61959,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDeviceGeneratedCommandsFeaturesNV & operator=( PhysicalDeviceDeviceGeneratedCommandsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDeviceGeneratedCommandsFeaturesNV & operator=( VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesNV & setDeviceGeneratedCommands( Bool32 deviceGeneratedCommands_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceGeneratedCommandsFeaturesNV &
+      setDeviceGeneratedCommands( VULKAN_HPP_NAMESPACE::Bool32 deviceGeneratedCommands_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceGeneratedCommands = deviceGeneratedCommands_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -86648,18 +61992,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceGeneratedCommands );
     }
@@ -86684,197 +62023,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
-    void *        pNext                   = {};
-    Bool32        deviceGeneratedCommands = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceGeneratedCommands = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV>
   {
     using Type = PhysicalDeviceDeviceGeneratedCommandsFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT.html
-  struct PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT
-  {
-    using NativeType = VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT( uint32_t                          maxIndirectPipelineCount_              = {},
-                                                                             uint32_t                          maxIndirectShaderObjectCount_          = {},
-                                                                             uint32_t                          maxIndirectSequenceCount_              = {},
-                                                                             uint32_t                          maxIndirectCommandsTokenCount_         = {},
-                                                                             uint32_t                          maxIndirectCommandsTokenOffset_        = {},
-                                                                             uint32_t                          maxIndirectCommandsIndirectStride_     = {},
-                                                                             IndirectCommandsInputModeFlagsEXT supportedIndirectCommandsInputModes_   = {},
-                                                                             ShaderStageFlags                  supportedIndirectCommandsShaderStages_ = {},
-                                                                             ShaderStageFlags supportedIndirectCommandsShaderStagesPipelineBinding_   = {},
-                                                                             ShaderStageFlags supportedIndirectCommandsShaderStagesShaderBinding_     = {},
-                                                                             Bool32           deviceGeneratedCommandsTransformFeedback_               = {},
-                                                                             Bool32           deviceGeneratedCommandsMultiDrawIndirectCount_          = {},
-                                                                             void *           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxIndirectPipelineCount{ maxIndirectPipelineCount_ }
-      , maxIndirectShaderObjectCount{ maxIndirectShaderObjectCount_ }
-      , maxIndirectSequenceCount{ maxIndirectSequenceCount_ }
-      , maxIndirectCommandsTokenCount{ maxIndirectCommandsTokenCount_ }
-      , maxIndirectCommandsTokenOffset{ maxIndirectCommandsTokenOffset_ }
-      , maxIndirectCommandsIndirectStride{ maxIndirectCommandsIndirectStride_ }
-      , supportedIndirectCommandsInputModes{ supportedIndirectCommandsInputModes_ }
-      , supportedIndirectCommandsShaderStages{ supportedIndirectCommandsShaderStages_ }
-      , supportedIndirectCommandsShaderStagesPipelineBinding{ supportedIndirectCommandsShaderStagesPipelineBinding_ }
-      , supportedIndirectCommandsShaderStagesShaderBinding{ supportedIndirectCommandsShaderStagesShaderBinding_ }
-      , deviceGeneratedCommandsTransformFeedback{ deviceGeneratedCommandsTransformFeedback_ }
-      , deviceGeneratedCommandsMultiDrawIndirectCount{ deviceGeneratedCommandsMultiDrawIndirectCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT( PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT( VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT( *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT &
-      operator=( PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT & operator=( VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               IndirectCommandsInputModeFlagsEXT const &,
-               ShaderStageFlags const &,
-               ShaderStageFlags const &,
-               ShaderStageFlags const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       maxIndirectPipelineCount,
-                       maxIndirectShaderObjectCount,
-                       maxIndirectSequenceCount,
-                       maxIndirectCommandsTokenCount,
-                       maxIndirectCommandsTokenOffset,
-                       maxIndirectCommandsIndirectStride,
-                       supportedIndirectCommandsInputModes,
-                       supportedIndirectCommandsShaderStages,
-                       supportedIndirectCommandsShaderStagesPipelineBinding,
-                       supportedIndirectCommandsShaderStagesShaderBinding,
-                       deviceGeneratedCommandsTransformFeedback,
-                       deviceGeneratedCommandsMultiDrawIndirectCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxIndirectPipelineCount == rhs.maxIndirectPipelineCount ) &&
-             ( maxIndirectShaderObjectCount == rhs.maxIndirectShaderObjectCount ) && ( maxIndirectSequenceCount == rhs.maxIndirectSequenceCount ) &&
-             ( maxIndirectCommandsTokenCount == rhs.maxIndirectCommandsTokenCount ) &&
-             ( maxIndirectCommandsTokenOffset == rhs.maxIndirectCommandsTokenOffset ) &&
-             ( maxIndirectCommandsIndirectStride == rhs.maxIndirectCommandsIndirectStride ) &&
-             ( supportedIndirectCommandsInputModes == rhs.supportedIndirectCommandsInputModes ) &&
-             ( supportedIndirectCommandsShaderStages == rhs.supportedIndirectCommandsShaderStages ) &&
-             ( supportedIndirectCommandsShaderStagesPipelineBinding == rhs.supportedIndirectCommandsShaderStagesPipelineBinding ) &&
-             ( supportedIndirectCommandsShaderStagesShaderBinding == rhs.supportedIndirectCommandsShaderStagesShaderBinding ) &&
-             ( deviceGeneratedCommandsTransformFeedback == rhs.deviceGeneratedCommandsTransformFeedback ) &&
-             ( deviceGeneratedCommandsMultiDrawIndirectCount == rhs.deviceGeneratedCommandsMultiDrawIndirectCount );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType                                                = StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-    void *                            pNext                                                = {};
-    uint32_t                          maxIndirectPipelineCount                             = {};
-    uint32_t                          maxIndirectShaderObjectCount                         = {};
-    uint32_t                          maxIndirectSequenceCount                             = {};
-    uint32_t                          maxIndirectCommandsTokenCount                        = {};
-    uint32_t                          maxIndirectCommandsTokenOffset                       = {};
-    uint32_t                          maxIndirectCommandsIndirectStride                    = {};
-    IndirectCommandsInputModeFlagsEXT supportedIndirectCommandsInputModes                  = {};
-    ShaderStageFlags                  supportedIndirectCommandsShaderStages                = {};
-    ShaderStageFlags                  supportedIndirectCommandsShaderStagesPipelineBinding = {};
-    ShaderStageFlags                  supportedIndirectCommandsShaderStagesShaderBinding   = {};
-    Bool32                            deviceGeneratedCommandsTransformFeedback             = {};
-    Bool32                            deviceGeneratedCommandsMultiDrawIndirectCount        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesEXT>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV.html
   struct PhysicalDeviceDeviceGeneratedCommandsPropertiesNV
   {
     using NativeType = VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
@@ -86882,7 +62041,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceGeneratedCommandsPropertiesNV( uint32_t maxGraphicsShaderGroupCount_              = {},
                                                                             uint32_t maxIndirectSequenceCount_                 = {},
                                                                             uint32_t maxIndirectCommandsTokenCount_            = {},
@@ -86893,16 +62052,16 @@ namespace VULKAN_HPP_NAMESPACE
                                                                             uint32_t minSequencesIndexBufferOffsetAlignment_   = {},
                                                                             uint32_t minIndirectCommandsBufferOffsetAlignment_ = {},
                                                                             void *   pNext_                                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxGraphicsShaderGroupCount{ maxGraphicsShaderGroupCount_ }
-      , maxIndirectSequenceCount{ maxIndirectSequenceCount_ }
-      , maxIndirectCommandsTokenCount{ maxIndirectCommandsTokenCount_ }
-      , maxIndirectCommandsStreamCount{ maxIndirectCommandsStreamCount_ }
-      , maxIndirectCommandsTokenOffset{ maxIndirectCommandsTokenOffset_ }
-      , maxIndirectCommandsStreamStride{ maxIndirectCommandsStreamStride_ }
-      , minSequencesCountBufferOffsetAlignment{ minSequencesCountBufferOffsetAlignment_ }
-      , minSequencesIndexBufferOffsetAlignment{ minSequencesIndexBufferOffsetAlignment_ }
-      , minIndirectCommandsBufferOffsetAlignment{ minIndirectCommandsBufferOffsetAlignment_ }
+      : pNext( pNext_ )
+      , maxGraphicsShaderGroupCount( maxGraphicsShaderGroupCount_ )
+      , maxIndirectSequenceCount( maxIndirectSequenceCount_ )
+      , maxIndirectCommandsTokenCount( maxIndirectCommandsTokenCount_ )
+      , maxIndirectCommandsStreamCount( maxIndirectCommandsStreamCount_ )
+      , maxIndirectCommandsTokenOffset( maxIndirectCommandsTokenOffset_ )
+      , maxIndirectCommandsStreamStride( maxIndirectCommandsStreamStride_ )
+      , minSequencesCountBufferOffsetAlignment( minSequencesCountBufferOffsetAlignment_ )
+      , minSequencesIndexBufferOffsetAlignment( minSequencesIndexBufferOffsetAlignment_ )
+      , minIndirectCommandsBufferOffsetAlignment( minIndirectCommandsBufferOffsetAlignment_ )
     {
     }
 
@@ -86916,11 +62075,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDeviceGeneratedCommandsPropertiesNV &
       operator=( PhysicalDeviceDeviceGeneratedCommandsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDeviceGeneratedCommandsPropertiesNV & operator=( VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceGeneratedCommandsPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceGeneratedCommandsPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -86934,18 +62093,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
@@ -86956,6 +62108,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -86998,35 +62151,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                    = StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
-    void *        pNext                                    = {};
-    uint32_t      maxGraphicsShaderGroupCount              = {};
-    uint32_t      maxIndirectSequenceCount                 = {};
-    uint32_t      maxIndirectCommandsTokenCount            = {};
-    uint32_t      maxIndirectCommandsStreamCount           = {};
-    uint32_t      maxIndirectCommandsTokenOffset           = {};
-    uint32_t      maxIndirectCommandsStreamStride          = {};
-    uint32_t      minSequencesCountBufferOffsetAlignment   = {};
-    uint32_t      minSequencesIndexBufferOffsetAlignment   = {};
-    uint32_t      minIndirectCommandsBufferOffsetAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                    = StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
+    void *                              pNext                                    = {};
+    uint32_t                            maxGraphicsShaderGroupCount              = {};
+    uint32_t                            maxIndirectSequenceCount                 = {};
+    uint32_t                            maxIndirectCommandsTokenCount            = {};
+    uint32_t                            maxIndirectCommandsStreamCount           = {};
+    uint32_t                            maxIndirectCommandsTokenOffset           = {};
+    uint32_t                            maxIndirectCommandsStreamStride          = {};
+    uint32_t                            minSequencesCountBufferOffsetAlignment   = {};
+    uint32_t                            minSequencesIndexBufferOffsetAlignment   = {};
+    uint32_t                            minIndirectCommandsBufferOffsetAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV>
-  {
-    using Type = PhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV>
   {
     using Type = PhysicalDeviceDeviceGeneratedCommandsPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDeviceMemoryReportFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDeviceMemoryReportFeaturesEXT.html
   struct PhysicalDeviceDeviceMemoryReportFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDeviceMemoryReportFeaturesEXT;
@@ -87034,10 +62177,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceMemoryReportFeaturesEXT( Bool32 deviceMemoryReport_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceMemoryReport{ deviceMemoryReport_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDeviceMemoryReportFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 deviceMemoryReport_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceMemoryReport( deviceMemoryReport_ )
     {
     }
 
@@ -87049,27 +62193,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDeviceMemoryReportFeaturesEXT & operator=( PhysicalDeviceDeviceMemoryReportFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDeviceMemoryReportFeaturesEXT & operator=( VkPhysicalDeviceDeviceMemoryReportFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDeviceMemoryReportFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDeviceMemoryReportFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceMemoryReportFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceMemoryReportFeaturesEXT & setDeviceMemoryReport( Bool32 deviceMemoryReport_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDeviceMemoryReportFeaturesEXT &
+      setDeviceMemoryReport( VULKAN_HPP_NAMESPACE::Bool32 deviceMemoryReport_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceMemoryReport = deviceMemoryReport_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDeviceMemoryReportFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -87081,18 +62226,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDeviceMemoryReportFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDeviceMemoryReportFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDeviceMemoryReportFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceMemoryReport );
     }
@@ -87117,27 +62257,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT;
-    void *        pNext              = {};
-    Bool32        deviceMemoryReport = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceMemoryReport = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDeviceMemoryReportFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT>
   {
     using Type = PhysicalDeviceDeviceMemoryReportFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDiagnosticsConfigFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDiagnosticsConfigFeaturesNV.html
   struct PhysicalDeviceDiagnosticsConfigFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDiagnosticsConfigFeaturesNV;
@@ -87145,10 +62275,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDiagnosticsConfigFeaturesNV( Bool32 diagnosticsConfig_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , diagnosticsConfig{ diagnosticsConfig_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDiagnosticsConfigFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 diagnosticsConfig_ = {},
+                                                                    void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , diagnosticsConfig( diagnosticsConfig_ )
     {
     }
 
@@ -87160,27 +62291,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDiagnosticsConfigFeaturesNV & operator=( PhysicalDeviceDiagnosticsConfigFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDiagnosticsConfigFeaturesNV & operator=( VkPhysicalDeviceDiagnosticsConfigFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDiagnosticsConfigFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDiagnosticsConfigFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDiagnosticsConfigFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDiagnosticsConfigFeaturesNV & setDiagnosticsConfig( Bool32 diagnosticsConfig_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDiagnosticsConfigFeaturesNV &
+      setDiagnosticsConfig( VULKAN_HPP_NAMESPACE::Bool32 diagnosticsConfig_ ) VULKAN_HPP_NOEXCEPT
     {
       diagnosticsConfig = diagnosticsConfig_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDiagnosticsConfigFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -87192,18 +62324,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDiagnosticsConfigFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDiagnosticsConfigFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDiagnosticsConfigFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDiagnosticsConfigFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDiagnosticsConfigFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, diagnosticsConfig );
     }
@@ -87228,27 +62355,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV;
-    void *        pNext             = {};
-    Bool32        diagnosticsConfig = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        diagnosticsConfig = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDiagnosticsConfigFeaturesNV>
-  {
-    using Type = PhysicalDeviceDiagnosticsConfigFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV>
   {
     using Type = PhysicalDeviceDiagnosticsConfigFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDiscardRectanglePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDiscardRectanglePropertiesEXT.html
   struct PhysicalDeviceDiscardRectanglePropertiesEXT
   {
     using NativeType = VkPhysicalDeviceDiscardRectanglePropertiesEXT;
@@ -87256,10 +62373,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceDiscardRectanglePropertiesEXT( uint32_t maxDiscardRectangles_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxDiscardRectangles{ maxDiscardRectangles_ }
+      : pNext( pNext_ )
+      , maxDiscardRectangles( maxDiscardRectangles_ )
     {
     }
 
@@ -87271,11 +62388,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDiscardRectanglePropertiesEXT & operator=( PhysicalDeviceDiscardRectanglePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDiscardRectanglePropertiesEXT & operator=( VkPhysicalDeviceDiscardRectanglePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDiscardRectanglePropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDiscardRectanglePropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -87289,18 +62406,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDiscardRectanglePropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDiscardRectanglePropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDiscardRectanglePropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDiscardRectanglePropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDiscardRectanglePropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxDiscardRectangles );
     }
@@ -87325,19 +62437,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT;
-    void *        pNext                = {};
-    uint32_t      maxDiscardRectangles = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT;
+    void *                              pNext                = {};
+    uint32_t                            maxDiscardRectangles = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDiscardRectanglePropertiesEXT>
-  {
-    using Type = PhysicalDeviceDiscardRectanglePropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT>
   {
@@ -87345,8 +62449,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceDisplacementMicromapFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDisplacementMicromapFeaturesNV.html
   struct PhysicalDeviceDisplacementMicromapFeaturesNV
   {
     using NativeType = VkPhysicalDeviceDisplacementMicromapFeaturesNV;
@@ -87354,10 +62456,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDisplacementMicromapFeaturesNV( Bool32 displacementMicromap_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , displacementMicromap{ displacementMicromap_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDisplacementMicromapFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 displacementMicromap_ = {},
+                                                                       void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , displacementMicromap( displacementMicromap_ )
     {
     }
 
@@ -87369,27 +62472,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDisplacementMicromapFeaturesNV & operator=( PhysicalDeviceDisplacementMicromapFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDisplacementMicromapFeaturesNV & operator=( VkPhysicalDeviceDisplacementMicromapFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDisplacementMicromapFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDisplacementMicromapFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDisplacementMicromapFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDisplacementMicromapFeaturesNV & setDisplacementMicromap( Bool32 displacementMicromap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDisplacementMicromapFeaturesNV &
+      setDisplacementMicromap( VULKAN_HPP_NAMESPACE::Bool32 displacementMicromap_ ) VULKAN_HPP_NOEXCEPT
     {
       displacementMicromap = displacementMicromap_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDisplacementMicromapFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -87401,18 +62505,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDisplacementMicromapFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDisplacementMicromapFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDisplacementMicromapFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDisplacementMicromapFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDisplacementMicromapFeaturesNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, displacementMicromap );
     }
@@ -87437,19 +62536,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV;
-    void *        pNext                = {};
-    Bool32        displacementMicromap = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        displacementMicromap = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDisplacementMicromapFeaturesNV>
-  {
-    using Type = PhysicalDeviceDisplacementMicromapFeaturesNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV>
   {
@@ -87458,8 +62549,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceDisplacementMicromapPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDisplacementMicromapPropertiesNV.html
   struct PhysicalDeviceDisplacementMicromapPropertiesNV
   {
     using NativeType = VkPhysicalDeviceDisplacementMicromapPropertiesNV;
@@ -87467,11 +62556,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceDisplacementMicromapPropertiesNV( uint32_t maxDisplacementMicromapSubdivisionLevel_ = {},
                                                                          void *   pNext_                                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxDisplacementMicromapSubdivisionLevel{ maxDisplacementMicromapSubdivisionLevel_ }
+      : pNext( pNext_ )
+      , maxDisplacementMicromapSubdivisionLevel( maxDisplacementMicromapSubdivisionLevel_ )
     {
     }
 
@@ -87484,11 +62573,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDisplacementMicromapPropertiesNV & operator=( PhysicalDeviceDisplacementMicromapPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDisplacementMicromapPropertiesNV & operator=( VkPhysicalDeviceDisplacementMicromapPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDisplacementMicromapPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDisplacementMicromapPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -87502,18 +62591,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDisplacementMicromapPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceDisplacementMicromapPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDisplacementMicromapPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceDisplacementMicromapPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDisplacementMicromapPropertiesNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxDisplacementMicromapSubdivisionLevel );
     }
@@ -87538,19 +62622,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                                   = StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV;
-    void *        pNext                                   = {};
-    uint32_t      maxDisplacementMicromapSubdivisionLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                   = StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV;
+    void *                              pNext                                   = {};
+    uint32_t                            maxDisplacementMicromapSubdivisionLevel = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDisplacementMicromapPropertiesNV>
-  {
-    using Type = PhysicalDeviceDisplacementMicromapPropertiesNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV>
   {
@@ -87558,8 +62634,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkPhysicalDeviceDriverProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDriverProperties.html
   struct PhysicalDeviceDriverProperties
   {
     using NativeType = VkPhysicalDeviceDriverProperties;
@@ -87567,17 +62641,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDriverProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDriverProperties( DriverId                                          driverID_           = DriverId::eAmdProprietary,
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDriverProperties( VULKAN_HPP_NAMESPACE::DriverId driverID_ = VULKAN_HPP_NAMESPACE::DriverId::eAmdProprietary,
                                                             std::array<char, VK_MAX_DRIVER_NAME_SIZE> const & driverName_         = {},
                                                             std::array<char, VK_MAX_DRIVER_INFO_SIZE> const & driverInfo_         = {},
-                                                            ConformanceVersion                                conformanceVersion_ = {},
+                                                            VULKAN_HPP_NAMESPACE::ConformanceVersion          conformanceVersion_ = {},
                                                             void *                                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , driverID{ driverID_ }
-      , driverName{ driverName_ }
-      , driverInfo{ driverInfo_ }
-      , conformanceVersion{ conformanceVersion_ }
+      : pNext( pNext_ )
+      , driverID( driverID_ )
+      , driverName( driverName_ )
+      , driverInfo( driverInfo_ )
+      , conformanceVersion( conformanceVersion_ )
     {
     }
 
@@ -87588,12 +62662,36 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceDriverProperties( VULKAN_HPP_NAMESPACE::DriverId           driverID_,
+                                    std::string const &                      driverName_,
+                                    std::string const &                      driverInfo_         = {},
+                                    VULKAN_HPP_NAMESPACE::ConformanceVersion conformanceVersion_ = {},
+                                    void *                                   pNext_              = nullptr )
+      : pNext( pNext_ ), driverID( driverID_ ), conformanceVersion( conformanceVersion_ )
+    {
+      VULKAN_HPP_ASSERT( driverName_.size() < VK_MAX_DRIVER_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( driverName, VK_MAX_DRIVER_NAME_SIZE, driverName_.data(), driverName_.size() );
+#    else
+      strncpy( driverName, driverName_.data(), std::min<size_t>( VK_MAX_DRIVER_NAME_SIZE, driverName_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( driverInfo_.size() < VK_MAX_DRIVER_INFO_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( driverInfo, VK_MAX_DRIVER_INFO_SIZE, driverInfo_.data(), driverInfo_.size() );
+#    else
+      strncpy( driverInfo, driverInfo_.data(), std::min<size_t>( VK_MAX_DRIVER_INFO_SIZE, driverInfo_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PhysicalDeviceDriverProperties & operator=( PhysicalDeviceDriverProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDriverProperties & operator=( VkPhysicalDeviceDriverProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDriverProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDriverProperties const *>( &rhs );
       return *this;
     }
 
@@ -87607,23 +62705,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDriverProperties *>( this );
     }
 
-    operator VkPhysicalDeviceDriverProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDriverProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceDriverProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDriverProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               DriverId const &,
-               ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> const &,
-               ConformanceVersion const &>
+               VULKAN_HPP_NAMESPACE::DriverId const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ConformanceVersion const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, driverID, driverName, driverInfo, conformanceVersion );
@@ -87662,22 +62754,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType              = StructureType::ePhysicalDeviceDriverProperties;
-    void *                                        pNext              = {};
-    DriverId                                      driverID           = DriverId::eAmdProprietary;
-    ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> driverName         = {};
-    ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> driverInfo         = {};
-    ConformanceVersion                            conformanceVersion = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType              = StructureType::ePhysicalDeviceDriverProperties;
+    void *                                                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::DriverId                                      driverID           = VULKAN_HPP_NAMESPACE::DriverId::eAmdProprietary;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> driverName         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> driverInfo         = {};
+    VULKAN_HPP_NAMESPACE::ConformanceVersion                            conformanceVersion = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDriverProperties>
-  {
-    using Type = PhysicalDeviceDriverProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDriverProperties>
   {
@@ -87686,8 +62770,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceDriverPropertiesKHR = PhysicalDeviceDriverProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceDrmPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDrmPropertiesEXT.html
   struct PhysicalDeviceDrmPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceDrmPropertiesEXT;
@@ -87695,21 +62777,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDrmPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDrmPropertiesEXT( Bool32  hasPrimary_   = {},
-                                                         Bool32  hasRender_    = {},
-                                                         int64_t primaryMajor_ = {},
-                                                         int64_t primaryMinor_ = {},
-                                                         int64_t renderMajor_  = {},
-                                                         int64_t renderMinor_  = {},
-                                                         void *  pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hasPrimary{ hasPrimary_ }
-      , hasRender{ hasRender_ }
-      , primaryMajor{ primaryMajor_ }
-      , primaryMinor{ primaryMinor_ }
-      , renderMajor{ renderMajor_ }
-      , renderMinor{ renderMinor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDrmPropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 hasPrimary_   = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 hasRender_    = {},
+                                                         int64_t                      primaryMajor_ = {},
+                                                         int64_t                      primaryMinor_ = {},
+                                                         int64_t                      renderMajor_  = {},
+                                                         int64_t                      renderMinor_  = {},
+                                                         void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hasPrimary( hasPrimary_ )
+      , hasRender( hasRender_ )
+      , primaryMajor( primaryMajor_ )
+      , primaryMinor( primaryMinor_ )
+      , renderMajor( renderMajor_ )
+      , renderMinor( renderMinor_ )
     {
     }
 
@@ -87721,11 +62803,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDrmPropertiesEXT & operator=( PhysicalDeviceDrmPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDrmPropertiesEXT & operator=( VkPhysicalDeviceDrmPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDrmPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDrmPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -87739,18 +62821,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDrmPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDrmPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDrmPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDrmPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDrmPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, int64_t const &, int64_t const &, int64_t const &, int64_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               int64_t const &,
+               int64_t const &,
+               int64_t const &,
+               int64_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hasPrimary, hasRender, primaryMajor, primaryMinor, renderMajor, renderMinor );
@@ -87778,32 +62861,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceDrmPropertiesEXT;
-    void *        pNext        = {};
-    Bool32        hasPrimary   = {};
-    Bool32        hasRender    = {};
-    int64_t       primaryMajor = {};
-    int64_t       primaryMinor = {};
-    int64_t       renderMajor  = {};
-    int64_t       renderMinor  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceDrmPropertiesEXT;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasPrimary   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasRender    = {};
+    int64_t                             primaryMajor = {};
+    int64_t                             primaryMinor = {};
+    int64_t                             renderMajor  = {};
+    int64_t                             renderMinor  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDrmPropertiesEXT>
-  {
-    using Type = PhysicalDeviceDrmPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDrmPropertiesEXT>
   {
     using Type = PhysicalDeviceDrmPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceDynamicRenderingFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDynamicRenderingFeatures.html
   struct PhysicalDeviceDynamicRenderingFeatures
   {
     using NativeType = VkPhysicalDeviceDynamicRenderingFeatures;
@@ -87811,10 +62884,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDynamicRenderingFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingFeatures( Bool32 dynamicRendering_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dynamicRendering{ dynamicRendering_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingFeatures( VULKAN_HPP_NAMESPACE::Bool32 dynamicRendering_ = {},
+                                                                 void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dynamicRendering( dynamicRendering_ )
     {
     }
 
@@ -87826,27 +62900,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceDynamicRenderingFeatures & operator=( PhysicalDeviceDynamicRenderingFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDynamicRenderingFeatures & operator=( VkPhysicalDeviceDynamicRenderingFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDynamicRenderingFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingFeatures & setDynamicRendering( Bool32 dynamicRendering_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingFeatures & setDynamicRendering( VULKAN_HPP_NAMESPACE::Bool32 dynamicRendering_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicRendering = dynamicRendering_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDynamicRenderingFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -87858,18 +62932,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDynamicRenderingFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceDynamicRenderingFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDynamicRenderingFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceDynamicRenderingFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDynamicRenderingFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dynamicRendering );
     }
@@ -87894,19 +62963,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceDynamicRenderingFeatures;
-    void *        pNext            = {};
-    Bool32        dynamicRendering = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceDynamicRenderingFeatures;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicRendering = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDynamicRenderingFeatures>
-  {
-    using Type = PhysicalDeviceDynamicRenderingFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDynamicRenderingFeatures>
   {
@@ -87915,85 +62976,80 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceDynamicRenderingFeaturesKHR = PhysicalDeviceDynamicRenderingFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceDynamicRenderingLocalReadFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDynamicRenderingLocalReadFeatures.html
-  struct PhysicalDeviceDynamicRenderingLocalReadFeatures
+  struct PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceDynamicRenderingLocalReadFeatures;
+    using NativeType = VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingLocalReadFeatures( Bool32 dynamicRenderingLocalRead_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dynamicRenderingLocalRead{ dynamicRenderingLocalRead_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 dynamicRenderingLocalRead_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dynamicRenderingLocalRead( dynamicRenderingLocalRead_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceDynamicRenderingLocalReadFeatures( PhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR( PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceDynamicRenderingLocalReadFeatures( VkPhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceDynamicRenderingLocalReadFeatures( *reinterpret_cast<PhysicalDeviceDynamicRenderingLocalReadFeatures const *>( &rhs ) )
+    PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR( VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR( *reinterpret_cast<PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceDynamicRenderingLocalReadFeatures & operator=( PhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR &
+      operator=( PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceDynamicRenderingLocalReadFeatures & operator=( VkPhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR & operator=( VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDynamicRenderingLocalReadFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingLocalReadFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingLocalReadFeatures &
-      setDynamicRenderingLocalRead( Bool32 dynamicRenderingLocalRead_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR &
+      setDynamicRenderingLocalRead( VULKAN_HPP_NAMESPACE::Bool32 dynamicRenderingLocalRead_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicRenderingLocalRead = dynamicRenderingLocalRead_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceDynamicRenderingLocalReadFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceDynamicRenderingLocalReadFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceDynamicRenderingLocalReadFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceDynamicRenderingLocalReadFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceDynamicRenderingLocalReadFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDynamicRenderingLocalReadFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceDynamicRenderingLocalReadFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDynamicRenderingLocalReadFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dynamicRenderingLocalRead );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceDynamicRenderingLocalReadFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -88002,36 +63058,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceDynamicRenderingLocalReadFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeatures;
-    void *        pNext                     = {};
-    Bool32        dynamicRenderingLocalRead = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicRenderingLocalRead = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDynamicRenderingLocalReadFeatures>
-  {
-    using Type = PhysicalDeviceDynamicRenderingLocalReadFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR>
   {
-    using Type = PhysicalDeviceDynamicRenderingLocalReadFeatures;
+    using Type = PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR;
   };
 
-  using PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR = PhysicalDeviceDynamicRenderingLocalReadFeatures;
-
-  // wrapper struct for struct VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT.html
   struct PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
@@ -88039,11 +63083,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT( Bool32 dynamicRenderingUnusedAttachments_ = {},
-                                                                                     void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dynamicRenderingUnusedAttachments{ dynamicRenderingUnusedAttachments_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 dynamicRenderingUnusedAttachments_ = {},
+                                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dynamicRenderingUnusedAttachments( dynamicRenderingUnusedAttachments_ )
     {
     }
 
@@ -88058,16 +63102,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT &
       operator=( PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT &
       operator=( VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -88075,12 +63119,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT &
-      setDynamicRenderingUnusedAttachments( Bool32 dynamicRenderingUnusedAttachments_ ) VULKAN_HPP_NOEXCEPT
+      setDynamicRenderingUnusedAttachments( VULKAN_HPP_NAMESPACE::Bool32 dynamicRenderingUnusedAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicRenderingUnusedAttachments = dynamicRenderingUnusedAttachments_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -88092,18 +63136,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dynamicRenderingUnusedAttachments );
     }
@@ -88128,27 +63167,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                             = StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
-    void *        pNext                             = {};
-    Bool32        dynamicRenderingUnusedAttachments = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                             = StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
+    void *                              pNext                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicRenderingUnusedAttachments = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT>
-  {
-    using Type = PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT>
   {
     using Type = PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExclusiveScissorFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExclusiveScissorFeaturesNV.html
   struct PhysicalDeviceExclusiveScissorFeaturesNV
   {
     using NativeType = VkPhysicalDeviceExclusiveScissorFeaturesNV;
@@ -88156,10 +63185,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExclusiveScissorFeaturesNV( Bool32 exclusiveScissor_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , exclusiveScissor{ exclusiveScissor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExclusiveScissorFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 exclusiveScissor_ = {},
+                                                                   void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , exclusiveScissor( exclusiveScissor_ )
     {
     }
 
@@ -88171,27 +63201,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExclusiveScissorFeaturesNV & operator=( PhysicalDeviceExclusiveScissorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExclusiveScissorFeaturesNV & operator=( VkPhysicalDeviceExclusiveScissorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExclusiveScissorFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExclusiveScissorFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExclusiveScissorFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExclusiveScissorFeaturesNV & setExclusiveScissor( Bool32 exclusiveScissor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExclusiveScissorFeaturesNV & setExclusiveScissor( VULKAN_HPP_NAMESPACE::Bool32 exclusiveScissor_ ) VULKAN_HPP_NOEXCEPT
     {
       exclusiveScissor = exclusiveScissor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExclusiveScissorFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -88203,18 +63233,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExclusiveScissorFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceExclusiveScissorFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExclusiveScissorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExclusiveScissorFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExclusiveScissorFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, exclusiveScissor );
     }
@@ -88239,27 +63264,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV;
-    void *        pNext            = {};
-    Bool32        exclusiveScissor = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        exclusiveScissor = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExclusiveScissorFeaturesNV>
-  {
-    using Type = PhysicalDeviceExclusiveScissorFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV>
   {
     using Type = PhysicalDeviceExclusiveScissorFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedDynamicState2FeaturesEXT.html
   struct PhysicalDeviceExtendedDynamicState2FeaturesEXT
   {
     using NativeType = VkPhysicalDeviceExtendedDynamicState2FeaturesEXT;
@@ -88267,15 +63282,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicState2FeaturesEXT( Bool32 extendedDynamicState2_                   = {},
-                                                                         Bool32 extendedDynamicState2LogicOp_            = {},
-                                                                         Bool32 extendedDynamicState2PatchControlPoints_ = {},
-                                                                         void * pNext_                                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , extendedDynamicState2{ extendedDynamicState2_ }
-      , extendedDynamicState2LogicOp{ extendedDynamicState2LogicOp_ }
-      , extendedDynamicState2PatchControlPoints{ extendedDynamicState2PatchControlPoints_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicState2FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2_                   = {},
+                                                                         VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2LogicOp_            = {},
+                                                                         VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2PatchControlPoints_ = {},
+                                                                         void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , extendedDynamicState2( extendedDynamicState2_ )
+      , extendedDynamicState2LogicOp( extendedDynamicState2LogicOp_ )
+      , extendedDynamicState2PatchControlPoints( extendedDynamicState2PatchControlPoints_ )
     {
     }
 
@@ -88288,41 +63303,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExtendedDynamicState2FeaturesEXT & operator=( PhysicalDeviceExtendedDynamicState2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedDynamicState2FeaturesEXT & operator=( VkPhysicalDeviceExtendedDynamicState2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedDynamicState2FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState2FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState2FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState2FeaturesEXT & setExtendedDynamicState2( Bool32 extendedDynamicState2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState2FeaturesEXT &
+      setExtendedDynamicState2( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState2 = extendedDynamicState2_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState2FeaturesEXT &
-      setExtendedDynamicState2LogicOp( Bool32 extendedDynamicState2LogicOp_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState2LogicOp( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2LogicOp_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState2LogicOp = extendedDynamicState2LogicOp_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState2FeaturesEXT &
-      setExtendedDynamicState2PatchControlPoints( Bool32 extendedDynamicState2PatchControlPoints_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState2PatchControlPoints( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState2PatchControlPoints_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState2PatchControlPoints = extendedDynamicState2PatchControlPoints_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExtendedDynamicState2FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -88334,18 +63350,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedDynamicState2FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedDynamicState2FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedDynamicState2FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedDynamicState2FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedDynamicState2FeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, extendedDynamicState2, extendedDynamicState2LogicOp, extendedDynamicState2PatchControlPoints );
     }
@@ -88372,29 +63387,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                   = StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT;
-    void *        pNext                                   = {};
-    Bool32        extendedDynamicState2                   = {};
-    Bool32        extendedDynamicState2LogicOp            = {};
-    Bool32        extendedDynamicState2PatchControlPoints = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                   = StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT;
+    void *                              pNext                                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState2                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState2LogicOp            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState2PatchControlPoints = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedDynamicState2FeaturesEXT>
-  {
-    using Type = PhysicalDeviceExtendedDynamicState2FeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT>
   {
     using Type = PhysicalDeviceExtendedDynamicState2FeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedDynamicState3FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedDynamicState3FeaturesEXT.html
   struct PhysicalDeviceExtendedDynamicState3FeaturesEXT
   {
     using NativeType = VkPhysicalDeviceExtendedDynamicState3FeaturesEXT;
@@ -88402,71 +63407,72 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicState3FeaturesEXT( Bool32 extendedDynamicState3TessellationDomainOrigin_         = {},
-                                                                         Bool32 extendedDynamicState3DepthClampEnable_                 = {},
-                                                                         Bool32 extendedDynamicState3PolygonMode_                      = {},
-                                                                         Bool32 extendedDynamicState3RasterizationSamples_             = {},
-                                                                         Bool32 extendedDynamicState3SampleMask_                       = {},
-                                                                         Bool32 extendedDynamicState3AlphaToCoverageEnable_            = {},
-                                                                         Bool32 extendedDynamicState3AlphaToOneEnable_                 = {},
-                                                                         Bool32 extendedDynamicState3LogicOpEnable_                    = {},
-                                                                         Bool32 extendedDynamicState3ColorBlendEnable_                 = {},
-                                                                         Bool32 extendedDynamicState3ColorBlendEquation_               = {},
-                                                                         Bool32 extendedDynamicState3ColorWriteMask_                   = {},
-                                                                         Bool32 extendedDynamicState3RasterizationStream_              = {},
-                                                                         Bool32 extendedDynamicState3ConservativeRasterizationMode_    = {},
-                                                                         Bool32 extendedDynamicState3ExtraPrimitiveOverestimationSize_ = {},
-                                                                         Bool32 extendedDynamicState3DepthClipEnable_                  = {},
-                                                                         Bool32 extendedDynamicState3SampleLocationsEnable_            = {},
-                                                                         Bool32 extendedDynamicState3ColorBlendAdvanced_               = {},
-                                                                         Bool32 extendedDynamicState3ProvokingVertexMode_              = {},
-                                                                         Bool32 extendedDynamicState3LineRasterizationMode_            = {},
-                                                                         Bool32 extendedDynamicState3LineStippleEnable_                = {},
-                                                                         Bool32 extendedDynamicState3DepthClipNegativeOneToOne_        = {},
-                                                                         Bool32 extendedDynamicState3ViewportWScalingEnable_           = {},
-                                                                         Bool32 extendedDynamicState3ViewportSwizzle_                  = {},
-                                                                         Bool32 extendedDynamicState3CoverageToColorEnable_            = {},
-                                                                         Bool32 extendedDynamicState3CoverageToColorLocation_          = {},
-                                                                         Bool32 extendedDynamicState3CoverageModulationMode_           = {},
-                                                                         Bool32 extendedDynamicState3CoverageModulationTableEnable_    = {},
-                                                                         Bool32 extendedDynamicState3CoverageModulationTable_          = {},
-                                                                         Bool32 extendedDynamicState3CoverageReductionMode_            = {},
-                                                                         Bool32 extendedDynamicState3RepresentativeFragmentTestEnable_ = {},
-                                                                         Bool32 extendedDynamicState3ShadingRateImageEnable_           = {},
-                                                                         void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , extendedDynamicState3TessellationDomainOrigin{ extendedDynamicState3TessellationDomainOrigin_ }
-      , extendedDynamicState3DepthClampEnable{ extendedDynamicState3DepthClampEnable_ }
-      , extendedDynamicState3PolygonMode{ extendedDynamicState3PolygonMode_ }
-      , extendedDynamicState3RasterizationSamples{ extendedDynamicState3RasterizationSamples_ }
-      , extendedDynamicState3SampleMask{ extendedDynamicState3SampleMask_ }
-      , extendedDynamicState3AlphaToCoverageEnable{ extendedDynamicState3AlphaToCoverageEnable_ }
-      , extendedDynamicState3AlphaToOneEnable{ extendedDynamicState3AlphaToOneEnable_ }
-      , extendedDynamicState3LogicOpEnable{ extendedDynamicState3LogicOpEnable_ }
-      , extendedDynamicState3ColorBlendEnable{ extendedDynamicState3ColorBlendEnable_ }
-      , extendedDynamicState3ColorBlendEquation{ extendedDynamicState3ColorBlendEquation_ }
-      , extendedDynamicState3ColorWriteMask{ extendedDynamicState3ColorWriteMask_ }
-      , extendedDynamicState3RasterizationStream{ extendedDynamicState3RasterizationStream_ }
-      , extendedDynamicState3ConservativeRasterizationMode{ extendedDynamicState3ConservativeRasterizationMode_ }
-      , extendedDynamicState3ExtraPrimitiveOverestimationSize{ extendedDynamicState3ExtraPrimitiveOverestimationSize_ }
-      , extendedDynamicState3DepthClipEnable{ extendedDynamicState3DepthClipEnable_ }
-      , extendedDynamicState3SampleLocationsEnable{ extendedDynamicState3SampleLocationsEnable_ }
-      , extendedDynamicState3ColorBlendAdvanced{ extendedDynamicState3ColorBlendAdvanced_ }
-      , extendedDynamicState3ProvokingVertexMode{ extendedDynamicState3ProvokingVertexMode_ }
-      , extendedDynamicState3LineRasterizationMode{ extendedDynamicState3LineRasterizationMode_ }
-      , extendedDynamicState3LineStippleEnable{ extendedDynamicState3LineStippleEnable_ }
-      , extendedDynamicState3DepthClipNegativeOneToOne{ extendedDynamicState3DepthClipNegativeOneToOne_ }
-      , extendedDynamicState3ViewportWScalingEnable{ extendedDynamicState3ViewportWScalingEnable_ }
-      , extendedDynamicState3ViewportSwizzle{ extendedDynamicState3ViewportSwizzle_ }
-      , extendedDynamicState3CoverageToColorEnable{ extendedDynamicState3CoverageToColorEnable_ }
-      , extendedDynamicState3CoverageToColorLocation{ extendedDynamicState3CoverageToColorLocation_ }
-      , extendedDynamicState3CoverageModulationMode{ extendedDynamicState3CoverageModulationMode_ }
-      , extendedDynamicState3CoverageModulationTableEnable{ extendedDynamicState3CoverageModulationTableEnable_ }
-      , extendedDynamicState3CoverageModulationTable{ extendedDynamicState3CoverageModulationTable_ }
-      , extendedDynamicState3CoverageReductionMode{ extendedDynamicState3CoverageReductionMode_ }
-      , extendedDynamicState3RepresentativeFragmentTestEnable{ extendedDynamicState3RepresentativeFragmentTestEnable_ }
-      , extendedDynamicState3ShadingRateImageEnable{ extendedDynamicState3ShadingRateImageEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceExtendedDynamicState3FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3TessellationDomainOrigin_         = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClampEnable_                 = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3PolygonMode_                      = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RasterizationSamples_             = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3SampleMask_                       = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3AlphaToCoverageEnable_            = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3AlphaToOneEnable_                 = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LogicOpEnable_                    = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendEnable_                 = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendEquation_               = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorWriteMask_                   = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RasterizationStream_              = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ConservativeRasterizationMode_    = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ExtraPrimitiveOverestimationSize_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClipEnable_                  = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3SampleLocationsEnable_            = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendAdvanced_               = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ProvokingVertexMode_              = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LineRasterizationMode_            = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LineStippleEnable_                = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClipNegativeOneToOne_        = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ViewportWScalingEnable_           = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ViewportSwizzle_                  = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageToColorEnable_            = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageToColorLocation_          = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationMode_           = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationTableEnable_    = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationTable_          = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageReductionMode_            = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RepresentativeFragmentTestEnable_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ShadingRateImageEnable_           = {},
+                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , extendedDynamicState3TessellationDomainOrigin( extendedDynamicState3TessellationDomainOrigin_ )
+      , extendedDynamicState3DepthClampEnable( extendedDynamicState3DepthClampEnable_ )
+      , extendedDynamicState3PolygonMode( extendedDynamicState3PolygonMode_ )
+      , extendedDynamicState3RasterizationSamples( extendedDynamicState3RasterizationSamples_ )
+      , extendedDynamicState3SampleMask( extendedDynamicState3SampleMask_ )
+      , extendedDynamicState3AlphaToCoverageEnable( extendedDynamicState3AlphaToCoverageEnable_ )
+      , extendedDynamicState3AlphaToOneEnable( extendedDynamicState3AlphaToOneEnable_ )
+      , extendedDynamicState3LogicOpEnable( extendedDynamicState3LogicOpEnable_ )
+      , extendedDynamicState3ColorBlendEnable( extendedDynamicState3ColorBlendEnable_ )
+      , extendedDynamicState3ColorBlendEquation( extendedDynamicState3ColorBlendEquation_ )
+      , extendedDynamicState3ColorWriteMask( extendedDynamicState3ColorWriteMask_ )
+      , extendedDynamicState3RasterizationStream( extendedDynamicState3RasterizationStream_ )
+      , extendedDynamicState3ConservativeRasterizationMode( extendedDynamicState3ConservativeRasterizationMode_ )
+      , extendedDynamicState3ExtraPrimitiveOverestimationSize( extendedDynamicState3ExtraPrimitiveOverestimationSize_ )
+      , extendedDynamicState3DepthClipEnable( extendedDynamicState3DepthClipEnable_ )
+      , extendedDynamicState3SampleLocationsEnable( extendedDynamicState3SampleLocationsEnable_ )
+      , extendedDynamicState3ColorBlendAdvanced( extendedDynamicState3ColorBlendAdvanced_ )
+      , extendedDynamicState3ProvokingVertexMode( extendedDynamicState3ProvokingVertexMode_ )
+      , extendedDynamicState3LineRasterizationMode( extendedDynamicState3LineRasterizationMode_ )
+      , extendedDynamicState3LineStippleEnable( extendedDynamicState3LineStippleEnable_ )
+      , extendedDynamicState3DepthClipNegativeOneToOne( extendedDynamicState3DepthClipNegativeOneToOne_ )
+      , extendedDynamicState3ViewportWScalingEnable( extendedDynamicState3ViewportWScalingEnable_ )
+      , extendedDynamicState3ViewportSwizzle( extendedDynamicState3ViewportSwizzle_ )
+      , extendedDynamicState3CoverageToColorEnable( extendedDynamicState3CoverageToColorEnable_ )
+      , extendedDynamicState3CoverageToColorLocation( extendedDynamicState3CoverageToColorLocation_ )
+      , extendedDynamicState3CoverageModulationMode( extendedDynamicState3CoverageModulationMode_ )
+      , extendedDynamicState3CoverageModulationTableEnable( extendedDynamicState3CoverageModulationTableEnable_ )
+      , extendedDynamicState3CoverageModulationTable( extendedDynamicState3CoverageModulationTable_ )
+      , extendedDynamicState3CoverageReductionMode( extendedDynamicState3CoverageReductionMode_ )
+      , extendedDynamicState3RepresentativeFragmentTestEnable( extendedDynamicState3RepresentativeFragmentTestEnable_ )
+      , extendedDynamicState3ShadingRateImageEnable( extendedDynamicState3ShadingRateImageEnable_ )
     {
     }
 
@@ -88479,15 +63485,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExtendedDynamicState3FeaturesEXT & operator=( PhysicalDeviceExtendedDynamicState3FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedDynamicState3FeaturesEXT & operator=( VkPhysicalDeviceExtendedDynamicState3FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedDynamicState3FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState3FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -88495,222 +63501,222 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3TessellationDomainOrigin( Bool32 extendedDynamicState3TessellationDomainOrigin_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3TessellationDomainOrigin( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3TessellationDomainOrigin_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3TessellationDomainOrigin = extendedDynamicState3TessellationDomainOrigin_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3DepthClampEnable( Bool32 extendedDynamicState3DepthClampEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3DepthClampEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClampEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3DepthClampEnable = extendedDynamicState3DepthClampEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3PolygonMode( Bool32 extendedDynamicState3PolygonMode_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3PolygonMode( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3PolygonMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3PolygonMode = extendedDynamicState3PolygonMode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3RasterizationSamples( Bool32 extendedDynamicState3RasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3RasterizationSamples( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RasterizationSamples_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3RasterizationSamples = extendedDynamicState3RasterizationSamples_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3SampleMask( Bool32 extendedDynamicState3SampleMask_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3SampleMask( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3SampleMask_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3SampleMask = extendedDynamicState3SampleMask_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3AlphaToCoverageEnable( Bool32 extendedDynamicState3AlphaToCoverageEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3AlphaToCoverageEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3AlphaToCoverageEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3AlphaToCoverageEnable = extendedDynamicState3AlphaToCoverageEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3AlphaToOneEnable( Bool32 extendedDynamicState3AlphaToOneEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3AlphaToOneEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3AlphaToOneEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3AlphaToOneEnable = extendedDynamicState3AlphaToOneEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3LogicOpEnable( Bool32 extendedDynamicState3LogicOpEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3LogicOpEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LogicOpEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3LogicOpEnable = extendedDynamicState3LogicOpEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ColorBlendEnable( Bool32 extendedDynamicState3ColorBlendEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ColorBlendEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ColorBlendEnable = extendedDynamicState3ColorBlendEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ColorBlendEquation( Bool32 extendedDynamicState3ColorBlendEquation_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ColorBlendEquation( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendEquation_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ColorBlendEquation = extendedDynamicState3ColorBlendEquation_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ColorWriteMask( Bool32 extendedDynamicState3ColorWriteMask_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ColorWriteMask( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorWriteMask_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ColorWriteMask = extendedDynamicState3ColorWriteMask_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3RasterizationStream( Bool32 extendedDynamicState3RasterizationStream_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3RasterizationStream( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RasterizationStream_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3RasterizationStream = extendedDynamicState3RasterizationStream_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ConservativeRasterizationMode( Bool32 extendedDynamicState3ConservativeRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT & setExtendedDynamicState3ConservativeRasterizationMode(
+      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ConservativeRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ConservativeRasterizationMode = extendedDynamicState3ConservativeRasterizationMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ExtraPrimitiveOverestimationSize( Bool32 extendedDynamicState3ExtraPrimitiveOverestimationSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT & setExtendedDynamicState3ExtraPrimitiveOverestimationSize(
+      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ExtraPrimitiveOverestimationSize_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ExtraPrimitiveOverestimationSize = extendedDynamicState3ExtraPrimitiveOverestimationSize_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3DepthClipEnable( Bool32 extendedDynamicState3DepthClipEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3DepthClipEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClipEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3DepthClipEnable = extendedDynamicState3DepthClipEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3SampleLocationsEnable( Bool32 extendedDynamicState3SampleLocationsEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3SampleLocationsEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3SampleLocationsEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3SampleLocationsEnable = extendedDynamicState3SampleLocationsEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ColorBlendAdvanced( Bool32 extendedDynamicState3ColorBlendAdvanced_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ColorBlendAdvanced( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ColorBlendAdvanced_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ColorBlendAdvanced = extendedDynamicState3ColorBlendAdvanced_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ProvokingVertexMode( Bool32 extendedDynamicState3ProvokingVertexMode_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ProvokingVertexMode( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ProvokingVertexMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ProvokingVertexMode = extendedDynamicState3ProvokingVertexMode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3LineRasterizationMode( Bool32 extendedDynamicState3LineRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3LineRasterizationMode( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LineRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3LineRasterizationMode = extendedDynamicState3LineRasterizationMode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3LineStippleEnable( Bool32 extendedDynamicState3LineStippleEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3LineStippleEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3LineStippleEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3LineStippleEnable = extendedDynamicState3LineStippleEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3DepthClipNegativeOneToOne( Bool32 extendedDynamicState3DepthClipNegativeOneToOne_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3DepthClipNegativeOneToOne( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3DepthClipNegativeOneToOne_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3DepthClipNegativeOneToOne = extendedDynamicState3DepthClipNegativeOneToOne_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ViewportWScalingEnable( Bool32 extendedDynamicState3ViewportWScalingEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ViewportWScalingEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ViewportWScalingEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ViewportWScalingEnable = extendedDynamicState3ViewportWScalingEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ViewportSwizzle( Bool32 extendedDynamicState3ViewportSwizzle_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ViewportSwizzle( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ViewportSwizzle_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ViewportSwizzle = extendedDynamicState3ViewportSwizzle_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageToColorEnable( Bool32 extendedDynamicState3CoverageToColorEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3CoverageToColorEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageToColorEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageToColorEnable = extendedDynamicState3CoverageToColorEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageToColorLocation( Bool32 extendedDynamicState3CoverageToColorLocation_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3CoverageToColorLocation( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageToColorLocation_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageToColorLocation = extendedDynamicState3CoverageToColorLocation_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageModulationMode( Bool32 extendedDynamicState3CoverageModulationMode_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3CoverageModulationMode( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageModulationMode = extendedDynamicState3CoverageModulationMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageModulationTableEnable( Bool32 extendedDynamicState3CoverageModulationTableEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT & setExtendedDynamicState3CoverageModulationTableEnable(
+      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationTableEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageModulationTableEnable = extendedDynamicState3CoverageModulationTableEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageModulationTable( Bool32 extendedDynamicState3CoverageModulationTable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3CoverageModulationTable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageModulationTable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageModulationTable = extendedDynamicState3CoverageModulationTable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3CoverageReductionMode( Bool32 extendedDynamicState3CoverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3CoverageReductionMode( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3CoverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3CoverageReductionMode = extendedDynamicState3CoverageReductionMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3RepresentativeFragmentTestEnable( Bool32 extendedDynamicState3RepresentativeFragmentTestEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT & setExtendedDynamicState3RepresentativeFragmentTestEnable(
+      VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3RepresentativeFragmentTestEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3RepresentativeFragmentTestEnable = extendedDynamicState3RepresentativeFragmentTestEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3FeaturesEXT &
-      setExtendedDynamicState3ShadingRateImageEnable( Bool32 extendedDynamicState3ShadingRateImageEnable_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedDynamicState3ShadingRateImageEnable( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState3ShadingRateImageEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState3ShadingRateImageEnable = extendedDynamicState3ShadingRateImageEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExtendedDynamicState3FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -88722,50 +63728,44 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedDynamicState3FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -88854,57 +63854,47 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                 = StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT;
-    void *        pNext                                                 = {};
-    Bool32        extendedDynamicState3TessellationDomainOrigin         = {};
-    Bool32        extendedDynamicState3DepthClampEnable                 = {};
-    Bool32        extendedDynamicState3PolygonMode                      = {};
-    Bool32        extendedDynamicState3RasterizationSamples             = {};
-    Bool32        extendedDynamicState3SampleMask                       = {};
-    Bool32        extendedDynamicState3AlphaToCoverageEnable            = {};
-    Bool32        extendedDynamicState3AlphaToOneEnable                 = {};
-    Bool32        extendedDynamicState3LogicOpEnable                    = {};
-    Bool32        extendedDynamicState3ColorBlendEnable                 = {};
-    Bool32        extendedDynamicState3ColorBlendEquation               = {};
-    Bool32        extendedDynamicState3ColorWriteMask                   = {};
-    Bool32        extendedDynamicState3RasterizationStream              = {};
-    Bool32        extendedDynamicState3ConservativeRasterizationMode    = {};
-    Bool32        extendedDynamicState3ExtraPrimitiveOverestimationSize = {};
-    Bool32        extendedDynamicState3DepthClipEnable                  = {};
-    Bool32        extendedDynamicState3SampleLocationsEnable            = {};
-    Bool32        extendedDynamicState3ColorBlendAdvanced               = {};
-    Bool32        extendedDynamicState3ProvokingVertexMode              = {};
-    Bool32        extendedDynamicState3LineRasterizationMode            = {};
-    Bool32        extendedDynamicState3LineStippleEnable                = {};
-    Bool32        extendedDynamicState3DepthClipNegativeOneToOne        = {};
-    Bool32        extendedDynamicState3ViewportWScalingEnable           = {};
-    Bool32        extendedDynamicState3ViewportSwizzle                  = {};
-    Bool32        extendedDynamicState3CoverageToColorEnable            = {};
-    Bool32        extendedDynamicState3CoverageToColorLocation          = {};
-    Bool32        extendedDynamicState3CoverageModulationMode           = {};
-    Bool32        extendedDynamicState3CoverageModulationTableEnable    = {};
-    Bool32        extendedDynamicState3CoverageModulationTable          = {};
-    Bool32        extendedDynamicState3CoverageReductionMode            = {};
-    Bool32        extendedDynamicState3RepresentativeFragmentTestEnable = {};
-    Bool32        extendedDynamicState3ShadingRateImageEnable           = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                 = StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT;
+    void *                              pNext                                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3TessellationDomainOrigin         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3DepthClampEnable                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3PolygonMode                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3RasterizationSamples             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3SampleMask                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3AlphaToCoverageEnable            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3AlphaToOneEnable                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3LogicOpEnable                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ColorBlendEnable                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ColorBlendEquation               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ColorWriteMask                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3RasterizationStream              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ConservativeRasterizationMode    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ExtraPrimitiveOverestimationSize = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3DepthClipEnable                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3SampleLocationsEnable            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ColorBlendAdvanced               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ProvokingVertexMode              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3LineRasterizationMode            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3LineStippleEnable                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3DepthClipNegativeOneToOne        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ViewportWScalingEnable           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ViewportSwizzle                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageToColorEnable            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageToColorLocation          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageModulationMode           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageModulationTableEnable    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageModulationTable          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3CoverageReductionMode            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3RepresentativeFragmentTestEnable = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState3ShadingRateImageEnable           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedDynamicState3FeaturesEXT>
-  {
-    using Type = PhysicalDeviceExtendedDynamicState3FeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT>
   {
     using Type = PhysicalDeviceExtendedDynamicState3FeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedDynamicState3PropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedDynamicState3PropertiesEXT.html
   struct PhysicalDeviceExtendedDynamicState3PropertiesEXT
   {
     using NativeType = VkPhysicalDeviceExtendedDynamicState3PropertiesEXT;
@@ -88912,11 +63902,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicState3PropertiesEXT( Bool32 dynamicPrimitiveTopologyUnrestricted_ = {},
-                                                                           void * pNext_                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dynamicPrimitiveTopologyUnrestricted{ dynamicPrimitiveTopologyUnrestricted_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicState3PropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 dynamicPrimitiveTopologyUnrestricted_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dynamicPrimitiveTopologyUnrestricted( dynamicPrimitiveTopologyUnrestricted_ )
     {
     }
 
@@ -88929,14 +63919,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExtendedDynamicState3PropertiesEXT & operator=( PhysicalDeviceExtendedDynamicState3PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedDynamicState3PropertiesEXT & operator=( VkPhysicalDeviceExtendedDynamicState3PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedDynamicState3PropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicState3PropertiesEXT const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3PropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicState3PropertiesEXT &
+      setDynamicPrimitiveTopologyUnrestricted( VULKAN_HPP_NAMESPACE::Bool32 dynamicPrimitiveTopologyUnrestricted_ ) VULKAN_HPP_NOEXCEPT
+    {
+      dynamicPrimitiveTopologyUnrestricted = dynamicPrimitiveTopologyUnrestricted_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceExtendedDynamicState3PropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *>( this );
@@ -88947,18 +63952,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedDynamicState3PropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedDynamicState3PropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dynamicPrimitiveTopologyUnrestricted );
     }
@@ -88983,27 +63983,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                = StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT;
-    void *        pNext                                = {};
-    Bool32        dynamicPrimitiveTopologyUnrestricted = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                = StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT;
+    void *                              pNext                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicPrimitiveTopologyUnrestricted = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedDynamicState3PropertiesEXT>
-  {
-    using Type = PhysicalDeviceExtendedDynamicState3PropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT>
   {
     using Type = PhysicalDeviceExtendedDynamicState3PropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedDynamicStateFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedDynamicStateFeaturesEXT.html
   struct PhysicalDeviceExtendedDynamicStateFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceExtendedDynamicStateFeaturesEXT;
@@ -89011,10 +64001,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicStateFeaturesEXT( Bool32 extendedDynamicState_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , extendedDynamicState{ extendedDynamicState_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedDynamicStateFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState_ = {},
+                                                                        void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , extendedDynamicState( extendedDynamicState_ )
     {
     }
 
@@ -89027,27 +64018,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExtendedDynamicStateFeaturesEXT & operator=( PhysicalDeviceExtendedDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedDynamicStateFeaturesEXT & operator=( VkPhysicalDeviceExtendedDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedDynamicStateFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedDynamicStateFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicStateFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicStateFeaturesEXT & setExtendedDynamicState( Bool32 extendedDynamicState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedDynamicStateFeaturesEXT &
+      setExtendedDynamicState( VULKAN_HPP_NAMESPACE::Bool32 extendedDynamicState_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedDynamicState = extendedDynamicState_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExtendedDynamicStateFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89059,18 +64051,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedDynamicStateFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, extendedDynamicState );
     }
@@ -89095,27 +64082,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT;
-    void *        pNext                = {};
-    Bool32        extendedDynamicState = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedDynamicState = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedDynamicStateFeaturesEXT>
-  {
-    using Type = PhysicalDeviceExtendedDynamicStateFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT>
   {
     using Type = PhysicalDeviceExtendedDynamicStateFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV.html
   struct PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV
   {
     using NativeType = VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
@@ -89123,11 +64100,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV( Bool32 extendedSparseAddressSpace_ = {},
-                                                                             void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , extendedSparseAddressSpace{ extendedSparseAddressSpace_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 extendedSparseAddressSpace_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , extendedSparseAddressSpace( extendedSparseAddressSpace_ )
     {
     }
 
@@ -89141,15 +64118,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV &
       operator=( PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV & operator=( VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -89157,12 +64134,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV &
-      setExtendedSparseAddressSpace( Bool32 extendedSparseAddressSpace_ ) VULKAN_HPP_NOEXCEPT
+      setExtendedSparseAddressSpace( VULKAN_HPP_NAMESPACE::Bool32 extendedSparseAddressSpace_ ) VULKAN_HPP_NOEXCEPT
     {
       extendedSparseAddressSpace = extendedSparseAddressSpace_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89174,18 +64151,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, extendedSparseAddressSpace );
     }
@@ -89210,27 +64182,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
-    void *        pNext                      = {};
-    Bool32        extendedSparseAddressSpace = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        extendedSparseAddressSpace = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV>
-  {
-    using Type = PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV>
   {
     using Type = PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV.html
   struct PhysicalDeviceExtendedSparseAddressSpacePropertiesNV
   {
     using NativeType = VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
@@ -89238,15 +64200,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedSparseAddressSpacePropertiesNV( DeviceSize       extendedSparseAddressSpaceSize_ = {},
-                                                                               ImageUsageFlags  extendedSparseImageUsageFlags_  = {},
-                                                                               BufferUsageFlags extendedSparseBufferUsageFlags_ = {},
-                                                                               void *           pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , extendedSparseAddressSpaceSize{ extendedSparseAddressSpaceSize_ }
-      , extendedSparseImageUsageFlags{ extendedSparseImageUsageFlags_ }
-      , extendedSparseBufferUsageFlags{ extendedSparseBufferUsageFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExtendedSparseAddressSpacePropertiesNV( VULKAN_HPP_NAMESPACE::DeviceSize       extendedSparseAddressSpaceSize_ = {},
+                                                                               VULKAN_HPP_NAMESPACE::ImageUsageFlags  extendedSparseImageUsageFlags_  = {},
+                                                                               VULKAN_HPP_NAMESPACE::BufferUsageFlags extendedSparseBufferUsageFlags_ = {},
+                                                                               void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , extendedSparseAddressSpaceSize( extendedSparseAddressSpaceSize_ )
+      , extendedSparseImageUsageFlags( extendedSparseImageUsageFlags_ )
+      , extendedSparseBufferUsageFlags( extendedSparseBufferUsageFlags_ )
     {
     }
 
@@ -89260,11 +64222,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceExtendedSparseAddressSpacePropertiesNV &
       operator=( PhysicalDeviceExtendedSparseAddressSpacePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExtendedSparseAddressSpacePropertiesNV & operator=( VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExtendedSparseAddressSpacePropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExtendedSparseAddressSpacePropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -89278,18 +64240,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, ImageUsageFlags const &, BufferUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::BufferUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, extendedSparseAddressSpaceSize, extendedSparseImageUsageFlags, extendedSparseBufferUsageFlags );
     }
@@ -89315,29 +64276,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                          = StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
-    void *           pNext                          = {};
-    DeviceSize       extendedSparseAddressSpaceSize = {};
-    ImageUsageFlags  extendedSparseImageUsageFlags  = {};
-    BufferUsageFlags extendedSparseBufferUsageFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                          = StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
+    void *                                 pNext                          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize       extendedSparseAddressSpaceSize = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags  extendedSparseImageUsageFlags  = {};
+    VULKAN_HPP_NAMESPACE::BufferUsageFlags extendedSparseBufferUsageFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV>
-  {
-    using Type = PhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV>
   {
     using Type = PhysicalDeviceExtendedSparseAddressSpacePropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExternalBufferInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalBufferInfo.html
   struct PhysicalDeviceExternalBufferInfo
   {
     using NativeType = VkPhysicalDeviceExternalBufferInfo;
@@ -89345,15 +64296,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalBufferInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalBufferInfo( BufferCreateFlags                flags_      = {},
-                                                           BufferUsageFlags                 usage_      = {},
-                                                           ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                           const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , usage{ usage_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalBufferInfo(
+      VULKAN_HPP_NAMESPACE::BufferCreateFlags                flags_      = {},
+      VULKAN_HPP_NAMESPACE::BufferUsageFlags                 usage_      = {},
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , usage( usage_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -89365,39 +64317,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalBufferInfo & operator=( PhysicalDeviceExternalBufferInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalBufferInfo & operator=( VkPhysicalDeviceExternalBufferInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalBufferInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalBufferInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setFlags( BufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setFlags( VULKAN_HPP_NAMESPACE::BufferCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setUsage( BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setUsage( VULKAN_HPP_NAMESPACE::BufferUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalBufferInfo &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalBufferInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89409,18 +64362,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalBufferInfo *>( this );
     }
 
-    operator VkPhysicalDeviceExternalBufferInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalBufferInfo *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalBufferInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalBufferInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, BufferCreateFlags const &, BufferUsageFlags const &, ExternalMemoryHandleTypeFlagBits const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::BufferCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::BufferUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, usage, handleType );
@@ -89446,21 +64397,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType      = StructureType::ePhysicalDeviceExternalBufferInfo;
-    const void *                     pNext      = {};
-    BufferCreateFlags                flags      = {};
-    BufferUsageFlags                 usage      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::ePhysicalDeviceExternalBufferInfo;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::BufferCreateFlags                flags      = {};
+    VULKAN_HPP_NAMESPACE::BufferUsageFlags                 usage      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalBufferInfo>
-  {
-    using Type = PhysicalDeviceExternalBufferInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalBufferInfo>
   {
@@ -89469,110 +64412,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceExternalBufferInfoKHR = PhysicalDeviceExternalBufferInfo;
 
-  // wrapper struct for struct VkPhysicalDeviceExternalComputeQueuePropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalComputeQueuePropertiesNV.html
-  struct PhysicalDeviceExternalComputeQueuePropertiesNV
-  {
-    using NativeType = VkPhysicalDeviceExternalComputeQueuePropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalComputeQueuePropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalComputeQueuePropertiesNV( uint32_t externalDataSize_  = {},
-                                                                         uint32_t maxExternalQueues_ = {},
-                                                                         void *   pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalDataSize{ externalDataSize_ }
-      , maxExternalQueues{ maxExternalQueues_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceExternalComputeQueuePropertiesNV( PhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceExternalComputeQueuePropertiesNV( VkPhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceExternalComputeQueuePropertiesNV( *reinterpret_cast<PhysicalDeviceExternalComputeQueuePropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceExternalComputeQueuePropertiesNV & operator=( PhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceExternalComputeQueuePropertiesNV & operator=( VkPhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceExternalComputeQueuePropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceExternalComputeQueuePropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceExternalComputeQueuePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalComputeQueuePropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceExternalComputeQueuePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalComputeQueuePropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalComputeQueuePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalComputeQueuePropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalComputeQueuePropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, externalDataSize, maxExternalQueues );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceExternalComputeQueuePropertiesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( externalDataSize == rhs.externalDataSize ) && ( maxExternalQueues == rhs.maxExternalQueues );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceExternalComputeQueuePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::ePhysicalDeviceExternalComputeQueuePropertiesNV;
-    void *        pNext             = {};
-    uint32_t      externalDataSize  = {};
-    uint32_t      maxExternalQueues = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalComputeQueuePropertiesNV>
-  {
-    using Type = PhysicalDeviceExternalComputeQueuePropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceExternalComputeQueuePropertiesNV>
-  {
-    using Type = PhysicalDeviceExternalComputeQueuePropertiesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceExternalFenceInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalFenceInfo.html
   struct PhysicalDeviceExternalFenceInfo
   {
     using NativeType = VkPhysicalDeviceExternalFenceInfo;
@@ -89580,11 +64419,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalFenceInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalFenceInfo( ExternalFenceHandleTypeFlagBits handleType_ = ExternalFenceHandleTypeFlagBits::eOpaqueFd,
-                                                          const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalFenceInfo(
+      VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd,
+      const void *                                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -89596,27 +64436,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalFenceInfo & operator=( PhysicalDeviceExternalFenceInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalFenceInfo & operator=( VkPhysicalDeviceExternalFenceInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalFenceInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFenceInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFenceInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFenceInfo & setHandleType( ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFenceInfo &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalFenceInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89628,18 +64469,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalFenceInfo *>( this );
     }
 
-    operator VkPhysicalDeviceExternalFenceInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalFenceInfo *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalFenceInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalFenceInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalFenceHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType );
     }
@@ -89664,19 +64500,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType      = StructureType::ePhysicalDeviceExternalFenceInfo;
-    const void *                    pNext      = {};
-    ExternalFenceHandleTypeFlagBits handleType = ExternalFenceHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                   sType      = StructureType::ePhysicalDeviceExternalFenceInfo;
+    const void *                                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalFenceInfo>
-  {
-    using Type = PhysicalDeviceExternalFenceInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalFenceInfo>
   {
@@ -89686,8 +64514,6 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDeviceExternalFenceInfoKHR = PhysicalDeviceExternalFenceInfo;
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkPhysicalDeviceExternalFormatResolveFeaturesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalFormatResolveFeaturesANDROID.html
   struct PhysicalDeviceExternalFormatResolveFeaturesANDROID
   {
     using NativeType = VkPhysicalDeviceExternalFormatResolveFeaturesANDROID;
@@ -89695,10 +64521,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalFormatResolveFeaturesANDROID( Bool32 externalFormatResolve_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalFormatResolve{ externalFormatResolve_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalFormatResolveFeaturesANDROID( VULKAN_HPP_NAMESPACE::Bool32 externalFormatResolve_ = {},
+                                                                             void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , externalFormatResolve( externalFormatResolve_ )
     {
     }
 
@@ -89712,27 +64539,28 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceExternalFormatResolveFeaturesANDROID &
       operator=( PhysicalDeviceExternalFormatResolveFeaturesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalFormatResolveFeaturesANDROID & operator=( VkPhysicalDeviceExternalFormatResolveFeaturesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalFormatResolveFeaturesANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFormatResolveFeaturesANDROID const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFormatResolveFeaturesANDROID & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFormatResolveFeaturesANDROID & setExternalFormatResolve( Bool32 externalFormatResolve_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalFormatResolveFeaturesANDROID &
+      setExternalFormatResolve( VULKAN_HPP_NAMESPACE::Bool32 externalFormatResolve_ ) VULKAN_HPP_NOEXCEPT
     {
       externalFormatResolve = externalFormatResolve_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalFormatResolveFeaturesANDROID const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89744,18 +64572,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalFormatResolveFeaturesANDROID *>( this );
     }
 
-    operator VkPhysicalDeviceExternalFormatResolveFeaturesANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalFormatResolveFeaturesANDROID *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalFormatResolveFeaturesANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalFormatResolveFeaturesANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalFormatResolve );
     }
@@ -89780,19 +64603,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID;
-    void *        pNext                 = {};
-    Bool32        externalFormatResolve = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        externalFormatResolve = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalFormatResolveFeaturesANDROID>
-  {
-    using Type = PhysicalDeviceExternalFormatResolveFeaturesANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID>
   {
@@ -89801,8 +64616,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-  // wrapper struct for struct VkPhysicalDeviceExternalFormatResolvePropertiesANDROID, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalFormatResolvePropertiesANDROID.html
   struct PhysicalDeviceExternalFormatResolvePropertiesANDROID
   {
     using NativeType = VkPhysicalDeviceExternalFormatResolvePropertiesANDROID;
@@ -89810,16 +64623,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalFormatResolvePropertiesANDROID;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceExternalFormatResolvePropertiesANDROID( Bool32         nullColorAttachmentWithExternalFormatResolve_ = {},
-                                                            ChromaLocation externalFormatResolveChromaOffsetX_           = ChromaLocation::eCositedEven,
-                                                            ChromaLocation externalFormatResolveChromaOffsetY_           = ChromaLocation::eCositedEven,
-                                                            void *         pNext_                                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , nullColorAttachmentWithExternalFormatResolve{ nullColorAttachmentWithExternalFormatResolve_ }
-      , externalFormatResolveChromaOffsetX{ externalFormatResolveChromaOffsetX_ }
-      , externalFormatResolveChromaOffsetY{ externalFormatResolveChromaOffsetY_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalFormatResolvePropertiesANDROID(
+      VULKAN_HPP_NAMESPACE::Bool32         nullColorAttachmentWithExternalFormatResolve_ = {},
+      VULKAN_HPP_NAMESPACE::ChromaLocation externalFormatResolveChromaOffsetX_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation externalFormatResolveChromaOffsetY_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      void *                               pNext_                                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , nullColorAttachmentWithExternalFormatResolve( nullColorAttachmentWithExternalFormatResolve_ )
+      , externalFormatResolveChromaOffsetX( externalFormatResolveChromaOffsetX_ )
+      , externalFormatResolveChromaOffsetY( externalFormatResolveChromaOffsetY_ )
     {
     }
 
@@ -89833,11 +64646,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceExternalFormatResolvePropertiesANDROID &
       operator=( PhysicalDeviceExternalFormatResolvePropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalFormatResolvePropertiesANDROID & operator=( VkPhysicalDeviceExternalFormatResolvePropertiesANDROID const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalFormatResolvePropertiesANDROID const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalFormatResolvePropertiesANDROID const *>( &rhs );
       return *this;
     }
 
@@ -89851,18 +64664,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalFormatResolvePropertiesANDROID *>( this );
     }
 
-    operator VkPhysicalDeviceExternalFormatResolvePropertiesANDROID const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalFormatResolvePropertiesANDROID *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalFormatResolvePropertiesANDROID *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalFormatResolvePropertiesANDROID *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, ChromaLocation const &, ChromaLocation const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, nullColorAttachmentWithExternalFormatResolve, externalFormatResolveChromaOffsetX, externalFormatResolveChromaOffsetY );
     }
@@ -89890,21 +64702,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType  sType                                        = StructureType::ePhysicalDeviceExternalFormatResolvePropertiesANDROID;
-    void *         pNext                                        = {};
-    Bool32         nullColorAttachmentWithExternalFormatResolve = {};
-    ChromaLocation externalFormatResolveChromaOffsetX           = ChromaLocation::eCositedEven;
-    ChromaLocation externalFormatResolveChromaOffsetY           = ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::StructureType  sType                                        = StructureType::ePhysicalDeviceExternalFormatResolvePropertiesANDROID;
+    void *                               pNext                                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32         nullColorAttachmentWithExternalFormatResolve = {};
+    VULKAN_HPP_NAMESPACE::ChromaLocation externalFormatResolveChromaOffsetX           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation externalFormatResolveChromaOffsetY           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalFormatResolvePropertiesANDROID>
-  {
-    using Type = PhysicalDeviceExternalFormatResolvePropertiesANDROID;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalFormatResolvePropertiesANDROID>
   {
@@ -89912,8 +64716,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 
-  // wrapper struct for struct VkPhysicalDeviceExternalImageFormatInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalImageFormatInfo.html
   struct PhysicalDeviceExternalImageFormatInfo
   {
     using NativeType = VkPhysicalDeviceExternalImageFormatInfo;
@@ -89921,11 +64723,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalImageFormatInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalImageFormatInfo( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                                const void *                     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalImageFormatInfo(
+      VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
+      const void *                                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -89937,27 +64740,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalImageFormatInfo & operator=( PhysicalDeviceExternalImageFormatInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalImageFormatInfo & operator=( VkPhysicalDeviceExternalImageFormatInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalImageFormatInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalImageFormatInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalImageFormatInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalImageFormatInfo & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalImageFormatInfo &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalImageFormatInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -89969,18 +64773,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalImageFormatInfo *>( this );
     }
 
-    operator VkPhysicalDeviceExternalImageFormatInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalImageFormatInfo *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalImageFormatInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalImageFormatInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalMemoryHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType );
     }
@@ -90005,19 +64804,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType      = StructureType::ePhysicalDeviceExternalImageFormatInfo;
-    const void *                     pNext      = {};
-    ExternalMemoryHandleTypeFlagBits handleType = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                    sType      = StructureType::ePhysicalDeviceExternalImageFormatInfo;
+    const void *                                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalImageFormatInfo>
-  {
-    using Type = PhysicalDeviceExternalImageFormatInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalImageFormatInfo>
   {
@@ -90026,8 +64817,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceExternalImageFormatInfoKHR = PhysicalDeviceExternalImageFormatInfo;
 
-  // wrapper struct for struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalMemoryHostPropertiesEXT.html
   struct PhysicalDeviceExternalMemoryHostPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceExternalMemoryHostPropertiesEXT;
@@ -90035,11 +64824,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryHostPropertiesEXT( DeviceSize minImportedHostPointerAlignment_ = {},
-                                                                        void *     pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minImportedHostPointerAlignment{ minImportedHostPointerAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryHostPropertiesEXT( VULKAN_HPP_NAMESPACE::DeviceSize minImportedHostPointerAlignment_ = {},
+                                                                        void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minImportedHostPointerAlignment( minImportedHostPointerAlignment_ )
     {
     }
 
@@ -90052,11 +64841,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalMemoryHostPropertiesEXT & operator=( PhysicalDeviceExternalMemoryHostPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalMemoryHostPropertiesEXT & operator=( VkPhysicalDeviceExternalMemoryHostPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalMemoryHostPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryHostPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -90070,18 +64859,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalMemoryHostPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceExternalMemoryHostPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalMemoryHostPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalMemoryHostPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalMemoryHostPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minImportedHostPointerAlignment );
     }
@@ -90106,27 +64890,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                           = StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT;
-    void *        pNext                           = {};
-    DeviceSize    minImportedHostPointerAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT;
+    void *                              pNext                           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    minImportedHostPointerAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalMemoryHostPropertiesEXT>
-  {
-    using Type = PhysicalDeviceExternalMemoryHostPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT>
   {
     using Type = PhysicalDeviceExternalMemoryHostPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceExternalMemoryRDMAFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalMemoryRDMAFeaturesNV.html
   struct PhysicalDeviceExternalMemoryRDMAFeaturesNV
   {
     using NativeType = VkPhysicalDeviceExternalMemoryRDMAFeaturesNV;
@@ -90134,10 +64908,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryRDMAFeaturesNV( Bool32 externalMemoryRDMA_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , externalMemoryRDMA{ externalMemoryRDMA_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryRDMAFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 externalMemoryRDMA_ = {},
+                                                                     void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , externalMemoryRDMA( externalMemoryRDMA_ )
     {
     }
 
@@ -90149,27 +64924,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalMemoryRDMAFeaturesNV & operator=( PhysicalDeviceExternalMemoryRDMAFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalMemoryRDMAFeaturesNV & operator=( VkPhysicalDeviceExternalMemoryRDMAFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalMemoryRDMAFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryRDMAFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryRDMAFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryRDMAFeaturesNV & setExternalMemoryRDMA( Bool32 externalMemoryRDMA_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryRDMAFeaturesNV &
+      setExternalMemoryRDMA( VULKAN_HPP_NAMESPACE::Bool32 externalMemoryRDMA_ ) VULKAN_HPP_NOEXCEPT
     {
       externalMemoryRDMA = externalMemoryRDMA_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalMemoryRDMAFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -90181,18 +64957,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalMemoryRDMAFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceExternalMemoryRDMAFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalMemoryRDMAFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalMemoryRDMAFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalMemoryRDMAFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, externalMemoryRDMA );
     }
@@ -90217,19 +64988,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV;
-    void *        pNext              = {};
-    Bool32        externalMemoryRDMA = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        externalMemoryRDMA = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalMemoryRDMAFeaturesNV>
-  {
-    using Type = PhysicalDeviceExternalMemoryRDMAFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV>
   {
@@ -90237,8 +65000,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX.html
   struct PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX
   {
     using NativeType = VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX;
@@ -90246,10 +65007,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX( Bool32 screenBufferImport_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , screenBufferImport{ screenBufferImport_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX( VULKAN_HPP_NAMESPACE::Bool32 screenBufferImport_ = {},
+                                                                              void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , screenBufferImport( screenBufferImport_ )
     {
     }
 
@@ -90263,27 +65025,28 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX &
       operator=( PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX & operator=( VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX & setScreenBufferImport( Bool32 screenBufferImport_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX &
+      setScreenBufferImport( VULKAN_HPP_NAMESPACE::Bool32 screenBufferImport_ ) VULKAN_HPP_NOEXCEPT
     {
       screenBufferImport = screenBufferImport_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -90295,18 +65058,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX *>( this );
     }
 
-    operator VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, screenBufferImport );
     }
@@ -90331,19 +65089,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX;
-    void *        pNext              = {};
-    Bool32        screenBufferImport = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        screenBufferImport = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX>
-  {
-    using Type = PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX>
   {
@@ -90351,8 +65101,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  // wrapper struct for struct VkPhysicalDeviceExternalSemaphoreInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalSemaphoreInfo.html
   struct PhysicalDeviceExternalSemaphoreInfo
   {
     using NativeType = VkPhysicalDeviceExternalSemaphoreInfo;
@@ -90360,11 +65108,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalSemaphoreInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalSemaphoreInfo( ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                              const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalSemaphoreInfo(
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -90376,27 +65125,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceExternalSemaphoreInfo & operator=( PhysicalDeviceExternalSemaphoreInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceExternalSemaphoreInfo & operator=( VkPhysicalDeviceExternalSemaphoreInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceExternalSemaphoreInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceExternalSemaphoreInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalSemaphoreInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalSemaphoreInfo & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalSemaphoreInfo &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceExternalSemaphoreInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -90408,18 +65158,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceExternalSemaphoreInfo *>( this );
     }
 
-    operator VkPhysicalDeviceExternalSemaphoreInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalSemaphoreInfo *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalSemaphoreInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalSemaphoreInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalSemaphoreHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, handleType );
     }
@@ -90444,19 +65189,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType      = StructureType::ePhysicalDeviceExternalSemaphoreInfo;
-    const void *                        pNext      = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::ePhysicalDeviceExternalSemaphoreInfo;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalSemaphoreInfo>
-  {
-    using Type = PhysicalDeviceExternalSemaphoreInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceExternalSemaphoreInfo>
   {
@@ -90465,144 +65202,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceExternalSemaphoreInfoKHR = PhysicalDeviceExternalSemaphoreInfo;
 
-  // wrapper struct for struct VkPhysicalDeviceExternalTensorInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceExternalTensorInfoARM.html
-  struct PhysicalDeviceExternalTensorInfoARM
-  {
-    using NativeType = VkPhysicalDeviceExternalTensorInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceExternalTensorInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalTensorInfoARM( TensorCreateFlagsARM             flags_        = {},
-                                                              const TensorDescriptionARM *     pDescription_ = {},
-                                                              ExternalMemoryHandleTypeFlagBits handleType_   = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
-                                                              const void *                     pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pDescription{ pDescription_ }
-      , handleType{ handleType_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceExternalTensorInfoARM( PhysicalDeviceExternalTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceExternalTensorInfoARM( VkPhysicalDeviceExternalTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceExternalTensorInfoARM( *reinterpret_cast<PhysicalDeviceExternalTensorInfoARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceExternalTensorInfoARM & operator=( PhysicalDeviceExternalTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceExternalTensorInfoARM & operator=( VkPhysicalDeviceExternalTensorInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceExternalTensorInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalTensorInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalTensorInfoARM & setFlags( TensorCreateFlagsARM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalTensorInfoARM & setPDescription( const TensorDescriptionARM * pDescription_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDescription = pDescription_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceExternalTensorInfoARM & setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      handleType = handleType_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceExternalTensorInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceExternalTensorInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalTensorInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceExternalTensorInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalTensorInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceExternalTensorInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceExternalTensorInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceExternalTensorInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               TensorCreateFlagsARM const &,
-               const TensorDescriptionARM * const &,
-               ExternalMemoryHandleTypeFlagBits const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, pDescription, handleType );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceExternalTensorInfoARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceExternalTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( pDescription == rhs.pDescription ) &&
-             ( handleType == rhs.handleType );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceExternalTensorInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                    sType        = StructureType::ePhysicalDeviceExternalTensorInfoARM;
-    const void *                     pNext        = {};
-    TensorCreateFlagsARM             flags        = {};
-    const TensorDescriptionARM *     pDescription = {};
-    ExternalMemoryHandleTypeFlagBits handleType   = ExternalMemoryHandleTypeFlagBits::eOpaqueFd;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceExternalTensorInfoARM>
-  {
-    using Type = PhysicalDeviceExternalTensorInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceExternalTensorInfoARM>
-  {
-    using Type = PhysicalDeviceExternalTensorInfoARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceFaultFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFaultFeaturesEXT.html
   struct PhysicalDeviceFaultFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceFaultFeaturesEXT;
@@ -90610,12 +65209,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFaultFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFaultFeaturesEXT( Bool32 deviceFault_ = {}, Bool32 deviceFaultVendorBinary_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceFault{ deviceFault_ }
-      , deviceFaultVendorBinary{ deviceFaultVendorBinary_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFaultFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 deviceFault_             = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 deviceFaultVendorBinary_ = {},
+                                                         void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceFault( deviceFault_ )
+      , deviceFaultVendorBinary( deviceFaultVendorBinary_ )
     {
     }
 
@@ -90627,33 +65227,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFaultFeaturesEXT & operator=( PhysicalDeviceFaultFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFaultFeaturesEXT & operator=( VkPhysicalDeviceFaultFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFaultFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFaultFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFaultFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFaultFeaturesEXT & setDeviceFault( Bool32 deviceFault_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFaultFeaturesEXT & setDeviceFault( VULKAN_HPP_NAMESPACE::Bool32 deviceFault_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceFault = deviceFault_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFaultFeaturesEXT & setDeviceFaultVendorBinary( Bool32 deviceFaultVendorBinary_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFaultFeaturesEXT &
+      setDeviceFaultVendorBinary( VULKAN_HPP_NAMESPACE::Bool32 deviceFaultVendorBinary_ ) VULKAN_HPP_NOEXCEPT
     {
       deviceFaultVendorBinary = deviceFaultVendorBinary_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFaultFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -90665,18 +65266,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFaultFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFaultFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFaultFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFaultFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFaultFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceFault, deviceFaultVendorBinary );
     }
@@ -90702,27 +65298,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceFaultFeaturesEXT;
-    void *        pNext                   = {};
-    Bool32        deviceFault             = {};
-    Bool32        deviceFaultVendorBinary = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceFaultFeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceFault             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        deviceFaultVendorBinary = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFaultFeaturesEXT>
-  {
-    using Type = PhysicalDeviceFaultFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFaultFeaturesEXT>
   {
     using Type = PhysicalDeviceFaultFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFeatures2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFeatures2.html
   struct PhysicalDeviceFeatures2
   {
     using NativeType = VkPhysicalDeviceFeatures2;
@@ -90730,10 +65317,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFeatures2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFeatures2( PhysicalDeviceFeatures features_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , features{ features_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFeatures2( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures features_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , features( features_ )
     {
     }
 
@@ -90745,27 +65332,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFeatures2 & operator=( PhysicalDeviceFeatures2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFeatures2 & operator=( VkPhysicalDeviceFeatures2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFeatures2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures2 & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures2 & setFeatures( PhysicalDeviceFeatures const & features_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFeatures2 & setFeatures( VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures const & features_ ) VULKAN_HPP_NOEXCEPT
     {
       features = features_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFeatures2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -90777,18 +65364,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFeatures2 *>( this );
     }
 
-    operator VkPhysicalDeviceFeatures2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFeatures2 *>( this );
-    }
-
-    operator VkPhysicalDeviceFeatures2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFeatures2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PhysicalDeviceFeatures const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, features );
     }
@@ -90813,19 +65395,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType    = StructureType::ePhysicalDeviceFeatures2;
-    void *                 pNext    = {};
-    PhysicalDeviceFeatures features = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType    = StructureType::ePhysicalDeviceFeatures2;
+    void *                                       pNext    = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures features = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFeatures2>
-  {
-    using Type = PhysicalDeviceFeatures2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFeatures2>
   {
@@ -90834,8 +65408,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceFeatures2KHR = PhysicalDeviceFeatures2;
 
-  // wrapper struct for struct VkPhysicalDeviceFloatControlsProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFloatControlsProperties.html
   struct PhysicalDeviceFloatControlsProperties
   {
     using NativeType = VkPhysicalDeviceFloatControlsProperties;
@@ -90843,44 +65415,44 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFloatControlsProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFloatControlsProperties( ShaderFloatControlsIndependence denormBehaviorIndependence_ = ShaderFloatControlsIndependence::e32BitOnly,
-                                             ShaderFloatControlsIndependence roundingModeIndependence_   = ShaderFloatControlsIndependence::e32BitOnly,
-                                             Bool32                          shaderSignedZeroInfNanPreserveFloat16_ = {},
-                                             Bool32                          shaderSignedZeroInfNanPreserveFloat32_ = {},
-                                             Bool32                          shaderSignedZeroInfNanPreserveFloat64_ = {},
-                                             Bool32                          shaderDenormPreserveFloat16_           = {},
-                                             Bool32                          shaderDenormPreserveFloat32_           = {},
-                                             Bool32                          shaderDenormPreserveFloat64_           = {},
-                                             Bool32                          shaderDenormFlushToZeroFloat16_        = {},
-                                             Bool32                          shaderDenormFlushToZeroFloat32_        = {},
-                                             Bool32                          shaderDenormFlushToZeroFloat64_        = {},
-                                             Bool32                          shaderRoundingModeRTEFloat16_          = {},
-                                             Bool32                          shaderRoundingModeRTEFloat32_          = {},
-                                             Bool32                          shaderRoundingModeRTEFloat64_          = {},
-                                             Bool32                          shaderRoundingModeRTZFloat16_          = {},
-                                             Bool32                          shaderRoundingModeRTZFloat32_          = {},
-                                             Bool32                          shaderRoundingModeRTZFloat64_          = {},
-                                             void *                          pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , denormBehaviorIndependence{ denormBehaviorIndependence_ }
-      , roundingModeIndependence{ roundingModeIndependence_ }
-      , shaderSignedZeroInfNanPreserveFloat16{ shaderSignedZeroInfNanPreserveFloat16_ }
-      , shaderSignedZeroInfNanPreserveFloat32{ shaderSignedZeroInfNanPreserveFloat32_ }
-      , shaderSignedZeroInfNanPreserveFloat64{ shaderSignedZeroInfNanPreserveFloat64_ }
-      , shaderDenormPreserveFloat16{ shaderDenormPreserveFloat16_ }
-      , shaderDenormPreserveFloat32{ shaderDenormPreserveFloat32_ }
-      , shaderDenormPreserveFloat64{ shaderDenormPreserveFloat64_ }
-      , shaderDenormFlushToZeroFloat16{ shaderDenormFlushToZeroFloat16_ }
-      , shaderDenormFlushToZeroFloat32{ shaderDenormFlushToZeroFloat32_ }
-      , shaderDenormFlushToZeroFloat64{ shaderDenormFlushToZeroFloat64_ }
-      , shaderRoundingModeRTEFloat16{ shaderRoundingModeRTEFloat16_ }
-      , shaderRoundingModeRTEFloat32{ shaderRoundingModeRTEFloat32_ }
-      , shaderRoundingModeRTEFloat64{ shaderRoundingModeRTEFloat64_ }
-      , shaderRoundingModeRTZFloat16{ shaderRoundingModeRTZFloat16_ }
-      , shaderRoundingModeRTZFloat32{ shaderRoundingModeRTZFloat32_ }
-      , shaderRoundingModeRTZFloat64{ shaderRoundingModeRTZFloat64_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFloatControlsProperties(
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence denormBehaviorIndependence_ = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence roundingModeIndependence_   = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat16_ = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat32_ = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat64_ = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat16_           = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat32_           = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat64_           = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat16_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat32_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat64_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat16_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat32_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat64_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat16_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat32_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat64_          = {},
+      void *                                                pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , denormBehaviorIndependence( denormBehaviorIndependence_ )
+      , roundingModeIndependence( roundingModeIndependence_ )
+      , shaderSignedZeroInfNanPreserveFloat16( shaderSignedZeroInfNanPreserveFloat16_ )
+      , shaderSignedZeroInfNanPreserveFloat32( shaderSignedZeroInfNanPreserveFloat32_ )
+      , shaderSignedZeroInfNanPreserveFloat64( shaderSignedZeroInfNanPreserveFloat64_ )
+      , shaderDenormPreserveFloat16( shaderDenormPreserveFloat16_ )
+      , shaderDenormPreserveFloat32( shaderDenormPreserveFloat32_ )
+      , shaderDenormPreserveFloat64( shaderDenormPreserveFloat64_ )
+      , shaderDenormFlushToZeroFloat16( shaderDenormFlushToZeroFloat16_ )
+      , shaderDenormFlushToZeroFloat32( shaderDenormFlushToZeroFloat32_ )
+      , shaderDenormFlushToZeroFloat64( shaderDenormFlushToZeroFloat64_ )
+      , shaderRoundingModeRTEFloat16( shaderRoundingModeRTEFloat16_ )
+      , shaderRoundingModeRTEFloat32( shaderRoundingModeRTEFloat32_ )
+      , shaderRoundingModeRTEFloat64( shaderRoundingModeRTEFloat64_ )
+      , shaderRoundingModeRTZFloat16( shaderRoundingModeRTZFloat16_ )
+      , shaderRoundingModeRTZFloat32( shaderRoundingModeRTZFloat32_ )
+      , shaderRoundingModeRTZFloat64( shaderRoundingModeRTZFloat64_ )
     {
     }
 
@@ -90892,11 +65464,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFloatControlsProperties & operator=( PhysicalDeviceFloatControlsProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFloatControlsProperties & operator=( VkPhysicalDeviceFloatControlsProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFloatControlsProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFloatControlsProperties const *>( &rhs );
       return *this;
     }
 
@@ -90910,36 +65482,30 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFloatControlsProperties *>( this );
     }
 
-    operator VkPhysicalDeviceFloatControlsProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFloatControlsProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceFloatControlsProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFloatControlsProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ShaderFloatControlsIndependence const &,
-               ShaderFloatControlsIndependence const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence const &,
+               VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -90994,35 +65560,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                                 = StructureType::ePhysicalDeviceFloatControlsProperties;
-    void *                          pNext                                 = {};
-    ShaderFloatControlsIndependence denormBehaviorIndependence            = ShaderFloatControlsIndependence::e32BitOnly;
-    ShaderFloatControlsIndependence roundingModeIndependence              = ShaderFloatControlsIndependence::e32BitOnly;
-    Bool32                          shaderSignedZeroInfNanPreserveFloat16 = {};
-    Bool32                          shaderSignedZeroInfNanPreserveFloat32 = {};
-    Bool32                          shaderSignedZeroInfNanPreserveFloat64 = {};
-    Bool32                          shaderDenormPreserveFloat16           = {};
-    Bool32                          shaderDenormPreserveFloat32           = {};
-    Bool32                          shaderDenormPreserveFloat64           = {};
-    Bool32                          shaderDenormFlushToZeroFloat16        = {};
-    Bool32                          shaderDenormFlushToZeroFloat32        = {};
-    Bool32                          shaderDenormFlushToZeroFloat64        = {};
-    Bool32                          shaderRoundingModeRTEFloat16          = {};
-    Bool32                          shaderRoundingModeRTEFloat32          = {};
-    Bool32                          shaderRoundingModeRTEFloat64          = {};
-    Bool32                          shaderRoundingModeRTZFloat16          = {};
-    Bool32                          shaderRoundingModeRTZFloat32          = {};
-    Bool32                          shaderRoundingModeRTZFloat64          = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                      = StructureType::ePhysicalDeviceFloatControlsProperties;
+    void *                                                pNext                      = {};
+    VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence denormBehaviorIndependence = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly;
+    VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence roundingModeIndependence   = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly;
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat16 = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat32 = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat64 = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat16           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat32           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat64           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat16        = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat32        = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat64        = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat16          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat32          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat64          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat16          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat32          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat64          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFloatControlsProperties>
-  {
-    using Type = PhysicalDeviceFloatControlsProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFloatControlsProperties>
   {
@@ -91031,119 +65589,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceFloatControlsPropertiesKHR = PhysicalDeviceFloatControlsProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceFormatPackFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFormatPackFeaturesARM.html
-  struct PhysicalDeviceFormatPackFeaturesARM
-  {
-    using NativeType = VkPhysicalDeviceFormatPackFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFormatPackFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFormatPackFeaturesARM( Bool32 formatPack_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , formatPack{ formatPack_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFormatPackFeaturesARM( PhysicalDeviceFormatPackFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceFormatPackFeaturesARM( VkPhysicalDeviceFormatPackFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceFormatPackFeaturesARM( *reinterpret_cast<PhysicalDeviceFormatPackFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceFormatPackFeaturesARM & operator=( PhysicalDeviceFormatPackFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceFormatPackFeaturesARM & operator=( VkPhysicalDeviceFormatPackFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceFormatPackFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFormatPackFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFormatPackFeaturesARM & setFormatPack( Bool32 formatPack_ ) VULKAN_HPP_NOEXCEPT
-    {
-      formatPack = formatPack_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceFormatPackFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceFormatPackFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceFormatPackFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceFormatPackFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceFormatPackFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFormatPackFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceFormatPackFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFormatPackFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, formatPack );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceFormatPackFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceFormatPackFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( formatPack == rhs.formatPack );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceFormatPackFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::ePhysicalDeviceFormatPackFeaturesARM;
-    void *        pNext      = {};
-    Bool32        formatPack = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFormatPackFeaturesARM>
-  {
-    using Type = PhysicalDeviceFormatPackFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceFormatPackFeaturesARM>
-  {
-    using Type = PhysicalDeviceFormatPackFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMap2FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMap2FeaturesEXT.html
   struct PhysicalDeviceFragmentDensityMap2FeaturesEXT
   {
     using NativeType = VkPhysicalDeviceFragmentDensityMap2FeaturesEXT;
@@ -91151,10 +65596,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMap2FeaturesEXT( Bool32 fragmentDensityMapDeferred_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityMapDeferred{ fragmentDensityMapDeferred_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMap2FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapDeferred_ = {},
+                                                                       void *                       pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityMapDeferred( fragmentDensityMapDeferred_ )
     {
     }
 
@@ -91166,15 +65612,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentDensityMap2FeaturesEXT & operator=( PhysicalDeviceFragmentDensityMap2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentDensityMap2FeaturesEXT & operator=( VkPhysicalDeviceFragmentDensityMap2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMap2FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMap2FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMap2FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -91182,12 +65628,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMap2FeaturesEXT &
-      setFragmentDensityMapDeferred( Bool32 fragmentDensityMapDeferred_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentDensityMapDeferred( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapDeferred_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMapDeferred = fragmentDensityMapDeferred_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentDensityMap2FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -91199,18 +65645,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMap2FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMap2FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMap2FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMap2FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMap2FeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentDensityMapDeferred );
     }
@@ -91235,27 +65676,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT;
-    void *        pNext                      = {};
-    Bool32        fragmentDensityMapDeferred = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityMapDeferred = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMap2FeaturesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMap2FeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT>
   {
     using Type = PhysicalDeviceFragmentDensityMap2FeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMap2PropertiesEXT.html
   struct PhysicalDeviceFragmentDensityMap2PropertiesEXT
   {
     using NativeType = VkPhysicalDeviceFragmentDensityMap2PropertiesEXT;
@@ -91263,17 +65694,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMap2PropertiesEXT( Bool32   subsampledLoads_                           = {},
-                                                                         Bool32   subsampledCoarseReconstructionEarlyAccess_ = {},
-                                                                         uint32_t maxSubsampledArrayLayers_                  = {},
-                                                                         uint32_t maxDescriptorSetSubsampledSamplers_        = {},
-                                                                         void *   pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subsampledLoads{ subsampledLoads_ }
-      , subsampledCoarseReconstructionEarlyAccess{ subsampledCoarseReconstructionEarlyAccess_ }
-      , maxSubsampledArrayLayers{ maxSubsampledArrayLayers_ }
-      , maxDescriptorSetSubsampledSamplers{ maxDescriptorSetSubsampledSamplers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMap2PropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 subsampledLoads_                           = {},
+                                                                         VULKAN_HPP_NAMESPACE::Bool32 subsampledCoarseReconstructionEarlyAccess_ = {},
+                                                                         uint32_t                     maxSubsampledArrayLayers_                  = {},
+                                                                         uint32_t                     maxDescriptorSetSubsampledSamplers_        = {},
+                                                                         void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subsampledLoads( subsampledLoads_ )
+      , subsampledCoarseReconstructionEarlyAccess( subsampledCoarseReconstructionEarlyAccess_ )
+      , maxSubsampledArrayLayers( maxSubsampledArrayLayers_ )
+      , maxDescriptorSetSubsampledSamplers( maxDescriptorSetSubsampledSamplers_ )
     {
     }
 
@@ -91286,11 +65717,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentDensityMap2PropertiesEXT & operator=( PhysicalDeviceFragmentDensityMap2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentDensityMap2PropertiesEXT & operator=( VkPhysicalDeviceFragmentDensityMap2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMap2PropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMap2PropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -91304,18 +65735,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMap2PropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMap2PropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMap2PropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subsampledLoads, subsampledCoarseReconstructionEarlyAccess, maxSubsampledArrayLayers, maxDescriptorSetSubsampledSamplers );
     }
@@ -91342,30 +65773,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                     = StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT;
-    void *        pNext                                     = {};
-    Bool32        subsampledLoads                           = {};
-    Bool32        subsampledCoarseReconstructionEarlyAccess = {};
-    uint32_t      maxSubsampledArrayLayers                  = {};
-    uint32_t      maxDescriptorSetSubsampledSamplers        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                     = StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT;
+    void *                              pNext                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subsampledLoads                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subsampledCoarseReconstructionEarlyAccess = {};
+    uint32_t                            maxSubsampledArrayLayers                  = {};
+    uint32_t                            maxDescriptorSetSubsampledSamplers        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMap2PropertiesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMap2PropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT>
   {
     using Type = PhysicalDeviceFragmentDensityMap2PropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapFeaturesEXT.html
   struct PhysicalDeviceFragmentDensityMapFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceFragmentDensityMapFeaturesEXT;
@@ -91373,15 +65794,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapFeaturesEXT( Bool32 fragmentDensityMap_                    = {},
-                                                                      Bool32 fragmentDensityMapDynamic_             = {},
-                                                                      Bool32 fragmentDensityMapNonSubsampledImages_ = {},
-                                                                      void * pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityMap{ fragmentDensityMap_ }
-      , fragmentDensityMapDynamic{ fragmentDensityMapDynamic_ }
-      , fragmentDensityMapNonSubsampledImages{ fragmentDensityMapNonSubsampledImages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMap_                    = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapDynamic_             = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapNonSubsampledImages_ = {},
+                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityMap( fragmentDensityMap_ )
+      , fragmentDensityMapDynamic( fragmentDensityMapDynamic_ )
+      , fragmentDensityMapNonSubsampledImages( fragmentDensityMapNonSubsampledImages_ )
     {
     }
 
@@ -91393,40 +65814,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentDensityMapFeaturesEXT & operator=( PhysicalDeviceFragmentDensityMapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentDensityMapFeaturesEXT & operator=( VkPhysicalDeviceFragmentDensityMapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT & setFragmentDensityMap( Bool32 fragmentDensityMap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT &
+      setFragmentDensityMap( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMap_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMap = fragmentDensityMap_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT & setFragmentDensityMapDynamic( Bool32 fragmentDensityMapDynamic_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT &
+      setFragmentDensityMapDynamic( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapDynamic_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMapDynamic = fragmentDensityMapDynamic_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapFeaturesEXT &
-      setFragmentDensityMapNonSubsampledImages( Bool32 fragmentDensityMapNonSubsampledImages_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentDensityMapNonSubsampledImages( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapNonSubsampledImages_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMapNonSubsampledImages = fragmentDensityMapNonSubsampledImages_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentDensityMapFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -91438,18 +65861,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMapFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentDensityMap, fragmentDensityMapDynamic, fragmentDensityMapNonSubsampledImages );
     }
@@ -91476,323 +65898,93 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                 = StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT;
-    void *        pNext                                 = {};
-    Bool32        fragmentDensityMap                    = {};
-    Bool32        fragmentDensityMapDynamic             = {};
-    Bool32        fragmentDensityMapNonSubsampledImages = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                 = StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT;
+    void *                              pNext                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityMap                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityMapDynamic             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityMapNonSubsampledImages = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapFeaturesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT>
   {
     using Type = PhysicalDeviceFragmentDensityMapFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE.html
-  struct PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE
+  struct PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM
   {
-    using NativeType = VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
+    using NativeType = VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE( Bool32 fragmentDensityMapLayered_ = {},
-                                                                               void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityMapLayered{ fragmentDensityMapLayered_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapOffset_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityMapOffset( fragmentDensityMapOffset_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE( PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM( PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE( VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE( *reinterpret_cast<PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const *>( &rhs ) )
+    PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM( *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE &
-      operator=( PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM &
+      operator=( PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE & operator=( VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM & operator=( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE &
-      setFragmentDensityMapLayered( Bool32 fragmentDensityMapLayered_ ) VULKAN_HPP_NOEXCEPT
-    {
-      fragmentDensityMapLayered = fragmentDensityMapLayered_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, fragmentDensityMapLayered );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( fragmentDensityMapLayered == rhs.fragmentDensityMapLayered );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                     = StructureType::ePhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-    void *        pNext                     = {};
-    Bool32        fragmentDensityMapLayered = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE.html
-  struct PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE
-  {
-    using NativeType = VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE( uint32_t maxFragmentDensityMapLayers_ = {},
-                                                                                 void *   pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxFragmentDensityMapLayers{ maxFragmentDensityMapLayers_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE( PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE( VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE( *reinterpret_cast<PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE &
-      operator=( PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE &
-      operator=( VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxFragmentDensityMapLayers );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxFragmentDensityMapLayers == rhs.maxFragmentDensityMapLayers );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                       = StructureType::ePhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-    void *        pNext                       = {};
-    uint32_t      maxFragmentDensityMapLayers = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT.html
-  struct PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT( Bool32 fragmentDensityMapOffset_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityMapOffset{ fragmentDensityMapOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT( PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT( *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT &
-      operator=( PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT & operator=( VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT &
-      setFragmentDensityMapOffset( Bool32 fragmentDensityMapOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM &
+      setFragmentDensityMapOffset( VULKAN_HPP_NAMESPACE::Bool32 fragmentDensityMapOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMapOffset = fragmentDensityMapOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentDensityMapOffset );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & ) const = default;
+    auto operator<=>( PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -91801,100 +65993,83 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-    void *        pNext                    = {};
-    Bool32        fragmentDensityMapOffset = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityMapOffset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesEXT>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM>
   {
-    using Type = PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
+    using Type = PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM;
   };
 
-  using PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM = PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT;
-
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT.html
-  struct PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT
+  struct PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM
   {
-    using NativeType = VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
+    using NativeType = VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT( Extent2D fragmentDensityOffsetGranularity_ = {},
-                                                                              void *   pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityOffsetGranularity{ fragmentDensityOffsetGranularity_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM( VULKAN_HPP_NAMESPACE::Extent2D fragmentDensityOffsetGranularity_ = {},
+                                                                               void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityOffsetGranularity( fragmentDensityOffsetGranularity_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT( PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM( PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT( *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const *>( &rhs ) )
+    PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM( *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT &
-      operator=( PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM &
+      operator=( PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT & operator=( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM & operator=( VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentDensityOffsetGranularity );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & ) const = default;
+    auto operator<=>( PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -91903,36 +66078,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-    void *        pNext                            = {};
-    Extent2D      fragmentDensityOffsetGranularity = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      fragmentDensityOffsetGranularity = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesEXT>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM>
   {
-    using Type = PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
+    using Type = PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM;
   };
 
-  using PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM = PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT;
-
-  // wrapper struct for struct VkPhysicalDeviceFragmentDensityMapPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentDensityMapPropertiesEXT.html
   struct PhysicalDeviceFragmentDensityMapPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceFragmentDensityMapPropertiesEXT;
@@ -91940,15 +66103,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapPropertiesEXT( Extent2D minFragmentDensityTexelSize_ = {},
-                                                                        Extent2D maxFragmentDensityTexelSize_ = {},
-                                                                        Bool32   fragmentDensityInvocations_  = {},
-                                                                        void *   pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minFragmentDensityTexelSize{ minFragmentDensityTexelSize_ }
-      , maxFragmentDensityTexelSize{ maxFragmentDensityTexelSize_ }
-      , fragmentDensityInvocations{ fragmentDensityInvocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentDensityMapPropertiesEXT( VULKAN_HPP_NAMESPACE::Extent2D minFragmentDensityTexelSize_ = {},
+                                                                        VULKAN_HPP_NAMESPACE::Extent2D maxFragmentDensityTexelSize_ = {},
+                                                                        VULKAN_HPP_NAMESPACE::Bool32   fragmentDensityInvocations_  = {},
+                                                                        void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minFragmentDensityTexelSize( minFragmentDensityTexelSize_ )
+      , maxFragmentDensityTexelSize( maxFragmentDensityTexelSize_ )
+      , fragmentDensityInvocations( fragmentDensityInvocations_ )
     {
     }
 
@@ -91961,11 +66124,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentDensityMapPropertiesEXT & operator=( PhysicalDeviceFragmentDensityMapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentDensityMapPropertiesEXT & operator=( VkPhysicalDeviceFragmentDensityMapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentDensityMapPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentDensityMapPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -91979,18 +66142,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentDensityMapPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentDensityMapPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentDensityMapPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentDensityMapPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &, Extent2D const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minFragmentDensityTexelSize, maxFragmentDensityTexelSize, fragmentDensityInvocations );
     }
@@ -92016,29 +66178,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT;
-    void *        pNext                       = {};
-    Extent2D      minFragmentDensityTexelSize = {};
-    Extent2D      maxFragmentDensityTexelSize = {};
-    Bool32        fragmentDensityInvocations  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      minFragmentDensityTexelSize = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxFragmentDensityTexelSize = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentDensityInvocations  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentDensityMapPropertiesEXT>
-  {
-    using Type = PhysicalDeviceFragmentDensityMapPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT>
   {
     using Type = PhysicalDeviceFragmentDensityMapPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR.html
   struct PhysicalDeviceFragmentShaderBarycentricFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
@@ -92046,11 +66198,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShaderBarycentricFeaturesKHR( Bool32 fragmentShaderBarycentric_ = {},
-                                                                             void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentShaderBarycentric{ fragmentShaderBarycentric_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShaderBarycentricFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderBarycentric_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentShaderBarycentric( fragmentShaderBarycentric_ )
     {
     }
 
@@ -92064,15 +66216,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceFragmentShaderBarycentricFeaturesKHR &
       operator=( PhysicalDeviceFragmentShaderBarycentricFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShaderBarycentricFeaturesKHR & operator=( VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShaderBarycentricFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderBarycentricFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderBarycentricFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -92080,12 +66232,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderBarycentricFeaturesKHR &
-      setFragmentShaderBarycentric( Bool32 fragmentShaderBarycentric_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentShaderBarycentric( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderBarycentric_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentShaderBarycentric = fragmentShaderBarycentric_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -92097,18 +66249,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentShaderBarycentric );
     }
@@ -92133,19 +66280,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
-    void *        pNext                     = {};
-    Bool32        fragmentShaderBarycentric = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShaderBarycentric = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR>
-  {
-    using Type = PhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR>
   {
@@ -92154,8 +66293,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceFragmentShaderBarycentricFeaturesNV = PhysicalDeviceFragmentShaderBarycentricFeaturesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR.html
   struct PhysicalDeviceFragmentShaderBarycentricPropertiesKHR
   {
     using NativeType = VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
@@ -92163,11 +66300,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShaderBarycentricPropertiesKHR( Bool32 triStripVertexOrderIndependentOfProvokingVertex_ = {},
-                                                                               void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , triStripVertexOrderIndependentOfProvokingVertex{ triStripVertexOrderIndependentOfProvokingVertex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceFragmentShaderBarycentricPropertiesKHR( VULKAN_HPP_NAMESPACE::Bool32 triStripVertexOrderIndependentOfProvokingVertex_ = {},
+                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , triStripVertexOrderIndependentOfProvokingVertex( triStripVertexOrderIndependentOfProvokingVertex_ )
     {
     }
 
@@ -92181,11 +66319,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceFragmentShaderBarycentricPropertiesKHR &
       operator=( PhysicalDeviceFragmentShaderBarycentricPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShaderBarycentricPropertiesKHR & operator=( VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShaderBarycentricPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderBarycentricPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -92199,18 +66337,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, triStripVertexOrderIndependentOfProvokingVertex );
     }
@@ -92236,27 +66369,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                           = StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
-    void *        pNext                                           = {};
-    Bool32        triStripVertexOrderIndependentOfProvokingVertex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                           = StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
+    void *                              pNext                                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        triStripVertexOrderIndependentOfProvokingVertex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR>
-  {
-    using Type = PhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR>
   {
     using Type = PhysicalDeviceFragmentShaderBarycentricPropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT.html
   struct PhysicalDeviceFragmentShaderInterlockFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT;
@@ -92264,15 +66387,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShaderInterlockFeaturesEXT( Bool32 fragmentShaderSampleInterlock_      = {},
-                                                                           Bool32 fragmentShaderPixelInterlock_       = {},
-                                                                           Bool32 fragmentShaderShadingRateInterlock_ = {},
-                                                                           void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentShaderSampleInterlock{ fragmentShaderSampleInterlock_ }
-      , fragmentShaderPixelInterlock{ fragmentShaderPixelInterlock_ }
-      , fragmentShaderShadingRateInterlock{ fragmentShaderShadingRateInterlock_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShaderInterlockFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderSampleInterlock_      = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderPixelInterlock_       = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderShadingRateInterlock_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentShaderSampleInterlock( fragmentShaderSampleInterlock_ )
+      , fragmentShaderPixelInterlock( fragmentShaderPixelInterlock_ )
+      , fragmentShaderShadingRateInterlock( fragmentShaderShadingRateInterlock_ )
     {
     }
 
@@ -92285,15 +66408,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentShaderInterlockFeaturesEXT & operator=( PhysicalDeviceFragmentShaderInterlockFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShaderInterlockFeaturesEXT & operator=( VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShaderInterlockFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShaderInterlockFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderInterlockFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -92301,26 +66424,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderInterlockFeaturesEXT &
-      setFragmentShaderSampleInterlock( Bool32 fragmentShaderSampleInterlock_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentShaderSampleInterlock( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderSampleInterlock_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentShaderSampleInterlock = fragmentShaderSampleInterlock_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderInterlockFeaturesEXT &
-      setFragmentShaderPixelInterlock( Bool32 fragmentShaderPixelInterlock_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentShaderPixelInterlock( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderPixelInterlock_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentShaderPixelInterlock = fragmentShaderPixelInterlock_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShaderInterlockFeaturesEXT &
-      setFragmentShaderShadingRateInterlock( Bool32 fragmentShaderShadingRateInterlock_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentShaderShadingRateInterlock( VULKAN_HPP_NAMESPACE::Bool32 fragmentShaderShadingRateInterlock_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentShaderShadingRateInterlock = fragmentShaderShadingRateInterlock_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -92332,18 +66455,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentShaderSampleInterlock, fragmentShaderPixelInterlock, fragmentShaderShadingRateInterlock );
     }
@@ -92370,29 +66492,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT;
-    void *        pNext                              = {};
-    Bool32        fragmentShaderSampleInterlock      = {};
-    Bool32        fragmentShaderPixelInterlock       = {};
-    Bool32        fragmentShaderShadingRateInterlock = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShaderSampleInterlock      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShaderPixelInterlock       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShaderShadingRateInterlock = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT>
-  {
-    using Type = PhysicalDeviceFragmentShaderInterlockFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT>
   {
     using Type = PhysicalDeviceFragmentShaderInterlockFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV.html
   struct PhysicalDeviceFragmentShadingRateEnumsFeaturesNV
   {
     using NativeType = VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
@@ -92400,15 +66512,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateEnumsFeaturesNV( Bool32 fragmentShadingRateEnums_         = {},
-                                                                           Bool32 supersampleFragmentShadingRates_  = {},
-                                                                           Bool32 noInvocationFragmentShadingRates_ = {},
-                                                                           void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentShadingRateEnums{ fragmentShadingRateEnums_ }
-      , supersampleFragmentShadingRates{ supersampleFragmentShadingRates_ }
-      , noInvocationFragmentShadingRates{ noInvocationFragmentShadingRates_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateEnumsFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 fragmentShadingRateEnums_         = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 supersampleFragmentShadingRates_  = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 noInvocationFragmentShadingRates_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentShadingRateEnums( fragmentShadingRateEnums_ )
+      , supersampleFragmentShadingRates( supersampleFragmentShadingRates_ )
+      , noInvocationFragmentShadingRates( noInvocationFragmentShadingRates_ )
     {
     }
 
@@ -92421,15 +66533,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentShadingRateEnumsFeaturesNV & operator=( PhysicalDeviceFragmentShadingRateEnumsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShadingRateEnumsFeaturesNV & operator=( VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShadingRateEnumsFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateEnumsFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -92437,26 +66549,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsFeaturesNV &
-      setFragmentShadingRateEnums( Bool32 fragmentShadingRateEnums_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentShadingRateEnums( VULKAN_HPP_NAMESPACE::Bool32 fragmentShadingRateEnums_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentShadingRateEnums = fragmentShadingRateEnums_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsFeaturesNV &
-      setSupersampleFragmentShadingRates( Bool32 supersampleFragmentShadingRates_ ) VULKAN_HPP_NOEXCEPT
+      setSupersampleFragmentShadingRates( VULKAN_HPP_NAMESPACE::Bool32 supersampleFragmentShadingRates_ ) VULKAN_HPP_NOEXCEPT
     {
       supersampleFragmentShadingRates = supersampleFragmentShadingRates_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsFeaturesNV &
-      setNoInvocationFragmentShadingRates( Bool32 noInvocationFragmentShadingRates_ ) VULKAN_HPP_NOEXCEPT
+      setNoInvocationFragmentShadingRates( VULKAN_HPP_NAMESPACE::Bool32 noInvocationFragmentShadingRates_ ) VULKAN_HPP_NOEXCEPT
     {
       noInvocationFragmentShadingRates = noInvocationFragmentShadingRates_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -92468,18 +66580,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentShadingRateEnums, supersampleFragmentShadingRates, noInvocationFragmentShadingRates );
     }
@@ -92506,29 +66617,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
-    void *        pNext                            = {};
-    Bool32        fragmentShadingRateEnums         = {};
-    Bool32        supersampleFragmentShadingRates  = {};
-    Bool32        noInvocationFragmentShadingRates = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShadingRateEnums         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        supersampleFragmentShadingRates  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        noInvocationFragmentShadingRates = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV>
-  {
-    using Type = PhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV>
   {
     using Type = PhysicalDeviceFragmentShadingRateEnumsFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV.html
   struct PhysicalDeviceFragmentShadingRateEnumsPropertiesNV
   {
     using NativeType = VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
@@ -92536,12 +66637,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentShadingRateEnumsPropertiesNV( SampleCountFlagBits maxFragmentShadingRateInvocationCount_ = SampleCountFlagBits::e1,
-                                                          void *              pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxFragmentShadingRateInvocationCount{ maxFragmentShadingRateInvocationCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateEnumsPropertiesNV(
+      VULKAN_HPP_NAMESPACE::SampleCountFlagBits maxFragmentShadingRateInvocationCount_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+      void *                                    pNext_                                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxFragmentShadingRateInvocationCount( maxFragmentShadingRateInvocationCount_ )
     {
     }
 
@@ -92555,14 +66656,29 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceFragmentShadingRateEnumsPropertiesNV &
       operator=( PhysicalDeviceFragmentShadingRateEnumsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShadingRateEnumsPropertiesNV & operator=( VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShadingRateEnumsPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateEnumsPropertiesNV const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsPropertiesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateEnumsPropertiesNV &
+      setMaxFragmentShadingRateInvocationCount( VULKAN_HPP_NAMESPACE::SampleCountFlagBits maxFragmentShadingRateInvocationCount_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxFragmentShadingRateInvocationCount = maxFragmentShadingRateInvocationCount_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV *>( this );
@@ -92573,18 +66689,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SampleCountFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxFragmentShadingRateInvocationCount );
     }
@@ -92609,27 +66720,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                                 = StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
-    void *              pNext                                 = {};
-    SampleCountFlagBits maxFragmentShadingRateInvocationCount = SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::StructureType       sType                                 = StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
+    void *                                    pNext                                 = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits maxFragmentShadingRateInvocationCount = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV>
-  {
-    using Type = PhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV>
   {
     using Type = PhysicalDeviceFragmentShadingRateEnumsPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShadingRateFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShadingRateFeaturesKHR.html
   struct PhysicalDeviceFragmentShadingRateFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceFragmentShadingRateFeaturesKHR;
@@ -92637,15 +66738,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateFeaturesKHR( Bool32 pipelineFragmentShadingRate_   = {},
-                                                                       Bool32 primitiveFragmentShadingRate_  = {},
-                                                                       Bool32 attachmentFragmentShadingRate_ = {},
-                                                                       void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineFragmentShadingRate{ pipelineFragmentShadingRate_ }
-      , primitiveFragmentShadingRate{ primitiveFragmentShadingRate_ }
-      , attachmentFragmentShadingRate{ attachmentFragmentShadingRate_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 pipelineFragmentShadingRate_   = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 primitiveFragmentShadingRate_  = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 attachmentFragmentShadingRate_ = {},
+                                                                       void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineFragmentShadingRate( pipelineFragmentShadingRate_ )
+      , primitiveFragmentShadingRate( primitiveFragmentShadingRate_ )
+      , attachmentFragmentShadingRate( attachmentFragmentShadingRate_ )
     {
     }
 
@@ -92657,15 +66758,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentShadingRateFeaturesKHR & operator=( PhysicalDeviceFragmentShadingRateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShadingRateFeaturesKHR & operator=( VkPhysicalDeviceFragmentShadingRateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShadingRateFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -92673,26 +66774,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateFeaturesKHR &
-      setPipelineFragmentShadingRate( Bool32 pipelineFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
+      setPipelineFragmentShadingRate( VULKAN_HPP_NAMESPACE::Bool32 pipelineFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineFragmentShadingRate = pipelineFragmentShadingRate_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateFeaturesKHR &
-      setPrimitiveFragmentShadingRate( Bool32 primitiveFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitiveFragmentShadingRate( VULKAN_HPP_NAMESPACE::Bool32 primitiveFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveFragmentShadingRate = primitiveFragmentShadingRate_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFragmentShadingRateFeaturesKHR &
-      setAttachmentFragmentShadingRate( Bool32 attachmentFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
+      setAttachmentFragmentShadingRate( VULKAN_HPP_NAMESPACE::Bool32 attachmentFragmentShadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentFragmentShadingRate = attachmentFragmentShadingRate_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFragmentShadingRateFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -92704,18 +66805,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShadingRateFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShadingRateFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShadingRateFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShadingRateFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineFragmentShadingRate, primitiveFragmentShadingRate, attachmentFragmentShadingRate );
     }
@@ -92741,29 +66841,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR;
-    void *        pNext                         = {};
-    Bool32        pipelineFragmentShadingRate   = {};
-    Bool32        primitiveFragmentShadingRate  = {};
-    Bool32        attachmentFragmentShadingRate = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineFragmentShadingRate   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitiveFragmentShadingRate  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        attachmentFragmentShadingRate = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShadingRateFeaturesKHR>
-  {
-    using Type = PhysicalDeviceFragmentShadingRateFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR>
   {
     using Type = PhysicalDeviceFragmentShadingRateFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShadingRateKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShadingRateKHR.html
   struct PhysicalDeviceFragmentShadingRateKHR
   {
     using NativeType = VkPhysicalDeviceFragmentShadingRateKHR;
@@ -92771,12 +66861,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShadingRateKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentShadingRateKHR( SampleCountFlags sampleCounts_ = {}, Extent2D fragmentSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampleCounts{ sampleCounts_ }
-      , fragmentSize{ fragmentSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRateKHR( VULKAN_HPP_NAMESPACE::SampleCountFlags sampleCounts_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Extent2D         fragmentSize_ = {},
+                                                               void *                                 pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampleCounts( sampleCounts_ )
+      , fragmentSize( fragmentSize_ )
     {
     }
 
@@ -92788,11 +66879,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentShadingRateKHR & operator=( PhysicalDeviceFragmentShadingRateKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShadingRateKHR & operator=( VkPhysicalDeviceFragmentShadingRateKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShadingRateKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRateKHR const *>( &rhs );
       return *this;
     }
 
@@ -92806,18 +66897,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShadingRateKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShadingRateKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShadingRateKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SampleCountFlags const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SampleCountFlags const &, VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sampleCounts, fragmentSize );
     }
@@ -92842,28 +66929,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType        = StructureType::ePhysicalDeviceFragmentShadingRateKHR;
-    void *           pNext        = {};
-    SampleCountFlags sampleCounts = {};
-    Extent2D         fragmentSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType        = StructureType::ePhysicalDeviceFragmentShadingRateKHR;
+    void *                                 pNext        = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags sampleCounts = {};
+    VULKAN_HPP_NAMESPACE::Extent2D         fragmentSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShadingRateKHR>
-  {
-    using Type = PhysicalDeviceFragmentShadingRateKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShadingRateKHR>
   {
     using Type = PhysicalDeviceFragmentShadingRateKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFragmentShadingRatePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFragmentShadingRatePropertiesKHR.html
   struct PhysicalDeviceFragmentShadingRatePropertiesKHR
   {
     using NativeType = VkPhysicalDeviceFragmentShadingRatePropertiesKHR;
@@ -92871,44 +66948,44 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceFragmentShadingRatePropertiesKHR( Extent2D            minFragmentShadingRateAttachmentTexelSize_            = {},
-                                                      Extent2D            maxFragmentShadingRateAttachmentTexelSize_            = {},
-                                                      uint32_t            maxFragmentShadingRateAttachmentTexelSizeAspectRatio_ = {},
-                                                      Bool32              primitiveFragmentShadingRateWithMultipleViewports_    = {},
-                                                      Bool32              layeredShadingRateAttachments_                        = {},
-                                                      Bool32              fragmentShadingRateNonTrivialCombinerOps_             = {},
-                                                      Extent2D            maxFragmentSize_                                      = {},
-                                                      uint32_t            maxFragmentSizeAspectRatio_                           = {},
-                                                      uint32_t            maxFragmentShadingRateCoverageSamples_                = {},
-                                                      SampleCountFlagBits maxFragmentShadingRateRasterizationSamples_           = SampleCountFlagBits::e1,
-                                                      Bool32              fragmentShadingRateWithShaderDepthStencilWrites_      = {},
-                                                      Bool32              fragmentShadingRateWithSampleMask_                    = {},
-                                                      Bool32              fragmentShadingRateWithShaderSampleMask_              = {},
-                                                      Bool32              fragmentShadingRateWithConservativeRasterization_     = {},
-                                                      Bool32              fragmentShadingRateWithFragmentShaderInterlock_       = {},
-                                                      Bool32              fragmentShadingRateWithCustomSampleLocations_         = {},
-                                                      Bool32              fragmentShadingRateStrictMultiplyCombiner_            = {},
-                                                      void *              pNext_                                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minFragmentShadingRateAttachmentTexelSize{ minFragmentShadingRateAttachmentTexelSize_ }
-      , maxFragmentShadingRateAttachmentTexelSize{ maxFragmentShadingRateAttachmentTexelSize_ }
-      , maxFragmentShadingRateAttachmentTexelSizeAspectRatio{ maxFragmentShadingRateAttachmentTexelSizeAspectRatio_ }
-      , primitiveFragmentShadingRateWithMultipleViewports{ primitiveFragmentShadingRateWithMultipleViewports_ }
-      , layeredShadingRateAttachments{ layeredShadingRateAttachments_ }
-      , fragmentShadingRateNonTrivialCombinerOps{ fragmentShadingRateNonTrivialCombinerOps_ }
-      , maxFragmentSize{ maxFragmentSize_ }
-      , maxFragmentSizeAspectRatio{ maxFragmentSizeAspectRatio_ }
-      , maxFragmentShadingRateCoverageSamples{ maxFragmentShadingRateCoverageSamples_ }
-      , maxFragmentShadingRateRasterizationSamples{ maxFragmentShadingRateRasterizationSamples_ }
-      , fragmentShadingRateWithShaderDepthStencilWrites{ fragmentShadingRateWithShaderDepthStencilWrites_ }
-      , fragmentShadingRateWithSampleMask{ fragmentShadingRateWithSampleMask_ }
-      , fragmentShadingRateWithShaderSampleMask{ fragmentShadingRateWithShaderSampleMask_ }
-      , fragmentShadingRateWithConservativeRasterization{ fragmentShadingRateWithConservativeRasterization_ }
-      , fragmentShadingRateWithFragmentShaderInterlock{ fragmentShadingRateWithFragmentShaderInterlock_ }
-      , fragmentShadingRateWithCustomSampleLocations{ fragmentShadingRateWithCustomSampleLocations_ }
-      , fragmentShadingRateStrictMultiplyCombiner{ fragmentShadingRateStrictMultiplyCombiner_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFragmentShadingRatePropertiesKHR(
+      VULKAN_HPP_NAMESPACE::Extent2D            minFragmentShadingRateAttachmentTexelSize_            = {},
+      VULKAN_HPP_NAMESPACE::Extent2D            maxFragmentShadingRateAttachmentTexelSize_            = {},
+      uint32_t                                  maxFragmentShadingRateAttachmentTexelSizeAspectRatio_ = {},
+      VULKAN_HPP_NAMESPACE::Bool32              primitiveFragmentShadingRateWithMultipleViewports_    = {},
+      VULKAN_HPP_NAMESPACE::Bool32              layeredShadingRateAttachments_                        = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateNonTrivialCombinerOps_             = {},
+      VULKAN_HPP_NAMESPACE::Extent2D            maxFragmentSize_                                      = {},
+      uint32_t                                  maxFragmentSizeAspectRatio_                           = {},
+      uint32_t                                  maxFragmentShadingRateCoverageSamples_                = {},
+      VULKAN_HPP_NAMESPACE::SampleCountFlagBits maxFragmentShadingRateRasterizationSamples_           = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithShaderDepthStencilWrites_      = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithSampleMask_                    = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithShaderSampleMask_              = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithConservativeRasterization_     = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithFragmentShaderInterlock_       = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithCustomSampleLocations_         = {},
+      VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateStrictMultiplyCombiner_            = {},
+      void *                                    pNext_                                                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minFragmentShadingRateAttachmentTexelSize( minFragmentShadingRateAttachmentTexelSize_ )
+      , maxFragmentShadingRateAttachmentTexelSize( maxFragmentShadingRateAttachmentTexelSize_ )
+      , maxFragmentShadingRateAttachmentTexelSizeAspectRatio( maxFragmentShadingRateAttachmentTexelSizeAspectRatio_ )
+      , primitiveFragmentShadingRateWithMultipleViewports( primitiveFragmentShadingRateWithMultipleViewports_ )
+      , layeredShadingRateAttachments( layeredShadingRateAttachments_ )
+      , fragmentShadingRateNonTrivialCombinerOps( fragmentShadingRateNonTrivialCombinerOps_ )
+      , maxFragmentSize( maxFragmentSize_ )
+      , maxFragmentSizeAspectRatio( maxFragmentSizeAspectRatio_ )
+      , maxFragmentShadingRateCoverageSamples( maxFragmentShadingRateCoverageSamples_ )
+      , maxFragmentShadingRateRasterizationSamples( maxFragmentShadingRateRasterizationSamples_ )
+      , fragmentShadingRateWithShaderDepthStencilWrites( fragmentShadingRateWithShaderDepthStencilWrites_ )
+      , fragmentShadingRateWithSampleMask( fragmentShadingRateWithSampleMask_ )
+      , fragmentShadingRateWithShaderSampleMask( fragmentShadingRateWithShaderSampleMask_ )
+      , fragmentShadingRateWithConservativeRasterization( fragmentShadingRateWithConservativeRasterization_ )
+      , fragmentShadingRateWithFragmentShaderInterlock( fragmentShadingRateWithFragmentShaderInterlock_ )
+      , fragmentShadingRateWithCustomSampleLocations( fragmentShadingRateWithCustomSampleLocations_ )
+      , fragmentShadingRateStrictMultiplyCombiner( fragmentShadingRateStrictMultiplyCombiner_ )
     {
     }
 
@@ -92921,11 +66998,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFragmentShadingRatePropertiesKHR & operator=( PhysicalDeviceFragmentShadingRatePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFragmentShadingRatePropertiesKHR & operator=( VkPhysicalDeviceFragmentShadingRatePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFragmentShadingRatePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFragmentShadingRatePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -92939,36 +67016,30 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFragmentShadingRatePropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceFragmentShadingRatePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFragmentShadingRatePropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceFragmentShadingRatePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFragmentShadingRatePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Extent2D const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
                uint32_t const &,
-               SampleCountFlagBits const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -93028,43 +67099,33 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                                                = StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR;
-    void *              pNext                                                = {};
-    Extent2D            minFragmentShadingRateAttachmentTexelSize            = {};
-    Extent2D            maxFragmentShadingRateAttachmentTexelSize            = {};
-    uint32_t            maxFragmentShadingRateAttachmentTexelSizeAspectRatio = {};
-    Bool32              primitiveFragmentShadingRateWithMultipleViewports    = {};
-    Bool32              layeredShadingRateAttachments                        = {};
-    Bool32              fragmentShadingRateNonTrivialCombinerOps             = {};
-    Extent2D            maxFragmentSize                                      = {};
-    uint32_t            maxFragmentSizeAspectRatio                           = {};
-    uint32_t            maxFragmentShadingRateCoverageSamples                = {};
-    SampleCountFlagBits maxFragmentShadingRateRasterizationSamples           = SampleCountFlagBits::e1;
-    Bool32              fragmentShadingRateWithShaderDepthStencilWrites      = {};
-    Bool32              fragmentShadingRateWithSampleMask                    = {};
-    Bool32              fragmentShadingRateWithShaderSampleMask              = {};
-    Bool32              fragmentShadingRateWithConservativeRasterization     = {};
-    Bool32              fragmentShadingRateWithFragmentShaderInterlock       = {};
-    Bool32              fragmentShadingRateWithCustomSampleLocations         = {};
-    Bool32              fragmentShadingRateStrictMultiplyCombiner            = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType                                     = StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR;
+    void *                                    pNext                                     = {};
+    VULKAN_HPP_NAMESPACE::Extent2D            minFragmentShadingRateAttachmentTexelSize = {};
+    VULKAN_HPP_NAMESPACE::Extent2D            maxFragmentShadingRateAttachmentTexelSize = {};
+    uint32_t                                  maxFragmentShadingRateAttachmentTexelSizeAspectRatio = {};
+    VULKAN_HPP_NAMESPACE::Bool32              primitiveFragmentShadingRateWithMultipleViewports    = {};
+    VULKAN_HPP_NAMESPACE::Bool32              layeredShadingRateAttachments                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateNonTrivialCombinerOps             = {};
+    VULKAN_HPP_NAMESPACE::Extent2D            maxFragmentSize                                      = {};
+    uint32_t                                  maxFragmentSizeAspectRatio                           = {};
+    uint32_t                                  maxFragmentShadingRateCoverageSamples                = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits maxFragmentShadingRateRasterizationSamples           = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithShaderDepthStencilWrites      = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithSampleMask                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithShaderSampleMask              = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithConservativeRasterization     = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithFragmentShaderInterlock       = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateWithCustomSampleLocations         = {};
+    VULKAN_HPP_NAMESPACE::Bool32              fragmentShadingRateStrictMultiplyCombiner            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFragmentShadingRatePropertiesKHR>
-  {
-    using Type = PhysicalDeviceFragmentShadingRatePropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR>
   {
     using Type = PhysicalDeviceFragmentShadingRatePropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceFrameBoundaryFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceFrameBoundaryFeaturesEXT.html
   struct PhysicalDeviceFrameBoundaryFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceFrameBoundaryFeaturesEXT;
@@ -93072,10 +67133,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceFrameBoundaryFeaturesEXT( Bool32 frameBoundary_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , frameBoundary{ frameBoundary_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceFrameBoundaryFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 frameBoundary_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , frameBoundary( frameBoundary_ )
     {
     }
 
@@ -93087,27 +67148,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceFrameBoundaryFeaturesEXT & operator=( PhysicalDeviceFrameBoundaryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceFrameBoundaryFeaturesEXT & operator=( VkPhysicalDeviceFrameBoundaryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceFrameBoundaryFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceFrameBoundaryFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFrameBoundaryFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFrameBoundaryFeaturesEXT & setFrameBoundary( Bool32 frameBoundary_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceFrameBoundaryFeaturesEXT & setFrameBoundary( VULKAN_HPP_NAMESPACE::Bool32 frameBoundary_ ) VULKAN_HPP_NOEXCEPT
     {
       frameBoundary = frameBoundary_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceFrameBoundaryFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -93119,18 +67180,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceFrameBoundaryFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceFrameBoundaryFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceFrameBoundaryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceFrameBoundaryFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceFrameBoundaryFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, frameBoundary );
     }
@@ -93155,102 +67211,89 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT;
-    void *        pNext         = {};
-    Bool32        frameBoundary = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        frameBoundary = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceFrameBoundaryFeaturesEXT>
-  {
-    using Type = PhysicalDeviceFrameBoundaryFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT>
   {
     using Type = PhysicalDeviceFrameBoundaryFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceGlobalPriorityQueryFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceGlobalPriorityQueryFeatures.html
-  struct PhysicalDeviceGlobalPriorityQueryFeatures
+  struct PhysicalDeviceGlobalPriorityQueryFeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceGlobalPriorityQueryFeatures;
+    using NativeType = VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceGlobalPriorityQueryFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceGlobalPriorityQueryFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceGlobalPriorityQueryFeatures( Bool32 globalPriorityQuery_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , globalPriorityQuery{ globalPriorityQuery_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceGlobalPriorityQueryFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 globalPriorityQuery_ = {},
+                                                                       void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , globalPriorityQuery( globalPriorityQuery_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceGlobalPriorityQueryFeatures( PhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceGlobalPriorityQueryFeaturesKHR( PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceGlobalPriorityQueryFeatures( VkPhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceGlobalPriorityQueryFeatures( *reinterpret_cast<PhysicalDeviceGlobalPriorityQueryFeatures const *>( &rhs ) )
+    PhysicalDeviceGlobalPriorityQueryFeaturesKHR( VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceGlobalPriorityQueryFeaturesKHR( *reinterpret_cast<PhysicalDeviceGlobalPriorityQueryFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceGlobalPriorityQueryFeatures & operator=( PhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceGlobalPriorityQueryFeaturesKHR & operator=( PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceGlobalPriorityQueryFeatures & operator=( VkPhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceGlobalPriorityQueryFeaturesKHR & operator=( VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceGlobalPriorityQueryFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceGlobalPriorityQueryFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGlobalPriorityQueryFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGlobalPriorityQueryFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGlobalPriorityQueryFeatures & setGlobalPriorityQuery( Bool32 globalPriorityQuery_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGlobalPriorityQueryFeaturesKHR &
+      setGlobalPriorityQuery( VULKAN_HPP_NAMESPACE::Bool32 globalPriorityQuery_ ) VULKAN_HPP_NOEXCEPT
     {
       globalPriorityQuery = globalPriorityQuery_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceGlobalPriorityQueryFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceGlobalPriorityQueryFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceGlobalPriorityQueryFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceGlobalPriorityQueryFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceGlobalPriorityQueryFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceGlobalPriorityQueryFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceGlobalPriorityQueryFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceGlobalPriorityQueryFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, globalPriorityQuery );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceGlobalPriorityQueryFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -93259,37 +67302,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceGlobalPriorityQueryFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceGlobalPriorityQueryFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceGlobalPriorityQueryFeatures;
-    void *        pNext               = {};
-    Bool32        globalPriorityQuery = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceGlobalPriorityQueryFeaturesKHR;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        globalPriorityQuery = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceGlobalPriorityQueryFeatures>
-  {
-    using Type = PhysicalDeviceGlobalPriorityQueryFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceGlobalPriorityQueryFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceGlobalPriorityQueryFeaturesKHR>
   {
-    using Type = PhysicalDeviceGlobalPriorityQueryFeatures;
+    using Type = PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
   };
 
-  using PhysicalDeviceGlobalPriorityQueryFeaturesEXT = PhysicalDeviceGlobalPriorityQueryFeatures;
-  using PhysicalDeviceGlobalPriorityQueryFeaturesKHR = PhysicalDeviceGlobalPriorityQueryFeatures;
+  using PhysicalDeviceGlobalPriorityQueryFeaturesEXT = PhysicalDeviceGlobalPriorityQueryFeaturesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT.html
   struct PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
@@ -93297,10 +67329,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT( Bool32 graphicsPipelineLibrary_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , graphicsPipelineLibrary{ graphicsPipelineLibrary_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibrary_ = {},
+                                                                           void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , graphicsPipelineLibrary( graphicsPipelineLibrary_ )
     {
     }
 
@@ -93313,27 +67346,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT & operator=( PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT & operator=( VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT & setGraphicsPipelineLibrary( Bool32 graphicsPipelineLibrary_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT &
+      setGraphicsPipelineLibrary( VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibrary_ ) VULKAN_HPP_NOEXCEPT
     {
       graphicsPipelineLibrary = graphicsPipelineLibrary_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -93345,18 +67379,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, graphicsPipelineLibrary );
     }
@@ -93381,27 +67410,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
-    void *        pNext                   = {};
-    Bool32        graphicsPipelineLibrary = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        graphicsPipelineLibrary = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT>
-  {
-    using Type = PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT>
   {
     using Type = PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT.html
   struct PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
@@ -93409,13 +67428,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT( Bool32 graphicsPipelineLibraryFastLinking_                        = {},
-                                                                             Bool32 graphicsPipelineLibraryIndependentInterpolationDecoration_ = {},
-                                                                             void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , graphicsPipelineLibraryFastLinking{ graphicsPipelineLibraryFastLinking_ }
-      , graphicsPipelineLibraryIndependentInterpolationDecoration{ graphicsPipelineLibraryIndependentInterpolationDecoration_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibraryFastLinking_                        = {},
+                                                          VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibraryIndependentInterpolationDecoration_ = {},
+                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , graphicsPipelineLibraryFastLinking( graphicsPipelineLibraryFastLinking_ )
+      , graphicsPipelineLibraryIndependentInterpolationDecoration( graphicsPipelineLibraryIndependentInterpolationDecoration_ )
     {
     }
 
@@ -93429,14 +67449,36 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT &
       operator=( PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT & operator=( VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT &
+      setGraphicsPipelineLibraryFastLinking( VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibraryFastLinking_ ) VULKAN_HPP_NOEXCEPT
+    {
+      graphicsPipelineLibraryFastLinking = graphicsPipelineLibraryFastLinking_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT & setGraphicsPipelineLibraryIndependentInterpolationDecoration(
+      VULKAN_HPP_NAMESPACE::Bool32 graphicsPipelineLibraryIndependentInterpolationDecoration_ ) VULKAN_HPP_NOEXCEPT
+    {
+      graphicsPipelineLibraryIndependentInterpolationDecoration = graphicsPipelineLibraryIndependentInterpolationDecoration_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT *>( this );
@@ -93447,18 +67489,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, graphicsPipelineLibraryFastLinking, graphicsPipelineLibraryIndependentInterpolationDecoration );
     }
@@ -93484,28 +67521,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                     = StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
-    void *        pNext                                                     = {};
-    Bool32        graphicsPipelineLibraryFastLinking                        = {};
-    Bool32        graphicsPipelineLibraryIndependentInterpolationDecoration = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        graphicsPipelineLibraryFastLinking = {};
+    VULKAN_HPP_NAMESPACE::Bool32        graphicsPipelineLibraryIndependentInterpolationDecoration = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT>
-  {
-    using Type = PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT>
   {
     using Type = PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceGroupProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceGroupProperties.html
   struct PhysicalDeviceGroupProperties
   {
     using NativeType = VkPhysicalDeviceGroupProperties;
@@ -93513,15 +67540,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceGroupProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceGroupProperties( uint32_t                                                     physicalDeviceCount_ = {},
-                                                           std::array<PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> const & physicalDevices_     = {},
-                                                           Bool32                                                       subsetAllocation_    = {},
-                                                           void *                                                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , physicalDeviceCount{ physicalDeviceCount_ }
-      , physicalDevices{ physicalDevices_ }
-      , subsetAllocation{ subsetAllocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      PhysicalDeviceGroupProperties( uint32_t                                                                           physicalDeviceCount_ = {},
+                                     std::array<VULKAN_HPP_NAMESPACE::PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> const & physicalDevices_     = {},
+                                     VULKAN_HPP_NAMESPACE::Bool32                                                       subsetAllocation_    = {},
+                                     void *                                                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , physicalDeviceCount( physicalDeviceCount_ )
+      , physicalDevices( physicalDevices_ )
+      , subsetAllocation( subsetAllocation_ )
     {
     }
 
@@ -93532,12 +67560,25 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceGroupProperties( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::PhysicalDevice> const & physicalDevices_,
+                                   VULKAN_HPP_NAMESPACE::Bool32                                                   subsetAllocation_ = {},
+                                   void *                                                                         pNext_            = nullptr )
+      : pNext( pNext_ )
+      , physicalDeviceCount( std::min( static_cast<uint32_t>( physicalDevices_.size() ), VK_MAX_DEVICE_GROUP_SIZE ) )
+      , subsetAllocation( subsetAllocation_ )
+    {
+      VULKAN_HPP_ASSERT( physicalDevices_.size() < VK_MAX_DEVICE_GROUP_SIZE );
+      memcpy( physicalDevices, physicalDevices_.data(), physicalDeviceCount * sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice ) );
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PhysicalDeviceGroupProperties & operator=( PhysicalDeviceGroupProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceGroupProperties & operator=( VkPhysicalDeviceGroupProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceGroupProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceGroupProperties const *>( &rhs );
       return *this;
     }
 
@@ -93551,18 +67592,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceGroupProperties *>( this );
     }
 
-    operator VkPhysicalDeviceGroupProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceGroupProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceGroupProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceGroupProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, ArrayWrapper1D<PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, physicalDeviceCount, physicalDevices, subsetAllocation );
@@ -93593,7 +67632,7 @@ namespace VULKAN_HPP_NAMESPACE
     bool operator==( PhysicalDeviceGroupProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( physicalDeviceCount == rhs.physicalDeviceCount ) &&
-             ( memcmp( physicalDevices, rhs.physicalDevices, physicalDeviceCount * sizeof( PhysicalDevice ) ) == 0 ) &&
+             ( memcmp( physicalDevices, rhs.physicalDevices, physicalDeviceCount * sizeof( VULKAN_HPP_NAMESPACE::PhysicalDevice ) ) == 0 ) &&
              ( subsetAllocation == rhs.subsetAllocation );
     }
 
@@ -93603,21 +67642,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                            sType               = StructureType::ePhysicalDeviceGroupProperties;
-    void *                                                   pNext               = {};
-    uint32_t                                                 physicalDeviceCount = {};
-    ArrayWrapper1D<PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> physicalDevices     = {};
-    Bool32                                                   subsetAllocation    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                                                  sType = StructureType::ePhysicalDeviceGroupProperties;
+    void *                                                                                               pNext = {};
+    uint32_t                                                                                             physicalDeviceCount = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::PhysicalDevice, VK_MAX_DEVICE_GROUP_SIZE> physicalDevices     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                                                         subsetAllocation    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceGroupProperties>
-  {
-    using Type = PhysicalDeviceGroupProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceGroupProperties>
   {
@@ -93626,194 +67657,76 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceGroupPropertiesKHR = PhysicalDeviceGroupProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceHdrVividFeaturesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceHdrVividFeaturesHUAWEI.html
-  struct PhysicalDeviceHdrVividFeaturesHUAWEI
+  struct PhysicalDeviceHostImageCopyFeaturesEXT
   {
-    using NativeType = VkPhysicalDeviceHdrVividFeaturesHUAWEI;
+    using NativeType = VkPhysicalDeviceHostImageCopyFeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHdrVividFeaturesHUAWEI;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHostImageCopyFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceHdrVividFeaturesHUAWEI( Bool32 hdrVivid_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hdrVivid{ hdrVivid_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostImageCopyFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 hostImageCopy_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hostImageCopy( hostImageCopy_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceHdrVividFeaturesHUAWEI( PhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostImageCopyFeaturesEXT( PhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceHdrVividFeaturesHUAWEI( VkPhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceHdrVividFeaturesHUAWEI( *reinterpret_cast<PhysicalDeviceHdrVividFeaturesHUAWEI const *>( &rhs ) )
+    PhysicalDeviceHostImageCopyFeaturesEXT( VkPhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceHostImageCopyFeaturesEXT( *reinterpret_cast<PhysicalDeviceHostImageCopyFeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceHdrVividFeaturesHUAWEI & operator=( PhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceHostImageCopyFeaturesEXT & operator=( PhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceHdrVividFeaturesHUAWEI & operator=( VkPhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceHostImageCopyFeaturesEXT & operator=( VkPhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceHdrVividFeaturesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHdrVividFeaturesHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHdrVividFeaturesHUAWEI & setHdrVivid( Bool32 hdrVivid_ ) VULKAN_HPP_NOEXCEPT
-    {
-      hdrVivid = hdrVivid_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceHdrVividFeaturesHUAWEI const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceHdrVividFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceHdrVividFeaturesHUAWEI &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceHdrVividFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceHdrVividFeaturesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceHdrVividFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceHdrVividFeaturesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceHdrVividFeaturesHUAWEI *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, hdrVivid );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceHdrVividFeaturesHUAWEI const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( hdrVivid == rhs.hdrVivid );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceHdrVividFeaturesHUAWEI const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType    = StructureType::ePhysicalDeviceHdrVividFeaturesHUAWEI;
-    void *        pNext    = {};
-    Bool32        hdrVivid = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceHdrVividFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceHdrVividFeaturesHUAWEI;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceHdrVividFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceHdrVividFeaturesHUAWEI;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceHostImageCopyFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceHostImageCopyFeatures.html
-  struct PhysicalDeviceHostImageCopyFeatures
-  {
-    using NativeType = VkPhysicalDeviceHostImageCopyFeatures;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHostImageCopyFeatures;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostImageCopyFeatures( Bool32 hostImageCopy_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hostImageCopy{ hostImageCopy_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostImageCopyFeatures( PhysicalDeviceHostImageCopyFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceHostImageCopyFeatures( VkPhysicalDeviceHostImageCopyFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceHostImageCopyFeatures( *reinterpret_cast<PhysicalDeviceHostImageCopyFeatures const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceHostImageCopyFeatures & operator=( PhysicalDeviceHostImageCopyFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceHostImageCopyFeatures & operator=( VkPhysicalDeviceHostImageCopyFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceHostImageCopyFeatures const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyFeatures & setHostImageCopy( Bool32 hostImageCopy_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyFeaturesEXT & setHostImageCopy( VULKAN_HPP_NAMESPACE::Bool32 hostImageCopy_ ) VULKAN_HPP_NOEXCEPT
     {
       hostImageCopy = hostImageCopy_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceHostImageCopyFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceHostImageCopyFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceHostImageCopyFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceHostImageCopyFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceHostImageCopyFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceHostImageCopyFeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceHostImageCopyFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceHostImageCopyFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceHostImageCopyFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceHostImageCopyFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceHostImageCopyFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceHostImageCopyFeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hostImageCopy );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceHostImageCopyFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceHostImageCopyFeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceHostImageCopyFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -93822,74 +67735,62 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceHostImageCopyFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceHostImageCopyFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType         = StructureType::ePhysicalDeviceHostImageCopyFeatures;
-    void *        pNext         = {};
-    Bool32        hostImageCopy = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceHostImageCopyFeaturesEXT;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hostImageCopy = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceHostImageCopyFeatures>
-  {
-    using Type = PhysicalDeviceHostImageCopyFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceHostImageCopyFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceHostImageCopyFeaturesEXT>
   {
-    using Type = PhysicalDeviceHostImageCopyFeatures;
+    using Type = PhysicalDeviceHostImageCopyFeaturesEXT;
   };
 
-  using PhysicalDeviceHostImageCopyFeaturesEXT = PhysicalDeviceHostImageCopyFeatures;
-
-  // wrapper struct for struct VkPhysicalDeviceHostImageCopyProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceHostImageCopyProperties.html
-  struct PhysicalDeviceHostImageCopyProperties
+  struct PhysicalDeviceHostImageCopyPropertiesEXT
   {
-    using NativeType = VkPhysicalDeviceHostImageCopyProperties;
+    using NativeType = VkPhysicalDeviceHostImageCopyPropertiesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHostImageCopyProperties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHostImageCopyPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties( uint32_t                                  copySrcLayoutCount_              = {},
-                                                                   ImageLayout *                             pCopySrcLayouts_                 = {},
-                                                                   uint32_t                                  copyDstLayoutCount_              = {},
-                                                                   ImageLayout *                             pCopyDstLayouts_                 = {},
-                                                                   std::array<uint8_t, VK_UUID_SIZE> const & optimalTilingLayoutUUID_         = {},
-                                                                   Bool32                                    identicalMemoryTypeRequirements_ = {},
-                                                                   void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , copySrcLayoutCount{ copySrcLayoutCount_ }
-      , pCopySrcLayouts{ pCopySrcLayouts_ }
-      , copyDstLayoutCount{ copyDstLayoutCount_ }
-      , pCopyDstLayouts{ pCopyDstLayouts_ }
-      , optimalTilingLayoutUUID{ optimalTilingLayoutUUID_ }
-      , identicalMemoryTypeRequirements{ identicalMemoryTypeRequirements_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT( uint32_t                                  copySrcLayoutCount_              = {},
+                                                                      VULKAN_HPP_NAMESPACE::ImageLayout *       pCopySrcLayouts_                 = {},
+                                                                      uint32_t                                  copyDstLayoutCount_              = {},
+                                                                      VULKAN_HPP_NAMESPACE::ImageLayout *       pCopyDstLayouts_                 = {},
+                                                                      std::array<uint8_t, VK_UUID_SIZE> const & optimalTilingLayoutUUID_         = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32              identicalMemoryTypeRequirements_ = {},
+                                                                      void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , copySrcLayoutCount( copySrcLayoutCount_ )
+      , pCopySrcLayouts( pCopySrcLayouts_ )
+      , copyDstLayoutCount( copyDstLayoutCount_ )
+      , pCopyDstLayouts( pCopyDstLayouts_ )
+      , optimalTilingLayoutUUID( optimalTilingLayoutUUID_ )
+      , identicalMemoryTypeRequirements( identicalMemoryTypeRequirements_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties( PhysicalDeviceHostImageCopyProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT( PhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceHostImageCopyProperties( VkPhysicalDeviceHostImageCopyProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceHostImageCopyProperties( *reinterpret_cast<PhysicalDeviceHostImageCopyProperties const *>( &rhs ) )
+    PhysicalDeviceHostImageCopyPropertiesEXT( VkPhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceHostImageCopyPropertiesEXT( *reinterpret_cast<PhysicalDeviceHostImageCopyPropertiesEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceHostImageCopyProperties( ArrayProxyNoTemporaries<ImageLayout> const & copySrcLayouts_,
-                                           ArrayProxyNoTemporaries<ImageLayout> const & copyDstLayouts_                  = {},
-                                           std::array<uint8_t, VK_UUID_SIZE> const &    optimalTilingLayoutUUID_         = {},
-                                           Bool32                                       identicalMemoryTypeRequirements_ = {},
-                                           void *                                       pNext_                           = nullptr )
+    PhysicalDeviceHostImageCopyPropertiesEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageLayout> const & copySrcLayouts_,
+                                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageLayout> const & copyDstLayouts_ = {},
+                                              std::array<uint8_t, VK_UUID_SIZE> const & optimalTilingLayoutUUID_                                       = {},
+                                              VULKAN_HPP_NAMESPACE::Bool32              identicalMemoryTypeRequirements_                               = {},
+                                              void *                                    pNext_ = nullptr )
       : pNext( pNext_ )
       , copySrcLayoutCount( static_cast<uint32_t>( copySrcLayouts_.size() ) )
       , pCopySrcLayouts( copySrcLayouts_.data() )
@@ -93901,36 +67802,38 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    PhysicalDeviceHostImageCopyProperties & operator=( PhysicalDeviceHostImageCopyProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceHostImageCopyPropertiesEXT & operator=( PhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceHostImageCopyProperties & operator=( VkPhysicalDeviceHostImageCopyProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceHostImageCopyPropertiesEXT & operator=( VkPhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceHostImageCopyProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostImageCopyPropertiesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties & setCopySrcLayoutCount( uint32_t copySrcLayoutCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT & setCopySrcLayoutCount( uint32_t copySrcLayoutCount_ ) VULKAN_HPP_NOEXCEPT
     {
       copySrcLayoutCount = copySrcLayoutCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties & setPCopySrcLayouts( ImageLayout * pCopySrcLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT &
+      setPCopySrcLayouts( VULKAN_HPP_NAMESPACE::ImageLayout * pCopySrcLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pCopySrcLayouts = pCopySrcLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceHostImageCopyProperties & setCopySrcLayouts( ArrayProxyNoTemporaries<ImageLayout> const & copySrcLayouts_ ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceHostImageCopyPropertiesEXT &
+      setCopySrcLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageLayout> const & copySrcLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       copySrcLayoutCount = static_cast<uint32_t>( copySrcLayouts_.size() );
       pCopySrcLayouts    = copySrcLayouts_.data();
@@ -93938,20 +67841,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties & setCopyDstLayoutCount( uint32_t copyDstLayoutCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT & setCopyDstLayoutCount( uint32_t copyDstLayoutCount_ ) VULKAN_HPP_NOEXCEPT
     {
       copyDstLayoutCount = copyDstLayoutCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties & setPCopyDstLayouts( ImageLayout * pCopyDstLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT &
+      setPCopyDstLayouts( VULKAN_HPP_NAMESPACE::ImageLayout * pCopyDstLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pCopyDstLayouts = pCopyDstLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceHostImageCopyProperties & setCopyDstLayouts( ArrayProxyNoTemporaries<ImageLayout> const & copyDstLayouts_ ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceHostImageCopyPropertiesEXT &
+      setCopyDstLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::ImageLayout> const & copyDstLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       copyDstLayoutCount = static_cast<uint32_t>( copyDstLayouts_.size() );
       pCopyDstLayouts    = copyDstLayouts_.data();
@@ -93959,50 +67864,44 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties &
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT &
       setOptimalTilingLayoutUUID( std::array<uint8_t, VK_UUID_SIZE> optimalTilingLayoutUUID_ ) VULKAN_HPP_NOEXCEPT
     {
       optimalTilingLayoutUUID = optimalTilingLayoutUUID_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyProperties &
-      setIdenticalMemoryTypeRequirements( Bool32 identicalMemoryTypeRequirements_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostImageCopyPropertiesEXT &
+      setIdenticalMemoryTypeRequirements( VULKAN_HPP_NAMESPACE::Bool32 identicalMemoryTypeRequirements_ ) VULKAN_HPP_NOEXCEPT
     {
       identicalMemoryTypeRequirements = identicalMemoryTypeRequirements_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceHostImageCopyProperties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceHostImageCopyPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceHostImageCopyProperties *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceHostImageCopyPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceHostImageCopyProperties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceHostImageCopyPropertiesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceHostImageCopyProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceHostImageCopyProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceHostImageCopyProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceHostImageCopyProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceHostImageCopyProperties *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceHostImageCopyPropertiesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
-               ImageLayout * const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout * const &,
                uint32_t const &,
-               ImageLayout * const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::ImageLayout * const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -94011,9 +67910,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceHostImageCopyProperties const & ) const = default;
+    auto operator<=>( PhysicalDeviceHostImageCopyPropertiesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceHostImageCopyProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -94024,41 +67923,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceHostImageCopyProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceHostImageCopyPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                         sType                           = StructureType::ePhysicalDeviceHostImageCopyProperties;
-    void *                                pNext                           = {};
-    uint32_t                              copySrcLayoutCount              = {};
-    ImageLayout *                         pCopySrcLayouts                 = {};
-    uint32_t                              copyDstLayoutCount              = {};
-    ImageLayout *                         pCopyDstLayouts                 = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> optimalTilingLayoutUUID         = {};
-    Bool32                                identicalMemoryTypeRequirements = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType                           = StructureType::ePhysicalDeviceHostImageCopyPropertiesEXT;
+    void *                                                      pNext                           = {};
+    uint32_t                                                    copySrcLayoutCount              = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout *                         pCopySrcLayouts                 = {};
+    uint32_t                                                    copyDstLayoutCount              = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout *                         pCopyDstLayouts                 = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> optimalTilingLayoutUUID         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                identicalMemoryTypeRequirements = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceHostImageCopyProperties>
-  {
-    using Type = PhysicalDeviceHostImageCopyProperties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceHostImageCopyProperties>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceHostImageCopyPropertiesEXT>
   {
-    using Type = PhysicalDeviceHostImageCopyProperties;
+    using Type = PhysicalDeviceHostImageCopyPropertiesEXT;
   };
 
-  using PhysicalDeviceHostImageCopyPropertiesEXT = PhysicalDeviceHostImageCopyProperties;
-
-  // wrapper struct for struct VkPhysicalDeviceHostQueryResetFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceHostQueryResetFeatures.html
   struct PhysicalDeviceHostQueryResetFeatures
   {
     using NativeType = VkPhysicalDeviceHostQueryResetFeatures;
@@ -94066,10 +67953,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceHostQueryResetFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostQueryResetFeatures( Bool32 hostQueryReset_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hostQueryReset{ hostQueryReset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceHostQueryResetFeatures( VULKAN_HPP_NAMESPACE::Bool32 hostQueryReset_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hostQueryReset( hostQueryReset_ )
     {
     }
 
@@ -94081,27 +67968,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceHostQueryResetFeatures & operator=( PhysicalDeviceHostQueryResetFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceHostQueryResetFeatures & operator=( VkPhysicalDeviceHostQueryResetFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceHostQueryResetFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceHostQueryResetFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostQueryResetFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostQueryResetFeatures & setHostQueryReset( Bool32 hostQueryReset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceHostQueryResetFeatures & setHostQueryReset( VULKAN_HPP_NAMESPACE::Bool32 hostQueryReset_ ) VULKAN_HPP_NOEXCEPT
     {
       hostQueryReset = hostQueryReset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceHostQueryResetFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -94113,18 +68000,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceHostQueryResetFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceHostQueryResetFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceHostQueryResetFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceHostQueryResetFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceHostQueryResetFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hostQueryReset );
     }
@@ -94149,19 +68031,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceHostQueryResetFeatures;
-    void *        pNext          = {};
-    Bool32        hostQueryReset = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceHostQueryResetFeatures;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hostQueryReset = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceHostQueryResetFeatures>
-  {
-    using Type = PhysicalDeviceHostQueryResetFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceHostQueryResetFeatures>
   {
@@ -94170,7 +68044,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceHostQueryResetFeaturesEXT = PhysicalDeviceHostQueryResetFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceIDProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceIDProperties.html
   struct PhysicalDeviceIDProperties
   {
     using NativeType = VkPhysicalDeviceIDProperties;
@@ -94178,19 +68051,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceIdProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceIDProperties( std::array<uint8_t, VK_UUID_SIZE> const & deviceUUID_      = {},
                                                         std::array<uint8_t, VK_UUID_SIZE> const & driverUUID_      = {},
                                                         std::array<uint8_t, VK_LUID_SIZE> const & deviceLUID_      = {},
                                                         uint32_t                                  deviceNodeMask_  = {},
-                                                        Bool32                                    deviceLUIDValid_ = {},
+                                                        VULKAN_HPP_NAMESPACE::Bool32              deviceLUIDValid_ = {},
                                                         void *                                    pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceUUID{ deviceUUID_ }
-      , driverUUID{ driverUUID_ }
-      , deviceLUID{ deviceLUID_ }
-      , deviceNodeMask{ deviceNodeMask_ }
-      , deviceLUIDValid{ deviceLUIDValid_ }
+      : pNext( pNext_ )
+      , deviceUUID( deviceUUID_ )
+      , driverUUID( driverUUID_ )
+      , deviceLUID( deviceLUID_ )
+      , deviceNodeMask( deviceNodeMask_ )
+      , deviceLUIDValid( deviceLUIDValid_ )
     {
     }
 
@@ -94202,11 +68075,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceIDProperties & operator=( PhysicalDeviceIDProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceIDProperties & operator=( VkPhysicalDeviceIDProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceIDProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceIDProperties const *>( &rhs );
       return *this;
     }
 
@@ -94220,24 +68093,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceIDProperties *>( this );
     }
 
-    operator VkPhysicalDeviceIDProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceIDProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceIDProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceIDProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               ArrayWrapper1D<uint8_t, VK_LUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_LUID_SIZE> const &,
                uint32_t const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, deviceUUID, driverUUID, deviceLUID, deviceNodeMask, deviceLUIDValid );
@@ -94264,23 +68131,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType           = StructureType::ePhysicalDeviceIdProperties;
-    void *                                pNext           = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> deviceUUID      = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> driverUUID      = {};
-    ArrayWrapper1D<uint8_t, VK_LUID_SIZE> deviceLUID      = {};
-    uint32_t                              deviceNodeMask  = {};
-    Bool32                                deviceLUIDValid = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType           = StructureType::ePhysicalDeviceIdProperties;
+    void *                                                      pNext           = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> deviceUUID      = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> driverUUID      = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_LUID_SIZE> deviceLUID      = {};
+    uint32_t                                                    deviceNodeMask  = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                deviceLUIDValid = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceIDProperties>
-  {
-    using Type = PhysicalDeviceIDProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceIdProperties>
   {
@@ -94289,8 +68148,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceIDPropertiesKHR = PhysicalDeviceIDProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceImage2DViewOf3DFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImage2DViewOf3DFeaturesEXT.html
   struct PhysicalDeviceImage2DViewOf3DFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceImage2DViewOf3DFeaturesEXT;
@@ -94298,12 +68155,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceImage2DViewOf3DFeaturesEXT( Bool32 image2DViewOf3D_ = {}, Bool32 sampler2DViewOf3D_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image2DViewOf3D{ image2DViewOf3D_ }
-      , sampler2DViewOf3D{ sampler2DViewOf3D_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImage2DViewOf3DFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 image2DViewOf3D_   = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 sampler2DViewOf3D_ = {},
+                                                                   void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , image2DViewOf3D( image2DViewOf3D_ )
+      , sampler2DViewOf3D( sampler2DViewOf3D_ )
     {
     }
 
@@ -94315,33 +68173,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImage2DViewOf3DFeaturesEXT & operator=( PhysicalDeviceImage2DViewOf3DFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImage2DViewOf3DFeaturesEXT & operator=( VkPhysicalDeviceImage2DViewOf3DFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImage2DViewOf3DFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImage2DViewOf3DFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImage2DViewOf3DFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImage2DViewOf3DFeaturesEXT & setImage2DViewOf3D( Bool32 image2DViewOf3D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImage2DViewOf3DFeaturesEXT & setImage2DViewOf3D( VULKAN_HPP_NAMESPACE::Bool32 image2DViewOf3D_ ) VULKAN_HPP_NOEXCEPT
     {
       image2DViewOf3D = image2DViewOf3D_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImage2DViewOf3DFeaturesEXT & setSampler2DViewOf3D( Bool32 sampler2DViewOf3D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImage2DViewOf3DFeaturesEXT &
+      setSampler2DViewOf3D( VULKAN_HPP_NAMESPACE::Bool32 sampler2DViewOf3D_ ) VULKAN_HPP_NOEXCEPT
     {
       sampler2DViewOf3D = sampler2DViewOf3D_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImage2DViewOf3DFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -94353,18 +68212,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImage2DViewOf3DFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, image2DViewOf3D, sampler2DViewOf3D );
     }
@@ -94389,240 +68243,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT;
-    void *        pNext             = {};
-    Bool32        image2DViewOf3D   = {};
-    Bool32        sampler2DViewOf3D = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        image2DViewOf3D   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        sampler2DViewOf3D = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImage2DViewOf3DFeaturesEXT>
-  {
-    using Type = PhysicalDeviceImage2DViewOf3DFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT>
   {
     using Type = PhysicalDeviceImage2DViewOf3DFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageAlignmentControlFeaturesMESA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageAlignmentControlFeaturesMESA.html
-  struct PhysicalDeviceImageAlignmentControlFeaturesMESA
-  {
-    using NativeType = VkPhysicalDeviceImageAlignmentControlFeaturesMESA;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageAlignmentControlFeaturesMESA;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageAlignmentControlFeaturesMESA( Bool32 imageAlignmentControl_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageAlignmentControl{ imageAlignmentControl_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceImageAlignmentControlFeaturesMESA( PhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceImageAlignmentControlFeaturesMESA( VkPhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceImageAlignmentControlFeaturesMESA( *reinterpret_cast<PhysicalDeviceImageAlignmentControlFeaturesMESA const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceImageAlignmentControlFeaturesMESA & operator=( PhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceImageAlignmentControlFeaturesMESA & operator=( VkPhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceImageAlignmentControlFeaturesMESA const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageAlignmentControlFeaturesMESA & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageAlignmentControlFeaturesMESA & setImageAlignmentControl( Bool32 imageAlignmentControl_ ) VULKAN_HPP_NOEXCEPT
-    {
-      imageAlignmentControl = imageAlignmentControl_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceImageAlignmentControlFeaturesMESA const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlFeaturesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlFeaturesMESA &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceImageAlignmentControlFeaturesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlFeaturesMESA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlFeaturesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlFeaturesMESA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageAlignmentControlFeaturesMESA *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, imageAlignmentControl );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceImageAlignmentControlFeaturesMESA const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( imageAlignmentControl == rhs.imageAlignmentControl );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceImageAlignmentControlFeaturesMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                 = StructureType::ePhysicalDeviceImageAlignmentControlFeaturesMESA;
-    void *        pNext                 = {};
-    Bool32        imageAlignmentControl = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageAlignmentControlFeaturesMESA>
-  {
-    using Type = PhysicalDeviceImageAlignmentControlFeaturesMESA;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceImageAlignmentControlFeaturesMESA>
-  {
-    using Type = PhysicalDeviceImageAlignmentControlFeaturesMESA;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceImageAlignmentControlPropertiesMESA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageAlignmentControlPropertiesMESA.html
-  struct PhysicalDeviceImageAlignmentControlPropertiesMESA
-  {
-    using NativeType = VkPhysicalDeviceImageAlignmentControlPropertiesMESA;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageAlignmentControlPropertiesMESA;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageAlignmentControlPropertiesMESA( uint32_t supportedImageAlignmentMask_ = {},
-                                                                            void *   pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportedImageAlignmentMask{ supportedImageAlignmentMask_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceImageAlignmentControlPropertiesMESA( PhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceImageAlignmentControlPropertiesMESA( VkPhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceImageAlignmentControlPropertiesMESA( *reinterpret_cast<PhysicalDeviceImageAlignmentControlPropertiesMESA const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceImageAlignmentControlPropertiesMESA &
-      operator=( PhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceImageAlignmentControlPropertiesMESA & operator=( VkPhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceImageAlignmentControlPropertiesMESA const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlPropertiesMESA const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlPropertiesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlPropertiesMESA &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceImageAlignmentControlPropertiesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlPropertiesMESA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlPropertiesMESA *>( this );
-    }
-
-    operator VkPhysicalDeviceImageAlignmentControlPropertiesMESA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageAlignmentControlPropertiesMESA *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, supportedImageAlignmentMask );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceImageAlignmentControlPropertiesMESA const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( supportedImageAlignmentMask == rhs.supportedImageAlignmentMask );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceImageAlignmentControlPropertiesMESA const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                       = StructureType::ePhysicalDeviceImageAlignmentControlPropertiesMESA;
-    void *        pNext                       = {};
-    uint32_t      supportedImageAlignmentMask = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageAlignmentControlPropertiesMESA>
-  {
-    using Type = PhysicalDeviceImageAlignmentControlPropertiesMESA;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceImageAlignmentControlPropertiesMESA>
-  {
-    using Type = PhysicalDeviceImageAlignmentControlPropertiesMESA;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceImageCompressionControlFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageCompressionControlFeaturesEXT.html
   struct PhysicalDeviceImageCompressionControlFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceImageCompressionControlFeaturesEXT;
@@ -94630,10 +68262,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageCompressionControlFeaturesEXT( Bool32 imageCompressionControl_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageCompressionControl{ imageCompressionControl_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageCompressionControlFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 imageCompressionControl_ = {},
+                                                                           void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageCompressionControl( imageCompressionControl_ )
     {
     }
 
@@ -94646,27 +68279,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageCompressionControlFeaturesEXT & operator=( PhysicalDeviceImageCompressionControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageCompressionControlFeaturesEXT & operator=( VkPhysicalDeviceImageCompressionControlFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageCompressionControlFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageCompressionControlFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageCompressionControlFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageCompressionControlFeaturesEXT & setImageCompressionControl( Bool32 imageCompressionControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageCompressionControlFeaturesEXT &
+      setImageCompressionControl( VULKAN_HPP_NAMESPACE::Bool32 imageCompressionControl_ ) VULKAN_HPP_NOEXCEPT
     {
       imageCompressionControl = imageCompressionControl_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageCompressionControlFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -94678,18 +68312,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageCompressionControlFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageCompressionControlFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageCompressionControlFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageCompressionControlFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageCompressionControlFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageCompressionControl );
     }
@@ -94714,27 +68343,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT;
-    void *        pNext                   = {};
-    Bool32        imageCompressionControl = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageCompressionControl = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageCompressionControlFeaturesEXT>
-  {
-    using Type = PhysicalDeviceImageCompressionControlFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT>
   {
     using Type = PhysicalDeviceImageCompressionControlFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT.html
   struct PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
@@ -94742,11 +68361,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT( Bool32 imageCompressionControlSwapchain_ = {},
-                                                                                    void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageCompressionControlSwapchain{ imageCompressionControlSwapchain_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 imageCompressionControlSwapchain_ = {},
+                                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageCompressionControlSwapchain( imageCompressionControlSwapchain_ )
     {
     }
 
@@ -94761,16 +68380,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT &
       operator=( PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT &
       operator=( VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -94778,12 +68397,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT &
-      setImageCompressionControlSwapchain( Bool32 imageCompressionControlSwapchain_ ) VULKAN_HPP_NOEXCEPT
+      setImageCompressionControlSwapchain( VULKAN_HPP_NAMESPACE::Bool32 imageCompressionControlSwapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       imageCompressionControlSwapchain = imageCompressionControlSwapchain_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -94795,18 +68414,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageCompressionControlSwapchain );
     }
@@ -94831,27 +68445,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
-    void *        pNext                            = {};
-    Bool32        imageCompressionControlSwapchain = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageCompressionControlSwapchain = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT>
-  {
-    using Type = PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT>
   {
     using Type = PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageDrmFormatModifierInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageDrmFormatModifierInfoEXT.html
   struct PhysicalDeviceImageDrmFormatModifierInfoEXT
   {
     using NativeType = VkPhysicalDeviceImageDrmFormatModifierInfoEXT;
@@ -94859,17 +68463,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageDrmFormatModifierInfoEXT( uint64_t         drmFormatModifier_     = {},
-                                                                      SharingMode      sharingMode_           = SharingMode::eExclusive,
-                                                                      uint32_t         queueFamilyIndexCount_ = {},
-                                                                      const uint32_t * pQueueFamilyIndices_   = {},
-                                                                      const void *     pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , drmFormatModifier{ drmFormatModifier_ }
-      , sharingMode{ sharingMode_ }
-      , queueFamilyIndexCount{ queueFamilyIndexCount_ }
-      , pQueueFamilyIndices{ pQueueFamilyIndices_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceImageDrmFormatModifierInfoEXT( uint64_t                          drmFormatModifier_     = {},
+                                                   VULKAN_HPP_NAMESPACE::SharingMode sharingMode_           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive,
+                                                   uint32_t                          queueFamilyIndexCount_ = {},
+                                                   const uint32_t *                  pQueueFamilyIndices_   = {},
+                                                   const void *                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , drmFormatModifier( drmFormatModifier_ )
+      , sharingMode( sharingMode_ )
+      , queueFamilyIndexCount( queueFamilyIndexCount_ )
+      , pQueueFamilyIndices( pQueueFamilyIndices_ )
     {
     }
 
@@ -94881,10 +68486,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceImageDrmFormatModifierInfoEXT( uint64_t                                        drmFormatModifier_,
-                                                 SharingMode                                     sharingMode_,
-                                                 ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
-                                                 const void *                                    pNext_ = nullptr )
+    PhysicalDeviceImageDrmFormatModifierInfoEXT( uint64_t                                                              drmFormatModifier_,
+                                                 VULKAN_HPP_NAMESPACE::SharingMode                                     sharingMode_,
+                                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
+                                                 const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , drmFormatModifier( drmFormatModifier_ )
       , sharingMode( sharingMode_ )
@@ -94895,15 +68500,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PhysicalDeviceImageDrmFormatModifierInfoEXT & operator=( PhysicalDeviceImageDrmFormatModifierInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageDrmFormatModifierInfoEXT & operator=( VkPhysicalDeviceImageDrmFormatModifierInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageDrmFormatModifierInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageDrmFormatModifierInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageDrmFormatModifierInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -94916,7 +68521,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageDrmFormatModifierInfoEXT & setSharingMode( SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageDrmFormatModifierInfoEXT & setSharingMode( VULKAN_HPP_NAMESPACE::SharingMode sharingMode_ ) VULKAN_HPP_NOEXCEPT
     {
       sharingMode = sharingMode_;
       return *this;
@@ -94936,14 +68541,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PhysicalDeviceImageDrmFormatModifierInfoEXT &
-      setQueueFamilyIndices( ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
+      setQueueFamilyIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       queueFamilyIndexCount = static_cast<uint32_t>( queueFamilyIndices_.size() );
       pQueueFamilyIndices   = queueFamilyIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageDrmFormatModifierInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -94955,18 +68560,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageDrmFormatModifierInfoEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageDrmFormatModifierInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageDrmFormatModifierInfoEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageDrmFormatModifierInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageDrmFormatModifierInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, SharingMode const &, uint32_t const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint64_t const &,
+               VULKAN_HPP_NAMESPACE::SharingMode const &,
+               uint32_t const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, drmFormatModifier, sharingMode, queueFamilyIndexCount, pQueueFamilyIndices );
@@ -94993,30 +68597,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                 = StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT;
-    const void *     pNext                 = {};
-    uint64_t         drmFormatModifier     = {};
-    SharingMode      sharingMode           = SharingMode::eExclusive;
-    uint32_t         queueFamilyIndexCount = {};
-    const uint32_t * pQueueFamilyIndices   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT;
+    const void *                        pNext                 = {};
+    uint64_t                            drmFormatModifier     = {};
+    VULKAN_HPP_NAMESPACE::SharingMode   sharingMode           = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive;
+    uint32_t                            queueFamilyIndexCount = {};
+    const uint32_t *                    pQueueFamilyIndices   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>
-  {
-    using Type = PhysicalDeviceImageDrmFormatModifierInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT>
   {
     using Type = PhysicalDeviceImageDrmFormatModifierInfoEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageFormatInfo2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageFormatInfo2.html
   struct PhysicalDeviceImageFormatInfo2
   {
     using NativeType = VkPhysicalDeviceImageFormatInfo2;
@@ -95024,19 +68618,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageFormatInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageFormatInfo2( Format           format_ = Format::eUndefined,
-                                                         ImageType        type_   = ImageType::e1D,
-                                                         ImageTiling      tiling_ = ImageTiling::eOptimal,
-                                                         ImageUsageFlags  usage_  = {},
-                                                         ImageCreateFlags flags_  = {},
-                                                         const void *     pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , type{ type_ }
-      , tiling{ tiling_ }
-      , usage{ usage_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageFormatInfo2( VULKAN_HPP_NAMESPACE::Format           format_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                         VULKAN_HPP_NAMESPACE::ImageType        type_   = VULKAN_HPP_NAMESPACE::ImageType::e1D,
+                                                         VULKAN_HPP_NAMESPACE::ImageTiling      tiling_ = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal,
+                                                         VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage_  = {},
+                                                         VULKAN_HPP_NAMESPACE::ImageCreateFlags flags_  = {},
+                                                         const void *                           pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , type( type_ )
+      , tiling( tiling_ )
+      , usage( usage_ )
+      , flags( flags_ )
     {
     }
 
@@ -95048,51 +68642,51 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageFormatInfo2 & operator=( PhysicalDeviceImageFormatInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageFormatInfo2 & operator=( VkPhysicalDeviceImageFormatInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageFormatInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageFormatInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setType( ImageType type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setType( VULKAN_HPP_NAMESPACE::ImageType type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setTiling( ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setTiling( VULKAN_HPP_NAMESPACE::ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
     {
       tiling = tiling_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setUsage( ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setFlags( ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageFormatInfo2 & setFlags( VULKAN_HPP_NAMESPACE::ImageCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageFormatInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95104,24 +68698,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageFormatInfo2 *>( this );
     }
 
-    operator VkPhysicalDeviceImageFormatInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageFormatInfo2 *>( this );
-    }
-
-    operator VkPhysicalDeviceImageFormatInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageFormatInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Format const &,
-               ImageType const &,
-               ImageTiling const &,
-               ImageUsageFlags const &,
-               ImageCreateFlags const &>
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::ImageType const &,
+               VULKAN_HPP_NAMESPACE::ImageTiling const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageCreateFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, format, type, tiling, usage, flags );
@@ -95148,23 +68736,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType  = StructureType::ePhysicalDeviceImageFormatInfo2;
-    const void *     pNext  = {};
-    Format           format = Format::eUndefined;
-    ImageType        type   = ImageType::e1D;
-    ImageTiling      tiling = ImageTiling::eOptimal;
-    ImageUsageFlags  usage  = {};
-    ImageCreateFlags flags  = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType  = StructureType::ePhysicalDeviceImageFormatInfo2;
+    const void *                           pNext  = {};
+    VULKAN_HPP_NAMESPACE::Format           format = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageType        type   = VULKAN_HPP_NAMESPACE::ImageType::e1D;
+    VULKAN_HPP_NAMESPACE::ImageTiling      tiling = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal;
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags  usage  = {};
+    VULKAN_HPP_NAMESPACE::ImageCreateFlags flags  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageFormatInfo2>
-  {
-    using Type = PhysicalDeviceImageFormatInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageFormatInfo2>
   {
@@ -95173,8 +68753,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceImageFormatInfo2KHR = PhysicalDeviceImageFormatInfo2;
 
-  // wrapper struct for struct VkPhysicalDeviceImageProcessing2FeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageProcessing2FeaturesQCOM.html
   struct PhysicalDeviceImageProcessing2FeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceImageProcessing2FeaturesQCOM;
@@ -95182,10 +68760,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessing2FeaturesQCOM( Bool32 textureBlockMatch2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , textureBlockMatch2{ textureBlockMatch2_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessing2FeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 textureBlockMatch2_ = {},
+                                                                     void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , textureBlockMatch2( textureBlockMatch2_ )
     {
     }
 
@@ -95197,27 +68776,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageProcessing2FeaturesQCOM & operator=( PhysicalDeviceImageProcessing2FeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageProcessing2FeaturesQCOM & operator=( VkPhysicalDeviceImageProcessing2FeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageProcessing2FeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessing2FeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessing2FeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessing2FeaturesQCOM & setTextureBlockMatch2( Bool32 textureBlockMatch2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessing2FeaturesQCOM &
+      setTextureBlockMatch2( VULKAN_HPP_NAMESPACE::Bool32 textureBlockMatch2_ ) VULKAN_HPP_NOEXCEPT
     {
       textureBlockMatch2 = textureBlockMatch2_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageProcessing2FeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95229,18 +68809,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageProcessing2FeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceImageProcessing2FeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageProcessing2FeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceImageProcessing2FeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageProcessing2FeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, textureBlockMatch2 );
     }
@@ -95265,27 +68840,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM;
-    void *        pNext              = {};
-    Bool32        textureBlockMatch2 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureBlockMatch2 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageProcessing2FeaturesQCOM>
-  {
-    using Type = PhysicalDeviceImageProcessing2FeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM>
   {
     using Type = PhysicalDeviceImageProcessing2FeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageProcessing2PropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageProcessing2PropertiesQCOM.html
   struct PhysicalDeviceImageProcessing2PropertiesQCOM
   {
     using NativeType = VkPhysicalDeviceImageProcessing2PropertiesQCOM;
@@ -95293,10 +68858,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessing2PropertiesQCOM( Extent2D maxBlockMatchWindow_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxBlockMatchWindow{ maxBlockMatchWindow_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessing2PropertiesQCOM( VULKAN_HPP_NAMESPACE::Extent2D maxBlockMatchWindow_ = {},
+                                                                       void *                         pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxBlockMatchWindow( maxBlockMatchWindow_ )
     {
     }
 
@@ -95308,11 +68874,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageProcessing2PropertiesQCOM & operator=( PhysicalDeviceImageProcessing2PropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageProcessing2PropertiesQCOM & operator=( VkPhysicalDeviceImageProcessing2PropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageProcessing2PropertiesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessing2PropertiesQCOM const *>( &rhs );
       return *this;
     }
 
@@ -95326,18 +68892,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageProcessing2PropertiesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceImageProcessing2PropertiesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageProcessing2PropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceImageProcessing2PropertiesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageProcessing2PropertiesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxBlockMatchWindow );
     }
@@ -95362,27 +68923,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM;
-    void *        pNext               = {};
-    Extent2D      maxBlockMatchWindow = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxBlockMatchWindow = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageProcessing2PropertiesQCOM>
-  {
-    using Type = PhysicalDeviceImageProcessing2PropertiesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM>
   {
     using Type = PhysicalDeviceImageProcessing2PropertiesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageProcessingFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageProcessingFeaturesQCOM.html
   struct PhysicalDeviceImageProcessingFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceImageProcessingFeaturesQCOM;
@@ -95390,15 +68941,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessingFeaturesQCOM( Bool32 textureSampleWeighted_ = {},
-                                                                    Bool32 textureBoxFilter_      = {},
-                                                                    Bool32 textureBlockMatch_     = {},
-                                                                    void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , textureSampleWeighted{ textureSampleWeighted_ }
-      , textureBoxFilter{ textureBoxFilter_ }
-      , textureBlockMatch{ textureBlockMatch_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessingFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 textureSampleWeighted_ = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 textureBoxFilter_      = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 textureBlockMatch_     = {},
+                                                                    void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , textureSampleWeighted( textureSampleWeighted_ )
+      , textureBoxFilter( textureBoxFilter_ )
+      , textureBlockMatch( textureBlockMatch_ )
     {
     }
 
@@ -95410,39 +68961,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageProcessingFeaturesQCOM & operator=( PhysicalDeviceImageProcessingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageProcessingFeaturesQCOM & operator=( VkPhysicalDeviceImageProcessingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageProcessingFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessingFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM & setTextureSampleWeighted( Bool32 textureSampleWeighted_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM &
+      setTextureSampleWeighted( VULKAN_HPP_NAMESPACE::Bool32 textureSampleWeighted_ ) VULKAN_HPP_NOEXCEPT
     {
       textureSampleWeighted = textureSampleWeighted_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM & setTextureBoxFilter( Bool32 textureBoxFilter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM &
+      setTextureBoxFilter( VULKAN_HPP_NAMESPACE::Bool32 textureBoxFilter_ ) VULKAN_HPP_NOEXCEPT
     {
       textureBoxFilter = textureBoxFilter_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM & setTextureBlockMatch( Bool32 textureBlockMatch_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageProcessingFeaturesQCOM &
+      setTextureBlockMatch( VULKAN_HPP_NAMESPACE::Bool32 textureBlockMatch_ ) VULKAN_HPP_NOEXCEPT
     {
       textureBlockMatch = textureBlockMatch_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageProcessingFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95454,18 +69008,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageProcessingFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceImageProcessingFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageProcessingFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceImageProcessingFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageProcessingFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, textureSampleWeighted, textureBoxFilter, textureBlockMatch );
     }
@@ -95491,29 +69044,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM;
-    void *        pNext                 = {};
-    Bool32        textureSampleWeighted = {};
-    Bool32        textureBoxFilter      = {};
-    Bool32        textureBlockMatch     = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureSampleWeighted = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureBoxFilter      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureBlockMatch     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageProcessingFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceImageProcessingFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM>
   {
     using Type = PhysicalDeviceImageProcessingFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageProcessingPropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageProcessingPropertiesQCOM.html
   struct PhysicalDeviceImageProcessingPropertiesQCOM
   {
     using NativeType = VkPhysicalDeviceImageProcessingPropertiesQCOM;
@@ -95521,17 +69064,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessingPropertiesQCOM( uint32_t maxWeightFilterPhases_    = {},
-                                                                      Extent2D maxWeightFilterDimension_ = {},
-                                                                      Extent2D maxBlockMatchRegion_      = {},
-                                                                      Extent2D maxBoxFilterBlockSize_    = {},
-                                                                      void *   pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxWeightFilterPhases{ maxWeightFilterPhases_ }
-      , maxWeightFilterDimension{ maxWeightFilterDimension_ }
-      , maxBlockMatchRegion{ maxBlockMatchRegion_ }
-      , maxBoxFilterBlockSize{ maxBoxFilterBlockSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageProcessingPropertiesQCOM( uint32_t                       maxWeightFilterPhases_    = {},
+                                                                      VULKAN_HPP_NAMESPACE::Extent2D maxWeightFilterDimension_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Extent2D maxBlockMatchRegion_      = {},
+                                                                      VULKAN_HPP_NAMESPACE::Extent2D maxBoxFilterBlockSize_    = {},
+                                                                      void *                         pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxWeightFilterPhases( maxWeightFilterPhases_ )
+      , maxWeightFilterDimension( maxWeightFilterDimension_ )
+      , maxBlockMatchRegion( maxBlockMatchRegion_ )
+      , maxBoxFilterBlockSize( maxBoxFilterBlockSize_ )
     {
     }
 
@@ -95543,11 +69086,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageProcessingPropertiesQCOM & operator=( PhysicalDeviceImageProcessingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageProcessingPropertiesQCOM & operator=( VkPhysicalDeviceImageProcessingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageProcessingPropertiesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageProcessingPropertiesQCOM const *>( &rhs );
       return *this;
     }
 
@@ -95561,18 +69104,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageProcessingPropertiesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceImageProcessingPropertiesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageProcessingPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceImageProcessingPropertiesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageProcessingPropertiesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, Extent2D const &, Extent2D const &, Extent2D const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxWeightFilterPhases, maxWeightFilterDimension, maxBlockMatchRegion, maxBoxFilterBlockSize );
@@ -95600,30 +69142,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM;
-    void *        pNext                    = {};
-    uint32_t      maxWeightFilterPhases    = {};
-    Extent2D      maxWeightFilterDimension = {};
-    Extent2D      maxBlockMatchRegion      = {};
-    Extent2D      maxBoxFilterBlockSize    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM;
+    void *                              pNext                    = {};
+    uint32_t                            maxWeightFilterPhases    = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxWeightFilterDimension = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxBlockMatchRegion      = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      maxBoxFilterBlockSize    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageProcessingPropertiesQCOM>
-  {
-    using Type = PhysicalDeviceImageProcessingPropertiesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM>
   {
     using Type = PhysicalDeviceImageProcessingPropertiesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageRobustnessFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageRobustnessFeatures.html
   struct PhysicalDeviceImageRobustnessFeatures
   {
     using NativeType = VkPhysicalDeviceImageRobustnessFeatures;
@@ -95631,10 +69163,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageRobustnessFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageRobustnessFeatures( Bool32 robustImageAccess_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , robustImageAccess{ robustImageAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageRobustnessFeatures( VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess_ = {},
+                                                                void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , robustImageAccess( robustImageAccess_ )
     {
     }
 
@@ -95646,27 +69179,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageRobustnessFeatures & operator=( PhysicalDeviceImageRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageRobustnessFeatures & operator=( VkPhysicalDeviceImageRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageRobustnessFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageRobustnessFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageRobustnessFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageRobustnessFeatures & setRobustImageAccess( Bool32 robustImageAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageRobustnessFeatures & setRobustImageAccess( VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       robustImageAccess = robustImageAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageRobustnessFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95678,18 +69211,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageRobustnessFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceImageRobustnessFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageRobustnessFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceImageRobustnessFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageRobustnessFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, robustImageAccess );
     }
@@ -95714,19 +69242,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceImageRobustnessFeatures;
-    void *        pNext             = {};
-    Bool32        robustImageAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceImageRobustnessFeatures;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        robustImageAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageRobustnessFeatures>
-  {
-    using Type = PhysicalDeviceImageRobustnessFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageRobustnessFeatures>
   {
@@ -95735,8 +69255,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceImageRobustnessFeaturesEXT = PhysicalDeviceImageRobustnessFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT.html
   struct PhysicalDeviceImageSlicedViewOf3DFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
@@ -95744,10 +69262,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageSlicedViewOf3DFeaturesEXT( Bool32 imageSlicedViewOf3D_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageSlicedViewOf3D{ imageSlicedViewOf3D_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageSlicedViewOf3DFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 imageSlicedViewOf3D_ = {},
+                                                                       void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageSlicedViewOf3D( imageSlicedViewOf3D_ )
     {
     }
 
@@ -95759,27 +69278,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageSlicedViewOf3DFeaturesEXT & operator=( PhysicalDeviceImageSlicedViewOf3DFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageSlicedViewOf3DFeaturesEXT & operator=( VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageSlicedViewOf3DFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageSlicedViewOf3DFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageSlicedViewOf3DFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageSlicedViewOf3DFeaturesEXT & setImageSlicedViewOf3D( Bool32 imageSlicedViewOf3D_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageSlicedViewOf3DFeaturesEXT &
+      setImageSlicedViewOf3D( VULKAN_HPP_NAMESPACE::Bool32 imageSlicedViewOf3D_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSlicedViewOf3D = imageSlicedViewOf3D_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95791,18 +69311,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageSlicedViewOf3D );
     }
@@ -95827,27 +69342,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
-    void *        pNext               = {};
-    Bool32        imageSlicedViewOf3D = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageSlicedViewOf3D = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT>
-  {
-    using Type = PhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT>
   {
     using Type = PhysicalDeviceImageSlicedViewOf3DFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageViewImageFormatInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageViewImageFormatInfoEXT.html
   struct PhysicalDeviceImageViewImageFormatInfoEXT
   {
     using NativeType = VkPhysicalDeviceImageViewImageFormatInfoEXT;
@@ -95855,11 +69360,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageViewImageFormatInfoEXT( ImageViewType imageViewType_ = ImageViewType::e1D,
-                                                                    void *        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageViewType{ imageViewType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceImageViewImageFormatInfoEXT( VULKAN_HPP_NAMESPACE::ImageViewType imageViewType_ = VULKAN_HPP_NAMESPACE::ImageViewType::e1D,
+                                                 void *                              pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageViewType( imageViewType_ )
     {
     }
 
@@ -95871,27 +69377,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageViewImageFormatInfoEXT & operator=( PhysicalDeviceImageViewImageFormatInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageViewImageFormatInfoEXT & operator=( VkPhysicalDeviceImageViewImageFormatInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageViewImageFormatInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewImageFormatInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewImageFormatInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewImageFormatInfoEXT & setImageViewType( ImageViewType imageViewType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewImageFormatInfoEXT &
+      setImageViewType( VULKAN_HPP_NAMESPACE::ImageViewType imageViewType_ ) VULKAN_HPP_NOEXCEPT
     {
       imageViewType = imageViewType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageViewImageFormatInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -95903,18 +69410,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageViewImageFormatInfoEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageViewImageFormatInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageViewImageFormatInfoEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageViewImageFormatInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageViewImageFormatInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageViewType const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageViewType const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageViewType );
     }
@@ -95939,27 +69441,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT;
-    void *        pNext         = {};
-    ImageViewType imageViewType = ImageViewType::e1D;
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::ImageViewType imageViewType = VULKAN_HPP_NAMESPACE::ImageViewType::e1D;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageViewImageFormatInfoEXT>
-  {
-    using Type = PhysicalDeviceImageViewImageFormatInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT>
   {
     using Type = PhysicalDeviceImageViewImageFormatInfoEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImageViewMinLodFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImageViewMinLodFeaturesEXT.html
   struct PhysicalDeviceImageViewMinLodFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceImageViewMinLodFeaturesEXT;
@@ -95967,10 +69459,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageViewMinLodFeaturesEXT( Bool32 minLod_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minLod{ minLod_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImageViewMinLodFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 minLod_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minLod( minLod_ )
     {
     }
 
@@ -95982,27 +69474,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImageViewMinLodFeaturesEXT & operator=( PhysicalDeviceImageViewMinLodFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImageViewMinLodFeaturesEXT & operator=( VkPhysicalDeviceImageViewMinLodFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImageViewMinLodFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImageViewMinLodFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewMinLodFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewMinLodFeaturesEXT & setMinLod( Bool32 minLod_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImageViewMinLodFeaturesEXT & setMinLod( VULKAN_HPP_NAMESPACE::Bool32 minLod_ ) VULKAN_HPP_NOEXCEPT
     {
       minLod = minLod_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImageViewMinLodFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -96014,18 +69506,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImageViewMinLodFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceImageViewMinLodFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImageViewMinLodFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceImageViewMinLodFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImageViewMinLodFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minLod );
     }
@@ -96050,27 +69537,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType  = StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT;
-    void *        pNext  = {};
-    Bool32        minLod = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType  = StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT;
+    void *                              pNext  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        minLod = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImageViewMinLodFeaturesEXT>
-  {
-    using Type = PhysicalDeviceImageViewMinLodFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT>
   {
     using Type = PhysicalDeviceImageViewMinLodFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceImagelessFramebufferFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceImagelessFramebufferFeatures.html
   struct PhysicalDeviceImagelessFramebufferFeatures
   {
     using NativeType = VkPhysicalDeviceImagelessFramebufferFeatures;
@@ -96078,10 +69555,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceImagelessFramebufferFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceImagelessFramebufferFeatures( Bool32 imagelessFramebuffer_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imagelessFramebuffer{ imagelessFramebuffer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceImagelessFramebufferFeatures( VULKAN_HPP_NAMESPACE::Bool32 imagelessFramebuffer_ = {},
+                                                                     void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imagelessFramebuffer( imagelessFramebuffer_ )
     {
     }
 
@@ -96093,27 +69571,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceImagelessFramebufferFeatures & operator=( PhysicalDeviceImagelessFramebufferFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceImagelessFramebufferFeatures & operator=( VkPhysicalDeviceImagelessFramebufferFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceImagelessFramebufferFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceImagelessFramebufferFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImagelessFramebufferFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImagelessFramebufferFeatures & setImagelessFramebuffer( Bool32 imagelessFramebuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceImagelessFramebufferFeatures &
+      setImagelessFramebuffer( VULKAN_HPP_NAMESPACE::Bool32 imagelessFramebuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       imagelessFramebuffer = imagelessFramebuffer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceImagelessFramebufferFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -96125,18 +69604,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceImagelessFramebufferFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceImagelessFramebufferFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceImagelessFramebufferFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceImagelessFramebufferFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceImagelessFramebufferFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imagelessFramebuffer );
     }
@@ -96161,19 +69635,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceImagelessFramebufferFeatures;
-    void *        pNext                = {};
-    Bool32        imagelessFramebuffer = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceImagelessFramebufferFeatures;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imagelessFramebuffer = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceImagelessFramebufferFeatures>
-  {
-    using Type = PhysicalDeviceImagelessFramebufferFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceImagelessFramebufferFeatures>
   {
@@ -96182,83 +69648,77 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceImagelessFramebufferFeaturesKHR = PhysicalDeviceImagelessFramebufferFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceIndexTypeUint8Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceIndexTypeUint8Features.html
-  struct PhysicalDeviceIndexTypeUint8Features
+  struct PhysicalDeviceIndexTypeUint8FeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceIndexTypeUint8Features;
+    using NativeType = VkPhysicalDeviceIndexTypeUint8FeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceIndexTypeUint8Features;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceIndexTypeUint8FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceIndexTypeUint8Features( Bool32 indexTypeUint8_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , indexTypeUint8{ indexTypeUint8_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceIndexTypeUint8FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 indexTypeUint8_ = {},
+                                                                  void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , indexTypeUint8( indexTypeUint8_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceIndexTypeUint8Features( PhysicalDeviceIndexTypeUint8Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceIndexTypeUint8FeaturesKHR( PhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceIndexTypeUint8Features( VkPhysicalDeviceIndexTypeUint8Features const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceIndexTypeUint8Features( *reinterpret_cast<PhysicalDeviceIndexTypeUint8Features const *>( &rhs ) )
+    PhysicalDeviceIndexTypeUint8FeaturesKHR( VkPhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceIndexTypeUint8FeaturesKHR( *reinterpret_cast<PhysicalDeviceIndexTypeUint8FeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceIndexTypeUint8Features & operator=( PhysicalDeviceIndexTypeUint8Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceIndexTypeUint8FeaturesKHR & operator=( PhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceIndexTypeUint8Features & operator=( VkPhysicalDeviceIndexTypeUint8Features const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceIndexTypeUint8FeaturesKHR & operator=( VkPhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceIndexTypeUint8Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceIndexTypeUint8FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceIndexTypeUint8Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceIndexTypeUint8FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceIndexTypeUint8Features & setIndexTypeUint8( Bool32 indexTypeUint8_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceIndexTypeUint8FeaturesKHR & setIndexTypeUint8( VULKAN_HPP_NAMESPACE::Bool32 indexTypeUint8_ ) VULKAN_HPP_NOEXCEPT
     {
       indexTypeUint8 = indexTypeUint8_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceIndexTypeUint8Features const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceIndexTypeUint8FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceIndexTypeUint8Features *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceIndexTypeUint8FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceIndexTypeUint8Features &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceIndexTypeUint8FeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceIndexTypeUint8Features *>( this );
-    }
-
-    operator VkPhysicalDeviceIndexTypeUint8Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceIndexTypeUint8Features *>( this );
-    }
-
-    operator VkPhysicalDeviceIndexTypeUint8Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceIndexTypeUint8Features *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceIndexTypeUint8FeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, indexTypeUint8 );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceIndexTypeUint8Features const & ) const = default;
+    auto operator<=>( PhysicalDeviceIndexTypeUint8FeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceIndexTypeUint8Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -96267,37 +69727,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceIndexTypeUint8Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceIndexTypeUint8FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceIndexTypeUint8Features;
-    void *        pNext          = {};
-    Bool32        indexTypeUint8 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceIndexTypeUint8FeaturesKHR;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        indexTypeUint8 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceIndexTypeUint8Features>
-  {
-    using Type = PhysicalDeviceIndexTypeUint8Features;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceIndexTypeUint8Features>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceIndexTypeUint8FeaturesKHR>
   {
-    using Type = PhysicalDeviceIndexTypeUint8Features;
+    using Type = PhysicalDeviceIndexTypeUint8FeaturesKHR;
   };
 
-  using PhysicalDeviceIndexTypeUint8FeaturesEXT = PhysicalDeviceIndexTypeUint8Features;
-  using PhysicalDeviceIndexTypeUint8FeaturesKHR = PhysicalDeviceIndexTypeUint8Features;
+  using PhysicalDeviceIndexTypeUint8FeaturesEXT = PhysicalDeviceIndexTypeUint8FeaturesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceInheritedViewportScissorFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceInheritedViewportScissorFeaturesNV.html
   struct PhysicalDeviceInheritedViewportScissorFeaturesNV
   {
     using NativeType = VkPhysicalDeviceInheritedViewportScissorFeaturesNV;
@@ -96305,11 +69754,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceInheritedViewportScissorFeaturesNV( Bool32 inheritedViewportScissor2D_ = {},
-                                                                           void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , inheritedViewportScissor2D{ inheritedViewportScissor2D_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceInheritedViewportScissorFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 inheritedViewportScissor2D_ = {},
+                                                                           void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , inheritedViewportScissor2D( inheritedViewportScissor2D_ )
     {
     }
 
@@ -96322,15 +69771,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceInheritedViewportScissorFeaturesNV & operator=( PhysicalDeviceInheritedViewportScissorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceInheritedViewportScissorFeaturesNV & operator=( VkPhysicalDeviceInheritedViewportScissorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceInheritedViewportScissorFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceInheritedViewportScissorFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInheritedViewportScissorFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -96338,12 +69787,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInheritedViewportScissorFeaturesNV &
-      setInheritedViewportScissor2D( Bool32 inheritedViewportScissor2D_ ) VULKAN_HPP_NOEXCEPT
+      setInheritedViewportScissor2D( VULKAN_HPP_NAMESPACE::Bool32 inheritedViewportScissor2D_ ) VULKAN_HPP_NOEXCEPT
     {
       inheritedViewportScissor2D = inheritedViewportScissor2D_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceInheritedViewportScissorFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -96355,18 +69804,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceInheritedViewportScissorFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceInheritedViewportScissorFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceInheritedViewportScissorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceInheritedViewportScissorFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceInheritedViewportScissorFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, inheritedViewportScissor2D );
     }
@@ -96391,27 +69835,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV;
-    void *        pNext                      = {};
-    Bool32        inheritedViewportScissor2D = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        inheritedViewportScissor2D = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceInheritedViewportScissorFeaturesNV>
-  {
-    using Type = PhysicalDeviceInheritedViewportScissorFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV>
   {
     using Type = PhysicalDeviceInheritedViewportScissorFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceInlineUniformBlockFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceInlineUniformBlockFeatures.html
   struct PhysicalDeviceInlineUniformBlockFeatures
   {
     using NativeType = VkPhysicalDeviceInlineUniformBlockFeatures;
@@ -96419,13 +69853,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceInlineUniformBlockFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceInlineUniformBlockFeatures( Bool32 inlineUniformBlock_                                 = {},
-                                                                   Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ = {},
-                                                                   void * pNext_                                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , inlineUniformBlock{ inlineUniformBlock_ }
-      , descriptorBindingInlineUniformBlockUpdateAfterBind{ descriptorBindingInlineUniformBlockUpdateAfterBind_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceInlineUniformBlockFeatures( VULKAN_HPP_NAMESPACE::Bool32 inlineUniformBlock_                                 = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , inlineUniformBlock( inlineUniformBlock_ )
+      , descriptorBindingInlineUniformBlockUpdateAfterBind( descriptorBindingInlineUniformBlockUpdateAfterBind_ )
     {
     }
 
@@ -96437,34 +69871,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceInlineUniformBlockFeatures & operator=( PhysicalDeviceInlineUniformBlockFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceInlineUniformBlockFeatures & operator=( VkPhysicalDeviceInlineUniformBlockFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceInlineUniformBlockFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceInlineUniformBlockFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInlineUniformBlockFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInlineUniformBlockFeatures & setInlineUniformBlock( Bool32 inlineUniformBlock_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInlineUniformBlockFeatures &
+      setInlineUniformBlock( VULKAN_HPP_NAMESPACE::Bool32 inlineUniformBlock_ ) VULKAN_HPP_NOEXCEPT
     {
       inlineUniformBlock = inlineUniformBlock_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInlineUniformBlockFeatures &
-      setDescriptorBindingInlineUniformBlockUpdateAfterBind( Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInlineUniformBlockFeatures & setDescriptorBindingInlineUniformBlockUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingInlineUniformBlockUpdateAfterBind = descriptorBindingInlineUniformBlockUpdateAfterBind_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceInlineUniformBlockFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -96476,18 +69911,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceInlineUniformBlockFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceInlineUniformBlockFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceInlineUniformBlockFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceInlineUniformBlockFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceInlineUniformBlockFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, inlineUniformBlock, descriptorBindingInlineUniformBlockUpdateAfterBind );
     }
@@ -96513,20 +69943,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                              = StructureType::ePhysicalDeviceInlineUniformBlockFeatures;
-    void *        pNext                                              = {};
-    Bool32        inlineUniformBlock                                 = {};
-    Bool32        descriptorBindingInlineUniformBlockUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                              = StructureType::ePhysicalDeviceInlineUniformBlockFeatures;
+    void *                              pNext                                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        inlineUniformBlock                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingInlineUniformBlockUpdateAfterBind = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceInlineUniformBlockFeatures>
-  {
-    using Type = PhysicalDeviceInlineUniformBlockFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceInlineUniformBlockFeatures>
   {
@@ -96535,8 +69957,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceInlineUniformBlockFeaturesEXT = PhysicalDeviceInlineUniformBlockFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceInlineUniformBlockProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceInlineUniformBlockProperties.html
   struct PhysicalDeviceInlineUniformBlockProperties
   {
     using NativeType = VkPhysicalDeviceInlineUniformBlockProperties;
@@ -96544,19 +69964,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceInlineUniformBlockProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceInlineUniformBlockProperties( uint32_t maxInlineUniformBlockSize_                               = {},
                                                                      uint32_t maxPerStageDescriptorInlineUniformBlocks_                = {},
                                                                      uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_ = {},
                                                                      uint32_t maxDescriptorSetInlineUniformBlocks_                     = {},
                                                                      uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks_      = {},
                                                                      void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxInlineUniformBlockSize{ maxInlineUniformBlockSize_ }
-      , maxPerStageDescriptorInlineUniformBlocks{ maxPerStageDescriptorInlineUniformBlocks_ }
-      , maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks{ maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_ }
-      , maxDescriptorSetInlineUniformBlocks{ maxDescriptorSetInlineUniformBlocks_ }
-      , maxDescriptorSetUpdateAfterBindInlineUniformBlocks{ maxDescriptorSetUpdateAfterBindInlineUniformBlocks_ }
+      : pNext( pNext_ )
+      , maxInlineUniformBlockSize( maxInlineUniformBlockSize_ )
+      , maxPerStageDescriptorInlineUniformBlocks( maxPerStageDescriptorInlineUniformBlocks_ )
+      , maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks( maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_ )
+      , maxDescriptorSetInlineUniformBlocks( maxDescriptorSetInlineUniformBlocks_ )
+      , maxDescriptorSetUpdateAfterBindInlineUniformBlocks( maxDescriptorSetUpdateAfterBindInlineUniformBlocks_ )
     {
     }
 
@@ -96568,11 +69988,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceInlineUniformBlockProperties & operator=( PhysicalDeviceInlineUniformBlockProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceInlineUniformBlockProperties & operator=( VkPhysicalDeviceInlineUniformBlockProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceInlineUniformBlockProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceInlineUniformBlockProperties const *>( &rhs );
       return *this;
     }
 
@@ -96586,18 +70006,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceInlineUniformBlockProperties *>( this );
     }
 
-    operator VkPhysicalDeviceInlineUniformBlockProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceInlineUniformBlockProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceInlineUniformBlockProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceInlineUniformBlockProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -96633,23 +70053,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                   = StructureType::ePhysicalDeviceInlineUniformBlockProperties;
-    void *        pNext                                                   = {};
-    uint32_t      maxInlineUniformBlockSize                               = {};
-    uint32_t      maxPerStageDescriptorInlineUniformBlocks                = {};
-    uint32_t      maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks = {};
-    uint32_t      maxDescriptorSetInlineUniformBlocks                     = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindInlineUniformBlocks      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                   = StructureType::ePhysicalDeviceInlineUniformBlockProperties;
+    void *                              pNext                                                   = {};
+    uint32_t                            maxInlineUniformBlockSize                               = {};
+    uint32_t                            maxPerStageDescriptorInlineUniformBlocks                = {};
+    uint32_t                            maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks = {};
+    uint32_t                            maxDescriptorSetInlineUniformBlocks                     = {};
+    uint32_t                            maxDescriptorSetUpdateAfterBindInlineUniformBlocks      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceInlineUniformBlockProperties>
-  {
-    using Type = PhysicalDeviceInlineUniformBlockProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceInlineUniformBlockProperties>
   {
@@ -96658,8 +70070,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceInlineUniformBlockPropertiesEXT = PhysicalDeviceInlineUniformBlockProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceInvocationMaskFeaturesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceInvocationMaskFeaturesHUAWEI.html
   struct PhysicalDeviceInvocationMaskFeaturesHUAWEI
   {
     using NativeType = VkPhysicalDeviceInvocationMaskFeaturesHUAWEI;
@@ -96667,10 +70077,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceInvocationMaskFeaturesHUAWEI( Bool32 invocationMask_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , invocationMask{ invocationMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceInvocationMaskFeaturesHUAWEI( VULKAN_HPP_NAMESPACE::Bool32 invocationMask_ = {},
+                                                                     void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , invocationMask( invocationMask_ )
     {
     }
 
@@ -96682,27 +70093,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceInvocationMaskFeaturesHUAWEI & operator=( PhysicalDeviceInvocationMaskFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceInvocationMaskFeaturesHUAWEI & operator=( VkPhysicalDeviceInvocationMaskFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceInvocationMaskFeaturesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceInvocationMaskFeaturesHUAWEI const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInvocationMaskFeaturesHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInvocationMaskFeaturesHUAWEI & setInvocationMask( Bool32 invocationMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceInvocationMaskFeaturesHUAWEI & setInvocationMask( VULKAN_HPP_NAMESPACE::Bool32 invocationMask_ ) VULKAN_HPP_NOEXCEPT
     {
       invocationMask = invocationMask_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceInvocationMaskFeaturesHUAWEI const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -96714,18 +70125,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceInvocationMaskFeaturesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceInvocationMaskFeaturesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceInvocationMaskFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceInvocationMaskFeaturesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceInvocationMaskFeaturesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, invocationMask );
     }
@@ -96750,496 +70156,415 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI;
-    void *        pNext          = {};
-    Bool32        invocationMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        invocationMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceInvocationMaskFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceInvocationMaskFeaturesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI>
   {
     using Type = PhysicalDeviceInvocationMaskFeaturesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceLayeredApiPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLayeredApiPropertiesKHR.html
-  struct PhysicalDeviceLayeredApiPropertiesKHR
+  struct PhysicalDeviceLayeredDriverPropertiesMSFT
   {
-    using NativeType = VkPhysicalDeviceLayeredApiPropertiesKHR;
+    using NativeType = VkPhysicalDeviceLayeredDriverPropertiesMSFT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLayeredApiPropertiesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesKHR( uint32_t                    vendorID_   = {},
-                                                                   uint32_t                    deviceID_   = {},
-                                                                   PhysicalDeviceLayeredApiKHR layeredAPI_ = PhysicalDeviceLayeredApiKHR::eVulkan,
-                                                                   std::array<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const & deviceName_ = {},
-                                                                   void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vendorID{ vendorID_ }
-      , deviceID{ deviceID_ }
-      , layeredAPI{ layeredAPI_ }
-      , deviceName{ deviceName_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLayeredDriverPropertiesMSFT(
+      VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT underlyingAPI_ = VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT::eNone,
+      void *                                               pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , underlyingAPI( underlyingAPI_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesKHR( PhysicalDeviceLayeredApiPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLayeredDriverPropertiesMSFT( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceLayeredApiPropertiesKHR( VkPhysicalDeviceLayeredApiPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLayeredApiPropertiesKHR( *reinterpret_cast<PhysicalDeviceLayeredApiPropertiesKHR const *>( &rhs ) )
+    PhysicalDeviceLayeredDriverPropertiesMSFT( VkPhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceLayeredDriverPropertiesMSFT( *reinterpret_cast<PhysicalDeviceLayeredDriverPropertiesMSFT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceLayeredApiPropertiesKHR & operator=( PhysicalDeviceLayeredApiPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceLayeredDriverPropertiesMSFT & operator=( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceLayeredApiPropertiesKHR & operator=( VkPhysicalDeviceLayeredApiPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceLayeredDriverPropertiesMSFT & operator=( VkPhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceLayeredApiPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLayeredDriverPropertiesMSFT const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceLayeredApiPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceLayeredApiPropertiesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
     }
 
-    operator VkPhysicalDeviceLayeredApiPropertiesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceLayeredApiPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLayeredApiPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLayeredApiPropertiesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint32_t const &,
-               PhysicalDeviceLayeredApiKHR const &,
-               ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, vendorID, deviceID, layeredAPI, deviceName );
+      return std::tie( sType, pNext, underlyingAPI );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLayeredApiPropertiesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceLayeredDriverPropertiesMSFT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceLayeredApiPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( vendorID == rhs.vendorID ) && ( deviceID == rhs.deviceID ) &&
-             ( layeredAPI == rhs.layeredAPI ) && ( deviceName == rhs.deviceName );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( underlyingAPI == rhs.underlyingAPI );
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceLayeredApiPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                                          sType      = StructureType::ePhysicalDeviceLayeredApiPropertiesKHR;
-    void *                                                 pNext      = {};
-    uint32_t                                               vendorID   = {};
-    uint32_t                                               deviceID   = {};
-    PhysicalDeviceLayeredApiKHR                            layeredAPI = PhysicalDeviceLayeredApiKHR::eVulkan;
-    ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> deviceName = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType         = StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT;
+    void *                                               pNext         = {};
+    VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT underlyingAPI = VULKAN_HPP_NAMESPACE::LayeredDriverUnderlyingApiMSFT::eNone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLayeredApiPropertiesKHR>
-  {
-    using Type = PhysicalDeviceLayeredApiPropertiesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLayeredApiPropertiesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT>
   {
-    using Type = PhysicalDeviceLayeredApiPropertiesKHR;
+    using Type = PhysicalDeviceLayeredDriverPropertiesMSFT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceLayeredApiPropertiesListKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLayeredApiPropertiesListKHR.html
-  struct PhysicalDeviceLayeredApiPropertiesListKHR
+  struct PhysicalDeviceLegacyDitheringFeaturesEXT
   {
-    using NativeType = VkPhysicalDeviceLayeredApiPropertiesListKHR;
+    using NativeType = VkPhysicalDeviceLegacyDitheringFeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLayeredApiPropertiesListKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesListKHR( uint32_t                                layeredApiCount_ = {},
-                                                                       PhysicalDeviceLayeredApiPropertiesKHR * pLayeredApis_    = {},
-                                                                       void *                                  pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , layeredApiCount{ layeredApiCount_ }
-      , pLayeredApis{ pLayeredApis_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyDitheringFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 legacyDithering_ = {},
+                                                                   void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , legacyDithering( legacyDithering_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesListKHR( PhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyDitheringFeaturesEXT( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceLayeredApiPropertiesListKHR( VkPhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLayeredApiPropertiesListKHR( *reinterpret_cast<PhysicalDeviceLayeredApiPropertiesListKHR const *>( &rhs ) )
+    PhysicalDeviceLegacyDitheringFeaturesEXT( VkPhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceLegacyDitheringFeaturesEXT( *reinterpret_cast<PhysicalDeviceLegacyDitheringFeaturesEXT const *>( &rhs ) )
     {
     }
 
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceLayeredApiPropertiesListKHR( ArrayProxyNoTemporaries<PhysicalDeviceLayeredApiPropertiesKHR> const & layeredApis_, void * pNext_ = nullptr )
-      : pNext( pNext_ ), layeredApiCount( static_cast<uint32_t>( layeredApis_.size() ) ), pLayeredApis( layeredApis_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+    PhysicalDeviceLegacyDitheringFeaturesEXT & operator=( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceLayeredApiPropertiesListKHR & operator=( PhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLayeredApiPropertiesListKHR & operator=( VkPhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceLegacyDitheringFeaturesEXT & operator=( VkPhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceLayeredApiPropertiesListKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLegacyDitheringFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesListKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyDitheringFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesListKHR & setLayeredApiCount( uint32_t layeredApiCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyDitheringFeaturesEXT & setLegacyDithering( VULKAN_HPP_NAMESPACE::Bool32 legacyDithering_ ) VULKAN_HPP_NOEXCEPT
     {
-      layeredApiCount = layeredApiCount_;
+      legacyDithering = legacyDithering_;
       return *this;
     }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiPropertiesListKHR &
-      setPLayeredApis( PhysicalDeviceLayeredApiPropertiesKHR * pLayeredApis_ ) VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      pLayeredApis = pLayeredApis_;
-      return *this;
+      return *reinterpret_cast<const VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
     }
 
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PhysicalDeviceLayeredApiPropertiesListKHR &
-      setLayeredApis( ArrayProxyNoTemporaries<PhysicalDeviceLayeredApiPropertiesKHR> const & layeredApis_ ) VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      layeredApiCount = static_cast<uint32_t>( layeredApis_.size() );
-      pLayeredApis    = layeredApis_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceLayeredApiPropertiesListKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLayeredApiPropertiesListKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiPropertiesListKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLayeredApiPropertiesListKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiPropertiesListKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLayeredApiPropertiesListKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiPropertiesListKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLayeredApiPropertiesListKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, PhysicalDeviceLayeredApiPropertiesKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, layeredApiCount, pLayeredApis );
+      return std::tie( sType, pNext, legacyDithering );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLayeredApiPropertiesListKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceLegacyDitheringFeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( layeredApiCount == rhs.layeredApiCount ) && ( pLayeredApis == rhs.pLayeredApis );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( legacyDithering == rhs.legacyDithering );
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceLayeredApiPropertiesListKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                           sType           = StructureType::ePhysicalDeviceLayeredApiPropertiesListKHR;
-    void *                                  pNext           = {};
-    uint32_t                                layeredApiCount = {};
-    PhysicalDeviceLayeredApiPropertiesKHR * pLayeredApis    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT;
+    void *                              pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        legacyDithering = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLayeredApiPropertiesListKHR>
-  {
-    using Type = PhysicalDeviceLayeredApiPropertiesListKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLayeredApiPropertiesListKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT>
   {
-    using Type = PhysicalDeviceLayeredApiPropertiesListKHR;
+    using Type = PhysicalDeviceLegacyDitheringFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceLimits, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLimits.html
   struct PhysicalDeviceLimits
   {
     using NativeType = VkPhysicalDeviceLimits;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLimits( uint32_t                        maxImageDimension1D_                             = {},
-                                                  uint32_t                        maxImageDimension2D_                             = {},
-                                                  uint32_t                        maxImageDimension3D_                             = {},
-                                                  uint32_t                        maxImageDimensionCube_                           = {},
-                                                  uint32_t                        maxImageArrayLayers_                             = {},
-                                                  uint32_t                        maxTexelBufferElements_                          = {},
-                                                  uint32_t                        maxUniformBufferRange_                           = {},
-                                                  uint32_t                        maxStorageBufferRange_                           = {},
-                                                  uint32_t                        maxPushConstantsSize_                            = {},
-                                                  uint32_t                        maxMemoryAllocationCount_                        = {},
-                                                  uint32_t                        maxSamplerAllocationCount_                       = {},
-                                                  DeviceSize                      bufferImageGranularity_                          = {},
-                                                  DeviceSize                      sparseAddressSpaceSize_                          = {},
-                                                  uint32_t                        maxBoundDescriptorSets_                          = {},
-                                                  uint32_t                        maxPerStageDescriptorSamplers_                   = {},
-                                                  uint32_t                        maxPerStageDescriptorUniformBuffers_             = {},
-                                                  uint32_t                        maxPerStageDescriptorStorageBuffers_             = {},
-                                                  uint32_t                        maxPerStageDescriptorSampledImages_              = {},
-                                                  uint32_t                        maxPerStageDescriptorStorageImages_              = {},
-                                                  uint32_t                        maxPerStageDescriptorInputAttachments_           = {},
-                                                  uint32_t                        maxPerStageResources_                            = {},
-                                                  uint32_t                        maxDescriptorSetSamplers_                        = {},
-                                                  uint32_t                        maxDescriptorSetUniformBuffers_                  = {},
-                                                  uint32_t                        maxDescriptorSetUniformBuffersDynamic_           = {},
-                                                  uint32_t                        maxDescriptorSetStorageBuffers_                  = {},
-                                                  uint32_t                        maxDescriptorSetStorageBuffersDynamic_           = {},
-                                                  uint32_t                        maxDescriptorSetSampledImages_                   = {},
-                                                  uint32_t                        maxDescriptorSetStorageImages_                   = {},
-                                                  uint32_t                        maxDescriptorSetInputAttachments_                = {},
-                                                  uint32_t                        maxVertexInputAttributes_                        = {},
-                                                  uint32_t                        maxVertexInputBindings_                          = {},
-                                                  uint32_t                        maxVertexInputAttributeOffset_                   = {},
-                                                  uint32_t                        maxVertexInputBindingStride_                     = {},
-                                                  uint32_t                        maxVertexOutputComponents_                       = {},
-                                                  uint32_t                        maxTessellationGenerationLevel_                  = {},
-                                                  uint32_t                        maxTessellationPatchSize_                        = {},
-                                                  uint32_t                        maxTessellationControlPerVertexInputComponents_  = {},
-                                                  uint32_t                        maxTessellationControlPerVertexOutputComponents_ = {},
-                                                  uint32_t                        maxTessellationControlPerPatchOutputComponents_  = {},
-                                                  uint32_t                        maxTessellationControlTotalOutputComponents_     = {},
-                                                  uint32_t                        maxTessellationEvaluationInputComponents_        = {},
-                                                  uint32_t                        maxTessellationEvaluationOutputComponents_       = {},
-                                                  uint32_t                        maxGeometryShaderInvocations_                    = {},
-                                                  uint32_t                        maxGeometryInputComponents_                      = {},
-                                                  uint32_t                        maxGeometryOutputComponents_                     = {},
-                                                  uint32_t                        maxGeometryOutputVertices_                       = {},
-                                                  uint32_t                        maxGeometryTotalOutputComponents_                = {},
-                                                  uint32_t                        maxFragmentInputComponents_                      = {},
-                                                  uint32_t                        maxFragmentOutputAttachments_                    = {},
-                                                  uint32_t                        maxFragmentDualSrcAttachments_                   = {},
-                                                  uint32_t                        maxFragmentCombinedOutputResources_              = {},
-                                                  uint32_t                        maxComputeSharedMemorySize_                      = {},
-                                                  std::array<uint32_t, 3> const & maxComputeWorkGroupCount_                        = {},
-                                                  uint32_t                        maxComputeWorkGroupInvocations_                  = {},
-                                                  std::array<uint32_t, 3> const & maxComputeWorkGroupSize_                         = {},
-                                                  uint32_t                        subPixelPrecisionBits_                           = {},
-                                                  uint32_t                        subTexelPrecisionBits_                           = {},
-                                                  uint32_t                        mipmapPrecisionBits_                             = {},
-                                                  uint32_t                        maxDrawIndexedIndexValue_                        = {},
-                                                  uint32_t                        maxDrawIndirectCount_                            = {},
-                                                  float                           maxSamplerLodBias_                               = {},
-                                                  float                           maxSamplerAnisotropy_                            = {},
-                                                  uint32_t                        maxViewports_                                    = {},
-                                                  std::array<uint32_t, 2> const & maxViewportDimensions_                           = {},
-                                                  std::array<float, 2> const &    viewportBoundsRange_                             = {},
-                                                  uint32_t                        viewportSubPixelBits_                            = {},
-                                                  size_t                          minMemoryMapAlignment_                           = {},
-                                                  DeviceSize                      minTexelBufferOffsetAlignment_                   = {},
-                                                  DeviceSize                      minUniformBufferOffsetAlignment_                 = {},
-                                                  DeviceSize                      minStorageBufferOffsetAlignment_                 = {},
-                                                  int32_t                         minTexelOffset_                                  = {},
-                                                  uint32_t                        maxTexelOffset_                                  = {},
-                                                  int32_t                         minTexelGatherOffset_                            = {},
-                                                  uint32_t                        maxTexelGatherOffset_                            = {},
-                                                  float                           minInterpolationOffset_                          = {},
-                                                  float                           maxInterpolationOffset_                          = {},
-                                                  uint32_t                        subPixelInterpolationOffsetBits_                 = {},
-                                                  uint32_t                        maxFramebufferWidth_                             = {},
-                                                  uint32_t                        maxFramebufferHeight_                            = {},
-                                                  uint32_t                        maxFramebufferLayers_                            = {},
-                                                  SampleCountFlags                framebufferColorSampleCounts_                    = {},
-                                                  SampleCountFlags                framebufferDepthSampleCounts_                    = {},
-                                                  SampleCountFlags                framebufferStencilSampleCounts_                  = {},
-                                                  SampleCountFlags                framebufferNoAttachmentsSampleCounts_            = {},
-                                                  uint32_t                        maxColorAttachments_                             = {},
-                                                  SampleCountFlags                sampledImageColorSampleCounts_                   = {},
-                                                  SampleCountFlags                sampledImageIntegerSampleCounts_                 = {},
-                                                  SampleCountFlags                sampledImageDepthSampleCounts_                   = {},
-                                                  SampleCountFlags                sampledImageStencilSampleCounts_                 = {},
-                                                  SampleCountFlags                storageImageSampleCounts_                        = {},
-                                                  uint32_t                        maxSampleMaskWords_                              = {},
-                                                  Bool32                          timestampComputeAndGraphics_                     = {},
-                                                  float                           timestampPeriod_                                 = {},
-                                                  uint32_t                        maxClipDistances_                                = {},
-                                                  uint32_t                        maxCullDistances_                                = {},
-                                                  uint32_t                        maxCombinedClipAndCullDistances_                 = {},
-                                                  uint32_t                        discreteQueuePriorities_                         = {},
-                                                  std::array<float, 2> const &    pointSizeRange_                                  = {},
-                                                  std::array<float, 2> const &    lineWidthRange_                                  = {},
-                                                  float                           pointSizeGranularity_                            = {},
-                                                  float                           lineWidthGranularity_                            = {},
-                                                  Bool32                          strictLines_                                     = {},
-                                                  Bool32                          standardSampleLocations_                         = {},
-                                                  DeviceSize                      optimalBufferCopyOffsetAlignment_                = {},
-                                                  DeviceSize                      optimalBufferCopyRowPitchAlignment_              = {},
-                                                  DeviceSize                      nonCoherentAtomSize_                             = {} ) VULKAN_HPP_NOEXCEPT
-      : maxImageDimension1D{ maxImageDimension1D_ }
-      , maxImageDimension2D{ maxImageDimension2D_ }
-      , maxImageDimension3D{ maxImageDimension3D_ }
-      , maxImageDimensionCube{ maxImageDimensionCube_ }
-      , maxImageArrayLayers{ maxImageArrayLayers_ }
-      , maxTexelBufferElements{ maxTexelBufferElements_ }
-      , maxUniformBufferRange{ maxUniformBufferRange_ }
-      , maxStorageBufferRange{ maxStorageBufferRange_ }
-      , maxPushConstantsSize{ maxPushConstantsSize_ }
-      , maxMemoryAllocationCount{ maxMemoryAllocationCount_ }
-      , maxSamplerAllocationCount{ maxSamplerAllocationCount_ }
-      , bufferImageGranularity{ bufferImageGranularity_ }
-      , sparseAddressSpaceSize{ sparseAddressSpaceSize_ }
-      , maxBoundDescriptorSets{ maxBoundDescriptorSets_ }
-      , maxPerStageDescriptorSamplers{ maxPerStageDescriptorSamplers_ }
-      , maxPerStageDescriptorUniformBuffers{ maxPerStageDescriptorUniformBuffers_ }
-      , maxPerStageDescriptorStorageBuffers{ maxPerStageDescriptorStorageBuffers_ }
-      , maxPerStageDescriptorSampledImages{ maxPerStageDescriptorSampledImages_ }
-      , maxPerStageDescriptorStorageImages{ maxPerStageDescriptorStorageImages_ }
-      , maxPerStageDescriptorInputAttachments{ maxPerStageDescriptorInputAttachments_ }
-      , maxPerStageResources{ maxPerStageResources_ }
-      , maxDescriptorSetSamplers{ maxDescriptorSetSamplers_ }
-      , maxDescriptorSetUniformBuffers{ maxDescriptorSetUniformBuffers_ }
-      , maxDescriptorSetUniformBuffersDynamic{ maxDescriptorSetUniformBuffersDynamic_ }
-      , maxDescriptorSetStorageBuffers{ maxDescriptorSetStorageBuffers_ }
-      , maxDescriptorSetStorageBuffersDynamic{ maxDescriptorSetStorageBuffersDynamic_ }
-      , maxDescriptorSetSampledImages{ maxDescriptorSetSampledImages_ }
-      , maxDescriptorSetStorageImages{ maxDescriptorSetStorageImages_ }
-      , maxDescriptorSetInputAttachments{ maxDescriptorSetInputAttachments_ }
-      , maxVertexInputAttributes{ maxVertexInputAttributes_ }
-      , maxVertexInputBindings{ maxVertexInputBindings_ }
-      , maxVertexInputAttributeOffset{ maxVertexInputAttributeOffset_ }
-      , maxVertexInputBindingStride{ maxVertexInputBindingStride_ }
-      , maxVertexOutputComponents{ maxVertexOutputComponents_ }
-      , maxTessellationGenerationLevel{ maxTessellationGenerationLevel_ }
-      , maxTessellationPatchSize{ maxTessellationPatchSize_ }
-      , maxTessellationControlPerVertexInputComponents{ maxTessellationControlPerVertexInputComponents_ }
-      , maxTessellationControlPerVertexOutputComponents{ maxTessellationControlPerVertexOutputComponents_ }
-      , maxTessellationControlPerPatchOutputComponents{ maxTessellationControlPerPatchOutputComponents_ }
-      , maxTessellationControlTotalOutputComponents{ maxTessellationControlTotalOutputComponents_ }
-      , maxTessellationEvaluationInputComponents{ maxTessellationEvaluationInputComponents_ }
-      , maxTessellationEvaluationOutputComponents{ maxTessellationEvaluationOutputComponents_ }
-      , maxGeometryShaderInvocations{ maxGeometryShaderInvocations_ }
-      , maxGeometryInputComponents{ maxGeometryInputComponents_ }
-      , maxGeometryOutputComponents{ maxGeometryOutputComponents_ }
-      , maxGeometryOutputVertices{ maxGeometryOutputVertices_ }
-      , maxGeometryTotalOutputComponents{ maxGeometryTotalOutputComponents_ }
-      , maxFragmentInputComponents{ maxFragmentInputComponents_ }
-      , maxFragmentOutputAttachments{ maxFragmentOutputAttachments_ }
-      , maxFragmentDualSrcAttachments{ maxFragmentDualSrcAttachments_ }
-      , maxFragmentCombinedOutputResources{ maxFragmentCombinedOutputResources_ }
-      , maxComputeSharedMemorySize{ maxComputeSharedMemorySize_ }
-      , maxComputeWorkGroupCount{ maxComputeWorkGroupCount_ }
-      , maxComputeWorkGroupInvocations{ maxComputeWorkGroupInvocations_ }
-      , maxComputeWorkGroupSize{ maxComputeWorkGroupSize_ }
-      , subPixelPrecisionBits{ subPixelPrecisionBits_ }
-      , subTexelPrecisionBits{ subTexelPrecisionBits_ }
-      , mipmapPrecisionBits{ mipmapPrecisionBits_ }
-      , maxDrawIndexedIndexValue{ maxDrawIndexedIndexValue_ }
-      , maxDrawIndirectCount{ maxDrawIndirectCount_ }
-      , maxSamplerLodBias{ maxSamplerLodBias_ }
-      , maxSamplerAnisotropy{ maxSamplerAnisotropy_ }
-      , maxViewports{ maxViewports_ }
-      , maxViewportDimensions{ maxViewportDimensions_ }
-      , viewportBoundsRange{ viewportBoundsRange_ }
-      , viewportSubPixelBits{ viewportSubPixelBits_ }
-      , minMemoryMapAlignment{ minMemoryMapAlignment_ }
-      , minTexelBufferOffsetAlignment{ minTexelBufferOffsetAlignment_ }
-      , minUniformBufferOffsetAlignment{ minUniformBufferOffsetAlignment_ }
-      , minStorageBufferOffsetAlignment{ minStorageBufferOffsetAlignment_ }
-      , minTexelOffset{ minTexelOffset_ }
-      , maxTexelOffset{ maxTexelOffset_ }
-      , minTexelGatherOffset{ minTexelGatherOffset_ }
-      , maxTexelGatherOffset{ maxTexelGatherOffset_ }
-      , minInterpolationOffset{ minInterpolationOffset_ }
-      , maxInterpolationOffset{ maxInterpolationOffset_ }
-      , subPixelInterpolationOffsetBits{ subPixelInterpolationOffsetBits_ }
-      , maxFramebufferWidth{ maxFramebufferWidth_ }
-      , maxFramebufferHeight{ maxFramebufferHeight_ }
-      , maxFramebufferLayers{ maxFramebufferLayers_ }
-      , framebufferColorSampleCounts{ framebufferColorSampleCounts_ }
-      , framebufferDepthSampleCounts{ framebufferDepthSampleCounts_ }
-      , framebufferStencilSampleCounts{ framebufferStencilSampleCounts_ }
-      , framebufferNoAttachmentsSampleCounts{ framebufferNoAttachmentsSampleCounts_ }
-      , maxColorAttachments{ maxColorAttachments_ }
-      , sampledImageColorSampleCounts{ sampledImageColorSampleCounts_ }
-      , sampledImageIntegerSampleCounts{ sampledImageIntegerSampleCounts_ }
-      , sampledImageDepthSampleCounts{ sampledImageDepthSampleCounts_ }
-      , sampledImageStencilSampleCounts{ sampledImageStencilSampleCounts_ }
-      , storageImageSampleCounts{ storageImageSampleCounts_ }
-      , maxSampleMaskWords{ maxSampleMaskWords_ }
-      , timestampComputeAndGraphics{ timestampComputeAndGraphics_ }
-      , timestampPeriod{ timestampPeriod_ }
-      , maxClipDistances{ maxClipDistances_ }
-      , maxCullDistances{ maxCullDistances_ }
-      , maxCombinedClipAndCullDistances{ maxCombinedClipAndCullDistances_ }
-      , discreteQueuePriorities{ discreteQueuePriorities_ }
-      , pointSizeRange{ pointSizeRange_ }
-      , lineWidthRange{ lineWidthRange_ }
-      , pointSizeGranularity{ pointSizeGranularity_ }
-      , lineWidthGranularity{ lineWidthGranularity_ }
-      , strictLines{ strictLines_ }
-      , standardSampleLocations{ standardSampleLocations_ }
-      , optimalBufferCopyOffsetAlignment{ optimalBufferCopyOffsetAlignment_ }
-      , optimalBufferCopyRowPitchAlignment{ optimalBufferCopyRowPitchAlignment_ }
-      , nonCoherentAtomSize{ nonCoherentAtomSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLimits( uint32_t                               maxImageDimension1D_                             = {},
+                                                  uint32_t                               maxImageDimension2D_                             = {},
+                                                  uint32_t                               maxImageDimension3D_                             = {},
+                                                  uint32_t                               maxImageDimensionCube_                           = {},
+                                                  uint32_t                               maxImageArrayLayers_                             = {},
+                                                  uint32_t                               maxTexelBufferElements_                          = {},
+                                                  uint32_t                               maxUniformBufferRange_                           = {},
+                                                  uint32_t                               maxStorageBufferRange_                           = {},
+                                                  uint32_t                               maxPushConstantsSize_                            = {},
+                                                  uint32_t                               maxMemoryAllocationCount_                        = {},
+                                                  uint32_t                               maxSamplerAllocationCount_                       = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       bufferImageGranularity_                          = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       sparseAddressSpaceSize_                          = {},
+                                                  uint32_t                               maxBoundDescriptorSets_                          = {},
+                                                  uint32_t                               maxPerStageDescriptorSamplers_                   = {},
+                                                  uint32_t                               maxPerStageDescriptorUniformBuffers_             = {},
+                                                  uint32_t                               maxPerStageDescriptorStorageBuffers_             = {},
+                                                  uint32_t                               maxPerStageDescriptorSampledImages_              = {},
+                                                  uint32_t                               maxPerStageDescriptorStorageImages_              = {},
+                                                  uint32_t                               maxPerStageDescriptorInputAttachments_           = {},
+                                                  uint32_t                               maxPerStageResources_                            = {},
+                                                  uint32_t                               maxDescriptorSetSamplers_                        = {},
+                                                  uint32_t                               maxDescriptorSetUniformBuffers_                  = {},
+                                                  uint32_t                               maxDescriptorSetUniformBuffersDynamic_           = {},
+                                                  uint32_t                               maxDescriptorSetStorageBuffers_                  = {},
+                                                  uint32_t                               maxDescriptorSetStorageBuffersDynamic_           = {},
+                                                  uint32_t                               maxDescriptorSetSampledImages_                   = {},
+                                                  uint32_t                               maxDescriptorSetStorageImages_                   = {},
+                                                  uint32_t                               maxDescriptorSetInputAttachments_                = {},
+                                                  uint32_t                               maxVertexInputAttributes_                        = {},
+                                                  uint32_t                               maxVertexInputBindings_                          = {},
+                                                  uint32_t                               maxVertexInputAttributeOffset_                   = {},
+                                                  uint32_t                               maxVertexInputBindingStride_                     = {},
+                                                  uint32_t                               maxVertexOutputComponents_                       = {},
+                                                  uint32_t                               maxTessellationGenerationLevel_                  = {},
+                                                  uint32_t                               maxTessellationPatchSize_                        = {},
+                                                  uint32_t                               maxTessellationControlPerVertexInputComponents_  = {},
+                                                  uint32_t                               maxTessellationControlPerVertexOutputComponents_ = {},
+                                                  uint32_t                               maxTessellationControlPerPatchOutputComponents_  = {},
+                                                  uint32_t                               maxTessellationControlTotalOutputComponents_     = {},
+                                                  uint32_t                               maxTessellationEvaluationInputComponents_        = {},
+                                                  uint32_t                               maxTessellationEvaluationOutputComponents_       = {},
+                                                  uint32_t                               maxGeometryShaderInvocations_                    = {},
+                                                  uint32_t                               maxGeometryInputComponents_                      = {},
+                                                  uint32_t                               maxGeometryOutputComponents_                     = {},
+                                                  uint32_t                               maxGeometryOutputVertices_                       = {},
+                                                  uint32_t                               maxGeometryTotalOutputComponents_                = {},
+                                                  uint32_t                               maxFragmentInputComponents_                      = {},
+                                                  uint32_t                               maxFragmentOutputAttachments_                    = {},
+                                                  uint32_t                               maxFragmentDualSrcAttachments_                   = {},
+                                                  uint32_t                               maxFragmentCombinedOutputResources_              = {},
+                                                  uint32_t                               maxComputeSharedMemorySize_                      = {},
+                                                  std::array<uint32_t, 3> const &        maxComputeWorkGroupCount_                        = {},
+                                                  uint32_t                               maxComputeWorkGroupInvocations_                  = {},
+                                                  std::array<uint32_t, 3> const &        maxComputeWorkGroupSize_                         = {},
+                                                  uint32_t                               subPixelPrecisionBits_                           = {},
+                                                  uint32_t                               subTexelPrecisionBits_                           = {},
+                                                  uint32_t                               mipmapPrecisionBits_                             = {},
+                                                  uint32_t                               maxDrawIndexedIndexValue_                        = {},
+                                                  uint32_t                               maxDrawIndirectCount_                            = {},
+                                                  float                                  maxSamplerLodBias_                               = {},
+                                                  float                                  maxSamplerAnisotropy_                            = {},
+                                                  uint32_t                               maxViewports_                                    = {},
+                                                  std::array<uint32_t, 2> const &        maxViewportDimensions_                           = {},
+                                                  std::array<float, 2> const &           viewportBoundsRange_                             = {},
+                                                  uint32_t                               viewportSubPixelBits_                            = {},
+                                                  size_t                                 minMemoryMapAlignment_                           = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       minTexelBufferOffsetAlignment_                   = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       minUniformBufferOffsetAlignment_                 = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       minStorageBufferOffsetAlignment_                 = {},
+                                                  int32_t                                minTexelOffset_                                  = {},
+                                                  uint32_t                               maxTexelOffset_                                  = {},
+                                                  int32_t                                minTexelGatherOffset_                            = {},
+                                                  uint32_t                               maxTexelGatherOffset_                            = {},
+                                                  float                                  minInterpolationOffset_                          = {},
+                                                  float                                  maxInterpolationOffset_                          = {},
+                                                  uint32_t                               subPixelInterpolationOffsetBits_                 = {},
+                                                  uint32_t                               maxFramebufferWidth_                             = {},
+                                                  uint32_t                               maxFramebufferHeight_                            = {},
+                                                  uint32_t                               maxFramebufferLayers_                            = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags framebufferColorSampleCounts_                    = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags framebufferDepthSampleCounts_                    = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags framebufferStencilSampleCounts_                  = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags framebufferNoAttachmentsSampleCounts_            = {},
+                                                  uint32_t                               maxColorAttachments_                             = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags sampledImageColorSampleCounts_                   = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags sampledImageIntegerSampleCounts_                 = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags sampledImageDepthSampleCounts_                   = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags sampledImageStencilSampleCounts_                 = {},
+                                                  VULKAN_HPP_NAMESPACE::SampleCountFlags storageImageSampleCounts_                        = {},
+                                                  uint32_t                               maxSampleMaskWords_                              = {},
+                                                  VULKAN_HPP_NAMESPACE::Bool32           timestampComputeAndGraphics_                     = {},
+                                                  float                                  timestampPeriod_                                 = {},
+                                                  uint32_t                               maxClipDistances_                                = {},
+                                                  uint32_t                               maxCullDistances_                                = {},
+                                                  uint32_t                               maxCombinedClipAndCullDistances_                 = {},
+                                                  uint32_t                               discreteQueuePriorities_                         = {},
+                                                  std::array<float, 2> const &           pointSizeRange_                                  = {},
+                                                  std::array<float, 2> const &           lineWidthRange_                                  = {},
+                                                  float                                  pointSizeGranularity_                            = {},
+                                                  float                                  lineWidthGranularity_                            = {},
+                                                  VULKAN_HPP_NAMESPACE::Bool32           strictLines_                                     = {},
+                                                  VULKAN_HPP_NAMESPACE::Bool32           standardSampleLocations_                         = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       optimalBufferCopyOffsetAlignment_                = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       optimalBufferCopyRowPitchAlignment_              = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize       nonCoherentAtomSize_ = {} ) VULKAN_HPP_NOEXCEPT
+      : maxImageDimension1D( maxImageDimension1D_ )
+      , maxImageDimension2D( maxImageDimension2D_ )
+      , maxImageDimension3D( maxImageDimension3D_ )
+      , maxImageDimensionCube( maxImageDimensionCube_ )
+      , maxImageArrayLayers( maxImageArrayLayers_ )
+      , maxTexelBufferElements( maxTexelBufferElements_ )
+      , maxUniformBufferRange( maxUniformBufferRange_ )
+      , maxStorageBufferRange( maxStorageBufferRange_ )
+      , maxPushConstantsSize( maxPushConstantsSize_ )
+      , maxMemoryAllocationCount( maxMemoryAllocationCount_ )
+      , maxSamplerAllocationCount( maxSamplerAllocationCount_ )
+      , bufferImageGranularity( bufferImageGranularity_ )
+      , sparseAddressSpaceSize( sparseAddressSpaceSize_ )
+      , maxBoundDescriptorSets( maxBoundDescriptorSets_ )
+      , maxPerStageDescriptorSamplers( maxPerStageDescriptorSamplers_ )
+      , maxPerStageDescriptorUniformBuffers( maxPerStageDescriptorUniformBuffers_ )
+      , maxPerStageDescriptorStorageBuffers( maxPerStageDescriptorStorageBuffers_ )
+      , maxPerStageDescriptorSampledImages( maxPerStageDescriptorSampledImages_ )
+      , maxPerStageDescriptorStorageImages( maxPerStageDescriptorStorageImages_ )
+      , maxPerStageDescriptorInputAttachments( maxPerStageDescriptorInputAttachments_ )
+      , maxPerStageResources( maxPerStageResources_ )
+      , maxDescriptorSetSamplers( maxDescriptorSetSamplers_ )
+      , maxDescriptorSetUniformBuffers( maxDescriptorSetUniformBuffers_ )
+      , maxDescriptorSetUniformBuffersDynamic( maxDescriptorSetUniformBuffersDynamic_ )
+      , maxDescriptorSetStorageBuffers( maxDescriptorSetStorageBuffers_ )
+      , maxDescriptorSetStorageBuffersDynamic( maxDescriptorSetStorageBuffersDynamic_ )
+      , maxDescriptorSetSampledImages( maxDescriptorSetSampledImages_ )
+      , maxDescriptorSetStorageImages( maxDescriptorSetStorageImages_ )
+      , maxDescriptorSetInputAttachments( maxDescriptorSetInputAttachments_ )
+      , maxVertexInputAttributes( maxVertexInputAttributes_ )
+      , maxVertexInputBindings( maxVertexInputBindings_ )
+      , maxVertexInputAttributeOffset( maxVertexInputAttributeOffset_ )
+      , maxVertexInputBindingStride( maxVertexInputBindingStride_ )
+      , maxVertexOutputComponents( maxVertexOutputComponents_ )
+      , maxTessellationGenerationLevel( maxTessellationGenerationLevel_ )
+      , maxTessellationPatchSize( maxTessellationPatchSize_ )
+      , maxTessellationControlPerVertexInputComponents( maxTessellationControlPerVertexInputComponents_ )
+      , maxTessellationControlPerVertexOutputComponents( maxTessellationControlPerVertexOutputComponents_ )
+      , maxTessellationControlPerPatchOutputComponents( maxTessellationControlPerPatchOutputComponents_ )
+      , maxTessellationControlTotalOutputComponents( maxTessellationControlTotalOutputComponents_ )
+      , maxTessellationEvaluationInputComponents( maxTessellationEvaluationInputComponents_ )
+      , maxTessellationEvaluationOutputComponents( maxTessellationEvaluationOutputComponents_ )
+      , maxGeometryShaderInvocations( maxGeometryShaderInvocations_ )
+      , maxGeometryInputComponents( maxGeometryInputComponents_ )
+      , maxGeometryOutputComponents( maxGeometryOutputComponents_ )
+      , maxGeometryOutputVertices( maxGeometryOutputVertices_ )
+      , maxGeometryTotalOutputComponents( maxGeometryTotalOutputComponents_ )
+      , maxFragmentInputComponents( maxFragmentInputComponents_ )
+      , maxFragmentOutputAttachments( maxFragmentOutputAttachments_ )
+      , maxFragmentDualSrcAttachments( maxFragmentDualSrcAttachments_ )
+      , maxFragmentCombinedOutputResources( maxFragmentCombinedOutputResources_ )
+      , maxComputeSharedMemorySize( maxComputeSharedMemorySize_ )
+      , maxComputeWorkGroupCount( maxComputeWorkGroupCount_ )
+      , maxComputeWorkGroupInvocations( maxComputeWorkGroupInvocations_ )
+      , maxComputeWorkGroupSize( maxComputeWorkGroupSize_ )
+      , subPixelPrecisionBits( subPixelPrecisionBits_ )
+      , subTexelPrecisionBits( subTexelPrecisionBits_ )
+      , mipmapPrecisionBits( mipmapPrecisionBits_ )
+      , maxDrawIndexedIndexValue( maxDrawIndexedIndexValue_ )
+      , maxDrawIndirectCount( maxDrawIndirectCount_ )
+      , maxSamplerLodBias( maxSamplerLodBias_ )
+      , maxSamplerAnisotropy( maxSamplerAnisotropy_ )
+      , maxViewports( maxViewports_ )
+      , maxViewportDimensions( maxViewportDimensions_ )
+      , viewportBoundsRange( viewportBoundsRange_ )
+      , viewportSubPixelBits( viewportSubPixelBits_ )
+      , minMemoryMapAlignment( minMemoryMapAlignment_ )
+      , minTexelBufferOffsetAlignment( minTexelBufferOffsetAlignment_ )
+      , minUniformBufferOffsetAlignment( minUniformBufferOffsetAlignment_ )
+      , minStorageBufferOffsetAlignment( minStorageBufferOffsetAlignment_ )
+      , minTexelOffset( minTexelOffset_ )
+      , maxTexelOffset( maxTexelOffset_ )
+      , minTexelGatherOffset( minTexelGatherOffset_ )
+      , maxTexelGatherOffset( maxTexelGatherOffset_ )
+      , minInterpolationOffset( minInterpolationOffset_ )
+      , maxInterpolationOffset( maxInterpolationOffset_ )
+      , subPixelInterpolationOffsetBits( subPixelInterpolationOffsetBits_ )
+      , maxFramebufferWidth( maxFramebufferWidth_ )
+      , maxFramebufferHeight( maxFramebufferHeight_ )
+      , maxFramebufferLayers( maxFramebufferLayers_ )
+      , framebufferColorSampleCounts( framebufferColorSampleCounts_ )
+      , framebufferDepthSampleCounts( framebufferDepthSampleCounts_ )
+      , framebufferStencilSampleCounts( framebufferStencilSampleCounts_ )
+      , framebufferNoAttachmentsSampleCounts( framebufferNoAttachmentsSampleCounts_ )
+      , maxColorAttachments( maxColorAttachments_ )
+      , sampledImageColorSampleCounts( sampledImageColorSampleCounts_ )
+      , sampledImageIntegerSampleCounts( sampledImageIntegerSampleCounts_ )
+      , sampledImageDepthSampleCounts( sampledImageDepthSampleCounts_ )
+      , sampledImageStencilSampleCounts( sampledImageStencilSampleCounts_ )
+      , storageImageSampleCounts( storageImageSampleCounts_ )
+      , maxSampleMaskWords( maxSampleMaskWords_ )
+      , timestampComputeAndGraphics( timestampComputeAndGraphics_ )
+      , timestampPeriod( timestampPeriod_ )
+      , maxClipDistances( maxClipDistances_ )
+      , maxCullDistances( maxCullDistances_ )
+      , maxCombinedClipAndCullDistances( maxCombinedClipAndCullDistances_ )
+      , discreteQueuePriorities( discreteQueuePriorities_ )
+      , pointSizeRange( pointSizeRange_ )
+      , lineWidthRange( lineWidthRange_ )
+      , pointSizeGranularity( pointSizeGranularity_ )
+      , lineWidthGranularity( lineWidthGranularity_ )
+      , strictLines( strictLines_ )
+      , standardSampleLocations( standardSampleLocations_ )
+      , optimalBufferCopyOffsetAlignment( optimalBufferCopyOffsetAlignment_ )
+      , optimalBufferCopyRowPitchAlignment( optimalBufferCopyRowPitchAlignment_ )
+      , nonCoherentAtomSize( nonCoherentAtomSize_ )
     {
     }
 
@@ -97251,11 +70576,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceLimits & operator=( PhysicalDeviceLimits const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceLimits & operator=( VkPhysicalDeviceLimits const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceLimits const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits const *>( &rhs );
       return *this;
     }
 
@@ -97269,17 +70594,10 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceLimits *>( this );
     }
 
-    operator VkPhysicalDeviceLimits const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLimits *>( this );
-    }
-
-    operator VkPhysicalDeviceLimits *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLimits *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -97291,8 +70609,8 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               DeviceSize const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -97332,9 +70650,9 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -97343,13 +70661,13 @@ namespace VULKAN_HPP_NAMESPACE
                float const &,
                float const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 2> const &,
-               ArrayWrapper1D<float, 2> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 2> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2> const &,
                uint32_t const &,
                size_t const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                int32_t const &,
                uint32_t const &,
                int32_t const &,
@@ -97360,32 +70678,33 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
                uint32_t const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
-               SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
                uint32_t const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                float const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<float, 2> const &,
-               ArrayWrapper1D<float, 2> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2> const &,
                float const &,
                float const &,
-               Bool32 const &,
-               Bool32 const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( maxImageDimension1D,
@@ -97577,1090 +70896,226 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                    maxImageDimension1D                             = {};
-    uint32_t                    maxImageDimension2D                             = {};
-    uint32_t                    maxImageDimension3D                             = {};
-    uint32_t                    maxImageDimensionCube                           = {};
-    uint32_t                    maxImageArrayLayers                             = {};
-    uint32_t                    maxTexelBufferElements                          = {};
-    uint32_t                    maxUniformBufferRange                           = {};
-    uint32_t                    maxStorageBufferRange                           = {};
-    uint32_t                    maxPushConstantsSize                            = {};
-    uint32_t                    maxMemoryAllocationCount                        = {};
-    uint32_t                    maxSamplerAllocationCount                       = {};
-    DeviceSize                  bufferImageGranularity                          = {};
-    DeviceSize                  sparseAddressSpaceSize                          = {};
-    uint32_t                    maxBoundDescriptorSets                          = {};
-    uint32_t                    maxPerStageDescriptorSamplers                   = {};
-    uint32_t                    maxPerStageDescriptorUniformBuffers             = {};
-    uint32_t                    maxPerStageDescriptorStorageBuffers             = {};
-    uint32_t                    maxPerStageDescriptorSampledImages              = {};
-    uint32_t                    maxPerStageDescriptorStorageImages              = {};
-    uint32_t                    maxPerStageDescriptorInputAttachments           = {};
-    uint32_t                    maxPerStageResources                            = {};
-    uint32_t                    maxDescriptorSetSamplers                        = {};
-    uint32_t                    maxDescriptorSetUniformBuffers                  = {};
-    uint32_t                    maxDescriptorSetUniformBuffersDynamic           = {};
-    uint32_t                    maxDescriptorSetStorageBuffers                  = {};
-    uint32_t                    maxDescriptorSetStorageBuffersDynamic           = {};
-    uint32_t                    maxDescriptorSetSampledImages                   = {};
-    uint32_t                    maxDescriptorSetStorageImages                   = {};
-    uint32_t                    maxDescriptorSetInputAttachments                = {};
-    uint32_t                    maxVertexInputAttributes                        = {};
-    uint32_t                    maxVertexInputBindings                          = {};
-    uint32_t                    maxVertexInputAttributeOffset                   = {};
-    uint32_t                    maxVertexInputBindingStride                     = {};
-    uint32_t                    maxVertexOutputComponents                       = {};
-    uint32_t                    maxTessellationGenerationLevel                  = {};
-    uint32_t                    maxTessellationPatchSize                        = {};
-    uint32_t                    maxTessellationControlPerVertexInputComponents  = {};
-    uint32_t                    maxTessellationControlPerVertexOutputComponents = {};
-    uint32_t                    maxTessellationControlPerPatchOutputComponents  = {};
-    uint32_t                    maxTessellationControlTotalOutputComponents     = {};
-    uint32_t                    maxTessellationEvaluationInputComponents        = {};
-    uint32_t                    maxTessellationEvaluationOutputComponents       = {};
-    uint32_t                    maxGeometryShaderInvocations                    = {};
-    uint32_t                    maxGeometryInputComponents                      = {};
-    uint32_t                    maxGeometryOutputComponents                     = {};
-    uint32_t                    maxGeometryOutputVertices                       = {};
-    uint32_t                    maxGeometryTotalOutputComponents                = {};
-    uint32_t                    maxFragmentInputComponents                      = {};
-    uint32_t                    maxFragmentOutputAttachments                    = {};
-    uint32_t                    maxFragmentDualSrcAttachments                   = {};
-    uint32_t                    maxFragmentCombinedOutputResources              = {};
-    uint32_t                    maxComputeSharedMemorySize                      = {};
-    ArrayWrapper1D<uint32_t, 3> maxComputeWorkGroupCount                        = {};
-    uint32_t                    maxComputeWorkGroupInvocations                  = {};
-    ArrayWrapper1D<uint32_t, 3> maxComputeWorkGroupSize                         = {};
-    uint32_t                    subPixelPrecisionBits                           = {};
-    uint32_t                    subTexelPrecisionBits                           = {};
-    uint32_t                    mipmapPrecisionBits                             = {};
-    uint32_t                    maxDrawIndexedIndexValue                        = {};
-    uint32_t                    maxDrawIndirectCount                            = {};
-    float                       maxSamplerLodBias                               = {};
-    float                       maxSamplerAnisotropy                            = {};
-    uint32_t                    maxViewports                                    = {};
-    ArrayWrapper1D<uint32_t, 2> maxViewportDimensions                           = {};
-    ArrayWrapper1D<float, 2>    viewportBoundsRange                             = {};
-    uint32_t                    viewportSubPixelBits                            = {};
-    size_t                      minMemoryMapAlignment                           = {};
-    DeviceSize                  minTexelBufferOffsetAlignment                   = {};
-    DeviceSize                  minUniformBufferOffsetAlignment                 = {};
-    DeviceSize                  minStorageBufferOffsetAlignment                 = {};
-    int32_t                     minTexelOffset                                  = {};
-    uint32_t                    maxTexelOffset                                  = {};
-    int32_t                     minTexelGatherOffset                            = {};
-    uint32_t                    maxTexelGatherOffset                            = {};
-    float                       minInterpolationOffset                          = {};
-    float                       maxInterpolationOffset                          = {};
-    uint32_t                    subPixelInterpolationOffsetBits                 = {};
-    uint32_t                    maxFramebufferWidth                             = {};
-    uint32_t                    maxFramebufferHeight                            = {};
-    uint32_t                    maxFramebufferLayers                            = {};
-    SampleCountFlags            framebufferColorSampleCounts                    = {};
-    SampleCountFlags            framebufferDepthSampleCounts                    = {};
-    SampleCountFlags            framebufferStencilSampleCounts                  = {};
-    SampleCountFlags            framebufferNoAttachmentsSampleCounts            = {};
-    uint32_t                    maxColorAttachments                             = {};
-    SampleCountFlags            sampledImageColorSampleCounts                   = {};
-    SampleCountFlags            sampledImageIntegerSampleCounts                 = {};
-    SampleCountFlags            sampledImageDepthSampleCounts                   = {};
-    SampleCountFlags            sampledImageStencilSampleCounts                 = {};
-    SampleCountFlags            storageImageSampleCounts                        = {};
-    uint32_t                    maxSampleMaskWords                              = {};
-    Bool32                      timestampComputeAndGraphics                     = {};
-    float                       timestampPeriod                                 = {};
-    uint32_t                    maxClipDistances                                = {};
-    uint32_t                    maxCullDistances                                = {};
-    uint32_t                    maxCombinedClipAndCullDistances                 = {};
-    uint32_t                    discreteQueuePriorities                         = {};
-    ArrayWrapper1D<float, 2>    pointSizeRange                                  = {};
-    ArrayWrapper1D<float, 2>    lineWidthRange                                  = {};
-    float                       pointSizeGranularity                            = {};
-    float                       lineWidthGranularity                            = {};
-    Bool32                      strictLines                                     = {};
-    Bool32                      standardSampleLocations                         = {};
-    DeviceSize                  optimalBufferCopyOffsetAlignment                = {};
-    DeviceSize                  optimalBufferCopyRowPitchAlignment              = {};
-    DeviceSize                  nonCoherentAtomSize                             = {};
+    uint32_t                                          maxImageDimension1D                             = {};
+    uint32_t                                          maxImageDimension2D                             = {};
+    uint32_t                                          maxImageDimension3D                             = {};
+    uint32_t                                          maxImageDimensionCube                           = {};
+    uint32_t                                          maxImageArrayLayers                             = {};
+    uint32_t                                          maxTexelBufferElements                          = {};
+    uint32_t                                          maxUniformBufferRange                           = {};
+    uint32_t                                          maxStorageBufferRange                           = {};
+    uint32_t                                          maxPushConstantsSize                            = {};
+    uint32_t                                          maxMemoryAllocationCount                        = {};
+    uint32_t                                          maxSamplerAllocationCount                       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  bufferImageGranularity                          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  sparseAddressSpaceSize                          = {};
+    uint32_t                                          maxBoundDescriptorSets                          = {};
+    uint32_t                                          maxPerStageDescriptorSamplers                   = {};
+    uint32_t                                          maxPerStageDescriptorUniformBuffers             = {};
+    uint32_t                                          maxPerStageDescriptorStorageBuffers             = {};
+    uint32_t                                          maxPerStageDescriptorSampledImages              = {};
+    uint32_t                                          maxPerStageDescriptorStorageImages              = {};
+    uint32_t                                          maxPerStageDescriptorInputAttachments           = {};
+    uint32_t                                          maxPerStageResources                            = {};
+    uint32_t                                          maxDescriptorSetSamplers                        = {};
+    uint32_t                                          maxDescriptorSetUniformBuffers                  = {};
+    uint32_t                                          maxDescriptorSetUniformBuffersDynamic           = {};
+    uint32_t                                          maxDescriptorSetStorageBuffers                  = {};
+    uint32_t                                          maxDescriptorSetStorageBuffersDynamic           = {};
+    uint32_t                                          maxDescriptorSetSampledImages                   = {};
+    uint32_t                                          maxDescriptorSetStorageImages                   = {};
+    uint32_t                                          maxDescriptorSetInputAttachments                = {};
+    uint32_t                                          maxVertexInputAttributes                        = {};
+    uint32_t                                          maxVertexInputBindings                          = {};
+    uint32_t                                          maxVertexInputAttributeOffset                   = {};
+    uint32_t                                          maxVertexInputBindingStride                     = {};
+    uint32_t                                          maxVertexOutputComponents                       = {};
+    uint32_t                                          maxTessellationGenerationLevel                  = {};
+    uint32_t                                          maxTessellationPatchSize                        = {};
+    uint32_t                                          maxTessellationControlPerVertexInputComponents  = {};
+    uint32_t                                          maxTessellationControlPerVertexOutputComponents = {};
+    uint32_t                                          maxTessellationControlPerPatchOutputComponents  = {};
+    uint32_t                                          maxTessellationControlTotalOutputComponents     = {};
+    uint32_t                                          maxTessellationEvaluationInputComponents        = {};
+    uint32_t                                          maxTessellationEvaluationOutputComponents       = {};
+    uint32_t                                          maxGeometryShaderInvocations                    = {};
+    uint32_t                                          maxGeometryInputComponents                      = {};
+    uint32_t                                          maxGeometryOutputComponents                     = {};
+    uint32_t                                          maxGeometryOutputVertices                       = {};
+    uint32_t                                          maxGeometryTotalOutputComponents                = {};
+    uint32_t                                          maxFragmentInputComponents                      = {};
+    uint32_t                                          maxFragmentOutputAttachments                    = {};
+    uint32_t                                          maxFragmentDualSrcAttachments                   = {};
+    uint32_t                                          maxFragmentCombinedOutputResources              = {};
+    uint32_t                                          maxComputeSharedMemorySize                      = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxComputeWorkGroupCount                        = {};
+    uint32_t                                          maxComputeWorkGroupInvocations                  = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxComputeWorkGroupSize                         = {};
+    uint32_t                                          subPixelPrecisionBits                           = {};
+    uint32_t                                          subTexelPrecisionBits                           = {};
+    uint32_t                                          mipmapPrecisionBits                             = {};
+    uint32_t                                          maxDrawIndexedIndexValue                        = {};
+    uint32_t                                          maxDrawIndirectCount                            = {};
+    float                                             maxSamplerLodBias                               = {};
+    float                                             maxSamplerAnisotropy                            = {};
+    uint32_t                                          maxViewports                                    = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 2> maxViewportDimensions                           = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2>    viewportBoundsRange                             = {};
+    uint32_t                                          viewportSubPixelBits                            = {};
+    size_t                                            minMemoryMapAlignment                           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  minTexelBufferOffsetAlignment                   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  minUniformBufferOffsetAlignment                 = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  minStorageBufferOffsetAlignment                 = {};
+    int32_t                                           minTexelOffset                                  = {};
+    uint32_t                                          maxTexelOffset                                  = {};
+    int32_t                                           minTexelGatherOffset                            = {};
+    uint32_t                                          maxTexelGatherOffset                            = {};
+    float                                             minInterpolationOffset                          = {};
+    float                                             maxInterpolationOffset                          = {};
+    uint32_t                                          subPixelInterpolationOffsetBits                 = {};
+    uint32_t                                          maxFramebufferWidth                             = {};
+    uint32_t                                          maxFramebufferHeight                            = {};
+    uint32_t                                          maxFramebufferLayers                            = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            framebufferColorSampleCounts                    = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            framebufferDepthSampleCounts                    = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            framebufferStencilSampleCounts                  = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            framebufferNoAttachmentsSampleCounts            = {};
+    uint32_t                                          maxColorAttachments                             = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            sampledImageColorSampleCounts                   = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            sampledImageIntegerSampleCounts                 = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            sampledImageDepthSampleCounts                   = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            sampledImageStencilSampleCounts                 = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags            storageImageSampleCounts                        = {};
+    uint32_t                                          maxSampleMaskWords                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      timestampComputeAndGraphics                     = {};
+    float                                             timestampPeriod                                 = {};
+    uint32_t                                          maxClipDistances                                = {};
+    uint32_t                                          maxCullDistances                                = {};
+    uint32_t                                          maxCombinedClipAndCullDistances                 = {};
+    uint32_t                                          discreteQueuePriorities                         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2>    pointSizeRange                                  = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2>    lineWidthRange                                  = {};
+    float                                             pointSizeGranularity                            = {};
+    float                                             lineWidthGranularity                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      strictLines                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      standardSampleLocations                         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  optimalBufferCopyOffsetAlignment                = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  optimalBufferCopyRowPitchAlignment              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  nonCoherentAtomSize                             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLimits>
+  struct PhysicalDeviceLineRasterizationFeaturesKHR
   {
-    using Type = PhysicalDeviceLimits;
-  };
-#endif
-
-  // wrapper struct for struct VkPhysicalDeviceSparseProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSparseProperties.html
-  struct PhysicalDeviceSparseProperties
-  {
-    using NativeType = VkPhysicalDeviceSparseProperties;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSparseProperties( Bool32 residencyStandard2DBlockShape_            = {},
-                                                         Bool32 residencyStandard2DMultisampleBlockShape_ = {},
-                                                         Bool32 residencyStandard3DBlockShape_            = {},
-                                                         Bool32 residencyAlignedMipSize_                  = {},
-                                                         Bool32 residencyNonResidentStrict_               = {} ) VULKAN_HPP_NOEXCEPT
-      : residencyStandard2DBlockShape{ residencyStandard2DBlockShape_ }
-      , residencyStandard2DMultisampleBlockShape{ residencyStandard2DMultisampleBlockShape_ }
-      , residencyStandard3DBlockShape{ residencyStandard3DBlockShape_ }
-      , residencyAlignedMipSize{ residencyAlignedMipSize_ }
-      , residencyNonResidentStrict{ residencyNonResidentStrict_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSparseProperties( PhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceSparseProperties( VkPhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceSparseProperties( *reinterpret_cast<PhysicalDeviceSparseProperties const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceSparseProperties & operator=( PhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceSparseProperties & operator=( VkPhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceSparseProperties const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceSparseProperties const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceSparseProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSparseProperties &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceSparseProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSparseProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSparseProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSparseProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSparseProperties *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( residencyStandard2DBlockShape,
-                       residencyStandard2DMultisampleBlockShape,
-                       residencyStandard3DBlockShape,
-                       residencyAlignedMipSize,
-                       residencyNonResidentStrict );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceSparseProperties const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceSparseProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( residencyStandard2DBlockShape == rhs.residencyStandard2DBlockShape ) &&
-             ( residencyStandard2DMultisampleBlockShape == rhs.residencyStandard2DMultisampleBlockShape ) &&
-             ( residencyStandard3DBlockShape == rhs.residencyStandard3DBlockShape ) && ( residencyAlignedMipSize == rhs.residencyAlignedMipSize ) &&
-             ( residencyNonResidentStrict == rhs.residencyNonResidentStrict );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceSparseProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    Bool32 residencyStandard2DBlockShape            = {};
-    Bool32 residencyStandard2DMultisampleBlockShape = {};
-    Bool32 residencyStandard3DBlockShape            = {};
-    Bool32 residencyAlignedMipSize                  = {};
-    Bool32 residencyNonResidentStrict               = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSparseProperties>
-  {
-    using Type = PhysicalDeviceSparseProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkPhysicalDeviceProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProperties.html
-  struct PhysicalDeviceProperties
-  {
-    using NativeType = VkPhysicalDeviceProperties;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties( uint32_t                                                   apiVersion_    = {},
-                                                      uint32_t                                                   driverVersion_ = {},
-                                                      uint32_t                                                   vendorID_      = {},
-                                                      uint32_t                                                   deviceID_      = {},
-                                                      PhysicalDeviceType                                         deviceType_    = PhysicalDeviceType::eOther,
-                                                      std::array<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const & deviceName_    = {},
-                                                      std::array<uint8_t, VK_UUID_SIZE> const &                  pipelineCacheUUID_ = {},
-                                                      PhysicalDeviceLimits                                       limits_            = {},
-                                                      PhysicalDeviceSparseProperties                             sparseProperties_  = {} ) VULKAN_HPP_NOEXCEPT
-      : apiVersion{ apiVersion_ }
-      , driverVersion{ driverVersion_ }
-      , vendorID{ vendorID_ }
-      , deviceID{ deviceID_ }
-      , deviceType{ deviceType_ }
-      , deviceName{ deviceName_ }
-      , pipelineCacheUUID{ pipelineCacheUUID_ }
-      , limits{ limits_ }
-      , sparseProperties{ sparseProperties_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties( PhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceProperties( VkPhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceProperties( *reinterpret_cast<PhysicalDeviceProperties const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceProperties & operator=( PhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceProperties & operator=( VkPhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceProperties const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceProperties const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProperties *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               PhysicalDeviceType const &,
-               ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               PhysicalDeviceLimits const &,
-               PhysicalDeviceSparseProperties const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( apiVersion, driverVersion, vendorID, deviceID, deviceType, deviceName, pipelineCacheUUID, limits, sparseProperties );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::partial_ordering operator<=>( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = apiVersion <=> rhs.apiVersion; cmp != 0 )
-        return cmp;
-      if ( auto cmp = driverVersion <=> rhs.driverVersion; cmp != 0 )
-        return cmp;
-      if ( auto cmp = vendorID <=> rhs.vendorID; cmp != 0 )
-        return cmp;
-      if ( auto cmp = deviceID <=> rhs.deviceID; cmp != 0 )
-        return cmp;
-      if ( auto cmp = deviceType <=> rhs.deviceType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = strcmp( deviceName, rhs.deviceName ); cmp != 0 )
-        return ( cmp < 0 ) ? std::partial_ordering::less : std::partial_ordering::greater;
-      if ( auto cmp = pipelineCacheUUID <=> rhs.pipelineCacheUUID; cmp != 0 )
-        return cmp;
-      if ( auto cmp = limits <=> rhs.limits; cmp != 0 )
-        return cmp;
-      if ( auto cmp = sparseProperties <=> rhs.sparseProperties; cmp != 0 )
-        return cmp;
-
-      return std::partial_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( apiVersion == rhs.apiVersion ) && ( driverVersion == rhs.driverVersion ) && ( vendorID == rhs.vendorID ) && ( deviceID == rhs.deviceID ) &&
-             ( deviceType == rhs.deviceType ) && ( strcmp( deviceName, rhs.deviceName ) == 0 ) && ( pipelineCacheUUID == rhs.pipelineCacheUUID ) &&
-             ( limits == rhs.limits ) && ( sparseProperties == rhs.sparseProperties );
-    }
-
-    bool operator!=( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    uint32_t                                               apiVersion        = {};
-    uint32_t                                               driverVersion     = {};
-    uint32_t                                               vendorID          = {};
-    uint32_t                                               deviceID          = {};
-    PhysicalDeviceType                                     deviceType        = PhysicalDeviceType::eOther;
-    ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> deviceName        = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE>                  pipelineCacheUUID = {};
-    PhysicalDeviceLimits                                   limits            = {};
-    PhysicalDeviceSparseProperties                         sparseProperties  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProperties>
-  {
-    using Type = PhysicalDeviceProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkPhysicalDeviceProperties2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProperties2.html
-  struct PhysicalDeviceProperties2
-  {
-    using NativeType = VkPhysicalDeviceProperties2;
+    using NativeType = VkPhysicalDeviceLineRasterizationFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProperties2;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLineRasterizationFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties2( PhysicalDeviceProperties properties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , properties{ properties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 rectangularLines_         = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 bresenhamLines_           = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 smoothLines_              = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 stippledRectangularLines_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 stippledBresenhamLines_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 stippledSmoothLines_      = {},
+                                                                     void *                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rectangularLines( rectangularLines_ )
+      , bresenhamLines( bresenhamLines_ )
+      , smoothLines( smoothLines_ )
+      , stippledRectangularLines( stippledRectangularLines_ )
+      , stippledBresenhamLines( stippledBresenhamLines_ )
+      , stippledSmoothLines( stippledSmoothLines_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties2( PhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationFeaturesKHR( PhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceProperties2( VkPhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceProperties2( *reinterpret_cast<PhysicalDeviceProperties2 const *>( &rhs ) )
+    PhysicalDeviceLineRasterizationFeaturesKHR( VkPhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceLineRasterizationFeaturesKHR( *reinterpret_cast<PhysicalDeviceLineRasterizationFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceProperties2 & operator=( PhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceLineRasterizationFeaturesKHR & operator=( PhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceProperties2 & operator=( VkPhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceLineRasterizationFeaturesKHR & operator=( VkPhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceProperties2 const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceProperties2 *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties2 &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceProperties2 *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProperties2 *>( this );
-    }
-
-    operator VkPhysicalDeviceProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProperties2 *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PhysicalDeviceProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, properties );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceProperties2 const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceProperties2 const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( properties == rhs.properties );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceProperties2 const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType            sType      = StructureType::ePhysicalDeviceProperties2;
-    void *                   pNext      = {};
-    PhysicalDeviceProperties properties = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProperties2>
-  {
-    using Type = PhysicalDeviceProperties2;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceProperties2>
-  {
-    using Type = PhysicalDeviceProperties2;
-  };
-
-  using PhysicalDeviceProperties2KHR = PhysicalDeviceProperties2;
-
-  // wrapper struct for struct VkPhysicalDeviceLayeredApiVulkanPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLayeredApiVulkanPropertiesKHR.html
-  struct PhysicalDeviceLayeredApiVulkanPropertiesKHR
-  {
-    using NativeType = VkPhysicalDeviceLayeredApiVulkanPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLayeredApiVulkanPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLayeredApiVulkanPropertiesKHR( PhysicalDeviceProperties2 properties_ = {},
-                                                                         void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , properties{ properties_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14
-      PhysicalDeviceLayeredApiVulkanPropertiesKHR( PhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLayeredApiVulkanPropertiesKHR( VkPhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLayeredApiVulkanPropertiesKHR( *reinterpret_cast<PhysicalDeviceLayeredApiVulkanPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLayeredApiVulkanPropertiesKHR & operator=( PhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLayeredApiVulkanPropertiesKHR & operator=( VkPhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLayeredApiVulkanPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceLayeredApiVulkanPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLayeredApiVulkanPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiVulkanPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLayeredApiVulkanPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiVulkanPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLayeredApiVulkanPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredApiVulkanPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLayeredApiVulkanPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PhysicalDeviceProperties2 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, properties );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLayeredApiVulkanPropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( properties == rhs.properties );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceLayeredApiVulkanPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType             sType      = StructureType::ePhysicalDeviceLayeredApiVulkanPropertiesKHR;
-    void *                    pNext      = {};
-    PhysicalDeviceProperties2 properties = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLayeredApiVulkanPropertiesKHR>
-  {
-    using Type = PhysicalDeviceLayeredApiVulkanPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLayeredApiVulkanPropertiesKHR>
-  {
-    using Type = PhysicalDeviceLayeredApiVulkanPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceLayeredDriverPropertiesMSFT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLayeredDriverPropertiesMSFT.html
-  struct PhysicalDeviceLayeredDriverPropertiesMSFT
-  {
-    using NativeType = VkPhysicalDeviceLayeredDriverPropertiesMSFT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLayeredDriverPropertiesMSFT( LayeredDriverUnderlyingApiMSFT underlyingAPI_ = LayeredDriverUnderlyingApiMSFT::eNone,
-                                                                    void *                         pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , underlyingAPI{ underlyingAPI_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLayeredDriverPropertiesMSFT( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLayeredDriverPropertiesMSFT( VkPhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLayeredDriverPropertiesMSFT( *reinterpret_cast<PhysicalDeviceLayeredDriverPropertiesMSFT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLayeredDriverPropertiesMSFT & operator=( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLayeredDriverPropertiesMSFT & operator=( VkPhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLayeredDriverPropertiesMSFT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
-    }
-
-    operator VkPhysicalDeviceLayeredDriverPropertiesMSFT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLayeredDriverPropertiesMSFT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, LayeredDriverUnderlyingApiMSFT const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, underlyingAPI );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLayeredDriverPropertiesMSFT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( underlyingAPI == rhs.underlyingAPI );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceLayeredDriverPropertiesMSFT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType         = StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT;
-    void *                         pNext         = {};
-    LayeredDriverUnderlyingApiMSFT underlyingAPI = LayeredDriverUnderlyingApiMSFT::eNone;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLayeredDriverPropertiesMSFT>
-  {
-    using Type = PhysicalDeviceLayeredDriverPropertiesMSFT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT>
-  {
-    using Type = PhysicalDeviceLayeredDriverPropertiesMSFT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceLegacyDitheringFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLegacyDitheringFeaturesEXT.html
-  struct PhysicalDeviceLegacyDitheringFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceLegacyDitheringFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyDitheringFeaturesEXT( Bool32 legacyDithering_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , legacyDithering{ legacyDithering_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyDitheringFeaturesEXT( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLegacyDitheringFeaturesEXT( VkPhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLegacyDitheringFeaturesEXT( *reinterpret_cast<PhysicalDeviceLegacyDitheringFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLegacyDitheringFeaturesEXT & operator=( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLegacyDitheringFeaturesEXT & operator=( VkPhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLegacyDitheringFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyDitheringFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyDitheringFeaturesEXT & setLegacyDithering( Bool32 legacyDithering_ ) VULKAN_HPP_NOEXCEPT
-    {
-      legacyDithering = legacyDithering_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyDitheringFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLegacyDitheringFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, legacyDithering );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLegacyDitheringFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( legacyDithering == rhs.legacyDithering );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceLegacyDitheringFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType           = StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT;
-    void *        pNext           = {};
-    Bool32        legacyDithering = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLegacyDitheringFeaturesEXT>
-  {
-    using Type = PhysicalDeviceLegacyDitheringFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT>
-  {
-    using Type = PhysicalDeviceLegacyDitheringFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT.html
-  struct PhysicalDeviceLegacyVertexAttributesFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyVertexAttributesFeaturesEXT( Bool32 legacyVertexAttributes_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , legacyVertexAttributes{ legacyVertexAttributes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceLegacyVertexAttributesFeaturesEXT( PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLegacyVertexAttributesFeaturesEXT( VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLegacyVertexAttributesFeaturesEXT( *reinterpret_cast<PhysicalDeviceLegacyVertexAttributesFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLegacyVertexAttributesFeaturesEXT & operator=( PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLegacyVertexAttributesFeaturesEXT & operator=( VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLegacyVertexAttributesFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyVertexAttributesFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLegacyVertexAttributesFeaturesEXT & setLegacyVertexAttributes( Bool32 legacyVertexAttributes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      legacyVertexAttributes = legacyVertexAttributes_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, legacyVertexAttributes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( legacyVertexAttributes == rhs.legacyVertexAttributes );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceLegacyVertexAttributesFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                  = StructureType::ePhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-    void *        pNext                  = {};
-    Bool32        legacyVertexAttributes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT>
-  {
-    using Type = PhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLegacyVertexAttributesFeaturesEXT>
-  {
-    using Type = PhysicalDeviceLegacyVertexAttributesFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT.html
-  struct PhysicalDeviceLegacyVertexAttributesPropertiesEXT
-  {
-    using NativeType = VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLegacyVertexAttributesPropertiesEXT( Bool32 nativeUnalignedPerformance_ = {},
-                                                                            void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , nativeUnalignedPerformance{ nativeUnalignedPerformance_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceLegacyVertexAttributesPropertiesEXT( PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLegacyVertexAttributesPropertiesEXT( VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLegacyVertexAttributesPropertiesEXT( *reinterpret_cast<PhysicalDeviceLegacyVertexAttributesPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLegacyVertexAttributesPropertiesEXT &
-      operator=( PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLegacyVertexAttributesPropertiesEXT & operator=( VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLegacyVertexAttributesPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, nativeUnalignedPerformance );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( nativeUnalignedPerformance == rhs.nativeUnalignedPerformance );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceLegacyVertexAttributesPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-    void *        pNext                      = {};
-    Bool32        nativeUnalignedPerformance = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT>
-  {
-    using Type = PhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLegacyVertexAttributesPropertiesEXT>
-  {
-    using Type = PhysicalDeviceLegacyVertexAttributesPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceLineRasterizationFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLineRasterizationFeatures.html
-  struct PhysicalDeviceLineRasterizationFeatures
-  {
-    using NativeType = VkPhysicalDeviceLineRasterizationFeatures;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLineRasterizationFeatures;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationFeatures( Bool32 rectangularLines_         = {},
-                                                                  Bool32 bresenhamLines_           = {},
-                                                                  Bool32 smoothLines_              = {},
-                                                                  Bool32 stippledRectangularLines_ = {},
-                                                                  Bool32 stippledBresenhamLines_   = {},
-                                                                  Bool32 stippledSmoothLines_      = {},
-                                                                  void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rectangularLines{ rectangularLines_ }
-      , bresenhamLines{ bresenhamLines_ }
-      , smoothLines{ smoothLines_ }
-      , stippledRectangularLines{ stippledRectangularLines_ }
-      , stippledBresenhamLines{ stippledBresenhamLines_ }
-      , stippledSmoothLines{ stippledSmoothLines_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationFeatures( PhysicalDeviceLineRasterizationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceLineRasterizationFeatures( VkPhysicalDeviceLineRasterizationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLineRasterizationFeatures( *reinterpret_cast<PhysicalDeviceLineRasterizationFeatures const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceLineRasterizationFeatures & operator=( PhysicalDeviceLineRasterizationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceLineRasterizationFeatures & operator=( VkPhysicalDeviceLineRasterizationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceLineRasterizationFeatures const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setRectangularLines( Bool32 rectangularLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR &
+      setRectangularLines( VULKAN_HPP_NAMESPACE::Bool32 rectangularLines_ ) VULKAN_HPP_NOEXCEPT
     {
       rectangularLines = rectangularLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setBresenhamLines( Bool32 bresenhamLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR & setBresenhamLines( VULKAN_HPP_NAMESPACE::Bool32 bresenhamLines_ ) VULKAN_HPP_NOEXCEPT
     {
       bresenhamLines = bresenhamLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setSmoothLines( Bool32 smoothLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR & setSmoothLines( VULKAN_HPP_NAMESPACE::Bool32 smoothLines_ ) VULKAN_HPP_NOEXCEPT
     {
       smoothLines = smoothLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setStippledRectangularLines( Bool32 stippledRectangularLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR &
+      setStippledRectangularLines( VULKAN_HPP_NAMESPACE::Bool32 stippledRectangularLines_ ) VULKAN_HPP_NOEXCEPT
     {
       stippledRectangularLines = stippledRectangularLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setStippledBresenhamLines( Bool32 stippledBresenhamLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR &
+      setStippledBresenhamLines( VULKAN_HPP_NAMESPACE::Bool32 stippledBresenhamLines_ ) VULKAN_HPP_NOEXCEPT
     {
       stippledBresenhamLines = stippledBresenhamLines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeatures & setStippledSmoothLines( Bool32 stippledSmoothLines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLineRasterizationFeaturesKHR &
+      setStippledSmoothLines( VULKAN_HPP_NAMESPACE::Bool32 stippledSmoothLines_ ) VULKAN_HPP_NOEXCEPT
     {
       stippledSmoothLines = stippledSmoothLines_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceLineRasterizationFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLineRasterizationFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceLineRasterizationFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceLineRasterizationFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceLineRasterizationFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLineRasterizationFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceLineRasterizationFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceLineRasterizationFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLineRasterizationFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceLineRasterizationFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLineRasterizationFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceLineRasterizationFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rectangularLines, bresenhamLines, smoothLines, stippledRectangularLines, stippledBresenhamLines, stippledSmoothLines );
@@ -98668,9 +71123,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLineRasterizationFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceLineRasterizationFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceLineRasterizationFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -98681,103 +71136,87 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceLineRasterizationFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceLineRasterizationFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceLineRasterizationFeatures;
-    void *        pNext                    = {};
-    Bool32        rectangularLines         = {};
-    Bool32        bresenhamLines           = {};
-    Bool32        smoothLines              = {};
-    Bool32        stippledRectangularLines = {};
-    Bool32        stippledBresenhamLines   = {};
-    Bool32        stippledSmoothLines      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceLineRasterizationFeaturesKHR;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rectangularLines         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bresenhamLines           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        smoothLines              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        stippledRectangularLines = {};
+    VULKAN_HPP_NAMESPACE::Bool32        stippledBresenhamLines   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        stippledSmoothLines      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLineRasterizationFeatures>
-  {
-    using Type = PhysicalDeviceLineRasterizationFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLineRasterizationFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceLineRasterizationFeaturesKHR>
   {
-    using Type = PhysicalDeviceLineRasterizationFeatures;
+    using Type = PhysicalDeviceLineRasterizationFeaturesKHR;
   };
 
-  using PhysicalDeviceLineRasterizationFeaturesEXT = PhysicalDeviceLineRasterizationFeatures;
-  using PhysicalDeviceLineRasterizationFeaturesKHR = PhysicalDeviceLineRasterizationFeatures;
+  using PhysicalDeviceLineRasterizationFeaturesEXT = PhysicalDeviceLineRasterizationFeaturesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceLineRasterizationProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLineRasterizationProperties.html
-  struct PhysicalDeviceLineRasterizationProperties
+  struct PhysicalDeviceLineRasterizationPropertiesKHR
   {
-    using NativeType = VkPhysicalDeviceLineRasterizationProperties;
+    using NativeType = VkPhysicalDeviceLineRasterizationPropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLineRasterizationProperties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLineRasterizationPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationProperties( uint32_t lineSubPixelPrecisionBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , lineSubPixelPrecisionBits{ lineSubPixelPrecisionBits_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationPropertiesKHR( uint32_t lineSubPixelPrecisionBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , lineSubPixelPrecisionBits( lineSubPixelPrecisionBits_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationProperties( PhysicalDeviceLineRasterizationProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLineRasterizationPropertiesKHR( PhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceLineRasterizationProperties( VkPhysicalDeviceLineRasterizationProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceLineRasterizationProperties( *reinterpret_cast<PhysicalDeviceLineRasterizationProperties const *>( &rhs ) )
+    PhysicalDeviceLineRasterizationPropertiesKHR( VkPhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceLineRasterizationPropertiesKHR( *reinterpret_cast<PhysicalDeviceLineRasterizationPropertiesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceLineRasterizationProperties & operator=( PhysicalDeviceLineRasterizationProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceLineRasterizationPropertiesKHR & operator=( PhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceLineRasterizationProperties & operator=( VkPhysicalDeviceLineRasterizationProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceLineRasterizationPropertiesKHR & operator=( VkPhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceLineRasterizationProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLineRasterizationPropertiesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceLineRasterizationProperties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLineRasterizationPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceLineRasterizationProperties *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceLineRasterizationPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceLineRasterizationProperties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceLineRasterizationPropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceLineRasterizationProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceLineRasterizationProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLineRasterizationProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceLineRasterizationProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLineRasterizationProperties *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceLineRasterizationPropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, lineSubPixelPrecisionBits );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceLineRasterizationProperties const & ) const = default;
+    auto operator<=>( PhysicalDeviceLineRasterizationPropertiesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceLineRasterizationProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -98786,37 +71225,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceLineRasterizationProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceLineRasterizationPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceLineRasterizationProperties;
-    void *        pNext                     = {};
-    uint32_t      lineSubPixelPrecisionBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceLineRasterizationPropertiesKHR;
+    void *                              pNext                     = {};
+    uint32_t                            lineSubPixelPrecisionBits = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLineRasterizationProperties>
-  {
-    using Type = PhysicalDeviceLineRasterizationProperties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceLineRasterizationProperties>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceLineRasterizationPropertiesKHR>
   {
-    using Type = PhysicalDeviceLineRasterizationProperties;
+    using Type = PhysicalDeviceLineRasterizationPropertiesKHR;
   };
 
-  using PhysicalDeviceLineRasterizationPropertiesEXT = PhysicalDeviceLineRasterizationProperties;
-  using PhysicalDeviceLineRasterizationPropertiesKHR = PhysicalDeviceLineRasterizationProperties;
+  using PhysicalDeviceLineRasterizationPropertiesEXT = PhysicalDeviceLineRasterizationPropertiesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceLinearColorAttachmentFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceLinearColorAttachmentFeaturesNV.html
   struct PhysicalDeviceLinearColorAttachmentFeaturesNV
   {
     using NativeType = VkPhysicalDeviceLinearColorAttachmentFeaturesNV;
@@ -98824,10 +71252,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceLinearColorAttachmentFeaturesNV( Bool32 linearColorAttachment_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , linearColorAttachment{ linearColorAttachment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceLinearColorAttachmentFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 linearColorAttachment_ = {},
+                                                                        void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , linearColorAttachment( linearColorAttachment_ )
     {
     }
 
@@ -98840,27 +71269,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceLinearColorAttachmentFeaturesNV & operator=( PhysicalDeviceLinearColorAttachmentFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceLinearColorAttachmentFeaturesNV & operator=( VkPhysicalDeviceLinearColorAttachmentFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceLinearColorAttachmentFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceLinearColorAttachmentFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLinearColorAttachmentFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLinearColorAttachmentFeaturesNV & setLinearColorAttachment( Bool32 linearColorAttachment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceLinearColorAttachmentFeaturesNV &
+      setLinearColorAttachment( VULKAN_HPP_NAMESPACE::Bool32 linearColorAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       linearColorAttachment = linearColorAttachment_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceLinearColorAttachmentFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -98872,18 +71302,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceLinearColorAttachmentFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceLinearColorAttachmentFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceLinearColorAttachmentFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceLinearColorAttachmentFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceLinearColorAttachmentFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, linearColorAttachment );
     }
@@ -98908,244 +71333,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV;
-    void *        pNext                 = {};
-    Bool32        linearColorAttachment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        linearColorAttachment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceLinearColorAttachmentFeaturesNV>
-  {
-    using Type = PhysicalDeviceLinearColorAttachmentFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV>
   {
     using Type = PhysicalDeviceLinearColorAttachmentFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMaintenance10FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance10FeaturesKHR.html
-  struct PhysicalDeviceMaintenance10FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance10FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance10FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance10FeaturesKHR( Bool32 maintenance10_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance10{ maintenance10_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance10FeaturesKHR( PhysicalDeviceMaintenance10FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance10FeaturesKHR( VkPhysicalDeviceMaintenance10FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance10FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance10FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance10FeaturesKHR & operator=( PhysicalDeviceMaintenance10FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance10FeaturesKHR & operator=( VkPhysicalDeviceMaintenance10FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance10FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance10FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance10FeaturesKHR & setMaintenance10( Bool32 maintenance10_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance10 = maintenance10_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceMaintenance10FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance10FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance10FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance10FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance10FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maintenance10 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance10FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance10FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maintenance10 == rhs.maintenance10 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance10FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType         = StructureType::ePhysicalDeviceMaintenance10FeaturesKHR;
-    void *        pNext         = {};
-    Bool32        maintenance10 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance10FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance10FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance10FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance10FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance10PropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance10PropertiesKHR.html
-  struct PhysicalDeviceMaintenance10PropertiesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance10PropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance10PropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance10PropertiesKHR( Bool32 rgba4OpaqueBlackSwizzled_                         = {},
-                                                                   Bool32 resolveSrgbFormatAppliesTransferFunction_         = {},
-                                                                   Bool32 resolveSrgbFormatSupportsTransferFunctionControl_ = {},
-                                                                   void * pNext_                                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rgba4OpaqueBlackSwizzled{ rgba4OpaqueBlackSwizzled_ }
-      , resolveSrgbFormatAppliesTransferFunction{ resolveSrgbFormatAppliesTransferFunction_ }
-      , resolveSrgbFormatSupportsTransferFunctionControl{ resolveSrgbFormatSupportsTransferFunctionControl_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance10PropertiesKHR( PhysicalDeviceMaintenance10PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance10PropertiesKHR( VkPhysicalDeviceMaintenance10PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance10PropertiesKHR( *reinterpret_cast<PhysicalDeviceMaintenance10PropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance10PropertiesKHR & operator=( PhysicalDeviceMaintenance10PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance10PropertiesKHR & operator=( VkPhysicalDeviceMaintenance10PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance10PropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceMaintenance10PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance10PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10PropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance10PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10PropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance10PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance10PropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance10PropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, rgba4OpaqueBlackSwizzled, resolveSrgbFormatAppliesTransferFunction, resolveSrgbFormatSupportsTransferFunctionControl );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance10PropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance10PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( rgba4OpaqueBlackSwizzled == rhs.rgba4OpaqueBlackSwizzled ) &&
-             ( resolveSrgbFormatAppliesTransferFunction == rhs.resolveSrgbFormatAppliesTransferFunction ) &&
-             ( resolveSrgbFormatSupportsTransferFunctionControl == rhs.resolveSrgbFormatSupportsTransferFunctionControl );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance10PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                            = StructureType::ePhysicalDeviceMaintenance10PropertiesKHR;
-    void *        pNext                                            = {};
-    Bool32        rgba4OpaqueBlackSwizzled                         = {};
-    Bool32        resolveSrgbFormatAppliesTransferFunction         = {};
-    Bool32        resolveSrgbFormatSupportsTransferFunctionControl = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance10PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance10PropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance10PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance10PropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance3Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance3Properties.html
   struct PhysicalDeviceMaintenance3Properties
   {
     using NativeType = VkPhysicalDeviceMaintenance3Properties;
@@ -99153,13 +71351,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance3Properties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance3Properties( uint32_t   maxPerSetDescriptors_    = {},
-                                                               DeviceSize maxMemoryAllocationSize_ = {},
-                                                               void *     pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxPerSetDescriptors{ maxPerSetDescriptors_ }
-      , maxMemoryAllocationSize{ maxMemoryAllocationSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance3Properties( uint32_t                         maxPerSetDescriptors_    = {},
+                                                               VULKAN_HPP_NAMESPACE::DeviceSize maxMemoryAllocationSize_ = {},
+                                                               void *                           pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxPerSetDescriptors( maxPerSetDescriptors_ )
+      , maxMemoryAllocationSize( maxMemoryAllocationSize_ )
     {
     }
 
@@ -99171,11 +71369,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMaintenance3Properties & operator=( PhysicalDeviceMaintenance3Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMaintenance3Properties & operator=( VkPhysicalDeviceMaintenance3Properties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance3Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance3Properties const *>( &rhs );
       return *this;
     }
 
@@ -99189,18 +71387,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMaintenance3Properties *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance3Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance3Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance3Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance3Properties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxPerSetDescriptors, maxMemoryAllocationSize );
     }
@@ -99226,20 +71419,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceMaintenance3Properties;
-    void *        pNext                   = {};
-    uint32_t      maxPerSetDescriptors    = {};
-    DeviceSize    maxMemoryAllocationSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceMaintenance3Properties;
+    void *                              pNext                   = {};
+    uint32_t                            maxPerSetDescriptors    = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    maxMemoryAllocationSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance3Properties>
-  {
-    using Type = PhysicalDeviceMaintenance3Properties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance3Properties>
   {
@@ -99248,8 +71433,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMaintenance3PropertiesKHR = PhysicalDeviceMaintenance3Properties;
 
-  // wrapper struct for struct VkPhysicalDeviceMaintenance4Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance4Features.html
   struct PhysicalDeviceMaintenance4Features
   {
     using NativeType = VkPhysicalDeviceMaintenance4Features;
@@ -99257,10 +71440,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance4Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance4Features( Bool32 maintenance4_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance4{ maintenance4_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance4Features( VULKAN_HPP_NAMESPACE::Bool32 maintenance4_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maintenance4( maintenance4_ )
     {
     }
 
@@ -99272,27 +71455,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMaintenance4Features & operator=( PhysicalDeviceMaintenance4Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMaintenance4Features & operator=( VkPhysicalDeviceMaintenance4Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance4Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance4Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance4Features & setMaintenance4( Bool32 maintenance4_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance4Features & setMaintenance4( VULKAN_HPP_NAMESPACE::Bool32 maintenance4_ ) VULKAN_HPP_NOEXCEPT
     {
       maintenance4 = maintenance4_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMaintenance4Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -99304,18 +71487,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMaintenance4Features *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance4Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance4Features *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance4Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance4Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maintenance4 );
     }
@@ -99340,19 +71518,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance4Features;
-    void *        pNext        = {};
-    Bool32        maintenance4 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceMaintenance4Features;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        maintenance4 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance4Features>
-  {
-    using Type = PhysicalDeviceMaintenance4Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance4Features>
   {
@@ -99361,8 +71531,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMaintenance4FeaturesKHR = PhysicalDeviceMaintenance4Features;
 
-  // wrapper struct for struct VkPhysicalDeviceMaintenance4Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance4Properties.html
   struct PhysicalDeviceMaintenance4Properties
   {
     using NativeType = VkPhysicalDeviceMaintenance4Properties;
@@ -99370,10 +71538,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance4Properties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance4Properties( DeviceSize maxBufferSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxBufferSize{ maxBufferSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance4Properties( VULKAN_HPP_NAMESPACE::DeviceSize maxBufferSize_ = {},
+                                                               void *                           pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxBufferSize( maxBufferSize_ )
     {
     }
 
@@ -99385,11 +71554,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMaintenance4Properties & operator=( PhysicalDeviceMaintenance4Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMaintenance4Properties & operator=( VkPhysicalDeviceMaintenance4Properties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance4Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance4Properties const *>( &rhs );
       return *this;
     }
 
@@ -99403,18 +71572,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMaintenance4Properties *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance4Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance4Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance4Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance4Properties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxBufferSize );
     }
@@ -99439,19 +71603,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::ePhysicalDeviceMaintenance4Properties;
-    void *        pNext         = {};
-    DeviceSize    maxBufferSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceMaintenance4Properties;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    maxBufferSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance4Properties>
-  {
-    using Type = PhysicalDeviceMaintenance4Properties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance4Properties>
   {
@@ -99460,83 +71616,76 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMaintenance4PropertiesKHR = PhysicalDeviceMaintenance4Properties;
 
-  // wrapper struct for struct VkPhysicalDeviceMaintenance5Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance5Features.html
-  struct PhysicalDeviceMaintenance5Features
+  struct PhysicalDeviceMaintenance5FeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceMaintenance5Features;
+    using NativeType = VkPhysicalDeviceMaintenance5FeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance5Features;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance5FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5Features( Bool32 maintenance5_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance5{ maintenance5_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 maintenance5_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maintenance5( maintenance5_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5Features( PhysicalDeviceMaintenance5Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5FeaturesKHR( PhysicalDeviceMaintenance5FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMaintenance5Features( VkPhysicalDeviceMaintenance5Features const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance5Features( *reinterpret_cast<PhysicalDeviceMaintenance5Features const *>( &rhs ) )
+    PhysicalDeviceMaintenance5FeaturesKHR( VkPhysicalDeviceMaintenance5FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMaintenance5FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance5FeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMaintenance5Features & operator=( PhysicalDeviceMaintenance5Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMaintenance5FeaturesKHR & operator=( PhysicalDeviceMaintenance5FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMaintenance5Features & operator=( VkPhysicalDeviceMaintenance5Features const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMaintenance5FeaturesKHR & operator=( VkPhysicalDeviceMaintenance5FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance5Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance5Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance5FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance5Features & setMaintenance5( Bool32 maintenance5_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance5FeaturesKHR & setMaintenance5( VULKAN_HPP_NAMESPACE::Bool32 maintenance5_ ) VULKAN_HPP_NOEXCEPT
     {
       maintenance5 = maintenance5_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceMaintenance5Features const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance5FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance5Features *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMaintenance5FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance5Features &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance5FeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance5Features *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance5Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance5Features *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance5Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance5Features *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMaintenance5FeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maintenance5 );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance5Features const & ) const = default;
+    auto operator<=>( PhysicalDeviceMaintenance5FeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMaintenance5Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMaintenance5FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -99545,99 +71694,88 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMaintenance5Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMaintenance5FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance5Features;
-    void *        pNext        = {};
-    Bool32        maintenance5 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceMaintenance5FeaturesKHR;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        maintenance5 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance5Features>
-  {
-    using Type = PhysicalDeviceMaintenance5Features;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance5Features>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance5FeaturesKHR>
   {
-    using Type = PhysicalDeviceMaintenance5Features;
+    using Type = PhysicalDeviceMaintenance5FeaturesKHR;
   };
 
-  using PhysicalDeviceMaintenance5FeaturesKHR = PhysicalDeviceMaintenance5Features;
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance5Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance5Properties.html
-  struct PhysicalDeviceMaintenance5Properties
+  struct PhysicalDeviceMaintenance5PropertiesKHR
   {
-    using NativeType = VkPhysicalDeviceMaintenance5Properties;
+    using NativeType = VkPhysicalDeviceMaintenance5PropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance5Properties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance5PropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5Properties( Bool32 earlyFragmentMultisampleCoverageAfterSampleCounting_ = {},
-                                                               Bool32 earlyFragmentSampleMaskTestBeforeSampleCounting_     = {},
-                                                               Bool32 depthStencilSwizzleOneSupport_                       = {},
-                                                               Bool32 polygonModePointSize_                                = {},
-                                                               Bool32 nonStrictSinglePixelWideLinesUseParallelogram_       = {},
-                                                               Bool32 nonStrictWideLinesUseParallelogram_                  = {},
-                                                               void * pNext_                                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , earlyFragmentMultisampleCoverageAfterSampleCounting{ earlyFragmentMultisampleCoverageAfterSampleCounting_ }
-      , earlyFragmentSampleMaskTestBeforeSampleCounting{ earlyFragmentSampleMaskTestBeforeSampleCounting_ }
-      , depthStencilSwizzleOneSupport{ depthStencilSwizzleOneSupport_ }
-      , polygonModePointSize{ polygonModePointSize_ }
-      , nonStrictSinglePixelWideLinesUseParallelogram{ nonStrictSinglePixelWideLinesUseParallelogram_ }
-      , nonStrictWideLinesUseParallelogram{ nonStrictWideLinesUseParallelogram_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5PropertiesKHR( VULKAN_HPP_NAMESPACE::Bool32 earlyFragmentMultisampleCoverageAfterSampleCounting_ = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 earlyFragmentSampleMaskTestBeforeSampleCounting_     = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 depthStencilSwizzleOneSupport_                       = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 polygonModePointSize_                                = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 nonStrictSinglePixelWideLinesUseParallelogram_       = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 nonStrictWideLinesUseParallelogram_                  = {},
+                                                                  void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , earlyFragmentMultisampleCoverageAfterSampleCounting( earlyFragmentMultisampleCoverageAfterSampleCounting_ )
+      , earlyFragmentSampleMaskTestBeforeSampleCounting( earlyFragmentSampleMaskTestBeforeSampleCounting_ )
+      , depthStencilSwizzleOneSupport( depthStencilSwizzleOneSupport_ )
+      , polygonModePointSize( polygonModePointSize_ )
+      , nonStrictSinglePixelWideLinesUseParallelogram( nonStrictSinglePixelWideLinesUseParallelogram_ )
+      , nonStrictWideLinesUseParallelogram( nonStrictWideLinesUseParallelogram_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5Properties( PhysicalDeviceMaintenance5Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance5PropertiesKHR( PhysicalDeviceMaintenance5PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMaintenance5Properties( VkPhysicalDeviceMaintenance5Properties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance5Properties( *reinterpret_cast<PhysicalDeviceMaintenance5Properties const *>( &rhs ) )
+    PhysicalDeviceMaintenance5PropertiesKHR( VkPhysicalDeviceMaintenance5PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMaintenance5PropertiesKHR( *reinterpret_cast<PhysicalDeviceMaintenance5PropertiesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMaintenance5Properties & operator=( PhysicalDeviceMaintenance5Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMaintenance5PropertiesKHR & operator=( PhysicalDeviceMaintenance5PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMaintenance5Properties & operator=( VkPhysicalDeviceMaintenance5Properties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMaintenance5PropertiesKHR & operator=( VkPhysicalDeviceMaintenance5PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance5Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance5PropertiesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceMaintenance5Properties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance5PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance5Properties *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMaintenance5PropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance5Properties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance5PropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance5Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance5Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance5Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance5Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance5Properties *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMaintenance5PropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -99652,9 +71790,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance5Properties const & ) const = default;
+    auto operator<=>( PhysicalDeviceMaintenance5PropertiesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMaintenance5Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMaintenance5PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -99668,116 +71806,99 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMaintenance5Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMaintenance5PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                                               = StructureType::ePhysicalDeviceMaintenance5Properties;
-    void *        pNext                                               = {};
-    Bool32        earlyFragmentMultisampleCoverageAfterSampleCounting = {};
-    Bool32        earlyFragmentSampleMaskTestBeforeSampleCounting     = {};
-    Bool32        depthStencilSwizzleOneSupport                       = {};
-    Bool32        polygonModePointSize                                = {};
-    Bool32        nonStrictSinglePixelWideLinesUseParallelogram       = {};
-    Bool32        nonStrictWideLinesUseParallelogram                  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                               = StructureType::ePhysicalDeviceMaintenance5PropertiesKHR;
+    void *                              pNext                                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        earlyFragmentMultisampleCoverageAfterSampleCounting = {};
+    VULKAN_HPP_NAMESPACE::Bool32        earlyFragmentSampleMaskTestBeforeSampleCounting     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        depthStencilSwizzleOneSupport                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        polygonModePointSize                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nonStrictSinglePixelWideLinesUseParallelogram       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nonStrictWideLinesUseParallelogram                  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance5Properties>
-  {
-    using Type = PhysicalDeviceMaintenance5Properties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance5Properties>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance5PropertiesKHR>
   {
-    using Type = PhysicalDeviceMaintenance5Properties;
+    using Type = PhysicalDeviceMaintenance5PropertiesKHR;
   };
 
-  using PhysicalDeviceMaintenance5PropertiesKHR = PhysicalDeviceMaintenance5Properties;
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance6Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance6Features.html
-  struct PhysicalDeviceMaintenance6Features
+  struct PhysicalDeviceMaintenance6FeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceMaintenance6Features;
+    using NativeType = VkPhysicalDeviceMaintenance6FeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance6Features;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance6FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6Features( Bool32 maintenance6_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance6{ maintenance6_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 maintenance6_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maintenance6( maintenance6_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6Features( PhysicalDeviceMaintenance6Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6FeaturesKHR( PhysicalDeviceMaintenance6FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMaintenance6Features( VkPhysicalDeviceMaintenance6Features const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance6Features( *reinterpret_cast<PhysicalDeviceMaintenance6Features const *>( &rhs ) )
+    PhysicalDeviceMaintenance6FeaturesKHR( VkPhysicalDeviceMaintenance6FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMaintenance6FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance6FeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMaintenance6Features & operator=( PhysicalDeviceMaintenance6Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMaintenance6FeaturesKHR & operator=( PhysicalDeviceMaintenance6FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMaintenance6Features & operator=( VkPhysicalDeviceMaintenance6Features const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMaintenance6FeaturesKHR & operator=( VkPhysicalDeviceMaintenance6FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance6Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance6Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance6FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance6Features & setMaintenance6( Bool32 maintenance6_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance6FeaturesKHR & setMaintenance6( VULKAN_HPP_NAMESPACE::Bool32 maintenance6_ ) VULKAN_HPP_NOEXCEPT
     {
       maintenance6 = maintenance6_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceMaintenance6Features const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance6FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance6Features *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMaintenance6FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance6Features &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance6FeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance6Features *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance6Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance6Features *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance6Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance6Features *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMaintenance6FeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maintenance6 );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance6Features const & ) const = default;
+    auto operator<=>( PhysicalDeviceMaintenance6FeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMaintenance6Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMaintenance6FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -99786,102 +71907,89 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMaintenance6Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMaintenance6FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance6Features;
-    void *        pNext        = {};
-    Bool32        maintenance6 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceMaintenance6FeaturesKHR;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        maintenance6 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance6Features>
-  {
-    using Type = PhysicalDeviceMaintenance6Features;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance6Features>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance6FeaturesKHR>
   {
-    using Type = PhysicalDeviceMaintenance6Features;
+    using Type = PhysicalDeviceMaintenance6FeaturesKHR;
   };
 
-  using PhysicalDeviceMaintenance6FeaturesKHR = PhysicalDeviceMaintenance6Features;
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance6Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance6Properties.html
-  struct PhysicalDeviceMaintenance6Properties
+  struct PhysicalDeviceMaintenance6PropertiesKHR
   {
-    using NativeType = VkPhysicalDeviceMaintenance6Properties;
+    using NativeType = VkPhysicalDeviceMaintenance6PropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance6Properties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance6PropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6Properties( Bool32   blockTexelViewCompatibleMultipleLayers_ = {},
-                                                               uint32_t maxCombinedImageSamplerDescriptorCount_ = {},
-                                                               Bool32   fragmentShadingRateClampCombinerInputs_ = {},
-                                                               void *   pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , blockTexelViewCompatibleMultipleLayers{ blockTexelViewCompatibleMultipleLayers_ }
-      , maxCombinedImageSamplerDescriptorCount{ maxCombinedImageSamplerDescriptorCount_ }
-      , fragmentShadingRateClampCombinerInputs{ fragmentShadingRateClampCombinerInputs_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6PropertiesKHR( VULKAN_HPP_NAMESPACE::Bool32 blockTexelViewCompatibleMultipleLayers_ = {},
+                                                                  uint32_t                     maxCombinedImageSamplerDescriptorCount_ = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 fragmentShadingRateClampCombinerInputs_ = {},
+                                                                  void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , blockTexelViewCompatibleMultipleLayers( blockTexelViewCompatibleMultipleLayers_ )
+      , maxCombinedImageSamplerDescriptorCount( maxCombinedImageSamplerDescriptorCount_ )
+      , fragmentShadingRateClampCombinerInputs( fragmentShadingRateClampCombinerInputs_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6Properties( PhysicalDeviceMaintenance6Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance6PropertiesKHR( PhysicalDeviceMaintenance6PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMaintenance6Properties( VkPhysicalDeviceMaintenance6Properties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance6Properties( *reinterpret_cast<PhysicalDeviceMaintenance6Properties const *>( &rhs ) )
+    PhysicalDeviceMaintenance6PropertiesKHR( VkPhysicalDeviceMaintenance6PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMaintenance6PropertiesKHR( *reinterpret_cast<PhysicalDeviceMaintenance6PropertiesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMaintenance6Properties & operator=( PhysicalDeviceMaintenance6Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMaintenance6PropertiesKHR & operator=( PhysicalDeviceMaintenance6PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMaintenance6Properties & operator=( VkPhysicalDeviceMaintenance6Properties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMaintenance6PropertiesKHR & operator=( VkPhysicalDeviceMaintenance6PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance6Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMaintenance6PropertiesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceMaintenance6Properties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance6PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance6Properties *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMaintenance6PropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceMaintenance6Properties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMaintenance6PropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance6Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance6Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance6Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance6Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance6Properties *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMaintenance6PropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, uint32_t const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, blockTexelViewCompatibleMultipleLayers, maxCombinedImageSamplerDescriptorCount, fragmentShadingRateClampCombinerInputs );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance6Properties const & ) const = default;
+    auto operator<=>( PhysicalDeviceMaintenance6PropertiesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMaintenance6Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMaintenance6PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -99892,620 +72000,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMaintenance6Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMaintenance6PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceMaintenance6Properties;
-    void *        pNext                                  = {};
-    Bool32        blockTexelViewCompatibleMultipleLayers = {};
-    uint32_t      maxCombinedImageSamplerDescriptorCount = {};
-    Bool32        fragmentShadingRateClampCombinerInputs = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceMaintenance6PropertiesKHR;
+    void *                              pNext                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        blockTexelViewCompatibleMultipleLayers = {};
+    uint32_t                            maxCombinedImageSamplerDescriptorCount = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fragmentShadingRateClampCombinerInputs = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance6Properties>
-  {
-    using Type = PhysicalDeviceMaintenance6Properties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance6Properties>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance6PropertiesKHR>
   {
-    using Type = PhysicalDeviceMaintenance6Properties;
+    using Type = PhysicalDeviceMaintenance6PropertiesKHR;
   };
 
-  using PhysicalDeviceMaintenance6PropertiesKHR = PhysicalDeviceMaintenance6Properties;
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance7FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance7FeaturesKHR.html
-  struct PhysicalDeviceMaintenance7FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance7FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance7FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance7FeaturesKHR( Bool32 maintenance7_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance7{ maintenance7_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance7FeaturesKHR( PhysicalDeviceMaintenance7FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance7FeaturesKHR( VkPhysicalDeviceMaintenance7FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance7FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance7FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance7FeaturesKHR & operator=( PhysicalDeviceMaintenance7FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance7FeaturesKHR & operator=( VkPhysicalDeviceMaintenance7FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance7FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance7FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance7FeaturesKHR & setMaintenance7( Bool32 maintenance7_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance7 = maintenance7_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceMaintenance7FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance7FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance7FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance7FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance7FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maintenance7 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance7FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance7FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maintenance7 == rhs.maintenance7 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance7FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance7FeaturesKHR;
-    void *        pNext        = {};
-    Bool32        maintenance7 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance7FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance7FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance7FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance7FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance7PropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance7PropertiesKHR.html
-  struct PhysicalDeviceMaintenance7PropertiesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance7PropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance7PropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance7PropertiesKHR( Bool32   robustFragmentShadingRateAttachmentAccess_                 = {},
-                                                                  Bool32   separateDepthStencilAttachmentAccess_                      = {},
-                                                                  uint32_t maxDescriptorSetTotalUniformBuffersDynamic_                = {},
-                                                                  uint32_t maxDescriptorSetTotalStorageBuffersDynamic_                = {},
-                                                                  uint32_t maxDescriptorSetTotalBuffersDynamic_                       = {},
-                                                                  uint32_t maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic_ = {},
-                                                                  uint32_t maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic_ = {},
-                                                                  uint32_t maxDescriptorSetUpdateAfterBindTotalBuffersDynamic_        = {},
-                                                                  void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , robustFragmentShadingRateAttachmentAccess{ robustFragmentShadingRateAttachmentAccess_ }
-      , separateDepthStencilAttachmentAccess{ separateDepthStencilAttachmentAccess_ }
-      , maxDescriptorSetTotalUniformBuffersDynamic{ maxDescriptorSetTotalUniformBuffersDynamic_ }
-      , maxDescriptorSetTotalStorageBuffersDynamic{ maxDescriptorSetTotalStorageBuffersDynamic_ }
-      , maxDescriptorSetTotalBuffersDynamic{ maxDescriptorSetTotalBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic{ maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic{ maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindTotalBuffersDynamic{ maxDescriptorSetUpdateAfterBindTotalBuffersDynamic_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance7PropertiesKHR( PhysicalDeviceMaintenance7PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance7PropertiesKHR( VkPhysicalDeviceMaintenance7PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance7PropertiesKHR( *reinterpret_cast<PhysicalDeviceMaintenance7PropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance7PropertiesKHR & operator=( PhysicalDeviceMaintenance7PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance7PropertiesKHR & operator=( VkPhysicalDeviceMaintenance7PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance7PropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceMaintenance7PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance7PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7PropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance7PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7PropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance7PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance7PropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance7PropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       robustFragmentShadingRateAttachmentAccess,
-                       separateDepthStencilAttachmentAccess,
-                       maxDescriptorSetTotalUniformBuffersDynamic,
-                       maxDescriptorSetTotalStorageBuffersDynamic,
-                       maxDescriptorSetTotalBuffersDynamic,
-                       maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic,
-                       maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic,
-                       maxDescriptorSetUpdateAfterBindTotalBuffersDynamic );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance7PropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance7PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) &&
-             ( robustFragmentShadingRateAttachmentAccess == rhs.robustFragmentShadingRateAttachmentAccess ) &&
-             ( separateDepthStencilAttachmentAccess == rhs.separateDepthStencilAttachmentAccess ) &&
-             ( maxDescriptorSetTotalUniformBuffersDynamic == rhs.maxDescriptorSetTotalUniformBuffersDynamic ) &&
-             ( maxDescriptorSetTotalStorageBuffersDynamic == rhs.maxDescriptorSetTotalStorageBuffersDynamic ) &&
-             ( maxDescriptorSetTotalBuffersDynamic == rhs.maxDescriptorSetTotalBuffersDynamic ) &&
-             ( maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic == rhs.maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic ) &&
-             ( maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic == rhs.maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic ) &&
-             ( maxDescriptorSetUpdateAfterBindTotalBuffersDynamic == rhs.maxDescriptorSetUpdateAfterBindTotalBuffersDynamic );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance7PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                                     = StructureType::ePhysicalDeviceMaintenance7PropertiesKHR;
-    void *        pNext                                                     = {};
-    Bool32        robustFragmentShadingRateAttachmentAccess                 = {};
-    Bool32        separateDepthStencilAttachmentAccess                      = {};
-    uint32_t      maxDescriptorSetTotalUniformBuffersDynamic                = {};
-    uint32_t      maxDescriptorSetTotalStorageBuffersDynamic                = {};
-    uint32_t      maxDescriptorSetTotalBuffersDynamic                       = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic = {};
-    uint32_t      maxDescriptorSetUpdateAfterBindTotalBuffersDynamic        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance7PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance7PropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance7PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance7PropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance8FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance8FeaturesKHR.html
-  struct PhysicalDeviceMaintenance8FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance8FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance8FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance8FeaturesKHR( Bool32 maintenance8_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance8{ maintenance8_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance8FeaturesKHR( PhysicalDeviceMaintenance8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance8FeaturesKHR( VkPhysicalDeviceMaintenance8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance8FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance8FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance8FeaturesKHR & operator=( PhysicalDeviceMaintenance8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance8FeaturesKHR & operator=( VkPhysicalDeviceMaintenance8FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance8FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance8FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance8FeaturesKHR & setMaintenance8( Bool32 maintenance8_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance8 = maintenance8_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceMaintenance8FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance8FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance8FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance8FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance8FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance8FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance8FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance8FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maintenance8 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance8FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance8FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maintenance8 == rhs.maintenance8 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance8FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance8FeaturesKHR;
-    void *        pNext        = {};
-    Bool32        maintenance8 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance8FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance8FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance8FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance8FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance9FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance9FeaturesKHR.html
-  struct PhysicalDeviceMaintenance9FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance9FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance9FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance9FeaturesKHR( Bool32 maintenance9_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maintenance9{ maintenance9_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance9FeaturesKHR( PhysicalDeviceMaintenance9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance9FeaturesKHR( VkPhysicalDeviceMaintenance9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance9FeaturesKHR( *reinterpret_cast<PhysicalDeviceMaintenance9FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance9FeaturesKHR & operator=( PhysicalDeviceMaintenance9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance9FeaturesKHR & operator=( VkPhysicalDeviceMaintenance9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance9FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance9FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMaintenance9FeaturesKHR & setMaintenance9( Bool32 maintenance9_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance9 = maintenance9_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceMaintenance9FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance9FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maintenance9 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance9FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance9FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maintenance9 == rhs.maintenance9 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance9FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType        = StructureType::ePhysicalDeviceMaintenance9FeaturesKHR;
-    void *        pNext        = {};
-    Bool32        maintenance9 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance9FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance9FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance9FeaturesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance9FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMaintenance9PropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMaintenance9PropertiesKHR.html
-  struct PhysicalDeviceMaintenance9PropertiesKHR
-  {
-    using NativeType = VkPhysicalDeviceMaintenance9PropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMaintenance9PropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceMaintenance9PropertiesKHR( Bool32                         image2DViewOf3DSparse_       = {},
-                                               DefaultVertexAttributeValueKHR defaultVertexAttributeValue_ = DefaultVertexAttributeValueKHR::eZeroZeroZeroZero,
-                                               void *                         pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , image2DViewOf3DSparse{ image2DViewOf3DSparse_ }
-      , defaultVertexAttributeValue{ defaultVertexAttributeValue_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMaintenance9PropertiesKHR( PhysicalDeviceMaintenance9PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceMaintenance9PropertiesKHR( VkPhysicalDeviceMaintenance9PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMaintenance9PropertiesKHR( *reinterpret_cast<PhysicalDeviceMaintenance9PropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceMaintenance9PropertiesKHR & operator=( PhysicalDeviceMaintenance9PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceMaintenance9PropertiesKHR & operator=( VkPhysicalDeviceMaintenance9PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceMaintenance9PropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceMaintenance9PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceMaintenance9PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9PropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceMaintenance9PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9PropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMaintenance9PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceMaintenance9PropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMaintenance9PropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, DefaultVertexAttributeValueKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, image2DViewOf3DSparse, defaultVertexAttributeValue );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMaintenance9PropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceMaintenance9PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( image2DViewOf3DSparse == rhs.image2DViewOf3DSparse ) &&
-             ( defaultVertexAttributeValue == rhs.defaultVertexAttributeValue );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceMaintenance9PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType                       = StructureType::ePhysicalDeviceMaintenance9PropertiesKHR;
-    void *                         pNext                       = {};
-    Bool32                         image2DViewOf3DSparse       = {};
-    DefaultVertexAttributeValueKHR defaultVertexAttributeValue = DefaultVertexAttributeValueKHR::eZeroZeroZeroZero;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMaintenance9PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance9PropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMaintenance9PropertiesKHR>
-  {
-    using Type = PhysicalDeviceMaintenance9PropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceMapMemoryPlacedFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMapMemoryPlacedFeaturesEXT.html
   struct PhysicalDeviceMapMemoryPlacedFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMapMemoryPlacedFeaturesEXT;
@@ -100513,15 +72027,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMapMemoryPlacedFeaturesEXT( Bool32 memoryMapPlaced_      = {},
-                                                                   Bool32 memoryMapRangePlaced_ = {},
-                                                                   Bool32 memoryUnmapReserve_   = {},
-                                                                   void * pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryMapPlaced{ memoryMapPlaced_ }
-      , memoryMapRangePlaced{ memoryMapRangePlaced_ }
-      , memoryUnmapReserve{ memoryUnmapReserve_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMapMemoryPlacedFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 memoryMapPlaced_      = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 memoryMapRangePlaced_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 memoryUnmapReserve_   = {},
+                                                                   void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryMapPlaced( memoryMapPlaced_ )
+      , memoryMapRangePlaced( memoryMapRangePlaced_ )
+      , memoryUnmapReserve( memoryUnmapReserve_ )
     {
     }
 
@@ -100533,39 +72047,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMapMemoryPlacedFeaturesEXT & operator=( PhysicalDeviceMapMemoryPlacedFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMapMemoryPlacedFeaturesEXT & operator=( VkPhysicalDeviceMapMemoryPlacedFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMapMemoryPlacedFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT & setMemoryMapPlaced( Bool32 memoryMapPlaced_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT & setMemoryMapPlaced( VULKAN_HPP_NAMESPACE::Bool32 memoryMapPlaced_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryMapPlaced = memoryMapPlaced_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT & setMemoryMapRangePlaced( Bool32 memoryMapRangePlaced_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT &
+      setMemoryMapRangePlaced( VULKAN_HPP_NAMESPACE::Bool32 memoryMapRangePlaced_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryMapRangePlaced = memoryMapRangePlaced_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT & setMemoryUnmapReserve( Bool32 memoryUnmapReserve_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMapMemoryPlacedFeaturesEXT &
+      setMemoryUnmapReserve( VULKAN_HPP_NAMESPACE::Bool32 memoryUnmapReserve_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryUnmapReserve = memoryUnmapReserve_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMapMemoryPlacedFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -100577,18 +72093,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMapMemoryPlacedFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMapMemoryPlacedFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMapMemoryPlacedFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMapMemoryPlacedFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMapMemoryPlacedFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryMapPlaced, memoryMapRangePlaced, memoryUnmapReserve );
     }
@@ -100614,29 +72129,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT;
-    void *        pNext                = {};
-    Bool32        memoryMapPlaced      = {};
-    Bool32        memoryMapRangePlaced = {};
-    Bool32        memoryUnmapReserve   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        memoryMapPlaced      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        memoryMapRangePlaced = {};
+    VULKAN_HPP_NAMESPACE::Bool32        memoryUnmapReserve   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMapMemoryPlacedFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMapMemoryPlacedFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT>
   {
     using Type = PhysicalDeviceMapMemoryPlacedFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMapMemoryPlacedPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMapMemoryPlacedPropertiesEXT.html
   struct PhysicalDeviceMapMemoryPlacedPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceMapMemoryPlacedPropertiesEXT;
@@ -100644,10 +72149,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMapMemoryPlacedPropertiesEXT( DeviceSize minPlacedMemoryMapAlignment_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minPlacedMemoryMapAlignment{ minPlacedMemoryMapAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMapMemoryPlacedPropertiesEXT( VULKAN_HPP_NAMESPACE::DeviceSize minPlacedMemoryMapAlignment_ = {},
+                                                                     void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minPlacedMemoryMapAlignment( minPlacedMemoryMapAlignment_ )
     {
     }
 
@@ -100659,11 +72165,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMapMemoryPlacedPropertiesEXT & operator=( PhysicalDeviceMapMemoryPlacedPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMapMemoryPlacedPropertiesEXT & operator=( VkPhysicalDeviceMapMemoryPlacedPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMapMemoryPlacedPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMapMemoryPlacedPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -100677,18 +72183,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMapMemoryPlacedPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMapMemoryPlacedPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMapMemoryPlacedPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMapMemoryPlacedPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMapMemoryPlacedPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minPlacedMemoryMapAlignment );
     }
@@ -100713,27 +72214,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT;
-    void *        pNext                       = {};
-    DeviceSize    minPlacedMemoryMapAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    minPlacedMemoryMapAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMapMemoryPlacedPropertiesEXT>
-  {
-    using Type = PhysicalDeviceMapMemoryPlacedPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT>
   {
     using Type = PhysicalDeviceMapMemoryPlacedPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMemoryBudgetPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryBudgetPropertiesEXT.html
   struct PhysicalDeviceMemoryBudgetPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceMemoryBudgetPropertiesEXT;
@@ -100741,13 +72232,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryBudgetPropertiesEXT( std::array<DeviceSize, VK_MAX_MEMORY_HEAPS> const & heapBudget_ = {},
-                                                                     std::array<DeviceSize, VK_MAX_MEMORY_HEAPS> const & heapUsage_  = {},
-                                                                     void *                                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , heapBudget{ heapBudget_ }
-      , heapUsage{ heapUsage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryBudgetPropertiesEXT( std::array<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> const & heapBudget_ = {},
+                                                                     std::array<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> const & heapUsage_  = {},
+                                                                     void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , heapBudget( heapBudget_ )
+      , heapUsage( heapUsage_ )
     {
     }
 
@@ -100759,11 +72250,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMemoryBudgetPropertiesEXT & operator=( PhysicalDeviceMemoryBudgetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMemoryBudgetPropertiesEXT & operator=( VkPhysicalDeviceMemoryBudgetPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryBudgetPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryBudgetPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -100777,21 +72268,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMemoryBudgetPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryBudgetPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryBudgetPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryBudgetPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryBudgetPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<DeviceSize, VK_MAX_MEMORY_HEAPS> const &,
-               ArrayWrapper1D<DeviceSize, VK_MAX_MEMORY_HEAPS> const &>
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, heapBudget, heapUsage );
@@ -100817,103 +72302,90 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                   sType      = StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT;
-    void *                                          pNext      = {};
-    ArrayWrapper1D<DeviceSize, VK_MAX_MEMORY_HEAPS> heapBudget = {};
-    ArrayWrapper1D<DeviceSize, VK_MAX_MEMORY_HEAPS> heapUsage  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                                         sType = StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT;
+    void *                                                                                      pNext = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> heapBudget = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::DeviceSize, VK_MAX_MEMORY_HEAPS> heapUsage  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryBudgetPropertiesEXT>
-  {
-    using Type = PhysicalDeviceMemoryBudgetPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT>
   {
     using Type = PhysicalDeviceMemoryBudgetPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMemoryDecompressionFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryDecompressionFeaturesEXT.html
-  struct PhysicalDeviceMemoryDecompressionFeaturesEXT
+  struct PhysicalDeviceMemoryDecompressionFeaturesNV
   {
-    using NativeType = VkPhysicalDeviceMemoryDecompressionFeaturesEXT;
+    using NativeType = VkPhysicalDeviceMemoryDecompressionFeaturesNV;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryDecompressionFeaturesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryDecompressionFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionFeaturesEXT( Bool32 memoryDecompression_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryDecompression{ memoryDecompression_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 memoryDecompression_ = {},
+                                                                      void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryDecompression( memoryDecompression_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionFeaturesEXT( PhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionFeaturesNV( PhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMemoryDecompressionFeaturesEXT( VkPhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMemoryDecompressionFeaturesEXT( *reinterpret_cast<PhysicalDeviceMemoryDecompressionFeaturesEXT const *>( &rhs ) )
+    PhysicalDeviceMemoryDecompressionFeaturesNV( VkPhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMemoryDecompressionFeaturesNV( *reinterpret_cast<PhysicalDeviceMemoryDecompressionFeaturesNV const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMemoryDecompressionFeaturesEXT & operator=( PhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMemoryDecompressionFeaturesNV & operator=( PhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMemoryDecompressionFeaturesEXT & operator=( VkPhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMemoryDecompressionFeaturesNV & operator=( VkPhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryDecompressionFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryDecompressionFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryDecompressionFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryDecompressionFeaturesEXT & setMemoryDecompression( Bool32 memoryDecompression_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryDecompressionFeaturesNV &
+      setMemoryDecompression( VULKAN_HPP_NAMESPACE::Bool32 memoryDecompression_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryDecompression = memoryDecompression_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceMemoryDecompressionFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMemoryDecompressionFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionFeaturesEXT *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryDecompressionFeaturesEXT &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMemoryDecompressionFeaturesNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMemoryDecompressionFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryDecompressionFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryDecompressionFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryDecompressionFeaturesEXT *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMemoryDecompressionFeaturesNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryDecompression );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMemoryDecompressionFeaturesEXT const & ) const = default;
+    auto operator<=>( PhysicalDeviceMemoryDecompressionFeaturesNV const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -100922,101 +72394,84 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMemoryDecompressionFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMemoryDecompressionFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceMemoryDecompressionFeaturesEXT;
-    void *        pNext               = {};
-    Bool32        memoryDecompression = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceMemoryDecompressionFeaturesNV;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        memoryDecompression = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryDecompressionFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMemoryDecompressionFeaturesEXT;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryDecompressionFeaturesEXT>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryDecompressionFeaturesNV>
   {
-    using Type = PhysicalDeviceMemoryDecompressionFeaturesEXT;
+    using Type = PhysicalDeviceMemoryDecompressionFeaturesNV;
   };
 
-  using PhysicalDeviceMemoryDecompressionFeaturesNV = PhysicalDeviceMemoryDecompressionFeaturesEXT;
-
-  // wrapper struct for struct VkPhysicalDeviceMemoryDecompressionPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryDecompressionPropertiesEXT.html
-  struct PhysicalDeviceMemoryDecompressionPropertiesEXT
+  struct PhysicalDeviceMemoryDecompressionPropertiesNV
   {
-    using NativeType = VkPhysicalDeviceMemoryDecompressionPropertiesEXT;
+    using NativeType = VkPhysicalDeviceMemoryDecompressionPropertiesNV;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryDecompressionPropertiesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryDecompressionPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionPropertiesEXT( MemoryDecompressionMethodFlagsEXT decompressionMethods_          = {},
-                                                                         uint64_t                          maxDecompressionIndirectCount_ = {},
-                                                                         void *                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , decompressionMethods{ decompressionMethods_ }
-      , maxDecompressionIndirectCount{ maxDecompressionIndirectCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryDecompressionPropertiesNV( VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV decompressionMethods_ = {},
+                                                                        uint64_t maxDecompressionIndirectCount_                                      = {},
+                                                                        void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , decompressionMethods( decompressionMethods_ )
+      , maxDecompressionIndirectCount( maxDecompressionIndirectCount_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceMemoryDecompressionPropertiesEXT( PhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceMemoryDecompressionPropertiesNV( PhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceMemoryDecompressionPropertiesEXT( VkPhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceMemoryDecompressionPropertiesEXT( *reinterpret_cast<PhysicalDeviceMemoryDecompressionPropertiesEXT const *>( &rhs ) )
+    PhysicalDeviceMemoryDecompressionPropertiesNV( VkPhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceMemoryDecompressionPropertiesNV( *reinterpret_cast<PhysicalDeviceMemoryDecompressionPropertiesNV const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceMemoryDecompressionPropertiesEXT & operator=( PhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceMemoryDecompressionPropertiesNV & operator=( PhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceMemoryDecompressionPropertiesEXT & operator=( VkPhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceMemoryDecompressionPropertiesNV & operator=( VkPhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryDecompressionPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryDecompressionPropertiesNV const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceMemoryDecompressionPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMemoryDecompressionPropertiesNV const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionPropertiesEXT *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryDecompressionPropertiesEXT &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceMemoryDecompressionPropertiesNV &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceMemoryDecompressionPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryDecompressionPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryDecompressionPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryDecompressionPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryDecompressionPropertiesEXT *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceMemoryDecompressionPropertiesNV *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, MemoryDecompressionMethodFlagsEXT const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, decompressionMethods, maxDecompressionIndirectCount );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceMemoryDecompressionPropertiesEXT const & ) const = default;
+    auto operator<=>( PhysicalDeviceMemoryDecompressionPropertiesNV const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -101026,37 +72481,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceMemoryDecompressionPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceMemoryDecompressionPropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                     sType                         = StructureType::ePhysicalDeviceMemoryDecompressionPropertiesEXT;
-    void *                            pNext                         = {};
-    MemoryDecompressionMethodFlagsEXT decompressionMethods          = {};
-    uint64_t                          maxDecompressionIndirectCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType                         = StructureType::ePhysicalDeviceMemoryDecompressionPropertiesNV;
+    void *                                                 pNext                         = {};
+    VULKAN_HPP_NAMESPACE::MemoryDecompressionMethodFlagsNV decompressionMethods          = {};
+    uint64_t                                               maxDecompressionIndirectCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryDecompressionPropertiesEXT>
-  {
-    using Type = PhysicalDeviceMemoryDecompressionPropertiesEXT;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryDecompressionPropertiesEXT>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryDecompressionPropertiesNV>
   {
-    using Type = PhysicalDeviceMemoryDecompressionPropertiesEXT;
+    using Type = PhysicalDeviceMemoryDecompressionPropertiesNV;
   };
 
-  using PhysicalDeviceMemoryDecompressionPropertiesNV = PhysicalDeviceMemoryDecompressionPropertiesEXT;
-
-  // wrapper struct for struct VkPhysicalDeviceMemoryPriorityFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryPriorityFeaturesEXT.html
   struct PhysicalDeviceMemoryPriorityFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMemoryPriorityFeaturesEXT;
@@ -101064,10 +72507,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryPriorityFeaturesEXT( Bool32 memoryPriority_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryPriority{ memoryPriority_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMemoryPriorityFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 memoryPriority_ = {},
+                                                                  void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryPriority( memoryPriority_ )
     {
     }
 
@@ -101079,27 +72523,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMemoryPriorityFeaturesEXT & operator=( PhysicalDeviceMemoryPriorityFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMemoryPriorityFeaturesEXT & operator=( VkPhysicalDeviceMemoryPriorityFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryPriorityFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryPriorityFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryPriorityFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryPriorityFeaturesEXT & setMemoryPriority( Bool32 memoryPriority_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryPriorityFeaturesEXT & setMemoryPriority( VULKAN_HPP_NAMESPACE::Bool32 memoryPriority_ ) VULKAN_HPP_NOEXCEPT
     {
       memoryPriority = memoryPriority_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMemoryPriorityFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -101111,18 +72555,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMemoryPriorityFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryPriorityFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryPriorityFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryPriorityFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryPriorityFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryPriority );
     }
@@ -101147,40 +72586,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT;
-    void *        pNext          = {};
-    Bool32        memoryPriority = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        memoryPriority = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryPriorityFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMemoryPriorityFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT>
   {
     using Type = PhysicalDeviceMemoryPriorityFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMemoryProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryProperties.html
   struct PhysicalDeviceMemoryProperties
   {
     using NativeType = VkPhysicalDeviceMemoryProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryProperties( uint32_t                                            memoryTypeCount_ = {},
-                                                            std::array<MemoryType, VK_MAX_MEMORY_TYPES> const & memoryTypes_     = {},
-                                                            uint32_t                                            memoryHeapCount_ = {},
-                                                            std::array<MemoryHeap, VK_MAX_MEMORY_HEAPS> const & memoryHeaps_     = {} ) VULKAN_HPP_NOEXCEPT
-      : memoryTypeCount{ memoryTypeCount_ }
-      , memoryTypes{ memoryTypes_ }
-      , memoryHeapCount{ memoryHeapCount_ }
-      , memoryHeaps{ memoryHeaps_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      PhysicalDeviceMemoryProperties( uint32_t                                                                  memoryTypeCount_ = {},
+                                      std::array<VULKAN_HPP_NAMESPACE::MemoryType, VK_MAX_MEMORY_TYPES> const & memoryTypes_     = {},
+                                      uint32_t                                                                  memoryHeapCount_ = {},
+                                      std::array<VULKAN_HPP_NAMESPACE::MemoryHeap, VK_MAX_MEMORY_HEAPS> const & memoryHeaps_     = {} ) VULKAN_HPP_NOEXCEPT
+      : memoryTypeCount( memoryTypeCount_ )
+      , memoryTypes( memoryTypes_ )
+      , memoryHeapCount( memoryHeapCount_ )
+      , memoryHeaps( memoryHeaps_ )
     {
     }
 
@@ -101191,12 +72621,25 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceMemoryProperties( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::MemoryType> const & memoryTypes_,
+                                    VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::MemoryHeap> const & memoryHeaps_ = {} )
+      : memoryTypeCount( std::min( static_cast<uint32_t>( memoryTypes_.size() ), VK_MAX_MEMORY_TYPES ) )
+      , memoryHeapCount( std::min( static_cast<uint32_t>( memoryHeaps_.size() ), VK_MAX_MEMORY_HEAPS ) )
+    {
+      VULKAN_HPP_ASSERT( memoryTypes_.size() < VK_MAX_MEMORY_TYPES );
+      memcpy( memoryTypes, memoryTypes_.data(), memoryTypeCount * sizeof( VULKAN_HPP_NAMESPACE::MemoryType ) );
+      VULKAN_HPP_ASSERT( memoryHeaps_.size() < VK_MAX_MEMORY_HEAPS );
+      memcpy( memoryHeaps, memoryHeaps_.data(), memoryHeapCount * sizeof( VULKAN_HPP_NAMESPACE::MemoryHeap ) );
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PhysicalDeviceMemoryProperties & operator=( PhysicalDeviceMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMemoryProperties & operator=( VkPhysicalDeviceMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties const *>( &rhs );
       return *this;
     }
 
@@ -101210,21 +72653,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<uint32_t const &,
-               ArrayWrapper1D<MemoryType, VK_MAX_MEMORY_TYPES> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::MemoryType, VK_MAX_MEMORY_TYPES> const &,
                uint32_t const &,
-               ArrayWrapper1D<MemoryHeap, VK_MAX_MEMORY_HEAPS> const &>
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::MemoryHeap, VK_MAX_MEMORY_HEAPS> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( memoryTypeCount, memoryTypes, memoryHeapCount, memoryHeaps );
@@ -101255,8 +72692,10 @@ namespace VULKAN_HPP_NAMESPACE
 
     bool operator==( PhysicalDeviceMemoryProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
-      return ( memoryTypeCount == rhs.memoryTypeCount ) && ( memcmp( memoryTypes, rhs.memoryTypes, memoryTypeCount * sizeof( MemoryType ) ) == 0 ) &&
-             ( memoryHeapCount == rhs.memoryHeapCount ) && ( memcmp( memoryHeaps, rhs.memoryHeaps, memoryHeapCount * sizeof( MemoryHeap ) ) == 0 );
+      return ( memoryTypeCount == rhs.memoryTypeCount ) &&
+             ( memcmp( memoryTypes, rhs.memoryTypes, memoryTypeCount * sizeof( VULKAN_HPP_NAMESPACE::MemoryType ) ) == 0 ) &&
+             ( memoryHeapCount == rhs.memoryHeapCount ) &&
+             ( memcmp( memoryHeaps, rhs.memoryHeaps, memoryHeapCount * sizeof( VULKAN_HPP_NAMESPACE::MemoryHeap ) ) == 0 );
     }
 
     bool operator!=( PhysicalDeviceMemoryProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
@@ -101265,22 +72704,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    uint32_t                                        memoryTypeCount = {};
-    ArrayWrapper1D<MemoryType, VK_MAX_MEMORY_TYPES> memoryTypes     = {};
-    uint32_t                                        memoryHeapCount = {};
-    ArrayWrapper1D<MemoryHeap, VK_MAX_MEMORY_HEAPS> memoryHeaps     = {};
+    uint32_t                                                                                    memoryTypeCount = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::MemoryType, VK_MAX_MEMORY_TYPES> memoryTypes     = {};
+    uint32_t                                                                                    memoryHeapCount = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::MemoryHeap, VK_MAX_MEMORY_HEAPS> memoryHeaps     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryProperties>
-  {
-    using Type = PhysicalDeviceMemoryProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkPhysicalDeviceMemoryProperties2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMemoryProperties2.html
   struct PhysicalDeviceMemoryProperties2
   {
     using NativeType = VkPhysicalDeviceMemoryProperties2;
@@ -101288,11 +72717,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMemoryProperties2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryProperties2( PhysicalDeviceMemoryProperties memoryProperties_ = {},
-                                                             void *                         pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryProperties{ memoryProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMemoryProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties memoryProperties_ = {},
+                                                             void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryProperties( memoryProperties_ )
     {
     }
 
@@ -101304,11 +72733,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMemoryProperties2 & operator=( PhysicalDeviceMemoryProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMemoryProperties2 & operator=( VkPhysicalDeviceMemoryProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMemoryProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties2 const *>( &rhs );
       return *this;
     }
 
@@ -101322,18 +72751,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( this );
     }
 
-    operator VkPhysicalDeviceMemoryProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMemoryProperties2 *>( this );
-    }
-
-    operator VkPhysicalDeviceMemoryProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMemoryProperties2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PhysicalDeviceMemoryProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryProperties );
     }
@@ -101358,19 +72782,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType            = StructureType::ePhysicalDeviceMemoryProperties2;
-    void *                         pNext            = {};
-    PhysicalDeviceMemoryProperties memoryProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType            = StructureType::ePhysicalDeviceMemoryProperties2;
+    void *                                               pNext            = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceMemoryProperties memoryProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMemoryProperties2>
-  {
-    using Type = PhysicalDeviceMemoryProperties2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMemoryProperties2>
   {
@@ -101379,8 +72795,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMemoryProperties2KHR = PhysicalDeviceMemoryProperties2;
 
-  // wrapper struct for struct VkPhysicalDeviceMeshShaderFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMeshShaderFeaturesEXT.html
   struct PhysicalDeviceMeshShaderFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMeshShaderFeaturesEXT;
@@ -101388,19 +72802,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMeshShaderFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMeshShaderFeaturesEXT( Bool32 taskShader_                             = {},
-                                                              Bool32 meshShader_                             = {},
-                                                              Bool32 multiviewMeshShader_                    = {},
-                                                              Bool32 primitiveFragmentShadingRateMeshShader_ = {},
-                                                              Bool32 meshShaderQueries_                      = {},
-                                                              void * pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , taskShader{ taskShader_ }
-      , meshShader{ meshShader_ }
-      , multiviewMeshShader{ multiviewMeshShader_ }
-      , primitiveFragmentShadingRateMeshShader{ primitiveFragmentShadingRateMeshShader_ }
-      , meshShaderQueries{ meshShaderQueries_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMeshShaderFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 taskShader_                             = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 meshShader_                             = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 multiviewMeshShader_                    = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 primitiveFragmentShadingRateMeshShader_ = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 meshShaderQueries_                      = {},
+                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , taskShader( taskShader_ )
+      , meshShader( meshShader_ )
+      , multiviewMeshShader( multiviewMeshShader_ )
+      , primitiveFragmentShadingRateMeshShader( primitiveFragmentShadingRateMeshShader_ )
+      , meshShaderQueries( meshShaderQueries_ )
     {
     }
 
@@ -101412,52 +72826,53 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMeshShaderFeaturesEXT & operator=( PhysicalDeviceMeshShaderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMeshShaderFeaturesEXT & operator=( VkPhysicalDeviceMeshShaderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMeshShaderFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setTaskShader( Bool32 taskShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setTaskShader( VULKAN_HPP_NAMESPACE::Bool32 taskShader_ ) VULKAN_HPP_NOEXCEPT
     {
       taskShader = taskShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setMeshShader( Bool32 meshShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setMeshShader( VULKAN_HPP_NAMESPACE::Bool32 meshShader_ ) VULKAN_HPP_NOEXCEPT
     {
       meshShader = meshShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setMultiviewMeshShader( Bool32 multiviewMeshShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT &
+      setMultiviewMeshShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewMeshShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewMeshShader = multiviewMeshShader_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT &
-      setPrimitiveFragmentShadingRateMeshShader( Bool32 primitiveFragmentShadingRateMeshShader_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitiveFragmentShadingRateMeshShader( VULKAN_HPP_NAMESPACE::Bool32 primitiveFragmentShadingRateMeshShader_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveFragmentShadingRateMeshShader = primitiveFragmentShadingRateMeshShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setMeshShaderQueries( Bool32 meshShaderQueries_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesEXT & setMeshShaderQueries( VULKAN_HPP_NAMESPACE::Bool32 meshShaderQueries_ ) VULKAN_HPP_NOEXCEPT
     {
       meshShaderQueries = meshShaderQueries_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMeshShaderFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -101469,18 +72884,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMeshShaderFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMeshShaderFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMeshShaderFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMeshShaderFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMeshShaderFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, taskShader, meshShader, multiviewMeshShader, primitiveFragmentShadingRateMeshShader, meshShaderQueries );
@@ -101508,31 +72923,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceMeshShaderFeaturesEXT;
-    void *        pNext                                  = {};
-    Bool32        taskShader                             = {};
-    Bool32        meshShader                             = {};
-    Bool32        multiviewMeshShader                    = {};
-    Bool32        primitiveFragmentShadingRateMeshShader = {};
-    Bool32        meshShaderQueries                      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceMeshShaderFeaturesEXT;
+    void *                              pNext                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        taskShader                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        meshShader                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewMeshShader                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitiveFragmentShadingRateMeshShader = {};
+    VULKAN_HPP_NAMESPACE::Bool32        meshShaderQueries                      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMeshShaderFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMeshShaderFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMeshShaderFeaturesEXT>
   {
     using Type = PhysicalDeviceMeshShaderFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMeshShaderFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMeshShaderFeaturesNV.html
   struct PhysicalDeviceMeshShaderFeaturesNV
   {
     using NativeType = VkPhysicalDeviceMeshShaderFeaturesNV;
@@ -101540,11 +72945,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMeshShaderFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMeshShaderFeaturesNV( Bool32 taskShader_ = {}, Bool32 meshShader_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , taskShader{ taskShader_ }
-      , meshShader{ meshShader_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMeshShaderFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 taskShader_ = {},
+                                                             VULKAN_HPP_NAMESPACE::Bool32 meshShader_ = {},
+                                                             void *                       pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , taskShader( taskShader_ )
+      , meshShader( meshShader_ )
     {
     }
 
@@ -101556,33 +72963,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMeshShaderFeaturesNV & operator=( PhysicalDeviceMeshShaderFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMeshShaderFeaturesNV & operator=( VkPhysicalDeviceMeshShaderFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMeshShaderFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesNV & setTaskShader( Bool32 taskShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesNV & setTaskShader( VULKAN_HPP_NAMESPACE::Bool32 taskShader_ ) VULKAN_HPP_NOEXCEPT
     {
       taskShader = taskShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesNV & setMeshShader( Bool32 meshShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderFeaturesNV & setMeshShader( VULKAN_HPP_NAMESPACE::Bool32 meshShader_ ) VULKAN_HPP_NOEXCEPT
     {
       meshShader = meshShader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMeshShaderFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -101594,18 +73001,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMeshShaderFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceMeshShaderFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMeshShaderFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceMeshShaderFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMeshShaderFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, taskShader, meshShader );
     }
@@ -101630,28 +73032,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::ePhysicalDeviceMeshShaderFeaturesNV;
-    void *        pNext      = {};
-    Bool32        taskShader = {};
-    Bool32        meshShader = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::ePhysicalDeviceMeshShaderFeaturesNV;
+    void *                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        taskShader = {};
+    VULKAN_HPP_NAMESPACE::Bool32        meshShader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMeshShaderFeaturesNV>
-  {
-    using Type = PhysicalDeviceMeshShaderFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMeshShaderFeaturesNV>
   {
     using Type = PhysicalDeviceMeshShaderFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMeshShaderPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMeshShaderPropertiesEXT.html
   struct PhysicalDeviceMeshShaderPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceMeshShaderPropertiesEXT;
@@ -101659,7 +73051,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMeshShaderPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderPropertiesEXT( uint32_t                        maxTaskWorkGroupTotalCount_            = {},
                                                                    std::array<uint32_t, 3> const & maxTaskWorkGroupCount_                 = {},
                                                                    uint32_t                        maxTaskWorkGroupInvocations_           = {},
@@ -101684,40 +73076,40 @@ namespace VULKAN_HPP_NAMESPACE
                                                                    uint32_t                        meshOutputPerPrimitiveGranularity_     = {},
                                                                    uint32_t                        maxPreferredTaskWorkGroupInvocations_  = {},
                                                                    uint32_t                        maxPreferredMeshWorkGroupInvocations_  = {},
-                                                                   Bool32                          prefersLocalInvocationVertexOutput_    = {},
-                                                                   Bool32                          prefersLocalInvocationPrimitiveOutput_ = {},
-                                                                   Bool32                          prefersCompactVertexOutput_            = {},
-                                                                   Bool32                          prefersCompactPrimitiveOutput_         = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32    prefersLocalInvocationVertexOutput_    = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32    prefersLocalInvocationPrimitiveOutput_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32    prefersCompactVertexOutput_            = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32    prefersCompactPrimitiveOutput_         = {},
                                                                    void *                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxTaskWorkGroupTotalCount{ maxTaskWorkGroupTotalCount_ }
-      , maxTaskWorkGroupCount{ maxTaskWorkGroupCount_ }
-      , maxTaskWorkGroupInvocations{ maxTaskWorkGroupInvocations_ }
-      , maxTaskWorkGroupSize{ maxTaskWorkGroupSize_ }
-      , maxTaskPayloadSize{ maxTaskPayloadSize_ }
-      , maxTaskSharedMemorySize{ maxTaskSharedMemorySize_ }
-      , maxTaskPayloadAndSharedMemorySize{ maxTaskPayloadAndSharedMemorySize_ }
-      , maxMeshWorkGroupTotalCount{ maxMeshWorkGroupTotalCount_ }
-      , maxMeshWorkGroupCount{ maxMeshWorkGroupCount_ }
-      , maxMeshWorkGroupInvocations{ maxMeshWorkGroupInvocations_ }
-      , maxMeshWorkGroupSize{ maxMeshWorkGroupSize_ }
-      , maxMeshSharedMemorySize{ maxMeshSharedMemorySize_ }
-      , maxMeshPayloadAndSharedMemorySize{ maxMeshPayloadAndSharedMemorySize_ }
-      , maxMeshOutputMemorySize{ maxMeshOutputMemorySize_ }
-      , maxMeshPayloadAndOutputMemorySize{ maxMeshPayloadAndOutputMemorySize_ }
-      , maxMeshOutputComponents{ maxMeshOutputComponents_ }
-      , maxMeshOutputVertices{ maxMeshOutputVertices_ }
-      , maxMeshOutputPrimitives{ maxMeshOutputPrimitives_ }
-      , maxMeshOutputLayers{ maxMeshOutputLayers_ }
-      , maxMeshMultiviewViewCount{ maxMeshMultiviewViewCount_ }
-      , meshOutputPerVertexGranularity{ meshOutputPerVertexGranularity_ }
-      , meshOutputPerPrimitiveGranularity{ meshOutputPerPrimitiveGranularity_ }
-      , maxPreferredTaskWorkGroupInvocations{ maxPreferredTaskWorkGroupInvocations_ }
-      , maxPreferredMeshWorkGroupInvocations{ maxPreferredMeshWorkGroupInvocations_ }
-      , prefersLocalInvocationVertexOutput{ prefersLocalInvocationVertexOutput_ }
-      , prefersLocalInvocationPrimitiveOutput{ prefersLocalInvocationPrimitiveOutput_ }
-      , prefersCompactVertexOutput{ prefersCompactVertexOutput_ }
-      , prefersCompactPrimitiveOutput{ prefersCompactPrimitiveOutput_ }
+      : pNext( pNext_ )
+      , maxTaskWorkGroupTotalCount( maxTaskWorkGroupTotalCount_ )
+      , maxTaskWorkGroupCount( maxTaskWorkGroupCount_ )
+      , maxTaskWorkGroupInvocations( maxTaskWorkGroupInvocations_ )
+      , maxTaskWorkGroupSize( maxTaskWorkGroupSize_ )
+      , maxTaskPayloadSize( maxTaskPayloadSize_ )
+      , maxTaskSharedMemorySize( maxTaskSharedMemorySize_ )
+      , maxTaskPayloadAndSharedMemorySize( maxTaskPayloadAndSharedMemorySize_ )
+      , maxMeshWorkGroupTotalCount( maxMeshWorkGroupTotalCount_ )
+      , maxMeshWorkGroupCount( maxMeshWorkGroupCount_ )
+      , maxMeshWorkGroupInvocations( maxMeshWorkGroupInvocations_ )
+      , maxMeshWorkGroupSize( maxMeshWorkGroupSize_ )
+      , maxMeshSharedMemorySize( maxMeshSharedMemorySize_ )
+      , maxMeshPayloadAndSharedMemorySize( maxMeshPayloadAndSharedMemorySize_ )
+      , maxMeshOutputMemorySize( maxMeshOutputMemorySize_ )
+      , maxMeshPayloadAndOutputMemorySize( maxMeshPayloadAndOutputMemorySize_ )
+      , maxMeshOutputComponents( maxMeshOutputComponents_ )
+      , maxMeshOutputVertices( maxMeshOutputVertices_ )
+      , maxMeshOutputPrimitives( maxMeshOutputPrimitives_ )
+      , maxMeshOutputLayers( maxMeshOutputLayers_ )
+      , maxMeshMultiviewViewCount( maxMeshMultiviewViewCount_ )
+      , meshOutputPerVertexGranularity( meshOutputPerVertexGranularity_ )
+      , meshOutputPerPrimitiveGranularity( meshOutputPerPrimitiveGranularity_ )
+      , maxPreferredTaskWorkGroupInvocations( maxPreferredTaskWorkGroupInvocations_ )
+      , maxPreferredMeshWorkGroupInvocations( maxPreferredMeshWorkGroupInvocations_ )
+      , prefersLocalInvocationVertexOutput( prefersLocalInvocationVertexOutput_ )
+      , prefersLocalInvocationPrimitiveOutput( prefersLocalInvocationPrimitiveOutput_ )
+      , prefersCompactVertexOutput( prefersCompactVertexOutput_ )
+      , prefersCompactPrimitiveOutput( prefersCompactPrimitiveOutput_ )
     {
     }
 
@@ -101729,11 +73121,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMeshShaderPropertiesEXT & operator=( PhysicalDeviceMeshShaderPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMeshShaderPropertiesEXT & operator=( VkPhysicalDeviceMeshShaderPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMeshShaderPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -101747,30 +73139,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMeshShaderPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMeshShaderPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMeshShaderPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMeshShaderPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMeshShaderPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -101784,10 +73169,11 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -101858,54 +73244,44 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                                 = StructureType::ePhysicalDeviceMeshShaderPropertiesEXT;
-    void *                      pNext                                 = {};
-    uint32_t                    maxTaskWorkGroupTotalCount            = {};
-    ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupCount                 = {};
-    uint32_t                    maxTaskWorkGroupInvocations           = {};
-    ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupSize                  = {};
-    uint32_t                    maxTaskPayloadSize                    = {};
-    uint32_t                    maxTaskSharedMemorySize               = {};
-    uint32_t                    maxTaskPayloadAndSharedMemorySize     = {};
-    uint32_t                    maxMeshWorkGroupTotalCount            = {};
-    ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupCount                 = {};
-    uint32_t                    maxMeshWorkGroupInvocations           = {};
-    ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupSize                  = {};
-    uint32_t                    maxMeshSharedMemorySize               = {};
-    uint32_t                    maxMeshPayloadAndSharedMemorySize     = {};
-    uint32_t                    maxMeshOutputMemorySize               = {};
-    uint32_t                    maxMeshPayloadAndOutputMemorySize     = {};
-    uint32_t                    maxMeshOutputComponents               = {};
-    uint32_t                    maxMeshOutputVertices                 = {};
-    uint32_t                    maxMeshOutputPrimitives               = {};
-    uint32_t                    maxMeshOutputLayers                   = {};
-    uint32_t                    maxMeshMultiviewViewCount             = {};
-    uint32_t                    meshOutputPerVertexGranularity        = {};
-    uint32_t                    meshOutputPerPrimitiveGranularity     = {};
-    uint32_t                    maxPreferredTaskWorkGroupInvocations  = {};
-    uint32_t                    maxPreferredMeshWorkGroupInvocations  = {};
-    Bool32                      prefersLocalInvocationVertexOutput    = {};
-    Bool32                      prefersLocalInvocationPrimitiveOutput = {};
-    Bool32                      prefersCompactVertexOutput            = {};
-    Bool32                      prefersCompactPrimitiveOutput         = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                                 = StructureType::ePhysicalDeviceMeshShaderPropertiesEXT;
+    void *                                            pNext                                 = {};
+    uint32_t                                          maxTaskWorkGroupTotalCount            = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupCount                 = {};
+    uint32_t                                          maxTaskWorkGroupInvocations           = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupSize                  = {};
+    uint32_t                                          maxTaskPayloadSize                    = {};
+    uint32_t                                          maxTaskSharedMemorySize               = {};
+    uint32_t                                          maxTaskPayloadAndSharedMemorySize     = {};
+    uint32_t                                          maxMeshWorkGroupTotalCount            = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupCount                 = {};
+    uint32_t                                          maxMeshWorkGroupInvocations           = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupSize                  = {};
+    uint32_t                                          maxMeshSharedMemorySize               = {};
+    uint32_t                                          maxMeshPayloadAndSharedMemorySize     = {};
+    uint32_t                                          maxMeshOutputMemorySize               = {};
+    uint32_t                                          maxMeshPayloadAndOutputMemorySize     = {};
+    uint32_t                                          maxMeshOutputComponents               = {};
+    uint32_t                                          maxMeshOutputVertices                 = {};
+    uint32_t                                          maxMeshOutputPrimitives               = {};
+    uint32_t                                          maxMeshOutputLayers                   = {};
+    uint32_t                                          maxMeshMultiviewViewCount             = {};
+    uint32_t                                          meshOutputPerVertexGranularity        = {};
+    uint32_t                                          meshOutputPerPrimitiveGranularity     = {};
+    uint32_t                                          maxPreferredTaskWorkGroupInvocations  = {};
+    uint32_t                                          maxPreferredMeshWorkGroupInvocations  = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      prefersLocalInvocationVertexOutput    = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      prefersLocalInvocationPrimitiveOutput = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      prefersCompactVertexOutput            = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      prefersCompactPrimitiveOutput         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMeshShaderPropertiesEXT>
-  {
-    using Type = PhysicalDeviceMeshShaderPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMeshShaderPropertiesEXT>
   {
     using Type = PhysicalDeviceMeshShaderPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMeshShaderPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMeshShaderPropertiesNV.html
   struct PhysicalDeviceMeshShaderPropertiesNV
   {
     using NativeType = VkPhysicalDeviceMeshShaderPropertiesNV;
@@ -101913,7 +73289,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMeshShaderPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMeshShaderPropertiesNV( uint32_t                        maxDrawMeshTasksCount_             = {},
                                                                   uint32_t                        maxTaskWorkGroupInvocations_       = {},
                                                                   std::array<uint32_t, 3> const & maxTaskWorkGroupSize_              = {},
@@ -101928,20 +73304,20 @@ namespace VULKAN_HPP_NAMESPACE
                                                                   uint32_t                        meshOutputPerVertexGranularity_    = {},
                                                                   uint32_t                        meshOutputPerPrimitiveGranularity_ = {},
                                                                   void *                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxDrawMeshTasksCount{ maxDrawMeshTasksCount_ }
-      , maxTaskWorkGroupInvocations{ maxTaskWorkGroupInvocations_ }
-      , maxTaskWorkGroupSize{ maxTaskWorkGroupSize_ }
-      , maxTaskTotalMemorySize{ maxTaskTotalMemorySize_ }
-      , maxTaskOutputCount{ maxTaskOutputCount_ }
-      , maxMeshWorkGroupInvocations{ maxMeshWorkGroupInvocations_ }
-      , maxMeshWorkGroupSize{ maxMeshWorkGroupSize_ }
-      , maxMeshTotalMemorySize{ maxMeshTotalMemorySize_ }
-      , maxMeshOutputVertices{ maxMeshOutputVertices_ }
-      , maxMeshOutputPrimitives{ maxMeshOutputPrimitives_ }
-      , maxMeshMultiviewViewCount{ maxMeshMultiviewViewCount_ }
-      , meshOutputPerVertexGranularity{ meshOutputPerVertexGranularity_ }
-      , meshOutputPerPrimitiveGranularity{ meshOutputPerPrimitiveGranularity_ }
+      : pNext( pNext_ )
+      , maxDrawMeshTasksCount( maxDrawMeshTasksCount_ )
+      , maxTaskWorkGroupInvocations( maxTaskWorkGroupInvocations_ )
+      , maxTaskWorkGroupSize( maxTaskWorkGroupSize_ )
+      , maxTaskTotalMemorySize( maxTaskTotalMemorySize_ )
+      , maxTaskOutputCount( maxTaskOutputCount_ )
+      , maxMeshWorkGroupInvocations( maxMeshWorkGroupInvocations_ )
+      , maxMeshWorkGroupSize( maxMeshWorkGroupSize_ )
+      , maxMeshTotalMemorySize( maxMeshTotalMemorySize_ )
+      , maxMeshOutputVertices( maxMeshOutputVertices_ )
+      , maxMeshOutputPrimitives( maxMeshOutputPrimitives_ )
+      , maxMeshMultiviewViewCount( maxMeshMultiviewViewCount_ )
+      , meshOutputPerVertexGranularity( meshOutputPerVertexGranularity_ )
+      , meshOutputPerPrimitiveGranularity( meshOutputPerPrimitiveGranularity_ )
     {
     }
 
@@ -101953,11 +73329,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMeshShaderPropertiesNV & operator=( PhysicalDeviceMeshShaderPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMeshShaderPropertiesNV & operator=( VkPhysicalDeviceMeshShaderPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMeshShaderPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMeshShaderPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -101971,32 +73347,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMeshShaderPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceMeshShaderPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMeshShaderPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceMeshShaderPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMeshShaderPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -102043,39 +73413,29 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                             = StructureType::ePhysicalDeviceMeshShaderPropertiesNV;
-    void *                      pNext                             = {};
-    uint32_t                    maxDrawMeshTasksCount             = {};
-    uint32_t                    maxTaskWorkGroupInvocations       = {};
-    ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupSize              = {};
-    uint32_t                    maxTaskTotalMemorySize            = {};
-    uint32_t                    maxTaskOutputCount                = {};
-    uint32_t                    maxMeshWorkGroupInvocations       = {};
-    ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupSize              = {};
-    uint32_t                    maxMeshTotalMemorySize            = {};
-    uint32_t                    maxMeshOutputVertices             = {};
-    uint32_t                    maxMeshOutputPrimitives           = {};
-    uint32_t                    maxMeshMultiviewViewCount         = {};
-    uint32_t                    meshOutputPerVertexGranularity    = {};
-    uint32_t                    meshOutputPerPrimitiveGranularity = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                             = StructureType::ePhysicalDeviceMeshShaderPropertiesNV;
+    void *                                            pNext                             = {};
+    uint32_t                                          maxDrawMeshTasksCount             = {};
+    uint32_t                                          maxTaskWorkGroupInvocations       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxTaskWorkGroupSize              = {};
+    uint32_t                                          maxTaskTotalMemorySize            = {};
+    uint32_t                                          maxTaskOutputCount                = {};
+    uint32_t                                          maxMeshWorkGroupInvocations       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> maxMeshWorkGroupSize              = {};
+    uint32_t                                          maxMeshTotalMemorySize            = {};
+    uint32_t                                          maxMeshOutputVertices             = {};
+    uint32_t                                          maxMeshOutputPrimitives           = {};
+    uint32_t                                          maxMeshMultiviewViewCount         = {};
+    uint32_t                                          meshOutputPerVertexGranularity    = {};
+    uint32_t                                          meshOutputPerPrimitiveGranularity = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMeshShaderPropertiesNV>
-  {
-    using Type = PhysicalDeviceMeshShaderPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMeshShaderPropertiesNV>
   {
     using Type = PhysicalDeviceMeshShaderPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiDrawFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiDrawFeaturesEXT.html
   struct PhysicalDeviceMultiDrawFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMultiDrawFeaturesEXT;
@@ -102083,10 +73443,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiDrawFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiDrawFeaturesEXT( Bool32 multiDraw_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multiDraw{ multiDraw_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiDrawFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 multiDraw_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multiDraw( multiDraw_ )
     {
     }
 
@@ -102098,27 +73458,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMultiDrawFeaturesEXT & operator=( PhysicalDeviceMultiDrawFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiDrawFeaturesEXT & operator=( VkPhysicalDeviceMultiDrawFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiDrawFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiDrawFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiDrawFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiDrawFeaturesEXT & setMultiDraw( Bool32 multiDraw_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiDrawFeaturesEXT & setMultiDraw( VULKAN_HPP_NAMESPACE::Bool32 multiDraw_ ) VULKAN_HPP_NOEXCEPT
     {
       multiDraw = multiDraw_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMultiDrawFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -102130,18 +73490,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiDrawFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMultiDrawFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiDrawFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiDrawFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiDrawFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multiDraw );
     }
@@ -102166,27 +73521,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::ePhysicalDeviceMultiDrawFeaturesEXT;
-    void *        pNext     = {};
-    Bool32        multiDraw = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::ePhysicalDeviceMultiDrawFeaturesEXT;
+    void *                              pNext     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiDraw = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiDrawFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMultiDrawFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiDrawFeaturesEXT>
   {
     using Type = PhysicalDeviceMultiDrawFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiDrawPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiDrawPropertiesEXT.html
   struct PhysicalDeviceMultiDrawPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceMultiDrawPropertiesEXT;
@@ -102194,10 +73539,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiDrawPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiDrawPropertiesEXT( uint32_t maxMultiDrawCount_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxMultiDrawCount{ maxMultiDrawCount_ }
+      : pNext( pNext_ )
+      , maxMultiDrawCount( maxMultiDrawCount_ )
     {
     }
 
@@ -102209,11 +73554,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMultiDrawPropertiesEXT & operator=( PhysicalDeviceMultiDrawPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiDrawPropertiesEXT & operator=( VkPhysicalDeviceMultiDrawPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiDrawPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiDrawPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -102227,18 +73572,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiDrawPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMultiDrawPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiDrawPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiDrawPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiDrawPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxMultiDrawCount );
     }
@@ -102263,27 +73603,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceMultiDrawPropertiesEXT;
-    void *        pNext             = {};
-    uint32_t      maxMultiDrawCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceMultiDrawPropertiesEXT;
+    void *                              pNext             = {};
+    uint32_t                            maxMultiDrawCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiDrawPropertiesEXT>
-  {
-    using Type = PhysicalDeviceMultiDrawPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiDrawPropertiesEXT>
   {
     using Type = PhysicalDeviceMultiDrawPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT.html
   struct PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
@@ -102291,11 +73621,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT( Bool32 multisampledRenderToSingleSampled_ = {},
-                                                                                     void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multisampledRenderToSingleSampled{ multisampledRenderToSingleSampled_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 multisampledRenderToSingleSampled_ = {},
+                                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multisampledRenderToSingleSampled( multisampledRenderToSingleSampled_ )
     {
     }
 
@@ -102310,16 +73640,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT &
       operator=( PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT &
       operator=( VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -102327,12 +73657,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT &
-      setMultisampledRenderToSingleSampled( Bool32 multisampledRenderToSingleSampled_ ) VULKAN_HPP_NOEXCEPT
+      setMultisampledRenderToSingleSampled( VULKAN_HPP_NAMESPACE::Bool32 multisampledRenderToSingleSampled_ ) VULKAN_HPP_NOEXCEPT
     {
       multisampledRenderToSingleSampled = multisampledRenderToSingleSampled_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -102344,18 +73674,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multisampledRenderToSingleSampled );
     }
@@ -102380,27 +73705,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                             = StructureType::ePhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
-    void *        pNext                             = {};
-    Bool32        multisampledRenderToSingleSampled = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                             = StructureType::ePhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
+    void *                              pNext                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multisampledRenderToSingleSampled = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT>
   {
     using Type = PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiviewFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiviewFeatures.html
   struct PhysicalDeviceMultiviewFeatures
   {
     using NativeType = VkPhysicalDeviceMultiviewFeatures;
@@ -102408,15 +73723,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewFeatures( Bool32 multiview_                   = {},
-                                                          Bool32 multiviewGeometryShader_     = {},
-                                                          Bool32 multiviewTessellationShader_ = {},
-                                                          void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multiview{ multiview_ }
-      , multiviewGeometryShader{ multiviewGeometryShader_ }
-      , multiviewTessellationShader{ multiviewTessellationShader_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewFeatures( VULKAN_HPP_NAMESPACE::Bool32 multiview_                   = {},
+                                                          VULKAN_HPP_NAMESPACE::Bool32 multiviewGeometryShader_     = {},
+                                                          VULKAN_HPP_NAMESPACE::Bool32 multiviewTessellationShader_ = {},
+                                                          void *                       pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multiview( multiview_ )
+      , multiviewGeometryShader( multiviewGeometryShader_ )
+      , multiviewTessellationShader( multiviewTessellationShader_ )
     {
     }
 
@@ -102428,39 +73743,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMultiviewFeatures & operator=( PhysicalDeviceMultiviewFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiviewFeatures & operator=( VkPhysicalDeviceMultiviewFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiviewFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures & setMultiview( Bool32 multiview_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures & setMultiview( VULKAN_HPP_NAMESPACE::Bool32 multiview_ ) VULKAN_HPP_NOEXCEPT
     {
       multiview = multiview_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures & setMultiviewGeometryShader( Bool32 multiviewGeometryShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures &
+      setMultiviewGeometryShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewGeometryShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewGeometryShader = multiviewGeometryShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures & setMultiviewTessellationShader( Bool32 multiviewTessellationShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewFeatures &
+      setMultiviewTessellationShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewTessellationShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewTessellationShader = multiviewTessellationShader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMultiviewFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -102472,18 +73789,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiviewFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceMultiviewFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiviewFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiviewFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiviewFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multiview, multiviewGeometryShader, multiviewTessellationShader );
     }
@@ -102509,21 +73825,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceMultiviewFeatures;
-    void *        pNext                       = {};
-    Bool32        multiview                   = {};
-    Bool32        multiviewGeometryShader     = {};
-    Bool32        multiviewTessellationShader = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceMultiviewFeatures;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiview                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewGeometryShader     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewTessellationShader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiviewFeatures>
-  {
-    using Type = PhysicalDeviceMultiviewFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewFeatures>
   {
@@ -102532,8 +73840,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMultiviewFeaturesKHR = PhysicalDeviceMultiviewFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX.html
   struct PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX
   {
     using NativeType = VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
@@ -102541,11 +73847,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX( Bool32 perViewPositionAllComponents_ = {},
-                                                                                void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , perViewPositionAllComponents{ perViewPositionAllComponents_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX( VULKAN_HPP_NAMESPACE::Bool32 perViewPositionAllComponents_ = {},
+                                                                                void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , perViewPositionAllComponents( perViewPositionAllComponents_ )
     {
     }
 
@@ -102559,11 +73865,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX &
       operator=( PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX & operator=( VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX const *>( &rhs );
       return *this;
     }
 
@@ -102577,18 +73883,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX *>( this );
     }
 
-    operator VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, perViewPositionAllComponents );
     }
@@ -102613,27 +73914,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
-    void *        pNext                        = {};
-    Bool32        perViewPositionAllComponents = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        perViewPositionAllComponents = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>
-  {
-    using Type = PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX>
   {
     using Type = PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM.html
   struct PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
@@ -102641,11 +73932,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM( Bool32 multiviewPerViewRenderAreas_ = {},
-                                                                                void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multiviewPerViewRenderAreas{ multiviewPerViewRenderAreas_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 multiviewPerViewRenderAreas_ = {},
+                                                                                void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multiviewPerViewRenderAreas( multiviewPerViewRenderAreas_ )
     {
     }
 
@@ -102659,15 +73950,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM &
       operator=( PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM & operator=( VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -102675,12 +73966,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM &
-      setMultiviewPerViewRenderAreas( Bool32 multiviewPerViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
+      setMultiviewPerViewRenderAreas( VULKAN_HPP_NAMESPACE::Bool32 multiviewPerViewRenderAreas_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewPerViewRenderAreas = multiviewPerViewRenderAreas_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -102692,18 +73983,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multiviewPerViewRenderAreas );
     }
@@ -102728,27 +74014,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
-    void *        pNext                       = {};
-    Bool32        multiviewPerViewRenderAreas = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewPerViewRenderAreas = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM>
   {
     using Type = PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM.html
   struct PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
@@ -102756,11 +74032,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM( Bool32 multiviewPerViewViewports_ = {},
-                                                                              void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , multiviewPerViewViewports{ multiviewPerViewViewports_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 multiviewPerViewViewports_ = {},
+                                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , multiviewPerViewViewports( multiviewPerViewViewports_ )
     {
     }
 
@@ -102774,15 +74050,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &
       operator=( PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM & operator=( VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -102790,12 +74066,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &
-      setMultiviewPerViewViewports( Bool32 multiviewPerViewViewports_ ) VULKAN_HPP_NOEXCEPT
+      setMultiviewPerViewViewports( VULKAN_HPP_NAMESPACE::Bool32 multiviewPerViewViewports_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewPerViewViewports = multiviewPerViewViewports_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -102807,18 +74083,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, multiviewPerViewViewports );
     }
@@ -102843,27 +74114,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-    void *        pNext                     = {};
-    Bool32        multiviewPerViewViewports = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewPerViewViewports = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM>
   {
     using Type = PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceMultiviewProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMultiviewProperties.html
   struct PhysicalDeviceMultiviewProperties
   {
     using NativeType = VkPhysicalDeviceMultiviewProperties;
@@ -102871,13 +74132,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMultiviewProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceMultiviewProperties( uint32_t maxMultiviewViewCount_     = {},
                                                             uint32_t maxMultiviewInstanceIndex_ = {},
                                                             void *   pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxMultiviewViewCount{ maxMultiviewViewCount_ }
-      , maxMultiviewInstanceIndex{ maxMultiviewInstanceIndex_ }
+      : pNext( pNext_ )
+      , maxMultiviewViewCount( maxMultiviewViewCount_ )
+      , maxMultiviewInstanceIndex( maxMultiviewInstanceIndex_ )
     {
     }
 
@@ -102889,11 +74150,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMultiviewProperties & operator=( PhysicalDeviceMultiviewProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMultiviewProperties & operator=( VkPhysicalDeviceMultiviewProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMultiviewProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMultiviewProperties const *>( &rhs );
       return *this;
     }
 
@@ -102907,18 +74168,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMultiviewProperties *>( this );
     }
 
-    operator VkPhysicalDeviceMultiviewProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMultiviewProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceMultiviewProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMultiviewProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxMultiviewViewCount, maxMultiviewInstanceIndex );
     }
@@ -102944,20 +74200,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceMultiviewProperties;
-    void *        pNext                     = {};
-    uint32_t      maxMultiviewViewCount     = {};
-    uint32_t      maxMultiviewInstanceIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceMultiviewProperties;
+    void *                              pNext                     = {};
+    uint32_t                            maxMultiviewViewCount     = {};
+    uint32_t                            maxMultiviewInstanceIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMultiviewProperties>
-  {
-    using Type = PhysicalDeviceMultiviewProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMultiviewProperties>
   {
@@ -102966,8 +74214,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMultiviewPropertiesKHR = PhysicalDeviceMultiviewProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT.html
   struct PhysicalDeviceMutableDescriptorTypeFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT;
@@ -102975,10 +74221,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceMutableDescriptorTypeFeaturesEXT( Bool32 mutableDescriptorType_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , mutableDescriptorType{ mutableDescriptorType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceMutableDescriptorTypeFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 mutableDescriptorType_ = {},
+                                                                         void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , mutableDescriptorType( mutableDescriptorType_ )
     {
     }
 
@@ -102991,27 +74238,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceMutableDescriptorTypeFeaturesEXT & operator=( PhysicalDeviceMutableDescriptorTypeFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceMutableDescriptorTypeFeaturesEXT & operator=( VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceMutableDescriptorTypeFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceMutableDescriptorTypeFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMutableDescriptorTypeFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMutableDescriptorTypeFeaturesEXT & setMutableDescriptorType( Bool32 mutableDescriptorType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceMutableDescriptorTypeFeaturesEXT &
+      setMutableDescriptorType( VULKAN_HPP_NAMESPACE::Bool32 mutableDescriptorType_ ) VULKAN_HPP_NOEXCEPT
     {
       mutableDescriptorType = mutableDescriptorType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -103023,18 +74271,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, mutableDescriptorType );
     }
@@ -103059,19 +74302,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT;
-    void *        pNext                 = {};
-    Bool32        mutableDescriptorType = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        mutableDescriptorType = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT>
-  {
-    using Type = PhysicalDeviceMutableDescriptorTypeFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT>
   {
@@ -103080,8 +74315,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceMutableDescriptorTypeFeaturesVALVE = PhysicalDeviceMutableDescriptorTypeFeaturesEXT;
 
-  // wrapper struct for struct VkPhysicalDeviceNestedCommandBufferFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceNestedCommandBufferFeaturesEXT.html
   struct PhysicalDeviceNestedCommandBufferFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceNestedCommandBufferFeaturesEXT;
@@ -103089,15 +74322,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceNestedCommandBufferFeaturesEXT( Bool32 nestedCommandBuffer_                = {},
-                                                                       Bool32 nestedCommandBufferRendering_       = {},
-                                                                       Bool32 nestedCommandBufferSimultaneousUse_ = {},
-                                                                       void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , nestedCommandBuffer{ nestedCommandBuffer_ }
-      , nestedCommandBufferRendering{ nestedCommandBufferRendering_ }
-      , nestedCommandBufferSimultaneousUse{ nestedCommandBufferSimultaneousUse_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceNestedCommandBufferFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBuffer_                = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBufferRendering_       = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBufferSimultaneousUse_ = {},
+                                                                       void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , nestedCommandBuffer( nestedCommandBuffer_ )
+      , nestedCommandBufferRendering( nestedCommandBufferRendering_ )
+      , nestedCommandBufferSimultaneousUse( nestedCommandBufferSimultaneousUse_ )
     {
     }
 
@@ -103109,41 +74342,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceNestedCommandBufferFeaturesEXT & operator=( PhysicalDeviceNestedCommandBufferFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceNestedCommandBufferFeaturesEXT & operator=( VkPhysicalDeviceNestedCommandBufferFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceNestedCommandBufferFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferFeaturesEXT & setNestedCommandBuffer( Bool32 nestedCommandBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferFeaturesEXT &
+      setNestedCommandBuffer( VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       nestedCommandBuffer = nestedCommandBuffer_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferFeaturesEXT &
-      setNestedCommandBufferRendering( Bool32 nestedCommandBufferRendering_ ) VULKAN_HPP_NOEXCEPT
+      setNestedCommandBufferRendering( VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBufferRendering_ ) VULKAN_HPP_NOEXCEPT
     {
       nestedCommandBufferRendering = nestedCommandBufferRendering_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferFeaturesEXT &
-      setNestedCommandBufferSimultaneousUse( Bool32 nestedCommandBufferSimultaneousUse_ ) VULKAN_HPP_NOEXCEPT
+      setNestedCommandBufferSimultaneousUse( VULKAN_HPP_NAMESPACE::Bool32 nestedCommandBufferSimultaneousUse_ ) VULKAN_HPP_NOEXCEPT
     {
       nestedCommandBufferSimultaneousUse = nestedCommandBufferSimultaneousUse_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceNestedCommandBufferFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -103155,18 +74389,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceNestedCommandBufferFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceNestedCommandBufferFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceNestedCommandBufferFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceNestedCommandBufferFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceNestedCommandBufferFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, nestedCommandBuffer, nestedCommandBufferRendering, nestedCommandBufferSimultaneousUse );
     }
@@ -103193,29 +74426,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT;
-    void *        pNext                              = {};
-    Bool32        nestedCommandBuffer                = {};
-    Bool32        nestedCommandBufferRendering       = {};
-    Bool32        nestedCommandBufferSimultaneousUse = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nestedCommandBuffer                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nestedCommandBufferRendering       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nestedCommandBufferSimultaneousUse = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceNestedCommandBufferFeaturesEXT>
-  {
-    using Type = PhysicalDeviceNestedCommandBufferFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT>
   {
     using Type = PhysicalDeviceNestedCommandBufferFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceNestedCommandBufferPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceNestedCommandBufferPropertiesEXT.html
   struct PhysicalDeviceNestedCommandBufferPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceNestedCommandBufferPropertiesEXT;
@@ -103223,11 +74446,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceNestedCommandBufferPropertiesEXT( uint32_t maxCommandBufferNestingLevel_ = {},
                                                                          void *   pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxCommandBufferNestingLevel{ maxCommandBufferNestingLevel_ }
+      : pNext( pNext_ )
+      , maxCommandBufferNestingLevel( maxCommandBufferNestingLevel_ )
     {
     }
 
@@ -103240,14 +74463,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceNestedCommandBufferPropertiesEXT & operator=( PhysicalDeviceNestedCommandBufferPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceNestedCommandBufferPropertiesEXT & operator=( VkPhysicalDeviceNestedCommandBufferPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceNestedCommandBufferPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceNestedCommandBufferPropertiesEXT const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNestedCommandBufferPropertiesEXT &
+      setMaxCommandBufferNestingLevel( uint32_t maxCommandBufferNestingLevel_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxCommandBufferNestingLevel = maxCommandBufferNestingLevel_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceNestedCommandBufferPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceNestedCommandBufferPropertiesEXT *>( this );
@@ -103258,18 +74496,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceNestedCommandBufferPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceNestedCommandBufferPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceNestedCommandBufferPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceNestedCommandBufferPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceNestedCommandBufferPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxCommandBufferNestingLevel );
     }
@@ -103294,27 +74527,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT;
-    void *        pNext                        = {};
-    uint32_t      maxCommandBufferNestingLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT;
+    void *                              pNext                        = {};
+    uint32_t                            maxCommandBufferNestingLevel = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceNestedCommandBufferPropertiesEXT>
-  {
-    using Type = PhysicalDeviceNestedCommandBufferPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT>
   {
     using Type = PhysicalDeviceNestedCommandBufferPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT.html
   struct PhysicalDeviceNonSeamlessCubeMapFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
@@ -103322,10 +74545,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceNonSeamlessCubeMapFeaturesEXT( Bool32 nonSeamlessCubeMap_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , nonSeamlessCubeMap{ nonSeamlessCubeMap_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceNonSeamlessCubeMapFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 nonSeamlessCubeMap_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , nonSeamlessCubeMap( nonSeamlessCubeMap_ )
     {
     }
 
@@ -103337,27 +74561,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceNonSeamlessCubeMapFeaturesEXT & operator=( PhysicalDeviceNonSeamlessCubeMapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceNonSeamlessCubeMapFeaturesEXT & operator=( VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceNonSeamlessCubeMapFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceNonSeamlessCubeMapFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNonSeamlessCubeMapFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNonSeamlessCubeMapFeaturesEXT & setNonSeamlessCubeMap( Bool32 nonSeamlessCubeMap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceNonSeamlessCubeMapFeaturesEXT &
+      setNonSeamlessCubeMap( VULKAN_HPP_NAMESPACE::Bool32 nonSeamlessCubeMap_ ) VULKAN_HPP_NOEXCEPT
     {
       nonSeamlessCubeMap = nonSeamlessCubeMap_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -103369,18 +74594,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, nonSeamlessCubeMap );
     }
@@ -103405,27 +74625,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
-    void *        pNext              = {};
-    Bool32        nonSeamlessCubeMap = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nonSeamlessCubeMap = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT>
-  {
-    using Type = PhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT>
   {
     using Type = PhysicalDeviceNonSeamlessCubeMapFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceOpacityMicromapFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceOpacityMicromapFeaturesEXT.html
   struct PhysicalDeviceOpacityMicromapFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceOpacityMicromapFeaturesEXT;
@@ -103433,15 +74643,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpacityMicromapFeaturesEXT( Bool32 micromap_              = {},
-                                                                   Bool32 micromapCaptureReplay_ = {},
-                                                                   Bool32 micromapHostCommands_  = {},
-                                                                   void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , micromap{ micromap_ }
-      , micromapCaptureReplay{ micromapCaptureReplay_ }
-      , micromapHostCommands{ micromapHostCommands_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpacityMicromapFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 micromap_              = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 micromapCaptureReplay_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 micromapHostCommands_  = {},
+                                                                   void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , micromap( micromap_ )
+      , micromapCaptureReplay( micromapCaptureReplay_ )
+      , micromapHostCommands( micromapHostCommands_ )
     {
     }
 
@@ -103453,39 +74663,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceOpacityMicromapFeaturesEXT & operator=( PhysicalDeviceOpacityMicromapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceOpacityMicromapFeaturesEXT & operator=( VkPhysicalDeviceOpacityMicromapFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceOpacityMicromapFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT & setMicromap( Bool32 micromap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT & setMicromap( VULKAN_HPP_NAMESPACE::Bool32 micromap_ ) VULKAN_HPP_NOEXCEPT
     {
       micromap = micromap_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT & setMicromapCaptureReplay( Bool32 micromapCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT &
+      setMicromapCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 micromapCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       micromapCaptureReplay = micromapCaptureReplay_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT & setMicromapHostCommands( Bool32 micromapHostCommands_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpacityMicromapFeaturesEXT &
+      setMicromapHostCommands( VULKAN_HPP_NAMESPACE::Bool32 micromapHostCommands_ ) VULKAN_HPP_NOEXCEPT
     {
       micromapHostCommands = micromapHostCommands_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceOpacityMicromapFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -103497,18 +74709,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceOpacityMicromapFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceOpacityMicromapFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceOpacityMicromapFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceOpacityMicromapFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceOpacityMicromapFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, micromap, micromapCaptureReplay, micromapHostCommands );
     }
@@ -103534,29 +74745,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT;
-    void *        pNext                 = {};
-    Bool32        micromap              = {};
-    Bool32        micromapCaptureReplay = {};
-    Bool32        micromapHostCommands  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        micromap              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        micromapCaptureReplay = {};
+    VULKAN_HPP_NAMESPACE::Bool32        micromapHostCommands  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceOpacityMicromapFeaturesEXT>
-  {
-    using Type = PhysicalDeviceOpacityMicromapFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT>
   {
     using Type = PhysicalDeviceOpacityMicromapFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceOpacityMicromapPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceOpacityMicromapPropertiesEXT.html
   struct PhysicalDeviceOpacityMicromapPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceOpacityMicromapPropertiesEXT;
@@ -103564,13 +74765,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceOpacityMicromapPropertiesEXT( uint32_t maxOpacity2StateSubdivisionLevel_ = {},
                                                                      uint32_t maxOpacity4StateSubdivisionLevel_ = {},
                                                                      void *   pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxOpacity2StateSubdivisionLevel{ maxOpacity2StateSubdivisionLevel_ }
-      , maxOpacity4StateSubdivisionLevel{ maxOpacity4StateSubdivisionLevel_ }
+      : pNext( pNext_ )
+      , maxOpacity2StateSubdivisionLevel( maxOpacity2StateSubdivisionLevel_ )
+      , maxOpacity4StateSubdivisionLevel( maxOpacity4StateSubdivisionLevel_ )
     {
     }
 
@@ -103582,11 +74783,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceOpacityMicromapPropertiesEXT & operator=( PhysicalDeviceOpacityMicromapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceOpacityMicromapPropertiesEXT & operator=( VkPhysicalDeviceOpacityMicromapPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceOpacityMicromapPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpacityMicromapPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -103600,18 +74801,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceOpacityMicromapPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceOpacityMicromapPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceOpacityMicromapPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceOpacityMicromapPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceOpacityMicromapPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxOpacity2StateSubdivisionLevel, maxOpacity4StateSubdivisionLevel );
     }
@@ -103637,28 +74833,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT;
-    void *        pNext                            = {};
-    uint32_t      maxOpacity2StateSubdivisionLevel = {};
-    uint32_t      maxOpacity4StateSubdivisionLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT;
+    void *                              pNext                            = {};
+    uint32_t                            maxOpacity2StateSubdivisionLevel = {};
+    uint32_t                            maxOpacity4StateSubdivisionLevel = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceOpacityMicromapPropertiesEXT>
-  {
-    using Type = PhysicalDeviceOpacityMicromapPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT>
   {
     using Type = PhysicalDeviceOpacityMicromapPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceOpticalFlowFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceOpticalFlowFeaturesNV.html
   struct PhysicalDeviceOpticalFlowFeaturesNV
   {
     using NativeType = VkPhysicalDeviceOpticalFlowFeaturesNV;
@@ -103666,10 +74852,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceOpticalFlowFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpticalFlowFeaturesNV( Bool32 opticalFlow_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , opticalFlow{ opticalFlow_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpticalFlowFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 opticalFlow_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , opticalFlow( opticalFlow_ )
     {
     }
 
@@ -103681,27 +74867,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceOpticalFlowFeaturesNV & operator=( PhysicalDeviceOpticalFlowFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceOpticalFlowFeaturesNV & operator=( VkPhysicalDeviceOpticalFlowFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceOpticalFlowFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpticalFlowFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpticalFlowFeaturesNV & setOpticalFlow( Bool32 opticalFlow_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceOpticalFlowFeaturesNV & setOpticalFlow( VULKAN_HPP_NAMESPACE::Bool32 opticalFlow_ ) VULKAN_HPP_NOEXCEPT
     {
       opticalFlow = opticalFlow_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceOpticalFlowFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -103713,18 +74899,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceOpticalFlowFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceOpticalFlowFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceOpticalFlowFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceOpticalFlowFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceOpticalFlowFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, opticalFlow );
     }
@@ -103749,27 +74930,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::ePhysicalDeviceOpticalFlowFeaturesNV;
-    void *        pNext       = {};
-    Bool32        opticalFlow = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::ePhysicalDeviceOpticalFlowFeaturesNV;
+    void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        opticalFlow = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceOpticalFlowFeaturesNV>
-  {
-    using Type = PhysicalDeviceOpticalFlowFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceOpticalFlowFeaturesNV>
   {
     using Type = PhysicalDeviceOpticalFlowFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceOpticalFlowPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceOpticalFlowPropertiesNV.html
   struct PhysicalDeviceOpticalFlowPropertiesNV
   {
     using NativeType = VkPhysicalDeviceOpticalFlowPropertiesNV;
@@ -103777,31 +74948,31 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceOpticalFlowPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpticalFlowPropertiesNV( OpticalFlowGridSizeFlagsNV supportedOutputGridSizes_   = {},
-                                                                OpticalFlowGridSizeFlagsNV supportedHintGridSizes_     = {},
-                                                                Bool32                     hintSupported_              = {},
-                                                                Bool32                     costSupported_              = {},
-                                                                Bool32                     bidirectionalFlowSupported_ = {},
-                                                                Bool32                     globalFlowSupported_        = {},
-                                                                uint32_t                   minWidth_                   = {},
-                                                                uint32_t                   minHeight_                  = {},
-                                                                uint32_t                   maxWidth_                   = {},
-                                                                uint32_t                   maxHeight_                  = {},
-                                                                uint32_t                   maxNumRegionsOfInterest_    = {},
-                                                                void *                     pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportedOutputGridSizes{ supportedOutputGridSizes_ }
-      , supportedHintGridSizes{ supportedHintGridSizes_ }
-      , hintSupported{ hintSupported_ }
-      , costSupported{ costSupported_ }
-      , bidirectionalFlowSupported{ bidirectionalFlowSupported_ }
-      , globalFlowSupported{ globalFlowSupported_ }
-      , minWidth{ minWidth_ }
-      , minHeight{ minHeight_ }
-      , maxWidth{ maxWidth_ }
-      , maxHeight{ maxHeight_ }
-      , maxNumRegionsOfInterest{ maxNumRegionsOfInterest_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceOpticalFlowPropertiesNV( VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV supportedOutputGridSizes_   = {},
+                                                                VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV supportedHintGridSizes_     = {},
+                                                                VULKAN_HPP_NAMESPACE::Bool32                     hintSupported_              = {},
+                                                                VULKAN_HPP_NAMESPACE::Bool32                     costSupported_              = {},
+                                                                VULKAN_HPP_NAMESPACE::Bool32                     bidirectionalFlowSupported_ = {},
+                                                                VULKAN_HPP_NAMESPACE::Bool32                     globalFlowSupported_        = {},
+                                                                uint32_t                                         minWidth_                   = {},
+                                                                uint32_t                                         minHeight_                  = {},
+                                                                uint32_t                                         maxWidth_                   = {},
+                                                                uint32_t                                         maxHeight_                  = {},
+                                                                uint32_t                                         maxNumRegionsOfInterest_    = {},
+                                                                void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportedOutputGridSizes( supportedOutputGridSizes_ )
+      , supportedHintGridSizes( supportedHintGridSizes_ )
+      , hintSupported( hintSupported_ )
+      , costSupported( costSupported_ )
+      , bidirectionalFlowSupported( bidirectionalFlowSupported_ )
+      , globalFlowSupported( globalFlowSupported_ )
+      , minWidth( minWidth_ )
+      , minHeight( minHeight_ )
+      , maxWidth( maxWidth_ )
+      , maxHeight( maxHeight_ )
+      , maxNumRegionsOfInterest( maxNumRegionsOfInterest_ )
     {
     }
 
@@ -103813,11 +74984,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceOpticalFlowPropertiesNV & operator=( PhysicalDeviceOpticalFlowPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceOpticalFlowPropertiesNV & operator=( VkPhysicalDeviceOpticalFlowPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceOpticalFlowPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceOpticalFlowPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -103831,30 +75002,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceOpticalFlowPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceOpticalFlowPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceOpticalFlowPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceOpticalFlowPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceOpticalFlowPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               OpticalFlowGridSizeFlagsNV const &,
-               OpticalFlowGridSizeFlagsNV const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -103896,37 +75061,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                      = StructureType::ePhysicalDeviceOpticalFlowPropertiesNV;
-    void *                     pNext                      = {};
-    OpticalFlowGridSizeFlagsNV supportedOutputGridSizes   = {};
-    OpticalFlowGridSizeFlagsNV supportedHintGridSizes     = {};
-    Bool32                     hintSupported              = {};
-    Bool32                     costSupported              = {};
-    Bool32                     bidirectionalFlowSupported = {};
-    Bool32                     globalFlowSupported        = {};
-    uint32_t                   minWidth                   = {};
-    uint32_t                   minHeight                  = {};
-    uint32_t                   maxWidth                   = {};
-    uint32_t                   maxHeight                  = {};
-    uint32_t                   maxNumRegionsOfInterest    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                      = StructureType::ePhysicalDeviceOpticalFlowPropertiesNV;
+    void *                                           pNext                      = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV supportedOutputGridSizes   = {};
+    VULKAN_HPP_NAMESPACE::OpticalFlowGridSizeFlagsNV supportedHintGridSizes     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                     hintSupported              = {};
+    VULKAN_HPP_NAMESPACE::Bool32                     costSupported              = {};
+    VULKAN_HPP_NAMESPACE::Bool32                     bidirectionalFlowSupported = {};
+    VULKAN_HPP_NAMESPACE::Bool32                     globalFlowSupported        = {};
+    uint32_t                                         minWidth                   = {};
+    uint32_t                                         minHeight                  = {};
+    uint32_t                                         maxWidth                   = {};
+    uint32_t                                         maxHeight                  = {};
+    uint32_t                                         maxNumRegionsOfInterest    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceOpticalFlowPropertiesNV>
-  {
-    using Type = PhysicalDeviceOpticalFlowPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceOpticalFlowPropertiesNV>
   {
     using Type = PhysicalDeviceOpticalFlowPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePCIBusInfoPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePCIBusInfoPropertiesEXT.html
   struct PhysicalDevicePCIBusInfoPropertiesEXT
   {
     using NativeType = VkPhysicalDevicePCIBusInfoPropertiesEXT;
@@ -103934,14 +75089,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePciBusInfoPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDevicePCIBusInfoPropertiesEXT(
       uint32_t pciDomain_ = {}, uint32_t pciBus_ = {}, uint32_t pciDevice_ = {}, uint32_t pciFunction_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pciDomain{ pciDomain_ }
-      , pciBus{ pciBus_ }
-      , pciDevice{ pciDevice_ }
-      , pciFunction{ pciFunction_ }
+      : pNext( pNext_ )
+      , pciDomain( pciDomain_ )
+      , pciBus( pciBus_ )
+      , pciDevice( pciDevice_ )
+      , pciFunction( pciFunction_ )
     {
     }
 
@@ -103953,11 +75108,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePCIBusInfoPropertiesEXT & operator=( PhysicalDevicePCIBusInfoPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePCIBusInfoPropertiesEXT & operator=( VkPhysicalDevicePCIBusInfoPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePCIBusInfoPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePCIBusInfoPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -103971,18 +75126,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePCIBusInfoPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePCIBusInfoPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePCIBusInfoPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePCIBusInfoPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePCIBusInfoPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pciDomain, pciBus, pciDevice, pciFunction );
@@ -104009,30 +75158,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::ePhysicalDevicePciBusInfoPropertiesEXT;
-    void *        pNext       = {};
-    uint32_t      pciDomain   = {};
-    uint32_t      pciBus      = {};
-    uint32_t      pciDevice   = {};
-    uint32_t      pciFunction = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::ePhysicalDevicePciBusInfoPropertiesEXT;
+    void *                              pNext       = {};
+    uint32_t                            pciDomain   = {};
+    uint32_t                            pciBus      = {};
+    uint32_t                            pciDevice   = {};
+    uint32_t                            pciFunction = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePCIBusInfoPropertiesEXT>
-  {
-    using Type = PhysicalDevicePCIBusInfoPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePciBusInfoPropertiesEXT>
   {
     using Type = PhysicalDevicePCIBusInfoPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT.html
   struct PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT
   {
     using NativeType = VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
@@ -104040,11 +75179,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT( Bool32 pageableDeviceLocalMemory_ = {},
-                                                                             void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pageableDeviceLocalMemory{ pageableDeviceLocalMemory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 pageableDeviceLocalMemory_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pageableDeviceLocalMemory( pageableDeviceLocalMemory_ )
     {
     }
 
@@ -104058,15 +75197,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT &
       operator=( PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT & operator=( VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -104074,12 +75213,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT &
-      setPageableDeviceLocalMemory( Bool32 pageableDeviceLocalMemory_ ) VULKAN_HPP_NOEXCEPT
+      setPageableDeviceLocalMemory( VULKAN_HPP_NAMESPACE::Bool32 pageableDeviceLocalMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       pageableDeviceLocalMemory = pageableDeviceLocalMemory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -104091,18 +75230,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pageableDeviceLocalMemory );
     }
@@ -104127,245 +75261,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
-    void *        pNext                     = {};
-    Bool32        pageableDeviceLocalMemory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pageableDeviceLocalMemory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT>
-  {
-    using Type = PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT>
   {
     using Type = PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV.html
-  struct PhysicalDevicePartitionedAccelerationStructureFeaturesNV
-  {
-    using NativeType = VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePartitionedAccelerationStructureFeaturesNV( Bool32 partitionedAccelerationStructure_ = {},
-                                                                                   void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , partitionedAccelerationStructure{ partitionedAccelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePartitionedAccelerationStructureFeaturesNV( PhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePartitionedAccelerationStructureFeaturesNV( VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePartitionedAccelerationStructureFeaturesNV( *reinterpret_cast<PhysicalDevicePartitionedAccelerationStructureFeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePartitionedAccelerationStructureFeaturesNV &
-      operator=( PhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePartitionedAccelerationStructureFeaturesNV &
-      operator=( VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePartitionedAccelerationStructureFeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePartitionedAccelerationStructureFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePartitionedAccelerationStructureFeaturesNV &
-      setPartitionedAccelerationStructure( Bool32 partitionedAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      partitionedAccelerationStructure = partitionedAccelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, partitionedAccelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePartitionedAccelerationStructureFeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( partitionedAccelerationStructure == rhs.partitionedAccelerationStructure );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePartitionedAccelerationStructureFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                            = StructureType::ePhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-    void *        pNext                            = {};
-    Bool32        partitionedAccelerationStructure = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV>
-  {
-    using Type = PhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePartitionedAccelerationStructureFeaturesNV>
-  {
-    using Type = PhysicalDevicePartitionedAccelerationStructureFeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV.html
-  struct PhysicalDevicePartitionedAccelerationStructurePropertiesNV
-  {
-    using NativeType = VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePartitionedAccelerationStructurePropertiesNV( uint32_t maxPartitionCount_ = {},
-                                                                                     void *   pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxPartitionCount{ maxPartitionCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePartitionedAccelerationStructurePropertiesNV( PhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePartitionedAccelerationStructurePropertiesNV( VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePartitionedAccelerationStructurePropertiesNV(
-          *reinterpret_cast<PhysicalDevicePartitionedAccelerationStructurePropertiesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePartitionedAccelerationStructurePropertiesNV &
-      operator=( PhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePartitionedAccelerationStructurePropertiesNV &
-      operator=( VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePartitionedAccelerationStructurePropertiesNV const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxPartitionCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePartitionedAccelerationStructurePropertiesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxPartitionCount == rhs.maxPartitionCount );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePartitionedAccelerationStructurePropertiesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::ePhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-    void *        pNext             = {};
-    uint32_t      maxPartitionCount = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV>
-  {
-    using Type = PhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePartitionedAccelerationStructurePropertiesNV>
-  {
-    using Type = PhysicalDevicePartitionedAccelerationStructurePropertiesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePerStageDescriptorSetFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePerStageDescriptorSetFeaturesNV.html
   struct PhysicalDevicePerStageDescriptorSetFeaturesNV
   {
     using NativeType = VkPhysicalDevicePerStageDescriptorSetFeaturesNV;
@@ -104373,13 +75279,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerStageDescriptorSetFeaturesNV( Bool32 perStageDescriptorSet_ = {},
-                                                                        Bool32 dynamicPipelineLayout_ = {},
-                                                                        void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , perStageDescriptorSet{ perStageDescriptorSet_ }
-      , dynamicPipelineLayout{ dynamicPipelineLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePerStageDescriptorSetFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 perStageDescriptorSet_ = {},
+                                                                        VULKAN_HPP_NAMESPACE::Bool32 dynamicPipelineLayout_ = {},
+                                                                        void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , perStageDescriptorSet( perStageDescriptorSet_ )
+      , dynamicPipelineLayout( dynamicPipelineLayout_ )
     {
     }
 
@@ -104392,33 +75298,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePerStageDescriptorSetFeaturesNV & operator=( PhysicalDevicePerStageDescriptorSetFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePerStageDescriptorSetFeaturesNV & operator=( VkPhysicalDevicePerStageDescriptorSetFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePerStageDescriptorSetFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePerStageDescriptorSetFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerStageDescriptorSetFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerStageDescriptorSetFeaturesNV & setPerStageDescriptorSet( Bool32 perStageDescriptorSet_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerStageDescriptorSetFeaturesNV &
+      setPerStageDescriptorSet( VULKAN_HPP_NAMESPACE::Bool32 perStageDescriptorSet_ ) VULKAN_HPP_NOEXCEPT
     {
       perStageDescriptorSet = perStageDescriptorSet_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerStageDescriptorSetFeaturesNV & setDynamicPipelineLayout( Bool32 dynamicPipelineLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerStageDescriptorSetFeaturesNV &
+      setDynamicPipelineLayout( VULKAN_HPP_NAMESPACE::Bool32 dynamicPipelineLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicPipelineLayout = dynamicPipelineLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePerStageDescriptorSetFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -104430,18 +75338,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePerStageDescriptorSetFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDevicePerStageDescriptorSetFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePerStageDescriptorSetFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePerStageDescriptorSetFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePerStageDescriptorSetFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, perStageDescriptorSet, dynamicPipelineLayout );
     }
@@ -104467,260 +75370,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV;
-    void *        pNext                 = {};
-    Bool32        perStageDescriptorSet = {};
-    Bool32        dynamicPipelineLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        perStageDescriptorSet = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicPipelineLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePerStageDescriptorSetFeaturesNV>
-  {
-    using Type = PhysicalDevicePerStageDescriptorSetFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV>
   {
     using Type = PhysicalDevicePerStageDescriptorSetFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePerformanceCountersByRegionFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePerformanceCountersByRegionFeaturesARM.html
-  struct PhysicalDevicePerformanceCountersByRegionFeaturesARM
-  {
-    using NativeType = VkPhysicalDevicePerformanceCountersByRegionFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePerformanceCountersByRegionFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceCountersByRegionFeaturesARM( Bool32 performanceCountersByRegion_ = {},
-                                                                               void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , performanceCountersByRegion{ performanceCountersByRegion_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDevicePerformanceCountersByRegionFeaturesARM( PhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePerformanceCountersByRegionFeaturesARM( VkPhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePerformanceCountersByRegionFeaturesARM( *reinterpret_cast<PhysicalDevicePerformanceCountersByRegionFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePerformanceCountersByRegionFeaturesARM &
-      operator=( PhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePerformanceCountersByRegionFeaturesARM & operator=( VkPhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePerformanceCountersByRegionFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerformanceCountersByRegionFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerformanceCountersByRegionFeaturesARM &
-      setPerformanceCountersByRegion( Bool32 performanceCountersByRegion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      performanceCountersByRegion = performanceCountersByRegion_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePerformanceCountersByRegionFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePerformanceCountersByRegionFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePerformanceCountersByRegionFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePerformanceCountersByRegionFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePerformanceCountersByRegionFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, performanceCountersByRegion );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePerformanceCountersByRegionFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( performanceCountersByRegion == rhs.performanceCountersByRegion );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePerformanceCountersByRegionFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                       = StructureType::ePhysicalDevicePerformanceCountersByRegionFeaturesARM;
-    void *        pNext                       = {};
-    Bool32        performanceCountersByRegion = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePerformanceCountersByRegionFeaturesARM>
-  {
-    using Type = PhysicalDevicePerformanceCountersByRegionFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePerformanceCountersByRegionFeaturesARM>
-  {
-    using Type = PhysicalDevicePerformanceCountersByRegionFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePerformanceCountersByRegionPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePerformanceCountersByRegionPropertiesARM.html
-  struct PhysicalDevicePerformanceCountersByRegionPropertiesARM
-  {
-    using NativeType = VkPhysicalDevicePerformanceCountersByRegionPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePerformanceCountersByRegionPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceCountersByRegionPropertiesARM( uint32_t maxPerRegionPerformanceCounters_ = {},
-                                                                                 Extent2D performanceCounterRegionSize_    = {},
-                                                                                 uint32_t rowStrideAlignment_              = {},
-                                                                                 uint32_t regionAlignment_                 = {},
-                                                                                 Bool32   identityTransformOrder_          = {},
-                                                                                 void *   pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxPerRegionPerformanceCounters{ maxPerRegionPerformanceCounters_ }
-      , performanceCounterRegionSize{ performanceCounterRegionSize_ }
-      , rowStrideAlignment{ rowStrideAlignment_ }
-      , regionAlignment{ regionAlignment_ }
-      , identityTransformOrder{ identityTransformOrder_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceCountersByRegionPropertiesARM( PhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePerformanceCountersByRegionPropertiesARM( VkPhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePerformanceCountersByRegionPropertiesARM( *reinterpret_cast<PhysicalDevicePerformanceCountersByRegionPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePerformanceCountersByRegionPropertiesARM &
-      operator=( PhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePerformanceCountersByRegionPropertiesARM &
-      operator=( VkPhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePerformanceCountersByRegionPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePerformanceCountersByRegionPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePerformanceCountersByRegionPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePerformanceCountersByRegionPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceCountersByRegionPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePerformanceCountersByRegionPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, Extent2D const &, uint32_t const &, uint32_t const &, Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie(
-        sType, pNext, maxPerRegionPerformanceCounters, performanceCounterRegionSize, rowStrideAlignment, regionAlignment, identityTransformOrder );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePerformanceCountersByRegionPropertiesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxPerRegionPerformanceCounters == rhs.maxPerRegionPerformanceCounters ) &&
-             ( performanceCounterRegionSize == rhs.performanceCounterRegionSize ) && ( rowStrideAlignment == rhs.rowStrideAlignment ) &&
-             ( regionAlignment == rhs.regionAlignment ) && ( identityTransformOrder == rhs.identityTransformOrder );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePerformanceCountersByRegionPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                           = StructureType::ePhysicalDevicePerformanceCountersByRegionPropertiesARM;
-    void *        pNext                           = {};
-    uint32_t      maxPerRegionPerformanceCounters = {};
-    Extent2D      performanceCounterRegionSize    = {};
-    uint32_t      rowStrideAlignment              = {};
-    uint32_t      regionAlignment                 = {};
-    Bool32        identityTransformOrder          = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePerformanceCountersByRegionPropertiesARM>
-  {
-    using Type = PhysicalDevicePerformanceCountersByRegionPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePerformanceCountersByRegionPropertiesARM>
-  {
-    using Type = PhysicalDevicePerformanceCountersByRegionPropertiesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePerformanceQueryFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePerformanceQueryFeaturesKHR.html
   struct PhysicalDevicePerformanceQueryFeaturesKHR
   {
     using NativeType = VkPhysicalDevicePerformanceQueryFeaturesKHR;
@@ -104728,13 +75389,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceQueryFeaturesKHR( Bool32 performanceCounterQueryPools_         = {},
-                                                                    Bool32 performanceCounterMultipleQueryPools_ = {},
-                                                                    void * pNext_                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , performanceCounterQueryPools{ performanceCounterQueryPools_ }
-      , performanceCounterMultipleQueryPools{ performanceCounterMultipleQueryPools_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceQueryFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 performanceCounterQueryPools_         = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 performanceCounterMultipleQueryPools_ = {},
+                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , performanceCounterQueryPools( performanceCounterQueryPools_ )
+      , performanceCounterMultipleQueryPools( performanceCounterMultipleQueryPools_ )
     {
     }
 
@@ -104746,15 +75407,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePerformanceQueryFeaturesKHR & operator=( PhysicalDevicePerformanceQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePerformanceQueryFeaturesKHR & operator=( VkPhysicalDevicePerformanceQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePerformanceQueryFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceQueryFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerformanceQueryFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -104762,19 +75423,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerformanceQueryFeaturesKHR &
-      setPerformanceCounterQueryPools( Bool32 performanceCounterQueryPools_ ) VULKAN_HPP_NOEXCEPT
+      setPerformanceCounterQueryPools( VULKAN_HPP_NAMESPACE::Bool32 performanceCounterQueryPools_ ) VULKAN_HPP_NOEXCEPT
     {
       performanceCounterQueryPools = performanceCounterQueryPools_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePerformanceQueryFeaturesKHR &
-      setPerformanceCounterMultipleQueryPools( Bool32 performanceCounterMultipleQueryPools_ ) VULKAN_HPP_NOEXCEPT
+      setPerformanceCounterMultipleQueryPools( VULKAN_HPP_NAMESPACE::Bool32 performanceCounterMultipleQueryPools_ ) VULKAN_HPP_NOEXCEPT
     {
       performanceCounterMultipleQueryPools = performanceCounterMultipleQueryPools_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePerformanceQueryFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -104786,18 +75447,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePerformanceQueryFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePerformanceQueryFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePerformanceQueryFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceQueryFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePerformanceQueryFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, performanceCounterQueryPools, performanceCounterMultipleQueryPools );
     }
@@ -104823,28 +75479,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                = StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR;
-    void *        pNext                                = {};
-    Bool32        performanceCounterQueryPools         = {};
-    Bool32        performanceCounterMultipleQueryPools = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                = StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR;
+    void *                              pNext                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        performanceCounterQueryPools         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        performanceCounterMultipleQueryPools = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePerformanceQueryFeaturesKHR>
-  {
-    using Type = PhysicalDevicePerformanceQueryFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR>
   {
     using Type = PhysicalDevicePerformanceQueryFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePerformanceQueryPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePerformanceQueryPropertiesKHR.html
   struct PhysicalDevicePerformanceQueryPropertiesKHR
   {
     using NativeType = VkPhysicalDevicePerformanceQueryPropertiesKHR;
@@ -104852,10 +75498,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePerformanceQueryPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceQueryPropertiesKHR( Bool32 allowCommandBufferQueryCopies_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allowCommandBufferQueryCopies{ allowCommandBufferQueryCopies_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePerformanceQueryPropertiesKHR( VULKAN_HPP_NAMESPACE::Bool32 allowCommandBufferQueryCopies_ = {},
+                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , allowCommandBufferQueryCopies( allowCommandBufferQueryCopies_ )
     {
     }
 
@@ -104867,11 +75514,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePerformanceQueryPropertiesKHR & operator=( PhysicalDevicePerformanceQueryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePerformanceQueryPropertiesKHR & operator=( VkPhysicalDevicePerformanceQueryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePerformanceQueryPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePerformanceQueryPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -104885,18 +75532,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePerformanceQueryPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePerformanceQueryPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePerformanceQueryPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePerformanceQueryPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePerformanceQueryPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, allowCommandBufferQueryCopies );
     }
@@ -104921,374 +75563,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDevicePerformanceQueryPropertiesKHR;
-    void *        pNext                         = {};
-    Bool32        allowCommandBufferQueryCopies = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDevicePerformanceQueryPropertiesKHR;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        allowCommandBufferQueryCopies = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePerformanceQueryPropertiesKHR>
-  {
-    using Type = PhysicalDevicePerformanceQueryPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePerformanceQueryPropertiesKHR>
   {
     using Type = PhysicalDevicePerformanceQueryPropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePipelineBinaryFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineBinaryFeaturesKHR.html
-  struct PhysicalDevicePipelineBinaryFeaturesKHR
-  {
-    using NativeType = VkPhysicalDevicePipelineBinaryFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineBinaryFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineBinaryFeaturesKHR( Bool32 pipelineBinaries_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBinaries{ pipelineBinaries_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineBinaryFeaturesKHR( PhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePipelineBinaryFeaturesKHR( VkPhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineBinaryFeaturesKHR( *reinterpret_cast<PhysicalDevicePipelineBinaryFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePipelineBinaryFeaturesKHR & operator=( PhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePipelineBinaryFeaturesKHR & operator=( VkPhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePipelineBinaryFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineBinaryFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineBinaryFeaturesKHR & setPipelineBinaries( Bool32 pipelineBinaries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineBinaries = pipelineBinaries_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePipelineBinaryFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineBinaryFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePipelineBinaryFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineBinaryFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineBinaryFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipelineBinaries );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineBinaryFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineBinaries == rhs.pipelineBinaries );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePipelineBinaryFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType            = StructureType::ePhysicalDevicePipelineBinaryFeaturesKHR;
-    void *        pNext            = {};
-    Bool32        pipelineBinaries = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineBinaryFeaturesKHR>
-  {
-    using Type = PhysicalDevicePipelineBinaryFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineBinaryFeaturesKHR>
-  {
-    using Type = PhysicalDevicePipelineBinaryFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePipelineBinaryPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineBinaryPropertiesKHR.html
-  struct PhysicalDevicePipelineBinaryPropertiesKHR
-  {
-    using NativeType = VkPhysicalDevicePipelineBinaryPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineBinaryPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineBinaryPropertiesKHR( Bool32 pipelineBinaryInternalCache_            = {},
-                                                                    Bool32 pipelineBinaryInternalCacheControl_     = {},
-                                                                    Bool32 pipelineBinaryPrefersInternalCache_     = {},
-                                                                    Bool32 pipelineBinaryPrecompiledInternalCache_ = {},
-                                                                    Bool32 pipelineBinaryCompressedData_           = {},
-                                                                    void * pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBinaryInternalCache{ pipelineBinaryInternalCache_ }
-      , pipelineBinaryInternalCacheControl{ pipelineBinaryInternalCacheControl_ }
-      , pipelineBinaryPrefersInternalCache{ pipelineBinaryPrefersInternalCache_ }
-      , pipelineBinaryPrecompiledInternalCache{ pipelineBinaryPrecompiledInternalCache_ }
-      , pipelineBinaryCompressedData{ pipelineBinaryCompressedData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineBinaryPropertiesKHR( PhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePipelineBinaryPropertiesKHR( VkPhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineBinaryPropertiesKHR( *reinterpret_cast<PhysicalDevicePipelineBinaryPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePipelineBinaryPropertiesKHR & operator=( PhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePipelineBinaryPropertiesKHR & operator=( VkPhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePipelineBinaryPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDevicePipelineBinaryPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineBinaryPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePipelineBinaryPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineBinaryPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineBinaryPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineBinaryPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       pipelineBinaryInternalCache,
-                       pipelineBinaryInternalCacheControl,
-                       pipelineBinaryPrefersInternalCache,
-                       pipelineBinaryPrecompiledInternalCache,
-                       pipelineBinaryCompressedData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineBinaryPropertiesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineBinaryInternalCache == rhs.pipelineBinaryInternalCache ) &&
-             ( pipelineBinaryInternalCacheControl == rhs.pipelineBinaryInternalCacheControl ) &&
-             ( pipelineBinaryPrefersInternalCache == rhs.pipelineBinaryPrefersInternalCache ) &&
-             ( pipelineBinaryPrecompiledInternalCache == rhs.pipelineBinaryPrecompiledInternalCache ) &&
-             ( pipelineBinaryCompressedData == rhs.pipelineBinaryCompressedData );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePipelineBinaryPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                  = StructureType::ePhysicalDevicePipelineBinaryPropertiesKHR;
-    void *        pNext                                  = {};
-    Bool32        pipelineBinaryInternalCache            = {};
-    Bool32        pipelineBinaryInternalCacheControl     = {};
-    Bool32        pipelineBinaryPrefersInternalCache     = {};
-    Bool32        pipelineBinaryPrecompiledInternalCache = {};
-    Bool32        pipelineBinaryCompressedData           = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineBinaryPropertiesKHR>
-  {
-    using Type = PhysicalDevicePipelineBinaryPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineBinaryPropertiesKHR>
-  {
-    using Type = PhysicalDevicePipelineBinaryPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC.html
-  struct PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC
-  {
-    using NativeType = VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC( Bool32 pipelineCacheIncrementalMode_ = {},
-                                                                                void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineCacheIncrementalMode{ pipelineCacheIncrementalMode_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC( PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC( VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC( *reinterpret_cast<PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC &
-      operator=( PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC & operator=( VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC &
-      setPipelineCacheIncrementalMode( Bool32 pipelineCacheIncrementalMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineCacheIncrementalMode = pipelineCacheIncrementalMode_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipelineCacheIncrementalMode );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineCacheIncrementalMode == rhs.pipelineCacheIncrementalMode );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                        = StructureType::ePhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-    void *        pNext                        = {};
-    Bool32        pipelineCacheIncrementalMode = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>
-  {
-    using Type = PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineCacheIncrementalModeFeaturesSEC>
-  {
-    using Type = PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePipelineCreationCacheControlFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineCreationCacheControlFeatures.html
   struct PhysicalDevicePipelineCreationCacheControlFeatures
   {
     using NativeType = VkPhysicalDevicePipelineCreationCacheControlFeatures;
@@ -105296,11 +75581,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineCreationCacheControlFeatures( Bool32 pipelineCreationCacheControl_ = {},
-                                                                             void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineCreationCacheControl{ pipelineCreationCacheControl_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineCreationCacheControlFeatures( VULKAN_HPP_NAMESPACE::Bool32 pipelineCreationCacheControl_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineCreationCacheControl( pipelineCreationCacheControl_ )
     {
     }
 
@@ -105314,15 +75599,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePipelineCreationCacheControlFeatures &
       operator=( PhysicalDevicePipelineCreationCacheControlFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePipelineCreationCacheControlFeatures & operator=( VkPhysicalDevicePipelineCreationCacheControlFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineCreationCacheControlFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineCreationCacheControlFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineCreationCacheControlFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -105330,12 +75615,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineCreationCacheControlFeatures &
-      setPipelineCreationCacheControl( Bool32 pipelineCreationCacheControl_ ) VULKAN_HPP_NOEXCEPT
+      setPipelineCreationCacheControl( VULKAN_HPP_NAMESPACE::Bool32 pipelineCreationCacheControl_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineCreationCacheControl = pipelineCreationCacheControl_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePipelineCreationCacheControlFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -105347,18 +75632,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePipelineCreationCacheControlFeatures *>( this );
     }
 
-    operator VkPhysicalDevicePipelineCreationCacheControlFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineCreationCacheControlFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineCreationCacheControlFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineCreationCacheControlFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineCreationCacheControl );
     }
@@ -105383,19 +75663,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures;
-    void *        pNext                        = {};
-    Bool32        pipelineCreationCacheControl = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineCreationCacheControl = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineCreationCacheControlFeatures>
-  {
-    using Type = PhysicalDevicePipelineCreationCacheControlFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures>
   {
@@ -105404,8 +75676,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDevicePipelineCreationCacheControlFeaturesEXT = PhysicalDevicePipelineCreationCacheControlFeatures;
 
-  // wrapper struct for struct VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR.html
   struct PhysicalDevicePipelineExecutablePropertiesFeaturesKHR
   {
     using NativeType = VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
@@ -105413,11 +75683,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineExecutablePropertiesFeaturesKHR( Bool32 pipelineExecutableInfo_ = {},
-                                                                                void * pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineExecutableInfo{ pipelineExecutableInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineExecutablePropertiesFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 pipelineExecutableInfo_ = {},
+                                                                                void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineExecutableInfo( pipelineExecutableInfo_ )
     {
     }
 
@@ -105431,15 +75701,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePipelineExecutablePropertiesFeaturesKHR &
       operator=( PhysicalDevicePipelineExecutablePropertiesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePipelineExecutablePropertiesFeaturesKHR & operator=( VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineExecutablePropertiesFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineExecutablePropertiesFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineExecutablePropertiesFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -105447,12 +75717,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineExecutablePropertiesFeaturesKHR &
-      setPipelineExecutableInfo( Bool32 pipelineExecutableInfo_ ) VULKAN_HPP_NOEXCEPT
+      setPipelineExecutableInfo( VULKAN_HPP_NAMESPACE::Bool32 pipelineExecutableInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineExecutableInfo = pipelineExecutableInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -105464,18 +75734,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineExecutableInfo );
     }
@@ -105500,27 +75765,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
-    void *        pNext                  = {};
-    Bool32        pipelineExecutableInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
+    void *                              pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineExecutableInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR>
-  {
-    using Type = PhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePipelineExecutablePropertiesFeaturesKHR>
   {
     using Type = PhysicalDevicePipelineExecutablePropertiesFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT.html
   struct PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT
   {
     using NativeType = VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
@@ -105528,11 +75783,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT( Bool32 pipelineLibraryGroupHandles_ = {},
-                                                                               void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineLibraryGroupHandles{ pipelineLibraryGroupHandles_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 pipelineLibraryGroupHandles_ = {},
+                                                                               void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineLibraryGroupHandles( pipelineLibraryGroupHandles_ )
     {
     }
 
@@ -105546,15 +75801,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT &
       operator=( PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT & operator=( VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -105562,12 +75817,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT &
-      setPipelineLibraryGroupHandles( Bool32 pipelineLibraryGroupHandles_ ) VULKAN_HPP_NOEXCEPT
+      setPipelineLibraryGroupHandles( VULKAN_HPP_NAMESPACE::Bool32 pipelineLibraryGroupHandles_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineLibraryGroupHandles = pipelineLibraryGroupHandles_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -105579,18 +75834,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineLibraryGroupHandles );
     }
@@ -105615,139 +75865,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
-    void *        pNext                       = {};
-    Bool32        pipelineLibraryGroupHandles = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineLibraryGroupHandles = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT>
-  {
-    using Type = PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT>
   {
     using Type = PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePipelineOpacityMicromapFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineOpacityMicromapFeaturesARM.html
-  struct PhysicalDevicePipelineOpacityMicromapFeaturesARM
-  {
-    using NativeType = VkPhysicalDevicePipelineOpacityMicromapFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineOpacityMicromapFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineOpacityMicromapFeaturesARM( Bool32 pipelineOpacityMicromap_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineOpacityMicromap{ pipelineOpacityMicromap_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDevicePipelineOpacityMicromapFeaturesARM( PhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePipelineOpacityMicromapFeaturesARM( VkPhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineOpacityMicromapFeaturesARM( *reinterpret_cast<PhysicalDevicePipelineOpacityMicromapFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePipelineOpacityMicromapFeaturesARM & operator=( PhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePipelineOpacityMicromapFeaturesARM & operator=( VkPhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePipelineOpacityMicromapFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineOpacityMicromapFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineOpacityMicromapFeaturesARM & setPipelineOpacityMicromap( Bool32 pipelineOpacityMicromap_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineOpacityMicromap = pipelineOpacityMicromap_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePipelineOpacityMicromapFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineOpacityMicromapFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineOpacityMicromapFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePipelineOpacityMicromapFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineOpacityMicromapFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineOpacityMicromapFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineOpacityMicromapFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineOpacityMicromapFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipelineOpacityMicromap );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineOpacityMicromapFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineOpacityMicromap == rhs.pipelineOpacityMicromap );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePipelineOpacityMicromapFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                   = StructureType::ePhysicalDevicePipelineOpacityMicromapFeaturesARM;
-    void *        pNext                   = {};
-    Bool32        pipelineOpacityMicromap = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineOpacityMicromapFeaturesARM>
-  {
-    using Type = PhysicalDevicePipelineOpacityMicromapFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineOpacityMicromapFeaturesARM>
-  {
-    using Type = PhysicalDevicePipelineOpacityMicromapFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePipelinePropertiesFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelinePropertiesFeaturesEXT.html
   struct PhysicalDevicePipelinePropertiesFeaturesEXT
   {
     using NativeType = VkPhysicalDevicePipelinePropertiesFeaturesEXT;
@@ -105755,10 +75883,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelinePropertiesFeaturesEXT( Bool32 pipelinePropertiesIdentifier_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelinePropertiesIdentifier{ pipelinePropertiesIdentifier_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelinePropertiesFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 pipelinePropertiesIdentifier_ = {},
+                                                                      void *                       pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelinePropertiesIdentifier( pipelinePropertiesIdentifier_ )
     {
     }
 
@@ -105770,15 +75899,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePipelinePropertiesFeaturesEXT & operator=( PhysicalDevicePipelinePropertiesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePipelinePropertiesFeaturesEXT & operator=( VkPhysicalDevicePipelinePropertiesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelinePropertiesFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelinePropertiesFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelinePropertiesFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -105786,12 +75915,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelinePropertiesFeaturesEXT &
-      setPipelinePropertiesIdentifier( Bool32 pipelinePropertiesIdentifier_ ) VULKAN_HPP_NOEXCEPT
+      setPipelinePropertiesIdentifier( VULKAN_HPP_NAMESPACE::Bool32 pipelinePropertiesIdentifier_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelinePropertiesIdentifier = pipelinePropertiesIdentifier_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePipelinePropertiesFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -105803,18 +75932,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePipelinePropertiesFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePipelinePropertiesFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelinePropertiesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePipelinePropertiesFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelinePropertiesFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelinePropertiesIdentifier );
     }
@@ -105839,103 +75963,90 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT;
-    void *        pNext                        = {};
-    Bool32        pipelinePropertiesIdentifier = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelinePropertiesIdentifier = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelinePropertiesFeaturesEXT>
-  {
-    using Type = PhysicalDevicePipelinePropertiesFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT>
   {
     using Type = PhysicalDevicePipelinePropertiesFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePipelineProtectedAccessFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineProtectedAccessFeatures.html
-  struct PhysicalDevicePipelineProtectedAccessFeatures
+  struct PhysicalDevicePipelineProtectedAccessFeaturesEXT
   {
-    using NativeType = VkPhysicalDevicePipelineProtectedAccessFeatures;
+    using NativeType = VkPhysicalDevicePipelineProtectedAccessFeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineProtectedAccessFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineProtectedAccessFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineProtectedAccessFeatures( Bool32 pipelineProtectedAccess_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineProtectedAccess{ pipelineProtectedAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineProtectedAccessFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 pipelineProtectedAccess_ = {},
+                                                                           void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineProtectedAccess( pipelineProtectedAccess_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDevicePipelineProtectedAccessFeatures( PhysicalDevicePipelineProtectedAccessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDevicePipelineProtectedAccessFeaturesEXT( PhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDevicePipelineProtectedAccessFeatures( VkPhysicalDevicePipelineProtectedAccessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineProtectedAccessFeatures( *reinterpret_cast<PhysicalDevicePipelineProtectedAccessFeatures const *>( &rhs ) )
+    PhysicalDevicePipelineProtectedAccessFeaturesEXT( VkPhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDevicePipelineProtectedAccessFeaturesEXT( *reinterpret_cast<PhysicalDevicePipelineProtectedAccessFeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDevicePipelineProtectedAccessFeatures & operator=( PhysicalDevicePipelineProtectedAccessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDevicePipelineProtectedAccessFeaturesEXT & operator=( PhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDevicePipelineProtectedAccessFeatures & operator=( VkPhysicalDevicePipelineProtectedAccessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDevicePipelineProtectedAccessFeaturesEXT & operator=( VkPhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineProtectedAccessFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineProtectedAccessFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineProtectedAccessFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineProtectedAccessFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineProtectedAccessFeatures & setPipelineProtectedAccess( Bool32 pipelineProtectedAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineProtectedAccessFeaturesEXT &
+      setPipelineProtectedAccess( VULKAN_HPP_NAMESPACE::Bool32 pipelineProtectedAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineProtectedAccess = pipelineProtectedAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDevicePipelineProtectedAccessFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineProtectedAccessFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineProtectedAccessFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDevicePipelineProtectedAccessFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePipelineProtectedAccessFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineProtectedAccessFeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDevicePipelineProtectedAccessFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineProtectedAccessFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineProtectedAccessFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineProtectedAccessFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineProtectedAccessFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDevicePipelineProtectedAccessFeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineProtectedAccess );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineProtectedAccessFeatures const & ) const = default;
+    auto operator<=>( PhysicalDevicePipelineProtectedAccessFeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDevicePipelineProtectedAccessFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -105944,111 +76055,96 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDevicePipelineProtectedAccessFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDevicePipelineProtectedAccessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDevicePipelineProtectedAccessFeatures;
-    void *        pNext                   = {};
-    Bool32        pipelineProtectedAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDevicePipelineProtectedAccessFeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineProtectedAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineProtectedAccessFeatures>
-  {
-    using Type = PhysicalDevicePipelineProtectedAccessFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineProtectedAccessFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineProtectedAccessFeaturesEXT>
   {
-    using Type = PhysicalDevicePipelineProtectedAccessFeatures;
+    using Type = PhysicalDevicePipelineProtectedAccessFeaturesEXT;
   };
 
-  using PhysicalDevicePipelineProtectedAccessFeaturesEXT = PhysicalDevicePipelineProtectedAccessFeatures;
-
-  // wrapper struct for struct VkPhysicalDevicePipelineRobustnessFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineRobustnessFeatures.html
-  struct PhysicalDevicePipelineRobustnessFeatures
+  struct PhysicalDevicePipelineRobustnessFeaturesEXT
   {
-    using NativeType = VkPhysicalDevicePipelineRobustnessFeatures;
+    using NativeType = VkPhysicalDevicePipelineRobustnessFeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineRobustnessFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineRobustnessFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessFeatures( Bool32 pipelineRobustness_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineRobustness{ pipelineRobustness_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 pipelineRobustness_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineRobustness( pipelineRobustness_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessFeatures( PhysicalDevicePipelineRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessFeaturesEXT( PhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDevicePipelineRobustnessFeatures( VkPhysicalDevicePipelineRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineRobustnessFeatures( *reinterpret_cast<PhysicalDevicePipelineRobustnessFeatures const *>( &rhs ) )
+    PhysicalDevicePipelineRobustnessFeaturesEXT( VkPhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDevicePipelineRobustnessFeaturesEXT( *reinterpret_cast<PhysicalDevicePipelineRobustnessFeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDevicePipelineRobustnessFeatures & operator=( PhysicalDevicePipelineRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDevicePipelineRobustnessFeaturesEXT & operator=( PhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDevicePipelineRobustnessFeatures & operator=( VkPhysicalDevicePipelineRobustnessFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDevicePipelineRobustnessFeaturesEXT & operator=( VkPhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineRobustnessFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineRobustnessFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineRobustnessFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineRobustnessFeatures & setPipelineRobustness( Bool32 pipelineRobustness_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePipelineRobustnessFeaturesEXT &
+      setPipelineRobustness( VULKAN_HPP_NAMESPACE::Bool32 pipelineRobustness_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineRobustness = pipelineRobustness_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDevicePipelineRobustnessFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineRobustnessFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineRobustnessFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDevicePipelineRobustnessFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePipelineRobustnessFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineRobustnessFeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDevicePipelineRobustnessFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineRobustnessFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineRobustnessFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineRobustnessFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineRobustnessFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDevicePipelineRobustnessFeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineRobustness );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineRobustnessFeatures const & ) const = default;
+    auto operator<=>( PhysicalDevicePipelineRobustnessFeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDevicePipelineRobustnessFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -106057,101 +76153,88 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDevicePipelineRobustnessFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDevicePipelineRobustnessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDevicePipelineRobustnessFeatures;
-    void *        pNext              = {};
-    Bool32        pipelineRobustness = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDevicePipelineRobustnessFeaturesEXT;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineRobustness = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineRobustnessFeatures>
-  {
-    using Type = PhysicalDevicePipelineRobustnessFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineRobustnessFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineRobustnessFeaturesEXT>
   {
-    using Type = PhysicalDevicePipelineRobustnessFeatures;
+    using Type = PhysicalDevicePipelineRobustnessFeaturesEXT;
   };
 
-  using PhysicalDevicePipelineRobustnessFeaturesEXT = PhysicalDevicePipelineRobustnessFeatures;
-
-  // wrapper struct for struct VkPhysicalDevicePipelineRobustnessProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePipelineRobustnessProperties.html
-  struct PhysicalDevicePipelineRobustnessProperties
+  struct PhysicalDevicePipelineRobustnessPropertiesEXT
   {
-    using NativeType = VkPhysicalDevicePipelineRobustnessProperties;
+    using NativeType = VkPhysicalDevicePipelineRobustnessPropertiesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineRobustnessProperties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePipelineRobustnessPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessProperties(
-      PipelineRobustnessBufferBehavior defaultRobustnessStorageBuffers_ = PipelineRobustnessBufferBehavior::eDeviceDefault,
-      PipelineRobustnessBufferBehavior defaultRobustnessUniformBuffers_ = PipelineRobustnessBufferBehavior::eDeviceDefault,
-      PipelineRobustnessBufferBehavior defaultRobustnessVertexInputs_   = PipelineRobustnessBufferBehavior::eDeviceDefault,
-      PipelineRobustnessImageBehavior  defaultRobustnessImages_         = PipelineRobustnessImageBehavior::eDeviceDefault,
-      void *                           pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , defaultRobustnessStorageBuffers{ defaultRobustnessStorageBuffers_ }
-      , defaultRobustnessUniformBuffers{ defaultRobustnessUniformBuffers_ }
-      , defaultRobustnessVertexInputs{ defaultRobustnessVertexInputs_ }
-      , defaultRobustnessImages{ defaultRobustnessImages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDevicePipelineRobustnessPropertiesEXT( VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessStorageBuffers_ =
+                                                       VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+                                                     VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessUniformBuffers_ =
+                                                       VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+                                                     VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessVertexInputs_ =
+                                                       VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+                                                     VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT defaultRobustnessImages_ =
+                                                       VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT::eDeviceDefault,
+                                                     void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , defaultRobustnessStorageBuffers( defaultRobustnessStorageBuffers_ )
+      , defaultRobustnessUniformBuffers( defaultRobustnessUniformBuffers_ )
+      , defaultRobustnessVertexInputs( defaultRobustnessVertexInputs_ )
+      , defaultRobustnessImages( defaultRobustnessImages_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePipelineRobustnessProperties( PhysicalDevicePipelineRobustnessProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDevicePipelineRobustnessPropertiesEXT( PhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDevicePipelineRobustnessProperties( VkPhysicalDevicePipelineRobustnessProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePipelineRobustnessProperties( *reinterpret_cast<PhysicalDevicePipelineRobustnessProperties const *>( &rhs ) )
+    PhysicalDevicePipelineRobustnessPropertiesEXT( VkPhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDevicePipelineRobustnessPropertiesEXT( *reinterpret_cast<PhysicalDevicePipelineRobustnessPropertiesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDevicePipelineRobustnessProperties & operator=( PhysicalDevicePipelineRobustnessProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDevicePipelineRobustnessPropertiesEXT & operator=( PhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDevicePipelineRobustnessProperties & operator=( VkPhysicalDevicePipelineRobustnessProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDevicePipelineRobustnessPropertiesEXT & operator=( VkPhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePipelineRobustnessProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePipelineRobustnessPropertiesEXT const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDevicePipelineRobustnessProperties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineRobustnessPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDevicePipelineRobustnessProperties *>( this );
+      return *reinterpret_cast<const VkPhysicalDevicePipelineRobustnessPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePipelineRobustnessProperties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePipelineRobustnessPropertiesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDevicePipelineRobustnessProperties *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineRobustnessProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePipelineRobustnessProperties *>( this );
-    }
-
-    operator VkPhysicalDevicePipelineRobustnessProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePipelineRobustnessProperties *>( this );
+      return *reinterpret_cast<VkPhysicalDevicePipelineRobustnessPropertiesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessImageBehavior const &>
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, defaultRobustnessStorageBuffers, defaultRobustnessUniformBuffers, defaultRobustnessVertexInputs, defaultRobustnessImages );
@@ -106159,9 +76242,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePipelineRobustnessProperties const & ) const = default;
+    auto operator<=>( PhysicalDevicePipelineRobustnessPropertiesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDevicePipelineRobustnessProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -106172,39 +76255,30 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDevicePipelineRobustnessProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDevicePipelineRobustnessPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                    sType                           = StructureType::ePhysicalDevicePipelineRobustnessProperties;
-    void *                           pNext                           = {};
-    PipelineRobustnessBufferBehavior defaultRobustnessStorageBuffers = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior defaultRobustnessUniformBuffers = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior defaultRobustnessVertexInputs   = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessImageBehavior  defaultRobustnessImages         = PipelineRobustnessImageBehavior::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType = StructureType::ePhysicalDevicePipelineRobustnessPropertiesEXT;
+    void *                                                    pNext = {};
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessStorageBuffers =
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessUniformBuffers =
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT defaultRobustnessVertexInputs =
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT defaultRobustnessImages = VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT::eDeviceDefault;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePipelineRobustnessProperties>
-  {
-    using Type = PhysicalDevicePipelineRobustnessProperties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineRobustnessProperties>
+  struct CppType<StructureType, StructureType::ePhysicalDevicePipelineRobustnessPropertiesEXT>
   {
-    using Type = PhysicalDevicePipelineRobustnessProperties;
+    using Type = PhysicalDevicePipelineRobustnessPropertiesEXT;
   };
 
-  using PhysicalDevicePipelineRobustnessPropertiesEXT = PhysicalDevicePipelineRobustnessProperties;
-
-  // wrapper struct for struct VkPhysicalDevicePointClippingProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePointClippingProperties.html
   struct PhysicalDevicePointClippingProperties
   {
     using NativeType = VkPhysicalDevicePointClippingProperties;
@@ -106212,11 +76286,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePointClippingProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePointClippingProperties( PointClippingBehavior pointClippingBehavior_ = PointClippingBehavior::eAllClipPlanes,
-                                                                void *                pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pointClippingBehavior{ pointClippingBehavior_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePointClippingProperties(
+      VULKAN_HPP_NAMESPACE::PointClippingBehavior pointClippingBehavior_ = VULKAN_HPP_NAMESPACE::PointClippingBehavior::eAllClipPlanes,
+      void *                                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pointClippingBehavior( pointClippingBehavior_ )
     {
     }
 
@@ -106228,11 +76303,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePointClippingProperties & operator=( PhysicalDevicePointClippingProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePointClippingProperties & operator=( VkPhysicalDevicePointClippingProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePointClippingProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePointClippingProperties const *>( &rhs );
       return *this;
     }
 
@@ -106246,18 +76321,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePointClippingProperties *>( this );
     }
 
-    operator VkPhysicalDevicePointClippingProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePointClippingProperties *>( this );
-    }
-
-    operator VkPhysicalDevicePointClippingProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePointClippingProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PointClippingBehavior const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PointClippingBehavior const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pointClippingBehavior );
     }
@@ -106282,19 +76352,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType                 = StructureType::ePhysicalDevicePointClippingProperties;
-    void *                pNext                 = {};
-    PointClippingBehavior pointClippingBehavior = PointClippingBehavior::eAllClipPlanes;
+    VULKAN_HPP_NAMESPACE::StructureType         sType                 = StructureType::ePhysicalDevicePointClippingProperties;
+    void *                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::PointClippingBehavior pointClippingBehavior = VULKAN_HPP_NAMESPACE::PointClippingBehavior::eAllClipPlanes;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePointClippingProperties>
-  {
-    using Type = PhysicalDevicePointClippingProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePointClippingProperties>
   {
@@ -106304,8 +76366,6 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDevicePointClippingPropertiesKHR = PhysicalDevicePointClippingProperties;
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDevicePortabilitySubsetFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePortabilitySubsetFeaturesKHR.html
   struct PhysicalDevicePortabilitySubsetFeaturesKHR
   {
     using NativeType = VkPhysicalDevicePortabilitySubsetFeaturesKHR;
@@ -106313,39 +76373,39 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePortabilitySubsetFeaturesKHR( Bool32 constantAlphaColorBlendFactors_         = {},
-                                                                     Bool32 events_                                 = {},
-                                                                     Bool32 imageViewFormatReinterpretation_        = {},
-                                                                     Bool32 imageViewFormatSwizzle_                 = {},
-                                                                     Bool32 imageView2DOn3DImage_                   = {},
-                                                                     Bool32 multisampleArrayImage_                  = {},
-                                                                     Bool32 mutableComparisonSamplers_              = {},
-                                                                     Bool32 pointPolygons_                          = {},
-                                                                     Bool32 samplerMipLodBias_                      = {},
-                                                                     Bool32 separateStencilMaskRef_                 = {},
-                                                                     Bool32 shaderSampleRateInterpolationFunctions_ = {},
-                                                                     Bool32 tessellationIsolines_                   = {},
-                                                                     Bool32 tessellationPointMode_                  = {},
-                                                                     Bool32 triangleFans_                           = {},
-                                                                     Bool32 vertexAttributeAccessBeyondStride_      = {},
-                                                                     void * pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , constantAlphaColorBlendFactors{ constantAlphaColorBlendFactors_ }
-      , events{ events_ }
-      , imageViewFormatReinterpretation{ imageViewFormatReinterpretation_ }
-      , imageViewFormatSwizzle{ imageViewFormatSwizzle_ }
-      , imageView2DOn3DImage{ imageView2DOn3DImage_ }
-      , multisampleArrayImage{ multisampleArrayImage_ }
-      , mutableComparisonSamplers{ mutableComparisonSamplers_ }
-      , pointPolygons{ pointPolygons_ }
-      , samplerMipLodBias{ samplerMipLodBias_ }
-      , separateStencilMaskRef{ separateStencilMaskRef_ }
-      , shaderSampleRateInterpolationFunctions{ shaderSampleRateInterpolationFunctions_ }
-      , tessellationIsolines{ tessellationIsolines_ }
-      , tessellationPointMode{ tessellationPointMode_ }
-      , triangleFans{ triangleFans_ }
-      , vertexAttributeAccessBeyondStride{ vertexAttributeAccessBeyondStride_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePortabilitySubsetFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 constantAlphaColorBlendFactors_         = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 events_                                 = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 imageViewFormatReinterpretation_        = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 imageViewFormatSwizzle_                 = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 imageView2DOn3DImage_                   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 multisampleArrayImage_                  = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 mutableComparisonSamplers_              = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 pointPolygons_                          = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 samplerMipLodBias_                      = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 separateStencilMaskRef_                 = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSampleRateInterpolationFunctions_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 tessellationIsolines_                   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 tessellationPointMode_                  = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 triangleFans_                           = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeAccessBeyondStride_      = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , constantAlphaColorBlendFactors( constantAlphaColorBlendFactors_ )
+      , events( events_ )
+      , imageViewFormatReinterpretation( imageViewFormatReinterpretation_ )
+      , imageViewFormatSwizzle( imageViewFormatSwizzle_ )
+      , imageView2DOn3DImage( imageView2DOn3DImage_ )
+      , multisampleArrayImage( multisampleArrayImage_ )
+      , mutableComparisonSamplers( mutableComparisonSamplers_ )
+      , pointPolygons( pointPolygons_ )
+      , samplerMipLodBias( samplerMipLodBias_ )
+      , separateStencilMaskRef( separateStencilMaskRef_ )
+      , shaderSampleRateInterpolationFunctions( shaderSampleRateInterpolationFunctions_ )
+      , tessellationIsolines( tessellationIsolines_ )
+      , tessellationPointMode( tessellationPointMode_ )
+      , triangleFans( triangleFans_ )
+      , vertexAttributeAccessBeyondStride( vertexAttributeAccessBeyondStride_ )
     {
     }
 
@@ -106357,15 +76417,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePortabilitySubsetFeaturesKHR & operator=( PhysicalDevicePortabilitySubsetFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePortabilitySubsetFeaturesKHR & operator=( VkPhysicalDevicePortabilitySubsetFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePortabilitySubsetFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePortabilitySubsetFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -106373,99 +76433,107 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
-      setConstantAlphaColorBlendFactors( Bool32 constantAlphaColorBlendFactors_ ) VULKAN_HPP_NOEXCEPT
+      setConstantAlphaColorBlendFactors( VULKAN_HPP_NAMESPACE::Bool32 constantAlphaColorBlendFactors_ ) VULKAN_HPP_NOEXCEPT
     {
       constantAlphaColorBlendFactors = constantAlphaColorBlendFactors_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setEvents( Bool32 events_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setEvents( VULKAN_HPP_NAMESPACE::Bool32 events_ ) VULKAN_HPP_NOEXCEPT
     {
       events = events_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
-      setImageViewFormatReinterpretation( Bool32 imageViewFormatReinterpretation_ ) VULKAN_HPP_NOEXCEPT
+      setImageViewFormatReinterpretation( VULKAN_HPP_NAMESPACE::Bool32 imageViewFormatReinterpretation_ ) VULKAN_HPP_NOEXCEPT
     {
       imageViewFormatReinterpretation = imageViewFormatReinterpretation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setImageViewFormatSwizzle( Bool32 imageViewFormatSwizzle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setImageViewFormatSwizzle( VULKAN_HPP_NAMESPACE::Bool32 imageViewFormatSwizzle_ ) VULKAN_HPP_NOEXCEPT
     {
       imageViewFormatSwizzle = imageViewFormatSwizzle_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setImageView2DOn3DImage( Bool32 imageView2DOn3DImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setImageView2DOn3DImage( VULKAN_HPP_NAMESPACE::Bool32 imageView2DOn3DImage_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView2DOn3DImage = imageView2DOn3DImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setMultisampleArrayImage( Bool32 multisampleArrayImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setMultisampleArrayImage( VULKAN_HPP_NAMESPACE::Bool32 multisampleArrayImage_ ) VULKAN_HPP_NOEXCEPT
     {
       multisampleArrayImage = multisampleArrayImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setMutableComparisonSamplers( Bool32 mutableComparisonSamplers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setMutableComparisonSamplers( VULKAN_HPP_NAMESPACE::Bool32 mutableComparisonSamplers_ ) VULKAN_HPP_NOEXCEPT
     {
       mutableComparisonSamplers = mutableComparisonSamplers_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setPointPolygons( Bool32 pointPolygons_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setPointPolygons( VULKAN_HPP_NAMESPACE::Bool32 pointPolygons_ ) VULKAN_HPP_NOEXCEPT
     {
       pointPolygons = pointPolygons_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setSamplerMipLodBias( Bool32 samplerMipLodBias_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setSamplerMipLodBias( VULKAN_HPP_NAMESPACE::Bool32 samplerMipLodBias_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerMipLodBias = samplerMipLodBias_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setSeparateStencilMaskRef( Bool32 separateStencilMaskRef_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setSeparateStencilMaskRef( VULKAN_HPP_NAMESPACE::Bool32 separateStencilMaskRef_ ) VULKAN_HPP_NOEXCEPT
     {
       separateStencilMaskRef = separateStencilMaskRef_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
-      setShaderSampleRateInterpolationFunctions( Bool32 shaderSampleRateInterpolationFunctions_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSampleRateInterpolationFunctions( VULKAN_HPP_NAMESPACE::Bool32 shaderSampleRateInterpolationFunctions_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSampleRateInterpolationFunctions = shaderSampleRateInterpolationFunctions_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setTessellationIsolines( Bool32 tessellationIsolines_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setTessellationIsolines( VULKAN_HPP_NAMESPACE::Bool32 tessellationIsolines_ ) VULKAN_HPP_NOEXCEPT
     {
       tessellationIsolines = tessellationIsolines_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setTessellationPointMode( Bool32 tessellationPointMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
+      setTessellationPointMode( VULKAN_HPP_NAMESPACE::Bool32 tessellationPointMode_ ) VULKAN_HPP_NOEXCEPT
     {
       tessellationPointMode = tessellationPointMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setTriangleFans( Bool32 triangleFans_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR & setTriangleFans( VULKAN_HPP_NAMESPACE::Bool32 triangleFans_ ) VULKAN_HPP_NOEXCEPT
     {
       triangleFans = triangleFans_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetFeaturesKHR &
-      setVertexAttributeAccessBeyondStride( Bool32 vertexAttributeAccessBeyondStride_ ) VULKAN_HPP_NOEXCEPT
+      setVertexAttributeAccessBeyondStride( VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeAccessBeyondStride_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexAttributeAccessBeyondStride = vertexAttributeAccessBeyondStride_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePortabilitySubsetFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -106477,34 +76545,28 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePortabilitySubsetFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePortabilitySubsetFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePortabilitySubsetFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePortabilitySubsetFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePortabilitySubsetFeaturesKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -106554,33 +76616,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR;
-    void *        pNext                                  = {};
-    Bool32        constantAlphaColorBlendFactors         = {};
-    Bool32        events                                 = {};
-    Bool32        imageViewFormatReinterpretation        = {};
-    Bool32        imageViewFormatSwizzle                 = {};
-    Bool32        imageView2DOn3DImage                   = {};
-    Bool32        multisampleArrayImage                  = {};
-    Bool32        mutableComparisonSamplers              = {};
-    Bool32        pointPolygons                          = {};
-    Bool32        samplerMipLodBias                      = {};
-    Bool32        separateStencilMaskRef                 = {};
-    Bool32        shaderSampleRateInterpolationFunctions = {};
-    Bool32        tessellationIsolines                   = {};
-    Bool32        tessellationPointMode                  = {};
-    Bool32        triangleFans                           = {};
-    Bool32        vertexAttributeAccessBeyondStride      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR;
+    void *                              pNext                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        constantAlphaColorBlendFactors         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        events                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageViewFormatReinterpretation        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageViewFormatSwizzle                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageView2DOn3DImage                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multisampleArrayImage                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        mutableComparisonSamplers              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pointPolygons                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        samplerMipLodBias                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        separateStencilMaskRef                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSampleRateInterpolationFunctions = {};
+    VULKAN_HPP_NAMESPACE::Bool32        tessellationIsolines                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        tessellationPointMode                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        triangleFans                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vertexAttributeAccessBeyondStride      = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePortabilitySubsetFeaturesKHR>
-  {
-    using Type = PhysicalDevicePortabilitySubsetFeaturesKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR>
   {
@@ -106589,8 +76643,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDevicePortabilitySubsetPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePortabilitySubsetPropertiesKHR.html
   struct PhysicalDevicePortabilitySubsetPropertiesKHR
   {
     using NativeType = VkPhysicalDevicePortabilitySubsetPropertiesKHR;
@@ -106598,11 +76650,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePortabilitySubsetPropertiesKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDevicePortabilitySubsetPropertiesKHR( uint32_t minVertexInputBindingStrideAlignment_ = {},
                                                                        void *   pNext_                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minVertexInputBindingStrideAlignment{ minVertexInputBindingStrideAlignment_ }
+      : pNext( pNext_ )
+      , minVertexInputBindingStrideAlignment( minVertexInputBindingStrideAlignment_ )
     {
     }
 
@@ -106614,14 +76666,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePortabilitySubsetPropertiesKHR & operator=( PhysicalDevicePortabilitySubsetPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePortabilitySubsetPropertiesKHR & operator=( VkPhysicalDevicePortabilitySubsetPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePortabilitySubsetPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePortabilitySubsetPropertiesKHR const *>( &rhs );
       return *this;
     }
 
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetPropertiesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePortabilitySubsetPropertiesKHR &
+      setMinVertexInputBindingStrideAlignment( uint32_t minVertexInputBindingStrideAlignment_ ) VULKAN_HPP_NOEXCEPT
+    {
+      minVertexInputBindingStrideAlignment = minVertexInputBindingStrideAlignment_;
+      return *this;
+    }
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDevicePortabilitySubsetPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDevicePortabilitySubsetPropertiesKHR *>( this );
@@ -106632,18 +76699,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePortabilitySubsetPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePortabilitySubsetPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePortabilitySubsetPropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePortabilitySubsetPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePortabilitySubsetPropertiesKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minVertexInputBindingStrideAlignment );
     }
@@ -106668,19 +76730,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                                = StructureType::ePhysicalDevicePortabilitySubsetPropertiesKHR;
-    void *        pNext                                = {};
-    uint32_t      minVertexInputBindingStrideAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                = StructureType::ePhysicalDevicePortabilitySubsetPropertiesKHR;
+    void *                              pNext                                = {};
+    uint32_t                            minVertexInputBindingStrideAlignment = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePortabilitySubsetPropertiesKHR>
-  {
-    using Type = PhysicalDevicePortabilitySubsetPropertiesKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePortabilitySubsetPropertiesKHR>
   {
@@ -106688,8 +76742,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkPhysicalDevicePresentBarrierFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentBarrierFeaturesNV.html
   struct PhysicalDevicePresentBarrierFeaturesNV
   {
     using NativeType = VkPhysicalDevicePresentBarrierFeaturesNV;
@@ -106697,10 +76749,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentBarrierFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentBarrierFeaturesNV( Bool32 presentBarrier_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentBarrier{ presentBarrier_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentBarrierFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 presentBarrier_ = {},
+                                                                 void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentBarrier( presentBarrier_ )
     {
     }
 
@@ -106712,27 +76765,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePresentBarrierFeaturesNV & operator=( PhysicalDevicePresentBarrierFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePresentBarrierFeaturesNV & operator=( VkPhysicalDevicePresentBarrierFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePresentBarrierFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentBarrierFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentBarrierFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentBarrierFeaturesNV & setPresentBarrier( Bool32 presentBarrier_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentBarrierFeaturesNV & setPresentBarrier( VULKAN_HPP_NAMESPACE::Bool32 presentBarrier_ ) VULKAN_HPP_NOEXCEPT
     {
       presentBarrier = presentBarrier_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePresentBarrierFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -106744,18 +76797,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePresentBarrierFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDevicePresentBarrierFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentBarrierFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePresentBarrierFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentBarrierFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentBarrier );
     }
@@ -106780,138 +76828,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDevicePresentBarrierFeaturesNV;
-    void *        pNext          = {};
-    Bool32        presentBarrier = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDevicePresentBarrierFeaturesNV;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        presentBarrier = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentBarrierFeaturesNV>
-  {
-    using Type = PhysicalDevicePresentBarrierFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePresentBarrierFeaturesNV>
   {
     using Type = PhysicalDevicePresentBarrierFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePresentId2FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentId2FeaturesKHR.html
-  struct PhysicalDevicePresentId2FeaturesKHR
-  {
-    using NativeType = VkPhysicalDevicePresentId2FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentId2FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentId2FeaturesKHR( Bool32 presentId2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentId2{ presentId2_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentId2FeaturesKHR( PhysicalDevicePresentId2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentId2FeaturesKHR( VkPhysicalDevicePresentId2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentId2FeaturesKHR( *reinterpret_cast<PhysicalDevicePresentId2FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentId2FeaturesKHR & operator=( PhysicalDevicePresentId2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentId2FeaturesKHR & operator=( VkPhysicalDevicePresentId2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentId2FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentId2FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentId2FeaturesKHR & setPresentId2( Bool32 presentId2_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentId2 = presentId2_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePresentId2FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentId2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentId2FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentId2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentId2FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentId2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentId2FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentId2FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentId2 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentId2FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePresentId2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentId2 == rhs.presentId2 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePresentId2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::ePhysicalDevicePresentId2FeaturesKHR;
-    void *        pNext      = {};
-    Bool32        presentId2 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentId2FeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentId2FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentId2FeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentId2FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePresentIdFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentIdFeaturesKHR.html
   struct PhysicalDevicePresentIdFeaturesKHR
   {
     using NativeType = VkPhysicalDevicePresentIdFeaturesKHR;
@@ -106919,10 +76846,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentIdFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentIdFeaturesKHR( Bool32 presentId_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentId{ presentId_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentIdFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 presentId_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentId( presentId_ )
     {
     }
 
@@ -106934,27 +76861,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePresentIdFeaturesKHR & operator=( PhysicalDevicePresentIdFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePresentIdFeaturesKHR & operator=( VkPhysicalDevicePresentIdFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePresentIdFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentIdFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentIdFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentIdFeaturesKHR & setPresentId( Bool32 presentId_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentIdFeaturesKHR & setPresentId( VULKAN_HPP_NAMESPACE::Bool32 presentId_ ) VULKAN_HPP_NOEXCEPT
     {
       presentId = presentId_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePresentIdFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -106966,18 +76893,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePresentIdFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePresentIdFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentIdFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentIdFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentIdFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentId );
     }
@@ -107002,499 +76924,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::ePhysicalDevicePresentIdFeaturesKHR;
-    void *        pNext     = {};
-    Bool32        presentId = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::ePhysicalDevicePresentIdFeaturesKHR;
+    void *                              pNext     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        presentId = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentIdFeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentIdFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePresentIdFeaturesKHR>
   {
     using Type = PhysicalDevicePresentIdFeaturesKHR;
   };
 
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDevicePresentMeteringFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentMeteringFeaturesNV.html
-  struct PhysicalDevicePresentMeteringFeaturesNV
-  {
-    using NativeType = VkPhysicalDevicePresentMeteringFeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentMeteringFeaturesNV;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentMeteringFeaturesNV( Bool32 presentMetering_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentMetering{ presentMetering_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentMeteringFeaturesNV( PhysicalDevicePresentMeteringFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentMeteringFeaturesNV( VkPhysicalDevicePresentMeteringFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentMeteringFeaturesNV( *reinterpret_cast<PhysicalDevicePresentMeteringFeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentMeteringFeaturesNV & operator=( PhysicalDevicePresentMeteringFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentMeteringFeaturesNV & operator=( VkPhysicalDevicePresentMeteringFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentMeteringFeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentMeteringFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentMeteringFeaturesNV & setPresentMetering( Bool32 presentMetering_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentMetering = presentMetering_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePresentMeteringFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentMeteringFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePresentMeteringFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentMeteringFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePresentMeteringFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentMeteringFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDevicePresentMeteringFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentMeteringFeaturesNV *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentMetering );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentMeteringFeaturesNV const & ) const = default;
-#  else
-    bool operator==( PhysicalDevicePresentMeteringFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentMetering == rhs.presentMetering );
-#    endif
-    }
-
-    bool operator!=( PhysicalDevicePresentMeteringFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType           = StructureType::ePhysicalDevicePresentMeteringFeaturesNV;
-    void *        pNext           = {};
-    Bool32        presentMetering = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentMeteringFeaturesNV>
-  {
-    using Type = PhysicalDevicePresentMeteringFeaturesNV;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentMeteringFeaturesNV>
-  {
-    using Type = PhysicalDevicePresentMeteringFeaturesNV;
-  };
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  // wrapper struct for struct VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR.html
-  struct PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR
-  {
-    using NativeType = VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR( Bool32 presentModeFifoLatestReady_ = {},
-                                                                              void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentModeFifoLatestReady{ presentModeFifoLatestReady_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR( PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR( VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR( *reinterpret_cast<PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR &
-      operator=( PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR & operator=( VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR &
-      setPresentModeFifoLatestReady( Bool32 presentModeFifoLatestReady_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentModeFifoLatestReady = presentModeFifoLatestReady_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentModeFifoLatestReady );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentModeFifoLatestReady == rhs.presentModeFifoLatestReady );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-    void *        pNext                      = {};
-    Bool32        presentModeFifoLatestReady = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentModeFifoLatestReadyFeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-  };
-
-  using PhysicalDevicePresentModeFifoLatestReadyFeaturesEXT = PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-  // wrapper struct for struct VkPhysicalDevicePresentTimingFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentTimingFeaturesEXT.html
-  struct PhysicalDevicePresentTimingFeaturesEXT
-  {
-    using NativeType = VkPhysicalDevicePresentTimingFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentTimingFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentTimingFeaturesEXT( Bool32 presentTiming_         = {},
-                                                                 Bool32 presentAtAbsoluteTime_ = {},
-                                                                 Bool32 presentAtRelativeTime_ = {},
-                                                                 void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentTiming{ presentTiming_ }
-      , presentAtAbsoluteTime{ presentAtAbsoluteTime_ }
-      , presentAtRelativeTime{ presentAtRelativeTime_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentTimingFeaturesEXT( PhysicalDevicePresentTimingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentTimingFeaturesEXT( VkPhysicalDevicePresentTimingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentTimingFeaturesEXT( *reinterpret_cast<PhysicalDevicePresentTimingFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentTimingFeaturesEXT & operator=( PhysicalDevicePresentTimingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentTimingFeaturesEXT & operator=( VkPhysicalDevicePresentTimingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentTimingFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentTiming( Bool32 presentTiming_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentTiming = presentTiming_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtAbsoluteTime( Bool32 presentAtAbsoluteTime_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentAtAbsoluteTime = presentAtAbsoluteTime_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtRelativeTime( Bool32 presentAtRelativeTime_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentAtRelativeTime = presentAtRelativeTime_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePresentTimingFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentTimingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePresentTimingFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentTimingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePresentTimingFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentTimingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePresentTimingFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentTimingFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentTiming, presentAtAbsoluteTime, presentAtRelativeTime );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentTimingFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePresentTimingFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentTiming == rhs.presentTiming ) &&
-             ( presentAtAbsoluteTime == rhs.presentAtAbsoluteTime ) && ( presentAtRelativeTime == rhs.presentAtRelativeTime );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePresentTimingFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                 = StructureType::ePhysicalDevicePresentTimingFeaturesEXT;
-    void *        pNext                 = {};
-    Bool32        presentTiming         = {};
-    Bool32        presentAtAbsoluteTime = {};
-    Bool32        presentAtRelativeTime = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentTimingFeaturesEXT>
-  {
-    using Type = PhysicalDevicePresentTimingFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentTimingFeaturesEXT>
-  {
-    using Type = PhysicalDevicePresentTimingFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePresentWait2FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentWait2FeaturesKHR.html
-  struct PhysicalDevicePresentWait2FeaturesKHR
-  {
-    using NativeType = VkPhysicalDevicePresentWait2FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentWait2FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentWait2FeaturesKHR( Bool32 presentWait2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentWait2{ presentWait2_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentWait2FeaturesKHR( PhysicalDevicePresentWait2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentWait2FeaturesKHR( VkPhysicalDevicePresentWait2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentWait2FeaturesKHR( *reinterpret_cast<PhysicalDevicePresentWait2FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentWait2FeaturesKHR & operator=( PhysicalDevicePresentWait2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentWait2FeaturesKHR & operator=( VkPhysicalDevicePresentWait2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentWait2FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentWait2FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentWait2FeaturesKHR & setPresentWait2( Bool32 presentWait2_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentWait2 = presentWait2_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDevicePresentWait2FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentWait2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentWait2FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentWait2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentWait2FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentWait2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentWait2FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentWait2FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentWait2 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentWait2FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDevicePresentWait2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentWait2 == rhs.presentWait2 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDevicePresentWait2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType        = StructureType::ePhysicalDevicePresentWait2FeaturesKHR;
-    void *        pNext        = {};
-    Bool32        presentWait2 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentWait2FeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentWait2FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentWait2FeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentWait2FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDevicePresentWaitFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentWaitFeaturesKHR.html
   struct PhysicalDevicePresentWaitFeaturesKHR
   {
     using NativeType = VkPhysicalDevicePresentWaitFeaturesKHR;
@@ -107502,10 +76942,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentWaitFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentWaitFeaturesKHR( Bool32 presentWait_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentWait{ presentWait_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentWaitFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 presentWait_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentWait( presentWait_ )
     {
     }
 
@@ -107517,27 +76957,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePresentWaitFeaturesKHR & operator=( PhysicalDevicePresentWaitFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePresentWaitFeaturesKHR & operator=( VkPhysicalDevicePresentWaitFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePresentWaitFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentWaitFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentWaitFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentWaitFeaturesKHR & setPresentWait( Bool32 presentWait_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentWaitFeaturesKHR & setPresentWait( VULKAN_HPP_NAMESPACE::Bool32 presentWait_ ) VULKAN_HPP_NOEXCEPT
     {
       presentWait = presentWait_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePresentWaitFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -107549,18 +76989,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePresentWaitFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePresentWaitFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentWaitFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDevicePresentWaitFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentWaitFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentWait );
     }
@@ -107585,126 +77020,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::ePhysicalDevicePresentWaitFeaturesKHR;
-    void *        pNext       = {};
-    Bool32        presentWait = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::ePhysicalDevicePresentWaitFeaturesKHR;
+    void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        presentWait = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentWaitFeaturesKHR>
-  {
-    using Type = PhysicalDevicePresentWaitFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePresentWaitFeaturesKHR>
   {
     using Type = PhysicalDevicePresentWaitFeaturesKHR;
   };
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkPhysicalDevicePresentationPropertiesOHOS, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePresentationPropertiesOHOS.html
-  struct PhysicalDevicePresentationPropertiesOHOS
-  {
-    using NativeType = VkPhysicalDevicePresentationPropertiesOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePresentationPropertiesOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentationPropertiesOHOS( Bool32 sharedImage_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sharedImage{ sharedImage_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePresentationPropertiesOHOS( PhysicalDevicePresentationPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDevicePresentationPropertiesOHOS( VkPhysicalDevicePresentationPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePresentationPropertiesOHOS( *reinterpret_cast<PhysicalDevicePresentationPropertiesOHOS const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDevicePresentationPropertiesOHOS & operator=( PhysicalDevicePresentationPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDevicePresentationPropertiesOHOS & operator=( VkPhysicalDevicePresentationPropertiesOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDevicePresentationPropertiesOHOS const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDevicePresentationPropertiesOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDevicePresentationPropertiesOHOS *>( this );
-    }
-
-    operator VkPhysicalDevicePresentationPropertiesOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDevicePresentationPropertiesOHOS *>( this );
-    }
-
-    operator VkPhysicalDevicePresentationPropertiesOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePresentationPropertiesOHOS *>( this );
-    }
-
-    operator VkPhysicalDevicePresentationPropertiesOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePresentationPropertiesOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, sharedImage );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePresentationPropertiesOHOS const & ) const = default;
-#  else
-    bool operator==( PhysicalDevicePresentationPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( sharedImage == rhs.sharedImage );
-#    endif
-    }
-
-    bool operator!=( PhysicalDevicePresentationPropertiesOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType       = StructureType::ePhysicalDevicePresentationPropertiesOHOS;
-    void *        pNext       = {};
-    Bool32        sharedImage = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePresentationPropertiesOHOS>
-  {
-    using Type = PhysicalDevicePresentationPropertiesOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePresentationPropertiesOHOS>
-  {
-    using Type = PhysicalDevicePresentationPropertiesOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  // wrapper struct for struct VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT.html
   struct PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT
   {
     using NativeType = VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
@@ -107712,13 +77038,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT( Bool32 primitiveTopologyListRestart_      = {},
-                                                                                Bool32 primitiveTopologyPatchListRestart_ = {},
-                                                                                void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , primitiveTopologyListRestart{ primitiveTopologyListRestart_ }
-      , primitiveTopologyPatchListRestart{ primitiveTopologyPatchListRestart_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 primitiveTopologyListRestart_      = {},
+                                                                                VULKAN_HPP_NAMESPACE::Bool32 primitiveTopologyPatchListRestart_ = {},
+                                                                                void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , primitiveTopologyListRestart( primitiveTopologyListRestart_ )
+      , primitiveTopologyPatchListRestart( primitiveTopologyPatchListRestart_ )
     {
     }
 
@@ -107732,15 +77058,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT &
       operator=( PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT & operator=( VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -107748,19 +77074,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT &
-      setPrimitiveTopologyListRestart( Bool32 primitiveTopologyListRestart_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitiveTopologyListRestart( VULKAN_HPP_NAMESPACE::Bool32 primitiveTopologyListRestart_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveTopologyListRestart = primitiveTopologyListRestart_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT &
-      setPrimitiveTopologyPatchListRestart( Bool32 primitiveTopologyPatchListRestart_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitiveTopologyPatchListRestart( VULKAN_HPP_NAMESPACE::Bool32 primitiveTopologyPatchListRestart_ ) VULKAN_HPP_NOEXCEPT
     {
       primitiveTopologyPatchListRestart = primitiveTopologyPatchListRestart_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -107772,18 +77098,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, primitiveTopologyListRestart, primitiveTopologyPatchListRestart );
     }
@@ -107809,28 +77130,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                             = StructureType::ePhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
-    void *        pNext                             = {};
-    Bool32        primitiveTopologyListRestart      = {};
-    Bool32        primitiveTopologyPatchListRestart = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                             = StructureType::ePhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
+    void *                              pNext                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitiveTopologyListRestart      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitiveTopologyPatchListRestart = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>
-  {
-    using Type = PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>
   {
     using Type = PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT.html
   struct PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT
   {
     using NativeType = VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
@@ -107838,15 +77149,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT( Bool32 primitivesGeneratedQuery_                      = {},
-                                                                            Bool32 primitivesGeneratedQueryWithRasterizerDiscard_ = {},
-                                                                            Bool32 primitivesGeneratedQueryWithNonZeroStreams_    = {},
-                                                                            void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , primitivesGeneratedQuery{ primitivesGeneratedQuery_ }
-      , primitivesGeneratedQueryWithRasterizerDiscard{ primitivesGeneratedQueryWithRasterizerDiscard_ }
-      , primitivesGeneratedQueryWithNonZeroStreams{ primitivesGeneratedQueryWithNonZeroStreams_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQuery_                      = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQueryWithRasterizerDiscard_ = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQueryWithNonZeroStreams_    = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , primitivesGeneratedQuery( primitivesGeneratedQuery_ )
+      , primitivesGeneratedQueryWithRasterizerDiscard( primitivesGeneratedQueryWithRasterizerDiscard_ )
+      , primitivesGeneratedQueryWithNonZeroStreams( primitivesGeneratedQueryWithNonZeroStreams_ )
     {
     }
 
@@ -107860,15 +77171,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT &
       operator=( PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT & operator=( VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -107876,26 +77187,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT &
-      setPrimitivesGeneratedQuery( Bool32 primitivesGeneratedQuery_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitivesGeneratedQuery( VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQuery_ ) VULKAN_HPP_NOEXCEPT
     {
       primitivesGeneratedQuery = primitivesGeneratedQuery_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT &
-      setPrimitivesGeneratedQueryWithRasterizerDiscard( Bool32 primitivesGeneratedQueryWithRasterizerDiscard_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitivesGeneratedQueryWithRasterizerDiscard( VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQueryWithRasterizerDiscard_ ) VULKAN_HPP_NOEXCEPT
     {
       primitivesGeneratedQueryWithRasterizerDiscard = primitivesGeneratedQueryWithRasterizerDiscard_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT &
-      setPrimitivesGeneratedQueryWithNonZeroStreams( Bool32 primitivesGeneratedQueryWithNonZeroStreams_ ) VULKAN_HPP_NOEXCEPT
+      setPrimitivesGeneratedQueryWithNonZeroStreams( VULKAN_HPP_NAMESPACE::Bool32 primitivesGeneratedQueryWithNonZeroStreams_ ) VULKAN_HPP_NOEXCEPT
     {
       primitivesGeneratedQueryWithNonZeroStreams = primitivesGeneratedQueryWithNonZeroStreams_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -107907,18 +77218,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, primitivesGeneratedQuery, primitivesGeneratedQueryWithRasterizerDiscard, primitivesGeneratedQueryWithNonZeroStreams );
     }
@@ -107945,29 +77255,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                         = StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
-    void *        pNext                                         = {};
-    Bool32        primitivesGeneratedQuery                      = {};
-    Bool32        primitivesGeneratedQueryWithRasterizerDiscard = {};
-    Bool32        primitivesGeneratedQueryWithNonZeroStreams    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                         = StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
+    void *                              pNext                                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitivesGeneratedQuery                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitivesGeneratedQueryWithRasterizerDiscard = {};
+    VULKAN_HPP_NAMESPACE::Bool32        primitivesGeneratedQueryWithNonZeroStreams    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT>
-  {
-    using Type = PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT>
   {
     using Type = PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePrivateDataFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePrivateDataFeatures.html
   struct PhysicalDevicePrivateDataFeatures
   {
     using NativeType = VkPhysicalDevicePrivateDataFeatures;
@@ -107975,10 +77275,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePrivateDataFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePrivateDataFeatures( Bool32 privateData_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , privateData{ privateData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePrivateDataFeatures( VULKAN_HPP_NAMESPACE::Bool32 privateData_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , privateData( privateData_ )
     {
     }
 
@@ -107990,27 +77290,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDevicePrivateDataFeatures & operator=( PhysicalDevicePrivateDataFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDevicePrivateDataFeatures & operator=( VkPhysicalDevicePrivateDataFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePrivateDataFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePrivateDataFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrivateDataFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrivateDataFeatures & setPrivateData( Bool32 privateData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePrivateDataFeatures & setPrivateData( VULKAN_HPP_NAMESPACE::Bool32 privateData_ ) VULKAN_HPP_NOEXCEPT
     {
       privateData = privateData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDevicePrivateDataFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -108022,18 +77322,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDevicePrivateDataFeatures *>( this );
     }
 
-    operator VkPhysicalDevicePrivateDataFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePrivateDataFeatures *>( this );
-    }
-
-    operator VkPhysicalDevicePrivateDataFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePrivateDataFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, privateData );
     }
@@ -108058,19 +77353,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::ePhysicalDevicePrivateDataFeatures;
-    void *        pNext       = {};
-    Bool32        privateData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::ePhysicalDevicePrivateDataFeatures;
+    void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        privateData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePrivateDataFeatures>
-  {
-    using Type = PhysicalDevicePrivateDataFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDevicePrivateDataFeatures>
   {
@@ -108079,8 +77366,334 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDevicePrivateDataFeaturesEXT = PhysicalDevicePrivateDataFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceProtectedMemoryFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProtectedMemoryFeatures.html
+  struct PhysicalDeviceSparseProperties
+  {
+    using NativeType = VkPhysicalDeviceSparseProperties;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSparseProperties( VULKAN_HPP_NAMESPACE::Bool32 residencyStandard2DBlockShape_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 residencyStandard2DMultisampleBlockShape_ = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 residencyStandard3DBlockShape_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 residencyAlignedMipSize_                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 residencyNonResidentStrict_               = {} ) VULKAN_HPP_NOEXCEPT
+      : residencyStandard2DBlockShape( residencyStandard2DBlockShape_ )
+      , residencyStandard2DMultisampleBlockShape( residencyStandard2DMultisampleBlockShape_ )
+      , residencyStandard3DBlockShape( residencyStandard3DBlockShape_ )
+      , residencyAlignedMipSize( residencyAlignedMipSize_ )
+      , residencyNonResidentStrict( residencyNonResidentStrict_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSparseProperties( PhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    PhysicalDeviceSparseProperties( VkPhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceSparseProperties( *reinterpret_cast<PhysicalDeviceSparseProperties const *>( &rhs ) )
+    {
+    }
+
+    PhysicalDeviceSparseProperties & operator=( PhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    PhysicalDeviceSparseProperties & operator=( VkPhysicalDeviceSparseProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties const *>( &rhs );
+      return *this;
+    }
+
+    operator VkPhysicalDeviceSparseProperties const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkPhysicalDeviceSparseProperties *>( this );
+    }
+
+    operator VkPhysicalDeviceSparseProperties &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkPhysicalDeviceSparseProperties *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( residencyStandard2DBlockShape,
+                       residencyStandard2DMultisampleBlockShape,
+                       residencyStandard3DBlockShape,
+                       residencyAlignedMipSize,
+                       residencyNonResidentStrict );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PhysicalDeviceSparseProperties const & ) const = default;
+#else
+    bool operator==( PhysicalDeviceSparseProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( residencyStandard2DBlockShape == rhs.residencyStandard2DBlockShape ) &&
+             ( residencyStandard2DMultisampleBlockShape == rhs.residencyStandard2DMultisampleBlockShape ) &&
+             ( residencyStandard3DBlockShape == rhs.residencyStandard3DBlockShape ) && ( residencyAlignedMipSize == rhs.residencyAlignedMipSize ) &&
+             ( residencyNonResidentStrict == rhs.residencyNonResidentStrict );
+#  endif
+    }
+
+    bool operator!=( PhysicalDeviceSparseProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::Bool32 residencyStandard2DBlockShape            = {};
+    VULKAN_HPP_NAMESPACE::Bool32 residencyStandard2DMultisampleBlockShape = {};
+    VULKAN_HPP_NAMESPACE::Bool32 residencyStandard3DBlockShape            = {};
+    VULKAN_HPP_NAMESPACE::Bool32 residencyAlignedMipSize                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32 residencyNonResidentStrict               = {};
+  };
+
+  struct PhysicalDeviceProperties
+  {
+    using NativeType = VkPhysicalDeviceProperties;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties( uint32_t                                 apiVersion_    = {},
+                                                      uint32_t                                 driverVersion_ = {},
+                                                      uint32_t                                 vendorID_      = {},
+                                                      uint32_t                                 deviceID_      = {},
+                                                      VULKAN_HPP_NAMESPACE::PhysicalDeviceType deviceType_ = VULKAN_HPP_NAMESPACE::PhysicalDeviceType::eOther,
+                                                      std::array<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const & deviceName_        = {},
+                                                      std::array<uint8_t, VK_UUID_SIZE> const &                  pipelineCacheUUID_ = {},
+                                                      VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits                 limits_            = {},
+                                                      VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties       sparseProperties_  = {} ) VULKAN_HPP_NOEXCEPT
+      : apiVersion( apiVersion_ )
+      , driverVersion( driverVersion_ )
+      , vendorID( vendorID_ )
+      , deviceID( deviceID_ )
+      , deviceType( deviceType_ )
+      , deviceName( deviceName_ )
+      , pipelineCacheUUID( pipelineCacheUUID_ )
+      , limits( limits_ )
+      , sparseProperties( sparseProperties_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties( PhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    PhysicalDeviceProperties( VkPhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceProperties( *reinterpret_cast<PhysicalDeviceProperties const *>( &rhs ) )
+    {
+    }
+
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceProperties( uint32_t                                             apiVersion_,
+                              uint32_t                                             driverVersion_,
+                              uint32_t                                             vendorID_,
+                              uint32_t                                             deviceID_,
+                              VULKAN_HPP_NAMESPACE::PhysicalDeviceType             deviceType_,
+                              std::string const &                                  deviceName_,
+                              std::array<uint8_t, VK_UUID_SIZE> const &            pipelineCacheUUID_ = {},
+                              VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits           limits_            = {},
+                              VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties sparseProperties_  = {} )
+      : apiVersion( apiVersion_ )
+      , driverVersion( driverVersion_ )
+      , vendorID( vendorID_ )
+      , deviceID( deviceID_ )
+      , deviceType( deviceType_ )
+      , pipelineCacheUUID( pipelineCacheUUID_ )
+      , limits( limits_ )
+      , sparseProperties( sparseProperties_ )
+    {
+      VULKAN_HPP_ASSERT( deviceName_.size() < VK_MAX_PHYSICAL_DEVICE_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( deviceName, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE, deviceName_.data(), deviceName_.size() );
+#    else
+      strncpy( deviceName, deviceName_.data(), std::min<size_t>( VK_MAX_PHYSICAL_DEVICE_NAME_SIZE, deviceName_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+    PhysicalDeviceProperties & operator=( PhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    PhysicalDeviceProperties & operator=( VkPhysicalDeviceProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties const *>( &rhs );
+      return *this;
+    }
+
+    operator VkPhysicalDeviceProperties const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkPhysicalDeviceProperties *>( this );
+    }
+
+    operator VkPhysicalDeviceProperties &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkPhysicalDeviceProperties *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::PhysicalDeviceType const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits const &,
+               VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( apiVersion, driverVersion, vendorID, deviceID, deviceType, deviceName, pipelineCacheUUID, limits, sparseProperties );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    std::partial_ordering operator<=>( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      if ( auto cmp = apiVersion <=> rhs.apiVersion; cmp != 0 )
+        return cmp;
+      if ( auto cmp = driverVersion <=> rhs.driverVersion; cmp != 0 )
+        return cmp;
+      if ( auto cmp = vendorID <=> rhs.vendorID; cmp != 0 )
+        return cmp;
+      if ( auto cmp = deviceID <=> rhs.deviceID; cmp != 0 )
+        return cmp;
+      if ( auto cmp = deviceType <=> rhs.deviceType; cmp != 0 )
+        return cmp;
+      if ( auto cmp = strcmp( deviceName, rhs.deviceName ); cmp != 0 )
+        return ( cmp < 0 ) ? std::partial_ordering::less : std::partial_ordering::greater;
+      if ( auto cmp = pipelineCacheUUID <=> rhs.pipelineCacheUUID; cmp != 0 )
+        return cmp;
+      if ( auto cmp = limits <=> rhs.limits; cmp != 0 )
+        return cmp;
+      if ( auto cmp = sparseProperties <=> rhs.sparseProperties; cmp != 0 )
+        return cmp;
+
+      return std::partial_ordering::equivalent;
+    }
+#endif
+
+    bool operator==( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return ( apiVersion == rhs.apiVersion ) && ( driverVersion == rhs.driverVersion ) && ( vendorID == rhs.vendorID ) && ( deviceID == rhs.deviceID ) &&
+             ( deviceType == rhs.deviceType ) && ( strcmp( deviceName, rhs.deviceName ) == 0 ) && ( pipelineCacheUUID == rhs.pipelineCacheUUID ) &&
+             ( limits == rhs.limits ) && ( sparseProperties == rhs.sparseProperties );
+    }
+
+    bool operator!=( PhysicalDeviceProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+
+  public:
+    uint32_t                                                                     apiVersion        = {};
+    uint32_t                                                                     driverVersion     = {};
+    uint32_t                                                                     vendorID          = {};
+    uint32_t                                                                     deviceID          = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceType                                     deviceType        = VULKAN_HPP_NAMESPACE::PhysicalDeviceType::eOther;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE> deviceName        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE>                  pipelineCacheUUID = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceLimits                                   limits            = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseProperties                         sparseProperties  = {};
+  };
+
+  struct PhysicalDeviceProperties2
+  {
+    using NativeType = VkPhysicalDeviceProperties2;
+
+    static const bool                                  allowDuplicate = false;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProperties2;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties2( VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties properties_ = {},
+                                                       void *                                         pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , properties( properties_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProperties2( PhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    PhysicalDeviceProperties2( VkPhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceProperties2( *reinterpret_cast<PhysicalDeviceProperties2 const *>( &rhs ) )
+    {
+    }
+
+    PhysicalDeviceProperties2 & operator=( PhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    PhysicalDeviceProperties2 & operator=( VkPhysicalDeviceProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties2 const *>( &rhs );
+      return *this;
+    }
+
+    operator VkPhysicalDeviceProperties2 const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkPhysicalDeviceProperties2 *>( this );
+    }
+
+    operator VkPhysicalDeviceProperties2 &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkPhysicalDeviceProperties2 *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( sType, pNext, properties );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PhysicalDeviceProperties2 const & ) const = default;
+#else
+    bool operator==( PhysicalDeviceProperties2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( properties == rhs.properties );
+#  endif
+    }
+
+    bool operator!=( PhysicalDeviceProperties2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::StructureType            sType      = StructureType::ePhysicalDeviceProperties2;
+    void *                                         pNext      = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceProperties properties = {};
+  };
+
+  template <>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceProperties2>
+  {
+    using Type = PhysicalDeviceProperties2;
+  };
+
+  using PhysicalDeviceProperties2KHR = PhysicalDeviceProperties2;
+
   struct PhysicalDeviceProtectedMemoryFeatures
   {
     using NativeType = VkPhysicalDeviceProtectedMemoryFeatures;
@@ -108088,10 +77701,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProtectedMemoryFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceProtectedMemoryFeatures( Bool32 protectedMemory_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , protectedMemory{ protectedMemory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceProtectedMemoryFeatures( VULKAN_HPP_NAMESPACE::Bool32 protectedMemory_ = {},
+                                                                void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , protectedMemory( protectedMemory_ )
     {
     }
 
@@ -108103,27 +77717,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceProtectedMemoryFeatures & operator=( PhysicalDeviceProtectedMemoryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceProtectedMemoryFeatures & operator=( VkPhysicalDeviceProtectedMemoryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceProtectedMemoryFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProtectedMemoryFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProtectedMemoryFeatures & setProtectedMemory( Bool32 protectedMemory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProtectedMemoryFeatures & setProtectedMemory( VULKAN_HPP_NAMESPACE::Bool32 protectedMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       protectedMemory = protectedMemory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceProtectedMemoryFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -108135,18 +77749,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceProtectedMemoryFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceProtectedMemoryFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProtectedMemoryFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceProtectedMemoryFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProtectedMemoryFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, protectedMemory );
     }
@@ -108171,27 +77780,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::ePhysicalDeviceProtectedMemoryFeatures;
-    void *        pNext           = {};
-    Bool32        protectedMemory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePhysicalDeviceProtectedMemoryFeatures;
+    void *                              pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        protectedMemory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProtectedMemoryFeatures>
-  {
-    using Type = PhysicalDeviceProtectedMemoryFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceProtectedMemoryFeatures>
   {
     using Type = PhysicalDeviceProtectedMemoryFeatures;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceProtectedMemoryProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProtectedMemoryProperties.html
   struct PhysicalDeviceProtectedMemoryProperties
   {
     using NativeType = VkPhysicalDeviceProtectedMemoryProperties;
@@ -108199,10 +77798,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProtectedMemoryProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceProtectedMemoryProperties( Bool32 protectedNoFault_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , protectedNoFault{ protectedNoFault_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceProtectedMemoryProperties( VULKAN_HPP_NAMESPACE::Bool32 protectedNoFault_ = {},
+                                                                  void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , protectedNoFault( protectedNoFault_ )
     {
     }
 
@@ -108214,11 +77814,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceProtectedMemoryProperties & operator=( PhysicalDeviceProtectedMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceProtectedMemoryProperties & operator=( VkPhysicalDeviceProtectedMemoryProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceProtectedMemoryProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProtectedMemoryProperties const *>( &rhs );
       return *this;
     }
 
@@ -108232,18 +77832,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceProtectedMemoryProperties *>( this );
     }
 
-    operator VkPhysicalDeviceProtectedMemoryProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProtectedMemoryProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceProtectedMemoryProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProtectedMemoryProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, protectedNoFault );
     }
@@ -108268,27 +77863,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceProtectedMemoryProperties;
-    void *        pNext            = {};
-    Bool32        protectedNoFault = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceProtectedMemoryProperties;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        protectedNoFault = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProtectedMemoryProperties>
-  {
-    using Type = PhysicalDeviceProtectedMemoryProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceProtectedMemoryProperties>
   {
     using Type = PhysicalDeviceProtectedMemoryProperties;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceProvokingVertexFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProvokingVertexFeaturesEXT.html
   struct PhysicalDeviceProvokingVertexFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceProvokingVertexFeaturesEXT;
@@ -108296,13 +77881,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceProvokingVertexFeaturesEXT( Bool32 provokingVertexLast_                       = {},
-                                                                   Bool32 transformFeedbackPreservesProvokingVertex_ = {},
-                                                                   void * pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , provokingVertexLast{ provokingVertexLast_ }
-      , transformFeedbackPreservesProvokingVertex{ transformFeedbackPreservesProvokingVertex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceProvokingVertexFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 provokingVertexLast_                       = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 transformFeedbackPreservesProvokingVertex_ = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , provokingVertexLast( provokingVertexLast_ )
+      , transformFeedbackPreservesProvokingVertex( transformFeedbackPreservesProvokingVertex_ )
     {
     }
 
@@ -108314,34 +77899,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceProvokingVertexFeaturesEXT & operator=( PhysicalDeviceProvokingVertexFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceProvokingVertexFeaturesEXT & operator=( VkPhysicalDeviceProvokingVertexFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceProvokingVertexFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProvokingVertexFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProvokingVertexFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProvokingVertexFeaturesEXT & setProvokingVertexLast( Bool32 provokingVertexLast_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProvokingVertexFeaturesEXT &
+      setProvokingVertexLast( VULKAN_HPP_NAMESPACE::Bool32 provokingVertexLast_ ) VULKAN_HPP_NOEXCEPT
     {
       provokingVertexLast = provokingVertexLast_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceProvokingVertexFeaturesEXT &
-      setTransformFeedbackPreservesProvokingVertex( Bool32 transformFeedbackPreservesProvokingVertex_ ) VULKAN_HPP_NOEXCEPT
+      setTransformFeedbackPreservesProvokingVertex( VULKAN_HPP_NAMESPACE::Bool32 transformFeedbackPreservesProvokingVertex_ ) VULKAN_HPP_NOEXCEPT
     {
       transformFeedbackPreservesProvokingVertex = transformFeedbackPreservesProvokingVertex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceProvokingVertexFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -108353,18 +77939,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceProvokingVertexFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceProvokingVertexFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProvokingVertexFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceProvokingVertexFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProvokingVertexFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, provokingVertexLast, transformFeedbackPreservesProvokingVertex );
     }
@@ -108390,28 +77971,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                     = StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT;
-    void *        pNext                                     = {};
-    Bool32        provokingVertexLast                       = {};
-    Bool32        transformFeedbackPreservesProvokingVertex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                     = StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT;
+    void *                              pNext                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        provokingVertexLast                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackPreservesProvokingVertex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProvokingVertexFeaturesEXT>
-  {
-    using Type = PhysicalDeviceProvokingVertexFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT>
   {
     using Type = PhysicalDeviceProvokingVertexFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceProvokingVertexPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceProvokingVertexPropertiesEXT.html
   struct PhysicalDeviceProvokingVertexPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceProvokingVertexPropertiesEXT;
@@ -108419,13 +77990,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceProvokingVertexPropertiesEXT( Bool32 provokingVertexModePerPipeline_                       = {},
-                                                                     Bool32 transformFeedbackPreservesTriangleFanProvokingVertex_ = {},
-                                                                     void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , provokingVertexModePerPipeline{ provokingVertexModePerPipeline_ }
-      , transformFeedbackPreservesTriangleFanProvokingVertex{ transformFeedbackPreservesTriangleFanProvokingVertex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceProvokingVertexPropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 provokingVertexModePerPipeline_                       = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 transformFeedbackPreservesTriangleFanProvokingVertex_ = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , provokingVertexModePerPipeline( provokingVertexModePerPipeline_ )
+      , transformFeedbackPreservesTriangleFanProvokingVertex( transformFeedbackPreservesTriangleFanProvokingVertex_ )
     {
     }
 
@@ -108437,11 +78008,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceProvokingVertexPropertiesEXT & operator=( PhysicalDeviceProvokingVertexPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceProvokingVertexPropertiesEXT & operator=( VkPhysicalDeviceProvokingVertexPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceProvokingVertexPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceProvokingVertexPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -108455,18 +78026,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceProvokingVertexPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceProvokingVertexPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceProvokingVertexPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceProvokingVertexPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceProvokingVertexPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, provokingVertexModePerPipeline, transformFeedbackPreservesTriangleFanProvokingVertex );
     }
@@ -108492,89 +78058,74 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                = StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT;
-    void *        pNext                                                = {};
-    Bool32        provokingVertexModePerPipeline                       = {};
-    Bool32        transformFeedbackPreservesTriangleFanProvokingVertex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                = StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT;
+    void *                              pNext                                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        provokingVertexModePerPipeline                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackPreservesTriangleFanProvokingVertex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceProvokingVertexPropertiesEXT>
-  {
-    using Type = PhysicalDeviceProvokingVertexPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT>
   {
     using Type = PhysicalDeviceProvokingVertexPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDevicePushDescriptorProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDevicePushDescriptorProperties.html
-  struct PhysicalDevicePushDescriptorProperties
+  struct PhysicalDevicePushDescriptorPropertiesKHR
   {
-    using NativeType = VkPhysicalDevicePushDescriptorProperties;
+    using NativeType = VkPhysicalDevicePushDescriptorPropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePushDescriptorProperties;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDevicePushDescriptorPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePushDescriptorProperties( uint32_t maxPushDescriptors_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxPushDescriptors{ maxPushDescriptors_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePushDescriptorPropertiesKHR( uint32_t maxPushDescriptors_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxPushDescriptors( maxPushDescriptors_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDevicePushDescriptorProperties( PhysicalDevicePushDescriptorProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDevicePushDescriptorPropertiesKHR( PhysicalDevicePushDescriptorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDevicePushDescriptorProperties( VkPhysicalDevicePushDescriptorProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDevicePushDescriptorProperties( *reinterpret_cast<PhysicalDevicePushDescriptorProperties const *>( &rhs ) )
+    PhysicalDevicePushDescriptorPropertiesKHR( VkPhysicalDevicePushDescriptorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDevicePushDescriptorPropertiesKHR( *reinterpret_cast<PhysicalDevicePushDescriptorPropertiesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDevicePushDescriptorProperties & operator=( PhysicalDevicePushDescriptorProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDevicePushDescriptorPropertiesKHR & operator=( PhysicalDevicePushDescriptorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDevicePushDescriptorProperties & operator=( VkPhysicalDevicePushDescriptorProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDevicePushDescriptorPropertiesKHR & operator=( VkPhysicalDevicePushDescriptorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDevicePushDescriptorProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDevicePushDescriptorPropertiesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDevicePushDescriptorProperties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePushDescriptorPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDevicePushDescriptorProperties *>( this );
+      return *reinterpret_cast<const VkPhysicalDevicePushDescriptorPropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDevicePushDescriptorProperties &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDevicePushDescriptorPropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDevicePushDescriptorProperties *>( this );
-    }
-
-    operator VkPhysicalDevicePushDescriptorProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDevicePushDescriptorProperties *>( this );
-    }
-
-    operator VkPhysicalDevicePushDescriptorProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDevicePushDescriptorProperties *>( this );
+      return *reinterpret_cast<VkPhysicalDevicePushDescriptorPropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxPushDescriptors );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDevicePushDescriptorProperties const & ) const = default;
+    auto operator<=>( PhysicalDevicePushDescriptorPropertiesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDevicePushDescriptorProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDevicePushDescriptorPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -108583,164 +78134,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDevicePushDescriptorProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDevicePushDescriptorPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDevicePushDescriptorProperties;
-    void *        pNext              = {};
-    uint32_t      maxPushDescriptors = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDevicePushDescriptorPropertiesKHR;
+    void *                              pNext              = {};
+    uint32_t                            maxPushDescriptors = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDevicePushDescriptorProperties>
-  {
-    using Type = PhysicalDevicePushDescriptorProperties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDevicePushDescriptorProperties>
+  struct CppType<StructureType, StructureType::ePhysicalDevicePushDescriptorPropertiesKHR>
   {
-    using Type = PhysicalDevicePushDescriptorProperties;
+    using Type = PhysicalDevicePushDescriptorPropertiesKHR;
   };
 
-  using PhysicalDevicePushDescriptorPropertiesKHR = PhysicalDevicePushDescriptorProperties;
-
-  // wrapper struct for struct VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM.html
-  struct PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM
-  {
-    using NativeType = VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM(
-      uint32_t                                       queueFamilyIndex_ = {},
-      PhysicalDeviceDataGraphProcessingEngineTypeARM engineType_       = PhysicalDeviceDataGraphProcessingEngineTypeARM::eDefault,
-      const void *                                   pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
-      , engineType{ engineType_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM( PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM( VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM(
-          *reinterpret_cast<PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM &
-      operator=( PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM &
-      operator=( VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM & setQueueFamilyIndex( uint32_t queueFamilyIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      queueFamilyIndex = queueFamilyIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM &
-      setEngineType( PhysicalDeviceDataGraphProcessingEngineTypeARM engineType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      engineType = engineType_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( this );
-    }
-
-    operator VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, PhysicalDeviceDataGraphProcessingEngineTypeARM const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, queueFamilyIndex, engineType );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( queueFamilyIndex == rhs.queueFamilyIndex ) && ( engineType == rhs.engineType );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                  sType            = StructureType::ePhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-    const void *                                   pNext            = {};
-    uint32_t                                       queueFamilyIndex = {};
-    PhysicalDeviceDataGraphProcessingEngineTypeARM engineType       = PhysicalDeviceDataGraphProcessingEngineTypeARM::eDefault;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>
-  {
-    using Type = PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM>
-  {
-    using Type = PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT.html
   struct PhysicalDeviceRGBA10X6FormatsFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT;
@@ -108748,10 +78159,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRGBA10X6FormatsFeaturesEXT( Bool32 formatRgba10x6WithoutYCbCrSampler_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , formatRgba10x6WithoutYCbCrSampler{ formatRgba10x6WithoutYCbCrSampler_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRGBA10X6FormatsFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 formatRgba10x6WithoutYCbCrSampler_ = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , formatRgba10x6WithoutYCbCrSampler( formatRgba10x6WithoutYCbCrSampler_ )
     {
     }
 
@@ -108763,15 +78175,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRGBA10X6FormatsFeaturesEXT & operator=( PhysicalDeviceRGBA10X6FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRGBA10X6FormatsFeaturesEXT & operator=( VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRGBA10X6FormatsFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRGBA10X6FormatsFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRGBA10X6FormatsFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -108779,12 +78191,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRGBA10X6FormatsFeaturesEXT &
-      setFormatRgba10x6WithoutYCbCrSampler( Bool32 formatRgba10x6WithoutYCbCrSampler_ ) VULKAN_HPP_NOEXCEPT
+      setFormatRgba10x6WithoutYCbCrSampler( VULKAN_HPP_NAMESPACE::Bool32 formatRgba10x6WithoutYCbCrSampler_ ) VULKAN_HPP_NOEXCEPT
     {
       formatRgba10x6WithoutYCbCrSampler = formatRgba10x6WithoutYCbCrSampler_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -108796,18 +78208,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, formatRgba10x6WithoutYCbCrSampler );
     }
@@ -108832,27 +78239,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                             = StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT;
-    void *        pNext                             = {};
-    Bool32        formatRgba10x6WithoutYCbCrSampler = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                             = StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT;
+    void *                              pNext                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        formatRgba10x6WithoutYCbCrSampler = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT>
-  {
-    using Type = PhysicalDeviceRGBA10X6FormatsFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT>
   {
     using Type = PhysicalDeviceRGBA10X6FormatsFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT.html
   struct PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
@@ -108860,15 +78257,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT( Bool32 rasterizationOrderColorAttachmentAccess_   = {},
-                                                                                      Bool32 rasterizationOrderDepthAttachmentAccess_   = {},
-                                                                                      Bool32 rasterizationOrderStencilAttachmentAccess_ = {},
-                                                                                      void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rasterizationOrderColorAttachmentAccess{ rasterizationOrderColorAttachmentAccess_ }
-      , rasterizationOrderDepthAttachmentAccess{ rasterizationOrderDepthAttachmentAccess_ }
-      , rasterizationOrderStencilAttachmentAccess{ rasterizationOrderStencilAttachmentAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderColorAttachmentAccess_   = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderDepthAttachmentAccess_   = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderStencilAttachmentAccess_ = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rasterizationOrderColorAttachmentAccess( rasterizationOrderColorAttachmentAccess_ )
+      , rasterizationOrderDepthAttachmentAccess( rasterizationOrderDepthAttachmentAccess_ )
+      , rasterizationOrderStencilAttachmentAccess( rasterizationOrderStencilAttachmentAccess_ )
     {
     }
 
@@ -108883,16 +78281,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT &
       operator=( PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT &
       operator=( VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -108900,26 +78298,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT &
-      setRasterizationOrderColorAttachmentAccess( Bool32 rasterizationOrderColorAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
+      setRasterizationOrderColorAttachmentAccess( VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderColorAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationOrderColorAttachmentAccess = rasterizationOrderColorAttachmentAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT &
-      setRasterizationOrderDepthAttachmentAccess( Bool32 rasterizationOrderDepthAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
+      setRasterizationOrderDepthAttachmentAccess( VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderDepthAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationOrderDepthAttachmentAccess = rasterizationOrderDepthAttachmentAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT &
-      setRasterizationOrderStencilAttachmentAccess( Bool32 rasterizationOrderStencilAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
+      setRasterizationOrderStencilAttachmentAccess( VULKAN_HPP_NAMESPACE::Bool32 rasterizationOrderStencilAttachmentAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationOrderStencilAttachmentAccess = rasterizationOrderStencilAttachmentAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -108931,18 +78329,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
         sType, pNext, rasterizationOrderColorAttachmentAccess, rasterizationOrderDepthAttachmentAccess, rasterizationOrderStencilAttachmentAccess );
@@ -108970,21 +78367,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                     = StructureType::ePhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
-    void *        pNext                                     = {};
-    Bool32        rasterizationOrderColorAttachmentAccess   = {};
-    Bool32        rasterizationOrderDepthAttachmentAccess   = {};
-    Bool32        rasterizationOrderStencilAttachmentAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                     = StructureType::ePhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
+    void *                              pNext                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rasterizationOrderColorAttachmentAccess   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rasterizationOrderDepthAttachmentAccess   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rasterizationOrderStencilAttachmentAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT>
-  {
-    using Type = PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT>
   {
@@ -108993,8 +78382,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM = PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT;
 
-  // wrapper struct for struct VkPhysicalDeviceRawAccessChainsFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRawAccessChainsFeaturesNV.html
   struct PhysicalDeviceRawAccessChainsFeaturesNV
   {
     using NativeType = VkPhysicalDeviceRawAccessChainsFeaturesNV;
@@ -109002,10 +78389,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRawAccessChainsFeaturesNV( Bool32 shaderRawAccessChains_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderRawAccessChains{ shaderRawAccessChains_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRawAccessChainsFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 shaderRawAccessChains_ = {},
+                                                                  void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderRawAccessChains( shaderRawAccessChains_ )
     {
     }
 
@@ -109017,27 +78405,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRawAccessChainsFeaturesNV & operator=( PhysicalDeviceRawAccessChainsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRawAccessChainsFeaturesNV & operator=( VkPhysicalDeviceRawAccessChainsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRawAccessChainsFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRawAccessChainsFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRawAccessChainsFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRawAccessChainsFeaturesNV & setShaderRawAccessChains( Bool32 shaderRawAccessChains_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRawAccessChainsFeaturesNV &
+      setShaderRawAccessChains( VULKAN_HPP_NAMESPACE::Bool32 shaderRawAccessChains_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderRawAccessChains = shaderRawAccessChains_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRawAccessChainsFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -109049,18 +78438,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRawAccessChainsFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRawAccessChainsFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRawAccessChainsFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRawAccessChainsFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRawAccessChainsFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderRawAccessChains );
     }
@@ -109085,27 +78469,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV;
-    void *        pNext                 = {};
-    Bool32        shaderRawAccessChains = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderRawAccessChains = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRawAccessChainsFeaturesNV>
-  {
-    using Type = PhysicalDeviceRawAccessChainsFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV>
   {
     using Type = PhysicalDeviceRawAccessChainsFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayQueryFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayQueryFeaturesKHR.html
   struct PhysicalDeviceRayQueryFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceRayQueryFeaturesKHR;
@@ -109113,10 +78487,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayQueryFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayQueryFeaturesKHR( Bool32 rayQuery_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayQuery{ rayQuery_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayQueryFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 rayQuery_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayQuery( rayQuery_ )
     {
     }
 
@@ -109128,27 +78502,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayQueryFeaturesKHR & operator=( PhysicalDeviceRayQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayQueryFeaturesKHR & operator=( VkPhysicalDeviceRayQueryFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayQueryFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayQueryFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayQueryFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayQueryFeaturesKHR & setRayQuery( Bool32 rayQuery_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayQueryFeaturesKHR & setRayQuery( VULKAN_HPP_NAMESPACE::Bool32 rayQuery_ ) VULKAN_HPP_NOEXCEPT
     {
       rayQuery = rayQuery_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayQueryFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -109160,18 +78534,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayQueryFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceRayQueryFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayQueryFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRayQueryFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayQueryFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayQuery );
     }
@@ -109196,142 +78565,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::ePhysicalDeviceRayQueryFeaturesKHR;
-    void *        pNext    = {};
-    Bool32        rayQuery = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::ePhysicalDeviceRayQueryFeaturesKHR;
+    void *                              pNext    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayQuery = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayQueryFeaturesKHR>
-  {
-    using Type = PhysicalDeviceRayQueryFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayQueryFeaturesKHR>
   {
     using Type = PhysicalDeviceRayQueryFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT.html
-  struct PhysicalDeviceRayTracingInvocationReorderFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderFeaturesEXT( Bool32 rayTracingInvocationReorder_ = {},
-                                                                               void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingInvocationReorder{ rayTracingInvocationReorder_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceRayTracingInvocationReorderFeaturesEXT( PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceRayTracingInvocationReorderFeaturesEXT( VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceRayTracingInvocationReorderFeaturesEXT( *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceRayTracingInvocationReorderFeaturesEXT &
-      operator=( PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceRayTracingInvocationReorderFeaturesEXT & operator=( VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesEXT &
-      setRayTracingInvocationReorder( Bool32 rayTracingInvocationReorder_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rayTracingInvocationReorder = rayTracingInvocationReorder_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, rayTracingInvocationReorder );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( rayTracingInvocationReorder == rhs.rayTracingInvocationReorder );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceRayTracingInvocationReorderFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                       = StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-    void *        pNext                       = {};
-    Bool32        rayTracingInvocationReorder = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesEXT>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV.html
   struct PhysicalDeviceRayTracingInvocationReorderFeaturesNV
   {
     using NativeType = VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV;
@@ -109339,11 +78583,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderFeaturesNV( Bool32 rayTracingInvocationReorder_ = {},
-                                                                              void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingInvocationReorder{ rayTracingInvocationReorder_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 rayTracingInvocationReorder_ = {},
+                                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingInvocationReorder( rayTracingInvocationReorder_ )
     {
     }
 
@@ -109357,15 +78601,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceRayTracingInvocationReorderFeaturesNV &
       operator=( PhysicalDeviceRayTracingInvocationReorderFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingInvocationReorderFeaturesNV & operator=( VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -109373,12 +78617,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV &
-      setRayTracingInvocationReorder( Bool32 rayTracingInvocationReorder_ ) VULKAN_HPP_NOEXCEPT
+      setRayTracingInvocationReorder( VULKAN_HPP_NAMESPACE::Bool32 rayTracingInvocationReorder_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingInvocationReorder = rayTracingInvocationReorder_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -109390,18 +78634,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingInvocationReorder );
     }
@@ -109426,134 +78665,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV;
-    void *        pNext                       = {};
-    Bool32        rayTracingInvocationReorder = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingInvocationReorder = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV>
   {
     using Type = PhysicalDeviceRayTracingInvocationReorderFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT.html
-  struct PhysicalDeviceRayTracingInvocationReorderPropertiesEXT
-  {
-    using NativeType = VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderPropertiesEXT(
-      RayTracingInvocationReorderModeEXT rayTracingInvocationReorderReorderingHint_ = RayTracingInvocationReorderModeEXT::eNone,
-      uint32_t                           maxShaderBindingTableRecordIndex_          = {},
-      void *                             pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingInvocationReorderReorderingHint{ rayTracingInvocationReorderReorderingHint_ }
-      , maxShaderBindingTableRecordIndex{ maxShaderBindingTableRecordIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderPropertiesEXT( PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceRayTracingInvocationReorderPropertiesEXT( VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceRayTracingInvocationReorderPropertiesEXT( *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceRayTracingInvocationReorderPropertiesEXT &
-      operator=( PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceRayTracingInvocationReorderPropertiesEXT &
-      operator=( VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, RayTracingInvocationReorderModeEXT const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, rayTracingInvocationReorderReorderingHint, maxShaderBindingTableRecordIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) &&
-             ( rayTracingInvocationReorderReorderingHint == rhs.rayTracingInvocationReorderReorderingHint ) &&
-             ( maxShaderBindingTableRecordIndex == rhs.maxShaderBindingTableRecordIndex );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceRayTracingInvocationReorderPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                      sType                                     = StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-    void *                             pNext                                     = {};
-    RayTracingInvocationReorderModeEXT rayTracingInvocationReorderReorderingHint = RayTracingInvocationReorderModeEXT::eNone;
-    uint32_t                           maxShaderBindingTableRecordIndex          = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesEXT>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV.html
   struct PhysicalDeviceRayTracingInvocationReorderPropertiesNV
   {
     using NativeType = VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV;
@@ -109561,12 +78683,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingInvocationReorderPropertiesNV(
-      RayTracingInvocationReorderModeEXT rayTracingInvocationReorderReorderingHint_ = RayTracingInvocationReorderModeEXT::eNone,
-      void *                             pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingInvocationReorderReorderingHint{ rayTracingInvocationReorderReorderingHint_ }
+      VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV rayTracingInvocationReorderReorderingHint_ =
+        VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV::eNone,
+      void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingInvocationReorderReorderingHint( rayTracingInvocationReorderReorderingHint_ )
     {
     }
 
@@ -109580,11 +78703,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceRayTracingInvocationReorderPropertiesNV &
       operator=( PhysicalDeviceRayTracingInvocationReorderPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingInvocationReorderPropertiesNV & operator=( VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingInvocationReorderPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingInvocationReorderPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -109598,18 +78721,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, RayTracingInvocationReorderModeEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingInvocationReorderReorderingHint );
     }
@@ -109634,149 +78752,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                                     = StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV;
-    void *                             pNext                                     = {};
-    RayTracingInvocationReorderModeEXT rayTracingInvocationReorderReorderingHint = RayTracingInvocationReorderModeEXT::eNone;
+    VULKAN_HPP_NAMESPACE::StructureType                     sType = StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV;
+    void *                                                  pNext = {};
+    VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV rayTracingInvocationReorderReorderingHint =
+      VULKAN_HPP_NAMESPACE::RayTracingInvocationReorderModeNV::eNone;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV>
-  {
-    using Type = PhysicalDeviceRayTracingInvocationReorderPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV>
   {
     using Type = PhysicalDeviceRayTracingInvocationReorderPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV.html
-  struct PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV
-  {
-    using NativeType = VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV( Bool32 spheres_ = {}, Bool32 linearSweptSpheres_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , spheres{ spheres_ }
-      , linearSweptSpheres{ linearSweptSpheres_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV( PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV( VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV( *reinterpret_cast<PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV &
-      operator=( PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV & operator=( VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV & setSpheres( Bool32 spheres_ ) VULKAN_HPP_NOEXCEPT
-    {
-      spheres = spheres_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV & setLinearSweptSpheres( Bool32 linearSweptSpheres_ ) VULKAN_HPP_NOEXCEPT
-    {
-      linearSweptSpheres = linearSweptSpheres_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, spheres, linearSweptSpheres );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( spheres == rhs.spheres ) && ( linearSweptSpheres == rhs.linearSweptSpheres );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType              = StructureType::ePhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-    void *        pNext              = {};
-    Bool32        spheres            = {};
-    Bool32        linearSweptSpheres = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>
-  {
-    using Type = PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV>
-  {
-    using Type = PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR.html
   struct PhysicalDeviceRayTracingMaintenance1FeaturesKHR
   {
     using NativeType = VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR;
@@ -109784,13 +78771,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingMaintenance1FeaturesKHR( Bool32 rayTracingMaintenance1_               = {},
-                                                                          Bool32 rayTracingPipelineTraceRaysIndirect2_ = {},
-                                                                          void * pNext_                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingMaintenance1{ rayTracingMaintenance1_ }
-      , rayTracingPipelineTraceRaysIndirect2{ rayTracingPipelineTraceRaysIndirect2_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingMaintenance1FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 rayTracingMaintenance1_               = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineTraceRaysIndirect2_ = {},
+                                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingMaintenance1( rayTracingMaintenance1_ )
+      , rayTracingPipelineTraceRaysIndirect2( rayTracingPipelineTraceRaysIndirect2_ )
     {
     }
 
@@ -109803,34 +78790,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingMaintenance1FeaturesKHR & operator=( PhysicalDeviceRayTracingMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingMaintenance1FeaturesKHR & operator=( VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingMaintenance1FeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMaintenance1FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMaintenance1FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMaintenance1FeaturesKHR & setRayTracingMaintenance1( Bool32 rayTracingMaintenance1_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMaintenance1FeaturesKHR &
+      setRayTracingMaintenance1( VULKAN_HPP_NAMESPACE::Bool32 rayTracingMaintenance1_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingMaintenance1 = rayTracingMaintenance1_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMaintenance1FeaturesKHR &
-      setRayTracingPipelineTraceRaysIndirect2( Bool32 rayTracingPipelineTraceRaysIndirect2_ ) VULKAN_HPP_NOEXCEPT
+      setRayTracingPipelineTraceRaysIndirect2( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineTraceRaysIndirect2_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPipelineTraceRaysIndirect2 = rayTracingPipelineTraceRaysIndirect2_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -109842,18 +78830,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingMaintenance1, rayTracingPipelineTraceRaysIndirect2 );
     }
@@ -109879,28 +78862,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                = StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR;
-    void *        pNext                                = {};
-    Bool32        rayTracingMaintenance1               = {};
-    Bool32        rayTracingPipelineTraceRaysIndirect2 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                = StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR;
+    void *                              pNext                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingMaintenance1               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPipelineTraceRaysIndirect2 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR>
-  {
-    using Type = PhysicalDeviceRayTracingMaintenance1FeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR>
   {
     using Type = PhysicalDeviceRayTracingMaintenance1FeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingMotionBlurFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingMotionBlurFeaturesNV.html
   struct PhysicalDeviceRayTracingMotionBlurFeaturesNV
   {
     using NativeType = VkPhysicalDeviceRayTracingMotionBlurFeaturesNV;
@@ -109908,13 +78881,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingMotionBlurFeaturesNV( Bool32 rayTracingMotionBlur_                          = {},
-                                                                       Bool32 rayTracingMotionBlurPipelineTraceRaysIndirect_ = {},
-                                                                       void * pNext_                                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingMotionBlur{ rayTracingMotionBlur_ }
-      , rayTracingMotionBlurPipelineTraceRaysIndirect{ rayTracingMotionBlurPipelineTraceRaysIndirect_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingMotionBlurFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 rayTracingMotionBlur_                          = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32 rayTracingMotionBlurPipelineTraceRaysIndirect_ = {},
+                                                                       void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingMotionBlur( rayTracingMotionBlur_ )
+      , rayTracingMotionBlurPipelineTraceRaysIndirect( rayTracingMotionBlurPipelineTraceRaysIndirect_ )
     {
     }
 
@@ -109926,34 +78899,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingMotionBlurFeaturesNV & operator=( PhysicalDeviceRayTracingMotionBlurFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingMotionBlurFeaturesNV & operator=( VkPhysicalDeviceRayTracingMotionBlurFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingMotionBlurFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingMotionBlurFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMotionBlurFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMotionBlurFeaturesNV & setRayTracingMotionBlur( Bool32 rayTracingMotionBlur_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMotionBlurFeaturesNV &
+      setRayTracingMotionBlur( VULKAN_HPP_NAMESPACE::Bool32 rayTracingMotionBlur_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingMotionBlur = rayTracingMotionBlur_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingMotionBlurFeaturesNV &
-      setRayTracingMotionBlurPipelineTraceRaysIndirect( Bool32 rayTracingMotionBlurPipelineTraceRaysIndirect_ ) VULKAN_HPP_NOEXCEPT
+      setRayTracingMotionBlurPipelineTraceRaysIndirect( VULKAN_HPP_NAMESPACE::Bool32 rayTracingMotionBlurPipelineTraceRaysIndirect_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingMotionBlurPipelineTraceRaysIndirect = rayTracingMotionBlurPipelineTraceRaysIndirect_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingMotionBlurFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -109965,18 +78939,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingMotionBlurFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingMotionBlur, rayTracingMotionBlurPipelineTraceRaysIndirect );
     }
@@ -110002,28 +78971,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                         = StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV;
-    void *        pNext                                         = {};
-    Bool32        rayTracingMotionBlur                          = {};
-    Bool32        rayTracingMotionBlurPipelineTraceRaysIndirect = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                         = StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV;
+    void *                              pNext                                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingMotionBlur                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingMotionBlurPipelineTraceRaysIndirect = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingMotionBlurFeaturesNV>
-  {
-    using Type = PhysicalDeviceRayTracingMotionBlurFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV>
   {
     using Type = PhysicalDeviceRayTracingMotionBlurFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingPipelineFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingPipelineFeaturesKHR.html
   struct PhysicalDeviceRayTracingPipelineFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceRayTracingPipelineFeaturesKHR;
@@ -110031,19 +78990,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPipelineFeaturesKHR( Bool32 rayTracingPipeline_                                    = {},
-                                                                      Bool32 rayTracingPipelineShaderGroupHandleCaptureReplay_      = {},
-                                                                      Bool32 rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ = {},
-                                                                      Bool32 rayTracingPipelineTraceRaysIndirect_                   = {},
-                                                                      Bool32 rayTraversalPrimitiveCulling_                          = {},
-                                                                      void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingPipeline{ rayTracingPipeline_ }
-      , rayTracingPipelineShaderGroupHandleCaptureReplay{ rayTracingPipelineShaderGroupHandleCaptureReplay_ }
-      , rayTracingPipelineShaderGroupHandleCaptureReplayMixed{ rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ }
-      , rayTracingPipelineTraceRaysIndirect{ rayTracingPipelineTraceRaysIndirect_ }
-      , rayTraversalPrimitiveCulling{ rayTraversalPrimitiveCulling_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPipelineFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipeline_                                    = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineShaderGroupHandleCaptureReplay_      = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineTraceRaysIndirect_                   = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 rayTraversalPrimitiveCulling_                          = {},
+                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingPipeline( rayTracingPipeline_ )
+      , rayTracingPipelineShaderGroupHandleCaptureReplay( rayTracingPipelineShaderGroupHandleCaptureReplay_ )
+      , rayTracingPipelineShaderGroupHandleCaptureReplayMixed( rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ )
+      , rayTracingPipelineTraceRaysIndirect( rayTracingPipelineTraceRaysIndirect_ )
+      , rayTraversalPrimitiveCulling( rayTraversalPrimitiveCulling_ )
     {
     }
 
@@ -110055,55 +79014,56 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingPipelineFeaturesKHR & operator=( PhysicalDeviceRayTracingPipelineFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingPipelineFeaturesKHR & operator=( VkPhysicalDeviceRayTracingPipelineFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingPipelineFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPipelineFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR & setRayTracingPipeline( Bool32 rayTracingPipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR &
+      setRayTracingPipeline( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPipeline = rayTracingPipeline_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR &
-      setRayTracingPipelineShaderGroupHandleCaptureReplay( Bool32 rayTracingPipelineShaderGroupHandleCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+      setRayTracingPipelineShaderGroupHandleCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineShaderGroupHandleCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPipelineShaderGroupHandleCaptureReplay = rayTracingPipelineShaderGroupHandleCaptureReplay_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR &
-      setRayTracingPipelineShaderGroupHandleCaptureReplayMixed( Bool32 rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR & setRayTracingPipelineShaderGroupHandleCaptureReplayMixed(
+      VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineShaderGroupHandleCaptureReplayMixed_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPipelineShaderGroupHandleCaptureReplayMixed = rayTracingPipelineShaderGroupHandleCaptureReplayMixed_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR &
-      setRayTracingPipelineTraceRaysIndirect( Bool32 rayTracingPipelineTraceRaysIndirect_ ) VULKAN_HPP_NOEXCEPT
+      setRayTracingPipelineTraceRaysIndirect( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPipelineTraceRaysIndirect_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPipelineTraceRaysIndirect = rayTracingPipelineTraceRaysIndirect_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPipelineFeaturesKHR &
-      setRayTraversalPrimitiveCulling( Bool32 rayTraversalPrimitiveCulling_ ) VULKAN_HPP_NOEXCEPT
+      setRayTraversalPrimitiveCulling( VULKAN_HPP_NAMESPACE::Bool32 rayTraversalPrimitiveCulling_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTraversalPrimitiveCulling = rayTraversalPrimitiveCulling_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingPipelineFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -110115,18 +79075,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingPipelineFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingPipelineFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingPipelineFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingPipelineFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingPipelineFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -110162,31 +79122,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                 = StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR;
-    void *        pNext                                                 = {};
-    Bool32        rayTracingPipeline                                    = {};
-    Bool32        rayTracingPipelineShaderGroupHandleCaptureReplay      = {};
-    Bool32        rayTracingPipelineShaderGroupHandleCaptureReplayMixed = {};
-    Bool32        rayTracingPipelineTraceRaysIndirect                   = {};
-    Bool32        rayTraversalPrimitiveCulling                          = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                                 = StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR;
+    void *                              pNext                                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPipeline                                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPipelineShaderGroupHandleCaptureReplay      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPipelineShaderGroupHandleCaptureReplayMixed = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPipelineTraceRaysIndirect                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTraversalPrimitiveCulling                          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingPipelineFeaturesKHR>
-  {
-    using Type = PhysicalDeviceRayTracingPipelineFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR>
   {
     using Type = PhysicalDeviceRayTracingPipelineFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingPipelinePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingPipelinePropertiesKHR.html
   struct PhysicalDeviceRayTracingPipelinePropertiesKHR
   {
     using NativeType = VkPhysicalDeviceRayTracingPipelinePropertiesKHR;
@@ -110194,7 +79144,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPipelinePropertiesKHR( uint32_t shaderGroupHandleSize_              = {},
                                                                         uint32_t maxRayRecursionDepth_               = {},
                                                                         uint32_t maxShaderGroupStride_               = {},
@@ -110204,15 +79154,15 @@ namespace VULKAN_HPP_NAMESPACE
                                                                         uint32_t shaderGroupHandleAlignment_         = {},
                                                                         uint32_t maxRayHitAttributeSize_             = {},
                                                                         void *   pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderGroupHandleSize{ shaderGroupHandleSize_ }
-      , maxRayRecursionDepth{ maxRayRecursionDepth_ }
-      , maxShaderGroupStride{ maxShaderGroupStride_ }
-      , shaderGroupBaseAlignment{ shaderGroupBaseAlignment_ }
-      , shaderGroupHandleCaptureReplaySize{ shaderGroupHandleCaptureReplaySize_ }
-      , maxRayDispatchInvocationCount{ maxRayDispatchInvocationCount_ }
-      , shaderGroupHandleAlignment{ shaderGroupHandleAlignment_ }
-      , maxRayHitAttributeSize{ maxRayHitAttributeSize_ }
+      : pNext( pNext_ )
+      , shaderGroupHandleSize( shaderGroupHandleSize_ )
+      , maxRayRecursionDepth( maxRayRecursionDepth_ )
+      , maxShaderGroupStride( maxShaderGroupStride_ )
+      , shaderGroupBaseAlignment( shaderGroupBaseAlignment_ )
+      , shaderGroupHandleCaptureReplaySize( shaderGroupHandleCaptureReplaySize_ )
+      , maxRayDispatchInvocationCount( maxRayDispatchInvocationCount_ )
+      , shaderGroupHandleAlignment( shaderGroupHandleAlignment_ )
+      , maxRayHitAttributeSize( maxRayHitAttributeSize_ )
     {
     }
 
@@ -110225,11 +79175,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingPipelinePropertiesKHR & operator=( PhysicalDeviceRayTracingPipelinePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingPipelinePropertiesKHR & operator=( VkPhysicalDeviceRayTracingPipelinePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingPipelinePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPipelinePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -110243,18 +79193,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingPipelinePropertiesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingPipelinePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingPipelinePropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingPipelinePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingPipelinePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
@@ -110264,6 +79207,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -110302,34 +79246,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR;
-    void *        pNext                              = {};
-    uint32_t      shaderGroupHandleSize              = {};
-    uint32_t      maxRayRecursionDepth               = {};
-    uint32_t      maxShaderGroupStride               = {};
-    uint32_t      shaderGroupBaseAlignment           = {};
-    uint32_t      shaderGroupHandleCaptureReplaySize = {};
-    uint32_t      maxRayDispatchInvocationCount      = {};
-    uint32_t      shaderGroupHandleAlignment         = {};
-    uint32_t      maxRayHitAttributeSize             = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR;
+    void *                              pNext                              = {};
+    uint32_t                            shaderGroupHandleSize              = {};
+    uint32_t                            maxRayRecursionDepth               = {};
+    uint32_t                            maxShaderGroupStride               = {};
+    uint32_t                            shaderGroupBaseAlignment           = {};
+    uint32_t                            shaderGroupHandleCaptureReplaySize = {};
+    uint32_t                            maxRayDispatchInvocationCount      = {};
+    uint32_t                            shaderGroupHandleAlignment         = {};
+    uint32_t                            maxRayHitAttributeSize             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingPipelinePropertiesKHR>
-  {
-    using Type = PhysicalDeviceRayTracingPipelinePropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR>
   {
     using Type = PhysicalDeviceRayTracingPipelinePropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR.html
   struct PhysicalDeviceRayTracingPositionFetchFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR;
@@ -110337,10 +79271,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPositionFetchFeaturesKHR( Bool32 rayTracingPositionFetch_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingPositionFetch{ rayTracingPositionFetch_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPositionFetchFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPositionFetch_ = {},
+                                                                           void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingPositionFetch( rayTracingPositionFetch_ )
     {
     }
 
@@ -110353,27 +79288,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingPositionFetchFeaturesKHR & operator=( PhysicalDeviceRayTracingPositionFetchFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingPositionFetchFeaturesKHR & operator=( VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingPositionFetchFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPositionFetchFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPositionFetchFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPositionFetchFeaturesKHR & setRayTracingPositionFetch( Bool32 rayTracingPositionFetch_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingPositionFetchFeaturesKHR &
+      setRayTracingPositionFetch( VULKAN_HPP_NAMESPACE::Bool32 rayTracingPositionFetch_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingPositionFetch = rayTracingPositionFetch_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -110385,18 +79321,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingPositionFetch );
     }
@@ -110421,27 +79352,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR;
-    void *        pNext                   = {};
-    Bool32        rayTracingPositionFetch = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingPositionFetch = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR>
-  {
-    using Type = PhysicalDeviceRayTracingPositionFetchFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR>
   {
     using Type = PhysicalDeviceRayTracingPositionFetchFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingPropertiesNV.html
   struct PhysicalDeviceRayTracingPropertiesNV
   {
     using NativeType = VkPhysicalDeviceRayTracingPropertiesNV;
@@ -110449,7 +79370,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingPropertiesNV( uint32_t shaderGroupHandleSize_                  = {},
                                                                uint32_t maxRecursionDepth_                      = {},
                                                                uint32_t maxShaderGroupStride_                   = {},
@@ -110459,15 +79380,15 @@ namespace VULKAN_HPP_NAMESPACE
                                                                uint64_t maxTriangleCount_                       = {},
                                                                uint32_t maxDescriptorSetAccelerationStructures_ = {},
                                                                void *   pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderGroupHandleSize{ shaderGroupHandleSize_ }
-      , maxRecursionDepth{ maxRecursionDepth_ }
-      , maxShaderGroupStride{ maxShaderGroupStride_ }
-      , shaderGroupBaseAlignment{ shaderGroupBaseAlignment_ }
-      , maxGeometryCount{ maxGeometryCount_ }
-      , maxInstanceCount{ maxInstanceCount_ }
-      , maxTriangleCount{ maxTriangleCount_ }
-      , maxDescriptorSetAccelerationStructures{ maxDescriptorSetAccelerationStructures_ }
+      : pNext( pNext_ )
+      , shaderGroupHandleSize( shaderGroupHandleSize_ )
+      , maxRecursionDepth( maxRecursionDepth_ )
+      , maxShaderGroupStride( maxShaderGroupStride_ )
+      , shaderGroupBaseAlignment( shaderGroupBaseAlignment_ )
+      , maxGeometryCount( maxGeometryCount_ )
+      , maxInstanceCount( maxInstanceCount_ )
+      , maxTriangleCount( maxTriangleCount_ )
+      , maxDescriptorSetAccelerationStructures( maxDescriptorSetAccelerationStructures_ )
     {
     }
 
@@ -110479,11 +79400,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingPropertiesNV & operator=( PhysicalDeviceRayTracingPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingPropertiesNV & operator=( VkPhysicalDeviceRayTracingPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -110497,18 +79418,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
@@ -110518,6 +79432,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint64_t const &,
                uint64_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -110556,34 +79471,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceRayTracingPropertiesNV;
-    void *        pNext                                  = {};
-    uint32_t      shaderGroupHandleSize                  = {};
-    uint32_t      maxRecursionDepth                      = {};
-    uint32_t      maxShaderGroupStride                   = {};
-    uint32_t      shaderGroupBaseAlignment               = {};
-    uint64_t      maxGeometryCount                       = {};
-    uint64_t      maxInstanceCount                       = {};
-    uint64_t      maxTriangleCount                       = {};
-    uint32_t      maxDescriptorSetAccelerationStructures = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceRayTracingPropertiesNV;
+    void *                              pNext                                  = {};
+    uint32_t                            shaderGroupHandleSize                  = {};
+    uint32_t                            maxRecursionDepth                      = {};
+    uint32_t                            maxShaderGroupStride                   = {};
+    uint32_t                            shaderGroupBaseAlignment               = {};
+    uint64_t                            maxGeometryCount                       = {};
+    uint64_t                            maxInstanceCount                       = {};
+    uint64_t                            maxTriangleCount                       = {};
+    uint32_t                            maxDescriptorSetAccelerationStructures = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingPropertiesNV>
-  {
-    using Type = PhysicalDeviceRayTracingPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingPropertiesNV>
   {
     using Type = PhysicalDeviceRayTracingPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRayTracingValidationFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRayTracingValidationFeaturesNV.html
   struct PhysicalDeviceRayTracingValidationFeaturesNV
   {
     using NativeType = VkPhysicalDeviceRayTracingValidationFeaturesNV;
@@ -110591,10 +79496,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingValidationFeaturesNV( Bool32 rayTracingValidation_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rayTracingValidation{ rayTracingValidation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRayTracingValidationFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 rayTracingValidation_ = {},
+                                                                       void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rayTracingValidation( rayTracingValidation_ )
     {
     }
 
@@ -110606,27 +79512,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRayTracingValidationFeaturesNV & operator=( PhysicalDeviceRayTracingValidationFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRayTracingValidationFeaturesNV & operator=( VkPhysicalDeviceRayTracingValidationFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRayTracingValidationFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRayTracingValidationFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingValidationFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingValidationFeaturesNV & setRayTracingValidation( Bool32 rayTracingValidation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingValidationFeaturesNV &
+      setRayTracingValidation( VULKAN_HPP_NAMESPACE::Bool32 rayTracingValidation_ ) VULKAN_HPP_NOEXCEPT
     {
       rayTracingValidation = rayTracingValidation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingValidationFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -110638,18 +79545,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRayTracingValidationFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRayTracingValidationFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRayTracingValidationFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRayTracingValidationFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRayTracingValidationFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rayTracingValidation );
     }
@@ -110674,27 +79576,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV;
-    void *        pNext                = {};
-    Bool32        rayTracingValidation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        rayTracingValidation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRayTracingValidationFeaturesNV>
-  {
-    using Type = PhysicalDeviceRayTracingValidationFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV>
   {
     using Type = PhysicalDeviceRayTracingValidationFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG.html
   struct PhysicalDeviceRelaxedLineRasterizationFeaturesIMG
   {
     using NativeType = VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
@@ -110702,10 +79594,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRelaxedLineRasterizationFeaturesIMG( Bool32 relaxedLineRasterization_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , relaxedLineRasterization{ relaxedLineRasterization_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRelaxedLineRasterizationFeaturesIMG( VULKAN_HPP_NAMESPACE::Bool32 relaxedLineRasterization_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , relaxedLineRasterization( relaxedLineRasterization_ )
     {
     }
 
@@ -110719,15 +79612,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceRelaxedLineRasterizationFeaturesIMG &
       operator=( PhysicalDeviceRelaxedLineRasterizationFeaturesIMG const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRelaxedLineRasterizationFeaturesIMG & operator=( VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRelaxedLineRasterizationFeaturesIMG const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRelaxedLineRasterizationFeaturesIMG const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRelaxedLineRasterizationFeaturesIMG & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -110735,12 +79628,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRelaxedLineRasterizationFeaturesIMG &
-      setRelaxedLineRasterization( Bool32 relaxedLineRasterization_ ) VULKAN_HPP_NOEXCEPT
+      setRelaxedLineRasterization( VULKAN_HPP_NAMESPACE::Bool32 relaxedLineRasterization_ ) VULKAN_HPP_NOEXCEPT
     {
       relaxedLineRasterization = relaxedLineRasterization_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -110752,18 +79645,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG *>( this );
     }
 
-    operator VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG *>( this );
-    }
-
-    operator VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, relaxedLineRasterization );
     }
@@ -110788,27 +79676,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
-    void *        pNext                    = {};
-    Bool32        relaxedLineRasterization = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        relaxedLineRasterization = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG>
-  {
-    using Type = PhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG>
   {
     using Type = PhysicalDeviceRelaxedLineRasterizationFeaturesIMG;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRenderPassStripedFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRenderPassStripedFeaturesARM.html
   struct PhysicalDeviceRenderPassStripedFeaturesARM
   {
     using NativeType = VkPhysicalDeviceRenderPassStripedFeaturesARM;
@@ -110816,10 +79694,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRenderPassStripedFeaturesARM( Bool32 renderPassStriped_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , renderPassStriped{ renderPassStriped_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRenderPassStripedFeaturesARM( VULKAN_HPP_NAMESPACE::Bool32 renderPassStriped_ = {},
+                                                                     void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , renderPassStriped( renderPassStriped_ )
     {
     }
 
@@ -110831,27 +79710,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRenderPassStripedFeaturesARM & operator=( PhysicalDeviceRenderPassStripedFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRenderPassStripedFeaturesARM & operator=( VkPhysicalDeviceRenderPassStripedFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRenderPassStripedFeaturesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRenderPassStripedFeaturesARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRenderPassStripedFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRenderPassStripedFeaturesARM & setRenderPassStriped( Bool32 renderPassStriped_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRenderPassStripedFeaturesARM &
+      setRenderPassStriped( VULKAN_HPP_NAMESPACE::Bool32 renderPassStriped_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPassStriped = renderPassStriped_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRenderPassStripedFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -110863,18 +79743,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRenderPassStripedFeaturesARM *>( this );
     }
 
-    operator VkPhysicalDeviceRenderPassStripedFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRenderPassStripedFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceRenderPassStripedFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRenderPassStripedFeaturesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, renderPassStriped );
     }
@@ -110899,27 +79774,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM;
-    void *        pNext             = {};
-    Bool32        renderPassStriped = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        renderPassStriped = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRenderPassStripedFeaturesARM>
-  {
-    using Type = PhysicalDeviceRenderPassStripedFeaturesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM>
   {
     using Type = PhysicalDeviceRenderPassStripedFeaturesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRenderPassStripedPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRenderPassStripedPropertiesARM.html
   struct PhysicalDeviceRenderPassStripedPropertiesARM
   {
     using NativeType = VkPhysicalDeviceRenderPassStripedPropertiesARM;
@@ -110927,13 +79792,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRenderPassStripedPropertiesARM( Extent2D renderPassStripeGranularity_ = {},
-                                                                       uint32_t maxRenderPassStripes_        = {},
-                                                                       void *   pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , renderPassStripeGranularity{ renderPassStripeGranularity_ }
-      , maxRenderPassStripes{ maxRenderPassStripes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRenderPassStripedPropertiesARM( VULKAN_HPP_NAMESPACE::Extent2D renderPassStripeGranularity_ = {},
+                                                                       uint32_t                       maxRenderPassStripes_        = {},
+                                                                       void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , renderPassStripeGranularity( renderPassStripeGranularity_ )
+      , maxRenderPassStripes( maxRenderPassStripes_ )
     {
     }
 
@@ -110945,11 +79810,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceRenderPassStripedPropertiesARM & operator=( PhysicalDeviceRenderPassStripedPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRenderPassStripedPropertiesARM & operator=( VkPhysicalDeviceRenderPassStripedPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRenderPassStripedPropertiesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRenderPassStripedPropertiesARM const *>( &rhs );
       return *this;
     }
 
@@ -110963,18 +79828,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRenderPassStripedPropertiesARM *>( this );
     }
 
-    operator VkPhysicalDeviceRenderPassStripedPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRenderPassStripedPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceRenderPassStripedPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRenderPassStripedPropertiesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Extent2D const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, renderPassStripeGranularity, maxRenderPassStripes );
     }
@@ -111000,28 +79860,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM;
-    void *        pNext                       = {};
-    Extent2D      renderPassStripeGranularity = {};
-    uint32_t      maxRenderPassStripes        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      renderPassStripeGranularity = {};
+    uint32_t                            maxRenderPassStripes        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRenderPassStripedPropertiesARM>
-  {
-    using Type = PhysicalDeviceRenderPassStripedPropertiesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM>
   {
     using Type = PhysicalDeviceRenderPassStripedPropertiesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV.html
   struct PhysicalDeviceRepresentativeFragmentTestFeaturesNV
   {
     using NativeType = VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV;
@@ -111029,11 +79879,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRepresentativeFragmentTestFeaturesNV( Bool32 representativeFragmentTest_ = {},
-                                                                             void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , representativeFragmentTest{ representativeFragmentTest_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRepresentativeFragmentTestFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTest_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , representativeFragmentTest( representativeFragmentTest_ )
     {
     }
 
@@ -111047,15 +79897,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceRepresentativeFragmentTestFeaturesNV &
       operator=( PhysicalDeviceRepresentativeFragmentTestFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceRepresentativeFragmentTestFeaturesNV & operator=( VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRepresentativeFragmentTestFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRepresentativeFragmentTestFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRepresentativeFragmentTestFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -111063,12 +79913,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRepresentativeFragmentTestFeaturesNV &
-      setRepresentativeFragmentTest( Bool32 representativeFragmentTest_ ) VULKAN_HPP_NOEXCEPT
+      setRepresentativeFragmentTest( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTest_ ) VULKAN_HPP_NOEXCEPT
     {
       representativeFragmentTest = representativeFragmentTest_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -111080,18 +79930,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, representativeFragmentTest );
     }
@@ -111116,119 +79961,109 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV;
-    void *        pNext                      = {};
-    Bool32        representativeFragmentTest = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        representativeFragmentTest = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV>
-  {
-    using Type = PhysicalDeviceRepresentativeFragmentTestFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV>
   {
     using Type = PhysicalDeviceRepresentativeFragmentTestFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceRobustness2FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRobustness2FeaturesKHR.html
-  struct PhysicalDeviceRobustness2FeaturesKHR
+  struct PhysicalDeviceRobustness2FeaturesEXT
   {
-    using NativeType = VkPhysicalDeviceRobustness2FeaturesKHR;
+    using NativeType = VkPhysicalDeviceRobustness2FeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRobustness2FeaturesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRobustness2FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2FeaturesKHR( Bool32 robustBufferAccess2_ = {},
-                                                               Bool32 robustImageAccess2_  = {},
-                                                               Bool32 nullDescriptor_      = {},
-                                                               void * pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , robustBufferAccess2{ robustBufferAccess2_ }
-      , robustImageAccess2{ robustImageAccess2_ }
-      , nullDescriptor{ nullDescriptor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccess2_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess2_  = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32 nullDescriptor_      = {},
+                                                               void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , robustBufferAccess2( robustBufferAccess2_ )
+      , robustImageAccess2( robustImageAccess2_ )
+      , nullDescriptor( nullDescriptor_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2FeaturesKHR( PhysicalDeviceRobustness2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2FeaturesEXT( PhysicalDeviceRobustness2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceRobustness2FeaturesKHR( VkPhysicalDeviceRobustness2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceRobustness2FeaturesKHR( *reinterpret_cast<PhysicalDeviceRobustness2FeaturesKHR const *>( &rhs ) )
+    PhysicalDeviceRobustness2FeaturesEXT( VkPhysicalDeviceRobustness2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceRobustness2FeaturesEXT( *reinterpret_cast<PhysicalDeviceRobustness2FeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceRobustness2FeaturesKHR & operator=( PhysicalDeviceRobustness2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceRobustness2FeaturesEXT & operator=( PhysicalDeviceRobustness2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceRobustness2FeaturesKHR & operator=( VkPhysicalDeviceRobustness2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceRobustness2FeaturesEXT & operator=( VkPhysicalDeviceRobustness2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRobustness2FeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesKHR & setRobustBufferAccess2( Bool32 robustBufferAccess2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesEXT &
+      setRobustBufferAccess2( VULKAN_HPP_NAMESPACE::Bool32 robustBufferAccess2_ ) VULKAN_HPP_NOEXCEPT
     {
       robustBufferAccess2 = robustBufferAccess2_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesKHR & setRobustImageAccess2( Bool32 robustImageAccess2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesEXT & setRobustImageAccess2( VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess2_ ) VULKAN_HPP_NOEXCEPT
     {
       robustImageAccess2 = robustImageAccess2_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesKHR & setNullDescriptor( Bool32 nullDescriptor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRobustness2FeaturesEXT & setNullDescriptor( VULKAN_HPP_NAMESPACE::Bool32 nullDescriptor_ ) VULKAN_HPP_NOEXCEPT
     {
       nullDescriptor = nullDescriptor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceRobustness2FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceRobustness2FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceRobustness2FeaturesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceRobustness2FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceRobustness2FeaturesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceRobustness2FeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceRobustness2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRobustness2FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRobustness2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRobustness2FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRobustness2FeaturesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceRobustness2FeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, robustBufferAccess2, robustImageAccess2, nullDescriptor );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceRobustness2FeaturesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceRobustness2FeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceRobustness2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceRobustness2FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -111238,102 +80073,85 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceRobustness2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceRobustness2FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceRobustness2FeaturesKHR;
-    void *        pNext               = {};
-    Bool32        robustBufferAccess2 = {};
-    Bool32        robustImageAccess2  = {};
-    Bool32        nullDescriptor      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceRobustness2FeaturesEXT;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        robustBufferAccess2 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        robustImageAccess2  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        nullDescriptor      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRobustness2FeaturesKHR>
-  {
-    using Type = PhysicalDeviceRobustness2FeaturesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceRobustness2FeaturesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceRobustness2FeaturesEXT>
   {
-    using Type = PhysicalDeviceRobustness2FeaturesKHR;
+    using Type = PhysicalDeviceRobustness2FeaturesEXT;
   };
 
-  using PhysicalDeviceRobustness2FeaturesEXT = PhysicalDeviceRobustness2FeaturesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceRobustness2PropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceRobustness2PropertiesKHR.html
-  struct PhysicalDeviceRobustness2PropertiesKHR
+  struct PhysicalDeviceRobustness2PropertiesEXT
   {
-    using NativeType = VkPhysicalDeviceRobustness2PropertiesKHR;
+    using NativeType = VkPhysicalDeviceRobustness2PropertiesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRobustness2PropertiesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceRobustness2PropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2PropertiesKHR( DeviceSize robustStorageBufferAccessSizeAlignment_ = {},
-                                                                 DeviceSize robustUniformBufferAccessSizeAlignment_ = {},
-                                                                 void *     pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , robustStorageBufferAccessSizeAlignment{ robustStorageBufferAccessSizeAlignment_ }
-      , robustUniformBufferAccessSizeAlignment{ robustUniformBufferAccessSizeAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2PropertiesEXT( VULKAN_HPP_NAMESPACE::DeviceSize robustStorageBufferAccessSizeAlignment_ = {},
+                                                                 VULKAN_HPP_NAMESPACE::DeviceSize robustUniformBufferAccessSizeAlignment_ = {},
+                                                                 void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , robustStorageBufferAccessSizeAlignment( robustStorageBufferAccessSizeAlignment_ )
+      , robustUniformBufferAccessSizeAlignment( robustUniformBufferAccessSizeAlignment_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2PropertiesKHR( PhysicalDeviceRobustness2PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceRobustness2PropertiesEXT( PhysicalDeviceRobustness2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceRobustness2PropertiesKHR( VkPhysicalDeviceRobustness2PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceRobustness2PropertiesKHR( *reinterpret_cast<PhysicalDeviceRobustness2PropertiesKHR const *>( &rhs ) )
+    PhysicalDeviceRobustness2PropertiesEXT( VkPhysicalDeviceRobustness2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceRobustness2PropertiesEXT( *reinterpret_cast<PhysicalDeviceRobustness2PropertiesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceRobustness2PropertiesKHR & operator=( PhysicalDeviceRobustness2PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceRobustness2PropertiesEXT & operator=( PhysicalDeviceRobustness2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceRobustness2PropertiesKHR & operator=( VkPhysicalDeviceRobustness2PropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceRobustness2PropertiesEXT & operator=( VkPhysicalDeviceRobustness2PropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceRobustness2PropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceRobustness2PropertiesEXT const *>( &rhs );
       return *this;
     }
 
-    operator VkPhysicalDeviceRobustness2PropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceRobustness2PropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceRobustness2PropertiesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceRobustness2PropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceRobustness2PropertiesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceRobustness2PropertiesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceRobustness2PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRobustness2PropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceRobustness2PropertiesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceRobustness2PropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceRobustness2PropertiesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceRobustness2PropertiesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, robustStorageBufferAccessSizeAlignment, robustUniformBufferAccessSizeAlignment );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceRobustness2PropertiesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceRobustness2PropertiesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceRobustness2PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceRobustness2PropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -111343,37 +80161,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceRobustness2PropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceRobustness2PropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceRobustness2PropertiesKHR;
-    void *        pNext                                  = {};
-    DeviceSize    robustStorageBufferAccessSizeAlignment = {};
-    DeviceSize    robustUniformBufferAccessSizeAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceRobustness2PropertiesEXT;
+    void *                              pNext                                  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    robustStorageBufferAccessSizeAlignment = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    robustUniformBufferAccessSizeAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceRobustness2PropertiesKHR>
-  {
-    using Type = PhysicalDeviceRobustness2PropertiesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceRobustness2PropertiesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceRobustness2PropertiesEXT>
   {
-    using Type = PhysicalDeviceRobustness2PropertiesKHR;
+    using Type = PhysicalDeviceRobustness2PropertiesEXT;
   };
 
-  using PhysicalDeviceRobustness2PropertiesEXT = PhysicalDeviceRobustness2PropertiesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceSampleLocationsPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSampleLocationsPropertiesEXT.html
   struct PhysicalDeviceSampleLocationsPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceSampleLocationsPropertiesEXT;
@@ -111381,19 +80187,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSampleLocationsPropertiesEXT( SampleCountFlags             sampleLocationSampleCounts_    = {},
-                                                                        Extent2D                     maxSampleLocationGridSize_     = {},
-                                                                        std::array<float, 2> const & sampleLocationCoordinateRange_ = {},
-                                                                        uint32_t                     sampleLocationSubPixelBits_    = {},
-                                                                        Bool32                       variableSampleLocations_       = {},
-                                                                        void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampleLocationSampleCounts{ sampleLocationSampleCounts_ }
-      , maxSampleLocationGridSize{ maxSampleLocationGridSize_ }
-      , sampleLocationCoordinateRange{ sampleLocationCoordinateRange_ }
-      , sampleLocationSubPixelBits{ sampleLocationSubPixelBits_ }
-      , variableSampleLocations{ variableSampleLocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSampleLocationsPropertiesEXT( VULKAN_HPP_NAMESPACE::SampleCountFlags sampleLocationSampleCounts_    = {},
+                                                                        VULKAN_HPP_NAMESPACE::Extent2D         maxSampleLocationGridSize_     = {},
+                                                                        std::array<float, 2> const &           sampleLocationCoordinateRange_ = {},
+                                                                        uint32_t                               sampleLocationSubPixelBits_    = {},
+                                                                        VULKAN_HPP_NAMESPACE::Bool32           variableSampleLocations_       = {},
+                                                                        void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampleLocationSampleCounts( sampleLocationSampleCounts_ )
+      , maxSampleLocationGridSize( maxSampleLocationGridSize_ )
+      , sampleLocationCoordinateRange( sampleLocationCoordinateRange_ )
+      , sampleLocationSubPixelBits( sampleLocationSubPixelBits_ )
+      , variableSampleLocations( variableSampleLocations_ )
     {
     }
 
@@ -111405,11 +80211,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSampleLocationsPropertiesEXT & operator=( PhysicalDeviceSampleLocationsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSampleLocationsPropertiesEXT & operator=( VkPhysicalDeviceSampleLocationsPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSampleLocationsPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSampleLocationsPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -111423,24 +80229,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSampleLocationsPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceSampleLocationsPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSampleLocationsPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceSampleLocationsPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSampleLocationsPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               SampleCountFlags const &,
-               Extent2D const &,
-               ArrayWrapper1D<float, 2> const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2> const &,
                uint32_t const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -111474,31 +80274,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType                         = StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT;
-    void *                   pNext                         = {};
-    SampleCountFlags         sampleLocationSampleCounts    = {};
-    Extent2D                 maxSampleLocationGridSize     = {};
-    ArrayWrapper1D<float, 2> sampleLocationCoordinateRange = {};
-    uint32_t                 sampleLocationSubPixelBits    = {};
-    Bool32                   variableSampleLocations       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                         = StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT;
+    void *                                         pNext                         = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags         sampleLocationSampleCounts    = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                 maxSampleLocationGridSize     = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<float, 2> sampleLocationCoordinateRange = {};
+    uint32_t                                       sampleLocationSubPixelBits    = {};
+    VULKAN_HPP_NAMESPACE::Bool32                   variableSampleLocations       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSampleLocationsPropertiesEXT>
-  {
-    using Type = PhysicalDeviceSampleLocationsPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT>
   {
     using Type = PhysicalDeviceSampleLocationsPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSamplerFilterMinmaxProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSamplerFilterMinmaxProperties.html
   struct PhysicalDeviceSamplerFilterMinmaxProperties
   {
     using NativeType = VkPhysicalDeviceSamplerFilterMinmaxProperties;
@@ -111506,13 +80296,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSamplerFilterMinmaxProperties( Bool32 filterMinmaxSingleComponentFormats_ = {},
-                                                                      Bool32 filterMinmaxImageComponentMapping_  = {},
-                                                                      void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , filterMinmaxSingleComponentFormats{ filterMinmaxSingleComponentFormats_ }
-      , filterMinmaxImageComponentMapping{ filterMinmaxImageComponentMapping_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSamplerFilterMinmaxProperties( VULKAN_HPP_NAMESPACE::Bool32 filterMinmaxSingleComponentFormats_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 filterMinmaxImageComponentMapping_  = {},
+                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , filterMinmaxSingleComponentFormats( filterMinmaxSingleComponentFormats_ )
+      , filterMinmaxImageComponentMapping( filterMinmaxImageComponentMapping_ )
     {
     }
 
@@ -111524,11 +80314,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSamplerFilterMinmaxProperties & operator=( PhysicalDeviceSamplerFilterMinmaxProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSamplerFilterMinmaxProperties & operator=( VkPhysicalDeviceSamplerFilterMinmaxProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSamplerFilterMinmaxProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerFilterMinmaxProperties const *>( &rhs );
       return *this;
     }
 
@@ -111542,18 +80332,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSamplerFilterMinmaxProperties *>( this );
     }
 
-    operator VkPhysicalDeviceSamplerFilterMinmaxProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSamplerFilterMinmaxProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSamplerFilterMinmaxProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSamplerFilterMinmaxProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, filterMinmaxSingleComponentFormats, filterMinmaxImageComponentMapping );
     }
@@ -111579,20 +80364,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties;
-    void *        pNext                              = {};
-    Bool32        filterMinmaxSingleComponentFormats = {};
-    Bool32        filterMinmaxImageComponentMapping  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        filterMinmaxSingleComponentFormats = {};
+    VULKAN_HPP_NAMESPACE::Bool32        filterMinmaxImageComponentMapping  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSamplerFilterMinmaxProperties>
-  {
-    using Type = PhysicalDeviceSamplerFilterMinmaxProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties>
   {
@@ -111601,8 +80378,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSamplerFilterMinmaxPropertiesEXT = PhysicalDeviceSamplerFilterMinmaxProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceSamplerYcbcrConversionFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSamplerYcbcrConversionFeatures.html
   struct PhysicalDeviceSamplerYcbcrConversionFeatures
   {
     using NativeType = VkPhysicalDeviceSamplerYcbcrConversionFeatures;
@@ -111610,10 +80385,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSamplerYcbcrConversionFeatures( Bool32 samplerYcbcrConversion_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , samplerYcbcrConversion{ samplerYcbcrConversion_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSamplerYcbcrConversionFeatures( VULKAN_HPP_NAMESPACE::Bool32 samplerYcbcrConversion_ = {},
+                                                                       void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , samplerYcbcrConversion( samplerYcbcrConversion_ )
     {
     }
 
@@ -111625,27 +80401,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSamplerYcbcrConversionFeatures & operator=( PhysicalDeviceSamplerYcbcrConversionFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSamplerYcbcrConversionFeatures & operator=( VkPhysicalDeviceSamplerYcbcrConversionFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSamplerYcbcrConversionFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSamplerYcbcrConversionFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSamplerYcbcrConversionFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSamplerYcbcrConversionFeatures & setSamplerYcbcrConversion( Bool32 samplerYcbcrConversion_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSamplerYcbcrConversionFeatures &
+      setSamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::Bool32 samplerYcbcrConversion_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerYcbcrConversion = samplerYcbcrConversion_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSamplerYcbcrConversionFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -111657,18 +80434,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSamplerYcbcrConversionFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceSamplerYcbcrConversionFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSamplerYcbcrConversionFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceSamplerYcbcrConversionFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSamplerYcbcrConversionFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, samplerYcbcrConversion );
     }
@@ -111693,19 +80465,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures;
-    void *        pNext                  = {};
-    Bool32        samplerYcbcrConversion = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures;
+    void *                              pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        samplerYcbcrConversion = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSamplerYcbcrConversionFeatures>
-  {
-    using Type = PhysicalDeviceSamplerYcbcrConversionFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures>
   {
@@ -111714,8 +80478,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSamplerYcbcrConversionFeaturesKHR = PhysicalDeviceSamplerYcbcrConversionFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceScalarBlockLayoutFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceScalarBlockLayoutFeatures.html
   struct PhysicalDeviceScalarBlockLayoutFeatures
   {
     using NativeType = VkPhysicalDeviceScalarBlockLayoutFeatures;
@@ -111723,10 +80485,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceScalarBlockLayoutFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceScalarBlockLayoutFeatures( Bool32 scalarBlockLayout_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , scalarBlockLayout{ scalarBlockLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceScalarBlockLayoutFeatures( VULKAN_HPP_NAMESPACE::Bool32 scalarBlockLayout_ = {},
+                                                                  void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , scalarBlockLayout( scalarBlockLayout_ )
     {
     }
 
@@ -111738,27 +80501,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceScalarBlockLayoutFeatures & operator=( PhysicalDeviceScalarBlockLayoutFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceScalarBlockLayoutFeatures & operator=( VkPhysicalDeviceScalarBlockLayoutFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceScalarBlockLayoutFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceScalarBlockLayoutFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceScalarBlockLayoutFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceScalarBlockLayoutFeatures & setScalarBlockLayout( Bool32 scalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceScalarBlockLayoutFeatures &
+      setScalarBlockLayout( VULKAN_HPP_NAMESPACE::Bool32 scalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       scalarBlockLayout = scalarBlockLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceScalarBlockLayoutFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -111770,18 +80534,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceScalarBlockLayoutFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceScalarBlockLayoutFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceScalarBlockLayoutFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceScalarBlockLayoutFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceScalarBlockLayoutFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, scalarBlockLayout );
     }
@@ -111806,19 +80565,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceScalarBlockLayoutFeatures;
-    void *        pNext             = {};
-    Bool32        scalarBlockLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceScalarBlockLayoutFeatures;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        scalarBlockLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceScalarBlockLayoutFeatures>
-  {
-    using Type = PhysicalDeviceScalarBlockLayoutFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceScalarBlockLayoutFeatures>
   {
@@ -111827,8 +80578,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceScalarBlockLayoutFeaturesEXT = PhysicalDeviceScalarBlockLayoutFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceSchedulingControlsFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSchedulingControlsFeaturesARM.html
   struct PhysicalDeviceSchedulingControlsFeaturesARM
   {
     using NativeType = VkPhysicalDeviceSchedulingControlsFeaturesARM;
@@ -111836,10 +80585,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSchedulingControlsFeaturesARM( Bool32 schedulingControls_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , schedulingControls{ schedulingControls_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSchedulingControlsFeaturesARM( VULKAN_HPP_NAMESPACE::Bool32 schedulingControls_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , schedulingControls( schedulingControls_ )
     {
     }
 
@@ -111851,27 +80601,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSchedulingControlsFeaturesARM & operator=( PhysicalDeviceSchedulingControlsFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSchedulingControlsFeaturesARM & operator=( VkPhysicalDeviceSchedulingControlsFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSchedulingControlsFeaturesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFeaturesARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSchedulingControlsFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSchedulingControlsFeaturesARM & setSchedulingControls( Bool32 schedulingControls_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSchedulingControlsFeaturesARM &
+      setSchedulingControls( VULKAN_HPP_NAMESPACE::Bool32 schedulingControls_ ) VULKAN_HPP_NOEXCEPT
     {
       schedulingControls = schedulingControls_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSchedulingControlsFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -111883,18 +80634,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSchedulingControlsFeaturesARM *>( this );
     }
 
-    operator VkPhysicalDeviceSchedulingControlsFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSchedulingControlsFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceSchedulingControlsFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSchedulingControlsFeaturesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, schedulingControls );
     }
@@ -111919,27 +80665,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM;
-    void *        pNext              = {};
-    Bool32        schedulingControls = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        schedulingControls = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSchedulingControlsFeaturesARM>
-  {
-    using Type = PhysicalDeviceSchedulingControlsFeaturesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM>
   {
     using Type = PhysicalDeviceSchedulingControlsFeaturesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSchedulingControlsPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSchedulingControlsPropertiesARM.html
   struct PhysicalDeviceSchedulingControlsPropertiesARM
   {
     using NativeType = VkPhysicalDeviceSchedulingControlsPropertiesARM;
@@ -111947,11 +80683,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSchedulingControlsPropertiesARM( PhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags_ = {},
-                                                                        void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , schedulingControlsFlags{ schedulingControlsFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceSchedulingControlsPropertiesARM( VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags_ = {},
+                                                     void *                                                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , schedulingControlsFlags( schedulingControlsFlags_ )
     {
     }
 
@@ -111964,14 +80701,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSchedulingControlsPropertiesARM & operator=( PhysicalDeviceSchedulingControlsPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSchedulingControlsPropertiesARM & operator=( VkPhysicalDeviceSchedulingControlsPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSchedulingControlsPropertiesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsPropertiesARM const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSchedulingControlsPropertiesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSchedulingControlsPropertiesARM &
+      setSchedulingControlsFlags( VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags_ ) VULKAN_HPP_NOEXCEPT
+    {
+      schedulingControlsFlags = schedulingControlsFlags_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceSchedulingControlsPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceSchedulingControlsPropertiesARM *>( this );
@@ -111982,18 +80734,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSchedulingControlsPropertiesARM *>( this );
     }
 
-    operator VkPhysicalDeviceSchedulingControlsPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSchedulingControlsPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceSchedulingControlsPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSchedulingControlsPropertiesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PhysicalDeviceSchedulingControlsFlagsARM const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagsARM const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, schedulingControlsFlags );
     }
@@ -112018,27 +80765,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                            sType                   = StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM;
-    void *                                   pNext                   = {};
-    PhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                            sType                   = StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM;
+    void *                                                         pNext                   = {};
+    VULKAN_HPP_NAMESPACE::PhysicalDeviceSchedulingControlsFlagsARM schedulingControlsFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSchedulingControlsPropertiesARM>
-  {
-    using Type = PhysicalDeviceSchedulingControlsPropertiesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM>
   {
     using Type = PhysicalDeviceSchedulingControlsPropertiesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures.html
   struct PhysicalDeviceSeparateDepthStencilLayoutsFeatures
   {
     using NativeType = VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures;
@@ -112046,11 +80783,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSeparateDepthStencilLayoutsFeatures( Bool32 separateDepthStencilLayouts_ = {},
-                                                                            void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , separateDepthStencilLayouts{ separateDepthStencilLayouts_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSeparateDepthStencilLayoutsFeatures( VULKAN_HPP_NAMESPACE::Bool32 separateDepthStencilLayouts_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , separateDepthStencilLayouts( separateDepthStencilLayouts_ )
     {
     }
 
@@ -112064,15 +80801,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceSeparateDepthStencilLayoutsFeatures &
       operator=( PhysicalDeviceSeparateDepthStencilLayoutsFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSeparateDepthStencilLayoutsFeatures & operator=( VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSeparateDepthStencilLayoutsFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSeparateDepthStencilLayoutsFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSeparateDepthStencilLayoutsFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -112080,12 +80817,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSeparateDepthStencilLayoutsFeatures &
-      setSeparateDepthStencilLayouts( Bool32 separateDepthStencilLayouts_ ) VULKAN_HPP_NOEXCEPT
+      setSeparateDepthStencilLayouts( VULKAN_HPP_NAMESPACE::Bool32 separateDepthStencilLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       separateDepthStencilLayouts = separateDepthStencilLayouts_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -112097,18 +80834,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, separateDepthStencilLayouts );
     }
@@ -112133,19 +80865,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures;
-    void *        pNext                       = {};
-    Bool32        separateDepthStencilLayouts = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        separateDepthStencilLayouts = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures>
-  {
-    using Type = PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures>
   {
@@ -112154,119 +80878,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR = PhysicalDeviceSeparateDepthStencilLayoutsFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShader64BitIndexingFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShader64BitIndexingFeaturesEXT.html
-  struct PhysicalDeviceShader64BitIndexingFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceShader64BitIndexingFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShader64BitIndexingFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShader64BitIndexingFeaturesEXT( Bool32 shader64BitIndexing_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shader64BitIndexing{ shader64BitIndexing_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShader64BitIndexingFeaturesEXT( PhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShader64BitIndexingFeaturesEXT( VkPhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShader64BitIndexingFeaturesEXT( *reinterpret_cast<PhysicalDeviceShader64BitIndexingFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShader64BitIndexingFeaturesEXT & operator=( PhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShader64BitIndexingFeaturesEXT & operator=( VkPhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShader64BitIndexingFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShader64BitIndexingFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShader64BitIndexingFeaturesEXT & setShader64BitIndexing( Bool32 shader64BitIndexing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shader64BitIndexing = shader64BitIndexing_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShader64BitIndexingFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShader64BitIndexingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShader64BitIndexingFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShader64BitIndexingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShader64BitIndexingFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShader64BitIndexingFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShader64BitIndexingFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShader64BitIndexingFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shader64BitIndexing );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShader64BitIndexingFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shader64BitIndexing == rhs.shader64BitIndexing );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShader64BitIndexingFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType               = StructureType::ePhysicalDeviceShader64BitIndexingFeaturesEXT;
-    void *        pNext               = {};
-    Bool32        shader64BitIndexing = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShader64BitIndexingFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShader64BitIndexingFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShader64BitIndexingFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShader64BitIndexingFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV.html
   struct PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV
   {
     using NativeType = VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
@@ -112274,11 +80885,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV( Bool32 shaderFloat16VectorAtomics_ = {},
-                                                                            void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderFloat16VectorAtomics{ shaderFloat16VectorAtomics_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16VectorAtomics_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderFloat16VectorAtomics( shaderFloat16VectorAtomics_ )
     {
     }
 
@@ -112292,15 +80903,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV &
       operator=( PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV & operator=( VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -112308,12 +80919,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV &
-      setShaderFloat16VectorAtomics( Bool32 shaderFloat16VectorAtomics_ ) VULKAN_HPP_NOEXCEPT
+      setShaderFloat16VectorAtomics( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16VectorAtomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderFloat16VectorAtomics = shaderFloat16VectorAtomics_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -112325,18 +80936,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderFloat16VectorAtomics );
     }
@@ -112361,27 +80967,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
-    void *        pNext                      = {};
-    Bool32        shaderFloat16VectorAtomics = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderFloat16VectorAtomics = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>
-  {
-    using Type = PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>
   {
     using Type = PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT.html
   struct PhysicalDeviceShaderAtomicFloat2FeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT;
@@ -112389,33 +80985,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloat2FeaturesEXT( Bool32 shaderBufferFloat16Atomics_      = {},
-                                                                      Bool32 shaderBufferFloat16AtomicAdd_    = {},
-                                                                      Bool32 shaderBufferFloat16AtomicMinMax_ = {},
-                                                                      Bool32 shaderBufferFloat32AtomicMinMax_ = {},
-                                                                      Bool32 shaderBufferFloat64AtomicMinMax_ = {},
-                                                                      Bool32 shaderSharedFloat16Atomics_      = {},
-                                                                      Bool32 shaderSharedFloat16AtomicAdd_    = {},
-                                                                      Bool32 shaderSharedFloat16AtomicMinMax_ = {},
-                                                                      Bool32 shaderSharedFloat32AtomicMinMax_ = {},
-                                                                      Bool32 shaderSharedFloat64AtomicMinMax_ = {},
-                                                                      Bool32 shaderImageFloat32AtomicMinMax_  = {},
-                                                                      Bool32 sparseImageFloat32AtomicMinMax_  = {},
-                                                                      void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderBufferFloat16Atomics{ shaderBufferFloat16Atomics_ }
-      , shaderBufferFloat16AtomicAdd{ shaderBufferFloat16AtomicAdd_ }
-      , shaderBufferFloat16AtomicMinMax{ shaderBufferFloat16AtomicMinMax_ }
-      , shaderBufferFloat32AtomicMinMax{ shaderBufferFloat32AtomicMinMax_ }
-      , shaderBufferFloat64AtomicMinMax{ shaderBufferFloat64AtomicMinMax_ }
-      , shaderSharedFloat16Atomics{ shaderSharedFloat16Atomics_ }
-      , shaderSharedFloat16AtomicAdd{ shaderSharedFloat16AtomicAdd_ }
-      , shaderSharedFloat16AtomicMinMax{ shaderSharedFloat16AtomicMinMax_ }
-      , shaderSharedFloat32AtomicMinMax{ shaderSharedFloat32AtomicMinMax_ }
-      , shaderSharedFloat64AtomicMinMax{ shaderSharedFloat64AtomicMinMax_ }
-      , shaderImageFloat32AtomicMinMax{ shaderImageFloat32AtomicMinMax_ }
-      , sparseImageFloat32AtomicMinMax{ sparseImageFloat32AtomicMinMax_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloat2FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16Atomics_      = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16AtomicAdd_    = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16Atomics_      = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16AtomicAdd_    = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64AtomicMinMax_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32AtomicMinMax_  = {},
+                                                                      VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32AtomicMinMax_  = {},
+                                                                      void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderBufferFloat16Atomics( shaderBufferFloat16Atomics_ )
+      , shaderBufferFloat16AtomicAdd( shaderBufferFloat16AtomicAdd_ )
+      , shaderBufferFloat16AtomicMinMax( shaderBufferFloat16AtomicMinMax_ )
+      , shaderBufferFloat32AtomicMinMax( shaderBufferFloat32AtomicMinMax_ )
+      , shaderBufferFloat64AtomicMinMax( shaderBufferFloat64AtomicMinMax_ )
+      , shaderSharedFloat16Atomics( shaderSharedFloat16Atomics_ )
+      , shaderSharedFloat16AtomicAdd( shaderSharedFloat16AtomicAdd_ )
+      , shaderSharedFloat16AtomicMinMax( shaderSharedFloat16AtomicMinMax_ )
+      , shaderSharedFloat32AtomicMinMax( shaderSharedFloat32AtomicMinMax_ )
+      , shaderSharedFloat64AtomicMinMax( shaderSharedFloat64AtomicMinMax_ )
+      , shaderImageFloat32AtomicMinMax( shaderImageFloat32AtomicMinMax_ )
+      , sparseImageFloat32AtomicMinMax( sparseImageFloat32AtomicMinMax_ )
     {
     }
 
@@ -112427,15 +81023,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderAtomicFloat2FeaturesEXT & operator=( PhysicalDeviceShaderAtomicFloat2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderAtomicFloat2FeaturesEXT & operator=( VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderAtomicFloat2FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloat2FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -112443,89 +81039,89 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderBufferFloat16Atomics( Bool32 shaderBufferFloat16Atomics_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat16Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat16Atomics = shaderBufferFloat16Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderBufferFloat16AtomicAdd( Bool32 shaderBufferFloat16AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat16AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat16AtomicAdd = shaderBufferFloat16AtomicAdd_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderBufferFloat16AtomicMinMax( Bool32 shaderBufferFloat16AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat16AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat16AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat16AtomicMinMax = shaderBufferFloat16AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderBufferFloat32AtomicMinMax( Bool32 shaderBufferFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat32AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat32AtomicMinMax = shaderBufferFloat32AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderBufferFloat64AtomicMinMax( Bool32 shaderBufferFloat64AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat64AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat64AtomicMinMax = shaderBufferFloat64AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderSharedFloat16Atomics( Bool32 shaderSharedFloat16Atomics_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat16Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat16Atomics = shaderSharedFloat16Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderSharedFloat16AtomicAdd( Bool32 shaderSharedFloat16AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat16AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat16AtomicAdd = shaderSharedFloat16AtomicAdd_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderSharedFloat16AtomicMinMax( Bool32 shaderSharedFloat16AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat16AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat16AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat16AtomicMinMax = shaderSharedFloat16AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderSharedFloat32AtomicMinMax( Bool32 shaderSharedFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat32AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat32AtomicMinMax = shaderSharedFloat32AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderSharedFloat64AtomicMinMax( Bool32 shaderSharedFloat64AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat64AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat64AtomicMinMax = shaderSharedFloat64AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setShaderImageFloat32AtomicMinMax( Bool32 shaderImageFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setShaderImageFloat32AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderImageFloat32AtomicMinMax = shaderImageFloat32AtomicMinMax_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloat2FeaturesEXT &
-      setSparseImageFloat32AtomicMinMax( Bool32 sparseImageFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
+      setSparseImageFloat32AtomicMinMax( VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32AtomicMinMax_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseImageFloat32AtomicMinMax = sparseImageFloat32AtomicMinMax_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -112537,31 +81133,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -112610,38 +81200,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                           = StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT;
-    void *        pNext                           = {};
-    Bool32        shaderBufferFloat16Atomics      = {};
-    Bool32        shaderBufferFloat16AtomicAdd    = {};
-    Bool32        shaderBufferFloat16AtomicMinMax = {};
-    Bool32        shaderBufferFloat32AtomicMinMax = {};
-    Bool32        shaderBufferFloat64AtomicMinMax = {};
-    Bool32        shaderSharedFloat16Atomics      = {};
-    Bool32        shaderSharedFloat16AtomicAdd    = {};
-    Bool32        shaderSharedFloat16AtomicMinMax = {};
-    Bool32        shaderSharedFloat32AtomicMinMax = {};
-    Bool32        shaderSharedFloat64AtomicMinMax = {};
-    Bool32        shaderImageFloat32AtomicMinMax  = {};
-    Bool32        sparseImageFloat32AtomicMinMax  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT;
+    void *                              pNext                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat16Atomics      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat16AtomicAdd    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat16AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat32AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat64AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat16Atomics      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat16AtomicAdd    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat16AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat32AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat64AtomicMinMax = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderImageFloat32AtomicMinMax  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        sparseImageFloat32AtomicMinMax  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderAtomicFloat2FeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT>
   {
     using Type = PhysicalDeviceShaderAtomicFloat2FeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderAtomicFloatFeaturesEXT.html
   struct PhysicalDeviceShaderAtomicFloatFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderAtomicFloatFeaturesEXT;
@@ -112649,33 +81229,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloatFeaturesEXT( Bool32 shaderBufferFloat32Atomics_   = {},
-                                                                     Bool32 shaderBufferFloat32AtomicAdd_ = {},
-                                                                     Bool32 shaderBufferFloat64Atomics_   = {},
-                                                                     Bool32 shaderBufferFloat64AtomicAdd_ = {},
-                                                                     Bool32 shaderSharedFloat32Atomics_   = {},
-                                                                     Bool32 shaderSharedFloat32AtomicAdd_ = {},
-                                                                     Bool32 shaderSharedFloat64Atomics_   = {},
-                                                                     Bool32 shaderSharedFloat64AtomicAdd_ = {},
-                                                                     Bool32 shaderImageFloat32Atomics_    = {},
-                                                                     Bool32 shaderImageFloat32AtomicAdd_  = {},
-                                                                     Bool32 sparseImageFloat32Atomics_    = {},
-                                                                     Bool32 sparseImageFloat32AtomicAdd_  = {},
-                                                                     void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderBufferFloat32Atomics{ shaderBufferFloat32Atomics_ }
-      , shaderBufferFloat32AtomicAdd{ shaderBufferFloat32AtomicAdd_ }
-      , shaderBufferFloat64Atomics{ shaderBufferFloat64Atomics_ }
-      , shaderBufferFloat64AtomicAdd{ shaderBufferFloat64AtomicAdd_ }
-      , shaderSharedFloat32Atomics{ shaderSharedFloat32Atomics_ }
-      , shaderSharedFloat32AtomicAdd{ shaderSharedFloat32AtomicAdd_ }
-      , shaderSharedFloat64Atomics{ shaderSharedFloat64Atomics_ }
-      , shaderSharedFloat64AtomicAdd{ shaderSharedFloat64AtomicAdd_ }
-      , shaderImageFloat32Atomics{ shaderImageFloat32Atomics_ }
-      , shaderImageFloat32AtomicAdd{ shaderImageFloat32AtomicAdd_ }
-      , sparseImageFloat32Atomics{ sparseImageFloat32Atomics_ }
-      , sparseImageFloat32AtomicAdd{ sparseImageFloat32AtomicAdd_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicFloatFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32Atomics_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32AtomicAdd_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64Atomics_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64AtomicAdd_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32Atomics_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32AtomicAdd_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64Atomics_   = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64AtomicAdd_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32Atomics_    = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32AtomicAdd_  = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32Atomics_    = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32AtomicAdd_  = {},
+                                                                     void *                       pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderBufferFloat32Atomics( shaderBufferFloat32Atomics_ )
+      , shaderBufferFloat32AtomicAdd( shaderBufferFloat32AtomicAdd_ )
+      , shaderBufferFloat64Atomics( shaderBufferFloat64Atomics_ )
+      , shaderBufferFloat64AtomicAdd( shaderBufferFloat64AtomicAdd_ )
+      , shaderSharedFloat32Atomics( shaderSharedFloat32Atomics_ )
+      , shaderSharedFloat32AtomicAdd( shaderSharedFloat32AtomicAdd_ )
+      , shaderSharedFloat64Atomics( shaderSharedFloat64Atomics_ )
+      , shaderSharedFloat64AtomicAdd( shaderSharedFloat64AtomicAdd_ )
+      , shaderImageFloat32Atomics( shaderImageFloat32Atomics_ )
+      , shaderImageFloat32AtomicAdd( shaderImageFloat32AtomicAdd_ )
+      , sparseImageFloat32Atomics( sparseImageFloat32Atomics_ )
+      , sparseImageFloat32AtomicAdd( sparseImageFloat32AtomicAdd_ )
     {
     }
 
@@ -112687,99 +81267,105 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderAtomicFloatFeaturesEXT & operator=( PhysicalDeviceShaderAtomicFloatFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderAtomicFloatFeaturesEXT & operator=( VkPhysicalDeviceShaderAtomicFloatFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderAtomicFloatFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicFloatFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setShaderBufferFloat32Atomics( Bool32 shaderBufferFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setShaderBufferFloat32Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat32Atomics = shaderBufferFloat32Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setShaderBufferFloat32AtomicAdd( Bool32 shaderBufferFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat32AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat32AtomicAdd = shaderBufferFloat32AtomicAdd_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setShaderBufferFloat64Atomics( Bool32 shaderBufferFloat64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setShaderBufferFloat64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat64Atomics = shaderBufferFloat64Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setShaderBufferFloat64AtomicAdd( Bool32 shaderBufferFloat64AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderBufferFloat64AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferFloat64AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferFloat64AtomicAdd = shaderBufferFloat64AtomicAdd_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setShaderSharedFloat32Atomics( Bool32 shaderSharedFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setShaderSharedFloat32Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat32Atomics = shaderSharedFloat32Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setShaderSharedFloat32AtomicAdd( Bool32 shaderSharedFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat32AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat32AtomicAdd = shaderSharedFloat32AtomicAdd_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setShaderSharedFloat64Atomics( Bool32 shaderSharedFloat64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setShaderSharedFloat64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat64Atomics = shaderSharedFloat64Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setShaderSharedFloat64AtomicAdd( Bool32 shaderSharedFloat64AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSharedFloat64AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedFloat64AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedFloat64AtomicAdd = shaderSharedFloat64AtomicAdd_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setShaderImageFloat32Atomics( Bool32 shaderImageFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setShaderImageFloat32Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderImageFloat32Atomics = shaderImageFloat32Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setShaderImageFloat32AtomicAdd( Bool32 shaderImageFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setShaderImageFloat32AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 shaderImageFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderImageFloat32AtomicAdd = shaderImageFloat32AtomicAdd_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT & setSparseImageFloat32Atomics( Bool32 sparseImageFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
+      setSparseImageFloat32Atomics( VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseImageFloat32Atomics = sparseImageFloat32Atomics_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicFloatFeaturesEXT &
-      setSparseImageFloat32AtomicAdd( Bool32 sparseImageFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
+      setSparseImageFloat32AtomicAdd( VULKAN_HPP_NAMESPACE::Bool32 sparseImageFloat32AtomicAdd_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseImageFloat32AtomicAdd = sparseImageFloat32AtomicAdd_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderAtomicFloatFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -112791,31 +81377,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderAtomicFloatFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderAtomicFloatFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloatFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderAtomicFloatFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderAtomicFloatFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -112860,38 +81440,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT;
-    void *        pNext                        = {};
-    Bool32        shaderBufferFloat32Atomics   = {};
-    Bool32        shaderBufferFloat32AtomicAdd = {};
-    Bool32        shaderBufferFloat64Atomics   = {};
-    Bool32        shaderBufferFloat64AtomicAdd = {};
-    Bool32        shaderSharedFloat32Atomics   = {};
-    Bool32        shaderSharedFloat32AtomicAdd = {};
-    Bool32        shaderSharedFloat64Atomics   = {};
-    Bool32        shaderSharedFloat64AtomicAdd = {};
-    Bool32        shaderImageFloat32Atomics    = {};
-    Bool32        shaderImageFloat32AtomicAdd  = {};
-    Bool32        sparseImageFloat32Atomics    = {};
-    Bool32        sparseImageFloat32AtomicAdd  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat32Atomics   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat32AtomicAdd = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat64Atomics   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferFloat64AtomicAdd = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat32Atomics   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat32AtomicAdd = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat64Atomics   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedFloat64AtomicAdd = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderImageFloat32Atomics    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderImageFloat32AtomicAdd  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        sparseImageFloat32Atomics    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        sparseImageFloat32AtomicAdd  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderAtomicFloatFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderAtomicFloatFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT>
   {
     using Type = PhysicalDeviceShaderAtomicFloatFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderAtomicInt64Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderAtomicInt64Features.html
   struct PhysicalDeviceShaderAtomicInt64Features
   {
     using NativeType = VkPhysicalDeviceShaderAtomicInt64Features;
@@ -112899,13 +81469,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderAtomicInt64Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicInt64Features( Bool32 shaderBufferInt64Atomics_ = {},
-                                                                  Bool32 shaderSharedInt64Atomics_ = {},
-                                                                  void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderBufferInt64Atomics{ shaderBufferInt64Atomics_ }
-      , shaderSharedInt64Atomics{ shaderSharedInt64Atomics_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderAtomicInt64Features( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferInt64Atomics_ = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 shaderSharedInt64Atomics_ = {},
+                                                                  void *                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderBufferInt64Atomics( shaderBufferInt64Atomics_ )
+      , shaderSharedInt64Atomics( shaderSharedInt64Atomics_ )
     {
     }
 
@@ -112917,33 +81487,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderAtomicInt64Features & operator=( PhysicalDeviceShaderAtomicInt64Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderAtomicInt64Features & operator=( VkPhysicalDeviceShaderAtomicInt64Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderAtomicInt64Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderAtomicInt64Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicInt64Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicInt64Features & setShaderBufferInt64Atomics( Bool32 shaderBufferInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicInt64Features &
+      setShaderBufferInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferInt64Atomics = shaderBufferInt64Atomics_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicInt64Features & setShaderSharedInt64Atomics( Bool32 shaderSharedInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderAtomicInt64Features &
+      setShaderSharedInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedInt64Atomics = shaderSharedInt64Atomics_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderAtomicInt64Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -112955,18 +81527,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderAtomicInt64Features *>( this );
     }
 
-    operator VkPhysicalDeviceShaderAtomicInt64Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderAtomicInt64Features *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderAtomicInt64Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderAtomicInt64Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderBufferInt64Atomics, shaderSharedInt64Atomics );
     }
@@ -112992,20 +81559,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::ePhysicalDeviceShaderAtomicInt64Features;
-    void *        pNext                    = {};
-    Bool32        shaderBufferInt64Atomics = {};
-    Bool32        shaderSharedInt64Atomics = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::ePhysicalDeviceShaderAtomicInt64Features;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferInt64Atomics = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedInt64Atomics = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderAtomicInt64Features>
-  {
-    using Type = PhysicalDeviceShaderAtomicInt64Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderAtomicInt64Features>
   {
@@ -113014,140 +81573,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderAtomicInt64FeaturesKHR = PhysicalDeviceShaderAtomicInt64Features;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderBfloat16FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderBfloat16FeaturesKHR.html
-  struct PhysicalDeviceShaderBfloat16FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceShaderBfloat16FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderBfloat16FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderBfloat16FeaturesKHR( Bool32 shaderBFloat16Type_              = {},
-                                                                  Bool32 shaderBFloat16DotProduct_        = {},
-                                                                  Bool32 shaderBFloat16CooperativeMatrix_ = {},
-                                                                  void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderBFloat16Type{ shaderBFloat16Type_ }
-      , shaderBFloat16DotProduct{ shaderBFloat16DotProduct_ }
-      , shaderBFloat16CooperativeMatrix{ shaderBFloat16CooperativeMatrix_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderBfloat16FeaturesKHR( PhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderBfloat16FeaturesKHR( VkPhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderBfloat16FeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderBfloat16FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderBfloat16FeaturesKHR & operator=( PhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderBfloat16FeaturesKHR & operator=( VkPhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderBfloat16FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderBfloat16FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderBfloat16FeaturesKHR & setShaderBFloat16Type( Bool32 shaderBFloat16Type_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderBFloat16Type = shaderBFloat16Type_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderBfloat16FeaturesKHR & setShaderBFloat16DotProduct( Bool32 shaderBFloat16DotProduct_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderBFloat16DotProduct = shaderBFloat16DotProduct_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderBfloat16FeaturesKHR &
-      setShaderBFloat16CooperativeMatrix( Bool32 shaderBFloat16CooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderBFloat16CooperativeMatrix = shaderBFloat16CooperativeMatrix_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderBfloat16FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderBfloat16FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderBfloat16FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderBfloat16FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderBfloat16FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderBfloat16FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderBfloat16FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderBfloat16FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderBFloat16Type, shaderBFloat16DotProduct, shaderBFloat16CooperativeMatrix );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderBfloat16FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderBFloat16Type == rhs.shaderBFloat16Type ) &&
-             ( shaderBFloat16DotProduct == rhs.shaderBFloat16DotProduct ) && ( shaderBFloat16CooperativeMatrix == rhs.shaderBFloat16CooperativeMatrix );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderBfloat16FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                           = StructureType::ePhysicalDeviceShaderBfloat16FeaturesKHR;
-    void *        pNext                           = {};
-    Bool32        shaderBFloat16Type              = {};
-    Bool32        shaderBFloat16DotProduct        = {};
-    Bool32        shaderBFloat16CooperativeMatrix = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderBfloat16FeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderBfloat16FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderBfloat16FeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderBfloat16FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderClockFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderClockFeaturesKHR.html
   struct PhysicalDeviceShaderClockFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceShaderClockFeaturesKHR;
@@ -113155,12 +81580,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderClockFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderClockFeaturesKHR( Bool32 shaderSubgroupClock_ = {}, Bool32 shaderDeviceClock_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSubgroupClock{ shaderSubgroupClock_ }
-      , shaderDeviceClock{ shaderDeviceClock_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderClockFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupClock_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Bool32 shaderDeviceClock_   = {},
+                                                               void *                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderSubgroupClock( shaderSubgroupClock_ )
+      , shaderDeviceClock( shaderDeviceClock_ )
     {
     }
 
@@ -113172,33 +81598,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderClockFeaturesKHR & operator=( PhysicalDeviceShaderClockFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderClockFeaturesKHR & operator=( VkPhysicalDeviceShaderClockFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderClockFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderClockFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderClockFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderClockFeaturesKHR & setShaderSubgroupClock( Bool32 shaderSubgroupClock_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderClockFeaturesKHR &
+      setShaderSubgroupClock( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupClock_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupClock = shaderSubgroupClock_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderClockFeaturesKHR & setShaderDeviceClock( Bool32 shaderDeviceClock_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderClockFeaturesKHR & setShaderDeviceClock( VULKAN_HPP_NAMESPACE::Bool32 shaderDeviceClock_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderDeviceClock = shaderDeviceClock_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderClockFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -113210,18 +81637,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderClockFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderClockFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderClockFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderClockFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderClockFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSubgroupClock, shaderDeviceClock );
     }
@@ -113247,28 +81669,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::ePhysicalDeviceShaderClockFeaturesKHR;
-    void *        pNext               = {};
-    Bool32        shaderSubgroupClock = {};
-    Bool32        shaderDeviceClock   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::ePhysicalDeviceShaderClockFeaturesKHR;
+    void *                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupClock = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderDeviceClock   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderClockFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderClockFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderClockFeaturesKHR>
   {
     using Type = PhysicalDeviceShaderClockFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM.html
   struct PhysicalDeviceShaderCoreBuiltinsFeaturesARM
   {
     using NativeType = VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM;
@@ -113276,10 +81688,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCoreBuiltinsFeaturesARM( Bool32 shaderCoreBuiltins_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCoreBuiltins{ shaderCoreBuiltins_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCoreBuiltinsFeaturesARM( VULKAN_HPP_NAMESPACE::Bool32 shaderCoreBuiltins_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderCoreBuiltins( shaderCoreBuiltins_ )
     {
     }
 
@@ -113291,27 +81704,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderCoreBuiltinsFeaturesARM & operator=( PhysicalDeviceShaderCoreBuiltinsFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderCoreBuiltinsFeaturesARM & operator=( VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderCoreBuiltinsFeaturesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreBuiltinsFeaturesARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderCoreBuiltinsFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderCoreBuiltinsFeaturesARM & setShaderCoreBuiltins( Bool32 shaderCoreBuiltins_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderCoreBuiltinsFeaturesARM &
+      setShaderCoreBuiltins( VULKAN_HPP_NAMESPACE::Bool32 shaderCoreBuiltins_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderCoreBuiltins = shaderCoreBuiltins_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -113323,18 +81737,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM *>( this );
     }
 
-    operator VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderCoreBuiltins );
     }
@@ -113359,27 +81768,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM;
-    void *        pNext              = {};
-    Bool32        shaderCoreBuiltins = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderCoreBuiltins = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM>
-  {
-    using Type = PhysicalDeviceShaderCoreBuiltinsFeaturesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM>
   {
     using Type = PhysicalDeviceShaderCoreBuiltinsFeaturesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM.html
   struct PhysicalDeviceShaderCoreBuiltinsPropertiesARM
   {
     using NativeType = VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM;
@@ -113387,15 +81786,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCoreBuiltinsPropertiesARM( uint64_t shaderCoreMask_     = {},
                                                                         uint32_t shaderCoreCount_    = {},
                                                                         uint32_t shaderWarpsPerCore_ = {},
                                                                         void *   pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCoreMask{ shaderCoreMask_ }
-      , shaderCoreCount{ shaderCoreCount_ }
-      , shaderWarpsPerCore{ shaderWarpsPerCore_ }
+      : pNext( pNext_ )
+      , shaderCoreMask( shaderCoreMask_ )
+      , shaderCoreCount( shaderCoreCount_ )
+      , shaderWarpsPerCore( shaderWarpsPerCore_ )
     {
     }
 
@@ -113408,11 +81807,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderCoreBuiltinsPropertiesARM & operator=( PhysicalDeviceShaderCoreBuiltinsPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderCoreBuiltinsPropertiesARM & operator=( VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderCoreBuiltinsPropertiesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreBuiltinsPropertiesARM const *>( &rhs );
       return *this;
     }
 
@@ -113426,18 +81825,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *>( this );
     }
 
-    operator VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderCoreMask, shaderCoreCount, shaderWarpsPerCore );
     }
@@ -113463,29 +81857,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM;
-    void *        pNext              = {};
-    uint64_t      shaderCoreMask     = {};
-    uint32_t      shaderCoreCount    = {};
-    uint32_t      shaderWarpsPerCore = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM;
+    void *                              pNext              = {};
+    uint64_t                            shaderCoreMask     = {};
+    uint32_t                            shaderCoreCount    = {};
+    uint32_t                            shaderWarpsPerCore = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM>
-  {
-    using Type = PhysicalDeviceShaderCoreBuiltinsPropertiesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM>
   {
     using Type = PhysicalDeviceShaderCoreBuiltinsPropertiesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderCoreProperties2AMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderCoreProperties2AMD.html
   struct PhysicalDeviceShaderCoreProperties2AMD
   {
     using NativeType = VkPhysicalDeviceShaderCoreProperties2AMD;
@@ -113493,13 +81877,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderCoreProperties2AMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCoreProperties2AMD( ShaderCorePropertiesFlagsAMD shaderCoreFeatures_     = {},
-                                                                 uint32_t                     activeComputeUnitCount_ = {},
-                                                                 void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderCoreFeatures{ shaderCoreFeatures_ }
-      , activeComputeUnitCount{ activeComputeUnitCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCoreProperties2AMD( VULKAN_HPP_NAMESPACE::ShaderCorePropertiesFlagsAMD shaderCoreFeatures_     = {},
+                                                                 uint32_t                                           activeComputeUnitCount_ = {},
+                                                                 void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderCoreFeatures( shaderCoreFeatures_ )
+      , activeComputeUnitCount( activeComputeUnitCount_ )
     {
     }
 
@@ -113511,11 +81895,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderCoreProperties2AMD & operator=( PhysicalDeviceShaderCoreProperties2AMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderCoreProperties2AMD & operator=( VkPhysicalDeviceShaderCoreProperties2AMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderCoreProperties2AMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCoreProperties2AMD const *>( &rhs );
       return *this;
     }
 
@@ -113529,18 +81913,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderCoreProperties2AMD *>( this );
     }
 
-    operator VkPhysicalDeviceShaderCoreProperties2AMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderCoreProperties2AMD *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderCoreProperties2AMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderCoreProperties2AMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ShaderCorePropertiesFlagsAMD const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ShaderCorePropertiesFlagsAMD const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderCoreFeatures, activeComputeUnitCount );
     }
@@ -113566,28 +81945,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                  = StructureType::ePhysicalDeviceShaderCoreProperties2AMD;
-    void *                       pNext                  = {};
-    ShaderCorePropertiesFlagsAMD shaderCoreFeatures     = {};
-    uint32_t                     activeComputeUnitCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                  = StructureType::ePhysicalDeviceShaderCoreProperties2AMD;
+    void *                                             pNext                  = {};
+    VULKAN_HPP_NAMESPACE::ShaderCorePropertiesFlagsAMD shaderCoreFeatures     = {};
+    uint32_t                                           activeComputeUnitCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderCoreProperties2AMD>
-  {
-    using Type = PhysicalDeviceShaderCoreProperties2AMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderCoreProperties2AMD>
   {
     using Type = PhysicalDeviceShaderCoreProperties2AMD;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderCorePropertiesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderCorePropertiesAMD.html
   struct PhysicalDeviceShaderCorePropertiesAMD
   {
     using NativeType = VkPhysicalDeviceShaderCorePropertiesAMD;
@@ -113595,7 +81964,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderCorePropertiesAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCorePropertiesAMD( uint32_t shaderEngineCount_          = {},
                                                                 uint32_t shaderArraysPerEngineCount_ = {},
                                                                 uint32_t computeUnitsPerShaderArray_ = {},
@@ -113611,21 +81980,21 @@ namespace VULKAN_HPP_NAMESPACE
                                                                 uint32_t maxVgprAllocation_          = {},
                                                                 uint32_t vgprAllocationGranularity_  = {},
                                                                 void *   pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderEngineCount{ shaderEngineCount_ }
-      , shaderArraysPerEngineCount{ shaderArraysPerEngineCount_ }
-      , computeUnitsPerShaderArray{ computeUnitsPerShaderArray_ }
-      , simdPerComputeUnit{ simdPerComputeUnit_ }
-      , wavefrontsPerSimd{ wavefrontsPerSimd_ }
-      , wavefrontSize{ wavefrontSize_ }
-      , sgprsPerSimd{ sgprsPerSimd_ }
-      , minSgprAllocation{ minSgprAllocation_ }
-      , maxSgprAllocation{ maxSgprAllocation_ }
-      , sgprAllocationGranularity{ sgprAllocationGranularity_ }
-      , vgprsPerSimd{ vgprsPerSimd_ }
-      , minVgprAllocation{ minVgprAllocation_ }
-      , maxVgprAllocation{ maxVgprAllocation_ }
-      , vgprAllocationGranularity{ vgprAllocationGranularity_ }
+      : pNext( pNext_ )
+      , shaderEngineCount( shaderEngineCount_ )
+      , shaderArraysPerEngineCount( shaderArraysPerEngineCount_ )
+      , computeUnitsPerShaderArray( computeUnitsPerShaderArray_ )
+      , simdPerComputeUnit( simdPerComputeUnit_ )
+      , wavefrontsPerSimd( wavefrontsPerSimd_ )
+      , wavefrontSize( wavefrontSize_ )
+      , sgprsPerSimd( sgprsPerSimd_ )
+      , minSgprAllocation( minSgprAllocation_ )
+      , maxSgprAllocation( maxSgprAllocation_ )
+      , sgprAllocationGranularity( sgprAllocationGranularity_ )
+      , vgprsPerSimd( vgprsPerSimd_ )
+      , minVgprAllocation( minVgprAllocation_ )
+      , maxVgprAllocation( maxVgprAllocation_ )
+      , vgprAllocationGranularity( vgprAllocationGranularity_ )
     {
     }
 
@@ -113637,11 +82006,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderCorePropertiesAMD & operator=( PhysicalDeviceShaderCorePropertiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderCorePropertiesAMD & operator=( VkPhysicalDeviceShaderCorePropertiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderCorePropertiesAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesAMD const *>( &rhs );
       return *this;
     }
 
@@ -113655,18 +82024,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderCorePropertiesAMD *>( this );
     }
 
-    operator VkPhysicalDeviceShaderCorePropertiesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderCorePropertiesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderCorePropertiesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderCorePropertiesAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
@@ -113682,6 +82044,7 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -113728,40 +82091,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceShaderCorePropertiesAMD;
-    void *        pNext                      = {};
-    uint32_t      shaderEngineCount          = {};
-    uint32_t      shaderArraysPerEngineCount = {};
-    uint32_t      computeUnitsPerShaderArray = {};
-    uint32_t      simdPerComputeUnit         = {};
-    uint32_t      wavefrontsPerSimd          = {};
-    uint32_t      wavefrontSize              = {};
-    uint32_t      sgprsPerSimd               = {};
-    uint32_t      minSgprAllocation          = {};
-    uint32_t      maxSgprAllocation          = {};
-    uint32_t      sgprAllocationGranularity  = {};
-    uint32_t      vgprsPerSimd               = {};
-    uint32_t      minVgprAllocation          = {};
-    uint32_t      maxVgprAllocation          = {};
-    uint32_t      vgprAllocationGranularity  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceShaderCorePropertiesAMD;
+    void *                              pNext                      = {};
+    uint32_t                            shaderEngineCount          = {};
+    uint32_t                            shaderArraysPerEngineCount = {};
+    uint32_t                            computeUnitsPerShaderArray = {};
+    uint32_t                            simdPerComputeUnit         = {};
+    uint32_t                            wavefrontsPerSimd          = {};
+    uint32_t                            wavefrontSize              = {};
+    uint32_t                            sgprsPerSimd               = {};
+    uint32_t                            minSgprAllocation          = {};
+    uint32_t                            maxSgprAllocation          = {};
+    uint32_t                            sgprAllocationGranularity  = {};
+    uint32_t                            vgprsPerSimd               = {};
+    uint32_t                            minVgprAllocation          = {};
+    uint32_t                            maxVgprAllocation          = {};
+    uint32_t                            vgprAllocationGranularity  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderCorePropertiesAMD>
-  {
-    using Type = PhysicalDeviceShaderCorePropertiesAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderCorePropertiesAMD>
   {
     using Type = PhysicalDeviceShaderCorePropertiesAMD;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderCorePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderCorePropertiesARM.html
   struct PhysicalDeviceShaderCorePropertiesARM
   {
     using NativeType = VkPhysicalDeviceShaderCorePropertiesARM;
@@ -113769,15 +82122,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderCorePropertiesARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderCorePropertiesARM( uint32_t pixelRate_ = {},
                                                                 uint32_t texelRate_ = {},
                                                                 uint32_t fmaRate_   = {},
                                                                 void *   pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pixelRate{ pixelRate_ }
-      , texelRate{ texelRate_ }
-      , fmaRate{ fmaRate_ }
+      : pNext( pNext_ )
+      , pixelRate( pixelRate_ )
+      , texelRate( texelRate_ )
+      , fmaRate( fmaRate_ )
     {
     }
 
@@ -113789,11 +82142,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderCorePropertiesARM & operator=( PhysicalDeviceShaderCorePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderCorePropertiesARM & operator=( VkPhysicalDeviceShaderCorePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderCorePropertiesARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderCorePropertiesARM const *>( &rhs );
       return *this;
     }
 
@@ -113807,18 +82160,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderCorePropertiesARM *>( this );
     }
 
-    operator VkPhysicalDeviceShaderCorePropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderCorePropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderCorePropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderCorePropertiesARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pixelRate, texelRate, fmaRate );
     }
@@ -113843,29 +82191,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::ePhysicalDeviceShaderCorePropertiesARM;
-    void *        pNext     = {};
-    uint32_t      pixelRate = {};
-    uint32_t      texelRate = {};
-    uint32_t      fmaRate   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::ePhysicalDeviceShaderCorePropertiesARM;
+    void *                              pNext     = {};
+    uint32_t                            pixelRate = {};
+    uint32_t                            texelRate = {};
+    uint32_t                            fmaRate   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderCorePropertiesARM>
-  {
-    using Type = PhysicalDeviceShaderCorePropertiesARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderCorePropertiesARM>
   {
     using Type = PhysicalDeviceShaderCorePropertiesARM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures.html
   struct PhysicalDeviceShaderDemoteToHelperInvocationFeatures
   {
     using NativeType = VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures;
@@ -113873,11 +82211,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderDemoteToHelperInvocationFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderDemoteToHelperInvocationFeatures( Bool32 shaderDemoteToHelperInvocation_ = {},
-                                                                               void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderDemoteToHelperInvocation{ shaderDemoteToHelperInvocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderDemoteToHelperInvocationFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderDemoteToHelperInvocation_ = {},
+                                                                               void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderDemoteToHelperInvocation( shaderDemoteToHelperInvocation_ )
     {
     }
 
@@ -113891,15 +82229,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderDemoteToHelperInvocationFeatures &
       operator=( PhysicalDeviceShaderDemoteToHelperInvocationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderDemoteToHelperInvocationFeatures & operator=( VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderDemoteToHelperInvocationFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDemoteToHelperInvocationFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderDemoteToHelperInvocationFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -113907,12 +82245,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderDemoteToHelperInvocationFeatures &
-      setShaderDemoteToHelperInvocation( Bool32 shaderDemoteToHelperInvocation_ ) VULKAN_HPP_NOEXCEPT
+      setShaderDemoteToHelperInvocation( VULKAN_HPP_NAMESPACE::Bool32 shaderDemoteToHelperInvocation_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderDemoteToHelperInvocation = shaderDemoteToHelperInvocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -113924,18 +82262,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderDemoteToHelperInvocation );
     }
@@ -113960,19 +82293,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                          = StructureType::ePhysicalDeviceShaderDemoteToHelperInvocationFeatures;
-    void *        pNext                          = {};
-    Bool32        shaderDemoteToHelperInvocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                          = StructureType::ePhysicalDeviceShaderDemoteToHelperInvocationFeatures;
+    void *                              pNext                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderDemoteToHelperInvocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures>
-  {
-    using Type = PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderDemoteToHelperInvocationFeatures>
   {
@@ -113981,8 +82306,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT = PhysicalDeviceShaderDemoteToHelperInvocationFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderDrawParametersFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderDrawParametersFeatures.html
   struct PhysicalDeviceShaderDrawParametersFeatures
   {
     using NativeType = VkPhysicalDeviceShaderDrawParametersFeatures;
@@ -113990,10 +82313,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderDrawParametersFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderDrawParametersFeatures( Bool32 shaderDrawParameters_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderDrawParameters{ shaderDrawParameters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderDrawParametersFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderDrawParameters_ = {},
+                                                                     void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderDrawParameters( shaderDrawParameters_ )
     {
     }
 
@@ -114005,27 +82329,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderDrawParametersFeatures & operator=( PhysicalDeviceShaderDrawParametersFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderDrawParametersFeatures & operator=( VkPhysicalDeviceShaderDrawParametersFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderDrawParametersFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderDrawParametersFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderDrawParametersFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderDrawParametersFeatures & setShaderDrawParameters( Bool32 shaderDrawParameters_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderDrawParametersFeatures &
+      setShaderDrawParameters( VULKAN_HPP_NAMESPACE::Bool32 shaderDrawParameters_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderDrawParameters = shaderDrawParameters_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderDrawParametersFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -114037,18 +82362,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderDrawParametersFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceShaderDrawParametersFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderDrawParametersFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderDrawParametersFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderDrawParametersFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderDrawParameters );
     }
@@ -114073,19 +82393,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceShaderDrawParametersFeatures;
-    void *        pNext                = {};
-    Bool32        shaderDrawParameters = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceShaderDrawParametersFeatures;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderDrawParameters = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderDrawParametersFeatures>
-  {
-    using Type = PhysicalDeviceShaderDrawParametersFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderDrawParametersFeatures>
   {
@@ -114094,8 +82406,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderDrawParameterFeatures = PhysicalDeviceShaderDrawParametersFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD.html
   struct PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD
   {
     using NativeType = VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD;
@@ -114103,11 +82413,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD( Bool32 shaderEarlyAndLateFragmentTests_ = {},
-                                                                                   void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderEarlyAndLateFragmentTests{ shaderEarlyAndLateFragmentTests_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD( VULKAN_HPP_NAMESPACE::Bool32 shaderEarlyAndLateFragmentTests_ = {},
+                                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderEarlyAndLateFragmentTests( shaderEarlyAndLateFragmentTests_ )
     {
     }
 
@@ -114121,16 +82431,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD &
       operator=( PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD &
       operator=( VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -114138,12 +82448,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD &
-      setShaderEarlyAndLateFragmentTests( Bool32 shaderEarlyAndLateFragmentTests_ ) VULKAN_HPP_NOEXCEPT
+      setShaderEarlyAndLateFragmentTests( VULKAN_HPP_NAMESPACE::Bool32 shaderEarlyAndLateFragmentTests_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderEarlyAndLateFragmentTests = shaderEarlyAndLateFragmentTests_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -114155,18 +82465,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *>( this );
     }
 
-    operator VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderEarlyAndLateFragmentTests );
     }
@@ -114191,19 +82496,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                           = StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD;
-    void *        pNext                           = {};
-    Bool32        shaderEarlyAndLateFragmentTests = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD;
+    void *                              pNext                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderEarlyAndLateFragmentTests = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD>
-  {
-    using Type = PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD>
   {
@@ -114211,8 +82508,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceShaderEnqueueFeaturesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderEnqueueFeaturesAMDX.html
   struct PhysicalDeviceShaderEnqueueFeaturesAMDX
   {
     using NativeType = VkPhysicalDeviceShaderEnqueueFeaturesAMDX;
@@ -114220,12 +82515,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderEnqueueFeaturesAMDX( Bool32 shaderEnqueue_ = {}, Bool32 shaderMeshEnqueue_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderEnqueue{ shaderEnqueue_ }
-      , shaderMeshEnqueue{ shaderMeshEnqueue_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderEnqueueFeaturesAMDX( VULKAN_HPP_NAMESPACE::Bool32 shaderEnqueue_ = {},
+                                                                  void *                       pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderEnqueue( shaderEnqueue_ )
     {
     }
 
@@ -114237,33 +82531,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderEnqueueFeaturesAMDX & operator=( PhysicalDeviceShaderEnqueueFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderEnqueueFeaturesAMDX & operator=( VkPhysicalDeviceShaderEnqueueFeaturesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderEnqueueFeaturesAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEnqueueFeaturesAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueueFeaturesAMDX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueueFeaturesAMDX & setShaderEnqueue( Bool32 shaderEnqueue_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueueFeaturesAMDX & setShaderEnqueue( VULKAN_HPP_NAMESPACE::Bool32 shaderEnqueue_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderEnqueue = shaderEnqueue_;
       return *this;
     }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueueFeaturesAMDX & setShaderMeshEnqueue( Bool32 shaderMeshEnqueue_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderMeshEnqueue = shaderMeshEnqueue_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderEnqueueFeaturesAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -114275,20 +82563,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderEnqueueFeaturesAMDX *>( this );
     }
 
-    operator VkPhysicalDeviceShaderEnqueueFeaturesAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderEnqueueFeaturesAMDX *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderEnqueueFeaturesAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderEnqueueFeaturesAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, shaderEnqueue, shaderMeshEnqueue );
+      return std::tie( sType, pNext, shaderEnqueue );
     }
 #  endif
 
@@ -114300,7 +82583,7 @@ namespace VULKAN_HPP_NAMESPACE
 #    if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderEnqueue == rhs.shaderEnqueue ) && ( shaderMeshEnqueue == rhs.shaderMeshEnqueue );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderEnqueue == rhs.shaderEnqueue );
 #    endif
     }
 
@@ -114311,20 +82594,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX;
-    void *        pNext             = {};
-    Bool32        shaderEnqueue     = {};
-    Bool32        shaderMeshEnqueue = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderEnqueue = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderEnqueueFeaturesAMDX>
-  {
-    using Type = PhysicalDeviceShaderEnqueueFeaturesAMDX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX>
   {
@@ -114333,8 +82607,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPhysicalDeviceShaderEnqueuePropertiesAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderEnqueuePropertiesAMDX.html
   struct PhysicalDeviceShaderEnqueuePropertiesAMDX
   {
     using NativeType = VkPhysicalDeviceShaderEnqueuePropertiesAMDX;
@@ -114342,27 +82614,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderEnqueuePropertiesAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX( uint32_t                        maxExecutionGraphDepth_                 = {},
-                                                                       uint32_t                        maxExecutionGraphShaderOutputNodes_     = {},
-                                                                       uint32_t                        maxExecutionGraphShaderPayloadSize_     = {},
-                                                                       uint32_t                        maxExecutionGraphShaderPayloadCount_    = {},
-                                                                       uint32_t                        executionGraphDispatchAddressAlignment_ = {},
-                                                                       std::array<uint32_t, 3> const & maxExecutionGraphWorkgroupCount_        = {},
-                                                                       uint32_t                        maxExecutionGraphWorkgroups_            = {},
-                                                                       void *                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxExecutionGraphDepth{ maxExecutionGraphDepth_ }
-      , maxExecutionGraphShaderOutputNodes{ maxExecutionGraphShaderOutputNodes_ }
-      , maxExecutionGraphShaderPayloadSize{ maxExecutionGraphShaderPayloadSize_ }
-      , maxExecutionGraphShaderPayloadCount{ maxExecutionGraphShaderPayloadCount_ }
-      , executionGraphDispatchAddressAlignment{ executionGraphDispatchAddressAlignment_ }
-      , maxExecutionGraphWorkgroupCount{ maxExecutionGraphWorkgroupCount_ }
-      , maxExecutionGraphWorkgroups{ maxExecutionGraphWorkgroups_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderEnqueuePropertiesAMDX( uint32_t maxExecutionGraphDepth_                 = {},
+                                                                    uint32_t maxExecutionGraphShaderOutputNodes_     = {},
+                                                                    uint32_t maxExecutionGraphShaderPayloadSize_     = {},
+                                                                    uint32_t maxExecutionGraphShaderPayloadCount_    = {},
+                                                                    uint32_t executionGraphDispatchAddressAlignment_ = {},
+                                                                    void *   pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxExecutionGraphDepth( maxExecutionGraphDepth_ )
+      , maxExecutionGraphShaderOutputNodes( maxExecutionGraphShaderOutputNodes_ )
+      , maxExecutionGraphShaderPayloadSize( maxExecutionGraphShaderPayloadSize_ )
+      , maxExecutionGraphShaderPayloadCount( maxExecutionGraphShaderPayloadCount_ )
+      , executionGraphDispatchAddressAlignment( executionGraphDispatchAddressAlignment_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX( PhysicalDeviceShaderEnqueuePropertiesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderEnqueuePropertiesAMDX( PhysicalDeviceShaderEnqueuePropertiesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
     PhysicalDeviceShaderEnqueuePropertiesAMDX( VkPhysicalDeviceShaderEnqueuePropertiesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
       : PhysicalDeviceShaderEnqueuePropertiesAMDX( *reinterpret_cast<PhysicalDeviceShaderEnqueuePropertiesAMDX const *>( &rhs ) )
@@ -114370,14 +82638,56 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderEnqueuePropertiesAMDX & operator=( PhysicalDeviceShaderEnqueuePropertiesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderEnqueuePropertiesAMDX & operator=( VkPhysicalDeviceShaderEnqueuePropertiesAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderEnqueuePropertiesAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderEnqueuePropertiesAMDX const *>( &rhs );
       return *this;
     }
 
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX & setMaxExecutionGraphDepth( uint32_t maxExecutionGraphDepth_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxExecutionGraphDepth = maxExecutionGraphDepth_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX &
+      setMaxExecutionGraphShaderOutputNodes( uint32_t maxExecutionGraphShaderOutputNodes_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxExecutionGraphShaderOutputNodes = maxExecutionGraphShaderOutputNodes_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX &
+      setMaxExecutionGraphShaderPayloadSize( uint32_t maxExecutionGraphShaderPayloadSize_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxExecutionGraphShaderPayloadSize = maxExecutionGraphShaderPayloadSize_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX &
+      setMaxExecutionGraphShaderPayloadCount( uint32_t maxExecutionGraphShaderPayloadCount_ ) VULKAN_HPP_NOEXCEPT
+    {
+      maxExecutionGraphShaderPayloadCount = maxExecutionGraphShaderPayloadCount_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderEnqueuePropertiesAMDX &
+      setExecutionGraphDispatchAddressAlignment( uint32_t executionGraphDispatchAddressAlignment_ ) VULKAN_HPP_NOEXCEPT
+    {
+      executionGraphDispatchAddressAlignment = executionGraphDispatchAddressAlignment_;
+      return *this;
+    }
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkPhysicalDeviceShaderEnqueuePropertiesAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPhysicalDeviceShaderEnqueuePropertiesAMDX *>( this );
@@ -114388,26 +82698,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderEnqueuePropertiesAMDX *>( this );
     }
 
-    operator VkPhysicalDeviceShaderEnqueuePropertiesAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderEnqueuePropertiesAMDX *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderEnqueuePropertiesAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderEnqueuePropertiesAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &,
                uint32_t const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -114416,9 +82718,7 @@ namespace VULKAN_HPP_NAMESPACE
                        maxExecutionGraphShaderOutputNodes,
                        maxExecutionGraphShaderPayloadSize,
                        maxExecutionGraphShaderPayloadCount,
-                       executionGraphDispatchAddressAlignment,
-                       maxExecutionGraphWorkgroupCount,
-                       maxExecutionGraphWorkgroups );
+                       executionGraphDispatchAddressAlignment );
     }
 #  endif
 
@@ -114434,8 +82734,7 @@ namespace VULKAN_HPP_NAMESPACE
              ( maxExecutionGraphShaderOutputNodes == rhs.maxExecutionGraphShaderOutputNodes ) &&
              ( maxExecutionGraphShaderPayloadSize == rhs.maxExecutionGraphShaderPayloadSize ) &&
              ( maxExecutionGraphShaderPayloadCount == rhs.maxExecutionGraphShaderPayloadCount ) &&
-             ( executionGraphDispatchAddressAlignment == rhs.executionGraphDispatchAddressAlignment ) &&
-             ( maxExecutionGraphWorkgroupCount == rhs.maxExecutionGraphWorkgroupCount ) && ( maxExecutionGraphWorkgroups == rhs.maxExecutionGraphWorkgroups );
+             ( executionGraphDispatchAddressAlignment == rhs.executionGraphDispatchAddressAlignment );
 #    endif
     }
 
@@ -114446,25 +82745,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType                                  = StructureType::ePhysicalDeviceShaderEnqueuePropertiesAMDX;
-    void *                      pNext                                  = {};
-    uint32_t                    maxExecutionGraphDepth                 = {};
-    uint32_t                    maxExecutionGraphShaderOutputNodes     = {};
-    uint32_t                    maxExecutionGraphShaderPayloadSize     = {};
-    uint32_t                    maxExecutionGraphShaderPayloadCount    = {};
-    uint32_t                    executionGraphDispatchAddressAlignment = {};
-    ArrayWrapper1D<uint32_t, 3> maxExecutionGraphWorkgroupCount        = {};
-    uint32_t                    maxExecutionGraphWorkgroups            = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceShaderEnqueuePropertiesAMDX;
+    void *                              pNext                                  = {};
+    uint32_t                            maxExecutionGraphDepth                 = {};
+    uint32_t                            maxExecutionGraphShaderOutputNodes     = {};
+    uint32_t                            maxExecutionGraphShaderPayloadSize     = {};
+    uint32_t                            maxExecutionGraphShaderPayloadCount    = {};
+    uint32_t                            executionGraphDispatchAddressAlignment = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderEnqueuePropertiesAMDX>
-  {
-    using Type = PhysicalDeviceShaderEnqueuePropertiesAMDX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderEnqueuePropertiesAMDX>
   {
@@ -114472,83 +82761,78 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkPhysicalDeviceShaderExpectAssumeFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderExpectAssumeFeatures.html
-  struct PhysicalDeviceShaderExpectAssumeFeatures
+  struct PhysicalDeviceShaderExpectAssumeFeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceShaderExpectAssumeFeatures;
+    using NativeType = VkPhysicalDeviceShaderExpectAssumeFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderExpectAssumeFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderExpectAssumeFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderExpectAssumeFeatures( Bool32 shaderExpectAssume_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderExpectAssume{ shaderExpectAssume_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderExpectAssumeFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderExpectAssume_ = {},
+                                                                      void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderExpectAssume( shaderExpectAssume_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderExpectAssumeFeatures( PhysicalDeviceShaderExpectAssumeFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderExpectAssumeFeaturesKHR( PhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceShaderExpectAssumeFeatures( VkPhysicalDeviceShaderExpectAssumeFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderExpectAssumeFeatures( *reinterpret_cast<PhysicalDeviceShaderExpectAssumeFeatures const *>( &rhs ) )
+    PhysicalDeviceShaderExpectAssumeFeaturesKHR( VkPhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceShaderExpectAssumeFeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderExpectAssumeFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceShaderExpectAssumeFeatures & operator=( PhysicalDeviceShaderExpectAssumeFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceShaderExpectAssumeFeaturesKHR & operator=( PhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceShaderExpectAssumeFeatures & operator=( VkPhysicalDeviceShaderExpectAssumeFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceShaderExpectAssumeFeaturesKHR & operator=( VkPhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderExpectAssumeFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderExpectAssumeFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderExpectAssumeFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderExpectAssumeFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderExpectAssumeFeatures & setShaderExpectAssume( Bool32 shaderExpectAssume_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderExpectAssumeFeaturesKHR &
+      setShaderExpectAssume( VULKAN_HPP_NAMESPACE::Bool32 shaderExpectAssume_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderExpectAssume = shaderExpectAssume_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceShaderExpectAssumeFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderExpectAssumeFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderExpectAssumeFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceShaderExpectAssumeFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderExpectAssumeFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderExpectAssumeFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceShaderExpectAssumeFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderExpectAssumeFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderExpectAssumeFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderExpectAssumeFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderExpectAssumeFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceShaderExpectAssumeFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderExpectAssume );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderExpectAssumeFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceShaderExpectAssumeFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceShaderExpectAssumeFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -114557,36 +82841,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceShaderExpectAssumeFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceShaderExpectAssumeFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType              = StructureType::ePhysicalDeviceShaderExpectAssumeFeatures;
-    void *        pNext              = {};
-    Bool32        shaderExpectAssume = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::ePhysicalDeviceShaderExpectAssumeFeaturesKHR;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderExpectAssume = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderExpectAssumeFeatures>
-  {
-    using Type = PhysicalDeviceShaderExpectAssumeFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderExpectAssumeFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderExpectAssumeFeaturesKHR>
   {
-    using Type = PhysicalDeviceShaderExpectAssumeFeatures;
+    using Type = PhysicalDeviceShaderExpectAssumeFeaturesKHR;
   };
 
-  using PhysicalDeviceShaderExpectAssumeFeaturesKHR = PhysicalDeviceShaderExpectAssumeFeatures;
-
-  // wrapper struct for struct VkPhysicalDeviceShaderFloat16Int8Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderFloat16Int8Features.html
   struct PhysicalDeviceShaderFloat16Int8Features
   {
     using NativeType = VkPhysicalDeviceShaderFloat16Int8Features;
@@ -114594,12 +82866,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderFloat16Int8Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderFloat16Int8Features( Bool32 shaderFloat16_ = {}, Bool32 shaderInt8_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderFloat16{ shaderFloat16_ }
-      , shaderInt8{ shaderInt8_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloat16Int8Features( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16_ = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 shaderInt8_    = {},
+                                                                  void *                       pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderFloat16( shaderFloat16_ )
+      , shaderInt8( shaderInt8_ )
     {
     }
 
@@ -114611,33 +82884,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderFloat16Int8Features & operator=( PhysicalDeviceShaderFloat16Int8Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderFloat16Int8Features & operator=( VkPhysicalDeviceShaderFloat16Int8Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderFloat16Int8Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloat16Int8Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat16Int8Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat16Int8Features & setShaderFloat16( Bool32 shaderFloat16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat16Int8Features & setShaderFloat16( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderFloat16 = shaderFloat16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat16Int8Features & setShaderInt8( Bool32 shaderInt8_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat16Int8Features & setShaderInt8( VULKAN_HPP_NAMESPACE::Bool32 shaderInt8_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInt8 = shaderInt8_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderFloat16Int8Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -114649,18 +82922,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderFloat16Int8Features *>( this );
     }
 
-    operator VkPhysicalDeviceShaderFloat16Int8Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderFloat16Int8Features *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloat16Int8Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderFloat16Int8Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderFloat16, shaderInt8 );
     }
@@ -114685,20 +82953,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::ePhysicalDeviceShaderFloat16Int8Features;
-    void *        pNext         = {};
-    Bool32        shaderFloat16 = {};
-    Bool32        shaderInt8    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::ePhysicalDeviceShaderFloat16Int8Features;
+    void *                              pNext         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderFloat16 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInt8    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderFloat16Int8Features>
-  {
-    using Type = PhysicalDeviceShaderFloat16Int8Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderFloat16Int8Features>
   {
@@ -114708,206 +82968,79 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDeviceFloat16Int8FeaturesKHR       = PhysicalDeviceShaderFloat16Int8Features;
   using PhysicalDeviceShaderFloat16Int8FeaturesKHR = PhysicalDeviceShaderFloat16Int8Features;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderFloat8FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderFloat8FeaturesEXT.html
-  struct PhysicalDeviceShaderFloat8FeaturesEXT
+  struct PhysicalDeviceShaderFloatControls2FeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceShaderFloat8FeaturesEXT;
+    using NativeType = VkPhysicalDeviceShaderFloatControls2FeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderFloat8FeaturesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderFloatControls2FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloat8FeaturesEXT( Bool32 shaderFloat8_                  = {},
-                                                                Bool32 shaderFloat8CooperativeMatrix_ = {},
-                                                                void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderFloat8{ shaderFloat8_ }
-      , shaderFloat8CooperativeMatrix{ shaderFloat8CooperativeMatrix_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloatControls2FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderFloatControls2_ = {},
+                                                                        void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderFloatControls2( shaderFloatControls2_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloat8FeaturesEXT( PhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceShaderFloatControls2FeaturesKHR( PhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceShaderFloat8FeaturesEXT( VkPhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderFloat8FeaturesEXT( *reinterpret_cast<PhysicalDeviceShaderFloat8FeaturesEXT const *>( &rhs ) )
+    PhysicalDeviceShaderFloatControls2FeaturesKHR( VkPhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceShaderFloatControls2FeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderFloatControls2FeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceShaderFloat8FeaturesEXT & operator=( PhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceShaderFloatControls2FeaturesKHR & operator=( PhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceShaderFloat8FeaturesEXT & operator=( VkPhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceShaderFloatControls2FeaturesKHR & operator=( VkPhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderFloat8FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderFloatControls2FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat8FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloatControls2FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat8FeaturesEXT & setShaderFloat8( Bool32 shaderFloat8_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFloat8 = shaderFloat8_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloat8FeaturesEXT &
-      setShaderFloat8CooperativeMatrix( Bool32 shaderFloat8CooperativeMatrix_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFloat8CooperativeMatrix = shaderFloat8CooperativeMatrix_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderFloat8FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderFloat8FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloat8FeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderFloat8FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloat8FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderFloat8FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloat8FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderFloat8FeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderFloat8, shaderFloat8CooperativeMatrix );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderFloat8FeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderFloat8 == rhs.shaderFloat8 ) &&
-             ( shaderFloat8CooperativeMatrix == rhs.shaderFloat8CooperativeMatrix );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderFloat8FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                         = StructureType::ePhysicalDeviceShaderFloat8FeaturesEXT;
-    void *        pNext                         = {};
-    Bool32        shaderFloat8                  = {};
-    Bool32        shaderFloat8CooperativeMatrix = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderFloat8FeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderFloat8FeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderFloat8FeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderFloat8FeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderFloatControls2Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderFloatControls2Features.html
-  struct PhysicalDeviceShaderFloatControls2Features
-  {
-    using NativeType = VkPhysicalDeviceShaderFloatControls2Features;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderFloatControls2Features;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloatControls2Features( Bool32 shaderFloatControls2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderFloatControls2{ shaderFloatControls2_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFloatControls2Features( PhysicalDeviceShaderFloatControls2Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderFloatControls2Features( VkPhysicalDeviceShaderFloatControls2Features const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderFloatControls2Features( *reinterpret_cast<PhysicalDeviceShaderFloatControls2Features const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderFloatControls2Features & operator=( PhysicalDeviceShaderFloatControls2Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderFloatControls2Features & operator=( VkPhysicalDeviceShaderFloatControls2Features const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderFloatControls2Features const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloatControls2Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloatControls2Features & setShaderFloatControls2( Bool32 shaderFloatControls2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFloatControls2FeaturesKHR &
+      setShaderFloatControls2( VULKAN_HPP_NAMESPACE::Bool32 shaderFloatControls2_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderFloatControls2 = shaderFloatControls2_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceShaderFloatControls2Features const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderFloatControls2FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderFloatControls2Features *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceShaderFloatControls2FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderFloatControls2Features &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderFloatControls2FeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceShaderFloatControls2Features *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloatControls2Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderFloatControls2Features *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFloatControls2Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderFloatControls2Features *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceShaderFloatControls2FeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderFloatControls2 );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderFloatControls2Features const & ) const = default;
+    auto operator<=>( PhysicalDeviceShaderFloatControls2FeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceShaderFloatControls2Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -114916,167 +83049,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceShaderFloatControls2Features const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceShaderFloatControls2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceShaderFloatControls2Features;
-    void *        pNext                = {};
-    Bool32        shaderFloatControls2 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceShaderFloatControls2FeaturesKHR;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderFloatControls2 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderFloatControls2Features>
-  {
-    using Type = PhysicalDeviceShaderFloatControls2Features;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderFloatControls2Features>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderFloatControls2FeaturesKHR>
   {
-    using Type = PhysicalDeviceShaderFloatControls2Features;
+    using Type = PhysicalDeviceShaderFloatControls2FeaturesKHR;
   };
 
-  using PhysicalDeviceShaderFloatControls2FeaturesKHR = PhysicalDeviceShaderFloatControls2Features;
-
-  // wrapper struct for struct VkPhysicalDeviceShaderFmaFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderFmaFeaturesKHR.html
-  struct PhysicalDeviceShaderFmaFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceShaderFmaFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderFmaFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFmaFeaturesKHR( Bool32 shaderFmaFloat16_ = {},
-                                                             Bool32 shaderFmaFloat32_ = {},
-                                                             Bool32 shaderFmaFloat64_ = {},
-                                                             void * pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderFmaFloat16{ shaderFmaFloat16_ }
-      , shaderFmaFloat32{ shaderFmaFloat32_ }
-      , shaderFmaFloat64{ shaderFmaFloat64_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderFmaFeaturesKHR( PhysicalDeviceShaderFmaFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderFmaFeaturesKHR( VkPhysicalDeviceShaderFmaFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderFmaFeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderFmaFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderFmaFeaturesKHR & operator=( PhysicalDeviceShaderFmaFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderFmaFeaturesKHR & operator=( VkPhysicalDeviceShaderFmaFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderFmaFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFmaFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFmaFeaturesKHR & setShaderFmaFloat16( Bool32 shaderFmaFloat16_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFmaFloat16 = shaderFmaFloat16_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFmaFeaturesKHR & setShaderFmaFloat32( Bool32 shaderFmaFloat32_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFmaFloat32 = shaderFmaFloat32_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderFmaFeaturesKHR & setShaderFmaFloat64( Bool32 shaderFmaFloat64_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFmaFloat64 = shaderFmaFloat64_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderFmaFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderFmaFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFmaFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderFmaFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFmaFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderFmaFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderFmaFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderFmaFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderFmaFloat16, shaderFmaFloat32, shaderFmaFloat64 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderFmaFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderFmaFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderFmaFloat16 == rhs.shaderFmaFloat16 ) && ( shaderFmaFloat32 == rhs.shaderFmaFloat32 ) &&
-             ( shaderFmaFloat64 == rhs.shaderFmaFloat64 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderFmaFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType            = StructureType::ePhysicalDeviceShaderFmaFeaturesKHR;
-    void *        pNext            = {};
-    Bool32        shaderFmaFloat16 = {};
-    Bool32        shaderFmaFloat32 = {};
-    Bool32        shaderFmaFloat64 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderFmaFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderFmaFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderFmaFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderFmaFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT.html
   struct PhysicalDeviceShaderImageAtomicInt64FeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
@@ -115084,13 +83074,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderImageAtomicInt64FeaturesEXT( Bool32 shaderImageInt64Atomics_ = {},
-                                                                          Bool32 sparseImageInt64Atomics_ = {},
-                                                                          void * pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderImageInt64Atomics{ shaderImageInt64Atomics_ }
-      , sparseImageInt64Atomics{ sparseImageInt64Atomics_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderImageAtomicInt64FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderImageInt64Atomics_ = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 sparseImageInt64Atomics_ = {},
+                                                                          void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderImageInt64Atomics( shaderImageInt64Atomics_ )
+      , sparseImageInt64Atomics( sparseImageInt64Atomics_ )
     {
     }
 
@@ -115103,33 +83093,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderImageAtomicInt64FeaturesEXT & operator=( PhysicalDeviceShaderImageAtomicInt64FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderImageAtomicInt64FeaturesEXT & operator=( VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderImageAtomicInt64FeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageAtomicInt64FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageAtomicInt64FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageAtomicInt64FeaturesEXT & setShaderImageInt64Atomics( Bool32 shaderImageInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageAtomicInt64FeaturesEXT &
+      setShaderImageInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderImageInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderImageInt64Atomics = shaderImageInt64Atomics_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageAtomicInt64FeaturesEXT & setSparseImageInt64Atomics( Bool32 sparseImageInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageAtomicInt64FeaturesEXT &
+      setSparseImageInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 sparseImageInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       sparseImageInt64Atomics = sparseImageInt64Atomics_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115141,18 +83133,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderImageInt64Atomics, sparseImageInt64Atomics );
     }
@@ -115178,28 +83165,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
-    void *        pNext                   = {};
-    Bool32        shaderImageInt64Atomics = {};
-    Bool32        sparseImageInt64Atomics = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderImageInt64Atomics = {};
+    VULKAN_HPP_NAMESPACE::Bool32        sparseImageInt64Atomics = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT>
   {
     using Type = PhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderImageFootprintFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderImageFootprintFeaturesNV.html
   struct PhysicalDeviceShaderImageFootprintFeaturesNV
   {
     using NativeType = VkPhysicalDeviceShaderImageFootprintFeaturesNV;
@@ -115207,10 +83184,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderImageFootprintFeaturesNV( Bool32 imageFootprint_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageFootprint{ imageFootprint_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderImageFootprintFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 imageFootprint_ = {},
+                                                                       void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageFootprint( imageFootprint_ )
     {
     }
 
@@ -115222,27 +83200,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderImageFootprintFeaturesNV & operator=( PhysicalDeviceShaderImageFootprintFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderImageFootprintFeaturesNV & operator=( VkPhysicalDeviceShaderImageFootprintFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderImageFootprintFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderImageFootprintFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageFootprintFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageFootprintFeaturesNV & setImageFootprint( Bool32 imageFootprint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderImageFootprintFeaturesNV & setImageFootprint( VULKAN_HPP_NAMESPACE::Bool32 imageFootprint_ ) VULKAN_HPP_NOEXCEPT
     {
       imageFootprint = imageFootprint_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderImageFootprintFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115254,18 +83232,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderImageFootprintFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShaderImageFootprintFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderImageFootprintFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderImageFootprintFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderImageFootprintFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageFootprint );
     }
@@ -115290,27 +83263,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV;
-    void *        pNext          = {};
-    Bool32        imageFootprint = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imageFootprint = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderImageFootprintFeaturesNV>
-  {
-    using Type = PhysicalDeviceShaderImageFootprintFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV>
   {
     using Type = PhysicalDeviceShaderImageFootprintFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderIntegerDotProductFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderIntegerDotProductFeatures.html
   struct PhysicalDeviceShaderIntegerDotProductFeatures
   {
     using NativeType = VkPhysicalDeviceShaderIntegerDotProductFeatures;
@@ -115318,10 +83281,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderIntegerDotProductFeatures( Bool32 shaderIntegerDotProduct_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderIntegerDotProduct{ shaderIntegerDotProduct_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderIntegerDotProductFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerDotProduct_ = {},
+                                                                        void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderIntegerDotProduct( shaderIntegerDotProduct_ )
     {
     }
 
@@ -115334,27 +83298,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderIntegerDotProductFeatures & operator=( PhysicalDeviceShaderIntegerDotProductFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderIntegerDotProductFeatures & operator=( VkPhysicalDeviceShaderIntegerDotProductFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderIntegerDotProductFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderIntegerDotProductFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderIntegerDotProductFeatures & setShaderIntegerDotProduct( Bool32 shaderIntegerDotProduct_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderIntegerDotProductFeatures &
+      setShaderIntegerDotProduct( VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerDotProduct_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderIntegerDotProduct = shaderIntegerDotProduct_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderIntegerDotProductFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115366,18 +83331,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderIntegerDotProductFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceShaderIntegerDotProductFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderIntegerDotProductFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderIntegerDotProductFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderIntegerDotProductFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderIntegerDotProduct );
     }
@@ -115402,19 +83362,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures;
-    void *        pNext                   = {};
-    Bool32        shaderIntegerDotProduct = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderIntegerDotProduct = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderIntegerDotProductFeatures>
-  {
-    using Type = PhysicalDeviceShaderIntegerDotProductFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures>
   {
@@ -115423,8 +83375,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderIntegerDotProductFeaturesKHR = PhysicalDeviceShaderIntegerDotProductFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderIntegerDotProductProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderIntegerDotProductProperties.html
   struct PhysicalDeviceShaderIntegerDotProductProperties
   {
     using NativeType = VkPhysicalDeviceShaderIntegerDotProductProperties;
@@ -115432,70 +83382,71 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderIntegerDotProductProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderIntegerDotProductProperties( Bool32 integerDotProduct8BitUnsignedAccelerated_                                      = {},
-                                                       Bool32 integerDotProduct8BitSignedAccelerated_                                        = {},
-                                                       Bool32 integerDotProduct8BitMixedSignednessAccelerated_                               = {},
-                                                       Bool32 integerDotProduct4x8BitPackedUnsignedAccelerated_                              = {},
-                                                       Bool32 integerDotProduct4x8BitPackedSignedAccelerated_                                = {},
-                                                       Bool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated_                       = {},
-                                                       Bool32 integerDotProduct16BitUnsignedAccelerated_                                     = {},
-                                                       Bool32 integerDotProduct16BitSignedAccelerated_                                       = {},
-                                                       Bool32 integerDotProduct16BitMixedSignednessAccelerated_                              = {},
-                                                       Bool32 integerDotProduct32BitUnsignedAccelerated_                                     = {},
-                                                       Bool32 integerDotProduct32BitSignedAccelerated_                                       = {},
-                                                       Bool32 integerDotProduct32BitMixedSignednessAccelerated_                              = {},
-                                                       Bool32 integerDotProduct64BitUnsignedAccelerated_                                     = {},
-                                                       Bool32 integerDotProduct64BitSignedAccelerated_                                       = {},
-                                                       Bool32 integerDotProduct64BitMixedSignednessAccelerated_                              = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_                = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated_                  = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_         = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_        = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_          = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_               = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated_                 = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_        = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_               = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated_                 = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_        = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_               = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated_                 = {},
-                                                       Bool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_        = {},
-                                                       void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , integerDotProduct8BitUnsignedAccelerated{ integerDotProduct8BitUnsignedAccelerated_ }
-      , integerDotProduct8BitSignedAccelerated{ integerDotProduct8BitSignedAccelerated_ }
-      , integerDotProduct8BitMixedSignednessAccelerated{ integerDotProduct8BitMixedSignednessAccelerated_ }
-      , integerDotProduct4x8BitPackedUnsignedAccelerated{ integerDotProduct4x8BitPackedUnsignedAccelerated_ }
-      , integerDotProduct4x8BitPackedSignedAccelerated{ integerDotProduct4x8BitPackedSignedAccelerated_ }
-      , integerDotProduct4x8BitPackedMixedSignednessAccelerated{ integerDotProduct4x8BitPackedMixedSignednessAccelerated_ }
-      , integerDotProduct16BitUnsignedAccelerated{ integerDotProduct16BitUnsignedAccelerated_ }
-      , integerDotProduct16BitSignedAccelerated{ integerDotProduct16BitSignedAccelerated_ }
-      , integerDotProduct16BitMixedSignednessAccelerated{ integerDotProduct16BitMixedSignednessAccelerated_ }
-      , integerDotProduct32BitUnsignedAccelerated{ integerDotProduct32BitUnsignedAccelerated_ }
-      , integerDotProduct32BitSignedAccelerated{ integerDotProduct32BitSignedAccelerated_ }
-      , integerDotProduct32BitMixedSignednessAccelerated{ integerDotProduct32BitMixedSignednessAccelerated_ }
-      , integerDotProduct64BitUnsignedAccelerated{ integerDotProduct64BitUnsignedAccelerated_ }
-      , integerDotProduct64BitSignedAccelerated{ integerDotProduct64BitSignedAccelerated_ }
-      , integerDotProduct64BitMixedSignednessAccelerated{ integerDotProduct64BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitSignedAccelerated{ integerDotProductAccumulatingSaturating8BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitSignedAccelerated{ integerDotProductAccumulatingSaturating16BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitSignedAccelerated{ integerDotProductAccumulatingSaturating32BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitSignedAccelerated{ integerDotProductAccumulatingSaturating64BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderIntegerDotProductProperties(
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct8BitUnsignedAccelerated_                                      = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct8BitSignedAccelerated_                                        = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct8BitMixedSignednessAccelerated_                               = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct4x8BitPackedUnsignedAccelerated_                              = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct4x8BitPackedSignedAccelerated_                                = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct16BitUnsignedAccelerated_                                     = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct16BitSignedAccelerated_                                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct16BitMixedSignednessAccelerated_                              = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct32BitUnsignedAccelerated_                                     = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct32BitSignedAccelerated_                                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct32BitMixedSignednessAccelerated_                              = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct64BitUnsignedAccelerated_                                     = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct64BitSignedAccelerated_                                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProduct64BitMixedSignednessAccelerated_                              = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated_                  = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_         = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_          = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_               = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated_                 = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_               = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated_                 = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_        = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_               = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated_                 = {},
+      VULKAN_HPP_NAMESPACE::Bool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_        = {},
+      void *                       pNext_                                                                         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , integerDotProduct8BitUnsignedAccelerated( integerDotProduct8BitUnsignedAccelerated_ )
+      , integerDotProduct8BitSignedAccelerated( integerDotProduct8BitSignedAccelerated_ )
+      , integerDotProduct8BitMixedSignednessAccelerated( integerDotProduct8BitMixedSignednessAccelerated_ )
+      , integerDotProduct4x8BitPackedUnsignedAccelerated( integerDotProduct4x8BitPackedUnsignedAccelerated_ )
+      , integerDotProduct4x8BitPackedSignedAccelerated( integerDotProduct4x8BitPackedSignedAccelerated_ )
+      , integerDotProduct4x8BitPackedMixedSignednessAccelerated( integerDotProduct4x8BitPackedMixedSignednessAccelerated_ )
+      , integerDotProduct16BitUnsignedAccelerated( integerDotProduct16BitUnsignedAccelerated_ )
+      , integerDotProduct16BitSignedAccelerated( integerDotProduct16BitSignedAccelerated_ )
+      , integerDotProduct16BitMixedSignednessAccelerated( integerDotProduct16BitMixedSignednessAccelerated_ )
+      , integerDotProduct32BitUnsignedAccelerated( integerDotProduct32BitUnsignedAccelerated_ )
+      , integerDotProduct32BitSignedAccelerated( integerDotProduct32BitSignedAccelerated_ )
+      , integerDotProduct32BitMixedSignednessAccelerated( integerDotProduct32BitMixedSignednessAccelerated_ )
+      , integerDotProduct64BitUnsignedAccelerated( integerDotProduct64BitUnsignedAccelerated_ )
+      , integerDotProduct64BitSignedAccelerated( integerDotProduct64BitSignedAccelerated_ )
+      , integerDotProduct64BitMixedSignednessAccelerated( integerDotProduct64BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitUnsignedAccelerated( integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitSignedAccelerated( integerDotProductAccumulatingSaturating8BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated( integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated( integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated(
+          integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitUnsignedAccelerated( integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitSignedAccelerated( integerDotProductAccumulatingSaturating16BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitUnsignedAccelerated( integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitSignedAccelerated( integerDotProductAccumulatingSaturating32BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitUnsignedAccelerated( integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitSignedAccelerated( integerDotProductAccumulatingSaturating64BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_ )
     {
     }
 
@@ -115508,11 +83459,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderIntegerDotProductProperties & operator=( PhysicalDeviceShaderIntegerDotProductProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderIntegerDotProductProperties & operator=( VkPhysicalDeviceShaderIntegerDotProductProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderIntegerDotProductProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerDotProductProperties const *>( &rhs );
       return *this;
     }
 
@@ -115526,49 +83477,43 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderIntegerDotProductProperties *>( this );
     }
 
-    operator VkPhysicalDeviceShaderIntegerDotProductProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderIntegerDotProductProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderIntegerDotProductProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderIntegerDotProductProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -115661,48 +83606,40 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                                                  = StructureType::ePhysicalDeviceShaderIntegerDotProductProperties;
-    void *        pNext                                                                  = {};
-    Bool32        integerDotProduct8BitUnsignedAccelerated                               = {};
-    Bool32        integerDotProduct8BitSignedAccelerated                                 = {};
-    Bool32        integerDotProduct8BitMixedSignednessAccelerated                        = {};
-    Bool32        integerDotProduct4x8BitPackedUnsignedAccelerated                       = {};
-    Bool32        integerDotProduct4x8BitPackedSignedAccelerated                         = {};
-    Bool32        integerDotProduct4x8BitPackedMixedSignednessAccelerated                = {};
-    Bool32        integerDotProduct16BitUnsignedAccelerated                              = {};
-    Bool32        integerDotProduct16BitSignedAccelerated                                = {};
-    Bool32        integerDotProduct16BitMixedSignednessAccelerated                       = {};
-    Bool32        integerDotProduct32BitUnsignedAccelerated                              = {};
-    Bool32        integerDotProduct32BitSignedAccelerated                                = {};
-    Bool32        integerDotProduct32BitMixedSignednessAccelerated                       = {};
-    Bool32        integerDotProduct64BitUnsignedAccelerated                              = {};
-    Bool32        integerDotProduct64BitSignedAccelerated                                = {};
-    Bool32        integerDotProduct64BitMixedSignednessAccelerated                       = {};
-    Bool32        integerDotProductAccumulatingSaturating8BitUnsignedAccelerated         = {};
-    Bool32        integerDotProductAccumulatingSaturating8BitSignedAccelerated           = {};
-    Bool32        integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated  = {};
-    Bool32        integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated = {};
-    Bool32        integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated   = {};
-    Bool32        integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated = {};
-    Bool32        integerDotProductAccumulatingSaturating16BitUnsignedAccelerated               = {};
-    Bool32        integerDotProductAccumulatingSaturating16BitSignedAccelerated                 = {};
-    Bool32        integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated        = {};
-    Bool32        integerDotProductAccumulatingSaturating32BitUnsignedAccelerated               = {};
-    Bool32        integerDotProductAccumulatingSaturating32BitSignedAccelerated                 = {};
-    Bool32        integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated        = {};
-    Bool32        integerDotProductAccumulatingSaturating64BitUnsignedAccelerated               = {};
-    Bool32        integerDotProductAccumulatingSaturating64BitSignedAccelerated                 = {};
-    Bool32        integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                            = StructureType::ePhysicalDeviceShaderIntegerDotProductProperties;
+    void *                              pNext                                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct8BitUnsignedAccelerated         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct8BitSignedAccelerated           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct8BitMixedSignednessAccelerated  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct4x8BitPackedUnsignedAccelerated = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct4x8BitPackedSignedAccelerated   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct4x8BitPackedMixedSignednessAccelerated                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct16BitUnsignedAccelerated                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct16BitSignedAccelerated                                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct16BitMixedSignednessAccelerated                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct32BitUnsignedAccelerated                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct32BitSignedAccelerated                                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct32BitMixedSignednessAccelerated                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct64BitUnsignedAccelerated                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct64BitSignedAccelerated                                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProduct64BitMixedSignednessAccelerated                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating8BitUnsignedAccelerated                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating8BitSignedAccelerated                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating16BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating16BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating32BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating32BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating64BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating64BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderIntegerDotProductProperties>
-  {
-    using Type = PhysicalDeviceShaderIntegerDotProductProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderIntegerDotProductProperties>
   {
@@ -115711,8 +83648,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderIntegerDotProductPropertiesKHR = PhysicalDeviceShaderIntegerDotProductProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL.html
   struct PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL
   {
     using NativeType = VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
@@ -115720,10 +83655,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL( Bool32 shaderIntegerFunctions2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderIntegerFunctions2{ shaderIntegerFunctions2_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL( VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerFunctions2_ = {},
+                                                                             void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderIntegerFunctions2( shaderIntegerFunctions2_ )
     {
     }
 
@@ -115737,15 +83673,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL &
       operator=( PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL & operator=( VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -115753,12 +83689,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL &
-      setShaderIntegerFunctions2( Bool32 shaderIntegerFunctions2_ ) VULKAN_HPP_NOEXCEPT
+      setShaderIntegerFunctions2( VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerFunctions2_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderIntegerFunctions2 = shaderIntegerFunctions2_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115770,18 +83706,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *>( this );
     }
 
-    operator VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderIntegerFunctions2 );
     }
@@ -115806,27 +83737,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
-    void *        pNext                   = {};
-    Bool32        shaderIntegerFunctions2 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderIntegerFunctions2 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL>
-  {
-    using Type = PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL>
   {
     using Type = PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR.html
   struct PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
@@ -115834,11 +83755,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR( Bool32 shaderMaximalReconvergence_ = {},
-                                                                              void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderMaximalReconvergence{ shaderMaximalReconvergence_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderMaximalReconvergence_ = {},
+                                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderMaximalReconvergence( shaderMaximalReconvergence_ )
     {
     }
 
@@ -115852,15 +83773,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR &
       operator=( PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR & operator=( VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -115868,12 +83789,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR &
-      setShaderMaximalReconvergence( Bool32 shaderMaximalReconvergence_ ) VULKAN_HPP_NOEXCEPT
+      setShaderMaximalReconvergence( VULKAN_HPP_NAMESPACE::Bool32 shaderMaximalReconvergence_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderMaximalReconvergence = shaderMaximalReconvergence_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115885,18 +83806,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderMaximalReconvergence );
     }
@@ -115921,27 +83837,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
-    void *        pNext                      = {};
-    Bool32        shaderMaximalReconvergence = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderMaximalReconvergence = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR>
   {
     using Type = PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT.html
   struct PhysicalDeviceShaderModuleIdentifierFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT;
@@ -115949,10 +83855,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderModuleIdentifierFeaturesEXT( Bool32 shaderModuleIdentifier_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderModuleIdentifier{ shaderModuleIdentifier_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderModuleIdentifierFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderModuleIdentifier_ = {},
+                                                                          void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderModuleIdentifier( shaderModuleIdentifier_ )
     {
     }
 
@@ -115965,27 +83872,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderModuleIdentifierFeaturesEXT & operator=( PhysicalDeviceShaderModuleIdentifierFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderModuleIdentifierFeaturesEXT & operator=( VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderModuleIdentifierFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderModuleIdentifierFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderModuleIdentifierFeaturesEXT & setShaderModuleIdentifier( Bool32 shaderModuleIdentifier_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderModuleIdentifierFeaturesEXT &
+      setShaderModuleIdentifier( VULKAN_HPP_NAMESPACE::Bool32 shaderModuleIdentifier_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderModuleIdentifier = shaderModuleIdentifier_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -115997,18 +83905,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderModuleIdentifier );
     }
@@ -116033,27 +83936,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT;
-    void *        pNext                  = {};
-    Bool32        shaderModuleIdentifier = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT;
+    void *                              pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderModuleIdentifier = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderModuleIdentifierFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT>
   {
     using Type = PhysicalDeviceShaderModuleIdentifierFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT.html
   struct PhysicalDeviceShaderModuleIdentifierPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT;
@@ -116061,12 +83954,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14
       PhysicalDeviceShaderModuleIdentifierPropertiesEXT( std::array<uint8_t, VK_UUID_SIZE> const & shaderModuleIdentifierAlgorithmUUID_ = {},
                                                          void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderModuleIdentifierAlgorithmUUID{ shaderModuleIdentifierAlgorithmUUID_ }
+      : pNext( pNext_ )
+      , shaderModuleIdentifierAlgorithmUUID( shaderModuleIdentifierAlgorithmUUID_ )
     {
     }
 
@@ -116080,11 +83973,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderModuleIdentifierPropertiesEXT &
       operator=( PhysicalDeviceShaderModuleIdentifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderModuleIdentifierPropertiesEXT & operator=( VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderModuleIdentifierPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderModuleIdentifierPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -116098,18 +83991,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderModuleIdentifierAlgorithmUUID );
     }
@@ -116134,27 +84022,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                               = StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT;
-    void *                                pNext                               = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> shaderModuleIdentifierAlgorithmUUID = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType = StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT;
+    void *                                                      pNext = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> shaderModuleIdentifierAlgorithmUUID = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT>
-  {
-    using Type = PhysicalDeviceShaderModuleIdentifierPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT>
   {
     using Type = PhysicalDeviceShaderModuleIdentifierPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderObjectFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderObjectFeaturesEXT.html
   struct PhysicalDeviceShaderObjectFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderObjectFeaturesEXT;
@@ -116162,10 +84040,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderObjectFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderObjectFeaturesEXT( Bool32 shaderObject_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderObject{ shaderObject_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderObjectFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderObject_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderObject( shaderObject_ )
     {
     }
 
@@ -116177,27 +84055,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderObjectFeaturesEXT & operator=( PhysicalDeviceShaderObjectFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderObjectFeaturesEXT & operator=( VkPhysicalDeviceShaderObjectFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderObjectFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderObjectFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderObjectFeaturesEXT & setShaderObject( Bool32 shaderObject_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderObjectFeaturesEXT & setShaderObject( VULKAN_HPP_NAMESPACE::Bool32 shaderObject_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderObject = shaderObject_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderObjectFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -116209,18 +84087,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderObjectFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderObjectFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderObjectFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderObjectFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderObjectFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderObject );
     }
@@ -116245,27 +84118,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceShaderObjectFeaturesEXT;
-    void *        pNext        = {};
-    Bool32        shaderObject = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceShaderObjectFeaturesEXT;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderObject = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderObjectFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderObjectFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderObjectFeaturesEXT>
   {
     using Type = PhysicalDeviceShaderObjectFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderObjectPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderObjectPropertiesEXT.html
   struct PhysicalDeviceShaderObjectPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceShaderObjectPropertiesEXT;
@@ -116273,13 +84136,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderObjectPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderObjectPropertiesEXT( std::array<uint8_t, VK_UUID_SIZE> const & shaderBinaryUUID_    = {},
                                                                      uint32_t                                  shaderBinaryVersion_ = {},
                                                                      void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderBinaryUUID{ shaderBinaryUUID_ }
-      , shaderBinaryVersion{ shaderBinaryVersion_ }
+      : pNext( pNext_ )
+      , shaderBinaryUUID( shaderBinaryUUID_ )
+      , shaderBinaryVersion( shaderBinaryVersion_ )
     {
     }
 
@@ -116291,11 +84154,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderObjectPropertiesEXT & operator=( PhysicalDeviceShaderObjectPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderObjectPropertiesEXT & operator=( VkPhysicalDeviceShaderObjectPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderObjectPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderObjectPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -116309,18 +84172,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderObjectPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderObjectPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderObjectPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderObjectPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderObjectPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderBinaryUUID, shaderBinaryVersion );
     }
@@ -116346,28 +84205,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType               = StructureType::ePhysicalDeviceShaderObjectPropertiesEXT;
-    void *                                pNext               = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> shaderBinaryUUID    = {};
-    uint32_t                              shaderBinaryVersion = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType               = StructureType::ePhysicalDeviceShaderObjectPropertiesEXT;
+    void *                                                      pNext               = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> shaderBinaryUUID    = {};
+    uint32_t                                                    shaderBinaryVersion = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderObjectPropertiesEXT>
-  {
-    using Type = PhysicalDeviceShaderObjectPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderObjectPropertiesEXT>
   {
     using Type = PhysicalDeviceShaderObjectPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderQuadControlFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderQuadControlFeaturesKHR.html
   struct PhysicalDeviceShaderQuadControlFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceShaderQuadControlFeaturesKHR;
@@ -116375,10 +84224,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderQuadControlFeaturesKHR( Bool32 shaderQuadControl_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderQuadControl{ shaderQuadControl_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderQuadControlFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderQuadControl_ = {},
+                                                                     void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderQuadControl( shaderQuadControl_ )
     {
     }
 
@@ -116390,27 +84240,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderQuadControlFeaturesKHR & operator=( PhysicalDeviceShaderQuadControlFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderQuadControlFeaturesKHR & operator=( VkPhysicalDeviceShaderQuadControlFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderQuadControlFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderQuadControlFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderQuadControlFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderQuadControlFeaturesKHR & setShaderQuadControl( Bool32 shaderQuadControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderQuadControlFeaturesKHR &
+      setShaderQuadControl( VULKAN_HPP_NAMESPACE::Bool32 shaderQuadControl_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderQuadControl = shaderQuadControl_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderQuadControlFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -116422,18 +84273,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderQuadControlFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderQuadControlFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderQuadControlFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderQuadControlFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderQuadControlFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderQuadControl );
     }
@@ -116458,259 +84304,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR;
-    void *        pNext             = {};
-    Bool32        shaderQuadControl = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderQuadControl = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderQuadControlFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderQuadControlFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR>
   {
     using Type = PhysicalDeviceShaderQuadControlFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR.html
-  struct PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR( Bool32 shaderRelaxedExtendedInstruction_ = {},
-                                                                                    void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderRelaxedExtendedInstruction{ shaderRelaxedExtendedInstruction_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR( PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR( VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR(
-          *reinterpret_cast<PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR &
-      operator=( PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR &
-      operator=( VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR &
-      setShaderRelaxedExtendedInstruction( Bool32 shaderRelaxedExtendedInstruction_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderRelaxedExtendedInstruction = shaderRelaxedExtendedInstruction_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderRelaxedExtendedInstruction );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderRelaxedExtendedInstruction == rhs.shaderRelaxedExtendedInstruction );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                            = StructureType::ePhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-    void *        pNext                            = {};
-    Bool32        shaderRelaxedExtendedInstruction = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT.html
-  struct PhysicalDeviceShaderReplicatedCompositesFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderReplicatedCompositesFeaturesEXT( Bool32 shaderReplicatedComposites_ = {},
-                                                                              void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderReplicatedComposites{ shaderReplicatedComposites_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderReplicatedCompositesFeaturesEXT( PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderReplicatedCompositesFeaturesEXT( VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderReplicatedCompositesFeaturesEXT( *reinterpret_cast<PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderReplicatedCompositesFeaturesEXT &
-      operator=( PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderReplicatedCompositesFeaturesEXT & operator=( VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderReplicatedCompositesFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderReplicatedCompositesFeaturesEXT &
-      setShaderReplicatedComposites( Bool32 shaderReplicatedComposites_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderReplicatedComposites = shaderReplicatedComposites_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderReplicatedComposites );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderReplicatedComposites == rhs.shaderReplicatedComposites );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderReplicatedCompositesFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-    void *        pNext                      = {};
-    Bool32        shaderReplicatedComposites = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderReplicatedCompositesFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderReplicatedCompositesFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderSMBuiltinsFeaturesNV.html
   struct PhysicalDeviceShaderSMBuiltinsFeaturesNV
   {
     using NativeType = VkPhysicalDeviceShaderSMBuiltinsFeaturesNV;
@@ -116718,10 +84322,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSMBuiltinsFeaturesNV( Bool32 shaderSMBuiltins_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSMBuiltins{ shaderSMBuiltins_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSMBuiltinsFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 shaderSMBuiltins_ = {},
+                                                                   void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderSMBuiltins( shaderSMBuiltins_ )
     {
     }
 
@@ -116733,27 +84338,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderSMBuiltinsFeaturesNV & operator=( PhysicalDeviceShaderSMBuiltinsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderSMBuiltinsFeaturesNV & operator=( VkPhysicalDeviceShaderSMBuiltinsFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderSMBuiltinsFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSMBuiltinsFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSMBuiltinsFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSMBuiltinsFeaturesNV & setShaderSMBuiltins( Bool32 shaderSMBuiltins_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSMBuiltinsFeaturesNV & setShaderSMBuiltins( VULKAN_HPP_NAMESPACE::Bool32 shaderSMBuiltins_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSMBuiltins = shaderSMBuiltins_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderSMBuiltinsFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -116765,18 +84370,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderSMBuiltinsFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShaderSMBuiltinsFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderSMBuiltinsFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSMBuiltinsFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderSMBuiltinsFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSMBuiltins );
     }
@@ -116801,27 +84401,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV;
-    void *        pNext            = {};
-    Bool32        shaderSMBuiltins = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSMBuiltins = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderSMBuiltinsFeaturesNV>
-  {
-    using Type = PhysicalDeviceShaderSMBuiltinsFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV>
   {
     using Type = PhysicalDeviceShaderSMBuiltinsFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderSMBuiltinsPropertiesNV.html
   struct PhysicalDeviceShaderSMBuiltinsPropertiesNV
   {
     using NativeType = VkPhysicalDeviceShaderSMBuiltinsPropertiesNV;
@@ -116829,12 +84419,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       PhysicalDeviceShaderSMBuiltinsPropertiesNV( uint32_t shaderSMCount_ = {}, uint32_t shaderWarpsPerSM_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSMCount{ shaderSMCount_ }
-      , shaderWarpsPerSM{ shaderWarpsPerSM_ }
+      : pNext( pNext_ )
+      , shaderSMCount( shaderSMCount_ )
+      , shaderWarpsPerSM( shaderWarpsPerSM_ )
     {
     }
 
@@ -116846,11 +84436,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderSMBuiltinsPropertiesNV & operator=( PhysicalDeviceShaderSMBuiltinsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderSMBuiltinsPropertiesNV & operator=( VkPhysicalDeviceShaderSMBuiltinsPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderSMBuiltinsPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSMBuiltinsPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -116864,18 +84454,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderSMBuiltinsPropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShaderSMBuiltinsPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderSMBuiltinsPropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSMBuiltinsPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderSMBuiltinsPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSMCount, shaderWarpsPerSM );
     }
@@ -116900,28 +84485,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV;
-    void *        pNext            = {};
-    uint32_t      shaderSMCount    = {};
-    uint32_t      shaderWarpsPerSM = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV;
+    void *                              pNext            = {};
+    uint32_t                            shaderSMCount    = {};
+    uint32_t                            shaderWarpsPerSM = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderSMBuiltinsPropertiesNV>
-  {
-    using Type = PhysicalDeviceShaderSMBuiltinsPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV>
   {
     using Type = PhysicalDeviceShaderSMBuiltinsPropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures.html
   struct PhysicalDeviceShaderSubgroupExtendedTypesFeatures
   {
     using NativeType = VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures;
@@ -116929,11 +84504,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupExtendedTypesFeatures( Bool32 shaderSubgroupExtendedTypes_ = {},
-                                                                            void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSubgroupExtendedTypes{ shaderSubgroupExtendedTypes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupExtendedTypesFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupExtendedTypes_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderSubgroupExtendedTypes( shaderSubgroupExtendedTypes_ )
     {
     }
 
@@ -116947,15 +84522,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderSubgroupExtendedTypesFeatures &
       operator=( PhysicalDeviceShaderSubgroupExtendedTypesFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderSubgroupExtendedTypesFeatures & operator=( VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderSubgroupExtendedTypesFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupExtendedTypesFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupExtendedTypesFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -116963,12 +84538,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupExtendedTypesFeatures &
-      setShaderSubgroupExtendedTypes( Bool32 shaderSubgroupExtendedTypes_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSubgroupExtendedTypes( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupExtendedTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupExtendedTypes = shaderSubgroupExtendedTypes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -116980,18 +84555,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSubgroupExtendedTypes );
     }
@@ -117016,19 +84586,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures;
-    void *        pNext                       = {};
-    Bool32        shaderSubgroupExtendedTypes = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupExtendedTypes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures>
-  {
-    using Type = PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures>
   {
@@ -117037,93 +84599,88 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR = PhysicalDeviceShaderSubgroupExtendedTypesFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderSubgroupRotateFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderSubgroupRotateFeatures.html
-  struct PhysicalDeviceShaderSubgroupRotateFeatures
+  struct PhysicalDeviceShaderSubgroupRotateFeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceShaderSubgroupRotateFeatures;
+    using NativeType = VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSubgroupRotateFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSubgroupRotateFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupRotateFeatures( Bool32 shaderSubgroupRotate_          = {},
-                                                                     Bool32 shaderSubgroupRotateClustered_ = {},
-                                                                     void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSubgroupRotate{ shaderSubgroupRotate_ }
-      , shaderSubgroupRotateClustered{ shaderSubgroupRotateClustered_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupRotateFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupRotate_          = {},
+                                                                        VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupRotateClustered_ = {},
+                                                                        void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderSubgroupRotate( shaderSubgroupRotate_ )
+      , shaderSubgroupRotateClustered( shaderSubgroupRotateClustered_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupRotateFeatures( PhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceShaderSubgroupRotateFeaturesKHR( PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceShaderSubgroupRotateFeatures( VkPhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderSubgroupRotateFeatures( *reinterpret_cast<PhysicalDeviceShaderSubgroupRotateFeatures const *>( &rhs ) )
+    PhysicalDeviceShaderSubgroupRotateFeaturesKHR( VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceShaderSubgroupRotateFeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderSubgroupRotateFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceShaderSubgroupRotateFeatures & operator=( PhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceShaderSubgroupRotateFeaturesKHR & operator=( PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceShaderSubgroupRotateFeatures & operator=( VkPhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceShaderSubgroupRotateFeaturesKHR & operator=( VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderSubgroupRotateFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupRotateFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeatures & setShaderSubgroupRotate( Bool32 shaderSubgroupRotate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeaturesKHR &
+      setShaderSubgroupRotate( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupRotate_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupRotate = shaderSubgroupRotate_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeatures &
-      setShaderSubgroupRotateClustered( Bool32 shaderSubgroupRotateClustered_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupRotateFeaturesKHR &
+      setShaderSubgroupRotateClustered( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupRotateClustered_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupRotateClustered = shaderSubgroupRotateClustered_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceShaderSubgroupRotateFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderSubgroupRotateFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderSubgroupRotateFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceShaderSubgroupRotateFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSubgroupRotateFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderSubgroupRotateFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSubgroupRotateFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderSubgroupRotateFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSubgroupRotate, shaderSubgroupRotateClustered );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderSubgroupRotateFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -117133,37 +84690,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceShaderSubgroupRotateFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceShaderSubgroupRotateFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDeviceShaderSubgroupRotateFeatures;
-    void *        pNext                         = {};
-    Bool32        shaderSubgroupRotate          = {};
-    Bool32        shaderSubgroupRotateClustered = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDeviceShaderSubgroupRotateFeaturesKHR;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupRotate          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupRotateClustered = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderSubgroupRotateFeatures>
-  {
-    using Type = PhysicalDeviceShaderSubgroupRotateFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSubgroupRotateFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSubgroupRotateFeaturesKHR>
   {
-    using Type = PhysicalDeviceShaderSubgroupRotateFeatures;
+    using Type = PhysicalDeviceShaderSubgroupRotateFeaturesKHR;
   };
 
-  using PhysicalDeviceShaderSubgroupRotateFeaturesKHR = PhysicalDeviceShaderSubgroupRotateFeatures;
-
-  // wrapper struct for struct VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR.html
   struct PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
@@ -117171,11 +84716,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR( Bool32 shaderSubgroupUniformControlFlow_ = {},
-                                                                                    void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderSubgroupUniformControlFlow{ shaderSubgroupUniformControlFlow_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupUniformControlFlow_ = {},
+                                                                                    void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderSubgroupUniformControlFlow( shaderSubgroupUniformControlFlow_ )
     {
     }
 
@@ -117190,16 +84735,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR &
       operator=( PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR &
       operator=( VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -117207,12 +84752,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR &
-      setShaderSubgroupUniformControlFlow( Bool32 shaderSubgroupUniformControlFlow_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSubgroupUniformControlFlow( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupUniformControlFlow_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupUniformControlFlow = shaderSubgroupUniformControlFlow_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -117224,18 +84769,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderSubgroupUniformControlFlow );
     }
@@ -117260,27 +84800,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
-    void *        pNext                            = {};
-    Bool32        shaderSubgroupUniformControlFlow = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupUniformControlFlow = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR>
   {
     using Type = PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderTerminateInvocationFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderTerminateInvocationFeatures.html
   struct PhysicalDeviceShaderTerminateInvocationFeatures
   {
     using NativeType = VkPhysicalDeviceShaderTerminateInvocationFeatures;
@@ -117288,10 +84818,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTerminateInvocationFeatures( Bool32 shaderTerminateInvocation_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderTerminateInvocation{ shaderTerminateInvocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTerminateInvocationFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderTerminateInvocation_ = {},
+                                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderTerminateInvocation( shaderTerminateInvocation_ )
     {
     }
 
@@ -117304,15 +84835,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderTerminateInvocationFeatures & operator=( PhysicalDeviceShaderTerminateInvocationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderTerminateInvocationFeatures & operator=( VkPhysicalDeviceShaderTerminateInvocationFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderTerminateInvocationFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTerminateInvocationFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTerminateInvocationFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -117320,12 +84851,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTerminateInvocationFeatures &
-      setShaderTerminateInvocation( Bool32 shaderTerminateInvocation_ ) VULKAN_HPP_NOEXCEPT
+      setShaderTerminateInvocation( VULKAN_HPP_NAMESPACE::Bool32 shaderTerminateInvocation_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTerminateInvocation = shaderTerminateInvocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderTerminateInvocationFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -117337,18 +84868,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderTerminateInvocationFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceShaderTerminateInvocationFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderTerminateInvocationFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderTerminateInvocationFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderTerminateInvocationFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderTerminateInvocation );
     }
@@ -117373,19 +84899,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures;
-    void *        pNext                     = {};
-    Bool32        shaderTerminateInvocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures;
+    void *                              pNext                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTerminateInvocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderTerminateInvocationFeatures>
-  {
-    using Type = PhysicalDeviceShaderTerminateInvocationFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures>
   {
@@ -117394,8 +84912,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceShaderTerminateInvocationFeaturesKHR = PhysicalDeviceShaderTerminateInvocationFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceShaderTileImageFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderTileImageFeaturesEXT.html
   struct PhysicalDeviceShaderTileImageFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceShaderTileImageFeaturesEXT;
@@ -117403,15 +84919,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTileImageFeaturesEXT( Bool32 shaderTileImageColorReadAccess_   = {},
-                                                                   Bool32 shaderTileImageDepthReadAccess_   = {},
-                                                                   Bool32 shaderTileImageStencilReadAccess_ = {},
-                                                                   void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderTileImageColorReadAccess{ shaderTileImageColorReadAccess_ }
-      , shaderTileImageDepthReadAccess{ shaderTileImageDepthReadAccess_ }
-      , shaderTileImageStencilReadAccess{ shaderTileImageStencilReadAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTileImageFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageColorReadAccess_   = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageDepthReadAccess_   = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageStencilReadAccess_ = {},
+                                                                   void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderTileImageColorReadAccess( shaderTileImageColorReadAccess_ )
+      , shaderTileImageDepthReadAccess( shaderTileImageDepthReadAccess_ )
+      , shaderTileImageStencilReadAccess( shaderTileImageStencilReadAccess_ )
     {
     }
 
@@ -117423,15 +84939,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderTileImageFeaturesEXT & operator=( PhysicalDeviceShaderTileImageFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderTileImageFeaturesEXT & operator=( VkPhysicalDeviceShaderTileImageFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderTileImageFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTileImageFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTileImageFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -117439,26 +84955,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTileImageFeaturesEXT &
-      setShaderTileImageColorReadAccess( Bool32 shaderTileImageColorReadAccess_ ) VULKAN_HPP_NOEXCEPT
+      setShaderTileImageColorReadAccess( VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageColorReadAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTileImageColorReadAccess = shaderTileImageColorReadAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTileImageFeaturesEXT &
-      setShaderTileImageDepthReadAccess( Bool32 shaderTileImageDepthReadAccess_ ) VULKAN_HPP_NOEXCEPT
+      setShaderTileImageDepthReadAccess( VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageDepthReadAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTileImageDepthReadAccess = shaderTileImageDepthReadAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderTileImageFeaturesEXT &
-      setShaderTileImageStencilReadAccess( Bool32 shaderTileImageStencilReadAccess_ ) VULKAN_HPP_NOEXCEPT
+      setShaderTileImageStencilReadAccess( VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageStencilReadAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTileImageStencilReadAccess = shaderTileImageStencilReadAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShaderTileImageFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -117470,18 +84986,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderTileImageFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderTileImageFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderTileImageFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderTileImageFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderTileImageFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderTileImageColorReadAccess, shaderTileImageDepthReadAccess, shaderTileImageStencilReadAccess );
     }
@@ -117508,29 +85023,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT;
-    void *        pNext                            = {};
-    Bool32        shaderTileImageColorReadAccess   = {};
-    Bool32        shaderTileImageDepthReadAccess   = {};
-    Bool32        shaderTileImageStencilReadAccess = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT;
+    void *                              pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageColorReadAccess   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageDepthReadAccess   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageStencilReadAccess = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderTileImageFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderTileImageFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT>
   {
     using Type = PhysicalDeviceShaderTileImageFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderTileImagePropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderTileImagePropertiesEXT.html
   struct PhysicalDeviceShaderTileImagePropertiesEXT
   {
     using NativeType = VkPhysicalDeviceShaderTileImagePropertiesEXT;
@@ -117538,15 +85043,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTileImagePropertiesEXT( Bool32 shaderTileImageCoherentReadAccelerated_           = {},
-                                                                     Bool32 shaderTileImageReadSampleFromPixelRateInvocation_ = {},
-                                                                     Bool32 shaderTileImageReadFromHelperInvocation_          = {},
-                                                                     void * pNext_                                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderTileImageCoherentReadAccelerated{ shaderTileImageCoherentReadAccelerated_ }
-      , shaderTileImageReadSampleFromPixelRateInvocation{ shaderTileImageReadSampleFromPixelRateInvocation_ }
-      , shaderTileImageReadFromHelperInvocation{ shaderTileImageReadFromHelperInvocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderTileImagePropertiesEXT( VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageCoherentReadAccelerated_           = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageReadSampleFromPixelRateInvocation_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 shaderTileImageReadFromHelperInvocation_          = {},
+                                                                     void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderTileImageCoherentReadAccelerated( shaderTileImageCoherentReadAccelerated_ )
+      , shaderTileImageReadSampleFromPixelRateInvocation( shaderTileImageReadSampleFromPixelRateInvocation_ )
+      , shaderTileImageReadFromHelperInvocation( shaderTileImageReadFromHelperInvocation_ )
     {
     }
 
@@ -117558,11 +85063,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShaderTileImagePropertiesEXT & operator=( PhysicalDeviceShaderTileImagePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShaderTileImagePropertiesEXT & operator=( VkPhysicalDeviceShaderTileImagePropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShaderTileImagePropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderTileImagePropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -117576,18 +85081,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShaderTileImagePropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceShaderTileImagePropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderTileImagePropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderTileImagePropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderTileImagePropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
         sType, pNext, shaderTileImageCoherentReadAccelerated, shaderTileImageReadSampleFromPixelRateInvocation, shaderTileImageReadFromHelperInvocation );
@@ -117615,257 +85119,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                            = StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT;
-    void *        pNext                                            = {};
-    Bool32        shaderTileImageCoherentReadAccelerated           = {};
-    Bool32        shaderTileImageReadSampleFromPixelRateInvocation = {};
-    Bool32        shaderTileImageReadFromHelperInvocation          = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                            = StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT;
+    void *                              pNext                                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageCoherentReadAccelerated           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageReadSampleFromPixelRateInvocation = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTileImageReadFromHelperInvocation          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderTileImagePropertiesEXT>
-  {
-    using Type = PhysicalDeviceShaderTileImagePropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT>
   {
     using Type = PhysicalDeviceShaderTileImagePropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT.html
-  struct PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT( Bool32 shaderUniformBufferUnsizedArray_ = {},
-                                                                                   void * pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderUniformBufferUnsizedArray{ shaderUniformBufferUnsizedArray_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT( PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT( VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT( *reinterpret_cast<PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT &
-      operator=( PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT &
-      operator=( VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT &
-      setShaderUniformBufferUnsizedArray( Bool32 shaderUniformBufferUnsizedArray_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderUniformBufferUnsizedArray = shaderUniformBufferUnsizedArray_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderUniformBufferUnsizedArray );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderUniformBufferUnsizedArray == rhs.shaderUniformBufferUnsizedArray );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                           = StructureType::ePhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-    void *        pNext                           = {};
-    Bool32        shaderUniformBufferUnsizedArray = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT>
-  {
-    using Type = PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShaderUntypedPointersFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShaderUntypedPointersFeaturesKHR.html
-  struct PhysicalDeviceShaderUntypedPointersFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShaderUntypedPointersFeaturesKHR( Bool32 shaderUntypedPointers_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderUntypedPointers{ shaderUntypedPointers_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceShaderUntypedPointersFeaturesKHR( PhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceShaderUntypedPointersFeaturesKHR( VkPhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceShaderUntypedPointersFeaturesKHR( *reinterpret_cast<PhysicalDeviceShaderUntypedPointersFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceShaderUntypedPointersFeaturesKHR & operator=( PhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceShaderUntypedPointersFeaturesKHR & operator=( VkPhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceShaderUntypedPointersFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderUntypedPointersFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShaderUntypedPointersFeaturesKHR & setShaderUntypedPointers( Bool32 shaderUntypedPointers_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderUntypedPointers = shaderUntypedPointers_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceShaderUntypedPointersFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceShaderUntypedPointersFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUntypedPointersFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceShaderUntypedPointersFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUntypedPointersFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShaderUntypedPointersFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceShaderUntypedPointersFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShaderUntypedPointersFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, shaderUntypedPointers );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceShaderUntypedPointersFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( shaderUntypedPointers == rhs.shaderUntypedPointers );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceShaderUntypedPointersFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                 = StructureType::ePhysicalDeviceShaderUntypedPointersFeaturesKHR;
-    void *        pNext                 = {};
-    Bool32        shaderUntypedPointers = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShaderUntypedPointersFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderUntypedPointersFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceShaderUntypedPointersFeaturesKHR>
-  {
-    using Type = PhysicalDeviceShaderUntypedPointersFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceShadingRateImageFeaturesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShadingRateImageFeaturesNV.html
   struct PhysicalDeviceShadingRateImageFeaturesNV
   {
     using NativeType = VkPhysicalDeviceShadingRateImageFeaturesNV;
@@ -117873,13 +85139,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShadingRateImageFeaturesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShadingRateImageFeaturesNV( Bool32 shadingRateImage_             = {},
-                                                                   Bool32 shadingRateCoarseSampleOrder_ = {},
-                                                                   void * pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shadingRateImage{ shadingRateImage_ }
-      , shadingRateCoarseSampleOrder{ shadingRateCoarseSampleOrder_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShadingRateImageFeaturesNV( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImage_             = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32 shadingRateCoarseSampleOrder_ = {},
+                                                                   void *                       pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shadingRateImage( shadingRateImage_ )
+      , shadingRateCoarseSampleOrder( shadingRateCoarseSampleOrder_ )
     {
     }
 
@@ -117891,34 +85157,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShadingRateImageFeaturesNV & operator=( PhysicalDeviceShadingRateImageFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShadingRateImageFeaturesNV & operator=( VkPhysicalDeviceShadingRateImageFeaturesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShadingRateImageFeaturesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShadingRateImageFeaturesNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShadingRateImageFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShadingRateImageFeaturesNV & setShadingRateImage( Bool32 shadingRateImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShadingRateImageFeaturesNV & setShadingRateImage( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImage_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateImage = shadingRateImage_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceShadingRateImageFeaturesNV &
-      setShadingRateCoarseSampleOrder( Bool32 shadingRateCoarseSampleOrder_ ) VULKAN_HPP_NOEXCEPT
+      setShadingRateCoarseSampleOrder( VULKAN_HPP_NAMESPACE::Bool32 shadingRateCoarseSampleOrder_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateCoarseSampleOrder = shadingRateCoarseSampleOrder_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceShadingRateImageFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -117930,18 +85196,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShadingRateImageFeaturesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShadingRateImageFeaturesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShadingRateImageFeaturesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShadingRateImageFeaturesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShadingRateImageFeaturesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shadingRateImage, shadingRateCoarseSampleOrder );
     }
@@ -117967,28 +85228,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                        = StructureType::ePhysicalDeviceShadingRateImageFeaturesNV;
-    void *        pNext                        = {};
-    Bool32        shadingRateImage             = {};
-    Bool32        shadingRateCoarseSampleOrder = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceShadingRateImageFeaturesNV;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shadingRateImage             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shadingRateCoarseSampleOrder = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShadingRateImageFeaturesNV>
-  {
-    using Type = PhysicalDeviceShadingRateImageFeaturesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShadingRateImageFeaturesNV>
   {
     using Type = PhysicalDeviceShadingRateImageFeaturesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceShadingRateImagePropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceShadingRateImagePropertiesNV.html
   struct PhysicalDeviceShadingRateImagePropertiesNV
   {
     using NativeType = VkPhysicalDeviceShadingRateImagePropertiesNV;
@@ -117996,15 +85247,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceShadingRateImagePropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceShadingRateImagePropertiesNV( Extent2D shadingRateTexelSize_        = {},
-                                                                     uint32_t shadingRatePaletteSize_      = {},
-                                                                     uint32_t shadingRateMaxCoarseSamples_ = {},
-                                                                     void *   pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shadingRateTexelSize{ shadingRateTexelSize_ }
-      , shadingRatePaletteSize{ shadingRatePaletteSize_ }
-      , shadingRateMaxCoarseSamples{ shadingRateMaxCoarseSamples_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceShadingRateImagePropertiesNV( VULKAN_HPP_NAMESPACE::Extent2D shadingRateTexelSize_        = {},
+                                                                     uint32_t                       shadingRatePaletteSize_      = {},
+                                                                     uint32_t                       shadingRateMaxCoarseSamples_ = {},
+                                                                     void *                         pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shadingRateTexelSize( shadingRateTexelSize_ )
+      , shadingRatePaletteSize( shadingRatePaletteSize_ )
+      , shadingRateMaxCoarseSamples( shadingRateMaxCoarseSamples_ )
     {
     }
 
@@ -118016,11 +85267,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceShadingRateImagePropertiesNV & operator=( PhysicalDeviceShadingRateImagePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceShadingRateImagePropertiesNV & operator=( VkPhysicalDeviceShadingRateImagePropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceShadingRateImagePropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceShadingRateImagePropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -118034,18 +85285,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceShadingRateImagePropertiesNV *>( this );
     }
 
-    operator VkPhysicalDeviceShadingRateImagePropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceShadingRateImagePropertiesNV *>( this );
-    }
-
-    operator VkPhysicalDeviceShadingRateImagePropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceShadingRateImagePropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Extent2D const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shadingRateTexelSize, shadingRatePaletteSize, shadingRateMaxCoarseSamples );
     }
@@ -118071,29 +85317,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceShadingRateImagePropertiesNV;
-    void *        pNext                       = {};
-    Extent2D      shadingRateTexelSize        = {};
-    uint32_t      shadingRatePaletteSize      = {};
-    uint32_t      shadingRateMaxCoarseSamples = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceShadingRateImagePropertiesNV;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      shadingRateTexelSize        = {};
+    uint32_t                            shadingRatePaletteSize      = {};
+    uint32_t                            shadingRateMaxCoarseSamples = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceShadingRateImagePropertiesNV>
-  {
-    using Type = PhysicalDeviceShadingRateImagePropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceShadingRateImagePropertiesNV>
   {
     using Type = PhysicalDeviceShadingRateImagePropertiesNV;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSparseImageFormatInfo2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSparseImageFormatInfo2.html
   struct PhysicalDeviceSparseImageFormatInfo2
   {
     using NativeType = VkPhysicalDeviceSparseImageFormatInfo2;
@@ -118101,19 +85337,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSparseImageFormatInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSparseImageFormatInfo2( Format              format_  = Format::eUndefined,
-                                                               ImageType           type_    = ImageType::e1D,
-                                                               SampleCountFlagBits samples_ = SampleCountFlagBits::e1,
-                                                               ImageUsageFlags     usage_   = {},
-                                                               ImageTiling         tiling_  = ImageTiling::eOptimal,
-                                                               const void *        pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , type{ type_ }
-      , samples{ samples_ }
-      , usage{ usage_ }
-      , tiling{ tiling_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceSparseImageFormatInfo2( VULKAN_HPP_NAMESPACE::Format              format_  = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                            VULKAN_HPP_NAMESPACE::ImageType           type_    = VULKAN_HPP_NAMESPACE::ImageType::e1D,
+                                            VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_ = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1,
+                                            VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage_   = {},
+                                            VULKAN_HPP_NAMESPACE::ImageTiling         tiling_  = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal,
+                                            const void *                              pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , type( type_ )
+      , samples( samples_ )
+      , usage( usage_ )
+      , tiling( tiling_ )
     {
     }
 
@@ -118125,51 +85362,51 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSparseImageFormatInfo2 & operator=( PhysicalDeviceSparseImageFormatInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSparseImageFormatInfo2 & operator=( VkPhysicalDeviceSparseImageFormatInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSparseImageFormatInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSparseImageFormatInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setType( ImageType type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setType( VULKAN_HPP_NAMESPACE::ImageType type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setSamples( SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setSamples( VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples_ ) VULKAN_HPP_NOEXCEPT
     {
       samples = samples_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setUsage( ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags usage_ ) VULKAN_HPP_NOEXCEPT
     {
       usage = usage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setTiling( ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSparseImageFormatInfo2 & setTiling( VULKAN_HPP_NAMESPACE::ImageTiling tiling_ ) VULKAN_HPP_NOEXCEPT
     {
       tiling = tiling_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSparseImageFormatInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -118181,24 +85418,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSparseImageFormatInfo2 *>( this );
     }
 
-    operator VkPhysicalDeviceSparseImageFormatInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSparseImageFormatInfo2 *>( this );
-    }
-
-    operator VkPhysicalDeviceSparseImageFormatInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSparseImageFormatInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Format const &,
-               ImageType const &,
-               SampleCountFlagBits const &,
-               ImageUsageFlags const &,
-               ImageTiling const &>
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::ImageType const &,
+               VULKAN_HPP_NAMESPACE::SampleCountFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageTiling const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, format, type, samples, usage, tiling );
@@ -118225,23 +85456,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType   = StructureType::ePhysicalDeviceSparseImageFormatInfo2;
-    const void *        pNext   = {};
-    Format              format  = Format::eUndefined;
-    ImageType           type    = ImageType::e1D;
-    SampleCountFlagBits samples = SampleCountFlagBits::e1;
-    ImageUsageFlags     usage   = {};
-    ImageTiling         tiling  = ImageTiling::eOptimal;
+    VULKAN_HPP_NAMESPACE::StructureType       sType   = StructureType::ePhysicalDeviceSparseImageFormatInfo2;
+    const void *                              pNext   = {};
+    VULKAN_HPP_NAMESPACE::Format              format  = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ImageType           type    = VULKAN_HPP_NAMESPACE::ImageType::e1D;
+    VULKAN_HPP_NAMESPACE::SampleCountFlagBits samples = VULKAN_HPP_NAMESPACE::SampleCountFlagBits::e1;
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags     usage   = {};
+    VULKAN_HPP_NAMESPACE::ImageTiling         tiling  = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSparseImageFormatInfo2>
-  {
-    using Type = PhysicalDeviceSparseImageFormatInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSparseImageFormatInfo2>
   {
@@ -118250,8 +85473,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSparseImageFormatInfo2KHR = PhysicalDeviceSparseImageFormatInfo2;
 
-  // wrapper struct for struct VkPhysicalDeviceSubgroupProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubgroupProperties.html
   struct PhysicalDeviceSubgroupProperties
   {
     using NativeType = VkPhysicalDeviceSubgroupProperties;
@@ -118259,17 +85480,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubgroupProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupProperties( uint32_t             subgroupSize_              = {},
-                                                           ShaderStageFlags     supportedStages_           = {},
-                                                           SubgroupFeatureFlags supportedOperations_       = {},
-                                                           Bool32               quadOperationsInAllStages_ = {},
-                                                           void *               pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subgroupSize{ subgroupSize_ }
-      , supportedStages{ supportedStages_ }
-      , supportedOperations{ supportedOperations_ }
-      , quadOperationsInAllStages{ quadOperationsInAllStages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupProperties( uint32_t                                   subgroupSize_              = {},
+                                                           VULKAN_HPP_NAMESPACE::ShaderStageFlags     supportedStages_           = {},
+                                                           VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags supportedOperations_       = {},
+                                                           VULKAN_HPP_NAMESPACE::Bool32               quadOperationsInAllStages_ = {},
+                                                           void *                                     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subgroupSize( subgroupSize_ )
+      , supportedStages( supportedStages_ )
+      , supportedOperations( supportedOperations_ )
+      , quadOperationsInAllStages( quadOperationsInAllStages_ )
     {
     }
 
@@ -118281,11 +85502,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubgroupProperties & operator=( PhysicalDeviceSubgroupProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubgroupProperties & operator=( VkPhysicalDeviceSubgroupProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubgroupProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupProperties const *>( &rhs );
       return *this;
     }
 
@@ -118299,18 +85520,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubgroupProperties *>( this );
     }
 
-    operator VkPhysicalDeviceSubgroupProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubgroupProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSubgroupProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubgroupProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, ShaderStageFlags const &, SubgroupFeatureFlags const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subgroupSize, supportedStages, supportedOperations, quadOperationsInAllStages );
@@ -118337,30 +85557,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType                     = StructureType::ePhysicalDeviceSubgroupProperties;
-    void *               pNext                     = {};
-    uint32_t             subgroupSize              = {};
-    ShaderStageFlags     supportedStages           = {};
-    SubgroupFeatureFlags supportedOperations       = {};
-    Bool32               quadOperationsInAllStages = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType                     = StructureType::ePhysicalDeviceSubgroupProperties;
+    void *                                     pNext                     = {};
+    uint32_t                                   subgroupSize              = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags     supportedStages           = {};
+    VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags supportedOperations       = {};
+    VULKAN_HPP_NAMESPACE::Bool32               quadOperationsInAllStages = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubgroupProperties>
-  {
-    using Type = PhysicalDeviceSubgroupProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubgroupProperties>
   {
     using Type = PhysicalDeviceSubgroupProperties;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSubgroupSizeControlFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubgroupSizeControlFeatures.html
   struct PhysicalDeviceSubgroupSizeControlFeatures
   {
     using NativeType = VkPhysicalDeviceSubgroupSizeControlFeatures;
@@ -118368,13 +85578,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubgroupSizeControlFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupSizeControlFeatures( Bool32 subgroupSizeControl_  = {},
-                                                                    Bool32 computeFullSubgroups_ = {},
-                                                                    void * pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subgroupSizeControl{ subgroupSizeControl_ }
-      , computeFullSubgroups{ computeFullSubgroups_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupSizeControlFeatures( VULKAN_HPP_NAMESPACE::Bool32 subgroupSizeControl_  = {},
+                                                                    VULKAN_HPP_NAMESPACE::Bool32 computeFullSubgroups_ = {},
+                                                                    void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subgroupSizeControl( subgroupSizeControl_ )
+      , computeFullSubgroups( computeFullSubgroups_ )
     {
     }
 
@@ -118386,33 +85596,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubgroupSizeControlFeatures & operator=( PhysicalDeviceSubgroupSizeControlFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubgroupSizeControlFeatures & operator=( VkPhysicalDeviceSubgroupSizeControlFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubgroupSizeControlFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupSizeControlFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubgroupSizeControlFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubgroupSizeControlFeatures & setSubgroupSizeControl( Bool32 subgroupSizeControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubgroupSizeControlFeatures &
+      setSubgroupSizeControl( VULKAN_HPP_NAMESPACE::Bool32 subgroupSizeControl_ ) VULKAN_HPP_NOEXCEPT
     {
       subgroupSizeControl = subgroupSizeControl_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubgroupSizeControlFeatures & setComputeFullSubgroups( Bool32 computeFullSubgroups_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubgroupSizeControlFeatures &
+      setComputeFullSubgroups( VULKAN_HPP_NAMESPACE::Bool32 computeFullSubgroups_ ) VULKAN_HPP_NOEXCEPT
     {
       computeFullSubgroups = computeFullSubgroups_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSubgroupSizeControlFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -118424,18 +85636,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubgroupSizeControlFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceSubgroupSizeControlFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubgroupSizeControlFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceSubgroupSizeControlFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubgroupSizeControlFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subgroupSizeControl, computeFullSubgroups );
     }
@@ -118461,20 +85668,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceSubgroupSizeControlFeatures;
-    void *        pNext                = {};
-    Bool32        subgroupSizeControl  = {};
-    Bool32        computeFullSubgroups = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceSubgroupSizeControlFeatures;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subgroupSizeControl  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        computeFullSubgroups = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubgroupSizeControlFeatures>
-  {
-    using Type = PhysicalDeviceSubgroupSizeControlFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubgroupSizeControlFeatures>
   {
@@ -118483,8 +85682,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSubgroupSizeControlFeaturesEXT = PhysicalDeviceSubgroupSizeControlFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceSubgroupSizeControlProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubgroupSizeControlProperties.html
   struct PhysicalDeviceSubgroupSizeControlProperties
   {
     using NativeType = VkPhysicalDeviceSubgroupSizeControlProperties;
@@ -118492,17 +85689,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubgroupSizeControlProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupSizeControlProperties( uint32_t         minSubgroupSize_              = {},
-                                                                      uint32_t         maxSubgroupSize_              = {},
-                                                                      uint32_t         maxComputeWorkgroupSubgroups_ = {},
-                                                                      ShaderStageFlags requiredSubgroupSizeStages_   = {},
-                                                                      void *           pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minSubgroupSize{ minSubgroupSize_ }
-      , maxSubgroupSize{ maxSubgroupSize_ }
-      , maxComputeWorkgroupSubgroups{ maxComputeWorkgroupSubgroups_ }
-      , requiredSubgroupSizeStages{ requiredSubgroupSizeStages_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubgroupSizeControlProperties( uint32_t                               minSubgroupSize_              = {},
+                                                                      uint32_t                               maxSubgroupSize_              = {},
+                                                                      uint32_t                               maxComputeWorkgroupSubgroups_ = {},
+                                                                      VULKAN_HPP_NAMESPACE::ShaderStageFlags requiredSubgroupSizeStages_   = {},
+                                                                      void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minSubgroupSize( minSubgroupSize_ )
+      , maxSubgroupSize( maxSubgroupSize_ )
+      , maxComputeWorkgroupSubgroups( maxComputeWorkgroupSubgroups_ )
+      , requiredSubgroupSizeStages( requiredSubgroupSizeStages_ )
     {
     }
 
@@ -118514,11 +85711,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubgroupSizeControlProperties & operator=( PhysicalDeviceSubgroupSizeControlProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubgroupSizeControlProperties & operator=( VkPhysicalDeviceSubgroupSizeControlProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubgroupSizeControlProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubgroupSizeControlProperties const *>( &rhs );
       return *this;
     }
 
@@ -118532,18 +85729,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubgroupSizeControlProperties *>( this );
     }
 
-    operator VkPhysicalDeviceSubgroupSizeControlProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubgroupSizeControlProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceSubgroupSizeControlProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubgroupSizeControlProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, uint32_t const &, ShaderStageFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, minSubgroupSize, maxSubgroupSize, maxComputeWorkgroupSubgroups, requiredSubgroupSizeStages );
@@ -118570,22 +85766,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                        = StructureType::ePhysicalDeviceSubgroupSizeControlProperties;
-    void *           pNext                        = {};
-    uint32_t         minSubgroupSize              = {};
-    uint32_t         maxSubgroupSize              = {};
-    uint32_t         maxComputeWorkgroupSubgroups = {};
-    ShaderStageFlags requiredSubgroupSizeStages   = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                        = StructureType::ePhysicalDeviceSubgroupSizeControlProperties;
+    void *                                 pNext                        = {};
+    uint32_t                               minSubgroupSize              = {};
+    uint32_t                               maxSubgroupSize              = {};
+    uint32_t                               maxComputeWorkgroupSubgroups = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags requiredSubgroupSizeStages   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubgroupSizeControlProperties>
-  {
-    using Type = PhysicalDeviceSubgroupSizeControlProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubgroupSizeControlProperties>
   {
@@ -118594,8 +85782,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSubgroupSizeControlPropertiesEXT = PhysicalDeviceSubgroupSizeControlProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT.html
   struct PhysicalDeviceSubpassMergeFeedbackFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
@@ -118603,10 +85789,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubpassMergeFeedbackFeaturesEXT( Bool32 subpassMergeFeedback_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subpassMergeFeedback{ subpassMergeFeedback_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubpassMergeFeedbackFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 subpassMergeFeedback_ = {},
+                                                                        void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subpassMergeFeedback( subpassMergeFeedback_ )
     {
     }
 
@@ -118619,27 +85806,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubpassMergeFeedbackFeaturesEXT & operator=( PhysicalDeviceSubpassMergeFeedbackFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubpassMergeFeedbackFeaturesEXT & operator=( VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubpassMergeFeedbackFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassMergeFeedbackFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassMergeFeedbackFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassMergeFeedbackFeaturesEXT & setSubpassMergeFeedback( Bool32 subpassMergeFeedback_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassMergeFeedbackFeaturesEXT &
+      setSubpassMergeFeedback( VULKAN_HPP_NAMESPACE::Bool32 subpassMergeFeedback_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassMergeFeedback = subpassMergeFeedback_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -118651,18 +85839,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subpassMergeFeedback );
     }
@@ -118687,27 +85870,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
-    void *        pNext                = {};
-    Bool32        subpassMergeFeedback = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subpassMergeFeedback = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT>
-  {
-    using Type = PhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT>
   {
     using Type = PhysicalDeviceSubpassMergeFeedbackFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSubpassShadingFeaturesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubpassShadingFeaturesHUAWEI.html
   struct PhysicalDeviceSubpassShadingFeaturesHUAWEI
   {
     using NativeType = VkPhysicalDeviceSubpassShadingFeaturesHUAWEI;
@@ -118715,10 +85888,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubpassShadingFeaturesHUAWEI( Bool32 subpassShading_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subpassShading{ subpassShading_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSubpassShadingFeaturesHUAWEI( VULKAN_HPP_NAMESPACE::Bool32 subpassShading_ = {},
+                                                                     void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subpassShading( subpassShading_ )
     {
     }
 
@@ -118730,27 +85904,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubpassShadingFeaturesHUAWEI & operator=( PhysicalDeviceSubpassShadingFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubpassShadingFeaturesHUAWEI & operator=( VkPhysicalDeviceSubpassShadingFeaturesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubpassShadingFeaturesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassShadingFeaturesHUAWEI const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassShadingFeaturesHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassShadingFeaturesHUAWEI & setSubpassShading( Bool32 subpassShading_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSubpassShadingFeaturesHUAWEI & setSubpassShading( VULKAN_HPP_NAMESPACE::Bool32 subpassShading_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassShading = subpassShading_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSubpassShadingFeaturesHUAWEI const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -118762,18 +85936,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubpassShadingFeaturesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceSubpassShadingFeaturesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubpassShadingFeaturesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceSubpassShadingFeaturesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubpassShadingFeaturesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subpassShading );
     }
@@ -118798,27 +85967,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI;
-    void *        pNext          = {};
-    Bool32        subpassShading = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subpassShading = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubpassShadingFeaturesHUAWEI>
-  {
-    using Type = PhysicalDeviceSubpassShadingFeaturesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI>
   {
     using Type = PhysicalDeviceSubpassShadingFeaturesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSubpassShadingPropertiesHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSubpassShadingPropertiesHUAWEI.html
   struct PhysicalDeviceSubpassShadingPropertiesHUAWEI
   {
     using NativeType = VkPhysicalDeviceSubpassShadingPropertiesHUAWEI;
@@ -118826,11 +85985,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceSubpassShadingPropertiesHUAWEI( uint32_t maxSubpassShadingWorkgroupSizeAspectRatio_ = {},
                                                                        void *   pNext_                                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxSubpassShadingWorkgroupSizeAspectRatio{ maxSubpassShadingWorkgroupSizeAspectRatio_ }
+      : pNext( pNext_ )
+      , maxSubpassShadingWorkgroupSizeAspectRatio( maxSubpassShadingWorkgroupSizeAspectRatio_ )
     {
     }
 
@@ -118842,11 +86001,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSubpassShadingPropertiesHUAWEI & operator=( PhysicalDeviceSubpassShadingPropertiesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSubpassShadingPropertiesHUAWEI & operator=( VkPhysicalDeviceSubpassShadingPropertiesHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSubpassShadingPropertiesHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSubpassShadingPropertiesHUAWEI const *>( &rhs );
       return *this;
     }
 
@@ -118860,18 +86019,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSubpassShadingPropertiesHUAWEI *>( this );
     }
 
-    operator VkPhysicalDeviceSubpassShadingPropertiesHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSubpassShadingPropertiesHUAWEI *>( this );
-    }
-
-    operator VkPhysicalDeviceSubpassShadingPropertiesHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSubpassShadingPropertiesHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxSubpassShadingWorkgroupSizeAspectRatio );
     }
@@ -118896,27 +86050,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                     = StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI;
-    void *        pNext                                     = {};
-    uint32_t      maxSubpassShadingWorkgroupSizeAspectRatio = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                     = StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI;
+    void *                              pNext                                     = {};
+    uint32_t                            maxSubpassShadingWorkgroupSizeAspectRatio = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSubpassShadingPropertiesHUAWEI>
-  {
-    using Type = PhysicalDeviceSubpassShadingPropertiesHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI>
   {
     using Type = PhysicalDeviceSubpassShadingPropertiesHUAWEI;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSurfaceInfo2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSurfaceInfo2KHR.html
   struct PhysicalDeviceSurfaceInfo2KHR
   {
     using NativeType = VkPhysicalDeviceSurfaceInfo2KHR;
@@ -118924,10 +86068,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSurfaceInfo2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSurfaceInfo2KHR( SurfaceKHR surface_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , surface{ surface_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSurfaceInfo2KHR( VULKAN_HPP_NAMESPACE::SurfaceKHR surface_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , surface( surface_ )
     {
     }
 
@@ -118939,27 +86083,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSurfaceInfo2KHR & operator=( PhysicalDeviceSurfaceInfo2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSurfaceInfo2KHR & operator=( VkPhysicalDeviceSurfaceInfo2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSurfaceInfo2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSurfaceInfo2KHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSurfaceInfo2KHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSurfaceInfo2KHR & setSurface( SurfaceKHR surface_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSurfaceInfo2KHR & setSurface( VULKAN_HPP_NAMESPACE::SurfaceKHR surface_ ) VULKAN_HPP_NOEXCEPT
     {
       surface = surface_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSurfaceInfo2KHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -118971,18 +86115,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSurfaceInfo2KHR *>( this );
     }
 
-    operator VkPhysicalDeviceSurfaceInfo2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSurfaceInfo2KHR *>( this );
-    }
-
-    operator VkPhysicalDeviceSurfaceInfo2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSurfaceInfo2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SurfaceKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, surface );
     }
@@ -119007,103 +86146,90 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType   = StructureType::ePhysicalDeviceSurfaceInfo2KHR;
-    const void *  pNext   = {};
-    SurfaceKHR    surface = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType   = StructureType::ePhysicalDeviceSurfaceInfo2KHR;
+    const void *                        pNext   = {};
+    VULKAN_HPP_NAMESPACE::SurfaceKHR    surface = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSurfaceInfo2KHR>
-  {
-    using Type = PhysicalDeviceSurfaceInfo2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSurfaceInfo2KHR>
   {
     using Type = PhysicalDeviceSurfaceInfo2KHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR.html
-  struct PhysicalDeviceSwapchainMaintenance1FeaturesKHR
+  struct PhysicalDeviceSwapchainMaintenance1FeaturesEXT
   {
-    using NativeType = VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR;
+    using NativeType = VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSwapchainMaintenance1FeaturesKHR( Bool32 swapchainMaintenance1_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainMaintenance1{ swapchainMaintenance1_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSwapchainMaintenance1FeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 swapchainMaintenance1_ = {},
+                                                                         void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainMaintenance1( swapchainMaintenance1_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceSwapchainMaintenance1FeaturesKHR( PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceSwapchainMaintenance1FeaturesEXT( PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceSwapchainMaintenance1FeaturesKHR( VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceSwapchainMaintenance1FeaturesKHR( *reinterpret_cast<PhysicalDeviceSwapchainMaintenance1FeaturesKHR const *>( &rhs ) )
+    PhysicalDeviceSwapchainMaintenance1FeaturesEXT( VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceSwapchainMaintenance1FeaturesEXT( *reinterpret_cast<PhysicalDeviceSwapchainMaintenance1FeaturesEXT const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceSwapchainMaintenance1FeaturesKHR & operator=( PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceSwapchainMaintenance1FeaturesEXT & operator=( PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceSwapchainMaintenance1FeaturesKHR & operator=( VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceSwapchainMaintenance1FeaturesEXT & operator=( VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSwapchainMaintenance1FeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSwapchainMaintenance1FeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSwapchainMaintenance1FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSwapchainMaintenance1FeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSwapchainMaintenance1FeaturesKHR & setSwapchainMaintenance1( Bool32 swapchainMaintenance1_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSwapchainMaintenance1FeaturesEXT &
+      setSwapchainMaintenance1( VULKAN_HPP_NAMESPACE::Bool32 swapchainMaintenance1_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainMaintenance1 = swapchainMaintenance1_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainMaintenance1 );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & ) const = default;
+    auto operator<=>( PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -119112,36 +86238,24 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceSwapchainMaintenance1FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceSwapchainMaintenance1FeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-    void *        pNext                 = {};
-    Bool32        swapchainMaintenance1 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesEXT;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        swapchainMaintenance1 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR>
-  {
-    using Type = PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesKHR>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesEXT>
   {
-    using Type = PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
+    using Type = PhysicalDeviceSwapchainMaintenance1FeaturesEXT;
   };
 
-  using PhysicalDeviceSwapchainMaintenance1FeaturesEXT = PhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-
-  // wrapper struct for struct VkPhysicalDeviceSynchronization2Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceSynchronization2Features.html
   struct PhysicalDeviceSynchronization2Features
   {
     using NativeType = VkPhysicalDeviceSynchronization2Features;
@@ -119149,10 +86263,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceSynchronization2Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceSynchronization2Features( Bool32 synchronization2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , synchronization2{ synchronization2_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceSynchronization2Features( VULKAN_HPP_NAMESPACE::Bool32 synchronization2_ = {},
+                                                                 void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , synchronization2( synchronization2_ )
     {
     }
 
@@ -119164,27 +86279,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceSynchronization2Features & operator=( PhysicalDeviceSynchronization2Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceSynchronization2Features & operator=( VkPhysicalDeviceSynchronization2Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceSynchronization2Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceSynchronization2Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSynchronization2Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSynchronization2Features & setSynchronization2( Bool32 synchronization2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceSynchronization2Features & setSynchronization2( VULKAN_HPP_NAMESPACE::Bool32 synchronization2_ ) VULKAN_HPP_NOEXCEPT
     {
       synchronization2 = synchronization2_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceSynchronization2Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -119196,18 +86311,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceSynchronization2Features *>( this );
     }
 
-    operator VkPhysicalDeviceSynchronization2Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceSynchronization2Features *>( this );
-    }
-
-    operator VkPhysicalDeviceSynchronization2Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceSynchronization2Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, synchronization2 );
     }
@@ -119232,19 +86342,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceSynchronization2Features;
-    void *        pNext            = {};
-    Bool32        synchronization2 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceSynchronization2Features;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        synchronization2 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceSynchronization2Features>
-  {
-    using Type = PhysicalDeviceSynchronization2Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceSynchronization2Features>
   {
@@ -119253,351 +86355,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceSynchronization2FeaturesKHR = PhysicalDeviceSynchronization2Features;
 
-  // wrapper struct for struct VkPhysicalDeviceTensorFeaturesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTensorFeaturesARM.html
-  struct PhysicalDeviceTensorFeaturesARM
-  {
-    using NativeType = VkPhysicalDeviceTensorFeaturesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTensorFeaturesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTensorFeaturesARM( Bool32 tensorNonPacked_                               = {},
-                                                          Bool32 shaderTensorAccess_                            = {},
-                                                          Bool32 shaderStorageTensorArrayDynamicIndexing_       = {},
-                                                          Bool32 shaderStorageTensorArrayNonUniformIndexing_    = {},
-                                                          Bool32 descriptorBindingStorageTensorUpdateAfterBind_ = {},
-                                                          Bool32 tensors_                                       = {},
-                                                          void * pNext_                                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorNonPacked{ tensorNonPacked_ }
-      , shaderTensorAccess{ shaderTensorAccess_ }
-      , shaderStorageTensorArrayDynamicIndexing{ shaderStorageTensorArrayDynamicIndexing_ }
-      , shaderStorageTensorArrayNonUniformIndexing{ shaderStorageTensorArrayNonUniformIndexing_ }
-      , descriptorBindingStorageTensorUpdateAfterBind{ descriptorBindingStorageTensorUpdateAfterBind_ }
-      , tensors{ tensors_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTensorFeaturesARM( PhysicalDeviceTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTensorFeaturesARM( VkPhysicalDeviceTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTensorFeaturesARM( *reinterpret_cast<PhysicalDeviceTensorFeaturesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTensorFeaturesARM & operator=( PhysicalDeviceTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTensorFeaturesARM & operator=( VkPhysicalDeviceTensorFeaturesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTensorFeaturesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM & setTensorNonPacked( Bool32 tensorNonPacked_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorNonPacked = tensorNonPacked_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM & setShaderTensorAccess( Bool32 shaderTensorAccess_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderTensorAccess = shaderTensorAccess_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM &
-      setShaderStorageTensorArrayDynamicIndexing( Bool32 shaderStorageTensorArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderStorageTensorArrayDynamicIndexing = shaderStorageTensorArrayDynamicIndexing_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM &
-      setShaderStorageTensorArrayNonUniformIndexing( Bool32 shaderStorageTensorArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderStorageTensorArrayNonUniformIndexing = shaderStorageTensorArrayNonUniformIndexing_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM &
-      setDescriptorBindingStorageTensorUpdateAfterBind( Bool32 descriptorBindingStorageTensorUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
-    {
-      descriptorBindingStorageTensorUpdateAfterBind = descriptorBindingStorageTensorUpdateAfterBind_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTensorFeaturesARM & setTensors( Bool32 tensors_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensors = tensors_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceTensorFeaturesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorFeaturesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorFeaturesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTensorFeaturesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorFeaturesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTensorFeaturesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       tensorNonPacked,
-                       shaderTensorAccess,
-                       shaderStorageTensorArrayDynamicIndexing,
-                       shaderStorageTensorArrayNonUniformIndexing,
-                       descriptorBindingStorageTensorUpdateAfterBind,
-                       tensors );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTensorFeaturesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTensorFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorNonPacked == rhs.tensorNonPacked ) &&
-             ( shaderTensorAccess == rhs.shaderTensorAccess ) && ( shaderStorageTensorArrayDynamicIndexing == rhs.shaderStorageTensorArrayDynamicIndexing ) &&
-             ( shaderStorageTensorArrayNonUniformIndexing == rhs.shaderStorageTensorArrayNonUniformIndexing ) &&
-             ( descriptorBindingStorageTensorUpdateAfterBind == rhs.descriptorBindingStorageTensorUpdateAfterBind ) && ( tensors == rhs.tensors );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTensorFeaturesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                         = StructureType::ePhysicalDeviceTensorFeaturesARM;
-    void *        pNext                                         = {};
-    Bool32        tensorNonPacked                               = {};
-    Bool32        shaderTensorAccess                            = {};
-    Bool32        shaderStorageTensorArrayDynamicIndexing       = {};
-    Bool32        shaderStorageTensorArrayNonUniformIndexing    = {};
-    Bool32        descriptorBindingStorageTensorUpdateAfterBind = {};
-    Bool32        tensors                                       = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTensorFeaturesARM>
-  {
-    using Type = PhysicalDeviceTensorFeaturesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTensorFeaturesARM>
-  {
-    using Type = PhysicalDeviceTensorFeaturesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTensorPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTensorPropertiesARM.html
-  struct PhysicalDeviceTensorPropertiesARM
-  {
-    using NativeType = VkPhysicalDeviceTensorPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTensorPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTensorPropertiesARM( uint32_t         maxTensorDimensionCount_                            = {},
-                                                            uint64_t         maxTensorElements_                                  = {},
-                                                            uint64_t         maxPerDimensionTensorElements_                      = {},
-                                                            int64_t          maxTensorStride_                                    = {},
-                                                            uint64_t         maxTensorSize_                                      = {},
-                                                            uint32_t         maxTensorShaderAccessArrayLength_                   = {},
-                                                            uint32_t         maxTensorShaderAccessSize_                          = {},
-                                                            uint32_t         maxDescriptorSetStorageTensors_                     = {},
-                                                            uint32_t         maxPerStageDescriptorSetStorageTensors_             = {},
-                                                            uint32_t         maxDescriptorSetUpdateAfterBindStorageTensors_      = {},
-                                                            uint32_t         maxPerStageDescriptorUpdateAfterBindStorageTensors_ = {},
-                                                            Bool32           shaderStorageTensorArrayNonUniformIndexingNative_   = {},
-                                                            ShaderStageFlags shaderTensorSupportedStages_                        = {},
-                                                            void *           pNext_                                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxTensorDimensionCount{ maxTensorDimensionCount_ }
-      , maxTensorElements{ maxTensorElements_ }
-      , maxPerDimensionTensorElements{ maxPerDimensionTensorElements_ }
-      , maxTensorStride{ maxTensorStride_ }
-      , maxTensorSize{ maxTensorSize_ }
-      , maxTensorShaderAccessArrayLength{ maxTensorShaderAccessArrayLength_ }
-      , maxTensorShaderAccessSize{ maxTensorShaderAccessSize_ }
-      , maxDescriptorSetStorageTensors{ maxDescriptorSetStorageTensors_ }
-      , maxPerStageDescriptorSetStorageTensors{ maxPerStageDescriptorSetStorageTensors_ }
-      , maxDescriptorSetUpdateAfterBindStorageTensors{ maxDescriptorSetUpdateAfterBindStorageTensors_ }
-      , maxPerStageDescriptorUpdateAfterBindStorageTensors{ maxPerStageDescriptorUpdateAfterBindStorageTensors_ }
-      , shaderStorageTensorArrayNonUniformIndexingNative{ shaderStorageTensorArrayNonUniformIndexingNative_ }
-      , shaderTensorSupportedStages{ shaderTensorSupportedStages_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTensorPropertiesARM( PhysicalDeviceTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTensorPropertiesARM( VkPhysicalDeviceTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTensorPropertiesARM( *reinterpret_cast<PhysicalDeviceTensorPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTensorPropertiesARM & operator=( PhysicalDeviceTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTensorPropertiesARM & operator=( VkPhysicalDeviceTensorPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTensorPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceTensorPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTensorPropertiesARM *>( this );
-    }
-
-    operator VkPhysicalDeviceTensorPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTensorPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint64_t const &,
-               uint64_t const &,
-               int64_t const &,
-               uint64_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               Bool32 const &,
-               ShaderStageFlags const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       maxTensorDimensionCount,
-                       maxTensorElements,
-                       maxPerDimensionTensorElements,
-                       maxTensorStride,
-                       maxTensorSize,
-                       maxTensorShaderAccessArrayLength,
-                       maxTensorShaderAccessSize,
-                       maxDescriptorSetStorageTensors,
-                       maxPerStageDescriptorSetStorageTensors,
-                       maxDescriptorSetUpdateAfterBindStorageTensors,
-                       maxPerStageDescriptorUpdateAfterBindStorageTensors,
-                       shaderStorageTensorArrayNonUniformIndexingNative,
-                       shaderTensorSupportedStages );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTensorPropertiesARM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxTensorDimensionCount == rhs.maxTensorDimensionCount ) &&
-             ( maxTensorElements == rhs.maxTensorElements ) && ( maxPerDimensionTensorElements == rhs.maxPerDimensionTensorElements ) &&
-             ( maxTensorStride == rhs.maxTensorStride ) && ( maxTensorSize == rhs.maxTensorSize ) &&
-             ( maxTensorShaderAccessArrayLength == rhs.maxTensorShaderAccessArrayLength ) && ( maxTensorShaderAccessSize == rhs.maxTensorShaderAccessSize ) &&
-             ( maxDescriptorSetStorageTensors == rhs.maxDescriptorSetStorageTensors ) &&
-             ( maxPerStageDescriptorSetStorageTensors == rhs.maxPerStageDescriptorSetStorageTensors ) &&
-             ( maxDescriptorSetUpdateAfterBindStorageTensors == rhs.maxDescriptorSetUpdateAfterBindStorageTensors ) &&
-             ( maxPerStageDescriptorUpdateAfterBindStorageTensors == rhs.maxPerStageDescriptorUpdateAfterBindStorageTensors ) &&
-             ( shaderStorageTensorArrayNonUniformIndexingNative == rhs.shaderStorageTensorArrayNonUniformIndexingNative ) &&
-             ( shaderTensorSupportedStages == rhs.shaderTensorSupportedStages );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTensorPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType                                              = StructureType::ePhysicalDeviceTensorPropertiesARM;
-    void *           pNext                                              = {};
-    uint32_t         maxTensorDimensionCount                            = {};
-    uint64_t         maxTensorElements                                  = {};
-    uint64_t         maxPerDimensionTensorElements                      = {};
-    int64_t          maxTensorStride                                    = {};
-    uint64_t         maxTensorSize                                      = {};
-    uint32_t         maxTensorShaderAccessArrayLength                   = {};
-    uint32_t         maxTensorShaderAccessSize                          = {};
-    uint32_t         maxDescriptorSetStorageTensors                     = {};
-    uint32_t         maxPerStageDescriptorSetStorageTensors             = {};
-    uint32_t         maxDescriptorSetUpdateAfterBindStorageTensors      = {};
-    uint32_t         maxPerStageDescriptorUpdateAfterBindStorageTensors = {};
-    Bool32           shaderStorageTensorArrayNonUniformIndexingNative   = {};
-    ShaderStageFlags shaderTensorSupportedStages                        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTensorPropertiesARM>
-  {
-    using Type = PhysicalDeviceTensorPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTensorPropertiesARM>
-  {
-    using Type = PhysicalDeviceTensorPropertiesARM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT.html
   struct PhysicalDeviceTexelBufferAlignmentFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT;
@@ -119605,10 +86362,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTexelBufferAlignmentFeaturesEXT( Bool32 texelBufferAlignment_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , texelBufferAlignment{ texelBufferAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTexelBufferAlignmentFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 texelBufferAlignment_ = {},
+                                                                        void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , texelBufferAlignment( texelBufferAlignment_ )
     {
     }
 
@@ -119621,27 +86379,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTexelBufferAlignmentFeaturesEXT & operator=( PhysicalDeviceTexelBufferAlignmentFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTexelBufferAlignmentFeaturesEXT & operator=( VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTexelBufferAlignmentFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTexelBufferAlignmentFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTexelBufferAlignmentFeaturesEXT & setTexelBufferAlignment( Bool32 texelBufferAlignment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTexelBufferAlignmentFeaturesEXT &
+      setTexelBufferAlignment( VULKAN_HPP_NAMESPACE::Bool32 texelBufferAlignment_ ) VULKAN_HPP_NOEXCEPT
     {
       texelBufferAlignment = texelBufferAlignment_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -119653,18 +86412,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, texelBufferAlignment );
     }
@@ -119689,27 +86443,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT;
-    void *        pNext                = {};
-    Bool32        texelBufferAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        texelBufferAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT>
-  {
-    using Type = PhysicalDeviceTexelBufferAlignmentFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT>
   {
     using Type = PhysicalDeviceTexelBufferAlignmentFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceTexelBufferAlignmentProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTexelBufferAlignmentProperties.html
   struct PhysicalDeviceTexelBufferAlignmentProperties
   {
     using NativeType = VkPhysicalDeviceTexelBufferAlignmentProperties;
@@ -119717,17 +86461,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTexelBufferAlignmentProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTexelBufferAlignmentProperties( DeviceSize storageTexelBufferOffsetAlignmentBytes_       = {},
-                                                                       Bool32     storageTexelBufferOffsetSingleTexelAlignment_ = {},
-                                                                       DeviceSize uniformTexelBufferOffsetAlignmentBytes_       = {},
-                                                                       Bool32     uniformTexelBufferOffsetSingleTexelAlignment_ = {},
-                                                                       void *     pNext_                                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , storageTexelBufferOffsetAlignmentBytes{ storageTexelBufferOffsetAlignmentBytes_ }
-      , storageTexelBufferOffsetSingleTexelAlignment{ storageTexelBufferOffsetSingleTexelAlignment_ }
-      , uniformTexelBufferOffsetAlignmentBytes{ uniformTexelBufferOffsetAlignmentBytes_ }
-      , uniformTexelBufferOffsetSingleTexelAlignment{ uniformTexelBufferOffsetSingleTexelAlignment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTexelBufferAlignmentProperties( VULKAN_HPP_NAMESPACE::DeviceSize storageTexelBufferOffsetAlignmentBytes_       = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     storageTexelBufferOffsetSingleTexelAlignment_ = {},
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize uniformTexelBufferOffsetAlignmentBytes_       = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     uniformTexelBufferOffsetSingleTexelAlignment_ = {},
+                                                                       void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , storageTexelBufferOffsetAlignmentBytes( storageTexelBufferOffsetAlignmentBytes_ )
+      , storageTexelBufferOffsetSingleTexelAlignment( storageTexelBufferOffsetSingleTexelAlignment_ )
+      , uniformTexelBufferOffsetAlignmentBytes( uniformTexelBufferOffsetAlignmentBytes_ )
+      , uniformTexelBufferOffsetSingleTexelAlignment( uniformTexelBufferOffsetSingleTexelAlignment_ )
     {
     }
 
@@ -119739,11 +86483,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTexelBufferAlignmentProperties & operator=( PhysicalDeviceTexelBufferAlignmentProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTexelBufferAlignmentProperties & operator=( VkPhysicalDeviceTexelBufferAlignmentProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTexelBufferAlignmentProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTexelBufferAlignmentProperties const *>( &rhs );
       return *this;
     }
 
@@ -119757,18 +86501,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTexelBufferAlignmentProperties *>( this );
     }
 
-    operator VkPhysicalDeviceTexelBufferAlignmentProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTexelBufferAlignmentProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceTexelBufferAlignmentProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTexelBufferAlignmentProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, Bool32 const &, DeviceSize const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -119802,22 +86545,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                        = StructureType::ePhysicalDeviceTexelBufferAlignmentProperties;
-    void *        pNext                                        = {};
-    DeviceSize    storageTexelBufferOffsetAlignmentBytes       = {};
-    Bool32        storageTexelBufferOffsetSingleTexelAlignment = {};
-    DeviceSize    uniformTexelBufferOffsetAlignmentBytes       = {};
-    Bool32        uniformTexelBufferOffsetSingleTexelAlignment = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                        = StructureType::ePhysicalDeviceTexelBufferAlignmentProperties;
+    void *                              pNext                                        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    storageTexelBufferOffsetAlignmentBytes       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageTexelBufferOffsetSingleTexelAlignment = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    uniformTexelBufferOffsetAlignmentBytes       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformTexelBufferOffsetSingleTexelAlignment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTexelBufferAlignmentProperties>
-  {
-    using Type = PhysicalDeviceTexelBufferAlignmentProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTexelBufferAlignmentProperties>
   {
@@ -119826,8 +86561,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceTexelBufferAlignmentPropertiesEXT = PhysicalDeviceTexelBufferAlignmentProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceTextureCompressionASTCHDRFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTextureCompressionASTCHDRFeatures.html
   struct PhysicalDeviceTextureCompressionASTCHDRFeatures
   {
     using NativeType = VkPhysicalDeviceTextureCompressionASTCHDRFeatures;
@@ -119835,10 +86568,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTextureCompressionASTCHDRFeatures( Bool32 textureCompressionASTC_HDR_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , textureCompressionASTC_HDR{ textureCompressionASTC_HDR_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTextureCompressionASTCHDRFeatures( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_HDR_ = {},
+                                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , textureCompressionASTC_HDR( textureCompressionASTC_HDR_ )
     {
     }
 
@@ -119851,15 +86585,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTextureCompressionASTCHDRFeatures & operator=( PhysicalDeviceTextureCompressionASTCHDRFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTextureCompressionASTCHDRFeatures & operator=( VkPhysicalDeviceTextureCompressionASTCHDRFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTextureCompressionASTCHDRFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTextureCompressionASTCHDRFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTextureCompressionASTCHDRFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -119867,12 +86601,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTextureCompressionASTCHDRFeatures &
-      setTextureCompressionASTC_HDR( Bool32 textureCompressionASTC_HDR_ ) VULKAN_HPP_NOEXCEPT
+      setTextureCompressionASTC_HDR( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_HDR_ ) VULKAN_HPP_NOEXCEPT
     {
       textureCompressionASTC_HDR = textureCompressionASTC_HDR_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceTextureCompressionASTCHDRFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -119884,18 +86618,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTextureCompressionASTCHDRFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceTextureCompressionASTCHDRFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTextureCompressionASTCHDRFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceTextureCompressionASTCHDRFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTextureCompressionASTCHDRFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, textureCompressionASTC_HDR );
     }
@@ -119920,19 +86649,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                      = StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures;
-    void *        pNext                      = {};
-    Bool32        textureCompressionASTC_HDR = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                      = StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures;
+    void *                              pNext                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureCompressionASTC_HDR = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTextureCompressionASTCHDRFeatures>
-  {
-    using Type = PhysicalDeviceTextureCompressionASTCHDRFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures>
   {
@@ -119941,241 +86662,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceTextureCompressionASTCHDRFeaturesEXT = PhysicalDeviceTextureCompressionASTCHDRFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceTileMemoryHeapFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTileMemoryHeapFeaturesQCOM.html
-  struct PhysicalDeviceTileMemoryHeapFeaturesQCOM
-  {
-    using NativeType = VkPhysicalDeviceTileMemoryHeapFeaturesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTileMemoryHeapFeaturesQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileMemoryHeapFeaturesQCOM( Bool32 tileMemoryHeap_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tileMemoryHeap{ tileMemoryHeap_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileMemoryHeapFeaturesQCOM( PhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTileMemoryHeapFeaturesQCOM( VkPhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTileMemoryHeapFeaturesQCOM( *reinterpret_cast<PhysicalDeviceTileMemoryHeapFeaturesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTileMemoryHeapFeaturesQCOM & operator=( PhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTileMemoryHeapFeaturesQCOM & operator=( VkPhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTileMemoryHeapFeaturesQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileMemoryHeapFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileMemoryHeapFeaturesQCOM & setTileMemoryHeap( Bool32 tileMemoryHeap_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileMemoryHeap = tileMemoryHeap_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceTileMemoryHeapFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTileMemoryHeapFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapFeaturesQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTileMemoryHeapFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTileMemoryHeapFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTileMemoryHeapFeaturesQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tileMemoryHeap );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTileMemoryHeapFeaturesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tileMemoryHeap == rhs.tileMemoryHeap );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTileMemoryHeapFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::ePhysicalDeviceTileMemoryHeapFeaturesQCOM;
-    void *        pNext          = {};
-    Bool32        tileMemoryHeap = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTileMemoryHeapFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceTileMemoryHeapFeaturesQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTileMemoryHeapFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceTileMemoryHeapFeaturesQCOM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTileMemoryHeapPropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTileMemoryHeapPropertiesQCOM.html
-  struct PhysicalDeviceTileMemoryHeapPropertiesQCOM
-  {
-    using NativeType = VkPhysicalDeviceTileMemoryHeapPropertiesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTileMemoryHeapPropertiesQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileMemoryHeapPropertiesQCOM( Bool32 queueSubmitBoundary_ = {},
-                                                                     Bool32 tileBufferTransfers_ = {},
-                                                                     void * pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueSubmitBoundary{ queueSubmitBoundary_ }
-      , tileBufferTransfers{ tileBufferTransfers_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileMemoryHeapPropertiesQCOM( PhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTileMemoryHeapPropertiesQCOM( VkPhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTileMemoryHeapPropertiesQCOM( *reinterpret_cast<PhysicalDeviceTileMemoryHeapPropertiesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTileMemoryHeapPropertiesQCOM & operator=( PhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTileMemoryHeapPropertiesQCOM & operator=( VkPhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTileMemoryHeapPropertiesQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileMemoryHeapPropertiesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileMemoryHeapPropertiesQCOM & setQueueSubmitBoundary( Bool32 queueSubmitBoundary_ ) VULKAN_HPP_NOEXCEPT
-    {
-      queueSubmitBoundary = queueSubmitBoundary_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileMemoryHeapPropertiesQCOM & setTileBufferTransfers( Bool32 tileBufferTransfers_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileBufferTransfers = tileBufferTransfers_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceTileMemoryHeapPropertiesQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTileMemoryHeapPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapPropertiesQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTileMemoryHeapPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapPropertiesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTileMemoryHeapPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileMemoryHeapPropertiesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTileMemoryHeapPropertiesQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, queueSubmitBoundary, tileBufferTransfers );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTileMemoryHeapPropertiesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( queueSubmitBoundary == rhs.queueSubmitBoundary ) &&
-             ( tileBufferTransfers == rhs.tileBufferTransfers );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTileMemoryHeapPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType               = StructureType::ePhysicalDeviceTileMemoryHeapPropertiesQCOM;
-    void *        pNext               = {};
-    Bool32        queueSubmitBoundary = {};
-    Bool32        tileBufferTransfers = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTileMemoryHeapPropertiesQCOM>
-  {
-    using Type = PhysicalDeviceTileMemoryHeapPropertiesQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTileMemoryHeapPropertiesQCOM>
-  {
-    using Type = PhysicalDeviceTileMemoryHeapPropertiesQCOM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTilePropertiesFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTilePropertiesFeaturesQCOM.html
   struct PhysicalDeviceTilePropertiesFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceTilePropertiesFeaturesQCOM;
@@ -120183,10 +86669,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTilePropertiesFeaturesQCOM( Bool32 tileProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tileProperties{ tileProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTilePropertiesFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 tileProperties_ = {},
+                                                                   void *                       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , tileProperties( tileProperties_ )
     {
     }
 
@@ -120198,27 +86685,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTilePropertiesFeaturesQCOM & operator=( PhysicalDeviceTilePropertiesFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTilePropertiesFeaturesQCOM & operator=( VkPhysicalDeviceTilePropertiesFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTilePropertiesFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTilePropertiesFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTilePropertiesFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTilePropertiesFeaturesQCOM & setTileProperties( Bool32 tileProperties_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTilePropertiesFeaturesQCOM & setTileProperties( VULKAN_HPP_NAMESPACE::Bool32 tileProperties_ ) VULKAN_HPP_NOEXCEPT
     {
       tileProperties = tileProperties_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceTilePropertiesFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -120230,18 +86717,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTilePropertiesFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceTilePropertiesFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTilePropertiesFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTilePropertiesFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTilePropertiesFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, tileProperties );
     }
@@ -120266,404 +86748,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType          = StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM;
-    void *        pNext          = {};
-    Bool32        tileProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        tileProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTilePropertiesFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceTilePropertiesFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM>
   {
     using Type = PhysicalDeviceTilePropertiesFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceTileShadingFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTileShadingFeaturesQCOM.html
-  struct PhysicalDeviceTileShadingFeaturesQCOM
-  {
-    using NativeType = VkPhysicalDeviceTileShadingFeaturesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTileShadingFeaturesQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileShadingFeaturesQCOM( Bool32 tileShading_                   = {},
-                                                                Bool32 tileShadingFragmentStage_      = {},
-                                                                Bool32 tileShadingColorAttachments_   = {},
-                                                                Bool32 tileShadingDepthAttachments_   = {},
-                                                                Bool32 tileShadingStencilAttachments_ = {},
-                                                                Bool32 tileShadingInputAttachments_   = {},
-                                                                Bool32 tileShadingSampledAttachments_ = {},
-                                                                Bool32 tileShadingPerTileDraw_        = {},
-                                                                Bool32 tileShadingPerTileDispatch_    = {},
-                                                                Bool32 tileShadingDispatchTile_       = {},
-                                                                Bool32 tileShadingApron_              = {},
-                                                                Bool32 tileShadingAnisotropicApron_   = {},
-                                                                Bool32 tileShadingAtomicOps_          = {},
-                                                                Bool32 tileShadingImageProcessing_    = {},
-                                                                void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tileShading{ tileShading_ }
-      , tileShadingFragmentStage{ tileShadingFragmentStage_ }
-      , tileShadingColorAttachments{ tileShadingColorAttachments_ }
-      , tileShadingDepthAttachments{ tileShadingDepthAttachments_ }
-      , tileShadingStencilAttachments{ tileShadingStencilAttachments_ }
-      , tileShadingInputAttachments{ tileShadingInputAttachments_ }
-      , tileShadingSampledAttachments{ tileShadingSampledAttachments_ }
-      , tileShadingPerTileDraw{ tileShadingPerTileDraw_ }
-      , tileShadingPerTileDispatch{ tileShadingPerTileDispatch_ }
-      , tileShadingDispatchTile{ tileShadingDispatchTile_ }
-      , tileShadingApron{ tileShadingApron_ }
-      , tileShadingAnisotropicApron{ tileShadingAnisotropicApron_ }
-      , tileShadingAtomicOps{ tileShadingAtomicOps_ }
-      , tileShadingImageProcessing{ tileShadingImageProcessing_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileShadingFeaturesQCOM( PhysicalDeviceTileShadingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTileShadingFeaturesQCOM( VkPhysicalDeviceTileShadingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTileShadingFeaturesQCOM( *reinterpret_cast<PhysicalDeviceTileShadingFeaturesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTileShadingFeaturesQCOM & operator=( PhysicalDeviceTileShadingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTileShadingFeaturesQCOM & operator=( VkPhysicalDeviceTileShadingFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTileShadingFeaturesQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShading( Bool32 tileShading_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShading = tileShading_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingFragmentStage( Bool32 tileShadingFragmentStage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingFragmentStage = tileShadingFragmentStage_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingColorAttachments( Bool32 tileShadingColorAttachments_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingColorAttachments = tileShadingColorAttachments_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingDepthAttachments( Bool32 tileShadingDepthAttachments_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingDepthAttachments = tileShadingDepthAttachments_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM &
-      setTileShadingStencilAttachments( Bool32 tileShadingStencilAttachments_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingStencilAttachments = tileShadingStencilAttachments_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingInputAttachments( Bool32 tileShadingInputAttachments_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingInputAttachments = tileShadingInputAttachments_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM &
-      setTileShadingSampledAttachments( Bool32 tileShadingSampledAttachments_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingSampledAttachments = tileShadingSampledAttachments_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingPerTileDraw( Bool32 tileShadingPerTileDraw_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingPerTileDraw = tileShadingPerTileDraw_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingPerTileDispatch( Bool32 tileShadingPerTileDispatch_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingPerTileDispatch = tileShadingPerTileDispatch_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingDispatchTile( Bool32 tileShadingDispatchTile_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingDispatchTile = tileShadingDispatchTile_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingApron( Bool32 tileShadingApron_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingApron = tileShadingApron_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingAnisotropicApron( Bool32 tileShadingAnisotropicApron_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingAnisotropicApron = tileShadingAnisotropicApron_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingAtomicOps( Bool32 tileShadingAtomicOps_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingAtomicOps = tileShadingAtomicOps_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTileShadingFeaturesQCOM & setTileShadingImageProcessing( Bool32 tileShadingImageProcessing_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileShadingImageProcessing = tileShadingImageProcessing_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceTileShadingFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTileShadingFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingFeaturesQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTileShadingFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTileShadingFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTileShadingFeaturesQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       tileShading,
-                       tileShadingFragmentStage,
-                       tileShadingColorAttachments,
-                       tileShadingDepthAttachments,
-                       tileShadingStencilAttachments,
-                       tileShadingInputAttachments,
-                       tileShadingSampledAttachments,
-                       tileShadingPerTileDraw,
-                       tileShadingPerTileDispatch,
-                       tileShadingDispatchTile,
-                       tileShadingApron,
-                       tileShadingAnisotropicApron,
-                       tileShadingAtomicOps,
-                       tileShadingImageProcessing );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTileShadingFeaturesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTileShadingFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tileShading == rhs.tileShading ) &&
-             ( tileShadingFragmentStage == rhs.tileShadingFragmentStage ) && ( tileShadingColorAttachments == rhs.tileShadingColorAttachments ) &&
-             ( tileShadingDepthAttachments == rhs.tileShadingDepthAttachments ) && ( tileShadingStencilAttachments == rhs.tileShadingStencilAttachments ) &&
-             ( tileShadingInputAttachments == rhs.tileShadingInputAttachments ) && ( tileShadingSampledAttachments == rhs.tileShadingSampledAttachments ) &&
-             ( tileShadingPerTileDraw == rhs.tileShadingPerTileDraw ) && ( tileShadingPerTileDispatch == rhs.tileShadingPerTileDispatch ) &&
-             ( tileShadingDispatchTile == rhs.tileShadingDispatchTile ) && ( tileShadingApron == rhs.tileShadingApron ) &&
-             ( tileShadingAnisotropicApron == rhs.tileShadingAnisotropicApron ) && ( tileShadingAtomicOps == rhs.tileShadingAtomicOps ) &&
-             ( tileShadingImageProcessing == rhs.tileShadingImageProcessing );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTileShadingFeaturesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                         = StructureType::ePhysicalDeviceTileShadingFeaturesQCOM;
-    void *        pNext                         = {};
-    Bool32        tileShading                   = {};
-    Bool32        tileShadingFragmentStage      = {};
-    Bool32        tileShadingColorAttachments   = {};
-    Bool32        tileShadingDepthAttachments   = {};
-    Bool32        tileShadingStencilAttachments = {};
-    Bool32        tileShadingInputAttachments   = {};
-    Bool32        tileShadingSampledAttachments = {};
-    Bool32        tileShadingPerTileDraw        = {};
-    Bool32        tileShadingPerTileDispatch    = {};
-    Bool32        tileShadingDispatchTile       = {};
-    Bool32        tileShadingApron              = {};
-    Bool32        tileShadingAnisotropicApron   = {};
-    Bool32        tileShadingAtomicOps          = {};
-    Bool32        tileShadingImageProcessing    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTileShadingFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceTileShadingFeaturesQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTileShadingFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceTileShadingFeaturesQCOM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTileShadingPropertiesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTileShadingPropertiesQCOM.html
-  struct PhysicalDeviceTileShadingPropertiesQCOM
-  {
-    using NativeType = VkPhysicalDeviceTileShadingPropertiesQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTileShadingPropertiesQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileShadingPropertiesQCOM( uint32_t maxApronSize_       = {},
-                                                                  Bool32   preferNonCoherent_  = {},
-                                                                  Extent2D tileGranularity_    = {},
-                                                                  Extent2D maxTileShadingRate_ = {},
-                                                                  void *   pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxApronSize{ maxApronSize_ }
-      , preferNonCoherent{ preferNonCoherent_ }
-      , tileGranularity{ tileGranularity_ }
-      , maxTileShadingRate{ maxTileShadingRate_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTileShadingPropertiesQCOM( PhysicalDeviceTileShadingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceTileShadingPropertiesQCOM( VkPhysicalDeviceTileShadingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceTileShadingPropertiesQCOM( *reinterpret_cast<PhysicalDeviceTileShadingPropertiesQCOM const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceTileShadingPropertiesQCOM & operator=( PhysicalDeviceTileShadingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceTileShadingPropertiesQCOM & operator=( VkPhysicalDeviceTileShadingPropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceTileShadingPropertiesQCOM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceTileShadingPropertiesQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceTileShadingPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingPropertiesQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceTileShadingPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingPropertiesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTileShadingPropertiesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceTileShadingPropertiesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTileShadingPropertiesQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, Bool32 const &, Extent2D const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxApronSize, preferNonCoherent, tileGranularity, maxTileShadingRate );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceTileShadingPropertiesQCOM const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceTileShadingPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxApronSize == rhs.maxApronSize ) && ( preferNonCoherent == rhs.preferNonCoherent ) &&
-             ( tileGranularity == rhs.tileGranularity ) && ( maxTileShadingRate == rhs.maxTileShadingRate );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceTileShadingPropertiesQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType              = StructureType::ePhysicalDeviceTileShadingPropertiesQCOM;
-    void *        pNext              = {};
-    uint32_t      maxApronSize       = {};
-    Bool32        preferNonCoherent  = {};
-    Extent2D      tileGranularity    = {};
-    Extent2D      maxTileShadingRate = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTileShadingPropertiesQCOM>
-  {
-    using Type = PhysicalDeviceTileShadingPropertiesQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceTileShadingPropertiesQCOM>
-  {
-    using Type = PhysicalDeviceTileShadingPropertiesQCOM;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceTimelineSemaphoreFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTimelineSemaphoreFeatures.html
   struct PhysicalDeviceTimelineSemaphoreFeatures
   {
     using NativeType = VkPhysicalDeviceTimelineSemaphoreFeatures;
@@ -120671,10 +86766,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTimelineSemaphoreFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTimelineSemaphoreFeatures( Bool32 timelineSemaphore_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , timelineSemaphore{ timelineSemaphore_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTimelineSemaphoreFeatures( VULKAN_HPP_NAMESPACE::Bool32 timelineSemaphore_ = {},
+                                                                  void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , timelineSemaphore( timelineSemaphore_ )
     {
     }
 
@@ -120686,27 +86782,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTimelineSemaphoreFeatures & operator=( PhysicalDeviceTimelineSemaphoreFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTimelineSemaphoreFeatures & operator=( VkPhysicalDeviceTimelineSemaphoreFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTimelineSemaphoreFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTimelineSemaphoreFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTimelineSemaphoreFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTimelineSemaphoreFeatures & setTimelineSemaphore( Bool32 timelineSemaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTimelineSemaphoreFeatures &
+      setTimelineSemaphore( VULKAN_HPP_NAMESPACE::Bool32 timelineSemaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       timelineSemaphore = timelineSemaphore_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceTimelineSemaphoreFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -120718,18 +86815,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceTimelineSemaphoreFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTimelineSemaphoreFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceTimelineSemaphoreFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, timelineSemaphore );
     }
@@ -120754,19 +86846,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceTimelineSemaphoreFeatures;
-    void *        pNext             = {};
-    Bool32        timelineSemaphore = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceTimelineSemaphoreFeatures;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        timelineSemaphore = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTimelineSemaphoreFeatures>
-  {
-    using Type = PhysicalDeviceTimelineSemaphoreFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTimelineSemaphoreFeatures>
   {
@@ -120775,8 +86859,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceTimelineSemaphoreFeaturesKHR = PhysicalDeviceTimelineSemaphoreFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceTimelineSemaphoreProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTimelineSemaphoreProperties.html
   struct PhysicalDeviceTimelineSemaphoreProperties
   {
     using NativeType = VkPhysicalDeviceTimelineSemaphoreProperties;
@@ -120784,11 +86866,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTimelineSemaphoreProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceTimelineSemaphoreProperties( uint64_t maxTimelineSemaphoreValueDifference_ = {},
                                                                     void *   pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxTimelineSemaphoreValueDifference{ maxTimelineSemaphoreValueDifference_ }
+      : pNext( pNext_ )
+      , maxTimelineSemaphoreValueDifference( maxTimelineSemaphoreValueDifference_ )
     {
     }
 
@@ -120800,11 +86882,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTimelineSemaphoreProperties & operator=( PhysicalDeviceTimelineSemaphoreProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTimelineSemaphoreProperties & operator=( VkPhysicalDeviceTimelineSemaphoreProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTimelineSemaphoreProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTimelineSemaphoreProperties const *>( &rhs );
       return *this;
     }
 
@@ -120818,18 +86900,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreProperties *>( this );
     }
 
-    operator VkPhysicalDeviceTimelineSemaphoreProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTimelineSemaphoreProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceTimelineSemaphoreProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxTimelineSemaphoreValueDifference );
     }
@@ -120854,19 +86931,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::ePhysicalDeviceTimelineSemaphoreProperties;
-    void *        pNext                               = {};
-    uint64_t      maxTimelineSemaphoreValueDifference = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::ePhysicalDeviceTimelineSemaphoreProperties;
+    void *                              pNext                               = {};
+    uint64_t                            maxTimelineSemaphoreValueDifference = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTimelineSemaphoreProperties>
-  {
-    using Type = PhysicalDeviceTimelineSemaphoreProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTimelineSemaphoreProperties>
   {
@@ -120875,7 +86944,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceTimelineSemaphorePropertiesKHR = PhysicalDeviceTimelineSemaphoreProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceToolProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceToolProperties.html
   struct PhysicalDeviceToolProperties
   {
     using NativeType = VkPhysicalDeviceToolProperties;
@@ -120883,19 +86951,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceToolProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceToolProperties( std::array<char, VK_MAX_EXTENSION_NAME_SIZE> const & name_        = {},
                                                           std::array<char, VK_MAX_EXTENSION_NAME_SIZE> const & version_     = {},
-                                                          ToolPurposeFlags                                     purposes_    = {},
+                                                          VULKAN_HPP_NAMESPACE::ToolPurposeFlags               purposes_    = {},
                                                           std::array<char, VK_MAX_DESCRIPTION_SIZE> const &    description_ = {},
                                                           std::array<char, VK_MAX_EXTENSION_NAME_SIZE> const & layer_       = {},
                                                           void *                                               pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , name{ name_ }
-      , version{ version_ }
-      , purposes{ purposes_ }
-      , description{ description_ }
-      , layer{ layer_ }
+      : pNext( pNext_ )
+      , name( name_ )
+      , version( version_ )
+      , purposes( purposes_ )
+      , description( description_ )
+      , layer( layer_ )
     {
     }
 
@@ -120906,12 +86974,51 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceToolProperties( std::string const &                    name_,
+                                  std::string const &                    version_     = {},
+                                  VULKAN_HPP_NAMESPACE::ToolPurposeFlags purposes_    = {},
+                                  std::string const &                    description_ = {},
+                                  std::string const &                    layer_       = {},
+                                  void *                                 pNext_       = nullptr )
+      : pNext( pNext_ ), purposes( purposes_ )
+    {
+      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_EXTENSION_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( name, VK_MAX_EXTENSION_NAME_SIZE, name_.data(), name_.size() );
+#    else
+      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_EXTENSION_NAME_SIZE, name_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( version_.size() < VK_MAX_EXTENSION_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( version, VK_MAX_EXTENSION_NAME_SIZE, version_.data(), version_.size() );
+#    else
+      strncpy( version, version_.data(), std::min<size_t>( VK_MAX_EXTENSION_NAME_SIZE, version_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( layer_.size() < VK_MAX_EXTENSION_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( layer, VK_MAX_EXTENSION_NAME_SIZE, layer_.data(), layer_.size() );
+#    else
+      strncpy( layer, layer_.data(), std::min<size_t>( VK_MAX_EXTENSION_NAME_SIZE, layer_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PhysicalDeviceToolProperties & operator=( PhysicalDeviceToolProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceToolProperties & operator=( VkPhysicalDeviceToolProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceToolProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceToolProperties const *>( &rhs );
       return *this;
     }
 
@@ -120925,24 +87032,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceToolProperties *>( this );
     }
 
-    operator VkPhysicalDeviceToolProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceToolProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceToolProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceToolProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &,
-               ToolPurposeFlags const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &>
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ToolPurposeFlags const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, name, version, purposes, description, layer );
@@ -120983,23 +87084,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                    sType       = StructureType::ePhysicalDeviceToolProperties;
-    void *                                           pNext       = {};
-    ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> name        = {};
-    ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> version     = {};
-    ToolPurposeFlags                                 purposes    = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE>    description = {};
-    ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> layer       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                    sType       = StructureType::ePhysicalDeviceToolProperties;
+    void *                                                                 pNext       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> name        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> version     = {};
+    VULKAN_HPP_NAMESPACE::ToolPurposeFlags                                 purposes    = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE>    description = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_EXTENSION_NAME_SIZE> layer       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceToolProperties>
-  {
-    using Type = PhysicalDeviceToolProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceToolProperties>
   {
@@ -121008,8 +87101,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceToolPropertiesEXT = PhysicalDeviceToolProperties;
 
-  // wrapper struct for struct VkPhysicalDeviceTransformFeedbackFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTransformFeedbackFeaturesEXT.html
   struct PhysicalDeviceTransformFeedbackFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceTransformFeedbackFeaturesEXT;
@@ -121017,12 +87108,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceTransformFeedbackFeaturesEXT( Bool32 transformFeedback_ = {}, Bool32 geometryStreams_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , transformFeedback{ transformFeedback_ }
-      , geometryStreams{ geometryStreams_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTransformFeedbackFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 transformFeedback_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 geometryStreams_   = {},
+                                                                     void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , transformFeedback( transformFeedback_ )
+      , geometryStreams( geometryStreams_ )
     {
     }
 
@@ -121034,33 +87126,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTransformFeedbackFeaturesEXT & operator=( PhysicalDeviceTransformFeedbackFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTransformFeedbackFeaturesEXT & operator=( VkPhysicalDeviceTransformFeedbackFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTransformFeedbackFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTransformFeedbackFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTransformFeedbackFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTransformFeedbackFeaturesEXT & setTransformFeedback( Bool32 transformFeedback_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTransformFeedbackFeaturesEXT &
+      setTransformFeedback( VULKAN_HPP_NAMESPACE::Bool32 transformFeedback_ ) VULKAN_HPP_NOEXCEPT
     {
       transformFeedback = transformFeedback_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTransformFeedbackFeaturesEXT & setGeometryStreams( Bool32 geometryStreams_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceTransformFeedbackFeaturesEXT & setGeometryStreams( VULKAN_HPP_NAMESPACE::Bool32 geometryStreams_ ) VULKAN_HPP_NOEXCEPT
     {
       geometryStreams = geometryStreams_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceTransformFeedbackFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -121072,18 +87165,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTransformFeedbackFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceTransformFeedbackFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTransformFeedbackFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceTransformFeedbackFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTransformFeedbackFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, transformFeedback, geometryStreams );
     }
@@ -121108,28 +87196,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT;
-    void *        pNext             = {};
-    Bool32        transformFeedback = {};
-    Bool32        geometryStreams   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedback = {};
+    VULKAN_HPP_NAMESPACE::Bool32        geometryStreams   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTransformFeedbackFeaturesEXT>
-  {
-    using Type = PhysicalDeviceTransformFeedbackFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT>
   {
     using Type = PhysicalDeviceTransformFeedbackFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceTransformFeedbackPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceTransformFeedbackPropertiesEXT.html
   struct PhysicalDeviceTransformFeedbackPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceTransformFeedbackPropertiesEXT;
@@ -121137,29 +87215,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceTransformFeedbackPropertiesEXT( uint32_t   maxTransformFeedbackStreams_                = {},
-                                                                       uint32_t   maxTransformFeedbackBuffers_                = {},
-                                                                       DeviceSize maxTransformFeedbackBufferSize_             = {},
-                                                                       uint32_t   maxTransformFeedbackStreamDataSize_         = {},
-                                                                       uint32_t   maxTransformFeedbackBufferDataSize_         = {},
-                                                                       uint32_t   maxTransformFeedbackBufferDataStride_       = {},
-                                                                       Bool32     transformFeedbackQueries_                   = {},
-                                                                       Bool32     transformFeedbackStreamsLinesTriangles_     = {},
-                                                                       Bool32     transformFeedbackRasterizationStreamSelect_ = {},
-                                                                       Bool32     transformFeedbackDraw_                      = {},
-                                                                       void *     pNext_                                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxTransformFeedbackStreams{ maxTransformFeedbackStreams_ }
-      , maxTransformFeedbackBuffers{ maxTransformFeedbackBuffers_ }
-      , maxTransformFeedbackBufferSize{ maxTransformFeedbackBufferSize_ }
-      , maxTransformFeedbackStreamDataSize{ maxTransformFeedbackStreamDataSize_ }
-      , maxTransformFeedbackBufferDataSize{ maxTransformFeedbackBufferDataSize_ }
-      , maxTransformFeedbackBufferDataStride{ maxTransformFeedbackBufferDataStride_ }
-      , transformFeedbackQueries{ transformFeedbackQueries_ }
-      , transformFeedbackStreamsLinesTriangles{ transformFeedbackStreamsLinesTriangles_ }
-      , transformFeedbackRasterizationStreamSelect{ transformFeedbackRasterizationStreamSelect_ }
-      , transformFeedbackDraw{ transformFeedbackDraw_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceTransformFeedbackPropertiesEXT( uint32_t                         maxTransformFeedbackStreams_                = {},
+                                                                       uint32_t                         maxTransformFeedbackBuffers_                = {},
+                                                                       VULKAN_HPP_NAMESPACE::DeviceSize maxTransformFeedbackBufferSize_             = {},
+                                                                       uint32_t                         maxTransformFeedbackStreamDataSize_         = {},
+                                                                       uint32_t                         maxTransformFeedbackBufferDataSize_         = {},
+                                                                       uint32_t                         maxTransformFeedbackBufferDataStride_       = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     transformFeedbackQueries_                   = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     transformFeedbackStreamsLinesTriangles_     = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     transformFeedbackRasterizationStreamSelect_ = {},
+                                                                       VULKAN_HPP_NAMESPACE::Bool32     transformFeedbackDraw_                      = {},
+                                                                       void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxTransformFeedbackStreams( maxTransformFeedbackStreams_ )
+      , maxTransformFeedbackBuffers( maxTransformFeedbackBuffers_ )
+      , maxTransformFeedbackBufferSize( maxTransformFeedbackBufferSize_ )
+      , maxTransformFeedbackStreamDataSize( maxTransformFeedbackStreamDataSize_ )
+      , maxTransformFeedbackBufferDataSize( maxTransformFeedbackBufferDataSize_ )
+      , maxTransformFeedbackBufferDataStride( maxTransformFeedbackBufferDataStride_ )
+      , transformFeedbackQueries( transformFeedbackQueries_ )
+      , transformFeedbackStreamsLinesTriangles( transformFeedbackStreamsLinesTriangles_ )
+      , transformFeedbackRasterizationStreamSelect( transformFeedbackRasterizationStreamSelect_ )
+      , transformFeedbackDraw( transformFeedbackDraw_ )
     {
     }
 
@@ -121171,11 +87249,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceTransformFeedbackPropertiesEXT & operator=( PhysicalDeviceTransformFeedbackPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceTransformFeedbackPropertiesEXT & operator=( VkPhysicalDeviceTransformFeedbackPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceTransformFeedbackPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceTransformFeedbackPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -121189,29 +87267,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceTransformFeedbackPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceTransformFeedbackPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceTransformFeedbackPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceTransformFeedbackPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceTransformFeedbackPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
-               DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -121256,158 +87328,26 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                      = StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT;
-    void *        pNext                                      = {};
-    uint32_t      maxTransformFeedbackStreams                = {};
-    uint32_t      maxTransformFeedbackBuffers                = {};
-    DeviceSize    maxTransformFeedbackBufferSize             = {};
-    uint32_t      maxTransformFeedbackStreamDataSize         = {};
-    uint32_t      maxTransformFeedbackBufferDataSize         = {};
-    uint32_t      maxTransformFeedbackBufferDataStride       = {};
-    Bool32        transformFeedbackQueries                   = {};
-    Bool32        transformFeedbackStreamsLinesTriangles     = {};
-    Bool32        transformFeedbackRasterizationStreamSelect = {};
-    Bool32        transformFeedbackDraw                      = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                      = StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT;
+    void *                              pNext                                      = {};
+    uint32_t                            maxTransformFeedbackStreams                = {};
+    uint32_t                            maxTransformFeedbackBuffers                = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    maxTransformFeedbackBufferSize             = {};
+    uint32_t                            maxTransformFeedbackStreamDataSize         = {};
+    uint32_t                            maxTransformFeedbackBufferDataSize         = {};
+    uint32_t                            maxTransformFeedbackBufferDataStride       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackQueries                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackStreamsLinesTriangles     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackRasterizationStreamSelect = {};
+    VULKAN_HPP_NAMESPACE::Bool32        transformFeedbackDraw                      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceTransformFeedbackPropertiesEXT>
-  {
-    using Type = PhysicalDeviceTransformFeedbackPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT>
   {
     using Type = PhysicalDeviceTransformFeedbackPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR.html
-  struct PhysicalDeviceUnifiedImageLayoutsFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceUnifiedImageLayoutsFeaturesKHR( Bool32 unifiedImageLayouts_      = {},
-                                                                       Bool32 unifiedImageLayoutsVideo_ = {},
-                                                                       void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , unifiedImageLayouts{ unifiedImageLayouts_ }
-      , unifiedImageLayoutsVideo{ unifiedImageLayoutsVideo_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceUnifiedImageLayoutsFeaturesKHR( PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceUnifiedImageLayoutsFeaturesKHR( VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceUnifiedImageLayoutsFeaturesKHR( *reinterpret_cast<PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceUnifiedImageLayoutsFeaturesKHR & operator=( PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceUnifiedImageLayoutsFeaturesKHR & operator=( VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceUnifiedImageLayoutsFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceUnifiedImageLayoutsFeaturesKHR & setUnifiedImageLayouts( Bool32 unifiedImageLayouts_ ) VULKAN_HPP_NOEXCEPT
-    {
-      unifiedImageLayouts = unifiedImageLayouts_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceUnifiedImageLayoutsFeaturesKHR & setUnifiedImageLayoutsVideo( Bool32 unifiedImageLayoutsVideo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      unifiedImageLayoutsVideo = unifiedImageLayoutsVideo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, unifiedImageLayouts, unifiedImageLayoutsVideo );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( unifiedImageLayouts == rhs.unifiedImageLayouts ) &&
-             ( unifiedImageLayoutsVideo == rhs.unifiedImageLayoutsVideo );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceUnifiedImageLayoutsFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::ePhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-    void *        pNext                    = {};
-    Bool32        unifiedImageLayouts      = {};
-    Bool32        unifiedImageLayoutsVideo = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR>
-  {
-    using Type = PhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceUnifiedImageLayoutsFeaturesKHR>
-  {
-    using Type = PhysicalDeviceUnifiedImageLayoutsFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceUniformBufferStandardLayoutFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceUniformBufferStandardLayoutFeatures.html
   struct PhysicalDeviceUniformBufferStandardLayoutFeatures
   {
     using NativeType = VkPhysicalDeviceUniformBufferStandardLayoutFeatures;
@@ -121415,11 +87355,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceUniformBufferStandardLayoutFeatures( Bool32 uniformBufferStandardLayout_ = {},
-                                                                            void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , uniformBufferStandardLayout{ uniformBufferStandardLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceUniformBufferStandardLayoutFeatures( VULKAN_HPP_NAMESPACE::Bool32 uniformBufferStandardLayout_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , uniformBufferStandardLayout( uniformBufferStandardLayout_ )
     {
     }
 
@@ -121433,15 +87373,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceUniformBufferStandardLayoutFeatures &
       operator=( PhysicalDeviceUniformBufferStandardLayoutFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceUniformBufferStandardLayoutFeatures & operator=( VkPhysicalDeviceUniformBufferStandardLayoutFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceUniformBufferStandardLayoutFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceUniformBufferStandardLayoutFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceUniformBufferStandardLayoutFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -121449,12 +87389,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceUniformBufferStandardLayoutFeatures &
-      setUniformBufferStandardLayout( Bool32 uniformBufferStandardLayout_ ) VULKAN_HPP_NOEXCEPT
+      setUniformBufferStandardLayout( VULKAN_HPP_NAMESPACE::Bool32 uniformBufferStandardLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformBufferStandardLayout = uniformBufferStandardLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceUniformBufferStandardLayoutFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -121466,18 +87406,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceUniformBufferStandardLayoutFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceUniformBufferStandardLayoutFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceUniformBufferStandardLayoutFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceUniformBufferStandardLayoutFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceUniformBufferStandardLayoutFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, uniformBufferStandardLayout );
     }
@@ -121502,19 +87437,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                       = StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures;
-    void *        pNext                       = {};
-    Bool32        uniformBufferStandardLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                       = StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures;
+    void *                              pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformBufferStandardLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceUniformBufferStandardLayoutFeatures>
-  {
-    using Type = PhysicalDeviceUniformBufferStandardLayoutFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures>
   {
@@ -121523,8 +87450,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceUniformBufferStandardLayoutFeaturesKHR = PhysicalDeviceUniformBufferStandardLayoutFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceVariablePointersFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVariablePointersFeatures.html
   struct PhysicalDeviceVariablePointersFeatures
   {
     using NativeType = VkPhysicalDeviceVariablePointersFeatures;
@@ -121532,13 +87457,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVariablePointersFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVariablePointersFeatures( Bool32 variablePointersStorageBuffer_ = {},
-                                                                 Bool32 variablePointers_              = {},
-                                                                 void * pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , variablePointersStorageBuffer{ variablePointersStorageBuffer_ }
-      , variablePointers{ variablePointers_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVariablePointersFeatures( VULKAN_HPP_NAMESPACE::Bool32 variablePointersStorageBuffer_ = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32 variablePointers_              = {},
+                                                                 void *                       pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , variablePointersStorageBuffer( variablePointersStorageBuffer_ )
+      , variablePointers( variablePointers_ )
     {
     }
 
@@ -121550,15 +87475,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVariablePointersFeatures & operator=( PhysicalDeviceVariablePointersFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVariablePointersFeatures & operator=( VkPhysicalDeviceVariablePointersFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVariablePointersFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVariablePointersFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVariablePointersFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -121566,18 +87491,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVariablePointersFeatures &
-      setVariablePointersStorageBuffer( Bool32 variablePointersStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
+      setVariablePointersStorageBuffer( VULKAN_HPP_NAMESPACE::Bool32 variablePointersStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       variablePointersStorageBuffer = variablePointersStorageBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVariablePointersFeatures & setVariablePointers( Bool32 variablePointers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVariablePointersFeatures & setVariablePointers( VULKAN_HPP_NAMESPACE::Bool32 variablePointers_ ) VULKAN_HPP_NOEXCEPT
     {
       variablePointers = variablePointers_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVariablePointersFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -121589,18 +87514,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVariablePointersFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceVariablePointersFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVariablePointersFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceVariablePointersFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVariablePointersFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, variablePointersStorageBuffer, variablePointers );
     }
@@ -121626,20 +87546,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                         = StructureType::ePhysicalDeviceVariablePointersFeatures;
-    void *        pNext                         = {};
-    Bool32        variablePointersStorageBuffer = {};
-    Bool32        variablePointers              = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                         = StructureType::ePhysicalDeviceVariablePointersFeatures;
+    void *                              pNext                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        variablePointersStorageBuffer = {};
+    VULKAN_HPP_NAMESPACE::Bool32        variablePointers              = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVariablePointersFeatures>
-  {
-    using Type = PhysicalDeviceVariablePointersFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVariablePointersFeatures>
   {
@@ -121650,94 +87562,88 @@ namespace VULKAN_HPP_NAMESPACE
   using PhysicalDeviceVariablePointerFeaturesKHR  = PhysicalDeviceVariablePointersFeatures;
   using PhysicalDeviceVariablePointersFeaturesKHR = PhysicalDeviceVariablePointersFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceVertexAttributeDivisorFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVertexAttributeDivisorFeatures.html
-  struct PhysicalDeviceVertexAttributeDivisorFeatures
+  struct PhysicalDeviceVertexAttributeDivisorFeaturesKHR
   {
-    using NativeType = VkPhysicalDeviceVertexAttributeDivisorFeatures;
+    using NativeType = VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeDivisorFeatures;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeDivisorFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorFeatures( Bool32 vertexAttributeInstanceRateDivisor_     = {},
-                                                                       Bool32 vertexAttributeInstanceRateZeroDivisor_ = {},
-                                                                       void * pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexAttributeInstanceRateDivisor{ vertexAttributeInstanceRateDivisor_ }
-      , vertexAttributeInstanceRateZeroDivisor{ vertexAttributeInstanceRateZeroDivisor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeInstanceRateDivisor_     = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeInstanceRateZeroDivisor_ = {},
+                                                                          void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexAttributeInstanceRateDivisor( vertexAttributeInstanceRateDivisor_ )
+      , vertexAttributeInstanceRateZeroDivisor( vertexAttributeInstanceRateZeroDivisor_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorFeatures( PhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceVertexAttributeDivisorFeaturesKHR( PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceVertexAttributeDivisorFeatures( VkPhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVertexAttributeDivisorFeatures( *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorFeatures const *>( &rhs ) )
+    PhysicalDeviceVertexAttributeDivisorFeaturesKHR( VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceVertexAttributeDivisorFeaturesKHR( *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorFeaturesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceVertexAttributeDivisorFeatures & operator=( PhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceVertexAttributeDivisorFeaturesKHR & operator=( PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceVertexAttributeDivisorFeatures & operator=( VkPhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceVertexAttributeDivisorFeaturesKHR & operator=( VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeatures &
-      setVertexAttributeInstanceRateDivisor( Bool32 vertexAttributeInstanceRateDivisor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeaturesKHR &
+      setVertexAttributeInstanceRateDivisor( VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeInstanceRateDivisor_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexAttributeInstanceRateDivisor = vertexAttributeInstanceRateDivisor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeatures &
-      setVertexAttributeInstanceRateZeroDivisor( Bool32 vertexAttributeInstanceRateZeroDivisor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeDivisorFeaturesKHR &
+      setVertexAttributeInstanceRateZeroDivisor( VULKAN_HPP_NAMESPACE::Bool32 vertexAttributeInstanceRateZeroDivisor_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexAttributeInstanceRateZeroDivisor = vertexAttributeInstanceRateZeroDivisor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPhysicalDeviceVertexAttributeDivisorFeatures const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorFeatures *>( this );
+      return *reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceVertexAttributeDivisorFeatures &() VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorFeatures *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorFeaturesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vertexAttributeInstanceRateDivisor, vertexAttributeInstanceRateZeroDivisor );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVertexAttributeDivisorFeatures const & ) const = default;
+    auto operator<=>( PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -121747,143 +87653,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceVertexAttributeDivisorFeatures const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceVertexAttributeDivisorFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceVertexAttributeDivisorFeatures;
-    void *        pNext                                  = {};
-    Bool32        vertexAttributeInstanceRateDivisor     = {};
-    Bool32        vertexAttributeInstanceRateZeroDivisor = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                  = StructureType::ePhysicalDeviceVertexAttributeDivisorFeaturesKHR;
+    void *                              pNext                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vertexAttributeInstanceRateDivisor     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vertexAttributeInstanceRateZeroDivisor = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVertexAttributeDivisorFeatures>
-  {
-    using Type = PhysicalDeviceVertexAttributeDivisorFeatures;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeDivisorFeatures>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeDivisorFeaturesKHR>
   {
-    using Type = PhysicalDeviceVertexAttributeDivisorFeatures;
+    using Type = PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
   };
 
-  using PhysicalDeviceVertexAttributeDivisorFeaturesEXT = PhysicalDeviceVertexAttributeDivisorFeatures;
-  using PhysicalDeviceVertexAttributeDivisorFeaturesKHR = PhysicalDeviceVertexAttributeDivisorFeatures;
+  using PhysicalDeviceVertexAttributeDivisorFeaturesEXT = PhysicalDeviceVertexAttributeDivisorFeaturesKHR;
 
-  // wrapper struct for struct VkPhysicalDeviceVertexAttributeDivisorProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVertexAttributeDivisorProperties.html
-  struct PhysicalDeviceVertexAttributeDivisorProperties
-  {
-    using NativeType = VkPhysicalDeviceVertexAttributeDivisorProperties;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeDivisorProperties;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorProperties( uint32_t maxVertexAttribDivisor_       = {},
-                                                                         Bool32   supportsNonZeroFirstInstance_ = {},
-                                                                         void *   pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxVertexAttribDivisor{ maxVertexAttribDivisor_ }
-      , supportsNonZeroFirstInstance{ supportsNonZeroFirstInstance_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceVertexAttributeDivisorProperties( PhysicalDeviceVertexAttributeDivisorProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVertexAttributeDivisorProperties( VkPhysicalDeviceVertexAttributeDivisorProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVertexAttributeDivisorProperties( *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorProperties const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVertexAttributeDivisorProperties & operator=( PhysicalDeviceVertexAttributeDivisorProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVertexAttributeDivisorProperties & operator=( VkPhysicalDeviceVertexAttributeDivisorProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorProperties const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorProperties const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorProperties &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorProperties *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorProperties *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxVertexAttribDivisor, supportsNonZeroFirstInstance );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVertexAttributeDivisorProperties const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVertexAttributeDivisorProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxVertexAttribDivisor == rhs.maxVertexAttribDivisor ) &&
-             ( supportsNonZeroFirstInstance == rhs.supportsNonZeroFirstInstance );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVertexAttributeDivisorProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                        = StructureType::ePhysicalDeviceVertexAttributeDivisorProperties;
-    void *        pNext                        = {};
-    uint32_t      maxVertexAttribDivisor       = {};
-    Bool32        supportsNonZeroFirstInstance = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVertexAttributeDivisorProperties>
-  {
-    using Type = PhysicalDeviceVertexAttributeDivisorProperties;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeDivisorProperties>
-  {
-    using Type = PhysicalDeviceVertexAttributeDivisorProperties;
-  };
-
-  using PhysicalDeviceVertexAttributeDivisorPropertiesKHR = PhysicalDeviceVertexAttributeDivisorProperties;
-
-  // wrapper struct for struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT.html
   struct PhysicalDeviceVertexAttributeDivisorPropertiesEXT
   {
     using NativeType = VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT;
@@ -121891,10 +87681,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorPropertiesEXT( uint32_t maxVertexAttribDivisor_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxVertexAttribDivisor{ maxVertexAttribDivisor_ }
+      : pNext( pNext_ )
+      , maxVertexAttribDivisor( maxVertexAttribDivisor_ )
     {
     }
 
@@ -121908,11 +87698,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceVertexAttributeDivisorPropertiesEXT &
       operator=( PhysicalDeviceVertexAttributeDivisorPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVertexAttributeDivisorPropertiesEXT & operator=( VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorPropertiesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesEXT const *>( &rhs );
       return *this;
     }
 
@@ -121926,18 +87716,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxVertexAttribDivisor );
     }
@@ -121962,142 +87747,106 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT;
-    void *        pNext                  = {};
-    uint32_t      maxVertexAttribDivisor = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT;
+    void *                              pNext                  = {};
+    uint32_t                            maxVertexAttribDivisor = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT>
-  {
-    using Type = PhysicalDeviceVertexAttributeDivisorPropertiesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT>
   {
     using Type = PhysicalDeviceVertexAttributeDivisorPropertiesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT.html
-  struct PhysicalDeviceVertexAttributeRobustnessFeaturesEXT
+  struct PhysicalDeviceVertexAttributeDivisorPropertiesKHR
   {
-    using NativeType = VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
+    using NativeType = VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeRobustnessFeaturesEXT( Bool32 vertexAttributeRobustness_ = {},
-                                                                             void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexAttributeRobustness{ vertexAttributeRobustness_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexAttributeDivisorPropertiesKHR( uint32_t                     maxVertexAttribDivisor_       = {},
+                                                                            VULKAN_HPP_NAMESPACE::Bool32 supportsNonZeroFirstInstance_ = {},
+                                                                            void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxVertexAttribDivisor( maxVertexAttribDivisor_ )
+      , supportsNonZeroFirstInstance( supportsNonZeroFirstInstance_ )
     {
     }
 
     VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceVertexAttributeRobustnessFeaturesEXT( PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+      PhysicalDeviceVertexAttributeDivisorPropertiesKHR( PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PhysicalDeviceVertexAttributeRobustnessFeaturesEXT( VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVertexAttributeRobustnessFeaturesEXT( *reinterpret_cast<PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const *>( &rhs ) )
+    PhysicalDeviceVertexAttributeDivisorPropertiesKHR( VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PhysicalDeviceVertexAttributeDivisorPropertiesKHR( *reinterpret_cast<PhysicalDeviceVertexAttributeDivisorPropertiesKHR const *>( &rhs ) )
     {
     }
 
-    PhysicalDeviceVertexAttributeRobustnessFeaturesEXT &
-      operator=( PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PhysicalDeviceVertexAttributeDivisorPropertiesKHR &
+      operator=( PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PhysicalDeviceVertexAttributeRobustnessFeaturesEXT & operator=( VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+    PhysicalDeviceVertexAttributeDivisorPropertiesKHR & operator=( VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexAttributeDivisorPropertiesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeRobustnessFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      pNext = pNext_;
-      return *this;
+      return *reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR *>( this );
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexAttributeRobustnessFeaturesEXT &
-      setVertexAttributeRobustness( Bool32 vertexAttributeRobustness_ ) VULKAN_HPP_NOEXCEPT
+    operator VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      vertexAttributeRobustness = vertexAttributeRobustness_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT *>( this );
+      return *reinterpret_cast<VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
-      return std::tie( sType, pNext, vertexAttributeRobustness );
+      return std::tie( sType, pNext, maxVertexAttribDivisor, supportsNonZeroFirstInstance );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & ) const = default;
+    auto operator<=>( PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & ) const = default;
 #else
-    bool operator==( PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
 #  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( vertexAttributeRobustness == rhs.vertexAttributeRobustness );
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxVertexAttribDivisor == rhs.maxVertexAttribDivisor ) &&
+             ( supportsNonZeroFirstInstance == rhs.supportsNonZeroFirstInstance );
 #  endif
     }
 
-    bool operator!=( PhysicalDeviceVertexAttributeRobustnessFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PhysicalDeviceVertexAttributeDivisorPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType                     = StructureType::ePhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
-    void *        pNext                     = {};
-    Bool32        vertexAttributeRobustness = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesKHR;
+    void *                              pNext                        = {};
+    uint32_t                            maxVertexAttribDivisor       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        supportsNonZeroFirstInstance = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT>
-  {
-    using Type = PhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeRobustnessFeaturesEXT>
+  struct CppType<StructureType, StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesKHR>
   {
-    using Type = PhysicalDeviceVertexAttributeRobustnessFeaturesEXT;
+    using Type = PhysicalDeviceVertexAttributeDivisorPropertiesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT.html
   struct PhysicalDeviceVertexInputDynamicStateFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT;
@@ -122105,10 +87854,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexInputDynamicStateFeaturesEXT( Bool32 vertexInputDynamicState_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexInputDynamicState{ vertexInputDynamicState_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVertexInputDynamicStateFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 vertexInputDynamicState_ = {},
+                                                                           void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexInputDynamicState( vertexInputDynamicState_ )
     {
     }
 
@@ -122121,27 +87871,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVertexInputDynamicStateFeaturesEXT & operator=( PhysicalDeviceVertexInputDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVertexInputDynamicStateFeaturesEXT & operator=( VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVertexInputDynamicStateFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVertexInputDynamicStateFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexInputDynamicStateFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexInputDynamicStateFeaturesEXT & setVertexInputDynamicState( Bool32 vertexInputDynamicState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVertexInputDynamicStateFeaturesEXT &
+      setVertexInputDynamicState( VULKAN_HPP_NAMESPACE::Bool32 vertexInputDynamicState_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexInputDynamicState = vertexInputDynamicState_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -122153,18 +87904,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vertexInputDynamicState );
     }
@@ -122189,360 +87935,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT;
-    void *        pNext                   = {};
-    Bool32        vertexInputDynamicState = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vertexInputDynamicState = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT>
-  {
-    using Type = PhysicalDeviceVertexInputDynamicStateFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT>
   {
     using Type = PhysicalDeviceVertexInputDynamicStateFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVideoDecodeVP9FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoDecodeVP9FeaturesKHR.html
-  struct PhysicalDeviceVideoDecodeVP9FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceVideoDecodeVP9FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoDecodeVp9FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoDecodeVP9FeaturesKHR( Bool32 videoDecodeVP9_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoDecodeVP9{ videoDecodeVP9_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoDecodeVP9FeaturesKHR( PhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoDecodeVP9FeaturesKHR( VkPhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoDecodeVP9FeaturesKHR( *reinterpret_cast<PhysicalDeviceVideoDecodeVP9FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoDecodeVP9FeaturesKHR & operator=( PhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoDecodeVP9FeaturesKHR & operator=( VkPhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoDecodeVP9FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoDecodeVP9FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoDecodeVP9FeaturesKHR & setVideoDecodeVP9( Bool32 videoDecodeVP9_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoDecodeVP9 = videoDecodeVP9_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoDecodeVP9FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoDecodeVP9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoDecodeVP9FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoDecodeVP9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoDecodeVP9FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoDecodeVP9FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoDecodeVP9FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoDecodeVP9FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoDecodeVP9 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoDecodeVP9FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoDecodeVP9 == rhs.videoDecodeVP9 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoDecodeVP9FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::ePhysicalDeviceVideoDecodeVp9FeaturesKHR;
-    void *        pNext          = {};
-    Bool32        videoDecodeVP9 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoDecodeVP9FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoDecodeVP9FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoDecodeVp9FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoDecodeVP9FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVideoEncodeAV1FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoEncodeAV1FeaturesKHR.html
-  struct PhysicalDeviceVideoEncodeAV1FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceVideoEncodeAV1FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoEncodeAv1FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeAV1FeaturesKHR( Bool32 videoEncodeAV1_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoEncodeAV1{ videoEncodeAV1_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeAV1FeaturesKHR( PhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoEncodeAV1FeaturesKHR( VkPhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoEncodeAV1FeaturesKHR( *reinterpret_cast<PhysicalDeviceVideoEncodeAV1FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoEncodeAV1FeaturesKHR & operator=( PhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoEncodeAV1FeaturesKHR & operator=( VkPhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoEncodeAV1FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeAV1FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeAV1FeaturesKHR & setVideoEncodeAV1( Bool32 videoEncodeAV1_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoEncodeAV1 = videoEncodeAV1_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoEncodeAV1FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoEncodeAV1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeAV1FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoEncodeAV1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeAV1FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoEncodeAV1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeAV1FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoEncodeAV1FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoEncodeAV1 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoEncodeAV1FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoEncodeAV1 == rhs.videoEncodeAV1 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoEncodeAV1FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::ePhysicalDeviceVideoEncodeAv1FeaturesKHR;
-    void *        pNext          = {};
-    Bool32        videoEncodeAV1 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoEncodeAV1FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeAV1FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoEncodeAv1FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeAV1FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR.html
-  struct PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR( Bool32 videoEncodeIntraRefresh_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoEncodeIntraRefresh{ videoEncodeIntraRefresh_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR( PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR( VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR( *reinterpret_cast<PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR & operator=( PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR & operator=( VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR & setVideoEncodeIntraRefresh( Bool32 videoEncodeIntraRefresh_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoEncodeIntraRefresh = videoEncodeIntraRefresh_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoEncodeIntraRefresh );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoEncodeIntraRefresh == rhs.videoEncodeIntraRefresh );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                   = StructureType::ePhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-    void *        pNext                   = {};
-    Bool32        videoEncodeIntraRefresh = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkVideoProfileInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoProfileInfoKHR.html
   struct VideoProfileInfoKHR
   {
     using NativeType = VkVideoProfileInfoKHR;
@@ -122550,17 +87953,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoProfileInfoKHR( VideoCodecOperationFlagBitsKHR videoCodecOperation_ = VideoCodecOperationFlagBitsKHR::eNone,
-                                              VideoChromaSubsamplingFlagsKHR chromaSubsampling_   = {},
-                                              VideoComponentBitDepthFlagsKHR lumaBitDepth_        = {},
-                                              VideoComponentBitDepthFlagsKHR chromaBitDepth_      = {},
-                                              const void *                   pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoCodecOperation{ videoCodecOperation_ }
-      , chromaSubsampling{ chromaSubsampling_ }
-      , lumaBitDepth{ lumaBitDepth_ }
-      , chromaBitDepth{ chromaBitDepth_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoProfileInfoKHR(
+      VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR videoCodecOperation_ = VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR::eNone,
+      VULKAN_HPP_NAMESPACE::VideoChromaSubsamplingFlagsKHR chromaSubsampling_   = {},
+      VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR lumaBitDepth_        = {},
+      VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR chromaBitDepth_      = {},
+      const void *                                         pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoCodecOperation( videoCodecOperation_ )
+      , chromaSubsampling( chromaSubsampling_ )
+      , lumaBitDepth( lumaBitDepth_ )
+      , chromaBitDepth( chromaBitDepth_ )
     {
     }
 
@@ -122571,45 +87975,47 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoProfileInfoKHR & operator=( VideoProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoProfileInfoKHR & operator=( VkVideoProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setVideoCodecOperation( VideoCodecOperationFlagBitsKHR videoCodecOperation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR &
+      setVideoCodecOperation( VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR videoCodecOperation_ ) VULKAN_HPP_NOEXCEPT
     {
       videoCodecOperation = videoCodecOperation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setChromaSubsampling( VideoChromaSubsamplingFlagsKHR chromaSubsampling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR &
+      setChromaSubsampling( VULKAN_HPP_NAMESPACE::VideoChromaSubsamplingFlagsKHR chromaSubsampling_ ) VULKAN_HPP_NOEXCEPT
     {
       chromaSubsampling = chromaSubsampling_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setLumaBitDepth( VideoComponentBitDepthFlagsKHR lumaBitDepth_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setLumaBitDepth( VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR lumaBitDepth_ ) VULKAN_HPP_NOEXCEPT
     {
       lumaBitDepth = lumaBitDepth_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setChromaBitDepth( VideoComponentBitDepthFlagsKHR chromaBitDepth_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoProfileInfoKHR & setChromaBitDepth( VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR chromaBitDepth_ ) VULKAN_HPP_NOEXCEPT
     {
       chromaBitDepth = chromaBitDepth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -122621,23 +88027,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoProfileInfoKHR *>( this );
     }
 
-    operator VkVideoProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoCodecOperationFlagBitsKHR const &,
-               VideoChromaSubsamplingFlagsKHR const &,
-               VideoComponentBitDepthFlagsKHR const &,
-               VideoComponentBitDepthFlagsKHR const &>
+               VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoChromaSubsamplingFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoCodecOperation, chromaSubsampling, lumaBitDepth, chromaBitDepth );
@@ -122664,30 +88064,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType               = StructureType::eVideoProfileInfoKHR;
-    const void *                   pNext               = {};
-    VideoCodecOperationFlagBitsKHR videoCodecOperation = VideoCodecOperationFlagBitsKHR::eNone;
-    VideoChromaSubsamplingFlagsKHR chromaSubsampling   = {};
-    VideoComponentBitDepthFlagsKHR lumaBitDepth        = {};
-    VideoComponentBitDepthFlagsKHR chromaBitDepth      = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType               = StructureType::eVideoProfileInfoKHR;
+    const void *                                         pNext               = {};
+    VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR videoCodecOperation = VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagBitsKHR::eNone;
+    VULKAN_HPP_NAMESPACE::VideoChromaSubsamplingFlagsKHR chromaSubsampling   = {};
+    VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR lumaBitDepth        = {};
+    VULKAN_HPP_NAMESPACE::VideoComponentBitDepthFlagsKHR chromaBitDepth      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoProfileInfoKHR>
-  {
-    using Type = VideoProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoProfileInfoKHR>
   {
     using Type = VideoProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR.html
   struct PhysicalDeviceVideoEncodeQualityLevelInfoKHR
   {
     using NativeType = VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR;
@@ -122695,13 +88085,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeQualityLevelInfoKHR( const VideoProfileInfoKHR * pVideoProfile_ = {},
-                                                                       uint32_t                    qualityLevel_  = {},
-                                                                       const void *                pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pVideoProfile{ pVideoProfile_ }
-      , qualityLevel{ qualityLevel_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeQualityLevelInfoKHR( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile_ = {},
+                                                                       uint32_t                                          qualityLevel_  = {},
+                                                                       const void *                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pVideoProfile( pVideoProfile_ )
+      , qualityLevel( qualityLevel_ )
     {
     }
 
@@ -122713,22 +88103,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVideoEncodeQualityLevelInfoKHR & operator=( PhysicalDeviceVideoEncodeQualityLevelInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVideoEncodeQualityLevelInfoKHR & operator=( VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVideoEncodeQualityLevelInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoEncodeQualityLevelInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeQualityLevelInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeQualityLevelInfoKHR & setPVideoProfile( const VideoProfileInfoKHR * pVideoProfile_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeQualityLevelInfoKHR &
+      setPVideoProfile( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile_ ) VULKAN_HPP_NOEXCEPT
     {
       pVideoProfile = pVideoProfile_;
       return *this;
@@ -122739,7 +88130,7 @@ namespace VULKAN_HPP_NAMESPACE
       qualityLevel = qualityLevel_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -122751,18 +88142,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( this );
     }
 
-    operator VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const VideoProfileInfoKHR * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pVideoProfile, qualityLevel );
     }
@@ -122787,258 +88173,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType         = StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR;
-    const void *                pNext         = {};
-    const VideoProfileInfoKHR * pVideoProfile = {};
-    uint32_t                    qualityLevel  = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType         = StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR;
+    const void *                                      pNext         = {};
+    const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile = {};
+    uint32_t                                          qualityLevel  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeQualityLevelInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR>
   {
     using Type = PhysicalDeviceVideoEncodeQualityLevelInfoKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR.html
-  struct PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR( Bool32 videoEncodeQuantizationMap_ = {},
-                                                                              void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoEncodeQuantizationMap{ videoEncodeQuantizationMap_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR( PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR( VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR( *reinterpret_cast<PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR &
-      operator=( PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR & operator=( VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR &
-      setVideoEncodeQuantizationMap( Bool32 videoEncodeQuantizationMap_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoEncodeQuantizationMap = videoEncodeQuantizationMap_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoEncodeQuantizationMap );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoEncodeQuantizationMap == rhs.videoEncodeQuantizationMap );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-    void *        pNext                      = {};
-    Bool32        videoEncodeQuantizationMap = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE.html
-  struct PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE
-  {
-    using NativeType = VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE( Bool32 videoEncodeRgbConversion_ = {},
-                                                                              void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoEncodeRgbConversion{ videoEncodeRgbConversion_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE( PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE( VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE( *reinterpret_cast<PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE &
-      operator=( PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE & operator=( VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE &
-      setVideoEncodeRgbConversion( Bool32 videoEncodeRgbConversion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoEncodeRgbConversion = videoEncodeRgbConversion_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoEncodeRgbConversion );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoEncodeRgbConversion == rhs.videoEncodeRgbConversion );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::ePhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-    void *        pNext                    = {};
-    Bool32        videoEncodeRgbConversion = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>
-  {
-    using Type = PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE>
-  {
-    using Type = PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVideoFormatInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoFormatInfoKHR.html
   struct PhysicalDeviceVideoFormatInfoKHR
   {
     using NativeType = VkPhysicalDeviceVideoFormatInfoKHR;
@@ -123046,10 +88192,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoFormatInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoFormatInfoKHR( ImageUsageFlags imageUsage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageUsage{ imageUsage_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoFormatInfoKHR( VULKAN_HPP_NAMESPACE::ImageUsageFlags imageUsage_ = {},
+                                                           const void *                          pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageUsage( imageUsage_ )
     {
     }
 
@@ -123061,27 +88208,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVideoFormatInfoKHR & operator=( PhysicalDeviceVideoFormatInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVideoFormatInfoKHR & operator=( VkPhysicalDeviceVideoFormatInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVideoFormatInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoFormatInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoFormatInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoFormatInfoKHR & setImageUsage( ImageUsageFlags imageUsage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoFormatInfoKHR & setImageUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags imageUsage_ ) VULKAN_HPP_NOEXCEPT
     {
       imageUsage = imageUsage_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVideoFormatInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -123093,18 +88240,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVideoFormatInfoKHR *>( this );
     }
 
-    operator VkPhysicalDeviceVideoFormatInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoFormatInfoKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoFormatInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoFormatInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageUsage );
     }
@@ -123129,27 +88271,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType      = StructureType::ePhysicalDeviceVideoFormatInfoKHR;
-    const void *    pNext      = {};
-    ImageUsageFlags imageUsage = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType      = StructureType::ePhysicalDeviceVideoFormatInfoKHR;
+    const void *                          pNext      = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags imageUsage = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoFormatInfoKHR>
-  {
-    using Type = PhysicalDeviceVideoFormatInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVideoFormatInfoKHR>
   {
     using Type = PhysicalDeviceVideoFormatInfoKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVideoMaintenance1FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoMaintenance1FeaturesKHR.html
   struct PhysicalDeviceVideoMaintenance1FeaturesKHR
   {
     using NativeType = VkPhysicalDeviceVideoMaintenance1FeaturesKHR;
@@ -123157,10 +88289,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoMaintenance1FeaturesKHR( Bool32 videoMaintenance1_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoMaintenance1{ videoMaintenance1_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoMaintenance1FeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 videoMaintenance1_ = {},
+                                                                     void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoMaintenance1( videoMaintenance1_ )
     {
     }
 
@@ -123172,27 +88305,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVideoMaintenance1FeaturesKHR & operator=( PhysicalDeviceVideoMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVideoMaintenance1FeaturesKHR & operator=( VkPhysicalDeviceVideoMaintenance1FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVideoMaintenance1FeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVideoMaintenance1FeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoMaintenance1FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoMaintenance1FeaturesKHR & setVideoMaintenance1( Bool32 videoMaintenance1_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoMaintenance1FeaturesKHR &
+      setVideoMaintenance1( VULKAN_HPP_NAMESPACE::Bool32 videoMaintenance1_ ) VULKAN_HPP_NOEXCEPT
     {
       videoMaintenance1 = videoMaintenance1_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVideoMaintenance1FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -123204,18 +88338,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVideoMaintenance1FeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceVideoMaintenance1FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoMaintenance1FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoMaintenance1FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoMaintenance1FeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoMaintenance1 );
     }
@@ -123240,138 +88369,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR;
-    void *        pNext             = {};
-    Bool32        videoMaintenance1 = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        videoMaintenance1 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoMaintenance1FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoMaintenance1FeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR>
   {
     using Type = PhysicalDeviceVideoMaintenance1FeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVideoMaintenance2FeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVideoMaintenance2FeaturesKHR.html
-  struct PhysicalDeviceVideoMaintenance2FeaturesKHR
-  {
-    using NativeType = VkPhysicalDeviceVideoMaintenance2FeaturesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVideoMaintenance2FeaturesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoMaintenance2FeaturesKHR( Bool32 videoMaintenance2_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoMaintenance2{ videoMaintenance2_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVideoMaintenance2FeaturesKHR( PhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVideoMaintenance2FeaturesKHR( VkPhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVideoMaintenance2FeaturesKHR( *reinterpret_cast<PhysicalDeviceVideoMaintenance2FeaturesKHR const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVideoMaintenance2FeaturesKHR & operator=( PhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVideoMaintenance2FeaturesKHR & operator=( VkPhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVideoMaintenance2FeaturesKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoMaintenance2FeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVideoMaintenance2FeaturesKHR & setVideoMaintenance2( Bool32 videoMaintenance2_ ) VULKAN_HPP_NOEXCEPT
-    {
-      videoMaintenance2 = videoMaintenance2_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVideoMaintenance2FeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVideoMaintenance2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoMaintenance2FeaturesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVideoMaintenance2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoMaintenance2FeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVideoMaintenance2FeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceVideoMaintenance2FeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVideoMaintenance2FeaturesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, videoMaintenance2 );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVideoMaintenance2FeaturesKHR const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( videoMaintenance2 == rhs.videoMaintenance2 );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVideoMaintenance2FeaturesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType             = StructureType::ePhysicalDeviceVideoMaintenance2FeaturesKHR;
-    void *        pNext             = {};
-    Bool32        videoMaintenance2 = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVideoMaintenance2FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoMaintenance2FeaturesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVideoMaintenance2FeaturesKHR>
-  {
-    using Type = PhysicalDeviceVideoMaintenance2FeaturesKHR;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVulkan11Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan11Features.html
   struct PhysicalDeviceVulkan11Features
   {
     using NativeType = VkPhysicalDeviceVulkan11Features;
@@ -123379,33 +88387,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan11Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan11Features( Bool32 storageBuffer16BitAccess_           = {},
-                                                         Bool32 uniformAndStorageBuffer16BitAccess_ = {},
-                                                         Bool32 storagePushConstant16_              = {},
-                                                         Bool32 storageInputOutput16_               = {},
-                                                         Bool32 multiview_                          = {},
-                                                         Bool32 multiviewGeometryShader_            = {},
-                                                         Bool32 multiviewTessellationShader_        = {},
-                                                         Bool32 variablePointersStorageBuffer_      = {},
-                                                         Bool32 variablePointers_                   = {},
-                                                         Bool32 protectedMemory_                    = {},
-                                                         Bool32 samplerYcbcrConversion_             = {},
-                                                         Bool32 shaderDrawParameters_               = {},
-                                                         void * pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , storageBuffer16BitAccess{ storageBuffer16BitAccess_ }
-      , uniformAndStorageBuffer16BitAccess{ uniformAndStorageBuffer16BitAccess_ }
-      , storagePushConstant16{ storagePushConstant16_ }
-      , storageInputOutput16{ storageInputOutput16_ }
-      , multiview{ multiview_ }
-      , multiviewGeometryShader{ multiviewGeometryShader_ }
-      , multiviewTessellationShader{ multiviewTessellationShader_ }
-      , variablePointersStorageBuffer{ variablePointersStorageBuffer_ }
-      , variablePointers{ variablePointers_ }
-      , protectedMemory{ protectedMemory_ }
-      , samplerYcbcrConversion{ samplerYcbcrConversion_ }
-      , shaderDrawParameters{ shaderDrawParameters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan11Features( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer16BitAccess_           = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer16BitAccess_ = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant16_              = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 storageInputOutput16_               = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 multiview_                          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 multiviewGeometryShader_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 multiviewTessellationShader_        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 variablePointersStorageBuffer_      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 variablePointers_                   = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 protectedMemory_                    = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 samplerYcbcrConversion_             = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderDrawParameters_               = {},
+                                                         void *                       pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , storageBuffer16BitAccess( storageBuffer16BitAccess_ )
+      , uniformAndStorageBuffer16BitAccess( uniformAndStorageBuffer16BitAccess_ )
+      , storagePushConstant16( storagePushConstant16_ )
+      , storageInputOutput16( storageInputOutput16_ )
+      , multiview( multiview_ )
+      , multiviewGeometryShader( multiviewGeometryShader_ )
+      , multiviewTessellationShader( multiviewTessellationShader_ )
+      , variablePointersStorageBuffer( variablePointersStorageBuffer_ )
+      , variablePointers( variablePointers_ )
+      , protectedMemory( protectedMemory_ )
+      , samplerYcbcrConversion( samplerYcbcrConversion_ )
+      , shaderDrawParameters( shaderDrawParameters_ )
     {
     }
 
@@ -123417,94 +88425,99 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkan11Features & operator=( PhysicalDeviceVulkan11Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan11Features & operator=( VkPhysicalDeviceVulkan11Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan11Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan11Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setStorageBuffer16BitAccess( Bool32 storageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
+      setStorageBuffer16BitAccess( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       storageBuffer16BitAccess = storageBuffer16BitAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
-      setUniformAndStorageBuffer16BitAccess( Bool32 uniformAndStorageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setUniformAndStorageBuffer16BitAccess( VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer16BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformAndStorageBuffer16BitAccess = uniformAndStorageBuffer16BitAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setStoragePushConstant16( Bool32 storagePushConstant16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setStoragePushConstant16( VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant16_ ) VULKAN_HPP_NOEXCEPT
     {
       storagePushConstant16 = storagePushConstant16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setStorageInputOutput16( Bool32 storageInputOutput16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setStorageInputOutput16( VULKAN_HPP_NAMESPACE::Bool32 storageInputOutput16_ ) VULKAN_HPP_NOEXCEPT
     {
       storageInputOutput16 = storageInputOutput16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setMultiview( Bool32 multiview_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setMultiview( VULKAN_HPP_NAMESPACE::Bool32 multiview_ ) VULKAN_HPP_NOEXCEPT
     {
       multiview = multiview_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setMultiviewGeometryShader( Bool32 multiviewGeometryShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
+      setMultiviewGeometryShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewGeometryShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewGeometryShader = multiviewGeometryShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setMultiviewTessellationShader( Bool32 multiviewTessellationShader_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
+      setMultiviewTessellationShader( VULKAN_HPP_NAMESPACE::Bool32 multiviewTessellationShader_ ) VULKAN_HPP_NOEXCEPT
     {
       multiviewTessellationShader = multiviewTessellationShader_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setVariablePointersStorageBuffer( Bool32 variablePointersStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
+      setVariablePointersStorageBuffer( VULKAN_HPP_NAMESPACE::Bool32 variablePointersStorageBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       variablePointersStorageBuffer = variablePointersStorageBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setVariablePointers( Bool32 variablePointers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setVariablePointers( VULKAN_HPP_NAMESPACE::Bool32 variablePointers_ ) VULKAN_HPP_NOEXCEPT
     {
       variablePointers = variablePointers_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setProtectedMemory( Bool32 protectedMemory_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setProtectedMemory( VULKAN_HPP_NAMESPACE::Bool32 protectedMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       protectedMemory = protectedMemory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setSamplerYcbcrConversion( Bool32 samplerYcbcrConversion_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features &
+      setSamplerYcbcrConversion( VULKAN_HPP_NAMESPACE::Bool32 samplerYcbcrConversion_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerYcbcrConversion = samplerYcbcrConversion_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setShaderDrawParameters( Bool32 shaderDrawParameters_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Features & setShaderDrawParameters( VULKAN_HPP_NAMESPACE::Bool32 shaderDrawParameters_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderDrawParameters = shaderDrawParameters_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVulkan11Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -123516,31 +88529,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan11Features *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan11Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan11Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan11Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan11Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -123585,38 +88592,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                              = StructureType::ePhysicalDeviceVulkan11Features;
-    void *        pNext                              = {};
-    Bool32        storageBuffer16BitAccess           = {};
-    Bool32        uniformAndStorageBuffer16BitAccess = {};
-    Bool32        storagePushConstant16              = {};
-    Bool32        storageInputOutput16               = {};
-    Bool32        multiview                          = {};
-    Bool32        multiviewGeometryShader            = {};
-    Bool32        multiviewTessellationShader        = {};
-    Bool32        variablePointersStorageBuffer      = {};
-    Bool32        variablePointers                   = {};
-    Bool32        protectedMemory                    = {};
-    Bool32        samplerYcbcrConversion             = {};
-    Bool32        shaderDrawParameters               = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                              = StructureType::ePhysicalDeviceVulkan11Features;
+    void *                              pNext                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageBuffer16BitAccess           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformAndStorageBuffer16BitAccess = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storagePushConstant16              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageInputOutput16               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiview                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewGeometryShader            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        multiviewTessellationShader        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        variablePointersStorageBuffer      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        variablePointers                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        protectedMemory                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        samplerYcbcrConversion             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderDrawParameters               = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan11Features>
-  {
-    using Type = PhysicalDeviceVulkan11Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan11Features>
   {
     using Type = PhysicalDeviceVulkan11Features;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan11Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan11Properties.html
   struct PhysicalDeviceVulkan11Properties
   {
     using NativeType = VkPhysicalDeviceVulkan11Properties;
@@ -123624,39 +88621,40 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan11Properties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Properties( std::array<uint8_t, VK_UUID_SIZE> const & deviceUUID_                        = {},
-                                                              std::array<uint8_t, VK_UUID_SIZE> const & driverUUID_                        = {},
-                                                              std::array<uint8_t, VK_LUID_SIZE> const & deviceLUID_                        = {},
-                                                              uint32_t                                  deviceNodeMask_                    = {},
-                                                              Bool32                                    deviceLUIDValid_                   = {},
-                                                              uint32_t                                  subgroupSize_                      = {},
-                                                              ShaderStageFlags                          subgroupSupportedStages_           = {},
-                                                              SubgroupFeatureFlags                      subgroupSupportedOperations_       = {},
-                                                              Bool32                                    subgroupQuadOperationsInAllStages_ = {},
-                                                              PointClippingBehavior pointClippingBehavior_     = PointClippingBehavior::eAllClipPlanes,
-                                                              uint32_t              maxMultiviewViewCount_     = {},
-                                                              uint32_t              maxMultiviewInstanceIndex_ = {},
-                                                              Bool32                protectedNoFault_          = {},
-                                                              uint32_t              maxPerSetDescriptors_      = {},
-                                                              DeviceSize            maxMemoryAllocationSize_   = {},
-                                                              void *                pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , deviceUUID{ deviceUUID_ }
-      , driverUUID{ driverUUID_ }
-      , deviceLUID{ deviceLUID_ }
-      , deviceNodeMask{ deviceNodeMask_ }
-      , deviceLUIDValid{ deviceLUIDValid_ }
-      , subgroupSize{ subgroupSize_ }
-      , subgroupSupportedStages{ subgroupSupportedStages_ }
-      , subgroupSupportedOperations{ subgroupSupportedOperations_ }
-      , subgroupQuadOperationsInAllStages{ subgroupQuadOperationsInAllStages_ }
-      , pointClippingBehavior{ pointClippingBehavior_ }
-      , maxMultiviewViewCount{ maxMultiviewViewCount_ }
-      , maxMultiviewInstanceIndex{ maxMultiviewInstanceIndex_ }
-      , protectedNoFault{ protectedNoFault_ }
-      , maxPerSetDescriptors{ maxPerSetDescriptors_ }
-      , maxMemoryAllocationSize{ maxMemoryAllocationSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan11Properties(
+      std::array<uint8_t, VK_UUID_SIZE> const &   deviceUUID_                        = {},
+      std::array<uint8_t, VK_UUID_SIZE> const &   driverUUID_                        = {},
+      std::array<uint8_t, VK_LUID_SIZE> const &   deviceLUID_                        = {},
+      uint32_t                                    deviceNodeMask_                    = {},
+      VULKAN_HPP_NAMESPACE::Bool32                deviceLUIDValid_                   = {},
+      uint32_t                                    subgroupSize_                      = {},
+      VULKAN_HPP_NAMESPACE::ShaderStageFlags      subgroupSupportedStages_           = {},
+      VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags  subgroupSupportedOperations_       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                subgroupQuadOperationsInAllStages_ = {},
+      VULKAN_HPP_NAMESPACE::PointClippingBehavior pointClippingBehavior_             = VULKAN_HPP_NAMESPACE::PointClippingBehavior::eAllClipPlanes,
+      uint32_t                                    maxMultiviewViewCount_             = {},
+      uint32_t                                    maxMultiviewInstanceIndex_         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                protectedNoFault_                  = {},
+      uint32_t                                    maxPerSetDescriptors_              = {},
+      VULKAN_HPP_NAMESPACE::DeviceSize            maxMemoryAllocationSize_           = {},
+      void *                                      pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , deviceUUID( deviceUUID_ )
+      , driverUUID( driverUUID_ )
+      , deviceLUID( deviceLUID_ )
+      , deviceNodeMask( deviceNodeMask_ )
+      , deviceLUIDValid( deviceLUIDValid_ )
+      , subgroupSize( subgroupSize_ )
+      , subgroupSupportedStages( subgroupSupportedStages_ )
+      , subgroupSupportedOperations( subgroupSupportedOperations_ )
+      , subgroupQuadOperationsInAllStages( subgroupQuadOperationsInAllStages_ )
+      , pointClippingBehavior( pointClippingBehavior_ )
+      , maxMultiviewViewCount( maxMultiviewViewCount_ )
+      , maxMultiviewInstanceIndex( maxMultiviewInstanceIndex_ )
+      , protectedNoFault( protectedNoFault_ )
+      , maxPerSetDescriptors( maxPerSetDescriptors_ )
+      , maxMemoryAllocationSize( maxMemoryAllocationSize_ )
     {
     }
 
@@ -123668,11 +88666,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkan11Properties & operator=( PhysicalDeviceVulkan11Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan11Properties & operator=( VkPhysicalDeviceVulkan11Properties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan11Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan11Properties const *>( &rhs );
       return *this;
     }
 
@@ -123686,34 +88684,28 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan11Properties *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan11Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan11Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan11Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan11Properties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               ArrayWrapper1D<uint8_t, VK_LUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_LUID_SIZE> const &,
                uint32_t const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
-               ShaderStageFlags const &,
-               SubgroupFeatureFlags const &,
-               Bool32 const &,
-               PointClippingBehavior const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PointClippingBehavior const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -123762,41 +88754,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                             = StructureType::ePhysicalDeviceVulkan11Properties;
-    void *                                pNext                             = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> deviceUUID                        = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> driverUUID                        = {};
-    ArrayWrapper1D<uint8_t, VK_LUID_SIZE> deviceLUID                        = {};
-    uint32_t                              deviceNodeMask                    = {};
-    Bool32                                deviceLUIDValid                   = {};
-    uint32_t                              subgroupSize                      = {};
-    ShaderStageFlags                      subgroupSupportedStages           = {};
-    SubgroupFeatureFlags                  subgroupSupportedOperations       = {};
-    Bool32                                subgroupQuadOperationsInAllStages = {};
-    PointClippingBehavior                 pointClippingBehavior             = PointClippingBehavior::eAllClipPlanes;
-    uint32_t                              maxMultiviewViewCount             = {};
-    uint32_t                              maxMultiviewInstanceIndex         = {};
-    Bool32                                protectedNoFault                  = {};
-    uint32_t                              maxPerSetDescriptors              = {};
-    DeviceSize                            maxMemoryAllocationSize           = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType                             = StructureType::ePhysicalDeviceVulkan11Properties;
+    void *                                                      pNext                             = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> deviceUUID                        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> driverUUID                        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_LUID_SIZE> deviceLUID                        = {};
+    uint32_t                                                    deviceNodeMask                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                deviceLUIDValid                   = {};
+    uint32_t                                                    subgroupSize                      = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags                      subgroupSupportedStages           = {};
+    VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags                  subgroupSupportedOperations       = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                subgroupQuadOperationsInAllStages = {};
+    VULKAN_HPP_NAMESPACE::PointClippingBehavior                 pointClippingBehavior             = VULKAN_HPP_NAMESPACE::PointClippingBehavior::eAllClipPlanes;
+    uint32_t                                                    maxMultiviewViewCount             = {};
+    uint32_t                                                    maxMultiviewInstanceIndex         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                protectedNoFault                  = {};
+    uint32_t                                                    maxPerSetDescriptors              = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                            maxMemoryAllocationSize           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan11Properties>
-  {
-    using Type = PhysicalDeviceVulkan11Properties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan11Properties>
   {
     using Type = PhysicalDeviceVulkan11Properties;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan12Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan12Features.html
   struct PhysicalDeviceVulkan12Features
   {
     using NativeType = VkPhysicalDeviceVulkan12Features;
@@ -123804,103 +88786,103 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan12Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan12Features( Bool32 samplerMirrorClampToEdge_                           = {},
-                                                         Bool32 drawIndirectCount_                                  = {},
-                                                         Bool32 storageBuffer8BitAccess_                            = {},
-                                                         Bool32 uniformAndStorageBuffer8BitAccess_                  = {},
-                                                         Bool32 storagePushConstant8_                               = {},
-                                                         Bool32 shaderBufferInt64Atomics_                           = {},
-                                                         Bool32 shaderSharedInt64Atomics_                           = {},
-                                                         Bool32 shaderFloat16_                                      = {},
-                                                         Bool32 shaderInt8_                                         = {},
-                                                         Bool32 descriptorIndexing_                                 = {},
-                                                         Bool32 shaderInputAttachmentArrayDynamicIndexing_          = {},
-                                                         Bool32 shaderUniformTexelBufferArrayDynamicIndexing_       = {},
-                                                         Bool32 shaderStorageTexelBufferArrayDynamicIndexing_       = {},
-                                                         Bool32 shaderUniformBufferArrayNonUniformIndexing_         = {},
-                                                         Bool32 shaderSampledImageArrayNonUniformIndexing_          = {},
-                                                         Bool32 shaderStorageBufferArrayNonUniformIndexing_         = {},
-                                                         Bool32 shaderStorageImageArrayNonUniformIndexing_          = {},
-                                                         Bool32 shaderInputAttachmentArrayNonUniformIndexing_       = {},
-                                                         Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_    = {},
-                                                         Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_    = {},
-                                                         Bool32 descriptorBindingUniformBufferUpdateAfterBind_      = {},
-                                                         Bool32 descriptorBindingSampledImageUpdateAfterBind_       = {},
-                                                         Bool32 descriptorBindingStorageImageUpdateAfterBind_       = {},
-                                                         Bool32 descriptorBindingStorageBufferUpdateAfterBind_      = {},
-                                                         Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ = {},
-                                                         Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ = {},
-                                                         Bool32 descriptorBindingUpdateUnusedWhilePending_          = {},
-                                                         Bool32 descriptorBindingPartiallyBound_                    = {},
-                                                         Bool32 descriptorBindingVariableDescriptorCount_           = {},
-                                                         Bool32 runtimeDescriptorArray_                             = {},
-                                                         Bool32 samplerFilterMinmax_                                = {},
-                                                         Bool32 scalarBlockLayout_                                  = {},
-                                                         Bool32 imagelessFramebuffer_                               = {},
-                                                         Bool32 uniformBufferStandardLayout_                        = {},
-                                                         Bool32 shaderSubgroupExtendedTypes_                        = {},
-                                                         Bool32 separateDepthStencilLayouts_                        = {},
-                                                         Bool32 hostQueryReset_                                     = {},
-                                                         Bool32 timelineSemaphore_                                  = {},
-                                                         Bool32 bufferDeviceAddress_                                = {},
-                                                         Bool32 bufferDeviceAddressCaptureReplay_                   = {},
-                                                         Bool32 bufferDeviceAddressMultiDevice_                     = {},
-                                                         Bool32 vulkanMemoryModel_                                  = {},
-                                                         Bool32 vulkanMemoryModelDeviceScope_                       = {},
-                                                         Bool32 vulkanMemoryModelAvailabilityVisibilityChains_      = {},
-                                                         Bool32 shaderOutputViewportIndex_                          = {},
-                                                         Bool32 shaderOutputLayer_                                  = {},
-                                                         Bool32 subgroupBroadcastDynamicId_                         = {},
-                                                         void * pNext_                                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , samplerMirrorClampToEdge{ samplerMirrorClampToEdge_ }
-      , drawIndirectCount{ drawIndirectCount_ }
-      , storageBuffer8BitAccess{ storageBuffer8BitAccess_ }
-      , uniformAndStorageBuffer8BitAccess{ uniformAndStorageBuffer8BitAccess_ }
-      , storagePushConstant8{ storagePushConstant8_ }
-      , shaderBufferInt64Atomics{ shaderBufferInt64Atomics_ }
-      , shaderSharedInt64Atomics{ shaderSharedInt64Atomics_ }
-      , shaderFloat16{ shaderFloat16_ }
-      , shaderInt8{ shaderInt8_ }
-      , descriptorIndexing{ descriptorIndexing_ }
-      , shaderInputAttachmentArrayDynamicIndexing{ shaderInputAttachmentArrayDynamicIndexing_ }
-      , shaderUniformTexelBufferArrayDynamicIndexing{ shaderUniformTexelBufferArrayDynamicIndexing_ }
-      , shaderStorageTexelBufferArrayDynamicIndexing{ shaderStorageTexelBufferArrayDynamicIndexing_ }
-      , shaderUniformBufferArrayNonUniformIndexing{ shaderUniformBufferArrayNonUniformIndexing_ }
-      , shaderSampledImageArrayNonUniformIndexing{ shaderSampledImageArrayNonUniformIndexing_ }
-      , shaderStorageBufferArrayNonUniformIndexing{ shaderStorageBufferArrayNonUniformIndexing_ }
-      , shaderStorageImageArrayNonUniformIndexing{ shaderStorageImageArrayNonUniformIndexing_ }
-      , shaderInputAttachmentArrayNonUniformIndexing{ shaderInputAttachmentArrayNonUniformIndexing_ }
-      , shaderUniformTexelBufferArrayNonUniformIndexing{ shaderUniformTexelBufferArrayNonUniformIndexing_ }
-      , shaderStorageTexelBufferArrayNonUniformIndexing{ shaderStorageTexelBufferArrayNonUniformIndexing_ }
-      , descriptorBindingUniformBufferUpdateAfterBind{ descriptorBindingUniformBufferUpdateAfterBind_ }
-      , descriptorBindingSampledImageUpdateAfterBind{ descriptorBindingSampledImageUpdateAfterBind_ }
-      , descriptorBindingStorageImageUpdateAfterBind{ descriptorBindingStorageImageUpdateAfterBind_ }
-      , descriptorBindingStorageBufferUpdateAfterBind{ descriptorBindingStorageBufferUpdateAfterBind_ }
-      , descriptorBindingUniformTexelBufferUpdateAfterBind{ descriptorBindingUniformTexelBufferUpdateAfterBind_ }
-      , descriptorBindingStorageTexelBufferUpdateAfterBind{ descriptorBindingStorageTexelBufferUpdateAfterBind_ }
-      , descriptorBindingUpdateUnusedWhilePending{ descriptorBindingUpdateUnusedWhilePending_ }
-      , descriptorBindingPartiallyBound{ descriptorBindingPartiallyBound_ }
-      , descriptorBindingVariableDescriptorCount{ descriptorBindingVariableDescriptorCount_ }
-      , runtimeDescriptorArray{ runtimeDescriptorArray_ }
-      , samplerFilterMinmax{ samplerFilterMinmax_ }
-      , scalarBlockLayout{ scalarBlockLayout_ }
-      , imagelessFramebuffer{ imagelessFramebuffer_ }
-      , uniformBufferStandardLayout{ uniformBufferStandardLayout_ }
-      , shaderSubgroupExtendedTypes{ shaderSubgroupExtendedTypes_ }
-      , separateDepthStencilLayouts{ separateDepthStencilLayouts_ }
-      , hostQueryReset{ hostQueryReset_ }
-      , timelineSemaphore{ timelineSemaphore_ }
-      , bufferDeviceAddress{ bufferDeviceAddress_ }
-      , bufferDeviceAddressCaptureReplay{ bufferDeviceAddressCaptureReplay_ }
-      , bufferDeviceAddressMultiDevice{ bufferDeviceAddressMultiDevice_ }
-      , vulkanMemoryModel{ vulkanMemoryModel_ }
-      , vulkanMemoryModelDeviceScope{ vulkanMemoryModelDeviceScope_ }
-      , vulkanMemoryModelAvailabilityVisibilityChains{ vulkanMemoryModelAvailabilityVisibilityChains_ }
-      , shaderOutputViewportIndex{ shaderOutputViewportIndex_ }
-      , shaderOutputLayer{ shaderOutputLayer_ }
-      , subgroupBroadcastDynamicId{ subgroupBroadcastDynamicId_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan12Features( VULKAN_HPP_NAMESPACE::Bool32 samplerMirrorClampToEdge_                           = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 drawIndirectCount_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 storageBuffer8BitAccess_                            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer8BitAccess_                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant8_                               = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderBufferInt64Atomics_                           = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderSharedInt64Atomics_                           = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16_                                      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderInt8_                                         = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorIndexing_                                 = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayDynamicIndexing_          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayDynamicIndexing_       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayDynamicIndexing_       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayNonUniformIndexing_         = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayNonUniformIndexing_          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayNonUniformIndexing_         = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayNonUniformIndexing_          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayNonUniformIndexing_       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_    = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_    = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformBufferUpdateAfterBind_      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingSampledImageUpdateAfterBind_       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageImageUpdateAfterBind_       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageBufferUpdateAfterBind_      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUpdateUnusedWhilePending_          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingPartiallyBound_                    = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingVariableDescriptorCount_           = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 runtimeDescriptorArray_                             = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 samplerFilterMinmax_                                = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 scalarBlockLayout_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 imagelessFramebuffer_                               = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 uniformBufferStandardLayout_                        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupExtendedTypes_                        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 separateDepthStencilLayouts_                        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 hostQueryReset_                                     = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 timelineSemaphore_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_                                = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_                   = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_                     = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModel_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelDeviceScope_                       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelAvailabilityVisibilityChains_      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderOutputViewportIndex_                          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderOutputLayer_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 subgroupBroadcastDynamicId_                         = {},
+                                                         void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , samplerMirrorClampToEdge( samplerMirrorClampToEdge_ )
+      , drawIndirectCount( drawIndirectCount_ )
+      , storageBuffer8BitAccess( storageBuffer8BitAccess_ )
+      , uniformAndStorageBuffer8BitAccess( uniformAndStorageBuffer8BitAccess_ )
+      , storagePushConstant8( storagePushConstant8_ )
+      , shaderBufferInt64Atomics( shaderBufferInt64Atomics_ )
+      , shaderSharedInt64Atomics( shaderSharedInt64Atomics_ )
+      , shaderFloat16( shaderFloat16_ )
+      , shaderInt8( shaderInt8_ )
+      , descriptorIndexing( descriptorIndexing_ )
+      , shaderInputAttachmentArrayDynamicIndexing( shaderInputAttachmentArrayDynamicIndexing_ )
+      , shaderUniformTexelBufferArrayDynamicIndexing( shaderUniformTexelBufferArrayDynamicIndexing_ )
+      , shaderStorageTexelBufferArrayDynamicIndexing( shaderStorageTexelBufferArrayDynamicIndexing_ )
+      , shaderUniformBufferArrayNonUniformIndexing( shaderUniformBufferArrayNonUniformIndexing_ )
+      , shaderSampledImageArrayNonUniformIndexing( shaderSampledImageArrayNonUniformIndexing_ )
+      , shaderStorageBufferArrayNonUniformIndexing( shaderStorageBufferArrayNonUniformIndexing_ )
+      , shaderStorageImageArrayNonUniformIndexing( shaderStorageImageArrayNonUniformIndexing_ )
+      , shaderInputAttachmentArrayNonUniformIndexing( shaderInputAttachmentArrayNonUniformIndexing_ )
+      , shaderUniformTexelBufferArrayNonUniformIndexing( shaderUniformTexelBufferArrayNonUniformIndexing_ )
+      , shaderStorageTexelBufferArrayNonUniformIndexing( shaderStorageTexelBufferArrayNonUniformIndexing_ )
+      , descriptorBindingUniformBufferUpdateAfterBind( descriptorBindingUniformBufferUpdateAfterBind_ )
+      , descriptorBindingSampledImageUpdateAfterBind( descriptorBindingSampledImageUpdateAfterBind_ )
+      , descriptorBindingStorageImageUpdateAfterBind( descriptorBindingStorageImageUpdateAfterBind_ )
+      , descriptorBindingStorageBufferUpdateAfterBind( descriptorBindingStorageBufferUpdateAfterBind_ )
+      , descriptorBindingUniformTexelBufferUpdateAfterBind( descriptorBindingUniformTexelBufferUpdateAfterBind_ )
+      , descriptorBindingStorageTexelBufferUpdateAfterBind( descriptorBindingStorageTexelBufferUpdateAfterBind_ )
+      , descriptorBindingUpdateUnusedWhilePending( descriptorBindingUpdateUnusedWhilePending_ )
+      , descriptorBindingPartiallyBound( descriptorBindingPartiallyBound_ )
+      , descriptorBindingVariableDescriptorCount( descriptorBindingVariableDescriptorCount_ )
+      , runtimeDescriptorArray( runtimeDescriptorArray_ )
+      , samplerFilterMinmax( samplerFilterMinmax_ )
+      , scalarBlockLayout( scalarBlockLayout_ )
+      , imagelessFramebuffer( imagelessFramebuffer_ )
+      , uniformBufferStandardLayout( uniformBufferStandardLayout_ )
+      , shaderSubgroupExtendedTypes( shaderSubgroupExtendedTypes_ )
+      , separateDepthStencilLayouts( separateDepthStencilLayouts_ )
+      , hostQueryReset( hostQueryReset_ )
+      , timelineSemaphore( timelineSemaphore_ )
+      , bufferDeviceAddress( bufferDeviceAddress_ )
+      , bufferDeviceAddressCaptureReplay( bufferDeviceAddressCaptureReplay_ )
+      , bufferDeviceAddressMultiDevice( bufferDeviceAddressMultiDevice_ )
+      , vulkanMemoryModel( vulkanMemoryModel_ )
+      , vulkanMemoryModelDeviceScope( vulkanMemoryModelDeviceScope_ )
+      , vulkanMemoryModelAvailabilityVisibilityChains( vulkanMemoryModelAvailabilityVisibilityChains_ )
+      , shaderOutputViewportIndex( shaderOutputViewportIndex_ )
+      , shaderOutputLayer( shaderOutputLayer_ )
+      , subgroupBroadcastDynamicId( subgroupBroadcastDynamicId_ )
     {
     }
 
@@ -123912,323 +88894,337 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkan12Features & operator=( PhysicalDeviceVulkan12Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan12Features & operator=( VkPhysicalDeviceVulkan12Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan12Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan12Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setSamplerMirrorClampToEdge( Bool32 samplerMirrorClampToEdge_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setSamplerMirrorClampToEdge( VULKAN_HPP_NAMESPACE::Bool32 samplerMirrorClampToEdge_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerMirrorClampToEdge = samplerMirrorClampToEdge_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDrawIndirectCount( Bool32 drawIndirectCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDrawIndirectCount( VULKAN_HPP_NAMESPACE::Bool32 drawIndirectCount_ ) VULKAN_HPP_NOEXCEPT
     {
       drawIndirectCount = drawIndirectCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setStorageBuffer8BitAccess( Bool32 storageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setStorageBuffer8BitAccess( VULKAN_HPP_NAMESPACE::Bool32 storageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       storageBuffer8BitAccess = storageBuffer8BitAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setUniformAndStorageBuffer8BitAccess( Bool32 uniformAndStorageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setUniformAndStorageBuffer8BitAccess( VULKAN_HPP_NAMESPACE::Bool32 uniformAndStorageBuffer8BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformAndStorageBuffer8BitAccess = uniformAndStorageBuffer8BitAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setStoragePushConstant8( Bool32 storagePushConstant8_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setStoragePushConstant8( VULKAN_HPP_NAMESPACE::Bool32 storagePushConstant8_ ) VULKAN_HPP_NOEXCEPT
     {
       storagePushConstant8 = storagePushConstant8_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderBufferInt64Atomics( Bool32 shaderBufferInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setShaderBufferInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderBufferInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderBufferInt64Atomics = shaderBufferInt64Atomics_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderSharedInt64Atomics( Bool32 shaderSharedInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setShaderSharedInt64Atomics( VULKAN_HPP_NAMESPACE::Bool32 shaderSharedInt64Atomics_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSharedInt64Atomics = shaderSharedInt64Atomics_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderFloat16( Bool32 shaderFloat16_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderFloat16( VULKAN_HPP_NAMESPACE::Bool32 shaderFloat16_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderFloat16 = shaderFloat16_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderInt8( Bool32 shaderInt8_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderInt8( VULKAN_HPP_NAMESPACE::Bool32 shaderInt8_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInt8 = shaderInt8_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDescriptorIndexing( Bool32 descriptorIndexing_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDescriptorIndexing( VULKAN_HPP_NAMESPACE::Bool32 descriptorIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorIndexing = descriptorIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderInputAttachmentArrayDynamicIndexing( Bool32 shaderInputAttachmentArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderInputAttachmentArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInputAttachmentArrayDynamicIndexing = shaderInputAttachmentArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderUniformTexelBufferArrayDynamicIndexing( Bool32 shaderUniformTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformTexelBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformTexelBufferArrayDynamicIndexing = shaderUniformTexelBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderStorageTexelBufferArrayDynamicIndexing( Bool32 shaderStorageTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageTexelBufferArrayDynamicIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayDynamicIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageTexelBufferArrayDynamicIndexing = shaderStorageTexelBufferArrayDynamicIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderUniformBufferArrayNonUniformIndexing( Bool32 shaderUniformBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformBufferArrayNonUniformIndexing = shaderUniformBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderSampledImageArrayNonUniformIndexing( Bool32 shaderSampledImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderSampledImageArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderSampledImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSampledImageArrayNonUniformIndexing = shaderSampledImageArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderStorageBufferArrayNonUniformIndexing( Bool32 shaderStorageBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageBufferArrayNonUniformIndexing = shaderStorageBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderStorageImageArrayNonUniformIndexing( Bool32 shaderStorageImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageImageArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageImageArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageImageArrayNonUniformIndexing = shaderStorageImageArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderInputAttachmentArrayNonUniformIndexing( Bool32 shaderInputAttachmentArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderInputAttachmentArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderInputAttachmentArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderInputAttachmentArrayNonUniformIndexing = shaderInputAttachmentArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderUniformTexelBufferArrayNonUniformIndexing( Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderUniformTexelBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderUniformTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderUniformTexelBufferArrayNonUniformIndexing = shaderUniformTexelBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setShaderStorageTexelBufferArrayNonUniformIndexing( Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
+      setShaderStorageTexelBufferArrayNonUniformIndexing( VULKAN_HPP_NAMESPACE::Bool32 shaderStorageTexelBufferArrayNonUniformIndexing_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderStorageTexelBufferArrayNonUniformIndexing = shaderStorageTexelBufferArrayNonUniformIndexing_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingUniformBufferUpdateAfterBind( Bool32 descriptorBindingUniformBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingUniformBufferUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUniformBufferUpdateAfterBind = descriptorBindingUniformBufferUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingSampledImageUpdateAfterBind( Bool32 descriptorBindingSampledImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingSampledImageUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingSampledImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingSampledImageUpdateAfterBind = descriptorBindingSampledImageUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingStorageImageUpdateAfterBind( Bool32 descriptorBindingStorageImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingStorageImageUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageImageUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageImageUpdateAfterBind = descriptorBindingStorageImageUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingStorageBufferUpdateAfterBind( Bool32 descriptorBindingStorageBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingStorageBufferUpdateAfterBind( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageBufferUpdateAfterBind = descriptorBindingStorageBufferUpdateAfterBind_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingUniformTexelBufferUpdateAfterBind( Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDescriptorBindingUniformTexelBufferUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUniformTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUniformTexelBufferUpdateAfterBind = descriptorBindingUniformTexelBufferUpdateAfterBind_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingStorageTexelBufferUpdateAfterBind( Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDescriptorBindingStorageTexelBufferUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingStorageTexelBufferUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingStorageTexelBufferUpdateAfterBind = descriptorBindingStorageTexelBufferUpdateAfterBind_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingUpdateUnusedWhilePending( Bool32 descriptorBindingUpdateUnusedWhilePending_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingUpdateUnusedWhilePending( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingUpdateUnusedWhilePending_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingUpdateUnusedWhilePending = descriptorBindingUpdateUnusedWhilePending_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setDescriptorBindingPartiallyBound( Bool32 descriptorBindingPartiallyBound_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setDescriptorBindingPartiallyBound( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingPartiallyBound_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingPartiallyBound = descriptorBindingPartiallyBound_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setDescriptorBindingVariableDescriptorCount( Bool32 descriptorBindingVariableDescriptorCount_ ) VULKAN_HPP_NOEXCEPT
+      setDescriptorBindingVariableDescriptorCount( VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingVariableDescriptorCount_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingVariableDescriptorCount = descriptorBindingVariableDescriptorCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setRuntimeDescriptorArray( Bool32 runtimeDescriptorArray_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setRuntimeDescriptorArray( VULKAN_HPP_NAMESPACE::Bool32 runtimeDescriptorArray_ ) VULKAN_HPP_NOEXCEPT
     {
       runtimeDescriptorArray = runtimeDescriptorArray_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setSamplerFilterMinmax( Bool32 samplerFilterMinmax_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setSamplerFilterMinmax( VULKAN_HPP_NAMESPACE::Bool32 samplerFilterMinmax_ ) VULKAN_HPP_NOEXCEPT
     {
       samplerFilterMinmax = samplerFilterMinmax_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setScalarBlockLayout( Bool32 scalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setScalarBlockLayout( VULKAN_HPP_NAMESPACE::Bool32 scalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       scalarBlockLayout = scalarBlockLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setImagelessFramebuffer( Bool32 imagelessFramebuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setImagelessFramebuffer( VULKAN_HPP_NAMESPACE::Bool32 imagelessFramebuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       imagelessFramebuffer = imagelessFramebuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setUniformBufferStandardLayout( Bool32 uniformBufferStandardLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setUniformBufferStandardLayout( VULKAN_HPP_NAMESPACE::Bool32 uniformBufferStandardLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformBufferStandardLayout = uniformBufferStandardLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderSubgroupExtendedTypes( Bool32 shaderSubgroupExtendedTypes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setShaderSubgroupExtendedTypes( VULKAN_HPP_NAMESPACE::Bool32 shaderSubgroupExtendedTypes_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderSubgroupExtendedTypes = shaderSubgroupExtendedTypes_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setSeparateDepthStencilLayouts( Bool32 separateDepthStencilLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setSeparateDepthStencilLayouts( VULKAN_HPP_NAMESPACE::Bool32 separateDepthStencilLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       separateDepthStencilLayouts = separateDepthStencilLayouts_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setHostQueryReset( Bool32 hostQueryReset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setHostQueryReset( VULKAN_HPP_NAMESPACE::Bool32 hostQueryReset_ ) VULKAN_HPP_NOEXCEPT
     {
       hostQueryReset = hostQueryReset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setTimelineSemaphore( Bool32 timelineSemaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setTimelineSemaphore( VULKAN_HPP_NAMESPACE::Bool32 timelineSemaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       timelineSemaphore = timelineSemaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setBufferDeviceAddress( Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setBufferDeviceAddress( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddress = bufferDeviceAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setBufferDeviceAddressCaptureReplay( Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setBufferDeviceAddressCaptureReplay( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressCaptureReplay_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressCaptureReplay = bufferDeviceAddressCaptureReplay_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setBufferDeviceAddressMultiDevice( Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setBufferDeviceAddressMultiDevice( VULKAN_HPP_NAMESPACE::Bool32 bufferDeviceAddressMultiDevice_ ) VULKAN_HPP_NOEXCEPT
     {
       bufferDeviceAddressMultiDevice = bufferDeviceAddressMultiDevice_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setVulkanMemoryModel( Bool32 vulkanMemoryModel_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setVulkanMemoryModel( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModel_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModel = vulkanMemoryModel_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setVulkanMemoryModelDeviceScope( Bool32 vulkanMemoryModelDeviceScope_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setVulkanMemoryModelDeviceScope( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelDeviceScope_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModelDeviceScope = vulkanMemoryModelDeviceScope_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
-      setVulkanMemoryModelAvailabilityVisibilityChains( Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ ) VULKAN_HPP_NOEXCEPT
+      setVulkanMemoryModelAvailabilityVisibilityChains( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModelAvailabilityVisibilityChains = vulkanMemoryModelAvailabilityVisibilityChains_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderOutputViewportIndex( Bool32 shaderOutputViewportIndex_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setShaderOutputViewportIndex( VULKAN_HPP_NAMESPACE::Bool32 shaderOutputViewportIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderOutputViewportIndex = shaderOutputViewportIndex_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderOutputLayer( Bool32 shaderOutputLayer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setShaderOutputLayer( VULKAN_HPP_NAMESPACE::Bool32 shaderOutputLayer_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderOutputLayer = shaderOutputLayer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features & setSubgroupBroadcastDynamicId( Bool32 subgroupBroadcastDynamicId_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Features &
+      setSubgroupBroadcastDynamicId( VULKAN_HPP_NAMESPACE::Bool32 subgroupBroadcastDynamicId_ ) VULKAN_HPP_NOEXCEPT
     {
       subgroupBroadcastDynamicId = subgroupBroadcastDynamicId_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVulkan12Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -124240,66 +89236,60 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan12Features *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan12Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan12Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan12Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan12Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -124407,73 +89397,63 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                              = StructureType::ePhysicalDeviceVulkan12Features;
-    void *        pNext                                              = {};
-    Bool32        samplerMirrorClampToEdge                           = {};
-    Bool32        drawIndirectCount                                  = {};
-    Bool32        storageBuffer8BitAccess                            = {};
-    Bool32        uniformAndStorageBuffer8BitAccess                  = {};
-    Bool32        storagePushConstant8                               = {};
-    Bool32        shaderBufferInt64Atomics                           = {};
-    Bool32        shaderSharedInt64Atomics                           = {};
-    Bool32        shaderFloat16                                      = {};
-    Bool32        shaderInt8                                         = {};
-    Bool32        descriptorIndexing                                 = {};
-    Bool32        shaderInputAttachmentArrayDynamicIndexing          = {};
-    Bool32        shaderUniformTexelBufferArrayDynamicIndexing       = {};
-    Bool32        shaderStorageTexelBufferArrayDynamicIndexing       = {};
-    Bool32        shaderUniformBufferArrayNonUniformIndexing         = {};
-    Bool32        shaderSampledImageArrayNonUniformIndexing          = {};
-    Bool32        shaderStorageBufferArrayNonUniformIndexing         = {};
-    Bool32        shaderStorageImageArrayNonUniformIndexing          = {};
-    Bool32        shaderInputAttachmentArrayNonUniformIndexing       = {};
-    Bool32        shaderUniformTexelBufferArrayNonUniformIndexing    = {};
-    Bool32        shaderStorageTexelBufferArrayNonUniformIndexing    = {};
-    Bool32        descriptorBindingUniformBufferUpdateAfterBind      = {};
-    Bool32        descriptorBindingSampledImageUpdateAfterBind       = {};
-    Bool32        descriptorBindingStorageImageUpdateAfterBind       = {};
-    Bool32        descriptorBindingStorageBufferUpdateAfterBind      = {};
-    Bool32        descriptorBindingUniformTexelBufferUpdateAfterBind = {};
-    Bool32        descriptorBindingStorageTexelBufferUpdateAfterBind = {};
-    Bool32        descriptorBindingUpdateUnusedWhilePending          = {};
-    Bool32        descriptorBindingPartiallyBound                    = {};
-    Bool32        descriptorBindingVariableDescriptorCount           = {};
-    Bool32        runtimeDescriptorArray                             = {};
-    Bool32        samplerFilterMinmax                                = {};
-    Bool32        scalarBlockLayout                                  = {};
-    Bool32        imagelessFramebuffer                               = {};
-    Bool32        uniformBufferStandardLayout                        = {};
-    Bool32        shaderSubgroupExtendedTypes                        = {};
-    Bool32        separateDepthStencilLayouts                        = {};
-    Bool32        hostQueryReset                                     = {};
-    Bool32        timelineSemaphore                                  = {};
-    Bool32        bufferDeviceAddress                                = {};
-    Bool32        bufferDeviceAddressCaptureReplay                   = {};
-    Bool32        bufferDeviceAddressMultiDevice                     = {};
-    Bool32        vulkanMemoryModel                                  = {};
-    Bool32        vulkanMemoryModelDeviceScope                       = {};
-    Bool32        vulkanMemoryModelAvailabilityVisibilityChains      = {};
-    Bool32        shaderOutputViewportIndex                          = {};
-    Bool32        shaderOutputLayer                                  = {};
-    Bool32        subgroupBroadcastDynamicId                         = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                              = StructureType::ePhysicalDeviceVulkan12Features;
+    void *                              pNext                                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        samplerMirrorClampToEdge                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        drawIndirectCount                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storageBuffer8BitAccess                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformAndStorageBuffer8BitAccess                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        storagePushConstant8                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderBufferInt64Atomics                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSharedInt64Atomics                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderFloat16                                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInt8                                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorIndexing                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInputAttachmentArrayDynamicIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformTexelBufferArrayDynamicIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageTexelBufferArrayDynamicIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformBufferArrayNonUniformIndexing         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSampledImageArrayNonUniformIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageBufferArrayNonUniformIndexing         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageImageArrayNonUniformIndexing          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderInputAttachmentArrayNonUniformIndexing       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderUniformTexelBufferArrayNonUniformIndexing    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderStorageTexelBufferArrayNonUniformIndexing    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUniformBufferUpdateAfterBind      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingSampledImageUpdateAfterBind       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageImageUpdateAfterBind       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageBufferUpdateAfterBind      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUniformTexelBufferUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingStorageTexelBufferUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingUpdateUnusedWhilePending          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingPartiallyBound                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingVariableDescriptorCount           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        runtimeDescriptorArray                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        samplerFilterMinmax                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        scalarBlockLayout                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        imagelessFramebuffer                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        uniformBufferStandardLayout                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderSubgroupExtendedTypes                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        separateDepthStencilLayouts                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hostQueryReset                                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        timelineSemaphore                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddress                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressCaptureReplay                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        bufferDeviceAddressMultiDevice                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModel                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModelDeviceScope                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModelAvailabilityVisibilityChains      = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderOutputViewportIndex                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderOutputLayer                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subgroupBroadcastDynamicId                         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan12Features>
-  {
-    using Type = PhysicalDeviceVulkan12Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan12Features>
   {
     using Type = PhysicalDeviceVulkan12Features;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan12Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan12Properties.html
   struct PhysicalDeviceVulkan12Properties
   {
     using NativeType = VkPhysicalDeviceVulkan12Properties;
@@ -124481,114 +89461,114 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan12Properties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      PhysicalDeviceVulkan12Properties( DriverId                                          driverID_              = DriverId::eAmdProprietary,
-                                        std::array<char, VK_MAX_DRIVER_NAME_SIZE> const & driverName_            = {},
-                                        std::array<char, VK_MAX_DRIVER_INFO_SIZE> const & driverInfo_            = {},
-                                        ConformanceVersion                                conformanceVersion_    = {},
-                                        ShaderFloatControlsIndependence denormBehaviorIndependence_              = ShaderFloatControlsIndependence::e32BitOnly,
-                                        ShaderFloatControlsIndependence roundingModeIndependence_                = ShaderFloatControlsIndependence::e32BitOnly,
-                                        Bool32                          shaderSignedZeroInfNanPreserveFloat16_   = {},
-                                        Bool32                          shaderSignedZeroInfNanPreserveFloat32_   = {},
-                                        Bool32                          shaderSignedZeroInfNanPreserveFloat64_   = {},
-                                        Bool32                          shaderDenormPreserveFloat16_             = {},
-                                        Bool32                          shaderDenormPreserveFloat32_             = {},
-                                        Bool32                          shaderDenormPreserveFloat64_             = {},
-                                        Bool32                          shaderDenormFlushToZeroFloat16_          = {},
-                                        Bool32                          shaderDenormFlushToZeroFloat32_          = {},
-                                        Bool32                          shaderDenormFlushToZeroFloat64_          = {},
-                                        Bool32                          shaderRoundingModeRTEFloat16_            = {},
-                                        Bool32                          shaderRoundingModeRTEFloat32_            = {},
-                                        Bool32                          shaderRoundingModeRTEFloat64_            = {},
-                                        Bool32                          shaderRoundingModeRTZFloat16_            = {},
-                                        Bool32                          shaderRoundingModeRTZFloat32_            = {},
-                                        Bool32                          shaderRoundingModeRTZFloat64_            = {},
-                                        uint32_t                        maxUpdateAfterBindDescriptorsInAllPools_ = {},
-                                        Bool32                          shaderUniformBufferArrayNonUniformIndexingNative_     = {},
-                                        Bool32                          shaderSampledImageArrayNonUniformIndexingNative_      = {},
-                                        Bool32                          shaderStorageBufferArrayNonUniformIndexingNative_     = {},
-                                        Bool32                          shaderStorageImageArrayNonUniformIndexingNative_      = {},
-                                        Bool32                          shaderInputAttachmentArrayNonUniformIndexingNative_   = {},
-                                        Bool32                          robustBufferAccessUpdateAfterBind_                    = {},
-                                        Bool32                          quadDivergentImplicitLod_                             = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindSamplers_         = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindUniformBuffers_   = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindStorageBuffers_   = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindSampledImages_    = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindStorageImages_    = {},
-                                        uint32_t                        maxPerStageDescriptorUpdateAfterBindInputAttachments_ = {},
-                                        uint32_t                        maxPerStageUpdateAfterBindResources_                  = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindSamplers_              = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindUniformBuffers_        = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindStorageBuffers_        = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindSampledImages_         = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindStorageImages_         = {},
-                                        uint32_t                        maxDescriptorSetUpdateAfterBindInputAttachments_      = {},
-                                        ResolveModeFlags                supportedDepthResolveModes_                           = {},
-                                        ResolveModeFlags                supportedStencilResolveModes_                         = {},
-                                        Bool32                          independentResolveNone_                               = {},
-                                        Bool32                          independentResolve_                                   = {},
-                                        Bool32                          filterMinmaxSingleComponentFormats_                   = {},
-                                        Bool32                          filterMinmaxImageComponentMapping_                    = {},
-                                        uint64_t                        maxTimelineSemaphoreValueDifference_                  = {},
-                                        SampleCountFlags                framebufferIntegerColorSampleCounts_                  = {},
-                                        void *                          pNext_                                                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , driverID{ driverID_ }
-      , driverName{ driverName_ }
-      , driverInfo{ driverInfo_ }
-      , conformanceVersion{ conformanceVersion_ }
-      , denormBehaviorIndependence{ denormBehaviorIndependence_ }
-      , roundingModeIndependence{ roundingModeIndependence_ }
-      , shaderSignedZeroInfNanPreserveFloat16{ shaderSignedZeroInfNanPreserveFloat16_ }
-      , shaderSignedZeroInfNanPreserveFloat32{ shaderSignedZeroInfNanPreserveFloat32_ }
-      , shaderSignedZeroInfNanPreserveFloat64{ shaderSignedZeroInfNanPreserveFloat64_ }
-      , shaderDenormPreserveFloat16{ shaderDenormPreserveFloat16_ }
-      , shaderDenormPreserveFloat32{ shaderDenormPreserveFloat32_ }
-      , shaderDenormPreserveFloat64{ shaderDenormPreserveFloat64_ }
-      , shaderDenormFlushToZeroFloat16{ shaderDenormFlushToZeroFloat16_ }
-      , shaderDenormFlushToZeroFloat32{ shaderDenormFlushToZeroFloat32_ }
-      , shaderDenormFlushToZeroFloat64{ shaderDenormFlushToZeroFloat64_ }
-      , shaderRoundingModeRTEFloat16{ shaderRoundingModeRTEFloat16_ }
-      , shaderRoundingModeRTEFloat32{ shaderRoundingModeRTEFloat32_ }
-      , shaderRoundingModeRTEFloat64{ shaderRoundingModeRTEFloat64_ }
-      , shaderRoundingModeRTZFloat16{ shaderRoundingModeRTZFloat16_ }
-      , shaderRoundingModeRTZFloat32{ shaderRoundingModeRTZFloat32_ }
-      , shaderRoundingModeRTZFloat64{ shaderRoundingModeRTZFloat64_ }
-      , maxUpdateAfterBindDescriptorsInAllPools{ maxUpdateAfterBindDescriptorsInAllPools_ }
-      , shaderUniformBufferArrayNonUniformIndexingNative{ shaderUniformBufferArrayNonUniformIndexingNative_ }
-      , shaderSampledImageArrayNonUniformIndexingNative{ shaderSampledImageArrayNonUniformIndexingNative_ }
-      , shaderStorageBufferArrayNonUniformIndexingNative{ shaderStorageBufferArrayNonUniformIndexingNative_ }
-      , shaderStorageImageArrayNonUniformIndexingNative{ shaderStorageImageArrayNonUniformIndexingNative_ }
-      , shaderInputAttachmentArrayNonUniformIndexingNative{ shaderInputAttachmentArrayNonUniformIndexingNative_ }
-      , robustBufferAccessUpdateAfterBind{ robustBufferAccessUpdateAfterBind_ }
-      , quadDivergentImplicitLod{ quadDivergentImplicitLod_ }
-      , maxPerStageDescriptorUpdateAfterBindSamplers{ maxPerStageDescriptorUpdateAfterBindSamplers_ }
-      , maxPerStageDescriptorUpdateAfterBindUniformBuffers{ maxPerStageDescriptorUpdateAfterBindUniformBuffers_ }
-      , maxPerStageDescriptorUpdateAfterBindStorageBuffers{ maxPerStageDescriptorUpdateAfterBindStorageBuffers_ }
-      , maxPerStageDescriptorUpdateAfterBindSampledImages{ maxPerStageDescriptorUpdateAfterBindSampledImages_ }
-      , maxPerStageDescriptorUpdateAfterBindStorageImages{ maxPerStageDescriptorUpdateAfterBindStorageImages_ }
-      , maxPerStageDescriptorUpdateAfterBindInputAttachments{ maxPerStageDescriptorUpdateAfterBindInputAttachments_ }
-      , maxPerStageUpdateAfterBindResources{ maxPerStageUpdateAfterBindResources_ }
-      , maxDescriptorSetUpdateAfterBindSamplers{ maxDescriptorSetUpdateAfterBindSamplers_ }
-      , maxDescriptorSetUpdateAfterBindUniformBuffers{ maxDescriptorSetUpdateAfterBindUniformBuffers_ }
-      , maxDescriptorSetUpdateAfterBindUniformBuffersDynamic{ maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindStorageBuffers{ maxDescriptorSetUpdateAfterBindStorageBuffers_ }
-      , maxDescriptorSetUpdateAfterBindStorageBuffersDynamic{ maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ }
-      , maxDescriptorSetUpdateAfterBindSampledImages{ maxDescriptorSetUpdateAfterBindSampledImages_ }
-      , maxDescriptorSetUpdateAfterBindStorageImages{ maxDescriptorSetUpdateAfterBindStorageImages_ }
-      , maxDescriptorSetUpdateAfterBindInputAttachments{ maxDescriptorSetUpdateAfterBindInputAttachments_ }
-      , supportedDepthResolveModes{ supportedDepthResolveModes_ }
-      , supportedStencilResolveModes{ supportedStencilResolveModes_ }
-      , independentResolveNone{ independentResolveNone_ }
-      , independentResolve{ independentResolve_ }
-      , filterMinmaxSingleComponentFormats{ filterMinmaxSingleComponentFormats_ }
-      , filterMinmaxImageComponentMapping{ filterMinmaxImageComponentMapping_ }
-      , maxTimelineSemaphoreValueDifference{ maxTimelineSemaphoreValueDifference_ }
-      , framebufferIntegerColorSampleCounts{ framebufferIntegerColorSampleCounts_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan12Properties(
+      VULKAN_HPP_NAMESPACE::DriverId                        driverID_                   = VULKAN_HPP_NAMESPACE::DriverId::eAmdProprietary,
+      std::array<char, VK_MAX_DRIVER_NAME_SIZE> const &     driverName_                 = {},
+      std::array<char, VK_MAX_DRIVER_INFO_SIZE> const &     driverInfo_                 = {},
+      VULKAN_HPP_NAMESPACE::ConformanceVersion              conformanceVersion_         = {},
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence denormBehaviorIndependence_ = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence roundingModeIndependence_   = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat16_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat32_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat64_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat16_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat32_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat64_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat16_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat32_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat64_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat16_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat32_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat64_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat16_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat32_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat64_                         = {},
+      uint32_t                                              maxUpdateAfterBindDescriptorsInAllPools_              = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderUniformBufferArrayNonUniformIndexingNative_     = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSampledImageArrayNonUniformIndexingNative_      = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageBufferArrayNonUniformIndexingNative_     = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageImageArrayNonUniformIndexingNative_      = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderInputAttachmentArrayNonUniformIndexingNative_   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          robustBufferAccessUpdateAfterBind_                    = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          quadDivergentImplicitLod_                             = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindSamplers_         = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindUniformBuffers_   = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageBuffers_   = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindSampledImages_    = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageImages_    = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindInputAttachments_ = {},
+      uint32_t                                              maxPerStageUpdateAfterBindResources_                  = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindSamplers_              = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffers_        = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffers_        = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindSampledImages_         = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageImages_         = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindInputAttachments_      = {},
+      VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedDepthResolveModes_                           = {},
+      VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedStencilResolveModes_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          independentResolveNone_                               = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          independentResolve_                                   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxSingleComponentFormats_                   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxImageComponentMapping_                    = {},
+      uint64_t                                              maxTimelineSemaphoreValueDifference_                  = {},
+      VULKAN_HPP_NAMESPACE::SampleCountFlags                framebufferIntegerColorSampleCounts_                  = {},
+      void *                                                pNext_                                                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , driverID( driverID_ )
+      , driverName( driverName_ )
+      , driverInfo( driverInfo_ )
+      , conformanceVersion( conformanceVersion_ )
+      , denormBehaviorIndependence( denormBehaviorIndependence_ )
+      , roundingModeIndependence( roundingModeIndependence_ )
+      , shaderSignedZeroInfNanPreserveFloat16( shaderSignedZeroInfNanPreserveFloat16_ )
+      , shaderSignedZeroInfNanPreserveFloat32( shaderSignedZeroInfNanPreserveFloat32_ )
+      , shaderSignedZeroInfNanPreserveFloat64( shaderSignedZeroInfNanPreserveFloat64_ )
+      , shaderDenormPreserveFloat16( shaderDenormPreserveFloat16_ )
+      , shaderDenormPreserveFloat32( shaderDenormPreserveFloat32_ )
+      , shaderDenormPreserveFloat64( shaderDenormPreserveFloat64_ )
+      , shaderDenormFlushToZeroFloat16( shaderDenormFlushToZeroFloat16_ )
+      , shaderDenormFlushToZeroFloat32( shaderDenormFlushToZeroFloat32_ )
+      , shaderDenormFlushToZeroFloat64( shaderDenormFlushToZeroFloat64_ )
+      , shaderRoundingModeRTEFloat16( shaderRoundingModeRTEFloat16_ )
+      , shaderRoundingModeRTEFloat32( shaderRoundingModeRTEFloat32_ )
+      , shaderRoundingModeRTEFloat64( shaderRoundingModeRTEFloat64_ )
+      , shaderRoundingModeRTZFloat16( shaderRoundingModeRTZFloat16_ )
+      , shaderRoundingModeRTZFloat32( shaderRoundingModeRTZFloat32_ )
+      , shaderRoundingModeRTZFloat64( shaderRoundingModeRTZFloat64_ )
+      , maxUpdateAfterBindDescriptorsInAllPools( maxUpdateAfterBindDescriptorsInAllPools_ )
+      , shaderUniformBufferArrayNonUniformIndexingNative( shaderUniformBufferArrayNonUniformIndexingNative_ )
+      , shaderSampledImageArrayNonUniformIndexingNative( shaderSampledImageArrayNonUniformIndexingNative_ )
+      , shaderStorageBufferArrayNonUniformIndexingNative( shaderStorageBufferArrayNonUniformIndexingNative_ )
+      , shaderStorageImageArrayNonUniformIndexingNative( shaderStorageImageArrayNonUniformIndexingNative_ )
+      , shaderInputAttachmentArrayNonUniformIndexingNative( shaderInputAttachmentArrayNonUniformIndexingNative_ )
+      , robustBufferAccessUpdateAfterBind( robustBufferAccessUpdateAfterBind_ )
+      , quadDivergentImplicitLod( quadDivergentImplicitLod_ )
+      , maxPerStageDescriptorUpdateAfterBindSamplers( maxPerStageDescriptorUpdateAfterBindSamplers_ )
+      , maxPerStageDescriptorUpdateAfterBindUniformBuffers( maxPerStageDescriptorUpdateAfterBindUniformBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageBuffers( maxPerStageDescriptorUpdateAfterBindStorageBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindSampledImages( maxPerStageDescriptorUpdateAfterBindSampledImages_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageImages( maxPerStageDescriptorUpdateAfterBindStorageImages_ )
+      , maxPerStageDescriptorUpdateAfterBindInputAttachments( maxPerStageDescriptorUpdateAfterBindInputAttachments_ )
+      , maxPerStageUpdateAfterBindResources( maxPerStageUpdateAfterBindResources_ )
+      , maxDescriptorSetUpdateAfterBindSamplers( maxDescriptorSetUpdateAfterBindSamplers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffers( maxDescriptorSetUpdateAfterBindUniformBuffers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffersDynamic( maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffers( maxDescriptorSetUpdateAfterBindStorageBuffers_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffersDynamic( maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindSampledImages( maxDescriptorSetUpdateAfterBindSampledImages_ )
+      , maxDescriptorSetUpdateAfterBindStorageImages( maxDescriptorSetUpdateAfterBindStorageImages_ )
+      , maxDescriptorSetUpdateAfterBindInputAttachments( maxDescriptorSetUpdateAfterBindInputAttachments_ )
+      , supportedDepthResolveModes( supportedDepthResolveModes_ )
+      , supportedStencilResolveModes( supportedStencilResolveModes_ )
+      , independentResolveNone( independentResolveNone_ )
+      , independentResolve( independentResolve_ )
+      , filterMinmaxSingleComponentFormats( filterMinmaxSingleComponentFormats_ )
+      , filterMinmaxImageComponentMapping( filterMinmaxImageComponentMapping_ )
+      , maxTimelineSemaphoreValueDifference( maxTimelineSemaphoreValueDifference_ )
+      , framebufferIntegerColorSampleCounts( framebufferIntegerColorSampleCounts_ )
     {
     }
 
@@ -124599,12 +89579,135 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PhysicalDeviceVulkan12Properties(
+      VULKAN_HPP_NAMESPACE::DriverId                        driverID_,
+      std::string const &                                   driverName_,
+      std::string const &                                   driverInfo_                 = {},
+      VULKAN_HPP_NAMESPACE::ConformanceVersion              conformanceVersion_         = {},
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence denormBehaviorIndependence_ = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence roundingModeIndependence_   = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly,
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat16_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat32_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat64_                = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat16_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat32_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat64_                          = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat16_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat32_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat64_                       = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat16_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat32_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat64_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat16_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat32_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat64_                         = {},
+      uint32_t                                              maxUpdateAfterBindDescriptorsInAllPools_              = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderUniformBufferArrayNonUniformIndexingNative_     = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderSampledImageArrayNonUniformIndexingNative_      = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageBufferArrayNonUniformIndexingNative_     = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageImageArrayNonUniformIndexingNative_      = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          shaderInputAttachmentArrayNonUniformIndexingNative_   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          robustBufferAccessUpdateAfterBind_                    = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          quadDivergentImplicitLod_                             = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindSamplers_         = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindUniformBuffers_   = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageBuffers_   = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindSampledImages_    = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageImages_    = {},
+      uint32_t                                              maxPerStageDescriptorUpdateAfterBindInputAttachments_ = {},
+      uint32_t                                              maxPerStageUpdateAfterBindResources_                  = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindSamplers_              = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffers_        = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffers_        = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindSampledImages_         = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindStorageImages_         = {},
+      uint32_t                                              maxDescriptorSetUpdateAfterBindInputAttachments_      = {},
+      VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedDepthResolveModes_                           = {},
+      VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedStencilResolveModes_                         = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          independentResolveNone_                               = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          independentResolve_                                   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxSingleComponentFormats_                   = {},
+      VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxImageComponentMapping_                    = {},
+      uint64_t                                              maxTimelineSemaphoreValueDifference_                  = {},
+      VULKAN_HPP_NAMESPACE::SampleCountFlags                framebufferIntegerColorSampleCounts_                  = {},
+      void *                                                pNext_                                                = nullptr )
+      : pNext( pNext_ )
+      , driverID( driverID_ )
+      , conformanceVersion( conformanceVersion_ )
+      , denormBehaviorIndependence( denormBehaviorIndependence_ )
+      , roundingModeIndependence( roundingModeIndependence_ )
+      , shaderSignedZeroInfNanPreserveFloat16( shaderSignedZeroInfNanPreserveFloat16_ )
+      , shaderSignedZeroInfNanPreserveFloat32( shaderSignedZeroInfNanPreserveFloat32_ )
+      , shaderSignedZeroInfNanPreserveFloat64( shaderSignedZeroInfNanPreserveFloat64_ )
+      , shaderDenormPreserveFloat16( shaderDenormPreserveFloat16_ )
+      , shaderDenormPreserveFloat32( shaderDenormPreserveFloat32_ )
+      , shaderDenormPreserveFloat64( shaderDenormPreserveFloat64_ )
+      , shaderDenormFlushToZeroFloat16( shaderDenormFlushToZeroFloat16_ )
+      , shaderDenormFlushToZeroFloat32( shaderDenormFlushToZeroFloat32_ )
+      , shaderDenormFlushToZeroFloat64( shaderDenormFlushToZeroFloat64_ )
+      , shaderRoundingModeRTEFloat16( shaderRoundingModeRTEFloat16_ )
+      , shaderRoundingModeRTEFloat32( shaderRoundingModeRTEFloat32_ )
+      , shaderRoundingModeRTEFloat64( shaderRoundingModeRTEFloat64_ )
+      , shaderRoundingModeRTZFloat16( shaderRoundingModeRTZFloat16_ )
+      , shaderRoundingModeRTZFloat32( shaderRoundingModeRTZFloat32_ )
+      , shaderRoundingModeRTZFloat64( shaderRoundingModeRTZFloat64_ )
+      , maxUpdateAfterBindDescriptorsInAllPools( maxUpdateAfterBindDescriptorsInAllPools_ )
+      , shaderUniformBufferArrayNonUniformIndexingNative( shaderUniformBufferArrayNonUniformIndexingNative_ )
+      , shaderSampledImageArrayNonUniformIndexingNative( shaderSampledImageArrayNonUniformIndexingNative_ )
+      , shaderStorageBufferArrayNonUniformIndexingNative( shaderStorageBufferArrayNonUniformIndexingNative_ )
+      , shaderStorageImageArrayNonUniformIndexingNative( shaderStorageImageArrayNonUniformIndexingNative_ )
+      , shaderInputAttachmentArrayNonUniformIndexingNative( shaderInputAttachmentArrayNonUniformIndexingNative_ )
+      , robustBufferAccessUpdateAfterBind( robustBufferAccessUpdateAfterBind_ )
+      , quadDivergentImplicitLod( quadDivergentImplicitLod_ )
+      , maxPerStageDescriptorUpdateAfterBindSamplers( maxPerStageDescriptorUpdateAfterBindSamplers_ )
+      , maxPerStageDescriptorUpdateAfterBindUniformBuffers( maxPerStageDescriptorUpdateAfterBindUniformBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageBuffers( maxPerStageDescriptorUpdateAfterBindStorageBuffers_ )
+      , maxPerStageDescriptorUpdateAfterBindSampledImages( maxPerStageDescriptorUpdateAfterBindSampledImages_ )
+      , maxPerStageDescriptorUpdateAfterBindStorageImages( maxPerStageDescriptorUpdateAfterBindStorageImages_ )
+      , maxPerStageDescriptorUpdateAfterBindInputAttachments( maxPerStageDescriptorUpdateAfterBindInputAttachments_ )
+      , maxPerStageUpdateAfterBindResources( maxPerStageUpdateAfterBindResources_ )
+      , maxDescriptorSetUpdateAfterBindSamplers( maxDescriptorSetUpdateAfterBindSamplers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffers( maxDescriptorSetUpdateAfterBindUniformBuffers_ )
+      , maxDescriptorSetUpdateAfterBindUniformBuffersDynamic( maxDescriptorSetUpdateAfterBindUniformBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffers( maxDescriptorSetUpdateAfterBindStorageBuffers_ )
+      , maxDescriptorSetUpdateAfterBindStorageBuffersDynamic( maxDescriptorSetUpdateAfterBindStorageBuffersDynamic_ )
+      , maxDescriptorSetUpdateAfterBindSampledImages( maxDescriptorSetUpdateAfterBindSampledImages_ )
+      , maxDescriptorSetUpdateAfterBindStorageImages( maxDescriptorSetUpdateAfterBindStorageImages_ )
+      , maxDescriptorSetUpdateAfterBindInputAttachments( maxDescriptorSetUpdateAfterBindInputAttachments_ )
+      , supportedDepthResolveModes( supportedDepthResolveModes_ )
+      , supportedStencilResolveModes( supportedStencilResolveModes_ )
+      , independentResolveNone( independentResolveNone_ )
+      , independentResolve( independentResolve_ )
+      , filterMinmaxSingleComponentFormats( filterMinmaxSingleComponentFormats_ )
+      , filterMinmaxImageComponentMapping( filterMinmaxImageComponentMapping_ )
+      , maxTimelineSemaphoreValueDifference( maxTimelineSemaphoreValueDifference_ )
+      , framebufferIntegerColorSampleCounts( framebufferIntegerColorSampleCounts_ )
+    {
+      VULKAN_HPP_ASSERT( driverName_.size() < VK_MAX_DRIVER_NAME_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( driverName, VK_MAX_DRIVER_NAME_SIZE, driverName_.data(), driverName_.size() );
+#    else
+      strncpy( driverName, driverName_.data(), std::min<size_t>( VK_MAX_DRIVER_NAME_SIZE, driverName_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( driverInfo_.size() < VK_MAX_DRIVER_INFO_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( driverInfo, VK_MAX_DRIVER_INFO_SIZE, driverInfo_.data(), driverInfo_.size() );
+#    else
+      strncpy( driverInfo, driverInfo_.data(), std::min<size_t>( VK_MAX_DRIVER_INFO_SIZE, driverInfo_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PhysicalDeviceVulkan12Properties & operator=( PhysicalDeviceVulkan12Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan12Properties & operator=( VkPhysicalDeviceVulkan12Properties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan12Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan12Properties const *>( &rhs );
       return *this;
     }
 
@@ -124618,48 +89721,41 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan12Properties *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan12Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan12Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan12Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan12Properties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               DriverId const &,
-               ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> const &,
-               ConformanceVersion const &,
-               ShaderFloatControlsIndependence const &,
-               ShaderFloatControlsIndependence const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DriverId const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ConformanceVersion const &,
+               VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence const &,
+               VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
@@ -124675,14 +89771,15 @@ namespace VULKAN_HPP_NAMESPACE
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ResolveModeFlags const &,
-               ResolveModeFlags const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlags const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlags const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint64_t const &,
-               SampleCountFlags const &>
+               VULKAN_HPP_NAMESPACE::SampleCountFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -124909,78 +90006,68 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType                                                = StructureType::ePhysicalDeviceVulkan12Properties;
-    void *                                        pNext                                                = {};
-    DriverId                                      driverID                                             = DriverId::eAmdProprietary;
-    ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> driverName                                           = {};
-    ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> driverInfo                                           = {};
-    ConformanceVersion                            conformanceVersion                                   = {};
-    ShaderFloatControlsIndependence               denormBehaviorIndependence                           = ShaderFloatControlsIndependence::e32BitOnly;
-    ShaderFloatControlsIndependence               roundingModeIndependence                             = ShaderFloatControlsIndependence::e32BitOnly;
-    Bool32                                        shaderSignedZeroInfNanPreserveFloat16                = {};
-    Bool32                                        shaderSignedZeroInfNanPreserveFloat32                = {};
-    Bool32                                        shaderSignedZeroInfNanPreserveFloat64                = {};
-    Bool32                                        shaderDenormPreserveFloat16                          = {};
-    Bool32                                        shaderDenormPreserveFloat32                          = {};
-    Bool32                                        shaderDenormPreserveFloat64                          = {};
-    Bool32                                        shaderDenormFlushToZeroFloat16                       = {};
-    Bool32                                        shaderDenormFlushToZeroFloat32                       = {};
-    Bool32                                        shaderDenormFlushToZeroFloat64                       = {};
-    Bool32                                        shaderRoundingModeRTEFloat16                         = {};
-    Bool32                                        shaderRoundingModeRTEFloat32                         = {};
-    Bool32                                        shaderRoundingModeRTEFloat64                         = {};
-    Bool32                                        shaderRoundingModeRTZFloat16                         = {};
-    Bool32                                        shaderRoundingModeRTZFloat32                         = {};
-    Bool32                                        shaderRoundingModeRTZFloat64                         = {};
-    uint32_t                                      maxUpdateAfterBindDescriptorsInAllPools              = {};
-    Bool32                                        shaderUniformBufferArrayNonUniformIndexingNative     = {};
-    Bool32                                        shaderSampledImageArrayNonUniformIndexingNative      = {};
-    Bool32                                        shaderStorageBufferArrayNonUniformIndexingNative     = {};
-    Bool32                                        shaderStorageImageArrayNonUniformIndexingNative      = {};
-    Bool32                                        shaderInputAttachmentArrayNonUniformIndexingNative   = {};
-    Bool32                                        robustBufferAccessUpdateAfterBind                    = {};
-    Bool32                                        quadDivergentImplicitLod                             = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindSamplers         = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindUniformBuffers   = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindStorageBuffers   = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindSampledImages    = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindStorageImages    = {};
-    uint32_t                                      maxPerStageDescriptorUpdateAfterBindInputAttachments = {};
-    uint32_t                                      maxPerStageUpdateAfterBindResources                  = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindSamplers              = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindUniformBuffers        = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindStorageBuffers        = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindSampledImages         = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindStorageImages         = {};
-    uint32_t                                      maxDescriptorSetUpdateAfterBindInputAttachments      = {};
-    ResolveModeFlags                              supportedDepthResolveModes                           = {};
-    ResolveModeFlags                              supportedStencilResolveModes                         = {};
-    Bool32                                        independentResolveNone                               = {};
-    Bool32                                        independentResolve                                   = {};
-    Bool32                                        filterMinmaxSingleComponentFormats                   = {};
-    Bool32                                        filterMinmaxImageComponentMapping                    = {};
-    uint64_t                                      maxTimelineSemaphoreValueDifference                  = {};
-    SampleCountFlags                              framebufferIntegerColorSampleCounts                  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType              = StructureType::ePhysicalDeviceVulkan12Properties;
+    void *                                                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::DriverId                                      driverID           = VULKAN_HPP_NAMESPACE::DriverId::eAmdProprietary;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_NAME_SIZE> driverName         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DRIVER_INFO_SIZE> driverInfo         = {};
+    VULKAN_HPP_NAMESPACE::ConformanceVersion                            conformanceVersion = {};
+    VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence denormBehaviorIndependence       = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly;
+    VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence roundingModeIndependence         = VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence::e32BitOnly;
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat16                = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat32                = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSignedZeroInfNanPreserveFloat64                = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat16                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat32                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormPreserveFloat64                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat16                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat32                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderDenormFlushToZeroFloat64                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat16                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat32                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTEFloat64                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat16                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat32                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderRoundingModeRTZFloat64                         = {};
+    uint32_t                                              maxUpdateAfterBindDescriptorsInAllPools              = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderUniformBufferArrayNonUniformIndexingNative     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderSampledImageArrayNonUniformIndexingNative      = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageBufferArrayNonUniformIndexingNative     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderStorageImageArrayNonUniformIndexingNative      = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          shaderInputAttachmentArrayNonUniformIndexingNative   = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          robustBufferAccessUpdateAfterBind                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          quadDivergentImplicitLod                             = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindSamplers         = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindUniformBuffers   = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageBuffers   = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindSampledImages    = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindStorageImages    = {};
+    uint32_t                                              maxPerStageDescriptorUpdateAfterBindInputAttachments = {};
+    uint32_t                                              maxPerStageUpdateAfterBindResources                  = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindSamplers              = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffers        = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffers        = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindSampledImages         = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindStorageImages         = {};
+    uint32_t                                              maxDescriptorSetUpdateAfterBindInputAttachments      = {};
+    VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedDepthResolveModes                           = {};
+    VULKAN_HPP_NAMESPACE::ResolveModeFlags                supportedStencilResolveModes                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          independentResolveNone                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          independentResolve                                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxSingleComponentFormats                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32                          filterMinmaxImageComponentMapping                    = {};
+    uint64_t                                              maxTimelineSemaphoreValueDifference                  = {};
+    VULKAN_HPP_NAMESPACE::SampleCountFlags                framebufferIntegerColorSampleCounts                  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan12Properties>
-  {
-    using Type = PhysicalDeviceVulkan12Properties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan12Properties>
   {
     using Type = PhysicalDeviceVulkan12Properties;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan13Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan13Features.html
   struct PhysicalDeviceVulkan13Features
   {
     using NativeType = VkPhysicalDeviceVulkan13Features;
@@ -124988,39 +90075,39 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan13Features;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan13Features( Bool32 robustImageAccess_                                  = {},
-                                                         Bool32 inlineUniformBlock_                                 = {},
-                                                         Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ = {},
-                                                         Bool32 pipelineCreationCacheControl_                       = {},
-                                                         Bool32 privateData_                                        = {},
-                                                         Bool32 shaderDemoteToHelperInvocation_                     = {},
-                                                         Bool32 shaderTerminateInvocation_                          = {},
-                                                         Bool32 subgroupSizeControl_                                = {},
-                                                         Bool32 computeFullSubgroups_                               = {},
-                                                         Bool32 synchronization2_                                   = {},
-                                                         Bool32 textureCompressionASTC_HDR_                         = {},
-                                                         Bool32 shaderZeroInitializeWorkgroupMemory_                = {},
-                                                         Bool32 dynamicRendering_                                   = {},
-                                                         Bool32 shaderIntegerDotProduct_                            = {},
-                                                         Bool32 maintenance4_                                       = {},
-                                                         void * pNext_                                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , robustImageAccess{ robustImageAccess_ }
-      , inlineUniformBlock{ inlineUniformBlock_ }
-      , descriptorBindingInlineUniformBlockUpdateAfterBind{ descriptorBindingInlineUniformBlockUpdateAfterBind_ }
-      , pipelineCreationCacheControl{ pipelineCreationCacheControl_ }
-      , privateData{ privateData_ }
-      , shaderDemoteToHelperInvocation{ shaderDemoteToHelperInvocation_ }
-      , shaderTerminateInvocation{ shaderTerminateInvocation_ }
-      , subgroupSizeControl{ subgroupSizeControl_ }
-      , computeFullSubgroups{ computeFullSubgroups_ }
-      , synchronization2{ synchronization2_ }
-      , textureCompressionASTC_HDR{ textureCompressionASTC_HDR_ }
-      , shaderZeroInitializeWorkgroupMemory{ shaderZeroInitializeWorkgroupMemory_ }
-      , dynamicRendering{ dynamicRendering_ }
-      , shaderIntegerDotProduct{ shaderIntegerDotProduct_ }
-      , maintenance4{ maintenance4_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan13Features( VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess_                                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 inlineUniformBlock_                                 = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 pipelineCreationCacheControl_                       = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 privateData_                                        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderDemoteToHelperInvocation_                     = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderTerminateInvocation_                          = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 subgroupSizeControl_                                = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 computeFullSubgroups_                               = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 synchronization2_                                   = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_HDR_                         = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderZeroInitializeWorkgroupMemory_                = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 dynamicRendering_                                   = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerDotProduct_                            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32 maintenance4_                                       = {},
+                                                         void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , robustImageAccess( robustImageAccess_ )
+      , inlineUniformBlock( inlineUniformBlock_ )
+      , descriptorBindingInlineUniformBlockUpdateAfterBind( descriptorBindingInlineUniformBlockUpdateAfterBind_ )
+      , pipelineCreationCacheControl( pipelineCreationCacheControl_ )
+      , privateData( privateData_ )
+      , shaderDemoteToHelperInvocation( shaderDemoteToHelperInvocation_ )
+      , shaderTerminateInvocation( shaderTerminateInvocation_ )
+      , subgroupSizeControl( subgroupSizeControl_ )
+      , computeFullSubgroups( computeFullSubgroups_ )
+      , synchronization2( synchronization2_ )
+      , textureCompressionASTC_HDR( textureCompressionASTC_HDR_ )
+      , shaderZeroInitializeWorkgroupMemory( shaderZeroInitializeWorkgroupMemory_ )
+      , dynamicRendering( dynamicRendering_ )
+      , shaderIntegerDotProduct( shaderIntegerDotProduct_ )
+      , maintenance4( maintenance4_ )
     {
     }
 
@@ -125032,113 +90119,118 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkan13Features & operator=( PhysicalDeviceVulkan13Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan13Features & operator=( VkPhysicalDeviceVulkan13Features const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan13Features const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Features const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setRobustImageAccess( Bool32 robustImageAccess_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setRobustImageAccess( VULKAN_HPP_NAMESPACE::Bool32 robustImageAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       robustImageAccess = robustImageAccess_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setInlineUniformBlock( Bool32 inlineUniformBlock_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setInlineUniformBlock( VULKAN_HPP_NAMESPACE::Bool32 inlineUniformBlock_ ) VULKAN_HPP_NOEXCEPT
     {
       inlineUniformBlock = inlineUniformBlock_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
-      setDescriptorBindingInlineUniformBlockUpdateAfterBind( Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setDescriptorBindingInlineUniformBlockUpdateAfterBind(
+      VULKAN_HPP_NAMESPACE::Bool32 descriptorBindingInlineUniformBlockUpdateAfterBind_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorBindingInlineUniformBlockUpdateAfterBind = descriptorBindingInlineUniformBlockUpdateAfterBind_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setPipelineCreationCacheControl( Bool32 pipelineCreationCacheControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
+      setPipelineCreationCacheControl( VULKAN_HPP_NAMESPACE::Bool32 pipelineCreationCacheControl_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineCreationCacheControl = pipelineCreationCacheControl_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setPrivateData( Bool32 privateData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setPrivateData( VULKAN_HPP_NAMESPACE::Bool32 privateData_ ) VULKAN_HPP_NOEXCEPT
     {
       privateData = privateData_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setShaderDemoteToHelperInvocation( Bool32 shaderDemoteToHelperInvocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
+      setShaderDemoteToHelperInvocation( VULKAN_HPP_NAMESPACE::Bool32 shaderDemoteToHelperInvocation_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderDemoteToHelperInvocation = shaderDemoteToHelperInvocation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setShaderTerminateInvocation( Bool32 shaderTerminateInvocation_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
+      setShaderTerminateInvocation( VULKAN_HPP_NAMESPACE::Bool32 shaderTerminateInvocation_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderTerminateInvocation = shaderTerminateInvocation_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setSubgroupSizeControl( Bool32 subgroupSizeControl_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setSubgroupSizeControl( VULKAN_HPP_NAMESPACE::Bool32 subgroupSizeControl_ ) VULKAN_HPP_NOEXCEPT
     {
       subgroupSizeControl = subgroupSizeControl_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setComputeFullSubgroups( Bool32 computeFullSubgroups_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setComputeFullSubgroups( VULKAN_HPP_NAMESPACE::Bool32 computeFullSubgroups_ ) VULKAN_HPP_NOEXCEPT
     {
       computeFullSubgroups = computeFullSubgroups_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setSynchronization2( Bool32 synchronization2_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setSynchronization2( VULKAN_HPP_NAMESPACE::Bool32 synchronization2_ ) VULKAN_HPP_NOEXCEPT
     {
       synchronization2 = synchronization2_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setTextureCompressionASTC_HDR( Bool32 textureCompressionASTC_HDR_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
+      setTextureCompressionASTC_HDR( VULKAN_HPP_NAMESPACE::Bool32 textureCompressionASTC_HDR_ ) VULKAN_HPP_NOEXCEPT
     {
       textureCompressionASTC_HDR = textureCompressionASTC_HDR_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
-      setShaderZeroInitializeWorkgroupMemory( Bool32 shaderZeroInitializeWorkgroupMemory_ ) VULKAN_HPP_NOEXCEPT
+      setShaderZeroInitializeWorkgroupMemory( VULKAN_HPP_NAMESPACE::Bool32 shaderZeroInitializeWorkgroupMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderZeroInitializeWorkgroupMemory = shaderZeroInitializeWorkgroupMemory_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setDynamicRendering( Bool32 dynamicRendering_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setDynamicRendering( VULKAN_HPP_NAMESPACE::Bool32 dynamicRendering_ ) VULKAN_HPP_NOEXCEPT
     {
       dynamicRendering = dynamicRendering_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setShaderIntegerDotProduct( Bool32 shaderIntegerDotProduct_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features &
+      setShaderIntegerDotProduct( VULKAN_HPP_NAMESPACE::Bool32 shaderIntegerDotProduct_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderIntegerDotProduct = shaderIntegerDotProduct_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setMaintenance4( Bool32 maintenance4_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan13Features & setMaintenance4( VULKAN_HPP_NAMESPACE::Bool32 maintenance4_ ) VULKAN_HPP_NOEXCEPT
     {
       maintenance4 = maintenance4_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVulkan13Features const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -125150,34 +90242,28 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan13Features *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan13Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan13Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan13Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan13Features *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -125227,41 +90313,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                              = StructureType::ePhysicalDeviceVulkan13Features;
-    void *        pNext                                              = {};
-    Bool32        robustImageAccess                                  = {};
-    Bool32        inlineUniformBlock                                 = {};
-    Bool32        descriptorBindingInlineUniformBlockUpdateAfterBind = {};
-    Bool32        pipelineCreationCacheControl                       = {};
-    Bool32        privateData                                        = {};
-    Bool32        shaderDemoteToHelperInvocation                     = {};
-    Bool32        shaderTerminateInvocation                          = {};
-    Bool32        subgroupSizeControl                                = {};
-    Bool32        computeFullSubgroups                               = {};
-    Bool32        synchronization2                                   = {};
-    Bool32        textureCompressionASTC_HDR                         = {};
-    Bool32        shaderZeroInitializeWorkgroupMemory                = {};
-    Bool32        dynamicRendering                                   = {};
-    Bool32        shaderIntegerDotProduct                            = {};
-    Bool32        maintenance4                                       = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                              = StructureType::ePhysicalDeviceVulkan13Features;
+    void *                              pNext                                              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        robustImageAccess                                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        inlineUniformBlock                                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        descriptorBindingInlineUniformBlockUpdateAfterBind = {};
+    VULKAN_HPP_NAMESPACE::Bool32        pipelineCreationCacheControl                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        privateData                                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderDemoteToHelperInvocation                     = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderTerminateInvocation                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        subgroupSizeControl                                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        computeFullSubgroups                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        synchronization2                                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        textureCompressionASTC_HDR                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderZeroInitializeWorkgroupMemory                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        dynamicRendering                                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderIntegerDotProduct                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        maintenance4                                       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan13Features>
-  {
-    using Type = PhysicalDeviceVulkan13Features;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan13Features>
   {
     using Type = PhysicalDeviceVulkan13Features;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan13Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan13Properties.html
   struct PhysicalDeviceVulkan13Properties
   {
     using NativeType = VkPhysicalDeviceVulkan13Properties;
@@ -125269,99 +90345,101 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan13Properties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan13Properties( uint32_t         minSubgroupSize_                                                               = {},
-                                                           uint32_t         maxSubgroupSize_                                                               = {},
-                                                           uint32_t         maxComputeWorkgroupSubgroups_                                                  = {},
-                                                           ShaderStageFlags requiredSubgroupSizeStages_                                                    = {},
-                                                           uint32_t         maxInlineUniformBlockSize_                                                     = {},
-                                                           uint32_t         maxPerStageDescriptorInlineUniformBlocks_                                      = {},
-                                                           uint32_t         maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_                       = {},
-                                                           uint32_t         maxDescriptorSetInlineUniformBlocks_                                           = {},
-                                                           uint32_t         maxDescriptorSetUpdateAfterBindInlineUniformBlocks_                            = {},
-                                                           uint32_t         maxInlineUniformTotalSize_                                                     = {},
-                                                           Bool32           integerDotProduct8BitUnsignedAccelerated_                                      = {},
-                                                           Bool32           integerDotProduct8BitSignedAccelerated_                                        = {},
-                                                           Bool32           integerDotProduct8BitMixedSignednessAccelerated_                               = {},
-                                                           Bool32           integerDotProduct4x8BitPackedUnsignedAccelerated_                              = {},
-                                                           Bool32           integerDotProduct4x8BitPackedSignedAccelerated_                                = {},
-                                                           Bool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated_                       = {},
-                                                           Bool32           integerDotProduct16BitUnsignedAccelerated_                                     = {},
-                                                           Bool32           integerDotProduct16BitSignedAccelerated_                                       = {},
-                                                           Bool32           integerDotProduct16BitMixedSignednessAccelerated_                              = {},
-                                                           Bool32           integerDotProduct32BitUnsignedAccelerated_                                     = {},
-                                                           Bool32           integerDotProduct32BitSignedAccelerated_                                       = {},
-                                                           Bool32           integerDotProduct32BitMixedSignednessAccelerated_                              = {},
-                                                           Bool32           integerDotProduct64BitUnsignedAccelerated_                                     = {},
-                                                           Bool32           integerDotProduct64BitSignedAccelerated_                                       = {},
-                                                           Bool32           integerDotProduct64BitMixedSignednessAccelerated_                              = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_                = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated_                  = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_         = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_        = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_          = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_               = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating16BitSignedAccelerated_                 = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_        = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_               = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating32BitSignedAccelerated_                 = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_        = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_               = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating64BitSignedAccelerated_                 = {},
-                                                           Bool32           integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_        = {},
-                                                           DeviceSize       storageTexelBufferOffsetAlignmentBytes_                                        = {},
-                                                           Bool32           storageTexelBufferOffsetSingleTexelAlignment_                                  = {},
-                                                           DeviceSize       uniformTexelBufferOffsetAlignmentBytes_                                        = {},
-                                                           Bool32           uniformTexelBufferOffsetSingleTexelAlignment_                                  = {},
-                                                           DeviceSize       maxBufferSize_                                                                 = {},
-                                                           void *           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minSubgroupSize{ minSubgroupSize_ }
-      , maxSubgroupSize{ maxSubgroupSize_ }
-      , maxComputeWorkgroupSubgroups{ maxComputeWorkgroupSubgroups_ }
-      , requiredSubgroupSizeStages{ requiredSubgroupSizeStages_ }
-      , maxInlineUniformBlockSize{ maxInlineUniformBlockSize_ }
-      , maxPerStageDescriptorInlineUniformBlocks{ maxPerStageDescriptorInlineUniformBlocks_ }
-      , maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks{ maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_ }
-      , maxDescriptorSetInlineUniformBlocks{ maxDescriptorSetInlineUniformBlocks_ }
-      , maxDescriptorSetUpdateAfterBindInlineUniformBlocks{ maxDescriptorSetUpdateAfterBindInlineUniformBlocks_ }
-      , maxInlineUniformTotalSize{ maxInlineUniformTotalSize_ }
-      , integerDotProduct8BitUnsignedAccelerated{ integerDotProduct8BitUnsignedAccelerated_ }
-      , integerDotProduct8BitSignedAccelerated{ integerDotProduct8BitSignedAccelerated_ }
-      , integerDotProduct8BitMixedSignednessAccelerated{ integerDotProduct8BitMixedSignednessAccelerated_ }
-      , integerDotProduct4x8BitPackedUnsignedAccelerated{ integerDotProduct4x8BitPackedUnsignedAccelerated_ }
-      , integerDotProduct4x8BitPackedSignedAccelerated{ integerDotProduct4x8BitPackedSignedAccelerated_ }
-      , integerDotProduct4x8BitPackedMixedSignednessAccelerated{ integerDotProduct4x8BitPackedMixedSignednessAccelerated_ }
-      , integerDotProduct16BitUnsignedAccelerated{ integerDotProduct16BitUnsignedAccelerated_ }
-      , integerDotProduct16BitSignedAccelerated{ integerDotProduct16BitSignedAccelerated_ }
-      , integerDotProduct16BitMixedSignednessAccelerated{ integerDotProduct16BitMixedSignednessAccelerated_ }
-      , integerDotProduct32BitUnsignedAccelerated{ integerDotProduct32BitUnsignedAccelerated_ }
-      , integerDotProduct32BitSignedAccelerated{ integerDotProduct32BitSignedAccelerated_ }
-      , integerDotProduct32BitMixedSignednessAccelerated{ integerDotProduct32BitMixedSignednessAccelerated_ }
-      , integerDotProduct64BitUnsignedAccelerated{ integerDotProduct64BitUnsignedAccelerated_ }
-      , integerDotProduct64BitSignedAccelerated{ integerDotProduct64BitSignedAccelerated_ }
-      , integerDotProduct64BitMixedSignednessAccelerated{ integerDotProduct64BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitSignedAccelerated{ integerDotProductAccumulatingSaturating8BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitSignedAccelerated{ integerDotProductAccumulatingSaturating16BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitSignedAccelerated{ integerDotProductAccumulatingSaturating32BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitUnsignedAccelerated{ integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitSignedAccelerated{ integerDotProductAccumulatingSaturating64BitSignedAccelerated_ }
-      , integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated{ integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_ }
-      , storageTexelBufferOffsetAlignmentBytes{ storageTexelBufferOffsetAlignmentBytes_ }
-      , storageTexelBufferOffsetSingleTexelAlignment{ storageTexelBufferOffsetSingleTexelAlignment_ }
-      , uniformTexelBufferOffsetAlignmentBytes{ uniformTexelBufferOffsetAlignmentBytes_ }
-      , uniformTexelBufferOffsetSingleTexelAlignment{ uniformTexelBufferOffsetSingleTexelAlignment_ }
-      , maxBufferSize{ maxBufferSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceVulkan13Properties( uint32_t                               minSubgroupSize_                                                         = {},
+                                        uint32_t                               maxSubgroupSize_                                                         = {},
+                                        uint32_t                               maxComputeWorkgroupSubgroups_                                            = {},
+                                        VULKAN_HPP_NAMESPACE::ShaderStageFlags requiredSubgroupSizeStages_                                              = {},
+                                        uint32_t                               maxInlineUniformBlockSize_                                               = {},
+                                        uint32_t                               maxPerStageDescriptorInlineUniformBlocks_                                = {},
+                                        uint32_t                               maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_                 = {},
+                                        uint32_t                               maxDescriptorSetInlineUniformBlocks_                                     = {},
+                                        uint32_t                               maxDescriptorSetUpdateAfterBindInlineUniformBlocks_                      = {},
+                                        uint32_t                               maxInlineUniformTotalSize_                                               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitUnsignedAccelerated_                                = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitSignedAccelerated_                                  = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitMixedSignednessAccelerated_                         = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedUnsignedAccelerated_                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedSignedAccelerated_                          = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated_                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitUnsignedAccelerated_                               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitSignedAccelerated_                                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitMixedSignednessAccelerated_                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitUnsignedAccelerated_                               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitSignedAccelerated_                                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitMixedSignednessAccelerated_                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitUnsignedAccelerated_                               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitSignedAccelerated_                                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitMixedSignednessAccelerated_                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_          = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated_            = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_   = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_  = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_    = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating16BitSignedAccelerated_                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating32BitSignedAccelerated_                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_               = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating64BitSignedAccelerated_                 = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_        = {},
+                                        VULKAN_HPP_NAMESPACE::DeviceSize storageTexelBufferOffsetAlignmentBytes_                                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     storageTexelBufferOffsetSingleTexelAlignment_                                  = {},
+                                        VULKAN_HPP_NAMESPACE::DeviceSize uniformTexelBufferOffsetAlignmentBytes_                                        = {},
+                                        VULKAN_HPP_NAMESPACE::Bool32     uniformTexelBufferOffsetSingleTexelAlignment_                                  = {},
+                                        VULKAN_HPP_NAMESPACE::DeviceSize maxBufferSize_                                                                 = {},
+                                        void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minSubgroupSize( minSubgroupSize_ )
+      , maxSubgroupSize( maxSubgroupSize_ )
+      , maxComputeWorkgroupSubgroups( maxComputeWorkgroupSubgroups_ )
+      , requiredSubgroupSizeStages( requiredSubgroupSizeStages_ )
+      , maxInlineUniformBlockSize( maxInlineUniformBlockSize_ )
+      , maxPerStageDescriptorInlineUniformBlocks( maxPerStageDescriptorInlineUniformBlocks_ )
+      , maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks( maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks_ )
+      , maxDescriptorSetInlineUniformBlocks( maxDescriptorSetInlineUniformBlocks_ )
+      , maxDescriptorSetUpdateAfterBindInlineUniformBlocks( maxDescriptorSetUpdateAfterBindInlineUniformBlocks_ )
+      , maxInlineUniformTotalSize( maxInlineUniformTotalSize_ )
+      , integerDotProduct8BitUnsignedAccelerated( integerDotProduct8BitUnsignedAccelerated_ )
+      , integerDotProduct8BitSignedAccelerated( integerDotProduct8BitSignedAccelerated_ )
+      , integerDotProduct8BitMixedSignednessAccelerated( integerDotProduct8BitMixedSignednessAccelerated_ )
+      , integerDotProduct4x8BitPackedUnsignedAccelerated( integerDotProduct4x8BitPackedUnsignedAccelerated_ )
+      , integerDotProduct4x8BitPackedSignedAccelerated( integerDotProduct4x8BitPackedSignedAccelerated_ )
+      , integerDotProduct4x8BitPackedMixedSignednessAccelerated( integerDotProduct4x8BitPackedMixedSignednessAccelerated_ )
+      , integerDotProduct16BitUnsignedAccelerated( integerDotProduct16BitUnsignedAccelerated_ )
+      , integerDotProduct16BitSignedAccelerated( integerDotProduct16BitSignedAccelerated_ )
+      , integerDotProduct16BitMixedSignednessAccelerated( integerDotProduct16BitMixedSignednessAccelerated_ )
+      , integerDotProduct32BitUnsignedAccelerated( integerDotProduct32BitUnsignedAccelerated_ )
+      , integerDotProduct32BitSignedAccelerated( integerDotProduct32BitSignedAccelerated_ )
+      , integerDotProduct32BitMixedSignednessAccelerated( integerDotProduct32BitMixedSignednessAccelerated_ )
+      , integerDotProduct64BitUnsignedAccelerated( integerDotProduct64BitUnsignedAccelerated_ )
+      , integerDotProduct64BitSignedAccelerated( integerDotProduct64BitSignedAccelerated_ )
+      , integerDotProduct64BitMixedSignednessAccelerated( integerDotProduct64BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitUnsignedAccelerated( integerDotProductAccumulatingSaturating8BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitSignedAccelerated( integerDotProductAccumulatingSaturating8BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated( integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated( integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated(
+          integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitUnsignedAccelerated( integerDotProductAccumulatingSaturating16BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitSignedAccelerated( integerDotProductAccumulatingSaturating16BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitUnsignedAccelerated( integerDotProductAccumulatingSaturating32BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitSignedAccelerated( integerDotProductAccumulatingSaturating32BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitUnsignedAccelerated( integerDotProductAccumulatingSaturating64BitUnsignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitSignedAccelerated( integerDotProductAccumulatingSaturating64BitSignedAccelerated_ )
+      , integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated( integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated_ )
+      , storageTexelBufferOffsetAlignmentBytes( storageTexelBufferOffsetAlignmentBytes_ )
+      , storageTexelBufferOffsetSingleTexelAlignment( storageTexelBufferOffsetSingleTexelAlignment_ )
+      , uniformTexelBufferOffsetAlignmentBytes( uniformTexelBufferOffsetAlignmentBytes_ )
+      , uniformTexelBufferOffsetSingleTexelAlignment( uniformTexelBufferOffsetSingleTexelAlignment_ )
+      , maxBufferSize( maxBufferSize_ )
     {
     }
 
@@ -125373,11 +90451,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkan13Properties & operator=( PhysicalDeviceVulkan13Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkan13Properties & operator=( VkPhysicalDeviceVulkan13Properties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan13Properties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkan13Properties const *>( &rhs );
       return *this;
     }
 
@@ -125391,64 +90469,58 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkan13Properties *>( this );
     }
 
-    operator VkPhysicalDeviceVulkan13Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan13Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan13Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan13Properties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               DeviceSize const &,
-               Bool32 const &,
-               DeviceSize const &,
-               Bool32 const &,
-               DeviceSize const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -125568,661 +90640,61 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                                                                         = StructureType::ePhysicalDeviceVulkan13Properties;
-    void *           pNext                                                                         = {};
-    uint32_t         minSubgroupSize                                                               = {};
-    uint32_t         maxSubgroupSize                                                               = {};
-    uint32_t         maxComputeWorkgroupSubgroups                                                  = {};
-    ShaderStageFlags requiredSubgroupSizeStages                                                    = {};
-    uint32_t         maxInlineUniformBlockSize                                                     = {};
-    uint32_t         maxPerStageDescriptorInlineUniformBlocks                                      = {};
-    uint32_t         maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks                       = {};
-    uint32_t         maxDescriptorSetInlineUniformBlocks                                           = {};
-    uint32_t         maxDescriptorSetUpdateAfterBindInlineUniformBlocks                            = {};
-    uint32_t         maxInlineUniformTotalSize                                                     = {};
-    Bool32           integerDotProduct8BitUnsignedAccelerated                                      = {};
-    Bool32           integerDotProduct8BitSignedAccelerated                                        = {};
-    Bool32           integerDotProduct8BitMixedSignednessAccelerated                               = {};
-    Bool32           integerDotProduct4x8BitPackedUnsignedAccelerated                              = {};
-    Bool32           integerDotProduct4x8BitPackedSignedAccelerated                                = {};
-    Bool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated                       = {};
-    Bool32           integerDotProduct16BitUnsignedAccelerated                                     = {};
-    Bool32           integerDotProduct16BitSignedAccelerated                                       = {};
-    Bool32           integerDotProduct16BitMixedSignednessAccelerated                              = {};
-    Bool32           integerDotProduct32BitUnsignedAccelerated                                     = {};
-    Bool32           integerDotProduct32BitSignedAccelerated                                       = {};
-    Bool32           integerDotProduct32BitMixedSignednessAccelerated                              = {};
-    Bool32           integerDotProduct64BitUnsignedAccelerated                                     = {};
-    Bool32           integerDotProduct64BitSignedAccelerated                                       = {};
-    Bool32           integerDotProduct64BitMixedSignednessAccelerated                              = {};
-    Bool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated                = {};
-    Bool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated                  = {};
-    Bool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated         = {};
-    Bool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated        = {};
-    Bool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated          = {};
-    Bool32           integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated = {};
-    Bool32           integerDotProductAccumulatingSaturating16BitUnsignedAccelerated               = {};
-    Bool32           integerDotProductAccumulatingSaturating16BitSignedAccelerated                 = {};
-    Bool32           integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated        = {};
-    Bool32           integerDotProductAccumulatingSaturating32BitUnsignedAccelerated               = {};
-    Bool32           integerDotProductAccumulatingSaturating32BitSignedAccelerated                 = {};
-    Bool32           integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated        = {};
-    Bool32           integerDotProductAccumulatingSaturating64BitUnsignedAccelerated               = {};
-    Bool32           integerDotProductAccumulatingSaturating64BitSignedAccelerated                 = {};
-    Bool32           integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated        = {};
-    DeviceSize       storageTexelBufferOffsetAlignmentBytes                                        = {};
-    Bool32           storageTexelBufferOffsetSingleTexelAlignment                                  = {};
-    DeviceSize       uniformTexelBufferOffsetAlignmentBytes                                        = {};
-    Bool32           uniformTexelBufferOffsetSingleTexelAlignment                                  = {};
-    DeviceSize       maxBufferSize                                                                 = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType                                                          = StructureType::ePhysicalDeviceVulkan13Properties;
+    void *                                 pNext                                                          = {};
+    uint32_t                               minSubgroupSize                                                = {};
+    uint32_t                               maxSubgroupSize                                                = {};
+    uint32_t                               maxComputeWorkgroupSubgroups                                   = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags requiredSubgroupSizeStages                                     = {};
+    uint32_t                               maxInlineUniformBlockSize                                      = {};
+    uint32_t                               maxPerStageDescriptorInlineUniformBlocks                       = {};
+    uint32_t                               maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks        = {};
+    uint32_t                               maxDescriptorSetInlineUniformBlocks                            = {};
+    uint32_t                               maxDescriptorSetUpdateAfterBindInlineUniformBlocks             = {};
+    uint32_t                               maxInlineUniformTotalSize                                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitUnsignedAccelerated                       = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitSignedAccelerated                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct8BitMixedSignednessAccelerated                = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct4x8BitPackedMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitUnsignedAccelerated                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitSignedAccelerated                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct16BitMixedSignednessAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitUnsignedAccelerated                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitSignedAccelerated                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct32BitMixedSignednessAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitUnsignedAccelerated                      = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitSignedAccelerated                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProduct64BitMixedSignednessAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitUnsignedAccelerated = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitSignedAccelerated   = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated         = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated          = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating16BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating16BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating32BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating32BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating64BitUnsignedAccelerated               = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating64BitSignedAccelerated                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32           integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize       storageTexelBufferOffsetAlignmentBytes                                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           storageTexelBufferOffsetSingleTexelAlignment                                  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize       uniformTexelBufferOffsetAlignmentBytes                                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32           uniformTexelBufferOffsetSingleTexelAlignment                                  = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize       maxBufferSize                                                                 = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan13Properties>
-  {
-    using Type = PhysicalDeviceVulkan13Properties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan13Properties>
   {
     using Type = PhysicalDeviceVulkan13Properties;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceVulkan14Features, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan14Features.html
-  struct PhysicalDeviceVulkan14Features
-  {
-    using NativeType = VkPhysicalDeviceVulkan14Features;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan14Features;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan14Features( Bool32 globalPriorityQuery_                    = {},
-                                                         Bool32 shaderSubgroupRotate_                   = {},
-                                                         Bool32 shaderSubgroupRotateClustered_          = {},
-                                                         Bool32 shaderFloatControls2_                   = {},
-                                                         Bool32 shaderExpectAssume_                     = {},
-                                                         Bool32 rectangularLines_                       = {},
-                                                         Bool32 bresenhamLines_                         = {},
-                                                         Bool32 smoothLines_                            = {},
-                                                         Bool32 stippledRectangularLines_               = {},
-                                                         Bool32 stippledBresenhamLines_                 = {},
-                                                         Bool32 stippledSmoothLines_                    = {},
-                                                         Bool32 vertexAttributeInstanceRateDivisor_     = {},
-                                                         Bool32 vertexAttributeInstanceRateZeroDivisor_ = {},
-                                                         Bool32 indexTypeUint8_                         = {},
-                                                         Bool32 dynamicRenderingLocalRead_              = {},
-                                                         Bool32 maintenance5_                           = {},
-                                                         Bool32 maintenance6_                           = {},
-                                                         Bool32 pipelineProtectedAccess_                = {},
-                                                         Bool32 pipelineRobustness_                     = {},
-                                                         Bool32 hostImageCopy_                          = {},
-                                                         Bool32 pushDescriptor_                         = {},
-                                                         void * pNext_                                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , globalPriorityQuery{ globalPriorityQuery_ }
-      , shaderSubgroupRotate{ shaderSubgroupRotate_ }
-      , shaderSubgroupRotateClustered{ shaderSubgroupRotateClustered_ }
-      , shaderFloatControls2{ shaderFloatControls2_ }
-      , shaderExpectAssume{ shaderExpectAssume_ }
-      , rectangularLines{ rectangularLines_ }
-      , bresenhamLines{ bresenhamLines_ }
-      , smoothLines{ smoothLines_ }
-      , stippledRectangularLines{ stippledRectangularLines_ }
-      , stippledBresenhamLines{ stippledBresenhamLines_ }
-      , stippledSmoothLines{ stippledSmoothLines_ }
-      , vertexAttributeInstanceRateDivisor{ vertexAttributeInstanceRateDivisor_ }
-      , vertexAttributeInstanceRateZeroDivisor{ vertexAttributeInstanceRateZeroDivisor_ }
-      , indexTypeUint8{ indexTypeUint8_ }
-      , dynamicRenderingLocalRead{ dynamicRenderingLocalRead_ }
-      , maintenance5{ maintenance5_ }
-      , maintenance6{ maintenance6_ }
-      , pipelineProtectedAccess{ pipelineProtectedAccess_ }
-      , pipelineRobustness{ pipelineRobustness_ }
-      , hostImageCopy{ hostImageCopy_ }
-      , pushDescriptor{ pushDescriptor_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkan14Features( PhysicalDeviceVulkan14Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVulkan14Features( VkPhysicalDeviceVulkan14Features const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVulkan14Features( *reinterpret_cast<PhysicalDeviceVulkan14Features const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVulkan14Features & operator=( PhysicalDeviceVulkan14Features const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVulkan14Features & operator=( VkPhysicalDeviceVulkan14Features const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan14Features const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setGlobalPriorityQuery( Bool32 globalPriorityQuery_ ) VULKAN_HPP_NOEXCEPT
-    {
-      globalPriorityQuery = globalPriorityQuery_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setShaderSubgroupRotate( Bool32 shaderSubgroupRotate_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderSubgroupRotate = shaderSubgroupRotate_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setShaderSubgroupRotateClustered( Bool32 shaderSubgroupRotateClustered_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderSubgroupRotateClustered = shaderSubgroupRotateClustered_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setShaderFloatControls2( Bool32 shaderFloatControls2_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderFloatControls2 = shaderFloatControls2_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setShaderExpectAssume( Bool32 shaderExpectAssume_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shaderExpectAssume = shaderExpectAssume_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setRectangularLines( Bool32 rectangularLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rectangularLines = rectangularLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setBresenhamLines( Bool32 bresenhamLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bresenhamLines = bresenhamLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setSmoothLines( Bool32 smoothLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      smoothLines = smoothLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setStippledRectangularLines( Bool32 stippledRectangularLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stippledRectangularLines = stippledRectangularLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setStippledBresenhamLines( Bool32 stippledBresenhamLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stippledBresenhamLines = stippledBresenhamLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setStippledSmoothLines( Bool32 stippledSmoothLines_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stippledSmoothLines = stippledSmoothLines_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features &
-      setVertexAttributeInstanceRateDivisor( Bool32 vertexAttributeInstanceRateDivisor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexAttributeInstanceRateDivisor = vertexAttributeInstanceRateDivisor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features &
-      setVertexAttributeInstanceRateZeroDivisor( Bool32 vertexAttributeInstanceRateZeroDivisor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      vertexAttributeInstanceRateZeroDivisor = vertexAttributeInstanceRateZeroDivisor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setIndexTypeUint8( Bool32 indexTypeUint8_ ) VULKAN_HPP_NOEXCEPT
-    {
-      indexTypeUint8 = indexTypeUint8_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setDynamicRenderingLocalRead( Bool32 dynamicRenderingLocalRead_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dynamicRenderingLocalRead = dynamicRenderingLocalRead_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setMaintenance5( Bool32 maintenance5_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance5 = maintenance5_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setMaintenance6( Bool32 maintenance6_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maintenance6 = maintenance6_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setPipelineProtectedAccess( Bool32 pipelineProtectedAccess_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineProtectedAccess = pipelineProtectedAccess_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setPipelineRobustness( Bool32 pipelineRobustness_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineRobustness = pipelineRobustness_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setHostImageCopy( Bool32 hostImageCopy_ ) VULKAN_HPP_NOEXCEPT
-    {
-      hostImageCopy = hostImageCopy_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Features & setPushDescriptor( Bool32 pushDescriptor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pushDescriptor = pushDescriptor_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceVulkan14Features const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVulkan14Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Features &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVulkan14Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Features const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan14Features *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Features *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan14Features *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       globalPriorityQuery,
-                       shaderSubgroupRotate,
-                       shaderSubgroupRotateClustered,
-                       shaderFloatControls2,
-                       shaderExpectAssume,
-                       rectangularLines,
-                       bresenhamLines,
-                       smoothLines,
-                       stippledRectangularLines,
-                       stippledBresenhamLines,
-                       stippledSmoothLines,
-                       vertexAttributeInstanceRateDivisor,
-                       vertexAttributeInstanceRateZeroDivisor,
-                       indexTypeUint8,
-                       dynamicRenderingLocalRead,
-                       maintenance5,
-                       maintenance6,
-                       pipelineProtectedAccess,
-                       pipelineRobustness,
-                       hostImageCopy,
-                       pushDescriptor );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVulkan14Features const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVulkan14Features const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( globalPriorityQuery == rhs.globalPriorityQuery ) &&
-             ( shaderSubgroupRotate == rhs.shaderSubgroupRotate ) && ( shaderSubgroupRotateClustered == rhs.shaderSubgroupRotateClustered ) &&
-             ( shaderFloatControls2 == rhs.shaderFloatControls2 ) && ( shaderExpectAssume == rhs.shaderExpectAssume ) &&
-             ( rectangularLines == rhs.rectangularLines ) && ( bresenhamLines == rhs.bresenhamLines ) && ( smoothLines == rhs.smoothLines ) &&
-             ( stippledRectangularLines == rhs.stippledRectangularLines ) && ( stippledBresenhamLines == rhs.stippledBresenhamLines ) &&
-             ( stippledSmoothLines == rhs.stippledSmoothLines ) && ( vertexAttributeInstanceRateDivisor == rhs.vertexAttributeInstanceRateDivisor ) &&
-             ( vertexAttributeInstanceRateZeroDivisor == rhs.vertexAttributeInstanceRateZeroDivisor ) && ( indexTypeUint8 == rhs.indexTypeUint8 ) &&
-             ( dynamicRenderingLocalRead == rhs.dynamicRenderingLocalRead ) && ( maintenance5 == rhs.maintenance5 ) && ( maintenance6 == rhs.maintenance6 ) &&
-             ( pipelineProtectedAccess == rhs.pipelineProtectedAccess ) && ( pipelineRobustness == rhs.pipelineRobustness ) &&
-             ( hostImageCopy == rhs.hostImageCopy ) && ( pushDescriptor == rhs.pushDescriptor );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVulkan14Features const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                                  = StructureType::ePhysicalDeviceVulkan14Features;
-    void *        pNext                                  = {};
-    Bool32        globalPriorityQuery                    = {};
-    Bool32        shaderSubgroupRotate                   = {};
-    Bool32        shaderSubgroupRotateClustered          = {};
-    Bool32        shaderFloatControls2                   = {};
-    Bool32        shaderExpectAssume                     = {};
-    Bool32        rectangularLines                       = {};
-    Bool32        bresenhamLines                         = {};
-    Bool32        smoothLines                            = {};
-    Bool32        stippledRectangularLines               = {};
-    Bool32        stippledBresenhamLines                 = {};
-    Bool32        stippledSmoothLines                    = {};
-    Bool32        vertexAttributeInstanceRateDivisor     = {};
-    Bool32        vertexAttributeInstanceRateZeroDivisor = {};
-    Bool32        indexTypeUint8                         = {};
-    Bool32        dynamicRenderingLocalRead              = {};
-    Bool32        maintenance5                           = {};
-    Bool32        maintenance6                           = {};
-    Bool32        pipelineProtectedAccess                = {};
-    Bool32        pipelineRobustness                     = {};
-    Bool32        hostImageCopy                          = {};
-    Bool32        pushDescriptor                         = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan14Features>
-  {
-    using Type = PhysicalDeviceVulkan14Features;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan14Features>
-  {
-    using Type = PhysicalDeviceVulkan14Features;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVulkan14Properties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkan14Properties.html
-  struct PhysicalDeviceVulkan14Properties
-  {
-    using NativeType = VkPhysicalDeviceVulkan14Properties;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkan14Properties;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14
-      PhysicalDeviceVulkan14Properties( uint32_t                         lineSubPixelPrecisionBits_                           = {},
-                                        uint32_t                         maxVertexAttribDivisor_                              = {},
-                                        Bool32                           supportsNonZeroFirstInstance_                        = {},
-                                        uint32_t                         maxPushDescriptors_                                  = {},
-                                        Bool32                           dynamicRenderingLocalReadDepthStencilAttachments_    = {},
-                                        Bool32                           dynamicRenderingLocalReadMultisampledAttachments_    = {},
-                                        Bool32                           earlyFragmentMultisampleCoverageAfterSampleCounting_ = {},
-                                        Bool32                           earlyFragmentSampleMaskTestBeforeSampleCounting_     = {},
-                                        Bool32                           depthStencilSwizzleOneSupport_                       = {},
-                                        Bool32                           polygonModePointSize_                                = {},
-                                        Bool32                           nonStrictSinglePixelWideLinesUseParallelogram_       = {},
-                                        Bool32                           nonStrictWideLinesUseParallelogram_                  = {},
-                                        Bool32                           blockTexelViewCompatibleMultipleLayers_              = {},
-                                        uint32_t                         maxCombinedImageSamplerDescriptorCount_              = {},
-                                        Bool32                           fragmentShadingRateClampCombinerInputs_              = {},
-                                        PipelineRobustnessBufferBehavior defaultRobustnessStorageBuffers_  = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                        PipelineRobustnessBufferBehavior defaultRobustnessUniformBuffers_  = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                        PipelineRobustnessBufferBehavior defaultRobustnessVertexInputs_    = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                        PipelineRobustnessImageBehavior  defaultRobustnessImages_          = PipelineRobustnessImageBehavior::eDeviceDefault,
-                                        uint32_t                         copySrcLayoutCount_               = {},
-                                        ImageLayout *                    pCopySrcLayouts_                  = {},
-                                        uint32_t                         copyDstLayoutCount_               = {},
-                                        ImageLayout *                    pCopyDstLayouts_                  = {},
-                                        std::array<uint8_t, VK_UUID_SIZE> const & optimalTilingLayoutUUID_ = {},
-                                        Bool32                                    identicalMemoryTypeRequirements_ = {},
-                                        void *                                    pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , lineSubPixelPrecisionBits{ lineSubPixelPrecisionBits_ }
-      , maxVertexAttribDivisor{ maxVertexAttribDivisor_ }
-      , supportsNonZeroFirstInstance{ supportsNonZeroFirstInstance_ }
-      , maxPushDescriptors{ maxPushDescriptors_ }
-      , dynamicRenderingLocalReadDepthStencilAttachments{ dynamicRenderingLocalReadDepthStencilAttachments_ }
-      , dynamicRenderingLocalReadMultisampledAttachments{ dynamicRenderingLocalReadMultisampledAttachments_ }
-      , earlyFragmentMultisampleCoverageAfterSampleCounting{ earlyFragmentMultisampleCoverageAfterSampleCounting_ }
-      , earlyFragmentSampleMaskTestBeforeSampleCounting{ earlyFragmentSampleMaskTestBeforeSampleCounting_ }
-      , depthStencilSwizzleOneSupport{ depthStencilSwizzleOneSupport_ }
-      , polygonModePointSize{ polygonModePointSize_ }
-      , nonStrictSinglePixelWideLinesUseParallelogram{ nonStrictSinglePixelWideLinesUseParallelogram_ }
-      , nonStrictWideLinesUseParallelogram{ nonStrictWideLinesUseParallelogram_ }
-      , blockTexelViewCompatibleMultipleLayers{ blockTexelViewCompatibleMultipleLayers_ }
-      , maxCombinedImageSamplerDescriptorCount{ maxCombinedImageSamplerDescriptorCount_ }
-      , fragmentShadingRateClampCombinerInputs{ fragmentShadingRateClampCombinerInputs_ }
-      , defaultRobustnessStorageBuffers{ defaultRobustnessStorageBuffers_ }
-      , defaultRobustnessUniformBuffers{ defaultRobustnessUniformBuffers_ }
-      , defaultRobustnessVertexInputs{ defaultRobustnessVertexInputs_ }
-      , defaultRobustnessImages{ defaultRobustnessImages_ }
-      , copySrcLayoutCount{ copySrcLayoutCount_ }
-      , pCopySrcLayouts{ pCopySrcLayouts_ }
-      , copyDstLayoutCount{ copyDstLayoutCount_ }
-      , pCopyDstLayouts{ pCopyDstLayouts_ }
-      , optimalTilingLayoutUUID{ optimalTilingLayoutUUID_ }
-      , identicalMemoryTypeRequirements{ identicalMemoryTypeRequirements_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkan14Properties( PhysicalDeviceVulkan14Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceVulkan14Properties( VkPhysicalDeviceVulkan14Properties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceVulkan14Properties( *reinterpret_cast<PhysicalDeviceVulkan14Properties const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceVulkan14Properties & operator=( PhysicalDeviceVulkan14Properties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceVulkan14Properties & operator=( VkPhysicalDeviceVulkan14Properties const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceVulkan14Properties const *>( &rhs );
-      return *this;
-    }
-
-    operator VkPhysicalDeviceVulkan14Properties const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceVulkan14Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Properties &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceVulkan14Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Properties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkan14Properties *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkan14Properties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkan14Properties *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               uint32_t const &,
-               uint32_t const &,
-               Bool32 const &,
-               uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               Bool32 const &,
-               uint32_t const &,
-               Bool32 const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessImageBehavior const &,
-               uint32_t const &,
-               ImageLayout * const &,
-               uint32_t const &,
-               ImageLayout * const &,
-               ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       lineSubPixelPrecisionBits,
-                       maxVertexAttribDivisor,
-                       supportsNonZeroFirstInstance,
-                       maxPushDescriptors,
-                       dynamicRenderingLocalReadDepthStencilAttachments,
-                       dynamicRenderingLocalReadMultisampledAttachments,
-                       earlyFragmentMultisampleCoverageAfterSampleCounting,
-                       earlyFragmentSampleMaskTestBeforeSampleCounting,
-                       depthStencilSwizzleOneSupport,
-                       polygonModePointSize,
-                       nonStrictSinglePixelWideLinesUseParallelogram,
-                       nonStrictWideLinesUseParallelogram,
-                       blockTexelViewCompatibleMultipleLayers,
-                       maxCombinedImageSamplerDescriptorCount,
-                       fragmentShadingRateClampCombinerInputs,
-                       defaultRobustnessStorageBuffers,
-                       defaultRobustnessUniformBuffers,
-                       defaultRobustnessVertexInputs,
-                       defaultRobustnessImages,
-                       copySrcLayoutCount,
-                       pCopySrcLayouts,
-                       copyDstLayoutCount,
-                       pCopyDstLayouts,
-                       optimalTilingLayoutUUID,
-                       identicalMemoryTypeRequirements );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceVulkan14Properties const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceVulkan14Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( lineSubPixelPrecisionBits == rhs.lineSubPixelPrecisionBits ) &&
-             ( maxVertexAttribDivisor == rhs.maxVertexAttribDivisor ) && ( supportsNonZeroFirstInstance == rhs.supportsNonZeroFirstInstance ) &&
-             ( maxPushDescriptors == rhs.maxPushDescriptors ) &&
-             ( dynamicRenderingLocalReadDepthStencilAttachments == rhs.dynamicRenderingLocalReadDepthStencilAttachments ) &&
-             ( dynamicRenderingLocalReadMultisampledAttachments == rhs.dynamicRenderingLocalReadMultisampledAttachments ) &&
-             ( earlyFragmentMultisampleCoverageAfterSampleCounting == rhs.earlyFragmentMultisampleCoverageAfterSampleCounting ) &&
-             ( earlyFragmentSampleMaskTestBeforeSampleCounting == rhs.earlyFragmentSampleMaskTestBeforeSampleCounting ) &&
-             ( depthStencilSwizzleOneSupport == rhs.depthStencilSwizzleOneSupport ) && ( polygonModePointSize == rhs.polygonModePointSize ) &&
-             ( nonStrictSinglePixelWideLinesUseParallelogram == rhs.nonStrictSinglePixelWideLinesUseParallelogram ) &&
-             ( nonStrictWideLinesUseParallelogram == rhs.nonStrictWideLinesUseParallelogram ) &&
-             ( blockTexelViewCompatibleMultipleLayers == rhs.blockTexelViewCompatibleMultipleLayers ) &&
-             ( maxCombinedImageSamplerDescriptorCount == rhs.maxCombinedImageSamplerDescriptorCount ) &&
-             ( fragmentShadingRateClampCombinerInputs == rhs.fragmentShadingRateClampCombinerInputs ) &&
-             ( defaultRobustnessStorageBuffers == rhs.defaultRobustnessStorageBuffers ) &&
-             ( defaultRobustnessUniformBuffers == rhs.defaultRobustnessUniformBuffers ) &&
-             ( defaultRobustnessVertexInputs == rhs.defaultRobustnessVertexInputs ) && ( defaultRobustnessImages == rhs.defaultRobustnessImages ) &&
-             ( copySrcLayoutCount == rhs.copySrcLayoutCount ) && ( pCopySrcLayouts == rhs.pCopySrcLayouts ) &&
-             ( copyDstLayoutCount == rhs.copyDstLayoutCount ) && ( pCopyDstLayouts == rhs.pCopyDstLayouts ) &&
-             ( optimalTilingLayoutUUID == rhs.optimalTilingLayoutUUID ) && ( identicalMemoryTypeRequirements == rhs.identicalMemoryTypeRequirements );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceVulkan14Properties const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                         sType                                               = StructureType::ePhysicalDeviceVulkan14Properties;
-    void *                                pNext                                               = {};
-    uint32_t                              lineSubPixelPrecisionBits                           = {};
-    uint32_t                              maxVertexAttribDivisor                              = {};
-    Bool32                                supportsNonZeroFirstInstance                        = {};
-    uint32_t                              maxPushDescriptors                                  = {};
-    Bool32                                dynamicRenderingLocalReadDepthStencilAttachments    = {};
-    Bool32                                dynamicRenderingLocalReadMultisampledAttachments    = {};
-    Bool32                                earlyFragmentMultisampleCoverageAfterSampleCounting = {};
-    Bool32                                earlyFragmentSampleMaskTestBeforeSampleCounting     = {};
-    Bool32                                depthStencilSwizzleOneSupport                       = {};
-    Bool32                                polygonModePointSize                                = {};
-    Bool32                                nonStrictSinglePixelWideLinesUseParallelogram       = {};
-    Bool32                                nonStrictWideLinesUseParallelogram                  = {};
-    Bool32                                blockTexelViewCompatibleMultipleLayers              = {};
-    uint32_t                              maxCombinedImageSamplerDescriptorCount              = {};
-    Bool32                                fragmentShadingRateClampCombinerInputs              = {};
-    PipelineRobustnessBufferBehavior      defaultRobustnessStorageBuffers                     = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior      defaultRobustnessUniformBuffers                     = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior      defaultRobustnessVertexInputs                       = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessImageBehavior       defaultRobustnessImages                             = PipelineRobustnessImageBehavior::eDeviceDefault;
-    uint32_t                              copySrcLayoutCount                                  = {};
-    ImageLayout *                         pCopySrcLayouts                                     = {};
-    uint32_t                              copyDstLayoutCount                                  = {};
-    ImageLayout *                         pCopyDstLayouts                                     = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> optimalTilingLayoutUUID                             = {};
-    Bool32                                identicalMemoryTypeRequirements                     = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkan14Properties>
-  {
-    using Type = PhysicalDeviceVulkan14Properties;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceVulkan14Properties>
-  {
-    using Type = PhysicalDeviceVulkan14Properties;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceVulkanMemoryModelFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceVulkanMemoryModelFeatures.html
   struct PhysicalDeviceVulkanMemoryModelFeatures
   {
     using NativeType = VkPhysicalDeviceVulkanMemoryModelFeatures;
@@ -126230,15 +90702,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceVulkanMemoryModelFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkanMemoryModelFeatures( Bool32 vulkanMemoryModel_                             = {},
-                                                                  Bool32 vulkanMemoryModelDeviceScope_                  = {},
-                                                                  Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ = {},
-                                                                  void * pNext_                                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vulkanMemoryModel{ vulkanMemoryModel_ }
-      , vulkanMemoryModelDeviceScope{ vulkanMemoryModelDeviceScope_ }
-      , vulkanMemoryModelAvailabilityVisibilityChains{ vulkanMemoryModelAvailabilityVisibilityChains_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceVulkanMemoryModelFeatures( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModel_                             = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelDeviceScope_                  = {},
+                                                                  VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ = {},
+                                                                  void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vulkanMemoryModel( vulkanMemoryModel_ )
+      , vulkanMemoryModelDeviceScope( vulkanMemoryModelDeviceScope_ )
+      , vulkanMemoryModelAvailabilityVisibilityChains( vulkanMemoryModelAvailabilityVisibilityChains_ )
     {
     }
 
@@ -126250,41 +90722,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceVulkanMemoryModelFeatures & operator=( PhysicalDeviceVulkanMemoryModelFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceVulkanMemoryModelFeatures & operator=( VkPhysicalDeviceVulkanMemoryModelFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceVulkanMemoryModelFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceVulkanMemoryModelFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkanMemoryModelFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkanMemoryModelFeatures & setVulkanMemoryModel( Bool32 vulkanMemoryModel_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkanMemoryModelFeatures &
+      setVulkanMemoryModel( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModel_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModel = vulkanMemoryModel_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkanMemoryModelFeatures &
-      setVulkanMemoryModelDeviceScope( Bool32 vulkanMemoryModelDeviceScope_ ) VULKAN_HPP_NOEXCEPT
+      setVulkanMemoryModelDeviceScope( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelDeviceScope_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModelDeviceScope = vulkanMemoryModelDeviceScope_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceVulkanMemoryModelFeatures &
-      setVulkanMemoryModelAvailabilityVisibilityChains( Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ ) VULKAN_HPP_NOEXCEPT
+      setVulkanMemoryModelAvailabilityVisibilityChains( VULKAN_HPP_NAMESPACE::Bool32 vulkanMemoryModelAvailabilityVisibilityChains_ ) VULKAN_HPP_NOEXCEPT
     {
       vulkanMemoryModelAvailabilityVisibilityChains = vulkanMemoryModelAvailabilityVisibilityChains_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceVulkanMemoryModelFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -126296,18 +90769,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceVulkanMemoryModelFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceVulkanMemoryModelFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceVulkanMemoryModelFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceVulkanMemoryModelFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceVulkanMemoryModelFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vulkanMemoryModel, vulkanMemoryModelDeviceScope, vulkanMemoryModelAvailabilityVisibilityChains );
     }
@@ -126334,21 +90806,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                         = StructureType::ePhysicalDeviceVulkanMemoryModelFeatures;
-    void *        pNext                                         = {};
-    Bool32        vulkanMemoryModel                             = {};
-    Bool32        vulkanMemoryModelDeviceScope                  = {};
-    Bool32        vulkanMemoryModelAvailabilityVisibilityChains = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                         = StructureType::ePhysicalDeviceVulkanMemoryModelFeatures;
+    void *                              pNext                                         = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModel                             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModelDeviceScope                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        vulkanMemoryModelAvailabilityVisibilityChains = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceVulkanMemoryModelFeatures>
-  {
-    using Type = PhysicalDeviceVulkanMemoryModelFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceVulkanMemoryModelFeatures>
   {
@@ -126357,8 +90821,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceVulkanMemoryModelFeaturesKHR = PhysicalDeviceVulkanMemoryModelFeatures;
 
-  // wrapper struct for struct VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR.html
   struct PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR
   {
     using NativeType = VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
@@ -126366,17 +90828,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR( Bool32 workgroupMemoryExplicitLayout_                  = {},
-                                                                                 Bool32 workgroupMemoryExplicitLayoutScalarBlockLayout_ = {},
-                                                                                 Bool32 workgroupMemoryExplicitLayout8BitAccess_        = {},
-                                                                                 Bool32 workgroupMemoryExplicitLayout16BitAccess_       = {},
-                                                                                 void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , workgroupMemoryExplicitLayout{ workgroupMemoryExplicitLayout_ }
-      , workgroupMemoryExplicitLayoutScalarBlockLayout{ workgroupMemoryExplicitLayoutScalarBlockLayout_ }
-      , workgroupMemoryExplicitLayout8BitAccess{ workgroupMemoryExplicitLayout8BitAccess_ }
-      , workgroupMemoryExplicitLayout16BitAccess{ workgroupMemoryExplicitLayout16BitAccess_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR( VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout_                  = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayoutScalarBlockLayout_ = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout8BitAccess_        = {},
+                                                              VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout16BitAccess_       = {},
+                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , workgroupMemoryExplicitLayout( workgroupMemoryExplicitLayout_ )
+      , workgroupMemoryExplicitLayoutScalarBlockLayout( workgroupMemoryExplicitLayoutScalarBlockLayout_ )
+      , workgroupMemoryExplicitLayout8BitAccess( workgroupMemoryExplicitLayout8BitAccess_ )
+      , workgroupMemoryExplicitLayout16BitAccess( workgroupMemoryExplicitLayout16BitAccess_ )
     {
     }
 
@@ -126390,16 +90853,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
       operator=( PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
       operator=( VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -126407,33 +90870,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
-      setWorkgroupMemoryExplicitLayout( Bool32 workgroupMemoryExplicitLayout_ ) VULKAN_HPP_NOEXCEPT
+      setWorkgroupMemoryExplicitLayout( VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       workgroupMemoryExplicitLayout = workgroupMemoryExplicitLayout_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
-      setWorkgroupMemoryExplicitLayoutScalarBlockLayout( Bool32 workgroupMemoryExplicitLayoutScalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
+      setWorkgroupMemoryExplicitLayoutScalarBlockLayout( VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayoutScalarBlockLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       workgroupMemoryExplicitLayoutScalarBlockLayout = workgroupMemoryExplicitLayoutScalarBlockLayout_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
-      setWorkgroupMemoryExplicitLayout8BitAccess( Bool32 workgroupMemoryExplicitLayout8BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setWorkgroupMemoryExplicitLayout8BitAccess( VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout8BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       workgroupMemoryExplicitLayout8BitAccess = workgroupMemoryExplicitLayout8BitAccess_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR &
-      setWorkgroupMemoryExplicitLayout16BitAccess( Bool32 workgroupMemoryExplicitLayout16BitAccess_ ) VULKAN_HPP_NOEXCEPT
+      setWorkgroupMemoryExplicitLayout16BitAccess( VULKAN_HPP_NAMESPACE::Bool32 workgroupMemoryExplicitLayout16BitAccess_ ) VULKAN_HPP_NOEXCEPT
     {
       workgroupMemoryExplicitLayout16BitAccess = workgroupMemoryExplicitLayout16BitAccess_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -126445,18 +90908,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *>( this );
     }
 
-    operator VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *>( this );
-    }
-
-    operator VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
                        pNext,
@@ -126489,30 +90952,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                                          = StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
-    void *        pNext                                          = {};
-    Bool32        workgroupMemoryExplicitLayout                  = {};
-    Bool32        workgroupMemoryExplicitLayoutScalarBlockLayout = {};
-    Bool32        workgroupMemoryExplicitLayout8BitAccess        = {};
-    Bool32        workgroupMemoryExplicitLayout16BitAccess       = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                                          = StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
+    void *                              pNext                                          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        workgroupMemoryExplicitLayout                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32        workgroupMemoryExplicitLayoutScalarBlockLayout = {};
+    VULKAN_HPP_NAMESPACE::Bool32        workgroupMemoryExplicitLayout8BitAccess        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        workgroupMemoryExplicitLayout16BitAccess       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR>
-  {
-    using Type = PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR>
   {
     using Type = PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT.html
   struct PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
@@ -126520,10 +90973,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT( Bool32 ycbcr2plane444Formats_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , ycbcr2plane444Formats{ ycbcr2plane444Formats_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 ycbcr2plane444Formats_ = {},
+                                                                         void *                       pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , ycbcr2plane444Formats( ycbcr2plane444Formats_ )
     {
     }
 
@@ -126536,27 +90990,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT & operator=( PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT & operator=( VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT & setYcbcr2plane444Formats( Bool32 ycbcr2plane444Formats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT &
+      setYcbcr2plane444Formats( VULKAN_HPP_NAMESPACE::Bool32 ycbcr2plane444Formats_ ) VULKAN_HPP_NOEXCEPT
     {
       ycbcr2plane444Formats = ycbcr2plane444Formats_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -126568,18 +91023,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, ycbcr2plane444Formats );
     }
@@ -126604,27 +91054,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
-    void *        pNext                 = {};
-    Bool32        ycbcr2plane444Formats = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
+    void *                              pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        ycbcr2plane444Formats = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT>
-  {
-    using Type = PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT>
   {
     using Type = PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceYcbcrDegammaFeaturesQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceYcbcrDegammaFeaturesQCOM.html
   struct PhysicalDeviceYcbcrDegammaFeaturesQCOM
   {
     using NativeType = VkPhysicalDeviceYcbcrDegammaFeaturesQCOM;
@@ -126632,10 +91072,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcrDegammaFeaturesQCOM( Bool32 ycbcrDegamma_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , ycbcrDegamma{ ycbcrDegamma_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcrDegammaFeaturesQCOM( VULKAN_HPP_NAMESPACE::Bool32 ycbcrDegamma_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , ycbcrDegamma( ycbcrDegamma_ )
     {
     }
 
@@ -126647,27 +91087,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceYcbcrDegammaFeaturesQCOM & operator=( PhysicalDeviceYcbcrDegammaFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceYcbcrDegammaFeaturesQCOM & operator=( VkPhysicalDeviceYcbcrDegammaFeaturesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceYcbcrDegammaFeaturesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcrDegammaFeaturesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrDegammaFeaturesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrDegammaFeaturesQCOM & setYcbcrDegamma( Bool32 ycbcrDegamma_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrDegammaFeaturesQCOM & setYcbcrDegamma( VULKAN_HPP_NAMESPACE::Bool32 ycbcrDegamma_ ) VULKAN_HPP_NOEXCEPT
     {
       ycbcrDegamma = ycbcrDegamma_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceYcbcrDegammaFeaturesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -126679,18 +91119,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceYcbcrDegammaFeaturesQCOM *>( this );
     }
 
-    operator VkPhysicalDeviceYcbcrDegammaFeaturesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceYcbcrDegammaFeaturesQCOM *>( this );
-    }
-
-    operator VkPhysicalDeviceYcbcrDegammaFeaturesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceYcbcrDegammaFeaturesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, ycbcrDegamma );
     }
@@ -126715,27 +91150,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM;
-    void *        pNext        = {};
-    Bool32        ycbcrDegamma = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        ycbcrDegamma = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceYcbcrDegammaFeaturesQCOM>
-  {
-    using Type = PhysicalDeviceYcbcrDegammaFeaturesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM>
   {
     using Type = PhysicalDeviceYcbcrDegammaFeaturesQCOM;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceYcbcrImageArraysFeaturesEXT.html
   struct PhysicalDeviceYcbcrImageArraysFeaturesEXT
   {
     using NativeType = VkPhysicalDeviceYcbcrImageArraysFeaturesEXT;
@@ -126743,10 +91168,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcrImageArraysFeaturesEXT( Bool32 ycbcrImageArrays_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , ycbcrImageArrays{ ycbcrImageArrays_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceYcbcrImageArraysFeaturesEXT( VULKAN_HPP_NAMESPACE::Bool32 ycbcrImageArrays_ = {},
+                                                                    void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , ycbcrImageArrays( ycbcrImageArrays_ )
     {
     }
 
@@ -126758,27 +91184,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PhysicalDeviceYcbcrImageArraysFeaturesEXT & operator=( PhysicalDeviceYcbcrImageArraysFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceYcbcrImageArraysFeaturesEXT & operator=( VkPhysicalDeviceYcbcrImageArraysFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceYcbcrImageArraysFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceYcbcrImageArraysFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrImageArraysFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrImageArraysFeaturesEXT & setYcbcrImageArrays( Bool32 ycbcrImageArrays_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceYcbcrImageArraysFeaturesEXT &
+      setYcbcrImageArrays( VULKAN_HPP_NAMESPACE::Bool32 ycbcrImageArrays_ ) VULKAN_HPP_NOEXCEPT
     {
       ycbcrImageArrays = ycbcrImageArrays_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceYcbcrImageArraysFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -126790,18 +91217,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *>( this );
     }
 
-    operator VkPhysicalDeviceYcbcrImageArraysFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, ycbcrImageArrays );
     }
@@ -126826,142 +91248,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT;
-    void *        pNext            = {};
-    Bool32        ycbcrImageArrays = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT;
+    void *                              pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        ycbcrImageArrays = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceYcbcrImageArraysFeaturesEXT>
-  {
-    using Type = PhysicalDeviceYcbcrImageArraysFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT>
   {
     using Type = PhysicalDeviceYcbcrImageArraysFeaturesEXT;
   };
 
-  // wrapper struct for struct VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT.html
-  struct PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT
-  {
-    using NativeType = VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT( Bool32 zeroInitializeDeviceMemory_ = {},
-                                                                              void * pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , zeroInitializeDeviceMemory{ zeroInitializeDeviceMemory_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT( PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT( VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT( *reinterpret_cast<PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const *>( &rhs ) )
-    {
-    }
-
-    PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT &
-      operator=( PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT & operator=( VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT &
-      setZeroInitializeDeviceMemory( Bool32 zeroInitializeDeviceMemory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      zeroInitializeDeviceMemory = zeroInitializeDeviceMemory_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT *>( this );
-    }
-
-    operator VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, zeroInitializeDeviceMemory );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & ) const = default;
-#else
-    bool operator==( PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( zeroInitializeDeviceMemory == rhs.zeroInitializeDeviceMemory );
-#  endif
-    }
-
-    bool operator!=( PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::ePhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-    void *        pNext                      = {};
-    Bool32        zeroInitializeDeviceMemory = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>
-  {
-    using Type = PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT>
-  {
-    using Type = PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT;
-  };
-
-  // wrapper struct for struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures.html
   struct PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures
   {
     using NativeType = VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
@@ -126969,11 +91266,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures( Bool32 shaderZeroInitializeWorkgroupMemory_ = {},
-                                                                              void * pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shaderZeroInitializeWorkgroupMemory{ shaderZeroInitializeWorkgroupMemory_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures( VULKAN_HPP_NAMESPACE::Bool32 shaderZeroInitializeWorkgroupMemory_ = {},
+                                                                              void *                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shaderZeroInitializeWorkgroupMemory( shaderZeroInitializeWorkgroupMemory_ )
     {
     }
 
@@ -126987,15 +91284,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures &
       operator=( PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures & operator=( VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -127003,12 +91300,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures &
-      setShaderZeroInitializeWorkgroupMemory( Bool32 shaderZeroInitializeWorkgroupMemory_ ) VULKAN_HPP_NOEXCEPT
+      setShaderZeroInitializeWorkgroupMemory( VULKAN_HPP_NAMESPACE::Bool32 shaderZeroInitializeWorkgroupMemory_ ) VULKAN_HPP_NOEXCEPT
     {
       shaderZeroInitializeWorkgroupMemory = shaderZeroInitializeWorkgroupMemory_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -127020,18 +91317,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures *>( this );
     }
 
-    operator VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures *>( this );
-    }
-
-    operator VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shaderZeroInitializeWorkgroupMemory );
     }
@@ -127056,19 +91348,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
-    void *        pNext                               = {};
-    Bool32        shaderZeroInitializeWorkgroupMemory = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
+    void *                              pNext                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32        shaderZeroInitializeWorkgroupMemory = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>
-  {
-    using Type = PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures>
   {
@@ -127077,1005 +91361,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR = PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures;
 
-  // wrapper struct for struct VkPipelineBinaryKeyKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryKeyKHR.html
-  struct PipelineBinaryKeyKHR
-  {
-    using NativeType = VkPipelineBinaryKeyKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineBinaryKeyKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeyKHR( uint32_t                                                         keySize_ = {},
-                                                  std::array<uint8_t, VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR> const & key_     = {},
-                                                  void *                                                           pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , keySize{ keySize_ }
-      , key{ key_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeyKHR( PipelineBinaryKeyKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryKeyKHR( VkPipelineBinaryKeyKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryKeyKHR( *reinterpret_cast<PipelineBinaryKeyKHR const *>( &rhs ) )
-    {
-    }
-
-    PipelineBinaryKeyKHR & operator=( PipelineBinaryKeyKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryKeyKHR & operator=( VkPipelineBinaryKeyKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryKeyKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeyKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeyKHR & setKeySize( uint32_t keySize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      keySize = keySize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeyKHR & setKey( std::array<uint8_t, VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR> key_ ) VULKAN_HPP_NOEXCEPT
-    {
-      key = key_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryKeyKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryKeyKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeyKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryKeyKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeyKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryKeyKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeyKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryKeyKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, ArrayWrapper1D<uint8_t, VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR> const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, keySize, key );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryKeyKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryKeyKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( keySize == rhs.keySize ) && ( key == rhs.key );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryKeyKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                                sType   = StructureType::ePipelineBinaryKeyKHR;
-    void *                                                       pNext   = {};
-    uint32_t                                                     keySize = {};
-    ArrayWrapper1D<uint8_t, VK_MAX_PIPELINE_BINARY_KEY_SIZE_KHR> key     = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryKeyKHR>
-  {
-    using Type = PipelineBinaryKeyKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineBinaryKeyKHR>
-  {
-    using Type = PipelineBinaryKeyKHR;
-  };
-
-  // wrapper struct for struct VkPipelineBinaryDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryDataKHR.html
-  struct PipelineBinaryDataKHR
-  {
-    using NativeType = VkPipelineBinaryDataKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineBinaryDataKHR( size_t dataSize_ = {}, void * pData_ = {} ) VULKAN_HPP_NOEXCEPT
-      : dataSize{ dataSize_ }
-      , pData{ pData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PipelineBinaryDataKHR( PipelineBinaryDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryDataKHR( VkPipelineBinaryDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryDataKHR( *reinterpret_cast<PipelineBinaryDataKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    PipelineBinaryDataKHR( ArrayProxyNoTemporaries<T> const & data_ ) : dataSize( data_.size() * sizeof( T ) ), pData( data_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PipelineBinaryDataKHR & operator=( PipelineBinaryDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryDataKHR & operator=( VkPipelineBinaryDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryDataKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryDataKHR & setDataSize( size_t dataSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataSize = dataSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryDataKHR & setPData( void * pData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pData = pData_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    template <typename T>
-    PipelineBinaryDataKHR & setData( ArrayProxyNoTemporaries<T> const & data_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dataSize = data_.size() * sizeof( T );
-      pData    = data_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryDataKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryDataKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<size_t const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( dataSize, pData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryDataKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryDataKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( dataSize == rhs.dataSize ) && ( pData == rhs.pData );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryDataKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    size_t dataSize = {};
-    void * pData    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryDataKHR>
-  {
-    using Type = PipelineBinaryDataKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineBinaryKeysAndDataKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryKeysAndDataKHR.html
-  struct PipelineBinaryKeysAndDataKHR
-  {
-    using NativeType = VkPipelineBinaryKeysAndDataKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeysAndDataKHR( uint32_t                      binaryCount_         = {},
-                                                          const PipelineBinaryKeyKHR *  pPipelineBinaryKeys_ = {},
-                                                          const PipelineBinaryDataKHR * pPipelineBinaryData_ = {} ) VULKAN_HPP_NOEXCEPT
-      : binaryCount{ binaryCount_ }
-      , pPipelineBinaryKeys{ pPipelineBinaryKeys_ }
-      , pPipelineBinaryData{ pPipelineBinaryData_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeysAndDataKHR( PipelineBinaryKeysAndDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryKeysAndDataKHR( VkPipelineBinaryKeysAndDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryKeysAndDataKHR( *reinterpret_cast<PipelineBinaryKeysAndDataKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryKeysAndDataKHR( ArrayProxyNoTemporaries<const PipelineBinaryKeyKHR> const &  pipelineBinaryKeys_,
-                                  ArrayProxyNoTemporaries<const PipelineBinaryDataKHR> const & pipelineBinaryData_ = {} )
-      : binaryCount( static_cast<uint32_t>( pipelineBinaryKeys_.size() ) )
-      , pPipelineBinaryKeys( pipelineBinaryKeys_.data() )
-      , pPipelineBinaryData( pipelineBinaryData_.data() )
-    {
-#    ifdef VULKAN_HPP_NO_EXCEPTIONS
-      VULKAN_HPP_ASSERT( pipelineBinaryKeys_.size() == pipelineBinaryData_.size() );
-#    else
-      if ( pipelineBinaryKeys_.size() != pipelineBinaryData_.size() )
-      {
-        throw LogicError( VULKAN_HPP_NAMESPACE_STRING
-                          "::PipelineBinaryKeysAndDataKHR::PipelineBinaryKeysAndDataKHR: pipelineBinaryKeys_.size() != pipelineBinaryData_.size()" );
-      }
-#    endif /*VULKAN_HPP_NO_EXCEPTIONS*/
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PipelineBinaryKeysAndDataKHR & operator=( PipelineBinaryKeysAndDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryKeysAndDataKHR & operator=( VkPipelineBinaryKeysAndDataKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryKeysAndDataKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeysAndDataKHR & setBinaryCount( uint32_t binaryCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binaryCount = binaryCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeysAndDataKHR & setPPipelineBinaryKeys( const PipelineBinaryKeyKHR * pPipelineBinaryKeys_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineBinaryKeys = pPipelineBinaryKeys_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryKeysAndDataKHR & setPipelineBinaryKeys( ArrayProxyNoTemporaries<const PipelineBinaryKeyKHR> const & pipelineBinaryKeys_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binaryCount         = static_cast<uint32_t>( pipelineBinaryKeys_.size() );
-      pPipelineBinaryKeys = pipelineBinaryKeys_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryKeysAndDataKHR & setPPipelineBinaryData( const PipelineBinaryDataKHR * pPipelineBinaryData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineBinaryData = pPipelineBinaryData_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryKeysAndDataKHR & setPipelineBinaryData( ArrayProxyNoTemporaries<const PipelineBinaryDataKHR> const & pipelineBinaryData_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binaryCount         = static_cast<uint32_t>( pipelineBinaryData_.size() );
-      pPipelineBinaryData = pipelineBinaryData_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryKeysAndDataKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryKeysAndDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeysAndDataKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryKeysAndDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeysAndDataKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryKeysAndDataKHR *>( this );
-    }
-
-    operator VkPipelineBinaryKeysAndDataKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryKeysAndDataKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, const PipelineBinaryKeyKHR * const &, const PipelineBinaryDataKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( binaryCount, pPipelineBinaryKeys, pPipelineBinaryData );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryKeysAndDataKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryKeysAndDataKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( binaryCount == rhs.binaryCount ) && ( pPipelineBinaryKeys == rhs.pPipelineBinaryKeys ) && ( pPipelineBinaryData == rhs.pPipelineBinaryData );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryKeysAndDataKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t                      binaryCount         = {};
-    const PipelineBinaryKeyKHR *  pPipelineBinaryKeys = {};
-    const PipelineBinaryDataKHR * pPipelineBinaryData = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryKeysAndDataKHR>
-  {
-    using Type = PipelineBinaryKeysAndDataKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateInfoKHR.html
-  struct PipelineCreateInfoKHR
-  {
-    using NativeType = VkPipelineCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCreateInfoKHR( void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR PipelineCreateInfoKHR( PipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineCreateInfoKHR( VkPipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineCreateInfoKHR( *reinterpret_cast<PipelineCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    PipelineCreateInfoKHR & operator=( PipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineCreateInfoKHR & operator=( VkPipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineCreateInfoKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineCreateInfoKHR const & ) const = default;
-#else
-    bool operator==( PipelineCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( PipelineCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::ePipelineCreateInfoKHR;
-    void *        pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCreateInfoKHR>
-  {
-    using Type = PipelineCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineCreateInfoKHR>
-  {
-    using Type = PipelineCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkPipelineBinaryCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryCreateInfoKHR.html
-  struct PipelineBinaryCreateInfoKHR
-  {
-    using NativeType = VkPipelineBinaryCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineBinaryCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR( const PipelineBinaryKeysAndDataKHR * pKeysAndDataInfo_    = {},
-                                                         Pipeline                             pipeline_            = {},
-                                                         const PipelineCreateInfoKHR *        pPipelineCreateInfo_ = {},
-                                                         const void *                         pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pKeysAndDataInfo{ pKeysAndDataInfo_ }
-      , pipeline{ pipeline_ }
-      , pPipelineCreateInfo{ pPipelineCreateInfo_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR( PipelineBinaryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryCreateInfoKHR( VkPipelineBinaryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryCreateInfoKHR( *reinterpret_cast<PipelineBinaryCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    PipelineBinaryCreateInfoKHR & operator=( PipelineBinaryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryCreateInfoKHR & operator=( VkPipelineBinaryCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR & setPKeysAndDataInfo( const PipelineBinaryKeysAndDataKHR * pKeysAndDataInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pKeysAndDataInfo = pKeysAndDataInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipeline = pipeline_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryCreateInfoKHR & setPPipelineCreateInfo( const PipelineCreateInfoKHR * pPipelineCreateInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineCreateInfo = pPipelineCreateInfo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, const PipelineBinaryKeysAndDataKHR * const &, Pipeline const &, const PipelineCreateInfoKHR * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pKeysAndDataInfo, pipeline, pPipelineCreateInfo );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryCreateInfoKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pKeysAndDataInfo == rhs.pKeysAndDataInfo ) && ( pipeline == rhs.pipeline ) &&
-             ( pPipelineCreateInfo == rhs.pPipelineCreateInfo );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                        sType               = StructureType::ePipelineBinaryCreateInfoKHR;
-    const void *                         pNext               = {};
-    const PipelineBinaryKeysAndDataKHR * pKeysAndDataInfo    = {};
-    Pipeline                             pipeline            = {};
-    const PipelineCreateInfoKHR *        pPipelineCreateInfo = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryCreateInfoKHR>
-  {
-    using Type = PipelineBinaryCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineBinaryCreateInfoKHR>
-  {
-    using Type = PipelineBinaryCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkPipelineBinaryDataInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryDataInfoKHR.html
-  struct PipelineBinaryDataInfoKHR
-  {
-    using NativeType = VkPipelineBinaryDataInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineBinaryDataInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineBinaryDataInfoKHR( PipelineBinaryKHR pipelineBinary_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBinary{ pipelineBinary_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PipelineBinaryDataInfoKHR( PipelineBinaryDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryDataInfoKHR( VkPipelineBinaryDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryDataInfoKHR( *reinterpret_cast<PipelineBinaryDataInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    PipelineBinaryDataInfoKHR & operator=( PipelineBinaryDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryDataInfoKHR & operator=( VkPipelineBinaryDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryDataInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryDataInfoKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryDataInfoKHR & setPipelineBinary( PipelineBinaryKHR pipelineBinary_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineBinary = pipelineBinary_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryDataInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryDataInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryDataInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryDataInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryDataInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PipelineBinaryKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipelineBinary );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryDataInfoKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryDataInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineBinary == rhs.pipelineBinary );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryDataInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType     sType          = StructureType::ePipelineBinaryDataInfoKHR;
-    void *            pNext          = {};
-    PipelineBinaryKHR pipelineBinary = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryDataInfoKHR>
-  {
-    using Type = PipelineBinaryDataInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineBinaryDataInfoKHR>
-  {
-    using Type = PipelineBinaryDataInfoKHR;
-  };
-
-  // wrapper struct for struct VkPipelineBinaryHandlesInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryHandlesInfoKHR.html
-  struct PipelineBinaryHandlesInfoKHR
-  {
-    using NativeType = VkPipelineBinaryHandlesInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineBinaryHandlesInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineBinaryHandlesInfoKHR( uint32_t            pipelineBinaryCount_ = {},
-                                                       PipelineBinaryKHR * pPipelineBinaries_   = {},
-                                                       const void *        pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBinaryCount{ pipelineBinaryCount_ }
-      , pPipelineBinaries{ pPipelineBinaries_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PipelineBinaryHandlesInfoKHR( PipelineBinaryHandlesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryHandlesInfoKHR( VkPipelineBinaryHandlesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryHandlesInfoKHR( *reinterpret_cast<PipelineBinaryHandlesInfoKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryHandlesInfoKHR( ArrayProxyNoTemporaries<PipelineBinaryKHR> const & pipelineBinaries_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), pipelineBinaryCount( static_cast<uint32_t>( pipelineBinaries_.size() ) ), pPipelineBinaries( pipelineBinaries_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PipelineBinaryHandlesInfoKHR & operator=( PipelineBinaryHandlesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryHandlesInfoKHR & operator=( VkPipelineBinaryHandlesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryHandlesInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryHandlesInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryHandlesInfoKHR & setPipelineBinaryCount( uint32_t pipelineBinaryCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineBinaryCount = pipelineBinaryCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryHandlesInfoKHR & setPPipelineBinaries( PipelineBinaryKHR * pPipelineBinaries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineBinaries = pPipelineBinaries_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryHandlesInfoKHR & setPipelineBinaries( ArrayProxyNoTemporaries<PipelineBinaryKHR> const & pipelineBinaries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipelineBinaryCount = static_cast<uint32_t>( pipelineBinaries_.size() );
-      pPipelineBinaries   = pipelineBinaries_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryHandlesInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryHandlesInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryHandlesInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryHandlesInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryHandlesInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryHandlesInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryHandlesInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, PipelineBinaryKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipelineBinaryCount, pPipelineBinaries );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryHandlesInfoKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryHandlesInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipelineBinaryCount == rhs.pipelineBinaryCount ) &&
-             ( pPipelineBinaries == rhs.pPipelineBinaries );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryHandlesInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType       sType               = StructureType::ePipelineBinaryHandlesInfoKHR;
-    const void *        pNext               = {};
-    uint32_t            pipelineBinaryCount = {};
-    PipelineBinaryKHR * pPipelineBinaries   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryHandlesInfoKHR>
-  {
-    using Type = PipelineBinaryHandlesInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineBinaryHandlesInfoKHR>
-  {
-    using Type = PipelineBinaryHandlesInfoKHR;
-  };
-
-  // wrapper struct for struct VkPipelineBinaryInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineBinaryInfoKHR.html
-  struct PipelineBinaryInfoKHR
-  {
-    using NativeType = VkPipelineBinaryInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineBinaryInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PipelineBinaryInfoKHR( uint32_t binaryCount_ = {}, const PipelineBinaryKHR * pPipelineBinaries_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , binaryCount{ binaryCount_ }
-      , pPipelineBinaries{ pPipelineBinaries_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PipelineBinaryInfoKHR( PipelineBinaryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineBinaryInfoKHR( VkPipelineBinaryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineBinaryInfoKHR( *reinterpret_cast<PipelineBinaryInfoKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryInfoKHR( ArrayProxyNoTemporaries<const PipelineBinaryKHR> const & pipelineBinaries_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), binaryCount( static_cast<uint32_t>( pipelineBinaries_.size() ) ), pPipelineBinaries( pipelineBinaries_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PipelineBinaryInfoKHR & operator=( PipelineBinaryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineBinaryInfoKHR & operator=( VkPipelineBinaryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineBinaryInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryInfoKHR & setBinaryCount( uint32_t binaryCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binaryCount = binaryCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineBinaryInfoKHR & setPPipelineBinaries( const PipelineBinaryKHR * pPipelineBinaries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPipelineBinaries = pPipelineBinaries_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineBinaryInfoKHR & setPipelineBinaries( ArrayProxyNoTemporaries<const PipelineBinaryKHR> const & pipelineBinaries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      binaryCount       = static_cast<uint32_t>( pipelineBinaries_.size() );
-      pPipelineBinaries = pipelineBinaries_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineBinaryInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineBinaryInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineBinaryInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineBinaryInfoKHR *>( this );
-    }
-
-    operator VkPipelineBinaryInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineBinaryInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PipelineBinaryKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, binaryCount, pPipelineBinaries );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineBinaryInfoKHR const & ) const = default;
-#else
-    bool operator==( PipelineBinaryInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( binaryCount == rhs.binaryCount ) && ( pPipelineBinaries == rhs.pPipelineBinaries );
-#  endif
-    }
-
-    bool operator!=( PipelineBinaryInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType             sType             = StructureType::ePipelineBinaryInfoKHR;
-    const void *              pNext             = {};
-    uint32_t                  binaryCount       = {};
-    const PipelineBinaryKHR * pPipelineBinaries = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineBinaryInfoKHR>
-  {
-    using Type = PipelineBinaryInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineBinaryInfoKHR>
-  {
-    using Type = PipelineBinaryInfoKHR;
-  };
-
-  // wrapper struct for struct VkPipelineCacheCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheCreateInfo.html
   struct PipelineCacheCreateInfo
   {
     using NativeType = VkPipelineCacheCreateInfo;
@@ -128083,15 +91368,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCacheCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCacheCreateInfo( PipelineCacheCreateFlags flags_           = {},
-                                                  size_t                   initialDataSize_ = {},
-                                                  const void *             pInitialData_    = {},
-                                                  const void *             pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , initialDataSize{ initialDataSize_ }
-      , pInitialData{ pInitialData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCacheCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCacheCreateFlags flags_           = {},
+                                                  size_t                                         initialDataSize_ = {},
+                                                  const void *                                   pInitialData_    = {},
+                                                  const void *                                   pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , initialDataSize( initialDataSize_ )
+      , pInitialData( pInitialData_ )
     {
     }
 
@@ -128104,29 +91389,31 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    PipelineCacheCreateInfo( PipelineCacheCreateFlags flags_, ArrayProxyNoTemporaries<const T> const & initialData_, const void * pNext_ = nullptr )
+    PipelineCacheCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCacheCreateFlags                 flags_,
+                             VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & initialData_,
+                             const void *                                                   pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), initialDataSize( initialData_.size() * sizeof( T ) ), pInitialData( initialData_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineCacheCreateInfo & operator=( PipelineCacheCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCacheCreateInfo & operator=( VkPipelineCacheCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCacheCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCacheCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCacheCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheCreateInfo & setFlags( PipelineCacheCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCacheCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineCacheCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -128146,14 +91433,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    PipelineCacheCreateInfo & setInitialData( ArrayProxyNoTemporaries<const T> const & initialData_ ) VULKAN_HPP_NOEXCEPT
+    PipelineCacheCreateInfo & setInitialData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & initialData_ ) VULKAN_HPP_NOEXCEPT
     {
       initialDataSize = initialData_.size() * sizeof( T );
       pInitialData    = initialData_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCacheCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128165,18 +91452,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCacheCreateInfo *>( this );
     }
 
-    operator VkPipelineCacheCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCacheCreateInfo *>( this );
-    }
-
-    operator VkPipelineCacheCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCacheCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCacheCreateFlags const &, size_t const &, const void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineCacheCreateFlags const &,
+               size_t const &,
+               const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, initialDataSize, pInitialData );
@@ -128203,181 +91488,35 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType           = StructureType::ePipelineCacheCreateInfo;
-    const void *             pNext           = {};
-    PipelineCacheCreateFlags flags           = {};
-    size_t                   initialDataSize = {};
-    const void *             pInitialData    = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType           = StructureType::ePipelineCacheCreateInfo;
+    const void *                                   pNext           = {};
+    VULKAN_HPP_NAMESPACE::PipelineCacheCreateFlags flags           = {};
+    size_t                                         initialDataSize = {};
+    const void *                                   pInitialData    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCacheCreateInfo>
-  {
-    using Type = PipelineCacheCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCacheCreateInfo>
   {
     using Type = PipelineCacheCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelineCacheHeaderVersionDataGraphQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheHeaderVersionDataGraphQCOM.html
-  struct PipelineCacheHeaderVersionDataGraphQCOM
-  {
-    using NativeType = VkPipelineCacheHeaderVersionDataGraphQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM(
-      uint32_t                                                                        headerSize_       = {},
-      PipelineCacheHeaderVersion                                                      headerVersion_    = PipelineCacheHeaderVersion::eOne,
-      DataGraphModelCacheTypeQCOM                                                     cacheType_        = DataGraphModelCacheTypeQCOM::eGenericBinary,
-      uint32_t                                                                        cacheVersion_     = {},
-      std::array<uint32_t, VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM> const & toolchainVersion_ = {} ) VULKAN_HPP_NOEXCEPT
-      : headerSize{ headerSize_ }
-      , headerVersion{ headerVersion_ }
-      , cacheType{ cacheType_ }
-      , cacheVersion{ cacheVersion_ }
-      , toolchainVersion{ toolchainVersion_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM( PipelineCacheHeaderVersionDataGraphQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineCacheHeaderVersionDataGraphQCOM( VkPipelineCacheHeaderVersionDataGraphQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineCacheHeaderVersionDataGraphQCOM( *reinterpret_cast<PipelineCacheHeaderVersionDataGraphQCOM const *>( &rhs ) )
-    {
-    }
-
-    PipelineCacheHeaderVersionDataGraphQCOM & operator=( PipelineCacheHeaderVersionDataGraphQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineCacheHeaderVersionDataGraphQCOM & operator=( VkPipelineCacheHeaderVersionDataGraphQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineCacheHeaderVersionDataGraphQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM & setHeaderSize( uint32_t headerSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      headerSize = headerSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM & setHeaderVersion( PipelineCacheHeaderVersion headerVersion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      headerVersion = headerVersion_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM & setCacheType( DataGraphModelCacheTypeQCOM cacheType_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cacheType = cacheType_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM & setCacheVersion( uint32_t cacheVersion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      cacheVersion = cacheVersion_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionDataGraphQCOM &
-      setToolchainVersion( std::array<uint32_t, VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM> toolchainVersion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      toolchainVersion = toolchainVersion_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineCacheHeaderVersionDataGraphQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineCacheHeaderVersionDataGraphQCOM *>( this );
-    }
-
-    operator VkPipelineCacheHeaderVersionDataGraphQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineCacheHeaderVersionDataGraphQCOM *>( this );
-    }
-
-    operator VkPipelineCacheHeaderVersionDataGraphQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCacheHeaderVersionDataGraphQCOM *>( this );
-    }
-
-    operator VkPipelineCacheHeaderVersionDataGraphQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCacheHeaderVersionDataGraphQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &,
-               PipelineCacheHeaderVersion const &,
-               DataGraphModelCacheTypeQCOM const &,
-               uint32_t const &,
-               ArrayWrapper1D<uint32_t, VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM> const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( headerSize, headerVersion, cacheType, cacheVersion, toolchainVersion );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineCacheHeaderVersionDataGraphQCOM const & ) const = default;
-#else
-    bool operator==( PipelineCacheHeaderVersionDataGraphQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( headerSize == rhs.headerSize ) && ( headerVersion == rhs.headerVersion ) && ( cacheType == rhs.cacheType ) &&
-             ( cacheVersion == rhs.cacheVersion ) && ( toolchainVersion == rhs.toolchainVersion );
-#  endif
-    }
-
-    bool operator!=( PipelineCacheHeaderVersionDataGraphQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t                                                                    headerSize       = {};
-    PipelineCacheHeaderVersion                                                  headerVersion    = PipelineCacheHeaderVersion::eOne;
-    DataGraphModelCacheTypeQCOM                                                 cacheType        = DataGraphModelCacheTypeQCOM::eGenericBinary;
-    uint32_t                                                                    cacheVersion     = {};
-    ArrayWrapper1D<uint32_t, VK_DATA_GRAPH_MODEL_TOOLCHAIN_VERSION_LENGTH_QCOM> toolchainVersion = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCacheHeaderVersionDataGraphQCOM>
-  {
-    using Type = PipelineCacheHeaderVersionDataGraphQCOM;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineCacheHeaderVersionOne, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCacheHeaderVersionOne.html
   struct PipelineCacheHeaderVersionOne
   {
     using NativeType = VkPipelineCacheHeaderVersionOne;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionOne( uint32_t                                  headerSize_        = {},
-                                                           PipelineCacheHeaderVersion                headerVersion_     = PipelineCacheHeaderVersion::eOne,
-                                                           uint32_t                                  vendorID_          = {},
-                                                           uint32_t                                  deviceID_          = {},
-                                                           std::array<uint8_t, VK_UUID_SIZE> const & pipelineCacheUUID_ = {} ) VULKAN_HPP_NOEXCEPT
-      : headerSize{ headerSize_ }
-      , headerVersion{ headerVersion_ }
-      , vendorID{ vendorID_ }
-      , deviceID{ deviceID_ }
-      , pipelineCacheUUID{ pipelineCacheUUID_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      PipelineCacheHeaderVersionOne( uint32_t                                         headerSize_    = {},
+                                     VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion headerVersion_ = VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion::eOne,
+                                     uint32_t                                         vendorID_      = {},
+                                     uint32_t                                         deviceID_      = {},
+                                     std::array<uint8_t, VK_UUID_SIZE> const &        pipelineCacheUUID_ = {} ) VULKAN_HPP_NOEXCEPT
+      : headerSize( headerSize_ )
+      , headerVersion( headerVersion_ )
+      , vendorID( vendorID_ )
+      , deviceID( deviceID_ )
+      , pipelineCacheUUID( pipelineCacheUUID_ )
     {
     }
 
@@ -128389,22 +91528,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineCacheHeaderVersionOne & operator=( PipelineCacheHeaderVersionOne const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCacheHeaderVersionOne & operator=( VkPipelineCacheHeaderVersionOne const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCacheHeaderVersionOne const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersionOne const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionOne & setHeaderSize( uint32_t headerSize_ ) VULKAN_HPP_NOEXCEPT
     {
       headerSize = headerSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionOne & setHeaderVersion( PipelineCacheHeaderVersion headerVersion_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCacheHeaderVersionOne &
+      setHeaderVersion( VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion headerVersion_ ) VULKAN_HPP_NOEXCEPT
     {
       headerVersion = headerVersion_;
       return *this;
@@ -128427,7 +91567,7 @@ namespace VULKAN_HPP_NAMESPACE
       pipelineCacheUUID = pipelineCacheUUID_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCacheHeaderVersionOne const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128439,18 +91579,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCacheHeaderVersionOne *>( this );
     }
 
-    operator VkPipelineCacheHeaderVersionOne const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCacheHeaderVersionOne *>( this );
-    }
-
-    operator VkPipelineCacheHeaderVersionOne *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCacheHeaderVersionOne *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, PipelineCacheHeaderVersion const &, uint32_t const &, uint32_t const &, ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &,
+               VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( headerSize, headerVersion, vendorID, deviceID, pipelineCacheUUID );
@@ -128477,23 +91615,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                              headerSize        = {};
-    PipelineCacheHeaderVersion            headerVersion     = PipelineCacheHeaderVersion::eOne;
-    uint32_t                              vendorID          = {};
-    uint32_t                              deviceID          = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> pipelineCacheUUID = {};
+    uint32_t                                                    headerSize        = {};
+    VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion            headerVersion     = VULKAN_HPP_NAMESPACE::PipelineCacheHeaderVersion::eOne;
+    uint32_t                                                    vendorID          = {};
+    uint32_t                                                    deviceID          = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> pipelineCacheUUID = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCacheHeaderVersionOne>
-  {
-    using Type = PipelineCacheHeaderVersionOne;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineColorBlendAdvancedStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorBlendAdvancedStateCreateInfoEXT.html
   struct PipelineColorBlendAdvancedStateCreateInfoEXT
   {
     using NativeType = VkPipelineColorBlendAdvancedStateCreateInfoEXT;
@@ -128501,15 +91629,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineColorBlendAdvancedStateCreateInfoEXT( Bool32          srcPremultiplied_ = {},
-                                                                       Bool32          dstPremultiplied_ = {},
-                                                                       BlendOverlapEXT blendOverlap_     = BlendOverlapEXT::eUncorrelated,
-                                                                       const void *    pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcPremultiplied{ srcPremultiplied_ }
-      , dstPremultiplied{ dstPremultiplied_ }
-      , blendOverlap{ blendOverlap_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PipelineColorBlendAdvancedStateCreateInfoEXT( VULKAN_HPP_NAMESPACE::Bool32          srcPremultiplied_ = {},
+                                                    VULKAN_HPP_NAMESPACE::Bool32          dstPremultiplied_ = {},
+                                                    VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap_ = VULKAN_HPP_NAMESPACE::BlendOverlapEXT::eUncorrelated,
+                                                    const void *                          pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcPremultiplied( srcPremultiplied_ )
+      , dstPremultiplied( dstPremultiplied_ )
+      , blendOverlap( blendOverlap_ )
     {
     }
 
@@ -128521,39 +91650,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineColorBlendAdvancedStateCreateInfoEXT & operator=( PipelineColorBlendAdvancedStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineColorBlendAdvancedStateCreateInfoEXT & operator=( VkPipelineColorBlendAdvancedStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineColorBlendAdvancedStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineColorBlendAdvancedStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT & setSrcPremultiplied( Bool32 srcPremultiplied_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT &
+      setSrcPremultiplied( VULKAN_HPP_NAMESPACE::Bool32 srcPremultiplied_ ) VULKAN_HPP_NOEXCEPT
     {
       srcPremultiplied = srcPremultiplied_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT & setDstPremultiplied( Bool32 dstPremultiplied_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT &
+      setDstPremultiplied( VULKAN_HPP_NAMESPACE::Bool32 dstPremultiplied_ ) VULKAN_HPP_NOEXCEPT
     {
       dstPremultiplied = dstPremultiplied_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT & setBlendOverlap( BlendOverlapEXT blendOverlap_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorBlendAdvancedStateCreateInfoEXT &
+      setBlendOverlap( VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap_ ) VULKAN_HPP_NOEXCEPT
     {
       blendOverlap = blendOverlap_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineColorBlendAdvancedStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128565,18 +91697,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineColorBlendAdvancedStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineColorBlendAdvancedStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineColorBlendAdvancedStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineColorBlendAdvancedStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineColorBlendAdvancedStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, Bool32 const &, BlendOverlapEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::BlendOverlapEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcPremultiplied, dstPremultiplied, blendOverlap );
     }
@@ -128602,29 +91733,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType            = StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT;
-    const void *    pNext            = {};
-    Bool32          srcPremultiplied = {};
-    Bool32          dstPremultiplied = {};
-    BlendOverlapEXT blendOverlap     = BlendOverlapEXT::eUncorrelated;
+    VULKAN_HPP_NAMESPACE::StructureType   sType            = StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT;
+    const void *                          pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32          srcPremultiplied = {};
+    VULKAN_HPP_NAMESPACE::Bool32          dstPremultiplied = {};
+    VULKAN_HPP_NAMESPACE::BlendOverlapEXT blendOverlap     = VULKAN_HPP_NAMESPACE::BlendOverlapEXT::eUncorrelated;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineColorBlendAdvancedStateCreateInfoEXT>
-  {
-    using Type = PipelineColorBlendAdvancedStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT>
   {
     using Type = PipelineColorBlendAdvancedStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineColorWriteCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineColorWriteCreateInfoEXT.html
   struct PipelineColorWriteCreateInfoEXT
   {
     using NativeType = VkPipelineColorWriteCreateInfoEXT;
@@ -128632,13 +91753,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineColorWriteCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineColorWriteCreateInfoEXT( uint32_t       attachmentCount_    = {},
-                                                          const Bool32 * pColorWriteEnables_ = {},
-                                                          const void *   pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentCount{ attachmentCount_ }
-      , pColorWriteEnables{ pColorWriteEnables_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineColorWriteCreateInfoEXT( uint32_t                             attachmentCount_    = {},
+                                                          const VULKAN_HPP_NAMESPACE::Bool32 * pColorWriteEnables_ = {},
+                                                          const void *                         pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentCount( attachmentCount_ )
+      , pColorWriteEnables( pColorWriteEnables_ )
     {
     }
 
@@ -128650,22 +91771,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineColorWriteCreateInfoEXT( ArrayProxyNoTemporaries<const Bool32> const & colorWriteEnables_, const void * pNext_ = nullptr )
+    PipelineColorWriteCreateInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables_,
+                                     const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ ), attachmentCount( static_cast<uint32_t>( colorWriteEnables_.size() ) ), pColorWriteEnables( colorWriteEnables_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineColorWriteCreateInfoEXT & operator=( PipelineColorWriteCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineColorWriteCreateInfoEXT & operator=( VkPipelineColorWriteCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineColorWriteCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineColorWriteCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineColorWriteCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -128678,21 +91800,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineColorWriteCreateInfoEXT & setPColorWriteEnables( const Bool32 * pColorWriteEnables_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineColorWriteCreateInfoEXT &
+      setPColorWriteEnables( const VULKAN_HPP_NAMESPACE::Bool32 * pColorWriteEnables_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorWriteEnables = pColorWriteEnables_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineColorWriteCreateInfoEXT & setColorWriteEnables( ArrayProxyNoTemporaries<const Bool32> const & colorWriteEnables_ ) VULKAN_HPP_NOEXCEPT
+    PipelineColorWriteCreateInfoEXT &
+      setColorWriteEnables( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Bool32> const & colorWriteEnables_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount    = static_cast<uint32_t>( colorWriteEnables_.size() );
       pColorWriteEnables = colorWriteEnables_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineColorWriteCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128704,18 +91828,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineColorWriteCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineColorWriteCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineColorWriteCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineColorWriteCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineColorWriteCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Bool32 * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Bool32 * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachmentCount, pColorWriteEnables );
     }
@@ -128740,28 +91859,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType              = StructureType::ePipelineColorWriteCreateInfoEXT;
-    const void *   pNext              = {};
-    uint32_t       attachmentCount    = {};
-    const Bool32 * pColorWriteEnables = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType              = StructureType::ePipelineColorWriteCreateInfoEXT;
+    const void *                         pNext              = {};
+    uint32_t                             attachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::Bool32 * pColorWriteEnables = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineColorWriteCreateInfoEXT>
-  {
-    using Type = PipelineColorWriteCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineColorWriteCreateInfoEXT>
   {
     using Type = PipelineColorWriteCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineCompilerControlCreateInfoAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCompilerControlCreateInfoAMD.html
   struct PipelineCompilerControlCreateInfoAMD
   {
     using NativeType = VkPipelineCompilerControlCreateInfoAMD;
@@ -128769,11 +91878,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCompilerControlCreateInfoAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCompilerControlCreateInfoAMD( PipelineCompilerControlFlagsAMD compilerControlFlags_ = {},
-                                                               const void *                    pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , compilerControlFlags{ compilerControlFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCompilerControlCreateInfoAMD( VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagsAMD compilerControlFlags_ = {},
+                                                               const void *                                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , compilerControlFlags( compilerControlFlags_ )
     {
     }
 
@@ -128785,15 +91894,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineCompilerControlCreateInfoAMD & operator=( PipelineCompilerControlCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCompilerControlCreateInfoAMD & operator=( VkPipelineCompilerControlCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCompilerControlCreateInfoAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCompilerControlCreateInfoAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCompilerControlCreateInfoAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -128801,12 +91910,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCompilerControlCreateInfoAMD &
-      setCompilerControlFlags( PipelineCompilerControlFlagsAMD compilerControlFlags_ ) VULKAN_HPP_NOEXCEPT
+      setCompilerControlFlags( VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagsAMD compilerControlFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       compilerControlFlags = compilerControlFlags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCompilerControlCreateInfoAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128818,18 +91927,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCompilerControlCreateInfoAMD *>( this );
     }
 
-    operator VkPipelineCompilerControlCreateInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCompilerControlCreateInfoAMD *>( this );
-    }
-
-    operator VkPipelineCompilerControlCreateInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCompilerControlCreateInfoAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCompilerControlFlagsAMD const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagsAMD const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, compilerControlFlags );
     }
@@ -128854,27 +91958,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                = StructureType::ePipelineCompilerControlCreateInfoAMD;
-    const void *                    pNext                = {};
-    PipelineCompilerControlFlagsAMD compilerControlFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                = StructureType::ePipelineCompilerControlCreateInfoAMD;
+    const void *                                          pNext                = {};
+    VULKAN_HPP_NAMESPACE::PipelineCompilerControlFlagsAMD compilerControlFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCompilerControlCreateInfoAMD>
-  {
-    using Type = PipelineCompilerControlCreateInfoAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCompilerControlCreateInfoAMD>
   {
     using Type = PipelineCompilerControlCreateInfoAMD;
   };
 
-  // wrapper struct for struct VkPipelineCoverageModulationStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageModulationStateCreateInfoNV.html
   struct PipelineCoverageModulationStateCreateInfoNV
   {
     using NativeType = VkPipelineCoverageModulationStateCreateInfoNV;
@@ -128882,19 +91976,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCoverageModulationStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCoverageModulationStateCreateInfoNV( PipelineCoverageModulationStateCreateFlagsNV flags_     = {},
-                                                                      CoverageModulationModeNV coverageModulationMode_        = CoverageModulationModeNV::eNone,
-                                                                      Bool32                   coverageModulationTableEnable_ = {},
-                                                                      uint32_t                 coverageModulationTableCount_  = {},
-                                                                      const float *            pCoverageModulationTable_      = {},
-                                                                      const void *             pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , coverageModulationMode{ coverageModulationMode_ }
-      , coverageModulationTableEnable{ coverageModulationTableEnable_ }
-      , coverageModulationTableCount{ coverageModulationTableCount_ }
-      , pCoverageModulationTable{ pCoverageModulationTable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCoverageModulationStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateFlagsNV flags_                         = {},
+      VULKAN_HPP_NAMESPACE::CoverageModulationModeNV                     coverageModulationMode_        = VULKAN_HPP_NAMESPACE::CoverageModulationModeNV::eNone,
+      VULKAN_HPP_NAMESPACE::Bool32                                       coverageModulationTableEnable_ = {},
+      uint32_t                                                           coverageModulationTableCount_  = {},
+      const float *                                                      pCoverageModulationTable_      = {},
+      const void *                                                       pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , coverageModulationMode( coverageModulationMode_ )
+      , coverageModulationTableEnable( coverageModulationTableEnable_ )
+      , coverageModulationTableCount( coverageModulationTableCount_ )
+      , pCoverageModulationTable( pCoverageModulationTable_ )
     {
     }
 
@@ -128906,11 +92001,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineCoverageModulationStateCreateInfoNV( PipelineCoverageModulationStateCreateFlagsNV flags_,
-                                                 CoverageModulationModeNV                     coverageModulationMode_,
-                                                 Bool32                                       coverageModulationTableEnable_,
-                                                 ArrayProxyNoTemporaries<const float> const & coverageModulationTable_,
-                                                 const void *                                 pNext_ = nullptr )
+    PipelineCoverageModulationStateCreateInfoNV( VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateFlagsNV flags_,
+                                                 VULKAN_HPP_NAMESPACE::CoverageModulationModeNV                     coverageModulationMode_,
+                                                 VULKAN_HPP_NAMESPACE::Bool32                                       coverageModulationTableEnable_,
+                                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const float> const & coverageModulationTable_,
+                                                 const void *                                                       pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , coverageModulationMode( coverageModulationMode_ )
@@ -128922,36 +92017,37 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineCoverageModulationStateCreateInfoNV & operator=( PipelineCoverageModulationStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCoverageModulationStateCreateInfoNV & operator=( VkPipelineCoverageModulationStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCoverageModulationStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageModulationStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageModulationStateCreateInfoNV & setFlags( PipelineCoverageModulationStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageModulationStateCreateInfoNV &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageModulationStateCreateInfoNV &
-      setCoverageModulationMode( CoverageModulationModeNV coverageModulationMode_ ) VULKAN_HPP_NOEXCEPT
+      setCoverageModulationMode( VULKAN_HPP_NAMESPACE::CoverageModulationModeNV coverageModulationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageModulationMode = coverageModulationMode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageModulationStateCreateInfoNV &
-      setCoverageModulationTableEnable( Bool32 coverageModulationTableEnable_ ) VULKAN_HPP_NOEXCEPT
+      setCoverageModulationTableEnable( VULKAN_HPP_NAMESPACE::Bool32 coverageModulationTableEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageModulationTableEnable = coverageModulationTableEnable_;
       return *this;
@@ -128973,14 +92069,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PipelineCoverageModulationStateCreateInfoNV &
-      setCoverageModulationTable( ArrayProxyNoTemporaries<const float> const & coverageModulationTable_ ) VULKAN_HPP_NOEXCEPT
+      setCoverageModulationTable( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const float> const & coverageModulationTable_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageModulationTableCount = static_cast<uint32_t>( coverageModulationTable_.size() );
       pCoverageModulationTable     = coverageModulationTable_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCoverageModulationStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -128992,24 +92088,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCoverageModulationStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineCoverageModulationStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCoverageModulationStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineCoverageModulationStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCoverageModulationStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCoverageModulationStateCreateFlagsNV const &,
-               CoverageModulationModeNV const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::CoverageModulationModeNV const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                uint32_t const &,
                const float * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, coverageModulationMode, coverageModulationTableEnable, coverageModulationTableCount, pCoverageModulationTable );
@@ -129037,31 +92127,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                sType                         = StructureType::ePipelineCoverageModulationStateCreateInfoNV;
-    const void *                                 pNext                         = {};
-    PipelineCoverageModulationStateCreateFlagsNV flags                         = {};
-    CoverageModulationModeNV                     coverageModulationMode        = CoverageModulationModeNV::eNone;
-    Bool32                                       coverageModulationTableEnable = {};
-    uint32_t                                     coverageModulationTableCount  = {};
-    const float *                                pCoverageModulationTable      = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                sType                  = StructureType::ePipelineCoverageModulationStateCreateInfoNV;
+    const void *                                                       pNext                  = {};
+    VULKAN_HPP_NAMESPACE::PipelineCoverageModulationStateCreateFlagsNV flags                  = {};
+    VULKAN_HPP_NAMESPACE::CoverageModulationModeNV                     coverageModulationMode = VULKAN_HPP_NAMESPACE::CoverageModulationModeNV::eNone;
+    VULKAN_HPP_NAMESPACE::Bool32                                       coverageModulationTableEnable = {};
+    uint32_t                                                           coverageModulationTableCount  = {};
+    const float *                                                      pCoverageModulationTable      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCoverageModulationStateCreateInfoNV>
-  {
-    using Type = PipelineCoverageModulationStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCoverageModulationStateCreateInfoNV>
   {
     using Type = PipelineCoverageModulationStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineCoverageReductionStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageReductionStateCreateInfoNV.html
   struct PipelineCoverageReductionStateCreateInfoNV
   {
     using NativeType = VkPipelineCoverageReductionStateCreateInfoNV;
@@ -129069,13 +92149,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCoverageReductionStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCoverageReductionStateCreateInfoNV( PipelineCoverageReductionStateCreateFlagsNV flags_ = {},
-                                                                     CoverageReductionModeNV coverageReductionMode_     = CoverageReductionModeNV::eMerge,
-                                                                     const void *            pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , coverageReductionMode{ coverageReductionMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCoverageReductionStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateFlagsNV flags_                 = {},
+      VULKAN_HPP_NAMESPACE::CoverageReductionModeNV                     coverageReductionMode_ = VULKAN_HPP_NAMESPACE::CoverageReductionModeNV::eMerge,
+      const void *                                                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , coverageReductionMode( coverageReductionMode_ )
     {
     }
 
@@ -129087,34 +92168,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineCoverageReductionStateCreateInfoNV & operator=( PipelineCoverageReductionStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCoverageReductionStateCreateInfoNV & operator=( VkPipelineCoverageReductionStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCoverageReductionStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageReductionStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageReductionStateCreateInfoNV & setFlags( PipelineCoverageReductionStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageReductionStateCreateInfoNV &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageReductionStateCreateInfoNV &
-      setCoverageReductionMode( CoverageReductionModeNV coverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
+      setCoverageReductionMode( VULKAN_HPP_NAMESPACE::CoverageReductionModeNV coverageReductionMode_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageReductionMode = coverageReductionMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCoverageReductionStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -129126,18 +92208,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCoverageReductionStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineCoverageReductionStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCoverageReductionStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineCoverageReductionStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCoverageReductionStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCoverageReductionStateCreateFlagsNV const &, CoverageReductionModeNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::CoverageReductionModeNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, coverageReductionMode );
@@ -129163,28 +92242,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                               sType                 = StructureType::ePipelineCoverageReductionStateCreateInfoNV;
-    const void *                                pNext                 = {};
-    PipelineCoverageReductionStateCreateFlagsNV flags                 = {};
-    CoverageReductionModeNV                     coverageReductionMode = CoverageReductionModeNV::eMerge;
+    VULKAN_HPP_NAMESPACE::StructureType                               sType                 = StructureType::ePipelineCoverageReductionStateCreateInfoNV;
+    const void *                                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::PipelineCoverageReductionStateCreateFlagsNV flags                 = {};
+    VULKAN_HPP_NAMESPACE::CoverageReductionModeNV                     coverageReductionMode = VULKAN_HPP_NAMESPACE::CoverageReductionModeNV::eMerge;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCoverageReductionStateCreateInfoNV>
-  {
-    using Type = PipelineCoverageReductionStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCoverageReductionStateCreateInfoNV>
   {
     using Type = PipelineCoverageReductionStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineCoverageToColorStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCoverageToColorStateCreateInfoNV.html
   struct PipelineCoverageToColorStateCreateInfoNV
   {
     using NativeType = VkPipelineCoverageToColorStateCreateInfoNV;
@@ -129192,15 +92261,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCoverageToColorStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCoverageToColorStateCreateInfoNV( PipelineCoverageToColorStateCreateFlagsNV flags_                   = {},
-                                                                   Bool32                                    coverageToColorEnable_   = {},
-                                                                   uint32_t                                  coverageToColorLocation_ = {},
-                                                                   const void *                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , coverageToColorEnable{ coverageToColorEnable_ }
-      , coverageToColorLocation{ coverageToColorLocation_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCoverageToColorStateCreateInfoNV( VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateFlagsNV flags_                 = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32                                    coverageToColorEnable_ = {},
+                                                                   uint32_t     coverageToColorLocation_                                                  = {},
+                                                                   const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , coverageToColorEnable( coverageToColorEnable_ )
+      , coverageToColorLocation( coverageToColorLocation_ )
     {
     }
 
@@ -129212,28 +92281,30 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineCoverageToColorStateCreateInfoNV & operator=( PipelineCoverageToColorStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCoverageToColorStateCreateInfoNV & operator=( VkPipelineCoverageToColorStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCoverageToColorStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCoverageToColorStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageToColorStateCreateInfoNV & setFlags( PipelineCoverageToColorStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageToColorStateCreateInfoNV &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageToColorStateCreateInfoNV & setCoverageToColorEnable( Bool32 coverageToColorEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCoverageToColorStateCreateInfoNV &
+      setCoverageToColorEnable( VULKAN_HPP_NAMESPACE::Bool32 coverageToColorEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       coverageToColorEnable = coverageToColorEnable_;
       return *this;
@@ -129244,7 +92315,7 @@ namespace VULKAN_HPP_NAMESPACE
       coverageToColorLocation = coverageToColorLocation_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCoverageToColorStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -129256,18 +92327,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCoverageToColorStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineCoverageToColorStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCoverageToColorStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineCoverageToColorStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCoverageToColorStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCoverageToColorStateCreateFlagsNV const &, Bool32 const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateFlagsNV const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, coverageToColorEnable, coverageToColorLocation );
@@ -129294,104 +92363,90 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                             sType                   = StructureType::ePipelineCoverageToColorStateCreateInfoNV;
-    const void *                              pNext                   = {};
-    PipelineCoverageToColorStateCreateFlagsNV flags                   = {};
-    Bool32                                    coverageToColorEnable   = {};
-    uint32_t                                  coverageToColorLocation = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType                   = StructureType::ePipelineCoverageToColorStateCreateInfoNV;
+    const void *                                                    pNext                   = {};
+    VULKAN_HPP_NAMESPACE::PipelineCoverageToColorStateCreateFlagsNV flags                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                    coverageToColorEnable   = {};
+    uint32_t                                                        coverageToColorLocation = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCoverageToColorStateCreateInfoNV>
-  {
-    using Type = PipelineCoverageToColorStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCoverageToColorStateCreateInfoNV>
   {
     using Type = PipelineCoverageToColorStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineCreateFlags2CreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreateFlags2CreateInfo.html
-  struct PipelineCreateFlags2CreateInfo
+  struct PipelineCreateFlags2CreateInfoKHR
   {
-    using NativeType = VkPipelineCreateFlags2CreateInfo;
+    using NativeType = VkPipelineCreateFlags2CreateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCreateFlags2CreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCreateFlags2CreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCreateFlags2CreateInfo( PipelineCreateFlags2 flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCreateFlags2CreateInfoKHR( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR flags_ = {},
+                                                            const void *                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PipelineCreateFlags2CreateInfo( PipelineCreateFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PipelineCreateFlags2CreateInfoKHR( PipelineCreateFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PipelineCreateFlags2CreateInfo( VkPipelineCreateFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineCreateFlags2CreateInfo( *reinterpret_cast<PipelineCreateFlags2CreateInfo const *>( &rhs ) )
+    PipelineCreateFlags2CreateInfoKHR( VkPipelineCreateFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PipelineCreateFlags2CreateInfoKHR( *reinterpret_cast<PipelineCreateFlags2CreateInfoKHR const *>( &rhs ) )
     {
     }
 
-    PipelineCreateFlags2CreateInfo & operator=( PipelineCreateFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PipelineCreateFlags2CreateInfoKHR & operator=( PipelineCreateFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PipelineCreateFlags2CreateInfo & operator=( VkPipelineCreateFlags2CreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PipelineCreateFlags2CreateInfoKHR & operator=( VkPipelineCreateFlags2CreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCreateFlags2CreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCreateFlags2CreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineCreateFlags2CreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineCreateFlags2CreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineCreateFlags2CreateInfo & setFlags( PipelineCreateFlags2 flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineCreateFlags2CreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPipelineCreateFlags2CreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPipelineCreateFlags2CreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPipelineCreateFlags2CreateInfo *>( this );
+      return *reinterpret_cast<const VkPipelineCreateFlags2CreateInfoKHR *>( this );
     }
 
-    operator VkPipelineCreateFlags2CreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPipelineCreateFlags2CreateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPipelineCreateFlags2CreateInfo *>( this );
-    }
-
-    operator VkPipelineCreateFlags2CreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCreateFlags2CreateInfo *>( this );
-    }
-
-    operator VkPipelineCreateFlags2CreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCreateFlags2CreateInfo *>( this );
+      return *reinterpret_cast<VkPipelineCreateFlags2CreateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCreateFlags2 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineCreateFlags2CreateInfo const & ) const = default;
+    auto operator<=>( PipelineCreateFlags2CreateInfoKHR const & ) const = default;
 #else
-    bool operator==( PipelineCreateFlags2CreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PipelineCreateFlags2CreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -129400,43 +92455,33 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PipelineCreateFlags2CreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PipelineCreateFlags2CreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType        sType = StructureType::ePipelineCreateFlags2CreateInfo;
-    const void *         pNext = {};
-    PipelineCreateFlags2 flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType = StructureType::ePipelineCreateFlags2CreateInfoKHR;
+    const void *                                  pNext = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags2KHR flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCreateFlags2CreateInfo>
-  {
-    using Type = PipelineCreateFlags2CreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePipelineCreateFlags2CreateInfo>
+  struct CppType<StructureType, StructureType::ePipelineCreateFlags2CreateInfoKHR>
   {
-    using Type = PipelineCreateFlags2CreateInfo;
+    using Type = PipelineCreateFlags2CreateInfoKHR;
   };
 
-  using PipelineCreateFlags2CreateInfoKHR = PipelineCreateFlags2CreateInfo;
-
-  // wrapper struct for struct VkPipelineCreationFeedback, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreationFeedback.html
   struct PipelineCreationFeedback
   {
     using NativeType = VkPipelineCreationFeedback;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCreationFeedback( PipelineCreationFeedbackFlags flags_ = {}, uint64_t duration_ = {} ) VULKAN_HPP_NOEXCEPT
-      : flags{ flags_ }
-      , duration{ duration_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCreationFeedback( VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags flags_    = {},
+                                                   uint64_t                                            duration_ = {} ) VULKAN_HPP_NOEXCEPT
+      : flags( flags_ )
+      , duration( duration_ )
     {
     }
 
@@ -129448,11 +92493,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineCreationFeedback & operator=( PipelineCreationFeedback const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCreationFeedback & operator=( VkPipelineCreationFeedback const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCreationFeedback const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback const *>( &rhs );
       return *this;
     }
 
@@ -129466,18 +92511,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCreationFeedback *>( this );
     }
 
-    operator VkPipelineCreationFeedback const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCreationFeedback *>( this );
-    }
-
-    operator VkPipelineCreationFeedback *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCreationFeedback *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<PipelineCreationFeedbackFlags const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( flags, duration );
     }
@@ -129502,21 +92542,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    PipelineCreationFeedbackFlags flags    = {};
-    uint64_t                      duration = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags flags    = {};
+    uint64_t                                            duration = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCreationFeedback>
-  {
-    using Type = PipelineCreationFeedback;
-  };
-#endif
   using PipelineCreationFeedbackEXT = PipelineCreationFeedback;
 
-  // wrapper struct for struct VkPipelineCreationFeedbackCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineCreationFeedbackCreateInfo.html
   struct PipelineCreationFeedbackCreateInfo
   {
     using NativeType = VkPipelineCreationFeedbackCreateInfo;
@@ -129524,15 +92555,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineCreationFeedbackCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineCreationFeedbackCreateInfo( PipelineCreationFeedback * pPipelineCreationFeedback_          = {},
-                                                             uint32_t                   pipelineStageCreationFeedbackCount_ = {},
-                                                             PipelineCreationFeedback * pPipelineStageCreationFeedbacks_    = {},
-                                                             const void *               pNext_                              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pPipelineCreationFeedback{ pPipelineCreationFeedback_ }
-      , pipelineStageCreationFeedbackCount{ pipelineStageCreationFeedbackCount_ }
-      , pPipelineStageCreationFeedbacks{ pPipelineStageCreationFeedbacks_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineCreationFeedbackCreateInfo( VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineCreationFeedback_          = {},
+                                                             uint32_t                                         pipelineStageCreationFeedbackCount_ = {},
+                                                             VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineStageCreationFeedbacks_    = {},
+                                                             const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pPipelineCreationFeedback( pPipelineCreationFeedback_ )
+      , pipelineStageCreationFeedbackCount( pipelineStageCreationFeedbackCount_ )
+      , pPipelineStageCreationFeedbacks( pPipelineStageCreationFeedbacks_ )
     {
     }
 
@@ -129544,9 +92575,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineCreationFeedbackCreateInfo( PipelineCreationFeedback *                                pPipelineCreationFeedback_,
-                                        ArrayProxyNoTemporaries<PipelineCreationFeedback> const & pipelineStageCreationFeedbacks_,
-                                        const void *                                              pNext_ = nullptr )
+    PipelineCreationFeedbackCreateInfo(
+      VULKAN_HPP_NAMESPACE::PipelineCreationFeedback *                                                      pPipelineCreationFeedback_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback> const & pipelineStageCreationFeedbacks_,
+      const void *                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , pPipelineCreationFeedback( pPipelineCreationFeedback_ )
       , pipelineStageCreationFeedbackCount( static_cast<uint32_t>( pipelineStageCreationFeedbacks_.size() ) )
@@ -129556,15 +92588,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineCreationFeedbackCreateInfo & operator=( PipelineCreationFeedbackCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineCreationFeedbackCreateInfo & operator=( VkPipelineCreationFeedbackCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineCreationFeedbackCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineCreationFeedbackCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -129572,7 +92604,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCreationFeedbackCreateInfo &
-      setPPipelineCreationFeedback( PipelineCreationFeedback * pPipelineCreationFeedback_ ) VULKAN_HPP_NOEXCEPT
+      setPPipelineCreationFeedback( VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineCreationFeedback_ ) VULKAN_HPP_NOEXCEPT
     {
       pPipelineCreationFeedback = pPipelineCreationFeedback_;
       return *this;
@@ -129586,22 +92618,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineCreationFeedbackCreateInfo &
-      setPPipelineStageCreationFeedbacks( PipelineCreationFeedback * pPipelineStageCreationFeedbacks_ ) VULKAN_HPP_NOEXCEPT
+      setPPipelineStageCreationFeedbacks( VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineStageCreationFeedbacks_ ) VULKAN_HPP_NOEXCEPT
     {
       pPipelineStageCreationFeedbacks = pPipelineStageCreationFeedbacks_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineCreationFeedbackCreateInfo &
-      setPipelineStageCreationFeedbacks( ArrayProxyNoTemporaries<PipelineCreationFeedback> const & pipelineStageCreationFeedbacks_ ) VULKAN_HPP_NOEXCEPT
+    PipelineCreationFeedbackCreateInfo & setPipelineStageCreationFeedbacks(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PipelineCreationFeedback> const & pipelineStageCreationFeedbacks_ )
+      VULKAN_HPP_NOEXCEPT
     {
       pipelineStageCreationFeedbackCount = static_cast<uint32_t>( pipelineStageCreationFeedbacks_.size() );
       pPipelineStageCreationFeedbacks    = pipelineStageCreationFeedbacks_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineCreationFeedbackCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -129613,18 +92646,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineCreationFeedbackCreateInfo *>( this );
     }
 
-    operator VkPipelineCreationFeedbackCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineCreationFeedbackCreateInfo *>( this );
-    }
-
-    operator VkPipelineCreationFeedbackCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineCreationFeedbackCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineCreationFeedback * const &, uint32_t const &, PipelineCreationFeedback * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pPipelineCreationFeedback, pipelineStageCreationFeedbackCount, pPipelineStageCreationFeedbacks );
@@ -129652,21 +92683,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                              = StructureType::ePipelineCreationFeedbackCreateInfo;
-    const void *               pNext                              = {};
-    PipelineCreationFeedback * pPipelineCreationFeedback          = {};
-    uint32_t                   pipelineStageCreationFeedbackCount = {};
-    PipelineCreationFeedback * pPipelineStageCreationFeedbacks    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                              = StructureType::ePipelineCreationFeedbackCreateInfo;
+    const void *                                     pNext                              = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineCreationFeedback          = {};
+    uint32_t                                         pipelineStageCreationFeedbackCount = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreationFeedback * pPipelineStageCreationFeedbacks    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineCreationFeedbackCreateInfo>
-  {
-    using Type = PipelineCreationFeedbackCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineCreationFeedbackCreateInfo>
   {
@@ -129675,8 +92698,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PipelineCreationFeedbackCreateInfoEXT = PipelineCreationFeedbackCreateInfo;
 
-  // wrapper struct for struct VkPipelineDiscardRectangleStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineDiscardRectangleStateCreateInfoEXT.html
   struct PipelineDiscardRectangleStateCreateInfoEXT
   {
     using NativeType = VkPipelineDiscardRectangleStateCreateInfoEXT;
@@ -129684,17 +92705,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineDiscardRectangleStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineDiscardRectangleStateCreateInfoEXT( PipelineDiscardRectangleStateCreateFlagsEXT flags_ = {},
-                                                                     DiscardRectangleModeEXT discardRectangleMode_      = DiscardRectangleModeEXT::eInclusive,
-                                                                     uint32_t                discardRectangleCount_     = {},
-                                                                     const Rect2D *          pDiscardRectangles_        = {},
-                                                                     const void *            pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , discardRectangleMode{ discardRectangleMode_ }
-      , discardRectangleCount{ discardRectangleCount_ }
-      , pDiscardRectangles{ pDiscardRectangles_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineDiscardRectangleStateCreateInfoEXT(
+      VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateFlagsEXT flags_                 = {},
+      VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT                     discardRectangleMode_  = VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT::eInclusive,
+      uint32_t                                                          discardRectangleCount_ = {},
+      const VULKAN_HPP_NAMESPACE::Rect2D *                              pDiscardRectangles_    = {},
+      const void *                                                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , discardRectangleMode( discardRectangleMode_ )
+      , discardRectangleCount( discardRectangleCount_ )
+      , pDiscardRectangles( pDiscardRectangles_ )
     {
     }
 
@@ -129706,10 +92728,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineDiscardRectangleStateCreateInfoEXT( PipelineDiscardRectangleStateCreateFlagsEXT   flags_,
-                                                DiscardRectangleModeEXT                       discardRectangleMode_,
-                                                ArrayProxyNoTemporaries<const Rect2D> const & discardRectangles_,
-                                                const void *                                  pNext_ = nullptr )
+    PipelineDiscardRectangleStateCreateInfoEXT( VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateFlagsEXT                         flags_,
+                                                VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT                                             discardRectangleMode_,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles_,
+                                                const void *                                                                              pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , discardRectangleMode( discardRectangleMode_ )
@@ -129720,29 +92742,30 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineDiscardRectangleStateCreateInfoEXT & operator=( PipelineDiscardRectangleStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineDiscardRectangleStateCreateInfoEXT & operator=( VkPipelineDiscardRectangleStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineDiscardRectangleStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT & setFlags( PipelineDiscardRectangleStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT &
-      setDiscardRectangleMode( DiscardRectangleModeEXT discardRectangleMode_ ) VULKAN_HPP_NOEXCEPT
+      setDiscardRectangleMode( VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT discardRectangleMode_ ) VULKAN_HPP_NOEXCEPT
     {
       discardRectangleMode = discardRectangleMode_;
       return *this;
@@ -129754,21 +92777,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT & setPDiscardRectangles( const Rect2D * pDiscardRectangles_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineDiscardRectangleStateCreateInfoEXT &
+      setPDiscardRectangles( const VULKAN_HPP_NAMESPACE::Rect2D * pDiscardRectangles_ ) VULKAN_HPP_NOEXCEPT
     {
       pDiscardRectangles = pDiscardRectangles_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineDiscardRectangleStateCreateInfoEXT & setDiscardRectangles( ArrayProxyNoTemporaries<const Rect2D> const & discardRectangles_ ) VULKAN_HPP_NOEXCEPT
+    PipelineDiscardRectangleStateCreateInfoEXT &
+      setDiscardRectangles( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & discardRectangles_ ) VULKAN_HPP_NOEXCEPT
     {
       discardRectangleCount = static_cast<uint32_t>( discardRectangles_.size() );
       pDiscardRectangles    = discardRectangles_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineDiscardRectangleStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -129780,23 +92805,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineDiscardRectangleStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineDiscardRectangleStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineDiscardRectangleStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineDiscardRectangleStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineDiscardRectangleStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineDiscardRectangleStateCreateFlagsEXT const &,
-               DiscardRectangleModeEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT const &,
                uint32_t const &,
-               const Rect2D * const &>
+               const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, discardRectangleMode, discardRectangleCount, pDiscardRectangles );
@@ -129823,29 +92842,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                               sType                 = StructureType::ePipelineDiscardRectangleStateCreateInfoEXT;
-    const void *                                pNext                 = {};
-    PipelineDiscardRectangleStateCreateFlagsEXT flags                 = {};
-    DiscardRectangleModeEXT                     discardRectangleMode  = DiscardRectangleModeEXT::eInclusive;
-    uint32_t                                    discardRectangleCount = {};
-    const Rect2D *                              pDiscardRectangles    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                               sType                 = StructureType::ePipelineDiscardRectangleStateCreateInfoEXT;
+    const void *                                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::PipelineDiscardRectangleStateCreateFlagsEXT flags                 = {};
+    VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT                     discardRectangleMode  = VULKAN_HPP_NAMESPACE::DiscardRectangleModeEXT::eInclusive;
+    uint32_t                                                          discardRectangleCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D *                              pDiscardRectangles    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineDiscardRectangleStateCreateInfoEXT>
-  {
-    using Type = PipelineDiscardRectangleStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineDiscardRectangleStateCreateInfoEXT>
   {
     using Type = PipelineDiscardRectangleStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineExecutableInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineExecutableInfoKHR.html
   struct PipelineExecutableInfoKHR
   {
     using NativeType = VkPipelineExecutableInfoKHR;
@@ -129853,11 +92863,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineExecutableInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineExecutableInfoKHR( Pipeline pipeline_ = {}, uint32_t executableIndex_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipeline{ pipeline_ }
-      , executableIndex{ executableIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineExecutableInfoKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline_        = {},
+                                                    uint32_t                       executableIndex_ = {},
+                                                    const void *                   pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipeline( pipeline_ )
+      , executableIndex( executableIndex_ )
     {
     }
 
@@ -129869,22 +92881,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineExecutableInfoKHR & operator=( PipelineExecutableInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineExecutableInfoKHR & operator=( VkPipelineExecutableInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineExecutableInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineExecutableInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineExecutableInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableInfoKHR & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableInfoKHR & setPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       pipeline = pipeline_;
       return *this;
@@ -129895,7 +92907,7 @@ namespace VULKAN_HPP_NAMESPACE
       executableIndex = executableIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineExecutableInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -129907,18 +92919,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineExecutableInfoKHR *>( this );
     }
 
-    operator VkPipelineExecutableInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineExecutableInfoKHR *>( this );
-    }
-
-    operator VkPipelineExecutableInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineExecutableInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Pipeline const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Pipeline const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipeline, executableIndex );
     }
@@ -129943,28 +92950,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::ePipelineExecutableInfoKHR;
-    const void *  pNext           = {};
-    Pipeline      pipeline        = {};
-    uint32_t      executableIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::ePipelineExecutableInfoKHR;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Pipeline      pipeline        = {};
+    uint32_t                            executableIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineExecutableInfoKHR>
-  {
-    using Type = PipelineExecutableInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineExecutableInfoKHR>
   {
     using Type = PipelineExecutableInfoKHR;
   };
 
-  // wrapper struct for struct VkPipelineExecutableInternalRepresentationKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineExecutableInternalRepresentationKHR.html
   struct PipelineExecutableInternalRepresentationKHR
   {
     using NativeType = VkPipelineExecutableInternalRepresentationKHR;
@@ -129972,19 +92969,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineExecutableInternalRepresentationKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PipelineExecutableInternalRepresentationKHR( std::array<char, VK_MAX_DESCRIPTION_SIZE> const & name_        = {},
                                                                          std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_ = {},
-                                                                         Bool32                                            isText_      = {},
+                                                                         VULKAN_HPP_NAMESPACE::Bool32                      isText_      = {},
                                                                          size_t                                            dataSize_    = {},
                                                                          void *                                            pData_       = {},
                                                                          void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , name{ name_ }
-      , description{ description_ }
-      , isText{ isText_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
+      : pNext( pNext_ )
+      , name( name_ )
+      , description( description_ )
+      , isText( isText_ )
+      , dataSize( dataSize_ )
+      , pData( pData_ )
     {
     }
 
@@ -129996,12 +92993,37 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    template <typename T>
+    PipelineExecutableInternalRepresentationKHR( std::string const &                                      name_,
+                                                 std::string const &                                      description_ = {},
+                                                 VULKAN_HPP_NAMESPACE::Bool32                             isText_      = {},
+                                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<T> const & data_        = {},
+                                                 void *                                                   pNext_       = nullptr )
+      : pNext( pNext_ ), isText( isText_ ), dataSize( data_.size() * sizeof( T ) ), pData( data_.data() )
+    {
+      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( name, VK_MAX_DESCRIPTION_SIZE, name_.data(), name_.size() );
+#    else
+      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, name_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PipelineExecutableInternalRepresentationKHR & operator=( PipelineExecutableInternalRepresentationKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineExecutableInternalRepresentationKHR & operator=( VkPipelineExecutableInternalRepresentationKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineExecutableInternalRepresentationKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineExecutableInternalRepresentationKHR const *>( &rhs );
       return *this;
     }
 
@@ -130015,24 +93037,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( this );
     }
 
-    operator VkPipelineExecutableInternalRepresentationKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineExecutableInternalRepresentationKHR *>( this );
-    }
-
-    operator VkPipelineExecutableInternalRepresentationKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineExecutableInternalRepresentationKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                size_t const &,
                void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, name, description, isText, dataSize, pData );
@@ -130073,31 +93089,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType       = StructureType::ePipelineExecutableInternalRepresentationKHR;
-    void *                                        pNext       = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
-    Bool32                                        isText      = {};
-    size_t                                        dataSize    = {};
-    void *                                        pData       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType       = StructureType::ePipelineExecutableInternalRepresentationKHR;
+    void *                                                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                        isText      = {};
+    size_t                                                              dataSize    = {};
+    void *                                                              pData       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineExecutableInternalRepresentationKHR>
-  {
-    using Type = PipelineExecutableInternalRepresentationKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineExecutableInternalRepresentationKHR>
   {
     using Type = PipelineExecutableInternalRepresentationKHR;
   };
 
-  // wrapper struct for struct VkPipelineExecutablePropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineExecutablePropertiesKHR.html
   struct PipelineExecutablePropertiesKHR
   {
     using NativeType = VkPipelineExecutablePropertiesKHR;
@@ -130105,17 +93111,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineExecutablePropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineExecutablePropertiesKHR( ShaderStageFlags                                  stages_       = {},
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineExecutablePropertiesKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags            stages_       = {},
                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & name_         = {},
                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_  = {},
                                                              uint32_t                                          subgroupSize_ = {},
                                                              void *                                            pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stages{ stages_ }
-      , name{ name_ }
-      , description{ description_ }
-      , subgroupSize{ subgroupSize_ }
+      : pNext( pNext_ )
+      , stages( stages_ )
+      , name( name_ )
+      , description( description_ )
+      , subgroupSize( subgroupSize_ )
     {
     }
 
@@ -130126,12 +93132,36 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PipelineExecutablePropertiesKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags stages_,
+                                     std::string const &                    name_,
+                                     std::string const &                    description_  = {},
+                                     uint32_t                               subgroupSize_ = {},
+                                     void *                                 pNext_        = nullptr )
+      : pNext( pNext_ ), stages( stages_ ), subgroupSize( subgroupSize_ )
+    {
+      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( name, VK_MAX_DESCRIPTION_SIZE, name_.data(), name_.size() );
+#    else
+      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, name_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PipelineExecutablePropertiesKHR & operator=( PipelineExecutablePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineExecutablePropertiesKHR & operator=( VkPipelineExecutablePropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineExecutablePropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineExecutablePropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -130145,23 +93175,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( this );
     }
 
-    operator VkPipelineExecutablePropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineExecutablePropertiesKHR *>( this );
-    }
-
-    operator VkPipelineExecutablePropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineExecutablePropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ShaderStageFlags const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stages, name, description, subgroupSize );
@@ -130200,22 +93224,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                 sType        = StructureType::ePipelineExecutablePropertiesKHR;
-    void *                                        pNext        = {};
-    ShaderStageFlags                              stages       = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name         = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description  = {};
-    uint32_t                                      subgroupSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType        = StructureType::ePipelineExecutablePropertiesKHR;
+    void *                                                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags                              stages       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name         = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description  = {};
+    uint32_t                                                            subgroupSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineExecutablePropertiesKHR>
-  {
-    using Type = PipelineExecutablePropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineExecutablePropertiesKHR>
   {
@@ -130225,19 +93241,19 @@ namespace VULKAN_HPP_NAMESPACE
   union PipelineExecutableStatisticValueKHR
   {
     using NativeType = VkPipelineExecutableStatisticValueKHR;
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_UNION_CONSTRUCTORS )
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR( Bool32 b32_ = {} ) : b32( b32_ ) {}
+    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR( VULKAN_HPP_NAMESPACE::Bool32 b32_ = {} ) : b32( b32_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR( int64_t i64_ ) : i64( i64_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR( uint64_t u64_ ) : u64( u64_ ) {}
 
     VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR( double f64_ ) : f64( f64_ ) {}
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_UNION_CONSTRUCTORS*/
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_UNION_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR & setB32( Bool32 b32_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_UNION_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticValueKHR & setB32( VULKAN_HPP_NAMESPACE::Bool32 b32_ ) VULKAN_HPP_NOEXCEPT
     {
       b32 = b32_;
       return *this;
@@ -130260,7 +93276,7 @@ namespace VULKAN_HPP_NAMESPACE
       f64 = f64_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_UNION_SETTERS*/
 
     operator VkPipelineExecutableStatisticValueKHR const &() const
     {
@@ -130273,10 +93289,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #ifdef VULKAN_HPP_HAS_UNRESTRICTED_UNIONS
-    Bool32   b32;
-    int64_t  i64;
-    uint64_t u64;
-    double   f64;
+    VULKAN_HPP_NAMESPACE::Bool32 b32;
+    int64_t                      i64;
+    uint64_t                     u64;
+    double                       f64;
 #else
     VkBool32 b32;
     int64_t  i64;
@@ -130285,16 +93301,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VULKAN_HPP_HAS_UNRESTRICTED_UNIONS*/
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineExecutableStatisticValueKHR>
-  {
-    using Type = PipelineExecutableStatisticValueKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineExecutableStatisticKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineExecutableStatisticKHR.html
   struct PipelineExecutableStatisticKHR
   {
     using NativeType = VkPipelineExecutableStatisticKHR;
@@ -130302,17 +93308,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineExecutableStatisticKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticKHR( std::array<char, VK_MAX_DESCRIPTION_SIZE> const & name_        = {},
-                                                            std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_ = {},
-                                                            PipelineExecutableStatisticFormatKHR format_ = PipelineExecutableStatisticFormatKHR::eBool32,
-                                                            PipelineExecutableStatisticValueKHR  value_  = {},
-                                                            void *                               pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , name{ name_ }
-      , description{ description_ }
-      , format{ format_ }
-      , value{ value_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineExecutableStatisticKHR(
+      std::array<char, VK_MAX_DESCRIPTION_SIZE> const &          name_        = {},
+      std::array<char, VK_MAX_DESCRIPTION_SIZE> const &          description_ = {},
+      VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR format_      = VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR::eBool32,
+      VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticValueKHR  value_       = {},
+      void *                                                     pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , name( name_ )
+      , description( description_ )
+      , format( format_ )
+      , value( value_ )
     {
     }
 
@@ -130323,12 +93330,37 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    PipelineExecutableStatisticKHR(
+      std::string const &                                        name_,
+      std::string const &                                        description_ = {},
+      VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR format_      = VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR::eBool32,
+      VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticValueKHR  value_       = {},
+      void *                                                     pNext_       = nullptr )
+      : pNext( pNext_ ), format( format_ ), value( value_ )
+    {
+      VULKAN_HPP_ASSERT( name_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( name, VK_MAX_DESCRIPTION_SIZE, name_.data(), name_.size() );
+#    else
+      strncpy( name, name_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, name_.size() ) );
+#    endif
+
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     PipelineExecutableStatisticKHR & operator=( PipelineExecutableStatisticKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineExecutableStatisticKHR & operator=( VkPipelineExecutableStatisticKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineExecutableStatisticKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticKHR const *>( &rhs );
       return *this;
     }
 
@@ -130342,23 +93374,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineExecutableStatisticKHR *>( this );
     }
 
-    operator VkPipelineExecutableStatisticKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineExecutableStatisticKHR *>( this );
-    }
-
-    operator VkPipelineExecutableStatisticKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineExecutableStatisticKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
-               PipelineExecutableStatisticFormatKHR const &,
-               PipelineExecutableStatisticValueKHR const &>
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &,
+               VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR const &,
+               VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticValueKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, name, description, format, value );
@@ -130366,144 +93392,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                 sType       = StructureType::ePipelineExecutableStatisticKHR;
-    void *                                        pNext       = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
-    PipelineExecutableStatisticFormatKHR          format      = PipelineExecutableStatisticFormatKHR::eBool32;
-    PipelineExecutableStatisticValueKHR           value       = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                 sType       = StructureType::ePipelineExecutableStatisticKHR;
+    void *                                                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> name        = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description = {};
+    VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR          format      = VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticFormatKHR::eBool32;
+    VULKAN_HPP_NAMESPACE::PipelineExecutableStatisticValueKHR           value       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineExecutableStatisticKHR>
-  {
-    using Type = PipelineExecutableStatisticKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineExecutableStatisticKHR>
   {
     using Type = PipelineExecutableStatisticKHR;
   };
 
-  // wrapper struct for struct VkPipelineFragmentDensityMapLayeredCreateInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineFragmentDensityMapLayeredCreateInfoVALVE.html
-  struct PipelineFragmentDensityMapLayeredCreateInfoVALVE
-  {
-    using NativeType = VkPipelineFragmentDensityMapLayeredCreateInfoVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineFragmentDensityMapLayeredCreateInfoVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineFragmentDensityMapLayeredCreateInfoVALVE( uint32_t     maxFragmentDensityMapLayers_ = {},
-                                                                           const void * pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxFragmentDensityMapLayers{ maxFragmentDensityMapLayers_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PipelineFragmentDensityMapLayeredCreateInfoVALVE( PipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineFragmentDensityMapLayeredCreateInfoVALVE( VkPipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineFragmentDensityMapLayeredCreateInfoVALVE( *reinterpret_cast<PipelineFragmentDensityMapLayeredCreateInfoVALVE const *>( &rhs ) )
-    {
-    }
-
-    PipelineFragmentDensityMapLayeredCreateInfoVALVE & operator=( PipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineFragmentDensityMapLayeredCreateInfoVALVE & operator=( VkPipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineFragmentDensityMapLayeredCreateInfoVALVE const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentDensityMapLayeredCreateInfoVALVE & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentDensityMapLayeredCreateInfoVALVE &
-      setMaxFragmentDensityMapLayers( uint32_t maxFragmentDensityMapLayers_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxFragmentDensityMapLayers = maxFragmentDensityMapLayers_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineFragmentDensityMapLayeredCreateInfoVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineFragmentDensityMapLayeredCreateInfoVALVE *>( this );
-    }
-
-    operator VkPipelineFragmentDensityMapLayeredCreateInfoVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineFragmentDensityMapLayeredCreateInfoVALVE *>( this );
-    }
-
-    operator VkPipelineFragmentDensityMapLayeredCreateInfoVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineFragmentDensityMapLayeredCreateInfoVALVE *>( this );
-    }
-
-    operator VkPipelineFragmentDensityMapLayeredCreateInfoVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineFragmentDensityMapLayeredCreateInfoVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxFragmentDensityMapLayers );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineFragmentDensityMapLayeredCreateInfoVALVE const & ) const = default;
-#else
-    bool operator==( PipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxFragmentDensityMapLayers == rhs.maxFragmentDensityMapLayers );
-#  endif
-    }
-
-    bool operator!=( PipelineFragmentDensityMapLayeredCreateInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                       = StructureType::ePipelineFragmentDensityMapLayeredCreateInfoVALVE;
-    const void *  pNext                       = {};
-    uint32_t      maxFragmentDensityMapLayers = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineFragmentDensityMapLayeredCreateInfoVALVE>
-  {
-    using Type = PipelineFragmentDensityMapLayeredCreateInfoVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineFragmentDensityMapLayeredCreateInfoVALVE>
-  {
-    using Type = PipelineFragmentDensityMapLayeredCreateInfoVALVE;
-  };
-
-  // wrapper struct for struct VkPipelineFragmentShadingRateEnumStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineFragmentShadingRateEnumStateCreateInfoNV.html
   struct PipelineFragmentShadingRateEnumStateCreateInfoNV
   {
     using NativeType = VkPipelineFragmentShadingRateEnumStateCreateInfoNV;
@@ -130511,17 +93413,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV(
-      FragmentShadingRateTypeNV                               shadingRateType_ = FragmentShadingRateTypeNV::eFragmentSize,
-      FragmentShadingRateNV                                   shadingRate_     = FragmentShadingRateNV::e1InvocationPerPixel,
-      std::array<FragmentShadingRateCombinerOpKHR, 2> const & combinerOps_     = { { FragmentShadingRateCombinerOpKHR::eKeep,
-                                                                                     FragmentShadingRateCombinerOpKHR::eKeep } },
-      const void *                                            pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shadingRateType{ shadingRateType_ }
-      , shadingRate{ shadingRate_ }
-      , combinerOps{ combinerOps_ }
+      VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV shadingRateType_ = VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV::eFragmentSize,
+      VULKAN_HPP_NAMESPACE::FragmentShadingRateNV     shadingRate_     = VULKAN_HPP_NAMESPACE::FragmentShadingRateNV::e1InvocationPerPixel,
+      std::array<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> const &
+        combinerOps_ = { { VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR::eKeep, VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR::eKeep } },
+      const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shadingRateType( shadingRateType_ )
+      , shadingRate( shadingRate_ )
+      , combinerOps( combinerOps_ )
     {
     }
 
@@ -130534,15 +93436,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineFragmentShadingRateEnumStateCreateInfoNV & operator=( PipelineFragmentShadingRateEnumStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineFragmentShadingRateEnumStateCreateInfoNV & operator=( VkPipelineFragmentShadingRateEnumStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineFragmentShadingRateEnumStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateEnumStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -130550,25 +93452,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV &
-      setShadingRateType( FragmentShadingRateTypeNV shadingRateType_ ) VULKAN_HPP_NOEXCEPT
+      setShadingRateType( VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV shadingRateType_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateType = shadingRateType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV & setShadingRate( FragmentShadingRateNV shadingRate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV &
+      setShadingRate( VULKAN_HPP_NAMESPACE::FragmentShadingRateNV shadingRate_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRate = shadingRate_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateEnumStateCreateInfoNV &
-      setCombinerOps( std::array<FragmentShadingRateCombinerOpKHR, 2> combinerOps_ ) VULKAN_HPP_NOEXCEPT
+      setCombinerOps( std::array<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> combinerOps_ ) VULKAN_HPP_NOEXCEPT
     {
       combinerOps = combinerOps_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineFragmentShadingRateEnumStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -130580,22 +93483,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineFragmentShadingRateEnumStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineFragmentShadingRateEnumStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineFragmentShadingRateEnumStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineFragmentShadingRateEnumStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineFragmentShadingRateEnumStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               FragmentShadingRateTypeNV const &,
-               FragmentShadingRateNV const &,
-               ArrayWrapper1D<FragmentShadingRateCombinerOpKHR, 2> const &>
+               VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV const &,
+               VULKAN_HPP_NAMESPACE::FragmentShadingRateNV const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shadingRateType, shadingRate, combinerOps );
@@ -130605,7 +93502,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
     auto operator<=>( PipelineFragmentShadingRateEnumStateCreateInfoNV const & ) const = default;
 #else
-    bool operator==( PipelineFragmentShadingRateEnumStateCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool     operator==( PipelineFragmentShadingRateEnumStateCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -130622,29 +93519,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                       sType           = StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV;
-    const void *                                        pNext           = {};
-    FragmentShadingRateTypeNV                           shadingRateType = FragmentShadingRateTypeNV::eFragmentSize;
-    FragmentShadingRateNV                               shadingRate     = FragmentShadingRateNV::e1InvocationPerPixel;
-    ArrayWrapper1D<FragmentShadingRateCombinerOpKHR, 2> combinerOps     = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType           = StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV;
+    const void *                                    pNext           = {};
+    VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV shadingRateType = VULKAN_HPP_NAMESPACE::FragmentShadingRateTypeNV::eFragmentSize;
+    VULKAN_HPP_NAMESPACE::FragmentShadingRateNV     shadingRate     = VULKAN_HPP_NAMESPACE::FragmentShadingRateNV::e1InvocationPerPixel;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> combinerOps = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineFragmentShadingRateEnumStateCreateInfoNV>
-  {
-    using Type = PipelineFragmentShadingRateEnumStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV>
   {
     using Type = PipelineFragmentShadingRateEnumStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineFragmentShadingRateStateCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineFragmentShadingRateStateCreateInfoKHR.html
   struct PipelineFragmentShadingRateStateCreateInfoKHR
   {
     using NativeType = VkPipelineFragmentShadingRateStateCreateInfoKHR;
@@ -130652,15 +93539,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateStateCreateInfoKHR(
-      Extent2D                                                fragmentSize_ = {},
-      std::array<FragmentShadingRateCombinerOpKHR, 2> const & combinerOps_  = { { FragmentShadingRateCombinerOpKHR::eKeep,
-                                                                                  FragmentShadingRateCombinerOpKHR::eKeep } },
-      const void *                                            pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentSize{ fragmentSize_ }
-      , combinerOps{ combinerOps_ }
+      VULKAN_HPP_NAMESPACE::Extent2D fragmentSize_ = {},
+      std::array<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> const &
+        combinerOps_ = { { VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR::eKeep, VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR::eKeep } },
+      const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentSize( fragmentSize_ )
+      , combinerOps( combinerOps_ )
     {
     }
 
@@ -130673,34 +93560,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineFragmentShadingRateStateCreateInfoKHR & operator=( PipelineFragmentShadingRateStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineFragmentShadingRateStateCreateInfoKHR & operator=( VkPipelineFragmentShadingRateStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineFragmentShadingRateStateCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineFragmentShadingRateStateCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateStateCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateStateCreateInfoKHR & setFragmentSize( Extent2D const & fragmentSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateStateCreateInfoKHR &
+      setFragmentSize( VULKAN_HPP_NAMESPACE::Extent2D const & fragmentSize_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentSize = fragmentSize_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineFragmentShadingRateStateCreateInfoKHR &
-      setCombinerOps( std::array<FragmentShadingRateCombinerOpKHR, 2> combinerOps_ ) VULKAN_HPP_NOEXCEPT
+      setCombinerOps( std::array<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> combinerOps_ ) VULKAN_HPP_NOEXCEPT
     {
       combinerOps = combinerOps_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineFragmentShadingRateStateCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -130712,18 +93600,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineFragmentShadingRateStateCreateInfoKHR *>( this );
     }
 
-    operator VkPipelineFragmentShadingRateStateCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineFragmentShadingRateStateCreateInfoKHR *>( this );
-    }
-
-    operator VkPipelineFragmentShadingRateStateCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineFragmentShadingRateStateCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Extent2D const &, ArrayWrapper1D<FragmentShadingRateCombinerOpKHR, 2> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentSize, combinerOps );
@@ -130749,28 +93634,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                       sType        = StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR;
-    const void *                                        pNext        = {};
-    Extent2D                                            fragmentSize = {};
-    ArrayWrapper1D<FragmentShadingRateCombinerOpKHR, 2> combinerOps  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR;
+    const void *                        pNext        = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      fragmentSize = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::FragmentShadingRateCombinerOpKHR, 2> combinerOps = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineFragmentShadingRateStateCreateInfoKHR>
-  {
-    using Type = PipelineFragmentShadingRateStateCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR>
   {
     using Type = PipelineFragmentShadingRateStateCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkPipelineIndirectDeviceAddressInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineIndirectDeviceAddressInfoNV.html
   struct PipelineIndirectDeviceAddressInfoNV
   {
     using NativeType = VkPipelineIndirectDeviceAddressInfoNV;
@@ -130778,13 +93653,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineIndirectDeviceAddressInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineIndirectDeviceAddressInfoNV( PipelineBindPoint pipelineBindPoint_ = PipelineBindPoint::eGraphics,
-                                                              Pipeline          pipeline_          = {},
-                                                              const void *      pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , pipeline{ pipeline_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PipelineIndirectDeviceAddressInfoNV( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+                                           VULKAN_HPP_NAMESPACE::Pipeline          pipeline_          = {},
+                                           const void *                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , pipeline( pipeline_ )
     {
     }
 
@@ -130796,33 +93672,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineIndirectDeviceAddressInfoNV & operator=( PipelineIndirectDeviceAddressInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineIndirectDeviceAddressInfoNV & operator=( VkPipelineIndirectDeviceAddressInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineIndirectDeviceAddressInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineIndirectDeviceAddressInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineIndirectDeviceAddressInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineIndirectDeviceAddressInfoNV & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineIndirectDeviceAddressInfoNV &
+      setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineIndirectDeviceAddressInfoNV & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineIndirectDeviceAddressInfoNV & setPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       pipeline = pipeline_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineIndirectDeviceAddressInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -130834,18 +93711,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineIndirectDeviceAddressInfoNV *>( this );
     }
 
-    operator VkPipelineIndirectDeviceAddressInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineIndirectDeviceAddressInfoNV *>( this );
-    }
-
-    operator VkPipelineIndirectDeviceAddressInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineIndirectDeviceAddressInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineBindPoint const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineBindPoint, pipeline );
     }
@@ -130870,27 +93745,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType     sType             = StructureType::ePipelineIndirectDeviceAddressInfoNV;
-    const void *      pNext             = {};
-    PipelineBindPoint pipelineBindPoint = PipelineBindPoint::eGraphics;
-    Pipeline          pipeline          = {};
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::ePipelineIndirectDeviceAddressInfoNV;
+    const void *                            pNext             = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    VULKAN_HPP_NAMESPACE::Pipeline          pipeline          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineIndirectDeviceAddressInfoNV>
-  {
-    using Type = PipelineIndirectDeviceAddressInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineIndirectDeviceAddressInfoNV>
   {
     using Type = PipelineIndirectDeviceAddressInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineInfoKHR.html
   struct PipelineInfoKHR
   {
     using NativeType = VkPipelineInfoKHR;
@@ -130898,10 +93764,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineInfoKHR( Pipeline pipeline_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipeline{ pipeline_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineInfoKHR( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pipeline( pipeline_ )
     {
     }
 
@@ -130910,27 +93776,27 @@ namespace VULKAN_HPP_NAMESPACE
     PipelineInfoKHR( VkPipelineInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PipelineInfoKHR( *reinterpret_cast<PipelineInfoKHR const *>( &rhs ) ) {}
 
     PipelineInfoKHR & operator=( PipelineInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineInfoKHR & operator=( VkPipelineInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineInfoKHR & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineInfoKHR & setPipeline( VULKAN_HPP_NAMESPACE::Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
     {
       pipeline = pipeline_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -130942,18 +93808,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineInfoKHR *>( this );
     }
 
-    operator VkPipelineInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineInfoKHR *>( this );
-    }
-
-    operator VkPipelineInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Pipeline const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipeline );
     }
@@ -130978,19 +93839,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::ePipelineInfoKHR;
-    const void *  pNext    = {};
-    Pipeline      pipeline = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::ePipelineInfoKHR;
+    const void *                        pNext    = {};
+    VULKAN_HPP_NAMESPACE::Pipeline      pipeline = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineInfoKHR>
-  {
-    using Type = PipelineInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineInfoKHR>
   {
@@ -130999,7 +93852,98 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PipelineInfoEXT = PipelineInfoKHR;
 
-  // wrapper struct for struct VkPipelineLayoutCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineLayoutCreateInfo.html
+  struct PushConstantRange
+  {
+    using NativeType = VkPushConstantRange;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PushConstantRange( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ = {}, uint32_t offset_ = {}, uint32_t size_ = {} ) VULKAN_HPP_NOEXCEPT
+      : stageFlags( stageFlags_ )
+      , offset( offset_ )
+      , size( size_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR PushConstantRange( PushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    PushConstantRange( VkPushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT : PushConstantRange( *reinterpret_cast<PushConstantRange const *>( &rhs ) ) {}
+
+    PushConstantRange & operator=( PushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    PushConstantRange & operator=( VkPushConstantRange const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PushConstantRange const *>( &rhs );
+      return *this;
+    }
+
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    {
+      stageFlags = stageFlags_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setOffset( uint32_t offset_ ) VULKAN_HPP_NOEXCEPT
+    {
+      offset = offset_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 PushConstantRange & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
+    {
+      size = size_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
+    operator VkPushConstantRange const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkPushConstantRange *>( this );
+    }
+
+    operator VkPushConstantRange &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkPushConstantRange *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ShaderStageFlags const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( stageFlags, offset, size );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( PushConstantRange const & ) const = default;
+#else
+    bool operator==( PushConstantRange const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( stageFlags == rhs.stageFlags ) && ( offset == rhs.offset ) && ( size == rhs.size );
+#  endif
+    }
+
+    bool operator!=( PushConstantRange const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags = {};
+    uint32_t                               offset     = {};
+    uint32_t                               size       = {};
+  };
+
   struct PipelineLayoutCreateInfo
   {
     using NativeType = VkPipelineLayoutCreateInfo;
@@ -131007,19 +93951,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineLayoutCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineLayoutCreateInfo( PipelineLayoutCreateFlags   flags_                  = {},
-                                                   uint32_t                    setLayoutCount_         = {},
-                                                   const DescriptorSetLayout * pSetLayouts_            = {},
-                                                   uint32_t                    pushConstantRangeCount_ = {},
-                                                   const PushConstantRange *   pPushConstantRanges_    = {},
-                                                   const void *                pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , setLayoutCount{ setLayoutCount_ }
-      , pSetLayouts{ pSetLayouts_ }
-      , pushConstantRangeCount{ pushConstantRangeCount_ }
-      , pPushConstantRanges{ pPushConstantRanges_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineLayoutCreateInfo( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateFlags   flags_                  = {},
+                                                   uint32_t                                          setLayoutCount_         = {},
+                                                   const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_            = {},
+                                                   uint32_t                                          pushConstantRangeCount_ = {},
+                                                   const VULKAN_HPP_NAMESPACE::PushConstantRange *   pPushConstantRanges_    = {},
+                                                   const void *                                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , setLayoutCount( setLayoutCount_ )
+      , pSetLayouts( pSetLayouts_ )
+      , pushConstantRangeCount( pushConstantRangeCount_ )
+      , pPushConstantRanges( pPushConstantRanges_ )
     {
     }
 
@@ -131031,10 +93975,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineLayoutCreateInfo( PipelineLayoutCreateFlags                                  flags_,
-                              ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_,
-                              ArrayProxyNoTemporaries<const PushConstantRange> const &   pushConstantRanges_ = {},
-                              const void *                                               pNext_              = nullptr )
+    PipelineLayoutCreateInfo( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateFlags                                                        flags_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PushConstantRange> const &   pushConstantRanges_ = {},
+                              const void *                                                                                           pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , setLayoutCount( static_cast<uint32_t>( setLayouts_.size() ) )
@@ -131046,22 +93990,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineLayoutCreateInfo & operator=( PipelineLayoutCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineLayoutCreateInfo & operator=( VkPipelineLayoutCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineLayoutCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineLayoutCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setFlags( PipelineLayoutCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PipelineLayoutCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -131073,14 +94017,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setPSetLayouts( const DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setPSetLayouts( const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pSetLayouts = pSetLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineLayoutCreateInfo & setSetLayouts( ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
+    PipelineLayoutCreateInfo &
+      setSetLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       setLayoutCount = static_cast<uint32_t>( setLayouts_.size() );
       pSetLayouts    = setLayouts_.data();
@@ -131094,21 +94039,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo & setPPushConstantRanges( const PushConstantRange * pPushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineLayoutCreateInfo &
+      setPPushConstantRanges( const VULKAN_HPP_NAMESPACE::PushConstantRange * pPushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
     {
       pPushConstantRanges = pPushConstantRanges_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineLayoutCreateInfo & setPushConstantRanges( ArrayProxyNoTemporaries<const PushConstantRange> const & pushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
+    PipelineLayoutCreateInfo & setPushConstantRanges(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PushConstantRange> const & pushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
     {
       pushConstantRangeCount = static_cast<uint32_t>( pushConstantRanges_.size() );
       pPushConstantRanges    = pushConstantRanges_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineLayoutCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131120,24 +94067,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineLayoutCreateInfo *>( this );
     }
 
-    operator VkPipelineLayoutCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineLayoutCreateInfo *>( this );
-    }
-
-    operator VkPipelineLayoutCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineLayoutCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineLayoutCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayoutCreateFlags const &,
                uint32_t const &,
-               const DescriptorSetLayout * const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * const &,
                uint32_t const &,
-               const PushConstantRange * const &>
+               const VULKAN_HPP_NAMESPACE::PushConstantRange * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, setLayoutCount, pSetLayouts, pushConstantRangeCount, pPushConstantRanges );
@@ -131165,31 +94106,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                  = StructureType::ePipelineLayoutCreateInfo;
-    const void *                pNext                  = {};
-    PipelineLayoutCreateFlags   flags                  = {};
-    uint32_t                    setLayoutCount         = {};
-    const DescriptorSetLayout * pSetLayouts            = {};
-    uint32_t                    pushConstantRangeCount = {};
-    const PushConstantRange *   pPushConstantRanges    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                  = StructureType::ePipelineLayoutCreateInfo;
+    const void *                                      pNext                  = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayoutCreateFlags   flags                  = {};
+    uint32_t                                          setLayoutCount         = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts            = {};
+    uint32_t                                          pushConstantRangeCount = {};
+    const VULKAN_HPP_NAMESPACE::PushConstantRange *   pPushConstantRanges    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineLayoutCreateInfo>
-  {
-    using Type = PipelineLayoutCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineLayoutCreateInfo>
   {
     using Type = PipelineLayoutCreateInfo;
   };
 
-  // wrapper struct for struct VkPipelinePropertiesIdentifierEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelinePropertiesIdentifierEXT.html
   struct PipelinePropertiesIdentifierEXT
   {
     using NativeType = VkPipelinePropertiesIdentifierEXT;
@@ -131197,11 +94128,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelinePropertiesIdentifierEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 PipelinePropertiesIdentifierEXT( std::array<uint8_t, VK_UUID_SIZE> const & pipelineIdentifier_ = {},
                                                              void *                                    pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipelineIdentifier{ pipelineIdentifier_ }
+      : pNext( pNext_ )
+      , pipelineIdentifier( pipelineIdentifier_ )
     {
     }
 
@@ -131213,11 +94144,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelinePropertiesIdentifierEXT & operator=( PipelinePropertiesIdentifierEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelinePropertiesIdentifierEXT & operator=( VkPipelinePropertiesIdentifierEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelinePropertiesIdentifierEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelinePropertiesIdentifierEXT const *>( &rhs );
       return *this;
     }
 
@@ -131231,18 +94162,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelinePropertiesIdentifierEXT *>( this );
     }
 
-    operator VkPipelinePropertiesIdentifierEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelinePropertiesIdentifierEXT *>( this );
-    }
-
-    operator VkPipelinePropertiesIdentifierEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelinePropertiesIdentifierEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pipelineIdentifier );
     }
@@ -131267,27 +94193,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType              = StructureType::ePipelinePropertiesIdentifierEXT;
-    void *                                pNext              = {};
-    ArrayWrapper1D<uint8_t, VK_UUID_SIZE> pipelineIdentifier = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType              = StructureType::ePipelinePropertiesIdentifierEXT;
+    void *                                                      pNext              = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_UUID_SIZE> pipelineIdentifier = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelinePropertiesIdentifierEXT>
-  {
-    using Type = PipelinePropertiesIdentifierEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelinePropertiesIdentifierEXT>
   {
     using Type = PipelinePropertiesIdentifierEXT;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationConservativeStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationConservativeStateCreateInfoEXT.html
   struct PipelineRasterizationConservativeStateCreateInfoEXT
   {
     using NativeType = VkPipelineRasterizationConservativeStateCreateInfoEXT;
@@ -131295,16 +94211,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PipelineRasterizationConservativeStateCreateInfoEXT(
-      PipelineRasterizationConservativeStateCreateFlagsEXT flags_                            = {},
-      ConservativeRasterizationModeEXT                     conservativeRasterizationMode_    = ConservativeRasterizationModeEXT::eDisabled,
-      float                                                extraPrimitiveOverestimationSize_ = {},
-      const void *                                         pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , conservativeRasterizationMode{ conservativeRasterizationMode_ }
-      , extraPrimitiveOverestimationSize{ extraPrimitiveOverestimationSize_ }
+      VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateFlagsEXT flags_     = {},
+      VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode_ = VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT::eDisabled,
+      float                                                  extraPrimitiveOverestimationSize_ = {},
+      const void *                                           pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , conservativeRasterizationMode( conservativeRasterizationMode_ )
+      , extraPrimitiveOverestimationSize( extraPrimitiveOverestimationSize_ )
     {
     }
 
@@ -131318,15 +94234,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineRasterizationConservativeStateCreateInfoEXT &
       operator=( PipelineRasterizationConservativeStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationConservativeStateCreateInfoEXT & operator=( VkPipelineRasterizationConservativeStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationConservativeStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationConservativeStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -131334,14 +94250,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationConservativeStateCreateInfoEXT &
-      setFlags( PipelineRasterizationConservativeStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationConservativeStateCreateInfoEXT &
-      setConservativeRasterizationMode( ConservativeRasterizationModeEXT conservativeRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
+      setConservativeRasterizationMode( VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       conservativeRasterizationMode = conservativeRasterizationMode_;
       return *this;
@@ -131353,7 +94269,7 @@ namespace VULKAN_HPP_NAMESPACE
       extraPrimitiveOverestimationSize = extraPrimitiveOverestimationSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationConservativeStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131365,22 +94281,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationConservativeStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineRasterizationConservativeStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationConservativeStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineRasterizationConservativeStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationConservativeStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineRasterizationConservativeStateCreateFlagsEXT const &,
-               ConservativeRasterizationModeEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT const &,
                float const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, conservativeRasterizationMode, extraPrimitiveOverestimationSize );
@@ -131408,29 +94318,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                        sType                            = StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT;
-    const void *                                         pNext                            = {};
-    PipelineRasterizationConservativeStateCreateFlagsEXT flags                            = {};
-    ConservativeRasterizationModeEXT                     conservativeRasterizationMode    = ConservativeRasterizationModeEXT::eDisabled;
-    float                                                extraPrimitiveOverestimationSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                        sType     = StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT;
+    const void *                                                               pNext     = {};
+    VULKAN_HPP_NAMESPACE::PipelineRasterizationConservativeStateCreateFlagsEXT flags     = {};
+    VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT conservativeRasterizationMode = VULKAN_HPP_NAMESPACE::ConservativeRasterizationModeEXT::eDisabled;
+    float                                                  extraPrimitiveOverestimationSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationConservativeStateCreateInfoEXT>
-  {
-    using Type = PipelineRasterizationConservativeStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT>
   {
     using Type = PipelineRasterizationConservativeStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationDepthClipStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationDepthClipStateCreateInfoEXT.html
   struct PipelineRasterizationDepthClipStateCreateInfoEXT
   {
     using NativeType = VkPipelineRasterizationDepthClipStateCreateInfoEXT;
@@ -131438,13 +94338,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationDepthClipStateCreateInfoEXT( PipelineRasterizationDepthClipStateCreateFlagsEXT flags_           = {},
-                                                                           Bool32                                            depthClipEnable_ = {},
-                                                                           const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , depthClipEnable{ depthClipEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationDepthClipStateCreateInfoEXT( VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateFlagsEXT flags_ = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable_                                  = {},
+                                                                           const void *                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , depthClipEnable( depthClipEnable_ )
     {
     }
 
@@ -131457,15 +94357,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineRasterizationDepthClipStateCreateInfoEXT & operator=( PipelineRasterizationDepthClipStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationDepthClipStateCreateInfoEXT & operator=( VkPipelineRasterizationDepthClipStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationDepthClipStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationDepthClipStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -131473,18 +94373,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationDepthClipStateCreateInfoEXT &
-      setFlags( PipelineRasterizationDepthClipStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationDepthClipStateCreateInfoEXT & setDepthClipEnable( Bool32 depthClipEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationDepthClipStateCreateInfoEXT &
+      setDepthClipEnable( VULKAN_HPP_NAMESPACE::Bool32 depthClipEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       depthClipEnable = depthClipEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationDepthClipStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131496,18 +94397,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationDepthClipStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineRasterizationDepthClipStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationDepthClipStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineRasterizationDepthClipStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationDepthClipStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineRasterizationDepthClipStateCreateFlagsEXT const &, Bool32 const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, depthClipEnable );
@@ -131533,120 +94431,111 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                     sType           = StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT;
-    const void *                                      pNext           = {};
-    PipelineRasterizationDepthClipStateCreateFlagsEXT flags           = {};
-    Bool32                                            depthClipEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                     sType           = StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT;
+    const void *                                                            pNext           = {};
+    VULKAN_HPP_NAMESPACE::PipelineRasterizationDepthClipStateCreateFlagsEXT flags           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                            depthClipEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationDepthClipStateCreateInfoEXT>
-  {
-    using Type = PipelineRasterizationDepthClipStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT>
   {
     using Type = PipelineRasterizationDepthClipStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationLineStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationLineStateCreateInfo.html
-  struct PipelineRasterizationLineStateCreateInfo
+  struct PipelineRasterizationLineStateCreateInfoKHR
   {
-    using NativeType = VkPipelineRasterizationLineStateCreateInfo;
+    using NativeType = VkPipelineRasterizationLineStateCreateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationLineStateCreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationLineStateCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationLineStateCreateInfo( LineRasterizationMode lineRasterizationMode_ = LineRasterizationMode::eDefault,
-                                                                   Bool32                stippledLineEnable_    = {},
-                                                                   uint32_t              lineStippleFactor_     = {},
-                                                                   uint16_t              lineStipplePattern_    = {},
-                                                                   const void *          pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , lineRasterizationMode{ lineRasterizationMode_ }
-      , stippledLineEnable{ stippledLineEnable_ }
-      , lineStippleFactor{ lineStippleFactor_ }
-      , lineStipplePattern{ lineStipplePattern_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationLineStateCreateInfoKHR(
+      VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR lineRasterizationMode_ = VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR::eDefault,
+      VULKAN_HPP_NAMESPACE::Bool32                   stippledLineEnable_    = {},
+      uint32_t                                       lineStippleFactor_     = {},
+      uint16_t                                       lineStipplePattern_    = {},
+      const void *                                   pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , lineRasterizationMode( lineRasterizationMode_ )
+      , stippledLineEnable( stippledLineEnable_ )
+      , lineStippleFactor( lineStippleFactor_ )
+      , lineStipplePattern( lineStipplePattern_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationLineStateCreateInfo( PipelineRasterizationLineStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationLineStateCreateInfoKHR( PipelineRasterizationLineStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PipelineRasterizationLineStateCreateInfo( VkPipelineRasterizationLineStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineRasterizationLineStateCreateInfo( *reinterpret_cast<PipelineRasterizationLineStateCreateInfo const *>( &rhs ) )
+    PipelineRasterizationLineStateCreateInfoKHR( VkPipelineRasterizationLineStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PipelineRasterizationLineStateCreateInfoKHR( *reinterpret_cast<PipelineRasterizationLineStateCreateInfoKHR const *>( &rhs ) )
     {
     }
 
-    PipelineRasterizationLineStateCreateInfo & operator=( PipelineRasterizationLineStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PipelineRasterizationLineStateCreateInfoKHR & operator=( PipelineRasterizationLineStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PipelineRasterizationLineStateCreateInfo & operator=( VkPipelineRasterizationLineStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PipelineRasterizationLineStateCreateInfoKHR & operator=( VkPipelineRasterizationLineStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationLineStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationLineStateCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfo &
-      setLineRasterizationMode( LineRasterizationMode lineRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfoKHR &
+      setLineRasterizationMode( VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR lineRasterizationMode_ ) VULKAN_HPP_NOEXCEPT
     {
       lineRasterizationMode = lineRasterizationMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfo & setStippledLineEnable( Bool32 stippledLineEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfoKHR &
+      setStippledLineEnable( VULKAN_HPP_NAMESPACE::Bool32 stippledLineEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       stippledLineEnable = stippledLineEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfo & setLineStippleFactor( uint32_t lineStippleFactor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfoKHR & setLineStippleFactor( uint32_t lineStippleFactor_ ) VULKAN_HPP_NOEXCEPT
     {
       lineStippleFactor = lineStippleFactor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfo & setLineStipplePattern( uint16_t lineStipplePattern_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationLineStateCreateInfoKHR & setLineStipplePattern( uint16_t lineStipplePattern_ ) VULKAN_HPP_NOEXCEPT
     {
       lineStipplePattern = lineStipplePattern_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPipelineRasterizationLineStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPipelineRasterizationLineStateCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPipelineRasterizationLineStateCreateInfo *>( this );
+      return *reinterpret_cast<const VkPipelineRasterizationLineStateCreateInfoKHR *>( this );
     }
 
-    operator VkPipelineRasterizationLineStateCreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPipelineRasterizationLineStateCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPipelineRasterizationLineStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineRasterizationLineStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationLineStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineRasterizationLineStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationLineStateCreateInfo *>( this );
+      return *reinterpret_cast<VkPipelineRasterizationLineStateCreateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, LineRasterizationMode const &, Bool32 const &, uint32_t const &, uint16_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint16_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, lineRasterizationMode, stippledLineEnable, lineStippleFactor, lineStipplePattern );
@@ -131654,9 +94543,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineRasterizationLineStateCreateInfo const & ) const = default;
+    auto operator<=>( PipelineRasterizationLineStateCreateInfoKHR const & ) const = default;
 #else
-    bool operator==( PipelineRasterizationLineStateCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PipelineRasterizationLineStateCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -131667,40 +94556,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PipelineRasterizationLineStateCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PipelineRasterizationLineStateCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType         sType                 = StructureType::ePipelineRasterizationLineStateCreateInfo;
-    const void *          pNext                 = {};
-    LineRasterizationMode lineRasterizationMode = LineRasterizationMode::eDefault;
-    Bool32                stippledLineEnable    = {};
-    uint32_t              lineStippleFactor     = {};
-    uint16_t              lineStipplePattern    = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                 = StructureType::ePipelineRasterizationLineStateCreateInfoKHR;
+    const void *                                   pNext                 = {};
+    VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR lineRasterizationMode = VULKAN_HPP_NAMESPACE::LineRasterizationModeKHR::eDefault;
+    VULKAN_HPP_NAMESPACE::Bool32                   stippledLineEnable    = {};
+    uint32_t                                       lineStippleFactor     = {};
+    uint16_t                                       lineStipplePattern    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationLineStateCreateInfo>
-  {
-    using Type = PipelineRasterizationLineStateCreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePipelineRasterizationLineStateCreateInfo>
+  struct CppType<StructureType, StructureType::ePipelineRasterizationLineStateCreateInfoKHR>
   {
-    using Type = PipelineRasterizationLineStateCreateInfo;
+    using Type = PipelineRasterizationLineStateCreateInfoKHR;
   };
 
-  using PipelineRasterizationLineStateCreateInfoEXT = PipelineRasterizationLineStateCreateInfo;
-  using PipelineRasterizationLineStateCreateInfoKHR = PipelineRasterizationLineStateCreateInfo;
+  using PipelineRasterizationLineStateCreateInfoEXT = PipelineRasterizationLineStateCreateInfoKHR;
 
-  // wrapper struct for struct VkPipelineRasterizationProvokingVertexStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationProvokingVertexStateCreateInfoEXT.html
   struct PipelineRasterizationProvokingVertexStateCreateInfoEXT
   {
     using NativeType = VkPipelineRasterizationProvokingVertexStateCreateInfoEXT;
@@ -131708,12 +94586,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PipelineRasterizationProvokingVertexStateCreateInfoEXT( ProvokingVertexModeEXT provokingVertexMode_ = ProvokingVertexModeEXT::eFirstVertex,
-                                                              const void *           pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , provokingVertexMode{ provokingVertexMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationProvokingVertexStateCreateInfoEXT(
+      VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode_ = VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT::eFirstVertex,
+      const void *                                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , provokingVertexMode( provokingVertexMode_ )
     {
     }
 
@@ -131727,16 +94605,16 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineRasterizationProvokingVertexStateCreateInfoEXT &
       operator=( PipelineRasterizationProvokingVertexStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationProvokingVertexStateCreateInfoEXT &
       operator=( VkPipelineRasterizationProvokingVertexStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationProvokingVertexStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationProvokingVertexStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationProvokingVertexStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -131744,12 +94622,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationProvokingVertexStateCreateInfoEXT &
-      setProvokingVertexMode( ProvokingVertexModeEXT provokingVertexMode_ ) VULKAN_HPP_NOEXCEPT
+      setProvokingVertexMode( VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode_ ) VULKAN_HPP_NOEXCEPT
     {
       provokingVertexMode = provokingVertexMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationProvokingVertexStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131761,18 +94639,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineRasterizationProvokingVertexStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ProvokingVertexModeEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, provokingVertexMode );
     }
@@ -131797,27 +94670,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType               = StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT;
-    const void *           pNext               = {};
-    ProvokingVertexModeEXT provokingVertexMode = ProvokingVertexModeEXT::eFirstVertex;
+    VULKAN_HPP_NAMESPACE::StructureType          sType               = StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT;
+    const void *                                 pNext               = {};
+    VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT provokingVertexMode = VULKAN_HPP_NAMESPACE::ProvokingVertexModeEXT::eFirstVertex;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationProvokingVertexStateCreateInfoEXT>
-  {
-    using Type = PipelineRasterizationProvokingVertexStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT>
   {
     using Type = PipelineRasterizationProvokingVertexStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationStateRasterizationOrderAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationStateRasterizationOrderAMD.html
   struct PipelineRasterizationStateRasterizationOrderAMD
   {
     using NativeType = VkPipelineRasterizationStateRasterizationOrderAMD;
@@ -131825,11 +94688,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationStateRasterizationOrderAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateRasterizationOrderAMD( RasterizationOrderAMD rasterizationOrder_ = RasterizationOrderAMD::eStrict,
-                                                                          const void *          pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rasterizationOrder{ rasterizationOrder_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateRasterizationOrderAMD(
+      VULKAN_HPP_NAMESPACE::RasterizationOrderAMD rasterizationOrder_ = VULKAN_HPP_NAMESPACE::RasterizationOrderAMD::eStrict,
+      const void *                                pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , rasterizationOrder( rasterizationOrder_ )
     {
     }
 
@@ -131842,15 +94706,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineRasterizationStateRasterizationOrderAMD & operator=( PipelineRasterizationStateRasterizationOrderAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationStateRasterizationOrderAMD & operator=( VkPipelineRasterizationStateRasterizationOrderAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationStateRasterizationOrderAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateRasterizationOrderAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateRasterizationOrderAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -131858,12 +94722,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateRasterizationOrderAMD &
-      setRasterizationOrder( RasterizationOrderAMD rasterizationOrder_ ) VULKAN_HPP_NOEXCEPT
+      setRasterizationOrder( VULKAN_HPP_NAMESPACE::RasterizationOrderAMD rasterizationOrder_ ) VULKAN_HPP_NOEXCEPT
     {
       rasterizationOrder = rasterizationOrder_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationStateRasterizationOrderAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131875,18 +94739,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationStateRasterizationOrderAMD *>( this );
     }
 
-    operator VkPipelineRasterizationStateRasterizationOrderAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationStateRasterizationOrderAMD *>( this );
-    }
-
-    operator VkPipelineRasterizationStateRasterizationOrderAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationStateRasterizationOrderAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, RasterizationOrderAMD const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::RasterizationOrderAMD const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, rasterizationOrder );
     }
@@ -131911,27 +94770,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType              = StructureType::ePipelineRasterizationStateRasterizationOrderAMD;
-    const void *          pNext              = {};
-    RasterizationOrderAMD rasterizationOrder = RasterizationOrderAMD::eStrict;
+    VULKAN_HPP_NAMESPACE::StructureType         sType              = StructureType::ePipelineRasterizationStateRasterizationOrderAMD;
+    const void *                                pNext              = {};
+    VULKAN_HPP_NAMESPACE::RasterizationOrderAMD rasterizationOrder = VULKAN_HPP_NAMESPACE::RasterizationOrderAMD::eStrict;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationStateRasterizationOrderAMD>
-  {
-    using Type = PipelineRasterizationStateRasterizationOrderAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationStateRasterizationOrderAMD>
   {
     using Type = PipelineRasterizationStateRasterizationOrderAMD;
   };
 
-  // wrapper struct for struct VkPipelineRasterizationStateStreamCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRasterizationStateStreamCreateInfoEXT.html
   struct PipelineRasterizationStateStreamCreateInfoEXT
   {
     using NativeType = VkPipelineRasterizationStateStreamCreateInfoEXT;
@@ -131939,13 +94788,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRasterizationStateStreamCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateStreamCreateInfoEXT( PipelineRasterizationStateStreamCreateFlagsEXT flags_               = {},
-                                                                        uint32_t                                       rasterizationStream_ = {},
-                                                                        const void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , rasterizationStream{ rasterizationStream_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRasterizationStateStreamCreateInfoEXT( VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateFlagsEXT flags_ = {},
+                                                                        uint32_t     rasterizationStream_                                           = {},
+                                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , rasterizationStream( rasterizationStream_ )
     {
     }
 
@@ -131958,15 +94807,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineRasterizationStateStreamCreateInfoEXT & operator=( PipelineRasterizationStateStreamCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRasterizationStateStreamCreateInfoEXT & operator=( VkPipelineRasterizationStateStreamCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRasterizationStateStreamCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateStreamCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -131974,7 +94823,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRasterizationStateStreamCreateInfoEXT &
-      setFlags( PipelineRasterizationStateStreamCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -131985,7 +94834,7 @@ namespace VULKAN_HPP_NAMESPACE
       rasterizationStream = rasterizationStream_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRasterizationStateStreamCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -131997,18 +94846,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRasterizationStateStreamCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineRasterizationStateStreamCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRasterizationStateStreamCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineRasterizationStateStreamCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRasterizationStateStreamCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PipelineRasterizationStateStreamCreateFlagsEXT const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateFlagsEXT const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, rasterizationStream );
@@ -132034,27 +94880,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                  sType               = StructureType::ePipelineRasterizationStateStreamCreateInfoEXT;
-    const void *                                   pNext               = {};
-    PipelineRasterizationStateStreamCreateFlagsEXT flags               = {};
-    uint32_t                                       rasterizationStream = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                  sType               = StructureType::ePipelineRasterizationStateStreamCreateInfoEXT;
+    const void *                                                         pNext               = {};
+    VULKAN_HPP_NAMESPACE::PipelineRasterizationStateStreamCreateFlagsEXT flags               = {};
+    uint32_t                                                             rasterizationStream = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRasterizationStateStreamCreateInfoEXT>
-  {
-    using Type = PipelineRasterizationStateStreamCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRasterizationStateStreamCreateInfoEXT>
   {
     using Type = PipelineRasterizationStateStreamCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineRenderingCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRenderingCreateInfo.html
   struct PipelineRenderingCreateInfo
   {
     using NativeType = VkPipelineRenderingCreateInfo;
@@ -132062,19 +94899,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRenderingCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRenderingCreateInfo( uint32_t       viewMask_                = {},
-                                                      uint32_t       colorAttachmentCount_    = {},
-                                                      const Format * pColorAttachmentFormats_ = {},
-                                                      Format         depthAttachmentFormat_   = Format::eUndefined,
-                                                      Format         stencilAttachmentFormat_ = Format::eUndefined,
-                                                      const void *   pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , viewMask{ viewMask_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentFormats{ pColorAttachmentFormats_ }
-      , depthAttachmentFormat{ depthAttachmentFormat_ }
-      , stencilAttachmentFormat{ stencilAttachmentFormat_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRenderingCreateInfo( uint32_t                             viewMask_                = {},
+                                                      uint32_t                             colorAttachmentCount_    = {},
+                                                      const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats_ = {},
+                                                      VULKAN_HPP_NAMESPACE::Format         depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                      VULKAN_HPP_NAMESPACE::Format         stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                      const void *                         pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , viewMask( viewMask_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentFormats( pColorAttachmentFormats_ )
+      , depthAttachmentFormat( depthAttachmentFormat_ )
+      , stencilAttachmentFormat( stencilAttachmentFormat_ )
     {
     }
 
@@ -132086,11 +94923,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineRenderingCreateInfo( uint32_t                                      viewMask_,
-                                 ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_,
-                                 Format                                        depthAttachmentFormat_   = Format::eUndefined,
-                                 Format                                        stencilAttachmentFormat_ = Format::eUndefined,
-                                 const void *                                  pNext_                   = nullptr )
+    PipelineRenderingCreateInfo( uint32_t                                                                                  viewMask_,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_,
+                                 VULKAN_HPP_NAMESPACE::Format depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                 VULKAN_HPP_NAMESPACE::Format stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                 const void *                 pNext_                   = nullptr )
       : pNext( pNext_ )
       , viewMask( viewMask_ )
       , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentFormats_.size() ) )
@@ -132102,15 +94939,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineRenderingCreateInfo & operator=( PipelineRenderingCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRenderingCreateInfo & operator=( VkPipelineRenderingCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRenderingCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRenderingCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -132129,14 +94966,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo & setPColorAttachmentFormats( const Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo &
+      setPColorAttachmentFormats( const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentFormats = pColorAttachmentFormats_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineRenderingCreateInfo & setColorAttachmentFormats( ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    PipelineRenderingCreateInfo & setColorAttachmentFormats(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount    = static_cast<uint32_t>( colorAttachmentFormats_.size() );
       pColorAttachmentFormats = colorAttachmentFormats_.data();
@@ -132144,18 +94983,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo & setDepthAttachmentFormat( Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo & setDepthAttachmentFormat( VULKAN_HPP_NAMESPACE::Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       depthAttachmentFormat = depthAttachmentFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo & setStencilAttachmentFormat( Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRenderingCreateInfo &
+      setStencilAttachmentFormat( VULKAN_HPP_NAMESPACE::Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilAttachmentFormat = stencilAttachmentFormat_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRenderingCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -132167,18 +95007,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRenderingCreateInfo *>( this );
     }
 
-    operator VkPipelineRenderingCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRenderingCreateInfo *>( this );
-    }
-
-    operator VkPipelineRenderingCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRenderingCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const Format * const &, Format const &, Format const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Format * const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, viewMask, colorAttachmentCount, pColorAttachmentFormats, depthAttachmentFormat, stencilAttachmentFormat );
@@ -132206,23 +95046,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType                   = StructureType::ePipelineRenderingCreateInfo;
-    const void *   pNext                   = {};
-    uint32_t       viewMask                = {};
-    uint32_t       colorAttachmentCount    = {};
-    const Format * pColorAttachmentFormats = {};
-    Format         depthAttachmentFormat   = Format::eUndefined;
-    Format         stencilAttachmentFormat = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType  sType                   = StructureType::ePipelineRenderingCreateInfo;
+    const void *                         pNext                   = {};
+    uint32_t                             viewMask                = {};
+    uint32_t                             colorAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats = {};
+    VULKAN_HPP_NAMESPACE::Format         depthAttachmentFormat   = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format         stencilAttachmentFormat = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRenderingCreateInfo>
-  {
-    using Type = PipelineRenderingCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRenderingCreateInfo>
   {
@@ -132231,8 +95063,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PipelineRenderingCreateInfoKHR = PipelineRenderingCreateInfo;
 
-  // wrapper struct for struct VkPipelineRepresentativeFragmentTestStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRepresentativeFragmentTestStateCreateInfoNV.html
   struct PipelineRepresentativeFragmentTestStateCreateInfoNV
   {
     using NativeType = VkPipelineRepresentativeFragmentTestStateCreateInfoNV;
@@ -132240,11 +95070,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRepresentativeFragmentTestStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRepresentativeFragmentTestStateCreateInfoNV( Bool32       representativeFragmentTestEnable_ = {},
-                                                                              const void * pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , representativeFragmentTestEnable{ representativeFragmentTestEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRepresentativeFragmentTestStateCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable_ = {},
+                                                                              const void *                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , representativeFragmentTestEnable( representativeFragmentTestEnable_ )
     {
     }
 
@@ -132258,15 +95088,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineRepresentativeFragmentTestStateCreateInfoNV &
       operator=( PipelineRepresentativeFragmentTestStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineRepresentativeFragmentTestStateCreateInfoNV & operator=( VkPipelineRepresentativeFragmentTestStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRepresentativeFragmentTestStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRepresentativeFragmentTestStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineRepresentativeFragmentTestStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -132274,12 +95104,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineRepresentativeFragmentTestStateCreateInfoNV &
-      setRepresentativeFragmentTestEnable( Bool32 representativeFragmentTestEnable_ ) VULKAN_HPP_NOEXCEPT
+      setRepresentativeFragmentTestEnable( VULKAN_HPP_NAMESPACE::Bool32 representativeFragmentTestEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       representativeFragmentTestEnable = representativeFragmentTestEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineRepresentativeFragmentTestStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -132291,18 +95121,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineRepresentativeFragmentTestStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineRepresentativeFragmentTestStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRepresentativeFragmentTestStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineRepresentativeFragmentTestStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRepresentativeFragmentTestStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, representativeFragmentTestEnable );
     }
@@ -132327,122 +95152,111 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                            = StructureType::ePipelineRepresentativeFragmentTestStateCreateInfoNV;
-    const void *  pNext                            = {};
-    Bool32        representativeFragmentTestEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                            = StructureType::ePipelineRepresentativeFragmentTestStateCreateInfoNV;
+    const void *                        pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        representativeFragmentTestEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRepresentativeFragmentTestStateCreateInfoNV>
-  {
-    using Type = PipelineRepresentativeFragmentTestStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineRepresentativeFragmentTestStateCreateInfoNV>
   {
     using Type = PipelineRepresentativeFragmentTestStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineRobustnessCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineRobustnessCreateInfo.html
-  struct PipelineRobustnessCreateInfo
+  struct PipelineRobustnessCreateInfoEXT
   {
-    using NativeType = VkPipelineRobustnessCreateInfo;
+    using NativeType = VkPipelineRobustnessCreateInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRobustnessCreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineRobustnessCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineRobustnessCreateInfo( PipelineRobustnessBufferBehavior storageBuffers_ = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                                       PipelineRobustnessBufferBehavior uniformBuffers_ = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                                       PipelineRobustnessBufferBehavior vertexInputs_   = PipelineRobustnessBufferBehavior::eDeviceDefault,
-                                                       PipelineRobustnessImageBehavior  images_         = PipelineRobustnessImageBehavior::eDeviceDefault,
-                                                       const void *                     pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , storageBuffers{ storageBuffers_ }
-      , uniformBuffers{ uniformBuffers_ }
-      , vertexInputs{ vertexInputs_ }
-      , images{ images_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineRobustnessCreateInfoEXT(
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT storageBuffers_ = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT uniformBuffers_ = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT vertexInputs_   = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault,
+      VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT  images_         = VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT::eDeviceDefault,
+      const void *                                              pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , storageBuffers( storageBuffers_ )
+      , uniformBuffers( uniformBuffers_ )
+      , vertexInputs( vertexInputs_ )
+      , images( images_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PipelineRobustnessCreateInfo( PipelineRobustnessCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PipelineRobustnessCreateInfoEXT( PipelineRobustnessCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PipelineRobustnessCreateInfo( VkPipelineRobustnessCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineRobustnessCreateInfo( *reinterpret_cast<PipelineRobustnessCreateInfo const *>( &rhs ) )
+    PipelineRobustnessCreateInfoEXT( VkPipelineRobustnessCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PipelineRobustnessCreateInfoEXT( *reinterpret_cast<PipelineRobustnessCreateInfoEXT const *>( &rhs ) )
     {
     }
 
-    PipelineRobustnessCreateInfo & operator=( PipelineRobustnessCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PipelineRobustnessCreateInfoEXT & operator=( PipelineRobustnessCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PipelineRobustnessCreateInfo & operator=( VkPipelineRobustnessCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PipelineRobustnessCreateInfoEXT & operator=( VkPipelineRobustnessCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineRobustnessCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineRobustnessCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfo & setStorageBuffers( PipelineRobustnessBufferBehavior storageBuffers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfoEXT &
+      setStorageBuffers( VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT storageBuffers_ ) VULKAN_HPP_NOEXCEPT
     {
       storageBuffers = storageBuffers_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfo & setUniformBuffers( PipelineRobustnessBufferBehavior uniformBuffers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfoEXT &
+      setUniformBuffers( VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT uniformBuffers_ ) VULKAN_HPP_NOEXCEPT
     {
       uniformBuffers = uniformBuffers_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfo & setVertexInputs( PipelineRobustnessBufferBehavior vertexInputs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfoEXT &
+      setVertexInputs( VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT vertexInputs_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexInputs = vertexInputs_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfo & setImages( PipelineRobustnessImageBehavior images_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineRobustnessCreateInfoEXT & setImages( VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT images_ ) VULKAN_HPP_NOEXCEPT
     {
       images = images_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPipelineRobustnessCreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPipelineRobustnessCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPipelineRobustnessCreateInfo *>( this );
+      return *reinterpret_cast<const VkPipelineRobustnessCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineRobustnessCreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPipelineRobustnessCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPipelineRobustnessCreateInfo *>( this );
-    }
-
-    operator VkPipelineRobustnessCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineRobustnessCreateInfo *>( this );
-    }
-
-    operator VkPipelineRobustnessCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineRobustnessCreateInfo *>( this );
+      return *reinterpret_cast<VkPipelineRobustnessCreateInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessBufferBehavior const &,
-               PipelineRobustnessImageBehavior const &>
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT const &,
+               VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, storageBuffers, uniformBuffers, vertexInputs, images );
@@ -132450,9 +95264,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineRobustnessCreateInfo const & ) const = default;
+    auto operator<=>( PipelineRobustnessCreateInfoEXT const & ) const = default;
 #else
-    bool operator==( PipelineRobustnessCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PipelineRobustnessCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -132462,39 +95276,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PipelineRobustnessCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PipelineRobustnessCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                    sType          = StructureType::ePipelineRobustnessCreateInfo;
-    const void *                     pNext          = {};
-    PipelineRobustnessBufferBehavior storageBuffers = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior uniformBuffers = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessBufferBehavior vertexInputs   = PipelineRobustnessBufferBehavior::eDeviceDefault;
-    PipelineRobustnessImageBehavior  images         = PipelineRobustnessImageBehavior::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType          = StructureType::ePipelineRobustnessCreateInfoEXT;
+    const void *                                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT storageBuffers = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT uniformBuffers = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT vertexInputs   = VULKAN_HPP_NAMESPACE::PipelineRobustnessBufferBehaviorEXT::eDeviceDefault;
+    VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT  images         = VULKAN_HPP_NAMESPACE::PipelineRobustnessImageBehaviorEXT::eDeviceDefault;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineRobustnessCreateInfo>
-  {
-    using Type = PipelineRobustnessCreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePipelineRobustnessCreateInfo>
+  struct CppType<StructureType, StructureType::ePipelineRobustnessCreateInfoEXT>
   {
-    using Type = PipelineRobustnessCreateInfo;
+    using Type = PipelineRobustnessCreateInfoEXT;
   };
 
-  using PipelineRobustnessCreateInfoEXT = PipelineRobustnessCreateInfo;
-
-  // wrapper struct for struct VkPipelineSampleLocationsStateCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineSampleLocationsStateCreateInfoEXT.html
   struct PipelineSampleLocationsStateCreateInfoEXT
   {
     using NativeType = VkPipelineSampleLocationsStateCreateInfoEXT;
@@ -132502,13 +95304,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineSampleLocationsStateCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineSampleLocationsStateCreateInfoEXT( Bool32                 sampleLocationsEnable_ = {},
-                                                                    SampleLocationsInfoEXT sampleLocationsInfo_   = {},
-                                                                    const void *           pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampleLocationsEnable{ sampleLocationsEnable_ }
-      , sampleLocationsInfo{ sampleLocationsInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineSampleLocationsStateCreateInfoEXT( VULKAN_HPP_NAMESPACE::Bool32                 sampleLocationsEnable_ = {},
+                                                                    VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo_   = {},
+                                                                    const void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampleLocationsEnable( sampleLocationsEnable_ )
+      , sampleLocationsInfo( sampleLocationsInfo_ )
     {
     }
 
@@ -132520,34 +95322,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineSampleLocationsStateCreateInfoEXT & operator=( PipelineSampleLocationsStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineSampleLocationsStateCreateInfoEXT & operator=( VkPipelineSampleLocationsStateCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineSampleLocationsStateCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineSampleLocationsStateCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineSampleLocationsStateCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineSampleLocationsStateCreateInfoEXT & setSampleLocationsEnable( Bool32 sampleLocationsEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineSampleLocationsStateCreateInfoEXT &
+      setSampleLocationsEnable( VULKAN_HPP_NAMESPACE::Bool32 sampleLocationsEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsEnable = sampleLocationsEnable_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineSampleLocationsStateCreateInfoEXT &
-      setSampleLocationsInfo( SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
+      setSampleLocationsInfo( VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsInfo = sampleLocationsInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineSampleLocationsStateCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -132559,18 +95362,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineSampleLocationsStateCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineSampleLocationsStateCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineSampleLocationsStateCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineSampleLocationsStateCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineSampleLocationsStateCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, SampleLocationsInfoEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sampleLocationsEnable, sampleLocationsInfo );
     }
@@ -132596,28 +95397,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType                 = StructureType::ePipelineSampleLocationsStateCreateInfoEXT;
-    const void *           pNext                 = {};
-    Bool32                 sampleLocationsEnable = {};
-    SampleLocationsInfoEXT sampleLocationsInfo   = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType                 = StructureType::ePipelineSampleLocationsStateCreateInfoEXT;
+    const void *                                 pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32                 sampleLocationsEnable = {};
+    VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineSampleLocationsStateCreateInfoEXT>
-  {
-    using Type = PipelineSampleLocationsStateCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineSampleLocationsStateCreateInfoEXT>
   {
     using Type = PipelineSampleLocationsStateCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineShaderStageModuleIdentifierCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageModuleIdentifierCreateInfoEXT.html
   struct PipelineShaderStageModuleIdentifierCreateInfoEXT
   {
     using NativeType = VkPipelineShaderStageModuleIdentifierCreateInfoEXT;
@@ -132625,13 +95416,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PipelineShaderStageModuleIdentifierCreateInfoEXT( uint32_t        identifierSize_ = {},
                                                                            const uint8_t * pIdentifier_    = {},
                                                                            const void *    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , identifierSize{ identifierSize_ }
-      , pIdentifier{ pIdentifier_ }
+      : pNext( pNext_ )
+      , identifierSize( identifierSize_ )
+      , pIdentifier( pIdentifier_ )
     {
     }
 
@@ -132644,22 +95435,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineShaderStageModuleIdentifierCreateInfoEXT( ArrayProxyNoTemporaries<const uint8_t> const & identifier_, const void * pNext_ = nullptr )
+    PipelineShaderStageModuleIdentifierCreateInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint8_t> const & identifier_,
+                                                      const void *                                                         pNext_ = nullptr )
       : pNext( pNext_ ), identifierSize( static_cast<uint32_t>( identifier_.size() ) ), pIdentifier( identifier_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineShaderStageModuleIdentifierCreateInfoEXT & operator=( PipelineShaderStageModuleIdentifierCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineShaderStageModuleIdentifierCreateInfoEXT & operator=( VkPipelineShaderStageModuleIdentifierCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineShaderStageModuleIdentifierCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineShaderStageModuleIdentifierCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageModuleIdentifierCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -132679,14 +95471,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineShaderStageModuleIdentifierCreateInfoEXT & setIdentifier( ArrayProxyNoTemporaries<const uint8_t> const & identifier_ ) VULKAN_HPP_NOEXCEPT
+    PipelineShaderStageModuleIdentifierCreateInfoEXT &
+      setIdentifier( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint8_t> const & identifier_ ) VULKAN_HPP_NOEXCEPT
     {
       identifierSize = static_cast<uint32_t>( identifier_.size() );
       pIdentifier    = identifier_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineShaderStageModuleIdentifierCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -132698,18 +95491,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineShaderStageModuleIdentifierCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineShaderStageModuleIdentifierCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineShaderStageModuleIdentifierCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineShaderStageModuleIdentifierCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineShaderStageModuleIdentifierCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint8_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint8_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, identifierSize, pIdentifier );
     }
@@ -132734,20 +95522,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType          = StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT;
-    const void *    pNext          = {};
-    uint32_t        identifierSize = {};
-    const uint8_t * pIdentifier    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT;
+    const void *                        pNext          = {};
+    uint32_t                            identifierSize = {};
+    const uint8_t *                     pIdentifier    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineShaderStageModuleIdentifierCreateInfoEXT>
-  {
-    using Type = PipelineShaderStageModuleIdentifierCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT>
   {
@@ -132755,8 +95535,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkPipelineShaderStageNodeCreateInfoAMDX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageNodeCreateInfoAMDX.html
   struct PipelineShaderStageNodeCreateInfoAMDX
   {
     using NativeType = VkPipelineShaderStageNodeCreateInfoAMDX;
@@ -132764,12 +95542,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineShaderStageNodeCreateInfoAMDX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       PipelineShaderStageNodeCreateInfoAMDX( const char * pName_ = {}, uint32_t index_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pName{ pName_ }
-      , index{ index_ }
+      : pNext( pNext_ )
+      , pName( pName_ )
+      , index( index_ )
     {
     }
 
@@ -132781,15 +95559,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineShaderStageNodeCreateInfoAMDX & operator=( PipelineShaderStageNodeCreateInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineShaderStageNodeCreateInfoAMDX & operator=( VkPipelineShaderStageNodeCreateInfoAMDX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineShaderStageNodeCreateInfoAMDX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineShaderStageNodeCreateInfoAMDX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageNodeCreateInfoAMDX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -132807,7 +95585,7 @@ namespace VULKAN_HPP_NAMESPACE
       index = index_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineShaderStageNodeCreateInfoAMDX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -132819,18 +95597,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineShaderStageNodeCreateInfoAMDX *>( this );
     }
 
-    operator VkPipelineShaderStageNodeCreateInfoAMDX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineShaderStageNodeCreateInfoAMDX *>( this );
-    }
-
-    operator VkPipelineShaderStageNodeCreateInfoAMDX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineShaderStageNodeCreateInfoAMDX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const char * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const char * const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pName, index );
     }
@@ -132864,20 +95637,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType = StructureType::ePipelineShaderStageNodeCreateInfoAMDX;
-    const void *  pNext = {};
-    const char *  pName = {};
-    uint32_t      index = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::ePipelineShaderStageNodeCreateInfoAMDX;
+    const void *                        pNext = {};
+    const char *                        pName = {};
+    uint32_t                            index = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineShaderStageNodeCreateInfoAMDX>
-  {
-    using Type = PipelineShaderStageNodeCreateInfoAMDX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineShaderStageNodeCreateInfoAMDX>
   {
@@ -132885,8 +95650,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
-  // wrapper struct for struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineShaderStageRequiredSubgroupSizeCreateInfo.html
   struct PipelineShaderStageRequiredSubgroupSizeCreateInfo
   {
     using NativeType = VkPipelineShaderStageRequiredSubgroupSizeCreateInfo;
@@ -132894,11 +95657,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineShaderStageRequiredSubgroupSizeCreateInfo( uint32_t     requiredSubgroupSize_ = {},
-                                                                            const void * pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , requiredSubgroupSize{ requiredSubgroupSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineShaderStageRequiredSubgroupSizeCreateInfo( uint32_t requiredSubgroupSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , requiredSubgroupSize( requiredSubgroupSize_ )
     {
     }
 
@@ -132912,28 +95674,14 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineShaderStageRequiredSubgroupSizeCreateInfo &
       operator=( PipelineShaderStageRequiredSubgroupSizeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineShaderStageRequiredSubgroupSizeCreateInfo & operator=( VkPipelineShaderStageRequiredSubgroupSizeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineShaderStageRequiredSubgroupSizeCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineShaderStageRequiredSubgroupSizeCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageRequiredSubgroupSizeCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineShaderStageRequiredSubgroupSizeCreateInfo & setRequiredSubgroupSize( uint32_t requiredSubgroupSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      requiredSubgroupSize = requiredSubgroupSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
     operator VkPipelineShaderStageRequiredSubgroupSizeCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkPipelineShaderStageRequiredSubgroupSizeCreateInfo *>( this );
@@ -132944,18 +95692,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineShaderStageRequiredSubgroupSizeCreateInfo *>( this );
     }
 
-    operator VkPipelineShaderStageRequiredSubgroupSizeCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineShaderStageRequiredSubgroupSizeCreateInfo *>( this );
-    }
-
-    operator VkPipelineShaderStageRequiredSubgroupSizeCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineShaderStageRequiredSubgroupSizeCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, requiredSubgroupSize );
     }
@@ -132980,19 +95723,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo;
-    const void *  pNext                = {};
-    uint32_t      requiredSubgroupSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo;
+    void *                              pNext                = {};
+    uint32_t                            requiredSubgroupSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineShaderStageRequiredSubgroupSizeCreateInfo>
-  {
-    using Type = PipelineShaderStageRequiredSubgroupSizeCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo>
   {
@@ -133002,8 +95737,6 @@ namespace VULKAN_HPP_NAMESPACE
   using PipelineShaderStageRequiredSubgroupSizeCreateInfoEXT = PipelineShaderStageRequiredSubgroupSizeCreateInfo;
   using ShaderRequiredSubgroupSizeCreateInfoEXT              = PipelineShaderStageRequiredSubgroupSizeCreateInfo;
 
-  // wrapper struct for struct VkPipelineTessellationDomainOriginStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineTessellationDomainOriginStateCreateInfo.html
   struct PipelineTessellationDomainOriginStateCreateInfo
   {
     using NativeType = VkPipelineTessellationDomainOriginStateCreateInfo;
@@ -133011,11 +95744,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineTessellationDomainOriginStateCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineTessellationDomainOriginStateCreateInfo( TessellationDomainOrigin domainOrigin_ = TessellationDomainOrigin::eUpperLeft,
-                                                                          const void *             pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , domainOrigin{ domainOrigin_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineTessellationDomainOriginStateCreateInfo(
+      VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin_ = VULKAN_HPP_NAMESPACE::TessellationDomainOrigin::eUpperLeft,
+      const void *                                   pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , domainOrigin( domainOrigin_ )
     {
     }
 
@@ -133028,27 +95762,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineTessellationDomainOriginStateCreateInfo & operator=( PipelineTessellationDomainOriginStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineTessellationDomainOriginStateCreateInfo & operator=( VkPipelineTessellationDomainOriginStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineTessellationDomainOriginStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineTessellationDomainOriginStateCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineTessellationDomainOriginStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineTessellationDomainOriginStateCreateInfo & setDomainOrigin( TessellationDomainOrigin domainOrigin_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineTessellationDomainOriginStateCreateInfo &
+      setDomainOrigin( VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin_ ) VULKAN_HPP_NOEXCEPT
     {
       domainOrigin = domainOrigin_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineTessellationDomainOriginStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -133060,18 +95795,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineTessellationDomainOriginStateCreateInfo *>( this );
     }
 
-    operator VkPipelineTessellationDomainOriginStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineTessellationDomainOriginStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineTessellationDomainOriginStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineTessellationDomainOriginStateCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TessellationDomainOrigin const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::TessellationDomainOrigin const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, domainOrigin );
     }
@@ -133096,19 +95826,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType        = StructureType::ePipelineTessellationDomainOriginStateCreateInfo;
-    const void *             pNext        = {};
-    TessellationDomainOrigin domainOrigin = TessellationDomainOrigin::eUpperLeft;
+    VULKAN_HPP_NAMESPACE::StructureType            sType        = StructureType::ePipelineTessellationDomainOriginStateCreateInfo;
+    const void *                                   pNext        = {};
+    VULKAN_HPP_NAMESPACE::TessellationDomainOrigin domainOrigin = VULKAN_HPP_NAMESPACE::TessellationDomainOrigin::eUpperLeft;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineTessellationDomainOriginStateCreateInfo>
-  {
-    using Type = PipelineTessellationDomainOriginStateCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineTessellationDomainOriginStateCreateInfo>
   {
@@ -133117,80 +95839,73 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PipelineTessellationDomainOriginStateCreateInfoKHR = PipelineTessellationDomainOriginStateCreateInfo;
 
-  // wrapper struct for struct VkVertexInputBindingDivisorDescription, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputBindingDivisorDescription.html
-  struct VertexInputBindingDivisorDescription
+  struct VertexInputBindingDivisorDescriptionKHR
   {
-    using NativeType = VkVertexInputBindingDivisorDescription;
+    using NativeType = VkVertexInputBindingDivisorDescriptionKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VertexInputBindingDivisorDescription( uint32_t binding_ = {}, uint32_t divisor_ = {} ) VULKAN_HPP_NOEXCEPT
-      : binding{ binding_ }
-      , divisor{ divisor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VertexInputBindingDivisorDescriptionKHR( uint32_t binding_ = {}, uint32_t divisor_ = {} ) VULKAN_HPP_NOEXCEPT
+      : binding( binding_ )
+      , divisor( divisor_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR VertexInputBindingDivisorDescription( VertexInputBindingDivisorDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR VertexInputBindingDivisorDescriptionKHR( VertexInputBindingDivisorDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    VertexInputBindingDivisorDescription( VkVertexInputBindingDivisorDescription const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VertexInputBindingDivisorDescription( *reinterpret_cast<VertexInputBindingDivisorDescription const *>( &rhs ) )
+    VertexInputBindingDivisorDescriptionKHR( VkVertexInputBindingDivisorDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : VertexInputBindingDivisorDescriptionKHR( *reinterpret_cast<VertexInputBindingDivisorDescriptionKHR const *>( &rhs ) )
     {
     }
 
-    VertexInputBindingDivisorDescription & operator=( VertexInputBindingDivisorDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    VertexInputBindingDivisorDescriptionKHR & operator=( VertexInputBindingDivisorDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    VertexInputBindingDivisorDescription & operator=( VkVertexInputBindingDivisorDescription const & rhs ) VULKAN_HPP_NOEXCEPT
+    VertexInputBindingDivisorDescriptionKHR & operator=( VkVertexInputBindingDivisorDescriptionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VertexInputBindingDivisorDescription const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDivisorDescription & setBinding( uint32_t binding_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDivisorDescriptionKHR & setBinding( uint32_t binding_ ) VULKAN_HPP_NOEXCEPT
     {
       binding = binding_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDivisorDescription & setDivisor( uint32_t divisor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDivisorDescriptionKHR & setDivisor( uint32_t divisor_ ) VULKAN_HPP_NOEXCEPT
     {
       divisor = divisor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkVertexInputBindingDivisorDescription const &() const VULKAN_HPP_NOEXCEPT
+    operator VkVertexInputBindingDivisorDescriptionKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkVertexInputBindingDivisorDescription *>( this );
+      return *reinterpret_cast<const VkVertexInputBindingDivisorDescriptionKHR *>( this );
     }
 
-    operator VkVertexInputBindingDivisorDescription &() VULKAN_HPP_NOEXCEPT
+    operator VkVertexInputBindingDivisorDescriptionKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkVertexInputBindingDivisorDescription *>( this );
-    }
-
-    operator VkVertexInputBindingDivisorDescription const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVertexInputBindingDivisorDescription *>( this );
-    }
-
-    operator VkVertexInputBindingDivisorDescription *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVertexInputBindingDivisorDescription *>( this );
+      return *reinterpret_cast<VkVertexInputBindingDivisorDescriptionKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( binding, divisor );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VertexInputBindingDivisorDescription const & ) const = default;
+    auto operator<=>( VertexInputBindingDivisorDescriptionKHR const & ) const = default;
 #else
-    bool operator==( VertexInputBindingDivisorDescription const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( VertexInputBindingDivisorDescriptionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -133199,7 +95914,7 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( VertexInputBindingDivisorDescription const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( VertexInputBindingDivisorDescriptionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
@@ -133210,45 +95925,37 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t divisor = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVertexInputBindingDivisorDescription>
-  {
-    using Type = VertexInputBindingDivisorDescription;
-  };
-#endif
-  using VertexInputBindingDivisorDescriptionEXT = VertexInputBindingDivisorDescription;
-  using VertexInputBindingDivisorDescriptionKHR = VertexInputBindingDivisorDescription;
+  using VertexInputBindingDivisorDescriptionEXT = VertexInputBindingDivisorDescriptionKHR;
 
-  // wrapper struct for struct VkPipelineVertexInputDivisorStateCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineVertexInputDivisorStateCreateInfo.html
-  struct PipelineVertexInputDivisorStateCreateInfo
+  struct PipelineVertexInputDivisorStateCreateInfoKHR
   {
-    using NativeType = VkPipelineVertexInputDivisorStateCreateInfo;
+    using NativeType = VkPipelineVertexInputDivisorStateCreateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineVertexInputDivisorStateCreateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineVertexInputDivisorStateCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineVertexInputDivisorStateCreateInfo( uint32_t                                     vertexBindingDivisorCount_ = {},
-                                                                    const VertexInputBindingDivisorDescription * pVertexBindingDivisors_    = {},
-                                                                    const void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , vertexBindingDivisorCount{ vertexBindingDivisorCount_ }
-      , pVertexBindingDivisors{ pVertexBindingDivisors_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      PipelineVertexInputDivisorStateCreateInfoKHR( uint32_t                                                              vertexBindingDivisorCount_ = {},
+                                                    const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR * pVertexBindingDivisors_    = {},
+                                                    const void *                                                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , vertexBindingDivisorCount( vertexBindingDivisorCount_ )
+      , pVertexBindingDivisors( pVertexBindingDivisors_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PipelineVertexInputDivisorStateCreateInfo( PipelineVertexInputDivisorStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PipelineVertexInputDivisorStateCreateInfoKHR( PipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PipelineVertexInputDivisorStateCreateInfo( VkPipelineVertexInputDivisorStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineVertexInputDivisorStateCreateInfo( *reinterpret_cast<PipelineVertexInputDivisorStateCreateInfo const *>( &rhs ) )
+    PipelineVertexInputDivisorStateCreateInfoKHR( VkPipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PipelineVertexInputDivisorStateCreateInfoKHR( *reinterpret_cast<PipelineVertexInputDivisorStateCreateInfoKHR const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineVertexInputDivisorStateCreateInfo( ArrayProxyNoTemporaries<const VertexInputBindingDivisorDescription> const & vertexBindingDivisors_,
-                                               const void *                                                                pNext_ = nullptr )
+    PipelineVertexInputDivisorStateCreateInfoKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR> const & vertexBindingDivisors_,
+      const void *                                                                                                               pNext_ = nullptr )
       : pNext( pNext_ )
       , vertexBindingDivisorCount( static_cast<uint32_t>( vertexBindingDivisors_.size() ) )
       , pVertexBindingDivisors( vertexBindingDivisors_.data() )
@@ -133256,68 +95963,67 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    PipelineVertexInputDivisorStateCreateInfo & operator=( PipelineVertexInputDivisorStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PipelineVertexInputDivisorStateCreateInfoKHR & operator=( PipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PipelineVertexInputDivisorStateCreateInfo & operator=( VkPipelineVertexInputDivisorStateCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PipelineVertexInputDivisorStateCreateInfoKHR & operator=( VkPipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineVertexInputDivisorStateCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineVertexInputDivisorStateCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfo & setVertexBindingDivisorCount( uint32_t vertexBindingDivisorCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfoKHR &
+      setVertexBindingDivisorCount( uint32_t vertexBindingDivisorCount_ ) VULKAN_HPP_NOEXCEPT
     {
       vertexBindingDivisorCount = vertexBindingDivisorCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfo &
-      setPVertexBindingDivisors( const VertexInputBindingDivisorDescription * pVertexBindingDivisors_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineVertexInputDivisorStateCreateInfoKHR &
+      setPVertexBindingDivisors( const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR * pVertexBindingDivisors_ ) VULKAN_HPP_NOEXCEPT
     {
       pVertexBindingDivisors = pVertexBindingDivisors_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineVertexInputDivisorStateCreateInfo &
-      setVertexBindingDivisors( ArrayProxyNoTemporaries<const VertexInputBindingDivisorDescription> const & vertexBindingDivisors_ ) VULKAN_HPP_NOEXCEPT
+    PipelineVertexInputDivisorStateCreateInfoKHR & setVertexBindingDivisors(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR> const & vertexBindingDivisors_ )
+      VULKAN_HPP_NOEXCEPT
     {
       vertexBindingDivisorCount = static_cast<uint32_t>( vertexBindingDivisors_.size() );
       pVertexBindingDivisors    = vertexBindingDivisors_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPipelineVertexInputDivisorStateCreateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPipelineVertexInputDivisorStateCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPipelineVertexInputDivisorStateCreateInfo *>( this );
+      return *reinterpret_cast<const VkPipelineVertexInputDivisorStateCreateInfoKHR *>( this );
     }
 
-    operator VkPipelineVertexInputDivisorStateCreateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPipelineVertexInputDivisorStateCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPipelineVertexInputDivisorStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineVertexInputDivisorStateCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineVertexInputDivisorStateCreateInfo *>( this );
-    }
-
-    operator VkPipelineVertexInputDivisorStateCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineVertexInputDivisorStateCreateInfo *>( this );
+      return *reinterpret_cast<VkPipelineVertexInputDivisorStateCreateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const VertexInputBindingDivisorDescription * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, vertexBindingDivisorCount, pVertexBindingDivisors );
@@ -133325,9 +96031,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineVertexInputDivisorStateCreateInfo const & ) const = default;
+    auto operator<=>( PipelineVertexInputDivisorStateCreateInfoKHR const & ) const = default;
 #else
-    bool operator==( PipelineVertexInputDivisorStateCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -133337,38 +96043,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PipelineVertexInputDivisorStateCreateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PipelineVertexInputDivisorStateCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType                                sType                     = StructureType::ePipelineVertexInputDivisorStateCreateInfo;
-    const void *                                 pNext                     = {};
-    uint32_t                                     vertexBindingDivisorCount = {};
-    const VertexInputBindingDivisorDescription * pVertexBindingDivisors    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                   sType = StructureType::ePipelineVertexInputDivisorStateCreateInfoKHR;
+    const void *                                                          pNext = {};
+    uint32_t                                                              vertexBindingDivisorCount = {};
+    const VULKAN_HPP_NAMESPACE::VertexInputBindingDivisorDescriptionKHR * pVertexBindingDivisors    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineVertexInputDivisorStateCreateInfo>
-  {
-    using Type = PipelineVertexInputDivisorStateCreateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePipelineVertexInputDivisorStateCreateInfo>
+  struct CppType<StructureType, StructureType::ePipelineVertexInputDivisorStateCreateInfoKHR>
   {
-    using Type = PipelineVertexInputDivisorStateCreateInfo;
+    using Type = PipelineVertexInputDivisorStateCreateInfoKHR;
   };
 
-  using PipelineVertexInputDivisorStateCreateInfoEXT = PipelineVertexInputDivisorStateCreateInfo;
-  using PipelineVertexInputDivisorStateCreateInfoKHR = PipelineVertexInputDivisorStateCreateInfo;
+  using PipelineVertexInputDivisorStateCreateInfoEXT = PipelineVertexInputDivisorStateCreateInfoKHR;
 
-  // wrapper struct for struct VkPipelineViewportCoarseSampleOrderStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportCoarseSampleOrderStateCreateInfoNV.html
   struct PipelineViewportCoarseSampleOrderStateCreateInfoNV
   {
     using NativeType = VkPipelineViewportCoarseSampleOrderStateCreateInfoNV;
@@ -133376,15 +96071,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportCoarseSampleOrderStateCreateInfoNV( CoarseSampleOrderTypeNV sampleOrderType_ = CoarseSampleOrderTypeNV::eDefault,
-                                                                             uint32_t                customSampleOrderCount_        = {},
-                                                                             const CoarseSampleOrderCustomNV * pCustomSampleOrders_ = {},
-                                                                             const void *                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampleOrderType{ sampleOrderType_ }
-      , customSampleOrderCount{ customSampleOrderCount_ }
-      , pCustomSampleOrders{ pCustomSampleOrders_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportCoarseSampleOrderStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType_        = VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV::eDefault,
+      uint32_t                                                customSampleOrderCount_ = {},
+      const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * pCustomSampleOrders_    = {},
+      const void *                                            pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampleOrderType( sampleOrderType_ )
+      , customSampleOrderCount( customSampleOrderCount_ )
+      , pCustomSampleOrders( pCustomSampleOrders_ )
     {
     }
 
@@ -133397,9 +96093,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportCoarseSampleOrderStateCreateInfoNV( CoarseSampleOrderTypeNV                                          sampleOrderType_,
-                                                        ArrayProxyNoTemporaries<const CoarseSampleOrderCustomNV> const & customSampleOrders_,
-                                                        const void *                                                     pNext_ = nullptr )
+    PipelineViewportCoarseSampleOrderStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV                                                                sampleOrderType_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders_,
+      const void *                                                                                                 pNext_ = nullptr )
       : pNext( pNext_ )
       , sampleOrderType( sampleOrderType_ )
       , customSampleOrderCount( static_cast<uint32_t>( customSampleOrders_.size() ) )
@@ -133410,15 +96107,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineViewportCoarseSampleOrderStateCreateInfoNV &
       operator=( PipelineViewportCoarseSampleOrderStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportCoarseSampleOrderStateCreateInfoNV & operator=( VkPipelineViewportCoarseSampleOrderStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportCoarseSampleOrderStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportCoarseSampleOrderStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportCoarseSampleOrderStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -133426,7 +96123,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportCoarseSampleOrderStateCreateInfoNV &
-      setSampleOrderType( CoarseSampleOrderTypeNV sampleOrderType_ ) VULKAN_HPP_NOEXCEPT
+      setSampleOrderType( VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV sampleOrderType_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleOrderType = sampleOrderType_;
       return *this;
@@ -133440,22 +96137,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportCoarseSampleOrderStateCreateInfoNV &
-      setPCustomSampleOrders( const CoarseSampleOrderCustomNV * pCustomSampleOrders_ ) VULKAN_HPP_NOEXCEPT
+      setPCustomSampleOrders( const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * pCustomSampleOrders_ ) VULKAN_HPP_NOEXCEPT
     {
       pCustomSampleOrders = pCustomSampleOrders_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportCoarseSampleOrderStateCreateInfoNV &
-      setCustomSampleOrders( ArrayProxyNoTemporaries<const CoarseSampleOrderCustomNV> const & customSampleOrders_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportCoarseSampleOrderStateCreateInfoNV & setCustomSampleOrders(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV> const & customSampleOrders_ ) VULKAN_HPP_NOEXCEPT
     {
       customSampleOrderCount = static_cast<uint32_t>( customSampleOrders_.size() );
       pCustomSampleOrders    = customSampleOrders_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportCoarseSampleOrderStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -133467,18 +96164,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportCoarseSampleOrderStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineViewportCoarseSampleOrderStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportCoarseSampleOrderStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineViewportCoarseSampleOrderStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportCoarseSampleOrderStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CoarseSampleOrderTypeNV const &, uint32_t const &, const CoarseSampleOrderCustomNV * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sampleOrderType, customSampleOrderCount, pCustomSampleOrders );
@@ -133505,152 +96200,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType                  = StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV;
-    const void *                      pNext                  = {};
-    CoarseSampleOrderTypeNV           sampleOrderType        = CoarseSampleOrderTypeNV::eDefault;
-    uint32_t                          customSampleOrderCount = {};
-    const CoarseSampleOrderCustomNV * pCustomSampleOrders    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                  = StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV;
+    const void *                                            pNext                  = {};
+    VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV           sampleOrderType        = VULKAN_HPP_NAMESPACE::CoarseSampleOrderTypeNV::eDefault;
+    uint32_t                                                customSampleOrderCount = {};
+    const VULKAN_HPP_NAMESPACE::CoarseSampleOrderCustomNV * pCustomSampleOrders    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportCoarseSampleOrderStateCreateInfoNV>
-  {
-    using Type = PipelineViewportCoarseSampleOrderStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV>
   {
     using Type = PipelineViewportCoarseSampleOrderStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkPipelineViewportDepthClampControlCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportDepthClampControlCreateInfoEXT.html
-  struct PipelineViewportDepthClampControlCreateInfoEXT
-  {
-    using NativeType = VkPipelineViewportDepthClampControlCreateInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportDepthClampControlCreateInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportDepthClampControlCreateInfoEXT( DepthClampModeEXT          depthClampMode_   = DepthClampModeEXT::eViewportRange,
-                                                                         const DepthClampRangeEXT * pDepthClampRange_ = {},
-                                                                         const void *               pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthClampMode{ depthClampMode_ }
-      , pDepthClampRange{ pDepthClampRange_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      PipelineViewportDepthClampControlCreateInfoEXT( PipelineViewportDepthClampControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PipelineViewportDepthClampControlCreateInfoEXT( VkPipelineViewportDepthClampControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PipelineViewportDepthClampControlCreateInfoEXT( *reinterpret_cast<PipelineViewportDepthClampControlCreateInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    PipelineViewportDepthClampControlCreateInfoEXT & operator=( PipelineViewportDepthClampControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PipelineViewportDepthClampControlCreateInfoEXT & operator=( VkPipelineViewportDepthClampControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PipelineViewportDepthClampControlCreateInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClampControlCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClampControlCreateInfoEXT & setDepthClampMode( DepthClampModeEXT depthClampMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      depthClampMode = depthClampMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClampControlCreateInfoEXT &
-      setPDepthClampRange( const DepthClampRangeEXT * pDepthClampRange_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pDepthClampRange = pDepthClampRange_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPipelineViewportDepthClampControlCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPipelineViewportDepthClampControlCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineViewportDepthClampControlCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPipelineViewportDepthClampControlCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineViewportDepthClampControlCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportDepthClampControlCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineViewportDepthClampControlCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportDepthClampControlCreateInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DepthClampModeEXT const &, const DepthClampRangeEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, depthClampMode, pDepthClampRange );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PipelineViewportDepthClampControlCreateInfoEXT const & ) const = default;
-#else
-    bool operator==( PipelineViewportDepthClampControlCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( depthClampMode == rhs.depthClampMode ) && ( pDepthClampRange == rhs.pDepthClampRange );
-#  endif
-    }
-
-    bool operator!=( PipelineViewportDepthClampControlCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType              sType            = StructureType::ePipelineViewportDepthClampControlCreateInfoEXT;
-    const void *               pNext            = {};
-    DepthClampModeEXT          depthClampMode   = DepthClampModeEXT::eViewportRange;
-    const DepthClampRangeEXT * pDepthClampRange = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportDepthClampControlCreateInfoEXT>
-  {
-    using Type = PipelineViewportDepthClampControlCreateInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePipelineViewportDepthClampControlCreateInfoEXT>
-  {
-    using Type = PipelineViewportDepthClampControlCreateInfoEXT;
-  };
-
-  // wrapper struct for struct VkPipelineViewportDepthClipControlCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportDepthClipControlCreateInfoEXT.html
   struct PipelineViewportDepthClipControlCreateInfoEXT
   {
     using NativeType = VkPipelineViewportDepthClipControlCreateInfoEXT;
@@ -133658,10 +96220,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportDepthClipControlCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportDepthClipControlCreateInfoEXT( Bool32 negativeOneToOne_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , negativeOneToOne{ negativeOneToOne_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportDepthClipControlCreateInfoEXT( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne_ = {},
+                                                                        const void *                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , negativeOneToOne( negativeOneToOne_ )
     {
     }
 
@@ -133674,27 +96237,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PipelineViewportDepthClipControlCreateInfoEXT & operator=( PipelineViewportDepthClipControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportDepthClipControlCreateInfoEXT & operator=( VkPipelineViewportDepthClipControlCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportDepthClipControlCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportDepthClipControlCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClipControlCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClipControlCreateInfoEXT & setNegativeOneToOne( Bool32 negativeOneToOne_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportDepthClipControlCreateInfoEXT &
+      setNegativeOneToOne( VULKAN_HPP_NAMESPACE::Bool32 negativeOneToOne_ ) VULKAN_HPP_NOEXCEPT
     {
       negativeOneToOne = negativeOneToOne_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportDepthClipControlCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -133706,18 +96270,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportDepthClipControlCreateInfoEXT *>( this );
     }
 
-    operator VkPipelineViewportDepthClipControlCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportDepthClipControlCreateInfoEXT *>( this );
-    }
-
-    operator VkPipelineViewportDepthClipControlCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportDepthClipControlCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, negativeOneToOne );
     }
@@ -133742,27 +96301,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::ePipelineViewportDepthClipControlCreateInfoEXT;
-    const void *  pNext            = {};
-    Bool32        negativeOneToOne = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::ePipelineViewportDepthClipControlCreateInfoEXT;
+    const void *                        pNext            = {};
+    VULKAN_HPP_NAMESPACE::Bool32        negativeOneToOne = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportDepthClipControlCreateInfoEXT>
-  {
-    using Type = PipelineViewportDepthClipControlCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportDepthClipControlCreateInfoEXT>
   {
     using Type = PipelineViewportDepthClipControlCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkPipelineViewportExclusiveScissorStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportExclusiveScissorStateCreateInfoNV.html
   struct PipelineViewportExclusiveScissorStateCreateInfoNV
   {
     using NativeType = VkPipelineViewportExclusiveScissorStateCreateInfoNV;
@@ -133770,13 +96319,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportExclusiveScissorStateCreateInfoNV( uint32_t       exclusiveScissorCount_ = {},
-                                                                            const Rect2D * pExclusiveScissors_    = {},
-                                                                            const void *   pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , exclusiveScissorCount{ exclusiveScissorCount_ }
-      , pExclusiveScissors{ pExclusiveScissors_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportExclusiveScissorStateCreateInfoNV( uint32_t                             exclusiveScissorCount_ = {},
+                                                                            const VULKAN_HPP_NAMESPACE::Rect2D * pExclusiveScissors_    = {},
+                                                                            const void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , exclusiveScissorCount( exclusiveScissorCount_ )
+      , pExclusiveScissors( pExclusiveScissors_ )
     {
     }
 
@@ -133789,7 +96338,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportExclusiveScissorStateCreateInfoNV( ArrayProxyNoTemporaries<const Rect2D> const & exclusiveScissors_, const void * pNext_ = nullptr )
+    PipelineViewportExclusiveScissorStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), exclusiveScissorCount( static_cast<uint32_t>( exclusiveScissors_.size() ) ), pExclusiveScissors( exclusiveScissors_.data() )
     {
     }
@@ -133797,15 +96347,15 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineViewportExclusiveScissorStateCreateInfoNV &
       operator=( PipelineViewportExclusiveScissorStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportExclusiveScissorStateCreateInfoNV & operator=( VkPipelineViewportExclusiveScissorStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportExclusiveScissorStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportExclusiveScissorStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportExclusiveScissorStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -133818,7 +96368,8 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportExclusiveScissorStateCreateInfoNV & setPExclusiveScissors( const Rect2D * pExclusiveScissors_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportExclusiveScissorStateCreateInfoNV &
+      setPExclusiveScissors( const VULKAN_HPP_NAMESPACE::Rect2D * pExclusiveScissors_ ) VULKAN_HPP_NOEXCEPT
     {
       pExclusiveScissors = pExclusiveScissors_;
       return *this;
@@ -133826,14 +96377,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PipelineViewportExclusiveScissorStateCreateInfoNV &
-      setExclusiveScissors( ArrayProxyNoTemporaries<const Rect2D> const & exclusiveScissors_ ) VULKAN_HPP_NOEXCEPT
+      setExclusiveScissors( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Rect2D> const & exclusiveScissors_ ) VULKAN_HPP_NOEXCEPT
     {
       exclusiveScissorCount = static_cast<uint32_t>( exclusiveScissors_.size() );
       pExclusiveScissors    = exclusiveScissors_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportExclusiveScissorStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -133845,18 +96396,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportExclusiveScissorStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineViewportExclusiveScissorStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportExclusiveScissorStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineViewportExclusiveScissorStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportExclusiveScissorStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Rect2D * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Rect2D * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, exclusiveScissorCount, pExclusiveScissors );
     }
@@ -133882,36 +96428,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType  sType                 = StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV;
-    const void *   pNext                 = {};
-    uint32_t       exclusiveScissorCount = {};
-    const Rect2D * pExclusiveScissors    = {};
+    VULKAN_HPP_NAMESPACE::StructureType  sType                 = StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV;
+    const void *                         pNext                 = {};
+    uint32_t                             exclusiveScissorCount = {};
+    const VULKAN_HPP_NAMESPACE::Rect2D * pExclusiveScissors    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportExclusiveScissorStateCreateInfoNV>
-  {
-    using Type = PipelineViewportExclusiveScissorStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV>
   {
     using Type = PipelineViewportExclusiveScissorStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkShadingRatePaletteNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShadingRatePaletteNV.html
   struct ShadingRatePaletteNV
   {
     using NativeType = VkShadingRatePaletteNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ShadingRatePaletteNV( uint32_t                          shadingRatePaletteEntryCount_ = {},
-                                               const ShadingRatePaletteEntryNV * pShadingRatePaletteEntries_   = {} ) VULKAN_HPP_NOEXCEPT
-      : shadingRatePaletteEntryCount{ shadingRatePaletteEntryCount_ }
-      , pShadingRatePaletteEntries{ pShadingRatePaletteEntries_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ShadingRatePaletteNV( uint32_t                                                shadingRatePaletteEntryCount_ = {},
+                                               const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV * pShadingRatePaletteEntries_   = {} ) VULKAN_HPP_NOEXCEPT
+      : shadingRatePaletteEntryCount( shadingRatePaletteEntryCount_ )
+      , pShadingRatePaletteEntries( pShadingRatePaletteEntries_ )
     {
     }
 
@@ -133923,7 +96460,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShadingRatePaletteNV( ArrayProxyNoTemporaries<const ShadingRatePaletteEntryNV> const & shadingRatePaletteEntries_ )
+    ShadingRatePaletteNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV> const & shadingRatePaletteEntries_ )
       : shadingRatePaletteEntryCount( static_cast<uint32_t>( shadingRatePaletteEntries_.size() ) )
       , pShadingRatePaletteEntries( shadingRatePaletteEntries_.data() )
     {
@@ -133931,15 +96469,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ShadingRatePaletteNV & operator=( ShadingRatePaletteNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShadingRatePaletteNV & operator=( VkShadingRatePaletteNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShadingRatePaletteNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ShadingRatePaletteNV & setShadingRatePaletteEntryCount( uint32_t shadingRatePaletteEntryCount_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRatePaletteEntryCount = shadingRatePaletteEntryCount_;
@@ -133947,22 +96485,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 ShadingRatePaletteNV &
-      setPShadingRatePaletteEntries( const ShadingRatePaletteEntryNV * pShadingRatePaletteEntries_ ) VULKAN_HPP_NOEXCEPT
+      setPShadingRatePaletteEntries( const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV * pShadingRatePaletteEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       pShadingRatePaletteEntries = pShadingRatePaletteEntries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShadingRatePaletteNV &
-      setShadingRatePaletteEntries( ArrayProxyNoTemporaries<const ShadingRatePaletteEntryNV> const & shadingRatePaletteEntries_ ) VULKAN_HPP_NOEXCEPT
+    ShadingRatePaletteNV & setShadingRatePaletteEntries(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV> const & shadingRatePaletteEntries_ )
+      VULKAN_HPP_NOEXCEPT
     {
       shadingRatePaletteEntryCount = static_cast<uint32_t>( shadingRatePaletteEntries_.size() );
       pShadingRatePaletteEntries   = shadingRatePaletteEntries_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkShadingRatePaletteNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -133974,18 +96513,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShadingRatePaletteNV *>( this );
     }
 
-    operator VkShadingRatePaletteNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShadingRatePaletteNV *>( this );
-    }
-
-    operator VkShadingRatePaletteNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShadingRatePaletteNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, const ShadingRatePaletteEntryNV * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( shadingRatePaletteEntryCount, pShadingRatePaletteEntries );
     }
@@ -134010,20 +96544,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                          shadingRatePaletteEntryCount = {};
-    const ShadingRatePaletteEntryNV * pShadingRatePaletteEntries   = {};
+    uint32_t                                                shadingRatePaletteEntryCount = {};
+    const VULKAN_HPP_NAMESPACE::ShadingRatePaletteEntryNV * pShadingRatePaletteEntries   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShadingRatePaletteNV>
-  {
-    using Type = ShadingRatePaletteNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineViewportShadingRateImageStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportShadingRateImageStateCreateInfoNV.html
   struct PipelineViewportShadingRateImageStateCreateInfoNV
   {
     using NativeType = VkPipelineViewportShadingRateImageStateCreateInfoNV;
@@ -134031,15 +96555,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportShadingRateImageStateCreateInfoNV( Bool32                       shadingRateImageEnable_ = {},
-                                                                            uint32_t                     viewportCount_          = {},
-                                                                            const ShadingRatePaletteNV * pShadingRatePalettes_   = {},
-                                                                            const void *                 pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , shadingRateImageEnable{ shadingRateImageEnable_ }
-      , viewportCount{ viewportCount_ }
-      , pShadingRatePalettes{ pShadingRatePalettes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportShadingRateImageStateCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32                       shadingRateImageEnable_ = {},
+                                                                            uint32_t                                           viewportCount_          = {},
+                                                                            const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * pShadingRatePalettes_   = {},
+                                                                            const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , shadingRateImageEnable( shadingRateImageEnable_ )
+      , viewportCount( viewportCount_ )
+      , pShadingRatePalettes( pShadingRatePalettes_ )
     {
     }
 
@@ -134052,9 +96576,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportShadingRateImageStateCreateInfoNV( Bool32                                                      shadingRateImageEnable_,
-                                                       ArrayProxyNoTemporaries<const ShadingRatePaletteNV> const & shadingRatePalettes_,
-                                                       const void *                                                pNext_ = nullptr )
+    PipelineViewportShadingRateImageStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::Bool32                                                                            shadingRateImageEnable_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes_,
+      const void *                                                                                            pNext_ = nullptr )
       : pNext( pNext_ )
       , shadingRateImageEnable( shadingRateImageEnable_ )
       , viewportCount( static_cast<uint32_t>( shadingRatePalettes_.size() ) )
@@ -134065,22 +96590,23 @@ namespace VULKAN_HPP_NAMESPACE
 
     PipelineViewportShadingRateImageStateCreateInfoNV &
       operator=( PipelineViewportShadingRateImageStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportShadingRateImageStateCreateInfoNV & operator=( VkPipelineViewportShadingRateImageStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportShadingRateImageStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportShadingRateImageStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportShadingRateImageStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportShadingRateImageStateCreateInfoNV & setShadingRateImageEnable( Bool32 shadingRateImageEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportShadingRateImageStateCreateInfoNV &
+      setShadingRateImageEnable( VULKAN_HPP_NAMESPACE::Bool32 shadingRateImageEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateImageEnable = shadingRateImageEnable_;
       return *this;
@@ -134093,22 +96619,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportShadingRateImageStateCreateInfoNV &
-      setPShadingRatePalettes( const ShadingRatePaletteNV * pShadingRatePalettes_ ) VULKAN_HPP_NOEXCEPT
+      setPShadingRatePalettes( const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * pShadingRatePalettes_ ) VULKAN_HPP_NOEXCEPT
     {
       pShadingRatePalettes = pShadingRatePalettes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportShadingRateImageStateCreateInfoNV &
-      setShadingRatePalettes( ArrayProxyNoTemporaries<const ShadingRatePaletteNV> const & shadingRatePalettes_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportShadingRateImageStateCreateInfoNV & setShadingRatePalettes(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV> const & shadingRatePalettes_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportCount        = static_cast<uint32_t>( shadingRatePalettes_.size() );
       pShadingRatePalettes = shadingRatePalettes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportShadingRateImageStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134120,18 +96646,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportShadingRateImageStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineViewportShadingRateImageStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportShadingRateImageStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineViewportShadingRateImageStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportShadingRateImageStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, const ShadingRatePaletteNV * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, shadingRateImageEnable, viewportCount, pShadingRatePalettes );
@@ -134158,41 +96682,33 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                  = StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV;
-    const void *                 pNext                  = {};
-    Bool32                       shadingRateImageEnable = {};
-    uint32_t                     viewportCount          = {};
-    const ShadingRatePaletteNV * pShadingRatePalettes   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                  = StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV;
+    const void *                                       pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32                       shadingRateImageEnable = {};
+    uint32_t                                           viewportCount          = {};
+    const VULKAN_HPP_NAMESPACE::ShadingRatePaletteNV * pShadingRatePalettes   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportShadingRateImageStateCreateInfoNV>
-  {
-    using Type = PipelineViewportShadingRateImageStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV>
   {
     using Type = PipelineViewportShadingRateImageStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkViewportSwizzleNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViewportSwizzleNV.html
   struct ViewportSwizzleNV
   {
     using NativeType = VkViewportSwizzleNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ViewportSwizzleNV( ViewportCoordinateSwizzleNV x_ = ViewportCoordinateSwizzleNV::ePositiveX,
-                                            ViewportCoordinateSwizzleNV y_ = ViewportCoordinateSwizzleNV::ePositiveX,
-                                            ViewportCoordinateSwizzleNV z_ = ViewportCoordinateSwizzleNV::ePositiveX,
-                                            ViewportCoordinateSwizzleNV w_ = ViewportCoordinateSwizzleNV::ePositiveX ) VULKAN_HPP_NOEXCEPT
-      : x{ x_ }
-      , y{ y_ }
-      , z{ z_ }
-      , w{ w_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ViewportSwizzleNV(
+      VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV x_ = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX,
+      VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV y_ = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX,
+      VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV z_ = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX,
+      VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV w_ = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX ) VULKAN_HPP_NOEXCEPT
+      : x( x_ )
+      , y( y_ )
+      , z( z_ )
+      , w( w_ )
     {
     }
 
@@ -134201,39 +96717,39 @@ namespace VULKAN_HPP_NAMESPACE
     ViewportSwizzleNV( VkViewportSwizzleNV const & rhs ) VULKAN_HPP_NOEXCEPT : ViewportSwizzleNV( *reinterpret_cast<ViewportSwizzleNV const *>( &rhs ) ) {}
 
     ViewportSwizzleNV & operator=( ViewportSwizzleNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ViewportSwizzleNV & operator=( VkViewportSwizzleNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ViewportSwizzleNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ViewportSwizzleNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setX( ViewportCoordinateSwizzleNV x_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setX( VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV x_ ) VULKAN_HPP_NOEXCEPT
     {
       x = x_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setY( ViewportCoordinateSwizzleNV y_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setY( VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV y_ ) VULKAN_HPP_NOEXCEPT
     {
       y = y_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setZ( ViewportCoordinateSwizzleNV z_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setZ( VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV z_ ) VULKAN_HPP_NOEXCEPT
     {
       z = z_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setW( ViewportCoordinateSwizzleNV w_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ViewportSwizzleNV & setW( VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV w_ ) VULKAN_HPP_NOEXCEPT
     {
       w = w_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkViewportSwizzleNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134245,19 +96761,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkViewportSwizzleNV *>( this );
     }
 
-    operator VkViewportSwizzleNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkViewportSwizzleNV *>( this );
-    }
-
-    operator VkViewportSwizzleNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkViewportSwizzleNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<ViewportCoordinateSwizzleNV const &, ViewportCoordinateSwizzleNV const &, ViewportCoordinateSwizzleNV const &, ViewportCoordinateSwizzleNV const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV const &,
+               VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV const &,
+               VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV const &,
+               VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( x, y, z, w );
@@ -134283,22 +96795,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ViewportCoordinateSwizzleNV x = ViewportCoordinateSwizzleNV::ePositiveX;
-    ViewportCoordinateSwizzleNV y = ViewportCoordinateSwizzleNV::ePositiveX;
-    ViewportCoordinateSwizzleNV z = ViewportCoordinateSwizzleNV::ePositiveX;
-    ViewportCoordinateSwizzleNV w = ViewportCoordinateSwizzleNV::ePositiveX;
+    VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV x = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX;
+    VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV y = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX;
+    VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV z = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX;
+    VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV w = VULKAN_HPP_NAMESPACE::ViewportCoordinateSwizzleNV::ePositiveX;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkViewportSwizzleNV>
-  {
-    using Type = ViewportSwizzleNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineViewportSwizzleStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportSwizzleStateCreateInfoNV.html
   struct PipelineViewportSwizzleStateCreateInfoNV
   {
     using NativeType = VkPipelineViewportSwizzleStateCreateInfoNV;
@@ -134306,15 +96808,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportSwizzleStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportSwizzleStateCreateInfoNV( PipelineViewportSwizzleStateCreateFlagsNV flags_             = {},
-                                                                   uint32_t                                  viewportCount_     = {},
-                                                                   const ViewportSwizzleNV *                 pViewportSwizzles_ = {},
-                                                                   const void *                              pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , viewportCount{ viewportCount_ }
-      , pViewportSwizzles{ pViewportSwizzles_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportSwizzleStateCreateInfoNV( VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateFlagsNV flags_             = {},
+                                                                   uint32_t                                                        viewportCount_     = {},
+                                                                   const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV *                 pViewportSwizzles_ = {},
+                                                                   const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , viewportCount( viewportCount_ )
+      , pViewportSwizzles( pViewportSwizzles_ )
     {
     }
 
@@ -134326,31 +96828,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportSwizzleStateCreateInfoNV( PipelineViewportSwizzleStateCreateFlagsNV                flags_,
-                                              ArrayProxyNoTemporaries<const ViewportSwizzleNV> const & viewportSwizzles_,
-                                              const void *                                             pNext_ = nullptr )
+    PipelineViewportSwizzleStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateFlagsNV                                      flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles_,
+      const void *                                                                                         pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), viewportCount( static_cast<uint32_t>( viewportSwizzles_.size() ) ), pViewportSwizzles( viewportSwizzles_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineViewportSwizzleStateCreateInfoNV & operator=( PipelineViewportSwizzleStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportSwizzleStateCreateInfoNV & operator=( VkPipelineViewportSwizzleStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportSwizzleStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportSwizzleStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportSwizzleStateCreateInfoNV & setFlags( PipelineViewportSwizzleStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportSwizzleStateCreateInfoNV &
+      setFlags( VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateFlagsNV flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -134362,22 +96866,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportSwizzleStateCreateInfoNV & setPViewportSwizzles( const ViewportSwizzleNV * pViewportSwizzles_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportSwizzleStateCreateInfoNV &
+      setPViewportSwizzles( const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV * pViewportSwizzles_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewportSwizzles = pViewportSwizzles_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportSwizzleStateCreateInfoNV &
-      setViewportSwizzles( ArrayProxyNoTemporaries<const ViewportSwizzleNV> const & viewportSwizzles_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportSwizzleStateCreateInfoNV & setViewportSwizzles(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV> const & viewportSwizzles_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportCount     = static_cast<uint32_t>( viewportSwizzles_.size() );
       pViewportSwizzles = viewportSwizzles_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportSwizzleStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134389,19 +96894,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportSwizzleStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineViewportSwizzleStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportSwizzleStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineViewportSwizzleStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportSwizzleStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, PipelineViewportSwizzleStateCreateFlagsNV const &, uint32_t const &, const ViewportSwizzleNV * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateFlagsNV const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, viewportCount, pViewportSwizzles );
@@ -134428,36 +96930,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                             sType             = StructureType::ePipelineViewportSwizzleStateCreateInfoNV;
-    const void *                              pNext             = {};
-    PipelineViewportSwizzleStateCreateFlagsNV flags             = {};
-    uint32_t                                  viewportCount     = {};
-    const ViewportSwizzleNV *                 pViewportSwizzles = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType             = StructureType::ePipelineViewportSwizzleStateCreateInfoNV;
+    const void *                                                    pNext             = {};
+    VULKAN_HPP_NAMESPACE::PipelineViewportSwizzleStateCreateFlagsNV flags             = {};
+    uint32_t                                                        viewportCount     = {};
+    const VULKAN_HPP_NAMESPACE::ViewportSwizzleNV *                 pViewportSwizzles = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportSwizzleStateCreateInfoNV>
-  {
-    using Type = PipelineViewportSwizzleStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportSwizzleStateCreateInfoNV>
   {
     using Type = PipelineViewportSwizzleStateCreateInfoNV;
   };
 
-  // wrapper struct for struct VkViewportWScalingNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViewportWScalingNV.html
   struct ViewportWScalingNV
   {
     using NativeType = VkViewportWScalingNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ViewportWScalingNV( float xcoeff_ = {}, float ycoeff_ = {} ) VULKAN_HPP_NOEXCEPT
-      : xcoeff{ xcoeff_ }
-      , ycoeff{ ycoeff_ }
+      : xcoeff( xcoeff_ )
+      , ycoeff( ycoeff_ )
     {
     }
 
@@ -134466,15 +96959,15 @@ namespace VULKAN_HPP_NAMESPACE
     ViewportWScalingNV( VkViewportWScalingNV const & rhs ) VULKAN_HPP_NOEXCEPT : ViewportWScalingNV( *reinterpret_cast<ViewportWScalingNV const *>( &rhs ) ) {}
 
     ViewportWScalingNV & operator=( ViewportWScalingNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ViewportWScalingNV & operator=( VkViewportWScalingNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ViewportWScalingNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ViewportWScalingNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ViewportWScalingNV & setXcoeff( float xcoeff_ ) VULKAN_HPP_NOEXCEPT
     {
       xcoeff = xcoeff_;
@@ -134486,7 +96979,7 @@ namespace VULKAN_HPP_NAMESPACE
       ycoeff = ycoeff_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkViewportWScalingNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134498,18 +96991,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkViewportWScalingNV *>( this );
     }
 
-    operator VkViewportWScalingNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkViewportWScalingNV *>( this );
-    }
-
-    operator VkViewportWScalingNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkViewportWScalingNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<float const &, float const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<float const &, float const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( xcoeff, ycoeff );
     }
@@ -134538,16 +97026,6 @@ namespace VULKAN_HPP_NAMESPACE
     float ycoeff = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkViewportWScalingNV>
-  {
-    using Type = ViewportWScalingNV;
-  };
-#endif
-
-  // wrapper struct for struct VkPipelineViewportWScalingStateCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPipelineViewportWScalingStateCreateInfoNV.html
   struct PipelineViewportWScalingStateCreateInfoNV
   {
     using NativeType = VkPipelineViewportWScalingStateCreateInfoNV;
@@ -134555,15 +97033,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePipelineViewportWScalingStateCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PipelineViewportWScalingStateCreateInfoNV( Bool32                     viewportWScalingEnable_ = {},
-                                                                    uint32_t                   viewportCount_          = {},
-                                                                    const ViewportWScalingNV * pViewportWScalings_     = {},
-                                                                    const void *               pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , viewportWScalingEnable{ viewportWScalingEnable_ }
-      , viewportCount{ viewportCount_ }
-      , pViewportWScalings{ pViewportWScalings_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PipelineViewportWScalingStateCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32                     viewportWScalingEnable_ = {},
+                                                                    uint32_t                                         viewportCount_          = {},
+                                                                    const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * pViewportWScalings_     = {},
+                                                                    const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , viewportWScalingEnable( viewportWScalingEnable_ )
+      , viewportCount( viewportCount_ )
+      , pViewportWScalings( pViewportWScalings_ )
     {
     }
 
@@ -134575,9 +97053,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportWScalingStateCreateInfoNV( Bool32                                                    viewportWScalingEnable_,
-                                               ArrayProxyNoTemporaries<const ViewportWScalingNV> const & viewportWScalings_,
-                                               const void *                                              pNext_ = nullptr )
+    PipelineViewportWScalingStateCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::Bool32                                                                          viewportWScalingEnable_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings_,
+      const void *                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , viewportWScalingEnable( viewportWScalingEnable_ )
       , viewportCount( static_cast<uint32_t>( viewportWScalings_.size() ) )
@@ -134587,22 +97066,23 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PipelineViewportWScalingStateCreateInfoNV & operator=( PipelineViewportWScalingStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PipelineViewportWScalingStateCreateInfoNV & operator=( VkPipelineViewportWScalingStateCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PipelineViewportWScalingStateCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PipelineViewportWScalingStateCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportWScalingStateCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PipelineViewportWScalingStateCreateInfoNV & setViewportWScalingEnable( Bool32 viewportWScalingEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PipelineViewportWScalingStateCreateInfoNV &
+      setViewportWScalingEnable( VULKAN_HPP_NAMESPACE::Bool32 viewportWScalingEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportWScalingEnable = viewportWScalingEnable_;
       return *this;
@@ -134615,22 +97095,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PipelineViewportWScalingStateCreateInfoNV &
-      setPViewportWScalings( const ViewportWScalingNV * pViewportWScalings_ ) VULKAN_HPP_NOEXCEPT
+      setPViewportWScalings( const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * pViewportWScalings_ ) VULKAN_HPP_NOEXCEPT
     {
       pViewportWScalings = pViewportWScalings_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PipelineViewportWScalingStateCreateInfoNV &
-      setViewportWScalings( ArrayProxyNoTemporaries<const ViewportWScalingNV> const & viewportWScalings_ ) VULKAN_HPP_NOEXCEPT
+    PipelineViewportWScalingStateCreateInfoNV & setViewportWScalings(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ViewportWScalingNV> const & viewportWScalings_ ) VULKAN_HPP_NOEXCEPT
     {
       viewportCount      = static_cast<uint32_t>( viewportWScalings_.size() );
       pViewportWScalings = viewportWScalings_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPipelineViewportWScalingStateCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134642,18 +97122,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPipelineViewportWScalingStateCreateInfoNV *>( this );
     }
 
-    operator VkPipelineViewportWScalingStateCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPipelineViewportWScalingStateCreateInfoNV *>( this );
-    }
-
-    operator VkPipelineViewportWScalingStateCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPipelineViewportWScalingStateCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, const ViewportWScalingNV * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, viewportWScalingEnable, viewportCount, pViewportWScalings );
@@ -134680,21 +97158,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                  = StructureType::ePipelineViewportWScalingStateCreateInfoNV;
-    const void *               pNext                  = {};
-    Bool32                     viewportWScalingEnable = {};
-    uint32_t                   viewportCount          = {};
-    const ViewportWScalingNV * pViewportWScalings     = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                  = StructureType::ePipelineViewportWScalingStateCreateInfoNV;
+    const void *                                     pNext                  = {};
+    VULKAN_HPP_NAMESPACE::Bool32                     viewportWScalingEnable = {};
+    uint32_t                                         viewportCount          = {};
+    const VULKAN_HPP_NAMESPACE::ViewportWScalingNV * pViewportWScalings     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPipelineViewportWScalingStateCreateInfoNV>
-  {
-    using Type = PipelineViewportWScalingStateCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePipelineViewportWScalingStateCreateInfoNV>
   {
@@ -134702,7 +97172,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_GGP )
-  // wrapper struct for struct VkPresentFrameTokenGGP, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentFrameTokenGGP.html
   struct PresentFrameTokenGGP
   {
     using NativeType = VkPresentFrameTokenGGP;
@@ -134710,10 +97179,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentFrameTokenGGP;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PresentFrameTokenGGP( GgpFrameToken frameToken_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , frameToken{ frameToken_ }
+      : pNext( pNext_ )
+      , frameToken( frameToken_ )
     {
     }
 
@@ -134725,15 +97194,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PresentFrameTokenGGP & operator=( PresentFrameTokenGGP const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentFrameTokenGGP & operator=( VkPresentFrameTokenGGP const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentFrameTokenGGP const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentFrameTokenGGP const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentFrameTokenGGP & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -134745,7 +97214,7 @@ namespace VULKAN_HPP_NAMESPACE
       frameToken = frameToken_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentFrameTokenGGP const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -134757,18 +97226,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentFrameTokenGGP *>( this );
     }
 
-    operator VkPresentFrameTokenGGP const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentFrameTokenGGP *>( this );
-    }
-
-    operator VkPresentFrameTokenGGP *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentFrameTokenGGP *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, GgpFrameToken const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, GgpFrameToken const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, frameToken );
     }
@@ -134799,19 +97263,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType sType      = StructureType::ePresentFrameTokenGGP;
-    const void *  pNext      = {};
-    GgpFrameToken frameToken = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::ePresentFrameTokenGGP;
+    const void *                        pNext      = {};
+    GgpFrameToken                       frameToken = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentFrameTokenGGP>
-  {
-    using Type = PresentFrameTokenGGP;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::ePresentFrameTokenGGP>
   {
@@ -134819,138 +97275,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_GGP*/
 
-  // wrapper struct for struct VkPresentId2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentId2KHR.html
-  struct PresentId2KHR
-  {
-    using NativeType = VkPresentId2KHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentId2KHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentId2KHR( uint32_t swapchainCount_ = {}, const uint64_t * pPresentIds_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pPresentIds{ pPresentIds_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentId2KHR( PresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentId2KHR( VkPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentId2KHR( *reinterpret_cast<PresentId2KHR const *>( &rhs ) ) {}
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentId2KHR( ArrayProxyNoTemporaries<const uint64_t> const & presentIds_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( presentIds_.size() ) ), pPresentIds( presentIds_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PresentId2KHR & operator=( PresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentId2KHR & operator=( VkPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentId2KHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentId2KHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentId2KHR & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchainCount = swapchainCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentId2KHR & setPPresentIds( const uint64_t * pPresentIds_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pPresentIds = pPresentIds_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentId2KHR & setPresentIds( ArrayProxyNoTemporaries<const uint64_t> const & presentIds_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchainCount = static_cast<uint32_t>( presentIds_.size() );
-      pPresentIds    = presentIds_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentId2KHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentId2KHR *>( this );
-    }
-
-    operator VkPresentId2KHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentId2KHR *>( this );
-    }
-
-    operator VkPresentId2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentId2KHR *>( this );
-    }
-
-    operator VkPresentId2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentId2KHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, swapchainCount, pPresentIds );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentId2KHR const & ) const = default;
-#else
-    bool operator==( PresentId2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( swapchainCount == rhs.swapchainCount ) && ( pPresentIds == rhs.pPresentIds );
-#  endif
-    }
-
-    bool operator!=( PresentId2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType          = StructureType::ePresentId2KHR;
-    const void *     pNext          = {};
-    uint32_t         swapchainCount = {};
-    const uint64_t * pPresentIds    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentId2KHR>
-  {
-    using Type = PresentId2KHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePresentId2KHR>
-  {
-    using Type = PresentId2KHR;
-  };
-
-  // wrapper struct for struct VkPresentIdKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentIdKHR.html
   struct PresentIdKHR
   {
     using NativeType = VkPresentIdKHR;
@@ -134958,11 +97282,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentIdKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PresentIdKHR( uint32_t swapchainCount_ = {}, const uint64_t * pPresentIds_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pPresentIds{ pPresentIds_ }
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pPresentIds( pPresentIds_ )
     {
     }
 
@@ -134971,22 +97295,22 @@ namespace VULKAN_HPP_NAMESPACE
     PresentIdKHR( VkPresentIdKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentIdKHR( *reinterpret_cast<PresentIdKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentIdKHR( ArrayProxyNoTemporaries<const uint64_t> const & presentIds_, const void * pNext_ = nullptr )
+    PresentIdKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & presentIds_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( presentIds_.size() ) ), pPresentIds( presentIds_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PresentIdKHR & operator=( PresentIdKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentIdKHR & operator=( VkPresentIdKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentIdKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentIdKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentIdKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -135006,14 +97330,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentIdKHR & setPresentIds( ArrayProxyNoTemporaries<const uint64_t> const & presentIds_ ) VULKAN_HPP_NOEXCEPT
+    PresentIdKHR & setPresentIds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & presentIds_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( presentIds_.size() );
       pPresentIds    = presentIds_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentIdKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135025,18 +97349,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentIdKHR *>( this );
     }
 
-    operator VkPresentIdKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentIdKHR *>( this );
-    }
-
-    operator VkPresentIdKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentIdKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pPresentIds );
     }
@@ -135061,27 +97380,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType          = StructureType::ePresentIdKHR;
-    const void *     pNext          = {};
-    uint32_t         swapchainCount = {};
-    const uint64_t * pPresentIds    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::ePresentIdKHR;
+    const void *                        pNext          = {};
+    uint32_t                            swapchainCount = {};
+    const uint64_t *                    pPresentIds    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentIdKHR>
-  {
-    using Type = PresentIdKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePresentIdKHR>
   {
     using Type = PresentIdKHR;
   };
 
-  // wrapper struct for struct VkPresentInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentInfoKHR.html
   struct PresentInfoKHR
   {
     using NativeType = VkPresentInfoKHR;
@@ -135089,21 +97399,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentInfoKHR( uint32_t             waitSemaphoreCount_ = {},
-                                         const Semaphore *    pWaitSemaphores_    = {},
-                                         uint32_t             swapchainCount_     = {},
-                                         const SwapchainKHR * pSwapchains_        = {},
-                                         const uint32_t *     pImageIndices_      = {},
-                                         Result *             pResults_           = {},
-                                         const void *         pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreCount{ waitSemaphoreCount_ }
-      , pWaitSemaphores{ pWaitSemaphores_ }
-      , swapchainCount{ swapchainCount_ }
-      , pSwapchains{ pSwapchains_ }
-      , pImageIndices{ pImageIndices_ }
-      , pResults{ pResults_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PresentInfoKHR( uint32_t                                   waitSemaphoreCount_ = {},
+                                         const VULKAN_HPP_NAMESPACE::Semaphore *    pWaitSemaphores_    = {},
+                                         uint32_t                                   swapchainCount_     = {},
+                                         const VULKAN_HPP_NAMESPACE::SwapchainKHR * pSwapchains_        = {},
+                                         const uint32_t *                           pImageIndices_      = {},
+                                         VULKAN_HPP_NAMESPACE::Result *             pResults_           = {},
+                                         const void *                               pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , waitSemaphoreCount( waitSemaphoreCount_ )
+      , pWaitSemaphores( pWaitSemaphores_ )
+      , swapchainCount( swapchainCount_ )
+      , pSwapchains( pSwapchains_ )
+      , pImageIndices( pImageIndices_ )
+      , pResults( pResults_ )
     {
     }
 
@@ -135112,11 +97422,11 @@ namespace VULKAN_HPP_NAMESPACE
     PresentInfoKHR( VkPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentInfoKHR( *reinterpret_cast<PresentInfoKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentInfoKHR( ArrayProxyNoTemporaries<const Semaphore> const &    waitSemaphores_,
-                    ArrayProxyNoTemporaries<const SwapchainKHR> const & swapchains_   = {},
-                    ArrayProxyNoTemporaries<const uint32_t> const &     imageIndices_ = {},
-                    ArrayProxyNoTemporaries<Result> const &             results_      = {},
-                    const void *                                        pNext_        = nullptr )
+    PresentInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const &    waitSemaphores_,
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains_   = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                           imageIndices_ = {},
+                    VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::Result> const &             results_      = {},
+                    const void *                                                                                    pNext_        = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreCount( static_cast<uint32_t>( waitSemaphores_.size() ) )
       , pWaitSemaphores( waitSemaphores_.data() )
@@ -135147,15 +97457,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PresentInfoKHR & operator=( PresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentInfoKHR & operator=( VkPresentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -135168,14 +97478,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPWaitSemaphores( const Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPWaitSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pWaitSemaphores = pWaitSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentInfoKHR & setWaitSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    PresentInfoKHR &
+      setWaitSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreCount = static_cast<uint32_t>( waitSemaphores_.size() );
       pWaitSemaphores    = waitSemaphores_.data();
@@ -135189,14 +97500,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPSwapchains( const SwapchainKHR * pSwapchains_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPSwapchains( const VULKAN_HPP_NAMESPACE::SwapchainKHR * pSwapchains_ ) VULKAN_HPP_NOEXCEPT
     {
       pSwapchains = pSwapchains_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentInfoKHR & setSwapchains( ArrayProxyNoTemporaries<const SwapchainKHR> const & swapchains_ ) VULKAN_HPP_NOEXCEPT
+    PresentInfoKHR &
+      setSwapchains( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SwapchainKHR> const & swapchains_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( swapchains_.size() );
       pSwapchains    = swapchains_.data();
@@ -135211,7 +97523,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentInfoKHR & setImageIndices( ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_ ) VULKAN_HPP_NOEXCEPT
+    PresentInfoKHR & setImageIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( imageIndices_.size() );
       pImageIndices  = imageIndices_.data();
@@ -135219,21 +97531,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPResults( Result * pResults_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentInfoKHR & setPResults( VULKAN_HPP_NAMESPACE::Result * pResults_ ) VULKAN_HPP_NOEXCEPT
     {
       pResults = pResults_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentInfoKHR & setResults( ArrayProxyNoTemporaries<Result> const & results_ ) VULKAN_HPP_NOEXCEPT
+    PresentInfoKHR & setResults( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::Result> const & results_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( results_.size() );
       pResults       = results_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135245,25 +97557,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentInfoKHR *>( this );
     }
 
-    operator VkPresentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentInfoKHR *>( this );
-    }
-
-    operator VkPresentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const Semaphore * const &,
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &,
                uint32_t const &,
-               const SwapchainKHR * const &,
+               const VULKAN_HPP_NAMESPACE::SwapchainKHR * const &,
                const uint32_t * const &,
-               Result * const &>
+               VULKAN_HPP_NAMESPACE::Result * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, waitSemaphoreCount, pWaitSemaphores, swapchainCount, pSwapchains, pImageIndices, pResults );
@@ -135291,40 +97597,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType              = StructureType::ePresentInfoKHR;
-    const void *         pNext              = {};
-    uint32_t             waitSemaphoreCount = {};
-    const Semaphore *    pWaitSemaphores    = {};
-    uint32_t             swapchainCount     = {};
-    const SwapchainKHR * pSwapchains        = {};
-    const uint32_t *     pImageIndices      = {};
-    Result *             pResults           = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType              = StructureType::ePresentInfoKHR;
+    const void *                               pNext              = {};
+    uint32_t                                   waitSemaphoreCount = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *    pWaitSemaphores    = {};
+    uint32_t                                   swapchainCount     = {};
+    const VULKAN_HPP_NAMESPACE::SwapchainKHR * pSwapchains        = {};
+    const uint32_t *                           pImageIndices      = {};
+    VULKAN_HPP_NAMESPACE::Result *             pResults           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentInfoKHR>
-  {
-    using Type = PresentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePresentInfoKHR>
   {
     using Type = PresentInfoKHR;
   };
 
-  // wrapper struct for struct VkRectLayerKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRectLayerKHR.html
   struct RectLayerKHR
   {
     using NativeType = VkRectLayerKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RectLayerKHR( Offset2D offset_ = {}, Extent2D extent_ = {}, uint32_t layer_ = {} ) VULKAN_HPP_NOEXCEPT
-      : offset{ offset_ }
-      , extent{ extent_ }
-      , layer{ layer_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      RectLayerKHR( VULKAN_HPP_NAMESPACE::Offset2D offset_ = {}, VULKAN_HPP_NAMESPACE::Extent2D extent_ = {}, uint32_t layer_ = {} ) VULKAN_HPP_NOEXCEPT
+      : offset( offset_ )
+      , extent( extent_ )
+      , layer( layer_ )
     {
     }
 
@@ -135335,22 +97633,22 @@ namespace VULKAN_HPP_NAMESPACE
     explicit RectLayerKHR( Rect2D const & rect2D, uint32_t layer_ = {} ) : offset( rect2D.offset ), extent( rect2D.extent ), layer( layer_ ) {}
 
     RectLayerKHR & operator=( RectLayerKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RectLayerKHR & operator=( VkRectLayerKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RectLayerKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RectLayerKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RectLayerKHR & setOffset( Offset2D const & offset_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 RectLayerKHR & setOffset( VULKAN_HPP_NAMESPACE::Offset2D const & offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RectLayerKHR & setExtent( Extent2D const & extent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RectLayerKHR & setExtent( VULKAN_HPP_NAMESPACE::Extent2D const & extent_ ) VULKAN_HPP_NOEXCEPT
     {
       extent = extent_;
       return *this;
@@ -135361,7 +97659,7 @@ namespace VULKAN_HPP_NAMESPACE
       layer = layer_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRectLayerKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135373,18 +97671,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRectLayerKHR *>( this );
     }
 
-    operator VkRectLayerKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRectLayerKHR *>( this );
-    }
-
-    operator VkRectLayerKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRectLayerKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Offset2D const &, Extent2D const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Offset2D const &, VULKAN_HPP_NAMESPACE::Extent2D const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( offset, extent, layer );
     }
@@ -135409,28 +97702,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Offset2D offset = {};
-    Extent2D extent = {};
-    uint32_t layer  = {};
+    VULKAN_HPP_NAMESPACE::Offset2D offset = {};
+    VULKAN_HPP_NAMESPACE::Extent2D extent = {};
+    uint32_t                       layer  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRectLayerKHR>
-  {
-    using Type = RectLayerKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPresentRegionKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentRegionKHR.html
   struct PresentRegionKHR
   {
     using NativeType = VkPresentRegionKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentRegionKHR( uint32_t rectangleCount_ = {}, const RectLayerKHR * pRectangles_ = {} ) VULKAN_HPP_NOEXCEPT
-      : rectangleCount{ rectangleCount_ }
-      , pRectangles{ pRectangles_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PresentRegionKHR( uint32_t rectangleCount_ = {}, const VULKAN_HPP_NAMESPACE::RectLayerKHR * pRectangles_ = {} ) VULKAN_HPP_NOEXCEPT
+      : rectangleCount( rectangleCount_ )
+      , pRectangles( pRectangles_ )
     {
     }
 
@@ -135439,43 +97723,44 @@ namespace VULKAN_HPP_NAMESPACE
     PresentRegionKHR( VkPresentRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentRegionKHR( *reinterpret_cast<PresentRegionKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentRegionKHR( ArrayProxyNoTemporaries<const RectLayerKHR> const & rectangles_ )
+    PresentRegionKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RectLayerKHR> const & rectangles_ )
       : rectangleCount( static_cast<uint32_t>( rectangles_.size() ) ), pRectangles( rectangles_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PresentRegionKHR & operator=( PresentRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentRegionKHR & operator=( VkPresentRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentRegionKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentRegionKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentRegionKHR & setRectangleCount( uint32_t rectangleCount_ ) VULKAN_HPP_NOEXCEPT
     {
       rectangleCount = rectangleCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PresentRegionKHR & setPRectangles( const RectLayerKHR * pRectangles_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentRegionKHR & setPRectangles( const VULKAN_HPP_NAMESPACE::RectLayerKHR * pRectangles_ ) VULKAN_HPP_NOEXCEPT
     {
       pRectangles = pRectangles_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentRegionKHR & setRectangles( ArrayProxyNoTemporaries<const RectLayerKHR> const & rectangles_ ) VULKAN_HPP_NOEXCEPT
+    PresentRegionKHR &
+      setRectangles( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RectLayerKHR> const & rectangles_ ) VULKAN_HPP_NOEXCEPT
     {
       rectangleCount = static_cast<uint32_t>( rectangles_.size() );
       pRectangles    = rectangles_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentRegionKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135487,18 +97772,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentRegionKHR *>( this );
     }
 
-    operator VkPresentRegionKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentRegionKHR *>( this );
-    }
-
-    operator VkPresentRegionKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentRegionKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, const RectLayerKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, const VULKAN_HPP_NAMESPACE::RectLayerKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( rectangleCount, pRectangles );
     }
@@ -135523,19 +97803,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t             rectangleCount = {};
-    const RectLayerKHR * pRectangles    = {};
+    uint32_t                                   rectangleCount = {};
+    const VULKAN_HPP_NAMESPACE::RectLayerKHR * pRectangles    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentRegionKHR>
-  {
-    using Type = PresentRegionKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkPresentRegionsKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentRegionsKHR.html
   struct PresentRegionsKHR
   {
     using NativeType = VkPresentRegionsKHR;
@@ -135543,12 +97814,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentRegionsKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PresentRegionsKHR( uint32_t swapchainCount_ = {}, const PresentRegionKHR * pRegions_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PresentRegionsKHR( uint32_t                                       swapchainCount_ = {},
+                                            const VULKAN_HPP_NAMESPACE::PresentRegionKHR * pRegions_       = {},
+                                            const void *                                   pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -135557,22 +97829,23 @@ namespace VULKAN_HPP_NAMESPACE
     PresentRegionsKHR( VkPresentRegionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentRegionsKHR( *reinterpret_cast<PresentRegionsKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentRegionsKHR( ArrayProxyNoTemporaries<const PresentRegionKHR> const & regions_, const void * pNext_ = nullptr )
+    PresentRegionsKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentRegionKHR> const & regions_,
+                       const void *                                                                                        pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( regions_.size() ) ), pRegions( regions_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PresentRegionsKHR & operator=( PresentRegionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentRegionsKHR & operator=( VkPresentRegionsKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentRegionsKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentRegionsKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentRegionsKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -135585,21 +97858,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PresentRegionsKHR & setPRegions( const PresentRegionKHR * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentRegionsKHR & setPRegions( const VULKAN_HPP_NAMESPACE::PresentRegionKHR * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentRegionsKHR & setRegions( ArrayProxyNoTemporaries<const PresentRegionKHR> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    PresentRegionsKHR &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentRegionKHR> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( regions_.size() );
       pRegions       = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentRegionsKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135611,18 +97885,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentRegionsKHR *>( this );
     }
 
-    operator VkPresentRegionsKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentRegionsKHR *>( this );
-    }
-
-    operator VkPresentRegionsKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentRegionsKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PresentRegionKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::PresentRegionKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pRegions );
     }
@@ -135647,35 +97916,26 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType          = StructureType::ePresentRegionsKHR;
-    const void *             pNext          = {};
-    uint32_t                 swapchainCount = {};
-    const PresentRegionKHR * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType          = StructureType::ePresentRegionsKHR;
+    const void *                                   pNext          = {};
+    uint32_t                                       swapchainCount = {};
+    const VULKAN_HPP_NAMESPACE::PresentRegionKHR * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentRegionsKHR>
-  {
-    using Type = PresentRegionsKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePresentRegionsKHR>
   {
     using Type = PresentRegionsKHR;
   };
 
-  // wrapper struct for struct VkPresentTimeGOOGLE, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimeGOOGLE.html
   struct PresentTimeGOOGLE
   {
     using NativeType = VkPresentTimeGOOGLE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR PresentTimeGOOGLE( uint32_t presentID_ = {}, uint64_t desiredPresentTime_ = {} ) VULKAN_HPP_NOEXCEPT
-      : presentID{ presentID_ }
-      , desiredPresentTime{ desiredPresentTime_ }
+      : presentID( presentID_ )
+      , desiredPresentTime( desiredPresentTime_ )
     {
     }
 
@@ -135684,15 +97944,15 @@ namespace VULKAN_HPP_NAMESPACE
     PresentTimeGOOGLE( VkPresentTimeGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT : PresentTimeGOOGLE( *reinterpret_cast<PresentTimeGOOGLE const *>( &rhs ) ) {}
 
     PresentTimeGOOGLE & operator=( PresentTimeGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentTimeGOOGLE & operator=( VkPresentTimeGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentTimeGOOGLE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentTimeGOOGLE & setPresentID( uint32_t presentID_ ) VULKAN_HPP_NOEXCEPT
     {
       presentID = presentID_;
@@ -135704,7 +97964,7 @@ namespace VULKAN_HPP_NAMESPACE
       desiredPresentTime = desiredPresentTime_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentTimeGOOGLE const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135716,18 +97976,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentTimeGOOGLE *>( this );
     }
 
-    operator VkPresentTimeGOOGLE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentTimeGOOGLE *>( this );
-    }
-
-    operator VkPresentTimeGOOGLE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentTimeGOOGLE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( presentID, desiredPresentTime );
     }
@@ -135756,15 +98011,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint64_t desiredPresentTime = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentTimeGOOGLE>
-  {
-    using Type = PresentTimeGOOGLE;
-  };
-#endif
-
-  // wrapper struct for struct VkPresentTimesInfoGOOGLE, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimesInfoGOOGLE.html
   struct PresentTimesInfoGOOGLE
   {
     using NativeType = VkPresentTimesInfoGOOGLE;
@@ -135772,12 +98018,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentTimesInfoGOOGLE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PresentTimesInfoGOOGLE( uint32_t swapchainCount_ = {}, const PresentTimeGOOGLE * pTimes_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pTimes{ pTimes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PresentTimesInfoGOOGLE( uint32_t                                        swapchainCount_ = {},
+                                                 const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE * pTimes_         = {},
+                                                 const void *                                    pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pTimes( pTimes_ )
     {
     }
 
@@ -135789,22 +98036,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentTimesInfoGOOGLE( ArrayProxyNoTemporaries<const PresentTimeGOOGLE> const & times_, const void * pNext_ = nullptr )
+    PresentTimesInfoGOOGLE( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE> const & times_,
+                            const void *                                                                                         pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( times_.size() ) ), pTimes( times_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     PresentTimesInfoGOOGLE & operator=( PresentTimesInfoGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PresentTimesInfoGOOGLE & operator=( VkPresentTimesInfoGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PresentTimesInfoGOOGLE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PresentTimesInfoGOOGLE const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PresentTimesInfoGOOGLE & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -135817,21 +98065,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PresentTimesInfoGOOGLE & setPTimes( const PresentTimeGOOGLE * pTimes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PresentTimesInfoGOOGLE & setPTimes( const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE * pTimes_ ) VULKAN_HPP_NOEXCEPT
     {
       pTimes = pTimes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentTimesInfoGOOGLE & setTimes( ArrayProxyNoTemporaries<const PresentTimeGOOGLE> const & times_ ) VULKAN_HPP_NOEXCEPT
+    PresentTimesInfoGOOGLE &
+      setTimes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE> const & times_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( times_.size() );
       pTimes         = times_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPresentTimesInfoGOOGLE const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -135843,18 +98092,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPresentTimesInfoGOOGLE *>( this );
     }
 
-    operator VkPresentTimesInfoGOOGLE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentTimesInfoGOOGLE *>( this );
-    }
-
-    operator VkPresentTimesInfoGOOGLE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentTimesInfoGOOGLE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PresentTimeGOOGLE * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pTimes );
     }
@@ -135879,579 +98123,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType          = StructureType::ePresentTimesInfoGOOGLE;
-    const void *              pNext          = {};
-    uint32_t                  swapchainCount = {};
-    const PresentTimeGOOGLE * pTimes         = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType          = StructureType::ePresentTimesInfoGOOGLE;
+    const void *                                    pNext          = {};
+    uint32_t                                        swapchainCount = {};
+    const VULKAN_HPP_NAMESPACE::PresentTimeGOOGLE * pTimes         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentTimesInfoGOOGLE>
-  {
-    using Type = PresentTimesInfoGOOGLE;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePresentTimesInfoGOOGLE>
   {
     using Type = PresentTimesInfoGOOGLE;
   };
 
-  // wrapper struct for struct VkPresentTimingInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimingInfoEXT.html
-  struct PresentTimingInfoEXT
-  {
-    using NativeType = VkPresentTimingInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentTimingInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentTimingInfoEXT( PresentTimingInfoFlagsEXT flags_                        = {},
-                                               uint64_t                  targetTime_                   = {},
-                                               uint64_t                  timeDomainId_                 = {},
-                                               PresentStageFlagsEXT      presentStageQueries_          = {},
-                                               PresentStageFlagsEXT      targetTimeDomainPresentStage_ = {},
-                                               const void *              pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , targetTime{ targetTime_ }
-      , timeDomainId{ timeDomainId_ }
-      , presentStageQueries{ presentStageQueries_ }
-      , targetTimeDomainPresentStage{ targetTimeDomainPresentStage_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentTimingInfoEXT( PresentTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentTimingInfoEXT( VkPresentTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PresentTimingInfoEXT( *reinterpret_cast<PresentTimingInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    PresentTimingInfoEXT & operator=( PresentTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentTimingInfoEXT & operator=( VkPresentTimingInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentTimingInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setFlags( PresentTimingInfoFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTime( uint64_t targetTime_ ) VULKAN_HPP_NOEXCEPT
-    {
-      targetTime = targetTime_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainId = timeDomainId_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentStageQueries = presentStageQueries_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTimeDomainPresentStage( PresentStageFlagsEXT targetTimeDomainPresentStage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      targetTimeDomainPresentStage = targetTimeDomainPresentStage_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentTimingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentTimingInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentTimingInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentTimingInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentTimingInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               PresentTimingInfoFlagsEXT const &,
-               uint64_t const &,
-               uint64_t const &,
-               PresentStageFlagsEXT const &,
-               PresentStageFlagsEXT const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, targetTime, timeDomainId, presentStageQueries, targetTimeDomainPresentStage );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentTimingInfoEXT const & ) const = default;
-#else
-    bool operator==( PresentTimingInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( targetTime == rhs.targetTime ) &&
-             ( timeDomainId == rhs.timeDomainId ) && ( presentStageQueries == rhs.presentStageQueries ) &&
-             ( targetTimeDomainPresentStage == rhs.targetTimeDomainPresentStage );
-#  endif
-    }
-
-    bool operator!=( PresentTimingInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType             sType                        = StructureType::ePresentTimingInfoEXT;
-    const void *              pNext                        = {};
-    PresentTimingInfoFlagsEXT flags                        = {};
-    uint64_t                  targetTime                   = {};
-    uint64_t                  timeDomainId                 = {};
-    PresentStageFlagsEXT      presentStageQueries          = {};
-    PresentStageFlagsEXT      targetTimeDomainPresentStage = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentTimingInfoEXT>
-  {
-    using Type = PresentTimingInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePresentTimingInfoEXT>
-  {
-    using Type = PresentTimingInfoEXT;
-  };
-
-  // wrapper struct for struct VkPresentTimingSurfaceCapabilitiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimingSurfaceCapabilitiesEXT.html
-  struct PresentTimingSurfaceCapabilitiesEXT
-  {
-    using NativeType = VkPresentTimingSurfaceCapabilitiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentTimingSurfaceCapabilitiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentTimingSurfaceCapabilitiesEXT( Bool32               presentTimingSupported_         = {},
-                                                              Bool32               presentAtAbsoluteTimeSupported_ = {},
-                                                              Bool32               presentAtRelativeTimeSupported_ = {},
-                                                              PresentStageFlagsEXT presentStageQueries_            = {},
-                                                              void *               pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentTimingSupported{ presentTimingSupported_ }
-      , presentAtAbsoluteTimeSupported{ presentAtAbsoluteTimeSupported_ }
-      , presentAtRelativeTimeSupported{ presentAtRelativeTimeSupported_ }
-      , presentStageQueries{ presentStageQueries_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentTimingSurfaceCapabilitiesEXT( PresentTimingSurfaceCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentTimingSurfaceCapabilitiesEXT( VkPresentTimingSurfaceCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PresentTimingSurfaceCapabilitiesEXT( *reinterpret_cast<PresentTimingSurfaceCapabilitiesEXT const *>( &rhs ) )
-    {
-    }
-
-    PresentTimingSurfaceCapabilitiesEXT & operator=( PresentTimingSurfaceCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentTimingSurfaceCapabilitiesEXT & operator=( VkPresentTimingSurfaceCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentTimingSurfaceCapabilitiesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentTimingSupported( Bool32 presentTimingSupported_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentTimingSupported = presentTimingSupported_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT &
-      setPresentAtAbsoluteTimeSupported( Bool32 presentAtAbsoluteTimeSupported_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentAtAbsoluteTimeSupported = presentAtAbsoluteTimeSupported_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT &
-      setPresentAtRelativeTimeSupported( Bool32 presentAtRelativeTimeSupported_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentAtRelativeTimeSupported = presentAtRelativeTimeSupported_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentStageQueries = presentStageQueries_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentTimingSurfaceCapabilitiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentTimingSurfaceCapabilitiesEXT *>( this );
-    }
-
-    operator VkPresentTimingSurfaceCapabilitiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentTimingSurfaceCapabilitiesEXT *>( this );
-    }
-
-    operator VkPresentTimingSurfaceCapabilitiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentTimingSurfaceCapabilitiesEXT *>( this );
-    }
-
-    operator VkPresentTimingSurfaceCapabilitiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentTimingSurfaceCapabilitiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &, PresentStageFlagsEXT const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentTimingSupported, presentAtAbsoluteTimeSupported, presentAtRelativeTimeSupported, presentStageQueries );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentTimingSurfaceCapabilitiesEXT const & ) const = default;
-#else
-    bool operator==( PresentTimingSurfaceCapabilitiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentTimingSupported == rhs.presentTimingSupported ) &&
-             ( presentAtAbsoluteTimeSupported == rhs.presentAtAbsoluteTimeSupported ) &&
-             ( presentAtRelativeTimeSupported == rhs.presentAtRelativeTimeSupported ) && ( presentStageQueries == rhs.presentStageQueries );
-#  endif
-    }
-
-    bool operator!=( PresentTimingSurfaceCapabilitiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType        sType                          = StructureType::ePresentTimingSurfaceCapabilitiesEXT;
-    void *               pNext                          = {};
-    Bool32               presentTimingSupported         = {};
-    Bool32               presentAtAbsoluteTimeSupported = {};
-    Bool32               presentAtRelativeTimeSupported = {};
-    PresentStageFlagsEXT presentStageQueries            = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentTimingSurfaceCapabilitiesEXT>
-  {
-    using Type = PresentTimingSurfaceCapabilitiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePresentTimingSurfaceCapabilitiesEXT>
-  {
-    using Type = PresentTimingSurfaceCapabilitiesEXT;
-  };
-
-  // wrapper struct for struct VkPresentTimingsInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentTimingsInfoEXT.html
-  struct PresentTimingsInfoEXT
-  {
-    using NativeType = VkPresentTimingsInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentTimingsInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      PresentTimingsInfoEXT( uint32_t swapchainCount_ = {}, const PresentTimingInfoEXT * pTimingInfos_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pTimingInfos{ pTimingInfos_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentTimingsInfoEXT( PresentTimingsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentTimingsInfoEXT( VkPresentTimingsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PresentTimingsInfoEXT( *reinterpret_cast<PresentTimingsInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentTimingsInfoEXT( ArrayProxyNoTemporaries<const PresentTimingInfoEXT> const & timingInfos_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( timingInfos_.size() ) ), pTimingInfos( timingInfos_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    PresentTimingsInfoEXT & operator=( PresentTimingsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentTimingsInfoEXT & operator=( VkPresentTimingsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentTimingsInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchainCount = swapchainCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPTimingInfos( const PresentTimingInfoEXT * pTimingInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTimingInfos = pTimingInfos_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PresentTimingsInfoEXT & setTimingInfos( ArrayProxyNoTemporaries<const PresentTimingInfoEXT> const & timingInfos_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchainCount = static_cast<uint32_t>( timingInfos_.size() );
-      pTimingInfos   = timingInfos_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentTimingsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentTimingsInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingsInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentTimingsInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentTimingsInfoEXT *>( this );
-    }
-
-    operator VkPresentTimingsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentTimingsInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PresentTimingInfoEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, swapchainCount, pTimingInfos );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentTimingsInfoEXT const & ) const = default;
-#else
-    bool operator==( PresentTimingsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( swapchainCount == rhs.swapchainCount ) && ( pTimingInfos == rhs.pTimingInfos );
-#  endif
-    }
-
-    bool operator!=( PresentTimingsInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                sType          = StructureType::ePresentTimingsInfoEXT;
-    const void *                 pNext          = {};
-    uint32_t                     swapchainCount = {};
-    const PresentTimingInfoEXT * pTimingInfos   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentTimingsInfoEXT>
-  {
-    using Type = PresentTimingsInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePresentTimingsInfoEXT>
-  {
-    using Type = PresentTimingsInfoEXT;
-  };
-
-  // wrapper struct for struct VkPresentWait2InfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPresentWait2InfoKHR.html
-  struct PresentWait2InfoKHR
-  {
-    using NativeType = VkPresentWait2InfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePresentWait2InfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PresentWait2InfoKHR( uint64_t presentId_ = {}, uint64_t timeout_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentId{ presentId_ }
-      , timeout{ timeout_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR PresentWait2InfoKHR( PresentWait2InfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    PresentWait2InfoKHR( VkPresentWait2InfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : PresentWait2InfoKHR( *reinterpret_cast<PresentWait2InfoKHR const *>( &rhs ) )
-    {
-    }
-
-    PresentWait2InfoKHR & operator=( PresentWait2InfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    PresentWait2InfoKHR & operator=( VkPresentWait2InfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<PresentWait2InfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PresentWait2InfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentWait2InfoKHR & setPresentId( uint64_t presentId_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentId = presentId_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 PresentWait2InfoKHR & setTimeout( uint64_t timeout_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeout = timeout_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkPresentWait2InfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkPresentWait2InfoKHR *>( this );
-    }
-
-    operator VkPresentWait2InfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkPresentWait2InfoKHR *>( this );
-    }
-
-    operator VkPresentWait2InfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPresentWait2InfoKHR *>( this );
-    }
-
-    operator VkPresentWait2InfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPresentWait2InfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentId, timeout );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PresentWait2InfoKHR const & ) const = default;
-#else
-    bool operator==( PresentWait2InfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentId == rhs.presentId ) && ( timeout == rhs.timeout );
-#  endif
-    }
-
-    bool operator!=( PresentWait2InfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType     = StructureType::ePresentWait2InfoKHR;
-    const void *  pNext     = {};
-    uint64_t      presentId = {};
-    uint64_t      timeout   = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPresentWait2InfoKHR>
-  {
-    using Type = PresentWait2InfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::ePresentWait2InfoKHR>
-  {
-    using Type = PresentWait2InfoKHR;
-  };
-
-  // wrapper struct for struct VkPrivateDataSlotCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPrivateDataSlotCreateInfo.html
   struct PrivateDataSlotCreateInfo
   {
     using NativeType = VkPrivateDataSlotCreateInfo;
@@ -136459,10 +98142,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePrivateDataSlotCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PrivateDataSlotCreateInfo( PrivateDataSlotCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PrivateDataSlotCreateInfo( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags flags_ = {},
+                                                    const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -136474,27 +98158,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     PrivateDataSlotCreateInfo & operator=( PrivateDataSlotCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     PrivateDataSlotCreateInfo & operator=( VkPrivateDataSlotCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PrivateDataSlotCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 PrivateDataSlotCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PrivateDataSlotCreateInfo & setFlags( PrivateDataSlotCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PrivateDataSlotCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkPrivateDataSlotCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -136506,18 +98190,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkPrivateDataSlotCreateInfo *>( this );
     }
 
-    operator VkPrivateDataSlotCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPrivateDataSlotCreateInfo *>( this );
-    }
-
-    operator VkPrivateDataSlotCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPrivateDataSlotCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PrivateDataSlotCreateFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -136542,19 +98221,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType = StructureType::ePrivateDataSlotCreateInfo;
-    const void *               pNext = {};
-    PrivateDataSlotCreateFlags flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType = StructureType::ePrivateDataSlotCreateInfo;
+    const void *                                     pNext = {};
+    VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPrivateDataSlotCreateInfo>
-  {
-    using Type = PrivateDataSlotCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::ePrivateDataSlotCreateInfo>
   {
@@ -136563,7 +98234,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using PrivateDataSlotCreateInfoEXT = PrivateDataSlotCreateInfo;
 
-  // wrapper struct for struct VkProtectedSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkProtectedSubmitInfo.html
   struct ProtectedSubmitInfo
   {
     using NativeType = VkProtectedSubmitInfo;
@@ -136571,10 +98241,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eProtectedSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ProtectedSubmitInfo( Bool32 protectedSubmit_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , protectedSubmit{ protectedSubmit_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ProtectedSubmitInfo( VULKAN_HPP_NAMESPACE::Bool32 protectedSubmit_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , protectedSubmit( protectedSubmit_ )
     {
     }
 
@@ -136585,27 +98255,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ProtectedSubmitInfo & operator=( ProtectedSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ProtectedSubmitInfo & operator=( VkProtectedSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ProtectedSubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ProtectedSubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ProtectedSubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ProtectedSubmitInfo & setProtectedSubmit( Bool32 protectedSubmit_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ProtectedSubmitInfo & setProtectedSubmit( VULKAN_HPP_NAMESPACE::Bool32 protectedSubmit_ ) VULKAN_HPP_NOEXCEPT
     {
       protectedSubmit = protectedSubmit_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkProtectedSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -136617,18 +98287,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkProtectedSubmitInfo *>( this );
     }
 
-    operator VkProtectedSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkProtectedSubmitInfo *>( this );
-    }
-
-    operator VkProtectedSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkProtectedSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, protectedSubmit );
     }
@@ -136653,57 +98318,54 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eProtectedSubmitInfo;
-    const void *  pNext           = {};
-    Bool32        protectedSubmit = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eProtectedSubmitInfo;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        protectedSubmit = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkProtectedSubmitInfo>
-  {
-    using Type = ProtectedSubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eProtectedSubmitInfo>
   {
     using Type = ProtectedSubmitInfo;
   };
 
-  // wrapper struct for struct VkPushConstantsInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPushConstantsInfo.html
-  struct PushConstantsInfo
+  struct PushConstantsInfoKHR
   {
-    using NativeType = VkPushConstantsInfo;
+    using NativeType = VkPushConstantsInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushConstantsInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushConstantsInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PushConstantsInfo( PipelineLayout   layout_     = {},
-                                            ShaderStageFlags stageFlags_ = {},
-                                            uint32_t         offset_     = {},
-                                            uint32_t         size_       = {},
-                                            const void *     pValues_    = {},
-                                            const void *     pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , layout{ layout_ }
-      , stageFlags{ stageFlags_ }
-      , offset{ offset_ }
-      , size{ size_ }
-      , pValues{ pValues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PushConstantsInfoKHR( VULKAN_HPP_NAMESPACE::PipelineLayout   layout_     = {},
+                                               VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ = {},
+                                               uint32_t                               offset_     = {},
+                                               uint32_t                               size_       = {},
+                                               const void *                           pValues_    = {},
+                                               const void *                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , layout( layout_ )
+      , stageFlags( stageFlags_ )
+      , offset( offset_ )
+      , size( size_ )
+      , pValues( pValues_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PushConstantsInfo( PushConstantsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PushConstantsInfoKHR( PushConstantsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PushConstantsInfo( VkPushConstantsInfo const & rhs ) VULKAN_HPP_NOEXCEPT : PushConstantsInfo( *reinterpret_cast<PushConstantsInfo const *>( &rhs ) ) {}
+    PushConstantsInfoKHR( VkPushConstantsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PushConstantsInfoKHR( *reinterpret_cast<PushConstantsInfoKHR const *>( &rhs ) )
+    {
+    }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    PushConstantsInfo(
-      PipelineLayout layout_, ShaderStageFlags stageFlags_, uint32_t offset_, ArrayProxyNoTemporaries<const T> const & values_, const void * pNext_ = nullptr )
+    PushConstantsInfoKHR( VULKAN_HPP_NAMESPACE::PipelineLayout                           layout_,
+                          VULKAN_HPP_NAMESPACE::ShaderStageFlags                         stageFlags_,
+                          uint32_t                                                       offset_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & values_,
+                          const void *                                                   pNext_ = nullptr )
       : pNext( pNext_ )
       , layout( layout_ )
       , stageFlags( stageFlags_ )
@@ -136714,47 +98376,47 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    PushConstantsInfo & operator=( PushConstantsInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PushConstantsInfoKHR & operator=( PushConstantsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PushConstantsInfo & operator=( VkPushConstantsInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PushConstantsInfoKHR & operator=( VkPushConstantsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PushConstantsInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PushConstantsInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setOffset( uint32_t offset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setOffset( uint32_t offset_ ) VULKAN_HPP_NOEXCEPT
     {
       offset = offset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setSize( uint32_t size_ ) VULKAN_HPP_NOEXCEPT
     {
       size = size_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfo & setPValues( const void * pValues_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushConstantsInfoKHR & setPValues( const void * pValues_ ) VULKAN_HPP_NOEXCEPT
     {
       pValues = pValues_;
       return *this;
@@ -136762,43 +98424,37 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    PushConstantsInfo & setValues( ArrayProxyNoTemporaries<const T> const & values_ ) VULKAN_HPP_NOEXCEPT
+    PushConstantsInfoKHR & setValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & values_ ) VULKAN_HPP_NOEXCEPT
     {
       size    = static_cast<uint32_t>( values_.size() * sizeof( T ) );
       pValues = values_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPushConstantsInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPushConstantsInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPushConstantsInfo *>( this );
+      return *reinterpret_cast<const VkPushConstantsInfoKHR *>( this );
     }
 
-    operator VkPushConstantsInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPushConstantsInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPushConstantsInfo *>( this );
-    }
-
-    operator VkPushConstantsInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPushConstantsInfo *>( this );
-    }
-
-    operator VkPushConstantsInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPushConstantsInfo *>( this );
+      return *reinterpret_cast<VkPushConstantsInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineLayout const &,
-               ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
                uint32_t const &,
                uint32_t const &,
                const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, layout, stageFlags, offset, size, pValues );
@@ -136806,9 +98462,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PushConstantsInfo const & ) const = default;
+    auto operator<=>( PushConstantsInfoKHR const & ) const = default;
 #else
-    bool operator==( PushConstantsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PushConstantsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -136818,39 +98474,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PushConstantsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PushConstantsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType      = StructureType::ePushConstantsInfo;
-    const void *     pNext      = {};
-    PipelineLayout   layout     = {};
-    ShaderStageFlags stageFlags = {};
-    uint32_t         offset     = {};
-    uint32_t         size       = {};
-    const void *     pValues    = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType      = StructureType::ePushConstantsInfoKHR;
+    const void *                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout   layout     = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags = {};
+    uint32_t                               offset     = {};
+    uint32_t                               size       = {};
+    const void *                           pValues    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPushConstantsInfo>
-  {
-    using Type = PushConstantsInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePushConstantsInfo>
+  struct CppType<StructureType, StructureType::ePushConstantsInfoKHR>
   {
-    using Type = PushConstantsInfo;
+    using Type = PushConstantsInfoKHR;
   };
 
-  using PushConstantsInfoKHR = PushConstantsInfo;
-
-  // wrapper struct for struct VkWriteDescriptorSet, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSet.html
   struct WriteDescriptorSet
   {
     using NativeType = VkWriteDescriptorSet;
@@ -136858,25 +98503,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSet;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WriteDescriptorSet( DescriptorSet                dstSet_           = {},
-                                             uint32_t                     dstBinding_       = {},
-                                             uint32_t                     dstArrayElement_  = {},
-                                             uint32_t                     descriptorCount_  = {},
-                                             DescriptorType               descriptorType_   = DescriptorType::eSampler,
-                                             const DescriptorImageInfo *  pImageInfo_       = {},
-                                             const DescriptorBufferInfo * pBufferInfo_      = {},
-                                             const BufferView *           pTexelBufferView_ = {},
-                                             const void *                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dstSet{ dstSet_ }
-      , dstBinding{ dstBinding_ }
-      , dstArrayElement{ dstArrayElement_ }
-      , descriptorCount{ descriptorCount_ }
-      , descriptorType{ descriptorType_ }
-      , pImageInfo{ pImageInfo_ }
-      , pBufferInfo{ pBufferInfo_ }
-      , pTexelBufferView{ pTexelBufferView_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR WriteDescriptorSet( VULKAN_HPP_NAMESPACE::DescriptorSet               dstSet_          = {},
+                                             uint32_t                                          dstBinding_      = {},
+                                             uint32_t                                          dstArrayElement_ = {},
+                                             uint32_t                                          descriptorCount_ = {},
+                                             VULKAN_HPP_NAMESPACE::DescriptorType              descriptorType_ = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler,
+                                             const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pImageInfo_     = {},
+                                             const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo * pBufferInfo_   = {},
+                                             const VULKAN_HPP_NAMESPACE::BufferView *           pTexelBufferView_ = {},
+                                             const void *                                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , dstSet( dstSet_ )
+      , dstBinding( dstBinding_ )
+      , dstArrayElement( dstArrayElement_ )
+      , descriptorCount( descriptorCount_ )
+      , descriptorType( descriptorType_ )
+      , pImageInfo( pImageInfo_ )
+      , pBufferInfo( pBufferInfo_ )
+      , pTexelBufferView( pTexelBufferView_ )
     {
     }
 
@@ -136885,14 +98530,14 @@ namespace VULKAN_HPP_NAMESPACE
     WriteDescriptorSet( VkWriteDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT : WriteDescriptorSet( *reinterpret_cast<WriteDescriptorSet const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSet( DescriptorSet                                               dstSet_,
-                        uint32_t                                                    dstBinding_,
-                        uint32_t                                                    dstArrayElement_,
-                        DescriptorType                                              descriptorType_,
-                        ArrayProxyNoTemporaries<const DescriptorImageInfo> const &  imageInfo_,
-                        ArrayProxyNoTemporaries<const DescriptorBufferInfo> const & bufferInfo_      = {},
-                        ArrayProxyNoTemporaries<const BufferView> const &           texelBufferView_ = {},
-                        const void *                                                pNext_           = nullptr )
+    WriteDescriptorSet( VULKAN_HPP_NAMESPACE::DescriptorSet                                                                     dstSet_,
+                        uint32_t                                                                                                dstBinding_,
+                        uint32_t                                                                                                dstArrayElement_,
+                        VULKAN_HPP_NAMESPACE::DescriptorType                                                                    descriptorType_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorImageInfo> const &  imageInfo_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo> const & bufferInfo_      = {},
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferView> const &           texelBufferView_ = {},
+                        const void *                                                                                            pNext_           = nullptr )
       : pNext( pNext_ )
       , dstSet( dstSet_ )
       , dstBinding( dstBinding_ )
@@ -136918,22 +98563,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     WriteDescriptorSet & operator=( WriteDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     WriteDescriptorSet & operator=( VkWriteDescriptorSet const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<WriteDescriptorSet const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::WriteDescriptorSet const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setDstSet( DescriptorSet dstSet_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setDstSet( VULKAN_HPP_NAMESPACE::DescriptorSet dstSet_ ) VULKAN_HPP_NOEXCEPT
     {
       dstSet = dstSet_;
       return *this;
@@ -136957,20 +98602,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setDescriptorType( DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setDescriptorType( VULKAN_HPP_NAMESPACE::DescriptorType descriptorType_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorType = descriptorType_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPImageInfo( const DescriptorImageInfo * pImageInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPImageInfo( const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * pImageInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pImageInfo = pImageInfo_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSet & setImageInfo( ArrayProxyNoTemporaries<const DescriptorImageInfo> const & imageInfo_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSet &
+      setImageInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorImageInfo> const & imageInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorCount = static_cast<uint32_t>( imageInfo_.size() );
       pImageInfo      = imageInfo_.data();
@@ -136978,14 +98624,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPBufferInfo( const DescriptorBufferInfo * pBufferInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPBufferInfo( const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo * pBufferInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pBufferInfo = pBufferInfo_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSet & setBufferInfo( ArrayProxyNoTemporaries<const DescriptorBufferInfo> const & bufferInfo_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSet &
+      setBufferInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo> const & bufferInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorCount = static_cast<uint32_t>( bufferInfo_.size() );
       pBufferInfo     = bufferInfo_.data();
@@ -136993,21 +98640,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPTexelBufferView( const BufferView * pTexelBufferView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSet & setPTexelBufferView( const VULKAN_HPP_NAMESPACE::BufferView * pTexelBufferView_ ) VULKAN_HPP_NOEXCEPT
     {
       pTexelBufferView = pTexelBufferView_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSet & setTexelBufferView( ArrayProxyNoTemporaries<const BufferView> const & texelBufferView_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSet &
+      setTexelBufferView( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::BufferView> const & texelBufferView_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorCount  = static_cast<uint32_t>( texelBufferView_.size() );
       pTexelBufferView = texelBufferView_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWriteDescriptorSet const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137019,27 +98667,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWriteDescriptorSet *>( this );
     }
 
-    operator VkWriteDescriptorSet const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSet *>( this );
-    }
-
-    operator VkWriteDescriptorSet *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSet *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               DescriptorSet const &,
+               VULKAN_HPP_NAMESPACE::DescriptorSet const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               DescriptorType const &,
-               const DescriptorImageInfo * const &,
-               const DescriptorBufferInfo * const &,
-               const BufferView * const &>
+               VULKAN_HPP_NAMESPACE::DescriptorType const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorImageInfo * const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo * const &,
+               const VULKAN_HPP_NAMESPACE::BufferView * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dstSet, dstBinding, dstArrayElement, descriptorCount, descriptorType, pImageInfo, pBufferInfo, pTexelBufferView );
@@ -137067,69 +98709,60 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType            = StructureType::eWriteDescriptorSet;
-    const void *                 pNext            = {};
-    DescriptorSet                dstSet           = {};
-    uint32_t                     dstBinding       = {};
-    uint32_t                     dstArrayElement  = {};
-    uint32_t                     descriptorCount  = {};
-    DescriptorType               descriptorType   = DescriptorType::eSampler;
-    const DescriptorImageInfo *  pImageInfo       = {};
-    const DescriptorBufferInfo * pBufferInfo      = {};
-    const BufferView *           pTexelBufferView = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType            = StructureType::eWriteDescriptorSet;
+    const void *                                       pNext            = {};
+    VULKAN_HPP_NAMESPACE::DescriptorSet                dstSet           = {};
+    uint32_t                                           dstBinding       = {};
+    uint32_t                                           dstArrayElement  = {};
+    uint32_t                                           descriptorCount  = {};
+    VULKAN_HPP_NAMESPACE::DescriptorType               descriptorType   = VULKAN_HPP_NAMESPACE::DescriptorType::eSampler;
+    const VULKAN_HPP_NAMESPACE::DescriptorImageInfo *  pImageInfo       = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorBufferInfo * pBufferInfo      = {};
+    const VULKAN_HPP_NAMESPACE::BufferView *           pTexelBufferView = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSet>
-  {
-    using Type = WriteDescriptorSet;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eWriteDescriptorSet>
   {
     using Type = WriteDescriptorSet;
   };
 
-  // wrapper struct for struct VkPushDescriptorSetInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkPushDescriptorSetInfo.html
-  struct PushDescriptorSetInfo
+  struct PushDescriptorSetInfoKHR
   {
-    using NativeType = VkPushDescriptorSetInfo;
+    using NativeType = VkPushDescriptorSetInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushDescriptorSetInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushDescriptorSetInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PushDescriptorSetInfo( ShaderStageFlags           stageFlags_           = {},
-                                                PipelineLayout             layout_               = {},
-                                                uint32_t                   set_                  = {},
-                                                uint32_t                   descriptorWriteCount_ = {},
-                                                const WriteDescriptorSet * pDescriptorWrites_    = {},
-                                                const void *               pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stageFlags{ stageFlags_ }
-      , layout{ layout_ }
-      , set{ set_ }
-      , descriptorWriteCount{ descriptorWriteCount_ }
-      , pDescriptorWrites{ pDescriptorWrites_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PushDescriptorSetInfoKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags           stageFlags_           = {},
+                                                   VULKAN_HPP_NAMESPACE::PipelineLayout             layout_               = {},
+                                                   uint32_t                                         set_                  = {},
+                                                   uint32_t                                         descriptorWriteCount_ = {},
+                                                   const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites_    = {},
+                                                   const void *                                     pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stageFlags( stageFlags_ )
+      , layout( layout_ )
+      , set( set_ )
+      , descriptorWriteCount( descriptorWriteCount_ )
+      , pDescriptorWrites( pDescriptorWrites_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PushDescriptorSetInfo( PushDescriptorSetInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PushDescriptorSetInfoKHR( PushDescriptorSetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PushDescriptorSetInfo( VkPushDescriptorSetInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PushDescriptorSetInfo( *reinterpret_cast<PushDescriptorSetInfo const *>( &rhs ) )
+    PushDescriptorSetInfoKHR( VkPushDescriptorSetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PushDescriptorSetInfoKHR( *reinterpret_cast<PushDescriptorSetInfoKHR const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PushDescriptorSetInfo( ShaderStageFlags                                          stageFlags_,
-                           PipelineLayout                                            layout_,
-                           uint32_t                                                  set_,
-                           ArrayProxyNoTemporaries<const WriteDescriptorSet> const & descriptorWrites_,
-                           const void *                                              pNext_ = nullptr )
+    PushDescriptorSetInfoKHR( VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                                stageFlags_,
+                              VULKAN_HPP_NAMESPACE::PipelineLayout                                                                  layout_,
+                              uint32_t                                                                                              set_,
+                              VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites_,
+                              const void *                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , stageFlags( stageFlags_ )
       , layout( layout_ )
@@ -137140,90 +98773,86 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    PushDescriptorSetInfo & operator=( PushDescriptorSetInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PushDescriptorSetInfoKHR & operator=( PushDescriptorSetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PushDescriptorSetInfo & operator=( VkPushDescriptorSetInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PushDescriptorSetInfoKHR & operator=( VkPushDescriptorSetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PushDescriptorSetInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PushDescriptorSetInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setSet( uint32_t set_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR & setSet( uint32_t set_ ) VULKAN_HPP_NOEXCEPT
     {
       set = set_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setDescriptorWriteCount( uint32_t descriptorWriteCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR & setDescriptorWriteCount( uint32_t descriptorWriteCount_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorWriteCount = descriptorWriteCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfo & setPDescriptorWrites( const WriteDescriptorSet * pDescriptorWrites_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetInfoKHR &
+      setPDescriptorWrites( const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites_ ) VULKAN_HPP_NOEXCEPT
     {
       pDescriptorWrites = pDescriptorWrites_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    PushDescriptorSetInfo & setDescriptorWrites( ArrayProxyNoTemporaries<const WriteDescriptorSet> const & descriptorWrites_ ) VULKAN_HPP_NOEXCEPT
+    PushDescriptorSetInfoKHR & setDescriptorWrites(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::WriteDescriptorSet> const & descriptorWrites_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorWriteCount = static_cast<uint32_t>( descriptorWrites_.size() );
       pDescriptorWrites    = descriptorWrites_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPushDescriptorSetInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPushDescriptorSetInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPushDescriptorSetInfo *>( this );
+      return *reinterpret_cast<const VkPushDescriptorSetInfoKHR *>( this );
     }
 
-    operator VkPushDescriptorSetInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPushDescriptorSetInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPushDescriptorSetInfo *>( this );
-    }
-
-    operator VkPushDescriptorSetInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPushDescriptorSetInfo *>( this );
-    }
-
-    operator VkPushDescriptorSetInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPushDescriptorSetInfo *>( this );
+      return *reinterpret_cast<VkPushDescriptorSetInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ShaderStageFlags const &,
-               PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
                uint32_t const &,
                uint32_t const &,
-               const WriteDescriptorSet * const &>
+               const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stageFlags, layout, set, descriptorWriteCount, pDescriptorWrites );
@@ -137231,9 +98860,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PushDescriptorSetInfo const & ) const = default;
+    auto operator<=>( PushDescriptorSetInfoKHR const & ) const = default;
 #else
-    bool operator==( PushDescriptorSetInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PushDescriptorSetInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -137243,132 +98872,119 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PushDescriptorSetInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PushDescriptorSetInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType              sType                = StructureType::ePushDescriptorSetInfo;
-    const void *               pNext                = {};
-    ShaderStageFlags           stageFlags           = {};
-    PipelineLayout             layout               = {};
-    uint32_t                   set                  = {};
-    uint32_t                   descriptorWriteCount = {};
-    const WriteDescriptorSet * pDescriptorWrites    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                = StructureType::ePushDescriptorSetInfoKHR;
+    const void *                                     pNext                = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags           stageFlags           = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout             layout               = {};
+    uint32_t                                         set                  = {};
+    uint32_t                                         descriptorWriteCount = {};
+    const VULKAN_HPP_NAMESPACE::WriteDescriptorSet * pDescriptorWrites    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPushDescriptorSetInfo>
-  {
-    using Type = PushDescriptorSetInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePushDescriptorSetInfo>
+  struct CppType<StructureType, StructureType::ePushDescriptorSetInfoKHR>
   {
-    using Type = PushDescriptorSetInfo;
+    using Type = PushDescriptorSetInfoKHR;
   };
 
-  using PushDescriptorSetInfoKHR = PushDescriptorSetInfo;
-
-  // wrapper struct for struct VkPushDescriptorSetWithTemplateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkPushDescriptorSetWithTemplateInfo.html
-  struct PushDescriptorSetWithTemplateInfo
+  struct PushDescriptorSetWithTemplateInfoKHR
   {
-    using NativeType = VkPushDescriptorSetWithTemplateInfo;
+    using NativeType = VkPushDescriptorSetWithTemplateInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushDescriptorSetWithTemplateInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::ePushDescriptorSetWithTemplateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR PushDescriptorSetWithTemplateInfo( DescriptorUpdateTemplate descriptorUpdateTemplate_ = {},
-                                                            PipelineLayout           layout_                   = {},
-                                                            uint32_t                 set_                      = {},
-                                                            const void *             pData_                    = {},
-                                                            const void *             pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , descriptorUpdateTemplate{ descriptorUpdateTemplate_ }
-      , layout{ layout_ }
-      , set{ set_ }
-      , pData{ pData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR PushDescriptorSetWithTemplateInfoKHR( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate_ = {},
+                                                               VULKAN_HPP_NAMESPACE::PipelineLayout           layout_                   = {},
+                                                               uint32_t                                       set_                      = {},
+                                                               const void *                                   pData_                    = {},
+                                                               const void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , descriptorUpdateTemplate( descriptorUpdateTemplate_ )
+      , layout( layout_ )
+      , set( set_ )
+      , pData( pData_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR PushDescriptorSetWithTemplateInfo( PushDescriptorSetWithTemplateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR PushDescriptorSetWithTemplateInfoKHR( PushDescriptorSetWithTemplateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    PushDescriptorSetWithTemplateInfo( VkPushDescriptorSetWithTemplateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : PushDescriptorSetWithTemplateInfo( *reinterpret_cast<PushDescriptorSetWithTemplateInfo const *>( &rhs ) )
+    PushDescriptorSetWithTemplateInfoKHR( VkPushDescriptorSetWithTemplateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : PushDescriptorSetWithTemplateInfoKHR( *reinterpret_cast<PushDescriptorSetWithTemplateInfoKHR const *>( &rhs ) )
     {
     }
 
-    PushDescriptorSetWithTemplateInfo & operator=( PushDescriptorSetWithTemplateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    PushDescriptorSetWithTemplateInfoKHR & operator=( PushDescriptorSetWithTemplateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    PushDescriptorSetWithTemplateInfo & operator=( VkPushDescriptorSetWithTemplateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    PushDescriptorSetWithTemplateInfoKHR & operator=( VkPushDescriptorSetWithTemplateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<PushDescriptorSetWithTemplateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::PushDescriptorSetWithTemplateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfo &
-      setDescriptorUpdateTemplate( DescriptorUpdateTemplate descriptorUpdateTemplate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfoKHR &
+      setDescriptorUpdateTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate_ ) VULKAN_HPP_NOEXCEPT
     {
       descriptorUpdateTemplate = descriptorUpdateTemplate_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfo & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfoKHR & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfo & setSet( uint32_t set_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfoKHR & setSet( uint32_t set_ ) VULKAN_HPP_NOEXCEPT
     {
       set = set_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfo & setPData( const void * pData_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 PushDescriptorSetWithTemplateInfoKHR & setPData( const void * pData_ ) VULKAN_HPP_NOEXCEPT
     {
       pData = pData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkPushDescriptorSetWithTemplateInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkPushDescriptorSetWithTemplateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( this );
+      return *reinterpret_cast<const VkPushDescriptorSetWithTemplateInfoKHR *>( this );
     }
 
-    operator VkPushDescriptorSetWithTemplateInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkPushDescriptorSetWithTemplateInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkPushDescriptorSetWithTemplateInfo *>( this );
-    }
-
-    operator VkPushDescriptorSetWithTemplateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkPushDescriptorSetWithTemplateInfo *>( this );
-    }
-
-    operator VkPushDescriptorSetWithTemplateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkPushDescriptorSetWithTemplateInfo *>( this );
+      return *reinterpret_cast<VkPushDescriptorSetWithTemplateInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DescriptorUpdateTemplate const &, PipelineLayout const &, uint32_t const &, const void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               uint32_t const &,
+               const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, descriptorUpdateTemplate, layout, set, pData );
@@ -137376,9 +98992,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( PushDescriptorSetWithTemplateInfo const & ) const = default;
+    auto operator<=>( PushDescriptorSetWithTemplateInfoKHR const & ) const = default;
 #else
-    bool operator==( PushDescriptorSetWithTemplateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( PushDescriptorSetWithTemplateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -137388,38 +99004,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( PushDescriptorSetWithTemplateInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( PushDescriptorSetWithTemplateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType            sType                    = StructureType::ePushDescriptorSetWithTemplateInfo;
-    const void *             pNext                    = {};
-    DescriptorUpdateTemplate descriptorUpdateTemplate = {};
-    PipelineLayout           layout                   = {};
-    uint32_t                 set                      = {};
-    const void *             pData                    = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType                    = StructureType::ePushDescriptorSetWithTemplateInfoKHR;
+    const void *                                   pNext                    = {};
+    VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout           layout                   = {};
+    uint32_t                                       set                      = {};
+    const void *                                   pData                    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkPushDescriptorSetWithTemplateInfo>
-  {
-    using Type = PushDescriptorSetWithTemplateInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::ePushDescriptorSetWithTemplateInfo>
+  struct CppType<StructureType, StructureType::ePushDescriptorSetWithTemplateInfoKHR>
   {
-    using Type = PushDescriptorSetWithTemplateInfo;
+    using Type = PushDescriptorSetWithTemplateInfoKHR;
   };
 
-  using PushDescriptorSetWithTemplateInfoKHR = PushDescriptorSetWithTemplateInfo;
-
-  // wrapper struct for struct VkQueryLowLatencySupportNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryLowLatencySupportNV.html
   struct QueryLowLatencySupportNV
   {
     using NativeType = VkQueryLowLatencySupportNV;
@@ -137427,10 +99032,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueryLowLatencySupportNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR QueryLowLatencySupportNV( void * pQueriedLowLatencyData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pQueriedLowLatencyData{ pQueriedLowLatencyData_ }
+      : pNext( pNext_ )
+      , pQueriedLowLatencyData( pQueriedLowLatencyData_ )
     {
     }
 
@@ -137442,15 +99047,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueryLowLatencySupportNV & operator=( QueryLowLatencySupportNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueryLowLatencySupportNV & operator=( VkQueryLowLatencySupportNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueryLowLatencySupportNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueryLowLatencySupportNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 QueryLowLatencySupportNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -137462,7 +99067,7 @@ namespace VULKAN_HPP_NAMESPACE
       pQueriedLowLatencyData = pQueriedLowLatencyData_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkQueryLowLatencySupportNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137474,18 +99079,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueryLowLatencySupportNV *>( this );
     }
 
-    operator VkQueryLowLatencySupportNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueryLowLatencySupportNV *>( this );
-    }
-
-    operator VkQueryLowLatencySupportNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueryLowLatencySupportNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pQueriedLowLatencyData );
     }
@@ -137510,26 +99110,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                  = StructureType::eQueryLowLatencySupportNV;
-    const void *  pNext                  = {};
-    void *        pQueriedLowLatencyData = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::eQueryLowLatencySupportNV;
+    const void *                        pNext                  = {};
+    void *                              pQueriedLowLatencyData = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueryLowLatencySupportNV>
-  {
-    using Type = QueryLowLatencySupportNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueryLowLatencySupportNV>
   {
     using Type = QueryLowLatencySupportNV;
   };
 
-  // wrapper struct for struct VkQueryPoolCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolCreateInfo.html
   struct QueryPoolCreateInfo
   {
     using NativeType = VkQueryPoolCreateInfo;
@@ -137537,17 +99128,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueryPoolCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueryPoolCreateInfo( QueryPoolCreateFlags        flags_              = {},
-                                              QueryType                   queryType_          = QueryType::eOcclusion,
-                                              uint32_t                    queryCount_         = {},
-                                              QueryPipelineStatisticFlags pipelineStatistics_ = {},
-                                              const void *                pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , queryType{ queryType_ }
-      , queryCount{ queryCount_ }
-      , pipelineStatistics{ pipelineStatistics_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueryPoolCreateInfo( VULKAN_HPP_NAMESPACE::QueryPoolCreateFlags        flags_      = {},
+                                              VULKAN_HPP_NAMESPACE::QueryType                   queryType_  = VULKAN_HPP_NAMESPACE::QueryType::eOcclusion,
+                                              uint32_t                                          queryCount_ = {},
+                                              VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics_ = {},
+                                              const void *                                      pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , queryType( queryType_ )
+      , queryCount( queryCount_ )
+      , pipelineStatistics( pipelineStatistics_ )
     {
     }
 
@@ -137558,28 +99149,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueryPoolCreateInfo & operator=( QueryPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueryPoolCreateInfo & operator=( VkQueryPoolCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueryPoolCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueryPoolCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setFlags( QueryPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::QueryPoolCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setQueryType( QueryType queryType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setQueryType( VULKAN_HPP_NAMESPACE::QueryType queryType_ ) VULKAN_HPP_NOEXCEPT
     {
       queryType = queryType_;
       return *this;
@@ -137591,12 +99182,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo & setPipelineStatistics( QueryPipelineStatisticFlags pipelineStatistics_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 QueryPoolCreateInfo &
+      setPipelineStatistics( VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineStatistics = pipelineStatistics_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkQueryPoolCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137608,19 +99200,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueryPoolCreateInfo *>( this );
     }
 
-    operator VkQueryPoolCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueryPoolCreateInfo *>( this );
-    }
-
-    operator VkQueryPoolCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueryPoolCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, QueryPoolCreateFlags const &, QueryType const &, uint32_t const &, QueryPipelineStatisticFlags const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::QueryPoolCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::QueryType const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, queryType, queryCount, pipelineStatistics );
@@ -137647,30 +99237,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType              = StructureType::eQueryPoolCreateInfo;
-    const void *                pNext              = {};
-    QueryPoolCreateFlags        flags              = {};
-    QueryType                   queryType          = QueryType::eOcclusion;
-    uint32_t                    queryCount         = {};
-    QueryPipelineStatisticFlags pipelineStatistics = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType              = StructureType::eQueryPoolCreateInfo;
+    const void *                                      pNext              = {};
+    VULKAN_HPP_NAMESPACE::QueryPoolCreateFlags        flags              = {};
+    VULKAN_HPP_NAMESPACE::QueryType                   queryType          = VULKAN_HPP_NAMESPACE::QueryType::eOcclusion;
+    uint32_t                                          queryCount         = {};
+    VULKAN_HPP_NAMESPACE::QueryPipelineStatisticFlags pipelineStatistics = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueryPoolCreateInfo>
-  {
-    using Type = QueryPoolCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueryPoolCreateInfo>
   {
     using Type = QueryPoolCreateInfo;
   };
 
-  // wrapper struct for struct VkQueryPoolPerformanceCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolPerformanceCreateInfoKHR.html
   struct QueryPoolPerformanceCreateInfoKHR
   {
     using NativeType = VkQueryPoolPerformanceCreateInfoKHR;
@@ -137678,15 +99258,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueryPoolPerformanceCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR QueryPoolPerformanceCreateInfoKHR( uint32_t         queueFamilyIndex_  = {},
                                                             uint32_t         counterIndexCount_ = {},
                                                             const uint32_t * pCounterIndices_   = {},
                                                             const void *     pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
-      , counterIndexCount{ counterIndexCount_ }
-      , pCounterIndices{ pCounterIndices_ }
+      : pNext( pNext_ )
+      , queueFamilyIndex( queueFamilyIndex_ )
+      , counterIndexCount( counterIndexCount_ )
+      , pCounterIndices( pCounterIndices_ )
     {
     }
 
@@ -137698,9 +99278,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    QueryPoolPerformanceCreateInfoKHR( uint32_t                                        queueFamilyIndex_,
-                                       ArrayProxyNoTemporaries<const uint32_t> const & counterIndices_,
-                                       const void *                                    pNext_ = nullptr )
+    QueryPoolPerformanceCreateInfoKHR( uint32_t                                                              queueFamilyIndex_,
+                                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & counterIndices_,
+                                       const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , queueFamilyIndex( queueFamilyIndex_ )
       , counterIndexCount( static_cast<uint32_t>( counterIndices_.size() ) )
@@ -137710,15 +99290,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     QueryPoolPerformanceCreateInfoKHR & operator=( QueryPoolPerformanceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueryPoolPerformanceCreateInfoKHR & operator=( VkQueryPoolPerformanceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueryPoolPerformanceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueryPoolPerformanceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 QueryPoolPerformanceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -137744,14 +99324,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    QueryPoolPerformanceCreateInfoKHR & setCounterIndices( ArrayProxyNoTemporaries<const uint32_t> const & counterIndices_ ) VULKAN_HPP_NOEXCEPT
+    QueryPoolPerformanceCreateInfoKHR &
+      setCounterIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & counterIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       counterIndexCount = static_cast<uint32_t>( counterIndices_.size() );
       pCounterIndices   = counterIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkQueryPoolPerformanceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137763,18 +99344,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueryPoolPerformanceCreateInfoKHR *>( this );
     }
 
-    operator VkQueryPoolPerformanceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueryPoolPerformanceCreateInfoKHR *>( this );
-    }
-
-    operator VkQueryPoolPerformanceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueryPoolPerformanceCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const uint32_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const uint32_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queueFamilyIndex, counterIndexCount, pCounterIndices );
     }
@@ -137800,29 +99376,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType             = StructureType::eQueryPoolPerformanceCreateInfoKHR;
-    const void *     pNext             = {};
-    uint32_t         queueFamilyIndex  = {};
-    uint32_t         counterIndexCount = {};
-    const uint32_t * pCounterIndices   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eQueryPoolPerformanceCreateInfoKHR;
+    const void *                        pNext             = {};
+    uint32_t                            queueFamilyIndex  = {};
+    uint32_t                            counterIndexCount = {};
+    const uint32_t *                    pCounterIndices   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueryPoolPerformanceCreateInfoKHR>
-  {
-    using Type = QueryPoolPerformanceCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueryPoolPerformanceCreateInfoKHR>
   {
     using Type = QueryPoolPerformanceCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkQueryPoolPerformanceQueryCreateInfoINTEL, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolPerformanceQueryCreateInfoINTEL.html
   struct QueryPoolPerformanceQueryCreateInfoINTEL
   {
     using NativeType = VkQueryPoolPerformanceQueryCreateInfoINTEL;
@@ -137830,12 +99396,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      QueryPoolPerformanceQueryCreateInfoINTEL( QueryPoolSamplingModeINTEL performanceCountersSampling_ = QueryPoolSamplingModeINTEL::eManual,
-                                                const void *               pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , performanceCountersSampling{ performanceCountersSampling_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueryPoolPerformanceQueryCreateInfoINTEL(
+      VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL performanceCountersSampling_ = VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL::eManual,
+      const void *                                     pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , performanceCountersSampling( performanceCountersSampling_ )
     {
     }
 
@@ -137847,15 +99413,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueryPoolPerformanceQueryCreateInfoINTEL & operator=( QueryPoolPerformanceQueryCreateInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueryPoolPerformanceQueryCreateInfoINTEL & operator=( VkQueryPoolPerformanceQueryCreateInfoINTEL const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueryPoolPerformanceQueryCreateInfoINTEL const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueryPoolPerformanceQueryCreateInfoINTEL const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 QueryPoolPerformanceQueryCreateInfoINTEL & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -137863,12 +99429,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 QueryPoolPerformanceQueryCreateInfoINTEL &
-      setPerformanceCountersSampling( QueryPoolSamplingModeINTEL performanceCountersSampling_ ) VULKAN_HPP_NOEXCEPT
+      setPerformanceCountersSampling( VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL performanceCountersSampling_ ) VULKAN_HPP_NOEXCEPT
     {
       performanceCountersSampling = performanceCountersSampling_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkQueryPoolPerformanceQueryCreateInfoINTEL const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137880,18 +99446,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueryPoolPerformanceQueryCreateInfoINTEL *>( this );
     }
 
-    operator VkQueryPoolPerformanceQueryCreateInfoINTEL const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueryPoolPerformanceQueryCreateInfoINTEL *>( this );
-    }
-
-    operator VkQueryPoolPerformanceQueryCreateInfoINTEL *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueryPoolPerformanceQueryCreateInfoINTEL *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, QueryPoolSamplingModeINTEL const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, performanceCountersSampling );
     }
@@ -137916,19 +99477,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                       = StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL;
-    const void *               pNext                       = {};
-    QueryPoolSamplingModeINTEL performanceCountersSampling = QueryPoolSamplingModeINTEL::eManual;
+    VULKAN_HPP_NAMESPACE::StructureType              sType                       = StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL;
+    const void *                                     pNext                       = {};
+    VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL performanceCountersSampling = VULKAN_HPP_NAMESPACE::QueryPoolSamplingModeINTEL::eManual;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueryPoolPerformanceQueryCreateInfoINTEL>
-  {
-    using Type = QueryPoolPerformanceQueryCreateInfoINTEL;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL>
   {
@@ -137937,8 +99490,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using QueryPoolCreateInfoINTEL = QueryPoolPerformanceQueryCreateInfoINTEL;
 
-  // wrapper struct for struct VkQueryPoolVideoEncodeFeedbackCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueryPoolVideoEncodeFeedbackCreateInfoKHR.html
   struct QueryPoolVideoEncodeFeedbackCreateInfoKHR
   {
     using NativeType = VkQueryPoolVideoEncodeFeedbackCreateInfoKHR;
@@ -137946,11 +99497,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueryPoolVideoEncodeFeedbackCreateInfoKHR( VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags_ = {},
-                                                                    const void *                pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , encodeFeedbackFlags{ encodeFeedbackFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueryPoolVideoEncodeFeedbackCreateInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags_ = {},
+                                                                    const void *                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , encodeFeedbackFlags( encodeFeedbackFlags_ )
     {
     }
 
@@ -137962,15 +99513,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueryPoolVideoEncodeFeedbackCreateInfoKHR & operator=( QueryPoolVideoEncodeFeedbackCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueryPoolVideoEncodeFeedbackCreateInfoKHR & operator=( VkQueryPoolVideoEncodeFeedbackCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueryPoolVideoEncodeFeedbackCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueryPoolVideoEncodeFeedbackCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 QueryPoolVideoEncodeFeedbackCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -137978,12 +99529,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 QueryPoolVideoEncodeFeedbackCreateInfoKHR &
-      setEncodeFeedbackFlags( VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags_ ) VULKAN_HPP_NOEXCEPT
+      setEncodeFeedbackFlags( VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       encodeFeedbackFlags = encodeFeedbackFlags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkQueryPoolVideoEncodeFeedbackCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -137995,18 +99546,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueryPoolVideoEncodeFeedbackCreateInfoKHR *>( this );
     }
 
-    operator VkQueryPoolVideoEncodeFeedbackCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueryPoolVideoEncodeFeedbackCreateInfoKHR *>( this );
-    }
-
-    operator VkQueryPoolVideoEncodeFeedbackCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueryPoolVideoEncodeFeedbackCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoEncodeFeedbackFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, encodeFeedbackFlags );
     }
@@ -138031,27 +99577,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType               = StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR;
-    const void *                pNext               = {};
-    VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType               = StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR;
+    const void *                                      pNext               = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR encodeFeedbackFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueryPoolVideoEncodeFeedbackCreateInfoKHR>
-  {
-    using Type = QueryPoolVideoEncodeFeedbackCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR>
   {
     using Type = QueryPoolVideoEncodeFeedbackCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkQueueFamilyCheckpointProperties2NV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyCheckpointProperties2NV.html
   struct QueueFamilyCheckpointProperties2NV
   {
     using NativeType = VkQueueFamilyCheckpointProperties2NV;
@@ -138059,11 +99595,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyCheckpointProperties2NV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyCheckpointProperties2NV( PipelineStageFlags2 checkpointExecutionStageMask_ = {},
-                                                             void *              pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , checkpointExecutionStageMask{ checkpointExecutionStageMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyCheckpointProperties2NV( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 checkpointExecutionStageMask_ = {},
+                                                             void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , checkpointExecutionStageMask( checkpointExecutionStageMask_ )
     {
     }
 
@@ -138075,11 +99611,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyCheckpointProperties2NV & operator=( QueueFamilyCheckpointProperties2NV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyCheckpointProperties2NV & operator=( VkQueueFamilyCheckpointProperties2NV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyCheckpointProperties2NV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV const *>( &rhs );
       return *this;
     }
 
@@ -138093,18 +99629,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyCheckpointProperties2NV *>( this );
     }
 
-    operator VkQueueFamilyCheckpointProperties2NV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyCheckpointProperties2NV *>( this );
-    }
-
-    operator VkQueueFamilyCheckpointProperties2NV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyCheckpointProperties2NV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PipelineStageFlags2 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, checkpointExecutionStageMask );
     }
@@ -138129,27 +99660,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                        = StructureType::eQueueFamilyCheckpointProperties2NV;
-    void *              pNext                        = {};
-    PipelineStageFlags2 checkpointExecutionStageMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType                        = StructureType::eQueueFamilyCheckpointProperties2NV;
+    void *                                    pNext                        = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 checkpointExecutionStageMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyCheckpointProperties2NV>
-  {
-    using Type = QueueFamilyCheckpointProperties2NV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueueFamilyCheckpointProperties2NV>
   {
     using Type = QueueFamilyCheckpointProperties2NV;
   };
 
-  // wrapper struct for struct VkQueueFamilyCheckpointPropertiesNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyCheckpointPropertiesNV.html
   struct QueueFamilyCheckpointPropertiesNV
   {
     using NativeType = VkQueueFamilyCheckpointPropertiesNV;
@@ -138157,10 +99678,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyCheckpointPropertiesNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyCheckpointPropertiesNV( PipelineStageFlags checkpointExecutionStageMask_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , checkpointExecutionStageMask{ checkpointExecutionStageMask_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyCheckpointPropertiesNV( VULKAN_HPP_NAMESPACE::PipelineStageFlags checkpointExecutionStageMask_ = {},
+                                                            void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , checkpointExecutionStageMask( checkpointExecutionStageMask_ )
     {
     }
 
@@ -138172,11 +99694,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyCheckpointPropertiesNV & operator=( QueueFamilyCheckpointPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyCheckpointPropertiesNV & operator=( VkQueueFamilyCheckpointPropertiesNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyCheckpointPropertiesNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointPropertiesNV const *>( &rhs );
       return *this;
     }
 
@@ -138190,18 +99712,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyCheckpointPropertiesNV *>( this );
     }
 
-    operator VkQueueFamilyCheckpointPropertiesNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyCheckpointPropertiesNV *>( this );
-    }
-
-    operator VkQueueFamilyCheckpointPropertiesNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyCheckpointPropertiesNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PipelineStageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PipelineStageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, checkpointExecutionStageMask );
     }
@@ -138226,349 +99743,96 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType                        = StructureType::eQueueFamilyCheckpointPropertiesNV;
-    void *             pNext                        = {};
-    PipelineStageFlags checkpointExecutionStageMask = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType                        = StructureType::eQueueFamilyCheckpointPropertiesNV;
+    void *                                   pNext                        = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags checkpointExecutionStageMask = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyCheckpointPropertiesNV>
-  {
-    using Type = QueueFamilyCheckpointPropertiesNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueueFamilyCheckpointPropertiesNV>
   {
     using Type = QueueFamilyCheckpointPropertiesNV;
   };
 
-  // wrapper struct for struct VkQueueFamilyDataGraphProcessingEnginePropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyDataGraphProcessingEnginePropertiesARM.html
-  struct QueueFamilyDataGraphProcessingEnginePropertiesARM
+  struct QueueFamilyGlobalPriorityPropertiesKHR
   {
-    using NativeType = VkQueueFamilyDataGraphProcessingEnginePropertiesARM;
+    using NativeType = VkQueueFamilyGlobalPriorityPropertiesKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyDataGraphProcessingEnginePropertiesARM;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyGlobalPriorityPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyDataGraphProcessingEnginePropertiesARM( ExternalSemaphoreHandleTypeFlags foreignSemaphoreHandleTypes_ = {},
-                                                                            ExternalMemoryHandleTypeFlags    foreignMemoryHandleTypes_    = {},
-                                                                            const void *                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , foreignSemaphoreHandleTypes{ foreignSemaphoreHandleTypes_ }
-      , foreignMemoryHandleTypes{ foreignMemoryHandleTypes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      QueueFamilyDataGraphProcessingEnginePropertiesARM( QueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    QueueFamilyDataGraphProcessingEnginePropertiesARM( VkQueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : QueueFamilyDataGraphProcessingEnginePropertiesARM( *reinterpret_cast<QueueFamilyDataGraphProcessingEnginePropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    QueueFamilyDataGraphProcessingEnginePropertiesARM &
-      operator=( QueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    QueueFamilyDataGraphProcessingEnginePropertiesARM & operator=( VkQueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<QueueFamilyDataGraphProcessingEnginePropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphProcessingEnginePropertiesARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphProcessingEnginePropertiesARM &
-      setForeignSemaphoreHandleTypes( ExternalSemaphoreHandleTypeFlags foreignSemaphoreHandleTypes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      foreignSemaphoreHandleTypes = foreignSemaphoreHandleTypes_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphProcessingEnginePropertiesARM &
-      setForeignMemoryHandleTypes( ExternalMemoryHandleTypeFlags foreignMemoryHandleTypes_ ) VULKAN_HPP_NOEXCEPT
-    {
-      foreignMemoryHandleTypes = foreignMemoryHandleTypes_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkQueueFamilyDataGraphProcessingEnginePropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphProcessingEnginePropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphProcessingEnginePropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphProcessingEnginePropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyDataGraphProcessingEnginePropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ExternalSemaphoreHandleTypeFlags const &, ExternalMemoryHandleTypeFlags const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, foreignSemaphoreHandleTypes, foreignMemoryHandleTypes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( QueueFamilyDataGraphProcessingEnginePropertiesARM const & ) const = default;
-#else
-    bool operator==( QueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( foreignSemaphoreHandleTypes == rhs.foreignSemaphoreHandleTypes ) &&
-             ( foreignMemoryHandleTypes == rhs.foreignMemoryHandleTypes );
-#  endif
-    }
-
-    bool operator!=( QueueFamilyDataGraphProcessingEnginePropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                    sType                       = StructureType::eQueueFamilyDataGraphProcessingEnginePropertiesARM;
-    const void *                     pNext                       = {};
-    ExternalSemaphoreHandleTypeFlags foreignSemaphoreHandleTypes = {};
-    ExternalMemoryHandleTypeFlags    foreignMemoryHandleTypes    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyDataGraphProcessingEnginePropertiesARM>
-  {
-    using Type = QueueFamilyDataGraphProcessingEnginePropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eQueueFamilyDataGraphProcessingEnginePropertiesARM>
-  {
-    using Type = QueueFamilyDataGraphProcessingEnginePropertiesARM;
-  };
-
-  // wrapper struct for struct VkQueueFamilyDataGraphPropertiesARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyDataGraphPropertiesARM.html
-  struct QueueFamilyDataGraphPropertiesARM
-  {
-    using NativeType = VkQueueFamilyDataGraphPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyDataGraphPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphPropertiesARM( PhysicalDeviceDataGraphProcessingEngineARM engine_    = {},
-                                                               PhysicalDeviceDataGraphOperationSupportARM operation_ = {},
-                                                               const void *                               pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , engine{ engine_ }
-      , operation{ operation_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphPropertiesARM( QueueFamilyDataGraphPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    QueueFamilyDataGraphPropertiesARM( VkQueueFamilyDataGraphPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : QueueFamilyDataGraphPropertiesARM( *reinterpret_cast<QueueFamilyDataGraphPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    QueueFamilyDataGraphPropertiesARM & operator=( QueueFamilyDataGraphPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    QueueFamilyDataGraphPropertiesARM & operator=( VkQueueFamilyDataGraphPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<QueueFamilyDataGraphPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphPropertiesARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphPropertiesARM & setEngine( PhysicalDeviceDataGraphProcessingEngineARM const & engine_ ) VULKAN_HPP_NOEXCEPT
-    {
-      engine = engine_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyDataGraphPropertiesARM &
-      setOperation( PhysicalDeviceDataGraphOperationSupportARM const & operation_ ) VULKAN_HPP_NOEXCEPT
-    {
-      operation = operation_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkQueueFamilyDataGraphPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkQueueFamilyDataGraphPropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyDataGraphPropertiesARM *>( this );
-    }
-
-    operator VkQueueFamilyDataGraphPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyDataGraphPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, PhysicalDeviceDataGraphProcessingEngineARM const &, PhysicalDeviceDataGraphOperationSupportARM const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, engine, operation );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( QueueFamilyDataGraphPropertiesARM const & ) const = default;
-#else
-    bool operator==( QueueFamilyDataGraphPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( engine == rhs.engine ) && ( operation == rhs.operation );
-#  endif
-    }
-
-    bool operator!=( QueueFamilyDataGraphPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                              sType     = StructureType::eQueueFamilyDataGraphPropertiesARM;
-    const void *                               pNext     = {};
-    PhysicalDeviceDataGraphProcessingEngineARM engine    = {};
-    PhysicalDeviceDataGraphOperationSupportARM operation = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyDataGraphPropertiesARM>
-  {
-    using Type = QueueFamilyDataGraphPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eQueueFamilyDataGraphPropertiesARM>
-  {
-    using Type = QueueFamilyDataGraphPropertiesARM;
-  };
-
-  // wrapper struct for struct VkQueueFamilyGlobalPriorityProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyGlobalPriorityProperties.html
-  struct QueueFamilyGlobalPriorityProperties
-  {
-    using NativeType = VkQueueFamilyGlobalPriorityProperties;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyGlobalPriorityProperties;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14
-      QueueFamilyGlobalPriorityProperties( uint32_t                                                             priorityCount_ = {},
-                                           std::array<QueueGlobalPriority, VK_MAX_GLOBAL_PRIORITY_SIZE> const & priorities_    = { { QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow,
-                                                                                                                                     QueueGlobalPriority::eLow } },
-                                           void *                                                               pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , priorityCount{ priorityCount_ }
-      , priorities{ priorities_ }
+      QueueFamilyGlobalPriorityPropertiesKHR( uint32_t priorityCount_ = {},
+                                              std::array<VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR, VK_MAX_GLOBAL_PRIORITY_SIZE_KHR> const &
+                                                     priorities_ = { { VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow,
+                                                                       VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR::eLow } },
+                                              void * pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , priorityCount( priorityCount_ )
+      , priorities( priorities_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR_14 QueueFamilyGlobalPriorityProperties( QueueFamilyGlobalPriorityProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR_14 QueueFamilyGlobalPriorityPropertiesKHR( QueueFamilyGlobalPriorityPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    QueueFamilyGlobalPriorityProperties( VkQueueFamilyGlobalPriorityProperties const & rhs ) VULKAN_HPP_NOEXCEPT
-      : QueueFamilyGlobalPriorityProperties( *reinterpret_cast<QueueFamilyGlobalPriorityProperties const *>( &rhs ) )
+    QueueFamilyGlobalPriorityPropertiesKHR( VkQueueFamilyGlobalPriorityPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : QueueFamilyGlobalPriorityPropertiesKHR( *reinterpret_cast<QueueFamilyGlobalPriorityPropertiesKHR const *>( &rhs ) )
     {
     }
 
-    QueueFamilyGlobalPriorityProperties & operator=( QueueFamilyGlobalPriorityProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    QueueFamilyGlobalPriorityProperties & operator=( VkQueueFamilyGlobalPriorityProperties const & rhs ) VULKAN_HPP_NOEXCEPT
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    QueueFamilyGlobalPriorityPropertiesKHR( VULKAN_HPP_NAMESPACE::ArrayProxy<VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR> const & priorities_,
+                                            void *                                                                                 pNext_ = nullptr )
+      : pNext( pNext_ ), priorityCount( std::min( static_cast<uint32_t>( priorities_.size() ), VK_MAX_GLOBAL_PRIORITY_SIZE_KHR ) )
     {
-      *this = *reinterpret_cast<QueueFamilyGlobalPriorityProperties const *>( &rhs );
+      VULKAN_HPP_ASSERT( priorities_.size() < VK_MAX_GLOBAL_PRIORITY_SIZE_KHR );
+      memcpy( priorities, priorities_.data(), priorityCount * sizeof( VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR ) );
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+    QueueFamilyGlobalPriorityPropertiesKHR & operator=( QueueFamilyGlobalPriorityPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    QueueFamilyGlobalPriorityPropertiesKHR & operator=( VkQueueFamilyGlobalPriorityPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyGlobalPriorityPropertiesKHR const *>( &rhs );
       return *this;
     }
 
-    operator VkQueueFamilyGlobalPriorityProperties const &() const VULKAN_HPP_NOEXCEPT
+    operator VkQueueFamilyGlobalPriorityPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkQueueFamilyGlobalPriorityProperties *>( this );
+      return *reinterpret_cast<const VkQueueFamilyGlobalPriorityPropertiesKHR *>( this );
     }
 
-    operator VkQueueFamilyGlobalPriorityProperties &() VULKAN_HPP_NOEXCEPT
+    operator VkQueueFamilyGlobalPriorityPropertiesKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkQueueFamilyGlobalPriorityProperties *>( this );
-    }
-
-    operator VkQueueFamilyGlobalPriorityProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyGlobalPriorityProperties *>( this );
-    }
-
-    operator VkQueueFamilyGlobalPriorityProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyGlobalPriorityProperties *>( this );
+      return *reinterpret_cast<VkQueueFamilyGlobalPriorityPropertiesKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, ArrayWrapper1D<QueueGlobalPriority, VK_MAX_GLOBAL_PRIORITY_SIZE> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR, VK_MAX_GLOBAL_PRIORITY_SIZE_KHR> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, priorityCount, priorities );
@@ -138576,7 +99840,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( QueueFamilyGlobalPriorityProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    std::strong_ordering operator<=>( QueueFamilyGlobalPriorityPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
         return cmp;
@@ -138594,153 +99858,45 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #endif
 
-    bool operator==( QueueFamilyGlobalPriorityProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( QueueFamilyGlobalPriorityPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( priorityCount == rhs.priorityCount ) &&
-             ( memcmp( priorities, rhs.priorities, priorityCount * sizeof( QueueGlobalPriority ) ) == 0 );
+             ( memcmp( priorities, rhs.priorities, priorityCount * sizeof( VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR ) ) == 0 );
     }
 
-    bool operator!=( QueueFamilyGlobalPriorityProperties const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( QueueFamilyGlobalPriorityPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 
   public:
-    StructureType                                                    sType         = StructureType::eQueueFamilyGlobalPriorityProperties;
-    void *                                                           pNext         = {};
-    uint32_t                                                         priorityCount = {};
-    ArrayWrapper1D<QueueGlobalPriority, VK_MAX_GLOBAL_PRIORITY_SIZE> priorities    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eQueueFamilyGlobalPriorityPropertiesKHR;
+    void *                              pNext         = {};
+    uint32_t                            priorityCount = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<VULKAN_HPP_NAMESPACE::QueueGlobalPriorityKHR, VK_MAX_GLOBAL_PRIORITY_SIZE_KHR> priorities = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyGlobalPriorityProperties>
-  {
-    using Type = QueueFamilyGlobalPriorityProperties;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eQueueFamilyGlobalPriorityProperties>
+  struct CppType<StructureType, StructureType::eQueueFamilyGlobalPriorityPropertiesKHR>
   {
-    using Type = QueueFamilyGlobalPriorityProperties;
+    using Type = QueueFamilyGlobalPriorityPropertiesKHR;
   };
 
-  using QueueFamilyGlobalPriorityPropertiesEXT = QueueFamilyGlobalPriorityProperties;
-  using QueueFamilyGlobalPriorityPropertiesKHR = QueueFamilyGlobalPriorityProperties;
+  using QueueFamilyGlobalPriorityPropertiesEXT = QueueFamilyGlobalPriorityPropertiesKHR;
 
-  // wrapper struct for struct VkQueueFamilyOwnershipTransferPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyOwnershipTransferPropertiesKHR.html
-  struct QueueFamilyOwnershipTransferPropertiesKHR
-  {
-    using NativeType = VkQueueFamilyOwnershipTransferPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyOwnershipTransferPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyOwnershipTransferPropertiesKHR( uint32_t optimalImageTransferToQueueFamilies_ = {},
-                                                                    void *   pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , optimalImageTransferToQueueFamilies{ optimalImageTransferToQueueFamilies_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR QueueFamilyOwnershipTransferPropertiesKHR( QueueFamilyOwnershipTransferPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    QueueFamilyOwnershipTransferPropertiesKHR( VkQueueFamilyOwnershipTransferPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : QueueFamilyOwnershipTransferPropertiesKHR( *reinterpret_cast<QueueFamilyOwnershipTransferPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    QueueFamilyOwnershipTransferPropertiesKHR & operator=( QueueFamilyOwnershipTransferPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    QueueFamilyOwnershipTransferPropertiesKHR & operator=( VkQueueFamilyOwnershipTransferPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<QueueFamilyOwnershipTransferPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkQueueFamilyOwnershipTransferPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkQueueFamilyOwnershipTransferPropertiesKHR *>( this );
-    }
-
-    operator VkQueueFamilyOwnershipTransferPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkQueueFamilyOwnershipTransferPropertiesKHR *>( this );
-    }
-
-    operator VkQueueFamilyOwnershipTransferPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyOwnershipTransferPropertiesKHR *>( this );
-    }
-
-    operator VkQueueFamilyOwnershipTransferPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyOwnershipTransferPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, optimalImageTransferToQueueFamilies );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( QueueFamilyOwnershipTransferPropertiesKHR const & ) const = default;
-#else
-    bool operator==( QueueFamilyOwnershipTransferPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( optimalImageTransferToQueueFamilies == rhs.optimalImageTransferToQueueFamilies );
-#  endif
-    }
-
-    bool operator!=( QueueFamilyOwnershipTransferPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                               = StructureType::eQueueFamilyOwnershipTransferPropertiesKHR;
-    void *        pNext                               = {};
-    uint32_t      optimalImageTransferToQueueFamilies = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyOwnershipTransferPropertiesKHR>
-  {
-    using Type = QueueFamilyOwnershipTransferPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eQueueFamilyOwnershipTransferPropertiesKHR>
-  {
-    using Type = QueueFamilyOwnershipTransferPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkQueueFamilyProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyProperties.html
   struct QueueFamilyProperties
   {
     using NativeType = VkQueueFamilyProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyProperties( QueueFlags queueFlags_                  = {},
-                                                uint32_t   queueCount_                  = {},
-                                                uint32_t   timestampValidBits_          = {},
-                                                Extent3D   minImageTransferGranularity_ = {} ) VULKAN_HPP_NOEXCEPT
-      : queueFlags{ queueFlags_ }
-      , queueCount{ queueCount_ }
-      , timestampValidBits{ timestampValidBits_ }
-      , minImageTransferGranularity{ minImageTransferGranularity_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyProperties( VULKAN_HPP_NAMESPACE::QueueFlags queueFlags_                  = {},
+                                                uint32_t                         queueCount_                  = {},
+                                                uint32_t                         timestampValidBits_          = {},
+                                                VULKAN_HPP_NAMESPACE::Extent3D   minImageTransferGranularity_ = {} ) VULKAN_HPP_NOEXCEPT
+      : queueFlags( queueFlags_ )
+      , queueCount( queueCount_ )
+      , timestampValidBits( timestampValidBits_ )
+      , minImageTransferGranularity( minImageTransferGranularity_ )
     {
     }
 
@@ -138752,11 +99908,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyProperties & operator=( QueueFamilyProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyProperties & operator=( VkQueueFamilyProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyProperties const *>( &rhs );
       return *this;
     }
 
@@ -138770,18 +99926,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyProperties *>( this );
     }
 
-    operator VkQueueFamilyProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyProperties *>( this );
-    }
-
-    operator VkQueueFamilyProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<QueueFlags const &, uint32_t const &, uint32_t const &, Extent3D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::QueueFlags const &, uint32_t const &, uint32_t const &, VULKAN_HPP_NAMESPACE::Extent3D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( queueFlags, queueCount, timestampValidBits, minImageTransferGranularity );
     }
@@ -138807,21 +99958,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    QueueFlags queueFlags                  = {};
-    uint32_t   queueCount                  = {};
-    uint32_t   timestampValidBits          = {};
-    Extent3D   minImageTransferGranularity = {};
+    VULKAN_HPP_NAMESPACE::QueueFlags queueFlags                  = {};
+    uint32_t                         queueCount                  = {};
+    uint32_t                         timestampValidBits          = {};
+    VULKAN_HPP_NAMESPACE::Extent3D   minImageTransferGranularity = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyProperties>
-  {
-    using Type = QueueFamilyProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkQueueFamilyProperties2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyProperties2.html
   struct QueueFamilyProperties2
   {
     using NativeType = VkQueueFamilyProperties2;
@@ -138829,10 +99971,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyProperties2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyProperties2( QueueFamilyProperties queueFamilyProperties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueFamilyProperties{ queueFamilyProperties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyProperties2( VULKAN_HPP_NAMESPACE::QueueFamilyProperties queueFamilyProperties_ = {},
+                                                 void *                                      pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queueFamilyProperties( queueFamilyProperties_ )
     {
     }
 
@@ -138844,11 +99987,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyProperties2 & operator=( QueueFamilyProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyProperties2 & operator=( VkQueueFamilyProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyProperties2 const *>( &rhs );
       return *this;
     }
 
@@ -138862,18 +100005,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyProperties2 *>( this );
     }
 
-    operator VkQueueFamilyProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyProperties2 *>( this );
-    }
-
-    operator VkQueueFamilyProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyProperties2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, QueueFamilyProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::QueueFamilyProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queueFamilyProperties );
     }
@@ -138898,19 +100036,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType                 = StructureType::eQueueFamilyProperties2;
-    void *                pNext                 = {};
-    QueueFamilyProperties queueFamilyProperties = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType                 = StructureType::eQueueFamilyProperties2;
+    void *                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::QueueFamilyProperties queueFamilyProperties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyProperties2>
-  {
-    using Type = QueueFamilyProperties2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueueFamilyProperties2>
   {
@@ -138919,8 +100049,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using QueueFamilyProperties2KHR = QueueFamilyProperties2;
 
-  // wrapper struct for struct VkQueueFamilyQueryResultStatusPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyQueryResultStatusPropertiesKHR.html
   struct QueueFamilyQueryResultStatusPropertiesKHR
   {
     using NativeType = VkQueueFamilyQueryResultStatusPropertiesKHR;
@@ -138928,10 +100056,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyQueryResultStatusPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyQueryResultStatusPropertiesKHR( Bool32 queryResultStatusSupport_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queryResultStatusSupport{ queryResultStatusSupport_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyQueryResultStatusPropertiesKHR( VULKAN_HPP_NAMESPACE::Bool32 queryResultStatusSupport_ = {},
+                                                                    void *                       pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queryResultStatusSupport( queryResultStatusSupport_ )
     {
     }
 
@@ -138943,11 +100072,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyQueryResultStatusPropertiesKHR & operator=( QueueFamilyQueryResultStatusPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyQueryResultStatusPropertiesKHR & operator=( VkQueueFamilyQueryResultStatusPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyQueryResultStatusPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyQueryResultStatusPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -138961,18 +100090,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyQueryResultStatusPropertiesKHR *>( this );
     }
 
-    operator VkQueueFamilyQueryResultStatusPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyQueryResultStatusPropertiesKHR *>( this );
-    }
-
-    operator VkQueueFamilyQueryResultStatusPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyQueryResultStatusPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queryResultStatusSupport );
     }
@@ -138997,27 +100121,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                    = StructureType::eQueueFamilyQueryResultStatusPropertiesKHR;
-    void *        pNext                    = {};
-    Bool32        queryResultStatusSupport = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                    = StructureType::eQueueFamilyQueryResultStatusPropertiesKHR;
+    void *                              pNext                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        queryResultStatusSupport = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyQueryResultStatusPropertiesKHR>
-  {
-    using Type = QueueFamilyQueryResultStatusPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueueFamilyQueryResultStatusPropertiesKHR>
   {
     using Type = QueueFamilyQueryResultStatusPropertiesKHR;
   };
 
-  // wrapper struct for struct VkQueueFamilyVideoPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkQueueFamilyVideoPropertiesKHR.html
   struct QueueFamilyVideoPropertiesKHR
   {
     using NativeType = VkQueueFamilyVideoPropertiesKHR;
@@ -139025,10 +100139,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eQueueFamilyVideoPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR QueueFamilyVideoPropertiesKHR( VideoCodecOperationFlagsKHR videoCodecOperations_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoCodecOperations{ videoCodecOperations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR QueueFamilyVideoPropertiesKHR( VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagsKHR videoCodecOperations_ = {},
+                                                        void *                                            pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoCodecOperations( videoCodecOperations_ )
     {
     }
 
@@ -139040,11 +100155,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     QueueFamilyVideoPropertiesKHR & operator=( QueueFamilyVideoPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     QueueFamilyVideoPropertiesKHR & operator=( VkQueueFamilyVideoPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<QueueFamilyVideoPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::QueueFamilyVideoPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -139058,18 +100173,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkQueueFamilyVideoPropertiesKHR *>( this );
     }
 
-    operator VkQueueFamilyVideoPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkQueueFamilyVideoPropertiesKHR *>( this );
-    }
-
-    operator VkQueueFamilyVideoPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkQueueFamilyVideoPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, VideoCodecOperationFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoCodecOperations );
     }
@@ -139094,144 +100204,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                = StructureType::eQueueFamilyVideoPropertiesKHR;
-    void *                      pNext                = {};
-    VideoCodecOperationFlagsKHR videoCodecOperations = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                = StructureType::eQueueFamilyVideoPropertiesKHR;
+    void *                                            pNext                = {};
+    VULKAN_HPP_NAMESPACE::VideoCodecOperationFlagsKHR videoCodecOperations = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkQueueFamilyVideoPropertiesKHR>
-  {
-    using Type = QueueFamilyVideoPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eQueueFamilyVideoPropertiesKHR>
   {
     using Type = QueueFamilyVideoPropertiesKHR;
   };
 
-  // wrapper struct for struct VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV.html
-  struct RayTracingPipelineClusterAccelerationStructureCreateInfoNV
-  {
-    using NativeType = VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RayTracingPipelineClusterAccelerationStructureCreateInfoNV( Bool32 allowClusterAccelerationStructure_ = {},
-                                                                                     void * pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allowClusterAccelerationStructure{ allowClusterAccelerationStructure_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR RayTracingPipelineClusterAccelerationStructureCreateInfoNV( RayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    RayTracingPipelineClusterAccelerationStructureCreateInfoNV( VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RayTracingPipelineClusterAccelerationStructureCreateInfoNV(
-          *reinterpret_cast<RayTracingPipelineClusterAccelerationStructureCreateInfoNV const *>( &rhs ) )
-    {
-    }
-
-    RayTracingPipelineClusterAccelerationStructureCreateInfoNV &
-      operator=( RayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RayTracingPipelineClusterAccelerationStructureCreateInfoNV &
-      operator=( VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RayTracingPipelineClusterAccelerationStructureCreateInfoNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineClusterAccelerationStructureCreateInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineClusterAccelerationStructureCreateInfoNV &
-      setAllowClusterAccelerationStructure( Bool32 allowClusterAccelerationStructure_ ) VULKAN_HPP_NOEXCEPT
-    {
-      allowClusterAccelerationStructure = allowClusterAccelerationStructure_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV *>( this );
-    }
-
-    operator VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV *>( this );
-    }
-
-    operator VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV *>( this );
-    }
-
-    operator VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, allowClusterAccelerationStructure );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RayTracingPipelineClusterAccelerationStructureCreateInfoNV const & ) const = default;
-#else
-    bool operator==( RayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( allowClusterAccelerationStructure == rhs.allowClusterAccelerationStructure );
-#  endif
-    }
-
-    bool operator!=( RayTracingPipelineClusterAccelerationStructureCreateInfoNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                             = StructureType::eRayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-    void *        pNext                             = {};
-    Bool32        allowClusterAccelerationStructure = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV>
-  {
-    using Type = RayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRayTracingPipelineClusterAccelerationStructureCreateInfoNV>
-  {
-    using Type = RayTracingPipelineClusterAccelerationStructureCreateInfoNV;
-  };
-
-  // wrapper struct for struct VkRayTracingShaderGroupCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingShaderGroupCreateInfoKHR.html
   struct RayTracingShaderGroupCreateInfoKHR
   {
     using NativeType = VkRayTracingShaderGroupCreateInfoKHR;
@@ -139239,21 +100222,22 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingShaderGroupCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RayTracingShaderGroupCreateInfoKHR( RayTracingShaderGroupTypeKHR type_               = RayTracingShaderGroupTypeKHR::eGeneral,
-                                                             uint32_t                     generalShader_      = ShaderUnusedKHR,
-                                                             uint32_t                     closestHitShader_   = ShaderUnusedKHR,
-                                                             uint32_t                     anyHitShader_       = ShaderUnusedKHR,
-                                                             uint32_t                     intersectionShader_ = ShaderUnusedKHR,
-                                                             const void *                 pShaderGroupCaptureReplayHandle_ = {},
-                                                             const void *                 pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , generalShader{ generalShader_ }
-      , closestHitShader{ closestHitShader_ }
-      , anyHitShader{ anyHitShader_ }
-      , intersectionShader{ intersectionShader_ }
-      , pShaderGroupCaptureReplayHandle{ pShaderGroupCaptureReplayHandle_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RayTracingShaderGroupCreateInfoKHR(
+      VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type_                            = VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR::eGeneral,
+      uint32_t                                           generalShader_                   = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR,
+      uint32_t                                           closestHitShader_                = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR,
+      uint32_t                                           anyHitShader_                    = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR,
+      uint32_t                                           intersectionShader_              = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR,
+      const void *                                       pShaderGroupCaptureReplayHandle_ = {},
+      const void *                                       pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , generalShader( generalShader_ )
+      , closestHitShader( closestHitShader_ )
+      , anyHitShader( anyHitShader_ )
+      , intersectionShader( intersectionShader_ )
+      , pShaderGroupCaptureReplayHandle( pShaderGroupCaptureReplayHandle_ )
     {
     }
 
@@ -139265,22 +100249,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RayTracingShaderGroupCreateInfoKHR & operator=( RayTracingShaderGroupCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RayTracingShaderGroupCreateInfoKHR & operator=( VkRayTracingShaderGroupCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RayTracingShaderGroupCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoKHR & setType( RayTracingShaderGroupTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoKHR & setType( VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
@@ -139316,7 +100300,7 @@ namespace VULKAN_HPP_NAMESPACE
       pShaderGroupCaptureReplayHandle = pShaderGroupCaptureReplayHandle_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRayTracingShaderGroupCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -139328,25 +100312,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRayTracingShaderGroupCreateInfoKHR *>( this );
     }
 
-    operator VkRayTracingShaderGroupCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingShaderGroupCreateInfoKHR *>( this );
-    }
-
-    operator VkRayTracingShaderGroupCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingShaderGroupCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RayTracingShaderGroupTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, generalShader, closestHitShader, anyHitShader, intersectionShader, pShaderGroupCaptureReplayHandle );
@@ -139374,32 +100352,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                           = StructureType::eRayTracingShaderGroupCreateInfoKHR;
-    const void *                 pNext                           = {};
-    RayTracingShaderGroupTypeKHR type                            = RayTracingShaderGroupTypeKHR::eGeneral;
-    uint32_t                     generalShader                   = ShaderUnusedKHR;
-    uint32_t                     closestHitShader                = ShaderUnusedKHR;
-    uint32_t                     anyHitShader                    = ShaderUnusedKHR;
-    uint32_t                     intersectionShader              = ShaderUnusedKHR;
-    const void *                 pShaderGroupCaptureReplayHandle = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                           = StructureType::eRayTracingShaderGroupCreateInfoKHR;
+    const void *                                       pNext                           = {};
+    VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type                            = VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR::eGeneral;
+    uint32_t                                           generalShader                   = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR;
+    uint32_t                                           closestHitShader                = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR;
+    uint32_t                                           anyHitShader                    = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR;
+    uint32_t                                           intersectionShader              = VULKAN_HPP_NAMESPACE::ShaderUnusedKHR;
+    const void *                                       pShaderGroupCaptureReplayHandle = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingShaderGroupCreateInfoKHR>
-  {
-    using Type = RayTracingShaderGroupCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRayTracingShaderGroupCreateInfoKHR>
   {
     using Type = RayTracingShaderGroupCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkRayTracingPipelineInterfaceCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingPipelineInterfaceCreateInfoKHR.html
   struct RayTracingPipelineInterfaceCreateInfoKHR
   {
     using NativeType = VkRayTracingPipelineInterfaceCreateInfoKHR;
@@ -139407,13 +100375,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingPipelineInterfaceCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR RayTracingPipelineInterfaceCreateInfoKHR( uint32_t     maxPipelineRayPayloadSize_      = {},
                                                                    uint32_t     maxPipelineRayHitAttributeSize_ = {},
                                                                    const void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxPipelineRayPayloadSize{ maxPipelineRayPayloadSize_ }
-      , maxPipelineRayHitAttributeSize{ maxPipelineRayHitAttributeSize_ }
+      : pNext( pNext_ )
+      , maxPipelineRayPayloadSize( maxPipelineRayPayloadSize_ )
+      , maxPipelineRayHitAttributeSize( maxPipelineRayHitAttributeSize_ )
     {
     }
 
@@ -139425,15 +100393,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RayTracingPipelineInterfaceCreateInfoKHR & operator=( RayTracingPipelineInterfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RayTracingPipelineInterfaceCreateInfoKHR & operator=( VkRayTracingPipelineInterfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RayTracingPipelineInterfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineInterfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -139452,7 +100420,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxPipelineRayHitAttributeSize = maxPipelineRayHitAttributeSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRayTracingPipelineInterfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -139464,18 +100432,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRayTracingPipelineInterfaceCreateInfoKHR *>( this );
     }
 
-    operator VkRayTracingPipelineInterfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingPipelineInterfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkRayTracingPipelineInterfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingPipelineInterfaceCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxPipelineRayPayloadSize, maxPipelineRayHitAttributeSize );
     }
@@ -139501,28 +100464,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                          = StructureType::eRayTracingPipelineInterfaceCreateInfoKHR;
-    const void *  pNext                          = {};
-    uint32_t      maxPipelineRayPayloadSize      = {};
-    uint32_t      maxPipelineRayHitAttributeSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                          = StructureType::eRayTracingPipelineInterfaceCreateInfoKHR;
+    const void *                        pNext                          = {};
+    uint32_t                            maxPipelineRayPayloadSize      = {};
+    uint32_t                            maxPipelineRayHitAttributeSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingPipelineInterfaceCreateInfoKHR>
-  {
-    using Type = RayTracingPipelineInterfaceCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRayTracingPipelineInterfaceCreateInfoKHR>
   {
     using Type = RayTracingPipelineInterfaceCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkRayTracingPipelineCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingPipelineCreateInfoKHR.html
   struct RayTracingPipelineCreateInfoKHR
   {
     using NativeType = VkRayTracingPipelineCreateInfoKHR;
@@ -139530,33 +100483,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingPipelineCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RayTracingPipelineCreateInfoKHR( PipelineCreateFlags                              flags_                        = {},
-                                                          uint32_t                                         stageCount_                   = {},
-                                                          const PipelineShaderStageCreateInfo *            pStages_                      = {},
-                                                          uint32_t                                         groupCount_                   = {},
-                                                          const RayTracingShaderGroupCreateInfoKHR *       pGroups_                      = {},
-                                                          uint32_t                                         maxPipelineRayRecursionDepth_ = {},
-                                                          const PipelineLibraryCreateInfoKHR *             pLibraryInfo_                 = {},
-                                                          const RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface_            = {},
-                                                          const PipelineDynamicStateCreateInfo *           pDynamicState_                = {},
-                                                          PipelineLayout                                   layout_                       = {},
-                                                          Pipeline                                         basePipelineHandle_           = {},
-                                                          int32_t                                          basePipelineIndex_            = {},
-                                                          const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stageCount{ stageCount_ }
-      , pStages{ pStages_ }
-      , groupCount{ groupCount_ }
-      , pGroups{ pGroups_ }
-      , maxPipelineRayRecursionDepth{ maxPipelineRayRecursionDepth_ }
-      , pLibraryInfo{ pLibraryInfo_ }
-      , pLibraryInterface{ pLibraryInterface_ }
-      , pDynamicState{ pDynamicState_ }
-      , layout{ layout_ }
-      , basePipelineHandle{ basePipelineHandle_ }
-      , basePipelineIndex{ basePipelineIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RayTracingPipelineCreateInfoKHR( VULKAN_HPP_NAMESPACE::PipelineCreateFlags                        flags_                        = {},
+                                                          uint32_t                                                         stageCount_                   = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *      pStages_                      = {},
+                                                          uint32_t                                                         groupCount_                   = {},
+                                                          const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR * pGroups_                      = {},
+                                                          uint32_t                                                         maxPipelineRayRecursionDepth_ = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *       pLibraryInfo_                 = {},
+                                                          const VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface_      = {},
+                                                          const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *           pDynamicState_          = {},
+                                                          VULKAN_HPP_NAMESPACE::PipelineLayout                                   layout_                 = {},
+                                                          VULKAN_HPP_NAMESPACE::Pipeline                                         basePipelineHandle_     = {},
+                                                          int32_t                                                                basePipelineIndex_      = {},
+                                                          const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stageCount( stageCount_ )
+      , pStages( pStages_ )
+      , groupCount( groupCount_ )
+      , pGroups( pGroups_ )
+      , maxPipelineRayRecursionDepth( maxPipelineRayRecursionDepth_ )
+      , pLibraryInfo( pLibraryInfo_ )
+      , pLibraryInterface( pLibraryInterface_ )
+      , pDynamicState( pDynamicState_ )
+      , layout( layout_ )
+      , basePipelineHandle( basePipelineHandle_ )
+      , basePipelineIndex( basePipelineIndex_ )
     {
     }
 
@@ -139568,17 +100521,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoKHR( PipelineCreateFlags                                                       flags_,
-                                     ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const &      stages_,
-                                     ArrayProxyNoTemporaries<const RayTracingShaderGroupCreateInfoKHR> const & groups_                       = {},
-                                     uint32_t                                                                  maxPipelineRayRecursionDepth_ = {},
-                                     const PipelineLibraryCreateInfoKHR *                                      pLibraryInfo_                 = {},
-                                     const RayTracingPipelineInterfaceCreateInfoKHR *                          pLibraryInterface_            = {},
-                                     const PipelineDynamicStateCreateInfo *                                    pDynamicState_                = {},
-                                     PipelineLayout                                                            layout_                       = {},
-                                     Pipeline                                                                  basePipelineHandle_           = {},
-                                     int32_t                                                                   basePipelineIndex_            = {},
-                                     const void *                                                              pNext_                        = nullptr )
+    RayTracingPipelineCreateInfoKHR(
+      VULKAN_HPP_NAMESPACE::PipelineCreateFlags                                                                             flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const &      stages_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR> const & groups_                       = {},
+      uint32_t                                                                                                              maxPipelineRayRecursionDepth_ = {},
+      const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *                                                            pLibraryInfo_                 = {},
+      const VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR *                                                pLibraryInterface_            = {},
+      const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *                                                          pDynamicState_                = {},
+      VULKAN_HPP_NAMESPACE::PipelineLayout                                                                                  layout_                       = {},
+      VULKAN_HPP_NAMESPACE::Pipeline                                                                                        basePipelineHandle_           = {},
+      int32_t                                                                                                               basePipelineIndex_            = {},
+      const void *                                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , stageCount( static_cast<uint32_t>( stages_.size() ) )
@@ -139597,22 +100551,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RayTracingPipelineCreateInfoKHR & operator=( RayTracingPipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RayTracingPipelineCreateInfoKHR & operator=( VkRayTracingPipelineCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RayTracingPipelineCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setFlags( PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -139624,14 +100578,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setPStages( const PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR &
+      setPStages( const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
     {
       pStages = pStages_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoKHR & setStages( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
+    RayTracingPipelineCreateInfoKHR &
+      setStages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
     {
       stageCount = static_cast<uint32_t>( stages_.size() );
       pStages    = stages_.data();
@@ -139645,14 +100601,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setPGroups( const RayTracingShaderGroupCreateInfoKHR * pGroups_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR &
+      setPGroups( const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR * pGroups_ ) VULKAN_HPP_NOEXCEPT
     {
       pGroups = pGroups_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoKHR & setGroups( ArrayProxyNoTemporaries<const RayTracingShaderGroupCreateInfoKHR> const & groups_ ) VULKAN_HPP_NOEXCEPT
+    RayTracingPipelineCreateInfoKHR & setGroups(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR> const & groups_ ) VULKAN_HPP_NOEXCEPT
     {
       groupCount = static_cast<uint32_t>( groups_.size() );
       pGroups    = groups_.data();
@@ -139666,32 +100624,34 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setPLibraryInfo( const PipelineLibraryCreateInfoKHR * pLibraryInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR &
+      setPLibraryInfo( const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR * pLibraryInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pLibraryInfo = pLibraryInfo_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR &
-      setPLibraryInterface( const RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface_ ) VULKAN_HPP_NOEXCEPT
+      setPLibraryInterface( const VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface_ ) VULKAN_HPP_NOEXCEPT
     {
       pLibraryInterface = pLibraryInterface_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setPDynamicState( const PipelineDynamicStateCreateInfo * pDynamicState_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR &
+      setPDynamicState( const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo * pDynamicState_ ) VULKAN_HPP_NOEXCEPT
     {
       pDynamicState = pDynamicState_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setBasePipelineHandle( Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoKHR & setBasePipelineHandle( VULKAN_HPP_NAMESPACE::Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
     {
       basePipelineHandle = basePipelineHandle_;
       return *this;
@@ -139702,7 +100662,7 @@ namespace VULKAN_HPP_NAMESPACE
       basePipelineIndex = basePipelineIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRayTracingPipelineCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -139714,31 +100674,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRayTracingPipelineCreateInfoKHR *>( this );
     }
 
-    operator VkRayTracingPipelineCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingPipelineCreateInfoKHR *>( this );
-    }
-
-    operator VkRayTracingPipelineCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingPipelineCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreateFlags const &,
                uint32_t const &,
-               const PipelineShaderStageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * const &,
                uint32_t const &,
-               const RayTracingShaderGroupCreateInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR * const &,
                uint32_t const &,
-               const PipelineLibraryCreateInfoKHR * const &,
-               const RayTracingPipelineInterfaceCreateInfoKHR * const &,
-               const PipelineDynamicStateCreateInfo * const &,
-               PipelineLayout const &,
-               Pipeline const &,
+               const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo * const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
                int32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -139780,38 +100734,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                    sType                        = StructureType::eRayTracingPipelineCreateInfoKHR;
-    const void *                                     pNext                        = {};
-    PipelineCreateFlags                              flags                        = {};
-    uint32_t                                         stageCount                   = {};
-    const PipelineShaderStageCreateInfo *            pStages                      = {};
-    uint32_t                                         groupCount                   = {};
-    const RayTracingShaderGroupCreateInfoKHR *       pGroups                      = {};
-    uint32_t                                         maxPipelineRayRecursionDepth = {};
-    const PipelineLibraryCreateInfoKHR *             pLibraryInfo                 = {};
-    const RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface            = {};
-    const PipelineDynamicStateCreateInfo *           pDynamicState                = {};
-    PipelineLayout                                   layout                       = {};
-    Pipeline                                         basePipelineHandle           = {};
-    int32_t                                          basePipelineIndex            = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                    sType                        = StructureType::eRayTracingPipelineCreateInfoKHR;
+    const void *                                                           pNext                        = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags                              flags                        = {};
+    uint32_t                                                               stageCount                   = {};
+    const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *            pStages                      = {};
+    uint32_t                                                               groupCount                   = {};
+    const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoKHR *       pGroups                      = {};
+    uint32_t                                                               maxPipelineRayRecursionDepth = {};
+    const VULKAN_HPP_NAMESPACE::PipelineLibraryCreateInfoKHR *             pLibraryInfo                 = {};
+    const VULKAN_HPP_NAMESPACE::RayTracingPipelineInterfaceCreateInfoKHR * pLibraryInterface            = {};
+    const VULKAN_HPP_NAMESPACE::PipelineDynamicStateCreateInfo *           pDynamicState                = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout                                   layout                       = {};
+    VULKAN_HPP_NAMESPACE::Pipeline                                         basePipelineHandle           = {};
+    int32_t                                                                basePipelineIndex            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingPipelineCreateInfoKHR>
-  {
-    using Type = RayTracingPipelineCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRayTracingPipelineCreateInfoKHR>
   {
     using Type = RayTracingPipelineCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkRayTracingShaderGroupCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingShaderGroupCreateInfoNV.html
   struct RayTracingShaderGroupCreateInfoNV
   {
     using NativeType = VkRayTracingShaderGroupCreateInfoNV;
@@ -139819,19 +100763,20 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingShaderGroupCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RayTracingShaderGroupCreateInfoNV( RayTracingShaderGroupTypeKHR type_               = RayTracingShaderGroupTypeKHR::eGeneral,
-                                                            uint32_t                     generalShader_      = ShaderUnusedNV,
-                                                            uint32_t                     closestHitShader_   = ShaderUnusedNV,
-                                                            uint32_t                     anyHitShader_       = ShaderUnusedNV,
-                                                            uint32_t                     intersectionShader_ = ShaderUnusedNV,
-                                                            const void *                 pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , type{ type_ }
-      , generalShader{ generalShader_ }
-      , closestHitShader{ closestHitShader_ }
-      , anyHitShader{ anyHitShader_ }
-      , intersectionShader{ intersectionShader_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RayTracingShaderGroupCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type_               = VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR::eGeneral,
+      uint32_t                                           generalShader_      = VULKAN_HPP_NAMESPACE::ShaderUnusedNV,
+      uint32_t                                           closestHitShader_   = VULKAN_HPP_NAMESPACE::ShaderUnusedNV,
+      uint32_t                                           anyHitShader_       = VULKAN_HPP_NAMESPACE::ShaderUnusedNV,
+      uint32_t                                           intersectionShader_ = VULKAN_HPP_NAMESPACE::ShaderUnusedNV,
+      const void *                                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , type( type_ )
+      , generalShader( generalShader_ )
+      , closestHitShader( closestHitShader_ )
+      , anyHitShader( anyHitShader_ )
+      , intersectionShader( intersectionShader_ )
     {
     }
 
@@ -139843,22 +100788,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RayTracingShaderGroupCreateInfoNV & operator=( RayTracingShaderGroupCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RayTracingShaderGroupCreateInfoNV & operator=( VkRayTracingShaderGroupCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RayTracingShaderGroupCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoNV & setType( RayTracingShaderGroupTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingShaderGroupCreateInfoNV & setType( VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type_ ) VULKAN_HPP_NOEXCEPT
     {
       type = type_;
       return *this;
@@ -139887,7 +100832,7 @@ namespace VULKAN_HPP_NAMESPACE
       intersectionShader = intersectionShader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRayTracingShaderGroupCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -139899,24 +100844,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRayTracingShaderGroupCreateInfoNV *>( this );
     }
 
-    operator VkRayTracingShaderGroupCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingShaderGroupCreateInfoNV *>( this );
-    }
-
-    operator VkRayTracingShaderGroupCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingShaderGroupCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RayTracingShaderGroupTypeKHR const &,
+               VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, type, generalShader, closestHitShader, anyHitShader, intersectionShader );
@@ -139943,31 +100882,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType              = StructureType::eRayTracingShaderGroupCreateInfoNV;
-    const void *                 pNext              = {};
-    RayTracingShaderGroupTypeKHR type               = RayTracingShaderGroupTypeKHR::eGeneral;
-    uint32_t                     generalShader      = ShaderUnusedNV;
-    uint32_t                     closestHitShader   = ShaderUnusedNV;
-    uint32_t                     anyHitShader       = ShaderUnusedNV;
-    uint32_t                     intersectionShader = ShaderUnusedNV;
+    VULKAN_HPP_NAMESPACE::StructureType                sType              = StructureType::eRayTracingShaderGroupCreateInfoNV;
+    const void *                                       pNext              = {};
+    VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR type               = VULKAN_HPP_NAMESPACE::RayTracingShaderGroupTypeKHR::eGeneral;
+    uint32_t                                           generalShader      = VULKAN_HPP_NAMESPACE::ShaderUnusedNV;
+    uint32_t                                           closestHitShader   = VULKAN_HPP_NAMESPACE::ShaderUnusedNV;
+    uint32_t                                           anyHitShader       = VULKAN_HPP_NAMESPACE::ShaderUnusedNV;
+    uint32_t                                           intersectionShader = VULKAN_HPP_NAMESPACE::ShaderUnusedNV;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingShaderGroupCreateInfoNV>
-  {
-    using Type = RayTracingShaderGroupCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRayTracingShaderGroupCreateInfoNV>
   {
     using Type = RayTracingShaderGroupCreateInfoNV;
   };
 
-  // wrapper struct for struct VkRayTracingPipelineCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRayTracingPipelineCreateInfoNV.html
   struct RayTracingPipelineCreateInfoNV
   {
     using NativeType = VkRayTracingPipelineCreateInfoNV;
@@ -139975,27 +100904,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRayTracingPipelineCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RayTracingPipelineCreateInfoNV( PipelineCreateFlags                       flags_              = {},
-                                                         uint32_t                                  stageCount_         = {},
-                                                         const PipelineShaderStageCreateInfo *     pStages_            = {},
-                                                         uint32_t                                  groupCount_         = {},
-                                                         const RayTracingShaderGroupCreateInfoNV * pGroups_            = {},
-                                                         uint32_t                                  maxRecursionDepth_  = {},
-                                                         PipelineLayout                            layout_             = {},
-                                                         Pipeline                                  basePipelineHandle_ = {},
-                                                         int32_t                                   basePipelineIndex_  = {},
-                                                         const void *                              pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stageCount{ stageCount_ }
-      , pStages{ pStages_ }
-      , groupCount{ groupCount_ }
-      , pGroups{ pGroups_ }
-      , maxRecursionDepth{ maxRecursionDepth_ }
-      , layout{ layout_ }
-      , basePipelineHandle{ basePipelineHandle_ }
-      , basePipelineIndex{ basePipelineIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RayTracingPipelineCreateInfoNV( VULKAN_HPP_NAMESPACE::PipelineCreateFlags                       flags_              = {},
+                                                         uint32_t                                                        stageCount_         = {},
+                                                         const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *     pStages_            = {},
+                                                         uint32_t                                                        groupCount_         = {},
+                                                         const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV * pGroups_            = {},
+                                                         uint32_t                                                        maxRecursionDepth_  = {},
+                                                         VULKAN_HPP_NAMESPACE::PipelineLayout                            layout_             = {},
+                                                         VULKAN_HPP_NAMESPACE::Pipeline                                  basePipelineHandle_ = {},
+                                                         int32_t                                                         basePipelineIndex_  = {},
+                                                         const void *                                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stageCount( stageCount_ )
+      , pStages( pStages_ )
+      , groupCount( groupCount_ )
+      , pGroups( pGroups_ )
+      , maxRecursionDepth( maxRecursionDepth_ )
+      , layout( layout_ )
+      , basePipelineHandle( basePipelineHandle_ )
+      , basePipelineIndex( basePipelineIndex_ )
     {
     }
 
@@ -140007,14 +100936,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoNV( PipelineCreateFlags                                                      flags_,
-                                    ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const &     stages_,
-                                    ArrayProxyNoTemporaries<const RayTracingShaderGroupCreateInfoNV> const & groups_             = {},
-                                    uint32_t                                                                 maxRecursionDepth_  = {},
-                                    PipelineLayout                                                           layout_             = {},
-                                    Pipeline                                                                 basePipelineHandle_ = {},
-                                    int32_t                                                                  basePipelineIndex_  = {},
-                                    const void *                                                             pNext_              = nullptr )
+    RayTracingPipelineCreateInfoNV(
+      VULKAN_HPP_NAMESPACE::PipelineCreateFlags                                                                            flags_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const &     stages_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV> const & groups_             = {},
+      uint32_t                                                                                                             maxRecursionDepth_  = {},
+      VULKAN_HPP_NAMESPACE::PipelineLayout                                                                                 layout_             = {},
+      VULKAN_HPP_NAMESPACE::Pipeline                                                                                       basePipelineHandle_ = {},
+      int32_t                                                                                                              basePipelineIndex_  = {},
+      const void *                                                                                                         pNext_              = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , stageCount( static_cast<uint32_t>( stages_.size() ) )
@@ -140030,22 +100960,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RayTracingPipelineCreateInfoNV & operator=( RayTracingPipelineCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RayTracingPipelineCreateInfoNV & operator=( VkRayTracingPipelineCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RayTracingPipelineCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RayTracingPipelineCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setFlags( PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setFlags( VULKAN_HPP_NAMESPACE::PipelineCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -140057,14 +100987,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setPStages( const PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV &
+      setPStages( const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * pStages_ ) VULKAN_HPP_NOEXCEPT
     {
       pStages = pStages_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoNV & setStages( ArrayProxyNoTemporaries<const PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
+    RayTracingPipelineCreateInfoNV &
+      setStages( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo> const & stages_ ) VULKAN_HPP_NOEXCEPT
     {
       stageCount = static_cast<uint32_t>( stages_.size() );
       pStages    = stages_.data();
@@ -140078,14 +101010,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setPGroups( const RayTracingShaderGroupCreateInfoNV * pGroups_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV &
+      setPGroups( const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV * pGroups_ ) VULKAN_HPP_NOEXCEPT
     {
       pGroups = pGroups_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RayTracingPipelineCreateInfoNV & setGroups( ArrayProxyNoTemporaries<const RayTracingShaderGroupCreateInfoNV> const & groups_ ) VULKAN_HPP_NOEXCEPT
+    RayTracingPipelineCreateInfoNV & setGroups(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV> const & groups_ ) VULKAN_HPP_NOEXCEPT
     {
       groupCount = static_cast<uint32_t>( groups_.size() );
       pGroups    = groups_.data();
@@ -140099,13 +101033,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setBasePipelineHandle( Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RayTracingPipelineCreateInfoNV & setBasePipelineHandle( VULKAN_HPP_NAMESPACE::Pipeline basePipelineHandle_ ) VULKAN_HPP_NOEXCEPT
     {
       basePipelineHandle = basePipelineHandle_;
       return *this;
@@ -140116,7 +101050,7 @@ namespace VULKAN_HPP_NAMESPACE
       basePipelineIndex = basePipelineIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRayTracingPipelineCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -140128,28 +101062,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRayTracingPipelineCreateInfoNV *>( this );
     }
 
-    operator VkRayTracingPipelineCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRayTracingPipelineCreateInfoNV *>( this );
-    }
-
-    operator VkRayTracingPipelineCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRayTracingPipelineCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               PipelineCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineCreateFlags const &,
                uint32_t const &,
-               const PipelineShaderStageCreateInfo * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo * const &,
                uint32_t const &,
-               const RayTracingShaderGroupCreateInfoNV * const &,
+               const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV * const &,
                uint32_t const &,
-               PipelineLayout const &,
-               Pipeline const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::Pipeline const &,
                int32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, stageCount, pStages, groupCount, pGroups, maxRecursionDepth, layout, basePipelineHandle, basePipelineIndex );
@@ -140177,40 +101105,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                             sType              = StructureType::eRayTracingPipelineCreateInfoNV;
-    const void *                              pNext              = {};
-    PipelineCreateFlags                       flags              = {};
-    uint32_t                                  stageCount         = {};
-    const PipelineShaderStageCreateInfo *     pStages            = {};
-    uint32_t                                  groupCount         = {};
-    const RayTracingShaderGroupCreateInfoNV * pGroups            = {};
-    uint32_t                                  maxRecursionDepth  = {};
-    PipelineLayout                            layout             = {};
-    Pipeline                                  basePipelineHandle = {};
-    int32_t                                   basePipelineIndex  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType              = StructureType::eRayTracingPipelineCreateInfoNV;
+    const void *                                                    pNext              = {};
+    VULKAN_HPP_NAMESPACE::PipelineCreateFlags                       flags              = {};
+    uint32_t                                                        stageCount         = {};
+    const VULKAN_HPP_NAMESPACE::PipelineShaderStageCreateInfo *     pStages            = {};
+    uint32_t                                                        groupCount         = {};
+    const VULKAN_HPP_NAMESPACE::RayTracingShaderGroupCreateInfoNV * pGroups            = {};
+    uint32_t                                                        maxRecursionDepth  = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout                            layout             = {};
+    VULKAN_HPP_NAMESPACE::Pipeline                                  basePipelineHandle = {};
+    int32_t                                                         basePipelineIndex  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRayTracingPipelineCreateInfoNV>
-  {
-    using Type = RayTracingPipelineCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRayTracingPipelineCreateInfoNV>
   {
     using Type = RayTracingPipelineCreateInfoNV;
   };
 
-  // wrapper struct for struct VkRefreshCycleDurationGOOGLE, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRefreshCycleDurationGOOGLE.html
   struct RefreshCycleDurationGOOGLE
   {
     using NativeType = VkRefreshCycleDurationGOOGLE;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RefreshCycleDurationGOOGLE( uint64_t refreshDuration_ = {} ) VULKAN_HPP_NOEXCEPT : refreshDuration{ refreshDuration_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RefreshCycleDurationGOOGLE( uint64_t refreshDuration_ = {} ) VULKAN_HPP_NOEXCEPT : refreshDuration( refreshDuration_ ) {}
 
     VULKAN_HPP_CONSTEXPR RefreshCycleDurationGOOGLE( RefreshCycleDurationGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
@@ -140220,11 +101139,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RefreshCycleDurationGOOGLE & operator=( RefreshCycleDurationGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RefreshCycleDurationGOOGLE & operator=( VkRefreshCycleDurationGOOGLE const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RefreshCycleDurationGOOGLE const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RefreshCycleDurationGOOGLE const *>( &rhs );
       return *this;
     }
 
@@ -140238,18 +101157,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( this );
     }
 
-    operator VkRefreshCycleDurationGOOGLE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRefreshCycleDurationGOOGLE *>( this );
-    }
-
-    operator VkRefreshCycleDurationGOOGLE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRefreshCycleDurationGOOGLE *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( refreshDuration );
     }
@@ -140277,226 +101191,105 @@ namespace VULKAN_HPP_NAMESPACE
     uint64_t refreshDuration = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRefreshCycleDurationGOOGLE>
+  struct ReleaseSwapchainImagesInfoEXT
   {
-    using Type = RefreshCycleDurationGOOGLE;
-  };
-#endif
-
-  // wrapper struct for struct VkReleaseCapturedPipelineDataInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkReleaseCapturedPipelineDataInfoKHR.html
-  struct ReleaseCapturedPipelineDataInfoKHR
-  {
-    using NativeType = VkReleaseCapturedPipelineDataInfoKHR;
+    using NativeType = VkReleaseSwapchainImagesInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eReleaseCapturedPipelineDataInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eReleaseSwapchainImagesInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ReleaseCapturedPipelineDataInfoKHR( Pipeline pipeline_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pipeline{ pipeline_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ReleaseSwapchainImagesInfoEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_       = {},
+                                                        uint32_t                           imageIndexCount_ = {},
+                                                        const uint32_t *                   pImageIndices_   = {},
+                                                        const void *                       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchain( swapchain_ )
+      , imageIndexCount( imageIndexCount_ )
+      , pImageIndices( pImageIndices_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR ReleaseCapturedPipelineDataInfoKHR( ReleaseCapturedPipelineDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR ReleaseSwapchainImagesInfoEXT( ReleaseSwapchainImagesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    ReleaseCapturedPipelineDataInfoKHR( VkReleaseCapturedPipelineDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ReleaseCapturedPipelineDataInfoKHR( *reinterpret_cast<ReleaseCapturedPipelineDataInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    ReleaseCapturedPipelineDataInfoKHR & operator=( ReleaseCapturedPipelineDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ReleaseCapturedPipelineDataInfoKHR & operator=( VkReleaseCapturedPipelineDataInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ReleaseCapturedPipelineDataInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ReleaseCapturedPipelineDataInfoKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ReleaseCapturedPipelineDataInfoKHR & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipeline = pipeline_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkReleaseCapturedPipelineDataInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkReleaseCapturedPipelineDataInfoKHR *>( this );
-    }
-
-    operator VkReleaseCapturedPipelineDataInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkReleaseCapturedPipelineDataInfoKHR *>( this );
-    }
-
-    operator VkReleaseCapturedPipelineDataInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkReleaseCapturedPipelineDataInfoKHR *>( this );
-    }
-
-    operator VkReleaseCapturedPipelineDataInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkReleaseCapturedPipelineDataInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pipeline );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ReleaseCapturedPipelineDataInfoKHR const & ) const = default;
-#else
-    bool operator==( ReleaseCapturedPipelineDataInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pipeline == rhs.pipeline );
-#  endif
-    }
-
-    bool operator!=( ReleaseCapturedPipelineDataInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType    = StructureType::eReleaseCapturedPipelineDataInfoKHR;
-    void *        pNext    = {};
-    Pipeline      pipeline = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkReleaseCapturedPipelineDataInfoKHR>
-  {
-    using Type = ReleaseCapturedPipelineDataInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eReleaseCapturedPipelineDataInfoKHR>
-  {
-    using Type = ReleaseCapturedPipelineDataInfoKHR;
-  };
-
-  // wrapper struct for struct VkReleaseSwapchainImagesInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkReleaseSwapchainImagesInfoKHR.html
-  struct ReleaseSwapchainImagesInfoKHR
-  {
-    using NativeType = VkReleaseSwapchainImagesInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eReleaseSwapchainImagesInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ReleaseSwapchainImagesInfoKHR( SwapchainKHR     swapchain_       = {},
-                                                        uint32_t         imageIndexCount_ = {},
-                                                        const uint32_t * pImageIndices_   = {},
-                                                        const void *     pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchain{ swapchain_ }
-      , imageIndexCount{ imageIndexCount_ }
-      , pImageIndices{ pImageIndices_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ReleaseSwapchainImagesInfoKHR( ReleaseSwapchainImagesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ReleaseSwapchainImagesInfoKHR( VkReleaseSwapchainImagesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ReleaseSwapchainImagesInfoKHR( *reinterpret_cast<ReleaseSwapchainImagesInfoKHR const *>( &rhs ) )
+    ReleaseSwapchainImagesInfoEXT( VkReleaseSwapchainImagesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : ReleaseSwapchainImagesInfoEXT( *reinterpret_cast<ReleaseSwapchainImagesInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ReleaseSwapchainImagesInfoKHR( SwapchainKHR swapchain_, ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_, const void * pNext_ = nullptr )
+    ReleaseSwapchainImagesInfoEXT( VULKAN_HPP_NAMESPACE::SwapchainKHR                                    swapchain_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_,
+                                   const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ ), swapchain( swapchain_ ), imageIndexCount( static_cast<uint32_t>( imageIndices_.size() ) ), pImageIndices( imageIndices_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    ReleaseSwapchainImagesInfoKHR & operator=( ReleaseSwapchainImagesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    ReleaseSwapchainImagesInfoEXT & operator=( ReleaseSwapchainImagesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    ReleaseSwapchainImagesInfoKHR & operator=( VkReleaseSwapchainImagesInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    ReleaseSwapchainImagesInfoEXT & operator=( VkReleaseSwapchainImagesInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ReleaseSwapchainImagesInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ReleaseSwapchainImagesInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoKHR & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoEXT & setSwapchain( VULKAN_HPP_NAMESPACE::SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoKHR & setImageIndexCount( uint32_t imageIndexCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoEXT & setImageIndexCount( uint32_t imageIndexCount_ ) VULKAN_HPP_NOEXCEPT
     {
       imageIndexCount = imageIndexCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoKHR & setPImageIndices( const uint32_t * pImageIndices_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ReleaseSwapchainImagesInfoEXT & setPImageIndices( const uint32_t * pImageIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       pImageIndices = pImageIndices_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ReleaseSwapchainImagesInfoKHR & setImageIndices( ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_ ) VULKAN_HPP_NOEXCEPT
+    ReleaseSwapchainImagesInfoEXT & setImageIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & imageIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       imageIndexCount = static_cast<uint32_t>( imageIndices_.size() );
       pImageIndices   = imageIndices_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkReleaseSwapchainImagesInfoKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkReleaseSwapchainImagesInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( this );
+      return *reinterpret_cast<const VkReleaseSwapchainImagesInfoEXT *>( this );
     }
 
-    operator VkReleaseSwapchainImagesInfoKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkReleaseSwapchainImagesInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkReleaseSwapchainImagesInfoKHR *>( this );
-    }
-
-    operator VkReleaseSwapchainImagesInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkReleaseSwapchainImagesInfoKHR *>( this );
-    }
-
-    operator VkReleaseSwapchainImagesInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkReleaseSwapchainImagesInfoKHR *>( this );
+      return *reinterpret_cast<VkReleaseSwapchainImagesInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainKHR const &, uint32_t const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::SwapchainKHR const &,
+               uint32_t const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchain, imageIndexCount, pImageIndices );
@@ -140504,9 +101297,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ReleaseSwapchainImagesInfoKHR const & ) const = default;
+    auto operator<=>( ReleaseSwapchainImagesInfoEXT const & ) const = default;
 #else
-    bool operator==( ReleaseSwapchainImagesInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( ReleaseSwapchainImagesInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -140516,38 +101309,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( ReleaseSwapchainImagesInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( ReleaseSwapchainImagesInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType           = StructureType::eReleaseSwapchainImagesInfoKHR;
-    const void *     pNext           = {};
-    SwapchainKHR     swapchain       = {};
-    uint32_t         imageIndexCount = {};
-    const uint32_t * pImageIndices   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eReleaseSwapchainImagesInfoEXT;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::SwapchainKHR  swapchain       = {};
+    uint32_t                            imageIndexCount = {};
+    const uint32_t *                    pImageIndices   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkReleaseSwapchainImagesInfoKHR>
-  {
-    using Type = ReleaseSwapchainImagesInfoKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eReleaseSwapchainImagesInfoKHR>
+  struct CppType<StructureType, StructureType::eReleaseSwapchainImagesInfoEXT>
   {
-    using Type = ReleaseSwapchainImagesInfoKHR;
+    using Type = ReleaseSwapchainImagesInfoEXT;
   };
 
-  using ReleaseSwapchainImagesInfoEXT = ReleaseSwapchainImagesInfoKHR;
-
-  // wrapper struct for struct VkRenderPassAttachmentBeginInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassAttachmentBeginInfo.html
   struct RenderPassAttachmentBeginInfo
   {
     using NativeType = VkRenderPassAttachmentBeginInfo;
@@ -140555,12 +101336,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassAttachmentBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      RenderPassAttachmentBeginInfo( uint32_t attachmentCount_ = {}, const ImageView * pAttachments_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentCount{ attachmentCount_ }
-      , pAttachments{ pAttachments_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassAttachmentBeginInfo( uint32_t                                attachmentCount_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::ImageView * pAttachments_    = {},
+                                                        const void *                            pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentCount( attachmentCount_ )
+      , pAttachments( pAttachments_ )
     {
     }
 
@@ -140572,22 +101354,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassAttachmentBeginInfo( ArrayProxyNoTemporaries<const ImageView> const & attachments_, const void * pNext_ = nullptr )
+    RenderPassAttachmentBeginInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageView> const & attachments_,
+                                   const void *                                                                                 pNext_ = nullptr )
       : pNext( pNext_ ), attachmentCount( static_cast<uint32_t>( attachments_.size() ) ), pAttachments( attachments_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassAttachmentBeginInfo & operator=( RenderPassAttachmentBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassAttachmentBeginInfo & operator=( VkRenderPassAttachmentBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassAttachmentBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassAttachmentBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassAttachmentBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -140600,21 +101383,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassAttachmentBeginInfo & setPAttachments( const ImageView * pAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassAttachmentBeginInfo & setPAttachments( const VULKAN_HPP_NAMESPACE::ImageView * pAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachments = pAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassAttachmentBeginInfo & setAttachments( ArrayProxyNoTemporaries<const ImageView> const & attachments_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassAttachmentBeginInfo &
+      setAttachments( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageView> const & attachments_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount = static_cast<uint32_t>( attachments_.size() );
       pAttachments    = attachments_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassAttachmentBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -140626,18 +101410,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassAttachmentBeginInfo *>( this );
     }
 
-    operator VkRenderPassAttachmentBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassAttachmentBeginInfo *>( this );
-    }
-
-    operator VkRenderPassAttachmentBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassAttachmentBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const ImageView * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::ImageView * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, attachmentCount, pAttachments );
     }
@@ -140662,20 +101441,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType     sType           = StructureType::eRenderPassAttachmentBeginInfo;
-    const void *      pNext           = {};
-    uint32_t          attachmentCount = {};
-    const ImageView * pAttachments    = {};
+    VULKAN_HPP_NAMESPACE::StructureType     sType           = StructureType::eRenderPassAttachmentBeginInfo;
+    const void *                            pNext           = {};
+    uint32_t                                attachmentCount = {};
+    const VULKAN_HPP_NAMESPACE::ImageView * pAttachments    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassAttachmentBeginInfo>
-  {
-    using Type = RenderPassAttachmentBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassAttachmentBeginInfo>
   {
@@ -140684,7 +101455,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderPassAttachmentBeginInfoKHR = RenderPassAttachmentBeginInfo;
 
-  // wrapper struct for struct VkRenderPassBeginInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassBeginInfo.html
   struct RenderPassBeginInfo
   {
     using NativeType = VkRenderPassBeginInfo;
@@ -140692,19 +101462,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo( RenderPass         renderPass_      = {},
-                                                 Framebuffer        framebuffer_     = {},
-                                                 Rect2D             renderArea_      = {},
-                                                 uint32_t           clearValueCount_ = {},
-                                                 const ClearValue * pClearValues_    = {},
-                                                 const void *       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , renderPass{ renderPass_ }
-      , framebuffer{ framebuffer_ }
-      , renderArea{ renderArea_ }
-      , clearValueCount{ clearValueCount_ }
-      , pClearValues{ pClearValues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo( VULKAN_HPP_NAMESPACE::RenderPass         renderPass_      = {},
+                                                 VULKAN_HPP_NAMESPACE::Framebuffer        framebuffer_     = {},
+                                                 VULKAN_HPP_NAMESPACE::Rect2D             renderArea_      = {},
+                                                 uint32_t                                 clearValueCount_ = {},
+                                                 const VULKAN_HPP_NAMESPACE::ClearValue * pClearValues_    = {},
+                                                 const void *                             pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , renderPass( renderPass_ )
+      , framebuffer( framebuffer_ )
+      , renderArea( renderArea_ )
+      , clearValueCount( clearValueCount_ )
+      , pClearValues( pClearValues_ )
     {
     }
 
@@ -140715,11 +101485,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassBeginInfo( RenderPass                                        renderPass_,
-                         Framebuffer                                       framebuffer_,
-                         Rect2D                                            renderArea_,
-                         ArrayProxyNoTemporaries<const ClearValue> const & clearValues_,
-                         const void *                                      pNext_ = nullptr )
+    RenderPassBeginInfo( VULKAN_HPP_NAMESPACE::RenderPass                                                              renderPass_,
+                         VULKAN_HPP_NAMESPACE::Framebuffer                                                             framebuffer_,
+                         VULKAN_HPP_NAMESPACE::Rect2D                                                                  renderArea_,
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ClearValue> const & clearValues_,
+                         const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , renderPass( renderPass_ )
       , framebuffer( framebuffer_ )
@@ -140731,34 +101501,34 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassBeginInfo & operator=( RenderPassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassBeginInfo & operator=( VkRenderPassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setRenderPass( RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPass = renderPass_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setFramebuffer( Framebuffer framebuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setFramebuffer( VULKAN_HPP_NAMESPACE::Framebuffer framebuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       framebuffer = framebuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setRenderArea( Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setRenderArea( VULKAN_HPP_NAMESPACE::Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
     {
       renderArea = renderArea_;
       return *this;
@@ -140770,21 +101540,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setPClearValues( const ClearValue * pClearValues_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassBeginInfo & setPClearValues( const VULKAN_HPP_NAMESPACE::ClearValue * pClearValues_ ) VULKAN_HPP_NOEXCEPT
     {
       pClearValues = pClearValues_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassBeginInfo & setClearValues( ArrayProxyNoTemporaries<const ClearValue> const & clearValues_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassBeginInfo &
+      setClearValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ClearValue> const & clearValues_ ) VULKAN_HPP_NOEXCEPT
     {
       clearValueCount = static_cast<uint32_t>( clearValues_.size() );
       pClearValues    = clearValues_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -140796,19 +101567,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassBeginInfo *>( this );
     }
 
-    operator VkRenderPassBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassBeginInfo *>( this );
-    }
-
-    operator VkRenderPassBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, RenderPass const &, Framebuffer const &, Rect2D const &, uint32_t const &, const ClearValue * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::RenderPass const &,
+               VULKAN_HPP_NAMESPACE::Framebuffer const &,
+               VULKAN_HPP_NAMESPACE::Rect2D const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::ClearValue * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, renderPass, framebuffer, renderArea, clearValueCount, pClearValues );
@@ -140835,55 +101605,46 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType           = StructureType::eRenderPassBeginInfo;
-    const void *       pNext           = {};
-    RenderPass         renderPass      = {};
-    Framebuffer        framebuffer     = {};
-    Rect2D             renderArea      = {};
-    uint32_t           clearValueCount = {};
-    const ClearValue * pClearValues    = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType           = StructureType::eRenderPassBeginInfo;
+    const void *                             pNext           = {};
+    VULKAN_HPP_NAMESPACE::RenderPass         renderPass      = {};
+    VULKAN_HPP_NAMESPACE::Framebuffer        framebuffer     = {};
+    VULKAN_HPP_NAMESPACE::Rect2D             renderArea      = {};
+    uint32_t                                 clearValueCount = {};
+    const VULKAN_HPP_NAMESPACE::ClearValue * pClearValues    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassBeginInfo>
-  {
-    using Type = RenderPassBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassBeginInfo>
   {
     using Type = RenderPassBeginInfo;
   };
 
-  // wrapper struct for struct VkSubpassDescription, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDescription.html
   struct SubpassDescription
   {
     using NativeType = VkSubpassDescription;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassDescription( SubpassDescriptionFlags     flags_                   = {},
-                                             PipelineBindPoint           pipelineBindPoint_       = PipelineBindPoint::eGraphics,
-                                             uint32_t                    inputAttachmentCount_    = {},
-                                             const AttachmentReference * pInputAttachments_       = {},
-                                             uint32_t                    colorAttachmentCount_    = {},
-                                             const AttachmentReference * pColorAttachments_       = {},
-                                             const AttachmentReference * pResolveAttachments_     = {},
-                                             const AttachmentReference * pDepthStencilAttachment_ = {},
-                                             uint32_t                    preserveAttachmentCount_ = {},
-                                             const uint32_t *            pPreserveAttachments_    = {} ) VULKAN_HPP_NOEXCEPT
-      : flags{ flags_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , inputAttachmentCount{ inputAttachmentCount_ }
-      , pInputAttachments{ pInputAttachments_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachments{ pColorAttachments_ }
-      , pResolveAttachments{ pResolveAttachments_ }
-      , pDepthStencilAttachment{ pDepthStencilAttachment_ }
-      , preserveAttachmentCount{ preserveAttachmentCount_ }
-      , pPreserveAttachments{ pPreserveAttachments_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassDescription( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags flags_          = {},
+                                             VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_    = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+                                             uint32_t                                inputAttachmentCount_ = {},
+                                             const VULKAN_HPP_NAMESPACE::AttachmentReference * pInputAttachments_       = {},
+                                             uint32_t                                          colorAttachmentCount_    = {},
+                                             const VULKAN_HPP_NAMESPACE::AttachmentReference * pColorAttachments_       = {},
+                                             const VULKAN_HPP_NAMESPACE::AttachmentReference * pResolveAttachments_     = {},
+                                             const VULKAN_HPP_NAMESPACE::AttachmentReference * pDepthStencilAttachment_ = {},
+                                             uint32_t                                          preserveAttachmentCount_ = {},
+                                             const uint32_t *                                  pPreserveAttachments_    = {} ) VULKAN_HPP_NOEXCEPT
+      : flags( flags_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , inputAttachmentCount( inputAttachmentCount_ )
+      , pInputAttachments( pInputAttachments_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachments( pColorAttachments_ )
+      , pResolveAttachments( pResolveAttachments_ )
+      , pDepthStencilAttachment( pDepthStencilAttachment_ )
+      , preserveAttachmentCount( preserveAttachmentCount_ )
+      , pPreserveAttachments( pPreserveAttachments_ )
     {
     }
 
@@ -140892,13 +101653,13 @@ namespace VULKAN_HPP_NAMESPACE
     SubpassDescription( VkSubpassDescription const & rhs ) VULKAN_HPP_NOEXCEPT : SubpassDescription( *reinterpret_cast<SubpassDescription const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription( SubpassDescriptionFlags                                    flags_,
-                        PipelineBindPoint                                          pipelineBindPoint_,
-                        ArrayProxyNoTemporaries<const AttachmentReference> const & inputAttachments_,
-                        ArrayProxyNoTemporaries<const AttachmentReference> const & colorAttachments_        = {},
-                        ArrayProxyNoTemporaries<const AttachmentReference> const & resolveAttachments_      = {},
-                        const AttachmentReference *                                pDepthStencilAttachment_ = {},
-                        ArrayProxyNoTemporaries<const uint32_t> const &            preserveAttachments_     = {} )
+    SubpassDescription( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags                                                          flags_,
+                        VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                                pipelineBindPoint_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & inputAttachments_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & colorAttachments_        = {},
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & resolveAttachments_      = {},
+                        const VULKAN_HPP_NAMESPACE::AttachmentReference *                                                      pDepthStencilAttachment_ = {},
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                                  preserveAttachments_     = {} )
       : flags( flags_ )
       , pipelineBindPoint( pipelineBindPoint_ )
       , inputAttachmentCount( static_cast<uint32_t>( inputAttachments_.size() ) )
@@ -140924,22 +101685,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SubpassDescription & operator=( SubpassDescription const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassDescription & operator=( VkSubpassDescription const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassDescription const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassDescription const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setFlags( SubpassDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setFlags( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
@@ -140951,14 +101712,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPInputAttachments( const AttachmentReference * pInputAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription &
+      setPInputAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference * pInputAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pInputAttachments = pInputAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription & setInputAttachments( ArrayProxyNoTemporaries<const AttachmentReference> const & inputAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription & setInputAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & inputAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       inputAttachmentCount = static_cast<uint32_t>( inputAttachments_.size() );
       pInputAttachments    = inputAttachments_.data();
@@ -140972,14 +101735,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPColorAttachments( const AttachmentReference * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription &
+      setPColorAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachments = pColorAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription & setColorAttachments( ArrayProxyNoTemporaries<const AttachmentReference> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription & setColorAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = static_cast<uint32_t>( colorAttachments_.size() );
       pColorAttachments    = colorAttachments_.data();
@@ -140987,14 +101752,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPResolveAttachments( const AttachmentReference * pResolveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription &
+      setPResolveAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference * pResolveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pResolveAttachments = pResolveAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription & setResolveAttachments( ArrayProxyNoTemporaries<const AttachmentReference> const & resolveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription & setResolveAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference> const & resolveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = static_cast<uint32_t>( resolveAttachments_.size() );
       pResolveAttachments  = resolveAttachments_.data();
@@ -141002,7 +101769,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription & setPDepthStencilAttachment( const AttachmentReference * pDepthStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription &
+      setPDepthStencilAttachment( const VULKAN_HPP_NAMESPACE::AttachmentReference * pDepthStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthStencilAttachment = pDepthStencilAttachment_;
       return *this;
@@ -141021,14 +101789,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription & setPreserveAttachments( ArrayProxyNoTemporaries<const uint32_t> const & preserveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription &
+      setPreserveAttachments( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & preserveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       preserveAttachmentCount = static_cast<uint32_t>( preserveAttachments_.size() );
       pPreserveAttachments    = preserveAttachments_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassDescription const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -141040,27 +101809,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassDescription *>( this );
     }
 
-    operator VkSubpassDescription const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassDescription *>( this );
-    }
-
-    operator VkSubpassDescription *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassDescription *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<SubpassDescriptionFlags const &,
-               PipelineBindPoint const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
                uint32_t const &,
-               const AttachmentReference * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference * const &,
                uint32_t const &,
-               const AttachmentReference * const &,
-               const AttachmentReference * const &,
-               const AttachmentReference * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( flags,
@@ -141099,46 +101862,37 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    SubpassDescriptionFlags     flags                   = {};
-    PipelineBindPoint           pipelineBindPoint       = PipelineBindPoint::eGraphics;
-    uint32_t                    inputAttachmentCount    = {};
-    const AttachmentReference * pInputAttachments       = {};
-    uint32_t                    colorAttachmentCount    = {};
-    const AttachmentReference * pColorAttachments       = {};
-    const AttachmentReference * pResolveAttachments     = {};
-    const AttachmentReference * pDepthStencilAttachment = {};
-    uint32_t                    preserveAttachmentCount = {};
-    const uint32_t *            pPreserveAttachments    = {};
+    VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags     flags                   = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint           pipelineBindPoint       = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    uint32_t                                          inputAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference * pInputAttachments       = {};
+    uint32_t                                          colorAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference * pColorAttachments       = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference * pResolveAttachments     = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference * pDepthStencilAttachment = {};
+    uint32_t                                          preserveAttachmentCount = {};
+    const uint32_t *                                  pPreserveAttachments    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassDescription>
-  {
-    using Type = SubpassDescription;
-  };
-#endif
-
-  // wrapper struct for struct VkSubpassDependency, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDependency.html
   struct SubpassDependency
   {
     using NativeType = VkSubpassDependency;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassDependency( uint32_t           srcSubpass_      = {},
-                                            uint32_t           dstSubpass_      = {},
-                                            PipelineStageFlags srcStageMask_    = {},
-                                            PipelineStageFlags dstStageMask_    = {},
-                                            AccessFlags        srcAccessMask_   = {},
-                                            AccessFlags        dstAccessMask_   = {},
-                                            DependencyFlags    dependencyFlags_ = {} ) VULKAN_HPP_NOEXCEPT
-      : srcSubpass{ srcSubpass_ }
-      , dstSubpass{ dstSubpass_ }
-      , srcStageMask{ srcStageMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , dependencyFlags{ dependencyFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassDependency( uint32_t                                 srcSubpass_      = {},
+                                            uint32_t                                 dstSubpass_      = {},
+                                            VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask_    = {},
+                                            VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask_    = {},
+                                            VULKAN_HPP_NAMESPACE::AccessFlags        srcAccessMask_   = {},
+                                            VULKAN_HPP_NAMESPACE::AccessFlags        dstAccessMask_   = {},
+                                            VULKAN_HPP_NAMESPACE::DependencyFlags    dependencyFlags_ = {} ) VULKAN_HPP_NOEXCEPT
+      : srcSubpass( srcSubpass_ )
+      , dstSubpass( dstSubpass_ )
+      , srcStageMask( srcStageMask_ )
+      , dstStageMask( dstStageMask_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , dependencyFlags( dependencyFlags_ )
     {
     }
 
@@ -141147,15 +101901,15 @@ namespace VULKAN_HPP_NAMESPACE
     SubpassDependency( VkSubpassDependency const & rhs ) VULKAN_HPP_NOEXCEPT : SubpassDependency( *reinterpret_cast<SubpassDependency const *>( &rhs ) ) {}
 
     SubpassDependency & operator=( SubpassDependency const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassDependency & operator=( VkSubpassDependency const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassDependency const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassDependency const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setSrcSubpass( uint32_t srcSubpass_ ) VULKAN_HPP_NOEXCEPT
     {
       srcSubpass = srcSubpass_;
@@ -141168,36 +101922,36 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setSrcStageMask( PipelineStageFlags srcStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setSrcStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcStageMask = srcStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDstStageMask( PipelineStageFlags dstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDstStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstStageMask = dstStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setSrcAccessMask( AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDstAccessMask( AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDependencyFlags( DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency & setDependencyFlags( VULKAN_HPP_NAMESPACE::DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyFlags = dependencyFlags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassDependency const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -141209,24 +101963,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassDependency *>( this );
     }
 
-    operator VkSubpassDependency const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassDependency *>( this );
-    }
-
-    operator VkSubpassDependency *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassDependency *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<uint32_t const &,
                uint32_t const &,
-               PipelineStageFlags const &,
-               PipelineStageFlags const &,
-               AccessFlags const &,
-               AccessFlags const &,
-               DependencyFlags const &>
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::DependencyFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( srcSubpass, dstSubpass, srcStageMask, dstStageMask, srcAccessMask, dstAccessMask, dependencyFlags );
@@ -141254,24 +102002,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t           srcSubpass      = {};
-    uint32_t           dstSubpass      = {};
-    PipelineStageFlags srcStageMask    = {};
-    PipelineStageFlags dstStageMask    = {};
-    AccessFlags        srcAccessMask   = {};
-    AccessFlags        dstAccessMask   = {};
-    DependencyFlags    dependencyFlags = {};
+    uint32_t                                 srcSubpass      = {};
+    uint32_t                                 dstSubpass      = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask    = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask    = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags        srcAccessMask   = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags        dstAccessMask   = {};
+    VULKAN_HPP_NAMESPACE::DependencyFlags    dependencyFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassDependency>
-  {
-    using Type = SubpassDependency;
-  };
-#endif
-
-  // wrapper struct for struct VkRenderPassCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreateInfo.html
   struct RenderPassCreateInfo
   {
     using NativeType = VkRenderPassCreateInfo;
@@ -141279,23 +102018,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassCreateInfo( RenderPassCreateFlags         flags_           = {},
-                                               uint32_t                      attachmentCount_ = {},
-                                               const AttachmentDescription * pAttachments_    = {},
-                                               uint32_t                      subpassCount_    = {},
-                                               const SubpassDescription *    pSubpasses_      = {},
-                                               uint32_t                      dependencyCount_ = {},
-                                               const SubpassDependency *     pDependencies_   = {},
-                                               const void *                  pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , attachmentCount{ attachmentCount_ }
-      , pAttachments{ pAttachments_ }
-      , subpassCount{ subpassCount_ }
-      , pSubpasses{ pSubpasses_ }
-      , dependencyCount{ dependencyCount_ }
-      , pDependencies{ pDependencies_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassCreateInfo( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags         flags_           = {},
+                                               uint32_t                                            attachmentCount_ = {},
+                                               const VULKAN_HPP_NAMESPACE::AttachmentDescription * pAttachments_    = {},
+                                               uint32_t                                            subpassCount_    = {},
+                                               const VULKAN_HPP_NAMESPACE::SubpassDescription *    pSubpasses_      = {},
+                                               uint32_t                                            dependencyCount_ = {},
+                                               const VULKAN_HPP_NAMESPACE::SubpassDependency *     pDependencies_   = {},
+                                               const void *                                        pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , attachmentCount( attachmentCount_ )
+      , pAttachments( pAttachments_ )
+      , subpassCount( subpassCount_ )
+      , pSubpasses( pSubpasses_ )
+      , dependencyCount( dependencyCount_ )
+      , pDependencies( pDependencies_ )
     {
     }
 
@@ -141307,11 +102046,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo( RenderPassCreateFlags                                        flags_,
-                          ArrayProxyNoTemporaries<const AttachmentDescription> const & attachments_,
-                          ArrayProxyNoTemporaries<const SubpassDescription> const &    subpasses_    = {},
-                          ArrayProxyNoTemporaries<const SubpassDependency> const &     dependencies_ = {},
-                          const void *                                                 pNext_        = nullptr )
+    RenderPassCreateInfo( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags                                                              flags_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentDescription> const & attachments_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDescription> const &    subpasses_    = {},
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDependency> const &     dependencies_ = {},
+                          const void *                                                                                             pNext_        = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , attachmentCount( static_cast<uint32_t>( attachments_.size() ) )
@@ -141325,22 +102064,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassCreateInfo & operator=( RenderPassCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassCreateInfo & operator=( VkRenderPassCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setFlags( RenderPassCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -141352,14 +102091,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPAttachments( const AttachmentDescription * pAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPAttachments( const VULKAN_HPP_NAMESPACE::AttachmentDescription * pAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachments = pAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo & setAttachments( ArrayProxyNoTemporaries<const AttachmentDescription> const & attachments_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo & setAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentDescription> const & attachments_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount = static_cast<uint32_t>( attachments_.size() );
       pAttachments    = attachments_.data();
@@ -141373,14 +102113,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPSubpasses( const SubpassDescription * pSubpasses_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPSubpasses( const VULKAN_HPP_NAMESPACE::SubpassDescription * pSubpasses_ ) VULKAN_HPP_NOEXCEPT
     {
       pSubpasses = pSubpasses_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo & setSubpasses( ArrayProxyNoTemporaries<const SubpassDescription> const & subpasses_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo &
+      setSubpasses( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDescription> const & subpasses_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassCount = static_cast<uint32_t>( subpasses_.size() );
       pSubpasses   = subpasses_.data();
@@ -141394,21 +102135,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPDependencies( const SubpassDependency * pDependencies_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo & setPDependencies( const VULKAN_HPP_NAMESPACE::SubpassDependency * pDependencies_ ) VULKAN_HPP_NOEXCEPT
     {
       pDependencies = pDependencies_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo & setDependencies( ArrayProxyNoTemporaries<const SubpassDependency> const & dependencies_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo &
+      setDependencies( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDependency> const & dependencies_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyCount = static_cast<uint32_t>( dependencies_.size() );
       pDependencies   = dependencies_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -141420,26 +102162,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassCreateInfo *>( this );
     }
 
-    operator VkRenderPassCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassCreateInfo *>( this );
-    }
-
-    operator VkRenderPassCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RenderPassCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::RenderPassCreateFlags const &,
                uint32_t const &,
-               const AttachmentDescription * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentDescription * const &,
                uint32_t const &,
-               const SubpassDescription * const &,
+               const VULKAN_HPP_NAMESPACE::SubpassDescription * const &,
                uint32_t const &,
-               const SubpassDependency * const &>
+               const VULKAN_HPP_NAMESPACE::SubpassDependency * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, attachmentCount, pAttachments, subpassCount, pSubpasses, dependencyCount, pDependencies );
@@ -141467,32 +102203,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType           = StructureType::eRenderPassCreateInfo;
-    const void *                  pNext           = {};
-    RenderPassCreateFlags         flags           = {};
-    uint32_t                      attachmentCount = {};
-    const AttachmentDescription * pAttachments    = {};
-    uint32_t                      subpassCount    = {};
-    const SubpassDescription *    pSubpasses      = {};
-    uint32_t                      dependencyCount = {};
-    const SubpassDependency *     pDependencies   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType           = StructureType::eRenderPassCreateInfo;
+    const void *                                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::RenderPassCreateFlags         flags           = {};
+    uint32_t                                            attachmentCount = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentDescription * pAttachments    = {};
+    uint32_t                                            subpassCount    = {};
+    const VULKAN_HPP_NAMESPACE::SubpassDescription *    pSubpasses      = {};
+    uint32_t                                            dependencyCount = {};
+    const VULKAN_HPP_NAMESPACE::SubpassDependency *     pDependencies   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassCreateInfo>
-  {
-    using Type = RenderPassCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassCreateInfo>
   {
     using Type = RenderPassCreateInfo;
   };
 
-  // wrapper struct for struct VkSubpassDescription2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDescription2.html
   struct SubpassDescription2
   {
     using NativeType = VkSubpassDescription2;
@@ -141500,31 +102227,31 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassDescription2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassDescription2( SubpassDescriptionFlags      flags_                   = {},
-                                              PipelineBindPoint            pipelineBindPoint_       = PipelineBindPoint::eGraphics,
-                                              uint32_t                     viewMask_                = {},
-                                              uint32_t                     inputAttachmentCount_    = {},
-                                              const AttachmentReference2 * pInputAttachments_       = {},
-                                              uint32_t                     colorAttachmentCount_    = {},
-                                              const AttachmentReference2 * pColorAttachments_       = {},
-                                              const AttachmentReference2 * pResolveAttachments_     = {},
-                                              const AttachmentReference2 * pDepthStencilAttachment_ = {},
-                                              uint32_t                     preserveAttachmentCount_ = {},
-                                              const uint32_t *             pPreserveAttachments_    = {},
-                                              const void *                 pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , pipelineBindPoint{ pipelineBindPoint_ }
-      , viewMask{ viewMask_ }
-      , inputAttachmentCount{ inputAttachmentCount_ }
-      , pInputAttachments{ pInputAttachments_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachments{ pColorAttachments_ }
-      , pResolveAttachments{ pResolveAttachments_ }
-      , pDepthStencilAttachment{ pDepthStencilAttachment_ }
-      , preserveAttachmentCount{ preserveAttachmentCount_ }
-      , pPreserveAttachments{ pPreserveAttachments_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassDescription2( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags flags_       = {},
+                                              VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics,
+                                              uint32_t                                viewMask_          = {},
+                                              uint32_t                                inputAttachmentCount_               = {},
+                                              const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pInputAttachments_       = {},
+                                              uint32_t                                           colorAttachmentCount_    = {},
+                                              const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pColorAttachments_       = {},
+                                              const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pResolveAttachments_     = {},
+                                              const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilAttachment_ = {},
+                                              uint32_t                                           preserveAttachmentCount_ = {},
+                                              const uint32_t *                                   pPreserveAttachments_    = {},
+                                              const void *                                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , pipelineBindPoint( pipelineBindPoint_ )
+      , viewMask( viewMask_ )
+      , inputAttachmentCount( inputAttachmentCount_ )
+      , pInputAttachments( pInputAttachments_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachments( pColorAttachments_ )
+      , pResolveAttachments( pResolveAttachments_ )
+      , pDepthStencilAttachment( pDepthStencilAttachment_ )
+      , preserveAttachmentCount( preserveAttachmentCount_ )
+      , pPreserveAttachments( pPreserveAttachments_ )
     {
     }
 
@@ -141535,15 +102262,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription2( SubpassDescriptionFlags                                     flags_,
-                         PipelineBindPoint                                           pipelineBindPoint_,
-                         uint32_t                                                    viewMask_,
-                         ArrayProxyNoTemporaries<const AttachmentReference2> const & inputAttachments_,
-                         ArrayProxyNoTemporaries<const AttachmentReference2> const & colorAttachments_        = {},
-                         ArrayProxyNoTemporaries<const AttachmentReference2> const & resolveAttachments_      = {},
-                         const AttachmentReference2 *                                pDepthStencilAttachment_ = {},
-                         ArrayProxyNoTemporaries<const uint32_t> const &             preserveAttachments_     = {},
-                         const void *                                                pNext_                   = nullptr )
+    SubpassDescription2( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags                                                           flags_,
+                         VULKAN_HPP_NAMESPACE::PipelineBindPoint                                                                 pipelineBindPoint_,
+                         uint32_t                                                                                                viewMask_,
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & inputAttachments_,
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & colorAttachments_        = {},
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & resolveAttachments_      = {},
+                         const VULKAN_HPP_NAMESPACE::AttachmentReference2 *                                                      pDepthStencilAttachment_ = {},
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                                   preserveAttachments_     = {},
+                         const void *                                                                                            pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , pipelineBindPoint( pipelineBindPoint_ )
@@ -141571,28 +102298,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SubpassDescription2 & operator=( SubpassDescription2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassDescription2 & operator=( VkSubpassDescription2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassDescription2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassDescription2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setFlags( SubpassDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setFlags( VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPipelineBindPoint( PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPipelineBindPoint( VULKAN_HPP_NAMESPACE::PipelineBindPoint pipelineBindPoint_ ) VULKAN_HPP_NOEXCEPT
     {
       pipelineBindPoint = pipelineBindPoint_;
       return *this;
@@ -141610,14 +102337,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPInputAttachments( const AttachmentReference2 * pInputAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 &
+      setPInputAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pInputAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pInputAttachments = pInputAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription2 & setInputAttachments( ArrayProxyNoTemporaries<const AttachmentReference2> const & inputAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription2 & setInputAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & inputAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       inputAttachmentCount = static_cast<uint32_t>( inputAttachments_.size() );
       pInputAttachments    = inputAttachments_.data();
@@ -141631,14 +102360,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPColorAttachments( const AttachmentReference2 * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 &
+      setPColorAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachments = pColorAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription2 & setColorAttachments( ArrayProxyNoTemporaries<const AttachmentReference2> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription2 & setColorAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = static_cast<uint32_t>( colorAttachments_.size() );
       pColorAttachments    = colorAttachments_.data();
@@ -141646,14 +102377,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPResolveAttachments( const AttachmentReference2 * pResolveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 &
+      setPResolveAttachments( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pResolveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pResolveAttachments = pResolveAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription2 & setResolveAttachments( ArrayProxyNoTemporaries<const AttachmentReference2> const & resolveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription2 & setResolveAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentReference2> const & resolveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = static_cast<uint32_t>( resolveAttachments_.size() );
       pResolveAttachments  = resolveAttachments_.data();
@@ -141661,7 +102394,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 & setPDepthStencilAttachment( const AttachmentReference2 * pDepthStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescription2 &
+      setPDepthStencilAttachment( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthStencilAttachment = pDepthStencilAttachment_;
       return *this;
@@ -141680,14 +102414,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubpassDescription2 & setPreserveAttachments( ArrayProxyNoTemporaries<const uint32_t> const & preserveAttachments_ ) VULKAN_HPP_NOEXCEPT
+    SubpassDescription2 &
+      setPreserveAttachments( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & preserveAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       preserveAttachmentCount = static_cast<uint32_t>( preserveAttachments_.size() );
       pPreserveAttachments    = preserveAttachments_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassDescription2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -141699,30 +102434,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassDescription2 *>( this );
     }
 
-    operator VkSubpassDescription2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassDescription2 *>( this );
-    }
-
-    operator VkSubpassDescription2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassDescription2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               SubpassDescriptionFlags const &,
-               PipelineBindPoint const &,
+               VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineBindPoint const &,
                uint32_t const &,
                uint32_t const &,
-               const AttachmentReference2 * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &,
                uint32_t const &,
-               const AttachmentReference2 * const &,
-               const AttachmentReference2 * const &,
-               const AttachmentReference2 * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -141764,29 +102493,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                   = StructureType::eSubpassDescription2;
-    const void *                 pNext                   = {};
-    SubpassDescriptionFlags      flags                   = {};
-    PipelineBindPoint            pipelineBindPoint       = PipelineBindPoint::eGraphics;
-    uint32_t                     viewMask                = {};
-    uint32_t                     inputAttachmentCount    = {};
-    const AttachmentReference2 * pInputAttachments       = {};
-    uint32_t                     colorAttachmentCount    = {};
-    const AttachmentReference2 * pColorAttachments       = {};
-    const AttachmentReference2 * pResolveAttachments     = {};
-    const AttachmentReference2 * pDepthStencilAttachment = {};
-    uint32_t                     preserveAttachmentCount = {};
-    const uint32_t *             pPreserveAttachments    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                   = StructureType::eSubpassDescription2;
+    const void *                                       pNext                   = {};
+    VULKAN_HPP_NAMESPACE::SubpassDescriptionFlags      flags                   = {};
+    VULKAN_HPP_NAMESPACE::PipelineBindPoint            pipelineBindPoint       = VULKAN_HPP_NAMESPACE::PipelineBindPoint::eGraphics;
+    uint32_t                                           viewMask                = {};
+    uint32_t                                           inputAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pInputAttachments       = {};
+    uint32_t                                           colorAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pColorAttachments       = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pResolveAttachments     = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilAttachment = {};
+    uint32_t                                           preserveAttachmentCount = {};
+    const uint32_t *                                   pPreserveAttachments    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassDescription2>
-  {
-    using Type = SubpassDescription2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassDescription2>
   {
@@ -141795,7 +102516,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubpassDescription2KHR = SubpassDescription2;
 
-  // wrapper struct for struct VkSubpassDependency2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDependency2.html
   struct SubpassDependency2
   {
     using NativeType = VkSubpassDependency2;
@@ -141803,25 +102523,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassDependency2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassDependency2( uint32_t           srcSubpass_      = {},
-                                             uint32_t           dstSubpass_      = {},
-                                             PipelineStageFlags srcStageMask_    = {},
-                                             PipelineStageFlags dstStageMask_    = {},
-                                             AccessFlags        srcAccessMask_   = {},
-                                             AccessFlags        dstAccessMask_   = {},
-                                             DependencyFlags    dependencyFlags_ = {},
-                                             int32_t            viewOffset_      = {},
-                                             const void *       pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcSubpass{ srcSubpass_ }
-      , dstSubpass{ dstSubpass_ }
-      , srcStageMask{ srcStageMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , dependencyFlags{ dependencyFlags_ }
-      , viewOffset{ viewOffset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassDependency2( uint32_t                                 srcSubpass_      = {},
+                                             uint32_t                                 dstSubpass_      = {},
+                                             VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask_    = {},
+                                             VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask_    = {},
+                                             VULKAN_HPP_NAMESPACE::AccessFlags        srcAccessMask_   = {},
+                                             VULKAN_HPP_NAMESPACE::AccessFlags        dstAccessMask_   = {},
+                                             VULKAN_HPP_NAMESPACE::DependencyFlags    dependencyFlags_ = {},
+                                             int32_t                                  viewOffset_      = {},
+                                             const void *                             pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcSubpass( srcSubpass_ )
+      , dstSubpass( dstSubpass_ )
+      , srcStageMask( srcStageMask_ )
+      , dstStageMask( dstStageMask_ )
+      , srcAccessMask( srcAccessMask_ )
+      , dstAccessMask( dstAccessMask_ )
+      , dependencyFlags( dependencyFlags_ )
+      , viewOffset( viewOffset_ )
     {
     }
 
@@ -141830,15 +102550,15 @@ namespace VULKAN_HPP_NAMESPACE
     SubpassDependency2( VkSubpassDependency2 const & rhs ) VULKAN_HPP_NOEXCEPT : SubpassDependency2( *reinterpret_cast<SubpassDependency2 const *>( &rhs ) ) {}
 
     SubpassDependency2 & operator=( SubpassDependency2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassDependency2 & operator=( VkSubpassDependency2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassDependency2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassDependency2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -141857,31 +102577,31 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setSrcStageMask( PipelineStageFlags srcStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setSrcStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcStageMask = srcStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDstStageMask( PipelineStageFlags dstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDstStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstStageMask = dstStageMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setSrcAccessMask( AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setSrcAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       srcAccessMask = srcAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDstAccessMask( AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDstAccessMask( VULKAN_HPP_NAMESPACE::AccessFlags dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
     {
       dstAccessMask = dstAccessMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDependencyFlags( DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDependency2 & setDependencyFlags( VULKAN_HPP_NAMESPACE::DependencyFlags dependencyFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyFlags = dependencyFlags_;
       return *this;
@@ -141892,7 +102612,7 @@ namespace VULKAN_HPP_NAMESPACE
       viewOffset = viewOffset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassDependency2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -141904,27 +102624,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassDependency2 *>( this );
     }
 
-    operator VkSubpassDependency2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassDependency2 *>( this );
-    }
-
-    operator VkSubpassDependency2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassDependency2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                uint32_t const &,
-               PipelineStageFlags const &,
-               PipelineStageFlags const &,
-               AccessFlags const &,
-               AccessFlags const &,
-               DependencyFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::AccessFlags const &,
+               VULKAN_HPP_NAMESPACE::DependencyFlags const &,
                int32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcSubpass, dstSubpass, srcStageMask, dstStageMask, srcAccessMask, dstAccessMask, dependencyFlags, viewOffset );
@@ -141952,26 +102666,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType           = StructureType::eSubpassDependency2;
-    const void *       pNext           = {};
-    uint32_t           srcSubpass      = {};
-    uint32_t           dstSubpass      = {};
-    PipelineStageFlags srcStageMask    = {};
-    PipelineStageFlags dstStageMask    = {};
-    AccessFlags        srcAccessMask   = {};
-    AccessFlags        dstAccessMask   = {};
-    DependencyFlags    dependencyFlags = {};
-    int32_t            viewOffset      = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType           = StructureType::eSubpassDependency2;
+    const void *                             pNext           = {};
+    uint32_t                                 srcSubpass      = {};
+    uint32_t                                 dstSubpass      = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags srcStageMask    = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags dstStageMask    = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags        srcAccessMask   = {};
+    VULKAN_HPP_NAMESPACE::AccessFlags        dstAccessMask   = {};
+    VULKAN_HPP_NAMESPACE::DependencyFlags    dependencyFlags = {};
+    int32_t                                  viewOffset      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassDependency2>
-  {
-    using Type = SubpassDependency2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassDependency2>
   {
@@ -141980,7 +102686,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubpassDependency2KHR = SubpassDependency2;
 
-  // wrapper struct for struct VkRenderPassCreateInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreateInfo2.html
   struct RenderPassCreateInfo2
   {
     using NativeType = VkRenderPassCreateInfo2;
@@ -141988,27 +102693,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassCreateInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassCreateInfo2( RenderPassCreateFlags          flags_                   = {},
-                                                uint32_t                       attachmentCount_         = {},
-                                                const AttachmentDescription2 * pAttachments_            = {},
-                                                uint32_t                       subpassCount_            = {},
-                                                const SubpassDescription2 *    pSubpasses_              = {},
-                                                uint32_t                       dependencyCount_         = {},
-                                                const SubpassDependency2 *     pDependencies_           = {},
-                                                uint32_t                       correlatedViewMaskCount_ = {},
-                                                const uint32_t *               pCorrelatedViewMasks_    = {},
-                                                const void *                   pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , attachmentCount{ attachmentCount_ }
-      , pAttachments{ pAttachments_ }
-      , subpassCount{ subpassCount_ }
-      , pSubpasses{ pSubpasses_ }
-      , dependencyCount{ dependencyCount_ }
-      , pDependencies{ pDependencies_ }
-      , correlatedViewMaskCount{ correlatedViewMaskCount_ }
-      , pCorrelatedViewMasks{ pCorrelatedViewMasks_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassCreateInfo2( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags          flags_                   = {},
+                                                uint32_t                                             attachmentCount_         = {},
+                                                const VULKAN_HPP_NAMESPACE::AttachmentDescription2 * pAttachments_            = {},
+                                                uint32_t                                             subpassCount_            = {},
+                                                const VULKAN_HPP_NAMESPACE::SubpassDescription2 *    pSubpasses_              = {},
+                                                uint32_t                                             dependencyCount_         = {},
+                                                const VULKAN_HPP_NAMESPACE::SubpassDependency2 *     pDependencies_           = {},
+                                                uint32_t                                             correlatedViewMaskCount_ = {},
+                                                const uint32_t *                                     pCorrelatedViewMasks_    = {},
+                                                const void *                                         pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , attachmentCount( attachmentCount_ )
+      , pAttachments( pAttachments_ )
+      , subpassCount( subpassCount_ )
+      , pSubpasses( pSubpasses_ )
+      , dependencyCount( dependencyCount_ )
+      , pDependencies( pDependencies_ )
+      , correlatedViewMaskCount( correlatedViewMaskCount_ )
+      , pCorrelatedViewMasks( pCorrelatedViewMasks_ )
     {
     }
 
@@ -142020,12 +102725,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo2( RenderPassCreateFlags                                         flags_,
-                           ArrayProxyNoTemporaries<const AttachmentDescription2> const & attachments_,
-                           ArrayProxyNoTemporaries<const SubpassDescription2> const &    subpasses_           = {},
-                           ArrayProxyNoTemporaries<const SubpassDependency2> const &     dependencies_        = {},
-                           ArrayProxyNoTemporaries<const uint32_t> const &               correlatedViewMasks_ = {},
-                           const void *                                                  pNext_               = nullptr )
+    RenderPassCreateInfo2( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags                                                               flags_,
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentDescription2> const & attachments_,
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDescription2> const &    subpasses_           = {},
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDependency2> const &     dependencies_        = {},
+                           VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                                     correlatedViewMasks_ = {},
+                           const void *                                                                                              pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , attachmentCount( static_cast<uint32_t>( attachments_.size() ) )
@@ -142041,22 +102746,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassCreateInfo2 & operator=( RenderPassCreateInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassCreateInfo2 & operator=( VkRenderPassCreateInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassCreateInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassCreateInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setFlags( RenderPassCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setFlags( VULKAN_HPP_NAMESPACE::RenderPassCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -142068,14 +102773,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPAttachments( const AttachmentDescription2 * pAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPAttachments( const VULKAN_HPP_NAMESPACE::AttachmentDescription2 * pAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachments = pAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo2 & setAttachments( ArrayProxyNoTemporaries<const AttachmentDescription2> const & attachments_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo2 & setAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentDescription2> const & attachments_ ) VULKAN_HPP_NOEXCEPT
     {
       attachmentCount = static_cast<uint32_t>( attachments_.size() );
       pAttachments    = attachments_.data();
@@ -142089,14 +102795,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPSubpasses( const SubpassDescription2 * pSubpasses_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPSubpasses( const VULKAN_HPP_NAMESPACE::SubpassDescription2 * pSubpasses_ ) VULKAN_HPP_NOEXCEPT
     {
       pSubpasses = pSubpasses_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo2 & setSubpasses( ArrayProxyNoTemporaries<const SubpassDescription2> const & subpasses_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo2 &
+      setSubpasses( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDescription2> const & subpasses_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassCount = static_cast<uint32_t>( subpasses_.size() );
       pSubpasses   = subpasses_.data();
@@ -142110,14 +102817,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPDependencies( const SubpassDependency2 * pDependencies_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreateInfo2 & setPDependencies( const VULKAN_HPP_NAMESPACE::SubpassDependency2 * pDependencies_ ) VULKAN_HPP_NOEXCEPT
     {
       pDependencies = pDependencies_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo2 & setDependencies( ArrayProxyNoTemporaries<const SubpassDependency2> const & dependencies_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo2 &
+      setDependencies( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassDependency2> const & dependencies_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyCount = static_cast<uint32_t>( dependencies_.size() );
       pDependencies   = dependencies_.data();
@@ -142138,14 +102846,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassCreateInfo2 & setCorrelatedViewMasks( ArrayProxyNoTemporaries<const uint32_t> const & correlatedViewMasks_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassCreateInfo2 &
+      setCorrelatedViewMasks( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & correlatedViewMasks_ ) VULKAN_HPP_NOEXCEPT
     {
       correlatedViewMaskCount = static_cast<uint32_t>( correlatedViewMasks_.size() );
       pCorrelatedViewMasks    = correlatedViewMasks_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassCreateInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -142157,28 +102866,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassCreateInfo2 *>( this );
     }
 
-    operator VkRenderPassCreateInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassCreateInfo2 *>( this );
-    }
-
-    operator VkRenderPassCreateInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassCreateInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RenderPassCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::RenderPassCreateFlags const &,
                uint32_t const &,
-               const AttachmentDescription2 * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentDescription2 * const &,
                uint32_t const &,
-               const SubpassDescription2 * const &,
+               const VULKAN_HPP_NAMESPACE::SubpassDescription2 * const &,
                uint32_t const &,
-               const SubpassDependency2 * const &,
+               const VULKAN_HPP_NAMESPACE::SubpassDependency2 * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -142217,27 +102920,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                  sType                   = StructureType::eRenderPassCreateInfo2;
-    const void *                   pNext                   = {};
-    RenderPassCreateFlags          flags                   = {};
-    uint32_t                       attachmentCount         = {};
-    const AttachmentDescription2 * pAttachments            = {};
-    uint32_t                       subpassCount            = {};
-    const SubpassDescription2 *    pSubpasses              = {};
-    uint32_t                       dependencyCount         = {};
-    const SubpassDependency2 *     pDependencies           = {};
-    uint32_t                       correlatedViewMaskCount = {};
-    const uint32_t *               pCorrelatedViewMasks    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                  sType                   = StructureType::eRenderPassCreateInfo2;
+    const void *                                         pNext                   = {};
+    VULKAN_HPP_NAMESPACE::RenderPassCreateFlags          flags                   = {};
+    uint32_t                                             attachmentCount         = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentDescription2 * pAttachments            = {};
+    uint32_t                                             subpassCount            = {};
+    const VULKAN_HPP_NAMESPACE::SubpassDescription2 *    pSubpasses              = {};
+    uint32_t                                             dependencyCount         = {};
+    const VULKAN_HPP_NAMESPACE::SubpassDependency2 *     pDependencies           = {};
+    uint32_t                                             correlatedViewMaskCount = {};
+    const uint32_t *                                     pCorrelatedViewMasks    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassCreateInfo2>
-  {
-    using Type = RenderPassCreateInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassCreateInfo2>
   {
@@ -142246,7 +102941,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderPassCreateInfo2KHR = RenderPassCreateInfo2;
 
-  // wrapper struct for struct VkRenderPassCreationControlEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreationControlEXT.html
   struct RenderPassCreationControlEXT
   {
     using NativeType = VkRenderPassCreationControlEXT;
@@ -142254,10 +102948,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassCreationControlEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassCreationControlEXT( Bool32 disallowMerging_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , disallowMerging{ disallowMerging_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassCreationControlEXT( VULKAN_HPP_NAMESPACE::Bool32 disallowMerging_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , disallowMerging( disallowMerging_ )
     {
     }
 
@@ -142269,27 +102963,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassCreationControlEXT & operator=( RenderPassCreationControlEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassCreationControlEXT & operator=( VkRenderPassCreationControlEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassCreationControlEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassCreationControlEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassCreationControlEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassCreationControlEXT & setDisallowMerging( Bool32 disallowMerging_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassCreationControlEXT & setDisallowMerging( VULKAN_HPP_NAMESPACE::Bool32 disallowMerging_ ) VULKAN_HPP_NOEXCEPT
     {
       disallowMerging = disallowMerging_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassCreationControlEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -142301,18 +102995,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassCreationControlEXT *>( this );
     }
 
-    operator VkRenderPassCreationControlEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassCreationControlEXT *>( this );
-    }
-
-    operator VkRenderPassCreationControlEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassCreationControlEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, disallowMerging );
     }
@@ -142337,34 +103026,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType           = StructureType::eRenderPassCreationControlEXT;
-    const void *  pNext           = {};
-    Bool32        disallowMerging = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType           = StructureType::eRenderPassCreationControlEXT;
+    const void *                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        disallowMerging = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassCreationControlEXT>
-  {
-    using Type = RenderPassCreationControlEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassCreationControlEXT>
   {
     using Type = RenderPassCreationControlEXT;
   };
 
-  // wrapper struct for struct VkRenderPassCreationFeedbackInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreationFeedbackInfoEXT.html
   struct RenderPassCreationFeedbackInfoEXT
   {
     using NativeType = VkRenderPassCreationFeedbackInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR RenderPassCreationFeedbackInfoEXT( uint32_t postMergeSubpassCount_ = {} ) VULKAN_HPP_NOEXCEPT
-      : postMergeSubpassCount{ postMergeSubpassCount_ }
+      : postMergeSubpassCount( postMergeSubpassCount_ )
     {
     }
 
@@ -142376,11 +103055,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassCreationFeedbackInfoEXT & operator=( RenderPassCreationFeedbackInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassCreationFeedbackInfoEXT & operator=( VkRenderPassCreationFeedbackInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassCreationFeedbackInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT const *>( &rhs );
       return *this;
     }
 
@@ -142394,18 +103073,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassCreationFeedbackInfoEXT *>( this );
     }
 
-    operator VkRenderPassCreationFeedbackInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassCreationFeedbackInfoEXT *>( this );
-    }
-
-    operator VkRenderPassCreationFeedbackInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassCreationFeedbackInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( postMergeSubpassCount );
     }
@@ -142433,16 +103107,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t postMergeSubpassCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassCreationFeedbackInfoEXT>
-  {
-    using Type = RenderPassCreationFeedbackInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkRenderPassCreationFeedbackCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassCreationFeedbackCreateInfoEXT.html
   struct RenderPassCreationFeedbackCreateInfoEXT
   {
     using NativeType = VkRenderPassCreationFeedbackCreateInfoEXT;
@@ -142450,11 +103114,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassCreationFeedbackCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassCreationFeedbackCreateInfoEXT( RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback_ = {},
-                                                                  const void *                        pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pRenderPassFeedback{ pRenderPassFeedback_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassCreationFeedbackCreateInfoEXT( VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback_ = {},
+                                                                  const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pRenderPassFeedback( pRenderPassFeedback_ )
     {
     }
 
@@ -142466,15 +103130,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassCreationFeedbackCreateInfoEXT & operator=( RenderPassCreationFeedbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassCreationFeedbackCreateInfoEXT & operator=( VkRenderPassCreationFeedbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassCreationFeedbackCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassCreationFeedbackCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -142482,12 +103146,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassCreationFeedbackCreateInfoEXT &
-      setPRenderPassFeedback( RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback_ ) VULKAN_HPP_NOEXCEPT
+      setPRenderPassFeedback( VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback_ ) VULKAN_HPP_NOEXCEPT
     {
       pRenderPassFeedback = pRenderPassFeedback_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassCreationFeedbackCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -142499,18 +103163,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassCreationFeedbackCreateInfoEXT *>( this );
     }
 
-    operator VkRenderPassCreationFeedbackCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassCreationFeedbackCreateInfoEXT *>( this );
-    }
-
-    operator VkRenderPassCreationFeedbackCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassCreationFeedbackCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, RenderPassCreationFeedbackInfoEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pRenderPassFeedback );
     }
@@ -142535,27 +103194,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType               = StructureType::eRenderPassCreationFeedbackCreateInfoEXT;
-    const void *                        pNext               = {};
-    RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType               = StructureType::eRenderPassCreationFeedbackCreateInfoEXT;
+    const void *                                              pNext               = {};
+    VULKAN_HPP_NAMESPACE::RenderPassCreationFeedbackInfoEXT * pRenderPassFeedback = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassCreationFeedbackCreateInfoEXT>
-  {
-    using Type = RenderPassCreationFeedbackCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassCreationFeedbackCreateInfoEXT>
   {
     using Type = RenderPassCreationFeedbackCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkRenderPassFragmentDensityMapCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassFragmentDensityMapCreateInfoEXT.html
   struct RenderPassFragmentDensityMapCreateInfoEXT
   {
     using NativeType = VkRenderPassFragmentDensityMapCreateInfoEXT;
@@ -142563,11 +103212,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassFragmentDensityMapCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassFragmentDensityMapCreateInfoEXT( AttachmentReference fragmentDensityMapAttachment_ = {},
-                                                                    const void *        pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityMapAttachment{ fragmentDensityMapAttachment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassFragmentDensityMapCreateInfoEXT( VULKAN_HPP_NAMESPACE::AttachmentReference fragmentDensityMapAttachment_ = {},
+                                                                    const void *                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityMapAttachment( fragmentDensityMapAttachment_ )
     {
     }
 
@@ -142579,15 +103228,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassFragmentDensityMapCreateInfoEXT & operator=( RenderPassFragmentDensityMapCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassFragmentDensityMapCreateInfoEXT & operator=( VkRenderPassFragmentDensityMapCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassFragmentDensityMapCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassFragmentDensityMapCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassFragmentDensityMapCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -142595,12 +103244,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassFragmentDensityMapCreateInfoEXT &
-      setFragmentDensityMapAttachment( AttachmentReference const & fragmentDensityMapAttachment_ ) VULKAN_HPP_NOEXCEPT
+      setFragmentDensityMapAttachment( VULKAN_HPP_NAMESPACE::AttachmentReference const & fragmentDensityMapAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       fragmentDensityMapAttachment = fragmentDensityMapAttachment_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassFragmentDensityMapCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -142612,18 +103261,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassFragmentDensityMapCreateInfoEXT *>( this );
     }
 
-    operator VkRenderPassFragmentDensityMapCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassFragmentDensityMapCreateInfoEXT *>( this );
-    }
-
-    operator VkRenderPassFragmentDensityMapCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassFragmentDensityMapCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, AttachmentReference const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::AttachmentReference const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fragmentDensityMapAttachment );
     }
@@ -142648,172 +103292,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType                        = StructureType::eRenderPassFragmentDensityMapCreateInfoEXT;
-    const void *        pNext                        = {};
-    AttachmentReference fragmentDensityMapAttachment = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType                        = StructureType::eRenderPassFragmentDensityMapCreateInfoEXT;
+    const void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::AttachmentReference fragmentDensityMapAttachment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassFragmentDensityMapCreateInfoEXT>
-  {
-    using Type = RenderPassFragmentDensityMapCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassFragmentDensityMapCreateInfoEXT>
   {
     using Type = RenderPassFragmentDensityMapCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkRenderPassFragmentDensityMapOffsetEndInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassFragmentDensityMapOffsetEndInfoEXT.html
-  struct RenderPassFragmentDensityMapOffsetEndInfoEXT
-  {
-    using NativeType = VkRenderPassFragmentDensityMapOffsetEndInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassFragmentDensityMapOffsetEndInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassFragmentDensityMapOffsetEndInfoEXT( uint32_t         fragmentDensityOffsetCount_ = {},
-                                                                       const Offset2D * pFragmentDensityOffsets_    = {},
-                                                                       const void *     pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fragmentDensityOffsetCount{ fragmentDensityOffsetCount_ }
-      , pFragmentDensityOffsets{ pFragmentDensityOffsets_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR RenderPassFragmentDensityMapOffsetEndInfoEXT( RenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    RenderPassFragmentDensityMapOffsetEndInfoEXT( VkRenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderPassFragmentDensityMapOffsetEndInfoEXT( *reinterpret_cast<RenderPassFragmentDensityMapOffsetEndInfoEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassFragmentDensityMapOffsetEndInfoEXT( ArrayProxyNoTemporaries<const Offset2D> const & fragmentDensityOffsets_, const void * pNext_ = nullptr )
-      : pNext( pNext_ )
-      , fragmentDensityOffsetCount( static_cast<uint32_t>( fragmentDensityOffsets_.size() ) )
-      , pFragmentDensityOffsets( fragmentDensityOffsets_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    RenderPassFragmentDensityMapOffsetEndInfoEXT & operator=( RenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RenderPassFragmentDensityMapOffsetEndInfoEXT & operator=( VkRenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RenderPassFragmentDensityMapOffsetEndInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassFragmentDensityMapOffsetEndInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassFragmentDensityMapOffsetEndInfoEXT &
-      setFragmentDensityOffsetCount( uint32_t fragmentDensityOffsetCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      fragmentDensityOffsetCount = fragmentDensityOffsetCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassFragmentDensityMapOffsetEndInfoEXT &
-      setPFragmentDensityOffsets( const Offset2D * pFragmentDensityOffsets_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pFragmentDensityOffsets = pFragmentDensityOffsets_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassFragmentDensityMapOffsetEndInfoEXT &
-      setFragmentDensityOffsets( ArrayProxyNoTemporaries<const Offset2D> const & fragmentDensityOffsets_ ) VULKAN_HPP_NOEXCEPT
-    {
-      fragmentDensityOffsetCount = static_cast<uint32_t>( fragmentDensityOffsets_.size() );
-      pFragmentDensityOffsets    = fragmentDensityOffsets_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRenderPassFragmentDensityMapOffsetEndInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRenderPassFragmentDensityMapOffsetEndInfoEXT *>( this );
-    }
-
-    operator VkRenderPassFragmentDensityMapOffsetEndInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRenderPassFragmentDensityMapOffsetEndInfoEXT *>( this );
-    }
-
-    operator VkRenderPassFragmentDensityMapOffsetEndInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassFragmentDensityMapOffsetEndInfoEXT *>( this );
-    }
-
-    operator VkRenderPassFragmentDensityMapOffsetEndInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassFragmentDensityMapOffsetEndInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Offset2D * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, fragmentDensityOffsetCount, pFragmentDensityOffsets );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderPassFragmentDensityMapOffsetEndInfoEXT const & ) const = default;
-#else
-    bool operator==( RenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( fragmentDensityOffsetCount == rhs.fragmentDensityOffsetCount ) &&
-             ( pFragmentDensityOffsets == rhs.pFragmentDensityOffsets );
-#  endif
-    }
-
-    bool operator!=( RenderPassFragmentDensityMapOffsetEndInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType    sType                      = StructureType::eRenderPassFragmentDensityMapOffsetEndInfoEXT;
-    const void *     pNext                      = {};
-    uint32_t         fragmentDensityOffsetCount = {};
-    const Offset2D * pFragmentDensityOffsets    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassFragmentDensityMapOffsetEndInfoEXT>
-  {
-    using Type = RenderPassFragmentDensityMapOffsetEndInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRenderPassFragmentDensityMapOffsetEndInfoEXT>
-  {
-    using Type = RenderPassFragmentDensityMapOffsetEndInfoEXT;
-  };
-
-  using SubpassFragmentDensityMapOffsetEndInfoQCOM = RenderPassFragmentDensityMapOffsetEndInfoEXT;
-
-  // wrapper struct for struct VkRenderPassInputAttachmentAspectCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassInputAttachmentAspectCreateInfo.html
   struct RenderPassInputAttachmentAspectCreateInfo
   {
     using NativeType = VkRenderPassInputAttachmentAspectCreateInfo;
@@ -142821,13 +103310,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassInputAttachmentAspectCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassInputAttachmentAspectCreateInfo( uint32_t                               aspectReferenceCount_ = {},
-                                                                    const InputAttachmentAspectReference * pAspectReferences_    = {},
-                                                                    const void *                           pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , aspectReferenceCount{ aspectReferenceCount_ }
-      , pAspectReferences{ pAspectReferences_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassInputAttachmentAspectCreateInfo( uint32_t                                                     aspectReferenceCount_ = {},
+                                                                    const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference * pAspectReferences_    = {},
+                                                                    const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , aspectReferenceCount( aspectReferenceCount_ )
+      , pAspectReferences( pAspectReferences_ )
     {
     }
 
@@ -142839,23 +103328,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassInputAttachmentAspectCreateInfo( ArrayProxyNoTemporaries<const InputAttachmentAspectReference> const & aspectReferences_,
-                                               const void *                                                          pNext_ = nullptr )
+    RenderPassInputAttachmentAspectCreateInfo(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference> const & aspectReferences_,
+      const void *                                                                                                      pNext_ = nullptr )
       : pNext( pNext_ ), aspectReferenceCount( static_cast<uint32_t>( aspectReferences_.size() ) ), pAspectReferences( aspectReferences_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassInputAttachmentAspectCreateInfo & operator=( RenderPassInputAttachmentAspectCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassInputAttachmentAspectCreateInfo & operator=( VkRenderPassInputAttachmentAspectCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassInputAttachmentAspectCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassInputAttachmentAspectCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassInputAttachmentAspectCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -142869,22 +103359,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassInputAttachmentAspectCreateInfo &
-      setPAspectReferences( const InputAttachmentAspectReference * pAspectReferences_ ) VULKAN_HPP_NOEXCEPT
+      setPAspectReferences( const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference * pAspectReferences_ ) VULKAN_HPP_NOEXCEPT
     {
       pAspectReferences = pAspectReferences_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassInputAttachmentAspectCreateInfo &
-      setAspectReferences( ArrayProxyNoTemporaries<const InputAttachmentAspectReference> const & aspectReferences_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassInputAttachmentAspectCreateInfo & setAspectReferences(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference> const & aspectReferences_ ) VULKAN_HPP_NOEXCEPT
     {
       aspectReferenceCount = static_cast<uint32_t>( aspectReferences_.size() );
       pAspectReferences    = aspectReferences_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassInputAttachmentAspectCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -142896,18 +103386,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassInputAttachmentAspectCreateInfo *>( this );
     }
 
-    operator VkRenderPassInputAttachmentAspectCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassInputAttachmentAspectCreateInfo *>( this );
-    }
-
-    operator VkRenderPassInputAttachmentAspectCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassInputAttachmentAspectCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const InputAttachmentAspectReference * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, aspectReferenceCount, pAspectReferences );
@@ -142934,20 +103421,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                          sType                = StructureType::eRenderPassInputAttachmentAspectCreateInfo;
-    const void *                           pNext                = {};
-    uint32_t                               aspectReferenceCount = {};
-    const InputAttachmentAspectReference * pAspectReferences    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                          sType                = StructureType::eRenderPassInputAttachmentAspectCreateInfo;
+    const void *                                                 pNext                = {};
+    uint32_t                                                     aspectReferenceCount = {};
+    const VULKAN_HPP_NAMESPACE::InputAttachmentAspectReference * pAspectReferences    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassInputAttachmentAspectCreateInfo>
-  {
-    using Type = RenderPassInputAttachmentAspectCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassInputAttachmentAspectCreateInfo>
   {
@@ -142956,8 +103435,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderPassInputAttachmentAspectCreateInfoKHR = RenderPassInputAttachmentAspectCreateInfo;
 
-  // wrapper struct for struct VkRenderPassMultiviewCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassMultiviewCreateInfo.html
   struct RenderPassMultiviewCreateInfo
   {
     using NativeType = VkRenderPassMultiviewCreateInfo;
@@ -142965,7 +103442,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassMultiviewCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR RenderPassMultiviewCreateInfo( uint32_t         subpassCount_         = {},
                                                         const uint32_t * pViewMasks_           = {},
                                                         uint32_t         dependencyCount_      = {},
@@ -142973,13 +103450,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                         uint32_t         correlationMaskCount_ = {},
                                                         const uint32_t * pCorrelationMasks_    = {},
                                                         const void *     pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subpassCount{ subpassCount_ }
-      , pViewMasks{ pViewMasks_ }
-      , dependencyCount{ dependencyCount_ }
-      , pViewOffsets{ pViewOffsets_ }
-      , correlationMaskCount{ correlationMaskCount_ }
-      , pCorrelationMasks{ pCorrelationMasks_ }
+      : pNext( pNext_ )
+      , subpassCount( subpassCount_ )
+      , pViewMasks( pViewMasks_ )
+      , dependencyCount( dependencyCount_ )
+      , pViewOffsets( pViewOffsets_ )
+      , correlationMaskCount( correlationMaskCount_ )
+      , pCorrelationMasks( pCorrelationMasks_ )
     {
     }
 
@@ -142991,10 +103468,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassMultiviewCreateInfo( ArrayProxyNoTemporaries<const uint32_t> const & viewMasks_,
-                                   ArrayProxyNoTemporaries<const int32_t> const &  viewOffsets_      = {},
-                                   ArrayProxyNoTemporaries<const uint32_t> const & correlationMasks_ = {},
-                                   const void *                                    pNext_            = nullptr )
+    RenderPassMultiviewCreateInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & viewMasks_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const int32_t> const &  viewOffsets_      = {},
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & correlationMasks_ = {},
+                                   const void *                                                          pNext_            = nullptr )
       : pNext( pNext_ )
       , subpassCount( static_cast<uint32_t>( viewMasks_.size() ) )
       , pViewMasks( viewMasks_.data() )
@@ -143007,15 +103484,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassMultiviewCreateInfo & operator=( RenderPassMultiviewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassMultiviewCreateInfo & operator=( VkRenderPassMultiviewCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassMultiviewCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassMultiviewCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassMultiviewCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -143035,7 +103512,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassMultiviewCreateInfo & setViewMasks( ArrayProxyNoTemporaries<const uint32_t> const & viewMasks_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassMultiviewCreateInfo & setViewMasks( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & viewMasks_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassCount = static_cast<uint32_t>( viewMasks_.size() );
       pViewMasks   = viewMasks_.data();
@@ -143056,7 +103533,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassMultiviewCreateInfo & setViewOffsets( ArrayProxyNoTemporaries<const int32_t> const & viewOffsets_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassMultiviewCreateInfo & setViewOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const int32_t> const & viewOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       dependencyCount = static_cast<uint32_t>( viewOffsets_.size() );
       pViewOffsets    = viewOffsets_.data();
@@ -143077,14 +103554,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassMultiviewCreateInfo & setCorrelationMasks( ArrayProxyNoTemporaries<const uint32_t> const & correlationMasks_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassMultiviewCreateInfo &
+      setCorrelationMasks( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & correlationMasks_ ) VULKAN_HPP_NOEXCEPT
     {
       correlationMaskCount = static_cast<uint32_t>( correlationMasks_.size() );
       pCorrelationMasks    = correlationMasks_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassMultiviewCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143096,18 +103574,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassMultiviewCreateInfo *>( this );
     }
 
-    operator VkRenderPassMultiviewCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassMultiviewCreateInfo *>( this );
-    }
-
-    operator VkRenderPassMultiviewCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassMultiviewCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const uint32_t * const &,
@@ -143115,6 +103586,7 @@ namespace VULKAN_HPP_NAMESPACE
                const int32_t * const &,
                uint32_t const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subpassCount, pViewMasks, dependencyCount, pViewOffsets, correlationMaskCount, pCorrelationMasks );
@@ -143142,24 +103614,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                = StructureType::eRenderPassMultiviewCreateInfo;
-    const void *     pNext                = {};
-    uint32_t         subpassCount         = {};
-    const uint32_t * pViewMasks           = {};
-    uint32_t         dependencyCount      = {};
-    const int32_t *  pViewOffsets         = {};
-    uint32_t         correlationMaskCount = {};
-    const uint32_t * pCorrelationMasks    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eRenderPassMultiviewCreateInfo;
+    const void *                        pNext                = {};
+    uint32_t                            subpassCount         = {};
+    const uint32_t *                    pViewMasks           = {};
+    uint32_t                            dependencyCount      = {};
+    const int32_t *                     pViewOffsets         = {};
+    uint32_t                            correlationMaskCount = {};
+    const uint32_t *                    pCorrelationMasks    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassMultiviewCreateInfo>
-  {
-    using Type = RenderPassMultiviewCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassMultiviewCreateInfo>
   {
@@ -143168,169 +103632,15 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderPassMultiviewCreateInfoKHR = RenderPassMultiviewCreateInfo;
 
-  // wrapper struct for struct VkRenderPassPerformanceCountersByRegionBeginInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassPerformanceCountersByRegionBeginInfoARM.html
-  struct RenderPassPerformanceCountersByRegionBeginInfoARM
-  {
-    using NativeType = VkRenderPassPerformanceCountersByRegionBeginInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassPerformanceCountersByRegionBeginInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassPerformanceCountersByRegionBeginInfoARM( uint32_t              counterAddressCount_ = {},
-                                                                            const DeviceAddress * pCounterAddresses_   = {},
-                                                                            Bool32                serializeRegions_    = {},
-                                                                            uint32_t              counterIndexCount_   = {},
-                                                                            uint32_t *            pCounterIndices_     = {},
-                                                                            void *                pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , counterAddressCount{ counterAddressCount_ }
-      , pCounterAddresses{ pCounterAddresses_ }
-      , serializeRegions{ serializeRegions_ }
-      , counterIndexCount{ counterIndexCount_ }
-      , pCounterIndices{ pCounterIndices_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      RenderPassPerformanceCountersByRegionBeginInfoARM( RenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    RenderPassPerformanceCountersByRegionBeginInfoARM( VkRenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderPassPerformanceCountersByRegionBeginInfoARM( *reinterpret_cast<RenderPassPerformanceCountersByRegionBeginInfoARM const *>( &rhs ) )
-    {
-    }
-
-    RenderPassPerformanceCountersByRegionBeginInfoARM &
-      operator=( RenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RenderPassPerformanceCountersByRegionBeginInfoARM & operator=( VkRenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RenderPassPerformanceCountersByRegionBeginInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM & setCounterAddressCount( uint32_t counterAddressCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      counterAddressCount = counterAddressCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM &
-      setPCounterAddresses( const DeviceAddress * pCounterAddresses_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pCounterAddresses = pCounterAddresses_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM & setSerializeRegions( Bool32 serializeRegions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      serializeRegions = serializeRegions_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM & setCounterIndexCount( uint32_t counterIndexCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      counterIndexCount = counterIndexCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassPerformanceCountersByRegionBeginInfoARM & setPCounterIndices( uint32_t * pCounterIndices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pCounterIndices = pCounterIndices_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRenderPassPerformanceCountersByRegionBeginInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRenderPassPerformanceCountersByRegionBeginInfoARM *>( this );
-    }
-
-    operator VkRenderPassPerformanceCountersByRegionBeginInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRenderPassPerformanceCountersByRegionBeginInfoARM *>( this );
-    }
-
-    operator VkRenderPassPerformanceCountersByRegionBeginInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassPerformanceCountersByRegionBeginInfoARM *>( this );
-    }
-
-    operator VkRenderPassPerformanceCountersByRegionBeginInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassPerformanceCountersByRegionBeginInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, const DeviceAddress * const &, Bool32 const &, uint32_t const &, uint32_t * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, counterAddressCount, pCounterAddresses, serializeRegions, counterIndexCount, pCounterIndices );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderPassPerformanceCountersByRegionBeginInfoARM const & ) const = default;
-#else
-    bool operator==( RenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( counterAddressCount == rhs.counterAddressCount ) &&
-             ( pCounterAddresses == rhs.pCounterAddresses ) && ( serializeRegions == rhs.serializeRegions ) && ( counterIndexCount == rhs.counterIndexCount ) &&
-             ( pCounterIndices == rhs.pCounterIndices );
-#  endif
-    }
-
-    bool operator!=( RenderPassPerformanceCountersByRegionBeginInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType         sType               = StructureType::eRenderPassPerformanceCountersByRegionBeginInfoARM;
-    void *                pNext               = {};
-    uint32_t              counterAddressCount = {};
-    const DeviceAddress * pCounterAddresses   = {};
-    Bool32                serializeRegions    = {};
-    uint32_t              counterIndexCount   = {};
-    uint32_t *            pCounterIndices     = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassPerformanceCountersByRegionBeginInfoARM>
-  {
-    using Type = RenderPassPerformanceCountersByRegionBeginInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRenderPassPerformanceCountersByRegionBeginInfoARM>
-  {
-    using Type = RenderPassPerformanceCountersByRegionBeginInfoARM;
-  };
-
-  // wrapper struct for struct VkSubpassSampleLocationsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassSampleLocationsEXT.html
   struct SubpassSampleLocationsEXT
   {
     using NativeType = VkSubpassSampleLocationsEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassSampleLocationsEXT( uint32_t subpassIndex_ = {}, SampleLocationsInfoEXT sampleLocationsInfo_ = {} ) VULKAN_HPP_NOEXCEPT
-      : subpassIndex{ subpassIndex_ }
-      , sampleLocationsInfo{ sampleLocationsInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassSampleLocationsEXT( uint32_t                                     subpassIndex_        = {},
+                                                    VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo_ = {} ) VULKAN_HPP_NOEXCEPT
+      : subpassIndex( subpassIndex_ )
+      , sampleLocationsInfo( sampleLocationsInfo_ )
     {
     }
 
@@ -143342,27 +103652,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SubpassSampleLocationsEXT & operator=( SubpassSampleLocationsEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassSampleLocationsEXT & operator=( VkSubpassSampleLocationsEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassSampleLocationsEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassSampleLocationsEXT & setSubpassIndex( uint32_t subpassIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       subpassIndex = subpassIndex_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassSampleLocationsEXT & setSampleLocationsInfo( SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassSampleLocationsEXT &
+      setSampleLocationsInfo( VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const & sampleLocationsInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       sampleLocationsInfo = sampleLocationsInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassSampleLocationsEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143374,18 +103685,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassSampleLocationsEXT *>( this );
     }
 
-    operator VkSubpassSampleLocationsEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassSampleLocationsEXT *>( this );
-    }
-
-    operator VkSubpassSampleLocationsEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassSampleLocationsEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, SampleLocationsInfoEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( subpassIndex, sampleLocationsInfo );
     }
@@ -143410,20 +103716,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t               subpassIndex        = {};
-    SampleLocationsInfoEXT sampleLocationsInfo = {};
+    uint32_t                                     subpassIndex        = {};
+    VULKAN_HPP_NAMESPACE::SampleLocationsInfoEXT sampleLocationsInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassSampleLocationsEXT>
-  {
-    using Type = SubpassSampleLocationsEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkRenderPassSampleLocationsBeginInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassSampleLocationsBeginInfoEXT.html
   struct RenderPassSampleLocationsBeginInfoEXT
   {
     using NativeType = VkRenderPassSampleLocationsBeginInfoEXT;
@@ -143431,17 +103727,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassSampleLocationsBeginInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassSampleLocationsBeginInfoEXT( uint32_t                             attachmentInitialSampleLocationsCount_ = {},
-                                                                const AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations_     = {},
-                                                                uint32_t                             postSubpassSampleLocationsCount_       = {},
-                                                                const SubpassSampleLocationsEXT *    pPostSubpassSampleLocations_           = {},
-                                                                const void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , attachmentInitialSampleLocationsCount{ attachmentInitialSampleLocationsCount_ }
-      , pAttachmentInitialSampleLocations{ pAttachmentInitialSampleLocations_ }
-      , postSubpassSampleLocationsCount{ postSubpassSampleLocationsCount_ }
-      , pPostSubpassSampleLocations{ pPostSubpassSampleLocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      RenderPassSampleLocationsBeginInfoEXT( uint32_t                                                   attachmentInitialSampleLocationsCount_ = {},
+                                             const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations_     = {},
+                                             uint32_t                                                   postSubpassSampleLocationsCount_       = {},
+                                             const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT *    pPostSubpassSampleLocations_           = {},
+                                             const void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , attachmentInitialSampleLocationsCount( attachmentInitialSampleLocationsCount_ )
+      , pAttachmentInitialSampleLocations( pAttachmentInitialSampleLocations_ )
+      , postSubpassSampleLocationsCount( postSubpassSampleLocationsCount_ )
+      , pPostSubpassSampleLocations( pPostSubpassSampleLocations_ )
     {
     }
 
@@ -143453,9 +103750,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassSampleLocationsBeginInfoEXT( ArrayProxyNoTemporaries<const AttachmentSampleLocationsEXT> const & attachmentInitialSampleLocations_,
-                                           ArrayProxyNoTemporaries<const SubpassSampleLocationsEXT> const &    postSubpassSampleLocations_ = {},
-                                           const void *                                                        pNext_                      = nullptr )
+    RenderPassSampleLocationsBeginInfoEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT> const & attachmentInitialSampleLocations_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT> const &    postSubpassSampleLocations_ = {},
+      const void *                                                                                                    pNext_                      = nullptr )
       : pNext( pNext_ )
       , attachmentInitialSampleLocationsCount( static_cast<uint32_t>( attachmentInitialSampleLocations_.size() ) )
       , pAttachmentInitialSampleLocations( attachmentInitialSampleLocations_.data() )
@@ -143466,15 +103764,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassSampleLocationsBeginInfoEXT & operator=( RenderPassSampleLocationsBeginInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassSampleLocationsBeginInfoEXT & operator=( VkRenderPassSampleLocationsBeginInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassSampleLocationsBeginInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassSampleLocationsBeginInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassSampleLocationsBeginInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -143489,7 +103787,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassSampleLocationsBeginInfoEXT &
-      setPAttachmentInitialSampleLocations( const AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+      setPAttachmentInitialSampleLocations( const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       pAttachmentInitialSampleLocations = pAttachmentInitialSampleLocations_;
       return *this;
@@ -143497,7 +103795,8 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     RenderPassSampleLocationsBeginInfoEXT & setAttachmentInitialSampleLocations(
-      ArrayProxyNoTemporaries<const AttachmentSampleLocationsEXT> const & attachmentInitialSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT> const & attachmentInitialSampleLocations_ )
+      VULKAN_HPP_NOEXCEPT
     {
       attachmentInitialSampleLocationsCount = static_cast<uint32_t>( attachmentInitialSampleLocations_.size() );
       pAttachmentInitialSampleLocations     = attachmentInitialSampleLocations_.data();
@@ -143513,22 +103812,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassSampleLocationsBeginInfoEXT &
-      setPPostSubpassSampleLocations( const SubpassSampleLocationsEXT * pPostSubpassSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+      setPPostSubpassSampleLocations( const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT * pPostSubpassSampleLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       pPostSubpassSampleLocations = pPostSubpassSampleLocations_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassSampleLocationsBeginInfoEXT &
-      setPostSubpassSampleLocations( ArrayProxyNoTemporaries<const SubpassSampleLocationsEXT> const & postSubpassSampleLocations_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassSampleLocationsBeginInfoEXT & setPostSubpassSampleLocations(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT> const & postSubpassSampleLocations_ )
+      VULKAN_HPP_NOEXCEPT
     {
       postSubpassSampleLocationsCount = static_cast<uint32_t>( postSubpassSampleLocations_.size() );
       pPostSubpassSampleLocations     = postSubpassSampleLocations_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassSampleLocationsBeginInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143540,23 +103840,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassSampleLocationsBeginInfoEXT *>( this );
     }
 
-    operator VkRenderPassSampleLocationsBeginInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassSampleLocationsBeginInfoEXT *>( this );
-    }
-
-    operator VkRenderPassSampleLocationsBeginInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassSampleLocationsBeginInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const AttachmentSampleLocationsEXT * const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT * const &,
                uint32_t const &,
-               const SubpassSampleLocationsEXT * const &>
+               const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -143585,29 +103879,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType                                 = StructureType::eRenderPassSampleLocationsBeginInfoEXT;
-    const void *                         pNext                                 = {};
-    uint32_t                             attachmentInitialSampleLocationsCount = {};
-    const AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations     = {};
-    uint32_t                             postSubpassSampleLocationsCount       = {};
-    const SubpassSampleLocationsEXT *    pPostSubpassSampleLocations           = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType                                 = StructureType::eRenderPassSampleLocationsBeginInfoEXT;
+    const void *                                               pNext                                 = {};
+    uint32_t                                                   attachmentInitialSampleLocationsCount = {};
+    const VULKAN_HPP_NAMESPACE::AttachmentSampleLocationsEXT * pAttachmentInitialSampleLocations     = {};
+    uint32_t                                                   postSubpassSampleLocationsCount       = {};
+    const VULKAN_HPP_NAMESPACE::SubpassSampleLocationsEXT *    pPostSubpassSampleLocations           = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassSampleLocationsBeginInfoEXT>
-  {
-    using Type = RenderPassSampleLocationsBeginInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassSampleLocationsBeginInfoEXT>
   {
     using Type = RenderPassSampleLocationsBeginInfoEXT;
   };
 
-  // wrapper struct for struct VkRenderPassStripeInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassStripeInfoARM.html
   struct RenderPassStripeInfoARM
   {
     using NativeType = VkRenderPassStripeInfoARM;
@@ -143615,10 +103900,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassStripeInfoARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassStripeInfoARM( Rect2D stripeArea_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stripeArea{ stripeArea_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassStripeInfoARM( VULKAN_HPP_NAMESPACE::Rect2D stripeArea_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stripeArea( stripeArea_ )
     {
     }
 
@@ -143630,27 +103915,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassStripeInfoARM & operator=( RenderPassStripeInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassStripeInfoARM & operator=( VkRenderPassStripeInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassStripeInfoARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassStripeInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeInfoARM & setStripeArea( Rect2D const & stripeArea_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeInfoARM & setStripeArea( VULKAN_HPP_NAMESPACE::Rect2D const & stripeArea_ ) VULKAN_HPP_NOEXCEPT
     {
       stripeArea = stripeArea_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassStripeInfoARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143662,18 +103947,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassStripeInfoARM *>( this );
     }
 
-    operator VkRenderPassStripeInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassStripeInfoARM *>( this );
-    }
-
-    operator VkRenderPassStripeInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassStripeInfoARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Rect2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Rect2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stripeArea );
     }
@@ -143698,26 +103978,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eRenderPassStripeInfoARM;
-    const void *  pNext      = {};
-    Rect2D        stripeArea = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eRenderPassStripeInfoARM;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::Rect2D        stripeArea = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassStripeInfoARM>
-  {
-    using Type = RenderPassStripeInfoARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassStripeInfoARM>
   {
     using Type = RenderPassStripeInfoARM;
   };
 
-  // wrapper struct for struct VkRenderPassStripeBeginInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassStripeBeginInfoARM.html
   struct RenderPassStripeBeginInfoARM
   {
     using NativeType = VkRenderPassStripeBeginInfoARM;
@@ -143725,13 +103996,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassStripeBeginInfoARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassStripeBeginInfoARM( uint32_t                        stripeInfoCount_ = {},
-                                                       const RenderPassStripeInfoARM * pStripeInfos_    = {},
-                                                       const void *                    pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stripeInfoCount{ stripeInfoCount_ }
-      , pStripeInfos{ pStripeInfos_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassStripeBeginInfoARM( uint32_t                                              stripeInfoCount_ = {},
+                                                       const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM * pStripeInfos_    = {},
+                                                       const void *                                          pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stripeInfoCount( stripeInfoCount_ )
+      , pStripeInfos( pStripeInfos_ )
     {
     }
 
@@ -143743,22 +104014,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassStripeBeginInfoARM( ArrayProxyNoTemporaries<const RenderPassStripeInfoARM> const & stripeInfos_, const void * pNext_ = nullptr )
+    RenderPassStripeBeginInfoARM( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM> const & stripeInfos_,
+                                  const void *                                                                                               pNext_ = nullptr )
       : pNext( pNext_ ), stripeInfoCount( static_cast<uint32_t>( stripeInfos_.size() ) ), pStripeInfos( stripeInfos_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassStripeBeginInfoARM & operator=( RenderPassStripeBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassStripeBeginInfoARM & operator=( VkRenderPassStripeBeginInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassStripeBeginInfoARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassStripeBeginInfoARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassStripeBeginInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -143771,21 +104043,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeBeginInfoARM & setPStripeInfos( const RenderPassStripeInfoARM * pStripeInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeBeginInfoARM &
+      setPStripeInfos( const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM * pStripeInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pStripeInfos = pStripeInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassStripeBeginInfoARM & setStripeInfos( ArrayProxyNoTemporaries<const RenderPassStripeInfoARM> const & stripeInfos_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassStripeBeginInfoARM & setStripeInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM> const & stripeInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       stripeInfoCount = static_cast<uint32_t>( stripeInfos_.size() );
       pStripeInfos    = stripeInfos_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassStripeBeginInfoARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143797,18 +104071,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassStripeBeginInfoARM *>( this );
     }
 
-    operator VkRenderPassStripeBeginInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassStripeBeginInfoARM *>( this );
-    }
-
-    operator VkRenderPassStripeBeginInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassStripeBeginInfoARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const RenderPassStripeInfoARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stripeInfoCount, pStripeInfos );
     }
@@ -143833,27 +104103,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType           = StructureType::eRenderPassStripeBeginInfoARM;
-    const void *                    pNext           = {};
-    uint32_t                        stripeInfoCount = {};
-    const RenderPassStripeInfoARM * pStripeInfos    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType           = StructureType::eRenderPassStripeBeginInfoARM;
+    const void *                                          pNext           = {};
+    uint32_t                                              stripeInfoCount = {};
+    const VULKAN_HPP_NAMESPACE::RenderPassStripeInfoARM * pStripeInfos    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassStripeBeginInfoARM>
-  {
-    using Type = RenderPassStripeBeginInfoARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassStripeBeginInfoARM>
   {
     using Type = RenderPassStripeBeginInfoARM;
   };
 
-  // wrapper struct for struct VkSemaphoreSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreSubmitInfo.html
   struct SemaphoreSubmitInfo
   {
     using NativeType = VkSemaphoreSubmitInfo;
@@ -143861,17 +104122,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreSubmitInfo( Semaphore           semaphore_   = {},
-                                              uint64_t            value_       = {},
-                                              PipelineStageFlags2 stageMask_   = {},
-                                              uint32_t            deviceIndex_ = {},
-                                              const void *        pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , value{ value_ }
-      , stageMask{ stageMask_ }
-      , deviceIndex{ deviceIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreSubmitInfo( VULKAN_HPP_NAMESPACE::Semaphore           semaphore_   = {},
+                                              uint64_t                                  value_       = {},
+                                              VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask_   = {},
+                                              uint32_t                                  deviceIndex_ = {},
+                                              const void *                              pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , value( value_ )
+      , stageMask( stageMask_ )
+      , deviceIndex( deviceIndex_ )
     {
     }
 
@@ -143882,22 +104143,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreSubmitInfo & operator=( SemaphoreSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreSubmitInfo & operator=( VkSemaphoreSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreSubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreSubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreSubmitInfo & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreSubmitInfo & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
@@ -143909,7 +104170,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreSubmitInfo & setStageMask( PipelineStageFlags2 stageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreSubmitInfo & setStageMask( VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       stageMask = stageMask_;
       return *this;
@@ -143920,7 +104181,7 @@ namespace VULKAN_HPP_NAMESPACE
       deviceIndex = deviceIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -143932,18 +104193,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreSubmitInfo *>( this );
     }
 
-    operator VkSemaphoreSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreSubmitInfo *>( this );
-    }
-
-    operator VkSemaphoreSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, uint64_t const &, PipelineStageFlags2 const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               uint64_t const &,
+               VULKAN_HPP_NAMESPACE::PipelineStageFlags2 const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, value, stageMask, deviceIndex );
@@ -143970,22 +104230,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType       = StructureType::eSemaphoreSubmitInfo;
-    const void *        pNext       = {};
-    Semaphore           semaphore   = {};
-    uint64_t            value       = {};
-    PipelineStageFlags2 stageMask   = {};
-    uint32_t            deviceIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType       = StructureType::eSemaphoreSubmitInfo;
+    const void *                              pNext       = {};
+    VULKAN_HPP_NAMESPACE::Semaphore           semaphore   = {};
+    uint64_t                                  value       = {};
+    VULKAN_HPP_NAMESPACE::PipelineStageFlags2 stageMask   = {};
+    uint32_t                                  deviceIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreSubmitInfo>
-  {
-    using Type = SemaphoreSubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreSubmitInfo>
   {
@@ -143994,8 +104246,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SemaphoreSubmitInfoKHR = SemaphoreSubmitInfo;
 
-  // wrapper struct for struct VkRenderPassStripeSubmitInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassStripeSubmitInfoARM.html
   struct RenderPassStripeSubmitInfoARM
   {
     using NativeType = VkRenderPassStripeSubmitInfoARM;
@@ -144003,13 +104253,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassStripeSubmitInfoARM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassStripeSubmitInfoARM( uint32_t                    stripeSemaphoreInfoCount_ = {},
-                                                        const SemaphoreSubmitInfo * pStripeSemaphoreInfos_    = {},
-                                                        const void *                pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stripeSemaphoreInfoCount{ stripeSemaphoreInfoCount_ }
-      , pStripeSemaphoreInfos{ pStripeSemaphoreInfos_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassStripeSubmitInfoARM( uint32_t                                          stripeSemaphoreInfoCount_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * pStripeSemaphoreInfos_    = {},
+                                                        const void *                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stripeSemaphoreInfoCount( stripeSemaphoreInfoCount_ )
+      , pStripeSemaphoreInfos( pStripeSemaphoreInfos_ )
     {
     }
 
@@ -144021,7 +104271,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassStripeSubmitInfoARM( ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const & stripeSemaphoreInfos_, const void * pNext_ = nullptr )
+    RenderPassStripeSubmitInfoARM( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const & stripeSemaphoreInfos_,
+                                   const void *                                                                                           pNext_ = nullptr )
       : pNext( pNext_ )
       , stripeSemaphoreInfoCount( static_cast<uint32_t>( stripeSemaphoreInfos_.size() ) )
       , pStripeSemaphoreInfos( stripeSemaphoreInfos_.data() )
@@ -144030,15 +104281,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderPassStripeSubmitInfoARM & operator=( RenderPassStripeSubmitInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassStripeSubmitInfoARM & operator=( VkRenderPassStripeSubmitInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassStripeSubmitInfoARM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassStripeSubmitInfoARM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassStripeSubmitInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -144051,22 +104302,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeSubmitInfoARM & setPStripeSemaphoreInfos( const SemaphoreSubmitInfo * pStripeSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassStripeSubmitInfoARM &
+      setPStripeSemaphoreInfos( const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * pStripeSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pStripeSemaphoreInfos = pStripeSemaphoreInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderPassStripeSubmitInfoARM &
-      setStripeSemaphoreInfos( ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const & stripeSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    RenderPassStripeSubmitInfoARM & setStripeSemaphoreInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const & stripeSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       stripeSemaphoreInfoCount = static_cast<uint32_t>( stripeSemaphoreInfos_.size() );
       pStripeSemaphoreInfos    = stripeSemaphoreInfos_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassStripeSubmitInfoARM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -144078,18 +104330,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassStripeSubmitInfoARM *>( this );
     }
 
-    operator VkRenderPassStripeSubmitInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassStripeSubmitInfoARM *>( this );
-    }
-
-    operator VkRenderPassStripeSubmitInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassStripeSubmitInfoARM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const SemaphoreSubmitInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stripeSemaphoreInfoCount, pStripeSemaphoreInfos );
     }
@@ -144115,39 +104362,30 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                    = StructureType::eRenderPassStripeSubmitInfoARM;
-    const void *                pNext                    = {};
-    uint32_t                    stripeSemaphoreInfoCount = {};
-    const SemaphoreSubmitInfo * pStripeSemaphoreInfos    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                    = StructureType::eRenderPassStripeSubmitInfoARM;
+    const void *                                      pNext                    = {};
+    uint32_t                                          stripeSemaphoreInfoCount = {};
+    const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * pStripeSemaphoreInfos    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassStripeSubmitInfoARM>
-  {
-    using Type = RenderPassStripeSubmitInfoARM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassStripeSubmitInfoARM>
   {
     using Type = RenderPassStripeSubmitInfoARM;
   };
 
-  // wrapper struct for struct VkRenderPassSubpassFeedbackInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassSubpassFeedbackInfoEXT.html
   struct RenderPassSubpassFeedbackInfoEXT
   {
     using NativeType = VkRenderPassSubpassFeedbackInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassSubpassFeedbackInfoEXT( SubpassMergeStatusEXT subpassMergeStatus_                      = SubpassMergeStatusEXT::eMerged,
-                                                              std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_ = {},
-                                                              uint32_t                                          postMergeIndex_ = {} ) VULKAN_HPP_NOEXCEPT
-      : subpassMergeStatus{ subpassMergeStatus_ }
-      , description{ description_ }
-      , postMergeIndex{ postMergeIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14
+      RenderPassSubpassFeedbackInfoEXT( VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT subpassMergeStatus_ = VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT::eMerged,
+                                        std::array<char, VK_MAX_DESCRIPTION_SIZE> const & description_  = {},
+                                        uint32_t                                          postMergeIndex_ = {} ) VULKAN_HPP_NOEXCEPT
+      : subpassMergeStatus( subpassMergeStatus_ )
+      , description( description_ )
+      , postMergeIndex( postMergeIndex_ )
     {
     }
 
@@ -144158,12 +104396,27 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    RenderPassSubpassFeedbackInfoEXT( VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT subpassMergeStatus_,
+                                      std::string const &                         description_,
+                                      uint32_t                                    postMergeIndex_ = {} )
+      : subpassMergeStatus( subpassMergeStatus_ ), postMergeIndex( postMergeIndex_ )
+    {
+      VULKAN_HPP_ASSERT( description_.size() < VK_MAX_DESCRIPTION_SIZE );
+#    if defined( WIN32 )
+      strncpy_s( description, VK_MAX_DESCRIPTION_SIZE, description_.data(), description_.size() );
+#    else
+      strncpy( description, description_.data(), std::min<size_t>( VK_MAX_DESCRIPTION_SIZE, description_.size() ) );
+#    endif
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     RenderPassSubpassFeedbackInfoEXT & operator=( RenderPassSubpassFeedbackInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassSubpassFeedbackInfoEXT & operator=( VkRenderPassSubpassFeedbackInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassSubpassFeedbackInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT const *>( &rhs );
       return *this;
     }
 
@@ -144177,18 +104430,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassSubpassFeedbackInfoEXT *>( this );
     }
 
-    operator VkRenderPassSubpassFeedbackInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassSubpassFeedbackInfoEXT *>( this );
-    }
-
-    operator VkRenderPassSubpassFeedbackInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassSubpassFeedbackInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<SubpassMergeStatusEXT const &, ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT const &, VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( subpassMergeStatus, description, postMergeIndex );
     }
@@ -144219,21 +104468,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    SubpassMergeStatusEXT                         subpassMergeStatus = SubpassMergeStatusEXT::eMerged;
-    ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description        = {};
-    uint32_t                                      postMergeIndex     = {};
+    VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT                         subpassMergeStatus = VULKAN_HPP_NAMESPACE::SubpassMergeStatusEXT::eMerged;
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<char, VK_MAX_DESCRIPTION_SIZE> description        = {};
+    uint32_t                                                            postMergeIndex     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassSubpassFeedbackInfoEXT>
-  {
-    using Type = RenderPassSubpassFeedbackInfoEXT;
-  };
-#endif
-
-  // wrapper struct for struct VkRenderPassSubpassFeedbackCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassSubpassFeedbackCreateInfoEXT.html
   struct RenderPassSubpassFeedbackCreateInfoEXT
   {
     using NativeType = VkRenderPassSubpassFeedbackCreateInfoEXT;
@@ -144241,11 +104480,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassSubpassFeedbackCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassSubpassFeedbackCreateInfoEXT( RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback_ = {},
-                                                                    const void *                       pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pSubpassFeedback{ pSubpassFeedback_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 RenderPassSubpassFeedbackCreateInfoEXT( VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback_ = {},
+                                                                    const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , pSubpassFeedback( pSubpassFeedback_ )
     {
     }
 
@@ -144257,15 +104496,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassSubpassFeedbackCreateInfoEXT & operator=( RenderPassSubpassFeedbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassSubpassFeedbackCreateInfoEXT & operator=( VkRenderPassSubpassFeedbackCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassSubpassFeedbackCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderPassSubpassFeedbackCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -144273,12 +104512,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderPassSubpassFeedbackCreateInfoEXT &
-      setPSubpassFeedback( RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback_ ) VULKAN_HPP_NOEXCEPT
+      setPSubpassFeedback( VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback_ ) VULKAN_HPP_NOEXCEPT
     {
       pSubpassFeedback = pSubpassFeedback_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassSubpassFeedbackCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -144290,18 +104529,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassSubpassFeedbackCreateInfoEXT *>( this );
     }
 
-    operator VkRenderPassSubpassFeedbackCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassSubpassFeedbackCreateInfoEXT *>( this );
-    }
-
-    operator VkRenderPassSubpassFeedbackCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassSubpassFeedbackCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, RenderPassSubpassFeedbackInfoEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pSubpassFeedback );
     }
@@ -144326,148 +104560,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType            = StructureType::eRenderPassSubpassFeedbackCreateInfoEXT;
-    const void *                       pNext            = {};
-    RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType            = StructureType::eRenderPassSubpassFeedbackCreateInfoEXT;
+    const void *                                             pNext            = {};
+    VULKAN_HPP_NAMESPACE::RenderPassSubpassFeedbackInfoEXT * pSubpassFeedback = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassSubpassFeedbackCreateInfoEXT>
-  {
-    using Type = RenderPassSubpassFeedbackCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassSubpassFeedbackCreateInfoEXT>
   {
     using Type = RenderPassSubpassFeedbackCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkRenderPassTileShadingCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassTileShadingCreateInfoQCOM.html
-  struct RenderPassTileShadingCreateInfoQCOM
-  {
-    using NativeType = VkRenderPassTileShadingCreateInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassTileShadingCreateInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassTileShadingCreateInfoQCOM( TileShadingRenderPassFlagsQCOM flags_         = {},
-                                                              Extent2D                       tileApronSize_ = {},
-                                                              const void *                   pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , tileApronSize{ tileApronSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR RenderPassTileShadingCreateInfoQCOM( RenderPassTileShadingCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    RenderPassTileShadingCreateInfoQCOM( VkRenderPassTileShadingCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderPassTileShadingCreateInfoQCOM( *reinterpret_cast<RenderPassTileShadingCreateInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    RenderPassTileShadingCreateInfoQCOM & operator=( RenderPassTileShadingCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RenderPassTileShadingCreateInfoQCOM & operator=( VkRenderPassTileShadingCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RenderPassTileShadingCreateInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassTileShadingCreateInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassTileShadingCreateInfoQCOM & setFlags( TileShadingRenderPassFlagsQCOM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderPassTileShadingCreateInfoQCOM & setTileApronSize( Extent2D const & tileApronSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tileApronSize = tileApronSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRenderPassTileShadingCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRenderPassTileShadingCreateInfoQCOM *>( this );
-    }
-
-    operator VkRenderPassTileShadingCreateInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRenderPassTileShadingCreateInfoQCOM *>( this );
-    }
-
-    operator VkRenderPassTileShadingCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassTileShadingCreateInfoQCOM *>( this );
-    }
-
-    operator VkRenderPassTileShadingCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassTileShadingCreateInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TileShadingRenderPassFlagsQCOM const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, tileApronSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderPassTileShadingCreateInfoQCOM const & ) const = default;
-#else
-    bool operator==( RenderPassTileShadingCreateInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( tileApronSize == rhs.tileApronSize );
-#  endif
-    }
-
-    bool operator!=( RenderPassTileShadingCreateInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType         = StructureType::eRenderPassTileShadingCreateInfoQCOM;
-    const void *                   pNext         = {};
-    TileShadingRenderPassFlagsQCOM flags         = {};
-    Extent2D                       tileApronSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassTileShadingCreateInfoQCOM>
-  {
-    using Type = RenderPassTileShadingCreateInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRenderPassTileShadingCreateInfoQCOM>
-  {
-    using Type = RenderPassTileShadingCreateInfoQCOM;
-  };
-
-  // wrapper struct for struct VkRenderPassTransformBeginInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderPassTransformBeginInfoQCOM.html
   struct RenderPassTransformBeginInfoQCOM
   {
     using NativeType = VkRenderPassTransformBeginInfoQCOM;
@@ -144475,11 +104578,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderPassTransformBeginInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderPassTransformBeginInfoQCOM( SurfaceTransformFlagBitsKHR transform_ = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                           const void *                pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , transform{ transform_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderPassTransformBeginInfoQCOM(
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+      void *                                            pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , transform( transform_ )
     {
     }
 
@@ -144491,27 +104595,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderPassTransformBeginInfoQCOM & operator=( RenderPassTransformBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderPassTransformBeginInfoQCOM & operator=( VkRenderPassTransformBeginInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderPassTransformBeginInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderPassTransformBeginInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderPassTransformBeginInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 RenderPassTransformBeginInfoQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderPassTransformBeginInfoQCOM & setTransform( SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderPassTransformBeginInfoQCOM & setTransform( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform_ ) VULKAN_HPP_NOEXCEPT
     {
       transform = transform_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderPassTransformBeginInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -144523,18 +104627,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderPassTransformBeginInfoQCOM *>( this );
     }
 
-    operator VkRenderPassTransformBeginInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderPassTransformBeginInfoQCOM *>( this );
-    }
-
-    operator VkRenderPassTransformBeginInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderPassTransformBeginInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceTransformFlagBitsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, transform );
     }
@@ -144559,59 +104658,53 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType     = StructureType::eRenderPassTransformBeginInfoQCOM;
-    const void *                pNext     = {};
-    SurfaceTransformFlagBitsKHR transform = SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::StructureType               sType     = StructureType::eRenderPassTransformBeginInfoQCOM;
+    void *                                            pNext     = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR transform = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderPassTransformBeginInfoQCOM>
-  {
-    using Type = RenderPassTransformBeginInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderPassTransformBeginInfoQCOM>
   {
     using Type = RenderPassTransformBeginInfoQCOM;
   };
 
-  // wrapper struct for struct VkRenderingAreaInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAreaInfo.html
-  struct RenderingAreaInfo
+  struct RenderingAreaInfoKHR
   {
-    using NativeType = VkRenderingAreaInfo;
+    using NativeType = VkRenderingAreaInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAreaInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAreaInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingAreaInfo( uint32_t       viewMask_                = {},
-                                            uint32_t       colorAttachmentCount_    = {},
-                                            const Format * pColorAttachmentFormats_ = {},
-                                            Format         depthAttachmentFormat_   = Format::eUndefined,
-                                            Format         stencilAttachmentFormat_ = Format::eUndefined,
-                                            const void *   pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , viewMask{ viewMask_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentFormats{ pColorAttachmentFormats_ }
-      , depthAttachmentFormat{ depthAttachmentFormat_ }
-      , stencilAttachmentFormat{ stencilAttachmentFormat_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderingAreaInfoKHR( uint32_t                             viewMask_                = {},
+                                               uint32_t                             colorAttachmentCount_    = {},
+                                               const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats_ = {},
+                                               VULKAN_HPP_NAMESPACE::Format         depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                               VULKAN_HPP_NAMESPACE::Format         stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                               const void *                         pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , viewMask( viewMask_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentFormats( pColorAttachmentFormats_ )
+      , depthAttachmentFormat( depthAttachmentFormat_ )
+      , stencilAttachmentFormat( stencilAttachmentFormat_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR RenderingAreaInfo( RenderingAreaInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR RenderingAreaInfoKHR( RenderingAreaInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    RenderingAreaInfo( VkRenderingAreaInfo const & rhs ) VULKAN_HPP_NOEXCEPT : RenderingAreaInfo( *reinterpret_cast<RenderingAreaInfo const *>( &rhs ) ) {}
+    RenderingAreaInfoKHR( VkRenderingAreaInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : RenderingAreaInfoKHR( *reinterpret_cast<RenderingAreaInfoKHR const *>( &rhs ) )
+    {
+    }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingAreaInfo( uint32_t                                      viewMask_,
-                       ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_,
-                       Format                                        depthAttachmentFormat_   = Format::eUndefined,
-                       Format                                        stencilAttachmentFormat_ = Format::eUndefined,
-                       const void *                                  pNext_                   = nullptr )
+    RenderingAreaInfoKHR( uint32_t                                                                                  viewMask_,
+                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_,
+                          VULKAN_HPP_NAMESPACE::Format depthAttachmentFormat_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                          VULKAN_HPP_NAMESPACE::Format stencilAttachmentFormat_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                          const void *                 pNext_                   = nullptr )
       : pNext( pNext_ )
       , viewMask( viewMask_ )
       , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentFormats_.size() ) )
@@ -144622,42 +104715,44 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    RenderingAreaInfo & operator=( RenderingAreaInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    RenderingAreaInfoKHR & operator=( RenderingAreaInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    RenderingAreaInfo & operator=( VkRenderingAreaInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    RenderingAreaInfoKHR & operator=( VkRenderingAreaInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingAreaInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingAreaInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setViewMask( uint32_t viewMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR & setViewMask( uint32_t viewMask_ ) VULKAN_HPP_NOEXCEPT
     {
       viewMask = viewMask_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = colorAttachmentCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setPColorAttachmentFormats( const Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR &
+      setPColorAttachmentFormats( const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentFormats = pColorAttachmentFormats_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingAreaInfo & setColorAttachmentFormats( ArrayProxyNoTemporaries<const Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
+    RenderingAreaInfoKHR & setColorAttachmentFormats(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Format> const & colorAttachmentFormats_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount    = static_cast<uint32_t>( colorAttachmentFormats_.size() );
       pColorAttachmentFormats = colorAttachmentFormats_.data();
@@ -144665,41 +104760,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setDepthAttachmentFormat( Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR & setDepthAttachmentFormat( VULKAN_HPP_NAMESPACE::Format depthAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       depthAttachmentFormat = depthAttachmentFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfo & setStencilAttachmentFormat( Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAreaInfoKHR & setStencilAttachmentFormat( VULKAN_HPP_NAMESPACE::Format stencilAttachmentFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilAttachmentFormat = stencilAttachmentFormat_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkRenderingAreaInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkRenderingAreaInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkRenderingAreaInfo *>( this );
+      return *reinterpret_cast<const VkRenderingAreaInfoKHR *>( this );
     }
 
-    operator VkRenderingAreaInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkRenderingAreaInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkRenderingAreaInfo *>( this );
-    }
-
-    operator VkRenderingAreaInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingAreaInfo *>( this );
-    }
-
-    operator VkRenderingAreaInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingAreaInfo *>( this );
+      return *reinterpret_cast<VkRenderingAreaInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const Format * const &, Format const &, Format const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Format * const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, viewMask, colorAttachmentCount, pColorAttachmentFormats, depthAttachmentFormat, stencilAttachmentFormat );
@@ -144707,9 +104802,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderingAreaInfo const & ) const = default;
+    auto operator<=>( RenderingAreaInfoKHR const & ) const = default;
 #else
-    bool operator==( RenderingAreaInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( RenderingAreaInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -144720,150 +104815,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( RenderingAreaInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( RenderingAreaInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType  sType                   = StructureType::eRenderingAreaInfo;
-    const void *   pNext                   = {};
-    uint32_t       viewMask                = {};
-    uint32_t       colorAttachmentCount    = {};
-    const Format * pColorAttachmentFormats = {};
-    Format         depthAttachmentFormat   = Format::eUndefined;
-    Format         stencilAttachmentFormat = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType  sType                   = StructureType::eRenderingAreaInfoKHR;
+    const void *                         pNext                   = {};
+    uint32_t                             viewMask                = {};
+    uint32_t                             colorAttachmentCount    = {};
+    const VULKAN_HPP_NAMESPACE::Format * pColorAttachmentFormats = {};
+    VULKAN_HPP_NAMESPACE::Format         depthAttachmentFormat   = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Format         stencilAttachmentFormat = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingAreaInfo>
-  {
-    using Type = RenderingAreaInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eRenderingAreaInfo>
+  struct CppType<StructureType, StructureType::eRenderingAreaInfoKHR>
   {
-    using Type = RenderingAreaInfo;
+    using Type = RenderingAreaInfoKHR;
   };
 
-  using RenderingAreaInfoKHR = RenderingAreaInfo;
-
-  // wrapper struct for struct VkRenderingAttachmentFlagsInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAttachmentFlagsInfoKHR.html
-  struct RenderingAttachmentFlagsInfoKHR
-  {
-    using NativeType = VkRenderingAttachmentFlagsInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAttachmentFlagsInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingAttachmentFlagsInfoKHR( RenderingAttachmentFlagsKHR flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR RenderingAttachmentFlagsInfoKHR( RenderingAttachmentFlagsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    RenderingAttachmentFlagsInfoKHR( VkRenderingAttachmentFlagsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderingAttachmentFlagsInfoKHR( *reinterpret_cast<RenderingAttachmentFlagsInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    RenderingAttachmentFlagsInfoKHR & operator=( RenderingAttachmentFlagsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RenderingAttachmentFlagsInfoKHR & operator=( VkRenderingAttachmentFlagsInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RenderingAttachmentFlagsInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentFlagsInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentFlagsInfoKHR & setFlags( RenderingAttachmentFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRenderingAttachmentFlagsInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRenderingAttachmentFlagsInfoKHR *>( this );
-    }
-
-    operator VkRenderingAttachmentFlagsInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRenderingAttachmentFlagsInfoKHR *>( this );
-    }
-
-    operator VkRenderingAttachmentFlagsInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingAttachmentFlagsInfoKHR *>( this );
-    }
-
-    operator VkRenderingAttachmentFlagsInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingAttachmentFlagsInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, RenderingAttachmentFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderingAttachmentFlagsInfoKHR const & ) const = default;
-#else
-    bool operator==( RenderingAttachmentFlagsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags );
-#  endif
-    }
-
-    bool operator!=( RenderingAttachmentFlagsInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType               sType = StructureType::eRenderingAttachmentFlagsInfoKHR;
-    const void *                pNext = {};
-    RenderingAttachmentFlagsKHR flags = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingAttachmentFlagsInfoKHR>
-  {
-    using Type = RenderingAttachmentFlagsInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRenderingAttachmentFlagsInfoKHR>
-  {
-    using Type = RenderingAttachmentFlagsInfoKHR;
-  };
-
-  // wrapper struct for struct VkRenderingAttachmentInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAttachmentInfo.html
   struct RenderingAttachmentInfo
   {
     using NativeType = VkRenderingAttachmentInfo;
@@ -144871,25 +104844,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAttachmentInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo( ImageView           imageView_          = {},
-                                                     ImageLayout         imageLayout_        = ImageLayout::eUndefined,
-                                                     ResolveModeFlagBits resolveMode_        = ResolveModeFlagBits::eNone,
-                                                     ImageView           resolveImageView_   = {},
-                                                     ImageLayout         resolveImageLayout_ = ImageLayout::eUndefined,
-                                                     AttachmentLoadOp    loadOp_             = AttachmentLoadOp::eLoad,
-                                                     AttachmentStoreOp   storeOp_            = AttachmentStoreOp::eStore,
-                                                     ClearValue          clearValue_         = {},
-                                                     const void *        pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageView{ imageView_ }
-      , imageLayout{ imageLayout_ }
-      , resolveMode{ resolveMode_ }
-      , resolveImageView{ resolveImageView_ }
-      , resolveImageLayout{ resolveImageLayout_ }
-      , loadOp{ loadOp_ }
-      , storeOp{ storeOp_ }
-      , clearValue{ clearValue_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo( VULKAN_HPP_NAMESPACE::ImageView           imageView_   = {},
+                                                     VULKAN_HPP_NAMESPACE::ImageLayout         imageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                     VULKAN_HPP_NAMESPACE::ResolveModeFlagBits resolveMode_ = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone,
+                                                     VULKAN_HPP_NAMESPACE::ImageView           resolveImageView_ = {},
+                                                     VULKAN_HPP_NAMESPACE::ImageLayout      resolveImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                     VULKAN_HPP_NAMESPACE::AttachmentLoadOp loadOp_             = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad,
+                                                     VULKAN_HPP_NAMESPACE::AttachmentStoreOp storeOp_    = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore,
+                                                     VULKAN_HPP_NAMESPACE::ClearValue        clearValue_ = {},
+                                                     const void *                            pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageView( imageView_ )
+      , imageLayout( imageLayout_ )
+      , resolveMode( resolveMode_ )
+      , resolveImageView( resolveImageView_ )
+      , resolveImageLayout( resolveImageLayout_ )
+      , loadOp( loadOp_ )
+      , storeOp( storeOp_ )
+      , clearValue( clearValue_ )
     {
     }
 
@@ -144901,69 +104874,69 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderingAttachmentInfo & operator=( RenderingAttachmentInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderingAttachmentInfo & operator=( VkRenderingAttachmentInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingAttachmentInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setImageLayout( ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       imageLayout = imageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveMode( ResolveModeFlagBits resolveMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveMode( VULKAN_HPP_NAMESPACE::ResolveModeFlagBits resolveMode_ ) VULKAN_HPP_NOEXCEPT
     {
       resolveMode = resolveMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveImageView( ImageView resolveImageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveImageView( VULKAN_HPP_NAMESPACE::ImageView resolveImageView_ ) VULKAN_HPP_NOEXCEPT
     {
       resolveImageView = resolveImageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveImageLayout( ImageLayout resolveImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setResolveImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout resolveImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       resolveImageLayout = resolveImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setLoadOp( AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setLoadOp( VULKAN_HPP_NAMESPACE::AttachmentLoadOp loadOp_ ) VULKAN_HPP_NOEXCEPT
     {
       loadOp = loadOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setStoreOp( AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setStoreOp( VULKAN_HPP_NAMESPACE::AttachmentStoreOp storeOp_ ) VULKAN_HPP_NOEXCEPT
     {
       storeOp = storeOp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setClearValue( ClearValue const & clearValue_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentInfo & setClearValue( VULKAN_HPP_NAMESPACE::ClearValue const & clearValue_ ) VULKAN_HPP_NOEXCEPT
     {
       clearValue = clearValue_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderingAttachmentInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -144975,27 +104948,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderingAttachmentInfo *>( this );
     }
 
-    operator VkRenderingAttachmentInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingAttachmentInfo *>( this );
-    }
-
-    operator VkRenderingAttachmentInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingAttachmentInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ImageView const &,
-               ImageLayout const &,
-               ResolveModeFlagBits const &,
-               ImageView const &,
-               ImageLayout const &,
-               AttachmentLoadOp const &,
-               AttachmentStoreOp const &,
-               ClearValue const &>
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::AttachmentLoadOp const &,
+               VULKAN_HPP_NAMESPACE::AttachmentStoreOp const &,
+               VULKAN_HPP_NAMESPACE::ClearValue const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageView, imageLayout, resolveMode, resolveImageView, resolveImageLayout, loadOp, storeOp, clearValue );
@@ -145003,26 +104970,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType       sType              = StructureType::eRenderingAttachmentInfo;
-    const void *        pNext              = {};
-    ImageView           imageView          = {};
-    ImageLayout         imageLayout        = ImageLayout::eUndefined;
-    ResolveModeFlagBits resolveMode        = ResolveModeFlagBits::eNone;
-    ImageView           resolveImageView   = {};
-    ImageLayout         resolveImageLayout = ImageLayout::eUndefined;
-    AttachmentLoadOp    loadOp             = AttachmentLoadOp::eLoad;
-    AttachmentStoreOp   storeOp            = AttachmentStoreOp::eStore;
-    ClearValue          clearValue         = {};
+    VULKAN_HPP_NAMESPACE::StructureType       sType              = StructureType::eRenderingAttachmentInfo;
+    const void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::ImageView           imageView          = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout         imageLayout        = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::ResolveModeFlagBits resolveMode        = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone;
+    VULKAN_HPP_NAMESPACE::ImageView           resolveImageView   = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout         resolveImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::AttachmentLoadOp    loadOp             = VULKAN_HPP_NAMESPACE::AttachmentLoadOp::eLoad;
+    VULKAN_HPP_NAMESPACE::AttachmentStoreOp   storeOp            = VULKAN_HPP_NAMESPACE::AttachmentStoreOp::eStore;
+    VULKAN_HPP_NAMESPACE::ClearValue          clearValue         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingAttachmentInfo>
-  {
-    using Type = RenderingAttachmentInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderingAttachmentInfo>
   {
@@ -145031,34 +104990,33 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderingAttachmentInfoKHR = RenderingAttachmentInfo;
 
-  // wrapper struct for struct VkRenderingAttachmentLocationInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingAttachmentLocationInfo.html
-  struct RenderingAttachmentLocationInfo
+  struct RenderingAttachmentLocationInfoKHR
   {
-    using NativeType = VkRenderingAttachmentLocationInfo;
+    using NativeType = VkRenderingAttachmentLocationInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAttachmentLocationInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingAttachmentLocationInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingAttachmentLocationInfo( uint32_t         colorAttachmentCount_      = {},
-                                                          const uint32_t * pColorAttachmentLocations_ = {},
-                                                          const void *     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentLocations{ pColorAttachmentLocations_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderingAttachmentLocationInfoKHR( uint32_t         colorAttachmentCount_      = {},
+                                                             const uint32_t * pColorAttachmentLocations_ = {},
+                                                             const void *     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentLocations( pColorAttachmentLocations_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR RenderingAttachmentLocationInfo( RenderingAttachmentLocationInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR RenderingAttachmentLocationInfoKHR( RenderingAttachmentLocationInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    RenderingAttachmentLocationInfo( VkRenderingAttachmentLocationInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderingAttachmentLocationInfo( *reinterpret_cast<RenderingAttachmentLocationInfo const *>( &rhs ) )
+    RenderingAttachmentLocationInfoKHR( VkRenderingAttachmentLocationInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : RenderingAttachmentLocationInfoKHR( *reinterpret_cast<RenderingAttachmentLocationInfoKHR const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingAttachmentLocationInfo( ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentLocations_, const void * pNext_ = nullptr )
+    RenderingAttachmentLocationInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentLocations_,
+                                        const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentLocations_.size() ) )
       , pColorAttachmentLocations( colorAttachmentLocations_.data() )
@@ -145066,76 +105024,71 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    RenderingAttachmentLocationInfo & operator=( RenderingAttachmentLocationInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    RenderingAttachmentLocationInfoKHR & operator=( RenderingAttachmentLocationInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    RenderingAttachmentLocationInfo & operator=( VkRenderingAttachmentLocationInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    RenderingAttachmentLocationInfoKHR & operator=( VkRenderingAttachmentLocationInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingAttachmentLocationInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingAttachmentLocationInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfo & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfoKHR & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = colorAttachmentCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfo & setPColorAttachmentLocations( const uint32_t * pColorAttachmentLocations_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingAttachmentLocationInfoKHR & setPColorAttachmentLocations( const uint32_t * pColorAttachmentLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentLocations = pColorAttachmentLocations_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingAttachmentLocationInfo &
-      setColorAttachmentLocations( ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentLocations_ ) VULKAN_HPP_NOEXCEPT
+    RenderingAttachmentLocationInfoKHR &
+      setColorAttachmentLocations( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentLocations_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount      = static_cast<uint32_t>( colorAttachmentLocations_.size() );
       pColorAttachmentLocations = colorAttachmentLocations_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkRenderingAttachmentLocationInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkRenderingAttachmentLocationInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( this );
+      return *reinterpret_cast<const VkRenderingAttachmentLocationInfoKHR *>( this );
     }
 
-    operator VkRenderingAttachmentLocationInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkRenderingAttachmentLocationInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkRenderingAttachmentLocationInfo *>( this );
-    }
-
-    operator VkRenderingAttachmentLocationInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingAttachmentLocationInfo *>( this );
-    }
-
-    operator VkRenderingAttachmentLocationInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingAttachmentLocationInfo *>( this );
+      return *reinterpret_cast<VkRenderingAttachmentLocationInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorAttachmentCount, pColorAttachmentLocations );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderingAttachmentLocationInfo const & ) const = default;
+    auto operator<=>( RenderingAttachmentLocationInfoKHR const & ) const = default;
 #else
-    bool operator==( RenderingAttachmentLocationInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( RenderingAttachmentLocationInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -145145,137 +105098,25 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( RenderingAttachmentLocationInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( RenderingAttachmentLocationInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType                     = StructureType::eRenderingAttachmentLocationInfo;
-    const void *     pNext                     = {};
-    uint32_t         colorAttachmentCount      = {};
-    const uint32_t * pColorAttachmentLocations = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::eRenderingAttachmentLocationInfoKHR;
+    const void *                        pNext                     = {};
+    uint32_t                            colorAttachmentCount      = {};
+    const uint32_t *                    pColorAttachmentLocations = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingAttachmentLocationInfo>
-  {
-    using Type = RenderingAttachmentLocationInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eRenderingAttachmentLocationInfo>
+  struct CppType<StructureType, StructureType::eRenderingAttachmentLocationInfoKHR>
   {
-    using Type = RenderingAttachmentLocationInfo;
+    using Type = RenderingAttachmentLocationInfoKHR;
   };
 
-  using RenderingAttachmentLocationInfoKHR = RenderingAttachmentLocationInfo;
-
-  // wrapper struct for struct VkRenderingEndInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingEndInfoKHR.html
-  struct RenderingEndInfoKHR
-  {
-    using NativeType = VkRenderingEndInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingEndInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingEndInfoKHR( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
-
-    VULKAN_HPP_CONSTEXPR RenderingEndInfoKHR( RenderingEndInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    RenderingEndInfoKHR( VkRenderingEndInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : RenderingEndInfoKHR( *reinterpret_cast<RenderingEndInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    RenderingEndInfoKHR & operator=( RenderingEndInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    RenderingEndInfoKHR & operator=( VkRenderingEndInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<RenderingEndInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingEndInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkRenderingEndInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkRenderingEndInfoKHR *>( this );
-    }
-
-    operator VkRenderingEndInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkRenderingEndInfoKHR *>( this );
-    }
-
-    operator VkRenderingEndInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingEndInfoKHR *>( this );
-    }
-
-    operator VkRenderingEndInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingEndInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderingEndInfoKHR const & ) const = default;
-#else
-    bool operator==( RenderingEndInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext );
-#  endif
-    }
-
-    bool operator!=( RenderingEndInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::eRenderingEndInfoKHR;
-    const void *  pNext = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingEndInfoKHR>
-  {
-    using Type = RenderingEndInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eRenderingEndInfoKHR>
-  {
-    using Type = RenderingEndInfoKHR;
-  };
-
-  using RenderingEndInfoEXT = RenderingEndInfoKHR;
-
-  // wrapper struct for struct VkRenderingFragmentDensityMapAttachmentInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingFragmentDensityMapAttachmentInfoEXT.html
   struct RenderingFragmentDensityMapAttachmentInfoEXT
   {
     using NativeType = VkRenderingFragmentDensityMapAttachmentInfoEXT;
@@ -145283,13 +105124,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingFragmentDensityMapAttachmentInfoEXT( ImageView    imageView_   = {},
-                                                                       ImageLayout  imageLayout_ = ImageLayout::eUndefined,
-                                                                       const void * pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageView{ imageView_ }
-      , imageLayout{ imageLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      RenderingFragmentDensityMapAttachmentInfoEXT( VULKAN_HPP_NAMESPACE::ImageView   imageView_   = {},
+                                                    VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                    const void *                      pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageView( imageView_ )
+      , imageLayout( imageLayout_ )
     {
     }
 
@@ -145301,33 +105143,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderingFragmentDensityMapAttachmentInfoEXT & operator=( RenderingFragmentDensityMapAttachmentInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderingFragmentDensityMapAttachmentInfoEXT & operator=( VkRenderingFragmentDensityMapAttachmentInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingFragmentDensityMapAttachmentInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingFragmentDensityMapAttachmentInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderingFragmentDensityMapAttachmentInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentDensityMapAttachmentInfoEXT & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentDensityMapAttachmentInfoEXT & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentDensityMapAttachmentInfoEXT & setImageLayout( ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentDensityMapAttachmentInfoEXT & setImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       imageLayout = imageLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderingFragmentDensityMapAttachmentInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -145339,18 +105181,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderingFragmentDensityMapAttachmentInfoEXT *>( this );
     }
 
-    operator VkRenderingFragmentDensityMapAttachmentInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingFragmentDensityMapAttachmentInfoEXT *>( this );
-    }
-
-    operator VkRenderingFragmentDensityMapAttachmentInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingFragmentDensityMapAttachmentInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageView const &, ImageLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageView, imageLayout );
     }
@@ -145375,28 +105215,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT;
-    const void *  pNext       = {};
-    ImageView     imageView   = {};
-    ImageLayout   imageLayout = ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT;
+    const void *                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::ImageView     imageView   = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout   imageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingFragmentDensityMapAttachmentInfoEXT>
-  {
-    using Type = RenderingFragmentDensityMapAttachmentInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT>
   {
     using Type = RenderingFragmentDensityMapAttachmentInfoEXT;
   };
 
-  // wrapper struct for struct VkRenderingFragmentShadingRateAttachmentInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingFragmentShadingRateAttachmentInfoKHR.html
   struct RenderingFragmentShadingRateAttachmentInfoKHR
   {
     using NativeType = VkRenderingFragmentShadingRateAttachmentInfoKHR;
@@ -145404,15 +105234,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingFragmentShadingRateAttachmentInfoKHR( ImageView    imageView_                      = {},
-                                                                        ImageLayout  imageLayout_                    = ImageLayout::eUndefined,
-                                                                        Extent2D     shadingRateAttachmentTexelSize_ = {},
-                                                                        const void * pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , imageView{ imageView_ }
-      , imageLayout{ imageLayout_ }
-      , shadingRateAttachmentTexelSize{ shadingRateAttachmentTexelSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      RenderingFragmentShadingRateAttachmentInfoKHR( VULKAN_HPP_NAMESPACE::ImageView   imageView_   = {},
+                                                     VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                                     VULKAN_HPP_NAMESPACE::Extent2D    shadingRateAttachmentTexelSize_ = {},
+                                                     const void *                      pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , imageView( imageView_ )
+      , imageLayout( imageLayout_ )
+      , shadingRateAttachmentTexelSize( shadingRateAttachmentTexelSize_ )
     {
     }
 
@@ -145425,40 +105256,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     RenderingFragmentShadingRateAttachmentInfoKHR & operator=( RenderingFragmentShadingRateAttachmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderingFragmentShadingRateAttachmentInfoKHR & operator=( VkRenderingFragmentShadingRateAttachmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingFragmentShadingRateAttachmentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingFragmentShadingRateAttachmentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR & setImageView( ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR & setImageView( VULKAN_HPP_NAMESPACE::ImageView imageView_ ) VULKAN_HPP_NOEXCEPT
     {
       imageView = imageView_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR & setImageLayout( ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR & setImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout imageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       imageLayout = imageLayout_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 RenderingFragmentShadingRateAttachmentInfoKHR &
-      setShadingRateAttachmentTexelSize( Extent2D const & shadingRateAttachmentTexelSize_ ) VULKAN_HPP_NOEXCEPT
+      setShadingRateAttachmentTexelSize( VULKAN_HPP_NAMESPACE::Extent2D const & shadingRateAttachmentTexelSize_ ) VULKAN_HPP_NOEXCEPT
     {
       shadingRateAttachmentTexelSize = shadingRateAttachmentTexelSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderingFragmentShadingRateAttachmentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -145470,18 +105301,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderingFragmentShadingRateAttachmentInfoKHR *>( this );
     }
 
-    operator VkRenderingFragmentShadingRateAttachmentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingFragmentShadingRateAttachmentInfoKHR *>( this );
-    }
-
-    operator VkRenderingFragmentShadingRateAttachmentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingFragmentShadingRateAttachmentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageView const &, ImageLayout const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, imageView, imageLayout, shadingRateAttachmentTexelSize );
     }
@@ -145507,28 +105337,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                          = StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR;
-    const void *  pNext                          = {};
-    ImageView     imageView                      = {};
-    ImageLayout   imageLayout                    = ImageLayout::eUndefined;
-    Extent2D      shadingRateAttachmentTexelSize = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                          = StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR;
+    const void *                        pNext                          = {};
+    VULKAN_HPP_NAMESPACE::ImageView     imageView                      = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout   imageLayout                    = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Extent2D      shadingRateAttachmentTexelSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingFragmentShadingRateAttachmentInfoKHR>
-  {
-    using Type = RenderingFragmentShadingRateAttachmentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR>
   {
     using Type = RenderingFragmentShadingRateAttachmentInfoKHR;
   };
 
-  // wrapper struct for struct VkRenderingInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingInfo.html
   struct RenderingInfo
   {
     using NativeType = VkRenderingInfo;
@@ -145536,25 +105357,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo( RenderingFlags                  flags_                = {},
-                                           Rect2D                          renderArea_           = {},
-                                           uint32_t                        layerCount_           = {},
-                                           uint32_t                        viewMask_             = {},
-                                           uint32_t                        colorAttachmentCount_ = {},
-                                           const RenderingAttachmentInfo * pColorAttachments_    = {},
-                                           const RenderingAttachmentInfo * pDepthAttachment_     = {},
-                                           const RenderingAttachmentInfo * pStencilAttachment_   = {},
-                                           const void *                    pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , renderArea{ renderArea_ }
-      , layerCount{ layerCount_ }
-      , viewMask{ viewMask_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachments{ pColorAttachments_ }
-      , pDepthAttachment{ pDepthAttachment_ }
-      , pStencilAttachment{ pStencilAttachment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo( VULKAN_HPP_NAMESPACE::RenderingFlags                  flags_                = {},
+                                           VULKAN_HPP_NAMESPACE::Rect2D                          renderArea_           = {},
+                                           uint32_t                                              layerCount_           = {},
+                                           uint32_t                                              viewMask_             = {},
+                                           uint32_t                                              colorAttachmentCount_ = {},
+                                           const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pColorAttachments_    = {},
+                                           const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pDepthAttachment_     = {},
+                                           const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pStencilAttachment_   = {},
+                                           const void *                                          pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , renderArea( renderArea_ )
+      , layerCount( layerCount_ )
+      , viewMask( viewMask_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachments( pColorAttachments_ )
+      , pDepthAttachment( pDepthAttachment_ )
+      , pStencilAttachment( pStencilAttachment_ )
     {
     }
 
@@ -145563,14 +105384,14 @@ namespace VULKAN_HPP_NAMESPACE
     RenderingInfo( VkRenderingInfo const & rhs ) VULKAN_HPP_NOEXCEPT : RenderingInfo( *reinterpret_cast<RenderingInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingInfo( RenderingFlags                                                 flags_,
-                   Rect2D                                                         renderArea_,
-                   uint32_t                                                       layerCount_,
-                   uint32_t                                                       viewMask_,
-                   ArrayProxyNoTemporaries<const RenderingAttachmentInfo> const & colorAttachments_,
-                   const RenderingAttachmentInfo *                                pDepthAttachment_   = {},
-                   const RenderingAttachmentInfo *                                pStencilAttachment_ = {},
-                   const void *                                                   pNext_              = nullptr )
+    RenderingInfo( VULKAN_HPP_NAMESPACE::RenderingFlags                                                                       flags_,
+                   VULKAN_HPP_NAMESPACE::Rect2D                                                                               renderArea_,
+                   uint32_t                                                                                                   layerCount_,
+                   uint32_t                                                                                                   viewMask_,
+                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo> const & colorAttachments_,
+                   const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo *                                                      pDepthAttachment_   = {},
+                   const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo *                                                      pStencilAttachment_ = {},
+                   const void *                                                                                               pNext_              = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , renderArea( renderArea_ )
@@ -145585,28 +105406,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     RenderingInfo & operator=( RenderingInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     RenderingInfo & operator=( VkRenderingInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setFlags( RenderingFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setFlags( VULKAN_HPP_NAMESPACE::RenderingFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setRenderArea( Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setRenderArea( VULKAN_HPP_NAMESPACE::Rect2D const & renderArea_ ) VULKAN_HPP_NOEXCEPT
     {
       renderArea = renderArea_;
       return *this;
@@ -145630,14 +105451,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPColorAttachments( const RenderingAttachmentInfo * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPColorAttachments( const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pColorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachments = pColorAttachments_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingInfo & setColorAttachments( ArrayProxyNoTemporaries<const RenderingAttachmentInfo> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
+    RenderingInfo & setColorAttachments(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo> const & colorAttachments_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = static_cast<uint32_t>( colorAttachments_.size() );
       pColorAttachments    = colorAttachments_.data();
@@ -145645,18 +105467,19 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPDepthAttachment( const RenderingAttachmentInfo * pDepthAttachment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPDepthAttachment( const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pDepthAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthAttachment = pDepthAttachment_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInfo & setPStencilAttachment( const RenderingAttachmentInfo * pStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInfo &
+      setPStencilAttachment( const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pStencilAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pStencilAttachment = pStencilAttachment_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkRenderingInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -145668,27 +105491,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkRenderingInfo *>( this );
     }
 
-    operator VkRenderingInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingInfo *>( this );
-    }
-
-    operator VkRenderingInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               RenderingFlags const &,
-               Rect2D const &,
+               VULKAN_HPP_NAMESPACE::RenderingFlags const &,
+               VULKAN_HPP_NAMESPACE::Rect2D const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               const RenderingAttachmentInfo * const &,
-               const RenderingAttachmentInfo * const &,
-               const RenderingAttachmentInfo * const &>
+               const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * const &,
+               const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * const &,
+               const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, renderArea, layerCount, viewMask, colorAttachmentCount, pColorAttachments, pDepthAttachment, pStencilAttachment );
@@ -145716,26 +105533,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                = StructureType::eRenderingInfo;
-    const void *                    pNext                = {};
-    RenderingFlags                  flags                = {};
-    Rect2D                          renderArea           = {};
-    uint32_t                        layerCount           = {};
-    uint32_t                        viewMask             = {};
-    uint32_t                        colorAttachmentCount = {};
-    const RenderingAttachmentInfo * pColorAttachments    = {};
-    const RenderingAttachmentInfo * pDepthAttachment     = {};
-    const RenderingAttachmentInfo * pStencilAttachment   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                = StructureType::eRenderingInfo;
+    const void *                                          pNext                = {};
+    VULKAN_HPP_NAMESPACE::RenderingFlags                  flags                = {};
+    VULKAN_HPP_NAMESPACE::Rect2D                          renderArea           = {};
+    uint32_t                                              layerCount           = {};
+    uint32_t                                              viewMask             = {};
+    uint32_t                                              colorAttachmentCount = {};
+    const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pColorAttachments    = {};
+    const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pDepthAttachment     = {};
+    const VULKAN_HPP_NAMESPACE::RenderingAttachmentInfo * pStencilAttachment   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingInfo>
-  {
-    using Type = RenderingInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eRenderingInfo>
   {
@@ -145744,41 +105553,39 @@ namespace VULKAN_HPP_NAMESPACE
 
   using RenderingInfoKHR = RenderingInfo;
 
-  // wrapper struct for struct VkRenderingInputAttachmentIndexInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkRenderingInputAttachmentIndexInfo.html
-  struct RenderingInputAttachmentIndexInfo
+  struct RenderingInputAttachmentIndexInfoKHR
   {
-    using NativeType = VkRenderingInputAttachmentIndexInfo;
+    using NativeType = VkRenderingInputAttachmentIndexInfoKHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingInputAttachmentIndexInfo;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eRenderingInputAttachmentIndexInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR RenderingInputAttachmentIndexInfo( uint32_t         colorAttachmentCount_         = {},
-                                                            const uint32_t * pColorAttachmentInputIndices_ = {},
-                                                            const uint32_t * pDepthInputAttachmentIndex_   = {},
-                                                            const uint32_t * pStencilInputAttachmentIndex_ = {},
-                                                            const void *     pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , colorAttachmentCount{ colorAttachmentCount_ }
-      , pColorAttachmentInputIndices{ pColorAttachmentInputIndices_ }
-      , pDepthInputAttachmentIndex{ pDepthInputAttachmentIndex_ }
-      , pStencilInputAttachmentIndex{ pStencilInputAttachmentIndex_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR RenderingInputAttachmentIndexInfoKHR( uint32_t         colorAttachmentCount_         = {},
+                                                               const uint32_t * pColorAttachmentInputIndices_ = {},
+                                                               const uint32_t * pDepthInputAttachmentIndex_   = {},
+                                                               const uint32_t * pStencilInputAttachmentIndex_ = {},
+                                                               const void *     pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , colorAttachmentCount( colorAttachmentCount_ )
+      , pColorAttachmentInputIndices( pColorAttachmentInputIndices_ )
+      , pDepthInputAttachmentIndex( pDepthInputAttachmentIndex_ )
+      , pStencilInputAttachmentIndex( pStencilInputAttachmentIndex_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR RenderingInputAttachmentIndexInfo( RenderingInputAttachmentIndexInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR RenderingInputAttachmentIndexInfoKHR( RenderingInputAttachmentIndexInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    RenderingInputAttachmentIndexInfo( VkRenderingInputAttachmentIndexInfo const & rhs ) VULKAN_HPP_NOEXCEPT
-      : RenderingInputAttachmentIndexInfo( *reinterpret_cast<RenderingInputAttachmentIndexInfo const *>( &rhs ) )
+    RenderingInputAttachmentIndexInfoKHR( VkRenderingInputAttachmentIndexInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : RenderingInputAttachmentIndexInfoKHR( *reinterpret_cast<RenderingInputAttachmentIndexInfoKHR const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingInputAttachmentIndexInfo( ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentInputIndices_,
-                                       const uint32_t *                                pDepthInputAttachmentIndex_   = {},
-                                       const uint32_t *                                pStencilInputAttachmentIndex_ = {},
-                                       const void *                                    pNext_                        = nullptr )
+    RenderingInputAttachmentIndexInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentInputIndices_,
+                                          const uint32_t *                                                      pDepthInputAttachmentIndex_   = {},
+                                          const uint32_t *                                                      pStencilInputAttachmentIndex_ = {},
+                                          const void *                                                          pNext_                        = nullptr )
       : pNext( pNext_ )
       , colorAttachmentCount( static_cast<uint32_t>( colorAttachmentInputIndices_.size() ) )
       , pColorAttachmentInputIndices( colorAttachmentInputIndices_.data() )
@@ -145788,29 +105595,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    RenderingInputAttachmentIndexInfo & operator=( RenderingInputAttachmentIndexInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    RenderingInputAttachmentIndexInfoKHR & operator=( RenderingInputAttachmentIndexInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    RenderingInputAttachmentIndexInfo & operator=( VkRenderingInputAttachmentIndexInfo const & rhs ) VULKAN_HPP_NOEXCEPT
+    RenderingInputAttachmentIndexInfoKHR & operator=( VkRenderingInputAttachmentIndexInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<RenderingInputAttachmentIndexInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::RenderingInputAttachmentIndexInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfo & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfoKHR & setColorAttachmentCount( uint32_t colorAttachmentCount_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount = colorAttachmentCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfo &
+    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfoKHR &
       setPColorAttachmentInputIndices( const uint32_t * pColorAttachmentInputIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       pColorAttachmentInputIndices = pColorAttachmentInputIndices_;
@@ -145818,8 +105625,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    RenderingInputAttachmentIndexInfo &
-      setColorAttachmentInputIndices( ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentInputIndices_ ) VULKAN_HPP_NOEXCEPT
+    RenderingInputAttachmentIndexInfoKHR &
+      setColorAttachmentInputIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & colorAttachmentInputIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       colorAttachmentCount         = static_cast<uint32_t>( colorAttachmentInputIndices_.size() );
       pColorAttachmentInputIndices = colorAttachmentInputIndices_.data();
@@ -145827,43 +105634,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfo &
+    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfoKHR &
       setPDepthInputAttachmentIndex( const uint32_t * pDepthInputAttachmentIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthInputAttachmentIndex = pDepthInputAttachmentIndex_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfo &
+    VULKAN_HPP_CONSTEXPR_14 RenderingInputAttachmentIndexInfoKHR &
       setPStencilInputAttachmentIndex( const uint32_t * pStencilInputAttachmentIndex_ ) VULKAN_HPP_NOEXCEPT
     {
       pStencilInputAttachmentIndex = pStencilInputAttachmentIndex_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkRenderingInputAttachmentIndexInfo const &() const VULKAN_HPP_NOEXCEPT
+    operator VkRenderingInputAttachmentIndexInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( this );
+      return *reinterpret_cast<const VkRenderingInputAttachmentIndexInfoKHR *>( this );
     }
 
-    operator VkRenderingInputAttachmentIndexInfo &() VULKAN_HPP_NOEXCEPT
+    operator VkRenderingInputAttachmentIndexInfoKHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkRenderingInputAttachmentIndexInfo *>( this );
-    }
-
-    operator VkRenderingInputAttachmentIndexInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkRenderingInputAttachmentIndexInfo *>( this );
-    }
-
-    operator VkRenderingInputAttachmentIndexInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkRenderingInputAttachmentIndexInfo *>( this );
+      return *reinterpret_cast<VkRenderingInputAttachmentIndexInfoKHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint32_t * const &, const uint32_t * const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const uint32_t * const &,
+               const uint32_t * const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, colorAttachmentCount, pColorAttachmentInputIndices, pDepthInputAttachmentIndex, pStencilInputAttachmentIndex );
@@ -145871,9 +105677,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( RenderingInputAttachmentIndexInfo const & ) const = default;
+    auto operator<=>( RenderingInputAttachmentIndexInfoKHR const & ) const = default;
 #else
-    bool operator==( RenderingInputAttachmentIndexInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( RenderingInputAttachmentIndexInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -145884,38 +105690,27 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( RenderingInputAttachmentIndexInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( RenderingInputAttachmentIndexInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType                        = StructureType::eRenderingInputAttachmentIndexInfo;
-    const void *     pNext                        = {};
-    uint32_t         colorAttachmentCount         = {};
-    const uint32_t * pColorAttachmentInputIndices = {};
-    const uint32_t * pDepthInputAttachmentIndex   = {};
-    const uint32_t * pStencilInputAttachmentIndex = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::eRenderingInputAttachmentIndexInfoKHR;
+    const void *                        pNext                        = {};
+    uint32_t                            colorAttachmentCount         = {};
+    const uint32_t *                    pColorAttachmentInputIndices = {};
+    const uint32_t *                    pDepthInputAttachmentIndex   = {};
+    const uint32_t *                    pStencilInputAttachmentIndex = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkRenderingInputAttachmentIndexInfo>
-  {
-    using Type = RenderingInputAttachmentIndexInfo;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eRenderingInputAttachmentIndexInfo>
+  struct CppType<StructureType, StructureType::eRenderingInputAttachmentIndexInfoKHR>
   {
-    using Type = RenderingInputAttachmentIndexInfo;
+    using Type = RenderingInputAttachmentIndexInfoKHR;
   };
 
-  using RenderingInputAttachmentIndexInfoKHR = RenderingInputAttachmentIndexInfo;
-
-  // wrapper struct for struct VkResolveImageInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveImageInfo2.html
   struct ResolveImageInfo2
   {
     using NativeType = VkResolveImageInfo2;
@@ -145923,21 +105718,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eResolveImageInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ResolveImageInfo2( Image                 srcImage_       = {},
-                                            ImageLayout           srcImageLayout_ = ImageLayout::eUndefined,
-                                            Image                 dstImage_       = {},
-                                            ImageLayout           dstImageLayout_ = ImageLayout::eUndefined,
-                                            uint32_t              regionCount_    = {},
-                                            const ImageResolve2 * pRegions_       = {},
-                                            const void *          pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcImage{ srcImage_ }
-      , srcImageLayout{ srcImageLayout_ }
-      , dstImage{ dstImage_ }
-      , dstImageLayout{ dstImageLayout_ }
-      , regionCount{ regionCount_ }
-      , pRegions{ pRegions_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ResolveImageInfo2( VULKAN_HPP_NAMESPACE::Image                 srcImage_       = {},
+                                            VULKAN_HPP_NAMESPACE::ImageLayout           srcImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                            VULKAN_HPP_NAMESPACE::Image                 dstImage_       = {},
+                                            VULKAN_HPP_NAMESPACE::ImageLayout           dstImageLayout_ = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined,
+                                            uint32_t                                    regionCount_    = {},
+                                            const VULKAN_HPP_NAMESPACE::ImageResolve2 * pRegions_       = {},
+                                            const void *                                pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , srcImage( srcImage_ )
+      , srcImageLayout( srcImageLayout_ )
+      , dstImage( dstImage_ )
+      , dstImageLayout( dstImageLayout_ )
+      , regionCount( regionCount_ )
+      , pRegions( pRegions_ )
     {
     }
 
@@ -145946,12 +105741,12 @@ namespace VULKAN_HPP_NAMESPACE
     ResolveImageInfo2( VkResolveImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : ResolveImageInfo2( *reinterpret_cast<ResolveImageInfo2 const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ResolveImageInfo2( Image                                                srcImage_,
-                       ImageLayout                                          srcImageLayout_,
-                       Image                                                dstImage_,
-                       ImageLayout                                          dstImageLayout_,
-                       ArrayProxyNoTemporaries<const ImageResolve2> const & regions_,
-                       const void *                                         pNext_ = nullptr )
+    ResolveImageInfo2( VULKAN_HPP_NAMESPACE::Image                                                                      srcImage_,
+                       VULKAN_HPP_NAMESPACE::ImageLayout                                                                srcImageLayout_,
+                       VULKAN_HPP_NAMESPACE::Image                                                                      dstImage_,
+                       VULKAN_HPP_NAMESPACE::ImageLayout                                                                dstImageLayout_,
+                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageResolve2> const & regions_,
+                       const void *                                                                                     pNext_ = nullptr )
       : pNext( pNext_ )
       , srcImage( srcImage_ )
       , srcImageLayout( srcImageLayout_ )
@@ -145964,40 +105759,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ResolveImageInfo2 & operator=( ResolveImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ResolveImageInfo2 & operator=( VkResolveImageInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ResolveImageInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ResolveImageInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setSrcImage( Image srcImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setSrcImage( VULKAN_HPP_NAMESPACE::Image srcImage_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImage = srcImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setSrcImageLayout( ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setSrcImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout srcImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       srcImageLayout = srcImageLayout_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setDstImage( Image dstImage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setDstImage( VULKAN_HPP_NAMESPACE::Image dstImage_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImage = dstImage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setDstImageLayout( ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setDstImageLayout( VULKAN_HPP_NAMESPACE::ImageLayout dstImageLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       dstImageLayout = dstImageLayout_;
       return *this;
@@ -146009,21 +105804,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setPRegions( const ImageResolve2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ResolveImageInfo2 & setPRegions( const VULKAN_HPP_NAMESPACE::ImageResolve2 * pRegions_ ) VULKAN_HPP_NOEXCEPT
     {
       pRegions = pRegions_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ResolveImageInfo2 & setRegions( ArrayProxyNoTemporaries<const ImageResolve2> const & regions_ ) VULKAN_HPP_NOEXCEPT
+    ResolveImageInfo2 &
+      setRegions( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ImageResolve2> const & regions_ ) VULKAN_HPP_NOEXCEPT
     {
       regionCount = static_cast<uint32_t>( regions_.size() );
       pRegions    = regions_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkResolveImageInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146035,25 +105831,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkResolveImageInfo2 *>( this );
     }
 
-    operator VkResolveImageInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkResolveImageInfo2 *>( this );
-    }
-
-    operator VkResolveImageInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkResolveImageInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Image const &,
-               ImageLayout const &,
-               Image const &,
-               ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
+               VULKAN_HPP_NAMESPACE::Image const &,
+               VULKAN_HPP_NAMESPACE::ImageLayout const &,
                uint32_t const &,
-               const ImageResolve2 * const &>
+               const VULKAN_HPP_NAMESPACE::ImageResolve2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions );
@@ -146080,24 +105870,16 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType         sType          = StructureType::eResolveImageInfo2;
-    const void *          pNext          = {};
-    Image                 srcImage       = {};
-    ImageLayout           srcImageLayout = ImageLayout::eUndefined;
-    Image                 dstImage       = {};
-    ImageLayout           dstImageLayout = ImageLayout::eUndefined;
-    uint32_t              regionCount    = {};
-    const ImageResolve2 * pRegions       = {};
+    VULKAN_HPP_NAMESPACE::StructureType         sType          = StructureType::eResolveImageInfo2;
+    const void *                                pNext          = {};
+    VULKAN_HPP_NAMESPACE::Image                 srcImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           srcImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    VULKAN_HPP_NAMESPACE::Image                 dstImage       = {};
+    VULKAN_HPP_NAMESPACE::ImageLayout           dstImageLayout = VULKAN_HPP_NAMESPACE::ImageLayout::eUndefined;
+    uint32_t                                    regionCount    = {};
+    const VULKAN_HPP_NAMESPACE::ImageResolve2 * pRegions       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkResolveImageInfo2>
-  {
-    using Type = ResolveImageInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eResolveImageInfo2>
   {
@@ -146106,139 +105888,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using ResolveImageInfo2KHR = ResolveImageInfo2;
 
-  // wrapper struct for struct VkResolveImageModeInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkResolveImageModeInfoKHR.html
-  struct ResolveImageModeInfoKHR
-  {
-    using NativeType = VkResolveImageModeInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eResolveImageModeInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ResolveImageModeInfoKHR( ResolveImageFlagsKHR flags_              = {},
-                                                  ResolveModeFlagBits  resolveMode_        = ResolveModeFlagBits::eNone,
-                                                  ResolveModeFlagBits  stencilResolveMode_ = ResolveModeFlagBits::eNone,
-                                                  const void *         pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , resolveMode{ resolveMode_ }
-      , stencilResolveMode{ stencilResolveMode_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR ResolveImageModeInfoKHR( ResolveImageModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    ResolveImageModeInfoKHR( VkResolveImageModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : ResolveImageModeInfoKHR( *reinterpret_cast<ResolveImageModeInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    ResolveImageModeInfoKHR & operator=( ResolveImageModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    ResolveImageModeInfoKHR & operator=( VkResolveImageModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<ResolveImageModeInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageModeInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageModeInfoKHR & setFlags( ResolveImageFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageModeInfoKHR & setResolveMode( ResolveModeFlagBits resolveMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      resolveMode = resolveMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 ResolveImageModeInfoKHR & setStencilResolveMode( ResolveModeFlagBits stencilResolveMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stencilResolveMode = stencilResolveMode_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkResolveImageModeInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkResolveImageModeInfoKHR *>( this );
-    }
-
-    operator VkResolveImageModeInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkResolveImageModeInfoKHR *>( this );
-    }
-
-    operator VkResolveImageModeInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkResolveImageModeInfoKHR *>( this );
-    }
-
-    operator VkResolveImageModeInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkResolveImageModeInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ResolveImageFlagsKHR const &, ResolveModeFlagBits const &, ResolveModeFlagBits const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, resolveMode, stencilResolveMode );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( ResolveImageModeInfoKHR const & ) const = default;
-#else
-    bool operator==( ResolveImageModeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( resolveMode == rhs.resolveMode ) &&
-             ( stencilResolveMode == rhs.stencilResolveMode );
-#  endif
-    }
-
-    bool operator!=( ResolveImageModeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType        sType              = StructureType::eResolveImageModeInfoKHR;
-    const void *         pNext              = {};
-    ResolveImageFlagsKHR flags              = {};
-    ResolveModeFlagBits  resolveMode        = ResolveModeFlagBits::eNone;
-    ResolveModeFlagBits  stencilResolveMode = ResolveModeFlagBits::eNone;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkResolveImageModeInfoKHR>
-  {
-    using Type = ResolveImageModeInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eResolveImageModeInfoKHR>
-  {
-    using Type = ResolveImageModeInfoKHR;
-  };
-
-  // wrapper struct for struct VkSamplerBlockMatchWindowCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerBlockMatchWindowCreateInfoQCOM.html
   struct SamplerBlockMatchWindowCreateInfoQCOM
   {
     using NativeType = VkSamplerBlockMatchWindowCreateInfoQCOM;
@@ -146246,13 +105895,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerBlockMatchWindowCreateInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerBlockMatchWindowCreateInfoQCOM( Extent2D                        windowExtent_      = {},
-                                                                BlockMatchWindowCompareModeQCOM windowCompareMode_ = BlockMatchWindowCompareModeQCOM::eMin,
-                                                                const void *                    pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , windowExtent{ windowExtent_ }
-      , windowCompareMode{ windowCompareMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerBlockMatchWindowCreateInfoQCOM(
+      VULKAN_HPP_NAMESPACE::Extent2D                        windowExtent_      = {},
+      VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM windowCompareMode_ = VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM::eMin,
+      const void *                                          pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , windowExtent( windowExtent_ )
+      , windowCompareMode( windowCompareMode_ )
     {
     }
 
@@ -146264,34 +105914,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerBlockMatchWindowCreateInfoQCOM & operator=( SamplerBlockMatchWindowCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerBlockMatchWindowCreateInfoQCOM & operator=( VkSamplerBlockMatchWindowCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerBlockMatchWindowCreateInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerBlockMatchWindowCreateInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerBlockMatchWindowCreateInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerBlockMatchWindowCreateInfoQCOM & setWindowExtent( Extent2D const & windowExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerBlockMatchWindowCreateInfoQCOM & setWindowExtent( VULKAN_HPP_NAMESPACE::Extent2D const & windowExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       windowExtent = windowExtent_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 SamplerBlockMatchWindowCreateInfoQCOM &
-      setWindowCompareMode( BlockMatchWindowCompareModeQCOM windowCompareMode_ ) VULKAN_HPP_NOEXCEPT
+      setWindowCompareMode( VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM windowCompareMode_ ) VULKAN_HPP_NOEXCEPT
     {
       windowCompareMode = windowCompareMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerBlockMatchWindowCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146303,18 +105953,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerBlockMatchWindowCreateInfoQCOM *>( this );
     }
 
-    operator VkSamplerBlockMatchWindowCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerBlockMatchWindowCreateInfoQCOM *>( this );
-    }
-
-    operator VkSamplerBlockMatchWindowCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerBlockMatchWindowCreateInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Extent2D const &, BlockMatchWindowCompareModeQCOM const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, windowExtent, windowCompareMode );
     }
@@ -146339,28 +105987,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType             = StructureType::eSamplerBlockMatchWindowCreateInfoQCOM;
-    const void *                    pNext             = {};
-    Extent2D                        windowExtent      = {};
-    BlockMatchWindowCompareModeQCOM windowCompareMode = BlockMatchWindowCompareModeQCOM::eMin;
+    VULKAN_HPP_NAMESPACE::StructureType                   sType             = StructureType::eSamplerBlockMatchWindowCreateInfoQCOM;
+    const void *                                          pNext             = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                        windowExtent      = {};
+    VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM windowCompareMode = VULKAN_HPP_NAMESPACE::BlockMatchWindowCompareModeQCOM::eMin;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerBlockMatchWindowCreateInfoQCOM>
-  {
-    using Type = SamplerBlockMatchWindowCreateInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerBlockMatchWindowCreateInfoQCOM>
   {
     using Type = SamplerBlockMatchWindowCreateInfoQCOM;
   };
 
-  // wrapper struct for struct VkSamplerBorderColorComponentMappingCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerBorderColorComponentMappingCreateInfoEXT.html
   struct SamplerBorderColorComponentMappingCreateInfoEXT
   {
     using NativeType = VkSamplerBorderColorComponentMappingCreateInfoEXT;
@@ -146368,12 +106006,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SamplerBorderColorComponentMappingCreateInfoEXT( ComponentMapping components_ = {}, Bool32 srgb_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , components{ components_ }
-      , srgb{ srgb_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerBorderColorComponentMappingCreateInfoEXT( VULKAN_HPP_NAMESPACE::ComponentMapping components_ = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32           srgb_       = {},
+                                                                          const void *                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , components( components_ )
+      , srgb( srgb_ )
     {
     }
 
@@ -146386,33 +106025,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerBorderColorComponentMappingCreateInfoEXT & operator=( SamplerBorderColorComponentMappingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerBorderColorComponentMappingCreateInfoEXT & operator=( VkSamplerBorderColorComponentMappingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerBorderColorComponentMappingCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerBorderColorComponentMappingCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerBorderColorComponentMappingCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerBorderColorComponentMappingCreateInfoEXT & setComponents( ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerBorderColorComponentMappingCreateInfoEXT &
+      setComponents( VULKAN_HPP_NAMESPACE::ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
     {
       components = components_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerBorderColorComponentMappingCreateInfoEXT & setSrgb( Bool32 srgb_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerBorderColorComponentMappingCreateInfoEXT & setSrgb( VULKAN_HPP_NAMESPACE::Bool32 srgb_ ) VULKAN_HPP_NOEXCEPT
     {
       srgb = srgb_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerBorderColorComponentMappingCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146424,18 +106064,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerBorderColorComponentMappingCreateInfoEXT *>( this );
     }
 
-    operator VkSamplerBorderColorComponentMappingCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerBorderColorComponentMappingCreateInfoEXT *>( this );
-    }
-
-    operator VkSamplerBorderColorComponentMappingCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerBorderColorComponentMappingCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ComponentMapping const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, components, srgb );
     }
@@ -146460,28 +106098,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType      = StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT;
-    const void *     pNext      = {};
-    ComponentMapping components = {};
-    Bool32           srgb       = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType      = StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT;
+    const void *                           pNext      = {};
+    VULKAN_HPP_NAMESPACE::ComponentMapping components = {};
+    VULKAN_HPP_NAMESPACE::Bool32           srgb       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerBorderColorComponentMappingCreateInfoEXT>
-  {
-    using Type = SamplerBorderColorComponentMappingCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT>
   {
     using Type = SamplerBorderColorComponentMappingCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkSamplerCaptureDescriptorDataInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCaptureDescriptorDataInfoEXT.html
   struct SamplerCaptureDescriptorDataInfoEXT
   {
     using NativeType = VkSamplerCaptureDescriptorDataInfoEXT;
@@ -146489,10 +106117,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerCaptureDescriptorDataInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerCaptureDescriptorDataInfoEXT( Sampler sampler_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sampler{ sampler_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerCaptureDescriptorDataInfoEXT( VULKAN_HPP_NAMESPACE::Sampler sampler_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sampler( sampler_ )
     {
     }
 
@@ -146504,27 +106132,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerCaptureDescriptorDataInfoEXT & operator=( SamplerCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerCaptureDescriptorDataInfoEXT & operator=( VkSamplerCaptureDescriptorDataInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerCaptureDescriptorDataInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerCaptureDescriptorDataInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerCaptureDescriptorDataInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCaptureDescriptorDataInfoEXT & setSampler( Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCaptureDescriptorDataInfoEXT & setSampler( VULKAN_HPP_NAMESPACE::Sampler sampler_ ) VULKAN_HPP_NOEXCEPT
     {
       sampler = sampler_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerCaptureDescriptorDataInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146536,18 +106164,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerCaptureDescriptorDataInfoEXT *>( this );
     }
 
-    operator VkSamplerCaptureDescriptorDataInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerCaptureDescriptorDataInfoEXT *>( this );
-    }
-
-    operator VkSamplerCaptureDescriptorDataInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerCaptureDescriptorDataInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Sampler const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Sampler const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sampler );
     }
@@ -146572,26 +106195,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType   = StructureType::eSamplerCaptureDescriptorDataInfoEXT;
-    const void *  pNext   = {};
-    Sampler       sampler = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType   = StructureType::eSamplerCaptureDescriptorDataInfoEXT;
+    const void *                        pNext   = {};
+    VULKAN_HPP_NAMESPACE::Sampler       sampler = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerCaptureDescriptorDataInfoEXT>
-  {
-    using Type = SamplerCaptureDescriptorDataInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerCaptureDescriptorDataInfoEXT>
   {
     using Type = SamplerCaptureDescriptorDataInfoEXT;
   };
 
-  // wrapper struct for struct VkSamplerCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCreateInfo.html
   struct SamplerCreateInfo
   {
     using NativeType = VkSamplerCreateInfo;
@@ -146599,41 +106213,41 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerCreateInfo( SamplerCreateFlags flags_                   = {},
-                                            Filter             magFilter_               = Filter::eNearest,
-                                            Filter             minFilter_               = Filter::eNearest,
-                                            SamplerMipmapMode  mipmapMode_              = SamplerMipmapMode::eNearest,
-                                            SamplerAddressMode addressModeU_            = SamplerAddressMode::eRepeat,
-                                            SamplerAddressMode addressModeV_            = SamplerAddressMode::eRepeat,
-                                            SamplerAddressMode addressModeW_            = SamplerAddressMode::eRepeat,
-                                            float              mipLodBias_              = {},
-                                            Bool32             anisotropyEnable_        = {},
-                                            float              maxAnisotropy_           = {},
-                                            Bool32             compareEnable_           = {},
-                                            CompareOp          compareOp_               = CompareOp::eNever,
-                                            float              minLod_                  = {},
-                                            float              maxLod_                  = {},
-                                            BorderColor        borderColor_             = BorderColor::eFloatTransparentBlack,
-                                            Bool32             unnormalizedCoordinates_ = {},
-                                            const void *       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , magFilter{ magFilter_ }
-      , minFilter{ minFilter_ }
-      , mipmapMode{ mipmapMode_ }
-      , addressModeU{ addressModeU_ }
-      , addressModeV{ addressModeV_ }
-      , addressModeW{ addressModeW_ }
-      , mipLodBias{ mipLodBias_ }
-      , anisotropyEnable{ anisotropyEnable_ }
-      , maxAnisotropy{ maxAnisotropy_ }
-      , compareEnable{ compareEnable_ }
-      , compareOp{ compareOp_ }
-      , minLod{ minLod_ }
-      , maxLod{ maxLod_ }
-      , borderColor{ borderColor_ }
-      , unnormalizedCoordinates{ unnormalizedCoordinates_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerCreateInfo( VULKAN_HPP_NAMESPACE::SamplerCreateFlags flags_            = {},
+                                            VULKAN_HPP_NAMESPACE::Filter             magFilter_        = VULKAN_HPP_NAMESPACE::Filter::eNearest,
+                                            VULKAN_HPP_NAMESPACE::Filter             minFilter_        = VULKAN_HPP_NAMESPACE::Filter::eNearest,
+                                            VULKAN_HPP_NAMESPACE::SamplerMipmapMode  mipmapMode_       = VULKAN_HPP_NAMESPACE::SamplerMipmapMode::eNearest,
+                                            VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeU_     = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat,
+                                            VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeV_     = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat,
+                                            VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeW_     = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat,
+                                            float                                    mipLodBias_       = {},
+                                            VULKAN_HPP_NAMESPACE::Bool32             anisotropyEnable_ = {},
+                                            float                                    maxAnisotropy_    = {},
+                                            VULKAN_HPP_NAMESPACE::Bool32             compareEnable_    = {},
+                                            VULKAN_HPP_NAMESPACE::CompareOp          compareOp_        = VULKAN_HPP_NAMESPACE::CompareOp::eNever,
+                                            float                                    minLod_           = {},
+                                            float                                    maxLod_           = {},
+                                            VULKAN_HPP_NAMESPACE::BorderColor        borderColor_ = VULKAN_HPP_NAMESPACE::BorderColor::eFloatTransparentBlack,
+                                            VULKAN_HPP_NAMESPACE::Bool32             unnormalizedCoordinates_ = {},
+                                            const void *                             pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , magFilter( magFilter_ )
+      , minFilter( minFilter_ )
+      , mipmapMode( mipmapMode_ )
+      , addressModeU( addressModeU_ )
+      , addressModeV( addressModeV_ )
+      , addressModeW( addressModeW_ )
+      , mipLodBias( mipLodBias_ )
+      , anisotropyEnable( anisotropyEnable_ )
+      , maxAnisotropy( maxAnisotropy_ )
+      , compareEnable( compareEnable_ )
+      , compareOp( compareOp_ )
+      , minLod( minLod_ )
+      , maxLod( maxLod_ )
+      , borderColor( borderColor_ )
+      , unnormalizedCoordinates( unnormalizedCoordinates_ )
     {
     }
 
@@ -146642,58 +106256,58 @@ namespace VULKAN_HPP_NAMESPACE
     SamplerCreateInfo( VkSamplerCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : SamplerCreateInfo( *reinterpret_cast<SamplerCreateInfo const *>( &rhs ) ) {}
 
     SamplerCreateInfo & operator=( SamplerCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerCreateInfo & operator=( VkSamplerCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setFlags( SamplerCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::SamplerCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMagFilter( Filter magFilter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMagFilter( VULKAN_HPP_NAMESPACE::Filter magFilter_ ) VULKAN_HPP_NOEXCEPT
     {
       magFilter = magFilter_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMinFilter( Filter minFilter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMinFilter( VULKAN_HPP_NAMESPACE::Filter minFilter_ ) VULKAN_HPP_NOEXCEPT
     {
       minFilter = minFilter_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMipmapMode( SamplerMipmapMode mipmapMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setMipmapMode( VULKAN_HPP_NAMESPACE::SamplerMipmapMode mipmapMode_ ) VULKAN_HPP_NOEXCEPT
     {
       mipmapMode = mipmapMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeU( SamplerAddressMode addressModeU_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeU( VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeU_ ) VULKAN_HPP_NOEXCEPT
     {
       addressModeU = addressModeU_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeV( SamplerAddressMode addressModeV_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeV( VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeV_ ) VULKAN_HPP_NOEXCEPT
     {
       addressModeV = addressModeV_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeW( SamplerAddressMode addressModeW_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAddressModeW( VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeW_ ) VULKAN_HPP_NOEXCEPT
     {
       addressModeW = addressModeW_;
       return *this;
@@ -146705,7 +106319,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAnisotropyEnable( Bool32 anisotropyEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setAnisotropyEnable( VULKAN_HPP_NAMESPACE::Bool32 anisotropyEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       anisotropyEnable = anisotropyEnable_;
       return *this;
@@ -146717,13 +106331,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setCompareEnable( Bool32 compareEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setCompareEnable( VULKAN_HPP_NAMESPACE::Bool32 compareEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       compareEnable = compareEnable_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setCompareOp( CompareOp compareOp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setCompareOp( VULKAN_HPP_NAMESPACE::CompareOp compareOp_ ) VULKAN_HPP_NOEXCEPT
     {
       compareOp = compareOp_;
       return *this;
@@ -146741,18 +106355,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setBorderColor( BorderColor borderColor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setBorderColor( VULKAN_HPP_NAMESPACE::BorderColor borderColor_ ) VULKAN_HPP_NOEXCEPT
     {
       borderColor = borderColor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setUnnormalizedCoordinates( Bool32 unnormalizedCoordinates_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCreateInfo & setUnnormalizedCoordinates( VULKAN_HPP_NAMESPACE::Bool32 unnormalizedCoordinates_ ) VULKAN_HPP_NOEXCEPT
     {
       unnormalizedCoordinates = unnormalizedCoordinates_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146764,35 +106378,29 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerCreateInfo *>( this );
     }
 
-    operator VkSamplerCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerCreateInfo *>( this );
-    }
-
-    operator VkSamplerCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               SamplerCreateFlags const &,
-               Filter const &,
-               Filter const &,
-               SamplerMipmapMode const &,
-               SamplerAddressMode const &,
-               SamplerAddressMode const &,
-               SamplerAddressMode const &,
+               VULKAN_HPP_NAMESPACE::SamplerCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::Filter const &,
+               VULKAN_HPP_NAMESPACE::Filter const &,
+               VULKAN_HPP_NAMESPACE::SamplerMipmapMode const &,
+               VULKAN_HPP_NAMESPACE::SamplerAddressMode const &,
+               VULKAN_HPP_NAMESPACE::SamplerAddressMode const &,
+               VULKAN_HPP_NAMESPACE::SamplerAddressMode const &,
                float const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                float const &,
-               Bool32 const &,
-               CompareOp const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::CompareOp const &,
                float const &,
                float const &,
-               BorderColor const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::BorderColor const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -146839,42 +106447,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType                   = StructureType::eSamplerCreateInfo;
-    const void *       pNext                   = {};
-    SamplerCreateFlags flags                   = {};
-    Filter             magFilter               = Filter::eNearest;
-    Filter             minFilter               = Filter::eNearest;
-    SamplerMipmapMode  mipmapMode              = SamplerMipmapMode::eNearest;
-    SamplerAddressMode addressModeU            = SamplerAddressMode::eRepeat;
-    SamplerAddressMode addressModeV            = SamplerAddressMode::eRepeat;
-    SamplerAddressMode addressModeW            = SamplerAddressMode::eRepeat;
-    float              mipLodBias              = {};
-    Bool32             anisotropyEnable        = {};
-    float              maxAnisotropy           = {};
-    Bool32             compareEnable           = {};
-    CompareOp          compareOp               = CompareOp::eNever;
-    float              minLod                  = {};
-    float              maxLod                  = {};
-    BorderColor        borderColor             = BorderColor::eFloatTransparentBlack;
-    Bool32             unnormalizedCoordinates = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType                   = StructureType::eSamplerCreateInfo;
+    const void *                             pNext                   = {};
+    VULKAN_HPP_NAMESPACE::SamplerCreateFlags flags                   = {};
+    VULKAN_HPP_NAMESPACE::Filter             magFilter               = VULKAN_HPP_NAMESPACE::Filter::eNearest;
+    VULKAN_HPP_NAMESPACE::Filter             minFilter               = VULKAN_HPP_NAMESPACE::Filter::eNearest;
+    VULKAN_HPP_NAMESPACE::SamplerMipmapMode  mipmapMode              = VULKAN_HPP_NAMESPACE::SamplerMipmapMode::eNearest;
+    VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeU            = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat;
+    VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeV            = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat;
+    VULKAN_HPP_NAMESPACE::SamplerAddressMode addressModeW            = VULKAN_HPP_NAMESPACE::SamplerAddressMode::eRepeat;
+    float                                    mipLodBias              = {};
+    VULKAN_HPP_NAMESPACE::Bool32             anisotropyEnable        = {};
+    float                                    maxAnisotropy           = {};
+    VULKAN_HPP_NAMESPACE::Bool32             compareEnable           = {};
+    VULKAN_HPP_NAMESPACE::CompareOp          compareOp               = VULKAN_HPP_NAMESPACE::CompareOp::eNever;
+    float                                    minLod                  = {};
+    float                                    maxLod                  = {};
+    VULKAN_HPP_NAMESPACE::BorderColor        borderColor             = VULKAN_HPP_NAMESPACE::BorderColor::eFloatTransparentBlack;
+    VULKAN_HPP_NAMESPACE::Bool32             unnormalizedCoordinates = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerCreateInfo>
-  {
-    using Type = SamplerCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerCreateInfo>
   {
     using Type = SamplerCreateInfo;
   };
 
-  // wrapper struct for struct VkSamplerCubicWeightsCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCubicWeightsCreateInfoQCOM.html
   struct SamplerCubicWeightsCreateInfoQCOM
   {
     using NativeType = VkSamplerCubicWeightsCreateInfoQCOM;
@@ -146882,11 +106480,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerCubicWeightsCreateInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerCubicWeightsCreateInfoQCOM( CubicFilterWeightsQCOM cubicWeights_ = CubicFilterWeightsQCOM::eCatmullRom,
-                                                            const void *           pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , cubicWeights{ cubicWeights_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SamplerCubicWeightsCreateInfoQCOM( VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights_ = VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM::eCatmullRom,
+                                         const void *                                 pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , cubicWeights( cubicWeights_ )
     {
     }
 
@@ -146898,27 +106497,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerCubicWeightsCreateInfoQCOM & operator=( SamplerCubicWeightsCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerCubicWeightsCreateInfoQCOM & operator=( VkSamplerCubicWeightsCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerCubicWeightsCreateInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerCubicWeightsCreateInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerCubicWeightsCreateInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCubicWeightsCreateInfoQCOM & setCubicWeights( CubicFilterWeightsQCOM cubicWeights_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCubicWeightsCreateInfoQCOM &
+      setCubicWeights( VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights_ ) VULKAN_HPP_NOEXCEPT
     {
       cubicWeights = cubicWeights_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerCubicWeightsCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -146930,18 +106530,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerCubicWeightsCreateInfoQCOM *>( this );
     }
 
-    operator VkSamplerCubicWeightsCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerCubicWeightsCreateInfoQCOM *>( this );
-    }
-
-    operator VkSamplerCubicWeightsCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerCubicWeightsCreateInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, CubicFilterWeightsQCOM const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, cubicWeights );
     }
@@ -146966,27 +106561,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType        = StructureType::eSamplerCubicWeightsCreateInfoQCOM;
-    const void *           pNext        = {};
-    CubicFilterWeightsQCOM cubicWeights = CubicFilterWeightsQCOM::eCatmullRom;
+    VULKAN_HPP_NAMESPACE::StructureType          sType        = StructureType::eSamplerCubicWeightsCreateInfoQCOM;
+    const void *                                 pNext        = {};
+    VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM cubicWeights = VULKAN_HPP_NAMESPACE::CubicFilterWeightsQCOM::eCatmullRom;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerCubicWeightsCreateInfoQCOM>
-  {
-    using Type = SamplerCubicWeightsCreateInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerCubicWeightsCreateInfoQCOM>
   {
     using Type = SamplerCubicWeightsCreateInfoQCOM;
   };
 
-  // wrapper struct for struct VkSamplerCustomBorderColorCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerCustomBorderColorCreateInfoEXT.html
   struct SamplerCustomBorderColorCreateInfoEXT
   {
     using NativeType = VkSamplerCustomBorderColorCreateInfoEXT;
@@ -146994,13 +106579,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerCustomBorderColorCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT( ClearColorValue customBorderColor_ = {},
-                                                                   Format          format_            = Format::eUndefined,
-                                                                   const void *    pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , customBorderColor{ customBorderColor_ }
-      , format{ format_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT( VULKAN_HPP_NAMESPACE::ClearColorValue customBorderColor_ = {},
+                                                                   VULKAN_HPP_NAMESPACE::Format          format_ = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                                   const void *                          pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , customBorderColor( customBorderColor_ )
+      , format( format_ )
     {
     }
 
@@ -147012,33 +106597,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerCustomBorderColorCreateInfoEXT & operator=( SamplerCustomBorderColorCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerCustomBorderColorCreateInfoEXT & operator=( VkSamplerCustomBorderColorCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerCustomBorderColorCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerCustomBorderColorCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT & setCustomBorderColor( ClearColorValue const & customBorderColor_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT &
+      setCustomBorderColor( VULKAN_HPP_NAMESPACE::ClearColorValue const & customBorderColor_ ) VULKAN_HPP_NOEXCEPT
     {
       customBorderColor = customBorderColor_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerCustomBorderColorCreateInfoEXT & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerCustomBorderColorCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -147050,46 +106636,34 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerCustomBorderColorCreateInfoEXT *>( this );
     }
 
-    operator VkSamplerCustomBorderColorCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerCustomBorderColorCreateInfoEXT *>( this );
-    }
-
-    operator VkSamplerCustomBorderColorCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerCustomBorderColorCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ClearColorValue const &, Format const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ClearColorValue const &,
+               VULKAN_HPP_NAMESPACE::Format const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, customBorderColor, format );
     }
 #endif
 
   public:
-    StructureType   sType             = StructureType::eSamplerCustomBorderColorCreateInfoEXT;
-    const void *    pNext             = {};
-    ClearColorValue customBorderColor = {};
-    Format          format            = Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::StructureType   sType             = StructureType::eSamplerCustomBorderColorCreateInfoEXT;
+    const void *                          pNext             = {};
+    VULKAN_HPP_NAMESPACE::ClearColorValue customBorderColor = {};
+    VULKAN_HPP_NAMESPACE::Format          format            = VULKAN_HPP_NAMESPACE::Format::eUndefined;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerCustomBorderColorCreateInfoEXT>
-  {
-    using Type = SamplerCustomBorderColorCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerCustomBorderColorCreateInfoEXT>
   {
     using Type = SamplerCustomBorderColorCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkSamplerReductionModeCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerReductionModeCreateInfo.html
   struct SamplerReductionModeCreateInfo
   {
     using NativeType = VkSamplerReductionModeCreateInfo;
@@ -147097,11 +106671,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerReductionModeCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerReductionModeCreateInfo( SamplerReductionMode reductionMode_ = SamplerReductionMode::eWeightedAverage,
-                                                         const void *         pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , reductionMode{ reductionMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SamplerReductionModeCreateInfo( VULKAN_HPP_NAMESPACE::SamplerReductionMode reductionMode_ = VULKAN_HPP_NAMESPACE::SamplerReductionMode::eWeightedAverage,
+                                      const void *                               pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , reductionMode( reductionMode_ )
     {
     }
 
@@ -147113,27 +106688,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerReductionModeCreateInfo & operator=( SamplerReductionModeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerReductionModeCreateInfo & operator=( VkSamplerReductionModeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerReductionModeCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerReductionModeCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerReductionModeCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerReductionModeCreateInfo & setReductionMode( SamplerReductionMode reductionMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerReductionModeCreateInfo & setReductionMode( VULKAN_HPP_NAMESPACE::SamplerReductionMode reductionMode_ ) VULKAN_HPP_NOEXCEPT
     {
       reductionMode = reductionMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerReductionModeCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -147145,18 +106720,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerReductionModeCreateInfo *>( this );
     }
 
-    operator VkSamplerReductionModeCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerReductionModeCreateInfo *>( this );
-    }
-
-    operator VkSamplerReductionModeCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerReductionModeCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SamplerReductionMode const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SamplerReductionMode const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, reductionMode );
     }
@@ -147181,19 +106751,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType         = StructureType::eSamplerReductionModeCreateInfo;
-    const void *         pNext         = {};
-    SamplerReductionMode reductionMode = SamplerReductionMode::eWeightedAverage;
+    VULKAN_HPP_NAMESPACE::StructureType        sType         = StructureType::eSamplerReductionModeCreateInfo;
+    const void *                               pNext         = {};
+    VULKAN_HPP_NAMESPACE::SamplerReductionMode reductionMode = VULKAN_HPP_NAMESPACE::SamplerReductionMode::eWeightedAverage;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerReductionModeCreateInfo>
-  {
-    using Type = SamplerReductionModeCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerReductionModeCreateInfo>
   {
@@ -147202,8 +106764,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SamplerReductionModeCreateInfoEXT = SamplerReductionModeCreateInfo;
 
-  // wrapper struct for struct VkSamplerYcbcrConversionCreateInfo, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversionCreateInfo.html
   struct SamplerYcbcrConversionCreateInfo
   {
     using NativeType = VkSamplerYcbcrConversionCreateInfo;
@@ -147211,25 +106771,26 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerYcbcrConversionCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionCreateInfo( Format                      format_                      = Format::eUndefined,
-                                                           SamplerYcbcrModelConversion ycbcrModel_                  = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                           SamplerYcbcrRange           ycbcrRange_                  = SamplerYcbcrRange::eItuFull,
-                                                           ComponentMapping            components_                  = {},
-                                                           ChromaLocation              xChromaOffset_               = ChromaLocation::eCositedEven,
-                                                           ChromaLocation              yChromaOffset_               = ChromaLocation::eCositedEven,
-                                                           Filter                      chromaFilter_                = Filter::eNearest,
-                                                           Bool32                      forceExplicitReconstruction_ = {},
-                                                           const void *                pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , ycbcrModel{ ycbcrModel_ }
-      , ycbcrRange{ ycbcrRange_ }
-      , components{ components_ }
-      , xChromaOffset{ xChromaOffset_ }
-      , yChromaOffset{ yChromaOffset_ }
-      , chromaFilter{ chromaFilter_ }
-      , forceExplicitReconstruction{ forceExplicitReconstruction_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionCreateInfo(
+      VULKAN_HPP_NAMESPACE::Format                      format_                      = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion ycbcrModel_                  = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           ycbcrRange_                  = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull,
+      VULKAN_HPP_NAMESPACE::ComponentMapping            components_                  = {},
+      VULKAN_HPP_NAMESPACE::ChromaLocation              xChromaOffset_               = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              yChromaOffset_               = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::Filter                      chromaFilter_                = VULKAN_HPP_NAMESPACE::Filter::eNearest,
+      VULKAN_HPP_NAMESPACE::Bool32                      forceExplicitReconstruction_ = {},
+      const void *                                      pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , ycbcrModel( ycbcrModel_ )
+      , ycbcrRange( ycbcrRange_ )
+      , components( components_ )
+      , xChromaOffset( xChromaOffset_ )
+      , yChromaOffset( yChromaOffset_ )
+      , chromaFilter( chromaFilter_ )
+      , forceExplicitReconstruction( forceExplicitReconstruction_ )
     {
     }
 
@@ -147241,69 +106802,71 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerYcbcrConversionCreateInfo & operator=( SamplerYcbcrConversionCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerYcbcrConversionCreateInfo & operator=( VkSamplerYcbcrConversionCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerYcbcrConversionCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setYcbcrModel( SamplerYcbcrModelConversion ycbcrModel_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo &
+      setYcbcrModel( VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion ycbcrModel_ ) VULKAN_HPP_NOEXCEPT
     {
       ycbcrModel = ycbcrModel_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setYcbcrRange( SamplerYcbcrRange ycbcrRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setYcbcrRange( VULKAN_HPP_NAMESPACE::SamplerYcbcrRange ycbcrRange_ ) VULKAN_HPP_NOEXCEPT
     {
       ycbcrRange = ycbcrRange_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setComponents( ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setComponents( VULKAN_HPP_NAMESPACE::ComponentMapping const & components_ ) VULKAN_HPP_NOEXCEPT
     {
       components = components_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setXChromaOffset( ChromaLocation xChromaOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setXChromaOffset( VULKAN_HPP_NAMESPACE::ChromaLocation xChromaOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       xChromaOffset = xChromaOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setYChromaOffset( ChromaLocation yChromaOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setYChromaOffset( VULKAN_HPP_NAMESPACE::ChromaLocation yChromaOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       yChromaOffset = yChromaOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setChromaFilter( Filter chromaFilter_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setChromaFilter( VULKAN_HPP_NAMESPACE::Filter chromaFilter_ ) VULKAN_HPP_NOEXCEPT
     {
       chromaFilter = chromaFilter_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo & setForceExplicitReconstruction( Bool32 forceExplicitReconstruction_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionCreateInfo &
+      setForceExplicitReconstruction( VULKAN_HPP_NAMESPACE::Bool32 forceExplicitReconstruction_ ) VULKAN_HPP_NOEXCEPT
     {
       forceExplicitReconstruction = forceExplicitReconstruction_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerYcbcrConversionCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -147315,27 +106878,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerYcbcrConversionCreateInfo *>( this );
     }
 
-    operator VkSamplerYcbcrConversionCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerYcbcrConversionCreateInfo *>( this );
-    }
-
-    operator VkSamplerYcbcrConversionCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerYcbcrConversionCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Format const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ComponentMapping const &,
-               ChromaLocation const &,
-               ChromaLocation const &,
-               Filter const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrRange const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::Filter const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, format, ycbcrModel, ycbcrRange, components, xChromaOffset, yChromaOffset, chromaFilter, forceExplicitReconstruction );
@@ -147364,26 +106921,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                       = StructureType::eSamplerYcbcrConversionCreateInfo;
-    const void *                pNext                       = {};
-    Format                      format                      = Format::eUndefined;
-    SamplerYcbcrModelConversion ycbcrModel                  = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           ycbcrRange                  = SamplerYcbcrRange::eItuFull;
-    ComponentMapping            components                  = {};
-    ChromaLocation              xChromaOffset               = ChromaLocation::eCositedEven;
-    ChromaLocation              yChromaOffset               = ChromaLocation::eCositedEven;
-    Filter                      chromaFilter                = Filter::eNearest;
-    Bool32                      forceExplicitReconstruction = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                       = StructureType::eSamplerYcbcrConversionCreateInfo;
+    const void *                                      pNext                       = {};
+    VULKAN_HPP_NAMESPACE::Format                      format                      = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion ycbcrModel                  = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           ycbcrRange                  = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull;
+    VULKAN_HPP_NAMESPACE::ComponentMapping            components                  = {};
+    VULKAN_HPP_NAMESPACE::ChromaLocation              xChromaOffset               = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              yChromaOffset               = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::Filter                      chromaFilter                = VULKAN_HPP_NAMESPACE::Filter::eNearest;
+    VULKAN_HPP_NAMESPACE::Bool32                      forceExplicitReconstruction = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerYcbcrConversionCreateInfo>
-  {
-    using Type = SamplerYcbcrConversionCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerYcbcrConversionCreateInfo>
   {
@@ -147392,8 +106941,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SamplerYcbcrConversionCreateInfoKHR = SamplerYcbcrConversionCreateInfo;
 
-  // wrapper struct for struct VkSamplerYcbcrConversionImageFormatProperties, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversionImageFormatProperties.html
   struct SamplerYcbcrConversionImageFormatProperties
   {
     using NativeType = VkSamplerYcbcrConversionImageFormatProperties;
@@ -147401,11 +106948,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerYcbcrConversionImageFormatProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionImageFormatProperties( uint32_t combinedImageSamplerDescriptorCount_ = {},
                                                                       void *   pNext_                               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , combinedImageSamplerDescriptorCount{ combinedImageSamplerDescriptorCount_ }
+      : pNext( pNext_ )
+      , combinedImageSamplerDescriptorCount( combinedImageSamplerDescriptorCount_ )
     {
     }
 
@@ -147417,11 +106964,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerYcbcrConversionImageFormatProperties & operator=( SamplerYcbcrConversionImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerYcbcrConversionImageFormatProperties & operator=( VkSamplerYcbcrConversionImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerYcbcrConversionImageFormatProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionImageFormatProperties const *>( &rhs );
       return *this;
     }
 
@@ -147435,18 +106982,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerYcbcrConversionImageFormatProperties *>( this );
     }
 
-    operator VkSamplerYcbcrConversionImageFormatProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerYcbcrConversionImageFormatProperties *>( this );
-    }
-
-    operator VkSamplerYcbcrConversionImageFormatProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerYcbcrConversionImageFormatProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, combinedImageSamplerDescriptorCount );
     }
@@ -147471,19 +107013,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                               = StructureType::eSamplerYcbcrConversionImageFormatProperties;
-    void *        pNext                               = {};
-    uint32_t      combinedImageSamplerDescriptorCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                               = StructureType::eSamplerYcbcrConversionImageFormatProperties;
+    void *                              pNext                               = {};
+    uint32_t                            combinedImageSamplerDescriptorCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerYcbcrConversionImageFormatProperties>
-  {
-    using Type = SamplerYcbcrConversionImageFormatProperties;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerYcbcrConversionImageFormatProperties>
   {
@@ -147492,7 +107026,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SamplerYcbcrConversionImageFormatPropertiesKHR = SamplerYcbcrConversionImageFormatProperties;
 
-  // wrapper struct for struct VkSamplerYcbcrConversionInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversionInfo.html
   struct SamplerYcbcrConversionInfo
   {
     using NativeType = VkSamplerYcbcrConversionInfo;
@@ -147500,10 +107033,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerYcbcrConversionInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionInfo( SamplerYcbcrConversion conversion_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , conversion{ conversion_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionInfo( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion conversion_ = {},
+                                                     const void *                                 pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , conversion( conversion_ )
     {
     }
 
@@ -147515,27 +107049,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerYcbcrConversionInfo & operator=( SamplerYcbcrConversionInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerYcbcrConversionInfo & operator=( VkSamplerYcbcrConversionInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerYcbcrConversionInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionInfo & setConversion( SamplerYcbcrConversion conversion_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionInfo & setConversion( VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion conversion_ ) VULKAN_HPP_NOEXCEPT
     {
       conversion = conversion_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerYcbcrConversionInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -147547,18 +107081,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerYcbcrConversionInfo *>( this );
     }
 
-    operator VkSamplerYcbcrConversionInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerYcbcrConversionInfo *>( this );
-    }
-
-    operator VkSamplerYcbcrConversionInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerYcbcrConversionInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SamplerYcbcrConversion const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, conversion );
     }
@@ -147583,19 +107112,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType      = StructureType::eSamplerYcbcrConversionInfo;
-    const void *           pNext      = {};
-    SamplerYcbcrConversion conversion = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType      = StructureType::eSamplerYcbcrConversionInfo;
+    const void *                                 pNext      = {};
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion conversion = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerYcbcrConversionInfo>
-  {
-    using Type = SamplerYcbcrConversionInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerYcbcrConversionInfo>
   {
@@ -147604,8 +107125,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SamplerYcbcrConversionInfoKHR = SamplerYcbcrConversionInfo;
 
-  // wrapper struct for struct VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM.html
   struct SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM
   {
     using NativeType = VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM;
@@ -147613,13 +107132,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM( Bool32 enableYDegamma_    = {},
-                                                                           Bool32 enableCbCrDegamma_ = {},
-                                                                           void * pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , enableYDegamma{ enableYDegamma_ }
-      , enableCbCrDegamma{ enableCbCrDegamma_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM( VULKAN_HPP_NAMESPACE::Bool32 enableYDegamma_    = {},
+                                                                           VULKAN_HPP_NAMESPACE::Bool32 enableCbCrDegamma_ = {},
+                                                                           void *                       pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , enableYDegamma( enableYDegamma_ )
+      , enableCbCrDegamma( enableCbCrDegamma_ )
     {
     }
 
@@ -147632,33 +107151,35 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM & operator=( SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM & operator=( VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM & setEnableYDegamma( Bool32 enableYDegamma_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM &
+      setEnableYDegamma( VULKAN_HPP_NAMESPACE::Bool32 enableYDegamma_ ) VULKAN_HPP_NOEXCEPT
     {
       enableYDegamma = enableYDegamma_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM & setEnableCbCrDegamma( Bool32 enableCbCrDegamma_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM &
+      setEnableCbCrDegamma( VULKAN_HPP_NAMESPACE::Bool32 enableCbCrDegamma_ ) VULKAN_HPP_NOEXCEPT
     {
       enableCbCrDegamma = enableCbCrDegamma_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -147670,18 +107191,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM *>( this );
     }
 
-    operator VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM *>( this );
-    }
-
-    operator VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, enableYDegamma, enableCbCrDegamma );
     }
@@ -147706,20 +107222,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM;
-    void *        pNext             = {};
-    Bool32        enableYDegamma    = {};
-    Bool32        enableCbCrDegamma = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM;
+    void *                              pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        enableYDegamma    = {};
+    VULKAN_HPP_NAMESPACE::Bool32        enableCbCrDegamma = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM>
-  {
-    using Type = SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM>
   {
@@ -147727,8 +107235,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkScreenBufferFormatPropertiesQNX, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkScreenBufferFormatPropertiesQNX.html
   struct ScreenBufferFormatPropertiesQNX
   {
     using NativeType = VkScreenBufferFormatPropertiesQNX;
@@ -147736,27 +107242,28 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eScreenBufferFormatPropertiesQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ScreenBufferFormatPropertiesQNX( Format                      format_                           = Format::eUndefined,
-                                                          uint64_t                    externalFormat_                   = {},
-                                                          uint64_t                    screenUsage_                      = {},
-                                                          FormatFeatureFlags          formatFeatures_                   = {},
-                                                          ComponentMapping            samplerYcbcrConversionComponents_ = {},
-                                                          SamplerYcbcrModelConversion suggestedYcbcrModel_    = SamplerYcbcrModelConversion::eRgbIdentity,
-                                                          SamplerYcbcrRange           suggestedYcbcrRange_    = SamplerYcbcrRange::eItuFull,
-                                                          ChromaLocation              suggestedXChromaOffset_ = ChromaLocation::eCositedEven,
-                                                          ChromaLocation              suggestedYChromaOffset_ = ChromaLocation::eCositedEven,
-                                                          void *                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , externalFormat{ externalFormat_ }
-      , screenUsage{ screenUsage_ }
-      , formatFeatures{ formatFeatures_ }
-      , samplerYcbcrConversionComponents{ samplerYcbcrConversionComponents_ }
-      , suggestedYcbcrModel{ suggestedYcbcrModel_ }
-      , suggestedYcbcrRange{ suggestedYcbcrRange_ }
-      , suggestedXChromaOffset{ suggestedXChromaOffset_ }
-      , suggestedYChromaOffset{ suggestedYChromaOffset_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ScreenBufferFormatPropertiesQNX(
+      VULKAN_HPP_NAMESPACE::Format                      format_                           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+      uint64_t                                          externalFormat_                   = {},
+      uint64_t                                          screenUsage_                      = {},
+      VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures_                   = {},
+      VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents_ = {},
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity,
+      VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange_              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset_           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven,
+      void *                                            pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , externalFormat( externalFormat_ )
+      , screenUsage( screenUsage_ )
+      , formatFeatures( formatFeatures_ )
+      , samplerYcbcrConversionComponents( samplerYcbcrConversionComponents_ )
+      , suggestedYcbcrModel( suggestedYcbcrModel_ )
+      , suggestedYcbcrRange( suggestedYcbcrRange_ )
+      , suggestedXChromaOffset( suggestedXChromaOffset_ )
+      , suggestedYChromaOffset( suggestedYChromaOffset_ )
     {
     }
 
@@ -147768,11 +107275,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ScreenBufferFormatPropertiesQNX & operator=( ScreenBufferFormatPropertiesQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ScreenBufferFormatPropertiesQNX & operator=( VkScreenBufferFormatPropertiesQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ScreenBufferFormatPropertiesQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ScreenBufferFormatPropertiesQNX const *>( &rhs );
       return *this;
     }
 
@@ -147786,28 +107293,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkScreenBufferFormatPropertiesQNX *>( this );
     }
 
-    operator VkScreenBufferFormatPropertiesQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkScreenBufferFormatPropertiesQNX *>( this );
-    }
-
-    operator VkScreenBufferFormatPropertiesQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkScreenBufferFormatPropertiesQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Format const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
                uint64_t const &,
                uint64_t const &,
-               FormatFeatureFlags const &,
-               ComponentMapping const &,
-               SamplerYcbcrModelConversion const &,
-               SamplerYcbcrRange const &,
-               ChromaLocation const &,
-               ChromaLocation const &>
+               VULKAN_HPP_NAMESPACE::FormatFeatureFlags const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion const &,
+               VULKAN_HPP_NAMESPACE::SamplerYcbcrRange const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &,
+               VULKAN_HPP_NAMESPACE::ChromaLocation const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -147847,27 +107348,19 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType                            = StructureType::eScreenBufferFormatPropertiesQNX;
-    void *                      pNext                            = {};
-    Format                      format                           = Format::eUndefined;
-    uint64_t                    externalFormat                   = {};
-    uint64_t                    screenUsage                      = {};
-    FormatFeatureFlags          formatFeatures                   = {};
-    ComponentMapping            samplerYcbcrConversionComponents = {};
-    SamplerYcbcrModelConversion suggestedYcbcrModel              = SamplerYcbcrModelConversion::eRgbIdentity;
-    SamplerYcbcrRange           suggestedYcbcrRange              = SamplerYcbcrRange::eItuFull;
-    ChromaLocation              suggestedXChromaOffset           = ChromaLocation::eCositedEven;
-    ChromaLocation              suggestedYChromaOffset           = ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::StructureType               sType                            = StructureType::eScreenBufferFormatPropertiesQNX;
+    void *                                            pNext                            = {};
+    VULKAN_HPP_NAMESPACE::Format                      format                           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint64_t                                          externalFormat                   = {};
+    uint64_t                                          screenUsage                      = {};
+    VULKAN_HPP_NAMESPACE::FormatFeatureFlags          formatFeatures                   = {};
+    VULKAN_HPP_NAMESPACE::ComponentMapping            samplerYcbcrConversionComponents = {};
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion suggestedYcbcrModel              = VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion::eRgbIdentity;
+    VULKAN_HPP_NAMESPACE::SamplerYcbcrRange           suggestedYcbcrRange              = VULKAN_HPP_NAMESPACE::SamplerYcbcrRange::eItuFull;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedXChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
+    VULKAN_HPP_NAMESPACE::ChromaLocation              suggestedYChromaOffset           = VULKAN_HPP_NAMESPACE::ChromaLocation::eCositedEven;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkScreenBufferFormatPropertiesQNX>
-  {
-    using Type = ScreenBufferFormatPropertiesQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eScreenBufferFormatPropertiesQNX>
   {
@@ -147876,7 +107369,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkScreenBufferPropertiesQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkScreenBufferPropertiesQNX.html
   struct ScreenBufferPropertiesQNX
   {
     using NativeType = VkScreenBufferPropertiesQNX;
@@ -147884,12 +107376,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eScreenBufferPropertiesQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      ScreenBufferPropertiesQNX( DeviceSize allocationSize_ = {}, uint32_t memoryTypeBits_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , allocationSize{ allocationSize_ }
-      , memoryTypeBits{ memoryTypeBits_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ScreenBufferPropertiesQNX( VULKAN_HPP_NAMESPACE::DeviceSize allocationSize_ = {},
+                                                    uint32_t                         memoryTypeBits_ = {},
+                                                    void *                           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , allocationSize( allocationSize_ )
+      , memoryTypeBits( memoryTypeBits_ )
     {
     }
 
@@ -147901,11 +107394,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ScreenBufferPropertiesQNX & operator=( ScreenBufferPropertiesQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ScreenBufferPropertiesQNX & operator=( VkScreenBufferPropertiesQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ScreenBufferPropertiesQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ScreenBufferPropertiesQNX const *>( &rhs );
       return *this;
     }
 
@@ -147919,18 +107412,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkScreenBufferPropertiesQNX *>( this );
     }
 
-    operator VkScreenBufferPropertiesQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkScreenBufferPropertiesQNX *>( this );
-    }
-
-    operator VkScreenBufferPropertiesQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkScreenBufferPropertiesQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, uint32_t const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, allocationSize, memoryTypeBits );
     }
@@ -147955,20 +107443,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType          = StructureType::eScreenBufferPropertiesQNX;
-    void *        pNext          = {};
-    DeviceSize    allocationSize = {};
-    uint32_t      memoryTypeBits = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eScreenBufferPropertiesQNX;
+    void *                              pNext          = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    allocationSize = {};
+    uint32_t                            memoryTypeBits = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkScreenBufferPropertiesQNX>
-  {
-    using Type = ScreenBufferPropertiesQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eScreenBufferPropertiesQNX>
   {
@@ -147977,7 +107457,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-  // wrapper struct for struct VkScreenSurfaceCreateInfoQNX, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkScreenSurfaceCreateInfoQNX.html
   struct ScreenSurfaceCreateInfoQNX
   {
     using NativeType = VkScreenSurfaceCreateInfoQNX;
@@ -147985,15 +107464,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eScreenSurfaceCreateInfoQNX;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ScreenSurfaceCreateInfoQNX( ScreenSurfaceCreateFlagsQNX flags_   = {},
-                                                     struct _screen_context *    context_ = {},
-                                                     struct _screen_window *     window_  = {},
-                                                     const void *                pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , context{ context_ }
-      , window{ window_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ScreenSurfaceCreateInfoQNX( VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateFlagsQNX flags_   = {},
+                                                     struct _screen_context *                          context_ = {},
+                                                     struct _screen_window *                           window_  = {},
+                                                     const void *                                      pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , context( context_ )
+      , window( window_ )
     {
     }
 
@@ -148005,22 +107484,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ScreenSurfaceCreateInfoQNX & operator=( ScreenSurfaceCreateInfoQNX const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ScreenSurfaceCreateInfoQNX & operator=( VkScreenSurfaceCreateInfoQNX const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ScreenSurfaceCreateInfoQNX const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateInfoQNX const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ScreenSurfaceCreateInfoQNX & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ScreenSurfaceCreateInfoQNX & setFlags( ScreenSurfaceCreateFlagsQNX flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ScreenSurfaceCreateInfoQNX & setFlags( VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateFlagsQNX flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -148037,7 +107516,7 @@ namespace VULKAN_HPP_NAMESPACE
       window = window_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkScreenSurfaceCreateInfoQNX const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148049,19 +107528,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkScreenSurfaceCreateInfoQNX *>( this );
     }
 
-    operator VkScreenSurfaceCreateInfoQNX const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkScreenSurfaceCreateInfoQNX *>( this );
-    }
-
-    operator VkScreenSurfaceCreateInfoQNX *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkScreenSurfaceCreateInfoQNX *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, ScreenSurfaceCreateFlagsQNX const &, struct _screen_context * const &, struct _screen_window * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateFlagsQNX const &,
+               struct _screen_context * const &,
+               struct _screen_window * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, context, window );
@@ -148087,21 +107563,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType               sType   = StructureType::eScreenSurfaceCreateInfoQNX;
-    const void *                pNext   = {};
-    ScreenSurfaceCreateFlagsQNX flags   = {};
-    struct _screen_context *    context = {};
-    struct _screen_window *     window  = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType   = StructureType::eScreenSurfaceCreateInfoQNX;
+    const void *                                      pNext   = {};
+    VULKAN_HPP_NAMESPACE::ScreenSurfaceCreateFlagsQNX flags   = {};
+    struct _screen_context *                          context = {};
+    struct _screen_window *                           window  = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkScreenSurfaceCreateInfoQNX>
-  {
-    using Type = ScreenSurfaceCreateInfoQNX;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eScreenSurfaceCreateInfoQNX>
   {
@@ -148109,7 +107577,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  // wrapper struct for struct VkSemaphoreCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreCreateInfo.html
   struct SemaphoreCreateInfo
   {
     using NativeType = VkSemaphoreCreateInfo;
@@ -148117,10 +107584,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreCreateInfo( SemaphoreCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreCreateInfo( VULKAN_HPP_NAMESPACE::SemaphoreCreateFlags flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -148131,27 +107598,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreCreateInfo & operator=( SemaphoreCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreCreateInfo & operator=( VkSemaphoreCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreCreateInfo & setFlags( SemaphoreCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::SemaphoreCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148163,18 +107630,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreCreateInfo *>( this );
     }
 
-    operator VkSemaphoreCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreCreateInfo *>( this );
-    }
-
-    operator VkSemaphoreCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SemaphoreCreateFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SemaphoreCreateFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -148199,26 +107661,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType        sType = StructureType::eSemaphoreCreateInfo;
-    const void *         pNext = {};
-    SemaphoreCreateFlags flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType = StructureType::eSemaphoreCreateInfo;
+    const void *                               pNext = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreCreateFlags flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreCreateInfo>
-  {
-    using Type = SemaphoreCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreCreateInfo>
   {
     using Type = SemaphoreCreateInfo;
   };
 
-  // wrapper struct for struct VkSemaphoreGetFdInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreGetFdInfoKHR.html
   struct SemaphoreGetFdInfoKHR
   {
     using NativeType = VkSemaphoreGetFdInfoKHR;
@@ -148226,13 +107679,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreGetFdInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreGetFdInfoKHR( Semaphore                           semaphore_  = {},
-                                                ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , handleType{ handleType_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreGetFdInfoKHR(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_  = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -148244,33 +107698,33 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreGetFdInfoKHR & operator=( SemaphoreGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreGetFdInfoKHR & operator=( VkSemaphoreGetFdInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreGetFdInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreGetFdInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreGetFdInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetFdInfoKHR & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetFdInfoKHR & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetFdInfoKHR & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetFdInfoKHR & setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreGetFdInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148282,18 +107736,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreGetFdInfoKHR *>( this );
     }
 
-    operator VkSemaphoreGetFdInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreGetFdInfoKHR *>( this );
-    }
-
-    operator VkSemaphoreGetFdInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreGetFdInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, ExternalSemaphoreHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, handleType );
     }
@@ -148318,20 +107770,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType      = StructureType::eSemaphoreGetFdInfoKHR;
-    const void *                        pNext      = {};
-    Semaphore                           semaphore  = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::eSemaphoreGetFdInfoKHR;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore  = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreGetFdInfoKHR>
-  {
-    using Type = SemaphoreGetFdInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreGetFdInfoKHR>
   {
@@ -148339,8 +107783,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkSemaphoreGetWin32HandleInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreGetWin32HandleInfoKHR.html
   struct SemaphoreGetWin32HandleInfoKHR
   {
     using NativeType = VkSemaphoreGetWin32HandleInfoKHR;
@@ -148348,13 +107790,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreGetWin32HandleInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreGetWin32HandleInfoKHR( Semaphore                           semaphore_  = {},
-                                                         ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                         const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , handleType{ handleType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreGetWin32HandleInfoKHR(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_  = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -148366,33 +107809,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreGetWin32HandleInfoKHR & operator=( SemaphoreGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreGetWin32HandleInfoKHR & operator=( VkSemaphoreGetWin32HandleInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreGetWin32HandleInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreGetWin32HandleInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreGetWin32HandleInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetWin32HandleInfoKHR & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetWin32HandleInfoKHR & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetWin32HandleInfoKHR & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetWin32HandleInfoKHR &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreGetWin32HandleInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148404,18 +107848,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreGetWin32HandleInfoKHR *>( this );
     }
 
-    operator VkSemaphoreGetWin32HandleInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreGetWin32HandleInfoKHR *>( this );
-    }
-
-    operator VkSemaphoreGetWin32HandleInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreGetWin32HandleInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, ExternalSemaphoreHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, handleType );
     }
@@ -148440,20 +107882,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                       sType      = StructureType::eSemaphoreGetWin32HandleInfoKHR;
-    const void *                        pNext      = {};
-    Semaphore                           semaphore  = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::eSemaphoreGetWin32HandleInfoKHR;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore  = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreGetWin32HandleInfoKHR>
-  {
-    using Type = SemaphoreGetWin32HandleInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreGetWin32HandleInfoKHR>
   {
@@ -148462,8 +107896,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-  // wrapper struct for struct VkSemaphoreGetZirconHandleInfoFUCHSIA, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreGetZirconHandleInfoFUCHSIA.html
   struct SemaphoreGetZirconHandleInfoFUCHSIA
   {
     using NativeType = VkSemaphoreGetZirconHandleInfoFUCHSIA;
@@ -148471,13 +107903,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreGetZirconHandleInfoFUCHSIA( Semaphore                           semaphore_  = {},
-                                                              ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
-                                                              const void *                        pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , handleType{ handleType_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreGetZirconHandleInfoFUCHSIA(
+      VULKAN_HPP_NAMESPACE::Semaphore                           semaphore_  = {},
+      VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
+      const void *                                              pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , handleType( handleType_ )
     {
     }
 
@@ -148489,33 +107922,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreGetZirconHandleInfoFUCHSIA & operator=( SemaphoreGetZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreGetZirconHandleInfoFUCHSIA & operator=( VkSemaphoreGetZirconHandleInfoFUCHSIA const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreGetZirconHandleInfoFUCHSIA const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreGetZirconHandleInfoFUCHSIA const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreGetZirconHandleInfoFUCHSIA & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetZirconHandleInfoFUCHSIA & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetZirconHandleInfoFUCHSIA & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetZirconHandleInfoFUCHSIA & setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreGetZirconHandleInfoFUCHSIA &
+      setHandleType( VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType_ ) VULKAN_HPP_NOEXCEPT
     {
       handleType = handleType_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreGetZirconHandleInfoFUCHSIA const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148527,18 +107961,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreGetZirconHandleInfoFUCHSIA *>( this );
     }
 
-    operator VkSemaphoreGetZirconHandleInfoFUCHSIA const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA *>( this );
-    }
-
-    operator VkSemaphoreGetZirconHandleInfoFUCHSIA *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreGetZirconHandleInfoFUCHSIA *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, ExternalSemaphoreHandleTypeFlagBits const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Semaphore const &,
+               VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, handleType );
     }
@@ -148563,20 +107995,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                       sType      = StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA;
-    const void *                        pNext      = {};
-    Semaphore                           semaphore  = {};
-    ExternalSemaphoreHandleTypeFlagBits handleType = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
+    VULKAN_HPP_NAMESPACE::StructureType                       sType      = StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA;
+    const void *                                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::Semaphore                           semaphore  = {};
+    VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits handleType = VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreGetZirconHandleInfoFUCHSIA>
-  {
-    using Type = SemaphoreGetZirconHandleInfoFUCHSIA;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA>
   {
@@ -148584,7 +108008,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-  // wrapper struct for struct VkSemaphoreSignalInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreSignalInfo.html
   struct SemaphoreSignalInfo
   {
     using NativeType = VkSemaphoreSignalInfo;
@@ -148592,11 +108015,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreSignalInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreSignalInfo( Semaphore semaphore_ = {}, uint64_t value_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphore{ semaphore_ }
-      , value{ value_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SemaphoreSignalInfo( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ = {}, uint64_t value_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphore( semaphore_ )
+      , value( value_ )
     {
     }
 
@@ -148607,22 +108031,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreSignalInfo & operator=( SemaphoreSignalInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreSignalInfo & operator=( VkSemaphoreSignalInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreSignalInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreSignalInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreSignalInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreSignalInfo & setSemaphore( Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreSignalInfo & setSemaphore( VULKAN_HPP_NAMESPACE::Semaphore semaphore_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphore = semaphore_;
       return *this;
@@ -148633,7 +108057,7 @@ namespace VULKAN_HPP_NAMESPACE
       value = value_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreSignalInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148645,18 +108069,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreSignalInfo *>( this );
     }
 
-    operator VkSemaphoreSignalInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreSignalInfo *>( this );
-    }
-
-    operator VkSemaphoreSignalInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreSignalInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Semaphore const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Semaphore const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphore, value );
     }
@@ -148681,20 +108100,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eSemaphoreSignalInfo;
-    const void *  pNext     = {};
-    Semaphore     semaphore = {};
-    uint64_t      value     = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eSemaphoreSignalInfo;
+    const void *                        pNext     = {};
+    VULKAN_HPP_NAMESPACE::Semaphore     semaphore = {};
+    uint64_t                            value     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreSignalInfo>
-  {
-    using Type = SemaphoreSignalInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreSignalInfo>
   {
@@ -148703,7 +108114,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SemaphoreSignalInfoKHR = SemaphoreSignalInfo;
 
-  // wrapper struct for struct VkSemaphoreTypeCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreTypeCreateInfo.html
   struct SemaphoreTypeCreateInfo
   {
     using NativeType = VkSemaphoreTypeCreateInfo;
@@ -148711,13 +108121,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreTypeCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreTypeCreateInfo( SemaphoreType semaphoreType_ = SemaphoreType::eBinary,
-                                                  uint64_t      initialValue_  = {},
-                                                  const void *  pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , semaphoreType{ semaphoreType_ }
-      , initialValue{ initialValue_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreTypeCreateInfo( VULKAN_HPP_NAMESPACE::SemaphoreType semaphoreType_ = VULKAN_HPP_NAMESPACE::SemaphoreType::eBinary,
+                                                  uint64_t                            initialValue_  = {},
+                                                  const void *                        pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , semaphoreType( semaphoreType_ )
+      , initialValue( initialValue_ )
     {
     }
 
@@ -148729,22 +108139,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SemaphoreTypeCreateInfo & operator=( SemaphoreTypeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreTypeCreateInfo & operator=( VkSemaphoreTypeCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreTypeCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreTypeCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreTypeCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreTypeCreateInfo & setSemaphoreType( SemaphoreType semaphoreType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreTypeCreateInfo & setSemaphoreType( VULKAN_HPP_NAMESPACE::SemaphoreType semaphoreType_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphoreType = semaphoreType_;
       return *this;
@@ -148755,7 +108165,7 @@ namespace VULKAN_HPP_NAMESPACE
       initialValue = initialValue_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreTypeCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148767,18 +108177,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreTypeCreateInfo *>( this );
     }
 
-    operator VkSemaphoreTypeCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreTypeCreateInfo *>( this );
-    }
-
-    operator VkSemaphoreTypeCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreTypeCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SemaphoreType const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SemaphoreType const &, uint64_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, semaphoreType, initialValue );
     }
@@ -148803,20 +108208,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType         = StructureType::eSemaphoreTypeCreateInfo;
-    const void *  pNext         = {};
-    SemaphoreType semaphoreType = SemaphoreType::eBinary;
-    uint64_t      initialValue  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eSemaphoreTypeCreateInfo;
+    const void *                        pNext         = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreType semaphoreType = VULKAN_HPP_NAMESPACE::SemaphoreType::eBinary;
+    uint64_t                            initialValue  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreTypeCreateInfo>
-  {
-    using Type = SemaphoreTypeCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreTypeCreateInfo>
   {
@@ -148825,7 +108222,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SemaphoreTypeCreateInfoKHR = SemaphoreTypeCreateInfo;
 
-  // wrapper struct for struct VkSemaphoreWaitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSemaphoreWaitInfo.html
   struct SemaphoreWaitInfo
   {
     using NativeType = VkSemaphoreWaitInfo;
@@ -148833,17 +108229,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSemaphoreWaitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SemaphoreWaitInfo( SemaphoreWaitFlags flags_          = {},
-                                            uint32_t           semaphoreCount_ = {},
-                                            const Semaphore *  pSemaphores_    = {},
-                                            const uint64_t *   pValues_        = {},
-                                            const void *       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , semaphoreCount{ semaphoreCount_ }
-      , pSemaphores{ pSemaphores_ }
-      , pValues{ pValues_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SemaphoreWaitInfo( VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags flags_          = {},
+                                            uint32_t                                 semaphoreCount_ = {},
+                                            const VULKAN_HPP_NAMESPACE::Semaphore *  pSemaphores_    = {},
+                                            const uint64_t *                         pValues_        = {},
+                                            const void *                             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , semaphoreCount( semaphoreCount_ )
+      , pSemaphores( pSemaphores_ )
+      , pValues( pValues_ )
     {
     }
 
@@ -148852,10 +108248,10 @@ namespace VULKAN_HPP_NAMESPACE
     SemaphoreWaitInfo( VkSemaphoreWaitInfo const & rhs ) VULKAN_HPP_NOEXCEPT : SemaphoreWaitInfo( *reinterpret_cast<SemaphoreWaitInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SemaphoreWaitInfo( SemaphoreWaitFlags                               flags_,
-                       ArrayProxyNoTemporaries<const Semaphore> const & semaphores_,
-                       ArrayProxyNoTemporaries<const uint64_t> const &  values_ = {},
-                       const void *                                     pNext_  = nullptr )
+    SemaphoreWaitInfo( VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags                                                     flags_,
+                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & semaphores_,
+                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const &                        values_ = {},
+                       const void *                                                                                 pNext_  = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , semaphoreCount( static_cast<uint32_t>( semaphores_.size() ) )
@@ -148874,22 +108270,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SemaphoreWaitInfo & operator=( SemaphoreWaitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SemaphoreWaitInfo & operator=( VkSemaphoreWaitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SemaphoreWaitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SemaphoreWaitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SemaphoreWaitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreWaitInfo & setFlags( SemaphoreWaitFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreWaitInfo & setFlags( VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -148901,14 +108297,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SemaphoreWaitInfo & setPSemaphores( const Semaphore * pSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SemaphoreWaitInfo & setPSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pSemaphores = pSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SemaphoreWaitInfo & setSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & semaphores_ ) VULKAN_HPP_NOEXCEPT
+    SemaphoreWaitInfo &
+      setSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & semaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphoreCount = static_cast<uint32_t>( semaphores_.size() );
       pSemaphores    = semaphores_.data();
@@ -148923,14 +108320,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SemaphoreWaitInfo & setValues( ArrayProxyNoTemporaries<const uint64_t> const & values_ ) VULKAN_HPP_NOEXCEPT
+    SemaphoreWaitInfo & setValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & values_ ) VULKAN_HPP_NOEXCEPT
     {
       semaphoreCount = static_cast<uint32_t>( values_.size() );
       pValues        = values_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSemaphoreWaitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -148942,18 +108339,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSemaphoreWaitInfo *>( this );
     }
 
-    operator VkSemaphoreWaitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSemaphoreWaitInfo *>( this );
-    }
-
-    operator VkSemaphoreWaitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSemaphoreWaitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SemaphoreWaitFlags const &, uint32_t const &, const Semaphore * const &, const uint64_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &,
+               const uint64_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, semaphoreCount, pSemaphores, pValues );
@@ -148980,22 +108376,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType          = StructureType::eSemaphoreWaitInfo;
-    const void *       pNext          = {};
-    SemaphoreWaitFlags flags          = {};
-    uint32_t           semaphoreCount = {};
-    const Semaphore *  pSemaphores    = {};
-    const uint64_t *   pValues        = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType          = StructureType::eSemaphoreWaitInfo;
+    const void *                             pNext          = {};
+    VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags flags          = {};
+    uint32_t                                 semaphoreCount = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *  pSemaphores    = {};
+    const uint64_t *                         pValues        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSemaphoreWaitInfo>
-  {
-    using Type = SemaphoreWaitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSemaphoreWaitInfo>
   {
@@ -149004,8 +108392,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SemaphoreWaitInfoKHR = SemaphoreWaitInfo;
 
-  // wrapper struct for struct VkSetDescriptorBufferOffsetsInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSetDescriptorBufferOffsetsInfoEXT.html
   struct SetDescriptorBufferOffsetsInfoEXT
   {
     using NativeType = VkSetDescriptorBufferOffsetsInfoEXT;
@@ -149013,21 +108399,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSetDescriptorBufferOffsetsInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SetDescriptorBufferOffsetsInfoEXT( ShaderStageFlags   stageFlags_     = {},
-                                                            PipelineLayout     layout_         = {},
-                                                            uint32_t           firstSet_       = {},
-                                                            uint32_t           setCount_       = {},
-                                                            const uint32_t *   pBufferIndices_ = {},
-                                                            const DeviceSize * pOffsets_       = {},
-                                                            const void *       pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stageFlags{ stageFlags_ }
-      , layout{ layout_ }
-      , firstSet{ firstSet_ }
-      , setCount{ setCount_ }
-      , pBufferIndices{ pBufferIndices_ }
-      , pOffsets{ pOffsets_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SetDescriptorBufferOffsetsInfoEXT( VULKAN_HPP_NAMESPACE::ShaderStageFlags   stageFlags_     = {},
+                                                            VULKAN_HPP_NAMESPACE::PipelineLayout     layout_         = {},
+                                                            uint32_t                                 firstSet_       = {},
+                                                            uint32_t                                 setCount_       = {},
+                                                            const uint32_t *                         pBufferIndices_ = {},
+                                                            const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets_       = {},
+                                                            const void *                             pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stageFlags( stageFlags_ )
+      , layout( layout_ )
+      , firstSet( firstSet_ )
+      , setCount( setCount_ )
+      , pBufferIndices( pBufferIndices_ )
+      , pOffsets( pOffsets_ )
     {
     }
 
@@ -149039,12 +108425,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SetDescriptorBufferOffsetsInfoEXT( ShaderStageFlags                                  stageFlags_,
-                                       PipelineLayout                                    layout_,
-                                       uint32_t                                          firstSet_,
-                                       ArrayProxyNoTemporaries<const uint32_t> const &   bufferIndices_,
-                                       ArrayProxyNoTemporaries<const DeviceSize> const & offsets_ = {},
-                                       const void *                                      pNext_   = nullptr )
+    SetDescriptorBufferOffsetsInfoEXT( VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                        stageFlags_,
+                                       VULKAN_HPP_NAMESPACE::PipelineLayout                                                          layout_,
+                                       uint32_t                                                                                      firstSet_,
+                                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                         bufferIndices_,
+                                       VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets_ = {},
+                                       const void *                                                                                  pNext_   = nullptr )
       : pNext( pNext_ )
       , stageFlags( stageFlags_ )
       , layout( layout_ )
@@ -149066,28 +108452,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SetDescriptorBufferOffsetsInfoEXT & operator=( SetDescriptorBufferOffsetsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SetDescriptorBufferOffsetsInfoEXT & operator=( VkSetDescriptorBufferOffsetsInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SetDescriptorBufferOffsetsInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SetDescriptorBufferOffsetsInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setStageFlags( ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setStageFlags( VULKAN_HPP_NAMESPACE::ShaderStageFlags stageFlags_ ) VULKAN_HPP_NOEXCEPT
     {
       stageFlags = stageFlags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setLayout( PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setLayout( VULKAN_HPP_NAMESPACE::PipelineLayout layout_ ) VULKAN_HPP_NOEXCEPT
     {
       layout = layout_;
       return *this;
@@ -149112,7 +108498,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SetDescriptorBufferOffsetsInfoEXT & setBufferIndices( ArrayProxyNoTemporaries<const uint32_t> const & bufferIndices_ ) VULKAN_HPP_NOEXCEPT
+    SetDescriptorBufferOffsetsInfoEXT &
+      setBufferIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & bufferIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       setCount       = static_cast<uint32_t>( bufferIndices_.size() );
       pBufferIndices = bufferIndices_.data();
@@ -149120,21 +108507,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setPOffsets( const DeviceSize * pOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SetDescriptorBufferOffsetsInfoEXT & setPOffsets( const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       pOffsets = pOffsets_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SetDescriptorBufferOffsetsInfoEXT & setOffsets( ArrayProxyNoTemporaries<const DeviceSize> const & offsets_ ) VULKAN_HPP_NOEXCEPT
+    SetDescriptorBufferOffsetsInfoEXT &
+      setOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceSize> const & offsets_ ) VULKAN_HPP_NOEXCEPT
     {
       setCount = static_cast<uint32_t>( offsets_.size() );
       pOffsets = offsets_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSetDescriptorBufferOffsetsInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -149146,25 +108534,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSetDescriptorBufferOffsetsInfoEXT *>( this );
     }
 
-    operator VkSetDescriptorBufferOffsetsInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSetDescriptorBufferOffsetsInfoEXT *>( this );
-    }
-
-    operator VkSetDescriptorBufferOffsetsInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSetDescriptorBufferOffsetsInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ShaderStageFlags const &,
-               PipelineLayout const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::PipelineLayout const &,
                uint32_t const &,
                uint32_t const &,
                const uint32_t * const &,
-               const DeviceSize * const &>
+               const VULKAN_HPP_NAMESPACE::DeviceSize * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stageFlags, layout, firstSet, setCount, pBufferIndices, pOffsets );
@@ -149191,31 +108573,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType          = StructureType::eSetDescriptorBufferOffsetsInfoEXT;
-    const void *       pNext          = {};
-    ShaderStageFlags   stageFlags     = {};
-    PipelineLayout     layout         = {};
-    uint32_t           firstSet       = {};
-    uint32_t           setCount       = {};
-    const uint32_t *   pBufferIndices = {};
-    const DeviceSize * pOffsets       = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType          = StructureType::eSetDescriptorBufferOffsetsInfoEXT;
+    const void *                             pNext          = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags   stageFlags     = {};
+    VULKAN_HPP_NAMESPACE::PipelineLayout     layout         = {};
+    uint32_t                                 firstSet       = {};
+    uint32_t                                 setCount       = {};
+    const uint32_t *                         pBufferIndices = {};
+    const VULKAN_HPP_NAMESPACE::DeviceSize * pOffsets       = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSetDescriptorBufferOffsetsInfoEXT>
-  {
-    using Type = SetDescriptorBufferOffsetsInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSetDescriptorBufferOffsetsInfoEXT>
   {
     using Type = SetDescriptorBufferOffsetsInfoEXT;
   };
 
-  // wrapper struct for struct VkSetLatencyMarkerInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSetLatencyMarkerInfoNV.html
   struct SetLatencyMarkerInfoNV
   {
     using NativeType = VkSetLatencyMarkerInfoNV;
@@ -149223,13 +108596,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSetLatencyMarkerInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SetLatencyMarkerInfoNV( uint64_t        presentID_ = {},
-                                                 LatencyMarkerNV marker_    = LatencyMarkerNV::eSimulationStart,
-                                                 const void *    pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentID{ presentID_ }
-      , marker{ marker_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SetLatencyMarkerInfoNV( uint64_t                              presentID_ = {},
+                                                 VULKAN_HPP_NAMESPACE::LatencyMarkerNV marker_    = VULKAN_HPP_NAMESPACE::LatencyMarkerNV::eSimulationStart,
+                                                 const void *                          pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentID( presentID_ )
+      , marker( marker_ )
     {
     }
 
@@ -149241,15 +108614,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SetLatencyMarkerInfoNV & operator=( SetLatencyMarkerInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SetLatencyMarkerInfoNV & operator=( VkSetLatencyMarkerInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SetLatencyMarkerInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SetLatencyMarkerInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SetLatencyMarkerInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -149262,12 +108635,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SetLatencyMarkerInfoNV & setMarker( LatencyMarkerNV marker_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SetLatencyMarkerInfoNV & setMarker( VULKAN_HPP_NAMESPACE::LatencyMarkerNV marker_ ) VULKAN_HPP_NOEXCEPT
     {
       marker = marker_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSetLatencyMarkerInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -149279,18 +108652,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSetLatencyMarkerInfoNV *>( this );
     }
 
-    operator VkSetLatencyMarkerInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSetLatencyMarkerInfoNV *>( this );
-    }
-
-    operator VkSetLatencyMarkerInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSetLatencyMarkerInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, LatencyMarkerNV const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &, VULKAN_HPP_NAMESPACE::LatencyMarkerNV const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentID, marker );
     }
@@ -149315,153 +108683,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType     = StructureType::eSetLatencyMarkerInfoNV;
-    const void *    pNext     = {};
-    uint64_t        presentID = {};
-    LatencyMarkerNV marker    = LatencyMarkerNV::eSimulationStart;
+    VULKAN_HPP_NAMESPACE::StructureType   sType     = StructureType::eSetLatencyMarkerInfoNV;
+    const void *                          pNext     = {};
+    uint64_t                              presentID = {};
+    VULKAN_HPP_NAMESPACE::LatencyMarkerNV marker    = VULKAN_HPP_NAMESPACE::LatencyMarkerNV::eSimulationStart;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSetLatencyMarkerInfoNV>
-  {
-    using Type = SetLatencyMarkerInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSetLatencyMarkerInfoNV>
   {
     using Type = SetLatencyMarkerInfoNV;
   };
 
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-  // wrapper struct for struct VkSetPresentConfigNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSetPresentConfigNV.html
-  struct SetPresentConfigNV
-  {
-    using NativeType = VkSetPresentConfigNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSetPresentConfigNV;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SetPresentConfigNV( uint32_t numFramesPerBatch_ = {}, uint32_t presentConfigFeedback_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , numFramesPerBatch{ numFramesPerBatch_ }
-      , presentConfigFeedback{ presentConfigFeedback_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SetPresentConfigNV( SetPresentConfigNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SetPresentConfigNV( VkSetPresentConfigNV const & rhs ) VULKAN_HPP_NOEXCEPT : SetPresentConfigNV( *reinterpret_cast<SetPresentConfigNV const *>( &rhs ) ) {}
-
-    SetPresentConfigNV & operator=( SetPresentConfigNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SetPresentConfigNV & operator=( VkSetPresentConfigNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SetPresentConfigNV const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SetPresentConfigNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SetPresentConfigNV & setNumFramesPerBatch( uint32_t numFramesPerBatch_ ) VULKAN_HPP_NOEXCEPT
-    {
-      numFramesPerBatch = numFramesPerBatch_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SetPresentConfigNV & setPresentConfigFeedback( uint32_t presentConfigFeedback_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentConfigFeedback = presentConfigFeedback_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSetPresentConfigNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSetPresentConfigNV *>( this );
-    }
-
-    operator VkSetPresentConfigNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSetPresentConfigNV *>( this );
-    }
-
-    operator VkSetPresentConfigNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSetPresentConfigNV *>( this );
-    }
-
-    operator VkSetPresentConfigNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSetPresentConfigNV *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, numFramesPerBatch, presentConfigFeedback );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SetPresentConfigNV const & ) const = default;
-#  else
-    bool operator==( SetPresentConfigNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( numFramesPerBatch == rhs.numFramesPerBatch ) &&
-             ( presentConfigFeedback == rhs.presentConfigFeedback );
-#    endif
-    }
-
-    bool operator!=( SetPresentConfigNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType sType                 = StructureType::eSetPresentConfigNV;
-    const void *  pNext                 = {};
-    uint32_t      numFramesPerBatch     = {};
-    uint32_t      presentConfigFeedback = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSetPresentConfigNV>
-  {
-    using Type = SetPresentConfigNV;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSetPresentConfigNV>
-  {
-    using Type = SetPresentConfigNV;
-  };
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-
-  // wrapper struct for struct VkSetStateFlagsIndirectCommandNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSetStateFlagsIndirectCommandNV.html
   struct SetStateFlagsIndirectCommandNV
   {
     using NativeType = VkSetStateFlagsIndirectCommandNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SetStateFlagsIndirectCommandNV( uint32_t data_ = {} ) VULKAN_HPP_NOEXCEPT : data{ data_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SetStateFlagsIndirectCommandNV( uint32_t data_ = {} ) VULKAN_HPP_NOEXCEPT : data( data_ ) {}
 
     VULKAN_HPP_CONSTEXPR SetStateFlagsIndirectCommandNV( SetStateFlagsIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
@@ -149471,21 +108710,21 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SetStateFlagsIndirectCommandNV & operator=( SetStateFlagsIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SetStateFlagsIndirectCommandNV & operator=( VkSetStateFlagsIndirectCommandNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SetStateFlagsIndirectCommandNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SetStateFlagsIndirectCommandNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SetStateFlagsIndirectCommandNV & setData( uint32_t data_ ) VULKAN_HPP_NOEXCEPT
     {
       data = data_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSetStateFlagsIndirectCommandNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -149497,18 +108736,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSetStateFlagsIndirectCommandNV *>( this );
     }
 
-    operator VkSetStateFlagsIndirectCommandNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSetStateFlagsIndirectCommandNV *>( this );
-    }
-
-    operator VkSetStateFlagsIndirectCommandNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSetStateFlagsIndirectCommandNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( data );
     }
@@ -149536,15 +108770,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t data = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSetStateFlagsIndirectCommandNV>
-  {
-    using Type = SetStateFlagsIndirectCommandNV;
-  };
-#endif
-
-  // wrapper struct for struct VkShaderCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderCreateInfoEXT.html
   struct ShaderCreateInfoEXT
   {
     using NativeType = VkShaderCreateInfoEXT;
@@ -149552,33 +108777,33 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eShaderCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ShaderCreateInfoEXT( ShaderCreateFlagsEXT        flags_                  = {},
-                                              ShaderStageFlagBits         stage_                  = ShaderStageFlagBits::eVertex,
-                                              ShaderStageFlags            nextStage_              = {},
-                                              ShaderCodeTypeEXT           codeType_               = ShaderCodeTypeEXT::eBinary,
-                                              size_t                      codeSize_               = {},
-                                              const void *                pCode_                  = {},
-                                              const char *                pName_                  = {},
-                                              uint32_t                    setLayoutCount_         = {},
-                                              const DescriptorSetLayout * pSetLayouts_            = {},
-                                              uint32_t                    pushConstantRangeCount_ = {},
-                                              const PushConstantRange *   pPushConstantRanges_    = {},
-                                              const SpecializationInfo *  pSpecializationInfo_    = {},
-                                              const void *                pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , stage{ stage_ }
-      , nextStage{ nextStage_ }
-      , codeType{ codeType_ }
-      , codeSize{ codeSize_ }
-      , pCode{ pCode_ }
-      , pName{ pName_ }
-      , setLayoutCount{ setLayoutCount_ }
-      , pSetLayouts{ pSetLayouts_ }
-      , pushConstantRangeCount{ pushConstantRangeCount_ }
-      , pPushConstantRanges{ pPushConstantRanges_ }
-      , pSpecializationInfo{ pSpecializationInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ShaderCreateInfoEXT( VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT        flags_     = {},
+                                              VULKAN_HPP_NAMESPACE::ShaderStageFlagBits         stage_     = VULKAN_HPP_NAMESPACE::ShaderStageFlagBits::eVertex,
+                                              VULKAN_HPP_NAMESPACE::ShaderStageFlags            nextStage_ = {},
+                                              VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT           codeType_  = VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT::eBinary,
+                                              size_t                                            codeSize_  = {},
+                                              const void *                                      pCode_     = {},
+                                              const char *                                      pName_     = {},
+                                              uint32_t                                          setLayoutCount_         = {},
+                                              const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_            = {},
+                                              uint32_t                                          pushConstantRangeCount_ = {},
+                                              const VULKAN_HPP_NAMESPACE::PushConstantRange *   pPushConstantRanges_    = {},
+                                              const VULKAN_HPP_NAMESPACE::SpecializationInfo *  pSpecializationInfo_    = {},
+                                              const void *                                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , stage( stage_ )
+      , nextStage( nextStage_ )
+      , codeType( codeType_ )
+      , codeSize( codeSize_ )
+      , pCode( pCode_ )
+      , pName( pName_ )
+      , setLayoutCount( setLayoutCount_ )
+      , pSetLayouts( pSetLayouts_ )
+      , pushConstantRangeCount( pushConstantRangeCount_ )
+      , pPushConstantRanges( pPushConstantRanges_ )
+      , pSpecializationInfo( pSpecializationInfo_ )
     {
     }
 
@@ -149590,16 +108815,16 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    ShaderCreateInfoEXT( ShaderCreateFlagsEXT                                       flags_,
-                         ShaderStageFlagBits                                        stage_,
-                         ShaderStageFlags                                           nextStage_,
-                         ShaderCodeTypeEXT                                          codeType_,
-                         ArrayProxyNoTemporaries<const T> const &                   code_,
-                         const char *                                               pName_               = {},
-                         ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_          = {},
-                         ArrayProxyNoTemporaries<const PushConstantRange> const &   pushConstantRanges_  = {},
-                         const SpecializationInfo *                                 pSpecializationInfo_ = {},
-                         const void *                                               pNext_               = nullptr )
+    ShaderCreateInfoEXT( VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT                                                             flags_,
+                         VULKAN_HPP_NAMESPACE::ShaderStageFlagBits                                                              stage_,
+                         VULKAN_HPP_NAMESPACE::ShaderStageFlags                                                                 nextStage_,
+                         VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT                                                                codeType_,
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const &                                         code_,
+                         const char *                                                                                           pName_               = {},
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_          = {},
+                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PushConstantRange> const &   pushConstantRanges_  = {},
+                         const VULKAN_HPP_NAMESPACE::SpecializationInfo *                                                       pSpecializationInfo_ = {},
+                         const void *                                                                                           pNext_               = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , stage( stage_ )
@@ -149618,40 +108843,40 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ShaderCreateInfoEXT & operator=( ShaderCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderCreateInfoEXT & operator=( VkShaderCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setFlags( ShaderCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setStage( ShaderStageFlagBits stage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setStage( VULKAN_HPP_NAMESPACE::ShaderStageFlagBits stage_ ) VULKAN_HPP_NOEXCEPT
     {
       stage = stage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setNextStage( ShaderStageFlags nextStage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setNextStage( VULKAN_HPP_NAMESPACE::ShaderStageFlags nextStage_ ) VULKAN_HPP_NOEXCEPT
     {
       nextStage = nextStage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setCodeType( ShaderCodeTypeEXT codeType_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setCodeType( VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT codeType_ ) VULKAN_HPP_NOEXCEPT
     {
       codeType = codeType_;
       return *this;
@@ -149671,7 +108896,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    ShaderCreateInfoEXT & setCode( ArrayProxyNoTemporaries<const T> const & code_ ) VULKAN_HPP_NOEXCEPT
+    ShaderCreateInfoEXT & setCode( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & code_ ) VULKAN_HPP_NOEXCEPT
     {
       codeSize = code_.size() * sizeof( T );
       pCode    = code_.data();
@@ -149691,14 +108916,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setPSetLayouts( const DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setPSetLayouts( const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       pSetLayouts = pSetLayouts_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShaderCreateInfoEXT & setSetLayouts( ArrayProxyNoTemporaries<const DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
+    ShaderCreateInfoEXT &
+      setSetLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
     {
       setLayoutCount = static_cast<uint32_t>( setLayouts_.size() );
       pSetLayouts    = setLayouts_.data();
@@ -149712,14 +108938,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setPPushConstantRanges( const PushConstantRange * pPushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT &
+      setPPushConstantRanges( const VULKAN_HPP_NAMESPACE::PushConstantRange * pPushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
     {
       pPushConstantRanges = pPushConstantRanges_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShaderCreateInfoEXT & setPushConstantRanges( ArrayProxyNoTemporaries<const PushConstantRange> const & pushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
+    ShaderCreateInfoEXT & setPushConstantRanges(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PushConstantRange> const & pushConstantRanges_ ) VULKAN_HPP_NOEXCEPT
     {
       pushConstantRangeCount = static_cast<uint32_t>( pushConstantRanges_.size() );
       pPushConstantRanges    = pushConstantRanges_.data();
@@ -149727,12 +108955,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT & setPSpecializationInfo( const SpecializationInfo * pSpecializationInfo_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderCreateInfoEXT &
+      setPSpecializationInfo( const VULKAN_HPP_NAMESPACE::SpecializationInfo * pSpecializationInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pSpecializationInfo = pSpecializationInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkShaderCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -149744,31 +108973,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderCreateInfoEXT *>( this );
     }
 
-    operator VkShaderCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderCreateInfoEXT *>( this );
-    }
-
-    operator VkShaderCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               ShaderCreateFlagsEXT const &,
-               ShaderStageFlagBits const &,
-               ShaderStageFlags const &,
-               ShaderCodeTypeEXT const &,
+               VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT const &,
                size_t const &,
                const void * const &,
                const char * const &,
                uint32_t const &,
-               const DescriptorSetLayout * const &,
+               const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * const &,
                uint32_t const &,
-               const PushConstantRange * const &,
-               const SpecializationInfo * const &>
+               const VULKAN_HPP_NAMESPACE::PushConstantRange * const &,
+               const VULKAN_HPP_NAMESPACE::SpecializationInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -149840,37 +109063,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType               sType                  = StructureType::eShaderCreateInfoEXT;
-    const void *                pNext                  = {};
-    ShaderCreateFlagsEXT        flags                  = {};
-    ShaderStageFlagBits         stage                  = ShaderStageFlagBits::eVertex;
-    ShaderStageFlags            nextStage              = {};
-    ShaderCodeTypeEXT           codeType               = ShaderCodeTypeEXT::eBinary;
-    size_t                      codeSize               = {};
-    const void *                pCode                  = {};
-    const char *                pName                  = {};
-    uint32_t                    setLayoutCount         = {};
-    const DescriptorSetLayout * pSetLayouts            = {};
-    uint32_t                    pushConstantRangeCount = {};
-    const PushConstantRange *   pPushConstantRanges    = {};
-    const SpecializationInfo *  pSpecializationInfo    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                  = StructureType::eShaderCreateInfoEXT;
+    const void *                                      pNext                  = {};
+    VULKAN_HPP_NAMESPACE::ShaderCreateFlagsEXT        flags                  = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlagBits         stage                  = VULKAN_HPP_NAMESPACE::ShaderStageFlagBits::eVertex;
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags            nextStage              = {};
+    VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT           codeType               = VULKAN_HPP_NAMESPACE::ShaderCodeTypeEXT::eBinary;
+    size_t                                            codeSize               = {};
+    const void *                                      pCode                  = {};
+    const char *                                      pName                  = {};
+    uint32_t                                          setLayoutCount         = {};
+    const VULKAN_HPP_NAMESPACE::DescriptorSetLayout * pSetLayouts            = {};
+    uint32_t                                          pushConstantRangeCount = {};
+    const VULKAN_HPP_NAMESPACE::PushConstantRange *   pPushConstantRanges    = {};
+    const VULKAN_HPP_NAMESPACE::SpecializationInfo *  pSpecializationInfo    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderCreateInfoEXT>
-  {
-    using Type = ShaderCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eShaderCreateInfoEXT>
   {
     using Type = ShaderCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkShaderModuleCreateInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModuleCreateInfo.html
   struct ShaderModuleCreateInfo
   {
     using NativeType = VkShaderModuleCreateInfo;
@@ -149878,15 +109092,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eShaderModuleCreateInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ShaderModuleCreateInfo( ShaderModuleCreateFlags flags_    = {},
-                                                 size_t                  codeSize_ = {},
-                                                 const uint32_t *        pCode_    = {},
-                                                 const void *            pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , codeSize{ codeSize_ }
-      , pCode{ pCode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ShaderModuleCreateInfo( VULKAN_HPP_NAMESPACE::ShaderModuleCreateFlags flags_    = {},
+                                                 size_t                                        codeSize_ = {},
+                                                 const uint32_t *                              pCode_    = {},
+                                                 const void *                                  pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , codeSize( codeSize_ )
+      , pCode( pCode_ )
     {
     }
 
@@ -149898,29 +109112,31 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShaderModuleCreateInfo( ShaderModuleCreateFlags flags_, ArrayProxyNoTemporaries<const uint32_t> const & code_, const void * pNext_ = nullptr )
+    ShaderModuleCreateInfo( VULKAN_HPP_NAMESPACE::ShaderModuleCreateFlags                         flags_,
+                            VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & code_,
+                            const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), codeSize( code_.size() * 4 ), pCode( code_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ShaderModuleCreateInfo & operator=( ShaderModuleCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderModuleCreateInfo & operator=( VkShaderModuleCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderModuleCreateInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderModuleCreateInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ShaderModuleCreateInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderModuleCreateInfo & setFlags( ShaderModuleCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderModuleCreateInfo & setFlags( VULKAN_HPP_NAMESPACE::ShaderModuleCreateFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -149939,14 +109155,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ShaderModuleCreateInfo & setCode( ArrayProxyNoTemporaries<const uint32_t> const & code_ ) VULKAN_HPP_NOEXCEPT
+    ShaderModuleCreateInfo & setCode( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & code_ ) VULKAN_HPP_NOEXCEPT
     {
       codeSize = code_.size() * 4;
       pCode    = code_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkShaderModuleCreateInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -149958,18 +109174,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderModuleCreateInfo *>( this );
     }
 
-    operator VkShaderModuleCreateInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderModuleCreateInfo *>( this );
-    }
-
-    operator VkShaderModuleCreateInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderModuleCreateInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ShaderModuleCreateFlags const &, size_t const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ShaderModuleCreateFlags const &,
+               size_t const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, codeSize, pCode );
@@ -149995,28 +109209,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType    = StructureType::eShaderModuleCreateInfo;
-    const void *            pNext    = {};
-    ShaderModuleCreateFlags flags    = {};
-    size_t                  codeSize = {};
-    const uint32_t *        pCode    = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType    = StructureType::eShaderModuleCreateInfo;
+    const void *                                  pNext    = {};
+    VULKAN_HPP_NAMESPACE::ShaderModuleCreateFlags flags    = {};
+    size_t                                        codeSize = {};
+    const uint32_t *                              pCode    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderModuleCreateInfo>
-  {
-    using Type = ShaderModuleCreateInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eShaderModuleCreateInfo>
   {
     using Type = ShaderModuleCreateInfo;
   };
 
-  // wrapper struct for struct VkShaderModuleIdentifierEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModuleIdentifierEXT.html
   struct ShaderModuleIdentifierEXT
   {
     using NativeType = VkShaderModuleIdentifierEXT;
@@ -150024,13 +109229,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eShaderModuleIdentifierEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 ShaderModuleIdentifierEXT( uint32_t                                                              identifierSize_ = {},
                                                        std::array<uint8_t, VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT> const & identifier_     = {},
                                                        void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , identifierSize{ identifierSize_ }
-      , identifier{ identifier_ }
+      : pNext( pNext_ )
+      , identifierSize( identifierSize_ )
+      , identifier( identifier_ )
     {
     }
 
@@ -150041,12 +109246,21 @@ namespace VULKAN_HPP_NAMESPACE
     {
     }
 
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    ShaderModuleIdentifierEXT( VULKAN_HPP_NAMESPACE::ArrayProxy<uint8_t> const & identifier_, void * pNext_ = nullptr )
+      : pNext( pNext_ ), identifierSize( std::min( static_cast<uint32_t>( identifier_.size() ), VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT ) )
+    {
+      VULKAN_HPP_ASSERT( identifier_.size() < VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT );
+      memcpy( identifier, identifier_.data(), identifierSize * sizeof( uint8_t ) );
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
     ShaderModuleIdentifierEXT & operator=( ShaderModuleIdentifierEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderModuleIdentifierEXT & operator=( VkShaderModuleIdentifierEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderModuleIdentifierEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderModuleIdentifierEXT const *>( &rhs );
       return *this;
     }
 
@@ -150060,18 +109274,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderModuleIdentifierEXT *>( this );
     }
 
-    operator VkShaderModuleIdentifierEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderModuleIdentifierEXT *>( this );
-    }
-
-    operator VkShaderModuleIdentifierEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderModuleIdentifierEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, ArrayWrapper1D<uint8_t, VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT> const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, identifierSize, identifier );
@@ -150109,28 +109320,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                                                     sType          = StructureType::eShaderModuleIdentifierEXT;
-    void *                                                            pNext          = {};
-    uint32_t                                                          identifierSize = {};
-    ArrayWrapper1D<uint8_t, VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT> identifier     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                                     sType          = StructureType::eShaderModuleIdentifierEXT;
+    void *                                                                                  pNext          = {};
+    uint32_t                                                                                identifierSize = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, VK_MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT> identifier     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderModuleIdentifierEXT>
-  {
-    using Type = ShaderModuleIdentifierEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eShaderModuleIdentifierEXT>
   {
     using Type = ShaderModuleIdentifierEXT;
   };
 
-  // wrapper struct for struct VkShaderModuleValidationCacheCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderModuleValidationCacheCreateInfoEXT.html
   struct ShaderModuleValidationCacheCreateInfoEXT
   {
     using NativeType = VkShaderModuleValidationCacheCreateInfoEXT;
@@ -150138,10 +109339,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eShaderModuleValidationCacheCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ShaderModuleValidationCacheCreateInfoEXT( ValidationCacheEXT validationCache_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , validationCache{ validationCache_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ShaderModuleValidationCacheCreateInfoEXT( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache_ = {},
+                                                                   const void *                             pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , validationCache( validationCache_ )
     {
     }
 
@@ -150153,27 +109355,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ShaderModuleValidationCacheCreateInfoEXT & operator=( ShaderModuleValidationCacheCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderModuleValidationCacheCreateInfoEXT & operator=( VkShaderModuleValidationCacheCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderModuleValidationCacheCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderModuleValidationCacheCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ShaderModuleValidationCacheCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ShaderModuleValidationCacheCreateInfoEXT & setValidationCache( ValidationCacheEXT validationCache_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ShaderModuleValidationCacheCreateInfoEXT &
+      setValidationCache( VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache_ ) VULKAN_HPP_NOEXCEPT
     {
       validationCache = validationCache_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkShaderModuleValidationCacheCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -150185,18 +109388,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderModuleValidationCacheCreateInfoEXT *>( this );
     }
 
-    operator VkShaderModuleValidationCacheCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderModuleValidationCacheCreateInfoEXT *>( this );
-    }
-
-    operator VkShaderModuleValidationCacheCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderModuleValidationCacheCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ValidationCacheEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ValidationCacheEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, validationCache );
     }
@@ -150221,41 +109419,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType           = StructureType::eShaderModuleValidationCacheCreateInfoEXT;
-    const void *       pNext           = {};
-    ValidationCacheEXT validationCache = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType           = StructureType::eShaderModuleValidationCacheCreateInfoEXT;
+    const void *                             pNext           = {};
+    VULKAN_HPP_NAMESPACE::ValidationCacheEXT validationCache = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderModuleValidationCacheCreateInfoEXT>
-  {
-    using Type = ShaderModuleValidationCacheCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eShaderModuleValidationCacheCreateInfoEXT>
   {
     using Type = ShaderModuleValidationCacheCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkShaderResourceUsageAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderResourceUsageAMD.html
   struct ShaderResourceUsageAMD
   {
     using NativeType = VkShaderResourceUsageAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR ShaderResourceUsageAMD( uint32_t numUsedVgprs_             = {},
                                                  uint32_t numUsedSgprs_             = {},
                                                  uint32_t ldsSizePerLocalWorkGroup_ = {},
                                                  size_t   ldsUsageSizeInBytes_      = {},
                                                  size_t   scratchMemUsageInBytes_   = {} ) VULKAN_HPP_NOEXCEPT
-      : numUsedVgprs{ numUsedVgprs_ }
-      , numUsedSgprs{ numUsedSgprs_ }
-      , ldsSizePerLocalWorkGroup{ ldsSizePerLocalWorkGroup_ }
-      , ldsUsageSizeInBytes{ ldsUsageSizeInBytes_ }
-      , scratchMemUsageInBytes{ scratchMemUsageInBytes_ }
+      : numUsedVgprs( numUsedVgprs_ )
+      , numUsedSgprs( numUsedSgprs_ )
+      , ldsSizePerLocalWorkGroup( ldsSizePerLocalWorkGroup_ )
+      , ldsUsageSizeInBytes( ldsUsageSizeInBytes_ )
+      , scratchMemUsageInBytes( scratchMemUsageInBytes_ )
     {
     }
 
@@ -150267,11 +109456,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ShaderResourceUsageAMD & operator=( ShaderResourceUsageAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderResourceUsageAMD & operator=( VkShaderResourceUsageAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderResourceUsageAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD const *>( &rhs );
       return *this;
     }
 
@@ -150285,18 +109474,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderResourceUsageAMD *>( this );
     }
 
-    operator VkShaderResourceUsageAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderResourceUsageAMD *>( this );
-    }
-
-    operator VkShaderResourceUsageAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderResourceUsageAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, size_t const &, size_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &, size_t const &, size_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( numUsedVgprs, numUsedSgprs, ldsSizePerLocalWorkGroup, ldsUsageSizeInBytes, scratchMemUsageInBytes );
     }
@@ -150329,34 +109513,25 @@ namespace VULKAN_HPP_NAMESPACE
     size_t   scratchMemUsageInBytes   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderResourceUsageAMD>
-  {
-    using Type = ShaderResourceUsageAMD;
-  };
-#endif
-
-  // wrapper struct for struct VkShaderStatisticsInfoAMD, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkShaderStatisticsInfoAMD.html
   struct ShaderStatisticsInfoAMD
   {
     using NativeType = VkShaderStatisticsInfoAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 ShaderStatisticsInfoAMD( ShaderStageFlags                shaderStageMask_      = {},
-                                                     ShaderResourceUsageAMD          resourceUsage_        = {},
-                                                     uint32_t                        numPhysicalVgprs_     = {},
-                                                     uint32_t                        numPhysicalSgprs_     = {},
-                                                     uint32_t                        numAvailableVgprs_    = {},
-                                                     uint32_t                        numAvailableSgprs_    = {},
-                                                     std::array<uint32_t, 3> const & computeWorkGroupSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : shaderStageMask{ shaderStageMask_ }
-      , resourceUsage{ resourceUsage_ }
-      , numPhysicalVgprs{ numPhysicalVgprs_ }
-      , numPhysicalSgprs{ numPhysicalSgprs_ }
-      , numAvailableVgprs{ numAvailableVgprs_ }
-      , numAvailableSgprs{ numAvailableSgprs_ }
-      , computeWorkGroupSize{ computeWorkGroupSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 ShaderStatisticsInfoAMD( VULKAN_HPP_NAMESPACE::ShaderStageFlags       shaderStageMask_      = {},
+                                                     VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD resourceUsage_        = {},
+                                                     uint32_t                                     numPhysicalVgprs_     = {},
+                                                     uint32_t                                     numPhysicalSgprs_     = {},
+                                                     uint32_t                                     numAvailableVgprs_    = {},
+                                                     uint32_t                                     numAvailableSgprs_    = {},
+                                                     std::array<uint32_t, 3> const &              computeWorkGroupSize_ = {} ) VULKAN_HPP_NOEXCEPT
+      : shaderStageMask( shaderStageMask_ )
+      , resourceUsage( resourceUsage_ )
+      , numPhysicalVgprs( numPhysicalVgprs_ )
+      , numPhysicalSgprs( numPhysicalSgprs_ )
+      , numAvailableVgprs( numAvailableVgprs_ )
+      , numAvailableSgprs( numAvailableSgprs_ )
+      , computeWorkGroupSize( computeWorkGroupSize_ )
     {
     }
 
@@ -150368,11 +109543,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ShaderStatisticsInfoAMD & operator=( ShaderStatisticsInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ShaderStatisticsInfoAMD & operator=( VkShaderStatisticsInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ShaderStatisticsInfoAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ShaderStatisticsInfoAMD const *>( &rhs );
       return *this;
     }
 
@@ -150386,24 +109561,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkShaderStatisticsInfoAMD *>( this );
     }
 
-    operator VkShaderStatisticsInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkShaderStatisticsInfoAMD *>( this );
-    }
-
-    operator VkShaderStatisticsInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkShaderStatisticsInfoAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ShaderStageFlags const &,
-               ShaderResourceUsageAMD const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ShaderStageFlags const &,
+               VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               ArrayWrapper1D<uint32_t, 3> const &>
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( shaderStageMask, resourceUsage, numPhysicalVgprs, numPhysicalSgprs, numAvailableVgprs, numAvailableSgprs, computeWorkGroupSize );
@@ -150431,25 +109600,15 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ShaderStageFlags            shaderStageMask      = {};
-    ShaderResourceUsageAMD      resourceUsage        = {};
-    uint32_t                    numPhysicalVgprs     = {};
-    uint32_t                    numPhysicalSgprs     = {};
-    uint32_t                    numAvailableVgprs    = {};
-    uint32_t                    numAvailableSgprs    = {};
-    ArrayWrapper1D<uint32_t, 3> computeWorkGroupSize = {};
+    VULKAN_HPP_NAMESPACE::ShaderStageFlags            shaderStageMask      = {};
+    VULKAN_HPP_NAMESPACE::ShaderResourceUsageAMD      resourceUsage        = {};
+    uint32_t                                          numPhysicalVgprs     = {};
+    uint32_t                                          numPhysicalSgprs     = {};
+    uint32_t                                          numAvailableVgprs    = {};
+    uint32_t                                          numAvailableSgprs    = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, 3> computeWorkGroupSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkShaderStatisticsInfoAMD>
-  {
-    using Type = ShaderStatisticsInfoAMD;
-  };
-#endif
-
-  // wrapper struct for struct VkSharedPresentSurfaceCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSharedPresentSurfaceCapabilitiesKHR.html
   struct SharedPresentSurfaceCapabilitiesKHR
   {
     using NativeType = VkSharedPresentSurfaceCapabilitiesKHR;
@@ -150457,11 +109616,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSharedPresentSurfaceCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SharedPresentSurfaceCapabilitiesKHR( ImageUsageFlags sharedPresentSupportedUsageFlags_ = {},
-                                                              void *          pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , sharedPresentSupportedUsageFlags{ sharedPresentSupportedUsageFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SharedPresentSurfaceCapabilitiesKHR( VULKAN_HPP_NAMESPACE::ImageUsageFlags sharedPresentSupportedUsageFlags_ = {},
+                                                              void *                                pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , sharedPresentSupportedUsageFlags( sharedPresentSupportedUsageFlags_ )
     {
     }
 
@@ -150473,11 +109632,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SharedPresentSurfaceCapabilitiesKHR & operator=( SharedPresentSurfaceCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SharedPresentSurfaceCapabilitiesKHR & operator=( VkSharedPresentSurfaceCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SharedPresentSurfaceCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SharedPresentSurfaceCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -150491,18 +109650,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSharedPresentSurfaceCapabilitiesKHR *>( this );
     }
 
-    operator VkSharedPresentSurfaceCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSharedPresentSurfaceCapabilitiesKHR *>( this );
-    }
-
-    operator VkSharedPresentSurfaceCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSharedPresentSurfaceCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, ImageUsageFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, sharedPresentSupportedUsageFlags );
     }
@@ -150527,36 +109681,28 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType                            = StructureType::eSharedPresentSurfaceCapabilitiesKHR;
-    void *          pNext                            = {};
-    ImageUsageFlags sharedPresentSupportedUsageFlags = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType                            = StructureType::eSharedPresentSurfaceCapabilitiesKHR;
+    void *                                pNext                            = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags sharedPresentSupportedUsageFlags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSharedPresentSurfaceCapabilitiesKHR>
-  {
-    using Type = SharedPresentSurfaceCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSharedPresentSurfaceCapabilitiesKHR>
   {
     using Type = SharedPresentSurfaceCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkSparseImageFormatProperties, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageFormatProperties.html
   struct SparseImageFormatProperties
   {
     using NativeType = VkSparseImageFormatProperties;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SparseImageFormatProperties( ImageAspectFlags aspectMask_ = {}, Extent3D imageGranularity_ = {}, SparseImageFormatFlags flags_ = {} ) VULKAN_HPP_NOEXCEPT
-      : aspectMask{ aspectMask_ }
-      , imageGranularity{ imageGranularity_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageFormatProperties( VULKAN_HPP_NAMESPACE::ImageAspectFlags       aspectMask_       = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent3D               imageGranularity_ = {},
+                                                      VULKAN_HPP_NAMESPACE::SparseImageFormatFlags flags_            = {} ) VULKAN_HPP_NOEXCEPT
+      : aspectMask( aspectMask_ )
+      , imageGranularity( imageGranularity_ )
+      , flags( flags_ )
     {
     }
 
@@ -150568,11 +109714,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SparseImageFormatProperties & operator=( SparseImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageFormatProperties & operator=( VkSparseImageFormatProperties const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageFormatProperties const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties const *>( &rhs );
       return *this;
     }
 
@@ -150586,18 +109732,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageFormatProperties *>( this );
     }
 
-    operator VkSparseImageFormatProperties const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageFormatProperties *>( this );
-    }
-
-    operator VkSparseImageFormatProperties *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageFormatProperties *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<ImageAspectFlags const &, Extent3D const &, SparseImageFormatFlags const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::ImageAspectFlags const &, VULKAN_HPP_NAMESPACE::Extent3D const &, VULKAN_HPP_NAMESPACE::SparseImageFormatFlags const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( aspectMask, imageGranularity, flags );
     }
@@ -150622,20 +109763,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    ImageAspectFlags       aspectMask       = {};
-    Extent3D               imageGranularity = {};
-    SparseImageFormatFlags flags            = {};
+    VULKAN_HPP_NAMESPACE::ImageAspectFlags       aspectMask       = {};
+    VULKAN_HPP_NAMESPACE::Extent3D               imageGranularity = {};
+    VULKAN_HPP_NAMESPACE::SparseImageFormatFlags flags            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageFormatProperties>
-  {
-    using Type = SparseImageFormatProperties;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseImageFormatProperties2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageFormatProperties2.html
   struct SparseImageFormatProperties2
   {
     using NativeType = VkSparseImageFormatProperties2;
@@ -150643,10 +109775,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSparseImageFormatProperties2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseImageFormatProperties2( SparseImageFormatProperties properties_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , properties{ properties_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageFormatProperties2( VULKAN_HPP_NAMESPACE::SparseImageFormatProperties properties_ = {},
+                                                       void *                                            pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , properties( properties_ )
     {
     }
 
@@ -150658,11 +109791,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SparseImageFormatProperties2 & operator=( SparseImageFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageFormatProperties2 & operator=( VkSparseImageFormatProperties2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageFormatProperties2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties2 const *>( &rhs );
       return *this;
     }
 
@@ -150676,18 +109809,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageFormatProperties2 *>( this );
     }
 
-    operator VkSparseImageFormatProperties2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageFormatProperties2 *>( this );
-    }
-
-    operator VkSparseImageFormatProperties2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageFormatProperties2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SparseImageFormatProperties const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SparseImageFormatProperties const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, properties );
     }
@@ -150712,19 +109840,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType      = StructureType::eSparseImageFormatProperties2;
-    void *                      pNext      = {};
-    SparseImageFormatProperties properties = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType      = StructureType::eSparseImageFormatProperties2;
+    void *                                            pNext      = {};
+    VULKAN_HPP_NAMESPACE::SparseImageFormatProperties properties = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageFormatProperties2>
-  {
-    using Type = SparseImageFormatProperties2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSparseImageFormatProperties2>
   {
@@ -150733,23 +109853,21 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SparseImageFormatProperties2KHR = SparseImageFormatProperties2;
 
-  // wrapper struct for struct VkSparseImageMemoryRequirements, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageMemoryRequirements.html
   struct SparseImageMemoryRequirements
   {
     using NativeType = VkSparseImageMemoryRequirements;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseImageMemoryRequirements( SparseImageFormatProperties formatProperties_     = {},
-                                                        uint32_t                    imageMipTailFirstLod_ = {},
-                                                        DeviceSize                  imageMipTailSize_     = {},
-                                                        DeviceSize                  imageMipTailOffset_   = {},
-                                                        DeviceSize                  imageMipTailStride_   = {} ) VULKAN_HPP_NOEXCEPT
-      : formatProperties{ formatProperties_ }
-      , imageMipTailFirstLod{ imageMipTailFirstLod_ }
-      , imageMipTailSize{ imageMipTailSize_ }
-      , imageMipTailOffset{ imageMipTailOffset_ }
-      , imageMipTailStride{ imageMipTailStride_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageMemoryRequirements( VULKAN_HPP_NAMESPACE::SparseImageFormatProperties formatProperties_     = {},
+                                                        uint32_t                                          imageMipTailFirstLod_ = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailSize_     = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailOffset_   = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailStride_   = {} ) VULKAN_HPP_NOEXCEPT
+      : formatProperties( formatProperties_ )
+      , imageMipTailFirstLod( imageMipTailFirstLod_ )
+      , imageMipTailSize( imageMipTailSize_ )
+      , imageMipTailOffset( imageMipTailOffset_ )
+      , imageMipTailStride( imageMipTailStride_ )
     {
     }
 
@@ -150761,11 +109879,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SparseImageMemoryRequirements & operator=( SparseImageMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageMemoryRequirements & operator=( VkSparseImageMemoryRequirements const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageMemoryRequirements const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements const *>( &rhs );
       return *this;
     }
 
@@ -150779,18 +109897,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageMemoryRequirements *>( this );
     }
 
-    operator VkSparseImageMemoryRequirements const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageMemoryRequirements *>( this );
-    }
-
-    operator VkSparseImageMemoryRequirements *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageMemoryRequirements *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<SparseImageFormatProperties const &, uint32_t const &, DeviceSize const &, DeviceSize const &, DeviceSize const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::SparseImageFormatProperties const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( formatProperties, imageMipTailFirstLod, imageMipTailSize, imageMipTailOffset, imageMipTailStride );
@@ -150818,23 +109934,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    SparseImageFormatProperties formatProperties     = {};
-    uint32_t                    imageMipTailFirstLod = {};
-    DeviceSize                  imageMipTailSize     = {};
-    DeviceSize                  imageMipTailOffset   = {};
-    DeviceSize                  imageMipTailStride   = {};
+    VULKAN_HPP_NAMESPACE::SparseImageFormatProperties formatProperties     = {};
+    uint32_t                                          imageMipTailFirstLod = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailSize     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailOffset   = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                  imageMipTailStride   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageMemoryRequirements>
-  {
-    using Type = SparseImageMemoryRequirements;
-  };
-#endif
-
-  // wrapper struct for struct VkSparseImageMemoryRequirements2, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSparseImageMemoryRequirements2.html
   struct SparseImageMemoryRequirements2
   {
     using NativeType = VkSparseImageMemoryRequirements2;
@@ -150842,10 +109948,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSparseImageMemoryRequirements2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SparseImageMemoryRequirements2( SparseImageMemoryRequirements memoryRequirements_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryRequirements{ memoryRequirements_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SparseImageMemoryRequirements2( VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements memoryRequirements_ = {},
+                                                         void *                                              pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryRequirements( memoryRequirements_ )
     {
     }
 
@@ -150857,11 +109964,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SparseImageMemoryRequirements2 & operator=( SparseImageMemoryRequirements2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SparseImageMemoryRequirements2 & operator=( VkSparseImageMemoryRequirements2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SparseImageMemoryRequirements2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements2 const *>( &rhs );
       return *this;
     }
 
@@ -150875,18 +109982,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSparseImageMemoryRequirements2 *>( this );
     }
 
-    operator VkSparseImageMemoryRequirements2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSparseImageMemoryRequirements2 *>( this );
-    }
-
-    operator VkSparseImageMemoryRequirements2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSparseImageMemoryRequirements2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SparseImageMemoryRequirements const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryRequirements );
     }
@@ -150911,19 +110013,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType              = StructureType::eSparseImageMemoryRequirements2;
-    void *                        pNext              = {};
-    SparseImageMemoryRequirements memoryRequirements = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType              = StructureType::eSparseImageMemoryRequirements2;
+    void *                                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::SparseImageMemoryRequirements memoryRequirements = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSparseImageMemoryRequirements2>
-  {
-    using Type = SparseImageMemoryRequirements2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSparseImageMemoryRequirements2>
   {
@@ -150933,8 +110027,6 @@ namespace VULKAN_HPP_NAMESPACE
   using SparseImageMemoryRequirements2KHR = SparseImageMemoryRequirements2;
 
 #if defined( VK_USE_PLATFORM_GGP )
-  // wrapper struct for struct VkStreamDescriptorSurfaceCreateInfoGGP, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkStreamDescriptorSurfaceCreateInfoGGP.html
   struct StreamDescriptorSurfaceCreateInfoGGP
   {
     using NativeType = VkStreamDescriptorSurfaceCreateInfoGGP;
@@ -150942,13 +110034,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eStreamDescriptorSurfaceCreateInfoGGP;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR StreamDescriptorSurfaceCreateInfoGGP( StreamDescriptorSurfaceCreateFlagsGGP flags_            = {},
-                                                               GgpStreamDescriptor                   streamDescriptor_ = {},
-                                                               const void *                          pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , streamDescriptor{ streamDescriptor_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR StreamDescriptorSurfaceCreateInfoGGP( VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateFlagsGGP flags_            = {},
+                                                               GgpStreamDescriptor                                         streamDescriptor_ = {},
+                                                               const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , streamDescriptor( streamDescriptor_ )
     {
     }
 
@@ -150960,22 +110052,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     StreamDescriptorSurfaceCreateInfoGGP & operator=( StreamDescriptorSurfaceCreateInfoGGP const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     StreamDescriptorSurfaceCreateInfoGGP & operator=( VkStreamDescriptorSurfaceCreateInfoGGP const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<StreamDescriptorSurfaceCreateInfoGGP const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateInfoGGP const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 StreamDescriptorSurfaceCreateInfoGGP & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 StreamDescriptorSurfaceCreateInfoGGP & setFlags( StreamDescriptorSurfaceCreateFlagsGGP flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 StreamDescriptorSurfaceCreateInfoGGP &
+      setFlags( VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateFlagsGGP flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -150986,7 +110079,7 @@ namespace VULKAN_HPP_NAMESPACE
       streamDescriptor = streamDescriptor_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkStreamDescriptorSurfaceCreateInfoGGP const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -150998,18 +110091,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkStreamDescriptorSurfaceCreateInfoGGP *>( this );
     }
 
-    operator VkStreamDescriptorSurfaceCreateInfoGGP const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkStreamDescriptorSurfaceCreateInfoGGP *>( this );
-    }
-
-    operator VkStreamDescriptorSurfaceCreateInfoGGP *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkStreamDescriptorSurfaceCreateInfoGGP *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StreamDescriptorSurfaceCreateFlagsGGP const &, GgpStreamDescriptor const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateFlagsGGP const &,
+               GgpStreamDescriptor const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, streamDescriptor );
@@ -151044,20 +110134,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                         sType            = StructureType::eStreamDescriptorSurfaceCreateInfoGGP;
-    const void *                          pNext            = {};
-    StreamDescriptorSurfaceCreateFlagsGGP flags            = {};
-    GgpStreamDescriptor                   streamDescriptor = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType            = StructureType::eStreamDescriptorSurfaceCreateInfoGGP;
+    const void *                                                pNext            = {};
+    VULKAN_HPP_NAMESPACE::StreamDescriptorSurfaceCreateFlagsGGP flags            = {};
+    GgpStreamDescriptor                                         streamDescriptor = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkStreamDescriptorSurfaceCreateInfoGGP>
-  {
-    using Type = StreamDescriptorSurfaceCreateInfoGGP;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eStreamDescriptorSurfaceCreateInfoGGP>
   {
@@ -151065,7 +110147,102 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_GGP*/
 
-  // wrapper struct for struct VkSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubmitInfo.html
+  struct StridedDeviceAddressRegionKHR
+  {
+    using NativeType = VkStridedDeviceAddressRegionKHR;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRegionKHR( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize    stride_        = {},
+                                                        VULKAN_HPP_NAMESPACE::DeviceSize    size_          = {} ) VULKAN_HPP_NOEXCEPT
+      : deviceAddress( deviceAddress_ )
+      , stride( stride_ )
+      , size( size_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR StridedDeviceAddressRegionKHR( StridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    StridedDeviceAddressRegionKHR( VkStridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : StridedDeviceAddressRegionKHR( *reinterpret_cast<StridedDeviceAddressRegionKHR const *>( &rhs ) )
+    {
+    }
+
+    StridedDeviceAddressRegionKHR & operator=( StridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    StridedDeviceAddressRegionKHR & operator=( VkStridedDeviceAddressRegionKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::StridedDeviceAddressRegionKHR const *>( &rhs );
+      return *this;
+    }
+
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setDeviceAddress( VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress_ ) VULKAN_HPP_NOEXCEPT
+    {
+      deviceAddress = deviceAddress_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setStride( VULKAN_HPP_NAMESPACE::DeviceSize stride_ ) VULKAN_HPP_NOEXCEPT
+    {
+      stride = stride_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 StridedDeviceAddressRegionKHR & setSize( VULKAN_HPP_NAMESPACE::DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
+    {
+      size = size_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
+    operator VkStridedDeviceAddressRegionKHR const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkStridedDeviceAddressRegionKHR *>( this );
+    }
+
+    operator VkStridedDeviceAddressRegionKHR &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkStridedDeviceAddressRegionKHR *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &, VULKAN_HPP_NAMESPACE::DeviceSize const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( deviceAddress, stride, size );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( StridedDeviceAddressRegionKHR const & ) const = default;
+#else
+    bool operator==( StridedDeviceAddressRegionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( deviceAddress == rhs.deviceAddress ) && ( stride == rhs.stride ) && ( size == rhs.size );
+#  endif
+    }
+
+    bool operator!=( StridedDeviceAddressRegionKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::DeviceAddress deviceAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    stride        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size          = {};
+  };
+
   struct SubmitInfo
   {
     using NativeType = VkSubmitInfo;
@@ -151073,23 +110250,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubmitInfo( uint32_t                   waitSemaphoreCount_   = {},
-                                     const Semaphore *          pWaitSemaphores_      = {},
-                                     const PipelineStageFlags * pWaitDstStageMask_    = {},
-                                     uint32_t                   commandBufferCount_   = {},
-                                     const CommandBuffer *      pCommandBuffers_      = {},
-                                     uint32_t                   signalSemaphoreCount_ = {},
-                                     const Semaphore *          pSignalSemaphores_    = {},
-                                     const void *               pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreCount{ waitSemaphoreCount_ }
-      , pWaitSemaphores{ pWaitSemaphores_ }
-      , pWaitDstStageMask{ pWaitDstStageMask_ }
-      , commandBufferCount{ commandBufferCount_ }
-      , pCommandBuffers{ pCommandBuffers_ }
-      , signalSemaphoreCount{ signalSemaphoreCount_ }
-      , pSignalSemaphores{ pSignalSemaphores_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubmitInfo( uint32_t                                         waitSemaphoreCount_   = {},
+                                     const VULKAN_HPP_NAMESPACE::Semaphore *          pWaitSemaphores_      = {},
+                                     const VULKAN_HPP_NAMESPACE::PipelineStageFlags * pWaitDstStageMask_    = {},
+                                     uint32_t                                         commandBufferCount_   = {},
+                                     const VULKAN_HPP_NAMESPACE::CommandBuffer *      pCommandBuffers_      = {},
+                                     uint32_t                                         signalSemaphoreCount_ = {},
+                                     const VULKAN_HPP_NAMESPACE::Semaphore *          pSignalSemaphores_    = {},
+                                     const void *                                     pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , waitSemaphoreCount( waitSemaphoreCount_ )
+      , pWaitSemaphores( pWaitSemaphores_ )
+      , pWaitDstStageMask( pWaitDstStageMask_ )
+      , commandBufferCount( commandBufferCount_ )
+      , pCommandBuffers( pCommandBuffers_ )
+      , signalSemaphoreCount( signalSemaphoreCount_ )
+      , pSignalSemaphores( pSignalSemaphores_ )
     {
     }
 
@@ -151098,11 +110275,11 @@ namespace VULKAN_HPP_NAMESPACE
     SubmitInfo( VkSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT : SubmitInfo( *reinterpret_cast<SubmitInfo const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo( ArrayProxyNoTemporaries<const Semaphore> const &          waitSemaphores_,
-                ArrayProxyNoTemporaries<const PipelineStageFlags> const & waitDstStageMask_ = {},
-                ArrayProxyNoTemporaries<const CommandBuffer> const &      commandBuffers_   = {},
-                ArrayProxyNoTemporaries<const Semaphore> const &          signalSemaphores_ = {},
-                const void *                                              pNext_            = nullptr )
+    SubmitInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const &          waitSemaphores_,
+                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineStageFlags> const & waitDstStageMask_ = {},
+                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CommandBuffer> const &      commandBuffers_   = {},
+                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const &          signalSemaphores_ = {},
+                const void *                                                                                          pNext_            = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreCount( static_cast<uint32_t>( waitSemaphores_.size() ) )
       , pWaitSemaphores( waitSemaphores_.data() )
@@ -151124,15 +110301,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SubmitInfo & operator=( SubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubmitInfo & operator=( VkSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -151145,14 +110322,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPWaitSemaphores( const Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPWaitSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pWaitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pWaitSemaphores = pWaitSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo & setWaitSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo &
+      setWaitSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & waitSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreCount = static_cast<uint32_t>( waitSemaphores_.size() );
       pWaitSemaphores    = waitSemaphores_.data();
@@ -151160,14 +110338,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPWaitDstStageMask( const PipelineStageFlags * pWaitDstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPWaitDstStageMask( const VULKAN_HPP_NAMESPACE::PipelineStageFlags * pWaitDstStageMask_ ) VULKAN_HPP_NOEXCEPT
     {
       pWaitDstStageMask = pWaitDstStageMask_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo & setWaitDstStageMask( ArrayProxyNoTemporaries<const PipelineStageFlags> const & waitDstStageMask_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo & setWaitDstStageMask( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PipelineStageFlags> const & waitDstStageMask_ )
+      VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreCount = static_cast<uint32_t>( waitDstStageMask_.size() );
       pWaitDstStageMask  = waitDstStageMask_.data();
@@ -151181,14 +110360,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPCommandBuffers( const CommandBuffer * pCommandBuffers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPCommandBuffers( const VULKAN_HPP_NAMESPACE::CommandBuffer * pCommandBuffers_ ) VULKAN_HPP_NOEXCEPT
     {
       pCommandBuffers = pCommandBuffers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo & setCommandBuffers( ArrayProxyNoTemporaries<const CommandBuffer> const & commandBuffers_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo &
+      setCommandBuffers( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CommandBuffer> const & commandBuffers_ ) VULKAN_HPP_NOEXCEPT
     {
       commandBufferCount = static_cast<uint32_t>( commandBuffers_.size() );
       pCommandBuffers    = commandBuffers_.data();
@@ -151202,21 +110382,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPSignalSemaphores( const Semaphore * pSignalSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo & setPSignalSemaphores( const VULKAN_HPP_NAMESPACE::Semaphore * pSignalSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       pSignalSemaphores = pSignalSemaphores_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo & setSignalSemaphores( ArrayProxyNoTemporaries<const Semaphore> const & signalSemaphores_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo &
+      setSignalSemaphores( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Semaphore> const & signalSemaphores_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreCount = static_cast<uint32_t>( signalSemaphores_.size() );
       pSignalSemaphores    = signalSemaphores_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -151228,26 +110409,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubmitInfo *>( this );
     }
 
-    operator VkSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubmitInfo *>( this );
-    }
-
-    operator VkSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const Semaphore * const &,
-               const PipelineStageFlags * const &,
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &,
+               const VULKAN_HPP_NAMESPACE::PipelineStageFlags * const &,
                uint32_t const &,
-               const CommandBuffer * const &,
+               const VULKAN_HPP_NAMESPACE::CommandBuffer * const &,
                uint32_t const &,
-               const Semaphore * const &>
+               const VULKAN_HPP_NAMESPACE::Semaphore * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -151277,32 +110452,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                = StructureType::eSubmitInfo;
-    const void *               pNext                = {};
-    uint32_t                   waitSemaphoreCount   = {};
-    const Semaphore *          pWaitSemaphores      = {};
-    const PipelineStageFlags * pWaitDstStageMask    = {};
-    uint32_t                   commandBufferCount   = {};
-    const CommandBuffer *      pCommandBuffers      = {};
-    uint32_t                   signalSemaphoreCount = {};
-    const Semaphore *          pSignalSemaphores    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                = StructureType::eSubmitInfo;
+    const void *                                     pNext                = {};
+    uint32_t                                         waitSemaphoreCount   = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *          pWaitSemaphores      = {};
+    const VULKAN_HPP_NAMESPACE::PipelineStageFlags * pWaitDstStageMask    = {};
+    uint32_t                                         commandBufferCount   = {};
+    const VULKAN_HPP_NAMESPACE::CommandBuffer *      pCommandBuffers      = {};
+    uint32_t                                         signalSemaphoreCount = {};
+    const VULKAN_HPP_NAMESPACE::Semaphore *          pSignalSemaphores    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubmitInfo>
-  {
-    using Type = SubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubmitInfo>
   {
     using Type = SubmitInfo;
   };
 
-  // wrapper struct for struct VkSubmitInfo2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubmitInfo2.html
   struct SubmitInfo2
   {
     using NativeType = VkSubmitInfo2;
@@ -151310,23 +110476,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubmitInfo2;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubmitInfo2( SubmitFlags                     flags_                    = {},
-                                      uint32_t                        waitSemaphoreInfoCount_   = {},
-                                      const SemaphoreSubmitInfo *     pWaitSemaphoreInfos_      = {},
-                                      uint32_t                        commandBufferInfoCount_   = {},
-                                      const CommandBufferSubmitInfo * pCommandBufferInfos_      = {},
-                                      uint32_t                        signalSemaphoreInfoCount_ = {},
-                                      const SemaphoreSubmitInfo *     pSignalSemaphoreInfos_    = {},
-                                      const void *                    pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , waitSemaphoreInfoCount{ waitSemaphoreInfoCount_ }
-      , pWaitSemaphoreInfos{ pWaitSemaphoreInfos_ }
-      , commandBufferInfoCount{ commandBufferInfoCount_ }
-      , pCommandBufferInfos{ pCommandBufferInfos_ }
-      , signalSemaphoreInfoCount{ signalSemaphoreInfoCount_ }
-      , pSignalSemaphoreInfos{ pSignalSemaphoreInfos_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubmitInfo2( VULKAN_HPP_NAMESPACE::SubmitFlags                     flags_                    = {},
+                                      uint32_t                                              waitSemaphoreInfoCount_   = {},
+                                      const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo *     pWaitSemaphoreInfos_      = {},
+                                      uint32_t                                              commandBufferInfoCount_   = {},
+                                      const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo * pCommandBufferInfos_      = {},
+                                      uint32_t                                              signalSemaphoreInfoCount_ = {},
+                                      const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo *     pSignalSemaphoreInfos_    = {},
+                                      const void *                                          pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , waitSemaphoreInfoCount( waitSemaphoreInfoCount_ )
+      , pWaitSemaphoreInfos( pWaitSemaphoreInfos_ )
+      , commandBufferInfoCount( commandBufferInfoCount_ )
+      , pCommandBufferInfos( pCommandBufferInfos_ )
+      , signalSemaphoreInfoCount( signalSemaphoreInfoCount_ )
+      , pSignalSemaphoreInfos( pSignalSemaphoreInfos_ )
     {
     }
 
@@ -151335,11 +110501,11 @@ namespace VULKAN_HPP_NAMESPACE
     SubmitInfo2( VkSubmitInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT : SubmitInfo2( *reinterpret_cast<SubmitInfo2 const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo2( SubmitFlags                                                    flags_,
-                 ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const &     waitSemaphoreInfos_,
-                 ArrayProxyNoTemporaries<const CommandBufferSubmitInfo> const & commandBufferInfos_   = {},
-                 ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const &     signalSemaphoreInfos_ = {},
-                 const void *                                                   pNext_                = nullptr )
+    SubmitInfo2( VULKAN_HPP_NAMESPACE::SubmitFlags                                                                          flags_,
+                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const &     waitSemaphoreInfos_,
+                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo> const & commandBufferInfos_   = {},
+                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const &     signalSemaphoreInfos_ = {},
+                 const void *                                                                                               pNext_                = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , waitSemaphoreInfoCount( static_cast<uint32_t>( waitSemaphoreInfos_.size() ) )
@@ -151353,22 +110519,22 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SubmitInfo2 & operator=( SubmitInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubmitInfo2 & operator=( VkSubmitInfo2 const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubmitInfo2 const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubmitInfo2 const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setFlags( SubmitFlags flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setFlags( VULKAN_HPP_NAMESPACE::SubmitFlags flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -151380,14 +110546,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setPWaitSemaphoreInfos( const SemaphoreSubmitInfo * pWaitSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setPWaitSemaphoreInfos( const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * pWaitSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pWaitSemaphoreInfos = pWaitSemaphoreInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo2 & setWaitSemaphoreInfos( ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const & waitSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo2 & setWaitSemaphoreInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const & waitSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreInfoCount = static_cast<uint32_t>( waitSemaphoreInfos_.size() );
       pWaitSemaphoreInfos    = waitSemaphoreInfos_.data();
@@ -151401,14 +110568,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setPCommandBufferInfos( const CommandBufferSubmitInfo * pCommandBufferInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 &
+      setPCommandBufferInfos( const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo * pCommandBufferInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pCommandBufferInfos = pCommandBufferInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo2 & setCommandBufferInfos( ArrayProxyNoTemporaries<const CommandBufferSubmitInfo> const & commandBufferInfos_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo2 & setCommandBufferInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo> const & commandBufferInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       commandBufferInfoCount = static_cast<uint32_t>( commandBufferInfos_.size() );
       pCommandBufferInfos    = commandBufferInfos_.data();
@@ -151422,21 +110591,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 & setPSignalSemaphoreInfos( const SemaphoreSubmitInfo * pSignalSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubmitInfo2 &
+      setPSignalSemaphoreInfos( const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * pSignalSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       pSignalSemaphoreInfos = pSignalSemaphoreInfos_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SubmitInfo2 & setSignalSemaphoreInfos( ArrayProxyNoTemporaries<const SemaphoreSubmitInfo> const & signalSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
+    SubmitInfo2 & setSignalSemaphoreInfos(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo> const & signalSemaphoreInfos_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreInfoCount = static_cast<uint32_t>( signalSemaphoreInfos_.size() );
       pSignalSemaphoreInfos    = signalSemaphoreInfos_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubmitInfo2 const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -151448,26 +110619,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubmitInfo2 *>( this );
     }
 
-    operator VkSubmitInfo2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubmitInfo2 *>( this );
-    }
-
-    operator VkSubmitInfo2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubmitInfo2 *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               SubmitFlags const &,
+               VULKAN_HPP_NAMESPACE::SubmitFlags const &,
                uint32_t const &,
-               const SemaphoreSubmitInfo * const &,
+               const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * const &,
                uint32_t const &,
-               const CommandBufferSubmitInfo * const &,
+               const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo * const &,
                uint32_t const &,
-               const SemaphoreSubmitInfo * const &>
+               const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -151504,25 +110669,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                    = StructureType::eSubmitInfo2;
-    const void *                    pNext                    = {};
-    SubmitFlags                     flags                    = {};
-    uint32_t                        waitSemaphoreInfoCount   = {};
-    const SemaphoreSubmitInfo *     pWaitSemaphoreInfos      = {};
-    uint32_t                        commandBufferInfoCount   = {};
-    const CommandBufferSubmitInfo * pCommandBufferInfos      = {};
-    uint32_t                        signalSemaphoreInfoCount = {};
-    const SemaphoreSubmitInfo *     pSignalSemaphoreInfos    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                    = StructureType::eSubmitInfo2;
+    const void *                                          pNext                    = {};
+    VULKAN_HPP_NAMESPACE::SubmitFlags                     flags                    = {};
+    uint32_t                                              waitSemaphoreInfoCount   = {};
+    const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo *     pWaitSemaphoreInfos      = {};
+    uint32_t                                              commandBufferInfoCount   = {};
+    const VULKAN_HPP_NAMESPACE::CommandBufferSubmitInfo * pCommandBufferInfos      = {};
+    uint32_t                                              signalSemaphoreInfoCount = {};
+    const VULKAN_HPP_NAMESPACE::SemaphoreSubmitInfo *     pSignalSemaphoreInfos    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubmitInfo2>
-  {
-    using Type = SubmitInfo2;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubmitInfo2>
   {
@@ -151531,7 +110688,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubmitInfo2KHR = SubmitInfo2;
 
-  // wrapper struct for struct VkSubpassBeginInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassBeginInfo.html
   struct SubpassBeginInfo
   {
     using NativeType = VkSubpassBeginInfo;
@@ -151539,10 +110695,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassBeginInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassBeginInfo( SubpassContents contents_ = SubpassContents::eInline, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , contents{ contents_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassBeginInfo( VULKAN_HPP_NAMESPACE::SubpassContents contents_ = VULKAN_HPP_NAMESPACE::SubpassContents::eInline,
+                                           const void *                          pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , contents( contents_ )
     {
     }
 
@@ -151551,27 +110708,27 @@ namespace VULKAN_HPP_NAMESPACE
     SubpassBeginInfo( VkSubpassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT : SubpassBeginInfo( *reinterpret_cast<SubpassBeginInfo const *>( &rhs ) ) {}
 
     SubpassBeginInfo & operator=( SubpassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassBeginInfo & operator=( VkSubpassBeginInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassBeginInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassBeginInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassBeginInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassBeginInfo & setContents( SubpassContents contents_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassBeginInfo & setContents( VULKAN_HPP_NAMESPACE::SubpassContents contents_ ) VULKAN_HPP_NOEXCEPT
     {
       contents = contents_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassBeginInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -151583,18 +110740,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassBeginInfo *>( this );
     }
 
-    operator VkSubpassBeginInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassBeginInfo *>( this );
-    }
-
-    operator VkSubpassBeginInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassBeginInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SubpassContents const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SubpassContents const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, contents );
     }
@@ -151619,19 +110771,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType    = StructureType::eSubpassBeginInfo;
-    const void *    pNext    = {};
-    SubpassContents contents = SubpassContents::eInline;
+    VULKAN_HPP_NAMESPACE::StructureType   sType    = StructureType::eSubpassBeginInfo;
+    const void *                          pNext    = {};
+    VULKAN_HPP_NAMESPACE::SubpassContents contents = VULKAN_HPP_NAMESPACE::SubpassContents::eInline;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassBeginInfo>
-  {
-    using Type = SubpassBeginInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassBeginInfo>
   {
@@ -151640,8 +110784,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubpassBeginInfoKHR = SubpassBeginInfo;
 
-  // wrapper struct for struct VkSubpassDescriptionDepthStencilResolve, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassDescriptionDepthStencilResolve.html
   struct SubpassDescriptionDepthStencilResolve
   {
     using NativeType = VkSubpassDescriptionDepthStencilResolve;
@@ -151649,15 +110791,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassDescriptionDepthStencilResolve;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassDescriptionDepthStencilResolve( ResolveModeFlagBits          depthResolveMode_               = ResolveModeFlagBits::eNone,
-                                                                ResolveModeFlagBits          stencilResolveMode_             = ResolveModeFlagBits::eNone,
-                                                                const AttachmentReference2 * pDepthStencilResolveAttachment_ = {},
-                                                                const void *                 pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , depthResolveMode{ depthResolveMode_ }
-      , stencilResolveMode{ stencilResolveMode_ }
-      , pDepthStencilResolveAttachment{ pDepthStencilResolveAttachment_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SubpassDescriptionDepthStencilResolve( VULKAN_HPP_NAMESPACE::ResolveModeFlagBits depthResolveMode_   = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone,
+                                             VULKAN_HPP_NAMESPACE::ResolveModeFlagBits stencilResolveMode_ = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone,
+                                             const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilResolveAttachment_ = {},
+                                             const void *                                       pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , depthResolveMode( depthResolveMode_ )
+      , stencilResolveMode( stencilResolveMode_ )
+      , pDepthStencilResolveAttachment( pDepthStencilResolveAttachment_ )
     {
     }
 
@@ -151669,40 +110812,42 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SubpassDescriptionDepthStencilResolve & operator=( SubpassDescriptionDepthStencilResolve const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassDescriptionDepthStencilResolve & operator=( VkSubpassDescriptionDepthStencilResolve const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassDescriptionDepthStencilResolve const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassDescriptionDepthStencilResolve const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve & setDepthResolveMode( ResolveModeFlagBits depthResolveMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve &
+      setDepthResolveMode( VULKAN_HPP_NAMESPACE::ResolveModeFlagBits depthResolveMode_ ) VULKAN_HPP_NOEXCEPT
     {
       depthResolveMode = depthResolveMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve & setStencilResolveMode( ResolveModeFlagBits stencilResolveMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve &
+      setStencilResolveMode( VULKAN_HPP_NAMESPACE::ResolveModeFlagBits stencilResolveMode_ ) VULKAN_HPP_NOEXCEPT
     {
       stencilResolveMode = stencilResolveMode_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 SubpassDescriptionDepthStencilResolve &
-      setPDepthStencilResolveAttachment( const AttachmentReference2 * pDepthStencilResolveAttachment_ ) VULKAN_HPP_NOEXCEPT
+      setPDepthStencilResolveAttachment( const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilResolveAttachment_ ) VULKAN_HPP_NOEXCEPT
     {
       pDepthStencilResolveAttachment = pDepthStencilResolveAttachment_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassDescriptionDepthStencilResolve const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -151714,18 +110859,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassDescriptionDepthStencilResolve *>( this );
     }
 
-    operator VkSubpassDescriptionDepthStencilResolve const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassDescriptionDepthStencilResolve *>( this );
-    }
-
-    operator VkSubpassDescriptionDepthStencilResolve *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassDescriptionDepthStencilResolve *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ResolveModeFlagBits const &, ResolveModeFlagBits const &, const AttachmentReference2 * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlagBits const &,
+               VULKAN_HPP_NAMESPACE::ResolveModeFlagBits const &,
+               const VULKAN_HPP_NAMESPACE::AttachmentReference2 * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, depthResolveMode, stencilResolveMode, pDepthStencilResolveAttachment );
@@ -151752,21 +110895,13 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                sType                          = StructureType::eSubpassDescriptionDepthStencilResolve;
-    const void *                 pNext                          = {};
-    ResolveModeFlagBits          depthResolveMode               = ResolveModeFlagBits::eNone;
-    ResolveModeFlagBits          stencilResolveMode             = ResolveModeFlagBits::eNone;
-    const AttachmentReference2 * pDepthStencilResolveAttachment = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType                          = StructureType::eSubpassDescriptionDepthStencilResolve;
+    const void *                                       pNext                          = {};
+    VULKAN_HPP_NAMESPACE::ResolveModeFlagBits          depthResolveMode               = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone;
+    VULKAN_HPP_NAMESPACE::ResolveModeFlagBits          stencilResolveMode             = VULKAN_HPP_NAMESPACE::ResolveModeFlagBits::eNone;
+    const VULKAN_HPP_NAMESPACE::AttachmentReference2 * pDepthStencilResolveAttachment = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassDescriptionDepthStencilResolve>
-  {
-    using Type = SubpassDescriptionDepthStencilResolve;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassDescriptionDepthStencilResolve>
   {
@@ -151775,7 +110910,6 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubpassDescriptionDepthStencilResolveKHR = SubpassDescriptionDepthStencilResolve;
 
-  // wrapper struct for struct VkSubpassEndInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassEndInfo.html
   struct SubpassEndInfo
   {
     using NativeType = VkSubpassEndInfo;
@@ -151783,29 +110917,29 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassEndInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassEndInfo( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext{ pNext_ } {}
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassEndInfo( const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT : pNext( pNext_ ) {}
 
     VULKAN_HPP_CONSTEXPR SubpassEndInfo( SubpassEndInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
     SubpassEndInfo( VkSubpassEndInfo const & rhs ) VULKAN_HPP_NOEXCEPT : SubpassEndInfo( *reinterpret_cast<SubpassEndInfo const *>( &rhs ) ) {}
 
     SubpassEndInfo & operator=( SubpassEndInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassEndInfo & operator=( VkSubpassEndInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassEndInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassEndInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassEndInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassEndInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -151817,18 +110951,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassEndInfo *>( this );
     }
 
-    operator VkSubpassEndInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassEndInfo *>( this );
-    }
-
-    operator VkSubpassEndInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassEndInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext );
     }
@@ -151853,18 +110982,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType = StructureType::eSubpassEndInfo;
-    const void *  pNext = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eSubpassEndInfo;
+    const void *                        pNext = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassEndInfo>
-  {
-    using Type = SubpassEndInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassEndInfo>
   {
@@ -151873,8 +110994,135 @@ namespace VULKAN_HPP_NAMESPACE
 
   using SubpassEndInfoKHR = SubpassEndInfo;
 
-  // wrapper struct for struct VkSubpassResolvePerformanceQueryEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassResolvePerformanceQueryEXT.html
+  struct SubpassFragmentDensityMapOffsetEndInfoQCOM
+  {
+    using NativeType = VkSubpassFragmentDensityMapOffsetEndInfoQCOM;
+
+    static const bool                                  allowDuplicate = false;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassFragmentDensityMapOffsetEndInfoQCOM;
+
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassFragmentDensityMapOffsetEndInfoQCOM( uint32_t                               fragmentDensityOffsetCount_ = {},
+                                                                     const VULKAN_HPP_NAMESPACE::Offset2D * pFragmentDensityOffsets_    = {},
+                                                                     const void *                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fragmentDensityOffsetCount( fragmentDensityOffsetCount_ )
+      , pFragmentDensityOffsets( pFragmentDensityOffsets_ )
+    {
+    }
+
+    VULKAN_HPP_CONSTEXPR SubpassFragmentDensityMapOffsetEndInfoQCOM( SubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+
+    SubpassFragmentDensityMapOffsetEndInfoQCOM( VkSubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SubpassFragmentDensityMapOffsetEndInfoQCOM( *reinterpret_cast<SubpassFragmentDensityMapOffsetEndInfoQCOM const *>( &rhs ) )
+    {
+    }
+
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    SubpassFragmentDensityMapOffsetEndInfoQCOM(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Offset2D> const & fragmentDensityOffsets_, const void * pNext_ = nullptr )
+      : pNext( pNext_ )
+      , fragmentDensityOffsetCount( static_cast<uint32_t>( fragmentDensityOffsets_.size() ) )
+      , pFragmentDensityOffsets( fragmentDensityOffsets_.data() )
+    {
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
+    SubpassFragmentDensityMapOffsetEndInfoQCOM & operator=( SubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    SubpassFragmentDensityMapOffsetEndInfoQCOM & operator=( VkSubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassFragmentDensityMapOffsetEndInfoQCOM const *>( &rhs );
+      return *this;
+    }
+
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SubpassFragmentDensityMapOffsetEndInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 SubpassFragmentDensityMapOffsetEndInfoQCOM &
+      setFragmentDensityOffsetCount( uint32_t fragmentDensityOffsetCount_ ) VULKAN_HPP_NOEXCEPT
+    {
+      fragmentDensityOffsetCount = fragmentDensityOffsetCount_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 SubpassFragmentDensityMapOffsetEndInfoQCOM &
+      setPFragmentDensityOffsets( const VULKAN_HPP_NAMESPACE::Offset2D * pFragmentDensityOffsets_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pFragmentDensityOffsets = pFragmentDensityOffsets_;
+      return *this;
+    }
+
+#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
+    SubpassFragmentDensityMapOffsetEndInfoQCOM & setFragmentDensityOffsets(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Offset2D> const & fragmentDensityOffsets_ ) VULKAN_HPP_NOEXCEPT
+    {
+      fragmentDensityOffsetCount = static_cast<uint32_t>( fragmentDensityOffsets_.size() );
+      pFragmentDensityOffsets    = fragmentDensityOffsets_.data();
+      return *this;
+    }
+#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
+    operator VkSubpassFragmentDensityMapOffsetEndInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<const VkSubpassFragmentDensityMapOffsetEndInfoQCOM *>( this );
+    }
+
+    operator VkSubpassFragmentDensityMapOffsetEndInfoQCOM &() VULKAN_HPP_NOEXCEPT
+    {
+      return *reinterpret_cast<VkSubpassFragmentDensityMapOffsetEndInfoQCOM *>( this );
+    }
+
+#if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Offset2D * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
+    {
+      return std::tie( sType, pNext, fragmentDensityOffsetCount, pFragmentDensityOffsets );
+    }
+#endif
+
+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
+    auto operator<=>( SubpassFragmentDensityMapOffsetEndInfoQCOM const & ) const = default;
+#else
+    bool operator==( SubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+#  if defined( VULKAN_HPP_USE_REFLECT )
+      return this->reflect() == rhs.reflect();
+#  else
+      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( fragmentDensityOffsetCount == rhs.fragmentDensityOffsetCount ) &&
+             ( pFragmentDensityOffsets == rhs.pFragmentDensityOffsets );
+#  endif
+    }
+
+    bool operator!=( SubpassFragmentDensityMapOffsetEndInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
+    {
+      return !operator==( rhs );
+    }
+#endif
+
+  public:
+    VULKAN_HPP_NAMESPACE::StructureType    sType                      = StructureType::eSubpassFragmentDensityMapOffsetEndInfoQCOM;
+    const void *                           pNext                      = {};
+    uint32_t                               fragmentDensityOffsetCount = {};
+    const VULKAN_HPP_NAMESPACE::Offset2D * pFragmentDensityOffsets    = {};
+  };
+
+  template <>
+  struct CppType<StructureType, StructureType::eSubpassFragmentDensityMapOffsetEndInfoQCOM>
+  {
+    using Type = SubpassFragmentDensityMapOffsetEndInfoQCOM;
+  };
+
   struct SubpassResolvePerformanceQueryEXT
   {
     using NativeType = VkSubpassResolvePerformanceQueryEXT;
@@ -151882,10 +111130,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassResolvePerformanceQueryEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubpassResolvePerformanceQueryEXT( Bool32 optimal_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , optimal{ optimal_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassResolvePerformanceQueryEXT( VULKAN_HPP_NAMESPACE::Bool32 optimal_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , optimal( optimal_ )
     {
     }
 
@@ -151897,11 +111145,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SubpassResolvePerformanceQueryEXT & operator=( SubpassResolvePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassResolvePerformanceQueryEXT & operator=( VkSubpassResolvePerformanceQueryEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassResolvePerformanceQueryEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassResolvePerformanceQueryEXT const *>( &rhs );
       return *this;
     }
 
@@ -151915,18 +111163,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassResolvePerformanceQueryEXT *>( this );
     }
 
-    operator VkSubpassResolvePerformanceQueryEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassResolvePerformanceQueryEXT *>( this );
-    }
-
-    operator VkSubpassResolvePerformanceQueryEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassResolvePerformanceQueryEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, optimal );
     }
@@ -151951,27 +111194,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType   = StructureType::eSubpassResolvePerformanceQueryEXT;
-    void *        pNext   = {};
-    Bool32        optimal = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType   = StructureType::eSubpassResolvePerformanceQueryEXT;
+    void *                              pNext   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        optimal = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassResolvePerformanceQueryEXT>
-  {
-    using Type = SubpassResolvePerformanceQueryEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassResolvePerformanceQueryEXT>
   {
     using Type = SubpassResolvePerformanceQueryEXT;
   };
 
-  // wrapper struct for struct VkSubpassShadingPipelineCreateInfoHUAWEI, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubpassShadingPipelineCreateInfoHUAWEI.html
   struct SubpassShadingPipelineCreateInfoHUAWEI
   {
     using NativeType = VkSubpassShadingPipelineCreateInfoHUAWEI;
@@ -151979,12 +111212,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubpassShadingPipelineCreateInfoHUAWEI;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SubpassShadingPipelineCreateInfoHUAWEI( RenderPass renderPass_ = {}, uint32_t subpass_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , renderPass{ renderPass_ }
-      , subpass{ subpass_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubpassShadingPipelineCreateInfoHUAWEI( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ = {},
+                                                                 uint32_t                         subpass_    = {},
+                                                                 void *                           pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , renderPass( renderPass_ )
+      , subpass( subpass_ )
     {
     }
 
@@ -151996,22 +111230,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SubpassShadingPipelineCreateInfoHUAWEI & operator=( SubpassShadingPipelineCreateInfoHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SubpassShadingPipelineCreateInfoHUAWEI & operator=( VkSubpassShadingPipelineCreateInfoHUAWEI const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubpassShadingPipelineCreateInfoHUAWEI const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubpassShadingPipelineCreateInfoHUAWEI const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SubpassShadingPipelineCreateInfoHUAWEI & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SubpassShadingPipelineCreateInfoHUAWEI & setRenderPass( RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SubpassShadingPipelineCreateInfoHUAWEI & setRenderPass( VULKAN_HPP_NAMESPACE::RenderPass renderPass_ ) VULKAN_HPP_NOEXCEPT
     {
       renderPass = renderPass_;
       return *this;
@@ -152022,7 +111256,7 @@ namespace VULKAN_HPP_NAMESPACE
       subpass = subpass_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSubpassShadingPipelineCreateInfoHUAWEI const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -152034,18 +111268,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSubpassShadingPipelineCreateInfoHUAWEI *>( this );
     }
 
-    operator VkSubpassShadingPipelineCreateInfoHUAWEI const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubpassShadingPipelineCreateInfoHUAWEI *>( this );
-    }
-
-    operator VkSubpassShadingPipelineCreateInfoHUAWEI *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubpassShadingPipelineCreateInfoHUAWEI *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, RenderPass const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::RenderPass const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, renderPass, subpass );
     }
@@ -152070,88 +111299,74 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eSubpassShadingPipelineCreateInfoHUAWEI;
-    void *        pNext      = {};
-    RenderPass    renderPass = {};
-    uint32_t      subpass    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eSubpassShadingPipelineCreateInfoHUAWEI;
+    void *                              pNext      = {};
+    VULKAN_HPP_NAMESPACE::RenderPass    renderPass = {};
+    uint32_t                            subpass    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubpassShadingPipelineCreateInfoHUAWEI>
-  {
-    using Type = SubpassShadingPipelineCreateInfoHUAWEI;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSubpassShadingPipelineCreateInfoHUAWEI>
   {
     using Type = SubpassShadingPipelineCreateInfoHUAWEI;
   };
 
-  // wrapper struct for struct VkSubresourceHostMemcpySize, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubresourceHostMemcpySize.html
-  struct SubresourceHostMemcpySize
+  struct SubresourceHostMemcpySizeEXT
   {
-    using NativeType = VkSubresourceHostMemcpySize;
+    using NativeType = VkSubresourceHostMemcpySizeEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubresourceHostMemcpySize;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubresourceHostMemcpySizeEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubresourceHostMemcpySize( DeviceSize size_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , size{ size_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubresourceHostMemcpySizeEXT( VULKAN_HPP_NAMESPACE::DeviceSize size_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , size( size_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SubresourceHostMemcpySize( SubresourceHostMemcpySize const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SubresourceHostMemcpySizeEXT( SubresourceHostMemcpySizeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SubresourceHostMemcpySize( VkSubresourceHostMemcpySize const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SubresourceHostMemcpySize( *reinterpret_cast<SubresourceHostMemcpySize const *>( &rhs ) )
+    SubresourceHostMemcpySizeEXT( VkSubresourceHostMemcpySizeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SubresourceHostMemcpySizeEXT( *reinterpret_cast<SubresourceHostMemcpySizeEXT const *>( &rhs ) )
     {
     }
 
-    SubresourceHostMemcpySize & operator=( SubresourceHostMemcpySize const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SubresourceHostMemcpySizeEXT & operator=( SubresourceHostMemcpySizeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SubresourceHostMemcpySize & operator=( VkSubresourceHostMemcpySize const & rhs ) VULKAN_HPP_NOEXCEPT
+    SubresourceHostMemcpySizeEXT & operator=( VkSubresourceHostMemcpySizeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SubresourceHostMemcpySize const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubresourceHostMemcpySizeEXT const *>( &rhs );
       return *this;
     }
 
-    operator VkSubresourceHostMemcpySize const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSubresourceHostMemcpySizeEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSubresourceHostMemcpySize *>( this );
+      return *reinterpret_cast<const VkSubresourceHostMemcpySizeEXT *>( this );
     }
 
-    operator VkSubresourceHostMemcpySize &() VULKAN_HPP_NOEXCEPT
+    operator VkSubresourceHostMemcpySizeEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSubresourceHostMemcpySize *>( this );
-    }
-
-    operator VkSubresourceHostMemcpySize const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubresourceHostMemcpySize *>( this );
-    }
-
-    operator VkSubresourceHostMemcpySize *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubresourceHostMemcpySize *>( this );
+      return *reinterpret_cast<VkSubresourceHostMemcpySizeEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::DeviceSize const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, size );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SubresourceHostMemcpySize const & ) const = default;
+    auto operator<=>( SubresourceHostMemcpySizeEXT const & ) const = default;
 #else
-    bool operator==( SubresourceHostMemcpySize const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SubresourceHostMemcpySizeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -152160,93 +111375,80 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SubresourceHostMemcpySize const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SubresourceHostMemcpySizeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType = StructureType::eSubresourceHostMemcpySize;
-    void *        pNext = {};
-    DeviceSize    size  = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType = StructureType::eSubresourceHostMemcpySizeEXT;
+    void *                              pNext = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    size  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubresourceHostMemcpySize>
-  {
-    using Type = SubresourceHostMemcpySize;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSubresourceHostMemcpySize>
+  struct CppType<StructureType, StructureType::eSubresourceHostMemcpySizeEXT>
   {
-    using Type = SubresourceHostMemcpySize;
+    using Type = SubresourceHostMemcpySizeEXT;
   };
 
-  using SubresourceHostMemcpySizeEXT = SubresourceHostMemcpySize;
-
-  // wrapper struct for struct VkSubresourceLayout2, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSubresourceLayout2.html
-  struct SubresourceLayout2
+  struct SubresourceLayout2KHR
   {
-    using NativeType = VkSubresourceLayout2;
+    using NativeType = VkSubresourceLayout2KHR;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubresourceLayout2;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSubresourceLayout2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SubresourceLayout2( SubresourceLayout subresourceLayout_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , subresourceLayout{ subresourceLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SubresourceLayout2KHR( VULKAN_HPP_NAMESPACE::SubresourceLayout subresourceLayout_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , subresourceLayout( subresourceLayout_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SubresourceLayout2( SubresourceLayout2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SubresourceLayout2KHR( SubresourceLayout2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SubresourceLayout2( VkSubresourceLayout2 const & rhs ) VULKAN_HPP_NOEXCEPT : SubresourceLayout2( *reinterpret_cast<SubresourceLayout2 const *>( &rhs ) ) {}
-
-    SubresourceLayout2 & operator=( SubresourceLayout2 const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SubresourceLayout2 & operator=( VkSubresourceLayout2 const & rhs ) VULKAN_HPP_NOEXCEPT
+    SubresourceLayout2KHR( VkSubresourceLayout2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SubresourceLayout2KHR( *reinterpret_cast<SubresourceLayout2KHR const *>( &rhs ) )
     {
-      *this = *reinterpret_cast<SubresourceLayout2 const *>( &rhs );
+    }
+
+    SubresourceLayout2KHR & operator=( SubresourceLayout2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
+
+    SubresourceLayout2KHR & operator=( VkSubresourceLayout2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    {
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SubresourceLayout2KHR const *>( &rhs );
       return *this;
     }
 
-    operator VkSubresourceLayout2 const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSubresourceLayout2KHR const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSubresourceLayout2 *>( this );
+      return *reinterpret_cast<const VkSubresourceLayout2KHR *>( this );
     }
 
-    operator VkSubresourceLayout2 &() VULKAN_HPP_NOEXCEPT
+    operator VkSubresourceLayout2KHR &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSubresourceLayout2 *>( this );
-    }
-
-    operator VkSubresourceLayout2 const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSubresourceLayout2 *>( this );
-    }
-
-    operator VkSubresourceLayout2 *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSubresourceLayout2 *>( this );
+      return *reinterpret_cast<VkSubresourceLayout2KHR *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SubresourceLayout const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SubresourceLayout const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, subresourceLayout );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SubresourceLayout2 const & ) const = default;
+    auto operator<=>( SubresourceLayout2KHR const & ) const = default;
 #else
-    bool operator==( SubresourceLayout2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SubresourceLayout2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -152255,36 +111457,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SubresourceLayout2 const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SubresourceLayout2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType     sType             = StructureType::eSubresourceLayout2;
-    void *            pNext             = {};
-    SubresourceLayout subresourceLayout = {};
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::eSubresourceLayout2KHR;
+    void *                                  pNext             = {};
+    VULKAN_HPP_NAMESPACE::SubresourceLayout subresourceLayout = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSubresourceLayout2>
-  {
-    using Type = SubresourceLayout2;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSubresourceLayout2>
+  struct CppType<StructureType, StructureType::eSubresourceLayout2KHR>
   {
-    using Type = SubresourceLayout2;
+    using Type = SubresourceLayout2KHR;
   };
 
-  using SubresourceLayout2EXT = SubresourceLayout2;
-  using SubresourceLayout2KHR = SubresourceLayout2;
+  using SubresourceLayout2EXT = SubresourceLayout2KHR;
 
-  // wrapper struct for struct VkSurfaceCapabilities2EXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilities2EXT.html
   struct SurfaceCapabilities2EXT
   {
     using NativeType = VkSurfaceCapabilities2EXT;
@@ -152292,31 +111484,32 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilities2EXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilities2EXT( uint32_t                    minImageCount_            = {},
-                                                  uint32_t                    maxImageCount_            = {},
-                                                  Extent2D                    currentExtent_            = {},
-                                                  Extent2D                    minImageExtent_           = {},
-                                                  Extent2D                    maxImageExtent_           = {},
-                                                  uint32_t                    maxImageArrayLayers_      = {},
-                                                  SurfaceTransformFlagsKHR    supportedTransforms_      = {},
-                                                  SurfaceTransformFlagBitsKHR currentTransform_         = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                  CompositeAlphaFlagsKHR      supportedCompositeAlpha_  = {},
-                                                  ImageUsageFlags             supportedUsageFlags_      = {},
-                                                  SurfaceCounterFlagsEXT      supportedSurfaceCounters_ = {},
-                                                  void *                      pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minImageCount{ minImageCount_ }
-      , maxImageCount{ maxImageCount_ }
-      , currentExtent{ currentExtent_ }
-      , minImageExtent{ minImageExtent_ }
-      , maxImageExtent{ maxImageExtent_ }
-      , maxImageArrayLayers{ maxImageArrayLayers_ }
-      , supportedTransforms{ supportedTransforms_ }
-      , currentTransform{ currentTransform_ }
-      , supportedCompositeAlpha{ supportedCompositeAlpha_ }
-      , supportedUsageFlags{ supportedUsageFlags_ }
-      , supportedSurfaceCounters{ supportedSurfaceCounters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceCapabilities2EXT(
+      uint32_t                                          minImageCount_            = {},
+      uint32_t                                          maxImageCount_            = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    currentExtent_            = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    minImageExtent_           = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    maxImageExtent_           = {},
+      uint32_t                                          maxImageArrayLayers_      = {},
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR    supportedTransforms_      = {},
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR currentTransform_         = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+      VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR      supportedCompositeAlpha_  = {},
+      VULKAN_HPP_NAMESPACE::ImageUsageFlags             supportedUsageFlags_      = {},
+      VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT      supportedSurfaceCounters_ = {},
+      void *                                            pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , minImageCount( minImageCount_ )
+      , maxImageCount( maxImageCount_ )
+      , currentExtent( currentExtent_ )
+      , minImageExtent( minImageExtent_ )
+      , maxImageExtent( maxImageExtent_ )
+      , maxImageArrayLayers( maxImageArrayLayers_ )
+      , supportedTransforms( supportedTransforms_ )
+      , currentTransform( currentTransform_ )
+      , supportedCompositeAlpha( supportedCompositeAlpha_ )
+      , supportedUsageFlags( supportedUsageFlags_ )
+      , supportedSurfaceCounters( supportedSurfaceCounters_ )
     {
     }
 
@@ -152328,11 +111521,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceCapabilities2EXT & operator=( SurfaceCapabilities2EXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceCapabilities2EXT & operator=( VkSurfaceCapabilities2EXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceCapabilities2EXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2EXT const *>( &rhs );
       return *this;
     }
 
@@ -152346,30 +111539,24 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceCapabilities2EXT *>( this );
     }
 
-    operator VkSurfaceCapabilities2EXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilities2EXT *>( this );
-    }
-
-    operator VkSurfaceCapabilities2EXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilities2EXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
                uint32_t const &,
                uint32_t const &,
-               Extent2D const &,
-               Extent2D const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
-               SurfaceTransformFlagsKHR const &,
-               SurfaceTransformFlagBitsKHR const &,
-               CompositeAlphaFlagsKHR const &,
-               ImageUsageFlags const &,
-               SurfaceCounterFlagsEXT const &>
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -152411,61 +111598,53 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                    = StructureType::eSurfaceCapabilities2EXT;
-    void *                      pNext                    = {};
-    uint32_t                    minImageCount            = {};
-    uint32_t                    maxImageCount            = {};
-    Extent2D                    currentExtent            = {};
-    Extent2D                    minImageExtent           = {};
-    Extent2D                    maxImageExtent           = {};
-    uint32_t                    maxImageArrayLayers      = {};
-    SurfaceTransformFlagsKHR    supportedTransforms      = {};
-    SurfaceTransformFlagBitsKHR currentTransform         = SurfaceTransformFlagBitsKHR::eIdentity;
-    CompositeAlphaFlagsKHR      supportedCompositeAlpha  = {};
-    ImageUsageFlags             supportedUsageFlags      = {};
-    SurfaceCounterFlagsEXT      supportedSurfaceCounters = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                    = StructureType::eSurfaceCapabilities2EXT;
+    void *                                            pNext                    = {};
+    uint32_t                                          minImageCount            = {};
+    uint32_t                                          maxImageCount            = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    currentExtent            = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    minImageExtent           = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    maxImageExtent           = {};
+    uint32_t                                          maxImageArrayLayers      = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR    supportedTransforms      = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR currentTransform         = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR      supportedCompositeAlpha  = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags             supportedUsageFlags      = {};
+    VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT      supportedSurfaceCounters = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilities2EXT>
-  {
-    using Type = SurfaceCapabilities2EXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceCapabilities2EXT>
   {
     using Type = SurfaceCapabilities2EXT;
   };
 
-  // wrapper struct for struct VkSurfaceCapabilitiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilitiesKHR.html
   struct SurfaceCapabilitiesKHR
   {
     using NativeType = VkSurfaceCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesKHR( uint32_t                    minImageCount_           = {},
-                                                 uint32_t                    maxImageCount_           = {},
-                                                 Extent2D                    currentExtent_           = {},
-                                                 Extent2D                    minImageExtent_          = {},
-                                                 Extent2D                    maxImageExtent_          = {},
-                                                 uint32_t                    maxImageArrayLayers_     = {},
-                                                 SurfaceTransformFlagsKHR    supportedTransforms_     = {},
-                                                 SurfaceTransformFlagBitsKHR currentTransform_        = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                 CompositeAlphaFlagsKHR      supportedCompositeAlpha_ = {},
-                                                 ImageUsageFlags             supportedUsageFlags_     = {} ) VULKAN_HPP_NOEXCEPT
-      : minImageCount{ minImageCount_ }
-      , maxImageCount{ maxImageCount_ }
-      , currentExtent{ currentExtent_ }
-      , minImageExtent{ minImageExtent_ }
-      , maxImageExtent{ maxImageExtent_ }
-      , maxImageArrayLayers{ maxImageArrayLayers_ }
-      , supportedTransforms{ supportedTransforms_ }
-      , currentTransform{ currentTransform_ }
-      , supportedCompositeAlpha{ supportedCompositeAlpha_ }
-      , supportedUsageFlags{ supportedUsageFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesKHR(
+      uint32_t                                          minImageCount_           = {},
+      uint32_t                                          maxImageCount_           = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    currentExtent_           = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    minImageExtent_          = {},
+      VULKAN_HPP_NAMESPACE::Extent2D                    maxImageExtent_          = {},
+      uint32_t                                          maxImageArrayLayers_     = {},
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR    supportedTransforms_     = {},
+      VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR currentTransform_        = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+      VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR      supportedCompositeAlpha_ = {},
+      VULKAN_HPP_NAMESPACE::ImageUsageFlags             supportedUsageFlags_     = {} ) VULKAN_HPP_NOEXCEPT
+      : minImageCount( minImageCount_ )
+      , maxImageCount( maxImageCount_ )
+      , currentExtent( currentExtent_ )
+      , minImageExtent( minImageExtent_ )
+      , maxImageExtent( maxImageExtent_ )
+      , maxImageArrayLayers( maxImageArrayLayers_ )
+      , supportedTransforms( supportedTransforms_ )
+      , currentTransform( currentTransform_ )
+      , supportedCompositeAlpha( supportedCompositeAlpha_ )
+      , supportedUsageFlags( supportedUsageFlags_ )
     {
     }
 
@@ -152477,11 +111656,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceCapabilitiesKHR & operator=( SurfaceCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceCapabilitiesKHR & operator=( VkSurfaceCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -152495,27 +111674,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceCapabilitiesKHR *>( this );
     }
 
-    operator VkSurfaceCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilitiesKHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
     std::tuple<uint32_t const &,
                uint32_t const &,
-               Extent2D const &,
-               Extent2D const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
-               SurfaceTransformFlagsKHR const &,
-               SurfaceTransformFlagBitsKHR const &,
-               CompositeAlphaFlagsKHR const &,
-               ImageUsageFlags const &>
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( minImageCount,
@@ -152553,27 +111726,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    uint32_t                    minImageCount           = {};
-    uint32_t                    maxImageCount           = {};
-    Extent2D                    currentExtent           = {};
-    Extent2D                    minImageExtent          = {};
-    Extent2D                    maxImageExtent          = {};
-    uint32_t                    maxImageArrayLayers     = {};
-    SurfaceTransformFlagsKHR    supportedTransforms     = {};
-    SurfaceTransformFlagBitsKHR currentTransform        = SurfaceTransformFlagBitsKHR::eIdentity;
-    CompositeAlphaFlagsKHR      supportedCompositeAlpha = {};
-    ImageUsageFlags             supportedUsageFlags     = {};
+    uint32_t                                          minImageCount           = {};
+    uint32_t                                          maxImageCount           = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    currentExtent           = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    minImageExtent          = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                    maxImageExtent          = {};
+    uint32_t                                          maxImageArrayLayers     = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagsKHR    supportedTransforms     = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR currentTransform        = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::CompositeAlphaFlagsKHR      supportedCompositeAlpha = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags             supportedUsageFlags     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilitiesKHR>
-  {
-    using Type = SurfaceCapabilitiesKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkSurfaceCapabilities2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilities2KHR.html
   struct SurfaceCapabilities2KHR
   {
     using NativeType = VkSurfaceCapabilities2KHR;
@@ -152581,10 +111745,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilities2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilities2KHR( SurfaceCapabilitiesKHR surfaceCapabilities_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , surfaceCapabilities{ surfaceCapabilities_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceCapabilities2KHR( VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR surfaceCapabilities_ = {},
+                                                  void *                                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , surfaceCapabilities( surfaceCapabilities_ )
     {
     }
 
@@ -152596,11 +111761,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceCapabilities2KHR & operator=( SurfaceCapabilities2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceCapabilities2KHR & operator=( VkSurfaceCapabilities2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceCapabilities2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceCapabilities2KHR const *>( &rhs );
       return *this;
     }
 
@@ -152614,18 +111779,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceCapabilities2KHR *>( this );
     }
 
-    operator VkSurfaceCapabilities2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilities2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilities2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilities2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SurfaceCapabilitiesKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, surfaceCapabilities );
     }
@@ -152650,19 +111810,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType               = StructureType::eSurfaceCapabilities2KHR;
-    void *                 pNext               = {};
-    SurfaceCapabilitiesKHR surfaceCapabilities = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType               = StructureType::eSurfaceCapabilities2KHR;
+    void *                                       pNext               = {};
+    VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesKHR surfaceCapabilities = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilities2KHR>
-  {
-    using Type = SurfaceCapabilities2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceCapabilities2KHR>
   {
@@ -152670,8 +111822,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkSurfaceCapabilitiesFullScreenExclusiveEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilitiesFullScreenExclusiveEXT.html
   struct SurfaceCapabilitiesFullScreenExclusiveEXT
   {
     using NativeType = VkSurfaceCapabilitiesFullScreenExclusiveEXT;
@@ -152679,10 +111829,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilitiesFullScreenExclusiveEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesFullScreenExclusiveEXT( Bool32 fullScreenExclusiveSupported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fullScreenExclusiveSupported{ fullScreenExclusiveSupported_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesFullScreenExclusiveEXT( VULKAN_HPP_NAMESPACE::Bool32 fullScreenExclusiveSupported_ = {},
+                                                                    void *                       pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fullScreenExclusiveSupported( fullScreenExclusiveSupported_ )
     {
     }
 
@@ -152694,14 +111845,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceCapabilitiesFullScreenExclusiveEXT & operator=( SurfaceCapabilitiesFullScreenExclusiveEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceCapabilitiesFullScreenExclusiveEXT & operator=( VkSurfaceCapabilitiesFullScreenExclusiveEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceCapabilitiesFullScreenExclusiveEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesFullScreenExclusiveEXT const *>( &rhs );
       return *this;
     }
 
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesFullScreenExclusiveEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesFullScreenExclusiveEXT &
+      setFullScreenExclusiveSupported( VULKAN_HPP_NAMESPACE::Bool32 fullScreenExclusiveSupported_ ) VULKAN_HPP_NOEXCEPT
+    {
+      fullScreenExclusiveSupported = fullScreenExclusiveSupported_;
+      return *this;
+    }
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkSurfaceCapabilitiesFullScreenExclusiveEXT const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkSurfaceCapabilitiesFullScreenExclusiveEXT *>( this );
@@ -152712,18 +111878,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceCapabilitiesFullScreenExclusiveEXT *>( this );
     }
 
-    operator VkSurfaceCapabilitiesFullScreenExclusiveEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilitiesFullScreenExclusiveEXT *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesFullScreenExclusiveEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilitiesFullScreenExclusiveEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fullScreenExclusiveSupported );
     }
@@ -152748,19 +111909,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType                        = StructureType::eSurfaceCapabilitiesFullScreenExclusiveEXT;
-    void *        pNext                        = {};
-    Bool32        fullScreenExclusiveSupported = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                        = StructureType::eSurfaceCapabilitiesFullScreenExclusiveEXT;
+    void *                              pNext                        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        fullScreenExclusiveSupported = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilitiesFullScreenExclusiveEXT>
-  {
-    using Type = SurfaceCapabilitiesFullScreenExclusiveEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceCapabilitiesFullScreenExclusiveEXT>
   {
@@ -152768,8 +111921,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkSurfaceCapabilitiesPresentBarrierNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilitiesPresentBarrierNV.html
   struct SurfaceCapabilitiesPresentBarrierNV
   {
     using NativeType = VkSurfaceCapabilitiesPresentBarrierNV;
@@ -152777,10 +111928,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilitiesPresentBarrierNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentBarrierNV( Bool32 presentBarrierSupported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentBarrierSupported{ presentBarrierSupported_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentBarrierNV( VULKAN_HPP_NAMESPACE::Bool32 presentBarrierSupported_ = {},
+                                                              void *                       pNext_                   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentBarrierSupported( presentBarrierSupported_ )
     {
     }
 
@@ -152792,14 +111944,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceCapabilitiesPresentBarrierNV & operator=( SurfaceCapabilitiesPresentBarrierNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceCapabilitiesPresentBarrierNV & operator=( VkSurfaceCapabilitiesPresentBarrierNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceCapabilitiesPresentBarrierNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceCapabilitiesPresentBarrierNV const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentBarrierNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentBarrierNV &
+      setPresentBarrierSupported( VULKAN_HPP_NAMESPACE::Bool32 presentBarrierSupported_ ) VULKAN_HPP_NOEXCEPT
+    {
+      presentBarrierSupported = presentBarrierSupported_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkSurfaceCapabilitiesPresentBarrierNV const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkSurfaceCapabilitiesPresentBarrierNV *>( this );
@@ -152810,18 +111977,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceCapabilitiesPresentBarrierNV *>( this );
     }
 
-    operator VkSurfaceCapabilitiesPresentBarrierNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilitiesPresentBarrierNV *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentBarrierNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilitiesPresentBarrierNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentBarrierSupported );
     }
@@ -152846,377 +112008,27 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                   = StructureType::eSurfaceCapabilitiesPresentBarrierNV;
-    void *        pNext                   = {};
-    Bool32        presentBarrierSupported = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                   = StructureType::eSurfaceCapabilitiesPresentBarrierNV;
+    void *                              pNext                   = {};
+    VULKAN_HPP_NAMESPACE::Bool32        presentBarrierSupported = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilitiesPresentBarrierNV>
-  {
-    using Type = SurfaceCapabilitiesPresentBarrierNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceCapabilitiesPresentBarrierNV>
   {
     using Type = SurfaceCapabilitiesPresentBarrierNV;
   };
 
-  // wrapper struct for struct VkSurfaceCapabilitiesPresentId2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilitiesPresentId2KHR.html
-  struct SurfaceCapabilitiesPresentId2KHR
-  {
-    using NativeType = VkSurfaceCapabilitiesPresentId2KHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilitiesPresentId2KHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentId2KHR( Bool32 presentId2Supported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentId2Supported{ presentId2Supported_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentId2KHR( SurfaceCapabilitiesPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SurfaceCapabilitiesPresentId2KHR( VkSurfaceCapabilitiesPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfaceCapabilitiesPresentId2KHR( *reinterpret_cast<SurfaceCapabilitiesPresentId2KHR const *>( &rhs ) )
-    {
-    }
-
-    SurfaceCapabilitiesPresentId2KHR & operator=( SurfaceCapabilitiesPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SurfaceCapabilitiesPresentId2KHR & operator=( VkSurfaceCapabilitiesPresentId2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SurfaceCapabilitiesPresentId2KHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentId2KHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentId2KHR & setPresentId2Supported( Bool32 presentId2Supported_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentId2Supported = presentId2Supported_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSurfaceCapabilitiesPresentId2KHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSurfaceCapabilitiesPresentId2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentId2KHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSurfaceCapabilitiesPresentId2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentId2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilitiesPresentId2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentId2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilitiesPresentId2KHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentId2Supported );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfaceCapabilitiesPresentId2KHR const & ) const = default;
-#else
-    bool operator==( SurfaceCapabilitiesPresentId2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentId2Supported == rhs.presentId2Supported );
-#  endif
-    }
-
-    bool operator!=( SurfaceCapabilitiesPresentId2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType               = StructureType::eSurfaceCapabilitiesPresentId2KHR;
-    void *        pNext               = {};
-    Bool32        presentId2Supported = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilitiesPresentId2KHR>
-  {
-    using Type = SurfaceCapabilitiesPresentId2KHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSurfaceCapabilitiesPresentId2KHR>
-  {
-    using Type = SurfaceCapabilitiesPresentId2KHR;
-  };
-
-  // wrapper struct for struct VkSurfaceCapabilitiesPresentWait2KHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCapabilitiesPresentWait2KHR.html
-  struct SurfaceCapabilitiesPresentWait2KHR
-  {
-    using NativeType = VkSurfaceCapabilitiesPresentWait2KHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCapabilitiesPresentWait2KHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentWait2KHR( Bool32 presentWait2Supported_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentWait2Supported{ presentWait2Supported_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SurfaceCapabilitiesPresentWait2KHR( SurfaceCapabilitiesPresentWait2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SurfaceCapabilitiesPresentWait2KHR( VkSurfaceCapabilitiesPresentWait2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfaceCapabilitiesPresentWait2KHR( *reinterpret_cast<SurfaceCapabilitiesPresentWait2KHR const *>( &rhs ) )
-    {
-    }
-
-    SurfaceCapabilitiesPresentWait2KHR & operator=( SurfaceCapabilitiesPresentWait2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SurfaceCapabilitiesPresentWait2KHR & operator=( VkSurfaceCapabilitiesPresentWait2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SurfaceCapabilitiesPresentWait2KHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentWait2KHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCapabilitiesPresentWait2KHR & setPresentWait2Supported( Bool32 presentWait2Supported_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentWait2Supported = presentWait2Supported_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSurfaceCapabilitiesPresentWait2KHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSurfaceCapabilitiesPresentWait2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentWait2KHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSurfaceCapabilitiesPresentWait2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentWait2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCapabilitiesPresentWait2KHR *>( this );
-    }
-
-    operator VkSurfaceCapabilitiesPresentWait2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCapabilitiesPresentWait2KHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, presentWait2Supported );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfaceCapabilitiesPresentWait2KHR const & ) const = default;
-#else
-    bool operator==( SurfaceCapabilitiesPresentWait2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( presentWait2Supported == rhs.presentWait2Supported );
-#  endif
-    }
-
-    bool operator!=( SurfaceCapabilitiesPresentWait2KHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                 = StructureType::eSurfaceCapabilitiesPresentWait2KHR;
-    void *        pNext                 = {};
-    Bool32        presentWait2Supported = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCapabilitiesPresentWait2KHR>
-  {
-    using Type = SurfaceCapabilitiesPresentWait2KHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSurfaceCapabilitiesPresentWait2KHR>
-  {
-    using Type = SurfaceCapabilitiesPresentWait2KHR;
-  };
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkSurfaceCreateInfoOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceCreateInfoOHOS.html
-  struct SurfaceCreateInfoOHOS
-  {
-    using NativeType = VkSurfaceCreateInfoOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceCreateInfoOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SurfaceCreateInfoOHOS( SurfaceCreateFlagsOHOS flags_ = {}, OHNativeWindow * window_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , window{ window_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SurfaceCreateInfoOHOS( SurfaceCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SurfaceCreateInfoOHOS( VkSurfaceCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfaceCreateInfoOHOS( *reinterpret_cast<SurfaceCreateInfoOHOS const *>( &rhs ) )
-    {
-    }
-
-    SurfaceCreateInfoOHOS & operator=( SurfaceCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SurfaceCreateInfoOHOS & operator=( VkSurfaceCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SurfaceCreateInfoOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCreateInfoOHOS & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCreateInfoOHOS & setFlags( SurfaceCreateFlagsOHOS flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SurfaceCreateInfoOHOS & setWindow( OHNativeWindow * window_ ) VULKAN_HPP_NOEXCEPT
-    {
-      window = window_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSurfaceCreateInfoOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( this );
-    }
-
-    operator VkSurfaceCreateInfoOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSurfaceCreateInfoOHOS *>( this );
-    }
-
-    operator VkSurfaceCreateInfoOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceCreateInfoOHOS *>( this );
-    }
-
-    operator VkSurfaceCreateInfoOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceCreateInfoOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceCreateFlagsOHOS const &, OHNativeWindow * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, window );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfaceCreateInfoOHOS const & ) const = default;
-#  else
-    bool operator==( SurfaceCreateInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( window == rhs.window );
-#    endif
-    }
-
-    bool operator!=( SurfaceCreateInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType          sType  = StructureType::eSurfaceCreateInfoOHOS;
-    const void *           pNext  = {};
-    SurfaceCreateFlagsOHOS flags  = {};
-    OHNativeWindow *       window = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceCreateInfoOHOS>
-  {
-    using Type = SurfaceCreateInfoOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSurfaceCreateInfoOHOS>
-  {
-    using Type = SurfaceCreateInfoOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  // wrapper struct for struct VkSurfaceFormatKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceFormatKHR.html
   struct SurfaceFormatKHR
   {
     using NativeType = VkSurfaceFormatKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceFormatKHR( Format format_ = Format::eUndefined, ColorSpaceKHR colorSpace_ = ColorSpaceKHR::eSrgbNonlinear ) VULKAN_HPP_NOEXCEPT
-      : format{ format_ }
-      , colorSpace{ colorSpace_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SurfaceFormatKHR( VULKAN_HPP_NAMESPACE::Format        format_     = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                        VULKAN_HPP_NAMESPACE::ColorSpaceKHR colorSpace_ = VULKAN_HPP_NAMESPACE::ColorSpaceKHR::eSrgbNonlinear ) VULKAN_HPP_NOEXCEPT
+      : format( format_ )
+      , colorSpace( colorSpace_ )
     {
     }
 
@@ -153225,11 +112037,11 @@ namespace VULKAN_HPP_NAMESPACE
     SurfaceFormatKHR( VkSurfaceFormatKHR const & rhs ) VULKAN_HPP_NOEXCEPT : SurfaceFormatKHR( *reinterpret_cast<SurfaceFormatKHR const *>( &rhs ) ) {}
 
     SurfaceFormatKHR & operator=( SurfaceFormatKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceFormatKHR & operator=( VkSurfaceFormatKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceFormatKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceFormatKHR const *>( &rhs );
       return *this;
     }
 
@@ -153243,18 +112055,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceFormatKHR *>( this );
     }
 
-    operator VkSurfaceFormatKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceFormatKHR *>( this );
-    }
-
-    operator VkSurfaceFormatKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceFormatKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<Format const &, ColorSpaceKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::Format const &, VULKAN_HPP_NAMESPACE::ColorSpaceKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( format, colorSpace );
     }
@@ -153279,19 +112086,10 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    Format        format     = Format::eUndefined;
-    ColorSpaceKHR colorSpace = ColorSpaceKHR::eSrgbNonlinear;
+    VULKAN_HPP_NAMESPACE::Format        format     = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ColorSpaceKHR colorSpace = VULKAN_HPP_NAMESPACE::ColorSpaceKHR::eSrgbNonlinear;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceFormatKHR>
-  {
-    using Type = SurfaceFormatKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkSurfaceFormat2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceFormat2KHR.html
   struct SurfaceFormat2KHR
   {
     using NativeType = VkSurfaceFormat2KHR;
@@ -153299,10 +112097,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceFormat2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceFormat2KHR( SurfaceFormatKHR surfaceFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , surfaceFormat{ surfaceFormat_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceFormat2KHR( VULKAN_HPP_NAMESPACE::SurfaceFormatKHR surfaceFormat_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , surfaceFormat( surfaceFormat_ )
     {
     }
 
@@ -153311,11 +112109,11 @@ namespace VULKAN_HPP_NAMESPACE
     SurfaceFormat2KHR( VkSurfaceFormat2KHR const & rhs ) VULKAN_HPP_NOEXCEPT : SurfaceFormat2KHR( *reinterpret_cast<SurfaceFormat2KHR const *>( &rhs ) ) {}
 
     SurfaceFormat2KHR & operator=( SurfaceFormat2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceFormat2KHR & operator=( VkSurfaceFormat2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceFormat2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceFormat2KHR const *>( &rhs );
       return *this;
     }
 
@@ -153329,18 +112127,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceFormat2KHR *>( this );
     }
 
-    operator VkSurfaceFormat2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceFormat2KHR *>( this );
-    }
-
-    operator VkSurfaceFormat2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceFormat2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, SurfaceFormatKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::SurfaceFormatKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, surfaceFormat );
     }
@@ -153365,19 +112158,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType         = StructureType::eSurfaceFormat2KHR;
-    void *           pNext         = {};
-    SurfaceFormatKHR surfaceFormat = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType         = StructureType::eSurfaceFormat2KHR;
+    void *                                 pNext         = {};
+    VULKAN_HPP_NAMESPACE::SurfaceFormatKHR surfaceFormat = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceFormat2KHR>
-  {
-    using Type = SurfaceFormat2KHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceFormat2KHR>
   {
@@ -153385,8 +112170,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkSurfaceFullScreenExclusiveInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceFullScreenExclusiveInfoEXT.html
   struct SurfaceFullScreenExclusiveInfoEXT
   {
     using NativeType = VkSurfaceFullScreenExclusiveInfoEXT;
@@ -153394,11 +112177,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceFullScreenExclusiveInfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceFullScreenExclusiveInfoEXT( FullScreenExclusiveEXT fullScreenExclusive_ = FullScreenExclusiveEXT::eDefault,
-                                                            void *                 pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , fullScreenExclusive{ fullScreenExclusive_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceFullScreenExclusiveInfoEXT(
+      VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT fullScreenExclusive_ = VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT::eDefault,
+      void *                                       pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , fullScreenExclusive( fullScreenExclusive_ )
     {
     }
 
@@ -153410,27 +112194,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceFullScreenExclusiveInfoEXT & operator=( SurfaceFullScreenExclusiveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceFullScreenExclusiveInfoEXT & operator=( VkSurfaceFullScreenExclusiveInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceFullScreenExclusiveInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceFullScreenExclusiveInfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SurfaceFullScreenExclusiveInfoEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfaceFullScreenExclusiveInfoEXT & setFullScreenExclusive( FullScreenExclusiveEXT fullScreenExclusive_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfaceFullScreenExclusiveInfoEXT &
+      setFullScreenExclusive( VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT fullScreenExclusive_ ) VULKAN_HPP_NOEXCEPT
     {
       fullScreenExclusive = fullScreenExclusive_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSurfaceFullScreenExclusiveInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -153442,18 +112227,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceFullScreenExclusiveInfoEXT *>( this );
     }
 
-    operator VkSurfaceFullScreenExclusiveInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceFullScreenExclusiveInfoEXT *>( this );
-    }
-
-    operator VkSurfaceFullScreenExclusiveInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceFullScreenExclusiveInfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, FullScreenExclusiveEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, fullScreenExclusive );
     }
@@ -153478,19 +112258,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType          sType               = StructureType::eSurfaceFullScreenExclusiveInfoEXT;
-    void *                 pNext               = {};
-    FullScreenExclusiveEXT fullScreenExclusive = FullScreenExclusiveEXT::eDefault;
+    VULKAN_HPP_NAMESPACE::StructureType          sType               = StructureType::eSurfaceFullScreenExclusiveInfoEXT;
+    void *                                       pNext               = {};
+    VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT fullScreenExclusive = VULKAN_HPP_NAMESPACE::FullScreenExclusiveEXT::eDefault;
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceFullScreenExclusiveInfoEXT>
-  {
-    using Type = SurfaceFullScreenExclusiveInfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceFullScreenExclusiveInfoEXT>
   {
@@ -153499,8 +112271,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkSurfaceFullScreenExclusiveWin32InfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceFullScreenExclusiveWin32InfoEXT.html
   struct SurfaceFullScreenExclusiveWin32InfoEXT
   {
     using NativeType = VkSurfaceFullScreenExclusiveWin32InfoEXT;
@@ -153508,10 +112278,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR SurfaceFullScreenExclusiveWin32InfoEXT( HMONITOR hmonitor_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hmonitor{ hmonitor_ }
+      : pNext( pNext_ )
+      , hmonitor( hmonitor_ )
     {
     }
 
@@ -153523,15 +112293,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceFullScreenExclusiveWin32InfoEXT & operator=( SurfaceFullScreenExclusiveWin32InfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceFullScreenExclusiveWin32InfoEXT & operator=( VkSurfaceFullScreenExclusiveWin32InfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceFullScreenExclusiveWin32InfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceFullScreenExclusiveWin32InfoEXT const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SurfaceFullScreenExclusiveWin32InfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -153543,7 +112313,7 @@ namespace VULKAN_HPP_NAMESPACE
       hmonitor = hmonitor_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSurfaceFullScreenExclusiveWin32InfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -153555,18 +112325,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceFullScreenExclusiveWin32InfoEXT *>( this );
     }
 
-    operator VkSurfaceFullScreenExclusiveWin32InfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceFullScreenExclusiveWin32InfoEXT *>( this );
-    }
-
-    operator VkSurfaceFullScreenExclusiveWin32InfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceFullScreenExclusiveWin32InfoEXT *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, HMONITOR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, HMONITOR const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hmonitor );
     }
@@ -153591,19 +112356,11 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType sType    = StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT;
-    const void *  pNext    = {};
-    HMONITOR      hmonitor = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT;
+    const void *                        pNext    = {};
+    HMONITOR                            hmonitor = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceFullScreenExclusiveWin32InfoEXT>
-  {
-    using Type = SurfaceFullScreenExclusiveWin32InfoEXT;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT>
   {
@@ -153611,107 +112368,103 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkSurfacePresentModeCompatibilityKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfacePresentModeCompatibilityKHR.html
-  struct SurfacePresentModeCompatibilityKHR
+  struct SurfacePresentModeCompatibilityEXT
   {
-    using NativeType = VkSurfacePresentModeCompatibilityKHR;
+    using NativeType = VkSurfacePresentModeCompatibilityEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentModeCompatibilityKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentModeCompatibilityEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SurfacePresentModeCompatibilityKHR( uint32_t presentModeCount_ = {}, PresentModeKHR * pPresentModes_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentModeCount{ presentModeCount_ }
-      , pPresentModes{ pPresentModes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfacePresentModeCompatibilityEXT( uint32_t                               presentModeCount_ = {},
+                                                             VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_    = {},
+                                                             void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentModeCount( presentModeCount_ )
+      , pPresentModes( pPresentModes_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SurfacePresentModeCompatibilityKHR( SurfacePresentModeCompatibilityKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SurfacePresentModeCompatibilityEXT( SurfacePresentModeCompatibilityEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SurfacePresentModeCompatibilityKHR( VkSurfacePresentModeCompatibilityKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfacePresentModeCompatibilityKHR( *reinterpret_cast<SurfacePresentModeCompatibilityKHR const *>( &rhs ) )
+    SurfacePresentModeCompatibilityEXT( VkSurfacePresentModeCompatibilityEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SurfacePresentModeCompatibilityEXT( *reinterpret_cast<SurfacePresentModeCompatibilityEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SurfacePresentModeCompatibilityKHR( ArrayProxyNoTemporaries<PresentModeKHR> const & presentModes_, void * pNext_ = nullptr )
+    SurfacePresentModeCompatibilityEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_,
+                                        void *                                                                                      pNext_ = nullptr )
       : pNext( pNext_ ), presentModeCount( static_cast<uint32_t>( presentModes_.size() ) ), pPresentModes( presentModes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    SurfacePresentModeCompatibilityKHR & operator=( SurfacePresentModeCompatibilityKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SurfacePresentModeCompatibilityEXT & operator=( SurfacePresentModeCompatibilityEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SurfacePresentModeCompatibilityKHR & operator=( VkSurfacePresentModeCompatibilityKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SurfacePresentModeCompatibilityEXT & operator=( VkSurfacePresentModeCompatibilityEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfacePresentModeCompatibilityKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfacePresentModeCompatibilityEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityKHR & setPresentModeCount( uint32_t presentModeCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityEXT & setPresentModeCount( uint32_t presentModeCount_ ) VULKAN_HPP_NOEXCEPT
     {
       presentModeCount = presentModeCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityKHR & setPPresentModes( PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeCompatibilityEXT & setPPresentModes( VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       pPresentModes = pPresentModes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SurfacePresentModeCompatibilityKHR & setPresentModes( ArrayProxyNoTemporaries<PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
+    SurfacePresentModeCompatibilityEXT &
+      setPresentModes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       presentModeCount = static_cast<uint32_t>( presentModes_.size() );
       pPresentModes    = presentModes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSurfacePresentModeCompatibilityKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentModeCompatibilityEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSurfacePresentModeCompatibilityKHR *>( this );
+      return *reinterpret_cast<const VkSurfacePresentModeCompatibilityEXT *>( this );
     }
 
-    operator VkSurfacePresentModeCompatibilityKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentModeCompatibilityEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSurfacePresentModeCompatibilityKHR *>( this );
-    }
-
-    operator VkSurfacePresentModeCompatibilityKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfacePresentModeCompatibilityKHR *>( this );
-    }
-
-    operator VkSurfacePresentModeCompatibilityKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfacePresentModeCompatibilityKHR *>( this );
+      return *reinterpret_cast<VkSurfacePresentModeCompatibilityEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, PresentModeKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::PresentModeKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentModeCount, pPresentModes );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfacePresentModeCompatibilityKHR const & ) const = default;
+    auto operator<=>( SurfacePresentModeCompatibilityEXT const & ) const = default;
 #else
-    bool operator==( SurfacePresentModeCompatibilityKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SurfacePresentModeCompatibilityEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -153720,111 +112473,96 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SurfacePresentModeCompatibilityKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SurfacePresentModeCompatibilityEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType    sType            = StructureType::eSurfacePresentModeCompatibilityKHR;
-    void *           pNext            = {};
-    uint32_t         presentModeCount = {};
-    PresentModeKHR * pPresentModes    = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType            = StructureType::eSurfacePresentModeCompatibilityEXT;
+    void *                                 pNext            = {};
+    uint32_t                               presentModeCount = {};
+    VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfacePresentModeCompatibilityKHR>
-  {
-    using Type = SurfacePresentModeCompatibilityKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSurfacePresentModeCompatibilityKHR>
+  struct CppType<StructureType, StructureType::eSurfacePresentModeCompatibilityEXT>
   {
-    using Type = SurfacePresentModeCompatibilityKHR;
+    using Type = SurfacePresentModeCompatibilityEXT;
   };
 
-  using SurfacePresentModeCompatibilityEXT = SurfacePresentModeCompatibilityKHR;
-
-  // wrapper struct for struct VkSurfacePresentModeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfacePresentModeKHR.html
-  struct SurfacePresentModeKHR
+  struct SurfacePresentModeEXT
   {
-    using NativeType = VkSurfacePresentModeKHR;
+    using NativeType = VkSurfacePresentModeEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentModeKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentModeEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfacePresentModeKHR( PresentModeKHR presentMode_ = PresentModeKHR::eImmediate, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentMode{ presentMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfacePresentModeEXT( VULKAN_HPP_NAMESPACE::PresentModeKHR presentMode_ = VULKAN_HPP_NAMESPACE::PresentModeKHR::eImmediate,
+                                                void *                               pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentMode( presentMode_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SurfacePresentModeKHR( SurfacePresentModeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SurfacePresentModeEXT( SurfacePresentModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SurfacePresentModeKHR( VkSurfacePresentModeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfacePresentModeKHR( *reinterpret_cast<SurfacePresentModeKHR const *>( &rhs ) )
+    SurfacePresentModeEXT( VkSurfacePresentModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SurfacePresentModeEXT( *reinterpret_cast<SurfacePresentModeEXT const *>( &rhs ) )
     {
     }
 
-    SurfacePresentModeKHR & operator=( SurfacePresentModeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SurfacePresentModeEXT & operator=( SurfacePresentModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SurfacePresentModeKHR & operator=( VkSurfacePresentModeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SurfacePresentModeEXT & operator=( VkSurfacePresentModeEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfacePresentModeKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfacePresentModeEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeKHR & setPresentMode( PresentModeKHR presentMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentModeEXT & setPresentMode( VULKAN_HPP_NAMESPACE::PresentModeKHR presentMode_ ) VULKAN_HPP_NOEXCEPT
     {
       presentMode = presentMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSurfacePresentModeKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentModeEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSurfacePresentModeKHR *>( this );
+      return *reinterpret_cast<const VkSurfacePresentModeEXT *>( this );
     }
 
-    operator VkSurfacePresentModeKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentModeEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSurfacePresentModeKHR *>( this );
-    }
-
-    operator VkSurfacePresentModeKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfacePresentModeKHR *>( this );
-    }
-
-    operator VkSurfacePresentModeKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfacePresentModeKHR *>( this );
+      return *reinterpret_cast<VkSurfacePresentModeEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, PresentModeKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::PresentModeKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentMode );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfacePresentModeKHR const & ) const = default;
+    auto operator<=>( SurfacePresentModeEXT const & ) const = default;
 #else
-    bool operator==( SurfacePresentModeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SurfacePresentModeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -153833,144 +112571,128 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SurfacePresentModeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SurfacePresentModeEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType  sType       = StructureType::eSurfacePresentModeKHR;
-    void *         pNext       = {};
-    PresentModeKHR presentMode = PresentModeKHR::eImmediate;
+    VULKAN_HPP_NAMESPACE::StructureType  sType       = StructureType::eSurfacePresentModeEXT;
+    void *                               pNext       = {};
+    VULKAN_HPP_NAMESPACE::PresentModeKHR presentMode = VULKAN_HPP_NAMESPACE::PresentModeKHR::eImmediate;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfacePresentModeKHR>
-  {
-    using Type = SurfacePresentModeKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSurfacePresentModeKHR>
+  struct CppType<StructureType, StructureType::eSurfacePresentModeEXT>
   {
-    using Type = SurfacePresentModeKHR;
+    using Type = SurfacePresentModeEXT;
   };
 
-  using SurfacePresentModeEXT = SurfacePresentModeKHR;
-
-  // wrapper struct for struct VkSurfacePresentScalingCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfacePresentScalingCapabilitiesKHR.html
-  struct SurfacePresentScalingCapabilitiesKHR
+  struct SurfacePresentScalingCapabilitiesEXT
   {
-    using NativeType = VkSurfacePresentScalingCapabilitiesKHR;
+    using NativeType = VkSurfacePresentScalingCapabilitiesEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentScalingCapabilitiesKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfacePresentScalingCapabilitiesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfacePresentScalingCapabilitiesKHR( PresentScalingFlagsKHR supportedPresentScaling_  = {},
-                                                               PresentGravityFlagsKHR supportedPresentGravityX_ = {},
-                                                               PresentGravityFlagsKHR supportedPresentGravityY_ = {},
-                                                               Extent2D               minScaledImageExtent_     = {},
-                                                               Extent2D               maxScaledImageExtent_     = {},
-                                                               void *                 pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportedPresentScaling{ supportedPresentScaling_ }
-      , supportedPresentGravityX{ supportedPresentGravityX_ }
-      , supportedPresentGravityY{ supportedPresentGravityY_ }
-      , minScaledImageExtent{ minScaledImageExtent_ }
-      , maxScaledImageExtent{ maxScaledImageExtent_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfacePresentScalingCapabilitiesEXT( VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT supportedPresentScaling_  = {},
+                                                               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityX_ = {},
+                                                               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityY_ = {},
+                                                               VULKAN_HPP_NAMESPACE::Extent2D               minScaledImageExtent_     = {},
+                                                               VULKAN_HPP_NAMESPACE::Extent2D               maxScaledImageExtent_     = {},
+                                                               void *                                       pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportedPresentScaling( supportedPresentScaling_ )
+      , supportedPresentGravityX( supportedPresentGravityX_ )
+      , supportedPresentGravityY( supportedPresentGravityY_ )
+      , minScaledImageExtent( minScaledImageExtent_ )
+      , maxScaledImageExtent( maxScaledImageExtent_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SurfacePresentScalingCapabilitiesKHR( SurfacePresentScalingCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SurfacePresentScalingCapabilitiesEXT( SurfacePresentScalingCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SurfacePresentScalingCapabilitiesKHR( VkSurfacePresentScalingCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SurfacePresentScalingCapabilitiesKHR( *reinterpret_cast<SurfacePresentScalingCapabilitiesKHR const *>( &rhs ) )
+    SurfacePresentScalingCapabilitiesEXT( VkSurfacePresentScalingCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SurfacePresentScalingCapabilitiesEXT( *reinterpret_cast<SurfacePresentScalingCapabilitiesEXT const *>( &rhs ) )
     {
     }
 
-    SurfacePresentScalingCapabilitiesKHR & operator=( SurfacePresentScalingCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SurfacePresentScalingCapabilitiesEXT & operator=( SurfacePresentScalingCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SurfacePresentScalingCapabilitiesKHR & operator=( VkSurfacePresentScalingCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SurfacePresentScalingCapabilitiesEXT & operator=( VkSurfacePresentScalingCapabilitiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfacePresentScalingCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfacePresentScalingCapabilitiesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR &
-      setSupportedPresentScaling( PresentScalingFlagsKHR supportedPresentScaling_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT &
+      setSupportedPresentScaling( VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT supportedPresentScaling_ ) VULKAN_HPP_NOEXCEPT
     {
       supportedPresentScaling = supportedPresentScaling_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR &
-      setSupportedPresentGravityX( PresentGravityFlagsKHR supportedPresentGravityX_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT &
+      setSupportedPresentGravityX( VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityX_ ) VULKAN_HPP_NOEXCEPT
     {
       supportedPresentGravityX = supportedPresentGravityX_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR &
-      setSupportedPresentGravityY( PresentGravityFlagsKHR supportedPresentGravityY_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT &
+      setSupportedPresentGravityY( VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityY_ ) VULKAN_HPP_NOEXCEPT
     {
       supportedPresentGravityY = supportedPresentGravityY_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR & setMinScaledImageExtent( Extent2D const & minScaledImageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT &
+      setMinScaledImageExtent( VULKAN_HPP_NAMESPACE::Extent2D const & minScaledImageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       minScaledImageExtent = minScaledImageExtent_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesKHR & setMaxScaledImageExtent( Extent2D const & maxScaledImageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SurfacePresentScalingCapabilitiesEXT &
+      setMaxScaledImageExtent( VULKAN_HPP_NAMESPACE::Extent2D const & maxScaledImageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       maxScaledImageExtent = maxScaledImageExtent_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSurfacePresentScalingCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentScalingCapabilitiesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSurfacePresentScalingCapabilitiesKHR *>( this );
+      return *reinterpret_cast<const VkSurfacePresentScalingCapabilitiesEXT *>( this );
     }
 
-    operator VkSurfacePresentScalingCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSurfacePresentScalingCapabilitiesEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSurfacePresentScalingCapabilitiesKHR *>( this );
-    }
-
-    operator VkSurfacePresentScalingCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfacePresentScalingCapabilitiesKHR *>( this );
-    }
-
-    operator VkSurfacePresentScalingCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfacePresentScalingCapabilitiesKHR *>( this );
+      return *reinterpret_cast<VkSurfacePresentScalingCapabilitiesEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               PresentScalingFlagsKHR const &,
-               PresentGravityFlagsKHR const &,
-               PresentGravityFlagsKHR const &,
-               Extent2D const &,
-               Extent2D const &>
+               VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supportedPresentScaling, supportedPresentGravityX, supportedPresentGravityY, minScaledImageExtent, maxScaledImageExtent );
@@ -153978,9 +112700,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SurfacePresentScalingCapabilitiesKHR const & ) const = default;
+    auto operator<=>( SurfacePresentScalingCapabilitiesEXT const & ) const = default;
 #else
-    bool operator==( SurfacePresentScalingCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SurfacePresentScalingCapabilitiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -153991,40 +112713,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SurfacePresentScalingCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SurfacePresentScalingCapabilitiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType                    = StructureType::eSurfacePresentScalingCapabilitiesKHR;
-    void *                 pNext                    = {};
-    PresentScalingFlagsKHR supportedPresentScaling  = {};
-    PresentGravityFlagsKHR supportedPresentGravityX = {};
-    PresentGravityFlagsKHR supportedPresentGravityY = {};
-    Extent2D               minScaledImageExtent     = {};
-    Extent2D               maxScaledImageExtent     = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType                    = StructureType::eSurfacePresentScalingCapabilitiesEXT;
+    void *                                       pNext                    = {};
+    VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT supportedPresentScaling  = {};
+    VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityX = {};
+    VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT supportedPresentGravityY = {};
+    VULKAN_HPP_NAMESPACE::Extent2D               minScaledImageExtent     = {};
+    VULKAN_HPP_NAMESPACE::Extent2D               maxScaledImageExtent     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfacePresentScalingCapabilitiesKHR>
-  {
-    using Type = SurfacePresentScalingCapabilitiesKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSurfacePresentScalingCapabilitiesKHR>
+  struct CppType<StructureType, StructureType::eSurfacePresentScalingCapabilitiesEXT>
   {
-    using Type = SurfacePresentScalingCapabilitiesKHR;
+    using Type = SurfacePresentScalingCapabilitiesEXT;
   };
 
-  using SurfacePresentScalingCapabilitiesEXT = SurfacePresentScalingCapabilitiesKHR;
-
-  // wrapper struct for struct VkSurfaceProtectedCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSurfaceProtectedCapabilitiesKHR.html
   struct SurfaceProtectedCapabilitiesKHR
   {
     using NativeType = VkSurfaceProtectedCapabilitiesKHR;
@@ -154032,10 +112742,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSurfaceProtectedCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SurfaceProtectedCapabilitiesKHR( Bool32 supportsProtected_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportsProtected{ supportsProtected_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SurfaceProtectedCapabilitiesKHR( VULKAN_HPP_NAMESPACE::Bool32 supportsProtected_ = {},
+                                                          const void *                 pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportsProtected( supportsProtected_ )
     {
     }
 
@@ -154047,14 +112758,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SurfaceProtectedCapabilitiesKHR & operator=( SurfaceProtectedCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SurfaceProtectedCapabilitiesKHR & operator=( VkSurfaceProtectedCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SurfaceProtectedCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SurfaceProtectedCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SurfaceProtectedCapabilitiesKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+    {
+      pNext = pNext_;
+      return *this;
+    }
+
+    VULKAN_HPP_CONSTEXPR_14 SurfaceProtectedCapabilitiesKHR & setSupportsProtected( VULKAN_HPP_NAMESPACE::Bool32 supportsProtected_ ) VULKAN_HPP_NOEXCEPT
+    {
+      supportsProtected = supportsProtected_;
+      return *this;
+    }
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
+
     operator VkSurfaceProtectedCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
     {
       return *reinterpret_cast<const VkSurfaceProtectedCapabilitiesKHR *>( this );
@@ -154065,18 +112790,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSurfaceProtectedCapabilitiesKHR *>( this );
     }
 
-    operator VkSurfaceProtectedCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSurfaceProtectedCapabilitiesKHR *>( this );
-    }
-
-    operator VkSurfaceProtectedCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSurfaceProtectedCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supportsProtected );
     }
@@ -154101,159 +112821,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eSurfaceProtectedCapabilitiesKHR;
-    void *        pNext             = {};
-    Bool32        supportsProtected = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eSurfaceProtectedCapabilitiesKHR;
+    const void *                        pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        supportsProtected = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSurfaceProtectedCapabilitiesKHR>
-  {
-    using Type = SurfaceProtectedCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSurfaceProtectedCapabilitiesKHR>
   {
     using Type = SurfaceProtectedCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkSwapchainCalibratedTimestampInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainCalibratedTimestampInfoEXT.html
-  struct SwapchainCalibratedTimestampInfoEXT
-  {
-    using NativeType = VkSwapchainCalibratedTimestampInfoEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainCalibratedTimestampInfoEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainCalibratedTimestampInfoEXT( SwapchainKHR         swapchain_    = {},
-                                                              PresentStageFlagsEXT presentStage_ = {},
-                                                              uint64_t             timeDomainId_ = {},
-                                                              const void *         pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchain{ swapchain_ }
-      , presentStage{ presentStage_ }
-      , timeDomainId{ timeDomainId_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SwapchainCalibratedTimestampInfoEXT( SwapchainCalibratedTimestampInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SwapchainCalibratedTimestampInfoEXT( VkSwapchainCalibratedTimestampInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainCalibratedTimestampInfoEXT( *reinterpret_cast<SwapchainCalibratedTimestampInfoEXT const *>( &rhs ) )
-    {
-    }
-
-    SwapchainCalibratedTimestampInfoEXT & operator=( SwapchainCalibratedTimestampInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SwapchainCalibratedTimestampInfoEXT & operator=( VkSwapchainCalibratedTimestampInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SwapchainCalibratedTimestampInfoEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
-    {
-      swapchain = swapchain_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPresentStage( PresentStageFlagsEXT presentStage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      presentStage = presentStage_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainId = timeDomainId_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSwapchainCalibratedTimestampInfoEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSwapchainCalibratedTimestampInfoEXT *>( this );
-    }
-
-    operator VkSwapchainCalibratedTimestampInfoEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSwapchainCalibratedTimestampInfoEXT *>( this );
-    }
-
-    operator VkSwapchainCalibratedTimestampInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainCalibratedTimestampInfoEXT *>( this );
-    }
-
-    operator VkSwapchainCalibratedTimestampInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainCalibratedTimestampInfoEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainKHR const &, PresentStageFlagsEXT const &, uint64_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, swapchain, presentStage, timeDomainId );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainCalibratedTimestampInfoEXT const & ) const = default;
-#else
-    bool operator==( SwapchainCalibratedTimestampInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( swapchain == rhs.swapchain ) && ( presentStage == rhs.presentStage ) &&
-             ( timeDomainId == rhs.timeDomainId );
-#  endif
-    }
-
-    bool operator!=( SwapchainCalibratedTimestampInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType        sType        = StructureType::eSwapchainCalibratedTimestampInfoEXT;
-    const void *         pNext        = {};
-    SwapchainKHR         swapchain    = {};
-    PresentStageFlagsEXT presentStage = {};
-    uint64_t             timeDomainId = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainCalibratedTimestampInfoEXT>
-  {
-    using Type = SwapchainCalibratedTimestampInfoEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSwapchainCalibratedTimestampInfoEXT>
-  {
-    using Type = SwapchainCalibratedTimestampInfoEXT;
-  };
-
-  // wrapper struct for struct VkSwapchainCounterCreateInfoEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainCounterCreateInfoEXT.html
   struct SwapchainCounterCreateInfoEXT
   {
     using NativeType = VkSwapchainCounterCreateInfoEXT;
@@ -154261,10 +112839,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainCounterCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainCounterCreateInfoEXT( SurfaceCounterFlagsEXT surfaceCounters_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , surfaceCounters{ surfaceCounters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainCounterCreateInfoEXT( VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT surfaceCounters_ = {},
+                                                        const void *                                 pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , surfaceCounters( surfaceCounters_ )
     {
     }
 
@@ -154276,27 +112855,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SwapchainCounterCreateInfoEXT & operator=( SwapchainCounterCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SwapchainCounterCreateInfoEXT & operator=( VkSwapchainCounterCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainCounterCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainCounterCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SwapchainCounterCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCounterCreateInfoEXT & setSurfaceCounters( SurfaceCounterFlagsEXT surfaceCounters_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCounterCreateInfoEXT &
+      setSurfaceCounters( VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT surfaceCounters_ ) VULKAN_HPP_NOEXCEPT
     {
       surfaceCounters = surfaceCounters_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSwapchainCounterCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -154308,18 +112888,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSwapchainCounterCreateInfoEXT *>( this );
     }
 
-    operator VkSwapchainCounterCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainCounterCreateInfoEXT *>( this );
-    }
-
-    operator VkSwapchainCounterCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainCounterCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SurfaceCounterFlagsEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, surfaceCounters );
     }
@@ -154344,26 +112919,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType           = StructureType::eSwapchainCounterCreateInfoEXT;
-    const void *           pNext           = {};
-    SurfaceCounterFlagsEXT surfaceCounters = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType           = StructureType::eSwapchainCounterCreateInfoEXT;
+    const void *                                 pNext           = {};
+    VULKAN_HPP_NAMESPACE::SurfaceCounterFlagsEXT surfaceCounters = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainCounterCreateInfoEXT>
-  {
-    using Type = SwapchainCounterCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSwapchainCounterCreateInfoEXT>
   {
     using Type = SwapchainCounterCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkSwapchainCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainCreateInfoKHR.html
   struct SwapchainCreateInfoKHR
   {
     using NativeType = VkSwapchainCreateInfoKHR;
@@ -154371,41 +112937,42 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainCreateInfoKHR( SwapchainCreateFlagsKHR     flags_                 = {},
-                                                 SurfaceKHR                  surface_               = {},
-                                                 uint32_t                    minImageCount_         = {},
-                                                 Format                      imageFormat_           = Format::eUndefined,
-                                                 ColorSpaceKHR               imageColorSpace_       = ColorSpaceKHR::eSrgbNonlinear,
-                                                 Extent2D                    imageExtent_           = {},
-                                                 uint32_t                    imageArrayLayers_      = {},
-                                                 ImageUsageFlags             imageUsage_            = {},
-                                                 SharingMode                 imageSharingMode_      = SharingMode::eExclusive,
-                                                 uint32_t                    queueFamilyIndexCount_ = {},
-                                                 const uint32_t *            pQueueFamilyIndices_   = {},
-                                                 SurfaceTransformFlagBitsKHR preTransform_          = SurfaceTransformFlagBitsKHR::eIdentity,
-                                                 CompositeAlphaFlagBitsKHR   compositeAlpha_        = CompositeAlphaFlagBitsKHR::eOpaque,
-                                                 PresentModeKHR              presentMode_           = PresentModeKHR::eImmediate,
-                                                 Bool32                      clipped_               = {},
-                                                 SwapchainKHR                oldSwapchain_          = {},
-                                                 const void *                pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , surface{ surface_ }
-      , minImageCount{ minImageCount_ }
-      , imageFormat{ imageFormat_ }
-      , imageColorSpace{ imageColorSpace_ }
-      , imageExtent{ imageExtent_ }
-      , imageArrayLayers{ imageArrayLayers_ }
-      , imageUsage{ imageUsage_ }
-      , imageSharingMode{ imageSharingMode_ }
-      , queueFamilyIndexCount{ queueFamilyIndexCount_ }
-      , pQueueFamilyIndices{ pQueueFamilyIndices_ }
-      , preTransform{ preTransform_ }
-      , compositeAlpha{ compositeAlpha_ }
-      , presentMode{ presentMode_ }
-      , clipped{ clipped_ }
-      , oldSwapchain{ oldSwapchain_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      SwapchainCreateInfoKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateFlagsKHR     flags_                 = {},
+                              VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface_               = {},
+                              uint32_t                                          minImageCount_         = {},
+                              VULKAN_HPP_NAMESPACE::Format                      imageFormat_           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                              VULKAN_HPP_NAMESPACE::ColorSpaceKHR               imageColorSpace_       = VULKAN_HPP_NAMESPACE::ColorSpaceKHR::eSrgbNonlinear,
+                              VULKAN_HPP_NAMESPACE::Extent2D                    imageExtent_           = {},
+                              uint32_t                                          imageArrayLayers_      = {},
+                              VULKAN_HPP_NAMESPACE::ImageUsageFlags             imageUsage_            = {},
+                              VULKAN_HPP_NAMESPACE::SharingMode                 imageSharingMode_      = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive,
+                              uint32_t                                          queueFamilyIndexCount_ = {},
+                              const uint32_t *                                  pQueueFamilyIndices_   = {},
+                              VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR preTransform_   = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+                              VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR   compositeAlpha_ = VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR::eOpaque,
+                              VULKAN_HPP_NAMESPACE::PresentModeKHR              presentMode_    = VULKAN_HPP_NAMESPACE::PresentModeKHR::eImmediate,
+                              VULKAN_HPP_NAMESPACE::Bool32                      clipped_        = {},
+                              VULKAN_HPP_NAMESPACE::SwapchainKHR                oldSwapchain_   = {},
+                              const void *                                      pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , surface( surface_ )
+      , minImageCount( minImageCount_ )
+      , imageFormat( imageFormat_ )
+      , imageColorSpace( imageColorSpace_ )
+      , imageExtent( imageExtent_ )
+      , imageArrayLayers( imageArrayLayers_ )
+      , imageUsage( imageUsage_ )
+      , imageSharingMode( imageSharingMode_ )
+      , queueFamilyIndexCount( queueFamilyIndexCount_ )
+      , pQueueFamilyIndices( pQueueFamilyIndices_ )
+      , preTransform( preTransform_ )
+      , compositeAlpha( compositeAlpha_ )
+      , presentMode( presentMode_ )
+      , clipped( clipped_ )
+      , oldSwapchain( oldSwapchain_ )
     {
     }
 
@@ -154417,22 +112984,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainCreateInfoKHR( SwapchainCreateFlagsKHR                         flags_,
-                            SurfaceKHR                                      surface_,
-                            uint32_t                                        minImageCount_,
-                            Format                                          imageFormat_,
-                            ColorSpaceKHR                                   imageColorSpace_,
-                            Extent2D                                        imageExtent_,
-                            uint32_t                                        imageArrayLayers_,
-                            ImageUsageFlags                                 imageUsage_,
-                            SharingMode                                     imageSharingMode_,
-                            ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
-                            SurfaceTransformFlagBitsKHR                     preTransform_   = SurfaceTransformFlagBitsKHR::eIdentity,
-                            CompositeAlphaFlagBitsKHR                       compositeAlpha_ = CompositeAlphaFlagBitsKHR::eOpaque,
-                            PresentModeKHR                                  presentMode_    = PresentModeKHR::eImmediate,
-                            Bool32                                          clipped_        = {},
-                            SwapchainKHR                                    oldSwapchain_   = {},
-                            const void *                                    pNext_          = nullptr )
+    SwapchainCreateInfoKHR( VULKAN_HPP_NAMESPACE::SwapchainCreateFlagsKHR                         flags_,
+                            VULKAN_HPP_NAMESPACE::SurfaceKHR                                      surface_,
+                            uint32_t                                                              minImageCount_,
+                            VULKAN_HPP_NAMESPACE::Format                                          imageFormat_,
+                            VULKAN_HPP_NAMESPACE::ColorSpaceKHR                                   imageColorSpace_,
+                            VULKAN_HPP_NAMESPACE::Extent2D                                        imageExtent_,
+                            uint32_t                                                              imageArrayLayers_,
+                            VULKAN_HPP_NAMESPACE::ImageUsageFlags                                 imageUsage_,
+                            VULKAN_HPP_NAMESPACE::SharingMode                                     imageSharingMode_,
+                            VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_,
+                            VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR preTransform_   = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity,
+                            VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR   compositeAlpha_ = VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR::eOpaque,
+                            VULKAN_HPP_NAMESPACE::PresentModeKHR              presentMode_    = VULKAN_HPP_NAMESPACE::PresentModeKHR::eImmediate,
+                            VULKAN_HPP_NAMESPACE::Bool32                      clipped_        = {},
+                            VULKAN_HPP_NAMESPACE::SwapchainKHR                oldSwapchain_   = {},
+                            const void *                                      pNext_          = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , surface( surface_ )
@@ -154455,28 +113022,28 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     SwapchainCreateInfoKHR & operator=( SwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SwapchainCreateInfoKHR & operator=( VkSwapchainCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setFlags( SwapchainCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::SwapchainCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setSurface( SurfaceKHR surface_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setSurface( VULKAN_HPP_NAMESPACE::SurfaceKHR surface_ ) VULKAN_HPP_NOEXCEPT
     {
       surface = surface_;
       return *this;
@@ -154488,19 +113055,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageFormat( Format imageFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageFormat( VULKAN_HPP_NAMESPACE::Format imageFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       imageFormat = imageFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageColorSpace( ColorSpaceKHR imageColorSpace_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageColorSpace( VULKAN_HPP_NAMESPACE::ColorSpaceKHR imageColorSpace_ ) VULKAN_HPP_NOEXCEPT
     {
       imageColorSpace = imageColorSpace_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageExtent( Extent2D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageExtent( VULKAN_HPP_NAMESPACE::Extent2D const & imageExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       imageExtent = imageExtent_;
       return *this;
@@ -154512,13 +113079,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageUsage( ImageUsageFlags imageUsage_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageUsage( VULKAN_HPP_NAMESPACE::ImageUsageFlags imageUsage_ ) VULKAN_HPP_NOEXCEPT
     {
       imageUsage = imageUsage_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageSharingMode( SharingMode imageSharingMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setImageSharingMode( VULKAN_HPP_NAMESPACE::SharingMode imageSharingMode_ ) VULKAN_HPP_NOEXCEPT
     {
       imageSharingMode = imageSharingMode_;
       return *this;
@@ -154537,7 +113104,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainCreateInfoKHR & setQueueFamilyIndices( ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
+    SwapchainCreateInfoKHR &
+      setQueueFamilyIndices( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & queueFamilyIndices_ ) VULKAN_HPP_NOEXCEPT
     {
       queueFamilyIndexCount = static_cast<uint32_t>( queueFamilyIndices_.size() );
       pQueueFamilyIndices   = queueFamilyIndices_.data();
@@ -154545,36 +113113,36 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setPreTransform( SurfaceTransformFlagBitsKHR preTransform_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setPreTransform( VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR preTransform_ ) VULKAN_HPP_NOEXCEPT
     {
       preTransform = preTransform_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setCompositeAlpha( CompositeAlphaFlagBitsKHR compositeAlpha_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setCompositeAlpha( VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR compositeAlpha_ ) VULKAN_HPP_NOEXCEPT
     {
       compositeAlpha = compositeAlpha_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setPresentMode( PresentModeKHR presentMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setPresentMode( VULKAN_HPP_NAMESPACE::PresentModeKHR presentMode_ ) VULKAN_HPP_NOEXCEPT
     {
       presentMode = presentMode_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setClipped( Bool32 clipped_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setClipped( VULKAN_HPP_NAMESPACE::Bool32 clipped_ ) VULKAN_HPP_NOEXCEPT
     {
       clipped = clipped_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setOldSwapchain( SwapchainKHR oldSwapchain_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainCreateInfoKHR & setOldSwapchain( VULKAN_HPP_NAMESPACE::SwapchainKHR oldSwapchain_ ) VULKAN_HPP_NOEXCEPT
     {
       oldSwapchain = oldSwapchain_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSwapchainCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -154586,35 +113154,29 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSwapchainCreateInfoKHR *>( this );
     }
 
-    operator VkSwapchainCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainCreateInfoKHR *>( this );
-    }
-
-    operator VkSwapchainCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               SwapchainCreateFlagsKHR const &,
-               SurfaceKHR const &,
+               VULKAN_HPP_NAMESPACE::SwapchainCreateFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::SurfaceKHR const &,
                uint32_t const &,
-               Format const &,
-               ColorSpaceKHR const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::ColorSpaceKHR const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
-               ImageUsageFlags const &,
-               SharingMode const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &,
+               VULKAN_HPP_NAMESPACE::SharingMode const &,
                uint32_t const &,
                const uint32_t * const &,
-               SurfaceTransformFlagBitsKHR const &,
-               CompositeAlphaFlagBitsKHR const &,
-               PresentModeKHR const &,
-               Bool32 const &,
-               SwapchainKHR const &>
+               VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::PresentModeKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::SwapchainKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -154662,42 +113224,32 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                 = StructureType::eSwapchainCreateInfoKHR;
-    const void *                pNext                 = {};
-    SwapchainCreateFlagsKHR     flags                 = {};
-    SurfaceKHR                  surface               = {};
-    uint32_t                    minImageCount         = {};
-    Format                      imageFormat           = Format::eUndefined;
-    ColorSpaceKHR               imageColorSpace       = ColorSpaceKHR::eSrgbNonlinear;
-    Extent2D                    imageExtent           = {};
-    uint32_t                    imageArrayLayers      = {};
-    ImageUsageFlags             imageUsage            = {};
-    SharingMode                 imageSharingMode      = SharingMode::eExclusive;
-    uint32_t                    queueFamilyIndexCount = {};
-    const uint32_t *            pQueueFamilyIndices   = {};
-    SurfaceTransformFlagBitsKHR preTransform          = SurfaceTransformFlagBitsKHR::eIdentity;
-    CompositeAlphaFlagBitsKHR   compositeAlpha        = CompositeAlphaFlagBitsKHR::eOpaque;
-    PresentModeKHR              presentMode           = PresentModeKHR::eImmediate;
-    Bool32                      clipped               = {};
-    SwapchainKHR                oldSwapchain          = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                 = StructureType::eSwapchainCreateInfoKHR;
+    const void *                                      pNext                 = {};
+    VULKAN_HPP_NAMESPACE::SwapchainCreateFlagsKHR     flags                 = {};
+    VULKAN_HPP_NAMESPACE::SurfaceKHR                  surface               = {};
+    uint32_t                                          minImageCount         = {};
+    VULKAN_HPP_NAMESPACE::Format                      imageFormat           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ColorSpaceKHR               imageColorSpace       = VULKAN_HPP_NAMESPACE::ColorSpaceKHR::eSrgbNonlinear;
+    VULKAN_HPP_NAMESPACE::Extent2D                    imageExtent           = {};
+    uint32_t                                          imageArrayLayers      = {};
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags             imageUsage            = {};
+    VULKAN_HPP_NAMESPACE::SharingMode                 imageSharingMode      = VULKAN_HPP_NAMESPACE::SharingMode::eExclusive;
+    uint32_t                                          queueFamilyIndexCount = {};
+    const uint32_t *                                  pQueueFamilyIndices   = {};
+    VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR preTransform          = VULKAN_HPP_NAMESPACE::SurfaceTransformFlagBitsKHR::eIdentity;
+    VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR   compositeAlpha        = VULKAN_HPP_NAMESPACE::CompositeAlphaFlagBitsKHR::eOpaque;
+    VULKAN_HPP_NAMESPACE::PresentModeKHR              presentMode           = VULKAN_HPP_NAMESPACE::PresentModeKHR::eImmediate;
+    VULKAN_HPP_NAMESPACE::Bool32                      clipped               = {};
+    VULKAN_HPP_NAMESPACE::SwapchainKHR                oldSwapchain          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainCreateInfoKHR>
-  {
-    using Type = SwapchainCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSwapchainCreateInfoKHR>
   {
     using Type = SwapchainCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkSwapchainDisplayNativeHdrCreateInfoAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainDisplayNativeHdrCreateInfoAMD.html
   struct SwapchainDisplayNativeHdrCreateInfoAMD
   {
     using NativeType = VkSwapchainDisplayNativeHdrCreateInfoAMD;
@@ -154705,10 +113257,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainDisplayNativeHdrCreateInfoAMD( Bool32 localDimmingEnable_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , localDimmingEnable{ localDimmingEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainDisplayNativeHdrCreateInfoAMD( VULKAN_HPP_NAMESPACE::Bool32 localDimmingEnable_ = {},
+                                                                 const void *                 pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , localDimmingEnable( localDimmingEnable_ )
     {
     }
 
@@ -154720,27 +113273,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SwapchainDisplayNativeHdrCreateInfoAMD & operator=( SwapchainDisplayNativeHdrCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SwapchainDisplayNativeHdrCreateInfoAMD & operator=( VkSwapchainDisplayNativeHdrCreateInfoAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainDisplayNativeHdrCreateInfoAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainDisplayNativeHdrCreateInfoAMD const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SwapchainDisplayNativeHdrCreateInfoAMD & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainDisplayNativeHdrCreateInfoAMD & setLocalDimmingEnable( Bool32 localDimmingEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainDisplayNativeHdrCreateInfoAMD &
+      setLocalDimmingEnable( VULKAN_HPP_NAMESPACE::Bool32 localDimmingEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       localDimmingEnable = localDimmingEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSwapchainDisplayNativeHdrCreateInfoAMD const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -154752,18 +113306,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSwapchainDisplayNativeHdrCreateInfoAMD *>( this );
     }
 
-    operator VkSwapchainDisplayNativeHdrCreateInfoAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainDisplayNativeHdrCreateInfoAMD *>( this );
-    }
-
-    operator VkSwapchainDisplayNativeHdrCreateInfoAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainDisplayNativeHdrCreateInfoAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, localDimmingEnable );
     }
@@ -154788,138 +113337,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD;
-    const void *  pNext              = {};
-    Bool32        localDimmingEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD;
+    const void *                        pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        localDimmingEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainDisplayNativeHdrCreateInfoAMD>
-  {
-    using Type = SwapchainDisplayNativeHdrCreateInfoAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD>
   {
     using Type = SwapchainDisplayNativeHdrCreateInfoAMD;
   };
 
-#if defined( VK_USE_PLATFORM_OHOS )
-  // wrapper struct for struct VkSwapchainImageCreateInfoOHOS, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainImageCreateInfoOHOS.html
-  struct SwapchainImageCreateInfoOHOS
-  {
-    using NativeType = VkSwapchainImageCreateInfoOHOS;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainImageCreateInfoOHOS;
-
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainImageCreateInfoOHOS( SwapchainImageUsageFlagsOHOS usage_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , usage{ usage_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SwapchainImageCreateInfoOHOS( SwapchainImageCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SwapchainImageCreateInfoOHOS( VkSwapchainImageCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainImageCreateInfoOHOS( *reinterpret_cast<SwapchainImageCreateInfoOHOS const *>( &rhs ) )
-    {
-    }
-
-    SwapchainImageCreateInfoOHOS & operator=( SwapchainImageCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SwapchainImageCreateInfoOHOS & operator=( VkSwapchainImageCreateInfoOHOS const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SwapchainImageCreateInfoOHOS const *>( &rhs );
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainImageCreateInfoOHOS & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainImageCreateInfoOHOS & setUsage( SwapchainImageUsageFlagsOHOS usage_ ) VULKAN_HPP_NOEXCEPT
-    {
-      usage = usage_;
-      return *this;
-    }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSwapchainImageCreateInfoOHOS const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSwapchainImageCreateInfoOHOS *>( this );
-    }
-
-    operator VkSwapchainImageCreateInfoOHOS &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSwapchainImageCreateInfoOHOS *>( this );
-    }
-
-    operator VkSwapchainImageCreateInfoOHOS const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainImageCreateInfoOHOS *>( this );
-    }
-
-    operator VkSwapchainImageCreateInfoOHOS *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainImageCreateInfoOHOS *>( this );
-    }
-
-#  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, SwapchainImageUsageFlagsOHOS const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, usage );
-    }
-#  endif
-
-#  if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainImageCreateInfoOHOS const & ) const = default;
-#  else
-    bool operator==( SwapchainImageCreateInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#    if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#    else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( usage == rhs.usage );
-#    endif
-    }
-
-    bool operator!=( SwapchainImageCreateInfoOHOS const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#  endif
-
-  public:
-    StructureType                sType = StructureType::eSwapchainImageCreateInfoOHOS;
-    const void *                 pNext = {};
-    SwapchainImageUsageFlagsOHOS usage = {};
-  };
-
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainImageCreateInfoOHOS>
-  {
-    using Type = SwapchainImageCreateInfoOHOS;
-  };
-#  endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSwapchainImageCreateInfoOHOS>
-  {
-    using Type = SwapchainImageCreateInfoOHOS;
-  };
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  // wrapper struct for struct VkSwapchainLatencyCreateInfoNV, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainLatencyCreateInfoNV.html
   struct SwapchainLatencyCreateInfoNV
   {
     using NativeType = VkSwapchainLatencyCreateInfoNV;
@@ -154927,10 +113355,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainLatencyCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainLatencyCreateInfoNV( Bool32 latencyModeEnable_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , latencyModeEnable{ latencyModeEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainLatencyCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32 latencyModeEnable_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , latencyModeEnable( latencyModeEnable_ )
     {
     }
 
@@ -154942,27 +113370,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SwapchainLatencyCreateInfoNV & operator=( SwapchainLatencyCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SwapchainLatencyCreateInfoNV & operator=( VkSwapchainLatencyCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainLatencyCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainLatencyCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SwapchainLatencyCreateInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainLatencyCreateInfoNV & setLatencyModeEnable( Bool32 latencyModeEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainLatencyCreateInfoNV & setLatencyModeEnable( VULKAN_HPP_NAMESPACE::Bool32 latencyModeEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       latencyModeEnable = latencyModeEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSwapchainLatencyCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -154974,18 +113402,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSwapchainLatencyCreateInfoNV *>( this );
     }
 
-    operator VkSwapchainLatencyCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainLatencyCreateInfoNV *>( this );
-    }
-
-    operator VkSwapchainLatencyCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainLatencyCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, latencyModeEnable );
     }
@@ -155010,27 +113433,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType             = StructureType::eSwapchainLatencyCreateInfoNV;
-    const void *  pNext             = {};
-    Bool32        latencyModeEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType             = StructureType::eSwapchainLatencyCreateInfoNV;
+    const void *                        pNext             = {};
+    VULKAN_HPP_NAMESPACE::Bool32        latencyModeEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainLatencyCreateInfoNV>
-  {
-    using Type = SwapchainLatencyCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSwapchainLatencyCreateInfoNV>
   {
     using Type = SwapchainLatencyCreateInfoNV;
   };
 
-  // wrapper struct for struct VkSwapchainPresentBarrierCreateInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainPresentBarrierCreateInfoNV.html
   struct SwapchainPresentBarrierCreateInfoNV
   {
     using NativeType = VkSwapchainPresentBarrierCreateInfoNV;
@@ -155038,10 +113451,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentBarrierCreateInfoNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainPresentBarrierCreateInfoNV( Bool32 presentBarrierEnable_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentBarrierEnable{ presentBarrierEnable_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainPresentBarrierCreateInfoNV( VULKAN_HPP_NAMESPACE::Bool32 presentBarrierEnable_ = {},
+                                                              void *                       pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentBarrierEnable( presentBarrierEnable_ )
     {
     }
 
@@ -155053,27 +113467,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     SwapchainPresentBarrierCreateInfoNV & operator=( SwapchainPresentBarrierCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     SwapchainPresentBarrierCreateInfoNV & operator=( VkSwapchainPresentBarrierCreateInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainPresentBarrierCreateInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainPresentBarrierCreateInfoNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 SwapchainPresentBarrierCreateInfoNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentBarrierCreateInfoNV & setPresentBarrierEnable( Bool32 presentBarrierEnable_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentBarrierCreateInfoNV &
+      setPresentBarrierEnable( VULKAN_HPP_NAMESPACE::Bool32 presentBarrierEnable_ ) VULKAN_HPP_NOEXCEPT
     {
       presentBarrierEnable = presentBarrierEnable_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkSwapchainPresentBarrierCreateInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -155085,18 +113500,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkSwapchainPresentBarrierCreateInfoNV *>( this );
     }
 
-    operator VkSwapchainPresentBarrierCreateInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainPresentBarrierCreateInfoNV *>( this );
-    }
-
-    operator VkSwapchainPresentBarrierCreateInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainPresentBarrierCreateInfoNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentBarrierEnable );
     }
@@ -155121,125 +113531,114 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::eSwapchainPresentBarrierCreateInfoNV;
-    void *        pNext                = {};
-    Bool32        presentBarrierEnable = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eSwapchainPresentBarrierCreateInfoNV;
+    void *                              pNext                = {};
+    VULKAN_HPP_NAMESPACE::Bool32        presentBarrierEnable = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainPresentBarrierCreateInfoNV>
-  {
-    using Type = SwapchainPresentBarrierCreateInfoNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eSwapchainPresentBarrierCreateInfoNV>
   {
     using Type = SwapchainPresentBarrierCreateInfoNV;
   };
 
-  // wrapper struct for struct VkSwapchainPresentFenceInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainPresentFenceInfoKHR.html
-  struct SwapchainPresentFenceInfoKHR
+  struct SwapchainPresentFenceInfoEXT
   {
-    using NativeType = VkSwapchainPresentFenceInfoKHR;
+    using NativeType = VkSwapchainPresentFenceInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentFenceInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentFenceInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SwapchainPresentFenceInfoKHR( uint32_t swapchainCount_ = {}, const Fence * pFences_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pFences{ pFences_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainPresentFenceInfoEXT( uint32_t                            swapchainCount_ = {},
+                                                       const VULKAN_HPP_NAMESPACE::Fence * pFences_        = {},
+                                                       const void *                        pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pFences( pFences_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SwapchainPresentFenceInfoKHR( SwapchainPresentFenceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SwapchainPresentFenceInfoEXT( SwapchainPresentFenceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SwapchainPresentFenceInfoKHR( VkSwapchainPresentFenceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainPresentFenceInfoKHR( *reinterpret_cast<SwapchainPresentFenceInfoKHR const *>( &rhs ) )
+    SwapchainPresentFenceInfoEXT( VkSwapchainPresentFenceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SwapchainPresentFenceInfoEXT( *reinterpret_cast<SwapchainPresentFenceInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentFenceInfoKHR( ArrayProxyNoTemporaries<const Fence> const & fences_, const void * pNext_ = nullptr )
+    SwapchainPresentFenceInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Fence> const & fences_,
+                                  const void *                                                                             pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( fences_.size() ) ), pFences( fences_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    SwapchainPresentFenceInfoKHR & operator=( SwapchainPresentFenceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SwapchainPresentFenceInfoEXT & operator=( SwapchainPresentFenceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SwapchainPresentFenceInfoKHR & operator=( VkSwapchainPresentFenceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentFenceInfoEXT & operator=( VkSwapchainPresentFenceInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainPresentFenceInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainPresentFenceInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoKHR & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoEXT & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = swapchainCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoKHR & setPFences( const Fence * pFences_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentFenceInfoEXT & setPFences( const VULKAN_HPP_NAMESPACE::Fence * pFences_ ) VULKAN_HPP_NOEXCEPT
     {
       pFences = pFences_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentFenceInfoKHR & setFences( ArrayProxyNoTemporaries<const Fence> const & fences_ ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentFenceInfoEXT &
+      setFences( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::Fence> const & fences_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( fences_.size() );
       pFences        = fences_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSwapchainPresentFenceInfoKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentFenceInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSwapchainPresentFenceInfoKHR *>( this );
+      return *reinterpret_cast<const VkSwapchainPresentFenceInfoEXT *>( this );
     }
 
-    operator VkSwapchainPresentFenceInfoKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentFenceInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSwapchainPresentFenceInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentFenceInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainPresentFenceInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentFenceInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainPresentFenceInfoKHR *>( this );
+      return *reinterpret_cast<VkSwapchainPresentFenceInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const Fence * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::Fence * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pFences );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainPresentFenceInfoKHR const & ) const = default;
+    auto operator<=>( SwapchainPresentFenceInfoEXT const & ) const = default;
 #else
-    bool operator==( SwapchainPresentFenceInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SwapchainPresentFenceInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -155248,136 +113647,122 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SwapchainPresentFenceInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SwapchainPresentFenceInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType sType          = StructureType::eSwapchainPresentFenceInfoKHR;
-    const void *  pNext          = {};
-    uint32_t      swapchainCount = {};
-    const Fence * pFences        = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eSwapchainPresentFenceInfoEXT;
+    const void *                        pNext          = {};
+    uint32_t                            swapchainCount = {};
+    const VULKAN_HPP_NAMESPACE::Fence * pFences        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainPresentFenceInfoKHR>
-  {
-    using Type = SwapchainPresentFenceInfoKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSwapchainPresentFenceInfoKHR>
+  struct CppType<StructureType, StructureType::eSwapchainPresentFenceInfoEXT>
   {
-    using Type = SwapchainPresentFenceInfoKHR;
+    using Type = SwapchainPresentFenceInfoEXT;
   };
 
-  using SwapchainPresentFenceInfoEXT = SwapchainPresentFenceInfoKHR;
-
-  // wrapper struct for struct VkSwapchainPresentModeInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainPresentModeInfoKHR.html
-  struct SwapchainPresentModeInfoKHR
+  struct SwapchainPresentModeInfoEXT
   {
-    using NativeType = VkSwapchainPresentModeInfoKHR;
+    using NativeType = VkSwapchainPresentModeInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentModeInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentModeInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainPresentModeInfoKHR( uint32_t               swapchainCount_ = {},
-                                                      const PresentModeKHR * pPresentModes_  = {},
-                                                      const void *           pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , swapchainCount{ swapchainCount_ }
-      , pPresentModes{ pPresentModes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainPresentModeInfoEXT( uint32_t                                     swapchainCount_ = {},
+                                                      const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_  = {},
+                                                      const void *                                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , swapchainCount( swapchainCount_ )
+      , pPresentModes( pPresentModes_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SwapchainPresentModeInfoKHR( SwapchainPresentModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SwapchainPresentModeInfoEXT( SwapchainPresentModeInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SwapchainPresentModeInfoKHR( VkSwapchainPresentModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainPresentModeInfoKHR( *reinterpret_cast<SwapchainPresentModeInfoKHR const *>( &rhs ) )
+    SwapchainPresentModeInfoEXT( VkSwapchainPresentModeInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SwapchainPresentModeInfoEXT( *reinterpret_cast<SwapchainPresentModeInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentModeInfoKHR( ArrayProxyNoTemporaries<const PresentModeKHR> const & presentModes_, const void * pNext_ = nullptr )
+    SwapchainPresentModeInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_,
+                                 const void *                                                                                      pNext_ = nullptr )
       : pNext( pNext_ ), swapchainCount( static_cast<uint32_t>( presentModes_.size() ) ), pPresentModes( presentModes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    SwapchainPresentModeInfoKHR & operator=( SwapchainPresentModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SwapchainPresentModeInfoEXT & operator=( SwapchainPresentModeInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SwapchainPresentModeInfoKHR & operator=( VkSwapchainPresentModeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentModeInfoEXT & operator=( VkSwapchainPresentModeInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainPresentModeInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainPresentModeInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoKHR & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoEXT & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = swapchainCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoKHR & setPPresentModes( const PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModeInfoEXT & setPPresentModes( const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       pPresentModes = pPresentModes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentModeInfoKHR & setPresentModes( ArrayProxyNoTemporaries<const PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentModeInfoEXT &
+      setPresentModes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = static_cast<uint32_t>( presentModes_.size() );
       pPresentModes  = presentModes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSwapchainPresentModeInfoKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentModeInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSwapchainPresentModeInfoKHR *>( this );
+      return *reinterpret_cast<const VkSwapchainPresentModeInfoEXT *>( this );
     }
 
-    operator VkSwapchainPresentModeInfoKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentModeInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSwapchainPresentModeInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentModeInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainPresentModeInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentModeInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainPresentModeInfoKHR *>( this );
+      return *reinterpret_cast<VkSwapchainPresentModeInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PresentModeKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::PresentModeKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, swapchainCount, pPresentModes );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainPresentModeInfoKHR const & ) const = default;
+    auto operator<=>( SwapchainPresentModeInfoEXT const & ) const = default;
 #else
-    bool operator==( SwapchainPresentModeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SwapchainPresentModeInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -155386,137 +113771,123 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SwapchainPresentModeInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SwapchainPresentModeInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType          = StructureType::eSwapchainPresentModeInfoKHR;
-    const void *           pNext          = {};
-    uint32_t               swapchainCount = {};
-    const PresentModeKHR * pPresentModes  = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType          = StructureType::eSwapchainPresentModeInfoEXT;
+    const void *                                 pNext          = {};
+    uint32_t                                     swapchainCount = {};
+    const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainPresentModeInfoKHR>
-  {
-    using Type = SwapchainPresentModeInfoKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSwapchainPresentModeInfoKHR>
+  struct CppType<StructureType, StructureType::eSwapchainPresentModeInfoEXT>
   {
-    using Type = SwapchainPresentModeInfoKHR;
+    using Type = SwapchainPresentModeInfoEXT;
   };
 
-  using SwapchainPresentModeInfoEXT = SwapchainPresentModeInfoKHR;
-
-  // wrapper struct for struct VkSwapchainPresentModesCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainPresentModesCreateInfoKHR.html
-  struct SwapchainPresentModesCreateInfoKHR
+  struct SwapchainPresentModesCreateInfoEXT
   {
-    using NativeType = VkSwapchainPresentModesCreateInfoKHR;
+    using NativeType = VkSwapchainPresentModesCreateInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentModesCreateInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentModesCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainPresentModesCreateInfoKHR( uint32_t               presentModeCount_ = {},
-                                                             const PresentModeKHR * pPresentModes_    = {},
-                                                             const void *           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , presentModeCount{ presentModeCount_ }
-      , pPresentModes{ pPresentModes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainPresentModesCreateInfoEXT( uint32_t                                     presentModeCount_ = {},
+                                                             const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_    = {},
+                                                             const void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , presentModeCount( presentModeCount_ )
+      , pPresentModes( pPresentModes_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SwapchainPresentModesCreateInfoKHR( SwapchainPresentModesCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SwapchainPresentModesCreateInfoEXT( SwapchainPresentModesCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SwapchainPresentModesCreateInfoKHR( VkSwapchainPresentModesCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainPresentModesCreateInfoKHR( *reinterpret_cast<SwapchainPresentModesCreateInfoKHR const *>( &rhs ) )
+    SwapchainPresentModesCreateInfoEXT( VkSwapchainPresentModesCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SwapchainPresentModesCreateInfoEXT( *reinterpret_cast<SwapchainPresentModesCreateInfoEXT const *>( &rhs ) )
     {
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentModesCreateInfoKHR( ArrayProxyNoTemporaries<const PresentModeKHR> const & presentModes_, const void * pNext_ = nullptr )
+    SwapchainPresentModesCreateInfoEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_,
+                                        const void *                                                                                      pNext_ = nullptr )
       : pNext( pNext_ ), presentModeCount( static_cast<uint32_t>( presentModes_.size() ) ), pPresentModes( presentModes_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-    SwapchainPresentModesCreateInfoKHR & operator=( SwapchainPresentModesCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SwapchainPresentModesCreateInfoEXT & operator=( SwapchainPresentModesCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SwapchainPresentModesCreateInfoKHR & operator=( VkSwapchainPresentModesCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentModesCreateInfoEXT & operator=( VkSwapchainPresentModesCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainPresentModesCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainPresentModesCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoKHR & setPresentModeCount( uint32_t presentModeCount_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoEXT & setPresentModeCount( uint32_t presentModeCount_ ) VULKAN_HPP_NOEXCEPT
     {
       presentModeCount = presentModeCount_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoKHR & setPPresentModes( const PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentModesCreateInfoEXT &
+      setPPresentModes( const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       pPresentModes = pPresentModes_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainPresentModesCreateInfoKHR & setPresentModes( ArrayProxyNoTemporaries<const PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentModesCreateInfoEXT &
+      setPresentModes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::PresentModeKHR> const & presentModes_ ) VULKAN_HPP_NOEXCEPT
     {
       presentModeCount = static_cast<uint32_t>( presentModes_.size() );
       pPresentModes    = presentModes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSwapchainPresentModesCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentModesCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSwapchainPresentModesCreateInfoKHR *>( this );
+      return *reinterpret_cast<const VkSwapchainPresentModesCreateInfoEXT *>( this );
     }
 
-    operator VkSwapchainPresentModesCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentModesCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSwapchainPresentModesCreateInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentModesCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainPresentModesCreateInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentModesCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainPresentModesCreateInfoKHR *>( this );
+      return *reinterpret_cast<VkSwapchainPresentModesCreateInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const PresentModeKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::PresentModeKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, presentModeCount, pPresentModes );
     }
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainPresentModesCreateInfoKHR const & ) const = default;
+    auto operator<=>( SwapchainPresentModesCreateInfoEXT const & ) const = default;
 #else
-    bool operator==( SwapchainPresentModesCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SwapchainPresentModesCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -155525,120 +113896,109 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SwapchainPresentModesCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SwapchainPresentModesCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType            = StructureType::eSwapchainPresentModesCreateInfoKHR;
-    const void *           pNext            = {};
-    uint32_t               presentModeCount = {};
-    const PresentModeKHR * pPresentModes    = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType            = StructureType::eSwapchainPresentModesCreateInfoEXT;
+    const void *                                 pNext            = {};
+    uint32_t                                     presentModeCount = {};
+    const VULKAN_HPP_NAMESPACE::PresentModeKHR * pPresentModes    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainPresentModesCreateInfoKHR>
-  {
-    using Type = SwapchainPresentModesCreateInfoKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSwapchainPresentModesCreateInfoKHR>
+  struct CppType<StructureType, StructureType::eSwapchainPresentModesCreateInfoEXT>
   {
-    using Type = SwapchainPresentModesCreateInfoKHR;
+    using Type = SwapchainPresentModesCreateInfoEXT;
   };
 
-  using SwapchainPresentModesCreateInfoEXT = SwapchainPresentModesCreateInfoKHR;
-
-  // wrapper struct for struct VkSwapchainPresentScalingCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainPresentScalingCreateInfoKHR.html
-  struct SwapchainPresentScalingCreateInfoKHR
+  struct SwapchainPresentScalingCreateInfoEXT
   {
-    using NativeType = VkSwapchainPresentScalingCreateInfoKHR;
+    using NativeType = VkSwapchainPresentScalingCreateInfoEXT;
 
     static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentScalingCreateInfoKHR;
+    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainPresentScalingCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainPresentScalingCreateInfoKHR( PresentScalingFlagsKHR scalingBehavior_ = {},
-                                                               PresentGravityFlagsKHR presentGravityX_ = {},
-                                                               PresentGravityFlagsKHR presentGravityY_ = {},
-                                                               const void *           pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , scalingBehavior{ scalingBehavior_ }
-      , presentGravityX{ presentGravityX_ }
-      , presentGravityY{ presentGravityY_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR SwapchainPresentScalingCreateInfoEXT( VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT scalingBehavior_ = {},
+                                                               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityX_ = {},
+                                                               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityY_ = {},
+                                                               const void *                                 pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , scalingBehavior( scalingBehavior_ )
+      , presentGravityX( presentGravityX_ )
+      , presentGravityY( presentGravityY_ )
     {
     }
 
-    VULKAN_HPP_CONSTEXPR SwapchainPresentScalingCreateInfoKHR( SwapchainPresentScalingCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+    VULKAN_HPP_CONSTEXPR SwapchainPresentScalingCreateInfoEXT( SwapchainPresentScalingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
 
-    SwapchainPresentScalingCreateInfoKHR( VkSwapchainPresentScalingCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainPresentScalingCreateInfoKHR( *reinterpret_cast<SwapchainPresentScalingCreateInfoKHR const *>( &rhs ) )
+    SwapchainPresentScalingCreateInfoEXT( VkSwapchainPresentScalingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
+      : SwapchainPresentScalingCreateInfoEXT( *reinterpret_cast<SwapchainPresentScalingCreateInfoEXT const *>( &rhs ) )
     {
     }
 
-    SwapchainPresentScalingCreateInfoKHR & operator=( SwapchainPresentScalingCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+    SwapchainPresentScalingCreateInfoEXT & operator=( SwapchainPresentScalingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
-    SwapchainPresentScalingCreateInfoKHR & operator=( VkSwapchainPresentScalingCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
+    SwapchainPresentScalingCreateInfoEXT & operator=( VkSwapchainPresentScalingCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<SwapchainPresentScalingCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::SwapchainPresentScalingCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoKHR & setScalingBehavior( PresentScalingFlagsKHR scalingBehavior_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoEXT &
+      setScalingBehavior( VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT scalingBehavior_ ) VULKAN_HPP_NOEXCEPT
     {
       scalingBehavior = scalingBehavior_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoKHR & setPresentGravityX( PresentGravityFlagsKHR presentGravityX_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoEXT &
+      setPresentGravityX( VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityX_ ) VULKAN_HPP_NOEXCEPT
     {
       presentGravityX = presentGravityX_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoKHR & setPresentGravityY( PresentGravityFlagsKHR presentGravityY_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 SwapchainPresentScalingCreateInfoEXT &
+      setPresentGravityY( VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityY_ ) VULKAN_HPP_NOEXCEPT
     {
       presentGravityY = presentGravityY_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
-    operator VkSwapchainPresentScalingCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentScalingCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<const VkSwapchainPresentScalingCreateInfoKHR *>( this );
+      return *reinterpret_cast<const VkSwapchainPresentScalingCreateInfoEXT *>( this );
     }
 
-    operator VkSwapchainPresentScalingCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
+    operator VkSwapchainPresentScalingCreateInfoEXT &() VULKAN_HPP_NOEXCEPT
     {
-      return *reinterpret_cast<VkSwapchainPresentScalingCreateInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentScalingCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainPresentScalingCreateInfoKHR *>( this );
-    }
-
-    operator VkSwapchainPresentScalingCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainPresentScalingCreateInfoKHR *>( this );
+      return *reinterpret_cast<VkSwapchainPresentScalingCreateInfoEXT *>( this );
     }
 
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, PresentScalingFlagsKHR const &, PresentGravityFlagsKHR const &, PresentGravityFlagsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT const &,
+               VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, scalingBehavior, presentGravityX, presentGravityY );
@@ -155646,9 +114006,9 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
 #if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainPresentScalingCreateInfoKHR const & ) const = default;
+    auto operator<=>( SwapchainPresentScalingCreateInfoEXT const & ) const = default;
 #else
-    bool operator==( SwapchainPresentScalingCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator==( SwapchainPresentScalingCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
 #  if defined( VULKAN_HPP_USE_REFLECT )
       return this->reflect() == rhs.reflect();
@@ -155658,1189 +114018,26 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
     }
 
-    bool operator!=( SwapchainPresentScalingCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
+    bool operator!=( SwapchainPresentScalingCreateInfoEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
     {
       return !operator==( rhs );
     }
 #endif
 
   public:
-    StructureType          sType           = StructureType::eSwapchainPresentScalingCreateInfoKHR;
-    const void *           pNext           = {};
-    PresentScalingFlagsKHR scalingBehavior = {};
-    PresentGravityFlagsKHR presentGravityX = {};
-    PresentGravityFlagsKHR presentGravityY = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType           = StructureType::eSwapchainPresentScalingCreateInfoEXT;
+    const void *                                 pNext           = {};
+    VULKAN_HPP_NAMESPACE::PresentScalingFlagsEXT scalingBehavior = {};
+    VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityX = {};
+    VULKAN_HPP_NAMESPACE::PresentGravityFlagsEXT presentGravityY = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainPresentScalingCreateInfoKHR>
-  {
-    using Type = SwapchainPresentScalingCreateInfoKHR;
-  };
-#endif
-
   template <>
-  struct CppType<StructureType, StructureType::eSwapchainPresentScalingCreateInfoKHR>
+  struct CppType<StructureType, StructureType::eSwapchainPresentScalingCreateInfoEXT>
   {
-    using Type = SwapchainPresentScalingCreateInfoKHR;
+    using Type = SwapchainPresentScalingCreateInfoEXT;
   };
 
-  using SwapchainPresentScalingCreateInfoEXT = SwapchainPresentScalingCreateInfoKHR;
-
-  // wrapper struct for struct VkSwapchainTimeDomainPropertiesEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainTimeDomainPropertiesEXT.html
-  struct SwapchainTimeDomainPropertiesEXT
-  {
-    using NativeType = VkSwapchainTimeDomainPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainTimeDomainPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR SwapchainTimeDomainPropertiesEXT( uint32_t        timeDomainCount_ = {},
-                                                           TimeDomainKHR * pTimeDomains_    = {},
-                                                           uint64_t *      pTimeDomainIds_  = {},
-                                                           void *          pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , timeDomainCount{ timeDomainCount_ }
-      , pTimeDomains{ pTimeDomains_ }
-      , pTimeDomainIds{ pTimeDomainIds_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SwapchainTimeDomainPropertiesEXT( SwapchainTimeDomainPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SwapchainTimeDomainPropertiesEXT( VkSwapchainTimeDomainPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainTimeDomainPropertiesEXT( *reinterpret_cast<SwapchainTimeDomainPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainTimeDomainPropertiesEXT( ArrayProxyNoTemporaries<TimeDomainKHR> const & timeDomains_,
-                                      ArrayProxyNoTemporaries<uint64_t> const &      timeDomainIds_ = {},
-                                      void *                                         pNext_         = nullptr )
-      : pNext( pNext_ )
-      , timeDomainCount( static_cast<uint32_t>( timeDomains_.size() ) )
-      , pTimeDomains( timeDomains_.data() )
-      , pTimeDomainIds( timeDomainIds_.data() )
-    {
-#    ifdef VULKAN_HPP_NO_EXCEPTIONS
-      VULKAN_HPP_ASSERT( timeDomains_.empty() || timeDomainIds_.empty() || ( timeDomains_.size() == timeDomainIds_.size() ) );
-#    else
-      if ( !timeDomains_.empty() && !timeDomainIds_.empty() && ( timeDomains_.size() != timeDomainIds_.size() ) )
-      {
-        throw LogicError(
-          VULKAN_HPP_NAMESPACE_STRING
-          "::SwapchainTimeDomainPropertiesEXT::SwapchainTimeDomainPropertiesEXT: !timeDomains_.empty() && !timeDomainIds_.empty() && ( timeDomains_.size() != timeDomainIds_.size() )" );
-      }
-#    endif /*VULKAN_HPP_NO_EXCEPTIONS*/
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    SwapchainTimeDomainPropertiesEXT & operator=( SwapchainTimeDomainPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SwapchainTimeDomainPropertiesEXT & operator=( VkSwapchainTimeDomainPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SwapchainTimeDomainPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setTimeDomainCount( uint32_t timeDomainCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainCount = timeDomainCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomains( TimeDomainKHR * pTimeDomains_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTimeDomains = pTimeDomains_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainTimeDomainPropertiesEXT & setTimeDomains( ArrayProxyNoTemporaries<TimeDomainKHR> const & timeDomains_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainCount = static_cast<uint32_t>( timeDomains_.size() );
-      pTimeDomains    = timeDomains_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomainIds( uint64_t * pTimeDomainIds_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTimeDomainIds = pTimeDomainIds_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    SwapchainTimeDomainPropertiesEXT & setTimeDomainIds( ArrayProxyNoTemporaries<uint64_t> const & timeDomainIds_ ) VULKAN_HPP_NOEXCEPT
-    {
-      timeDomainCount = static_cast<uint32_t>( timeDomainIds_.size() );
-      pTimeDomainIds  = timeDomainIds_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSwapchainTimeDomainPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSwapchainTimeDomainPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimeDomainPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSwapchainTimeDomainPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimeDomainPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainTimeDomainPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimeDomainPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainTimeDomainPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, TimeDomainKHR * const &, uint64_t * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, timeDomainCount, pTimeDomains, pTimeDomainIds );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainTimeDomainPropertiesEXT const & ) const = default;
-#else
-    bool operator==( SwapchainTimeDomainPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( timeDomainCount == rhs.timeDomainCount ) && ( pTimeDomains == rhs.pTimeDomains ) &&
-             ( pTimeDomainIds == rhs.pTimeDomainIds );
-#  endif
-    }
-
-    bool operator!=( SwapchainTimeDomainPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType   sType           = StructureType::eSwapchainTimeDomainPropertiesEXT;
-    void *          pNext           = {};
-    uint32_t        timeDomainCount = {};
-    TimeDomainKHR * pTimeDomains    = {};
-    uint64_t *      pTimeDomainIds  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainTimeDomainPropertiesEXT>
-  {
-    using Type = SwapchainTimeDomainPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSwapchainTimeDomainPropertiesEXT>
-  {
-    using Type = SwapchainTimeDomainPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkSwapchainTimingPropertiesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkSwapchainTimingPropertiesEXT.html
-  struct SwapchainTimingPropertiesEXT
-  {
-    using NativeType = VkSwapchainTimingPropertiesEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eSwapchainTimingPropertiesEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      SwapchainTimingPropertiesEXT( uint64_t refreshDuration_ = {}, uint64_t refreshInterval_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , refreshDuration{ refreshDuration_ }
-      , refreshInterval{ refreshInterval_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR SwapchainTimingPropertiesEXT( SwapchainTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    SwapchainTimingPropertiesEXT( VkSwapchainTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : SwapchainTimingPropertiesEXT( *reinterpret_cast<SwapchainTimingPropertiesEXT const *>( &rhs ) )
-    {
-    }
-
-    SwapchainTimingPropertiesEXT & operator=( SwapchainTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    SwapchainTimingPropertiesEXT & operator=( VkSwapchainTimingPropertiesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<SwapchainTimingPropertiesEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshDuration( uint64_t refreshDuration_ ) VULKAN_HPP_NOEXCEPT
-    {
-      refreshDuration = refreshDuration_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshInterval( uint64_t refreshInterval_ ) VULKAN_HPP_NOEXCEPT
-    {
-      refreshInterval = refreshInterval_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkSwapchainTimingPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkSwapchainTimingPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimingPropertiesEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkSwapchainTimingPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimingPropertiesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkSwapchainTimingPropertiesEXT *>( this );
-    }
-
-    operator VkSwapchainTimingPropertiesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkSwapchainTimingPropertiesEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint64_t const &, uint64_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, refreshDuration, refreshInterval );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( SwapchainTimingPropertiesEXT const & ) const = default;
-#else
-    bool operator==( SwapchainTimingPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( refreshDuration == rhs.refreshDuration ) && ( refreshInterval == rhs.refreshInterval );
-#  endif
-    }
-
-    bool operator!=( SwapchainTimingPropertiesEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType           = StructureType::eSwapchainTimingPropertiesEXT;
-    void *        pNext           = {};
-    uint64_t      refreshDuration = {};
-    uint64_t      refreshInterval = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkSwapchainTimingPropertiesEXT>
-  {
-    using Type = SwapchainTimingPropertiesEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eSwapchainTimingPropertiesEXT>
-  {
-    using Type = SwapchainTimingPropertiesEXT;
-  };
-
-  // wrapper struct for struct VkTensorCaptureDescriptorDataInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorCaptureDescriptorDataInfoARM.html
-  struct TensorCaptureDescriptorDataInfoARM
-  {
-    using NativeType = VkTensorCaptureDescriptorDataInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorCaptureDescriptorDataInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorCaptureDescriptorDataInfoARM( TensorARM tensor_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensor{ tensor_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorCaptureDescriptorDataInfoARM( TensorCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorCaptureDescriptorDataInfoARM( VkTensorCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorCaptureDescriptorDataInfoARM( *reinterpret_cast<TensorCaptureDescriptorDataInfoARM const *>( &rhs ) )
-    {
-    }
-
-    TensorCaptureDescriptorDataInfoARM & operator=( TensorCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorCaptureDescriptorDataInfoARM & operator=( VkTensorCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorCaptureDescriptorDataInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorCaptureDescriptorDataInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorCaptureDescriptorDataInfoARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorCaptureDescriptorDataInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorCaptureDescriptorDataInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorCaptureDescriptorDataInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorCaptureDescriptorDataInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorCaptureDescriptorDataInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensor );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorCaptureDescriptorDataInfoARM const & ) const = default;
-#else
-    bool operator==( TensorCaptureDescriptorDataInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensor == rhs.tensor );
-#  endif
-    }
-
-    bool operator!=( TensorCaptureDescriptorDataInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType  = StructureType::eTensorCaptureDescriptorDataInfoARM;
-    const void *  pNext  = {};
-    TensorARM     tensor = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorCaptureDescriptorDataInfoARM>
-  {
-    using Type = TensorCaptureDescriptorDataInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorCaptureDescriptorDataInfoARM>
-  {
-    using Type = TensorCaptureDescriptorDataInfoARM;
-  };
-
-  // wrapper struct for struct VkTensorMemoryBarrierARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorMemoryBarrierARM.html
-  struct TensorMemoryBarrierARM
-  {
-    using NativeType = VkTensorMemoryBarrierARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorMemoryBarrierARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorMemoryBarrierARM( PipelineStageFlags2 srcStageMask_        = {},
-                                                 AccessFlags2        srcAccessMask_       = {},
-                                                 PipelineStageFlags2 dstStageMask_        = {},
-                                                 AccessFlags2        dstAccessMask_       = {},
-                                                 uint32_t            srcQueueFamilyIndex_ = {},
-                                                 uint32_t            dstQueueFamilyIndex_ = {},
-                                                 TensorARM           tensor_              = {},
-                                                 const void *        pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , srcStageMask{ srcStageMask_ }
-      , srcAccessMask{ srcAccessMask_ }
-      , dstStageMask{ dstStageMask_ }
-      , dstAccessMask{ dstAccessMask_ }
-      , srcQueueFamilyIndex{ srcQueueFamilyIndex_ }
-      , dstQueueFamilyIndex{ dstQueueFamilyIndex_ }
-      , tensor{ tensor_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorMemoryBarrierARM( TensorMemoryBarrierARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorMemoryBarrierARM( VkTensorMemoryBarrierARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorMemoryBarrierARM( *reinterpret_cast<TensorMemoryBarrierARM const *>( &rhs ) )
-    {
-    }
-
-    TensorMemoryBarrierARM & operator=( TensorMemoryBarrierARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorMemoryBarrierARM & operator=( VkTensorMemoryBarrierARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorMemoryBarrierARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setSrcStageMask( PipelineStageFlags2 srcStageMask_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcStageMask = srcStageMask_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setSrcAccessMask( AccessFlags2 srcAccessMask_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcAccessMask = srcAccessMask_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setDstStageMask( PipelineStageFlags2 dstStageMask_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstStageMask = dstStageMask_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setDstAccessMask( AccessFlags2 dstAccessMask_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstAccessMask = dstAccessMask_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setSrcQueueFamilyIndex( uint32_t srcQueueFamilyIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      srcQueueFamilyIndex = srcQueueFamilyIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setDstQueueFamilyIndex( uint32_t dstQueueFamilyIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dstQueueFamilyIndex = dstQueueFamilyIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryBarrierARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorMemoryBarrierARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorMemoryBarrierARM *>( this );
-    }
-
-    operator VkTensorMemoryBarrierARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorMemoryBarrierARM *>( this );
-    }
-
-    operator VkTensorMemoryBarrierARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorMemoryBarrierARM *>( this );
-    }
-
-    operator VkTensorMemoryBarrierARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorMemoryBarrierARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
-               PipelineStageFlags2 const &,
-               AccessFlags2 const &,
-               uint32_t const &,
-               uint32_t const &,
-               TensorARM const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, srcStageMask, srcAccessMask, dstStageMask, dstAccessMask, srcQueueFamilyIndex, dstQueueFamilyIndex, tensor );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorMemoryBarrierARM const & ) const = default;
-#else
-    bool operator==( TensorMemoryBarrierARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( srcStageMask == rhs.srcStageMask ) && ( srcAccessMask == rhs.srcAccessMask ) &&
-             ( dstStageMask == rhs.dstStageMask ) && ( dstAccessMask == rhs.dstAccessMask ) && ( srcQueueFamilyIndex == rhs.srcQueueFamilyIndex ) &&
-             ( dstQueueFamilyIndex == rhs.dstQueueFamilyIndex ) && ( tensor == rhs.tensor );
-#  endif
-    }
-
-    bool operator!=( TensorMemoryBarrierARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType       sType               = StructureType::eTensorMemoryBarrierARM;
-    const void *        pNext               = {};
-    PipelineStageFlags2 srcStageMask        = {};
-    AccessFlags2        srcAccessMask       = {};
-    PipelineStageFlags2 dstStageMask        = {};
-    AccessFlags2        dstAccessMask       = {};
-    uint32_t            srcQueueFamilyIndex = {};
-    uint32_t            dstQueueFamilyIndex = {};
-    TensorARM           tensor              = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorMemoryBarrierARM>
-  {
-    using Type = TensorMemoryBarrierARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorMemoryBarrierARM>
-  {
-    using Type = TensorMemoryBarrierARM;
-  };
-
-  // wrapper struct for struct VkTensorDependencyInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorDependencyInfoARM.html
-  struct TensorDependencyInfoARM
-  {
-    using NativeType = VkTensorDependencyInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorDependencyInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorDependencyInfoARM( uint32_t                       tensorMemoryBarrierCount_ = {},
-                                                  const TensorMemoryBarrierARM * pTensorMemoryBarriers_    = {},
-                                                  const void *                   pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorMemoryBarrierCount{ tensorMemoryBarrierCount_ }
-      , pTensorMemoryBarriers{ pTensorMemoryBarriers_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorDependencyInfoARM( TensorDependencyInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorDependencyInfoARM( VkTensorDependencyInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorDependencyInfoARM( *reinterpret_cast<TensorDependencyInfoARM const *>( &rhs ) )
-    {
-    }
-
-    TensorDependencyInfoARM & operator=( TensorDependencyInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorDependencyInfoARM & operator=( VkTensorDependencyInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorDependencyInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorDependencyInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDependencyInfoARM & setTensorMemoryBarrierCount( uint32_t tensorMemoryBarrierCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorMemoryBarrierCount = tensorMemoryBarrierCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorDependencyInfoARM & setPTensorMemoryBarriers( const TensorMemoryBarrierARM * pTensorMemoryBarriers_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTensorMemoryBarriers = pTensorMemoryBarriers_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorDependencyInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorDependencyInfoARM *>( this );
-    }
-
-    operator VkTensorDependencyInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorDependencyInfoARM *>( this );
-    }
-
-    operator VkTensorDependencyInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorDependencyInfoARM *>( this );
-    }
-
-    operator VkTensorDependencyInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorDependencyInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const TensorMemoryBarrierARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorMemoryBarrierCount, pTensorMemoryBarriers );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorDependencyInfoARM const & ) const = default;
-#else
-    bool operator==( TensorDependencyInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorMemoryBarrierCount == rhs.tensorMemoryBarrierCount ) &&
-             ( pTensorMemoryBarriers == rhs.pTensorMemoryBarriers );
-#  endif
-    }
-
-    bool operator!=( TensorDependencyInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType                    = StructureType::eTensorDependencyInfoARM;
-    const void *                   pNext                    = {};
-    uint32_t                       tensorMemoryBarrierCount = {};
-    const TensorMemoryBarrierARM * pTensorMemoryBarriers    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorDependencyInfoARM>
-  {
-    using Type = TensorDependencyInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorDependencyInfoARM>
-  {
-    using Type = TensorDependencyInfoARM;
-  };
-
-  // wrapper struct for struct VkTensorFormatPropertiesARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorFormatPropertiesARM.html
-  struct TensorFormatPropertiesARM
-  {
-    using NativeType = VkTensorFormatPropertiesARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorFormatPropertiesARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorFormatPropertiesARM( FormatFeatureFlags2 optimalTilingTensorFeatures_ = {},
-                                                    FormatFeatureFlags2 linearTilingTensorFeatures_  = {},
-                                                    void *              pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , optimalTilingTensorFeatures{ optimalTilingTensorFeatures_ }
-      , linearTilingTensorFeatures{ linearTilingTensorFeatures_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorFormatPropertiesARM( TensorFormatPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorFormatPropertiesARM( VkTensorFormatPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorFormatPropertiesARM( *reinterpret_cast<TensorFormatPropertiesARM const *>( &rhs ) )
-    {
-    }
-
-    TensorFormatPropertiesARM & operator=( TensorFormatPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorFormatPropertiesARM & operator=( VkTensorFormatPropertiesARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorFormatPropertiesARM const *>( &rhs );
-      return *this;
-    }
-
-    operator VkTensorFormatPropertiesARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorFormatPropertiesARM *>( this );
-    }
-
-    operator VkTensorFormatPropertiesARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorFormatPropertiesARM *>( this );
-    }
-
-    operator VkTensorFormatPropertiesARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorFormatPropertiesARM *>( this );
-    }
-
-    operator VkTensorFormatPropertiesARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorFormatPropertiesARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, FormatFeatureFlags2 const &, FormatFeatureFlags2 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, optimalTilingTensorFeatures, linearTilingTensorFeatures );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorFormatPropertiesARM const & ) const = default;
-#else
-    bool operator==( TensorFormatPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( optimalTilingTensorFeatures == rhs.optimalTilingTensorFeatures ) &&
-             ( linearTilingTensorFeatures == rhs.linearTilingTensorFeatures );
-#  endif
-    }
-
-    bool operator!=( TensorFormatPropertiesARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType       sType                       = StructureType::eTensorFormatPropertiesARM;
-    void *              pNext                       = {};
-    FormatFeatureFlags2 optimalTilingTensorFeatures = {};
-    FormatFeatureFlags2 linearTilingTensorFeatures  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorFormatPropertiesARM>
-  {
-    using Type = TensorFormatPropertiesARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorFormatPropertiesARM>
-  {
-    using Type = TensorFormatPropertiesARM;
-  };
-
-  // wrapper struct for struct VkTensorMemoryRequirementsInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorMemoryRequirementsInfoARM.html
-  struct TensorMemoryRequirementsInfoARM
-  {
-    using NativeType = VkTensorMemoryRequirementsInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorMemoryRequirementsInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorMemoryRequirementsInfoARM( TensorARM tensor_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensor{ tensor_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorMemoryRequirementsInfoARM( TensorMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorMemoryRequirementsInfoARM( VkTensorMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorMemoryRequirementsInfoARM( *reinterpret_cast<TensorMemoryRequirementsInfoARM const *>( &rhs ) )
-    {
-    }
-
-    TensorMemoryRequirementsInfoARM & operator=( TensorMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorMemoryRequirementsInfoARM & operator=( VkTensorMemoryRequirementsInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorMemoryRequirementsInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryRequirementsInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorMemoryRequirementsInfoARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorMemoryRequirementsInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkTensorMemoryRequirementsInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkTensorMemoryRequirementsInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorMemoryRequirementsInfoARM *>( this );
-    }
-
-    operator VkTensorMemoryRequirementsInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorMemoryRequirementsInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensor );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorMemoryRequirementsInfoARM const & ) const = default;
-#else
-    bool operator==( TensorMemoryRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensor == rhs.tensor );
-#  endif
-    }
-
-    bool operator!=( TensorMemoryRequirementsInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType  = StructureType::eTensorMemoryRequirementsInfoARM;
-    const void *  pNext  = {};
-    TensorARM     tensor = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorMemoryRequirementsInfoARM>
-  {
-    using Type = TensorMemoryRequirementsInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorMemoryRequirementsInfoARM>
-  {
-    using Type = TensorMemoryRequirementsInfoARM;
-  };
-
-  // wrapper struct for struct VkTensorViewCaptureDescriptorDataInfoARM, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewCaptureDescriptorDataInfoARM.html
-  struct TensorViewCaptureDescriptorDataInfoARM
-  {
-    using NativeType = VkTensorViewCaptureDescriptorDataInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorViewCaptureDescriptorDataInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorViewCaptureDescriptorDataInfoARM( TensorViewARM tensorView_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorView{ tensorView_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorViewCaptureDescriptorDataInfoARM( TensorViewCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorViewCaptureDescriptorDataInfoARM( VkTensorViewCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorViewCaptureDescriptorDataInfoARM( *reinterpret_cast<TensorViewCaptureDescriptorDataInfoARM const *>( &rhs ) )
-    {
-    }
-
-    TensorViewCaptureDescriptorDataInfoARM & operator=( TensorViewCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorViewCaptureDescriptorDataInfoARM & operator=( VkTensorViewCaptureDescriptorDataInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorViewCaptureDescriptorDataInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCaptureDescriptorDataInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCaptureDescriptorDataInfoARM & setTensorView( TensorViewARM tensorView_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorView = tensorView_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorViewCaptureDescriptorDataInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorViewCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorViewCaptureDescriptorDataInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorViewCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorViewCaptureDescriptorDataInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorViewCaptureDescriptorDataInfoARM *>( this );
-    }
-
-    operator VkTensorViewCaptureDescriptorDataInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorViewCaptureDescriptorDataInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorViewARM const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorView );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorViewCaptureDescriptorDataInfoARM const & ) const = default;
-#else
-    bool operator==( TensorViewCaptureDescriptorDataInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorView == rhs.tensorView );
-#  endif
-    }
-
-    bool operator!=( TensorViewCaptureDescriptorDataInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::eTensorViewCaptureDescriptorDataInfoARM;
-    const void *  pNext      = {};
-    TensorViewARM tensorView = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorViewCaptureDescriptorDataInfoARM>
-  {
-    using Type = TensorViewCaptureDescriptorDataInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorViewCaptureDescriptorDataInfoARM>
-  {
-    using Type = TensorViewCaptureDescriptorDataInfoARM;
-  };
-
-  // wrapper struct for struct VkTensorViewCreateInfoARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTensorViewCreateInfoARM.html
-  struct TensorViewCreateInfoARM
-  {
-    using NativeType = VkTensorViewCreateInfoARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTensorViewCreateInfoARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TensorViewCreateInfoARM( TensorViewCreateFlagsARM flags_  = {},
-                                                  TensorARM                tensor_ = {},
-                                                  Format                   format_ = Format::eUndefined,
-                                                  const void *             pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , tensor{ tensor_ }
-      , format{ format_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TensorViewCreateInfoARM( TensorViewCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TensorViewCreateInfoARM( VkTensorViewCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TensorViewCreateInfoARM( *reinterpret_cast<TensorViewCreateInfoARM const *>( &rhs ) )
-    {
-    }
-
-    TensorViewCreateInfoARM & operator=( TensorViewCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TensorViewCreateInfoARM & operator=( VkTensorViewCreateInfoARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TensorViewCreateInfoARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCreateInfoARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCreateInfoARM & setFlags( TensorViewCreateFlagsARM flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCreateInfoARM & setTensor( TensorARM tensor_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensor = tensor_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TensorViewCreateInfoARM & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
-    {
-      format = format_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTensorViewCreateInfoARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTensorViewCreateInfoARM *>( this );
-    }
-
-    operator VkTensorViewCreateInfoARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTensorViewCreateInfoARM *>( this );
-    }
-
-    operator VkTensorViewCreateInfoARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTensorViewCreateInfoARM *>( this );
-    }
-
-    operator VkTensorViewCreateInfoARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTensorViewCreateInfoARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, TensorViewCreateFlagsARM const &, TensorARM const &, Format const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, tensor, format );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TensorViewCreateInfoARM const & ) const = default;
-#else
-    bool operator==( TensorViewCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( tensor == rhs.tensor ) && ( format == rhs.format );
-#  endif
-    }
-
-    bool operator!=( TensorViewCreateInfoARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType            sType  = StructureType::eTensorViewCreateInfoARM;
-    const void *             pNext  = {};
-    TensorViewCreateFlagsARM flags  = {};
-    TensorARM                tensor = {};
-    Format                   format = Format::eUndefined;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTensorViewCreateInfoARM>
-  {
-    using Type = TensorViewCreateInfoARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTensorViewCreateInfoARM>
-  {
-    using Type = TensorViewCreateInfoARM;
-  };
-
-  // wrapper struct for struct VkTextureLODGatherFormatPropertiesAMD, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkTextureLODGatherFormatPropertiesAMD.html
   struct TextureLODGatherFormatPropertiesAMD
   {
     using NativeType = VkTextureLODGatherFormatPropertiesAMD;
@@ -156848,10 +114045,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTextureLodGatherFormatPropertiesAMD;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TextureLODGatherFormatPropertiesAMD( Bool32 supportsTextureGatherLODBiasAMD_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , supportsTextureGatherLODBiasAMD{ supportsTextureGatherLODBiasAMD_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR TextureLODGatherFormatPropertiesAMD( VULKAN_HPP_NAMESPACE::Bool32 supportsTextureGatherLODBiasAMD_ = {},
+                                                              void *                       pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , supportsTextureGatherLODBiasAMD( supportsTextureGatherLODBiasAMD_ )
     {
     }
 
@@ -156863,11 +114061,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     TextureLODGatherFormatPropertiesAMD & operator=( TextureLODGatherFormatPropertiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TextureLODGatherFormatPropertiesAMD & operator=( VkTextureLODGatherFormatPropertiesAMD const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TextureLODGatherFormatPropertiesAMD const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TextureLODGatherFormatPropertiesAMD const *>( &rhs );
       return *this;
     }
 
@@ -156881,18 +114079,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTextureLODGatherFormatPropertiesAMD *>( this );
     }
 
-    operator VkTextureLODGatherFormatPropertiesAMD const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTextureLODGatherFormatPropertiesAMD *>( this );
-    }
-
-    operator VkTextureLODGatherFormatPropertiesAMD *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTextureLODGatherFormatPropertiesAMD *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, supportsTextureGatherLODBiasAMD );
     }
@@ -156917,364 +114110,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                           = StructureType::eTextureLodGatherFormatPropertiesAMD;
-    void *        pNext                           = {};
-    Bool32        supportsTextureGatherLODBiasAMD = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                           = StructureType::eTextureLodGatherFormatPropertiesAMD;
+    void *                              pNext                           = {};
+    VULKAN_HPP_NAMESPACE::Bool32        supportsTextureGatherLODBiasAMD = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTextureLODGatherFormatPropertiesAMD>
-  {
-    using Type = TextureLODGatherFormatPropertiesAMD;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eTextureLodGatherFormatPropertiesAMD>
   {
     using Type = TextureLODGatherFormatPropertiesAMD;
   };
 
-  // wrapper struct for struct VkTileMemoryBindInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTileMemoryBindInfoQCOM.html
-  struct TileMemoryBindInfoQCOM
-  {
-    using NativeType = VkTileMemoryBindInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTileMemoryBindInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TileMemoryBindInfoQCOM( DeviceMemory memory_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memory{ memory_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TileMemoryBindInfoQCOM( TileMemoryBindInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TileMemoryBindInfoQCOM( VkTileMemoryBindInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TileMemoryBindInfoQCOM( *reinterpret_cast<TileMemoryBindInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    TileMemoryBindInfoQCOM & operator=( TileMemoryBindInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TileMemoryBindInfoQCOM & operator=( VkTileMemoryBindInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TileMemoryBindInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TileMemoryBindInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TileMemoryBindInfoQCOM & setMemory( DeviceMemory memory_ ) VULKAN_HPP_NOEXCEPT
-    {
-      memory = memory_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTileMemoryBindInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTileMemoryBindInfoQCOM *>( this );
-    }
-
-    operator VkTileMemoryBindInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTileMemoryBindInfoQCOM *>( this );
-    }
-
-    operator VkTileMemoryBindInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTileMemoryBindInfoQCOM *>( this );
-    }
-
-    operator VkTileMemoryBindInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTileMemoryBindInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceMemory const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, memory );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TileMemoryBindInfoQCOM const & ) const = default;
-#else
-    bool operator==( TileMemoryBindInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memory == rhs.memory );
-#  endif
-    }
-
-    bool operator!=( TileMemoryBindInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType  = StructureType::eTileMemoryBindInfoQCOM;
-    const void *  pNext  = {};
-    DeviceMemory  memory = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTileMemoryBindInfoQCOM>
-  {
-    using Type = TileMemoryBindInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTileMemoryBindInfoQCOM>
-  {
-    using Type = TileMemoryBindInfoQCOM;
-  };
-
-  // wrapper struct for struct VkTileMemoryRequirementsQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTileMemoryRequirementsQCOM.html
-  struct TileMemoryRequirementsQCOM
-  {
-    using NativeType = VkTileMemoryRequirementsQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTileMemoryRequirementsQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TileMemoryRequirementsQCOM( DeviceSize size_ = {}, DeviceSize alignment_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , size{ size_ }
-      , alignment{ alignment_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TileMemoryRequirementsQCOM( TileMemoryRequirementsQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TileMemoryRequirementsQCOM( VkTileMemoryRequirementsQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TileMemoryRequirementsQCOM( *reinterpret_cast<TileMemoryRequirementsQCOM const *>( &rhs ) )
-    {
-    }
-
-    TileMemoryRequirementsQCOM & operator=( TileMemoryRequirementsQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TileMemoryRequirementsQCOM & operator=( VkTileMemoryRequirementsQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TileMemoryRequirementsQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TileMemoryRequirementsQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TileMemoryRequirementsQCOM & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TileMemoryRequirementsQCOM & setAlignment( DeviceSize alignment_ ) VULKAN_HPP_NOEXCEPT
-    {
-      alignment = alignment_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTileMemoryRequirementsQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTileMemoryRequirementsQCOM *>( this );
-    }
-
-    operator VkTileMemoryRequirementsQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTileMemoryRequirementsQCOM *>( this );
-    }
-
-    operator VkTileMemoryRequirementsQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTileMemoryRequirementsQCOM *>( this );
-    }
-
-    operator VkTileMemoryRequirementsQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTileMemoryRequirementsQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, DeviceSize const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, size, alignment );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TileMemoryRequirementsQCOM const & ) const = default;
-#else
-    bool operator==( TileMemoryRequirementsQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( size == rhs.size ) && ( alignment == rhs.alignment );
-#  endif
-    }
-
-    bool operator!=( TileMemoryRequirementsQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType     = StructureType::eTileMemoryRequirementsQCOM;
-    void *        pNext     = {};
-    DeviceSize    size      = {};
-    DeviceSize    alignment = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTileMemoryRequirementsQCOM>
-  {
-    using Type = TileMemoryRequirementsQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTileMemoryRequirementsQCOM>
-  {
-    using Type = TileMemoryRequirementsQCOM;
-  };
-
-  // wrapper struct for struct VkTileMemorySizeInfoQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTileMemorySizeInfoQCOM.html
-  struct TileMemorySizeInfoQCOM
-  {
-    using NativeType = VkTileMemorySizeInfoQCOM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTileMemorySizeInfoQCOM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TileMemorySizeInfoQCOM( DeviceSize size_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , size{ size_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR TileMemorySizeInfoQCOM( TileMemorySizeInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    TileMemorySizeInfoQCOM( VkTileMemorySizeInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : TileMemorySizeInfoQCOM( *reinterpret_cast<TileMemorySizeInfoQCOM const *>( &rhs ) )
-    {
-    }
-
-    TileMemorySizeInfoQCOM & operator=( TileMemorySizeInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    TileMemorySizeInfoQCOM & operator=( VkTileMemorySizeInfoQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<TileMemorySizeInfoQCOM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TileMemorySizeInfoQCOM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 TileMemorySizeInfoQCOM & setSize( DeviceSize size_ ) VULKAN_HPP_NOEXCEPT
-    {
-      size = size_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkTileMemorySizeInfoQCOM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkTileMemorySizeInfoQCOM *>( this );
-    }
-
-    operator VkTileMemorySizeInfoQCOM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkTileMemorySizeInfoQCOM *>( this );
-    }
-
-    operator VkTileMemorySizeInfoQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTileMemorySizeInfoQCOM *>( this );
-    }
-
-    operator VkTileMemorySizeInfoQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTileMemorySizeInfoQCOM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, DeviceSize const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, size );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( TileMemorySizeInfoQCOM const & ) const = default;
-#else
-    bool operator==( TileMemorySizeInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( size == rhs.size );
-#  endif
-    }
-
-    bool operator!=( TileMemorySizeInfoQCOM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType = StructureType::eTileMemorySizeInfoQCOM;
-    const void *  pNext = {};
-    DeviceSize    size  = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTileMemorySizeInfoQCOM>
-  {
-    using Type = TileMemorySizeInfoQCOM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eTileMemorySizeInfoQCOM>
-  {
-    using Type = TileMemorySizeInfoQCOM;
-  };
-
-  // wrapper struct for struct VkTilePropertiesQCOM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTilePropertiesQCOM.html
   struct TilePropertiesQCOM
   {
     using NativeType = VkTilePropertiesQCOM;
@@ -157282,13 +114128,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTilePropertiesQCOM;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      TilePropertiesQCOM( Extent3D tileSize_ = {}, Extent2D apronSize_ = {}, Offset2D origin_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tileSize{ tileSize_ }
-      , apronSize{ apronSize_ }
-      , origin{ origin_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR TilePropertiesQCOM( VULKAN_HPP_NAMESPACE::Extent3D tileSize_  = {},
+                                             VULKAN_HPP_NAMESPACE::Extent2D apronSize_ = {},
+                                             VULKAN_HPP_NAMESPACE::Offset2D origin_    = {},
+                                             void *                         pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , tileSize( tileSize_ )
+      , apronSize( apronSize_ )
+      , origin( origin_ )
     {
     }
 
@@ -157297,39 +114145,39 @@ namespace VULKAN_HPP_NAMESPACE
     TilePropertiesQCOM( VkTilePropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT : TilePropertiesQCOM( *reinterpret_cast<TilePropertiesQCOM const *>( &rhs ) ) {}
 
     TilePropertiesQCOM & operator=( TilePropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TilePropertiesQCOM & operator=( VkTilePropertiesQCOM const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TilePropertiesQCOM const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TilePropertiesQCOM const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setTileSize( Extent3D const & tileSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setTileSize( VULKAN_HPP_NAMESPACE::Extent3D const & tileSize_ ) VULKAN_HPP_NOEXCEPT
     {
       tileSize = tileSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setApronSize( Extent2D const & apronSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setApronSize( VULKAN_HPP_NAMESPACE::Extent2D const & apronSize_ ) VULKAN_HPP_NOEXCEPT
     {
       apronSize = apronSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setOrigin( Offset2D const & origin_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TilePropertiesQCOM & setOrigin( VULKAN_HPP_NAMESPACE::Offset2D const & origin_ ) VULKAN_HPP_NOEXCEPT
     {
       origin = origin_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkTilePropertiesQCOM const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -157341,18 +114189,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTilePropertiesQCOM *>( this );
     }
 
-    operator VkTilePropertiesQCOM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTilePropertiesQCOM *>( this );
-    }
-
-    operator VkTilePropertiesQCOM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTilePropertiesQCOM *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent3D const &, Extent2D const &, Offset2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Extent3D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, tileSize, apronSize, origin );
     }
@@ -157377,28 +114224,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType     = StructureType::eTilePropertiesQCOM;
-    void *        pNext     = {};
-    Extent3D      tileSize  = {};
-    Extent2D      apronSize = {};
-    Offset2D      origin    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType     = StructureType::eTilePropertiesQCOM;
+    void *                              pNext     = {};
+    VULKAN_HPP_NAMESPACE::Extent3D      tileSize  = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      apronSize = {};
+    VULKAN_HPP_NAMESPACE::Offset2D      origin    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTilePropertiesQCOM>
-  {
-    using Type = TilePropertiesQCOM;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eTilePropertiesQCOM>
   {
     using Type = TilePropertiesQCOM;
   };
 
-  // wrapper struct for struct VkTimelineSemaphoreSubmitInfo, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTimelineSemaphoreSubmitInfo.html
   struct TimelineSemaphoreSubmitInfo
   {
     using NativeType = VkTimelineSemaphoreSubmitInfo;
@@ -157406,17 +114244,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eTimelineSemaphoreSubmitInfo;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR TimelineSemaphoreSubmitInfo( uint32_t         waitSemaphoreValueCount_   = {},
                                                       const uint64_t * pWaitSemaphoreValues_      = {},
                                                       uint32_t         signalSemaphoreValueCount_ = {},
                                                       const uint64_t * pSignalSemaphoreValues_    = {},
                                                       const void *     pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , waitSemaphoreValueCount{ waitSemaphoreValueCount_ }
-      , pWaitSemaphoreValues{ pWaitSemaphoreValues_ }
-      , signalSemaphoreValueCount{ signalSemaphoreValueCount_ }
-      , pSignalSemaphoreValues{ pSignalSemaphoreValues_ }
+      : pNext( pNext_ )
+      , waitSemaphoreValueCount( waitSemaphoreValueCount_ )
+      , pWaitSemaphoreValues( pWaitSemaphoreValues_ )
+      , signalSemaphoreValueCount( signalSemaphoreValueCount_ )
+      , pSignalSemaphoreValues( pSignalSemaphoreValues_ )
     {
     }
 
@@ -157428,9 +114266,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TimelineSemaphoreSubmitInfo( ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_,
-                                 ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ = {},
-                                 const void *                                    pNext_                 = nullptr )
+    TimelineSemaphoreSubmitInfo( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_,
+                                 VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ = {},
+                                 const void *                                                          pNext_                 = nullptr )
       : pNext( pNext_ )
       , waitSemaphoreValueCount( static_cast<uint32_t>( waitSemaphoreValues_.size() ) )
       , pWaitSemaphoreValues( waitSemaphoreValues_.data() )
@@ -157441,15 +114279,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     TimelineSemaphoreSubmitInfo & operator=( TimelineSemaphoreSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TimelineSemaphoreSubmitInfo & operator=( VkTimelineSemaphoreSubmitInfo const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TimelineSemaphoreSubmitInfo const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TimelineSemaphoreSubmitInfo const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 TimelineSemaphoreSubmitInfo & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -157469,7 +114307,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TimelineSemaphoreSubmitInfo & setWaitSemaphoreValues( ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
+    TimelineSemaphoreSubmitInfo &
+      setWaitSemaphoreValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & waitSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
     {
       waitSemaphoreValueCount = static_cast<uint32_t>( waitSemaphoreValues_.size() );
       pWaitSemaphoreValues    = waitSemaphoreValues_.data();
@@ -157490,14 +114329,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    TimelineSemaphoreSubmitInfo & setSignalSemaphoreValues( ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
+    TimelineSemaphoreSubmitInfo &
+      setSignalSemaphoreValues( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & signalSemaphoreValues_ ) VULKAN_HPP_NOEXCEPT
     {
       signalSemaphoreValueCount = static_cast<uint32_t>( signalSemaphoreValues_.size() );
       pSignalSemaphoreValues    = signalSemaphoreValues_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkTimelineSemaphoreSubmitInfo const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -157509,18 +114349,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTimelineSemaphoreSubmitInfo *>( this );
     }
 
-    operator VkTimelineSemaphoreSubmitInfo const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTimelineSemaphoreSubmitInfo *>( this );
-    }
-
-    operator VkTimelineSemaphoreSubmitInfo *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTimelineSemaphoreSubmitInfo *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const uint64_t * const &, uint32_t const &, const uint64_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               const uint64_t * const &,
+               uint32_t const &,
+               const uint64_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, waitSemaphoreValueCount, pWaitSemaphoreValues, signalSemaphoreValueCount, pSignalSemaphoreValues );
@@ -157548,22 +114387,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType                     = StructureType::eTimelineSemaphoreSubmitInfo;
-    const void *     pNext                     = {};
-    uint32_t         waitSemaphoreValueCount   = {};
-    const uint64_t * pWaitSemaphoreValues      = {};
-    uint32_t         signalSemaphoreValueCount = {};
-    const uint64_t * pSignalSemaphoreValues    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                     = StructureType::eTimelineSemaphoreSubmitInfo;
+    const void *                        pNext                     = {};
+    uint32_t                            waitSemaphoreValueCount   = {};
+    const uint64_t *                    pWaitSemaphoreValues      = {};
+    uint32_t                            signalSemaphoreValueCount = {};
+    const uint64_t *                    pSignalSemaphoreValues    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTimelineSemaphoreSubmitInfo>
-  {
-    using Type = TimelineSemaphoreSubmitInfo;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eTimelineSemaphoreSubmitInfo>
   {
@@ -157572,40 +114403,39 @@ namespace VULKAN_HPP_NAMESPACE
 
   using TimelineSemaphoreSubmitInfoKHR = TimelineSemaphoreSubmitInfo;
 
-  // wrapper struct for struct VkTraceRaysIndirectCommand2KHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTraceRaysIndirectCommand2KHR.html
   struct TraceRaysIndirectCommand2KHR
   {
     using NativeType = VkTraceRaysIndirectCommand2KHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR TraceRaysIndirectCommand2KHR( DeviceAddress raygenShaderRecordAddress_         = {},
-                                                       DeviceSize    raygenShaderRecordSize_            = {},
-                                                       DeviceAddress missShaderBindingTableAddress_     = {},
-                                                       DeviceSize    missShaderBindingTableSize_        = {},
-                                                       DeviceSize    missShaderBindingTableStride_      = {},
-                                                       DeviceAddress hitShaderBindingTableAddress_      = {},
-                                                       DeviceSize    hitShaderBindingTableSize_         = {},
-                                                       DeviceSize    hitShaderBindingTableStride_       = {},
-                                                       DeviceAddress callableShaderBindingTableAddress_ = {},
-                                                       DeviceSize    callableShaderBindingTableSize_    = {},
-                                                       DeviceSize    callableShaderBindingTableStride_  = {},
-                                                       uint32_t      width_                             = {},
-                                                       uint32_t      height_                            = {},
-                                                       uint32_t      depth_                             = {} ) VULKAN_HPP_NOEXCEPT
-      : raygenShaderRecordAddress{ raygenShaderRecordAddress_ }
-      , raygenShaderRecordSize{ raygenShaderRecordSize_ }
-      , missShaderBindingTableAddress{ missShaderBindingTableAddress_ }
-      , missShaderBindingTableSize{ missShaderBindingTableSize_ }
-      , missShaderBindingTableStride{ missShaderBindingTableStride_ }
-      , hitShaderBindingTableAddress{ hitShaderBindingTableAddress_ }
-      , hitShaderBindingTableSize{ hitShaderBindingTableSize_ }
-      , hitShaderBindingTableStride{ hitShaderBindingTableStride_ }
-      , callableShaderBindingTableAddress{ callableShaderBindingTableAddress_ }
-      , callableShaderBindingTableSize{ callableShaderBindingTableSize_ }
-      , callableShaderBindingTableStride{ callableShaderBindingTableStride_ }
-      , width{ width_ }
-      , height{ height_ }
-      , depth{ depth_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR TraceRaysIndirectCommand2KHR( VULKAN_HPP_NAMESPACE::DeviceAddress raygenShaderRecordAddress_         = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    raygenShaderRecordSize_            = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceAddress missShaderBindingTableAddress_     = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    missShaderBindingTableSize_        = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    missShaderBindingTableStride_      = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceAddress hitShaderBindingTableAddress_      = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    hitShaderBindingTableSize_         = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    hitShaderBindingTableStride_       = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceAddress callableShaderBindingTableAddress_ = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    callableShaderBindingTableSize_    = {},
+                                                       VULKAN_HPP_NAMESPACE::DeviceSize    callableShaderBindingTableStride_  = {},
+                                                       uint32_t                            width_                             = {},
+                                                       uint32_t                            height_                            = {},
+                                                       uint32_t                            depth_                             = {} ) VULKAN_HPP_NOEXCEPT
+      : raygenShaderRecordAddress( raygenShaderRecordAddress_ )
+      , raygenShaderRecordSize( raygenShaderRecordSize_ )
+      , missShaderBindingTableAddress( missShaderBindingTableAddress_ )
+      , missShaderBindingTableSize( missShaderBindingTableSize_ )
+      , missShaderBindingTableStride( missShaderBindingTableStride_ )
+      , hitShaderBindingTableAddress( hitShaderBindingTableAddress_ )
+      , hitShaderBindingTableSize( hitShaderBindingTableSize_ )
+      , hitShaderBindingTableStride( hitShaderBindingTableStride_ )
+      , callableShaderBindingTableAddress( callableShaderBindingTableAddress_ )
+      , callableShaderBindingTableSize( callableShaderBindingTableSize_ )
+      , callableShaderBindingTableStride( callableShaderBindingTableStride_ )
+      , width( width_ )
+      , height( height_ )
+      , depth( depth_ )
     {
     }
 
@@ -157617,78 +114447,87 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     TraceRaysIndirectCommand2KHR & operator=( TraceRaysIndirectCommand2KHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TraceRaysIndirectCommand2KHR & operator=( VkTraceRaysIndirectCommand2KHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TraceRaysIndirectCommand2KHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommand2KHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setRaygenShaderRecordAddress( DeviceAddress raygenShaderRecordAddress_ ) VULKAN_HPP_NOEXCEPT
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setRaygenShaderRecordAddress( VULKAN_HPP_NAMESPACE::DeviceAddress raygenShaderRecordAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       raygenShaderRecordAddress = raygenShaderRecordAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setRaygenShaderRecordSize( DeviceSize raygenShaderRecordSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setRaygenShaderRecordSize( VULKAN_HPP_NAMESPACE::DeviceSize raygenShaderRecordSize_ ) VULKAN_HPP_NOEXCEPT
     {
       raygenShaderRecordSize = raygenShaderRecordSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setMissShaderBindingTableAddress( DeviceAddress missShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setMissShaderBindingTableAddress( VULKAN_HPP_NAMESPACE::DeviceAddress missShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       missShaderBindingTableAddress = missShaderBindingTableAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setMissShaderBindingTableSize( DeviceSize missShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setMissShaderBindingTableSize( VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
     {
       missShaderBindingTableSize = missShaderBindingTableSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setMissShaderBindingTableStride( DeviceSize missShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setMissShaderBindingTableStride( VULKAN_HPP_NAMESPACE::DeviceSize missShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
     {
       missShaderBindingTableStride = missShaderBindingTableStride_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setHitShaderBindingTableAddress( DeviceAddress hitShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setHitShaderBindingTableAddress( VULKAN_HPP_NAMESPACE::DeviceAddress hitShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       hitShaderBindingTableAddress = hitShaderBindingTableAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setHitShaderBindingTableSize( DeviceSize hitShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setHitShaderBindingTableSize( VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
     {
       hitShaderBindingTableSize = hitShaderBindingTableSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setHitShaderBindingTableStride( DeviceSize hitShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setHitShaderBindingTableStride( VULKAN_HPP_NAMESPACE::DeviceSize hitShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
     {
       hitShaderBindingTableStride = hitShaderBindingTableStride_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
-      setCallableShaderBindingTableAddress( DeviceAddress callableShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
+      setCallableShaderBindingTableAddress( VULKAN_HPP_NAMESPACE::DeviceAddress callableShaderBindingTableAddress_ ) VULKAN_HPP_NOEXCEPT
     {
       callableShaderBindingTableAddress = callableShaderBindingTableAddress_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR & setCallableShaderBindingTableSize( DeviceSize callableShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
+      setCallableShaderBindingTableSize( VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingTableSize_ ) VULKAN_HPP_NOEXCEPT
     {
       callableShaderBindingTableSize = callableShaderBindingTableSize_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommand2KHR &
-      setCallableShaderBindingTableStride( DeviceSize callableShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
+      setCallableShaderBindingTableStride( VULKAN_HPP_NAMESPACE::DeviceSize callableShaderBindingTableStride_ ) VULKAN_HPP_NOEXCEPT
     {
       callableShaderBindingTableStride = callableShaderBindingTableStride_;
       return *this;
@@ -157711,7 +114550,7 @@ namespace VULKAN_HPP_NAMESPACE
       depth = depth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkTraceRaysIndirectCommand2KHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -157723,31 +114562,25 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTraceRaysIndirectCommand2KHR *>( this );
     }
 
-    operator VkTraceRaysIndirectCommand2KHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTraceRaysIndirectCommand2KHR *>( this );
-    }
-
-    operator VkTraceRaysIndirectCommand2KHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTraceRaysIndirectCommand2KHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<DeviceAddress const &,
-               DeviceSize const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               DeviceAddress const &,
-               DeviceSize const &,
-               DeviceSize const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceAddress const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( raygenShaderRecordAddress,
@@ -157793,40 +114626,31 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    DeviceAddress raygenShaderRecordAddress         = {};
-    DeviceSize    raygenShaderRecordSize            = {};
-    DeviceAddress missShaderBindingTableAddress     = {};
-    DeviceSize    missShaderBindingTableSize        = {};
-    DeviceSize    missShaderBindingTableStride      = {};
-    DeviceAddress hitShaderBindingTableAddress      = {};
-    DeviceSize    hitShaderBindingTableSize         = {};
-    DeviceSize    hitShaderBindingTableStride       = {};
-    DeviceAddress callableShaderBindingTableAddress = {};
-    DeviceSize    callableShaderBindingTableSize    = {};
-    DeviceSize    callableShaderBindingTableStride  = {};
-    uint32_t      width                             = {};
-    uint32_t      height                            = {};
-    uint32_t      depth                             = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress raygenShaderRecordAddress         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    raygenShaderRecordSize            = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress missShaderBindingTableAddress     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    missShaderBindingTableSize        = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    missShaderBindingTableStride      = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress hitShaderBindingTableAddress      = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    hitShaderBindingTableSize         = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    hitShaderBindingTableStride       = {};
+    VULKAN_HPP_NAMESPACE::DeviceAddress callableShaderBindingTableAddress = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    callableShaderBindingTableSize    = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize    callableShaderBindingTableStride  = {};
+    uint32_t                            width                             = {};
+    uint32_t                            height                            = {};
+    uint32_t                            depth                             = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTraceRaysIndirectCommand2KHR>
-  {
-    using Type = TraceRaysIndirectCommand2KHR;
-  };
-#endif
-
-  // wrapper struct for struct VkTraceRaysIndirectCommandKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkTraceRaysIndirectCommandKHR.html
   struct TraceRaysIndirectCommandKHR
   {
     using NativeType = VkTraceRaysIndirectCommandKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR TraceRaysIndirectCommandKHR( uint32_t width_ = {}, uint32_t height_ = {}, uint32_t depth_ = {} ) VULKAN_HPP_NOEXCEPT
-      : width{ width_ }
-      , height{ height_ }
-      , depth{ depth_ }
+      : width( width_ )
+      , height( height_ )
+      , depth( depth_ )
     {
     }
 
@@ -157843,15 +114667,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     TraceRaysIndirectCommandKHR & operator=( TraceRaysIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     TraceRaysIndirectCommandKHR & operator=( VkTraceRaysIndirectCommandKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<TraceRaysIndirectCommandKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::TraceRaysIndirectCommandKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 TraceRaysIndirectCommandKHR & setWidth( uint32_t width_ ) VULKAN_HPP_NOEXCEPT
     {
       width = width_;
@@ -157869,7 +114693,7 @@ namespace VULKAN_HPP_NAMESPACE
       depth = depth_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkTraceRaysIndirectCommandKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -157881,18 +114705,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkTraceRaysIndirectCommandKHR *>( this );
     }
 
-    operator VkTraceRaysIndirectCommandKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkTraceRaysIndirectCommandKHR *>( this );
-    }
-
-    operator VkTraceRaysIndirectCommandKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkTraceRaysIndirectCommandKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( width, height, depth );
     }
@@ -157922,15 +114741,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t depth  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkTraceRaysIndirectCommandKHR>
-  {
-    using Type = TraceRaysIndirectCommandKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkValidationCacheCreateInfoEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationCacheCreateInfoEXT.html
   struct ValidationCacheCreateInfoEXT
   {
     using NativeType = VkValidationCacheCreateInfoEXT;
@@ -157938,15 +114748,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eValidationCacheCreateInfoEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ValidationCacheCreateInfoEXT( ValidationCacheCreateFlagsEXT flags_           = {},
-                                                       size_t                        initialDataSize_ = {},
-                                                       const void *                  pInitialData_    = {},
-                                                       const void *                  pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , initialDataSize{ initialDataSize_ }
-      , pInitialData{ pInitialData_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ValidationCacheCreateInfoEXT( VULKAN_HPP_NAMESPACE::ValidationCacheCreateFlagsEXT flags_           = {},
+                                                       size_t                                              initialDataSize_ = {},
+                                                       const void *                                        pInitialData_    = {},
+                                                       const void *                                        pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , initialDataSize( initialDataSize_ )
+      , pInitialData( pInitialData_ )
     {
     }
 
@@ -157959,29 +114769,31 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    ValidationCacheCreateInfoEXT( ValidationCacheCreateFlagsEXT flags_, ArrayProxyNoTemporaries<const T> const & initialData_, const void * pNext_ = nullptr )
+    ValidationCacheCreateInfoEXT( VULKAN_HPP_NAMESPACE::ValidationCacheCreateFlagsEXT            flags_,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & initialData_,
+                                  const void *                                                   pNext_ = nullptr )
       : pNext( pNext_ ), flags( flags_ ), initialDataSize( initialData_.size() * sizeof( T ) ), pInitialData( initialData_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ValidationCacheCreateInfoEXT & operator=( ValidationCacheCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ValidationCacheCreateInfoEXT & operator=( VkValidationCacheCreateInfoEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ValidationCacheCreateInfoEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ValidationCacheCreateInfoEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ValidationCacheCreateInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ValidationCacheCreateInfoEXT & setFlags( ValidationCacheCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ValidationCacheCreateInfoEXT & setFlags( VULKAN_HPP_NAMESPACE::ValidationCacheCreateFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -158001,14 +114813,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    ValidationCacheCreateInfoEXT & setInitialData( ArrayProxyNoTemporaries<const T> const & initialData_ ) VULKAN_HPP_NOEXCEPT
+    ValidationCacheCreateInfoEXT & setInitialData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & initialData_ ) VULKAN_HPP_NOEXCEPT
     {
       initialDataSize = initialData_.size() * sizeof( T );
       pInitialData    = initialData_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkValidationCacheCreateInfoEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158020,18 +114832,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkValidationCacheCreateInfoEXT *>( this );
     }
 
-    operator VkValidationCacheCreateInfoEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkValidationCacheCreateInfoEXT *>( this );
-    }
-
-    operator VkValidationCacheCreateInfoEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkValidationCacheCreateInfoEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ValidationCacheCreateFlagsEXT const &, size_t const &, const void * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::ValidationCacheCreateFlagsEXT const &,
+               size_t const &,
+               const void * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, initialDataSize, pInitialData );
@@ -158058,28 +114868,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType           = StructureType::eValidationCacheCreateInfoEXT;
-    const void *                  pNext           = {};
-    ValidationCacheCreateFlagsEXT flags           = {};
-    size_t                        initialDataSize = {};
-    const void *                  pInitialData    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType           = StructureType::eValidationCacheCreateInfoEXT;
+    const void *                                        pNext           = {};
+    VULKAN_HPP_NAMESPACE::ValidationCacheCreateFlagsEXT flags           = {};
+    size_t                                              initialDataSize = {};
+    const void *                                        pInitialData    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkValidationCacheCreateInfoEXT>
-  {
-    using Type = ValidationCacheCreateInfoEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eValidationCacheCreateInfoEXT>
   {
     using Type = ValidationCacheCreateInfoEXT;
   };
 
-  // wrapper struct for struct VkValidationFeaturesEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationFeaturesEXT.html
   struct ValidationFeaturesEXT
   {
     using NativeType = VkValidationFeaturesEXT;
@@ -158087,17 +114888,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eValidationFeaturesEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ValidationFeaturesEXT( uint32_t                            enabledValidationFeatureCount_  = {},
-                                                const ValidationFeatureEnableEXT *  pEnabledValidationFeatures_     = {},
-                                                uint32_t                            disabledValidationFeatureCount_ = {},
-                                                const ValidationFeatureDisableEXT * pDisabledValidationFeatures_    = {},
-                                                const void *                        pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , enabledValidationFeatureCount{ enabledValidationFeatureCount_ }
-      , pEnabledValidationFeatures{ pEnabledValidationFeatures_ }
-      , disabledValidationFeatureCount{ disabledValidationFeatureCount_ }
-      , pDisabledValidationFeatures{ pDisabledValidationFeatures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ValidationFeaturesEXT( uint32_t                                                  enabledValidationFeatureCount_  = {},
+                                                const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT *  pEnabledValidationFeatures_     = {},
+                                                uint32_t                                                  disabledValidationFeatureCount_ = {},
+                                                const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT * pDisabledValidationFeatures_    = {},
+                                                const void *                                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , enabledValidationFeatureCount( enabledValidationFeatureCount_ )
+      , pEnabledValidationFeatures( pEnabledValidationFeatures_ )
+      , disabledValidationFeatureCount( disabledValidationFeatureCount_ )
+      , pDisabledValidationFeatures( pDisabledValidationFeatures_ )
     {
     }
 
@@ -158109,9 +114910,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ValidationFeaturesEXT( ArrayProxyNoTemporaries<const ValidationFeatureEnableEXT> const &  enabledValidationFeatures_,
-                           ArrayProxyNoTemporaries<const ValidationFeatureDisableEXT> const & disabledValidationFeatures_ = {},
-                           const void *                                                       pNext_                      = nullptr )
+    ValidationFeaturesEXT(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT> const &  enabledValidationFeatures_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT> const & disabledValidationFeatures_ = {},
+      const void *                                                                                                   pNext_                      = nullptr )
       : pNext( pNext_ )
       , enabledValidationFeatureCount( static_cast<uint32_t>( enabledValidationFeatures_.size() ) )
       , pEnabledValidationFeatures( enabledValidationFeatures_.data() )
@@ -158122,15 +114924,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ValidationFeaturesEXT & operator=( ValidationFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ValidationFeaturesEXT & operator=( VkValidationFeaturesEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ValidationFeaturesEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ValidationFeaturesEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ValidationFeaturesEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -158144,15 +114946,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 ValidationFeaturesEXT &
-      setPEnabledValidationFeatures( const ValidationFeatureEnableEXT * pEnabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
+      setPEnabledValidationFeatures( const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT * pEnabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       pEnabledValidationFeatures = pEnabledValidationFeatures_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ValidationFeaturesEXT &
-      setEnabledValidationFeatures( ArrayProxyNoTemporaries<const ValidationFeatureEnableEXT> const & enabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
+    ValidationFeaturesEXT & setEnabledValidationFeatures(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT> const & enabledValidationFeatures_ )
+      VULKAN_HPP_NOEXCEPT
     {
       enabledValidationFeatureCount = static_cast<uint32_t>( enabledValidationFeatures_.size() );
       pEnabledValidationFeatures    = enabledValidationFeatures_.data();
@@ -158167,22 +114970,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 ValidationFeaturesEXT &
-      setPDisabledValidationFeatures( const ValidationFeatureDisableEXT * pDisabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
+      setPDisabledValidationFeatures( const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT * pDisabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
     {
       pDisabledValidationFeatures = pDisabledValidationFeatures_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ValidationFeaturesEXT &
-      setDisabledValidationFeatures( ArrayProxyNoTemporaries<const ValidationFeatureDisableEXT> const & disabledValidationFeatures_ ) VULKAN_HPP_NOEXCEPT
+    ValidationFeaturesEXT & setDisabledValidationFeatures(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT> const & disabledValidationFeatures_ )
+      VULKAN_HPP_NOEXCEPT
     {
       disabledValidationFeatureCount = static_cast<uint32_t>( disabledValidationFeatures_.size() );
       pDisabledValidationFeatures    = disabledValidationFeatures_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkValidationFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158194,23 +114998,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkValidationFeaturesEXT *>( this );
     }
 
-    operator VkValidationFeaturesEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkValidationFeaturesEXT *>( this );
-    }
-
-    operator VkValidationFeaturesEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkValidationFeaturesEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const ValidationFeatureEnableEXT * const &,
+               const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT * const &,
                uint32_t const &,
-               const ValidationFeatureDisableEXT * const &>
+               const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, enabledValidationFeatureCount, pEnabledValidationFeatures, disabledValidationFeatureCount, pDisabledValidationFeatures );
@@ -158238,29 +115036,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType                          = StructureType::eValidationFeaturesEXT;
-    const void *                        pNext                          = {};
-    uint32_t                            enabledValidationFeatureCount  = {};
-    const ValidationFeatureEnableEXT *  pEnabledValidationFeatures     = {};
-    uint32_t                            disabledValidationFeatureCount = {};
-    const ValidationFeatureDisableEXT * pDisabledValidationFeatures    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType                          = StructureType::eValidationFeaturesEXT;
+    const void *                                              pNext                          = {};
+    uint32_t                                                  enabledValidationFeatureCount  = {};
+    const VULKAN_HPP_NAMESPACE::ValidationFeatureEnableEXT *  pEnabledValidationFeatures     = {};
+    uint32_t                                                  disabledValidationFeatureCount = {};
+    const VULKAN_HPP_NAMESPACE::ValidationFeatureDisableEXT * pDisabledValidationFeatures    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkValidationFeaturesEXT>
-  {
-    using Type = ValidationFeaturesEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eValidationFeaturesEXT>
   {
     using Type = ValidationFeaturesEXT;
   };
 
-  // wrapper struct for struct VkValidationFlagsEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkValidationFlagsEXT.html
   struct ValidationFlagsEXT
   {
     using NativeType = VkValidationFlagsEXT;
@@ -158268,13 +115057,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eValidationFlagsEXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ValidationFlagsEXT( uint32_t                   disabledValidationCheckCount_ = {},
-                                             const ValidationCheckEXT * pDisabledValidationChecks_    = {},
-                                             const void *               pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , disabledValidationCheckCount{ disabledValidationCheckCount_ }
-      , pDisabledValidationChecks{ pDisabledValidationChecks_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR ValidationFlagsEXT( uint32_t                                         disabledValidationCheckCount_ = {},
+                                             const VULKAN_HPP_NAMESPACE::ValidationCheckEXT * pDisabledValidationChecks_    = {},
+                                             const void *                                     pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , disabledValidationCheckCount( disabledValidationCheckCount_ )
+      , pDisabledValidationChecks( pDisabledValidationChecks_ )
     {
     }
 
@@ -158283,7 +115072,8 @@ namespace VULKAN_HPP_NAMESPACE
     ValidationFlagsEXT( VkValidationFlagsEXT const & rhs ) VULKAN_HPP_NOEXCEPT : ValidationFlagsEXT( *reinterpret_cast<ValidationFlagsEXT const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ValidationFlagsEXT( ArrayProxyNoTemporaries<const ValidationCheckEXT> const & disabledValidationChecks_, const void * pNext_ = nullptr )
+    ValidationFlagsEXT( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationCheckEXT> const & disabledValidationChecks_,
+                        const void *                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , disabledValidationCheckCount( static_cast<uint32_t>( disabledValidationChecks_.size() ) )
       , pDisabledValidationChecks( disabledValidationChecks_.data() )
@@ -158292,15 +115082,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     ValidationFlagsEXT & operator=( ValidationFlagsEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ValidationFlagsEXT & operator=( VkValidationFlagsEXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ValidationFlagsEXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ValidationFlagsEXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ValidationFlagsEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -158313,21 +115103,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ValidationFlagsEXT & setPDisabledValidationChecks( const ValidationCheckEXT * pDisabledValidationChecks_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ValidationFlagsEXT &
+      setPDisabledValidationChecks( const VULKAN_HPP_NAMESPACE::ValidationCheckEXT * pDisabledValidationChecks_ ) VULKAN_HPP_NOEXCEPT
     {
       pDisabledValidationChecks = pDisabledValidationChecks_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    ValidationFlagsEXT & setDisabledValidationChecks( ArrayProxyNoTemporaries<const ValidationCheckEXT> const & disabledValidationChecks_ ) VULKAN_HPP_NOEXCEPT
+    ValidationFlagsEXT & setDisabledValidationChecks(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::ValidationCheckEXT> const & disabledValidationChecks_ ) VULKAN_HPP_NOEXCEPT
     {
       disabledValidationCheckCount = static_cast<uint32_t>( disabledValidationChecks_.size() );
       pDisabledValidationChecks    = disabledValidationChecks_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkValidationFlagsEXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158339,18 +115131,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkValidationFlagsEXT *>( this );
     }
 
-    operator VkValidationFlagsEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkValidationFlagsEXT *>( this );
-    }
-
-    operator VkValidationFlagsEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkValidationFlagsEXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const ValidationCheckEXT * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::ValidationCheckEXT * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, disabledValidationCheckCount, pDisabledValidationChecks );
     }
@@ -158376,28 +115163,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType                        = StructureType::eValidationFlagsEXT;
-    const void *               pNext                        = {};
-    uint32_t                   disabledValidationCheckCount = {};
-    const ValidationCheckEXT * pDisabledValidationChecks    = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType                        = StructureType::eValidationFlagsEXT;
+    const void *                                     pNext                        = {};
+    uint32_t                                         disabledValidationCheckCount = {};
+    const VULKAN_HPP_NAMESPACE::ValidationCheckEXT * pDisabledValidationChecks    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkValidationFlagsEXT>
-  {
-    using Type = ValidationFlagsEXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eValidationFlagsEXT>
   {
     using Type = ValidationFlagsEXT;
   };
 
-  // wrapper struct for struct VkVertexInputAttributeDescription2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputAttributeDescription2EXT.html
   struct VertexInputAttributeDescription2EXT
   {
     using NativeType = VkVertexInputAttributeDescription2EXT;
@@ -158405,14 +115182,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVertexInputAttributeDescription2EXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VertexInputAttributeDescription2EXT(
-      uint32_t location_ = {}, uint32_t binding_ = {}, Format format_ = Format::eUndefined, uint32_t offset_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , location{ location_ }
-      , binding{ binding_ }
-      , format{ format_ }
-      , offset{ offset_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VertexInputAttributeDescription2EXT( uint32_t                     location_ = {},
+                                                              uint32_t                     binding_  = {},
+                                                              VULKAN_HPP_NAMESPACE::Format format_   = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                              uint32_t                     offset_   = {},
+                                                              void *                       pNext_    = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , location( location_ )
+      , binding( binding_ )
+      , format( format_ )
+      , offset( offset_ )
     {
     }
 
@@ -158424,15 +115204,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VertexInputAttributeDescription2EXT & operator=( VertexInputAttributeDescription2EXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VertexInputAttributeDescription2EXT & operator=( VkVertexInputAttributeDescription2EXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VertexInputAttributeDescription2EXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VertexInputAttributeDescription2EXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription2EXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -158451,7 +115231,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription2EXT & setFormat( Format format_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VertexInputAttributeDescription2EXT & setFormat( VULKAN_HPP_NAMESPACE::Format format_ ) VULKAN_HPP_NOEXCEPT
     {
       format = format_;
       return *this;
@@ -158462,7 +115242,7 @@ namespace VULKAN_HPP_NAMESPACE
       offset = offset_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVertexInputAttributeDescription2EXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158474,18 +115254,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVertexInputAttributeDescription2EXT *>( this );
     }
 
-    operator VkVertexInputAttributeDescription2EXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVertexInputAttributeDescription2EXT *>( this );
-    }
-
-    operator VkVertexInputAttributeDescription2EXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVertexInputAttributeDescription2EXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, Format const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, location, binding, format, offset );
     }
@@ -158511,30 +115291,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::eVertexInputAttributeDescription2EXT;
-    void *        pNext    = {};
-    uint32_t      location = {};
-    uint32_t      binding  = {};
-    Format        format   = Format::eUndefined;
-    uint32_t      offset   = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eVertexInputAttributeDescription2EXT;
+    void *                              pNext    = {};
+    uint32_t                            location = {};
+    uint32_t                            binding  = {};
+    VULKAN_HPP_NAMESPACE::Format        format   = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint32_t                            offset   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVertexInputAttributeDescription2EXT>
-  {
-    using Type = VertexInputAttributeDescription2EXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVertexInputAttributeDescription2EXT>
   {
     using Type = VertexInputAttributeDescription2EXT;
   };
 
-  // wrapper struct for struct VkVertexInputBindingDescription2EXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVertexInputBindingDescription2EXT.html
   struct VertexInputBindingDescription2EXT
   {
     using NativeType = VkVertexInputBindingDescription2EXT;
@@ -158542,17 +115312,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVertexInputBindingDescription2EXT;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VertexInputBindingDescription2EXT( uint32_t        binding_   = {},
-                                                            uint32_t        stride_    = {},
-                                                            VertexInputRate inputRate_ = VertexInputRate::eVertex,
-                                                            uint32_t        divisor_   = {},
-                                                            void *          pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , binding{ binding_ }
-      , stride{ stride_ }
-      , inputRate{ inputRate_ }
-      , divisor{ divisor_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VertexInputBindingDescription2EXT( uint32_t                              binding_   = {},
+                                                            uint32_t                              stride_    = {},
+                                                            VULKAN_HPP_NAMESPACE::VertexInputRate inputRate_ = VULKAN_HPP_NAMESPACE::VertexInputRate::eVertex,
+                                                            uint32_t                              divisor_   = {},
+                                                            void *                                pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , binding( binding_ )
+      , stride( stride_ )
+      , inputRate( inputRate_ )
+      , divisor( divisor_ )
     {
     }
 
@@ -158564,15 +115334,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VertexInputBindingDescription2EXT & operator=( VertexInputBindingDescription2EXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VertexInputBindingDescription2EXT & operator=( VkVertexInputBindingDescription2EXT const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VertexInputBindingDescription2EXT const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VertexInputBindingDescription2EXT const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription2EXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -158591,7 +115361,7 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription2EXT & setInputRate( VertexInputRate inputRate_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VertexInputBindingDescription2EXT & setInputRate( VULKAN_HPP_NAMESPACE::VertexInputRate inputRate_ ) VULKAN_HPP_NOEXCEPT
     {
       inputRate = inputRate_;
       return *this;
@@ -158602,7 +115372,7 @@ namespace VULKAN_HPP_NAMESPACE
       divisor = divisor_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVertexInputBindingDescription2EXT const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158614,18 +115384,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVertexInputBindingDescription2EXT *>( this );
     }
 
-    operator VkVertexInputBindingDescription2EXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVertexInputBindingDescription2EXT *>( this );
-    }
-
-    operator VkVertexInputBindingDescription2EXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVertexInputBindingDescription2EXT *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, uint32_t const &, VertexInputRate const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::VertexInputRate const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, binding, stride, inputRate, divisor );
@@ -158652,22 +115421,14 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType   sType     = StructureType::eVertexInputBindingDescription2EXT;
-    void *          pNext     = {};
-    uint32_t        binding   = {};
-    uint32_t        stride    = {};
-    VertexInputRate inputRate = VertexInputRate::eVertex;
-    uint32_t        divisor   = {};
+    VULKAN_HPP_NAMESPACE::StructureType   sType     = StructureType::eVertexInputBindingDescription2EXT;
+    void *                                pNext     = {};
+    uint32_t                              binding   = {};
+    uint32_t                              stride    = {};
+    VULKAN_HPP_NAMESPACE::VertexInputRate inputRate = VULKAN_HPP_NAMESPACE::VertexInputRate::eVertex;
+    uint32_t                              divisor   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVertexInputBindingDescription2EXT>
-  {
-    using Type = VertexInputBindingDescription2EXT;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVertexInputBindingDescription2EXT>
   {
@@ -158675,7 +115436,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_VI_NN )
-  // wrapper struct for struct VkViSurfaceCreateInfoNN, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkViSurfaceCreateInfoNN.html
   struct ViSurfaceCreateInfoNN
   {
     using NativeType = VkViSurfaceCreateInfoNN;
@@ -158683,11 +115443,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eViSurfaceCreateInfoNN;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR ViSurfaceCreateInfoNN( ViSurfaceCreateFlagsNN flags_ = {}, void * window_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , window{ window_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      ViSurfaceCreateInfoNN( VULKAN_HPP_NAMESPACE::ViSurfaceCreateFlagsNN flags_ = {}, void * window_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , window( window_ )
     {
     }
 
@@ -158699,22 +115460,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     ViSurfaceCreateInfoNN & operator=( ViSurfaceCreateInfoNN const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     ViSurfaceCreateInfoNN & operator=( VkViSurfaceCreateInfoNN const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<ViSurfaceCreateInfoNN const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::ViSurfaceCreateInfoNN const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 ViSurfaceCreateInfoNN & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 ViSurfaceCreateInfoNN & setFlags( ViSurfaceCreateFlagsNN flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 ViSurfaceCreateInfoNN & setFlags( VULKAN_HPP_NAMESPACE::ViSurfaceCreateFlagsNN flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -158725,7 +115486,7 @@ namespace VULKAN_HPP_NAMESPACE
       window = window_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkViSurfaceCreateInfoNN const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158737,18 +115498,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkViSurfaceCreateInfoNN *>( this );
     }
 
-    operator VkViSurfaceCreateInfoNN const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkViSurfaceCreateInfoNN *>( this );
-    }
-
-    operator VkViSurfaceCreateInfoNN *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkViSurfaceCreateInfoNN *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ViSurfaceCreateFlagsNN const &, void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::ViSurfaceCreateFlagsNN const &, void * const &>
+#    endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, window );
     }
@@ -158773,20 +115529,12 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType          sType  = StructureType::eViSurfaceCreateInfoNN;
-    const void *           pNext  = {};
-    ViSurfaceCreateFlagsNN flags  = {};
-    void *                 window = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType  = StructureType::eViSurfaceCreateInfoNN;
+    const void *                                 pNext  = {};
+    VULKAN_HPP_NAMESPACE::ViSurfaceCreateFlagsNN flags  = {};
+    void *                                       window = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkViSurfaceCreateInfoNN>
-  {
-    using Type = ViSurfaceCreateInfoNN;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eViSurfaceCreateInfoNN>
   {
@@ -158794,7 +115542,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
-  // wrapper struct for struct VkVideoPictureResourceInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoPictureResourceInfoKHR.html
   struct VideoPictureResourceInfoKHR
   {
     using NativeType = VkVideoPictureResourceInfoKHR;
@@ -158802,17 +115549,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoPictureResourceInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoPictureResourceInfoKHR( Offset2D     codedOffset_      = {},
-                                                      Extent2D     codedExtent_      = {},
-                                                      uint32_t     baseArrayLayer_   = {},
-                                                      ImageView    imageViewBinding_ = {},
-                                                      const void * pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , codedOffset{ codedOffset_ }
-      , codedExtent{ codedExtent_ }
-      , baseArrayLayer{ baseArrayLayer_ }
-      , imageViewBinding{ imageViewBinding_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoPictureResourceInfoKHR( VULKAN_HPP_NAMESPACE::Offset2D  codedOffset_      = {},
+                                                      VULKAN_HPP_NAMESPACE::Extent2D  codedExtent_      = {},
+                                                      uint32_t                        baseArrayLayer_   = {},
+                                                      VULKAN_HPP_NAMESPACE::ImageView imageViewBinding_ = {},
+                                                      const void *                    pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , codedOffset( codedOffset_ )
+      , codedExtent( codedExtent_ )
+      , baseArrayLayer( baseArrayLayer_ )
+      , imageViewBinding( imageViewBinding_ )
     {
     }
 
@@ -158824,28 +115571,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoPictureResourceInfoKHR & operator=( VideoPictureResourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoPictureResourceInfoKHR & operator=( VkVideoPictureResourceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoPictureResourceInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setCodedOffset( Offset2D const & codedOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setCodedOffset( VULKAN_HPP_NAMESPACE::Offset2D const & codedOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       codedOffset = codedOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setCodedExtent( Extent2D const & codedExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setCodedExtent( VULKAN_HPP_NAMESPACE::Extent2D const & codedExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       codedExtent = codedExtent_;
       return *this;
@@ -158857,12 +115604,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setImageViewBinding( ImageView imageViewBinding_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoPictureResourceInfoKHR & setImageViewBinding( VULKAN_HPP_NAMESPACE::ImageView imageViewBinding_ ) VULKAN_HPP_NOEXCEPT
     {
       imageViewBinding = imageViewBinding_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoPictureResourceInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158874,18 +115621,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoPictureResourceInfoKHR *>( this );
     }
 
-    operator VkVideoPictureResourceInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoPictureResourceInfoKHR *>( this );
-    }
-
-    operator VkVideoPictureResourceInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoPictureResourceInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Offset2D const &, Extent2D const &, uint32_t const &, ImageView const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Offset2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               uint32_t const &,
+               VULKAN_HPP_NAMESPACE::ImageView const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, codedOffset, codedExtent, baseArrayLayer, imageViewBinding );
@@ -158912,29 +115658,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType            = StructureType::eVideoPictureResourceInfoKHR;
-    const void *  pNext            = {};
-    Offset2D      codedOffset      = {};
-    Extent2D      codedExtent      = {};
-    uint32_t      baseArrayLayer   = {};
-    ImageView     imageViewBinding = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eVideoPictureResourceInfoKHR;
+    const void *                        pNext            = {};
+    VULKAN_HPP_NAMESPACE::Offset2D      codedOffset      = {};
+    VULKAN_HPP_NAMESPACE::Extent2D      codedExtent      = {};
+    uint32_t                            baseArrayLayer   = {};
+    VULKAN_HPP_NAMESPACE::ImageView     imageViewBinding = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoPictureResourceInfoKHR>
-  {
-    using Type = VideoPictureResourceInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoPictureResourceInfoKHR>
   {
     using Type = VideoPictureResourceInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoReferenceSlotInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoReferenceSlotInfoKHR.html
   struct VideoReferenceSlotInfoKHR
   {
     using NativeType = VkVideoReferenceSlotInfoKHR;
@@ -158942,13 +115679,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoReferenceSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoReferenceSlotInfoKHR( int32_t                             slotIndex_        = {},
-                                                    const VideoPictureResourceInfoKHR * pPictureResource_ = {},
-                                                    const void *                        pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , slotIndex{ slotIndex_ }
-      , pPictureResource{ pPictureResource_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoReferenceSlotInfoKHR( int32_t                                                   slotIndex_        = {},
+                                                    const VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR * pPictureResource_ = {},
+                                                    const void *                                              pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , slotIndex( slotIndex_ )
+      , pPictureResource( pPictureResource_ )
     {
     }
 
@@ -158960,15 +115697,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoReferenceSlotInfoKHR & operator=( VideoReferenceSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoReferenceSlotInfoKHR & operator=( VkVideoReferenceSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoReferenceSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoReferenceSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -158981,12 +115718,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoReferenceSlotInfoKHR & setPPictureResource( const VideoPictureResourceInfoKHR * pPictureResource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoReferenceSlotInfoKHR &
+      setPPictureResource( const VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR * pPictureResource_ ) VULKAN_HPP_NOEXCEPT
     {
       pPictureResource = pPictureResource_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoReferenceSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -158998,18 +115736,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoReferenceSlotInfoKHR *>( this );
     }
 
-    operator VkVideoReferenceSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoReferenceSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoReferenceSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoReferenceSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, int32_t const &, const VideoPictureResourceInfoKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               int32_t const &,
+               const VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, slotIndex, pPictureResource );
     }
@@ -159034,27 +115770,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                       sType            = StructureType::eVideoReferenceSlotInfoKHR;
-    const void *                        pNext            = {};
-    int32_t                             slotIndex        = {};
-    const VideoPictureResourceInfoKHR * pPictureResource = {};
+    VULKAN_HPP_NAMESPACE::StructureType                       sType            = StructureType::eVideoReferenceSlotInfoKHR;
+    const void *                                              pNext            = {};
+    int32_t                                                   slotIndex        = {};
+    const VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR * pPictureResource = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoReferenceSlotInfoKHR>
-  {
-    using Type = VideoReferenceSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoReferenceSlotInfoKHR>
   {
     using Type = VideoReferenceSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoBeginCodingInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoBeginCodingInfoKHR.html
   struct VideoBeginCodingInfoKHR
   {
     using NativeType = VkVideoBeginCodingInfoKHR;
@@ -159062,19 +115789,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoBeginCodingInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoBeginCodingInfoKHR( VideoBeginCodingFlagsKHR          flags_                  = {},
-                                                  VideoSessionKHR                   videoSession_           = {},
-                                                  VideoSessionParametersKHR         videoSessionParameters_ = {},
-                                                  uint32_t                          referenceSlotCount_     = {},
-                                                  const VideoReferenceSlotInfoKHR * pReferenceSlots_        = {},
-                                                  const void *                      pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , videoSession{ videoSession_ }
-      , videoSessionParameters{ videoSessionParameters_ }
-      , referenceSlotCount{ referenceSlotCount_ }
-      , pReferenceSlots{ pReferenceSlots_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoBeginCodingInfoKHR( VULKAN_HPP_NAMESPACE::VideoBeginCodingFlagsKHR          flags_                  = {},
+                                                  VULKAN_HPP_NAMESPACE::VideoSessionKHR                   videoSession_           = {},
+                                                  VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR         videoSessionParameters_ = {},
+                                                  uint32_t                                                referenceSlotCount_     = {},
+                                                  const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_        = {},
+                                                  const void *                                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , videoSession( videoSession_ )
+      , videoSessionParameters( videoSessionParameters_ )
+      , referenceSlotCount( referenceSlotCount_ )
+      , pReferenceSlots( pReferenceSlots_ )
     {
     }
 
@@ -159086,11 +115813,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoBeginCodingInfoKHR( VideoBeginCodingFlagsKHR                                         flags_,
-                             VideoSessionKHR                                                  videoSession_,
-                             VideoSessionParametersKHR                                        videoSessionParameters_,
-                             ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_,
-                             const void *                                                     pNext_ = nullptr )
+    VideoBeginCodingInfoKHR( VULKAN_HPP_NAMESPACE::VideoBeginCodingFlagsKHR  flags_,
+                             VULKAN_HPP_NAMESPACE::VideoSessionKHR           videoSession_,
+                             VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters_,
+                             VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_,
+                             const void *                                                                                                 pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , videoSession( videoSession_ )
@@ -159102,34 +115829,35 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoBeginCodingInfoKHR & operator=( VideoBeginCodingInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoBeginCodingInfoKHR & operator=( VkVideoBeginCodingInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoBeginCodingInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoBeginCodingInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setFlags( VideoBeginCodingFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoBeginCodingFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setVideoSession( VideoSessionKHR videoSession_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setVideoSession( VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession_ ) VULKAN_HPP_NOEXCEPT
     {
       videoSession = videoSession_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setVideoSessionParameters( VideoSessionParametersKHR videoSessionParameters_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR &
+      setVideoSessionParameters( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters_ ) VULKAN_HPP_NOEXCEPT
     {
       videoSessionParameters = videoSessionParameters_;
       return *this;
@@ -159141,21 +115869,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR & setPReferenceSlots( const VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoBeginCodingInfoKHR &
+      setPReferenceSlots( const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       pReferenceSlots = pReferenceSlots_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoBeginCodingInfoKHR & setReferenceSlots( ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VideoBeginCodingInfoKHR & setReferenceSlots(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       referenceSlotCount = static_cast<uint32_t>( referenceSlots_.size() );
       pReferenceSlots    = referenceSlots_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoBeginCodingInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -159167,24 +115897,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoBeginCodingInfoKHR *>( this );
     }
 
-    operator VkVideoBeginCodingInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoBeginCodingInfoKHR *>( this );
-    }
-
-    operator VkVideoBeginCodingInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoBeginCodingInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoBeginCodingFlagsKHR const &,
-               VideoSessionKHR const &,
-               VideoSessionParametersKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoBeginCodingFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoSessionKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const &,
                uint32_t const &,
-               const VideoReferenceSlotInfoKHR * const &>
+               const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, videoSession, videoSessionParameters, referenceSlotCount, pReferenceSlots );
@@ -159212,30 +115936,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType                  = StructureType::eVideoBeginCodingInfoKHR;
-    const void *                      pNext                  = {};
-    VideoBeginCodingFlagsKHR          flags                  = {};
-    VideoSessionKHR                   videoSession           = {};
-    VideoSessionParametersKHR         videoSessionParameters = {};
-    uint32_t                          referenceSlotCount     = {};
-    const VideoReferenceSlotInfoKHR * pReferenceSlots        = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                  = StructureType::eVideoBeginCodingInfoKHR;
+    const void *                                            pNext                  = {};
+    VULKAN_HPP_NAMESPACE::VideoBeginCodingFlagsKHR          flags                  = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionKHR                   videoSession           = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR         videoSessionParameters = {};
+    uint32_t                                                referenceSlotCount     = {};
+    const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots        = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoBeginCodingInfoKHR>
-  {
-    using Type = VideoBeginCodingInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoBeginCodingInfoKHR>
   {
     using Type = VideoBeginCodingInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoCapabilitiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCapabilitiesKHR.html
   struct VideoCapabilitiesKHR
   {
     using NativeType = VkVideoCapabilitiesKHR;
@@ -159243,27 +115958,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 VideoCapabilitiesKHR( VideoCapabilityFlagsKHR flags_                             = {},
-                                                  DeviceSize              minBitstreamBufferOffsetAlignment_ = {},
-                                                  DeviceSize              minBitstreamBufferSizeAlignment_   = {},
-                                                  Extent2D                pictureAccessGranularity_          = {},
-                                                  Extent2D                minCodedExtent_                    = {},
-                                                  Extent2D                maxCodedExtent_                    = {},
-                                                  uint32_t                maxDpbSlots_                       = {},
-                                                  uint32_t                maxActiveReferencePictures_        = {},
-                                                  ExtensionProperties     stdHeaderVersion_                  = {},
-                                                  void *                  pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , minBitstreamBufferOffsetAlignment{ minBitstreamBufferOffsetAlignment_ }
-      , minBitstreamBufferSizeAlignment{ minBitstreamBufferSizeAlignment_ }
-      , pictureAccessGranularity{ pictureAccessGranularity_ }
-      , minCodedExtent{ minCodedExtent_ }
-      , maxCodedExtent{ maxCodedExtent_ }
-      , maxDpbSlots{ maxDpbSlots_ }
-      , maxActiveReferencePictures{ maxActiveReferencePictures_ }
-      , stdHeaderVersion{ stdHeaderVersion_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 VideoCapabilitiesKHR( VULKAN_HPP_NAMESPACE::VideoCapabilityFlagsKHR flags_                             = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize              minBitstreamBufferOffsetAlignment_ = {},
+                                                  VULKAN_HPP_NAMESPACE::DeviceSize              minBitstreamBufferSizeAlignment_   = {},
+                                                  VULKAN_HPP_NAMESPACE::Extent2D                pictureAccessGranularity_          = {},
+                                                  VULKAN_HPP_NAMESPACE::Extent2D                minCodedExtent_                    = {},
+                                                  VULKAN_HPP_NAMESPACE::Extent2D                maxCodedExtent_                    = {},
+                                                  uint32_t                                      maxDpbSlots_                       = {},
+                                                  uint32_t                                      maxActiveReferencePictures_        = {},
+                                                  VULKAN_HPP_NAMESPACE::ExtensionProperties     stdHeaderVersion_                  = {},
+                                                  void *                                        pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , minBitstreamBufferOffsetAlignment( minBitstreamBufferOffsetAlignment_ )
+      , minBitstreamBufferSizeAlignment( minBitstreamBufferSizeAlignment_ )
+      , pictureAccessGranularity( pictureAccessGranularity_ )
+      , minCodedExtent( minCodedExtent_ )
+      , maxCodedExtent( maxCodedExtent_ )
+      , maxDpbSlots( maxDpbSlots_ )
+      , maxActiveReferencePictures( maxActiveReferencePictures_ )
+      , stdHeaderVersion( stdHeaderVersion_ )
     {
     }
 
@@ -159275,11 +115990,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoCapabilitiesKHR & operator=( VideoCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoCapabilitiesKHR & operator=( VkVideoCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -159293,28 +116008,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoCapabilitiesKHR *>( this );
     }
 
-    operator VkVideoCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoCapabilityFlagsKHR const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               Extent2D const &,
-               Extent2D const &,
-               Extent2D const &,
+               VULKAN_HPP_NAMESPACE::VideoCapabilityFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
                uint32_t const &,
                uint32_t const &,
-               ExtensionProperties const &>
+               VULKAN_HPP_NAMESPACE::ExtensionProperties const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -159354,34 +116063,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType           sType                             = StructureType::eVideoCapabilitiesKHR;
-    void *                  pNext                             = {};
-    VideoCapabilityFlagsKHR flags                             = {};
-    DeviceSize              minBitstreamBufferOffsetAlignment = {};
-    DeviceSize              minBitstreamBufferSizeAlignment   = {};
-    Extent2D                pictureAccessGranularity          = {};
-    Extent2D                minCodedExtent                    = {};
-    Extent2D                maxCodedExtent                    = {};
-    uint32_t                maxDpbSlots                       = {};
-    uint32_t                maxActiveReferencePictures        = {};
-    ExtensionProperties     stdHeaderVersion                  = {};
+    VULKAN_HPP_NAMESPACE::StructureType           sType                             = StructureType::eVideoCapabilitiesKHR;
+    void *                                        pNext                             = {};
+    VULKAN_HPP_NAMESPACE::VideoCapabilityFlagsKHR flags                             = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize              minBitstreamBufferOffsetAlignment = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize              minBitstreamBufferSizeAlignment   = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                pictureAccessGranularity          = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                minCodedExtent                    = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                maxCodedExtent                    = {};
+    uint32_t                                      maxDpbSlots                       = {};
+    uint32_t                                      maxActiveReferencePictures        = {};
+    VULKAN_HPP_NAMESPACE::ExtensionProperties     stdHeaderVersion                  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoCapabilitiesKHR>
-  {
-    using Type = VideoCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoCapabilitiesKHR>
   {
     using Type = VideoCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoCodingControlInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoCodingControlInfoKHR.html
   struct VideoCodingControlInfoKHR
   {
     using NativeType = VkVideoCodingControlInfoKHR;
@@ -159389,10 +116089,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoCodingControlInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoCodingControlInfoKHR( VideoCodingControlFlagsKHR flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoCodingControlInfoKHR( VULKAN_HPP_NAMESPACE::VideoCodingControlFlagsKHR flags_ = {},
+                                                    const void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -159404,27 +116105,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoCodingControlInfoKHR & operator=( VideoCodingControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoCodingControlInfoKHR & operator=( VkVideoCodingControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoCodingControlInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoCodingControlInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoCodingControlInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoCodingControlInfoKHR & setFlags( VideoCodingControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoCodingControlInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoCodingControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoCodingControlInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -159436,18 +116137,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoCodingControlInfoKHR *>( this );
     }
 
-    operator VkVideoCodingControlInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoCodingControlInfoKHR *>( this );
-    }
-
-    operator VkVideoCodingControlInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoCodingControlInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoCodingControlFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::VideoCodingControlFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -159472,27 +116168,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType = StructureType::eVideoCodingControlInfoKHR;
-    const void *               pNext = {};
-    VideoCodingControlFlagsKHR flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType = StructureType::eVideoCodingControlInfoKHR;
+    const void *                                     pNext = {};
+    VULKAN_HPP_NAMESPACE::VideoCodingControlFlagsKHR flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoCodingControlInfoKHR>
-  {
-    using Type = VideoCodingControlInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoCodingControlInfoKHR>
   {
     using Type = VideoCodingControlInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeAV1CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1CapabilitiesKHR.html
   struct VideoDecodeAV1CapabilitiesKHR
   {
     using NativeType = VkVideoDecodeAV1CapabilitiesKHR;
@@ -159500,10 +116186,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1CapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeAV1CapabilitiesKHR( StdVideoAV1Level maxLevel_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxLevel{ maxLevel_ }
+      : pNext( pNext_ )
+      , maxLevel( maxLevel_ )
     {
     }
 
@@ -159515,11 +116201,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeAV1CapabilitiesKHR & operator=( VideoDecodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeAV1CapabilitiesKHR & operator=( VkVideoDecodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeAV1CapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeAV1CapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -159533,18 +116219,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeAV1CapabilitiesKHR *>( this );
     }
 
-    operator VkVideoDecodeAV1CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1CapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, StdVideoAV1Level const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, StdVideoAV1Level const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxLevel );
     }
@@ -159575,26 +116256,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType    sType    = StructureType::eVideoDecodeAv1CapabilitiesKHR;
-    void *           pNext    = {};
-    StdVideoAV1Level maxLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eVideoDecodeAv1CapabilitiesKHR;
+    void *                              pNext    = {};
+    StdVideoAV1Level                    maxLevel = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1CapabilitiesKHR>
-  {
-    using Type = VideoDecodeAV1CapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeAv1CapabilitiesKHR>
   {
     using Type = VideoDecodeAV1CapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeAV1DpbSlotInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1DpbSlotInfoKHR.html
   struct VideoDecodeAV1DpbSlotInfoKHR
   {
     using NativeType = VkVideoDecodeAV1DpbSlotInfoKHR;
@@ -159602,11 +116274,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1DpbSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeAV1DpbSlotInfoKHR( const StdVideoDecodeAV1ReferenceInfo * pStdReferenceInfo_ = {},
                                                        const void *                           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
+      : pNext( pNext_ )
+      , pStdReferenceInfo( pStdReferenceInfo_ )
     {
     }
 
@@ -159618,15 +116290,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeAV1DpbSlotInfoKHR & operator=( VideoDecodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeAV1DpbSlotInfoKHR & operator=( VkVideoDecodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeAV1DpbSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeAV1DpbSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -159638,7 +116310,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdReferenceInfo = pStdReferenceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeAV1DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -159650,18 +116322,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeAV1DpbSlotInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeAV1DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1DpbSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoDecodeAV1ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoDecodeAV1ReferenceInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdReferenceInfo );
     }
@@ -159686,139 +116353,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                          sType             = StructureType::eVideoDecodeAv1DpbSlotInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType    sType             = StructureType::eVideoDecodeAv1DpbSlotInfoKHR;
     const void *                           pNext             = {};
     const StdVideoDecodeAV1ReferenceInfo * pStdReferenceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1DpbSlotInfoKHR>
-  {
-    using Type = VideoDecodeAV1DpbSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeAv1DpbSlotInfoKHR>
   {
     using Type = VideoDecodeAV1DpbSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeAV1InlineSessionParametersInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1InlineSessionParametersInfoKHR.html
-  struct VideoDecodeAV1InlineSessionParametersInfoKHR
-  {
-    using NativeType = VkVideoDecodeAV1InlineSessionParametersInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1InlineSessionParametersInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeAV1InlineSessionParametersInfoKHR( const StdVideoAV1SequenceHeader * pStdSequenceHeader_ = {},
-                                                                       const void *                      pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdSequenceHeader{ pStdSequenceHeader_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoDecodeAV1InlineSessionParametersInfoKHR( VideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeAV1InlineSessionParametersInfoKHR( VkVideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeAV1InlineSessionParametersInfoKHR( *reinterpret_cast<VideoDecodeAV1InlineSessionParametersInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeAV1InlineSessionParametersInfoKHR & operator=( VideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeAV1InlineSessionParametersInfoKHR & operator=( VkVideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeAV1InlineSessionParametersInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1InlineSessionParametersInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1InlineSessionParametersInfoKHR &
-      setPStdSequenceHeader( const StdVideoAV1SequenceHeader * pStdSequenceHeader_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdSequenceHeader = pStdSequenceHeader_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoDecodeAV1InlineSessionParametersInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeAV1InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1InlineSessionParametersInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeAV1InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1InlineSessionParametersInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1InlineSessionParametersInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1InlineSessionParametersInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoAV1SequenceHeader * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdSequenceHeader );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoDecodeAV1InlineSessionParametersInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdSequenceHeader == rhs.pStdSequenceHeader );
-#  endif
-    }
-
-    bool operator!=( VideoDecodeAV1InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType              = StructureType::eVideoDecodeAv1InlineSessionParametersInfoKHR;
-    const void *                      pNext              = {};
-    const StdVideoAV1SequenceHeader * pStdSequenceHeader = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeAV1InlineSessionParametersInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeAv1InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeAV1InlineSessionParametersInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoDecodeAV1PictureInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1PictureInfoKHR.html
   struct VideoDecodeAV1PictureInfoKHR
   {
     using NativeType = VkVideoDecodeAV1PictureInfoKHR;
@@ -159826,7 +116371,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1PictureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1PictureInfoKHR( const StdVideoDecodeAV1PictureInfo *                                   pStdPictureInfo_          = {},
                                                           std::array<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const & referenceNameSlotIndices_ = {},
                                                           uint32_t                                                               frameHeaderOffset_        = {},
@@ -159834,13 +116379,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                           const uint32_t *                                                       pTileOffsets_             = {},
                                                           const uint32_t *                                                       pTileSizes_               = {},
                                                           const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , referenceNameSlotIndices{ referenceNameSlotIndices_ }
-      , frameHeaderOffset{ frameHeaderOffset_ }
-      , tileCount{ tileCount_ }
-      , pTileOffsets{ pTileOffsets_ }
-      , pTileSizes{ pTileSizes_ }
+      : pNext( pNext_ )
+      , pStdPictureInfo( pStdPictureInfo_ )
+      , referenceNameSlotIndices( referenceNameSlotIndices_ )
+      , frameHeaderOffset( frameHeaderOffset_ )
+      , tileCount( tileCount_ )
+      , pTileOffsets( pTileOffsets_ )
+      , pTileSizes( pTileSizes_ )
     {
     }
 
@@ -159855,8 +116400,8 @@ namespace VULKAN_HPP_NAMESPACE
     VideoDecodeAV1PictureInfoKHR( const StdVideoDecodeAV1PictureInfo *                                   pStdPictureInfo_,
                                   std::array<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const & referenceNameSlotIndices_,
                                   uint32_t                                                               frameHeaderOffset_,
-                                  ArrayProxyNoTemporaries<const uint32_t> const &                        tileOffsets_,
-                                  ArrayProxyNoTemporaries<const uint32_t> const &                        tileSizes_ = {},
+                                  VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &  tileOffsets_,
+                                  VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &  tileSizes_ = {},
                                   const void *                                                           pNext_     = nullptr )
       : pNext( pNext_ )
       , pStdPictureInfo( pStdPictureInfo_ )
@@ -159879,15 +116424,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeAV1PictureInfoKHR & operator=( VideoDecodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeAV1PictureInfoKHR & operator=( VkVideoDecodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeAV1PictureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeAV1PictureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -159926,7 +116471,7 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeAV1PictureInfoKHR & setTileOffsets( ArrayProxyNoTemporaries<const uint32_t> const & tileOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeAV1PictureInfoKHR & setTileOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & tileOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       tileCount    = static_cast<uint32_t>( tileOffsets_.size() );
       pTileOffsets = tileOffsets_.data();
@@ -159941,14 +116486,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeAV1PictureInfoKHR & setTileSizes( ArrayProxyNoTemporaries<const uint32_t> const & tileSizes_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeAV1PictureInfoKHR & setTileSizes( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & tileSizes_ ) VULKAN_HPP_NOEXCEPT
     {
       tileCount  = static_cast<uint32_t>( tileSizes_.size() );
       pTileSizes = tileSizes_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeAV1PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -159960,25 +116505,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeAV1PictureInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeAV1PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1PictureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                const StdVideoDecodeAV1PictureInfo * const &,
-               ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const &,
+               VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const &,
                uint32_t const &,
                uint32_t const &,
                const uint32_t * const &,
                const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdPictureInfo, referenceNameSlotIndices, frameHeaderOffset, tileCount, pTileOffsets, pTileSizes );
@@ -160006,31 +116545,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                                      sType                    = StructureType::eVideoDecodeAv1PictureInfoKHR;
-    const void *                                                       pNext                    = {};
-    const StdVideoDecodeAV1PictureInfo *                               pStdPictureInfo          = {};
-    ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices = {};
-    uint32_t                                                           frameHeaderOffset        = {};
-    uint32_t                                                           tileCount                = {};
-    const uint32_t *                                                   pTileOffsets             = {};
-    const uint32_t *                                                   pTileSizes               = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                                      sType           = StructureType::eVideoDecodeAv1PictureInfoKHR;
+    const void *                                                                             pNext           = {};
+    const StdVideoDecodeAV1PictureInfo *                                                     pStdPictureInfo = {};
+    VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices = {};
+    uint32_t                                                                                 frameHeaderOffset        = {};
+    uint32_t                                                                                 tileCount                = {};
+    const uint32_t *                                                                         pTileOffsets             = {};
+    const uint32_t *                                                                         pTileSizes               = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1PictureInfoKHR>
-  {
-    using Type = VideoDecodeAV1PictureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeAv1PictureInfoKHR>
   {
     using Type = VideoDecodeAV1PictureInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeAV1ProfileInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1ProfileInfoKHR.html
   struct VideoDecodeAV1ProfileInfoKHR
   {
     using NativeType = VkVideoDecodeAV1ProfileInfoKHR;
@@ -160038,12 +116568,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1ProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoDecodeAV1ProfileInfoKHR( StdVideoAV1Profile stdProfile_ = {}, Bool32 filmGrainSupport_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfile{ stdProfile_ }
-      , filmGrainSupport{ filmGrainSupport_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeAV1ProfileInfoKHR( StdVideoAV1Profile           stdProfile_       = {},
+                                                       VULKAN_HPP_NAMESPACE::Bool32 filmGrainSupport_ = {},
+                                                       const void *                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stdProfile( stdProfile_ )
+      , filmGrainSupport( filmGrainSupport_ )
     {
     }
 
@@ -160055,15 +116586,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeAV1ProfileInfoKHR & operator=( VideoDecodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeAV1ProfileInfoKHR & operator=( VkVideoDecodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeAV1ProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeAV1ProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -160076,12 +116607,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1ProfileInfoKHR & setFilmGrainSupport( Bool32 filmGrainSupport_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1ProfileInfoKHR & setFilmGrainSupport( VULKAN_HPP_NAMESPACE::Bool32 filmGrainSupport_ ) VULKAN_HPP_NOEXCEPT
     {
       filmGrainSupport = filmGrainSupport_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeAV1ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -160093,18 +116624,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeAV1ProfileInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeAV1ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1ProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoAV1Profile const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, StdVideoAV1Profile const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdProfile, filmGrainSupport );
     }
@@ -160138,28 +116664,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType      sType            = StructureType::eVideoDecodeAv1ProfileInfoKHR;
-    const void *       pNext            = {};
-    StdVideoAV1Profile stdProfile       = {};
-    Bool32             filmGrainSupport = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType            = StructureType::eVideoDecodeAv1ProfileInfoKHR;
+    const void *                        pNext            = {};
+    StdVideoAV1Profile                  stdProfile       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        filmGrainSupport = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1ProfileInfoKHR>
-  {
-    using Type = VideoDecodeAV1ProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeAv1ProfileInfoKHR>
   {
     using Type = VideoDecodeAV1ProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeAV1SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeAV1SessionParametersCreateInfoKHR.html
   struct VideoDecodeAV1SessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoDecodeAV1SessionParametersCreateInfoKHR;
@@ -160167,11 +116683,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeAV1SessionParametersCreateInfoKHR( const StdVideoAV1SequenceHeader * pStdSequenceHeader_ = {},
                                                                        const void *                      pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdSequenceHeader{ pStdSequenceHeader_ }
+      : pNext( pNext_ )
+      , pStdSequenceHeader( pStdSequenceHeader_ )
     {
     }
 
@@ -160183,15 +116699,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeAV1SessionParametersCreateInfoKHR & operator=( VideoDecodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeAV1SessionParametersCreateInfoKHR & operator=( VkVideoDecodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeAV1SessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeAV1SessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeAV1SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -160204,7 +116720,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdSequenceHeader = pStdSequenceHeader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeAV1SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -160216,18 +116732,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeAV1SessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeAV1SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeAV1SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoAV1SequenceHeader * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoAV1SequenceHeader * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdSequenceHeader );
     }
@@ -160252,26 +116763,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType              = StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR;
-    const void *                      pNext              = {};
-    const StdVideoAV1SequenceHeader * pStdSequenceHeader = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR;
+    const void *                        pNext              = {};
+    const StdVideoAV1SequenceHeader *   pStdSequenceHeader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeAV1SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoDecodeAV1SessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR>
   {
     using Type = VideoDecodeAV1SessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeCapabilitiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeCapabilitiesKHR.html
   struct VideoDecodeCapabilitiesKHR
   {
     using NativeType = VkVideoDecodeCapabilitiesKHR;
@@ -160279,10 +116781,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeCapabilitiesKHR( VideoDecodeCapabilityFlagsKHR flags_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeCapabilitiesKHR( VULKAN_HPP_NAMESPACE::VideoDecodeCapabilityFlagsKHR flags_ = {},
+                                                     void *                                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -160294,11 +116797,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeCapabilitiesKHR & operator=( VideoDecodeCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeCapabilitiesKHR & operator=( VkVideoDecodeCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -160312,18 +116815,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeCapabilitiesKHR *>( this );
     }
 
-    operator VkVideoDecodeCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, VideoDecodeCapabilityFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::VideoDecodeCapabilityFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -160348,27 +116846,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                 sType = StructureType::eVideoDecodeCapabilitiesKHR;
-    void *                        pNext = {};
-    VideoDecodeCapabilityFlagsKHR flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType                 sType = StructureType::eVideoDecodeCapabilitiesKHR;
+    void *                                              pNext = {};
+    VULKAN_HPP_NAMESPACE::VideoDecodeCapabilityFlagsKHR flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeCapabilitiesKHR>
-  {
-    using Type = VideoDecodeCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeCapabilitiesKHR>
   {
     using Type = VideoDecodeCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264CapabilitiesKHR.html
   struct VideoDecodeH264CapabilitiesKHR
   {
     using NativeType = VkVideoDecodeH264CapabilitiesKHR;
@@ -160376,13 +116864,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264CapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH264CapabilitiesKHR( StdVideoH264LevelIdc maxLevelIdc_            = {},
-                                                         Offset2D             fieldOffsetGranularity_ = {},
-                                                         void *               pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxLevelIdc{ maxLevelIdc_ }
-      , fieldOffsetGranularity{ fieldOffsetGranularity_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeH264CapabilitiesKHR( StdVideoH264LevelIdc           maxLevelIdc_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Offset2D fieldOffsetGranularity_ = {},
+                                                         void *                         pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxLevelIdc( maxLevelIdc_ )
+      , fieldOffsetGranularity( fieldOffsetGranularity_ )
     {
     }
 
@@ -160394,11 +116882,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH264CapabilitiesKHR & operator=( VideoDecodeH264CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264CapabilitiesKHR & operator=( VkVideoDecodeH264CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264CapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264CapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -160412,18 +116900,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264CapabilitiesKHR *>( this );
     }
 
-    operator VkVideoDecodeH264CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264CapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, StdVideoH264LevelIdc const &, Offset2D const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, StdVideoH264LevelIdc const &, VULKAN_HPP_NAMESPACE::Offset2D const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxLevelIdc, fieldOffsetGranularity );
     }
@@ -160457,28 +116940,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType        sType                  = StructureType::eVideoDecodeH264CapabilitiesKHR;
-    void *               pNext                  = {};
-    StdVideoH264LevelIdc maxLevelIdc            = {};
-    Offset2D             fieldOffsetGranularity = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                  = StructureType::eVideoDecodeH264CapabilitiesKHR;
+    void *                              pNext                  = {};
+    StdVideoH264LevelIdc                maxLevelIdc            = {};
+    VULKAN_HPP_NAMESPACE::Offset2D      fieldOffsetGranularity = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264CapabilitiesKHR>
-  {
-    using Type = VideoDecodeH264CapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264CapabilitiesKHR>
   {
     using Type = VideoDecodeH264CapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264DpbSlotInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264DpbSlotInfoKHR.html
   struct VideoDecodeH264DpbSlotInfoKHR
   {
     using NativeType = VkVideoDecodeH264DpbSlotInfoKHR;
@@ -160486,11 +116959,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264DpbSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH264DpbSlotInfoKHR( const StdVideoDecodeH264ReferenceInfo * pStdReferenceInfo_ = {},
                                                         const void *                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
+      : pNext( pNext_ )
+      , pStdReferenceInfo( pStdReferenceInfo_ )
     {
     }
 
@@ -160502,15 +116975,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH264DpbSlotInfoKHR & operator=( VideoDecodeH264DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264DpbSlotInfoKHR & operator=( VkVideoDecodeH264DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264DpbSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264DpbSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -160523,7 +116996,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdReferenceInfo = pStdReferenceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH264DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -160535,18 +117008,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264DpbSlotInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH264DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264DpbSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoDecodeH264ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoDecodeH264ReferenceInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdReferenceInfo );
     }
@@ -160571,150 +117039,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType             = StructureType::eVideoDecodeH264DpbSlotInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::eVideoDecodeH264DpbSlotInfoKHR;
     const void *                            pNext             = {};
     const StdVideoDecodeH264ReferenceInfo * pStdReferenceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264DpbSlotInfoKHR>
-  {
-    using Type = VideoDecodeH264DpbSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264DpbSlotInfoKHR>
   {
     using Type = VideoDecodeH264DpbSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264InlineSessionParametersInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264InlineSessionParametersInfoKHR.html
-  struct VideoDecodeH264InlineSessionParametersInfoKHR
-  {
-    using NativeType = VkVideoDecodeH264InlineSessionParametersInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264InlineSessionParametersInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH264InlineSessionParametersInfoKHR( const StdVideoH264SequenceParameterSet * pStdSPS_ = {},
-                                                                        const StdVideoH264PictureParameterSet *  pStdPPS_ = {},
-                                                                        const void *                             pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdSPS{ pStdSPS_ }
-      , pStdPPS{ pStdPPS_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      VideoDecodeH264InlineSessionParametersInfoKHR( VideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeH264InlineSessionParametersInfoKHR( VkVideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeH264InlineSessionParametersInfoKHR( *reinterpret_cast<VideoDecodeH264InlineSessionParametersInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeH264InlineSessionParametersInfoKHR & operator=( VideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeH264InlineSessionParametersInfoKHR & operator=( VkVideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeH264InlineSessionParametersInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264InlineSessionParametersInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264InlineSessionParametersInfoKHR & setPStdSPS( const StdVideoH264SequenceParameterSet * pStdSPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdSPS = pStdSPS_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264InlineSessionParametersInfoKHR & setPStdPPS( const StdVideoH264PictureParameterSet * pStdPPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdPPS = pStdPPS_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoDecodeH264InlineSessionParametersInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeH264InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264InlineSessionParametersInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeH264InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264InlineSessionParametersInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264InlineSessionParametersInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264InlineSessionParametersInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoH264SequenceParameterSet * const &, const StdVideoH264PictureParameterSet * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdSPS, pStdPPS );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoDecodeH264InlineSessionParametersInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdSPS == rhs.pStdSPS ) && ( pStdPPS == rhs.pStdPPS );
-#  endif
-    }
-
-    bool operator!=( VideoDecodeH264InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                            sType   = StructureType::eVideoDecodeH264InlineSessionParametersInfoKHR;
-    const void *                             pNext   = {};
-    const StdVideoH264SequenceParameterSet * pStdSPS = {};
-    const StdVideoH264PictureParameterSet *  pStdPPS = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeH264InlineSessionParametersInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeH264InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeH264InlineSessionParametersInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoDecodeH264PictureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264PictureInfoKHR.html
   struct VideoDecodeH264PictureInfoKHR
   {
     using NativeType = VkVideoDecodeH264PictureInfoKHR;
@@ -160722,15 +117057,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264PictureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH264PictureInfoKHR( const StdVideoDecodeH264PictureInfo * pStdPictureInfo_ = {},
                                                         uint32_t                              sliceCount_      = {},
                                                         const uint32_t *                      pSliceOffsets_   = {},
                                                         const void *                          pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , sliceCount{ sliceCount_ }
-      , pSliceOffsets{ pSliceOffsets_ }
+      : pNext( pNext_ )
+      , pStdPictureInfo( pStdPictureInfo_ )
+      , sliceCount( sliceCount_ )
+      , pSliceOffsets( pSliceOffsets_ )
     {
     }
 
@@ -160742,24 +117077,24 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH264PictureInfoKHR( const StdVideoDecodeH264PictureInfo *           pStdPictureInfo_,
-                                   ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_,
-                                   const void *                                    pNext_ = nullptr )
+    VideoDecodeH264PictureInfoKHR( const StdVideoDecodeH264PictureInfo *                                 pStdPictureInfo_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_,
+                                   const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ ), pStdPictureInfo( pStdPictureInfo_ ), sliceCount( static_cast<uint32_t>( sliceOffsets_.size() ) ), pSliceOffsets( sliceOffsets_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeH264PictureInfoKHR & operator=( VideoDecodeH264PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264PictureInfoKHR & operator=( VkVideoDecodeH264PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264PictureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -160785,14 +117120,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH264PictureInfoKHR & setSliceOffsets( ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeH264PictureInfoKHR & setSliceOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       sliceCount    = static_cast<uint32_t>( sliceOffsets_.size() );
       pSliceOffsets = sliceOffsets_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH264PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -160804,18 +117139,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264PictureInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH264PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264PictureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoDecodeH264PictureInfo * const &, uint32_t const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const StdVideoDecodeH264PictureInfo * const &,
+               uint32_t const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdPictureInfo, sliceCount, pSliceOffsets );
@@ -160842,29 +117175,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType           = StructureType::eVideoDecodeH264PictureInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType   sType           = StructureType::eVideoDecodeH264PictureInfoKHR;
     const void *                          pNext           = {};
     const StdVideoDecodeH264PictureInfo * pStdPictureInfo = {};
     uint32_t                              sliceCount      = {};
     const uint32_t *                      pSliceOffsets   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264PictureInfoKHR>
-  {
-    using Type = VideoDecodeH264PictureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264PictureInfoKHR>
   {
     using Type = VideoDecodeH264PictureInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264ProfileInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264ProfileInfoKHR.html
   struct VideoDecodeH264ProfileInfoKHR
   {
     using NativeType = VkVideoDecodeH264ProfileInfoKHR;
@@ -160872,14 +117195,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264ProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoDecodeH264ProfileInfoKHR( StdVideoH264ProfileIdc                  stdProfileIdc_ = {},
-                                     VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout_ = VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive,
-                                     const void *                            pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfileIdc{ stdProfileIdc_ }
-      , pictureLayout{ pictureLayout_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeH264ProfileInfoKHR( StdVideoH264ProfileIdc                                        stdProfileIdc_ = {},
+                                                        VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout_ =
+                                                          VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive,
+                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , stdProfileIdc( stdProfileIdc_ )
+      , pictureLayout( pictureLayout_ )
     {
     }
 
@@ -160891,15 +117214,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH264ProfileInfoKHR & operator=( VideoDecodeH264ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264ProfileInfoKHR & operator=( VkVideoDecodeH264ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264ProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264ProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -160912,12 +117235,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264ProfileInfoKHR & setPictureLayout( VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264ProfileInfoKHR &
+      setPictureLayout( VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout_ ) VULKAN_HPP_NOEXCEPT
     {
       pictureLayout = pictureLayout_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH264ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -160929,18 +117253,15 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264ProfileInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH264ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264ProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoH264ProfileIdc const &, VideoDecodeH264PictureLayoutFlagBitsKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               StdVideoH264ProfileIdc const &,
+               VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdProfileIdc, pictureLayout );
@@ -160975,28 +117296,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                           sType         = StructureType::eVideoDecodeH264ProfileInfoKHR;
-    const void *                            pNext         = {};
-    StdVideoH264ProfileIdc                  stdProfileIdc = {};
-    VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout = VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive;
+    VULKAN_HPP_NAMESPACE::StructureType                           sType         = StructureType::eVideoDecodeH264ProfileInfoKHR;
+    const void *                                                  pNext         = {};
+    StdVideoH264ProfileIdc                                        stdProfileIdc = {};
+    VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR pictureLayout = VULKAN_HPP_NAMESPACE::VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264ProfileInfoKHR>
-  {
-    using Type = VideoDecodeH264ProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264ProfileInfoKHR>
   {
     using Type = VideoDecodeH264ProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264SessionParametersAddInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264SessionParametersAddInfoKHR.html
   struct VideoDecodeH264SessionParametersAddInfoKHR
   {
     using NativeType = VkVideoDecodeH264SessionParametersAddInfoKHR;
@@ -161004,17 +117315,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264SessionParametersAddInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH264SessionParametersAddInfoKHR( uint32_t                                 stdSPSCount_ = {},
                                                                      const StdVideoH264SequenceParameterSet * pStdSPSs_    = {},
                                                                      uint32_t                                 stdPPSCount_ = {},
                                                                      const StdVideoH264PictureParameterSet *  pStdPPSs_    = {},
                                                                      const void *                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdSPSCount{ stdSPSCount_ }
-      , pStdSPSs{ pStdSPSs_ }
-      , stdPPSCount{ stdPPSCount_ }
-      , pStdPPSs{ pStdPPSs_ }
+      : pNext( pNext_ )
+      , stdSPSCount( stdSPSCount_ )
+      , pStdSPSs( pStdSPSs_ )
+      , stdPPSCount( stdPPSCount_ )
+      , pStdPPSs( pStdPPSs_ )
     {
     }
 
@@ -161026,9 +117337,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH264SessionParametersAddInfoKHR( ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_,
-                                                ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const &  stdPPSs_ = {},
-                                                const void *                                                            pNext_   = nullptr )
+    VideoDecodeH264SessionParametersAddInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const &  stdPPSs_ = {},
+                                                const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , stdSPSCount( static_cast<uint32_t>( stdSPSs_.size() ) )
       , pStdSPSs( stdSPSs_.data() )
@@ -161039,15 +117350,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeH264SessionParametersAddInfoKHR & operator=( VideoDecodeH264SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264SessionParametersAddInfoKHR & operator=( VkVideoDecodeH264SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264SessionParametersAddInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264SessionParametersAddInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -161068,7 +117379,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoDecodeH264SessionParametersAddInfoKHR &
-      setStdSPSs( ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdSPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdSPSCount = static_cast<uint32_t>( stdSPSs_.size() );
       pStdSPSs    = stdSPSs_.data();
@@ -161090,14 +117401,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoDecodeH264SessionParametersAddInfoKHR &
-      setStdPPSs( ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdPPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdPPSCount = static_cast<uint32_t>( stdPPSs_.size() );
       pStdPPSs    = stdPPSs_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH264SessionParametersAddInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -161109,23 +117420,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264SessionParametersAddInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH264SessionParametersAddInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264SessionParametersAddInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264SessionParametersAddInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264SessionParametersAddInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const StdVideoH264SequenceParameterSet * const &,
                uint32_t const &,
                const StdVideoH264PictureParameterSet * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdSPSCount, pStdSPSs, stdPPSCount, pStdPPSs );
@@ -161152,7 +117457,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                            sType       = StructureType::eVideoDecodeH264SessionParametersAddInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType      sType       = StructureType::eVideoDecodeH264SessionParametersAddInfoKHR;
     const void *                             pNext       = {};
     uint32_t                                 stdSPSCount = {};
     const StdVideoH264SequenceParameterSet * pStdSPSs    = {};
@@ -161160,22 +117465,12 @@ namespace VULKAN_HPP_NAMESPACE
     const StdVideoH264PictureParameterSet *  pStdPPSs    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264SessionParametersAddInfoKHR>
-  {
-    using Type = VideoDecodeH264SessionParametersAddInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264SessionParametersAddInfoKHR>
   {
     using Type = VideoDecodeH264SessionParametersAddInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH264SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH264SessionParametersCreateInfoKHR.html
   struct VideoDecodeH264SessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoDecodeH264SessionParametersCreateInfoKHR;
@@ -161183,15 +117478,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH264SessionParametersCreateInfoKHR( uint32_t                                           maxStdSPSCount_     = {},
-                                                                        uint32_t                                           maxStdPPSCount_     = {},
-                                                                        const VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
-                                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxStdSPSCount{ maxStdSPSCount_ }
-      , maxStdPPSCount{ maxStdPPSCount_ }
-      , pParametersAddInfo{ pParametersAddInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      VideoDecodeH264SessionParametersCreateInfoKHR( uint32_t                                                                 maxStdSPSCount_     = {},
+                                                     uint32_t                                                                 maxStdPPSCount_     = {},
+                                                     const VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
+                                                     const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxStdSPSCount( maxStdSPSCount_ )
+      , maxStdPPSCount( maxStdPPSCount_ )
+      , pParametersAddInfo( pParametersAddInfo_ )
     {
     }
 
@@ -161204,15 +117500,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH264SessionParametersCreateInfoKHR & operator=( VideoDecodeH264SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH264SessionParametersCreateInfoKHR & operator=( VkVideoDecodeH264SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH264SessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -161232,12 +117528,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH264SessionParametersCreateInfoKHR &
-      setPParametersAddInfo( const VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
+      setPParametersAddInfo( const VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pParametersAddInfo = pParametersAddInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH264SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -161249,18 +117545,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH264SessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH264SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH264SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH264SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH264SessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const VideoDecodeH264SessionParametersAddInfoKHR * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxStdSPSCount, maxStdPPSCount, pParametersAddInfo );
@@ -161287,29 +117581,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                      sType              = StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR;
-    const void *                                       pNext              = {};
-    uint32_t                                           maxStdSPSCount     = {};
-    uint32_t                                           maxStdPPSCount     = {};
-    const VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                      sType              = StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR;
+    const void *                                                             pNext              = {};
+    uint32_t                                                                 maxStdSPSCount     = {};
+    uint32_t                                                                 maxStdPPSCount     = {};
+    const VULKAN_HPP_NAMESPACE::VideoDecodeH264SessionParametersAddInfoKHR * pParametersAddInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH264SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoDecodeH264SessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR>
   {
     using Type = VideoDecodeH264SessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265CapabilitiesKHR.html
   struct VideoDecodeH265CapabilitiesKHR
   {
     using NativeType = VkVideoDecodeH265CapabilitiesKHR;
@@ -161317,10 +117601,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265CapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH265CapabilitiesKHR( StdVideoH265LevelIdc maxLevelIdc_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxLevelIdc{ maxLevelIdc_ }
+      : pNext( pNext_ )
+      , maxLevelIdc( maxLevelIdc_ )
     {
     }
 
@@ -161332,11 +117616,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH265CapabilitiesKHR & operator=( VideoDecodeH265CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265CapabilitiesKHR & operator=( VkVideoDecodeH265CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265CapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265CapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -161350,18 +117634,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265CapabilitiesKHR *>( this );
     }
 
-    operator VkVideoDecodeH265CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265CapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, StdVideoH265LevelIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, StdVideoH265LevelIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxLevelIdc );
     }
@@ -161392,27 +117671,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType        sType       = StructureType::eVideoDecodeH265CapabilitiesKHR;
-    void *               pNext       = {};
-    StdVideoH265LevelIdc maxLevelIdc = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eVideoDecodeH265CapabilitiesKHR;
+    void *                              pNext       = {};
+    StdVideoH265LevelIdc                maxLevelIdc = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265CapabilitiesKHR>
-  {
-    using Type = VideoDecodeH265CapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265CapabilitiesKHR>
   {
     using Type = VideoDecodeH265CapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265DpbSlotInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265DpbSlotInfoKHR.html
   struct VideoDecodeH265DpbSlotInfoKHR
   {
     using NativeType = VkVideoDecodeH265DpbSlotInfoKHR;
@@ -161420,11 +117689,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265DpbSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH265DpbSlotInfoKHR( const StdVideoDecodeH265ReferenceInfo * pStdReferenceInfo_ = {},
                                                         const void *                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
+      : pNext( pNext_ )
+      , pStdReferenceInfo( pStdReferenceInfo_ )
     {
     }
 
@@ -161436,15 +117705,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH265DpbSlotInfoKHR & operator=( VideoDecodeH265DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265DpbSlotInfoKHR & operator=( VkVideoDecodeH265DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265DpbSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265DpbSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -161457,7 +117726,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdReferenceInfo = pStdReferenceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH265DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -161469,18 +117738,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265DpbSlotInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH265DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265DpbSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoDecodeH265ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoDecodeH265ReferenceInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdReferenceInfo );
     }
@@ -161505,163 +117769,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType             = StructureType::eVideoDecodeH265DpbSlotInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::eVideoDecodeH265DpbSlotInfoKHR;
     const void *                            pNext             = {};
     const StdVideoDecodeH265ReferenceInfo * pStdReferenceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265DpbSlotInfoKHR>
-  {
-    using Type = VideoDecodeH265DpbSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265DpbSlotInfoKHR>
   {
     using Type = VideoDecodeH265DpbSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265InlineSessionParametersInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265InlineSessionParametersInfoKHR.html
-  struct VideoDecodeH265InlineSessionParametersInfoKHR
-  {
-    using NativeType = VkVideoDecodeH265InlineSessionParametersInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265InlineSessionParametersInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH265InlineSessionParametersInfoKHR( const StdVideoH265VideoParameterSet *    pStdVPS_ = {},
-                                                                        const StdVideoH265SequenceParameterSet * pStdSPS_ = {},
-                                                                        const StdVideoH265PictureParameterSet *  pStdPPS_ = {},
-                                                                        const void *                             pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdVPS{ pStdVPS_ }
-      , pStdSPS{ pStdSPS_ }
-      , pStdPPS{ pStdPPS_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      VideoDecodeH265InlineSessionParametersInfoKHR( VideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeH265InlineSessionParametersInfoKHR( VkVideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeH265InlineSessionParametersInfoKHR( *reinterpret_cast<VideoDecodeH265InlineSessionParametersInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeH265InlineSessionParametersInfoKHR & operator=( VideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeH265InlineSessionParametersInfoKHR & operator=( VkVideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeH265InlineSessionParametersInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265InlineSessionParametersInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265InlineSessionParametersInfoKHR & setPStdVPS( const StdVideoH265VideoParameterSet * pStdVPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdVPS = pStdVPS_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265InlineSessionParametersInfoKHR & setPStdSPS( const StdVideoH265SequenceParameterSet * pStdSPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdSPS = pStdSPS_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265InlineSessionParametersInfoKHR & setPStdPPS( const StdVideoH265PictureParameterSet * pStdPPS_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdPPS = pStdPPS_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoDecodeH265InlineSessionParametersInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeH265InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265InlineSessionParametersInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeH265InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265InlineSessionParametersInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265InlineSessionParametersInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265InlineSessionParametersInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265InlineSessionParametersInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               const StdVideoH265VideoParameterSet * const &,
-               const StdVideoH265SequenceParameterSet * const &,
-               const StdVideoH265PictureParameterSet * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdVPS, pStdSPS, pStdPPS );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoDecodeH265InlineSessionParametersInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdVPS == rhs.pStdVPS ) && ( pStdSPS == rhs.pStdSPS ) && ( pStdPPS == rhs.pStdPPS );
-#  endif
-    }
-
-    bool operator!=( VideoDecodeH265InlineSessionParametersInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                            sType   = StructureType::eVideoDecodeH265InlineSessionParametersInfoKHR;
-    const void *                             pNext   = {};
-    const StdVideoH265VideoParameterSet *    pStdVPS = {};
-    const StdVideoH265SequenceParameterSet * pStdSPS = {};
-    const StdVideoH265PictureParameterSet *  pStdPPS = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeH265InlineSessionParametersInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeH265InlineSessionParametersInfoKHR>
-  {
-    using Type = VideoDecodeH265InlineSessionParametersInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoDecodeH265PictureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265PictureInfoKHR.html
   struct VideoDecodeH265PictureInfoKHR
   {
     using NativeType = VkVideoDecodeH265PictureInfoKHR;
@@ -161669,15 +117787,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265PictureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH265PictureInfoKHR( const StdVideoDecodeH265PictureInfo * pStdPictureInfo_      = {},
                                                         uint32_t                              sliceSegmentCount_    = {},
                                                         const uint32_t *                      pSliceSegmentOffsets_ = {},
                                                         const void *                          pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , sliceSegmentCount{ sliceSegmentCount_ }
-      , pSliceSegmentOffsets{ pSliceSegmentOffsets_ }
+      : pNext( pNext_ )
+      , pStdPictureInfo( pStdPictureInfo_ )
+      , sliceSegmentCount( sliceSegmentCount_ )
+      , pSliceSegmentOffsets( pSliceSegmentOffsets_ )
     {
     }
 
@@ -161689,9 +117807,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH265PictureInfoKHR( const StdVideoDecodeH265PictureInfo *           pStdPictureInfo_,
-                                   ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_,
-                                   const void *                                    pNext_ = nullptr )
+    VideoDecodeH265PictureInfoKHR( const StdVideoDecodeH265PictureInfo *                                 pStdPictureInfo_,
+                                   VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_,
+                                   const void *                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , pStdPictureInfo( pStdPictureInfo_ )
       , sliceSegmentCount( static_cast<uint32_t>( sliceSegmentOffsets_.size() ) )
@@ -161701,15 +117819,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeH265PictureInfoKHR & operator=( VideoDecodeH265PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265PictureInfoKHR & operator=( VkVideoDecodeH265PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265PictureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265PictureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -161735,14 +117853,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH265PictureInfoKHR & setSliceSegmentOffsets( ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeH265PictureInfoKHR &
+      setSliceSegmentOffsets( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & sliceSegmentOffsets_ ) VULKAN_HPP_NOEXCEPT
     {
       sliceSegmentCount    = static_cast<uint32_t>( sliceSegmentOffsets_.size() );
       pSliceSegmentOffsets = sliceSegmentOffsets_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH265PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -161754,18 +117873,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265PictureInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH265PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265PictureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoDecodeH265PictureInfo * const &, uint32_t const &, const uint32_t * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               const StdVideoDecodeH265PictureInfo * const &,
+               uint32_t const &,
+               const uint32_t * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdPictureInfo, sliceSegmentCount, pSliceSegmentOffsets );
@@ -161792,29 +117909,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                = StructureType::eVideoDecodeH265PictureInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType   sType                = StructureType::eVideoDecodeH265PictureInfoKHR;
     const void *                          pNext                = {};
     const StdVideoDecodeH265PictureInfo * pStdPictureInfo      = {};
     uint32_t                              sliceSegmentCount    = {};
     const uint32_t *                      pSliceSegmentOffsets = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265PictureInfoKHR>
-  {
-    using Type = VideoDecodeH265PictureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265PictureInfoKHR>
   {
     using Type = VideoDecodeH265PictureInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265ProfileInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265ProfileInfoKHR.html
   struct VideoDecodeH265ProfileInfoKHR
   {
     using NativeType = VkVideoDecodeH265ProfileInfoKHR;
@@ -161822,10 +117929,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265ProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH265ProfileInfoKHR( StdVideoH265ProfileIdc stdProfileIdc_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfileIdc{ stdProfileIdc_ }
+      : pNext( pNext_ )
+      , stdProfileIdc( stdProfileIdc_ )
     {
     }
 
@@ -161837,15 +117944,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH265ProfileInfoKHR & operator=( VideoDecodeH265ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265ProfileInfoKHR & operator=( VkVideoDecodeH265ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265ProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265ProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -161857,7 +117964,7 @@ namespace VULKAN_HPP_NAMESPACE
       stdProfileIdc = stdProfileIdc_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH265ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -161869,18 +117976,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265ProfileInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH265ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265ProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoH265ProfileIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, StdVideoH265ProfileIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdProfileIdc );
     }
@@ -161911,27 +118013,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType          sType         = StructureType::eVideoDecodeH265ProfileInfoKHR;
-    const void *           pNext         = {};
-    StdVideoH265ProfileIdc stdProfileIdc = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eVideoDecodeH265ProfileInfoKHR;
+    const void *                        pNext         = {};
+    StdVideoH265ProfileIdc              stdProfileIdc = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265ProfileInfoKHR>
-  {
-    using Type = VideoDecodeH265ProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265ProfileInfoKHR>
   {
     using Type = VideoDecodeH265ProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265SessionParametersAddInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265SessionParametersAddInfoKHR.html
   struct VideoDecodeH265SessionParametersAddInfoKHR
   {
     using NativeType = VkVideoDecodeH265SessionParametersAddInfoKHR;
@@ -161939,7 +118031,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265SessionParametersAddInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoDecodeH265SessionParametersAddInfoKHR( uint32_t                                 stdVPSCount_ = {},
                                                                      const StdVideoH265VideoParameterSet *    pStdVPSs_    = {},
                                                                      uint32_t                                 stdSPSCount_ = {},
@@ -161947,13 +118039,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      uint32_t                                 stdPPSCount_ = {},
                                                                      const StdVideoH265PictureParameterSet *  pStdPPSs_    = {},
                                                                      const void *                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdVPSCount{ stdVPSCount_ }
-      , pStdVPSs{ pStdVPSs_ }
-      , stdSPSCount{ stdSPSCount_ }
-      , pStdSPSs{ pStdSPSs_ }
-      , stdPPSCount{ stdPPSCount_ }
-      , pStdPPSs{ pStdPPSs_ }
+      : pNext( pNext_ )
+      , stdVPSCount( stdVPSCount_ )
+      , pStdVPSs( pStdVPSs_ )
+      , stdSPSCount( stdSPSCount_ )
+      , pStdSPSs( pStdSPSs_ )
+      , stdPPSCount( stdPPSCount_ )
+      , pStdPPSs( pStdPPSs_ )
     {
     }
 
@@ -161965,10 +118057,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH265SessionParametersAddInfoKHR( ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const &    stdVPSs_,
-                                                ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ = {},
-                                                ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const &  stdPPSs_ = {},
-                                                const void *                                                            pNext_   = nullptr )
+    VideoDecodeH265SessionParametersAddInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const &    stdVPSs_,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ = {},
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const &  stdPPSs_ = {},
+                                                const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , stdVPSCount( static_cast<uint32_t>( stdVPSs_.size() ) )
       , pStdVPSs( stdVPSs_.data() )
@@ -161981,15 +118073,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeH265SessionParametersAddInfoKHR & operator=( VideoDecodeH265SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265SessionParametersAddInfoKHR & operator=( VkVideoDecodeH265SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265SessionParametersAddInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265SessionParametersAddInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -162009,7 +118101,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeH265SessionParametersAddInfoKHR & setStdVPSs( ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const & stdVPSs_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeH265SessionParametersAddInfoKHR &
+      setStdVPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const & stdVPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdVPSCount = static_cast<uint32_t>( stdVPSs_.size() );
       pStdVPSs    = stdVPSs_.data();
@@ -162031,7 +118124,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoDecodeH265SessionParametersAddInfoKHR &
-      setStdSPSs( ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdSPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdSPSCount = static_cast<uint32_t>( stdSPSs_.size() );
       pStdSPSs    = stdSPSs_.data();
@@ -162053,14 +118146,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoDecodeH265SessionParametersAddInfoKHR &
-      setStdPPSs( ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdPPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdPPSCount = static_cast<uint32_t>( stdPPSs_.size() );
       pStdPPSs    = stdPPSs_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH265SessionParametersAddInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -162072,18 +118165,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265SessionParametersAddInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH265SessionParametersAddInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265SessionParametersAddInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265SessionParametersAddInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265SessionParametersAddInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const StdVideoH265VideoParameterSet * const &,
@@ -162091,6 +118177,7 @@ namespace VULKAN_HPP_NAMESPACE
                const StdVideoH265SequenceParameterSet * const &,
                uint32_t const &,
                const StdVideoH265PictureParameterSet * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdVPSCount, pStdVPSs, stdSPSCount, pStdSPSs, stdPPSCount, pStdPPSs );
@@ -162117,7 +118204,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                            sType       = StructureType::eVideoDecodeH265SessionParametersAddInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType      sType       = StructureType::eVideoDecodeH265SessionParametersAddInfoKHR;
     const void *                             pNext       = {};
     uint32_t                                 stdVPSCount = {};
     const StdVideoH265VideoParameterSet *    pStdVPSs    = {};
@@ -162127,22 +118214,12 @@ namespace VULKAN_HPP_NAMESPACE
     const StdVideoH265PictureParameterSet *  pStdPPSs    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265SessionParametersAddInfoKHR>
-  {
-    using Type = VideoDecodeH265SessionParametersAddInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265SessionParametersAddInfoKHR>
   {
     using Type = VideoDecodeH265SessionParametersAddInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeH265SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeH265SessionParametersCreateInfoKHR.html
   struct VideoDecodeH265SessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoDecodeH265SessionParametersCreateInfoKHR;
@@ -162150,17 +118227,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeH265SessionParametersCreateInfoKHR( uint32_t                                           maxStdVPSCount_     = {},
-                                                                        uint32_t                                           maxStdSPSCount_     = {},
-                                                                        uint32_t                                           maxStdPPSCount_     = {},
-                                                                        const VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
-                                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxStdVPSCount{ maxStdVPSCount_ }
-      , maxStdSPSCount{ maxStdSPSCount_ }
-      , maxStdPPSCount{ maxStdPPSCount_ }
-      , pParametersAddInfo{ pParametersAddInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      VideoDecodeH265SessionParametersCreateInfoKHR( uint32_t                                                                 maxStdVPSCount_     = {},
+                                                     uint32_t                                                                 maxStdSPSCount_     = {},
+                                                     uint32_t                                                                 maxStdPPSCount_     = {},
+                                                     const VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
+                                                     const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxStdVPSCount( maxStdVPSCount_ )
+      , maxStdSPSCount( maxStdSPSCount_ )
+      , maxStdPPSCount( maxStdPPSCount_ )
+      , pParametersAddInfo( pParametersAddInfo_ )
     {
     }
 
@@ -162173,15 +118251,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeH265SessionParametersCreateInfoKHR & operator=( VideoDecodeH265SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeH265SessionParametersCreateInfoKHR & operator=( VkVideoDecodeH265SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeH265SessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -162207,12 +118285,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeH265SessionParametersCreateInfoKHR &
-      setPParametersAddInfo( const VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
+      setPParametersAddInfo( const VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pParametersAddInfo = pParametersAddInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeH265SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -162224,23 +118302,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeH265SessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeH265SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeH265SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeH265SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeH265SessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               const VideoDecodeH265SessionParametersAddInfoKHR * const &>
+               const VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxStdVPSCount, maxStdSPSCount, maxStdPPSCount, pParametersAddInfo );
@@ -162267,29 +118339,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                      sType              = StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR;
-    const void *                                       pNext              = {};
-    uint32_t                                           maxStdVPSCount     = {};
-    uint32_t                                           maxStdSPSCount     = {};
-    uint32_t                                           maxStdPPSCount     = {};
-    const VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                      sType              = StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR;
+    const void *                                                             pNext              = {};
+    uint32_t                                                                 maxStdVPSCount     = {};
+    uint32_t                                                                 maxStdSPSCount     = {};
+    uint32_t                                                                 maxStdPPSCount     = {};
+    const VULKAN_HPP_NAMESPACE::VideoDecodeH265SessionParametersAddInfoKHR * pParametersAddInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeH265SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoDecodeH265SessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR>
   {
     using Type = VideoDecodeH265SessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeInfoKHR.html
   struct VideoDecodeInfoKHR
   {
     using NativeType = VkVideoDecodeInfoKHR;
@@ -162297,25 +118360,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeInfoKHR( VideoDecodeFlagsKHR               flags_               = {},
-                                             Buffer                            srcBuffer_           = {},
-                                             DeviceSize                        srcBufferOffset_     = {},
-                                             DeviceSize                        srcBufferRange_      = {},
-                                             VideoPictureResourceInfoKHR       dstPictureResource_  = {},
-                                             const VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ = {},
-                                             uint32_t                          referenceSlotCount_  = {},
-                                             const VideoReferenceSlotInfoKHR * pReferenceSlots_     = {},
-                                             const void *                      pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , srcBuffer{ srcBuffer_ }
-      , srcBufferOffset{ srcBufferOffset_ }
-      , srcBufferRange{ srcBufferRange_ }
-      , dstPictureResource{ dstPictureResource_ }
-      , pSetupReferenceSlot{ pSetupReferenceSlot_ }
-      , referenceSlotCount{ referenceSlotCount_ }
-      , pReferenceSlots{ pReferenceSlots_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeInfoKHR( VULKAN_HPP_NAMESPACE::VideoDecodeFlagsKHR               flags_               = {},
+                                             VULKAN_HPP_NAMESPACE::Buffer                            srcBuffer_           = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceSize                        srcBufferOffset_     = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceSize                        srcBufferRange_      = {},
+                                             VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR       dstPictureResource_  = {},
+                                             const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ = {},
+                                             uint32_t                                                referenceSlotCount_  = {},
+                                             const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_     = {},
+                                             const void *                                            pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , srcBuffer( srcBuffer_ )
+      , srcBufferOffset( srcBufferOffset_ )
+      , srcBufferRange( srcBufferRange_ )
+      , dstPictureResource( dstPictureResource_ )
+      , pSetupReferenceSlot( pSetupReferenceSlot_ )
+      , referenceSlotCount( referenceSlotCount_ )
+      , pReferenceSlots( pReferenceSlots_ )
     {
     }
 
@@ -162324,14 +118387,14 @@ namespace VULKAN_HPP_NAMESPACE
     VideoDecodeInfoKHR( VkVideoDecodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : VideoDecodeInfoKHR( *reinterpret_cast<VideoDecodeInfoKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeInfoKHR( VideoDecodeFlagsKHR                                              flags_,
-                        Buffer                                                           srcBuffer_,
-                        DeviceSize                                                       srcBufferOffset_,
-                        DeviceSize                                                       srcBufferRange_,
-                        VideoPictureResourceInfoKHR                                      dstPictureResource_,
-                        const VideoReferenceSlotInfoKHR *                                pSetupReferenceSlot_,
-                        ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_,
-                        const void *                                                     pNext_ = nullptr )
+    VideoDecodeInfoKHR( VULKAN_HPP_NAMESPACE::VideoDecodeFlagsKHR                                                                    flags_,
+                        VULKAN_HPP_NAMESPACE::Buffer                                                                                 srcBuffer_,
+                        VULKAN_HPP_NAMESPACE::DeviceSize                                                                             srcBufferOffset_,
+                        VULKAN_HPP_NAMESPACE::DeviceSize                                                                             srcBufferRange_,
+                        VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR                                                            dstPictureResource_,
+                        const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR *                                                      pSetupReferenceSlot_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_,
+                        const void *                                                                                                 pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , srcBuffer( srcBuffer_ )
@@ -162346,52 +118409,54 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoDecodeInfoKHR & operator=( VideoDecodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeInfoKHR & operator=( VkVideoDecodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setFlags( VideoDecodeFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoDecodeFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBuffer( Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBuffer( VULKAN_HPP_NAMESPACE::Buffer srcBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       srcBuffer = srcBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBufferOffset( DeviceSize srcBufferOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBufferOffset( VULKAN_HPP_NAMESPACE::DeviceSize srcBufferOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       srcBufferOffset = srcBufferOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBufferRange( DeviceSize srcBufferRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setSrcBufferRange( VULKAN_HPP_NAMESPACE::DeviceSize srcBufferRange_ ) VULKAN_HPP_NOEXCEPT
     {
       srcBufferRange = srcBufferRange_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setDstPictureResource( VideoPictureResourceInfoKHR const & dstPictureResource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR &
+      setDstPictureResource( VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR const & dstPictureResource_ ) VULKAN_HPP_NOEXCEPT
     {
       dstPictureResource = dstPictureResource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setPSetupReferenceSlot( const VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR &
+      setPSetupReferenceSlot( const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ ) VULKAN_HPP_NOEXCEPT
     {
       pSetupReferenceSlot = pSetupReferenceSlot_;
       return *this;
@@ -162403,21 +118468,23 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR & setPReferenceSlots( const VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeInfoKHR &
+      setPReferenceSlots( const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       pReferenceSlots = pReferenceSlots_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoDecodeInfoKHR & setReferenceSlots( ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VideoDecodeInfoKHR & setReferenceSlots(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       referenceSlotCount = static_cast<uint32_t>( referenceSlots_.size() );
       pReferenceSlots    = referenceSlots_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -162429,27 +118496,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoDecodeFlagsKHR const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               VideoPictureResourceInfoKHR const &,
-               const VideoReferenceSlotInfoKHR * const &,
+               VULKAN_HPP_NAMESPACE::VideoDecodeFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR const &,
+               const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * const &,
                uint32_t const &,
-               const VideoReferenceSlotInfoKHR * const &>
+               const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie(
@@ -162479,33 +118540,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType               = StructureType::eVideoDecodeInfoKHR;
-    const void *                      pNext               = {};
-    VideoDecodeFlagsKHR               flags               = {};
-    Buffer                            srcBuffer           = {};
-    DeviceSize                        srcBufferOffset     = {};
-    DeviceSize                        srcBufferRange      = {};
-    VideoPictureResourceInfoKHR       dstPictureResource  = {};
-    const VideoReferenceSlotInfoKHR * pSetupReferenceSlot = {};
-    uint32_t                          referenceSlotCount  = {};
-    const VideoReferenceSlotInfoKHR * pReferenceSlots     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType               = StructureType::eVideoDecodeInfoKHR;
+    const void *                                            pNext               = {};
+    VULKAN_HPP_NAMESPACE::VideoDecodeFlagsKHR               flags               = {};
+    VULKAN_HPP_NAMESPACE::Buffer                            srcBuffer           = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                        srcBufferOffset     = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                        srcBufferRange      = {};
+    VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR       dstPictureResource  = {};
+    const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot = {};
+    uint32_t                                                referenceSlotCount  = {};
+    const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeInfoKHR>
-  {
-    using Type = VideoDecodeInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeInfoKHR>
   {
     using Type = VideoDecodeInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeUsageInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeUsageInfoKHR.html
   struct VideoDecodeUsageInfoKHR
   {
     using NativeType = VkVideoDecodeUsageInfoKHR;
@@ -162513,10 +118565,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeUsageInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeUsageInfoKHR( VideoDecodeUsageFlagsKHR videoUsageHints_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoUsageHints{ videoUsageHints_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoDecodeUsageInfoKHR( VULKAN_HPP_NAMESPACE::VideoDecodeUsageFlagsKHR videoUsageHints_ = {},
+                                                  const void *                                   pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoUsageHints( videoUsageHints_ )
     {
     }
 
@@ -162528,27 +118581,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoDecodeUsageInfoKHR & operator=( VideoDecodeUsageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoDecodeUsageInfoKHR & operator=( VkVideoDecodeUsageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoDecodeUsageInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoDecodeUsageInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoDecodeUsageInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeUsageInfoKHR & setVideoUsageHints( VideoDecodeUsageFlagsKHR videoUsageHints_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoDecodeUsageInfoKHR & setVideoUsageHints( VULKAN_HPP_NAMESPACE::VideoDecodeUsageFlagsKHR videoUsageHints_ ) VULKAN_HPP_NOEXCEPT
     {
       videoUsageHints = videoUsageHints_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoDecodeUsageInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -162560,18 +118613,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoDecodeUsageInfoKHR *>( this );
     }
 
-    operator VkVideoDecodeUsageInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeUsageInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeUsageInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeUsageInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoDecodeUsageFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::VideoDecodeUsageFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoUsageHints );
     }
@@ -162596,2374 +118644,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType            sType           = StructureType::eVideoDecodeUsageInfoKHR;
-    const void *             pNext           = {};
-    VideoDecodeUsageFlagsKHR videoUsageHints = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType           = StructureType::eVideoDecodeUsageInfoKHR;
+    const void *                                   pNext           = {};
+    VULKAN_HPP_NAMESPACE::VideoDecodeUsageFlagsKHR videoUsageHints = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeUsageInfoKHR>
-  {
-    using Type = VideoDecodeUsageInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoDecodeUsageInfoKHR>
   {
     using Type = VideoDecodeUsageInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoDecodeVP9CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeVP9CapabilitiesKHR.html
-  struct VideoDecodeVP9CapabilitiesKHR
-  {
-    using NativeType = VkVideoDecodeVP9CapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeVp9CapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeVP9CapabilitiesKHR( StdVideoVP9Level maxLevel_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxLevel{ maxLevel_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoDecodeVP9CapabilitiesKHR( VideoDecodeVP9CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeVP9CapabilitiesKHR( VkVideoDecodeVP9CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeVP9CapabilitiesKHR( *reinterpret_cast<VideoDecodeVP9CapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeVP9CapabilitiesKHR & operator=( VideoDecodeVP9CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeVP9CapabilitiesKHR & operator=( VkVideoDecodeVP9CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeVP9CapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoDecodeVP9CapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeVP9CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9CapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeVP9CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeVP9CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeVP9CapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, StdVideoVP9Level const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxLevel );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( VideoDecodeVP9CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoVP9Level ) ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( VideoDecodeVP9CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoVP9Level ) ) == 0 );
-    }
-
-    bool operator!=( VideoDecodeVP9CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType    sType    = StructureType::eVideoDecodeVp9CapabilitiesKHR;
-    void *           pNext    = {};
-    StdVideoVP9Level maxLevel = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeVP9CapabilitiesKHR>
-  {
-    using Type = VideoDecodeVP9CapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeVp9CapabilitiesKHR>
-  {
-    using Type = VideoDecodeVP9CapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoDecodeVP9PictureInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeVP9PictureInfoKHR.html
-  struct VideoDecodeVP9PictureInfoKHR
-  {
-    using NativeType = VkVideoDecodeVP9PictureInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeVp9PictureInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR( const StdVideoDecodeVP9PictureInfo *                                   pStdPictureInfo_          = {},
-                                                          std::array<int32_t, VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR> const & referenceNameSlotIndices_ = {},
-                                                          uint32_t                                                               uncompressedHeaderOffset_ = {},
-                                                          uint32_t                                                               compressedHeaderOffset_   = {},
-                                                          uint32_t                                                               tilesOffset_              = {},
-                                                          const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , referenceNameSlotIndices{ referenceNameSlotIndices_ }
-      , uncompressedHeaderOffset{ uncompressedHeaderOffset_ }
-      , compressedHeaderOffset{ compressedHeaderOffset_ }
-      , tilesOffset{ tilesOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR( VideoDecodeVP9PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeVP9PictureInfoKHR( VkVideoDecodeVP9PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeVP9PictureInfoKHR( *reinterpret_cast<VideoDecodeVP9PictureInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeVP9PictureInfoKHR & operator=( VideoDecodeVP9PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeVP9PictureInfoKHR & operator=( VkVideoDecodeVP9PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeVP9PictureInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR & setPStdPictureInfo( const StdVideoDecodeVP9PictureInfo * pStdPictureInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdPictureInfo = pStdPictureInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR &
-      setReferenceNameSlotIndices( std::array<int32_t, VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      referenceNameSlotIndices = referenceNameSlotIndices_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR & setUncompressedHeaderOffset( uint32_t uncompressedHeaderOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      uncompressedHeaderOffset = uncompressedHeaderOffset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR & setCompressedHeaderOffset( uint32_t compressedHeaderOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      compressedHeaderOffset = compressedHeaderOffset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9PictureInfoKHR & setTilesOffset( uint32_t tilesOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tilesOffset = tilesOffset_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoDecodeVP9PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeVP9PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9PictureInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeVP9PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeVP9PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeVP9PictureInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               const StdVideoDecodeVP9PictureInfo * const &,
-               ArrayWrapper1D<int32_t, VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR> const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdPictureInfo, referenceNameSlotIndices, uncompressedHeaderOffset, compressedHeaderOffset, tilesOffset );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoDecodeVP9PictureInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoDecodeVP9PictureInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdPictureInfo == rhs.pStdPictureInfo ) &&
-             ( referenceNameSlotIndices == rhs.referenceNameSlotIndices ) && ( uncompressedHeaderOffset == rhs.uncompressedHeaderOffset ) &&
-             ( compressedHeaderOffset == rhs.compressedHeaderOffset ) && ( tilesOffset == rhs.tilesOffset );
-#  endif
-    }
-
-    bool operator!=( VideoDecodeVP9PictureInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                                      sType                    = StructureType::eVideoDecodeVp9PictureInfoKHR;
-    const void *                                                       pNext                    = {};
-    const StdVideoDecodeVP9PictureInfo *                               pStdPictureInfo          = {};
-    ArrayWrapper1D<int32_t, VK_MAX_VIDEO_VP9_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices = {};
-    uint32_t                                                           uncompressedHeaderOffset = {};
-    uint32_t                                                           compressedHeaderOffset   = {};
-    uint32_t                                                           tilesOffset              = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeVP9PictureInfoKHR>
-  {
-    using Type = VideoDecodeVP9PictureInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeVp9PictureInfoKHR>
-  {
-    using Type = VideoDecodeVP9PictureInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoDecodeVP9ProfileInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoDecodeVP9ProfileInfoKHR.html
-  struct VideoDecodeVP9ProfileInfoKHR
-  {
-    using NativeType = VkVideoDecodeVP9ProfileInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoDecodeVp9ProfileInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoDecodeVP9ProfileInfoKHR( StdVideoVP9Profile stdProfile_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfile{ stdProfile_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoDecodeVP9ProfileInfoKHR( VideoDecodeVP9ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoDecodeVP9ProfileInfoKHR( VkVideoDecodeVP9ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoDecodeVP9ProfileInfoKHR( *reinterpret_cast<VideoDecodeVP9ProfileInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoDecodeVP9ProfileInfoKHR & operator=( VideoDecodeVP9ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoDecodeVP9ProfileInfoKHR & operator=( VkVideoDecodeVP9ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoDecodeVP9ProfileInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoDecodeVP9ProfileInfoKHR & setStdProfile( StdVideoVP9Profile stdProfile_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stdProfile = stdProfile_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoDecodeVP9ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoDecodeVP9ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9ProfileInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoDecodeVP9ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoDecodeVP9ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoDecodeVP9ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoDecodeVP9ProfileInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoVP9Profile const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, stdProfile );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( VideoDecodeVP9ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = memcmp( &stdProfile, &rhs.stdProfile, sizeof( StdVideoVP9Profile ) ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( VideoDecodeVP9ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memcmp( &stdProfile, &rhs.stdProfile, sizeof( StdVideoVP9Profile ) ) == 0 );
-    }
-
-    bool operator!=( VideoDecodeVP9ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType      sType      = StructureType::eVideoDecodeVp9ProfileInfoKHR;
-    const void *       pNext      = {};
-    StdVideoVP9Profile stdProfile = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoDecodeVP9ProfileInfoKHR>
-  {
-    using Type = VideoDecodeVP9ProfileInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoDecodeVp9ProfileInfoKHR>
-  {
-    using Type = VideoDecodeVP9ProfileInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1CapabilitiesKHR.html
-  struct VideoEncodeAV1CapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeAV1CapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1CapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1CapabilitiesKHR( VideoEncodeAV1CapabilityFlagsKHR     flags_                                         = {},
-                                                        StdVideoAV1Level                     maxLevel_                                      = {},
-                                                        Extent2D                             codedPictureAlignment_                         = {},
-                                                        Extent2D                             maxTiles_                                      = {},
-                                                        Extent2D                             minTileSize_                                   = {},
-                                                        Extent2D                             maxTileSize_                                   = {},
-                                                        VideoEncodeAV1SuperblockSizeFlagsKHR superblockSizes_                               = {},
-                                                        uint32_t                             maxSingleReferenceCount_                       = {},
-                                                        uint32_t                             singleReferenceNameMask_                       = {},
-                                                        uint32_t                             maxUnidirectionalCompoundReferenceCount_       = {},
-                                                        uint32_t                             maxUnidirectionalCompoundGroup1ReferenceCount_ = {},
-                                                        uint32_t                             unidirectionalCompoundReferenceNameMask_       = {},
-                                                        uint32_t                             maxBidirectionalCompoundReferenceCount_        = {},
-                                                        uint32_t                             maxBidirectionalCompoundGroup1ReferenceCount_  = {},
-                                                        uint32_t                             maxBidirectionalCompoundGroup2ReferenceCount_  = {},
-                                                        uint32_t                             bidirectionalCompoundReferenceNameMask_        = {},
-                                                        uint32_t                             maxTemporalLayerCount_                         = {},
-                                                        uint32_t                             maxSpatialLayerCount_                          = {},
-                                                        uint32_t                             maxOperatingPoints_                            = {},
-                                                        uint32_t                             minQIndex_                                     = {},
-                                                        uint32_t                             maxQIndex_                                     = {},
-                                                        Bool32                               prefersGopRemainingFrames_                     = {},
-                                                        Bool32                               requiresGopRemainingFrames_                    = {},
-                                                        VideoEncodeAV1StdFlagsKHR            stdSyntaxFlags_                                = {},
-                                                        void *                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , maxLevel{ maxLevel_ }
-      , codedPictureAlignment{ codedPictureAlignment_ }
-      , maxTiles{ maxTiles_ }
-      , minTileSize{ minTileSize_ }
-      , maxTileSize{ maxTileSize_ }
-      , superblockSizes{ superblockSizes_ }
-      , maxSingleReferenceCount{ maxSingleReferenceCount_ }
-      , singleReferenceNameMask{ singleReferenceNameMask_ }
-      , maxUnidirectionalCompoundReferenceCount{ maxUnidirectionalCompoundReferenceCount_ }
-      , maxUnidirectionalCompoundGroup1ReferenceCount{ maxUnidirectionalCompoundGroup1ReferenceCount_ }
-      , unidirectionalCompoundReferenceNameMask{ unidirectionalCompoundReferenceNameMask_ }
-      , maxBidirectionalCompoundReferenceCount{ maxBidirectionalCompoundReferenceCount_ }
-      , maxBidirectionalCompoundGroup1ReferenceCount{ maxBidirectionalCompoundGroup1ReferenceCount_ }
-      , maxBidirectionalCompoundGroup2ReferenceCount{ maxBidirectionalCompoundGroup2ReferenceCount_ }
-      , bidirectionalCompoundReferenceNameMask{ bidirectionalCompoundReferenceNameMask_ }
-      , maxTemporalLayerCount{ maxTemporalLayerCount_ }
-      , maxSpatialLayerCount{ maxSpatialLayerCount_ }
-      , maxOperatingPoints{ maxOperatingPoints_ }
-      , minQIndex{ minQIndex_ }
-      , maxQIndex{ maxQIndex_ }
-      , prefersGopRemainingFrames{ prefersGopRemainingFrames_ }
-      , requiresGopRemainingFrames{ requiresGopRemainingFrames_ }
-      , stdSyntaxFlags{ stdSyntaxFlags_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1CapabilitiesKHR( VideoEncodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1CapabilitiesKHR( VkVideoEncodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1CapabilitiesKHR( *reinterpret_cast<VideoEncodeAV1CapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1CapabilitiesKHR & operator=( VideoEncodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1CapabilitiesKHR & operator=( VkVideoEncodeAV1CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1CapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeAV1CapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1CapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1CapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               VideoEncodeAV1CapabilityFlagsKHR const &,
-               StdVideoAV1Level const &,
-               Extent2D const &,
-               Extent2D const &,
-               Extent2D const &,
-               Extent2D const &,
-               VideoEncodeAV1SuperblockSizeFlagsKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               VideoEncodeAV1StdFlagsKHR const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       flags,
-                       maxLevel,
-                       codedPictureAlignment,
-                       maxTiles,
-                       minTileSize,
-                       maxTileSize,
-                       superblockSizes,
-                       maxSingleReferenceCount,
-                       singleReferenceNameMask,
-                       maxUnidirectionalCompoundReferenceCount,
-                       maxUnidirectionalCompoundGroup1ReferenceCount,
-                       unidirectionalCompoundReferenceNameMask,
-                       maxBidirectionalCompoundReferenceCount,
-                       maxBidirectionalCompoundGroup1ReferenceCount,
-                       maxBidirectionalCompoundGroup2ReferenceCount,
-                       bidirectionalCompoundReferenceNameMask,
-                       maxTemporalLayerCount,
-                       maxSpatialLayerCount,
-                       maxOperatingPoints,
-                       minQIndex,
-                       maxQIndex,
-                       prefersGopRemainingFrames,
-                       requiresGopRemainingFrames,
-                       stdSyntaxFlags );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( VideoEncodeAV1CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = flags <=> rhs.flags; cmp != 0 )
-        return cmp;
-      if ( auto cmp = memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoAV1Level ) ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-      if ( auto cmp = codedPictureAlignment <=> rhs.codedPictureAlignment; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxTiles <=> rhs.maxTiles; cmp != 0 )
-        return cmp;
-      if ( auto cmp = minTileSize <=> rhs.minTileSize; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxTileSize <=> rhs.maxTileSize; cmp != 0 )
-        return cmp;
-      if ( auto cmp = superblockSizes <=> rhs.superblockSizes; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxSingleReferenceCount <=> rhs.maxSingleReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = singleReferenceNameMask <=> rhs.singleReferenceNameMask; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxUnidirectionalCompoundReferenceCount <=> rhs.maxUnidirectionalCompoundReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxUnidirectionalCompoundGroup1ReferenceCount <=> rhs.maxUnidirectionalCompoundGroup1ReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = unidirectionalCompoundReferenceNameMask <=> rhs.unidirectionalCompoundReferenceNameMask; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxBidirectionalCompoundReferenceCount <=> rhs.maxBidirectionalCompoundReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxBidirectionalCompoundGroup1ReferenceCount <=> rhs.maxBidirectionalCompoundGroup1ReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxBidirectionalCompoundGroup2ReferenceCount <=> rhs.maxBidirectionalCompoundGroup2ReferenceCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = bidirectionalCompoundReferenceNameMask <=> rhs.bidirectionalCompoundReferenceNameMask; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxTemporalLayerCount <=> rhs.maxTemporalLayerCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxSpatialLayerCount <=> rhs.maxSpatialLayerCount; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxOperatingPoints <=> rhs.maxOperatingPoints; cmp != 0 )
-        return cmp;
-      if ( auto cmp = minQIndex <=> rhs.minQIndex; cmp != 0 )
-        return cmp;
-      if ( auto cmp = maxQIndex <=> rhs.maxQIndex; cmp != 0 )
-        return cmp;
-      if ( auto cmp = prefersGopRemainingFrames <=> rhs.prefersGopRemainingFrames; cmp != 0 )
-        return cmp;
-      if ( auto cmp = requiresGopRemainingFrames <=> rhs.requiresGopRemainingFrames; cmp != 0 )
-        return cmp;
-      if ( auto cmp = stdSyntaxFlags <=> rhs.stdSyntaxFlags; cmp != 0 )
-        return cmp;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( VideoEncodeAV1CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) &&
-             ( memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoAV1Level ) ) == 0 ) && ( codedPictureAlignment == rhs.codedPictureAlignment ) &&
-             ( maxTiles == rhs.maxTiles ) && ( minTileSize == rhs.minTileSize ) && ( maxTileSize == rhs.maxTileSize ) &&
-             ( superblockSizes == rhs.superblockSizes ) && ( maxSingleReferenceCount == rhs.maxSingleReferenceCount ) &&
-             ( singleReferenceNameMask == rhs.singleReferenceNameMask ) &&
-             ( maxUnidirectionalCompoundReferenceCount == rhs.maxUnidirectionalCompoundReferenceCount ) &&
-             ( maxUnidirectionalCompoundGroup1ReferenceCount == rhs.maxUnidirectionalCompoundGroup1ReferenceCount ) &&
-             ( unidirectionalCompoundReferenceNameMask == rhs.unidirectionalCompoundReferenceNameMask ) &&
-             ( maxBidirectionalCompoundReferenceCount == rhs.maxBidirectionalCompoundReferenceCount ) &&
-             ( maxBidirectionalCompoundGroup1ReferenceCount == rhs.maxBidirectionalCompoundGroup1ReferenceCount ) &&
-             ( maxBidirectionalCompoundGroup2ReferenceCount == rhs.maxBidirectionalCompoundGroup2ReferenceCount ) &&
-             ( bidirectionalCompoundReferenceNameMask == rhs.bidirectionalCompoundReferenceNameMask ) &&
-             ( maxTemporalLayerCount == rhs.maxTemporalLayerCount ) && ( maxSpatialLayerCount == rhs.maxSpatialLayerCount ) &&
-             ( maxOperatingPoints == rhs.maxOperatingPoints ) && ( minQIndex == rhs.minQIndex ) && ( maxQIndex == rhs.maxQIndex ) &&
-             ( prefersGopRemainingFrames == rhs.prefersGopRemainingFrames ) && ( requiresGopRemainingFrames == rhs.requiresGopRemainingFrames ) &&
-             ( stdSyntaxFlags == rhs.stdSyntaxFlags );
-    }
-
-    bool operator!=( VideoEncodeAV1CapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType                        sType                                         = StructureType::eVideoEncodeAv1CapabilitiesKHR;
-    void *                               pNext                                         = {};
-    VideoEncodeAV1CapabilityFlagsKHR     flags                                         = {};
-    StdVideoAV1Level                     maxLevel                                      = {};
-    Extent2D                             codedPictureAlignment                         = {};
-    Extent2D                             maxTiles                                      = {};
-    Extent2D                             minTileSize                                   = {};
-    Extent2D                             maxTileSize                                   = {};
-    VideoEncodeAV1SuperblockSizeFlagsKHR superblockSizes                               = {};
-    uint32_t                             maxSingleReferenceCount                       = {};
-    uint32_t                             singleReferenceNameMask                       = {};
-    uint32_t                             maxUnidirectionalCompoundReferenceCount       = {};
-    uint32_t                             maxUnidirectionalCompoundGroup1ReferenceCount = {};
-    uint32_t                             unidirectionalCompoundReferenceNameMask       = {};
-    uint32_t                             maxBidirectionalCompoundReferenceCount        = {};
-    uint32_t                             maxBidirectionalCompoundGroup1ReferenceCount  = {};
-    uint32_t                             maxBidirectionalCompoundGroup2ReferenceCount  = {};
-    uint32_t                             bidirectionalCompoundReferenceNameMask        = {};
-    uint32_t                             maxTemporalLayerCount                         = {};
-    uint32_t                             maxSpatialLayerCount                          = {};
-    uint32_t                             maxOperatingPoints                            = {};
-    uint32_t                             minQIndex                                     = {};
-    uint32_t                             maxQIndex                                     = {};
-    Bool32                               prefersGopRemainingFrames                     = {};
-    Bool32                               requiresGopRemainingFrames                    = {};
-    VideoEncodeAV1StdFlagsKHR            stdSyntaxFlags                                = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1CapabilitiesKHR>
-  {
-    using Type = VideoEncodeAV1CapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1CapabilitiesKHR>
-  {
-    using Type = VideoEncodeAV1CapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1DpbSlotInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1DpbSlotInfoKHR.html
-  struct VideoEncodeAV1DpbSlotInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1DpbSlotInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1DpbSlotInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1DpbSlotInfoKHR( const StdVideoEncodeAV1ReferenceInfo * pStdReferenceInfo_ = {},
-                                                       const void *                           pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1DpbSlotInfoKHR( VideoEncodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1DpbSlotInfoKHR( VkVideoEncodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1DpbSlotInfoKHR( *reinterpret_cast<VideoEncodeAV1DpbSlotInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1DpbSlotInfoKHR & operator=( VideoEncodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1DpbSlotInfoKHR & operator=( VkVideoEncodeAV1DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1DpbSlotInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1DpbSlotInfoKHR & setPStdReferenceInfo( const StdVideoEncodeAV1ReferenceInfo * pStdReferenceInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdReferenceInfo = pStdReferenceInfo_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1DpbSlotInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1DpbSlotInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoEncodeAV1ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdReferenceInfo );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1DpbSlotInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1DpbSlotInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdReferenceInfo == rhs.pStdReferenceInfo );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1DpbSlotInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                          sType             = StructureType::eVideoEncodeAv1DpbSlotInfoKHR;
-    const void *                           pNext             = {};
-    const StdVideoEncodeAV1ReferenceInfo * pStdReferenceInfo = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1DpbSlotInfoKHR>
-  {
-    using Type = VideoEncodeAV1DpbSlotInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1DpbSlotInfoKHR>
-  {
-    using Type = VideoEncodeAV1DpbSlotInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1FrameSizeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1FrameSizeKHR.html
-  struct VideoEncodeAV1FrameSizeKHR
-  {
-    using NativeType = VkVideoEncodeAV1FrameSizeKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeAV1FrameSizeKHR( uint32_t intraFrameSize_ = {}, uint32_t predictiveFrameSize_ = {}, uint32_t bipredictiveFrameSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : intraFrameSize{ intraFrameSize_ }
-      , predictiveFrameSize{ predictiveFrameSize_ }
-      , bipredictiveFrameSize{ bipredictiveFrameSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1FrameSizeKHR( VideoEncodeAV1FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1FrameSizeKHR( VkVideoEncodeAV1FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1FrameSizeKHR( *reinterpret_cast<VideoEncodeAV1FrameSizeKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1FrameSizeKHR & operator=( VideoEncodeAV1FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1FrameSizeKHR & operator=( VkVideoEncodeAV1FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1FrameSizeKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1FrameSizeKHR & setIntraFrameSize( uint32_t intraFrameSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      intraFrameSize = intraFrameSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1FrameSizeKHR & setPredictiveFrameSize( uint32_t predictiveFrameSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      predictiveFrameSize = predictiveFrameSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1FrameSizeKHR & setBipredictiveFrameSize( uint32_t bipredictiveFrameSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bipredictiveFrameSize = bipredictiveFrameSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1FrameSizeKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1FrameSizeKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1FrameSizeKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1FrameSizeKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1FrameSizeKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1FrameSizeKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1FrameSizeKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1FrameSizeKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( intraFrameSize, predictiveFrameSize, bipredictiveFrameSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1FrameSizeKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1FrameSizeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( intraFrameSize == rhs.intraFrameSize ) && ( predictiveFrameSize == rhs.predictiveFrameSize ) &&
-             ( bipredictiveFrameSize == rhs.bipredictiveFrameSize );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1FrameSizeKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t intraFrameSize        = {};
-    uint32_t predictiveFrameSize   = {};
-    uint32_t bipredictiveFrameSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1FrameSizeKHR>
-  {
-    using Type = VideoEncodeAV1FrameSizeKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeAV1GopRemainingFrameInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1GopRemainingFrameInfoKHR.html
-  struct VideoEncodeAV1GopRemainingFrameInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1GopRemainingFrameInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1GopRemainingFrameInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1GopRemainingFrameInfoKHR( Bool32       useGopRemainingFrames_    = {},
-                                                                 uint32_t     gopRemainingIntra_        = {},
-                                                                 uint32_t     gopRemainingPredictive_   = {},
-                                                                 uint32_t     gopRemainingBipredictive_ = {},
-                                                                 const void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useGopRemainingFrames{ useGopRemainingFrames_ }
-      , gopRemainingIntra{ gopRemainingIntra_ }
-      , gopRemainingPredictive{ gopRemainingPredictive_ }
-      , gopRemainingBipredictive{ gopRemainingBipredictive_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1GopRemainingFrameInfoKHR( VideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1GopRemainingFrameInfoKHR( VkVideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1GopRemainingFrameInfoKHR( *reinterpret_cast<VideoEncodeAV1GopRemainingFrameInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1GopRemainingFrameInfoKHR & operator=( VideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1GopRemainingFrameInfoKHR & operator=( VkVideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1GopRemainingFrameInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1GopRemainingFrameInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1GopRemainingFrameInfoKHR & setUseGopRemainingFrames( Bool32 useGopRemainingFrames_ ) VULKAN_HPP_NOEXCEPT
-    {
-      useGopRemainingFrames = useGopRemainingFrames_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1GopRemainingFrameInfoKHR & setGopRemainingIntra( uint32_t gopRemainingIntra_ ) VULKAN_HPP_NOEXCEPT
-    {
-      gopRemainingIntra = gopRemainingIntra_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1GopRemainingFrameInfoKHR & setGopRemainingPredictive( uint32_t gopRemainingPredictive_ ) VULKAN_HPP_NOEXCEPT
-    {
-      gopRemainingPredictive = gopRemainingPredictive_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1GopRemainingFrameInfoKHR & setGopRemainingBipredictive( uint32_t gopRemainingBipredictive_ ) VULKAN_HPP_NOEXCEPT
-    {
-      gopRemainingBipredictive = gopRemainingBipredictive_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1GopRemainingFrameInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1GopRemainingFrameInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1GopRemainingFrameInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1GopRemainingFrameInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1GopRemainingFrameInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1GopRemainingFrameInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1GopRemainingFrameInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1GopRemainingFrameInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, uint32_t const &, uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, useGopRemainingFrames, gopRemainingIntra, gopRemainingPredictive, gopRemainingBipredictive );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1GopRemainingFrameInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( useGopRemainingFrames == rhs.useGopRemainingFrames ) &&
-             ( gopRemainingIntra == rhs.gopRemainingIntra ) && ( gopRemainingPredictive == rhs.gopRemainingPredictive ) &&
-             ( gopRemainingBipredictive == rhs.gopRemainingBipredictive );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1GopRemainingFrameInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::eVideoEncodeAv1GopRemainingFrameInfoKHR;
-    const void *  pNext                    = {};
-    Bool32        useGopRemainingFrames    = {};
-    uint32_t      gopRemainingIntra        = {};
-    uint32_t      gopRemainingPredictive   = {};
-    uint32_t      gopRemainingBipredictive = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1GopRemainingFrameInfoKHR>
-  {
-    using Type = VideoEncodeAV1GopRemainingFrameInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1GopRemainingFrameInfoKHR>
-  {
-    using Type = VideoEncodeAV1GopRemainingFrameInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1PictureInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1PictureInfoKHR.html
-  struct VideoEncodeAV1PictureInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1PictureInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1PictureInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR( VideoEncodeAV1PredictionModeKHR      predictionMode_   = VideoEncodeAV1PredictionModeKHR::eIntraOnly,
-                                                          VideoEncodeAV1RateControlGroupKHR    rateControlGroup_ = VideoEncodeAV1RateControlGroupKHR::eIntra,
-                                                          uint32_t                             constantQIndex_   = {},
-                                                          const StdVideoEncodeAV1PictureInfo * pStdPictureInfo_  = {},
-                                                          std::array<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const & referenceNameSlotIndices_ = {},
-                                                          Bool32                                                                 primaryReferenceCdfOnly_  = {},
-                                                          Bool32       generateObuExtensionHeader_                                                         = {},
-                                                          const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , predictionMode{ predictionMode_ }
-      , rateControlGroup{ rateControlGroup_ }
-      , constantQIndex{ constantQIndex_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , referenceNameSlotIndices{ referenceNameSlotIndices_ }
-      , primaryReferenceCdfOnly{ primaryReferenceCdfOnly_ }
-      , generateObuExtensionHeader{ generateObuExtensionHeader_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR( VideoEncodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1PictureInfoKHR( VkVideoEncodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1PictureInfoKHR( *reinterpret_cast<VideoEncodeAV1PictureInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1PictureInfoKHR & operator=( VideoEncodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1PictureInfoKHR & operator=( VkVideoEncodeAV1PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1PictureInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setPredictionMode( VideoEncodeAV1PredictionModeKHR predictionMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      predictionMode = predictionMode_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setRateControlGroup( VideoEncodeAV1RateControlGroupKHR rateControlGroup_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rateControlGroup = rateControlGroup_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setConstantQIndex( uint32_t constantQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      constantQIndex = constantQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setPStdPictureInfo( const StdVideoEncodeAV1PictureInfo * pStdPictureInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdPictureInfo = pStdPictureInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR &
-      setReferenceNameSlotIndices( std::array<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices_ ) VULKAN_HPP_NOEXCEPT
-    {
-      referenceNameSlotIndices = referenceNameSlotIndices_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setPrimaryReferenceCdfOnly( Bool32 primaryReferenceCdfOnly_ ) VULKAN_HPP_NOEXCEPT
-    {
-      primaryReferenceCdfOnly = primaryReferenceCdfOnly_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1PictureInfoKHR & setGenerateObuExtensionHeader( Bool32 generateObuExtensionHeader_ ) VULKAN_HPP_NOEXCEPT
-    {
-      generateObuExtensionHeader = generateObuExtensionHeader_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1PictureInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1PictureInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               VideoEncodeAV1PredictionModeKHR const &,
-               VideoEncodeAV1RateControlGroupKHR const &,
-               uint32_t const &,
-               const StdVideoEncodeAV1PictureInfo * const &,
-               ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       predictionMode,
-                       rateControlGroup,
-                       constantQIndex,
-                       pStdPictureInfo,
-                       referenceNameSlotIndices,
-                       primaryReferenceCdfOnly,
-                       generateObuExtensionHeader );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1PictureInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1PictureInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( predictionMode == rhs.predictionMode ) && ( rateControlGroup == rhs.rateControlGroup ) &&
-             ( constantQIndex == rhs.constantQIndex ) && ( pStdPictureInfo == rhs.pStdPictureInfo ) &&
-             ( referenceNameSlotIndices == rhs.referenceNameSlotIndices ) && ( primaryReferenceCdfOnly == rhs.primaryReferenceCdfOnly ) &&
-             ( generateObuExtensionHeader == rhs.generateObuExtensionHeader );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1PictureInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                                                      sType                      = StructureType::eVideoEncodeAv1PictureInfoKHR;
-    const void *                                                       pNext                      = {};
-    VideoEncodeAV1PredictionModeKHR                                    predictionMode             = VideoEncodeAV1PredictionModeKHR::eIntraOnly;
-    VideoEncodeAV1RateControlGroupKHR                                  rateControlGroup           = VideoEncodeAV1RateControlGroupKHR::eIntra;
-    uint32_t                                                           constantQIndex             = {};
-    const StdVideoEncodeAV1PictureInfo *                               pStdPictureInfo            = {};
-    ArrayWrapper1D<int32_t, VK_MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR> referenceNameSlotIndices   = {};
-    Bool32                                                             primaryReferenceCdfOnly    = {};
-    Bool32                                                             generateObuExtensionHeader = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1PictureInfoKHR>
-  {
-    using Type = VideoEncodeAV1PictureInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1PictureInfoKHR>
-  {
-    using Type = VideoEncodeAV1PictureInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1ProfileInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1ProfileInfoKHR.html
-  struct VideoEncodeAV1ProfileInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1ProfileInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1ProfileInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1ProfileInfoKHR( StdVideoAV1Profile stdProfile_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfile{ stdProfile_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1ProfileInfoKHR( VideoEncodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1ProfileInfoKHR( VkVideoEncodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1ProfileInfoKHR( *reinterpret_cast<VideoEncodeAV1ProfileInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1ProfileInfoKHR & operator=( VideoEncodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1ProfileInfoKHR & operator=( VkVideoEncodeAV1ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1ProfileInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1ProfileInfoKHR & setStdProfile( StdVideoAV1Profile stdProfile_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stdProfile = stdProfile_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1ProfileInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1ProfileInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoAV1Profile const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, stdProfile );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( VideoEncodeAV1ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = memcmp( &stdProfile, &rhs.stdProfile, sizeof( StdVideoAV1Profile ) ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( VideoEncodeAV1ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( memcmp( &stdProfile, &rhs.stdProfile, sizeof( StdVideoAV1Profile ) ) == 0 );
-    }
-
-    bool operator!=( VideoEncodeAV1ProfileInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType      sType      = StructureType::eVideoEncodeAv1ProfileInfoKHR;
-    const void *       pNext      = {};
-    StdVideoAV1Profile stdProfile = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1ProfileInfoKHR>
-  {
-    using Type = VideoEncodeAV1ProfileInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1ProfileInfoKHR>
-  {
-    using Type = VideoEncodeAV1ProfileInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1QIndexKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1QIndexKHR.html
-  struct VideoEncodeAV1QIndexKHR
-  {
-    using NativeType = VkVideoEncodeAV1QIndexKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeAV1QIndexKHR( uint32_t intraQIndex_ = {}, uint32_t predictiveQIndex_ = {}, uint32_t bipredictiveQIndex_ = {} ) VULKAN_HPP_NOEXCEPT
-      : intraQIndex{ intraQIndex_ }
-      , predictiveQIndex{ predictiveQIndex_ }
-      , bipredictiveQIndex{ bipredictiveQIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1QIndexKHR( VideoEncodeAV1QIndexKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1QIndexKHR( VkVideoEncodeAV1QIndexKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1QIndexKHR( *reinterpret_cast<VideoEncodeAV1QIndexKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1QIndexKHR & operator=( VideoEncodeAV1QIndexKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1QIndexKHR & operator=( VkVideoEncodeAV1QIndexKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1QIndexKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1QIndexKHR & setIntraQIndex( uint32_t intraQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      intraQIndex = intraQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1QIndexKHR & setPredictiveQIndex( uint32_t predictiveQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      predictiveQIndex = predictiveQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1QIndexKHR & setBipredictiveQIndex( uint32_t bipredictiveQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      bipredictiveQIndex = bipredictiveQIndex_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1QIndexKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1QIndexKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QIndexKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1QIndexKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QIndexKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1QIndexKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QIndexKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1QIndexKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( intraQIndex, predictiveQIndex, bipredictiveQIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1QIndexKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1QIndexKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( intraQIndex == rhs.intraQIndex ) && ( predictiveQIndex == rhs.predictiveQIndex ) && ( bipredictiveQIndex == rhs.bipredictiveQIndex );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1QIndexKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    uint32_t intraQIndex        = {};
-    uint32_t predictiveQIndex   = {};
-    uint32_t bipredictiveQIndex = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1QIndexKHR>
-  {
-    using Type = VideoEncodeAV1QIndexKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeAV1QualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1QualityLevelPropertiesKHR.html
-  struct VideoEncodeAV1QualityLevelPropertiesKHR
-  {
-    using NativeType = VkVideoEncodeAV1QualityLevelPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1QualityLevelPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1QualityLevelPropertiesKHR( VideoEncodeAV1RateControlFlagsKHR preferredRateControlFlags_                        = {},
-                                                                  uint32_t                          preferredGopFrameCount_                           = {},
-                                                                  uint32_t                          preferredKeyFramePeriod_                          = {},
-                                                                  uint32_t                          preferredConsecutiveBipredictiveFrameCount_       = {},
-                                                                  uint32_t                          preferredTemporalLayerCount_                      = {},
-                                                                  VideoEncodeAV1QIndexKHR           preferredConstantQIndex_                          = {},
-                                                                  uint32_t                          preferredMaxSingleReferenceCount_                 = {},
-                                                                  uint32_t                          preferredSingleReferenceNameMask_                 = {},
-                                                                  uint32_t                          preferredMaxUnidirectionalCompoundReferenceCount_ = {},
-                                                                  uint32_t preferredMaxUnidirectionalCompoundGroup1ReferenceCount_                    = {},
-                                                                  uint32_t preferredUnidirectionalCompoundReferenceNameMask_                          = {},
-                                                                  uint32_t preferredMaxBidirectionalCompoundReferenceCount_                           = {},
-                                                                  uint32_t preferredMaxBidirectionalCompoundGroup1ReferenceCount_                     = {},
-                                                                  uint32_t preferredMaxBidirectionalCompoundGroup2ReferenceCount_                     = {},
-                                                                  uint32_t preferredBidirectionalCompoundReferenceNameMask_                           = {},
-                                                                  void *   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , preferredRateControlFlags{ preferredRateControlFlags_ }
-      , preferredGopFrameCount{ preferredGopFrameCount_ }
-      , preferredKeyFramePeriod{ preferredKeyFramePeriod_ }
-      , preferredConsecutiveBipredictiveFrameCount{ preferredConsecutiveBipredictiveFrameCount_ }
-      , preferredTemporalLayerCount{ preferredTemporalLayerCount_ }
-      , preferredConstantQIndex{ preferredConstantQIndex_ }
-      , preferredMaxSingleReferenceCount{ preferredMaxSingleReferenceCount_ }
-      , preferredSingleReferenceNameMask{ preferredSingleReferenceNameMask_ }
-      , preferredMaxUnidirectionalCompoundReferenceCount{ preferredMaxUnidirectionalCompoundReferenceCount_ }
-      , preferredMaxUnidirectionalCompoundGroup1ReferenceCount{ preferredMaxUnidirectionalCompoundGroup1ReferenceCount_ }
-      , preferredUnidirectionalCompoundReferenceNameMask{ preferredUnidirectionalCompoundReferenceNameMask_ }
-      , preferredMaxBidirectionalCompoundReferenceCount{ preferredMaxBidirectionalCompoundReferenceCount_ }
-      , preferredMaxBidirectionalCompoundGroup1ReferenceCount{ preferredMaxBidirectionalCompoundGroup1ReferenceCount_ }
-      , preferredMaxBidirectionalCompoundGroup2ReferenceCount{ preferredMaxBidirectionalCompoundGroup2ReferenceCount_ }
-      , preferredBidirectionalCompoundReferenceNameMask{ preferredBidirectionalCompoundReferenceNameMask_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1QualityLevelPropertiesKHR( VideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1QualityLevelPropertiesKHR( VkVideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1QualityLevelPropertiesKHR( *reinterpret_cast<VideoEncodeAV1QualityLevelPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1QualityLevelPropertiesKHR & operator=( VideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1QualityLevelPropertiesKHR & operator=( VkVideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1QualityLevelPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeAV1QualityLevelPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1QualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QualityLevelPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1QualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QualityLevelPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1QualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QualityLevelPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1QualityLevelPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               VideoEncodeAV1RateControlFlagsKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               VideoEncodeAV1QIndexKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       preferredRateControlFlags,
-                       preferredGopFrameCount,
-                       preferredKeyFramePeriod,
-                       preferredConsecutiveBipredictiveFrameCount,
-                       preferredTemporalLayerCount,
-                       preferredConstantQIndex,
-                       preferredMaxSingleReferenceCount,
-                       preferredSingleReferenceNameMask,
-                       preferredMaxUnidirectionalCompoundReferenceCount,
-                       preferredMaxUnidirectionalCompoundGroup1ReferenceCount,
-                       preferredUnidirectionalCompoundReferenceNameMask,
-                       preferredMaxBidirectionalCompoundReferenceCount,
-                       preferredMaxBidirectionalCompoundGroup1ReferenceCount,
-                       preferredMaxBidirectionalCompoundGroup2ReferenceCount,
-                       preferredBidirectionalCompoundReferenceNameMask );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1QualityLevelPropertiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( preferredRateControlFlags == rhs.preferredRateControlFlags ) &&
-             ( preferredGopFrameCount == rhs.preferredGopFrameCount ) && ( preferredKeyFramePeriod == rhs.preferredKeyFramePeriod ) &&
-             ( preferredConsecutiveBipredictiveFrameCount == rhs.preferredConsecutiveBipredictiveFrameCount ) &&
-             ( preferredTemporalLayerCount == rhs.preferredTemporalLayerCount ) && ( preferredConstantQIndex == rhs.preferredConstantQIndex ) &&
-             ( preferredMaxSingleReferenceCount == rhs.preferredMaxSingleReferenceCount ) &&
-             ( preferredSingleReferenceNameMask == rhs.preferredSingleReferenceNameMask ) &&
-             ( preferredMaxUnidirectionalCompoundReferenceCount == rhs.preferredMaxUnidirectionalCompoundReferenceCount ) &&
-             ( preferredMaxUnidirectionalCompoundGroup1ReferenceCount == rhs.preferredMaxUnidirectionalCompoundGroup1ReferenceCount ) &&
-             ( preferredUnidirectionalCompoundReferenceNameMask == rhs.preferredUnidirectionalCompoundReferenceNameMask ) &&
-             ( preferredMaxBidirectionalCompoundReferenceCount == rhs.preferredMaxBidirectionalCompoundReferenceCount ) &&
-             ( preferredMaxBidirectionalCompoundGroup1ReferenceCount == rhs.preferredMaxBidirectionalCompoundGroup1ReferenceCount ) &&
-             ( preferredMaxBidirectionalCompoundGroup2ReferenceCount == rhs.preferredMaxBidirectionalCompoundGroup2ReferenceCount ) &&
-             ( preferredBidirectionalCompoundReferenceNameMask == rhs.preferredBidirectionalCompoundReferenceNameMask );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1QualityLevelPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType                                                  = StructureType::eVideoEncodeAv1QualityLevelPropertiesKHR;
-    void *                            pNext                                                  = {};
-    VideoEncodeAV1RateControlFlagsKHR preferredRateControlFlags                              = {};
-    uint32_t                          preferredGopFrameCount                                 = {};
-    uint32_t                          preferredKeyFramePeriod                                = {};
-    uint32_t                          preferredConsecutiveBipredictiveFrameCount             = {};
-    uint32_t                          preferredTemporalLayerCount                            = {};
-    VideoEncodeAV1QIndexKHR           preferredConstantQIndex                                = {};
-    uint32_t                          preferredMaxSingleReferenceCount                       = {};
-    uint32_t                          preferredSingleReferenceNameMask                       = {};
-    uint32_t                          preferredMaxUnidirectionalCompoundReferenceCount       = {};
-    uint32_t                          preferredMaxUnidirectionalCompoundGroup1ReferenceCount = {};
-    uint32_t                          preferredUnidirectionalCompoundReferenceNameMask       = {};
-    uint32_t                          preferredMaxBidirectionalCompoundReferenceCount        = {};
-    uint32_t                          preferredMaxBidirectionalCompoundGroup1ReferenceCount  = {};
-    uint32_t                          preferredMaxBidirectionalCompoundGroup2ReferenceCount  = {};
-    uint32_t                          preferredBidirectionalCompoundReferenceNameMask        = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1QualityLevelPropertiesKHR>
-  {
-    using Type = VideoEncodeAV1QualityLevelPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1QualityLevelPropertiesKHR>
-  {
-    using Type = VideoEncodeAV1QualityLevelPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1QuantizationMapCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1QuantizationMapCapabilitiesKHR.html
-  struct VideoEncodeAV1QuantizationMapCapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeAV1QuantizationMapCapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1QuantizationMapCapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeAV1QuantizationMapCapabilitiesKHR( int32_t minQIndexDelta_ = {}, int32_t maxQIndexDelta_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minQIndexDelta{ minQIndexDelta_ }
-      , maxQIndexDelta{ maxQIndexDelta_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1QuantizationMapCapabilitiesKHR( VideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1QuantizationMapCapabilitiesKHR( VkVideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1QuantizationMapCapabilitiesKHR( *reinterpret_cast<VideoEncodeAV1QuantizationMapCapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1QuantizationMapCapabilitiesKHR & operator=( VideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1QuantizationMapCapabilitiesKHR & operator=( VkVideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1QuantizationMapCapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeAV1QuantizationMapCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QuantizationMapCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QuantizationMapCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1QuantizationMapCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, minQIndexDelta, maxQIndexDelta );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1QuantizationMapCapabilitiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( minQIndexDelta == rhs.minQIndexDelta ) && ( maxQIndexDelta == rhs.maxQIndexDelta );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType          = StructureType::eVideoEncodeAv1QuantizationMapCapabilitiesKHR;
-    void *        pNext          = {};
-    int32_t       minQIndexDelta = {};
-    int32_t       maxQIndexDelta = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeAV1QuantizationMapCapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeAV1QuantizationMapCapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1RateControlInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1RateControlInfoKHR.html
-  struct VideoEncodeAV1RateControlInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1RateControlInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1RateControlInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1RateControlInfoKHR( VideoEncodeAV1RateControlFlagsKHR flags_                             = {},
-                                                           uint32_t                          gopFrameCount_                     = {},
-                                                           uint32_t                          keyFramePeriod_                    = {},
-                                                           uint32_t                          consecutiveBipredictiveFrameCount_ = {},
-                                                           uint32_t                          temporalLayerCount_                = {},
-                                                           const void *                      pNext_                             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , gopFrameCount{ gopFrameCount_ }
-      , keyFramePeriod{ keyFramePeriod_ }
-      , consecutiveBipredictiveFrameCount{ consecutiveBipredictiveFrameCount_ }
-      , temporalLayerCount{ temporalLayerCount_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1RateControlInfoKHR( VideoEncodeAV1RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1RateControlInfoKHR( VkVideoEncodeAV1RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1RateControlInfoKHR( *reinterpret_cast<VideoEncodeAV1RateControlInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1RateControlInfoKHR & operator=( VideoEncodeAV1RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1RateControlInfoKHR & operator=( VkVideoEncodeAV1RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1RateControlInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR & setFlags( VideoEncodeAV1RateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
-    {
-      flags = flags_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR & setGopFrameCount( uint32_t gopFrameCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      gopFrameCount = gopFrameCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR & setKeyFramePeriod( uint32_t keyFramePeriod_ ) VULKAN_HPP_NOEXCEPT
-    {
-      keyFramePeriod = keyFramePeriod_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR &
-      setConsecutiveBipredictiveFrameCount( uint32_t consecutiveBipredictiveFrameCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      consecutiveBipredictiveFrameCount = consecutiveBipredictiveFrameCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlInfoKHR & setTemporalLayerCount( uint32_t temporalLayerCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      temporalLayerCount = temporalLayerCount_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1RateControlInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1RateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1RateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1RateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1RateControlInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               VideoEncodeAV1RateControlFlagsKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &,
-               uint32_t const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, flags, gopFrameCount, keyFramePeriod, consecutiveBipredictiveFrameCount, temporalLayerCount );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1RateControlInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1RateControlInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( flags == rhs.flags ) && ( gopFrameCount == rhs.gopFrameCount ) &&
-             ( keyFramePeriod == rhs.keyFramePeriod ) && ( consecutiveBipredictiveFrameCount == rhs.consecutiveBipredictiveFrameCount ) &&
-             ( temporalLayerCount == rhs.temporalLayerCount );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1RateControlInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                     sType                             = StructureType::eVideoEncodeAv1RateControlInfoKHR;
-    const void *                      pNext                             = {};
-    VideoEncodeAV1RateControlFlagsKHR flags                             = {};
-    uint32_t                          gopFrameCount                     = {};
-    uint32_t                          keyFramePeriod                    = {};
-    uint32_t                          consecutiveBipredictiveFrameCount = {};
-    uint32_t                          temporalLayerCount                = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1RateControlInfoKHR>
-  {
-    using Type = VideoEncodeAV1RateControlInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1RateControlInfoKHR>
-  {
-    using Type = VideoEncodeAV1RateControlInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1RateControlLayerInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1RateControlLayerInfoKHR.html
-  struct VideoEncodeAV1RateControlLayerInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1RateControlLayerInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1RateControlLayerInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1RateControlLayerInfoKHR( Bool32                     useMinQIndex_    = {},
-                                                                VideoEncodeAV1QIndexKHR    minQIndex_       = {},
-                                                                Bool32                     useMaxQIndex_    = {},
-                                                                VideoEncodeAV1QIndexKHR    maxQIndex_       = {},
-                                                                Bool32                     useMaxFrameSize_ = {},
-                                                                VideoEncodeAV1FrameSizeKHR maxFrameSize_    = {},
-                                                                const void *               pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMinQIndex{ useMinQIndex_ }
-      , minQIndex{ minQIndex_ }
-      , useMaxQIndex{ useMaxQIndex_ }
-      , maxQIndex{ maxQIndex_ }
-      , useMaxFrameSize{ useMaxFrameSize_ }
-      , maxFrameSize{ maxFrameSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1RateControlLayerInfoKHR( VideoEncodeAV1RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1RateControlLayerInfoKHR( VkVideoEncodeAV1RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1RateControlLayerInfoKHR( *reinterpret_cast<VideoEncodeAV1RateControlLayerInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1RateControlLayerInfoKHR & operator=( VideoEncodeAV1RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1RateControlLayerInfoKHR & operator=( VkVideoEncodeAV1RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1RateControlLayerInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setUseMinQIndex( Bool32 useMinQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      useMinQIndex = useMinQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setMinQIndex( VideoEncodeAV1QIndexKHR const & minQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      minQIndex = minQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setUseMaxQIndex( Bool32 useMaxQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      useMaxQIndex = useMaxQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setMaxQIndex( VideoEncodeAV1QIndexKHR const & maxQIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxQIndex = maxQIndex_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setUseMaxFrameSize( Bool32 useMaxFrameSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      useMaxFrameSize = useMaxFrameSize_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1RateControlLayerInfoKHR & setMaxFrameSize( VideoEncodeAV1FrameSizeKHR const & maxFrameSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxFrameSize = maxFrameSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1RateControlLayerInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1RateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlLayerInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1RateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlLayerInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1RateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1RateControlLayerInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1RateControlLayerInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               Bool32 const &,
-               VideoEncodeAV1QIndexKHR const &,
-               Bool32 const &,
-               VideoEncodeAV1QIndexKHR const &,
-               Bool32 const &,
-               VideoEncodeAV1FrameSizeKHR const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, useMinQIndex, minQIndex, useMaxQIndex, maxQIndex, useMaxFrameSize, maxFrameSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1RateControlLayerInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1RateControlLayerInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( useMinQIndex == rhs.useMinQIndex ) && ( minQIndex == rhs.minQIndex ) &&
-             ( useMaxQIndex == rhs.useMaxQIndex ) && ( maxQIndex == rhs.maxQIndex ) && ( useMaxFrameSize == rhs.useMaxFrameSize ) &&
-             ( maxFrameSize == rhs.maxFrameSize );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1RateControlLayerInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType              sType           = StructureType::eVideoEncodeAv1RateControlLayerInfoKHR;
-    const void *               pNext           = {};
-    Bool32                     useMinQIndex    = {};
-    VideoEncodeAV1QIndexKHR    minQIndex       = {};
-    Bool32                     useMaxQIndex    = {};
-    VideoEncodeAV1QIndexKHR    maxQIndex       = {};
-    Bool32                     useMaxFrameSize = {};
-    VideoEncodeAV1FrameSizeKHR maxFrameSize    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1RateControlLayerInfoKHR>
-  {
-    using Type = VideoEncodeAV1RateControlLayerInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1RateControlLayerInfoKHR>
-  {
-    using Type = VideoEncodeAV1RateControlLayerInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1SessionCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1SessionCreateInfoKHR.html
-  struct VideoEncodeAV1SessionCreateInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1SessionCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1SessionCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeAV1SessionCreateInfoKHR( Bool32 useMaxLevel_ = {}, StdVideoAV1Level maxLevel_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMaxLevel{ useMaxLevel_ }
-      , maxLevel{ maxLevel_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1SessionCreateInfoKHR( VideoEncodeAV1SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1SessionCreateInfoKHR( VkVideoEncodeAV1SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1SessionCreateInfoKHR( *reinterpret_cast<VideoEncodeAV1SessionCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeAV1SessionCreateInfoKHR & operator=( VideoEncodeAV1SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1SessionCreateInfoKHR & operator=( VkVideoEncodeAV1SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1SessionCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionCreateInfoKHR & setUseMaxLevel( Bool32 useMaxLevel_ ) VULKAN_HPP_NOEXCEPT
-    {
-      useMaxLevel = useMaxLevel_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionCreateInfoKHR & setMaxLevel( StdVideoAV1Level maxLevel_ ) VULKAN_HPP_NOEXCEPT
-    {
-      maxLevel = maxLevel_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1SessionCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1SessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1SessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1SessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1SessionCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, StdVideoAV1Level const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, useMaxLevel, maxLevel );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    std::strong_ordering operator<=>( VideoEncodeAV1SessionCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      if ( auto cmp = sType <=> rhs.sType; cmp != 0 )
-        return cmp;
-      if ( auto cmp = pNext <=> rhs.pNext; cmp != 0 )
-        return cmp;
-      if ( auto cmp = useMaxLevel <=> rhs.useMaxLevel; cmp != 0 )
-        return cmp;
-      if ( auto cmp = memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoAV1Level ) ); cmp != 0 )
-        return ( cmp < 0 ) ? std::strong_ordering::less : std::strong_ordering::greater;
-
-      return std::strong_ordering::equivalent;
-    }
-#endif
-
-    bool operator==( VideoEncodeAV1SessionCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( useMaxLevel == rhs.useMaxLevel ) &&
-             ( memcmp( &maxLevel, &rhs.maxLevel, sizeof( StdVideoAV1Level ) ) == 0 );
-    }
-
-    bool operator!=( VideoEncodeAV1SessionCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-
-  public:
-    StructureType    sType       = StructureType::eVideoEncodeAv1SessionCreateInfoKHR;
-    const void *     pNext       = {};
-    Bool32           useMaxLevel = {};
-    StdVideoAV1Level maxLevel    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1SessionCreateInfoKHR>
-  {
-    using Type = VideoEncodeAV1SessionCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1SessionCreateInfoKHR>
-  {
-    using Type = VideoEncodeAV1SessionCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeAV1SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeAV1SessionParametersCreateInfoKHR.html
-  struct VideoEncodeAV1SessionParametersCreateInfoKHR
-  {
-    using NativeType = VkVideoEncodeAV1SessionParametersCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeAv1SessionParametersCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1SessionParametersCreateInfoKHR( const StdVideoAV1SequenceHeader *           pStdSequenceHeader_     = {},
-                                                                       const StdVideoEncodeAV1DecoderModelInfo *   pStdDecoderModelInfo_   = {},
-                                                                       uint32_t                                    stdOperatingPointCount_ = {},
-                                                                       const StdVideoEncodeAV1OperatingPointInfo * pStdOperatingPoints_    = {},
-                                                                       const void *                                pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdSequenceHeader{ pStdSequenceHeader_ }
-      , pStdDecoderModelInfo{ pStdDecoderModelInfo_ }
-      , stdOperatingPointCount{ stdOperatingPointCount_ }
-      , pStdOperatingPoints{ pStdOperatingPoints_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeAV1SessionParametersCreateInfoKHR( VideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeAV1SessionParametersCreateInfoKHR( VkVideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeAV1SessionParametersCreateInfoKHR( *reinterpret_cast<VideoEncodeAV1SessionParametersCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeAV1SessionParametersCreateInfoKHR( const StdVideoAV1SequenceHeader *                                          pStdSequenceHeader_,
-                                                  const StdVideoEncodeAV1DecoderModelInfo *                                  pStdDecoderModelInfo_,
-                                                  ArrayProxyNoTemporaries<const StdVideoEncodeAV1OperatingPointInfo> const & stdOperatingPoints_,
-                                                  const void *                                                               pNext_ = nullptr )
-      : pNext( pNext_ )
-      , pStdSequenceHeader( pStdSequenceHeader_ )
-      , pStdDecoderModelInfo( pStdDecoderModelInfo_ )
-      , stdOperatingPointCount( static_cast<uint32_t>( stdOperatingPoints_.size() ) )
-      , pStdOperatingPoints( stdOperatingPoints_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    VideoEncodeAV1SessionParametersCreateInfoKHR & operator=( VideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeAV1SessionParametersCreateInfoKHR & operator=( VkVideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeAV1SessionParametersCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionParametersCreateInfoKHR &
-      setPStdSequenceHeader( const StdVideoAV1SequenceHeader * pStdSequenceHeader_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdSequenceHeader = pStdSequenceHeader_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionParametersCreateInfoKHR &
-      setPStdDecoderModelInfo( const StdVideoEncodeAV1DecoderModelInfo * pStdDecoderModelInfo_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdDecoderModelInfo = pStdDecoderModelInfo_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionParametersCreateInfoKHR & setStdOperatingPointCount( uint32_t stdOperatingPointCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stdOperatingPointCount = stdOperatingPointCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeAV1SessionParametersCreateInfoKHR &
-      setPStdOperatingPoints( const StdVideoEncodeAV1OperatingPointInfo * pStdOperatingPoints_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pStdOperatingPoints = pStdOperatingPoints_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeAV1SessionParametersCreateInfoKHR &
-      setStdOperatingPoints( ArrayProxyNoTemporaries<const StdVideoEncodeAV1OperatingPointInfo> const & stdOperatingPoints_ ) VULKAN_HPP_NOEXCEPT
-    {
-      stdOperatingPointCount = static_cast<uint32_t>( stdOperatingPoints_.size() );
-      pStdOperatingPoints    = stdOperatingPoints_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeAV1SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionParametersCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeAV1SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeAV1SessionParametersCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               const StdVideoAV1SequenceHeader * const &,
-               const StdVideoEncodeAV1DecoderModelInfo * const &,
-               uint32_t const &,
-               const StdVideoEncodeAV1OperatingPointInfo * const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, pStdSequenceHeader, pStdDecoderModelInfo, stdOperatingPointCount, pStdOperatingPoints );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeAV1SessionParametersCreateInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( pStdSequenceHeader == rhs.pStdSequenceHeader ) &&
-             ( pStdDecoderModelInfo == rhs.pStdDecoderModelInfo ) && ( stdOperatingPointCount == rhs.stdOperatingPointCount ) &&
-             ( pStdOperatingPoints == rhs.pStdOperatingPoints );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeAV1SessionParametersCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                               sType                  = StructureType::eVideoEncodeAv1SessionParametersCreateInfoKHR;
-    const void *                                pNext                  = {};
-    const StdVideoAV1SequenceHeader *           pStdSequenceHeader     = {};
-    const StdVideoEncodeAV1DecoderModelInfo *   pStdDecoderModelInfo   = {};
-    uint32_t                                    stdOperatingPointCount = {};
-    const StdVideoEncodeAV1OperatingPointInfo * pStdOperatingPoints    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeAV1SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeAV1SessionParametersCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeAv1SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeAV1SessionParametersCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeCapabilitiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeCapabilitiesKHR.html
   struct VideoEncodeCapabilitiesKHR
   {
     using NativeType = VkVideoEncodeCapabilitiesKHR;
@@ -164971,23 +118662,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeCapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeCapabilitiesKHR( VideoEncodeCapabilityFlagsKHR      flags_                         = {},
-                                                     VideoEncodeRateControlModeFlagsKHR rateControlModes_              = {},
-                                                     uint32_t                           maxRateControlLayers_          = {},
-                                                     uint64_t                           maxBitrate_                    = {},
-                                                     uint32_t                           maxQualityLevels_              = {},
-                                                     Extent2D                           encodeInputPictureGranularity_ = {},
-                                                     VideoEncodeFeedbackFlagsKHR        supportedEncodeFeedbackFlags_  = {},
-                                                     void *                             pNext_                         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , rateControlModes{ rateControlModes_ }
-      , maxRateControlLayers{ maxRateControlLayers_ }
-      , maxBitrate{ maxBitrate_ }
-      , maxQualityLevels{ maxQualityLevels_ }
-      , encodeInputPictureGranularity{ encodeInputPictureGranularity_ }
-      , supportedEncodeFeedbackFlags{ supportedEncodeFeedbackFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeCapabilitiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeCapabilityFlagsKHR      flags_                         = {},
+                                                     VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagsKHR rateControlModes_              = {},
+                                                     uint32_t                                                 maxRateControlLayers_          = {},
+                                                     uint64_t                                                 maxBitrate_                    = {},
+                                                     uint32_t                                                 maxQualityLevels_              = {},
+                                                     VULKAN_HPP_NAMESPACE::Extent2D                           encodeInputPictureGranularity_ = {},
+                                                     VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR        supportedEncodeFeedbackFlags_  = {},
+                                                     void *                                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , rateControlModes( rateControlModes_ )
+      , maxRateControlLayers( maxRateControlLayers_ )
+      , maxBitrate( maxBitrate_ )
+      , maxQualityLevels( maxQualityLevels_ )
+      , encodeInputPictureGranularity( encodeInputPictureGranularity_ )
+      , supportedEncodeFeedbackFlags( supportedEncodeFeedbackFlags_ )
     {
     }
 
@@ -164999,11 +118690,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeCapabilitiesKHR & operator=( VideoEncodeCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeCapabilitiesKHR & operator=( VkVideoEncodeCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeCapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeCapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -165017,26 +118708,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeCapabilitiesKHR *>( this );
     }
 
-    operator VkVideoEncodeCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeCapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoEncodeCapabilityFlagsKHR const &,
-               VideoEncodeRateControlModeFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeCapabilityFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagsKHR const &,
                uint32_t const &,
                uint64_t const &,
                uint32_t const &,
-               Extent2D const &,
-               VideoEncodeFeedbackFlagsKHR const &>
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -165072,33 +118757,23 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                         = StructureType::eVideoEncodeCapabilitiesKHR;
-    void *                             pNext                         = {};
-    VideoEncodeCapabilityFlagsKHR      flags                         = {};
-    VideoEncodeRateControlModeFlagsKHR rateControlModes              = {};
-    uint32_t                           maxRateControlLayers          = {};
-    uint64_t                           maxBitrate                    = {};
-    uint32_t                           maxQualityLevels              = {};
-    Extent2D                           encodeInputPictureGranularity = {};
-    VideoEncodeFeedbackFlagsKHR        supportedEncodeFeedbackFlags  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                         = StructureType::eVideoEncodeCapabilitiesKHR;
+    void *                                                   pNext                         = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeCapabilityFlagsKHR      flags                         = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagsKHR rateControlModes              = {};
+    uint32_t                                                 maxRateControlLayers          = {};
+    uint64_t                                                 maxBitrate                    = {};
+    uint32_t                                                 maxQualityLevels              = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                           encodeInputPictureGranularity = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeFeedbackFlagsKHR        supportedEncodeFeedbackFlags  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeCapabilitiesKHR>
-  {
-    using Type = VideoEncodeCapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeCapabilitiesKHR>
   {
     using Type = VideoEncodeCapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264CapabilitiesKHR.html
   struct VideoEncodeH264CapabilitiesKHR
   {
     using NativeType = VkVideoEncodeH264CapabilitiesKHR;
@@ -165106,35 +118781,35 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264CapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264CapabilitiesKHR( VideoEncodeH264CapabilityFlagsKHR flags_                            = {},
-                                                         StdVideoH264LevelIdc              maxLevelIdc_                      = {},
-                                                         uint32_t                          maxSliceCount_                    = {},
-                                                         uint32_t                          maxPPictureL0ReferenceCount_      = {},
-                                                         uint32_t                          maxBPictureL0ReferenceCount_      = {},
-                                                         uint32_t                          maxL1ReferenceCount_              = {},
-                                                         uint32_t                          maxTemporalLayerCount_            = {},
-                                                         Bool32                            expectDyadicTemporalLayerPattern_ = {},
-                                                         int32_t                           minQp_                            = {},
-                                                         int32_t                           maxQp_                            = {},
-                                                         Bool32                            prefersGopRemainingFrames_        = {},
-                                                         Bool32                            requiresGopRemainingFrames_       = {},
-                                                         VideoEncodeH264StdFlagsKHR        stdSyntaxFlags_                   = {},
-                                                         void *                            pNext_                            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , maxLevelIdc{ maxLevelIdc_ }
-      , maxSliceCount{ maxSliceCount_ }
-      , maxPPictureL0ReferenceCount{ maxPPictureL0ReferenceCount_ }
-      , maxBPictureL0ReferenceCount{ maxBPictureL0ReferenceCount_ }
-      , maxL1ReferenceCount{ maxL1ReferenceCount_ }
-      , maxTemporalLayerCount{ maxTemporalLayerCount_ }
-      , expectDyadicTemporalLayerPattern{ expectDyadicTemporalLayerPattern_ }
-      , minQp{ minQp_ }
-      , maxQp{ maxQp_ }
-      , prefersGopRemainingFrames{ prefersGopRemainingFrames_ }
-      , requiresGopRemainingFrames{ requiresGopRemainingFrames_ }
-      , stdSyntaxFlags{ stdSyntaxFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264CapabilitiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH264CapabilityFlagsKHR flags_                            = {},
+                                                         StdVideoH264LevelIdc                                    maxLevelIdc_                      = {},
+                                                         uint32_t                                                maxSliceCount_                    = {},
+                                                         uint32_t                                                maxPPictureL0ReferenceCount_      = {},
+                                                         uint32_t                                                maxBPictureL0ReferenceCount_      = {},
+                                                         uint32_t                                                maxL1ReferenceCount_              = {},
+                                                         uint32_t                                                maxTemporalLayerCount_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                            expectDyadicTemporalLayerPattern_ = {},
+                                                         int32_t                                                 minQp_                            = {},
+                                                         int32_t                                                 maxQp_                            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                            prefersGopRemainingFrames_        = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                            requiresGopRemainingFrames_       = {},
+                                                         VULKAN_HPP_NAMESPACE::VideoEncodeH264StdFlagsKHR        stdSyntaxFlags_                   = {},
+                                                         void *                                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , maxLevelIdc( maxLevelIdc_ )
+      , maxSliceCount( maxSliceCount_ )
+      , maxPPictureL0ReferenceCount( maxPPictureL0ReferenceCount_ )
+      , maxBPictureL0ReferenceCount( maxBPictureL0ReferenceCount_ )
+      , maxL1ReferenceCount( maxL1ReferenceCount_ )
+      , maxTemporalLayerCount( maxTemporalLayerCount_ )
+      , expectDyadicTemporalLayerPattern( expectDyadicTemporalLayerPattern_ )
+      , minQp( minQp_ )
+      , maxQp( maxQp_ )
+      , prefersGopRemainingFrames( prefersGopRemainingFrames_ )
+      , requiresGopRemainingFrames( requiresGopRemainingFrames_ )
+      , stdSyntaxFlags( stdSyntaxFlags_ )
     {
     }
 
@@ -165146,11 +118821,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264CapabilitiesKHR & operator=( VideoEncodeH264CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264CapabilitiesKHR & operator=( VkVideoEncodeH264CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264CapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264CapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -165164,32 +118839,26 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264CapabilitiesKHR *>( this );
     }
 
-    operator VkVideoEncodeH264CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264CapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoEncodeH264CapabilityFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264CapabilityFlagsKHR const &,
                StdVideoH264LevelIdc const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                int32_t const &,
                int32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               VideoEncodeH264StdFlagsKHR const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264StdFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -165265,39 +118934,29 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                     sType                            = StructureType::eVideoEncodeH264CapabilitiesKHR;
-    void *                            pNext                            = {};
-    VideoEncodeH264CapabilityFlagsKHR flags                            = {};
-    StdVideoH264LevelIdc              maxLevelIdc                      = {};
-    uint32_t                          maxSliceCount                    = {};
-    uint32_t                          maxPPictureL0ReferenceCount      = {};
-    uint32_t                          maxBPictureL0ReferenceCount      = {};
-    uint32_t                          maxL1ReferenceCount              = {};
-    uint32_t                          maxTemporalLayerCount            = {};
-    Bool32                            expectDyadicTemporalLayerPattern = {};
-    int32_t                           minQp                            = {};
-    int32_t                           maxQp                            = {};
-    Bool32                            prefersGopRemainingFrames        = {};
-    Bool32                            requiresGopRemainingFrames       = {};
-    VideoEncodeH264StdFlagsKHR        stdSyntaxFlags                   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                            = StructureType::eVideoEncodeH264CapabilitiesKHR;
+    void *                                                  pNext                            = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264CapabilityFlagsKHR flags                            = {};
+    StdVideoH264LevelIdc                                    maxLevelIdc                      = {};
+    uint32_t                                                maxSliceCount                    = {};
+    uint32_t                                                maxPPictureL0ReferenceCount      = {};
+    uint32_t                                                maxBPictureL0ReferenceCount      = {};
+    uint32_t                                                maxL1ReferenceCount              = {};
+    uint32_t                                                maxTemporalLayerCount            = {};
+    VULKAN_HPP_NAMESPACE::Bool32                            expectDyadicTemporalLayerPattern = {};
+    int32_t                                                 minQp                            = {};
+    int32_t                                                 maxQp                            = {};
+    VULKAN_HPP_NAMESPACE::Bool32                            prefersGopRemainingFrames        = {};
+    VULKAN_HPP_NAMESPACE::Bool32                            requiresGopRemainingFrames       = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264StdFlagsKHR        stdSyntaxFlags                   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264CapabilitiesKHR>
-  {
-    using Type = VideoEncodeH264CapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264CapabilitiesKHR>
   {
     using Type = VideoEncodeH264CapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264DpbSlotInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264DpbSlotInfoKHR.html
   struct VideoEncodeH264DpbSlotInfoKHR
   {
     using NativeType = VkVideoEncodeH264DpbSlotInfoKHR;
@@ -165305,11 +118964,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264DpbSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264DpbSlotInfoKHR( const StdVideoEncodeH264ReferenceInfo * pStdReferenceInfo_ = {},
                                                         const void *                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
+      : pNext( pNext_ )
+      , pStdReferenceInfo( pStdReferenceInfo_ )
     {
     }
 
@@ -165321,15 +118980,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264DpbSlotInfoKHR & operator=( VideoEncodeH264DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264DpbSlotInfoKHR & operator=( VkVideoEncodeH264DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264DpbSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264DpbSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -165342,7 +119001,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdReferenceInfo = pStdReferenceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -165354,18 +119013,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264DpbSlotInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264DpbSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoEncodeH264ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoEncodeH264ReferenceInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdReferenceInfo );
     }
@@ -165390,35 +119044,26 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType             = StructureType::eVideoEncodeH264DpbSlotInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::eVideoEncodeH264DpbSlotInfoKHR;
     const void *                            pNext             = {};
     const StdVideoEncodeH264ReferenceInfo * pStdReferenceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264DpbSlotInfoKHR>
-  {
-    using Type = VideoEncodeH264DpbSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264DpbSlotInfoKHR>
   {
     using Type = VideoEncodeH264DpbSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264FrameSizeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264FrameSizeKHR.html
   struct VideoEncodeH264FrameSizeKHR
   {
     using NativeType = VkVideoEncodeH264FrameSizeKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264FrameSizeKHR( uint32_t frameISize_ = {}, uint32_t framePSize_ = {}, uint32_t frameBSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : frameISize{ frameISize_ }
-      , framePSize{ framePSize_ }
-      , frameBSize{ frameBSize_ }
+      : frameISize( frameISize_ )
+      , framePSize( framePSize_ )
+      , frameBSize( frameBSize_ )
     {
     }
 
@@ -165430,15 +119075,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264FrameSizeKHR & operator=( VideoEncodeH264FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264FrameSizeKHR & operator=( VkVideoEncodeH264FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264FrameSizeKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264FrameSizeKHR & setFrameISize( uint32_t frameISize_ ) VULKAN_HPP_NOEXCEPT
     {
       frameISize = frameISize_;
@@ -165456,7 +119101,7 @@ namespace VULKAN_HPP_NAMESPACE
       frameBSize = frameBSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264FrameSizeKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -165468,18 +119113,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264FrameSizeKHR *>( this );
     }
 
-    operator VkVideoEncodeH264FrameSizeKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264FrameSizeKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264FrameSizeKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264FrameSizeKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( frameISize, framePSize, frameBSize );
     }
@@ -165509,16 +119149,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t frameBSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264FrameSizeKHR>
-  {
-    using Type = VideoEncodeH264FrameSizeKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeH264GopRemainingFrameInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264GopRemainingFrameInfoKHR.html
   struct VideoEncodeH264GopRemainingFrameInfoKHR
   {
     using NativeType = VkVideoEncodeH264GopRemainingFrameInfoKHR;
@@ -165526,17 +119156,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264GopRemainingFrameInfoKHR( Bool32       useGopRemainingFrames_ = {},
-                                                                  uint32_t     gopRemainingI_         = {},
-                                                                  uint32_t     gopRemainingP_         = {},
-                                                                  uint32_t     gopRemainingB_         = {},
-                                                                  const void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useGopRemainingFrames{ useGopRemainingFrames_ }
-      , gopRemainingI{ gopRemainingI_ }
-      , gopRemainingP{ gopRemainingP_ }
-      , gopRemainingB{ gopRemainingB_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264GopRemainingFrameInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 useGopRemainingFrames_ = {},
+                                                                  uint32_t                     gopRemainingI_         = {},
+                                                                  uint32_t                     gopRemainingP_         = {},
+                                                                  uint32_t                     gopRemainingB_         = {},
+                                                                  const void *                 pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useGopRemainingFrames( useGopRemainingFrames_ )
+      , gopRemainingI( gopRemainingI_ )
+      , gopRemainingP( gopRemainingP_ )
+      , gopRemainingB( gopRemainingB_ )
     {
     }
 
@@ -165548,22 +119178,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264GopRemainingFrameInfoKHR & operator=( VideoEncodeH264GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264GopRemainingFrameInfoKHR & operator=( VkVideoEncodeH264GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264GopRemainingFrameInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264GopRemainingFrameInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264GopRemainingFrameInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264GopRemainingFrameInfoKHR & setUseGopRemainingFrames( Bool32 useGopRemainingFrames_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264GopRemainingFrameInfoKHR &
+      setUseGopRemainingFrames( VULKAN_HPP_NAMESPACE::Bool32 useGopRemainingFrames_ ) VULKAN_HPP_NOEXCEPT
     {
       useGopRemainingFrames = useGopRemainingFrames_;
       return *this;
@@ -165586,7 +119217,7 @@ namespace VULKAN_HPP_NAMESPACE
       gopRemainingB = gopRemainingB_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264GopRemainingFrameInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -165598,18 +119229,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264GopRemainingFrameInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264GopRemainingFrameInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264GopRemainingFrameInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264GopRemainingFrameInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264GopRemainingFrameInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useGopRemainingFrames, gopRemainingI, gopRemainingP, gopRemainingB );
@@ -165636,30 +119266,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR;
-    const void *  pNext                 = {};
-    Bool32        useGopRemainingFrames = {};
-    uint32_t      gopRemainingI         = {};
-    uint32_t      gopRemainingP         = {};
-    uint32_t      gopRemainingB         = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR;
+    const void *                        pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        useGopRemainingFrames = {};
+    uint32_t                            gopRemainingI         = {};
+    uint32_t                            gopRemainingP         = {};
+    uint32_t                            gopRemainingB         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264GopRemainingFrameInfoKHR>
-  {
-    using Type = VideoEncodeH264GopRemainingFrameInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR>
   {
     using Type = VideoEncodeH264GopRemainingFrameInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264NaluSliceInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264NaluSliceInfoKHR.html
   struct VideoEncodeH264NaluSliceInfoKHR
   {
     using NativeType = VkVideoEncodeH264NaluSliceInfoKHR;
@@ -165667,13 +119287,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264NaluSliceInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264NaluSliceInfoKHR( int32_t                               constantQp_      = {},
                                                           const StdVideoEncodeH264SliceHeader * pStdSliceHeader_ = {},
                                                           const void *                          pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , constantQp{ constantQp_ }
-      , pStdSliceHeader{ pStdSliceHeader_ }
+      : pNext( pNext_ )
+      , constantQp( constantQp_ )
+      , pStdSliceHeader( pStdSliceHeader_ )
     {
     }
 
@@ -165685,15 +119305,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264NaluSliceInfoKHR & operator=( VideoEncodeH264NaluSliceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264NaluSliceInfoKHR & operator=( VkVideoEncodeH264NaluSliceInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264NaluSliceInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264NaluSliceInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -165711,7 +119331,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdSliceHeader = pStdSliceHeader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264NaluSliceInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -165723,18 +119343,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264NaluSliceInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264NaluSliceInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264NaluSliceInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264NaluSliceInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264NaluSliceInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, int32_t const &, const StdVideoEncodeH264SliceHeader * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, int32_t const &, const StdVideoEncodeH264SliceHeader * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, constantQp, pStdSliceHeader );
     }
@@ -165759,28 +119374,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType           = StructureType::eVideoEncodeH264NaluSliceInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType   sType           = StructureType::eVideoEncodeH264NaluSliceInfoKHR;
     const void *                          pNext           = {};
     int32_t                               constantQp      = {};
     const StdVideoEncodeH264SliceHeader * pStdSliceHeader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264NaluSliceInfoKHR>
-  {
-    using Type = VideoEncodeH264NaluSliceInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264NaluSliceInfoKHR>
   {
     using Type = VideoEncodeH264NaluSliceInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264PictureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264PictureInfoKHR.html
   struct VideoEncodeH264PictureInfoKHR
   {
     using NativeType = VkVideoEncodeH264PictureInfoKHR;
@@ -165788,17 +119393,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264PictureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264PictureInfoKHR( uint32_t                                naluSliceEntryCount_ = {},
-                                                        const VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries_   = {},
-                                                        const StdVideoEncodeH264PictureInfo *   pStdPictureInfo_     = {},
-                                                        Bool32                                  generatePrefixNalu_  = {},
-                                                        const void *                            pNext_               = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , naluSliceEntryCount{ naluSliceEntryCount_ }
-      , pNaluSliceEntries{ pNaluSliceEntries_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
-      , generatePrefixNalu{ generatePrefixNalu_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264PictureInfoKHR( uint32_t                                                      naluSliceEntryCount_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries_   = {},
+                                                        const StdVideoEncodeH264PictureInfo *                         pStdPictureInfo_     = {},
+                                                        VULKAN_HPP_NAMESPACE::Bool32                                  generatePrefixNalu_  = {},
+                                                        const void *                                                  pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , naluSliceEntryCount( naluSliceEntryCount_ )
+      , pNaluSliceEntries( pNaluSliceEntries_ )
+      , pStdPictureInfo( pStdPictureInfo_ )
+      , generatePrefixNalu( generatePrefixNalu_ )
     {
     }
 
@@ -165810,10 +119415,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH264PictureInfoKHR( ArrayProxyNoTemporaries<const VideoEncodeH264NaluSliceInfoKHR> const & naluSliceEntries_,
-                                   const StdVideoEncodeH264PictureInfo *                                  pStdPictureInfo_    = {},
-                                   Bool32                                                                 generatePrefixNalu_ = {},
-                                   const void *                                                           pNext_              = nullptr )
+    VideoEncodeH264PictureInfoKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR> const & naluSliceEntries_,
+      const StdVideoEncodeH264PictureInfo *                                                                              pStdPictureInfo_    = {},
+      VULKAN_HPP_NAMESPACE::Bool32                                                                                       generatePrefixNalu_ = {},
+      const void *                                                                                                       pNext_              = nullptr )
       : pNext( pNext_ )
       , naluSliceEntryCount( static_cast<uint32_t>( naluSliceEntries_.size() ) )
       , pNaluSliceEntries( naluSliceEntries_.data() )
@@ -165824,15 +119430,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeH264PictureInfoKHR & operator=( VideoEncodeH264PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264PictureInfoKHR & operator=( VkVideoEncodeH264PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264PictureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264PictureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -165846,15 +119452,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264PictureInfoKHR &
-      setPNaluSliceEntries( const VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries_ ) VULKAN_HPP_NOEXCEPT
+      setPNaluSliceEntries( const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       pNaluSliceEntries = pNaluSliceEntries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH264PictureInfoKHR &
-      setNaluSliceEntries( ArrayProxyNoTemporaries<const VideoEncodeH264NaluSliceInfoKHR> const & naluSliceEntries_ ) VULKAN_HPP_NOEXCEPT
+    VideoEncodeH264PictureInfoKHR & setNaluSliceEntries(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR> const & naluSliceEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       naluSliceEntryCount = static_cast<uint32_t>( naluSliceEntries_.size() );
       pNaluSliceEntries   = naluSliceEntries_.data();
@@ -165868,12 +119474,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264PictureInfoKHR & setGeneratePrefixNalu( Bool32 generatePrefixNalu_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264PictureInfoKHR & setGeneratePrefixNalu( VULKAN_HPP_NAMESPACE::Bool32 generatePrefixNalu_ ) VULKAN_HPP_NOEXCEPT
     {
       generatePrefixNalu = generatePrefixNalu_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -165885,23 +119491,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264PictureInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264PictureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const VideoEncodeH264NaluSliceInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR * const &,
                const StdVideoEncodeH264PictureInfo * const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, naluSliceEntryCount, pNaluSliceEntries, pStdPictureInfo, generatePrefixNalu );
@@ -165928,30 +119528,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType               = StructureType::eVideoEncodeH264PictureInfoKHR;
-    const void *                            pNext               = {};
-    uint32_t                                naluSliceEntryCount = {};
-    const VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries   = {};
-    const StdVideoEncodeH264PictureInfo *   pStdPictureInfo     = {};
-    Bool32                                  generatePrefixNalu  = {};
+    VULKAN_HPP_NAMESPACE::StructureType                           sType               = StructureType::eVideoEncodeH264PictureInfoKHR;
+    const void *                                                  pNext               = {};
+    uint32_t                                                      naluSliceEntryCount = {};
+    const VULKAN_HPP_NAMESPACE::VideoEncodeH264NaluSliceInfoKHR * pNaluSliceEntries   = {};
+    const StdVideoEncodeH264PictureInfo *                         pStdPictureInfo     = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                  generatePrefixNalu  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264PictureInfoKHR>
-  {
-    using Type = VideoEncodeH264PictureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264PictureInfoKHR>
   {
     using Type = VideoEncodeH264PictureInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264ProfileInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264ProfileInfoKHR.html
   struct VideoEncodeH264ProfileInfoKHR
   {
     using NativeType = VkVideoEncodeH264ProfileInfoKHR;
@@ -165959,10 +119549,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264ProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264ProfileInfoKHR( StdVideoH264ProfileIdc stdProfileIdc_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfileIdc{ stdProfileIdc_ }
+      : pNext( pNext_ )
+      , stdProfileIdc( stdProfileIdc_ )
     {
     }
 
@@ -165974,15 +119564,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264ProfileInfoKHR & operator=( VideoEncodeH264ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264ProfileInfoKHR & operator=( VkVideoEncodeH264ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264ProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264ProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -165994,7 +119584,7 @@ namespace VULKAN_HPP_NAMESPACE
       stdProfileIdc = stdProfileIdc_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166006,18 +119596,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264ProfileInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264ProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoH264ProfileIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, StdVideoH264ProfileIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdProfileIdc );
     }
@@ -166048,35 +119633,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType          sType         = StructureType::eVideoEncodeH264ProfileInfoKHR;
-    const void *           pNext         = {};
-    StdVideoH264ProfileIdc stdProfileIdc = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eVideoEncodeH264ProfileInfoKHR;
+    const void *                        pNext         = {};
+    StdVideoH264ProfileIdc              stdProfileIdc = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264ProfileInfoKHR>
-  {
-    using Type = VideoEncodeH264ProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264ProfileInfoKHR>
   {
     using Type = VideoEncodeH264ProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264QpKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264QpKHR.html
   struct VideoEncodeH264QpKHR
   {
     using NativeType = VkVideoEncodeH264QpKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264QpKHR( int32_t qpI_ = {}, int32_t qpP_ = {}, int32_t qpB_ = {} ) VULKAN_HPP_NOEXCEPT
-      : qpI{ qpI_ }
-      , qpP{ qpP_ }
-      , qpB{ qpB_ }
+      : qpI( qpI_ )
+      , qpP( qpP_ )
+      , qpB( qpB_ )
     {
     }
 
@@ -166088,15 +119664,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264QpKHR & operator=( VideoEncodeH264QpKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264QpKHR & operator=( VkVideoEncodeH264QpKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264QpKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264QpKHR & setQpI( int32_t qpI_ ) VULKAN_HPP_NOEXCEPT
     {
       qpI = qpI_;
@@ -166114,7 +119690,7 @@ namespace VULKAN_HPP_NAMESPACE
       qpB = qpB_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264QpKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166126,18 +119702,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264QpKHR *>( this );
     }
 
-    operator VkVideoEncodeH264QpKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264QpKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264QpKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264QpKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<int32_t const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<int32_t const &, int32_t const &, int32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( qpI, qpP, qpB );
     }
@@ -166167,16 +119738,6 @@ namespace VULKAN_HPP_NAMESPACE
     int32_t qpB = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264QpKHR>
-  {
-    using Type = VideoEncodeH264QpKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeH264QualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264QualityLevelPropertiesKHR.html
   struct VideoEncodeH264QualityLevelPropertiesKHR
   {
     using NativeType = VkVideoEncodeH264QualityLevelPropertiesKHR;
@@ -166184,27 +119745,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264QualityLevelPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264QualityLevelPropertiesKHR( VideoEncodeH264RateControlFlagsKHR preferredRateControlFlags_         = {},
-                                                                   uint32_t                           preferredGopFrameCount_            = {},
-                                                                   uint32_t                           preferredIdrPeriod_                = {},
-                                                                   uint32_t                           preferredConsecutiveBFrameCount_   = {},
-                                                                   uint32_t                           preferredTemporalLayerCount_       = {},
-                                                                   VideoEncodeH264QpKHR               preferredConstantQp_               = {},
-                                                                   uint32_t                           preferredMaxL0ReferenceCount_      = {},
-                                                                   uint32_t                           preferredMaxL1ReferenceCount_      = {},
-                                                                   Bool32                             preferredStdEntropyCodingModeFlag_ = {},
-                                                                   void *                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , preferredRateControlFlags{ preferredRateControlFlags_ }
-      , preferredGopFrameCount{ preferredGopFrameCount_ }
-      , preferredIdrPeriod{ preferredIdrPeriod_ }
-      , preferredConsecutiveBFrameCount{ preferredConsecutiveBFrameCount_ }
-      , preferredTemporalLayerCount{ preferredTemporalLayerCount_ }
-      , preferredConstantQp{ preferredConstantQp_ }
-      , preferredMaxL0ReferenceCount{ preferredMaxL0ReferenceCount_ }
-      , preferredMaxL1ReferenceCount{ preferredMaxL1ReferenceCount_ }
-      , preferredStdEntropyCodingModeFlag{ preferredStdEntropyCodingModeFlag_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264QualityLevelPropertiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR preferredRateControlFlags_ = {},
+                                                                   uint32_t                                                 preferredGopFrameCount_    = {},
+                                                                   uint32_t                                                 preferredIdrPeriod_        = {},
+                                                                   uint32_t                                   preferredConsecutiveBFrameCount_         = {},
+                                                                   uint32_t                                   preferredTemporalLayerCount_             = {},
+                                                                   VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR preferredConstantQp_                     = {},
+                                                                   uint32_t                                   preferredMaxL0ReferenceCount_            = {},
+                                                                   uint32_t                                   preferredMaxL1ReferenceCount_            = {},
+                                                                   VULKAN_HPP_NAMESPACE::Bool32               preferredStdEntropyCodingModeFlag_       = {},
+                                                                   void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , preferredRateControlFlags( preferredRateControlFlags_ )
+      , preferredGopFrameCount( preferredGopFrameCount_ )
+      , preferredIdrPeriod( preferredIdrPeriod_ )
+      , preferredConsecutiveBFrameCount( preferredConsecutiveBFrameCount_ )
+      , preferredTemporalLayerCount( preferredTemporalLayerCount_ )
+      , preferredConstantQp( preferredConstantQp_ )
+      , preferredMaxL0ReferenceCount( preferredMaxL0ReferenceCount_ )
+      , preferredMaxL1ReferenceCount( preferredMaxL1ReferenceCount_ )
+      , preferredStdEntropyCodingModeFlag( preferredStdEntropyCodingModeFlag_ )
     {
     }
 
@@ -166216,11 +119777,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264QualityLevelPropertiesKHR & operator=( VideoEncodeH264QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264QualityLevelPropertiesKHR & operator=( VkVideoEncodeH264QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264QualityLevelPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264QualityLevelPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -166234,28 +119795,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264QualityLevelPropertiesKHR *>( this );
     }
 
-    operator VkVideoEncodeH264QualityLevelPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264QualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264QualityLevelPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264QualityLevelPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoEncodeH264RateControlFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               VideoEncodeH264QpKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -166296,136 +119851,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                             = StructureType::eVideoEncodeH264QualityLevelPropertiesKHR;
-    void *                             pNext                             = {};
-    VideoEncodeH264RateControlFlagsKHR preferredRateControlFlags         = {};
-    uint32_t                           preferredGopFrameCount            = {};
-    uint32_t                           preferredIdrPeriod                = {};
-    uint32_t                           preferredConsecutiveBFrameCount   = {};
-    uint32_t                           preferredTemporalLayerCount       = {};
-    VideoEncodeH264QpKHR               preferredConstantQp               = {};
-    uint32_t                           preferredMaxL0ReferenceCount      = {};
-    uint32_t                           preferredMaxL1ReferenceCount      = {};
-    Bool32                             preferredStdEntropyCodingModeFlag = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                             = StructureType::eVideoEncodeH264QualityLevelPropertiesKHR;
+    void *                                                   pNext                             = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR preferredRateControlFlags         = {};
+    uint32_t                                                 preferredGopFrameCount            = {};
+    uint32_t                                                 preferredIdrPeriod                = {};
+    uint32_t                                                 preferredConsecutiveBFrameCount   = {};
+    uint32_t                                                 preferredTemporalLayerCount       = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR               preferredConstantQp               = {};
+    uint32_t                                                 preferredMaxL0ReferenceCount      = {};
+    uint32_t                                                 preferredMaxL1ReferenceCount      = {};
+    VULKAN_HPP_NAMESPACE::Bool32                             preferredStdEntropyCodingModeFlag = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264QualityLevelPropertiesKHR>
-  {
-    using Type = VideoEncodeH264QualityLevelPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264QualityLevelPropertiesKHR>
   {
     using Type = VideoEncodeH264QualityLevelPropertiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264QuantizationMapCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264QuantizationMapCapabilitiesKHR.html
-  struct VideoEncodeH264QuantizationMapCapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeH264QuantizationMapCapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264QuantizationMapCapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeH264QuantizationMapCapabilitiesKHR( int32_t minQpDelta_ = {}, int32_t maxQpDelta_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minQpDelta{ minQpDelta_ }
-      , maxQpDelta{ maxQpDelta_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeH264QuantizationMapCapabilitiesKHR( VideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeH264QuantizationMapCapabilitiesKHR( VkVideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeH264QuantizationMapCapabilitiesKHR( *reinterpret_cast<VideoEncodeH264QuantizationMapCapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeH264QuantizationMapCapabilitiesKHR & operator=( VideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeH264QuantizationMapCapabilitiesKHR & operator=( VkVideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeH264QuantizationMapCapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeH264QuantizationMapCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeH264QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264QuantizationMapCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeH264QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264QuantizationMapCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264QuantizationMapCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, minQpDelta, maxQpDelta );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeH264QuantizationMapCapabilitiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( minQpDelta == rhs.minQpDelta ) && ( maxQpDelta == rhs.maxQpDelta );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeH264QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::eVideoEncodeH264QuantizationMapCapabilitiesKHR;
-    void *        pNext      = {};
-    int32_t       minQpDelta = {};
-    int32_t       maxQpDelta = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeH264QuantizationMapCapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeH264QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeH264QuantizationMapCapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeH264RateControlInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264RateControlInfoKHR.html
   struct VideoEncodeH264RateControlInfoKHR
   {
     using NativeType = VkVideoEncodeH264RateControlInfoKHR;
@@ -166433,19 +119877,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264RateControlInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264RateControlInfoKHR( VideoEncodeH264RateControlFlagsKHR flags_                  = {},
-                                                            uint32_t                           gopFrameCount_          = {},
-                                                            uint32_t                           idrPeriod_              = {},
-                                                            uint32_t                           consecutiveBFrameCount_ = {},
-                                                            uint32_t                           temporalLayerCount_     = {},
-                                                            const void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , gopFrameCount{ gopFrameCount_ }
-      , idrPeriod{ idrPeriod_ }
-      , consecutiveBFrameCount{ consecutiveBFrameCount_ }
-      , temporalLayerCount{ temporalLayerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264RateControlInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR flags_                  = {},
+                                                            uint32_t                                                 gopFrameCount_          = {},
+                                                            uint32_t                                                 idrPeriod_              = {},
+                                                            uint32_t                                                 consecutiveBFrameCount_ = {},
+                                                            uint32_t                                                 temporalLayerCount_     = {},
+                                                            const void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , gopFrameCount( gopFrameCount_ )
+      , idrPeriod( idrPeriod_ )
+      , consecutiveBFrameCount( consecutiveBFrameCount_ )
+      , temporalLayerCount( temporalLayerCount_ )
     {
     }
 
@@ -166457,22 +119901,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264RateControlInfoKHR & operator=( VideoEncodeH264RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264RateControlInfoKHR & operator=( VkVideoEncodeH264RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264RateControlInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlInfoKHR & setFlags( VideoEncodeH264RateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -166501,7 +119945,7 @@ namespace VULKAN_HPP_NAMESPACE
       temporalLayerCount = temporalLayerCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264RateControlInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166513,24 +119957,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264RateControlInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264RateControlInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264RateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264RateControlInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264RateControlInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoEncodeH264RateControlFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, gopFrameCount, idrPeriod, consecutiveBFrameCount, temporalLayerCount );
@@ -166557,31 +119995,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                  = StructureType::eVideoEncodeH264RateControlInfoKHR;
-    const void *                       pNext                  = {};
-    VideoEncodeH264RateControlFlagsKHR flags                  = {};
-    uint32_t                           gopFrameCount          = {};
-    uint32_t                           idrPeriod              = {};
-    uint32_t                           consecutiveBFrameCount = {};
-    uint32_t                           temporalLayerCount     = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                  = StructureType::eVideoEncodeH264RateControlInfoKHR;
+    const void *                                             pNext                  = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlFlagsKHR flags                  = {};
+    uint32_t                                                 gopFrameCount          = {};
+    uint32_t                                                 idrPeriod              = {};
+    uint32_t                                                 consecutiveBFrameCount = {};
+    uint32_t                                                 temporalLayerCount     = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264RateControlInfoKHR>
-  {
-    using Type = VideoEncodeH264RateControlInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264RateControlInfoKHR>
   {
     using Type = VideoEncodeH264RateControlInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264RateControlLayerInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264RateControlLayerInfoKHR.html
   struct VideoEncodeH264RateControlLayerInfoKHR
   {
     using NativeType = VkVideoEncodeH264RateControlLayerInfoKHR;
@@ -166589,21 +120017,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264RateControlLayerInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264RateControlLayerInfoKHR( Bool32                      useMinQp_        = {},
-                                                                 VideoEncodeH264QpKHR        minQp_           = {},
-                                                                 Bool32                      useMaxQp_        = {},
-                                                                 VideoEncodeH264QpKHR        maxQp_           = {},
-                                                                 Bool32                      useMaxFrameSize_ = {},
-                                                                 VideoEncodeH264FrameSizeKHR maxFrameSize_    = {},
-                                                                 const void *                pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMinQp{ useMinQp_ }
-      , minQp{ minQp_ }
-      , useMaxQp{ useMaxQp_ }
-      , maxQp{ maxQp_ }
-      , useMaxFrameSize{ useMaxFrameSize_ }
-      , maxFrameSize{ maxFrameSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264RateControlLayerInfoKHR( VULKAN_HPP_NAMESPACE::Bool32                      useMinQp_        = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR        minQp_           = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32                      useMaxQp_        = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR        maxQp_           = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32                      useMaxFrameSize_ = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR maxFrameSize_    = {},
+                                                                 const void *                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useMinQp( useMinQp_ )
+      , minQp( minQp_ )
+      , useMaxQp( useMaxQp_ )
+      , maxQp( maxQp_ )
+      , useMaxFrameSize( useMaxFrameSize_ )
+      , maxFrameSize( maxFrameSize_ )
     {
     }
 
@@ -166615,57 +120043,58 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264RateControlLayerInfoKHR & operator=( VideoEncodeH264RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264RateControlLayerInfoKHR & operator=( VkVideoEncodeH264RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264RateControlLayerInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264RateControlLayerInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMinQp( Bool32 useMinQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMinQp( VULKAN_HPP_NAMESPACE::Bool32 useMinQp_ ) VULKAN_HPP_NOEXCEPT
     {
       useMinQp = useMinQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setMinQp( VideoEncodeH264QpKHR const & minQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setMinQp( VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const & minQp_ ) VULKAN_HPP_NOEXCEPT
     {
       minQp = minQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMaxQp( Bool32 useMaxQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMaxQp( VULKAN_HPP_NAMESPACE::Bool32 useMaxQp_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxQp = useMaxQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setMaxQp( VideoEncodeH264QpKHR const & maxQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setMaxQp( VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const & maxQp_ ) VULKAN_HPP_NOEXCEPT
     {
       maxQp = maxQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMaxFrameSize( Bool32 useMaxFrameSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setUseMaxFrameSize( VULKAN_HPP_NAMESPACE::Bool32 useMaxFrameSize_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxFrameSize = useMaxFrameSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR & setMaxFrameSize( VideoEncodeH264FrameSizeKHR const & maxFrameSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264RateControlLayerInfoKHR &
+      setMaxFrameSize( VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR const & maxFrameSize_ ) VULKAN_HPP_NOEXCEPT
     {
       maxFrameSize = maxFrameSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264RateControlLayerInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166677,25 +120106,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264RateControlLayerInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264RateControlLayerInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264RateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264RateControlLayerInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264RateControlLayerInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Bool32 const &,
-               VideoEncodeH264QpKHR const &,
-               Bool32 const &,
-               VideoEncodeH264QpKHR const &,
-               Bool32 const &,
-               VideoEncodeH264FrameSizeKHR const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useMinQp, minQp, useMaxQp, maxQp, useMaxFrameSize, maxFrameSize );
@@ -166722,32 +120145,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType           = StructureType::eVideoEncodeH264RateControlLayerInfoKHR;
-    const void *                pNext           = {};
-    Bool32                      useMinQp        = {};
-    VideoEncodeH264QpKHR        minQp           = {};
-    Bool32                      useMaxQp        = {};
-    VideoEncodeH264QpKHR        maxQp           = {};
-    Bool32                      useMaxFrameSize = {};
-    VideoEncodeH264FrameSizeKHR maxFrameSize    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType           = StructureType::eVideoEncodeH264RateControlLayerInfoKHR;
+    const void *                                      pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMinQp        = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR        minQp           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMaxQp        = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264QpKHR        maxQp           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMaxFrameSize = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH264FrameSizeKHR maxFrameSize    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264RateControlLayerInfoKHR>
-  {
-    using Type = VideoEncodeH264RateControlLayerInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264RateControlLayerInfoKHR>
   {
     using Type = VideoEncodeH264RateControlLayerInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264SessionCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264SessionCreateInfoKHR.html
   struct VideoEncodeH264SessionCreateInfoKHR
   {
     using NativeType = VkVideoEncodeH264SessionCreateInfoKHR;
@@ -166755,13 +120168,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264SessionCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionCreateInfoKHR( Bool32               useMaxLevelIdc_ = {},
-                                                              StdVideoH264LevelIdc maxLevelIdc_    = {},
-                                                              const void *         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMaxLevelIdc{ useMaxLevelIdc_ }
-      , maxLevelIdc{ maxLevelIdc_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionCreateInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 useMaxLevelIdc_ = {},
+                                                              StdVideoH264LevelIdc         maxLevelIdc_    = {},
+                                                              const void *                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useMaxLevelIdc( useMaxLevelIdc_ )
+      , maxLevelIdc( maxLevelIdc_ )
     {
     }
 
@@ -166773,22 +120186,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264SessionCreateInfoKHR & operator=( VideoEncodeH264SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264SessionCreateInfoKHR & operator=( VkVideoEncodeH264SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264SessionCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionCreateInfoKHR & setUseMaxLevelIdc( Bool32 useMaxLevelIdc_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionCreateInfoKHR & setUseMaxLevelIdc( VULKAN_HPP_NAMESPACE::Bool32 useMaxLevelIdc_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxLevelIdc = useMaxLevelIdc_;
       return *this;
@@ -166799,7 +120212,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxLevelIdc = maxLevelIdc_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264SessionCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166811,18 +120224,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264SessionCreateInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264SessionCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264SessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264SessionCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264SessionCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, StdVideoH264LevelIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, StdVideoH264LevelIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useMaxLevelIdc, maxLevelIdc );
     }
@@ -166856,28 +120264,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType        sType          = StructureType::eVideoEncodeH264SessionCreateInfoKHR;
-    const void *         pNext          = {};
-    Bool32               useMaxLevelIdc = {};
-    StdVideoH264LevelIdc maxLevelIdc    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eVideoEncodeH264SessionCreateInfoKHR;
+    const void *                        pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        useMaxLevelIdc = {};
+    StdVideoH264LevelIdc                maxLevelIdc    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264SessionCreateInfoKHR>
-  {
-    using Type = VideoEncodeH264SessionCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264SessionCreateInfoKHR>
   {
     using Type = VideoEncodeH264SessionCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264SessionParametersAddInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264SessionParametersAddInfoKHR.html
   struct VideoEncodeH264SessionParametersAddInfoKHR
   {
     using NativeType = VkVideoEncodeH264SessionParametersAddInfoKHR;
@@ -166885,17 +120283,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264SessionParametersAddInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersAddInfoKHR( uint32_t                                 stdSPSCount_ = {},
                                                                      const StdVideoH264SequenceParameterSet * pStdSPSs_    = {},
                                                                      uint32_t                                 stdPPSCount_ = {},
                                                                      const StdVideoH264PictureParameterSet *  pStdPPSs_    = {},
                                                                      const void *                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdSPSCount{ stdSPSCount_ }
-      , pStdSPSs{ pStdSPSs_ }
-      , stdPPSCount{ stdPPSCount_ }
-      , pStdPPSs{ pStdPPSs_ }
+      : pNext( pNext_ )
+      , stdSPSCount( stdSPSCount_ )
+      , pStdSPSs( pStdSPSs_ )
+      , stdPPSCount( stdPPSCount_ )
+      , pStdPPSs( pStdPPSs_ )
     {
     }
 
@@ -166907,9 +120305,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH264SessionParametersAddInfoKHR( ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_,
-                                                ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const &  stdPPSs_ = {},
-                                                const void *                                                            pNext_   = nullptr )
+    VideoEncodeH264SessionParametersAddInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const &  stdPPSs_ = {},
+                                                const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , stdSPSCount( static_cast<uint32_t>( stdSPSs_.size() ) )
       , pStdSPSs( stdSPSs_.data() )
@@ -166920,15 +120318,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeH264SessionParametersAddInfoKHR & operator=( VideoEncodeH264SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264SessionParametersAddInfoKHR & operator=( VkVideoEncodeH264SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264SessionParametersAddInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersAddInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -166949,7 +120347,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoEncodeH264SessionParametersAddInfoKHR &
-      setStdSPSs( ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdSPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdSPSCount = static_cast<uint32_t>( stdSPSs_.size() );
       pStdSPSs    = stdSPSs_.data();
@@ -166971,14 +120369,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoEncodeH264SessionParametersAddInfoKHR &
-      setStdPPSs( ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdPPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH264PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdPPSCount = static_cast<uint32_t>( stdPPSs_.size() );
       pStdPPSs    = stdPPSs_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264SessionParametersAddInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -166990,23 +120388,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264SessionParametersAddInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264SessionParametersAddInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264SessionParametersAddInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264SessionParametersAddInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264SessionParametersAddInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const StdVideoH264SequenceParameterSet * const &,
                uint32_t const &,
                const StdVideoH264PictureParameterSet * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdSPSCount, pStdSPSs, stdPPSCount, pStdPPSs );
@@ -167033,7 +120425,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                            sType       = StructureType::eVideoEncodeH264SessionParametersAddInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType      sType       = StructureType::eVideoEncodeH264SessionParametersAddInfoKHR;
     const void *                             pNext       = {};
     uint32_t                                 stdSPSCount = {};
     const StdVideoH264SequenceParameterSet * pStdSPSs    = {};
@@ -167041,22 +120433,12 @@ namespace VULKAN_HPP_NAMESPACE
     const StdVideoH264PictureParameterSet *  pStdPPSs    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264SessionParametersAddInfoKHR>
-  {
-    using Type = VideoEncodeH264SessionParametersAddInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264SessionParametersAddInfoKHR>
   {
     using Type = VideoEncodeH264SessionParametersAddInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264SessionParametersCreateInfoKHR.html
   struct VideoEncodeH264SessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoEncodeH264SessionParametersCreateInfoKHR;
@@ -167064,15 +120446,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersCreateInfoKHR( uint32_t                                           maxStdSPSCount_     = {},
-                                                                        uint32_t                                           maxStdPPSCount_     = {},
-                                                                        const VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
-                                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxStdSPSCount{ maxStdSPSCount_ }
-      , maxStdPPSCount{ maxStdPPSCount_ }
-      , pParametersAddInfo{ pParametersAddInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      VideoEncodeH264SessionParametersCreateInfoKHR( uint32_t                                                                 maxStdSPSCount_     = {},
+                                                     uint32_t                                                                 maxStdPPSCount_     = {},
+                                                     const VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
+                                                     const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxStdSPSCount( maxStdSPSCount_ )
+      , maxStdPPSCount( maxStdPPSCount_ )
+      , pParametersAddInfo( pParametersAddInfo_ )
     {
     }
 
@@ -167085,15 +120468,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264SessionParametersCreateInfoKHR & operator=( VideoEncodeH264SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264SessionParametersCreateInfoKHR & operator=( VkVideoEncodeH264SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264SessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -167113,12 +120496,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersCreateInfoKHR &
-      setPParametersAddInfo( const VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
+      setPParametersAddInfo( const VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pParametersAddInfo = pParametersAddInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -167130,18 +120513,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264SessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264SessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &, const VideoEncodeH264SessionParametersAddInfoKHR * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               uint32_t const &,
+               uint32_t const &,
+               const VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxStdSPSCount, maxStdPPSCount, pParametersAddInfo );
@@ -167168,29 +120549,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                      sType              = StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR;
-    const void *                                       pNext              = {};
-    uint32_t                                           maxStdSPSCount     = {};
-    uint32_t                                           maxStdPPSCount     = {};
-    const VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                      sType              = StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR;
+    const void *                                                             pNext              = {};
+    uint32_t                                                                 maxStdSPSCount     = {};
+    uint32_t                                                                 maxStdPPSCount     = {};
+    const VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersAddInfoKHR * pParametersAddInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeH264SessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR>
   {
     using Type = VideoEncodeH264SessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264SessionParametersFeedbackInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264SessionParametersFeedbackInfoKHR.html
   struct VideoEncodeH264SessionParametersFeedbackInfoKHR
   {
     using NativeType = VkVideoEncodeH264SessionParametersFeedbackInfoKHR;
@@ -167198,13 +120569,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264SessionParametersFeedbackInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersFeedbackInfoKHR( Bool32 hasStdSPSOverrides_ = {},
-                                                                          Bool32 hasStdPPSOverrides_ = {},
-                                                                          void * pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hasStdSPSOverrides{ hasStdSPSOverrides_ }
-      , hasStdPPSOverrides{ hasStdPPSOverrides_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersFeedbackInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 hasStdSPSOverrides_ = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 hasStdPPSOverrides_ = {},
+                                                                          void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hasStdSPSOverrides( hasStdSPSOverrides_ )
+      , hasStdPPSOverrides( hasStdPPSOverrides_ )
     {
     }
 
@@ -167217,11 +120588,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264SessionParametersFeedbackInfoKHR & operator=( VideoEncodeH264SessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264SessionParametersFeedbackInfoKHR & operator=( VkVideoEncodeH264SessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264SessionParametersFeedbackInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersFeedbackInfoKHR const *>( &rhs );
       return *this;
     }
 
@@ -167235,18 +120606,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264SessionParametersFeedbackInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264SessionParametersFeedbackInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264SessionParametersFeedbackInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264SessionParametersFeedbackInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264SessionParametersFeedbackInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hasStdSPSOverrides, hasStdPPSOverrides );
     }
@@ -167272,28 +120638,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::eVideoEncodeH264SessionParametersFeedbackInfoKHR;
-    void *        pNext              = {};
-    Bool32        hasStdSPSOverrides = {};
-    Bool32        hasStdPPSOverrides = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eVideoEncodeH264SessionParametersFeedbackInfoKHR;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasStdSPSOverrides = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasStdPPSOverrides = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264SessionParametersFeedbackInfoKHR>
-  {
-    using Type = VideoEncodeH264SessionParametersFeedbackInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264SessionParametersFeedbackInfoKHR>
   {
     using Type = VideoEncodeH264SessionParametersFeedbackInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH264SessionParametersGetInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH264SessionParametersGetInfoKHR.html
   struct VideoEncodeH264SessionParametersGetInfoKHR
   {
     using NativeType = VkVideoEncodeH264SessionParametersGetInfoKHR;
@@ -167301,14 +120657,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH264SessionParametersGetInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersGetInfoKHR(
-      Bool32 writeStdSPS_ = {}, Bool32 writeStdPPS_ = {}, uint32_t stdSPSId_ = {}, uint32_t stdPPSId_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , writeStdSPS{ writeStdSPS_ }
-      , writeStdPPS{ writeStdPPS_ }
-      , stdSPSId{ stdSPSId_ }
-      , stdPPSId{ stdPPSId_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH264SessionParametersGetInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 writeStdSPS_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 writeStdPPS_ = {},
+                                                                     uint32_t                     stdSPSId_    = {},
+                                                                     uint32_t                     stdPPSId_    = {},
+                                                                     const void *                 pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , writeStdSPS( writeStdSPS_ )
+      , writeStdPPS( writeStdPPS_ )
+      , stdSPSId( stdSPSId_ )
+      , stdPPSId( stdPPSId_ )
     {
     }
 
@@ -167320,28 +120679,28 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH264SessionParametersGetInfoKHR & operator=( VideoEncodeH264SessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH264SessionParametersGetInfoKHR & operator=( VkVideoEncodeH264SessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH264SessionParametersGetInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH264SessionParametersGetInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersGetInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersGetInfoKHR & setWriteStdSPS( Bool32 writeStdSPS_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersGetInfoKHR & setWriteStdSPS( VULKAN_HPP_NAMESPACE::Bool32 writeStdSPS_ ) VULKAN_HPP_NOEXCEPT
     {
       writeStdSPS = writeStdSPS_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersGetInfoKHR & setWriteStdPPS( Bool32 writeStdPPS_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH264SessionParametersGetInfoKHR & setWriteStdPPS( VULKAN_HPP_NAMESPACE::Bool32 writeStdPPS_ ) VULKAN_HPP_NOEXCEPT
     {
       writeStdPPS = writeStdPPS_;
       return *this;
@@ -167358,7 +120717,7 @@ namespace VULKAN_HPP_NAMESPACE
       stdPPSId = stdPPSId_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH264SessionParametersGetInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -167370,18 +120729,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH264SessionParametersGetInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH264SessionParametersGetInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH264SessionParametersGetInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH264SessionParametersGetInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH264SessionParametersGetInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, Bool32 const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, writeStdSPS, writeStdPPS, stdSPSId, stdPPSId );
@@ -167408,30 +120766,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::eVideoEncodeH264SessionParametersGetInfoKHR;
-    const void *  pNext       = {};
-    Bool32        writeStdSPS = {};
-    Bool32        writeStdPPS = {};
-    uint32_t      stdSPSId    = {};
-    uint32_t      stdPPSId    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eVideoEncodeH264SessionParametersGetInfoKHR;
+    const void *                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        writeStdSPS = {};
+    VULKAN_HPP_NAMESPACE::Bool32        writeStdPPS = {};
+    uint32_t                            stdSPSId    = {};
+    uint32_t                            stdPPSId    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH264SessionParametersGetInfoKHR>
-  {
-    using Type = VideoEncodeH264SessionParametersGetInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH264SessionParametersGetInfoKHR>
   {
     using Type = VideoEncodeH264SessionParametersGetInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265CapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265CapabilitiesKHR.html
   struct VideoEncodeH265CapabilitiesKHR
   {
     using NativeType = VkVideoEncodeH265CapabilitiesKHR;
@@ -167439,41 +120787,41 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265CapabilitiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265CapabilitiesKHR( VideoEncodeH265CapabilityFlagsKHR         flags_                               = {},
-                                                         StdVideoH265LevelIdc                      maxLevelIdc_                         = {},
-                                                         uint32_t                                  maxSliceSegmentCount_                = {},
-                                                         Extent2D                                  maxTiles_                            = {},
-                                                         VideoEncodeH265CtbSizeFlagsKHR            ctbSizes_                            = {},
-                                                         VideoEncodeH265TransformBlockSizeFlagsKHR transformBlockSizes_                 = {},
-                                                         uint32_t                                  maxPPictureL0ReferenceCount_         = {},
-                                                         uint32_t                                  maxBPictureL0ReferenceCount_         = {},
-                                                         uint32_t                                  maxL1ReferenceCount_                 = {},
-                                                         uint32_t                                  maxSubLayerCount_                    = {},
-                                                         Bool32                                    expectDyadicTemporalSubLayerPattern_ = {},
-                                                         int32_t                                   minQp_                               = {},
-                                                         int32_t                                   maxQp_                               = {},
-                                                         Bool32                                    prefersGopRemainingFrames_           = {},
-                                                         Bool32                                    requiresGopRemainingFrames_          = {},
-                                                         VideoEncodeH265StdFlagsKHR                stdSyntaxFlags_                      = {},
-                                                         void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , maxLevelIdc{ maxLevelIdc_ }
-      , maxSliceSegmentCount{ maxSliceSegmentCount_ }
-      , maxTiles{ maxTiles_ }
-      , ctbSizes{ ctbSizes_ }
-      , transformBlockSizes{ transformBlockSizes_ }
-      , maxPPictureL0ReferenceCount{ maxPPictureL0ReferenceCount_ }
-      , maxBPictureL0ReferenceCount{ maxBPictureL0ReferenceCount_ }
-      , maxL1ReferenceCount{ maxL1ReferenceCount_ }
-      , maxSubLayerCount{ maxSubLayerCount_ }
-      , expectDyadicTemporalSubLayerPattern{ expectDyadicTemporalSubLayerPattern_ }
-      , minQp{ minQp_ }
-      , maxQp{ maxQp_ }
-      , prefersGopRemainingFrames{ prefersGopRemainingFrames_ }
-      , requiresGopRemainingFrames{ requiresGopRemainingFrames_ }
-      , stdSyntaxFlags{ stdSyntaxFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265CapabilitiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH265CapabilityFlagsKHR         flags_                       = {},
+                                                         StdVideoH265LevelIdc                                            maxLevelIdc_                 = {},
+                                                         uint32_t                                                        maxSliceSegmentCount_        = {},
+                                                         VULKAN_HPP_NAMESPACE::Extent2D                                  maxTiles_                    = {},
+                                                         VULKAN_HPP_NAMESPACE::VideoEncodeH265CtbSizeFlagsKHR            ctbSizes_                    = {},
+                                                         VULKAN_HPP_NAMESPACE::VideoEncodeH265TransformBlockSizeFlagsKHR transformBlockSizes_         = {},
+                                                         uint32_t                                                        maxPPictureL0ReferenceCount_ = {},
+                                                         uint32_t                                                        maxBPictureL0ReferenceCount_ = {},
+                                                         uint32_t                                                        maxL1ReferenceCount_         = {},
+                                                         uint32_t                                                        maxSubLayerCount_            = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                     expectDyadicTemporalSubLayerPattern_        = {},
+                                                         int32_t                                          minQp_                                      = {},
+                                                         int32_t                                          maxQp_                                      = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                     prefersGopRemainingFrames_                  = {},
+                                                         VULKAN_HPP_NAMESPACE::Bool32                     requiresGopRemainingFrames_                 = {},
+                                                         VULKAN_HPP_NAMESPACE::VideoEncodeH265StdFlagsKHR stdSyntaxFlags_                             = {},
+                                                         void *                                           pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , maxLevelIdc( maxLevelIdc_ )
+      , maxSliceSegmentCount( maxSliceSegmentCount_ )
+      , maxTiles( maxTiles_ )
+      , ctbSizes( ctbSizes_ )
+      , transformBlockSizes( transformBlockSizes_ )
+      , maxPPictureL0ReferenceCount( maxPPictureL0ReferenceCount_ )
+      , maxBPictureL0ReferenceCount( maxBPictureL0ReferenceCount_ )
+      , maxL1ReferenceCount( maxL1ReferenceCount_ )
+      , maxSubLayerCount( maxSubLayerCount_ )
+      , expectDyadicTemporalSubLayerPattern( expectDyadicTemporalSubLayerPattern_ )
+      , minQp( minQp_ )
+      , maxQp( maxQp_ )
+      , prefersGopRemainingFrames( prefersGopRemainingFrames_ )
+      , requiresGopRemainingFrames( requiresGopRemainingFrames_ )
+      , stdSyntaxFlags( stdSyntaxFlags_ )
     {
     }
 
@@ -167485,11 +120833,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265CapabilitiesKHR & operator=( VideoEncodeH265CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265CapabilitiesKHR & operator=( VkVideoEncodeH265CapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265CapabilitiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265CapabilitiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -167503,35 +120851,29 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265CapabilitiesKHR *>( this );
     }
 
-    operator VkVideoEncodeH265CapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265CapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265CapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265CapabilitiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoEncodeH265CapabilityFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265CapabilityFlagsKHR const &,
                StdVideoH265LevelIdc const &,
                uint32_t const &,
-               Extent2D const &,
-               VideoEncodeH265CtbSizeFlagsKHR const &,
-               VideoEncodeH265TransformBlockSizeFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265CtbSizeFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265TransformBlockSizeFlagsKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
                int32_t const &,
                int32_t const &,
-               Bool32 const &,
-               Bool32 const &,
-               VideoEncodeH265StdFlagsKHR const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265StdFlagsKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -167617,42 +120959,32 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType                             sType                               = StructureType::eVideoEncodeH265CapabilitiesKHR;
-    void *                                    pNext                               = {};
-    VideoEncodeH265CapabilityFlagsKHR         flags                               = {};
-    StdVideoH265LevelIdc                      maxLevelIdc                         = {};
-    uint32_t                                  maxSliceSegmentCount                = {};
-    Extent2D                                  maxTiles                            = {};
-    VideoEncodeH265CtbSizeFlagsKHR            ctbSizes                            = {};
-    VideoEncodeH265TransformBlockSizeFlagsKHR transformBlockSizes                 = {};
-    uint32_t                                  maxPPictureL0ReferenceCount         = {};
-    uint32_t                                  maxBPictureL0ReferenceCount         = {};
-    uint32_t                                  maxL1ReferenceCount                 = {};
-    uint32_t                                  maxSubLayerCount                    = {};
-    Bool32                                    expectDyadicTemporalSubLayerPattern = {};
-    int32_t                                   minQp                               = {};
-    int32_t                                   maxQp                               = {};
-    Bool32                                    prefersGopRemainingFrames           = {};
-    Bool32                                    requiresGopRemainingFrames          = {};
-    VideoEncodeH265StdFlagsKHR                stdSyntaxFlags                      = {};
+    VULKAN_HPP_NAMESPACE::StructureType                             sType                               = StructureType::eVideoEncodeH265CapabilitiesKHR;
+    void *                                                          pNext                               = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265CapabilityFlagsKHR         flags                               = {};
+    StdVideoH265LevelIdc                                            maxLevelIdc                         = {};
+    uint32_t                                                        maxSliceSegmentCount                = {};
+    VULKAN_HPP_NAMESPACE::Extent2D                                  maxTiles                            = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265CtbSizeFlagsKHR            ctbSizes                            = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265TransformBlockSizeFlagsKHR transformBlockSizes                 = {};
+    uint32_t                                                        maxPPictureL0ReferenceCount         = {};
+    uint32_t                                                        maxBPictureL0ReferenceCount         = {};
+    uint32_t                                                        maxL1ReferenceCount                 = {};
+    uint32_t                                                        maxSubLayerCount                    = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                    expectDyadicTemporalSubLayerPattern = {};
+    int32_t                                                         minQp                               = {};
+    int32_t                                                         maxQp                               = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                    prefersGopRemainingFrames           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                                    requiresGopRemainingFrames          = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265StdFlagsKHR                stdSyntaxFlags                      = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265CapabilitiesKHR>
-  {
-    using Type = VideoEncodeH265CapabilitiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265CapabilitiesKHR>
   {
     using Type = VideoEncodeH265CapabilitiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265DpbSlotInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265DpbSlotInfoKHR.html
   struct VideoEncodeH265DpbSlotInfoKHR
   {
     using NativeType = VkVideoEncodeH265DpbSlotInfoKHR;
@@ -167660,11 +120992,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265DpbSlotInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265DpbSlotInfoKHR( const StdVideoEncodeH265ReferenceInfo * pStdReferenceInfo_ = {},
                                                         const void *                            pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , pStdReferenceInfo{ pStdReferenceInfo_ }
+      : pNext( pNext_ )
+      , pStdReferenceInfo( pStdReferenceInfo_ )
     {
     }
 
@@ -167676,15 +121008,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265DpbSlotInfoKHR & operator=( VideoEncodeH265DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265DpbSlotInfoKHR & operator=( VkVideoEncodeH265DpbSlotInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265DpbSlotInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265DpbSlotInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265DpbSlotInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -167697,7 +121029,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdReferenceInfo = pStdReferenceInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265DpbSlotInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -167709,18 +121041,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265DpbSlotInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265DpbSlotInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265DpbSlotInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265DpbSlotInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265DpbSlotInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, const StdVideoEncodeH265ReferenceInfo * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, const StdVideoEncodeH265ReferenceInfo * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, pStdReferenceInfo );
     }
@@ -167745,35 +121072,26 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                           sType             = StructureType::eVideoEncodeH265DpbSlotInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType     sType             = StructureType::eVideoEncodeH265DpbSlotInfoKHR;
     const void *                            pNext             = {};
     const StdVideoEncodeH265ReferenceInfo * pStdReferenceInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265DpbSlotInfoKHR>
-  {
-    using Type = VideoEncodeH265DpbSlotInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265DpbSlotInfoKHR>
   {
     using Type = VideoEncodeH265DpbSlotInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265FrameSizeKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265FrameSizeKHR.html
   struct VideoEncodeH265FrameSizeKHR
   {
     using NativeType = VkVideoEncodeH265FrameSizeKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265FrameSizeKHR( uint32_t frameISize_ = {}, uint32_t framePSize_ = {}, uint32_t frameBSize_ = {} ) VULKAN_HPP_NOEXCEPT
-      : frameISize{ frameISize_ }
-      , framePSize{ framePSize_ }
-      , frameBSize{ frameBSize_ }
+      : frameISize( frameISize_ )
+      , framePSize( framePSize_ )
+      , frameBSize( frameBSize_ )
     {
     }
 
@@ -167785,15 +121103,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265FrameSizeKHR & operator=( VideoEncodeH265FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265FrameSizeKHR & operator=( VkVideoEncodeH265FrameSizeKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265FrameSizeKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265FrameSizeKHR & setFrameISize( uint32_t frameISize_ ) VULKAN_HPP_NOEXCEPT
     {
       frameISize = frameISize_;
@@ -167811,7 +121129,7 @@ namespace VULKAN_HPP_NAMESPACE
       frameBSize = frameBSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265FrameSizeKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -167823,18 +121141,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265FrameSizeKHR *>( this );
     }
 
-    operator VkVideoEncodeH265FrameSizeKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265FrameSizeKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265FrameSizeKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265FrameSizeKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<uint32_t const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( frameISize, framePSize, frameBSize );
     }
@@ -167864,16 +121177,6 @@ namespace VULKAN_HPP_NAMESPACE
     uint32_t frameBSize = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265FrameSizeKHR>
-  {
-    using Type = VideoEncodeH265FrameSizeKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeH265GopRemainingFrameInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265GopRemainingFrameInfoKHR.html
   struct VideoEncodeH265GopRemainingFrameInfoKHR
   {
     using NativeType = VkVideoEncodeH265GopRemainingFrameInfoKHR;
@@ -167881,17 +121184,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265GopRemainingFrameInfoKHR( Bool32       useGopRemainingFrames_ = {},
-                                                                  uint32_t     gopRemainingI_         = {},
-                                                                  uint32_t     gopRemainingP_         = {},
-                                                                  uint32_t     gopRemainingB_         = {},
-                                                                  const void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useGopRemainingFrames{ useGopRemainingFrames_ }
-      , gopRemainingI{ gopRemainingI_ }
-      , gopRemainingP{ gopRemainingP_ }
-      , gopRemainingB{ gopRemainingB_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265GopRemainingFrameInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 useGopRemainingFrames_ = {},
+                                                                  uint32_t                     gopRemainingI_         = {},
+                                                                  uint32_t                     gopRemainingP_         = {},
+                                                                  uint32_t                     gopRemainingB_         = {},
+                                                                  const void *                 pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useGopRemainingFrames( useGopRemainingFrames_ )
+      , gopRemainingI( gopRemainingI_ )
+      , gopRemainingP( gopRemainingP_ )
+      , gopRemainingB( gopRemainingB_ )
     {
     }
 
@@ -167903,22 +121206,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265GopRemainingFrameInfoKHR & operator=( VideoEncodeH265GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265GopRemainingFrameInfoKHR & operator=( VkVideoEncodeH265GopRemainingFrameInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265GopRemainingFrameInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265GopRemainingFrameInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265GopRemainingFrameInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265GopRemainingFrameInfoKHR & setUseGopRemainingFrames( Bool32 useGopRemainingFrames_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265GopRemainingFrameInfoKHR &
+      setUseGopRemainingFrames( VULKAN_HPP_NAMESPACE::Bool32 useGopRemainingFrames_ ) VULKAN_HPP_NOEXCEPT
     {
       useGopRemainingFrames = useGopRemainingFrames_;
       return *this;
@@ -167941,7 +121245,7 @@ namespace VULKAN_HPP_NAMESPACE
       gopRemainingB = gopRemainingB_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265GopRemainingFrameInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -167953,18 +121257,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265GopRemainingFrameInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265GopRemainingFrameInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265GopRemainingFrameInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265GopRemainingFrameInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265GopRemainingFrameInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useGopRemainingFrames, gopRemainingI, gopRemainingP, gopRemainingB );
@@ -167991,30 +121294,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                 = StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR;
-    const void *  pNext                 = {};
-    Bool32        useGopRemainingFrames = {};
-    uint32_t      gopRemainingI         = {};
-    uint32_t      gopRemainingP         = {};
-    uint32_t      gopRemainingB         = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                 = StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR;
+    const void *                        pNext                 = {};
+    VULKAN_HPP_NAMESPACE::Bool32        useGopRemainingFrames = {};
+    uint32_t                            gopRemainingI         = {};
+    uint32_t                            gopRemainingP         = {};
+    uint32_t                            gopRemainingB         = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265GopRemainingFrameInfoKHR>
-  {
-    using Type = VideoEncodeH265GopRemainingFrameInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR>
   {
     using Type = VideoEncodeH265GopRemainingFrameInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265NaluSliceSegmentInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265NaluSliceSegmentInfoKHR.html
   struct VideoEncodeH265NaluSliceSegmentInfoKHR
   {
     using NativeType = VkVideoEncodeH265NaluSliceSegmentInfoKHR;
@@ -168022,13 +121315,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265NaluSliceSegmentInfoKHR( int32_t                                      constantQp_             = {},
                                                                  const StdVideoEncodeH265SliceSegmentHeader * pStdSliceSegmentHeader_ = {},
                                                                  const void *                                 pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , constantQp{ constantQp_ }
-      , pStdSliceSegmentHeader{ pStdSliceSegmentHeader_ }
+      : pNext( pNext_ )
+      , constantQp( constantQp_ )
+      , pStdSliceSegmentHeader( pStdSliceSegmentHeader_ )
     {
     }
 
@@ -168040,15 +121333,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265NaluSliceSegmentInfoKHR & operator=( VideoEncodeH265NaluSliceSegmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265NaluSliceSegmentInfoKHR & operator=( VkVideoEncodeH265NaluSliceSegmentInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265NaluSliceSegmentInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265NaluSliceSegmentInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -168067,7 +121360,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdSliceSegmentHeader = pStdSliceSegmentHeader_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265NaluSliceSegmentInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -168079,18 +121372,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265NaluSliceSegmentInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265NaluSliceSegmentInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265NaluSliceSegmentInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265NaluSliceSegmentInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265NaluSliceSegmentInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, int32_t const &, const StdVideoEncodeH265SliceSegmentHeader * const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, int32_t const &, const StdVideoEncodeH265SliceSegmentHeader * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, constantQp, pStdSliceSegmentHeader );
@@ -168116,28 +121403,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                sType                  = StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType          sType                  = StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR;
     const void *                                 pNext                  = {};
     int32_t                                      constantQp             = {};
     const StdVideoEncodeH265SliceSegmentHeader * pStdSliceSegmentHeader = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265NaluSliceSegmentInfoKHR>
-  {
-    using Type = VideoEncodeH265NaluSliceSegmentInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR>
   {
     using Type = VideoEncodeH265NaluSliceSegmentInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265PictureInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265PictureInfoKHR.html
   struct VideoEncodeH265PictureInfoKHR
   {
     using NativeType = VkVideoEncodeH265PictureInfoKHR;
@@ -168145,15 +121422,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265PictureInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265PictureInfoKHR( uint32_t                                       naluSliceSegmentEntryCount_ = {},
-                                                        const VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries_   = {},
-                                                        const StdVideoEncodeH265PictureInfo *          pStdPictureInfo_            = {},
-                                                        const void *                                   pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , naluSliceSegmentEntryCount{ naluSliceSegmentEntryCount_ }
-      , pNaluSliceSegmentEntries{ pNaluSliceSegmentEntries_ }
-      , pStdPictureInfo{ pStdPictureInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265PictureInfoKHR( uint32_t                                                             naluSliceSegmentEntryCount_ = {},
+                                                        const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries_   = {},
+                                                        const StdVideoEncodeH265PictureInfo *                                pStdPictureInfo_            = {},
+                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , naluSliceSegmentEntryCount( naluSliceSegmentEntryCount_ )
+      , pNaluSliceSegmentEntries( pNaluSliceSegmentEntries_ )
+      , pStdPictureInfo( pStdPictureInfo_ )
     {
     }
 
@@ -168165,9 +121442,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH265PictureInfoKHR( ArrayProxyNoTemporaries<const VideoEncodeH265NaluSliceSegmentInfoKHR> const & naluSliceSegmentEntries_,
-                                   const StdVideoEncodeH265PictureInfo *                                         pStdPictureInfo_ = {},
-                                   const void *                                                                  pNext_           = nullptr )
+    VideoEncodeH265PictureInfoKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR> const & naluSliceSegmentEntries_,
+      const StdVideoEncodeH265PictureInfo *                                                                                     pStdPictureInfo_ = {},
+      const void *                                                                                                              pNext_           = nullptr )
       : pNext( pNext_ )
       , naluSliceSegmentEntryCount( static_cast<uint32_t>( naluSliceSegmentEntries_.size() ) )
       , pNaluSliceSegmentEntries( naluSliceSegmentEntries_.data() )
@@ -168177,15 +121455,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeH265PictureInfoKHR & operator=( VideoEncodeH265PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265PictureInfoKHR & operator=( VkVideoEncodeH265PictureInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265PictureInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265PictureInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265PictureInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -168199,15 +121477,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265PictureInfoKHR &
-      setPNaluSliceSegmentEntries( const VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries_ ) VULKAN_HPP_NOEXCEPT
+      setPNaluSliceSegmentEntries( const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries_ ) VULKAN_HPP_NOEXCEPT
     {
       pNaluSliceSegmentEntries = pNaluSliceSegmentEntries_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH265PictureInfoKHR &
-      setNaluSliceSegmentEntries( ArrayProxyNoTemporaries<const VideoEncodeH265NaluSliceSegmentInfoKHR> const & naluSliceSegmentEntries_ ) VULKAN_HPP_NOEXCEPT
+    VideoEncodeH265PictureInfoKHR & setNaluSliceSegmentEntries(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR> const & naluSliceSegmentEntries_ )
+      VULKAN_HPP_NOEXCEPT
     {
       naluSliceSegmentEntryCount = static_cast<uint32_t>( naluSliceSegmentEntries_.size() );
       pNaluSliceSegmentEntries   = naluSliceSegmentEntries_.data();
@@ -168220,7 +121499,7 @@ namespace VULKAN_HPP_NAMESPACE
       pStdPictureInfo = pStdPictureInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265PictureInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -168232,22 +121511,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265PictureInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265PictureInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265PictureInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265PictureInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265PictureInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const VideoEncodeH265NaluSliceSegmentInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR * const &,
                const StdVideoEncodeH265PictureInfo * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, naluSliceSegmentEntryCount, pNaluSliceSegmentEntries, pStdPictureInfo );
@@ -168274,29 +121547,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                  sType                      = StructureType::eVideoEncodeH265PictureInfoKHR;
-    const void *                                   pNext                      = {};
-    uint32_t                                       naluSliceSegmentEntryCount = {};
-    const VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries   = {};
-    const StdVideoEncodeH265PictureInfo *          pStdPictureInfo            = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                  sType                      = StructureType::eVideoEncodeH265PictureInfoKHR;
+    const void *                                                         pNext                      = {};
+    uint32_t                                                             naluSliceSegmentEntryCount = {};
+    const VULKAN_HPP_NAMESPACE::VideoEncodeH265NaluSliceSegmentInfoKHR * pNaluSliceSegmentEntries   = {};
+    const StdVideoEncodeH265PictureInfo *                                pStdPictureInfo            = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265PictureInfoKHR>
-  {
-    using Type = VideoEncodeH265PictureInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265PictureInfoKHR>
   {
     using Type = VideoEncodeH265PictureInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265ProfileInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265ProfileInfoKHR.html
   struct VideoEncodeH265ProfileInfoKHR
   {
     using NativeType = VkVideoEncodeH265ProfileInfoKHR;
@@ -168304,10 +121567,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265ProfileInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265ProfileInfoKHR( StdVideoH265ProfileIdc stdProfileIdc_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdProfileIdc{ stdProfileIdc_ }
+      : pNext( pNext_ )
+      , stdProfileIdc( stdProfileIdc_ )
     {
     }
 
@@ -168319,15 +121582,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265ProfileInfoKHR & operator=( VideoEncodeH265ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265ProfileInfoKHR & operator=( VkVideoEncodeH265ProfileInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265ProfileInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265ProfileInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265ProfileInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -168339,7 +121602,7 @@ namespace VULKAN_HPP_NAMESPACE
       stdProfileIdc = stdProfileIdc_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265ProfileInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -168351,18 +121614,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265ProfileInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265ProfileInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265ProfileInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265ProfileInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265ProfileInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, StdVideoH265ProfileIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, StdVideoH265ProfileIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdProfileIdc );
     }
@@ -168393,35 +121651,26 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType          sType         = StructureType::eVideoEncodeH265ProfileInfoKHR;
-    const void *           pNext         = {};
-    StdVideoH265ProfileIdc stdProfileIdc = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType         = StructureType::eVideoEncodeH265ProfileInfoKHR;
+    const void *                        pNext         = {};
+    StdVideoH265ProfileIdc              stdProfileIdc = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265ProfileInfoKHR>
-  {
-    using Type = VideoEncodeH265ProfileInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265ProfileInfoKHR>
   {
     using Type = VideoEncodeH265ProfileInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265QpKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265QpKHR.html
   struct VideoEncodeH265QpKHR
   {
     using NativeType = VkVideoEncodeH265QpKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265QpKHR( int32_t qpI_ = {}, int32_t qpP_ = {}, int32_t qpB_ = {} ) VULKAN_HPP_NOEXCEPT
-      : qpI{ qpI_ }
-      , qpP{ qpP_ }
-      , qpB{ qpB_ }
+      : qpI( qpI_ )
+      , qpP( qpP_ )
+      , qpB( qpB_ )
     {
     }
 
@@ -168433,15 +121682,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265QpKHR & operator=( VideoEncodeH265QpKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265QpKHR & operator=( VkVideoEncodeH265QpKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265QpKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265QpKHR & setQpI( int32_t qpI_ ) VULKAN_HPP_NOEXCEPT
     {
       qpI = qpI_;
@@ -168459,7 +121708,7 @@ namespace VULKAN_HPP_NAMESPACE
       qpB = qpB_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265QpKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -168471,18 +121720,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265QpKHR *>( this );
     }
 
-    operator VkVideoEncodeH265QpKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265QpKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265QpKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265QpKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<int32_t const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<int32_t const &, int32_t const &, int32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( qpI, qpP, qpB );
     }
@@ -168512,16 +121756,6 @@ namespace VULKAN_HPP_NAMESPACE
     int32_t qpB = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265QpKHR>
-  {
-    using Type = VideoEncodeH265QpKHR;
-  };
-#endif
-
-  // wrapper struct for struct VkVideoEncodeH265QualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265QualityLevelPropertiesKHR.html
   struct VideoEncodeH265QualityLevelPropertiesKHR
   {
     using NativeType = VkVideoEncodeH265QualityLevelPropertiesKHR;
@@ -168529,25 +121763,25 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265QualityLevelPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265QualityLevelPropertiesKHR( VideoEncodeH265RateControlFlagsKHR preferredRateControlFlags_       = {},
-                                                                   uint32_t                           preferredGopFrameCount_          = {},
-                                                                   uint32_t                           preferredIdrPeriod_              = {},
-                                                                   uint32_t                           preferredConsecutiveBFrameCount_ = {},
-                                                                   uint32_t                           preferredSubLayerCount_          = {},
-                                                                   VideoEncodeH265QpKHR               preferredConstantQp_             = {},
-                                                                   uint32_t                           preferredMaxL0ReferenceCount_    = {},
-                                                                   uint32_t                           preferredMaxL1ReferenceCount_    = {},
-                                                                   void *                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , preferredRateControlFlags{ preferredRateControlFlags_ }
-      , preferredGopFrameCount{ preferredGopFrameCount_ }
-      , preferredIdrPeriod{ preferredIdrPeriod_ }
-      , preferredConsecutiveBFrameCount{ preferredConsecutiveBFrameCount_ }
-      , preferredSubLayerCount{ preferredSubLayerCount_ }
-      , preferredConstantQp{ preferredConstantQp_ }
-      , preferredMaxL0ReferenceCount{ preferredMaxL0ReferenceCount_ }
-      , preferredMaxL1ReferenceCount{ preferredMaxL1ReferenceCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265QualityLevelPropertiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR preferredRateControlFlags_ = {},
+                                                                   uint32_t                                                 preferredGopFrameCount_    = {},
+                                                                   uint32_t                                                 preferredIdrPeriod_        = {},
+                                                                   uint32_t                                   preferredConsecutiveBFrameCount_         = {},
+                                                                   uint32_t                                   preferredSubLayerCount_                  = {},
+                                                                   VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR preferredConstantQp_                     = {},
+                                                                   uint32_t                                   preferredMaxL0ReferenceCount_            = {},
+                                                                   uint32_t                                   preferredMaxL1ReferenceCount_            = {},
+                                                                   void *                                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , preferredRateControlFlags( preferredRateControlFlags_ )
+      , preferredGopFrameCount( preferredGopFrameCount_ )
+      , preferredIdrPeriod( preferredIdrPeriod_ )
+      , preferredConsecutiveBFrameCount( preferredConsecutiveBFrameCount_ )
+      , preferredSubLayerCount( preferredSubLayerCount_ )
+      , preferredConstantQp( preferredConstantQp_ )
+      , preferredMaxL0ReferenceCount( preferredMaxL0ReferenceCount_ )
+      , preferredMaxL1ReferenceCount( preferredMaxL1ReferenceCount_ )
     {
     }
 
@@ -168559,11 +121793,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265QualityLevelPropertiesKHR & operator=( VideoEncodeH265QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265QualityLevelPropertiesKHR & operator=( VkVideoEncodeH265QualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265QualityLevelPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265QualityLevelPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -168577,27 +121811,21 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265QualityLevelPropertiesKHR *>( this );
     }
 
-    operator VkVideoEncodeH265QualityLevelPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265QualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265QualityLevelPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265QualityLevelPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               VideoEncodeH265RateControlFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               VideoEncodeH265QpKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -168636,135 +121864,24 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                           = StructureType::eVideoEncodeH265QualityLevelPropertiesKHR;
-    void *                             pNext                           = {};
-    VideoEncodeH265RateControlFlagsKHR preferredRateControlFlags       = {};
-    uint32_t                           preferredGopFrameCount          = {};
-    uint32_t                           preferredIdrPeriod              = {};
-    uint32_t                           preferredConsecutiveBFrameCount = {};
-    uint32_t                           preferredSubLayerCount          = {};
-    VideoEncodeH265QpKHR               preferredConstantQp             = {};
-    uint32_t                           preferredMaxL0ReferenceCount    = {};
-    uint32_t                           preferredMaxL1ReferenceCount    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                           = StructureType::eVideoEncodeH265QualityLevelPropertiesKHR;
+    void *                                                   pNext                           = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR preferredRateControlFlags       = {};
+    uint32_t                                                 preferredGopFrameCount          = {};
+    uint32_t                                                 preferredIdrPeriod              = {};
+    uint32_t                                                 preferredConsecutiveBFrameCount = {};
+    uint32_t                                                 preferredSubLayerCount          = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR               preferredConstantQp             = {};
+    uint32_t                                                 preferredMaxL0ReferenceCount    = {};
+    uint32_t                                                 preferredMaxL1ReferenceCount    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265QualityLevelPropertiesKHR>
-  {
-    using Type = VideoEncodeH265QualityLevelPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265QualityLevelPropertiesKHR>
   {
     using Type = VideoEncodeH265QualityLevelPropertiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265QuantizationMapCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265QuantizationMapCapabilitiesKHR.html
-  struct VideoEncodeH265QuantizationMapCapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeH265QuantizationMapCapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265QuantizationMapCapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeH265QuantizationMapCapabilitiesKHR( int32_t minQpDelta_ = {}, int32_t maxQpDelta_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , minQpDelta{ minQpDelta_ }
-      , maxQpDelta{ maxQpDelta_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeH265QuantizationMapCapabilitiesKHR( VideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeH265QuantizationMapCapabilitiesKHR( VkVideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeH265QuantizationMapCapabilitiesKHR( *reinterpret_cast<VideoEncodeH265QuantizationMapCapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeH265QuantizationMapCapabilitiesKHR & operator=( VideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeH265QuantizationMapCapabilitiesKHR & operator=( VkVideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeH265QuantizationMapCapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeH265QuantizationMapCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeH265QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265QuantizationMapCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeH265QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265QuantizationMapCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265QuantizationMapCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265QuantizationMapCapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, int32_t const &, int32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, minQpDelta, maxQpDelta );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeH265QuantizationMapCapabilitiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( minQpDelta == rhs.minQpDelta ) && ( maxQpDelta == rhs.maxQpDelta );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeH265QuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType      = StructureType::eVideoEncodeH265QuantizationMapCapabilitiesKHR;
-    void *        pNext      = {};
-    int32_t       minQpDelta = {};
-    int32_t       maxQpDelta = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeH265QuantizationMapCapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeH265QuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeH265QuantizationMapCapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeH265RateControlInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265RateControlInfoKHR.html
   struct VideoEncodeH265RateControlInfoKHR
   {
     using NativeType = VkVideoEncodeH265RateControlInfoKHR;
@@ -168772,19 +121889,19 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265RateControlInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265RateControlInfoKHR( VideoEncodeH265RateControlFlagsKHR flags_                  = {},
-                                                            uint32_t                           gopFrameCount_          = {},
-                                                            uint32_t                           idrPeriod_              = {},
-                                                            uint32_t                           consecutiveBFrameCount_ = {},
-                                                            uint32_t                           subLayerCount_          = {},
-                                                            const void *                       pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , gopFrameCount{ gopFrameCount_ }
-      , idrPeriod{ idrPeriod_ }
-      , consecutiveBFrameCount{ consecutiveBFrameCount_ }
-      , subLayerCount{ subLayerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265RateControlInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR flags_                  = {},
+                                                            uint32_t                                                 gopFrameCount_          = {},
+                                                            uint32_t                                                 idrPeriod_              = {},
+                                                            uint32_t                                                 consecutiveBFrameCount_ = {},
+                                                            uint32_t                                                 subLayerCount_          = {},
+                                                            const void *                                             pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , gopFrameCount( gopFrameCount_ )
+      , idrPeriod( idrPeriod_ )
+      , consecutiveBFrameCount( consecutiveBFrameCount_ )
+      , subLayerCount( subLayerCount_ )
     {
     }
 
@@ -168796,22 +121913,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265RateControlInfoKHR & operator=( VideoEncodeH265RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265RateControlInfoKHR & operator=( VkVideoEncodeH265RateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265RateControlInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlInfoKHR & setFlags( VideoEncodeH265RateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -168840,7 +121957,7 @@ namespace VULKAN_HPP_NAMESPACE
       subLayerCount = subLayerCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265RateControlInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -168852,24 +121969,18 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265RateControlInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265RateControlInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265RateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265RateControlInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265RateControlInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoEncodeH265RateControlFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, gopFrameCount, idrPeriod, consecutiveBFrameCount, subLayerCount );
@@ -168896,31 +122007,21 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                      sType                  = StructureType::eVideoEncodeH265RateControlInfoKHR;
-    const void *                       pNext                  = {};
-    VideoEncodeH265RateControlFlagsKHR flags                  = {};
-    uint32_t                           gopFrameCount          = {};
-    uint32_t                           idrPeriod              = {};
-    uint32_t                           consecutiveBFrameCount = {};
-    uint32_t                           subLayerCount          = {};
+    VULKAN_HPP_NAMESPACE::StructureType                      sType                  = StructureType::eVideoEncodeH265RateControlInfoKHR;
+    const void *                                             pNext                  = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlFlagsKHR flags                  = {};
+    uint32_t                                                 gopFrameCount          = {};
+    uint32_t                                                 idrPeriod              = {};
+    uint32_t                                                 consecutiveBFrameCount = {};
+    uint32_t                                                 subLayerCount          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265RateControlInfoKHR>
-  {
-    using Type = VideoEncodeH265RateControlInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265RateControlInfoKHR>
   {
     using Type = VideoEncodeH265RateControlInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265RateControlLayerInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265RateControlLayerInfoKHR.html
   struct VideoEncodeH265RateControlLayerInfoKHR
   {
     using NativeType = VkVideoEncodeH265RateControlLayerInfoKHR;
@@ -168928,21 +122029,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265RateControlLayerInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265RateControlLayerInfoKHR( Bool32                      useMinQp_        = {},
-                                                                 VideoEncodeH265QpKHR        minQp_           = {},
-                                                                 Bool32                      useMaxQp_        = {},
-                                                                 VideoEncodeH265QpKHR        maxQp_           = {},
-                                                                 Bool32                      useMaxFrameSize_ = {},
-                                                                 VideoEncodeH265FrameSizeKHR maxFrameSize_    = {},
-                                                                 const void *                pNext_           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMinQp{ useMinQp_ }
-      , minQp{ minQp_ }
-      , useMaxQp{ useMaxQp_ }
-      , maxQp{ maxQp_ }
-      , useMaxFrameSize{ useMaxFrameSize_ }
-      , maxFrameSize{ maxFrameSize_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265RateControlLayerInfoKHR( VULKAN_HPP_NAMESPACE::Bool32                      useMinQp_        = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR        minQp_           = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32                      useMaxQp_        = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR        maxQp_           = {},
+                                                                 VULKAN_HPP_NAMESPACE::Bool32                      useMaxFrameSize_ = {},
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR maxFrameSize_    = {},
+                                                                 const void *                                      pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useMinQp( useMinQp_ )
+      , minQp( minQp_ )
+      , useMaxQp( useMaxQp_ )
+      , maxQp( maxQp_ )
+      , useMaxFrameSize( useMaxFrameSize_ )
+      , maxFrameSize( maxFrameSize_ )
     {
     }
 
@@ -168954,57 +122055,58 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265RateControlLayerInfoKHR & operator=( VideoEncodeH265RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265RateControlLayerInfoKHR & operator=( VkVideoEncodeH265RateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265RateControlLayerInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265RateControlLayerInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMinQp( Bool32 useMinQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMinQp( VULKAN_HPP_NAMESPACE::Bool32 useMinQp_ ) VULKAN_HPP_NOEXCEPT
     {
       useMinQp = useMinQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setMinQp( VideoEncodeH265QpKHR const & minQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setMinQp( VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const & minQp_ ) VULKAN_HPP_NOEXCEPT
     {
       minQp = minQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMaxQp( Bool32 useMaxQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMaxQp( VULKAN_HPP_NAMESPACE::Bool32 useMaxQp_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxQp = useMaxQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setMaxQp( VideoEncodeH265QpKHR const & maxQp_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setMaxQp( VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const & maxQp_ ) VULKAN_HPP_NOEXCEPT
     {
       maxQp = maxQp_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMaxFrameSize( Bool32 useMaxFrameSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setUseMaxFrameSize( VULKAN_HPP_NAMESPACE::Bool32 useMaxFrameSize_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxFrameSize = useMaxFrameSize_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR & setMaxFrameSize( VideoEncodeH265FrameSizeKHR const & maxFrameSize_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265RateControlLayerInfoKHR &
+      setMaxFrameSize( VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR const & maxFrameSize_ ) VULKAN_HPP_NOEXCEPT
     {
       maxFrameSize = maxFrameSize_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265RateControlLayerInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169016,25 +122118,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265RateControlLayerInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265RateControlLayerInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265RateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265RateControlLayerInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265RateControlLayerInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               Bool32 const &,
-               VideoEncodeH265QpKHR const &,
-               Bool32 const &,
-               VideoEncodeH265QpKHR const &,
-               Bool32 const &,
-               VideoEncodeH265FrameSizeKHR const &>
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useMinQp, minQp, useMaxQp, maxQp, useMaxFrameSize, maxFrameSize );
@@ -169061,32 +122157,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType           = StructureType::eVideoEncodeH265RateControlLayerInfoKHR;
-    const void *                pNext           = {};
-    Bool32                      useMinQp        = {};
-    VideoEncodeH265QpKHR        minQp           = {};
-    Bool32                      useMaxQp        = {};
-    VideoEncodeH265QpKHR        maxQp           = {};
-    Bool32                      useMaxFrameSize = {};
-    VideoEncodeH265FrameSizeKHR maxFrameSize    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType           = StructureType::eVideoEncodeH265RateControlLayerInfoKHR;
+    const void *                                      pNext           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMinQp        = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR        minQp           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMaxQp        = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265QpKHR        maxQp           = {};
+    VULKAN_HPP_NAMESPACE::Bool32                      useMaxFrameSize = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeH265FrameSizeKHR maxFrameSize    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265RateControlLayerInfoKHR>
-  {
-    using Type = VideoEncodeH265RateControlLayerInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265RateControlLayerInfoKHR>
   {
     using Type = VideoEncodeH265RateControlLayerInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265SessionCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265SessionCreateInfoKHR.html
   struct VideoEncodeH265SessionCreateInfoKHR
   {
     using NativeType = VkVideoEncodeH265SessionCreateInfoKHR;
@@ -169094,13 +122180,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265SessionCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionCreateInfoKHR( Bool32               useMaxLevelIdc_ = {},
-                                                              StdVideoH265LevelIdc maxLevelIdc_    = {},
-                                                              const void *         pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , useMaxLevelIdc{ useMaxLevelIdc_ }
-      , maxLevelIdc{ maxLevelIdc_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionCreateInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 useMaxLevelIdc_ = {},
+                                                              StdVideoH265LevelIdc         maxLevelIdc_    = {},
+                                                              const void *                 pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , useMaxLevelIdc( useMaxLevelIdc_ )
+      , maxLevelIdc( maxLevelIdc_ )
     {
     }
 
@@ -169112,22 +122198,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265SessionCreateInfoKHR & operator=( VideoEncodeH265SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265SessionCreateInfoKHR & operator=( VkVideoEncodeH265SessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265SessionCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionCreateInfoKHR & setUseMaxLevelIdc( Bool32 useMaxLevelIdc_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionCreateInfoKHR & setUseMaxLevelIdc( VULKAN_HPP_NAMESPACE::Bool32 useMaxLevelIdc_ ) VULKAN_HPP_NOEXCEPT
     {
       useMaxLevelIdc = useMaxLevelIdc_;
       return *this;
@@ -169138,7 +122224,7 @@ namespace VULKAN_HPP_NAMESPACE
       maxLevelIdc = maxLevelIdc_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265SessionCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169150,18 +122236,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265SessionCreateInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265SessionCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265SessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265SessionCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265SessionCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &, StdVideoH265LevelIdc const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &, StdVideoH265LevelIdc const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, useMaxLevelIdc, maxLevelIdc );
     }
@@ -169195,28 +122276,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType        sType          = StructureType::eVideoEncodeH265SessionCreateInfoKHR;
-    const void *         pNext          = {};
-    Bool32               useMaxLevelIdc = {};
-    StdVideoH265LevelIdc maxLevelIdc    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType          = StructureType::eVideoEncodeH265SessionCreateInfoKHR;
+    const void *                        pNext          = {};
+    VULKAN_HPP_NAMESPACE::Bool32        useMaxLevelIdc = {};
+    StdVideoH265LevelIdc                maxLevelIdc    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265SessionCreateInfoKHR>
-  {
-    using Type = VideoEncodeH265SessionCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265SessionCreateInfoKHR>
   {
     using Type = VideoEncodeH265SessionCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265SessionParametersAddInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265SessionParametersAddInfoKHR.html
   struct VideoEncodeH265SessionParametersAddInfoKHR
   {
     using NativeType = VkVideoEncodeH265SessionParametersAddInfoKHR;
@@ -169224,7 +122295,7 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265SessionParametersAddInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersAddInfoKHR( uint32_t                                 stdVPSCount_ = {},
                                                                      const StdVideoH265VideoParameterSet *    pStdVPSs_    = {},
                                                                      uint32_t                                 stdSPSCount_ = {},
@@ -169232,13 +122303,13 @@ namespace VULKAN_HPP_NAMESPACE
                                                                      uint32_t                                 stdPPSCount_ = {},
                                                                      const StdVideoH265PictureParameterSet *  pStdPPSs_    = {},
                                                                      const void *                             pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , stdVPSCount{ stdVPSCount_ }
-      , pStdVPSs{ pStdVPSs_ }
-      , stdSPSCount{ stdSPSCount_ }
-      , pStdSPSs{ pStdSPSs_ }
-      , stdPPSCount{ stdPPSCount_ }
-      , pStdPPSs{ pStdPPSs_ }
+      : pNext( pNext_ )
+      , stdVPSCount( stdVPSCount_ )
+      , pStdVPSs( pStdVPSs_ )
+      , stdSPSCount( stdSPSCount_ )
+      , pStdSPSs( pStdSPSs_ )
+      , stdPPSCount( stdPPSCount_ )
+      , pStdPPSs( pStdPPSs_ )
     {
     }
 
@@ -169250,10 +122321,10 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH265SessionParametersAddInfoKHR( ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const &    stdVPSs_,
-                                                ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ = {},
-                                                ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const &  stdPPSs_ = {},
-                                                const void *                                                            pNext_   = nullptr )
+    VideoEncodeH265SessionParametersAddInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const &    stdVPSs_,
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ = {},
+                                                VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const &  stdPPSs_ = {},
+                                                const void *                                                                                  pNext_ = nullptr )
       : pNext( pNext_ )
       , stdVPSCount( static_cast<uint32_t>( stdVPSs_.size() ) )
       , pStdVPSs( stdVPSs_.data() )
@@ -169266,15 +122337,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeH265SessionParametersAddInfoKHR & operator=( VideoEncodeH265SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265SessionParametersAddInfoKHR & operator=( VkVideoEncodeH265SessionParametersAddInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265SessionParametersAddInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersAddInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -169294,7 +122365,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeH265SessionParametersAddInfoKHR & setStdVPSs( ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const & stdVPSs_ ) VULKAN_HPP_NOEXCEPT
+    VideoEncodeH265SessionParametersAddInfoKHR &
+      setStdVPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265VideoParameterSet> const & stdVPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdVPSCount = static_cast<uint32_t>( stdVPSs_.size() );
       pStdVPSs    = stdVPSs_.data();
@@ -169316,7 +122388,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoEncodeH265SessionParametersAddInfoKHR &
-      setStdSPSs( ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdSPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265SequenceParameterSet> const & stdSPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdSPSCount = static_cast<uint32_t>( stdSPSs_.size() );
       pStdSPSs    = stdSPSs_.data();
@@ -169338,14 +122410,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     VideoEncodeH265SessionParametersAddInfoKHR &
-      setStdPPSs( ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
+      setStdPPSs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const StdVideoH265PictureParameterSet> const & stdPPSs_ ) VULKAN_HPP_NOEXCEPT
     {
       stdPPSCount = static_cast<uint32_t>( stdPPSs_.size() );
       pStdPPSs    = stdPPSs_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265SessionParametersAddInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169357,18 +122429,11 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265SessionParametersAddInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265SessionParametersAddInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265SessionParametersAddInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265SessionParametersAddInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265SessionParametersAddInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                const StdVideoH265VideoParameterSet * const &,
@@ -169376,6 +122441,7 @@ namespace VULKAN_HPP_NAMESPACE
                const StdVideoH265SequenceParameterSet * const &,
                uint32_t const &,
                const StdVideoH265PictureParameterSet * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, stdVPSCount, pStdVPSs, stdSPSCount, pStdSPSs, stdPPSCount, pStdPPSs );
@@ -169402,7 +122468,7 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                            sType       = StructureType::eVideoEncodeH265SessionParametersAddInfoKHR;
+    VULKAN_HPP_NAMESPACE::StructureType      sType       = StructureType::eVideoEncodeH265SessionParametersAddInfoKHR;
     const void *                             pNext       = {};
     uint32_t                                 stdVPSCount = {};
     const StdVideoH265VideoParameterSet *    pStdVPSs    = {};
@@ -169412,22 +122478,12 @@ namespace VULKAN_HPP_NAMESPACE
     const StdVideoH265PictureParameterSet *  pStdPPSs    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265SessionParametersAddInfoKHR>
-  {
-    using Type = VideoEncodeH265SessionParametersAddInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265SessionParametersAddInfoKHR>
   {
     using Type = VideoEncodeH265SessionParametersAddInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265SessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265SessionParametersCreateInfoKHR.html
   struct VideoEncodeH265SessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoEncodeH265SessionParametersCreateInfoKHR;
@@ -169435,17 +122491,18 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersCreateInfoKHR( uint32_t                                           maxStdVPSCount_     = {},
-                                                                        uint32_t                                           maxStdSPSCount_     = {},
-                                                                        uint32_t                                           maxStdPPSCount_     = {},
-                                                                        const VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
-                                                                        const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxStdVPSCount{ maxStdVPSCount_ }
-      , maxStdSPSCount{ maxStdSPSCount_ }
-      , maxStdPPSCount{ maxStdPPSCount_ }
-      , pParametersAddInfo{ pParametersAddInfo_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      VideoEncodeH265SessionParametersCreateInfoKHR( uint32_t                                                                 maxStdVPSCount_     = {},
+                                                     uint32_t                                                                 maxStdSPSCount_     = {},
+                                                     uint32_t                                                                 maxStdPPSCount_     = {},
+                                                     const VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ = {},
+                                                     const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , maxStdVPSCount( maxStdVPSCount_ )
+      , maxStdSPSCount( maxStdSPSCount_ )
+      , maxStdPPSCount( maxStdPPSCount_ )
+      , pParametersAddInfo( pParametersAddInfo_ )
     {
     }
 
@@ -169458,15 +122515,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265SessionParametersCreateInfoKHR & operator=( VideoEncodeH265SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265SessionParametersCreateInfoKHR & operator=( VkVideoEncodeH265SessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265SessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -169492,12 +122549,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersCreateInfoKHR &
-      setPParametersAddInfo( const VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
+      setPParametersAddInfo( const VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo_ ) VULKAN_HPP_NOEXCEPT
     {
       pParametersAddInfo = pParametersAddInfo_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265SessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169509,23 +122566,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265SessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265SessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265SessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265SessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265SessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
                uint32_t const &,
                uint32_t const &,
-               const VideoEncodeH265SessionParametersAddInfoKHR * const &>
+               const VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, maxStdVPSCount, maxStdSPSCount, maxStdPPSCount, pParametersAddInfo );
@@ -169552,30 +122603,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                                      sType              = StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR;
-    const void *                                       pNext              = {};
-    uint32_t                                           maxStdVPSCount     = {};
-    uint32_t                                           maxStdSPSCount     = {};
-    uint32_t                                           maxStdPPSCount     = {};
-    const VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo = {};
+    VULKAN_HPP_NAMESPACE::StructureType                                      sType              = StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR;
+    const void *                                                             pNext              = {};
+    uint32_t                                                                 maxStdVPSCount     = {};
+    uint32_t                                                                 maxStdSPSCount     = {};
+    uint32_t                                                                 maxStdPPSCount     = {};
+    const VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersAddInfoKHR * pParametersAddInfo = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265SessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeH265SessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR>
   {
     using Type = VideoEncodeH265SessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265SessionParametersFeedbackInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265SessionParametersFeedbackInfoKHR.html
   struct VideoEncodeH265SessionParametersFeedbackInfoKHR
   {
     using NativeType = VkVideoEncodeH265SessionParametersFeedbackInfoKHR;
@@ -169583,15 +122624,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265SessionParametersFeedbackInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersFeedbackInfoKHR( Bool32 hasStdVPSOverrides_ = {},
-                                                                          Bool32 hasStdSPSOverrides_ = {},
-                                                                          Bool32 hasStdPPSOverrides_ = {},
-                                                                          void * pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hasStdVPSOverrides{ hasStdVPSOverrides_ }
-      , hasStdSPSOverrides{ hasStdSPSOverrides_ }
-      , hasStdPPSOverrides{ hasStdPPSOverrides_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersFeedbackInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 hasStdVPSOverrides_ = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 hasStdSPSOverrides_ = {},
+                                                                          VULKAN_HPP_NAMESPACE::Bool32 hasStdPPSOverrides_ = {},
+                                                                          void *                       pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hasStdVPSOverrides( hasStdVPSOverrides_ )
+      , hasStdSPSOverrides( hasStdSPSOverrides_ )
+      , hasStdPPSOverrides( hasStdPPSOverrides_ )
     {
     }
 
@@ -169604,11 +122645,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265SessionParametersFeedbackInfoKHR & operator=( VideoEncodeH265SessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265SessionParametersFeedbackInfoKHR & operator=( VkVideoEncodeH265SessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265SessionParametersFeedbackInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersFeedbackInfoKHR const *>( &rhs );
       return *this;
     }
 
@@ -169622,18 +122663,17 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265SessionParametersFeedbackInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265SessionParametersFeedbackInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265SessionParametersFeedbackInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265SessionParametersFeedbackInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265SessionParametersFeedbackInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &, Bool32 const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hasStdVPSOverrides, hasStdSPSOverrides, hasStdPPSOverrides );
     }
@@ -169659,29 +122699,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType              = StructureType::eVideoEncodeH265SessionParametersFeedbackInfoKHR;
-    void *        pNext              = {};
-    Bool32        hasStdVPSOverrides = {};
-    Bool32        hasStdSPSOverrides = {};
-    Bool32        hasStdPPSOverrides = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType              = StructureType::eVideoEncodeH265SessionParametersFeedbackInfoKHR;
+    void *                              pNext              = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasStdVPSOverrides = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasStdSPSOverrides = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasStdPPSOverrides = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265SessionParametersFeedbackInfoKHR>
-  {
-    using Type = VideoEncodeH265SessionParametersFeedbackInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265SessionParametersFeedbackInfoKHR>
   {
     using Type = VideoEncodeH265SessionParametersFeedbackInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeH265SessionParametersGetInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeH265SessionParametersGetInfoKHR.html
   struct VideoEncodeH265SessionParametersGetInfoKHR
   {
     using NativeType = VkVideoEncodeH265SessionParametersGetInfoKHR;
@@ -169689,21 +122719,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeH265SessionParametersGetInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersGetInfoKHR( Bool32       writeStdVPS_ = {},
-                                                                     Bool32       writeStdSPS_ = {},
-                                                                     Bool32       writeStdPPS_ = {},
-                                                                     uint32_t     stdVPSId_    = {},
-                                                                     uint32_t     stdSPSId_    = {},
-                                                                     uint32_t     stdPPSId_    = {},
-                                                                     const void * pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , writeStdVPS{ writeStdVPS_ }
-      , writeStdSPS{ writeStdSPS_ }
-      , writeStdPPS{ writeStdPPS_ }
-      , stdVPSId{ stdVPSId_ }
-      , stdSPSId{ stdSPSId_ }
-      , stdPPSId{ stdPPSId_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeH265SessionParametersGetInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 writeStdVPS_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 writeStdSPS_ = {},
+                                                                     VULKAN_HPP_NAMESPACE::Bool32 writeStdPPS_ = {},
+                                                                     uint32_t                     stdVPSId_    = {},
+                                                                     uint32_t                     stdSPSId_    = {},
+                                                                     uint32_t                     stdPPSId_    = {},
+                                                                     const void *                 pNext_       = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , writeStdVPS( writeStdVPS_ )
+      , writeStdSPS( writeStdSPS_ )
+      , writeStdPPS( writeStdPPS_ )
+      , stdVPSId( stdVPSId_ )
+      , stdSPSId( stdSPSId_ )
+      , stdPPSId( stdPPSId_ )
     {
     }
 
@@ -169715,34 +122745,34 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeH265SessionParametersGetInfoKHR & operator=( VideoEncodeH265SessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeH265SessionParametersGetInfoKHR & operator=( VkVideoEncodeH265SessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeH265SessionParametersGetInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeH265SessionParametersGetInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdVPS( Bool32 writeStdVPS_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdVPS( VULKAN_HPP_NAMESPACE::Bool32 writeStdVPS_ ) VULKAN_HPP_NOEXCEPT
     {
       writeStdVPS = writeStdVPS_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdSPS( Bool32 writeStdSPS_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdSPS( VULKAN_HPP_NAMESPACE::Bool32 writeStdSPS_ ) VULKAN_HPP_NOEXCEPT
     {
       writeStdSPS = writeStdSPS_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdPPS( Bool32 writeStdPPS_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeH265SessionParametersGetInfoKHR & setWriteStdPPS( VULKAN_HPP_NAMESPACE::Bool32 writeStdPPS_ ) VULKAN_HPP_NOEXCEPT
     {
       writeStdPPS = writeStdPPS_;
       return *this;
@@ -169765,7 +122795,7 @@ namespace VULKAN_HPP_NAMESPACE
       stdPPSId = stdPPSId_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeH265SessionParametersGetInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169777,19 +122807,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeH265SessionParametersGetInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeH265SessionParametersGetInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeH265SessionParametersGetInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeH265SessionParametersGetInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeH265SessionParametersGetInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, Bool32 const &, Bool32 const &, Bool32 const &, uint32_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               VULKAN_HPP_NAMESPACE::Bool32 const &,
+               uint32_t const &,
+               uint32_t const &,
+               uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, writeStdVPS, writeStdSPS, writeStdPPS, stdVPSId, stdSPSId, stdPPSId );
@@ -169816,31 +122846,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType       = StructureType::eVideoEncodeH265SessionParametersGetInfoKHR;
-    const void *  pNext       = {};
-    Bool32        writeStdVPS = {};
-    Bool32        writeStdSPS = {};
-    Bool32        writeStdPPS = {};
-    uint32_t      stdVPSId    = {};
-    uint32_t      stdSPSId    = {};
-    uint32_t      stdPPSId    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType       = StructureType::eVideoEncodeH265SessionParametersGetInfoKHR;
+    const void *                        pNext       = {};
+    VULKAN_HPP_NAMESPACE::Bool32        writeStdVPS = {};
+    VULKAN_HPP_NAMESPACE::Bool32        writeStdSPS = {};
+    VULKAN_HPP_NAMESPACE::Bool32        writeStdPPS = {};
+    uint32_t                            stdVPSId    = {};
+    uint32_t                            stdSPSId    = {};
+    uint32_t                            stdPPSId    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeH265SessionParametersGetInfoKHR>
-  {
-    using Type = VideoEncodeH265SessionParametersGetInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeH265SessionParametersGetInfoKHR>
   {
     using Type = VideoEncodeH265SessionParametersGetInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeInfoKHR.html
   struct VideoEncodeInfoKHR
   {
     using NativeType = VkVideoEncodeInfoKHR;
@@ -169848,27 +122869,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeInfoKHR( VideoEncodeFlagsKHR               flags_                           = {},
-                                             Buffer                            dstBuffer_                       = {},
-                                             DeviceSize                        dstBufferOffset_                 = {},
-                                             DeviceSize                        dstBufferRange_                  = {},
-                                             VideoPictureResourceInfoKHR       srcPictureResource_              = {},
-                                             const VideoReferenceSlotInfoKHR * pSetupReferenceSlot_             = {},
-                                             uint32_t                          referenceSlotCount_              = {},
-                                             const VideoReferenceSlotInfoKHR * pReferenceSlots_                 = {},
-                                             uint32_t                          precedingExternallyEncodedBytes_ = {},
-                                             const void *                      pNext_                           = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dstBuffer{ dstBuffer_ }
-      , dstBufferOffset{ dstBufferOffset_ }
-      , dstBufferRange{ dstBufferRange_ }
-      , srcPictureResource{ srcPictureResource_ }
-      , pSetupReferenceSlot{ pSetupReferenceSlot_ }
-      , referenceSlotCount{ referenceSlotCount_ }
-      , pReferenceSlots{ pReferenceSlots_ }
-      , precedingExternallyEncodedBytes{ precedingExternallyEncodedBytes_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeFlagsKHR               flags_                           = {},
+                                             VULKAN_HPP_NAMESPACE::Buffer                            dstBuffer_                       = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceSize                        dstBufferOffset_                 = {},
+                                             VULKAN_HPP_NAMESPACE::DeviceSize                        dstBufferRange_                  = {},
+                                             VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR       srcPictureResource_              = {},
+                                             const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot_             = {},
+                                             uint32_t                                                referenceSlotCount_              = {},
+                                             const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_                 = {},
+                                             uint32_t                                                precedingExternallyEncodedBytes_ = {},
+                                             const void *                                            pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , dstBuffer( dstBuffer_ )
+      , dstBufferOffset( dstBufferOffset_ )
+      , dstBufferRange( dstBufferRange_ )
+      , srcPictureResource( srcPictureResource_ )
+      , pSetupReferenceSlot( pSetupReferenceSlot_ )
+      , referenceSlotCount( referenceSlotCount_ )
+      , pReferenceSlots( pReferenceSlots_ )
+      , precedingExternallyEncodedBytes( precedingExternallyEncodedBytes_ )
     {
     }
 
@@ -169877,15 +122898,15 @@ namespace VULKAN_HPP_NAMESPACE
     VideoEncodeInfoKHR( VkVideoEncodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT : VideoEncodeInfoKHR( *reinterpret_cast<VideoEncodeInfoKHR const *>( &rhs ) ) {}
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeInfoKHR( VideoEncodeFlagsKHR                                              flags_,
-                        Buffer                                                           dstBuffer_,
-                        DeviceSize                                                       dstBufferOffset_,
-                        DeviceSize                                                       dstBufferRange_,
-                        VideoPictureResourceInfoKHR                                      srcPictureResource_,
-                        const VideoReferenceSlotInfoKHR *                                pSetupReferenceSlot_,
-                        ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_,
-                        uint32_t                                                         precedingExternallyEncodedBytes_ = {},
-                        const void *                                                     pNext_                           = nullptr )
+    VideoEncodeInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeFlagsKHR                                                                    flags_,
+                        VULKAN_HPP_NAMESPACE::Buffer                                                                                 dstBuffer_,
+                        VULKAN_HPP_NAMESPACE::DeviceSize                                                                             dstBufferOffset_,
+                        VULKAN_HPP_NAMESPACE::DeviceSize                                                                             dstBufferRange_,
+                        VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR                                                            srcPictureResource_,
+                        const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR *                                                      pSetupReferenceSlot_,
+                        VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_,
+                        uint32_t     precedingExternallyEncodedBytes_ = {},
+                        const void * pNext_                           = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , dstBuffer( dstBuffer_ )
@@ -169901,52 +122922,54 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeInfoKHR & operator=( VideoEncodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeInfoKHR & operator=( VkVideoEncodeInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setFlags( VideoEncodeFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoEncodeFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBuffer( Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBuffer( VULKAN_HPP_NAMESPACE::Buffer dstBuffer_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBuffer = dstBuffer_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBufferOffset( DeviceSize dstBufferOffset_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBufferOffset( VULKAN_HPP_NAMESPACE::DeviceSize dstBufferOffset_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBufferOffset = dstBufferOffset_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBufferRange( DeviceSize dstBufferRange_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setDstBufferRange( VULKAN_HPP_NAMESPACE::DeviceSize dstBufferRange_ ) VULKAN_HPP_NOEXCEPT
     {
       dstBufferRange = dstBufferRange_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setSrcPictureResource( VideoPictureResourceInfoKHR const & srcPictureResource_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR &
+      setSrcPictureResource( VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR const & srcPictureResource_ ) VULKAN_HPP_NOEXCEPT
     {
       srcPictureResource = srcPictureResource_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setPSetupReferenceSlot( const VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR &
+      setPSetupReferenceSlot( const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot_ ) VULKAN_HPP_NOEXCEPT
     {
       pSetupReferenceSlot = pSetupReferenceSlot_;
       return *this;
@@ -169958,14 +122981,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR & setPReferenceSlots( const VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeInfoKHR &
+      setPReferenceSlots( const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       pReferenceSlots = pReferenceSlots_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeInfoKHR & setReferenceSlots( ArrayProxyNoTemporaries<const VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
+    VideoEncodeInfoKHR & setReferenceSlots(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR> const & referenceSlots_ ) VULKAN_HPP_NOEXCEPT
     {
       referenceSlotCount = static_cast<uint32_t>( referenceSlots_.size() );
       pReferenceSlots    = referenceSlots_.data();
@@ -169978,7 +123003,7 @@ namespace VULKAN_HPP_NAMESPACE
       precedingExternallyEncodedBytes = precedingExternallyEncodedBytes_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -169990,28 +123015,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoEncodeFlagsKHR const &,
-               Buffer const &,
-               DeviceSize const &,
-               DeviceSize const &,
-               VideoPictureResourceInfoKHR const &,
-               const VideoReferenceSlotInfoKHR * const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::Buffer const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::DeviceSize const &,
+               VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR const &,
+               const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * const &,
                uint32_t const &,
-               const VideoReferenceSlotInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -170050,395 +123069,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                     sType                           = StructureType::eVideoEncodeInfoKHR;
-    const void *                      pNext                           = {};
-    VideoEncodeFlagsKHR               flags                           = {};
-    Buffer                            dstBuffer                       = {};
-    DeviceSize                        dstBufferOffset                 = {};
-    DeviceSize                        dstBufferRange                  = {};
-    VideoPictureResourceInfoKHR       srcPictureResource              = {};
-    const VideoReferenceSlotInfoKHR * pSetupReferenceSlot             = {};
-    uint32_t                          referenceSlotCount              = {};
-    const VideoReferenceSlotInfoKHR * pReferenceSlots                 = {};
-    uint32_t                          precedingExternallyEncodedBytes = {};
+    VULKAN_HPP_NAMESPACE::StructureType                     sType                           = StructureType::eVideoEncodeInfoKHR;
+    const void *                                            pNext                           = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeFlagsKHR               flags                           = {};
+    VULKAN_HPP_NAMESPACE::Buffer                            dstBuffer                       = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                        dstBufferOffset                 = {};
+    VULKAN_HPP_NAMESPACE::DeviceSize                        dstBufferRange                  = {};
+    VULKAN_HPP_NAMESPACE::VideoPictureResourceInfoKHR       srcPictureResource              = {};
+    const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pSetupReferenceSlot             = {};
+    uint32_t                                                referenceSlotCount              = {};
+    const VULKAN_HPP_NAMESPACE::VideoReferenceSlotInfoKHR * pReferenceSlots                 = {};
+    uint32_t                                                precedingExternallyEncodedBytes = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeInfoKHR>
-  {
-    using Type = VideoEncodeInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeInfoKHR>
   {
     using Type = VideoEncodeInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeIntraRefreshCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeIntraRefreshCapabilitiesKHR.html
-  struct VideoEncodeIntraRefreshCapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeIntraRefreshCapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeIntraRefreshCapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeIntraRefreshCapabilitiesKHR( VideoEncodeIntraRefreshModeFlagsKHR intraRefreshModes_                       = {},
-                                                                 uint32_t                            maxIntraRefreshCycleDuration_            = {},
-                                                                 uint32_t                            maxIntraRefreshActiveReferencePictures_  = {},
-                                                                 Bool32                              partitionIndependentIntraRefreshRegions_ = {},
-                                                                 Bool32                              nonRectangularIntraRefreshRegions_       = {},
-                                                                 void *                              pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , intraRefreshModes{ intraRefreshModes_ }
-      , maxIntraRefreshCycleDuration{ maxIntraRefreshCycleDuration_ }
-      , maxIntraRefreshActiveReferencePictures{ maxIntraRefreshActiveReferencePictures_ }
-      , partitionIndependentIntraRefreshRegions{ partitionIndependentIntraRefreshRegions_ }
-      , nonRectangularIntraRefreshRegions{ nonRectangularIntraRefreshRegions_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeIntraRefreshCapabilitiesKHR( VideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeIntraRefreshCapabilitiesKHR( VkVideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeIntraRefreshCapabilitiesKHR( *reinterpret_cast<VideoEncodeIntraRefreshCapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeIntraRefreshCapabilitiesKHR & operator=( VideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeIntraRefreshCapabilitiesKHR & operator=( VkVideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeIntraRefreshCapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeIntraRefreshCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeIntraRefreshCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeIntraRefreshCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeIntraRefreshCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeIntraRefreshCapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               VideoEncodeIntraRefreshModeFlagsKHR const &,
-               uint32_t const &,
-               uint32_t const &,
-               Bool32 const &,
-               Bool32 const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType,
-                       pNext,
-                       intraRefreshModes,
-                       maxIntraRefreshCycleDuration,
-                       maxIntraRefreshActiveReferencePictures,
-                       partitionIndependentIntraRefreshRegions,
-                       nonRectangularIntraRefreshRegions );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeIntraRefreshCapabilitiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( intraRefreshModes == rhs.intraRefreshModes ) &&
-             ( maxIntraRefreshCycleDuration == rhs.maxIntraRefreshCycleDuration ) &&
-             ( maxIntraRefreshActiveReferencePictures == rhs.maxIntraRefreshActiveReferencePictures ) &&
-             ( partitionIndependentIntraRefreshRegions == rhs.partitionIndependentIntraRefreshRegions ) &&
-             ( nonRectangularIntraRefreshRegions == rhs.nonRectangularIntraRefreshRegions );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeIntraRefreshCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                       sType                                   = StructureType::eVideoEncodeIntraRefreshCapabilitiesKHR;
-    void *                              pNext                                   = {};
-    VideoEncodeIntraRefreshModeFlagsKHR intraRefreshModes                       = {};
-    uint32_t                            maxIntraRefreshCycleDuration            = {};
-    uint32_t                            maxIntraRefreshActiveReferencePictures  = {};
-    Bool32                              partitionIndependentIntraRefreshRegions = {};
-    Bool32                              nonRectangularIntraRefreshRegions       = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeIntraRefreshCapabilitiesKHR>
-  {
-    using Type = VideoEncodeIntraRefreshCapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeIntraRefreshCapabilitiesKHR>
-  {
-    using Type = VideoEncodeIntraRefreshCapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeIntraRefreshInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeIntraRefreshInfoKHR.html
-  struct VideoEncodeIntraRefreshInfoKHR
-  {
-    using NativeType = VkVideoEncodeIntraRefreshInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeIntraRefreshInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeIntraRefreshInfoKHR( uint32_t     intraRefreshCycleDuration_ = {},
-                                                         uint32_t     intraRefreshIndex_         = {},
-                                                         const void * pNext_                     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , intraRefreshCycleDuration{ intraRefreshCycleDuration_ }
-      , intraRefreshIndex{ intraRefreshIndex_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeIntraRefreshInfoKHR( VideoEncodeIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeIntraRefreshInfoKHR( VkVideoEncodeIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeIntraRefreshInfoKHR( *reinterpret_cast<VideoEncodeIntraRefreshInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeIntraRefreshInfoKHR & operator=( VideoEncodeIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeIntraRefreshInfoKHR & operator=( VkVideoEncodeIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeIntraRefreshInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeIntraRefreshInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeIntraRefreshInfoKHR & setIntraRefreshCycleDuration( uint32_t intraRefreshCycleDuration_ ) VULKAN_HPP_NOEXCEPT
-    {
-      intraRefreshCycleDuration = intraRefreshCycleDuration_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeIntraRefreshInfoKHR & setIntraRefreshIndex( uint32_t intraRefreshIndex_ ) VULKAN_HPP_NOEXCEPT
-    {
-      intraRefreshIndex = intraRefreshIndex_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeIntraRefreshInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeIntraRefreshInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeIntraRefreshInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, intraRefreshCycleDuration, intraRefreshIndex );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeIntraRefreshInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeIntraRefreshInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( intraRefreshCycleDuration == rhs.intraRefreshCycleDuration ) &&
-             ( intraRefreshIndex == rhs.intraRefreshIndex );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeIntraRefreshInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                     = StructureType::eVideoEncodeIntraRefreshInfoKHR;
-    const void *  pNext                     = {};
-    uint32_t      intraRefreshCycleDuration = {};
-    uint32_t      intraRefreshIndex         = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeIntraRefreshInfoKHR>
-  {
-    using Type = VideoEncodeIntraRefreshInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeIntraRefreshInfoKHR>
-  {
-    using Type = VideoEncodeIntraRefreshInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeProfileRgbConversionInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeProfileRgbConversionInfoVALVE.html
-  struct VideoEncodeProfileRgbConversionInfoVALVE
-  {
-    using NativeType = VkVideoEncodeProfileRgbConversionInfoVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeProfileRgbConversionInfoVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeProfileRgbConversionInfoVALVE( Bool32 performEncodeRgbConversion_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , performEncodeRgbConversion{ performEncodeRgbConversion_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeProfileRgbConversionInfoVALVE( VideoEncodeProfileRgbConversionInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeProfileRgbConversionInfoVALVE( VkVideoEncodeProfileRgbConversionInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeProfileRgbConversionInfoVALVE( *reinterpret_cast<VideoEncodeProfileRgbConversionInfoVALVE const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeProfileRgbConversionInfoVALVE & operator=( VideoEncodeProfileRgbConversionInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeProfileRgbConversionInfoVALVE & operator=( VkVideoEncodeProfileRgbConversionInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeProfileRgbConversionInfoVALVE const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeProfileRgbConversionInfoVALVE & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeProfileRgbConversionInfoVALVE & setPerformEncodeRgbConversion( Bool32 performEncodeRgbConversion_ ) VULKAN_HPP_NOEXCEPT
-    {
-      performEncodeRgbConversion = performEncodeRgbConversion_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeProfileRgbConversionInfoVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeProfileRgbConversionInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeProfileRgbConversionInfoVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeProfileRgbConversionInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeProfileRgbConversionInfoVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeProfileRgbConversionInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeProfileRgbConversionInfoVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeProfileRgbConversionInfoVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, performEncodeRgbConversion );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeProfileRgbConversionInfoVALVE const & ) const = default;
-#else
-    bool operator==( VideoEncodeProfileRgbConversionInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( performEncodeRgbConversion == rhs.performEncodeRgbConversion );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeProfileRgbConversionInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                      = StructureType::eVideoEncodeProfileRgbConversionInfoVALVE;
-    const void *  pNext                      = {};
-    Bool32        performEncodeRgbConversion = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeProfileRgbConversionInfoVALVE>
-  {
-    using Type = VideoEncodeProfileRgbConversionInfoVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeProfileRgbConversionInfoVALVE>
-  {
-    using Type = VideoEncodeProfileRgbConversionInfoVALVE;
-  };
-
-  // wrapper struct for struct VkVideoEncodeQualityLevelInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeQualityLevelInfoKHR.html
   struct VideoEncodeQualityLevelInfoKHR
   {
     using NativeType = VkVideoEncodeQualityLevelInfoKHR;
@@ -170446,10 +123095,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeQualityLevelInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeQualityLevelInfoKHR( uint32_t qualityLevel_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , qualityLevel{ qualityLevel_ }
+      : pNext( pNext_ )
+      , qualityLevel( qualityLevel_ )
     {
     }
 
@@ -170461,15 +123110,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeQualityLevelInfoKHR & operator=( VideoEncodeQualityLevelInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeQualityLevelInfoKHR & operator=( VkVideoEncodeQualityLevelInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeQualityLevelInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeQualityLevelInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -170481,7 +123130,7 @@ namespace VULKAN_HPP_NAMESPACE
       qualityLevel = qualityLevel_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeQualityLevelInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -170493,18 +123142,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeQualityLevelInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeQualityLevelInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeQualityLevelInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQualityLevelInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeQualityLevelInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, qualityLevel );
     }
@@ -170529,27 +123173,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eVideoEncodeQualityLevelInfoKHR;
-    const void *  pNext        = {};
-    uint32_t      qualityLevel = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eVideoEncodeQualityLevelInfoKHR;
+    const void *                        pNext        = {};
+    uint32_t                            qualityLevel = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeQualityLevelInfoKHR>
-  {
-    using Type = VideoEncodeQualityLevelInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeQualityLevelInfoKHR>
   {
     using Type = VideoEncodeQualityLevelInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeQualityLevelPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeQualityLevelPropertiesKHR.html
   struct VideoEncodeQualityLevelPropertiesKHR
   {
     using NativeType = VkVideoEncodeQualityLevelPropertiesKHR;
@@ -170557,14 +123191,14 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeQualityLevelPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeQualityLevelPropertiesKHR( VideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode_ = VideoEncodeRateControlModeFlagBitsKHR::eDefault,
-                                            uint32_t                              preferredRateControlLayerCount_ = {},
-                                            void *                                pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , preferredRateControlMode{ preferredRateControlMode_ }
-      , preferredRateControlLayerCount{ preferredRateControlLayerCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeQualityLevelPropertiesKHR( VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode_ =
+                                                                 VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR::eDefault,
+                                                               uint32_t preferredRateControlLayerCount_ = {},
+                                                               void *   pNext_                          = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , preferredRateControlMode( preferredRateControlMode_ )
+      , preferredRateControlLayerCount( preferredRateControlLayerCount_ )
     {
     }
 
@@ -170576,11 +123210,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeQualityLevelPropertiesKHR & operator=( VideoEncodeQualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeQualityLevelPropertiesKHR & operator=( VkVideoEncodeQualityLevelPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeQualityLevelPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeQualityLevelPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -170594,18 +123228,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( this );
     }
 
-    operator VkVideoEncodeQualityLevelPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeQualityLevelPropertiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeQualityLevelPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeQualityLevelPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, VideoEncodeRateControlModeFlagBitsKHR const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, preferredRateControlMode, preferredRateControlLayerCount );
     }
@@ -170631,363 +123261,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                         sType                          = StructureType::eVideoEncodeQualityLevelPropertiesKHR;
-    void *                                pNext                          = {};
-    VideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode       = VideoEncodeRateControlModeFlagBitsKHR::eDefault;
-    uint32_t                              preferredRateControlLayerCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType                         sType = StructureType::eVideoEncodeQualityLevelPropertiesKHR;
+    void *                                                      pNext = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR preferredRateControlMode =
+      VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR::eDefault;
+    uint32_t preferredRateControlLayerCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeQualityLevelPropertiesKHR>
-  {
-    using Type = VideoEncodeQualityLevelPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeQualityLevelPropertiesKHR>
   {
     using Type = VideoEncodeQualityLevelPropertiesKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeQuantizationMapCapabilitiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeQuantizationMapCapabilitiesKHR.html
-  struct VideoEncodeQuantizationMapCapabilitiesKHR
-  {
-    using NativeType = VkVideoEncodeQuantizationMapCapabilitiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeQuantizationMapCapabilitiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapCapabilitiesKHR( Extent2D maxQuantizationMapExtent_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , maxQuantizationMapExtent{ maxQuantizationMapExtent_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapCapabilitiesKHR( VideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeQuantizationMapCapabilitiesKHR( VkVideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeQuantizationMapCapabilitiesKHR( *reinterpret_cast<VideoEncodeQuantizationMapCapabilitiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeQuantizationMapCapabilitiesKHR & operator=( VideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeQuantizationMapCapabilitiesKHR & operator=( VkVideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeQuantizationMapCapabilitiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeQuantizationMapCapabilitiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeQuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapCapabilitiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeQuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapCapabilitiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeQuantizationMapCapabilitiesKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapCapabilitiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeQuantizationMapCapabilitiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, maxQuantizationMapExtent );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeQuantizationMapCapabilitiesKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( maxQuantizationMapExtent == rhs.maxQuantizationMapExtent );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeQuantizationMapCapabilitiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::eVideoEncodeQuantizationMapCapabilitiesKHR;
-    void *        pNext                    = {};
-    Extent2D      maxQuantizationMapExtent = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeQuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeQuantizationMapCapabilitiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeQuantizationMapCapabilitiesKHR>
-  {
-    using Type = VideoEncodeQuantizationMapCapabilitiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeQuantizationMapInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeQuantizationMapInfoKHR.html
-  struct VideoEncodeQuantizationMapInfoKHR
-  {
-    using NativeType = VkVideoEncodeQuantizationMapInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeQuantizationMapInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapInfoKHR( ImageView    quantizationMap_       = {},
-                                                            Extent2D     quantizationMapExtent_ = {},
-                                                            const void * pNext_                 = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , quantizationMap{ quantizationMap_ }
-      , quantizationMapExtent{ quantizationMapExtent_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapInfoKHR( VideoEncodeQuantizationMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeQuantizationMapInfoKHR( VkVideoEncodeQuantizationMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeQuantizationMapInfoKHR( *reinterpret_cast<VideoEncodeQuantizationMapInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeQuantizationMapInfoKHR & operator=( VideoEncodeQuantizationMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeQuantizationMapInfoKHR & operator=( VkVideoEncodeQuantizationMapInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeQuantizationMapInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeQuantizationMapInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeQuantizationMapInfoKHR & setQuantizationMap( ImageView quantizationMap_ ) VULKAN_HPP_NOEXCEPT
-    {
-      quantizationMap = quantizationMap_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeQuantizationMapInfoKHR & setQuantizationMapExtent( Extent2D const & quantizationMapExtent_ ) VULKAN_HPP_NOEXCEPT
-    {
-      quantizationMapExtent = quantizationMapExtent_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeQuantizationMapInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeQuantizationMapInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeQuantizationMapInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeQuantizationMapInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeQuantizationMapInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, ImageView const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, quantizationMap, quantizationMapExtent );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeQuantizationMapInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeQuantizationMapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( quantizationMap == rhs.quantizationMap ) &&
-             ( quantizationMapExtent == rhs.quantizationMapExtent );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeQuantizationMapInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                 = StructureType::eVideoEncodeQuantizationMapInfoKHR;
-    const void *  pNext                 = {};
-    ImageView     quantizationMap       = {};
-    Extent2D      quantizationMapExtent = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeQuantizationMapInfoKHR>
-  {
-    using Type = VideoEncodeQuantizationMapInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeQuantizationMapInfoKHR>
-  {
-    using Type = VideoEncodeQuantizationMapInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR.html
-  struct VideoEncodeQuantizationMapSessionParametersCreateInfoKHR
-  {
-    using NativeType = VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapSessionParametersCreateInfoKHR( Extent2D     quantizationMapTexelSize_ = {},
-                                                                                   const void * pNext_                    = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , quantizationMapTexelSize{ quantizationMapTexelSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeQuantizationMapSessionParametersCreateInfoKHR( VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs )
-      VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeQuantizationMapSessionParametersCreateInfoKHR( VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeQuantizationMapSessionParametersCreateInfoKHR( *reinterpret_cast<VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeQuantizationMapSessionParametersCreateInfoKHR &
-      operator=( VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeQuantizationMapSessionParametersCreateInfoKHR &
-      operator=( VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeQuantizationMapSessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeQuantizationMapSessionParametersCreateInfoKHR &
-      setQuantizationMapTexelSize( Extent2D const & quantizationMapTexelSize_ ) VULKAN_HPP_NOEXCEPT
-    {
-      quantizationMapTexelSize = quantizationMapTexelSize_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, quantizationMapTexelSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( quantizationMapTexelSize == rhs.quantizationMapTexelSize );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeQuantizationMapSessionParametersCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::eVideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-    const void *  pNext                    = {};
-    Extent2D      quantizationMapTexelSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeQuantizationMapSessionParametersCreateInfoKHR>
-  {
-    using Type = VideoEncodeQuantizationMapSessionParametersCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeRateControlLayerInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRateControlLayerInfoKHR.html
   struct VideoEncodeRateControlLayerInfoKHR
   {
     using NativeType = VkVideoEncodeRateControlLayerInfoKHR;
@@ -170995,17 +123281,17 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeRateControlLayerInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoEncodeRateControlLayerInfoKHR( uint64_t     averageBitrate_       = {},
                                                              uint64_t     maxBitrate_           = {},
                                                              uint32_t     frameRateNumerator_   = {},
                                                              uint32_t     frameRateDenominator_ = {},
                                                              const void * pNext_                = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , averageBitrate{ averageBitrate_ }
-      , maxBitrate{ maxBitrate_ }
-      , frameRateNumerator{ frameRateNumerator_ }
-      , frameRateDenominator{ frameRateDenominator_ }
+      : pNext( pNext_ )
+      , averageBitrate( averageBitrate_ )
+      , maxBitrate( maxBitrate_ )
+      , frameRateNumerator( frameRateNumerator_ )
+      , frameRateDenominator( frameRateDenominator_ )
     {
     }
 
@@ -171017,15 +123303,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeRateControlLayerInfoKHR & operator=( VideoEncodeRateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeRateControlLayerInfoKHR & operator=( VkVideoEncodeRateControlLayerInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeRateControlLayerInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlLayerInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -171055,7 +123341,7 @@ namespace VULKAN_HPP_NAMESPACE
       frameRateDenominator = frameRateDenominator_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeRateControlLayerInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -171067,18 +123353,12 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeRateControlLayerInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeRateControlLayerInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeRateControlLayerInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeRateControlLayerInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeRateControlLayerInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint64_t const &, uint64_t const &, uint32_t const &, uint32_t const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint64_t const &, uint64_t const &, uint32_t const &, uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, averageBitrate, maxBitrate, frameRateNumerator, frameRateDenominator );
@@ -171105,30 +123385,20 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType                = StructureType::eVideoEncodeRateControlLayerInfoKHR;
-    const void *  pNext                = {};
-    uint64_t      averageBitrate       = {};
-    uint64_t      maxBitrate           = {};
-    uint32_t      frameRateNumerator   = {};
-    uint32_t      frameRateDenominator = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType                = StructureType::eVideoEncodeRateControlLayerInfoKHR;
+    const void *                        pNext                = {};
+    uint64_t                            averageBitrate       = {};
+    uint64_t                            maxBitrate           = {};
+    uint32_t                            frameRateNumerator   = {};
+    uint32_t                            frameRateDenominator = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeRateControlLayerInfoKHR>
-  {
-    using Type = VideoEncodeRateControlLayerInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeRateControlLayerInfoKHR>
   {
     using Type = VideoEncodeRateControlLayerInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeRateControlInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRateControlInfoKHR.html
   struct VideoEncodeRateControlInfoKHR
   {
     using NativeType = VkVideoEncodeRateControlInfoKHR;
@@ -171136,22 +123406,22 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeRateControlInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeRateControlInfoKHR( VideoEncodeRateControlFlagsKHR             flags_                        = {},
-                                     VideoEncodeRateControlModeFlagBitsKHR      rateControlMode_              = VideoEncodeRateControlModeFlagBitsKHR::eDefault,
-                                     uint32_t                                   layerCount_                   = {},
-                                     const VideoEncodeRateControlLayerInfoKHR * pLayers_                      = {},
-                                     uint32_t                                   virtualBufferSizeInMs_        = {},
-                                     uint32_t                                   initialVirtualBufferSizeInMs_ = {},
-                                     const void *                               pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , rateControlMode{ rateControlMode_ }
-      , layerCount{ layerCount_ }
-      , pLayers{ pLayers_ }
-      , virtualBufferSizeInMs{ virtualBufferSizeInMs_ }
-      , initialVirtualBufferSizeInMs{ initialVirtualBufferSizeInMs_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeRateControlInfoKHR(
+      VULKAN_HPP_NAMESPACE::VideoEncodeRateControlFlagsKHR             flags_           = {},
+      VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR      rateControlMode_ = VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR::eDefault,
+      uint32_t                                                         layerCount_      = {},
+      const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR * pLayers_         = {},
+      uint32_t                                                         virtualBufferSizeInMs_        = {},
+      uint32_t                                                         initialVirtualBufferSizeInMs_ = {},
+      const void *                                                     pNext_                        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , rateControlMode( rateControlMode_ )
+      , layerCount( layerCount_ )
+      , pLayers( pLayers_ )
+      , virtualBufferSizeInMs( virtualBufferSizeInMs_ )
+      , initialVirtualBufferSizeInMs( initialVirtualBufferSizeInMs_ )
     {
     }
 
@@ -171163,12 +123433,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeRateControlInfoKHR( VideoEncodeRateControlFlagsKHR                                            flags_,
-                                   VideoEncodeRateControlModeFlagBitsKHR                                     rateControlMode_,
-                                   ArrayProxyNoTemporaries<const VideoEncodeRateControlLayerInfoKHR> const & layers_,
-                                   uint32_t                                                                  virtualBufferSizeInMs_        = {},
-                                   uint32_t                                                                  initialVirtualBufferSizeInMs_ = {},
-                                   const void *                                                              pNext_                        = nullptr )
+    VideoEncodeRateControlInfoKHR(
+      VULKAN_HPP_NAMESPACE::VideoEncodeRateControlFlagsKHR                                                                  flags_,
+      VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR                                                           rateControlMode_,
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR> const & layers_,
+      uint32_t                                                                                                              virtualBufferSizeInMs_        = {},
+      uint32_t                                                                                                              initialVirtualBufferSizeInMs_ = {},
+      const void *                                                                                                          pNext_ = nullptr )
       : pNext( pNext_ )
       , flags( flags_ )
       , rateControlMode( rateControlMode_ )
@@ -171181,28 +123452,29 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoEncodeRateControlInfoKHR & operator=( VideoEncodeRateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeRateControlInfoKHR & operator=( VkVideoEncodeRateControlInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeRateControlInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeRateControlInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR & setFlags( VideoEncodeRateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoEncodeRateControlFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR & setRateControlMode( VideoEncodeRateControlModeFlagBitsKHR rateControlMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR &
+      setRateControlMode( VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR rateControlMode_ ) VULKAN_HPP_NOEXCEPT
     {
       rateControlMode = rateControlMode_;
       return *this;
@@ -171214,14 +123486,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR & setPLayers( const VideoEncodeRateControlLayerInfoKHR * pLayers_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeRateControlInfoKHR &
+      setPLayers( const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR * pLayers_ ) VULKAN_HPP_NOEXCEPT
     {
       pLayers = pLayers_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoEncodeRateControlInfoKHR & setLayers( ArrayProxyNoTemporaries<const VideoEncodeRateControlLayerInfoKHR> const & layers_ ) VULKAN_HPP_NOEXCEPT
+    VideoEncodeRateControlInfoKHR & setLayers(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR> const & layers_ ) VULKAN_HPP_NOEXCEPT
     {
       layerCount = static_cast<uint32_t>( layers_.size() );
       pLayers    = layers_.data();
@@ -171240,7 +123514,7 @@ namespace VULKAN_HPP_NAMESPACE
       initialVirtualBufferSizeInMs = initialVirtualBufferSizeInMs_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeRateControlInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -171252,25 +123526,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeRateControlInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeRateControlInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeRateControlInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeRateControlInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeRateControlInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoEncodeRateControlFlagsKHR const &,
-               VideoEncodeRateControlModeFlagBitsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeRateControlFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR const &,
                uint32_t const &,
-               const VideoEncodeRateControlLayerInfoKHR * const &,
+               const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR * const &,
                uint32_t const &,
                uint32_t const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, rateControlMode, layerCount, pLayers, virtualBufferSizeInMs, initialVirtualBufferSizeInMs );
@@ -171298,260 +123566,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                              sType                        = StructureType::eVideoEncodeRateControlInfoKHR;
-    const void *                               pNext                        = {};
-    VideoEncodeRateControlFlagsKHR             flags                        = {};
-    VideoEncodeRateControlModeFlagBitsKHR      rateControlMode              = VideoEncodeRateControlModeFlagBitsKHR::eDefault;
-    uint32_t                                   layerCount                   = {};
-    const VideoEncodeRateControlLayerInfoKHR * pLayers                      = {};
-    uint32_t                                   virtualBufferSizeInMs        = {};
-    uint32_t                                   initialVirtualBufferSizeInMs = {};
+    VULKAN_HPP_NAMESPACE::StructureType                              sType           = StructureType::eVideoEncodeRateControlInfoKHR;
+    const void *                                                     pNext           = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeRateControlFlagsKHR             flags           = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR      rateControlMode = VULKAN_HPP_NAMESPACE::VideoEncodeRateControlModeFlagBitsKHR::eDefault;
+    uint32_t                                                         layerCount      = {};
+    const VULKAN_HPP_NAMESPACE::VideoEncodeRateControlLayerInfoKHR * pLayers         = {};
+    uint32_t                                                         virtualBufferSizeInMs        = {};
+    uint32_t                                                         initialVirtualBufferSizeInMs = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeRateControlInfoKHR>
-  {
-    using Type = VideoEncodeRateControlInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeRateControlInfoKHR>
   {
     using Type = VideoEncodeRateControlInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeRgbConversionCapabilitiesVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeRgbConversionCapabilitiesVALVE.html
-  struct VideoEncodeRgbConversionCapabilitiesVALVE
-  {
-    using NativeType = VkVideoEncodeRgbConversionCapabilitiesVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeRgbConversionCapabilitiesVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeRgbConversionCapabilitiesVALVE( VideoEncodeRgbModelConversionFlagsVALVE  rgbModels_      = {},
-                                                                    VideoEncodeRgbRangeCompressionFlagsVALVE rgbRanges_      = {},
-                                                                    VideoEncodeRgbChromaOffsetFlagsVALVE     xChromaOffsets_ = {},
-                                                                    VideoEncodeRgbChromaOffsetFlagsVALVE     yChromaOffsets_ = {},
-                                                                    void *                                   pNext_          = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rgbModels{ rgbModels_ }
-      , rgbRanges{ rgbRanges_ }
-      , xChromaOffsets{ xChromaOffsets_ }
-      , yChromaOffsets{ yChromaOffsets_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeRgbConversionCapabilitiesVALVE( VideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeRgbConversionCapabilitiesVALVE( VkVideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeRgbConversionCapabilitiesVALVE( *reinterpret_cast<VideoEncodeRgbConversionCapabilitiesVALVE const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeRgbConversionCapabilitiesVALVE & operator=( VideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeRgbConversionCapabilitiesVALVE & operator=( VkVideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeRgbConversionCapabilitiesVALVE const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoEncodeRgbConversionCapabilitiesVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeRgbConversionCapabilitiesVALVE *>( this );
-    }
-
-    operator VkVideoEncodeRgbConversionCapabilitiesVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeRgbConversionCapabilitiesVALVE *>( this );
-    }
-
-    operator VkVideoEncodeRgbConversionCapabilitiesVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeRgbConversionCapabilitiesVALVE *>( this );
-    }
-
-    operator VkVideoEncodeRgbConversionCapabilitiesVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeRgbConversionCapabilitiesVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               void * const &,
-               VideoEncodeRgbModelConversionFlagsVALVE const &,
-               VideoEncodeRgbRangeCompressionFlagsVALVE const &,
-               VideoEncodeRgbChromaOffsetFlagsVALVE const &,
-               VideoEncodeRgbChromaOffsetFlagsVALVE const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, rgbModels, rgbRanges, xChromaOffsets, yChromaOffsets );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeRgbConversionCapabilitiesVALVE const & ) const = default;
-#else
-    bool operator==( VideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( rgbModels == rhs.rgbModels ) && ( rgbRanges == rhs.rgbRanges ) &&
-             ( xChromaOffsets == rhs.xChromaOffsets ) && ( yChromaOffsets == rhs.yChromaOffsets );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeRgbConversionCapabilitiesVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                            sType          = StructureType::eVideoEncodeRgbConversionCapabilitiesVALVE;
-    void *                                   pNext          = {};
-    VideoEncodeRgbModelConversionFlagsVALVE  rgbModels      = {};
-    VideoEncodeRgbRangeCompressionFlagsVALVE rgbRanges      = {};
-    VideoEncodeRgbChromaOffsetFlagsVALVE     xChromaOffsets = {};
-    VideoEncodeRgbChromaOffsetFlagsVALVE     yChromaOffsets = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeRgbConversionCapabilitiesVALVE>
-  {
-    using Type = VideoEncodeRgbConversionCapabilitiesVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeRgbConversionCapabilitiesVALVE>
-  {
-    using Type = VideoEncodeRgbConversionCapabilitiesVALVE;
-  };
-
-  // wrapper struct for struct VkVideoEncodeSessionIntraRefreshCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeSessionIntraRefreshCreateInfoKHR.html
-  struct VideoEncodeSessionIntraRefreshCreateInfoKHR
-  {
-    using NativeType = VkVideoEncodeSessionIntraRefreshCreateInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeSessionIntraRefreshCreateInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeSessionIntraRefreshCreateInfoKHR( VideoEncodeIntraRefreshModeFlagBitsKHR intraRefreshMode_ = VideoEncodeIntraRefreshModeFlagBitsKHR::eNone,
-                                                   const void *                           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , intraRefreshMode{ intraRefreshMode_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoEncodeSessionIntraRefreshCreateInfoKHR( VideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeSessionIntraRefreshCreateInfoKHR( VkVideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeSessionIntraRefreshCreateInfoKHR( *reinterpret_cast<VideoEncodeSessionIntraRefreshCreateInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeSessionIntraRefreshCreateInfoKHR & operator=( VideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeSessionIntraRefreshCreateInfoKHR & operator=( VkVideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeSessionIntraRefreshCreateInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionIntraRefreshCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionIntraRefreshCreateInfoKHR &
-      setIntraRefreshMode( VideoEncodeIntraRefreshModeFlagBitsKHR intraRefreshMode_ ) VULKAN_HPP_NOEXCEPT
-    {
-      intraRefreshMode = intraRefreshMode_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeSessionIntraRefreshCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeSessionIntraRefreshCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeSessionIntraRefreshCreateInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeSessionIntraRefreshCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeSessionIntraRefreshCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeSessionIntraRefreshCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeSessionIntraRefreshCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeSessionIntraRefreshCreateInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoEncodeIntraRefreshModeFlagBitsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, intraRefreshMode );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeSessionIntraRefreshCreateInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( intraRefreshMode == rhs.intraRefreshMode );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeSessionIntraRefreshCreateInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                          sType            = StructureType::eVideoEncodeSessionIntraRefreshCreateInfoKHR;
-    const void *                           pNext            = {};
-    VideoEncodeIntraRefreshModeFlagBitsKHR intraRefreshMode = VideoEncodeIntraRefreshModeFlagBitsKHR::eNone;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeSessionIntraRefreshCreateInfoKHR>
-  {
-    using Type = VideoEncodeSessionIntraRefreshCreateInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeSessionIntraRefreshCreateInfoKHR>
-  {
-    using Type = VideoEncodeSessionIntraRefreshCreateInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoEncodeSessionParametersFeedbackInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeSessionParametersFeedbackInfoKHR.html
   struct VideoEncodeSessionParametersFeedbackInfoKHR
   {
     using NativeType = VkVideoEncodeSessionParametersFeedbackInfoKHR;
@@ -171559,10 +123589,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeSessionParametersFeedbackInfoKHR( Bool32 hasOverrides_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , hasOverrides{ hasOverrides_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeSessionParametersFeedbackInfoKHR( VULKAN_HPP_NAMESPACE::Bool32 hasOverrides_ = {},
+                                                                      void *                       pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , hasOverrides( hasOverrides_ )
     {
     }
 
@@ -171574,11 +123605,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeSessionParametersFeedbackInfoKHR & operator=( VideoEncodeSessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeSessionParametersFeedbackInfoKHR & operator=( VkVideoEncodeSessionParametersFeedbackInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeSessionParametersFeedbackInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersFeedbackInfoKHR const *>( &rhs );
       return *this;
     }
 
@@ -171592,18 +123623,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeSessionParametersFeedbackInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeSessionParametersFeedbackInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeSessionParametersFeedbackInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeSessionParametersFeedbackInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Bool32 const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, VULKAN_HPP_NAMESPACE::Bool32 const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, hasOverrides );
     }
@@ -171628,27 +123654,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType        = StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR;
-    void *        pNext        = {};
-    Bool32        hasOverrides = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType        = StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR;
+    void *                              pNext        = {};
+    VULKAN_HPP_NAMESPACE::Bool32        hasOverrides = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeSessionParametersFeedbackInfoKHR>
-  {
-    using Type = VideoEncodeSessionParametersFeedbackInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR>
   {
     using Type = VideoEncodeSessionParametersFeedbackInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeSessionParametersGetInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeSessionParametersGetInfoKHR.html
   struct VideoEncodeSessionParametersGetInfoKHR
   {
     using NativeType = VkVideoEncodeSessionParametersGetInfoKHR;
@@ -171656,11 +123672,11 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeSessionParametersGetInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeSessionParametersGetInfoKHR( VideoSessionParametersKHR videoSessionParameters_ = {},
-                                                                 const void *              pNext_                  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoSessionParameters{ videoSessionParameters_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEncodeSessionParametersGetInfoKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters_ = {},
+                                                                 const void *                                    pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoSessionParameters( videoSessionParameters_ )
     {
     }
 
@@ -171672,15 +123688,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeSessionParametersGetInfoKHR & operator=( VideoEncodeSessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeSessionParametersGetInfoKHR & operator=( VkVideoEncodeSessionParametersGetInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeSessionParametersGetInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeSessionParametersGetInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionParametersGetInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -171688,12 +123704,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionParametersGetInfoKHR &
-      setVideoSessionParameters( VideoSessionParametersKHR videoSessionParameters_ ) VULKAN_HPP_NOEXCEPT
+      setVideoSessionParameters( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters_ ) VULKAN_HPP_NOEXCEPT
     {
       videoSessionParameters = videoSessionParameters_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeSessionParametersGetInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -171705,18 +123721,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeSessionParametersGetInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeSessionParametersGetInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeSessionParametersGetInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeSessionParametersGetInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeSessionParametersGetInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoSessionParametersKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoSessionParameters );
     }
@@ -171741,178 +123752,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType             sType                  = StructureType::eVideoEncodeSessionParametersGetInfoKHR;
-    const void *              pNext                  = {};
-    VideoSessionParametersKHR videoSessionParameters = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType                  = StructureType::eVideoEncodeSessionParametersGetInfoKHR;
+    const void *                                    pNext                  = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParameters = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeSessionParametersGetInfoKHR>
-  {
-    using Type = VideoEncodeSessionParametersGetInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeSessionParametersGetInfoKHR>
   {
     using Type = VideoEncodeSessionParametersGetInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEncodeSessionRgbConversionCreateInfoVALVE, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeSessionRgbConversionCreateInfoVALVE.html
-  struct VideoEncodeSessionRgbConversionCreateInfoVALVE
-  {
-    using NativeType = VkVideoEncodeSessionRgbConversionCreateInfoVALVE;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeSessionRgbConversionCreateInfoVALVE;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeSessionRgbConversionCreateInfoVALVE(
-      VideoEncodeRgbModelConversionFlagBitsVALVE  rgbModel_      = VideoEncodeRgbModelConversionFlagBitsVALVE::eRgbIdentity,
-      VideoEncodeRgbRangeCompressionFlagBitsVALVE rgbRange_      = VideoEncodeRgbRangeCompressionFlagBitsVALVE::eFullRange,
-      VideoEncodeRgbChromaOffsetFlagBitsVALVE     xChromaOffset_ = VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven,
-      VideoEncodeRgbChromaOffsetFlagBitsVALVE     yChromaOffset_ = VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven,
-      const void *                                pNext_         = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , rgbModel{ rgbModel_ }
-      , rgbRange{ rgbRange_ }
-      , xChromaOffset{ xChromaOffset_ }
-      , yChromaOffset{ yChromaOffset_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      VideoEncodeSessionRgbConversionCreateInfoVALVE( VideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoEncodeSessionRgbConversionCreateInfoVALVE( VkVideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoEncodeSessionRgbConversionCreateInfoVALVE( *reinterpret_cast<VideoEncodeSessionRgbConversionCreateInfoVALVE const *>( &rhs ) )
-    {
-    }
-
-    VideoEncodeSessionRgbConversionCreateInfoVALVE & operator=( VideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoEncodeSessionRgbConversionCreateInfoVALVE & operator=( VkVideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoEncodeSessionRgbConversionCreateInfoVALVE const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionRgbConversionCreateInfoVALVE & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionRgbConversionCreateInfoVALVE &
-      setRgbModel( VideoEncodeRgbModelConversionFlagBitsVALVE rgbModel_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rgbModel = rgbModel_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionRgbConversionCreateInfoVALVE &
-      setRgbRange( VideoEncodeRgbRangeCompressionFlagBitsVALVE rgbRange_ ) VULKAN_HPP_NOEXCEPT
-    {
-      rgbRange = rgbRange_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionRgbConversionCreateInfoVALVE &
-      setXChromaOffset( VideoEncodeRgbChromaOffsetFlagBitsVALVE xChromaOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      xChromaOffset = xChromaOffset_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeSessionRgbConversionCreateInfoVALVE &
-      setYChromaOffset( VideoEncodeRgbChromaOffsetFlagBitsVALVE yChromaOffset_ ) VULKAN_HPP_NOEXCEPT
-    {
-      yChromaOffset = yChromaOffset_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoEncodeSessionRgbConversionCreateInfoVALVE const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoEncodeSessionRgbConversionCreateInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeSessionRgbConversionCreateInfoVALVE &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoEncodeSessionRgbConversionCreateInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeSessionRgbConversionCreateInfoVALVE const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeSessionRgbConversionCreateInfoVALVE *>( this );
-    }
-
-    operator VkVideoEncodeSessionRgbConversionCreateInfoVALVE *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeSessionRgbConversionCreateInfoVALVE *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
-               const void * const &,
-               VideoEncodeRgbModelConversionFlagBitsVALVE const &,
-               VideoEncodeRgbRangeCompressionFlagBitsVALVE const &,
-               VideoEncodeRgbChromaOffsetFlagBitsVALVE const &,
-               VideoEncodeRgbChromaOffsetFlagBitsVALVE const &>
-      reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, rgbModel, rgbRange, xChromaOffset, yChromaOffset );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoEncodeSessionRgbConversionCreateInfoVALVE const & ) const = default;
-#else
-    bool operator==( VideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( rgbModel == rhs.rgbModel ) && ( rgbRange == rhs.rgbRange ) &&
-             ( xChromaOffset == rhs.xChromaOffset ) && ( yChromaOffset == rhs.yChromaOffset );
-#  endif
-    }
-
-    bool operator!=( VideoEncodeSessionRgbConversionCreateInfoVALVE const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                               sType         = StructureType::eVideoEncodeSessionRgbConversionCreateInfoVALVE;
-    const void *                                pNext         = {};
-    VideoEncodeRgbModelConversionFlagBitsVALVE  rgbModel      = VideoEncodeRgbModelConversionFlagBitsVALVE::eRgbIdentity;
-    VideoEncodeRgbRangeCompressionFlagBitsVALVE rgbRange      = VideoEncodeRgbRangeCompressionFlagBitsVALVE::eFullRange;
-    VideoEncodeRgbChromaOffsetFlagBitsVALVE     xChromaOffset = VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven;
-    VideoEncodeRgbChromaOffsetFlagBitsVALVE     yChromaOffset = VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven;
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeSessionRgbConversionCreateInfoVALVE>
-  {
-    using Type = VideoEncodeSessionRgbConversionCreateInfoVALVE;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoEncodeSessionRgbConversionCreateInfoVALVE>
-  {
-    using Type = VideoEncodeSessionRgbConversionCreateInfoVALVE;
-  };
-
-  // wrapper struct for struct VkVideoEncodeUsageInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEncodeUsageInfoKHR.html
   struct VideoEncodeUsageInfoKHR
   {
     using NativeType = VkVideoEncodeUsageInfoKHR;
@@ -171920,15 +123770,16 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEncodeUsageInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEncodeUsageInfoKHR( VideoEncodeUsageFlagsKHR   videoUsageHints_   = {},
-                                                  VideoEncodeContentFlagsKHR videoContentHints_ = {},
-                                                  VideoEncodeTuningModeKHR   tuningMode_        = VideoEncodeTuningModeKHR::eDefault,
-                                                  const void *               pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , videoUsageHints{ videoUsageHints_ }
-      , videoContentHints{ videoContentHints_ }
-      , tuningMode{ tuningMode_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR
+      VideoEncodeUsageInfoKHR( VULKAN_HPP_NAMESPACE::VideoEncodeUsageFlagsKHR   videoUsageHints_   = {},
+                               VULKAN_HPP_NAMESPACE::VideoEncodeContentFlagsKHR videoContentHints_ = {},
+                               VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR   tuningMode_        = VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR::eDefault,
+                               const void *                                     pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , videoUsageHints( videoUsageHints_ )
+      , videoContentHints( videoContentHints_ )
+      , tuningMode( tuningMode_ )
     {
     }
 
@@ -171940,39 +123791,40 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEncodeUsageInfoKHR & operator=( VideoEncodeUsageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEncodeUsageInfoKHR & operator=( VkVideoEncodeUsageInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEncodeUsageInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEncodeUsageInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setVideoUsageHints( VideoEncodeUsageFlagsKHR videoUsageHints_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setVideoUsageHints( VULKAN_HPP_NAMESPACE::VideoEncodeUsageFlagsKHR videoUsageHints_ ) VULKAN_HPP_NOEXCEPT
     {
       videoUsageHints = videoUsageHints_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setVideoContentHints( VideoEncodeContentFlagsKHR videoContentHints_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR &
+      setVideoContentHints( VULKAN_HPP_NAMESPACE::VideoEncodeContentFlagsKHR videoContentHints_ ) VULKAN_HPP_NOEXCEPT
     {
       videoContentHints = videoContentHints_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setTuningMode( VideoEncodeTuningModeKHR tuningMode_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEncodeUsageInfoKHR & setTuningMode( VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR tuningMode_ ) VULKAN_HPP_NOEXCEPT
     {
       tuningMode = tuningMode_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEncodeUsageInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -171984,19 +123836,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEncodeUsageInfoKHR *>( this );
     }
 
-    operator VkVideoEncodeUsageInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEncodeUsageInfoKHR *>( this );
-    }
-
-    operator VkVideoEncodeUsageInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEncodeUsageInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::
-      tuple<StructureType const &, const void * const &, VideoEncodeUsageFlagsKHR const &, VideoEncodeContentFlagsKHR const &, VideoEncodeTuningModeKHR const &>
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeUsageFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeContentFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, videoUsageHints, videoContentHints, tuningMode );
@@ -172023,28 +123872,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType              sType             = StructureType::eVideoEncodeUsageInfoKHR;
-    const void *               pNext             = {};
-    VideoEncodeUsageFlagsKHR   videoUsageHints   = {};
-    VideoEncodeContentFlagsKHR videoContentHints = {};
-    VideoEncodeTuningModeKHR   tuningMode        = VideoEncodeTuningModeKHR::eDefault;
+    VULKAN_HPP_NAMESPACE::StructureType              sType             = StructureType::eVideoEncodeUsageInfoKHR;
+    const void *                                     pNext             = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeUsageFlagsKHR   videoUsageHints   = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeContentFlagsKHR videoContentHints = {};
+    VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR   tuningMode        = VULKAN_HPP_NAMESPACE::VideoEncodeTuningModeKHR::eDefault;
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEncodeUsageInfoKHR>
-  {
-    using Type = VideoEncodeUsageInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEncodeUsageInfoKHR>
   {
     using Type = VideoEncodeUsageInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoEndCodingInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoEndCodingInfoKHR.html
   struct VideoEndCodingInfoKHR
   {
     using NativeType = VkVideoEndCodingInfoKHR;
@@ -172052,10 +123892,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoEndCodingInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoEndCodingInfoKHR( VideoEndCodingFlagsKHR flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoEndCodingInfoKHR( VULKAN_HPP_NAMESPACE::VideoEndCodingFlagsKHR flags_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
     {
     }
 
@@ -172067,27 +123907,27 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoEndCodingInfoKHR & operator=( VideoEndCodingInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoEndCodingInfoKHR & operator=( VkVideoEndCodingInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoEndCodingInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoEndCodingInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoEndCodingInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoEndCodingInfoKHR & setFlags( VideoEndCodingFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoEndCodingInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoEndCodingFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoEndCodingInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -172099,18 +123939,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoEndCodingInfoKHR *>( this );
     }
 
-    operator VkVideoEndCodingInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoEndCodingInfoKHR *>( this );
-    }
-
-    operator VkVideoEndCodingInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoEndCodingInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, VideoEndCodingFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::VideoEndCodingFlagsKHR const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags );
     }
@@ -172135,222 +123970,17 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType          sType = StructureType::eVideoEndCodingInfoKHR;
-    const void *           pNext = {};
-    VideoEndCodingFlagsKHR flags = {};
+    VULKAN_HPP_NAMESPACE::StructureType          sType = StructureType::eVideoEndCodingInfoKHR;
+    const void *                                 pNext = {};
+    VULKAN_HPP_NAMESPACE::VideoEndCodingFlagsKHR flags = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoEndCodingInfoKHR>
-  {
-    using Type = VideoEndCodingInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoEndCodingInfoKHR>
   {
     using Type = VideoEndCodingInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoFormatAV1QuantizationMapPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoFormatAV1QuantizationMapPropertiesKHR.html
-  struct VideoFormatAV1QuantizationMapPropertiesKHR
-  {
-    using NativeType = VkVideoFormatAV1QuantizationMapPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoFormatAv1QuantizationMapPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoFormatAV1QuantizationMapPropertiesKHR( VideoEncodeAV1SuperblockSizeFlagsKHR compatibleSuperblockSizes_ = {},
-                                                                     void *                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , compatibleSuperblockSizes{ compatibleSuperblockSizes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoFormatAV1QuantizationMapPropertiesKHR( VideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoFormatAV1QuantizationMapPropertiesKHR( VkVideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoFormatAV1QuantizationMapPropertiesKHR( *reinterpret_cast<VideoFormatAV1QuantizationMapPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoFormatAV1QuantizationMapPropertiesKHR & operator=( VideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoFormatAV1QuantizationMapPropertiesKHR & operator=( VkVideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoFormatAV1QuantizationMapPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoFormatAV1QuantizationMapPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoFormatAV1QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatAV1QuantizationMapPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoFormatAV1QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatAV1QuantizationMapPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoFormatAV1QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatAV1QuantizationMapPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoFormatAV1QuantizationMapPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, VideoEncodeAV1SuperblockSizeFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, compatibleSuperblockSizes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoFormatAV1QuantizationMapPropertiesKHR const & ) const = default;
-#else
-    bool operator==( VideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( compatibleSuperblockSizes == rhs.compatibleSuperblockSizes );
-#  endif
-    }
-
-    bool operator!=( VideoFormatAV1QuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                        sType                     = StructureType::eVideoFormatAv1QuantizationMapPropertiesKHR;
-    void *                               pNext                     = {};
-    VideoEncodeAV1SuperblockSizeFlagsKHR compatibleSuperblockSizes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoFormatAV1QuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatAV1QuantizationMapPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoFormatAv1QuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatAV1QuantizationMapPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoFormatH265QuantizationMapPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoFormatH265QuantizationMapPropertiesKHR.html
-  struct VideoFormatH265QuantizationMapPropertiesKHR
-  {
-    using NativeType = VkVideoFormatH265QuantizationMapPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoFormatH265QuantizationMapPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoFormatH265QuantizationMapPropertiesKHR( VideoEncodeH265CtbSizeFlagsKHR compatibleCtbSizes_ = {},
-                                                                      void *                         pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , compatibleCtbSizes{ compatibleCtbSizes_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoFormatH265QuantizationMapPropertiesKHR( VideoFormatH265QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoFormatH265QuantizationMapPropertiesKHR( VkVideoFormatH265QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoFormatH265QuantizationMapPropertiesKHR( *reinterpret_cast<VideoFormatH265QuantizationMapPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoFormatH265QuantizationMapPropertiesKHR & operator=( VideoFormatH265QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoFormatH265QuantizationMapPropertiesKHR & operator=( VkVideoFormatH265QuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoFormatH265QuantizationMapPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoFormatH265QuantizationMapPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoFormatH265QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatH265QuantizationMapPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoFormatH265QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatH265QuantizationMapPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoFormatH265QuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatH265QuantizationMapPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoFormatH265QuantizationMapPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, VideoEncodeH265CtbSizeFlagsKHR const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, compatibleCtbSizes );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoFormatH265QuantizationMapPropertiesKHR const & ) const = default;
-#else
-    bool operator==( VideoFormatH265QuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( compatibleCtbSizes == rhs.compatibleCtbSizes );
-#  endif
-    }
-
-    bool operator!=( VideoFormatH265QuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType                  sType              = StructureType::eVideoFormatH265QuantizationMapPropertiesKHR;
-    void *                         pNext              = {};
-    VideoEncodeH265CtbSizeFlagsKHR compatibleCtbSizes = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoFormatH265QuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatH265QuantizationMapPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoFormatH265QuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatH265QuantizationMapPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoFormatPropertiesKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoFormatPropertiesKHR.html
   struct VideoFormatPropertiesKHR
   {
     using NativeType = VkVideoFormatPropertiesKHR;
@@ -172358,21 +123988,21 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoFormatPropertiesKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoFormatPropertiesKHR( Format           format_           = Format::eUndefined,
-                                                   ComponentMapping componentMapping_ = {},
-                                                   ImageCreateFlags imageCreateFlags_ = {},
-                                                   ImageType        imageType_        = ImageType::e1D,
-                                                   ImageTiling      imageTiling_      = ImageTiling::eOptimal,
-                                                   ImageUsageFlags  imageUsageFlags_  = {},
-                                                   void *           pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , format{ format_ }
-      , componentMapping{ componentMapping_ }
-      , imageCreateFlags{ imageCreateFlags_ }
-      , imageType{ imageType_ }
-      , imageTiling{ imageTiling_ }
-      , imageUsageFlags{ imageUsageFlags_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoFormatPropertiesKHR( VULKAN_HPP_NAMESPACE::Format           format_           = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                   VULKAN_HPP_NAMESPACE::ComponentMapping componentMapping_ = {},
+                                                   VULKAN_HPP_NAMESPACE::ImageCreateFlags imageCreateFlags_ = {},
+                                                   VULKAN_HPP_NAMESPACE::ImageType        imageType_        = VULKAN_HPP_NAMESPACE::ImageType::e1D,
+                                                   VULKAN_HPP_NAMESPACE::ImageTiling      imageTiling_      = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal,
+                                                   VULKAN_HPP_NAMESPACE::ImageUsageFlags  imageUsageFlags_  = {},
+                                                   void *                                 pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , format( format_ )
+      , componentMapping( componentMapping_ )
+      , imageCreateFlags( imageCreateFlags_ )
+      , imageType( imageType_ )
+      , imageTiling( imageTiling_ )
+      , imageUsageFlags( imageUsageFlags_ )
     {
     }
 
@@ -172384,11 +124014,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoFormatPropertiesKHR & operator=( VideoFormatPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoFormatPropertiesKHR & operator=( VkVideoFormatPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoFormatPropertiesKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoFormatPropertiesKHR const *>( &rhs );
       return *this;
     }
 
@@ -172402,25 +124032,19 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoFormatPropertiesKHR *>( this );
     }
 
-    operator VkVideoFormatPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoFormatPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoFormatPropertiesKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                void * const &,
-               Format const &,
-               ComponentMapping const &,
-               ImageCreateFlags const &,
-               ImageType const &,
-               ImageTiling const &,
-               ImageUsageFlags const &>
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::ComponentMapping const &,
+               VULKAN_HPP_NAMESPACE::ImageCreateFlags const &,
+               VULKAN_HPP_NAMESPACE::ImageType const &,
+               VULKAN_HPP_NAMESPACE::ImageTiling const &,
+               VULKAN_HPP_NAMESPACE::ImageUsageFlags const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, format, componentMapping, imageCreateFlags, imageType, imageTiling, imageUsageFlags );
@@ -172448,128 +124072,22 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType    sType            = StructureType::eVideoFormatPropertiesKHR;
-    void *           pNext            = {};
-    Format           format           = Format::eUndefined;
-    ComponentMapping componentMapping = {};
-    ImageCreateFlags imageCreateFlags = {};
-    ImageType        imageType        = ImageType::e1D;
-    ImageTiling      imageTiling      = ImageTiling::eOptimal;
-    ImageUsageFlags  imageUsageFlags  = {};
+    VULKAN_HPP_NAMESPACE::StructureType    sType            = StructureType::eVideoFormatPropertiesKHR;
+    void *                                 pNext            = {};
+    VULKAN_HPP_NAMESPACE::Format           format           = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::ComponentMapping componentMapping = {};
+    VULKAN_HPP_NAMESPACE::ImageCreateFlags imageCreateFlags = {};
+    VULKAN_HPP_NAMESPACE::ImageType        imageType        = VULKAN_HPP_NAMESPACE::ImageType::e1D;
+    VULKAN_HPP_NAMESPACE::ImageTiling      imageTiling      = VULKAN_HPP_NAMESPACE::ImageTiling::eOptimal;
+    VULKAN_HPP_NAMESPACE::ImageUsageFlags  imageUsageFlags  = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoFormatPropertiesKHR>
-  {
-    using Type = VideoFormatPropertiesKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoFormatPropertiesKHR>
   {
     using Type = VideoFormatPropertiesKHR;
   };
 
-  // wrapper struct for struct VkVideoFormatQuantizationMapPropertiesKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoFormatQuantizationMapPropertiesKHR.html
-  struct VideoFormatQuantizationMapPropertiesKHR
-  {
-    using NativeType = VkVideoFormatQuantizationMapPropertiesKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoFormatQuantizationMapPropertiesKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoFormatQuantizationMapPropertiesKHR( Extent2D quantizationMapTexelSize_ = {}, void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , quantizationMapTexelSize{ quantizationMapTexelSize_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoFormatQuantizationMapPropertiesKHR( VideoFormatQuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoFormatQuantizationMapPropertiesKHR( VkVideoFormatQuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoFormatQuantizationMapPropertiesKHR( *reinterpret_cast<VideoFormatQuantizationMapPropertiesKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoFormatQuantizationMapPropertiesKHR & operator=( VideoFormatQuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoFormatQuantizationMapPropertiesKHR & operator=( VkVideoFormatQuantizationMapPropertiesKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoFormatQuantizationMapPropertiesKHR const *>( &rhs );
-      return *this;
-    }
-
-    operator VkVideoFormatQuantizationMapPropertiesKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoFormatQuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatQuantizationMapPropertiesKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoFormatQuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatQuantizationMapPropertiesKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoFormatQuantizationMapPropertiesKHR *>( this );
-    }
-
-    operator VkVideoFormatQuantizationMapPropertiesKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoFormatQuantizationMapPropertiesKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, Extent2D const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, quantizationMapTexelSize );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoFormatQuantizationMapPropertiesKHR const & ) const = default;
-#else
-    bool operator==( VideoFormatQuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( quantizationMapTexelSize == rhs.quantizationMapTexelSize );
-#  endif
-    }
-
-    bool operator!=( VideoFormatQuantizationMapPropertiesKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::eVideoFormatQuantizationMapPropertiesKHR;
-    void *        pNext                    = {};
-    Extent2D      quantizationMapTexelSize = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoFormatQuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatQuantizationMapPropertiesKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoFormatQuantizationMapPropertiesKHR>
-  {
-    using Type = VideoFormatQuantizationMapPropertiesKHR;
-  };
-
-  // wrapper struct for struct VkVideoInlineQueryInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoInlineQueryInfoKHR.html
   struct VideoInlineQueryInfoKHR
   {
     using NativeType = VkVideoInlineQueryInfoKHR;
@@ -172577,15 +124095,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoInlineQueryInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoInlineQueryInfoKHR( QueryPool    queryPool_  = {},
-                                                  uint32_t     firstQuery_ = {},
-                                                  uint32_t     queryCount_ = {},
-                                                  const void * pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queryPool{ queryPool_ }
-      , firstQuery{ firstQuery_ }
-      , queryCount{ queryCount_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoInlineQueryInfoKHR( VULKAN_HPP_NAMESPACE::QueryPool queryPool_  = {},
+                                                  uint32_t                        firstQuery_ = {},
+                                                  uint32_t                        queryCount_ = {},
+                                                  const void *                    pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queryPool( queryPool_ )
+      , firstQuery( firstQuery_ )
+      , queryCount( queryCount_ )
     {
     }
 
@@ -172597,22 +124115,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoInlineQueryInfoKHR & operator=( VideoInlineQueryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoInlineQueryInfoKHR & operator=( VkVideoInlineQueryInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoInlineQueryInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoInlineQueryInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoInlineQueryInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoInlineQueryInfoKHR & setQueryPool( QueryPool queryPool_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoInlineQueryInfoKHR & setQueryPool( VULKAN_HPP_NAMESPACE::QueryPool queryPool_ ) VULKAN_HPP_NOEXCEPT
     {
       queryPool = queryPool_;
       return *this;
@@ -172629,7 +124147,7 @@ namespace VULKAN_HPP_NAMESPACE
       queryCount = queryCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoInlineQueryInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -172641,18 +124159,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoInlineQueryInfoKHR *>( this );
     }
 
-    operator VkVideoInlineQueryInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoInlineQueryInfoKHR *>( this );
-    }
-
-    operator VkVideoInlineQueryInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoInlineQueryInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, QueryPool const &, uint32_t const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, VULKAN_HPP_NAMESPACE::QueryPool const &, uint32_t const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, queryPool, firstQuery, queryCount );
     }
@@ -172678,28 +124191,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType      = StructureType::eVideoInlineQueryInfoKHR;
-    const void *  pNext      = {};
-    QueryPool     queryPool  = {};
-    uint32_t      firstQuery = {};
-    uint32_t      queryCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType      = StructureType::eVideoInlineQueryInfoKHR;
+    const void *                        pNext      = {};
+    VULKAN_HPP_NAMESPACE::QueryPool     queryPool  = {};
+    uint32_t                            firstQuery = {};
+    uint32_t                            queryCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoInlineQueryInfoKHR>
-  {
-    using Type = VideoInlineQueryInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoInlineQueryInfoKHR>
   {
     using Type = VideoInlineQueryInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoProfileListInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoProfileListInfoKHR.html
   struct VideoProfileListInfoKHR
   {
     using NativeType = VkVideoProfileListInfoKHR;
@@ -172707,12 +124211,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoProfileListInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      VideoProfileListInfoKHR( uint32_t profileCount_ = {}, const VideoProfileInfoKHR * pProfiles_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , profileCount{ profileCount_ }
-      , pProfiles{ pProfiles_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoProfileListInfoKHR( uint32_t                                          profileCount_ = {},
+                                                  const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pProfiles_    = {},
+                                                  const void *                                      pNext_        = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , profileCount( profileCount_ )
+      , pProfiles( pProfiles_ )
     {
     }
 
@@ -172724,22 +124229,23 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoProfileListInfoKHR( ArrayProxyNoTemporaries<const VideoProfileInfoKHR> const & profiles_, const void * pNext_ = nullptr )
+    VideoProfileListInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR> const & profiles_,
+                             const void *                                                                                           pNext_ = nullptr )
       : pNext( pNext_ ), profileCount( static_cast<uint32_t>( profiles_.size() ) ), pProfiles( profiles_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     VideoProfileListInfoKHR & operator=( VideoProfileListInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoProfileListInfoKHR & operator=( VkVideoProfileListInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoProfileListInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoProfileListInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoProfileListInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -172752,21 +124258,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoProfileListInfoKHR & setPProfiles( const VideoProfileInfoKHR * pProfiles_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoProfileListInfoKHR & setPProfiles( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pProfiles_ ) VULKAN_HPP_NOEXCEPT
     {
       pProfiles = pProfiles_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    VideoProfileListInfoKHR & setProfiles( ArrayProxyNoTemporaries<const VideoProfileInfoKHR> const & profiles_ ) VULKAN_HPP_NOEXCEPT
+    VideoProfileListInfoKHR &
+      setProfiles( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR> const & profiles_ ) VULKAN_HPP_NOEXCEPT
     {
       profileCount = static_cast<uint32_t>( profiles_.size() );
       pProfiles    = profiles_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoProfileListInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -172778,18 +124285,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoProfileListInfoKHR *>( this );
     }
 
-    operator VkVideoProfileListInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoProfileListInfoKHR *>( this );
-    }
-
-    operator VkVideoProfileListInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoProfileListInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const VideoProfileInfoKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, profileCount, pProfiles );
     }
@@ -172814,138 +124316,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType        = StructureType::eVideoProfileListInfoKHR;
-    const void *                pNext        = {};
-    uint32_t                    profileCount = {};
-    const VideoProfileInfoKHR * pProfiles    = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType        = StructureType::eVideoProfileListInfoKHR;
+    const void *                                      pNext        = {};
+    uint32_t                                          profileCount = {};
+    const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pProfiles    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoProfileListInfoKHR>
-  {
-    using Type = VideoProfileListInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoProfileListInfoKHR>
   {
     using Type = VideoProfileListInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoReferenceIntraRefreshInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoReferenceIntraRefreshInfoKHR.html
-  struct VideoReferenceIntraRefreshInfoKHR
-  {
-    using NativeType = VkVideoReferenceIntraRefreshInfoKHR;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoReferenceIntraRefreshInfoKHR;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoReferenceIntraRefreshInfoKHR( uint32_t dirtyIntraRefreshRegions_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dirtyIntraRefreshRegions{ dirtyIntraRefreshRegions_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR VideoReferenceIntraRefreshInfoKHR( VideoReferenceIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    VideoReferenceIntraRefreshInfoKHR( VkVideoReferenceIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-      : VideoReferenceIntraRefreshInfoKHR( *reinterpret_cast<VideoReferenceIntraRefreshInfoKHR const *>( &rhs ) )
-    {
-    }
-
-    VideoReferenceIntraRefreshInfoKHR & operator=( VideoReferenceIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    VideoReferenceIntraRefreshInfoKHR & operator=( VkVideoReferenceIntraRefreshInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<VideoReferenceIntraRefreshInfoKHR const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 VideoReferenceIntraRefreshInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 VideoReferenceIntraRefreshInfoKHR & setDirtyIntraRefreshRegions( uint32_t dirtyIntraRefreshRegions_ ) VULKAN_HPP_NOEXCEPT
-    {
-      dirtyIntraRefreshRegions = dirtyIntraRefreshRegions_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkVideoReferenceIntraRefreshInfoKHR const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkVideoReferenceIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoReferenceIntraRefreshInfoKHR &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkVideoReferenceIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoReferenceIntraRefreshInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoReferenceIntraRefreshInfoKHR *>( this );
-    }
-
-    operator VkVideoReferenceIntraRefreshInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoReferenceIntraRefreshInfoKHR *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, dirtyIntraRefreshRegions );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( VideoReferenceIntraRefreshInfoKHR const & ) const = default;
-#else
-    bool operator==( VideoReferenceIntraRefreshInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( dirtyIntraRefreshRegions == rhs.dirtyIntraRefreshRegions );
-#  endif
-    }
-
-    bool operator!=( VideoReferenceIntraRefreshInfoKHR const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType                    = StructureType::eVideoReferenceIntraRefreshInfoKHR;
-    const void *  pNext                    = {};
-    uint32_t      dirtyIntraRefreshRegions = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoReferenceIntraRefreshInfoKHR>
-  {
-    using Type = VideoReferenceIntraRefreshInfoKHR;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eVideoReferenceIntraRefreshInfoKHR>
-  {
-    using Type = VideoReferenceIntraRefreshInfoKHR;
-  };
-
-  // wrapper struct for struct VkVideoSessionCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionCreateInfoKHR.html
   struct VideoSessionCreateInfoKHR
   {
     using NativeType = VkVideoSessionCreateInfoKHR;
@@ -172953,27 +124335,27 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoSessionCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR( uint32_t                    queueFamilyIndex_           = {},
-                                                       VideoSessionCreateFlagsKHR  flags_                      = {},
-                                                       const VideoProfileInfoKHR * pVideoProfile_              = {},
-                                                       Format                      pictureFormat_              = Format::eUndefined,
-                                                       Extent2D                    maxCodedExtent_             = {},
-                                                       Format                      referencePictureFormat_     = Format::eUndefined,
-                                                       uint32_t                    maxDpbSlots_                = {},
-                                                       uint32_t                    maxActiveReferencePictures_ = {},
-                                                       const ExtensionProperties * pStdHeaderVersion_          = {},
-                                                       const void *                pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , queueFamilyIndex{ queueFamilyIndex_ }
-      , flags{ flags_ }
-      , pVideoProfile{ pVideoProfile_ }
-      , pictureFormat{ pictureFormat_ }
-      , maxCodedExtent{ maxCodedExtent_ }
-      , referencePictureFormat{ referencePictureFormat_ }
-      , maxDpbSlots{ maxDpbSlots_ }
-      , maxActiveReferencePictures{ maxActiveReferencePictures_ }
-      , pStdHeaderVersion{ pStdHeaderVersion_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR( uint32_t                                          queueFamilyIndex_ = {},
+                                                       VULKAN_HPP_NAMESPACE::VideoSessionCreateFlagsKHR  flags_            = {},
+                                                       const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile_    = {},
+                                                       VULKAN_HPP_NAMESPACE::Format   pictureFormat_              = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                       VULKAN_HPP_NAMESPACE::Extent2D maxCodedExtent_             = {},
+                                                       VULKAN_HPP_NAMESPACE::Format   referencePictureFormat_     = VULKAN_HPP_NAMESPACE::Format::eUndefined,
+                                                       uint32_t                       maxDpbSlots_                = {},
+                                                       uint32_t                       maxActiveReferencePictures_ = {},
+                                                       const VULKAN_HPP_NAMESPACE::ExtensionProperties * pStdHeaderVersion_ = {},
+                                                       const void *                                      pNext_             = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , queueFamilyIndex( queueFamilyIndex_ )
+      , flags( flags_ )
+      , pVideoProfile( pVideoProfile_ )
+      , pictureFormat( pictureFormat_ )
+      , maxCodedExtent( maxCodedExtent_ )
+      , referencePictureFormat( referencePictureFormat_ )
+      , maxDpbSlots( maxDpbSlots_ )
+      , maxActiveReferencePictures( maxActiveReferencePictures_ )
+      , pStdHeaderVersion( pStdHeaderVersion_ )
     {
     }
 
@@ -172985,15 +124367,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoSessionCreateInfoKHR & operator=( VideoSessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoSessionCreateInfoKHR & operator=( VkVideoSessionCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoSessionCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoSessionCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -173006,31 +124388,31 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setFlags( VideoSessionCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::VideoSessionCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPVideoProfile( const VideoProfileInfoKHR * pVideoProfile_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPVideoProfile( const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile_ ) VULKAN_HPP_NOEXCEPT
     {
       pVideoProfile = pVideoProfile_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPictureFormat( Format pictureFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPictureFormat( VULKAN_HPP_NAMESPACE::Format pictureFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       pictureFormat = pictureFormat_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setMaxCodedExtent( Extent2D const & maxCodedExtent_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setMaxCodedExtent( VULKAN_HPP_NAMESPACE::Extent2D const & maxCodedExtent_ ) VULKAN_HPP_NOEXCEPT
     {
       maxCodedExtent = maxCodedExtent_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setReferencePictureFormat( Format referencePictureFormat_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setReferencePictureFormat( VULKAN_HPP_NAMESPACE::Format referencePictureFormat_ ) VULKAN_HPP_NOEXCEPT
     {
       referencePictureFormat = referencePictureFormat_;
       return *this;
@@ -173048,12 +124430,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR & setPStdHeaderVersion( const ExtensionProperties * pStdHeaderVersion_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionCreateInfoKHR &
+      setPStdHeaderVersion( const VULKAN_HPP_NAMESPACE::ExtensionProperties * pStdHeaderVersion_ ) VULKAN_HPP_NOEXCEPT
     {
       pStdHeaderVersion = pStdHeaderVersion_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoSessionCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -173065,28 +124448,22 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoSessionCreateInfoKHR *>( this );
     }
 
-    operator VkVideoSessionCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoSessionCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoSessionCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoSessionCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               VideoSessionCreateFlagsKHR const &,
-               const VideoProfileInfoKHR * const &,
-               Format const &,
-               Extent2D const &,
-               Format const &,
+               VULKAN_HPP_NAMESPACE::VideoSessionCreateFlagsKHR const &,
+               const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
+               VULKAN_HPP_NAMESPACE::Extent2D const &,
+               VULKAN_HPP_NAMESPACE::Format const &,
                uint32_t const &,
                uint32_t const &,
-               const ExtensionProperties * const &>
+               const VULKAN_HPP_NAMESPACE::ExtensionProperties * const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType,
@@ -173125,35 +124502,25 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType               sType                      = StructureType::eVideoSessionCreateInfoKHR;
-    const void *                pNext                      = {};
-    uint32_t                    queueFamilyIndex           = {};
-    VideoSessionCreateFlagsKHR  flags                      = {};
-    const VideoProfileInfoKHR * pVideoProfile              = {};
-    Format                      pictureFormat              = Format::eUndefined;
-    Extent2D                    maxCodedExtent             = {};
-    Format                      referencePictureFormat     = Format::eUndefined;
-    uint32_t                    maxDpbSlots                = {};
-    uint32_t                    maxActiveReferencePictures = {};
-    const ExtensionProperties * pStdHeaderVersion          = {};
+    VULKAN_HPP_NAMESPACE::StructureType               sType                      = StructureType::eVideoSessionCreateInfoKHR;
+    const void *                                      pNext                      = {};
+    uint32_t                                          queueFamilyIndex           = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionCreateFlagsKHR  flags                      = {};
+    const VULKAN_HPP_NAMESPACE::VideoProfileInfoKHR * pVideoProfile              = {};
+    VULKAN_HPP_NAMESPACE::Format                      pictureFormat              = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    VULKAN_HPP_NAMESPACE::Extent2D                    maxCodedExtent             = {};
+    VULKAN_HPP_NAMESPACE::Format                      referencePictureFormat     = VULKAN_HPP_NAMESPACE::Format::eUndefined;
+    uint32_t                                          maxDpbSlots                = {};
+    uint32_t                                          maxActiveReferencePictures = {};
+    const VULKAN_HPP_NAMESPACE::ExtensionProperties * pStdHeaderVersion          = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoSessionCreateInfoKHR>
-  {
-    using Type = VideoSessionCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoSessionCreateInfoKHR>
   {
     using Type = VideoSessionCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoSessionMemoryRequirementsKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionMemoryRequirementsKHR.html
   struct VideoSessionMemoryRequirementsKHR
   {
     using NativeType = VkVideoSessionMemoryRequirementsKHR;
@@ -173161,13 +124528,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoSessionMemoryRequirementsKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoSessionMemoryRequirementsKHR( uint32_t           memoryBindIndex_    = {},
-                                                            MemoryRequirements memoryRequirements_ = {},
-                                                            void *             pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , memoryBindIndex{ memoryBindIndex_ }
-      , memoryRequirements{ memoryRequirements_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoSessionMemoryRequirementsKHR( uint32_t                                 memoryBindIndex_    = {},
+                                                            VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements_ = {},
+                                                            void *                                   pNext_              = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , memoryBindIndex( memoryBindIndex_ )
+      , memoryRequirements( memoryRequirements_ )
     {
     }
 
@@ -173179,11 +124546,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoSessionMemoryRequirementsKHR & operator=( VideoSessionMemoryRequirementsKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoSessionMemoryRequirementsKHR & operator=( VkVideoSessionMemoryRequirementsKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoSessionMemoryRequirementsKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoSessionMemoryRequirementsKHR const *>( &rhs );
       return *this;
     }
 
@@ -173197,18 +124564,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( this );
     }
 
-    operator VkVideoSessionMemoryRequirementsKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoSessionMemoryRequirementsKHR *>( this );
-    }
-
-    operator VkVideoSessionMemoryRequirementsKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoSessionMemoryRequirementsKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, MemoryRequirements const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, void * const &, uint32_t const &, VULKAN_HPP_NAMESPACE::MemoryRequirements const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, memoryBindIndex, memoryRequirements );
     }
@@ -173233,28 +124595,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType      sType              = StructureType::eVideoSessionMemoryRequirementsKHR;
-    void *             pNext              = {};
-    uint32_t           memoryBindIndex    = {};
-    MemoryRequirements memoryRequirements = {};
+    VULKAN_HPP_NAMESPACE::StructureType      sType              = StructureType::eVideoSessionMemoryRequirementsKHR;
+    void *                                   pNext              = {};
+    uint32_t                                 memoryBindIndex    = {};
+    VULKAN_HPP_NAMESPACE::MemoryRequirements memoryRequirements = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoSessionMemoryRequirementsKHR>
-  {
-    using Type = VideoSessionMemoryRequirementsKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoSessionMemoryRequirementsKHR>
   {
     using Type = VideoSessionMemoryRequirementsKHR;
   };
 
-  // wrapper struct for struct VkVideoSessionParametersCreateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersCreateInfoKHR.html
   struct VideoSessionParametersCreateInfoKHR
   {
     using NativeType = VkVideoSessionParametersCreateInfoKHR;
@@ -173262,15 +124614,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoSessionParametersCreateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR VideoSessionParametersCreateInfoKHR( VideoSessionParametersCreateFlagsKHR flags_                          = {},
-                                                              VideoSessionParametersKHR            videoSessionParametersTemplate_ = {},
-                                                              VideoSessionKHR                      videoSession_                   = {},
-                                                              const void *                         pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , videoSessionParametersTemplate{ videoSessionParametersTemplate_ }
-      , videoSession{ videoSession_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR VideoSessionParametersCreateInfoKHR( VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateFlagsKHR flags_                          = {},
+                                                              VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR            videoSessionParametersTemplate_ = {},
+                                                              VULKAN_HPP_NAMESPACE::VideoSessionKHR                      videoSession_                   = {},
+                                                              const void *                                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , videoSessionParametersTemplate( videoSessionParametersTemplate_ )
+      , videoSession( videoSession_ )
     {
     }
 
@@ -173282,40 +124634,41 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoSessionParametersCreateInfoKHR & operator=( VideoSessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoSessionParametersCreateInfoKHR & operator=( VkVideoSessionParametersCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoSessionParametersCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR & setFlags( VideoSessionParametersCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR &
+      setFlags( VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
     }
 
     VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR &
-      setVideoSessionParametersTemplate( VideoSessionParametersKHR videoSessionParametersTemplate_ ) VULKAN_HPP_NOEXCEPT
+      setVideoSessionParametersTemplate( VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR videoSessionParametersTemplate_ ) VULKAN_HPP_NOEXCEPT
     {
       videoSessionParametersTemplate = videoSessionParametersTemplate_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR & setVideoSession( VideoSessionKHR videoSession_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersCreateInfoKHR & setVideoSession( VULKAN_HPP_NAMESPACE::VideoSessionKHR videoSession_ ) VULKAN_HPP_NOEXCEPT
     {
       videoSession = videoSession_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoSessionParametersCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -173327,22 +124680,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoSessionParametersCreateInfoKHR *>( this );
     }
 
-    operator VkVideoSessionParametersCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoSessionParametersCreateInfoKHR *>( this );
-    }
-
-    operator VkVideoSessionParametersCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoSessionParametersCreateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
-               VideoSessionParametersCreateFlagsKHR const &,
-               VideoSessionParametersKHR const &,
-               VideoSessionKHR const &>
+               VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateFlagsKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR const &,
+               VULKAN_HPP_NAMESPACE::VideoSessionKHR const &>
+#  endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, videoSessionParametersTemplate, videoSession );
@@ -173369,29 +124716,19 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                        sType                          = StructureType::eVideoSessionParametersCreateInfoKHR;
-    const void *                         pNext                          = {};
-    VideoSessionParametersCreateFlagsKHR flags                          = {};
-    VideoSessionParametersKHR            videoSessionParametersTemplate = {};
-    VideoSessionKHR                      videoSession                   = {};
+    VULKAN_HPP_NAMESPACE::StructureType                        sType                          = StructureType::eVideoSessionParametersCreateInfoKHR;
+    const void *                                               pNext                          = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersCreateFlagsKHR flags                          = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR            videoSessionParametersTemplate = {};
+    VULKAN_HPP_NAMESPACE::VideoSessionKHR                      videoSession                   = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoSessionParametersCreateInfoKHR>
-  {
-    using Type = VideoSessionParametersCreateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoSessionParametersCreateInfoKHR>
   {
     using Type = VideoSessionParametersCreateInfoKHR;
   };
 
-  // wrapper struct for struct VkVideoSessionParametersUpdateInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkVideoSessionParametersUpdateInfoKHR.html
   struct VideoSessionParametersUpdateInfoKHR
   {
     using NativeType = VkVideoSessionParametersUpdateInfoKHR;
@@ -173399,10 +124736,10 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eVideoSessionParametersUpdateInfoKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR VideoSessionParametersUpdateInfoKHR( uint32_t updateSequenceCount_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , updateSequenceCount{ updateSequenceCount_ }
+      : pNext( pNext_ )
+      , updateSequenceCount( updateSequenceCount_ )
     {
     }
 
@@ -173414,15 +124751,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VideoSessionParametersUpdateInfoKHR & operator=( VideoSessionParametersUpdateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     VideoSessionParametersUpdateInfoKHR & operator=( VkVideoSessionParametersUpdateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<VideoSessionParametersUpdateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 VideoSessionParametersUpdateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -173434,7 +124771,7 @@ namespace VULKAN_HPP_NAMESPACE
       updateSequenceCount = updateSequenceCount_;
       return *this;
     }
-#endif /*VULKAN_HPP_NO_SETTERS*/
+#endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkVideoSessionParametersUpdateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -173446,18 +124783,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkVideoSessionParametersUpdateInfoKHR *>( this );
     }
 
-    operator VkVideoSessionParametersUpdateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkVideoSessionParametersUpdateInfoKHR *>( this );
-    }
-
-    operator VkVideoSessionParametersUpdateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkVideoSessionParametersUpdateInfoKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, updateSequenceCount );
     }
@@ -173482,19 +124814,11 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType               = StructureType::eVideoSessionParametersUpdateInfoKHR;
-    const void *  pNext               = {};
-    uint32_t      updateSequenceCount = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType               = StructureType::eVideoSessionParametersUpdateInfoKHR;
+    const void *                        pNext               = {};
+    uint32_t                            updateSequenceCount = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkVideoSessionParametersUpdateInfoKHR>
-  {
-    using Type = VideoSessionParametersUpdateInfoKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eVideoSessionParametersUpdateInfoKHR>
   {
@@ -173502,7 +124826,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
-  // wrapper struct for struct VkWaylandSurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWaylandSurfaceCreateInfoKHR.html
   struct WaylandSurfaceCreateInfoKHR
   {
     using NativeType = VkWaylandSurfaceCreateInfoKHR;
@@ -173510,15 +124833,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWaylandSurfaceCreateInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WaylandSurfaceCreateInfoKHR( WaylandSurfaceCreateFlagsKHR flags_   = {},
-                                                      struct wl_display *          display_ = {},
-                                                      struct wl_surface *          surface_ = {},
-                                                      const void *                 pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , display{ display_ }
-      , surface{ surface_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR WaylandSurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateFlagsKHR flags_   = {},
+                                                      struct wl_display *                                display_ = {},
+                                                      struct wl_surface *                                surface_ = {},
+                                                      const void *                                       pNext_   = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , display( display_ )
+      , surface( surface_ )
     {
     }
 
@@ -173530,22 +124853,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     WaylandSurfaceCreateInfoKHR & operator=( WaylandSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     WaylandSurfaceCreateInfoKHR & operator=( VkWaylandSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<WaylandSurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 WaylandSurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 WaylandSurfaceCreateInfoKHR & setFlags( WaylandSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 WaylandSurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -173562,7 +124885,7 @@ namespace VULKAN_HPP_NAMESPACE
       surface = surface_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWaylandSurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -173574,18 +124897,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWaylandSurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkWaylandSurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWaylandSurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkWaylandSurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWaylandSurfaceCreateInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, WaylandSurfaceCreateFlagsKHR const &, struct wl_display * const &, struct wl_surface * const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateFlagsKHR const &,
+               struct wl_display * const &,
+               struct wl_surface * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, display, surface );
@@ -173611,21 +124932,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType                sType   = StructureType::eWaylandSurfaceCreateInfoKHR;
-    const void *                 pNext   = {};
-    WaylandSurfaceCreateFlagsKHR flags   = {};
-    struct wl_display *          display = {};
-    struct wl_surface *          surface = {};
+    VULKAN_HPP_NAMESPACE::StructureType                sType   = StructureType::eWaylandSurfaceCreateInfoKHR;
+    const void *                                       pNext   = {};
+    VULKAN_HPP_NAMESPACE::WaylandSurfaceCreateFlagsKHR flags   = {};
+    struct wl_display *                                display = {};
+    struct wl_surface *                                surface = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWaylandSurfaceCreateInfoKHR>
-  {
-    using Type = WaylandSurfaceCreateInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eWaylandSurfaceCreateInfoKHR>
   {
@@ -173634,8 +124947,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WAYLAND_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkWin32KeyedMutexAcquireReleaseInfoKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWin32KeyedMutexAcquireReleaseInfoKHR.html
   struct Win32KeyedMutexAcquireReleaseInfoKHR
   {
     using NativeType = VkWin32KeyedMutexAcquireReleaseInfoKHR;
@@ -173643,23 +124954,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWin32KeyedMutexAcquireReleaseInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR Win32KeyedMutexAcquireReleaseInfoKHR( uint32_t             acquireCount_     = {},
-                                                               const DeviceMemory * pAcquireSyncs_    = {},
-                                                               const uint64_t *     pAcquireKeys_     = {},
-                                                               const uint32_t *     pAcquireTimeouts_ = {},
-                                                               uint32_t             releaseCount_     = {},
-                                                               const DeviceMemory * pReleaseSyncs_    = {},
-                                                               const uint64_t *     pReleaseKeys_     = {},
-                                                               const void *         pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , acquireCount{ acquireCount_ }
-      , pAcquireSyncs{ pAcquireSyncs_ }
-      , pAcquireKeys{ pAcquireKeys_ }
-      , pAcquireTimeouts{ pAcquireTimeouts_ }
-      , releaseCount{ releaseCount_ }
-      , pReleaseSyncs{ pReleaseSyncs_ }
-      , pReleaseKeys{ pReleaseKeys_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR Win32KeyedMutexAcquireReleaseInfoKHR( uint32_t                                   acquireCount_     = {},
+                                                               const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs_    = {},
+                                                               const uint64_t *                           pAcquireKeys_     = {},
+                                                               const uint32_t *                           pAcquireTimeouts_ = {},
+                                                               uint32_t                                   releaseCount_     = {},
+                                                               const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs_    = {},
+                                                               const uint64_t *                           pReleaseKeys_     = {},
+                                                               const void *                               pNext_            = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , acquireCount( acquireCount_ )
+      , pAcquireSyncs( pAcquireSyncs_ )
+      , pAcquireKeys( pAcquireKeys_ )
+      , pAcquireTimeouts( pAcquireTimeouts_ )
+      , releaseCount( releaseCount_ )
+      , pReleaseSyncs( pReleaseSyncs_ )
+      , pReleaseKeys( pReleaseKeys_ )
     {
     }
 
@@ -173671,12 +124982,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR( ArrayProxyNoTemporaries<const DeviceMemory> const & acquireSyncs_,
-                                          ArrayProxyNoTemporaries<const uint64_t> const &     acquireKeys_     = {},
-                                          ArrayProxyNoTemporaries<const uint32_t> const &     acquireTimeouts_ = {},
-                                          ArrayProxyNoTemporaries<const DeviceMemory> const & releaseSyncs_    = {},
-                                          ArrayProxyNoTemporaries<const uint64_t> const &     releaseKeys_     = {},
-                                          const void *                                        pNext_           = nullptr )
+    Win32KeyedMutexAcquireReleaseInfoKHR( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & acquireSyncs_,
+                                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const &                           acquireKeys_     = {},
+                                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const &                           acquireTimeouts_ = {},
+                                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & releaseSyncs_    = {},
+                                          VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const &                           releaseKeys_     = {},
+                                          const void *                                                                                    pNext_ = nullptr )
       : pNext( pNext_ )
       , acquireCount( static_cast<uint32_t>( acquireSyncs_.size() ) )
       , pAcquireSyncs( acquireSyncs_.data() )
@@ -173721,15 +125032,15 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     Win32KeyedMutexAcquireReleaseInfoKHR & operator=( Win32KeyedMutexAcquireReleaseInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Win32KeyedMutexAcquireReleaseInfoKHR & operator=( VkWin32KeyedMutexAcquireReleaseInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Win32KeyedMutexAcquireReleaseInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Win32KeyedMutexAcquireReleaseInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -173742,14 +125053,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoKHR & setPAcquireSyncs( const DeviceMemory * pAcquireSyncs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoKHR &
+      setPAcquireSyncs( const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       pAcquireSyncs = pAcquireSyncs_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR & setAcquireSyncs( ArrayProxyNoTemporaries<const DeviceMemory> const & acquireSyncs_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoKHR &
+      setAcquireSyncs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & acquireSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount  = static_cast<uint32_t>( acquireSyncs_.size() );
       pAcquireSyncs = acquireSyncs_.data();
@@ -173764,7 +125077,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR & setAcquireKeys( ArrayProxyNoTemporaries<const uint64_t> const & acquireKeys_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoKHR &
+      setAcquireKeys( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & acquireKeys_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount = static_cast<uint32_t>( acquireKeys_.size() );
       pAcquireKeys = acquireKeys_.data();
@@ -173779,7 +125093,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR & setAcquireTimeouts( ArrayProxyNoTemporaries<const uint32_t> const & acquireTimeouts_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoKHR &
+      setAcquireTimeouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & acquireTimeouts_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount     = static_cast<uint32_t>( acquireTimeouts_.size() );
       pAcquireTimeouts = acquireTimeouts_.data();
@@ -173793,14 +125108,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoKHR & setPReleaseSyncs( const DeviceMemory * pReleaseSyncs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoKHR &
+      setPReleaseSyncs( const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       pReleaseSyncs = pReleaseSyncs_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR & setReleaseSyncs( ArrayProxyNoTemporaries<const DeviceMemory> const & releaseSyncs_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoKHR &
+      setReleaseSyncs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & releaseSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       releaseCount  = static_cast<uint32_t>( releaseSyncs_.size() );
       pReleaseSyncs = releaseSyncs_.data();
@@ -173815,14 +125132,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoKHR & setReleaseKeys( ArrayProxyNoTemporaries<const uint64_t> const & releaseKeys_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoKHR &
+      setReleaseKeys( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & releaseKeys_ ) VULKAN_HPP_NOEXCEPT
     {
       releaseCount = static_cast<uint32_t>( releaseKeys_.size() );
       pReleaseKeys = releaseKeys_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWin32KeyedMutexAcquireReleaseInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -173834,26 +125152,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWin32KeyedMutexAcquireReleaseInfoKHR *>( this );
     }
 
-    operator VkWin32KeyedMutexAcquireReleaseInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWin32KeyedMutexAcquireReleaseInfoKHR *>( this );
-    }
-
-    operator VkWin32KeyedMutexAcquireReleaseInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWin32KeyedMutexAcquireReleaseInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const DeviceMemory * const &,
+               const VULKAN_HPP_NAMESPACE::DeviceMemory * const &,
                const uint64_t * const &,
                const uint32_t * const &,
                uint32_t const &,
-               const DeviceMemory * const &,
+               const VULKAN_HPP_NAMESPACE::DeviceMemory * const &,
                const uint64_t * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, acquireCount, pAcquireSyncs, pAcquireKeys, pAcquireTimeouts, releaseCount, pReleaseSyncs, pReleaseKeys );
@@ -173881,25 +125193,17 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType        sType            = StructureType::eWin32KeyedMutexAcquireReleaseInfoKHR;
-    const void *         pNext            = {};
-    uint32_t             acquireCount     = {};
-    const DeviceMemory * pAcquireSyncs    = {};
-    const uint64_t *     pAcquireKeys     = {};
-    const uint32_t *     pAcquireTimeouts = {};
-    uint32_t             releaseCount     = {};
-    const DeviceMemory * pReleaseSyncs    = {};
-    const uint64_t *     pReleaseKeys     = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType            = StructureType::eWin32KeyedMutexAcquireReleaseInfoKHR;
+    const void *                               pNext            = {};
+    uint32_t                                   acquireCount     = {};
+    const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs    = {};
+    const uint64_t *                           pAcquireKeys     = {};
+    const uint32_t *                           pAcquireTimeouts = {};
+    uint32_t                                   releaseCount     = {};
+    const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs    = {};
+    const uint64_t *                           pReleaseKeys     = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWin32KeyedMutexAcquireReleaseInfoKHR>
-  {
-    using Type = Win32KeyedMutexAcquireReleaseInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eWin32KeyedMutexAcquireReleaseInfoKHR>
   {
@@ -173908,8 +125212,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkWin32KeyedMutexAcquireReleaseInfoNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWin32KeyedMutexAcquireReleaseInfoNV.html
   struct Win32KeyedMutexAcquireReleaseInfoNV
   {
     using NativeType = VkWin32KeyedMutexAcquireReleaseInfoNV;
@@ -173917,23 +125219,23 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWin32KeyedMutexAcquireReleaseInfoNV;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR Win32KeyedMutexAcquireReleaseInfoNV( uint32_t             acquireCount_                = {},
-                                                              const DeviceMemory * pAcquireSyncs_               = {},
-                                                              const uint64_t *     pAcquireKeys_                = {},
-                                                              const uint32_t *     pAcquireTimeoutMilliseconds_ = {},
-                                                              uint32_t             releaseCount_                = {},
-                                                              const DeviceMemory * pReleaseSyncs_               = {},
-                                                              const uint64_t *     pReleaseKeys_                = {},
-                                                              const void *         pNext_                       = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , acquireCount{ acquireCount_ }
-      , pAcquireSyncs{ pAcquireSyncs_ }
-      , pAcquireKeys{ pAcquireKeys_ }
-      , pAcquireTimeoutMilliseconds{ pAcquireTimeoutMilliseconds_ }
-      , releaseCount{ releaseCount_ }
-      , pReleaseSyncs{ pReleaseSyncs_ }
-      , pReleaseKeys{ pReleaseKeys_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR Win32KeyedMutexAcquireReleaseInfoNV( uint32_t                                   acquireCount_                = {},
+                                                              const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs_               = {},
+                                                              const uint64_t *                           pAcquireKeys_                = {},
+                                                              const uint32_t *                           pAcquireTimeoutMilliseconds_ = {},
+                                                              uint32_t                                   releaseCount_                = {},
+                                                              const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs_               = {},
+                                                              const uint64_t *                           pReleaseKeys_                = {},
+                                                              const void *                               pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , acquireCount( acquireCount_ )
+      , pAcquireSyncs( pAcquireSyncs_ )
+      , pAcquireKeys( pAcquireKeys_ )
+      , pAcquireTimeoutMilliseconds( pAcquireTimeoutMilliseconds_ )
+      , releaseCount( releaseCount_ )
+      , pReleaseSyncs( pReleaseSyncs_ )
+      , pReleaseKeys( pReleaseKeys_ )
     {
     }
 
@@ -173945,12 +125247,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoNV( ArrayProxyNoTemporaries<const DeviceMemory> const & acquireSyncs_,
-                                         ArrayProxyNoTemporaries<const uint64_t> const &     acquireKeys_                = {},
-                                         ArrayProxyNoTemporaries<const uint32_t> const &     acquireTimeoutMilliseconds_ = {},
-                                         ArrayProxyNoTemporaries<const DeviceMemory> const & releaseSyncs_               = {},
-                                         ArrayProxyNoTemporaries<const uint64_t> const &     releaseKeys_                = {},
-                                         const void *                                        pNext_                      = nullptr )
+    Win32KeyedMutexAcquireReleaseInfoNV( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & acquireSyncs_,
+                                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const &                           acquireKeys_  = {},
+                                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & acquireTimeoutMilliseconds_             = {},
+                                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & releaseSyncs_ = {},
+                                         VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const &                           releaseKeys_  = {},
+                                         const void *                                                                                    pNext_ = nullptr )
       : pNext( pNext_ )
       , acquireCount( static_cast<uint32_t>( acquireSyncs_.size() ) )
       , pAcquireSyncs( acquireSyncs_.data() )
@@ -173997,15 +125299,15 @@ namespace VULKAN_HPP_NAMESPACE
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     Win32KeyedMutexAcquireReleaseInfoNV & operator=( Win32KeyedMutexAcquireReleaseInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Win32KeyedMutexAcquireReleaseInfoNV & operator=( VkWin32KeyedMutexAcquireReleaseInfoNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Win32KeyedMutexAcquireReleaseInfoNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Win32KeyedMutexAcquireReleaseInfoNV const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -174018,14 +125320,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoNV & setPAcquireSyncs( const DeviceMemory * pAcquireSyncs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoNV &
+      setPAcquireSyncs( const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       pAcquireSyncs = pAcquireSyncs_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoNV & setAcquireSyncs( ArrayProxyNoTemporaries<const DeviceMemory> const & acquireSyncs_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoNV &
+      setAcquireSyncs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & acquireSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount  = static_cast<uint32_t>( acquireSyncs_.size() );
       pAcquireSyncs = acquireSyncs_.data();
@@ -174040,7 +125344,8 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoNV & setAcquireKeys( ArrayProxyNoTemporaries<const uint64_t> const & acquireKeys_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoNV &
+      setAcquireKeys( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & acquireKeys_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount = static_cast<uint32_t>( acquireKeys_.size() );
       pAcquireKeys = acquireKeys_.data();
@@ -174057,7 +125362,7 @@ namespace VULKAN_HPP_NAMESPACE
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     Win32KeyedMutexAcquireReleaseInfoNV &
-      setAcquireTimeoutMilliseconds( ArrayProxyNoTemporaries<const uint32_t> const & acquireTimeoutMilliseconds_ ) VULKAN_HPP_NOEXCEPT
+      setAcquireTimeoutMilliseconds( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint32_t> const & acquireTimeoutMilliseconds_ ) VULKAN_HPP_NOEXCEPT
     {
       acquireCount                = static_cast<uint32_t>( acquireTimeoutMilliseconds_.size() );
       pAcquireTimeoutMilliseconds = acquireTimeoutMilliseconds_.data();
@@ -174071,14 +125376,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoNV & setPReleaseSyncs( const DeviceMemory * pReleaseSyncs_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Win32KeyedMutexAcquireReleaseInfoNV &
+      setPReleaseSyncs( const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       pReleaseSyncs = pReleaseSyncs_;
       return *this;
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoNV & setReleaseSyncs( ArrayProxyNoTemporaries<const DeviceMemory> const & releaseSyncs_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoNV &
+      setReleaseSyncs( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DeviceMemory> const & releaseSyncs_ ) VULKAN_HPP_NOEXCEPT
     {
       releaseCount  = static_cast<uint32_t>( releaseSyncs_.size() );
       pReleaseSyncs = releaseSyncs_.data();
@@ -174093,14 +125400,15 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #    if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    Win32KeyedMutexAcquireReleaseInfoNV & setReleaseKeys( ArrayProxyNoTemporaries<const uint64_t> const & releaseKeys_ ) VULKAN_HPP_NOEXCEPT
+    Win32KeyedMutexAcquireReleaseInfoNV &
+      setReleaseKeys( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const uint64_t> const & releaseKeys_ ) VULKAN_HPP_NOEXCEPT
     {
       releaseCount = static_cast<uint32_t>( releaseKeys_.size() );
       pReleaseKeys = releaseKeys_.data();
       return *this;
     }
 #    endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#  endif   /*VULKAN_HPP_NO_SETTERS*/
+#  endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWin32KeyedMutexAcquireReleaseInfoNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -174112,26 +125420,20 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWin32KeyedMutexAcquireReleaseInfoNV *>( this );
     }
 
-    operator VkWin32KeyedMutexAcquireReleaseInfoNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWin32KeyedMutexAcquireReleaseInfoNV *>( this );
-    }
-
-    operator VkWin32KeyedMutexAcquireReleaseInfoNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWin32KeyedMutexAcquireReleaseInfoNV *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &,
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
                const void * const &,
                uint32_t const &,
-               const DeviceMemory * const &,
+               const VULKAN_HPP_NAMESPACE::DeviceMemory * const &,
                const uint64_t * const &,
                const uint32_t * const &,
                uint32_t const &,
-               const DeviceMemory * const &,
+               const VULKAN_HPP_NAMESPACE::DeviceMemory * const &,
                const uint64_t * const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, acquireCount, pAcquireSyncs, pAcquireKeys, pAcquireTimeoutMilliseconds, releaseCount, pReleaseSyncs, pReleaseKeys );
@@ -174159,25 +125461,17 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType        sType                       = StructureType::eWin32KeyedMutexAcquireReleaseInfoNV;
-    const void *         pNext                       = {};
-    uint32_t             acquireCount                = {};
-    const DeviceMemory * pAcquireSyncs               = {};
-    const uint64_t *     pAcquireKeys                = {};
-    const uint32_t *     pAcquireTimeoutMilliseconds = {};
-    uint32_t             releaseCount                = {};
-    const DeviceMemory * pReleaseSyncs               = {};
-    const uint64_t *     pReleaseKeys                = {};
+    VULKAN_HPP_NAMESPACE::StructureType        sType                       = StructureType::eWin32KeyedMutexAcquireReleaseInfoNV;
+    const void *                               pNext                       = {};
+    uint32_t                                   acquireCount                = {};
+    const VULKAN_HPP_NAMESPACE::DeviceMemory * pAcquireSyncs               = {};
+    const uint64_t *                           pAcquireKeys                = {};
+    const uint32_t *                           pAcquireTimeoutMilliseconds = {};
+    uint32_t                                   releaseCount                = {};
+    const VULKAN_HPP_NAMESPACE::DeviceMemory * pReleaseSyncs               = {};
+    const uint64_t *                           pReleaseKeys                = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWin32KeyedMutexAcquireReleaseInfoNV>
-  {
-    using Type = Win32KeyedMutexAcquireReleaseInfoNV;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eWin32KeyedMutexAcquireReleaseInfoNV>
   {
@@ -174186,7 +125480,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-  // wrapper struct for struct VkWin32SurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWin32SurfaceCreateInfoKHR.html
   struct Win32SurfaceCreateInfoKHR
   {
     using NativeType = VkWin32SurfaceCreateInfoKHR;
@@ -174194,15 +125487,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWin32SurfaceCreateInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR Win32SurfaceCreateInfoKHR( Win32SurfaceCreateFlagsKHR flags_     = {},
-                                                    HINSTANCE                  hinstance_ = {},
-                                                    HWND                       hwnd_      = {},
-                                                    const void *               pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , hinstance{ hinstance_ }
-      , hwnd{ hwnd_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR Win32SurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::Win32SurfaceCreateFlagsKHR flags_     = {},
+                                                    HINSTANCE                                        hinstance_ = {},
+                                                    HWND                                             hwnd_      = {},
+                                                    const void *                                     pNext_     = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , hinstance( hinstance_ )
+      , hwnd( hwnd_ )
     {
     }
 
@@ -174214,22 +125507,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     Win32SurfaceCreateInfoKHR & operator=( Win32SurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     Win32SurfaceCreateInfoKHR & operator=( VkWin32SurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<Win32SurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::Win32SurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 Win32SurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 Win32SurfaceCreateInfoKHR & setFlags( Win32SurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 Win32SurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::Win32SurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -174246,7 +125539,7 @@ namespace VULKAN_HPP_NAMESPACE
       hwnd = hwnd_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWin32SurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -174258,18 +125551,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWin32SurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkWin32SurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWin32SurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkWin32SurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWin32SurfaceCreateInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, Win32SurfaceCreateFlagsKHR const &, HINSTANCE const &, HWND const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::Win32SurfaceCreateFlagsKHR const &,
+               HINSTANCE const &,
+               HWND const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, hinstance, hwnd );
@@ -174295,21 +125586,13 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 
   public:
-    StructureType              sType     = StructureType::eWin32SurfaceCreateInfoKHR;
-    const void *               pNext     = {};
-    Win32SurfaceCreateFlagsKHR flags     = {};
-    HINSTANCE                  hinstance = {};
-    HWND                       hwnd      = {};
+    VULKAN_HPP_NAMESPACE::StructureType              sType     = StructureType::eWin32SurfaceCreateInfoKHR;
+    const void *                                     pNext     = {};
+    VULKAN_HPP_NAMESPACE::Win32SurfaceCreateFlagsKHR flags     = {};
+    HINSTANCE                                        hinstance = {};
+    HWND                                             hwnd      = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWin32SurfaceCreateInfoKHR>
-  {
-    using Type = Win32SurfaceCreateInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eWin32SurfaceCreateInfoKHR>
   {
@@ -174317,8 +125600,6 @@ namespace VULKAN_HPP_NAMESPACE
   };
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
-  // wrapper struct for struct VkWriteDescriptorSetAccelerationStructureKHR, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSetAccelerationStructureKHR.html
   struct WriteDescriptorSetAccelerationStructureKHR
   {
     using NativeType = VkWriteDescriptorSetAccelerationStructureKHR;
@@ -174326,13 +125607,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSetAccelerationStructureKHR;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WriteDescriptorSetAccelerationStructureKHR( uint32_t                         accelerationStructureCount_ = {},
-                                                                     const AccelerationStructureKHR * pAccelerationStructures_    = {},
-                                                                     const void *                     pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructureCount{ accelerationStructureCount_ }
-      , pAccelerationStructures{ pAccelerationStructures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR WriteDescriptorSetAccelerationStructureKHR( uint32_t                                               accelerationStructureCount_ = {},
+                                                                     const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures_    = {},
+                                                                     const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructureCount( accelerationStructureCount_ )
+      , pAccelerationStructures( pAccelerationStructures_ )
     {
     }
 
@@ -174344,8 +125625,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetAccelerationStructureKHR( ArrayProxyNoTemporaries<const AccelerationStructureKHR> const & accelerationStructures_,
-                                                const void *                                                    pNext_ = nullptr )
+    WriteDescriptorSetAccelerationStructureKHR(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures_,
+      const void *                                                                                                pNext_ = nullptr )
       : pNext( pNext_ )
       , accelerationStructureCount( static_cast<uint32_t>( accelerationStructures_.size() ) )
       , pAccelerationStructures( accelerationStructures_.data() )
@@ -174354,15 +125636,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     WriteDescriptorSetAccelerationStructureKHR & operator=( WriteDescriptorSetAccelerationStructureKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     WriteDescriptorSetAccelerationStructureKHR & operator=( VkWriteDescriptorSetAccelerationStructureKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<WriteDescriptorSetAccelerationStructureKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureKHR const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetAccelerationStructureKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -174377,22 +125659,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetAccelerationStructureKHR &
-      setPAccelerationStructures( const AccelerationStructureKHR * pAccelerationStructures_ ) VULKAN_HPP_NOEXCEPT
+      setPAccelerationStructures( const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures_ ) VULKAN_HPP_NOEXCEPT
     {
       pAccelerationStructures = pAccelerationStructures_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetAccelerationStructureKHR &
-      setAccelerationStructures( ArrayProxyNoTemporaries<const AccelerationStructureKHR> const & accelerationStructures_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSetAccelerationStructureKHR & setAccelerationStructures(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR> const & accelerationStructures_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureCount = static_cast<uint32_t>( accelerationStructures_.size() );
       pAccelerationStructures    = accelerationStructures_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWriteDescriptorSetAccelerationStructureKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -174404,18 +125686,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWriteDescriptorSetAccelerationStructureKHR *>( this );
     }
 
-    operator VkWriteDescriptorSetAccelerationStructureKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSetAccelerationStructureKHR *>( this );
-    }
-
-    operator VkWriteDescriptorSetAccelerationStructureKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSetAccelerationStructureKHR *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const AccelerationStructureKHR * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructureCount, pAccelerationStructures );
     }
@@ -174441,28 +125719,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                    sType                      = StructureType::eWriteDescriptorSetAccelerationStructureKHR;
-    const void *                     pNext                      = {};
-    uint32_t                         accelerationStructureCount = {};
-    const AccelerationStructureKHR * pAccelerationStructures    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                    sType                      = StructureType::eWriteDescriptorSetAccelerationStructureKHR;
+    const void *                                           pNext                      = {};
+    uint32_t                                               accelerationStructureCount = {};
+    const VULKAN_HPP_NAMESPACE::AccelerationStructureKHR * pAccelerationStructures    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSetAccelerationStructureKHR>
-  {
-    using Type = WriteDescriptorSetAccelerationStructureKHR;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eWriteDescriptorSetAccelerationStructureKHR>
   {
     using Type = WriteDescriptorSetAccelerationStructureKHR;
   };
 
-  // wrapper struct for struct VkWriteDescriptorSetAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSetAccelerationStructureNV.html
   struct WriteDescriptorSetAccelerationStructureNV
   {
     using NativeType = VkWriteDescriptorSetAccelerationStructureNV;
@@ -174470,13 +125738,13 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSetAccelerationStructureNV;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WriteDescriptorSetAccelerationStructureNV( uint32_t                        accelerationStructureCount_ = {},
-                                                                    const AccelerationStructureNV * pAccelerationStructures_    = {},
-                                                                    const void *                    pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructureCount{ accelerationStructureCount_ }
-      , pAccelerationStructures{ pAccelerationStructures_ }
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR WriteDescriptorSetAccelerationStructureNV( uint32_t                                              accelerationStructureCount_ = {},
+                                                                    const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * pAccelerationStructures_    = {},
+                                                                    const void *                                          pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , accelerationStructureCount( accelerationStructureCount_ )
+      , pAccelerationStructures( pAccelerationStructures_ )
     {
     }
 
@@ -174488,8 +125756,9 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetAccelerationStructureNV( ArrayProxyNoTemporaries<const AccelerationStructureNV> const & accelerationStructures_,
-                                               const void *                                                   pNext_ = nullptr )
+    WriteDescriptorSetAccelerationStructureNV(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures_,
+      const void *                                                                                               pNext_ = nullptr )
       : pNext( pNext_ )
       , accelerationStructureCount( static_cast<uint32_t>( accelerationStructures_.size() ) )
       , pAccelerationStructures( accelerationStructures_.data() )
@@ -174498,15 +125767,15 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     WriteDescriptorSetAccelerationStructureNV & operator=( WriteDescriptorSetAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     WriteDescriptorSetAccelerationStructureNV & operator=( VkWriteDescriptorSetAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<WriteDescriptorSetAccelerationStructureNV const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::WriteDescriptorSetAccelerationStructureNV const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetAccelerationStructureNV & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -174521,22 +125790,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetAccelerationStructureNV &
-      setPAccelerationStructures( const AccelerationStructureNV * pAccelerationStructures_ ) VULKAN_HPP_NOEXCEPT
+      setPAccelerationStructures( const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * pAccelerationStructures_ ) VULKAN_HPP_NOEXCEPT
     {
       pAccelerationStructures = pAccelerationStructures_;
       return *this;
     }
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetAccelerationStructureNV &
-      setAccelerationStructures( ArrayProxyNoTemporaries<const AccelerationStructureNV> const & accelerationStructures_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSetAccelerationStructureNV & setAccelerationStructures(
+      VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::AccelerationStructureNV> const & accelerationStructures_ ) VULKAN_HPP_NOEXCEPT
     {
       accelerationStructureCount = static_cast<uint32_t>( accelerationStructures_.size() );
       pAccelerationStructures    = accelerationStructures_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWriteDescriptorSetAccelerationStructureNV const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -174548,18 +125817,14 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWriteDescriptorSetAccelerationStructureNV *>( this );
     }
 
-    operator VkWriteDescriptorSetAccelerationStructureNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSetAccelerationStructureNV *>( this );
-    }
-
-    operator VkWriteDescriptorSetAccelerationStructureNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSetAccelerationStructureNV *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const AccelerationStructureNV * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::
+      tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, accelerationStructureCount, pAccelerationStructures );
     }
@@ -174585,28 +125850,18 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType                   sType                      = StructureType::eWriteDescriptorSetAccelerationStructureNV;
-    const void *                    pNext                      = {};
-    uint32_t                        accelerationStructureCount = {};
-    const AccelerationStructureNV * pAccelerationStructures    = {};
+    VULKAN_HPP_NAMESPACE::StructureType                   sType                      = StructureType::eWriteDescriptorSetAccelerationStructureNV;
+    const void *                                          pNext                      = {};
+    uint32_t                                              accelerationStructureCount = {};
+    const VULKAN_HPP_NAMESPACE::AccelerationStructureNV * pAccelerationStructures    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSetAccelerationStructureNV>
-  {
-    using Type = WriteDescriptorSetAccelerationStructureNV;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eWriteDescriptorSetAccelerationStructureNV>
   {
     using Type = WriteDescriptorSetAccelerationStructureNV;
   };
 
-  // wrapper struct for struct VkWriteDescriptorSetInlineUniformBlock, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSetInlineUniformBlock.html
   struct WriteDescriptorSetInlineUniformBlock
   {
     using NativeType = VkWriteDescriptorSetInlineUniformBlock;
@@ -174614,12 +125869,12 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSetInlineUniformBlock;
 
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+#if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
     VULKAN_HPP_CONSTEXPR
       WriteDescriptorSetInlineUniformBlock( uint32_t dataSize_ = {}, const void * pData_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , dataSize{ dataSize_ }
-      , pData{ pData_ }
+      : pNext( pNext_ )
+      , dataSize( dataSize_ )
+      , pData( pData_ )
     {
     }
 
@@ -174632,22 +125887,22 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    WriteDescriptorSetInlineUniformBlock( ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
+    WriteDescriptorSetInlineUniformBlock( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_, const void * pNext_ = nullptr )
       : pNext( pNext_ ), dataSize( static_cast<uint32_t>( data_.size() * sizeof( T ) ) ), pData( data_.data() )
     {
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
     WriteDescriptorSetInlineUniformBlock & operator=( WriteDescriptorSetInlineUniformBlock const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     WriteDescriptorSetInlineUniformBlock & operator=( VkWriteDescriptorSetInlineUniformBlock const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<WriteDescriptorSetInlineUniformBlock const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::WriteDescriptorSetInlineUniformBlock const *>( &rhs );
       return *this;
     }
 
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetInlineUniformBlock & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -174668,14 +125923,14 @@ namespace VULKAN_HPP_NAMESPACE
 
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     template <typename T>
-    WriteDescriptorSetInlineUniformBlock & setData( ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
+    WriteDescriptorSetInlineUniformBlock & setData( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const T> const & data_ ) VULKAN_HPP_NOEXCEPT
     {
       dataSize = static_cast<uint32_t>( data_.size() * sizeof( T ) );
       pData    = data_.data();
       return *this;
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
+#endif   /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkWriteDescriptorSetInlineUniformBlock const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -174687,18 +125942,13 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkWriteDescriptorSetInlineUniformBlock *>( this );
     }
 
-    operator VkWriteDescriptorSetInlineUniformBlock const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSetInlineUniformBlock *>( this );
-    }
-
-    operator VkWriteDescriptorSetInlineUniformBlock *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSetInlineUniformBlock *>( this );
-    }
-
 #if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const void * const &> reflect() const VULKAN_HPP_NOEXCEPT
+#  if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#  else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &, const void * const &, uint32_t const &, const void * const &>
+#  endif
+      reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, dataSize, pData );
     }
@@ -174723,20 +125973,12 @@ namespace VULKAN_HPP_NAMESPACE
 #endif
 
   public:
-    StructureType sType    = StructureType::eWriteDescriptorSetInlineUniformBlock;
-    const void *  pNext    = {};
-    uint32_t      dataSize = {};
-    const void *  pData    = {};
+    VULKAN_HPP_NAMESPACE::StructureType sType    = StructureType::eWriteDescriptorSetInlineUniformBlock;
+    const void *                        pNext    = {};
+    uint32_t                            dataSize = {};
+    const void *                        pData    = {};
   };
 
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSetInlineUniformBlock>
-  {
-    using Type = WriteDescriptorSetInlineUniformBlock;
-  };
-#endif
-
   template <>
   struct CppType<StructureType, StructureType::eWriteDescriptorSetInlineUniformBlock>
   {
@@ -174745,528 +125987,7 @@ namespace VULKAN_HPP_NAMESPACE
 
   using WriteDescriptorSetInlineUniformBlockEXT = WriteDescriptorSetInlineUniformBlock;
 
-  // wrapper struct for struct VkWriteDescriptorSetPartitionedAccelerationStructureNV, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSetPartitionedAccelerationStructureNV.html
-  struct WriteDescriptorSetPartitionedAccelerationStructureNV
-  {
-    using NativeType = VkWriteDescriptorSetPartitionedAccelerationStructureNV;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSetPartitionedAccelerationStructureNV;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WriteDescriptorSetPartitionedAccelerationStructureNV( uint32_t              accelerationStructureCount_ = {},
-                                                                               const DeviceAddress * pAccelerationStructures_    = {},
-                                                                               void *                pNext_                      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , accelerationStructureCount{ accelerationStructureCount_ }
-      , pAccelerationStructures{ pAccelerationStructures_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR
-      WriteDescriptorSetPartitionedAccelerationStructureNV( WriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    WriteDescriptorSetPartitionedAccelerationStructureNV( VkWriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT
-      : WriteDescriptorSetPartitionedAccelerationStructureNV( *reinterpret_cast<WriteDescriptorSetPartitionedAccelerationStructureNV const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetPartitionedAccelerationStructureNV( ArrayProxyNoTemporaries<const DeviceAddress> const & accelerationStructures_,
-                                                          void *                                               pNext_ = nullptr )
-      : pNext( pNext_ )
-      , accelerationStructureCount( static_cast<uint32_t>( accelerationStructures_.size() ) )
-      , pAccelerationStructures( accelerationStructures_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    WriteDescriptorSetPartitionedAccelerationStructureNV &
-      operator=( WriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    WriteDescriptorSetPartitionedAccelerationStructureNV & operator=( VkWriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<WriteDescriptorSetPartitionedAccelerationStructureNV const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetPartitionedAccelerationStructureNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetPartitionedAccelerationStructureNV &
-      setAccelerationStructureCount( uint32_t accelerationStructureCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      accelerationStructureCount = accelerationStructureCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetPartitionedAccelerationStructureNV &
-      setPAccelerationStructures( const DeviceAddress * pAccelerationStructures_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pAccelerationStructures = pAccelerationStructures_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetPartitionedAccelerationStructureNV &
-      setAccelerationStructures( ArrayProxyNoTemporaries<const DeviceAddress> const & accelerationStructures_ ) VULKAN_HPP_NOEXCEPT
-    {
-      accelerationStructureCount = static_cast<uint32_t>( accelerationStructures_.size() );
-      pAccelerationStructures    = accelerationStructures_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkWriteDescriptorSetPartitionedAccelerationStructureNV const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkWriteDescriptorSetPartitionedAccelerationStructureNV *>( this );
-    }
-
-    operator VkWriteDescriptorSetPartitionedAccelerationStructureNV &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkWriteDescriptorSetPartitionedAccelerationStructureNV *>( this );
-    }
-
-    operator VkWriteDescriptorSetPartitionedAccelerationStructureNV const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSetPartitionedAccelerationStructureNV *>( this );
-    }
-
-    operator VkWriteDescriptorSetPartitionedAccelerationStructureNV *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSetPartitionedAccelerationStructureNV *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, void * const &, uint32_t const &, const DeviceAddress * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, accelerationStructureCount, pAccelerationStructures );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( WriteDescriptorSetPartitionedAccelerationStructureNV const & ) const = default;
-#else
-    bool operator==( WriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( accelerationStructureCount == rhs.accelerationStructureCount ) &&
-             ( pAccelerationStructures == rhs.pAccelerationStructures );
-#  endif
-    }
-
-    bool operator!=( WriteDescriptorSetPartitionedAccelerationStructureNV const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType         sType                      = StructureType::eWriteDescriptorSetPartitionedAccelerationStructureNV;
-    void *                pNext                      = {};
-    uint32_t              accelerationStructureCount = {};
-    const DeviceAddress * pAccelerationStructures    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSetPartitionedAccelerationStructureNV>
-  {
-    using Type = WriteDescriptorSetPartitionedAccelerationStructureNV;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eWriteDescriptorSetPartitionedAccelerationStructureNV>
-  {
-    using Type = WriteDescriptorSetPartitionedAccelerationStructureNV;
-  };
-
-  // wrapper struct for struct VkWriteDescriptorSetTensorARM, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteDescriptorSetTensorARM.html
-  struct WriteDescriptorSetTensorARM
-  {
-    using NativeType = VkWriteDescriptorSetTensorARM;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteDescriptorSetTensorARM;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      WriteDescriptorSetTensorARM( uint32_t tensorViewCount_ = {}, const TensorViewARM * pTensorViews_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , tensorViewCount{ tensorViewCount_ }
-      , pTensorViews{ pTensorViews_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR WriteDescriptorSetTensorARM( WriteDescriptorSetTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    WriteDescriptorSetTensorARM( VkWriteDescriptorSetTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT
-      : WriteDescriptorSetTensorARM( *reinterpret_cast<WriteDescriptorSetTensorARM const *>( &rhs ) )
-    {
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetTensorARM( ArrayProxyNoTemporaries<const TensorViewARM> const & tensorViews_, const void * pNext_ = nullptr )
-      : pNext( pNext_ ), tensorViewCount( static_cast<uint32_t>( tensorViews_.size() ) ), pTensorViews( tensorViews_.data() )
-    {
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
-    WriteDescriptorSetTensorARM & operator=( WriteDescriptorSetTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    WriteDescriptorSetTensorARM & operator=( VkWriteDescriptorSetTensorARM const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<WriteDescriptorSetTensorARM const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetTensorARM & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetTensorARM & setTensorViewCount( uint32_t tensorViewCount_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorViewCount = tensorViewCount_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteDescriptorSetTensorARM & setPTensorViews( const TensorViewARM * pTensorViews_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pTensorViews = pTensorViews_;
-      return *this;
-    }
-
-#  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
-    WriteDescriptorSetTensorARM & setTensorViews( ArrayProxyNoTemporaries<const TensorViewARM> const & tensorViews_ ) VULKAN_HPP_NOEXCEPT
-    {
-      tensorViewCount = static_cast<uint32_t>( tensorViews_.size() );
-      pTensorViews    = tensorViews_.data();
-      return *this;
-    }
-#  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif   /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkWriteDescriptorSetTensorARM const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkWriteDescriptorSetTensorARM *>( this );
-    }
-
-    operator VkWriteDescriptorSetTensorARM &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkWriteDescriptorSetTensorARM *>( this );
-    }
-
-    operator VkWriteDescriptorSetTensorARM const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteDescriptorSetTensorARM *>( this );
-    }
-
-    operator VkWriteDescriptorSetTensorARM *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteDescriptorSetTensorARM *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, const TensorViewARM * const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, tensorViewCount, pTensorViews );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( WriteDescriptorSetTensorARM const & ) const = default;
-#else
-    bool operator==( WriteDescriptorSetTensorARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( tensorViewCount == rhs.tensorViewCount ) && ( pTensorViews == rhs.pTensorViews );
-#  endif
-    }
-
-    bool operator!=( WriteDescriptorSetTensorARM const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType         sType           = StructureType::eWriteDescriptorSetTensorARM;
-    const void *          pNext           = {};
-    uint32_t              tensorViewCount = {};
-    const TensorViewARM * pTensorViews    = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteDescriptorSetTensorARM>
-  {
-    using Type = WriteDescriptorSetTensorARM;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eWriteDescriptorSetTensorARM>
-  {
-    using Type = WriteDescriptorSetTensorARM;
-  };
-
-  // wrapper struct for struct VkWriteIndirectExecutionSetPipelineEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteIndirectExecutionSetPipelineEXT.html
-  struct WriteIndirectExecutionSetPipelineEXT
-  {
-    using NativeType = VkWriteIndirectExecutionSetPipelineEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteIndirectExecutionSetPipelineEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR
-      WriteIndirectExecutionSetPipelineEXT( uint32_t index_ = {}, Pipeline pipeline_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , index{ index_ }
-      , pipeline{ pipeline_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR WriteIndirectExecutionSetPipelineEXT( WriteIndirectExecutionSetPipelineEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    WriteIndirectExecutionSetPipelineEXT( VkWriteIndirectExecutionSetPipelineEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : WriteIndirectExecutionSetPipelineEXT( *reinterpret_cast<WriteIndirectExecutionSetPipelineEXT const *>( &rhs ) )
-    {
-    }
-
-    WriteIndirectExecutionSetPipelineEXT & operator=( WriteIndirectExecutionSetPipelineEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    WriteIndirectExecutionSetPipelineEXT & operator=( VkWriteIndirectExecutionSetPipelineEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<WriteIndirectExecutionSetPipelineEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetPipelineEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetPipelineEXT & setIndex( uint32_t index_ ) VULKAN_HPP_NOEXCEPT
-    {
-      index = index_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetPipelineEXT & setPipeline( Pipeline pipeline_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pipeline = pipeline_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkWriteIndirectExecutionSetPipelineEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkWriteIndirectExecutionSetPipelineEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetPipelineEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkWriteIndirectExecutionSetPipelineEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetPipelineEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteIndirectExecutionSetPipelineEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetPipelineEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteIndirectExecutionSetPipelineEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, Pipeline const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, index, pipeline );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( WriteIndirectExecutionSetPipelineEXT const & ) const = default;
-#else
-    bool operator==( WriteIndirectExecutionSetPipelineEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( index == rhs.index ) && ( pipeline == rhs.pipeline );
-#  endif
-    }
-
-    bool operator!=( WriteIndirectExecutionSetPipelineEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType    = StructureType::eWriteIndirectExecutionSetPipelineEXT;
-    const void *  pNext    = {};
-    uint32_t      index    = {};
-    Pipeline      pipeline = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteIndirectExecutionSetPipelineEXT>
-  {
-    using Type = WriteIndirectExecutionSetPipelineEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eWriteIndirectExecutionSetPipelineEXT>
-  {
-    using Type = WriteIndirectExecutionSetPipelineEXT;
-  };
-
-  // wrapper struct for struct VkWriteIndirectExecutionSetShaderEXT, see
-  // https://registry.khronos.org/vulkan/specs/latest/man/html/VkWriteIndirectExecutionSetShaderEXT.html
-  struct WriteIndirectExecutionSetShaderEXT
-  {
-    using NativeType = VkWriteIndirectExecutionSetShaderEXT;
-
-    static const bool                                  allowDuplicate = false;
-    static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eWriteIndirectExecutionSetShaderEXT;
-
-#if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR WriteIndirectExecutionSetShaderEXT( uint32_t index_ = {}, ShaderEXT shader_ = {}, const void * pNext_ = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , index{ index_ }
-      , shader{ shader_ }
-    {
-    }
-
-    VULKAN_HPP_CONSTEXPR WriteIndirectExecutionSetShaderEXT( WriteIndirectExecutionSetShaderEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-
-    WriteIndirectExecutionSetShaderEXT( VkWriteIndirectExecutionSetShaderEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-      : WriteIndirectExecutionSetShaderEXT( *reinterpret_cast<WriteIndirectExecutionSetShaderEXT const *>( &rhs ) )
-    {
-    }
-
-    WriteIndirectExecutionSetShaderEXT & operator=( WriteIndirectExecutionSetShaderEXT const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
-
-    WriteIndirectExecutionSetShaderEXT & operator=( VkWriteIndirectExecutionSetShaderEXT const & rhs ) VULKAN_HPP_NOEXCEPT
-    {
-      *this = *reinterpret_cast<WriteIndirectExecutionSetShaderEXT const *>( &rhs );
-      return *this;
-    }
-
-#if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetShaderEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
-    {
-      pNext = pNext_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetShaderEXT & setIndex( uint32_t index_ ) VULKAN_HPP_NOEXCEPT
-    {
-      index = index_;
-      return *this;
-    }
-
-    VULKAN_HPP_CONSTEXPR_14 WriteIndirectExecutionSetShaderEXT & setShader( ShaderEXT shader_ ) VULKAN_HPP_NOEXCEPT
-    {
-      shader = shader_;
-      return *this;
-    }
-#endif /*VULKAN_HPP_NO_SETTERS*/
-
-    operator VkWriteIndirectExecutionSetShaderEXT const &() const VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<const VkWriteIndirectExecutionSetShaderEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetShaderEXT &() VULKAN_HPP_NOEXCEPT
-    {
-      return *reinterpret_cast<VkWriteIndirectExecutionSetShaderEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetShaderEXT const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkWriteIndirectExecutionSetShaderEXT *>( this );
-    }
-
-    operator VkWriteIndirectExecutionSetShaderEXT *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkWriteIndirectExecutionSetShaderEXT *>( this );
-    }
-
-#if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, uint32_t const &, ShaderEXT const &> reflect() const VULKAN_HPP_NOEXCEPT
-    {
-      return std::tie( sType, pNext, index, shader );
-    }
-#endif
-
-#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
-    auto operator<=>( WriteIndirectExecutionSetShaderEXT const & ) const = default;
-#else
-    bool operator==( WriteIndirectExecutionSetShaderEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-#  if defined( VULKAN_HPP_USE_REFLECT )
-      return this->reflect() == rhs.reflect();
-#  else
-      return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( index == rhs.index ) && ( shader == rhs.shader );
-#  endif
-    }
-
-    bool operator!=( WriteIndirectExecutionSetShaderEXT const & rhs ) const VULKAN_HPP_NOEXCEPT
-    {
-      return !operator==( rhs );
-    }
-#endif
-
-  public:
-    StructureType sType  = StructureType::eWriteIndirectExecutionSetShaderEXT;
-    const void *  pNext  = {};
-    uint32_t      index  = {};
-    ShaderEXT     shader = {};
-  };
-
-#if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkWriteIndirectExecutionSetShaderEXT>
-  {
-    using Type = WriteIndirectExecutionSetShaderEXT;
-  };
-#endif
-
-  template <>
-  struct CppType<StructureType, StructureType::eWriteIndirectExecutionSetShaderEXT>
-  {
-    using Type = WriteIndirectExecutionSetShaderEXT;
-  };
-
 #if defined( VK_USE_PLATFORM_XCB_KHR )
-  // wrapper struct for struct VkXcbSurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkXcbSurfaceCreateInfoKHR.html
   struct XcbSurfaceCreateInfoKHR
   {
     using NativeType = VkXcbSurfaceCreateInfoKHR;
@@ -175274,15 +125995,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eXcbSurfaceCreateInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR XcbSurfaceCreateInfoKHR( XcbSurfaceCreateFlagsKHR flags_      = {},
-                                                  xcb_connection_t *       connection_ = {},
-                                                  xcb_window_t             window_     = {},
-                                                  const void *             pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , connection{ connection_ }
-      , window{ window_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR XcbSurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::XcbSurfaceCreateFlagsKHR flags_      = {},
+                                                  xcb_connection_t *                             connection_ = {},
+                                                  xcb_window_t                                   window_     = {},
+                                                  const void *                                   pNext_      = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , connection( connection_ )
+      , window( window_ )
     {
     }
 
@@ -175294,22 +126015,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     XcbSurfaceCreateInfoKHR & operator=( XcbSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     XcbSurfaceCreateInfoKHR & operator=( VkXcbSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<XcbSurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::XcbSurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 XcbSurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 XcbSurfaceCreateInfoKHR & setFlags( XcbSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 XcbSurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::XcbSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -175326,7 +126047,7 @@ namespace VULKAN_HPP_NAMESPACE
       window = window_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkXcbSurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -175338,18 +126059,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkXcbSurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkXcbSurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkXcbSurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkXcbSurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkXcbSurfaceCreateInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, XcbSurfaceCreateFlagsKHR const &, xcb_connection_t * const &, xcb_window_t const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::XcbSurfaceCreateFlagsKHR const &,
+               xcb_connection_t * const &,
+               xcb_window_t const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, connection, window );
@@ -175386,21 +126105,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType            sType      = StructureType::eXcbSurfaceCreateInfoKHR;
-    const void *             pNext      = {};
-    XcbSurfaceCreateFlagsKHR flags      = {};
-    xcb_connection_t *       connection = {};
-    xcb_window_t             window     = {};
+    VULKAN_HPP_NAMESPACE::StructureType            sType      = StructureType::eXcbSurfaceCreateInfoKHR;
+    const void *                                   pNext      = {};
+    VULKAN_HPP_NAMESPACE::XcbSurfaceCreateFlagsKHR flags      = {};
+    xcb_connection_t *                             connection = {};
+    xcb_window_t                                   window     = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkXcbSurfaceCreateInfoKHR>
-  {
-    using Type = XcbSurfaceCreateInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eXcbSurfaceCreateInfoKHR>
   {
@@ -175409,7 +126120,6 @@ namespace VULKAN_HPP_NAMESPACE
 #endif /*VK_USE_PLATFORM_XCB_KHR*/
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
-  // wrapper struct for struct VkXlibSurfaceCreateInfoKHR, see https://registry.khronos.org/vulkan/specs/latest/man/html/VkXlibSurfaceCreateInfoKHR.html
   struct XlibSurfaceCreateInfoKHR
   {
     using NativeType = VkXlibSurfaceCreateInfoKHR;
@@ -175417,15 +126127,15 @@ namespace VULKAN_HPP_NAMESPACE
     static const bool                                  allowDuplicate = false;
     static VULKAN_HPP_CONST_OR_CONSTEXPR StructureType structureType  = StructureType::eXlibSurfaceCreateInfoKHR;
 
-#  if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
-    VULKAN_HPP_CONSTEXPR XlibSurfaceCreateInfoKHR( XlibSurfaceCreateFlagsKHR flags_  = {},
-                                                   Display *                 dpy_    = {},
-                                                   Window                    window_ = {},
-                                                   const void *              pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
-      : pNext{ pNext_ }
-      , flags{ flags_ }
-      , dpy{ dpy_ }
-      , window{ window_ }
+#  if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
+    VULKAN_HPP_CONSTEXPR XlibSurfaceCreateInfoKHR( VULKAN_HPP_NAMESPACE::XlibSurfaceCreateFlagsKHR flags_  = {},
+                                                   Display *                                       dpy_    = {},
+                                                   Window                                          window_ = {},
+                                                   const void *                                    pNext_  = nullptr ) VULKAN_HPP_NOEXCEPT
+      : pNext( pNext_ )
+      , flags( flags_ )
+      , dpy( dpy_ )
+      , window( window_ )
     {
     }
 
@@ -175437,22 +126147,22 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     XlibSurfaceCreateInfoKHR & operator=( XlibSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT = default;
-#  endif /*VULKAN_HPP_NO_CONSTRUCTORS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_CONSTRUCTORS*/
 
     XlibSurfaceCreateInfoKHR & operator=( VkXlibSurfaceCreateInfoKHR const & rhs ) VULKAN_HPP_NOEXCEPT
     {
-      *this = *reinterpret_cast<XlibSurfaceCreateInfoKHR const *>( &rhs );
+      *this = *reinterpret_cast<VULKAN_HPP_NAMESPACE::XlibSurfaceCreateInfoKHR const *>( &rhs );
       return *this;
     }
 
-#  if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
+#  if !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
     VULKAN_HPP_CONSTEXPR_14 XlibSurfaceCreateInfoKHR & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
       return *this;
     }
 
-    VULKAN_HPP_CONSTEXPR_14 XlibSurfaceCreateInfoKHR & setFlags( XlibSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
+    VULKAN_HPP_CONSTEXPR_14 XlibSurfaceCreateInfoKHR & setFlags( VULKAN_HPP_NAMESPACE::XlibSurfaceCreateFlagsKHR flags_ ) VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
       return *this;
@@ -175469,7 +126179,7 @@ namespace VULKAN_HPP_NAMESPACE
       window = window_;
       return *this;
     }
-#  endif /*VULKAN_HPP_NO_SETTERS*/
+#  endif /*VULKAN_HPP_NO_STRUCT_SETTERS*/
 
     operator VkXlibSurfaceCreateInfoKHR const &() const VULKAN_HPP_NOEXCEPT
     {
@@ -175481,18 +126191,16 @@ namespace VULKAN_HPP_NAMESPACE
       return *reinterpret_cast<VkXlibSurfaceCreateInfoKHR *>( this );
     }
 
-    operator VkXlibSurfaceCreateInfoKHR const *() const VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<const VkXlibSurfaceCreateInfoKHR *>( this );
-    }
-
-    operator VkXlibSurfaceCreateInfoKHR *() VULKAN_HPP_NOEXCEPT
-    {
-      return reinterpret_cast<VkXlibSurfaceCreateInfoKHR *>( this );
-    }
-
 #  if defined( VULKAN_HPP_USE_REFLECT )
-    std::tuple<StructureType const &, const void * const &, XlibSurfaceCreateFlagsKHR const &, Display * const &, Window const &>
+#    if 14 <= VULKAN_HPP_CPP_VERSION
+    auto
+#    else
+    std::tuple<VULKAN_HPP_NAMESPACE::StructureType const &,
+               const void * const &,
+               VULKAN_HPP_NAMESPACE::XlibSurfaceCreateFlagsKHR const &,
+               Display * const &,
+               Window const &>
+#    endif
       reflect() const VULKAN_HPP_NOEXCEPT
     {
       return std::tie( sType, pNext, flags, dpy, window );
@@ -175529,21 +126237,13 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
   public:
-    StructureType             sType  = StructureType::eXlibSurfaceCreateInfoKHR;
-    const void *              pNext  = {};
-    XlibSurfaceCreateFlagsKHR flags  = {};
-    Display *                 dpy    = {};
-    Window                    window = {};
+    VULKAN_HPP_NAMESPACE::StructureType             sType  = StructureType::eXlibSurfaceCreateInfoKHR;
+    const void *                                    pNext  = {};
+    VULKAN_HPP_NAMESPACE::XlibSurfaceCreateFlagsKHR flags  = {};
+    Display *                                       dpy    = {};
+    Window                                          window = {};
   };
 
-#  if 20 <= VULKAN_HPP_CPP_VERSION
-  template <>
-  struct CppType<VkXlibSurfaceCreateInfoKHR>
-  {
-    using Type = XlibSurfaceCreateInfoKHR;
-  };
-#  endif
-
   template <>
   struct CppType<StructureType, StructureType::eXlibSurfaceCreateInfoKHR>
   {
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_to_string.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_to_string.hpp
index e918f7e0..011f7874 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_to_string.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_to_string.hpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2025 The Khronos Group Inc.
+// Copyright 2015-2024 The Khronos Group Inc.
 //
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
@@ -8,25 +8,12 @@
 #ifndef VULKAN_TO_STRING_HPP
 #define VULKAN_TO_STRING_HPP
 
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  include <vulkan/vulkan.hpp>
-#endif
+#include <vulkan/vulkan_enums.hpp>
 
-// ignore warnings on using deprecated enum values in this header
-#if defined( __clang__ ) || defined( __GNUC__ )
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined( _MSC_VER )
-#  pragma warning( push )
-#  pragma warning( disable : 4996 )
-#endif
-
-#if !defined( VULKAN_HPP_CXX_MODULE )
-#  if defined( __cpp_lib_format )
-#    include <format>  // std::format
-#  else
-#    include <sstream>  // std::stringstream
-#  endif
+#if __cpp_lib_format
+#  include <format>  // std::format
+#else
+#  include <sstream>  // std::stringstream
 #endif
 
 namespace VULKAN_HPP_NAMESPACE
@@ -40,2325 +27,1950 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( FormatFeatureFlags value )
   {
-    std::string result = "{";
-    if ( value & FormatFeatureFlagBits::eSampledImage )
-      result += " SampledImage |";
-    if ( value & FormatFeatureFlagBits::eStorageImage )
-      result += " StorageImage |";
-    if ( value & FormatFeatureFlagBits::eStorageImageAtomic )
-      result += " StorageImageAtomic |";
-    if ( value & FormatFeatureFlagBits::eUniformTexelBuffer )
-      result += " UniformTexelBuffer |";
-    if ( value & FormatFeatureFlagBits::eStorageTexelBuffer )
-      result += " StorageTexelBuffer |";
-    if ( value & FormatFeatureFlagBits::eStorageTexelBufferAtomic )
-      result += " StorageTexelBufferAtomic |";
-    if ( value & FormatFeatureFlagBits::eVertexBuffer )
-      result += " VertexBuffer |";
-    if ( value & FormatFeatureFlagBits::eColorAttachment )
-      result += " ColorAttachment |";
-    if ( value & FormatFeatureFlagBits::eColorAttachmentBlend )
-      result += " ColorAttachmentBlend |";
-    if ( value & FormatFeatureFlagBits::eDepthStencilAttachment )
-      result += " DepthStencilAttachment |";
-    if ( value & FormatFeatureFlagBits::eBlitSrc )
-      result += " BlitSrc |";
-    if ( value & FormatFeatureFlagBits::eBlitDst )
-      result += " BlitDst |";
-    if ( value & FormatFeatureFlagBits::eSampledImageFilterLinear )
-      result += " SampledImageFilterLinear |";
-    if ( value & FormatFeatureFlagBits::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & FormatFeatureFlagBits::eTransferDst )
-      result += " TransferDst |";
-    if ( value & FormatFeatureFlagBits::eMidpointChromaSamples )
-      result += " MidpointChromaSamples |";
-    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionLinearFilter )
-      result += " SampledImageYcbcrConversionLinearFilter |";
-    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionSeparateReconstructionFilter )
-      result += " SampledImageYcbcrConversionSeparateReconstructionFilter |";
-    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicit )
-      result += " SampledImageYcbcrConversionChromaReconstructionExplicit |";
-    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable )
-      result += " SampledImageYcbcrConversionChromaReconstructionExplicitForceable |";
-    if ( value & FormatFeatureFlagBits::eDisjoint )
-      result += " Disjoint |";
-    if ( value & FormatFeatureFlagBits::eCositedChromaSamples )
-      result += " CositedChromaSamples |";
-    if ( value & FormatFeatureFlagBits::eSampledImageFilterMinmax )
-      result += " SampledImageFilterMinmax |";
-    if ( value & FormatFeatureFlagBits::eVideoDecodeOutputKHR )
-      result += " VideoDecodeOutputKHR |";
-    if ( value & FormatFeatureFlagBits::eVideoDecodeDpbKHR )
-      result += " VideoDecodeDpbKHR |";
-    if ( value & FormatFeatureFlagBits::eAccelerationStructureVertexBufferKHR )
-      result += " AccelerationStructureVertexBufferKHR |";
-    if ( value & FormatFeatureFlagBits::eSampledImageFilterCubicEXT )
-      result += " SampledImageFilterCubicEXT |";
-    if ( value & FormatFeatureFlagBits::eFragmentDensityMapEXT )
-      result += " FragmentDensityMapEXT |";
-    if ( value & FormatFeatureFlagBits::eFragmentShadingRateAttachmentKHR )
-      result += " FragmentShadingRateAttachmentKHR |";
-    if ( value & FormatFeatureFlagBits::eVideoEncodeInputKHR )
-      result += " VideoEncodeInputKHR |";
-    if ( value & FormatFeatureFlagBits::eVideoEncodeDpbKHR )
-      result += " VideoEncodeDpbKHR |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & FormatFeatureFlagBits::eSampledImage )
+      result += "SampledImage | ";
+    if ( value & FormatFeatureFlagBits::eStorageImage )
+      result += "StorageImage | ";
+    if ( value & FormatFeatureFlagBits::eStorageImageAtomic )
+      result += "StorageImageAtomic | ";
+    if ( value & FormatFeatureFlagBits::eUniformTexelBuffer )
+      result += "UniformTexelBuffer | ";
+    if ( value & FormatFeatureFlagBits::eStorageTexelBuffer )
+      result += "StorageTexelBuffer | ";
+    if ( value & FormatFeatureFlagBits::eStorageTexelBufferAtomic )
+      result += "StorageTexelBufferAtomic | ";
+    if ( value & FormatFeatureFlagBits::eVertexBuffer )
+      result += "VertexBuffer | ";
+    if ( value & FormatFeatureFlagBits::eColorAttachment )
+      result += "ColorAttachment | ";
+    if ( value & FormatFeatureFlagBits::eColorAttachmentBlend )
+      result += "ColorAttachmentBlend | ";
+    if ( value & FormatFeatureFlagBits::eDepthStencilAttachment )
+      result += "DepthStencilAttachment | ";
+    if ( value & FormatFeatureFlagBits::eBlitSrc )
+      result += "BlitSrc | ";
+    if ( value & FormatFeatureFlagBits::eBlitDst )
+      result += "BlitDst | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageFilterLinear )
+      result += "SampledImageFilterLinear | ";
+    if ( value & FormatFeatureFlagBits::eTransferSrc )
+      result += "TransferSrc | ";
+    if ( value & FormatFeatureFlagBits::eTransferDst )
+      result += "TransferDst | ";
+    if ( value & FormatFeatureFlagBits::eMidpointChromaSamples )
+      result += "MidpointChromaSamples | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionLinearFilter )
+      result += "SampledImageYcbcrConversionLinearFilter | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionSeparateReconstructionFilter )
+      result += "SampledImageYcbcrConversionSeparateReconstructionFilter | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicit )
+      result += "SampledImageYcbcrConversionChromaReconstructionExplicit | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable )
+      result += "SampledImageYcbcrConversionChromaReconstructionExplicitForceable | ";
+    if ( value & FormatFeatureFlagBits::eDisjoint )
+      result += "Disjoint | ";
+    if ( value & FormatFeatureFlagBits::eCositedChromaSamples )
+      result += "CositedChromaSamples | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageFilterMinmax )
+      result += "SampledImageFilterMinmax | ";
+    if ( value & FormatFeatureFlagBits::eVideoDecodeOutputKHR )
+      result += "VideoDecodeOutputKHR | ";
+    if ( value & FormatFeatureFlagBits::eVideoDecodeDpbKHR )
+      result += "VideoDecodeDpbKHR | ";
+    if ( value & FormatFeatureFlagBits::eAccelerationStructureVertexBufferKHR )
+      result += "AccelerationStructureVertexBufferKHR | ";
+    if ( value & FormatFeatureFlagBits::eSampledImageFilterCubicEXT )
+      result += "SampledImageFilterCubicEXT | ";
+    if ( value & FormatFeatureFlagBits::eFragmentDensityMapEXT )
+      result += "FragmentDensityMapEXT | ";
+    if ( value & FormatFeatureFlagBits::eFragmentShadingRateAttachmentKHR )
+      result += "FragmentShadingRateAttachmentKHR | ";
+    if ( value & FormatFeatureFlagBits::eVideoEncodeInputKHR )
+      result += "VideoEncodeInputKHR | ";
+    if ( value & FormatFeatureFlagBits::eVideoEncodeDpbKHR )
+      result += "VideoEncodeDpbKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ImageCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & ImageCreateFlagBits::eSparseBinding )
-      result += " SparseBinding |";
-    if ( value & ImageCreateFlagBits::eSparseResidency )
-      result += " SparseResidency |";
-    if ( value & ImageCreateFlagBits::eSparseAliased )
-      result += " SparseAliased |";
-    if ( value & ImageCreateFlagBits::eMutableFormat )
-      result += " MutableFormat |";
-    if ( value & ImageCreateFlagBits::eCubeCompatible )
-      result += " CubeCompatible |";
-    if ( value & ImageCreateFlagBits::eAlias )
-      result += " Alias |";
-    if ( value & ImageCreateFlagBits::eSplitInstanceBindRegions )
-      result += " SplitInstanceBindRegions |";
-    if ( value & ImageCreateFlagBits::e2DArrayCompatible )
-      result += " 2DArrayCompatible |";
-    if ( value & ImageCreateFlagBits::eBlockTexelViewCompatible )
-      result += " BlockTexelViewCompatible |";
-    if ( value & ImageCreateFlagBits::eExtendedUsage )
-      result += " ExtendedUsage |";
-    if ( value & ImageCreateFlagBits::eProtected )
-      result += " Protected |";
-    if ( value & ImageCreateFlagBits::eDisjoint )
-      result += " Disjoint |";
-    if ( value & ImageCreateFlagBits::eCornerSampledNV )
-      result += " CornerSampledNV |";
-    if ( value & ImageCreateFlagBits::eSampleLocationsCompatibleDepthEXT )
-      result += " SampleLocationsCompatibleDepthEXT |";
-    if ( value & ImageCreateFlagBits::eSubsampledEXT )
-      result += " SubsampledEXT |";
-    if ( value & ImageCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
-      result += " DescriptorBufferCaptureReplayEXT |";
-    if ( value & ImageCreateFlagBits::eMultisampledRenderToSingleSampledEXT )
-      result += " MultisampledRenderToSingleSampledEXT |";
-    if ( value & ImageCreateFlagBits::e2DViewCompatibleEXT )
-      result += " 2DViewCompatibleEXT |";
-    if ( value & ImageCreateFlagBits::eVideoProfileIndependentKHR )
-      result += " VideoProfileIndependentKHR |";
-    if ( value & ImageCreateFlagBits::eFragmentDensityMapOffsetEXT )
-      result += " FragmentDensityMapOffsetEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ImageCreateFlagBits::eSparseBinding )
+      result += "SparseBinding | ";
+    if ( value & ImageCreateFlagBits::eSparseResidency )
+      result += "SparseResidency | ";
+    if ( value & ImageCreateFlagBits::eSparseAliased )
+      result += "SparseAliased | ";
+    if ( value & ImageCreateFlagBits::eMutableFormat )
+      result += "MutableFormat | ";
+    if ( value & ImageCreateFlagBits::eCubeCompatible )
+      result += "CubeCompatible | ";
+    if ( value & ImageCreateFlagBits::eAlias )
+      result += "Alias | ";
+    if ( value & ImageCreateFlagBits::eSplitInstanceBindRegions )
+      result += "SplitInstanceBindRegions | ";
+    if ( value & ImageCreateFlagBits::e2DArrayCompatible )
+      result += "2DArrayCompatible | ";
+    if ( value & ImageCreateFlagBits::eBlockTexelViewCompatible )
+      result += "BlockTexelViewCompatible | ";
+    if ( value & ImageCreateFlagBits::eExtendedUsage )
+      result += "ExtendedUsage | ";
+    if ( value & ImageCreateFlagBits::eProtected )
+      result += "Protected | ";
+    if ( value & ImageCreateFlagBits::eDisjoint )
+      result += "Disjoint | ";
+    if ( value & ImageCreateFlagBits::eCornerSampledNV )
+      result += "CornerSampledNV | ";
+    if ( value & ImageCreateFlagBits::eSampleLocationsCompatibleDepthEXT )
+      result += "SampleLocationsCompatibleDepthEXT | ";
+    if ( value & ImageCreateFlagBits::eSubsampledEXT )
+      result += "SubsampledEXT | ";
+    if ( value & ImageCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
+      result += "DescriptorBufferCaptureReplayEXT | ";
+    if ( value & ImageCreateFlagBits::eMultisampledRenderToSingleSampledEXT )
+      result += "MultisampledRenderToSingleSampledEXT | ";
+    if ( value & ImageCreateFlagBits::e2DViewCompatibleEXT )
+      result += "2DViewCompatibleEXT | ";
+    if ( value & ImageCreateFlagBits::eFragmentDensityMapOffsetQCOM )
+      result += "FragmentDensityMapOffsetQCOM | ";
+    if ( value & ImageCreateFlagBits::eVideoProfileIndependentKHR )
+      result += "VideoProfileIndependentKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ImageUsageFlags value )
   {
-    std::string result = "{";
-    if ( value & ImageUsageFlagBits::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & ImageUsageFlagBits::eTransferDst )
-      result += " TransferDst |";
-    if ( value & ImageUsageFlagBits::eSampled )
-      result += " Sampled |";
-    if ( value & ImageUsageFlagBits::eStorage )
-      result += " Storage |";
-    if ( value & ImageUsageFlagBits::eColorAttachment )
-      result += " ColorAttachment |";
-    if ( value & ImageUsageFlagBits::eDepthStencilAttachment )
-      result += " DepthStencilAttachment |";
-    if ( value & ImageUsageFlagBits::eTransientAttachment )
-      result += " TransientAttachment |";
-    if ( value & ImageUsageFlagBits::eInputAttachment )
-      result += " InputAttachment |";
-    if ( value & ImageUsageFlagBits::eHostTransfer )
-      result += " HostTransfer |";
-    if ( value & ImageUsageFlagBits::eVideoDecodeDstKHR )
-      result += " VideoDecodeDstKHR |";
-    if ( value & ImageUsageFlagBits::eVideoDecodeSrcKHR )
-      result += " VideoDecodeSrcKHR |";
-    if ( value & ImageUsageFlagBits::eVideoDecodeDpbKHR )
-      result += " VideoDecodeDpbKHR |";
-    if ( value & ImageUsageFlagBits::eFragmentDensityMapEXT )
-      result += " FragmentDensityMapEXT |";
-    if ( value & ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR )
-      result += " FragmentShadingRateAttachmentKHR |";
-    if ( value & ImageUsageFlagBits::eVideoEncodeDstKHR )
-      result += " VideoEncodeDstKHR |";
-    if ( value & ImageUsageFlagBits::eVideoEncodeSrcKHR )
-      result += " VideoEncodeSrcKHR |";
-    if ( value & ImageUsageFlagBits::eVideoEncodeDpbKHR )
-      result += " VideoEncodeDpbKHR |";
-    if ( value & ImageUsageFlagBits::eAttachmentFeedbackLoopEXT )
-      result += " AttachmentFeedbackLoopEXT |";
-    if ( value & ImageUsageFlagBits::eInvocationMaskHUAWEI )
-      result += " InvocationMaskHUAWEI |";
-    if ( value & ImageUsageFlagBits::eSampleWeightQCOM )
-      result += " SampleWeightQCOM |";
-    if ( value & ImageUsageFlagBits::eSampleBlockMatchQCOM )
-      result += " SampleBlockMatchQCOM |";
-    if ( value & ImageUsageFlagBits::eTensorAliasingARM )
-      result += " TensorAliasingARM |";
-    if ( value & ImageUsageFlagBits::eTileMemoryQCOM )
-      result += " TileMemoryQCOM |";
-    if ( value & ImageUsageFlagBits::eVideoEncodeQuantizationDeltaMapKHR )
-      result += " VideoEncodeQuantizationDeltaMapKHR |";
-    if ( value & ImageUsageFlagBits::eVideoEncodeEmphasisMapKHR )
-      result += " VideoEncodeEmphasisMapKHR |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ImageUsageFlagBits::eTransferSrc )
+      result += "TransferSrc | ";
+    if ( value & ImageUsageFlagBits::eTransferDst )
+      result += "TransferDst | ";
+    if ( value & ImageUsageFlagBits::eSampled )
+      result += "Sampled | ";
+    if ( value & ImageUsageFlagBits::eStorage )
+      result += "Storage | ";
+    if ( value & ImageUsageFlagBits::eColorAttachment )
+      result += "ColorAttachment | ";
+    if ( value & ImageUsageFlagBits::eDepthStencilAttachment )
+      result += "DepthStencilAttachment | ";
+    if ( value & ImageUsageFlagBits::eTransientAttachment )
+      result += "TransientAttachment | ";
+    if ( value & ImageUsageFlagBits::eInputAttachment )
+      result += "InputAttachment | ";
+    if ( value & ImageUsageFlagBits::eVideoDecodeDstKHR )
+      result += "VideoDecodeDstKHR | ";
+    if ( value & ImageUsageFlagBits::eVideoDecodeSrcKHR )
+      result += "VideoDecodeSrcKHR | ";
+    if ( value & ImageUsageFlagBits::eVideoDecodeDpbKHR )
+      result += "VideoDecodeDpbKHR | ";
+    if ( value & ImageUsageFlagBits::eFragmentDensityMapEXT )
+      result += "FragmentDensityMapEXT | ";
+    if ( value & ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR )
+      result += "FragmentShadingRateAttachmentKHR | ";
+    if ( value & ImageUsageFlagBits::eHostTransferEXT )
+      result += "HostTransferEXT | ";
+    if ( value & ImageUsageFlagBits::eVideoEncodeDstKHR )
+      result += "VideoEncodeDstKHR | ";
+    if ( value & ImageUsageFlagBits::eVideoEncodeSrcKHR )
+      result += "VideoEncodeSrcKHR | ";
+    if ( value & ImageUsageFlagBits::eVideoEncodeDpbKHR )
+      result += "VideoEncodeDpbKHR | ";
+    if ( value & ImageUsageFlagBits::eAttachmentFeedbackLoopEXT )
+      result += "AttachmentFeedbackLoopEXT | ";
+    if ( value & ImageUsageFlagBits::eInvocationMaskHUAWEI )
+      result += "InvocationMaskHUAWEI | ";
+    if ( value & ImageUsageFlagBits::eSampleWeightQCOM )
+      result += "SampleWeightQCOM | ";
+    if ( value & ImageUsageFlagBits::eSampleBlockMatchQCOM )
+      result += "SampleBlockMatchQCOM | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( InstanceCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & InstanceCreateFlagBits::eEnumeratePortabilityKHR )
-      result += " EnumeratePortabilityKHR |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & InstanceCreateFlagBits::eEnumeratePortabilityKHR )
+      result += "EnumeratePortabilityKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( MemoryHeapFlags value )
   {
-    std::string result = "{";
-    if ( value & MemoryHeapFlagBits::eDeviceLocal )
-      result += " DeviceLocal |";
-    if ( value & MemoryHeapFlagBits::eMultiInstance )
-      result += " MultiInstance |";
-    if ( value & MemoryHeapFlagBits::eTileMemoryQCOM )
-      result += " TileMemoryQCOM |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & MemoryHeapFlagBits::eDeviceLocal )
+      result += "DeviceLocal | ";
+    if ( value & MemoryHeapFlagBits::eMultiInstance )
+      result += "MultiInstance | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( MemoryPropertyFlags value )
   {
-    std::string result = "{";
-    if ( value & MemoryPropertyFlagBits::eDeviceLocal )
-      result += " DeviceLocal |";
-    if ( value & MemoryPropertyFlagBits::eHostVisible )
-      result += " HostVisible |";
-    if ( value & MemoryPropertyFlagBits::eHostCoherent )
-      result += " HostCoherent |";
-    if ( value & MemoryPropertyFlagBits::eHostCached )
-      result += " HostCached |";
-    if ( value & MemoryPropertyFlagBits::eLazilyAllocated )
-      result += " LazilyAllocated |";
-    if ( value & MemoryPropertyFlagBits::eProtected )
-      result += " Protected |";
-    if ( value & MemoryPropertyFlagBits::eDeviceCoherentAMD )
-      result += " DeviceCoherentAMD |";
-    if ( value & MemoryPropertyFlagBits::eDeviceUncachedAMD )
-      result += " DeviceUncachedAMD |";
-    if ( value & MemoryPropertyFlagBits::eRdmaCapableNV )
-      result += " RdmaCapableNV |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & MemoryPropertyFlagBits::eDeviceLocal )
+      result += "DeviceLocal | ";
+    if ( value & MemoryPropertyFlagBits::eHostVisible )
+      result += "HostVisible | ";
+    if ( value & MemoryPropertyFlagBits::eHostCoherent )
+      result += "HostCoherent | ";
+    if ( value & MemoryPropertyFlagBits::eHostCached )
+      result += "HostCached | ";
+    if ( value & MemoryPropertyFlagBits::eLazilyAllocated )
+      result += "LazilyAllocated | ";
+    if ( value & MemoryPropertyFlagBits::eProtected )
+      result += "Protected | ";
+    if ( value & MemoryPropertyFlagBits::eDeviceCoherentAMD )
+      result += "DeviceCoherentAMD | ";
+    if ( value & MemoryPropertyFlagBits::eDeviceUncachedAMD )
+      result += "DeviceUncachedAMD | ";
+    if ( value & MemoryPropertyFlagBits::eRdmaCapableNV )
+      result += "RdmaCapableNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( QueueFlags value )
   {
-    std::string result = "{";
-    if ( value & QueueFlagBits::eGraphics )
-      result += " Graphics |";
-    if ( value & QueueFlagBits::eCompute )
-      result += " Compute |";
-    if ( value & QueueFlagBits::eTransfer )
-      result += " Transfer |";
-    if ( value & QueueFlagBits::eSparseBinding )
-      result += " SparseBinding |";
-    if ( value & QueueFlagBits::eProtected )
-      result += " Protected |";
-    if ( value & QueueFlagBits::eVideoDecodeKHR )
-      result += " VideoDecodeKHR |";
-    if ( value & QueueFlagBits::eVideoEncodeKHR )
-      result += " VideoEncodeKHR |";
-    if ( value & QueueFlagBits::eOpticalFlowNV )
-      result += " OpticalFlowNV |";
-    if ( value & QueueFlagBits::eDataGraphARM )
-      result += " DataGraphARM |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & QueueFlagBits::eGraphics )
+      result += "Graphics | ";
+    if ( value & QueueFlagBits::eCompute )
+      result += "Compute | ";
+    if ( value & QueueFlagBits::eTransfer )
+      result += "Transfer | ";
+    if ( value & QueueFlagBits::eSparseBinding )
+      result += "SparseBinding | ";
+    if ( value & QueueFlagBits::eProtected )
+      result += "Protected | ";
+    if ( value & QueueFlagBits::eVideoDecodeKHR )
+      result += "VideoDecodeKHR | ";
+    if ( value & QueueFlagBits::eVideoEncodeKHR )
+      result += "VideoEncodeKHR | ";
+    if ( value & QueueFlagBits::eOpticalFlowNV )
+      result += "OpticalFlowNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SampleCountFlags value )
   {
-    std::string result = "{";
-    if ( value & SampleCountFlagBits::e1 )
-      result += " 1 |";
-    if ( value & SampleCountFlagBits::e2 )
-      result += " 2 |";
-    if ( value & SampleCountFlagBits::e4 )
-      result += " 4 |";
-    if ( value & SampleCountFlagBits::e8 )
-      result += " 8 |";
-    if ( value & SampleCountFlagBits::e16 )
-      result += " 16 |";
-    if ( value & SampleCountFlagBits::e32 )
-      result += " 32 |";
-    if ( value & SampleCountFlagBits::e64 )
-      result += " 64 |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SampleCountFlagBits::e1 )
+      result += "1 | ";
+    if ( value & SampleCountFlagBits::e2 )
+      result += "2 | ";
+    if ( value & SampleCountFlagBits::e4 )
+      result += "4 | ";
+    if ( value & SampleCountFlagBits::e8 )
+      result += "8 | ";
+    if ( value & SampleCountFlagBits::e16 )
+      result += "16 | ";
+    if ( value & SampleCountFlagBits::e32 )
+      result += "32 | ";
+    if ( value & SampleCountFlagBits::e64 )
+      result += "64 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceCreateFlags )
+  VULKAN_HPP_INLINE std::string to_string( DeviceCreateFlags )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DeviceQueueCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & DeviceQueueCreateFlagBits::eProtected )
-      result += " Protected |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DeviceQueueCreateFlagBits::eProtected )
+      result += "Protected | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineStageFlags value )
   {
-    std::string result = "{";
-    if ( value & PipelineStageFlagBits::eTopOfPipe )
-      result += " TopOfPipe |";
-    if ( value & PipelineStageFlagBits::eDrawIndirect )
-      result += " DrawIndirect |";
-    if ( value & PipelineStageFlagBits::eVertexInput )
-      result += " VertexInput |";
-    if ( value & PipelineStageFlagBits::eVertexShader )
-      result += " VertexShader |";
-    if ( value & PipelineStageFlagBits::eTessellationControlShader )
-      result += " TessellationControlShader |";
-    if ( value & PipelineStageFlagBits::eTessellationEvaluationShader )
-      result += " TessellationEvaluationShader |";
-    if ( value & PipelineStageFlagBits::eGeometryShader )
-      result += " GeometryShader |";
-    if ( value & PipelineStageFlagBits::eFragmentShader )
-      result += " FragmentShader |";
-    if ( value & PipelineStageFlagBits::eEarlyFragmentTests )
-      result += " EarlyFragmentTests |";
-    if ( value & PipelineStageFlagBits::eLateFragmentTests )
-      result += " LateFragmentTests |";
-    if ( value & PipelineStageFlagBits::eColorAttachmentOutput )
-      result += " ColorAttachmentOutput |";
-    if ( value & PipelineStageFlagBits::eComputeShader )
-      result += " ComputeShader |";
-    if ( value & PipelineStageFlagBits::eTransfer )
-      result += " Transfer |";
-    if ( value & PipelineStageFlagBits::eBottomOfPipe )
-      result += " BottomOfPipe |";
-    if ( value & PipelineStageFlagBits::eHost )
-      result += " Host |";
-    if ( value & PipelineStageFlagBits::eAllGraphics )
-      result += " AllGraphics |";
-    if ( value & PipelineStageFlagBits::eAllCommands )
-      result += " AllCommands |";
-    if ( value & PipelineStageFlagBits::eTransformFeedbackEXT )
-      result += " TransformFeedbackEXT |";
-    if ( value & PipelineStageFlagBits::eConditionalRenderingEXT )
-      result += " ConditionalRenderingEXT |";
-    if ( value & PipelineStageFlagBits::eAccelerationStructureBuildKHR )
-      result += " AccelerationStructureBuildKHR |";
-    if ( value & PipelineStageFlagBits::eRayTracingShaderKHR )
-      result += " RayTracingShaderKHR |";
-    if ( value & PipelineStageFlagBits::eFragmentDensityProcessEXT )
-      result += " FragmentDensityProcessEXT |";
-    if ( value & PipelineStageFlagBits::eFragmentShadingRateAttachmentKHR )
-      result += " FragmentShadingRateAttachmentKHR |";
-    if ( value & PipelineStageFlagBits::eTaskShaderEXT )
-      result += " TaskShaderEXT |";
-    if ( value & PipelineStageFlagBits::eMeshShaderEXT )
-      result += " MeshShaderEXT |";
-    if ( value & PipelineStageFlagBits::eCommandPreprocessEXT )
-      result += " CommandPreprocessEXT |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & PipelineStageFlagBits::eTopOfPipe )
+      result += "TopOfPipe | ";
+    if ( value & PipelineStageFlagBits::eDrawIndirect )
+      result += "DrawIndirect | ";
+    if ( value & PipelineStageFlagBits::eVertexInput )
+      result += "VertexInput | ";
+    if ( value & PipelineStageFlagBits::eVertexShader )
+      result += "VertexShader | ";
+    if ( value & PipelineStageFlagBits::eTessellationControlShader )
+      result += "TessellationControlShader | ";
+    if ( value & PipelineStageFlagBits::eTessellationEvaluationShader )
+      result += "TessellationEvaluationShader | ";
+    if ( value & PipelineStageFlagBits::eGeometryShader )
+      result += "GeometryShader | ";
+    if ( value & PipelineStageFlagBits::eFragmentShader )
+      result += "FragmentShader | ";
+    if ( value & PipelineStageFlagBits::eEarlyFragmentTests )
+      result += "EarlyFragmentTests | ";
+    if ( value & PipelineStageFlagBits::eLateFragmentTests )
+      result += "LateFragmentTests | ";
+    if ( value & PipelineStageFlagBits::eColorAttachmentOutput )
+      result += "ColorAttachmentOutput | ";
+    if ( value & PipelineStageFlagBits::eComputeShader )
+      result += "ComputeShader | ";
+    if ( value & PipelineStageFlagBits::eTransfer )
+      result += "Transfer | ";
+    if ( value & PipelineStageFlagBits::eBottomOfPipe )
+      result += "BottomOfPipe | ";
+    if ( value & PipelineStageFlagBits::eHost )
+      result += "Host | ";
+    if ( value & PipelineStageFlagBits::eAllGraphics )
+      result += "AllGraphics | ";
+    if ( value & PipelineStageFlagBits::eAllCommands )
+      result += "AllCommands | ";
+    if ( value & PipelineStageFlagBits::eTransformFeedbackEXT )
+      result += "TransformFeedbackEXT | ";
+    if ( value & PipelineStageFlagBits::eConditionalRenderingEXT )
+      result += "ConditionalRenderingEXT | ";
+    if ( value & PipelineStageFlagBits::eAccelerationStructureBuildKHR )
+      result += "AccelerationStructureBuildKHR | ";
+    if ( value & PipelineStageFlagBits::eRayTracingShaderKHR )
+      result += "RayTracingShaderKHR | ";
+    if ( value & PipelineStageFlagBits::eFragmentDensityProcessEXT )
+      result += "FragmentDensityProcessEXT | ";
+    if ( value & PipelineStageFlagBits::eFragmentShadingRateAttachmentKHR )
+      result += "FragmentShadingRateAttachmentKHR | ";
+    if ( value & PipelineStageFlagBits::eCommandPreprocessNV )
+      result += "CommandPreprocessNV | ";
+    if ( value & PipelineStageFlagBits::eTaskShaderEXT )
+      result += "TaskShaderEXT | ";
+    if ( value & PipelineStageFlagBits::eMeshShaderEXT )
+      result += "MeshShaderEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( MemoryMapFlags value )
   {
-    std::string result = "{";
-    if ( value & MemoryMapFlagBits::ePlacedEXT )
-      result += " PlacedEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & MemoryMapFlagBits::ePlacedEXT )
+      result += "PlacedEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ImageAspectFlags value )
   {
-    std::string result = "{";
-    if ( value & ImageAspectFlagBits::eColor )
-      result += " Color |";
-    if ( value & ImageAspectFlagBits::eDepth )
-      result += " Depth |";
-    if ( value & ImageAspectFlagBits::eStencil )
-      result += " Stencil |";
-    if ( value & ImageAspectFlagBits::eMetadata )
-      result += " Metadata |";
-    if ( value & ImageAspectFlagBits::ePlane0 )
-      result += " Plane0 |";
-    if ( value & ImageAspectFlagBits::ePlane1 )
-      result += " Plane1 |";
-    if ( value & ImageAspectFlagBits::ePlane2 )
-      result += " Plane2 |";
-    if ( value & ImageAspectFlagBits::eMemoryPlane0EXT )
-      result += " MemoryPlane0EXT |";
-    if ( value & ImageAspectFlagBits::eMemoryPlane1EXT )
-      result += " MemoryPlane1EXT |";
-    if ( value & ImageAspectFlagBits::eMemoryPlane2EXT )
-      result += " MemoryPlane2EXT |";
-    if ( value & ImageAspectFlagBits::eMemoryPlane3EXT )
-      result += " MemoryPlane3EXT |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & ImageAspectFlagBits::eColor )
+      result += "Color | ";
+    if ( value & ImageAspectFlagBits::eDepth )
+      result += "Depth | ";
+    if ( value & ImageAspectFlagBits::eStencil )
+      result += "Stencil | ";
+    if ( value & ImageAspectFlagBits::eMetadata )
+      result += "Metadata | ";
+    if ( value & ImageAspectFlagBits::ePlane0 )
+      result += "Plane0 | ";
+    if ( value & ImageAspectFlagBits::ePlane1 )
+      result += "Plane1 | ";
+    if ( value & ImageAspectFlagBits::ePlane2 )
+      result += "Plane2 | ";
+    if ( value & ImageAspectFlagBits::eMemoryPlane0EXT )
+      result += "MemoryPlane0EXT | ";
+    if ( value & ImageAspectFlagBits::eMemoryPlane1EXT )
+      result += "MemoryPlane1EXT | ";
+    if ( value & ImageAspectFlagBits::eMemoryPlane2EXT )
+      result += "MemoryPlane2EXT | ";
+    if ( value & ImageAspectFlagBits::eMemoryPlane3EXT )
+      result += "MemoryPlane3EXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SparseImageFormatFlags value )
   {
-    std::string result = "{";
-    if ( value & SparseImageFormatFlagBits::eSingleMiptail )
-      result += " SingleMiptail |";
-    if ( value & SparseImageFormatFlagBits::eAlignedMipSize )
-      result += " AlignedMipSize |";
-    if ( value & SparseImageFormatFlagBits::eNonstandardBlockSize )
-      result += " NonstandardBlockSize |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SparseImageFormatFlagBits::eSingleMiptail )
+      result += "SingleMiptail | ";
+    if ( value & SparseImageFormatFlagBits::eAlignedMipSize )
+      result += "AlignedMipSize | ";
+    if ( value & SparseImageFormatFlagBits::eNonstandardBlockSize )
+      result += "NonstandardBlockSize | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SparseMemoryBindFlags value )
   {
-    std::string result = "{";
-    if ( value & SparseMemoryBindFlagBits::eMetadata )
-      result += " Metadata |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SparseMemoryBindFlagBits::eMetadata )
+      result += "Metadata | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( FenceCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & FenceCreateFlagBits::eSignaled )
-      result += " Signaled |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & FenceCreateFlagBits::eSignaled )
+      result += "Signaled | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SemaphoreCreateFlags )
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreCreateFlags )
   {
     return "{}";
   }
 
-  VULKAN_HPP_INLINE std::string to_string( QueryPoolCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & QueryPoolCreateFlagBits::eResetKHR )
-      result += " ResetKHR |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( QueryResultFlags value )
-  {
-    std::string result = "{";
-    if ( value & QueryResultFlagBits::e64 )
-      result += " 64 |";
-    if ( value & QueryResultFlagBits::eWait )
-      result += " Wait |";
-    if ( value & QueryResultFlagBits::eWithAvailability )
-      result += " WithAvailability |";
-    if ( value & QueryResultFlagBits::ePartial )
-      result += " Partial |";
-    if ( value & QueryResultFlagBits::eWithStatusKHR )
-      result += " WithStatusKHR |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( BufferCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & BufferCreateFlagBits::eSparseBinding )
-      result += " SparseBinding |";
-    if ( value & BufferCreateFlagBits::eSparseResidency )
-      result += " SparseResidency |";
-    if ( value & BufferCreateFlagBits::eSparseAliased )
-      result += " SparseAliased |";
-    if ( value & BufferCreateFlagBits::eProtected )
-      result += " Protected |";
-    if ( value & BufferCreateFlagBits::eDeviceAddressCaptureReplay )
-      result += " DeviceAddressCaptureReplay |";
-    if ( value & BufferCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
-      result += " DescriptorBufferCaptureReplayEXT |";
-    if ( value & BufferCreateFlagBits::eVideoProfileIndependentKHR )
-      result += " VideoProfileIndependentKHR |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlags value )
-  {
-    std::string result = "{";
-    if ( value & BufferUsageFlagBits::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & BufferUsageFlagBits::eTransferDst )
-      result += " TransferDst |";
-    if ( value & BufferUsageFlagBits::eUniformTexelBuffer )
-      result += " UniformTexelBuffer |";
-    if ( value & BufferUsageFlagBits::eStorageTexelBuffer )
-      result += " StorageTexelBuffer |";
-    if ( value & BufferUsageFlagBits::eUniformBuffer )
-      result += " UniformBuffer |";
-    if ( value & BufferUsageFlagBits::eStorageBuffer )
-      result += " StorageBuffer |";
-    if ( value & BufferUsageFlagBits::eIndexBuffer )
-      result += " IndexBuffer |";
-    if ( value & BufferUsageFlagBits::eVertexBuffer )
-      result += " VertexBuffer |";
-    if ( value & BufferUsageFlagBits::eIndirectBuffer )
-      result += " IndirectBuffer |";
-    if ( value & BufferUsageFlagBits::eShaderDeviceAddress )
-      result += " ShaderDeviceAddress |";
-    if ( value & BufferUsageFlagBits::eVideoDecodeSrcKHR )
-      result += " VideoDecodeSrcKHR |";
-    if ( value & BufferUsageFlagBits::eVideoDecodeDstKHR )
-      result += " VideoDecodeDstKHR |";
-    if ( value & BufferUsageFlagBits::eTransformFeedbackBufferEXT )
-      result += " TransformFeedbackBufferEXT |";
-    if ( value & BufferUsageFlagBits::eTransformFeedbackCounterBufferEXT )
-      result += " TransformFeedbackCounterBufferEXT |";
-    if ( value & BufferUsageFlagBits::eConditionalRenderingEXT )
-      result += " ConditionalRenderingEXT |";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    if ( value & BufferUsageFlagBits::eExecutionGraphScratchAMDX )
-      result += " ExecutionGraphScratchAMDX |";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    if ( value & BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR )
-      result += " AccelerationStructureBuildInputReadOnlyKHR |";
-    if ( value & BufferUsageFlagBits::eAccelerationStructureStorageKHR )
-      result += " AccelerationStructureStorageKHR |";
-    if ( value & BufferUsageFlagBits::eShaderBindingTableKHR )
-      result += " ShaderBindingTableKHR |";
-    if ( value & BufferUsageFlagBits::eVideoEncodeDstKHR )
-      result += " VideoEncodeDstKHR |";
-    if ( value & BufferUsageFlagBits::eVideoEncodeSrcKHR )
-      result += " VideoEncodeSrcKHR |";
-    if ( value & BufferUsageFlagBits::eSamplerDescriptorBufferEXT )
-      result += " SamplerDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits::eResourceDescriptorBufferEXT )
-      result += " ResourceDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT )
-      result += " PushDescriptorsDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT )
-      result += " MicromapBuildInputReadOnlyEXT |";
-    if ( value & BufferUsageFlagBits::eMicromapStorageEXT )
-      result += " MicromapStorageEXT |";
-    if ( value & BufferUsageFlagBits::eTileMemoryQCOM )
-      result += " TileMemoryQCOM |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( ImageViewCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & ImageViewCreateFlagBits::eFragmentDensityMapDynamicEXT )
-      result += " FragmentDensityMapDynamicEXT |";
-    if ( value & ImageViewCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
-      result += " DescriptorBufferCaptureReplayEXT |";
-    if ( value & ImageViewCreateFlagBits::eFragmentDensityMapDeferredEXT )
-      result += " FragmentDensityMapDeferredEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( AccessFlags value )
-  {
-    std::string result = "{";
-    if ( value & AccessFlagBits::eIndirectCommandRead )
-      result += " IndirectCommandRead |";
-    if ( value & AccessFlagBits::eIndexRead )
-      result += " IndexRead |";
-    if ( value & AccessFlagBits::eVertexAttributeRead )
-      result += " VertexAttributeRead |";
-    if ( value & AccessFlagBits::eUniformRead )
-      result += " UniformRead |";
-    if ( value & AccessFlagBits::eInputAttachmentRead )
-      result += " InputAttachmentRead |";
-    if ( value & AccessFlagBits::eShaderRead )
-      result += " ShaderRead |";
-    if ( value & AccessFlagBits::eShaderWrite )
-      result += " ShaderWrite |";
-    if ( value & AccessFlagBits::eColorAttachmentRead )
-      result += " ColorAttachmentRead |";
-    if ( value & AccessFlagBits::eColorAttachmentWrite )
-      result += " ColorAttachmentWrite |";
-    if ( value & AccessFlagBits::eDepthStencilAttachmentRead )
-      result += " DepthStencilAttachmentRead |";
-    if ( value & AccessFlagBits::eDepthStencilAttachmentWrite )
-      result += " DepthStencilAttachmentWrite |";
-    if ( value & AccessFlagBits::eTransferRead )
-      result += " TransferRead |";
-    if ( value & AccessFlagBits::eTransferWrite )
-      result += " TransferWrite |";
-    if ( value & AccessFlagBits::eHostRead )
-      result += " HostRead |";
-    if ( value & AccessFlagBits::eHostWrite )
-      result += " HostWrite |";
-    if ( value & AccessFlagBits::eMemoryRead )
-      result += " MemoryRead |";
-    if ( value & AccessFlagBits::eMemoryWrite )
-      result += " MemoryWrite |";
-    if ( value & AccessFlagBits::eTransformFeedbackWriteEXT )
-      result += " TransformFeedbackWriteEXT |";
-    if ( value & AccessFlagBits::eTransformFeedbackCounterReadEXT )
-      result += " TransformFeedbackCounterReadEXT |";
-    if ( value & AccessFlagBits::eTransformFeedbackCounterWriteEXT )
-      result += " TransformFeedbackCounterWriteEXT |";
-    if ( value & AccessFlagBits::eConditionalRenderingReadEXT )
-      result += " ConditionalRenderingReadEXT |";
-    if ( value & AccessFlagBits::eColorAttachmentReadNoncoherentEXT )
-      result += " ColorAttachmentReadNoncoherentEXT |";
-    if ( value & AccessFlagBits::eAccelerationStructureReadKHR )
-      result += " AccelerationStructureReadKHR |";
-    if ( value & AccessFlagBits::eAccelerationStructureWriteKHR )
-      result += " AccelerationStructureWriteKHR |";
-    if ( value & AccessFlagBits::eFragmentDensityMapReadEXT )
-      result += " FragmentDensityMapReadEXT |";
-    if ( value & AccessFlagBits::eFragmentShadingRateAttachmentReadKHR )
-      result += " FragmentShadingRateAttachmentReadKHR |";
-    if ( value & AccessFlagBits::eCommandPreprocessReadEXT )
-      result += " CommandPreprocessReadEXT |";
-    if ( value & AccessFlagBits::eCommandPreprocessWriteEXT )
-      result += " CommandPreprocessWriteEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( DependencyFlags value )
-  {
-    std::string result = "{";
-    if ( value & DependencyFlagBits::eByRegion )
-      result += " ByRegion |";
-    if ( value & DependencyFlagBits::eDeviceGroup )
-      result += " DeviceGroup |";
-    if ( value & DependencyFlagBits::eViewLocal )
-      result += " ViewLocal |";
-    if ( value & DependencyFlagBits::eFeedbackLoopEXT )
-      result += " FeedbackLoopEXT |";
-    if ( value & DependencyFlagBits::eQueueFamilyOwnershipTransferUseAllStagesKHR )
-      result += " QueueFamilyOwnershipTransferUseAllStagesKHR |";
-    if ( value & DependencyFlagBits::eAsymmetricEventKHR )
-      result += " AsymmetricEventKHR |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( CommandPoolCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & CommandPoolCreateFlagBits::eTransient )
-      result += " Transient |";
-    if ( value & CommandPoolCreateFlagBits::eResetCommandBuffer )
-      result += " ResetCommandBuffer |";
-    if ( value & CommandPoolCreateFlagBits::eProtected )
-      result += " Protected |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( CommandPoolResetFlags value )
-  {
-    std::string result = "{";
-    if ( value & CommandPoolResetFlagBits::eReleaseResources )
-      result += " ReleaseResources |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( CommandBufferResetFlags value )
-  {
-    std::string result = "{";
-    if ( value & CommandBufferResetFlagBits::eReleaseResources )
-      result += " ReleaseResources |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( CommandBufferUsageFlags value )
-  {
-    std::string result = "{";
-    if ( value & CommandBufferUsageFlagBits::eOneTimeSubmit )
-      result += " OneTimeSubmit |";
-    if ( value & CommandBufferUsageFlagBits::eRenderPassContinue )
-      result += " RenderPassContinue |";
-    if ( value & CommandBufferUsageFlagBits::eSimultaneousUse )
-      result += " SimultaneousUse |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( QueryControlFlags value )
-  {
-    std::string result = "{";
-    if ( value & QueryControlFlagBits::ePrecise )
-      result += " Precise |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
   VULKAN_HPP_INLINE std::string to_string( EventCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & EventCreateFlagBits::eDeviceOnly )
-      result += " DeviceOnly |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & EventCreateFlagBits::eDeviceOnly )
+      result += "DeviceOnly | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BufferViewCreateFlags )
+  VULKAN_HPP_INLINE std::string to_string( QueryPipelineStatisticFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & QueryPipelineStatisticFlagBits::eInputAssemblyVertices )
+      result += "InputAssemblyVertices | ";
+    if ( value & QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives )
+      result += "InputAssemblyPrimitives | ";
+    if ( value & QueryPipelineStatisticFlagBits::eVertexShaderInvocations )
+      result += "VertexShaderInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eGeometryShaderInvocations )
+      result += "GeometryShaderInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives )
+      result += "GeometryShaderPrimitives | ";
+    if ( value & QueryPipelineStatisticFlagBits::eClippingInvocations )
+      result += "ClippingInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eClippingPrimitives )
+      result += "ClippingPrimitives | ";
+    if ( value & QueryPipelineStatisticFlagBits::eFragmentShaderInvocations )
+      result += "FragmentShaderInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches )
+      result += "TessellationControlShaderPatches | ";
+    if ( value & QueryPipelineStatisticFlagBits::eTessellationEvaluationShaderInvocations )
+      result += "TessellationEvaluationShaderInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eComputeShaderInvocations )
+      result += "ComputeShaderInvocations | ";
+    if ( value & QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT )
+      result += "TaskShaderInvocationsEXT | ";
+    if ( value & QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT )
+      result += "MeshShaderInvocationsEXT | ";
+    if ( value & QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI )
+      result += "ClusterCullingShaderInvocationsHUAWEI | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( QueryPoolCreateFlags )
   {
     return "{}";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderModuleCreateFlags )
+  VULKAN_HPP_INLINE std::string to_string( QueryResultFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & QueryResultFlagBits::e64 )
+      result += "64 | ";
+    if ( value & QueryResultFlagBits::eWait )
+      result += "Wait | ";
+    if ( value & QueryResultFlagBits::eWithAvailability )
+      result += "WithAvailability | ";
+    if ( value & QueryResultFlagBits::ePartial )
+      result += "Partial | ";
+    if ( value & QueryResultFlagBits::eWithStatusKHR )
+      result += "WithStatusKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferCreateFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & BufferCreateFlagBits::eSparseBinding )
+      result += "SparseBinding | ";
+    if ( value & BufferCreateFlagBits::eSparseResidency )
+      result += "SparseResidency | ";
+    if ( value & BufferCreateFlagBits::eSparseAliased )
+      result += "SparseAliased | ";
+    if ( value & BufferCreateFlagBits::eProtected )
+      result += "Protected | ";
+    if ( value & BufferCreateFlagBits::eDeviceAddressCaptureReplay )
+      result += "DeviceAddressCaptureReplay | ";
+    if ( value & BufferCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
+      result += "DescriptorBufferCaptureReplayEXT | ";
+    if ( value & BufferCreateFlagBits::eVideoProfileIndependentKHR )
+      result += "VideoProfileIndependentKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & BufferUsageFlagBits::eTransferSrc )
+      result += "TransferSrc | ";
+    if ( value & BufferUsageFlagBits::eTransferDst )
+      result += "TransferDst | ";
+    if ( value & BufferUsageFlagBits::eUniformTexelBuffer )
+      result += "UniformTexelBuffer | ";
+    if ( value & BufferUsageFlagBits::eStorageTexelBuffer )
+      result += "StorageTexelBuffer | ";
+    if ( value & BufferUsageFlagBits::eUniformBuffer )
+      result += "UniformBuffer | ";
+    if ( value & BufferUsageFlagBits::eStorageBuffer )
+      result += "StorageBuffer | ";
+    if ( value & BufferUsageFlagBits::eIndexBuffer )
+      result += "IndexBuffer | ";
+    if ( value & BufferUsageFlagBits::eVertexBuffer )
+      result += "VertexBuffer | ";
+    if ( value & BufferUsageFlagBits::eIndirectBuffer )
+      result += "IndirectBuffer | ";
+    if ( value & BufferUsageFlagBits::eShaderDeviceAddress )
+      result += "ShaderDeviceAddress | ";
+    if ( value & BufferUsageFlagBits::eVideoDecodeSrcKHR )
+      result += "VideoDecodeSrcKHR | ";
+    if ( value & BufferUsageFlagBits::eVideoDecodeDstKHR )
+      result += "VideoDecodeDstKHR | ";
+    if ( value & BufferUsageFlagBits::eTransformFeedbackBufferEXT )
+      result += "TransformFeedbackBufferEXT | ";
+    if ( value & BufferUsageFlagBits::eTransformFeedbackCounterBufferEXT )
+      result += "TransformFeedbackCounterBufferEXT | ";
+    if ( value & BufferUsageFlagBits::eConditionalRenderingEXT )
+      result += "ConditionalRenderingEXT | ";
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    if ( value & BufferUsageFlagBits::eExecutionGraphScratchAMDX )
+      result += "ExecutionGraphScratchAMDX | ";
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    if ( value & BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR )
+      result += "AccelerationStructureBuildInputReadOnlyKHR | ";
+    if ( value & BufferUsageFlagBits::eAccelerationStructureStorageKHR )
+      result += "AccelerationStructureStorageKHR | ";
+    if ( value & BufferUsageFlagBits::eShaderBindingTableKHR )
+      result += "ShaderBindingTableKHR | ";
+    if ( value & BufferUsageFlagBits::eVideoEncodeDstKHR )
+      result += "VideoEncodeDstKHR | ";
+    if ( value & BufferUsageFlagBits::eVideoEncodeSrcKHR )
+      result += "VideoEncodeSrcKHR | ";
+    if ( value & BufferUsageFlagBits::eSamplerDescriptorBufferEXT )
+      result += "SamplerDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits::eResourceDescriptorBufferEXT )
+      result += "ResourceDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT )
+      result += "PushDescriptorsDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT )
+      result += "MicromapBuildInputReadOnlyEXT | ";
+    if ( value & BufferUsageFlagBits::eMicromapStorageEXT )
+      result += "MicromapStorageEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferViewCreateFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ImageViewCreateFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & ImageViewCreateFlagBits::eFragmentDensityMapDynamicEXT )
+      result += "FragmentDensityMapDynamicEXT | ";
+    if ( value & ImageViewCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
+      result += "DescriptorBufferCaptureReplayEXT | ";
+    if ( value & ImageViewCreateFlagBits::eFragmentDensityMapDeferredEXT )
+      result += "FragmentDensityMapDeferredEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ShaderModuleCreateFlags )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineCacheCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & PipelineCacheCreateFlagBits::eExternallySynchronized )
-      result += " ExternallySynchronized |";
-    if ( value & PipelineCacheCreateFlagBits::eInternallySynchronizedMergeKHR )
-      result += " InternallySynchronizedMergeKHR |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PipelineCacheCreateFlagBits::eExternallySynchronized )
+      result += "ExternallySynchronized | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ColorComponentFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & ColorComponentFlagBits::eR )
+      result += "R | ";
+    if ( value & ColorComponentFlagBits::eG )
+      result += "G | ";
+    if ( value & ColorComponentFlagBits::eB )
+      result += "B | ";
+    if ( value & ColorComponentFlagBits::eA )
+      result += "A | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CullModeFlags value )
+  {
+    if ( !value )
+      return "None";
+
+    std::string result;
+    if ( value & CullModeFlagBits::eFront )
+      result += "Front | ";
+    if ( value & CullModeFlagBits::eBack )
+      result += "Back | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineColorBlendStateCreateFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & PipelineColorBlendStateCreateFlagBits::eRasterizationOrderAttachmentAccessEXT )
+      result += "RasterizationOrderAttachmentAccessEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineCreateFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & PipelineCreateFlagBits::eDisableOptimization )
-      result += " DisableOptimization |";
+      result += "DisableOptimization | ";
     if ( value & PipelineCreateFlagBits::eAllowDerivatives )
-      result += " AllowDerivatives |";
+      result += "AllowDerivatives | ";
     if ( value & PipelineCreateFlagBits::eDerivative )
-      result += " Derivative |";
-    if ( value & PipelineCreateFlagBits::eDispatchBase )
-      result += " DispatchBase |";
+      result += "Derivative | ";
     if ( value & PipelineCreateFlagBits::eViewIndexFromDeviceIndex )
-      result += " ViewIndexFromDeviceIndex |";
+      result += "ViewIndexFromDeviceIndex | ";
+    if ( value & PipelineCreateFlagBits::eDispatchBase )
+      result += "DispatchBase | ";
     if ( value & PipelineCreateFlagBits::eFailOnPipelineCompileRequired )
-      result += " FailOnPipelineCompileRequired |";
+      result += "FailOnPipelineCompileRequired | ";
     if ( value & PipelineCreateFlagBits::eEarlyReturnOnFailure )
-      result += " EarlyReturnOnFailure |";
-    if ( value & PipelineCreateFlagBits::eNoProtectedAccess )
-      result += " NoProtectedAccess |";
-    if ( value & PipelineCreateFlagBits::eProtectedAccessOnly )
-      result += " ProtectedAccessOnly |";
-    if ( value & PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR )
-      result += " RayTracingNoNullAnyHitShadersKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR )
-      result += " RayTracingNoNullClosestHitShadersKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR )
-      result += " RayTracingNoNullMissShadersKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR )
-      result += " RayTracingNoNullIntersectionShadersKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR )
-      result += " RayTracingSkipTrianglesKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingSkipAabbsKHR )
-      result += " RayTracingSkipAabbsKHR |";
-    if ( value & PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR )
-      result += " RayTracingShaderGroupHandleCaptureReplayKHR |";
-    if ( value & PipelineCreateFlagBits::eDeferCompileNV )
-      result += " DeferCompileNV |";
-    if ( value & PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT )
-      result += " RenderingFragmentDensityMapAttachmentEXT |";
+      result += "EarlyReturnOnFailure | ";
     if ( value & PipelineCreateFlagBits::eRenderingFragmentShadingRateAttachmentKHR )
-      result += " RenderingFragmentShadingRateAttachmentKHR |";
+      result += "RenderingFragmentShadingRateAttachmentKHR | ";
+    if ( value & PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT )
+      result += "RenderingFragmentDensityMapAttachmentEXT | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR )
+      result += "RayTracingNoNullAnyHitShadersKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR )
+      result += "RayTracingNoNullClosestHitShadersKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR )
+      result += "RayTracingNoNullMissShadersKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR )
+      result += "RayTracingNoNullIntersectionShadersKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR )
+      result += "RayTracingSkipTrianglesKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingSkipAabbsKHR )
+      result += "RayTracingSkipAabbsKHR | ";
+    if ( value & PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR )
+      result += "RayTracingShaderGroupHandleCaptureReplayKHR | ";
+    if ( value & PipelineCreateFlagBits::eDeferCompileNV )
+      result += "DeferCompileNV | ";
     if ( value & PipelineCreateFlagBits::eCaptureStatisticsKHR )
-      result += " CaptureStatisticsKHR |";
+      result += "CaptureStatisticsKHR | ";
     if ( value & PipelineCreateFlagBits::eCaptureInternalRepresentationsKHR )
-      result += " CaptureInternalRepresentationsKHR |";
+      result += "CaptureInternalRepresentationsKHR | ";
     if ( value & PipelineCreateFlagBits::eIndirectBindableNV )
-      result += " IndirectBindableNV |";
+      result += "IndirectBindableNV | ";
     if ( value & PipelineCreateFlagBits::eLibraryKHR )
-      result += " LibraryKHR |";
+      result += "LibraryKHR | ";
     if ( value & PipelineCreateFlagBits::eDescriptorBufferEXT )
-      result += " DescriptorBufferEXT |";
+      result += "DescriptorBufferEXT | ";
     if ( value & PipelineCreateFlagBits::eRetainLinkTimeOptimizationInfoEXT )
-      result += " RetainLinkTimeOptimizationInfoEXT |";
+      result += "RetainLinkTimeOptimizationInfoEXT | ";
     if ( value & PipelineCreateFlagBits::eLinkTimeOptimizationEXT )
-      result += " LinkTimeOptimizationEXT |";
+      result += "LinkTimeOptimizationEXT | ";
     if ( value & PipelineCreateFlagBits::eRayTracingAllowMotionNV )
-      result += " RayTracingAllowMotionNV |";
+      result += "RayTracingAllowMotionNV | ";
     if ( value & PipelineCreateFlagBits::eColorAttachmentFeedbackLoopEXT )
-      result += " ColorAttachmentFeedbackLoopEXT |";
+      result += "ColorAttachmentFeedbackLoopEXT | ";
     if ( value & PipelineCreateFlagBits::eDepthStencilAttachmentFeedbackLoopEXT )
-      result += " DepthStencilAttachmentFeedbackLoopEXT |";
+      result += "DepthStencilAttachmentFeedbackLoopEXT | ";
     if ( value & PipelineCreateFlagBits::eRayTracingOpacityMicromapEXT )
-      result += " RayTracingOpacityMicromapEXT |";
+      result += "RayTracingOpacityMicromapEXT | ";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     if ( value & PipelineCreateFlagBits::eRayTracingDisplacementMicromapNV )
-      result += " RayTracingDisplacementMicromapNV |";
+      result += "RayTracingDisplacementMicromapNV | ";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    if ( value & PipelineCreateFlagBits::eNoProtectedAccessEXT )
+      result += "NoProtectedAccessEXT | ";
+    if ( value & PipelineCreateFlagBits::eProtectedAccessOnlyEXT )
+      result += "ProtectedAccessOnlyEXT | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineDepthStencilStateCreateFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentDepthAccessEXT )
+      result += "RasterizationOrderAttachmentDepthAccessEXT | ";
+    if ( value & PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentStencilAccessEXT )
+      result += "RasterizationOrderAttachmentStencilAccessEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineDynamicStateCreateFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineInputAssemblyStateCreateFlags )
+  {
+    return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineLayoutCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & PipelineLayoutCreateFlagBits::eIndependentSetsEXT )
-      result += " IndependentSetsEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PipelineLayoutCreateFlagBits::eIndependentSetsEXT )
+      result += "IndependentSetsEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineMultisampleStateCreateFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationStateCreateFlags )
+  {
+    return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineShaderStageCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize )
-      result += " AllowVaryingSubgroupSize |";
-    if ( value & PipelineShaderStageCreateFlagBits::eRequireFullSubgroups )
-      result += " RequireFullSubgroups |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize )
+      result += "AllowVaryingSubgroupSize | ";
+    if ( value & PipelineShaderStageCreateFlagBits::eRequireFullSubgroups )
+      result += "RequireFullSubgroups | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineTessellationStateCreateFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineVertexInputStateCreateFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineViewportStateCreateFlags )
+  {
+    return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ShaderStageFlags value )
   {
-    std::string result = "{";
-    if ( value & ShaderStageFlagBits::eVertex )
-      result += " Vertex |";
-    if ( value & ShaderStageFlagBits::eTessellationControl )
-      result += " TessellationControl |";
-    if ( value & ShaderStageFlagBits::eTessellationEvaluation )
-      result += " TessellationEvaluation |";
-    if ( value & ShaderStageFlagBits::eGeometry )
-      result += " Geometry |";
-    if ( value & ShaderStageFlagBits::eFragment )
-      result += " Fragment |";
-    if ( value & ShaderStageFlagBits::eCompute )
-      result += " Compute |";
-    if ( value & ShaderStageFlagBits::eRaygenKHR )
-      result += " RaygenKHR |";
-    if ( value & ShaderStageFlagBits::eAnyHitKHR )
-      result += " AnyHitKHR |";
-    if ( value & ShaderStageFlagBits::eClosestHitKHR )
-      result += " ClosestHitKHR |";
-    if ( value & ShaderStageFlagBits::eMissKHR )
-      result += " MissKHR |";
-    if ( value & ShaderStageFlagBits::eIntersectionKHR )
-      result += " IntersectionKHR |";
-    if ( value & ShaderStageFlagBits::eCallableKHR )
-      result += " CallableKHR |";
-    if ( value & ShaderStageFlagBits::eTaskEXT )
-      result += " TaskEXT |";
-    if ( value & ShaderStageFlagBits::eMeshEXT )
-      result += " MeshEXT |";
-    if ( value & ShaderStageFlagBits::eSubpassShadingHUAWEI )
-      result += " SubpassShadingHUAWEI |";
-    if ( value & ShaderStageFlagBits::eClusterCullingHUAWEI )
-      result += " ClusterCullingHUAWEI |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ShaderStageFlagBits::eVertex )
+      result += "Vertex | ";
+    if ( value & ShaderStageFlagBits::eTessellationControl )
+      result += "TessellationControl | ";
+    if ( value & ShaderStageFlagBits::eTessellationEvaluation )
+      result += "TessellationEvaluation | ";
+    if ( value & ShaderStageFlagBits::eGeometry )
+      result += "Geometry | ";
+    if ( value & ShaderStageFlagBits::eFragment )
+      result += "Fragment | ";
+    if ( value & ShaderStageFlagBits::eCompute )
+      result += "Compute | ";
+    if ( value & ShaderStageFlagBits::eRaygenKHR )
+      result += "RaygenKHR | ";
+    if ( value & ShaderStageFlagBits::eAnyHitKHR )
+      result += "AnyHitKHR | ";
+    if ( value & ShaderStageFlagBits::eClosestHitKHR )
+      result += "ClosestHitKHR | ";
+    if ( value & ShaderStageFlagBits::eMissKHR )
+      result += "MissKHR | ";
+    if ( value & ShaderStageFlagBits::eIntersectionKHR )
+      result += "IntersectionKHR | ";
+    if ( value & ShaderStageFlagBits::eCallableKHR )
+      result += "CallableKHR | ";
+    if ( value & ShaderStageFlagBits::eTaskEXT )
+      result += "TaskEXT | ";
+    if ( value & ShaderStageFlagBits::eMeshEXT )
+      result += "MeshEXT | ";
+    if ( value & ShaderStageFlagBits::eSubpassShadingHUAWEI )
+      result += "SubpassShadingHUAWEI | ";
+    if ( value & ShaderStageFlagBits::eClusterCullingHUAWEI )
+      result += "ClusterCullingHUAWEI | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SamplerCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & SamplerCreateFlagBits::eSubsampledEXT )
-      result += " SubsampledEXT |";
-    if ( value & SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT )
-      result += " SubsampledCoarseReconstructionEXT |";
-    if ( value & SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
-      result += " DescriptorBufferCaptureReplayEXT |";
-    if ( value & SamplerCreateFlagBits::eNonSeamlessCubeMapEXT )
-      result += " NonSeamlessCubeMapEXT |";
-    if ( value & SamplerCreateFlagBits::eImageProcessingQCOM )
-      result += " ImageProcessingQCOM |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SamplerCreateFlagBits::eSubsampledEXT )
+      result += "SubsampledEXT | ";
+    if ( value & SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT )
+      result += "SubsampledCoarseReconstructionEXT | ";
+    if ( value & SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT )
+      result += "DescriptorBufferCaptureReplayEXT | ";
+    if ( value & SamplerCreateFlagBits::eNonSeamlessCubeMapEXT )
+      result += "NonSeamlessCubeMapEXT | ";
+    if ( value & SamplerCreateFlagBits::eImageProcessingQCOM )
+      result += "ImageProcessingQCOM | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DescriptorPoolCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & DescriptorPoolCreateFlagBits::eFreeDescriptorSet )
-      result += " FreeDescriptorSet |";
-    if ( value & DescriptorPoolCreateFlagBits::eUpdateAfterBind )
-      result += " UpdateAfterBind |";
-    if ( value & DescriptorPoolCreateFlagBits::eHostOnlyEXT )
-      result += " HostOnlyEXT |";
-    if ( value & DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV )
-      result += " AllowOverallocationSetsNV |";
-    if ( value & DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV )
-      result += " AllowOverallocationPoolsNV |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DescriptorPoolCreateFlagBits::eFreeDescriptorSet )
+      result += "FreeDescriptorSet | ";
+    if ( value & DescriptorPoolCreateFlagBits::eUpdateAfterBind )
+      result += "UpdateAfterBind | ";
+    if ( value & DescriptorPoolCreateFlagBits::eHostOnlyEXT )
+      result += "HostOnlyEXT | ";
+    if ( value & DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV )
+      result += "AllowOverallocationSetsNV | ";
+    if ( value & DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV )
+      result += "AllowOverallocationPoolsNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorPoolResetFlags )
+  VULKAN_HPP_INLINE std::string to_string( DescriptorPoolResetFlags )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DescriptorSetLayoutCreateFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & DescriptorSetLayoutCreateFlagBits::eUpdateAfterBindPool )
-      result += " UpdateAfterBindPool |";
-    if ( value & DescriptorSetLayoutCreateFlagBits::ePushDescriptor )
-      result += " PushDescriptor |";
+      result += "UpdateAfterBindPool | ";
+    if ( value & DescriptorSetLayoutCreateFlagBits::ePushDescriptorKHR )
+      result += "PushDescriptorKHR | ";
     if ( value & DescriptorSetLayoutCreateFlagBits::eDescriptorBufferEXT )
-      result += " DescriptorBufferEXT |";
+      result += "DescriptorBufferEXT | ";
     if ( value & DescriptorSetLayoutCreateFlagBits::eEmbeddedImmutableSamplersEXT )
-      result += " EmbeddedImmutableSamplersEXT |";
+      result += "EmbeddedImmutableSamplersEXT | ";
     if ( value & DescriptorSetLayoutCreateFlagBits::eIndirectBindableNV )
-      result += " IndirectBindableNV |";
+      result += "IndirectBindableNV | ";
     if ( value & DescriptorSetLayoutCreateFlagBits::eHostOnlyPoolEXT )
-      result += " HostOnlyPoolEXT |";
+      result += "HostOnlyPoolEXT | ";
     if ( value & DescriptorSetLayoutCreateFlagBits::ePerStageNV )
-      result += " PerStageNV |";
+      result += "PerStageNV | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE std::string to_string( QueryPipelineStatisticFlags value )
+  VULKAN_HPP_INLINE std::string to_string( AccessFlags value )
   {
-    std::string result = "{";
-    if ( value & QueryPipelineStatisticFlagBits::eInputAssemblyVertices )
-      result += " InputAssemblyVertices |";
-    if ( value & QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives )
-      result += " InputAssemblyPrimitives |";
-    if ( value & QueryPipelineStatisticFlagBits::eVertexShaderInvocations )
-      result += " VertexShaderInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eGeometryShaderInvocations )
-      result += " GeometryShaderInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives )
-      result += " GeometryShaderPrimitives |";
-    if ( value & QueryPipelineStatisticFlagBits::eClippingInvocations )
-      result += " ClippingInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eClippingPrimitives )
-      result += " ClippingPrimitives |";
-    if ( value & QueryPipelineStatisticFlagBits::eFragmentShaderInvocations )
-      result += " FragmentShaderInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches )
-      result += " TessellationControlShaderPatches |";
-    if ( value & QueryPipelineStatisticFlagBits::eTessellationEvaluationShaderInvocations )
-      result += " TessellationEvaluationShaderInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eComputeShaderInvocations )
-      result += " ComputeShaderInvocations |";
-    if ( value & QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT )
-      result += " TaskShaderInvocationsEXT |";
-    if ( value & QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT )
-      result += " MeshShaderInvocationsEXT |";
-    if ( value & QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI )
-      result += " ClusterCullingShaderInvocationsHUAWEI |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
+    std::string result;
+    if ( value & AccessFlagBits::eIndirectCommandRead )
+      result += "IndirectCommandRead | ";
+    if ( value & AccessFlagBits::eIndexRead )
+      result += "IndexRead | ";
+    if ( value & AccessFlagBits::eVertexAttributeRead )
+      result += "VertexAttributeRead | ";
+    if ( value & AccessFlagBits::eUniformRead )
+      result += "UniformRead | ";
+    if ( value & AccessFlagBits::eInputAttachmentRead )
+      result += "InputAttachmentRead | ";
+    if ( value & AccessFlagBits::eShaderRead )
+      result += "ShaderRead | ";
+    if ( value & AccessFlagBits::eShaderWrite )
+      result += "ShaderWrite | ";
+    if ( value & AccessFlagBits::eColorAttachmentRead )
+      result += "ColorAttachmentRead | ";
+    if ( value & AccessFlagBits::eColorAttachmentWrite )
+      result += "ColorAttachmentWrite | ";
+    if ( value & AccessFlagBits::eDepthStencilAttachmentRead )
+      result += "DepthStencilAttachmentRead | ";
+    if ( value & AccessFlagBits::eDepthStencilAttachmentWrite )
+      result += "DepthStencilAttachmentWrite | ";
+    if ( value & AccessFlagBits::eTransferRead )
+      result += "TransferRead | ";
+    if ( value & AccessFlagBits::eTransferWrite )
+      result += "TransferWrite | ";
+    if ( value & AccessFlagBits::eHostRead )
+      result += "HostRead | ";
+    if ( value & AccessFlagBits::eHostWrite )
+      result += "HostWrite | ";
+    if ( value & AccessFlagBits::eMemoryRead )
+      result += "MemoryRead | ";
+    if ( value & AccessFlagBits::eMemoryWrite )
+      result += "MemoryWrite | ";
+    if ( value & AccessFlagBits::eTransformFeedbackWriteEXT )
+      result += "TransformFeedbackWriteEXT | ";
+    if ( value & AccessFlagBits::eTransformFeedbackCounterReadEXT )
+      result += "TransformFeedbackCounterReadEXT | ";
+    if ( value & AccessFlagBits::eTransformFeedbackCounterWriteEXT )
+      result += "TransformFeedbackCounterWriteEXT | ";
+    if ( value & AccessFlagBits::eConditionalRenderingReadEXT )
+      result += "ConditionalRenderingReadEXT | ";
+    if ( value & AccessFlagBits::eColorAttachmentReadNoncoherentEXT )
+      result += "ColorAttachmentReadNoncoherentEXT | ";
+    if ( value & AccessFlagBits::eAccelerationStructureReadKHR )
+      result += "AccelerationStructureReadKHR | ";
+    if ( value & AccessFlagBits::eAccelerationStructureWriteKHR )
+      result += "AccelerationStructureWriteKHR | ";
+    if ( value & AccessFlagBits::eFragmentDensityMapReadEXT )
+      result += "FragmentDensityMapReadEXT | ";
+    if ( value & AccessFlagBits::eFragmentShadingRateAttachmentReadKHR )
+      result += "FragmentShadingRateAttachmentReadKHR | ";
+    if ( value & AccessFlagBits::eCommandPreprocessReadNV )
+      result += "CommandPreprocessReadNV | ";
+    if ( value & AccessFlagBits::eCommandPreprocessWriteNV )
+      result += "CommandPreprocessWriteNV | ";
 
-  VULKAN_HPP_INLINE std::string to_string( ColorComponentFlags value )
-  {
-    std::string result = "{";
-    if ( value & ColorComponentFlagBits::eR )
-      result += " R |";
-    if ( value & ColorComponentFlagBits::eG )
-      result += " G |";
-    if ( value & ColorComponentFlagBits::eB )
-      result += " B |";
-    if ( value & ColorComponentFlagBits::eA )
-      result += " A |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( CullModeFlags value )
-  {
-    std::string result = "{";
-    if ( value & CullModeFlagBits::eFront )
-      result += " Front |";
-    if ( value & CullModeFlagBits::eBack )
-      result += " Back |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PipelineColorBlendStateCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & PipelineColorBlendStateCreateFlagBits::eRasterizationOrderAttachmentAccessEXT )
-      result += " RasterizationOrderAttachmentAccessEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PipelineDepthStencilStateCreateFlags value )
-  {
-    std::string result = "{";
-    if ( value & PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentDepthAccessEXT )
-      result += " RasterizationOrderAttachmentDepthAccessEXT |";
-    if ( value & PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentStencilAccessEXT )
-      result += " RasterizationOrderAttachmentStencilAccessEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineDynamicStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineInputAssemblyStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineMultisampleStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineTessellationStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineVertexInputStateCreateFlags )
-  {
-    return "{}";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineViewportStateCreateFlags )
-  {
-    return "{}";
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( AttachmentDescriptionFlags value )
   {
-    std::string result = "{";
-    if ( value & AttachmentDescriptionFlagBits::eMayAlias )
-      result += " MayAlias |";
-    if ( value & AttachmentDescriptionFlagBits::eResolveSkipTransferFunctionKHR )
-      result += " ResolveSkipTransferFunctionKHR |";
-    if ( value & AttachmentDescriptionFlagBits::eResolveEnableTransferFunctionKHR )
-      result += " ResolveEnableTransferFunctionKHR |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & AttachmentDescriptionFlagBits::eMayAlias )
+      result += "MayAlias | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DependencyFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & DependencyFlagBits::eByRegion )
+      result += "ByRegion | ";
+    if ( value & DependencyFlagBits::eDeviceGroup )
+      result += "DeviceGroup | ";
+    if ( value & DependencyFlagBits::eViewLocal )
+      result += "ViewLocal | ";
+    if ( value & DependencyFlagBits::eFeedbackLoopEXT )
+      result += "FeedbackLoopEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( FramebufferCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & FramebufferCreateFlagBits::eImageless )
-      result += " Imageless |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & FramebufferCreateFlagBits::eImageless )
+      result += "Imageless | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( RenderPassCreateFlags value )
   {
-    std::string result = "{";
-    if ( value & RenderPassCreateFlagBits::eTransformQCOM )
-      result += " TransformQCOM |";
-    if ( value & RenderPassCreateFlagBits::ePerLayerFragmentDensityVALVE )
-      result += " PerLayerFragmentDensityVALVE |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & RenderPassCreateFlagBits::eTransformQCOM )
+      result += "TransformQCOM | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SubpassDescriptionFlags value )
   {
-    std::string result = "{";
-    if ( value & SubpassDescriptionFlagBits::ePerViewAttributesNVX )
-      result += " PerViewAttributesNVX |";
-    if ( value & SubpassDescriptionFlagBits::ePerViewPositionXOnlyNVX )
-      result += " PerViewPositionXOnlyNVX |";
-    if ( value & SubpassDescriptionFlagBits::eTileShadingApronQCOM )
-      result += " TileShadingApronQCOM |";
-    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT )
-      result += " RasterizationOrderAttachmentColorAccessEXT |";
-    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT )
-      result += " RasterizationOrderAttachmentDepthAccessEXT |";
-    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentStencilAccessEXT )
-      result += " RasterizationOrderAttachmentStencilAccessEXT |";
-    if ( value & SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT )
-      result += " EnableLegacyDitheringEXT |";
-    if ( value & SubpassDescriptionFlagBits::eFragmentRegionEXT )
-      result += " FragmentRegionEXT |";
-    if ( value & SubpassDescriptionFlagBits::eCustomResolveEXT )
-      result += " CustomResolveEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SubpassDescriptionFlagBits::ePerViewAttributesNVX )
+      result += "PerViewAttributesNVX | ";
+    if ( value & SubpassDescriptionFlagBits::ePerViewPositionXOnlyNVX )
+      result += "PerViewPositionXOnlyNVX | ";
+    if ( value & SubpassDescriptionFlagBits::eFragmentRegionQCOM )
+      result += "FragmentRegionQCOM | ";
+    if ( value & SubpassDescriptionFlagBits::eShaderResolveQCOM )
+      result += "ShaderResolveQCOM | ";
+    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT )
+      result += "RasterizationOrderAttachmentColorAccessEXT | ";
+    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT )
+      result += "RasterizationOrderAttachmentDepthAccessEXT | ";
+    if ( value & SubpassDescriptionFlagBits::eRasterizationOrderAttachmentStencilAccessEXT )
+      result += "RasterizationOrderAttachmentStencilAccessEXT | ";
+    if ( value & SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT )
+      result += "EnableLegacyDitheringEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolCreateFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & CommandPoolCreateFlagBits::eTransient )
+      result += "Transient | ";
+    if ( value & CommandPoolCreateFlagBits::eResetCommandBuffer )
+      result += "ResetCommandBuffer | ";
+    if ( value & CommandPoolCreateFlagBits::eProtected )
+      result += "Protected | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolResetFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & CommandPoolResetFlagBits::eReleaseResources )
+      result += "ReleaseResources | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandBufferResetFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & CommandBufferResetFlagBits::eReleaseResources )
+      result += "ReleaseResources | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandBufferUsageFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & CommandBufferUsageFlagBits::eOneTimeSubmit )
+      result += "OneTimeSubmit | ";
+    if ( value & CommandBufferUsageFlagBits::eRenderPassContinue )
+      result += "RenderPassContinue | ";
+    if ( value & CommandBufferUsageFlagBits::eSimultaneousUse )
+      result += "SimultaneousUse | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( QueryControlFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & QueryControlFlagBits::ePrecise )
+      result += "Precise | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( StencilFaceFlags value )
   {
-    std::string result = "{";
-    if ( value & StencilFaceFlagBits::eFront )
-      result += " Front |";
-    if ( value & StencilFaceFlagBits::eBack )
-      result += " Back |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & StencilFaceFlagBits::eFront )
+      result += "Front | ";
+    if ( value & StencilFaceFlagBits::eBack )
+      result += "Back | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_VERSION_1_1 ===
 
+  VULKAN_HPP_INLINE std::string to_string( SubgroupFeatureFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & SubgroupFeatureFlagBits::eBasic )
+      result += "Basic | ";
+    if ( value & SubgroupFeatureFlagBits::eVote )
+      result += "Vote | ";
+    if ( value & SubgroupFeatureFlagBits::eArithmetic )
+      result += "Arithmetic | ";
+    if ( value & SubgroupFeatureFlagBits::eBallot )
+      result += "Ballot | ";
+    if ( value & SubgroupFeatureFlagBits::eShuffle )
+      result += "Shuffle | ";
+    if ( value & SubgroupFeatureFlagBits::eShuffleRelative )
+      result += "ShuffleRelative | ";
+    if ( value & SubgroupFeatureFlagBits::eClustered )
+      result += "Clustered | ";
+    if ( value & SubgroupFeatureFlagBits::eQuad )
+      result += "Quad | ";
+    if ( value & SubgroupFeatureFlagBits::ePartitionedNV )
+      result += "PartitionedNV | ";
+    if ( value & SubgroupFeatureFlagBits::eRotateKHR )
+      result += "RotateKHR | ";
+    if ( value & SubgroupFeatureFlagBits::eRotateClusteredKHR )
+      result += "RotateClusteredKHR | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
   VULKAN_HPP_INLINE std::string to_string( PeerMemoryFeatureFlags value )
   {
-    std::string result = "{";
-    if ( value & PeerMemoryFeatureFlagBits::eCopySrc )
-      result += " CopySrc |";
-    if ( value & PeerMemoryFeatureFlagBits::eCopyDst )
-      result += " CopyDst |";
-    if ( value & PeerMemoryFeatureFlagBits::eGenericSrc )
-      result += " GenericSrc |";
-    if ( value & PeerMemoryFeatureFlagBits::eGenericDst )
-      result += " GenericDst |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PeerMemoryFeatureFlagBits::eCopySrc )
+      result += "CopySrc | ";
+    if ( value & PeerMemoryFeatureFlagBits::eCopyDst )
+      result += "CopyDst | ";
+    if ( value & PeerMemoryFeatureFlagBits::eGenericSrc )
+      result += "GenericSrc | ";
+    if ( value & PeerMemoryFeatureFlagBits::eGenericDst )
+      result += "GenericDst | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( MemoryAllocateFlags value )
   {
-    std::string result = "{";
-    if ( value & MemoryAllocateFlagBits::eDeviceMask )
-      result += " DeviceMask |";
-    if ( value & MemoryAllocateFlagBits::eDeviceAddress )
-      result += " DeviceAddress |";
-    if ( value & MemoryAllocateFlagBits::eDeviceAddressCaptureReplay )
-      result += " DeviceAddressCaptureReplay |";
-    if ( value & MemoryAllocateFlagBits::eZeroInitializeEXT )
-      result += " ZeroInitializeEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & MemoryAllocateFlagBits::eDeviceMask )
+      result += "DeviceMask | ";
+    if ( value & MemoryAllocateFlagBits::eDeviceAddress )
+      result += "DeviceAddress | ";
+    if ( value & MemoryAllocateFlagBits::eDeviceAddressCaptureReplay )
+      result += "DeviceAddressCaptureReplay | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandPoolTrimFlags )
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolTrimFlags )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorUpdateTemplateCreateFlags )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalMemoryHandleTypeFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & ExternalMemoryHandleTypeFlagBits::eOpaqueFd )
-      result += " OpaqueFd |";
+      result += "OpaqueFd | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eOpaqueWin32 )
-      result += " OpaqueWin32 |";
+      result += "OpaqueWin32 | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt )
-      result += " OpaqueWin32Kmt |";
+      result += "OpaqueWin32Kmt | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eD3D11Texture )
-      result += " D3D11Texture |";
+      result += "D3D11Texture | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eD3D11TextureKmt )
-      result += " D3D11TextureKmt |";
+      result += "D3D11TextureKmt | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eD3D12Heap )
-      result += " D3D12Heap |";
+      result += "D3D12Heap | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eD3D12Resource )
-      result += " D3D12Resource |";
+      result += "D3D12Resource | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eDmaBufEXT )
-      result += " DmaBufEXT |";
+      result += "DmaBufEXT | ";
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     if ( value & ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID )
-      result += " AndroidHardwareBufferANDROID |";
+      result += "AndroidHardwareBufferANDROID | ";
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
     if ( value & ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT )
-      result += " HostAllocationEXT |";
+      result += "HostAllocationEXT | ";
     if ( value & ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT )
-      result += " HostMappedForeignMemoryEXT |";
+      result += "HostMappedForeignMemoryEXT | ";
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     if ( value & ExternalMemoryHandleTypeFlagBits::eZirconVmoFUCHSIA )
-      result += " ZirconVmoFUCHSIA |";
+      result += "ZirconVmoFUCHSIA | ";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
     if ( value & ExternalMemoryHandleTypeFlagBits::eRdmaAddressNV )
-      result += " RdmaAddressNV |";
-#if defined( VK_USE_PLATFORM_OHOS )
-    if ( value & ExternalMemoryHandleTypeFlagBits::eOhNativeBufferOHOS )
-      result += " OhNativeBufferOHOS |";
-#endif /*VK_USE_PLATFORM_OHOS*/
+      result += "RdmaAddressNV | ";
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
     if ( value & ExternalMemoryHandleTypeFlagBits::eScreenBufferQNX )
-      result += " ScreenBufferQNX |";
+      result += "ScreenBufferQNX | ";
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-    if ( value & ExternalMemoryHandleTypeFlagBits::eMtlbufferEXT )
-      result += " MtlbufferEXT |";
-    if ( value & ExternalMemoryHandleTypeFlagBits::eMtltextureEXT )
-      result += " MtltextureEXT |";
-    if ( value & ExternalMemoryHandleTypeFlagBits::eMtlheapEXT )
-      result += " MtlheapEXT |";
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalMemoryFeatureFlags value )
   {
-    std::string result = "{";
-    if ( value & ExternalMemoryFeatureFlagBits::eDedicatedOnly )
-      result += " DedicatedOnly |";
-    if ( value & ExternalMemoryFeatureFlagBits::eExportable )
-      result += " Exportable |";
-    if ( value & ExternalMemoryFeatureFlagBits::eImportable )
-      result += " Importable |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExternalMemoryFeatureFlagBits::eDedicatedOnly )
+      result += "DedicatedOnly | ";
+    if ( value & ExternalMemoryFeatureFlagBits::eExportable )
+      result += "Exportable | ";
+    if ( value & ExternalMemoryFeatureFlagBits::eImportable )
+      result += "Importable | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalFenceHandleTypeFlags value )
   {
-    std::string result = "{";
-    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueFd )
-      result += " OpaqueFd |";
-    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueWin32 )
-      result += " OpaqueWin32 |";
-    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueWin32Kmt )
-      result += " OpaqueWin32Kmt |";
-    if ( value & ExternalFenceHandleTypeFlagBits::eSyncFd )
-      result += " SyncFd |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueFd )
+      result += "OpaqueFd | ";
+    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueWin32 )
+      result += "OpaqueWin32 | ";
+    if ( value & ExternalFenceHandleTypeFlagBits::eOpaqueWin32Kmt )
+      result += "OpaqueWin32Kmt | ";
+    if ( value & ExternalFenceHandleTypeFlagBits::eSyncFd )
+      result += "SyncFd | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalFenceFeatureFlags value )
   {
-    std::string result = "{";
-    if ( value & ExternalFenceFeatureFlagBits::eExportable )
-      result += " Exportable |";
-    if ( value & ExternalFenceFeatureFlagBits::eImportable )
-      result += " Importable |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExternalFenceFeatureFlagBits::eExportable )
+      result += "Exportable | ";
+    if ( value & ExternalFenceFeatureFlagBits::eImportable )
+      result += "Importable | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( FenceImportFlags value )
   {
-    std::string result = "{";
-    if ( value & FenceImportFlagBits::eTemporary )
-      result += " Temporary |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & FenceImportFlagBits::eTemporary )
+      result += "Temporary | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SemaphoreImportFlags value )
   {
-    std::string result = "{";
-    if ( value & SemaphoreImportFlagBits::eTemporary )
-      result += " Temporary |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SemaphoreImportFlagBits::eTemporary )
+      result += "Temporary | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalSemaphoreHandleTypeFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd )
-      result += " OpaqueFd |";
+      result += "OpaqueFd | ";
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32 )
-      result += " OpaqueWin32 |";
+      result += "OpaqueWin32 | ";
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt )
-      result += " OpaqueWin32Kmt |";
+      result += "OpaqueWin32Kmt | ";
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence )
-      result += " D3D12Fence |";
+      result += "D3D12Fence | ";
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eSyncFd )
-      result += " SyncFd |";
+      result += "SyncFd | ";
 #if defined( VK_USE_PLATFORM_FUCHSIA )
     if ( value & ExternalSemaphoreHandleTypeFlagBits::eZirconEventFUCHSIA )
-      result += " ZirconEventFUCHSIA |";
+      result += "ZirconEventFUCHSIA | ";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalSemaphoreFeatureFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & ExternalSemaphoreFeatureFlagBits::eExportable )
-      result += " Exportable |";
+      result += "Exportable | ";
     if ( value & ExternalSemaphoreFeatureFlagBits::eImportable )
-      result += " Importable |";
+      result += "Importable | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( SubgroupFeatureFlags value )
-  {
-    std::string result = "{";
-    if ( value & SubgroupFeatureFlagBits::eBasic )
-      result += " Basic |";
-    if ( value & SubgroupFeatureFlagBits::eVote )
-      result += " Vote |";
-    if ( value & SubgroupFeatureFlagBits::eArithmetic )
-      result += " Arithmetic |";
-    if ( value & SubgroupFeatureFlagBits::eBallot )
-      result += " Ballot |";
-    if ( value & SubgroupFeatureFlagBits::eShuffle )
-      result += " Shuffle |";
-    if ( value & SubgroupFeatureFlagBits::eShuffleRelative )
-      result += " ShuffleRelative |";
-    if ( value & SubgroupFeatureFlagBits::eClustered )
-      result += " Clustered |";
-    if ( value & SubgroupFeatureFlagBits::eQuad )
-      result += " Quad |";
-    if ( value & SubgroupFeatureFlagBits::eRotate )
-      result += " Rotate |";
-    if ( value & SubgroupFeatureFlagBits::eRotateClustered )
-      result += " RotateClustered |";
-    if ( value & SubgroupFeatureFlagBits::ePartitionedNV )
-      result += " PartitionedNV |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorUpdateTemplateCreateFlags )
-  {
-    return "{}";
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_VERSION_1_2 ===
 
-  VULKAN_HPP_INLINE std::string to_string( SemaphoreWaitFlags value )
-  {
-    std::string result = "{";
-    if ( value & SemaphoreWaitFlagBits::eAny )
-      result += " Any |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
   VULKAN_HPP_INLINE std::string to_string( DescriptorBindingFlags value )
   {
-    std::string result = "{";
-    if ( value & DescriptorBindingFlagBits::eUpdateAfterBind )
-      result += " UpdateAfterBind |";
-    if ( value & DescriptorBindingFlagBits::eUpdateUnusedWhilePending )
-      result += " UpdateUnusedWhilePending |";
-    if ( value & DescriptorBindingFlagBits::ePartiallyBound )
-      result += " PartiallyBound |";
-    if ( value & DescriptorBindingFlagBits::eVariableDescriptorCount )
-      result += " VariableDescriptorCount |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DescriptorBindingFlagBits::eUpdateAfterBind )
+      result += "UpdateAfterBind | ";
+    if ( value & DescriptorBindingFlagBits::eUpdateUnusedWhilePending )
+      result += "UpdateUnusedWhilePending | ";
+    if ( value & DescriptorBindingFlagBits::ePartiallyBound )
+      result += "PartiallyBound | ";
+    if ( value & DescriptorBindingFlagBits::eVariableDescriptorCount )
+      result += "VariableDescriptorCount | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ResolveModeFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "None";
+
+    std::string result;
     if ( value & ResolveModeFlagBits::eSampleZero )
-      result += " SampleZero |";
+      result += "SampleZero | ";
     if ( value & ResolveModeFlagBits::eAverage )
-      result += " Average |";
+      result += "Average | ";
     if ( value & ResolveModeFlagBits::eMin )
-      result += " Min |";
+      result += "Min | ";
     if ( value & ResolveModeFlagBits::eMax )
-      result += " Max |";
+      result += "Max | ";
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
     if ( value & ResolveModeFlagBits::eExternalFormatDownsampleANDROID )
-      result += " ExternalFormatDownsampleANDROID |";
+      result += "ExternalFormatDownsampleANDROID | ";
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-    if ( value & ResolveModeFlagBits::eCustomEXT )
-      result += " CustomEXT |";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreWaitFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & SemaphoreWaitFlagBits::eAny )
+      result += "Any | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_VERSION_1_3 ===
 
-  VULKAN_HPP_INLINE std::string to_string( ToolPurposeFlags value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCreationFeedbackFlags value )
   {
-    std::string result = "{";
-    if ( value & ToolPurposeFlagBits::eValidation )
-      result += " Validation |";
-    if ( value & ToolPurposeFlagBits::eProfiling )
-      result += " Profiling |";
-    if ( value & ToolPurposeFlagBits::eTracing )
-      result += " Tracing |";
-    if ( value & ToolPurposeFlagBits::eAdditionalFeatures )
-      result += " AdditionalFeatures |";
-    if ( value & ToolPurposeFlagBits::eModifyingFeatures )
-      result += " ModifyingFeatures |";
-    if ( value & ToolPurposeFlagBits::eDebugReportingEXT )
-      result += " DebugReportingEXT |";
-    if ( value & ToolPurposeFlagBits::eDebugMarkersEXT )
-      result += " DebugMarkersEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PipelineCreationFeedbackFlagBits::eValid )
+      result += "Valid | ";
+    if ( value & PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit )
+      result += "ApplicationPipelineCacheHit | ";
+    if ( value & PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration )
+      result += "BasePipelineAcceleration | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PrivateDataSlotCreateFlags )
+  VULKAN_HPP_INLINE std::string to_string( ToolPurposeFlags value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & ToolPurposeFlagBits::eValidation )
+      result += "Validation | ";
+    if ( value & ToolPurposeFlagBits::eProfiling )
+      result += "Profiling | ";
+    if ( value & ToolPurposeFlagBits::eTracing )
+      result += "Tracing | ";
+    if ( value & ToolPurposeFlagBits::eAdditionalFeatures )
+      result += "AdditionalFeatures | ";
+    if ( value & ToolPurposeFlagBits::eModifyingFeatures )
+      result += "ModifyingFeatures | ";
+    if ( value & ToolPurposeFlagBits::eDebugReportingEXT )
+      result += "DebugReportingEXT | ";
+    if ( value & ToolPurposeFlagBits::eDebugMarkersEXT )
+      result += "DebugMarkersEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PrivateDataSlotCreateFlags )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( PipelineStageFlags2 value )
   {
-    std::string result = "{";
-    if ( value & PipelineStageFlagBits2::eTopOfPipe )
-      result += " TopOfPipe |";
-    if ( value & PipelineStageFlagBits2::eDrawIndirect )
-      result += " DrawIndirect |";
-    if ( value & PipelineStageFlagBits2::eVertexInput )
-      result += " VertexInput |";
-    if ( value & PipelineStageFlagBits2::eVertexShader )
-      result += " VertexShader |";
-    if ( value & PipelineStageFlagBits2::eTessellationControlShader )
-      result += " TessellationControlShader |";
-    if ( value & PipelineStageFlagBits2::eTessellationEvaluationShader )
-      result += " TessellationEvaluationShader |";
-    if ( value & PipelineStageFlagBits2::eGeometryShader )
-      result += " GeometryShader |";
-    if ( value & PipelineStageFlagBits2::eFragmentShader )
-      result += " FragmentShader |";
-    if ( value & PipelineStageFlagBits2::eEarlyFragmentTests )
-      result += " EarlyFragmentTests |";
-    if ( value & PipelineStageFlagBits2::eLateFragmentTests )
-      result += " LateFragmentTests |";
-    if ( value & PipelineStageFlagBits2::eColorAttachmentOutput )
-      result += " ColorAttachmentOutput |";
-    if ( value & PipelineStageFlagBits2::eComputeShader )
-      result += " ComputeShader |";
-    if ( value & PipelineStageFlagBits2::eAllTransfer )
-      result += " AllTransfer |";
-    if ( value & PipelineStageFlagBits2::eBottomOfPipe )
-      result += " BottomOfPipe |";
-    if ( value & PipelineStageFlagBits2::eHost )
-      result += " Host |";
-    if ( value & PipelineStageFlagBits2::eAllGraphics )
-      result += " AllGraphics |";
-    if ( value & PipelineStageFlagBits2::eAllCommands )
-      result += " AllCommands |";
-    if ( value & PipelineStageFlagBits2::eCopy )
-      result += " Copy |";
-    if ( value & PipelineStageFlagBits2::eResolve )
-      result += " Resolve |";
-    if ( value & PipelineStageFlagBits2::eBlit )
-      result += " Blit |";
-    if ( value & PipelineStageFlagBits2::eClear )
-      result += " Clear |";
-    if ( value & PipelineStageFlagBits2::eIndexInput )
-      result += " IndexInput |";
-    if ( value & PipelineStageFlagBits2::eVertexAttributeInput )
-      result += " VertexAttributeInput |";
-    if ( value & PipelineStageFlagBits2::ePreRasterizationShaders )
-      result += " PreRasterizationShaders |";
-    if ( value & PipelineStageFlagBits2::eVideoDecodeKHR )
-      result += " VideoDecodeKHR |";
-    if ( value & PipelineStageFlagBits2::eVideoEncodeKHR )
-      result += " VideoEncodeKHR |";
-    if ( value & PipelineStageFlagBits2::eTransformFeedbackEXT )
-      result += " TransformFeedbackEXT |";
-    if ( value & PipelineStageFlagBits2::eConditionalRenderingEXT )
-      result += " ConditionalRenderingEXT |";
-    if ( value & PipelineStageFlagBits2::eCommandPreprocessEXT )
-      result += " CommandPreprocessEXT |";
-    if ( value & PipelineStageFlagBits2::eFragmentShadingRateAttachmentKHR )
-      result += " FragmentShadingRateAttachmentKHR |";
-    if ( value & PipelineStageFlagBits2::eAccelerationStructureBuildKHR )
-      result += " AccelerationStructureBuildKHR |";
-    if ( value & PipelineStageFlagBits2::eRayTracingShaderKHR )
-      result += " RayTracingShaderKHR |";
-    if ( value & PipelineStageFlagBits2::eFragmentDensityProcessEXT )
-      result += " FragmentDensityProcessEXT |";
-    if ( value & PipelineStageFlagBits2::eTaskShaderEXT )
-      result += " TaskShaderEXT |";
-    if ( value & PipelineStageFlagBits2::eMeshShaderEXT )
-      result += " MeshShaderEXT |";
-    if ( value & PipelineStageFlagBits2::eSubpassShaderHUAWEI )
-      result += " SubpassShaderHUAWEI |";
-    if ( value & PipelineStageFlagBits2::eInvocationMaskHUAWEI )
-      result += " InvocationMaskHUAWEI |";
-    if ( value & PipelineStageFlagBits2::eAccelerationStructureCopyKHR )
-      result += " AccelerationStructureCopyKHR |";
-    if ( value & PipelineStageFlagBits2::eMicromapBuildEXT )
-      result += " MicromapBuildEXT |";
-    if ( value & PipelineStageFlagBits2::eClusterCullingShaderHUAWEI )
-      result += " ClusterCullingShaderHUAWEI |";
-    if ( value & PipelineStageFlagBits2::eOpticalFlowNV )
-      result += " OpticalFlowNV |";
-    if ( value & PipelineStageFlagBits2::eConvertCooperativeVectorMatrixNV )
-      result += " ConvertCooperativeVectorMatrixNV |";
-    if ( value & PipelineStageFlagBits2::eDataGraphARM )
-      result += " DataGraphARM |";
-    if ( value & PipelineStageFlagBits2::eCopyIndirectKHR )
-      result += " CopyIndirectKHR |";
-    if ( value & PipelineStageFlagBits2::eMemoryDecompressionEXT )
-      result += " MemoryDecompressionEXT |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & PipelineStageFlagBits2::eTopOfPipe )
+      result += "TopOfPipe | ";
+    if ( value & PipelineStageFlagBits2::eDrawIndirect )
+      result += "DrawIndirect | ";
+    if ( value & PipelineStageFlagBits2::eVertexInput )
+      result += "VertexInput | ";
+    if ( value & PipelineStageFlagBits2::eVertexShader )
+      result += "VertexShader | ";
+    if ( value & PipelineStageFlagBits2::eTessellationControlShader )
+      result += "TessellationControlShader | ";
+    if ( value & PipelineStageFlagBits2::eTessellationEvaluationShader )
+      result += "TessellationEvaluationShader | ";
+    if ( value & PipelineStageFlagBits2::eGeometryShader )
+      result += "GeometryShader | ";
+    if ( value & PipelineStageFlagBits2::eFragmentShader )
+      result += "FragmentShader | ";
+    if ( value & PipelineStageFlagBits2::eEarlyFragmentTests )
+      result += "EarlyFragmentTests | ";
+    if ( value & PipelineStageFlagBits2::eLateFragmentTests )
+      result += "LateFragmentTests | ";
+    if ( value & PipelineStageFlagBits2::eColorAttachmentOutput )
+      result += "ColorAttachmentOutput | ";
+    if ( value & PipelineStageFlagBits2::eComputeShader )
+      result += "ComputeShader | ";
+    if ( value & PipelineStageFlagBits2::eAllTransfer )
+      result += "AllTransfer | ";
+    if ( value & PipelineStageFlagBits2::eBottomOfPipe )
+      result += "BottomOfPipe | ";
+    if ( value & PipelineStageFlagBits2::eHost )
+      result += "Host | ";
+    if ( value & PipelineStageFlagBits2::eAllGraphics )
+      result += "AllGraphics | ";
+    if ( value & PipelineStageFlagBits2::eAllCommands )
+      result += "AllCommands | ";
+    if ( value & PipelineStageFlagBits2::eCopy )
+      result += "Copy | ";
+    if ( value & PipelineStageFlagBits2::eResolve )
+      result += "Resolve | ";
+    if ( value & PipelineStageFlagBits2::eBlit )
+      result += "Blit | ";
+    if ( value & PipelineStageFlagBits2::eClear )
+      result += "Clear | ";
+    if ( value & PipelineStageFlagBits2::eIndexInput )
+      result += "IndexInput | ";
+    if ( value & PipelineStageFlagBits2::eVertexAttributeInput )
+      result += "VertexAttributeInput | ";
+    if ( value & PipelineStageFlagBits2::ePreRasterizationShaders )
+      result += "PreRasterizationShaders | ";
+    if ( value & PipelineStageFlagBits2::eVideoDecodeKHR )
+      result += "VideoDecodeKHR | ";
+    if ( value & PipelineStageFlagBits2::eVideoEncodeKHR )
+      result += "VideoEncodeKHR | ";
+    if ( value & PipelineStageFlagBits2::eTransformFeedbackEXT )
+      result += "TransformFeedbackEXT | ";
+    if ( value & PipelineStageFlagBits2::eConditionalRenderingEXT )
+      result += "ConditionalRenderingEXT | ";
+    if ( value & PipelineStageFlagBits2::eCommandPreprocessNV )
+      result += "CommandPreprocessNV | ";
+    if ( value & PipelineStageFlagBits2::eFragmentShadingRateAttachmentKHR )
+      result += "FragmentShadingRateAttachmentKHR | ";
+    if ( value & PipelineStageFlagBits2::eAccelerationStructureBuildKHR )
+      result += "AccelerationStructureBuildKHR | ";
+    if ( value & PipelineStageFlagBits2::eRayTracingShaderKHR )
+      result += "RayTracingShaderKHR | ";
+    if ( value & PipelineStageFlagBits2::eFragmentDensityProcessEXT )
+      result += "FragmentDensityProcessEXT | ";
+    if ( value & PipelineStageFlagBits2::eTaskShaderEXT )
+      result += "TaskShaderEXT | ";
+    if ( value & PipelineStageFlagBits2::eMeshShaderEXT )
+      result += "MeshShaderEXT | ";
+    if ( value & PipelineStageFlagBits2::eSubpassShaderHUAWEI )
+      result += "SubpassShaderHUAWEI | ";
+    if ( value & PipelineStageFlagBits2::eInvocationMaskHUAWEI )
+      result += "InvocationMaskHUAWEI | ";
+    if ( value & PipelineStageFlagBits2::eAccelerationStructureCopyKHR )
+      result += "AccelerationStructureCopyKHR | ";
+    if ( value & PipelineStageFlagBits2::eMicromapBuildEXT )
+      result += "MicromapBuildEXT | ";
+    if ( value & PipelineStageFlagBits2::eClusterCullingShaderHUAWEI )
+      result += "ClusterCullingShaderHUAWEI | ";
+    if ( value & PipelineStageFlagBits2::eOpticalFlowNV )
+      result += "OpticalFlowNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( AccessFlags2 value )
   {
-    std::string result = "{";
-    if ( value & AccessFlagBits2::eIndirectCommandRead )
-      result += " IndirectCommandRead |";
-    if ( value & AccessFlagBits2::eIndexRead )
-      result += " IndexRead |";
-    if ( value & AccessFlagBits2::eVertexAttributeRead )
-      result += " VertexAttributeRead |";
-    if ( value & AccessFlagBits2::eUniformRead )
-      result += " UniformRead |";
-    if ( value & AccessFlagBits2::eInputAttachmentRead )
-      result += " InputAttachmentRead |";
-    if ( value & AccessFlagBits2::eShaderRead )
-      result += " ShaderRead |";
-    if ( value & AccessFlagBits2::eShaderWrite )
-      result += " ShaderWrite |";
-    if ( value & AccessFlagBits2::eColorAttachmentRead )
-      result += " ColorAttachmentRead |";
-    if ( value & AccessFlagBits2::eColorAttachmentWrite )
-      result += " ColorAttachmentWrite |";
-    if ( value & AccessFlagBits2::eDepthStencilAttachmentRead )
-      result += " DepthStencilAttachmentRead |";
-    if ( value & AccessFlagBits2::eDepthStencilAttachmentWrite )
-      result += " DepthStencilAttachmentWrite |";
-    if ( value & AccessFlagBits2::eTransferRead )
-      result += " TransferRead |";
-    if ( value & AccessFlagBits2::eTransferWrite )
-      result += " TransferWrite |";
-    if ( value & AccessFlagBits2::eHostRead )
-      result += " HostRead |";
-    if ( value & AccessFlagBits2::eHostWrite )
-      result += " HostWrite |";
-    if ( value & AccessFlagBits2::eMemoryRead )
-      result += " MemoryRead |";
-    if ( value & AccessFlagBits2::eMemoryWrite )
-      result += " MemoryWrite |";
-    if ( value & AccessFlagBits2::eShaderSampledRead )
-      result += " ShaderSampledRead |";
-    if ( value & AccessFlagBits2::eShaderStorageRead )
-      result += " ShaderStorageRead |";
-    if ( value & AccessFlagBits2::eShaderStorageWrite )
-      result += " ShaderStorageWrite |";
-    if ( value & AccessFlagBits2::eVideoDecodeReadKHR )
-      result += " VideoDecodeReadKHR |";
-    if ( value & AccessFlagBits2::eVideoDecodeWriteKHR )
-      result += " VideoDecodeWriteKHR |";
-    if ( value & AccessFlagBits2::eVideoEncodeReadKHR )
-      result += " VideoEncodeReadKHR |";
-    if ( value & AccessFlagBits2::eVideoEncodeWriteKHR )
-      result += " VideoEncodeWriteKHR |";
-    if ( value & AccessFlagBits2::eShaderTileAttachmentReadQCOM )
-      result += " ShaderTileAttachmentReadQCOM |";
-    if ( value & AccessFlagBits2::eShaderTileAttachmentWriteQCOM )
-      result += " ShaderTileAttachmentWriteQCOM |";
-    if ( value & AccessFlagBits2::eTransformFeedbackWriteEXT )
-      result += " TransformFeedbackWriteEXT |";
-    if ( value & AccessFlagBits2::eTransformFeedbackCounterReadEXT )
-      result += " TransformFeedbackCounterReadEXT |";
-    if ( value & AccessFlagBits2::eTransformFeedbackCounterWriteEXT )
-      result += " TransformFeedbackCounterWriteEXT |";
-    if ( value & AccessFlagBits2::eConditionalRenderingReadEXT )
-      result += " ConditionalRenderingReadEXT |";
-    if ( value & AccessFlagBits2::eCommandPreprocessReadEXT )
-      result += " CommandPreprocessReadEXT |";
-    if ( value & AccessFlagBits2::eCommandPreprocessWriteEXT )
-      result += " CommandPreprocessWriteEXT |";
-    if ( value & AccessFlagBits2::eFragmentShadingRateAttachmentReadKHR )
-      result += " FragmentShadingRateAttachmentReadKHR |";
-    if ( value & AccessFlagBits2::eAccelerationStructureReadKHR )
-      result += " AccelerationStructureReadKHR |";
-    if ( value & AccessFlagBits2::eAccelerationStructureWriteKHR )
-      result += " AccelerationStructureWriteKHR |";
-    if ( value & AccessFlagBits2::eFragmentDensityMapReadEXT )
-      result += " FragmentDensityMapReadEXT |";
-    if ( value & AccessFlagBits2::eColorAttachmentReadNoncoherentEXT )
-      result += " ColorAttachmentReadNoncoherentEXT |";
-    if ( value & AccessFlagBits2::eDescriptorBufferReadEXT )
-      result += " DescriptorBufferReadEXT |";
-    if ( value & AccessFlagBits2::eInvocationMaskReadHUAWEI )
-      result += " InvocationMaskReadHUAWEI |";
-    if ( value & AccessFlagBits2::eShaderBindingTableReadKHR )
-      result += " ShaderBindingTableReadKHR |";
-    if ( value & AccessFlagBits2::eMicromapReadEXT )
-      result += " MicromapReadEXT |";
-    if ( value & AccessFlagBits2::eMicromapWriteEXT )
-      result += " MicromapWriteEXT |";
-    if ( value & AccessFlagBits2::eOpticalFlowReadNV )
-      result += " OpticalFlowReadNV |";
-    if ( value & AccessFlagBits2::eOpticalFlowWriteNV )
-      result += " OpticalFlowWriteNV |";
-    if ( value & AccessFlagBits2::eDataGraphReadARM )
-      result += " DataGraphReadARM |";
-    if ( value & AccessFlagBits2::eDataGraphWriteARM )
-      result += " DataGraphWriteARM |";
-    if ( value & AccessFlagBits2::eMemoryDecompressionReadEXT )
-      result += " MemoryDecompressionReadEXT |";
-    if ( value & AccessFlagBits2::eMemoryDecompressionWriteEXT )
-      result += " MemoryDecompressionWriteEXT |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & AccessFlagBits2::eIndirectCommandRead )
+      result += "IndirectCommandRead | ";
+    if ( value & AccessFlagBits2::eIndexRead )
+      result += "IndexRead | ";
+    if ( value & AccessFlagBits2::eVertexAttributeRead )
+      result += "VertexAttributeRead | ";
+    if ( value & AccessFlagBits2::eUniformRead )
+      result += "UniformRead | ";
+    if ( value & AccessFlagBits2::eInputAttachmentRead )
+      result += "InputAttachmentRead | ";
+    if ( value & AccessFlagBits2::eShaderRead )
+      result += "ShaderRead | ";
+    if ( value & AccessFlagBits2::eShaderWrite )
+      result += "ShaderWrite | ";
+    if ( value & AccessFlagBits2::eColorAttachmentRead )
+      result += "ColorAttachmentRead | ";
+    if ( value & AccessFlagBits2::eColorAttachmentWrite )
+      result += "ColorAttachmentWrite | ";
+    if ( value & AccessFlagBits2::eDepthStencilAttachmentRead )
+      result += "DepthStencilAttachmentRead | ";
+    if ( value & AccessFlagBits2::eDepthStencilAttachmentWrite )
+      result += "DepthStencilAttachmentWrite | ";
+    if ( value & AccessFlagBits2::eTransferRead )
+      result += "TransferRead | ";
+    if ( value & AccessFlagBits2::eTransferWrite )
+      result += "TransferWrite | ";
+    if ( value & AccessFlagBits2::eHostRead )
+      result += "HostRead | ";
+    if ( value & AccessFlagBits2::eHostWrite )
+      result += "HostWrite | ";
+    if ( value & AccessFlagBits2::eMemoryRead )
+      result += "MemoryRead | ";
+    if ( value & AccessFlagBits2::eMemoryWrite )
+      result += "MemoryWrite | ";
+    if ( value & AccessFlagBits2::eShaderSampledRead )
+      result += "ShaderSampledRead | ";
+    if ( value & AccessFlagBits2::eShaderStorageRead )
+      result += "ShaderStorageRead | ";
+    if ( value & AccessFlagBits2::eShaderStorageWrite )
+      result += "ShaderStorageWrite | ";
+    if ( value & AccessFlagBits2::eVideoDecodeReadKHR )
+      result += "VideoDecodeReadKHR | ";
+    if ( value & AccessFlagBits2::eVideoDecodeWriteKHR )
+      result += "VideoDecodeWriteKHR | ";
+    if ( value & AccessFlagBits2::eVideoEncodeReadKHR )
+      result += "VideoEncodeReadKHR | ";
+    if ( value & AccessFlagBits2::eVideoEncodeWriteKHR )
+      result += "VideoEncodeWriteKHR | ";
+    if ( value & AccessFlagBits2::eTransformFeedbackWriteEXT )
+      result += "TransformFeedbackWriteEXT | ";
+    if ( value & AccessFlagBits2::eTransformFeedbackCounterReadEXT )
+      result += "TransformFeedbackCounterReadEXT | ";
+    if ( value & AccessFlagBits2::eTransformFeedbackCounterWriteEXT )
+      result += "TransformFeedbackCounterWriteEXT | ";
+    if ( value & AccessFlagBits2::eConditionalRenderingReadEXT )
+      result += "ConditionalRenderingReadEXT | ";
+    if ( value & AccessFlagBits2::eCommandPreprocessReadNV )
+      result += "CommandPreprocessReadNV | ";
+    if ( value & AccessFlagBits2::eCommandPreprocessWriteNV )
+      result += "CommandPreprocessWriteNV | ";
+    if ( value & AccessFlagBits2::eFragmentShadingRateAttachmentReadKHR )
+      result += "FragmentShadingRateAttachmentReadKHR | ";
+    if ( value & AccessFlagBits2::eAccelerationStructureReadKHR )
+      result += "AccelerationStructureReadKHR | ";
+    if ( value & AccessFlagBits2::eAccelerationStructureWriteKHR )
+      result += "AccelerationStructureWriteKHR | ";
+    if ( value & AccessFlagBits2::eFragmentDensityMapReadEXT )
+      result += "FragmentDensityMapReadEXT | ";
+    if ( value & AccessFlagBits2::eColorAttachmentReadNoncoherentEXT )
+      result += "ColorAttachmentReadNoncoherentEXT | ";
+    if ( value & AccessFlagBits2::eDescriptorBufferReadEXT )
+      result += "DescriptorBufferReadEXT | ";
+    if ( value & AccessFlagBits2::eInvocationMaskReadHUAWEI )
+      result += "InvocationMaskReadHUAWEI | ";
+    if ( value & AccessFlagBits2::eShaderBindingTableReadKHR )
+      result += "ShaderBindingTableReadKHR | ";
+    if ( value & AccessFlagBits2::eMicromapReadEXT )
+      result += "MicromapReadEXT | ";
+    if ( value & AccessFlagBits2::eMicromapWriteEXT )
+      result += "MicromapWriteEXT | ";
+    if ( value & AccessFlagBits2::eOpticalFlowReadNV )
+      result += "OpticalFlowReadNV | ";
+    if ( value & AccessFlagBits2::eOpticalFlowWriteNV )
+      result += "OpticalFlowWriteNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SubmitFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & SubmitFlagBits::eProtected )
-      result += " Protected |";
+      result += "Protected | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( FormatFeatureFlags2 value )
-  {
-    std::string result = "{";
-    if ( value & FormatFeatureFlagBits2::eSampledImage )
-      result += " SampledImage |";
-    if ( value & FormatFeatureFlagBits2::eStorageImage )
-      result += " StorageImage |";
-    if ( value & FormatFeatureFlagBits2::eStorageImageAtomic )
-      result += " StorageImageAtomic |";
-    if ( value & FormatFeatureFlagBits2::eUniformTexelBuffer )
-      result += " UniformTexelBuffer |";
-    if ( value & FormatFeatureFlagBits2::eStorageTexelBuffer )
-      result += " StorageTexelBuffer |";
-    if ( value & FormatFeatureFlagBits2::eStorageTexelBufferAtomic )
-      result += " StorageTexelBufferAtomic |";
-    if ( value & FormatFeatureFlagBits2::eVertexBuffer )
-      result += " VertexBuffer |";
-    if ( value & FormatFeatureFlagBits2::eColorAttachment )
-      result += " ColorAttachment |";
-    if ( value & FormatFeatureFlagBits2::eColorAttachmentBlend )
-      result += " ColorAttachmentBlend |";
-    if ( value & FormatFeatureFlagBits2::eDepthStencilAttachment )
-      result += " DepthStencilAttachment |";
-    if ( value & FormatFeatureFlagBits2::eBlitSrc )
-      result += " BlitSrc |";
-    if ( value & FormatFeatureFlagBits2::eBlitDst )
-      result += " BlitDst |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageFilterLinear )
-      result += " SampledImageFilterLinear |";
-    if ( value & FormatFeatureFlagBits2::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & FormatFeatureFlagBits2::eTransferDst )
-      result += " TransferDst |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageFilterMinmax )
-      result += " SampledImageFilterMinmax |";
-    if ( value & FormatFeatureFlagBits2::eMidpointChromaSamples )
-      result += " MidpointChromaSamples |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionLinearFilter )
-      result += " SampledImageYcbcrConversionLinearFilter |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionSeparateReconstructionFilter )
-      result += " SampledImageYcbcrConversionSeparateReconstructionFilter |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicit )
-      result += " SampledImageYcbcrConversionChromaReconstructionExplicit |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable )
-      result += " SampledImageYcbcrConversionChromaReconstructionExplicitForceable |";
-    if ( value & FormatFeatureFlagBits2::eDisjoint )
-      result += " Disjoint |";
-    if ( value & FormatFeatureFlagBits2::eCositedChromaSamples )
-      result += " CositedChromaSamples |";
-    if ( value & FormatFeatureFlagBits2::eStorageReadWithoutFormat )
-      result += " StorageReadWithoutFormat |";
-    if ( value & FormatFeatureFlagBits2::eStorageWriteWithoutFormat )
-      result += " StorageWriteWithoutFormat |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageDepthComparison )
-      result += " SampledImageDepthComparison |";
-    if ( value & FormatFeatureFlagBits2::eSampledImageFilterCubic )
-      result += " SampledImageFilterCubic |";
-    if ( value & FormatFeatureFlagBits2::eHostImageTransfer )
-      result += " HostImageTransfer |";
-    if ( value & FormatFeatureFlagBits2::eVideoDecodeOutputKHR )
-      result += " VideoDecodeOutputKHR |";
-    if ( value & FormatFeatureFlagBits2::eVideoDecodeDpbKHR )
-      result += " VideoDecodeDpbKHR |";
-    if ( value & FormatFeatureFlagBits2::eAccelerationStructureVertexBufferKHR )
-      result += " AccelerationStructureVertexBufferKHR |";
-    if ( value & FormatFeatureFlagBits2::eFragmentDensityMapEXT )
-      result += " FragmentDensityMapEXT |";
-    if ( value & FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR )
-      result += " FragmentShadingRateAttachmentKHR |";
-    if ( value & FormatFeatureFlagBits2::eVideoEncodeInputKHR )
-      result += " VideoEncodeInputKHR |";
-    if ( value & FormatFeatureFlagBits2::eVideoEncodeDpbKHR )
-      result += " VideoEncodeDpbKHR |";
-    if ( value & FormatFeatureFlagBits2::eAccelerationStructureRadiusBufferNV )
-      result += " AccelerationStructureRadiusBufferNV |";
-    if ( value & FormatFeatureFlagBits2::eLinearColorAttachmentNV )
-      result += " LinearColorAttachmentNV |";
-    if ( value & FormatFeatureFlagBits2::eWeightImageQCOM )
-      result += " WeightImageQCOM |";
-    if ( value & FormatFeatureFlagBits2::eWeightSampledImageQCOM )
-      result += " WeightSampledImageQCOM |";
-    if ( value & FormatFeatureFlagBits2::eBlockMatchingQCOM )
-      result += " BlockMatchingQCOM |";
-    if ( value & FormatFeatureFlagBits2::eBoxFilterSampledQCOM )
-      result += " BoxFilterSampledQCOM |";
-    if ( value & FormatFeatureFlagBits2::eTensorShaderARM )
-      result += " TensorShaderARM |";
-    if ( value & FormatFeatureFlagBits2::eTensorImageAliasingARM )
-      result += " TensorImageAliasingARM |";
-    if ( value & FormatFeatureFlagBits2::eOpticalFlowImageNV )
-      result += " OpticalFlowImageNV |";
-    if ( value & FormatFeatureFlagBits2::eOpticalFlowVectorNV )
-      result += " OpticalFlowVectorNV |";
-    if ( value & FormatFeatureFlagBits2::eOpticalFlowCostNV )
-      result += " OpticalFlowCostNV |";
-    if ( value & FormatFeatureFlagBits2::eTensorDataGraphARM )
-      result += " TensorDataGraphARM |";
-    if ( value & FormatFeatureFlagBits2::eCopyImageIndirectDstKHR )
-      result += " CopyImageIndirectDstKHR |";
-    if ( value & FormatFeatureFlagBits2::eVideoEncodeQuantizationDeltaMapKHR )
-      result += " VideoEncodeQuantizationDeltaMapKHR |";
-    if ( value & FormatFeatureFlagBits2::eVideoEncodeEmphasisMapKHR )
-      result += " VideoEncodeEmphasisMapKHR |";
-    if ( value & FormatFeatureFlagBits2::eDepthCopyOnComputeQueueKHR )
-      result += " DepthCopyOnComputeQueueKHR |";
-    if ( value & FormatFeatureFlagBits2::eDepthCopyOnTransferQueueKHR )
-      result += " DepthCopyOnTransferQueueKHR |";
-    if ( value & FormatFeatureFlagBits2::eStencilCopyOnComputeQueueKHR )
-      result += " StencilCopyOnComputeQueueKHR |";
-    if ( value & FormatFeatureFlagBits2::eStencilCopyOnTransferQueueKHR )
-      result += " StencilCopyOnTransferQueueKHR |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PipelineCreationFeedbackFlags value )
-  {
-    std::string result = "{";
-    if ( value & PipelineCreationFeedbackFlagBits::eValid )
-      result += " Valid |";
-    if ( value & PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit )
-      result += " ApplicationPipelineCacheHit |";
-    if ( value & PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration )
-      result += " BasePipelineAcceleration |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( RenderingFlags value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & RenderingFlagBits::eContentsSecondaryCommandBuffers )
-      result += " ContentsSecondaryCommandBuffers |";
+      result += "ContentsSecondaryCommandBuffers | ";
     if ( value & RenderingFlagBits::eSuspending )
-      result += " Suspending |";
+      result += "Suspending | ";
     if ( value & RenderingFlagBits::eResuming )
-      result += " Resuming |";
+      result += "Resuming | ";
+    if ( value & RenderingFlagBits::eContentsInlineEXT )
+      result += "ContentsInlineEXT | ";
     if ( value & RenderingFlagBits::eEnableLegacyDitheringEXT )
-      result += " EnableLegacyDitheringEXT |";
-    if ( value & RenderingFlagBits::eContentsInlineKHR )
-      result += " ContentsInlineKHR |";
-    if ( value & RenderingFlagBits::ePerLayerFragmentDensityVALVE )
-      result += " PerLayerFragmentDensityVALVE |";
-    if ( value & RenderingFlagBits::eFragmentRegionEXT )
-      result += " FragmentRegionEXT |";
-    if ( value & RenderingFlagBits::eCustomResolveEXT )
-      result += " CustomResolveEXT |";
-    if ( value & RenderingFlagBits::eLocalReadConcurrentAccessControlKHR )
-      result += " LocalReadConcurrentAccessControlKHR |";
+      result += "EnableLegacyDitheringEXT | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  //=== VK_VERSION_1_4 ===
-
-  VULKAN_HPP_INLINE std::string to_string( MemoryUnmapFlags value )
+  VULKAN_HPP_INLINE std::string to_string( FormatFeatureFlags2 value )
   {
-    std::string result = "{";
-    if ( value & MemoryUnmapFlagBits::eReserveEXT )
-      result += " ReserveEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
+    std::string result;
+    if ( value & FormatFeatureFlagBits2::eSampledImage )
+      result += "SampledImage | ";
+    if ( value & FormatFeatureFlagBits2::eStorageImage )
+      result += "StorageImage | ";
+    if ( value & FormatFeatureFlagBits2::eStorageImageAtomic )
+      result += "StorageImageAtomic | ";
+    if ( value & FormatFeatureFlagBits2::eUniformTexelBuffer )
+      result += "UniformTexelBuffer | ";
+    if ( value & FormatFeatureFlagBits2::eStorageTexelBuffer )
+      result += "StorageTexelBuffer | ";
+    if ( value & FormatFeatureFlagBits2::eStorageTexelBufferAtomic )
+      result += "StorageTexelBufferAtomic | ";
+    if ( value & FormatFeatureFlagBits2::eVertexBuffer )
+      result += "VertexBuffer | ";
+    if ( value & FormatFeatureFlagBits2::eColorAttachment )
+      result += "ColorAttachment | ";
+    if ( value & FormatFeatureFlagBits2::eColorAttachmentBlend )
+      result += "ColorAttachmentBlend | ";
+    if ( value & FormatFeatureFlagBits2::eDepthStencilAttachment )
+      result += "DepthStencilAttachment | ";
+    if ( value & FormatFeatureFlagBits2::eBlitSrc )
+      result += "BlitSrc | ";
+    if ( value & FormatFeatureFlagBits2::eBlitDst )
+      result += "BlitDst | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageFilterLinear )
+      result += "SampledImageFilterLinear | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageFilterCubic )
+      result += "SampledImageFilterCubic | ";
+    if ( value & FormatFeatureFlagBits2::eTransferSrc )
+      result += "TransferSrc | ";
+    if ( value & FormatFeatureFlagBits2::eTransferDst )
+      result += "TransferDst | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageFilterMinmax )
+      result += "SampledImageFilterMinmax | ";
+    if ( value & FormatFeatureFlagBits2::eMidpointChromaSamples )
+      result += "MidpointChromaSamples | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionLinearFilter )
+      result += "SampledImageYcbcrConversionLinearFilter | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionSeparateReconstructionFilter )
+      result += "SampledImageYcbcrConversionSeparateReconstructionFilter | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicit )
+      result += "SampledImageYcbcrConversionChromaReconstructionExplicit | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable )
+      result += "SampledImageYcbcrConversionChromaReconstructionExplicitForceable | ";
+    if ( value & FormatFeatureFlagBits2::eDisjoint )
+      result += "Disjoint | ";
+    if ( value & FormatFeatureFlagBits2::eCositedChromaSamples )
+      result += "CositedChromaSamples | ";
+    if ( value & FormatFeatureFlagBits2::eStorageReadWithoutFormat )
+      result += "StorageReadWithoutFormat | ";
+    if ( value & FormatFeatureFlagBits2::eStorageWriteWithoutFormat )
+      result += "StorageWriteWithoutFormat | ";
+    if ( value & FormatFeatureFlagBits2::eSampledImageDepthComparison )
+      result += "SampledImageDepthComparison | ";
+    if ( value & FormatFeatureFlagBits2::eVideoDecodeOutputKHR )
+      result += "VideoDecodeOutputKHR | ";
+    if ( value & FormatFeatureFlagBits2::eVideoDecodeDpbKHR )
+      result += "VideoDecodeDpbKHR | ";
+    if ( value & FormatFeatureFlagBits2::eAccelerationStructureVertexBufferKHR )
+      result += "AccelerationStructureVertexBufferKHR | ";
+    if ( value & FormatFeatureFlagBits2::eFragmentDensityMapEXT )
+      result += "FragmentDensityMapEXT | ";
+    if ( value & FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR )
+      result += "FragmentShadingRateAttachmentKHR | ";
+    if ( value & FormatFeatureFlagBits2::eHostImageTransferEXT )
+      result += "HostImageTransferEXT | ";
+    if ( value & FormatFeatureFlagBits2::eVideoEncodeInputKHR )
+      result += "VideoEncodeInputKHR | ";
+    if ( value & FormatFeatureFlagBits2::eVideoEncodeDpbKHR )
+      result += "VideoEncodeDpbKHR | ";
+    if ( value & FormatFeatureFlagBits2::eLinearColorAttachmentNV )
+      result += "LinearColorAttachmentNV | ";
+    if ( value & FormatFeatureFlagBits2::eWeightImageQCOM )
+      result += "WeightImageQCOM | ";
+    if ( value & FormatFeatureFlagBits2::eWeightSampledImageQCOM )
+      result += "WeightSampledImageQCOM | ";
+    if ( value & FormatFeatureFlagBits2::eBlockMatchingQCOM )
+      result += "BlockMatchingQCOM | ";
+    if ( value & FormatFeatureFlagBits2::eBoxFilterSampledQCOM )
+      result += "BoxFilterSampledQCOM | ";
+    if ( value & FormatFeatureFlagBits2::eOpticalFlowImageNV )
+      result += "OpticalFlowImageNV | ";
+    if ( value & FormatFeatureFlagBits2::eOpticalFlowVectorNV )
+      result += "OpticalFlowVectorNV | ";
+    if ( value & FormatFeatureFlagBits2::eOpticalFlowCostNV )
+      result += "OpticalFlowCostNV | ";
 
-  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlags2 value )
-  {
-    std::string result = "{";
-    if ( value & BufferUsageFlagBits2::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & BufferUsageFlagBits2::eTransferDst )
-      result += " TransferDst |";
-    if ( value & BufferUsageFlagBits2::eUniformTexelBuffer )
-      result += " UniformTexelBuffer |";
-    if ( value & BufferUsageFlagBits2::eStorageTexelBuffer )
-      result += " StorageTexelBuffer |";
-    if ( value & BufferUsageFlagBits2::eUniformBuffer )
-      result += " UniformBuffer |";
-    if ( value & BufferUsageFlagBits2::eStorageBuffer )
-      result += " StorageBuffer |";
-    if ( value & BufferUsageFlagBits2::eIndexBuffer )
-      result += " IndexBuffer |";
-    if ( value & BufferUsageFlagBits2::eVertexBuffer )
-      result += " VertexBuffer |";
-    if ( value & BufferUsageFlagBits2::eIndirectBuffer )
-      result += " IndirectBuffer |";
-    if ( value & BufferUsageFlagBits2::eShaderDeviceAddress )
-      result += " ShaderDeviceAddress |";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    if ( value & BufferUsageFlagBits2::eExecutionGraphScratchAMDX )
-      result += " ExecutionGraphScratchAMDX |";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    if ( value & BufferUsageFlagBits2::eConditionalRenderingEXT )
-      result += " ConditionalRenderingEXT |";
-    if ( value & BufferUsageFlagBits2::eShaderBindingTableKHR )
-      result += " ShaderBindingTableKHR |";
-    if ( value & BufferUsageFlagBits2::eTransformFeedbackBufferEXT )
-      result += " TransformFeedbackBufferEXT |";
-    if ( value & BufferUsageFlagBits2::eTransformFeedbackCounterBufferEXT )
-      result += " TransformFeedbackCounterBufferEXT |";
-    if ( value & BufferUsageFlagBits2::eVideoDecodeSrcKHR )
-      result += " VideoDecodeSrcKHR |";
-    if ( value & BufferUsageFlagBits2::eVideoDecodeDstKHR )
-      result += " VideoDecodeDstKHR |";
-    if ( value & BufferUsageFlagBits2::eVideoEncodeDstKHR )
-      result += " VideoEncodeDstKHR |";
-    if ( value & BufferUsageFlagBits2::eVideoEncodeSrcKHR )
-      result += " VideoEncodeSrcKHR |";
-    if ( value & BufferUsageFlagBits2::eAccelerationStructureBuildInputReadOnlyKHR )
-      result += " AccelerationStructureBuildInputReadOnlyKHR |";
-    if ( value & BufferUsageFlagBits2::eAccelerationStructureStorageKHR )
-      result += " AccelerationStructureStorageKHR |";
-    if ( value & BufferUsageFlagBits2::eSamplerDescriptorBufferEXT )
-      result += " SamplerDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits2::eResourceDescriptorBufferEXT )
-      result += " ResourceDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits2::ePushDescriptorsDescriptorBufferEXT )
-      result += " PushDescriptorsDescriptorBufferEXT |";
-    if ( value & BufferUsageFlagBits2::eMicromapBuildInputReadOnlyEXT )
-      result += " MicromapBuildInputReadOnlyEXT |";
-    if ( value & BufferUsageFlagBits2::eMicromapStorageEXT )
-      result += " MicromapStorageEXT |";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    if ( value & BufferUsageFlagBits2::eCompressedDataDgf1AMDX )
-      result += " CompressedDataDgf1AMDX |";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    if ( value & BufferUsageFlagBits2::eDataGraphForeignDescriptorARM )
-      result += " DataGraphForeignDescriptorARM |";
-    if ( value & BufferUsageFlagBits2::eTileMemoryQCOM )
-      result += " TileMemoryQCOM |";
-    if ( value & BufferUsageFlagBits2::eMemoryDecompressionEXT )
-      result += " MemoryDecompressionEXT |";
-    if ( value & BufferUsageFlagBits2::ePreprocessBufferEXT )
-      result += " PreprocessBufferEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( HostImageCopyFlags value )
-  {
-    std::string result = "{";
-    if ( value & HostImageCopyFlagBits::eMemcpy )
-      result += " Memcpy |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PipelineCreateFlags2 value )
-  {
-    std::string result = "{";
-    if ( value & PipelineCreateFlagBits2::eDisableOptimization )
-      result += " DisableOptimization |";
-    if ( value & PipelineCreateFlagBits2::eAllowDerivatives )
-      result += " AllowDerivatives |";
-    if ( value & PipelineCreateFlagBits2::eDerivative )
-      result += " Derivative |";
-    if ( value & PipelineCreateFlagBits2::eViewIndexFromDeviceIndex )
-      result += " ViewIndexFromDeviceIndex |";
-    if ( value & PipelineCreateFlagBits2::eDispatchBase )
-      result += " DispatchBase |";
-    if ( value & PipelineCreateFlagBits2::eFailOnPipelineCompileRequired )
-      result += " FailOnPipelineCompileRequired |";
-    if ( value & PipelineCreateFlagBits2::eEarlyReturnOnFailure )
-      result += " EarlyReturnOnFailure |";
-    if ( value & PipelineCreateFlagBits2::eNoProtectedAccess )
-      result += " NoProtectedAccess |";
-    if ( value & PipelineCreateFlagBits2::eProtectedAccessOnly )
-      result += " ProtectedAccessOnly |";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-    if ( value & PipelineCreateFlagBits2::eExecutionGraphAMDX )
-      result += " ExecutionGraphAMDX |";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-    if ( value & PipelineCreateFlagBits2::eRayTracingAllowSpheresAndLinearSweptSpheresNV )
-      result += " RayTracingAllowSpheresAndLinearSweptSpheresNV |";
-    if ( value & PipelineCreateFlagBits2::eEnableLegacyDitheringEXT )
-      result += " EnableLegacyDitheringEXT |";
-    if ( value & PipelineCreateFlagBits2::eDeferCompileNV )
-      result += " DeferCompileNV |";
-    if ( value & PipelineCreateFlagBits2::eCaptureStatisticsKHR )
-      result += " CaptureStatisticsKHR |";
-    if ( value & PipelineCreateFlagBits2::eCaptureInternalRepresentationsKHR )
-      result += " CaptureInternalRepresentationsKHR |";
-    if ( value & PipelineCreateFlagBits2::eLinkTimeOptimizationEXT )
-      result += " LinkTimeOptimizationEXT |";
-    if ( value & PipelineCreateFlagBits2::eRetainLinkTimeOptimizationInfoEXT )
-      result += " RetainLinkTimeOptimizationInfoEXT |";
-    if ( value & PipelineCreateFlagBits2::eLibraryKHR )
-      result += " LibraryKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingSkipTrianglesKHR )
-      result += " RayTracingSkipTrianglesKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingSkipAabbsKHR )
-      result += " RayTracingSkipAabbsKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingNoNullAnyHitShadersKHR )
-      result += " RayTracingNoNullAnyHitShadersKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingNoNullClosestHitShadersKHR )
-      result += " RayTracingNoNullClosestHitShadersKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingNoNullMissShadersKHR )
-      result += " RayTracingNoNullMissShadersKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingNoNullIntersectionShadersKHR )
-      result += " RayTracingNoNullIntersectionShadersKHR |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingShaderGroupHandleCaptureReplayKHR )
-      result += " RayTracingShaderGroupHandleCaptureReplayKHR |";
-    if ( value & PipelineCreateFlagBits2::eIndirectBindableNV )
-      result += " IndirectBindableNV |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingAllowMotionNV )
-      result += " RayTracingAllowMotionNV |";
-    if ( value & PipelineCreateFlagBits2::eRenderingFragmentShadingRateAttachmentKHR )
-      result += " RenderingFragmentShadingRateAttachmentKHR |";
-    if ( value & PipelineCreateFlagBits2::eRenderingFragmentDensityMapAttachmentEXT )
-      result += " RenderingFragmentDensityMapAttachmentEXT |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingOpacityMicromapEXT )
-      result += " RayTracingOpacityMicromapEXT |";
-    if ( value & PipelineCreateFlagBits2::eColorAttachmentFeedbackLoopEXT )
-      result += " ColorAttachmentFeedbackLoopEXT |";
-    if ( value & PipelineCreateFlagBits2::eDepthStencilAttachmentFeedbackLoopEXT )
-      result += " DepthStencilAttachmentFeedbackLoopEXT |";
-    if ( value & PipelineCreateFlagBits2::eRayTracingDisplacementMicromapNV )
-      result += " RayTracingDisplacementMicromapNV |";
-    if ( value & PipelineCreateFlagBits2::eDescriptorBufferEXT )
-      result += " DescriptorBufferEXT |";
-    if ( value & PipelineCreateFlagBits2::eDisallowOpacityMicromapARM )
-      result += " DisallowOpacityMicromapARM |";
-    if ( value & PipelineCreateFlagBits2::eCaptureDataKHR )
-      result += " CaptureDataKHR |";
-    if ( value & PipelineCreateFlagBits2::eIndirectBindableEXT )
-      result += " IndirectBindableEXT |";
-    if ( value & PipelineCreateFlagBits2::ePerLayerFragmentDensityVALVE )
-      result += " PerLayerFragmentDensityVALVE |";
-    if ( value & PipelineCreateFlagBits2::e64BitIndexingEXT )
-      result += " 64BitIndexingEXT |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_surface ===
 
   VULKAN_HPP_INLINE std::string to_string( CompositeAlphaFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & CompositeAlphaFlagBitsKHR::eOpaque )
-      result += " Opaque |";
-    if ( value & CompositeAlphaFlagBitsKHR::ePreMultiplied )
-      result += " PreMultiplied |";
-    if ( value & CompositeAlphaFlagBitsKHR::ePostMultiplied )
-      result += " PostMultiplied |";
-    if ( value & CompositeAlphaFlagBitsKHR::eInherit )
-      result += " Inherit |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & CompositeAlphaFlagBitsKHR::eOpaque )
+      result += "Opaque | ";
+    if ( value & CompositeAlphaFlagBitsKHR::ePreMultiplied )
+      result += "PreMultiplied | ";
+    if ( value & CompositeAlphaFlagBitsKHR::ePostMultiplied )
+      result += "PostMultiplied | ";
+    if ( value & CompositeAlphaFlagBitsKHR::eInherit )
+      result += "Inherit | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_swapchain ===
 
   VULKAN_HPP_INLINE std::string to_string( SwapchainCreateFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & SwapchainCreateFlagBitsKHR::eSplitInstanceBindRegions )
-      result += " SplitInstanceBindRegions |";
-    if ( value & SwapchainCreateFlagBitsKHR::eProtected )
-      result += " Protected |";
-    if ( value & SwapchainCreateFlagBitsKHR::eMutableFormat )
-      result += " MutableFormat |";
-    if ( value & SwapchainCreateFlagBitsKHR::ePresentTimingEXT )
-      result += " PresentTimingEXT |";
-    if ( value & SwapchainCreateFlagBitsKHR::ePresentId2 )
-      result += " PresentId2 |";
-    if ( value & SwapchainCreateFlagBitsKHR::ePresentWait2 )
-      result += " PresentWait2 |";
-    if ( value & SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocation )
-      result += " DeferredMemoryAllocation |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SwapchainCreateFlagBitsKHR::eSplitInstanceBindRegions )
+      result += "SplitInstanceBindRegions | ";
+    if ( value & SwapchainCreateFlagBitsKHR::eProtected )
+      result += "Protected | ";
+    if ( value & SwapchainCreateFlagBitsKHR::eMutableFormat )
+      result += "MutableFormat | ";
+    if ( value & SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocationEXT )
+      result += "DeferredMemoryAllocationEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DeviceGroupPresentModeFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & DeviceGroupPresentModeFlagBitsKHR::eLocal )
-      result += " Local |";
-    if ( value & DeviceGroupPresentModeFlagBitsKHR::eRemote )
-      result += " Remote |";
-    if ( value & DeviceGroupPresentModeFlagBitsKHR::eSum )
-      result += " Sum |";
-    if ( value & DeviceGroupPresentModeFlagBitsKHR::eLocalMultiDevice )
-      result += " LocalMultiDevice |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DeviceGroupPresentModeFlagBitsKHR::eLocal )
+      result += "Local | ";
+    if ( value & DeviceGroupPresentModeFlagBitsKHR::eRemote )
+      result += "Remote | ";
+    if ( value & DeviceGroupPresentModeFlagBitsKHR::eSum )
+      result += "Sum | ";
+    if ( value & DeviceGroupPresentModeFlagBitsKHR::eLocalMultiDevice )
+      result += "LocalMultiDevice | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_display ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplayModeCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( DisplayModeCreateFlagsKHR )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DisplayPlaneAlphaFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & DisplayPlaneAlphaFlagBitsKHR::eOpaque )
-      result += " Opaque |";
-    if ( value & DisplayPlaneAlphaFlagBitsKHR::eGlobal )
-      result += " Global |";
-    if ( value & DisplayPlaneAlphaFlagBitsKHR::ePerPixel )
-      result += " PerPixel |";
-    if ( value & DisplayPlaneAlphaFlagBitsKHR::ePerPixelPremultiplied )
-      result += " PerPixelPremultiplied |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DisplayPlaneAlphaFlagBitsKHR::eOpaque )
+      result += "Opaque | ";
+    if ( value & DisplayPlaneAlphaFlagBitsKHR::eGlobal )
+      result += "Global | ";
+    if ( value & DisplayPlaneAlphaFlagBitsKHR::ePerPixel )
+      result += "PerPixel | ";
+    if ( value & DisplayPlaneAlphaFlagBitsKHR::ePerPixelPremultiplied )
+      result += "PerPixelPremultiplied | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplaySurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( DisplaySurfaceCreateFlagsKHR )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( SurfaceTransformFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & SurfaceTransformFlagBitsKHR::eIdentity )
-      result += " Identity |";
-    if ( value & SurfaceTransformFlagBitsKHR::eRotate90 )
-      result += " Rotate90 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eRotate180 )
-      result += " Rotate180 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eRotate270 )
-      result += " Rotate270 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirror )
-      result += " HorizontalMirror |";
-    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate90 )
-      result += " HorizontalMirrorRotate90 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate180 )
-      result += " HorizontalMirrorRotate180 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate270 )
-      result += " HorizontalMirrorRotate270 |";
-    if ( value & SurfaceTransformFlagBitsKHR::eInherit )
-      result += " Inherit |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SurfaceTransformFlagBitsKHR::eIdentity )
+      result += "Identity | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eRotate90 )
+      result += "Rotate90 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eRotate180 )
+      result += "Rotate180 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eRotate270 )
+      result += "Rotate270 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirror )
+      result += "HorizontalMirror | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate90 )
+      result += "HorizontalMirrorRotate90 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate180 )
+      result += "HorizontalMirrorRotate180 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate270 )
+      result += "HorizontalMirrorRotate270 | ";
+    if ( value & SurfaceTransformFlagBitsKHR::eInherit )
+      result += "Inherit | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
   //=== VK_KHR_xlib_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( XlibSurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( XlibSurfaceCreateFlagsKHR )
   {
     return "{}";
   }
@@ -2367,7 +1979,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XCB_KHR )
   //=== VK_KHR_xcb_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( XcbSurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( XcbSurfaceCreateFlagsKHR )
   {
     return "{}";
   }
@@ -2376,7 +1988,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
   //=== VK_KHR_wayland_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( WaylandSurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( WaylandSurfaceCreateFlagsKHR )
   {
     return "{}";
   }
@@ -2385,7 +1997,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_KHR_android_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AndroidSurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( AndroidSurfaceCreateFlagsKHR )
   {
     return "{}";
   }
@@ -2394,7 +2006,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_win32_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( Win32SurfaceCreateFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( Win32SurfaceCreateFlagsKHR )
   {
     return "{}";
   }
@@ -2404,208 +2016,181 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( DebugReportFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & DebugReportFlagBitsEXT::eInformation )
-      result += " Information |";
-    if ( value & DebugReportFlagBitsEXT::eWarning )
-      result += " Warning |";
-    if ( value & DebugReportFlagBitsEXT::ePerformanceWarning )
-      result += " PerformanceWarning |";
-    if ( value & DebugReportFlagBitsEXT::eError )
-      result += " Error |";
-    if ( value & DebugReportFlagBitsEXT::eDebug )
-      result += " Debug |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DebugReportFlagBitsEXT::eInformation )
+      result += "Information | ";
+    if ( value & DebugReportFlagBitsEXT::eWarning )
+      result += "Warning | ";
+    if ( value & DebugReportFlagBitsEXT::ePerformanceWarning )
+      result += "PerformanceWarning | ";
+    if ( value & DebugReportFlagBitsEXT::eError )
+      result += "Error | ";
+    if ( value & DebugReportFlagBitsEXT::eDebug )
+      result += "Debug | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_video_queue ===
 
   VULKAN_HPP_INLINE std::string to_string( VideoCodecOperationFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoCodecOperationFlagBitsKHR::eEncodeH264 )
-      result += " EncodeH264 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eEncodeH265 )
-      result += " EncodeH265 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeH264 )
-      result += " DecodeH264 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeH265 )
-      result += " DecodeH265 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeAv1 )
-      result += " DecodeAv1 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eEncodeAv1 )
-      result += " EncodeAv1 |";
-    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeVp9 )
-      result += " DecodeVp9 |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & VideoCodecOperationFlagBitsKHR::eEncodeH264 )
+      result += "EncodeH264 | ";
+    if ( value & VideoCodecOperationFlagBitsKHR::eEncodeH265 )
+      result += "EncodeH265 | ";
+    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeH264 )
+      result += "DecodeH264 | ";
+    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeH265 )
+      result += "DecodeH265 | ";
+    if ( value & VideoCodecOperationFlagBitsKHR::eDecodeAv1 )
+      result += "DecodeAv1 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoChromaSubsamplingFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoChromaSubsamplingFlagBitsKHR::eMonochrome )
-      result += " Monochrome |";
-    if ( value & VideoChromaSubsamplingFlagBitsKHR::e420 )
-      result += " 420 |";
-    if ( value & VideoChromaSubsamplingFlagBitsKHR::e422 )
-      result += " 422 |";
-    if ( value & VideoChromaSubsamplingFlagBitsKHR::e444 )
-      result += " 444 |";
+    if ( !value )
+      return "Invalid";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Invalid";
-    return result;
+    std::string result;
+    if ( value & VideoChromaSubsamplingFlagBitsKHR::eMonochrome )
+      result += "Monochrome | ";
+    if ( value & VideoChromaSubsamplingFlagBitsKHR::e420 )
+      result += "420 | ";
+    if ( value & VideoChromaSubsamplingFlagBitsKHR::e422 )
+      result += "422 | ";
+    if ( value & VideoChromaSubsamplingFlagBitsKHR::e444 )
+      result += "444 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoComponentBitDepthFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoComponentBitDepthFlagBitsKHR::e8 )
-      result += " 8 |";
-    if ( value & VideoComponentBitDepthFlagBitsKHR::e10 )
-      result += " 10 |";
-    if ( value & VideoComponentBitDepthFlagBitsKHR::e12 )
-      result += " 12 |";
+    if ( !value )
+      return "Invalid";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Invalid";
-    return result;
+    std::string result;
+    if ( value & VideoComponentBitDepthFlagBitsKHR::e8 )
+      result += "8 | ";
+    if ( value & VideoComponentBitDepthFlagBitsKHR::e10 )
+      result += "10 | ";
+    if ( value & VideoComponentBitDepthFlagBitsKHR::e12 )
+      result += "12 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoCapabilityFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoCapabilityFlagBitsKHR::eProtectedContent )
-      result += " ProtectedContent |";
-    if ( value & VideoCapabilityFlagBitsKHR::eSeparateReferenceImages )
-      result += " SeparateReferenceImages |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoCapabilityFlagBitsKHR::eProtectedContent )
+      result += "ProtectedContent | ";
+    if ( value & VideoCapabilityFlagBitsKHR::eSeparateReferenceImages )
+      result += "SeparateReferenceImages | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoSessionCreateFlagsKHR value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & VideoSessionCreateFlagBitsKHR::eProtectedContent )
-      result += " ProtectedContent |";
+      result += "ProtectedContent | ";
     if ( value & VideoSessionCreateFlagBitsKHR::eAllowEncodeParameterOptimizations )
-      result += " AllowEncodeParameterOptimizations |";
+      result += "AllowEncodeParameterOptimizations | ";
     if ( value & VideoSessionCreateFlagBitsKHR::eInlineQueries )
-      result += " InlineQueries |";
-    if ( value & VideoSessionCreateFlagBitsKHR::eAllowEncodeQuantizationDeltaMap )
-      result += " AllowEncodeQuantizationDeltaMap |";
-    if ( value & VideoSessionCreateFlagBitsKHR::eAllowEncodeEmphasisMap )
-      result += " AllowEncodeEmphasisMap |";
-    if ( value & VideoSessionCreateFlagBitsKHR::eInlineSessionParameters )
-      result += " InlineSessionParameters |";
+      result += "InlineQueries | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE std::string to_string( VideoSessionParametersCreateFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoSessionParametersCreateFlagBitsKHR::eQuantizationMapCompatible )
-      result += " QuantizationMapCompatible |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoBeginCodingFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoSessionParametersCreateFlagsKHR )
   {
     return "{}";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEndCodingFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoBeginCodingFlagsKHR )
+  {
+    return "{}";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( VideoEndCodingFlagsKHR )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoCodingControlFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoCodingControlFlagBitsKHR::eReset )
-      result += " Reset |";
-    if ( value & VideoCodingControlFlagBitsKHR::eEncodeRateControl )
-      result += " EncodeRateControl |";
-    if ( value & VideoCodingControlFlagBitsKHR::eEncodeQualityLevel )
-      result += " EncodeQualityLevel |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoCodingControlFlagBitsKHR::eReset )
+      result += "Reset | ";
+    if ( value & VideoCodingControlFlagBitsKHR::eEncodeRateControl )
+      result += "EncodeRateControl | ";
+    if ( value & VideoCodingControlFlagBitsKHR::eEncodeQualityLevel )
+      result += "EncodeQualityLevel | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_video_decode_queue ===
 
   VULKAN_HPP_INLINE std::string to_string( VideoDecodeCapabilityFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputCoincide )
-      result += " DpbAndOutputCoincide |";
-    if ( value & VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputDistinct )
-      result += " DpbAndOutputDistinct |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputCoincide )
+      result += "DpbAndOutputCoincide | ";
+    if ( value & VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputDistinct )
+      result += "DpbAndOutputDistinct | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoDecodeUsageFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoDecodeUsageFlagBitsKHR::eTranscoding )
-      result += " Transcoding |";
-    if ( value & VideoDecodeUsageFlagBitsKHR::eOffline )
-      result += " Offline |";
-    if ( value & VideoDecodeUsageFlagBitsKHR::eStreaming )
-      result += " Streaming |";
+    if ( !value )
+      return "Default";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Default";
-    return result;
+    std::string result;
+    if ( value & VideoDecodeUsageFlagBitsKHR::eTranscoding )
+      result += "Transcoding | ";
+    if ( value & VideoDecodeUsageFlagBitsKHR::eOffline )
+      result += "Offline | ";
+    if ( value & VideoDecodeUsageFlagBitsKHR::eStreaming )
+      result += "Streaming | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoDecodeFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoDecodeFlagsKHR )
   {
     return "{}";
   }
 
   //=== VK_EXT_transform_feedback ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationStateStreamCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationStateStreamCreateFlagsEXT )
   {
     return "{}";
   }
@@ -2614,277 +2199,260 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264CapabilityFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eHrdCompliance )
-      result += " HrdCompliance |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePredictionWeightTableGenerated )
-      result += " PredictionWeightTableGenerated |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eRowUnalignedSlice )
-      result += " RowUnalignedSlice |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eDifferentSliceType )
-      result += " DifferentSliceType |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL0List )
-      result += " BFrameInL0List |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL1List )
-      result += " BFrameInL1List |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp )
-      result += " PerPictureTypeMinMaxQp |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePerSliceConstantQp )
-      result += " PerSliceConstantQp |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu )
-      result += " GeneratePrefixNalu |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eBPictureIntraRefresh )
-      result += " BPictureIntraRefresh |";
-    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eMbQpDiffWraparound )
-      result += " MbQpDiffWraparound |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eHrdCompliance )
+      result += "HrdCompliance | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePredictionWeightTableGenerated )
+      result += "PredictionWeightTableGenerated | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eRowUnalignedSlice )
+      result += "RowUnalignedSlice | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eDifferentSliceType )
+      result += "DifferentSliceType | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL0List )
+      result += "BFrameInL0List | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL1List )
+      result += "BFrameInL1List | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp )
+      result += "PerPictureTypeMinMaxQp | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::ePerSliceConstantQp )
+      result += "PerSliceConstantQp | ";
+    if ( value & VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu )
+      result += "GeneratePrefixNalu | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264StdFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eSeparateColorPlaneFlagSet )
-      result += " SeparateColorPlaneFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eQpprimeYZeroTransformBypassFlagSet )
-      result += " QpprimeYZeroTransformBypassFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eScalingMatrixPresentFlagSet )
-      result += " ScalingMatrixPresentFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eChromaQpIndexOffset )
-      result += " ChromaQpIndexOffset |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eSecondChromaQpIndexOffset )
-      result += " SecondChromaQpIndexOffset |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::ePicInitQpMinus26 )
-      result += " PicInitQpMinus26 |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedPredFlagSet )
-      result += " WeightedPredFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcExplicit )
-      result += " WeightedBipredIdcExplicit |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcImplicit )
-      result += " WeightedBipredIdcImplicit |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eTransform8X8ModeFlagSet )
-      result += " Transform8X8ModeFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDirectSpatialMvPredFlagUnset )
-      result += " DirectSpatialMvPredFlagUnset |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagUnset )
-      result += " EntropyCodingModeFlagUnset |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagSet )
-      result += " EntropyCodingModeFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDirect8X8InferenceFlagUnset )
-      result += " Direct8X8InferenceFlagUnset |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eConstrainedIntraPredFlagSet )
-      result += " ConstrainedIntraPredFlagSet |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterDisabled )
-      result += " DeblockingFilterDisabled |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterEnabled )
-      result += " DeblockingFilterEnabled |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterPartial )
-      result += " DeblockingFilterPartial |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eSliceQpDelta )
-      result += " SliceQpDelta |";
-    if ( value & VideoEncodeH264StdFlagBitsKHR::eDifferentSliceQpDelta )
-      result += " DifferentSliceQpDelta |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eSeparateColorPlaneFlagSet )
+      result += "SeparateColorPlaneFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eQpprimeYZeroTransformBypassFlagSet )
+      result += "QpprimeYZeroTransformBypassFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eScalingMatrixPresentFlagSet )
+      result += "ScalingMatrixPresentFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eChromaQpIndexOffset )
+      result += "ChromaQpIndexOffset | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eSecondChromaQpIndexOffset )
+      result += "SecondChromaQpIndexOffset | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::ePicInitQpMinus26 )
+      result += "PicInitQpMinus26 | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedPredFlagSet )
+      result += "WeightedPredFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcExplicit )
+      result += "WeightedBipredIdcExplicit | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcImplicit )
+      result += "WeightedBipredIdcImplicit | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eTransform8X8ModeFlagSet )
+      result += "Transform8X8ModeFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDirectSpatialMvPredFlagUnset )
+      result += "DirectSpatialMvPredFlagUnset | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagUnset )
+      result += "EntropyCodingModeFlagUnset | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagSet )
+      result += "EntropyCodingModeFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDirect8X8InferenceFlagUnset )
+      result += "Direct8X8InferenceFlagUnset | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eConstrainedIntraPredFlagSet )
+      result += "ConstrainedIntraPredFlagSet | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterDisabled )
+      result += "DeblockingFilterDisabled | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterEnabled )
+      result += "DeblockingFilterEnabled | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterPartial )
+      result += "DeblockingFilterPartial | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eSliceQpDelta )
+      result += "SliceQpDelta | ";
+    if ( value & VideoEncodeH264StdFlagBitsKHR::eDifferentSliceQpDelta )
+      result += "DifferentSliceQpDelta | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264RateControlFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eAttemptHrdCompliance )
-      result += " AttemptHrdCompliance |";
-    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eRegularGop )
-      result += " RegularGop |";
-    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternFlat )
-      result += " ReferencePatternFlat |";
-    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternDyadic )
-      result += " ReferencePatternDyadic |";
-    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eTemporalLayerPatternDyadic )
-      result += " TemporalLayerPatternDyadic |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eAttemptHrdCompliance )
+      result += "AttemptHrdCompliance | ";
+    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eRegularGop )
+      result += "RegularGop | ";
+    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternFlat )
+      result += "ReferencePatternFlat | ";
+    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternDyadic )
+      result += "ReferencePatternDyadic | ";
+    if ( value & VideoEncodeH264RateControlFlagBitsKHR::eTemporalLayerPatternDyadic )
+      result += "TemporalLayerPatternDyadic | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_video_encode_h265 ===
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265CapabilityFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eHrdCompliance )
-      result += " HrdCompliance |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePredictionWeightTableGenerated )
-      result += " PredictionWeightTableGenerated |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eRowUnalignedSliceSegment )
-      result += " RowUnalignedSliceSegment |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eDifferentSliceSegmentType )
-      result += " DifferentSliceSegmentType |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL0List )
-      result += " BFrameInL0List |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL1List )
-      result += " BFrameInL1List |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp )
-      result += " PerPictureTypeMinMaxQp |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePerSliceSegmentConstantQp )
-      result += " PerSliceSegmentConstantQp |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment )
-      result += " MultipleTilesPerSliceSegment |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile )
-      result += " MultipleSliceSegmentsPerTile |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eBPictureIntraRefresh )
-      result += " BPictureIntraRefresh |";
-    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eCuQpDiffWraparound )
-      result += " CuQpDiffWraparound |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eHrdCompliance )
+      result += "HrdCompliance | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePredictionWeightTableGenerated )
+      result += "PredictionWeightTableGenerated | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eRowUnalignedSliceSegment )
+      result += "RowUnalignedSliceSegment | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eDifferentSliceSegmentType )
+      result += "DifferentSliceSegmentType | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL0List )
+      result += "BFrameInL0List | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL1List )
+      result += "BFrameInL1List | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp )
+      result += "PerPictureTypeMinMaxQp | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::ePerSliceSegmentConstantQp )
+      result += "PerSliceSegmentConstantQp | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment )
+      result += "MultipleTilesPerSliceSegment | ";
+    if ( value & VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile )
+      result += "MultipleSliceSegmentsPerTile | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265StdFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eSeparateColorPlaneFlagSet )
-      result += " SeparateColorPlaneFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eSampleAdaptiveOffsetEnabledFlagSet )
-      result += " SampleAdaptiveOffsetEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eScalingListDataPresentFlagSet )
-      result += " ScalingListDataPresentFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::ePcmEnabledFlagSet )
-      result += " PcmEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eSpsTemporalMvpEnabledFlagSet )
-      result += " SpsTemporalMvpEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eInitQpMinus26 )
-      result += " InitQpMinus26 |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eWeightedPredFlagSet )
-      result += " WeightedPredFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eWeightedBipredFlagSet )
-      result += " WeightedBipredFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eLog2ParallelMergeLevelMinus2 )
-      result += " Log2ParallelMergeLevelMinus2 |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eSignDataHidingEnabledFlagSet )
-      result += " SignDataHidingEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagSet )
-      result += " TransformSkipEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagUnset )
-      result += " TransformSkipEnabledFlagUnset |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::ePpsSliceChromaQpOffsetsPresentFlagSet )
-      result += " PpsSliceChromaQpOffsetsPresentFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransquantBypassEnabledFlagSet )
-      result += " TransquantBypassEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eConstrainedIntraPredFlagSet )
-      result += " ConstrainedIntraPredFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eEntropyCodingSyncEnabledFlagSet )
-      result += " EntropyCodingSyncEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eDeblockingFilterOverrideEnabledFlagSet )
-      result += " DeblockingFilterOverrideEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentsEnabledFlagSet )
-      result += " DependentSliceSegmentsEnabledFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentFlagSet )
-      result += " DependentSliceSegmentFlagSet |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eSliceQpDelta )
-      result += " SliceQpDelta |";
-    if ( value & VideoEncodeH265StdFlagBitsKHR::eDifferentSliceQpDelta )
-      result += " DifferentSliceQpDelta |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eSeparateColorPlaneFlagSet )
+      result += "SeparateColorPlaneFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eSampleAdaptiveOffsetEnabledFlagSet )
+      result += "SampleAdaptiveOffsetEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eScalingListDataPresentFlagSet )
+      result += "ScalingListDataPresentFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::ePcmEnabledFlagSet )
+      result += "PcmEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eSpsTemporalMvpEnabledFlagSet )
+      result += "SpsTemporalMvpEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eInitQpMinus26 )
+      result += "InitQpMinus26 | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eWeightedPredFlagSet )
+      result += "WeightedPredFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eWeightedBipredFlagSet )
+      result += "WeightedBipredFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eLog2ParallelMergeLevelMinus2 )
+      result += "Log2ParallelMergeLevelMinus2 | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eSignDataHidingEnabledFlagSet )
+      result += "SignDataHidingEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagSet )
+      result += "TransformSkipEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagUnset )
+      result += "TransformSkipEnabledFlagUnset | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::ePpsSliceChromaQpOffsetsPresentFlagSet )
+      result += "PpsSliceChromaQpOffsetsPresentFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eTransquantBypassEnabledFlagSet )
+      result += "TransquantBypassEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eConstrainedIntraPredFlagSet )
+      result += "ConstrainedIntraPredFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eEntropyCodingSyncEnabledFlagSet )
+      result += "EntropyCodingSyncEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eDeblockingFilterOverrideEnabledFlagSet )
+      result += "DeblockingFilterOverrideEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentsEnabledFlagSet )
+      result += "DependentSliceSegmentsEnabledFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentFlagSet )
+      result += "DependentSliceSegmentFlagSet | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eSliceQpDelta )
+      result += "SliceQpDelta | ";
+    if ( value & VideoEncodeH265StdFlagBitsKHR::eDifferentSliceQpDelta )
+      result += "DifferentSliceQpDelta | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265CtbSizeFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e16 )
-      result += " 16 |";
-    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e32 )
-      result += " 32 |";
-    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e64 )
-      result += " 64 |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e16 )
+      result += "16 | ";
+    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e32 )
+      result += "32 | ";
+    if ( value & VideoEncodeH265CtbSizeFlagBitsKHR::e64 )
+      result += "64 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265TransformBlockSizeFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e4 )
-      result += " 4 |";
-    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e8 )
-      result += " 8 |";
-    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e16 )
-      result += " 16 |";
-    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e32 )
-      result += " 32 |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e4 )
+      result += "4 | ";
+    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e8 )
+      result += "8 | ";
+    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e16 )
+      result += "16 | ";
+    if ( value & VideoEncodeH265TransformBlockSizeFlagBitsKHR::e32 )
+      result += "32 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265RateControlFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eAttemptHrdCompliance )
-      result += " AttemptHrdCompliance |";
-    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eRegularGop )
-      result += " RegularGop |";
-    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternFlat )
-      result += " ReferencePatternFlat |";
-    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternDyadic )
-      result += " ReferencePatternDyadic |";
-    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eTemporalSubLayerPatternDyadic )
-      result += " TemporalSubLayerPatternDyadic |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eAttemptHrdCompliance )
+      result += "AttemptHrdCompliance | ";
+    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eRegularGop )
+      result += "RegularGop | ";
+    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternFlat )
+      result += "ReferencePatternFlat | ";
+    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternDyadic )
+      result += "ReferencePatternDyadic | ";
+    if ( value & VideoEncodeH265RateControlFlagBitsKHR::eTemporalSubLayerPatternDyadic )
+      result += "TemporalSubLayerPatternDyadic | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_KHR_video_decode_h264 ===
 
   VULKAN_HPP_INLINE std::string to_string( VideoDecodeH264PictureLayoutFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedInterleavedLines )
-      result += " InterlacedInterleavedLines |";
-    if ( value & VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedSeparatePlanes )
-      result += " InterlacedSeparatePlanes |";
+    if ( !value )
+      return "Progressive";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Progressive";
-    return result;
+    std::string result;
+    if ( value & VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedInterleavedLines )
+      result += "InterlacedInterleavedLines | ";
+    if ( value & VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedSeparatePlanes )
+      result += "InterlacedSeparatePlanes | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_stream_descriptor_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( StreamDescriptorSurfaceCreateFlagsGGP )
+  VULKAN_HPP_INLINE std::string to_string( StreamDescriptorSurfaceCreateFlagsGGP )
   {
     return "{}";
   }
@@ -2894,44 +2462,42 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( ExternalMemoryHandleTypeFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32 )
-      result += " OpaqueWin32 |";
-    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32Kmt )
-      result += " OpaqueWin32Kmt |";
-    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eD3D11Image )
-      result += " D3D11Image |";
-    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eD3D11ImageKmt )
-      result += " D3D11ImageKmt |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32 )
+      result += "OpaqueWin32 | ";
+    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32Kmt )
+      result += "OpaqueWin32Kmt | ";
+    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eD3D11Image )
+      result += "D3D11Image | ";
+    if ( value & ExternalMemoryHandleTypeFlagBitsNV::eD3D11ImageKmt )
+      result += "D3D11ImageKmt | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ExternalMemoryFeatureFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & ExternalMemoryFeatureFlagBitsNV::eDedicatedOnly )
-      result += " DedicatedOnly |";
-    if ( value & ExternalMemoryFeatureFlagBitsNV::eExportable )
-      result += " Exportable |";
-    if ( value & ExternalMemoryFeatureFlagBitsNV::eImportable )
-      result += " Importable |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExternalMemoryFeatureFlagBitsNV::eDedicatedOnly )
+      result += "DedicatedOnly | ";
+    if ( value & ExternalMemoryFeatureFlagBitsNV::eExportable )
+      result += "Exportable | ";
+    if ( value & ExternalMemoryFeatureFlagBitsNV::eImportable )
+      result += "Importable | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_VI_NN )
   //=== VK_NN_vi_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ViSurfaceCreateFlagsNN )
+  VULKAN_HPP_INLINE std::string to_string( ViSurfaceCreateFlagsNN )
   {
     return "{}";
   }
@@ -2941,56 +2507,54 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( ConditionalRenderingFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & ConditionalRenderingFlagBitsEXT::eInverted )
-      result += " Inverted |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ConditionalRenderingFlagBitsEXT::eInverted )
+      result += "Inverted | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_EXT_display_surface_counter ===
 
   VULKAN_HPP_INLINE std::string to_string( SurfaceCounterFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & SurfaceCounterFlagBitsEXT::eVblank )
-      result += " Vblank |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & SurfaceCounterFlagBitsEXT::eVblank )
+      result += "Vblank | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_NV_viewport_swizzle ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineViewportSwizzleStateCreateFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineViewportSwizzleStateCreateFlagsNV )
   {
     return "{}";
   }
 
   //=== VK_EXT_discard_rectangles ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineDiscardRectangleStateCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineDiscardRectangleStateCreateFlagsEXT )
   {
     return "{}";
   }
 
   //=== VK_EXT_conservative_rasterization ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationConservativeStateCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationConservativeStateCreateFlagsEXT )
   {
     return "{}";
   }
 
   //=== VK_EXT_depth_clip_enable ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationDepthClipStateCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationDepthClipStateCreateFlagsEXT )
   {
     return "{}";
   }
@@ -2999,20 +2563,19 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( PerformanceCounterDescriptionFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & PerformanceCounterDescriptionFlagBitsKHR::ePerformanceImpacting )
-      result += " PerformanceImpacting |";
-    if ( value & PerformanceCounterDescriptionFlagBitsKHR::eConcurrentlyImpacted )
-      result += " ConcurrentlyImpacted |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PerformanceCounterDescriptionFlagBitsKHR::ePerformanceImpacting )
+      result += "PerformanceImpacting | ";
+    if ( value & PerformanceCounterDescriptionFlagBitsKHR::eConcurrentlyImpacted )
+      result += "ConcurrentlyImpacted | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AcquireProfilingLockFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( AcquireProfilingLockFlagsKHR )
   {
     return "{}";
   }
@@ -3020,7 +2583,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_IOS_MVK )
   //=== VK_MVK_ios_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IOSSurfaceCreateFlagsMVK )
+  VULKAN_HPP_INLINE std::string to_string( IOSSurfaceCreateFlagsMVK )
   {
     return "{}";
   }
@@ -3029,7 +2592,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
   //=== VK_MVK_macos_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MacOSSurfaceCreateFlagsMVK )
+  VULKAN_HPP_INLINE std::string to_string( MacOSSurfaceCreateFlagsMVK )
   {
     return "{}";
   }
@@ -3039,55 +2602,53 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessageSeverityFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eVerbose )
-      result += " Verbose |";
-    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eInfo )
-      result += " Info |";
-    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eWarning )
-      result += " Warning |";
-    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eError )
-      result += " Error |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eVerbose )
+      result += "Verbose | ";
+    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eInfo )
+      result += "Info | ";
+    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eWarning )
+      result += "Warning | ";
+    if ( value & DebugUtilsMessageSeverityFlagBitsEXT::eError )
+      result += "Error | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessageTypeFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eGeneral )
-      result += " General |";
-    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eValidation )
-      result += " Validation |";
-    if ( value & DebugUtilsMessageTypeFlagBitsEXT::ePerformance )
-      result += " Performance |";
-    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eDeviceAddressBinding )
-      result += " DeviceAddressBinding |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eGeneral )
+      result += "General | ";
+    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eValidation )
+      result += "Validation | ";
+    if ( value & DebugUtilsMessageTypeFlagBitsEXT::ePerformance )
+      result += "Performance | ";
+    if ( value & DebugUtilsMessageTypeFlagBitsEXT::eDeviceAddressBinding )
+      result += "DeviceAddressBinding | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessengerCallbackDataFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessengerCallbackDataFlagsEXT )
   {
     return "{}";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessengerCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessengerCreateFlagsEXT )
   {
     return "{}";
   }
 
   //=== VK_NV_fragment_coverage_to_color ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageToColorStateCreateFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageToColorStateCreateFlagsNV )
   {
     return "{}";
   }
@@ -3096,172 +2657,115 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( GeometryFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & GeometryFlagBitsKHR::eOpaque )
-      result += " Opaque |";
-    if ( value & GeometryFlagBitsKHR::eNoDuplicateAnyHitInvocation )
-      result += " NoDuplicateAnyHitInvocation |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & GeometryFlagBitsKHR::eOpaque )
+      result += "Opaque | ";
+    if ( value & GeometryFlagBitsKHR::eNoDuplicateAnyHitInvocation )
+      result += "NoDuplicateAnyHitInvocation | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( GeometryInstanceFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & GeometryInstanceFlagBitsKHR::eTriangleFacingCullDisable )
-      result += " TriangleFacingCullDisable |";
-    if ( value & GeometryInstanceFlagBitsKHR::eTriangleFlipFacing )
-      result += " TriangleFlipFacing |";
-    if ( value & GeometryInstanceFlagBitsKHR::eForceOpaque )
-      result += " ForceOpaque |";
-    if ( value & GeometryInstanceFlagBitsKHR::eForceNoOpaque )
-      result += " ForceNoOpaque |";
-    if ( value & GeometryInstanceFlagBitsKHR::eForceOpacityMicromap2StateEXT )
-      result += " ForceOpacityMicromap2StateEXT |";
-    if ( value & GeometryInstanceFlagBitsKHR::eDisableOpacityMicromapsEXT )
-      result += " DisableOpacityMicromapsEXT |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & GeometryInstanceFlagBitsKHR::eTriangleFacingCullDisable )
+      result += "TriangleFacingCullDisable | ";
+    if ( value & GeometryInstanceFlagBitsKHR::eTriangleFlipFacing )
+      result += "TriangleFlipFacing | ";
+    if ( value & GeometryInstanceFlagBitsKHR::eForceOpaque )
+      result += "ForceOpaque | ";
+    if ( value & GeometryInstanceFlagBitsKHR::eForceNoOpaque )
+      result += "ForceNoOpaque | ";
+    if ( value & GeometryInstanceFlagBitsKHR::eForceOpacityMicromap2StateEXT )
+      result += "ForceOpacityMicromap2StateEXT | ";
+    if ( value & GeometryInstanceFlagBitsKHR::eDisableOpacityMicromapsEXT )
+      result += "DisableOpacityMicromapsEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( BuildAccelerationStructureFlagsKHR value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowUpdate )
-      result += " AllowUpdate |";
+      result += "AllowUpdate | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowCompaction )
-      result += " AllowCompaction |";
+      result += "AllowCompaction | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::ePreferFastTrace )
-      result += " PreferFastTrace |";
+      result += "PreferFastTrace | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::ePreferFastBuild )
-      result += " PreferFastBuild |";
+      result += "PreferFastBuild | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eLowMemory )
-      result += " LowMemory |";
+      result += "LowMemory | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eMotionNV )
-      result += " MotionNV |";
+      result += "MotionNV | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowOpacityMicromapUpdateEXT )
-      result += " AllowOpacityMicromapUpdateEXT |";
+      result += "AllowOpacityMicromapUpdateEXT | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowDisableOpacityMicromapsEXT )
-      result += " AllowDisableOpacityMicromapsEXT |";
+      result += "AllowDisableOpacityMicromapsEXT | ";
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowOpacityMicromapDataUpdateEXT )
-      result += " AllowOpacityMicromapDataUpdateEXT |";
+      result += "AllowOpacityMicromapDataUpdateEXT | ";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowDisplacementMicromapUpdateNV )
-      result += " AllowDisplacementMicromapUpdateNV |";
+      result += "AllowDisplacementMicromapUpdateNV | ";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
     if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowDataAccess )
-      result += " AllowDataAccess |";
-    if ( value & BuildAccelerationStructureFlagBitsKHR::eAllowClusterOpacityMicromapsNV )
-      result += " AllowClusterOpacityMicromapsNV |";
+      result += "AllowDataAccess | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( AccelerationStructureCreateFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & AccelerationStructureCreateFlagBitsKHR::eDeviceAddressCaptureReplay )
-      result += " DeviceAddressCaptureReplay |";
-    if ( value & AccelerationStructureCreateFlagBitsKHR::eDescriptorBufferCaptureReplayEXT )
-      result += " DescriptorBufferCaptureReplayEXT |";
-    if ( value & AccelerationStructureCreateFlagBitsKHR::eMotionNV )
-      result += " MotionNV |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & AccelerationStructureCreateFlagBitsKHR::eDeviceAddressCaptureReplay )
+      result += "DeviceAddressCaptureReplay | ";
+    if ( value & AccelerationStructureCreateFlagBitsKHR::eDescriptorBufferCaptureReplayEXT )
+      result += "DescriptorBufferCaptureReplayEXT | ";
+    if ( value & AccelerationStructureCreateFlagBitsKHR::eMotionNV )
+      result += "MotionNV | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_NV_framebuffer_mixed_samples ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageModulationStateCreateFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageModulationStateCreateFlagsNV )
   {
     return "{}";
   }
 
   //=== VK_EXT_validation_cache ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationCacheCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( ValidationCacheCreateFlagsEXT )
   {
     return "{}";
   }
 
   //=== VK_AMD_pipeline_compiler_control ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCompilerControlFlagsAMD )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCompilerControlFlagsAMD )
   {
     return "{}";
   }
 
-  //=== VK_EXT_present_timing ===
-
-  VULKAN_HPP_INLINE std::string to_string( PresentStageFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & PresentStageFlagBitsEXT::eQueueOperationsEnd )
-      result += " QueueOperationsEnd |";
-    if ( value & PresentStageFlagBitsEXT::eRequestDequeued )
-      result += " RequestDequeued |";
-    if ( value & PresentStageFlagBitsEXT::eImageFirstPixelOut )
-      result += " ImageFirstPixelOut |";
-    if ( value & PresentStageFlagBitsEXT::eImageFirstPixelVisible )
-      result += " ImageFirstPixelVisible |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PresentTimingInfoFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & PresentTimingInfoFlagBitsEXT::ePresentAtRelativeTime )
-      result += " PresentAtRelativeTime |";
-    if ( value & PresentTimingInfoFlagBitsEXT::ePresentAtNearestRefreshCycle )
-      result += " PresentAtNearestRefreshCycle |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PastPresentationTimingFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & PastPresentationTimingFlagBitsEXT::eAllowPartialResults )
-      result += " AllowPartialResults |";
-    if ( value & PastPresentationTimingFlagBitsEXT::eAllowOutOfOrderResults )
-      result += " AllowOutOfOrderResults |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_imagepipe_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImagePipeSurfaceCreateFlagsFUCHSIA )
+  VULKAN_HPP_INLINE std::string to_string( ImagePipeSurfaceCreateFlagsFUCHSIA )
   {
     return "{}";
   }
@@ -3270,7 +2774,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MetalSurfaceCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( MetalSurfaceCreateFlagsEXT )
   {
     return "{}";
   }
@@ -3278,213 +2782,234 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_AMD_shader_core_properties2 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderCorePropertiesFlagsAMD )
+  VULKAN_HPP_INLINE std::string to_string( ShaderCorePropertiesFlagsAMD )
   {
     return "{}";
   }
 
   //=== VK_NV_coverage_reduction_mode ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageReductionStateCreateFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageReductionStateCreateFlagsNV )
   {
     return "{}";
   }
 
   //=== VK_EXT_headless_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( HeadlessSurfaceCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( HeadlessSurfaceCreateFlagsEXT )
   {
     return "{}";
   }
 
+  //=== VK_EXT_host_image_copy ===
+
+  VULKAN_HPP_INLINE std::string to_string( HostImageCopyFlagsEXT value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & HostImageCopyFlagBitsEXT::eMemcpy )
+      result += "Memcpy | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  //=== VK_KHR_map_memory2 ===
+
+  VULKAN_HPP_INLINE std::string to_string( MemoryUnmapFlagsKHR value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & MemoryUnmapFlagBitsKHR::eReserveEXT )
+      result += "ReserveEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  //=== VK_EXT_surface_maintenance1 ===
+
+  VULKAN_HPP_INLINE std::string to_string( PresentScalingFlagsEXT value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & PresentScalingFlagBitsEXT::eOneToOne )
+      result += "OneToOne | ";
+    if ( value & PresentScalingFlagBitsEXT::eAspectRatioStretch )
+      result += "AspectRatioStretch | ";
+    if ( value & PresentScalingFlagBitsEXT::eStretch )
+      result += "Stretch | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PresentGravityFlagsEXT value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & PresentGravityFlagBitsEXT::eMin )
+      result += "Min | ";
+    if ( value & PresentGravityFlagBitsEXT::eMax )
+      result += "Max | ";
+    if ( value & PresentGravityFlagBitsEXT::eCentered )
+      result += "Centered | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
   //=== VK_NV_device_generated_commands ===
 
   VULKAN_HPP_INLINE std::string to_string( IndirectStateFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & IndirectStateFlagBitsNV::eFlagFrontface )
-      result += " FlagFrontface |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & IndirectStateFlagBitsNV::eFlagFrontface )
+      result += "FlagFrontface | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( IndirectCommandsLayoutUsageFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eExplicitPreprocess )
-      result += " ExplicitPreprocess |";
-    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eIndexedSequences )
-      result += " IndexedSequences |";
-    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eUnorderedSequences )
-      result += " UnorderedSequences |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eExplicitPreprocess )
+      result += "ExplicitPreprocess | ";
+    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eIndexedSequences )
+      result += "IndexedSequences | ";
+    if ( value & IndirectCommandsLayoutUsageFlagBitsNV::eUnorderedSequences )
+      result += "UnorderedSequences | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_EXT_device_memory_report ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceMemoryReportFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DeviceMemoryReportFlagsEXT )
   {
     return "{}";
   }
 
   //=== VK_KHR_video_encode_queue ===
 
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeFlagsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeFlagsKHR )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeFlagBitsKHR::eIntraRefresh )
-      result += " IntraRefresh |";
-    if ( value & VideoEncodeFlagBitsKHR::eWithQuantizationDeltaMap )
-      result += " WithQuantizationDeltaMap |";
-    if ( value & VideoEncodeFlagBitsKHR::eWithEmphasisMap )
-      result += " WithEmphasisMap |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeCapabilityFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes )
-      result += " PrecedingExternallyEncodedBytes |";
-    if ( value & VideoEncodeCapabilityFlagBitsKHR::eInsufficientBitstreamBufferRangeDetection )
-      result += " InsufficientBitstreamBufferRangeDetection |";
-    if ( value & VideoEncodeCapabilityFlagBitsKHR::eQuantizationDeltaMap )
-      result += " QuantizationDeltaMap |";
-    if ( value & VideoEncodeCapabilityFlagBitsKHR::eEmphasisMap )
-      result += " EmphasisMap |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes )
+      result += "PrecedingExternallyEncodedBytes | ";
+    if ( value & VideoEncodeCapabilityFlagBitsKHR::eInsufficientBitstreamBufferRangeDetection )
+      result += "InsufficientBitstreamBufferRangeDetection | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeFeedbackFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamBufferOffset )
-      result += " BitstreamBufferOffset |";
-    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamBytesWritten )
-      result += " BitstreamBytesWritten |";
-    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamHasOverrides )
-      result += " BitstreamHasOverrides |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamBufferOffset )
+      result += "BitstreamBufferOffset | ";
+    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamBytesWritten )
+      result += "BitstreamBytesWritten | ";
+    if ( value & VideoEncodeFeedbackFlagBitsKHR::eBitstreamHasOverrides )
+      result += "BitstreamHasOverrides | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeUsageFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeUsageFlagBitsKHR::eTranscoding )
-      result += " Transcoding |";
-    if ( value & VideoEncodeUsageFlagBitsKHR::eStreaming )
-      result += " Streaming |";
-    if ( value & VideoEncodeUsageFlagBitsKHR::eRecording )
-      result += " Recording |";
-    if ( value & VideoEncodeUsageFlagBitsKHR::eConferencing )
-      result += " Conferencing |";
+    if ( !value )
+      return "Default";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Default";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeUsageFlagBitsKHR::eTranscoding )
+      result += "Transcoding | ";
+    if ( value & VideoEncodeUsageFlagBitsKHR::eStreaming )
+      result += "Streaming | ";
+    if ( value & VideoEncodeUsageFlagBitsKHR::eRecording )
+      result += "Recording | ";
+    if ( value & VideoEncodeUsageFlagBitsKHR::eConferencing )
+      result += "Conferencing | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeContentFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeContentFlagBitsKHR::eCamera )
-      result += " Camera |";
-    if ( value & VideoEncodeContentFlagBitsKHR::eDesktop )
-      result += " Desktop |";
-    if ( value & VideoEncodeContentFlagBitsKHR::eRendered )
-      result += " Rendered |";
+    if ( !value )
+      return "Default";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Default";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeContentFlagBitsKHR::eCamera )
+      result += "Camera | ";
+    if ( value & VideoEncodeContentFlagBitsKHR::eDesktop )
+      result += "Desktop | ";
+    if ( value & VideoEncodeContentFlagBitsKHR::eRendered )
+      result += "Rendered | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRateControlFlagsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRateControlFlagsKHR )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( VideoEncodeRateControlModeFlagsKHR value )
   {
-    std::string result = "{";
-    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eDisabled )
-      result += " Disabled |";
-    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eCbr )
-      result += " Cbr |";
-    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eVbr )
-      result += " Vbr |";
+    if ( !value )
+      return "Default";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Default";
-    return result;
+    std::string result;
+    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eDisabled )
+      result += "Disabled | ";
+    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eCbr )
+      result += "Cbr | ";
+    if ( value & VideoEncodeRateControlModeFlagBitsKHR::eVbr )
+      result += "Vbr | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_NV_device_diagnostics_config ===
 
   VULKAN_HPP_INLINE std::string to_string( DeviceDiagnosticsConfigFlagsNV value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderDebugInfo )
-      result += " EnableShaderDebugInfo |";
+      result += "EnableShaderDebugInfo | ";
     if ( value & DeviceDiagnosticsConfigFlagBitsNV::eEnableResourceTracking )
-      result += " EnableResourceTracking |";
+      result += "EnableResourceTracking | ";
     if ( value & DeviceDiagnosticsConfigFlagBitsNV::eEnableAutomaticCheckpoints )
-      result += " EnableAutomaticCheckpoints |";
+      result += "EnableAutomaticCheckpoints | ";
     if ( value & DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderErrorReporting )
-      result += " EnableShaderErrorReporting |";
+      result += "EnableShaderErrorReporting | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_QCOM_tile_shading ===
-
-  VULKAN_HPP_INLINE std::string to_string( TileShadingRenderPassFlagsQCOM value )
-  {
-    std::string result = "{";
-    if ( value & TileShadingRenderPassFlagBitsQCOM::eEnable )
-      result += " Enable |";
-    if ( value & TileShadingRenderPassFlagBitsQCOM::ePerTileExecution )
-      result += " PerTileExecution |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
@@ -3492,25 +3017,24 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( ExportMetalObjectTypeFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalDevice )
-      result += " MetalDevice |";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalCommandQueue )
-      result += " MetalCommandQueue |";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalBuffer )
-      result += " MetalBuffer |";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalTexture )
-      result += " MetalTexture |";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalIosurface )
-      result += " MetalIosurface |";
-    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalSharedEvent )
-      result += " MetalSharedEvent |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalDevice )
+      result += "MetalDevice | ";
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalCommandQueue )
+      result += "MetalCommandQueue | ";
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalBuffer )
+      result += "MetalBuffer | ";
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalTexture )
+      result += "MetalTexture | ";
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalIosurface )
+      result += "MetalIosurface | ";
+    if ( value & ExportMetalObjectTypeFlagBitsEXT::eMetalSharedEvent )
+      result += "MetalSharedEvent | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
@@ -3518,31 +3042,30 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( GraphicsPipelineLibraryFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eVertexInputInterface )
-      result += " VertexInputInterface |";
-    if ( value & GraphicsPipelineLibraryFlagBitsEXT::ePreRasterizationShaders )
-      result += " PreRasterizationShaders |";
-    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eFragmentShader )
-      result += " FragmentShader |";
-    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eFragmentOutputInterface )
-      result += " FragmentOutputInterface |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eVertexInputInterface )
+      result += "VertexInputInterface | ";
+    if ( value & GraphicsPipelineLibraryFlagBitsEXT::ePreRasterizationShaders )
+      result += "PreRasterizationShaders | ";
+    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eFragmentShader )
+      result += "FragmentShader | ";
+    if ( value & GraphicsPipelineLibraryFlagBitsEXT::eFragmentOutputInterface )
+      result += "FragmentOutputInterface | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_NV_ray_tracing_motion_blur ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMotionInfoFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMotionInfoFlagsNV )
   {
     return "{}";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMotionInstanceFlagsNV )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMotionInstanceFlagsNV )
   {
     return "{}";
   }
@@ -3551,84 +3074,82 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( ImageCompressionFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & ImageCompressionFlagBitsEXT::eFixedRateDefault )
-      result += " FixedRateDefault |";
-    if ( value & ImageCompressionFlagBitsEXT::eFixedRateExplicit )
-      result += " FixedRateExplicit |";
-    if ( value & ImageCompressionFlagBitsEXT::eDisabled )
-      result += " Disabled |";
+    if ( !value )
+      return "Default";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Default";
-    return result;
+    std::string result;
+    if ( value & ImageCompressionFlagBitsEXT::eFixedRateDefault )
+      result += "FixedRateDefault | ";
+    if ( value & ImageCompressionFlagBitsEXT::eFixedRateExplicit )
+      result += "FixedRateExplicit | ";
+    if ( value & ImageCompressionFlagBitsEXT::eDisabled )
+      result += "Disabled | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ImageCompressionFixedRateFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e1Bpc )
-      result += " 1Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e2Bpc )
-      result += " 2Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e3Bpc )
-      result += " 3Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e4Bpc )
-      result += " 4Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e5Bpc )
-      result += " 5Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e6Bpc )
-      result += " 6Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e7Bpc )
-      result += " 7Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e8Bpc )
-      result += " 8Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e9Bpc )
-      result += " 9Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e10Bpc )
-      result += " 10Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e11Bpc )
-      result += " 11Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e12Bpc )
-      result += " 12Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e13Bpc )
-      result += " 13Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e14Bpc )
-      result += " 14Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e15Bpc )
-      result += " 15Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e16Bpc )
-      result += " 16Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e17Bpc )
-      result += " 17Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e18Bpc )
-      result += " 18Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e19Bpc )
-      result += " 19Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e20Bpc )
-      result += " 20Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e21Bpc )
-      result += " 21Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e22Bpc )
-      result += " 22Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e23Bpc )
-      result += " 23Bpc |";
-    if ( value & ImageCompressionFixedRateFlagBitsEXT::e24Bpc )
-      result += " 24Bpc |";
+    if ( !value )
+      return "None";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
+    std::string result;
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e1Bpc )
+      result += "1Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e2Bpc )
+      result += "2Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e3Bpc )
+      result += "3Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e4Bpc )
+      result += "4Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e5Bpc )
+      result += "5Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e6Bpc )
+      result += "6Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e7Bpc )
+      result += "7Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e8Bpc )
+      result += "8Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e9Bpc )
+      result += "9Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e10Bpc )
+      result += "10Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e11Bpc )
+      result += "11Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e12Bpc )
+      result += "12Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e13Bpc )
+      result += "13Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e14Bpc )
+      result += "14Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e15Bpc )
+      result += "15Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e16Bpc )
+      result += "16Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e17Bpc )
+      result += "17Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e18Bpc )
+      result += "18Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e19Bpc )
+      result += "19Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e20Bpc )
+      result += "20Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e21Bpc )
+      result += "21Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e22Bpc )
+      result += "22Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e23Bpc )
+      result += "23Bpc | ";
+    if ( value & ImageCompressionFixedRateFlagBitsEXT::e24Bpc )
+      result += "24Bpc | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
   //=== VK_EXT_directfb_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DirectFBSurfaceCreateFlagsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DirectFBSurfaceCreateFlagsEXT )
   {
     return "{}";
   }
@@ -3638,44 +3159,42 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( DeviceAddressBindingFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & DeviceAddressBindingFlagBitsEXT::eInternalObject )
-      result += " InternalObject |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & DeviceAddressBindingFlagBitsEXT::eInternalObject )
+      result += "InternalObject | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_buffer_collection ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageFormatConstraintsFlagsFUCHSIA )
+  VULKAN_HPP_INLINE std::string to_string( ImageFormatConstraintsFlagsFUCHSIA )
   {
     return "{}";
   }
 
   VULKAN_HPP_INLINE std::string to_string( ImageConstraintsInfoFlagsFUCHSIA value )
   {
-    std::string result = "{";
-    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadRarely )
-      result += " CpuReadRarely |";
-    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadOften )
-      result += " CpuReadOften |";
-    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteRarely )
-      result += " CpuWriteRarely |";
-    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteOften )
-      result += " CpuWriteOften |";
-    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eProtectedOptional )
-      result += " ProtectedOptional |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadRarely )
+      result += "CpuReadRarely | ";
+    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadOften )
+      result += "CpuReadOften | ";
+    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteRarely )
+      result += "CpuWriteRarely | ";
+    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteOften )
+      result += "CpuWriteOften | ";
+    if ( value & ImageConstraintsInfoFlagBitsFUCHSIA::eProtectedOptional )
+      result += "ProtectedOptional | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 
@@ -3683,681 +3202,326 @@ namespace VULKAN_HPP_NAMESPACE
 
   VULKAN_HPP_INLINE std::string to_string( FrameBoundaryFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & FrameBoundaryFlagBitsEXT::eFrameEnd )
-      result += " FrameEnd |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & FrameBoundaryFlagBitsEXT::eFrameEnd )
+      result += "FrameEnd | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_screen_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ScreenSurfaceCreateFlagsQNX )
+  VULKAN_HPP_INLINE std::string to_string( ScreenSurfaceCreateFlagsQNX )
   {
     return "{}";
   }
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRgbModelConversionFlagsVALVE value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeRgbModelConversionFlagBitsVALVE::eRgbIdentity )
-      result += " RgbIdentity |";
-    if ( value & VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcrIdentity )
-      result += " YcbcrIdentity |";
-    if ( value & VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr709 )
-      result += " Ycbcr709 |";
-    if ( value & VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr601 )
-      result += " Ycbcr601 |";
-    if ( value & VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr2020 )
-      result += " Ycbcr2020 |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRgbRangeCompressionFlagsVALVE value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeRgbRangeCompressionFlagBitsVALVE::eFullRange )
-      result += " FullRange |";
-    if ( value & VideoEncodeRgbRangeCompressionFlagBitsVALVE::eNarrowRange )
-      result += " NarrowRange |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRgbChromaOffsetFlagsVALVE value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven )
-      result += " CositedEven |";
-    if ( value & VideoEncodeRgbChromaOffsetFlagBitsVALVE::eMidpoint )
-      result += " Midpoint |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
   //=== VK_EXT_opacity_micromap ===
 
   VULKAN_HPP_INLINE std::string to_string( BuildMicromapFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & BuildMicromapFlagBitsEXT::ePreferFastTrace )
-      result += " PreferFastTrace |";
-    if ( value & BuildMicromapFlagBitsEXT::ePreferFastBuild )
-      result += " PreferFastBuild |";
-    if ( value & BuildMicromapFlagBitsEXT::eAllowCompaction )
-      result += " AllowCompaction |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & BuildMicromapFlagBitsEXT::ePreferFastTrace )
+      result += "PreferFastTrace | ";
+    if ( value & BuildMicromapFlagBitsEXT::ePreferFastBuild )
+      result += "PreferFastBuild | ";
+    if ( value & BuildMicromapFlagBitsEXT::eAllowCompaction )
+      result += "AllowCompaction | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( MicromapCreateFlagsEXT value )
   {
-    std::string result = "{";
-    if ( value & MicromapCreateFlagBitsEXT::eDeviceAddressCaptureReplay )
-      result += " DeviceAddressCaptureReplay |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & MicromapCreateFlagBitsEXT::eDeviceAddressCaptureReplay )
+      result += "DeviceAddressCaptureReplay | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_ARM_scheduling_controls ===
 
   VULKAN_HPP_INLINE std::string to_string( PhysicalDeviceSchedulingControlsFlagsARM value )
   {
-    std::string result = "{";
-    if ( value & PhysicalDeviceSchedulingControlsFlagBitsARM::eShaderCoreCount )
-      result += " ShaderCoreCount |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & PhysicalDeviceSchedulingControlsFlagBitsARM::eShaderCoreCount )
+      result += "ShaderCoreCount | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  //=== VK_NV_memory_decompression ===
+
+  VULKAN_HPP_INLINE std::string to_string( MemoryDecompressionMethodFlagsNV value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & MemoryDecompressionMethodFlagBitsNV::eGdeflate10 )
+      result += "Gdeflate10 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_LUNARG_direct_driver_loading ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DirectDriverLoadingFlagsLUNARG )
+  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingFlagsLUNARG )
   {
     return "{}";
   }
 
-  //=== VK_ARM_tensors ===
-
-  VULKAN_HPP_INLINE std::string to_string( TensorCreateFlagsARM value )
-  {
-    std::string result = "{";
-    if ( value & TensorCreateFlagBitsARM::eMutableFormat )
-      result += " MutableFormat |";
-    if ( value & TensorCreateFlagBitsARM::eProtected )
-      result += " Protected |";
-    if ( value & TensorCreateFlagBitsARM::eDescriptorBufferCaptureReplay )
-      result += " DescriptorBufferCaptureReplay |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( TensorViewCreateFlagsARM value )
-  {
-    std::string result = "{";
-    if ( value & TensorViewCreateFlagBitsARM::eDescriptorBufferCaptureReplay )
-      result += " DescriptorBufferCaptureReplay |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( TensorUsageFlagsARM value )
-  {
-    std::string result = "{";
-    if ( value & TensorUsageFlagBitsARM::eShader )
-      result += " Shader |";
-    if ( value & TensorUsageFlagBitsARM::eTransferSrc )
-      result += " TransferSrc |";
-    if ( value & TensorUsageFlagBitsARM::eTransferDst )
-      result += " TransferDst |";
-    if ( value & TensorUsageFlagBitsARM::eImageAliasing )
-      result += " ImageAliasing |";
-    if ( value & TensorUsageFlagBitsARM::eDataGraph )
-      result += " DataGraph |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
   //=== VK_NV_optical_flow ===
 
   VULKAN_HPP_INLINE std::string to_string( OpticalFlowUsageFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & OpticalFlowUsageFlagBitsNV::eInput )
-      result += " Input |";
-    if ( value & OpticalFlowUsageFlagBitsNV::eOutput )
-      result += " Output |";
-    if ( value & OpticalFlowUsageFlagBitsNV::eHint )
-      result += " Hint |";
-    if ( value & OpticalFlowUsageFlagBitsNV::eCost )
-      result += " Cost |";
-    if ( value & OpticalFlowUsageFlagBitsNV::eGlobalFlow )
-      result += " GlobalFlow |";
+    if ( !value )
+      return "Unknown";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Unknown";
-    return result;
+    std::string result;
+    if ( value & OpticalFlowUsageFlagBitsNV::eInput )
+      result += "Input | ";
+    if ( value & OpticalFlowUsageFlagBitsNV::eOutput )
+      result += "Output | ";
+    if ( value & OpticalFlowUsageFlagBitsNV::eHint )
+      result += "Hint | ";
+    if ( value & OpticalFlowUsageFlagBitsNV::eCost )
+      result += "Cost | ";
+    if ( value & OpticalFlowUsageFlagBitsNV::eGlobalFlow )
+      result += "GlobalFlow | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( OpticalFlowGridSizeFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & OpticalFlowGridSizeFlagBitsNV::e1X1 )
-      result += " 1X1 |";
-    if ( value & OpticalFlowGridSizeFlagBitsNV::e2X2 )
-      result += " 2X2 |";
-    if ( value & OpticalFlowGridSizeFlagBitsNV::e4X4 )
-      result += " 4X4 |";
-    if ( value & OpticalFlowGridSizeFlagBitsNV::e8X8 )
-      result += " 8X8 |";
+    if ( !value )
+      return "Unknown";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "Unknown";
-    return result;
+    std::string result;
+    if ( value & OpticalFlowGridSizeFlagBitsNV::e1X1 )
+      result += "1X1 | ";
+    if ( value & OpticalFlowGridSizeFlagBitsNV::e2X2 )
+      result += "2X2 | ";
+    if ( value & OpticalFlowGridSizeFlagBitsNV::e4X4 )
+      result += "4X4 | ";
+    if ( value & OpticalFlowGridSizeFlagBitsNV::e8X8 )
+      result += "8X8 | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( OpticalFlowSessionCreateFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableHint )
-      result += " EnableHint |";
-    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableCost )
-      result += " EnableCost |";
-    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableGlobalFlow )
-      result += " EnableGlobalFlow |";
-    if ( value & OpticalFlowSessionCreateFlagBitsNV::eAllowRegions )
-      result += " AllowRegions |";
-    if ( value & OpticalFlowSessionCreateFlagBitsNV::eBothDirections )
-      result += " BothDirections |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableHint )
+      result += "EnableHint | ";
+    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableCost )
+      result += "EnableCost | ";
+    if ( value & OpticalFlowSessionCreateFlagBitsNV::eEnableGlobalFlow )
+      result += "EnableGlobalFlow | ";
+    if ( value & OpticalFlowSessionCreateFlagBitsNV::eAllowRegions )
+      result += "AllowRegions | ";
+    if ( value & OpticalFlowSessionCreateFlagBitsNV::eBothDirections )
+      result += "BothDirections | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   VULKAN_HPP_INLINE std::string to_string( OpticalFlowExecuteFlagsNV value )
   {
-    std::string result = "{";
-    if ( value & OpticalFlowExecuteFlagBitsNV::eDisableTemporalHints )
-      result += " DisableTemporalHints |";
+    if ( !value )
+      return "{}";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    std::string result;
+    if ( value & OpticalFlowExecuteFlagBitsNV::eDisableTemporalHints )
+      result += "DisableTemporalHints | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  //=== VK_KHR_maintenance5 ===
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineCreateFlags2KHR value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & PipelineCreateFlagBits2KHR::eDisableOptimization )
+      result += "DisableOptimization | ";
+    if ( value & PipelineCreateFlagBits2KHR::eAllowDerivatives )
+      result += "AllowDerivatives | ";
+    if ( value & PipelineCreateFlagBits2KHR::eDerivative )
+      result += "Derivative | ";
+    if ( value & PipelineCreateFlagBits2KHR::eEnableLegacyDitheringEXT )
+      result += "EnableLegacyDitheringEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eViewIndexFromDeviceIndex )
+      result += "ViewIndexFromDeviceIndex | ";
+    if ( value & PipelineCreateFlagBits2KHR::eDispatchBase )
+      result += "DispatchBase | ";
+    if ( value & PipelineCreateFlagBits2KHR::eDeferCompileNV )
+      result += "DeferCompileNV | ";
+    if ( value & PipelineCreateFlagBits2KHR::eCaptureStatistics )
+      result += "CaptureStatistics | ";
+    if ( value & PipelineCreateFlagBits2KHR::eCaptureInternalRepresentations )
+      result += "CaptureInternalRepresentations | ";
+    if ( value & PipelineCreateFlagBits2KHR::eFailOnPipelineCompileRequired )
+      result += "FailOnPipelineCompileRequired | ";
+    if ( value & PipelineCreateFlagBits2KHR::eEarlyReturnOnFailure )
+      result += "EarlyReturnOnFailure | ";
+    if ( value & PipelineCreateFlagBits2KHR::eLinkTimeOptimizationEXT )
+      result += "LinkTimeOptimizationEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRetainLinkTimeOptimizationInfoEXT )
+      result += "RetainLinkTimeOptimizationInfoEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eLibrary )
+      result += "Library | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingSkipTriangles )
+      result += "RayTracingSkipTriangles | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingSkipAabbs )
+      result += "RayTracingSkipAabbs | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingNoNullAnyHitShaders )
+      result += "RayTracingNoNullAnyHitShaders | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingNoNullClosestHitShaders )
+      result += "RayTracingNoNullClosestHitShaders | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingNoNullMissShaders )
+      result += "RayTracingNoNullMissShaders | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingNoNullIntersectionShaders )
+      result += "RayTracingNoNullIntersectionShaders | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingShaderGroupHandleCaptureReplay )
+      result += "RayTracingShaderGroupHandleCaptureReplay | ";
+    if ( value & PipelineCreateFlagBits2KHR::eIndirectBindableNV )
+      result += "IndirectBindableNV | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingAllowMotionNV )
+      result += "RayTracingAllowMotionNV | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRenderingFragmentShadingRateAttachment )
+      result += "RenderingFragmentShadingRateAttachment | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRenderingFragmentDensityMapAttachmentEXT )
+      result += "RenderingFragmentDensityMapAttachmentEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingOpacityMicromapEXT )
+      result += "RayTracingOpacityMicromapEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eColorAttachmentFeedbackLoopEXT )
+      result += "ColorAttachmentFeedbackLoopEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eDepthStencilAttachmentFeedbackLoopEXT )
+      result += "DepthStencilAttachmentFeedbackLoopEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eNoProtectedAccessEXT )
+      result += "NoProtectedAccessEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eProtectedAccessOnlyEXT )
+      result += "ProtectedAccessOnlyEXT | ";
+    if ( value & PipelineCreateFlagBits2KHR::eRayTracingDisplacementMicromapNV )
+      result += "RayTracingDisplacementMicromapNV | ";
+    if ( value & PipelineCreateFlagBits2KHR::eDescriptorBufferEXT )
+      result += "DescriptorBufferEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlags2KHR value )
+  {
+    if ( !value )
+      return "{}";
+
+    std::string result;
+    if ( value & BufferUsageFlagBits2KHR::eTransferSrc )
+      result += "TransferSrc | ";
+    if ( value & BufferUsageFlagBits2KHR::eTransferDst )
+      result += "TransferDst | ";
+    if ( value & BufferUsageFlagBits2KHR::eUniformTexelBuffer )
+      result += "UniformTexelBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eStorageTexelBuffer )
+      result += "StorageTexelBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eUniformBuffer )
+      result += "UniformBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eStorageBuffer )
+      result += "StorageBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eIndexBuffer )
+      result += "IndexBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eVertexBuffer )
+      result += "VertexBuffer | ";
+    if ( value & BufferUsageFlagBits2KHR::eIndirectBuffer )
+      result += "IndirectBuffer | ";
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+    if ( value & BufferUsageFlagBits2KHR::eExecutionGraphScratchAMDX )
+      result += "ExecutionGraphScratchAMDX | ";
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+    if ( value & BufferUsageFlagBits2KHR::eConditionalRenderingEXT )
+      result += "ConditionalRenderingEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eShaderBindingTable )
+      result += "ShaderBindingTable | ";
+    if ( value & BufferUsageFlagBits2KHR::eTransformFeedbackBufferEXT )
+      result += "TransformFeedbackBufferEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eTransformFeedbackCounterBufferEXT )
+      result += "TransformFeedbackCounterBufferEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eVideoDecodeSrc )
+      result += "VideoDecodeSrc | ";
+    if ( value & BufferUsageFlagBits2KHR::eVideoDecodeDst )
+      result += "VideoDecodeDst | ";
+    if ( value & BufferUsageFlagBits2KHR::eVideoEncodeDst )
+      result += "VideoEncodeDst | ";
+    if ( value & BufferUsageFlagBits2KHR::eVideoEncodeSrc )
+      result += "VideoEncodeSrc | ";
+    if ( value & BufferUsageFlagBits2KHR::eShaderDeviceAddress )
+      result += "ShaderDeviceAddress | ";
+    if ( value & BufferUsageFlagBits2KHR::eAccelerationStructureBuildInputReadOnly )
+      result += "AccelerationStructureBuildInputReadOnly | ";
+    if ( value & BufferUsageFlagBits2KHR::eAccelerationStructureStorage )
+      result += "AccelerationStructureStorage | ";
+    if ( value & BufferUsageFlagBits2KHR::eSamplerDescriptorBufferEXT )
+      result += "SamplerDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eResourceDescriptorBufferEXT )
+      result += "ResourceDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::ePushDescriptorsDescriptorBufferEXT )
+      result += "PushDescriptorsDescriptorBufferEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eMicromapBuildInputReadOnlyEXT )
+      result += "MicromapBuildInputReadOnlyEXT | ";
+    if ( value & BufferUsageFlagBits2KHR::eMicromapStorageEXT )
+      result += "MicromapStorageEXT | ";
+
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=== VK_EXT_shader_object ===
 
   VULKAN_HPP_INLINE std::string to_string( ShaderCreateFlagsEXT value )
   {
-    std::string result = "{";
+    if ( !value )
+      return "{}";
+
+    std::string result;
     if ( value & ShaderCreateFlagBitsEXT::eLinkStage )
-      result += " LinkStage |";
+      result += "LinkStage | ";
     if ( value & ShaderCreateFlagBitsEXT::eAllowVaryingSubgroupSize )
-      result += " AllowVaryingSubgroupSize |";
+      result += "AllowVaryingSubgroupSize | ";
     if ( value & ShaderCreateFlagBitsEXT::eRequireFullSubgroups )
-      result += " RequireFullSubgroups |";
+      result += "RequireFullSubgroups | ";
     if ( value & ShaderCreateFlagBitsEXT::eNoTaskShader )
-      result += " NoTaskShader |";
+      result += "NoTaskShader | ";
     if ( value & ShaderCreateFlagBitsEXT::eDispatchBase )
-      result += " DispatchBase |";
+      result += "DispatchBase | ";
     if ( value & ShaderCreateFlagBitsEXT::eFragmentShadingRateAttachment )
-      result += " FragmentShadingRateAttachment |";
+      result += "FragmentShadingRateAttachment | ";
     if ( value & ShaderCreateFlagBitsEXT::eFragmentDensityMapAttachment )
-      result += " FragmentDensityMapAttachment |";
-    if ( value & ShaderCreateFlagBitsEXT::eIndirectBindable )
-      result += " IndirectBindable |";
-    if ( value & ShaderCreateFlagBitsEXT::e64BitIndexing )
-      result += " 64BitIndexing |";
+      result += "FragmentDensityMapAttachment | ";
 
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_KHR_surface_maintenance1 ===
-
-  VULKAN_HPP_INLINE std::string to_string( PresentScalingFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & PresentScalingFlagBitsKHR::eOneToOne )
-      result += " OneToOne |";
-    if ( value & PresentScalingFlagBitsKHR::eAspectRatioStretch )
-      result += " AspectRatioStretch |";
-    if ( value & PresentScalingFlagBitsKHR::eStretch )
-      result += " Stretch |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( PresentGravityFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & PresentGravityFlagBitsKHR::eMin )
-      result += " Min |";
-    if ( value & PresentGravityFlagBitsKHR::eMax )
-      result += " Max |";
-    if ( value & PresentGravityFlagBitsKHR::eCentered )
-      result += " Centered |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_ARM_data_graph ===
-
-  VULKAN_HPP_INLINE std::string to_string( DataGraphPipelineSessionCreateFlagsARM value )
-  {
-    std::string result = "{";
-    if ( value & DataGraphPipelineSessionCreateFlagBitsARM::eProtected )
-      result += " Protected |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelineDispatchFlagsARM )
-  {
-    return "{}";
-  }
-
-  //=== VK_KHR_video_encode_av1 ===
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeAV1CapabilityFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::ePerRateControlGroupMinMaxQIndex )
-      result += " PerRateControlGroupMinMaxQIndex |";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::eGenerateObuExtensionHeader )
-      result += " GenerateObuExtensionHeader |";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::ePrimaryReferenceCdfOnly )
-      result += " PrimaryReferenceCdfOnly |";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::eFrameSizeOverride )
-      result += " FrameSizeOverride |";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::eMotionVectorScaling )
-      result += " MotionVectorScaling |";
-    if ( value & VideoEncodeAV1CapabilityFlagBitsKHR::eCompoundPredictionIntraRefresh )
-      result += " CompoundPredictionIntraRefresh |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeAV1StdFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeAV1StdFlagBitsKHR::eUniformTileSpacingFlagSet )
-      result += " UniformTileSpacingFlagSet |";
-    if ( value & VideoEncodeAV1StdFlagBitsKHR::eSkipModePresentUnset )
-      result += " SkipModePresentUnset |";
-    if ( value & VideoEncodeAV1StdFlagBitsKHR::ePrimaryRefFrame )
-      result += " PrimaryRefFrame |";
-    if ( value & VideoEncodeAV1StdFlagBitsKHR::eDeltaQ )
-      result += " DeltaQ |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeAV1SuperblockSizeFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeAV1SuperblockSizeFlagBitsKHR::e64 )
-      result += " 64 |";
-    if ( value & VideoEncodeAV1SuperblockSizeFlagBitsKHR::e128 )
-      result += " 128 |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeAV1RateControlFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeAV1RateControlFlagBitsKHR::eRegularGop )
-      result += " RegularGop |";
-    if ( value & VideoEncodeAV1RateControlFlagBitsKHR::eTemporalLayerPatternDyadic )
-      result += " TemporalLayerPatternDyadic |";
-    if ( value & VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternFlat )
-      result += " ReferencePatternFlat |";
-    if ( value & VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternDyadic )
-      result += " ReferencePatternDyadic |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_KHR_copy_memory_indirect ===
-
-  VULKAN_HPP_INLINE std::string to_string( AddressCopyFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & AddressCopyFlagBitsKHR::eDeviceLocal )
-      result += " DeviceLocal |";
-    if ( value & AddressCopyFlagBitsKHR::eSparse )
-      result += " Sparse |";
-    if ( value & AddressCopyFlagBitsKHR::eProtected )
-      result += " Protected |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_EXT_memory_decompression ===
-
-  VULKAN_HPP_INLINE std::string to_string( MemoryDecompressionMethodFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & MemoryDecompressionMethodFlagBitsEXT::eGdeflate10 )
-      result += " Gdeflate10 |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-
-  VULKAN_HPP_INLINE std::string to_string( VideoEncodeIntraRefreshModeFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & VideoEncodeIntraRefreshModeFlagBitsKHR::ePerPicturePartition )
-      result += " PerPicturePartition |";
-    if ( value & VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockBased )
-      result += " BlockBased |";
-    if ( value & VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockRowBased )
-      result += " BlockRowBased |";
-    if ( value & VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockColumnBased )
-      result += " BlockColumnBased |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
-  }
-
-  //=== VK_NV_cluster_acceleration_structure ===
-
-  VULKAN_HPP_INLINE std::string to_string( ClusterAccelerationStructureClusterFlagsNV value )
-  {
-    std::string result = "{";
-    if ( value & ClusterAccelerationStructureClusterFlagBitsNV::eAllowDisableOpacityMicromaps )
-      result += " AllowDisableOpacityMicromaps |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( ClusterAccelerationStructureGeometryFlagsNV value )
-  {
-    std::string result = "{";
-    if ( value & ClusterAccelerationStructureGeometryFlagBitsNV::eCullDisable )
-      result += " CullDisable |";
-    if ( value & ClusterAccelerationStructureGeometryFlagBitsNV::eNoDuplicateAnyhitInvocation )
-      result += " NoDuplicateAnyhitInvocation |";
-    if ( value & ClusterAccelerationStructureGeometryFlagBitsNV::eOpaque )
-      result += " Opaque |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( ClusterAccelerationStructureAddressResolutionFlagsNV value )
-  {
-    std::string result = "{";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstImplicitData )
-      result += " IndirectedDstImplicitData |";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedScratchData )
-      result += " IndirectedScratchData |";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstAddressArray )
-      result += " IndirectedDstAddressArray |";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstSizesArray )
-      result += " IndirectedDstSizesArray |";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosArray )
-      result += " IndirectedSrcInfosArray |";
-    if ( value & ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosCount )
-      result += " IndirectedSrcInfosCount |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "None";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( ClusterAccelerationStructureIndexFormatFlagsNV value )
-  {
-    std::string result = "{";
-    if ( value & ClusterAccelerationStructureIndexFormatFlagBitsNV::e8 )
-      result += " 8 |";
-    if ( value & ClusterAccelerationStructureIndexFormatFlagBitsNV::e16 )
-      result += " 16 |";
-    if ( value & ClusterAccelerationStructureIndexFormatFlagBitsNV::e32 )
-      result += " 32 |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-
-  VULKAN_HPP_INLINE std::string to_string( PartitionedAccelerationStructureInstanceFlagsNV value )
-  {
-    std::string result = "{";
-    if ( value & PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFacingCullDisable )
-      result += " FlagTriangleFacingCullDisable |";
-    if ( value & PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFlipFacing )
-      result += " FlagTriangleFlipFacing |";
-    if ( value & PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceOpaque )
-      result += " FlagForceOpaque |";
-    if ( value & PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceNoOpaque )
-      result += " FlagForceNoOpaque |";
-    if ( value & PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagEnableExplicitBoundingBox )
-      result += " FlagEnableExplicitBoundingBox |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_EXT_device_generated_commands ===
-
-  VULKAN_HPP_INLINE std::string to_string( IndirectCommandsLayoutUsageFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & IndirectCommandsLayoutUsageFlagBitsEXT::eExplicitPreprocess )
-      result += " ExplicitPreprocess |";
-    if ( value & IndirectCommandsLayoutUsageFlagBitsEXT::eUnorderedSequences )
-      result += " UnorderedSequences |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( IndirectCommandsInputModeFlagsEXT value )
-  {
-    std::string result = "{";
-    if ( value & IndirectCommandsInputModeFlagBitsEXT::eVulkanIndexBuffer )
-      result += " VulkanIndexBuffer |";
-    if ( value & IndirectCommandsInputModeFlagBitsEXT::eDxgiIndexBuffer )
-      result += " DxgiIndexBuffer |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  //=== VK_KHR_maintenance8 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccessFlags3KHR )
-  {
-    return "None";
-  }
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SurfaceCreateFlagsOHOS )
-  {
-    return "{}";
-  }
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-
-  VULKAN_HPP_INLINE std::string to_string( SwapchainImageUsageFlagsOHOS value )
-  {
-    std::string result = "{";
-    if ( value & SwapchainImageUsageFlagBitsOHOS::eShared )
-      result += " Shared |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterDescriptionFlagsARM )
-  {
-    return "{}";
-  }
-
-  //=== VK_KHR_maintenance10 ===
-
-  VULKAN_HPP_INLINE std::string to_string( RenderingAttachmentFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & RenderingAttachmentFlagBitsKHR::eInputAttachmentFeedback )
-      result += " InputAttachmentFeedback |";
-    if ( value & RenderingAttachmentFlagBitsKHR::eResolveSkipTransferFunction )
-      result += " ResolveSkipTransferFunction |";
-    if ( value & RenderingAttachmentFlagBitsKHR::eResolveEnableTransferFunction )
-      result += " ResolveEnableTransferFunction |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
-  }
-
-  VULKAN_HPP_INLINE std::string to_string( ResolveImageFlagsKHR value )
-  {
-    std::string result = "{";
-    if ( value & ResolveImageFlagBitsKHR::eSkipTransferFunction )
-      result += " SkipTransferFunction |";
-    if ( value & ResolveImageFlagBitsKHR::eEnableTransferFunction )
-      result += " EnableTransferFunction |";
-
-    if ( result.size() > 1 )
-      result.back() = '}';
-    else
-      result = "{}";
-    return result;
+    return "{ " + result.substr( 0, result.size() - 3 ) + " }";
   }
 
   //=======================
@@ -4377,347 +3541,294 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_VERSION_1_0 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( Result value )
+  VULKAN_HPP_INLINE std::string to_string( Result value )
   {
     switch ( value )
     {
-      case Result::eSuccess                                    : return "Success";
-      case Result::eNotReady                                   : return "NotReady";
-      case Result::eTimeout                                    : return "Timeout";
-      case Result::eEventSet                                   : return "EventSet";
-      case Result::eEventReset                                 : return "EventReset";
-      case Result::eIncomplete                                 : return "Incomplete";
-      case Result::eErrorOutOfHostMemory                       : return "ErrorOutOfHostMemory";
-      case Result::eErrorOutOfDeviceMemory                     : return "ErrorOutOfDeviceMemory";
-      case Result::eErrorInitializationFailed                  : return "ErrorInitializationFailed";
-      case Result::eErrorDeviceLost                            : return "ErrorDeviceLost";
-      case Result::eErrorMemoryMapFailed                       : return "ErrorMemoryMapFailed";
-      case Result::eErrorLayerNotPresent                       : return "ErrorLayerNotPresent";
-      case Result::eErrorExtensionNotPresent                   : return "ErrorExtensionNotPresent";
-      case Result::eErrorFeatureNotPresent                     : return "ErrorFeatureNotPresent";
-      case Result::eErrorIncompatibleDriver                    : return "ErrorIncompatibleDriver";
-      case Result::eErrorTooManyObjects                        : return "ErrorTooManyObjects";
-      case Result::eErrorFormatNotSupported                    : return "ErrorFormatNotSupported";
-      case Result::eErrorFragmentedPool                        : return "ErrorFragmentedPool";
-      case Result::eErrorUnknown                               : return "ErrorUnknown";
-      case Result::eErrorValidationFailed                      : return "ErrorValidationFailed";
-      case Result::eErrorOutOfPoolMemory                       : return "ErrorOutOfPoolMemory";
-      case Result::eErrorInvalidExternalHandle                 : return "ErrorInvalidExternalHandle";
-      case Result::eErrorInvalidOpaqueCaptureAddress           : return "ErrorInvalidOpaqueCaptureAddress";
-      case Result::eErrorFragmentation                         : return "ErrorFragmentation";
-      case Result::ePipelineCompileRequired                    : return "PipelineCompileRequired";
-      case Result::eErrorNotPermitted                          : return "ErrorNotPermitted";
-      case Result::eErrorSurfaceLostKHR                        : return "ErrorSurfaceLostKHR";
-      case Result::eErrorNativeWindowInUseKHR                  : return "ErrorNativeWindowInUseKHR";
-      case Result::eSuboptimalKHR                              : return "SuboptimalKHR";
-      case Result::eErrorOutOfDateKHR                          : return "ErrorOutOfDateKHR";
-      case Result::eErrorIncompatibleDisplayKHR                : return "ErrorIncompatibleDisplayKHR";
-      case Result::eErrorInvalidShaderNV                       : return "ErrorInvalidShaderNV";
-      case Result::eErrorImageUsageNotSupportedKHR             : return "ErrorImageUsageNotSupportedKHR";
-      case Result::eErrorVideoPictureLayoutNotSupportedKHR     : return "ErrorVideoPictureLayoutNotSupportedKHR";
-      case Result::eErrorVideoProfileOperationNotSupportedKHR  : return "ErrorVideoProfileOperationNotSupportedKHR";
-      case Result::eErrorVideoProfileFormatNotSupportedKHR     : return "ErrorVideoProfileFormatNotSupportedKHR";
-      case Result::eErrorVideoProfileCodecNotSupportedKHR      : return "ErrorVideoProfileCodecNotSupportedKHR";
-      case Result::eErrorVideoStdVersionNotSupportedKHR        : return "ErrorVideoStdVersionNotSupportedKHR";
+      case Result::eSuccess: return "Success";
+      case Result::eNotReady: return "NotReady";
+      case Result::eTimeout: return "Timeout";
+      case Result::eEventSet: return "EventSet";
+      case Result::eEventReset: return "EventReset";
+      case Result::eIncomplete: return "Incomplete";
+      case Result::eErrorOutOfHostMemory: return "ErrorOutOfHostMemory";
+      case Result::eErrorOutOfDeviceMemory: return "ErrorOutOfDeviceMemory";
+      case Result::eErrorInitializationFailed: return "ErrorInitializationFailed";
+      case Result::eErrorDeviceLost: return "ErrorDeviceLost";
+      case Result::eErrorMemoryMapFailed: return "ErrorMemoryMapFailed";
+      case Result::eErrorLayerNotPresent: return "ErrorLayerNotPresent";
+      case Result::eErrorExtensionNotPresent: return "ErrorExtensionNotPresent";
+      case Result::eErrorFeatureNotPresent: return "ErrorFeatureNotPresent";
+      case Result::eErrorIncompatibleDriver: return "ErrorIncompatibleDriver";
+      case Result::eErrorTooManyObjects: return "ErrorTooManyObjects";
+      case Result::eErrorFormatNotSupported: return "ErrorFormatNotSupported";
+      case Result::eErrorFragmentedPool: return "ErrorFragmentedPool";
+      case Result::eErrorUnknown: return "ErrorUnknown";
+      case Result::eErrorOutOfPoolMemory: return "ErrorOutOfPoolMemory";
+      case Result::eErrorInvalidExternalHandle: return "ErrorInvalidExternalHandle";
+      case Result::eErrorFragmentation: return "ErrorFragmentation";
+      case Result::eErrorInvalidOpaqueCaptureAddress: return "ErrorInvalidOpaqueCaptureAddress";
+      case Result::ePipelineCompileRequired: return "PipelineCompileRequired";
+      case Result::eErrorSurfaceLostKHR: return "ErrorSurfaceLostKHR";
+      case Result::eErrorNativeWindowInUseKHR: return "ErrorNativeWindowInUseKHR";
+      case Result::eSuboptimalKHR: return "SuboptimalKHR";
+      case Result::eErrorOutOfDateKHR: return "ErrorOutOfDateKHR";
+      case Result::eErrorIncompatibleDisplayKHR: return "ErrorIncompatibleDisplayKHR";
+      case Result::eErrorValidationFailedEXT: return "ErrorValidationFailedEXT";
+      case Result::eErrorInvalidShaderNV: return "ErrorInvalidShaderNV";
+      case Result::eErrorImageUsageNotSupportedKHR: return "ErrorImageUsageNotSupportedKHR";
+      case Result::eErrorVideoPictureLayoutNotSupportedKHR: return "ErrorVideoPictureLayoutNotSupportedKHR";
+      case Result::eErrorVideoProfileOperationNotSupportedKHR: return "ErrorVideoProfileOperationNotSupportedKHR";
+      case Result::eErrorVideoProfileFormatNotSupportedKHR: return "ErrorVideoProfileFormatNotSupportedKHR";
+      case Result::eErrorVideoProfileCodecNotSupportedKHR: return "ErrorVideoProfileCodecNotSupportedKHR";
+      case Result::eErrorVideoStdVersionNotSupportedKHR: return "ErrorVideoStdVersionNotSupportedKHR";
       case Result::eErrorInvalidDrmFormatModifierPlaneLayoutEXT: return "ErrorInvalidDrmFormatModifierPlaneLayoutEXT";
-      case Result::eErrorPresentTimingQueueFullEXT             : return "ErrorPresentTimingQueueFullEXT";
+      case Result::eErrorNotPermittedKHR: return "ErrorNotPermittedKHR";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       case Result::eErrorFullScreenExclusiveModeLostEXT: return "ErrorFullScreenExclusiveModeLostEXT";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      case Result::eThreadIdleKHR                    : return "ThreadIdleKHR";
-      case Result::eThreadDoneKHR                    : return "ThreadDoneKHR";
-      case Result::eOperationDeferredKHR             : return "OperationDeferredKHR";
-      case Result::eOperationNotDeferredKHR          : return "OperationNotDeferredKHR";
+      case Result::eThreadIdleKHR: return "ThreadIdleKHR";
+      case Result::eThreadDoneKHR: return "ThreadDoneKHR";
+      case Result::eOperationDeferredKHR: return "OperationDeferredKHR";
+      case Result::eOperationNotDeferredKHR: return "OperationNotDeferredKHR";
       case Result::eErrorInvalidVideoStdParametersKHR: return "ErrorInvalidVideoStdParametersKHR";
-      case Result::eErrorCompressionExhaustedEXT     : return "ErrorCompressionExhaustedEXT";
-      case Result::eIncompatibleShaderBinaryEXT      : return "IncompatibleShaderBinaryEXT";
-      case Result::ePipelineBinaryMissingKHR         : return "PipelineBinaryMissingKHR";
-      case Result::eErrorNotEnoughSpaceKHR           : return "ErrorNotEnoughSpaceKHR";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case Result::eErrorCompressionExhaustedEXT: return "ErrorCompressionExhaustedEXT";
+      case Result::eIncompatibleShaderBinaryEXT: return "IncompatibleShaderBinaryEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( StructureType value )
+  VULKAN_HPP_INLINE std::string to_string( StructureType value )
   {
     switch ( value )
     {
-      case StructureType::eApplicationInfo                                     : return "ApplicationInfo";
-      case StructureType::eInstanceCreateInfo                                  : return "InstanceCreateInfo";
-      case StructureType::eDeviceQueueCreateInfo                               : return "DeviceQueueCreateInfo";
-      case StructureType::eDeviceCreateInfo                                    : return "DeviceCreateInfo";
-      case StructureType::eSubmitInfo                                          : return "SubmitInfo";
-      case StructureType::eMemoryAllocateInfo                                  : return "MemoryAllocateInfo";
-      case StructureType::eMappedMemoryRange                                   : return "MappedMemoryRange";
-      case StructureType::eBindSparseInfo                                      : return "BindSparseInfo";
-      case StructureType::eFenceCreateInfo                                     : return "FenceCreateInfo";
-      case StructureType::eSemaphoreCreateInfo                                 : return "SemaphoreCreateInfo";
-      case StructureType::eEventCreateInfo                                     : return "EventCreateInfo";
-      case StructureType::eQueryPoolCreateInfo                                 : return "QueryPoolCreateInfo";
-      case StructureType::eBufferCreateInfo                                    : return "BufferCreateInfo";
-      case StructureType::eBufferViewCreateInfo                                : return "BufferViewCreateInfo";
-      case StructureType::eImageCreateInfo                                     : return "ImageCreateInfo";
-      case StructureType::eImageViewCreateInfo                                 : return "ImageViewCreateInfo";
-      case StructureType::eShaderModuleCreateInfo                              : return "ShaderModuleCreateInfo";
-      case StructureType::ePipelineCacheCreateInfo                             : return "PipelineCacheCreateInfo";
-      case StructureType::ePipelineShaderStageCreateInfo                       : return "PipelineShaderStageCreateInfo";
-      case StructureType::ePipelineVertexInputStateCreateInfo                  : return "PipelineVertexInputStateCreateInfo";
-      case StructureType::ePipelineInputAssemblyStateCreateInfo                : return "PipelineInputAssemblyStateCreateInfo";
-      case StructureType::ePipelineTessellationStateCreateInfo                 : return "PipelineTessellationStateCreateInfo";
-      case StructureType::ePipelineViewportStateCreateInfo                     : return "PipelineViewportStateCreateInfo";
-      case StructureType::ePipelineRasterizationStateCreateInfo                : return "PipelineRasterizationStateCreateInfo";
-      case StructureType::ePipelineMultisampleStateCreateInfo                  : return "PipelineMultisampleStateCreateInfo";
-      case StructureType::ePipelineDepthStencilStateCreateInfo                 : return "PipelineDepthStencilStateCreateInfo";
-      case StructureType::ePipelineColorBlendStateCreateInfo                   : return "PipelineColorBlendStateCreateInfo";
-      case StructureType::ePipelineDynamicStateCreateInfo                      : return "PipelineDynamicStateCreateInfo";
-      case StructureType::eGraphicsPipelineCreateInfo                          : return "GraphicsPipelineCreateInfo";
-      case StructureType::eComputePipelineCreateInfo                           : return "ComputePipelineCreateInfo";
-      case StructureType::ePipelineLayoutCreateInfo                            : return "PipelineLayoutCreateInfo";
-      case StructureType::eSamplerCreateInfo                                   : return "SamplerCreateInfo";
-      case StructureType::eDescriptorSetLayoutCreateInfo                       : return "DescriptorSetLayoutCreateInfo";
-      case StructureType::eDescriptorPoolCreateInfo                            : return "DescriptorPoolCreateInfo";
-      case StructureType::eDescriptorSetAllocateInfo                           : return "DescriptorSetAllocateInfo";
-      case StructureType::eWriteDescriptorSet                                  : return "WriteDescriptorSet";
-      case StructureType::eCopyDescriptorSet                                   : return "CopyDescriptorSet";
-      case StructureType::eFramebufferCreateInfo                               : return "FramebufferCreateInfo";
-      case StructureType::eRenderPassCreateInfo                                : return "RenderPassCreateInfo";
-      case StructureType::eCommandPoolCreateInfo                               : return "CommandPoolCreateInfo";
-      case StructureType::eCommandBufferAllocateInfo                           : return "CommandBufferAllocateInfo";
-      case StructureType::eCommandBufferInheritanceInfo                        : return "CommandBufferInheritanceInfo";
-      case StructureType::eCommandBufferBeginInfo                              : return "CommandBufferBeginInfo";
-      case StructureType::eRenderPassBeginInfo                                 : return "RenderPassBeginInfo";
-      case StructureType::eBufferMemoryBarrier                                 : return "BufferMemoryBarrier";
-      case StructureType::eImageMemoryBarrier                                  : return "ImageMemoryBarrier";
-      case StructureType::eMemoryBarrier                                       : return "MemoryBarrier";
-      case StructureType::eLoaderInstanceCreateInfo                            : return "LoaderInstanceCreateInfo";
-      case StructureType::eLoaderDeviceCreateInfo                              : return "LoaderDeviceCreateInfo";
-      case StructureType::eBindBufferMemoryInfo                                : return "BindBufferMemoryInfo";
-      case StructureType::eBindImageMemoryInfo                                 : return "BindImageMemoryInfo";
-      case StructureType::eMemoryDedicatedRequirements                         : return "MemoryDedicatedRequirements";
-      case StructureType::eMemoryDedicatedAllocateInfo                         : return "MemoryDedicatedAllocateInfo";
-      case StructureType::eMemoryAllocateFlagsInfo                             : return "MemoryAllocateFlagsInfo";
-      case StructureType::eDeviceGroupCommandBufferBeginInfo                   : return "DeviceGroupCommandBufferBeginInfo";
-      case StructureType::eDeviceGroupSubmitInfo                               : return "DeviceGroupSubmitInfo";
-      case StructureType::eDeviceGroupBindSparseInfo                           : return "DeviceGroupBindSparseInfo";
-      case StructureType::eBindBufferMemoryDeviceGroupInfo                     : return "BindBufferMemoryDeviceGroupInfo";
-      case StructureType::eBindImageMemoryDeviceGroupInfo                      : return "BindImageMemoryDeviceGroupInfo";
-      case StructureType::ePhysicalDeviceGroupProperties                       : return "PhysicalDeviceGroupProperties";
-      case StructureType::eDeviceGroupDeviceCreateInfo                         : return "DeviceGroupDeviceCreateInfo";
-      case StructureType::eBufferMemoryRequirementsInfo2                       : return "BufferMemoryRequirementsInfo2";
-      case StructureType::eImageMemoryRequirementsInfo2                        : return "ImageMemoryRequirementsInfo2";
-      case StructureType::eImageSparseMemoryRequirementsInfo2                  : return "ImageSparseMemoryRequirementsInfo2";
-      case StructureType::eMemoryRequirements2                                 : return "MemoryRequirements2";
-      case StructureType::eSparseImageMemoryRequirements2                      : return "SparseImageMemoryRequirements2";
-      case StructureType::ePhysicalDeviceFeatures2                             : return "PhysicalDeviceFeatures2";
-      case StructureType::ePhysicalDeviceProperties2                           : return "PhysicalDeviceProperties2";
-      case StructureType::eFormatProperties2                                   : return "FormatProperties2";
-      case StructureType::eImageFormatProperties2                              : return "ImageFormatProperties2";
-      case StructureType::ePhysicalDeviceImageFormatInfo2                      : return "PhysicalDeviceImageFormatInfo2";
-      case StructureType::eQueueFamilyProperties2                              : return "QueueFamilyProperties2";
-      case StructureType::ePhysicalDeviceMemoryProperties2                     : return "PhysicalDeviceMemoryProperties2";
-      case StructureType::eSparseImageFormatProperties2                        : return "SparseImageFormatProperties2";
-      case StructureType::ePhysicalDeviceSparseImageFormatInfo2                : return "PhysicalDeviceSparseImageFormatInfo2";
-      case StructureType::eImageViewUsageCreateInfo                            : return "ImageViewUsageCreateInfo";
-      case StructureType::eProtectedSubmitInfo                                 : return "ProtectedSubmitInfo";
-      case StructureType::ePhysicalDeviceProtectedMemoryFeatures               : return "PhysicalDeviceProtectedMemoryFeatures";
-      case StructureType::ePhysicalDeviceProtectedMemoryProperties             : return "PhysicalDeviceProtectedMemoryProperties";
-      case StructureType::eDeviceQueueInfo2                                    : return "DeviceQueueInfo2";
-      case StructureType::ePhysicalDeviceExternalImageFormatInfo               : return "PhysicalDeviceExternalImageFormatInfo";
-      case StructureType::eExternalImageFormatProperties                       : return "ExternalImageFormatProperties";
-      case StructureType::ePhysicalDeviceExternalBufferInfo                    : return "PhysicalDeviceExternalBufferInfo";
-      case StructureType::eExternalBufferProperties                            : return "ExternalBufferProperties";
-      case StructureType::ePhysicalDeviceIdProperties                          : return "PhysicalDeviceIdProperties";
-      case StructureType::eExternalMemoryBufferCreateInfo                      : return "ExternalMemoryBufferCreateInfo";
-      case StructureType::eExternalMemoryImageCreateInfo                       : return "ExternalMemoryImageCreateInfo";
-      case StructureType::eExportMemoryAllocateInfo                            : return "ExportMemoryAllocateInfo";
-      case StructureType::ePhysicalDeviceExternalFenceInfo                     : return "PhysicalDeviceExternalFenceInfo";
-      case StructureType::eExternalFenceProperties                             : return "ExternalFenceProperties";
-      case StructureType::eExportFenceCreateInfo                               : return "ExportFenceCreateInfo";
-      case StructureType::eExportSemaphoreCreateInfo                           : return "ExportSemaphoreCreateInfo";
-      case StructureType::ePhysicalDeviceExternalSemaphoreInfo                 : return "PhysicalDeviceExternalSemaphoreInfo";
-      case StructureType::eExternalSemaphoreProperties                         : return "ExternalSemaphoreProperties";
-      case StructureType::ePhysicalDeviceSubgroupProperties                    : return "PhysicalDeviceSubgroupProperties";
-      case StructureType::ePhysicalDevice16BitStorageFeatures                  : return "PhysicalDevice16BitStorageFeatures";
-      case StructureType::ePhysicalDeviceVariablePointersFeatures              : return "PhysicalDeviceVariablePointersFeatures";
-      case StructureType::eDescriptorUpdateTemplateCreateInfo                  : return "DescriptorUpdateTemplateCreateInfo";
-      case StructureType::ePhysicalDeviceMaintenance3Properties                : return "PhysicalDeviceMaintenance3Properties";
-      case StructureType::eDescriptorSetLayoutSupport                          : return "DescriptorSetLayoutSupport";
-      case StructureType::eSamplerYcbcrConversionCreateInfo                    : return "SamplerYcbcrConversionCreateInfo";
-      case StructureType::eSamplerYcbcrConversionInfo                          : return "SamplerYcbcrConversionInfo";
-      case StructureType::eBindImagePlaneMemoryInfo                            : return "BindImagePlaneMemoryInfo";
-      case StructureType::eImagePlaneMemoryRequirementsInfo                    : return "ImagePlaneMemoryRequirementsInfo";
-      case StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures        : return "PhysicalDeviceSamplerYcbcrConversionFeatures";
-      case StructureType::eSamplerYcbcrConversionImageFormatProperties         : return "SamplerYcbcrConversionImageFormatProperties";
-      case StructureType::eDeviceGroupRenderPassBeginInfo                      : return "DeviceGroupRenderPassBeginInfo";
-      case StructureType::ePhysicalDevicePointClippingProperties               : return "PhysicalDevicePointClippingProperties";
-      case StructureType::eRenderPassInputAttachmentAspectCreateInfo           : return "RenderPassInputAttachmentAspectCreateInfo";
-      case StructureType::ePipelineTessellationDomainOriginStateCreateInfo     : return "PipelineTessellationDomainOriginStateCreateInfo";
-      case StructureType::eRenderPassMultiviewCreateInfo                       : return "RenderPassMultiviewCreateInfo";
-      case StructureType::ePhysicalDeviceMultiviewFeatures                     : return "PhysicalDeviceMultiviewFeatures";
-      case StructureType::ePhysicalDeviceMultiviewProperties                   : return "PhysicalDeviceMultiviewProperties";
-      case StructureType::ePhysicalDeviceShaderDrawParametersFeatures          : return "PhysicalDeviceShaderDrawParametersFeatures";
-      case StructureType::ePhysicalDeviceVulkan11Features                      : return "PhysicalDeviceVulkan11Features";
-      case StructureType::ePhysicalDeviceVulkan11Properties                    : return "PhysicalDeviceVulkan11Properties";
-      case StructureType::ePhysicalDeviceVulkan12Features                      : return "PhysicalDeviceVulkan12Features";
-      case StructureType::ePhysicalDeviceVulkan12Properties                    : return "PhysicalDeviceVulkan12Properties";
-      case StructureType::eImageFormatListCreateInfo                           : return "ImageFormatListCreateInfo";
-      case StructureType::ePhysicalDeviceDriverProperties                      : return "PhysicalDeviceDriverProperties";
-      case StructureType::ePhysicalDeviceVulkanMemoryModelFeatures             : return "PhysicalDeviceVulkanMemoryModelFeatures";
-      case StructureType::ePhysicalDeviceHostQueryResetFeatures                : return "PhysicalDeviceHostQueryResetFeatures";
-      case StructureType::ePhysicalDeviceTimelineSemaphoreFeatures             : return "PhysicalDeviceTimelineSemaphoreFeatures";
-      case StructureType::ePhysicalDeviceTimelineSemaphoreProperties           : return "PhysicalDeviceTimelineSemaphoreProperties";
-      case StructureType::eSemaphoreTypeCreateInfo                             : return "SemaphoreTypeCreateInfo";
-      case StructureType::eTimelineSemaphoreSubmitInfo                         : return "TimelineSemaphoreSubmitInfo";
-      case StructureType::eSemaphoreWaitInfo                                   : return "SemaphoreWaitInfo";
-      case StructureType::eSemaphoreSignalInfo                                 : return "SemaphoreSignalInfo";
-      case StructureType::ePhysicalDeviceBufferDeviceAddressFeatures           : return "PhysicalDeviceBufferDeviceAddressFeatures";
-      case StructureType::eBufferDeviceAddressInfo                             : return "BufferDeviceAddressInfo";
-      case StructureType::eBufferOpaqueCaptureAddressCreateInfo                : return "BufferOpaqueCaptureAddressCreateInfo";
-      case StructureType::eMemoryOpaqueCaptureAddressAllocateInfo              : return "MemoryOpaqueCaptureAddressAllocateInfo";
-      case StructureType::eDeviceMemoryOpaqueCaptureAddressInfo                : return "DeviceMemoryOpaqueCaptureAddressInfo";
-      case StructureType::ePhysicalDevice8BitStorageFeatures                   : return "PhysicalDevice8BitStorageFeatures";
-      case StructureType::ePhysicalDeviceShaderAtomicInt64Features             : return "PhysicalDeviceShaderAtomicInt64Features";
-      case StructureType::ePhysicalDeviceShaderFloat16Int8Features             : return "PhysicalDeviceShaderFloat16Int8Features";
-      case StructureType::ePhysicalDeviceFloatControlsProperties               : return "PhysicalDeviceFloatControlsProperties";
-      case StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo           : return "DescriptorSetLayoutBindingFlagsCreateInfo";
-      case StructureType::ePhysicalDeviceDescriptorIndexingFeatures            : return "PhysicalDeviceDescriptorIndexingFeatures";
-      case StructureType::ePhysicalDeviceDescriptorIndexingProperties          : return "PhysicalDeviceDescriptorIndexingProperties";
-      case StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo    : return "DescriptorSetVariableDescriptorCountAllocateInfo";
-      case StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport   : return "DescriptorSetVariableDescriptorCountLayoutSupport";
-      case StructureType::ePhysicalDeviceScalarBlockLayoutFeatures             : return "PhysicalDeviceScalarBlockLayoutFeatures";
-      case StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties         : return "PhysicalDeviceSamplerFilterMinmaxProperties";
-      case StructureType::eSamplerReductionModeCreateInfo                      : return "SamplerReductionModeCreateInfo";
-      case StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures   : return "PhysicalDeviceUniformBufferStandardLayoutFeatures";
-      case StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures   : return "PhysicalDeviceShaderSubgroupExtendedTypesFeatures";
-      case StructureType::eAttachmentDescription2                              : return "AttachmentDescription2";
-      case StructureType::eAttachmentReference2                                : return "AttachmentReference2";
-      case StructureType::eSubpassDescription2                                 : return "SubpassDescription2";
-      case StructureType::eSubpassDependency2                                  : return "SubpassDependency2";
-      case StructureType::eRenderPassCreateInfo2                               : return "RenderPassCreateInfo2";
-      case StructureType::eSubpassBeginInfo                                    : return "SubpassBeginInfo";
-      case StructureType::eSubpassEndInfo                                      : return "SubpassEndInfo";
-      case StructureType::ePhysicalDeviceDepthStencilResolveProperties         : return "PhysicalDeviceDepthStencilResolveProperties";
-      case StructureType::eSubpassDescriptionDepthStencilResolve               : return "SubpassDescriptionDepthStencilResolve";
-      case StructureType::eImageStencilUsageCreateInfo                         : return "ImageStencilUsageCreateInfo";
-      case StructureType::ePhysicalDeviceImagelessFramebufferFeatures          : return "PhysicalDeviceImagelessFramebufferFeatures";
-      case StructureType::eFramebufferAttachmentsCreateInfo                    : return "FramebufferAttachmentsCreateInfo";
-      case StructureType::eFramebufferAttachmentImageInfo                      : return "FramebufferAttachmentImageInfo";
-      case StructureType::eRenderPassAttachmentBeginInfo                       : return "RenderPassAttachmentBeginInfo";
-      case StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures   : return "PhysicalDeviceSeparateDepthStencilLayoutsFeatures";
-      case StructureType::eAttachmentReferenceStencilLayout                    : return "AttachmentReferenceStencilLayout";
-      case StructureType::eAttachmentDescriptionStencilLayout                  : return "AttachmentDescriptionStencilLayout";
-      case StructureType::ePhysicalDeviceVulkan13Features                      : return "PhysicalDeviceVulkan13Features";
-      case StructureType::ePhysicalDeviceVulkan13Properties                    : return "PhysicalDeviceVulkan13Properties";
-      case StructureType::ePhysicalDeviceToolProperties                        : return "PhysicalDeviceToolProperties";
-      case StructureType::ePhysicalDevicePrivateDataFeatures                   : return "PhysicalDevicePrivateDataFeatures";
-      case StructureType::eDevicePrivateDataCreateInfo                         : return "DevicePrivateDataCreateInfo";
-      case StructureType::ePrivateDataSlotCreateInfo                           : return "PrivateDataSlotCreateInfo";
-      case StructureType::eMemoryBarrier2                                      : return "MemoryBarrier2";
-      case StructureType::eBufferMemoryBarrier2                                : return "BufferMemoryBarrier2";
-      case StructureType::eImageMemoryBarrier2                                 : return "ImageMemoryBarrier2";
-      case StructureType::eDependencyInfo                                      : return "DependencyInfo";
-      case StructureType::eSubmitInfo2                                         : return "SubmitInfo2";
-      case StructureType::eSemaphoreSubmitInfo                                 : return "SemaphoreSubmitInfo";
-      case StructureType::eCommandBufferSubmitInfo                             : return "CommandBufferSubmitInfo";
-      case StructureType::ePhysicalDeviceSynchronization2Features              : return "PhysicalDeviceSynchronization2Features";
-      case StructureType::eCopyBufferInfo2                                     : return "CopyBufferInfo2";
-      case StructureType::eCopyImageInfo2                                      : return "CopyImageInfo2";
-      case StructureType::eCopyBufferToImageInfo2                              : return "CopyBufferToImageInfo2";
-      case StructureType::eCopyImageToBufferInfo2                              : return "CopyImageToBufferInfo2";
-      case StructureType::eBufferCopy2                                         : return "BufferCopy2";
-      case StructureType::eImageCopy2                                          : return "ImageCopy2";
-      case StructureType::eBufferImageCopy2                                    : return "BufferImageCopy2";
-      case StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures     : return "PhysicalDeviceTextureCompressionAstcHdrFeatures";
-      case StructureType::eFormatProperties3                                   : return "FormatProperties3";
-      case StructureType::ePhysicalDeviceMaintenance4Features                  : return "PhysicalDeviceMaintenance4Features";
-      case StructureType::ePhysicalDeviceMaintenance4Properties                : return "PhysicalDeviceMaintenance4Properties";
-      case StructureType::eDeviceBufferMemoryRequirements                      : return "DeviceBufferMemoryRequirements";
-      case StructureType::eDeviceImageMemoryRequirements                       : return "DeviceImageMemoryRequirements";
-      case StructureType::ePipelineCreationFeedbackCreateInfo                  : return "PipelineCreationFeedbackCreateInfo";
-      case StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures     : return "PhysicalDeviceShaderTerminateInvocationFeatures";
+      case StructureType::eApplicationInfo: return "ApplicationInfo";
+      case StructureType::eInstanceCreateInfo: return "InstanceCreateInfo";
+      case StructureType::eDeviceQueueCreateInfo: return "DeviceQueueCreateInfo";
+      case StructureType::eDeviceCreateInfo: return "DeviceCreateInfo";
+      case StructureType::eSubmitInfo: return "SubmitInfo";
+      case StructureType::eMemoryAllocateInfo: return "MemoryAllocateInfo";
+      case StructureType::eMappedMemoryRange: return "MappedMemoryRange";
+      case StructureType::eBindSparseInfo: return "BindSparseInfo";
+      case StructureType::eFenceCreateInfo: return "FenceCreateInfo";
+      case StructureType::eSemaphoreCreateInfo: return "SemaphoreCreateInfo";
+      case StructureType::eEventCreateInfo: return "EventCreateInfo";
+      case StructureType::eQueryPoolCreateInfo: return "QueryPoolCreateInfo";
+      case StructureType::eBufferCreateInfo: return "BufferCreateInfo";
+      case StructureType::eBufferViewCreateInfo: return "BufferViewCreateInfo";
+      case StructureType::eImageCreateInfo: return "ImageCreateInfo";
+      case StructureType::eImageViewCreateInfo: return "ImageViewCreateInfo";
+      case StructureType::eShaderModuleCreateInfo: return "ShaderModuleCreateInfo";
+      case StructureType::ePipelineCacheCreateInfo: return "PipelineCacheCreateInfo";
+      case StructureType::ePipelineShaderStageCreateInfo: return "PipelineShaderStageCreateInfo";
+      case StructureType::ePipelineVertexInputStateCreateInfo: return "PipelineVertexInputStateCreateInfo";
+      case StructureType::ePipelineInputAssemblyStateCreateInfo: return "PipelineInputAssemblyStateCreateInfo";
+      case StructureType::ePipelineTessellationStateCreateInfo: return "PipelineTessellationStateCreateInfo";
+      case StructureType::ePipelineViewportStateCreateInfo: return "PipelineViewportStateCreateInfo";
+      case StructureType::ePipelineRasterizationStateCreateInfo: return "PipelineRasterizationStateCreateInfo";
+      case StructureType::ePipelineMultisampleStateCreateInfo: return "PipelineMultisampleStateCreateInfo";
+      case StructureType::ePipelineDepthStencilStateCreateInfo: return "PipelineDepthStencilStateCreateInfo";
+      case StructureType::ePipelineColorBlendStateCreateInfo: return "PipelineColorBlendStateCreateInfo";
+      case StructureType::ePipelineDynamicStateCreateInfo: return "PipelineDynamicStateCreateInfo";
+      case StructureType::eGraphicsPipelineCreateInfo: return "GraphicsPipelineCreateInfo";
+      case StructureType::eComputePipelineCreateInfo: return "ComputePipelineCreateInfo";
+      case StructureType::ePipelineLayoutCreateInfo: return "PipelineLayoutCreateInfo";
+      case StructureType::eSamplerCreateInfo: return "SamplerCreateInfo";
+      case StructureType::eDescriptorSetLayoutCreateInfo: return "DescriptorSetLayoutCreateInfo";
+      case StructureType::eDescriptorPoolCreateInfo: return "DescriptorPoolCreateInfo";
+      case StructureType::eDescriptorSetAllocateInfo: return "DescriptorSetAllocateInfo";
+      case StructureType::eWriteDescriptorSet: return "WriteDescriptorSet";
+      case StructureType::eCopyDescriptorSet: return "CopyDescriptorSet";
+      case StructureType::eFramebufferCreateInfo: return "FramebufferCreateInfo";
+      case StructureType::eRenderPassCreateInfo: return "RenderPassCreateInfo";
+      case StructureType::eCommandPoolCreateInfo: return "CommandPoolCreateInfo";
+      case StructureType::eCommandBufferAllocateInfo: return "CommandBufferAllocateInfo";
+      case StructureType::eCommandBufferInheritanceInfo: return "CommandBufferInheritanceInfo";
+      case StructureType::eCommandBufferBeginInfo: return "CommandBufferBeginInfo";
+      case StructureType::eRenderPassBeginInfo: return "RenderPassBeginInfo";
+      case StructureType::eBufferMemoryBarrier: return "BufferMemoryBarrier";
+      case StructureType::eImageMemoryBarrier: return "ImageMemoryBarrier";
+      case StructureType::eMemoryBarrier: return "MemoryBarrier";
+      case StructureType::eLoaderInstanceCreateInfo: return "LoaderInstanceCreateInfo";
+      case StructureType::eLoaderDeviceCreateInfo: return "LoaderDeviceCreateInfo";
+      case StructureType::ePhysicalDeviceSubgroupProperties: return "PhysicalDeviceSubgroupProperties";
+      case StructureType::eBindBufferMemoryInfo: return "BindBufferMemoryInfo";
+      case StructureType::eBindImageMemoryInfo: return "BindImageMemoryInfo";
+      case StructureType::ePhysicalDevice16BitStorageFeatures: return "PhysicalDevice16BitStorageFeatures";
+      case StructureType::eMemoryDedicatedRequirements: return "MemoryDedicatedRequirements";
+      case StructureType::eMemoryDedicatedAllocateInfo: return "MemoryDedicatedAllocateInfo";
+      case StructureType::eMemoryAllocateFlagsInfo: return "MemoryAllocateFlagsInfo";
+      case StructureType::eDeviceGroupRenderPassBeginInfo: return "DeviceGroupRenderPassBeginInfo";
+      case StructureType::eDeviceGroupCommandBufferBeginInfo: return "DeviceGroupCommandBufferBeginInfo";
+      case StructureType::eDeviceGroupSubmitInfo: return "DeviceGroupSubmitInfo";
+      case StructureType::eDeviceGroupBindSparseInfo: return "DeviceGroupBindSparseInfo";
+      case StructureType::eBindBufferMemoryDeviceGroupInfo: return "BindBufferMemoryDeviceGroupInfo";
+      case StructureType::eBindImageMemoryDeviceGroupInfo: return "BindImageMemoryDeviceGroupInfo";
+      case StructureType::ePhysicalDeviceGroupProperties: return "PhysicalDeviceGroupProperties";
+      case StructureType::eDeviceGroupDeviceCreateInfo: return "DeviceGroupDeviceCreateInfo";
+      case StructureType::eBufferMemoryRequirementsInfo2: return "BufferMemoryRequirementsInfo2";
+      case StructureType::eImageMemoryRequirementsInfo2: return "ImageMemoryRequirementsInfo2";
+      case StructureType::eImageSparseMemoryRequirementsInfo2: return "ImageSparseMemoryRequirementsInfo2";
+      case StructureType::eMemoryRequirements2: return "MemoryRequirements2";
+      case StructureType::eSparseImageMemoryRequirements2: return "SparseImageMemoryRequirements2";
+      case StructureType::ePhysicalDeviceFeatures2: return "PhysicalDeviceFeatures2";
+      case StructureType::ePhysicalDeviceProperties2: return "PhysicalDeviceProperties2";
+      case StructureType::eFormatProperties2: return "FormatProperties2";
+      case StructureType::eImageFormatProperties2: return "ImageFormatProperties2";
+      case StructureType::ePhysicalDeviceImageFormatInfo2: return "PhysicalDeviceImageFormatInfo2";
+      case StructureType::eQueueFamilyProperties2: return "QueueFamilyProperties2";
+      case StructureType::ePhysicalDeviceMemoryProperties2: return "PhysicalDeviceMemoryProperties2";
+      case StructureType::eSparseImageFormatProperties2: return "SparseImageFormatProperties2";
+      case StructureType::ePhysicalDeviceSparseImageFormatInfo2: return "PhysicalDeviceSparseImageFormatInfo2";
+      case StructureType::ePhysicalDevicePointClippingProperties: return "PhysicalDevicePointClippingProperties";
+      case StructureType::eRenderPassInputAttachmentAspectCreateInfo: return "RenderPassInputAttachmentAspectCreateInfo";
+      case StructureType::eImageViewUsageCreateInfo: return "ImageViewUsageCreateInfo";
+      case StructureType::ePipelineTessellationDomainOriginStateCreateInfo: return "PipelineTessellationDomainOriginStateCreateInfo";
+      case StructureType::eRenderPassMultiviewCreateInfo: return "RenderPassMultiviewCreateInfo";
+      case StructureType::ePhysicalDeviceMultiviewFeatures: return "PhysicalDeviceMultiviewFeatures";
+      case StructureType::ePhysicalDeviceMultiviewProperties: return "PhysicalDeviceMultiviewProperties";
+      case StructureType::ePhysicalDeviceVariablePointersFeatures: return "PhysicalDeviceVariablePointersFeatures";
+      case StructureType::eProtectedSubmitInfo: return "ProtectedSubmitInfo";
+      case StructureType::ePhysicalDeviceProtectedMemoryFeatures: return "PhysicalDeviceProtectedMemoryFeatures";
+      case StructureType::ePhysicalDeviceProtectedMemoryProperties: return "PhysicalDeviceProtectedMemoryProperties";
+      case StructureType::eDeviceQueueInfo2: return "DeviceQueueInfo2";
+      case StructureType::eSamplerYcbcrConversionCreateInfo: return "SamplerYcbcrConversionCreateInfo";
+      case StructureType::eSamplerYcbcrConversionInfo: return "SamplerYcbcrConversionInfo";
+      case StructureType::eBindImagePlaneMemoryInfo: return "BindImagePlaneMemoryInfo";
+      case StructureType::eImagePlaneMemoryRequirementsInfo: return "ImagePlaneMemoryRequirementsInfo";
+      case StructureType::ePhysicalDeviceSamplerYcbcrConversionFeatures: return "PhysicalDeviceSamplerYcbcrConversionFeatures";
+      case StructureType::eSamplerYcbcrConversionImageFormatProperties: return "SamplerYcbcrConversionImageFormatProperties";
+      case StructureType::eDescriptorUpdateTemplateCreateInfo: return "DescriptorUpdateTemplateCreateInfo";
+      case StructureType::ePhysicalDeviceExternalImageFormatInfo: return "PhysicalDeviceExternalImageFormatInfo";
+      case StructureType::eExternalImageFormatProperties: return "ExternalImageFormatProperties";
+      case StructureType::ePhysicalDeviceExternalBufferInfo: return "PhysicalDeviceExternalBufferInfo";
+      case StructureType::eExternalBufferProperties: return "ExternalBufferProperties";
+      case StructureType::ePhysicalDeviceIdProperties: return "PhysicalDeviceIdProperties";
+      case StructureType::eExternalMemoryBufferCreateInfo: return "ExternalMemoryBufferCreateInfo";
+      case StructureType::eExternalMemoryImageCreateInfo: return "ExternalMemoryImageCreateInfo";
+      case StructureType::eExportMemoryAllocateInfo: return "ExportMemoryAllocateInfo";
+      case StructureType::ePhysicalDeviceExternalFenceInfo: return "PhysicalDeviceExternalFenceInfo";
+      case StructureType::eExternalFenceProperties: return "ExternalFenceProperties";
+      case StructureType::eExportFenceCreateInfo: return "ExportFenceCreateInfo";
+      case StructureType::eExportSemaphoreCreateInfo: return "ExportSemaphoreCreateInfo";
+      case StructureType::ePhysicalDeviceExternalSemaphoreInfo: return "PhysicalDeviceExternalSemaphoreInfo";
+      case StructureType::eExternalSemaphoreProperties: return "ExternalSemaphoreProperties";
+      case StructureType::ePhysicalDeviceMaintenance3Properties: return "PhysicalDeviceMaintenance3Properties";
+      case StructureType::eDescriptorSetLayoutSupport: return "DescriptorSetLayoutSupport";
+      case StructureType::ePhysicalDeviceShaderDrawParametersFeatures: return "PhysicalDeviceShaderDrawParametersFeatures";
+      case StructureType::ePhysicalDeviceVulkan11Features: return "PhysicalDeviceVulkan11Features";
+      case StructureType::ePhysicalDeviceVulkan11Properties: return "PhysicalDeviceVulkan11Properties";
+      case StructureType::ePhysicalDeviceVulkan12Features: return "PhysicalDeviceVulkan12Features";
+      case StructureType::ePhysicalDeviceVulkan12Properties: return "PhysicalDeviceVulkan12Properties";
+      case StructureType::eImageFormatListCreateInfo: return "ImageFormatListCreateInfo";
+      case StructureType::eAttachmentDescription2: return "AttachmentDescription2";
+      case StructureType::eAttachmentReference2: return "AttachmentReference2";
+      case StructureType::eSubpassDescription2: return "SubpassDescription2";
+      case StructureType::eSubpassDependency2: return "SubpassDependency2";
+      case StructureType::eRenderPassCreateInfo2: return "RenderPassCreateInfo2";
+      case StructureType::eSubpassBeginInfo: return "SubpassBeginInfo";
+      case StructureType::eSubpassEndInfo: return "SubpassEndInfo";
+      case StructureType::ePhysicalDevice8BitStorageFeatures: return "PhysicalDevice8BitStorageFeatures";
+      case StructureType::ePhysicalDeviceDriverProperties: return "PhysicalDeviceDriverProperties";
+      case StructureType::ePhysicalDeviceShaderAtomicInt64Features: return "PhysicalDeviceShaderAtomicInt64Features";
+      case StructureType::ePhysicalDeviceShaderFloat16Int8Features: return "PhysicalDeviceShaderFloat16Int8Features";
+      case StructureType::ePhysicalDeviceFloatControlsProperties: return "PhysicalDeviceFloatControlsProperties";
+      case StructureType::eDescriptorSetLayoutBindingFlagsCreateInfo: return "DescriptorSetLayoutBindingFlagsCreateInfo";
+      case StructureType::ePhysicalDeviceDescriptorIndexingFeatures: return "PhysicalDeviceDescriptorIndexingFeatures";
+      case StructureType::ePhysicalDeviceDescriptorIndexingProperties: return "PhysicalDeviceDescriptorIndexingProperties";
+      case StructureType::eDescriptorSetVariableDescriptorCountAllocateInfo: return "DescriptorSetVariableDescriptorCountAllocateInfo";
+      case StructureType::eDescriptorSetVariableDescriptorCountLayoutSupport: return "DescriptorSetVariableDescriptorCountLayoutSupport";
+      case StructureType::ePhysicalDeviceDepthStencilResolveProperties: return "PhysicalDeviceDepthStencilResolveProperties";
+      case StructureType::eSubpassDescriptionDepthStencilResolve: return "SubpassDescriptionDepthStencilResolve";
+      case StructureType::ePhysicalDeviceScalarBlockLayoutFeatures: return "PhysicalDeviceScalarBlockLayoutFeatures";
+      case StructureType::eImageStencilUsageCreateInfo: return "ImageStencilUsageCreateInfo";
+      case StructureType::ePhysicalDeviceSamplerFilterMinmaxProperties: return "PhysicalDeviceSamplerFilterMinmaxProperties";
+      case StructureType::eSamplerReductionModeCreateInfo: return "SamplerReductionModeCreateInfo";
+      case StructureType::ePhysicalDeviceVulkanMemoryModelFeatures: return "PhysicalDeviceVulkanMemoryModelFeatures";
+      case StructureType::ePhysicalDeviceImagelessFramebufferFeatures: return "PhysicalDeviceImagelessFramebufferFeatures";
+      case StructureType::eFramebufferAttachmentsCreateInfo: return "FramebufferAttachmentsCreateInfo";
+      case StructureType::eFramebufferAttachmentImageInfo: return "FramebufferAttachmentImageInfo";
+      case StructureType::eRenderPassAttachmentBeginInfo: return "RenderPassAttachmentBeginInfo";
+      case StructureType::ePhysicalDeviceUniformBufferStandardLayoutFeatures: return "PhysicalDeviceUniformBufferStandardLayoutFeatures";
+      case StructureType::ePhysicalDeviceShaderSubgroupExtendedTypesFeatures: return "PhysicalDeviceShaderSubgroupExtendedTypesFeatures";
+      case StructureType::ePhysicalDeviceSeparateDepthStencilLayoutsFeatures: return "PhysicalDeviceSeparateDepthStencilLayoutsFeatures";
+      case StructureType::eAttachmentReferenceStencilLayout: return "AttachmentReferenceStencilLayout";
+      case StructureType::eAttachmentDescriptionStencilLayout: return "AttachmentDescriptionStencilLayout";
+      case StructureType::ePhysicalDeviceHostQueryResetFeatures: return "PhysicalDeviceHostQueryResetFeatures";
+      case StructureType::ePhysicalDeviceTimelineSemaphoreFeatures: return "PhysicalDeviceTimelineSemaphoreFeatures";
+      case StructureType::ePhysicalDeviceTimelineSemaphoreProperties: return "PhysicalDeviceTimelineSemaphoreProperties";
+      case StructureType::eSemaphoreTypeCreateInfo: return "SemaphoreTypeCreateInfo";
+      case StructureType::eTimelineSemaphoreSubmitInfo: return "TimelineSemaphoreSubmitInfo";
+      case StructureType::eSemaphoreWaitInfo: return "SemaphoreWaitInfo";
+      case StructureType::eSemaphoreSignalInfo: return "SemaphoreSignalInfo";
+      case StructureType::ePhysicalDeviceBufferDeviceAddressFeatures: return "PhysicalDeviceBufferDeviceAddressFeatures";
+      case StructureType::eBufferDeviceAddressInfo: return "BufferDeviceAddressInfo";
+      case StructureType::eBufferOpaqueCaptureAddressCreateInfo: return "BufferOpaqueCaptureAddressCreateInfo";
+      case StructureType::eMemoryOpaqueCaptureAddressAllocateInfo: return "MemoryOpaqueCaptureAddressAllocateInfo";
+      case StructureType::eDeviceMemoryOpaqueCaptureAddressInfo: return "DeviceMemoryOpaqueCaptureAddressInfo";
+      case StructureType::ePhysicalDeviceVulkan13Features: return "PhysicalDeviceVulkan13Features";
+      case StructureType::ePhysicalDeviceVulkan13Properties: return "PhysicalDeviceVulkan13Properties";
+      case StructureType::ePipelineCreationFeedbackCreateInfo: return "PipelineCreationFeedbackCreateInfo";
+      case StructureType::ePhysicalDeviceShaderTerminateInvocationFeatures: return "PhysicalDeviceShaderTerminateInvocationFeatures";
+      case StructureType::ePhysicalDeviceToolProperties: return "PhysicalDeviceToolProperties";
       case StructureType::ePhysicalDeviceShaderDemoteToHelperInvocationFeatures: return "PhysicalDeviceShaderDemoteToHelperInvocationFeatures";
-      case StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures  : return "PhysicalDevicePipelineCreationCacheControlFeatures";
-      case StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures : return "PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures";
-      case StructureType::ePhysicalDeviceImageRobustnessFeatures               : return "PhysicalDeviceImageRobustnessFeatures";
-      case StructureType::ePhysicalDeviceSubgroupSizeControlProperties         : return "PhysicalDeviceSubgroupSizeControlProperties";
-      case StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo   : return "PipelineShaderStageRequiredSubgroupSizeCreateInfo";
-      case StructureType::ePhysicalDeviceSubgroupSizeControlFeatures           : return "PhysicalDeviceSubgroupSizeControlFeatures";
-      case StructureType::ePhysicalDeviceInlineUniformBlockFeatures            : return "PhysicalDeviceInlineUniformBlockFeatures";
-      case StructureType::ePhysicalDeviceInlineUniformBlockProperties          : return "PhysicalDeviceInlineUniformBlockProperties";
-      case StructureType::eWriteDescriptorSetInlineUniformBlock                : return "WriteDescriptorSetInlineUniformBlock";
-      case StructureType::eDescriptorPoolInlineUniformBlockCreateInfo          : return "DescriptorPoolInlineUniformBlockCreateInfo";
-      case StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures       : return "PhysicalDeviceShaderIntegerDotProductFeatures";
-      case StructureType::ePhysicalDeviceShaderIntegerDotProductProperties     : return "PhysicalDeviceShaderIntegerDotProductProperties";
-      case StructureType::ePhysicalDeviceTexelBufferAlignmentProperties        : return "PhysicalDeviceTexelBufferAlignmentProperties";
-      case StructureType::eBlitImageInfo2                                      : return "BlitImageInfo2";
-      case StructureType::eResolveImageInfo2                                   : return "ResolveImageInfo2";
-      case StructureType::eImageBlit2                                          : return "ImageBlit2";
-      case StructureType::eImageResolve2                                       : return "ImageResolve2";
-      case StructureType::eRenderingInfo                                       : return "RenderingInfo";
-      case StructureType::eRenderingAttachmentInfo                             : return "RenderingAttachmentInfo";
-      case StructureType::ePipelineRenderingCreateInfo                         : return "PipelineRenderingCreateInfo";
-      case StructureType::ePhysicalDeviceDynamicRenderingFeatures              : return "PhysicalDeviceDynamicRenderingFeatures";
-      case StructureType::eCommandBufferInheritanceRenderingInfo               : return "CommandBufferInheritanceRenderingInfo";
-      case StructureType::ePhysicalDeviceVulkan14Features                      : return "PhysicalDeviceVulkan14Features";
-      case StructureType::ePhysicalDeviceVulkan14Properties                    : return "PhysicalDeviceVulkan14Properties";
-      case StructureType::eDeviceQueueGlobalPriorityCreateInfo                 : return "DeviceQueueGlobalPriorityCreateInfo";
-      case StructureType::ePhysicalDeviceGlobalPriorityQueryFeatures           : return "PhysicalDeviceGlobalPriorityQueryFeatures";
-      case StructureType::eQueueFamilyGlobalPriorityProperties                 : return "QueueFamilyGlobalPriorityProperties";
-      case StructureType::ePhysicalDeviceIndexTypeUint8Features                : return "PhysicalDeviceIndexTypeUint8Features";
-      case StructureType::eMemoryMapInfo                                       : return "MemoryMapInfo";
-      case StructureType::eMemoryUnmapInfo                                     : return "MemoryUnmapInfo";
-      case StructureType::ePhysicalDeviceMaintenance5Features                  : return "PhysicalDeviceMaintenance5Features";
-      case StructureType::ePhysicalDeviceMaintenance5Properties                : return "PhysicalDeviceMaintenance5Properties";
-      case StructureType::eDeviceImageSubresourceInfo                          : return "DeviceImageSubresourceInfo";
-      case StructureType::eSubresourceLayout2                                  : return "SubresourceLayout2";
-      case StructureType::eImageSubresource2                                   : return "ImageSubresource2";
-      case StructureType::eBufferUsageFlags2CreateInfo                         : return "BufferUsageFlags2CreateInfo";
-      case StructureType::ePhysicalDeviceMaintenance6Features                  : return "PhysicalDeviceMaintenance6Features";
-      case StructureType::ePhysicalDeviceMaintenance6Properties                : return "PhysicalDeviceMaintenance6Properties";
-      case StructureType::eBindMemoryStatus                                    : return "BindMemoryStatus";
-      case StructureType::ePhysicalDeviceHostImageCopyFeatures                 : return "PhysicalDeviceHostImageCopyFeatures";
-      case StructureType::ePhysicalDeviceHostImageCopyProperties               : return "PhysicalDeviceHostImageCopyProperties";
-      case StructureType::eMemoryToImageCopy                                   : return "MemoryToImageCopy";
-      case StructureType::eImageToMemoryCopy                                   : return "ImageToMemoryCopy";
-      case StructureType::eCopyImageToMemoryInfo                               : return "CopyImageToMemoryInfo";
-      case StructureType::eCopyMemoryToImageInfo                               : return "CopyMemoryToImageInfo";
-      case StructureType::eHostImageLayoutTransitionInfo                       : return "HostImageLayoutTransitionInfo";
-      case StructureType::eCopyImageToImageInfo                                : return "CopyImageToImageInfo";
-      case StructureType::eSubresourceHostMemcpySize                           : return "SubresourceHostMemcpySize";
-      case StructureType::eHostImageCopyDevicePerformanceQuery                 : return "HostImageCopyDevicePerformanceQuery";
-      case StructureType::ePhysicalDeviceShaderSubgroupRotateFeatures          : return "PhysicalDeviceShaderSubgroupRotateFeatures";
-      case StructureType::ePhysicalDeviceShaderFloatControls2Features          : return "PhysicalDeviceShaderFloatControls2Features";
-      case StructureType::ePhysicalDeviceShaderExpectAssumeFeatures            : return "PhysicalDeviceShaderExpectAssumeFeatures";
-      case StructureType::ePipelineCreateFlags2CreateInfo                      : return "PipelineCreateFlags2CreateInfo";
-      case StructureType::ePhysicalDevicePushDescriptorProperties              : return "PhysicalDevicePushDescriptorProperties";
-      case StructureType::eBindDescriptorSetsInfo                              : return "BindDescriptorSetsInfo";
-      case StructureType::ePushConstantsInfo                                   : return "PushConstantsInfo";
-      case StructureType::ePushDescriptorSetInfo                               : return "PushDescriptorSetInfo";
-      case StructureType::ePushDescriptorSetWithTemplateInfo                   : return "PushDescriptorSetWithTemplateInfo";
-      case StructureType::ePhysicalDevicePipelineProtectedAccessFeatures       : return "PhysicalDevicePipelineProtectedAccessFeatures";
-      case StructureType::ePipelineRobustnessCreateInfo                        : return "PipelineRobustnessCreateInfo";
-      case StructureType::ePhysicalDevicePipelineRobustnessFeatures            : return "PhysicalDevicePipelineRobustnessFeatures";
-      case StructureType::ePhysicalDevicePipelineRobustnessProperties          : return "PhysicalDevicePipelineRobustnessProperties";
-      case StructureType::ePhysicalDeviceLineRasterizationFeatures             : return "PhysicalDeviceLineRasterizationFeatures";
-      case StructureType::ePipelineRasterizationLineStateCreateInfo            : return "PipelineRasterizationLineStateCreateInfo";
-      case StructureType::ePhysicalDeviceLineRasterizationProperties           : return "PhysicalDeviceLineRasterizationProperties";
-      case StructureType::ePhysicalDeviceVertexAttributeDivisorProperties      : return "PhysicalDeviceVertexAttributeDivisorProperties";
-      case StructureType::ePipelineVertexInputDivisorStateCreateInfo           : return "PipelineVertexInputDivisorStateCreateInfo";
-      case StructureType::ePhysicalDeviceVertexAttributeDivisorFeatures        : return "PhysicalDeviceVertexAttributeDivisorFeatures";
-      case StructureType::eRenderingAreaInfo                                   : return "RenderingAreaInfo";
-      case StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeatures     : return "PhysicalDeviceDynamicRenderingLocalReadFeatures";
-      case StructureType::eRenderingAttachmentLocationInfo                     : return "RenderingAttachmentLocationInfo";
-      case StructureType::eRenderingInputAttachmentIndexInfo                   : return "RenderingInputAttachmentIndexInfo";
-      case StructureType::eSwapchainCreateInfoKHR                              : return "SwapchainCreateInfoKHR";
-      case StructureType::ePresentInfoKHR                                      : return "PresentInfoKHR";
-      case StructureType::eDeviceGroupPresentCapabilitiesKHR                   : return "DeviceGroupPresentCapabilitiesKHR";
-      case StructureType::eImageSwapchainCreateInfoKHR                         : return "ImageSwapchainCreateInfoKHR";
-      case StructureType::eBindImageMemorySwapchainInfoKHR                     : return "BindImageMemorySwapchainInfoKHR";
-      case StructureType::eAcquireNextImageInfoKHR                             : return "AcquireNextImageInfoKHR";
-      case StructureType::eDeviceGroupPresentInfoKHR                           : return "DeviceGroupPresentInfoKHR";
-      case StructureType::eDeviceGroupSwapchainCreateInfoKHR                   : return "DeviceGroupSwapchainCreateInfoKHR";
-      case StructureType::eDisplayModeCreateInfoKHR                            : return "DisplayModeCreateInfoKHR";
-      case StructureType::eDisplaySurfaceCreateInfoKHR                         : return "DisplaySurfaceCreateInfoKHR";
-      case StructureType::eDisplayPresentInfoKHR                               : return "DisplayPresentInfoKHR";
+      case StructureType::ePhysicalDevicePrivateDataFeatures: return "PhysicalDevicePrivateDataFeatures";
+      case StructureType::eDevicePrivateDataCreateInfo: return "DevicePrivateDataCreateInfo";
+      case StructureType::ePrivateDataSlotCreateInfo: return "PrivateDataSlotCreateInfo";
+      case StructureType::ePhysicalDevicePipelineCreationCacheControlFeatures: return "PhysicalDevicePipelineCreationCacheControlFeatures";
+      case StructureType::eMemoryBarrier2: return "MemoryBarrier2";
+      case StructureType::eBufferMemoryBarrier2: return "BufferMemoryBarrier2";
+      case StructureType::eImageMemoryBarrier2: return "ImageMemoryBarrier2";
+      case StructureType::eDependencyInfo: return "DependencyInfo";
+      case StructureType::eSubmitInfo2: return "SubmitInfo2";
+      case StructureType::eSemaphoreSubmitInfo: return "SemaphoreSubmitInfo";
+      case StructureType::eCommandBufferSubmitInfo: return "CommandBufferSubmitInfo";
+      case StructureType::ePhysicalDeviceSynchronization2Features: return "PhysicalDeviceSynchronization2Features";
+      case StructureType::ePhysicalDeviceZeroInitializeWorkgroupMemoryFeatures: return "PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures";
+      case StructureType::ePhysicalDeviceImageRobustnessFeatures: return "PhysicalDeviceImageRobustnessFeatures";
+      case StructureType::eCopyBufferInfo2: return "CopyBufferInfo2";
+      case StructureType::eCopyImageInfo2: return "CopyImageInfo2";
+      case StructureType::eCopyBufferToImageInfo2: return "CopyBufferToImageInfo2";
+      case StructureType::eCopyImageToBufferInfo2: return "CopyImageToBufferInfo2";
+      case StructureType::eBlitImageInfo2: return "BlitImageInfo2";
+      case StructureType::eResolveImageInfo2: return "ResolveImageInfo2";
+      case StructureType::eBufferCopy2: return "BufferCopy2";
+      case StructureType::eImageCopy2: return "ImageCopy2";
+      case StructureType::eImageBlit2: return "ImageBlit2";
+      case StructureType::eBufferImageCopy2: return "BufferImageCopy2";
+      case StructureType::eImageResolve2: return "ImageResolve2";
+      case StructureType::ePhysicalDeviceSubgroupSizeControlProperties: return "PhysicalDeviceSubgroupSizeControlProperties";
+      case StructureType::ePipelineShaderStageRequiredSubgroupSizeCreateInfo: return "PipelineShaderStageRequiredSubgroupSizeCreateInfo";
+      case StructureType::ePhysicalDeviceSubgroupSizeControlFeatures: return "PhysicalDeviceSubgroupSizeControlFeatures";
+      case StructureType::ePhysicalDeviceInlineUniformBlockFeatures: return "PhysicalDeviceInlineUniformBlockFeatures";
+      case StructureType::ePhysicalDeviceInlineUniformBlockProperties: return "PhysicalDeviceInlineUniformBlockProperties";
+      case StructureType::eWriteDescriptorSetInlineUniformBlock: return "WriteDescriptorSetInlineUniformBlock";
+      case StructureType::eDescriptorPoolInlineUniformBlockCreateInfo: return "DescriptorPoolInlineUniformBlockCreateInfo";
+      case StructureType::ePhysicalDeviceTextureCompressionAstcHdrFeatures: return "PhysicalDeviceTextureCompressionAstcHdrFeatures";
+      case StructureType::eRenderingInfo: return "RenderingInfo";
+      case StructureType::eRenderingAttachmentInfo: return "RenderingAttachmentInfo";
+      case StructureType::ePipelineRenderingCreateInfo: return "PipelineRenderingCreateInfo";
+      case StructureType::ePhysicalDeviceDynamicRenderingFeatures: return "PhysicalDeviceDynamicRenderingFeatures";
+      case StructureType::eCommandBufferInheritanceRenderingInfo: return "CommandBufferInheritanceRenderingInfo";
+      case StructureType::ePhysicalDeviceShaderIntegerDotProductFeatures: return "PhysicalDeviceShaderIntegerDotProductFeatures";
+      case StructureType::ePhysicalDeviceShaderIntegerDotProductProperties: return "PhysicalDeviceShaderIntegerDotProductProperties";
+      case StructureType::ePhysicalDeviceTexelBufferAlignmentProperties: return "PhysicalDeviceTexelBufferAlignmentProperties";
+      case StructureType::eFormatProperties3: return "FormatProperties3";
+      case StructureType::ePhysicalDeviceMaintenance4Features: return "PhysicalDeviceMaintenance4Features";
+      case StructureType::ePhysicalDeviceMaintenance4Properties: return "PhysicalDeviceMaintenance4Properties";
+      case StructureType::eDeviceBufferMemoryRequirements: return "DeviceBufferMemoryRequirements";
+      case StructureType::eDeviceImageMemoryRequirements: return "DeviceImageMemoryRequirements";
+      case StructureType::eSwapchainCreateInfoKHR: return "SwapchainCreateInfoKHR";
+      case StructureType::ePresentInfoKHR: return "PresentInfoKHR";
+      case StructureType::eDeviceGroupPresentCapabilitiesKHR: return "DeviceGroupPresentCapabilitiesKHR";
+      case StructureType::eImageSwapchainCreateInfoKHR: return "ImageSwapchainCreateInfoKHR";
+      case StructureType::eBindImageMemorySwapchainInfoKHR: return "BindImageMemorySwapchainInfoKHR";
+      case StructureType::eAcquireNextImageInfoKHR: return "AcquireNextImageInfoKHR";
+      case StructureType::eDeviceGroupPresentInfoKHR: return "DeviceGroupPresentInfoKHR";
+      case StructureType::eDeviceGroupSwapchainCreateInfoKHR: return "DeviceGroupSwapchainCreateInfoKHR";
+      case StructureType::eDisplayModeCreateInfoKHR: return "DisplayModeCreateInfoKHR";
+      case StructureType::eDisplaySurfaceCreateInfoKHR: return "DisplaySurfaceCreateInfoKHR";
+      case StructureType::eDisplayPresentInfoKHR: return "DisplayPresentInfoKHR";
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
       case StructureType::eXlibSurfaceCreateInfoKHR: return "XlibSurfaceCreateInfoKHR";
 #endif /*VK_USE_PLATFORM_XLIB_KHR*/
@@ -4733,2308 +3844,1715 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       case StructureType::eWin32SurfaceCreateInfoKHR: return "Win32SurfaceCreateInfoKHR";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      case StructureType::eDebugReportCallbackCreateInfoEXT               : return "DebugReportCallbackCreateInfoEXT";
+      case StructureType::eDebugReportCallbackCreateInfoEXT: return "DebugReportCallbackCreateInfoEXT";
       case StructureType::ePipelineRasterizationStateRasterizationOrderAMD: return "PipelineRasterizationStateRasterizationOrderAMD";
-      case StructureType::eDebugMarkerObjectNameInfoEXT                   : return "DebugMarkerObjectNameInfoEXT";
-      case StructureType::eDebugMarkerObjectTagInfoEXT                    : return "DebugMarkerObjectTagInfoEXT";
-      case StructureType::eDebugMarkerMarkerInfoEXT                       : return "DebugMarkerMarkerInfoEXT";
-      case StructureType::eVideoProfileInfoKHR                            : return "VideoProfileInfoKHR";
-      case StructureType::eVideoCapabilitiesKHR                           : return "VideoCapabilitiesKHR";
-      case StructureType::eVideoPictureResourceInfoKHR                    : return "VideoPictureResourceInfoKHR";
-      case StructureType::eVideoSessionMemoryRequirementsKHR              : return "VideoSessionMemoryRequirementsKHR";
-      case StructureType::eBindVideoSessionMemoryInfoKHR                  : return "BindVideoSessionMemoryInfoKHR";
-      case StructureType::eVideoSessionCreateInfoKHR                      : return "VideoSessionCreateInfoKHR";
-      case StructureType::eVideoSessionParametersCreateInfoKHR            : return "VideoSessionParametersCreateInfoKHR";
-      case StructureType::eVideoSessionParametersUpdateInfoKHR            : return "VideoSessionParametersUpdateInfoKHR";
-      case StructureType::eVideoBeginCodingInfoKHR                        : return "VideoBeginCodingInfoKHR";
-      case StructureType::eVideoEndCodingInfoKHR                          : return "VideoEndCodingInfoKHR";
-      case StructureType::eVideoCodingControlInfoKHR                      : return "VideoCodingControlInfoKHR";
-      case StructureType::eVideoReferenceSlotInfoKHR                      : return "VideoReferenceSlotInfoKHR";
-      case StructureType::eQueueFamilyVideoPropertiesKHR                  : return "QueueFamilyVideoPropertiesKHR";
-      case StructureType::eVideoProfileListInfoKHR                        : return "VideoProfileListInfoKHR";
-      case StructureType::ePhysicalDeviceVideoFormatInfoKHR               : return "PhysicalDeviceVideoFormatInfoKHR";
-      case StructureType::eVideoFormatPropertiesKHR                       : return "VideoFormatPropertiesKHR";
-      case StructureType::eQueueFamilyQueryResultStatusPropertiesKHR      : return "QueueFamilyQueryResultStatusPropertiesKHR";
-      case StructureType::eVideoDecodeInfoKHR                             : return "VideoDecodeInfoKHR";
-      case StructureType::eVideoDecodeCapabilitiesKHR                     : return "VideoDecodeCapabilitiesKHR";
-      case StructureType::eVideoDecodeUsageInfoKHR                        : return "VideoDecodeUsageInfoKHR";
-      case StructureType::eDedicatedAllocationImageCreateInfoNV           : return "DedicatedAllocationImageCreateInfoNV";
-      case StructureType::eDedicatedAllocationBufferCreateInfoNV          : return "DedicatedAllocationBufferCreateInfoNV";
-      case StructureType::eDedicatedAllocationMemoryAllocateInfoNV        : return "DedicatedAllocationMemoryAllocateInfoNV";
-      case StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT     : return "PhysicalDeviceTransformFeedbackFeaturesEXT";
-      case StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT   : return "PhysicalDeviceTransformFeedbackPropertiesEXT";
-      case StructureType::ePipelineRasterizationStateStreamCreateInfoEXT  : return "PipelineRasterizationStateStreamCreateInfoEXT";
-      case StructureType::eCuModuleCreateInfoNVX                          : return "CuModuleCreateInfoNVX";
-      case StructureType::eCuFunctionCreateInfoNVX                        : return "CuFunctionCreateInfoNVX";
-      case StructureType::eCuLaunchInfoNVX                                : return "CuLaunchInfoNVX";
-      case StructureType::eCuModuleTexturingModeCreateInfoNVX             : return "CuModuleTexturingModeCreateInfoNVX";
-      case StructureType::eImageViewHandleInfoNVX                         : return "ImageViewHandleInfoNVX";
-      case StructureType::eImageViewAddressPropertiesNVX                  : return "ImageViewAddressPropertiesNVX";
-      case StructureType::eVideoEncodeH264CapabilitiesKHR                 : return "VideoEncodeH264CapabilitiesKHR";
-      case StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR  : return "VideoEncodeH264SessionParametersCreateInfoKHR";
-      case StructureType::eVideoEncodeH264SessionParametersAddInfoKHR     : return "VideoEncodeH264SessionParametersAddInfoKHR";
-      case StructureType::eVideoEncodeH264PictureInfoKHR                  : return "VideoEncodeH264PictureInfoKHR";
-      case StructureType::eVideoEncodeH264DpbSlotInfoKHR                  : return "VideoEncodeH264DpbSlotInfoKHR";
-      case StructureType::eVideoEncodeH264NaluSliceInfoKHR                : return "VideoEncodeH264NaluSliceInfoKHR";
-      case StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR        : return "VideoEncodeH264GopRemainingFrameInfoKHR";
-      case StructureType::eVideoEncodeH264ProfileInfoKHR                  : return "VideoEncodeH264ProfileInfoKHR";
-      case StructureType::eVideoEncodeH264RateControlInfoKHR              : return "VideoEncodeH264RateControlInfoKHR";
-      case StructureType::eVideoEncodeH264RateControlLayerInfoKHR         : return "VideoEncodeH264RateControlLayerInfoKHR";
-      case StructureType::eVideoEncodeH264SessionCreateInfoKHR            : return "VideoEncodeH264SessionCreateInfoKHR";
-      case StructureType::eVideoEncodeH264QualityLevelPropertiesKHR       : return "VideoEncodeH264QualityLevelPropertiesKHR";
-      case StructureType::eVideoEncodeH264SessionParametersGetInfoKHR     : return "VideoEncodeH264SessionParametersGetInfoKHR";
+      case StructureType::eDebugMarkerObjectNameInfoEXT: return "DebugMarkerObjectNameInfoEXT";
+      case StructureType::eDebugMarkerObjectTagInfoEXT: return "DebugMarkerObjectTagInfoEXT";
+      case StructureType::eDebugMarkerMarkerInfoEXT: return "DebugMarkerMarkerInfoEXT";
+      case StructureType::eVideoProfileInfoKHR: return "VideoProfileInfoKHR";
+      case StructureType::eVideoCapabilitiesKHR: return "VideoCapabilitiesKHR";
+      case StructureType::eVideoPictureResourceInfoKHR: return "VideoPictureResourceInfoKHR";
+      case StructureType::eVideoSessionMemoryRequirementsKHR: return "VideoSessionMemoryRequirementsKHR";
+      case StructureType::eBindVideoSessionMemoryInfoKHR: return "BindVideoSessionMemoryInfoKHR";
+      case StructureType::eVideoSessionCreateInfoKHR: return "VideoSessionCreateInfoKHR";
+      case StructureType::eVideoSessionParametersCreateInfoKHR: return "VideoSessionParametersCreateInfoKHR";
+      case StructureType::eVideoSessionParametersUpdateInfoKHR: return "VideoSessionParametersUpdateInfoKHR";
+      case StructureType::eVideoBeginCodingInfoKHR: return "VideoBeginCodingInfoKHR";
+      case StructureType::eVideoEndCodingInfoKHR: return "VideoEndCodingInfoKHR";
+      case StructureType::eVideoCodingControlInfoKHR: return "VideoCodingControlInfoKHR";
+      case StructureType::eVideoReferenceSlotInfoKHR: return "VideoReferenceSlotInfoKHR";
+      case StructureType::eQueueFamilyVideoPropertiesKHR: return "QueueFamilyVideoPropertiesKHR";
+      case StructureType::eVideoProfileListInfoKHR: return "VideoProfileListInfoKHR";
+      case StructureType::ePhysicalDeviceVideoFormatInfoKHR: return "PhysicalDeviceVideoFormatInfoKHR";
+      case StructureType::eVideoFormatPropertiesKHR: return "VideoFormatPropertiesKHR";
+      case StructureType::eQueueFamilyQueryResultStatusPropertiesKHR: return "QueueFamilyQueryResultStatusPropertiesKHR";
+      case StructureType::eVideoDecodeInfoKHR: return "VideoDecodeInfoKHR";
+      case StructureType::eVideoDecodeCapabilitiesKHR: return "VideoDecodeCapabilitiesKHR";
+      case StructureType::eVideoDecodeUsageInfoKHR: return "VideoDecodeUsageInfoKHR";
+      case StructureType::eDedicatedAllocationImageCreateInfoNV: return "DedicatedAllocationImageCreateInfoNV";
+      case StructureType::eDedicatedAllocationBufferCreateInfoNV: return "DedicatedAllocationBufferCreateInfoNV";
+      case StructureType::eDedicatedAllocationMemoryAllocateInfoNV: return "DedicatedAllocationMemoryAllocateInfoNV";
+      case StructureType::ePhysicalDeviceTransformFeedbackFeaturesEXT: return "PhysicalDeviceTransformFeedbackFeaturesEXT";
+      case StructureType::ePhysicalDeviceTransformFeedbackPropertiesEXT: return "PhysicalDeviceTransformFeedbackPropertiesEXT";
+      case StructureType::ePipelineRasterizationStateStreamCreateInfoEXT: return "PipelineRasterizationStateStreamCreateInfoEXT";
+      case StructureType::eCuModuleCreateInfoNVX: return "CuModuleCreateInfoNVX";
+      case StructureType::eCuFunctionCreateInfoNVX: return "CuFunctionCreateInfoNVX";
+      case StructureType::eCuLaunchInfoNVX: return "CuLaunchInfoNVX";
+      case StructureType::eImageViewHandleInfoNVX: return "ImageViewHandleInfoNVX";
+      case StructureType::eImageViewAddressPropertiesNVX: return "ImageViewAddressPropertiesNVX";
+      case StructureType::eVideoEncodeH264CapabilitiesKHR: return "VideoEncodeH264CapabilitiesKHR";
+      case StructureType::eVideoEncodeH264SessionParametersCreateInfoKHR: return "VideoEncodeH264SessionParametersCreateInfoKHR";
+      case StructureType::eVideoEncodeH264SessionParametersAddInfoKHR: return "VideoEncodeH264SessionParametersAddInfoKHR";
+      case StructureType::eVideoEncodeH264PictureInfoKHR: return "VideoEncodeH264PictureInfoKHR";
+      case StructureType::eVideoEncodeH264DpbSlotInfoKHR: return "VideoEncodeH264DpbSlotInfoKHR";
+      case StructureType::eVideoEncodeH264NaluSliceInfoKHR: return "VideoEncodeH264NaluSliceInfoKHR";
+      case StructureType::eVideoEncodeH264GopRemainingFrameInfoKHR: return "VideoEncodeH264GopRemainingFrameInfoKHR";
+      case StructureType::eVideoEncodeH264ProfileInfoKHR: return "VideoEncodeH264ProfileInfoKHR";
+      case StructureType::eVideoEncodeH264RateControlInfoKHR: return "VideoEncodeH264RateControlInfoKHR";
+      case StructureType::eVideoEncodeH264RateControlLayerInfoKHR: return "VideoEncodeH264RateControlLayerInfoKHR";
+      case StructureType::eVideoEncodeH264SessionCreateInfoKHR: return "VideoEncodeH264SessionCreateInfoKHR";
+      case StructureType::eVideoEncodeH264QualityLevelPropertiesKHR: return "VideoEncodeH264QualityLevelPropertiesKHR";
+      case StructureType::eVideoEncodeH264SessionParametersGetInfoKHR: return "VideoEncodeH264SessionParametersGetInfoKHR";
       case StructureType::eVideoEncodeH264SessionParametersFeedbackInfoKHR: return "VideoEncodeH264SessionParametersFeedbackInfoKHR";
-      case StructureType::eVideoEncodeH265CapabilitiesKHR                 : return "VideoEncodeH265CapabilitiesKHR";
-      case StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR  : return "VideoEncodeH265SessionParametersCreateInfoKHR";
-      case StructureType::eVideoEncodeH265SessionParametersAddInfoKHR     : return "VideoEncodeH265SessionParametersAddInfoKHR";
-      case StructureType::eVideoEncodeH265PictureInfoKHR                  : return "VideoEncodeH265PictureInfoKHR";
-      case StructureType::eVideoEncodeH265DpbSlotInfoKHR                  : return "VideoEncodeH265DpbSlotInfoKHR";
-      case StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR         : return "VideoEncodeH265NaluSliceSegmentInfoKHR";
-      case StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR        : return "VideoEncodeH265GopRemainingFrameInfoKHR";
-      case StructureType::eVideoEncodeH265ProfileInfoKHR                  : return "VideoEncodeH265ProfileInfoKHR";
-      case StructureType::eVideoEncodeH265RateControlInfoKHR              : return "VideoEncodeH265RateControlInfoKHR";
-      case StructureType::eVideoEncodeH265RateControlLayerInfoKHR         : return "VideoEncodeH265RateControlLayerInfoKHR";
-      case StructureType::eVideoEncodeH265SessionCreateInfoKHR            : return "VideoEncodeH265SessionCreateInfoKHR";
-      case StructureType::eVideoEncodeH265QualityLevelPropertiesKHR       : return "VideoEncodeH265QualityLevelPropertiesKHR";
-      case StructureType::eVideoEncodeH265SessionParametersGetInfoKHR     : return "VideoEncodeH265SessionParametersGetInfoKHR";
+      case StructureType::eVideoEncodeH265CapabilitiesKHR: return "VideoEncodeH265CapabilitiesKHR";
+      case StructureType::eVideoEncodeH265SessionParametersCreateInfoKHR: return "VideoEncodeH265SessionParametersCreateInfoKHR";
+      case StructureType::eVideoEncodeH265SessionParametersAddInfoKHR: return "VideoEncodeH265SessionParametersAddInfoKHR";
+      case StructureType::eVideoEncodeH265PictureInfoKHR: return "VideoEncodeH265PictureInfoKHR";
+      case StructureType::eVideoEncodeH265DpbSlotInfoKHR: return "VideoEncodeH265DpbSlotInfoKHR";
+      case StructureType::eVideoEncodeH265NaluSliceSegmentInfoKHR: return "VideoEncodeH265NaluSliceSegmentInfoKHR";
+      case StructureType::eVideoEncodeH265GopRemainingFrameInfoKHR: return "VideoEncodeH265GopRemainingFrameInfoKHR";
+      case StructureType::eVideoEncodeH265ProfileInfoKHR: return "VideoEncodeH265ProfileInfoKHR";
+      case StructureType::eVideoEncodeH265RateControlInfoKHR: return "VideoEncodeH265RateControlInfoKHR";
+      case StructureType::eVideoEncodeH265RateControlLayerInfoKHR: return "VideoEncodeH265RateControlLayerInfoKHR";
+      case StructureType::eVideoEncodeH265SessionCreateInfoKHR: return "VideoEncodeH265SessionCreateInfoKHR";
+      case StructureType::eVideoEncodeH265QualityLevelPropertiesKHR: return "VideoEncodeH265QualityLevelPropertiesKHR";
+      case StructureType::eVideoEncodeH265SessionParametersGetInfoKHR: return "VideoEncodeH265SessionParametersGetInfoKHR";
       case StructureType::eVideoEncodeH265SessionParametersFeedbackInfoKHR: return "VideoEncodeH265SessionParametersFeedbackInfoKHR";
-      case StructureType::eVideoDecodeH264CapabilitiesKHR                 : return "VideoDecodeH264CapabilitiesKHR";
-      case StructureType::eVideoDecodeH264PictureInfoKHR                  : return "VideoDecodeH264PictureInfoKHR";
-      case StructureType::eVideoDecodeH264ProfileInfoKHR                  : return "VideoDecodeH264ProfileInfoKHR";
-      case StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR  : return "VideoDecodeH264SessionParametersCreateInfoKHR";
-      case StructureType::eVideoDecodeH264SessionParametersAddInfoKHR     : return "VideoDecodeH264SessionParametersAddInfoKHR";
-      case StructureType::eVideoDecodeH264DpbSlotInfoKHR                  : return "VideoDecodeH264DpbSlotInfoKHR";
-      case StructureType::eTextureLodGatherFormatPropertiesAMD            : return "TextureLodGatherFormatPropertiesAMD";
+      case StructureType::eVideoDecodeH264CapabilitiesKHR: return "VideoDecodeH264CapabilitiesKHR";
+      case StructureType::eVideoDecodeH264PictureInfoKHR: return "VideoDecodeH264PictureInfoKHR";
+      case StructureType::eVideoDecodeH264ProfileInfoKHR: return "VideoDecodeH264ProfileInfoKHR";
+      case StructureType::eVideoDecodeH264SessionParametersCreateInfoKHR: return "VideoDecodeH264SessionParametersCreateInfoKHR";
+      case StructureType::eVideoDecodeH264SessionParametersAddInfoKHR: return "VideoDecodeH264SessionParametersAddInfoKHR";
+      case StructureType::eVideoDecodeH264DpbSlotInfoKHR: return "VideoDecodeH264DpbSlotInfoKHR";
+      case StructureType::eTextureLodGatherFormatPropertiesAMD: return "TextureLodGatherFormatPropertiesAMD";
+      case StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR: return "RenderingFragmentShadingRateAttachmentInfoKHR";
+      case StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT: return "RenderingFragmentDensityMapAttachmentInfoEXT";
+      case StructureType::eAttachmentSampleCountInfoAMD: return "AttachmentSampleCountInfoAMD";
+      case StructureType::eMultiviewPerViewAttributesInfoNVX: return "MultiviewPerViewAttributesInfoNVX";
 #if defined( VK_USE_PLATFORM_GGP )
       case StructureType::eStreamDescriptorSurfaceCreateInfoGGP: return "StreamDescriptorSurfaceCreateInfoGGP";
 #endif /*VK_USE_PLATFORM_GGP*/
       case StructureType::ePhysicalDeviceCornerSampledImageFeaturesNV: return "PhysicalDeviceCornerSampledImageFeaturesNV";
-      case StructureType::eExternalMemoryImageCreateInfoNV           : return "ExternalMemoryImageCreateInfoNV";
-      case StructureType::eExportMemoryAllocateInfoNV                : return "ExportMemoryAllocateInfoNV";
+      case StructureType::eExternalMemoryImageCreateInfoNV: return "ExternalMemoryImageCreateInfoNV";
+      case StructureType::eExportMemoryAllocateInfoNV: return "ExportMemoryAllocateInfoNV";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      case StructureType::eImportMemoryWin32HandleInfoNV      : return "ImportMemoryWin32HandleInfoNV";
-      case StructureType::eExportMemoryWin32HandleInfoNV      : return "ExportMemoryWin32HandleInfoNV";
+      case StructureType::eImportMemoryWin32HandleInfoNV: return "ImportMemoryWin32HandleInfoNV";
+      case StructureType::eExportMemoryWin32HandleInfoNV: return "ExportMemoryWin32HandleInfoNV";
       case StructureType::eWin32KeyedMutexAcquireReleaseInfoNV: return "Win32KeyedMutexAcquireReleaseInfoNV";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
       case StructureType::eValidationFlagsEXT: return "ValidationFlagsEXT";
 #if defined( VK_USE_PLATFORM_VI_NN )
       case StructureType::eViSurfaceCreateInfoNN: return "ViSurfaceCreateInfoNN";
 #endif /*VK_USE_PLATFORM_VI_NN*/
-      case StructureType::eImageViewAstcDecodeModeEXT         : return "ImageViewAstcDecodeModeEXT";
+      case StructureType::eImageViewAstcDecodeModeEXT: return "ImageViewAstcDecodeModeEXT";
       case StructureType::ePhysicalDeviceAstcDecodeFeaturesEXT: return "PhysicalDeviceAstcDecodeFeaturesEXT";
+      case StructureType::ePipelineRobustnessCreateInfoEXT: return "PipelineRobustnessCreateInfoEXT";
+      case StructureType::ePhysicalDevicePipelineRobustnessFeaturesEXT: return "PhysicalDevicePipelineRobustnessFeaturesEXT";
+      case StructureType::ePhysicalDevicePipelineRobustnessPropertiesEXT: return "PhysicalDevicePipelineRobustnessPropertiesEXT";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       case StructureType::eImportMemoryWin32HandleInfoKHR: return "ImportMemoryWin32HandleInfoKHR";
       case StructureType::eExportMemoryWin32HandleInfoKHR: return "ExportMemoryWin32HandleInfoKHR";
       case StructureType::eMemoryWin32HandlePropertiesKHR: return "MemoryWin32HandlePropertiesKHR";
-      case StructureType::eMemoryGetWin32HandleInfoKHR   : return "MemoryGetWin32HandleInfoKHR";
+      case StructureType::eMemoryGetWin32HandleInfoKHR: return "MemoryGetWin32HandleInfoKHR";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
       case StructureType::eImportMemoryFdInfoKHR: return "ImportMemoryFdInfoKHR";
       case StructureType::eMemoryFdPropertiesKHR: return "MemoryFdPropertiesKHR";
-      case StructureType::eMemoryGetFdInfoKHR   : return "MemoryGetFdInfoKHR";
+      case StructureType::eMemoryGetFdInfoKHR: return "MemoryGetFdInfoKHR";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       case StructureType::eWin32KeyedMutexAcquireReleaseInfoKHR: return "Win32KeyedMutexAcquireReleaseInfoKHR";
-      case StructureType::eImportSemaphoreWin32HandleInfoKHR   : return "ImportSemaphoreWin32HandleInfoKHR";
-      case StructureType::eExportSemaphoreWin32HandleInfoKHR   : return "ExportSemaphoreWin32HandleInfoKHR";
-      case StructureType::eD3D12FenceSubmitInfoKHR             : return "D3D12FenceSubmitInfoKHR";
-      case StructureType::eSemaphoreGetWin32HandleInfoKHR      : return "SemaphoreGetWin32HandleInfoKHR";
+      case StructureType::eImportSemaphoreWin32HandleInfoKHR: return "ImportSemaphoreWin32HandleInfoKHR";
+      case StructureType::eExportSemaphoreWin32HandleInfoKHR: return "ExportSemaphoreWin32HandleInfoKHR";
+      case StructureType::eD3D12FenceSubmitInfoKHR: return "D3D12FenceSubmitInfoKHR";
+      case StructureType::eSemaphoreGetWin32HandleInfoKHR: return "SemaphoreGetWin32HandleInfoKHR";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      case StructureType::eImportSemaphoreFdInfoKHR                             : return "ImportSemaphoreFdInfoKHR";
-      case StructureType::eSemaphoreGetFdInfoKHR                                : return "SemaphoreGetFdInfoKHR";
-      case StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT  : return "CommandBufferInheritanceConditionalRenderingInfoEXT";
-      case StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT        : return "PhysicalDeviceConditionalRenderingFeaturesEXT";
-      case StructureType::eConditionalRenderingBeginInfoEXT                     : return "ConditionalRenderingBeginInfoEXT";
-      case StructureType::ePresentRegionsKHR                                    : return "PresentRegionsKHR";
-      case StructureType::ePipelineViewportWScalingStateCreateInfoNV            : return "PipelineViewportWScalingStateCreateInfoNV";
-      case StructureType::eSurfaceCapabilities2EXT                              : return "SurfaceCapabilities2EXT";
-      case StructureType::eDisplayPowerInfoEXT                                  : return "DisplayPowerInfoEXT";
-      case StructureType::eDeviceEventInfoEXT                                   : return "DeviceEventInfoEXT";
-      case StructureType::eDisplayEventInfoEXT                                  : return "DisplayEventInfoEXT";
-      case StructureType::eSwapchainCounterCreateInfoEXT                        : return "SwapchainCounterCreateInfoEXT";
-      case StructureType::ePresentTimesInfoGOOGLE                               : return "PresentTimesInfoGOOGLE";
+      case StructureType::eImportSemaphoreFdInfoKHR: return "ImportSemaphoreFdInfoKHR";
+      case StructureType::eSemaphoreGetFdInfoKHR: return "SemaphoreGetFdInfoKHR";
+      case StructureType::ePhysicalDevicePushDescriptorPropertiesKHR: return "PhysicalDevicePushDescriptorPropertiesKHR";
+      case StructureType::eCommandBufferInheritanceConditionalRenderingInfoEXT: return "CommandBufferInheritanceConditionalRenderingInfoEXT";
+      case StructureType::ePhysicalDeviceConditionalRenderingFeaturesEXT: return "PhysicalDeviceConditionalRenderingFeaturesEXT";
+      case StructureType::eConditionalRenderingBeginInfoEXT: return "ConditionalRenderingBeginInfoEXT";
+      case StructureType::ePresentRegionsKHR: return "PresentRegionsKHR";
+      case StructureType::ePipelineViewportWScalingStateCreateInfoNV: return "PipelineViewportWScalingStateCreateInfoNV";
+      case StructureType::eSurfaceCapabilities2EXT: return "SurfaceCapabilities2EXT";
+      case StructureType::eDisplayPowerInfoEXT: return "DisplayPowerInfoEXT";
+      case StructureType::eDeviceEventInfoEXT: return "DeviceEventInfoEXT";
+      case StructureType::eDisplayEventInfoEXT: return "DisplayEventInfoEXT";
+      case StructureType::eSwapchainCounterCreateInfoEXT: return "SwapchainCounterCreateInfoEXT";
+      case StructureType::ePresentTimesInfoGOOGLE: return "PresentTimesInfoGOOGLE";
       case StructureType::ePhysicalDeviceMultiviewPerViewAttributesPropertiesNVX: return "PhysicalDeviceMultiviewPerViewAttributesPropertiesNVX";
-      case StructureType::eMultiviewPerViewAttributesInfoNVX                    : return "MultiviewPerViewAttributesInfoNVX";
-      case StructureType::ePipelineViewportSwizzleStateCreateInfoNV             : return "PipelineViewportSwizzleStateCreateInfoNV";
-      case StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT          : return "PhysicalDeviceDiscardRectanglePropertiesEXT";
-      case StructureType::ePipelineDiscardRectangleStateCreateInfoEXT           : return "PipelineDiscardRectangleStateCreateInfoEXT";
-      case StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT : return "PhysicalDeviceConservativeRasterizationPropertiesEXT";
-      case StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT  : return "PipelineRasterizationConservativeStateCreateInfoEXT";
-      case StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT             : return "PhysicalDeviceDepthClipEnableFeaturesEXT";
-      case StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT     : return "PipelineRasterizationDepthClipStateCreateInfoEXT";
-      case StructureType::eHdrMetadataEXT                                       : return "HdrMetadataEXT";
-      case StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG    : return "PhysicalDeviceRelaxedLineRasterizationFeaturesIMG";
-      case StructureType::eSharedPresentSurfaceCapabilitiesKHR                  : return "SharedPresentSurfaceCapabilitiesKHR";
+      case StructureType::ePipelineViewportSwizzleStateCreateInfoNV: return "PipelineViewportSwizzleStateCreateInfoNV";
+      case StructureType::ePhysicalDeviceDiscardRectanglePropertiesEXT: return "PhysicalDeviceDiscardRectanglePropertiesEXT";
+      case StructureType::ePipelineDiscardRectangleStateCreateInfoEXT: return "PipelineDiscardRectangleStateCreateInfoEXT";
+      case StructureType::ePhysicalDeviceConservativeRasterizationPropertiesEXT: return "PhysicalDeviceConservativeRasterizationPropertiesEXT";
+      case StructureType::ePipelineRasterizationConservativeStateCreateInfoEXT: return "PipelineRasterizationConservativeStateCreateInfoEXT";
+      case StructureType::ePhysicalDeviceDepthClipEnableFeaturesEXT: return "PhysicalDeviceDepthClipEnableFeaturesEXT";
+      case StructureType::ePipelineRasterizationDepthClipStateCreateInfoEXT: return "PipelineRasterizationDepthClipStateCreateInfoEXT";
+      case StructureType::eHdrMetadataEXT: return "HdrMetadataEXT";
+      case StructureType::ePhysicalDeviceRelaxedLineRasterizationFeaturesIMG: return "PhysicalDeviceRelaxedLineRasterizationFeaturesIMG";
+      case StructureType::eSharedPresentSurfaceCapabilitiesKHR: return "SharedPresentSurfaceCapabilitiesKHR";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
       case StructureType::eImportFenceWin32HandleInfoKHR: return "ImportFenceWin32HandleInfoKHR";
       case StructureType::eExportFenceWin32HandleInfoKHR: return "ExportFenceWin32HandleInfoKHR";
-      case StructureType::eFenceGetWin32HandleInfoKHR   : return "FenceGetWin32HandleInfoKHR";
+      case StructureType::eFenceGetWin32HandleInfoKHR: return "FenceGetWin32HandleInfoKHR";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      case StructureType::eImportFenceFdInfoKHR                       : return "ImportFenceFdInfoKHR";
-      case StructureType::eFenceGetFdInfoKHR                          : return "FenceGetFdInfoKHR";
-      case StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR  : return "PhysicalDevicePerformanceQueryFeaturesKHR";
+      case StructureType::eImportFenceFdInfoKHR: return "ImportFenceFdInfoKHR";
+      case StructureType::eFenceGetFdInfoKHR: return "FenceGetFdInfoKHR";
+      case StructureType::ePhysicalDevicePerformanceQueryFeaturesKHR: return "PhysicalDevicePerformanceQueryFeaturesKHR";
       case StructureType::ePhysicalDevicePerformanceQueryPropertiesKHR: return "PhysicalDevicePerformanceQueryPropertiesKHR";
-      case StructureType::eQueryPoolPerformanceCreateInfoKHR          : return "QueryPoolPerformanceCreateInfoKHR";
-      case StructureType::ePerformanceQuerySubmitInfoKHR              : return "PerformanceQuerySubmitInfoKHR";
-      case StructureType::eAcquireProfilingLockInfoKHR                : return "AcquireProfilingLockInfoKHR";
-      case StructureType::ePerformanceCounterKHR                      : return "PerformanceCounterKHR";
-      case StructureType::ePerformanceCounterDescriptionKHR           : return "PerformanceCounterDescriptionKHR";
-      case StructureType::ePhysicalDeviceSurfaceInfo2KHR              : return "PhysicalDeviceSurfaceInfo2KHR";
-      case StructureType::eSurfaceCapabilities2KHR                    : return "SurfaceCapabilities2KHR";
-      case StructureType::eSurfaceFormat2KHR                          : return "SurfaceFormat2KHR";
-      case StructureType::eDisplayProperties2KHR                      : return "DisplayProperties2KHR";
-      case StructureType::eDisplayPlaneProperties2KHR                 : return "DisplayPlaneProperties2KHR";
-      case StructureType::eDisplayModeProperties2KHR                  : return "DisplayModeProperties2KHR";
-      case StructureType::eDisplayPlaneInfo2KHR                       : return "DisplayPlaneInfo2KHR";
-      case StructureType::eDisplayPlaneCapabilities2KHR               : return "DisplayPlaneCapabilities2KHR";
+      case StructureType::eQueryPoolPerformanceCreateInfoKHR: return "QueryPoolPerformanceCreateInfoKHR";
+      case StructureType::ePerformanceQuerySubmitInfoKHR: return "PerformanceQuerySubmitInfoKHR";
+      case StructureType::eAcquireProfilingLockInfoKHR: return "AcquireProfilingLockInfoKHR";
+      case StructureType::ePerformanceCounterKHR: return "PerformanceCounterKHR";
+      case StructureType::ePerformanceCounterDescriptionKHR: return "PerformanceCounterDescriptionKHR";
+      case StructureType::ePhysicalDeviceSurfaceInfo2KHR: return "PhysicalDeviceSurfaceInfo2KHR";
+      case StructureType::eSurfaceCapabilities2KHR: return "SurfaceCapabilities2KHR";
+      case StructureType::eSurfaceFormat2KHR: return "SurfaceFormat2KHR";
+      case StructureType::eDisplayProperties2KHR: return "DisplayProperties2KHR";
+      case StructureType::eDisplayPlaneProperties2KHR: return "DisplayPlaneProperties2KHR";
+      case StructureType::eDisplayModeProperties2KHR: return "DisplayModeProperties2KHR";
+      case StructureType::eDisplayPlaneInfo2KHR: return "DisplayPlaneInfo2KHR";
+      case StructureType::eDisplayPlaneCapabilities2KHR: return "DisplayPlaneCapabilities2KHR";
 #if defined( VK_USE_PLATFORM_IOS_MVK )
       case StructureType::eIosSurfaceCreateInfoMVK: return "IosSurfaceCreateInfoMVK";
 #endif /*VK_USE_PLATFORM_IOS_MVK*/
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
       case StructureType::eMacosSurfaceCreateInfoMVK: return "MacosSurfaceCreateInfoMVK";
 #endif /*VK_USE_PLATFORM_MACOS_MVK*/
-      case StructureType::eDebugUtilsObjectNameInfoEXT       : return "DebugUtilsObjectNameInfoEXT";
-      case StructureType::eDebugUtilsObjectTagInfoEXT        : return "DebugUtilsObjectTagInfoEXT";
-      case StructureType::eDebugUtilsLabelEXT                : return "DebugUtilsLabelEXT";
+      case StructureType::eDebugUtilsObjectNameInfoEXT: return "DebugUtilsObjectNameInfoEXT";
+      case StructureType::eDebugUtilsObjectTagInfoEXT: return "DebugUtilsObjectTagInfoEXT";
+      case StructureType::eDebugUtilsLabelEXT: return "DebugUtilsLabelEXT";
       case StructureType::eDebugUtilsMessengerCallbackDataEXT: return "DebugUtilsMessengerCallbackDataEXT";
-      case StructureType::eDebugUtilsMessengerCreateInfoEXT  : return "DebugUtilsMessengerCreateInfoEXT";
+      case StructureType::eDebugUtilsMessengerCreateInfoEXT: return "DebugUtilsMessengerCreateInfoEXT";
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      case StructureType::eAndroidHardwareBufferUsageANDROID            : return "AndroidHardwareBufferUsageANDROID";
-      case StructureType::eAndroidHardwareBufferPropertiesANDROID       : return "AndroidHardwareBufferPropertiesANDROID";
-      case StructureType::eAndroidHardwareBufferFormatPropertiesANDROID : return "AndroidHardwareBufferFormatPropertiesANDROID";
-      case StructureType::eImportAndroidHardwareBufferInfoANDROID       : return "ImportAndroidHardwareBufferInfoANDROID";
-      case StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID    : return "MemoryGetAndroidHardwareBufferInfoANDROID";
-      case StructureType::eExternalFormatANDROID                        : return "ExternalFormatANDROID";
+      case StructureType::eAndroidHardwareBufferUsageANDROID: return "AndroidHardwareBufferUsageANDROID";
+      case StructureType::eAndroidHardwareBufferPropertiesANDROID: return "AndroidHardwareBufferPropertiesANDROID";
+      case StructureType::eAndroidHardwareBufferFormatPropertiesANDROID: return "AndroidHardwareBufferFormatPropertiesANDROID";
+      case StructureType::eImportAndroidHardwareBufferInfoANDROID: return "ImportAndroidHardwareBufferInfoANDROID";
+      case StructureType::eMemoryGetAndroidHardwareBufferInfoANDROID: return "MemoryGetAndroidHardwareBufferInfoANDROID";
+      case StructureType::eExternalFormatANDROID: return "ExternalFormatANDROID";
       case StructureType::eAndroidHardwareBufferFormatProperties2ANDROID: return "AndroidHardwareBufferFormatProperties2ANDROID";
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX  : return "PhysicalDeviceShaderEnqueueFeaturesAMDX";
+      case StructureType::ePhysicalDeviceShaderEnqueueFeaturesAMDX: return "PhysicalDeviceShaderEnqueueFeaturesAMDX";
       case StructureType::ePhysicalDeviceShaderEnqueuePropertiesAMDX: return "PhysicalDeviceShaderEnqueuePropertiesAMDX";
-      case StructureType::eExecutionGraphPipelineScratchSizeAMDX    : return "ExecutionGraphPipelineScratchSizeAMDX";
-      case StructureType::eExecutionGraphPipelineCreateInfoAMDX     : return "ExecutionGraphPipelineCreateInfoAMDX";
-      case StructureType::ePipelineShaderStageNodeCreateInfoAMDX    : return "PipelineShaderStageNodeCreateInfoAMDX";
+      case StructureType::eExecutionGraphPipelineScratchSizeAMDX: return "ExecutionGraphPipelineScratchSizeAMDX";
+      case StructureType::eExecutionGraphPipelineCreateInfoAMDX: return "ExecutionGraphPipelineCreateInfoAMDX";
+      case StructureType::ePipelineShaderStageNodeCreateInfoAMDX: return "PipelineShaderStageNodeCreateInfoAMDX";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::eAttachmentSampleCountInfoAMD                     : return "AttachmentSampleCountInfoAMD";
-      case StructureType::ePhysicalDeviceShaderBfloat16FeaturesKHR          : return "PhysicalDeviceShaderBfloat16FeaturesKHR";
-      case StructureType::eSampleLocationsInfoEXT                           : return "SampleLocationsInfoEXT";
-      case StructureType::eRenderPassSampleLocationsBeginInfoEXT            : return "RenderPassSampleLocationsBeginInfoEXT";
-      case StructureType::ePipelineSampleLocationsStateCreateInfoEXT        : return "PipelineSampleLocationsStateCreateInfoEXT";
-      case StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT       : return "PhysicalDeviceSampleLocationsPropertiesEXT";
-      case StructureType::eMultisamplePropertiesEXT                         : return "MultisamplePropertiesEXT";
-      case StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT  : return "PhysicalDeviceBlendOperationAdvancedFeaturesEXT";
+      case StructureType::eSampleLocationsInfoEXT: return "SampleLocationsInfoEXT";
+      case StructureType::eRenderPassSampleLocationsBeginInfoEXT: return "RenderPassSampleLocationsBeginInfoEXT";
+      case StructureType::ePipelineSampleLocationsStateCreateInfoEXT: return "PipelineSampleLocationsStateCreateInfoEXT";
+      case StructureType::ePhysicalDeviceSampleLocationsPropertiesEXT: return "PhysicalDeviceSampleLocationsPropertiesEXT";
+      case StructureType::eMultisamplePropertiesEXT: return "MultisamplePropertiesEXT";
+      case StructureType::ePhysicalDeviceBlendOperationAdvancedFeaturesEXT: return "PhysicalDeviceBlendOperationAdvancedFeaturesEXT";
       case StructureType::ePhysicalDeviceBlendOperationAdvancedPropertiesEXT: return "PhysicalDeviceBlendOperationAdvancedPropertiesEXT";
-      case StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT     : return "PipelineColorBlendAdvancedStateCreateInfoEXT";
-      case StructureType::ePipelineCoverageToColorStateCreateInfoNV         : return "PipelineCoverageToColorStateCreateInfoNV";
-      case StructureType::eWriteDescriptorSetAccelerationStructureKHR       : return "WriteDescriptorSetAccelerationStructureKHR";
-      case StructureType::eAccelerationStructureBuildGeometryInfoKHR        : return "AccelerationStructureBuildGeometryInfoKHR";
-      case StructureType::eAccelerationStructureDeviceAddressInfoKHR        : return "AccelerationStructureDeviceAddressInfoKHR";
-      case StructureType::eAccelerationStructureGeometryAabbsDataKHR        : return "AccelerationStructureGeometryAabbsDataKHR";
-      case StructureType::eAccelerationStructureGeometryInstancesDataKHR    : return "AccelerationStructureGeometryInstancesDataKHR";
-      case StructureType::eAccelerationStructureGeometryTrianglesDataKHR    : return "AccelerationStructureGeometryTrianglesDataKHR";
-      case StructureType::eAccelerationStructureGeometryKHR                 : return "AccelerationStructureGeometryKHR";
-      case StructureType::eAccelerationStructureVersionInfoKHR              : return "AccelerationStructureVersionInfoKHR";
-      case StructureType::eCopyAccelerationStructureInfoKHR                 : return "CopyAccelerationStructureInfoKHR";
-      case StructureType::eCopyAccelerationStructureToMemoryInfoKHR         : return "CopyAccelerationStructureToMemoryInfoKHR";
-      case StructureType::eCopyMemoryToAccelerationStructureInfoKHR         : return "CopyMemoryToAccelerationStructureInfoKHR";
-      case StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR   : return "PhysicalDeviceAccelerationStructureFeaturesKHR";
-      case StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR : return "PhysicalDeviceAccelerationStructurePropertiesKHR";
-      case StructureType::eAccelerationStructureCreateInfoKHR               : return "AccelerationStructureCreateInfoKHR";
-      case StructureType::eAccelerationStructureBuildSizesInfoKHR           : return "AccelerationStructureBuildSizesInfoKHR";
-      case StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR      : return "PhysicalDeviceRayTracingPipelineFeaturesKHR";
-      case StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR    : return "PhysicalDeviceRayTracingPipelinePropertiesKHR";
-      case StructureType::eRayTracingPipelineCreateInfoKHR                  : return "RayTracingPipelineCreateInfoKHR";
-      case StructureType::eRayTracingShaderGroupCreateInfoKHR               : return "RayTracingShaderGroupCreateInfoKHR";
-      case StructureType::eRayTracingPipelineInterfaceCreateInfoKHR         : return "RayTracingPipelineInterfaceCreateInfoKHR";
-      case StructureType::ePhysicalDeviceRayQueryFeaturesKHR                : return "PhysicalDeviceRayQueryFeaturesKHR";
-      case StructureType::ePipelineCoverageModulationStateCreateInfoNV      : return "PipelineCoverageModulationStateCreateInfoNV";
-      case StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV         : return "PhysicalDeviceShaderSmBuiltinsFeaturesNV";
-      case StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV       : return "PhysicalDeviceShaderSmBuiltinsPropertiesNV";
-      case StructureType::eDrmFormatModifierPropertiesListEXT               : return "DrmFormatModifierPropertiesListEXT";
-      case StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT      : return "PhysicalDeviceImageDrmFormatModifierInfoEXT";
-      case StructureType::eImageDrmFormatModifierListCreateInfoEXT          : return "ImageDrmFormatModifierListCreateInfoEXT";
-      case StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT      : return "ImageDrmFormatModifierExplicitCreateInfoEXT";
-      case StructureType::eImageDrmFormatModifierPropertiesEXT              : return "ImageDrmFormatModifierPropertiesEXT";
-      case StructureType::eDrmFormatModifierPropertiesList2EXT              : return "DrmFormatModifierPropertiesList2EXT";
-      case StructureType::eValidationCacheCreateInfoEXT                     : return "ValidationCacheCreateInfoEXT";
-      case StructureType::eShaderModuleValidationCacheCreateInfoEXT         : return "ShaderModuleValidationCacheCreateInfoEXT";
+      case StructureType::ePipelineColorBlendAdvancedStateCreateInfoEXT: return "PipelineColorBlendAdvancedStateCreateInfoEXT";
+      case StructureType::ePipelineCoverageToColorStateCreateInfoNV: return "PipelineCoverageToColorStateCreateInfoNV";
+      case StructureType::eWriteDescriptorSetAccelerationStructureKHR: return "WriteDescriptorSetAccelerationStructureKHR";
+      case StructureType::eAccelerationStructureBuildGeometryInfoKHR: return "AccelerationStructureBuildGeometryInfoKHR";
+      case StructureType::eAccelerationStructureDeviceAddressInfoKHR: return "AccelerationStructureDeviceAddressInfoKHR";
+      case StructureType::eAccelerationStructureGeometryAabbsDataKHR: return "AccelerationStructureGeometryAabbsDataKHR";
+      case StructureType::eAccelerationStructureGeometryInstancesDataKHR: return "AccelerationStructureGeometryInstancesDataKHR";
+      case StructureType::eAccelerationStructureGeometryTrianglesDataKHR: return "AccelerationStructureGeometryTrianglesDataKHR";
+      case StructureType::eAccelerationStructureGeometryKHR: return "AccelerationStructureGeometryKHR";
+      case StructureType::eAccelerationStructureVersionInfoKHR: return "AccelerationStructureVersionInfoKHR";
+      case StructureType::eCopyAccelerationStructureInfoKHR: return "CopyAccelerationStructureInfoKHR";
+      case StructureType::eCopyAccelerationStructureToMemoryInfoKHR: return "CopyAccelerationStructureToMemoryInfoKHR";
+      case StructureType::eCopyMemoryToAccelerationStructureInfoKHR: return "CopyMemoryToAccelerationStructureInfoKHR";
+      case StructureType::ePhysicalDeviceAccelerationStructureFeaturesKHR: return "PhysicalDeviceAccelerationStructureFeaturesKHR";
+      case StructureType::ePhysicalDeviceAccelerationStructurePropertiesKHR: return "PhysicalDeviceAccelerationStructurePropertiesKHR";
+      case StructureType::eAccelerationStructureCreateInfoKHR: return "AccelerationStructureCreateInfoKHR";
+      case StructureType::eAccelerationStructureBuildSizesInfoKHR: return "AccelerationStructureBuildSizesInfoKHR";
+      case StructureType::ePhysicalDeviceRayTracingPipelineFeaturesKHR: return "PhysicalDeviceRayTracingPipelineFeaturesKHR";
+      case StructureType::ePhysicalDeviceRayTracingPipelinePropertiesKHR: return "PhysicalDeviceRayTracingPipelinePropertiesKHR";
+      case StructureType::eRayTracingPipelineCreateInfoKHR: return "RayTracingPipelineCreateInfoKHR";
+      case StructureType::eRayTracingShaderGroupCreateInfoKHR: return "RayTracingShaderGroupCreateInfoKHR";
+      case StructureType::eRayTracingPipelineInterfaceCreateInfoKHR: return "RayTracingPipelineInterfaceCreateInfoKHR";
+      case StructureType::ePhysicalDeviceRayQueryFeaturesKHR: return "PhysicalDeviceRayQueryFeaturesKHR";
+      case StructureType::ePipelineCoverageModulationStateCreateInfoNV: return "PipelineCoverageModulationStateCreateInfoNV";
+      case StructureType::ePhysicalDeviceShaderSmBuiltinsFeaturesNV: return "PhysicalDeviceShaderSmBuiltinsFeaturesNV";
+      case StructureType::ePhysicalDeviceShaderSmBuiltinsPropertiesNV: return "PhysicalDeviceShaderSmBuiltinsPropertiesNV";
+      case StructureType::eDrmFormatModifierPropertiesListEXT: return "DrmFormatModifierPropertiesListEXT";
+      case StructureType::ePhysicalDeviceImageDrmFormatModifierInfoEXT: return "PhysicalDeviceImageDrmFormatModifierInfoEXT";
+      case StructureType::eImageDrmFormatModifierListCreateInfoEXT: return "ImageDrmFormatModifierListCreateInfoEXT";
+      case StructureType::eImageDrmFormatModifierExplicitCreateInfoEXT: return "ImageDrmFormatModifierExplicitCreateInfoEXT";
+      case StructureType::eImageDrmFormatModifierPropertiesEXT: return "ImageDrmFormatModifierPropertiesEXT";
+      case StructureType::eDrmFormatModifierPropertiesList2EXT: return "DrmFormatModifierPropertiesList2EXT";
+      case StructureType::eValidationCacheCreateInfoEXT: return "ValidationCacheCreateInfoEXT";
+      case StructureType::eShaderModuleValidationCacheCreateInfoEXT: return "ShaderModuleValidationCacheCreateInfoEXT";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR  : return "PhysicalDevicePortabilitySubsetFeaturesKHR";
+      case StructureType::ePhysicalDevicePortabilitySubsetFeaturesKHR: return "PhysicalDevicePortabilitySubsetFeaturesKHR";
       case StructureType::ePhysicalDevicePortabilitySubsetPropertiesKHR: return "PhysicalDevicePortabilitySubsetPropertiesKHR";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV  : return "PipelineViewportShadingRateImageStateCreateInfoNV";
-      case StructureType::ePhysicalDeviceShadingRateImageFeaturesNV           : return "PhysicalDeviceShadingRateImageFeaturesNV";
-      case StructureType::ePhysicalDeviceShadingRateImagePropertiesNV         : return "PhysicalDeviceShadingRateImagePropertiesNV";
-      case StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV : return "PipelineViewportCoarseSampleOrderStateCreateInfoNV";
-      case StructureType::eRayTracingPipelineCreateInfoNV                     : return "RayTracingPipelineCreateInfoNV";
-      case StructureType::eAccelerationStructureCreateInfoNV                  : return "AccelerationStructureCreateInfoNV";
-      case StructureType::eGeometryNV                                         : return "GeometryNV";
-      case StructureType::eGeometryTrianglesNV                                : return "GeometryTrianglesNV";
-      case StructureType::eGeometryAabbNV                                     : return "GeometryAabbNV";
-      case StructureType::eBindAccelerationStructureMemoryInfoNV              : return "BindAccelerationStructureMemoryInfoNV";
-      case StructureType::eWriteDescriptorSetAccelerationStructureNV          : return "WriteDescriptorSetAccelerationStructureNV";
-      case StructureType::eAccelerationStructureMemoryRequirementsInfoNV      : return "AccelerationStructureMemoryRequirementsInfoNV";
-      case StructureType::ePhysicalDeviceRayTracingPropertiesNV               : return "PhysicalDeviceRayTracingPropertiesNV";
-      case StructureType::eRayTracingShaderGroupCreateInfoNV                  : return "RayTracingShaderGroupCreateInfoNV";
-      case StructureType::eAccelerationStructureInfoNV                        : return "AccelerationStructureInfoNV";
-      case StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV : return "PhysicalDeviceRepresentativeFragmentTestFeaturesNV";
+      case StructureType::ePipelineViewportShadingRateImageStateCreateInfoNV: return "PipelineViewportShadingRateImageStateCreateInfoNV";
+      case StructureType::ePhysicalDeviceShadingRateImageFeaturesNV: return "PhysicalDeviceShadingRateImageFeaturesNV";
+      case StructureType::ePhysicalDeviceShadingRateImagePropertiesNV: return "PhysicalDeviceShadingRateImagePropertiesNV";
+      case StructureType::ePipelineViewportCoarseSampleOrderStateCreateInfoNV: return "PipelineViewportCoarseSampleOrderStateCreateInfoNV";
+      case StructureType::eRayTracingPipelineCreateInfoNV: return "RayTracingPipelineCreateInfoNV";
+      case StructureType::eAccelerationStructureCreateInfoNV: return "AccelerationStructureCreateInfoNV";
+      case StructureType::eGeometryNV: return "GeometryNV";
+      case StructureType::eGeometryTrianglesNV: return "GeometryTrianglesNV";
+      case StructureType::eGeometryAabbNV: return "GeometryAabbNV";
+      case StructureType::eBindAccelerationStructureMemoryInfoNV: return "BindAccelerationStructureMemoryInfoNV";
+      case StructureType::eWriteDescriptorSetAccelerationStructureNV: return "WriteDescriptorSetAccelerationStructureNV";
+      case StructureType::eAccelerationStructureMemoryRequirementsInfoNV: return "AccelerationStructureMemoryRequirementsInfoNV";
+      case StructureType::ePhysicalDeviceRayTracingPropertiesNV: return "PhysicalDeviceRayTracingPropertiesNV";
+      case StructureType::eRayTracingShaderGroupCreateInfoNV: return "RayTracingShaderGroupCreateInfoNV";
+      case StructureType::eAccelerationStructureInfoNV: return "AccelerationStructureInfoNV";
+      case StructureType::ePhysicalDeviceRepresentativeFragmentTestFeaturesNV: return "PhysicalDeviceRepresentativeFragmentTestFeaturesNV";
       case StructureType::ePipelineRepresentativeFragmentTestStateCreateInfoNV: return "PipelineRepresentativeFragmentTestStateCreateInfoNV";
-      case StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT          : return "PhysicalDeviceImageViewImageFormatInfoEXT";
-      case StructureType::eFilterCubicImageViewImageFormatPropertiesEXT       : return "FilterCubicImageViewImageFormatPropertiesEXT";
-      case StructureType::eImportMemoryHostPointerInfoEXT                     : return "ImportMemoryHostPointerInfoEXT";
-      case StructureType::eMemoryHostPointerPropertiesEXT                     : return "MemoryHostPointerPropertiesEXT";
-      case StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT      : return "PhysicalDeviceExternalMemoryHostPropertiesEXT";
-      case StructureType::ePhysicalDeviceShaderClockFeaturesKHR               : return "PhysicalDeviceShaderClockFeaturesKHR";
-      case StructureType::ePipelineCompilerControlCreateInfoAMD               : return "PipelineCompilerControlCreateInfoAMD";
-      case StructureType::ePhysicalDeviceShaderCorePropertiesAMD              : return "PhysicalDeviceShaderCorePropertiesAMD";
-      case StructureType::eVideoDecodeH265CapabilitiesKHR                     : return "VideoDecodeH265CapabilitiesKHR";
-      case StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR      : return "VideoDecodeH265SessionParametersCreateInfoKHR";
-      case StructureType::eVideoDecodeH265SessionParametersAddInfoKHR         : return "VideoDecodeH265SessionParametersAddInfoKHR";
-      case StructureType::eVideoDecodeH265ProfileInfoKHR                      : return "VideoDecodeH265ProfileInfoKHR";
-      case StructureType::eVideoDecodeH265PictureInfoKHR                      : return "VideoDecodeH265PictureInfoKHR";
-      case StructureType::eVideoDecodeH265DpbSlotInfoKHR                      : return "VideoDecodeH265DpbSlotInfoKHR";
-      case StructureType::eDeviceMemoryOverallocationCreateInfoAMD            : return "DeviceMemoryOverallocationCreateInfoAMD";
-      case StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT  : return "PhysicalDeviceVertexAttributeDivisorPropertiesEXT";
+      case StructureType::ePhysicalDeviceImageViewImageFormatInfoEXT: return "PhysicalDeviceImageViewImageFormatInfoEXT";
+      case StructureType::eFilterCubicImageViewImageFormatPropertiesEXT: return "FilterCubicImageViewImageFormatPropertiesEXT";
+      case StructureType::eImportMemoryHostPointerInfoEXT: return "ImportMemoryHostPointerInfoEXT";
+      case StructureType::eMemoryHostPointerPropertiesEXT: return "MemoryHostPointerPropertiesEXT";
+      case StructureType::ePhysicalDeviceExternalMemoryHostPropertiesEXT: return "PhysicalDeviceExternalMemoryHostPropertiesEXT";
+      case StructureType::ePhysicalDeviceShaderClockFeaturesKHR: return "PhysicalDeviceShaderClockFeaturesKHR";
+      case StructureType::ePipelineCompilerControlCreateInfoAMD: return "PipelineCompilerControlCreateInfoAMD";
+      case StructureType::ePhysicalDeviceShaderCorePropertiesAMD: return "PhysicalDeviceShaderCorePropertiesAMD";
+      case StructureType::eVideoDecodeH265CapabilitiesKHR: return "VideoDecodeH265CapabilitiesKHR";
+      case StructureType::eVideoDecodeH265SessionParametersCreateInfoKHR: return "VideoDecodeH265SessionParametersCreateInfoKHR";
+      case StructureType::eVideoDecodeH265SessionParametersAddInfoKHR: return "VideoDecodeH265SessionParametersAddInfoKHR";
+      case StructureType::eVideoDecodeH265ProfileInfoKHR: return "VideoDecodeH265ProfileInfoKHR";
+      case StructureType::eVideoDecodeH265PictureInfoKHR: return "VideoDecodeH265PictureInfoKHR";
+      case StructureType::eVideoDecodeH265DpbSlotInfoKHR: return "VideoDecodeH265DpbSlotInfoKHR";
+      case StructureType::eDeviceQueueGlobalPriorityCreateInfoKHR: return "DeviceQueueGlobalPriorityCreateInfoKHR";
+      case StructureType::ePhysicalDeviceGlobalPriorityQueryFeaturesKHR: return "PhysicalDeviceGlobalPriorityQueryFeaturesKHR";
+      case StructureType::eQueueFamilyGlobalPriorityPropertiesKHR: return "QueueFamilyGlobalPriorityPropertiesKHR";
+      case StructureType::eDeviceMemoryOverallocationCreateInfoAMD: return "DeviceMemoryOverallocationCreateInfoAMD";
+      case StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT: return "PhysicalDeviceVertexAttributeDivisorPropertiesEXT";
 #if defined( VK_USE_PLATFORM_GGP )
       case StructureType::ePresentFrameTokenGGP: return "PresentFrameTokenGGP";
 #endif /*VK_USE_PLATFORM_GGP*/
-      case StructureType::ePhysicalDeviceMeshShaderFeaturesNV                : return "PhysicalDeviceMeshShaderFeaturesNV";
-      case StructureType::ePhysicalDeviceMeshShaderPropertiesNV              : return "PhysicalDeviceMeshShaderPropertiesNV";
-      case StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV      : return "PhysicalDeviceShaderImageFootprintFeaturesNV";
-      case StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV : return "PipelineViewportExclusiveScissorStateCreateInfoNV";
-      case StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV          : return "PhysicalDeviceExclusiveScissorFeaturesNV";
-      case StructureType::eCheckpointDataNV                                  : return "CheckpointDataNV";
-      case StructureType::eQueueFamilyCheckpointPropertiesNV                 : return "QueueFamilyCheckpointPropertiesNV";
-      case StructureType::eQueueFamilyCheckpointProperties2NV                : return "QueueFamilyCheckpointProperties2NV";
-      case StructureType::eCheckpointData2NV                                 : return "CheckpointData2NV";
-      case StructureType::ePhysicalDevicePresentTimingFeaturesEXT            : return "PhysicalDevicePresentTimingFeaturesEXT";
-      case StructureType::eSwapchainTimingPropertiesEXT                      : return "SwapchainTimingPropertiesEXT";
-      case StructureType::eSwapchainTimeDomainPropertiesEXT                  : return "SwapchainTimeDomainPropertiesEXT";
-      case StructureType::ePresentTimingsInfoEXT                             : return "PresentTimingsInfoEXT";
-      case StructureType::ePresentTimingInfoEXT                              : return "PresentTimingInfoEXT";
-      case StructureType::ePastPresentationTimingInfoEXT                     : return "PastPresentationTimingInfoEXT";
-      case StructureType::ePastPresentationTimingPropertiesEXT               : return "PastPresentationTimingPropertiesEXT";
-      case StructureType::ePastPresentationTimingEXT                         : return "PastPresentationTimingEXT";
-      case StructureType::ePresentTimingSurfaceCapabilitiesEXT               : return "PresentTimingSurfaceCapabilitiesEXT";
-      case StructureType::eSwapchainCalibratedTimestampInfoEXT               : return "SwapchainCalibratedTimestampInfoEXT";
+      case StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesNV: return "PhysicalDeviceComputeShaderDerivativesFeaturesNV";
+      case StructureType::ePhysicalDeviceMeshShaderFeaturesNV: return "PhysicalDeviceMeshShaderFeaturesNV";
+      case StructureType::ePhysicalDeviceMeshShaderPropertiesNV: return "PhysicalDeviceMeshShaderPropertiesNV";
+      case StructureType::ePhysicalDeviceShaderImageFootprintFeaturesNV: return "PhysicalDeviceShaderImageFootprintFeaturesNV";
+      case StructureType::ePipelineViewportExclusiveScissorStateCreateInfoNV: return "PipelineViewportExclusiveScissorStateCreateInfoNV";
+      case StructureType::ePhysicalDeviceExclusiveScissorFeaturesNV: return "PhysicalDeviceExclusiveScissorFeaturesNV";
+      case StructureType::eCheckpointDataNV: return "CheckpointDataNV";
+      case StructureType::eQueueFamilyCheckpointPropertiesNV: return "QueueFamilyCheckpointPropertiesNV";
       case StructureType::ePhysicalDeviceShaderIntegerFunctions2FeaturesINTEL: return "PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL";
-      case StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL          : return "QueryPoolPerformanceQueryCreateInfoINTEL";
-      case StructureType::eInitializePerformanceApiInfoINTEL                 : return "InitializePerformanceApiInfoINTEL";
-      case StructureType::ePerformanceMarkerInfoINTEL                        : return "PerformanceMarkerInfoINTEL";
-      case StructureType::ePerformanceStreamMarkerInfoINTEL                  : return "PerformanceStreamMarkerInfoINTEL";
-      case StructureType::ePerformanceOverrideInfoINTEL                      : return "PerformanceOverrideInfoINTEL";
-      case StructureType::ePerformanceConfigurationAcquireInfoINTEL          : return "PerformanceConfigurationAcquireInfoINTEL";
-      case StructureType::ePhysicalDevicePciBusInfoPropertiesEXT             : return "PhysicalDevicePciBusInfoPropertiesEXT";
-      case StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD            : return "DisplayNativeHdrSurfaceCapabilitiesAMD";
-      case StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD            : return "SwapchainDisplayNativeHdrCreateInfoAMD";
+      case StructureType::eQueryPoolPerformanceQueryCreateInfoINTEL: return "QueryPoolPerformanceQueryCreateInfoINTEL";
+      case StructureType::eInitializePerformanceApiInfoINTEL: return "InitializePerformanceApiInfoINTEL";
+      case StructureType::ePerformanceMarkerInfoINTEL: return "PerformanceMarkerInfoINTEL";
+      case StructureType::ePerformanceStreamMarkerInfoINTEL: return "PerformanceStreamMarkerInfoINTEL";
+      case StructureType::ePerformanceOverrideInfoINTEL: return "PerformanceOverrideInfoINTEL";
+      case StructureType::ePerformanceConfigurationAcquireInfoINTEL: return "PerformanceConfigurationAcquireInfoINTEL";
+      case StructureType::ePhysicalDevicePciBusInfoPropertiesEXT: return "PhysicalDevicePciBusInfoPropertiesEXT";
+      case StructureType::eDisplayNativeHdrSurfaceCapabilitiesAMD: return "DisplayNativeHdrSurfaceCapabilitiesAMD";
+      case StructureType::eSwapchainDisplayNativeHdrCreateInfoAMD: return "SwapchainDisplayNativeHdrCreateInfoAMD";
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       case StructureType::eImagepipeSurfaceCreateInfoFUCHSIA: return "ImagepipeSurfaceCreateInfoFUCHSIA";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
 #if defined( VK_USE_PLATFORM_METAL_EXT )
       case StructureType::eMetalSurfaceCreateInfoEXT: return "MetalSurfaceCreateInfoEXT";
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
-      case StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT             : return "PhysicalDeviceFragmentDensityMapFeaturesEXT";
-      case StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT           : return "PhysicalDeviceFragmentDensityMapPropertiesEXT";
-      case StructureType::eRenderPassFragmentDensityMapCreateInfoEXT               : return "RenderPassFragmentDensityMapCreateInfoEXT";
-      case StructureType::eRenderingFragmentDensityMapAttachmentInfoEXT            : return "RenderingFragmentDensityMapAttachmentInfoEXT";
-      case StructureType::eFragmentShadingRateAttachmentInfoKHR                    : return "FragmentShadingRateAttachmentInfoKHR";
-      case StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR           : return "PipelineFragmentShadingRateStateCreateInfoKHR";
-      case StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR          : return "PhysicalDeviceFragmentShadingRatePropertiesKHR";
-      case StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR            : return "PhysicalDeviceFragmentShadingRateFeaturesKHR";
-      case StructureType::ePhysicalDeviceFragmentShadingRateKHR                    : return "PhysicalDeviceFragmentShadingRateKHR";
-      case StructureType::eRenderingFragmentShadingRateAttachmentInfoKHR           : return "RenderingFragmentShadingRateAttachmentInfoKHR";
-      case StructureType::ePhysicalDeviceShaderCoreProperties2AMD                  : return "PhysicalDeviceShaderCoreProperties2AMD";
-      case StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD                 : return "PhysicalDeviceCoherentMemoryFeaturesAMD";
-      case StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT         : return "PhysicalDeviceShaderImageAtomicInt64FeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR              : return "PhysicalDeviceShaderQuadControlFeaturesKHR";
-      case StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT                 : return "PhysicalDeviceMemoryBudgetPropertiesEXT";
-      case StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT                 : return "PhysicalDeviceMemoryPriorityFeaturesEXT";
-      case StructureType::eMemoryPriorityAllocateInfoEXT                           : return "MemoryPriorityAllocateInfoEXT";
-      case StructureType::eSurfaceProtectedCapabilitiesKHR                         : return "SurfaceProtectedCapabilitiesKHR";
+      case StructureType::ePhysicalDeviceFragmentDensityMapFeaturesEXT: return "PhysicalDeviceFragmentDensityMapFeaturesEXT";
+      case StructureType::ePhysicalDeviceFragmentDensityMapPropertiesEXT: return "PhysicalDeviceFragmentDensityMapPropertiesEXT";
+      case StructureType::eRenderPassFragmentDensityMapCreateInfoEXT: return "RenderPassFragmentDensityMapCreateInfoEXT";
+      case StructureType::eFragmentShadingRateAttachmentInfoKHR: return "FragmentShadingRateAttachmentInfoKHR";
+      case StructureType::ePipelineFragmentShadingRateStateCreateInfoKHR: return "PipelineFragmentShadingRateStateCreateInfoKHR";
+      case StructureType::ePhysicalDeviceFragmentShadingRatePropertiesKHR: return "PhysicalDeviceFragmentShadingRatePropertiesKHR";
+      case StructureType::ePhysicalDeviceFragmentShadingRateFeaturesKHR: return "PhysicalDeviceFragmentShadingRateFeaturesKHR";
+      case StructureType::ePhysicalDeviceFragmentShadingRateKHR: return "PhysicalDeviceFragmentShadingRateKHR";
+      case StructureType::ePhysicalDeviceShaderCoreProperties2AMD: return "PhysicalDeviceShaderCoreProperties2AMD";
+      case StructureType::ePhysicalDeviceCoherentMemoryFeaturesAMD: return "PhysicalDeviceCoherentMemoryFeaturesAMD";
+      case StructureType::ePhysicalDeviceDynamicRenderingLocalReadFeaturesKHR: return "PhysicalDeviceDynamicRenderingLocalReadFeaturesKHR";
+      case StructureType::eRenderingAttachmentLocationInfoKHR: return "RenderingAttachmentLocationInfoKHR";
+      case StructureType::eRenderingInputAttachmentIndexInfoKHR: return "RenderingInputAttachmentIndexInfoKHR";
+      case StructureType::ePhysicalDeviceShaderImageAtomicInt64FeaturesEXT: return "PhysicalDeviceShaderImageAtomicInt64FeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderQuadControlFeaturesKHR: return "PhysicalDeviceShaderQuadControlFeaturesKHR";
+      case StructureType::ePhysicalDeviceMemoryBudgetPropertiesEXT: return "PhysicalDeviceMemoryBudgetPropertiesEXT";
+      case StructureType::ePhysicalDeviceMemoryPriorityFeaturesEXT: return "PhysicalDeviceMemoryPriorityFeaturesEXT";
+      case StructureType::eMemoryPriorityAllocateInfoEXT: return "MemoryPriorityAllocateInfoEXT";
+      case StructureType::eSurfaceProtectedCapabilitiesKHR: return "SurfaceProtectedCapabilitiesKHR";
       case StructureType::ePhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV: return "PhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV";
-      case StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT            : return "PhysicalDeviceBufferDeviceAddressFeaturesEXT";
-      case StructureType::eBufferDeviceAddressCreateInfoEXT                        : return "BufferDeviceAddressCreateInfoEXT";
-      case StructureType::eValidationFeaturesEXT                                   : return "ValidationFeaturesEXT";
-      case StructureType::ePhysicalDevicePresentWaitFeaturesKHR                    : return "PhysicalDevicePresentWaitFeaturesKHR";
-      case StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV               : return "PhysicalDeviceCooperativeMatrixFeaturesNV";
-      case StructureType::eCooperativeMatrixPropertiesNV                           : return "CooperativeMatrixPropertiesNV";
-      case StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV             : return "PhysicalDeviceCooperativeMatrixPropertiesNV";
-      case StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV           : return "PhysicalDeviceCoverageReductionModeFeaturesNV";
-      case StructureType::ePipelineCoverageReductionStateCreateInfoNV              : return "PipelineCoverageReductionStateCreateInfoNV";
-      case StructureType::eFramebufferMixedSamplesCombinationNV                    : return "FramebufferMixedSamplesCombinationNV";
-      case StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT        : return "PhysicalDeviceFragmentShaderInterlockFeaturesEXT";
-      case StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT               : return "PhysicalDeviceYcbcrImageArraysFeaturesEXT";
-      case StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT                : return "PhysicalDeviceProvokingVertexFeaturesEXT";
-      case StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT  : return "PipelineRasterizationProvokingVertexStateCreateInfoEXT";
-      case StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT              : return "PhysicalDeviceProvokingVertexPropertiesEXT";
+      case StructureType::ePhysicalDeviceBufferDeviceAddressFeaturesEXT: return "PhysicalDeviceBufferDeviceAddressFeaturesEXT";
+      case StructureType::eBufferDeviceAddressCreateInfoEXT: return "BufferDeviceAddressCreateInfoEXT";
+      case StructureType::eValidationFeaturesEXT: return "ValidationFeaturesEXT";
+      case StructureType::ePhysicalDevicePresentWaitFeaturesKHR: return "PhysicalDevicePresentWaitFeaturesKHR";
+      case StructureType::ePhysicalDeviceCooperativeMatrixFeaturesNV: return "PhysicalDeviceCooperativeMatrixFeaturesNV";
+      case StructureType::eCooperativeMatrixPropertiesNV: return "CooperativeMatrixPropertiesNV";
+      case StructureType::ePhysicalDeviceCooperativeMatrixPropertiesNV: return "PhysicalDeviceCooperativeMatrixPropertiesNV";
+      case StructureType::ePhysicalDeviceCoverageReductionModeFeaturesNV: return "PhysicalDeviceCoverageReductionModeFeaturesNV";
+      case StructureType::ePipelineCoverageReductionStateCreateInfoNV: return "PipelineCoverageReductionStateCreateInfoNV";
+      case StructureType::eFramebufferMixedSamplesCombinationNV: return "FramebufferMixedSamplesCombinationNV";
+      case StructureType::ePhysicalDeviceFragmentShaderInterlockFeaturesEXT: return "PhysicalDeviceFragmentShaderInterlockFeaturesEXT";
+      case StructureType::ePhysicalDeviceYcbcrImageArraysFeaturesEXT: return "PhysicalDeviceYcbcrImageArraysFeaturesEXT";
+      case StructureType::ePhysicalDeviceProvokingVertexFeaturesEXT: return "PhysicalDeviceProvokingVertexFeaturesEXT";
+      case StructureType::ePipelineRasterizationProvokingVertexStateCreateInfoEXT: return "PipelineRasterizationProvokingVertexStateCreateInfoEXT";
+      case StructureType::ePhysicalDeviceProvokingVertexPropertiesEXT: return "PhysicalDeviceProvokingVertexPropertiesEXT";
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
-      case StructureType::eSurfaceFullScreenExclusiveInfoEXT        : return "SurfaceFullScreenExclusiveInfoEXT";
+      case StructureType::eSurfaceFullScreenExclusiveInfoEXT: return "SurfaceFullScreenExclusiveInfoEXT";
       case StructureType::eSurfaceCapabilitiesFullScreenExclusiveEXT: return "SurfaceCapabilitiesFullScreenExclusiveEXT";
-      case StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT   : return "SurfaceFullScreenExclusiveWin32InfoEXT";
+      case StructureType::eSurfaceFullScreenExclusiveWin32InfoEXT: return "SurfaceFullScreenExclusiveWin32InfoEXT";
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
-      case StructureType::eHeadlessSurfaceCreateInfoEXT                         : return "HeadlessSurfaceCreateInfoEXT";
-      case StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT           : return "PhysicalDeviceShaderAtomicFloatFeaturesEXT";
-      case StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT        : return "PhysicalDeviceExtendedDynamicStateFeaturesEXT";
+      case StructureType::eHeadlessSurfaceCreateInfoEXT: return "HeadlessSurfaceCreateInfoEXT";
+      case StructureType::ePhysicalDeviceShaderAtomicFloatFeaturesEXT: return "PhysicalDeviceShaderAtomicFloatFeaturesEXT";
+      case StructureType::ePhysicalDeviceExtendedDynamicStateFeaturesEXT: return "PhysicalDeviceExtendedDynamicStateFeaturesEXT";
       case StructureType::ePhysicalDevicePipelineExecutablePropertiesFeaturesKHR: return "PhysicalDevicePipelineExecutablePropertiesFeaturesKHR";
-      case StructureType::ePipelineInfoKHR                                      : return "PipelineInfoKHR";
-      case StructureType::ePipelineExecutablePropertiesKHR                      : return "PipelineExecutablePropertiesKHR";
-      case StructureType::ePipelineExecutableInfoKHR                            : return "PipelineExecutableInfoKHR";
-      case StructureType::ePipelineExecutableStatisticKHR                       : return "PipelineExecutableStatisticKHR";
-      case StructureType::ePipelineExecutableInternalRepresentationKHR          : return "PipelineExecutableInternalRepresentationKHR";
-      case StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT             : return "PhysicalDeviceMapMemoryPlacedFeaturesEXT";
-      case StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT           : return "PhysicalDeviceMapMemoryPlacedPropertiesEXT";
-      case StructureType::eMemoryMapPlacedInfoEXT                               : return "MemoryMapPlacedInfoEXT";
-      case StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT          : return "PhysicalDeviceShaderAtomicFloat2FeaturesEXT";
-      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV    : return "PhysicalDeviceDeviceGeneratedCommandsPropertiesNV";
-      case StructureType::eGraphicsShaderGroupCreateInfoNV                      : return "GraphicsShaderGroupCreateInfoNV";
-      case StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV             : return "GraphicsPipelineShaderGroupsCreateInfoNV";
-      case StructureType::eIndirectCommandsLayoutTokenNV                        : return "IndirectCommandsLayoutTokenNV";
-      case StructureType::eIndirectCommandsLayoutCreateInfoNV                   : return "IndirectCommandsLayoutCreateInfoNV";
-      case StructureType::eGeneratedCommandsInfoNV                              : return "GeneratedCommandsInfoNV";
-      case StructureType::eGeneratedCommandsMemoryRequirementsInfoNV            : return "GeneratedCommandsMemoryRequirementsInfoNV";
-      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV      : return "PhysicalDeviceDeviceGeneratedCommandsFeaturesNV";
-      case StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV     : return "PhysicalDeviceInheritedViewportScissorFeaturesNV";
-      case StructureType::eCommandBufferInheritanceViewportScissorInfoNV        : return "CommandBufferInheritanceViewportScissorInfoNV";
-      case StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT        : return "PhysicalDeviceTexelBufferAlignmentFeaturesEXT";
-      case StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM  : return "CommandBufferInheritanceRenderPassTransformInfoQCOM";
-      case StructureType::eRenderPassTransformBeginInfoQCOM                     : return "RenderPassTransformBeginInfoQCOM";
-      case StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT            : return "PhysicalDeviceDepthBiasControlFeaturesEXT";
-      case StructureType::eDepthBiasInfoEXT                                     : return "DepthBiasInfoEXT";
-      case StructureType::eDepthBiasRepresentationInfoEXT                       : return "DepthBiasRepresentationInfoEXT";
-      case StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT          : return "PhysicalDeviceDeviceMemoryReportFeaturesEXT";
-      case StructureType::eDeviceDeviceMemoryReportCreateInfoEXT                : return "DeviceDeviceMemoryReportCreateInfoEXT";
-      case StructureType::eDeviceMemoryReportCallbackDataEXT                    : return "DeviceMemoryReportCallbackDataEXT";
-      case StructureType::eSamplerCustomBorderColorCreateInfoEXT                : return "SamplerCustomBorderColorCreateInfoEXT";
-      case StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT         : return "PhysicalDeviceCustomBorderColorPropertiesEXT";
-      case StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT           : return "PhysicalDeviceCustomBorderColorFeaturesEXT";
-      case StructureType::ePipelineLibraryCreateInfoKHR                         : return "PipelineLibraryCreateInfoKHR";
-      case StructureType::ePhysicalDevicePresentBarrierFeaturesNV               : return "PhysicalDevicePresentBarrierFeaturesNV";
-      case StructureType::eSurfaceCapabilitiesPresentBarrierNV                  : return "SurfaceCapabilitiesPresentBarrierNV";
-      case StructureType::eSwapchainPresentBarrierCreateInfoNV                  : return "SwapchainPresentBarrierCreateInfoNV";
-      case StructureType::ePresentIdKHR                                         : return "PresentIdKHR";
-      case StructureType::ePhysicalDevicePresentIdFeaturesKHR                   : return "PhysicalDevicePresentIdFeaturesKHR";
-      case StructureType::eVideoEncodeInfoKHR                                   : return "VideoEncodeInfoKHR";
-      case StructureType::eVideoEncodeRateControlInfoKHR                        : return "VideoEncodeRateControlInfoKHR";
-      case StructureType::eVideoEncodeRateControlLayerInfoKHR                   : return "VideoEncodeRateControlLayerInfoKHR";
-      case StructureType::eVideoEncodeCapabilitiesKHR                           : return "VideoEncodeCapabilitiesKHR";
-      case StructureType::eVideoEncodeUsageInfoKHR                              : return "VideoEncodeUsageInfoKHR";
-      case StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR            : return "QueryPoolVideoEncodeFeedbackCreateInfoKHR";
-      case StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR         : return "PhysicalDeviceVideoEncodeQualityLevelInfoKHR";
-      case StructureType::eVideoEncodeQualityLevelPropertiesKHR                 : return "VideoEncodeQualityLevelPropertiesKHR";
-      case StructureType::eVideoEncodeQualityLevelInfoKHR                       : return "VideoEncodeQualityLevelInfoKHR";
-      case StructureType::eVideoEncodeSessionParametersGetInfoKHR               : return "VideoEncodeSessionParametersGetInfoKHR";
-      case StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR          : return "VideoEncodeSessionParametersFeedbackInfoKHR";
-      case StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV            : return "PhysicalDeviceDiagnosticsConfigFeaturesNV";
-      case StructureType::eDeviceDiagnosticsConfigCreateInfoNV                  : return "DeviceDiagnosticsConfigCreateInfoNV";
+      case StructureType::ePipelineInfoKHR: return "PipelineInfoKHR";
+      case StructureType::ePipelineExecutablePropertiesKHR: return "PipelineExecutablePropertiesKHR";
+      case StructureType::ePipelineExecutableInfoKHR: return "PipelineExecutableInfoKHR";
+      case StructureType::ePipelineExecutableStatisticKHR: return "PipelineExecutableStatisticKHR";
+      case StructureType::ePipelineExecutableInternalRepresentationKHR: return "PipelineExecutableInternalRepresentationKHR";
+      case StructureType::ePhysicalDeviceHostImageCopyFeaturesEXT: return "PhysicalDeviceHostImageCopyFeaturesEXT";
+      case StructureType::ePhysicalDeviceHostImageCopyPropertiesEXT: return "PhysicalDeviceHostImageCopyPropertiesEXT";
+      case StructureType::eMemoryToImageCopyEXT: return "MemoryToImageCopyEXT";
+      case StructureType::eImageToMemoryCopyEXT: return "ImageToMemoryCopyEXT";
+      case StructureType::eCopyImageToMemoryInfoEXT: return "CopyImageToMemoryInfoEXT";
+      case StructureType::eCopyMemoryToImageInfoEXT: return "CopyMemoryToImageInfoEXT";
+      case StructureType::eHostImageLayoutTransitionInfoEXT: return "HostImageLayoutTransitionInfoEXT";
+      case StructureType::eCopyImageToImageInfoEXT: return "CopyImageToImageInfoEXT";
+      case StructureType::eSubresourceHostMemcpySizeEXT: return "SubresourceHostMemcpySizeEXT";
+      case StructureType::eHostImageCopyDevicePerformanceQueryEXT: return "HostImageCopyDevicePerformanceQueryEXT";
+      case StructureType::eMemoryMapInfoKHR: return "MemoryMapInfoKHR";
+      case StructureType::eMemoryUnmapInfoKHR: return "MemoryUnmapInfoKHR";
+      case StructureType::ePhysicalDeviceMapMemoryPlacedFeaturesEXT: return "PhysicalDeviceMapMemoryPlacedFeaturesEXT";
+      case StructureType::ePhysicalDeviceMapMemoryPlacedPropertiesEXT: return "PhysicalDeviceMapMemoryPlacedPropertiesEXT";
+      case StructureType::eMemoryMapPlacedInfoEXT: return "MemoryMapPlacedInfoEXT";
+      case StructureType::ePhysicalDeviceShaderAtomicFloat2FeaturesEXT: return "PhysicalDeviceShaderAtomicFloat2FeaturesEXT";
+      case StructureType::eSurfacePresentModeEXT: return "SurfacePresentModeEXT";
+      case StructureType::eSurfacePresentScalingCapabilitiesEXT: return "SurfacePresentScalingCapabilitiesEXT";
+      case StructureType::eSurfacePresentModeCompatibilityEXT: return "SurfacePresentModeCompatibilityEXT";
+      case StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesEXT: return "PhysicalDeviceSwapchainMaintenance1FeaturesEXT";
+      case StructureType::eSwapchainPresentFenceInfoEXT: return "SwapchainPresentFenceInfoEXT";
+      case StructureType::eSwapchainPresentModesCreateInfoEXT: return "SwapchainPresentModesCreateInfoEXT";
+      case StructureType::eSwapchainPresentModeInfoEXT: return "SwapchainPresentModeInfoEXT";
+      case StructureType::eSwapchainPresentScalingCreateInfoEXT: return "SwapchainPresentScalingCreateInfoEXT";
+      case StructureType::eReleaseSwapchainImagesInfoEXT: return "ReleaseSwapchainImagesInfoEXT";
+      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesNV: return "PhysicalDeviceDeviceGeneratedCommandsPropertiesNV";
+      case StructureType::eGraphicsShaderGroupCreateInfoNV: return "GraphicsShaderGroupCreateInfoNV";
+      case StructureType::eGraphicsPipelineShaderGroupsCreateInfoNV: return "GraphicsPipelineShaderGroupsCreateInfoNV";
+      case StructureType::eIndirectCommandsLayoutTokenNV: return "IndirectCommandsLayoutTokenNV";
+      case StructureType::eIndirectCommandsLayoutCreateInfoNV: return "IndirectCommandsLayoutCreateInfoNV";
+      case StructureType::eGeneratedCommandsInfoNV: return "GeneratedCommandsInfoNV";
+      case StructureType::eGeneratedCommandsMemoryRequirementsInfoNV: return "GeneratedCommandsMemoryRequirementsInfoNV";
+      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesNV: return "PhysicalDeviceDeviceGeneratedCommandsFeaturesNV";
+      case StructureType::ePhysicalDeviceInheritedViewportScissorFeaturesNV: return "PhysicalDeviceInheritedViewportScissorFeaturesNV";
+      case StructureType::eCommandBufferInheritanceViewportScissorInfoNV: return "CommandBufferInheritanceViewportScissorInfoNV";
+      case StructureType::ePhysicalDeviceTexelBufferAlignmentFeaturesEXT: return "PhysicalDeviceTexelBufferAlignmentFeaturesEXT";
+      case StructureType::eCommandBufferInheritanceRenderPassTransformInfoQCOM: return "CommandBufferInheritanceRenderPassTransformInfoQCOM";
+      case StructureType::eRenderPassTransformBeginInfoQCOM: return "RenderPassTransformBeginInfoQCOM";
+      case StructureType::ePhysicalDeviceDepthBiasControlFeaturesEXT: return "PhysicalDeviceDepthBiasControlFeaturesEXT";
+      case StructureType::eDepthBiasInfoEXT: return "DepthBiasInfoEXT";
+      case StructureType::eDepthBiasRepresentationInfoEXT: return "DepthBiasRepresentationInfoEXT";
+      case StructureType::ePhysicalDeviceDeviceMemoryReportFeaturesEXT: return "PhysicalDeviceDeviceMemoryReportFeaturesEXT";
+      case StructureType::eDeviceDeviceMemoryReportCreateInfoEXT: return "DeviceDeviceMemoryReportCreateInfoEXT";
+      case StructureType::eDeviceMemoryReportCallbackDataEXT: return "DeviceMemoryReportCallbackDataEXT";
+      case StructureType::ePhysicalDeviceRobustness2FeaturesEXT: return "PhysicalDeviceRobustness2FeaturesEXT";
+      case StructureType::ePhysicalDeviceRobustness2PropertiesEXT: return "PhysicalDeviceRobustness2PropertiesEXT";
+      case StructureType::eSamplerCustomBorderColorCreateInfoEXT: return "SamplerCustomBorderColorCreateInfoEXT";
+      case StructureType::ePhysicalDeviceCustomBorderColorPropertiesEXT: return "PhysicalDeviceCustomBorderColorPropertiesEXT";
+      case StructureType::ePhysicalDeviceCustomBorderColorFeaturesEXT: return "PhysicalDeviceCustomBorderColorFeaturesEXT";
+      case StructureType::ePipelineLibraryCreateInfoKHR: return "PipelineLibraryCreateInfoKHR";
+      case StructureType::ePhysicalDevicePresentBarrierFeaturesNV: return "PhysicalDevicePresentBarrierFeaturesNV";
+      case StructureType::eSurfaceCapabilitiesPresentBarrierNV: return "SurfaceCapabilitiesPresentBarrierNV";
+      case StructureType::eSwapchainPresentBarrierCreateInfoNV: return "SwapchainPresentBarrierCreateInfoNV";
+      case StructureType::ePresentIdKHR: return "PresentIdKHR";
+      case StructureType::ePhysicalDevicePresentIdFeaturesKHR: return "PhysicalDevicePresentIdFeaturesKHR";
+      case StructureType::eVideoEncodeInfoKHR: return "VideoEncodeInfoKHR";
+      case StructureType::eVideoEncodeRateControlInfoKHR: return "VideoEncodeRateControlInfoKHR";
+      case StructureType::eVideoEncodeRateControlLayerInfoKHR: return "VideoEncodeRateControlLayerInfoKHR";
+      case StructureType::eVideoEncodeCapabilitiesKHR: return "VideoEncodeCapabilitiesKHR";
+      case StructureType::eVideoEncodeUsageInfoKHR: return "VideoEncodeUsageInfoKHR";
+      case StructureType::eQueryPoolVideoEncodeFeedbackCreateInfoKHR: return "QueryPoolVideoEncodeFeedbackCreateInfoKHR";
+      case StructureType::ePhysicalDeviceVideoEncodeQualityLevelInfoKHR: return "PhysicalDeviceVideoEncodeQualityLevelInfoKHR";
+      case StructureType::eVideoEncodeQualityLevelPropertiesKHR: return "VideoEncodeQualityLevelPropertiesKHR";
+      case StructureType::eVideoEncodeQualityLevelInfoKHR: return "VideoEncodeQualityLevelInfoKHR";
+      case StructureType::eVideoEncodeSessionParametersGetInfoKHR: return "VideoEncodeSessionParametersGetInfoKHR";
+      case StructureType::eVideoEncodeSessionParametersFeedbackInfoKHR: return "VideoEncodeSessionParametersFeedbackInfoKHR";
+      case StructureType::ePhysicalDeviceDiagnosticsConfigFeaturesNV: return "PhysicalDeviceDiagnosticsConfigFeaturesNV";
+      case StructureType::eDeviceDiagnosticsConfigCreateInfoNV: return "DeviceDiagnosticsConfigCreateInfoNV";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::eCudaModuleCreateInfoNV                    : return "CudaModuleCreateInfoNV";
-      case StructureType::eCudaFunctionCreateInfoNV                  : return "CudaFunctionCreateInfoNV";
-      case StructureType::eCudaLaunchInfoNV                          : return "CudaLaunchInfoNV";
-      case StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV  : return "PhysicalDeviceCudaKernelLaunchFeaturesNV";
+      case StructureType::eCudaModuleCreateInfoNV: return "CudaModuleCreateInfoNV";
+      case StructureType::eCudaFunctionCreateInfoNV: return "CudaFunctionCreateInfoNV";
+      case StructureType::eCudaLaunchInfoNV: return "CudaLaunchInfoNV";
+      case StructureType::ePhysicalDeviceCudaKernelLaunchFeaturesNV: return "PhysicalDeviceCudaKernelLaunchFeaturesNV";
       case StructureType::ePhysicalDeviceCudaKernelLaunchPropertiesNV: return "PhysicalDeviceCudaKernelLaunchPropertiesNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::ePhysicalDeviceTileShadingFeaturesQCOM  : return "PhysicalDeviceTileShadingFeaturesQCOM";
-      case StructureType::ePhysicalDeviceTileShadingPropertiesQCOM: return "PhysicalDeviceTileShadingPropertiesQCOM";
-      case StructureType::eRenderPassTileShadingCreateInfoQCOM    : return "RenderPassTileShadingCreateInfoQCOM";
-      case StructureType::ePerTileBeginInfoQCOM                   : return "PerTileBeginInfoQCOM";
-      case StructureType::ePerTileEndInfoQCOM                     : return "PerTileEndInfoQCOM";
-      case StructureType::eDispatchTileInfoQCOM                   : return "DispatchTileInfoQCOM";
-      case StructureType::eQueryLowLatencySupportNV               : return "QueryLowLatencySupportNV";
+      case StructureType::eQueryLowLatencySupportNV: return "QueryLowLatencySupportNV";
 #if defined( VK_USE_PLATFORM_METAL_EXT )
       case StructureType::eExportMetalObjectCreateInfoEXT: return "ExportMetalObjectCreateInfoEXT";
-      case StructureType::eExportMetalObjectsInfoEXT     : return "ExportMetalObjectsInfoEXT";
-      case StructureType::eExportMetalDeviceInfoEXT      : return "ExportMetalDeviceInfoEXT";
+      case StructureType::eExportMetalObjectsInfoEXT: return "ExportMetalObjectsInfoEXT";
+      case StructureType::eExportMetalDeviceInfoEXT: return "ExportMetalDeviceInfoEXT";
       case StructureType::eExportMetalCommandQueueInfoEXT: return "ExportMetalCommandQueueInfoEXT";
-      case StructureType::eExportMetalBufferInfoEXT      : return "ExportMetalBufferInfoEXT";
-      case StructureType::eImportMetalBufferInfoEXT      : return "ImportMetalBufferInfoEXT";
-      case StructureType::eExportMetalTextureInfoEXT     : return "ExportMetalTextureInfoEXT";
-      case StructureType::eImportMetalTextureInfoEXT     : return "ImportMetalTextureInfoEXT";
-      case StructureType::eExportMetalIoSurfaceInfoEXT   : return "ExportMetalIoSurfaceInfoEXT";
-      case StructureType::eImportMetalIoSurfaceInfoEXT   : return "ImportMetalIoSurfaceInfoEXT";
-      case StructureType::eExportMetalSharedEventInfoEXT : return "ExportMetalSharedEventInfoEXT";
-      case StructureType::eImportMetalSharedEventInfoEXT : return "ImportMetalSharedEventInfoEXT";
+      case StructureType::eExportMetalBufferInfoEXT: return "ExportMetalBufferInfoEXT";
+      case StructureType::eImportMetalBufferInfoEXT: return "ImportMetalBufferInfoEXT";
+      case StructureType::eExportMetalTextureInfoEXT: return "ExportMetalTextureInfoEXT";
+      case StructureType::eImportMetalTextureInfoEXT: return "ImportMetalTextureInfoEXT";
+      case StructureType::eExportMetalIoSurfaceInfoEXT: return "ExportMetalIoSurfaceInfoEXT";
+      case StructureType::eImportMetalIoSurfaceInfoEXT: return "ImportMetalIoSurfaceInfoEXT";
+      case StructureType::eExportMetalSharedEventInfoEXT: return "ExportMetalSharedEventInfoEXT";
+      case StructureType::eImportMetalSharedEventInfoEXT: return "ImportMetalSharedEventInfoEXT";
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
-      case StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT              : return "PhysicalDeviceDescriptorBufferPropertiesEXT";
-      case StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT    : return "PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT";
-      case StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT                : return "PhysicalDeviceDescriptorBufferFeaturesEXT";
-      case StructureType::eDescriptorAddressInfoEXT                                 : return "DescriptorAddressInfoEXT";
-      case StructureType::eDescriptorGetInfoEXT                                     : return "DescriptorGetInfoEXT";
-      case StructureType::eBufferCaptureDescriptorDataInfoEXT                       : return "BufferCaptureDescriptorDataInfoEXT";
-      case StructureType::eImageCaptureDescriptorDataInfoEXT                        : return "ImageCaptureDescriptorDataInfoEXT";
-      case StructureType::eImageViewCaptureDescriptorDataInfoEXT                    : return "ImageViewCaptureDescriptorDataInfoEXT";
-      case StructureType::eSamplerCaptureDescriptorDataInfoEXT                      : return "SamplerCaptureDescriptorDataInfoEXT";
-      case StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT                 : return "OpaqueCaptureDescriptorDataCreateInfoEXT";
-      case StructureType::eDescriptorBufferBindingInfoEXT                           : return "DescriptorBufferBindingInfoEXT";
-      case StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT     : return "DescriptorBufferBindingPushDescriptorBufferHandleEXT";
-      case StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT        : return "AccelerationStructureCaptureDescriptorDataInfoEXT";
-      case StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT         : return "PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT";
-      case StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT       : return "PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT";
-      case StructureType::eGraphicsPipelineLibraryCreateInfoEXT                     : return "GraphicsPipelineLibraryCreateInfoEXT";
-      case StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD : return "PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD";
-      case StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR       : return "PhysicalDeviceFragmentShaderBarycentricFeaturesKHR";
-      case StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR     : return "PhysicalDeviceFragmentShaderBarycentricPropertiesKHR";
+      case StructureType::eQueueFamilyCheckpointProperties2NV: return "QueueFamilyCheckpointProperties2NV";
+      case StructureType::eCheckpointData2NV: return "CheckpointData2NV";
+      case StructureType::ePhysicalDeviceDescriptorBufferPropertiesEXT: return "PhysicalDeviceDescriptorBufferPropertiesEXT";
+      case StructureType::ePhysicalDeviceDescriptorBufferDensityMapPropertiesEXT: return "PhysicalDeviceDescriptorBufferDensityMapPropertiesEXT";
+      case StructureType::ePhysicalDeviceDescriptorBufferFeaturesEXT: return "PhysicalDeviceDescriptorBufferFeaturesEXT";
+      case StructureType::eDescriptorAddressInfoEXT: return "DescriptorAddressInfoEXT";
+      case StructureType::eDescriptorGetInfoEXT: return "DescriptorGetInfoEXT";
+      case StructureType::eBufferCaptureDescriptorDataInfoEXT: return "BufferCaptureDescriptorDataInfoEXT";
+      case StructureType::eImageCaptureDescriptorDataInfoEXT: return "ImageCaptureDescriptorDataInfoEXT";
+      case StructureType::eImageViewCaptureDescriptorDataInfoEXT: return "ImageViewCaptureDescriptorDataInfoEXT";
+      case StructureType::eSamplerCaptureDescriptorDataInfoEXT: return "SamplerCaptureDescriptorDataInfoEXT";
+      case StructureType::eOpaqueCaptureDescriptorDataCreateInfoEXT: return "OpaqueCaptureDescriptorDataCreateInfoEXT";
+      case StructureType::eDescriptorBufferBindingInfoEXT: return "DescriptorBufferBindingInfoEXT";
+      case StructureType::eDescriptorBufferBindingPushDescriptorBufferHandleEXT: return "DescriptorBufferBindingPushDescriptorBufferHandleEXT";
+      case StructureType::eAccelerationStructureCaptureDescriptorDataInfoEXT: return "AccelerationStructureCaptureDescriptorDataInfoEXT";
+      case StructureType::ePhysicalDeviceGraphicsPipelineLibraryFeaturesEXT: return "PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT";
+      case StructureType::ePhysicalDeviceGraphicsPipelineLibraryPropertiesEXT: return "PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT";
+      case StructureType::eGraphicsPipelineLibraryCreateInfoEXT: return "GraphicsPipelineLibraryCreateInfoEXT";
+      case StructureType::ePhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD: return "PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD";
+      case StructureType::ePhysicalDeviceFragmentShaderBarycentricFeaturesKHR: return "PhysicalDeviceFragmentShaderBarycentricFeaturesKHR";
+      case StructureType::ePhysicalDeviceFragmentShaderBarycentricPropertiesKHR: return "PhysicalDeviceFragmentShaderBarycentricPropertiesKHR";
       case StructureType::ePhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR: return "PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR";
-      case StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV       : return "PhysicalDeviceFragmentShadingRateEnumsPropertiesNV";
-      case StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV         : return "PhysicalDeviceFragmentShadingRateEnumsFeaturesNV";
-      case StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV         : return "PipelineFragmentShadingRateEnumStateCreateInfoNV";
-      case StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV       : return "AccelerationStructureGeometryMotionTrianglesDataNV";
-      case StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV             : return "PhysicalDeviceRayTracingMotionBlurFeaturesNV";
-      case StructureType::eAccelerationStructureMotionInfoNV                        : return "AccelerationStructureMotionInfoNV";
-      case StructureType::ePhysicalDeviceMeshShaderFeaturesEXT                      : return "PhysicalDeviceMeshShaderFeaturesEXT";
-      case StructureType::ePhysicalDeviceMeshShaderPropertiesEXT                    : return "PhysicalDeviceMeshShaderPropertiesEXT";
-      case StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT           : return "PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT";
-      case StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT             : return "PhysicalDeviceFragmentDensityMap2FeaturesEXT";
-      case StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT           : return "PhysicalDeviceFragmentDensityMap2PropertiesEXT";
-      case StructureType::eCopyCommandTransformInfoQCOM                             : return "CopyCommandTransformInfoQCOM";
-      case StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR   : return "PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR";
-      case StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT         : return "PhysicalDeviceImageCompressionControlFeaturesEXT";
-      case StructureType::eImageCompressionControlEXT                               : return "ImageCompressionControlEXT";
-      case StructureType::eImageCompressionPropertiesEXT                            : return "ImageCompressionPropertiesEXT";
-      case StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT    : return "PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT";
-      case StructureType::ePhysicalDevice4444FormatsFeaturesEXT                     : return "PhysicalDevice4444FormatsFeaturesEXT";
-      case StructureType::ePhysicalDeviceFaultFeaturesEXT                           : return "PhysicalDeviceFaultFeaturesEXT";
-      case StructureType::eDeviceFaultCountsEXT                                     : return "DeviceFaultCountsEXT";
-      case StructureType::eDeviceFaultInfoEXT                                       : return "DeviceFaultInfoEXT";
-      case StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT                 : return "PhysicalDeviceRgba10X6FormatsFeaturesEXT";
+      case StructureType::ePhysicalDeviceFragmentShadingRateEnumsPropertiesNV: return "PhysicalDeviceFragmentShadingRateEnumsPropertiesNV";
+      case StructureType::ePhysicalDeviceFragmentShadingRateEnumsFeaturesNV: return "PhysicalDeviceFragmentShadingRateEnumsFeaturesNV";
+      case StructureType::ePipelineFragmentShadingRateEnumStateCreateInfoNV: return "PipelineFragmentShadingRateEnumStateCreateInfoNV";
+      case StructureType::eAccelerationStructureGeometryMotionTrianglesDataNV: return "AccelerationStructureGeometryMotionTrianglesDataNV";
+      case StructureType::ePhysicalDeviceRayTracingMotionBlurFeaturesNV: return "PhysicalDeviceRayTracingMotionBlurFeaturesNV";
+      case StructureType::eAccelerationStructureMotionInfoNV: return "AccelerationStructureMotionInfoNV";
+      case StructureType::ePhysicalDeviceMeshShaderFeaturesEXT: return "PhysicalDeviceMeshShaderFeaturesEXT";
+      case StructureType::ePhysicalDeviceMeshShaderPropertiesEXT: return "PhysicalDeviceMeshShaderPropertiesEXT";
+      case StructureType::ePhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT: return "PhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT";
+      case StructureType::ePhysicalDeviceFragmentDensityMap2FeaturesEXT: return "PhysicalDeviceFragmentDensityMap2FeaturesEXT";
+      case StructureType::ePhysicalDeviceFragmentDensityMap2PropertiesEXT: return "PhysicalDeviceFragmentDensityMap2PropertiesEXT";
+      case StructureType::eCopyCommandTransformInfoQCOM: return "CopyCommandTransformInfoQCOM";
+      case StructureType::ePhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR: return "PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR";
+      case StructureType::ePhysicalDeviceImageCompressionControlFeaturesEXT: return "PhysicalDeviceImageCompressionControlFeaturesEXT";
+      case StructureType::eImageCompressionControlEXT: return "ImageCompressionControlEXT";
+      case StructureType::eImageCompressionPropertiesEXT: return "ImageCompressionPropertiesEXT";
+      case StructureType::ePhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT: return "PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT";
+      case StructureType::ePhysicalDevice4444FormatsFeaturesEXT: return "PhysicalDevice4444FormatsFeaturesEXT";
+      case StructureType::ePhysicalDeviceFaultFeaturesEXT: return "PhysicalDeviceFaultFeaturesEXT";
+      case StructureType::eDeviceFaultCountsEXT: return "DeviceFaultCountsEXT";
+      case StructureType::eDeviceFaultInfoEXT: return "DeviceFaultInfoEXT";
+      case StructureType::ePhysicalDeviceRgba10X6FormatsFeaturesEXT: return "PhysicalDeviceRgba10X6FormatsFeaturesEXT";
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
       case StructureType::eDirectfbSurfaceCreateInfoEXT: return "DirectfbSurfaceCreateInfoEXT";
 #endif /*VK_USE_PLATFORM_DIRECTFB_EXT*/
-      case StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT     : return "PhysicalDeviceVertexInputDynamicStateFeaturesEXT";
-      case StructureType::eVertexInputBindingDescription2EXT                    : return "VertexInputBindingDescription2EXT";
-      case StructureType::eVertexInputAttributeDescription2EXT                  : return "VertexInputAttributeDescription2EXT";
-      case StructureType::ePhysicalDeviceDrmPropertiesEXT                       : return "PhysicalDeviceDrmPropertiesEXT";
-      case StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT        : return "PhysicalDeviceAddressBindingReportFeaturesEXT";
-      case StructureType::eDeviceAddressBindingCallbackDataEXT                  : return "DeviceAddressBindingCallbackDataEXT";
-      case StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT            : return "PhysicalDeviceDepthClipControlFeaturesEXT";
-      case StructureType::ePipelineViewportDepthClipControlCreateInfoEXT        : return "PipelineViewportDepthClipControlCreateInfoEXT";
+      case StructureType::ePhysicalDeviceVertexInputDynamicStateFeaturesEXT: return "PhysicalDeviceVertexInputDynamicStateFeaturesEXT";
+      case StructureType::eVertexInputBindingDescription2EXT: return "VertexInputBindingDescription2EXT";
+      case StructureType::eVertexInputAttributeDescription2EXT: return "VertexInputAttributeDescription2EXT";
+      case StructureType::ePhysicalDeviceDrmPropertiesEXT: return "PhysicalDeviceDrmPropertiesEXT";
+      case StructureType::ePhysicalDeviceAddressBindingReportFeaturesEXT: return "PhysicalDeviceAddressBindingReportFeaturesEXT";
+      case StructureType::eDeviceAddressBindingCallbackDataEXT: return "DeviceAddressBindingCallbackDataEXT";
+      case StructureType::ePhysicalDeviceDepthClipControlFeaturesEXT: return "PhysicalDeviceDepthClipControlFeaturesEXT";
+      case StructureType::ePipelineViewportDepthClipControlCreateInfoEXT: return "PipelineViewportDepthClipControlCreateInfoEXT";
       case StructureType::ePhysicalDevicePrimitiveTopologyListRestartFeaturesEXT: return "PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT";
 #if defined( VK_USE_PLATFORM_FUCHSIA )
-      case StructureType::eImportMemoryZirconHandleInfoFUCHSIA    : return "ImportMemoryZirconHandleInfoFUCHSIA";
-      case StructureType::eMemoryZirconHandlePropertiesFUCHSIA    : return "MemoryZirconHandlePropertiesFUCHSIA";
-      case StructureType::eMemoryGetZirconHandleInfoFUCHSIA       : return "MemoryGetZirconHandleInfoFUCHSIA";
-      case StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA : return "ImportSemaphoreZirconHandleInfoFUCHSIA";
-      case StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA    : return "SemaphoreGetZirconHandleInfoFUCHSIA";
-      case StructureType::eBufferCollectionCreateInfoFUCHSIA      : return "BufferCollectionCreateInfoFUCHSIA";
-      case StructureType::eImportMemoryBufferCollectionFUCHSIA    : return "ImportMemoryBufferCollectionFUCHSIA";
-      case StructureType::eBufferCollectionImageCreateInfoFUCHSIA : return "BufferCollectionImageCreateInfoFUCHSIA";
-      case StructureType::eBufferCollectionPropertiesFUCHSIA      : return "BufferCollectionPropertiesFUCHSIA";
-      case StructureType::eBufferConstraintsInfoFUCHSIA           : return "BufferConstraintsInfoFUCHSIA";
+      case StructureType::eImportMemoryZirconHandleInfoFUCHSIA: return "ImportMemoryZirconHandleInfoFUCHSIA";
+      case StructureType::eMemoryZirconHandlePropertiesFUCHSIA: return "MemoryZirconHandlePropertiesFUCHSIA";
+      case StructureType::eMemoryGetZirconHandleInfoFUCHSIA: return "MemoryGetZirconHandleInfoFUCHSIA";
+      case StructureType::eImportSemaphoreZirconHandleInfoFUCHSIA: return "ImportSemaphoreZirconHandleInfoFUCHSIA";
+      case StructureType::eSemaphoreGetZirconHandleInfoFUCHSIA: return "SemaphoreGetZirconHandleInfoFUCHSIA";
+      case StructureType::eBufferCollectionCreateInfoFUCHSIA: return "BufferCollectionCreateInfoFUCHSIA";
+      case StructureType::eImportMemoryBufferCollectionFUCHSIA: return "ImportMemoryBufferCollectionFUCHSIA";
+      case StructureType::eBufferCollectionImageCreateInfoFUCHSIA: return "BufferCollectionImageCreateInfoFUCHSIA";
+      case StructureType::eBufferCollectionPropertiesFUCHSIA: return "BufferCollectionPropertiesFUCHSIA";
+      case StructureType::eBufferConstraintsInfoFUCHSIA: return "BufferConstraintsInfoFUCHSIA";
       case StructureType::eBufferCollectionBufferCreateInfoFUCHSIA: return "BufferCollectionBufferCreateInfoFUCHSIA";
-      case StructureType::eImageConstraintsInfoFUCHSIA            : return "ImageConstraintsInfoFUCHSIA";
-      case StructureType::eImageFormatConstraintsInfoFUCHSIA      : return "ImageFormatConstraintsInfoFUCHSIA";
-      case StructureType::eSysmemColorSpaceFUCHSIA                : return "SysmemColorSpaceFUCHSIA";
-      case StructureType::eBufferCollectionConstraintsInfoFUCHSIA : return "BufferCollectionConstraintsInfoFUCHSIA";
+      case StructureType::eImageConstraintsInfoFUCHSIA: return "ImageConstraintsInfoFUCHSIA";
+      case StructureType::eImageFormatConstraintsInfoFUCHSIA: return "ImageFormatConstraintsInfoFUCHSIA";
+      case StructureType::eSysmemColorSpaceFUCHSIA: return "SysmemColorSpaceFUCHSIA";
+      case StructureType::eBufferCollectionConstraintsInfoFUCHSIA: return "BufferCollectionConstraintsInfoFUCHSIA";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-      case StructureType::eSubpassShadingPipelineCreateInfoHUAWEI                    : return "SubpassShadingPipelineCreateInfoHUAWEI";
-      case StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI                : return "PhysicalDeviceSubpassShadingFeaturesHUAWEI";
-      case StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI              : return "PhysicalDeviceSubpassShadingPropertiesHUAWEI";
-      case StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI                : return "PhysicalDeviceInvocationMaskFeaturesHUAWEI";
-      case StructureType::eMemoryGetRemoteAddressInfoNV                              : return "MemoryGetRemoteAddressInfoNV";
-      case StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV                : return "PhysicalDeviceExternalMemoryRdmaFeaturesNV";
-      case StructureType::ePipelinePropertiesIdentifierEXT                           : return "PipelinePropertiesIdentifierEXT";
-      case StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT               : return "PhysicalDevicePipelinePropertiesFeaturesEXT";
-      case StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT                    : return "PhysicalDeviceFrameBoundaryFeaturesEXT";
-      case StructureType::eFrameBoundaryEXT                                          : return "FrameBoundaryEXT";
+      case StructureType::eSubpassShadingPipelineCreateInfoHUAWEI: return "SubpassShadingPipelineCreateInfoHUAWEI";
+      case StructureType::ePhysicalDeviceSubpassShadingFeaturesHUAWEI: return "PhysicalDeviceSubpassShadingFeaturesHUAWEI";
+      case StructureType::ePhysicalDeviceSubpassShadingPropertiesHUAWEI: return "PhysicalDeviceSubpassShadingPropertiesHUAWEI";
+      case StructureType::ePhysicalDeviceInvocationMaskFeaturesHUAWEI: return "PhysicalDeviceInvocationMaskFeaturesHUAWEI";
+      case StructureType::eMemoryGetRemoteAddressInfoNV: return "MemoryGetRemoteAddressInfoNV";
+      case StructureType::ePhysicalDeviceExternalMemoryRdmaFeaturesNV: return "PhysicalDeviceExternalMemoryRdmaFeaturesNV";
+      case StructureType::ePipelinePropertiesIdentifierEXT: return "PipelinePropertiesIdentifierEXT";
+      case StructureType::ePhysicalDevicePipelinePropertiesFeaturesEXT: return "PhysicalDevicePipelinePropertiesFeaturesEXT";
+      case StructureType::ePhysicalDeviceFrameBoundaryFeaturesEXT: return "PhysicalDeviceFrameBoundaryFeaturesEXT";
+      case StructureType::eFrameBoundaryEXT: return "FrameBoundaryEXT";
       case StructureType::ePhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT: return "PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT";
-      case StructureType::eSubpassResolvePerformanceQueryEXT                         : return "SubpassResolvePerformanceQueryEXT";
-      case StructureType::eMultisampledRenderToSingleSampledInfoEXT                  : return "MultisampledRenderToSingleSampledInfoEXT";
-      case StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT            : return "PhysicalDeviceExtendedDynamicState2FeaturesEXT";
+      case StructureType::eSubpassResolvePerformanceQueryEXT: return "SubpassResolvePerformanceQueryEXT";
+      case StructureType::eMultisampledRenderToSingleSampledInfoEXT: return "MultisampledRenderToSingleSampledInfoEXT";
+      case StructureType::ePhysicalDeviceExtendedDynamicState2FeaturesEXT: return "PhysicalDeviceExtendedDynamicState2FeaturesEXT";
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
       case StructureType::eScreenSurfaceCreateInfoQNX: return "ScreenSurfaceCreateInfoQNX";
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-      case StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT          : return "PhysicalDeviceColorWriteEnableFeaturesEXT";
-      case StructureType::ePipelineColorWriteCreateInfoEXT                    : return "PipelineColorWriteCreateInfoEXT";
-      case StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT  : return "PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT";
-      case StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR    : return "PhysicalDeviceRayTracingMaintenance1FeaturesKHR";
-      case StructureType::ePhysicalDeviceShaderUntypedPointersFeaturesKHR     : return "PhysicalDeviceShaderUntypedPointersFeaturesKHR";
-      case StructureType::ePhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE: return "PhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE";
-      case StructureType::eVideoEncodeRgbConversionCapabilitiesVALVE          : return "VideoEncodeRgbConversionCapabilitiesVALVE";
-      case StructureType::eVideoEncodeProfileRgbConversionInfoVALVE           : return "VideoEncodeProfileRgbConversionInfoVALVE";
-      case StructureType::eVideoEncodeSessionRgbConversionCreateInfoVALVE     : return "VideoEncodeSessionRgbConversionCreateInfoVALVE";
-      case StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT           : return "PhysicalDeviceImageViewMinLodFeaturesEXT";
-      case StructureType::eImageViewMinLodCreateInfoEXT                       : return "ImageViewMinLodCreateInfoEXT";
-      case StructureType::ePhysicalDeviceMultiDrawFeaturesEXT                 : return "PhysicalDeviceMultiDrawFeaturesEXT";
-      case StructureType::ePhysicalDeviceMultiDrawPropertiesEXT               : return "PhysicalDeviceMultiDrawPropertiesEXT";
-      case StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT           : return "PhysicalDeviceImage2DViewOf3DFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT           : return "PhysicalDeviceShaderTileImageFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT         : return "PhysicalDeviceShaderTileImagePropertiesEXT";
-      case StructureType::eMicromapBuildInfoEXT                               : return "MicromapBuildInfoEXT";
-      case StructureType::eMicromapVersionInfoEXT                             : return "MicromapVersionInfoEXT";
-      case StructureType::eCopyMicromapInfoEXT                                : return "CopyMicromapInfoEXT";
-      case StructureType::eCopyMicromapToMemoryInfoEXT                        : return "CopyMicromapToMemoryInfoEXT";
-      case StructureType::eCopyMemoryToMicromapInfoEXT                        : return "CopyMemoryToMicromapInfoEXT";
-      case StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT           : return "PhysicalDeviceOpacityMicromapFeaturesEXT";
-      case StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT         : return "PhysicalDeviceOpacityMicromapPropertiesEXT";
-      case StructureType::eMicromapCreateInfoEXT                              : return "MicromapCreateInfoEXT";
-      case StructureType::eMicromapBuildSizesInfoEXT                          : return "MicromapBuildSizesInfoEXT";
-      case StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT   : return "AccelerationStructureTrianglesOpacityMicromapEXT";
+      case StructureType::ePhysicalDeviceColorWriteEnableFeaturesEXT: return "PhysicalDeviceColorWriteEnableFeaturesEXT";
+      case StructureType::ePipelineColorWriteCreateInfoEXT: return "PipelineColorWriteCreateInfoEXT";
+      case StructureType::ePhysicalDevicePrimitivesGeneratedQueryFeaturesEXT: return "PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT";
+      case StructureType::ePhysicalDeviceRayTracingMaintenance1FeaturesKHR: return "PhysicalDeviceRayTracingMaintenance1FeaturesKHR";
+      case StructureType::ePhysicalDeviceImageViewMinLodFeaturesEXT: return "PhysicalDeviceImageViewMinLodFeaturesEXT";
+      case StructureType::eImageViewMinLodCreateInfoEXT: return "ImageViewMinLodCreateInfoEXT";
+      case StructureType::ePhysicalDeviceMultiDrawFeaturesEXT: return "PhysicalDeviceMultiDrawFeaturesEXT";
+      case StructureType::ePhysicalDeviceMultiDrawPropertiesEXT: return "PhysicalDeviceMultiDrawPropertiesEXT";
+      case StructureType::ePhysicalDeviceImage2DViewOf3DFeaturesEXT: return "PhysicalDeviceImage2DViewOf3DFeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderTileImageFeaturesEXT: return "PhysicalDeviceShaderTileImageFeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderTileImagePropertiesEXT: return "PhysicalDeviceShaderTileImagePropertiesEXT";
+      case StructureType::eMicromapBuildInfoEXT: return "MicromapBuildInfoEXT";
+      case StructureType::eMicromapVersionInfoEXT: return "MicromapVersionInfoEXT";
+      case StructureType::eCopyMicromapInfoEXT: return "CopyMicromapInfoEXT";
+      case StructureType::eCopyMicromapToMemoryInfoEXT: return "CopyMicromapToMemoryInfoEXT";
+      case StructureType::eCopyMemoryToMicromapInfoEXT: return "CopyMemoryToMicromapInfoEXT";
+      case StructureType::ePhysicalDeviceOpacityMicromapFeaturesEXT: return "PhysicalDeviceOpacityMicromapFeaturesEXT";
+      case StructureType::ePhysicalDeviceOpacityMicromapPropertiesEXT: return "PhysicalDeviceOpacityMicromapPropertiesEXT";
+      case StructureType::eMicromapCreateInfoEXT: return "MicromapCreateInfoEXT";
+      case StructureType::eMicromapBuildSizesInfoEXT: return "MicromapBuildSizesInfoEXT";
+      case StructureType::eAccelerationStructureTrianglesOpacityMicromapEXT: return "AccelerationStructureTrianglesOpacityMicromapEXT";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV        : return "PhysicalDeviceDisplacementMicromapFeaturesNV";
-      case StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV      : return "PhysicalDeviceDisplacementMicromapPropertiesNV";
+      case StructureType::ePhysicalDeviceDisplacementMicromapFeaturesNV: return "PhysicalDeviceDisplacementMicromapFeaturesNV";
+      case StructureType::ePhysicalDeviceDisplacementMicromapPropertiesNV: return "PhysicalDeviceDisplacementMicromapPropertiesNV";
       case StructureType::eAccelerationStructureTrianglesDisplacementMicromapNV: return "AccelerationStructureTrianglesDisplacementMicromapNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI         : return "PhysicalDeviceClusterCullingShaderFeaturesHUAWEI";
-      case StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI       : return "PhysicalDeviceClusterCullingShaderPropertiesHUAWEI";
-      case StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI      : return "PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI";
-      case StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT              : return "PhysicalDeviceBorderColorSwizzleFeaturesEXT";
-      case StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT          : return "SamplerBorderColorComponentMappingCreateInfoEXT";
-      case StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT       : return "PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderCorePropertiesARM                    : return "PhysicalDeviceShaderCorePropertiesARM";
-      case StructureType::eDeviceQueueShaderCoreControlCreateInfoARM                : return "DeviceQueueShaderCoreControlCreateInfoARM";
-      case StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM              : return "PhysicalDeviceSchedulingControlsFeaturesARM";
-      case StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM            : return "PhysicalDeviceSchedulingControlsPropertiesARM";
-      case StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT             : return "PhysicalDeviceImageSlicedViewOf3DFeaturesEXT";
-      case StructureType::eImageViewSlicedCreateInfoEXT                             : return "ImageViewSlicedCreateInfoEXT";
-      case StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE      : return "PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE";
-      case StructureType::eDescriptorSetBindingReferenceVALVE                       : return "DescriptorSetBindingReferenceVALVE";
-      case StructureType::eDescriptorSetLayoutHostMappingInfoVALVE                  : return "DescriptorSetLayoutHostMappingInfoVALVE";
-      case StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT              : return "PhysicalDeviceNonSeamlessCubeMapFeaturesEXT";
-      case StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM               : return "PhysicalDeviceRenderPassStripedFeaturesARM";
-      case StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM             : return "PhysicalDeviceRenderPassStripedPropertiesARM";
-      case StructureType::eRenderPassStripeBeginInfoARM                             : return "RenderPassStripeBeginInfoARM";
-      case StructureType::eRenderPassStripeInfoARM                                  : return "RenderPassStripeInfoARM";
-      case StructureType::eRenderPassStripeSubmitInfoARM                            : return "RenderPassStripeSubmitInfoARM";
-      case StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV               : return "PhysicalDeviceCopyMemoryIndirectFeaturesNV";
-      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV   : return "PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV";
-      case StructureType::eComputePipelineIndirectBufferInfoNV                      : return "ComputePipelineIndirectBufferInfoNV";
-      case StructureType::ePipelineIndirectDeviceAddressInfoNV                      : return "PipelineIndirectDeviceAddressInfoNV";
-      case StructureType::ePhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV     : return "PhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV";
-      case StructureType::eAccelerationStructureGeometryLinearSweptSpheresDataNV    : return "AccelerationStructureGeometryLinearSweptSpheresDataNV";
-      case StructureType::eAccelerationStructureGeometrySpheresDataNV               : return "AccelerationStructureGeometrySpheresDataNV";
-      case StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV            : return "PhysicalDeviceLinearColorAttachmentFeaturesNV";
-      case StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR      : return "PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR";
+      case StructureType::ePhysicalDeviceClusterCullingShaderFeaturesHUAWEI: return "PhysicalDeviceClusterCullingShaderFeaturesHUAWEI";
+      case StructureType::ePhysicalDeviceClusterCullingShaderPropertiesHUAWEI: return "PhysicalDeviceClusterCullingShaderPropertiesHUAWEI";
+      case StructureType::ePhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI: return "PhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI";
+      case StructureType::ePhysicalDeviceBorderColorSwizzleFeaturesEXT: return "PhysicalDeviceBorderColorSwizzleFeaturesEXT";
+      case StructureType::eSamplerBorderColorComponentMappingCreateInfoEXT: return "SamplerBorderColorComponentMappingCreateInfoEXT";
+      case StructureType::ePhysicalDevicePageableDeviceLocalMemoryFeaturesEXT: return "PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderCorePropertiesARM: return "PhysicalDeviceShaderCorePropertiesARM";
+      case StructureType::ePhysicalDeviceShaderSubgroupRotateFeaturesKHR: return "PhysicalDeviceShaderSubgroupRotateFeaturesKHR";
+      case StructureType::eDeviceQueueShaderCoreControlCreateInfoARM: return "DeviceQueueShaderCoreControlCreateInfoARM";
+      case StructureType::ePhysicalDeviceSchedulingControlsFeaturesARM: return "PhysicalDeviceSchedulingControlsFeaturesARM";
+      case StructureType::ePhysicalDeviceSchedulingControlsPropertiesARM: return "PhysicalDeviceSchedulingControlsPropertiesARM";
+      case StructureType::ePhysicalDeviceImageSlicedViewOf3DFeaturesEXT: return "PhysicalDeviceImageSlicedViewOf3DFeaturesEXT";
+      case StructureType::eImageViewSlicedCreateInfoEXT: return "ImageViewSlicedCreateInfoEXT";
+      case StructureType::ePhysicalDeviceDescriptorSetHostMappingFeaturesVALVE: return "PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE";
+      case StructureType::eDescriptorSetBindingReferenceVALVE: return "DescriptorSetBindingReferenceVALVE";
+      case StructureType::eDescriptorSetLayoutHostMappingInfoVALVE: return "DescriptorSetLayoutHostMappingInfoVALVE";
+      case StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesEXT: return "PhysicalDeviceDepthClampZeroOneFeaturesEXT";
+      case StructureType::ePhysicalDeviceNonSeamlessCubeMapFeaturesEXT: return "PhysicalDeviceNonSeamlessCubeMapFeaturesEXT";
+      case StructureType::ePhysicalDeviceRenderPassStripedFeaturesARM: return "PhysicalDeviceRenderPassStripedFeaturesARM";
+      case StructureType::ePhysicalDeviceRenderPassStripedPropertiesARM: return "PhysicalDeviceRenderPassStripedPropertiesARM";
+      case StructureType::eRenderPassStripeBeginInfoARM: return "RenderPassStripeBeginInfoARM";
+      case StructureType::eRenderPassStripeInfoARM: return "RenderPassStripeInfoARM";
+      case StructureType::eRenderPassStripeSubmitInfoARM: return "RenderPassStripeSubmitInfoARM";
+      case StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM: return "PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM";
+      case StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM: return "PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM";
+      case StructureType::eSubpassFragmentDensityMapOffsetEndInfoQCOM: return "SubpassFragmentDensityMapOffsetEndInfoQCOM";
+      case StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesNV: return "PhysicalDeviceCopyMemoryIndirectFeaturesNV";
+      case StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesNV: return "PhysicalDeviceCopyMemoryIndirectPropertiesNV";
+      case StructureType::ePhysicalDeviceMemoryDecompressionFeaturesNV: return "PhysicalDeviceMemoryDecompressionFeaturesNV";
+      case StructureType::ePhysicalDeviceMemoryDecompressionPropertiesNV: return "PhysicalDeviceMemoryDecompressionPropertiesNV";
+      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV: return "PhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV";
+      case StructureType::eComputePipelineIndirectBufferInfoNV: return "ComputePipelineIndirectBufferInfoNV";
+      case StructureType::ePipelineIndirectDeviceAddressInfoNV: return "PipelineIndirectDeviceAddressInfoNV";
+      case StructureType::ePhysicalDeviceLinearColorAttachmentFeaturesNV: return "PhysicalDeviceLinearColorAttachmentFeaturesNV";
+      case StructureType::ePhysicalDeviceShaderMaximalReconvergenceFeaturesKHR: return "PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR";
       case StructureType::ePhysicalDeviceImageCompressionControlSwapchainFeaturesEXT: return "PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT";
-      case StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM                : return "PhysicalDeviceImageProcessingFeaturesQCOM";
-      case StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM              : return "PhysicalDeviceImageProcessingPropertiesQCOM";
-      case StructureType::eImageViewSampleWeightCreateInfoQCOM                      : return "ImageViewSampleWeightCreateInfoQCOM";
-      case StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT             : return "PhysicalDeviceNestedCommandBufferFeaturesEXT";
-      case StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT           : return "PhysicalDeviceNestedCommandBufferPropertiesEXT";
-#if defined( VK_USE_PLATFORM_OHOS )
-      case StructureType::eNativeBufferUsageOHOS           : return "NativeBufferUsageOHOS";
-      case StructureType::eNativeBufferPropertiesOHOS      : return "NativeBufferPropertiesOHOS";
-      case StructureType::eNativeBufferFormatPropertiesOHOS: return "NativeBufferFormatPropertiesOHOS";
-      case StructureType::eImportNativeBufferInfoOHOS      : return "ImportNativeBufferInfoOHOS";
-      case StructureType::eMemoryGetNativeBufferInfoOHOS   : return "MemoryGetNativeBufferInfoOHOS";
-      case StructureType::eExternalFormatOHOS              : return "ExternalFormatOHOS";
-#endif /*VK_USE_PLATFORM_OHOS*/
-      case StructureType::eExternalMemoryAcquireUnmodifiedEXT                         : return "ExternalMemoryAcquireUnmodifiedEXT";
-      case StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT             : return "PhysicalDeviceExtendedDynamicState3FeaturesEXT";
-      case StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT           : return "PhysicalDeviceExtendedDynamicState3PropertiesEXT";
-      case StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT              : return "PhysicalDeviceSubpassMergeFeedbackFeaturesEXT";
-      case StructureType::eRenderPassCreationControlEXT                               : return "RenderPassCreationControlEXT";
-      case StructureType::eRenderPassCreationFeedbackCreateInfoEXT                    : return "RenderPassCreationFeedbackCreateInfoEXT";
-      case StructureType::eRenderPassSubpassFeedbackCreateInfoEXT                     : return "RenderPassSubpassFeedbackCreateInfoEXT";
-      case StructureType::eDirectDriverLoadingInfoLUNARG                              : return "DirectDriverLoadingInfoLUNARG";
-      case StructureType::eDirectDriverLoadingListLUNARG                              : return "DirectDriverLoadingListLUNARG";
-      case StructureType::eTensorCreateInfoARM                                        : return "TensorCreateInfoARM";
-      case StructureType::eTensorViewCreateInfoARM                                    : return "TensorViewCreateInfoARM";
-      case StructureType::eBindTensorMemoryInfoARM                                    : return "BindTensorMemoryInfoARM";
-      case StructureType::eWriteDescriptorSetTensorARM                                : return "WriteDescriptorSetTensorARM";
-      case StructureType::ePhysicalDeviceTensorPropertiesARM                          : return "PhysicalDeviceTensorPropertiesARM";
-      case StructureType::eTensorFormatPropertiesARM                                  : return "TensorFormatPropertiesARM";
-      case StructureType::eTensorDescriptionARM                                       : return "TensorDescriptionARM";
-      case StructureType::eTensorMemoryRequirementsInfoARM                            : return "TensorMemoryRequirementsInfoARM";
-      case StructureType::eTensorMemoryBarrierARM                                     : return "TensorMemoryBarrierARM";
-      case StructureType::ePhysicalDeviceTensorFeaturesARM                            : return "PhysicalDeviceTensorFeaturesARM";
-      case StructureType::eDeviceTensorMemoryRequirementsARM                          : return "DeviceTensorMemoryRequirementsARM";
-      case StructureType::eCopyTensorInfoARM                                          : return "CopyTensorInfoARM";
-      case StructureType::eTensorCopyARM                                              : return "TensorCopyARM";
-      case StructureType::eTensorDependencyInfoARM                                    : return "TensorDependencyInfoARM";
-      case StructureType::eMemoryDedicatedAllocateInfoTensorARM                       : return "MemoryDedicatedAllocateInfoTensorARM";
-      case StructureType::ePhysicalDeviceExternalTensorInfoARM                        : return "PhysicalDeviceExternalTensorInfoARM";
-      case StructureType::eExternalTensorPropertiesARM                                : return "ExternalTensorPropertiesARM";
-      case StructureType::eExternalMemoryTensorCreateInfoARM                          : return "ExternalMemoryTensorCreateInfoARM";
-      case StructureType::ePhysicalDeviceDescriptorBufferTensorFeaturesARM            : return "PhysicalDeviceDescriptorBufferTensorFeaturesARM";
-      case StructureType::ePhysicalDeviceDescriptorBufferTensorPropertiesARM          : return "PhysicalDeviceDescriptorBufferTensorPropertiesARM";
-      case StructureType::eDescriptorGetTensorInfoARM                                 : return "DescriptorGetTensorInfoARM";
-      case StructureType::eTensorCaptureDescriptorDataInfoARM                         : return "TensorCaptureDescriptorDataInfoARM";
-      case StructureType::eTensorViewCaptureDescriptorDataInfoARM                     : return "TensorViewCaptureDescriptorDataInfoARM";
-      case StructureType::eFrameBoundaryTensorsARM                                    : return "FrameBoundaryTensorsARM";
-      case StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT            : return "PhysicalDeviceShaderModuleIdentifierFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT          : return "PhysicalDeviceShaderModuleIdentifierPropertiesEXT";
-      case StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT           : return "PipelineShaderStageModuleIdentifierCreateInfoEXT";
-      case StructureType::eShaderModuleIdentifierEXT                                  : return "ShaderModuleIdentifierEXT";
+      case StructureType::ePhysicalDeviceImageProcessingFeaturesQCOM: return "PhysicalDeviceImageProcessingFeaturesQCOM";
+      case StructureType::ePhysicalDeviceImageProcessingPropertiesQCOM: return "PhysicalDeviceImageProcessingPropertiesQCOM";
+      case StructureType::eImageViewSampleWeightCreateInfoQCOM: return "ImageViewSampleWeightCreateInfoQCOM";
+      case StructureType::ePhysicalDeviceNestedCommandBufferFeaturesEXT: return "PhysicalDeviceNestedCommandBufferFeaturesEXT";
+      case StructureType::ePhysicalDeviceNestedCommandBufferPropertiesEXT: return "PhysicalDeviceNestedCommandBufferPropertiesEXT";
+      case StructureType::eExternalMemoryAcquireUnmodifiedEXT: return "ExternalMemoryAcquireUnmodifiedEXT";
+      case StructureType::ePhysicalDeviceExtendedDynamicState3FeaturesEXT: return "PhysicalDeviceExtendedDynamicState3FeaturesEXT";
+      case StructureType::ePhysicalDeviceExtendedDynamicState3PropertiesEXT: return "PhysicalDeviceExtendedDynamicState3PropertiesEXT";
+      case StructureType::ePhysicalDeviceSubpassMergeFeedbackFeaturesEXT: return "PhysicalDeviceSubpassMergeFeedbackFeaturesEXT";
+      case StructureType::eRenderPassCreationControlEXT: return "RenderPassCreationControlEXT";
+      case StructureType::eRenderPassCreationFeedbackCreateInfoEXT: return "RenderPassCreationFeedbackCreateInfoEXT";
+      case StructureType::eRenderPassSubpassFeedbackCreateInfoEXT: return "RenderPassSubpassFeedbackCreateInfoEXT";
+      case StructureType::eDirectDriverLoadingInfoLUNARG: return "DirectDriverLoadingInfoLUNARG";
+      case StructureType::eDirectDriverLoadingListLUNARG: return "DirectDriverLoadingListLUNARG";
+      case StructureType::ePhysicalDeviceShaderModuleIdentifierFeaturesEXT: return "PhysicalDeviceShaderModuleIdentifierFeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderModuleIdentifierPropertiesEXT: return "PhysicalDeviceShaderModuleIdentifierPropertiesEXT";
+      case StructureType::ePipelineShaderStageModuleIdentifierCreateInfoEXT: return "PipelineShaderStageModuleIdentifierCreateInfoEXT";
+      case StructureType::eShaderModuleIdentifierEXT: return "ShaderModuleIdentifierEXT";
       case StructureType::ePhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT: return "PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT";
-      case StructureType::ePhysicalDeviceOpticalFlowFeaturesNV                        : return "PhysicalDeviceOpticalFlowFeaturesNV";
-      case StructureType::ePhysicalDeviceOpticalFlowPropertiesNV                      : return "PhysicalDeviceOpticalFlowPropertiesNV";
-      case StructureType::eOpticalFlowImageFormatInfoNV                               : return "OpticalFlowImageFormatInfoNV";
-      case StructureType::eOpticalFlowImageFormatPropertiesNV                         : return "OpticalFlowImageFormatPropertiesNV";
-      case StructureType::eOpticalFlowSessionCreateInfoNV                             : return "OpticalFlowSessionCreateInfoNV";
-      case StructureType::eOpticalFlowExecuteInfoNV                                   : return "OpticalFlowExecuteInfoNV";
-      case StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV                  : return "OpticalFlowSessionCreatePrivateDataInfoNV";
-      case StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT                   : return "PhysicalDeviceLegacyDitheringFeaturesEXT";
+      case StructureType::ePhysicalDeviceOpticalFlowFeaturesNV: return "PhysicalDeviceOpticalFlowFeaturesNV";
+      case StructureType::ePhysicalDeviceOpticalFlowPropertiesNV: return "PhysicalDeviceOpticalFlowPropertiesNV";
+      case StructureType::eOpticalFlowImageFormatInfoNV: return "OpticalFlowImageFormatInfoNV";
+      case StructureType::eOpticalFlowImageFormatPropertiesNV: return "OpticalFlowImageFormatPropertiesNV";
+      case StructureType::eOpticalFlowSessionCreateInfoNV: return "OpticalFlowSessionCreateInfoNV";
+      case StructureType::eOpticalFlowExecuteInfoNV: return "OpticalFlowExecuteInfoNV";
+      case StructureType::eOpticalFlowSessionCreatePrivateDataInfoNV: return "OpticalFlowSessionCreatePrivateDataInfoNV";
+      case StructureType::ePhysicalDeviceLegacyDitheringFeaturesEXT: return "PhysicalDeviceLegacyDitheringFeaturesEXT";
+      case StructureType::ePhysicalDevicePipelineProtectedAccessFeaturesEXT: return "PhysicalDevicePipelineProtectedAccessFeaturesEXT";
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      case StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID  : return "PhysicalDeviceExternalFormatResolveFeaturesANDROID";
+      case StructureType::ePhysicalDeviceExternalFormatResolveFeaturesANDROID: return "PhysicalDeviceExternalFormatResolveFeaturesANDROID";
       case StructureType::ePhysicalDeviceExternalFormatResolvePropertiesANDROID: return "PhysicalDeviceExternalFormatResolvePropertiesANDROID";
-      case StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID : return "AndroidHardwareBufferFormatResolvePropertiesANDROID";
+      case StructureType::eAndroidHardwareBufferFormatResolvePropertiesANDROID: return "AndroidHardwareBufferFormatResolvePropertiesANDROID";
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-      case StructureType::ePhysicalDeviceAntiLagFeaturesAMD: return "PhysicalDeviceAntiLagFeaturesAMD";
-      case StructureType::eAntiLagDataAMD                  : return "AntiLagDataAMD";
-      case StructureType::eAntiLagPresentationInfoAMD      : return "AntiLagPresentationInfoAMD";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::ePhysicalDeviceDenseGeometryFormatFeaturesAMDX            : return "PhysicalDeviceDenseGeometryFormatFeaturesAMDX";
-      case StructureType::eAccelerationStructureDenseGeometryFormatTrianglesDataAMDX: return "AccelerationStructureDenseGeometryFormatTrianglesDataAMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::eSurfaceCapabilitiesPresentId2KHR                            : return "SurfaceCapabilitiesPresentId2KHR";
-      case StructureType::ePresentId2KHR                                               : return "PresentId2KHR";
-      case StructureType::ePhysicalDevicePresentId2FeaturesKHR                         : return "PhysicalDevicePresentId2FeaturesKHR";
-      case StructureType::eSurfaceCapabilitiesPresentWait2KHR                          : return "SurfaceCapabilitiesPresentWait2KHR";
-      case StructureType::ePhysicalDevicePresentWait2FeaturesKHR                       : return "PhysicalDevicePresentWait2FeaturesKHR";
-      case StructureType::ePresentWait2InfoKHR                                         : return "PresentWait2InfoKHR";
-      case StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR            : return "PhysicalDeviceRayTracingPositionFetchFeaturesKHR";
-      case StructureType::ePhysicalDeviceShaderObjectFeaturesEXT                       : return "PhysicalDeviceShaderObjectFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderObjectPropertiesEXT                     : return "PhysicalDeviceShaderObjectPropertiesEXT";
-      case StructureType::eShaderCreateInfoEXT                                         : return "ShaderCreateInfoEXT";
-      case StructureType::ePhysicalDevicePipelineBinaryFeaturesKHR                     : return "PhysicalDevicePipelineBinaryFeaturesKHR";
-      case StructureType::ePipelineBinaryCreateInfoKHR                                 : return "PipelineBinaryCreateInfoKHR";
-      case StructureType::ePipelineBinaryInfoKHR                                       : return "PipelineBinaryInfoKHR";
-      case StructureType::ePipelineBinaryKeyKHR                                        : return "PipelineBinaryKeyKHR";
-      case StructureType::ePhysicalDevicePipelineBinaryPropertiesKHR                   : return "PhysicalDevicePipelineBinaryPropertiesKHR";
-      case StructureType::eReleaseCapturedPipelineDataInfoKHR                          : return "ReleaseCapturedPipelineDataInfoKHR";
-      case StructureType::ePipelineBinaryDataInfoKHR                                   : return "PipelineBinaryDataInfoKHR";
-      case StructureType::ePipelineCreateInfoKHR                                       : return "PipelineCreateInfoKHR";
-      case StructureType::eDevicePipelineBinaryInternalCacheControlKHR                 : return "DevicePipelineBinaryInternalCacheControlKHR";
-      case StructureType::ePipelineBinaryHandlesInfoKHR                                : return "PipelineBinaryHandlesInfoKHR";
-      case StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM                    : return "PhysicalDeviceTilePropertiesFeaturesQCOM";
-      case StructureType::eTilePropertiesQCOM                                          : return "TilePropertiesQCOM";
-      case StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC                     : return "PhysicalDeviceAmigoProfilingFeaturesSEC";
-      case StructureType::eAmigoProfilingSubmitInfoSEC                                 : return "AmigoProfilingSubmitInfoSEC";
-      case StructureType::eSurfacePresentModeKHR                                       : return "SurfacePresentModeKHR";
-      case StructureType::eSurfacePresentScalingCapabilitiesKHR                        : return "SurfacePresentScalingCapabilitiesKHR";
-      case StructureType::eSurfacePresentModeCompatibilityKHR                          : return "SurfacePresentModeCompatibilityKHR";
-      case StructureType::ePhysicalDeviceSwapchainMaintenance1FeaturesKHR              : return "PhysicalDeviceSwapchainMaintenance1FeaturesKHR";
-      case StructureType::eSwapchainPresentFenceInfoKHR                                : return "SwapchainPresentFenceInfoKHR";
-      case StructureType::eSwapchainPresentModesCreateInfoKHR                          : return "SwapchainPresentModesCreateInfoKHR";
-      case StructureType::eSwapchainPresentModeInfoKHR                                 : return "SwapchainPresentModeInfoKHR";
-      case StructureType::eSwapchainPresentScalingCreateInfoKHR                        : return "SwapchainPresentScalingCreateInfoKHR";
-      case StructureType::eReleaseSwapchainImagesInfoKHR                               : return "ReleaseSwapchainImagesInfoKHR";
-      case StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM         : return "PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM";
-      case StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV         : return "PhysicalDeviceRayTracingInvocationReorderFeaturesNV";
-      case StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV       : return "PhysicalDeviceRayTracingInvocationReorderPropertiesNV";
-      case StructureType::ePhysicalDeviceCooperativeVectorFeaturesNV                   : return "PhysicalDeviceCooperativeVectorFeaturesNV";
-      case StructureType::ePhysicalDeviceCooperativeVectorPropertiesNV                 : return "PhysicalDeviceCooperativeVectorPropertiesNV";
-      case StructureType::eCooperativeVectorPropertiesNV                               : return "CooperativeVectorPropertiesNV";
-      case StructureType::eConvertCooperativeVectorMatrixInfoNV                        : return "ConvertCooperativeVectorMatrixInfoNV";
-      case StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV          : return "PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV";
-      case StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV        : return "PhysicalDeviceExtendedSparseAddressSpacePropertiesNV";
-      case StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT              : return "PhysicalDeviceMutableDescriptorTypeFeaturesEXT";
-      case StructureType::eMutableDescriptorTypeCreateInfoEXT                          : return "MutableDescriptorTypeCreateInfoEXT";
-      case StructureType::ePhysicalDeviceLegacyVertexAttributesFeaturesEXT             : return "PhysicalDeviceLegacyVertexAttributesFeaturesEXT";
-      case StructureType::ePhysicalDeviceLegacyVertexAttributesPropertiesEXT           : return "PhysicalDeviceLegacyVertexAttributesPropertiesEXT";
-      case StructureType::eLayerSettingsCreateInfoEXT                                  : return "LayerSettingsCreateInfoEXT";
-      case StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM                 : return "PhysicalDeviceShaderCoreBuiltinsFeaturesARM";
-      case StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM               : return "PhysicalDeviceShaderCoreBuiltinsPropertiesARM";
-      case StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT        : return "PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT";
-      case StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT  : return "PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT";
-      case StructureType::eLatencySleepModeInfoNV                                      : return "LatencySleepModeInfoNV";
-      case StructureType::eLatencySleepInfoNV                                          : return "LatencySleepInfoNV";
-      case StructureType::eSetLatencyMarkerInfoNV                                      : return "SetLatencyMarkerInfoNV";
-      case StructureType::eGetLatencyMarkerInfoNV                                      : return "GetLatencyMarkerInfoNV";
-      case StructureType::eLatencyTimingsFrameReportNV                                 : return "LatencyTimingsFrameReportNV";
-      case StructureType::eLatencySubmissionPresentIdNV                                : return "LatencySubmissionPresentIdNV";
-      case StructureType::eOutOfBandQueueTypeInfoNV                                    : return "OutOfBandQueueTypeInfoNV";
-      case StructureType::eSwapchainLatencyCreateInfoNV                                : return "SwapchainLatencyCreateInfoNV";
-      case StructureType::eLatencySurfaceCapabilitiesNV                                : return "LatencySurfaceCapabilitiesNV";
-      case StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR                  : return "PhysicalDeviceCooperativeMatrixFeaturesKHR";
-      case StructureType::eCooperativeMatrixPropertiesKHR                              : return "CooperativeMatrixPropertiesKHR";
-      case StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR                : return "PhysicalDeviceCooperativeMatrixPropertiesKHR";
-      case StructureType::eDataGraphPipelineCreateInfoARM                              : return "DataGraphPipelineCreateInfoARM";
-      case StructureType::eDataGraphPipelineSessionCreateInfoARM                       : return "DataGraphPipelineSessionCreateInfoARM";
-      case StructureType::eDataGraphPipelineResourceInfoARM                            : return "DataGraphPipelineResourceInfoARM";
-      case StructureType::eDataGraphPipelineConstantARM                                : return "DataGraphPipelineConstantARM";
-      case StructureType::eDataGraphPipelineSessionMemoryRequirementsInfoARM           : return "DataGraphPipelineSessionMemoryRequirementsInfoARM";
-      case StructureType::eBindDataGraphPipelineSessionMemoryInfoARM                   : return "BindDataGraphPipelineSessionMemoryInfoARM";
-      case StructureType::ePhysicalDeviceDataGraphFeaturesARM                          : return "PhysicalDeviceDataGraphFeaturesARM";
-      case StructureType::eDataGraphPipelineShaderModuleCreateInfoARM                  : return "DataGraphPipelineShaderModuleCreateInfoARM";
-      case StructureType::eDataGraphPipelinePropertyQueryResultARM                     : return "DataGraphPipelinePropertyQueryResultARM";
-      case StructureType::eDataGraphPipelineInfoARM                                    : return "DataGraphPipelineInfoARM";
-      case StructureType::eDataGraphPipelineCompilerControlCreateInfoARM               : return "DataGraphPipelineCompilerControlCreateInfoARM";
-      case StructureType::eDataGraphPipelineSessionBindPointRequirementsInfoARM        : return "DataGraphPipelineSessionBindPointRequirementsInfoARM";
-      case StructureType::eDataGraphPipelineSessionBindPointRequirementARM             : return "DataGraphPipelineSessionBindPointRequirementARM";
-      case StructureType::eDataGraphPipelineIdentifierCreateInfoARM                    : return "DataGraphPipelineIdentifierCreateInfoARM";
-      case StructureType::eDataGraphPipelineDispatchInfoARM                            : return "DataGraphPipelineDispatchInfoARM";
-      case StructureType::eDataGraphProcessingEngineCreateInfoARM                      : return "DataGraphProcessingEngineCreateInfoARM";
-      case StructureType::eQueueFamilyDataGraphProcessingEnginePropertiesARM           : return "QueueFamilyDataGraphProcessingEnginePropertiesARM";
-      case StructureType::eQueueFamilyDataGraphPropertiesARM                           : return "QueueFamilyDataGraphPropertiesARM";
-      case StructureType::ePhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM   : return "PhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM";
-      case StructureType::eDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM: return "DataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM";
-      case StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM       : return "PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM";
-      case StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM          : return "MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM";
-      case StructureType::ePhysicalDeviceComputeShaderDerivativesFeaturesKHR           : return "PhysicalDeviceComputeShaderDerivativesFeaturesKHR";
-      case StructureType::ePhysicalDeviceComputeShaderDerivativesPropertiesKHR         : return "PhysicalDeviceComputeShaderDerivativesPropertiesKHR";
-      case StructureType::eVideoDecodeAv1CapabilitiesKHR                               : return "VideoDecodeAv1CapabilitiesKHR";
-      case StructureType::eVideoDecodeAv1PictureInfoKHR                                : return "VideoDecodeAv1PictureInfoKHR";
-      case StructureType::eVideoDecodeAv1ProfileInfoKHR                                : return "VideoDecodeAv1ProfileInfoKHR";
-      case StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR                : return "VideoDecodeAv1SessionParametersCreateInfoKHR";
-      case StructureType::eVideoDecodeAv1DpbSlotInfoKHR                                : return "VideoDecodeAv1DpbSlotInfoKHR";
-      case StructureType::eVideoEncodeAv1CapabilitiesKHR                               : return "VideoEncodeAv1CapabilitiesKHR";
-      case StructureType::eVideoEncodeAv1SessionParametersCreateInfoKHR                : return "VideoEncodeAv1SessionParametersCreateInfoKHR";
-      case StructureType::eVideoEncodeAv1PictureInfoKHR                                : return "VideoEncodeAv1PictureInfoKHR";
-      case StructureType::eVideoEncodeAv1DpbSlotInfoKHR                                : return "VideoEncodeAv1DpbSlotInfoKHR";
-      case StructureType::ePhysicalDeviceVideoEncodeAv1FeaturesKHR                     : return "PhysicalDeviceVideoEncodeAv1FeaturesKHR";
-      case StructureType::eVideoEncodeAv1ProfileInfoKHR                                : return "VideoEncodeAv1ProfileInfoKHR";
-      case StructureType::eVideoEncodeAv1RateControlInfoKHR                            : return "VideoEncodeAv1RateControlInfoKHR";
-      case StructureType::eVideoEncodeAv1RateControlLayerInfoKHR                       : return "VideoEncodeAv1RateControlLayerInfoKHR";
-      case StructureType::eVideoEncodeAv1QualityLevelPropertiesKHR                     : return "VideoEncodeAv1QualityLevelPropertiesKHR";
-      case StructureType::eVideoEncodeAv1SessionCreateInfoKHR                          : return "VideoEncodeAv1SessionCreateInfoKHR";
-      case StructureType::eVideoEncodeAv1GopRemainingFrameInfoKHR                      : return "VideoEncodeAv1GopRemainingFrameInfoKHR";
-      case StructureType::ePhysicalDeviceVideoDecodeVp9FeaturesKHR                     : return "PhysicalDeviceVideoDecodeVp9FeaturesKHR";
-      case StructureType::eVideoDecodeVp9CapabilitiesKHR                               : return "VideoDecodeVp9CapabilitiesKHR";
-      case StructureType::eVideoDecodeVp9PictureInfoKHR                                : return "VideoDecodeVp9PictureInfoKHR";
-      case StructureType::eVideoDecodeVp9ProfileInfoKHR                                : return "VideoDecodeVp9ProfileInfoKHR";
-      case StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR                  : return "PhysicalDeviceVideoMaintenance1FeaturesKHR";
-      case StructureType::eVideoInlineQueryInfoKHR                                     : return "VideoInlineQueryInfoKHR";
-      case StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV               : return "PhysicalDevicePerStageDescriptorSetFeaturesNV";
-      case StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM                  : return "PhysicalDeviceImageProcessing2FeaturesQCOM";
-      case StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM                : return "PhysicalDeviceImageProcessing2PropertiesQCOM";
-      case StructureType::eSamplerBlockMatchWindowCreateInfoQCOM                       : return "SamplerBlockMatchWindowCreateInfoQCOM";
-      case StructureType::eSamplerCubicWeightsCreateInfoQCOM                           : return "SamplerCubicWeightsCreateInfoQCOM";
-      case StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM                      : return "PhysicalDeviceCubicWeightsFeaturesQCOM";
-      case StructureType::eBlitImageCubicWeightsInfoQCOM                               : return "BlitImageCubicWeightsInfoQCOM";
-      case StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM                      : return "PhysicalDeviceYcbcrDegammaFeaturesQCOM";
-      case StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM            : return "SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM";
-      case StructureType::ePhysicalDeviceCubicClampFeaturesQCOM                        : return "PhysicalDeviceCubicClampFeaturesQCOM";
-      case StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT : return "PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT";
-      case StructureType::ePhysicalDeviceUnifiedImageLayoutsFeaturesKHR                : return "PhysicalDeviceUnifiedImageLayoutsFeaturesKHR";
-      case StructureType::eAttachmentFeedbackLoopInfoEXT                               : return "AttachmentFeedbackLoopInfoEXT";
+      case StructureType::ePhysicalDeviceMaintenance5FeaturesKHR: return "PhysicalDeviceMaintenance5FeaturesKHR";
+      case StructureType::ePhysicalDeviceMaintenance5PropertiesKHR: return "PhysicalDeviceMaintenance5PropertiesKHR";
+      case StructureType::eRenderingAreaInfoKHR: return "RenderingAreaInfoKHR";
+      case StructureType::eDeviceImageSubresourceInfoKHR: return "DeviceImageSubresourceInfoKHR";
+      case StructureType::eSubresourceLayout2KHR: return "SubresourceLayout2KHR";
+      case StructureType::eImageSubresource2KHR: return "ImageSubresource2KHR";
+      case StructureType::ePipelineCreateFlags2CreateInfoKHR: return "PipelineCreateFlags2CreateInfoKHR";
+      case StructureType::eBufferUsageFlags2CreateInfoKHR: return "BufferUsageFlags2CreateInfoKHR";
+      case StructureType::ePhysicalDeviceRayTracingPositionFetchFeaturesKHR: return "PhysicalDeviceRayTracingPositionFetchFeaturesKHR";
+      case StructureType::ePhysicalDeviceShaderObjectFeaturesEXT: return "PhysicalDeviceShaderObjectFeaturesEXT";
+      case StructureType::ePhysicalDeviceShaderObjectPropertiesEXT: return "PhysicalDeviceShaderObjectPropertiesEXT";
+      case StructureType::eShaderCreateInfoEXT: return "ShaderCreateInfoEXT";
+      case StructureType::ePhysicalDeviceTilePropertiesFeaturesQCOM: return "PhysicalDeviceTilePropertiesFeaturesQCOM";
+      case StructureType::eTilePropertiesQCOM: return "TilePropertiesQCOM";
+      case StructureType::ePhysicalDeviceAmigoProfilingFeaturesSEC: return "PhysicalDeviceAmigoProfilingFeaturesSEC";
+      case StructureType::eAmigoProfilingSubmitInfoSEC: return "AmigoProfilingSubmitInfoSEC";
+      case StructureType::ePhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM: return "PhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM";
+      case StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesNV: return "PhysicalDeviceRayTracingInvocationReorderFeaturesNV";
+      case StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesNV: return "PhysicalDeviceRayTracingInvocationReorderPropertiesNV";
+      case StructureType::ePhysicalDeviceExtendedSparseAddressSpaceFeaturesNV: return "PhysicalDeviceExtendedSparseAddressSpaceFeaturesNV";
+      case StructureType::ePhysicalDeviceExtendedSparseAddressSpacePropertiesNV: return "PhysicalDeviceExtendedSparseAddressSpacePropertiesNV";
+      case StructureType::ePhysicalDeviceMutableDescriptorTypeFeaturesEXT: return "PhysicalDeviceMutableDescriptorTypeFeaturesEXT";
+      case StructureType::eMutableDescriptorTypeCreateInfoEXT: return "MutableDescriptorTypeCreateInfoEXT";
+      case StructureType::eLayerSettingsCreateInfoEXT: return "LayerSettingsCreateInfoEXT";
+      case StructureType::ePhysicalDeviceShaderCoreBuiltinsFeaturesARM: return "PhysicalDeviceShaderCoreBuiltinsFeaturesARM";
+      case StructureType::ePhysicalDeviceShaderCoreBuiltinsPropertiesARM: return "PhysicalDeviceShaderCoreBuiltinsPropertiesARM";
+      case StructureType::ePhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT: return "PhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT";
+      case StructureType::ePhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT: return "PhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT";
+      case StructureType::eLatencySleepModeInfoNV: return "LatencySleepModeInfoNV";
+      case StructureType::eLatencySleepInfoNV: return "LatencySleepInfoNV";
+      case StructureType::eSetLatencyMarkerInfoNV: return "SetLatencyMarkerInfoNV";
+      case StructureType::eGetLatencyMarkerInfoNV: return "GetLatencyMarkerInfoNV";
+      case StructureType::eLatencyTimingsFrameReportNV: return "LatencyTimingsFrameReportNV";
+      case StructureType::eLatencySubmissionPresentIdNV: return "LatencySubmissionPresentIdNV";
+      case StructureType::eOutOfBandQueueTypeInfoNV: return "OutOfBandQueueTypeInfoNV";
+      case StructureType::eSwapchainLatencyCreateInfoNV: return "SwapchainLatencyCreateInfoNV";
+      case StructureType::eLatencySurfaceCapabilitiesNV: return "LatencySurfaceCapabilitiesNV";
+      case StructureType::ePhysicalDeviceCooperativeMatrixFeaturesKHR: return "PhysicalDeviceCooperativeMatrixFeaturesKHR";
+      case StructureType::eCooperativeMatrixPropertiesKHR: return "CooperativeMatrixPropertiesKHR";
+      case StructureType::ePhysicalDeviceCooperativeMatrixPropertiesKHR: return "PhysicalDeviceCooperativeMatrixPropertiesKHR";
+      case StructureType::ePhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM: return "PhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM";
+      case StructureType::eMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM: return "MultiviewPerViewRenderAreasRenderPassBeginInfoQCOM";
+      case StructureType::eVideoDecodeAv1CapabilitiesKHR: return "VideoDecodeAv1CapabilitiesKHR";
+      case StructureType::eVideoDecodeAv1PictureInfoKHR: return "VideoDecodeAv1PictureInfoKHR";
+      case StructureType::eVideoDecodeAv1ProfileInfoKHR: return "VideoDecodeAv1ProfileInfoKHR";
+      case StructureType::eVideoDecodeAv1SessionParametersCreateInfoKHR: return "VideoDecodeAv1SessionParametersCreateInfoKHR";
+      case StructureType::eVideoDecodeAv1DpbSlotInfoKHR: return "VideoDecodeAv1DpbSlotInfoKHR";
+      case StructureType::ePhysicalDeviceVideoMaintenance1FeaturesKHR: return "PhysicalDeviceVideoMaintenance1FeaturesKHR";
+      case StructureType::eVideoInlineQueryInfoKHR: return "VideoInlineQueryInfoKHR";
+      case StructureType::ePhysicalDevicePerStageDescriptorSetFeaturesNV: return "PhysicalDevicePerStageDescriptorSetFeaturesNV";
+      case StructureType::ePhysicalDeviceImageProcessing2FeaturesQCOM: return "PhysicalDeviceImageProcessing2FeaturesQCOM";
+      case StructureType::ePhysicalDeviceImageProcessing2PropertiesQCOM: return "PhysicalDeviceImageProcessing2PropertiesQCOM";
+      case StructureType::eSamplerBlockMatchWindowCreateInfoQCOM: return "SamplerBlockMatchWindowCreateInfoQCOM";
+      case StructureType::eSamplerCubicWeightsCreateInfoQCOM: return "SamplerCubicWeightsCreateInfoQCOM";
+      case StructureType::ePhysicalDeviceCubicWeightsFeaturesQCOM: return "PhysicalDeviceCubicWeightsFeaturesQCOM";
+      case StructureType::eBlitImageCubicWeightsInfoQCOM: return "BlitImageCubicWeightsInfoQCOM";
+      case StructureType::ePhysicalDeviceYcbcrDegammaFeaturesQCOM: return "PhysicalDeviceYcbcrDegammaFeaturesQCOM";
+      case StructureType::eSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM: return "SamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM";
+      case StructureType::ePhysicalDeviceCubicClampFeaturesQCOM: return "PhysicalDeviceCubicClampFeaturesQCOM";
+      case StructureType::ePhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT: return "PhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT";
+      case StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesKHR: return "PhysicalDeviceVertexAttributeDivisorPropertiesKHR";
+      case StructureType::ePipelineVertexInputDivisorStateCreateInfoKHR: return "PipelineVertexInputDivisorStateCreateInfoKHR";
+      case StructureType::ePhysicalDeviceVertexAttributeDivisorFeaturesKHR: return "PhysicalDeviceVertexAttributeDivisorFeaturesKHR";
+      case StructureType::ePhysicalDeviceShaderFloatControls2FeaturesKHR: return "PhysicalDeviceShaderFloatControls2FeaturesKHR";
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      case StructureType::eScreenBufferPropertiesQNX                          : return "ScreenBufferPropertiesQNX";
-      case StructureType::eScreenBufferFormatPropertiesQNX                    : return "ScreenBufferFormatPropertiesQNX";
-      case StructureType::eImportScreenBufferInfoQNX                          : return "ImportScreenBufferInfoQNX";
-      case StructureType::eExternalFormatQNX                                  : return "ExternalFormatQNX";
+      case StructureType::eScreenBufferPropertiesQNX: return "ScreenBufferPropertiesQNX";
+      case StructureType::eScreenBufferFormatPropertiesQNX: return "ScreenBufferFormatPropertiesQNX";
+      case StructureType::eImportScreenBufferInfoQNX: return "ImportScreenBufferInfoQNX";
+      case StructureType::eExternalFormatQNX: return "ExternalFormatQNX";
       case StructureType::ePhysicalDeviceExternalMemoryScreenBufferFeaturesQNX: return "PhysicalDeviceExternalMemoryScreenBufferFeaturesQNX";
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-      case StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT                 : return "PhysicalDeviceLayeredDriverPropertiesMSFT";
-      case StructureType::eCalibratedTimestampInfoKHR                                : return "CalibratedTimestampInfoKHR";
-      case StructureType::eSetDescriptorBufferOffsetsInfoEXT                         : return "SetDescriptorBufferOffsetsInfoEXT";
-      case StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT               : return "BindDescriptorBufferEmbeddedSamplersInfoEXT";
-      case StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV      : return "PhysicalDeviceDescriptorPoolOverallocationFeaturesNV";
-      case StructureType::ePhysicalDeviceTileMemoryHeapFeaturesQCOM                  : return "PhysicalDeviceTileMemoryHeapFeaturesQCOM";
-      case StructureType::ePhysicalDeviceTileMemoryHeapPropertiesQCOM                : return "PhysicalDeviceTileMemoryHeapPropertiesQCOM";
-      case StructureType::eTileMemoryRequirementsQCOM                                : return "TileMemoryRequirementsQCOM";
-      case StructureType::eTileMemoryBindInfoQCOM                                    : return "TileMemoryBindInfoQCOM";
-      case StructureType::eTileMemorySizeInfoQCOM                                    : return "TileMemorySizeInfoQCOM";
-      case StructureType::ePhysicalDeviceCopyMemoryIndirectFeaturesKHR               : return "PhysicalDeviceCopyMemoryIndirectFeaturesKHR";
-      case StructureType::ePhysicalDeviceCopyMemoryIndirectPropertiesKHR             : return "PhysicalDeviceCopyMemoryIndirectPropertiesKHR";
-      case StructureType::eCopyMemoryIndirectInfoKHR                                 : return "CopyMemoryIndirectInfoKHR";
-      case StructureType::eCopyMemoryToImageIndirectInfoKHR                          : return "CopyMemoryToImageIndirectInfoKHR";
-      case StructureType::ePhysicalDeviceMemoryDecompressionFeaturesEXT              : return "PhysicalDeviceMemoryDecompressionFeaturesEXT";
-      case StructureType::ePhysicalDeviceMemoryDecompressionPropertiesEXT            : return "PhysicalDeviceMemoryDecompressionPropertiesEXT";
-      case StructureType::eDecompressMemoryInfoEXT                                   : return "DecompressMemoryInfoEXT";
-      case StructureType::eDisplaySurfaceStereoCreateInfoNV                          : return "DisplaySurfaceStereoCreateInfoNV";
-      case StructureType::eDisplayModeStereoPropertiesNV                             : return "DisplayModeStereoPropertiesNV";
-      case StructureType::eVideoEncodeIntraRefreshCapabilitiesKHR                    : return "VideoEncodeIntraRefreshCapabilitiesKHR";
-      case StructureType::eVideoEncodeSessionIntraRefreshCreateInfoKHR               : return "VideoEncodeSessionIntraRefreshCreateInfoKHR";
-      case StructureType::eVideoEncodeIntraRefreshInfoKHR                            : return "VideoEncodeIntraRefreshInfoKHR";
-      case StructureType::eVideoReferenceIntraRefreshInfoKHR                         : return "VideoReferenceIntraRefreshInfoKHR";
-      case StructureType::ePhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR          : return "PhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR";
-      case StructureType::eVideoEncodeQuantizationMapCapabilitiesKHR                 : return "VideoEncodeQuantizationMapCapabilitiesKHR";
-      case StructureType::eVideoFormatQuantizationMapPropertiesKHR                   : return "VideoFormatQuantizationMapPropertiesKHR";
-      case StructureType::eVideoEncodeQuantizationMapInfoKHR                         : return "VideoEncodeQuantizationMapInfoKHR";
-      case StructureType::eVideoEncodeQuantizationMapSessionParametersCreateInfoKHR  : return "VideoEncodeQuantizationMapSessionParametersCreateInfoKHR";
-      case StructureType::ePhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR       : return "PhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR";
-      case StructureType::eVideoEncodeH264QuantizationMapCapabilitiesKHR             : return "VideoEncodeH264QuantizationMapCapabilitiesKHR";
-      case StructureType::eVideoEncodeH265QuantizationMapCapabilitiesKHR             : return "VideoEncodeH265QuantizationMapCapabilitiesKHR";
-      case StructureType::eVideoFormatH265QuantizationMapPropertiesKHR               : return "VideoFormatH265QuantizationMapPropertiesKHR";
-      case StructureType::eVideoEncodeAv1QuantizationMapCapabilitiesKHR              : return "VideoEncodeAv1QuantizationMapCapabilitiesKHR";
-      case StructureType::eVideoFormatAv1QuantizationMapPropertiesKHR                : return "VideoFormatAv1QuantizationMapPropertiesKHR";
-      case StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV                   : return "PhysicalDeviceRawAccessChainsFeaturesNV";
-      case StructureType::eExternalComputeQueueDeviceCreateInfoNV                    : return "ExternalComputeQueueDeviceCreateInfoNV";
-      case StructureType::eExternalComputeQueueCreateInfoNV                          : return "ExternalComputeQueueCreateInfoNV";
-      case StructureType::eExternalComputeQueueDataParamsNV                          : return "ExternalComputeQueueDataParamsNV";
-      case StructureType::ePhysicalDeviceExternalComputeQueuePropertiesNV            : return "PhysicalDeviceExternalComputeQueuePropertiesNV";
-      case StructureType::ePhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR : return "PhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR";
-      case StructureType::ePhysicalDeviceCommandBufferInheritanceFeaturesNV          : return "PhysicalDeviceCommandBufferInheritanceFeaturesNV";
-      case StructureType::ePhysicalDeviceMaintenance7FeaturesKHR                     : return "PhysicalDeviceMaintenance7FeaturesKHR";
-      case StructureType::ePhysicalDeviceMaintenance7PropertiesKHR                   : return "PhysicalDeviceMaintenance7PropertiesKHR";
-      case StructureType::ePhysicalDeviceLayeredApiPropertiesListKHR                 : return "PhysicalDeviceLayeredApiPropertiesListKHR";
-      case StructureType::ePhysicalDeviceLayeredApiPropertiesKHR                     : return "PhysicalDeviceLayeredApiPropertiesKHR";
-      case StructureType::ePhysicalDeviceLayeredApiVulkanPropertiesKHR               : return "PhysicalDeviceLayeredApiVulkanPropertiesKHR";
-      case StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV         : return "PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV";
-      case StructureType::ePhysicalDeviceShaderReplicatedCompositesFeaturesEXT       : return "PhysicalDeviceShaderReplicatedCompositesFeaturesEXT";
-      case StructureType::ePhysicalDeviceShaderFloat8FeaturesEXT                     : return "PhysicalDeviceShaderFloat8FeaturesEXT";
-      case StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV              : return "PhysicalDeviceRayTracingValidationFeaturesNV";
-      case StructureType::ePhysicalDeviceClusterAccelerationStructureFeaturesNV      : return "PhysicalDeviceClusterAccelerationStructureFeaturesNV";
-      case StructureType::ePhysicalDeviceClusterAccelerationStructurePropertiesNV    : return "PhysicalDeviceClusterAccelerationStructurePropertiesNV";
-      case StructureType::eClusterAccelerationStructureClustersBottomLevelInputNV    : return "ClusterAccelerationStructureClustersBottomLevelInputNV";
-      case StructureType::eClusterAccelerationStructureTriangleClusterInputNV        : return "ClusterAccelerationStructureTriangleClusterInputNV";
-      case StructureType::eClusterAccelerationStructureMoveObjectsInputNV            : return "ClusterAccelerationStructureMoveObjectsInputNV";
-      case StructureType::eClusterAccelerationStructureInputInfoNV                   : return "ClusterAccelerationStructureInputInfoNV";
-      case StructureType::eClusterAccelerationStructureCommandsInfoNV                : return "ClusterAccelerationStructureCommandsInfoNV";
-      case StructureType::eRayTracingPipelineClusterAccelerationStructureCreateInfoNV: return "RayTracingPipelineClusterAccelerationStructureCreateInfoNV";
-      case StructureType::ePhysicalDevicePartitionedAccelerationStructureFeaturesNV  : return "PhysicalDevicePartitionedAccelerationStructureFeaturesNV";
-      case StructureType::ePhysicalDevicePartitionedAccelerationStructurePropertiesNV: return "PhysicalDevicePartitionedAccelerationStructurePropertiesNV";
-      case StructureType::eWriteDescriptorSetPartitionedAccelerationStructureNV      : return "WriteDescriptorSetPartitionedAccelerationStructureNV";
-      case StructureType::ePartitionedAccelerationStructureInstancesInputNV          : return "PartitionedAccelerationStructureInstancesInputNV";
-      case StructureType::eBuildPartitionedAccelerationStructureInfoNV               : return "BuildPartitionedAccelerationStructureInfoNV";
-      case StructureType::ePartitionedAccelerationStructureFlagsNV                   : return "PartitionedAccelerationStructureFlagsNV";
-      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsFeaturesEXT          : return "PhysicalDeviceDeviceGeneratedCommandsFeaturesEXT";
-      case StructureType::ePhysicalDeviceDeviceGeneratedCommandsPropertiesEXT        : return "PhysicalDeviceDeviceGeneratedCommandsPropertiesEXT";
-      case StructureType::eGeneratedCommandsMemoryRequirementsInfoEXT                : return "GeneratedCommandsMemoryRequirementsInfoEXT";
-      case StructureType::eIndirectExecutionSetCreateInfoEXT                         : return "IndirectExecutionSetCreateInfoEXT";
-      case StructureType::eGeneratedCommandsInfoEXT                                  : return "GeneratedCommandsInfoEXT";
-      case StructureType::eIndirectCommandsLayoutCreateInfoEXT                       : return "IndirectCommandsLayoutCreateInfoEXT";
-      case StructureType::eIndirectCommandsLayoutTokenEXT                            : return "IndirectCommandsLayoutTokenEXT";
-      case StructureType::eWriteIndirectExecutionSetPipelineEXT                      : return "WriteIndirectExecutionSetPipelineEXT";
-      case StructureType::eWriteIndirectExecutionSetShaderEXT                        : return "WriteIndirectExecutionSetShaderEXT";
-      case StructureType::eIndirectExecutionSetPipelineInfoEXT                       : return "IndirectExecutionSetPipelineInfoEXT";
-      case StructureType::eIndirectExecutionSetShaderInfoEXT                         : return "IndirectExecutionSetShaderInfoEXT";
-      case StructureType::eIndirectExecutionSetShaderLayoutInfoEXT                   : return "IndirectExecutionSetShaderLayoutInfoEXT";
-      case StructureType::eGeneratedCommandsPipelineInfoEXT                          : return "GeneratedCommandsPipelineInfoEXT";
-      case StructureType::eGeneratedCommandsShaderInfoEXT                            : return "GeneratedCommandsShaderInfoEXT";
-      case StructureType::ePhysicalDeviceMaintenance8FeaturesKHR                     : return "PhysicalDeviceMaintenance8FeaturesKHR";
-      case StructureType::eMemoryBarrierAccessFlags3KHR                              : return "MemoryBarrierAccessFlags3KHR";
-      case StructureType::ePhysicalDeviceImageAlignmentControlFeaturesMESA           : return "PhysicalDeviceImageAlignmentControlFeaturesMESA";
-      case StructureType::ePhysicalDeviceImageAlignmentControlPropertiesMESA         : return "PhysicalDeviceImageAlignmentControlPropertiesMESA";
-      case StructureType::eImageAlignmentControlCreateInfoMESA                       : return "ImageAlignmentControlCreateInfoMESA";
-      case StructureType::ePhysicalDeviceShaderFmaFeaturesKHR                        : return "PhysicalDeviceShaderFmaFeaturesKHR";
-      case StructureType::ePhysicalDeviceRayTracingInvocationReorderFeaturesEXT      : return "PhysicalDeviceRayTracingInvocationReorderFeaturesEXT";
-      case StructureType::ePhysicalDeviceRayTracingInvocationReorderPropertiesEXT    : return "PhysicalDeviceRayTracingInvocationReorderPropertiesEXT";
-      case StructureType::ePhysicalDeviceDepthClampControlFeaturesEXT                : return "PhysicalDeviceDepthClampControlFeaturesEXT";
-      case StructureType::ePipelineViewportDepthClampControlCreateInfoEXT            : return "PipelineViewportDepthClampControlCreateInfoEXT";
-      case StructureType::ePhysicalDeviceMaintenance9FeaturesKHR                     : return "PhysicalDeviceMaintenance9FeaturesKHR";
-      case StructureType::ePhysicalDeviceMaintenance9PropertiesKHR                   : return "PhysicalDeviceMaintenance9PropertiesKHR";
-      case StructureType::eQueueFamilyOwnershipTransferPropertiesKHR                 : return "QueueFamilyOwnershipTransferPropertiesKHR";
-      case StructureType::ePhysicalDeviceVideoMaintenance2FeaturesKHR                : return "PhysicalDeviceVideoMaintenance2FeaturesKHR";
-      case StructureType::eVideoDecodeH264InlineSessionParametersInfoKHR             : return "VideoDecodeH264InlineSessionParametersInfoKHR";
-      case StructureType::eVideoDecodeH265InlineSessionParametersInfoKHR             : return "VideoDecodeH265InlineSessionParametersInfoKHR";
-      case StructureType::eVideoDecodeAv1InlineSessionParametersInfoKHR              : return "VideoDecodeAv1InlineSessionParametersInfoKHR";
-#if defined( VK_USE_PLATFORM_OHOS )
-      case StructureType::eSurfaceCreateInfoOHOS                   : return "SurfaceCreateInfoOHOS";
-      case StructureType::eNativeBufferOHOS                        : return "NativeBufferOHOS";
-      case StructureType::eSwapchainImageCreateInfoOHOS            : return "SwapchainImageCreateInfoOHOS";
-      case StructureType::ePhysicalDevicePresentationPropertiesOHOS: return "PhysicalDevicePresentationPropertiesOHOS";
-#endif /*VK_USE_PLATFORM_OHOS*/
-      case StructureType::ePhysicalDeviceHdrVividFeaturesHUAWEI            : return "PhysicalDeviceHdrVividFeaturesHUAWEI";
-      case StructureType::eHdrVividDynamicMetadataHUAWEI                   : return "HdrVividDynamicMetadataHUAWEI";
-      case StructureType::ePhysicalDeviceCooperativeMatrix2FeaturesNV      : return "PhysicalDeviceCooperativeMatrix2FeaturesNV";
-      case StructureType::eCooperativeMatrixFlexibleDimensionsPropertiesNV : return "CooperativeMatrixFlexibleDimensionsPropertiesNV";
-      case StructureType::ePhysicalDeviceCooperativeMatrix2PropertiesNV    : return "PhysicalDeviceCooperativeMatrix2PropertiesNV";
-      case StructureType::ePhysicalDevicePipelineOpacityMicromapFeaturesARM: return "PhysicalDevicePipelineOpacityMicromapFeaturesARM";
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-      case StructureType::eImportMemoryMetalHandleInfoEXT: return "ImportMemoryMetalHandleInfoEXT";
-      case StructureType::eMemoryMetalHandlePropertiesEXT: return "MemoryMetalHandlePropertiesEXT";
-      case StructureType::eMemoryGetMetalHandleInfoEXT   : return "MemoryGetMetalHandleInfoEXT";
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-      case StructureType::ePhysicalDeviceDepthClampZeroOneFeaturesKHR            : return "PhysicalDeviceDepthClampZeroOneFeaturesKHR";
-      case StructureType::ePhysicalDevicePerformanceCountersByRegionFeaturesARM  : return "PhysicalDevicePerformanceCountersByRegionFeaturesARM";
-      case StructureType::ePhysicalDevicePerformanceCountersByRegionPropertiesARM: return "PhysicalDevicePerformanceCountersByRegionPropertiesARM";
-      case StructureType::ePerformanceCounterARM                                 : return "PerformanceCounterARM";
-      case StructureType::ePerformanceCounterDescriptionARM                      : return "PerformanceCounterDescriptionARM";
-      case StructureType::eRenderPassPerformanceCountersByRegionBeginInfoARM     : return "RenderPassPerformanceCountersByRegionBeginInfoARM";
-      case StructureType::ePhysicalDeviceVertexAttributeRobustnessFeaturesEXT    : return "PhysicalDeviceVertexAttributeRobustnessFeaturesEXT";
-      case StructureType::ePhysicalDeviceFormatPackFeaturesARM                   : return "PhysicalDeviceFormatPackFeaturesARM";
-      case StructureType::ePhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE  : return "PhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE";
-      case StructureType::ePhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE: return "PhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE";
-      case StructureType::ePipelineFragmentDensityMapLayeredCreateInfoVALVE      : return "PipelineFragmentDensityMapLayeredCreateInfoVALVE";
-      case StructureType::ePhysicalDeviceRobustness2FeaturesKHR                  : return "PhysicalDeviceRobustness2FeaturesKHR";
-      case StructureType::ePhysicalDeviceRobustness2PropertiesKHR                : return "PhysicalDeviceRobustness2PropertiesKHR";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case StructureType::eSetPresentConfigNV                     : return "SetPresentConfigNV";
-      case StructureType::ePhysicalDevicePresentMeteringFeaturesNV: return "PhysicalDevicePresentMeteringFeaturesNV";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case StructureType::ePhysicalDeviceFragmentDensityMapOffsetFeaturesEXT       : return "PhysicalDeviceFragmentDensityMapOffsetFeaturesEXT";
-      case StructureType::ePhysicalDeviceFragmentDensityMapOffsetPropertiesEXT     : return "PhysicalDeviceFragmentDensityMapOffsetPropertiesEXT";
-      case StructureType::eRenderPassFragmentDensityMapOffsetEndInfoEXT            : return "RenderPassFragmentDensityMapOffsetEndInfoEXT";
-      case StructureType::ePhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT     : return "PhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT";
-      case StructureType::ePhysicalDevicePresentModeFifoLatestReadyFeaturesKHR     : return "PhysicalDevicePresentModeFifoLatestReadyFeaturesKHR";
-      case StructureType::ePhysicalDeviceShader64BitIndexingFeaturesEXT            : return "PhysicalDeviceShader64BitIndexingFeaturesEXT";
-      case StructureType::ePhysicalDeviceCustomResolveFeaturesEXT                  : return "PhysicalDeviceCustomResolveFeaturesEXT";
-      case StructureType::eBeginCustomResolveInfoEXT                               : return "BeginCustomResolveInfoEXT";
-      case StructureType::eCustomResolveCreateInfoEXT                              : return "CustomResolveCreateInfoEXT";
-      case StructureType::ePhysicalDeviceDataGraphModelFeaturesQCOM                : return "PhysicalDeviceDataGraphModelFeaturesQCOM";
-      case StructureType::eDataGraphPipelineBuiltinModelCreateInfoQCOM             : return "DataGraphPipelineBuiltinModelCreateInfoQCOM";
-      case StructureType::ePhysicalDeviceMaintenance10FeaturesKHR                  : return "PhysicalDeviceMaintenance10FeaturesKHR";
-      case StructureType::ePhysicalDeviceMaintenance10PropertiesKHR                : return "PhysicalDeviceMaintenance10PropertiesKHR";
-      case StructureType::eRenderingAttachmentFlagsInfoKHR                         : return "RenderingAttachmentFlagsInfoKHR";
-      case StructureType::eRenderingEndInfoKHR                                     : return "RenderingEndInfoKHR";
-      case StructureType::eResolveImageModeInfoKHR                                 : return "ResolveImageModeInfoKHR";
-      case StructureType::ePhysicalDevicePipelineCacheIncrementalModeFeaturesSEC   : return "PhysicalDevicePipelineCacheIncrementalModeFeaturesSEC";
-      case StructureType::ePhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT: return "PhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT";
-      default                                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case StructureType::ePhysicalDeviceLayeredDriverPropertiesMSFT: return "PhysicalDeviceLayeredDriverPropertiesMSFT";
+      case StructureType::ePhysicalDeviceIndexTypeUint8FeaturesKHR: return "PhysicalDeviceIndexTypeUint8FeaturesKHR";
+      case StructureType::ePhysicalDeviceLineRasterizationFeaturesKHR: return "PhysicalDeviceLineRasterizationFeaturesKHR";
+      case StructureType::ePipelineRasterizationLineStateCreateInfoKHR: return "PipelineRasterizationLineStateCreateInfoKHR";
+      case StructureType::ePhysicalDeviceLineRasterizationPropertiesKHR: return "PhysicalDeviceLineRasterizationPropertiesKHR";
+      case StructureType::eCalibratedTimestampInfoKHR: return "CalibratedTimestampInfoKHR";
+      case StructureType::ePhysicalDeviceShaderExpectAssumeFeaturesKHR: return "PhysicalDeviceShaderExpectAssumeFeaturesKHR";
+      case StructureType::ePhysicalDeviceMaintenance6FeaturesKHR: return "PhysicalDeviceMaintenance6FeaturesKHR";
+      case StructureType::ePhysicalDeviceMaintenance6PropertiesKHR: return "PhysicalDeviceMaintenance6PropertiesKHR";
+      case StructureType::eBindMemoryStatusKHR: return "BindMemoryStatusKHR";
+      case StructureType::eBindDescriptorSetsInfoKHR: return "BindDescriptorSetsInfoKHR";
+      case StructureType::ePushConstantsInfoKHR: return "PushConstantsInfoKHR";
+      case StructureType::ePushDescriptorSetInfoKHR: return "PushDescriptorSetInfoKHR";
+      case StructureType::ePushDescriptorSetWithTemplateInfoKHR: return "PushDescriptorSetWithTemplateInfoKHR";
+      case StructureType::eSetDescriptorBufferOffsetsInfoEXT: return "SetDescriptorBufferOffsetsInfoEXT";
+      case StructureType::eBindDescriptorBufferEmbeddedSamplersInfoEXT: return "BindDescriptorBufferEmbeddedSamplersInfoEXT";
+      case StructureType::ePhysicalDeviceDescriptorPoolOverallocationFeaturesNV: return "PhysicalDeviceDescriptorPoolOverallocationFeaturesNV";
+      case StructureType::ePhysicalDeviceRawAccessChainsFeaturesNV: return "PhysicalDeviceRawAccessChainsFeaturesNV";
+      case StructureType::ePhysicalDeviceShaderAtomicFloat16VectorFeaturesNV: return "PhysicalDeviceShaderAtomicFloat16VectorFeaturesNV";
+      case StructureType::ePhysicalDeviceRayTracingValidationFeaturesNV: return "PhysicalDeviceRayTracingValidationFeaturesNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ObjectType value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCacheHeaderVersion value )
   {
     switch ( value )
     {
-      case ObjectType::eUnknown                      : return "Unknown";
-      case ObjectType::eInstance                     : return "Instance";
-      case ObjectType::ePhysicalDevice               : return "PhysicalDevice";
-      case ObjectType::eDevice                       : return "Device";
-      case ObjectType::eQueue                        : return "Queue";
-      case ObjectType::eSemaphore                    : return "Semaphore";
-      case ObjectType::eCommandBuffer                : return "CommandBuffer";
-      case ObjectType::eFence                        : return "Fence";
-      case ObjectType::eDeviceMemory                 : return "DeviceMemory";
-      case ObjectType::eBuffer                       : return "Buffer";
-      case ObjectType::eImage                        : return "Image";
-      case ObjectType::eEvent                        : return "Event";
-      case ObjectType::eQueryPool                    : return "QueryPool";
-      case ObjectType::eBufferView                   : return "BufferView";
-      case ObjectType::eImageView                    : return "ImageView";
-      case ObjectType::eShaderModule                 : return "ShaderModule";
-      case ObjectType::ePipelineCache                : return "PipelineCache";
-      case ObjectType::ePipelineLayout               : return "PipelineLayout";
-      case ObjectType::eRenderPass                   : return "RenderPass";
-      case ObjectType::ePipeline                     : return "Pipeline";
-      case ObjectType::eDescriptorSetLayout          : return "DescriptorSetLayout";
-      case ObjectType::eSampler                      : return "Sampler";
-      case ObjectType::eDescriptorPool               : return "DescriptorPool";
-      case ObjectType::eDescriptorSet                : return "DescriptorSet";
-      case ObjectType::eFramebuffer                  : return "Framebuffer";
-      case ObjectType::eCommandPool                  : return "CommandPool";
-      case ObjectType::eDescriptorUpdateTemplate     : return "DescriptorUpdateTemplate";
-      case ObjectType::eSamplerYcbcrConversion       : return "SamplerYcbcrConversion";
-      case ObjectType::ePrivateDataSlot              : return "PrivateDataSlot";
-      case ObjectType::eSurfaceKHR                   : return "SurfaceKHR";
-      case ObjectType::eSwapchainKHR                 : return "SwapchainKHR";
-      case ObjectType::eDisplayKHR                   : return "DisplayKHR";
-      case ObjectType::eDisplayModeKHR               : return "DisplayModeKHR";
-      case ObjectType::eDebugReportCallbackEXT       : return "DebugReportCallbackEXT";
-      case ObjectType::eVideoSessionKHR              : return "VideoSessionKHR";
-      case ObjectType::eVideoSessionParametersKHR    : return "VideoSessionParametersKHR";
-      case ObjectType::eCuModuleNVX                  : return "CuModuleNVX";
-      case ObjectType::eCuFunctionNVX                : return "CuFunctionNVX";
-      case ObjectType::eDebugUtilsMessengerEXT       : return "DebugUtilsMessengerEXT";
-      case ObjectType::eAccelerationStructureKHR     : return "AccelerationStructureKHR";
-      case ObjectType::eValidationCacheEXT           : return "ValidationCacheEXT";
-      case ObjectType::eAccelerationStructureNV      : return "AccelerationStructureNV";
+      case PipelineCacheHeaderVersion::eOne: return "One";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ObjectType value )
+  {
+    switch ( value )
+    {
+      case ObjectType::eUnknown: return "Unknown";
+      case ObjectType::eInstance: return "Instance";
+      case ObjectType::ePhysicalDevice: return "PhysicalDevice";
+      case ObjectType::eDevice: return "Device";
+      case ObjectType::eQueue: return "Queue";
+      case ObjectType::eSemaphore: return "Semaphore";
+      case ObjectType::eCommandBuffer: return "CommandBuffer";
+      case ObjectType::eFence: return "Fence";
+      case ObjectType::eDeviceMemory: return "DeviceMemory";
+      case ObjectType::eBuffer: return "Buffer";
+      case ObjectType::eImage: return "Image";
+      case ObjectType::eEvent: return "Event";
+      case ObjectType::eQueryPool: return "QueryPool";
+      case ObjectType::eBufferView: return "BufferView";
+      case ObjectType::eImageView: return "ImageView";
+      case ObjectType::eShaderModule: return "ShaderModule";
+      case ObjectType::ePipelineCache: return "PipelineCache";
+      case ObjectType::ePipelineLayout: return "PipelineLayout";
+      case ObjectType::eRenderPass: return "RenderPass";
+      case ObjectType::ePipeline: return "Pipeline";
+      case ObjectType::eDescriptorSetLayout: return "DescriptorSetLayout";
+      case ObjectType::eSampler: return "Sampler";
+      case ObjectType::eDescriptorPool: return "DescriptorPool";
+      case ObjectType::eDescriptorSet: return "DescriptorSet";
+      case ObjectType::eFramebuffer: return "Framebuffer";
+      case ObjectType::eCommandPool: return "CommandPool";
+      case ObjectType::eSamplerYcbcrConversion: return "SamplerYcbcrConversion";
+      case ObjectType::eDescriptorUpdateTemplate: return "DescriptorUpdateTemplate";
+      case ObjectType::ePrivateDataSlot: return "PrivateDataSlot";
+      case ObjectType::eSurfaceKHR: return "SurfaceKHR";
+      case ObjectType::eSwapchainKHR: return "SwapchainKHR";
+      case ObjectType::eDisplayKHR: return "DisplayKHR";
+      case ObjectType::eDisplayModeKHR: return "DisplayModeKHR";
+      case ObjectType::eDebugReportCallbackEXT: return "DebugReportCallbackEXT";
+      case ObjectType::eVideoSessionKHR: return "VideoSessionKHR";
+      case ObjectType::eVideoSessionParametersKHR: return "VideoSessionParametersKHR";
+      case ObjectType::eCuModuleNVX: return "CuModuleNVX";
+      case ObjectType::eCuFunctionNVX: return "CuFunctionNVX";
+      case ObjectType::eDebugUtilsMessengerEXT: return "DebugUtilsMessengerEXT";
+      case ObjectType::eAccelerationStructureKHR: return "AccelerationStructureKHR";
+      case ObjectType::eValidationCacheEXT: return "ValidationCacheEXT";
+      case ObjectType::eAccelerationStructureNV: return "AccelerationStructureNV";
       case ObjectType::ePerformanceConfigurationINTEL: return "PerformanceConfigurationINTEL";
-      case ObjectType::eDeferredOperationKHR         : return "DeferredOperationKHR";
-      case ObjectType::eIndirectCommandsLayoutNV     : return "IndirectCommandsLayoutNV";
+      case ObjectType::eDeferredOperationKHR: return "DeferredOperationKHR";
+      case ObjectType::eIndirectCommandsLayoutNV: return "IndirectCommandsLayoutNV";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case ObjectType::eCudaModuleNV  : return "CudaModuleNV";
+      case ObjectType::eCudaModuleNV: return "CudaModuleNV";
       case ObjectType::eCudaFunctionNV: return "CudaFunctionNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       case ObjectType::eBufferCollectionFUCHSIA: return "BufferCollectionFUCHSIA";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-      case ObjectType::eMicromapEXT                : return "MicromapEXT";
-      case ObjectType::eTensorARM                  : return "TensorARM";
-      case ObjectType::eTensorViewARM              : return "TensorViewARM";
-      case ObjectType::eOpticalFlowSessionNV       : return "OpticalFlowSessionNV";
-      case ObjectType::eShaderEXT                  : return "ShaderEXT";
-      case ObjectType::ePipelineBinaryKHR          : return "PipelineBinaryKHR";
-      case ObjectType::eDataGraphPipelineSessionARM: return "DataGraphPipelineSessionARM";
-      case ObjectType::eExternalComputeQueueNV     : return "ExternalComputeQueueNV";
-      case ObjectType::eIndirectCommandsLayoutEXT  : return "IndirectCommandsLayoutEXT";
-      case ObjectType::eIndirectExecutionSetEXT    : return "IndirectExecutionSetEXT";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ObjectType::eMicromapEXT: return "MicromapEXT";
+      case ObjectType::eOpticalFlowSessionNV: return "OpticalFlowSessionNV";
+      case ObjectType::eShaderEXT: return "ShaderEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VendorId value )
+  VULKAN_HPP_INLINE std::string to_string( VendorId value )
   {
     switch ( value )
     {
-      case VendorId::eKhronos : return "Khronos";
-      case VendorId::eVIV     : return "VIV";
-      case VendorId::eVSI     : return "VSI";
-      case VendorId::eKazan   : return "Kazan";
+      case VendorId::eVIV: return "VIV";
+      case VendorId::eVSI: return "VSI";
+      case VendorId::eKazan: return "Kazan";
       case VendorId::eCodeplay: return "Codeplay";
-      case VendorId::eMESA    : return "MESA";
-      case VendorId::ePocl    : return "Pocl";
+      case VendorId::eMESA: return "MESA";
+      case VendorId::ePocl: return "Pocl";
       case VendorId::eMobileye: return "Mobileye";
-      default                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( Format value )
+  VULKAN_HPP_INLINE std::string to_string( Format value )
   {
     switch ( value )
     {
-      case Format::eUndefined                              : return "Undefined";
-      case Format::eR4G4UnormPack8                         : return "R4G4UnormPack8";
-      case Format::eR4G4B4A4UnormPack16                    : return "R4G4B4A4UnormPack16";
-      case Format::eB4G4R4A4UnormPack16                    : return "B4G4R4A4UnormPack16";
-      case Format::eR5G6B5UnormPack16                      : return "R5G6B5UnormPack16";
-      case Format::eB5G6R5UnormPack16                      : return "B5G6R5UnormPack16";
-      case Format::eR5G5B5A1UnormPack16                    : return "R5G5B5A1UnormPack16";
-      case Format::eB5G5R5A1UnormPack16                    : return "B5G5R5A1UnormPack16";
-      case Format::eA1R5G5B5UnormPack16                    : return "A1R5G5B5UnormPack16";
-      case Format::eR8Unorm                                : return "R8Unorm";
-      case Format::eR8Snorm                                : return "R8Snorm";
-      case Format::eR8Uscaled                              : return "R8Uscaled";
-      case Format::eR8Sscaled                              : return "R8Sscaled";
-      case Format::eR8Uint                                 : return "R8Uint";
-      case Format::eR8Sint                                 : return "R8Sint";
-      case Format::eR8Srgb                                 : return "R8Srgb";
-      case Format::eR8G8Unorm                              : return "R8G8Unorm";
-      case Format::eR8G8Snorm                              : return "R8G8Snorm";
-      case Format::eR8G8Uscaled                            : return "R8G8Uscaled";
-      case Format::eR8G8Sscaled                            : return "R8G8Sscaled";
-      case Format::eR8G8Uint                               : return "R8G8Uint";
-      case Format::eR8G8Sint                               : return "R8G8Sint";
-      case Format::eR8G8Srgb                               : return "R8G8Srgb";
-      case Format::eR8G8B8Unorm                            : return "R8G8B8Unorm";
-      case Format::eR8G8B8Snorm                            : return "R8G8B8Snorm";
-      case Format::eR8G8B8Uscaled                          : return "R8G8B8Uscaled";
-      case Format::eR8G8B8Sscaled                          : return "R8G8B8Sscaled";
-      case Format::eR8G8B8Uint                             : return "R8G8B8Uint";
-      case Format::eR8G8B8Sint                             : return "R8G8B8Sint";
-      case Format::eR8G8B8Srgb                             : return "R8G8B8Srgb";
-      case Format::eB8G8R8Unorm                            : return "B8G8R8Unorm";
-      case Format::eB8G8R8Snorm                            : return "B8G8R8Snorm";
-      case Format::eB8G8R8Uscaled                          : return "B8G8R8Uscaled";
-      case Format::eB8G8R8Sscaled                          : return "B8G8R8Sscaled";
-      case Format::eB8G8R8Uint                             : return "B8G8R8Uint";
-      case Format::eB8G8R8Sint                             : return "B8G8R8Sint";
-      case Format::eB8G8R8Srgb                             : return "B8G8R8Srgb";
-      case Format::eR8G8B8A8Unorm                          : return "R8G8B8A8Unorm";
-      case Format::eR8G8B8A8Snorm                          : return "R8G8B8A8Snorm";
-      case Format::eR8G8B8A8Uscaled                        : return "R8G8B8A8Uscaled";
-      case Format::eR8G8B8A8Sscaled                        : return "R8G8B8A8Sscaled";
-      case Format::eR8G8B8A8Uint                           : return "R8G8B8A8Uint";
-      case Format::eR8G8B8A8Sint                           : return "R8G8B8A8Sint";
-      case Format::eR8G8B8A8Srgb                           : return "R8G8B8A8Srgb";
-      case Format::eB8G8R8A8Unorm                          : return "B8G8R8A8Unorm";
-      case Format::eB8G8R8A8Snorm                          : return "B8G8R8A8Snorm";
-      case Format::eB8G8R8A8Uscaled                        : return "B8G8R8A8Uscaled";
-      case Format::eB8G8R8A8Sscaled                        : return "B8G8R8A8Sscaled";
-      case Format::eB8G8R8A8Uint                           : return "B8G8R8A8Uint";
-      case Format::eB8G8R8A8Sint                           : return "B8G8R8A8Sint";
-      case Format::eB8G8R8A8Srgb                           : return "B8G8R8A8Srgb";
-      case Format::eA8B8G8R8UnormPack32                    : return "A8B8G8R8UnormPack32";
-      case Format::eA8B8G8R8SnormPack32                    : return "A8B8G8R8SnormPack32";
-      case Format::eA8B8G8R8UscaledPack32                  : return "A8B8G8R8UscaledPack32";
-      case Format::eA8B8G8R8SscaledPack32                  : return "A8B8G8R8SscaledPack32";
-      case Format::eA8B8G8R8UintPack32                     : return "A8B8G8R8UintPack32";
-      case Format::eA8B8G8R8SintPack32                     : return "A8B8G8R8SintPack32";
-      case Format::eA8B8G8R8SrgbPack32                     : return "A8B8G8R8SrgbPack32";
-      case Format::eA2R10G10B10UnormPack32                 : return "A2R10G10B10UnormPack32";
-      case Format::eA2R10G10B10SnormPack32                 : return "A2R10G10B10SnormPack32";
-      case Format::eA2R10G10B10UscaledPack32               : return "A2R10G10B10UscaledPack32";
-      case Format::eA2R10G10B10SscaledPack32               : return "A2R10G10B10SscaledPack32";
-      case Format::eA2R10G10B10UintPack32                  : return "A2R10G10B10UintPack32";
-      case Format::eA2R10G10B10SintPack32                  : return "A2R10G10B10SintPack32";
-      case Format::eA2B10G10R10UnormPack32                 : return "A2B10G10R10UnormPack32";
-      case Format::eA2B10G10R10SnormPack32                 : return "A2B10G10R10SnormPack32";
-      case Format::eA2B10G10R10UscaledPack32               : return "A2B10G10R10UscaledPack32";
-      case Format::eA2B10G10R10SscaledPack32               : return "A2B10G10R10SscaledPack32";
-      case Format::eA2B10G10R10UintPack32                  : return "A2B10G10R10UintPack32";
-      case Format::eA2B10G10R10SintPack32                  : return "A2B10G10R10SintPack32";
-      case Format::eR16Unorm                               : return "R16Unorm";
-      case Format::eR16Snorm                               : return "R16Snorm";
-      case Format::eR16Uscaled                             : return "R16Uscaled";
-      case Format::eR16Sscaled                             : return "R16Sscaled";
-      case Format::eR16Uint                                : return "R16Uint";
-      case Format::eR16Sint                                : return "R16Sint";
-      case Format::eR16Sfloat                              : return "R16Sfloat";
-      case Format::eR16G16Unorm                            : return "R16G16Unorm";
-      case Format::eR16G16Snorm                            : return "R16G16Snorm";
-      case Format::eR16G16Uscaled                          : return "R16G16Uscaled";
-      case Format::eR16G16Sscaled                          : return "R16G16Sscaled";
-      case Format::eR16G16Uint                             : return "R16G16Uint";
-      case Format::eR16G16Sint                             : return "R16G16Sint";
-      case Format::eR16G16Sfloat                           : return "R16G16Sfloat";
-      case Format::eR16G16B16Unorm                         : return "R16G16B16Unorm";
-      case Format::eR16G16B16Snorm                         : return "R16G16B16Snorm";
-      case Format::eR16G16B16Uscaled                       : return "R16G16B16Uscaled";
-      case Format::eR16G16B16Sscaled                       : return "R16G16B16Sscaled";
-      case Format::eR16G16B16Uint                          : return "R16G16B16Uint";
-      case Format::eR16G16B16Sint                          : return "R16G16B16Sint";
-      case Format::eR16G16B16Sfloat                        : return "R16G16B16Sfloat";
-      case Format::eR16G16B16A16Unorm                      : return "R16G16B16A16Unorm";
-      case Format::eR16G16B16A16Snorm                      : return "R16G16B16A16Snorm";
-      case Format::eR16G16B16A16Uscaled                    : return "R16G16B16A16Uscaled";
-      case Format::eR16G16B16A16Sscaled                    : return "R16G16B16A16Sscaled";
-      case Format::eR16G16B16A16Uint                       : return "R16G16B16A16Uint";
-      case Format::eR16G16B16A16Sint                       : return "R16G16B16A16Sint";
-      case Format::eR16G16B16A16Sfloat                     : return "R16G16B16A16Sfloat";
-      case Format::eR32Uint                                : return "R32Uint";
-      case Format::eR32Sint                                : return "R32Sint";
-      case Format::eR32Sfloat                              : return "R32Sfloat";
-      case Format::eR32G32Uint                             : return "R32G32Uint";
-      case Format::eR32G32Sint                             : return "R32G32Sint";
-      case Format::eR32G32Sfloat                           : return "R32G32Sfloat";
-      case Format::eR32G32B32Uint                          : return "R32G32B32Uint";
-      case Format::eR32G32B32Sint                          : return "R32G32B32Sint";
-      case Format::eR32G32B32Sfloat                        : return "R32G32B32Sfloat";
-      case Format::eR32G32B32A32Uint                       : return "R32G32B32A32Uint";
-      case Format::eR32G32B32A32Sint                       : return "R32G32B32A32Sint";
-      case Format::eR32G32B32A32Sfloat                     : return "R32G32B32A32Sfloat";
-      case Format::eR64Uint                                : return "R64Uint";
-      case Format::eR64Sint                                : return "R64Sint";
-      case Format::eR64Sfloat                              : return "R64Sfloat";
-      case Format::eR64G64Uint                             : return "R64G64Uint";
-      case Format::eR64G64Sint                             : return "R64G64Sint";
-      case Format::eR64G64Sfloat                           : return "R64G64Sfloat";
-      case Format::eR64G64B64Uint                          : return "R64G64B64Uint";
-      case Format::eR64G64B64Sint                          : return "R64G64B64Sint";
-      case Format::eR64G64B64Sfloat                        : return "R64G64B64Sfloat";
-      case Format::eR64G64B64A64Uint                       : return "R64G64B64A64Uint";
-      case Format::eR64G64B64A64Sint                       : return "R64G64B64A64Sint";
-      case Format::eR64G64B64A64Sfloat                     : return "R64G64B64A64Sfloat";
-      case Format::eB10G11R11UfloatPack32                  : return "B10G11R11UfloatPack32";
-      case Format::eE5B9G9R9UfloatPack32                   : return "E5B9G9R9UfloatPack32";
-      case Format::eD16Unorm                               : return "D16Unorm";
-      case Format::eX8D24UnormPack32                       : return "X8D24UnormPack32";
-      case Format::eD32Sfloat                              : return "D32Sfloat";
-      case Format::eS8Uint                                 : return "S8Uint";
-      case Format::eD16UnormS8Uint                         : return "D16UnormS8Uint";
-      case Format::eD24UnormS8Uint                         : return "D24UnormS8Uint";
-      case Format::eD32SfloatS8Uint                        : return "D32SfloatS8Uint";
-      case Format::eBc1RgbUnormBlock                       : return "Bc1RgbUnormBlock";
-      case Format::eBc1RgbSrgbBlock                        : return "Bc1RgbSrgbBlock";
-      case Format::eBc1RgbaUnormBlock                      : return "Bc1RgbaUnormBlock";
-      case Format::eBc1RgbaSrgbBlock                       : return "Bc1RgbaSrgbBlock";
-      case Format::eBc2UnormBlock                          : return "Bc2UnormBlock";
-      case Format::eBc2SrgbBlock                           : return "Bc2SrgbBlock";
-      case Format::eBc3UnormBlock                          : return "Bc3UnormBlock";
-      case Format::eBc3SrgbBlock                           : return "Bc3SrgbBlock";
-      case Format::eBc4UnormBlock                          : return "Bc4UnormBlock";
-      case Format::eBc4SnormBlock                          : return "Bc4SnormBlock";
-      case Format::eBc5UnormBlock                          : return "Bc5UnormBlock";
-      case Format::eBc5SnormBlock                          : return "Bc5SnormBlock";
-      case Format::eBc6HUfloatBlock                        : return "Bc6HUfloatBlock";
-      case Format::eBc6HSfloatBlock                        : return "Bc6HSfloatBlock";
-      case Format::eBc7UnormBlock                          : return "Bc7UnormBlock";
-      case Format::eBc7SrgbBlock                           : return "Bc7SrgbBlock";
-      case Format::eEtc2R8G8B8UnormBlock                   : return "Etc2R8G8B8UnormBlock";
-      case Format::eEtc2R8G8B8SrgbBlock                    : return "Etc2R8G8B8SrgbBlock";
-      case Format::eEtc2R8G8B8A1UnormBlock                 : return "Etc2R8G8B8A1UnormBlock";
-      case Format::eEtc2R8G8B8A1SrgbBlock                  : return "Etc2R8G8B8A1SrgbBlock";
-      case Format::eEtc2R8G8B8A8UnormBlock                 : return "Etc2R8G8B8A8UnormBlock";
-      case Format::eEtc2R8G8B8A8SrgbBlock                  : return "Etc2R8G8B8A8SrgbBlock";
-      case Format::eEacR11UnormBlock                       : return "EacR11UnormBlock";
-      case Format::eEacR11SnormBlock                       : return "EacR11SnormBlock";
-      case Format::eEacR11G11UnormBlock                    : return "EacR11G11UnormBlock";
-      case Format::eEacR11G11SnormBlock                    : return "EacR11G11SnormBlock";
-      case Format::eAstc4x4UnormBlock                      : return "Astc4x4UnormBlock";
-      case Format::eAstc4x4SrgbBlock                       : return "Astc4x4SrgbBlock";
-      case Format::eAstc5x4UnormBlock                      : return "Astc5x4UnormBlock";
-      case Format::eAstc5x4SrgbBlock                       : return "Astc5x4SrgbBlock";
-      case Format::eAstc5x5UnormBlock                      : return "Astc5x5UnormBlock";
-      case Format::eAstc5x5SrgbBlock                       : return "Astc5x5SrgbBlock";
-      case Format::eAstc6x5UnormBlock                      : return "Astc6x5UnormBlock";
-      case Format::eAstc6x5SrgbBlock                       : return "Astc6x5SrgbBlock";
-      case Format::eAstc6x6UnormBlock                      : return "Astc6x6UnormBlock";
-      case Format::eAstc6x6SrgbBlock                       : return "Astc6x6SrgbBlock";
-      case Format::eAstc8x5UnormBlock                      : return "Astc8x5UnormBlock";
-      case Format::eAstc8x5SrgbBlock                       : return "Astc8x5SrgbBlock";
-      case Format::eAstc8x6UnormBlock                      : return "Astc8x6UnormBlock";
-      case Format::eAstc8x6SrgbBlock                       : return "Astc8x6SrgbBlock";
-      case Format::eAstc8x8UnormBlock                      : return "Astc8x8UnormBlock";
-      case Format::eAstc8x8SrgbBlock                       : return "Astc8x8SrgbBlock";
-      case Format::eAstc10x5UnormBlock                     : return "Astc10x5UnormBlock";
-      case Format::eAstc10x5SrgbBlock                      : return "Astc10x5SrgbBlock";
-      case Format::eAstc10x6UnormBlock                     : return "Astc10x6UnormBlock";
-      case Format::eAstc10x6SrgbBlock                      : return "Astc10x6SrgbBlock";
-      case Format::eAstc10x8UnormBlock                     : return "Astc10x8UnormBlock";
-      case Format::eAstc10x8SrgbBlock                      : return "Astc10x8SrgbBlock";
-      case Format::eAstc10x10UnormBlock                    : return "Astc10x10UnormBlock";
-      case Format::eAstc10x10SrgbBlock                     : return "Astc10x10SrgbBlock";
-      case Format::eAstc12x10UnormBlock                    : return "Astc12x10UnormBlock";
-      case Format::eAstc12x10SrgbBlock                     : return "Astc12x10SrgbBlock";
-      case Format::eAstc12x12UnormBlock                    : return "Astc12x12UnormBlock";
-      case Format::eAstc12x12SrgbBlock                     : return "Astc12x12SrgbBlock";
-      case Format::eG8B8G8R8422Unorm                       : return "G8B8G8R8422Unorm";
-      case Format::eB8G8R8G8422Unorm                       : return "B8G8R8G8422Unorm";
-      case Format::eG8B8R83Plane420Unorm                   : return "G8B8R83Plane420Unorm";
-      case Format::eG8B8R82Plane420Unorm                   : return "G8B8R82Plane420Unorm";
-      case Format::eG8B8R83Plane422Unorm                   : return "G8B8R83Plane422Unorm";
-      case Format::eG8B8R82Plane422Unorm                   : return "G8B8R82Plane422Unorm";
-      case Format::eG8B8R83Plane444Unorm                   : return "G8B8R83Plane444Unorm";
-      case Format::eR10X6UnormPack16                       : return "R10X6UnormPack16";
-      case Format::eR10X6G10X6Unorm2Pack16                 : return "R10X6G10X6Unorm2Pack16";
-      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16       : return "R10X6G10X6B10X6A10X6Unorm4Pack16";
-      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16    : return "G10X6B10X6G10X6R10X6422Unorm4Pack16";
-      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16    : return "B10X6G10X6R10X6G10X6422Unorm4Pack16";
-      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16   : return "G10X6B10X6R10X63Plane420Unorm3Pack16";
-      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16   : return "G10X6B10X6R10X62Plane420Unorm3Pack16";
-      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16   : return "G10X6B10X6R10X63Plane422Unorm3Pack16";
-      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16   : return "G10X6B10X6R10X62Plane422Unorm3Pack16";
-      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16   : return "G10X6B10X6R10X63Plane444Unorm3Pack16";
-      case Format::eR12X4UnormPack16                       : return "R12X4UnormPack16";
-      case Format::eR12X4G12X4Unorm2Pack16                 : return "R12X4G12X4Unorm2Pack16";
-      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16       : return "R12X4G12X4B12X4A12X4Unorm4Pack16";
-      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16    : return "G12X4B12X4G12X4R12X4422Unorm4Pack16";
-      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16    : return "B12X4G12X4R12X4G12X4422Unorm4Pack16";
-      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16   : return "G12X4B12X4R12X43Plane420Unorm3Pack16";
-      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16   : return "G12X4B12X4R12X42Plane420Unorm3Pack16";
-      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16   : return "G12X4B12X4R12X43Plane422Unorm3Pack16";
-      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16   : return "G12X4B12X4R12X42Plane422Unorm3Pack16";
-      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16   : return "G12X4B12X4R12X43Plane444Unorm3Pack16";
-      case Format::eG16B16G16R16422Unorm                   : return "G16B16G16R16422Unorm";
-      case Format::eB16G16R16G16422Unorm                   : return "B16G16R16G16422Unorm";
-      case Format::eG16B16R163Plane420Unorm                : return "G16B16R163Plane420Unorm";
-      case Format::eG16B16R162Plane420Unorm                : return "G16B16R162Plane420Unorm";
-      case Format::eG16B16R163Plane422Unorm                : return "G16B16R163Plane422Unorm";
-      case Format::eG16B16R162Plane422Unorm                : return "G16B16R162Plane422Unorm";
-      case Format::eG16B16R163Plane444Unorm                : return "G16B16R163Plane444Unorm";
-      case Format::eG8B8R82Plane444Unorm                   : return "G8B8R82Plane444Unorm";
-      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16   : return "G10X6B10X6R10X62Plane444Unorm3Pack16";
-      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16   : return "G12X4B12X4R12X42Plane444Unorm3Pack16";
-      case Format::eG16B16R162Plane444Unorm                : return "G16B16R162Plane444Unorm";
-      case Format::eA4R4G4B4UnormPack16                    : return "A4R4G4B4UnormPack16";
-      case Format::eA4B4G4R4UnormPack16                    : return "A4B4G4R4UnormPack16";
-      case Format::eAstc4x4SfloatBlock                     : return "Astc4x4SfloatBlock";
-      case Format::eAstc5x4SfloatBlock                     : return "Astc5x4SfloatBlock";
-      case Format::eAstc5x5SfloatBlock                     : return "Astc5x5SfloatBlock";
-      case Format::eAstc6x5SfloatBlock                     : return "Astc6x5SfloatBlock";
-      case Format::eAstc6x6SfloatBlock                     : return "Astc6x6SfloatBlock";
-      case Format::eAstc8x5SfloatBlock                     : return "Astc8x5SfloatBlock";
-      case Format::eAstc8x6SfloatBlock                     : return "Astc8x6SfloatBlock";
-      case Format::eAstc8x8SfloatBlock                     : return "Astc8x8SfloatBlock";
-      case Format::eAstc10x5SfloatBlock                    : return "Astc10x5SfloatBlock";
-      case Format::eAstc10x6SfloatBlock                    : return "Astc10x6SfloatBlock";
-      case Format::eAstc10x8SfloatBlock                    : return "Astc10x8SfloatBlock";
-      case Format::eAstc10x10SfloatBlock                   : return "Astc10x10SfloatBlock";
-      case Format::eAstc12x10SfloatBlock                   : return "Astc12x10SfloatBlock";
-      case Format::eAstc12x12SfloatBlock                   : return "Astc12x12SfloatBlock";
-      case Format::eA1B5G5R5UnormPack16                    : return "A1B5G5R5UnormPack16";
-      case Format::eA8Unorm                                : return "A8Unorm";
-      case Format::ePvrtc12BppUnormBlockIMG                : return "Pvrtc12BppUnormBlockIMG";
-      case Format::ePvrtc14BppUnormBlockIMG                : return "Pvrtc14BppUnormBlockIMG";
-      case Format::ePvrtc22BppUnormBlockIMG                : return "Pvrtc22BppUnormBlockIMG";
-      case Format::ePvrtc24BppUnormBlockIMG                : return "Pvrtc24BppUnormBlockIMG";
-      case Format::ePvrtc12BppSrgbBlockIMG                 : return "Pvrtc12BppSrgbBlockIMG";
-      case Format::ePvrtc14BppSrgbBlockIMG                 : return "Pvrtc14BppSrgbBlockIMG";
-      case Format::ePvrtc22BppSrgbBlockIMG                 : return "Pvrtc22BppSrgbBlockIMG";
-      case Format::ePvrtc24BppSrgbBlockIMG                 : return "Pvrtc24BppSrgbBlockIMG";
-      case Format::eR8BoolARM                              : return "R8BoolARM";
-      case Format::eR16G16Sfixed5NV                        : return "R16G16Sfixed5NV";
-      case Format::eR10X6UintPack16ARM                     : return "R10X6UintPack16ARM";
-      case Format::eR10X6G10X6Uint2Pack16ARM               : return "R10X6G10X6Uint2Pack16ARM";
-      case Format::eR10X6G10X6B10X6A10X6Uint4Pack16ARM     : return "R10X6G10X6B10X6A10X6Uint4Pack16ARM";
-      case Format::eR12X4UintPack16ARM                     : return "R12X4UintPack16ARM";
-      case Format::eR12X4G12X4Uint2Pack16ARM               : return "R12X4G12X4Uint2Pack16ARM";
-      case Format::eR12X4G12X4B12X4A12X4Uint4Pack16ARM     : return "R12X4G12X4B12X4A12X4Uint4Pack16ARM";
-      case Format::eR14X2UintPack16ARM                     : return "R14X2UintPack16ARM";
-      case Format::eR14X2G14X2Uint2Pack16ARM               : return "R14X2G14X2Uint2Pack16ARM";
-      case Format::eR14X2G14X2B14X2A14X2Uint4Pack16ARM     : return "R14X2G14X2B14X2A14X2Uint4Pack16ARM";
-      case Format::eR14X2UnormPack16ARM                    : return "R14X2UnormPack16ARM";
-      case Format::eR14X2G14X2Unorm2Pack16ARM              : return "R14X2G14X2Unorm2Pack16ARM";
-      case Format::eR14X2G14X2B14X2A14X2Unorm4Pack16ARM    : return "R14X2G14X2B14X2A14X2Unorm4Pack16ARM";
-      case Format::eG14X2B14X2R14X22Plane420Unorm3Pack16ARM: return "G14X2B14X2R14X22Plane420Unorm3Pack16ARM";
-      case Format::eG14X2B14X2R14X22Plane422Unorm3Pack16ARM: return "G14X2B14X2R14X22Plane422Unorm3Pack16ARM";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case Format::eUndefined: return "Undefined";
+      case Format::eR4G4UnormPack8: return "R4G4UnormPack8";
+      case Format::eR4G4B4A4UnormPack16: return "R4G4B4A4UnormPack16";
+      case Format::eB4G4R4A4UnormPack16: return "B4G4R4A4UnormPack16";
+      case Format::eR5G6B5UnormPack16: return "R5G6B5UnormPack16";
+      case Format::eB5G6R5UnormPack16: return "B5G6R5UnormPack16";
+      case Format::eR5G5B5A1UnormPack16: return "R5G5B5A1UnormPack16";
+      case Format::eB5G5R5A1UnormPack16: return "B5G5R5A1UnormPack16";
+      case Format::eA1R5G5B5UnormPack16: return "A1R5G5B5UnormPack16";
+      case Format::eR8Unorm: return "R8Unorm";
+      case Format::eR8Snorm: return "R8Snorm";
+      case Format::eR8Uscaled: return "R8Uscaled";
+      case Format::eR8Sscaled: return "R8Sscaled";
+      case Format::eR8Uint: return "R8Uint";
+      case Format::eR8Sint: return "R8Sint";
+      case Format::eR8Srgb: return "R8Srgb";
+      case Format::eR8G8Unorm: return "R8G8Unorm";
+      case Format::eR8G8Snorm: return "R8G8Snorm";
+      case Format::eR8G8Uscaled: return "R8G8Uscaled";
+      case Format::eR8G8Sscaled: return "R8G8Sscaled";
+      case Format::eR8G8Uint: return "R8G8Uint";
+      case Format::eR8G8Sint: return "R8G8Sint";
+      case Format::eR8G8Srgb: return "R8G8Srgb";
+      case Format::eR8G8B8Unorm: return "R8G8B8Unorm";
+      case Format::eR8G8B8Snorm: return "R8G8B8Snorm";
+      case Format::eR8G8B8Uscaled: return "R8G8B8Uscaled";
+      case Format::eR8G8B8Sscaled: return "R8G8B8Sscaled";
+      case Format::eR8G8B8Uint: return "R8G8B8Uint";
+      case Format::eR8G8B8Sint: return "R8G8B8Sint";
+      case Format::eR8G8B8Srgb: return "R8G8B8Srgb";
+      case Format::eB8G8R8Unorm: return "B8G8R8Unorm";
+      case Format::eB8G8R8Snorm: return "B8G8R8Snorm";
+      case Format::eB8G8R8Uscaled: return "B8G8R8Uscaled";
+      case Format::eB8G8R8Sscaled: return "B8G8R8Sscaled";
+      case Format::eB8G8R8Uint: return "B8G8R8Uint";
+      case Format::eB8G8R8Sint: return "B8G8R8Sint";
+      case Format::eB8G8R8Srgb: return "B8G8R8Srgb";
+      case Format::eR8G8B8A8Unorm: return "R8G8B8A8Unorm";
+      case Format::eR8G8B8A8Snorm: return "R8G8B8A8Snorm";
+      case Format::eR8G8B8A8Uscaled: return "R8G8B8A8Uscaled";
+      case Format::eR8G8B8A8Sscaled: return "R8G8B8A8Sscaled";
+      case Format::eR8G8B8A8Uint: return "R8G8B8A8Uint";
+      case Format::eR8G8B8A8Sint: return "R8G8B8A8Sint";
+      case Format::eR8G8B8A8Srgb: return "R8G8B8A8Srgb";
+      case Format::eB8G8R8A8Unorm: return "B8G8R8A8Unorm";
+      case Format::eB8G8R8A8Snorm: return "B8G8R8A8Snorm";
+      case Format::eB8G8R8A8Uscaled: return "B8G8R8A8Uscaled";
+      case Format::eB8G8R8A8Sscaled: return "B8G8R8A8Sscaled";
+      case Format::eB8G8R8A8Uint: return "B8G8R8A8Uint";
+      case Format::eB8G8R8A8Sint: return "B8G8R8A8Sint";
+      case Format::eB8G8R8A8Srgb: return "B8G8R8A8Srgb";
+      case Format::eA8B8G8R8UnormPack32: return "A8B8G8R8UnormPack32";
+      case Format::eA8B8G8R8SnormPack32: return "A8B8G8R8SnormPack32";
+      case Format::eA8B8G8R8UscaledPack32: return "A8B8G8R8UscaledPack32";
+      case Format::eA8B8G8R8SscaledPack32: return "A8B8G8R8SscaledPack32";
+      case Format::eA8B8G8R8UintPack32: return "A8B8G8R8UintPack32";
+      case Format::eA8B8G8R8SintPack32: return "A8B8G8R8SintPack32";
+      case Format::eA8B8G8R8SrgbPack32: return "A8B8G8R8SrgbPack32";
+      case Format::eA2R10G10B10UnormPack32: return "A2R10G10B10UnormPack32";
+      case Format::eA2R10G10B10SnormPack32: return "A2R10G10B10SnormPack32";
+      case Format::eA2R10G10B10UscaledPack32: return "A2R10G10B10UscaledPack32";
+      case Format::eA2R10G10B10SscaledPack32: return "A2R10G10B10SscaledPack32";
+      case Format::eA2R10G10B10UintPack32: return "A2R10G10B10UintPack32";
+      case Format::eA2R10G10B10SintPack32: return "A2R10G10B10SintPack32";
+      case Format::eA2B10G10R10UnormPack32: return "A2B10G10R10UnormPack32";
+      case Format::eA2B10G10R10SnormPack32: return "A2B10G10R10SnormPack32";
+      case Format::eA2B10G10R10UscaledPack32: return "A2B10G10R10UscaledPack32";
+      case Format::eA2B10G10R10SscaledPack32: return "A2B10G10R10SscaledPack32";
+      case Format::eA2B10G10R10UintPack32: return "A2B10G10R10UintPack32";
+      case Format::eA2B10G10R10SintPack32: return "A2B10G10R10SintPack32";
+      case Format::eR16Unorm: return "R16Unorm";
+      case Format::eR16Snorm: return "R16Snorm";
+      case Format::eR16Uscaled: return "R16Uscaled";
+      case Format::eR16Sscaled: return "R16Sscaled";
+      case Format::eR16Uint: return "R16Uint";
+      case Format::eR16Sint: return "R16Sint";
+      case Format::eR16Sfloat: return "R16Sfloat";
+      case Format::eR16G16Unorm: return "R16G16Unorm";
+      case Format::eR16G16Snorm: return "R16G16Snorm";
+      case Format::eR16G16Uscaled: return "R16G16Uscaled";
+      case Format::eR16G16Sscaled: return "R16G16Sscaled";
+      case Format::eR16G16Uint: return "R16G16Uint";
+      case Format::eR16G16Sint: return "R16G16Sint";
+      case Format::eR16G16Sfloat: return "R16G16Sfloat";
+      case Format::eR16G16B16Unorm: return "R16G16B16Unorm";
+      case Format::eR16G16B16Snorm: return "R16G16B16Snorm";
+      case Format::eR16G16B16Uscaled: return "R16G16B16Uscaled";
+      case Format::eR16G16B16Sscaled: return "R16G16B16Sscaled";
+      case Format::eR16G16B16Uint: return "R16G16B16Uint";
+      case Format::eR16G16B16Sint: return "R16G16B16Sint";
+      case Format::eR16G16B16Sfloat: return "R16G16B16Sfloat";
+      case Format::eR16G16B16A16Unorm: return "R16G16B16A16Unorm";
+      case Format::eR16G16B16A16Snorm: return "R16G16B16A16Snorm";
+      case Format::eR16G16B16A16Uscaled: return "R16G16B16A16Uscaled";
+      case Format::eR16G16B16A16Sscaled: return "R16G16B16A16Sscaled";
+      case Format::eR16G16B16A16Uint: return "R16G16B16A16Uint";
+      case Format::eR16G16B16A16Sint: return "R16G16B16A16Sint";
+      case Format::eR16G16B16A16Sfloat: return "R16G16B16A16Sfloat";
+      case Format::eR32Uint: return "R32Uint";
+      case Format::eR32Sint: return "R32Sint";
+      case Format::eR32Sfloat: return "R32Sfloat";
+      case Format::eR32G32Uint: return "R32G32Uint";
+      case Format::eR32G32Sint: return "R32G32Sint";
+      case Format::eR32G32Sfloat: return "R32G32Sfloat";
+      case Format::eR32G32B32Uint: return "R32G32B32Uint";
+      case Format::eR32G32B32Sint: return "R32G32B32Sint";
+      case Format::eR32G32B32Sfloat: return "R32G32B32Sfloat";
+      case Format::eR32G32B32A32Uint: return "R32G32B32A32Uint";
+      case Format::eR32G32B32A32Sint: return "R32G32B32A32Sint";
+      case Format::eR32G32B32A32Sfloat: return "R32G32B32A32Sfloat";
+      case Format::eR64Uint: return "R64Uint";
+      case Format::eR64Sint: return "R64Sint";
+      case Format::eR64Sfloat: return "R64Sfloat";
+      case Format::eR64G64Uint: return "R64G64Uint";
+      case Format::eR64G64Sint: return "R64G64Sint";
+      case Format::eR64G64Sfloat: return "R64G64Sfloat";
+      case Format::eR64G64B64Uint: return "R64G64B64Uint";
+      case Format::eR64G64B64Sint: return "R64G64B64Sint";
+      case Format::eR64G64B64Sfloat: return "R64G64B64Sfloat";
+      case Format::eR64G64B64A64Uint: return "R64G64B64A64Uint";
+      case Format::eR64G64B64A64Sint: return "R64G64B64A64Sint";
+      case Format::eR64G64B64A64Sfloat: return "R64G64B64A64Sfloat";
+      case Format::eB10G11R11UfloatPack32: return "B10G11R11UfloatPack32";
+      case Format::eE5B9G9R9UfloatPack32: return "E5B9G9R9UfloatPack32";
+      case Format::eD16Unorm: return "D16Unorm";
+      case Format::eX8D24UnormPack32: return "X8D24UnormPack32";
+      case Format::eD32Sfloat: return "D32Sfloat";
+      case Format::eS8Uint: return "S8Uint";
+      case Format::eD16UnormS8Uint: return "D16UnormS8Uint";
+      case Format::eD24UnormS8Uint: return "D24UnormS8Uint";
+      case Format::eD32SfloatS8Uint: return "D32SfloatS8Uint";
+      case Format::eBc1RgbUnormBlock: return "Bc1RgbUnormBlock";
+      case Format::eBc1RgbSrgbBlock: return "Bc1RgbSrgbBlock";
+      case Format::eBc1RgbaUnormBlock: return "Bc1RgbaUnormBlock";
+      case Format::eBc1RgbaSrgbBlock: return "Bc1RgbaSrgbBlock";
+      case Format::eBc2UnormBlock: return "Bc2UnormBlock";
+      case Format::eBc2SrgbBlock: return "Bc2SrgbBlock";
+      case Format::eBc3UnormBlock: return "Bc3UnormBlock";
+      case Format::eBc3SrgbBlock: return "Bc3SrgbBlock";
+      case Format::eBc4UnormBlock: return "Bc4UnormBlock";
+      case Format::eBc4SnormBlock: return "Bc4SnormBlock";
+      case Format::eBc5UnormBlock: return "Bc5UnormBlock";
+      case Format::eBc5SnormBlock: return "Bc5SnormBlock";
+      case Format::eBc6HUfloatBlock: return "Bc6HUfloatBlock";
+      case Format::eBc6HSfloatBlock: return "Bc6HSfloatBlock";
+      case Format::eBc7UnormBlock: return "Bc7UnormBlock";
+      case Format::eBc7SrgbBlock: return "Bc7SrgbBlock";
+      case Format::eEtc2R8G8B8UnormBlock: return "Etc2R8G8B8UnormBlock";
+      case Format::eEtc2R8G8B8SrgbBlock: return "Etc2R8G8B8SrgbBlock";
+      case Format::eEtc2R8G8B8A1UnormBlock: return "Etc2R8G8B8A1UnormBlock";
+      case Format::eEtc2R8G8B8A1SrgbBlock: return "Etc2R8G8B8A1SrgbBlock";
+      case Format::eEtc2R8G8B8A8UnormBlock: return "Etc2R8G8B8A8UnormBlock";
+      case Format::eEtc2R8G8B8A8SrgbBlock: return "Etc2R8G8B8A8SrgbBlock";
+      case Format::eEacR11UnormBlock: return "EacR11UnormBlock";
+      case Format::eEacR11SnormBlock: return "EacR11SnormBlock";
+      case Format::eEacR11G11UnormBlock: return "EacR11G11UnormBlock";
+      case Format::eEacR11G11SnormBlock: return "EacR11G11SnormBlock";
+      case Format::eAstc4x4UnormBlock: return "Astc4x4UnormBlock";
+      case Format::eAstc4x4SrgbBlock: return "Astc4x4SrgbBlock";
+      case Format::eAstc5x4UnormBlock: return "Astc5x4UnormBlock";
+      case Format::eAstc5x4SrgbBlock: return "Astc5x4SrgbBlock";
+      case Format::eAstc5x5UnormBlock: return "Astc5x5UnormBlock";
+      case Format::eAstc5x5SrgbBlock: return "Astc5x5SrgbBlock";
+      case Format::eAstc6x5UnormBlock: return "Astc6x5UnormBlock";
+      case Format::eAstc6x5SrgbBlock: return "Astc6x5SrgbBlock";
+      case Format::eAstc6x6UnormBlock: return "Astc6x6UnormBlock";
+      case Format::eAstc6x6SrgbBlock: return "Astc6x6SrgbBlock";
+      case Format::eAstc8x5UnormBlock: return "Astc8x5UnormBlock";
+      case Format::eAstc8x5SrgbBlock: return "Astc8x5SrgbBlock";
+      case Format::eAstc8x6UnormBlock: return "Astc8x6UnormBlock";
+      case Format::eAstc8x6SrgbBlock: return "Astc8x6SrgbBlock";
+      case Format::eAstc8x8UnormBlock: return "Astc8x8UnormBlock";
+      case Format::eAstc8x8SrgbBlock: return "Astc8x8SrgbBlock";
+      case Format::eAstc10x5UnormBlock: return "Astc10x5UnormBlock";
+      case Format::eAstc10x5SrgbBlock: return "Astc10x5SrgbBlock";
+      case Format::eAstc10x6UnormBlock: return "Astc10x6UnormBlock";
+      case Format::eAstc10x6SrgbBlock: return "Astc10x6SrgbBlock";
+      case Format::eAstc10x8UnormBlock: return "Astc10x8UnormBlock";
+      case Format::eAstc10x8SrgbBlock: return "Astc10x8SrgbBlock";
+      case Format::eAstc10x10UnormBlock: return "Astc10x10UnormBlock";
+      case Format::eAstc10x10SrgbBlock: return "Astc10x10SrgbBlock";
+      case Format::eAstc12x10UnormBlock: return "Astc12x10UnormBlock";
+      case Format::eAstc12x10SrgbBlock: return "Astc12x10SrgbBlock";
+      case Format::eAstc12x12UnormBlock: return "Astc12x12UnormBlock";
+      case Format::eAstc12x12SrgbBlock: return "Astc12x12SrgbBlock";
+      case Format::eG8B8G8R8422Unorm: return "G8B8G8R8422Unorm";
+      case Format::eB8G8R8G8422Unorm: return "B8G8R8G8422Unorm";
+      case Format::eG8B8R83Plane420Unorm: return "G8B8R83Plane420Unorm";
+      case Format::eG8B8R82Plane420Unorm: return "G8B8R82Plane420Unorm";
+      case Format::eG8B8R83Plane422Unorm: return "G8B8R83Plane422Unorm";
+      case Format::eG8B8R82Plane422Unorm: return "G8B8R82Plane422Unorm";
+      case Format::eG8B8R83Plane444Unorm: return "G8B8R83Plane444Unorm";
+      case Format::eR10X6UnormPack16: return "R10X6UnormPack16";
+      case Format::eR10X6G10X6Unorm2Pack16: return "R10X6G10X6Unorm2Pack16";
+      case Format::eR10X6G10X6B10X6A10X6Unorm4Pack16: return "R10X6G10X6B10X6A10X6Unorm4Pack16";
+      case Format::eG10X6B10X6G10X6R10X6422Unorm4Pack16: return "G10X6B10X6G10X6R10X6422Unorm4Pack16";
+      case Format::eB10X6G10X6R10X6G10X6422Unorm4Pack16: return "B10X6G10X6R10X6G10X6422Unorm4Pack16";
+      case Format::eG10X6B10X6R10X63Plane420Unorm3Pack16: return "G10X6B10X6R10X63Plane420Unorm3Pack16";
+      case Format::eG10X6B10X6R10X62Plane420Unorm3Pack16: return "G10X6B10X6R10X62Plane420Unorm3Pack16";
+      case Format::eG10X6B10X6R10X63Plane422Unorm3Pack16: return "G10X6B10X6R10X63Plane422Unorm3Pack16";
+      case Format::eG10X6B10X6R10X62Plane422Unorm3Pack16: return "G10X6B10X6R10X62Plane422Unorm3Pack16";
+      case Format::eG10X6B10X6R10X63Plane444Unorm3Pack16: return "G10X6B10X6R10X63Plane444Unorm3Pack16";
+      case Format::eR12X4UnormPack16: return "R12X4UnormPack16";
+      case Format::eR12X4G12X4Unorm2Pack16: return "R12X4G12X4Unorm2Pack16";
+      case Format::eR12X4G12X4B12X4A12X4Unorm4Pack16: return "R12X4G12X4B12X4A12X4Unorm4Pack16";
+      case Format::eG12X4B12X4G12X4R12X4422Unorm4Pack16: return "G12X4B12X4G12X4R12X4422Unorm4Pack16";
+      case Format::eB12X4G12X4R12X4G12X4422Unorm4Pack16: return "B12X4G12X4R12X4G12X4422Unorm4Pack16";
+      case Format::eG12X4B12X4R12X43Plane420Unorm3Pack16: return "G12X4B12X4R12X43Plane420Unorm3Pack16";
+      case Format::eG12X4B12X4R12X42Plane420Unorm3Pack16: return "G12X4B12X4R12X42Plane420Unorm3Pack16";
+      case Format::eG12X4B12X4R12X43Plane422Unorm3Pack16: return "G12X4B12X4R12X43Plane422Unorm3Pack16";
+      case Format::eG12X4B12X4R12X42Plane422Unorm3Pack16: return "G12X4B12X4R12X42Plane422Unorm3Pack16";
+      case Format::eG12X4B12X4R12X43Plane444Unorm3Pack16: return "G12X4B12X4R12X43Plane444Unorm3Pack16";
+      case Format::eG16B16G16R16422Unorm: return "G16B16G16R16422Unorm";
+      case Format::eB16G16R16G16422Unorm: return "B16G16R16G16422Unorm";
+      case Format::eG16B16R163Plane420Unorm: return "G16B16R163Plane420Unorm";
+      case Format::eG16B16R162Plane420Unorm: return "G16B16R162Plane420Unorm";
+      case Format::eG16B16R163Plane422Unorm: return "G16B16R163Plane422Unorm";
+      case Format::eG16B16R162Plane422Unorm: return "G16B16R162Plane422Unorm";
+      case Format::eG16B16R163Plane444Unorm: return "G16B16R163Plane444Unorm";
+      case Format::eG8B8R82Plane444Unorm: return "G8B8R82Plane444Unorm";
+      case Format::eG10X6B10X6R10X62Plane444Unorm3Pack16: return "G10X6B10X6R10X62Plane444Unorm3Pack16";
+      case Format::eG12X4B12X4R12X42Plane444Unorm3Pack16: return "G12X4B12X4R12X42Plane444Unorm3Pack16";
+      case Format::eG16B16R162Plane444Unorm: return "G16B16R162Plane444Unorm";
+      case Format::eA4R4G4B4UnormPack16: return "A4R4G4B4UnormPack16";
+      case Format::eA4B4G4R4UnormPack16: return "A4B4G4R4UnormPack16";
+      case Format::eAstc4x4SfloatBlock: return "Astc4x4SfloatBlock";
+      case Format::eAstc5x4SfloatBlock: return "Astc5x4SfloatBlock";
+      case Format::eAstc5x5SfloatBlock: return "Astc5x5SfloatBlock";
+      case Format::eAstc6x5SfloatBlock: return "Astc6x5SfloatBlock";
+      case Format::eAstc6x6SfloatBlock: return "Astc6x6SfloatBlock";
+      case Format::eAstc8x5SfloatBlock: return "Astc8x5SfloatBlock";
+      case Format::eAstc8x6SfloatBlock: return "Astc8x6SfloatBlock";
+      case Format::eAstc8x8SfloatBlock: return "Astc8x8SfloatBlock";
+      case Format::eAstc10x5SfloatBlock: return "Astc10x5SfloatBlock";
+      case Format::eAstc10x6SfloatBlock: return "Astc10x6SfloatBlock";
+      case Format::eAstc10x8SfloatBlock: return "Astc10x8SfloatBlock";
+      case Format::eAstc10x10SfloatBlock: return "Astc10x10SfloatBlock";
+      case Format::eAstc12x10SfloatBlock: return "Astc12x10SfloatBlock";
+      case Format::eAstc12x12SfloatBlock: return "Astc12x12SfloatBlock";
+      case Format::ePvrtc12BppUnormBlockIMG: return "Pvrtc12BppUnormBlockIMG";
+      case Format::ePvrtc14BppUnormBlockIMG: return "Pvrtc14BppUnormBlockIMG";
+      case Format::ePvrtc22BppUnormBlockIMG: return "Pvrtc22BppUnormBlockIMG";
+      case Format::ePvrtc24BppUnormBlockIMG: return "Pvrtc24BppUnormBlockIMG";
+      case Format::ePvrtc12BppSrgbBlockIMG: return "Pvrtc12BppSrgbBlockIMG";
+      case Format::ePvrtc14BppSrgbBlockIMG: return "Pvrtc14BppSrgbBlockIMG";
+      case Format::ePvrtc22BppSrgbBlockIMG: return "Pvrtc22BppSrgbBlockIMG";
+      case Format::ePvrtc24BppSrgbBlockIMG: return "Pvrtc24BppSrgbBlockIMG";
+      case Format::eR16G16Sfixed5NV: return "R16G16Sfixed5NV";
+      case Format::eA1B5G5R5UnormPack16KHR: return "A1B5G5R5UnormPack16KHR";
+      case Format::eA8UnormKHR: return "A8UnormKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FormatFeatureFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( FormatFeatureFlagBits value )
   {
     switch ( value )
     {
-      case FormatFeatureFlagBits::eSampledImage                                           : return "SampledImage";
-      case FormatFeatureFlagBits::eStorageImage                                           : return "StorageImage";
-      case FormatFeatureFlagBits::eStorageImageAtomic                                     : return "StorageImageAtomic";
-      case FormatFeatureFlagBits::eUniformTexelBuffer                                     : return "UniformTexelBuffer";
-      case FormatFeatureFlagBits::eStorageTexelBuffer                                     : return "StorageTexelBuffer";
-      case FormatFeatureFlagBits::eStorageTexelBufferAtomic                               : return "StorageTexelBufferAtomic";
-      case FormatFeatureFlagBits::eVertexBuffer                                           : return "VertexBuffer";
-      case FormatFeatureFlagBits::eColorAttachment                                        : return "ColorAttachment";
-      case FormatFeatureFlagBits::eColorAttachmentBlend                                   : return "ColorAttachmentBlend";
-      case FormatFeatureFlagBits::eDepthStencilAttachment                                 : return "DepthStencilAttachment";
-      case FormatFeatureFlagBits::eBlitSrc                                                : return "BlitSrc";
-      case FormatFeatureFlagBits::eBlitDst                                                : return "BlitDst";
-      case FormatFeatureFlagBits::eSampledImageFilterLinear                               : return "SampledImageFilterLinear";
-      case FormatFeatureFlagBits::eTransferSrc                                            : return "TransferSrc";
-      case FormatFeatureFlagBits::eTransferDst                                            : return "TransferDst";
-      case FormatFeatureFlagBits::eMidpointChromaSamples                                  : return "MidpointChromaSamples";
-      case FormatFeatureFlagBits::eSampledImageYcbcrConversionLinearFilter                : return "SampledImageYcbcrConversionLinearFilter";
+      case FormatFeatureFlagBits::eSampledImage: return "SampledImage";
+      case FormatFeatureFlagBits::eStorageImage: return "StorageImage";
+      case FormatFeatureFlagBits::eStorageImageAtomic: return "StorageImageAtomic";
+      case FormatFeatureFlagBits::eUniformTexelBuffer: return "UniformTexelBuffer";
+      case FormatFeatureFlagBits::eStorageTexelBuffer: return "StorageTexelBuffer";
+      case FormatFeatureFlagBits::eStorageTexelBufferAtomic: return "StorageTexelBufferAtomic";
+      case FormatFeatureFlagBits::eVertexBuffer: return "VertexBuffer";
+      case FormatFeatureFlagBits::eColorAttachment: return "ColorAttachment";
+      case FormatFeatureFlagBits::eColorAttachmentBlend: return "ColorAttachmentBlend";
+      case FormatFeatureFlagBits::eDepthStencilAttachment: return "DepthStencilAttachment";
+      case FormatFeatureFlagBits::eBlitSrc: return "BlitSrc";
+      case FormatFeatureFlagBits::eBlitDst: return "BlitDst";
+      case FormatFeatureFlagBits::eSampledImageFilterLinear: return "SampledImageFilterLinear";
+      case FormatFeatureFlagBits::eTransferSrc: return "TransferSrc";
+      case FormatFeatureFlagBits::eTransferDst: return "TransferDst";
+      case FormatFeatureFlagBits::eMidpointChromaSamples: return "MidpointChromaSamples";
+      case FormatFeatureFlagBits::eSampledImageYcbcrConversionLinearFilter: return "SampledImageYcbcrConversionLinearFilter";
       case FormatFeatureFlagBits::eSampledImageYcbcrConversionSeparateReconstructionFilter: return "SampledImageYcbcrConversionSeparateReconstructionFilter";
       case FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicit: return "SampledImageYcbcrConversionChromaReconstructionExplicit";
       case FormatFeatureFlagBits::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable:
         return "SampledImageYcbcrConversionChromaReconstructionExplicitForceable";
-      case FormatFeatureFlagBits::eDisjoint                            : return "Disjoint";
-      case FormatFeatureFlagBits::eCositedChromaSamples                : return "CositedChromaSamples";
-      case FormatFeatureFlagBits::eSampledImageFilterMinmax            : return "SampledImageFilterMinmax";
-      case FormatFeatureFlagBits::eVideoDecodeOutputKHR                : return "VideoDecodeOutputKHR";
-      case FormatFeatureFlagBits::eVideoDecodeDpbKHR                   : return "VideoDecodeDpbKHR";
+      case FormatFeatureFlagBits::eDisjoint: return "Disjoint";
+      case FormatFeatureFlagBits::eCositedChromaSamples: return "CositedChromaSamples";
+      case FormatFeatureFlagBits::eSampledImageFilterMinmax: return "SampledImageFilterMinmax";
+      case FormatFeatureFlagBits::eVideoDecodeOutputKHR: return "VideoDecodeOutputKHR";
+      case FormatFeatureFlagBits::eVideoDecodeDpbKHR: return "VideoDecodeDpbKHR";
       case FormatFeatureFlagBits::eAccelerationStructureVertexBufferKHR: return "AccelerationStructureVertexBufferKHR";
-      case FormatFeatureFlagBits::eSampledImageFilterCubicEXT          : return "SampledImageFilterCubicEXT";
-      case FormatFeatureFlagBits::eFragmentDensityMapEXT               : return "FragmentDensityMapEXT";
-      case FormatFeatureFlagBits::eFragmentShadingRateAttachmentKHR    : return "FragmentShadingRateAttachmentKHR";
-      case FormatFeatureFlagBits::eVideoEncodeInputKHR                 : return "VideoEncodeInputKHR";
-      case FormatFeatureFlagBits::eVideoEncodeDpbKHR                   : return "VideoEncodeDpbKHR";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FormatFeatureFlagBits::eSampledImageFilterCubicEXT: return "SampledImageFilterCubicEXT";
+      case FormatFeatureFlagBits::eFragmentDensityMapEXT: return "FragmentDensityMapEXT";
+      case FormatFeatureFlagBits::eFragmentShadingRateAttachmentKHR: return "FragmentShadingRateAttachmentKHR";
+      case FormatFeatureFlagBits::eVideoEncodeInputKHR: return "VideoEncodeInputKHR";
+      case FormatFeatureFlagBits::eVideoEncodeDpbKHR: return "VideoEncodeDpbKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( ImageCreateFlagBits value )
   {
     switch ( value )
     {
-      case ImageCreateFlagBits::eSparseBinding                       : return "SparseBinding";
-      case ImageCreateFlagBits::eSparseResidency                     : return "SparseResidency";
-      case ImageCreateFlagBits::eSparseAliased                       : return "SparseAliased";
-      case ImageCreateFlagBits::eMutableFormat                       : return "MutableFormat";
-      case ImageCreateFlagBits::eCubeCompatible                      : return "CubeCompatible";
-      case ImageCreateFlagBits::eAlias                               : return "Alias";
-      case ImageCreateFlagBits::eSplitInstanceBindRegions            : return "SplitInstanceBindRegions";
-      case ImageCreateFlagBits::e2DArrayCompatible                   : return "2DArrayCompatible";
-      case ImageCreateFlagBits::eBlockTexelViewCompatible            : return "BlockTexelViewCompatible";
-      case ImageCreateFlagBits::eExtendedUsage                       : return "ExtendedUsage";
-      case ImageCreateFlagBits::eProtected                           : return "Protected";
-      case ImageCreateFlagBits::eDisjoint                            : return "Disjoint";
-      case ImageCreateFlagBits::eCornerSampledNV                     : return "CornerSampledNV";
-      case ImageCreateFlagBits::eSampleLocationsCompatibleDepthEXT   : return "SampleLocationsCompatibleDepthEXT";
-      case ImageCreateFlagBits::eSubsampledEXT                       : return "SubsampledEXT";
-      case ImageCreateFlagBits::eDescriptorBufferCaptureReplayEXT    : return "DescriptorBufferCaptureReplayEXT";
+      case ImageCreateFlagBits::eSparseBinding: return "SparseBinding";
+      case ImageCreateFlagBits::eSparseResidency: return "SparseResidency";
+      case ImageCreateFlagBits::eSparseAliased: return "SparseAliased";
+      case ImageCreateFlagBits::eMutableFormat: return "MutableFormat";
+      case ImageCreateFlagBits::eCubeCompatible: return "CubeCompatible";
+      case ImageCreateFlagBits::eAlias: return "Alias";
+      case ImageCreateFlagBits::eSplitInstanceBindRegions: return "SplitInstanceBindRegions";
+      case ImageCreateFlagBits::e2DArrayCompatible: return "2DArrayCompatible";
+      case ImageCreateFlagBits::eBlockTexelViewCompatible: return "BlockTexelViewCompatible";
+      case ImageCreateFlagBits::eExtendedUsage: return "ExtendedUsage";
+      case ImageCreateFlagBits::eProtected: return "Protected";
+      case ImageCreateFlagBits::eDisjoint: return "Disjoint";
+      case ImageCreateFlagBits::eCornerSampledNV: return "CornerSampledNV";
+      case ImageCreateFlagBits::eSampleLocationsCompatibleDepthEXT: return "SampleLocationsCompatibleDepthEXT";
+      case ImageCreateFlagBits::eSubsampledEXT: return "SubsampledEXT";
+      case ImageCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
       case ImageCreateFlagBits::eMultisampledRenderToSingleSampledEXT: return "MultisampledRenderToSingleSampledEXT";
-      case ImageCreateFlagBits::e2DViewCompatibleEXT                 : return "2DViewCompatibleEXT";
-      case ImageCreateFlagBits::eVideoProfileIndependentKHR          : return "VideoProfileIndependentKHR";
-      case ImageCreateFlagBits::eFragmentDensityMapOffsetEXT         : return "FragmentDensityMapOffsetEXT";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ImageCreateFlagBits::e2DViewCompatibleEXT: return "2DViewCompatibleEXT";
+      case ImageCreateFlagBits::eFragmentDensityMapOffsetQCOM: return "FragmentDensityMapOffsetQCOM";
+      case ImageCreateFlagBits::eVideoProfileIndependentKHR: return "VideoProfileIndependentKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageTiling value )
+  VULKAN_HPP_INLINE std::string to_string( ImageTiling value )
   {
     switch ( value )
     {
-      case ImageTiling::eOptimal             : return "Optimal";
-      case ImageTiling::eLinear              : return "Linear";
+      case ImageTiling::eOptimal: return "Optimal";
+      case ImageTiling::eLinear: return "Linear";
       case ImageTiling::eDrmFormatModifierEXT: return "DrmFormatModifierEXT";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageType value )
+  VULKAN_HPP_INLINE std::string to_string( ImageType value )
   {
     switch ( value )
     {
       case ImageType::e1D: return "1D";
       case ImageType::e2D: return "2D";
       case ImageType::e3D: return "3D";
-      default            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageUsageFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( ImageUsageFlagBits value )
   {
     switch ( value )
     {
-      case ImageUsageFlagBits::eTransferSrc                       : return "TransferSrc";
-      case ImageUsageFlagBits::eTransferDst                       : return "TransferDst";
-      case ImageUsageFlagBits::eSampled                           : return "Sampled";
-      case ImageUsageFlagBits::eStorage                           : return "Storage";
-      case ImageUsageFlagBits::eColorAttachment                   : return "ColorAttachment";
-      case ImageUsageFlagBits::eDepthStencilAttachment            : return "DepthStencilAttachment";
-      case ImageUsageFlagBits::eTransientAttachment               : return "TransientAttachment";
-      case ImageUsageFlagBits::eInputAttachment                   : return "InputAttachment";
-      case ImageUsageFlagBits::eHostTransfer                      : return "HostTransfer";
-      case ImageUsageFlagBits::eVideoDecodeDstKHR                 : return "VideoDecodeDstKHR";
-      case ImageUsageFlagBits::eVideoDecodeSrcKHR                 : return "VideoDecodeSrcKHR";
-      case ImageUsageFlagBits::eVideoDecodeDpbKHR                 : return "VideoDecodeDpbKHR";
-      case ImageUsageFlagBits::eFragmentDensityMapEXT             : return "FragmentDensityMapEXT";
-      case ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR  : return "FragmentShadingRateAttachmentKHR";
-      case ImageUsageFlagBits::eVideoEncodeDstKHR                 : return "VideoEncodeDstKHR";
-      case ImageUsageFlagBits::eVideoEncodeSrcKHR                 : return "VideoEncodeSrcKHR";
-      case ImageUsageFlagBits::eVideoEncodeDpbKHR                 : return "VideoEncodeDpbKHR";
-      case ImageUsageFlagBits::eAttachmentFeedbackLoopEXT         : return "AttachmentFeedbackLoopEXT";
-      case ImageUsageFlagBits::eInvocationMaskHUAWEI              : return "InvocationMaskHUAWEI";
-      case ImageUsageFlagBits::eSampleWeightQCOM                  : return "SampleWeightQCOM";
-      case ImageUsageFlagBits::eSampleBlockMatchQCOM              : return "SampleBlockMatchQCOM";
-      case ImageUsageFlagBits::eTensorAliasingARM                 : return "TensorAliasingARM";
-      case ImageUsageFlagBits::eTileMemoryQCOM                    : return "TileMemoryQCOM";
-      case ImageUsageFlagBits::eVideoEncodeQuantizationDeltaMapKHR: return "VideoEncodeQuantizationDeltaMapKHR";
-      case ImageUsageFlagBits::eVideoEncodeEmphasisMapKHR         : return "VideoEncodeEmphasisMapKHR";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ImageUsageFlagBits::eTransferSrc: return "TransferSrc";
+      case ImageUsageFlagBits::eTransferDst: return "TransferDst";
+      case ImageUsageFlagBits::eSampled: return "Sampled";
+      case ImageUsageFlagBits::eStorage: return "Storage";
+      case ImageUsageFlagBits::eColorAttachment: return "ColorAttachment";
+      case ImageUsageFlagBits::eDepthStencilAttachment: return "DepthStencilAttachment";
+      case ImageUsageFlagBits::eTransientAttachment: return "TransientAttachment";
+      case ImageUsageFlagBits::eInputAttachment: return "InputAttachment";
+      case ImageUsageFlagBits::eVideoDecodeDstKHR: return "VideoDecodeDstKHR";
+      case ImageUsageFlagBits::eVideoDecodeSrcKHR: return "VideoDecodeSrcKHR";
+      case ImageUsageFlagBits::eVideoDecodeDpbKHR: return "VideoDecodeDpbKHR";
+      case ImageUsageFlagBits::eFragmentDensityMapEXT: return "FragmentDensityMapEXT";
+      case ImageUsageFlagBits::eFragmentShadingRateAttachmentKHR: return "FragmentShadingRateAttachmentKHR";
+      case ImageUsageFlagBits::eHostTransferEXT: return "HostTransferEXT";
+      case ImageUsageFlagBits::eVideoEncodeDstKHR: return "VideoEncodeDstKHR";
+      case ImageUsageFlagBits::eVideoEncodeSrcKHR: return "VideoEncodeSrcKHR";
+      case ImageUsageFlagBits::eVideoEncodeDpbKHR: return "VideoEncodeDpbKHR";
+      case ImageUsageFlagBits::eAttachmentFeedbackLoopEXT: return "AttachmentFeedbackLoopEXT";
+      case ImageUsageFlagBits::eInvocationMaskHUAWEI: return "InvocationMaskHUAWEI";
+      case ImageUsageFlagBits::eSampleWeightQCOM: return "SampleWeightQCOM";
+      case ImageUsageFlagBits::eSampleBlockMatchQCOM: return "SampleBlockMatchQCOM";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( InstanceCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( InstanceCreateFlagBits value )
   {
     switch ( value )
     {
       case InstanceCreateFlagBits::eEnumeratePortabilityKHR: return "EnumeratePortabilityKHR";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( InternalAllocationType value )
+  VULKAN_HPP_INLINE std::string to_string( InternalAllocationType value )
   {
     switch ( value )
     {
       case InternalAllocationType::eExecutable: return "Executable";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryHeapFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryHeapFlagBits value )
   {
     switch ( value )
     {
-      case MemoryHeapFlagBits::eDeviceLocal   : return "DeviceLocal";
-      case MemoryHeapFlagBits::eMultiInstance : return "MultiInstance";
-      case MemoryHeapFlagBits::eTileMemoryQCOM: return "TileMemoryQCOM";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case MemoryHeapFlagBits::eDeviceLocal: return "DeviceLocal";
+      case MemoryHeapFlagBits::eMultiInstance: return "MultiInstance";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryPropertyFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryPropertyFlagBits value )
   {
     switch ( value )
     {
-      case MemoryPropertyFlagBits::eDeviceLocal      : return "DeviceLocal";
-      case MemoryPropertyFlagBits::eHostVisible      : return "HostVisible";
-      case MemoryPropertyFlagBits::eHostCoherent     : return "HostCoherent";
-      case MemoryPropertyFlagBits::eHostCached       : return "HostCached";
-      case MemoryPropertyFlagBits::eLazilyAllocated  : return "LazilyAllocated";
-      case MemoryPropertyFlagBits::eProtected        : return "Protected";
+      case MemoryPropertyFlagBits::eDeviceLocal: return "DeviceLocal";
+      case MemoryPropertyFlagBits::eHostVisible: return "HostVisible";
+      case MemoryPropertyFlagBits::eHostCoherent: return "HostCoherent";
+      case MemoryPropertyFlagBits::eHostCached: return "HostCached";
+      case MemoryPropertyFlagBits::eLazilyAllocated: return "LazilyAllocated";
+      case MemoryPropertyFlagBits::eProtected: return "Protected";
       case MemoryPropertyFlagBits::eDeviceCoherentAMD: return "DeviceCoherentAMD";
       case MemoryPropertyFlagBits::eDeviceUncachedAMD: return "DeviceUncachedAMD";
-      case MemoryPropertyFlagBits::eRdmaCapableNV    : return "RdmaCapableNV";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case MemoryPropertyFlagBits::eRdmaCapableNV: return "RdmaCapableNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PhysicalDeviceType value )
+  VULKAN_HPP_INLINE std::string to_string( PhysicalDeviceType value )
   {
     switch ( value )
     {
-      case PhysicalDeviceType::eOther        : return "Other";
+      case PhysicalDeviceType::eOther: return "Other";
       case PhysicalDeviceType::eIntegratedGpu: return "IntegratedGpu";
-      case PhysicalDeviceType::eDiscreteGpu  : return "DiscreteGpu";
-      case PhysicalDeviceType::eVirtualGpu   : return "VirtualGpu";
-      case PhysicalDeviceType::eCpu          : return "Cpu";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PhysicalDeviceType::eDiscreteGpu: return "DiscreteGpu";
+      case PhysicalDeviceType::eVirtualGpu: return "VirtualGpu";
+      case PhysicalDeviceType::eCpu: return "Cpu";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueueFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( QueueFlagBits value )
   {
     switch ( value )
     {
-      case QueueFlagBits::eGraphics      : return "Graphics";
-      case QueueFlagBits::eCompute       : return "Compute";
-      case QueueFlagBits::eTransfer      : return "Transfer";
-      case QueueFlagBits::eSparseBinding : return "SparseBinding";
-      case QueueFlagBits::eProtected     : return "Protected";
+      case QueueFlagBits::eGraphics: return "Graphics";
+      case QueueFlagBits::eCompute: return "Compute";
+      case QueueFlagBits::eTransfer: return "Transfer";
+      case QueueFlagBits::eSparseBinding: return "SparseBinding";
+      case QueueFlagBits::eProtected: return "Protected";
       case QueueFlagBits::eVideoDecodeKHR: return "VideoDecodeKHR";
       case QueueFlagBits::eVideoEncodeKHR: return "VideoEncodeKHR";
-      case QueueFlagBits::eOpticalFlowNV : return "OpticalFlowNV";
-      case QueueFlagBits::eDataGraphARM  : return "DataGraphARM";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case QueueFlagBits::eOpticalFlowNV: return "OpticalFlowNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SampleCountFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( SampleCountFlagBits value )
   {
     switch ( value )
     {
-      case SampleCountFlagBits::e1 : return "1";
-      case SampleCountFlagBits::e2 : return "2";
-      case SampleCountFlagBits::e4 : return "4";
-      case SampleCountFlagBits::e8 : return "8";
+      case SampleCountFlagBits::e1: return "1";
+      case SampleCountFlagBits::e2: return "2";
+      case SampleCountFlagBits::e4: return "4";
+      case SampleCountFlagBits::e8: return "8";
       case SampleCountFlagBits::e16: return "16";
       case SampleCountFlagBits::e32: return "32";
       case SampleCountFlagBits::e64: return "64";
-      default                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SystemAllocationScope value )
+  VULKAN_HPP_INLINE std::string to_string( SystemAllocationScope value )
   {
     switch ( value )
     {
-      case SystemAllocationScope::eCommand : return "Command";
-      case SystemAllocationScope::eObject  : return "Object";
-      case SystemAllocationScope::eCache   : return "Cache";
-      case SystemAllocationScope::eDevice  : return "Device";
+      case SystemAllocationScope::eCommand: return "Command";
+      case SystemAllocationScope::eObject: return "Object";
+      case SystemAllocationScope::eCache: return "Cache";
+      case SystemAllocationScope::eDevice: return "Device";
       case SystemAllocationScope::eInstance: return "Instance";
-      default                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceCreateFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( DeviceCreateFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceQueueCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceQueueCreateFlagBits value )
   {
     switch ( value )
     {
       case DeviceQueueCreateFlagBits::eProtected: return "Protected";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineStageFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineStageFlagBits value )
   {
     switch ( value )
     {
-      case PipelineStageFlagBits::eTopOfPipe                       : return "TopOfPipe";
-      case PipelineStageFlagBits::eDrawIndirect                    : return "DrawIndirect";
-      case PipelineStageFlagBits::eVertexInput                     : return "VertexInput";
-      case PipelineStageFlagBits::eVertexShader                    : return "VertexShader";
-      case PipelineStageFlagBits::eTessellationControlShader       : return "TessellationControlShader";
-      case PipelineStageFlagBits::eTessellationEvaluationShader    : return "TessellationEvaluationShader";
-      case PipelineStageFlagBits::eGeometryShader                  : return "GeometryShader";
-      case PipelineStageFlagBits::eFragmentShader                  : return "FragmentShader";
-      case PipelineStageFlagBits::eEarlyFragmentTests              : return "EarlyFragmentTests";
-      case PipelineStageFlagBits::eLateFragmentTests               : return "LateFragmentTests";
-      case PipelineStageFlagBits::eColorAttachmentOutput           : return "ColorAttachmentOutput";
-      case PipelineStageFlagBits::eComputeShader                   : return "ComputeShader";
-      case PipelineStageFlagBits::eTransfer                        : return "Transfer";
-      case PipelineStageFlagBits::eBottomOfPipe                    : return "BottomOfPipe";
-      case PipelineStageFlagBits::eHost                            : return "Host";
-      case PipelineStageFlagBits::eAllGraphics                     : return "AllGraphics";
-      case PipelineStageFlagBits::eAllCommands                     : return "AllCommands";
-      case PipelineStageFlagBits::eNone                            : return "None";
-      case PipelineStageFlagBits::eTransformFeedbackEXT            : return "TransformFeedbackEXT";
-      case PipelineStageFlagBits::eConditionalRenderingEXT         : return "ConditionalRenderingEXT";
-      case PipelineStageFlagBits::eAccelerationStructureBuildKHR   : return "AccelerationStructureBuildKHR";
-      case PipelineStageFlagBits::eRayTracingShaderKHR             : return "RayTracingShaderKHR";
-      case PipelineStageFlagBits::eFragmentDensityProcessEXT       : return "FragmentDensityProcessEXT";
+      case PipelineStageFlagBits::eTopOfPipe: return "TopOfPipe";
+      case PipelineStageFlagBits::eDrawIndirect: return "DrawIndirect";
+      case PipelineStageFlagBits::eVertexInput: return "VertexInput";
+      case PipelineStageFlagBits::eVertexShader: return "VertexShader";
+      case PipelineStageFlagBits::eTessellationControlShader: return "TessellationControlShader";
+      case PipelineStageFlagBits::eTessellationEvaluationShader: return "TessellationEvaluationShader";
+      case PipelineStageFlagBits::eGeometryShader: return "GeometryShader";
+      case PipelineStageFlagBits::eFragmentShader: return "FragmentShader";
+      case PipelineStageFlagBits::eEarlyFragmentTests: return "EarlyFragmentTests";
+      case PipelineStageFlagBits::eLateFragmentTests: return "LateFragmentTests";
+      case PipelineStageFlagBits::eColorAttachmentOutput: return "ColorAttachmentOutput";
+      case PipelineStageFlagBits::eComputeShader: return "ComputeShader";
+      case PipelineStageFlagBits::eTransfer: return "Transfer";
+      case PipelineStageFlagBits::eBottomOfPipe: return "BottomOfPipe";
+      case PipelineStageFlagBits::eHost: return "Host";
+      case PipelineStageFlagBits::eAllGraphics: return "AllGraphics";
+      case PipelineStageFlagBits::eAllCommands: return "AllCommands";
+      case PipelineStageFlagBits::eNone: return "None";
+      case PipelineStageFlagBits::eTransformFeedbackEXT: return "TransformFeedbackEXT";
+      case PipelineStageFlagBits::eConditionalRenderingEXT: return "ConditionalRenderingEXT";
+      case PipelineStageFlagBits::eAccelerationStructureBuildKHR: return "AccelerationStructureBuildKHR";
+      case PipelineStageFlagBits::eRayTracingShaderKHR: return "RayTracingShaderKHR";
+      case PipelineStageFlagBits::eFragmentDensityProcessEXT: return "FragmentDensityProcessEXT";
       case PipelineStageFlagBits::eFragmentShadingRateAttachmentKHR: return "FragmentShadingRateAttachmentKHR";
-      case PipelineStageFlagBits::eTaskShaderEXT                   : return "TaskShaderEXT";
-      case PipelineStageFlagBits::eMeshShaderEXT                   : return "MeshShaderEXT";
-      case PipelineStageFlagBits::eCommandPreprocessEXT            : return "CommandPreprocessEXT";
-      default                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineStageFlagBits::eCommandPreprocessNV: return "CommandPreprocessNV";
+      case PipelineStageFlagBits::eTaskShaderEXT: return "TaskShaderEXT";
+      case PipelineStageFlagBits::eMeshShaderEXT: return "MeshShaderEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryMapFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryMapFlagBits value )
   {
     switch ( value )
     {
       case MemoryMapFlagBits::ePlacedEXT: return "PlacedEXT";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageAspectFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( ImageAspectFlagBits value )
   {
     switch ( value )
     {
-      case ImageAspectFlagBits::eColor          : return "Color";
-      case ImageAspectFlagBits::eDepth          : return "Depth";
-      case ImageAspectFlagBits::eStencil        : return "Stencil";
-      case ImageAspectFlagBits::eMetadata       : return "Metadata";
-      case ImageAspectFlagBits::ePlane0         : return "Plane0";
-      case ImageAspectFlagBits::ePlane1         : return "Plane1";
-      case ImageAspectFlagBits::ePlane2         : return "Plane2";
-      case ImageAspectFlagBits::eNone           : return "None";
+      case ImageAspectFlagBits::eColor: return "Color";
+      case ImageAspectFlagBits::eDepth: return "Depth";
+      case ImageAspectFlagBits::eStencil: return "Stencil";
+      case ImageAspectFlagBits::eMetadata: return "Metadata";
+      case ImageAspectFlagBits::ePlane0: return "Plane0";
+      case ImageAspectFlagBits::ePlane1: return "Plane1";
+      case ImageAspectFlagBits::ePlane2: return "Plane2";
+      case ImageAspectFlagBits::eNone: return "None";
       case ImageAspectFlagBits::eMemoryPlane0EXT: return "MemoryPlane0EXT";
       case ImageAspectFlagBits::eMemoryPlane1EXT: return "MemoryPlane1EXT";
       case ImageAspectFlagBits::eMemoryPlane2EXT: return "MemoryPlane2EXT";
       case ImageAspectFlagBits::eMemoryPlane3EXT: return "MemoryPlane3EXT";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SparseImageFormatFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( SparseImageFormatFlagBits value )
   {
     switch ( value )
     {
-      case SparseImageFormatFlagBits::eSingleMiptail       : return "SingleMiptail";
-      case SparseImageFormatFlagBits::eAlignedMipSize      : return "AlignedMipSize";
+      case SparseImageFormatFlagBits::eSingleMiptail: return "SingleMiptail";
+      case SparseImageFormatFlagBits::eAlignedMipSize: return "AlignedMipSize";
       case SparseImageFormatFlagBits::eNonstandardBlockSize: return "NonstandardBlockSize";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SparseMemoryBindFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( SparseMemoryBindFlagBits value )
   {
     switch ( value )
     {
       case SparseMemoryBindFlagBits::eMetadata: return "Metadata";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FenceCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( FenceCreateFlagBits value )
   {
     switch ( value )
     {
       case FenceCreateFlagBits::eSignaled: return "Signaled";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SemaphoreCreateFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreCreateFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryPoolCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case QueryPoolCreateFlagBits::eResetKHR: return "ResetKHR";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryResultFlagBits value )
-  {
-    switch ( value )
-    {
-      case QueryResultFlagBits::e64              : return "64";
-      case QueryResultFlagBits::eWait            : return "Wait";
-      case QueryResultFlagBits::eWithAvailability: return "WithAvailability";
-      case QueryResultFlagBits::ePartial         : return "Partial";
-      case QueryResultFlagBits::eWithStatusKHR   : return "WithStatusKHR";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryType value )
-  {
-    switch ( value )
-    {
-      case QueryType::eOcclusion                                               : return "Occlusion";
-      case QueryType::ePipelineStatistics                                      : return "PipelineStatistics";
-      case QueryType::eTimestamp                                               : return "Timestamp";
-      case QueryType::eResultStatusOnlyKHR                                     : return "ResultStatusOnlyKHR";
-      case QueryType::eTransformFeedbackStreamEXT                              : return "TransformFeedbackStreamEXT";
-      case QueryType::ePerformanceQueryKHR                                     : return "PerformanceQueryKHR";
-      case QueryType::eAccelerationStructureCompactedSizeKHR                   : return "AccelerationStructureCompactedSizeKHR";
-      case QueryType::eAccelerationStructureSerializationSizeKHR               : return "AccelerationStructureSerializationSizeKHR";
-      case QueryType::eAccelerationStructureCompactedSizeNV                    : return "AccelerationStructureCompactedSizeNV";
-      case QueryType::ePerformanceQueryINTEL                                   : return "PerformanceQueryINTEL";
-      case QueryType::eVideoEncodeFeedbackKHR                                  : return "VideoEncodeFeedbackKHR";
-      case QueryType::eMeshPrimitivesGeneratedEXT                              : return "MeshPrimitivesGeneratedEXT";
-      case QueryType::ePrimitivesGeneratedEXT                                  : return "PrimitivesGeneratedEXT";
-      case QueryType::eAccelerationStructureSerializationBottomLevelPointersKHR: return "AccelerationStructureSerializationBottomLevelPointersKHR";
-      case QueryType::eAccelerationStructureSizeKHR                            : return "AccelerationStructureSizeKHR";
-      case QueryType::eMicromapSerializationSizeEXT                            : return "MicromapSerializationSizeEXT";
-      case QueryType::eMicromapCompactedSizeEXT                                : return "MicromapCompactedSizeEXT";
-      default                                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BufferCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case BufferCreateFlagBits::eSparseBinding                   : return "SparseBinding";
-      case BufferCreateFlagBits::eSparseResidency                 : return "SparseResidency";
-      case BufferCreateFlagBits::eSparseAliased                   : return "SparseAliased";
-      case BufferCreateFlagBits::eProtected                       : return "Protected";
-      case BufferCreateFlagBits::eDeviceAddressCaptureReplay      : return "DeviceAddressCaptureReplay";
-      case BufferCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
-      case BufferCreateFlagBits::eVideoProfileIndependentKHR      : return "VideoProfileIndependentKHR";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BufferUsageFlagBits value )
-  {
-    switch ( value )
-    {
-      case BufferUsageFlagBits::eTransferSrc                      : return "TransferSrc";
-      case BufferUsageFlagBits::eTransferDst                      : return "TransferDst";
-      case BufferUsageFlagBits::eUniformTexelBuffer               : return "UniformTexelBuffer";
-      case BufferUsageFlagBits::eStorageTexelBuffer               : return "StorageTexelBuffer";
-      case BufferUsageFlagBits::eUniformBuffer                    : return "UniformBuffer";
-      case BufferUsageFlagBits::eStorageBuffer                    : return "StorageBuffer";
-      case BufferUsageFlagBits::eIndexBuffer                      : return "IndexBuffer";
-      case BufferUsageFlagBits::eVertexBuffer                     : return "VertexBuffer";
-      case BufferUsageFlagBits::eIndirectBuffer                   : return "IndirectBuffer";
-      case BufferUsageFlagBits::eShaderDeviceAddress              : return "ShaderDeviceAddress";
-      case BufferUsageFlagBits::eVideoDecodeSrcKHR                : return "VideoDecodeSrcKHR";
-      case BufferUsageFlagBits::eVideoDecodeDstKHR                : return "VideoDecodeDstKHR";
-      case BufferUsageFlagBits::eTransformFeedbackBufferEXT       : return "TransformFeedbackBufferEXT";
-      case BufferUsageFlagBits::eTransformFeedbackCounterBufferEXT: return "TransformFeedbackCounterBufferEXT";
-      case BufferUsageFlagBits::eConditionalRenderingEXT          : return "ConditionalRenderingEXT";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case BufferUsageFlagBits::eExecutionGraphScratchAMDX: return "ExecutionGraphScratchAMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR: return "AccelerationStructureBuildInputReadOnlyKHR";
-      case BufferUsageFlagBits::eAccelerationStructureStorageKHR           : return "AccelerationStructureStorageKHR";
-      case BufferUsageFlagBits::eShaderBindingTableKHR                     : return "ShaderBindingTableKHR";
-      case BufferUsageFlagBits::eVideoEncodeDstKHR                         : return "VideoEncodeDstKHR";
-      case BufferUsageFlagBits::eVideoEncodeSrcKHR                         : return "VideoEncodeSrcKHR";
-      case BufferUsageFlagBits::eSamplerDescriptorBufferEXT                : return "SamplerDescriptorBufferEXT";
-      case BufferUsageFlagBits::eResourceDescriptorBufferEXT               : return "ResourceDescriptorBufferEXT";
-      case BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT        : return "PushDescriptorsDescriptorBufferEXT";
-      case BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT             : return "MicromapBuildInputReadOnlyEXT";
-      case BufferUsageFlagBits::eMicromapStorageEXT                        : return "MicromapStorageEXT";
-      case BufferUsageFlagBits::eTileMemoryQCOM                            : return "TileMemoryQCOM";
-      default                                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SharingMode value )
-  {
-    switch ( value )
-    {
-      case SharingMode::eExclusive : return "Exclusive";
-      case SharingMode::eConcurrent: return "Concurrent";
-      default                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageLayout value )
-  {
-    switch ( value )
-    {
-      case ImageLayout::eUndefined                              : return "Undefined";
-      case ImageLayout::eGeneral                                : return "General";
-      case ImageLayout::eColorAttachmentOptimal                 : return "ColorAttachmentOptimal";
-      case ImageLayout::eDepthStencilAttachmentOptimal          : return "DepthStencilAttachmentOptimal";
-      case ImageLayout::eDepthStencilReadOnlyOptimal            : return "DepthStencilReadOnlyOptimal";
-      case ImageLayout::eShaderReadOnlyOptimal                  : return "ShaderReadOnlyOptimal";
-      case ImageLayout::eTransferSrcOptimal                     : return "TransferSrcOptimal";
-      case ImageLayout::eTransferDstOptimal                     : return "TransferDstOptimal";
-      case ImageLayout::ePreinitialized                         : return "Preinitialized";
-      case ImageLayout::eDepthReadOnlyStencilAttachmentOptimal  : return "DepthReadOnlyStencilAttachmentOptimal";
-      case ImageLayout::eDepthAttachmentStencilReadOnlyOptimal  : return "DepthAttachmentStencilReadOnlyOptimal";
-      case ImageLayout::eDepthAttachmentOptimal                 : return "DepthAttachmentOptimal";
-      case ImageLayout::eDepthReadOnlyOptimal                   : return "DepthReadOnlyOptimal";
-      case ImageLayout::eStencilAttachmentOptimal               : return "StencilAttachmentOptimal";
-      case ImageLayout::eStencilReadOnlyOptimal                 : return "StencilReadOnlyOptimal";
-      case ImageLayout::eReadOnlyOptimal                        : return "ReadOnlyOptimal";
-      case ImageLayout::eAttachmentOptimal                      : return "AttachmentOptimal";
-      case ImageLayout::eRenderingLocalRead                     : return "RenderingLocalRead";
-      case ImageLayout::ePresentSrcKHR                          : return "PresentSrcKHR";
-      case ImageLayout::eVideoDecodeDstKHR                      : return "VideoDecodeDstKHR";
-      case ImageLayout::eVideoDecodeSrcKHR                      : return "VideoDecodeSrcKHR";
-      case ImageLayout::eVideoDecodeDpbKHR                      : return "VideoDecodeDpbKHR";
-      case ImageLayout::eSharedPresentKHR                       : return "SharedPresentKHR";
-      case ImageLayout::eFragmentDensityMapOptimalEXT           : return "FragmentDensityMapOptimalEXT";
-      case ImageLayout::eFragmentShadingRateAttachmentOptimalKHR: return "FragmentShadingRateAttachmentOptimalKHR";
-      case ImageLayout::eVideoEncodeDstKHR                      : return "VideoEncodeDstKHR";
-      case ImageLayout::eVideoEncodeSrcKHR                      : return "VideoEncodeSrcKHR";
-      case ImageLayout::eVideoEncodeDpbKHR                      : return "VideoEncodeDpbKHR";
-      case ImageLayout::eAttachmentFeedbackLoopOptimalEXT       : return "AttachmentFeedbackLoopOptimalEXT";
-      case ImageLayout::eTensorAliasingARM                      : return "TensorAliasingARM";
-      case ImageLayout::eVideoEncodeQuantizationMapKHR          : return "VideoEncodeQuantizationMapKHR";
-      case ImageLayout::eZeroInitializedEXT                     : return "ZeroInitializedEXT";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ComponentSwizzle value )
-  {
-    switch ( value )
-    {
-      case ComponentSwizzle::eIdentity: return "Identity";
-      case ComponentSwizzle::eZero    : return "Zero";
-      case ComponentSwizzle::eOne     : return "One";
-      case ComponentSwizzle::eR       : return "R";
-      case ComponentSwizzle::eG       : return "G";
-      case ComponentSwizzle::eB       : return "B";
-      case ComponentSwizzle::eA       : return "A";
-      default                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageViewCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case ImageViewCreateFlagBits::eFragmentDensityMapDynamicEXT    : return "FragmentDensityMapDynamicEXT";
-      case ImageViewCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
-      case ImageViewCreateFlagBits::eFragmentDensityMapDeferredEXT   : return "FragmentDensityMapDeferredEXT";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageViewType value )
-  {
-    switch ( value )
-    {
-      case ImageViewType::e1D       : return "1D";
-      case ImageViewType::e2D       : return "2D";
-      case ImageViewType::e3D       : return "3D";
-      case ImageViewType::eCube     : return "Cube";
-      case ImageViewType::e1DArray  : return "1DArray";
-      case ImageViewType::e2DArray  : return "2DArray";
-      case ImageViewType::eCubeArray: return "CubeArray";
-      default                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccessFlagBits value )
-  {
-    switch ( value )
-    {
-      case AccessFlagBits::eIndirectCommandRead                 : return "IndirectCommandRead";
-      case AccessFlagBits::eIndexRead                           : return "IndexRead";
-      case AccessFlagBits::eVertexAttributeRead                 : return "VertexAttributeRead";
-      case AccessFlagBits::eUniformRead                         : return "UniformRead";
-      case AccessFlagBits::eInputAttachmentRead                 : return "InputAttachmentRead";
-      case AccessFlagBits::eShaderRead                          : return "ShaderRead";
-      case AccessFlagBits::eShaderWrite                         : return "ShaderWrite";
-      case AccessFlagBits::eColorAttachmentRead                 : return "ColorAttachmentRead";
-      case AccessFlagBits::eColorAttachmentWrite                : return "ColorAttachmentWrite";
-      case AccessFlagBits::eDepthStencilAttachmentRead          : return "DepthStencilAttachmentRead";
-      case AccessFlagBits::eDepthStencilAttachmentWrite         : return "DepthStencilAttachmentWrite";
-      case AccessFlagBits::eTransferRead                        : return "TransferRead";
-      case AccessFlagBits::eTransferWrite                       : return "TransferWrite";
-      case AccessFlagBits::eHostRead                            : return "HostRead";
-      case AccessFlagBits::eHostWrite                           : return "HostWrite";
-      case AccessFlagBits::eMemoryRead                          : return "MemoryRead";
-      case AccessFlagBits::eMemoryWrite                         : return "MemoryWrite";
-      case AccessFlagBits::eNone                                : return "None";
-      case AccessFlagBits::eTransformFeedbackWriteEXT           : return "TransformFeedbackWriteEXT";
-      case AccessFlagBits::eTransformFeedbackCounterReadEXT     : return "TransformFeedbackCounterReadEXT";
-      case AccessFlagBits::eTransformFeedbackCounterWriteEXT    : return "TransformFeedbackCounterWriteEXT";
-      case AccessFlagBits::eConditionalRenderingReadEXT         : return "ConditionalRenderingReadEXT";
-      case AccessFlagBits::eColorAttachmentReadNoncoherentEXT   : return "ColorAttachmentReadNoncoherentEXT";
-      case AccessFlagBits::eAccelerationStructureReadKHR        : return "AccelerationStructureReadKHR";
-      case AccessFlagBits::eAccelerationStructureWriteKHR       : return "AccelerationStructureWriteKHR";
-      case AccessFlagBits::eFragmentDensityMapReadEXT           : return "FragmentDensityMapReadEXT";
-      case AccessFlagBits::eFragmentShadingRateAttachmentReadKHR: return "FragmentShadingRateAttachmentReadKHR";
-      case AccessFlagBits::eCommandPreprocessReadEXT            : return "CommandPreprocessReadEXT";
-      case AccessFlagBits::eCommandPreprocessWriteEXT           : return "CommandPreprocessWriteEXT";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DependencyFlagBits value )
-  {
-    switch ( value )
-    {
-      case DependencyFlagBits::eByRegion                                   : return "ByRegion";
-      case DependencyFlagBits::eDeviceGroup                                : return "DeviceGroup";
-      case DependencyFlagBits::eViewLocal                                  : return "ViewLocal";
-      case DependencyFlagBits::eFeedbackLoopEXT                            : return "FeedbackLoopEXT";
-      case DependencyFlagBits::eQueueFamilyOwnershipTransferUseAllStagesKHR: return "QueueFamilyOwnershipTransferUseAllStagesKHR";
-      case DependencyFlagBits::eAsymmetricEventKHR                         : return "AsymmetricEventKHR";
-      default                                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandPoolCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case CommandPoolCreateFlagBits::eTransient         : return "Transient";
-      case CommandPoolCreateFlagBits::eResetCommandBuffer: return "ResetCommandBuffer";
-      case CommandPoolCreateFlagBits::eProtected         : return "Protected";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandPoolResetFlagBits value )
-  {
-    switch ( value )
-    {
-      case CommandPoolResetFlagBits::eReleaseResources: return "ReleaseResources";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandBufferLevel value )
-  {
-    switch ( value )
-    {
-      case CommandBufferLevel::ePrimary  : return "Primary";
-      case CommandBufferLevel::eSecondary: return "Secondary";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandBufferResetFlagBits value )
-  {
-    switch ( value )
-    {
-      case CommandBufferResetFlagBits::eReleaseResources: return "ReleaseResources";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandBufferUsageFlagBits value )
-  {
-    switch ( value )
-    {
-      case CommandBufferUsageFlagBits::eOneTimeSubmit     : return "OneTimeSubmit";
-      case CommandBufferUsageFlagBits::eRenderPassContinue: return "RenderPassContinue";
-      case CommandBufferUsageFlagBits::eSimultaneousUse   : return "SimultaneousUse";
-      default                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryControlFlagBits value )
-  {
-    switch ( value )
-    {
-      case QueryControlFlagBits::ePrecise: return "Precise";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndexType value )
-  {
-    switch ( value )
-    {
-      case IndexType::eUint16 : return "Uint16";
-      case IndexType::eUint32 : return "Uint32";
-      case IndexType::eUint8  : return "Uint8";
-      case IndexType::eNoneKHR: return "NoneKHR";
-      default                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCacheHeaderVersion value )
-  {
-    switch ( value )
-    {
-      case PipelineCacheHeaderVersion::eOne          : return "One";
-      case PipelineCacheHeaderVersion::eDataGraphQCOM: return "DataGraphQCOM";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( EventCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( EventCreateFlagBits value )
   {
     switch ( value )
     {
       case EventCreateFlagBits::eDeviceOnly: return "DeviceOnly";
-      default                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BufferViewCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderModuleCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCacheCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( QueryPipelineStatisticFlagBits value )
   {
     switch ( value )
     {
-      case PipelineCacheCreateFlagBits::eExternallySynchronized        : return "ExternallySynchronized";
-      case PipelineCacheCreateFlagBits::eInternallySynchronizedMergeKHR: return "InternallySynchronizedMergeKHR";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case PipelineCreateFlagBits::eDisableOptimization                        : return "DisableOptimization";
-      case PipelineCreateFlagBits::eAllowDerivatives                           : return "AllowDerivatives";
-      case PipelineCreateFlagBits::eDerivative                                 : return "Derivative";
-      case PipelineCreateFlagBits::eDispatchBase                               : return "DispatchBase";
-      case PipelineCreateFlagBits::eViewIndexFromDeviceIndex                   : return "ViewIndexFromDeviceIndex";
-      case PipelineCreateFlagBits::eFailOnPipelineCompileRequired              : return "FailOnPipelineCompileRequired";
-      case PipelineCreateFlagBits::eEarlyReturnOnFailure                       : return "EarlyReturnOnFailure";
-      case PipelineCreateFlagBits::eNoProtectedAccess                          : return "NoProtectedAccess";
-      case PipelineCreateFlagBits::eProtectedAccessOnly                        : return "ProtectedAccessOnly";
-      case PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR           : return "RayTracingNoNullAnyHitShadersKHR";
-      case PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR       : return "RayTracingNoNullClosestHitShadersKHR";
-      case PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR             : return "RayTracingNoNullMissShadersKHR";
-      case PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR     : return "RayTracingNoNullIntersectionShadersKHR";
-      case PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR                 : return "RayTracingSkipTrianglesKHR";
-      case PipelineCreateFlagBits::eRayTracingSkipAabbsKHR                     : return "RayTracingSkipAabbsKHR";
-      case PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR: return "RayTracingShaderGroupHandleCaptureReplayKHR";
-      case PipelineCreateFlagBits::eDeferCompileNV                             : return "DeferCompileNV";
-      case PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT   : return "RenderingFragmentDensityMapAttachmentEXT";
-      case PipelineCreateFlagBits::eRenderingFragmentShadingRateAttachmentKHR  : return "RenderingFragmentShadingRateAttachmentKHR";
-      case PipelineCreateFlagBits::eCaptureStatisticsKHR                       : return "CaptureStatisticsKHR";
-      case PipelineCreateFlagBits::eCaptureInternalRepresentationsKHR          : return "CaptureInternalRepresentationsKHR";
-      case PipelineCreateFlagBits::eIndirectBindableNV                         : return "IndirectBindableNV";
-      case PipelineCreateFlagBits::eLibraryKHR                                 : return "LibraryKHR";
-      case PipelineCreateFlagBits::eDescriptorBufferEXT                        : return "DescriptorBufferEXT";
-      case PipelineCreateFlagBits::eRetainLinkTimeOptimizationInfoEXT          : return "RetainLinkTimeOptimizationInfoEXT";
-      case PipelineCreateFlagBits::eLinkTimeOptimizationEXT                    : return "LinkTimeOptimizationEXT";
-      case PipelineCreateFlagBits::eRayTracingAllowMotionNV                    : return "RayTracingAllowMotionNV";
-      case PipelineCreateFlagBits::eColorAttachmentFeedbackLoopEXT             : return "ColorAttachmentFeedbackLoopEXT";
-      case PipelineCreateFlagBits::eDepthStencilAttachmentFeedbackLoopEXT      : return "DepthStencilAttachmentFeedbackLoopEXT";
-      case PipelineCreateFlagBits::eRayTracingOpacityMicromapEXT               : return "RayTracingOpacityMicromapEXT";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case PipelineCreateFlagBits::eRayTracingDisplacementMicromapNV: return "RayTracingDisplacementMicromapNV";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineShaderStageCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize: return "AllowVaryingSubgroupSize";
-      case PipelineShaderStageCreateFlagBits::eRequireFullSubgroups    : return "RequireFullSubgroups";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderStageFlagBits value )
-  {
-    switch ( value )
-    {
-      case ShaderStageFlagBits::eVertex                : return "Vertex";
-      case ShaderStageFlagBits::eTessellationControl   : return "TessellationControl";
-      case ShaderStageFlagBits::eTessellationEvaluation: return "TessellationEvaluation";
-      case ShaderStageFlagBits::eGeometry              : return "Geometry";
-      case ShaderStageFlagBits::eFragment              : return "Fragment";
-      case ShaderStageFlagBits::eCompute               : return "Compute";
-      case ShaderStageFlagBits::eAllGraphics           : return "AllGraphics";
-      case ShaderStageFlagBits::eAll                   : return "All";
-      case ShaderStageFlagBits::eRaygenKHR             : return "RaygenKHR";
-      case ShaderStageFlagBits::eAnyHitKHR             : return "AnyHitKHR";
-      case ShaderStageFlagBits::eClosestHitKHR         : return "ClosestHitKHR";
-      case ShaderStageFlagBits::eMissKHR               : return "MissKHR";
-      case ShaderStageFlagBits::eIntersectionKHR       : return "IntersectionKHR";
-      case ShaderStageFlagBits::eCallableKHR           : return "CallableKHR";
-      case ShaderStageFlagBits::eTaskEXT               : return "TaskEXT";
-      case ShaderStageFlagBits::eMeshEXT               : return "MeshEXT";
-      case ShaderStageFlagBits::eSubpassShadingHUAWEI  : return "SubpassShadingHUAWEI";
-      case ShaderStageFlagBits::eClusterCullingHUAWEI  : return "ClusterCullingHUAWEI";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineLayoutCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case PipelineLayoutCreateFlagBits::eIndependentSetsEXT: return "IndependentSetsEXT";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BorderColor value )
-  {
-    switch ( value )
-    {
-      case BorderColor::eFloatTransparentBlack: return "FloatTransparentBlack";
-      case BorderColor::eIntTransparentBlack  : return "IntTransparentBlack";
-      case BorderColor::eFloatOpaqueBlack     : return "FloatOpaqueBlack";
-      case BorderColor::eIntOpaqueBlack       : return "IntOpaqueBlack";
-      case BorderColor::eFloatOpaqueWhite     : return "FloatOpaqueWhite";
-      case BorderColor::eIntOpaqueWhite       : return "IntOpaqueWhite";
-      case BorderColor::eFloatCustomEXT       : return "FloatCustomEXT";
-      case BorderColor::eIntCustomEXT         : return "IntCustomEXT";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( Filter value )
-  {
-    switch ( value )
-    {
-      case Filter::eNearest : return "Nearest";
-      case Filter::eLinear  : return "Linear";
-      case Filter::eCubicEXT: return "CubicEXT";
-      default               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerAddressMode value )
-  {
-    switch ( value )
-    {
-      case SamplerAddressMode::eRepeat           : return "Repeat";
-      case SamplerAddressMode::eMirroredRepeat   : return "MirroredRepeat";
-      case SamplerAddressMode::eClampToEdge      : return "ClampToEdge";
-      case SamplerAddressMode::eClampToBorder    : return "ClampToBorder";
-      case SamplerAddressMode::eMirrorClampToEdge: return "MirrorClampToEdge";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case SamplerCreateFlagBits::eSubsampledEXT                    : return "SubsampledEXT";
-      case SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT: return "SubsampledCoarseReconstructionEXT";
-      case SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT : return "DescriptorBufferCaptureReplayEXT";
-      case SamplerCreateFlagBits::eNonSeamlessCubeMapEXT            : return "NonSeamlessCubeMapEXT";
-      case SamplerCreateFlagBits::eImageProcessingQCOM              : return "ImageProcessingQCOM";
-      default                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerMipmapMode value )
-  {
-    switch ( value )
-    {
-      case SamplerMipmapMode::eNearest: return "Nearest";
-      case SamplerMipmapMode::eLinear : return "Linear";
-      default                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorPoolCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case DescriptorPoolCreateFlagBits::eFreeDescriptorSet         : return "FreeDescriptorSet";
-      case DescriptorPoolCreateFlagBits::eUpdateAfterBind           : return "UpdateAfterBind";
-      case DescriptorPoolCreateFlagBits::eHostOnlyEXT               : return "HostOnlyEXT";
-      case DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV : return "AllowOverallocationSetsNV";
-      case DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV: return "AllowOverallocationPoolsNV";
-      default                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorSetLayoutCreateFlagBits value )
-  {
-    switch ( value )
-    {
-      case DescriptorSetLayoutCreateFlagBits::eUpdateAfterBindPool         : return "UpdateAfterBindPool";
-      case DescriptorSetLayoutCreateFlagBits::ePushDescriptor              : return "PushDescriptor";
-      case DescriptorSetLayoutCreateFlagBits::eDescriptorBufferEXT         : return "DescriptorBufferEXT";
-      case DescriptorSetLayoutCreateFlagBits::eEmbeddedImmutableSamplersEXT: return "EmbeddedImmutableSamplersEXT";
-      case DescriptorSetLayoutCreateFlagBits::eIndirectBindableNV          : return "IndirectBindableNV";
-      case DescriptorSetLayoutCreateFlagBits::eHostOnlyPoolEXT             : return "HostOnlyPoolEXT";
-      case DescriptorSetLayoutCreateFlagBits::ePerStageNV                  : return "PerStageNV";
-      default                                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorType value )
-  {
-    switch ( value )
-    {
-      case DescriptorType::eSampler                           : return "Sampler";
-      case DescriptorType::eCombinedImageSampler              : return "CombinedImageSampler";
-      case DescriptorType::eSampledImage                      : return "SampledImage";
-      case DescriptorType::eStorageImage                      : return "StorageImage";
-      case DescriptorType::eUniformTexelBuffer                : return "UniformTexelBuffer";
-      case DescriptorType::eStorageTexelBuffer                : return "StorageTexelBuffer";
-      case DescriptorType::eUniformBuffer                     : return "UniformBuffer";
-      case DescriptorType::eStorageBuffer                     : return "StorageBuffer";
-      case DescriptorType::eUniformBufferDynamic              : return "UniformBufferDynamic";
-      case DescriptorType::eStorageBufferDynamic              : return "StorageBufferDynamic";
-      case DescriptorType::eInputAttachment                   : return "InputAttachment";
-      case DescriptorType::eInlineUniformBlock                : return "InlineUniformBlock";
-      case DescriptorType::eAccelerationStructureKHR          : return "AccelerationStructureKHR";
-      case DescriptorType::eAccelerationStructureNV           : return "AccelerationStructureNV";
-      case DescriptorType::eSampleWeightImageQCOM             : return "SampleWeightImageQCOM";
-      case DescriptorType::eBlockMatchImageQCOM               : return "BlockMatchImageQCOM";
-      case DescriptorType::eTensorARM                         : return "TensorARM";
-      case DescriptorType::eMutableEXT                        : return "MutableEXT";
-      case DescriptorType::ePartitionedAccelerationStructureNV: return "PartitionedAccelerationStructureNV";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorPoolResetFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryPipelineStatisticFlagBits value )
-  {
-    switch ( value )
-    {
-      case QueryPipelineStatisticFlagBits::eInputAssemblyVertices                  : return "InputAssemblyVertices";
-      case QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives                : return "InputAssemblyPrimitives";
-      case QueryPipelineStatisticFlagBits::eVertexShaderInvocations                : return "VertexShaderInvocations";
-      case QueryPipelineStatisticFlagBits::eGeometryShaderInvocations              : return "GeometryShaderInvocations";
-      case QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives               : return "GeometryShaderPrimitives";
-      case QueryPipelineStatisticFlagBits::eClippingInvocations                    : return "ClippingInvocations";
-      case QueryPipelineStatisticFlagBits::eClippingPrimitives                     : return "ClippingPrimitives";
-      case QueryPipelineStatisticFlagBits::eFragmentShaderInvocations              : return "FragmentShaderInvocations";
-      case QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches       : return "TessellationControlShaderPatches";
+      case QueryPipelineStatisticFlagBits::eInputAssemblyVertices: return "InputAssemblyVertices";
+      case QueryPipelineStatisticFlagBits::eInputAssemblyPrimitives: return "InputAssemblyPrimitives";
+      case QueryPipelineStatisticFlagBits::eVertexShaderInvocations: return "VertexShaderInvocations";
+      case QueryPipelineStatisticFlagBits::eGeometryShaderInvocations: return "GeometryShaderInvocations";
+      case QueryPipelineStatisticFlagBits::eGeometryShaderPrimitives: return "GeometryShaderPrimitives";
+      case QueryPipelineStatisticFlagBits::eClippingInvocations: return "ClippingInvocations";
+      case QueryPipelineStatisticFlagBits::eClippingPrimitives: return "ClippingPrimitives";
+      case QueryPipelineStatisticFlagBits::eFragmentShaderInvocations: return "FragmentShaderInvocations";
+      case QueryPipelineStatisticFlagBits::eTessellationControlShaderPatches: return "TessellationControlShaderPatches";
       case QueryPipelineStatisticFlagBits::eTessellationEvaluationShaderInvocations: return "TessellationEvaluationShaderInvocations";
-      case QueryPipelineStatisticFlagBits::eComputeShaderInvocations               : return "ComputeShaderInvocations";
-      case QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT               : return "TaskShaderInvocationsEXT";
-      case QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT               : return "MeshShaderInvocationsEXT";
-      case QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI  : return "ClusterCullingShaderInvocationsHUAWEI";
-      default                                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case QueryPipelineStatisticFlagBits::eComputeShaderInvocations: return "ComputeShaderInvocations";
+      case QueryPipelineStatisticFlagBits::eTaskShaderInvocationsEXT: return "TaskShaderInvocationsEXT";
+      case QueryPipelineStatisticFlagBits::eMeshShaderInvocationsEXT: return "MeshShaderInvocationsEXT";
+      case QueryPipelineStatisticFlagBits::eClusterCullingShaderInvocationsHUAWEI: return "ClusterCullingShaderInvocationsHUAWEI";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineBindPoint value )
+  VULKAN_HPP_INLINE std::string to_string( QueryResultFlagBits value )
   {
     switch ( value )
     {
-      case PipelineBindPoint::eGraphics: return "Graphics";
-      case PipelineBindPoint::eCompute : return "Compute";
+      case QueryResultFlagBits::e64: return "64";
+      case QueryResultFlagBits::eWait: return "Wait";
+      case QueryResultFlagBits::eWithAvailability: return "WithAvailability";
+      case QueryResultFlagBits::ePartial: return "Partial";
+      case QueryResultFlagBits::eWithStatusKHR: return "WithStatusKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( QueryType value )
+  {
+    switch ( value )
+    {
+      case QueryType::eOcclusion: return "Occlusion";
+      case QueryType::ePipelineStatistics: return "PipelineStatistics";
+      case QueryType::eTimestamp: return "Timestamp";
+      case QueryType::eResultStatusOnlyKHR: return "ResultStatusOnlyKHR";
+      case QueryType::eTransformFeedbackStreamEXT: return "TransformFeedbackStreamEXT";
+      case QueryType::ePerformanceQueryKHR: return "PerformanceQueryKHR";
+      case QueryType::eAccelerationStructureCompactedSizeKHR: return "AccelerationStructureCompactedSizeKHR";
+      case QueryType::eAccelerationStructureSerializationSizeKHR: return "AccelerationStructureSerializationSizeKHR";
+      case QueryType::eAccelerationStructureCompactedSizeNV: return "AccelerationStructureCompactedSizeNV";
+      case QueryType::ePerformanceQueryINTEL: return "PerformanceQueryINTEL";
+      case QueryType::eVideoEncodeFeedbackKHR: return "VideoEncodeFeedbackKHR";
+      case QueryType::eMeshPrimitivesGeneratedEXT: return "MeshPrimitivesGeneratedEXT";
+      case QueryType::ePrimitivesGeneratedEXT: return "PrimitivesGeneratedEXT";
+      case QueryType::eAccelerationStructureSerializationBottomLevelPointersKHR: return "AccelerationStructureSerializationBottomLevelPointersKHR";
+      case QueryType::eAccelerationStructureSizeKHR: return "AccelerationStructureSizeKHR";
+      case QueryType::eMicromapSerializationSizeEXT: return "MicromapSerializationSizeEXT";
+      case QueryType::eMicromapCompactedSizeEXT: return "MicromapCompactedSizeEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( QueryPoolCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case BufferCreateFlagBits::eSparseBinding: return "SparseBinding";
+      case BufferCreateFlagBits::eSparseResidency: return "SparseResidency";
+      case BufferCreateFlagBits::eSparseAliased: return "SparseAliased";
+      case BufferCreateFlagBits::eProtected: return "Protected";
+      case BufferCreateFlagBits::eDeviceAddressCaptureReplay: return "DeviceAddressCaptureReplay";
+      case BufferCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
+      case BufferCreateFlagBits::eVideoProfileIndependentKHR: return "VideoProfileIndependentKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlagBits value )
+  {
+    switch ( value )
+    {
+      case BufferUsageFlagBits::eTransferSrc: return "TransferSrc";
+      case BufferUsageFlagBits::eTransferDst: return "TransferDst";
+      case BufferUsageFlagBits::eUniformTexelBuffer: return "UniformTexelBuffer";
+      case BufferUsageFlagBits::eStorageTexelBuffer: return "StorageTexelBuffer";
+      case BufferUsageFlagBits::eUniformBuffer: return "UniformBuffer";
+      case BufferUsageFlagBits::eStorageBuffer: return "StorageBuffer";
+      case BufferUsageFlagBits::eIndexBuffer: return "IndexBuffer";
+      case BufferUsageFlagBits::eVertexBuffer: return "VertexBuffer";
+      case BufferUsageFlagBits::eIndirectBuffer: return "IndirectBuffer";
+      case BufferUsageFlagBits::eShaderDeviceAddress: return "ShaderDeviceAddress";
+      case BufferUsageFlagBits::eVideoDecodeSrcKHR: return "VideoDecodeSrcKHR";
+      case BufferUsageFlagBits::eVideoDecodeDstKHR: return "VideoDecodeDstKHR";
+      case BufferUsageFlagBits::eTransformFeedbackBufferEXT: return "TransformFeedbackBufferEXT";
+      case BufferUsageFlagBits::eTransformFeedbackCounterBufferEXT: return "TransformFeedbackCounterBufferEXT";
+      case BufferUsageFlagBits::eConditionalRenderingEXT: return "ConditionalRenderingEXT";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case PipelineBindPoint::eExecutionGraphAMDX: return "ExecutionGraphAMDX";
+      case BufferUsageFlagBits::eExecutionGraphScratchAMDX: return "ExecutionGraphScratchAMDX";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case PipelineBindPoint::eRayTracingKHR       : return "RayTracingKHR";
-      case PipelineBindPoint::eSubpassShadingHUAWEI: return "SubpassShadingHUAWEI";
-      case PipelineBindPoint::eDataGraphARM        : return "DataGraphARM";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR: return "AccelerationStructureBuildInputReadOnlyKHR";
+      case BufferUsageFlagBits::eAccelerationStructureStorageKHR: return "AccelerationStructureStorageKHR";
+      case BufferUsageFlagBits::eShaderBindingTableKHR: return "ShaderBindingTableKHR";
+      case BufferUsageFlagBits::eVideoEncodeDstKHR: return "VideoEncodeDstKHR";
+      case BufferUsageFlagBits::eVideoEncodeSrcKHR: return "VideoEncodeSrcKHR";
+      case BufferUsageFlagBits::eSamplerDescriptorBufferEXT: return "SamplerDescriptorBufferEXT";
+      case BufferUsageFlagBits::eResourceDescriptorBufferEXT: return "ResourceDescriptorBufferEXT";
+      case BufferUsageFlagBits::ePushDescriptorsDescriptorBufferEXT: return "PushDescriptorsDescriptorBufferEXT";
+      case BufferUsageFlagBits::eMicromapBuildInputReadOnlyEXT: return "MicromapBuildInputReadOnlyEXT";
+      case BufferUsageFlagBits::eMicromapStorageEXT: return "MicromapStorageEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BlendFactor value )
+  VULKAN_HPP_INLINE std::string to_string( SharingMode value )
   {
     switch ( value )
     {
-      case BlendFactor::eZero                 : return "Zero";
-      case BlendFactor::eOne                  : return "One";
-      case BlendFactor::eSrcColor             : return "SrcColor";
-      case BlendFactor::eOneMinusSrcColor     : return "OneMinusSrcColor";
-      case BlendFactor::eDstColor             : return "DstColor";
-      case BlendFactor::eOneMinusDstColor     : return "OneMinusDstColor";
-      case BlendFactor::eSrcAlpha             : return "SrcAlpha";
-      case BlendFactor::eOneMinusSrcAlpha     : return "OneMinusSrcAlpha";
-      case BlendFactor::eDstAlpha             : return "DstAlpha";
-      case BlendFactor::eOneMinusDstAlpha     : return "OneMinusDstAlpha";
-      case BlendFactor::eConstantColor        : return "ConstantColor";
+      case SharingMode::eExclusive: return "Exclusive";
+      case SharingMode::eConcurrent: return "Concurrent";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BufferViewCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ImageLayout value )
+  {
+    switch ( value )
+    {
+      case ImageLayout::eUndefined: return "Undefined";
+      case ImageLayout::eGeneral: return "General";
+      case ImageLayout::eColorAttachmentOptimal: return "ColorAttachmentOptimal";
+      case ImageLayout::eDepthStencilAttachmentOptimal: return "DepthStencilAttachmentOptimal";
+      case ImageLayout::eDepthStencilReadOnlyOptimal: return "DepthStencilReadOnlyOptimal";
+      case ImageLayout::eShaderReadOnlyOptimal: return "ShaderReadOnlyOptimal";
+      case ImageLayout::eTransferSrcOptimal: return "TransferSrcOptimal";
+      case ImageLayout::eTransferDstOptimal: return "TransferDstOptimal";
+      case ImageLayout::ePreinitialized: return "Preinitialized";
+      case ImageLayout::eDepthReadOnlyStencilAttachmentOptimal: return "DepthReadOnlyStencilAttachmentOptimal";
+      case ImageLayout::eDepthAttachmentStencilReadOnlyOptimal: return "DepthAttachmentStencilReadOnlyOptimal";
+      case ImageLayout::eDepthAttachmentOptimal: return "DepthAttachmentOptimal";
+      case ImageLayout::eDepthReadOnlyOptimal: return "DepthReadOnlyOptimal";
+      case ImageLayout::eStencilAttachmentOptimal: return "StencilAttachmentOptimal";
+      case ImageLayout::eStencilReadOnlyOptimal: return "StencilReadOnlyOptimal";
+      case ImageLayout::eReadOnlyOptimal: return "ReadOnlyOptimal";
+      case ImageLayout::eAttachmentOptimal: return "AttachmentOptimal";
+      case ImageLayout::ePresentSrcKHR: return "PresentSrcKHR";
+      case ImageLayout::eVideoDecodeDstKHR: return "VideoDecodeDstKHR";
+      case ImageLayout::eVideoDecodeSrcKHR: return "VideoDecodeSrcKHR";
+      case ImageLayout::eVideoDecodeDpbKHR: return "VideoDecodeDpbKHR";
+      case ImageLayout::eSharedPresentKHR: return "SharedPresentKHR";
+      case ImageLayout::eFragmentDensityMapOptimalEXT: return "FragmentDensityMapOptimalEXT";
+      case ImageLayout::eFragmentShadingRateAttachmentOptimalKHR: return "FragmentShadingRateAttachmentOptimalKHR";
+      case ImageLayout::eRenderingLocalReadKHR: return "RenderingLocalReadKHR";
+      case ImageLayout::eVideoEncodeDstKHR: return "VideoEncodeDstKHR";
+      case ImageLayout::eVideoEncodeSrcKHR: return "VideoEncodeSrcKHR";
+      case ImageLayout::eVideoEncodeDpbKHR: return "VideoEncodeDpbKHR";
+      case ImageLayout::eAttachmentFeedbackLoopOptimalEXT: return "AttachmentFeedbackLoopOptimalEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ComponentSwizzle value )
+  {
+    switch ( value )
+    {
+      case ComponentSwizzle::eIdentity: return "Identity";
+      case ComponentSwizzle::eZero: return "Zero";
+      case ComponentSwizzle::eOne: return "One";
+      case ComponentSwizzle::eR: return "R";
+      case ComponentSwizzle::eG: return "G";
+      case ComponentSwizzle::eB: return "B";
+      case ComponentSwizzle::eA: return "A";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ImageViewCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case ImageViewCreateFlagBits::eFragmentDensityMapDynamicEXT: return "FragmentDensityMapDynamicEXT";
+      case ImageViewCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
+      case ImageViewCreateFlagBits::eFragmentDensityMapDeferredEXT: return "FragmentDensityMapDeferredEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ImageViewType value )
+  {
+    switch ( value )
+    {
+      case ImageViewType::e1D: return "1D";
+      case ImageViewType::e2D: return "2D";
+      case ImageViewType::e3D: return "3D";
+      case ImageViewType::eCube: return "Cube";
+      case ImageViewType::e1DArray: return "1DArray";
+      case ImageViewType::e2DArray: return "2DArray";
+      case ImageViewType::eCubeArray: return "CubeArray";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ShaderModuleCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineCacheCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case PipelineCacheCreateFlagBits::eExternallySynchronized: return "ExternallySynchronized";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BlendFactor value )
+  {
+    switch ( value )
+    {
+      case BlendFactor::eZero: return "Zero";
+      case BlendFactor::eOne: return "One";
+      case BlendFactor::eSrcColor: return "SrcColor";
+      case BlendFactor::eOneMinusSrcColor: return "OneMinusSrcColor";
+      case BlendFactor::eDstColor: return "DstColor";
+      case BlendFactor::eOneMinusDstColor: return "OneMinusDstColor";
+      case BlendFactor::eSrcAlpha: return "SrcAlpha";
+      case BlendFactor::eOneMinusSrcAlpha: return "OneMinusSrcAlpha";
+      case BlendFactor::eDstAlpha: return "DstAlpha";
+      case BlendFactor::eOneMinusDstAlpha: return "OneMinusDstAlpha";
+      case BlendFactor::eConstantColor: return "ConstantColor";
       case BlendFactor::eOneMinusConstantColor: return "OneMinusConstantColor";
-      case BlendFactor::eConstantAlpha        : return "ConstantAlpha";
+      case BlendFactor::eConstantAlpha: return "ConstantAlpha";
       case BlendFactor::eOneMinusConstantAlpha: return "OneMinusConstantAlpha";
-      case BlendFactor::eSrcAlphaSaturate     : return "SrcAlphaSaturate";
-      case BlendFactor::eSrc1Color            : return "Src1Color";
-      case BlendFactor::eOneMinusSrc1Color    : return "OneMinusSrc1Color";
-      case BlendFactor::eSrc1Alpha            : return "Src1Alpha";
-      case BlendFactor::eOneMinusSrc1Alpha    : return "OneMinusSrc1Alpha";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BlendFactor::eSrcAlphaSaturate: return "SrcAlphaSaturate";
+      case BlendFactor::eSrc1Color: return "Src1Color";
+      case BlendFactor::eOneMinusSrc1Color: return "OneMinusSrc1Color";
+      case BlendFactor::eSrc1Alpha: return "Src1Alpha";
+      case BlendFactor::eOneMinusSrc1Alpha: return "OneMinusSrc1Alpha";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BlendOp value )
+  VULKAN_HPP_INLINE std::string to_string( BlendOp value )
   {
     switch ( value )
     {
-      case BlendOp::eAdd                : return "Add";
-      case BlendOp::eSubtract           : return "Subtract";
-      case BlendOp::eReverseSubtract    : return "ReverseSubtract";
-      case BlendOp::eMin                : return "Min";
-      case BlendOp::eMax                : return "Max";
-      case BlendOp::eZeroEXT            : return "ZeroEXT";
-      case BlendOp::eSrcEXT             : return "SrcEXT";
-      case BlendOp::eDstEXT             : return "DstEXT";
-      case BlendOp::eSrcOverEXT         : return "SrcOverEXT";
-      case BlendOp::eDstOverEXT         : return "DstOverEXT";
-      case BlendOp::eSrcInEXT           : return "SrcInEXT";
-      case BlendOp::eDstInEXT           : return "DstInEXT";
-      case BlendOp::eSrcOutEXT          : return "SrcOutEXT";
-      case BlendOp::eDstOutEXT          : return "DstOutEXT";
-      case BlendOp::eSrcAtopEXT         : return "SrcAtopEXT";
-      case BlendOp::eDstAtopEXT         : return "DstAtopEXT";
-      case BlendOp::eXorEXT             : return "XorEXT";
-      case BlendOp::eMultiplyEXT        : return "MultiplyEXT";
-      case BlendOp::eScreenEXT          : return "ScreenEXT";
-      case BlendOp::eOverlayEXT         : return "OverlayEXT";
-      case BlendOp::eDarkenEXT          : return "DarkenEXT";
-      case BlendOp::eLightenEXT         : return "LightenEXT";
-      case BlendOp::eColordodgeEXT      : return "ColordodgeEXT";
-      case BlendOp::eColorburnEXT       : return "ColorburnEXT";
-      case BlendOp::eHardlightEXT       : return "HardlightEXT";
-      case BlendOp::eSoftlightEXT       : return "SoftlightEXT";
-      case BlendOp::eDifferenceEXT      : return "DifferenceEXT";
-      case BlendOp::eExclusionEXT       : return "ExclusionEXT";
-      case BlendOp::eInvertEXT          : return "InvertEXT";
-      case BlendOp::eInvertRgbEXT       : return "InvertRgbEXT";
-      case BlendOp::eLineardodgeEXT     : return "LineardodgeEXT";
-      case BlendOp::eLinearburnEXT      : return "LinearburnEXT";
-      case BlendOp::eVividlightEXT      : return "VividlightEXT";
-      case BlendOp::eLinearlightEXT     : return "LinearlightEXT";
-      case BlendOp::ePinlightEXT        : return "PinlightEXT";
-      case BlendOp::eHardmixEXT         : return "HardmixEXT";
-      case BlendOp::eHslHueEXT          : return "HslHueEXT";
-      case BlendOp::eHslSaturationEXT   : return "HslSaturationEXT";
-      case BlendOp::eHslColorEXT        : return "HslColorEXT";
-      case BlendOp::eHslLuminosityEXT   : return "HslLuminosityEXT";
-      case BlendOp::ePlusEXT            : return "PlusEXT";
-      case BlendOp::ePlusClampedEXT     : return "PlusClampedEXT";
+      case BlendOp::eAdd: return "Add";
+      case BlendOp::eSubtract: return "Subtract";
+      case BlendOp::eReverseSubtract: return "ReverseSubtract";
+      case BlendOp::eMin: return "Min";
+      case BlendOp::eMax: return "Max";
+      case BlendOp::eZeroEXT: return "ZeroEXT";
+      case BlendOp::eSrcEXT: return "SrcEXT";
+      case BlendOp::eDstEXT: return "DstEXT";
+      case BlendOp::eSrcOverEXT: return "SrcOverEXT";
+      case BlendOp::eDstOverEXT: return "DstOverEXT";
+      case BlendOp::eSrcInEXT: return "SrcInEXT";
+      case BlendOp::eDstInEXT: return "DstInEXT";
+      case BlendOp::eSrcOutEXT: return "SrcOutEXT";
+      case BlendOp::eDstOutEXT: return "DstOutEXT";
+      case BlendOp::eSrcAtopEXT: return "SrcAtopEXT";
+      case BlendOp::eDstAtopEXT: return "DstAtopEXT";
+      case BlendOp::eXorEXT: return "XorEXT";
+      case BlendOp::eMultiplyEXT: return "MultiplyEXT";
+      case BlendOp::eScreenEXT: return "ScreenEXT";
+      case BlendOp::eOverlayEXT: return "OverlayEXT";
+      case BlendOp::eDarkenEXT: return "DarkenEXT";
+      case BlendOp::eLightenEXT: return "LightenEXT";
+      case BlendOp::eColordodgeEXT: return "ColordodgeEXT";
+      case BlendOp::eColorburnEXT: return "ColorburnEXT";
+      case BlendOp::eHardlightEXT: return "HardlightEXT";
+      case BlendOp::eSoftlightEXT: return "SoftlightEXT";
+      case BlendOp::eDifferenceEXT: return "DifferenceEXT";
+      case BlendOp::eExclusionEXT: return "ExclusionEXT";
+      case BlendOp::eInvertEXT: return "InvertEXT";
+      case BlendOp::eInvertRgbEXT: return "InvertRgbEXT";
+      case BlendOp::eLineardodgeEXT: return "LineardodgeEXT";
+      case BlendOp::eLinearburnEXT: return "LinearburnEXT";
+      case BlendOp::eVividlightEXT: return "VividlightEXT";
+      case BlendOp::eLinearlightEXT: return "LinearlightEXT";
+      case BlendOp::ePinlightEXT: return "PinlightEXT";
+      case BlendOp::eHardmixEXT: return "HardmixEXT";
+      case BlendOp::eHslHueEXT: return "HslHueEXT";
+      case BlendOp::eHslSaturationEXT: return "HslSaturationEXT";
+      case BlendOp::eHslColorEXT: return "HslColorEXT";
+      case BlendOp::eHslLuminosityEXT: return "HslLuminosityEXT";
+      case BlendOp::ePlusEXT: return "PlusEXT";
+      case BlendOp::ePlusClampedEXT: return "PlusClampedEXT";
       case BlendOp::ePlusClampedAlphaEXT: return "PlusClampedAlphaEXT";
-      case BlendOp::ePlusDarkerEXT      : return "PlusDarkerEXT";
-      case BlendOp::eMinusEXT           : return "MinusEXT";
-      case BlendOp::eMinusClampedEXT    : return "MinusClampedEXT";
-      case BlendOp::eContrastEXT        : return "ContrastEXT";
-      case BlendOp::eInvertOvgEXT       : return "InvertOvgEXT";
-      case BlendOp::eRedEXT             : return "RedEXT";
-      case BlendOp::eGreenEXT           : return "GreenEXT";
-      case BlendOp::eBlueEXT            : return "BlueEXT";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BlendOp::ePlusDarkerEXT: return "PlusDarkerEXT";
+      case BlendOp::eMinusEXT: return "MinusEXT";
+      case BlendOp::eMinusClampedEXT: return "MinusClampedEXT";
+      case BlendOp::eContrastEXT: return "ContrastEXT";
+      case BlendOp::eInvertOvgEXT: return "InvertOvgEXT";
+      case BlendOp::eRedEXT: return "RedEXT";
+      case BlendOp::eGreenEXT: return "GreenEXT";
+      case BlendOp::eBlueEXT: return "BlueEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ColorComponentFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( ColorComponentFlagBits value )
   {
     switch ( value )
     {
@@ -7042,1208 +5560,1344 @@ namespace VULKAN_HPP_NAMESPACE
       case ColorComponentFlagBits::eG: return "G";
       case ColorComponentFlagBits::eB: return "B";
       case ColorComponentFlagBits::eA: return "A";
-      default                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CompareOp value )
+  VULKAN_HPP_INLINE std::string to_string( CompareOp value )
   {
     switch ( value )
     {
-      case CompareOp::eNever         : return "Never";
-      case CompareOp::eLess          : return "Less";
-      case CompareOp::eEqual         : return "Equal";
-      case CompareOp::eLessOrEqual   : return "LessOrEqual";
-      case CompareOp::eGreater       : return "Greater";
-      case CompareOp::eNotEqual      : return "NotEqual";
+      case CompareOp::eNever: return "Never";
+      case CompareOp::eLess: return "Less";
+      case CompareOp::eEqual: return "Equal";
+      case CompareOp::eLessOrEqual: return "LessOrEqual";
+      case CompareOp::eGreater: return "Greater";
+      case CompareOp::eNotEqual: return "NotEqual";
       case CompareOp::eGreaterOrEqual: return "GreaterOrEqual";
-      case CompareOp::eAlways        : return "Always";
-      default                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case CompareOp::eAlways: return "Always";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CullModeFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( CullModeFlagBits value )
   {
     switch ( value )
     {
-      case CullModeFlagBits::eNone        : return "None";
-      case CullModeFlagBits::eFront       : return "Front";
-      case CullModeFlagBits::eBack        : return "Back";
+      case CullModeFlagBits::eNone: return "None";
+      case CullModeFlagBits::eFront: return "Front";
+      case CullModeFlagBits::eBack: return "Back";
       case CullModeFlagBits::eFrontAndBack: return "FrontAndBack";
-      default                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DynamicState value )
+  VULKAN_HPP_INLINE std::string to_string( DynamicState value )
   {
     switch ( value )
     {
-      case DynamicState::eViewport                           : return "Viewport";
-      case DynamicState::eScissor                            : return "Scissor";
-      case DynamicState::eLineWidth                          : return "LineWidth";
-      case DynamicState::eDepthBias                          : return "DepthBias";
-      case DynamicState::eBlendConstants                     : return "BlendConstants";
-      case DynamicState::eDepthBounds                        : return "DepthBounds";
-      case DynamicState::eStencilCompareMask                 : return "StencilCompareMask";
-      case DynamicState::eStencilWriteMask                   : return "StencilWriteMask";
-      case DynamicState::eStencilReference                   : return "StencilReference";
-      case DynamicState::eCullMode                           : return "CullMode";
-      case DynamicState::eFrontFace                          : return "FrontFace";
-      case DynamicState::ePrimitiveTopology                  : return "PrimitiveTopology";
-      case DynamicState::eViewportWithCount                  : return "ViewportWithCount";
-      case DynamicState::eScissorWithCount                   : return "ScissorWithCount";
-      case DynamicState::eVertexInputBindingStride           : return "VertexInputBindingStride";
-      case DynamicState::eDepthTestEnable                    : return "DepthTestEnable";
-      case DynamicState::eDepthWriteEnable                   : return "DepthWriteEnable";
-      case DynamicState::eDepthCompareOp                     : return "DepthCompareOp";
-      case DynamicState::eDepthBoundsTestEnable              : return "DepthBoundsTestEnable";
-      case DynamicState::eStencilTestEnable                  : return "StencilTestEnable";
-      case DynamicState::eStencilOp                          : return "StencilOp";
-      case DynamicState::eRasterizerDiscardEnable            : return "RasterizerDiscardEnable";
-      case DynamicState::eDepthBiasEnable                    : return "DepthBiasEnable";
-      case DynamicState::ePrimitiveRestartEnable             : return "PrimitiveRestartEnable";
-      case DynamicState::eLineStipple                        : return "LineStipple";
-      case DynamicState::eViewportWScalingNV                 : return "ViewportWScalingNV";
-      case DynamicState::eDiscardRectangleEXT                : return "DiscardRectangleEXT";
-      case DynamicState::eDiscardRectangleEnableEXT          : return "DiscardRectangleEnableEXT";
-      case DynamicState::eDiscardRectangleModeEXT            : return "DiscardRectangleModeEXT";
-      case DynamicState::eSampleLocationsEXT                 : return "SampleLocationsEXT";
-      case DynamicState::eRayTracingPipelineStackSizeKHR     : return "RayTracingPipelineStackSizeKHR";
-      case DynamicState::eViewportShadingRatePaletteNV       : return "ViewportShadingRatePaletteNV";
-      case DynamicState::eViewportCoarseSampleOrderNV        : return "ViewportCoarseSampleOrderNV";
-      case DynamicState::eExclusiveScissorEnableNV           : return "ExclusiveScissorEnableNV";
-      case DynamicState::eExclusiveScissorNV                 : return "ExclusiveScissorNV";
-      case DynamicState::eFragmentShadingRateKHR             : return "FragmentShadingRateKHR";
-      case DynamicState::eVertexInputEXT                     : return "VertexInputEXT";
-      case DynamicState::ePatchControlPointsEXT              : return "PatchControlPointsEXT";
-      case DynamicState::eLogicOpEXT                         : return "LogicOpEXT";
-      case DynamicState::eColorWriteEnableEXT                : return "ColorWriteEnableEXT";
-      case DynamicState::eDepthClampEnableEXT                : return "DepthClampEnableEXT";
-      case DynamicState::ePolygonModeEXT                     : return "PolygonModeEXT";
-      case DynamicState::eRasterizationSamplesEXT            : return "RasterizationSamplesEXT";
-      case DynamicState::eSampleMaskEXT                      : return "SampleMaskEXT";
-      case DynamicState::eAlphaToCoverageEnableEXT           : return "AlphaToCoverageEnableEXT";
-      case DynamicState::eAlphaToOneEnableEXT                : return "AlphaToOneEnableEXT";
-      case DynamicState::eLogicOpEnableEXT                   : return "LogicOpEnableEXT";
-      case DynamicState::eColorBlendEnableEXT                : return "ColorBlendEnableEXT";
-      case DynamicState::eColorBlendEquationEXT              : return "ColorBlendEquationEXT";
-      case DynamicState::eColorWriteMaskEXT                  : return "ColorWriteMaskEXT";
-      case DynamicState::eTessellationDomainOriginEXT        : return "TessellationDomainOriginEXT";
-      case DynamicState::eRasterizationStreamEXT             : return "RasterizationStreamEXT";
-      case DynamicState::eConservativeRasterizationModeEXT   : return "ConservativeRasterizationModeEXT";
+      case DynamicState::eViewport: return "Viewport";
+      case DynamicState::eScissor: return "Scissor";
+      case DynamicState::eLineWidth: return "LineWidth";
+      case DynamicState::eDepthBias: return "DepthBias";
+      case DynamicState::eBlendConstants: return "BlendConstants";
+      case DynamicState::eDepthBounds: return "DepthBounds";
+      case DynamicState::eStencilCompareMask: return "StencilCompareMask";
+      case DynamicState::eStencilWriteMask: return "StencilWriteMask";
+      case DynamicState::eStencilReference: return "StencilReference";
+      case DynamicState::eCullMode: return "CullMode";
+      case DynamicState::eFrontFace: return "FrontFace";
+      case DynamicState::ePrimitiveTopology: return "PrimitiveTopology";
+      case DynamicState::eViewportWithCount: return "ViewportWithCount";
+      case DynamicState::eScissorWithCount: return "ScissorWithCount";
+      case DynamicState::eVertexInputBindingStride: return "VertexInputBindingStride";
+      case DynamicState::eDepthTestEnable: return "DepthTestEnable";
+      case DynamicState::eDepthWriteEnable: return "DepthWriteEnable";
+      case DynamicState::eDepthCompareOp: return "DepthCompareOp";
+      case DynamicState::eDepthBoundsTestEnable: return "DepthBoundsTestEnable";
+      case DynamicState::eStencilTestEnable: return "StencilTestEnable";
+      case DynamicState::eStencilOp: return "StencilOp";
+      case DynamicState::eRasterizerDiscardEnable: return "RasterizerDiscardEnable";
+      case DynamicState::eDepthBiasEnable: return "DepthBiasEnable";
+      case DynamicState::ePrimitiveRestartEnable: return "PrimitiveRestartEnable";
+      case DynamicState::eViewportWScalingNV: return "ViewportWScalingNV";
+      case DynamicState::eDiscardRectangleEXT: return "DiscardRectangleEXT";
+      case DynamicState::eDiscardRectangleEnableEXT: return "DiscardRectangleEnableEXT";
+      case DynamicState::eDiscardRectangleModeEXT: return "DiscardRectangleModeEXT";
+      case DynamicState::eSampleLocationsEXT: return "SampleLocationsEXT";
+      case DynamicState::eRayTracingPipelineStackSizeKHR: return "RayTracingPipelineStackSizeKHR";
+      case DynamicState::eViewportShadingRatePaletteNV: return "ViewportShadingRatePaletteNV";
+      case DynamicState::eViewportCoarseSampleOrderNV: return "ViewportCoarseSampleOrderNV";
+      case DynamicState::eExclusiveScissorEnableNV: return "ExclusiveScissorEnableNV";
+      case DynamicState::eExclusiveScissorNV: return "ExclusiveScissorNV";
+      case DynamicState::eFragmentShadingRateKHR: return "FragmentShadingRateKHR";
+      case DynamicState::eVertexInputEXT: return "VertexInputEXT";
+      case DynamicState::ePatchControlPointsEXT: return "PatchControlPointsEXT";
+      case DynamicState::eLogicOpEXT: return "LogicOpEXT";
+      case DynamicState::eColorWriteEnableEXT: return "ColorWriteEnableEXT";
+      case DynamicState::eDepthClampEnableEXT: return "DepthClampEnableEXT";
+      case DynamicState::ePolygonModeEXT: return "PolygonModeEXT";
+      case DynamicState::eRasterizationSamplesEXT: return "RasterizationSamplesEXT";
+      case DynamicState::eSampleMaskEXT: return "SampleMaskEXT";
+      case DynamicState::eAlphaToCoverageEnableEXT: return "AlphaToCoverageEnableEXT";
+      case DynamicState::eAlphaToOneEnableEXT: return "AlphaToOneEnableEXT";
+      case DynamicState::eLogicOpEnableEXT: return "LogicOpEnableEXT";
+      case DynamicState::eColorBlendEnableEXT: return "ColorBlendEnableEXT";
+      case DynamicState::eColorBlendEquationEXT: return "ColorBlendEquationEXT";
+      case DynamicState::eColorWriteMaskEXT: return "ColorWriteMaskEXT";
+      case DynamicState::eTessellationDomainOriginEXT: return "TessellationDomainOriginEXT";
+      case DynamicState::eRasterizationStreamEXT: return "RasterizationStreamEXT";
+      case DynamicState::eConservativeRasterizationModeEXT: return "ConservativeRasterizationModeEXT";
       case DynamicState::eExtraPrimitiveOverestimationSizeEXT: return "ExtraPrimitiveOverestimationSizeEXT";
-      case DynamicState::eDepthClipEnableEXT                 : return "DepthClipEnableEXT";
-      case DynamicState::eSampleLocationsEnableEXT           : return "SampleLocationsEnableEXT";
-      case DynamicState::eColorBlendAdvancedEXT              : return "ColorBlendAdvancedEXT";
-      case DynamicState::eProvokingVertexModeEXT             : return "ProvokingVertexModeEXT";
-      case DynamicState::eLineRasterizationModeEXT           : return "LineRasterizationModeEXT";
-      case DynamicState::eLineStippleEnableEXT               : return "LineStippleEnableEXT";
-      case DynamicState::eDepthClipNegativeOneToOneEXT       : return "DepthClipNegativeOneToOneEXT";
-      case DynamicState::eViewportWScalingEnableNV           : return "ViewportWScalingEnableNV";
-      case DynamicState::eViewportSwizzleNV                  : return "ViewportSwizzleNV";
-      case DynamicState::eCoverageToColorEnableNV            : return "CoverageToColorEnableNV";
-      case DynamicState::eCoverageToColorLocationNV          : return "CoverageToColorLocationNV";
-      case DynamicState::eCoverageModulationModeNV           : return "CoverageModulationModeNV";
-      case DynamicState::eCoverageModulationTableEnableNV    : return "CoverageModulationTableEnableNV";
-      case DynamicState::eCoverageModulationTableNV          : return "CoverageModulationTableNV";
-      case DynamicState::eShadingRateImageEnableNV           : return "ShadingRateImageEnableNV";
-      case DynamicState::eRepresentativeFragmentTestEnableNV : return "RepresentativeFragmentTestEnableNV";
-      case DynamicState::eCoverageReductionModeNV            : return "CoverageReductionModeNV";
-      case DynamicState::eAttachmentFeedbackLoopEnableEXT    : return "AttachmentFeedbackLoopEnableEXT";
-      case DynamicState::eDepthClampRangeEXT                 : return "DepthClampRangeEXT";
-      default                                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DynamicState::eDepthClipEnableEXT: return "DepthClipEnableEXT";
+      case DynamicState::eSampleLocationsEnableEXT: return "SampleLocationsEnableEXT";
+      case DynamicState::eColorBlendAdvancedEXT: return "ColorBlendAdvancedEXT";
+      case DynamicState::eProvokingVertexModeEXT: return "ProvokingVertexModeEXT";
+      case DynamicState::eLineRasterizationModeEXT: return "LineRasterizationModeEXT";
+      case DynamicState::eLineStippleEnableEXT: return "LineStippleEnableEXT";
+      case DynamicState::eDepthClipNegativeOneToOneEXT: return "DepthClipNegativeOneToOneEXT";
+      case DynamicState::eViewportWScalingEnableNV: return "ViewportWScalingEnableNV";
+      case DynamicState::eViewportSwizzleNV: return "ViewportSwizzleNV";
+      case DynamicState::eCoverageToColorEnableNV: return "CoverageToColorEnableNV";
+      case DynamicState::eCoverageToColorLocationNV: return "CoverageToColorLocationNV";
+      case DynamicState::eCoverageModulationModeNV: return "CoverageModulationModeNV";
+      case DynamicState::eCoverageModulationTableEnableNV: return "CoverageModulationTableEnableNV";
+      case DynamicState::eCoverageModulationTableNV: return "CoverageModulationTableNV";
+      case DynamicState::eShadingRateImageEnableNV: return "ShadingRateImageEnableNV";
+      case DynamicState::eRepresentativeFragmentTestEnableNV: return "RepresentativeFragmentTestEnableNV";
+      case DynamicState::eCoverageReductionModeNV: return "CoverageReductionModeNV";
+      case DynamicState::eAttachmentFeedbackLoopEnableEXT: return "AttachmentFeedbackLoopEnableEXT";
+      case DynamicState::eLineStippleKHR: return "LineStippleKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FrontFace value )
+  VULKAN_HPP_INLINE std::string to_string( FrontFace value )
   {
     switch ( value )
     {
       case FrontFace::eCounterClockwise: return "CounterClockwise";
-      case FrontFace::eClockwise       : return "Clockwise";
-      default                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FrontFace::eClockwise: return "Clockwise";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( LogicOp value )
+  VULKAN_HPP_INLINE std::string to_string( LogicOp value )
   {
     switch ( value )
     {
-      case LogicOp::eClear       : return "Clear";
-      case LogicOp::eAnd         : return "And";
-      case LogicOp::eAndReverse  : return "AndReverse";
-      case LogicOp::eCopy        : return "Copy";
-      case LogicOp::eAndInverted : return "AndInverted";
-      case LogicOp::eNoOp        : return "NoOp";
-      case LogicOp::eXor         : return "Xor";
-      case LogicOp::eOr          : return "Or";
-      case LogicOp::eNor         : return "Nor";
-      case LogicOp::eEquivalent  : return "Equivalent";
-      case LogicOp::eInvert      : return "Invert";
-      case LogicOp::eOrReverse   : return "OrReverse";
+      case LogicOp::eClear: return "Clear";
+      case LogicOp::eAnd: return "And";
+      case LogicOp::eAndReverse: return "AndReverse";
+      case LogicOp::eCopy: return "Copy";
+      case LogicOp::eAndInverted: return "AndInverted";
+      case LogicOp::eNoOp: return "NoOp";
+      case LogicOp::eXor: return "Xor";
+      case LogicOp::eOr: return "Or";
+      case LogicOp::eNor: return "Nor";
+      case LogicOp::eEquivalent: return "Equivalent";
+      case LogicOp::eInvert: return "Invert";
+      case LogicOp::eOrReverse: return "OrReverse";
       case LogicOp::eCopyInverted: return "CopyInverted";
-      case LogicOp::eOrInverted  : return "OrInverted";
-      case LogicOp::eNand        : return "Nand";
-      case LogicOp::eSet         : return "Set";
-      default                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case LogicOp::eOrInverted: return "OrInverted";
+      case LogicOp::eNand: return "Nand";
+      case LogicOp::eSet: return "Set";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PolygonMode value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCreateFlagBits value )
   {
     switch ( value )
     {
-      case PolygonMode::eFill           : return "Fill";
-      case PolygonMode::eLine           : return "Line";
-      case PolygonMode::ePoint          : return "Point";
+      case PipelineCreateFlagBits::eDisableOptimization: return "DisableOptimization";
+      case PipelineCreateFlagBits::eAllowDerivatives: return "AllowDerivatives";
+      case PipelineCreateFlagBits::eDerivative: return "Derivative";
+      case PipelineCreateFlagBits::eViewIndexFromDeviceIndex: return "ViewIndexFromDeviceIndex";
+      case PipelineCreateFlagBits::eDispatchBase: return "DispatchBase";
+      case PipelineCreateFlagBits::eFailOnPipelineCompileRequired: return "FailOnPipelineCompileRequired";
+      case PipelineCreateFlagBits::eEarlyReturnOnFailure: return "EarlyReturnOnFailure";
+      case PipelineCreateFlagBits::eRenderingFragmentShadingRateAttachmentKHR: return "RenderingFragmentShadingRateAttachmentKHR";
+      case PipelineCreateFlagBits::eRenderingFragmentDensityMapAttachmentEXT: return "RenderingFragmentDensityMapAttachmentEXT";
+      case PipelineCreateFlagBits::eRayTracingNoNullAnyHitShadersKHR: return "RayTracingNoNullAnyHitShadersKHR";
+      case PipelineCreateFlagBits::eRayTracingNoNullClosestHitShadersKHR: return "RayTracingNoNullClosestHitShadersKHR";
+      case PipelineCreateFlagBits::eRayTracingNoNullMissShadersKHR: return "RayTracingNoNullMissShadersKHR";
+      case PipelineCreateFlagBits::eRayTracingNoNullIntersectionShadersKHR: return "RayTracingNoNullIntersectionShadersKHR";
+      case PipelineCreateFlagBits::eRayTracingSkipTrianglesKHR: return "RayTracingSkipTrianglesKHR";
+      case PipelineCreateFlagBits::eRayTracingSkipAabbsKHR: return "RayTracingSkipAabbsKHR";
+      case PipelineCreateFlagBits::eRayTracingShaderGroupHandleCaptureReplayKHR: return "RayTracingShaderGroupHandleCaptureReplayKHR";
+      case PipelineCreateFlagBits::eDeferCompileNV: return "DeferCompileNV";
+      case PipelineCreateFlagBits::eCaptureStatisticsKHR: return "CaptureStatisticsKHR";
+      case PipelineCreateFlagBits::eCaptureInternalRepresentationsKHR: return "CaptureInternalRepresentationsKHR";
+      case PipelineCreateFlagBits::eIndirectBindableNV: return "IndirectBindableNV";
+      case PipelineCreateFlagBits::eLibraryKHR: return "LibraryKHR";
+      case PipelineCreateFlagBits::eDescriptorBufferEXT: return "DescriptorBufferEXT";
+      case PipelineCreateFlagBits::eRetainLinkTimeOptimizationInfoEXT: return "RetainLinkTimeOptimizationInfoEXT";
+      case PipelineCreateFlagBits::eLinkTimeOptimizationEXT: return "LinkTimeOptimizationEXT";
+      case PipelineCreateFlagBits::eRayTracingAllowMotionNV: return "RayTracingAllowMotionNV";
+      case PipelineCreateFlagBits::eColorAttachmentFeedbackLoopEXT: return "ColorAttachmentFeedbackLoopEXT";
+      case PipelineCreateFlagBits::eDepthStencilAttachmentFeedbackLoopEXT: return "DepthStencilAttachmentFeedbackLoopEXT";
+      case PipelineCreateFlagBits::eRayTracingOpacityMicromapEXT: return "RayTracingOpacityMicromapEXT";
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      case PipelineCreateFlagBits::eRayTracingDisplacementMicromapNV: return "RayTracingDisplacementMicromapNV";
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      case PipelineCreateFlagBits::eNoProtectedAccessEXT: return "NoProtectedAccessEXT";
+      case PipelineCreateFlagBits::eProtectedAccessOnlyEXT: return "ProtectedAccessOnlyEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineShaderStageCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case PipelineShaderStageCreateFlagBits::eAllowVaryingSubgroupSize: return "AllowVaryingSubgroupSize";
+      case PipelineShaderStageCreateFlagBits::eRequireFullSubgroups: return "RequireFullSubgroups";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PolygonMode value )
+  {
+    switch ( value )
+    {
+      case PolygonMode::eFill: return "Fill";
+      case PolygonMode::eLine: return "Line";
+      case PolygonMode::ePoint: return "Point";
       case PolygonMode::eFillRectangleNV: return "FillRectangleNV";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PrimitiveTopology value )
+  VULKAN_HPP_INLINE std::string to_string( PrimitiveTopology value )
   {
     switch ( value )
     {
-      case PrimitiveTopology::ePointList                 : return "PointList";
-      case PrimitiveTopology::eLineList                  : return "LineList";
-      case PrimitiveTopology::eLineStrip                 : return "LineStrip";
-      case PrimitiveTopology::eTriangleList              : return "TriangleList";
-      case PrimitiveTopology::eTriangleStrip             : return "TriangleStrip";
-      case PrimitiveTopology::eTriangleFan               : return "TriangleFan";
-      case PrimitiveTopology::eLineListWithAdjacency     : return "LineListWithAdjacency";
-      case PrimitiveTopology::eLineStripWithAdjacency    : return "LineStripWithAdjacency";
-      case PrimitiveTopology::eTriangleListWithAdjacency : return "TriangleListWithAdjacency";
+      case PrimitiveTopology::ePointList: return "PointList";
+      case PrimitiveTopology::eLineList: return "LineList";
+      case PrimitiveTopology::eLineStrip: return "LineStrip";
+      case PrimitiveTopology::eTriangleList: return "TriangleList";
+      case PrimitiveTopology::eTriangleStrip: return "TriangleStrip";
+      case PrimitiveTopology::eTriangleFan: return "TriangleFan";
+      case PrimitiveTopology::eLineListWithAdjacency: return "LineListWithAdjacency";
+      case PrimitiveTopology::eLineStripWithAdjacency: return "LineStripWithAdjacency";
+      case PrimitiveTopology::eTriangleListWithAdjacency: return "TriangleListWithAdjacency";
       case PrimitiveTopology::eTriangleStripWithAdjacency: return "TriangleStripWithAdjacency";
-      case PrimitiveTopology::ePatchList                 : return "PatchList";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PrimitiveTopology::ePatchList: return "PatchList";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( StencilOp value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderStageFlagBits value )
   {
     switch ( value )
     {
-      case StencilOp::eKeep             : return "Keep";
-      case StencilOp::eZero             : return "Zero";
-      case StencilOp::eReplace          : return "Replace";
+      case ShaderStageFlagBits::eVertex: return "Vertex";
+      case ShaderStageFlagBits::eTessellationControl: return "TessellationControl";
+      case ShaderStageFlagBits::eTessellationEvaluation: return "TessellationEvaluation";
+      case ShaderStageFlagBits::eGeometry: return "Geometry";
+      case ShaderStageFlagBits::eFragment: return "Fragment";
+      case ShaderStageFlagBits::eCompute: return "Compute";
+      case ShaderStageFlagBits::eAllGraphics: return "AllGraphics";
+      case ShaderStageFlagBits::eAll: return "All";
+      case ShaderStageFlagBits::eRaygenKHR: return "RaygenKHR";
+      case ShaderStageFlagBits::eAnyHitKHR: return "AnyHitKHR";
+      case ShaderStageFlagBits::eClosestHitKHR: return "ClosestHitKHR";
+      case ShaderStageFlagBits::eMissKHR: return "MissKHR";
+      case ShaderStageFlagBits::eIntersectionKHR: return "IntersectionKHR";
+      case ShaderStageFlagBits::eCallableKHR: return "CallableKHR";
+      case ShaderStageFlagBits::eTaskEXT: return "TaskEXT";
+      case ShaderStageFlagBits::eMeshEXT: return "MeshEXT";
+      case ShaderStageFlagBits::eSubpassShadingHUAWEI: return "SubpassShadingHUAWEI";
+      case ShaderStageFlagBits::eClusterCullingHUAWEI: return "ClusterCullingHUAWEI";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( StencilOp value )
+  {
+    switch ( value )
+    {
+      case StencilOp::eKeep: return "Keep";
+      case StencilOp::eZero: return "Zero";
+      case StencilOp::eReplace: return "Replace";
       case StencilOp::eIncrementAndClamp: return "IncrementAndClamp";
       case StencilOp::eDecrementAndClamp: return "DecrementAndClamp";
-      case StencilOp::eInvert           : return "Invert";
-      case StencilOp::eIncrementAndWrap : return "IncrementAndWrap";
-      case StencilOp::eDecrementAndWrap : return "DecrementAndWrap";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case StencilOp::eInvert: return "Invert";
+      case StencilOp::eIncrementAndWrap: return "IncrementAndWrap";
+      case StencilOp::eDecrementAndWrap: return "DecrementAndWrap";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VertexInputRate value )
+  VULKAN_HPP_INLINE std::string to_string( VertexInputRate value )
   {
     switch ( value )
     {
-      case VertexInputRate::eVertex  : return "Vertex";
+      case VertexInputRate::eVertex: return "Vertex";
       case VertexInputRate::eInstance: return "Instance";
-      default                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineColorBlendStateCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineColorBlendStateCreateFlagBits value )
   {
     switch ( value )
     {
       case PipelineColorBlendStateCreateFlagBits::eRasterizationOrderAttachmentAccessEXT: return "RasterizationOrderAttachmentAccessEXT";
-      default                                                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineDepthStencilStateCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineDepthStencilStateCreateFlagBits value )
   {
     switch ( value )
     {
-      case PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentDepthAccessEXT  : return "RasterizationOrderAttachmentDepthAccessEXT";
+      case PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentDepthAccessEXT: return "RasterizationOrderAttachmentDepthAccessEXT";
       case PipelineDepthStencilStateCreateFlagBits::eRasterizationOrderAttachmentStencilAccessEXT: return "RasterizationOrderAttachmentStencilAccessEXT";
-      default                                                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineDynamicStateCreateFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( PipelineDynamicStateCreateFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineInputAssemblyStateCreateFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( PipelineInputAssemblyStateCreateFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineMultisampleStateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationStateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineTessellationStateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineVertexInputStateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineViewportStateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AttachmentDescriptionFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineLayoutCreateFlagBits value )
   {
     switch ( value )
     {
-      case AttachmentDescriptionFlagBits::eMayAlias                        : return "MayAlias";
-      case AttachmentDescriptionFlagBits::eResolveSkipTransferFunctionKHR  : return "ResolveSkipTransferFunctionKHR";
-      case AttachmentDescriptionFlagBits::eResolveEnableTransferFunctionKHR: return "ResolveEnableTransferFunctionKHR";
-      default                                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineLayoutCreateFlagBits::eIndependentSetsEXT: return "IndependentSetsEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AttachmentLoadOp value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineMultisampleStateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationStateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineTessellationStateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineVertexInputStateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineViewportStateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( BorderColor value )
   {
     switch ( value )
     {
-      case AttachmentLoadOp::eLoad    : return "Load";
-      case AttachmentLoadOp::eClear   : return "Clear";
+      case BorderColor::eFloatTransparentBlack: return "FloatTransparentBlack";
+      case BorderColor::eIntTransparentBlack: return "IntTransparentBlack";
+      case BorderColor::eFloatOpaqueBlack: return "FloatOpaqueBlack";
+      case BorderColor::eIntOpaqueBlack: return "IntOpaqueBlack";
+      case BorderColor::eFloatOpaqueWhite: return "FloatOpaqueWhite";
+      case BorderColor::eIntOpaqueWhite: return "IntOpaqueWhite";
+      case BorderColor::eFloatCustomEXT: return "FloatCustomEXT";
+      case BorderColor::eIntCustomEXT: return "IntCustomEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( Filter value )
+  {
+    switch ( value )
+    {
+      case Filter::eNearest: return "Nearest";
+      case Filter::eLinear: return "Linear";
+      case Filter::eCubicEXT: return "CubicEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerAddressMode value )
+  {
+    switch ( value )
+    {
+      case SamplerAddressMode::eRepeat: return "Repeat";
+      case SamplerAddressMode::eMirroredRepeat: return "MirroredRepeat";
+      case SamplerAddressMode::eClampToEdge: return "ClampToEdge";
+      case SamplerAddressMode::eClampToBorder: return "ClampToBorder";
+      case SamplerAddressMode::eMirrorClampToEdge: return "MirrorClampToEdge";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case SamplerCreateFlagBits::eSubsampledEXT: return "SubsampledEXT";
+      case SamplerCreateFlagBits::eSubsampledCoarseReconstructionEXT: return "SubsampledCoarseReconstructionEXT";
+      case SamplerCreateFlagBits::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
+      case SamplerCreateFlagBits::eNonSeamlessCubeMapEXT: return "NonSeamlessCubeMapEXT";
+      case SamplerCreateFlagBits::eImageProcessingQCOM: return "ImageProcessingQCOM";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerMipmapMode value )
+  {
+    switch ( value )
+    {
+      case SamplerMipmapMode::eNearest: return "Nearest";
+      case SamplerMipmapMode::eLinear: return "Linear";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorPoolCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case DescriptorPoolCreateFlagBits::eFreeDescriptorSet: return "FreeDescriptorSet";
+      case DescriptorPoolCreateFlagBits::eUpdateAfterBind: return "UpdateAfterBind";
+      case DescriptorPoolCreateFlagBits::eHostOnlyEXT: return "HostOnlyEXT";
+      case DescriptorPoolCreateFlagBits::eAllowOverallocationSetsNV: return "AllowOverallocationSetsNV";
+      case DescriptorPoolCreateFlagBits::eAllowOverallocationPoolsNV: return "AllowOverallocationPoolsNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorSetLayoutCreateFlagBits value )
+  {
+    switch ( value )
+    {
+      case DescriptorSetLayoutCreateFlagBits::eUpdateAfterBindPool: return "UpdateAfterBindPool";
+      case DescriptorSetLayoutCreateFlagBits::ePushDescriptorKHR: return "PushDescriptorKHR";
+      case DescriptorSetLayoutCreateFlagBits::eDescriptorBufferEXT: return "DescriptorBufferEXT";
+      case DescriptorSetLayoutCreateFlagBits::eEmbeddedImmutableSamplersEXT: return "EmbeddedImmutableSamplersEXT";
+      case DescriptorSetLayoutCreateFlagBits::eIndirectBindableNV: return "IndirectBindableNV";
+      case DescriptorSetLayoutCreateFlagBits::eHostOnlyPoolEXT: return "HostOnlyPoolEXT";
+      case DescriptorSetLayoutCreateFlagBits::ePerStageNV: return "PerStageNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorType value )
+  {
+    switch ( value )
+    {
+      case DescriptorType::eSampler: return "Sampler";
+      case DescriptorType::eCombinedImageSampler: return "CombinedImageSampler";
+      case DescriptorType::eSampledImage: return "SampledImage";
+      case DescriptorType::eStorageImage: return "StorageImage";
+      case DescriptorType::eUniformTexelBuffer: return "UniformTexelBuffer";
+      case DescriptorType::eStorageTexelBuffer: return "StorageTexelBuffer";
+      case DescriptorType::eUniformBuffer: return "UniformBuffer";
+      case DescriptorType::eStorageBuffer: return "StorageBuffer";
+      case DescriptorType::eUniformBufferDynamic: return "UniformBufferDynamic";
+      case DescriptorType::eStorageBufferDynamic: return "StorageBufferDynamic";
+      case DescriptorType::eInputAttachment: return "InputAttachment";
+      case DescriptorType::eInlineUniformBlock: return "InlineUniformBlock";
+      case DescriptorType::eAccelerationStructureKHR: return "AccelerationStructureKHR";
+      case DescriptorType::eAccelerationStructureNV: return "AccelerationStructureNV";
+      case DescriptorType::eSampleWeightImageQCOM: return "SampleWeightImageQCOM";
+      case DescriptorType::eBlockMatchImageQCOM: return "BlockMatchImageQCOM";
+      case DescriptorType::eMutableEXT: return "MutableEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorPoolResetFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( AccessFlagBits value )
+  {
+    switch ( value )
+    {
+      case AccessFlagBits::eIndirectCommandRead: return "IndirectCommandRead";
+      case AccessFlagBits::eIndexRead: return "IndexRead";
+      case AccessFlagBits::eVertexAttributeRead: return "VertexAttributeRead";
+      case AccessFlagBits::eUniformRead: return "UniformRead";
+      case AccessFlagBits::eInputAttachmentRead: return "InputAttachmentRead";
+      case AccessFlagBits::eShaderRead: return "ShaderRead";
+      case AccessFlagBits::eShaderWrite: return "ShaderWrite";
+      case AccessFlagBits::eColorAttachmentRead: return "ColorAttachmentRead";
+      case AccessFlagBits::eColorAttachmentWrite: return "ColorAttachmentWrite";
+      case AccessFlagBits::eDepthStencilAttachmentRead: return "DepthStencilAttachmentRead";
+      case AccessFlagBits::eDepthStencilAttachmentWrite: return "DepthStencilAttachmentWrite";
+      case AccessFlagBits::eTransferRead: return "TransferRead";
+      case AccessFlagBits::eTransferWrite: return "TransferWrite";
+      case AccessFlagBits::eHostRead: return "HostRead";
+      case AccessFlagBits::eHostWrite: return "HostWrite";
+      case AccessFlagBits::eMemoryRead: return "MemoryRead";
+      case AccessFlagBits::eMemoryWrite: return "MemoryWrite";
+      case AccessFlagBits::eNone: return "None";
+      case AccessFlagBits::eTransformFeedbackWriteEXT: return "TransformFeedbackWriteEXT";
+      case AccessFlagBits::eTransformFeedbackCounterReadEXT: return "TransformFeedbackCounterReadEXT";
+      case AccessFlagBits::eTransformFeedbackCounterWriteEXT: return "TransformFeedbackCounterWriteEXT";
+      case AccessFlagBits::eConditionalRenderingReadEXT: return "ConditionalRenderingReadEXT";
+      case AccessFlagBits::eColorAttachmentReadNoncoherentEXT: return "ColorAttachmentReadNoncoherentEXT";
+      case AccessFlagBits::eAccelerationStructureReadKHR: return "AccelerationStructureReadKHR";
+      case AccessFlagBits::eAccelerationStructureWriteKHR: return "AccelerationStructureWriteKHR";
+      case AccessFlagBits::eFragmentDensityMapReadEXT: return "FragmentDensityMapReadEXT";
+      case AccessFlagBits::eFragmentShadingRateAttachmentReadKHR: return "FragmentShadingRateAttachmentReadKHR";
+      case AccessFlagBits::eCommandPreprocessReadNV: return "CommandPreprocessReadNV";
+      case AccessFlagBits::eCommandPreprocessWriteNV: return "CommandPreprocessWriteNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( AttachmentDescriptionFlagBits value )
+  {
+    switch ( value )
+    {
+      case AttachmentDescriptionFlagBits::eMayAlias: return "MayAlias";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( AttachmentLoadOp value )
+  {
+    switch ( value )
+    {
+      case AttachmentLoadOp::eLoad: return "Load";
+      case AttachmentLoadOp::eClear: return "Clear";
       case AttachmentLoadOp::eDontCare: return "DontCare";
-      case AttachmentLoadOp::eNone    : return "None";
-      default                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AttachmentLoadOp::eNoneKHR: return "NoneKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AttachmentStoreOp value )
+  VULKAN_HPP_INLINE std::string to_string( AttachmentStoreOp value )
   {
     switch ( value )
     {
-      case AttachmentStoreOp::eStore   : return "Store";
+      case AttachmentStoreOp::eStore: return "Store";
       case AttachmentStoreOp::eDontCare: return "DontCare";
-      case AttachmentStoreOp::eNone    : return "None";
-      default                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AttachmentStoreOp::eNone: return "None";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FramebufferCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( DependencyFlagBits value )
+  {
+    switch ( value )
+    {
+      case DependencyFlagBits::eByRegion: return "ByRegion";
+      case DependencyFlagBits::eDeviceGroup: return "DeviceGroup";
+      case DependencyFlagBits::eViewLocal: return "ViewLocal";
+      case DependencyFlagBits::eFeedbackLoopEXT: return "FeedbackLoopEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( FramebufferCreateFlagBits value )
   {
     switch ( value )
     {
       case FramebufferCreateFlagBits::eImageless: return "Imageless";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RenderPassCreateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineBindPoint value )
   {
     switch ( value )
     {
-      case RenderPassCreateFlagBits::eTransformQCOM               : return "TransformQCOM";
-      case RenderPassCreateFlagBits::ePerLayerFragmentDensityVALVE: return "PerLayerFragmentDensityVALVE";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineBindPoint::eGraphics: return "Graphics";
+      case PipelineBindPoint::eCompute: return "Compute";
+#if defined( VK_ENABLE_BETA_EXTENSIONS )
+      case PipelineBindPoint::eExecutionGraphAMDX: return "ExecutionGraphAMDX";
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      case PipelineBindPoint::eRayTracingKHR: return "RayTracingKHR";
+      case PipelineBindPoint::eSubpassShadingHUAWEI: return "SubpassShadingHUAWEI";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SubpassDescriptionFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( RenderPassCreateFlagBits value )
   {
     switch ( value )
     {
-      case SubpassDescriptionFlagBits::ePerViewAttributesNVX                        : return "PerViewAttributesNVX";
-      case SubpassDescriptionFlagBits::ePerViewPositionXOnlyNVX                     : return "PerViewPositionXOnlyNVX";
-      case SubpassDescriptionFlagBits::eTileShadingApronQCOM                        : return "TileShadingApronQCOM";
-      case SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT  : return "RasterizationOrderAttachmentColorAccessEXT";
-      case SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT  : return "RasterizationOrderAttachmentDepthAccessEXT";
+      case RenderPassCreateFlagBits::eTransformQCOM: return "TransformQCOM";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SubpassDescriptionFlagBits value )
+  {
+    switch ( value )
+    {
+      case SubpassDescriptionFlagBits::ePerViewAttributesNVX: return "PerViewAttributesNVX";
+      case SubpassDescriptionFlagBits::ePerViewPositionXOnlyNVX: return "PerViewPositionXOnlyNVX";
+      case SubpassDescriptionFlagBits::eFragmentRegionQCOM: return "FragmentRegionQCOM";
+      case SubpassDescriptionFlagBits::eShaderResolveQCOM: return "ShaderResolveQCOM";
+      case SubpassDescriptionFlagBits::eRasterizationOrderAttachmentColorAccessEXT: return "RasterizationOrderAttachmentColorAccessEXT";
+      case SubpassDescriptionFlagBits::eRasterizationOrderAttachmentDepthAccessEXT: return "RasterizationOrderAttachmentDepthAccessEXT";
       case SubpassDescriptionFlagBits::eRasterizationOrderAttachmentStencilAccessEXT: return "RasterizationOrderAttachmentStencilAccessEXT";
-      case SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT                    : return "EnableLegacyDitheringEXT";
-      case SubpassDescriptionFlagBits::eFragmentRegionEXT                           : return "FragmentRegionEXT";
-      case SubpassDescriptionFlagBits::eCustomResolveEXT                            : return "CustomResolveEXT";
-      default                                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case SubpassDescriptionFlagBits::eEnableLegacyDitheringEXT: return "EnableLegacyDitheringEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( StencilFaceFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolCreateFlagBits value )
   {
     switch ( value )
     {
-      case StencilFaceFlagBits::eFront       : return "Front";
-      case StencilFaceFlagBits::eBack        : return "Back";
+      case CommandPoolCreateFlagBits::eTransient: return "Transient";
+      case CommandPoolCreateFlagBits::eResetCommandBuffer: return "ResetCommandBuffer";
+      case CommandPoolCreateFlagBits::eProtected: return "Protected";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolResetFlagBits value )
+  {
+    switch ( value )
+    {
+      case CommandPoolResetFlagBits::eReleaseResources: return "ReleaseResources";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandBufferLevel value )
+  {
+    switch ( value )
+    {
+      case CommandBufferLevel::ePrimary: return "Primary";
+      case CommandBufferLevel::eSecondary: return "Secondary";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandBufferResetFlagBits value )
+  {
+    switch ( value )
+    {
+      case CommandBufferResetFlagBits::eReleaseResources: return "ReleaseResources";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( CommandBufferUsageFlagBits value )
+  {
+    switch ( value )
+    {
+      case CommandBufferUsageFlagBits::eOneTimeSubmit: return "OneTimeSubmit";
+      case CommandBufferUsageFlagBits::eRenderPassContinue: return "RenderPassContinue";
+      case CommandBufferUsageFlagBits::eSimultaneousUse: return "SimultaneousUse";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( QueryControlFlagBits value )
+  {
+    switch ( value )
+    {
+      case QueryControlFlagBits::ePrecise: return "Precise";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( IndexType value )
+  {
+    switch ( value )
+    {
+      case IndexType::eUint16: return "Uint16";
+      case IndexType::eUint32: return "Uint32";
+      case IndexType::eNoneKHR: return "NoneKHR";
+      case IndexType::eUint8KHR: return "Uint8KHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( StencilFaceFlagBits value )
+  {
+    switch ( value )
+    {
+      case StencilFaceFlagBits::eFront: return "Front";
+      case StencilFaceFlagBits::eBack: return "Back";
       case StencilFaceFlagBits::eFrontAndBack: return "FrontAndBack";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SubpassContents value )
+  VULKAN_HPP_INLINE std::string to_string( SubpassContents value )
   {
     switch ( value )
     {
-      case SubpassContents::eInline                             : return "Inline";
-      case SubpassContents::eSecondaryCommandBuffers            : return "SecondaryCommandBuffers";
-      case SubpassContents::eInlineAndSecondaryCommandBuffersKHR: return "InlineAndSecondaryCommandBuffersKHR";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case SubpassContents::eInline: return "Inline";
+      case SubpassContents::eSecondaryCommandBuffers: return "SecondaryCommandBuffers";
+      case SubpassContents::eInlineAndSecondaryCommandBuffersEXT: return "InlineAndSecondaryCommandBuffersEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_VERSION_1_1 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PeerMemoryFeatureFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( SubgroupFeatureFlagBits value )
   {
     switch ( value )
     {
-      case PeerMemoryFeatureFlagBits::eCopySrc   : return "CopySrc";
-      case PeerMemoryFeatureFlagBits::eCopyDst   : return "CopyDst";
+      case SubgroupFeatureFlagBits::eBasic: return "Basic";
+      case SubgroupFeatureFlagBits::eVote: return "Vote";
+      case SubgroupFeatureFlagBits::eArithmetic: return "Arithmetic";
+      case SubgroupFeatureFlagBits::eBallot: return "Ballot";
+      case SubgroupFeatureFlagBits::eShuffle: return "Shuffle";
+      case SubgroupFeatureFlagBits::eShuffleRelative: return "ShuffleRelative";
+      case SubgroupFeatureFlagBits::eClustered: return "Clustered";
+      case SubgroupFeatureFlagBits::eQuad: return "Quad";
+      case SubgroupFeatureFlagBits::ePartitionedNV: return "PartitionedNV";
+      case SubgroupFeatureFlagBits::eRotateKHR: return "RotateKHR";
+      case SubgroupFeatureFlagBits::eRotateClusteredKHR: return "RotateClusteredKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PeerMemoryFeatureFlagBits value )
+  {
+    switch ( value )
+    {
+      case PeerMemoryFeatureFlagBits::eCopySrc: return "CopySrc";
+      case PeerMemoryFeatureFlagBits::eCopyDst: return "CopyDst";
       case PeerMemoryFeatureFlagBits::eGenericSrc: return "GenericSrc";
       case PeerMemoryFeatureFlagBits::eGenericDst: return "GenericDst";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryAllocateFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryAllocateFlagBits value )
   {
     switch ( value )
     {
-      case MemoryAllocateFlagBits::eDeviceMask                : return "DeviceMask";
-      case MemoryAllocateFlagBits::eDeviceAddress             : return "DeviceAddress";
+      case MemoryAllocateFlagBits::eDeviceMask: return "DeviceMask";
+      case MemoryAllocateFlagBits::eDeviceAddress: return "DeviceAddress";
       case MemoryAllocateFlagBits::eDeviceAddressCaptureReplay: return "DeviceAddressCaptureReplay";
-      case MemoryAllocateFlagBits::eZeroInitializeEXT         : return "ZeroInitializeEXT";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CommandPoolTrimFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( CommandPoolTrimFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalMemoryHandleTypeFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PointClippingBehavior value )
   {
     switch ( value )
     {
-      case ExternalMemoryHandleTypeFlagBits::eOpaqueFd       : return "OpaqueFd";
-      case ExternalMemoryHandleTypeFlagBits::eOpaqueWin32    : return "OpaqueWin32";
-      case ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt : return "OpaqueWin32Kmt";
-      case ExternalMemoryHandleTypeFlagBits::eD3D11Texture   : return "D3D11Texture";
-      case ExternalMemoryHandleTypeFlagBits::eD3D11TextureKmt: return "D3D11TextureKmt";
-      case ExternalMemoryHandleTypeFlagBits::eD3D12Heap      : return "D3D12Heap";
-      case ExternalMemoryHandleTypeFlagBits::eD3D12Resource  : return "D3D12Resource";
-      case ExternalMemoryHandleTypeFlagBits::eDmaBufEXT      : return "DmaBufEXT";
-#if defined( VK_USE_PLATFORM_ANDROID_KHR )
-      case ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID: return "AndroidHardwareBufferANDROID";
-#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-      case ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT         : return "HostAllocationEXT";
-      case ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT: return "HostMappedForeignMemoryEXT";
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-      case ExternalMemoryHandleTypeFlagBits::eZirconVmoFUCHSIA: return "ZirconVmoFUCHSIA";
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-      case ExternalMemoryHandleTypeFlagBits::eRdmaAddressNV: return "RdmaAddressNV";
-#if defined( VK_USE_PLATFORM_OHOS )
-      case ExternalMemoryHandleTypeFlagBits::eOhNativeBufferOHOS: return "OhNativeBufferOHOS";
-#endif /*VK_USE_PLATFORM_OHOS*/
-#if defined( VK_USE_PLATFORM_SCREEN_QNX )
-      case ExternalMemoryHandleTypeFlagBits::eScreenBufferQNX: return "ScreenBufferQNX";
-#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
-#if defined( VK_USE_PLATFORM_METAL_EXT )
-      case ExternalMemoryHandleTypeFlagBits::eMtlbufferEXT : return "MtlbufferEXT";
-      case ExternalMemoryHandleTypeFlagBits::eMtltextureEXT: return "MtltextureEXT";
-      case ExternalMemoryHandleTypeFlagBits::eMtlheapEXT   : return "MtlheapEXT";
-#endif /*VK_USE_PLATFORM_METAL_EXT*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalMemoryFeatureFlagBits value )
-  {
-    switch ( value )
-    {
-      case ExternalMemoryFeatureFlagBits::eDedicatedOnly: return "DedicatedOnly";
-      case ExternalMemoryFeatureFlagBits::eExportable   : return "Exportable";
-      case ExternalMemoryFeatureFlagBits::eImportable   : return "Importable";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalFenceHandleTypeFlagBits value )
-  {
-    switch ( value )
-    {
-      case ExternalFenceHandleTypeFlagBits::eOpaqueFd      : return "OpaqueFd";
-      case ExternalFenceHandleTypeFlagBits::eOpaqueWin32   : return "OpaqueWin32";
-      case ExternalFenceHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
-      case ExternalFenceHandleTypeFlagBits::eSyncFd        : return "SyncFd";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalFenceFeatureFlagBits value )
-  {
-    switch ( value )
-    {
-      case ExternalFenceFeatureFlagBits::eExportable: return "Exportable";
-      case ExternalFenceFeatureFlagBits::eImportable: return "Importable";
-      default                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FenceImportFlagBits value )
-  {
-    switch ( value )
-    {
-      case FenceImportFlagBits::eTemporary: return "Temporary";
-      default                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SemaphoreImportFlagBits value )
-  {
-    switch ( value )
-    {
-      case SemaphoreImportFlagBits::eTemporary: return "Temporary";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalSemaphoreHandleTypeFlagBits value )
-  {
-    switch ( value )
-    {
-      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd      : return "OpaqueFd";
-      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32   : return "OpaqueWin32";
-      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
-      case ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence    : return "D3D12Fence";
-      case ExternalSemaphoreHandleTypeFlagBits::eSyncFd        : return "SyncFd";
-#if defined( VK_USE_PLATFORM_FUCHSIA )
-      case ExternalSemaphoreHandleTypeFlagBits::eZirconEventFUCHSIA: return "ZirconEventFUCHSIA";
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalSemaphoreFeatureFlagBits value )
-  {
-    switch ( value )
-    {
-      case ExternalSemaphoreFeatureFlagBits::eExportable: return "Exportable";
-      case ExternalSemaphoreFeatureFlagBits::eImportable: return "Importable";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SubgroupFeatureFlagBits value )
-  {
-    switch ( value )
-    {
-      case SubgroupFeatureFlagBits::eBasic          : return "Basic";
-      case SubgroupFeatureFlagBits::eVote           : return "Vote";
-      case SubgroupFeatureFlagBits::eArithmetic     : return "Arithmetic";
-      case SubgroupFeatureFlagBits::eBallot         : return "Ballot";
-      case SubgroupFeatureFlagBits::eShuffle        : return "Shuffle";
-      case SubgroupFeatureFlagBits::eShuffleRelative: return "ShuffleRelative";
-      case SubgroupFeatureFlagBits::eClustered      : return "Clustered";
-      case SubgroupFeatureFlagBits::eQuad           : return "Quad";
-      case SubgroupFeatureFlagBits::eRotate         : return "Rotate";
-      case SubgroupFeatureFlagBits::eRotateClustered: return "RotateClustered";
-      case SubgroupFeatureFlagBits::ePartitionedNV  : return "PartitionedNV";
-      default                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorUpdateTemplateType value )
-  {
-    switch ( value )
-    {
-      case DescriptorUpdateTemplateType::eDescriptorSet  : return "DescriptorSet";
-      case DescriptorUpdateTemplateType::ePushDescriptors: return "PushDescriptors";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorUpdateTemplateCreateFlagBits )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerYcbcrModelConversion value )
-  {
-    switch ( value )
-    {
-      case SamplerYcbcrModelConversion::eRgbIdentity  : return "RgbIdentity";
-      case SamplerYcbcrModelConversion::eYcbcrIdentity: return "YcbcrIdentity";
-      case SamplerYcbcrModelConversion::eYcbcr709     : return "Ycbcr709";
-      case SamplerYcbcrModelConversion::eYcbcr601     : return "Ycbcr601";
-      case SamplerYcbcrModelConversion::eYcbcr2020    : return "Ycbcr2020";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerYcbcrRange value )
-  {
-    switch ( value )
-    {
-      case SamplerYcbcrRange::eItuFull  : return "ItuFull";
-      case SamplerYcbcrRange::eItuNarrow: return "ItuNarrow";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ChromaLocation value )
-  {
-    switch ( value )
-    {
-      case ChromaLocation::eCositedEven: return "CositedEven";
-      case ChromaLocation::eMidpoint   : return "Midpoint";
-      default                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PointClippingBehavior value )
-  {
-    switch ( value )
-    {
-      case PointClippingBehavior::eAllClipPlanes     : return "AllClipPlanes";
+      case PointClippingBehavior::eAllClipPlanes: return "AllClipPlanes";
       case PointClippingBehavior::eUserClipPlanesOnly: return "UserClipPlanesOnly";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TessellationDomainOrigin value )
+  VULKAN_HPP_INLINE std::string to_string( TessellationDomainOrigin value )
   {
     switch ( value )
     {
       case TessellationDomainOrigin::eUpperLeft: return "UpperLeft";
       case TessellationDomainOrigin::eLowerLeft: return "LowerLeft";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerYcbcrModelConversion value )
+  {
+    switch ( value )
+    {
+      case SamplerYcbcrModelConversion::eRgbIdentity: return "RgbIdentity";
+      case SamplerYcbcrModelConversion::eYcbcrIdentity: return "YcbcrIdentity";
+      case SamplerYcbcrModelConversion::eYcbcr709: return "Ycbcr709";
+      case SamplerYcbcrModelConversion::eYcbcr601: return "Ycbcr601";
+      case SamplerYcbcrModelConversion::eYcbcr2020: return "Ycbcr2020";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerYcbcrRange value )
+  {
+    switch ( value )
+    {
+      case SamplerYcbcrRange::eItuFull: return "ItuFull";
+      case SamplerYcbcrRange::eItuNarrow: return "ItuNarrow";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ChromaLocation value )
+  {
+    switch ( value )
+    {
+      case ChromaLocation::eCositedEven: return "CositedEven";
+      case ChromaLocation::eMidpoint: return "Midpoint";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorUpdateTemplateType value )
+  {
+    switch ( value )
+    {
+      case DescriptorUpdateTemplateType::eDescriptorSet: return "DescriptorSet";
+      case DescriptorUpdateTemplateType::ePushDescriptorsKHR: return "PushDescriptorsKHR";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( DescriptorUpdateTemplateCreateFlagBits )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalMemoryHandleTypeFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalMemoryHandleTypeFlagBits::eOpaqueFd: return "OpaqueFd";
+      case ExternalMemoryHandleTypeFlagBits::eOpaqueWin32: return "OpaqueWin32";
+      case ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
+      case ExternalMemoryHandleTypeFlagBits::eD3D11Texture: return "D3D11Texture";
+      case ExternalMemoryHandleTypeFlagBits::eD3D11TextureKmt: return "D3D11TextureKmt";
+      case ExternalMemoryHandleTypeFlagBits::eD3D12Heap: return "D3D12Heap";
+      case ExternalMemoryHandleTypeFlagBits::eD3D12Resource: return "D3D12Resource";
+      case ExternalMemoryHandleTypeFlagBits::eDmaBufEXT: return "DmaBufEXT";
+#if defined( VK_USE_PLATFORM_ANDROID_KHR )
+      case ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID: return "AndroidHardwareBufferANDROID";
+#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
+      case ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT: return "HostAllocationEXT";
+      case ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT: return "HostMappedForeignMemoryEXT";
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+      case ExternalMemoryHandleTypeFlagBits::eZirconVmoFUCHSIA: return "ZirconVmoFUCHSIA";
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+      case ExternalMemoryHandleTypeFlagBits::eRdmaAddressNV: return "RdmaAddressNV";
+#if defined( VK_USE_PLATFORM_SCREEN_QNX )
+      case ExternalMemoryHandleTypeFlagBits::eScreenBufferQNX: return "ScreenBufferQNX";
+#endif /*VK_USE_PLATFORM_SCREEN_QNX*/
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalMemoryFeatureFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalMemoryFeatureFlagBits::eDedicatedOnly: return "DedicatedOnly";
+      case ExternalMemoryFeatureFlagBits::eExportable: return "Exportable";
+      case ExternalMemoryFeatureFlagBits::eImportable: return "Importable";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalFenceHandleTypeFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalFenceHandleTypeFlagBits::eOpaqueFd: return "OpaqueFd";
+      case ExternalFenceHandleTypeFlagBits::eOpaqueWin32: return "OpaqueWin32";
+      case ExternalFenceHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
+      case ExternalFenceHandleTypeFlagBits::eSyncFd: return "SyncFd";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalFenceFeatureFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalFenceFeatureFlagBits::eExportable: return "Exportable";
+      case ExternalFenceFeatureFlagBits::eImportable: return "Importable";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( FenceImportFlagBits value )
+  {
+    switch ( value )
+    {
+      case FenceImportFlagBits::eTemporary: return "Temporary";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreImportFlagBits value )
+  {
+    switch ( value )
+    {
+      case SemaphoreImportFlagBits::eTemporary: return "Temporary";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalSemaphoreHandleTypeFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd: return "OpaqueFd";
+      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32: return "OpaqueWin32";
+      case ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
+      case ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence: return "D3D12Fence";
+      case ExternalSemaphoreHandleTypeFlagBits::eSyncFd: return "SyncFd";
+#if defined( VK_USE_PLATFORM_FUCHSIA )
+      case ExternalSemaphoreHandleTypeFlagBits::eZirconEventFUCHSIA: return "ZirconEventFUCHSIA";
+#endif /*VK_USE_PLATFORM_FUCHSIA*/
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( ExternalSemaphoreFeatureFlagBits value )
+  {
+    switch ( value )
+    {
+      case ExternalSemaphoreFeatureFlagBits::eExportable: return "Exportable";
+      case ExternalSemaphoreFeatureFlagBits::eImportable: return "Importable";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_VERSION_1_2 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DriverId value )
+  VULKAN_HPP_INLINE std::string to_string( DriverId value )
   {
     switch ( value )
     {
-      case DriverId::eAmdProprietary           : return "AmdProprietary";
-      case DriverId::eAmdOpenSource            : return "AmdOpenSource";
-      case DriverId::eMesaRadv                 : return "MesaRadv";
-      case DriverId::eNvidiaProprietary        : return "NvidiaProprietary";
-      case DriverId::eIntelProprietaryWindows  : return "IntelProprietaryWindows";
-      case DriverId::eIntelOpenSourceMESA      : return "IntelOpenSourceMESA";
-      case DriverId::eImaginationProprietary   : return "ImaginationProprietary";
-      case DriverId::eQualcommProprietary      : return "QualcommProprietary";
-      case DriverId::eArmProprietary           : return "ArmProprietary";
-      case DriverId::eGoogleSwiftshader        : return "GoogleSwiftshader";
-      case DriverId::eGgpProprietary           : return "GgpProprietary";
-      case DriverId::eBroadcomProprietary      : return "BroadcomProprietary";
-      case DriverId::eMesaLlvmpipe             : return "MesaLlvmpipe";
-      case DriverId::eMoltenvk                 : return "Moltenvk";
-      case DriverId::eCoreaviProprietary       : return "CoreaviProprietary";
-      case DriverId::eJuiceProprietary         : return "JuiceProprietary";
-      case DriverId::eVerisiliconProprietary   : return "VerisiliconProprietary";
-      case DriverId::eMesaTurnip               : return "MesaTurnip";
-      case DriverId::eMesaV3Dv                 : return "MesaV3Dv";
-      case DriverId::eMesaPanvk                : return "MesaPanvk";
-      case DriverId::eSamsungProprietary       : return "SamsungProprietary";
-      case DriverId::eMesaVenus                : return "MesaVenus";
-      case DriverId::eMesaDozen                : return "MesaDozen";
-      case DriverId::eMesaNvk                  : return "MesaNvk";
+      case DriverId::eAmdProprietary: return "AmdProprietary";
+      case DriverId::eAmdOpenSource: return "AmdOpenSource";
+      case DriverId::eMesaRadv: return "MesaRadv";
+      case DriverId::eNvidiaProprietary: return "NvidiaProprietary";
+      case DriverId::eIntelProprietaryWindows: return "IntelProprietaryWindows";
+      case DriverId::eIntelOpenSourceMESA: return "IntelOpenSourceMESA";
+      case DriverId::eImaginationProprietary: return "ImaginationProprietary";
+      case DriverId::eQualcommProprietary: return "QualcommProprietary";
+      case DriverId::eArmProprietary: return "ArmProprietary";
+      case DriverId::eGoogleSwiftshader: return "GoogleSwiftshader";
+      case DriverId::eGgpProprietary: return "GgpProprietary";
+      case DriverId::eBroadcomProprietary: return "BroadcomProprietary";
+      case DriverId::eMesaLlvmpipe: return "MesaLlvmpipe";
+      case DriverId::eMoltenvk: return "Moltenvk";
+      case DriverId::eCoreaviProprietary: return "CoreaviProprietary";
+      case DriverId::eJuiceProprietary: return "JuiceProprietary";
+      case DriverId::eVerisiliconProprietary: return "VerisiliconProprietary";
+      case DriverId::eMesaTurnip: return "MesaTurnip";
+      case DriverId::eMesaV3Dv: return "MesaV3Dv";
+      case DriverId::eMesaPanvk: return "MesaPanvk";
+      case DriverId::eSamsungProprietary: return "SamsungProprietary";
+      case DriverId::eMesaVenus: return "MesaVenus";
+      case DriverId::eMesaDozen: return "MesaDozen";
+      case DriverId::eMesaNvk: return "MesaNvk";
       case DriverId::eImaginationOpenSourceMESA: return "ImaginationOpenSourceMESA";
-      case DriverId::eMesaHoneykrisp           : return "MesaHoneykrisp";
-      case DriverId::eVulkanScEmulationOnVulkan: return "VulkanScEmulationOnVulkan";
-      case DriverId::eMesaKosmickrisp          : return "MesaKosmickrisp";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DriverId::eMesaAgxv: return "MesaAgxv";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SemaphoreType value )
-  {
-    switch ( value )
-    {
-      case SemaphoreType::eBinary  : return "Binary";
-      case SemaphoreType::eTimeline: return "Timeline";
-      default                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SemaphoreWaitFlagBits value )
-  {
-    switch ( value )
-    {
-      case SemaphoreWaitFlagBits::eAny: return "Any";
-      default                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderFloatControlsIndependence value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderFloatControlsIndependence value )
   {
     switch ( value )
     {
       case ShaderFloatControlsIndependence::e32BitOnly: return "32BitOnly";
-      case ShaderFloatControlsIndependence::eAll      : return "All";
-      case ShaderFloatControlsIndependence::eNone     : return "None";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ShaderFloatControlsIndependence::eAll: return "All";
+      case ShaderFloatControlsIndependence::eNone: return "None";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DescriptorBindingFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( DescriptorBindingFlagBits value )
   {
     switch ( value )
     {
-      case DescriptorBindingFlagBits::eUpdateAfterBind         : return "UpdateAfterBind";
+      case DescriptorBindingFlagBits::eUpdateAfterBind: return "UpdateAfterBind";
       case DescriptorBindingFlagBits::eUpdateUnusedWhilePending: return "UpdateUnusedWhilePending";
-      case DescriptorBindingFlagBits::ePartiallyBound          : return "PartiallyBound";
-      case DescriptorBindingFlagBits::eVariableDescriptorCount : return "VariableDescriptorCount";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DescriptorBindingFlagBits::ePartiallyBound: return "PartiallyBound";
+      case DescriptorBindingFlagBits::eVariableDescriptorCount: return "VariableDescriptorCount";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SamplerReductionMode value )
+  VULKAN_HPP_INLINE std::string to_string( ResolveModeFlagBits value )
   {
     switch ( value )
     {
-      case SamplerReductionMode::eWeightedAverage              : return "WeightedAverage";
-      case SamplerReductionMode::eMin                          : return "Min";
-      case SamplerReductionMode::eMax                          : return "Max";
-      case SamplerReductionMode::eWeightedAverageRangeclampQCOM: return "WeightedAverageRangeclampQCOM";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ResolveModeFlagBits value )
-  {
-    switch ( value )
-    {
-      case ResolveModeFlagBits::eNone      : return "None";
+      case ResolveModeFlagBits::eNone: return "None";
       case ResolveModeFlagBits::eSampleZero: return "SampleZero";
-      case ResolveModeFlagBits::eAverage   : return "Average";
-      case ResolveModeFlagBits::eMin       : return "Min";
-      case ResolveModeFlagBits::eMax       : return "Max";
+      case ResolveModeFlagBits::eAverage: return "Average";
+      case ResolveModeFlagBits::eMin: return "Min";
+      case ResolveModeFlagBits::eMax: return "Max";
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
       case ResolveModeFlagBits::eExternalFormatDownsampleANDROID: return "ExternalFormatDownsampleANDROID";
 #endif /*VK_USE_PLATFORM_ANDROID_KHR*/
-      case ResolveModeFlagBits::eCustomEXT: return "CustomEXT";
-      default                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SamplerReductionMode value )
+  {
+    switch ( value )
+    {
+      case SamplerReductionMode::eWeightedAverage: return "WeightedAverage";
+      case SamplerReductionMode::eMin: return "Min";
+      case SamplerReductionMode::eMax: return "Max";
+      case SamplerReductionMode::eWeightedAverageRangeclampQCOM: return "WeightedAverageRangeclampQCOM";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreType value )
+  {
+    switch ( value )
+    {
+      case SemaphoreType::eBinary: return "Binary";
+      case SemaphoreType::eTimeline: return "Timeline";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( SemaphoreWaitFlagBits value )
+  {
+    switch ( value )
+    {
+      case SemaphoreWaitFlagBits::eAny: return "Any";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_VERSION_1_3 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ToolPurposeFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCreationFeedbackFlagBits value )
   {
     switch ( value )
     {
-      case ToolPurposeFlagBits::eValidation        : return "Validation";
-      case ToolPurposeFlagBits::eProfiling         : return "Profiling";
-      case ToolPurposeFlagBits::eTracing           : return "Tracing";
-      case ToolPurposeFlagBits::eAdditionalFeatures: return "AdditionalFeatures";
-      case ToolPurposeFlagBits::eModifyingFeatures : return "ModifyingFeatures";
-      case ToolPurposeFlagBits::eDebugReportingEXT : return "DebugReportingEXT";
-      case ToolPurposeFlagBits::eDebugMarkersEXT   : return "DebugMarkersEXT";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineCreationFeedbackFlagBits::eValid: return "Valid";
+      case PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit: return "ApplicationPipelineCacheHit";
+      case PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration: return "BasePipelineAcceleration";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PrivateDataSlotCreateFlagBits )
+  VULKAN_HPP_INLINE std::string to_string( ToolPurposeFlagBits value )
+  {
+    switch ( value )
+    {
+      case ToolPurposeFlagBits::eValidation: return "Validation";
+      case ToolPurposeFlagBits::eProfiling: return "Profiling";
+      case ToolPurposeFlagBits::eTracing: return "Tracing";
+      case ToolPurposeFlagBits::eAdditionalFeatures: return "AdditionalFeatures";
+      case ToolPurposeFlagBits::eModifyingFeatures: return "ModifyingFeatures";
+      case ToolPurposeFlagBits::eDebugReportingEXT: return "DebugReportingEXT";
+      case ToolPurposeFlagBits::eDebugMarkersEXT: return "DebugMarkersEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PrivateDataSlotCreateFlagBits )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineStageFlagBits2 value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineStageFlagBits2 value )
   {
     switch ( value )
     {
-      case PipelineStageFlagBits2::eNone                            : return "None";
-      case PipelineStageFlagBits2::eTopOfPipe                       : return "TopOfPipe";
-      case PipelineStageFlagBits2::eDrawIndirect                    : return "DrawIndirect";
-      case PipelineStageFlagBits2::eVertexInput                     : return "VertexInput";
-      case PipelineStageFlagBits2::eVertexShader                    : return "VertexShader";
-      case PipelineStageFlagBits2::eTessellationControlShader       : return "TessellationControlShader";
-      case PipelineStageFlagBits2::eTessellationEvaluationShader    : return "TessellationEvaluationShader";
-      case PipelineStageFlagBits2::eGeometryShader                  : return "GeometryShader";
-      case PipelineStageFlagBits2::eFragmentShader                  : return "FragmentShader";
-      case PipelineStageFlagBits2::eEarlyFragmentTests              : return "EarlyFragmentTests";
-      case PipelineStageFlagBits2::eLateFragmentTests               : return "LateFragmentTests";
-      case PipelineStageFlagBits2::eColorAttachmentOutput           : return "ColorAttachmentOutput";
-      case PipelineStageFlagBits2::eComputeShader                   : return "ComputeShader";
-      case PipelineStageFlagBits2::eAllTransfer                     : return "AllTransfer";
-      case PipelineStageFlagBits2::eBottomOfPipe                    : return "BottomOfPipe";
-      case PipelineStageFlagBits2::eHost                            : return "Host";
-      case PipelineStageFlagBits2::eAllGraphics                     : return "AllGraphics";
-      case PipelineStageFlagBits2::eAllCommands                     : return "AllCommands";
-      case PipelineStageFlagBits2::eCopy                            : return "Copy";
-      case PipelineStageFlagBits2::eResolve                         : return "Resolve";
-      case PipelineStageFlagBits2::eBlit                            : return "Blit";
-      case PipelineStageFlagBits2::eClear                           : return "Clear";
-      case PipelineStageFlagBits2::eIndexInput                      : return "IndexInput";
-      case PipelineStageFlagBits2::eVertexAttributeInput            : return "VertexAttributeInput";
-      case PipelineStageFlagBits2::ePreRasterizationShaders         : return "PreRasterizationShaders";
-      case PipelineStageFlagBits2::eVideoDecodeKHR                  : return "VideoDecodeKHR";
-      case PipelineStageFlagBits2::eVideoEncodeKHR                  : return "VideoEncodeKHR";
-      case PipelineStageFlagBits2::eTransformFeedbackEXT            : return "TransformFeedbackEXT";
-      case PipelineStageFlagBits2::eConditionalRenderingEXT         : return "ConditionalRenderingEXT";
-      case PipelineStageFlagBits2::eCommandPreprocessEXT            : return "CommandPreprocessEXT";
+      case PipelineStageFlagBits2::eNone: return "None";
+      case PipelineStageFlagBits2::eTopOfPipe: return "TopOfPipe";
+      case PipelineStageFlagBits2::eDrawIndirect: return "DrawIndirect";
+      case PipelineStageFlagBits2::eVertexInput: return "VertexInput";
+      case PipelineStageFlagBits2::eVertexShader: return "VertexShader";
+      case PipelineStageFlagBits2::eTessellationControlShader: return "TessellationControlShader";
+      case PipelineStageFlagBits2::eTessellationEvaluationShader: return "TessellationEvaluationShader";
+      case PipelineStageFlagBits2::eGeometryShader: return "GeometryShader";
+      case PipelineStageFlagBits2::eFragmentShader: return "FragmentShader";
+      case PipelineStageFlagBits2::eEarlyFragmentTests: return "EarlyFragmentTests";
+      case PipelineStageFlagBits2::eLateFragmentTests: return "LateFragmentTests";
+      case PipelineStageFlagBits2::eColorAttachmentOutput: return "ColorAttachmentOutput";
+      case PipelineStageFlagBits2::eComputeShader: return "ComputeShader";
+      case PipelineStageFlagBits2::eAllTransfer: return "AllTransfer";
+      case PipelineStageFlagBits2::eBottomOfPipe: return "BottomOfPipe";
+      case PipelineStageFlagBits2::eHost: return "Host";
+      case PipelineStageFlagBits2::eAllGraphics: return "AllGraphics";
+      case PipelineStageFlagBits2::eAllCommands: return "AllCommands";
+      case PipelineStageFlagBits2::eCopy: return "Copy";
+      case PipelineStageFlagBits2::eResolve: return "Resolve";
+      case PipelineStageFlagBits2::eBlit: return "Blit";
+      case PipelineStageFlagBits2::eClear: return "Clear";
+      case PipelineStageFlagBits2::eIndexInput: return "IndexInput";
+      case PipelineStageFlagBits2::eVertexAttributeInput: return "VertexAttributeInput";
+      case PipelineStageFlagBits2::ePreRasterizationShaders: return "PreRasterizationShaders";
+      case PipelineStageFlagBits2::eVideoDecodeKHR: return "VideoDecodeKHR";
+      case PipelineStageFlagBits2::eVideoEncodeKHR: return "VideoEncodeKHR";
+      case PipelineStageFlagBits2::eTransformFeedbackEXT: return "TransformFeedbackEXT";
+      case PipelineStageFlagBits2::eConditionalRenderingEXT: return "ConditionalRenderingEXT";
+      case PipelineStageFlagBits2::eCommandPreprocessNV: return "CommandPreprocessNV";
       case PipelineStageFlagBits2::eFragmentShadingRateAttachmentKHR: return "FragmentShadingRateAttachmentKHR";
-      case PipelineStageFlagBits2::eAccelerationStructureBuildKHR   : return "AccelerationStructureBuildKHR";
-      case PipelineStageFlagBits2::eRayTracingShaderKHR             : return "RayTracingShaderKHR";
-      case PipelineStageFlagBits2::eFragmentDensityProcessEXT       : return "FragmentDensityProcessEXT";
-      case PipelineStageFlagBits2::eTaskShaderEXT                   : return "TaskShaderEXT";
-      case PipelineStageFlagBits2::eMeshShaderEXT                   : return "MeshShaderEXT";
-      case PipelineStageFlagBits2::eSubpassShaderHUAWEI             : return "SubpassShaderHUAWEI";
-      case PipelineStageFlagBits2::eInvocationMaskHUAWEI            : return "InvocationMaskHUAWEI";
-      case PipelineStageFlagBits2::eAccelerationStructureCopyKHR    : return "AccelerationStructureCopyKHR";
-      case PipelineStageFlagBits2::eMicromapBuildEXT                : return "MicromapBuildEXT";
-      case PipelineStageFlagBits2::eClusterCullingShaderHUAWEI      : return "ClusterCullingShaderHUAWEI";
-      case PipelineStageFlagBits2::eOpticalFlowNV                   : return "OpticalFlowNV";
-      case PipelineStageFlagBits2::eConvertCooperativeVectorMatrixNV: return "ConvertCooperativeVectorMatrixNV";
-      case PipelineStageFlagBits2::eDataGraphARM                    : return "DataGraphARM";
-      case PipelineStageFlagBits2::eCopyIndirectKHR                 : return "CopyIndirectKHR";
-      case PipelineStageFlagBits2::eMemoryDecompressionEXT          : return "MemoryDecompressionEXT";
-      default                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineStageFlagBits2::eAccelerationStructureBuildKHR: return "AccelerationStructureBuildKHR";
+      case PipelineStageFlagBits2::eRayTracingShaderKHR: return "RayTracingShaderKHR";
+      case PipelineStageFlagBits2::eFragmentDensityProcessEXT: return "FragmentDensityProcessEXT";
+      case PipelineStageFlagBits2::eTaskShaderEXT: return "TaskShaderEXT";
+      case PipelineStageFlagBits2::eMeshShaderEXT: return "MeshShaderEXT";
+      case PipelineStageFlagBits2::eSubpassShaderHUAWEI: return "SubpassShaderHUAWEI";
+      case PipelineStageFlagBits2::eInvocationMaskHUAWEI: return "InvocationMaskHUAWEI";
+      case PipelineStageFlagBits2::eAccelerationStructureCopyKHR: return "AccelerationStructureCopyKHR";
+      case PipelineStageFlagBits2::eMicromapBuildEXT: return "MicromapBuildEXT";
+      case PipelineStageFlagBits2::eClusterCullingShaderHUAWEI: return "ClusterCullingShaderHUAWEI";
+      case PipelineStageFlagBits2::eOpticalFlowNV: return "OpticalFlowNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccessFlagBits2 value )
+  VULKAN_HPP_INLINE std::string to_string( AccessFlagBits2 value )
   {
     switch ( value )
     {
-      case AccessFlagBits2::eNone                                : return "None";
-      case AccessFlagBits2::eIndirectCommandRead                 : return "IndirectCommandRead";
-      case AccessFlagBits2::eIndexRead                           : return "IndexRead";
-      case AccessFlagBits2::eVertexAttributeRead                 : return "VertexAttributeRead";
-      case AccessFlagBits2::eUniformRead                         : return "UniformRead";
-      case AccessFlagBits2::eInputAttachmentRead                 : return "InputAttachmentRead";
-      case AccessFlagBits2::eShaderRead                          : return "ShaderRead";
-      case AccessFlagBits2::eShaderWrite                         : return "ShaderWrite";
-      case AccessFlagBits2::eColorAttachmentRead                 : return "ColorAttachmentRead";
-      case AccessFlagBits2::eColorAttachmentWrite                : return "ColorAttachmentWrite";
-      case AccessFlagBits2::eDepthStencilAttachmentRead          : return "DepthStencilAttachmentRead";
-      case AccessFlagBits2::eDepthStencilAttachmentWrite         : return "DepthStencilAttachmentWrite";
-      case AccessFlagBits2::eTransferRead                        : return "TransferRead";
-      case AccessFlagBits2::eTransferWrite                       : return "TransferWrite";
-      case AccessFlagBits2::eHostRead                            : return "HostRead";
-      case AccessFlagBits2::eHostWrite                           : return "HostWrite";
-      case AccessFlagBits2::eMemoryRead                          : return "MemoryRead";
-      case AccessFlagBits2::eMemoryWrite                         : return "MemoryWrite";
-      case AccessFlagBits2::eShaderSampledRead                   : return "ShaderSampledRead";
-      case AccessFlagBits2::eShaderStorageRead                   : return "ShaderStorageRead";
-      case AccessFlagBits2::eShaderStorageWrite                  : return "ShaderStorageWrite";
-      case AccessFlagBits2::eVideoDecodeReadKHR                  : return "VideoDecodeReadKHR";
-      case AccessFlagBits2::eVideoDecodeWriteKHR                 : return "VideoDecodeWriteKHR";
-      case AccessFlagBits2::eVideoEncodeReadKHR                  : return "VideoEncodeReadKHR";
-      case AccessFlagBits2::eVideoEncodeWriteKHR                 : return "VideoEncodeWriteKHR";
-      case AccessFlagBits2::eShaderTileAttachmentReadQCOM        : return "ShaderTileAttachmentReadQCOM";
-      case AccessFlagBits2::eShaderTileAttachmentWriteQCOM       : return "ShaderTileAttachmentWriteQCOM";
-      case AccessFlagBits2::eTransformFeedbackWriteEXT           : return "TransformFeedbackWriteEXT";
-      case AccessFlagBits2::eTransformFeedbackCounterReadEXT     : return "TransformFeedbackCounterReadEXT";
-      case AccessFlagBits2::eTransformFeedbackCounterWriteEXT    : return "TransformFeedbackCounterWriteEXT";
-      case AccessFlagBits2::eConditionalRenderingReadEXT         : return "ConditionalRenderingReadEXT";
-      case AccessFlagBits2::eCommandPreprocessReadEXT            : return "CommandPreprocessReadEXT";
-      case AccessFlagBits2::eCommandPreprocessWriteEXT           : return "CommandPreprocessWriteEXT";
+      case AccessFlagBits2::eNone: return "None";
+      case AccessFlagBits2::eIndirectCommandRead: return "IndirectCommandRead";
+      case AccessFlagBits2::eIndexRead: return "IndexRead";
+      case AccessFlagBits2::eVertexAttributeRead: return "VertexAttributeRead";
+      case AccessFlagBits2::eUniformRead: return "UniformRead";
+      case AccessFlagBits2::eInputAttachmentRead: return "InputAttachmentRead";
+      case AccessFlagBits2::eShaderRead: return "ShaderRead";
+      case AccessFlagBits2::eShaderWrite: return "ShaderWrite";
+      case AccessFlagBits2::eColorAttachmentRead: return "ColorAttachmentRead";
+      case AccessFlagBits2::eColorAttachmentWrite: return "ColorAttachmentWrite";
+      case AccessFlagBits2::eDepthStencilAttachmentRead: return "DepthStencilAttachmentRead";
+      case AccessFlagBits2::eDepthStencilAttachmentWrite: return "DepthStencilAttachmentWrite";
+      case AccessFlagBits2::eTransferRead: return "TransferRead";
+      case AccessFlagBits2::eTransferWrite: return "TransferWrite";
+      case AccessFlagBits2::eHostRead: return "HostRead";
+      case AccessFlagBits2::eHostWrite: return "HostWrite";
+      case AccessFlagBits2::eMemoryRead: return "MemoryRead";
+      case AccessFlagBits2::eMemoryWrite: return "MemoryWrite";
+      case AccessFlagBits2::eShaderSampledRead: return "ShaderSampledRead";
+      case AccessFlagBits2::eShaderStorageRead: return "ShaderStorageRead";
+      case AccessFlagBits2::eShaderStorageWrite: return "ShaderStorageWrite";
+      case AccessFlagBits2::eVideoDecodeReadKHR: return "VideoDecodeReadKHR";
+      case AccessFlagBits2::eVideoDecodeWriteKHR: return "VideoDecodeWriteKHR";
+      case AccessFlagBits2::eVideoEncodeReadKHR: return "VideoEncodeReadKHR";
+      case AccessFlagBits2::eVideoEncodeWriteKHR: return "VideoEncodeWriteKHR";
+      case AccessFlagBits2::eTransformFeedbackWriteEXT: return "TransformFeedbackWriteEXT";
+      case AccessFlagBits2::eTransformFeedbackCounterReadEXT: return "TransformFeedbackCounterReadEXT";
+      case AccessFlagBits2::eTransformFeedbackCounterWriteEXT: return "TransformFeedbackCounterWriteEXT";
+      case AccessFlagBits2::eConditionalRenderingReadEXT: return "ConditionalRenderingReadEXT";
+      case AccessFlagBits2::eCommandPreprocessReadNV: return "CommandPreprocessReadNV";
+      case AccessFlagBits2::eCommandPreprocessWriteNV: return "CommandPreprocessWriteNV";
       case AccessFlagBits2::eFragmentShadingRateAttachmentReadKHR: return "FragmentShadingRateAttachmentReadKHR";
-      case AccessFlagBits2::eAccelerationStructureReadKHR        : return "AccelerationStructureReadKHR";
-      case AccessFlagBits2::eAccelerationStructureWriteKHR       : return "AccelerationStructureWriteKHR";
-      case AccessFlagBits2::eFragmentDensityMapReadEXT           : return "FragmentDensityMapReadEXT";
-      case AccessFlagBits2::eColorAttachmentReadNoncoherentEXT   : return "ColorAttachmentReadNoncoherentEXT";
-      case AccessFlagBits2::eDescriptorBufferReadEXT             : return "DescriptorBufferReadEXT";
-      case AccessFlagBits2::eInvocationMaskReadHUAWEI            : return "InvocationMaskReadHUAWEI";
-      case AccessFlagBits2::eShaderBindingTableReadKHR           : return "ShaderBindingTableReadKHR";
-      case AccessFlagBits2::eMicromapReadEXT                     : return "MicromapReadEXT";
-      case AccessFlagBits2::eMicromapWriteEXT                    : return "MicromapWriteEXT";
-      case AccessFlagBits2::eOpticalFlowReadNV                   : return "OpticalFlowReadNV";
-      case AccessFlagBits2::eOpticalFlowWriteNV                  : return "OpticalFlowWriteNV";
-      case AccessFlagBits2::eDataGraphReadARM                    : return "DataGraphReadARM";
-      case AccessFlagBits2::eDataGraphWriteARM                   : return "DataGraphWriteARM";
-      case AccessFlagBits2::eMemoryDecompressionReadEXT          : return "MemoryDecompressionReadEXT";
-      case AccessFlagBits2::eMemoryDecompressionWriteEXT         : return "MemoryDecompressionWriteEXT";
-      default                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AccessFlagBits2::eAccelerationStructureReadKHR: return "AccelerationStructureReadKHR";
+      case AccessFlagBits2::eAccelerationStructureWriteKHR: return "AccelerationStructureWriteKHR";
+      case AccessFlagBits2::eFragmentDensityMapReadEXT: return "FragmentDensityMapReadEXT";
+      case AccessFlagBits2::eColorAttachmentReadNoncoherentEXT: return "ColorAttachmentReadNoncoherentEXT";
+      case AccessFlagBits2::eDescriptorBufferReadEXT: return "DescriptorBufferReadEXT";
+      case AccessFlagBits2::eInvocationMaskReadHUAWEI: return "InvocationMaskReadHUAWEI";
+      case AccessFlagBits2::eShaderBindingTableReadKHR: return "ShaderBindingTableReadKHR";
+      case AccessFlagBits2::eMicromapReadEXT: return "MicromapReadEXT";
+      case AccessFlagBits2::eMicromapWriteEXT: return "MicromapWriteEXT";
+      case AccessFlagBits2::eOpticalFlowReadNV: return "OpticalFlowReadNV";
+      case AccessFlagBits2::eOpticalFlowWriteNV: return "OpticalFlowWriteNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SubmitFlagBits value )
+  VULKAN_HPP_INLINE std::string to_string( SubmitFlagBits value )
   {
     switch ( value )
     {
       case SubmitFlagBits::eProtected: return "Protected";
-      default                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FormatFeatureFlagBits2 value )
+  VULKAN_HPP_INLINE std::string to_string( RenderingFlagBits value )
   {
     switch ( value )
     {
-      case FormatFeatureFlagBits2::eSampledImage                                           : return "SampledImage";
-      case FormatFeatureFlagBits2::eStorageImage                                           : return "StorageImage";
-      case FormatFeatureFlagBits2::eStorageImageAtomic                                     : return "StorageImageAtomic";
-      case FormatFeatureFlagBits2::eUniformTexelBuffer                                     : return "UniformTexelBuffer";
-      case FormatFeatureFlagBits2::eStorageTexelBuffer                                     : return "StorageTexelBuffer";
-      case FormatFeatureFlagBits2::eStorageTexelBufferAtomic                               : return "StorageTexelBufferAtomic";
-      case FormatFeatureFlagBits2::eVertexBuffer                                           : return "VertexBuffer";
-      case FormatFeatureFlagBits2::eColorAttachment                                        : return "ColorAttachment";
-      case FormatFeatureFlagBits2::eColorAttachmentBlend                                   : return "ColorAttachmentBlend";
-      case FormatFeatureFlagBits2::eDepthStencilAttachment                                 : return "DepthStencilAttachment";
-      case FormatFeatureFlagBits2::eBlitSrc                                                : return "BlitSrc";
-      case FormatFeatureFlagBits2::eBlitDst                                                : return "BlitDst";
-      case FormatFeatureFlagBits2::eSampledImageFilterLinear                               : return "SampledImageFilterLinear";
-      case FormatFeatureFlagBits2::eTransferSrc                                            : return "TransferSrc";
-      case FormatFeatureFlagBits2::eTransferDst                                            : return "TransferDst";
-      case FormatFeatureFlagBits2::eSampledImageFilterMinmax                               : return "SampledImageFilterMinmax";
-      case FormatFeatureFlagBits2::eMidpointChromaSamples                                  : return "MidpointChromaSamples";
-      case FormatFeatureFlagBits2::eSampledImageYcbcrConversionLinearFilter                : return "SampledImageYcbcrConversionLinearFilter";
+      case RenderingFlagBits::eContentsSecondaryCommandBuffers: return "ContentsSecondaryCommandBuffers";
+      case RenderingFlagBits::eSuspending: return "Suspending";
+      case RenderingFlagBits::eResuming: return "Resuming";
+      case RenderingFlagBits::eContentsInlineEXT: return "ContentsInlineEXT";
+      case RenderingFlagBits::eEnableLegacyDitheringEXT: return "EnableLegacyDitheringEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( FormatFeatureFlagBits2 value )
+  {
+    switch ( value )
+    {
+      case FormatFeatureFlagBits2::eSampledImage: return "SampledImage";
+      case FormatFeatureFlagBits2::eStorageImage: return "StorageImage";
+      case FormatFeatureFlagBits2::eStorageImageAtomic: return "StorageImageAtomic";
+      case FormatFeatureFlagBits2::eUniformTexelBuffer: return "UniformTexelBuffer";
+      case FormatFeatureFlagBits2::eStorageTexelBuffer: return "StorageTexelBuffer";
+      case FormatFeatureFlagBits2::eStorageTexelBufferAtomic: return "StorageTexelBufferAtomic";
+      case FormatFeatureFlagBits2::eVertexBuffer: return "VertexBuffer";
+      case FormatFeatureFlagBits2::eColorAttachment: return "ColorAttachment";
+      case FormatFeatureFlagBits2::eColorAttachmentBlend: return "ColorAttachmentBlend";
+      case FormatFeatureFlagBits2::eDepthStencilAttachment: return "DepthStencilAttachment";
+      case FormatFeatureFlagBits2::eBlitSrc: return "BlitSrc";
+      case FormatFeatureFlagBits2::eBlitDst: return "BlitDst";
+      case FormatFeatureFlagBits2::eSampledImageFilterLinear: return "SampledImageFilterLinear";
+      case FormatFeatureFlagBits2::eSampledImageFilterCubic: return "SampledImageFilterCubic";
+      case FormatFeatureFlagBits2::eTransferSrc: return "TransferSrc";
+      case FormatFeatureFlagBits2::eTransferDst: return "TransferDst";
+      case FormatFeatureFlagBits2::eSampledImageFilterMinmax: return "SampledImageFilterMinmax";
+      case FormatFeatureFlagBits2::eMidpointChromaSamples: return "MidpointChromaSamples";
+      case FormatFeatureFlagBits2::eSampledImageYcbcrConversionLinearFilter: return "SampledImageYcbcrConversionLinearFilter";
       case FormatFeatureFlagBits2::eSampledImageYcbcrConversionSeparateReconstructionFilter: return "SampledImageYcbcrConversionSeparateReconstructionFilter";
       case FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicit: return "SampledImageYcbcrConversionChromaReconstructionExplicit";
       case FormatFeatureFlagBits2::eSampledImageYcbcrConversionChromaReconstructionExplicitForceable:
         return "SampledImageYcbcrConversionChromaReconstructionExplicitForceable";
-      case FormatFeatureFlagBits2::eDisjoint                            : return "Disjoint";
-      case FormatFeatureFlagBits2::eCositedChromaSamples                : return "CositedChromaSamples";
-      case FormatFeatureFlagBits2::eStorageReadWithoutFormat            : return "StorageReadWithoutFormat";
-      case FormatFeatureFlagBits2::eStorageWriteWithoutFormat           : return "StorageWriteWithoutFormat";
-      case FormatFeatureFlagBits2::eSampledImageDepthComparison         : return "SampledImageDepthComparison";
-      case FormatFeatureFlagBits2::eSampledImageFilterCubic             : return "SampledImageFilterCubic";
-      case FormatFeatureFlagBits2::eHostImageTransfer                   : return "HostImageTransfer";
-      case FormatFeatureFlagBits2::eVideoDecodeOutputKHR                : return "VideoDecodeOutputKHR";
-      case FormatFeatureFlagBits2::eVideoDecodeDpbKHR                   : return "VideoDecodeDpbKHR";
+      case FormatFeatureFlagBits2::eDisjoint: return "Disjoint";
+      case FormatFeatureFlagBits2::eCositedChromaSamples: return "CositedChromaSamples";
+      case FormatFeatureFlagBits2::eStorageReadWithoutFormat: return "StorageReadWithoutFormat";
+      case FormatFeatureFlagBits2::eStorageWriteWithoutFormat: return "StorageWriteWithoutFormat";
+      case FormatFeatureFlagBits2::eSampledImageDepthComparison: return "SampledImageDepthComparison";
+      case FormatFeatureFlagBits2::eVideoDecodeOutputKHR: return "VideoDecodeOutputKHR";
+      case FormatFeatureFlagBits2::eVideoDecodeDpbKHR: return "VideoDecodeDpbKHR";
       case FormatFeatureFlagBits2::eAccelerationStructureVertexBufferKHR: return "AccelerationStructureVertexBufferKHR";
-      case FormatFeatureFlagBits2::eFragmentDensityMapEXT               : return "FragmentDensityMapEXT";
-      case FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR    : return "FragmentShadingRateAttachmentKHR";
-      case FormatFeatureFlagBits2::eVideoEncodeInputKHR                 : return "VideoEncodeInputKHR";
-      case FormatFeatureFlagBits2::eVideoEncodeDpbKHR                   : return "VideoEncodeDpbKHR";
-      case FormatFeatureFlagBits2::eAccelerationStructureRadiusBufferNV : return "AccelerationStructureRadiusBufferNV";
-      case FormatFeatureFlagBits2::eLinearColorAttachmentNV             : return "LinearColorAttachmentNV";
-      case FormatFeatureFlagBits2::eWeightImageQCOM                     : return "WeightImageQCOM";
-      case FormatFeatureFlagBits2::eWeightSampledImageQCOM              : return "WeightSampledImageQCOM";
-      case FormatFeatureFlagBits2::eBlockMatchingQCOM                   : return "BlockMatchingQCOM";
-      case FormatFeatureFlagBits2::eBoxFilterSampledQCOM                : return "BoxFilterSampledQCOM";
-      case FormatFeatureFlagBits2::eTensorShaderARM                     : return "TensorShaderARM";
-      case FormatFeatureFlagBits2::eTensorImageAliasingARM              : return "TensorImageAliasingARM";
-      case FormatFeatureFlagBits2::eOpticalFlowImageNV                  : return "OpticalFlowImageNV";
-      case FormatFeatureFlagBits2::eOpticalFlowVectorNV                 : return "OpticalFlowVectorNV";
-      case FormatFeatureFlagBits2::eOpticalFlowCostNV                   : return "OpticalFlowCostNV";
-      case FormatFeatureFlagBits2::eTensorDataGraphARM                  : return "TensorDataGraphARM";
-      case FormatFeatureFlagBits2::eCopyImageIndirectDstKHR             : return "CopyImageIndirectDstKHR";
-      case FormatFeatureFlagBits2::eVideoEncodeQuantizationDeltaMapKHR  : return "VideoEncodeQuantizationDeltaMapKHR";
-      case FormatFeatureFlagBits2::eVideoEncodeEmphasisMapKHR           : return "VideoEncodeEmphasisMapKHR";
-      case FormatFeatureFlagBits2::eDepthCopyOnComputeQueueKHR          : return "DepthCopyOnComputeQueueKHR";
-      case FormatFeatureFlagBits2::eDepthCopyOnTransferQueueKHR         : return "DepthCopyOnTransferQueueKHR";
-      case FormatFeatureFlagBits2::eStencilCopyOnComputeQueueKHR        : return "StencilCopyOnComputeQueueKHR";
-      case FormatFeatureFlagBits2::eStencilCopyOnTransferQueueKHR       : return "StencilCopyOnTransferQueueKHR";
-      default                                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCreationFeedbackFlagBits value )
-  {
-    switch ( value )
-    {
-      case PipelineCreationFeedbackFlagBits::eValid                      : return "Valid";
-      case PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit: return "ApplicationPipelineCacheHit";
-      case PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration   : return "BasePipelineAcceleration";
-      default                                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RenderingFlagBits value )
-  {
-    switch ( value )
-    {
-      case RenderingFlagBits::eContentsSecondaryCommandBuffers    : return "ContentsSecondaryCommandBuffers";
-      case RenderingFlagBits::eSuspending                         : return "Suspending";
-      case RenderingFlagBits::eResuming                           : return "Resuming";
-      case RenderingFlagBits::eEnableLegacyDitheringEXT           : return "EnableLegacyDitheringEXT";
-      case RenderingFlagBits::eContentsInlineKHR                  : return "ContentsInlineKHR";
-      case RenderingFlagBits::ePerLayerFragmentDensityVALVE       : return "PerLayerFragmentDensityVALVE";
-      case RenderingFlagBits::eFragmentRegionEXT                  : return "FragmentRegionEXT";
-      case RenderingFlagBits::eCustomResolveEXT                   : return "CustomResolveEXT";
-      case RenderingFlagBits::eLocalReadConcurrentAccessControlKHR: return "LocalReadConcurrentAccessControlKHR";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_VERSION_1_4 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueueGlobalPriority value )
-  {
-    switch ( value )
-    {
-      case QueueGlobalPriority::eLow     : return "Low";
-      case QueueGlobalPriority::eMedium  : return "Medium";
-      case QueueGlobalPriority::eHigh    : return "High";
-      case QueueGlobalPriority::eRealtime: return "Realtime";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryUnmapFlagBits value )
-  {
-    switch ( value )
-    {
-      case MemoryUnmapFlagBits::eReserveEXT: return "ReserveEXT";
-      default                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BufferUsageFlagBits2 value )
-  {
-    switch ( value )
-    {
-      case BufferUsageFlagBits2::eTransferSrc        : return "TransferSrc";
-      case BufferUsageFlagBits2::eTransferDst        : return "TransferDst";
-      case BufferUsageFlagBits2::eUniformTexelBuffer : return "UniformTexelBuffer";
-      case BufferUsageFlagBits2::eStorageTexelBuffer : return "StorageTexelBuffer";
-      case BufferUsageFlagBits2::eUniformBuffer      : return "UniformBuffer";
-      case BufferUsageFlagBits2::eStorageBuffer      : return "StorageBuffer";
-      case BufferUsageFlagBits2::eIndexBuffer        : return "IndexBuffer";
-      case BufferUsageFlagBits2::eVertexBuffer       : return "VertexBuffer";
-      case BufferUsageFlagBits2::eIndirectBuffer     : return "IndirectBuffer";
-      case BufferUsageFlagBits2::eShaderDeviceAddress: return "ShaderDeviceAddress";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case BufferUsageFlagBits2::eExecutionGraphScratchAMDX: return "ExecutionGraphScratchAMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case BufferUsageFlagBits2::eConditionalRenderingEXT                   : return "ConditionalRenderingEXT";
-      case BufferUsageFlagBits2::eShaderBindingTableKHR                     : return "ShaderBindingTableKHR";
-      case BufferUsageFlagBits2::eTransformFeedbackBufferEXT                : return "TransformFeedbackBufferEXT";
-      case BufferUsageFlagBits2::eTransformFeedbackCounterBufferEXT         : return "TransformFeedbackCounterBufferEXT";
-      case BufferUsageFlagBits2::eVideoDecodeSrcKHR                         : return "VideoDecodeSrcKHR";
-      case BufferUsageFlagBits2::eVideoDecodeDstKHR                         : return "VideoDecodeDstKHR";
-      case BufferUsageFlagBits2::eVideoEncodeDstKHR                         : return "VideoEncodeDstKHR";
-      case BufferUsageFlagBits2::eVideoEncodeSrcKHR                         : return "VideoEncodeSrcKHR";
-      case BufferUsageFlagBits2::eAccelerationStructureBuildInputReadOnlyKHR: return "AccelerationStructureBuildInputReadOnlyKHR";
-      case BufferUsageFlagBits2::eAccelerationStructureStorageKHR           : return "AccelerationStructureStorageKHR";
-      case BufferUsageFlagBits2::eSamplerDescriptorBufferEXT                : return "SamplerDescriptorBufferEXT";
-      case BufferUsageFlagBits2::eResourceDescriptorBufferEXT               : return "ResourceDescriptorBufferEXT";
-      case BufferUsageFlagBits2::ePushDescriptorsDescriptorBufferEXT        : return "PushDescriptorsDescriptorBufferEXT";
-      case BufferUsageFlagBits2::eMicromapBuildInputReadOnlyEXT             : return "MicromapBuildInputReadOnlyEXT";
-      case BufferUsageFlagBits2::eMicromapStorageEXT                        : return "MicromapStorageEXT";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case BufferUsageFlagBits2::eCompressedDataDgf1AMDX: return "CompressedDataDgf1AMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case BufferUsageFlagBits2::eDataGraphForeignDescriptorARM: return "DataGraphForeignDescriptorARM";
-      case BufferUsageFlagBits2::eTileMemoryQCOM               : return "TileMemoryQCOM";
-      case BufferUsageFlagBits2::eMemoryDecompressionEXT       : return "MemoryDecompressionEXT";
-      case BufferUsageFlagBits2::ePreprocessBufferEXT          : return "PreprocessBufferEXT";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( HostImageCopyFlagBits value )
-  {
-    switch ( value )
-    {
-      case HostImageCopyFlagBits::eMemcpy: return "Memcpy";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCreateFlagBits2 value )
-  {
-    switch ( value )
-    {
-      case PipelineCreateFlagBits2::eDisableOptimization          : return "DisableOptimization";
-      case PipelineCreateFlagBits2::eAllowDerivatives             : return "AllowDerivatives";
-      case PipelineCreateFlagBits2::eDerivative                   : return "Derivative";
-      case PipelineCreateFlagBits2::eViewIndexFromDeviceIndex     : return "ViewIndexFromDeviceIndex";
-      case PipelineCreateFlagBits2::eDispatchBase                 : return "DispatchBase";
-      case PipelineCreateFlagBits2::eFailOnPipelineCompileRequired: return "FailOnPipelineCompileRequired";
-      case PipelineCreateFlagBits2::eEarlyReturnOnFailure         : return "EarlyReturnOnFailure";
-      case PipelineCreateFlagBits2::eNoProtectedAccess            : return "NoProtectedAccess";
-      case PipelineCreateFlagBits2::eProtectedAccessOnly          : return "ProtectedAccessOnly";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case PipelineCreateFlagBits2::eExecutionGraphAMDX: return "ExecutionGraphAMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case PipelineCreateFlagBits2::eRayTracingAllowSpheresAndLinearSweptSpheresNV: return "RayTracingAllowSpheresAndLinearSweptSpheresNV";
-      case PipelineCreateFlagBits2::eEnableLegacyDitheringEXT                     : return "EnableLegacyDitheringEXT";
-      case PipelineCreateFlagBits2::eDeferCompileNV                               : return "DeferCompileNV";
-      case PipelineCreateFlagBits2::eCaptureStatisticsKHR                         : return "CaptureStatisticsKHR";
-      case PipelineCreateFlagBits2::eCaptureInternalRepresentationsKHR            : return "CaptureInternalRepresentationsKHR";
-      case PipelineCreateFlagBits2::eLinkTimeOptimizationEXT                      : return "LinkTimeOptimizationEXT";
-      case PipelineCreateFlagBits2::eRetainLinkTimeOptimizationInfoEXT            : return "RetainLinkTimeOptimizationInfoEXT";
-      case PipelineCreateFlagBits2::eLibraryKHR                                   : return "LibraryKHR";
-      case PipelineCreateFlagBits2::eRayTracingSkipTrianglesKHR                   : return "RayTracingSkipTrianglesKHR";
-      case PipelineCreateFlagBits2::eRayTracingSkipAabbsKHR                       : return "RayTracingSkipAabbsKHR";
-      case PipelineCreateFlagBits2::eRayTracingNoNullAnyHitShadersKHR             : return "RayTracingNoNullAnyHitShadersKHR";
-      case PipelineCreateFlagBits2::eRayTracingNoNullClosestHitShadersKHR         : return "RayTracingNoNullClosestHitShadersKHR";
-      case PipelineCreateFlagBits2::eRayTracingNoNullMissShadersKHR               : return "RayTracingNoNullMissShadersKHR";
-      case PipelineCreateFlagBits2::eRayTracingNoNullIntersectionShadersKHR       : return "RayTracingNoNullIntersectionShadersKHR";
-      case PipelineCreateFlagBits2::eRayTracingShaderGroupHandleCaptureReplayKHR  : return "RayTracingShaderGroupHandleCaptureReplayKHR";
-      case PipelineCreateFlagBits2::eIndirectBindableNV                           : return "IndirectBindableNV";
-      case PipelineCreateFlagBits2::eRayTracingAllowMotionNV                      : return "RayTracingAllowMotionNV";
-      case PipelineCreateFlagBits2::eRenderingFragmentShadingRateAttachmentKHR    : return "RenderingFragmentShadingRateAttachmentKHR";
-      case PipelineCreateFlagBits2::eRenderingFragmentDensityMapAttachmentEXT     : return "RenderingFragmentDensityMapAttachmentEXT";
-      case PipelineCreateFlagBits2::eRayTracingOpacityMicromapEXT                 : return "RayTracingOpacityMicromapEXT";
-      case PipelineCreateFlagBits2::eColorAttachmentFeedbackLoopEXT               : return "ColorAttachmentFeedbackLoopEXT";
-      case PipelineCreateFlagBits2::eDepthStencilAttachmentFeedbackLoopEXT        : return "DepthStencilAttachmentFeedbackLoopEXT";
-      case PipelineCreateFlagBits2::eRayTracingDisplacementMicromapNV             : return "RayTracingDisplacementMicromapNV";
-      case PipelineCreateFlagBits2::eDescriptorBufferEXT                          : return "DescriptorBufferEXT";
-      case PipelineCreateFlagBits2::eDisallowOpacityMicromapARM                   : return "DisallowOpacityMicromapARM";
-      case PipelineCreateFlagBits2::eCaptureDataKHR                               : return "CaptureDataKHR";
-      case PipelineCreateFlagBits2::eIndirectBindableEXT                          : return "IndirectBindableEXT";
-      case PipelineCreateFlagBits2::ePerLayerFragmentDensityVALVE                 : return "PerLayerFragmentDensityVALVE";
-      case PipelineCreateFlagBits2::e64BitIndexingEXT                             : return "64BitIndexingEXT";
-      default                                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRobustnessBufferBehavior value )
-  {
-    switch ( value )
-    {
-      case PipelineRobustnessBufferBehavior::eDeviceDefault      : return "DeviceDefault";
-      case PipelineRobustnessBufferBehavior::eDisabled           : return "Disabled";
-      case PipelineRobustnessBufferBehavior::eRobustBufferAccess : return "RobustBufferAccess";
-      case PipelineRobustnessBufferBehavior::eRobustBufferAccess2: return "RobustBufferAccess2";
-      default                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRobustnessImageBehavior value )
-  {
-    switch ( value )
-    {
-      case PipelineRobustnessImageBehavior::eDeviceDefault     : return "DeviceDefault";
-      case PipelineRobustnessImageBehavior::eDisabled          : return "Disabled";
-      case PipelineRobustnessImageBehavior::eRobustImageAccess : return "RobustImageAccess";
-      case PipelineRobustnessImageBehavior::eRobustImageAccess2: return "RobustImageAccess2";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( LineRasterizationMode value )
-  {
-    switch ( value )
-    {
-      case LineRasterizationMode::eDefault          : return "Default";
-      case LineRasterizationMode::eRectangular      : return "Rectangular";
-      case LineRasterizationMode::eBresenham        : return "Bresenham";
-      case LineRasterizationMode::eRectangularSmooth: return "RectangularSmooth";
-      default                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FormatFeatureFlagBits2::eFragmentDensityMapEXT: return "FragmentDensityMapEXT";
+      case FormatFeatureFlagBits2::eFragmentShadingRateAttachmentKHR: return "FragmentShadingRateAttachmentKHR";
+      case FormatFeatureFlagBits2::eHostImageTransferEXT: return "HostImageTransferEXT";
+      case FormatFeatureFlagBits2::eVideoEncodeInputKHR: return "VideoEncodeInputKHR";
+      case FormatFeatureFlagBits2::eVideoEncodeDpbKHR: return "VideoEncodeDpbKHR";
+      case FormatFeatureFlagBits2::eLinearColorAttachmentNV: return "LinearColorAttachmentNV";
+      case FormatFeatureFlagBits2::eWeightImageQCOM: return "WeightImageQCOM";
+      case FormatFeatureFlagBits2::eWeightSampledImageQCOM: return "WeightSampledImageQCOM";
+      case FormatFeatureFlagBits2::eBlockMatchingQCOM: return "BlockMatchingQCOM";
+      case FormatFeatureFlagBits2::eBoxFilterSampledQCOM: return "BoxFilterSampledQCOM";
+      case FormatFeatureFlagBits2::eOpticalFlowImageNV: return "OpticalFlowImageNV";
+      case FormatFeatureFlagBits2::eOpticalFlowVectorNV: return "OpticalFlowVectorNV";
+      case FormatFeatureFlagBits2::eOpticalFlowCostNV: return "OpticalFlowCostNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SurfaceTransformFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( SurfaceTransformFlagBitsKHR value )
   {
     switch ( value )
     {
-      case SurfaceTransformFlagBitsKHR::eIdentity                 : return "Identity";
-      case SurfaceTransformFlagBitsKHR::eRotate90                 : return "Rotate90";
-      case SurfaceTransformFlagBitsKHR::eRotate180                : return "Rotate180";
-      case SurfaceTransformFlagBitsKHR::eRotate270                : return "Rotate270";
-      case SurfaceTransformFlagBitsKHR::eHorizontalMirror         : return "HorizontalMirror";
-      case SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate90 : return "HorizontalMirrorRotate90";
+      case SurfaceTransformFlagBitsKHR::eIdentity: return "Identity";
+      case SurfaceTransformFlagBitsKHR::eRotate90: return "Rotate90";
+      case SurfaceTransformFlagBitsKHR::eRotate180: return "Rotate180";
+      case SurfaceTransformFlagBitsKHR::eRotate270: return "Rotate270";
+      case SurfaceTransformFlagBitsKHR::eHorizontalMirror: return "HorizontalMirror";
+      case SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate90: return "HorizontalMirrorRotate90";
       case SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate180: return "HorizontalMirrorRotate180";
       case SurfaceTransformFlagBitsKHR::eHorizontalMirrorRotate270: return "HorizontalMirrorRotate270";
-      case SurfaceTransformFlagBitsKHR::eInherit                  : return "Inherit";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case SurfaceTransformFlagBitsKHR::eInherit: return "Inherit";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PresentModeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PresentModeKHR value )
   {
     switch ( value )
     {
-      case PresentModeKHR::eImmediate              : return "Immediate";
-      case PresentModeKHR::eMailbox                : return "Mailbox";
-      case PresentModeKHR::eFifo                   : return "Fifo";
-      case PresentModeKHR::eFifoRelaxed            : return "FifoRelaxed";
-      case PresentModeKHR::eSharedDemandRefresh    : return "SharedDemandRefresh";
+      case PresentModeKHR::eImmediate: return "Immediate";
+      case PresentModeKHR::eMailbox: return "Mailbox";
+      case PresentModeKHR::eFifo: return "Fifo";
+      case PresentModeKHR::eFifoRelaxed: return "FifoRelaxed";
+      case PresentModeKHR::eSharedDemandRefresh: return "SharedDemandRefresh";
       case PresentModeKHR::eSharedContinuousRefresh: return "SharedContinuousRefresh";
-      case PresentModeKHR::eFifoLatestReady        : return "FifoLatestReady";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ColorSpaceKHR value )
+  VULKAN_HPP_INLINE std::string to_string( ColorSpaceKHR value )
   {
     switch ( value )
     {
-      case ColorSpaceKHR::eSrgbNonlinear           : return "SrgbNonlinear";
-      case ColorSpaceKHR::eDisplayP3NonlinearEXT   : return "DisplayP3NonlinearEXT";
-      case ColorSpaceKHR::eExtendedSrgbLinearEXT   : return "ExtendedSrgbLinearEXT";
-      case ColorSpaceKHR::eDisplayP3LinearEXT      : return "DisplayP3LinearEXT";
-      case ColorSpaceKHR::eDciP3NonlinearEXT       : return "DciP3NonlinearEXT";
-      case ColorSpaceKHR::eBt709LinearEXT          : return "Bt709LinearEXT";
-      case ColorSpaceKHR::eBt709NonlinearEXT       : return "Bt709NonlinearEXT";
-      case ColorSpaceKHR::eBt2020LinearEXT         : return "Bt2020LinearEXT";
-      case ColorSpaceKHR::eHdr10St2084EXT          : return "Hdr10St2084EXT";
-      case ColorSpaceKHR::eDolbyvisionEXT          : return "DolbyvisionEXT";
-      case ColorSpaceKHR::eHdr10HlgEXT             : return "Hdr10HlgEXT";
-      case ColorSpaceKHR::eAdobergbLinearEXT       : return "AdobergbLinearEXT";
-      case ColorSpaceKHR::eAdobergbNonlinearEXT    : return "AdobergbNonlinearEXT";
-      case ColorSpaceKHR::ePassThroughEXT          : return "PassThroughEXT";
+      case ColorSpaceKHR::eSrgbNonlinear: return "SrgbNonlinear";
+      case ColorSpaceKHR::eDisplayP3NonlinearEXT: return "DisplayP3NonlinearEXT";
+      case ColorSpaceKHR::eExtendedSrgbLinearEXT: return "ExtendedSrgbLinearEXT";
+      case ColorSpaceKHR::eDisplayP3LinearEXT: return "DisplayP3LinearEXT";
+      case ColorSpaceKHR::eDciP3NonlinearEXT: return "DciP3NonlinearEXT";
+      case ColorSpaceKHR::eBt709LinearEXT: return "Bt709LinearEXT";
+      case ColorSpaceKHR::eBt709NonlinearEXT: return "Bt709NonlinearEXT";
+      case ColorSpaceKHR::eBt2020LinearEXT: return "Bt2020LinearEXT";
+      case ColorSpaceKHR::eHdr10St2084EXT: return "Hdr10St2084EXT";
+      case ColorSpaceKHR::eDolbyvisionEXT: return "DolbyvisionEXT";
+      case ColorSpaceKHR::eHdr10HlgEXT: return "Hdr10HlgEXT";
+      case ColorSpaceKHR::eAdobergbLinearEXT: return "AdobergbLinearEXT";
+      case ColorSpaceKHR::eAdobergbNonlinearEXT: return "AdobergbNonlinearEXT";
+      case ColorSpaceKHR::ePassThroughEXT: return "PassThroughEXT";
       case ColorSpaceKHR::eExtendedSrgbNonlinearEXT: return "ExtendedSrgbNonlinearEXT";
-      case ColorSpaceKHR::eDisplayNativeAMD        : return "DisplayNativeAMD";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ColorSpaceKHR::eDisplayNativeAMD: return "DisplayNativeAMD";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CompositeAlphaFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( CompositeAlphaFlagBitsKHR value )
   {
     switch ( value )
     {
-      case CompositeAlphaFlagBitsKHR::eOpaque        : return "Opaque";
-      case CompositeAlphaFlagBitsKHR::ePreMultiplied : return "PreMultiplied";
+      case CompositeAlphaFlagBitsKHR::eOpaque: return "Opaque";
+      case CompositeAlphaFlagBitsKHR::ePreMultiplied: return "PreMultiplied";
       case CompositeAlphaFlagBitsKHR::ePostMultiplied: return "PostMultiplied";
-      case CompositeAlphaFlagBitsKHR::eInherit       : return "Inherit";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case CompositeAlphaFlagBitsKHR::eInherit: return "Inherit";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_swapchain ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SwapchainCreateFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( SwapchainCreateFlagBitsKHR value )
   {
     switch ( value )
     {
       case SwapchainCreateFlagBitsKHR::eSplitInstanceBindRegions: return "SplitInstanceBindRegions";
-      case SwapchainCreateFlagBitsKHR::eProtected               : return "Protected";
-      case SwapchainCreateFlagBitsKHR::eMutableFormat           : return "MutableFormat";
-      case SwapchainCreateFlagBitsKHR::ePresentTimingEXT        : return "PresentTimingEXT";
-      case SwapchainCreateFlagBitsKHR::ePresentId2              : return "PresentId2";
-      case SwapchainCreateFlagBitsKHR::ePresentWait2            : return "PresentWait2";
-      case SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocation: return "DeferredMemoryAllocation";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case SwapchainCreateFlagBitsKHR::eProtected: return "Protected";
+      case SwapchainCreateFlagBitsKHR::eMutableFormat: return "MutableFormat";
+      case SwapchainCreateFlagBitsKHR::eDeferredMemoryAllocationEXT: return "DeferredMemoryAllocationEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceGroupPresentModeFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceGroupPresentModeFlagBitsKHR value )
   {
     switch ( value )
     {
-      case DeviceGroupPresentModeFlagBitsKHR::eLocal           : return "Local";
-      case DeviceGroupPresentModeFlagBitsKHR::eRemote          : return "Remote";
-      case DeviceGroupPresentModeFlagBitsKHR::eSum             : return "Sum";
+      case DeviceGroupPresentModeFlagBitsKHR::eLocal: return "Local";
+      case DeviceGroupPresentModeFlagBitsKHR::eRemote: return "Remote";
+      case DeviceGroupPresentModeFlagBitsKHR::eSum: return "Sum";
       case DeviceGroupPresentModeFlagBitsKHR::eLocalMultiDevice: return "LocalMultiDevice";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_display ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplayPlaneAlphaFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( DisplayPlaneAlphaFlagBitsKHR value )
   {
     switch ( value )
     {
-      case DisplayPlaneAlphaFlagBitsKHR::eOpaque               : return "Opaque";
-      case DisplayPlaneAlphaFlagBitsKHR::eGlobal               : return "Global";
-      case DisplayPlaneAlphaFlagBitsKHR::ePerPixel             : return "PerPixel";
+      case DisplayPlaneAlphaFlagBitsKHR::eOpaque: return "Opaque";
+      case DisplayPlaneAlphaFlagBitsKHR::eGlobal: return "Global";
+      case DisplayPlaneAlphaFlagBitsKHR::ePerPixel: return "PerPixel";
       case DisplayPlaneAlphaFlagBitsKHR::ePerPixelPremultiplied: return "PerPixelPremultiplied";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplayModeCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( DisplayModeCreateFlagBitsKHR )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplaySurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( DisplaySurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8251,7 +6905,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XLIB_KHR )
   //=== VK_KHR_xlib_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( XlibSurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( XlibSurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8260,7 +6914,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_XCB_KHR )
   //=== VK_KHR_xcb_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( XcbSurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( XcbSurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8269,7 +6923,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WAYLAND_KHR )
   //=== VK_KHR_wayland_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( WaylandSurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( WaylandSurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8278,7 +6932,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_ANDROID_KHR )
   //=== VK_KHR_android_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AndroidSurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( AndroidSurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8287,7 +6941,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_KHR_win32_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( Win32SurfaceCreateFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( Win32SurfaceCreateFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8295,408 +6949,395 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_report ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugReportFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DebugReportFlagBitsEXT value )
   {
     switch ( value )
     {
-      case DebugReportFlagBitsEXT::eInformation       : return "Information";
-      case DebugReportFlagBitsEXT::eWarning           : return "Warning";
+      case DebugReportFlagBitsEXT::eInformation: return "Information";
+      case DebugReportFlagBitsEXT::eWarning: return "Warning";
       case DebugReportFlagBitsEXT::ePerformanceWarning: return "PerformanceWarning";
-      case DebugReportFlagBitsEXT::eError             : return "Error";
-      case DebugReportFlagBitsEXT::eDebug             : return "Debug";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DebugReportFlagBitsEXT::eError: return "Error";
+      case DebugReportFlagBitsEXT::eDebug: return "Debug";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugReportObjectTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DebugReportObjectTypeEXT value )
   {
     switch ( value )
     {
-      case DebugReportObjectTypeEXT::eUnknown                 : return "Unknown";
-      case DebugReportObjectTypeEXT::eInstance                : return "Instance";
-      case DebugReportObjectTypeEXT::ePhysicalDevice          : return "PhysicalDevice";
-      case DebugReportObjectTypeEXT::eDevice                  : return "Device";
-      case DebugReportObjectTypeEXT::eQueue                   : return "Queue";
-      case DebugReportObjectTypeEXT::eSemaphore               : return "Semaphore";
-      case DebugReportObjectTypeEXT::eCommandBuffer           : return "CommandBuffer";
-      case DebugReportObjectTypeEXT::eFence                   : return "Fence";
-      case DebugReportObjectTypeEXT::eDeviceMemory            : return "DeviceMemory";
-      case DebugReportObjectTypeEXT::eBuffer                  : return "Buffer";
-      case DebugReportObjectTypeEXT::eImage                   : return "Image";
-      case DebugReportObjectTypeEXT::eEvent                   : return "Event";
-      case DebugReportObjectTypeEXT::eQueryPool               : return "QueryPool";
-      case DebugReportObjectTypeEXT::eBufferView              : return "BufferView";
-      case DebugReportObjectTypeEXT::eImageView               : return "ImageView";
-      case DebugReportObjectTypeEXT::eShaderModule            : return "ShaderModule";
-      case DebugReportObjectTypeEXT::ePipelineCache           : return "PipelineCache";
-      case DebugReportObjectTypeEXT::ePipelineLayout          : return "PipelineLayout";
-      case DebugReportObjectTypeEXT::eRenderPass              : return "RenderPass";
-      case DebugReportObjectTypeEXT::ePipeline                : return "Pipeline";
-      case DebugReportObjectTypeEXT::eDescriptorSetLayout     : return "DescriptorSetLayout";
-      case DebugReportObjectTypeEXT::eSampler                 : return "Sampler";
-      case DebugReportObjectTypeEXT::eDescriptorPool          : return "DescriptorPool";
-      case DebugReportObjectTypeEXT::eDescriptorSet           : return "DescriptorSet";
-      case DebugReportObjectTypeEXT::eFramebuffer             : return "Framebuffer";
-      case DebugReportObjectTypeEXT::eCommandPool             : return "CommandPool";
-      case DebugReportObjectTypeEXT::eSurfaceKHR              : return "SurfaceKHR";
-      case DebugReportObjectTypeEXT::eSwapchainKHR            : return "SwapchainKHR";
-      case DebugReportObjectTypeEXT::eDebugReportCallbackEXT  : return "DebugReportCallbackEXT";
-      case DebugReportObjectTypeEXT::eDisplayKHR              : return "DisplayKHR";
-      case DebugReportObjectTypeEXT::eDisplayModeKHR          : return "DisplayModeKHR";
-      case DebugReportObjectTypeEXT::eValidationCacheEXT      : return "ValidationCacheEXT";
-      case DebugReportObjectTypeEXT::eSamplerYcbcrConversion  : return "SamplerYcbcrConversion";
+      case DebugReportObjectTypeEXT::eUnknown: return "Unknown";
+      case DebugReportObjectTypeEXT::eInstance: return "Instance";
+      case DebugReportObjectTypeEXT::ePhysicalDevice: return "PhysicalDevice";
+      case DebugReportObjectTypeEXT::eDevice: return "Device";
+      case DebugReportObjectTypeEXT::eQueue: return "Queue";
+      case DebugReportObjectTypeEXT::eSemaphore: return "Semaphore";
+      case DebugReportObjectTypeEXT::eCommandBuffer: return "CommandBuffer";
+      case DebugReportObjectTypeEXT::eFence: return "Fence";
+      case DebugReportObjectTypeEXT::eDeviceMemory: return "DeviceMemory";
+      case DebugReportObjectTypeEXT::eBuffer: return "Buffer";
+      case DebugReportObjectTypeEXT::eImage: return "Image";
+      case DebugReportObjectTypeEXT::eEvent: return "Event";
+      case DebugReportObjectTypeEXT::eQueryPool: return "QueryPool";
+      case DebugReportObjectTypeEXT::eBufferView: return "BufferView";
+      case DebugReportObjectTypeEXT::eImageView: return "ImageView";
+      case DebugReportObjectTypeEXT::eShaderModule: return "ShaderModule";
+      case DebugReportObjectTypeEXT::ePipelineCache: return "PipelineCache";
+      case DebugReportObjectTypeEXT::ePipelineLayout: return "PipelineLayout";
+      case DebugReportObjectTypeEXT::eRenderPass: return "RenderPass";
+      case DebugReportObjectTypeEXT::ePipeline: return "Pipeline";
+      case DebugReportObjectTypeEXT::eDescriptorSetLayout: return "DescriptorSetLayout";
+      case DebugReportObjectTypeEXT::eSampler: return "Sampler";
+      case DebugReportObjectTypeEXT::eDescriptorPool: return "DescriptorPool";
+      case DebugReportObjectTypeEXT::eDescriptorSet: return "DescriptorSet";
+      case DebugReportObjectTypeEXT::eFramebuffer: return "Framebuffer";
+      case DebugReportObjectTypeEXT::eCommandPool: return "CommandPool";
+      case DebugReportObjectTypeEXT::eSurfaceKHR: return "SurfaceKHR";
+      case DebugReportObjectTypeEXT::eSwapchainKHR: return "SwapchainKHR";
+      case DebugReportObjectTypeEXT::eDebugReportCallbackEXT: return "DebugReportCallbackEXT";
+      case DebugReportObjectTypeEXT::eDisplayKHR: return "DisplayKHR";
+      case DebugReportObjectTypeEXT::eDisplayModeKHR: return "DisplayModeKHR";
+      case DebugReportObjectTypeEXT::eValidationCacheEXT: return "ValidationCacheEXT";
+      case DebugReportObjectTypeEXT::eSamplerYcbcrConversion: return "SamplerYcbcrConversion";
       case DebugReportObjectTypeEXT::eDescriptorUpdateTemplate: return "DescriptorUpdateTemplate";
-      case DebugReportObjectTypeEXT::eCuModuleNVX             : return "CuModuleNVX";
-      case DebugReportObjectTypeEXT::eCuFunctionNVX           : return "CuFunctionNVX";
+      case DebugReportObjectTypeEXT::eCuModuleNVX: return "CuModuleNVX";
+      case DebugReportObjectTypeEXT::eCuFunctionNVX: return "CuFunctionNVX";
       case DebugReportObjectTypeEXT::eAccelerationStructureKHR: return "AccelerationStructureKHR";
-      case DebugReportObjectTypeEXT::eAccelerationStructureNV : return "AccelerationStructureNV";
+      case DebugReportObjectTypeEXT::eAccelerationStructureNV: return "AccelerationStructureNV";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case DebugReportObjectTypeEXT::eCudaModuleNV  : return "CudaModuleNV";
+      case DebugReportObjectTypeEXT::eCudaModuleNV: return "CudaModuleNV";
       case DebugReportObjectTypeEXT::eCudaFunctionNV: return "CudaFunctionNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 #if defined( VK_USE_PLATFORM_FUCHSIA )
       case DebugReportObjectTypeEXT::eBufferCollectionFUCHSIA: return "BufferCollectionFUCHSIA";
 #endif /*VK_USE_PLATFORM_FUCHSIA*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_AMD_rasterization_order ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RasterizationOrderAMD value )
+  VULKAN_HPP_INLINE std::string to_string( RasterizationOrderAMD value )
   {
     switch ( value )
     {
-      case RasterizationOrderAMD::eStrict : return "Strict";
+      case RasterizationOrderAMD::eStrict: return "Strict";
       case RasterizationOrderAMD::eRelaxed: return "Relaxed";
-      default                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_video_queue ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoCodecOperationFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoCodecOperationFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoCodecOperationFlagBitsKHR::eNone      : return "None";
+      case VideoCodecOperationFlagBitsKHR::eNone: return "None";
       case VideoCodecOperationFlagBitsKHR::eEncodeH264: return "EncodeH264";
       case VideoCodecOperationFlagBitsKHR::eEncodeH265: return "EncodeH265";
       case VideoCodecOperationFlagBitsKHR::eDecodeH264: return "DecodeH264";
       case VideoCodecOperationFlagBitsKHR::eDecodeH265: return "DecodeH265";
-      case VideoCodecOperationFlagBitsKHR::eDecodeAv1 : return "DecodeAv1";
-      case VideoCodecOperationFlagBitsKHR::eEncodeAv1 : return "EncodeAv1";
-      case VideoCodecOperationFlagBitsKHR::eDecodeVp9 : return "DecodeVp9";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoCodecOperationFlagBitsKHR::eDecodeAv1: return "DecodeAv1";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoChromaSubsamplingFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoChromaSubsamplingFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoChromaSubsamplingFlagBitsKHR::eInvalid   : return "Invalid";
+      case VideoChromaSubsamplingFlagBitsKHR::eInvalid: return "Invalid";
       case VideoChromaSubsamplingFlagBitsKHR::eMonochrome: return "Monochrome";
-      case VideoChromaSubsamplingFlagBitsKHR::e420       : return "420";
-      case VideoChromaSubsamplingFlagBitsKHR::e422       : return "422";
-      case VideoChromaSubsamplingFlagBitsKHR::e444       : return "444";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoChromaSubsamplingFlagBitsKHR::e420: return "420";
+      case VideoChromaSubsamplingFlagBitsKHR::e422: return "422";
+      case VideoChromaSubsamplingFlagBitsKHR::e444: return "444";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoComponentBitDepthFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoComponentBitDepthFlagBitsKHR value )
   {
     switch ( value )
     {
       case VideoComponentBitDepthFlagBitsKHR::eInvalid: return "Invalid";
-      case VideoComponentBitDepthFlagBitsKHR::e8      : return "8";
-      case VideoComponentBitDepthFlagBitsKHR::e10     : return "10";
-      case VideoComponentBitDepthFlagBitsKHR::e12     : return "12";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoComponentBitDepthFlagBitsKHR::e8: return "8";
+      case VideoComponentBitDepthFlagBitsKHR::e10: return "10";
+      case VideoComponentBitDepthFlagBitsKHR::e12: return "12";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoCapabilityFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoCapabilityFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoCapabilityFlagBitsKHR::eProtectedContent       : return "ProtectedContent";
+      case VideoCapabilityFlagBitsKHR::eProtectedContent: return "ProtectedContent";
       case VideoCapabilityFlagBitsKHR::eSeparateReferenceImages: return "SeparateReferenceImages";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoSessionCreateFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoSessionCreateFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoSessionCreateFlagBitsKHR::eProtectedContent                 : return "ProtectedContent";
+      case VideoSessionCreateFlagBitsKHR::eProtectedContent: return "ProtectedContent";
       case VideoSessionCreateFlagBitsKHR::eAllowEncodeParameterOptimizations: return "AllowEncodeParameterOptimizations";
-      case VideoSessionCreateFlagBitsKHR::eInlineQueries                    : return "InlineQueries";
-      case VideoSessionCreateFlagBitsKHR::eAllowEncodeQuantizationDeltaMap  : return "AllowEncodeQuantizationDeltaMap";
-      case VideoSessionCreateFlagBitsKHR::eAllowEncodeEmphasisMap           : return "AllowEncodeEmphasisMap";
-      case VideoSessionCreateFlagBitsKHR::eInlineSessionParameters          : return "InlineSessionParameters";
-      default                                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoSessionCreateFlagBitsKHR::eInlineQueries: return "InlineQueries";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoCodingControlFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoCodingControlFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoCodingControlFlagBitsKHR::eReset             : return "Reset";
-      case VideoCodingControlFlagBitsKHR::eEncodeRateControl : return "EncodeRateControl";
+      case VideoCodingControlFlagBitsKHR::eReset: return "Reset";
+      case VideoCodingControlFlagBitsKHR::eEncodeRateControl: return "EncodeRateControl";
       case VideoCodingControlFlagBitsKHR::eEncodeQualityLevel: return "EncodeQualityLevel";
-      default                                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryResultStatusKHR value )
+  VULKAN_HPP_INLINE std::string to_string( QueryResultStatusKHR value )
   {
     switch ( value )
     {
-      case QueryResultStatusKHR::eError                           : return "Error";
-      case QueryResultStatusKHR::eNotReady                        : return "NotReady";
-      case QueryResultStatusKHR::eComplete                        : return "Complete";
+      case QueryResultStatusKHR::eError: return "Error";
+      case QueryResultStatusKHR::eNotReady: return "NotReady";
+      case QueryResultStatusKHR::eComplete: return "Complete";
       case QueryResultStatusKHR::eInsufficientBitstreamBufferRange: return "InsufficientBitstreamBufferRange";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoSessionParametersCreateFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoSessionParametersCreateFlagBitsKHR::eQuantizationMapCompatible: return "QuantizationMapCompatible";
-      default                                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoBeginCodingFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoSessionParametersCreateFlagBitsKHR )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEndCodingFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoBeginCodingFlagBitsKHR )
+  {
+    return "(void)";
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( VideoEndCodingFlagBitsKHR )
   {
     return "(void)";
   }
 
   //=== VK_KHR_video_decode_queue ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoDecodeCapabilityFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoDecodeCapabilityFlagBitsKHR value )
   {
     switch ( value )
     {
       case VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputCoincide: return "DpbAndOutputCoincide";
       case VideoDecodeCapabilityFlagBitsKHR::eDpbAndOutputDistinct: return "DpbAndOutputDistinct";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoDecodeUsageFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoDecodeUsageFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoDecodeUsageFlagBitsKHR::eDefault    : return "Default";
+      case VideoDecodeUsageFlagBitsKHR::eDefault: return "Default";
       case VideoDecodeUsageFlagBitsKHR::eTranscoding: return "Transcoding";
-      case VideoDecodeUsageFlagBitsKHR::eOffline    : return "Offline";
-      case VideoDecodeUsageFlagBitsKHR::eStreaming  : return "Streaming";
-      default                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoDecodeUsageFlagBitsKHR::eOffline: return "Offline";
+      case VideoDecodeUsageFlagBitsKHR::eStreaming: return "Streaming";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoDecodeFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoDecodeFlagBitsKHR )
   {
     return "(void)";
   }
 
   //=== VK_EXT_transform_feedback ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationStateStreamCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationStateStreamCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_KHR_video_encode_h264 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH264CapabilityFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264CapabilityFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH264CapabilityFlagBitsKHR::eHrdCompliance                 : return "HrdCompliance";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eHrdCompliance: return "HrdCompliance";
       case VideoEncodeH264CapabilityFlagBitsKHR::ePredictionWeightTableGenerated: return "PredictionWeightTableGenerated";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eRowUnalignedSlice             : return "RowUnalignedSlice";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eDifferentSliceType            : return "DifferentSliceType";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL0List                : return "BFrameInL0List";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL1List                : return "BFrameInL1List";
-      case VideoEncodeH264CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp        : return "PerPictureTypeMinMaxQp";
-      case VideoEncodeH264CapabilityFlagBitsKHR::ePerSliceConstantQp            : return "PerSliceConstantQp";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu            : return "GeneratePrefixNalu";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eBPictureIntraRefresh          : return "BPictureIntraRefresh";
-      case VideoEncodeH264CapabilityFlagBitsKHR::eMbQpDiffWraparound            : return "MbQpDiffWraparound";
-      default                                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eRowUnalignedSlice: return "RowUnalignedSlice";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eDifferentSliceType: return "DifferentSliceType";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL0List: return "BFrameInL0List";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eBFrameInL1List: return "BFrameInL1List";
+      case VideoEncodeH264CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp: return "PerPictureTypeMinMaxQp";
+      case VideoEncodeH264CapabilityFlagBitsKHR::ePerSliceConstantQp: return "PerSliceConstantQp";
+      case VideoEncodeH264CapabilityFlagBitsKHR::eGeneratePrefixNalu: return "GeneratePrefixNalu";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH264StdFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264StdFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH264StdFlagBitsKHR::eSeparateColorPlaneFlagSet         : return "SeparateColorPlaneFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eSeparateColorPlaneFlagSet: return "SeparateColorPlaneFlagSet";
       case VideoEncodeH264StdFlagBitsKHR::eQpprimeYZeroTransformBypassFlagSet: return "QpprimeYZeroTransformBypassFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eScalingMatrixPresentFlagSet       : return "ScalingMatrixPresentFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eChromaQpIndexOffset               : return "ChromaQpIndexOffset";
-      case VideoEncodeH264StdFlagBitsKHR::eSecondChromaQpIndexOffset         : return "SecondChromaQpIndexOffset";
-      case VideoEncodeH264StdFlagBitsKHR::ePicInitQpMinus26                  : return "PicInitQpMinus26";
-      case VideoEncodeH264StdFlagBitsKHR::eWeightedPredFlagSet               : return "WeightedPredFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcExplicit         : return "WeightedBipredIdcExplicit";
-      case VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcImplicit         : return "WeightedBipredIdcImplicit";
-      case VideoEncodeH264StdFlagBitsKHR::eTransform8X8ModeFlagSet           : return "Transform8X8ModeFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eDirectSpatialMvPredFlagUnset      : return "DirectSpatialMvPredFlagUnset";
-      case VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagUnset        : return "EntropyCodingModeFlagUnset";
-      case VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagSet          : return "EntropyCodingModeFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eDirect8X8InferenceFlagUnset       : return "Direct8X8InferenceFlagUnset";
-      case VideoEncodeH264StdFlagBitsKHR::eConstrainedIntraPredFlagSet       : return "ConstrainedIntraPredFlagSet";
-      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterDisabled          : return "DeblockingFilterDisabled";
-      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterEnabled           : return "DeblockingFilterEnabled";
-      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterPartial           : return "DeblockingFilterPartial";
-      case VideoEncodeH264StdFlagBitsKHR::eSliceQpDelta                      : return "SliceQpDelta";
-      case VideoEncodeH264StdFlagBitsKHR::eDifferentSliceQpDelta             : return "DifferentSliceQpDelta";
-      default                                                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeH264StdFlagBitsKHR::eScalingMatrixPresentFlagSet: return "ScalingMatrixPresentFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eChromaQpIndexOffset: return "ChromaQpIndexOffset";
+      case VideoEncodeH264StdFlagBitsKHR::eSecondChromaQpIndexOffset: return "SecondChromaQpIndexOffset";
+      case VideoEncodeH264StdFlagBitsKHR::ePicInitQpMinus26: return "PicInitQpMinus26";
+      case VideoEncodeH264StdFlagBitsKHR::eWeightedPredFlagSet: return "WeightedPredFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcExplicit: return "WeightedBipredIdcExplicit";
+      case VideoEncodeH264StdFlagBitsKHR::eWeightedBipredIdcImplicit: return "WeightedBipredIdcImplicit";
+      case VideoEncodeH264StdFlagBitsKHR::eTransform8X8ModeFlagSet: return "Transform8X8ModeFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eDirectSpatialMvPredFlagUnset: return "DirectSpatialMvPredFlagUnset";
+      case VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagUnset: return "EntropyCodingModeFlagUnset";
+      case VideoEncodeH264StdFlagBitsKHR::eEntropyCodingModeFlagSet: return "EntropyCodingModeFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eDirect8X8InferenceFlagUnset: return "Direct8X8InferenceFlagUnset";
+      case VideoEncodeH264StdFlagBitsKHR::eConstrainedIntraPredFlagSet: return "ConstrainedIntraPredFlagSet";
+      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterDisabled: return "DeblockingFilterDisabled";
+      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterEnabled: return "DeblockingFilterEnabled";
+      case VideoEncodeH264StdFlagBitsKHR::eDeblockingFilterPartial: return "DeblockingFilterPartial";
+      case VideoEncodeH264StdFlagBitsKHR::eSliceQpDelta: return "SliceQpDelta";
+      case VideoEncodeH264StdFlagBitsKHR::eDifferentSliceQpDelta: return "DifferentSliceQpDelta";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH264RateControlFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH264RateControlFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH264RateControlFlagBitsKHR::eAttemptHrdCompliance      : return "AttemptHrdCompliance";
-      case VideoEncodeH264RateControlFlagBitsKHR::eRegularGop                : return "RegularGop";
-      case VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternFlat      : return "ReferencePatternFlat";
-      case VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternDyadic    : return "ReferencePatternDyadic";
+      case VideoEncodeH264RateControlFlagBitsKHR::eAttemptHrdCompliance: return "AttemptHrdCompliance";
+      case VideoEncodeH264RateControlFlagBitsKHR::eRegularGop: return "RegularGop";
+      case VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternFlat: return "ReferencePatternFlat";
+      case VideoEncodeH264RateControlFlagBitsKHR::eReferencePatternDyadic: return "ReferencePatternDyadic";
       case VideoEncodeH264RateControlFlagBitsKHR::eTemporalLayerPatternDyadic: return "TemporalLayerPatternDyadic";
-      default                                                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_video_encode_h265 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH265CapabilityFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265CapabilityFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH265CapabilityFlagBitsKHR::eHrdCompliance                 : return "HrdCompliance";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eHrdCompliance: return "HrdCompliance";
       case VideoEncodeH265CapabilityFlagBitsKHR::ePredictionWeightTableGenerated: return "PredictionWeightTableGenerated";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eRowUnalignedSliceSegment      : return "RowUnalignedSliceSegment";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eDifferentSliceSegmentType     : return "DifferentSliceSegmentType";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL0List                : return "BFrameInL0List";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL1List                : return "BFrameInL1List";
-      case VideoEncodeH265CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp        : return "PerPictureTypeMinMaxQp";
-      case VideoEncodeH265CapabilityFlagBitsKHR::ePerSliceSegmentConstantQp     : return "PerSliceSegmentConstantQp";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment  : return "MultipleTilesPerSliceSegment";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile  : return "MultipleSliceSegmentsPerTile";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eBPictureIntraRefresh          : return "BPictureIntraRefresh";
-      case VideoEncodeH265CapabilityFlagBitsKHR::eCuQpDiffWraparound            : return "CuQpDiffWraparound";
-      default                                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eRowUnalignedSliceSegment: return "RowUnalignedSliceSegment";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eDifferentSliceSegmentType: return "DifferentSliceSegmentType";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL0List: return "BFrameInL0List";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eBFrameInL1List: return "BFrameInL1List";
+      case VideoEncodeH265CapabilityFlagBitsKHR::ePerPictureTypeMinMaxQp: return "PerPictureTypeMinMaxQp";
+      case VideoEncodeH265CapabilityFlagBitsKHR::ePerSliceSegmentConstantQp: return "PerSliceSegmentConstantQp";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eMultipleTilesPerSliceSegment: return "MultipleTilesPerSliceSegment";
+      case VideoEncodeH265CapabilityFlagBitsKHR::eMultipleSliceSegmentsPerTile: return "MultipleSliceSegmentsPerTile";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH265StdFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265StdFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH265StdFlagBitsKHR::eSeparateColorPlaneFlagSet             : return "SeparateColorPlaneFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eSampleAdaptiveOffsetEnabledFlagSet    : return "SampleAdaptiveOffsetEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eScalingListDataPresentFlagSet         : return "ScalingListDataPresentFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::ePcmEnabledFlagSet                     : return "PcmEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eSpsTemporalMvpEnabledFlagSet          : return "SpsTemporalMvpEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eInitQpMinus26                         : return "InitQpMinus26";
-      case VideoEncodeH265StdFlagBitsKHR::eWeightedPredFlagSet                   : return "WeightedPredFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eWeightedBipredFlagSet                 : return "WeightedBipredFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eLog2ParallelMergeLevelMinus2          : return "Log2ParallelMergeLevelMinus2";
-      case VideoEncodeH265StdFlagBitsKHR::eSignDataHidingEnabledFlagSet          : return "SignDataHidingEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagSet           : return "TransformSkipEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagUnset         : return "TransformSkipEnabledFlagUnset";
-      case VideoEncodeH265StdFlagBitsKHR::ePpsSliceChromaQpOffsetsPresentFlagSet : return "PpsSliceChromaQpOffsetsPresentFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eTransquantBypassEnabledFlagSet        : return "TransquantBypassEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eConstrainedIntraPredFlagSet           : return "ConstrainedIntraPredFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eEntropyCodingSyncEnabledFlagSet       : return "EntropyCodingSyncEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eSeparateColorPlaneFlagSet: return "SeparateColorPlaneFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eSampleAdaptiveOffsetEnabledFlagSet: return "SampleAdaptiveOffsetEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eScalingListDataPresentFlagSet: return "ScalingListDataPresentFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::ePcmEnabledFlagSet: return "PcmEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eSpsTemporalMvpEnabledFlagSet: return "SpsTemporalMvpEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eInitQpMinus26: return "InitQpMinus26";
+      case VideoEncodeH265StdFlagBitsKHR::eWeightedPredFlagSet: return "WeightedPredFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eWeightedBipredFlagSet: return "WeightedBipredFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eLog2ParallelMergeLevelMinus2: return "Log2ParallelMergeLevelMinus2";
+      case VideoEncodeH265StdFlagBitsKHR::eSignDataHidingEnabledFlagSet: return "SignDataHidingEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagSet: return "TransformSkipEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eTransformSkipEnabledFlagUnset: return "TransformSkipEnabledFlagUnset";
+      case VideoEncodeH265StdFlagBitsKHR::ePpsSliceChromaQpOffsetsPresentFlagSet: return "PpsSliceChromaQpOffsetsPresentFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eTransquantBypassEnabledFlagSet: return "TransquantBypassEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eConstrainedIntraPredFlagSet: return "ConstrainedIntraPredFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eEntropyCodingSyncEnabledFlagSet: return "EntropyCodingSyncEnabledFlagSet";
       case VideoEncodeH265StdFlagBitsKHR::eDeblockingFilterOverrideEnabledFlagSet: return "DeblockingFilterOverrideEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentsEnabledFlagSet  : return "DependentSliceSegmentsEnabledFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentFlagSet          : return "DependentSliceSegmentFlagSet";
-      case VideoEncodeH265StdFlagBitsKHR::eSliceQpDelta                          : return "SliceQpDelta";
-      case VideoEncodeH265StdFlagBitsKHR::eDifferentSliceQpDelta                 : return "DifferentSliceQpDelta";
-      default                                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentsEnabledFlagSet: return "DependentSliceSegmentsEnabledFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eDependentSliceSegmentFlagSet: return "DependentSliceSegmentFlagSet";
+      case VideoEncodeH265StdFlagBitsKHR::eSliceQpDelta: return "SliceQpDelta";
+      case VideoEncodeH265StdFlagBitsKHR::eDifferentSliceQpDelta: return "DifferentSliceQpDelta";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH265CtbSizeFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265CtbSizeFlagBitsKHR value )
   {
     switch ( value )
     {
       case VideoEncodeH265CtbSizeFlagBitsKHR::e16: return "16";
       case VideoEncodeH265CtbSizeFlagBitsKHR::e32: return "32";
       case VideoEncodeH265CtbSizeFlagBitsKHR::e64: return "64";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH265TransformBlockSizeFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265TransformBlockSizeFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e4 : return "4";
-      case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e8 : return "8";
+      case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e4: return "4";
+      case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e8: return "8";
       case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e16: return "16";
       case VideoEncodeH265TransformBlockSizeFlagBitsKHR::e32: return "32";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeH265RateControlFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeH265RateControlFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeH265RateControlFlagBitsKHR::eAttemptHrdCompliance         : return "AttemptHrdCompliance";
-      case VideoEncodeH265RateControlFlagBitsKHR::eRegularGop                   : return "RegularGop";
-      case VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternFlat         : return "ReferencePatternFlat";
-      case VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternDyadic       : return "ReferencePatternDyadic";
+      case VideoEncodeH265RateControlFlagBitsKHR::eAttemptHrdCompliance: return "AttemptHrdCompliance";
+      case VideoEncodeH265RateControlFlagBitsKHR::eRegularGop: return "RegularGop";
+      case VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternFlat: return "ReferencePatternFlat";
+      case VideoEncodeH265RateControlFlagBitsKHR::eReferencePatternDyadic: return "ReferencePatternDyadic";
       case VideoEncodeH265RateControlFlagBitsKHR::eTemporalSubLayerPatternDyadic: return "TemporalSubLayerPatternDyadic";
-      default                                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_video_decode_h264 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoDecodeH264PictureLayoutFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoDecodeH264PictureLayoutFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive               : return "Progressive";
+      case VideoDecodeH264PictureLayoutFlagBitsKHR::eProgressive: return "Progressive";
       case VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedInterleavedLines: return "InterlacedInterleavedLines";
-      case VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedSeparatePlanes  : return "InterlacedSeparatePlanes";
-      default                                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoDecodeH264PictureLayoutFlagBitsKHR::eInterlacedSeparatePlanes: return "InterlacedSeparatePlanes";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_AMD_shader_info ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderInfoTypeAMD value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderInfoTypeAMD value )
   {
     switch ( value )
     {
-      case ShaderInfoTypeAMD::eStatistics : return "Statistics";
-      case ShaderInfoTypeAMD::eBinary     : return "Binary";
+      case ShaderInfoTypeAMD::eStatistics: return "Statistics";
+      case ShaderInfoTypeAMD::eBinary: return "Binary";
       case ShaderInfoTypeAMD::eDisassembly: return "Disassembly";
-      default                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_GGP )
   //=== VK_GGP_stream_descriptor_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( StreamDescriptorSurfaceCreateFlagBitsGGP )
+  VULKAN_HPP_INLINE std::string to_string( StreamDescriptorSurfaceCreateFlagBitsGGP )
   {
     return "(void)";
   }
@@ -8704,106 +7345,132 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_NV_external_memory_capabilities ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalMemoryHandleTypeFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( ExternalMemoryHandleTypeFlagBitsNV value )
   {
     switch ( value )
     {
-      case ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32   : return "OpaqueWin32";
+      case ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32: return "OpaqueWin32";
       case ExternalMemoryHandleTypeFlagBitsNV::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
-      case ExternalMemoryHandleTypeFlagBitsNV::eD3D11Image    : return "D3D11Image";
-      case ExternalMemoryHandleTypeFlagBitsNV::eD3D11ImageKmt : return "D3D11ImageKmt";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ExternalMemoryHandleTypeFlagBitsNV::eD3D11Image: return "D3D11Image";
+      case ExternalMemoryHandleTypeFlagBitsNV::eD3D11ImageKmt: return "D3D11ImageKmt";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExternalMemoryFeatureFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( ExternalMemoryFeatureFlagBitsNV value )
   {
     switch ( value )
     {
       case ExternalMemoryFeatureFlagBitsNV::eDedicatedOnly: return "DedicatedOnly";
-      case ExternalMemoryFeatureFlagBitsNV::eExportable   : return "Exportable";
-      case ExternalMemoryFeatureFlagBitsNV::eImportable   : return "Importable";
-      default                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ExternalMemoryFeatureFlagBitsNV::eExportable: return "Exportable";
+      case ExternalMemoryFeatureFlagBitsNV::eImportable: return "Importable";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_validation_flags ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationCheckEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ValidationCheckEXT value )
   {
     switch ( value )
     {
-      case ValidationCheckEXT::eAll    : return "All";
+      case ValidationCheckEXT::eAll: return "All";
       case ValidationCheckEXT::eShaders: return "Shaders";
-      default                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_VI_NN )
   //=== VK_NN_vi_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ViSurfaceCreateFlagBitsNN )
+  VULKAN_HPP_INLINE std::string to_string( ViSurfaceCreateFlagBitsNN )
   {
     return "(void)";
   }
 #endif /*VK_USE_PLATFORM_VI_NN*/
 
+  //=== VK_EXT_pipeline_robustness ===
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineRobustnessBufferBehaviorEXT value )
+  {
+    switch ( value )
+    {
+      case PipelineRobustnessBufferBehaviorEXT::eDeviceDefault: return "DeviceDefault";
+      case PipelineRobustnessBufferBehaviorEXT::eDisabled: return "Disabled";
+      case PipelineRobustnessBufferBehaviorEXT::eRobustBufferAccess: return "RobustBufferAccess";
+      case PipelineRobustnessBufferBehaviorEXT::eRobustBufferAccess2: return "RobustBufferAccess2";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PipelineRobustnessImageBehaviorEXT value )
+  {
+    switch ( value )
+    {
+      case PipelineRobustnessImageBehaviorEXT::eDeviceDefault: return "DeviceDefault";
+      case PipelineRobustnessImageBehaviorEXT::eDisabled: return "Disabled";
+      case PipelineRobustnessImageBehaviorEXT::eRobustImageAccess: return "RobustImageAccess";
+      case PipelineRobustnessImageBehaviorEXT::eRobustImageAccess2: return "RobustImageAccess2";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
   //=== VK_EXT_conditional_rendering ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ConditionalRenderingFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ConditionalRenderingFlagBitsEXT value )
   {
     switch ( value )
     {
       case ConditionalRenderingFlagBitsEXT::eInverted: return "Inverted";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_display_surface_counter ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SurfaceCounterFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( SurfaceCounterFlagBitsEXT value )
   {
     switch ( value )
     {
       case SurfaceCounterFlagBitsEXT::eVblank: return "Vblank";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_display_control ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplayPowerStateEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DisplayPowerStateEXT value )
   {
     switch ( value )
     {
-      case DisplayPowerStateEXT::eOff    : return "Off";
+      case DisplayPowerStateEXT::eOff: return "Off";
       case DisplayPowerStateEXT::eSuspend: return "Suspend";
-      case DisplayPowerStateEXT::eOn     : return "On";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DisplayPowerStateEXT::eOn: return "On";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceEventTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceEventTypeEXT value )
   {
     switch ( value )
     {
       case DeviceEventTypeEXT::eDisplayHotplug: return "DisplayHotplug";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplayEventTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DisplayEventTypeEXT value )
   {
     switch ( value )
     {
       case DisplayEventTypeEXT::eFirstPixelOut: return "FirstPixelOut";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_viewport_swizzle ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ViewportCoordinateSwizzleNV value )
+  VULKAN_HPP_INLINE std::string to_string( ViewportCoordinateSwizzleNV value )
   {
     switch ( value )
     {
@@ -8815,114 +7482,114 @@ namespace VULKAN_HPP_NAMESPACE
       case ViewportCoordinateSwizzleNV::eNegativeZ: return "NegativeZ";
       case ViewportCoordinateSwizzleNV::ePositiveW: return "PositiveW";
       case ViewportCoordinateSwizzleNV::eNegativeW: return "NegativeW";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineViewportSwizzleStateCreateFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineViewportSwizzleStateCreateFlagBitsNV )
   {
     return "(void)";
   }
 
   //=== VK_EXT_discard_rectangles ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DiscardRectangleModeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DiscardRectangleModeEXT value )
   {
     switch ( value )
     {
       case DiscardRectangleModeEXT::eInclusive: return "Inclusive";
       case DiscardRectangleModeEXT::eExclusive: return "Exclusive";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineDiscardRectangleStateCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineDiscardRectangleStateCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_EXT_conservative_rasterization ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ConservativeRasterizationModeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ConservativeRasterizationModeEXT value )
   {
     switch ( value )
     {
-      case ConservativeRasterizationModeEXT::eDisabled     : return "Disabled";
-      case ConservativeRasterizationModeEXT::eOverestimate : return "Overestimate";
+      case ConservativeRasterizationModeEXT::eDisabled: return "Disabled";
+      case ConservativeRasterizationModeEXT::eOverestimate: return "Overestimate";
       case ConservativeRasterizationModeEXT::eUnderestimate: return "Underestimate";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationConservativeStateCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationConservativeStateCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_EXT_depth_clip_enable ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineRasterizationDepthClipStateCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( PipelineRasterizationDepthClipStateCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_KHR_performance_query ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterDescriptionFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceCounterDescriptionFlagBitsKHR value )
   {
     switch ( value )
     {
       case PerformanceCounterDescriptionFlagBitsKHR::ePerformanceImpacting: return "PerformanceImpacting";
       case PerformanceCounterDescriptionFlagBitsKHR::eConcurrentlyImpacted: return "ConcurrentlyImpacted";
-      default                                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterScopeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceCounterScopeKHR value )
   {
     switch ( value )
     {
       case PerformanceCounterScopeKHR::eCommandBuffer: return "CommandBuffer";
-      case PerformanceCounterScopeKHR::eRenderPass   : return "RenderPass";
-      case PerformanceCounterScopeKHR::eCommand      : return "Command";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PerformanceCounterScopeKHR::eRenderPass: return "RenderPass";
+      case PerformanceCounterScopeKHR::eCommand: return "Command";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterStorageKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceCounterStorageKHR value )
   {
     switch ( value )
     {
-      case PerformanceCounterStorageKHR::eInt32  : return "Int32";
-      case PerformanceCounterStorageKHR::eInt64  : return "Int64";
-      case PerformanceCounterStorageKHR::eUint32 : return "Uint32";
-      case PerformanceCounterStorageKHR::eUint64 : return "Uint64";
+      case PerformanceCounterStorageKHR::eInt32: return "Int32";
+      case PerformanceCounterStorageKHR::eInt64: return "Int64";
+      case PerformanceCounterStorageKHR::eUint32: return "Uint32";
+      case PerformanceCounterStorageKHR::eUint64: return "Uint64";
       case PerformanceCounterStorageKHR::eFloat32: return "Float32";
       case PerformanceCounterStorageKHR::eFloat64: return "Float64";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterUnitKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceCounterUnitKHR value )
   {
     switch ( value )
     {
-      case PerformanceCounterUnitKHR::eGeneric       : return "Generic";
-      case PerformanceCounterUnitKHR::ePercentage    : return "Percentage";
-      case PerformanceCounterUnitKHR::eNanoseconds   : return "Nanoseconds";
-      case PerformanceCounterUnitKHR::eBytes         : return "Bytes";
+      case PerformanceCounterUnitKHR::eGeneric: return "Generic";
+      case PerformanceCounterUnitKHR::ePercentage: return "Percentage";
+      case PerformanceCounterUnitKHR::eNanoseconds: return "Nanoseconds";
+      case PerformanceCounterUnitKHR::eBytes: return "Bytes";
       case PerformanceCounterUnitKHR::eBytesPerSecond: return "BytesPerSecond";
-      case PerformanceCounterUnitKHR::eKelvin        : return "Kelvin";
-      case PerformanceCounterUnitKHR::eWatts         : return "Watts";
-      case PerformanceCounterUnitKHR::eVolts         : return "Volts";
-      case PerformanceCounterUnitKHR::eAmps          : return "Amps";
-      case PerformanceCounterUnitKHR::eHertz         : return "Hertz";
-      case PerformanceCounterUnitKHR::eCycles        : return "Cycles";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PerformanceCounterUnitKHR::eKelvin: return "Kelvin";
+      case PerformanceCounterUnitKHR::eWatts: return "Watts";
+      case PerformanceCounterUnitKHR::eVolts: return "Volts";
+      case PerformanceCounterUnitKHR::eAmps: return "Amps";
+      case PerformanceCounterUnitKHR::eHertz: return "Hertz";
+      case PerformanceCounterUnitKHR::eCycles: return "Cycles";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AcquireProfilingLockFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( AcquireProfilingLockFlagBitsKHR )
   {
     return "(void)";
   }
@@ -8930,7 +7597,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_IOS_MVK )
   //=== VK_MVK_ios_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IOSSurfaceCreateFlagBitsMVK )
+  VULKAN_HPP_INLINE std::string to_string( IOSSurfaceCreateFlagBitsMVK )
   {
     return "(void)";
   }
@@ -8939,7 +7606,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_MACOS_MVK )
   //=== VK_MVK_macos_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MacOSSurfaceCreateFlagBitsMVK )
+  VULKAN_HPP_INLINE std::string to_string( MacOSSurfaceCreateFlagBitsMVK )
   {
     return "(void)";
   }
@@ -8947,407 +7614,381 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_debug_utils ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessageSeverityFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessageSeverityFlagBitsEXT value )
   {
     switch ( value )
     {
       case DebugUtilsMessageSeverityFlagBitsEXT::eVerbose: return "Verbose";
-      case DebugUtilsMessageSeverityFlagBitsEXT::eInfo   : return "Info";
+      case DebugUtilsMessageSeverityFlagBitsEXT::eInfo: return "Info";
       case DebugUtilsMessageSeverityFlagBitsEXT::eWarning: return "Warning";
-      case DebugUtilsMessageSeverityFlagBitsEXT::eError  : return "Error";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DebugUtilsMessageSeverityFlagBitsEXT::eError: return "Error";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessageTypeFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessageTypeFlagBitsEXT value )
   {
     switch ( value )
     {
-      case DebugUtilsMessageTypeFlagBitsEXT::eGeneral             : return "General";
-      case DebugUtilsMessageTypeFlagBitsEXT::eValidation          : return "Validation";
-      case DebugUtilsMessageTypeFlagBitsEXT::ePerformance         : return "Performance";
+      case DebugUtilsMessageTypeFlagBitsEXT::eGeneral: return "General";
+      case DebugUtilsMessageTypeFlagBitsEXT::eValidation: return "Validation";
+      case DebugUtilsMessageTypeFlagBitsEXT::ePerformance: return "Performance";
       case DebugUtilsMessageTypeFlagBitsEXT::eDeviceAddressBinding: return "DeviceAddressBinding";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessengerCallbackDataFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessengerCallbackDataFlagBitsEXT )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DebugUtilsMessengerCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DebugUtilsMessengerCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_EXT_blend_operation_advanced ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BlendOverlapEXT value )
+  VULKAN_HPP_INLINE std::string to_string( BlendOverlapEXT value )
   {
     switch ( value )
     {
       case BlendOverlapEXT::eUncorrelated: return "Uncorrelated";
-      case BlendOverlapEXT::eDisjoint    : return "Disjoint";
-      case BlendOverlapEXT::eConjoint    : return "Conjoint";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BlendOverlapEXT::eDisjoint: return "Disjoint";
+      case BlendOverlapEXT::eConjoint: return "Conjoint";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_fragment_coverage_to_color ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageToColorStateCreateFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageToColorStateCreateFlagBitsNV )
   {
     return "(void)";
   }
 
   //=== VK_KHR_acceleration_structure ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureTypeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureTypeKHR value )
   {
     switch ( value )
     {
-      case AccelerationStructureTypeKHR::eTopLevel   : return "TopLevel";
+      case AccelerationStructureTypeKHR::eTopLevel: return "TopLevel";
       case AccelerationStructureTypeKHR::eBottomLevel: return "BottomLevel";
-      case AccelerationStructureTypeKHR::eGeneric    : return "Generic";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AccelerationStructureTypeKHR::eGeneric: return "Generic";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureBuildTypeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureBuildTypeKHR value )
   {
     switch ( value )
     {
-      case AccelerationStructureBuildTypeKHR::eHost        : return "Host";
-      case AccelerationStructureBuildTypeKHR::eDevice      : return "Device";
+      case AccelerationStructureBuildTypeKHR::eHost: return "Host";
+      case AccelerationStructureBuildTypeKHR::eDevice: return "Device";
       case AccelerationStructureBuildTypeKHR::eHostOrDevice: return "HostOrDevice";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( GeometryFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( GeometryFlagBitsKHR value )
   {
     switch ( value )
     {
-      case GeometryFlagBitsKHR::eOpaque                     : return "Opaque";
+      case GeometryFlagBitsKHR::eOpaque: return "Opaque";
       case GeometryFlagBitsKHR::eNoDuplicateAnyHitInvocation: return "NoDuplicateAnyHitInvocation";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( GeometryInstanceFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( GeometryInstanceFlagBitsKHR value )
   {
     switch ( value )
     {
-      case GeometryInstanceFlagBitsKHR::eTriangleFacingCullDisable    : return "TriangleFacingCullDisable";
-      case GeometryInstanceFlagBitsKHR::eTriangleFlipFacing           : return "TriangleFlipFacing";
-      case GeometryInstanceFlagBitsKHR::eForceOpaque                  : return "ForceOpaque";
-      case GeometryInstanceFlagBitsKHR::eForceNoOpaque                : return "ForceNoOpaque";
+      case GeometryInstanceFlagBitsKHR::eTriangleFacingCullDisable: return "TriangleFacingCullDisable";
+      case GeometryInstanceFlagBitsKHR::eTriangleFlipFacing: return "TriangleFlipFacing";
+      case GeometryInstanceFlagBitsKHR::eForceOpaque: return "ForceOpaque";
+      case GeometryInstanceFlagBitsKHR::eForceNoOpaque: return "ForceNoOpaque";
       case GeometryInstanceFlagBitsKHR::eForceOpacityMicromap2StateEXT: return "ForceOpacityMicromap2StateEXT";
-      case GeometryInstanceFlagBitsKHR::eDisableOpacityMicromapsEXT   : return "DisableOpacityMicromapsEXT";
-      default                                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case GeometryInstanceFlagBitsKHR::eDisableOpacityMicromapsEXT: return "DisableOpacityMicromapsEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BuildAccelerationStructureFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( BuildAccelerationStructureFlagBitsKHR value )
   {
     switch ( value )
     {
-      case BuildAccelerationStructureFlagBitsKHR::eAllowUpdate                      : return "AllowUpdate";
-      case BuildAccelerationStructureFlagBitsKHR::eAllowCompaction                  : return "AllowCompaction";
-      case BuildAccelerationStructureFlagBitsKHR::ePreferFastTrace                  : return "PreferFastTrace";
-      case BuildAccelerationStructureFlagBitsKHR::ePreferFastBuild                  : return "PreferFastBuild";
-      case BuildAccelerationStructureFlagBitsKHR::eLowMemory                        : return "LowMemory";
-      case BuildAccelerationStructureFlagBitsKHR::eMotionNV                         : return "MotionNV";
-      case BuildAccelerationStructureFlagBitsKHR::eAllowOpacityMicromapUpdateEXT    : return "AllowOpacityMicromapUpdateEXT";
-      case BuildAccelerationStructureFlagBitsKHR::eAllowDisableOpacityMicromapsEXT  : return "AllowDisableOpacityMicromapsEXT";
+      case BuildAccelerationStructureFlagBitsKHR::eAllowUpdate: return "AllowUpdate";
+      case BuildAccelerationStructureFlagBitsKHR::eAllowCompaction: return "AllowCompaction";
+      case BuildAccelerationStructureFlagBitsKHR::ePreferFastTrace: return "PreferFastTrace";
+      case BuildAccelerationStructureFlagBitsKHR::ePreferFastBuild: return "PreferFastBuild";
+      case BuildAccelerationStructureFlagBitsKHR::eLowMemory: return "LowMemory";
+      case BuildAccelerationStructureFlagBitsKHR::eMotionNV: return "MotionNV";
+      case BuildAccelerationStructureFlagBitsKHR::eAllowOpacityMicromapUpdateEXT: return "AllowOpacityMicromapUpdateEXT";
+      case BuildAccelerationStructureFlagBitsKHR::eAllowDisableOpacityMicromapsEXT: return "AllowDisableOpacityMicromapsEXT";
       case BuildAccelerationStructureFlagBitsKHR::eAllowOpacityMicromapDataUpdateEXT: return "AllowOpacityMicromapDataUpdateEXT";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
       case BuildAccelerationStructureFlagBitsKHR::eAllowDisplacementMicromapUpdateNV: return "AllowDisplacementMicromapUpdateNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      case BuildAccelerationStructureFlagBitsKHR::eAllowDataAccess               : return "AllowDataAccess";
-      case BuildAccelerationStructureFlagBitsKHR::eAllowClusterOpacityMicromapsNV: return "AllowClusterOpacityMicromapsNV";
-      default                                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BuildAccelerationStructureFlagBitsKHR::eAllowDataAccess: return "AllowDataAccess";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CopyAccelerationStructureModeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( CopyAccelerationStructureModeKHR value )
   {
     switch ( value )
     {
-      case CopyAccelerationStructureModeKHR::eClone      : return "Clone";
-      case CopyAccelerationStructureModeKHR::eCompact    : return "Compact";
-      case CopyAccelerationStructureModeKHR::eSerialize  : return "Serialize";
+      case CopyAccelerationStructureModeKHR::eClone: return "Clone";
+      case CopyAccelerationStructureModeKHR::eCompact: return "Compact";
+      case CopyAccelerationStructureModeKHR::eSerialize: return "Serialize";
       case CopyAccelerationStructureModeKHR::eDeserialize: return "Deserialize";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( GeometryTypeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( GeometryTypeKHR value )
   {
     switch ( value )
     {
-      case GeometryTypeKHR::eTriangles           : return "Triangles";
-      case GeometryTypeKHR::eAabbs               : return "Aabbs";
-      case GeometryTypeKHR::eInstances           : return "Instances";
-      case GeometryTypeKHR::eSpheresNV           : return "SpheresNV";
-      case GeometryTypeKHR::eLinearSweptSpheresNV: return "LinearSweptSpheresNV";
-#if defined( VK_ENABLE_BETA_EXTENSIONS )
-      case GeometryTypeKHR::eDenseGeometryFormatTrianglesAMDX: return "DenseGeometryFormatTrianglesAMDX";
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case GeometryTypeKHR::eTriangles: return "Triangles";
+      case GeometryTypeKHR::eAabbs: return "Aabbs";
+      case GeometryTypeKHR::eInstances: return "Instances";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureCompatibilityKHR value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureCompatibilityKHR value )
   {
     switch ( value )
     {
-      case AccelerationStructureCompatibilityKHR::eCompatible  : return "Compatible";
+      case AccelerationStructureCompatibilityKHR::eCompatible: return "Compatible";
       case AccelerationStructureCompatibilityKHR::eIncompatible: return "Incompatible";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureCreateFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureCreateFlagBitsKHR value )
   {
     switch ( value )
     {
-      case AccelerationStructureCreateFlagBitsKHR::eDeviceAddressCaptureReplay      : return "DeviceAddressCaptureReplay";
+      case AccelerationStructureCreateFlagBitsKHR::eDeviceAddressCaptureReplay: return "DeviceAddressCaptureReplay";
       case AccelerationStructureCreateFlagBitsKHR::eDescriptorBufferCaptureReplayEXT: return "DescriptorBufferCaptureReplayEXT";
-      case AccelerationStructureCreateFlagBitsKHR::eMotionNV                        : return "MotionNV";
-      default                                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AccelerationStructureCreateFlagBitsKHR::eMotionNV: return "MotionNV";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BuildAccelerationStructureModeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( BuildAccelerationStructureModeKHR value )
   {
     switch ( value )
     {
-      case BuildAccelerationStructureModeKHR::eBuild : return "Build";
+      case BuildAccelerationStructureModeKHR::eBuild: return "Build";
       case BuildAccelerationStructureModeKHR::eUpdate: return "Update";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_ray_tracing_pipeline ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RayTracingShaderGroupTypeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( RayTracingShaderGroupTypeKHR value )
   {
     switch ( value )
     {
-      case RayTracingShaderGroupTypeKHR::eGeneral           : return "General";
-      case RayTracingShaderGroupTypeKHR::eTrianglesHitGroup : return "TrianglesHitGroup";
+      case RayTracingShaderGroupTypeKHR::eGeneral: return "General";
+      case RayTracingShaderGroupTypeKHR::eTrianglesHitGroup: return "TrianglesHitGroup";
       case RayTracingShaderGroupTypeKHR::eProceduralHitGroup: return "ProceduralHitGroup";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderGroupShaderKHR value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderGroupShaderKHR value )
   {
     switch ( value )
     {
-      case ShaderGroupShaderKHR::eGeneral     : return "General";
-      case ShaderGroupShaderKHR::eClosestHit  : return "ClosestHit";
-      case ShaderGroupShaderKHR::eAnyHit      : return "AnyHit";
+      case ShaderGroupShaderKHR::eGeneral: return "General";
+      case ShaderGroupShaderKHR::eClosestHit: return "ClosestHit";
+      case ShaderGroupShaderKHR::eAnyHit: return "AnyHit";
       case ShaderGroupShaderKHR::eIntersection: return "Intersection";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_framebuffer_mixed_samples ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CoverageModulationModeNV value )
+  VULKAN_HPP_INLINE std::string to_string( CoverageModulationModeNV value )
   {
     switch ( value )
     {
-      case CoverageModulationModeNV::eNone : return "None";
-      case CoverageModulationModeNV::eRgb  : return "Rgb";
+      case CoverageModulationModeNV::eNone: return "None";
+      case CoverageModulationModeNV::eRgb: return "Rgb";
       case CoverageModulationModeNV::eAlpha: return "Alpha";
-      case CoverageModulationModeNV::eRgba : return "Rgba";
-      default                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case CoverageModulationModeNV::eRgba: return "Rgba";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageModulationStateCreateFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageModulationStateCreateFlagBitsNV )
   {
     return "(void)";
   }
 
   //=== VK_EXT_validation_cache ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationCacheHeaderVersionEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ValidationCacheHeaderVersionEXT value )
   {
     switch ( value )
     {
       case ValidationCacheHeaderVersionEXT::eOne: return "One";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationCacheCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( ValidationCacheCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_NV_shading_rate_image ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShadingRatePaletteEntryNV value )
+  VULKAN_HPP_INLINE std::string to_string( ShadingRatePaletteEntryNV value )
   {
     switch ( value )
     {
-      case ShadingRatePaletteEntryNV::eNoInvocations          : return "NoInvocations";
-      case ShadingRatePaletteEntryNV::e16InvocationsPerPixel  : return "16InvocationsPerPixel";
-      case ShadingRatePaletteEntryNV::e8InvocationsPerPixel   : return "8InvocationsPerPixel";
-      case ShadingRatePaletteEntryNV::e4InvocationsPerPixel   : return "4InvocationsPerPixel";
-      case ShadingRatePaletteEntryNV::e2InvocationsPerPixel   : return "2InvocationsPerPixel";
-      case ShadingRatePaletteEntryNV::e1InvocationPerPixel    : return "1InvocationPerPixel";
+      case ShadingRatePaletteEntryNV::eNoInvocations: return "NoInvocations";
+      case ShadingRatePaletteEntryNV::e16InvocationsPerPixel: return "16InvocationsPerPixel";
+      case ShadingRatePaletteEntryNV::e8InvocationsPerPixel: return "8InvocationsPerPixel";
+      case ShadingRatePaletteEntryNV::e4InvocationsPerPixel: return "4InvocationsPerPixel";
+      case ShadingRatePaletteEntryNV::e2InvocationsPerPixel: return "2InvocationsPerPixel";
+      case ShadingRatePaletteEntryNV::e1InvocationPerPixel: return "1InvocationPerPixel";
       case ShadingRatePaletteEntryNV::e1InvocationPer2X1Pixels: return "1InvocationPer2X1Pixels";
       case ShadingRatePaletteEntryNV::e1InvocationPer1X2Pixels: return "1InvocationPer1X2Pixels";
       case ShadingRatePaletteEntryNV::e1InvocationPer2X2Pixels: return "1InvocationPer2X2Pixels";
       case ShadingRatePaletteEntryNV::e1InvocationPer4X2Pixels: return "1InvocationPer4X2Pixels";
       case ShadingRatePaletteEntryNV::e1InvocationPer2X4Pixels: return "1InvocationPer2X4Pixels";
       case ShadingRatePaletteEntryNV::e1InvocationPer4X4Pixels: return "1InvocationPer4X4Pixels";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CoarseSampleOrderTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( CoarseSampleOrderTypeNV value )
   {
     switch ( value )
     {
-      case CoarseSampleOrderTypeNV::eDefault    : return "Default";
-      case CoarseSampleOrderTypeNV::eCustom     : return "Custom";
-      case CoarseSampleOrderTypeNV::ePixelMajor : return "PixelMajor";
+      case CoarseSampleOrderTypeNV::eDefault: return "Default";
+      case CoarseSampleOrderTypeNV::eCustom: return "Custom";
+      case CoarseSampleOrderTypeNV::ePixelMajor: return "PixelMajor";
       case CoarseSampleOrderTypeNV::eSampleMajor: return "SampleMajor";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_ray_tracing ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMemoryRequirementsTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMemoryRequirementsTypeNV value )
   {
     switch ( value )
     {
-      case AccelerationStructureMemoryRequirementsTypeNV::eObject       : return "Object";
-      case AccelerationStructureMemoryRequirementsTypeNV::eBuildScratch : return "BuildScratch";
+      case AccelerationStructureMemoryRequirementsTypeNV::eObject: return "Object";
+      case AccelerationStructureMemoryRequirementsTypeNV::eBuildScratch: return "BuildScratch";
       case AccelerationStructureMemoryRequirementsTypeNV::eUpdateScratch: return "UpdateScratch";
-      default                                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_AMD_pipeline_compiler_control ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCompilerControlFlagBitsAMD )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCompilerControlFlagBitsAMD )
   {
     return "(void)";
   }
 
+  //=== VK_KHR_global_priority ===
+
+  VULKAN_HPP_INLINE std::string to_string( QueueGlobalPriorityKHR value )
+  {
+    switch ( value )
+    {
+      case QueueGlobalPriorityKHR::eLow: return "Low";
+      case QueueGlobalPriorityKHR::eMedium: return "Medium";
+      case QueueGlobalPriorityKHR::eHigh: return "High";
+      case QueueGlobalPriorityKHR::eRealtime: return "Realtime";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
   //=== VK_AMD_memory_overallocation_behavior ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryOverallocationBehaviorAMD value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryOverallocationBehaviorAMD value )
   {
     switch ( value )
     {
-      case MemoryOverallocationBehaviorAMD::eDefault   : return "Default";
-      case MemoryOverallocationBehaviorAMD::eAllowed   : return "Allowed";
+      case MemoryOverallocationBehaviorAMD::eDefault: return "Default";
+      case MemoryOverallocationBehaviorAMD::eAllowed: return "Allowed";
       case MemoryOverallocationBehaviorAMD::eDisallowed: return "Disallowed";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_EXT_present_timing ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PresentStageFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case PresentStageFlagBitsEXT::eQueueOperationsEnd    : return "QueueOperationsEnd";
-      case PresentStageFlagBitsEXT::eRequestDequeued       : return "RequestDequeued";
-      case PresentStageFlagBitsEXT::eImageFirstPixelOut    : return "ImageFirstPixelOut";
-      case PresentStageFlagBitsEXT::eImageFirstPixelVisible: return "ImageFirstPixelVisible";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PresentTimingInfoFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case PresentTimingInfoFlagBitsEXT::ePresentAtRelativeTime       : return "PresentAtRelativeTime";
-      case PresentTimingInfoFlagBitsEXT::ePresentAtNearestRefreshCycle: return "PresentAtNearestRefreshCycle";
-      default                                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PastPresentationTimingFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case PastPresentationTimingFlagBitsEXT::eAllowPartialResults   : return "AllowPartialResults";
-      case PastPresentationTimingFlagBitsEXT::eAllowOutOfOrderResults: return "AllowOutOfOrderResults";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_INTEL_performance_query ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceConfigurationTypeINTEL value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceConfigurationTypeINTEL value )
   {
     switch ( value )
     {
       case PerformanceConfigurationTypeINTEL::eCommandQueueMetricsDiscoveryActivated: return "CommandQueueMetricsDiscoveryActivated";
-      default                                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( QueryPoolSamplingModeINTEL value )
+  VULKAN_HPP_INLINE std::string to_string( QueryPoolSamplingModeINTEL value )
   {
     switch ( value )
     {
       case QueryPoolSamplingModeINTEL::eManual: return "Manual";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceOverrideTypeINTEL value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceOverrideTypeINTEL value )
   {
     switch ( value )
     {
-      case PerformanceOverrideTypeINTEL::eNullHardware  : return "NullHardware";
+      case PerformanceOverrideTypeINTEL::eNullHardware: return "NullHardware";
       case PerformanceOverrideTypeINTEL::eFlushGpuCaches: return "FlushGpuCaches";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceParameterTypeINTEL value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceParameterTypeINTEL value )
   {
     switch ( value )
     {
-      case PerformanceParameterTypeINTEL::eHwCountersSupported  : return "HwCountersSupported";
+      case PerformanceParameterTypeINTEL::eHwCountersSupported: return "HwCountersSupported";
       case PerformanceParameterTypeINTEL::eStreamMarkerValidBits: return "StreamMarkerValidBits";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceValueTypeINTEL value )
+  VULKAN_HPP_INLINE std::string to_string( PerformanceValueTypeINTEL value )
   {
     switch ( value )
     {
       case PerformanceValueTypeINTEL::eUint32: return "Uint32";
       case PerformanceValueTypeINTEL::eUint64: return "Uint64";
-      case PerformanceValueTypeINTEL::eFloat : return "Float";
-      case PerformanceValueTypeINTEL::eBool  : return "Bool";
+      case PerformanceValueTypeINTEL::eFloat: return "Float";
+      case PerformanceValueTypeINTEL::eBool: return "Bool";
       case PerformanceValueTypeINTEL::eString: return "String";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_imagepipe_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImagePipeSurfaceCreateFlagBitsFUCHSIA )
+  VULKAN_HPP_INLINE std::string to_string( ImagePipeSurfaceCreateFlagBitsFUCHSIA )
   {
     return "(void)";
   }
@@ -9356,7 +7997,7 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MetalSurfaceCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( MetalSurfaceCreateFlagBitsEXT )
   {
     return "(void)";
   }
@@ -9364,429 +8005,455 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_KHR_fragment_shading_rate ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FragmentShadingRateCombinerOpKHR value )
+  VULKAN_HPP_INLINE std::string to_string( FragmentShadingRateCombinerOpKHR value )
   {
     switch ( value )
     {
-      case FragmentShadingRateCombinerOpKHR::eKeep   : return "Keep";
+      case FragmentShadingRateCombinerOpKHR::eKeep: return "Keep";
       case FragmentShadingRateCombinerOpKHR::eReplace: return "Replace";
-      case FragmentShadingRateCombinerOpKHR::eMin    : return "Min";
-      case FragmentShadingRateCombinerOpKHR::eMax    : return "Max";
-      case FragmentShadingRateCombinerOpKHR::eMul    : return "Mul";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FragmentShadingRateCombinerOpKHR::eMin: return "Min";
+      case FragmentShadingRateCombinerOpKHR::eMax: return "Max";
+      case FragmentShadingRateCombinerOpKHR::eMul: return "Mul";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_AMD_shader_core_properties2 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderCorePropertiesFlagBitsAMD )
+  VULKAN_HPP_INLINE std::string to_string( ShaderCorePropertiesFlagBitsAMD )
   {
     return "(void)";
   }
 
   //=== VK_EXT_validation_features ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationFeatureEnableEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ValidationFeatureEnableEXT value )
   {
     switch ( value )
     {
-      case ValidationFeatureEnableEXT::eGpuAssisted                  : return "GpuAssisted";
+      case ValidationFeatureEnableEXT::eGpuAssisted: return "GpuAssisted";
       case ValidationFeatureEnableEXT::eGpuAssistedReserveBindingSlot: return "GpuAssistedReserveBindingSlot";
-      case ValidationFeatureEnableEXT::eBestPractices                : return "BestPractices";
-      case ValidationFeatureEnableEXT::eDebugPrintf                  : return "DebugPrintf";
-      case ValidationFeatureEnableEXT::eSynchronizationValidation    : return "SynchronizationValidation";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ValidationFeatureEnableEXT::eBestPractices: return "BestPractices";
+      case ValidationFeatureEnableEXT::eDebugPrintf: return "DebugPrintf";
+      case ValidationFeatureEnableEXT::eSynchronizationValidation: return "SynchronizationValidation";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ValidationFeatureDisableEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ValidationFeatureDisableEXT value )
   {
     switch ( value )
     {
-      case ValidationFeatureDisableEXT::eAll                  : return "All";
-      case ValidationFeatureDisableEXT::eShaders              : return "Shaders";
-      case ValidationFeatureDisableEXT::eThreadSafety         : return "ThreadSafety";
-      case ValidationFeatureDisableEXT::eApiParameters        : return "ApiParameters";
-      case ValidationFeatureDisableEXT::eObjectLifetimes      : return "ObjectLifetimes";
-      case ValidationFeatureDisableEXT::eCoreChecks           : return "CoreChecks";
-      case ValidationFeatureDisableEXT::eUniqueHandles        : return "UniqueHandles";
+      case ValidationFeatureDisableEXT::eAll: return "All";
+      case ValidationFeatureDisableEXT::eShaders: return "Shaders";
+      case ValidationFeatureDisableEXT::eThreadSafety: return "ThreadSafety";
+      case ValidationFeatureDisableEXT::eApiParameters: return "ApiParameters";
+      case ValidationFeatureDisableEXT::eObjectLifetimes: return "ObjectLifetimes";
+      case ValidationFeatureDisableEXT::eCoreChecks: return "CoreChecks";
+      case ValidationFeatureDisableEXT::eUniqueHandles: return "UniqueHandles";
       case ValidationFeatureDisableEXT::eShaderValidationCache: return "ShaderValidationCache";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_coverage_reduction_mode ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CoverageReductionModeNV value )
+  VULKAN_HPP_INLINE std::string to_string( CoverageReductionModeNV value )
   {
     switch ( value )
     {
-      case CoverageReductionModeNV::eMerge   : return "Merge";
+      case CoverageReductionModeNV::eMerge: return "Merge";
       case CoverageReductionModeNV::eTruncate: return "Truncate";
-      default                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineCoverageReductionStateCreateFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCoverageReductionStateCreateFlagBitsNV )
   {
     return "(void)";
   }
 
   //=== VK_EXT_provoking_vertex ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ProvokingVertexModeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ProvokingVertexModeEXT value )
   {
     switch ( value )
     {
       case ProvokingVertexModeEXT::eFirstVertex: return "FirstVertex";
-      case ProvokingVertexModeEXT::eLastVertex : return "LastVertex";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ProvokingVertexModeEXT::eLastVertex: return "LastVertex";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_WIN32_KHR )
   //=== VK_EXT_full_screen_exclusive ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FullScreenExclusiveEXT value )
+  VULKAN_HPP_INLINE std::string to_string( FullScreenExclusiveEXT value )
   {
     switch ( value )
     {
-      case FullScreenExclusiveEXT::eDefault              : return "Default";
-      case FullScreenExclusiveEXT::eAllowed              : return "Allowed";
-      case FullScreenExclusiveEXT::eDisallowed           : return "Disallowed";
+      case FullScreenExclusiveEXT::eDefault: return "Default";
+      case FullScreenExclusiveEXT::eAllowed: return "Allowed";
+      case FullScreenExclusiveEXT::eDisallowed: return "Disallowed";
       case FullScreenExclusiveEXT::eApplicationControlled: return "ApplicationControlled";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 #endif /*VK_USE_PLATFORM_WIN32_KHR*/
 
   //=== VK_EXT_headless_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( HeadlessSurfaceCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( HeadlessSurfaceCreateFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_KHR_pipeline_executable_properties ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PipelineExecutableStatisticFormatKHR value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineExecutableStatisticFormatKHR value )
   {
     switch ( value )
     {
-      case PipelineExecutableStatisticFormatKHR::eBool32 : return "Bool32";
-      case PipelineExecutableStatisticFormatKHR::eInt64  : return "Int64";
-      case PipelineExecutableStatisticFormatKHR::eUint64 : return "Uint64";
+      case PipelineExecutableStatisticFormatKHR::eBool32: return "Bool32";
+      case PipelineExecutableStatisticFormatKHR::eInt64: return "Int64";
+      case PipelineExecutableStatisticFormatKHR::eUint64: return "Uint64";
       case PipelineExecutableStatisticFormatKHR::eFloat64: return "Float64";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  //=== VK_EXT_host_image_copy ===
+
+  VULKAN_HPP_INLINE std::string to_string( HostImageCopyFlagBitsEXT value )
+  {
+    switch ( value )
+    {
+      case HostImageCopyFlagBitsEXT::eMemcpy: return "Memcpy";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  //=== VK_KHR_map_memory2 ===
+
+  VULKAN_HPP_INLINE std::string to_string( MemoryUnmapFlagBitsKHR value )
+  {
+    switch ( value )
+    {
+      case MemoryUnmapFlagBitsKHR::eReserveEXT: return "ReserveEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  //=== VK_EXT_surface_maintenance1 ===
+
+  VULKAN_HPP_INLINE std::string to_string( PresentScalingFlagBitsEXT value )
+  {
+    switch ( value )
+    {
+      case PresentScalingFlagBitsEXT::eOneToOne: return "OneToOne";
+      case PresentScalingFlagBitsEXT::eAspectRatioStretch: return "AspectRatioStretch";
+      case PresentScalingFlagBitsEXT::eStretch: return "Stretch";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  VULKAN_HPP_INLINE std::string to_string( PresentGravityFlagBitsEXT value )
+  {
+    switch ( value )
+    {
+      case PresentGravityFlagBitsEXT::eMin: return "Min";
+      case PresentGravityFlagBitsEXT::eMax: return "Max";
+      case PresentGravityFlagBitsEXT::eCentered: return "Centered";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_device_generated_commands ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectStateFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( IndirectStateFlagBitsNV value )
   {
     switch ( value )
     {
       case IndirectStateFlagBitsNV::eFlagFrontface: return "FlagFrontface";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectCommandsTokenTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( IndirectCommandsTokenTypeNV value )
   {
     switch ( value )
     {
-      case IndirectCommandsTokenTypeNV::eShaderGroup  : return "ShaderGroup";
-      case IndirectCommandsTokenTypeNV::eStateFlags   : return "StateFlags";
-      case IndirectCommandsTokenTypeNV::eIndexBuffer  : return "IndexBuffer";
-      case IndirectCommandsTokenTypeNV::eVertexBuffer : return "VertexBuffer";
-      case IndirectCommandsTokenTypeNV::ePushConstant : return "PushConstant";
-      case IndirectCommandsTokenTypeNV::eDrawIndexed  : return "DrawIndexed";
-      case IndirectCommandsTokenTypeNV::eDraw         : return "Draw";
-      case IndirectCommandsTokenTypeNV::eDrawTasks    : return "DrawTasks";
+      case IndirectCommandsTokenTypeNV::eShaderGroup: return "ShaderGroup";
+      case IndirectCommandsTokenTypeNV::eStateFlags: return "StateFlags";
+      case IndirectCommandsTokenTypeNV::eIndexBuffer: return "IndexBuffer";
+      case IndirectCommandsTokenTypeNV::eVertexBuffer: return "VertexBuffer";
+      case IndirectCommandsTokenTypeNV::ePushConstant: return "PushConstant";
+      case IndirectCommandsTokenTypeNV::eDrawIndexed: return "DrawIndexed";
+      case IndirectCommandsTokenTypeNV::eDraw: return "Draw";
+      case IndirectCommandsTokenTypeNV::eDrawTasks: return "DrawTasks";
       case IndirectCommandsTokenTypeNV::eDrawMeshTasks: return "DrawMeshTasks";
-      case IndirectCommandsTokenTypeNV::ePipeline     : return "Pipeline";
-      case IndirectCommandsTokenTypeNV::eDispatch     : return "Dispatch";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case IndirectCommandsTokenTypeNV::ePipeline: return "Pipeline";
+      case IndirectCommandsTokenTypeNV::eDispatch: return "Dispatch";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectCommandsLayoutUsageFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( IndirectCommandsLayoutUsageFlagBitsNV value )
   {
     switch ( value )
     {
       case IndirectCommandsLayoutUsageFlagBitsNV::eExplicitPreprocess: return "ExplicitPreprocess";
-      case IndirectCommandsLayoutUsageFlagBitsNV::eIndexedSequences  : return "IndexedSequences";
+      case IndirectCommandsLayoutUsageFlagBitsNV::eIndexedSequences: return "IndexedSequences";
       case IndirectCommandsLayoutUsageFlagBitsNV::eUnorderedSequences: return "UnorderedSequences";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_depth_bias_control ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DepthBiasRepresentationEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DepthBiasRepresentationEXT value )
   {
     switch ( value )
     {
-      case DepthBiasRepresentationEXT::eLeastRepresentableValueFormat    : return "LeastRepresentableValueFormat";
+      case DepthBiasRepresentationEXT::eLeastRepresentableValueFormat: return "LeastRepresentableValueFormat";
       case DepthBiasRepresentationEXT::eLeastRepresentableValueForceUnorm: return "LeastRepresentableValueForceUnorm";
-      case DepthBiasRepresentationEXT::eFloat                            : return "Float";
-      default                                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DepthBiasRepresentationEXT::eFloat: return "Float";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_device_memory_report ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceMemoryReportEventTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceMemoryReportEventTypeEXT value )
   {
     switch ( value )
     {
-      case DeviceMemoryReportEventTypeEXT::eAllocate        : return "Allocate";
-      case DeviceMemoryReportEventTypeEXT::eFree            : return "Free";
-      case DeviceMemoryReportEventTypeEXT::eImport          : return "Import";
-      case DeviceMemoryReportEventTypeEXT::eUnimport        : return "Unimport";
+      case DeviceMemoryReportEventTypeEXT::eAllocate: return "Allocate";
+      case DeviceMemoryReportEventTypeEXT::eFree: return "Free";
+      case DeviceMemoryReportEventTypeEXT::eImport: return "Import";
+      case DeviceMemoryReportEventTypeEXT::eUnimport: return "Unimport";
       case DeviceMemoryReportEventTypeEXT::eAllocationFailed: return "AllocationFailed";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceMemoryReportFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DeviceMemoryReportFlagBitsEXT )
   {
     return "(void)";
   }
 
   //=== VK_KHR_video_encode_queue ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeCapabilityFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeCapabilityFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes          : return "PrecedingExternallyEncodedBytes";
+      case VideoEncodeCapabilityFlagBitsKHR::ePrecedingExternallyEncodedBytes: return "PrecedingExternallyEncodedBytes";
       case VideoEncodeCapabilityFlagBitsKHR::eInsufficientBitstreamBufferRangeDetection: return "InsufficientBitstreamBufferRangeDetection";
-      case VideoEncodeCapabilityFlagBitsKHR::eQuantizationDeltaMap                     : return "QuantizationDeltaMap";
-      case VideoEncodeCapabilityFlagBitsKHR::eEmphasisMap                              : return "EmphasisMap";
-      default                                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeFeedbackFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeFeedbackFlagBitsKHR value )
   {
     switch ( value )
     {
       case VideoEncodeFeedbackFlagBitsKHR::eBitstreamBufferOffset: return "BitstreamBufferOffset";
       case VideoEncodeFeedbackFlagBitsKHR::eBitstreamBytesWritten: return "BitstreamBytesWritten";
       case VideoEncodeFeedbackFlagBitsKHR::eBitstreamHasOverrides: return "BitstreamHasOverrides";
-      default                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeUsageFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeUsageFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeUsageFlagBitsKHR::eDefault     : return "Default";
-      case VideoEncodeUsageFlagBitsKHR::eTranscoding : return "Transcoding";
-      case VideoEncodeUsageFlagBitsKHR::eStreaming   : return "Streaming";
-      case VideoEncodeUsageFlagBitsKHR::eRecording   : return "Recording";
+      case VideoEncodeUsageFlagBitsKHR::eDefault: return "Default";
+      case VideoEncodeUsageFlagBitsKHR::eTranscoding: return "Transcoding";
+      case VideoEncodeUsageFlagBitsKHR::eStreaming: return "Streaming";
+      case VideoEncodeUsageFlagBitsKHR::eRecording: return "Recording";
       case VideoEncodeUsageFlagBitsKHR::eConferencing: return "Conferencing";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeContentFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeContentFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeContentFlagBitsKHR::eDefault : return "Default";
-      case VideoEncodeContentFlagBitsKHR::eCamera  : return "Camera";
-      case VideoEncodeContentFlagBitsKHR::eDesktop : return "Desktop";
+      case VideoEncodeContentFlagBitsKHR::eDefault: return "Default";
+      case VideoEncodeContentFlagBitsKHR::eCamera: return "Camera";
+      case VideoEncodeContentFlagBitsKHR::eDesktop: return "Desktop";
       case VideoEncodeContentFlagBitsKHR::eRendered: return "Rendered";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeTuningModeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeTuningModeKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeTuningModeKHR::eDefault        : return "Default";
-      case VideoEncodeTuningModeKHR::eHighQuality    : return "HighQuality";
-      case VideoEncodeTuningModeKHR::eLowLatency     : return "LowLatency";
+      case VideoEncodeTuningModeKHR::eDefault: return "Default";
+      case VideoEncodeTuningModeKHR::eHighQuality: return "HighQuality";
+      case VideoEncodeTuningModeKHR::eLowLatency: return "LowLatency";
       case VideoEncodeTuningModeKHR::eUltraLowLatency: return "UltraLowLatency";
-      case VideoEncodeTuningModeKHR::eLossless       : return "Lossless";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeTuningModeKHR::eLossless: return "Lossless";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRateControlModeFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRateControlModeFlagBitsKHR value )
   {
     switch ( value )
     {
-      case VideoEncodeRateControlModeFlagBitsKHR::eDefault : return "Default";
+      case VideoEncodeRateControlModeFlagBitsKHR::eDefault: return "Default";
       case VideoEncodeRateControlModeFlagBitsKHR::eDisabled: return "Disabled";
-      case VideoEncodeRateControlModeFlagBitsKHR::eCbr     : return "Cbr";
-      case VideoEncodeRateControlModeFlagBitsKHR::eVbr     : return "Vbr";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case VideoEncodeRateControlModeFlagBitsKHR::eCbr: return "Cbr";
+      case VideoEncodeRateControlModeFlagBitsKHR::eVbr: return "Vbr";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeFlagBitsKHR )
   {
-    switch ( value )
-    {
-      case VideoEncodeFlagBitsKHR::eIntraRefresh            : return "IntraRefresh";
-      case VideoEncodeFlagBitsKHR::eWithQuantizationDeltaMap: return "WithQuantizationDeltaMap";
-      case VideoEncodeFlagBitsKHR::eWithEmphasisMap         : return "WithEmphasisMap";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
+    return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRateControlFlagBitsKHR )
+  VULKAN_HPP_INLINE std::string to_string( VideoEncodeRateControlFlagBitsKHR )
   {
     return "(void)";
   }
 
   //=== VK_NV_device_diagnostics_config ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceDiagnosticsConfigFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceDiagnosticsConfigFlagBitsNV value )
   {
     switch ( value )
     {
-      case DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderDebugInfo     : return "EnableShaderDebugInfo";
-      case DeviceDiagnosticsConfigFlagBitsNV::eEnableResourceTracking    : return "EnableResourceTracking";
+      case DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderDebugInfo: return "EnableShaderDebugInfo";
+      case DeviceDiagnosticsConfigFlagBitsNV::eEnableResourceTracking: return "EnableResourceTracking";
       case DeviceDiagnosticsConfigFlagBitsNV::eEnableAutomaticCheckpoints: return "EnableAutomaticCheckpoints";
       case DeviceDiagnosticsConfigFlagBitsNV::eEnableShaderErrorReporting: return "EnableShaderErrorReporting";
-      default                                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_QCOM_tile_shading ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TileShadingRenderPassFlagBitsQCOM value )
-  {
-    switch ( value )
-    {
-      case TileShadingRenderPassFlagBitsQCOM::eEnable          : return "Enable";
-      case TileShadingRenderPassFlagBitsQCOM::ePerTileExecution: return "PerTileExecution";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_METAL_EXT )
   //=== VK_EXT_metal_objects ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ExportMetalObjectTypeFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ExportMetalObjectTypeFlagBitsEXT value )
   {
     switch ( value )
     {
-      case ExportMetalObjectTypeFlagBitsEXT::eMetalDevice      : return "MetalDevice";
+      case ExportMetalObjectTypeFlagBitsEXT::eMetalDevice: return "MetalDevice";
       case ExportMetalObjectTypeFlagBitsEXT::eMetalCommandQueue: return "MetalCommandQueue";
-      case ExportMetalObjectTypeFlagBitsEXT::eMetalBuffer      : return "MetalBuffer";
-      case ExportMetalObjectTypeFlagBitsEXT::eMetalTexture     : return "MetalTexture";
-      case ExportMetalObjectTypeFlagBitsEXT::eMetalIosurface   : return "MetalIosurface";
-      case ExportMetalObjectTypeFlagBitsEXT::eMetalSharedEvent : return "MetalSharedEvent";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ExportMetalObjectTypeFlagBitsEXT::eMetalBuffer: return "MetalBuffer";
+      case ExportMetalObjectTypeFlagBitsEXT::eMetalTexture: return "MetalTexture";
+      case ExportMetalObjectTypeFlagBitsEXT::eMetalIosurface: return "MetalIosurface";
+      case ExportMetalObjectTypeFlagBitsEXT::eMetalSharedEvent: return "MetalSharedEvent";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 #endif /*VK_USE_PLATFORM_METAL_EXT*/
 
   //=== VK_EXT_graphics_pipeline_library ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( GraphicsPipelineLibraryFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( GraphicsPipelineLibraryFlagBitsEXT value )
   {
     switch ( value )
     {
-      case GraphicsPipelineLibraryFlagBitsEXT::eVertexInputInterface   : return "VertexInputInterface";
+      case GraphicsPipelineLibraryFlagBitsEXT::eVertexInputInterface: return "VertexInputInterface";
       case GraphicsPipelineLibraryFlagBitsEXT::ePreRasterizationShaders: return "PreRasterizationShaders";
-      case GraphicsPipelineLibraryFlagBitsEXT::eFragmentShader         : return "FragmentShader";
+      case GraphicsPipelineLibraryFlagBitsEXT::eFragmentShader: return "FragmentShader";
       case GraphicsPipelineLibraryFlagBitsEXT::eFragmentOutputInterface: return "FragmentOutputInterface";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_fragment_shading_rate_enums ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FragmentShadingRateNV value )
+  VULKAN_HPP_INLINE std::string to_string( FragmentShadingRateNV value )
   {
     switch ( value )
     {
-      case FragmentShadingRateNV::e1InvocationPerPixel    : return "1InvocationPerPixel";
+      case FragmentShadingRateNV::e1InvocationPerPixel: return "1InvocationPerPixel";
       case FragmentShadingRateNV::e1InvocationPer1X2Pixels: return "1InvocationPer1X2Pixels";
       case FragmentShadingRateNV::e1InvocationPer2X1Pixels: return "1InvocationPer2X1Pixels";
       case FragmentShadingRateNV::e1InvocationPer2X2Pixels: return "1InvocationPer2X2Pixels";
       case FragmentShadingRateNV::e1InvocationPer2X4Pixels: return "1InvocationPer2X4Pixels";
       case FragmentShadingRateNV::e1InvocationPer4X2Pixels: return "1InvocationPer4X2Pixels";
       case FragmentShadingRateNV::e1InvocationPer4X4Pixels: return "1InvocationPer4X4Pixels";
-      case FragmentShadingRateNV::e2InvocationsPerPixel   : return "2InvocationsPerPixel";
-      case FragmentShadingRateNV::e4InvocationsPerPixel   : return "4InvocationsPerPixel";
-      case FragmentShadingRateNV::e8InvocationsPerPixel   : return "8InvocationsPerPixel";
-      case FragmentShadingRateNV::e16InvocationsPerPixel  : return "16InvocationsPerPixel";
-      case FragmentShadingRateNV::eNoInvocations          : return "NoInvocations";
-      default                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FragmentShadingRateNV::e2InvocationsPerPixel: return "2InvocationsPerPixel";
+      case FragmentShadingRateNV::e4InvocationsPerPixel: return "4InvocationsPerPixel";
+      case FragmentShadingRateNV::e8InvocationsPerPixel: return "8InvocationsPerPixel";
+      case FragmentShadingRateNV::e16InvocationsPerPixel: return "16InvocationsPerPixel";
+      case FragmentShadingRateNV::eNoInvocations: return "NoInvocations";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FragmentShadingRateTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( FragmentShadingRateTypeNV value )
   {
     switch ( value )
     {
       case FragmentShadingRateTypeNV::eFragmentSize: return "FragmentSize";
-      case FragmentShadingRateTypeNV::eEnums       : return "Enums";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case FragmentShadingRateTypeNV::eEnums: return "Enums";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_ray_tracing_motion_blur ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMotionInstanceTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMotionInstanceTypeNV value )
   {
     switch ( value )
     {
-      case AccelerationStructureMotionInstanceTypeNV::eStatic      : return "Static";
+      case AccelerationStructureMotionInstanceTypeNV::eStatic: return "Static";
       case AccelerationStructureMotionInstanceTypeNV::eMatrixMotion: return "MatrixMotion";
-      case AccelerationStructureMotionInstanceTypeNV::eSrtMotion   : return "SrtMotion";
-      default                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case AccelerationStructureMotionInstanceTypeNV::eSrtMotion: return "SrtMotion";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMotionInfoFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMotionInfoFlagBitsNV )
   {
     return "(void)";
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccelerationStructureMotionInstanceFlagBitsNV )
+  VULKAN_HPP_INLINE std::string to_string( AccelerationStructureMotionInstanceFlagBitsNV )
   {
     return "(void)";
   }
 
   //=== VK_EXT_image_compression_control ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageCompressionFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ImageCompressionFlagBitsEXT value )
   {
     switch ( value )
     {
-      case ImageCompressionFlagBitsEXT::eDefault          : return "Default";
-      case ImageCompressionFlagBitsEXT::eFixedRateDefault : return "FixedRateDefault";
+      case ImageCompressionFlagBitsEXT::eDefault: return "Default";
+      case ImageCompressionFlagBitsEXT::eFixedRateDefault: return "FixedRateDefault";
       case ImageCompressionFlagBitsEXT::eFixedRateExplicit: return "FixedRateExplicit";
-      case ImageCompressionFlagBitsEXT::eDisabled         : return "Disabled";
-      default                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ImageCompressionFlagBitsEXT::eDisabled: return "Disabled";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageCompressionFixedRateFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ImageCompressionFixedRateFlagBitsEXT value )
   {
     switch ( value )
     {
-      case ImageCompressionFixedRateFlagBitsEXT::eNone : return "None";
-      case ImageCompressionFixedRateFlagBitsEXT::e1Bpc : return "1Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e2Bpc : return "2Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e3Bpc : return "3Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e4Bpc : return "4Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e5Bpc : return "5Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e6Bpc : return "6Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e7Bpc : return "7Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e8Bpc : return "8Bpc";
-      case ImageCompressionFixedRateFlagBitsEXT::e9Bpc : return "9Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::eNone: return "None";
+      case ImageCompressionFixedRateFlagBitsEXT::e1Bpc: return "1Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e2Bpc: return "2Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e3Bpc: return "3Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e4Bpc: return "4Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e5Bpc: return "5Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e6Bpc: return "6Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e7Bpc: return "7Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e8Bpc: return "8Bpc";
+      case ImageCompressionFixedRateFlagBitsEXT::e9Bpc: return "9Bpc";
       case ImageCompressionFixedRateFlagBitsEXT::e10Bpc: return "10Bpc";
       case ImageCompressionFixedRateFlagBitsEXT::e11Bpc: return "11Bpc";
       case ImageCompressionFixedRateFlagBitsEXT::e12Bpc: return "12Bpc";
@@ -9802,40 +8469,40 @@ namespace VULKAN_HPP_NAMESPACE
       case ImageCompressionFixedRateFlagBitsEXT::e22Bpc: return "22Bpc";
       case ImageCompressionFixedRateFlagBitsEXT::e23Bpc: return "23Bpc";
       case ImageCompressionFixedRateFlagBitsEXT::e24Bpc: return "24Bpc";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_device_fault ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceFaultAddressTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceFaultAddressTypeEXT value )
   {
     switch ( value )
     {
-      case DeviceFaultAddressTypeEXT::eNone                     : return "None";
-      case DeviceFaultAddressTypeEXT::eReadInvalid              : return "ReadInvalid";
-      case DeviceFaultAddressTypeEXT::eWriteInvalid             : return "WriteInvalid";
-      case DeviceFaultAddressTypeEXT::eExecuteInvalid           : return "ExecuteInvalid";
+      case DeviceFaultAddressTypeEXT::eNone: return "None";
+      case DeviceFaultAddressTypeEXT::eReadInvalid: return "ReadInvalid";
+      case DeviceFaultAddressTypeEXT::eWriteInvalid: return "WriteInvalid";
+      case DeviceFaultAddressTypeEXT::eExecuteInvalid: return "ExecuteInvalid";
       case DeviceFaultAddressTypeEXT::eInstructionPointerUnknown: return "InstructionPointerUnknown";
       case DeviceFaultAddressTypeEXT::eInstructionPointerInvalid: return "InstructionPointerInvalid";
-      case DeviceFaultAddressTypeEXT::eInstructionPointerFault  : return "InstructionPointerFault";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case DeviceFaultAddressTypeEXT::eInstructionPointerFault: return "InstructionPointerFault";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceFaultVendorBinaryHeaderVersionEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceFaultVendorBinaryHeaderVersionEXT value )
   {
     switch ( value )
     {
       case DeviceFaultVendorBinaryHeaderVersionEXT::eOne: return "One";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_DIRECTFB_EXT )
   //=== VK_EXT_directfb_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DirectFBSurfaceCreateFlagBitsEXT )
+  VULKAN_HPP_INLINE std::string to_string( DirectFBSurfaceCreateFlagBitsEXT )
   {
     return "(void)";
   }
@@ -9843,42 +8510,42 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_device_address_binding_report ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceAddressBindingFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceAddressBindingFlagBitsEXT value )
   {
     switch ( value )
     {
       case DeviceAddressBindingFlagBitsEXT::eInternalObject: return "InternalObject";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DeviceAddressBindingTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( DeviceAddressBindingTypeEXT value )
   {
     switch ( value )
     {
-      case DeviceAddressBindingTypeEXT::eBind  : return "Bind";
+      case DeviceAddressBindingTypeEXT::eBind: return "Bind";
       case DeviceAddressBindingTypeEXT::eUnbind: return "Unbind";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_FUCHSIA )
   //=== VK_FUCHSIA_buffer_collection ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageConstraintsInfoFlagBitsFUCHSIA value )
+  VULKAN_HPP_INLINE std::string to_string( ImageConstraintsInfoFlagBitsFUCHSIA value )
   {
     switch ( value )
     {
-      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadRarely    : return "CpuReadRarely";
-      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadOften     : return "CpuReadOften";
-      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteRarely   : return "CpuWriteRarely";
-      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteOften    : return "CpuWriteOften";
+      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadRarely: return "CpuReadRarely";
+      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuReadOften: return "CpuReadOften";
+      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteRarely: return "CpuWriteRarely";
+      case ImageConstraintsInfoFlagBitsFUCHSIA::eCpuWriteOften: return "CpuWriteOften";
       case ImageConstraintsInfoFlagBitsFUCHSIA::eProtectedOptional: return "ProtectedOptional";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ImageFormatConstraintsFlagBitsFUCHSIA )
+  VULKAN_HPP_INLINE std::string to_string( ImageFormatConstraintsFlagBitsFUCHSIA )
   {
     return "(void)";
   }
@@ -9886,62 +8553,27 @@ namespace VULKAN_HPP_NAMESPACE
 
   //=== VK_EXT_frame_boundary ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( FrameBoundaryFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( FrameBoundaryFlagBitsEXT value )
   {
     switch ( value )
     {
       case FrameBoundaryFlagBitsEXT::eFrameEnd: return "FrameEnd";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_USE_PLATFORM_SCREEN_QNX )
   //=== VK_QNX_screen_surface ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ScreenSurfaceCreateFlagBitsQNX )
+  VULKAN_HPP_INLINE std::string to_string( ScreenSurfaceCreateFlagBitsQNX )
   {
     return "(void)";
   }
 #endif /*VK_USE_PLATFORM_SCREEN_QNX*/
 
-  //=== VK_VALVE_video_encode_rgb_conversion ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRgbModelConversionFlagBitsVALVE value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeRgbModelConversionFlagBitsVALVE::eRgbIdentity  : return "RgbIdentity";
-      case VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcrIdentity: return "YcbcrIdentity";
-      case VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr709     : return "Ycbcr709";
-      case VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr601     : return "Ycbcr601";
-      case VideoEncodeRgbModelConversionFlagBitsVALVE::eYcbcr2020    : return "Ycbcr2020";
-      default                                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRgbRangeCompressionFlagBitsVALVE value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeRgbRangeCompressionFlagBitsVALVE::eFullRange  : return "FullRange";
-      case VideoEncodeRgbRangeCompressionFlagBitsVALVE::eNarrowRange: return "NarrowRange";
-      default                                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeRgbChromaOffsetFlagBitsVALVE value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeRgbChromaOffsetFlagBitsVALVE::eCositedEven: return "CositedEven";
-      case VideoEncodeRgbChromaOffsetFlagBitsVALVE::eMidpoint   : return "Midpoint";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
   //=== VK_EXT_opacity_micromap ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MicromapTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( MicromapTypeEXT value )
   {
     switch ( value )
     {
@@ -9949,1021 +8581,496 @@ namespace VULKAN_HPP_NAMESPACE
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
       case MicromapTypeEXT::eDisplacementMicromapNV: return "DisplacementMicromapNV";
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
-      default: return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BuildMicromapFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( BuildMicromapFlagBitsEXT value )
   {
     switch ( value )
     {
       case BuildMicromapFlagBitsEXT::ePreferFastTrace: return "PreferFastTrace";
       case BuildMicromapFlagBitsEXT::ePreferFastBuild: return "PreferFastBuild";
       case BuildMicromapFlagBitsEXT::eAllowCompaction: return "AllowCompaction";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CopyMicromapModeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( CopyMicromapModeEXT value )
   {
     switch ( value )
     {
-      case CopyMicromapModeEXT::eClone      : return "Clone";
-      case CopyMicromapModeEXT::eSerialize  : return "Serialize";
+      case CopyMicromapModeEXT::eClone: return "Clone";
+      case CopyMicromapModeEXT::eSerialize: return "Serialize";
       case CopyMicromapModeEXT::eDeserialize: return "Deserialize";
-      case CopyMicromapModeEXT::eCompact    : return "Compact";
-      default                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case CopyMicromapModeEXT::eCompact: return "Compact";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MicromapCreateFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( MicromapCreateFlagBitsEXT value )
   {
     switch ( value )
     {
       case MicromapCreateFlagBitsEXT::eDeviceAddressCaptureReplay: return "DeviceAddressCaptureReplay";
-      default                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BuildMicromapModeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( BuildMicromapModeEXT value )
   {
     switch ( value )
     {
       case BuildMicromapModeEXT::eBuild: return "Build";
-      default                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpacityMicromapFormatEXT value )
+  VULKAN_HPP_INLINE std::string to_string( OpacityMicromapFormatEXT value )
   {
     switch ( value )
     {
       case OpacityMicromapFormatEXT::e2State: return "2State";
       case OpacityMicromapFormatEXT::e4State: return "4State";
-      default                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpacityMicromapSpecialIndexEXT value )
+  VULKAN_HPP_INLINE std::string to_string( OpacityMicromapSpecialIndexEXT value )
   {
     switch ( value )
     {
-      case OpacityMicromapSpecialIndexEXT::eFullyTransparent                       : return "FullyTransparent";
-      case OpacityMicromapSpecialIndexEXT::eFullyOpaque                            : return "FullyOpaque";
-      case OpacityMicromapSpecialIndexEXT::eFullyUnknownTransparent                : return "FullyUnknownTransparent";
-      case OpacityMicromapSpecialIndexEXT::eFullyUnknownOpaque                     : return "FullyUnknownOpaque";
-      case OpacityMicromapSpecialIndexEXT::eClusterGeometryDisableOpacityMicromapNV: return "ClusterGeometryDisableOpacityMicromapNV";
-      default                                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case OpacityMicromapSpecialIndexEXT::eFullyTransparent: return "FullyTransparent";
+      case OpacityMicromapSpecialIndexEXT::eFullyOpaque: return "FullyOpaque";
+      case OpacityMicromapSpecialIndexEXT::eFullyUnknownTransparent: return "FullyUnknownTransparent";
+      case OpacityMicromapSpecialIndexEXT::eFullyUnknownOpaque: return "FullyUnknownOpaque";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
   //=== VK_NV_displacement_micromap ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplacementMicromapFormatNV value )
+  VULKAN_HPP_INLINE std::string to_string( DisplacementMicromapFormatNV value )
   {
     switch ( value )
     {
-      case DisplacementMicromapFormatNV::e64Triangles64Bytes   : return "64Triangles64Bytes";
-      case DisplacementMicromapFormatNV::e256Triangles128Bytes : return "256Triangles128Bytes";
+      case DisplacementMicromapFormatNV::e64Triangles64Bytes: return "64Triangles64Bytes";
+      case DisplacementMicromapFormatNV::e256Triangles128Bytes: return "256Triangles128Bytes";
       case DisplacementMicromapFormatNV::e1024Triangles128Bytes: return "1024Triangles128Bytes";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_ARM_scheduling_controls ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PhysicalDeviceSchedulingControlsFlagBitsARM value )
+  VULKAN_HPP_INLINE std::string to_string( PhysicalDeviceSchedulingControlsFlagBitsARM value )
   {
     switch ( value )
     {
       case PhysicalDeviceSchedulingControlsFlagBitsARM::eShaderCoreCount: return "ShaderCoreCount";
-      default                                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  //=== VK_NV_ray_tracing_linear_swept_spheres ===
+  //=== VK_NV_memory_decompression ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RayTracingLssIndexingModeNV value )
+  VULKAN_HPP_INLINE std::string to_string( MemoryDecompressionMethodFlagBitsNV value )
   {
     switch ( value )
     {
-      case RayTracingLssIndexingModeNV::eList      : return "List";
-      case RayTracingLssIndexingModeNV::eSuccessive: return "Successive";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RayTracingLssPrimitiveEndCapsModeNV value )
-  {
-    switch ( value )
-    {
-      case RayTracingLssPrimitiveEndCapsModeNV::eNone   : return "None";
-      case RayTracingLssPrimitiveEndCapsModeNV::eChained: return "Chained";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case MemoryDecompressionMethodFlagBitsNV::eGdeflate10: return "Gdeflate10";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_subpass_merge_feedback ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SubpassMergeStatusEXT value )
+  VULKAN_HPP_INLINE std::string to_string( SubpassMergeStatusEXT value )
   {
     switch ( value )
     {
-      case SubpassMergeStatusEXT::eMerged                              : return "Merged";
-      case SubpassMergeStatusEXT::eDisallowed                          : return "Disallowed";
-      case SubpassMergeStatusEXT::eNotMergedSideEffects                : return "NotMergedSideEffects";
-      case SubpassMergeStatusEXT::eNotMergedSamplesMismatch            : return "NotMergedSamplesMismatch";
-      case SubpassMergeStatusEXT::eNotMergedViewsMismatch              : return "NotMergedViewsMismatch";
-      case SubpassMergeStatusEXT::eNotMergedAliasing                   : return "NotMergedAliasing";
-      case SubpassMergeStatusEXT::eNotMergedDependencies               : return "NotMergedDependencies";
+      case SubpassMergeStatusEXT::eMerged: return "Merged";
+      case SubpassMergeStatusEXT::eDisallowed: return "Disallowed";
+      case SubpassMergeStatusEXT::eNotMergedSideEffects: return "NotMergedSideEffects";
+      case SubpassMergeStatusEXT::eNotMergedSamplesMismatch: return "NotMergedSamplesMismatch";
+      case SubpassMergeStatusEXT::eNotMergedViewsMismatch: return "NotMergedViewsMismatch";
+      case SubpassMergeStatusEXT::eNotMergedAliasing: return "NotMergedAliasing";
+      case SubpassMergeStatusEXT::eNotMergedDependencies: return "NotMergedDependencies";
       case SubpassMergeStatusEXT::eNotMergedIncompatibleInputAttachment: return "NotMergedIncompatibleInputAttachment";
-      case SubpassMergeStatusEXT::eNotMergedTooManyAttachments         : return "NotMergedTooManyAttachments";
-      case SubpassMergeStatusEXT::eNotMergedInsufficientStorage        : return "NotMergedInsufficientStorage";
-      case SubpassMergeStatusEXT::eNotMergedDepthStencilCount          : return "NotMergedDepthStencilCount";
-      case SubpassMergeStatusEXT::eNotMergedResolveAttachmentReuse     : return "NotMergedResolveAttachmentReuse";
-      case SubpassMergeStatusEXT::eNotMergedSingleSubpass              : return "NotMergedSingleSubpass";
-      case SubpassMergeStatusEXT::eNotMergedUnspecified                : return "NotMergedUnspecified";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case SubpassMergeStatusEXT::eNotMergedTooManyAttachments: return "NotMergedTooManyAttachments";
+      case SubpassMergeStatusEXT::eNotMergedInsufficientStorage: return "NotMergedInsufficientStorage";
+      case SubpassMergeStatusEXT::eNotMergedDepthStencilCount: return "NotMergedDepthStencilCount";
+      case SubpassMergeStatusEXT::eNotMergedResolveAttachmentReuse: return "NotMergedResolveAttachmentReuse";
+      case SubpassMergeStatusEXT::eNotMergedSingleSubpass: return "NotMergedSingleSubpass";
+      case SubpassMergeStatusEXT::eNotMergedUnspecified: return "NotMergedUnspecified";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_LUNARG_direct_driver_loading ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DirectDriverLoadingModeLUNARG value )
+  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingModeLUNARG value )
   {
     switch ( value )
     {
       case DirectDriverLoadingModeLUNARG::eExclusive: return "Exclusive";
       case DirectDriverLoadingModeLUNARG::eInclusive: return "Inclusive";
-      default                                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DirectDriverLoadingFlagBitsLUNARG )
+  VULKAN_HPP_INLINE std::string to_string( DirectDriverLoadingFlagBitsLUNARG )
   {
     return "(void)";
   }
 
-  //=== VK_ARM_tensors ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TensorCreateFlagBitsARM value )
-  {
-    switch ( value )
-    {
-      case TensorCreateFlagBitsARM::eMutableFormat                : return "MutableFormat";
-      case TensorCreateFlagBitsARM::eProtected                    : return "Protected";
-      case TensorCreateFlagBitsARM::eDescriptorBufferCaptureReplay: return "DescriptorBufferCaptureReplay";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TensorViewCreateFlagBitsARM value )
-  {
-    switch ( value )
-    {
-      case TensorViewCreateFlagBitsARM::eDescriptorBufferCaptureReplay: return "DescriptorBufferCaptureReplay";
-      default                                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TensorUsageFlagBitsARM value )
-  {
-    switch ( value )
-    {
-      case TensorUsageFlagBitsARM::eShader       : return "Shader";
-      case TensorUsageFlagBitsARM::eTransferSrc  : return "TransferSrc";
-      case TensorUsageFlagBitsARM::eTransferDst  : return "TransferDst";
-      case TensorUsageFlagBitsARM::eImageAliasing: return "ImageAliasing";
-      case TensorUsageFlagBitsARM::eDataGraph    : return "DataGraph";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TensorTilingARM value )
-  {
-    switch ( value )
-    {
-      case TensorTilingARM::eOptimal: return "Optimal";
-      case TensorTilingARM::eLinear : return "Linear";
-      default                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
   //=== VK_NV_optical_flow ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowUsageFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowUsageFlagBitsNV value )
   {
     switch ( value )
     {
-      case OpticalFlowUsageFlagBitsNV::eUnknown   : return "Unknown";
-      case OpticalFlowUsageFlagBitsNV::eInput     : return "Input";
-      case OpticalFlowUsageFlagBitsNV::eOutput    : return "Output";
-      case OpticalFlowUsageFlagBitsNV::eHint      : return "Hint";
-      case OpticalFlowUsageFlagBitsNV::eCost      : return "Cost";
+      case OpticalFlowUsageFlagBitsNV::eUnknown: return "Unknown";
+      case OpticalFlowUsageFlagBitsNV::eInput: return "Input";
+      case OpticalFlowUsageFlagBitsNV::eOutput: return "Output";
+      case OpticalFlowUsageFlagBitsNV::eHint: return "Hint";
+      case OpticalFlowUsageFlagBitsNV::eCost: return "Cost";
       case OpticalFlowUsageFlagBitsNV::eGlobalFlow: return "GlobalFlow";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowGridSizeFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowGridSizeFlagBitsNV value )
   {
     switch ( value )
     {
       case OpticalFlowGridSizeFlagBitsNV::eUnknown: return "Unknown";
-      case OpticalFlowGridSizeFlagBitsNV::e1X1    : return "1X1";
-      case OpticalFlowGridSizeFlagBitsNV::e2X2    : return "2X2";
-      case OpticalFlowGridSizeFlagBitsNV::e4X4    : return "4X4";
-      case OpticalFlowGridSizeFlagBitsNV::e8X8    : return "8X8";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case OpticalFlowGridSizeFlagBitsNV::e1X1: return "1X1";
+      case OpticalFlowGridSizeFlagBitsNV::e2X2: return "2X2";
+      case OpticalFlowGridSizeFlagBitsNV::e4X4: return "4X4";
+      case OpticalFlowGridSizeFlagBitsNV::e8X8: return "8X8";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowPerformanceLevelNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowPerformanceLevelNV value )
   {
     switch ( value )
     {
       case OpticalFlowPerformanceLevelNV::eUnknown: return "Unknown";
-      case OpticalFlowPerformanceLevelNV::eSlow   : return "Slow";
-      case OpticalFlowPerformanceLevelNV::eMedium : return "Medium";
-      case OpticalFlowPerformanceLevelNV::eFast   : return "Fast";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case OpticalFlowPerformanceLevelNV::eSlow: return "Slow";
+      case OpticalFlowPerformanceLevelNV::eMedium: return "Medium";
+      case OpticalFlowPerformanceLevelNV::eFast: return "Fast";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowSessionBindingPointNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowSessionBindingPointNV value )
   {
     switch ( value )
     {
-      case OpticalFlowSessionBindingPointNV::eUnknown           : return "Unknown";
-      case OpticalFlowSessionBindingPointNV::eInput             : return "Input";
-      case OpticalFlowSessionBindingPointNV::eReference         : return "Reference";
-      case OpticalFlowSessionBindingPointNV::eHint              : return "Hint";
-      case OpticalFlowSessionBindingPointNV::eFlowVector        : return "FlowVector";
+      case OpticalFlowSessionBindingPointNV::eUnknown: return "Unknown";
+      case OpticalFlowSessionBindingPointNV::eInput: return "Input";
+      case OpticalFlowSessionBindingPointNV::eReference: return "Reference";
+      case OpticalFlowSessionBindingPointNV::eHint: return "Hint";
+      case OpticalFlowSessionBindingPointNV::eFlowVector: return "FlowVector";
       case OpticalFlowSessionBindingPointNV::eBackwardFlowVector: return "BackwardFlowVector";
-      case OpticalFlowSessionBindingPointNV::eCost              : return "Cost";
-      case OpticalFlowSessionBindingPointNV::eBackwardCost      : return "BackwardCost";
-      case OpticalFlowSessionBindingPointNV::eGlobalFlow        : return "GlobalFlow";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case OpticalFlowSessionBindingPointNV::eCost: return "Cost";
+      case OpticalFlowSessionBindingPointNV::eBackwardCost: return "BackwardCost";
+      case OpticalFlowSessionBindingPointNV::eGlobalFlow: return "GlobalFlow";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowSessionCreateFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowSessionCreateFlagBitsNV value )
   {
     switch ( value )
     {
-      case OpticalFlowSessionCreateFlagBitsNV::eEnableHint      : return "EnableHint";
-      case OpticalFlowSessionCreateFlagBitsNV::eEnableCost      : return "EnableCost";
+      case OpticalFlowSessionCreateFlagBitsNV::eEnableHint: return "EnableHint";
+      case OpticalFlowSessionCreateFlagBitsNV::eEnableCost: return "EnableCost";
       case OpticalFlowSessionCreateFlagBitsNV::eEnableGlobalFlow: return "EnableGlobalFlow";
-      case OpticalFlowSessionCreateFlagBitsNV::eAllowRegions    : return "AllowRegions";
-      case OpticalFlowSessionCreateFlagBitsNV::eBothDirections  : return "BothDirections";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case OpticalFlowSessionCreateFlagBitsNV::eAllowRegions: return "AllowRegions";
+      case OpticalFlowSessionCreateFlagBitsNV::eBothDirections: return "BothDirections";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OpticalFlowExecuteFlagBitsNV value )
+  VULKAN_HPP_INLINE std::string to_string( OpticalFlowExecuteFlagBitsNV value )
   {
     switch ( value )
     {
       case OpticalFlowExecuteFlagBitsNV::eDisableTemporalHints: return "DisableTemporalHints";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  //=== VK_AMD_anti_lag ===
+  //=== VK_KHR_maintenance5 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AntiLagModeAMD value )
+  VULKAN_HPP_INLINE std::string to_string( PipelineCreateFlagBits2KHR value )
   {
     switch ( value )
     {
-      case AntiLagModeAMD::eDriverControl: return "DriverControl";
-      case AntiLagModeAMD::eOn           : return "On";
-      case AntiLagModeAMD::eOff          : return "Off";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case PipelineCreateFlagBits2KHR::eDisableOptimization: return "DisableOptimization";
+      case PipelineCreateFlagBits2KHR::eAllowDerivatives: return "AllowDerivatives";
+      case PipelineCreateFlagBits2KHR::eDerivative: return "Derivative";
+      case PipelineCreateFlagBits2KHR::eEnableLegacyDitheringEXT: return "EnableLegacyDitheringEXT";
+      case PipelineCreateFlagBits2KHR::eViewIndexFromDeviceIndex: return "ViewIndexFromDeviceIndex";
+      case PipelineCreateFlagBits2KHR::eDispatchBase: return "DispatchBase";
+      case PipelineCreateFlagBits2KHR::eDeferCompileNV: return "DeferCompileNV";
+      case PipelineCreateFlagBits2KHR::eCaptureStatistics: return "CaptureStatistics";
+      case PipelineCreateFlagBits2KHR::eCaptureInternalRepresentations: return "CaptureInternalRepresentations";
+      case PipelineCreateFlagBits2KHR::eFailOnPipelineCompileRequired: return "FailOnPipelineCompileRequired";
+      case PipelineCreateFlagBits2KHR::eEarlyReturnOnFailure: return "EarlyReturnOnFailure";
+      case PipelineCreateFlagBits2KHR::eLinkTimeOptimizationEXT: return "LinkTimeOptimizationEXT";
+      case PipelineCreateFlagBits2KHR::eRetainLinkTimeOptimizationInfoEXT: return "RetainLinkTimeOptimizationInfoEXT";
+      case PipelineCreateFlagBits2KHR::eLibrary: return "Library";
+      case PipelineCreateFlagBits2KHR::eRayTracingSkipTriangles: return "RayTracingSkipTriangles";
+      case PipelineCreateFlagBits2KHR::eRayTracingSkipAabbs: return "RayTracingSkipAabbs";
+      case PipelineCreateFlagBits2KHR::eRayTracingNoNullAnyHitShaders: return "RayTracingNoNullAnyHitShaders";
+      case PipelineCreateFlagBits2KHR::eRayTracingNoNullClosestHitShaders: return "RayTracingNoNullClosestHitShaders";
+      case PipelineCreateFlagBits2KHR::eRayTracingNoNullMissShaders: return "RayTracingNoNullMissShaders";
+      case PipelineCreateFlagBits2KHR::eRayTracingNoNullIntersectionShaders: return "RayTracingNoNullIntersectionShaders";
+      case PipelineCreateFlagBits2KHR::eRayTracingShaderGroupHandleCaptureReplay: return "RayTracingShaderGroupHandleCaptureReplay";
+      case PipelineCreateFlagBits2KHR::eIndirectBindableNV: return "IndirectBindableNV";
+      case PipelineCreateFlagBits2KHR::eRayTracingAllowMotionNV: return "RayTracingAllowMotionNV";
+      case PipelineCreateFlagBits2KHR::eRenderingFragmentShadingRateAttachment: return "RenderingFragmentShadingRateAttachment";
+      case PipelineCreateFlagBits2KHR::eRenderingFragmentDensityMapAttachmentEXT: return "RenderingFragmentDensityMapAttachmentEXT";
+      case PipelineCreateFlagBits2KHR::eRayTracingOpacityMicromapEXT: return "RayTracingOpacityMicromapEXT";
+      case PipelineCreateFlagBits2KHR::eColorAttachmentFeedbackLoopEXT: return "ColorAttachmentFeedbackLoopEXT";
+      case PipelineCreateFlagBits2KHR::eDepthStencilAttachmentFeedbackLoopEXT: return "DepthStencilAttachmentFeedbackLoopEXT";
+      case PipelineCreateFlagBits2KHR::eNoProtectedAccessEXT: return "NoProtectedAccessEXT";
+      case PipelineCreateFlagBits2KHR::eProtectedAccessOnlyEXT: return "ProtectedAccessOnlyEXT";
+      case PipelineCreateFlagBits2KHR::eRayTracingDisplacementMicromapNV: return "RayTracingDisplacementMicromapNV";
+      case PipelineCreateFlagBits2KHR::eDescriptorBufferEXT: return "DescriptorBufferEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AntiLagStageAMD value )
+  VULKAN_HPP_INLINE std::string to_string( BufferUsageFlagBits2KHR value )
   {
     switch ( value )
     {
-      case AntiLagStageAMD::eInput  : return "Input";
-      case AntiLagStageAMD::ePresent: return "Present";
-      default                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
+      case BufferUsageFlagBits2KHR::eTransferSrc: return "TransferSrc";
+      case BufferUsageFlagBits2KHR::eTransferDst: return "TransferDst";
+      case BufferUsageFlagBits2KHR::eUniformTexelBuffer: return "UniformTexelBuffer";
+      case BufferUsageFlagBits2KHR::eStorageTexelBuffer: return "StorageTexelBuffer";
+      case BufferUsageFlagBits2KHR::eUniformBuffer: return "UniformBuffer";
+      case BufferUsageFlagBits2KHR::eStorageBuffer: return "StorageBuffer";
+      case BufferUsageFlagBits2KHR::eIndexBuffer: return "IndexBuffer";
+      case BufferUsageFlagBits2KHR::eVertexBuffer: return "VertexBuffer";
+      case BufferUsageFlagBits2KHR::eIndirectBuffer: return "IndirectBuffer";
 #if defined( VK_ENABLE_BETA_EXTENSIONS )
-  //=== VK_AMDX_dense_geometry_format ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CompressedTriangleFormatAMDX value )
-  {
-    switch ( value )
-    {
-      case CompressedTriangleFormatAMDX::eDgf1: return "Dgf1";
-      default                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case BufferUsageFlagBits2KHR::eExecutionGraphScratchAMDX: return "ExecutionGraphScratchAMDX";
+#endif /*VK_ENABLE_BETA_EXTENSIONS*/
+      case BufferUsageFlagBits2KHR::eConditionalRenderingEXT: return "ConditionalRenderingEXT";
+      case BufferUsageFlagBits2KHR::eShaderBindingTable: return "ShaderBindingTable";
+      case BufferUsageFlagBits2KHR::eTransformFeedbackBufferEXT: return "TransformFeedbackBufferEXT";
+      case BufferUsageFlagBits2KHR::eTransformFeedbackCounterBufferEXT: return "TransformFeedbackCounterBufferEXT";
+      case BufferUsageFlagBits2KHR::eVideoDecodeSrc: return "VideoDecodeSrc";
+      case BufferUsageFlagBits2KHR::eVideoDecodeDst: return "VideoDecodeDst";
+      case BufferUsageFlagBits2KHR::eVideoEncodeDst: return "VideoEncodeDst";
+      case BufferUsageFlagBits2KHR::eVideoEncodeSrc: return "VideoEncodeSrc";
+      case BufferUsageFlagBits2KHR::eShaderDeviceAddress: return "ShaderDeviceAddress";
+      case BufferUsageFlagBits2KHR::eAccelerationStructureBuildInputReadOnly: return "AccelerationStructureBuildInputReadOnly";
+      case BufferUsageFlagBits2KHR::eAccelerationStructureStorage: return "AccelerationStructureStorage";
+      case BufferUsageFlagBits2KHR::eSamplerDescriptorBufferEXT: return "SamplerDescriptorBufferEXT";
+      case BufferUsageFlagBits2KHR::eResourceDescriptorBufferEXT: return "ResourceDescriptorBufferEXT";
+      case BufferUsageFlagBits2KHR::ePushDescriptorsDescriptorBufferEXT: return "PushDescriptorsDescriptorBufferEXT";
+      case BufferUsageFlagBits2KHR::eMicromapBuildInputReadOnlyEXT: return "MicromapBuildInputReadOnlyEXT";
+      case BufferUsageFlagBits2KHR::eMicromapStorageEXT: return "MicromapStorageEXT";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
-#endif /*VK_ENABLE_BETA_EXTENSIONS*/
 
   //=== VK_EXT_shader_object ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderCreateFlagBitsEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderCreateFlagBitsEXT value )
   {
     switch ( value )
     {
-      case ShaderCreateFlagBitsEXT::eLinkStage                    : return "LinkStage";
-      case ShaderCreateFlagBitsEXT::eAllowVaryingSubgroupSize     : return "AllowVaryingSubgroupSize";
-      case ShaderCreateFlagBitsEXT::eRequireFullSubgroups         : return "RequireFullSubgroups";
-      case ShaderCreateFlagBitsEXT::eNoTaskShader                 : return "NoTaskShader";
-      case ShaderCreateFlagBitsEXT::eDispatchBase                 : return "DispatchBase";
+      case ShaderCreateFlagBitsEXT::eLinkStage: return "LinkStage";
+      case ShaderCreateFlagBitsEXT::eAllowVaryingSubgroupSize: return "AllowVaryingSubgroupSize";
+      case ShaderCreateFlagBitsEXT::eRequireFullSubgroups: return "RequireFullSubgroups";
+      case ShaderCreateFlagBitsEXT::eNoTaskShader: return "NoTaskShader";
+      case ShaderCreateFlagBitsEXT::eDispatchBase: return "DispatchBase";
       case ShaderCreateFlagBitsEXT::eFragmentShadingRateAttachment: return "FragmentShadingRateAttachment";
-      case ShaderCreateFlagBitsEXT::eFragmentDensityMapAttachment : return "FragmentDensityMapAttachment";
-      case ShaderCreateFlagBitsEXT::eIndirectBindable             : return "IndirectBindable";
-      case ShaderCreateFlagBitsEXT::e64BitIndexing                : return "64BitIndexing";
-      default                                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ShaderCreateFlagBitsEXT::eFragmentDensityMapAttachment: return "FragmentDensityMapAttachment";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ShaderCodeTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( ShaderCodeTypeEXT value )
   {
     switch ( value )
     {
       case ShaderCodeTypeEXT::eBinary: return "Binary";
-      case ShaderCodeTypeEXT::eSpirv : return "Spirv";
-      default                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ShaderCodeTypeEXT::eSpirv: return "Spirv";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  //=== VK_KHR_surface_maintenance1 ===
+  //=== VK_NV_ray_tracing_invocation_reorder ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PresentScalingFlagBitsKHR value )
+  VULKAN_HPP_INLINE std::string to_string( RayTracingInvocationReorderModeNV value )
   {
     switch ( value )
     {
-      case PresentScalingFlagBitsKHR::eOneToOne          : return "OneToOne";
-      case PresentScalingFlagBitsKHR::eAspectRatioStretch: return "AspectRatioStretch";
-      case PresentScalingFlagBitsKHR::eStretch           : return "Stretch";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PresentGravityFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case PresentGravityFlagBitsKHR::eMin     : return "Min";
-      case PresentGravityFlagBitsKHR::eMax     : return "Max";
-      case PresentGravityFlagBitsKHR::eCentered: return "Centered";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_NV_cooperative_vector ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CooperativeVectorMatrixLayoutNV value )
-  {
-    switch ( value )
-    {
-      case CooperativeVectorMatrixLayoutNV::eRowMajor          : return "RowMajor";
-      case CooperativeVectorMatrixLayoutNV::eColumnMajor       : return "ColumnMajor";
-      case CooperativeVectorMatrixLayoutNV::eInferencingOptimal: return "InferencingOptimal";
-      case CooperativeVectorMatrixLayoutNV::eTrainingOptimal   : return "TrainingOptimal";
-      default                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ComponentTypeKHR value )
-  {
-    switch ( value )
-    {
-      case ComponentTypeKHR::eFloat16      : return "Float16";
-      case ComponentTypeKHR::eFloat32      : return "Float32";
-      case ComponentTypeKHR::eFloat64      : return "Float64";
-      case ComponentTypeKHR::eSint8        : return "Sint8";
-      case ComponentTypeKHR::eSint16       : return "Sint16";
-      case ComponentTypeKHR::eSint32       : return "Sint32";
-      case ComponentTypeKHR::eSint64       : return "Sint64";
-      case ComponentTypeKHR::eUint8        : return "Uint8";
-      case ComponentTypeKHR::eUint16       : return "Uint16";
-      case ComponentTypeKHR::eUint32       : return "Uint32";
-      case ComponentTypeKHR::eUint64       : return "Uint64";
-      case ComponentTypeKHR::eBfloat16     : return "Bfloat16";
-      case ComponentTypeKHR::eSint8PackedNV: return "Sint8PackedNV";
-      case ComponentTypeKHR::eUint8PackedNV: return "Uint8PackedNV";
-      case ComponentTypeKHR::eFloat8E4M3EXT: return "Float8E4M3EXT";
-      case ComponentTypeKHR::eFloat8E5M2EXT: return "Float8E5M2EXT";
-      default                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case RayTracingInvocationReorderModeNV::eNone: return "None";
+      case RayTracingInvocationReorderModeNV::eReorder: return "Reorder";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_EXT_layer_settings ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( LayerSettingTypeEXT value )
+  VULKAN_HPP_INLINE std::string to_string( LayerSettingTypeEXT value )
   {
     switch ( value )
     {
-      case LayerSettingTypeEXT::eBool32 : return "Bool32";
-      case LayerSettingTypeEXT::eInt32  : return "Int32";
-      case LayerSettingTypeEXT::eInt64  : return "Int64";
-      case LayerSettingTypeEXT::eUint32 : return "Uint32";
-      case LayerSettingTypeEXT::eUint64 : return "Uint64";
+      case LayerSettingTypeEXT::eBool32: return "Bool32";
+      case LayerSettingTypeEXT::eInt32: return "Int32";
+      case LayerSettingTypeEXT::eInt64: return "Int64";
+      case LayerSettingTypeEXT::eUint32: return "Uint32";
+      case LayerSettingTypeEXT::eUint64: return "Uint64";
       case LayerSettingTypeEXT::eFloat32: return "Float32";
       case LayerSettingTypeEXT::eFloat64: return "Float64";
-      case LayerSettingTypeEXT::eString : return "String";
-      default                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case LayerSettingTypeEXT::eString: return "String";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_NV_low_latency2 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( LatencyMarkerNV value )
+  VULKAN_HPP_INLINE std::string to_string( LatencyMarkerNV value )
   {
     switch ( value )
     {
-      case LatencyMarkerNV::eSimulationStart           : return "SimulationStart";
-      case LatencyMarkerNV::eSimulationEnd             : return "SimulationEnd";
-      case LatencyMarkerNV::eRendersubmitStart         : return "RendersubmitStart";
-      case LatencyMarkerNV::eRendersubmitEnd           : return "RendersubmitEnd";
-      case LatencyMarkerNV::ePresentStart              : return "PresentStart";
-      case LatencyMarkerNV::ePresentEnd                : return "PresentEnd";
-      case LatencyMarkerNV::eInputSample               : return "InputSample";
-      case LatencyMarkerNV::eTriggerFlash              : return "TriggerFlash";
+      case LatencyMarkerNV::eSimulationStart: return "SimulationStart";
+      case LatencyMarkerNV::eSimulationEnd: return "SimulationEnd";
+      case LatencyMarkerNV::eRendersubmitStart: return "RendersubmitStart";
+      case LatencyMarkerNV::eRendersubmitEnd: return "RendersubmitEnd";
+      case LatencyMarkerNV::ePresentStart: return "PresentStart";
+      case LatencyMarkerNV::ePresentEnd: return "PresentEnd";
+      case LatencyMarkerNV::eInputSample: return "InputSample";
+      case LatencyMarkerNV::eTriggerFlash: return "TriggerFlash";
       case LatencyMarkerNV::eOutOfBandRendersubmitStart: return "OutOfBandRendersubmitStart";
-      case LatencyMarkerNV::eOutOfBandRendersubmitEnd  : return "OutOfBandRendersubmitEnd";
-      case LatencyMarkerNV::eOutOfBandPresentStart     : return "OutOfBandPresentStart";
-      case LatencyMarkerNV::eOutOfBandPresentEnd       : return "OutOfBandPresentEnd";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case LatencyMarkerNV::eOutOfBandRendersubmitEnd: return "OutOfBandRendersubmitEnd";
+      case LatencyMarkerNV::eOutOfBandPresentStart: return "OutOfBandPresentStart";
+      case LatencyMarkerNV::eOutOfBandPresentEnd: return "OutOfBandPresentEnd";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( OutOfBandQueueTypeNV value )
+  VULKAN_HPP_INLINE std::string to_string( OutOfBandQueueTypeNV value )
   {
     switch ( value )
     {
-      case OutOfBandQueueTypeNV::eRender : return "Render";
+      case OutOfBandQueueTypeNV::eRender: return "Render";
       case OutOfBandQueueTypeNV::ePresent: return "Present";
-      default                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_cooperative_matrix ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ScopeKHR value )
+  VULKAN_HPP_INLINE std::string to_string( ScopeKHR value )
   {
     switch ( value )
     {
-      case ScopeKHR::eDevice     : return "Device";
-      case ScopeKHR::eWorkgroup  : return "Workgroup";
-      case ScopeKHR::eSubgroup   : return "Subgroup";
+      case ScopeKHR::eDevice: return "Device";
+      case ScopeKHR::eWorkgroup: return "Workgroup";
+      case ScopeKHR::eSubgroup: return "Subgroup";
       case ScopeKHR::eQueueFamily: return "QueueFamily";
-      default                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
-  //=== VK_ARM_data_graph ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelineSessionBindPointARM value )
+  VULKAN_HPP_INLINE std::string to_string( ComponentTypeKHR value )
   {
     switch ( value )
     {
-      case DataGraphPipelineSessionBindPointARM::eTransient: return "Transient";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelineSessionBindPointTypeARM value )
-  {
-    switch ( value )
-    {
-      case DataGraphPipelineSessionBindPointTypeARM::eMemory: return "Memory";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelineSessionCreateFlagBitsARM value )
-  {
-    switch ( value )
-    {
-      case DataGraphPipelineSessionCreateFlagBitsARM::eProtected: return "Protected";
-      default                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelinePropertyARM value )
-  {
-    switch ( value )
-    {
-      case DataGraphPipelinePropertyARM::eCreationLog: return "CreationLog";
-      case DataGraphPipelinePropertyARM::eIdentifier : return "Identifier";
-      default                                        : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphPipelineDispatchFlagBitsARM )
-  {
-    return "(void)";
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PhysicalDeviceDataGraphProcessingEngineTypeARM value )
-  {
-    switch ( value )
-    {
-      case PhysicalDeviceDataGraphProcessingEngineTypeARM::eDefault    : return "Default";
-      case PhysicalDeviceDataGraphProcessingEngineTypeARM::eNeuralQCOM : return "NeuralQCOM";
-      case PhysicalDeviceDataGraphProcessingEngineTypeARM::eComputeQCOM: return "ComputeQCOM";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PhysicalDeviceDataGraphOperationTypeARM value )
-  {
-    switch ( value )
-    {
-      case PhysicalDeviceDataGraphOperationTypeARM::eSpirvExtendedInstructionSet: return "SpirvExtendedInstructionSet";
-      case PhysicalDeviceDataGraphOperationTypeARM::eNeuralModelQCOM            : return "NeuralModelQCOM";
-      case PhysicalDeviceDataGraphOperationTypeARM::eBuiltinModelQCOM           : return "BuiltinModelQCOM";
-      default                                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_video_encode_av1 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1PredictionModeKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1PredictionModeKHR::eIntraOnly             : return "IntraOnly";
-      case VideoEncodeAV1PredictionModeKHR::eSingleReference       : return "SingleReference";
-      case VideoEncodeAV1PredictionModeKHR::eUnidirectionalCompound: return "UnidirectionalCompound";
-      case VideoEncodeAV1PredictionModeKHR::eBidirectionalCompound : return "BidirectionalCompound";
-      default                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1RateControlGroupKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1RateControlGroupKHR::eIntra       : return "Intra";
-      case VideoEncodeAV1RateControlGroupKHR::ePredictive  : return "Predictive";
-      case VideoEncodeAV1RateControlGroupKHR::eBipredictive: return "Bipredictive";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1CapabilityFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1CapabilityFlagBitsKHR::ePerRateControlGroupMinMaxQIndex: return "PerRateControlGroupMinMaxQIndex";
-      case VideoEncodeAV1CapabilityFlagBitsKHR::eGenerateObuExtensionHeader     : return "GenerateObuExtensionHeader";
-      case VideoEncodeAV1CapabilityFlagBitsKHR::ePrimaryReferenceCdfOnly        : return "PrimaryReferenceCdfOnly";
-      case VideoEncodeAV1CapabilityFlagBitsKHR::eFrameSizeOverride              : return "FrameSizeOverride";
-      case VideoEncodeAV1CapabilityFlagBitsKHR::eMotionVectorScaling            : return "MotionVectorScaling";
-      case VideoEncodeAV1CapabilityFlagBitsKHR::eCompoundPredictionIntraRefresh : return "CompoundPredictionIntraRefresh";
-      default                                                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1StdFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1StdFlagBitsKHR::eUniformTileSpacingFlagSet: return "UniformTileSpacingFlagSet";
-      case VideoEncodeAV1StdFlagBitsKHR::eSkipModePresentUnset     : return "SkipModePresentUnset";
-      case VideoEncodeAV1StdFlagBitsKHR::ePrimaryRefFrame          : return "PrimaryRefFrame";
-      case VideoEncodeAV1StdFlagBitsKHR::eDeltaQ                   : return "DeltaQ";
-      default                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1SuperblockSizeFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1SuperblockSizeFlagBitsKHR::e64 : return "64";
-      case VideoEncodeAV1SuperblockSizeFlagBitsKHR::e128: return "128";
-      default                                           : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeAV1RateControlFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeAV1RateControlFlagBitsKHR::eRegularGop                : return "RegularGop";
-      case VideoEncodeAV1RateControlFlagBitsKHR::eTemporalLayerPatternDyadic: return "TemporalLayerPatternDyadic";
-      case VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternFlat      : return "ReferencePatternFlat";
-      case VideoEncodeAV1RateControlFlagBitsKHR::eReferencePatternDyadic    : return "ReferencePatternDyadic";
-      default                                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case ComponentTypeKHR::eFloat16: return "Float16";
+      case ComponentTypeKHR::eFloat32: return "Float32";
+      case ComponentTypeKHR::eFloat64: return "Float64";
+      case ComponentTypeKHR::eSint8: return "Sint8";
+      case ComponentTypeKHR::eSint16: return "Sint16";
+      case ComponentTypeKHR::eSint32: return "Sint32";
+      case ComponentTypeKHR::eSint64: return "Sint64";
+      case ComponentTypeKHR::eUint8: return "Uint8";
+      case ComponentTypeKHR::eUint16: return "Uint16";
+      case ComponentTypeKHR::eUint32: return "Uint32";
+      case ComponentTypeKHR::eUint64: return "Uint64";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_QCOM_image_processing2 ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( BlockMatchWindowCompareModeQCOM value )
+  VULKAN_HPP_INLINE std::string to_string( BlockMatchWindowCompareModeQCOM value )
   {
     switch ( value )
     {
       case BlockMatchWindowCompareModeQCOM::eMin: return "Min";
       case BlockMatchWindowCompareModeQCOM::eMax: return "Max";
-      default                                   : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_QCOM_filter_cubic_weights ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( CubicFilterWeightsQCOM value )
+  VULKAN_HPP_INLINE std::string to_string( CubicFilterWeightsQCOM value )
   {
     switch ( value )
     {
-      case CubicFilterWeightsQCOM::eCatmullRom         : return "CatmullRom";
+      case CubicFilterWeightsQCOM::eCatmullRom: return "CatmullRom";
       case CubicFilterWeightsQCOM::eZeroTangentCardinal: return "ZeroTangentCardinal";
-      case CubicFilterWeightsQCOM::eBSpline            : return "BSpline";
-      case CubicFilterWeightsQCOM::eMitchellNetravali  : return "MitchellNetravali";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      case CubicFilterWeightsQCOM::eBSpline: return "BSpline";
+      case CubicFilterWeightsQCOM::eMitchellNetravali: return "MitchellNetravali";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_MSFT_layered_driver ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( LayeredDriverUnderlyingApiMSFT value )
+  VULKAN_HPP_INLINE std::string to_string( LayeredDriverUnderlyingApiMSFT value )
   {
     switch ( value )
     {
-      case LayeredDriverUnderlyingApiMSFT::eNone : return "None";
+      case LayeredDriverUnderlyingApiMSFT::eNone: return "None";
       case LayeredDriverUnderlyingApiMSFT::eD3D12: return "D3D12";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
+    }
+  }
+
+  //=== VK_KHR_line_rasterization ===
+
+  VULKAN_HPP_INLINE std::string to_string( LineRasterizationModeKHR value )
+  {
+    switch ( value )
+    {
+      case LineRasterizationModeKHR::eDefault: return "Default";
+      case LineRasterizationModeKHR::eRectangular: return "Rectangular";
+      case LineRasterizationModeKHR::eBresenham: return "Bresenham";
+      case LineRasterizationModeKHR::eRectangularSmooth: return "RectangularSmooth";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
   //=== VK_KHR_calibrated_timestamps ===
 
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( TimeDomainKHR value )
+  VULKAN_HPP_INLINE std::string to_string( TimeDomainKHR value )
   {
     switch ( value )
     {
-      case TimeDomainKHR::eDevice                 : return "Device";
-      case TimeDomainKHR::eClockMonotonic         : return "ClockMonotonic";
-      case TimeDomainKHR::eClockMonotonicRaw      : return "ClockMonotonicRaw";
+      case TimeDomainKHR::eDevice: return "Device";
+      case TimeDomainKHR::eClockMonotonic: return "ClockMonotonic";
+      case TimeDomainKHR::eClockMonotonicRaw: return "ClockMonotonicRaw";
       case TimeDomainKHR::eQueryPerformanceCounter: return "QueryPerformanceCounter";
-      case TimeDomainKHR::ePresentStageLocalEXT   : return "PresentStageLocalEXT";
-      case TimeDomainKHR::eSwapchainLocalEXT      : return "SwapchainLocalEXT";
-      default                                     : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_copy_memory_indirect ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AddressCopyFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case AddressCopyFlagBitsKHR::eDeviceLocal: return "DeviceLocal";
-      case AddressCopyFlagBitsKHR::eSparse     : return "Sparse";
-      case AddressCopyFlagBitsKHR::eProtected  : return "Protected";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_EXT_memory_decompression ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( MemoryDecompressionMethodFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case MemoryDecompressionMethodFlagBitsEXT::eGdeflate10: return "Gdeflate10";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_NV_display_stereo ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DisplaySurfaceStereoTypeNV value )
-  {
-    switch ( value )
-    {
-      case DisplaySurfaceStereoTypeNV::eNone             : return "None";
-      case DisplaySurfaceStereoTypeNV::eOnboardDin       : return "OnboardDin";
-      case DisplaySurfaceStereoTypeNV::eHdmi3D           : return "Hdmi3D";
-      case DisplaySurfaceStereoTypeNV::eInbandDisplayport: return "InbandDisplayport";
-      default                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_video_encode_intra_refresh ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( VideoEncodeIntraRefreshModeFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case VideoEncodeIntraRefreshModeFlagBitsKHR::eNone               : return "None";
-      case VideoEncodeIntraRefreshModeFlagBitsKHR::ePerPicturePartition: return "PerPicturePartition";
-      case VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockBased         : return "BlockBased";
-      case VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockRowBased      : return "BlockRowBased";
-      case VideoEncodeIntraRefreshModeFlagBitsKHR::eBlockColumnBased   : return "BlockColumnBased";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_maintenance7 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PhysicalDeviceLayeredApiKHR value )
-  {
-    switch ( value )
-    {
-      case PhysicalDeviceLayeredApiKHR::eVulkan  : return "Vulkan";
-      case PhysicalDeviceLayeredApiKHR::eD3D12   : return "D3D12";
-      case PhysicalDeviceLayeredApiKHR::eMetal   : return "Metal";
-      case PhysicalDeviceLayeredApiKHR::eOpengl  : return "Opengl";
-      case PhysicalDeviceLayeredApiKHR::eOpengles: return "Opengles";
-      default                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_NV_cluster_acceleration_structure ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureClusterFlagBitsNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureClusterFlagBitsNV::eAllowDisableOpacityMicromaps: return "AllowDisableOpacityMicromaps";
-      default                                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureGeometryFlagBitsNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureGeometryFlagBitsNV::eCullDisable                : return "CullDisable";
-      case ClusterAccelerationStructureGeometryFlagBitsNV::eNoDuplicateAnyhitInvocation: return "NoDuplicateAnyhitInvocation";
-      case ClusterAccelerationStructureGeometryFlagBitsNV::eOpaque                     : return "Opaque";
-      default                                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureAddressResolutionFlagBitsNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eNone                     : return "None";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstImplicitData: return "IndirectedDstImplicitData";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedScratchData    : return "IndirectedScratchData";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstAddressArray: return "IndirectedDstAddressArray";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedDstSizesArray  : return "IndirectedDstSizesArray";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosArray  : return "IndirectedSrcInfosArray";
-      case ClusterAccelerationStructureAddressResolutionFlagBitsNV::eIndirectedSrcInfosCount  : return "IndirectedSrcInfosCount";
-      default                                                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureIndexFormatFlagBitsNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureIndexFormatFlagBitsNV::e8 : return "8";
-      case ClusterAccelerationStructureIndexFormatFlagBitsNV::e16: return "16";
-      case ClusterAccelerationStructureIndexFormatFlagBitsNV::e32: return "32";
-      default                                                    : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureTypeNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureTypeNV::eClustersBottomLevel    : return "ClustersBottomLevel";
-      case ClusterAccelerationStructureTypeNV::eTriangleCluster        : return "TriangleCluster";
-      case ClusterAccelerationStructureTypeNV::eTriangleClusterTemplate: return "TriangleClusterTemplate";
-      default                                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureOpTypeNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureOpTypeNV::eMoveObjects                 : return "MoveObjects";
-      case ClusterAccelerationStructureOpTypeNV::eBuildClustersBottomLevel    : return "BuildClustersBottomLevel";
-      case ClusterAccelerationStructureOpTypeNV::eBuildTriangleCluster        : return "BuildTriangleCluster";
-      case ClusterAccelerationStructureOpTypeNV::eBuildTriangleClusterTemplate: return "BuildTriangleClusterTemplate";
-      case ClusterAccelerationStructureOpTypeNV::eInstantiateTriangleCluster  : return "InstantiateTriangleCluster";
-      case ClusterAccelerationStructureOpTypeNV::eGetClusterTemplateIndices   : return "GetClusterTemplateIndices";
-      default                                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ClusterAccelerationStructureOpModeNV value )
-  {
-    switch ( value )
-    {
-      case ClusterAccelerationStructureOpModeNV::eImplicitDestinations: return "ImplicitDestinations";
-      case ClusterAccelerationStructureOpModeNV::eExplicitDestinations: return "ExplicitDestinations";
-      case ClusterAccelerationStructureOpModeNV::eComputeSizes        : return "ComputeSizes";
-      default                                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_NV_partitioned_acceleration_structure ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PartitionedAccelerationStructureOpTypeNV value )
-  {
-    switch ( value )
-    {
-      case PartitionedAccelerationStructureOpTypeNV::eWriteInstance            : return "WriteInstance";
-      case PartitionedAccelerationStructureOpTypeNV::eUpdateInstance           : return "UpdateInstance";
-      case PartitionedAccelerationStructureOpTypeNV::eWritePartitionTranslation: return "WritePartitionTranslation";
-      default                                                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PartitionedAccelerationStructureInstanceFlagBitsNV value )
-  {
-    switch ( value )
-    {
-      case PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFacingCullDisable: return "FlagTriangleFacingCullDisable";
-      case PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagTriangleFlipFacing       : return "FlagTriangleFlipFacing";
-      case PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceOpaque              : return "FlagForceOpaque";
-      case PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagForceNoOpaque            : return "FlagForceNoOpaque";
-      case PartitionedAccelerationStructureInstanceFlagBitsNV::eFlagEnableExplicitBoundingBox: return "FlagEnableExplicitBoundingBox";
-      default                                                                                : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_EXT_device_generated_commands ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectCommandsTokenTypeEXT value )
-  {
-    switch ( value )
-    {
-      case IndirectCommandsTokenTypeEXT::eExecutionSet        : return "ExecutionSet";
-      case IndirectCommandsTokenTypeEXT::ePushConstant        : return "PushConstant";
-      case IndirectCommandsTokenTypeEXT::eSequenceIndex       : return "SequenceIndex";
-      case IndirectCommandsTokenTypeEXT::eIndexBuffer         : return "IndexBuffer";
-      case IndirectCommandsTokenTypeEXT::eVertexBuffer        : return "VertexBuffer";
-      case IndirectCommandsTokenTypeEXT::eDrawIndexed         : return "DrawIndexed";
-      case IndirectCommandsTokenTypeEXT::eDraw                : return "Draw";
-      case IndirectCommandsTokenTypeEXT::eDrawIndexedCount    : return "DrawIndexedCount";
-      case IndirectCommandsTokenTypeEXT::eDrawCount           : return "DrawCount";
-      case IndirectCommandsTokenTypeEXT::eDispatch            : return "Dispatch";
-      case IndirectCommandsTokenTypeEXT::eDrawMeshTasksNV     : return "DrawMeshTasksNV";
-      case IndirectCommandsTokenTypeEXT::eDrawMeshTasksCountNV: return "DrawMeshTasksCountNV";
-      case IndirectCommandsTokenTypeEXT::eDrawMeshTasks       : return "DrawMeshTasks";
-      case IndirectCommandsTokenTypeEXT::eDrawMeshTasksCount  : return "DrawMeshTasksCount";
-      case IndirectCommandsTokenTypeEXT::eTraceRays2          : return "TraceRays2";
-      default                                                 : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectExecutionSetInfoTypeEXT value )
-  {
-    switch ( value )
-    {
-      case IndirectExecutionSetInfoTypeEXT::ePipelines    : return "Pipelines";
-      case IndirectExecutionSetInfoTypeEXT::eShaderObjects: return "ShaderObjects";
-      default                                             : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectCommandsLayoutUsageFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case IndirectCommandsLayoutUsageFlagBitsEXT::eExplicitPreprocess: return "ExplicitPreprocess";
-      case IndirectCommandsLayoutUsageFlagBitsEXT::eUnorderedSequences: return "UnorderedSequences";
-      default                                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( IndirectCommandsInputModeFlagBitsEXT value )
-  {
-    switch ( value )
-    {
-      case IndirectCommandsInputModeFlagBitsEXT::eVulkanIndexBuffer: return "VulkanIndexBuffer";
-      case IndirectCommandsInputModeFlagBitsEXT::eDxgiIndexBuffer  : return "DxgiIndexBuffer";
-      default                                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_maintenance8 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( AccessFlagBits3KHR value )
-  {
-    switch ( value )
-    {
-      case AccessFlagBits3KHR::eNone: return "None";
-      default                       : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_EXT_ray_tracing_invocation_reorder ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RayTracingInvocationReorderModeEXT value )
-  {
-    switch ( value )
-    {
-      case RayTracingInvocationReorderModeEXT::eNone   : return "None";
-      case RayTracingInvocationReorderModeEXT::eReorder: return "Reorder";
-      default                                          : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_EXT_depth_clamp_control ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DepthClampModeEXT value )
-  {
-    switch ( value )
-    {
-      case DepthClampModeEXT::eViewportRange   : return "ViewportRange";
-      case DepthClampModeEXT::eUserDefinedRange: return "UserDefinedRange";
-      default                                  : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_maintenance9 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DefaultVertexAttributeValueKHR value )
-  {
-    switch ( value )
-    {
-      case DefaultVertexAttributeValueKHR::eZeroZeroZeroZero: return "ZeroZeroZeroZero";
-      case DefaultVertexAttributeValueKHR::eZeroZeroZeroOne : return "ZeroZeroZeroOne";
-      default                                               : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_surface ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SurfaceCreateFlagBitsOHOS )
-  {
-    return "(void)";
-  }
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-#if defined( VK_USE_PLATFORM_OHOS )
-  //=== VK_OHOS_native_buffer ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( SwapchainImageUsageFlagBitsOHOS value )
-  {
-    switch ( value )
-    {
-      case SwapchainImageUsageFlagBitsOHOS::eShared: return "Shared";
-      default                                      : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-#endif /*VK_USE_PLATFORM_OHOS*/
-
-  //=== VK_ARM_performance_counters_by_region ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( PerformanceCounterDescriptionFlagBitsARM )
-  {
-    return "(void)";
-  }
-
-  //=== VK_QCOM_data_graph_model ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( DataGraphModelCacheTypeQCOM value )
-  {
-    switch ( value )
-    {
-      case DataGraphModelCacheTypeQCOM::eGenericBinary: return "GenericBinary";
-      default                                         : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  //=== VK_KHR_maintenance10 ===
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( RenderingAttachmentFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case RenderingAttachmentFlagBitsKHR::eInputAttachmentFeedback      : return "InputAttachmentFeedback";
-      case RenderingAttachmentFlagBitsKHR::eResolveSkipTransferFunction  : return "ResolveSkipTransferFunction";
-      case RenderingAttachmentFlagBitsKHR::eResolveEnableTransferFunction: return "ResolveEnableTransferFunction";
-      default                                                            : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
-    }
-  }
-
-  VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR_20 std::string to_string( ResolveImageFlagBitsKHR value )
-  {
-    switch ( value )
-    {
-      case ResolveImageFlagBitsKHR::eSkipTransferFunction  : return "SkipTransferFunction";
-      case ResolveImageFlagBitsKHR::eEnableTransferFunction: return "EnableTransferFunction";
-      default                                              : return "invalid ( " + toHexString( static_cast<uint32_t>( value ) ) + " )";
+      default: return "invalid ( " + VULKAN_HPP_NAMESPACE::toHexString( static_cast<uint32_t>( value ) ) + " )";
     }
   }
 
 }  // namespace VULKAN_HPP_NAMESPACE
-
-#if defined( __clang__ ) || defined( __GNUC__ )
-#  pragma GCC diagnostic pop
-#elif defined( _MSC_VER )
-#  pragma warning( pop )
-#endif
-
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_vi.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_vi.h
index 5a52a17d..c145f4a8 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_vi.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_vi.h
@@ -2,7 +2,7 @@
 #define VULKAN_VI_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -34,14 +34,12 @@ typedef struct VkViSurfaceCreateInfoNN {
 typedef VkResult (VKAPI_PTR *PFN_vkCreateViSurfaceNN)(VkInstance instance, const VkViSurfaceCreateInfoNN* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateViSurfaceNN(
     VkInstance                                  instance,
     const VkViSurfaceCreateInfoNN*              pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_video.cppm b/engine/thirdparty/vulkan/include/vulkan/vulkan_video.cppm
deleted file mode 100644
index bcf3e547..00000000
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_video.cppm
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2021-2025 The Khronos Group Inc.
-// SPDX-License-Identifier: Apache-2.0 OR MIT
-//
-
-// This header is generated from the Khronos Vulkan XML API Registry.
-
-module;
-
-#define VULKAN_HPP_CXX_MODULE 1
-
-#include <vulkan/vulkan_hpp_macros.hpp>
-
-#if !defined( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
-#  define VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING \
-    "\n\tThe Vulkan-Hpp C++ named module is experimental. It is subject to change without prior notice.\n" \
-  "\tTo silence this warning, define the VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING macro.\n" \
-  "\tFor feedback, go to: https://github.com/KhronosGroup/Vulkan-Hpp/issues"
-
-VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
-#endif
-
-#include <vulkan/vulkan_video.hpp>
-
-export module vulkan_hpp:video;
-
-export namespace VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE
-{
-
-  //=================
-  //=== CONSTANTs ===
-  //=================
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-  //=== vulkan_video_codec_h264std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CpbCntListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MaxChromaPlanes;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MaxNumListRef;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264NoReferencePicture;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList4X4NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList4X4NumLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList8X8NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList8X8NumLists;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-  //=== vulkan_video_codec_h264std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCountListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-  //=== vulkan_video_codec_h265std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetTileColsListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetTileRowsListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265CpbCntListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxChromaPlanes;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxDeltaPoc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxDpbSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxLongTermPics;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxLongTermRefPicsSps;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxNumListRef;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxShortTermRefPicSets;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265NoReferencePicture;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteCompEntriesListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteComponentsListSize;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList16X16NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList16X16NumLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList32X32NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList32X32NumLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList4X4NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList4X4NumLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList8X8NumElements;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList8X8NumLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SublayersListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-  //=== vulkan_video_codec_h265std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265RefPicSetListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-  //=== vulkan_video_codec_vp9std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9LoopFilterAdjustments;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxRefFrames;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegmentationPredProb;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegmentationTreeProbs;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegments;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9NumRefFrames;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9RefsPerFrame;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9SegLvlMax;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-  //=== vulkan_video_codec_av1std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1GlobalMotionParams;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1LoopFilterAdjustments;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxCdefFilterStrengths;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxLoopFilterStrengths;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumCbPoints;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumCrPoints;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPlanes;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPosChroma;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPosLuma;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumYPoints;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxSegments;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxTileCols;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxTileRows;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1NumRefFrames;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1PrimaryRefNone;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1RefsPerFrame;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SegLvlMax;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SelectIntegerMv;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SelectScreenContentTools;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SkipModeFrames;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1TotalRefsPerFrame;
-#endif
-
-  //=============
-  //=== ENUMs ===
-  //=============
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-  //=== vulkan_video_codec_h264std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264AspectRatioIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CabacInitIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ChromaFormatIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264LevelIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MemMgmtControlOp;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ModificationOfPicNumsIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264NonVclNaluType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PocType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ProfileIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SliceType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264WeightedBipredIdc;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-  //=== vulkan_video_codec_h264std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCount;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-  //=== vulkan_video_codec_h265std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265AspectRatioIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaFormatIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LevelIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PictureType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileIdc;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SliceType;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-  //=== vulkan_video_codec_vp9std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorSpace;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9FrameType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9InterpolationFilter;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Level;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Profile;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ReferenceName;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-  //=== vulkan_video_codec_av1std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ChromaSamplePosition;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorPrimaries;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameRestorationType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Level;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1MatrixCoefficients;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Profile;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ReferenceName;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TransferCharacteristics;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode;
-#endif
-
-  //===============
-  //=== STRUCTS ===
-  //===============
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-  //=== vulkan_video_codec_h264std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureParameterSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PpsFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsVuiFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-  //=== vulkan_video_codec_h264std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ )
-  //=== vulkan_video_codec_h264std_encode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264SliceHeader;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264SliceHeaderFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-  //=== vulkan_video_codec_h265std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LongTermRefPicsSps;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PictureParameterSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PpsFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevelFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSetVui;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSetFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SpsFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SpsVuiFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VideoParameterSet;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VpsFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-  //=== vulkan_video_codec_h265std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ )
-  //=== vulkan_video_codec_h265std_encode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeader;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeaderFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-  //=== vulkan_video_codec_vp9std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfigFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilterFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ )
-  //=== vulkan_video_codec_vp9std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-  //=== vulkan_video_codec_av1std ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfigFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1QuantizationFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeader;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeaderFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ )
-  //=== vulkan_video_codec_av1std_decode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ )
-  //=== vulkan_video_codec_av1std_encode ===
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1DecoderModelInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfoFlags;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfo;
-  using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfoFlags;
-#endif
-
-}  // namespace VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_video.hpp b/engine/thirdparty/vulkan/include/vulkan/vulkan_video.hpp
index 311b0c3e..fb82aa32 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_video.hpp
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_video.hpp
@@ -1,4 +1,4 @@
-// Copyright 2021-2025 The Khronos Group Inc.
+// Copyright 2021-2024 The Khronos Group Inc.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 //
 
@@ -7,52 +7,16 @@
 #ifndef VULKAN_VIDEO_HPP
 #define VULKAN_VIDEO_HPP
 
-// here, we consider include files to be available when __has_include is not defined
-#if !defined( __has_include )
-#  define __has_include( x ) true
-#  define has_include_was_not_defined
-#endif
-
-// clang-format off
+#include <vk_video/vulkan_video_codec_av1std.h>
+#include <vk_video/vulkan_video_codec_av1std_decode.h>
+#include <vk_video/vulkan_video_codec_h264std.h>
+#include <vk_video/vulkan_video_codec_h264std_decode.h>
+#include <vk_video/vulkan_video_codec_h264std_encode.h>
+#include <vk_video/vulkan_video_codec_h265std.h>
+#include <vk_video/vulkan_video_codec_h265std_decode.h>
+#include <vk_video/vulkan_video_codec_h265std_encode.h>
+#include <vk_video/vulkan_video_codecs_common.h>
 #include <vulkan/vulkan.hpp>
-// clang-format on
-
-#if __has_include( <vk_video/vulkan_video_codecs_common.h> )
-#  include <vk_video/vulkan_video_codecs_common.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std.h> )
-#  include <vk_video/vulkan_video_codec_h264std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std_decode.h> )
-#  include <vk_video/vulkan_video_codec_h264std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std_encode.h> )
-#  include <vk_video/vulkan_video_codec_h264std_encode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std.h> )
-#  include <vk_video/vulkan_video_codec_h265std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std_decode.h> )
-#  include <vk_video/vulkan_video_codec_h265std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std_encode.h> )
-#  include <vk_video/vulkan_video_codec_h265std_encode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_vp9std.h> )
-#  include <vk_video/vulkan_video_codec_vp9std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_vp9std_decode.h> )
-#  include <vk_video/vulkan_video_codec_vp9std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std.h> )
-#  include <vk_video/vulkan_video_codec_av1std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std_decode.h> )
-#  include <vk_video/vulkan_video_codec_av1std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std_encode.h> )
-#  include <vk_video/vulkan_video_codec_av1std_encode.h>
-#endif
 
 #if !defined( VULKAN_HPP_VIDEO_NAMESPACE )
 #  define VULKAN_HPP_VIDEO_NAMESPACE video
@@ -63,101 +27,10 @@ namespace VULKAN_HPP_NAMESPACE
   namespace VULKAN_HPP_VIDEO_NAMESPACE
   {
 
-    //=================
-    //=== CONSTANTs ===
-    //=================
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-    //=== vulkan_video_codec_h264std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264CpbCntListSize            = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxChromaPlanes           = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxNumListRef             = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  H264NoReferencePicture        = 0xFF;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumElements = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumLists    = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumElements = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumLists    = 6;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-    //=== vulkan_video_codec_h264std_decode ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH264FieldOrderCountListSize = 2;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-    //=== vulkan_video_codec_h265std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetListSize              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileColsListSize      = 19;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileRowsListSize      = 21;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265CpbCntListSize                      = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxChromaPlanes                     = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDeltaPoc                         = 48;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDpbSize                          = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermPics                     = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermRefPicsSps               = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxNumListRef                       = 15;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxShortTermRefPicSets              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  H265NoReferencePicture                  = 0xFF;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteComponentsListSize  = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteCompEntriesListSize = 128;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumElements         = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumLists            = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumElements         = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumLists            = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumElements           = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumLists              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumElements           = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumLists              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265SublayersListSize                   = 7;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-    //=== vulkan_video_codec_h265std_decode ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH265RefPicSetListSize = 8;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9LoopFilterAdjustments    = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxRefFrames             = 4;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationPredProb  = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationTreeProbs = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegments              = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9NumRefFrames             = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9RefsPerFrame             = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9SegLvlMax                = 4;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-    //=== vulkan_video_codec_av1std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1GlobalMotionParams       = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1LoopFilterAdjustments    = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxCdefFilterStrengths   = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxLoopFilterStrengths   = 4;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCbPoints           = 10;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCrPoints           = 10;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPlanes             = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosChroma          = 25;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosLuma            = 24;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumYPoints            = 14;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxSegments              = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileCols              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileRows              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1NumRefFrames             = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  Av1PrimaryRefNone           = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1RefsPerFrame             = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SegLvlMax                = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  Av1SelectIntegerMv          = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SelectScreenContentTools = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SkipModeFrames           = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1TotalRefsPerFrame        = 8;
-#endif
-
     //=============
     //=== ENUMs ===
     //=============
 
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
     //=== vulkan_video_codec_h264std ===
 
     enum class H264ChromaFormatIdc
@@ -306,9 +179,7 @@ namespace VULKAN_HPP_NAMESPACE
       ePrecoded      = STD_VIDEO_H264_NON_VCL_NALU_TYPE_PRECODED,
       eInvalid       = STD_VIDEO_H264_NON_VCL_NALU_TYPE_INVALID
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
     //=== vulkan_video_codec_h264std_decode ===
 
     enum class DecodeH264FieldOrderCount
@@ -317,9 +188,7 @@ namespace VULKAN_HPP_NAMESPACE
       eBottom  = STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_BOTTOM,
       eInvalid = STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_INVALID
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
     //=== vulkan_video_codec_h265std ===
 
     enum class H265ChromaFormatIdc
@@ -398,80 +267,7 @@ namespace VULKAN_HPP_NAMESPACE
       eExtendedSar = STD_VIDEO_H265_ASPECT_RATIO_IDC_EXTENDED_SAR,
       eInvalid     = STD_VIDEO_H265_ASPECT_RATIO_IDC_INVALID
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
-
-    enum class VP9Profile
-    {
-      e0       = STD_VIDEO_VP9_PROFILE_0,
-      e1       = STD_VIDEO_VP9_PROFILE_1,
-      e2       = STD_VIDEO_VP9_PROFILE_2,
-      e3       = STD_VIDEO_VP9_PROFILE_3,
-      eInvalid = STD_VIDEO_VP9_PROFILE_INVALID
-    };
-
-    enum class VP9Level
-    {
-      e1_0     = STD_VIDEO_VP9_LEVEL_1_0,
-      e1_1     = STD_VIDEO_VP9_LEVEL_1_1,
-      e2_0     = STD_VIDEO_VP9_LEVEL_2_0,
-      e2_1     = STD_VIDEO_VP9_LEVEL_2_1,
-      e3_0     = STD_VIDEO_VP9_LEVEL_3_0,
-      e3_1     = STD_VIDEO_VP9_LEVEL_3_1,
-      e4_0     = STD_VIDEO_VP9_LEVEL_4_0,
-      e4_1     = STD_VIDEO_VP9_LEVEL_4_1,
-      e5_0     = STD_VIDEO_VP9_LEVEL_5_0,
-      e5_1     = STD_VIDEO_VP9_LEVEL_5_1,
-      e5_2     = STD_VIDEO_VP9_LEVEL_5_2,
-      e6_0     = STD_VIDEO_VP9_LEVEL_6_0,
-      e6_1     = STD_VIDEO_VP9_LEVEL_6_1,
-      e6_2     = STD_VIDEO_VP9_LEVEL_6_2,
-      eInvalid = STD_VIDEO_VP9_LEVEL_INVALID
-    };
-
-    enum class VP9FrameType
-    {
-      eKey     = STD_VIDEO_VP9_FRAME_TYPE_KEY,
-      eNonKey  = STD_VIDEO_VP9_FRAME_TYPE_NON_KEY,
-      eInvalid = STD_VIDEO_VP9_FRAME_TYPE_INVALID
-    };
-
-    enum class VP9ReferenceName
-    {
-      eIntraFrame  = STD_VIDEO_VP9_REFERENCE_NAME_INTRA_FRAME,
-      eLastFrame   = STD_VIDEO_VP9_REFERENCE_NAME_LAST_FRAME,
-      eGoldenFrame = STD_VIDEO_VP9_REFERENCE_NAME_GOLDEN_FRAME,
-      eAltrefFrame = STD_VIDEO_VP9_REFERENCE_NAME_ALTREF_FRAME,
-      eInvalid     = STD_VIDEO_VP9_REFERENCE_NAME_INVALID
-    };
-
-    enum class VP9InterpolationFilter
-    {
-      eEighttap       = STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP,
-      eEighttapSmooth = STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH,
-      eEighttapSharp  = STD_VIDEO_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP,
-      eBilinear       = STD_VIDEO_VP9_INTERPOLATION_FILTER_BILINEAR,
-      eSwitchable     = STD_VIDEO_VP9_INTERPOLATION_FILTER_SWITCHABLE,
-      eInvalid        = STD_VIDEO_VP9_INTERPOLATION_FILTER_INVALID
-    };
-
-    enum class VP9ColorSpace
-    {
-      eUnknown  = STD_VIDEO_VP9_COLOR_SPACE_UNKNOWN,
-      eBt601    = STD_VIDEO_VP9_COLOR_SPACE_BT_601,
-      eBt709    = STD_VIDEO_VP9_COLOR_SPACE_BT_709,
-      eSmpte170 = STD_VIDEO_VP9_COLOR_SPACE_SMPTE_170,
-      eSmpte240 = STD_VIDEO_VP9_COLOR_SPACE_SMPTE_240,
-      eBt2020   = STD_VIDEO_VP9_COLOR_SPACE_BT_2020,
-      eReserved = STD_VIDEO_VP9_COLOR_SPACE_RESERVED,
-      eRgb      = STD_VIDEO_VP9_COLOR_SPACE_RGB,
-      eInvalid  = STD_VIDEO_VP9_COLOR_SPACE_INVALID
-    };
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
     //=== vulkan_video_codec_av1std ===
 
     enum class AV1Profile
@@ -562,21 +358,19 @@ namespace VULKAN_HPP_NAMESPACE
 
     enum class AV1ColorPrimaries
     {
-      eBt709       = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_709,
-      eUnspecified = STD_VIDEO_AV1_COLOR_PRIMARIES_UNSPECIFIED,
-      eBtUnspecified VULKAN_HPP_DEPRECATED_17( "eBtUnspecified is deprecated, eUnspecified should be used instead." ) =
-        STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED,
-      eBt470M      = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_M,
-      eBt470BG     = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_B_G,
-      eBt601       = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_601,
-      eSmpte240    = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_240,
-      eGenericFilm = STD_VIDEO_AV1_COLOR_PRIMARIES_GENERIC_FILM,
-      eBt2020      = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_2020,
-      eXyz         = STD_VIDEO_AV1_COLOR_PRIMARIES_XYZ,
-      eSmpte431    = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_431,
-      eSmpte432    = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432,
-      eEbu3213     = STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213,
-      eInvalid     = STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID
+      eBt709         = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_709,
+      eBtUnspecified = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED,
+      eBt470M        = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_M,
+      eBt470BG       = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_B_G,
+      eBt601         = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_601,
+      eSmpte240      = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_240,
+      eGenericFilm   = STD_VIDEO_AV1_COLOR_PRIMARIES_GENERIC_FILM,
+      eBt2020        = STD_VIDEO_AV1_COLOR_PRIMARIES_BT_2020,
+      eXyz           = STD_VIDEO_AV1_COLOR_PRIMARIES_XYZ,
+      eSmpte431      = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_431,
+      eSmpte432      = STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432,
+      eEbu3213       = STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213,
+      eInvalid       = STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID
     };
 
     enum class AV1TransferCharacteristics
@@ -631,13 +425,11 @@ namespace VULKAN_HPP_NAMESPACE
       eReserved  = STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_RESERVED,
       eInvalid   = STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_INVALID
     };
-#endif
 
     //===============
     //=== STRUCTS ===
     //===============
 
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
     //=== vulkan_video_codec_h264std ===
 
     struct H264SpsVuiFlags
@@ -654,16 +446,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264SpsVuiFlags *>( this );
       }
 
-      operator StdVideoH264SpsVuiFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264SpsVuiFlags *>( this );
-      }
-
-      operator StdVideoH264SpsVuiFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264SpsVuiFlags *>( this );
-      }
-
       bool operator==( H264SpsVuiFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( aspect_ratio_info_present_flag == rhs.aspect_ratio_info_present_flag ) && ( overscan_info_present_flag == rhs.overscan_info_present_flag ) &&
@@ -709,16 +491,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264HrdParameters *>( this );
       }
 
-      operator StdVideoH264HrdParameters const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264HrdParameters *>( this );
-      }
-
-      operator StdVideoH264HrdParameters *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264HrdParameters *>( this );
-      }
-
       bool operator==( H264HrdParameters const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( cpb_cnt_minus1 == rhs.cpb_cnt_minus1 ) && ( bit_rate_scale == rhs.bit_rate_scale ) && ( cpb_size_scale == rhs.cpb_size_scale ) &&
@@ -735,17 +507,17 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      uint8_t                                                    cpb_cnt_minus1                          = {};
-      uint8_t                                                    bit_rate_scale                          = {};
-      uint8_t                                                    cpb_size_scale                          = {};
-      uint8_t                                                    reserved1                               = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1                   = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE>  cbr_flag                                = {};
-      uint32_t                                                   initial_cpb_removal_delay_length_minus1 = {};
-      uint32_t                                                   cpb_removal_delay_length_minus1         = {};
-      uint32_t                                                   dpb_output_delay_length_minus1          = {};
-      uint32_t                                                   time_offset_length                      = {};
+      uint8_t                                                                          cpb_cnt_minus1                          = {};
+      uint8_t                                                                          bit_rate_scale                          = {};
+      uint8_t                                                                          cpb_size_scale                          = {};
+      uint8_t                                                                          reserved1                               = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1                   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1                   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE>  cbr_flag                                = {};
+      uint32_t                                                                         initial_cpb_removal_delay_length_minus1 = {};
+      uint32_t                                                                         cpb_removal_delay_length_minus1         = {};
+      uint32_t                                                                         dpb_output_delay_length_minus1          = {};
+      uint32_t                                                                         time_offset_length                      = {};
     };
 
     struct H264SequenceParameterSetVui
@@ -762,16 +534,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264SequenceParameterSetVui *>( this );
       }
 
-      operator StdVideoH264SequenceParameterSetVui const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264SequenceParameterSetVui *>( this );
-      }
-
-      operator StdVideoH264SequenceParameterSetVui *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264SequenceParameterSetVui *>( this );
-      }
-
       bool operator==( H264SequenceParameterSetVui const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( aspect_ratio_idc == rhs.aspect_ratio_idc ) && ( sar_width == rhs.sar_width ) && ( sar_height == rhs.sar_height ) &&
@@ -822,16 +584,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264SpsFlags *>( this );
       }
 
-      operator StdVideoH264SpsFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264SpsFlags *>( this );
-      }
-
-      operator StdVideoH264SpsFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264SpsFlags *>( this );
-      }
-
       bool operator==( H264SpsFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( constraint_set0_flag == rhs.constraint_set0_flag ) && ( constraint_set1_flag == rhs.constraint_set1_flag ) &&
@@ -883,16 +635,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264ScalingLists *>( this );
       }
 
-      operator StdVideoH264ScalingLists const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264ScalingLists *>( this );
-      }
-
-      operator StdVideoH264ScalingLists *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264ScalingLists *>( this );
-      }
-
       bool operator==( H264ScalingLists const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( scaling_list_present_mask == rhs.scaling_list_present_mask ) && ( use_default_scaling_matrix_mask == rhs.use_default_scaling_matrix_mask ) &&
@@ -905,10 +647,12 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      uint16_t                                                                                                         scaling_list_present_mask       = {};
-      uint16_t                                                                                                         use_default_scaling_matrix_mask = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS> ScalingList4x4                  = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS> ScalingList8x8                  = {};
+      uint16_t scaling_list_present_mask       = {};
+      uint16_t use_default_scaling_matrix_mask = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS>
+        ScalingList4x4 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS>
+        ScalingList8x8 = {};
     };
 
     struct H264SequenceParameterSet
@@ -925,16 +669,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264SequenceParameterSet *>( this );
       }
 
-      operator StdVideoH264SequenceParameterSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264SequenceParameterSet *>( this );
-      }
-
-      operator StdVideoH264SequenceParameterSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264SequenceParameterSet *>( this );
-      }
-
       bool operator==( H264SequenceParameterSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( profile_idc == rhs.profile_idc ) && ( level_idc == rhs.level_idc ) &&
@@ -1001,16 +735,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264PpsFlags *>( this );
       }
 
-      operator StdVideoH264PpsFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264PpsFlags *>( this );
-      }
-
-      operator StdVideoH264PpsFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264PpsFlags *>( this );
-      }
-
       bool operator==( H264PpsFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( transform_8x8_mode_flag == rhs.transform_8x8_mode_flag ) && ( redundant_pic_cnt_present_flag == rhs.redundant_pic_cnt_present_flag ) &&
@@ -1050,16 +774,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH264PictureParameterSet *>( this );
       }
 
-      operator StdVideoH264PictureParameterSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH264PictureParameterSet *>( this );
-      }
-
-      operator StdVideoH264PictureParameterSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH264PictureParameterSet *>( this );
-      }
-
       bool operator==( H264PictureParameterSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( seq_parameter_set_id == rhs.seq_parameter_set_id ) && ( pic_parameter_set_id == rhs.pic_parameter_set_id ) &&
@@ -1089,9 +803,7 @@ namespace VULKAN_HPP_NAMESPACE
       int8_t                                                                     second_chroma_qp_index_offset = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists * pScalingLists                 = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
     //=== vulkan_video_codec_h264std_decode ===
 
     struct DecodeH264PictureInfoFlags
@@ -1108,16 +820,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH264PictureInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeH264PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH264PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeH264PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH264PictureInfoFlags *>( this );
-      }
-
       bool operator==( DecodeH264PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( field_pic_flag == rhs.field_pic_flag ) && ( is_intra == rhs.is_intra ) && ( IdrPicFlag == rhs.IdrPicFlag ) &&
@@ -1153,16 +855,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH264PictureInfo *>( this );
       }
 
-      operator StdVideoDecodeH264PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH264PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeH264PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH264PictureInfo *>( this );
-      }
-
       bool operator==( DecodeH264PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( seq_parameter_set_id == rhs.seq_parameter_set_id ) && ( pic_parameter_set_id == rhs.pic_parameter_set_id ) &&
@@ -1176,14 +868,14 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfoFlags flags                = {};
-      uint8_t                                                                      seq_parameter_set_id = {};
-      uint8_t                                                                      pic_parameter_set_id = {};
-      uint8_t                                                                      reserved1            = {};
-      uint8_t                                                                      reserved2            = {};
-      uint16_t                                                                     frame_num            = {};
-      uint16_t                                                                     idr_pic_id           = {};
-      ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE>   PicOrderCnt          = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfoFlags                     flags                = {};
+      uint8_t                                                                                          seq_parameter_set_id = {};
+      uint8_t                                                                                          pic_parameter_set_id = {};
+      uint8_t                                                                                          reserved1            = {};
+      uint8_t                                                                                          reserved2            = {};
+      uint16_t                                                                                         frame_num            = {};
+      uint16_t                                                                                         idr_pic_id           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt          = {};
     };
 
     struct DecodeH264ReferenceInfoFlags
@@ -1200,16 +892,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH264ReferenceInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeH264ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH264ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeH264ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH264ReferenceInfoFlags *>( this );
-      }
-
       bool operator==( DecodeH264ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( top_field_flag == rhs.top_field_flag ) && ( bottom_field_flag == rhs.bottom_field_flag ) &&
@@ -1242,16 +924,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH264ReferenceInfo *>( this );
       }
 
-      operator StdVideoDecodeH264ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH264ReferenceInfo *>( this );
-      }
-
-      operator StdVideoDecodeH264ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH264ReferenceInfo *>( this );
-      }
-
       bool operator==( DecodeH264ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( FrameNum == rhs.FrameNum ) && ( reserved == rhs.reserved ) && ( PicOrderCnt == rhs.PicOrderCnt );
@@ -1263,14 +935,12 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags flags       = {};
-      uint16_t                                                                       FrameNum    = {};
-      uint16_t                                                                       reserved    = {};
-      ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE>     PicOrderCnt = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags                   flags       = {};
+      uint16_t                                                                                         FrameNum    = {};
+      uint16_t                                                                                         reserved    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ )
     //=== vulkan_video_codec_h264std_encode ===
 
     struct EncodeH264WeightTableFlags
@@ -1287,16 +957,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264WeightTableFlags *>( this );
       }
 
-      operator StdVideoEncodeH264WeightTableFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264WeightTableFlags *>( this );
-      }
-
-      operator StdVideoEncodeH264WeightTableFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264WeightTableFlags *>( this );
-      }
-
       bool operator==( EncodeH264WeightTableFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( luma_weight_l0_flag == rhs.luma_weight_l0_flag ) && ( chroma_weight_l0_flag == rhs.chroma_weight_l0_flag ) &&
@@ -1329,16 +989,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264WeightTable *>( this );
       }
 
-      operator StdVideoEncodeH264WeightTable const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264WeightTable *>( this );
-      }
-
-      operator StdVideoEncodeH264WeightTable *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264WeightTable *>( this );
-      }
-
       bool operator==( EncodeH264WeightTable const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( luma_log2_weight_denom == rhs.luma_log2_weight_denom ) &&
@@ -1354,17 +1004,17 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags              flags                    = {};
-      uint8_t                                                                                   luma_log2_weight_denom   = {};
-      uint8_t                                                                                   chroma_log2_weight_denom = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l0           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l0           = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l1           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l1           = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1         = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags                                    flags                    = {};
+      uint8_t                                                                                                         luma_log2_weight_denom   = {};
+      uint8_t                                                                                                         chroma_log2_weight_denom = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1         = {};
     };
 
     struct EncodeH264SliceHeaderFlags
@@ -1381,16 +1031,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264SliceHeaderFlags *>( this );
       }
 
-      operator StdVideoEncodeH264SliceHeaderFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264SliceHeaderFlags *>( this );
-      }
-
-      operator StdVideoEncodeH264SliceHeaderFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264SliceHeaderFlags *>( this );
-      }
-
       bool operator==( EncodeH264SliceHeaderFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( direct_spatial_mv_pred_flag == rhs.direct_spatial_mv_pred_flag ) &&
@@ -1422,16 +1062,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264PictureInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH264PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH264PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264PictureInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH264PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( IdrPicFlag == rhs.IdrPicFlag ) && ( is_reference == rhs.is_reference ) &&
@@ -1467,16 +1097,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264ReferenceInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH264ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH264ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264ReferenceInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH264ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( used_for_long_term_reference == rhs.used_for_long_term_reference ) && ( reserved == rhs.reserved );
@@ -1506,16 +1126,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264ReferenceListsInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH264ReferenceListsInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264ReferenceListsInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH264ReferenceListsInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264ReferenceListsInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH264ReferenceListsInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( ref_pic_list_modification_flag_l0 == rhs.ref_pic_list_modification_flag_l0 ) &&
@@ -1547,16 +1157,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264RefListModEntry *>( this );
       }
 
-      operator StdVideoEncodeH264RefListModEntry const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264RefListModEntry *>( this );
-      }
-
-      operator StdVideoEncodeH264RefListModEntry *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264RefListModEntry *>( this );
-      }
-
       bool operator==( EncodeH264RefListModEntry const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( modification_of_pic_nums_idc == rhs.modification_of_pic_nums_idc ) && ( abs_diff_pic_num_minus1 == rhs.abs_diff_pic_num_minus1 ) &&
@@ -1589,16 +1189,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264RefPicMarkingEntry *>( this );
       }
 
-      operator StdVideoEncodeH264RefPicMarkingEntry const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264RefPicMarkingEntry *>( this );
-      }
-
-      operator StdVideoEncodeH264RefPicMarkingEntry *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264RefPicMarkingEntry *>( this );
-      }
-
       bool operator==( EncodeH264RefPicMarkingEntry const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( memory_management_control_operation == rhs.memory_management_control_operation ) &&
@@ -1634,16 +1224,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264ReferenceListsInfo *>( this );
       }
 
-      operator StdVideoEncodeH264ReferenceListsInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264ReferenceListsInfo *>( this );
-      }
-
-      operator StdVideoEncodeH264ReferenceListsInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264ReferenceListsInfo *>( this );
-      }
-
       bool operator==( EncodeH264ReferenceListsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( num_ref_idx_l0_active_minus1 == rhs.num_ref_idx_l0_active_minus1 ) &&
@@ -1663,12 +1243,12 @@ namespace VULKAN_HPP_NAMESPACE
       VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags    flags                        = {};
       uint8_t                                                                                num_ref_idx_l0_active_minus1 = {};
       uint8_t                                                                                num_ref_idx_l1_active_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                               RefPicList0                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                               RefPicList1                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>         RefPicList0                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>         RefPicList1                  = {};
       uint8_t                                                                                refList0ModOpCount           = {};
       uint8_t                                                                                refList1ModOpCount           = {};
       uint8_t                                                                                refPicMarkingOpCount         = {};
-      ArrayWrapper1D<uint8_t, 7>                                                             reserved1                    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                                       reserved1                    = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry *    pRefList0ModOperations       = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry *    pRefList1ModOperations       = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry * pRefPicMarkingOperations     = {};
@@ -1688,16 +1268,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264PictureInfo *>( this );
       }
 
-      operator StdVideoEncodeH264PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264PictureInfo *>( this );
-      }
-
-      operator StdVideoEncodeH264PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264PictureInfo *>( this );
-      }
-
       bool operator==( EncodeH264PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( seq_parameter_set_id == rhs.seq_parameter_set_id ) && ( pic_parameter_set_id == rhs.pic_parameter_set_id ) &&
@@ -1720,7 +1290,7 @@ namespace VULKAN_HPP_NAMESPACE
       uint32_t                                                                               frame_num   = {};
       int32_t                                                                                PicOrderCnt = {};
       uint8_t                                                                                temporal_id = {};
-      ArrayWrapper1D<uint8_t, 3>                                                             reserved1   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>                                       reserved1   = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo * pRefLists   = {};
     };
 
@@ -1738,16 +1308,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264ReferenceInfo *>( this );
       }
 
-      operator StdVideoEncodeH264ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264ReferenceInfo *>( this );
-      }
-
-      operator StdVideoEncodeH264ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264ReferenceInfo *>( this );
-      }
-
       bool operator==( EncodeH264ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( primary_pic_type == rhs.primary_pic_type ) && ( FrameNum == rhs.FrameNum ) && ( PicOrderCnt == rhs.PicOrderCnt ) &&
@@ -1784,16 +1344,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH264SliceHeader *>( this );
       }
 
-      operator StdVideoEncodeH264SliceHeader const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH264SliceHeader *>( this );
-      }
-
-      operator StdVideoEncodeH264SliceHeader *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH264SliceHeader *>( this );
-      }
-
       bool operator==( EncodeH264SliceHeader const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( first_mb_in_slice == rhs.first_mb_in_slice ) && ( slice_type == rhs.slice_type ) &&
@@ -1821,9 +1371,7 @@ namespace VULKAN_HPP_NAMESPACE
         VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc::eDisabled;
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable * pWeightTable = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
     //=== vulkan_video_codec_h265std ===
 
     struct H265DecPicBufMgr
@@ -1840,16 +1388,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265DecPicBufMgr *>( this );
       }
 
-      operator StdVideoH265DecPicBufMgr const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265DecPicBufMgr *>( this );
-      }
-
-      operator StdVideoH265DecPicBufMgr *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265DecPicBufMgr *>( this );
-      }
-
       bool operator==( H265DecPicBufMgr const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( max_latency_increase_plus1 == rhs.max_latency_increase_plus1 ) && ( max_dec_pic_buffering_minus1 == rhs.max_dec_pic_buffering_minus1 ) &&
@@ -1862,9 +1400,9 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_dec_pic_buffering_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_num_reorder_pics         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_dec_pic_buffering_minus1 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_num_reorder_pics         = {};
     };
 
     struct H265SubLayerHrdParameters
@@ -1881,16 +1419,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265SubLayerHrdParameters *>( this );
       }
 
-      operator StdVideoH265SubLayerHrdParameters const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265SubLayerHrdParameters *>( this );
-      }
-
-      operator StdVideoH265SubLayerHrdParameters *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265SubLayerHrdParameters *>( this );
-      }
-
       bool operator==( H265SubLayerHrdParameters const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( bit_rate_value_minus1 == rhs.bit_rate_value_minus1 ) && ( cpb_size_value_minus1 == rhs.cpb_size_value_minus1 ) &&
@@ -1904,11 +1432,11 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
-      uint32_t                                                   cbr_flag                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
+      uint32_t                                                                         cbr_flag                 = {};
     };
 
     struct H265HrdFlags
@@ -1925,16 +1453,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265HrdFlags *>( this );
       }
 
-      operator StdVideoH265HrdFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265HrdFlags *>( this );
-      }
-
-      operator StdVideoH265HrdFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265HrdFlags *>( this );
-      }
-
       bool operator==( H265HrdFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( nal_hrd_parameters_present_flag == rhs.nal_hrd_parameters_present_flag ) &&
@@ -1974,16 +1492,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265HrdParameters *>( this );
       }
 
-      operator StdVideoH265HrdParameters const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265HrdParameters *>( this );
-      }
-
-      operator StdVideoH265HrdParameters *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265HrdParameters *>( this );
-      }
-
       bool operator==( H265HrdParameters const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( tick_divisor_minus2 == rhs.tick_divisor_minus2 ) &&
@@ -2013,9 +1521,9 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                                             initial_cpb_removal_delay_length_minus1      = {};
       uint8_t                                                                             au_cpb_removal_delay_length_minus1           = {};
       uint8_t                                                                             dpb_output_delay_length_minus1               = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>                         cpb_cnt_minus1                               = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>                        elemental_duration_in_tc_minus1              = {};
-      ArrayWrapper1D<uint16_t, 3>                                                         reserved                                     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>   cpb_cnt_minus1                               = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  elemental_duration_in_tc_minus1              = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, 3>                                   reserved                                     = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersNal                    = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersVcl                    = {};
     };
@@ -2034,16 +1542,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265VpsFlags *>( this );
       }
 
-      operator StdVideoH265VpsFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265VpsFlags *>( this );
-      }
-
-      operator StdVideoH265VpsFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265VpsFlags *>( this );
-      }
-
       bool operator==( H265VpsFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( vps_temporal_id_nesting_flag == rhs.vps_temporal_id_nesting_flag ) &&
@@ -2078,16 +1576,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265ProfileTierLevelFlags *>( this );
       }
 
-      operator StdVideoH265ProfileTierLevelFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265ProfileTierLevelFlags *>( this );
-      }
-
-      operator StdVideoH265ProfileTierLevelFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265ProfileTierLevelFlags *>( this );
-      }
-
       bool operator==( H265ProfileTierLevelFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( general_tier_flag == rhs.general_tier_flag ) && ( general_progressive_source_flag == rhs.general_progressive_source_flag ) &&
@@ -2123,16 +1611,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265ProfileTierLevel *>( this );
       }
 
-      operator StdVideoH265ProfileTierLevel const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265ProfileTierLevel *>( this );
-      }
-
-      operator StdVideoH265ProfileTierLevel *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265ProfileTierLevel *>( this );
-      }
-
       bool operator==( H265ProfileTierLevel const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( general_profile_idc == rhs.general_profile_idc ) && ( general_level_idc == rhs.general_level_idc );
@@ -2164,16 +1642,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265VideoParameterSet *>( this );
       }
 
-      operator StdVideoH265VideoParameterSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265VideoParameterSet *>( this );
-      }
-
-      operator StdVideoH265VideoParameterSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265VideoParameterSet *>( this );
-      }
-
       bool operator==( H265VideoParameterSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( vps_video_parameter_set_id == rhs.vps_video_parameter_set_id ) &&
@@ -2217,16 +1685,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265ScalingLists *>( this );
       }
 
-      operator StdVideoH265ScalingLists const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265ScalingLists *>( this );
-      }
-
-      operator StdVideoH265ScalingLists *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265ScalingLists *>( this );
-      }
-
       bool operator==( H265ScalingLists const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( ScalingList4x4 == rhs.ScalingList4x4 ) && ( ScalingList8x8 == rhs.ScalingList8x8 ) && ( ScalingList16x16 == rhs.ScalingList16x16 ) &&
@@ -2240,12 +1698,16 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS>     ScalingList4x4         = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS>     ScalingList8x8         = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS> ScalingList16x16       = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS> ScalingList32x32       = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS>                                                 ScalingListDCCoef16x16 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS>                                                 ScalingListDCCoef32x32 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS>
+        ScalingList4x4 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS>
+        ScalingList8x8 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS>
+        ScalingList16x16 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS>
+                                                                                                 ScalingList32x32       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS> ScalingListDCCoef16x16 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS> ScalingListDCCoef32x32 = {};
     };
 
     struct H265SpsVuiFlags
@@ -2262,16 +1724,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265SpsVuiFlags *>( this );
       }
 
-      operator StdVideoH265SpsVuiFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265SpsVuiFlags *>( this );
-      }
-
-      operator StdVideoH265SpsVuiFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265SpsVuiFlags *>( this );
-      }
-
       bool operator==( H265SpsVuiFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( aspect_ratio_info_present_flag == rhs.aspect_ratio_info_present_flag ) && ( overscan_info_present_flag == rhs.overscan_info_present_flag ) &&
@@ -2328,16 +1780,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265SequenceParameterSetVui *>( this );
       }
 
-      operator StdVideoH265SequenceParameterSetVui const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265SequenceParameterSetVui *>( this );
-      }
-
-      operator StdVideoH265SequenceParameterSetVui *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265SequenceParameterSetVui *>( this );
-      }
-
       bool operator==( H265SequenceParameterSetVui const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( aspect_ratio_idc == rhs.aspect_ratio_idc ) && ( sar_width == rhs.sar_width ) && ( sar_height == rhs.sar_height ) &&
@@ -2404,16 +1846,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265PredictorPaletteEntries *>( this );
       }
 
-      operator StdVideoH265PredictorPaletteEntries const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265PredictorPaletteEntries *>( this );
-      }
-
-      operator StdVideoH265PredictorPaletteEntries *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265PredictorPaletteEntries *>( this );
-      }
-
       bool operator==( H265PredictorPaletteEntries const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( PredictorPaletteEntries == rhs.PredictorPaletteEntries );
@@ -2425,8 +1857,9 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper2D<uint16_t, STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE, STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE>
-        PredictorPaletteEntries = {};
+      VULKAN_HPP_NAMESPACE::
+        ArrayWrapper2D<uint16_t, STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE, STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE>
+          PredictorPaletteEntries = {};
     };
 
     struct H265SpsFlags
@@ -2443,16 +1876,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265SpsFlags *>( this );
       }
 
-      operator StdVideoH265SpsFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265SpsFlags *>( this );
-      }
-
-      operator StdVideoH265SpsFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265SpsFlags *>( this );
-      }
-
       bool operator==( H265SpsFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( sps_temporal_id_nesting_flag == rhs.sps_temporal_id_nesting_flag ) && ( separate_colour_plane_flag == rhs.separate_colour_plane_flag ) &&
@@ -2532,16 +1955,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265ShortTermRefPicSetFlags *>( this );
       }
 
-      operator StdVideoH265ShortTermRefPicSetFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265ShortTermRefPicSetFlags *>( this );
-      }
-
-      operator StdVideoH265ShortTermRefPicSetFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265ShortTermRefPicSetFlags *>( this );
-      }
-
       bool operator==( H265ShortTermRefPicSetFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( inter_ref_pic_set_prediction_flag == rhs.inter_ref_pic_set_prediction_flag ) && ( delta_rps_sign == rhs.delta_rps_sign );
@@ -2571,16 +1984,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265ShortTermRefPicSet *>( this );
       }
 
-      operator StdVideoH265ShortTermRefPicSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265ShortTermRefPicSet *>( this );
-      }
-
-      operator StdVideoH265ShortTermRefPicSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265ShortTermRefPicSet *>( this );
-      }
-
       bool operator==( H265ShortTermRefPicSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( delta_idx_minus1 == rhs.delta_idx_minus1 ) && ( use_delta_flag == rhs.use_delta_flag ) &&
@@ -2609,8 +2012,8 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                                       reserved3                = {};
       uint8_t                                                                       num_negative_pics        = {};
       uint8_t                                                                       num_positive_pics        = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>                         delta_poc_s0_minus1      = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>                         delta_poc_s1_minus1      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>   delta_poc_s0_minus1      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>   delta_poc_s1_minus1      = {};
     };
 
     struct H265LongTermRefPicsSps
@@ -2627,16 +2030,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265LongTermRefPicsSps *>( this );
       }
 
-      operator StdVideoH265LongTermRefPicsSps const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265LongTermRefPicsSps *>( this );
-      }
-
-      operator StdVideoH265LongTermRefPicsSps *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265LongTermRefPicsSps *>( this );
-      }
-
       bool operator==( H265LongTermRefPicsSps const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( used_by_curr_pic_lt_sps_flag == rhs.used_by_curr_pic_lt_sps_flag ) && ( lt_ref_pic_poc_lsb_sps == rhs.lt_ref_pic_poc_lsb_sps );
@@ -2648,8 +2041,8 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      uint32_t                                                            used_by_curr_pic_lt_sps_flag = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps       = {};
+      uint32_t                                                                                  used_by_curr_pic_lt_sps_flag = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps       = {};
     };
 
     struct H265SequenceParameterSet
@@ -2666,16 +2059,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265SequenceParameterSet *>( this );
       }
 
-      operator StdVideoH265SequenceParameterSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265SequenceParameterSet *>( this );
-      }
-
-      operator StdVideoH265SequenceParameterSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265SequenceParameterSet *>( this );
-      }
-
       bool operator==( H265SequenceParameterSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( chroma_format_idc == rhs.chroma_format_idc ) && ( pic_width_in_luma_samples == rhs.pic_width_in_luma_samples ) &&
@@ -2767,16 +2150,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265PpsFlags *>( this );
       }
 
-      operator StdVideoH265PpsFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265PpsFlags *>( this );
-      }
-
-      operator StdVideoH265PpsFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265PpsFlags *>( this );
-      }
-
       bool operator==( H265PpsFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( dependent_slice_segments_enabled_flag == rhs.dependent_slice_segments_enabled_flag ) &&
@@ -2858,16 +2231,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoH265PictureParameterSet *>( this );
       }
 
-      operator StdVideoH265PictureParameterSet const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoH265PictureParameterSet *>( this );
-      }
-
-      operator StdVideoH265PictureParameterSet *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoH265PictureParameterSet *>( this );
-      }
-
       bool operator==( H265PictureParameterSet const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( pps_pic_parameter_set_id == rhs.pps_pic_parameter_set_id ) &&
@@ -2898,46 +2261,44 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PpsFlags                        flags                                     = {};
-      uint8_t                                                                               pps_pic_parameter_set_id                  = {};
-      uint8_t                                                                               pps_seq_parameter_set_id                  = {};
-      uint8_t                                                                               sps_video_parameter_set_id                = {};
-      uint8_t                                                                               num_extra_slice_header_bits               = {};
-      uint8_t                                                                               num_ref_idx_l0_default_active_minus1      = {};
-      uint8_t                                                                               num_ref_idx_l1_default_active_minus1      = {};
-      int8_t                                                                                init_qp_minus26                           = {};
-      uint8_t                                                                               diff_cu_qp_delta_depth                    = {};
-      int8_t                                                                                pps_cb_qp_offset                          = {};
-      int8_t                                                                                pps_cr_qp_offset                          = {};
-      int8_t                                                                                pps_beta_offset_div2                      = {};
-      int8_t                                                                                pps_tc_offset_div2                        = {};
-      uint8_t                                                                               log2_parallel_merge_level_minus2          = {};
-      uint8_t                                                                               log2_max_transform_skip_block_size_minus2 = {};
-      uint8_t                                                                               diff_cu_chroma_qp_offset_depth            = {};
-      uint8_t                                                                               chroma_qp_offset_list_len_minus1          = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>                     cb_qp_offset_list                         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>                     cr_qp_offset_list                         = {};
-      uint8_t                                                                               log2_sao_offset_scale_luma                = {};
-      uint8_t                                                                               log2_sao_offset_scale_chroma              = {};
-      int8_t                                                                                pps_act_y_qp_offset_plus5                 = {};
-      int8_t                                                                                pps_act_cb_qp_offset_plus5                = {};
-      int8_t                                                                                pps_act_cr_qp_offset_plus3                = {};
-      uint8_t                                                                               pps_num_palette_predictor_initializers    = {};
-      uint8_t                                                                               luma_bit_depth_entry_minus8               = {};
-      uint8_t                                                                               chroma_bit_depth_entry_minus8             = {};
-      uint8_t                                                                               num_tile_columns_minus1                   = {};
-      uint8_t                                                                               num_tile_rows_minus1                      = {};
-      uint8_t                                                                               reserved1                                 = {};
-      uint8_t                                                                               reserved2                                 = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE>         column_width_minus1                       = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE>         row_height_minus1                         = {};
-      uint32_t                                                                              reserved3                                 = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists *            pScalingLists                             = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries * pPredictorPaletteEntries                  = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PpsFlags                                      flags                                     = {};
+      uint8_t                                                                                             pps_pic_parameter_set_id                  = {};
+      uint8_t                                                                                             pps_seq_parameter_set_id                  = {};
+      uint8_t                                                                                             sps_video_parameter_set_id                = {};
+      uint8_t                                                                                             num_extra_slice_header_bits               = {};
+      uint8_t                                                                                             num_ref_idx_l0_default_active_minus1      = {};
+      uint8_t                                                                                             num_ref_idx_l1_default_active_minus1      = {};
+      int8_t                                                                                              init_qp_minus26                           = {};
+      uint8_t                                                                                             diff_cu_qp_delta_depth                    = {};
+      int8_t                                                                                              pps_cb_qp_offset                          = {};
+      int8_t                                                                                              pps_cr_qp_offset                          = {};
+      int8_t                                                                                              pps_beta_offset_div2                      = {};
+      int8_t                                                                                              pps_tc_offset_div2                        = {};
+      uint8_t                                                                                             log2_parallel_merge_level_minus2          = {};
+      uint8_t                                                                                             log2_max_transform_skip_block_size_minus2 = {};
+      uint8_t                                                                                             diff_cu_chroma_qp_offset_depth            = {};
+      uint8_t                                                                                             chroma_qp_offset_list_len_minus1          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>             cb_qp_offset_list                         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>             cr_qp_offset_list                         = {};
+      uint8_t                                                                                             log2_sao_offset_scale_luma                = {};
+      uint8_t                                                                                             log2_sao_offset_scale_chroma              = {};
+      int8_t                                                                                              pps_act_y_qp_offset_plus5                 = {};
+      int8_t                                                                                              pps_act_cb_qp_offset_plus5                = {};
+      int8_t                                                                                              pps_act_cr_qp_offset_plus3                = {};
+      uint8_t                                                                                             pps_num_palette_predictor_initializers    = {};
+      uint8_t                                                                                             luma_bit_depth_entry_minus8               = {};
+      uint8_t                                                                                             chroma_bit_depth_entry_minus8             = {};
+      uint8_t                                                                                             num_tile_columns_minus1                   = {};
+      uint8_t                                                                                             num_tile_rows_minus1                      = {};
+      uint8_t                                                                                             reserved1                                 = {};
+      uint8_t                                                                                             reserved2                                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE> column_width_minus1                       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE> row_height_minus1                         = {};
+      uint32_t                                                                                            reserved3                                 = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists *                          pScalingLists                             = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries *               pPredictorPaletteEntries                  = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
     //=== vulkan_video_codec_h265std_decode ===
 
     struct DecodeH265PictureInfoFlags
@@ -2954,16 +2315,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH265PictureInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeH265PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH265PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeH265PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH265PictureInfoFlags *>( this );
-      }
-
       bool operator==( DecodeH265PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( IrapPicFlag == rhs.IrapPicFlag ) && ( IdrPicFlag == rhs.IdrPicFlag ) && ( IsReference == rhs.IsReference ) &&
@@ -2996,16 +2347,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH265PictureInfo *>( this );
       }
 
-      operator StdVideoDecodeH265PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH265PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeH265PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH265PictureInfo *>( this );
-      }
-
       bool operator==( DecodeH265PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( sps_video_parameter_set_id == rhs.sps_video_parameter_set_id ) &&
@@ -3022,17 +2363,17 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags flags                        = {};
-      uint8_t                                                                      sps_video_parameter_set_id   = {};
-      uint8_t                                                                      pps_seq_parameter_set_id     = {};
-      uint8_t                                                                      pps_pic_parameter_set_id     = {};
-      uint8_t                                                                      NumDeltaPocsOfRefRpsIdx      = {};
-      int32_t                                                                      PicOrderCntVal               = {};
-      uint16_t                                                                     NumBitsForSTRefPicSetInSlice = {};
-      uint16_t                                                                     reserved                     = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetStCurrBefore        = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetStCurrAfter         = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetLtCurr              = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags               flags                        = {};
+      uint8_t                                                                                    sps_video_parameter_set_id   = {};
+      uint8_t                                                                                    pps_seq_parameter_set_id     = {};
+      uint8_t                                                                                    pps_pic_parameter_set_id     = {};
+      uint8_t                                                                                    NumDeltaPocsOfRefRpsIdx      = {};
+      int32_t                                                                                    PicOrderCntVal               = {};
+      uint16_t                                                                                   NumBitsForSTRefPicSetInSlice = {};
+      uint16_t                                                                                   reserved                     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrBefore        = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrAfter         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetLtCurr              = {};
     };
 
     struct DecodeH265ReferenceInfoFlags
@@ -3049,16 +2390,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH265ReferenceInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeH265ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH265ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeH265ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH265ReferenceInfoFlags *>( this );
-      }
-
       bool operator==( DecodeH265ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( used_for_long_term_reference == rhs.used_for_long_term_reference ) && ( unused_for_reference == rhs.unused_for_reference );
@@ -3088,16 +2419,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeH265ReferenceInfo *>( this );
       }
 
-      operator StdVideoDecodeH265ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeH265ReferenceInfo *>( this );
-      }
-
-      operator StdVideoDecodeH265ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeH265ReferenceInfo *>( this );
-      }
-
       bool operator==( DecodeH265ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( PicOrderCntVal == rhs.PicOrderCntVal );
@@ -3112,9 +2433,7 @@ namespace VULKAN_HPP_NAMESPACE
       VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfoFlags flags          = {};
       int32_t                                                                        PicOrderCntVal = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ )
     //=== vulkan_video_codec_h265std_encode ===
 
     struct EncodeH265WeightTableFlags
@@ -3131,16 +2450,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265WeightTableFlags *>( this );
       }
 
-      operator StdVideoEncodeH265WeightTableFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265WeightTableFlags *>( this );
-      }
-
-      operator StdVideoEncodeH265WeightTableFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265WeightTableFlags *>( this );
-      }
-
       bool operator==( EncodeH265WeightTableFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( luma_weight_l0_flag == rhs.luma_weight_l0_flag ) && ( chroma_weight_l0_flag == rhs.chroma_weight_l0_flag ) &&
@@ -3173,16 +2482,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265WeightTable *>( this );
       }
 
-      operator StdVideoEncodeH265WeightTable const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265WeightTable *>( this );
-      }
-
-      operator StdVideoEncodeH265WeightTable *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265WeightTable *>( this );
-      }
-
       bool operator==( EncodeH265WeightTable const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( luma_log2_weight_denom == rhs.luma_log2_weight_denom ) &&
@@ -3199,17 +2498,17 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags              flags                          = {};
-      uint8_t                                                                                   luma_log2_weight_denom         = {};
-      int8_t                                                                                    delta_chroma_log2_weight_denom = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l0           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l0                 = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l1           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l1                 = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1         = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags                                    flags                          = {};
+      uint8_t                                                                                                         luma_log2_weight_denom         = {};
+      int8_t                                                                                                          delta_chroma_log2_weight_denom = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l0                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l1                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1         = {};
     };
 
     struct EncodeH265SliceSegmentHeaderFlags
@@ -3226,16 +2525,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265SliceSegmentHeaderFlags *>( this );
       }
 
-      operator StdVideoEncodeH265SliceSegmentHeaderFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265SliceSegmentHeaderFlags *>( this );
-      }
-
-      operator StdVideoEncodeH265SliceSegmentHeaderFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265SliceSegmentHeaderFlags *>( this );
-      }
-
       bool operator==( EncodeH265SliceSegmentHeaderFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( first_slice_segment_in_pic_flag == rhs.first_slice_segment_in_pic_flag ) &&
@@ -3284,16 +2573,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265SliceSegmentHeader *>( this );
       }
 
-      operator StdVideoEncodeH265SliceSegmentHeader const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265SliceSegmentHeader *>( this );
-      }
-
-      operator StdVideoEncodeH265SliceSegmentHeader *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265SliceSegmentHeader *>( this );
-      }
-
       bool operator==( EncodeH265SliceSegmentHeader const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( slice_type == rhs.slice_type ) && ( slice_segment_address == rhs.slice_segment_address ) &&
@@ -3342,16 +2621,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265ReferenceListsInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH265ReferenceListsInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265ReferenceListsInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH265ReferenceListsInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265ReferenceListsInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH265ReferenceListsInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( ref_pic_list_modification_flag_l0 == rhs.ref_pic_list_modification_flag_l0 ) &&
@@ -3383,16 +2652,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265ReferenceListsInfo *>( this );
       }
 
-      operator StdVideoEncodeH265ReferenceListsInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265ReferenceListsInfo *>( this );
-      }
-
-      operator StdVideoEncodeH265ReferenceListsInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265ReferenceListsInfo *>( this );
-      }
-
       bool operator==( EncodeH265ReferenceListsInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( num_ref_idx_l0_active_minus1 == rhs.num_ref_idx_l0_active_minus1 ) &&
@@ -3409,10 +2668,10 @@ namespace VULKAN_HPP_NAMESPACE
       VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags flags                        = {};
       uint8_t                                                                             num_ref_idx_l0_active_minus1 = {};
       uint8_t                                                                             num_ref_idx_l1_active_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            RefPicList0                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            RefPicList1                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            list_entry_l0                = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            list_entry_l1                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      RefPicList0                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      RefPicList1                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      list_entry_l0                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      list_entry_l1                = {};
     };
 
     struct EncodeH265PictureInfoFlags
@@ -3429,16 +2688,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265PictureInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH265PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH265PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265PictureInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH265PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( is_reference == rhs.is_reference ) && ( IrapPicFlag == rhs.IrapPicFlag ) &&
@@ -3481,16 +2730,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265LongTermRefPics *>( this );
       }
 
-      operator StdVideoEncodeH265LongTermRefPics const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265LongTermRefPics *>( this );
-      }
-
-      operator StdVideoEncodeH265LongTermRefPics *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265LongTermRefPics *>( this );
-      }
-
       bool operator==( EncodeH265LongTermRefPics const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( num_long_term_sps == rhs.num_long_term_sps ) && ( num_long_term_pics == rhs.num_long_term_pics ) && ( lt_idx_sps == rhs.lt_idx_sps ) &&
@@ -3504,13 +2743,13 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      uint8_t                                                            num_long_term_sps          = {};
-      uint8_t                                                            num_long_term_pics         = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps                 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS>         poc_lsb_lt                 = {};
-      uint16_t                                                           used_by_curr_pic_lt_flag   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_present_flag = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_cycle_lt     = {};
+      uint8_t                                                                                  num_long_term_sps          = {};
+      uint8_t                                                                                  num_long_term_pics         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS>         poc_lsb_lt                 = {};
+      uint16_t                                                                                 used_by_curr_pic_lt_flag   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_present_flag = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_cycle_lt     = {};
     };
 
     struct EncodeH265PictureInfo
@@ -3527,16 +2766,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265PictureInfo *>( this );
       }
 
-      operator StdVideoEncodeH265PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265PictureInfo *>( this );
-      }
-
-      operator StdVideoEncodeH265PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265PictureInfo *>( this );
-      }
-
       bool operator==( EncodeH265PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( pic_type == rhs.pic_type ) && ( sps_video_parameter_set_id == rhs.sps_video_parameter_set_id ) &&
@@ -3560,7 +2789,7 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                           short_term_ref_pic_set_idx               = {};
       int32_t                                                           PicOrderCntVal                           = {};
       uint8_t                                                           TemporalId                               = {};
-      ArrayWrapper1D<uint8_t, 7>                                        reserved1                                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                  reserved1                                = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo * pRefLists           = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet *       pShortTermRefPicSet = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics *    pLongTermRefPics    = {};
@@ -3580,16 +2809,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265ReferenceInfoFlags *>( this );
       }
 
-      operator StdVideoEncodeH265ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeH265ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265ReferenceInfoFlags *>( this );
-      }
-
       bool operator==( EncodeH265ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( used_for_long_term_reference == rhs.used_for_long_term_reference ) && ( unused_for_reference == rhs.unused_for_reference ) &&
@@ -3621,16 +2840,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoEncodeH265ReferenceInfo *>( this );
       }
 
-      operator StdVideoEncodeH265ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeH265ReferenceInfo *>( this );
-      }
-
-      operator StdVideoEncodeH265ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeH265ReferenceInfo *>( this );
-      }
-
       bool operator==( EncodeH265ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( pic_type == rhs.pic_type ) && ( PicOrderCntVal == rhs.PicOrderCntVal ) && ( TemporalId == rhs.TemporalId );
@@ -3647,385 +2856,7 @@ namespace VULKAN_HPP_NAMESPACE
       int32_t                                                           PicOrderCntVal = {};
       uint8_t                                                           TemporalId     = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
-
-    struct VP9ColorConfigFlags
-    {
-      using NativeType = StdVideoVP9ColorConfigFlags;
-
-      operator StdVideoVP9ColorConfigFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9ColorConfigFlags *>( this );
-      }
-
-      operator StdVideoVP9ColorConfigFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9ColorConfigFlags *>( this );
-      }
-
-      operator StdVideoVP9ColorConfigFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9ColorConfigFlags *>( this );
-      }
-
-      operator StdVideoVP9ColorConfigFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9ColorConfigFlags *>( this );
-      }
-
-      bool operator==( VP9ColorConfigFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( color_range == rhs.color_range ) && ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( VP9ColorConfigFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t color_range : 1;
-      uint32_t reserved    : 31;
-    };
-
-    struct VP9ColorConfig
-    {
-      using NativeType = StdVideoVP9ColorConfig;
-
-      operator StdVideoVP9ColorConfig const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9ColorConfig *>( this );
-      }
-
-      operator StdVideoVP9ColorConfig &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9ColorConfig *>( this );
-      }
-
-      operator StdVideoVP9ColorConfig const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9ColorConfig *>( this );
-      }
-
-      operator StdVideoVP9ColorConfig *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9ColorConfig *>( this );
-      }
-
-      bool operator==( VP9ColorConfig const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( BitDepth == rhs.BitDepth ) && ( subsampling_x == rhs.subsampling_x ) && ( subsampling_y == rhs.subsampling_y ) &&
-               ( reserved1 == rhs.reserved1 ) && ( color_space == rhs.color_space );
-      }
-
-      bool operator!=( VP9ColorConfig const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfigFlags flags         = {};
-      uint8_t                                                               BitDepth      = {};
-      uint8_t                                                               subsampling_x = {};
-      uint8_t                                                               subsampling_y = {};
-      uint8_t                                                               reserved1     = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorSpace color_space = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorSpace::eUnknown;
-    };
-
-    struct VP9LoopFilterFlags
-    {
-      using NativeType = StdVideoVP9LoopFilterFlags;
-
-      operator StdVideoVP9LoopFilterFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9LoopFilterFlags *>( this );
-      }
-
-      operator StdVideoVP9LoopFilterFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9LoopFilterFlags *>( this );
-      }
-
-      operator StdVideoVP9LoopFilterFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9LoopFilterFlags *>( this );
-      }
-
-      operator StdVideoVP9LoopFilterFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9LoopFilterFlags *>( this );
-      }
-
-      bool operator==( VP9LoopFilterFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( loop_filter_delta_enabled == rhs.loop_filter_delta_enabled ) && ( loop_filter_delta_update == rhs.loop_filter_delta_update ) &&
-               ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( VP9LoopFilterFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t loop_filter_delta_enabled : 1;
-      uint32_t loop_filter_delta_update  : 1;
-      uint32_t reserved                  : 30;
-    };
-
-    struct VP9LoopFilter
-    {
-      using NativeType = StdVideoVP9LoopFilter;
-
-      operator StdVideoVP9LoopFilter const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9LoopFilter *>( this );
-      }
-
-      operator StdVideoVP9LoopFilter &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9LoopFilter *>( this );
-      }
-
-      operator StdVideoVP9LoopFilter const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9LoopFilter *>( this );
-      }
-
-      operator StdVideoVP9LoopFilter *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9LoopFilter *>( this );
-      }
-
-      bool operator==( VP9LoopFilter const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( loop_filter_level == rhs.loop_filter_level ) && ( loop_filter_sharpness == rhs.loop_filter_sharpness ) &&
-               ( update_ref_delta == rhs.update_ref_delta ) && ( loop_filter_ref_deltas == rhs.loop_filter_ref_deltas ) &&
-               ( update_mode_delta == rhs.update_mode_delta ) && ( loop_filter_mode_deltas == rhs.loop_filter_mode_deltas );
-      }
-
-      bool operator!=( VP9LoopFilter const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilterFlags flags                   = {};
-      uint8_t                                                              loop_filter_level       = {};
-      uint8_t                                                              loop_filter_sharpness   = {};
-      uint8_t                                                              update_ref_delta        = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_VP9_MAX_REF_FRAMES>                 loop_filter_ref_deltas  = {};
-      uint8_t                                                              update_mode_delta       = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS>        loop_filter_mode_deltas = {};
-    };
-
-    struct VP9SegmentationFlags
-    {
-      using NativeType = StdVideoVP9SegmentationFlags;
-
-      operator StdVideoVP9SegmentationFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9SegmentationFlags *>( this );
-      }
-
-      operator StdVideoVP9SegmentationFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9SegmentationFlags *>( this );
-      }
-
-      operator StdVideoVP9SegmentationFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9SegmentationFlags *>( this );
-      }
-
-      operator StdVideoVP9SegmentationFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9SegmentationFlags *>( this );
-      }
-
-      bool operator==( VP9SegmentationFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( segmentation_update_map == rhs.segmentation_update_map ) && ( segmentation_temporal_update == rhs.segmentation_temporal_update ) &&
-               ( segmentation_update_data == rhs.segmentation_update_data ) && ( segmentation_abs_or_delta_update == rhs.segmentation_abs_or_delta_update ) &&
-               ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( VP9SegmentationFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t segmentation_update_map          : 1;
-      uint32_t segmentation_temporal_update     : 1;
-      uint32_t segmentation_update_data         : 1;
-      uint32_t segmentation_abs_or_delta_update : 1;
-      uint32_t reserved                         : 28;
-    };
-
-    struct VP9Segmentation
-    {
-      using NativeType = StdVideoVP9Segmentation;
-
-      operator StdVideoVP9Segmentation const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoVP9Segmentation *>( this );
-      }
-
-      operator StdVideoVP9Segmentation &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoVP9Segmentation *>( this );
-      }
-
-      operator StdVideoVP9Segmentation const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoVP9Segmentation *>( this );
-      }
-
-      operator StdVideoVP9Segmentation *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoVP9Segmentation *>( this );
-      }
-
-      bool operator==( VP9Segmentation const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( segmentation_tree_probs == rhs.segmentation_tree_probs ) &&
-               ( segmentation_pred_prob == rhs.segmentation_pred_prob ) && ( FeatureEnabled == rhs.FeatureEnabled ) && ( FeatureData == rhs.FeatureData );
-      }
-
-      bool operator!=( VP9Segmentation const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags         flags                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS>             segmentation_tree_probs = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB>              segmentation_pred_prob  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTS>                            FeatureEnabled          = {};
-      ArrayWrapper2D<int16_t, STD_VIDEO_VP9_MAX_SEGMENTS, STD_VIDEO_VP9_SEG_LVL_MAX> FeatureData             = {};
-    };
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ )
-    //=== vulkan_video_codec_vp9std_decode ===
-
-    struct DecodeVP9PictureInfoFlags
-    {
-      using NativeType = StdVideoDecodeVP9PictureInfoFlags;
-
-      operator StdVideoDecodeVP9PictureInfoFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoDecodeVP9PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfoFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoDecodeVP9PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeVP9PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeVP9PictureInfoFlags *>( this );
-      }
-
-      bool operator==( DecodeVP9PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( error_resilient_mode == rhs.error_resilient_mode ) && ( intra_only == rhs.intra_only ) &&
-               ( allow_high_precision_mv == rhs.allow_high_precision_mv ) && ( refresh_frame_context == rhs.refresh_frame_context ) &&
-               ( frame_parallel_decoding_mode == rhs.frame_parallel_decoding_mode ) && ( segmentation_enabled == rhs.segmentation_enabled ) &&
-               ( show_frame == rhs.show_frame ) && ( UsePrevFrameMvs == rhs.UsePrevFrameMvs ) && ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( DecodeVP9PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t error_resilient_mode         : 1;
-      uint32_t intra_only                   : 1;
-      uint32_t allow_high_precision_mv      : 1;
-      uint32_t refresh_frame_context        : 1;
-      uint32_t frame_parallel_decoding_mode : 1;
-      uint32_t segmentation_enabled         : 1;
-      uint32_t show_frame                   : 1;
-      uint32_t UsePrevFrameMvs              : 1;
-      uint32_t reserved                     : 24;
-    };
-
-    struct DecodeVP9PictureInfo
-    {
-      using NativeType = StdVideoDecodeVP9PictureInfo;
-
-      operator StdVideoDecodeVP9PictureInfo const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoDecodeVP9PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfo &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoDecodeVP9PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeVP9PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeVP9PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeVP9PictureInfo *>( this );
-      }
-
-      bool operator==( DecodeVP9PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( profile == rhs.profile ) && ( frame_type == rhs.frame_type ) && ( frame_context_idx == rhs.frame_context_idx ) &&
-               ( reset_frame_context == rhs.reset_frame_context ) && ( refresh_frame_flags == rhs.refresh_frame_flags ) &&
-               ( ref_frame_sign_bias_mask == rhs.ref_frame_sign_bias_mask ) && ( interpolation_filter == rhs.interpolation_filter ) &&
-               ( base_q_idx == rhs.base_q_idx ) && ( delta_q_y_dc == rhs.delta_q_y_dc ) && ( delta_q_uv_dc == rhs.delta_q_uv_dc ) &&
-               ( delta_q_uv_ac == rhs.delta_q_uv_ac ) && ( tile_cols_log2 == rhs.tile_cols_log2 ) && ( tile_rows_log2 == rhs.tile_rows_log2 ) &&
-               ( reserved1 == rhs.reserved1 ) && ( pColorConfig == rhs.pColorConfig ) && ( pLoopFilter == rhs.pLoopFilter ) &&
-               ( pSegmentation == rhs.pSegmentation );
-      }
-
-      bool operator!=( DecodeVP9PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfoFlags flags   = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Profile                profile = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Profile::e0;
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9FrameType frame_type          = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9FrameType::eKey;
-      uint8_t                                                        frame_context_idx   = {};
-      uint8_t                                                        reset_frame_context = {};
-      uint8_t                                                        refresh_frame_flags = {};
-      uint8_t                                                        ref_frame_sign_bias_mask = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9InterpolationFilter interpolation_filter =
-        VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9InterpolationFilter::eEighttap;
-      uint8_t                                                                   base_q_idx     = {};
-      int8_t                                                                    delta_q_y_dc   = {};
-      int8_t                                                                    delta_q_uv_dc  = {};
-      int8_t                                                                    delta_q_uv_ac  = {};
-      uint8_t                                                                   tile_cols_log2 = {};
-      uint8_t                                                                   tile_rows_log2 = {};
-      ArrayWrapper1D<uint16_t, 3>                                               reserved1      = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig *  pColorConfig   = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter *   pLoopFilter    = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation * pSegmentation  = {};
-    };
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
     //=== vulkan_video_codec_av1std ===
 
     struct AV1ColorConfigFlags
@@ -4042,16 +2873,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1ColorConfigFlags *>( this );
       }
 
-      operator StdVideoAV1ColorConfigFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1ColorConfigFlags *>( this );
-      }
-
-      operator StdVideoAV1ColorConfigFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1ColorConfigFlags *>( this );
-      }
-
       bool operator==( AV1ColorConfigFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( mono_chrome == rhs.mono_chrome ) && ( color_range == rhs.color_range ) && ( separate_uv_delta_q == rhs.separate_uv_delta_q ) &&
@@ -4085,16 +2906,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1ColorConfig *>( this );
       }
 
-      operator StdVideoAV1ColorConfig const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1ColorConfig *>( this );
-      }
-
-      operator StdVideoAV1ColorConfig *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1ColorConfig *>( this );
-      }
-
       bool operator==( AV1ColorConfig const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( BitDepth == rhs.BitDepth ) && ( subsampling_x == rhs.subsampling_x ) && ( subsampling_y == rhs.subsampling_y ) &&
@@ -4137,16 +2948,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1TimingInfoFlags *>( this );
       }
 
-      operator StdVideoAV1TimingInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1TimingInfoFlags *>( this );
-      }
-
-      operator StdVideoAV1TimingInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1TimingInfoFlags *>( this );
-      }
-
       bool operator==( AV1TimingInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( equal_picture_interval == rhs.equal_picture_interval ) && ( reserved == rhs.reserved );
@@ -4176,16 +2977,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1TimingInfo *>( this );
       }
 
-      operator StdVideoAV1TimingInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1TimingInfo *>( this );
-      }
-
-      operator StdVideoAV1TimingInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1TimingInfo *>( this );
-      }
-
       bool operator==( AV1TimingInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( num_units_in_display_tick == rhs.num_units_in_display_tick ) && ( time_scale == rhs.time_scale ) &&
@@ -4218,16 +3009,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1LoopFilterFlags *>( this );
       }
 
-      operator StdVideoAV1LoopFilterFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1LoopFilterFlags *>( this );
-      }
-
-      operator StdVideoAV1LoopFilterFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1LoopFilterFlags *>( this );
-      }
-
       bool operator==( AV1LoopFilterFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( loop_filter_delta_enabled == rhs.loop_filter_delta_enabled ) && ( loop_filter_delta_update == rhs.loop_filter_delta_update ) &&
@@ -4259,16 +3040,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1LoopFilter *>( this );
       }
 
-      operator StdVideoAV1LoopFilter const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1LoopFilter *>( this );
-      }
-
-      operator StdVideoAV1LoopFilter *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1LoopFilter *>( this );
-      }
-
       bool operator==( AV1LoopFilter const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( loop_filter_level == rhs.loop_filter_level ) && ( loop_filter_sharpness == rhs.loop_filter_sharpness ) &&
@@ -4282,13 +3053,13 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags flags                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS>     loop_filter_level       = {};
-      uint8_t                                                              loop_filter_sharpness   = {};
-      uint8_t                                                              update_ref_delta        = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME>           loop_filter_ref_deltas  = {};
-      uint8_t                                                              update_mode_delta       = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS>        loop_filter_mode_deltas = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags                   flags                   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS> loop_filter_level       = {};
+      uint8_t                                                                                loop_filter_sharpness   = {};
+      uint8_t                                                                                update_ref_delta        = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME>       loop_filter_ref_deltas  = {};
+      uint8_t                                                                                update_mode_delta       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS>    loop_filter_mode_deltas = {};
     };
 
     struct AV1QuantizationFlags
@@ -4305,16 +3076,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1QuantizationFlags *>( this );
       }
 
-      operator StdVideoAV1QuantizationFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1QuantizationFlags *>( this );
-      }
-
-      operator StdVideoAV1QuantizationFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1QuantizationFlags *>( this );
-      }
-
       bool operator==( AV1QuantizationFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( using_qmatrix == rhs.using_qmatrix ) && ( diff_uv_delta == rhs.diff_uv_delta ) && ( reserved == rhs.reserved );
@@ -4345,16 +3106,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1Quantization *>( this );
       }
 
-      operator StdVideoAV1Quantization const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1Quantization *>( this );
-      }
-
-      operator StdVideoAV1Quantization *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1Quantization *>( this );
-      }
-
       bool operator==( AV1Quantization const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( base_q_idx == rhs.base_q_idx ) && ( DeltaQYDc == rhs.DeltaQYDc ) && ( DeltaQUDc == rhs.DeltaQUDc ) &&
@@ -4394,16 +3145,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1Segmentation *>( this );
       }
 
-      operator StdVideoAV1Segmentation const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1Segmentation *>( this );
-      }
-
-      operator StdVideoAV1Segmentation *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1Segmentation *>( this );
-      }
-
       bool operator==( AV1Segmentation const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( FeatureEnabled == rhs.FeatureEnabled ) && ( FeatureData == rhs.FeatureData );
@@ -4415,8 +3156,8 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS>                            FeatureEnabled = {};
-      ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS>                            FeatureEnabled = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData    = {};
     };
 
     struct AV1TileInfoFlags
@@ -4433,16 +3174,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1TileInfoFlags *>( this );
       }
 
-      operator StdVideoAV1TileInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1TileInfoFlags *>( this );
-      }
-
-      operator StdVideoAV1TileInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1TileInfoFlags *>( this );
-      }
-
       bool operator==( AV1TileInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( uniform_tile_spacing_flag == rhs.uniform_tile_spacing_flag ) && ( reserved == rhs.reserved );
@@ -4472,16 +3203,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1TileInfo *>( this );
       }
 
-      operator StdVideoAV1TileInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1TileInfo *>( this );
-      }
-
-      operator StdVideoAV1TileInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1TileInfo *>( this );
-      }
-
       bool operator==( AV1TileInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( TileCols == rhs.TileCols ) && ( TileRows == rhs.TileRows ) &&
@@ -4501,7 +3222,7 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                            TileRows                = {};
       uint16_t                                                           context_update_tile_id  = {};
       uint8_t                                                            tile_size_bytes_minus_1 = {};
-      ArrayWrapper1D<uint8_t, 7>                                         reserved1               = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                   reserved1               = {};
       const uint16_t *                                                   pMiColStarts            = {};
       const uint16_t *                                                   pMiRowStarts            = {};
       const uint16_t *                                                   pWidthInSbsMinus1       = {};
@@ -4522,16 +3243,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1CDEF *>( this );
       }
 
-      operator StdVideoAV1CDEF const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1CDEF *>( this );
-      }
-
-      operator StdVideoAV1CDEF *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1CDEF *>( this );
-      }
-
       bool operator==( AV1CDEF const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( cdef_damping_minus_3 == rhs.cdef_damping_minus_3 ) && ( cdef_bits == rhs.cdef_bits ) && ( cdef_y_pri_strength == rhs.cdef_y_pri_strength ) &&
@@ -4545,12 +3256,12 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      uint8_t                                                          cdef_damping_minus_3 = {};
-      uint8_t                                                          cdef_bits            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
+      uint8_t                                                                                cdef_damping_minus_3 = {};
+      uint8_t                                                                                cdef_bits            = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
     };
 
     struct AV1LoopRestoration
@@ -4567,16 +3278,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1LoopRestoration *>( this );
       }
 
-      operator StdVideoAV1LoopRestoration const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1LoopRestoration *>( this );
-      }
-
-      operator StdVideoAV1LoopRestoration *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1LoopRestoration *>( this );
-      }
-
       bool operator==( AV1LoopRestoration const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( FrameRestorationType == rhs.FrameRestorationType ) && ( LoopRestorationSize == rhs.LoopRestorationSize );
@@ -4588,8 +3289,8 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES>                        LoopRestorationSize  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES>                        LoopRestorationSize  = {};
     };
 
     struct AV1GlobalMotion
@@ -4606,16 +3307,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1GlobalMotion *>( this );
       }
 
-      operator StdVideoAV1GlobalMotion const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1GlobalMotion *>( this );
-      }
-
-      operator StdVideoAV1GlobalMotion *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1GlobalMotion *>( this );
-      }
-
       bool operator==( AV1GlobalMotion const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( GmType == rhs.GmType ) && ( gm_params == rhs.gm_params );
@@ -4627,8 +3318,8 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                                     GmType    = {};
-      ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                                     GmType    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
     };
 
     struct AV1FilmGrainFlags
@@ -4645,16 +3336,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1FilmGrainFlags *>( this );
       }
 
-      operator StdVideoAV1FilmGrainFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1FilmGrainFlags *>( this );
-      }
-
-      operator StdVideoAV1FilmGrainFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1FilmGrainFlags *>( this );
-      }
-
       bool operator==( AV1FilmGrainFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( chroma_scaling_from_luma == rhs.chroma_scaling_from_luma ) && ( overlap_flag == rhs.overlap_flag ) &&
@@ -4688,16 +3369,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1FilmGrain *>( this );
       }
 
-      operator StdVideoAV1FilmGrain const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1FilmGrain *>( this );
-      }
-
-      operator StdVideoAV1FilmGrain *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1FilmGrain *>( this );
-      }
-
       bool operator==( AV1FilmGrain const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( grain_scaling_minus_8 == rhs.grain_scaling_minus_8 ) && ( ar_coeff_lag == rhs.ar_coeff_lag ) &&
@@ -4717,31 +3388,31 @@ namespace VULKAN_HPP_NAMESPACE
       }
 
     public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags flags                     = {};
-      uint8_t                                                             grain_scaling_minus_8     = {};
-      uint8_t                                                             ar_coeff_lag              = {};
-      uint8_t                                                             ar_coeff_shift_minus_6    = {};
-      uint8_t                                                             grain_scale_shift         = {};
-      uint16_t                                                            grain_seed                = {};
-      uint8_t                                                             film_grain_params_ref_idx = {};
-      uint8_t                                                             num_y_points              = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>             point_y_value             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>             point_y_scaling           = {};
-      uint8_t                                                             num_cb_points             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS>            point_cb_value            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS>            point_cb_scaling          = {};
-      uint8_t                                                             num_cr_points             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS>            point_cr_value            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS>            point_cr_scaling          = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA>              ar_coeffs_y_plus_128      = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA>            ar_coeffs_cb_plus_128     = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA>            ar_coeffs_cr_plus_128     = {};
-      uint8_t                                                             cb_mult                   = {};
-      uint8_t                                                             cb_luma_mult              = {};
-      uint16_t                                                            cb_offset                 = {};
-      uint8_t                                                             cr_mult                   = {};
-      uint8_t                                                             cr_luma_mult              = {};
-      uint16_t                                                            cr_offset                 = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags            flags                     = {};
+      uint8_t                                                                        grain_scaling_minus_8     = {};
+      uint8_t                                                                        ar_coeff_lag              = {};
+      uint8_t                                                                        ar_coeff_shift_minus_6    = {};
+      uint8_t                                                                        grain_scale_shift         = {};
+      uint16_t                                                                       grain_seed                = {};
+      uint8_t                                                                        film_grain_params_ref_idx = {};
+      uint8_t                                                                        num_y_points              = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>  point_y_value             = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>  point_y_scaling           = {};
+      uint8_t                                                                        num_cb_points             = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_value            = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_scaling          = {};
+      uint8_t                                                                        num_cr_points             = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_value            = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_scaling          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA>   ar_coeffs_y_plus_128      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cb_plus_128     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cr_plus_128     = {};
+      uint8_t                                                                        cb_mult                   = {};
+      uint8_t                                                                        cb_luma_mult              = {};
+      uint16_t                                                                       cb_offset                 = {};
+      uint8_t                                                                        cr_mult                   = {};
+      uint8_t                                                                        cr_luma_mult              = {};
+      uint16_t                                                                       cr_offset                 = {};
     };
 
     struct AV1SequenceHeaderFlags
@@ -4758,16 +3429,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1SequenceHeaderFlags *>( this );
       }
 
-      operator StdVideoAV1SequenceHeaderFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1SequenceHeaderFlags *>( this );
-      }
-
-      operator StdVideoAV1SequenceHeaderFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1SequenceHeaderFlags *>( this );
-      }
-
       bool operator==( AV1SequenceHeaderFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( still_picture == rhs.still_picture ) && ( reduced_still_picture_header == rhs.reduced_still_picture_header ) &&
@@ -4824,16 +3485,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoAV1SequenceHeader *>( this );
       }
 
-      operator StdVideoAV1SequenceHeader const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoAV1SequenceHeader *>( this );
-      }
-
-      operator StdVideoAV1SequenceHeader *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoAV1SequenceHeader *>( this );
-      }
-
       bool operator==( AV1SequenceHeader const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( seq_profile == rhs.seq_profile ) && ( frame_width_bits_minus_1 == rhs.frame_width_bits_minus_1 ) &&
@@ -4861,13 +3512,11 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                      order_hint_bits_minus_1            = {};
       uint8_t                                                      seq_force_integer_mv               = {};
       uint8_t                                                      seq_force_screen_content_tools     = {};
-      ArrayWrapper1D<uint8_t, 5>                                   reserved1                          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 5>             reserved1                          = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig * pColorConfig           = {};
       const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo *  pTimingInfo            = {};
     };
-#endif
 
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ )
     //=== vulkan_video_codec_av1std_decode ===
 
     struct DecodeAV1PictureInfoFlags
@@ -4884,16 +3533,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeAV1PictureInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeAV1PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeAV1PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeAV1PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeAV1PictureInfoFlags *>( this );
-      }
-
       bool operator==( DecodeAV1PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( error_resilient_mode == rhs.error_resilient_mode ) && ( disable_cdf_update == rhs.disable_cdf_update ) &&
@@ -4963,16 +3602,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeAV1PictureInfo *>( this );
       }
 
-      operator StdVideoDecodeAV1PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeAV1PictureInfo *>( this );
-      }
-
-      operator StdVideoDecodeAV1PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeAV1PictureInfo *>( this );
-      }
-
       bool operator==( DecodeAV1PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( frame_type == rhs.frame_type ) && ( current_frame_id == rhs.current_frame_id ) && ( OrderHint == rhs.OrderHint ) &&
@@ -5000,22 +3629,22 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                        reserved1           = {};
       VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter interpolation_filter =
         VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter::eEighttap;
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode               TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
-      uint8_t                                                                   delta_q_res         = {};
-      uint8_t                                                                   delta_lf_res        = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES>                   SkipModeFrame       = {};
-      uint8_t                                                                   coded_denom         = {};
-      ArrayWrapper1D<uint8_t, 3>                                                reserved2           = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                     OrderHints          = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                    expectedFrameId     = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo *     pTileInfo           = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization * pQuantization       = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation * pSegmentation       = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter *   pLoopFilter         = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF *         pCDEF               = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration * pLoopRestoration = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion *    pGlobalMotion    = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain *       pFilmGrain       = {};
+      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode       = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
+      uint8_t                                                     delta_q_res  = {};
+      uint8_t                                                     delta_lf_res = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES> SkipModeFrame    = {};
+      uint8_t                                                                       coded_denom      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>                              reserved2        = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>   OrderHints       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES>  expectedFrameId  = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo *         pTileInfo        = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization *     pQuantization    = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation *     pSegmentation    = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter *       pLoopFilter      = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF *             pCDEF            = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration *  pLoopRestoration = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion *     pGlobalMotion    = {};
+      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain *        pFilmGrain       = {};
     };
 
     struct DecodeAV1ReferenceInfoFlags
@@ -5032,16 +3661,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeAV1ReferenceInfoFlags *>( this );
       }
 
-      operator StdVideoDecodeAV1ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeAV1ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoDecodeAV1ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeAV1ReferenceInfoFlags *>( this );
-      }
-
       bool operator==( DecodeAV1ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( disable_frame_end_update_cdf == rhs.disable_frame_end_update_cdf ) && ( segmentation_enabled == rhs.segmentation_enabled ) &&
@@ -5073,16 +3692,6 @@ namespace VULKAN_HPP_NAMESPACE
         return *reinterpret_cast<StdVideoDecodeAV1ReferenceInfo *>( this );
       }
 
-      operator StdVideoDecodeAV1ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoDecodeAV1ReferenceInfo *>( this );
-      }
-
-      operator StdVideoDecodeAV1ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoDecodeAV1ReferenceInfo *>( this );
-      }
-
       bool operator==( DecodeAV1ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
       {
         return ( flags == rhs.flags ) && ( frame_type == rhs.frame_type ) && ( RefFrameSignBias == rhs.RefFrameSignBias ) && ( OrderHint == rhs.OrderHint ) &&
@@ -5099,431 +3708,9 @@ namespace VULKAN_HPP_NAMESPACE
       uint8_t                                                                       frame_type       = {};
       uint8_t                                                                       RefFrameSignBias = {};
       uint8_t                                                                       OrderHint        = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                         SavedOrderHints  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>   SavedOrderHints  = {};
     };
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ )
-    //=== vulkan_video_codec_av1std_encode ===
-
-    struct EncodeAV1DecoderModelInfo
-    {
-      using NativeType = StdVideoEncodeAV1DecoderModelInfo;
-
-      operator StdVideoEncodeAV1DecoderModelInfo const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1DecoderModelInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1DecoderModelInfo &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1DecoderModelInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1DecoderModelInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1DecoderModelInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1DecoderModelInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1DecoderModelInfo *>( this );
-      }
-
-      bool operator==( EncodeAV1DecoderModelInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( buffer_delay_length_minus_1 == rhs.buffer_delay_length_minus_1 ) &&
-               ( buffer_removal_time_length_minus_1 == rhs.buffer_removal_time_length_minus_1 ) &&
-               ( frame_presentation_time_length_minus_1 == rhs.frame_presentation_time_length_minus_1 ) && ( reserved1 == rhs.reserved1 ) &&
-               ( num_units_in_decoding_tick == rhs.num_units_in_decoding_tick );
-      }
-
-      bool operator!=( EncodeAV1DecoderModelInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint8_t  buffer_delay_length_minus_1            = {};
-      uint8_t  buffer_removal_time_length_minus_1     = {};
-      uint8_t  frame_presentation_time_length_minus_1 = {};
-      uint8_t  reserved1                              = {};
-      uint32_t num_units_in_decoding_tick             = {};
-    };
-
-    struct EncodeAV1ExtensionHeader
-    {
-      using NativeType = StdVideoEncodeAV1ExtensionHeader;
-
-      operator StdVideoEncodeAV1ExtensionHeader const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1ExtensionHeader *>( this );
-      }
-
-      operator StdVideoEncodeAV1ExtensionHeader &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1ExtensionHeader *>( this );
-      }
-
-      operator StdVideoEncodeAV1ExtensionHeader const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1ExtensionHeader *>( this );
-      }
-
-      operator StdVideoEncodeAV1ExtensionHeader *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1ExtensionHeader *>( this );
-      }
-
-      bool operator==( EncodeAV1ExtensionHeader const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( temporal_id == rhs.temporal_id ) && ( spatial_id == rhs.spatial_id );
-      }
-
-      bool operator!=( EncodeAV1ExtensionHeader const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint8_t temporal_id = {};
-      uint8_t spatial_id  = {};
-    };
-
-    struct EncodeAV1OperatingPointInfoFlags
-    {
-      using NativeType = StdVideoEncodeAV1OperatingPointInfoFlags;
-
-      operator StdVideoEncodeAV1OperatingPointInfoFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1OperatingPointInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfoFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1OperatingPointInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1OperatingPointInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1OperatingPointInfoFlags *>( this );
-      }
-
-      bool operator==( EncodeAV1OperatingPointInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( decoder_model_present_for_this_op == rhs.decoder_model_present_for_this_op ) && ( low_delay_mode_flag == rhs.low_delay_mode_flag ) &&
-               ( initial_display_delay_present_for_this_op == rhs.initial_display_delay_present_for_this_op ) && ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( EncodeAV1OperatingPointInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t decoder_model_present_for_this_op         : 1;
-      uint32_t low_delay_mode_flag                       : 1;
-      uint32_t initial_display_delay_present_for_this_op : 1;
-      uint32_t reserved                                  : 29;
-    };
-
-    struct EncodeAV1OperatingPointInfo
-    {
-      using NativeType = StdVideoEncodeAV1OperatingPointInfo;
-
-      operator StdVideoEncodeAV1OperatingPointInfo const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1OperatingPointInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfo &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1OperatingPointInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1OperatingPointInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1OperatingPointInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1OperatingPointInfo *>( this );
-      }
-
-      bool operator==( EncodeAV1OperatingPointInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( operating_point_idc == rhs.operating_point_idc ) && ( seq_level_idx == rhs.seq_level_idx ) &&
-               ( seq_tier == rhs.seq_tier ) && ( decoder_buffer_delay == rhs.decoder_buffer_delay ) && ( encoder_buffer_delay == rhs.encoder_buffer_delay ) &&
-               ( initial_display_delay_minus_1 == rhs.initial_display_delay_minus_1 );
-      }
-
-      bool operator!=( EncodeAV1OperatingPointInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfoFlags flags                         = {};
-      uint16_t                                                                           operating_point_idc           = {};
-      uint8_t                                                                            seq_level_idx                 = {};
-      uint8_t                                                                            seq_tier                      = {};
-      uint32_t                                                                           decoder_buffer_delay          = {};
-      uint32_t                                                                           encoder_buffer_delay          = {};
-      uint8_t                                                                            initial_display_delay_minus_1 = {};
-    };
-
-    struct EncodeAV1PictureInfoFlags
-    {
-      using NativeType = StdVideoEncodeAV1PictureInfoFlags;
-
-      operator StdVideoEncodeAV1PictureInfoFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfoFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1PictureInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1PictureInfoFlags *>( this );
-      }
-
-      bool operator==( EncodeAV1PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( error_resilient_mode == rhs.error_resilient_mode ) && ( disable_cdf_update == rhs.disable_cdf_update ) &&
-               ( use_superres == rhs.use_superres ) && ( render_and_frame_size_different == rhs.render_and_frame_size_different ) &&
-               ( allow_screen_content_tools == rhs.allow_screen_content_tools ) && ( is_filter_switchable == rhs.is_filter_switchable ) &&
-               ( force_integer_mv == rhs.force_integer_mv ) && ( frame_size_override_flag == rhs.frame_size_override_flag ) &&
-               ( buffer_removal_time_present_flag == rhs.buffer_removal_time_present_flag ) && ( allow_intrabc == rhs.allow_intrabc ) &&
-               ( frame_refs_short_signaling == rhs.frame_refs_short_signaling ) && ( allow_high_precision_mv == rhs.allow_high_precision_mv ) &&
-               ( is_motion_mode_switchable == rhs.is_motion_mode_switchable ) && ( use_ref_frame_mvs == rhs.use_ref_frame_mvs ) &&
-               ( disable_frame_end_update_cdf == rhs.disable_frame_end_update_cdf ) && ( allow_warped_motion == rhs.allow_warped_motion ) &&
-               ( reduced_tx_set == rhs.reduced_tx_set ) && ( skip_mode_present == rhs.skip_mode_present ) && ( delta_q_present == rhs.delta_q_present ) &&
-               ( delta_lf_present == rhs.delta_lf_present ) && ( delta_lf_multi == rhs.delta_lf_multi ) &&
-               ( segmentation_enabled == rhs.segmentation_enabled ) && ( segmentation_update_map == rhs.segmentation_update_map ) &&
-               ( segmentation_temporal_update == rhs.segmentation_temporal_update ) && ( segmentation_update_data == rhs.segmentation_update_data ) &&
-               ( UsesLr == rhs.UsesLr ) && ( usesChromaLr == rhs.usesChromaLr ) && ( show_frame == rhs.show_frame ) &&
-               ( showable_frame == rhs.showable_frame ) && ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( EncodeAV1PictureInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t error_resilient_mode             : 1;
-      uint32_t disable_cdf_update               : 1;
-      uint32_t use_superres                     : 1;
-      uint32_t render_and_frame_size_different  : 1;
-      uint32_t allow_screen_content_tools       : 1;
-      uint32_t is_filter_switchable             : 1;
-      uint32_t force_integer_mv                 : 1;
-      uint32_t frame_size_override_flag         : 1;
-      uint32_t buffer_removal_time_present_flag : 1;
-      uint32_t allow_intrabc                    : 1;
-      uint32_t frame_refs_short_signaling       : 1;
-      uint32_t allow_high_precision_mv          : 1;
-      uint32_t is_motion_mode_switchable        : 1;
-      uint32_t use_ref_frame_mvs                : 1;
-      uint32_t disable_frame_end_update_cdf     : 1;
-      uint32_t allow_warped_motion              : 1;
-      uint32_t reduced_tx_set                   : 1;
-      uint32_t skip_mode_present                : 1;
-      uint32_t delta_q_present                  : 1;
-      uint32_t delta_lf_present                 : 1;
-      uint32_t delta_lf_multi                   : 1;
-      uint32_t segmentation_enabled             : 1;
-      uint32_t segmentation_update_map          : 1;
-      uint32_t segmentation_temporal_update     : 1;
-      uint32_t segmentation_update_data         : 1;
-      uint32_t UsesLr                           : 1;
-      uint32_t usesChromaLr                     : 1;
-      uint32_t show_frame                       : 1;
-      uint32_t showable_frame                   : 1;
-      uint32_t reserved                         : 3;
-    };
-
-    struct EncodeAV1PictureInfo
-    {
-      using NativeType = StdVideoEncodeAV1PictureInfo;
-
-      operator StdVideoEncodeAV1PictureInfo const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1PictureInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfo &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1PictureInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1PictureInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1PictureInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1PictureInfo *>( this );
-      }
-
-      bool operator==( EncodeAV1PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( frame_type == rhs.frame_type ) && ( frame_presentation_time == rhs.frame_presentation_time ) &&
-               ( current_frame_id == rhs.current_frame_id ) && ( order_hint == rhs.order_hint ) && ( primary_ref_frame == rhs.primary_ref_frame ) &&
-               ( refresh_frame_flags == rhs.refresh_frame_flags ) && ( coded_denom == rhs.coded_denom ) &&
-               ( render_width_minus_1 == rhs.render_width_minus_1 ) && ( render_height_minus_1 == rhs.render_height_minus_1 ) &&
-               ( interpolation_filter == rhs.interpolation_filter ) && ( TxMode == rhs.TxMode ) && ( delta_q_res == rhs.delta_q_res ) &&
-               ( delta_lf_res == rhs.delta_lf_res ) && ( ref_order_hint == rhs.ref_order_hint ) && ( ref_frame_idx == rhs.ref_frame_idx ) &&
-               ( reserved1 == rhs.reserved1 ) && ( delta_frame_id_minus_1 == rhs.delta_frame_id_minus_1 ) && ( pTileInfo == rhs.pTileInfo ) &&
-               ( pQuantization == rhs.pQuantization ) && ( pSegmentation == rhs.pSegmentation ) && ( pLoopFilter == rhs.pLoopFilter ) &&
-               ( pCDEF == rhs.pCDEF ) && ( pLoopRestoration == rhs.pLoopRestoration ) && ( pGlobalMotion == rhs.pGlobalMotion ) &&
-               ( pExtensionHeader == rhs.pExtensionHeader ) && ( pBufferRemovalTimes == rhs.pBufferRemovalTimes );
-      }
-
-      bool operator!=( EncodeAV1PictureInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfoFlags flags = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType frame_type         = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType::eKey;
-      uint32_t                                                       frame_presentation_time = {};
-      uint32_t                                                       current_frame_id        = {};
-      uint8_t                                                        order_hint              = {};
-      uint8_t                                                        primary_ref_frame       = {};
-      uint8_t                                                        refresh_frame_flags     = {};
-      uint8_t                                                        coded_denom             = {};
-      uint16_t                                                       render_width_minus_1    = {};
-      uint16_t                                                       render_height_minus_1   = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter interpolation_filter =
-        VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter::eEighttap;
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode               TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
-      uint8_t                                                                   delta_q_res                  = {};
-      uint8_t                                                                   delta_lf_res                 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                     ref_order_hint               = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_REFS_PER_FRAME>                      ref_frame_idx                = {};
-      ArrayWrapper1D<uint8_t, 3>                                                reserved1                    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_REFS_PER_FRAME>                    delta_frame_id_minus_1       = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo *     pTileInfo                    = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization * pQuantization                = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation * pSegmentation                = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter *   pLoopFilter                  = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF *         pCDEF                        = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration *       pLoopRestoration    = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion *          pGlobalMotion       = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader * pExtensionHeader    = {};
-      const uint32_t *                                                                   pBufferRemovalTimes = {};
-    };
-
-    struct EncodeAV1ReferenceInfoFlags
-    {
-      using NativeType = StdVideoEncodeAV1ReferenceInfoFlags;
-
-      operator StdVideoEncodeAV1ReferenceInfoFlags const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfoFlags &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfoFlags const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1ReferenceInfoFlags *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfoFlags *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1ReferenceInfoFlags *>( this );
-      }
-
-      bool operator==( EncodeAV1ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( disable_frame_end_update_cdf == rhs.disable_frame_end_update_cdf ) && ( segmentation_enabled == rhs.segmentation_enabled ) &&
-               ( reserved == rhs.reserved );
-      }
-
-      bool operator!=( EncodeAV1ReferenceInfoFlags const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      uint32_t disable_frame_end_update_cdf : 1;
-      uint32_t segmentation_enabled         : 1;
-      uint32_t reserved                     : 30;
-    };
-
-    struct EncodeAV1ReferenceInfo
-    {
-      using NativeType = StdVideoEncodeAV1ReferenceInfo;
-
-      operator StdVideoEncodeAV1ReferenceInfo const &() const VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<const StdVideoEncodeAV1ReferenceInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfo &() VULKAN_HPP_NOEXCEPT
-      {
-        return *reinterpret_cast<StdVideoEncodeAV1ReferenceInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfo const *() const VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<const StdVideoEncodeAV1ReferenceInfo *>( this );
-      }
-
-      operator StdVideoEncodeAV1ReferenceInfo *() VULKAN_HPP_NOEXCEPT
-      {
-        return reinterpret_cast<StdVideoEncodeAV1ReferenceInfo *>( this );
-      }
-
-      bool operator==( EncodeAV1ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return ( flags == rhs.flags ) && ( RefFrameId == rhs.RefFrameId ) && ( frame_type == rhs.frame_type ) && ( OrderHint == rhs.OrderHint ) &&
-               ( reserved1 == rhs.reserved1 ) && ( pExtensionHeader == rhs.pExtensionHeader );
-      }
-
-      bool operator!=( EncodeAV1ReferenceInfo const & rhs ) const VULKAN_HPP_NOEXCEPT
-      {
-        return !operator==( rhs );
-      }
-
-    public:
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfoFlags flags      = {};
-      uint32_t                                                                      RefFrameId = {};
-      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType frame_type = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType::eKey;
-      uint8_t                                                        OrderHint  = {};
-      ArrayWrapper1D<uint8_t, 3>                                     reserved1  = {};
-      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader * pExtensionHeader = {};
-    };
-#endif
 
   }  // namespace VULKAN_HPP_VIDEO_NAMESPACE
 }  // namespace VULKAN_HPP_NAMESPACE
-
-#if defined( has_include_was_not_defined )
-#  undef has_include_was_not_defined
-#  undef __has_include
-#endif
-
 #endif
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_wayland.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_wayland.h
index 3172badb..ec706a11 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_wayland.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_wayland.h
@@ -2,7 +2,7 @@
 #define VULKAN_WAYLAND_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,21 +36,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateWaylandSurfaceKHR)(VkInstance instance,
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct wl_display* display);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateWaylandSurfaceKHR(
     VkInstance                                  instance,
     const VkWaylandSurfaceCreateInfoKHR*        pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWaylandPresentationSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     struct wl_display*                          display);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_win32.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_win32.h
index beee808f..d7a0b2ba 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_win32.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_win32.h
@@ -2,7 +2,7 @@
 #define VULKAN_WIN32_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,20 +36,16 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance instance, c
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(
     VkInstance                                  instance,
     const VkWin32SurfaceCreateInfoKHR*          pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex);
 #endif
-#endif
 
 
 // VK_KHR_external_memory_win32 is a preprocessor guard. Do not pass it to API calls.
@@ -89,21 +85,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryWin32HandleKHR)(VkDevice device, con
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryWin32HandlePropertiesKHR)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, HANDLE handle, VkMemoryWin32HandlePropertiesKHR* pMemoryWin32HandleProperties);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandleKHR(
     VkDevice                                    device,
     const VkMemoryGetWin32HandleInfoKHR*        pGetWin32HandleInfo,
     HANDLE*                                     pHandle);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandlePropertiesKHR(
     VkDevice                                    device,
     VkExternalMemoryHandleTypeFlagBits          handleType,
     HANDLE                                      handle,
     VkMemoryWin32HandlePropertiesKHR*           pMemoryWin32HandleProperties);
 #endif
-#endif
 
 
 // VK_KHR_win32_keyed_mutex is a preprocessor guard. Do not pass it to API calls.
@@ -166,19 +158,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkImportSemaphoreWin32HandleKHR)(VkDevice devic
 typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreWin32HandleKHR)(VkDevice device, const VkSemaphoreGetWin32HandleInfoKHR* pGetWin32HandleInfo, HANDLE* pHandle);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreWin32HandleKHR(
     VkDevice                                    device,
     const VkImportSemaphoreWin32HandleInfoKHR*  pImportSemaphoreWin32HandleInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreWin32HandleKHR(
     VkDevice                                    device,
     const VkSemaphoreGetWin32HandleInfoKHR*     pGetWin32HandleInfo,
     HANDLE*                                     pHandle);
 #endif
-#endif
 
 
 // VK_KHR_external_fence_win32 is a preprocessor guard. Do not pass it to API calls.
@@ -214,19 +202,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkImportFenceWin32HandleKHR)(VkDevice device, c
 typedef VkResult (VKAPI_PTR *PFN_vkGetFenceWin32HandleKHR)(VkDevice device, const VkFenceGetWin32HandleInfoKHR* pGetWin32HandleInfo, HANDLE* pHandle);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportFenceWin32HandleKHR(
     VkDevice                                    device,
     const VkImportFenceWin32HandleInfoKHR*      pImportFenceWin32HandleInfo);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetFenceWin32HandleKHR(
     VkDevice                                    device,
     const VkFenceGetWin32HandleInfoKHR*         pGetWin32HandleInfo,
     HANDLE*                                     pHandle);
 #endif
-#endif
 
 
 // VK_NV_external_memory_win32 is a preprocessor guard. Do not pass it to API calls.
@@ -250,14 +234,12 @@ typedef struct VkExportMemoryWin32HandleInfoNV {
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryWin32HandleNV)(VkDevice device, VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagsNV handleType, HANDLE* pHandle);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandleNV(
     VkDevice                                    device,
     VkDeviceMemory                              memory,
     VkExternalMemoryHandleTypeFlagsNV           handleType,
     HANDLE*                                     pHandle);
 #endif
-#endif
 
 
 // VK_NV_win32_keyed_mutex is a preprocessor guard. Do not pass it to API calls.
@@ -314,33 +296,25 @@ typedef VkResult (VKAPI_PTR *PFN_vkReleaseFullScreenExclusiveModeEXT)(VkDevice d
 typedef VkResult (VKAPI_PTR *PFN_vkGetDeviceGroupSurfacePresentModes2EXT)(VkDevice device, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkDeviceGroupPresentModeFlagsKHR* pModes);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModes2EXT(
     VkPhysicalDevice                            physicalDevice,
     const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,
     uint32_t*                                   pPresentModeCount,
     VkPresentModeKHR*                           pPresentModes);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireFullScreenExclusiveModeEXT(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkReleaseFullScreenExclusiveModeEXT(
     VkDevice                                    device,
     VkSwapchainKHR                              swapchain);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModes2EXT(
     VkDevice                                    device,
     const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,
     VkDeviceGroupPresentModeFlagsKHR*           pModes);
 #endif
-#endif
 
 
 // VK_NV_acquire_winrt_display is a preprocessor guard. Do not pass it to API calls.
@@ -351,19 +325,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkAcquireWinrtDisplayNV)(VkPhysicalDevice physi
 typedef VkResult (VKAPI_PTR *PFN_vkGetWinrtDisplayNV)(VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireWinrtDisplayNV(
     VkPhysicalDevice                            physicalDevice,
     VkDisplayKHR                                display);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetWinrtDisplayNV(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    deviceRelativeId,
     VkDisplayKHR*                               pDisplay);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_xcb.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_xcb.h
index e6acb9c3..cdf6b526 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_xcb.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_xcb.h
@@ -2,7 +2,7 @@
 #define VULKAN_XCB_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,22 +36,18 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateXcbSurfaceKHR)(VkInstance instance, con
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t* connection, xcb_visualid_t visual_id);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateXcbSurfaceKHR(
     VkInstance                                  instance,
     const VkXcbSurfaceCreateInfoKHR*            pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXcbPresentationSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     xcb_connection_t*                           connection,
     xcb_visualid_t                              visual_id);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib.h
index e2593fc7..b3c3e27d 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib.h
@@ -2,7 +2,7 @@
 #define VULKAN_XLIB_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -36,22 +36,18 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateXlibSurfaceKHR)(VkInstance instance, co
 typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display* dpy, VisualID visualID);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateXlibSurfaceKHR(
     VkInstance                                  instance,
     const VkXlibSurfaceCreateInfoKHR*           pCreateInfo,
     const VkAllocationCallbacks*                pAllocator,
     VkSurfaceKHR*                               pSurface);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXlibPresentationSupportKHR(
     VkPhysicalDevice                            physicalDevice,
     uint32_t                                    queueFamilyIndex,
     Display*                                    dpy,
     VisualID                                    visualID);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib_xrandr.h b/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib_xrandr.h
index 88b643f7..8e99190b 100644
--- a/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib_xrandr.h
+++ b/engine/thirdparty/vulkan/include/vulkan/vulkan_xlib_xrandr.h
@@ -2,7 +2,7 @@
 #define VULKAN_XLIB_XRANDR_H_ 1
 
 /*
-** Copyright 2015-2025 The Khronos Group Inc.
+** Copyright 2015-2024 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
@@ -27,21 +27,17 @@ typedef VkResult (VKAPI_PTR *PFN_vkAcquireXlibDisplayEXT)(VkPhysicalDevice physi
 typedef VkResult (VKAPI_PTR *PFN_vkGetRandROutputDisplayEXT)(VkPhysicalDevice physicalDevice, Display* dpy, RROutput rrOutput, VkDisplayKHR* pDisplay);
 
 #ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkAcquireXlibDisplayEXT(
     VkPhysicalDevice                            physicalDevice,
     Display*                                    dpy,
     VkDisplayKHR                                display);
-#endif
 
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkGetRandROutputDisplayEXT(
     VkPhysicalDevice                            physicalDevice,
     Display*                                    dpy,
     RROutput                                    rrOutput,
     VkDisplayKHR*                               pDisplay);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/engine/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch b/engine/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch
index cc9110c7..6b56d601 100644
--- a/engine/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch
+++ b/engine/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch
@@ -7,7 +7,7 @@ index 8026787ad4..7a54b12a38 100644
  #include <string>
  #endif
 -#include <vulkan/vulkan.h>
-+#include <drivers/vulkan/godot_vulkan.h>
++#include "drivers/vulkan/godot_vulkan.h"
  static inline const char* string_VkResult(VkResult input_value) {
      switch (input_value) {
          case VK_SUCCESS:
diff --git a/engine/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch b/engine/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch
index 5aa8e7e3..a6c546e3 100644
--- a/engine/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch
+++ b/engine/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch
@@ -1,21 +1,18 @@
 diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
-index 8df03649b5..42ba704beb 100644
+index 2307325d4e..ecb84094b9 100644
 --- a/thirdparty/vulkan/vk_mem_alloc.h
 +++ b/thirdparty/vulkan/vk_mem_alloc.h
-@@ -123,15 +123,12 @@ for user-defined purpose without allocating any real GPU memory.
+@@ -122,12 +122,12 @@ for user-defined purpose without allocating any real GPU memory.
  See documentation chapter: \ref statistics.
  */
  
-+#include <drivers/vulkan/godot_vulkan.h>
++#include "drivers/vulkan/godot_vulkan.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
--#if !defined(VULKAN_H_)
 -#include <vulkan/vulkan.h>
--#endif
--
+ 
  #if !defined(VMA_VULKAN_VERSION)
-     #if defined(VK_VERSION_1_4)
-         #define VMA_VULKAN_VERSION 1004000
+     #if defined(VK_VERSION_1_3)
diff --git a/engine/thirdparty/vulkan/patches/0003-VMA-add-vmaCalculateLazilyAllocatedBytes.patch b/engine/thirdparty/vulkan/patches/0003-VMA-add-vmaCalculateLazilyAllocatedBytes.patch
index 36b9f997..6c5f6893 100644
--- a/engine/thirdparty/vulkan/patches/0003-VMA-add-vmaCalculateLazilyAllocatedBytes.patch
+++ b/engine/thirdparty/vulkan/patches/0003-VMA-add-vmaCalculateLazilyAllocatedBytes.patch
@@ -1,8 +1,8 @@
 diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
-index 42ba704beb..ef158a8e57 100644
+index ecb84094b9..c436209896 100644
 --- a/thirdparty/vulkan/vk_mem_alloc.h
 +++ b/thirdparty/vulkan/vk_mem_alloc.h
-@@ -1794,6 +1794,19 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
+@@ -1713,6 +1713,19 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
      VmaAllocator VMA_NOT_NULL allocator,
      VmaTotalStatistics* VMA_NOT_NULL pStats);
  
@@ -22,7 +22,7 @@ index 42ba704beb..ef158a8e57 100644
  /** \brief Retrieves information about current memory usage and budget for all memory heaps.
  
  \param allocator
-@@ -15297,6 +15310,26 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
+@@ -14912,6 +14925,26 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
      allocator->CalculateStatistics(pStats);
  }
  
diff --git a/engine/thirdparty/vulkan/vk_enum_string_helper.h b/engine/thirdparty/vulkan/vk_enum_string_helper.h
index 224647e7..7a54b12a 100644
--- a/engine/thirdparty/vulkan/vk_enum_string_helper.h
+++ b/engine/thirdparty/vulkan/vk_enum_string_helper.h
@@ -1,8 +1,8 @@
 // *** THIS FILE IS GENERATED - DO NOT EDIT ***
 // See enum_string_helper_generator.py for modifications
-// Copyright 2023-2025 The Khronos Group Inc.
-// Copyright 2023-2025 Valve Corporation
-// Copyright 2023-2025 LunarG, Inc.
+// Copyright 2023 The Khronos Group Inc.
+// Copyright 2023 Valve Corporation
+// Copyright 2023 LunarG, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,7 +13,7 @@
 #ifdef __cplusplus
 #include <string>
 #endif
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 static inline const char* string_VkResult(VkResult input_value) {
     switch (input_value) {
         case VK_SUCCESS:
@@ -54,20 +54,16 @@ static inline const char* string_VkResult(VkResult input_value) {
             return "VK_ERROR_FRAGMENTED_POOL";
         case VK_ERROR_UNKNOWN:
             return "VK_ERROR_UNKNOWN";
-        case VK_ERROR_VALIDATION_FAILED:
-            return "VK_ERROR_VALIDATION_FAILED";
         case VK_ERROR_OUT_OF_POOL_MEMORY:
             return "VK_ERROR_OUT_OF_POOL_MEMORY";
         case VK_ERROR_INVALID_EXTERNAL_HANDLE:
             return "VK_ERROR_INVALID_EXTERNAL_HANDLE";
-        case VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS:
-            return "VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS";
         case VK_ERROR_FRAGMENTATION:
             return "VK_ERROR_FRAGMENTATION";
+        case VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS:
+            return "VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS";
         case VK_PIPELINE_COMPILE_REQUIRED:
             return "VK_PIPELINE_COMPILE_REQUIRED";
-        case VK_ERROR_NOT_PERMITTED:
-            return "VK_ERROR_NOT_PERMITTED";
         case VK_ERROR_SURFACE_LOST_KHR:
             return "VK_ERROR_SURFACE_LOST_KHR";
         case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR:
@@ -78,6 +74,8 @@ static inline const char* string_VkResult(VkResult input_value) {
             return "VK_ERROR_OUT_OF_DATE_KHR";
         case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR:
             return "VK_ERROR_INCOMPATIBLE_DISPLAY_KHR";
+        case VK_ERROR_VALIDATION_FAILED_EXT:
+            return "VK_ERROR_VALIDATION_FAILED_EXT";
         case VK_ERROR_INVALID_SHADER_NV:
             return "VK_ERROR_INVALID_SHADER_NV";
         case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR:
@@ -94,8 +92,8 @@ static inline const char* string_VkResult(VkResult input_value) {
             return "VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR";
         case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
             return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
-        case VK_ERROR_PRESENT_TIMING_QUEUE_FULL_EXT:
-            return "VK_ERROR_PRESENT_TIMING_QUEUE_FULL_EXT";
+        case VK_ERROR_NOT_PERMITTED_KHR:
+            return "VK_ERROR_NOT_PERMITTED_KHR";
         case VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT:
             return "VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT";
         case VK_THREAD_IDLE_KHR:
@@ -112,10 +110,6 @@ static inline const char* string_VkResult(VkResult input_value) {
             return "VK_ERROR_COMPRESSION_EXHAUSTED_EXT";
         case VK_INCOMPATIBLE_SHADER_BINARY_EXT:
             return "VK_INCOMPATIBLE_SHADER_BINARY_EXT";
-        case VK_PIPELINE_BINARY_MISSING_KHR:
-            return "VK_PIPELINE_BINARY_MISSING_KHR";
-        case VK_ERROR_NOT_ENOUGH_SPACE_KHR:
-            return "VK_ERROR_NOT_ENOUGH_SPACE_KHR";
         default:
             return "Unhandled VkResult";
     }
@@ -220,16 +214,22 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO";
         case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES";
         case VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO:
             return "VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO";
         case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO:
             return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES";
         case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS:
             return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS";
         case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO:
             return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO";
         case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO:
             return "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO";
+        case VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO:
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO";
         case VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO:
             return "VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO";
         case VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO:
@@ -272,8 +272,22 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES";
+        case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO";
         case VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES";
         case VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO:
             return "VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES:
@@ -282,6 +296,20 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES";
         case VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2:
             return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2";
+        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO";
+        case VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO:
+            return "VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO";
+        case VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO:
+            return "VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES";
+        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES";
+        case VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO";
         case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES:
@@ -310,44 +338,10 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO";
         case VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES:
             return "VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES";
         case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT:
             return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO";
-        case VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO:
-            return "VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO";
-        case VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO:
-            return "VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES:
@@ -360,10 +354,72 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES";
         case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2";
+        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2";
+        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2";
+        case VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2";
+        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2";
+        case VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO:
+            return "VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO";
+        case VK_STRUCTURE_TYPE_SUBPASS_END_INFO:
+            return "VK_STRUCTURE_TYPE_SUBPASS_END_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES";
+        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES";
+        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO";
+        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES";
+        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES";
+        case VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES";
+        case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES";
+        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO:
+            return "VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO";
+        case VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES";
+        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT";
+        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES:
@@ -388,80 +444,26 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO";
         case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO:
             return "VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES";
-        case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2";
-        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2:
-            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2";
-        case VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2:
-            return "VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2";
-        case VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO:
-            return "VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO";
-        case VK_STRUCTURE_TYPE_SUBPASS_END_INFO:
-            return "VK_STRUCTURE_TYPE_SUBPASS_END_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES";
-        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE:
-            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE";
-        case VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO:
-            return "VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES";
+        case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
+            return "VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES";
         case VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO";
         case VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES";
         case VK_STRUCTURE_TYPE_MEMORY_BARRIER_2:
             return "VK_STRUCTURE_TYPE_MEMORY_BARRIER_2";
         case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2:
@@ -478,6 +480,10 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES";
         case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2:
             return "VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2";
         case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2:
@@ -486,36 +492,20 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2";
         case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2:
             return "VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2";
+        case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2:
+            return "VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2";
+        case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2:
+            return "VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2";
         case VK_STRUCTURE_TYPE_BUFFER_COPY_2:
             return "VK_STRUCTURE_TYPE_BUFFER_COPY_2";
         case VK_STRUCTURE_TYPE_IMAGE_COPY_2:
             return "VK_STRUCTURE_TYPE_IMAGE_COPY_2";
+        case VK_STRUCTURE_TYPE_IMAGE_BLIT_2:
+            return "VK_STRUCTURE_TYPE_IMAGE_BLIT_2";
         case VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2:
             return "VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES";
-        case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3:
-            return "VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS:
-            return "VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS";
-        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS:
-            return "VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES";
+        case VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2:
+            return "VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES";
         case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO:
@@ -530,20 +520,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK";
         case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO:
             return "VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES";
-        case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2:
-            return "VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2";
-        case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2:
-            return "VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2";
-        case VK_STRUCTURE_TYPE_IMAGE_BLIT_2:
-            return "VK_STRUCTURE_TYPE_IMAGE_BLIT_2";
-        case VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2:
-            return "VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES";
         case VK_STRUCTURE_TYPE_RENDERING_INFO:
             return "VK_STRUCTURE_TYPE_RENDERING_INFO";
         case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO:
@@ -554,106 +532,22 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES";
         case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO:
             return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES";
-        case VK_STRUCTURE_TYPE_MEMORY_MAP_INFO:
-            return "VK_STRUCTURE_TYPE_MEMORY_MAP_INFO";
-        case VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO:
-            return "VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES";
-        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO:
-            return "VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO";
-        case VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2:
-            return "VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2";
-        case VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2:
-            return "VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2";
-        case VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES";
-        case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS:
-            return "VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES";
-        case VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY:
-            return "VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY";
-        case VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY:
-            return "VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO:
-            return "VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO:
-            return "VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO";
-        case VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO:
-            return "VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO:
-            return "VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO";
-        case VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE:
-            return "VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE";
-        case VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY:
-            return "VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES";
-        case VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO:
-            return "VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO";
-        case VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO:
-            return "VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO";
-        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO:
-            return "VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO";
-        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO:
-            return "VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES";
-        case VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES";
-        case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO:
-            return "VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES";
-        case VK_STRUCTURE_TYPE_RENDERING_AREA_INFO:
-            return "VK_STRUCTURE_TYPE_RENDERING_AREA_INFO";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES";
-        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO:
-            return "VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO";
-        case VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO:
-            return "VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES";
+        case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3:
+            return "VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES";
+        case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS:
+            return "VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS";
+        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS:
+            return "VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS";
         case VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR:
             return "VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR";
         case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR:
@@ -754,8 +648,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX";
         case VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX:
             return "VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX";
-        case VK_STRUCTURE_TYPE_CU_MODULE_TEXTURING_MODE_CREATE_INFO_NVX:
-            return "VK_STRUCTURE_TYPE_CU_MODULE_TEXTURING_MODE_CREATE_INFO_NVX";
         case VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX:
             return "VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX";
         case VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX:
@@ -830,6 +722,14 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR";
         case VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD:
             return "VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD";
+        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR";
+        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT";
+        case VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD";
+        case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX:
+            return "VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX";
         case VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP:
             return "VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV:
@@ -852,6 +752,12 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR:
             return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR";
         case VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR:
@@ -880,6 +786,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR";
         case VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR:
             return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT:
             return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT:
@@ -904,8 +812,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX";
-        case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX:
-            return "VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX";
         case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV:
             return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT:
@@ -1006,10 +912,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
         case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX:
             return "VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX";
 #endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT:
             return "VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT";
         case VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT:
@@ -1160,12 +1062,20 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR";
         case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR:
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR";
+        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD:
             return "VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP:
             return "VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV:
@@ -1180,30 +1090,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV";
         case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV:
             return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV";
-        case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV:
-            return "VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT:
-            return "VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT:
-            return "VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL";
         case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL:
@@ -1234,8 +1120,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT:
             return "VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT";
         case VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
             return "VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR";
         case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR:
@@ -1246,12 +1130,16 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR";
-        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR";
+        case VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR:
@@ -1320,6 +1208,30 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR";
         case VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR:
             return "VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES_EXT";
+        case VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT:
+            return "VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT";
+        case VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT:
+            return "VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY_EXT";
+        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO_EXT";
+        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT";
+        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT:
+            return "VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE_EXT";
+        case VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT:
+            return "VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT";
+        case VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR";
+        case VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT:
@@ -1328,6 +1240,24 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT:
+            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT";
+        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT:
+            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT";
+        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT:
+            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT";
+        case VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT:
+            return "VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV";
         case VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV:
@@ -1366,6 +1296,10 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT";
         case VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT:
             return "VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT:
             return "VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT:
@@ -1410,7 +1344,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV";
         case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV:
             return "VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
         case VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV:
             return "VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV";
         case VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV:
@@ -1421,19 +1354,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM";
         case VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV:
             return "VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV";
         case VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT:
@@ -1460,6 +1380,10 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_EXPORT_METAL_SHARED_EVENT_INFO_EXT";
         case VK_STRUCTURE_TYPE_IMPORT_METAL_SHARED_EVENT_INFO_EXT:
             return "VK_STRUCTURE_TYPE_IMPORT_METAL_SHARED_EVENT_INFO_EXT";
+        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV:
+            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV";
+        case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV:
+            return "VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT:
@@ -1632,16 +1556,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT:
@@ -1698,6 +1612,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM:
             return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM:
@@ -1714,6 +1630,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE";
         case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE:
             return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM:
@@ -1726,20 +1644,26 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM";
         case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM:
             return "VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM";
+        case VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM:
+            return "VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV";
         case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV:
             return "VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV";
         case VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV:
             return "VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_LINEAR_SWEPT_SPHERES_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_LINEAR_SWEPT_SPHERES_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV:
-            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV:
-            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR:
@@ -1756,18 +1680,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS:
-            return "VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS:
-            return "VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS:
-            return "VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS";
-        case VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS:
-            return "VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS:
-            return "VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS";
-        case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS";
         case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT:
             return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT:
@@ -1786,54 +1698,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG";
         case VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG:
             return "VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG";
-        case VK_STRUCTURE_TYPE_TENSOR_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_VIEW_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_VIEW_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_BIND_TENSOR_MEMORY_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_BIND_TENSOR_MEMORY_INFO_ARM";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_TENSOR_ARM:
-            return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_TENSOR_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_FORMAT_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_FORMAT_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_DESCRIPTION_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_DESCRIPTION_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_MEMORY_REQUIREMENTS_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_MEMORY_REQUIREMENTS_INFO_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_MEMORY_BARRIER_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_MEMORY_BARRIER_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_DEVICE_TENSOR_MEMORY_REQUIREMENTS_ARM:
-            return "VK_STRUCTURE_TYPE_DEVICE_TENSOR_MEMORY_REQUIREMENTS_ARM";
-        case VK_STRUCTURE_TYPE_COPY_TENSOR_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_COPY_TENSOR_INFO_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_COPY_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_COPY_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_DEPENDENCY_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_DEPENDENCY_INFO_ARM";
-        case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_TENSOR_ARM:
-            return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_TENSOR_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_TENSOR_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_TENSOR_INFO_ARM";
-        case VK_STRUCTURE_TYPE_EXTERNAL_TENSOR_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_TENSOR_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_TENSOR_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_TENSOR_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_GET_TENSOR_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_GET_TENSOR_INFO_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_CAPTURE_DESCRIPTOR_DATA_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_CAPTURE_DESCRIPTOR_DATA_INFO_ARM";
-        case VK_STRUCTURE_TYPE_TENSOR_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_TENSOR_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_ARM";
-        case VK_STRUCTURE_TYPE_FRAME_BOUNDARY_TENSORS_ARM:
-            return "VK_STRUCTURE_TYPE_FRAME_BOUNDARY_TENSORS_ARM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT:
@@ -1860,36 +1724,30 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_PRIVATE_DATA_INFO_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID";
         case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID:
             return "VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD";
-        case VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD:
-            return "VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD";
-        case VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD:
-            return "VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX:
-            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR:
-            return "VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR";
-        case VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR:
-            return "VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_WAIT_2_KHR:
-            return "VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_WAIT_2_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_2_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_2_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PRESENT_WAIT_2_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PRESENT_WAIT_2_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR";
+        case VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR";
+        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR";
+        case VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR:
+            return "VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2_KHR";
+        case VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR:
+            return "VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2_KHR";
+        case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR";
+        case VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT:
@@ -1898,26 +1756,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT:
             return "VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_BINARY_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_BINARY_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_KEY_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_BINARY_KEY_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_DATA_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_BINARY_DATA_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR:
-            return "VK_STRUCTURE_TYPE_DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_HANDLES_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_PIPELINE_BINARY_HANDLES_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM";
         case VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM:
@@ -1926,38 +1764,12 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC";
         case VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC:
             return "VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR:
-            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR:
-            return "VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_VECTOR_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_COOPERATIVE_VECTOR_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_CONVERT_COOPERATIVE_VECTOR_MATRIX_INFO_NV:
-            return "VK_STRUCTURE_TYPE_CONVERT_COOPERATIVE_VECTOR_MATRIX_INFO_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV:
@@ -1966,10 +1778,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT:
             return "VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT";
         case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
             return "VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM:
@@ -2004,54 +1812,10 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_RESOURCE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_RESOURCE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_MEMORY_REQUIREMENTS_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_MEMORY_REQUIREMENTS_INFO_ARM";
-        case VK_STRUCTURE_TYPE_BIND_DATA_GRAPH_PIPELINE_SESSION_MEMORY_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_BIND_DATA_GRAPH_PIPELINE_SESSION_MEMORY_INFO_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SHADER_MODULE_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SHADER_MODULE_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_PROPERTY_QUERY_RESULT_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_PROPERTY_QUERY_RESULT_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_COMPILER_CONTROL_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_COMPILER_CONTROL_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENTS_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENTS_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENT_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENT_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_IDENTIFIER_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_IDENTIFIER_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_DISPATCH_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_DISPATCH_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PROCESSING_ENGINE_CREATE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PROCESSING_ENGINE_CREATE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_INFO_ARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_TENSOR_SEMI_STRUCTURED_SPARSITY_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_TENSOR_SEMI_STRUCTURED_SPARSITY_INFO_ARM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM";
         case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM:
             return "VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR:
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR";
         case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR:
@@ -2062,36 +1826,6 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR";
         case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR:
             return "VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PICTURE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PICTURE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_DPB_SLOT_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_DPB_SLOT_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_AV1_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_AV1_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PROFILE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PROFILE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_LAYER_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_LAYER_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUALITY_LEVEL_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUALITY_LEVEL_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_GOP_REMAINING_FRAME_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_GOP_REMAINING_FRAME_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_DECODE_VP9_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_DECODE_VP9_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PICTURE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PICTURE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PROFILE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PROFILE_INFO_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR:
@@ -2118,10 +1852,14 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR";
+        case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR";
         case VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX:
             return "VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX";
         case VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX:
@@ -2134,292 +1872,56 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR:
             return "VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES_KHR";
+        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES_KHR";
+        case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR:
+            return "VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR";
+        case VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO_KHR";
+        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR:
+            return "VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO_KHR";
         case VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT:
             return "VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT";
         case VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT:
             return "VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM:
-            return "VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_DECOMPRESS_MEMORY_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_DECOMPRESS_MEMORY_INFO_EXT";
-        case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV:
-            return "VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV";
-        case VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_SESSION_PARAMETERS_CREATE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUANTIZATION_MAP_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUANTIZATION_MAP_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUANTIZATION_MAP_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUANTIZATION_MAP_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_H265_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_FORMAT_H265_QUANTIZATION_MAP_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUANTIZATION_MAP_CAPABILITIES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_AV1_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_FORMAT_AV1_QUANTIZATION_MAP_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT";
         case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV:
-            return "VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_TRIANGLE_CLUSTER_INPUT_NV:
-            return "VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_TRIANGLE_CLUSTER_INPUT_NV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_MOVE_OBJECTS_INPUT_NV:
-            return "VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_MOVE_OBJECTS_INPUT_NV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV:
-            return "VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV:
-            return "VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CLUSTER_ACCELERATION_STRUCTURE_CREATE_INFO_NV:
-            return "VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CLUSTER_ACCELERATION_STRUCTURE_CREATE_INFO_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_PARTITIONED_ACCELERATION_STRUCTURE_NV:
-            return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_PARTITIONED_ACCELERATION_STRUCTURE_NV";
-        case VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCES_INPUT_NV:
-            return "VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCES_INPUT_NV";
-        case VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV:
-            return "VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV";
-        case VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_FLAGS_NV:
-            return "VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_FLAGS_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_CREATE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_EXT";
-        case VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_PIPELINE_EXT:
-            return "VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_PIPELINE_EXT";
-        case VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_SHADER_EXT:
-            return "VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_SHADER_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_PIPELINE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_PIPELINE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_INFO_EXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_LAYOUT_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_LAYOUT_INFO_EXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_PIPELINE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_GENERATED_COMMANDS_PIPELINE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_SHADER_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_GENERATED_COMMANDS_SHADER_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR:
-            return "VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA";
-        case VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA:
-            return "VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_2_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_2_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS:
-            return "VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS:
-            return "VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS:
-            return "VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI";
-        case VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI:
-            return "VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_FLEXIBLE_DIMENSIONS_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_FLEXIBLE_DIMENSIONS_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_PROPERTIES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_PROPERTIES_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_OPACITY_MICROMAP_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_OPACITY_MICROMAP_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_METAL_HANDLE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_METAL_HANDLE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_MEMORY_METAL_HANDLE_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_MEMORY_METAL_HANDLE_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM:
-            return "VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM:
-            return "VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FORMAT_PACK_FEATURES_ARM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FORMAT_PACK_FEATURES_ARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE";
-        case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE:
-            return "VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV:
-            return "VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_INDEXING_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_INDEXING_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT";
-        case VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT:
-            return "VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_QCOM:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_QCOM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM:
-            return "VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_FEATURES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_FEATURES_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_PROPERTIES_KHR:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_PROPERTIES_KHR";
-        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_FLAGS_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_FLAGS_INFO_KHR";
-        case VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR";
-        case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_MODE_INFO_KHR:
-            return "VK_STRUCTURE_TYPE_RESOLVE_IMAGE_MODE_INFO_KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_FEATURES_EXT:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_FEATURES_EXT";
         default:
             return "Unhandled VkStructureType";
     }
 }
+static inline const char* string_VkPipelineCacheHeaderVersion(VkPipelineCacheHeaderVersion input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_CACHE_HEADER_VERSION_ONE:
+            return "VK_PIPELINE_CACHE_HEADER_VERSION_ONE";
+        default:
+            return "Unhandled VkPipelineCacheHeaderVersion";
+    }
+}
 static inline const char* string_VkImageLayout(VkImageLayout input_value) {
     switch (input_value) {
         case VK_IMAGE_LAYOUT_UNDEFINED:
@@ -2456,8 +1958,6 @@ static inline const char* string_VkImageLayout(VkImageLayout input_value) {
             return "VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL";
         case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL:
             return "VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL";
-        case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ:
-            return "VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ";
         case VK_IMAGE_LAYOUT_PRESENT_SRC_KHR:
             return "VK_IMAGE_LAYOUT_PRESENT_SRC_KHR";
         case VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR:
@@ -2472,6 +1972,8 @@ static inline const char* string_VkImageLayout(VkImageLayout input_value) {
             return "VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT";
         case VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR:
             return "VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR";
+        case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR:
+            return "VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR";
         case VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR:
             return "VK_IMAGE_LAYOUT_VIDEO_ENCODE_DST_KHR";
         case VK_IMAGE_LAYOUT_VIDEO_ENCODE_SRC_KHR:
@@ -2480,12 +1982,6 @@ static inline const char* string_VkImageLayout(VkImageLayout input_value) {
             return "VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR";
         case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
             return "VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT";
-        case VK_IMAGE_LAYOUT_TENSOR_ALIASING_ARM:
-            return "VK_IMAGE_LAYOUT_TENSOR_ALIASING_ARM";
-        case VK_IMAGE_LAYOUT_VIDEO_ENCODE_QUANTIZATION_MAP_KHR:
-            return "VK_IMAGE_LAYOUT_VIDEO_ENCODE_QUANTIZATION_MAP_KHR";
-        case VK_IMAGE_LAYOUT_ZERO_INITIALIZED_EXT:
-            return "VK_IMAGE_LAYOUT_ZERO_INITIALIZED_EXT";
         default:
             return "Unhandled VkImageLayout";
     }
@@ -2544,10 +2040,10 @@ static inline const char* string_VkObjectType(VkObjectType input_value) {
             return "VK_OBJECT_TYPE_FRAMEBUFFER";
         case VK_OBJECT_TYPE_COMMAND_POOL:
             return "VK_OBJECT_TYPE_COMMAND_POOL";
-        case VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE:
-            return "VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE";
         case VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION:
             return "VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION";
+        case VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE:
+            return "VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE";
         case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT:
             return "VK_OBJECT_TYPE_PRIVATE_DATA_SLOT";
         case VK_OBJECT_TYPE_SURFACE_KHR:
@@ -2582,42 +2078,24 @@ static inline const char* string_VkObjectType(VkObjectType input_value) {
             return "VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR";
         case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV:
             return "VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
         case VK_OBJECT_TYPE_CUDA_MODULE_NV:
             return "VK_OBJECT_TYPE_CUDA_MODULE_NV";
         case VK_OBJECT_TYPE_CUDA_FUNCTION_NV:
             return "VK_OBJECT_TYPE_CUDA_FUNCTION_NV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
         case VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA:
             return "VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA";
         case VK_OBJECT_TYPE_MICROMAP_EXT:
             return "VK_OBJECT_TYPE_MICROMAP_EXT";
-        case VK_OBJECT_TYPE_TENSOR_ARM:
-            return "VK_OBJECT_TYPE_TENSOR_ARM";
-        case VK_OBJECT_TYPE_TENSOR_VIEW_ARM:
-            return "VK_OBJECT_TYPE_TENSOR_VIEW_ARM";
         case VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV:
             return "VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV";
         case VK_OBJECT_TYPE_SHADER_EXT:
             return "VK_OBJECT_TYPE_SHADER_EXT";
-        case VK_OBJECT_TYPE_PIPELINE_BINARY_KHR:
-            return "VK_OBJECT_TYPE_PIPELINE_BINARY_KHR";
-        case VK_OBJECT_TYPE_DATA_GRAPH_PIPELINE_SESSION_ARM:
-            return "VK_OBJECT_TYPE_DATA_GRAPH_PIPELINE_SESSION_ARM";
-        case VK_OBJECT_TYPE_EXTERNAL_COMPUTE_QUEUE_NV:
-            return "VK_OBJECT_TYPE_EXTERNAL_COMPUTE_QUEUE_NV";
-        case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_EXT:
-            return "VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_EXT";
-        case VK_OBJECT_TYPE_INDIRECT_EXECUTION_SET_EXT:
-            return "VK_OBJECT_TYPE_INDIRECT_EXECUTION_SET_EXT";
         default:
             return "Unhandled VkObjectType";
     }
 }
 static inline const char* string_VkVendorId(VkVendorId input_value) {
     switch (input_value) {
-        case VK_VENDOR_ID_KHRONOS:
-            return "VK_VENDOR_ID_KHRONOS";
         case VK_VENDOR_ID_VIV:
             return "VK_VENDOR_ID_VIV";
         case VK_VENDOR_ID_VSI:
@@ -3140,10 +2618,6 @@ static inline const char* string_VkFormat(VkFormat input_value) {
             return "VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK";
         case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK:
             return "VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK";
-        case VK_FORMAT_A1B5G5R5_UNORM_PACK16:
-            return "VK_FORMAT_A1B5G5R5_UNORM_PACK16";
-        case VK_FORMAT_A8_UNORM:
-            return "VK_FORMAT_A8_UNORM";
         case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG:
             return "VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG";
         case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG:
@@ -3160,38 +2634,12 @@ static inline const char* string_VkFormat(VkFormat input_value) {
             return "VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG";
         case VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG:
             return "VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG";
-        case VK_FORMAT_R8_BOOL_ARM:
-            return "VK_FORMAT_R8_BOOL_ARM";
         case VK_FORMAT_R16G16_SFIXED5_NV:
             return "VK_FORMAT_R16G16_SFIXED5_NV";
-        case VK_FORMAT_R10X6_UINT_PACK16_ARM:
-            return "VK_FORMAT_R10X6_UINT_PACK16_ARM";
-        case VK_FORMAT_R10X6G10X6_UINT_2PACK16_ARM:
-            return "VK_FORMAT_R10X6G10X6_UINT_2PACK16_ARM";
-        case VK_FORMAT_R10X6G10X6B10X6A10X6_UINT_4PACK16_ARM:
-            return "VK_FORMAT_R10X6G10X6B10X6A10X6_UINT_4PACK16_ARM";
-        case VK_FORMAT_R12X4_UINT_PACK16_ARM:
-            return "VK_FORMAT_R12X4_UINT_PACK16_ARM";
-        case VK_FORMAT_R12X4G12X4_UINT_2PACK16_ARM:
-            return "VK_FORMAT_R12X4G12X4_UINT_2PACK16_ARM";
-        case VK_FORMAT_R12X4G12X4B12X4A12X4_UINT_4PACK16_ARM:
-            return "VK_FORMAT_R12X4G12X4B12X4A12X4_UINT_4PACK16_ARM";
-        case VK_FORMAT_R14X2_UINT_PACK16_ARM:
-            return "VK_FORMAT_R14X2_UINT_PACK16_ARM";
-        case VK_FORMAT_R14X2G14X2_UINT_2PACK16_ARM:
-            return "VK_FORMAT_R14X2G14X2_UINT_2PACK16_ARM";
-        case VK_FORMAT_R14X2G14X2B14X2A14X2_UINT_4PACK16_ARM:
-            return "VK_FORMAT_R14X2G14X2B14X2A14X2_UINT_4PACK16_ARM";
-        case VK_FORMAT_R14X2_UNORM_PACK16_ARM:
-            return "VK_FORMAT_R14X2_UNORM_PACK16_ARM";
-        case VK_FORMAT_R14X2G14X2_UNORM_2PACK16_ARM:
-            return "VK_FORMAT_R14X2G14X2_UNORM_2PACK16_ARM";
-        case VK_FORMAT_R14X2G14X2B14X2A14X2_UNORM_4PACK16_ARM:
-            return "VK_FORMAT_R14X2G14X2B14X2A14X2_UNORM_4PACK16_ARM";
-        case VK_FORMAT_G14X2_B14X2R14X2_2PLANE_420_UNORM_3PACK16_ARM:
-            return "VK_FORMAT_G14X2_B14X2R14X2_2PLANE_420_UNORM_3PACK16_ARM";
-        case VK_FORMAT_G14X2_B14X2R14X2_2PLANE_422_UNORM_3PACK16_ARM:
-            return "VK_FORMAT_G14X2_B14X2R14X2_2PLANE_422_UNORM_3PACK16_ARM";
+        case VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR:
+            return "VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR";
+        case VK_FORMAT_A8_UNORM_KHR:
+            return "VK_FORMAT_A8_UNORM_KHR";
         default:
             return "Unhandled VkFormat";
     }
@@ -3326,186 +2774,6 @@ static inline const char* string_VkImageViewType(VkImageViewType input_value) {
             return "Unhandled VkImageViewType";
     }
 }
-static inline const char* string_VkCommandBufferLevel(VkCommandBufferLevel input_value) {
-    switch (input_value) {
-        case VK_COMMAND_BUFFER_LEVEL_PRIMARY:
-            return "VK_COMMAND_BUFFER_LEVEL_PRIMARY";
-        case VK_COMMAND_BUFFER_LEVEL_SECONDARY:
-            return "VK_COMMAND_BUFFER_LEVEL_SECONDARY";
-        default:
-            return "Unhandled VkCommandBufferLevel";
-    }
-}
-static inline const char* string_VkIndexType(VkIndexType input_value) {
-    switch (input_value) {
-        case VK_INDEX_TYPE_UINT16:
-            return "VK_INDEX_TYPE_UINT16";
-        case VK_INDEX_TYPE_UINT32:
-            return "VK_INDEX_TYPE_UINT32";
-        case VK_INDEX_TYPE_UINT8:
-            return "VK_INDEX_TYPE_UINT8";
-        case VK_INDEX_TYPE_NONE_KHR:
-            return "VK_INDEX_TYPE_NONE_KHR";
-        default:
-            return "Unhandled VkIndexType";
-    }
-}
-static inline const char* string_VkPipelineCacheHeaderVersion(VkPipelineCacheHeaderVersion input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_CACHE_HEADER_VERSION_ONE:
-            return "VK_PIPELINE_CACHE_HEADER_VERSION_ONE";
-        case VK_PIPELINE_CACHE_HEADER_VERSION_DATA_GRAPH_QCOM:
-            return "VK_PIPELINE_CACHE_HEADER_VERSION_DATA_GRAPH_QCOM";
-        default:
-            return "Unhandled VkPipelineCacheHeaderVersion";
-    }
-}
-static inline const char* string_VkBorderColor(VkBorderColor input_value) {
-    switch (input_value) {
-        case VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK:
-            return "VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK";
-        case VK_BORDER_COLOR_INT_TRANSPARENT_BLACK:
-            return "VK_BORDER_COLOR_INT_TRANSPARENT_BLACK";
-        case VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK:
-            return "VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK";
-        case VK_BORDER_COLOR_INT_OPAQUE_BLACK:
-            return "VK_BORDER_COLOR_INT_OPAQUE_BLACK";
-        case VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE:
-            return "VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE";
-        case VK_BORDER_COLOR_INT_OPAQUE_WHITE:
-            return "VK_BORDER_COLOR_INT_OPAQUE_WHITE";
-        case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT:
-            return "VK_BORDER_COLOR_FLOAT_CUSTOM_EXT";
-        case VK_BORDER_COLOR_INT_CUSTOM_EXT:
-            return "VK_BORDER_COLOR_INT_CUSTOM_EXT";
-        default:
-            return "Unhandled VkBorderColor";
-    }
-}
-static inline const char* string_VkFilter(VkFilter input_value) {
-    switch (input_value) {
-        case VK_FILTER_NEAREST:
-            return "VK_FILTER_NEAREST";
-        case VK_FILTER_LINEAR:
-            return "VK_FILTER_LINEAR";
-        case VK_FILTER_CUBIC_EXT:
-            return "VK_FILTER_CUBIC_EXT";
-        default:
-            return "Unhandled VkFilter";
-    }
-}
-static inline const char* string_VkSamplerAddressMode(VkSamplerAddressMode input_value) {
-    switch (input_value) {
-        case VK_SAMPLER_ADDRESS_MODE_REPEAT:
-            return "VK_SAMPLER_ADDRESS_MODE_REPEAT";
-        case VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT:
-            return "VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT";
-        case VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE:
-            return "VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE";
-        case VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER:
-            return "VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER";
-        case VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE:
-            return "VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE";
-        default:
-            return "Unhandled VkSamplerAddressMode";
-    }
-}
-static inline const char* string_VkSamplerMipmapMode(VkSamplerMipmapMode input_value) {
-    switch (input_value) {
-        case VK_SAMPLER_MIPMAP_MODE_NEAREST:
-            return "VK_SAMPLER_MIPMAP_MODE_NEAREST";
-        case VK_SAMPLER_MIPMAP_MODE_LINEAR:
-            return "VK_SAMPLER_MIPMAP_MODE_LINEAR";
-        default:
-            return "Unhandled VkSamplerMipmapMode";
-    }
-}
-static inline const char* string_VkCompareOp(VkCompareOp input_value) {
-    switch (input_value) {
-        case VK_COMPARE_OP_NEVER:
-            return "VK_COMPARE_OP_NEVER";
-        case VK_COMPARE_OP_LESS:
-            return "VK_COMPARE_OP_LESS";
-        case VK_COMPARE_OP_EQUAL:
-            return "VK_COMPARE_OP_EQUAL";
-        case VK_COMPARE_OP_LESS_OR_EQUAL:
-            return "VK_COMPARE_OP_LESS_OR_EQUAL";
-        case VK_COMPARE_OP_GREATER:
-            return "VK_COMPARE_OP_GREATER";
-        case VK_COMPARE_OP_NOT_EQUAL:
-            return "VK_COMPARE_OP_NOT_EQUAL";
-        case VK_COMPARE_OP_GREATER_OR_EQUAL:
-            return "VK_COMPARE_OP_GREATER_OR_EQUAL";
-        case VK_COMPARE_OP_ALWAYS:
-            return "VK_COMPARE_OP_ALWAYS";
-        default:
-            return "Unhandled VkCompareOp";
-    }
-}
-static inline const char* string_VkDescriptorType(VkDescriptorType input_value) {
-    switch (input_value) {
-        case VK_DESCRIPTOR_TYPE_SAMPLER:
-            return "VK_DESCRIPTOR_TYPE_SAMPLER";
-        case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
-            return "VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER";
-        case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
-            return "VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE";
-        case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
-            return "VK_DESCRIPTOR_TYPE_STORAGE_IMAGE";
-        case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
-            return "VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER";
-        case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
-            return "VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER";
-        case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
-            return "VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER";
-        case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
-            return "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER";
-        case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
-            return "VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC";
-        case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
-            return "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC";
-        case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
-            return "VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT";
-        case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK:
-            return "VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK";
-        case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
-            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR";
-        case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV:
-            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV";
-        case VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM:
-            return "VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM";
-        case VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM:
-            return "VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM";
-        case VK_DESCRIPTOR_TYPE_TENSOR_ARM:
-            return "VK_DESCRIPTOR_TYPE_TENSOR_ARM";
-        case VK_DESCRIPTOR_TYPE_MUTABLE_EXT:
-            return "VK_DESCRIPTOR_TYPE_MUTABLE_EXT";
-        case VK_DESCRIPTOR_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_NV:
-            return "VK_DESCRIPTOR_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_NV";
-        default:
-            return "Unhandled VkDescriptorType";
-    }
-}
-static inline const char* string_VkPipelineBindPoint(VkPipelineBindPoint input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_BIND_POINT_GRAPHICS:
-            return "VK_PIPELINE_BIND_POINT_GRAPHICS";
-        case VK_PIPELINE_BIND_POINT_COMPUTE:
-            return "VK_PIPELINE_BIND_POINT_COMPUTE";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX:
-            return "VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR:
-            return "VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR";
-        case VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI:
-            return "VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI";
-        case VK_PIPELINE_BIND_POINT_DATA_GRAPH_ARM:
-            return "VK_PIPELINE_BIND_POINT_DATA_GRAPH_ARM";
-        default:
-            return "Unhandled VkPipelineBindPoint";
-    }
-}
 static inline const char* string_VkBlendFactor(VkBlendFactor input_value) {
     switch (input_value) {
         case VK_BLEND_FACTOR_ZERO:
@@ -3658,6 +2926,28 @@ static inline const char* string_VkBlendOp(VkBlendOp input_value) {
             return "Unhandled VkBlendOp";
     }
 }
+static inline const char* string_VkCompareOp(VkCompareOp input_value) {
+    switch (input_value) {
+        case VK_COMPARE_OP_NEVER:
+            return "VK_COMPARE_OP_NEVER";
+        case VK_COMPARE_OP_LESS:
+            return "VK_COMPARE_OP_LESS";
+        case VK_COMPARE_OP_EQUAL:
+            return "VK_COMPARE_OP_EQUAL";
+        case VK_COMPARE_OP_LESS_OR_EQUAL:
+            return "VK_COMPARE_OP_LESS_OR_EQUAL";
+        case VK_COMPARE_OP_GREATER:
+            return "VK_COMPARE_OP_GREATER";
+        case VK_COMPARE_OP_NOT_EQUAL:
+            return "VK_COMPARE_OP_NOT_EQUAL";
+        case VK_COMPARE_OP_GREATER_OR_EQUAL:
+            return "VK_COMPARE_OP_GREATER_OR_EQUAL";
+        case VK_COMPARE_OP_ALWAYS:
+            return "VK_COMPARE_OP_ALWAYS";
+        default:
+            return "Unhandled VkCompareOp";
+    }
+}
 static inline const char* string_VkDynamicState(VkDynamicState input_value) {
     switch (input_value) {
         case VK_DYNAMIC_STATE_VIEWPORT:
@@ -3708,8 +2998,6 @@ static inline const char* string_VkDynamicState(VkDynamicState input_value) {
             return "VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE";
         case VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE:
             return "VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE";
-        case VK_DYNAMIC_STATE_LINE_STIPPLE:
-            return "VK_DYNAMIC_STATE_LINE_STIPPLE";
         case VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV:
             return "VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV";
         case VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT:
@@ -3804,8 +3092,8 @@ static inline const char* string_VkDynamicState(VkDynamicState input_value) {
             return "VK_DYNAMIC_STATE_COVERAGE_REDUCTION_MODE_NV";
         case VK_DYNAMIC_STATE_ATTACHMENT_FEEDBACK_LOOP_ENABLE_EXT:
             return "VK_DYNAMIC_STATE_ATTACHMENT_FEEDBACK_LOOP_ENABLE_EXT";
-        case VK_DYNAMIC_STATE_DEPTH_CLAMP_RANGE_EXT:
-            return "VK_DYNAMIC_STATE_DEPTH_CLAMP_RANGE_EXT";
+        case VK_DYNAMIC_STATE_LINE_STIPPLE_KHR:
+            return "VK_DYNAMIC_STATE_LINE_STIPPLE_KHR";
         default:
             return "Unhandled VkDynamicState";
     }
@@ -3932,6 +3220,106 @@ static inline const char* string_VkLogicOp(VkLogicOp input_value) {
             return "Unhandled VkLogicOp";
     }
 }
+static inline const char* string_VkBorderColor(VkBorderColor input_value) {
+    switch (input_value) {
+        case VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK:
+            return "VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK";
+        case VK_BORDER_COLOR_INT_TRANSPARENT_BLACK:
+            return "VK_BORDER_COLOR_INT_TRANSPARENT_BLACK";
+        case VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK:
+            return "VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK";
+        case VK_BORDER_COLOR_INT_OPAQUE_BLACK:
+            return "VK_BORDER_COLOR_INT_OPAQUE_BLACK";
+        case VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE:
+            return "VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE";
+        case VK_BORDER_COLOR_INT_OPAQUE_WHITE:
+            return "VK_BORDER_COLOR_INT_OPAQUE_WHITE";
+        case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT:
+            return "VK_BORDER_COLOR_FLOAT_CUSTOM_EXT";
+        case VK_BORDER_COLOR_INT_CUSTOM_EXT:
+            return "VK_BORDER_COLOR_INT_CUSTOM_EXT";
+        default:
+            return "Unhandled VkBorderColor";
+    }
+}
+static inline const char* string_VkFilter(VkFilter input_value) {
+    switch (input_value) {
+        case VK_FILTER_NEAREST:
+            return "VK_FILTER_NEAREST";
+        case VK_FILTER_LINEAR:
+            return "VK_FILTER_LINEAR";
+        case VK_FILTER_CUBIC_EXT:
+            return "VK_FILTER_CUBIC_EXT";
+        default:
+            return "Unhandled VkFilter";
+    }
+}
+static inline const char* string_VkSamplerAddressMode(VkSamplerAddressMode input_value) {
+    switch (input_value) {
+        case VK_SAMPLER_ADDRESS_MODE_REPEAT:
+            return "VK_SAMPLER_ADDRESS_MODE_REPEAT";
+        case VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT:
+            return "VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT";
+        case VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE:
+            return "VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE";
+        case VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER:
+            return "VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER";
+        case VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE:
+            return "VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE";
+        default:
+            return "Unhandled VkSamplerAddressMode";
+    }
+}
+static inline const char* string_VkSamplerMipmapMode(VkSamplerMipmapMode input_value) {
+    switch (input_value) {
+        case VK_SAMPLER_MIPMAP_MODE_NEAREST:
+            return "VK_SAMPLER_MIPMAP_MODE_NEAREST";
+        case VK_SAMPLER_MIPMAP_MODE_LINEAR:
+            return "VK_SAMPLER_MIPMAP_MODE_LINEAR";
+        default:
+            return "Unhandled VkSamplerMipmapMode";
+    }
+}
+static inline const char* string_VkDescriptorType(VkDescriptorType input_value) {
+    switch (input_value) {
+        case VK_DESCRIPTOR_TYPE_SAMPLER:
+            return "VK_DESCRIPTOR_TYPE_SAMPLER";
+        case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
+            return "VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER";
+        case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
+            return "VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE";
+        case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
+            return "VK_DESCRIPTOR_TYPE_STORAGE_IMAGE";
+        case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
+            return "VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER";
+        case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
+            return "VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER";
+        case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
+            return "VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER";
+        case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
+            return "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER";
+        case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
+            return "VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC";
+        case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
+            return "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC";
+        case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+            return "VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT";
+        case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK:
+            return "VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK";
+        case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
+            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR";
+        case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV:
+            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV";
+        case VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM:
+            return "VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM";
+        case VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM:
+            return "VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM";
+        case VK_DESCRIPTOR_TYPE_MUTABLE_EXT:
+            return "VK_DESCRIPTOR_TYPE_MUTABLE_EXT";
+        default:
+            return "Unhandled VkDescriptorType";
+    }
+}
 static inline const char* string_VkAttachmentLoadOp(VkAttachmentLoadOp input_value) {
     switch (input_value) {
         case VK_ATTACHMENT_LOAD_OP_LOAD:
@@ -3940,8 +3328,8 @@ static inline const char* string_VkAttachmentLoadOp(VkAttachmentLoadOp input_val
             return "VK_ATTACHMENT_LOAD_OP_CLEAR";
         case VK_ATTACHMENT_LOAD_OP_DONT_CARE:
             return "VK_ATTACHMENT_LOAD_OP_DONT_CARE";
-        case VK_ATTACHMENT_LOAD_OP_NONE:
-            return "VK_ATTACHMENT_LOAD_OP_NONE";
+        case VK_ATTACHMENT_LOAD_OP_NONE_KHR:
+            return "VK_ATTACHMENT_LOAD_OP_NONE_KHR";
         default:
             return "Unhandled VkAttachmentLoadOp";
     }
@@ -3958,26 +3346,78 @@ static inline const char* string_VkAttachmentStoreOp(VkAttachmentStoreOp input_v
             return "Unhandled VkAttachmentStoreOp";
     }
 }
+static inline const char* string_VkPipelineBindPoint(VkPipelineBindPoint input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_BIND_POINT_GRAPHICS:
+            return "VK_PIPELINE_BIND_POINT_GRAPHICS";
+        case VK_PIPELINE_BIND_POINT_COMPUTE:
+            return "VK_PIPELINE_BIND_POINT_COMPUTE";
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+        case VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX:
+            return "VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX";
+#endif  // VK_ENABLE_BETA_EXTENSIONS
+        case VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR:
+            return "VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR";
+        case VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI:
+            return "VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI";
+        default:
+            return "Unhandled VkPipelineBindPoint";
+    }
+}
+static inline const char* string_VkCommandBufferLevel(VkCommandBufferLevel input_value) {
+    switch (input_value) {
+        case VK_COMMAND_BUFFER_LEVEL_PRIMARY:
+            return "VK_COMMAND_BUFFER_LEVEL_PRIMARY";
+        case VK_COMMAND_BUFFER_LEVEL_SECONDARY:
+            return "VK_COMMAND_BUFFER_LEVEL_SECONDARY";
+        default:
+            return "Unhandled VkCommandBufferLevel";
+    }
+}
+static inline const char* string_VkIndexType(VkIndexType input_value) {
+    switch (input_value) {
+        case VK_INDEX_TYPE_UINT16:
+            return "VK_INDEX_TYPE_UINT16";
+        case VK_INDEX_TYPE_UINT32:
+            return "VK_INDEX_TYPE_UINT32";
+        case VK_INDEX_TYPE_NONE_KHR:
+            return "VK_INDEX_TYPE_NONE_KHR";
+        case VK_INDEX_TYPE_UINT8_KHR:
+            return "VK_INDEX_TYPE_UINT8_KHR";
+        default:
+            return "Unhandled VkIndexType";
+    }
+}
 static inline const char* string_VkSubpassContents(VkSubpassContents input_value) {
     switch (input_value) {
         case VK_SUBPASS_CONTENTS_INLINE:
             return "VK_SUBPASS_CONTENTS_INLINE";
         case VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS:
             return "VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS";
-        case VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR:
-            return "VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR";
+        case VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT:
+            return "VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_EXT";
         default:
             return "Unhandled VkSubpassContents";
     }
 }
-static inline const char* string_VkDescriptorUpdateTemplateType(VkDescriptorUpdateTemplateType input_value) {
+static inline const char* string_VkPointClippingBehavior(VkPointClippingBehavior input_value) {
     switch (input_value) {
-        case VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET:
-            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET";
-        case VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS:
-            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS";
+        case VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES:
+            return "VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES";
+        case VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY:
+            return "VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY";
         default:
-            return "Unhandled VkDescriptorUpdateTemplateType";
+            return "Unhandled VkPointClippingBehavior";
+    }
+}
+static inline const char* string_VkTessellationDomainOrigin(VkTessellationDomainOrigin input_value) {
+    switch (input_value) {
+        case VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT:
+            return "VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT";
+        case VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT:
+            return "VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT";
+        default:
+            return "Unhandled VkTessellationDomainOrigin";
     }
 }
 static inline const char* string_VkSamplerYcbcrModelConversion(VkSamplerYcbcrModelConversion input_value) {
@@ -4016,24 +3456,14 @@ static inline const char* string_VkChromaLocation(VkChromaLocation input_value)
             return "Unhandled VkChromaLocation";
     }
 }
-static inline const char* string_VkPointClippingBehavior(VkPointClippingBehavior input_value) {
+static inline const char* string_VkDescriptorUpdateTemplateType(VkDescriptorUpdateTemplateType input_value) {
     switch (input_value) {
-        case VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES:
-            return "VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES";
-        case VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY:
-            return "VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY";
+        case VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET:
+            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET";
+        case VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR:
+            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR";
         default:
-            return "Unhandled VkPointClippingBehavior";
-    }
-}
-static inline const char* string_VkTessellationDomainOrigin(VkTessellationDomainOrigin input_value) {
-    switch (input_value) {
-        case VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT:
-            return "VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT";
-        case VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT:
-            return "VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT";
-        default:
-            return "Unhandled VkTessellationDomainOrigin";
+            return "Unhandled VkDescriptorUpdateTemplateType";
     }
 }
 static inline const char* string_VkDriverId(VkDriverId input_value) {
@@ -4088,12 +3518,8 @@ static inline const char* string_VkDriverId(VkDriverId input_value) {
             return "VK_DRIVER_ID_MESA_NVK";
         case VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA:
             return "VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA";
-        case VK_DRIVER_ID_MESA_HONEYKRISP:
-            return "VK_DRIVER_ID_MESA_HONEYKRISP";
-        case VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN:
-            return "VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN";
-        case VK_DRIVER_ID_MESA_KOSMICKRISP:
-            return "VK_DRIVER_ID_MESA_KOSMICKRISP";
+        case VK_DRIVER_ID_MESA_AGXV:
+            return "VK_DRIVER_ID_MESA_AGXV";
         default:
             return "Unhandled VkDriverId";
     }
@@ -4110,16 +3536,6 @@ static inline const char* string_VkShaderFloatControlsIndependence(VkShaderFloat
             return "Unhandled VkShaderFloatControlsIndependence";
     }
 }
-static inline const char* string_VkSemaphoreType(VkSemaphoreType input_value) {
-    switch (input_value) {
-        case VK_SEMAPHORE_TYPE_BINARY:
-            return "VK_SEMAPHORE_TYPE_BINARY";
-        case VK_SEMAPHORE_TYPE_TIMELINE:
-            return "VK_SEMAPHORE_TYPE_TIMELINE";
-        default:
-            return "Unhandled VkSemaphoreType";
-    }
-}
 static inline const char* string_VkSamplerReductionMode(VkSamplerReductionMode input_value) {
     switch (input_value) {
         case VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE:
@@ -4134,60 +3550,14 @@ static inline const char* string_VkSamplerReductionMode(VkSamplerReductionMode i
             return "Unhandled VkSamplerReductionMode";
     }
 }
-static inline const char* string_VkPipelineRobustnessBufferBehavior(VkPipelineRobustnessBufferBehavior input_value) {
+static inline const char* string_VkSemaphoreType(VkSemaphoreType input_value) {
     switch (input_value) {
-        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT:
-            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT";
-        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED:
-            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED";
-        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS:
-            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS";
-        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2:
-            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2";
+        case VK_SEMAPHORE_TYPE_BINARY:
+            return "VK_SEMAPHORE_TYPE_BINARY";
+        case VK_SEMAPHORE_TYPE_TIMELINE:
+            return "VK_SEMAPHORE_TYPE_TIMELINE";
         default:
-            return "Unhandled VkPipelineRobustnessBufferBehavior";
-    }
-}
-static inline const char* string_VkPipelineRobustnessImageBehavior(VkPipelineRobustnessImageBehavior input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT:
-            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT";
-        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED:
-            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED";
-        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS:
-            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS";
-        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2:
-            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2";
-        default:
-            return "Unhandled VkPipelineRobustnessImageBehavior";
-    }
-}
-static inline const char* string_VkQueueGlobalPriority(VkQueueGlobalPriority input_value) {
-    switch (input_value) {
-        case VK_QUEUE_GLOBAL_PRIORITY_LOW:
-            return "VK_QUEUE_GLOBAL_PRIORITY_LOW";
-        case VK_QUEUE_GLOBAL_PRIORITY_MEDIUM:
-            return "VK_QUEUE_GLOBAL_PRIORITY_MEDIUM";
-        case VK_QUEUE_GLOBAL_PRIORITY_HIGH:
-            return "VK_QUEUE_GLOBAL_PRIORITY_HIGH";
-        case VK_QUEUE_GLOBAL_PRIORITY_REALTIME:
-            return "VK_QUEUE_GLOBAL_PRIORITY_REALTIME";
-        default:
-            return "Unhandled VkQueueGlobalPriority";
-    }
-}
-static inline const char* string_VkLineRasterizationMode(VkLineRasterizationMode input_value) {
-    switch (input_value) {
-        case VK_LINE_RASTERIZATION_MODE_DEFAULT:
-            return "VK_LINE_RASTERIZATION_MODE_DEFAULT";
-        case VK_LINE_RASTERIZATION_MODE_RECTANGULAR:
-            return "VK_LINE_RASTERIZATION_MODE_RECTANGULAR";
-        case VK_LINE_RASTERIZATION_MODE_BRESENHAM:
-            return "VK_LINE_RASTERIZATION_MODE_BRESENHAM";
-        case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH:
-            return "VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH";
-        default:
-            return "Unhandled VkLineRasterizationMode";
+            return "Unhandled VkSemaphoreType";
     }
 }
 static inline const char* string_VkPresentModeKHR(VkPresentModeKHR input_value) {
@@ -4204,8 +3574,6 @@ static inline const char* string_VkPresentModeKHR(VkPresentModeKHR input_value)
             return "VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR";
         case VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR:
             return "VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR";
-        case VK_PRESENT_MODE_FIFO_LATEST_READY_KHR:
-            return "VK_PRESENT_MODE_FIFO_LATEST_READY_KHR";
         default:
             return "Unhandled VkPresentModeKHR";
     }
@@ -4320,6 +3688,20 @@ static inline const char* string_VkPerformanceCounterStorageKHR(VkPerformanceCou
             return "Unhandled VkPerformanceCounterStorageKHR";
     }
 }
+static inline const char* string_VkQueueGlobalPriorityKHR(VkQueueGlobalPriorityKHR input_value) {
+    switch (input_value) {
+        case VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR:
+            return "VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR";
+        case VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR:
+            return "VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR";
+        case VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR:
+            return "VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR";
+        case VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR:
+            return "VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR";
+        default:
+            return "Unhandled VkQueueGlobalPriorityKHR";
+    }
+}
 static inline const char* string_VkFragmentShadingRateCombinerOpKHR(VkFragmentShadingRateCombinerOpKHR input_value) {
     switch (input_value) {
         case VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR:
@@ -4390,16 +3772,6 @@ static inline const char* string_VkComponentTypeKHR(VkComponentTypeKHR input_val
             return "VK_COMPONENT_TYPE_UINT32_KHR";
         case VK_COMPONENT_TYPE_UINT64_KHR:
             return "VK_COMPONENT_TYPE_UINT64_KHR";
-        case VK_COMPONENT_TYPE_BFLOAT16_KHR:
-            return "VK_COMPONENT_TYPE_BFLOAT16_KHR";
-        case VK_COMPONENT_TYPE_SINT8_PACKED_NV:
-            return "VK_COMPONENT_TYPE_SINT8_PACKED_NV";
-        case VK_COMPONENT_TYPE_UINT8_PACKED_NV:
-            return "VK_COMPONENT_TYPE_UINT8_PACKED_NV";
-        case VK_COMPONENT_TYPE_FLOAT8_E4M3_EXT:
-            return "VK_COMPONENT_TYPE_FLOAT8_E4M3_EXT";
-        case VK_COMPONENT_TYPE_FLOAT8_E5M2_EXT:
-            return "VK_COMPONENT_TYPE_FLOAT8_E5M2_EXT";
         default:
             return "Unhandled VkComponentTypeKHR";
     }
@@ -4418,30 +3790,18 @@ static inline const char* string_VkScopeKHR(VkScopeKHR input_value) {
             return "Unhandled VkScopeKHR";
     }
 }
-static inline const char* string_VkVideoEncodeAV1PredictionModeKHR(VkVideoEncodeAV1PredictionModeKHR input_value) {
+static inline const char* string_VkLineRasterizationModeKHR(VkLineRasterizationModeKHR input_value) {
     switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_INTRA_ONLY_KHR:
-            return "VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_INTRA_ONLY_KHR";
-        case VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_SINGLE_REFERENCE_KHR:
-            return "VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_SINGLE_REFERENCE_KHR";
-        case VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_UNIDIRECTIONAL_COMPOUND_KHR:
-            return "VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_UNIDIRECTIONAL_COMPOUND_KHR";
-        case VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_BIDIRECTIONAL_COMPOUND_KHR:
-            return "VK_VIDEO_ENCODE_AV1_PREDICTION_MODE_BIDIRECTIONAL_COMPOUND_KHR";
+        case VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR:
+            return "VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR";
+        case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR:
+            return "VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR";
+        case VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR:
+            return "VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR";
+        case VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR:
+            return "VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR";
         default:
-            return "Unhandled VkVideoEncodeAV1PredictionModeKHR";
-    }
-}
-static inline const char* string_VkVideoEncodeAV1RateControlGroupKHR(VkVideoEncodeAV1RateControlGroupKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_INTRA_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_INTRA_KHR";
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_PREDICTIVE_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_PREDICTIVE_KHR";
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_BIPREDICTIVE_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_GROUP_BIPREDICTIVE_KHR";
-        default:
-            return "Unhandled VkVideoEncodeAV1RateControlGroupKHR";
+            return "Unhandled VkLineRasterizationModeKHR";
     }
 }
 static inline const char* string_VkTimeDomainKHR(VkTimeDomainKHR input_value) {
@@ -4454,40 +3814,10 @@ static inline const char* string_VkTimeDomainKHR(VkTimeDomainKHR input_value) {
             return "VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR";
         case VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR:
             return "VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR";
-        case VK_TIME_DOMAIN_PRESENT_STAGE_LOCAL_EXT:
-            return "VK_TIME_DOMAIN_PRESENT_STAGE_LOCAL_EXT";
-        case VK_TIME_DOMAIN_SWAPCHAIN_LOCAL_EXT:
-            return "VK_TIME_DOMAIN_SWAPCHAIN_LOCAL_EXT";
         default:
             return "Unhandled VkTimeDomainKHR";
     }
 }
-static inline const char* string_VkPhysicalDeviceLayeredApiKHR(VkPhysicalDeviceLayeredApiKHR input_value) {
-    switch (input_value) {
-        case VK_PHYSICAL_DEVICE_LAYERED_API_VULKAN_KHR:
-            return "VK_PHYSICAL_DEVICE_LAYERED_API_VULKAN_KHR";
-        case VK_PHYSICAL_DEVICE_LAYERED_API_D3D12_KHR:
-            return "VK_PHYSICAL_DEVICE_LAYERED_API_D3D12_KHR";
-        case VK_PHYSICAL_DEVICE_LAYERED_API_METAL_KHR:
-            return "VK_PHYSICAL_DEVICE_LAYERED_API_METAL_KHR";
-        case VK_PHYSICAL_DEVICE_LAYERED_API_OPENGL_KHR:
-            return "VK_PHYSICAL_DEVICE_LAYERED_API_OPENGL_KHR";
-        case VK_PHYSICAL_DEVICE_LAYERED_API_OPENGLES_KHR:
-            return "VK_PHYSICAL_DEVICE_LAYERED_API_OPENGLES_KHR";
-        default:
-            return "Unhandled VkPhysicalDeviceLayeredApiKHR";
-    }
-}
-static inline const char* string_VkDefaultVertexAttributeValueKHR(VkDefaultVertexAttributeValueKHR input_value) {
-    switch (input_value) {
-        case VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ZERO_KHR:
-            return "VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ZERO_KHR";
-        case VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ONE_KHR:
-            return "VK_DEFAULT_VERTEX_ATTRIBUTE_VALUE_ZERO_ZERO_ZERO_ONE_KHR";
-        default:
-            return "Unhandled VkDefaultVertexAttributeValueKHR";
-    }
-}
 static inline const char* string_VkDebugReportObjectTypeEXT(VkDebugReportObjectTypeEXT input_value) {
     switch (input_value) {
         case VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT:
@@ -4608,6 +3938,34 @@ static inline const char* string_VkValidationCheckEXT(VkValidationCheckEXT input
             return "Unhandled VkValidationCheckEXT";
     }
 }
+static inline const char* string_VkPipelineRobustnessBufferBehaviorEXT(VkPipelineRobustnessBufferBehaviorEXT input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT";
+        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT";
+        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT";
+        case VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT";
+        default:
+            return "Unhandled VkPipelineRobustnessBufferBehaviorEXT";
+    }
+}
+static inline const char* string_VkPipelineRobustnessImageBehaviorEXT(VkPipelineRobustnessImageBehaviorEXT input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT";
+        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED_EXT";
+        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT";
+        case VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT:
+            return "VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT";
+        default:
+            return "Unhandled VkPipelineRobustnessImageBehaviorEXT";
+    }
+}
 static inline const char* string_VkDisplayPowerStateEXT(VkDisplayPowerStateEXT input_value) {
     switch (input_value) {
         case VK_DISPLAY_POWER_STATE_OFF_EXT:
@@ -4778,14 +4136,6 @@ static inline const char* string_VkGeometryTypeKHR(VkGeometryTypeKHR input_value
             return "VK_GEOMETRY_TYPE_AABBS_KHR";
         case VK_GEOMETRY_TYPE_INSTANCES_KHR:
             return "VK_GEOMETRY_TYPE_INSTANCES_KHR";
-        case VK_GEOMETRY_TYPE_SPHERES_NV:
-            return "VK_GEOMETRY_TYPE_SPHERES_NV";
-        case VK_GEOMETRY_TYPE_LINEAR_SWEPT_SPHERES_NV:
-            return "VK_GEOMETRY_TYPE_LINEAR_SWEPT_SPHERES_NV";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_GEOMETRY_TYPE_DENSE_GEOMETRY_FORMAT_TRIANGLES_AMDX:
-            return "VK_GEOMETRY_TYPE_DENSE_GEOMETRY_FORMAT_TRIANGLES_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
         default:
             return "Unhandled VkGeometryTypeKHR";
     }
@@ -5166,8 +4516,6 @@ static inline const char* string_VkOpacityMicromapSpecialIndexEXT(VkOpacityMicro
             return "VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_TRANSPARENT_EXT";
         case VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_OPAQUE_EXT:
             return "VK_OPACITY_MICROMAP_SPECIAL_INDEX_FULLY_UNKNOWN_OPAQUE_EXT";
-        case VK_OPACITY_MICROMAP_SPECIAL_INDEX_CLUSTER_GEOMETRY_DISABLE_OPACITY_MICROMAP_NV:
-            return "VK_OPACITY_MICROMAP_SPECIAL_INDEX_CLUSTER_GEOMETRY_DISABLE_OPACITY_MICROMAP_NV";
         default:
             return "Unhandled VkOpacityMicromapSpecialIndexEXT";
     }
@@ -5208,26 +4556,6 @@ static inline const char* string_VkDisplacementMicromapFormatNV(VkDisplacementMi
     }
 }
 #endif  // VK_ENABLE_BETA_EXTENSIONS
-static inline const char* string_VkRayTracingLssIndexingModeNV(VkRayTracingLssIndexingModeNV input_value) {
-    switch (input_value) {
-        case VK_RAY_TRACING_LSS_INDEXING_MODE_LIST_NV:
-            return "VK_RAY_TRACING_LSS_INDEXING_MODE_LIST_NV";
-        case VK_RAY_TRACING_LSS_INDEXING_MODE_SUCCESSIVE_NV:
-            return "VK_RAY_TRACING_LSS_INDEXING_MODE_SUCCESSIVE_NV";
-        default:
-            return "Unhandled VkRayTracingLssIndexingModeNV";
-    }
-}
-static inline const char* string_VkRayTracingLssPrimitiveEndCapsModeNV(VkRayTracingLssPrimitiveEndCapsModeNV input_value) {
-    switch (input_value) {
-        case VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_NONE_NV:
-            return "VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_NONE_NV";
-        case VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_CHAINED_NV:
-            return "VK_RAY_TRACING_LSS_PRIMITIVE_END_CAPS_MODE_CHAINED_NV";
-        default:
-            return "Unhandled VkRayTracingLssPrimitiveEndCapsModeNV";
-    }
-}
 static inline const char* string_VkSubpassMergeStatusEXT(VkSubpassMergeStatusEXT input_value) {
     switch (input_value) {
         case VK_SUBPASS_MERGE_STATUS_MERGED_EXT:
@@ -5272,16 +4600,6 @@ static inline const char* string_VkDirectDriverLoadingModeLUNARG(VkDirectDriverL
             return "Unhandled VkDirectDriverLoadingModeLUNARG";
     }
 }
-static inline const char* string_VkTensorTilingARM(VkTensorTilingARM input_value) {
-    switch (input_value) {
-        case VK_TENSOR_TILING_OPTIMAL_ARM:
-            return "VK_TENSOR_TILING_OPTIMAL_ARM";
-        case VK_TENSOR_TILING_LINEAR_ARM:
-            return "VK_TENSOR_TILING_LINEAR_ARM";
-        default:
-            return "Unhandled VkTensorTilingARM";
-    }
-}
 static inline const char* string_VkOpticalFlowPerformanceLevelNV(VkOpticalFlowPerformanceLevelNV input_value) {
     switch (input_value) {
         case VK_OPTICAL_FLOW_PERFORMANCE_LEVEL_UNKNOWN_NV:
@@ -5320,38 +4638,6 @@ static inline const char* string_VkOpticalFlowSessionBindingPointNV(VkOpticalFlo
             return "Unhandled VkOpticalFlowSessionBindingPointNV";
     }
 }
-static inline const char* string_VkAntiLagModeAMD(VkAntiLagModeAMD input_value) {
-    switch (input_value) {
-        case VK_ANTI_LAG_MODE_DRIVER_CONTROL_AMD:
-            return "VK_ANTI_LAG_MODE_DRIVER_CONTROL_AMD";
-        case VK_ANTI_LAG_MODE_ON_AMD:
-            return "VK_ANTI_LAG_MODE_ON_AMD";
-        case VK_ANTI_LAG_MODE_OFF_AMD:
-            return "VK_ANTI_LAG_MODE_OFF_AMD";
-        default:
-            return "Unhandled VkAntiLagModeAMD";
-    }
-}
-static inline const char* string_VkAntiLagStageAMD(VkAntiLagStageAMD input_value) {
-    switch (input_value) {
-        case VK_ANTI_LAG_STAGE_INPUT_AMD:
-            return "VK_ANTI_LAG_STAGE_INPUT_AMD";
-        case VK_ANTI_LAG_STAGE_PRESENT_AMD:
-            return "VK_ANTI_LAG_STAGE_PRESENT_AMD";
-        default:
-            return "Unhandled VkAntiLagStageAMD";
-    }
-}
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-static inline const char* string_VkCompressedTriangleFormatAMDX(VkCompressedTriangleFormatAMDX input_value) {
-    switch (input_value) {
-        case VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX:
-            return "VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX";
-        default:
-            return "Unhandled VkCompressedTriangleFormatAMDX";
-    }
-}
-#endif  // VK_ENABLE_BETA_EXTENSIONS
 static inline const char* string_VkShaderCodeTypeEXT(VkShaderCodeTypeEXT input_value) {
     switch (input_value) {
         case VK_SHADER_CODE_TYPE_BINARY_EXT:
@@ -5362,38 +4648,14 @@ static inline const char* string_VkShaderCodeTypeEXT(VkShaderCodeTypeEXT input_v
             return "Unhandled VkShaderCodeTypeEXT";
     }
 }
-static inline const char* string_VkDepthClampModeEXT(VkDepthClampModeEXT input_value) {
+static inline const char* string_VkRayTracingInvocationReorderModeNV(VkRayTracingInvocationReorderModeNV input_value) {
     switch (input_value) {
-        case VK_DEPTH_CLAMP_MODE_VIEWPORT_RANGE_EXT:
-            return "VK_DEPTH_CLAMP_MODE_VIEWPORT_RANGE_EXT";
-        case VK_DEPTH_CLAMP_MODE_USER_DEFINED_RANGE_EXT:
-            return "VK_DEPTH_CLAMP_MODE_USER_DEFINED_RANGE_EXT";
+        case VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV:
+            return "VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_NV";
+        case VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV:
+            return "VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_NV";
         default:
-            return "Unhandled VkDepthClampModeEXT";
-    }
-}
-static inline const char* string_VkRayTracingInvocationReorderModeEXT(VkRayTracingInvocationReorderModeEXT input_value) {
-    switch (input_value) {
-        case VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_EXT:
-            return "VK_RAY_TRACING_INVOCATION_REORDER_MODE_NONE_EXT";
-        case VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_EXT:
-            return "VK_RAY_TRACING_INVOCATION_REORDER_MODE_REORDER_EXT";
-        default:
-            return "Unhandled VkRayTracingInvocationReorderModeEXT";
-    }
-}
-static inline const char* string_VkCooperativeVectorMatrixLayoutNV(VkCooperativeVectorMatrixLayoutNV input_value) {
-    switch (input_value) {
-        case VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_ROW_MAJOR_NV:
-            return "VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_ROW_MAJOR_NV";
-        case VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_COLUMN_MAJOR_NV:
-            return "VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_COLUMN_MAJOR_NV";
-        case VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_INFERENCING_OPTIMAL_NV:
-            return "VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_INFERENCING_OPTIMAL_NV";
-        case VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_TRAINING_OPTIMAL_NV:
-            return "VK_COOPERATIVE_VECTOR_MATRIX_LAYOUT_TRAINING_OPTIMAL_NV";
-        default:
-            return "Unhandled VkCooperativeVectorMatrixLayoutNV";
+            return "Unhandled VkRayTracingInvocationReorderModeNV";
     }
 }
 static inline const char* string_VkLayerSettingTypeEXT(VkLayerSettingTypeEXT input_value) {
@@ -5458,56 +4720,6 @@ static inline const char* string_VkOutOfBandQueueTypeNV(VkOutOfBandQueueTypeNV i
             return "Unhandled VkOutOfBandQueueTypeNV";
     }
 }
-static inline const char* string_VkDataGraphPipelineSessionBindPointARM(VkDataGraphPipelineSessionBindPointARM input_value) {
-    switch (input_value) {
-        case VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TRANSIENT_ARM:
-            return "VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TRANSIENT_ARM";
-        default:
-            return "Unhandled VkDataGraphPipelineSessionBindPointARM";
-    }
-}
-static inline const char* string_VkDataGraphPipelineSessionBindPointTypeARM(VkDataGraphPipelineSessionBindPointTypeARM input_value) {
-    switch (input_value) {
-        case VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TYPE_MEMORY_ARM:
-            return "VK_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_TYPE_MEMORY_ARM";
-        default:
-            return "Unhandled VkDataGraphPipelineSessionBindPointTypeARM";
-    }
-}
-static inline const char* string_VkDataGraphPipelinePropertyARM(VkDataGraphPipelinePropertyARM input_value) {
-    switch (input_value) {
-        case VK_DATA_GRAPH_PIPELINE_PROPERTY_CREATION_LOG_ARM:
-            return "VK_DATA_GRAPH_PIPELINE_PROPERTY_CREATION_LOG_ARM";
-        case VK_DATA_GRAPH_PIPELINE_PROPERTY_IDENTIFIER_ARM:
-            return "VK_DATA_GRAPH_PIPELINE_PROPERTY_IDENTIFIER_ARM";
-        default:
-            return "Unhandled VkDataGraphPipelinePropertyARM";
-    }
-}
-static inline const char* string_VkPhysicalDeviceDataGraphProcessingEngineTypeARM(VkPhysicalDeviceDataGraphProcessingEngineTypeARM input_value) {
-    switch (input_value) {
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_DEFAULT_ARM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_DEFAULT_ARM";
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_NEURAL_QCOM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_NEURAL_QCOM";
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_COMPUTE_QCOM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_PROCESSING_ENGINE_TYPE_COMPUTE_QCOM";
-        default:
-            return "Unhandled VkPhysicalDeviceDataGraphProcessingEngineTypeARM";
-    }
-}
-static inline const char* string_VkPhysicalDeviceDataGraphOperationTypeARM(VkPhysicalDeviceDataGraphOperationTypeARM input_value) {
-    switch (input_value) {
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_SPIRV_EXTENDED_INSTRUCTION_SET_ARM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_SPIRV_EXTENDED_INSTRUCTION_SET_ARM";
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_NEURAL_MODEL_QCOM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_NEURAL_MODEL_QCOM";
-        case VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_BUILTIN_MODEL_QCOM:
-            return "VK_PHYSICAL_DEVICE_DATA_GRAPH_OPERATION_TYPE_BUILTIN_MODEL_QCOM";
-        default:
-            return "Unhandled VkPhysicalDeviceDataGraphOperationTypeARM";
-    }
-}
 static inline const char* string_VkBlockMatchWindowCompareModeQCOM(VkBlockMatchWindowCompareModeQCOM input_value) {
     switch (input_value) {
         case VK_BLOCK_MATCH_WINDOW_COMPARE_MODE_MIN_QCOM:
@@ -5542,128 +4754,6 @@ static inline const char* string_VkLayeredDriverUnderlyingApiMSFT(VkLayeredDrive
             return "Unhandled VkLayeredDriverUnderlyingApiMSFT";
     }
 }
-static inline const char* string_VkDisplaySurfaceStereoTypeNV(VkDisplaySurfaceStereoTypeNV input_value) {
-    switch (input_value) {
-        case VK_DISPLAY_SURFACE_STEREO_TYPE_NONE_NV:
-            return "VK_DISPLAY_SURFACE_STEREO_TYPE_NONE_NV";
-        case VK_DISPLAY_SURFACE_STEREO_TYPE_ONBOARD_DIN_NV:
-            return "VK_DISPLAY_SURFACE_STEREO_TYPE_ONBOARD_DIN_NV";
-        case VK_DISPLAY_SURFACE_STEREO_TYPE_HDMI_3D_NV:
-            return "VK_DISPLAY_SURFACE_STEREO_TYPE_HDMI_3D_NV";
-        case VK_DISPLAY_SURFACE_STEREO_TYPE_INBAND_DISPLAYPORT_NV:
-            return "VK_DISPLAY_SURFACE_STEREO_TYPE_INBAND_DISPLAYPORT_NV";
-        default:
-            return "Unhandled VkDisplaySurfaceStereoTypeNV";
-    }
-}
-static inline const char* string_VkClusterAccelerationStructureTypeNV(VkClusterAccelerationStructureTypeNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_CLUSTERS_BOTTOM_LEVEL_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_CLUSTERS_BOTTOM_LEVEL_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_TEMPLATE_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_TYPE_TRIANGLE_CLUSTER_TEMPLATE_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureTypeNV";
-    }
-}
-static inline const char* string_VkClusterAccelerationStructureOpTypeNV(VkClusterAccelerationStructureOpTypeNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_MOVE_OBJECTS_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_MOVE_OBJECTS_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_CLUSTERS_BOTTOM_LEVEL_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_CLUSTERS_BOTTOM_LEVEL_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_TEMPLATE_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_BUILD_TRIANGLE_CLUSTER_TEMPLATE_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_INSTANTIATE_TRIANGLE_CLUSTER_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_INSTANTIATE_TRIANGLE_CLUSTER_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_GET_CLUSTER_TEMPLATE_INDICES_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_TYPE_GET_CLUSTER_TEMPLATE_INDICES_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureOpTypeNV";
-    }
-}
-static inline const char* string_VkClusterAccelerationStructureOpModeNV(VkClusterAccelerationStructureOpModeNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_IMPLICIT_DESTINATIONS_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_IMPLICIT_DESTINATIONS_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_EXPLICIT_DESTINATIONS_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_EXPLICIT_DESTINATIONS_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_COMPUTE_SIZES_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_OP_MODE_COMPUTE_SIZES_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureOpModeNV";
-    }
-}
-static inline const char* string_VkPartitionedAccelerationStructureOpTypeNV(VkPartitionedAccelerationStructureOpTypeNV input_value) {
-    switch (input_value) {
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_INSTANCE_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_INSTANCE_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_UPDATE_INSTANCE_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_UPDATE_INSTANCE_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_PARTITION_TRANSLATION_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_OP_TYPE_WRITE_PARTITION_TRANSLATION_NV";
-        default:
-            return "Unhandled VkPartitionedAccelerationStructureOpTypeNV";
-    }
-}
-static inline const char* string_VkIndirectExecutionSetInfoTypeEXT(VkIndirectExecutionSetInfoTypeEXT input_value) {
-    switch (input_value) {
-        case VK_INDIRECT_EXECUTION_SET_INFO_TYPE_PIPELINES_EXT:
-            return "VK_INDIRECT_EXECUTION_SET_INFO_TYPE_PIPELINES_EXT";
-        case VK_INDIRECT_EXECUTION_SET_INFO_TYPE_SHADER_OBJECTS_EXT:
-            return "VK_INDIRECT_EXECUTION_SET_INFO_TYPE_SHADER_OBJECTS_EXT";
-        default:
-            return "Unhandled VkIndirectExecutionSetInfoTypeEXT";
-    }
-}
-static inline const char* string_VkIndirectCommandsTokenTypeEXT(VkIndirectCommandsTokenTypeEXT input_value) {
-    switch (input_value) {
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_EXECUTION_SET_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_EXECUTION_SET_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_SEQUENCE_INDEX_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_SEQUENCE_INDEX_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_COUNT_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_COUNT_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_COUNT_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_COUNT_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_NV_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_NV_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_NV_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_MESH_TASKS_COUNT_EXT";
-        case VK_INDIRECT_COMMANDS_TOKEN_TYPE_TRACE_RAYS2_EXT:
-            return "VK_INDIRECT_COMMANDS_TOKEN_TYPE_TRACE_RAYS2_EXT";
-        default:
-            return "Unhandled VkIndirectCommandsTokenTypeEXT";
-    }
-}
-static inline const char* string_VkDataGraphModelCacheTypeQCOM(VkDataGraphModelCacheTypeQCOM input_value) {
-    switch (input_value) {
-        case VK_DATA_GRAPH_MODEL_CACHE_TYPE_GENERIC_BINARY_QCOM:
-            return "VK_DATA_GRAPH_MODEL_CACHE_TYPE_GENERIC_BINARY_QCOM";
-        default:
-            return "Unhandled VkDataGraphModelCacheTypeQCOM";
-    }
-}
 static inline const char* string_VkBuildAccelerationStructureModeKHR(VkBuildAccelerationStructureModeKHR input_value) {
     switch (input_value) {
         case VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR:
@@ -5745,10 +4835,10 @@ static inline const char* string_VkAccessFlagBits(VkAccessFlagBits input_value)
             return "VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT";
         case VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR:
             return "VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR";
-        case VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT:
-            return "VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_EXT";
-        case VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT:
-            return "VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_EXT";
+        case VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV:
+            return "VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV";
+        case VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV:
+            return "VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV";
         default:
             return "Unhandled VkAccessFlagBits";
     }
@@ -5940,10 +5030,10 @@ static inline const char* string_VkImageCreateFlagBits(VkImageCreateFlagBits inp
             return "VK_IMAGE_CREATE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_BIT_EXT";
         case VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT:
             return "VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT";
+        case VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM:
+            return "VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM";
         case VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR:
             return "VK_IMAGE_CREATE_VIDEO_PROFILE_INDEPENDENT_BIT_KHR";
-        case VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_EXT:
-            return "VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_EXT";
         default:
             return "Unhandled VkImageCreateFlagBits";
     }
@@ -6020,8 +5110,6 @@ static inline const char* string_VkImageUsageFlagBits(VkImageUsageFlagBits input
             return "VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT";
         case VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT:
             return "VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT";
-        case VK_IMAGE_USAGE_HOST_TRANSFER_BIT:
-            return "VK_IMAGE_USAGE_HOST_TRANSFER_BIT";
         case VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR:
             return "VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR";
         case VK_IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR:
@@ -6032,6 +5120,8 @@ static inline const char* string_VkImageUsageFlagBits(VkImageUsageFlagBits input
             return "VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT";
         case VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR:
             return "VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
+        case VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT:
+            return "VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT";
         case VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR:
             return "VK_IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR";
         case VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR:
@@ -6046,14 +5136,6 @@ static inline const char* string_VkImageUsageFlagBits(VkImageUsageFlagBits input
             return "VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM";
         case VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM:
             return "VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM";
-        case VK_IMAGE_USAGE_TENSOR_ALIASING_BIT_ARM:
-            return "VK_IMAGE_USAGE_TENSOR_ALIASING_BIT_ARM";
-        case VK_IMAGE_USAGE_TILE_MEMORY_BIT_QCOM:
-            return "VK_IMAGE_USAGE_TILE_MEMORY_BIT_QCOM";
-        case VK_IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR:
-            return "VK_IMAGE_USAGE_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR";
-        case VK_IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR:
-            return "VK_IMAGE_USAGE_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR";
         default:
             return "Unhandled VkImageUsageFlagBits";
     }
@@ -6106,8 +5188,6 @@ static inline const char* string_VkMemoryHeapFlagBits(VkMemoryHeapFlagBits input
             return "VK_MEMORY_HEAP_DEVICE_LOCAL_BIT";
         case VK_MEMORY_HEAP_MULTI_INSTANCE_BIT:
             return "VK_MEMORY_HEAP_MULTI_INSTANCE_BIT";
-        case VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM:
-            return "VK_MEMORY_HEAP_TILE_MEMORY_BIT_QCOM";
         default:
             return "Unhandled VkMemoryHeapFlagBits";
     }
@@ -6188,8 +5268,6 @@ static inline const char* string_VkQueueFlagBits(VkQueueFlagBits input_value) {
             return "VK_QUEUE_VIDEO_ENCODE_BIT_KHR";
         case VK_QUEUE_OPTICAL_FLOW_BIT_NV:
             return "VK_QUEUE_OPTICAL_FLOW_BIT_NV";
-        case VK_QUEUE_DATA_GRAPH_BIT_ARM:
-            return "VK_QUEUE_DATA_GRAPH_BIT_ARM";
         default:
             return "Unhandled VkQueueFlagBits";
     }
@@ -6286,12 +5364,12 @@ static inline const char* string_VkPipelineStageFlagBits(VkPipelineStageFlagBits
             return "VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT";
         case VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR:
             return "VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
+        case VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV:
+            return "VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV";
         case VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT:
             return "VK_PIPELINE_STAGE_TASK_SHADER_BIT_EXT";
         case VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT:
             return "VK_PIPELINE_STAGE_MESH_SHADER_BIT_EXT";
-        case VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT:
-            return "VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_EXT";
         default:
             return "Unhandled VkPipelineStageFlagBits";
     }
@@ -6417,28 +5495,28 @@ static inline std::string string_VkFenceCreateFlags(VkFenceCreateFlags input_val
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkQueryPoolCreateFlagBits(VkQueryPoolCreateFlagBits input_value) {
+static inline const char* string_VkEventCreateFlagBits(VkEventCreateFlagBits input_value) {
     switch (input_value) {
-        case VK_QUERY_POOL_CREATE_RESET_BIT_KHR:
-            return "VK_QUERY_POOL_CREATE_RESET_BIT_KHR";
+        case VK_EVENT_CREATE_DEVICE_ONLY_BIT:
+            return "VK_EVENT_CREATE_DEVICE_ONLY_BIT";
         default:
-            return "Unhandled VkQueryPoolCreateFlagBits";
+            return "Unhandled VkEventCreateFlagBits";
     }
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkQueryPoolCreateFlags(VkQueryPoolCreateFlags input_value) {
+static inline std::string string_VkEventCreateFlags(VkEventCreateFlags input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkQueryPoolCreateFlagBits(static_cast<VkQueryPoolCreateFlagBits>(1U << index)));
+            ret.append(string_VkEventCreateFlagBits(static_cast<VkEventCreateFlagBits>(1U << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkQueryPoolCreateFlags(0)");
+    if (ret.empty()) ret.append("VkEventCreateFlags(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -6619,8 +5697,6 @@ static inline const char* string_VkBufferUsageFlagBits(VkBufferUsageFlagBits inp
             return "VK_BUFFER_USAGE_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT";
         case VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT:
             return "VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT";
-        case VK_BUFFER_USAGE_TILE_MEMORY_BIT_QCOM:
-            return "VK_BUFFER_USAGE_TILE_MEMORY_BIT_QCOM";
         default:
             return "Unhandled VkBufferUsageFlagBits";
     }
@@ -6671,6 +5747,468 @@ static inline std::string string_VkImageViewCreateFlags(VkImageViewCreateFlags i
     return ret;
 }
 #endif // __cplusplus
+static inline const char* string_VkPipelineCacheCreateFlagBits(VkPipelineCacheCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT:
+            return "VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT";
+        default:
+            return "Unhandled VkPipelineCacheCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineCacheCreateFlags(VkPipelineCacheCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineCacheCreateFlagBits(static_cast<VkPipelineCacheCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineCacheCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkColorComponentFlagBits(VkColorComponentFlagBits input_value) {
+    switch (input_value) {
+        case VK_COLOR_COMPONENT_R_BIT:
+            return "VK_COLOR_COMPONENT_R_BIT";
+        case VK_COLOR_COMPONENT_G_BIT:
+            return "VK_COLOR_COMPONENT_G_BIT";
+        case VK_COLOR_COMPONENT_B_BIT:
+            return "VK_COLOR_COMPONENT_B_BIT";
+        case VK_COLOR_COMPONENT_A_BIT:
+            return "VK_COLOR_COMPONENT_A_BIT";
+        default:
+            return "Unhandled VkColorComponentFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkColorComponentFlags(VkColorComponentFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkColorComponentFlagBits(static_cast<VkColorComponentFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkColorComponentFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineCreateFlagBits(VkPipelineCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT:
+            return "VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT";
+        case VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT:
+            return "VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT";
+        case VK_PIPELINE_CREATE_DERIVATIVE_BIT:
+            return "VK_PIPELINE_CREATE_DERIVATIVE_BIT";
+        case VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT:
+            return "VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT";
+        case VK_PIPELINE_CREATE_DISPATCH_BASE_BIT:
+            return "VK_PIPELINE_CREATE_DISPATCH_BASE_BIT";
+        case VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT:
+            return "VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT";
+        case VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT:
+            return "VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT";
+        case VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
+        case VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT:
+            return "VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT";
+        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR";
+        case VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR";
+        case VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV:
+            return "VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV";
+        case VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR";
+        case VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR:
+            return "VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR";
+        case VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV:
+            return "VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV";
+        case VK_PIPELINE_CREATE_LIBRARY_BIT_KHR:
+            return "VK_PIPELINE_CREATE_LIBRARY_BIT_KHR";
+        case VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT:
+            return "VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT";
+        case VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT:
+            return "VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT";
+        case VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT:
+            return "VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT";
+        case VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV";
+        case VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT:
+            return "VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
+        case VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT:
+            return "VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
+        case VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT";
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+        case VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV:
+            return "VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV";
+#endif  // VK_ENABLE_BETA_EXTENSIONS
+        case VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT:
+            return "VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT";
+        case VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT:
+            return "VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT";
+        default:
+            return "Unhandled VkPipelineCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineCreateFlags(VkPipelineCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineCreateFlagBits(static_cast<VkPipelineCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineShaderStageCreateFlagBits(VkPipelineShaderStageCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT:
+            return "VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT";
+        case VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT:
+            return "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT";
+        default:
+            return "Unhandled VkPipelineShaderStageCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineShaderStageCreateFlags(VkPipelineShaderStageCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineShaderStageCreateFlagBits(static_cast<VkPipelineShaderStageCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineShaderStageCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkShaderStageFlagBits(VkShaderStageFlagBits input_value) {
+    switch (input_value) {
+        case VK_SHADER_STAGE_VERTEX_BIT:
+            return "VK_SHADER_STAGE_VERTEX_BIT";
+        case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT:
+            return "VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT";
+        case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT:
+            return "VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT";
+        case VK_SHADER_STAGE_GEOMETRY_BIT:
+            return "VK_SHADER_STAGE_GEOMETRY_BIT";
+        case VK_SHADER_STAGE_FRAGMENT_BIT:
+            return "VK_SHADER_STAGE_FRAGMENT_BIT";
+        case VK_SHADER_STAGE_COMPUTE_BIT:
+            return "VK_SHADER_STAGE_COMPUTE_BIT";
+        case VK_SHADER_STAGE_RAYGEN_BIT_KHR:
+            return "VK_SHADER_STAGE_RAYGEN_BIT_KHR";
+        case VK_SHADER_STAGE_ANY_HIT_BIT_KHR:
+            return "VK_SHADER_STAGE_ANY_HIT_BIT_KHR";
+        case VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR:
+            return "VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR";
+        case VK_SHADER_STAGE_MISS_BIT_KHR:
+            return "VK_SHADER_STAGE_MISS_BIT_KHR";
+        case VK_SHADER_STAGE_INTERSECTION_BIT_KHR:
+            return "VK_SHADER_STAGE_INTERSECTION_BIT_KHR";
+        case VK_SHADER_STAGE_CALLABLE_BIT_KHR:
+            return "VK_SHADER_STAGE_CALLABLE_BIT_KHR";
+        case VK_SHADER_STAGE_TASK_BIT_EXT:
+            return "VK_SHADER_STAGE_TASK_BIT_EXT";
+        case VK_SHADER_STAGE_MESH_BIT_EXT:
+            return "VK_SHADER_STAGE_MESH_BIT_EXT";
+        case VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI:
+            return "VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI";
+        case VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI:
+            return "VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI";
+        default:
+            return "Unhandled VkShaderStageFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkShaderStageFlags(VkShaderStageFlags input_value) {
+    if (input_value == VK_SHADER_STAGE_ALL_GRAPHICS) { return "VK_SHADER_STAGE_ALL_GRAPHICS"; }
+    if (input_value == VK_SHADER_STAGE_ALL) { return "VK_SHADER_STAGE_ALL"; }
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkShaderStageFlagBits(static_cast<VkShaderStageFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkShaderStageFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkCullModeFlagBits(VkCullModeFlagBits input_value) {
+    switch (input_value) {
+        case VK_CULL_MODE_NONE:
+            return "VK_CULL_MODE_NONE";
+        case VK_CULL_MODE_FRONT_BIT:
+            return "VK_CULL_MODE_FRONT_BIT";
+        case VK_CULL_MODE_BACK_BIT:
+            return "VK_CULL_MODE_BACK_BIT";
+        default:
+            return "Unhandled VkCullModeFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkCullModeFlags(VkCullModeFlags input_value) {
+    if (input_value == VK_CULL_MODE_FRONT_AND_BACK) { return "VK_CULL_MODE_FRONT_AND_BACK"; }
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkCullModeFlagBits(static_cast<VkCullModeFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkCullModeFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineDepthStencilStateCreateFlagBits(VkPipelineDepthStencilStateCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT:
+            return "VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT";
+        case VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT:
+            return "VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT";
+        default:
+            return "Unhandled VkPipelineDepthStencilStateCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineDepthStencilStateCreateFlags(VkPipelineDepthStencilStateCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineDepthStencilStateCreateFlagBits(static_cast<VkPipelineDepthStencilStateCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineDepthStencilStateCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineColorBlendStateCreateFlagBits(VkPipelineColorBlendStateCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT:
+            return "VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT";
+        default:
+            return "Unhandled VkPipelineColorBlendStateCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineColorBlendStateCreateFlags(VkPipelineColorBlendStateCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineColorBlendStateCreateFlagBits(static_cast<VkPipelineColorBlendStateCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineColorBlendStateCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineLayoutCreateFlagBits(VkPipelineLayoutCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT:
+            return "VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT";
+        default:
+            return "Unhandled VkPipelineLayoutCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineLayoutCreateFlags(VkPipelineLayoutCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineLayoutCreateFlagBits(static_cast<VkPipelineLayoutCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineLayoutCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkSamplerCreateFlagBits(VkSamplerCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT:
+            return "VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT";
+        case VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT:
+            return "VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT";
+        case VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT:
+            return "VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT";
+        case VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT:
+            return "VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT";
+        case VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM:
+            return "VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM";
+        default:
+            return "Unhandled VkSamplerCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkSamplerCreateFlags(VkSamplerCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkSamplerCreateFlagBits(static_cast<VkSamplerCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkSamplerCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkDescriptorPoolCreateFlagBits(VkDescriptorPoolCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT:
+            return "VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT";
+        case VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT:
+            return "VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT";
+        case VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT:
+            return "VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT";
+        case VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV:
+            return "VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV";
+        case VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV:
+            return "VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV";
+        default:
+            return "Unhandled VkDescriptorPoolCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkDescriptorPoolCreateFlags(VkDescriptorPoolCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkDescriptorPoolCreateFlagBits(static_cast<VkDescriptorPoolCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkDescriptorPoolCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkDescriptorSetLayoutCreateFlagBits(VkDescriptorSetLayoutCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT";
+        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV:
+            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV";
+        default:
+            return "Unhandled VkDescriptorSetLayoutCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkDescriptorSetLayoutCreateFlags(VkDescriptorSetLayoutCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkDescriptorSetLayoutCreateFlagBits(static_cast<VkDescriptorSetLayoutCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkDescriptorSetLayoutCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkAttachmentDescriptionFlagBits(VkAttachmentDescriptionFlagBits input_value) {
+    switch (input_value) {
+        case VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT:
+            return "VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT";
+        default:
+            return "Unhandled VkAttachmentDescriptionFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkAttachmentDescriptionFlags(VkAttachmentDescriptionFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkAttachmentDescriptionFlagBits(static_cast<VkAttachmentDescriptionFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkAttachmentDescriptionFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
 static inline const char* string_VkDependencyFlagBits(VkDependencyFlagBits input_value) {
     switch (input_value) {
         case VK_DEPENDENCY_BY_REGION_BIT:
@@ -6681,10 +6219,6 @@ static inline const char* string_VkDependencyFlagBits(VkDependencyFlagBits input
             return "VK_DEPENDENCY_VIEW_LOCAL_BIT";
         case VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT:
             return "VK_DEPENDENCY_FEEDBACK_LOOP_BIT_EXT";
-        case VK_DEPENDENCY_QUEUE_FAMILY_OWNERSHIP_TRANSFER_USE_ALL_STAGES_BIT_KHR:
-            return "VK_DEPENDENCY_QUEUE_FAMILY_OWNERSHIP_TRANSFER_USE_ALL_STAGES_BIT_KHR";
-        case VK_DEPENDENCY_ASYMMETRIC_EVENT_BIT_KHR:
-            return "VK_DEPENDENCY_ASYMMETRIC_EVENT_BIT_KHR";
         default:
             return "Unhandled VkDependencyFlagBits";
     }
@@ -6706,6 +6240,95 @@ static inline std::string string_VkDependencyFlags(VkDependencyFlags input_value
     return ret;
 }
 #endif // __cplusplus
+static inline const char* string_VkFramebufferCreateFlagBits(VkFramebufferCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT:
+            return "VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT";
+        default:
+            return "Unhandled VkFramebufferCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkFramebufferCreateFlags(VkFramebufferCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkFramebufferCreateFlagBits(static_cast<VkFramebufferCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkFramebufferCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkRenderPassCreateFlagBits(VkRenderPassCreateFlagBits input_value) {
+    switch (input_value) {
+        case VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM:
+            return "VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM";
+        default:
+            return "Unhandled VkRenderPassCreateFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkRenderPassCreateFlags(VkRenderPassCreateFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkRenderPassCreateFlagBits(static_cast<VkRenderPassCreateFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkRenderPassCreateFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkSubpassDescriptionFlagBits(VkSubpassDescriptionFlagBits input_value) {
+    switch (input_value) {
+        case VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX:
+            return "VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX";
+        case VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX:
+            return "VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX";
+        case VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM:
+            return "VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM";
+        case VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM:
+            return "VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM";
+        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT:
+            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT";
+        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT:
+            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT";
+        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT:
+            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT";
+        case VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT:
+            return "VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT";
+        default:
+            return "Unhandled VkSubpassDescriptionFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkSubpassDescriptionFlags(VkSubpassDescriptionFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkSubpassDescriptionFlagBits(static_cast<VkSubpassDescriptionFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkSubpassDescriptionFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
 static inline const char* string_VkCommandPoolCreateFlagBits(VkCommandPoolCreateFlagBits input_value) {
     switch (input_value) {
         case VK_COMMAND_POOL_CREATE_TRANSIENT_BIT:
@@ -6839,592 +6462,6 @@ static inline std::string string_VkCommandBufferResetFlags(VkCommandBufferResetF
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkEventCreateFlagBits(VkEventCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_EVENT_CREATE_DEVICE_ONLY_BIT:
-            return "VK_EVENT_CREATE_DEVICE_ONLY_BIT";
-        default:
-            return "Unhandled VkEventCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkEventCreateFlags(VkEventCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkEventCreateFlagBits(static_cast<VkEventCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkEventCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineCacheCreateFlagBits(VkPipelineCacheCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT:
-            return "VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT";
-        case VK_PIPELINE_CACHE_CREATE_INTERNALLY_SYNCHRONIZED_MERGE_BIT_KHR:
-            return "VK_PIPELINE_CACHE_CREATE_INTERNALLY_SYNCHRONIZED_MERGE_BIT_KHR";
-        default:
-            return "Unhandled VkPipelineCacheCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineCacheCreateFlags(VkPipelineCacheCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineCacheCreateFlagBits(static_cast<VkPipelineCacheCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineCacheCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineCreateFlagBits(VkPipelineCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT:
-            return "VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT";
-        case VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT:
-            return "VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT";
-        case VK_PIPELINE_CREATE_DERIVATIVE_BIT:
-            return "VK_PIPELINE_CREATE_DERIVATIVE_BIT";
-        case VK_PIPELINE_CREATE_DISPATCH_BASE_BIT:
-            return "VK_PIPELINE_CREATE_DISPATCH_BASE_BIT";
-        case VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT:
-            return "VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT";
-        case VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT:
-            return "VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT";
-        case VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT:
-            return "VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT";
-        case VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT:
-            return "VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT";
-        case VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT:
-            return "VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT";
-        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR";
-        case VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR";
-        case VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV:
-            return "VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV";
-        case VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT:
-            return "VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT";
-        case VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR:
-            return "VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
-        case VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR";
-        case VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR:
-            return "VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR";
-        case VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV:
-            return "VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV";
-        case VK_PIPELINE_CREATE_LIBRARY_BIT_KHR:
-            return "VK_PIPELINE_CREATE_LIBRARY_BIT_KHR";
-        case VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT:
-            return "VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT";
-        case VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT:
-            return "VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT";
-        case VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT:
-            return "VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT";
-        case VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV";
-        case VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT:
-            return "VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
-        case VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT:
-            return "VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
-        case VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV:
-            return "VK_PIPELINE_CREATE_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        default:
-            return "Unhandled VkPipelineCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineCreateFlags(VkPipelineCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineCreateFlagBits(static_cast<VkPipelineCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineShaderStageCreateFlagBits(VkPipelineShaderStageCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT:
-            return "VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT";
-        case VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT:
-            return "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT";
-        default:
-            return "Unhandled VkPipelineShaderStageCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineShaderStageCreateFlags(VkPipelineShaderStageCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineShaderStageCreateFlagBits(static_cast<VkPipelineShaderStageCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineShaderStageCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkShaderStageFlagBits(VkShaderStageFlagBits input_value) {
-    switch (input_value) {
-        case VK_SHADER_STAGE_VERTEX_BIT:
-            return "VK_SHADER_STAGE_VERTEX_BIT";
-        case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT:
-            return "VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT";
-        case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT:
-            return "VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT";
-        case VK_SHADER_STAGE_GEOMETRY_BIT:
-            return "VK_SHADER_STAGE_GEOMETRY_BIT";
-        case VK_SHADER_STAGE_FRAGMENT_BIT:
-            return "VK_SHADER_STAGE_FRAGMENT_BIT";
-        case VK_SHADER_STAGE_COMPUTE_BIT:
-            return "VK_SHADER_STAGE_COMPUTE_BIT";
-        case VK_SHADER_STAGE_RAYGEN_BIT_KHR:
-            return "VK_SHADER_STAGE_RAYGEN_BIT_KHR";
-        case VK_SHADER_STAGE_ANY_HIT_BIT_KHR:
-            return "VK_SHADER_STAGE_ANY_HIT_BIT_KHR";
-        case VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR:
-            return "VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR";
-        case VK_SHADER_STAGE_MISS_BIT_KHR:
-            return "VK_SHADER_STAGE_MISS_BIT_KHR";
-        case VK_SHADER_STAGE_INTERSECTION_BIT_KHR:
-            return "VK_SHADER_STAGE_INTERSECTION_BIT_KHR";
-        case VK_SHADER_STAGE_CALLABLE_BIT_KHR:
-            return "VK_SHADER_STAGE_CALLABLE_BIT_KHR";
-        case VK_SHADER_STAGE_TASK_BIT_EXT:
-            return "VK_SHADER_STAGE_TASK_BIT_EXT";
-        case VK_SHADER_STAGE_MESH_BIT_EXT:
-            return "VK_SHADER_STAGE_MESH_BIT_EXT";
-        case VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI:
-            return "VK_SHADER_STAGE_SUBPASS_SHADING_BIT_HUAWEI";
-        case VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI:
-            return "VK_SHADER_STAGE_CLUSTER_CULLING_BIT_HUAWEI";
-        default:
-            return "Unhandled VkShaderStageFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkShaderStageFlags(VkShaderStageFlags input_value) {
-    if (input_value == VK_SHADER_STAGE_ALL_GRAPHICS) { return "VK_SHADER_STAGE_ALL_GRAPHICS"; }
-    if (input_value == VK_SHADER_STAGE_ALL) { return "VK_SHADER_STAGE_ALL"; }
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkShaderStageFlagBits(static_cast<VkShaderStageFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkShaderStageFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineLayoutCreateFlagBits(VkPipelineLayoutCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT:
-            return "VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT";
-        default:
-            return "Unhandled VkPipelineLayoutCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineLayoutCreateFlags(VkPipelineLayoutCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineLayoutCreateFlagBits(static_cast<VkPipelineLayoutCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineLayoutCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkSamplerCreateFlagBits(VkSamplerCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT:
-            return "VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT";
-        case VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT:
-            return "VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT";
-        case VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT:
-            return "VK_SAMPLER_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_EXT";
-        case VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT:
-            return "VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT";
-        case VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM:
-            return "VK_SAMPLER_CREATE_IMAGE_PROCESSING_BIT_QCOM";
-        default:
-            return "Unhandled VkSamplerCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkSamplerCreateFlags(VkSamplerCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkSamplerCreateFlagBits(static_cast<VkSamplerCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkSamplerCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkDescriptorPoolCreateFlagBits(VkDescriptorPoolCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT:
-            return "VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT";
-        case VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT:
-            return "VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT";
-        case VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT:
-            return "VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT";
-        case VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV:
-            return "VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_SETS_BIT_NV";
-        case VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV:
-            return "VK_DESCRIPTOR_POOL_CREATE_ALLOW_OVERALLOCATION_POOLS_BIT_NV";
-        default:
-            return "Unhandled VkDescriptorPoolCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkDescriptorPoolCreateFlags(VkDescriptorPoolCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkDescriptorPoolCreateFlagBits(static_cast<VkDescriptorPoolCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkDescriptorPoolCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkDescriptorSetLayoutCreateFlagBits(VkDescriptorSetLayoutCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_INDIRECT_BINDABLE_BIT_NV";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT";
-        case VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV:
-            return "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PER_STAGE_BIT_NV";
-        default:
-            return "Unhandled VkDescriptorSetLayoutCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkDescriptorSetLayoutCreateFlags(VkDescriptorSetLayoutCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkDescriptorSetLayoutCreateFlagBits(static_cast<VkDescriptorSetLayoutCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkDescriptorSetLayoutCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkColorComponentFlagBits(VkColorComponentFlagBits input_value) {
-    switch (input_value) {
-        case VK_COLOR_COMPONENT_R_BIT:
-            return "VK_COLOR_COMPONENT_R_BIT";
-        case VK_COLOR_COMPONENT_G_BIT:
-            return "VK_COLOR_COMPONENT_G_BIT";
-        case VK_COLOR_COMPONENT_B_BIT:
-            return "VK_COLOR_COMPONENT_B_BIT";
-        case VK_COLOR_COMPONENT_A_BIT:
-            return "VK_COLOR_COMPONENT_A_BIT";
-        default:
-            return "Unhandled VkColorComponentFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkColorComponentFlags(VkColorComponentFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkColorComponentFlagBits(static_cast<VkColorComponentFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkColorComponentFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkCullModeFlagBits(VkCullModeFlagBits input_value) {
-    switch (input_value) {
-        case VK_CULL_MODE_NONE:
-            return "VK_CULL_MODE_NONE";
-        case VK_CULL_MODE_FRONT_BIT:
-            return "VK_CULL_MODE_FRONT_BIT";
-        case VK_CULL_MODE_BACK_BIT:
-            return "VK_CULL_MODE_BACK_BIT";
-        default:
-            return "Unhandled VkCullModeFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkCullModeFlags(VkCullModeFlags input_value) {
-    if (input_value == VK_CULL_MODE_FRONT_AND_BACK) { return "VK_CULL_MODE_FRONT_AND_BACK"; }
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkCullModeFlagBits(static_cast<VkCullModeFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkCullModeFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineDepthStencilStateCreateFlagBits(VkPipelineDepthStencilStateCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT:
-            return "VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT";
-        case VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT:
-            return "VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT";
-        default:
-            return "Unhandled VkPipelineDepthStencilStateCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineDepthStencilStateCreateFlags(VkPipelineDepthStencilStateCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineDepthStencilStateCreateFlagBits(static_cast<VkPipelineDepthStencilStateCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineDepthStencilStateCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineColorBlendStateCreateFlagBits(VkPipelineColorBlendStateCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT:
-            return "VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT";
-        default:
-            return "Unhandled VkPipelineColorBlendStateCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineColorBlendStateCreateFlags(VkPipelineColorBlendStateCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineColorBlendStateCreateFlagBits(static_cast<VkPipelineColorBlendStateCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineColorBlendStateCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkAttachmentDescriptionFlagBits(VkAttachmentDescriptionFlagBits input_value) {
-    switch (input_value) {
-        case VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT:
-            return "VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT";
-        case VK_ATTACHMENT_DESCRIPTION_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_ATTACHMENT_DESCRIPTION_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR";
-        case VK_ATTACHMENT_DESCRIPTION_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_ATTACHMENT_DESCRIPTION_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR";
-        default:
-            return "Unhandled VkAttachmentDescriptionFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkAttachmentDescriptionFlags(VkAttachmentDescriptionFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkAttachmentDescriptionFlagBits(static_cast<VkAttachmentDescriptionFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkAttachmentDescriptionFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkFramebufferCreateFlagBits(VkFramebufferCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT:
-            return "VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT";
-        default:
-            return "Unhandled VkFramebufferCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkFramebufferCreateFlags(VkFramebufferCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkFramebufferCreateFlagBits(static_cast<VkFramebufferCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkFramebufferCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkRenderPassCreateFlagBits(VkRenderPassCreateFlagBits input_value) {
-    switch (input_value) {
-        case VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM:
-            return "VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM";
-        case VK_RENDER_PASS_CREATE_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE:
-            return "VK_RENDER_PASS_CREATE_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE";
-        default:
-            return "Unhandled VkRenderPassCreateFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkRenderPassCreateFlags(VkRenderPassCreateFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkRenderPassCreateFlagBits(static_cast<VkRenderPassCreateFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkRenderPassCreateFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkSubpassDescriptionFlagBits(VkSubpassDescriptionFlagBits input_value) {
-    switch (input_value) {
-        case VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX:
-            return "VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX";
-        case VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX:
-            return "VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX";
-        case VK_SUBPASS_DESCRIPTION_TILE_SHADING_APRON_BIT_QCOM:
-            return "VK_SUBPASS_DESCRIPTION_TILE_SHADING_APRON_BIT_QCOM";
-        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT";
-        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT";
-        case VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT";
-        case VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT";
-        case VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_EXT";
-        case VK_SUBPASS_DESCRIPTION_CUSTOM_RESOLVE_BIT_EXT:
-            return "VK_SUBPASS_DESCRIPTION_CUSTOM_RESOLVE_BIT_EXT";
-        default:
-            return "Unhandled VkSubpassDescriptionFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkSubpassDescriptionFlags(VkSubpassDescriptionFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkSubpassDescriptionFlagBits(static_cast<VkSubpassDescriptionFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkSubpassDescriptionFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkStencilFaceFlagBits(VkStencilFaceFlagBits input_value) {
     switch (input_value) {
         case VK_STENCIL_FACE_FRONT_BIT:
@@ -7453,6 +6490,51 @@ static inline std::string string_VkStencilFaceFlags(VkStencilFaceFlags input_val
     return ret;
 }
 #endif // __cplusplus
+static inline const char* string_VkSubgroupFeatureFlagBits(VkSubgroupFeatureFlagBits input_value) {
+    switch (input_value) {
+        case VK_SUBGROUP_FEATURE_BASIC_BIT:
+            return "VK_SUBGROUP_FEATURE_BASIC_BIT";
+        case VK_SUBGROUP_FEATURE_VOTE_BIT:
+            return "VK_SUBGROUP_FEATURE_VOTE_BIT";
+        case VK_SUBGROUP_FEATURE_ARITHMETIC_BIT:
+            return "VK_SUBGROUP_FEATURE_ARITHMETIC_BIT";
+        case VK_SUBGROUP_FEATURE_BALLOT_BIT:
+            return "VK_SUBGROUP_FEATURE_BALLOT_BIT";
+        case VK_SUBGROUP_FEATURE_SHUFFLE_BIT:
+            return "VK_SUBGROUP_FEATURE_SHUFFLE_BIT";
+        case VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT:
+            return "VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT";
+        case VK_SUBGROUP_FEATURE_CLUSTERED_BIT:
+            return "VK_SUBGROUP_FEATURE_CLUSTERED_BIT";
+        case VK_SUBGROUP_FEATURE_QUAD_BIT:
+            return "VK_SUBGROUP_FEATURE_QUAD_BIT";
+        case VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV:
+            return "VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV";
+        case VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR:
+            return "VK_SUBGROUP_FEATURE_ROTATE_BIT_KHR";
+        case VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR:
+            return "VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT_KHR";
+        default:
+            return "Unhandled VkSubgroupFeatureFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkSubgroupFeatureFlags(VkSubgroupFeatureFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkSubgroupFeatureFlagBits(static_cast<VkSubgroupFeatureFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkSubgroupFeatureFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
 static inline const char* string_VkPeerMemoryFeatureFlagBits(VkPeerMemoryFeatureFlagBits input_value) {
     switch (input_value) {
         case VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT:
@@ -7492,8 +6574,6 @@ static inline const char* string_VkMemoryAllocateFlagBits(VkMemoryAllocateFlagBi
             return "VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT";
         case VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT:
             return "VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT";
-        case VK_MEMORY_ALLOCATE_ZERO_INITIALIZE_BIT_EXT:
-            return "VK_MEMORY_ALLOCATE_ZERO_INITIALIZE_BIT_EXT";
         default:
             return "Unhandled VkMemoryAllocateFlagBits";
     }
@@ -7543,16 +6623,8 @@ static inline const char* string_VkExternalMemoryHandleTypeFlagBits(VkExternalMe
             return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA";
         case VK_EXTERNAL_MEMORY_HANDLE_TYPE_RDMA_ADDRESS_BIT_NV:
             return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_RDMA_ADDRESS_BIT_NV";
-        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OH_NATIVE_BUFFER_BIT_OHOS:
-            return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_OH_NATIVE_BUFFER_BIT_OHOS";
         case VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX:
             return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_SCREEN_BUFFER_BIT_QNX";
-        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT:
-            return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT";
-        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT:
-            return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT";
-        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT:
-            return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT";
         default:
             return "Unhandled VkExternalMemoryHandleTypeFlagBits";
     }
@@ -7773,51 +6845,6 @@ static inline std::string string_VkExternalSemaphoreFeatureFlags(VkExternalSemap
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkSubgroupFeatureFlagBits(VkSubgroupFeatureFlagBits input_value) {
-    switch (input_value) {
-        case VK_SUBGROUP_FEATURE_BASIC_BIT:
-            return "VK_SUBGROUP_FEATURE_BASIC_BIT";
-        case VK_SUBGROUP_FEATURE_VOTE_BIT:
-            return "VK_SUBGROUP_FEATURE_VOTE_BIT";
-        case VK_SUBGROUP_FEATURE_ARITHMETIC_BIT:
-            return "VK_SUBGROUP_FEATURE_ARITHMETIC_BIT";
-        case VK_SUBGROUP_FEATURE_BALLOT_BIT:
-            return "VK_SUBGROUP_FEATURE_BALLOT_BIT";
-        case VK_SUBGROUP_FEATURE_SHUFFLE_BIT:
-            return "VK_SUBGROUP_FEATURE_SHUFFLE_BIT";
-        case VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT:
-            return "VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT";
-        case VK_SUBGROUP_FEATURE_CLUSTERED_BIT:
-            return "VK_SUBGROUP_FEATURE_CLUSTERED_BIT";
-        case VK_SUBGROUP_FEATURE_QUAD_BIT:
-            return "VK_SUBGROUP_FEATURE_QUAD_BIT";
-        case VK_SUBGROUP_FEATURE_ROTATE_BIT:
-            return "VK_SUBGROUP_FEATURE_ROTATE_BIT";
-        case VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT:
-            return "VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT";
-        case VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV:
-            return "VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV";
-        default:
-            return "Unhandled VkSubgroupFeatureFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkSubgroupFeatureFlags(VkSubgroupFeatureFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkSubgroupFeatureFlagBits(static_cast<VkSubgroupFeatureFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkSubgroupFeatureFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkResolveModeFlagBits(VkResolveModeFlagBits input_value) {
     switch (input_value) {
         case VK_RESOLVE_MODE_NONE:
@@ -7830,10 +6857,8 @@ static inline const char* string_VkResolveModeFlagBits(VkResolveModeFlagBits inp
             return "VK_RESOLVE_MODE_MIN_BIT";
         case VK_RESOLVE_MODE_MAX_BIT:
             return "VK_RESOLVE_MODE_MAX_BIT";
-        case VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID:
-            return "VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID";
-        case VK_RESOLVE_MODE_CUSTOM_BIT_EXT:
-            return "VK_RESOLVE_MODE_CUSTOM_BIT_EXT";
+        case VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID:
+            return "VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID";
         default:
             return "Unhandled VkResolveModeFlagBits";
     }
@@ -7855,31 +6880,6 @@ static inline std::string string_VkResolveModeFlags(VkResolveModeFlags input_val
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkSemaphoreWaitFlagBits(VkSemaphoreWaitFlagBits input_value) {
-    switch (input_value) {
-        case VK_SEMAPHORE_WAIT_ANY_BIT:
-            return "VK_SEMAPHORE_WAIT_ANY_BIT";
-        default:
-            return "Unhandled VkSemaphoreWaitFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkSemaphoreWaitFlags(VkSemaphoreWaitFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkSemaphoreWaitFlagBits(static_cast<VkSemaphoreWaitFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkSemaphoreWaitFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkDescriptorBindingFlagBits(VkDescriptorBindingFlagBits input_value) {
     switch (input_value) {
         case VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT:
@@ -7911,6 +6911,60 @@ static inline std::string string_VkDescriptorBindingFlags(VkDescriptorBindingFla
     return ret;
 }
 #endif // __cplusplus
+static inline const char* string_VkSemaphoreWaitFlagBits(VkSemaphoreWaitFlagBits input_value) {
+    switch (input_value) {
+        case VK_SEMAPHORE_WAIT_ANY_BIT:
+            return "VK_SEMAPHORE_WAIT_ANY_BIT";
+        default:
+            return "Unhandled VkSemaphoreWaitFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkSemaphoreWaitFlags(VkSemaphoreWaitFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkSemaphoreWaitFlagBits(static_cast<VkSemaphoreWaitFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkSemaphoreWaitFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
+static inline const char* string_VkPipelineCreationFeedbackFlagBits(VkPipelineCreationFeedbackFlagBits input_value) {
+    switch (input_value) {
+        case VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT:
+            return "VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT";
+        case VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT:
+            return "VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT";
+        case VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT:
+            return "VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT";
+        default:
+            return "Unhandled VkPipelineCreationFeedbackFlagBits";
+    }
+}
+
+#ifdef __cplusplus
+static inline std::string string_VkPipelineCreationFeedbackFlags(VkPipelineCreationFeedbackFlags input_value) {
+    std::string ret;
+    int index = 0;
+    while(input_value) {
+        if (input_value & 1) {
+            if( !ret.empty()) ret.append("|");
+            ret.append(string_VkPipelineCreationFeedbackFlagBits(static_cast<VkPipelineCreationFeedbackFlagBits>(1U << index)));
+        }
+        ++index;
+        input_value >>= 1;
+    }
+    if (ret.empty()) ret.append("VkPipelineCreationFeedbackFlags(0)");
+    return ret;
+}
+#endif // __cplusplus
 static inline const char* string_VkToolPurposeFlagBits(VkToolPurposeFlagBits input_value) {
     switch (input_value) {
         case VK_TOOL_PURPOSE_VALIDATION_BIT:
@@ -7978,7 +7032,7 @@ static inline const char* string_VkPipelineStageFlagBits2(uint64_t input_value)
     if (input_value == VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR) return "VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR";
     if (input_value == VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT) return "VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT";
     if (input_value == VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT) return "VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT";
-    if (input_value == VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_EXT) return "VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_EXT";
+    if (input_value == VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV) return "VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV";
     if (input_value == VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) return "VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
     if (input_value == VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR) return "VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR";
     if (input_value == VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR) return "VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR";
@@ -7991,10 +7045,6 @@ static inline const char* string_VkPipelineStageFlagBits2(uint64_t input_value)
     if (input_value == VK_PIPELINE_STAGE_2_MICROMAP_BUILD_BIT_EXT) return "VK_PIPELINE_STAGE_2_MICROMAP_BUILD_BIT_EXT";
     if (input_value == VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER_BIT_HUAWEI) return "VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER_BIT_HUAWEI";
     if (input_value == VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV) return "VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV";
-    if (input_value == VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV) return "VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV";
-    if (input_value == VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM) return "VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM";
-    if (input_value == VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR) return "VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR";
-    if (input_value == VK_PIPELINE_STAGE_2_MEMORY_DECOMPRESSION_BIT_EXT) return "VK_PIPELINE_STAGE_2_MEMORY_DECOMPRESSION_BIT_EXT";
     return "Unhandled VkPipelineStageFlagBits2";
 }
 
@@ -8040,14 +7090,12 @@ static inline const char* string_VkAccessFlagBits2(uint64_t input_value) {
     if (input_value == VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR) return "VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR";
     if (input_value == VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR) return "VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR";
     if (input_value == VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR) return "VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR";
-    if (input_value == VK_ACCESS_2_SHADER_TILE_ATTACHMENT_READ_BIT_QCOM) return "VK_ACCESS_2_SHADER_TILE_ATTACHMENT_READ_BIT_QCOM";
-    if (input_value == VK_ACCESS_2_SHADER_TILE_ATTACHMENT_WRITE_BIT_QCOM) return "VK_ACCESS_2_SHADER_TILE_ATTACHMENT_WRITE_BIT_QCOM";
     if (input_value == VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT) return "VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT";
     if (input_value == VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT) return "VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT";
     if (input_value == VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT) return "VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT";
     if (input_value == VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT) return "VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT";
-    if (input_value == VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_EXT) return "VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_EXT";
-    if (input_value == VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_EXT) return "VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_EXT";
+    if (input_value == VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV) return "VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV";
+    if (input_value == VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV) return "VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV";
     if (input_value == VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR) return "VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR";
     if (input_value == VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR) return "VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR";
     if (input_value == VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR) return "VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR";
@@ -8060,10 +7108,6 @@ static inline const char* string_VkAccessFlagBits2(uint64_t input_value) {
     if (input_value == VK_ACCESS_2_MICROMAP_WRITE_BIT_EXT) return "VK_ACCESS_2_MICROMAP_WRITE_BIT_EXT";
     if (input_value == VK_ACCESS_2_OPTICAL_FLOW_READ_BIT_NV) return "VK_ACCESS_2_OPTICAL_FLOW_READ_BIT_NV";
     if (input_value == VK_ACCESS_2_OPTICAL_FLOW_WRITE_BIT_NV) return "VK_ACCESS_2_OPTICAL_FLOW_WRITE_BIT_NV";
-    if (input_value == VK_ACCESS_2_DATA_GRAPH_READ_BIT_ARM) return "VK_ACCESS_2_DATA_GRAPH_READ_BIT_ARM";
-    if (input_value == VK_ACCESS_2_DATA_GRAPH_WRITE_BIT_ARM) return "VK_ACCESS_2_DATA_GRAPH_WRITE_BIT_ARM";
-    if (input_value == VK_ACCESS_2_MEMORY_DECOMPRESSION_READ_BIT_EXT) return "VK_ACCESS_2_MEMORY_DECOMPRESSION_READ_BIT_EXT";
-    if (input_value == VK_ACCESS_2_MEMORY_DECOMPRESSION_WRITE_BIT_EXT) return "VK_ACCESS_2_MEMORY_DECOMPRESSION_WRITE_BIT_EXT";
     return "Unhandled VkAccessFlagBits2";
 }
 
@@ -8108,109 +7152,6 @@ static inline std::string string_VkSubmitFlags(VkSubmitFlags input_value) {
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkFormatFeatureFlagBits2(uint64_t input_value) {
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT) return "VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT) return "VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT) return "VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_BLIT_SRC_BIT) return "VK_FORMAT_FEATURE_2_BLIT_SRC_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_BLIT_DST_BIT) return "VK_FORMAT_FEATURE_2_BLIT_DST_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT) return "VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT) return "VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT) return "VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_DISJOINT_BIT) return "VK_FORMAT_FEATURE_2_DISJOINT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT) return "VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT) return "VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR) return "VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT) return "VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT";
-    if (input_value == VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) return "VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_RADIUS_BUFFER_BIT_NV) return "VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_RADIUS_BUFFER_BIT_NV";
-    if (input_value == VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV) return "VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV";
-    if (input_value == VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM) return "VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM";
-    if (input_value == VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM) return "VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM";
-    if (input_value == VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM) return "VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM";
-    if (input_value == VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM) return "VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM";
-    if (input_value == VK_FORMAT_FEATURE_2_TENSOR_SHADER_BIT_ARM) return "VK_FORMAT_FEATURE_2_TENSOR_SHADER_BIT_ARM";
-    if (input_value == VK_FORMAT_FEATURE_2_TENSOR_IMAGE_ALIASING_BIT_ARM) return "VK_FORMAT_FEATURE_2_TENSOR_IMAGE_ALIASING_BIT_ARM";
-    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV";
-    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV";
-    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV";
-    if (input_value == VK_FORMAT_FEATURE_2_TENSOR_DATA_GRAPH_BIT_ARM) return "VK_FORMAT_FEATURE_2_TENSOR_DATA_GRAPH_BIT_ARM";
-    if (input_value == VK_FORMAT_FEATURE_2_COPY_IMAGE_INDIRECT_DST_BIT_KHR) return "VK_FORMAT_FEATURE_2_COPY_IMAGE_INDIRECT_DST_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_COMPUTE_QUEUE_BIT_KHR) return "VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_COMPUTE_QUEUE_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_TRANSFER_QUEUE_BIT_KHR) return "VK_FORMAT_FEATURE_2_DEPTH_COPY_ON_TRANSFER_QUEUE_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_COMPUTE_QUEUE_BIT_KHR) return "VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_COMPUTE_QUEUE_BIT_KHR";
-    if (input_value == VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_TRANSFER_QUEUE_BIT_KHR) return "VK_FORMAT_FEATURE_2_STENCIL_COPY_ON_TRANSFER_QUEUE_BIT_KHR";
-    return "Unhandled VkFormatFeatureFlagBits2";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkFormatFeatureFlags2(VkFormatFeatureFlags2 input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkFormatFeatureFlagBits2(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkFormatFeatureFlags2(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineCreationFeedbackFlagBits(VkPipelineCreationFeedbackFlagBits input_value) {
-    switch (input_value) {
-        case VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT:
-            return "VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT";
-        case VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT:
-            return "VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT";
-        case VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT:
-            return "VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT";
-        default:
-            return "Unhandled VkPipelineCreationFeedbackFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineCreationFeedbackFlags(VkPipelineCreationFeedbackFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineCreationFeedbackFlagBits(static_cast<VkPipelineCreationFeedbackFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineCreationFeedbackFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkRenderingFlagBits(VkRenderingFlagBits input_value) {
     switch (input_value) {
         case VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT:
@@ -8219,18 +7160,10 @@ static inline const char* string_VkRenderingFlagBits(VkRenderingFlagBits input_v
             return "VK_RENDERING_SUSPENDING_BIT";
         case VK_RENDERING_RESUMING_BIT:
             return "VK_RENDERING_RESUMING_BIT";
+        case VK_RENDERING_CONTENTS_INLINE_BIT_EXT:
+            return "VK_RENDERING_CONTENTS_INLINE_BIT_EXT";
         case VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT:
             return "VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT";
-        case VK_RENDERING_CONTENTS_INLINE_BIT_KHR:
-            return "VK_RENDERING_CONTENTS_INLINE_BIT_KHR";
-        case VK_RENDERING_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE:
-            return "VK_RENDERING_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE";
-        case VK_RENDERING_FRAGMENT_REGION_BIT_EXT:
-            return "VK_RENDERING_FRAGMENT_REGION_BIT_EXT";
-        case VK_RENDERING_CUSTOM_RESOLVE_BIT_EXT:
-            return "VK_RENDERING_CUSTOM_RESOLVE_BIT_EXT";
-        case VK_RENDERING_LOCAL_READ_CONCURRENT_ACCESS_CONTROL_BIT_KHR:
-            return "VK_RENDERING_LOCAL_READ_CONCURRENT_ACCESS_CONTROL_BIT_KHR";
         default:
             return "Unhandled VkRenderingFlagBits";
     }
@@ -8252,169 +7185,66 @@ static inline std::string string_VkRenderingFlags(VkRenderingFlags input_value)
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkMemoryUnmapFlagBits(VkMemoryUnmapFlagBits input_value) {
-    switch (input_value) {
-        case VK_MEMORY_UNMAP_RESERVE_BIT_EXT:
-            return "VK_MEMORY_UNMAP_RESERVE_BIT_EXT";
-        default:
-            return "Unhandled VkMemoryUnmapFlagBits";
-    }
+static inline const char* string_VkFormatFeatureFlagBits2(uint64_t input_value) {
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT) return "VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT) return "VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT) return "VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT) return "VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_BLIT_SRC_BIT) return "VK_FORMAT_FEATURE_2_BLIT_SRC_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_BLIT_DST_BIT) return "VK_FORMAT_FEATURE_2_BLIT_DST_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT) return "VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT) return "VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT) return "VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_DISJOINT_BIT) return "VK_FORMAT_FEATURE_2_DISJOINT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT) return "VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) return "VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT) return "VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT";
+    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR) return "VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT) return "VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT";
+    if (input_value == VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) return "VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT) return "VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT";
+    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR) return "VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR";
+    if (input_value == VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV) return "VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV";
+    if (input_value == VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM) return "VK_FORMAT_FEATURE_2_WEIGHT_IMAGE_BIT_QCOM";
+    if (input_value == VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM) return "VK_FORMAT_FEATURE_2_WEIGHT_SAMPLED_IMAGE_BIT_QCOM";
+    if (input_value == VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM) return "VK_FORMAT_FEATURE_2_BLOCK_MATCHING_BIT_QCOM";
+    if (input_value == VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM) return "VK_FORMAT_FEATURE_2_BOX_FILTER_SAMPLED_BIT_QCOM";
+    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT_NV";
+    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV";
+    if (input_value == VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV) return "VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV";
+    return "Unhandled VkFormatFeatureFlagBits2";
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkMemoryUnmapFlags(VkMemoryUnmapFlags input_value) {
+static inline std::string string_VkFormatFeatureFlags2(VkFormatFeatureFlags2 input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkMemoryUnmapFlagBits(static_cast<VkMemoryUnmapFlagBits>(1U << index)));
+            ret.append(string_VkFormatFeatureFlagBits2(static_cast<uint64_t>(1ULL << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkMemoryUnmapFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkBufferUsageFlagBits2(uint64_t input_value) {
-    if (input_value == VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT) return "VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_TRANSFER_DST_BIT) return "VK_BUFFER_USAGE_2_TRANSFER_DST_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT) return "VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT) return "VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT) return "VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT) return "VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT) return "VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT) return "VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT) return "VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT";
-    if (input_value == VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT) return "VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX) return "VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT) return "VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR) return "VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR) return "VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR) return "VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR";
-    if (input_value == VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT) return "VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT) return "VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_BUFFER_USAGE_2_COMPRESSED_DATA_DGF1_BIT_AMDX) return "VK_BUFFER_USAGE_2_COMPRESSED_DATA_DGF1_BIT_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_BUFFER_USAGE_2_DATA_GRAPH_FOREIGN_DESCRIPTOR_BIT_ARM) return "VK_BUFFER_USAGE_2_DATA_GRAPH_FOREIGN_DESCRIPTOR_BIT_ARM";
-    if (input_value == VK_BUFFER_USAGE_2_TILE_MEMORY_BIT_QCOM) return "VK_BUFFER_USAGE_2_TILE_MEMORY_BIT_QCOM";
-    if (input_value == VK_BUFFER_USAGE_2_MEMORY_DECOMPRESSION_BIT_EXT) return "VK_BUFFER_USAGE_2_MEMORY_DECOMPRESSION_BIT_EXT";
-    if (input_value == VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT";
-    return "Unhandled VkBufferUsageFlagBits2";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkBufferUsageFlags2(VkBufferUsageFlags2 input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkBufferUsageFlagBits2(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkBufferUsageFlags2(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkHostImageCopyFlagBits(VkHostImageCopyFlagBits input_value) {
-    switch (input_value) {
-        case VK_HOST_IMAGE_COPY_MEMCPY_BIT:
-            return "VK_HOST_IMAGE_COPY_MEMCPY_BIT";
-        default:
-            return "Unhandled VkHostImageCopyFlagBits";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkHostImageCopyFlags(VkHostImageCopyFlags input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkHostImageCopyFlagBits(static_cast<VkHostImageCopyFlagBits>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkHostImageCopyFlags(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPipelineCreateFlagBits2(uint64_t input_value) {
-    if (input_value == VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT) return "VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT) return "VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_DERIVATIVE_BIT) return "VK_PIPELINE_CREATE_2_DERIVATIVE_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT) return "VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT) return "VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT) return "VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT) return "VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT) return "VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT";
-    if (input_value == VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT) return "VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX) return "VK_PIPELINE_CREATE_2_EXECUTION_GRAPH_BIT_AMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_SPHERES_AND_LINEAR_SWEPT_SPHERES_BIT_NV) return "VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_SPHERES_AND_LINEAR_SWEPT_SPHERES_BIT_NV";
-    if (input_value == VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT) return "VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV) return "VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV";
-    if (input_value == VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR) return "VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) return "VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT) return "VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT) return "VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR) return "VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV) return "VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV) return "VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV";
-    if (input_value == VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) return "VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT) return "VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT) return "VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT) return "VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT) return "VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV) return "VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV";
-    if (input_value == VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM) return "VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM";
-    if (input_value == VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR) return "VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR";
-    if (input_value == VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT) return "VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT";
-    if (input_value == VK_PIPELINE_CREATE_2_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE) return "VK_PIPELINE_CREATE_2_PER_LAYER_FRAGMENT_DENSITY_BIT_VALVE";
-    if (input_value == VK_PIPELINE_CREATE_2_64_BIT_INDEXING_BIT_EXT) return "VK_PIPELINE_CREATE_2_64_BIT_INDEXING_BIT_EXT";
-    return "Unhandled VkPipelineCreateFlagBits2";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPipelineCreateFlags2(VkPipelineCreateFlags2 input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPipelineCreateFlagBits2(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPipelineCreateFlags2(0)");
+    if (ret.empty()) ret.append("VkFormatFeatureFlags2(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -8498,14 +7328,8 @@ static inline const char* string_VkSwapchainCreateFlagBitsKHR(VkSwapchainCreateF
             return "VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR";
         case VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR:
             return "VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR";
-        case VK_SWAPCHAIN_CREATE_PRESENT_TIMING_BIT_EXT:
-            return "VK_SWAPCHAIN_CREATE_PRESENT_TIMING_BIT_EXT";
-        case VK_SWAPCHAIN_CREATE_PRESENT_ID_2_BIT_KHR:
-            return "VK_SWAPCHAIN_CREATE_PRESENT_ID_2_BIT_KHR";
-        case VK_SWAPCHAIN_CREATE_PRESENT_WAIT_2_BIT_KHR:
-            return "VK_SWAPCHAIN_CREATE_PRESENT_WAIT_2_BIT_KHR";
-        case VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR:
-            return "VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR";
+        case VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT:
+            return "VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT";
         default:
             return "Unhandled VkSwapchainCreateFlagBitsKHR";
     }
@@ -8603,10 +7427,6 @@ static inline const char* string_VkVideoCodecOperationFlagBitsKHR(VkVideoCodecOp
             return "VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR";
         case VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR:
             return "VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR";
-        case VK_VIDEO_CODEC_OPERATION_ENCODE_AV1_BIT_KHR:
-            return "VK_VIDEO_CODEC_OPERATION_ENCODE_AV1_BIT_KHR";
-        case VK_VIDEO_CODEC_OPERATION_DECODE_VP9_BIT_KHR:
-            return "VK_VIDEO_CODEC_OPERATION_DECODE_VP9_BIT_KHR";
         default:
             return "Unhandled VkVideoCodecOperationFlagBitsKHR";
     }
@@ -8727,12 +7547,6 @@ static inline const char* string_VkVideoSessionCreateFlagBitsKHR(VkVideoSessionC
             return "VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_PARAMETER_OPTIMIZATIONS_BIT_KHR";
         case VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR:
             return "VK_VIDEO_SESSION_CREATE_INLINE_QUERIES_BIT_KHR";
-        case VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR:
-            return "VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR";
-        case VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_EMPHASIS_MAP_BIT_KHR:
-            return "VK_VIDEO_SESSION_CREATE_ALLOW_ENCODE_EMPHASIS_MAP_BIT_KHR";
-        case VK_VIDEO_SESSION_CREATE_INLINE_SESSION_PARAMETERS_BIT_KHR:
-            return "VK_VIDEO_SESSION_CREATE_INLINE_SESSION_PARAMETERS_BIT_KHR";
         default:
             return "Unhandled VkVideoSessionCreateFlagBitsKHR";
     }
@@ -8754,31 +7568,6 @@ static inline std::string string_VkVideoSessionCreateFlagsKHR(VkVideoSessionCrea
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkVideoSessionParametersCreateFlagBitsKHR(VkVideoSessionParametersCreateFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_SESSION_PARAMETERS_CREATE_QUANTIZATION_MAP_COMPATIBLE_BIT_KHR:
-            return "VK_VIDEO_SESSION_PARAMETERS_CREATE_QUANTIZATION_MAP_COMPATIBLE_BIT_KHR";
-        default:
-            return "Unhandled VkVideoSessionParametersCreateFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoSessionParametersCreateFlagsKHR(VkVideoSessionParametersCreateFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoSessionParametersCreateFlagBitsKHR(static_cast<VkVideoSessionParametersCreateFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoSessionParametersCreateFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkVideoCodingControlFlagBitsKHR(VkVideoCodingControlFlagBitsKHR input_value) {
     switch (input_value) {
         case VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR:
@@ -8886,10 +7675,6 @@ static inline const char* string_VkVideoEncodeH264CapabilityFlagBitsKHR(VkVideoE
             return "VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR";
         case VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR:
             return "VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR";
-        case VK_VIDEO_ENCODE_H264_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR:
-            return "VK_VIDEO_ENCODE_H264_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR";
-        case VK_VIDEO_ENCODE_H264_CAPABILITY_MB_QP_DIFF_WRAPAROUND_BIT_KHR:
-            return "VK_VIDEO_ENCODE_H264_CAPABILITY_MB_QP_DIFF_WRAPAROUND_BIT_KHR";
         default:
             return "Unhandled VkVideoEncodeH264CapabilityFlagBitsKHR";
     }
@@ -9029,10 +7814,6 @@ static inline const char* string_VkVideoEncodeH265CapabilityFlagBitsKHR(VkVideoE
             return "VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR";
         case VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR:
             return "VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR";
-        case VK_VIDEO_ENCODE_H265_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR:
-            return "VK_VIDEO_ENCODE_H265_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR";
-        case VK_VIDEO_ENCODE_H265_CAPABILITY_CU_QP_DIFF_WRAPAROUND_BIT_KHR:
-            return "VK_VIDEO_ENCODE_H265_CAPABILITY_CU_QP_DIFF_WRAPAROUND_BIT_KHR";
         default:
             return "Unhandled VkVideoEncodeH265CapabilityFlagBitsKHR";
     }
@@ -9268,32 +8049,28 @@ static inline std::string string_VkPerformanceCounterDescriptionFlagsKHR(VkPerfo
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkVideoEncodeFlagBitsKHR(VkVideoEncodeFlagBitsKHR input_value) {
+static inline const char* string_VkMemoryUnmapFlagBitsKHR(VkMemoryUnmapFlagBitsKHR input_value) {
     switch (input_value) {
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_BIT_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_BIT_KHR";
-        case VK_VIDEO_ENCODE_WITH_QUANTIZATION_DELTA_MAP_BIT_KHR:
-            return "VK_VIDEO_ENCODE_WITH_QUANTIZATION_DELTA_MAP_BIT_KHR";
-        case VK_VIDEO_ENCODE_WITH_EMPHASIS_MAP_BIT_KHR:
-            return "VK_VIDEO_ENCODE_WITH_EMPHASIS_MAP_BIT_KHR";
+        case VK_MEMORY_UNMAP_RESERVE_BIT_EXT:
+            return "VK_MEMORY_UNMAP_RESERVE_BIT_EXT";
         default:
-            return "Unhandled VkVideoEncodeFlagBitsKHR";
+            return "Unhandled VkMemoryUnmapFlagBitsKHR";
     }
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkVideoEncodeFlagsKHR(VkVideoEncodeFlagsKHR input_value) {
+static inline std::string string_VkMemoryUnmapFlagsKHR(VkMemoryUnmapFlagsKHR input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeFlagBitsKHR(static_cast<VkVideoEncodeFlagBitsKHR>(1U << index)));
+            ret.append(string_VkMemoryUnmapFlagBitsKHR(static_cast<VkMemoryUnmapFlagBitsKHR>(1U << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkVideoEncodeFlagsKHR(0)");
+    if (ret.empty()) ret.append("VkMemoryUnmapFlagsKHR(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -9303,10 +8080,6 @@ static inline const char* string_VkVideoEncodeCapabilityFlagBitsKHR(VkVideoEncod
             return "VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR";
         case VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR:
             return "VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR";
-        case VK_VIDEO_ENCODE_CAPABILITY_QUANTIZATION_DELTA_MAP_BIT_KHR:
-            return "VK_VIDEO_ENCODE_CAPABILITY_QUANTIZATION_DELTA_MAP_BIT_KHR";
-        case VK_VIDEO_ENCODE_CAPABILITY_EMPHASIS_MAP_BIT_KHR:
-            return "VK_VIDEO_ENCODE_CAPABILITY_EMPHASIS_MAP_BIT_KHR";
         default:
             return "Unhandled VkVideoEncodeCapabilityFlagBitsKHR";
     }
@@ -9452,324 +8225,101 @@ static inline std::string string_VkVideoEncodeContentFlagsKHR(VkVideoEncodeConte
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkPresentScalingFlagBitsKHR(VkPresentScalingFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR:
-            return "VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR";
-        case VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR:
-            return "VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR";
-        case VK_PRESENT_SCALING_STRETCH_BIT_KHR:
-            return "VK_PRESENT_SCALING_STRETCH_BIT_KHR";
-        default:
-            return "Unhandled VkPresentScalingFlagBitsKHR";
-    }
+static inline const char* string_VkPipelineCreateFlagBits2KHR(uint64_t input_value) {
+    if (input_value == VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR) return "VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR) return "VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR) return "VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT) return "VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR) return "VK_PIPELINE_CREATE_2_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR) return "VK_PIPELINE_CREATE_2_DISPATCH_BASE_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV) return "VK_PIPELINE_CREATE_2_DEFER_COMPILE_BIT_NV";
+    if (input_value == VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR) return "VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR) return "VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR) return "VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR) return "VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT) return "VK_PIPELINE_CREATE_2_LINK_TIME_OPTIMIZATION_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT) return "VK_PIPELINE_CREATE_2_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR) return "VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_AABBS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR) return "VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV) return "VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_NV";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV) return "VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV";
+    if (input_value == VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR) return "VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR";
+    if (input_value == VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT) return "VK_PIPELINE_CREATE_2_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT) return "VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT) return "VK_PIPELINE_CREATE_2_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT) return "VK_PIPELINE_CREATE_2_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT) return "VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT) return "VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT";
+    if (input_value == VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV) return "VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV";
+    if (input_value == VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT";
+    return "Unhandled VkPipelineCreateFlagBits2KHR";
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkPresentScalingFlagsKHR(VkPresentScalingFlagsKHR input_value) {
+static inline std::string string_VkPipelineCreateFlags2KHR(VkPipelineCreateFlags2KHR input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPresentScalingFlagBitsKHR(static_cast<VkPresentScalingFlagBitsKHR>(1U << index)));
+            ret.append(string_VkPipelineCreateFlagBits2KHR(static_cast<uint64_t>(1ULL << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkPresentScalingFlagsKHR(0)");
+    if (ret.empty()) ret.append("VkPipelineCreateFlags2KHR(0)");
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkPresentGravityFlagBitsKHR(VkPresentGravityFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_PRESENT_GRAVITY_MIN_BIT_KHR:
-            return "VK_PRESENT_GRAVITY_MIN_BIT_KHR";
-        case VK_PRESENT_GRAVITY_MAX_BIT_KHR:
-            return "VK_PRESENT_GRAVITY_MAX_BIT_KHR";
-        case VK_PRESENT_GRAVITY_CENTERED_BIT_KHR:
-            return "VK_PRESENT_GRAVITY_CENTERED_BIT_KHR";
-        default:
-            return "Unhandled VkPresentGravityFlagBitsKHR";
-    }
+static inline const char* string_VkBufferUsageFlagBits2KHR(uint64_t input_value) {
+    if (input_value == VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR) return "VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_TRANSFER_DST_BIT_KHR) return "VK_BUFFER_USAGE_2_TRANSFER_DST_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_VERTEX_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR) return "VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX) return "VK_BUFFER_USAGE_2_EXECUTION_GRAPH_SCRATCH_BIT_AMDX";
+    if (input_value == VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT) return "VK_BUFFER_USAGE_2_CONDITIONAL_RENDERING_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR) return "VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_DECODE_SRC_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_DECODE_DST_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_ENCODE_DST_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR) return "VK_BUFFER_USAGE_2_VIDEO_ENCODE_SRC_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR) return "VK_BUFFER_USAGE_2_SHADER_DEVICE_ADDRESS_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR) return "VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR) return "VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR";
+    if (input_value == VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT) return "VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT) return "VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT";
+    if (input_value == VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT) return "VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT";
+    return "Unhandled VkBufferUsageFlagBits2KHR";
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkPresentGravityFlagsKHR(VkPresentGravityFlagsKHR input_value) {
+static inline std::string string_VkBufferUsageFlags2KHR(VkBufferUsageFlags2KHR input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPresentGravityFlagBitsKHR(static_cast<VkPresentGravityFlagBitsKHR>(1U << index)));
+            ret.append(string_VkBufferUsageFlagBits2KHR(static_cast<uint64_t>(1ULL << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkPresentGravityFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeAV1CapabilityFlagBitsKHR(VkVideoEncodeAV1CapabilityFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_PER_RATE_CONTROL_GROUP_MIN_MAX_Q_INDEX_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_PER_RATE_CONTROL_GROUP_MIN_MAX_Q_INDEX_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_GENERATE_OBU_EXTENSION_HEADER_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_GENERATE_OBU_EXTENSION_HEADER_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_PRIMARY_REFERENCE_CDF_ONLY_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_PRIMARY_REFERENCE_CDF_ONLY_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_FRAME_SIZE_OVERRIDE_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_FRAME_SIZE_OVERRIDE_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_MOTION_VECTOR_SCALING_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_MOTION_VECTOR_SCALING_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_CAPABILITY_COMPOUND_PREDICTION_INTRA_REFRESH_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_CAPABILITY_COMPOUND_PREDICTION_INTRA_REFRESH_BIT_KHR";
-        default:
-            return "Unhandled VkVideoEncodeAV1CapabilityFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeAV1CapabilityFlagsKHR(VkVideoEncodeAV1CapabilityFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeAV1CapabilityFlagBitsKHR(static_cast<VkVideoEncodeAV1CapabilityFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeAV1CapabilityFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeAV1StdFlagBitsKHR(VkVideoEncodeAV1StdFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_STD_UNIFORM_TILE_SPACING_FLAG_SET_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_STD_UNIFORM_TILE_SPACING_FLAG_SET_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_STD_SKIP_MODE_PRESENT_UNSET_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_STD_SKIP_MODE_PRESENT_UNSET_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_STD_PRIMARY_REF_FRAME_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_STD_PRIMARY_REF_FRAME_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_STD_DELTA_Q_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_STD_DELTA_Q_BIT_KHR";
-        default:
-            return "Unhandled VkVideoEncodeAV1StdFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeAV1StdFlagsKHR(VkVideoEncodeAV1StdFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeAV1StdFlagBitsKHR(static_cast<VkVideoEncodeAV1StdFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeAV1StdFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeAV1SuperblockSizeFlagBitsKHR(VkVideoEncodeAV1SuperblockSizeFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_64_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_64_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_128_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_SUPERBLOCK_SIZE_128_BIT_KHR";
-        default:
-            return "Unhandled VkVideoEncodeAV1SuperblockSizeFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeAV1SuperblockSizeFlagsKHR(VkVideoEncodeAV1SuperblockSizeFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeAV1SuperblockSizeFlagBitsKHR(static_cast<VkVideoEncodeAV1SuperblockSizeFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeAV1SuperblockSizeFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeAV1RateControlFlagBitsKHR(VkVideoEncodeAV1RateControlFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REGULAR_GOP_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REGULAR_GOP_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_TEMPORAL_LAYER_PATTERN_DYADIC_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_FLAT_BIT_KHR";
-        case VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR:
-            return "VK_VIDEO_ENCODE_AV1_RATE_CONTROL_REFERENCE_PATTERN_DYADIC_BIT_KHR";
-        default:
-            return "Unhandled VkVideoEncodeAV1RateControlFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeAV1RateControlFlagsKHR(VkVideoEncodeAV1RateControlFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeAV1RateControlFlagBitsKHR(static_cast<VkVideoEncodeAV1RateControlFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeAV1RateControlFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkAddressCopyFlagBitsKHR(VkAddressCopyFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_ADDRESS_COPY_DEVICE_LOCAL_BIT_KHR:
-            return "VK_ADDRESS_COPY_DEVICE_LOCAL_BIT_KHR";
-        case VK_ADDRESS_COPY_SPARSE_BIT_KHR:
-            return "VK_ADDRESS_COPY_SPARSE_BIT_KHR";
-        case VK_ADDRESS_COPY_PROTECTED_BIT_KHR:
-            return "VK_ADDRESS_COPY_PROTECTED_BIT_KHR";
-        default:
-            return "Unhandled VkAddressCopyFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkAddressCopyFlagsKHR(VkAddressCopyFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkAddressCopyFlagBitsKHR(static_cast<VkAddressCopyFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkAddressCopyFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeIntraRefreshModeFlagBitsKHR(VkVideoEncodeIntraRefreshModeFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_NONE_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_NONE_KHR";
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_PER_PICTURE_PARTITION_BIT_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_PER_PICTURE_PARTITION_BIT_KHR";
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_BASED_BIT_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_BASED_BIT_KHR";
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_ROW_BASED_BIT_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_ROW_BASED_BIT_KHR";
-        case VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_COLUMN_BASED_BIT_KHR:
-            return "VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_COLUMN_BASED_BIT_KHR";
-        default:
-            return "Unhandled VkVideoEncodeIntraRefreshModeFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeIntraRefreshModeFlagsKHR(VkVideoEncodeIntraRefreshModeFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeIntraRefreshModeFlagBitsKHR(static_cast<VkVideoEncodeIntraRefreshModeFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeIntraRefreshModeFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkAccessFlagBits3KHR(uint64_t input_value) {
-    if (input_value == VK_ACCESS_3_NONE_KHR) return "VK_ACCESS_3_NONE_KHR";
-    return "Unhandled VkAccessFlagBits3KHR";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkAccessFlags3KHR(VkAccessFlags3KHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkAccessFlagBits3KHR(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkAccessFlags3KHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkRenderingAttachmentFlagBitsKHR(VkRenderingAttachmentFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_RENDERING_ATTACHMENT_INPUT_ATTACHMENT_FEEDBACK_BIT_KHR:
-            return "VK_RENDERING_ATTACHMENT_INPUT_ATTACHMENT_FEEDBACK_BIT_KHR";
-        case VK_RENDERING_ATTACHMENT_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_RENDERING_ATTACHMENT_RESOLVE_SKIP_TRANSFER_FUNCTION_BIT_KHR";
-        case VK_RENDERING_ATTACHMENT_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_RENDERING_ATTACHMENT_RESOLVE_ENABLE_TRANSFER_FUNCTION_BIT_KHR";
-        default:
-            return "Unhandled VkRenderingAttachmentFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkRenderingAttachmentFlagsKHR(VkRenderingAttachmentFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkRenderingAttachmentFlagBitsKHR(static_cast<VkRenderingAttachmentFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkRenderingAttachmentFlagsKHR(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkResolveImageFlagBitsKHR(VkResolveImageFlagBitsKHR input_value) {
-    switch (input_value) {
-        case VK_RESOLVE_IMAGE_SKIP_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_RESOLVE_IMAGE_SKIP_TRANSFER_FUNCTION_BIT_KHR";
-        case VK_RESOLVE_IMAGE_ENABLE_TRANSFER_FUNCTION_BIT_KHR:
-            return "VK_RESOLVE_IMAGE_ENABLE_TRANSFER_FUNCTION_BIT_KHR";
-        default:
-            return "Unhandled VkResolveImageFlagBitsKHR";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkResolveImageFlagsKHR(VkResolveImageFlagsKHR input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkResolveImageFlagBitsKHR(static_cast<VkResolveImageFlagBitsKHR>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkResolveImageFlagsKHR(0)");
+    if (ret.empty()) ret.append("VkBufferUsageFlags2KHR(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -10015,10 +8565,10 @@ static inline const char* string_VkGeometryInstanceFlagBitsKHR(VkGeometryInstanc
             return "VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR";
         case VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR:
             return "VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR";
-        case VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_BIT_EXT:
-            return "VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_BIT_EXT";
-        case VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_BIT_EXT:
-            return "VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_BIT_EXT";
+        case VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT:
+            return "VK_GEOMETRY_INSTANCE_FORCE_OPACITY_MICROMAP_2_STATE_EXT";
+        case VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT:
+            return "VK_GEOMETRY_INSTANCE_DISABLE_OPACITY_MICROMAPS_EXT";
         default:
             return "Unhandled VkGeometryInstanceFlagBitsKHR";
     }
@@ -10054,20 +8604,18 @@ static inline const char* string_VkBuildAccelerationStructureFlagBitsKHR(VkBuild
             return "VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_KHR";
         case VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV:
             return "VK_BUILD_ACCELERATION_STRUCTURE_MOTION_BIT_NV";
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_BIT_EXT:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_BIT_EXT";
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_BIT_EXT:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_BIT_EXT";
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT_EXT:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT_EXT";
+        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT:
+            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_UPDATE_EXT";
+        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT:
+            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISABLE_OPACITY_MICROMAPS_EXT";
+        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT:
+            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT";
 #ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV";
+        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV:
+            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV";
 #endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR";
-        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_CLUSTER_OPACITY_MICROMAPS_BIT_NV:
-            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_CLUSTER_OPACITY_MICROMAPS_BIT_NV";
+        case VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR:
+            return "VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_KHR";
         default:
             return "Unhandled VkBuildAccelerationStructureFlagBitsKHR";
     }
@@ -10089,88 +8637,86 @@ static inline std::string string_VkBuildAccelerationStructureFlagsKHR(VkBuildAcc
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkPresentStageFlagBitsEXT(VkPresentStageFlagBitsEXT input_value) {
+static inline const char* string_VkHostImageCopyFlagBitsEXT(VkHostImageCopyFlagBitsEXT input_value) {
     switch (input_value) {
-        case VK_PRESENT_STAGE_QUEUE_OPERATIONS_END_BIT_EXT:
-            return "VK_PRESENT_STAGE_QUEUE_OPERATIONS_END_BIT_EXT";
-        case VK_PRESENT_STAGE_REQUEST_DEQUEUED_BIT_EXT:
-            return "VK_PRESENT_STAGE_REQUEST_DEQUEUED_BIT_EXT";
-        case VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_OUT_BIT_EXT:
-            return "VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_OUT_BIT_EXT";
-        case VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_VISIBLE_BIT_EXT:
-            return "VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_VISIBLE_BIT_EXT";
+        case VK_HOST_IMAGE_COPY_MEMCPY_EXT:
+            return "VK_HOST_IMAGE_COPY_MEMCPY_EXT";
         default:
-            return "Unhandled VkPresentStageFlagBitsEXT";
+            return "Unhandled VkHostImageCopyFlagBitsEXT";
     }
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkPresentStageFlagsEXT(VkPresentStageFlagsEXT input_value) {
+static inline std::string string_VkHostImageCopyFlagsEXT(VkHostImageCopyFlagsEXT input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPresentStageFlagBitsEXT(static_cast<VkPresentStageFlagBitsEXT>(1U << index)));
+            ret.append(string_VkHostImageCopyFlagBitsEXT(static_cast<VkHostImageCopyFlagBitsEXT>(1U << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkPresentStageFlagsEXT(0)");
+    if (ret.empty()) ret.append("VkHostImageCopyFlagsEXT(0)");
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkPastPresentationTimingFlagBitsEXT(VkPastPresentationTimingFlagBitsEXT input_value) {
+static inline const char* string_VkPresentScalingFlagBitsEXT(VkPresentScalingFlagBitsEXT input_value) {
     switch (input_value) {
-        case VK_PAST_PRESENTATION_TIMING_ALLOW_PARTIAL_RESULTS_BIT_EXT:
-            return "VK_PAST_PRESENTATION_TIMING_ALLOW_PARTIAL_RESULTS_BIT_EXT";
-        case VK_PAST_PRESENTATION_TIMING_ALLOW_OUT_OF_ORDER_RESULTS_BIT_EXT:
-            return "VK_PAST_PRESENTATION_TIMING_ALLOW_OUT_OF_ORDER_RESULTS_BIT_EXT";
+        case VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT:
+            return "VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT";
+        case VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT:
+            return "VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT";
+        case VK_PRESENT_SCALING_STRETCH_BIT_EXT:
+            return "VK_PRESENT_SCALING_STRETCH_BIT_EXT";
         default:
-            return "Unhandled VkPastPresentationTimingFlagBitsEXT";
+            return "Unhandled VkPresentScalingFlagBitsEXT";
     }
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkPastPresentationTimingFlagsEXT(VkPastPresentationTimingFlagsEXT input_value) {
+static inline std::string string_VkPresentScalingFlagsEXT(VkPresentScalingFlagsEXT input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPastPresentationTimingFlagBitsEXT(static_cast<VkPastPresentationTimingFlagBitsEXT>(1U << index)));
+            ret.append(string_VkPresentScalingFlagBitsEXT(static_cast<VkPresentScalingFlagBitsEXT>(1U << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkPastPresentationTimingFlagsEXT(0)");
+    if (ret.empty()) ret.append("VkPresentScalingFlagsEXT(0)");
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkPresentTimingInfoFlagBitsEXT(VkPresentTimingInfoFlagBitsEXT input_value) {
+static inline const char* string_VkPresentGravityFlagBitsEXT(VkPresentGravityFlagBitsEXT input_value) {
     switch (input_value) {
-        case VK_PRESENT_TIMING_INFO_PRESENT_AT_RELATIVE_TIME_BIT_EXT:
-            return "VK_PRESENT_TIMING_INFO_PRESENT_AT_RELATIVE_TIME_BIT_EXT";
-        case VK_PRESENT_TIMING_INFO_PRESENT_AT_NEAREST_REFRESH_CYCLE_BIT_EXT:
-            return "VK_PRESENT_TIMING_INFO_PRESENT_AT_NEAREST_REFRESH_CYCLE_BIT_EXT";
+        case VK_PRESENT_GRAVITY_MIN_BIT_EXT:
+            return "VK_PRESENT_GRAVITY_MIN_BIT_EXT";
+        case VK_PRESENT_GRAVITY_MAX_BIT_EXT:
+            return "VK_PRESENT_GRAVITY_MAX_BIT_EXT";
+        case VK_PRESENT_GRAVITY_CENTERED_BIT_EXT:
+            return "VK_PRESENT_GRAVITY_CENTERED_BIT_EXT";
         default:
-            return "Unhandled VkPresentTimingInfoFlagBitsEXT";
+            return "Unhandled VkPresentGravityFlagBitsEXT";
     }
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkPresentTimingInfoFlagsEXT(VkPresentTimingInfoFlagsEXT input_value) {
+static inline std::string string_VkPresentGravityFlagsEXT(VkPresentGravityFlagsEXT input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPresentTimingInfoFlagBitsEXT(static_cast<VkPresentTimingInfoFlagBitsEXT>(1U << index)));
+            ret.append(string_VkPresentGravityFlagBitsEXT(static_cast<VkPresentGravityFlagBitsEXT>(1U << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkPresentTimingInfoFlagsEXT(0)");
+    if (ret.empty()) ret.append("VkPresentGravityFlagsEXT(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -10259,33 +8805,6 @@ static inline std::string string_VkDeviceDiagnosticsConfigFlagsNV(VkDeviceDiagno
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkTileShadingRenderPassFlagBitsQCOM(VkTileShadingRenderPassFlagBitsQCOM input_value) {
-    switch (input_value) {
-        case VK_TILE_SHADING_RENDER_PASS_ENABLE_BIT_QCOM:
-            return "VK_TILE_SHADING_RENDER_PASS_ENABLE_BIT_QCOM";
-        case VK_TILE_SHADING_RENDER_PASS_PER_TILE_EXECUTION_BIT_QCOM:
-            return "VK_TILE_SHADING_RENDER_PASS_PER_TILE_EXECUTION_BIT_QCOM";
-        default:
-            return "Unhandled VkTileShadingRenderPassFlagBitsQCOM";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkTileShadingRenderPassFlagsQCOM(VkTileShadingRenderPassFlagsQCOM input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkTileShadingRenderPassFlagBitsQCOM(static_cast<VkTileShadingRenderPassFlagBitsQCOM>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkTileShadingRenderPassFlagsQCOM(0)");
-    return ret;
-}
-#endif // __cplusplus
 #ifdef VK_USE_PLATFORM_METAL_EXT
 static inline const char* string_VkExportMetalObjectTypeFlagBitsEXT(VkExportMetalObjectTypeFlagBitsEXT input_value) {
     switch (input_value) {
@@ -10543,93 +9062,6 @@ static inline std::string string_VkFrameBoundaryFlagsEXT(VkFrameBoundaryFlagsEXT
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkVideoEncodeRgbModelConversionFlagBitsVALVE(VkVideoEncodeRgbModelConversionFlagBitsVALVE input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_RGB_IDENTITY_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_RGB_IDENTITY_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_IDENTITY_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_IDENTITY_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_709_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_709_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_601_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_601_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_2020_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_2020_BIT_VALVE";
-        default:
-            return "Unhandled VkVideoEncodeRgbModelConversionFlagBitsVALVE";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeRgbModelConversionFlagsVALVE(VkVideoEncodeRgbModelConversionFlagsVALVE input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeRgbModelConversionFlagBitsVALVE(static_cast<VkVideoEncodeRgbModelConversionFlagBitsVALVE>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeRgbModelConversionFlagsVALVE(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeRgbRangeCompressionFlagBitsVALVE(VkVideoEncodeRgbRangeCompressionFlagBitsVALVE input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FULL_RANGE_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FULL_RANGE_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_NARROW_RANGE_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_NARROW_RANGE_BIT_VALVE";
-        default:
-            return "Unhandled VkVideoEncodeRgbRangeCompressionFlagBitsVALVE";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeRgbRangeCompressionFlagsVALVE(VkVideoEncodeRgbRangeCompressionFlagsVALVE input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeRgbRangeCompressionFlagBitsVALVE(static_cast<VkVideoEncodeRgbRangeCompressionFlagBitsVALVE>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeRgbRangeCompressionFlagsVALVE(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkVideoEncodeRgbChromaOffsetFlagBitsVALVE(VkVideoEncodeRgbChromaOffsetFlagBitsVALVE input_value) {
-    switch (input_value) {
-        case VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_COSITED_EVEN_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_COSITED_EVEN_BIT_VALVE";
-        case VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_MIDPOINT_BIT_VALVE:
-            return "VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_MIDPOINT_BIT_VALVE";
-        default:
-            return "Unhandled VkVideoEncodeRgbChromaOffsetFlagBitsVALVE";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkVideoEncodeRgbChromaOffsetFlagsVALVE(VkVideoEncodeRgbChromaOffsetFlagsVALVE input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkVideoEncodeRgbChromaOffsetFlagBitsVALVE(static_cast<VkVideoEncodeRgbChromaOffsetFlagBitsVALVE>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkVideoEncodeRgbChromaOffsetFlagsVALVE(0)");
-    return ret;
-}
-#endif // __cplusplus
 static inline const char* string_VkBuildMicromapFlagBitsEXT(VkBuildMicromapFlagBitsEXT input_value) {
     switch (input_value) {
         case VK_BUILD_MICROMAP_PREFER_FAST_TRACE_BIT_EXT:
@@ -10705,93 +9137,24 @@ static inline std::string string_VkPhysicalDeviceSchedulingControlsFlagsARM(VkPh
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkMemoryDecompressionMethodFlagBitsEXT(uint64_t input_value) {
-    if (input_value == VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_EXT) return "VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_EXT";
-    return "Unhandled VkMemoryDecompressionMethodFlagBitsEXT";
+static inline const char* string_VkMemoryDecompressionMethodFlagBitsNV(uint64_t input_value) {
+    if (input_value == VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_NV) return "VK_MEMORY_DECOMPRESSION_METHOD_GDEFLATE_1_0_BIT_NV";
+    return "Unhandled VkMemoryDecompressionMethodFlagBitsNV";
 }
 
 #ifdef __cplusplus
-static inline std::string string_VkMemoryDecompressionMethodFlagsEXT(VkMemoryDecompressionMethodFlagsEXT input_value) {
+static inline std::string string_VkMemoryDecompressionMethodFlagsNV(VkMemoryDecompressionMethodFlagsNV input_value) {
     std::string ret;
     int index = 0;
     while(input_value) {
         if (input_value & 1) {
             if( !ret.empty()) ret.append("|");
-            ret.append(string_VkMemoryDecompressionMethodFlagBitsEXT(static_cast<uint64_t>(1ULL << index)));
+            ret.append(string_VkMemoryDecompressionMethodFlagBitsNV(static_cast<uint64_t>(1ULL << index)));
         }
         ++index;
         input_value >>= 1;
     }
-    if (ret.empty()) ret.append("VkMemoryDecompressionMethodFlagsEXT(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkTensorCreateFlagBitsARM(uint64_t input_value) {
-    if (input_value == VK_TENSOR_CREATE_MUTABLE_FORMAT_BIT_ARM) return "VK_TENSOR_CREATE_MUTABLE_FORMAT_BIT_ARM";
-    if (input_value == VK_TENSOR_CREATE_PROTECTED_BIT_ARM) return "VK_TENSOR_CREATE_PROTECTED_BIT_ARM";
-    if (input_value == VK_TENSOR_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM) return "VK_TENSOR_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM";
-    return "Unhandled VkTensorCreateFlagBitsARM";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkTensorCreateFlagsARM(VkTensorCreateFlagsARM input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkTensorCreateFlagBitsARM(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkTensorCreateFlagsARM(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkTensorViewCreateFlagBitsARM(uint64_t input_value) {
-    if (input_value == VK_TENSOR_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM) return "VK_TENSOR_VIEW_CREATE_DESCRIPTOR_BUFFER_CAPTURE_REPLAY_BIT_ARM";
-    return "Unhandled VkTensorViewCreateFlagBitsARM";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkTensorViewCreateFlagsARM(VkTensorViewCreateFlagsARM input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkTensorViewCreateFlagBitsARM(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkTensorViewCreateFlagsARM(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkTensorUsageFlagBitsARM(uint64_t input_value) {
-    if (input_value == VK_TENSOR_USAGE_SHADER_BIT_ARM) return "VK_TENSOR_USAGE_SHADER_BIT_ARM";
-    if (input_value == VK_TENSOR_USAGE_TRANSFER_SRC_BIT_ARM) return "VK_TENSOR_USAGE_TRANSFER_SRC_BIT_ARM";
-    if (input_value == VK_TENSOR_USAGE_TRANSFER_DST_BIT_ARM) return "VK_TENSOR_USAGE_TRANSFER_DST_BIT_ARM";
-    if (input_value == VK_TENSOR_USAGE_IMAGE_ALIASING_BIT_ARM) return "VK_TENSOR_USAGE_IMAGE_ALIASING_BIT_ARM";
-    if (input_value == VK_TENSOR_USAGE_DATA_GRAPH_BIT_ARM) return "VK_TENSOR_USAGE_DATA_GRAPH_BIT_ARM";
-    return "Unhandled VkTensorUsageFlagBitsARM";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkTensorUsageFlagsARM(VkTensorUsageFlagsARM input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkTensorUsageFlagBitsARM(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkTensorUsageFlagsARM(0)");
+    if (ret.empty()) ret.append("VkMemoryDecompressionMethodFlagsNV(0)");
     return ret;
 }
 #endif // __cplusplus
@@ -10937,10 +9300,6 @@ static inline const char* string_VkShaderCreateFlagBitsEXT(VkShaderCreateFlagBit
             return "VK_SHADER_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_EXT";
         case VK_SHADER_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT:
             return "VK_SHADER_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT";
-        case VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT:
-            return "VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT";
-        case VK_SHADER_CREATE_64_BIT_INDEXING_BIT_EXT:
-            return "VK_SHADER_CREATE_64_BIT_INDEXING_BIT_EXT";
         default:
             return "Unhandled VkShaderCreateFlagBitsEXT";
     }
@@ -10962,261 +9321,6 @@ static inline std::string string_VkShaderCreateFlagsEXT(VkShaderCreateFlagsEXT i
     return ret;
 }
 #endif // __cplusplus
-static inline const char* string_VkDataGraphPipelineSessionCreateFlagBitsARM(uint64_t input_value) {
-    if (input_value == VK_DATA_GRAPH_PIPELINE_SESSION_CREATE_PROTECTED_BIT_ARM) return "VK_DATA_GRAPH_PIPELINE_SESSION_CREATE_PROTECTED_BIT_ARM";
-    return "Unhandled VkDataGraphPipelineSessionCreateFlagBitsARM";
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkDataGraphPipelineSessionCreateFlagsARM(VkDataGraphPipelineSessionCreateFlagsARM input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkDataGraphPipelineSessionCreateFlagBitsARM(static_cast<uint64_t>(1ULL << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkDataGraphPipelineSessionCreateFlagsARM(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkClusterAccelerationStructureAddressResolutionFlagBitsNV(VkClusterAccelerationStructureAddressResolutionFlagBitsNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_NONE_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_NONE_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_IMPLICIT_DATA_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_IMPLICIT_DATA_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SCRATCH_DATA_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SCRATCH_DATA_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_ADDRESS_ARRAY_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_ADDRESS_ARRAY_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_SIZES_ARRAY_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_DST_SIZES_ARRAY_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_ARRAY_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_ARRAY_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_COUNT_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_ADDRESS_RESOLUTION_INDIRECTED_SRC_INFOS_COUNT_BIT_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureAddressResolutionFlagBitsNV";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkClusterAccelerationStructureAddressResolutionFlagsNV(VkClusterAccelerationStructureAddressResolutionFlagsNV input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkClusterAccelerationStructureAddressResolutionFlagBitsNV(static_cast<VkClusterAccelerationStructureAddressResolutionFlagBitsNV>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkClusterAccelerationStructureAddressResolutionFlagsNV(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkClusterAccelerationStructureClusterFlagBitsNV(VkClusterAccelerationStructureClusterFlagBitsNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_CLUSTER_ALLOW_DISABLE_OPACITY_MICROMAPS_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_CLUSTER_ALLOW_DISABLE_OPACITY_MICROMAPS_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureClusterFlagBitsNV";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkClusterAccelerationStructureClusterFlagsNV(VkClusterAccelerationStructureClusterFlagsNV input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkClusterAccelerationStructureClusterFlagBitsNV(static_cast<VkClusterAccelerationStructureClusterFlagBitsNV>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkClusterAccelerationStructureClusterFlagsNV(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkClusterAccelerationStructureGeometryFlagBitsNV(VkClusterAccelerationStructureGeometryFlagBitsNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_CULL_DISABLE_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_CULL_DISABLE_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANYHIT_INVOCATION_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_NO_DUPLICATE_ANYHIT_INVOCATION_BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_GEOMETRY_OPAQUE_BIT_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureGeometryFlagBitsNV";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkClusterAccelerationStructureGeometryFlagsNV(VkClusterAccelerationStructureGeometryFlagsNV input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkClusterAccelerationStructureGeometryFlagBitsNV(static_cast<VkClusterAccelerationStructureGeometryFlagBitsNV>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkClusterAccelerationStructureGeometryFlagsNV(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkClusterAccelerationStructureIndexFormatFlagBitsNV(VkClusterAccelerationStructureIndexFormatFlagBitsNV input_value) {
-    switch (input_value) {
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_8BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_8BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_16BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_16BIT_NV";
-        case VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_32BIT_NV:
-            return "VK_CLUSTER_ACCELERATION_STRUCTURE_INDEX_FORMAT_32BIT_NV";
-        default:
-            return "Unhandled VkClusterAccelerationStructureIndexFormatFlagBitsNV";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkClusterAccelerationStructureIndexFormatFlagsNV(VkClusterAccelerationStructureIndexFormatFlagsNV input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkClusterAccelerationStructureIndexFormatFlagBitsNV(static_cast<VkClusterAccelerationStructureIndexFormatFlagBitsNV>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkClusterAccelerationStructureIndexFormatFlagsNV(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkPartitionedAccelerationStructureInstanceFlagBitsNV(VkPartitionedAccelerationStructureInstanceFlagBitsNV input_value) {
-    switch (input_value) {
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FACING_CULL_DISABLE_BIT_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FACING_CULL_DISABLE_BIT_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FLIP_FACING_BIT_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_TRIANGLE_FLIP_FACING_BIT_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_OPAQUE_BIT_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_OPAQUE_BIT_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_NO_OPAQUE_BIT_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_FORCE_NO_OPAQUE_BIT_NV";
-        case VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_ENABLE_EXPLICIT_BOUNDING_BOX_NV:
-            return "VK_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCE_FLAG_ENABLE_EXPLICIT_BOUNDING_BOX_NV";
-        default:
-            return "Unhandled VkPartitionedAccelerationStructureInstanceFlagBitsNV";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkPartitionedAccelerationStructureInstanceFlagsNV(VkPartitionedAccelerationStructureInstanceFlagsNV input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkPartitionedAccelerationStructureInstanceFlagBitsNV(static_cast<VkPartitionedAccelerationStructureInstanceFlagBitsNV>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkPartitionedAccelerationStructureInstanceFlagsNV(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkIndirectCommandsInputModeFlagBitsEXT(VkIndirectCommandsInputModeFlagBitsEXT input_value) {
-    switch (input_value) {
-        case VK_INDIRECT_COMMANDS_INPUT_MODE_VULKAN_INDEX_BUFFER_EXT:
-            return "VK_INDIRECT_COMMANDS_INPUT_MODE_VULKAN_INDEX_BUFFER_EXT";
-        case VK_INDIRECT_COMMANDS_INPUT_MODE_DXGI_INDEX_BUFFER_EXT:
-            return "VK_INDIRECT_COMMANDS_INPUT_MODE_DXGI_INDEX_BUFFER_EXT";
-        default:
-            return "Unhandled VkIndirectCommandsInputModeFlagBitsEXT";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkIndirectCommandsInputModeFlagsEXT(VkIndirectCommandsInputModeFlagsEXT input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkIndirectCommandsInputModeFlagBitsEXT(static_cast<VkIndirectCommandsInputModeFlagBitsEXT>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkIndirectCommandsInputModeFlagsEXT(0)");
-    return ret;
-}
-#endif // __cplusplus
-static inline const char* string_VkIndirectCommandsLayoutUsageFlagBitsEXT(VkIndirectCommandsLayoutUsageFlagBitsEXT input_value) {
-    switch (input_value) {
-        case VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EXPLICIT_PREPROCESS_BIT_EXT:
-            return "VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EXPLICIT_PREPROCESS_BIT_EXT";
-        case VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_EXT:
-            return "VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_EXT";
-        default:
-            return "Unhandled VkIndirectCommandsLayoutUsageFlagBitsEXT";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkIndirectCommandsLayoutUsageFlagsEXT(VkIndirectCommandsLayoutUsageFlagsEXT input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkIndirectCommandsLayoutUsageFlagBitsEXT(static_cast<VkIndirectCommandsLayoutUsageFlagBitsEXT>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkIndirectCommandsLayoutUsageFlagsEXT(0)");
-    return ret;
-}
-#endif // __cplusplus
-#ifdef VK_USE_PLATFORM_OHOS
-static inline const char* string_VkSwapchainImageUsageFlagBitsOHOS(VkSwapchainImageUsageFlagBitsOHOS input_value) {
-    switch (input_value) {
-        case VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_OHOS:
-            return "VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_OHOS";
-        default:
-            return "Unhandled VkSwapchainImageUsageFlagBitsOHOS";
-    }
-}
-
-#ifdef __cplusplus
-static inline std::string string_VkSwapchainImageUsageFlagsOHOS(VkSwapchainImageUsageFlagsOHOS input_value) {
-    std::string ret;
-    int index = 0;
-    while(input_value) {
-        if (input_value & 1) {
-            if( !ret.empty()) ret.append("|");
-            ret.append(string_VkSwapchainImageUsageFlagBitsOHOS(static_cast<VkSwapchainImageUsageFlagBitsOHOS>(1U << index)));
-        }
-        ++index;
-        input_value >>= 1;
-    }
-    if (ret.empty()) ret.append("VkSwapchainImageUsageFlagsOHOS(0)");
-    return ret;
-}
-#endif // __cplusplus
-#endif  // VK_USE_PLATFORM_OHOS
 static inline const char* string_VkAccelerationStructureCreateFlagBitsKHR(VkAccelerationStructureCreateFlagBitsKHR input_value) {
     switch (input_value) {
         case VK_ACCELERATION_STRUCTURE_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR:
@@ -11247,2355 +9351,3 @@ static inline std::string string_VkAccelerationStructureCreateFlagsKHR(VkAcceler
 }
 #endif // __cplusplus
 // clang-format on
-
-// Same thing as string_VkStructureType, but prints out the API name
-static inline const char* string_VkStructureName(VkStructureType input_value) {
-    switch (input_value) {
-        case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER:
-            return "VkBufferMemoryBarrier";
-        case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER:
-            return "VkImageMemoryBarrier";
-        case VK_STRUCTURE_TYPE_MEMORY_BARRIER:
-            return "VkMemoryBarrier";
-        case VK_STRUCTURE_TYPE_APPLICATION_INFO:
-            return "VkApplicationInfo";
-        case VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO:
-            return "VkInstanceCreateInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO:
-            return "VkDeviceQueueCreateInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO:
-            return "VkDeviceCreateInfo";
-        case VK_STRUCTURE_TYPE_SUBMIT_INFO:
-            return "VkSubmitInfo";
-        case VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE:
-            return "VkMappedMemoryRange";
-        case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO:
-            return "VkMemoryAllocateInfo";
-        case VK_STRUCTURE_TYPE_BIND_SPARSE_INFO:
-            return "VkBindSparseInfo";
-        case VK_STRUCTURE_TYPE_FENCE_CREATE_INFO:
-            return "VkFenceCreateInfo";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO:
-            return "VkSemaphoreCreateInfo";
-        case VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO:
-            return "VkQueryPoolCreateInfo";
-        case VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO:
-            return "VkBufferCreateInfo";
-        case VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO:
-            return "VkImageCreateInfo";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO:
-            return "VkImageViewCreateInfo";
-        case VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO:
-            return "VkCommandPoolCreateInfo";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO:
-            return "VkCommandBufferAllocateInfo";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO:
-            return "VkCommandBufferInheritanceInfo";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO:
-            return "VkCommandBufferBeginInfo";
-        case VK_STRUCTURE_TYPE_EVENT_CREATE_INFO:
-            return "VkEventCreateInfo";
-        case VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO:
-            return "VkBufferViewCreateInfo";
-        case VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO:
-            return "VkShaderModuleCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO:
-            return "VkPipelineCacheCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:
-            return "VkPipelineShaderStageCreateInfo";
-        case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO:
-            return "VkComputePipelineCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO:
-            return "VkPipelineLayoutCreateInfo";
-        case VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO:
-            return "VkSamplerCreateInfo";
-        case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET:
-            return "VkCopyDescriptorSet";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO:
-            return "VkDescriptorPoolCreateInfo";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO:
-            return "VkDescriptorSetAllocateInfo";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO:
-            return "VkDescriptorSetLayoutCreateInfo";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET:
-            return "VkWriteDescriptorSet";
-        case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO:
-            return "VkPipelineVertexInputStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO:
-            return "VkPipelineInputAssemblyStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO:
-            return "VkPipelineTessellationStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO:
-            return "VkPipelineViewportStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO:
-            return "VkPipelineRasterizationStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO:
-            return "VkPipelineMultisampleStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO:
-            return "VkPipelineDepthStencilStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO:
-            return "VkPipelineColorBlendStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO:
-            return "VkPipelineDynamicStateCreateInfo";
-        case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO:
-            return "VkGraphicsPipelineCreateInfo";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO:
-            return "VkFramebufferCreateInfo";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO:
-            return "VkRenderPassCreateInfo";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO:
-            return "VkRenderPassBeginInfo";
-        case VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO:
-            return "VkBindBufferMemoryInfo";
-        case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO:
-            return "VkBindImageMemoryInfo";
-        case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS:
-            return "VkMemoryDedicatedRequirements";
-        case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO:
-            return "VkMemoryDedicatedAllocateInfo";
-        case VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO:
-            return "VkMemoryAllocateFlagsInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO:
-            return "VkDeviceGroupCommandBufferBeginInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO:
-            return "VkDeviceGroupSubmitInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO:
-            return "VkDeviceGroupBindSparseInfo";
-        case VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO:
-            return "VkBindBufferMemoryDeviceGroupInfo";
-        case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO:
-            return "VkBindImageMemoryDeviceGroupInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES:
-            return "VkPhysicalDeviceGroupProperties";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO:
-            return "VkDeviceGroupDeviceCreateInfo";
-        case VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2:
-            return "VkBufferMemoryRequirementsInfo2";
-        case VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2:
-            return "VkImageMemoryRequirementsInfo2";
-        case VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2:
-            return "VkImageSparseMemoryRequirementsInfo2";
-        case VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2:
-            return "VkMemoryRequirements2";
-        case VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2:
-            return "VkSparseImageMemoryRequirements2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2:
-            return "VkPhysicalDeviceFeatures2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2:
-            return "VkPhysicalDeviceProperties2";
-        case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2:
-            return "VkFormatProperties2";
-        case VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2:
-            return "VkImageFormatProperties2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2:
-            return "VkPhysicalDeviceImageFormatInfo2";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2:
-            return "VkQueueFamilyProperties2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2:
-            return "VkPhysicalDeviceMemoryProperties2";
-        case VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2:
-            return "VkSparseImageFormatProperties2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2:
-            return "VkPhysicalDeviceSparseImageFormatInfo2";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO:
-            return "VkImageViewUsageCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES:
-            return "VkPhysicalDeviceProtectedMemoryFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES:
-            return "VkPhysicalDeviceProtectedMemoryProperties";
-        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2:
-            return "VkDeviceQueueInfo2";
-        case VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO:
-            return "VkProtectedSubmitInfo";
-        case VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO:
-            return "VkBindImagePlaneMemoryInfo";
-        case VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO:
-            return "VkImagePlaneMemoryRequirementsInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO:
-            return "VkPhysicalDeviceExternalImageFormatInfo";
-        case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES:
-            return "VkExternalImageFormatProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO:
-            return "VkPhysicalDeviceExternalBufferInfo";
-        case VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES:
-            return "VkExternalBufferProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES:
-            return "VkPhysicalDeviceIDProperties";
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO:
-            return "VkExternalMemoryImageCreateInfo";
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO:
-            return "VkExternalMemoryBufferCreateInfo";
-        case VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO:
-            return "VkExportMemoryAllocateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO:
-            return "VkPhysicalDeviceExternalFenceInfo";
-        case VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES:
-            return "VkExternalFenceProperties";
-        case VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO:
-            return "VkExportFenceCreateInfo";
-        case VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO:
-            return "VkExportSemaphoreCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO:
-            return "VkPhysicalDeviceExternalSemaphoreInfo";
-        case VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES:
-            return "VkExternalSemaphoreProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES:
-            return "VkPhysicalDeviceSubgroupProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES:
-            return "VkPhysicalDevice16BitStorageFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES:
-            return "VkPhysicalDeviceVariablePointersFeatures";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO:
-            return "VkDescriptorUpdateTemplateCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES:
-            return "VkPhysicalDeviceMaintenance3Properties";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT:
-            return "VkDescriptorSetLayoutSupport";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO:
-            return "VkSamplerYcbcrConversionCreateInfo";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO:
-            return "VkSamplerYcbcrConversionInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES:
-            return "VkPhysicalDeviceSamplerYcbcrConversionFeatures";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES:
-            return "VkSamplerYcbcrConversionImageFormatProperties";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO:
-            return "VkDeviceGroupRenderPassBeginInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES:
-            return "VkPhysicalDevicePointClippingProperties";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO:
-            return "VkRenderPassInputAttachmentAspectCreateInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO:
-            return "VkPipelineTessellationDomainOriginStateCreateInfo";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO:
-            return "VkRenderPassMultiviewCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES:
-            return "VkPhysicalDeviceMultiviewFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES:
-            return "VkPhysicalDeviceMultiviewProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES:
-            return "VkPhysicalDeviceShaderDrawParametersFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES:
-            return "VkPhysicalDeviceVulkan11Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES:
-            return "VkPhysicalDeviceVulkan11Properties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES:
-            return "VkPhysicalDeviceVulkan12Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES:
-            return "VkPhysicalDeviceVulkan12Properties";
-        case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO:
-            return "VkImageFormatListCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES:
-            return "VkPhysicalDeviceDriverProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES:
-            return "VkPhysicalDeviceVulkanMemoryModelFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES:
-            return "VkPhysicalDeviceHostQueryResetFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES:
-            return "VkPhysicalDeviceTimelineSemaphoreFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES:
-            return "VkPhysicalDeviceTimelineSemaphoreProperties";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO:
-            return "VkSemaphoreTypeCreateInfo";
-        case VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO:
-            return "VkTimelineSemaphoreSubmitInfo";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO:
-            return "VkSemaphoreWaitInfo";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO:
-            return "VkSemaphoreSignalInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES:
-            return "VkPhysicalDeviceBufferDeviceAddressFeatures";
-        case VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO:
-            return "VkBufferDeviceAddressInfo";
-        case VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO:
-            return "VkBufferOpaqueCaptureAddressCreateInfo";
-        case VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO:
-            return "VkMemoryOpaqueCaptureAddressAllocateInfo";
-        case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO:
-            return "VkDeviceMemoryOpaqueCaptureAddressInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES:
-            return "VkPhysicalDevice8BitStorageFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES:
-            return "VkPhysicalDeviceShaderAtomicInt64Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES:
-            return "VkPhysicalDeviceShaderFloat16Int8Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES:
-            return "VkPhysicalDeviceFloatControlsProperties";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO:
-            return "VkDescriptorSetLayoutBindingFlagsCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES:
-            return "VkPhysicalDeviceDescriptorIndexingFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES:
-            return "VkPhysicalDeviceDescriptorIndexingProperties";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO:
-            return "VkDescriptorSetVariableDescriptorCountAllocateInfo";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT:
-            return "VkDescriptorSetVariableDescriptorCountLayoutSupport";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES:
-            return "VkPhysicalDeviceScalarBlockLayoutFeatures";
-        case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO:
-            return "VkSamplerReductionModeCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES:
-            return "VkPhysicalDeviceSamplerFilterMinmaxProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES:
-            return "VkPhysicalDeviceUniformBufferStandardLayoutFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES:
-            return "VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2:
-            return "VkAttachmentDescription2";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2:
-            return "VkAttachmentReference2";
-        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2:
-            return "VkSubpassDescription2";
-        case VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2:
-            return "VkSubpassDependency2";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2:
-            return "VkRenderPassCreateInfo2";
-        case VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO:
-            return "VkSubpassBeginInfo";
-        case VK_STRUCTURE_TYPE_SUBPASS_END_INFO:
-            return "VkSubpassEndInfo";
-        case VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE:
-            return "VkSubpassDescriptionDepthStencilResolve";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
-            return "VkPhysicalDeviceDepthStencilResolveProperties";
-        case VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO:
-            return "VkImageStencilUsageCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES:
-            return "VkPhysicalDeviceImagelessFramebufferFeatures";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO:
-            return "VkFramebufferAttachmentImageInfo";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO:
-            return "VkFramebufferAttachmentsCreateInfo";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO:
-            return "VkRenderPassAttachmentBeginInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES:
-            return "VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT:
-            return "VkAttachmentReferenceStencilLayout";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT:
-            return "VkAttachmentDescriptionStencilLayout";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES:
-            return "VkPhysicalDeviceVulkan13Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES:
-            return "VkPhysicalDeviceVulkan13Properties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES:
-            return "VkPhysicalDeviceToolProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES:
-            return "VkPhysicalDevicePrivateDataFeatures";
-        case VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO:
-            return "VkDevicePrivateDataCreateInfo";
-        case VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO:
-            return "VkPrivateDataSlotCreateInfo";
-        case VK_STRUCTURE_TYPE_MEMORY_BARRIER_2:
-            return "VkMemoryBarrier2";
-        case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2:
-            return "VkBufferMemoryBarrier2";
-        case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2:
-            return "VkImageMemoryBarrier2";
-        case VK_STRUCTURE_TYPE_DEPENDENCY_INFO:
-            return "VkDependencyInfo";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO:
-            return "VkSemaphoreSubmitInfo";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO:
-            return "VkCommandBufferSubmitInfo";
-        case VK_STRUCTURE_TYPE_SUBMIT_INFO_2:
-            return "VkSubmitInfo2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES:
-            return "VkPhysicalDeviceSynchronization2Features";
-        case VK_STRUCTURE_TYPE_BUFFER_COPY_2:
-            return "VkBufferCopy2";
-        case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2:
-            return "VkCopyBufferInfo2";
-        case VK_STRUCTURE_TYPE_IMAGE_COPY_2:
-            return "VkImageCopy2";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2:
-            return "VkCopyImageInfo2";
-        case VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2:
-            return "VkBufferImageCopy2";
-        case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2:
-            return "VkCopyBufferToImageInfo2";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2:
-            return "VkCopyImageToBufferInfo2";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES:
-            return "VkPhysicalDeviceTextureCompressionASTCHDRFeatures";
-        case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3:
-            return "VkFormatProperties3";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES:
-            return "VkPhysicalDeviceMaintenance4Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES:
-            return "VkPhysicalDeviceMaintenance4Properties";
-        case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS:
-            return "VkDeviceBufferMemoryRequirements";
-        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS:
-            return "VkDeviceImageMemoryRequirements";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO:
-            return "VkPipelineCreationFeedbackCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES:
-            return "VkPhysicalDeviceShaderTerminateInvocationFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES:
-            return "VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES:
-            return "VkPhysicalDevicePipelineCreationCacheControlFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES:
-            return "VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES:
-            return "VkPhysicalDeviceImageRobustnessFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES:
-            return "VkPhysicalDeviceSubgroupSizeControlFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES:
-            return "VkPhysicalDeviceSubgroupSizeControlProperties";
-        case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO:
-            return "VkPipelineShaderStageRequiredSubgroupSizeCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES:
-            return "VkPhysicalDeviceInlineUniformBlockFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES:
-            return "VkPhysicalDeviceInlineUniformBlockProperties";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK:
-            return "VkWriteDescriptorSetInlineUniformBlock";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO:
-            return "VkDescriptorPoolInlineUniformBlockCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES:
-            return "VkPhysicalDeviceShaderIntegerDotProductFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES:
-            return "VkPhysicalDeviceShaderIntegerDotProductProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES:
-            return "VkPhysicalDeviceTexelBufferAlignmentProperties";
-        case VK_STRUCTURE_TYPE_IMAGE_BLIT_2:
-            return "VkImageBlit2";
-        case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2:
-            return "VkBlitImageInfo2";
-        case VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2:
-            return "VkImageResolve2";
-        case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2:
-            return "VkResolveImageInfo2";
-        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO:
-            return "VkRenderingAttachmentInfo";
-        case VK_STRUCTURE_TYPE_RENDERING_INFO:
-            return "VkRenderingInfo";
-        case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO:
-            return "VkPipelineRenderingCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES:
-            return "VkPhysicalDeviceDynamicRenderingFeatures";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO:
-            return "VkCommandBufferInheritanceRenderingInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES:
-            return "VkPhysicalDeviceVulkan14Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES:
-            return "VkPhysicalDeviceVulkan14Properties";
-        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO:
-            return "VkDeviceQueueGlobalPriorityCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES:
-            return "VkPhysicalDeviceGlobalPriorityQueryFeatures";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES:
-            return "VkQueueFamilyGlobalPriorityProperties";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES:
-            return "VkPhysicalDeviceIndexTypeUint8Features";
-        case VK_STRUCTURE_TYPE_MEMORY_MAP_INFO:
-            return "VkMemoryMapInfo";
-        case VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO:
-            return "VkMemoryUnmapInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES:
-            return "VkPhysicalDeviceMaintenance5Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES:
-            return "VkPhysicalDeviceMaintenance5Properties";
-        case VK_STRUCTURE_TYPE_IMAGE_SUBRESOURCE_2:
-            return "VkImageSubresource2";
-        case VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO:
-            return "VkDeviceImageSubresourceInfo";
-        case VK_STRUCTURE_TYPE_SUBRESOURCE_LAYOUT_2:
-            return "VkSubresourceLayout2";
-        case VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO:
-            return "VkBufferUsageFlags2CreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_FEATURES:
-            return "VkPhysicalDeviceMaintenance6Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_6_PROPERTIES:
-            return "VkPhysicalDeviceMaintenance6Properties";
-        case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS:
-            return "VkBindMemoryStatus";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES:
-            return "VkPhysicalDeviceHostImageCopyFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_PROPERTIES:
-            return "VkPhysicalDeviceHostImageCopyProperties";
-        case VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY:
-            return "VkMemoryToImageCopy";
-        case VK_STRUCTURE_TYPE_IMAGE_TO_MEMORY_COPY:
-            return "VkImageToMemoryCopy";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INFO:
-            return "VkCopyMemoryToImageInfo";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_MEMORY_INFO:
-            return "VkCopyImageToMemoryInfo";
-        case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_IMAGE_INFO:
-            return "VkCopyImageToImageInfo";
-        case VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO:
-            return "VkHostImageLayoutTransitionInfo";
-        case VK_STRUCTURE_TYPE_SUBRESOURCE_HOST_MEMCPY_SIZE:
-            return "VkSubresourceHostMemcpySize";
-        case VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY:
-            return "VkHostImageCopyDevicePerformanceQuery";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES:
-            return "VkPhysicalDeviceShaderSubgroupRotateFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES:
-            return "VkPhysicalDeviceShaderFloatControls2Features";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES:
-            return "VkPhysicalDeviceShaderExpectAssumeFeatures";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO:
-            return "VkPipelineCreateFlags2CreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES:
-            return "VkPhysicalDevicePushDescriptorProperties";
-        case VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO:
-            return "VkBindDescriptorSetsInfo";
-        case VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO:
-            return "VkPushConstantsInfo";
-        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_INFO:
-            return "VkPushDescriptorSetInfo";
-        case VK_STRUCTURE_TYPE_PUSH_DESCRIPTOR_SET_WITH_TEMPLATE_INFO:
-            return "VkPushDescriptorSetWithTemplateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES:
-            return "VkPhysicalDevicePipelineProtectedAccessFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_FEATURES:
-            return "VkPhysicalDevicePipelineRobustnessFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_ROBUSTNESS_PROPERTIES:
-            return "VkPhysicalDevicePipelineRobustnessProperties";
-        case VK_STRUCTURE_TYPE_PIPELINE_ROBUSTNESS_CREATE_INFO:
-            return "VkPipelineRobustnessCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES:
-            return "VkPhysicalDeviceLineRasterizationFeatures";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES:
-            return "VkPhysicalDeviceLineRasterizationProperties";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO:
-            return "VkPipelineRasterizationLineStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES:
-            return "VkPhysicalDeviceVertexAttributeDivisorProperties";
-        case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO:
-            return "VkPipelineVertexInputDivisorStateCreateInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES:
-            return "VkPhysicalDeviceVertexAttributeDivisorFeatures";
-        case VK_STRUCTURE_TYPE_RENDERING_AREA_INFO:
-            return "VkRenderingAreaInfo";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES:
-            return "VkPhysicalDeviceDynamicRenderingLocalReadFeatures";
-        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO:
-            return "VkRenderingAttachmentLocationInfo";
-        case VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO:
-            return "VkRenderingInputAttachmentIndexInfo";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR:
-            return "VkSwapchainCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR:
-            return "VkPresentInfoKHR";
-        case VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR:
-            return "VkImageSwapchainCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR:
-            return "VkBindImageMemorySwapchainInfoKHR";
-        case VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR:
-            return "VkAcquireNextImageInfoKHR";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR:
-            return "VkDeviceGroupPresentCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR:
-            return "VkDeviceGroupPresentInfoKHR";
-        case VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR:
-            return "VkDeviceGroupSwapchainCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR:
-            return "VkDisplayModeCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR:
-            return "VkDisplaySurfaceCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR:
-            return "VkDisplayPresentInfoKHR";
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-        case VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR:
-            return "VkXlibSurfaceCreateInfoKHR";
-#endif  // VK_USE_PLATFORM_XLIB_KHR
-#ifdef VK_USE_PLATFORM_XCB_KHR
-        case VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR:
-            return "VkXcbSurfaceCreateInfoKHR";
-#endif  // VK_USE_PLATFORM_XCB_KHR
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-        case VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR:
-            return "VkWaylandSurfaceCreateInfoKHR";
-#endif  // VK_USE_PLATFORM_WAYLAND_KHR
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-        case VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR:
-            return "VkAndroidSurfaceCreateInfoKHR";
-#endif  // VK_USE_PLATFORM_ANDROID_KHR
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR:
-            return "VkWin32SurfaceCreateInfoKHR";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR:
-            return "VkQueueFamilyQueryResultStatusPropertiesKHR";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR:
-            return "VkQueueFamilyVideoPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR:
-            return "VkVideoProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR:
-            return "VkVideoProfileListInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_CAPABILITIES_KHR:
-            return "VkVideoCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR:
-            return "VkPhysicalDeviceVideoFormatInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR:
-            return "VkVideoFormatPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR:
-            return "VkVideoPictureResourceInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR:
-            return "VkVideoReferenceSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_SESSION_MEMORY_REQUIREMENTS_KHR:
-            return "VkVideoSessionMemoryRequirementsKHR";
-        case VK_STRUCTURE_TYPE_BIND_VIDEO_SESSION_MEMORY_INFO_KHR:
-            return "VkBindVideoSessionMemoryInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR:
-            return "VkVideoSessionCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoSessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_UPDATE_INFO_KHR:
-            return "VkVideoSessionParametersUpdateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR:
-            return "VkVideoBeginCodingInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_END_CODING_INFO_KHR:
-            return "VkVideoEndCodingInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR:
-            return "VkVideoCodingControlInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR:
-            return "VkVideoDecodeCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR:
-            return "VkVideoDecodeUsageInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR:
-            return "VkVideoDecodeInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_KHR:
-            return "VkVideoEncodeH264CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUALITY_LEVEL_PROPERTIES_KHR:
-            return "VkVideoEncodeH264QualityLevelPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_KHR:
-            return "VkVideoEncodeH264SessionCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR:
-            return "VkVideoEncodeH264SessionParametersAddInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoEncodeH264SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_GET_INFO_KHR:
-            return "VkVideoEncodeH264SessionParametersGetInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_FEEDBACK_INFO_KHR:
-            return "VkVideoEncodeH264SessionParametersFeedbackInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_INFO_KHR:
-            return "VkVideoEncodeH264NaluSliceInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PICTURE_INFO_KHR:
-            return "VkVideoEncodeH264PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_KHR:
-            return "VkVideoEncodeH264DpbSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_INFO_KHR:
-            return "VkVideoEncodeH264ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_KHR:
-            return "VkVideoEncodeH264RateControlInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_KHR:
-            return "VkVideoEncodeH264RateControlLayerInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_GOP_REMAINING_FRAME_INFO_KHR:
-            return "VkVideoEncodeH264GopRemainingFrameInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_KHR:
-            return "VkVideoEncodeH265CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_CREATE_INFO_KHR:
-            return "VkVideoEncodeH265SessionCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUALITY_LEVEL_PROPERTIES_KHR:
-            return "VkVideoEncodeH265QualityLevelPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR:
-            return "VkVideoEncodeH265SessionParametersAddInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoEncodeH265SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_GET_INFO_KHR:
-            return "VkVideoEncodeH265SessionParametersGetInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_FEEDBACK_INFO_KHR:
-            return "VkVideoEncodeH265SessionParametersFeedbackInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_INFO_KHR:
-            return "VkVideoEncodeH265NaluSliceSegmentInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PICTURE_INFO_KHR:
-            return "VkVideoEncodeH265PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_KHR:
-            return "VkVideoEncodeH265DpbSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_INFO_KHR:
-            return "VkVideoEncodeH265ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_KHR:
-            return "VkVideoEncodeH265RateControlInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_KHR:
-            return "VkVideoEncodeH265RateControlLayerInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_GOP_REMAINING_FRAME_INFO_KHR:
-            return "VkVideoEncodeH265GopRemainingFrameInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR:
-            return "VkVideoDecodeH264ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR:
-            return "VkVideoDecodeH264CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR:
-            return "VkVideoDecodeH264SessionParametersAddInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoDecodeH264SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR:
-            return "VkVideoDecodeH264PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR:
-            return "VkVideoDecodeH264DpbSlotInfoKHR";
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR:
-            return "VkImportMemoryWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR:
-            return "VkExportMemoryWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHR:
-            return "VkMemoryWin32HandlePropertiesKHR";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR:
-            return "VkMemoryGetWin32HandleInfoKHR";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR:
-            return "VkImportMemoryFdInfoKHR";
-        case VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR:
-            return "VkMemoryFdPropertiesKHR";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR:
-            return "VkMemoryGetFdInfoKHR";
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR:
-            return "VkWin32KeyedMutexAcquireReleaseInfoKHR";
-        case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR:
-            return "VkImportSemaphoreWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR:
-            return "VkExportSemaphoreWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHR:
-            return "VkD3D12FenceSubmitInfoKHR";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR:
-            return "VkSemaphoreGetWin32HandleInfoKHR";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR:
-            return "VkImportSemaphoreFdInfoKHR";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR:
-            return "VkSemaphoreGetFdInfoKHR";
-        case VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR:
-            return "VkPresentRegionsKHR";
-        case VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR:
-            return "VkSharedPresentSurfaceCapabilitiesKHR";
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR:
-            return "VkImportFenceWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR:
-            return "VkExportFenceWin32HandleInfoKHR";
-        case VK_STRUCTURE_TYPE_FENCE_GET_WIN32_HANDLE_INFO_KHR:
-            return "VkFenceGetWin32HandleInfoKHR";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR:
-            return "VkImportFenceFdInfoKHR";
-        case VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR:
-            return "VkFenceGetFdInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR:
-            return "VkPhysicalDevicePerformanceQueryFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR:
-            return "VkPhysicalDevicePerformanceQueryPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_KHR:
-            return "VkPerformanceCounterKHR";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_KHR:
-            return "VkPerformanceCounterDescriptionKHR";
-        case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR:
-            return "VkQueryPoolPerformanceCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_ACQUIRE_PROFILING_LOCK_INFO_KHR:
-            return "VkAcquireProfilingLockInfoKHR";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_QUERY_SUBMIT_INFO_KHR:
-            return "VkPerformanceQuerySubmitInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR:
-            return "VkPhysicalDeviceSurfaceInfo2KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR:
-            return "VkSurfaceCapabilities2KHR";
-        case VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR:
-            return "VkSurfaceFormat2KHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR:
-            return "VkDisplayProperties2KHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR:
-            return "VkDisplayPlaneProperties2KHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR:
-            return "VkDisplayModeProperties2KHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR:
-            return "VkDisplayPlaneInfo2KHR";
-        case VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR:
-            return "VkDisplayPlaneCapabilities2KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderBfloat16FeaturesKHR";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR:
-            return "VkPhysicalDevicePortabilitySubsetFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PORTABILITY_SUBSET_PROPERTIES_KHR:
-            return "VkPhysicalDevicePortabilitySubsetPropertiesKHR";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderClockFeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR:
-            return "VkVideoDecodeH265ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR:
-            return "VkVideoDecodeH265CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR:
-            return "VkVideoDecodeH265SessionParametersAddInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoDecodeH265SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR:
-            return "VkVideoDecodeH265PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR:
-            return "VkVideoDecodeH265DpbSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
-            return "VkFragmentShadingRateAttachmentInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR:
-            return "VkPipelineFragmentShadingRateStateCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR:
-            return "VkPhysicalDeviceFragmentShadingRateFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR:
-            return "VkPhysicalDeviceFragmentShadingRatePropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR:
-            return "VkPhysicalDeviceFragmentShadingRateKHR";
-        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
-            return "VkRenderingFragmentShadingRateAttachmentInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderQuadControlFeaturesKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PROTECTED_CAPABILITIES_KHR:
-            return "VkSurfaceProtectedCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR:
-            return "VkPhysicalDevicePresentWaitFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR:
-            return "VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR:
-            return "VkPipelineInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR:
-            return "VkPipelineExecutablePropertiesKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR:
-            return "VkPipelineExecutableInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR:
-            return "VkPipelineExecutableStatisticKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR:
-            return "VkPipelineExecutableInternalRepresentationKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR:
-            return "VkPipelineLibraryCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PRESENT_ID_KHR:
-            return "VkPresentIdKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR:
-            return "VkPhysicalDevicePresentIdFeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR:
-            return "VkVideoEncodeInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_CAPABILITIES_KHR:
-            return "VkVideoEncodeCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR:
-            return "VkQueryPoolVideoEncodeFeedbackCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_USAGE_INFO_KHR:
-            return "VkVideoEncodeUsageInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR:
-            return "VkVideoEncodeRateControlLayerInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR:
-            return "VkVideoEncodeRateControlInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR:
-            return "VkPhysicalDeviceVideoEncodeQualityLevelInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_PROPERTIES_KHR:
-            return "VkVideoEncodeQualityLevelPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUALITY_LEVEL_INFO_KHR:
-            return "VkVideoEncodeQualityLevelInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_GET_INFO_KHR:
-            return "VkVideoEncodeSessionParametersGetInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS_FEEDBACK_INFO_KHR:
-            return "VkVideoEncodeSessionParametersFeedbackInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR:
-            return "VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_PROPERTIES_KHR:
-            return "VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR:
-            return "VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR:
-            return "VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderUntypedPointersFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderMaximalReconvergenceFeaturesKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR:
-            return "VkSurfaceCapabilitiesPresentId2KHR";
-        case VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR:
-            return "VkPresentId2KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR:
-            return "VkPhysicalDevicePresentId2FeaturesKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_WAIT_2_KHR:
-            return "VkSurfaceCapabilitiesPresentWait2KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_2_FEATURES_KHR:
-            return "VkPhysicalDevicePresentWait2FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PRESENT_WAIT_2_INFO_KHR:
-            return "VkPresentWait2InfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR:
-            return "VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR:
-            return "VkPhysicalDevicePipelineBinaryFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR:
-            return "VkPhysicalDevicePipelineBinaryPropertiesKHR";
-        case VK_STRUCTURE_TYPE_DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR:
-            return "VkDevicePipelineBinaryInternalCacheControlKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_KEY_KHR:
-            return "VkPipelineBinaryKeyKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_CREATE_INFO_KHR:
-            return "VkPipelineCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_CREATE_INFO_KHR:
-            return "VkPipelineBinaryCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_INFO_KHR:
-            return "VkPipelineBinaryInfoKHR";
-        case VK_STRUCTURE_TYPE_RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR:
-            return "VkReleaseCapturedPipelineDataInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_DATA_INFO_KHR:
-            return "VkPipelineBinaryDataInfoKHR";
-        case VK_STRUCTURE_TYPE_PIPELINE_BINARY_HANDLES_INFO_KHR:
-            return "VkPipelineBinaryHandlesInfoKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR:
-            return "VkSurfacePresentModeKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR:
-            return "VkSurfacePresentScalingCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR:
-            return "VkSurfacePresentModeCompatibilityKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR:
-            return "VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR:
-            return "VkSwapchainPresentFenceInfoKHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR:
-            return "VkSwapchainPresentModesCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR:
-            return "VkSwapchainPresentModeInfoKHR";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR:
-            return "VkSwapchainPresentScalingCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR:
-            return "VkReleaseSwapchainImagesInfoKHR";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_KHR:
-            return "VkCooperativeMatrixPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_KHR:
-            return "VkPhysicalDeviceCooperativeMatrixFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR:
-            return "VkPhysicalDeviceCooperativeMatrixPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_KHR:
-            return "VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR:
-            return "VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR:
-            return "VkVideoDecodeAV1ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR:
-            return "VkVideoDecodeAV1CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoDecodeAV1SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR:
-            return "VkVideoDecodeAV1PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR:
-            return "VkVideoDecodeAV1DpbSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_AV1_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoEncodeAV1FeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_CAPABILITIES_KHR:
-            return "VkVideoEncodeAV1CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUALITY_LEVEL_PROPERTIES_KHR:
-            return "VkVideoEncodeAV1QualityLevelPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_CREATE_INFO_KHR:
-            return "VkVideoEncodeAV1SessionCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoEncodeAV1SessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PICTURE_INFO_KHR:
-            return "VkVideoEncodeAV1PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_DPB_SLOT_INFO_KHR:
-            return "VkVideoEncodeAV1DpbSlotInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_PROFILE_INFO_KHR:
-            return "VkVideoEncodeAV1ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_GOP_REMAINING_FRAME_INFO_KHR:
-            return "VkVideoEncodeAV1GopRemainingFrameInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_INFO_KHR:
-            return "VkVideoEncodeAV1RateControlInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_RATE_CONTROL_LAYER_INFO_KHR:
-            return "VkVideoEncodeAV1RateControlLayerInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_DECODE_VP9_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoDecodeVP9FeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PROFILE_INFO_KHR:
-            return "VkVideoDecodeVP9ProfileInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_CAPABILITIES_KHR:
-            return "VkVideoDecodeVP9CapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_VP9_PICTURE_INFO_KHR:
-            return "VkVideoDecodeVP9PictureInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoMaintenance1FeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR:
-            return "VkVideoInlineQueryInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFIED_IMAGE_LAYOUTS_FEATURES_KHR:
-            return "VkPhysicalDeviceUnifiedImageLayoutsFeaturesKHR";
-        case VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT:
-            return "VkAttachmentFeedbackLoopInfoEXT";
-        case VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_KHR:
-            return "VkCalibratedTimestampInfoKHR";
-        case VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT:
-            return "VkSetDescriptorBufferOffsetsInfoEXT";
-        case VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT:
-            return "VkBindDescriptorBufferEmbeddedSamplersInfoEXT";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR:
-            return "VkCopyMemoryIndirectInfoKHR";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR:
-            return "VkCopyMemoryToImageIndirectInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR:
-            return "VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR:
-            return "VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR:
-            return "VkVideoEncodeIntraRefreshCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR:
-            return "VkVideoEncodeSessionIntraRefreshCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR:
-            return "VkVideoEncodeIntraRefreshInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR:
-            return "VkVideoReferenceIntraRefreshInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VkVideoEncodeQuantizationMapCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VkVideoFormatQuantizationMapPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR:
-            return "VkVideoEncodeQuantizationMapInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_SESSION_PARAMETERS_CREATE_INFO_KHR:
-            return "VkVideoEncodeQuantizationMapSessionParametersCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_QUANTIZATION_MAP_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoEncodeQuantizationMapFeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VkVideoEncodeH264QuantizationMapCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VkVideoEncodeH265QuantizationMapCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_H265_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VkVideoFormatH265QuantizationMapPropertiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_AV1_QUANTIZATION_MAP_CAPABILITIES_KHR:
-            return "VkVideoEncodeAV1QuantizationMapCapabilitiesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_FORMAT_AV1_QUANTIZATION_MAP_PROPERTIES_KHR:
-            return "VkVideoFormatAV1QuantizationMapPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR:
-            return "VkPhysicalDeviceMaintenance7FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR:
-            return "VkPhysicalDeviceMaintenance7PropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_KHR:
-            return "VkPhysicalDeviceLayeredApiPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR:
-            return "VkPhysicalDeviceLayeredApiPropertiesListKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR:
-            return "VkPhysicalDeviceLayeredApiVulkanPropertiesKHR";
-        case VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR:
-            return "VkMemoryBarrierAccessFlags3KHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_FEATURES_KHR:
-            return "VkPhysicalDeviceMaintenance8FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR:
-            return "VkPhysicalDeviceShaderFmaFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR:
-            return "VkPhysicalDeviceMaintenance9FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_PROPERTIES_KHR:
-            return "VkPhysicalDeviceMaintenance9PropertiesKHR";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_OWNERSHIP_TRANSFER_PROPERTIES_KHR:
-            return "VkQueueFamilyOwnershipTransferPropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_2_FEATURES_KHR:
-            return "VkPhysicalDeviceVideoMaintenance2FeaturesKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VkVideoDecodeH264InlineSessionParametersInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VkVideoDecodeH265InlineSessionParametersInfoKHR";
-        case VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR:
-            return "VkVideoDecodeAV1InlineSessionParametersInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_KHR:
-            return "VkPhysicalDeviceDepthClampZeroOneFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_KHR:
-            return "VkPhysicalDeviceRobustness2FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_KHR:
-            return "VkPhysicalDeviceRobustness2PropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR:
-            return "VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_FEATURES_KHR:
-            return "VkPhysicalDeviceMaintenance10FeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_10_PROPERTIES_KHR:
-            return "VkPhysicalDeviceMaintenance10PropertiesKHR";
-        case VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR:
-            return "VkRenderingEndInfoKHR";
-        case VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_FLAGS_INFO_KHR:
-            return "VkRenderingAttachmentFlagsInfoKHR";
-        case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_MODE_INFO_KHR:
-            return "VkResolveImageModeInfoKHR";
-        case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT:
-            return "VkDebugReportCallbackCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD:
-            return "VkPipelineRasterizationStateRasterizationOrderAMD";
-        case VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT:
-            return "VkDebugMarkerObjectNameInfoEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT:
-            return "VkDebugMarkerObjectTagInfoEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT:
-            return "VkDebugMarkerMarkerInfoEXT";
-        case VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV:
-            return "VkDedicatedAllocationImageCreateInfoNV";
-        case VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV:
-            return "VkDedicatedAllocationBufferCreateInfoNV";
-        case VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV:
-            return "VkDedicatedAllocationMemoryAllocateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT:
-            return "VkPhysicalDeviceTransformFeedbackFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT:
-            return "VkPhysicalDeviceTransformFeedbackPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT:
-            return "VkPipelineRasterizationStateStreamCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX:
-            return "VkCuModuleCreateInfoNVX";
-        case VK_STRUCTURE_TYPE_CU_MODULE_TEXTURING_MODE_CREATE_INFO_NVX:
-            return "VkCuModuleTexturingModeCreateInfoNVX";
-        case VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX:
-            return "VkCuFunctionCreateInfoNVX";
-        case VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX:
-            return "VkCuLaunchInfoNVX";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX:
-            return "VkImageViewHandleInfoNVX";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX:
-            return "VkImageViewAddressPropertiesNVX";
-        case VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD:
-            return "VkTextureLODGatherFormatPropertiesAMD";
-#ifdef VK_USE_PLATFORM_GGP
-        case VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP:
-            return "VkStreamDescriptorSurfaceCreateInfoGGP";
-#endif  // VK_USE_PLATFORM_GGP
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV:
-            return "VkPhysicalDeviceCornerSampledImageFeaturesNV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV:
-            return "VkExternalMemoryImageCreateInfoNV";
-        case VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV:
-            return "VkExportMemoryAllocateInfoNV";
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV:
-            return "VkImportMemoryWin32HandleInfoNV";
-        case VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV:
-            return "VkExportMemoryWin32HandleInfoNV";
-        case VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV:
-            return "VkWin32KeyedMutexAcquireReleaseInfoNV";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT:
-            return "VkValidationFlagsEXT";
-#ifdef VK_USE_PLATFORM_VI_NN
-        case VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN:
-            return "VkViSurfaceCreateInfoNN";
-#endif  // VK_USE_PLATFORM_VI_NN
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT:
-            return "VkImageViewASTCDecodeModeEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT:
-            return "VkPhysicalDeviceASTCDecodeFeaturesEXT";
-        case VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT:
-            return "VkConditionalRenderingBeginInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT:
-            return "VkPhysicalDeviceConditionalRenderingFeaturesEXT";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT:
-            return "VkCommandBufferInheritanceConditionalRenderingInfoEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV:
-            return "VkPipelineViewportWScalingStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT:
-            return "VkSurfaceCapabilities2EXT";
-        case VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT:
-            return "VkDisplayPowerInfoEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT:
-            return "VkDeviceEventInfoEXT";
-        case VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT:
-            return "VkDisplayEventInfoEXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT:
-            return "VkSwapchainCounterCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE:
-            return "VkPresentTimesInfoGOOGLE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX:
-            return "VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX";
-        case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX:
-            return "VkMultiviewPerViewAttributesInfoNVX";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV:
-            return "VkPipelineViewportSwizzleStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT:
-            return "VkPhysicalDeviceDiscardRectanglePropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT:
-            return "VkPipelineDiscardRectangleStateCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT:
-            return "VkPhysicalDeviceConservativeRasterizationPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT:
-            return "VkPipelineRasterizationConservativeStateCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT:
-            return "VkPhysicalDeviceDepthClipEnableFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT:
-            return "VkPipelineRasterizationDepthClipStateCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_HDR_METADATA_EXT:
-            return "VkHdrMetadataEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG:
-            return "VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG";
-#ifdef VK_USE_PLATFORM_IOS_MVK
-        case VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK:
-            return "VkIOSSurfaceCreateInfoMVK";
-#endif  // VK_USE_PLATFORM_IOS_MVK
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-        case VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK:
-            return "VkMacOSSurfaceCreateInfoMVK";
-#endif  // VK_USE_PLATFORM_MACOS_MVK
-        case VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT:
-            return "VkDebugUtilsLabelEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT:
-            return "VkDebugUtilsObjectNameInfoEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT:
-            return "VkDebugUtilsMessengerCallbackDataEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT:
-            return "VkDebugUtilsMessengerCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT:
-            return "VkDebugUtilsObjectTagInfoEXT";
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-        case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID:
-            return "VkAndroidHardwareBufferUsageANDROID";
-        case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID:
-            return "VkAndroidHardwareBufferPropertiesANDROID";
-        case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID:
-            return "VkAndroidHardwareBufferFormatPropertiesANDROID";
-        case VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID:
-            return "VkImportAndroidHardwareBufferInfoANDROID";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID:
-            return "VkMemoryGetAndroidHardwareBufferInfoANDROID";
-        case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID:
-            return "VkExternalFormatANDROID";
-        case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID:
-            return "VkAndroidHardwareBufferFormatProperties2ANDROID";
-#endif  // VK_USE_PLATFORM_ANDROID_KHR
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX:
-            return "VkPhysicalDeviceShaderEnqueueFeaturesAMDX";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ENQUEUE_PROPERTIES_AMDX:
-            return "VkPhysicalDeviceShaderEnqueuePropertiesAMDX";
-        case VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_SCRATCH_SIZE_AMDX:
-            return "VkExecutionGraphPipelineScratchSizeAMDX";
-        case VK_STRUCTURE_TYPE_EXECUTION_GRAPH_PIPELINE_CREATE_INFO_AMDX:
-            return "VkExecutionGraphPipelineCreateInfoAMDX";
-        case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREATE_INFO_AMDX:
-            return "VkPipelineShaderStageNodeCreateInfoAMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD:
-            return "VkAttachmentSampleCountInfoAMD";
-        case VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT:
-            return "VkSampleLocationsInfoEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT:
-            return "VkRenderPassSampleLocationsBeginInfoEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT:
-            return "VkPipelineSampleLocationsStateCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT:
-            return "VkPhysicalDeviceSampleLocationsPropertiesEXT";
-        case VK_STRUCTURE_TYPE_MULTISAMPLE_PROPERTIES_EXT:
-            return "VkMultisamplePropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT:
-            return "VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT:
-            return "VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT:
-            return "VkPipelineColorBlendAdvancedStateCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV:
-            return "VkPipelineCoverageToColorStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV:
-            return "VkPipelineCoverageModulationStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV:
-            return "VkPhysicalDeviceShaderSMBuiltinsPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_FEATURES_NV:
-            return "VkPhysicalDeviceShaderSMBuiltinsFeaturesNV";
-        case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT:
-            return "VkDrmFormatModifierPropertiesListEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT:
-            return "VkPhysicalDeviceImageDrmFormatModifierInfoEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT:
-            return "VkImageDrmFormatModifierListCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT:
-            return "VkImageDrmFormatModifierExplicitCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT:
-            return "VkImageDrmFormatModifierPropertiesEXT";
-        case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT:
-            return "VkDrmFormatModifierPropertiesList2EXT";
-        case VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT:
-            return "VkValidationCacheCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT:
-            return "VkShaderModuleValidationCacheCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV:
-            return "VkPipelineViewportShadingRateImageStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV:
-            return "VkPhysicalDeviceShadingRateImageFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV:
-            return "VkPhysicalDeviceShadingRateImagePropertiesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV:
-            return "VkPipelineViewportCoarseSampleOrderStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV:
-            return "VkRayTracingShaderGroupCreateInfoNV";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV:
-            return "VkRayTracingPipelineCreateInfoNV";
-        case VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NV:
-            return "VkGeometryTrianglesNV";
-        case VK_STRUCTURE_TYPE_GEOMETRY_AABB_NV:
-            return "VkGeometryAABBNV";
-        case VK_STRUCTURE_TYPE_GEOMETRY_NV:
-            return "VkGeometryNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV:
-            return "VkAccelerationStructureInfoNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NV:
-            return "VkAccelerationStructureCreateInfoNV";
-        case VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV:
-            return "VkBindAccelerationStructureMemoryInfoNV";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV:
-            return "VkWriteDescriptorSetAccelerationStructureNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV:
-            return "VkAccelerationStructureMemoryRequirementsInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV:
-            return "VkPhysicalDeviceRayTracingPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV:
-            return "VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV:
-            return "VkPipelineRepresentativeFragmentTestStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT:
-            return "VkPhysicalDeviceImageViewImageFormatInfoEXT";
-        case VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT:
-            return "VkFilterCubicImageViewImageFormatPropertiesEXT";
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT:
-            return "VkImportMemoryHostPointerInfoEXT";
-        case VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT:
-            return "VkMemoryHostPointerPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT:
-            return "VkPhysicalDeviceExternalMemoryHostPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD:
-            return "VkPipelineCompilerControlCreateInfoAMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD:
-            return "VkPhysicalDeviceShaderCorePropertiesAMD";
-        case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD:
-            return "VkDeviceMemoryOverallocationCreateInfoAMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT:
-            return "VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT";
-#ifdef VK_USE_PLATFORM_GGP
-        case VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP:
-            return "VkPresentFrameTokenGGP";
-#endif  // VK_USE_PLATFORM_GGP
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV:
-            return "VkPhysicalDeviceMeshShaderFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV:
-            return "VkPhysicalDeviceMeshShaderPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV:
-            return "VkPhysicalDeviceShaderImageFootprintFeaturesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV:
-            return "VkPipelineViewportExclusiveScissorStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV:
-            return "VkPhysicalDeviceExclusiveScissorFeaturesNV";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV:
-            return "VkQueueFamilyCheckpointPropertiesNV";
-        case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV:
-            return "VkCheckpointDataNV";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV:
-            return "VkQueueFamilyCheckpointProperties2NV";
-        case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV:
-            return "VkCheckpointData2NV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT:
-            return "VkPhysicalDevicePresentTimingFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT:
-            return "VkPresentTimingSurfaceCapabilitiesEXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT:
-            return "VkSwapchainCalibratedTimestampInfoEXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT:
-            return "VkSwapchainTimingPropertiesEXT";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT:
-            return "VkSwapchainTimeDomainPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT:
-            return "VkPastPresentationTimingInfoEXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT:
-            return "VkPastPresentationTimingEXT";
-        case VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT:
-            return "VkPastPresentationTimingPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT:
-            return "VkPresentTimingInfoEXT";
-        case VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT:
-            return "VkPresentTimingsInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL:
-            return "VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL";
-        case VK_STRUCTURE_TYPE_INITIALIZE_PERFORMANCE_API_INFO_INTEL:
-            return "VkInitializePerformanceApiInfoINTEL";
-        case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL:
-            return "VkQueryPoolPerformanceQueryCreateInfoINTEL";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_MARKER_INFO_INTEL:
-            return "VkPerformanceMarkerInfoINTEL";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_STREAM_MARKER_INFO_INTEL:
-            return "VkPerformanceStreamMarkerInfoINTEL";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_OVERRIDE_INFO_INTEL:
-            return "VkPerformanceOverrideInfoINTEL";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_CONFIGURATION_ACQUIRE_INFO_INTEL:
-            return "VkPerformanceConfigurationAcquireInfoINTEL";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT:
-            return "VkPhysicalDevicePCIBusInfoPropertiesEXT";
-        case VK_STRUCTURE_TYPE_DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD:
-            return "VkDisplayNativeHdrSurfaceCapabilitiesAMD";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD:
-            return "VkSwapchainDisplayNativeHdrCreateInfoAMD";
-#ifdef VK_USE_PLATFORM_FUCHSIA
-        case VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA:
-            return "VkImagePipeSurfaceCreateInfoFUCHSIA";
-#endif  // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT:
-            return "VkMetalSurfaceCreateInfoEXT";
-#endif  // VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMapFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMapPropertiesEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT:
-            return "VkRenderPassFragmentDensityMapCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT:
-            return "VkRenderingFragmentDensityMapAttachmentInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD:
-            return "VkPhysicalDeviceShaderCoreProperties2AMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD:
-            return "VkPhysicalDeviceCoherentMemoryFeaturesAMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT:
-            return "VkPhysicalDeviceMemoryBudgetPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT:
-            return "VkPhysicalDeviceMemoryPriorityFeaturesEXT";
-        case VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT:
-            return "VkMemoryPriorityAllocateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV:
-            return "VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT:
-            return "VkPhysicalDeviceBufferDeviceAddressFeaturesEXT";
-        case VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT:
-            return "VkBufferDeviceAddressCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT:
-            return "VkValidationFeaturesEXT";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_NV:
-            return "VkCooperativeMatrixPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV:
-            return "VkPhysicalDeviceCooperativeMatrixFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_NV:
-            return "VkPhysicalDeviceCooperativeMatrixPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COVERAGE_REDUCTION_MODE_FEATURES_NV:
-            return "VkPhysicalDeviceCoverageReductionModeFeaturesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_REDUCTION_STATE_CREATE_INFO_NV:
-            return "VkPipelineCoverageReductionStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_FRAMEBUFFER_MIXED_SAMPLES_COMBINATION_NV:
-            return "VkFramebufferMixedSamplesCombinationNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT:
-            return "VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT:
-            return "VkPhysicalDeviceYcbcrImageArraysFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT:
-            return "VkPhysicalDeviceProvokingVertexFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT:
-            return "VkPhysicalDeviceProvokingVertexPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT:
-            return "VkPipelineRasterizationProvokingVertexStateCreateInfoEXT";
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT:
-            return "VkSurfaceFullScreenExclusiveInfoEXT";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT:
-            return "VkSurfaceCapabilitiesFullScreenExclusiveEXT";
-        case VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT:
-            return "VkSurfaceFullScreenExclusiveWin32InfoEXT";
-#endif  // VK_USE_PLATFORM_WIN32_KHR
-        case VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT:
-            return "VkHeadlessSurfaceCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderAtomicFloatFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT:
-            return "VkPhysicalDeviceExtendedDynamicStateFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT:
-            return "VkPhysicalDeviceMapMemoryPlacedFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT:
-            return "VkPhysicalDeviceMapMemoryPlacedPropertiesEXT";
-        case VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT:
-            return "VkMemoryMapPlacedInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV:
-            return "VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV:
-            return "VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV";
-        case VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV:
-            return "VkGraphicsShaderGroupCreateInfoNV";
-        case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV:
-            return "VkGraphicsPipelineShaderGroupsCreateInfoNV";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_NV:
-            return "VkIndirectCommandsLayoutTokenNV";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV:
-            return "VkIndirectCommandsLayoutCreateInfoNV";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV:
-            return "VkGeneratedCommandsInfoNV";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV:
-            return "VkGeneratedCommandsMemoryRequirementsInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV:
-            return "VkPhysicalDeviceInheritedViewportScissorFeaturesNV";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV:
-            return "VkCommandBufferInheritanceViewportScissorInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT:
-            return "VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM:
-            return "VkRenderPassTransformBeginInfoQCOM";
-        case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM:
-            return "VkCommandBufferInheritanceRenderPassTransformInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_BIAS_CONTROL_FEATURES_EXT:
-            return "VkPhysicalDeviceDepthBiasControlFeaturesEXT";
-        case VK_STRUCTURE_TYPE_DEPTH_BIAS_INFO_EXT:
-            return "VkDepthBiasInfoEXT";
-        case VK_STRUCTURE_TYPE_DEPTH_BIAS_REPRESENTATION_INFO_EXT:
-            return "VkDepthBiasRepresentationInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT:
-            return "VkPhysicalDeviceDeviceMemoryReportFeaturesEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT:
-            return "VkDeviceMemoryReportCallbackDataEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT:
-            return "VkDeviceDeviceMemoryReportCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT:
-            return "VkSamplerCustomBorderColorCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT:
-            return "VkPhysicalDeviceCustomBorderColorPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT:
-            return "VkPhysicalDeviceCustomBorderColorFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_BARRIER_FEATURES_NV:
-            return "VkPhysicalDevicePresentBarrierFeaturesNV";
-        case VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_BARRIER_NV:
-            return "VkSurfaceCapabilitiesPresentBarrierNV";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_BARRIER_CREATE_INFO_NV:
-            return "VkSwapchainPresentBarrierCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV:
-            return "VkPhysicalDeviceDiagnosticsConfigFeaturesNV";
-        case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV:
-            return "VkDeviceDiagnosticsConfigCreateInfoNV";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV:
-            return "VkCudaModuleCreateInfoNV";
-        case VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV:
-            return "VkCudaFunctionCreateInfoNV";
-        case VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV:
-            return "VkCudaLaunchInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV:
-            return "VkPhysicalDeviceCudaKernelLaunchFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV:
-            return "VkPhysicalDeviceCudaKernelLaunchPropertiesNV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM:
-            return "VkPhysicalDeviceTileShadingFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM:
-            return "VkPhysicalDeviceTileShadingPropertiesQCOM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM:
-            return "VkRenderPassTileShadingCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM:
-            return "VkPerTileBeginInfoQCOM";
-        case VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM:
-            return "VkPerTileEndInfoQCOM";
-        case VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM:
-            return "VkDispatchTileInfoQCOM";
-        case VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV:
-            return "VkQueryLowLatencySupportNV";
-#ifdef VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECT_CREATE_INFO_EXT:
-            return "VkExportMetalObjectCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_OBJECTS_INFO_EXT:
-            return "VkExportMetalObjectsInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_DEVICE_INFO_EXT:
-            return "VkExportMetalDeviceInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_COMMAND_QUEUE_INFO_EXT:
-            return "VkExportMetalCommandQueueInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_BUFFER_INFO_EXT:
-            return "VkExportMetalBufferInfoEXT";
-        case VK_STRUCTURE_TYPE_IMPORT_METAL_BUFFER_INFO_EXT:
-            return "VkImportMetalBufferInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_TEXTURE_INFO_EXT:
-            return "VkExportMetalTextureInfoEXT";
-        case VK_STRUCTURE_TYPE_IMPORT_METAL_TEXTURE_INFO_EXT:
-            return "VkImportMetalTextureInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_IO_SURFACE_INFO_EXT:
-            return "VkExportMetalIOSurfaceInfoEXT";
-        case VK_STRUCTURE_TYPE_IMPORT_METAL_IO_SURFACE_INFO_EXT:
-            return "VkImportMetalIOSurfaceInfoEXT";
-        case VK_STRUCTURE_TYPE_EXPORT_METAL_SHARED_EVENT_INFO_EXT:
-            return "VkExportMetalSharedEventInfoEXT";
-        case VK_STRUCTURE_TYPE_IMPORT_METAL_SHARED_EVENT_INFO_EXT:
-            return "VkImportMetalSharedEventInfoEXT";
-#endif  // VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_PROPERTIES_EXT:
-            return "VkPhysicalDeviceDescriptorBufferPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_DENSITY_MAP_PROPERTIES_EXT:
-            return "VkPhysicalDeviceDescriptorBufferDensityMapPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_FEATURES_EXT:
-            return "VkPhysicalDeviceDescriptorBufferFeaturesEXT";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT:
-            return "VkDescriptorAddressInfoEXT";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT:
-            return "VkDescriptorBufferBindingInfoEXT";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_PUSH_DESCRIPTOR_BUFFER_HANDLE_EXT:
-            return "VkDescriptorBufferBindingPushDescriptorBufferHandleEXT";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_GET_INFO_EXT:
-            return "VkDescriptorGetInfoEXT";
-        case VK_STRUCTURE_TYPE_BUFFER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT:
-            return "VkBufferCaptureDescriptorDataInfoEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT:
-            return "VkImageCaptureDescriptorDataInfoEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_EXT:
-            return "VkImageViewCaptureDescriptorDataInfoEXT";
-        case VK_STRUCTURE_TYPE_SAMPLER_CAPTURE_DESCRIPTOR_DATA_INFO_EXT:
-            return "VkSamplerCaptureDescriptorDataInfoEXT";
-        case VK_STRUCTURE_TYPE_OPAQUE_CAPTURE_DESCRIPTOR_DATA_CREATE_INFO_EXT:
-            return "VkOpaqueCaptureDescriptorDataCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CAPTURE_DESCRIPTOR_DATA_INFO_EXT:
-            return "VkAccelerationStructureCaptureDescriptorDataInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT:
-            return "VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_PROPERTIES_EXT:
-            return "VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT";
-        case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT:
-            return "VkGraphicsPipelineLibraryCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_AMD:
-            return "VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV:
-            return "VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV:
-            return "VkPhysicalDeviceFragmentShadingRateEnumsPropertiesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV:
-            return "VkPipelineFragmentShadingRateEnumStateCreateInfoNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV:
-            return "VkAccelerationStructureGeometryMotionTrianglesDataNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MOTION_INFO_NV:
-            return "VkAccelerationStructureMotionInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV:
-            return "VkPhysicalDeviceRayTracingMotionBlurFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_2_PLANE_444_FORMATS_FEATURES_EXT:
-            return "VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMap2FeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMap2PropertiesEXT";
-        case VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM:
-            return "VkCopyCommandTransformInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_FEATURES_EXT:
-            return "VkPhysicalDeviceImageCompressionControlFeaturesEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT:
-            return "VkImageCompressionControlEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_PROPERTIES_EXT:
-            return "VkImageCompressionPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT:
-            return "VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT:
-            return "VkPhysicalDevice4444FormatsFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_EXT:
-            return "VkPhysicalDeviceFaultFeaturesEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_FAULT_COUNTS_EXT:
-            return "VkDeviceFaultCountsEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT:
-            return "VkDeviceFaultInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_EXT:
-            return "VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT:
-            return "VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT";
-#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
-        case VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT:
-            return "VkDirectFBSurfaceCreateInfoEXT";
-#endif  // VK_USE_PLATFORM_DIRECTFB_EXT
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT:
-            return "VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT";
-        case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT:
-            return "VkMutableDescriptorTypeCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_INPUT_DYNAMIC_STATE_FEATURES_EXT:
-            return "VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT";
-        case VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT:
-            return "VkVertexInputBindingDescription2EXT";
-        case VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT:
-            return "VkVertexInputAttributeDescription2EXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT:
-            return "VkPhysicalDeviceDrmPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ADDRESS_BINDING_REPORT_FEATURES_EXT:
-            return "VkPhysicalDeviceAddressBindingReportFeaturesEXT";
-        case VK_STRUCTURE_TYPE_DEVICE_ADDRESS_BINDING_CALLBACK_DATA_EXT:
-            return "VkDeviceAddressBindingCallbackDataEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT:
-            return "VkPhysicalDeviceDepthClipControlFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT:
-            return "VkPipelineViewportDepthClipControlCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT:
-            return "VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT";
-#ifdef VK_USE_PLATFORM_FUCHSIA
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA:
-            return "VkImportMemoryZirconHandleInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA:
-            return "VkMemoryZirconHandlePropertiesFUCHSIA";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA:
-            return "VkMemoryGetZirconHandleInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA:
-            return "VkImportSemaphoreZirconHandleInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA:
-            return "VkSemaphoreGetZirconHandleInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA:
-            return "VkBufferCollectionCreateInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA:
-            return "VkImportMemoryBufferCollectionFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA:
-            return "VkBufferCollectionImageCreateInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CONSTRAINTS_INFO_FUCHSIA:
-            return "VkBufferCollectionConstraintsInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_CONSTRAINTS_INFO_FUCHSIA:
-            return "VkBufferConstraintsInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_BUFFER_CREATE_INFO_FUCHSIA:
-            return "VkBufferCollectionBufferCreateInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_SYSMEM_COLOR_SPACE_FUCHSIA:
-            return "VkSysmemColorSpaceFUCHSIA";
-        case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA:
-            return "VkBufferCollectionPropertiesFUCHSIA";
-        case VK_STRUCTURE_TYPE_IMAGE_FORMAT_CONSTRAINTS_INFO_FUCHSIA:
-            return "VkImageFormatConstraintsInfoFUCHSIA";
-        case VK_STRUCTURE_TYPE_IMAGE_CONSTRAINTS_INFO_FUCHSIA:
-            return "VkImageConstraintsInfoFUCHSIA";
-#endif  // VK_USE_PLATFORM_FUCHSIA
-        case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI:
-            return "VkSubpassShadingPipelineCreateInfoHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI:
-            return "VkPhysicalDeviceSubpassShadingFeaturesHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI:
-            return "VkPhysicalDeviceSubpassShadingPropertiesHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INVOCATION_MASK_FEATURES_HUAWEI:
-            return "VkPhysicalDeviceInvocationMaskFeaturesHUAWEI";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_REMOTE_ADDRESS_INFO_NV:
-            return "VkMemoryGetRemoteAddressInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV:
-            return "VkPhysicalDeviceExternalMemoryRDMAFeaturesNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_PROPERTIES_IDENTIFIER_EXT:
-            return "VkPipelinePropertiesIdentifierEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT:
-            return "VkPhysicalDevicePipelinePropertiesFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAME_BOUNDARY_FEATURES_EXT:
-            return "VkPhysicalDeviceFrameBoundaryFeaturesEXT";
-        case VK_STRUCTURE_TYPE_FRAME_BOUNDARY_EXT:
-            return "VkFrameBoundaryEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT:
-            return "VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT";
-        case VK_STRUCTURE_TYPE_SUBPASS_RESOLVE_PERFORMANCE_QUERY_EXT:
-            return "VkSubpassResolvePerformanceQueryEXT";
-        case VK_STRUCTURE_TYPE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_INFO_EXT:
-            return "VkMultisampledRenderToSingleSampledInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT:
-            return "VkPhysicalDeviceExtendedDynamicState2FeaturesEXT";
-#ifdef VK_USE_PLATFORM_SCREEN_QNX
-        case VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX:
-            return "VkScreenSurfaceCreateInfoQNX";
-#endif  // VK_USE_PLATFORM_SCREEN_QNX
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT:
-            return "VkPhysicalDeviceColorWriteEnableFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT:
-            return "VkPipelineColorWriteCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT:
-            return "VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE:
-            return "VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE:
-            return "VkVideoEncodeRgbConversionCapabilitiesVALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE:
-            return "VkVideoEncodeProfileRgbConversionInfoVALVE";
-        case VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE:
-            return "VkVideoEncodeSessionRgbConversionCreateInfoVALVE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT:
-            return "VkPhysicalDeviceImageViewMinLodFeaturesEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT:
-            return "VkImageViewMinLodCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT:
-            return "VkPhysicalDeviceMultiDrawFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT:
-            return "VkPhysicalDeviceMultiDrawPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT:
-            return "VkPhysicalDeviceImage2DViewOf3DFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderTileImageFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TILE_IMAGE_PROPERTIES_EXT:
-            return "VkPhysicalDeviceShaderTileImagePropertiesEXT";
-        case VK_STRUCTURE_TYPE_MICROMAP_BUILD_INFO_EXT:
-            return "VkMicromapBuildInfoEXT";
-        case VK_STRUCTURE_TYPE_MICROMAP_CREATE_INFO_EXT:
-            return "VkMicromapCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_FEATURES_EXT:
-            return "VkPhysicalDeviceOpacityMicromapFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT:
-            return "VkPhysicalDeviceOpacityMicromapPropertiesEXT";
-        case VK_STRUCTURE_TYPE_MICROMAP_VERSION_INFO_EXT:
-            return "VkMicromapVersionInfoEXT";
-        case VK_STRUCTURE_TYPE_COPY_MICROMAP_TO_MEMORY_INFO_EXT:
-            return "VkCopyMicromapToMemoryInfoEXT";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_MICROMAP_INFO_EXT:
-            return "VkCopyMemoryToMicromapInfoEXT";
-        case VK_STRUCTURE_TYPE_COPY_MICROMAP_INFO_EXT:
-            return "VkCopyMicromapInfoEXT";
-        case VK_STRUCTURE_TYPE_MICROMAP_BUILD_SIZES_INFO_EXT:
-            return "VkMicromapBuildSizesInfoEXT";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT:
-            return "VkAccelerationStructureTrianglesOpacityMicromapEXT";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV:
-            return "VkPhysicalDeviceDisplacementMicromapFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV:
-            return "VkPhysicalDeviceDisplacementMicromapPropertiesNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV:
-            return "VkAccelerationStructureTrianglesDisplacementMicromapNV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI:
-            return "VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI:
-            return "VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI:
-            return "VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT:
-            return "VkPhysicalDeviceBorderColorSwizzleFeaturesEXT";
-        case VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT:
-            return "VkSamplerBorderColorComponentMappingCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT:
-            return "VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM:
-            return "VkPhysicalDeviceShaderCorePropertiesARM";
-        case VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM:
-            return "VkDeviceQueueShaderCoreControlCreateInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM:
-            return "VkPhysicalDeviceSchedulingControlsFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM:
-            return "VkPhysicalDeviceSchedulingControlsPropertiesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT:
-            return "VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT:
-            return "VkImageViewSlicedCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE:
-            return "VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE:
-            return "VkDescriptorSetBindingReferenceVALVE";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE:
-            return "VkDescriptorSetLayoutHostMappingInfoVALVE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT:
-            return "VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM:
-            return "VkPhysicalDeviceRenderPassStripedFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM:
-            return "VkPhysicalDeviceRenderPassStripedPropertiesARM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM:
-            return "VkRenderPassStripeInfoARM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM:
-            return "VkRenderPassStripeBeginInfoARM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM:
-            return "VkRenderPassStripeSubmitInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT:
-            return "VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT:
-            return "VkRenderPassFragmentDensityMapOffsetEndInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV:
-            return "VkPhysicalDeviceCopyMemoryIndirectFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_EXT:
-            return "VkPhysicalDeviceMemoryDecompressionFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_EXT:
-            return "VkPhysicalDeviceMemoryDecompressionPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV:
-            return "VkPhysicalDeviceDeviceGeneratedCommandsComputeFeaturesNV";
-        case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV:
-            return "VkComputePipelineIndirectBufferInfoNV";
-        case VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV:
-            return "VkPipelineIndirectDeviceAddressInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_LINEAR_SWEPT_SPHERES_FEATURES_NV:
-            return "VkPhysicalDeviceRayTracingLinearSweptSpheresFeaturesNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV:
-            return "VkAccelerationStructureGeometryLinearSweptSpheresDataNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV:
-            return "VkAccelerationStructureGeometrySpheresDataNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV:
-            return "VkPhysicalDeviceLinearColorAttachmentFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT:
-            return "VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT";
-        case VK_STRUCTURE_TYPE_IMAGE_VIEW_SAMPLE_WEIGHT_CREATE_INFO_QCOM:
-            return "VkImageViewSampleWeightCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM:
-            return "VkPhysicalDeviceImageProcessingFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_PROPERTIES_QCOM:
-            return "VkPhysicalDeviceImageProcessingPropertiesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_FEATURES_EXT:
-            return "VkPhysicalDeviceNestedCommandBufferFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_BUFFER_PROPERTIES_EXT:
-            return "VkPhysicalDeviceNestedCommandBufferPropertiesEXT";
-#ifdef VK_USE_PLATFORM_OHOS
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS:
-            return "VkNativeBufferUsageOHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS:
-            return "VkNativeBufferPropertiesOHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS:
-            return "VkNativeBufferFormatPropertiesOHOS";
-        case VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS:
-            return "VkImportNativeBufferInfoOHOS";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS:
-            return "VkMemoryGetNativeBufferInfoOHOS";
-        case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS:
-            return "VkExternalFormatOHOS";
-#endif  // VK_USE_PLATFORM_OHOS
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT:
-            return "VkExternalMemoryAcquireUnmodifiedEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT:
-            return "VkPhysicalDeviceExtendedDynamicState3FeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_PROPERTIES_EXT:
-            return "VkPhysicalDeviceExtendedDynamicState3PropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_MERGE_FEEDBACK_FEATURES_EXT:
-            return "VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_CONTROL_EXT:
-            return "VkRenderPassCreationControlEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT:
-            return "VkRenderPassCreationFeedbackCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT:
-            return "VkRenderPassSubpassFeedbackCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_INFO_LUNARG:
-            return "VkDirectDriverLoadingInfoLUNARG";
-        case VK_STRUCTURE_TYPE_DIRECT_DRIVER_LOADING_LIST_LUNARG:
-            return "VkDirectDriverLoadingListLUNARG";
-        case VK_STRUCTURE_TYPE_TENSOR_DESCRIPTION_ARM:
-            return "VkTensorDescriptionARM";
-        case VK_STRUCTURE_TYPE_TENSOR_CREATE_INFO_ARM:
-            return "VkTensorCreateInfoARM";
-        case VK_STRUCTURE_TYPE_TENSOR_VIEW_CREATE_INFO_ARM:
-            return "VkTensorViewCreateInfoARM";
-        case VK_STRUCTURE_TYPE_TENSOR_MEMORY_REQUIREMENTS_INFO_ARM:
-            return "VkTensorMemoryRequirementsInfoARM";
-        case VK_STRUCTURE_TYPE_BIND_TENSOR_MEMORY_INFO_ARM:
-            return "VkBindTensorMemoryInfoARM";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_TENSOR_ARM:
-            return "VkWriteDescriptorSetTensorARM";
-        case VK_STRUCTURE_TYPE_TENSOR_FORMAT_PROPERTIES_ARM:
-            return "VkTensorFormatPropertiesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_PROPERTIES_ARM:
-            return "VkPhysicalDeviceTensorPropertiesARM";
-        case VK_STRUCTURE_TYPE_TENSOR_MEMORY_BARRIER_ARM:
-            return "VkTensorMemoryBarrierARM";
-        case VK_STRUCTURE_TYPE_TENSOR_DEPENDENCY_INFO_ARM:
-            return "VkTensorDependencyInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TENSOR_FEATURES_ARM:
-            return "VkPhysicalDeviceTensorFeaturesARM";
-        case VK_STRUCTURE_TYPE_DEVICE_TENSOR_MEMORY_REQUIREMENTS_ARM:
-            return "VkDeviceTensorMemoryRequirementsARM";
-        case VK_STRUCTURE_TYPE_TENSOR_COPY_ARM:
-            return "VkTensorCopyARM";
-        case VK_STRUCTURE_TYPE_COPY_TENSOR_INFO_ARM:
-            return "VkCopyTensorInfoARM";
-        case VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_TENSOR_ARM:
-            return "VkMemoryDedicatedAllocateInfoTensorARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_TENSOR_INFO_ARM:
-            return "VkPhysicalDeviceExternalTensorInfoARM";
-        case VK_STRUCTURE_TYPE_EXTERNAL_TENSOR_PROPERTIES_ARM:
-            return "VkExternalTensorPropertiesARM";
-        case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_TENSOR_CREATE_INFO_ARM:
-            return "VkExternalMemoryTensorCreateInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_FEATURES_ARM:
-            return "VkPhysicalDeviceDescriptorBufferTensorFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_BUFFER_TENSOR_PROPERTIES_ARM:
-            return "VkPhysicalDeviceDescriptorBufferTensorPropertiesARM";
-        case VK_STRUCTURE_TYPE_DESCRIPTOR_GET_TENSOR_INFO_ARM:
-            return "VkDescriptorGetTensorInfoARM";
-        case VK_STRUCTURE_TYPE_TENSOR_CAPTURE_DESCRIPTOR_DATA_INFO_ARM:
-            return "VkTensorCaptureDescriptorDataInfoARM";
-        case VK_STRUCTURE_TYPE_TENSOR_VIEW_CAPTURE_DESCRIPTOR_DATA_INFO_ARM:
-            return "VkTensorViewCaptureDescriptorDataInfoARM";
-        case VK_STRUCTURE_TYPE_FRAME_BOUNDARY_TENSORS_ARM:
-            return "VkFrameBoundaryTensorsARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT:
-            return "VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT:
-            return "VkPipelineShaderStageModuleIdentifierCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_SHADER_MODULE_IDENTIFIER_EXT:
-            return "VkShaderModuleIdentifierEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPTICAL_FLOW_FEATURES_NV:
-            return "VkPhysicalDeviceOpticalFlowFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPTICAL_FLOW_PROPERTIES_NV:
-            return "VkPhysicalDeviceOpticalFlowPropertiesNV";
-        case VK_STRUCTURE_TYPE_OPTICAL_FLOW_IMAGE_FORMAT_INFO_NV:
-            return "VkOpticalFlowImageFormatInfoNV";
-        case VK_STRUCTURE_TYPE_OPTICAL_FLOW_IMAGE_FORMAT_PROPERTIES_NV:
-            return "VkOpticalFlowImageFormatPropertiesNV";
-        case VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_INFO_NV:
-            return "VkOpticalFlowSessionCreateInfoNV";
-        case VK_STRUCTURE_TYPE_OPTICAL_FLOW_SESSION_CREATE_PRIVATE_DATA_INFO_NV:
-            return "VkOpticalFlowSessionCreatePrivateDataInfoNV";
-        case VK_STRUCTURE_TYPE_OPTICAL_FLOW_EXECUTE_INFO_NV:
-            return "VkOpticalFlowExecuteInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT:
-            return "VkPhysicalDeviceLegacyDitheringFeaturesEXT";
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID:
-            return "VkPhysicalDeviceExternalFormatResolveFeaturesANDROID";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_PROPERTIES_ANDROID:
-            return "VkPhysicalDeviceExternalFormatResolvePropertiesANDROID";
-        case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_RESOLVE_PROPERTIES_ANDROID:
-            return "VkAndroidHardwareBufferFormatResolvePropertiesANDROID";
-#endif  // VK_USE_PLATFORM_ANDROID_KHR
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD:
-            return "VkPhysicalDeviceAntiLagFeaturesAMD";
-        case VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD:
-            return "VkAntiLagPresentationInfoAMD";
-        case VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD:
-            return "VkAntiLagDataAMD";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX:
-            return "VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX:
-            return "VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderObjectFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT:
-            return "VkPhysicalDeviceShaderObjectPropertiesEXT";
-        case VK_STRUCTURE_TYPE_SHADER_CREATE_INFO_EXT:
-            return "VkShaderCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM:
-            return "VkPhysicalDeviceTilePropertiesFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM:
-            return "VkTilePropertiesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC:
-            return "VkPhysicalDeviceAmigoProfilingFeaturesSEC";
-        case VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC:
-            return "VkAmigoProfilingSubmitInfoSEC";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM:
-            return "VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV:
-            return "VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV:
-            return "VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV:
-            return "VkPhysicalDeviceCooperativeVectorPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_FEATURES_NV:
-            return "VkPhysicalDeviceCooperativeVectorFeaturesNV";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_VECTOR_PROPERTIES_NV:
-            return "VkCooperativeVectorPropertiesNV";
-        case VK_STRUCTURE_TYPE_CONVERT_COOPERATIVE_VECTOR_MATRIX_INFO_NV:
-            return "VkConvertCooperativeVectorMatrixInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV:
-            return "VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV:
-            return "VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT:
-            return "VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT:
-            return "VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT";
-        case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
-            return "VkLayerSettingsCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM:
-            return "VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM:
-            return "VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT:
-            return "VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_FEATURES_EXT:
-            return "VkPhysicalDeviceDynamicRenderingUnusedAttachmentsFeaturesEXT";
-        case VK_STRUCTURE_TYPE_LATENCY_SLEEP_MODE_INFO_NV:
-            return "VkLatencySleepModeInfoNV";
-        case VK_STRUCTURE_TYPE_LATENCY_SLEEP_INFO_NV:
-            return "VkLatencySleepInfoNV";
-        case VK_STRUCTURE_TYPE_SET_LATENCY_MARKER_INFO_NV:
-            return "VkSetLatencyMarkerInfoNV";
-        case VK_STRUCTURE_TYPE_LATENCY_TIMINGS_FRAME_REPORT_NV:
-            return "VkLatencyTimingsFrameReportNV";
-        case VK_STRUCTURE_TYPE_GET_LATENCY_MARKER_INFO_NV:
-            return "VkGetLatencyMarkerInfoNV";
-        case VK_STRUCTURE_TYPE_LATENCY_SUBMISSION_PRESENT_ID_NV:
-            return "VkLatencySubmissionPresentIdNV";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_LATENCY_CREATE_INFO_NV:
-            return "VkSwapchainLatencyCreateInfoNV";
-        case VK_STRUCTURE_TYPE_OUT_OF_BAND_QUEUE_TYPE_INFO_NV:
-            return "VkOutOfBandQueueTypeInfoNV";
-        case VK_STRUCTURE_TYPE_LATENCY_SURFACE_CAPABILITIES_NV:
-            return "VkLatencySurfaceCapabilitiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_FEATURES_ARM:
-            return "VkPhysicalDeviceDataGraphFeaturesARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_ARM:
-            return "VkDataGraphPipelineConstantARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_RESOURCE_INFO_ARM:
-            return "VkDataGraphPipelineResourceInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_COMPILER_CONTROL_CREATE_INFO_ARM:
-            return "VkDataGraphPipelineCompilerControlCreateInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CREATE_INFO_ARM:
-            return "VkDataGraphPipelineCreateInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SHADER_MODULE_CREATE_INFO_ARM:
-            return "VkDataGraphPipelineShaderModuleCreateInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_CREATE_INFO_ARM:
-            return "VkDataGraphPipelineSessionCreateInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENTS_INFO_ARM:
-            return "VkDataGraphPipelineSessionBindPointRequirementsInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_BIND_POINT_REQUIREMENT_ARM:
-            return "VkDataGraphPipelineSessionBindPointRequirementARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_SESSION_MEMORY_REQUIREMENTS_INFO_ARM:
-            return "VkDataGraphPipelineSessionMemoryRequirementsInfoARM";
-        case VK_STRUCTURE_TYPE_BIND_DATA_GRAPH_PIPELINE_SESSION_MEMORY_INFO_ARM:
-            return "VkBindDataGraphPipelineSessionMemoryInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_INFO_ARM:
-            return "VkDataGraphPipelineInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_PROPERTY_QUERY_RESULT_ARM:
-            return "VkDataGraphPipelinePropertyQueryResultARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_IDENTIFIER_CREATE_INFO_ARM:
-            return "VkDataGraphPipelineIdentifierCreateInfoARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_DISPATCH_INFO_ARM:
-            return "VkDataGraphPipelineDispatchInfoARM";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROPERTIES_ARM:
-            return "VkQueueFamilyDataGraphPropertiesARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PROCESSING_ENGINE_CREATE_INFO_ARM:
-            return "VkDataGraphProcessingEngineCreateInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_INFO_ARM:
-            return "VkPhysicalDeviceQueueFamilyDataGraphProcessingEngineInfoARM";
-        case VK_STRUCTURE_TYPE_QUEUE_FAMILY_DATA_GRAPH_PROCESSING_ENGINE_PROPERTIES_ARM:
-            return "VkQueueFamilyDataGraphProcessingEnginePropertiesARM";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_CONSTANT_TENSOR_SEMI_STRUCTURED_SPARSITY_INFO_ARM:
-            return "VkDataGraphPipelineConstantTensorSemiStructuredSparsityInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM:
-            return "VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM:
-            return "VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV:
-            return "VkPhysicalDevicePerStageDescriptorSetFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_FEATURES_QCOM:
-            return "VkPhysicalDeviceImageProcessing2FeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_2_PROPERTIES_QCOM:
-            return "VkPhysicalDeviceImageProcessing2PropertiesQCOM";
-        case VK_STRUCTURE_TYPE_SAMPLER_BLOCK_MATCH_WINDOW_CREATE_INFO_QCOM:
-            return "VkSamplerBlockMatchWindowCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_WEIGHTS_FEATURES_QCOM:
-            return "VkPhysicalDeviceCubicWeightsFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_SAMPLER_CUBIC_WEIGHTS_CREATE_INFO_QCOM:
-            return "VkSamplerCubicWeightsCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_BLIT_IMAGE_CUBIC_WEIGHTS_INFO_QCOM:
-            return "VkBlitImageCubicWeightsInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_DEGAMMA_FEATURES_QCOM:
-            return "VkPhysicalDeviceYcbcrDegammaFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_YCBCR_DEGAMMA_CREATE_INFO_QCOM:
-            return "VkSamplerYcbcrConversionYcbcrDegammaCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUBIC_CLAMP_FEATURES_QCOM:
-            return "VkPhysicalDeviceCubicClampFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_FEATURES_EXT:
-            return "VkPhysicalDeviceAttachmentFeedbackLoopDynamicStateFeaturesEXT";
-#ifdef VK_USE_PLATFORM_SCREEN_QNX
-        case VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QNX:
-            return "VkScreenBufferPropertiesQNX";
-        case VK_STRUCTURE_TYPE_SCREEN_BUFFER_FORMAT_PROPERTIES_QNX:
-            return "VkScreenBufferFormatPropertiesQNX";
-        case VK_STRUCTURE_TYPE_IMPORT_SCREEN_BUFFER_INFO_QNX:
-            return "VkImportScreenBufferInfoQNX";
-        case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_QNX:
-            return "VkExternalFormatQNX";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_SCREEN_BUFFER_FEATURES_QNX:
-            return "VkPhysicalDeviceExternalMemoryScreenBufferFeaturesQNX";
-#endif  // VK_USE_PLATFORM_SCREEN_QNX
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_DRIVER_PROPERTIES_MSFT:
-            return "VkPhysicalDeviceLayeredDriverPropertiesMSFT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV:
-            return "VkPhysicalDeviceDescriptorPoolOverallocationFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_FEATURES_QCOM:
-            return "VkPhysicalDeviceTileMemoryHeapFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_MEMORY_HEAP_PROPERTIES_QCOM:
-            return "VkPhysicalDeviceTileMemoryHeapPropertiesQCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM:
-            return "VkTileMemoryRequirementsQCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM:
-            return "VkTileMemoryBindInfoQCOM";
-        case VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM:
-            return "VkTileMemorySizeInfoQCOM";
-        case VK_STRUCTURE_TYPE_DECOMPRESS_MEMORY_INFO_EXT:
-            return "VkDecompressMemoryInfoEXT";
-        case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV:
-            return "VkDisplaySurfaceStereoCreateInfoNV";
-        case VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV:
-            return "VkDisplayModeStereoPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV:
-            return "VkPhysicalDeviceRawAccessChainsFeaturesNV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV:
-            return "VkExternalComputeQueueDeviceCreateInfoNV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV:
-            return "VkExternalComputeQueueCreateInfoNV";
-        case VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV:
-            return "VkExternalComputeQueueDataParamsNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV:
-            return "VkPhysicalDeviceExternalComputeQueuePropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV:
-            return "VkPhysicalDeviceCommandBufferInheritanceFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV:
-            return "VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderFloat8FeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV:
-            return "VkPhysicalDeviceRayTracingValidationFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_FEATURES_NV:
-            return "VkPhysicalDeviceClusterAccelerationStructureFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_ACCELERATION_STRUCTURE_PROPERTIES_NV:
-            return "VkPhysicalDeviceClusterAccelerationStructurePropertiesNV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_CLUSTERS_BOTTOM_LEVEL_INPUT_NV:
-            return "VkClusterAccelerationStructureClustersBottomLevelInputNV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_TRIANGLE_CLUSTER_INPUT_NV:
-            return "VkClusterAccelerationStructureTriangleClusterInputNV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_MOVE_OBJECTS_INPUT_NV:
-            return "VkClusterAccelerationStructureMoveObjectsInputNV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_INPUT_INFO_NV:
-            return "VkClusterAccelerationStructureInputInfoNV";
-        case VK_STRUCTURE_TYPE_CLUSTER_ACCELERATION_STRUCTURE_COMMANDS_INFO_NV:
-            return "VkClusterAccelerationStructureCommandsInfoNV";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR:
-            return "VkAccelerationStructureBuildSizesInfoKHR";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CLUSTER_ACCELERATION_STRUCTURE_CREATE_INFO_NV:
-            return "VkRayTracingPipelineClusterAccelerationStructureCreateInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_FEATURES_NV:
-            return "VkPhysicalDevicePartitionedAccelerationStructureFeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PARTITIONED_ACCELERATION_STRUCTURE_PROPERTIES_NV:
-            return "VkPhysicalDevicePartitionedAccelerationStructurePropertiesNV";
-        case VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_FLAGS_NV:
-            return "VkPartitionedAccelerationStructureFlagsNV";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_PARTITIONED_ACCELERATION_STRUCTURE_NV:
-            return "VkWriteDescriptorSetPartitionedAccelerationStructureNV";
-        case VK_STRUCTURE_TYPE_PARTITIONED_ACCELERATION_STRUCTURE_INSTANCES_INPUT_NV:
-            return "VkPartitionedAccelerationStructureInstancesInputNV";
-        case VK_STRUCTURE_TYPE_BUILD_PARTITIONED_ACCELERATION_STRUCTURE_INFO_NV:
-            return "VkBuildPartitionedAccelerationStructureInfoNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_EXT:
-            return "VkPhysicalDeviceDeviceGeneratedCommandsFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_EXT:
-            return "VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_EXT:
-            return "VkGeneratedCommandsMemoryRequirementsInfoEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_PIPELINE_INFO_EXT:
-            return "VkIndirectExecutionSetPipelineInfoEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_LAYOUT_INFO_EXT:
-            return "VkIndirectExecutionSetShaderLayoutInfoEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_SHADER_INFO_EXT:
-            return "VkIndirectExecutionSetShaderInfoEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_EXECUTION_SET_CREATE_INFO_EXT:
-            return "VkIndirectExecutionSetCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_EXT:
-            return "VkGeneratedCommandsInfoEXT";
-        case VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_PIPELINE_EXT:
-            return "VkWriteIndirectExecutionSetPipelineEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_EXT:
-            return "VkIndirectCommandsLayoutTokenEXT";
-        case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_EXT:
-            return "VkIndirectCommandsLayoutCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_PIPELINE_INFO_EXT:
-            return "VkGeneratedCommandsPipelineInfoEXT";
-        case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_SHADER_INFO_EXT:
-            return "VkGeneratedCommandsShaderInfoEXT";
-        case VK_STRUCTURE_TYPE_WRITE_INDIRECT_EXECUTION_SET_SHADER_EXT:
-            return "VkWriteIndirectExecutionSetShaderEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA:
-            return "VkPhysicalDeviceImageAlignmentControlFeaturesMESA";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA:
-            return "VkPhysicalDeviceImageAlignmentControlPropertiesMESA";
-        case VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA:
-            return "VkImageAlignmentControlCreateInfoMESA";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT:
-            return "VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT:
-            return "VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT:
-            return "VkPhysicalDeviceDepthClampControlFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT:
-            return "VkPipelineViewportDepthClampControlCreateInfoEXT";
-#ifdef VK_USE_PLATFORM_OHOS
-        case VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS:
-            return "VkSurfaceCreateInfoOHOS";
-        case VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS:
-            return "VkNativeBufferOHOS";
-        case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS:
-            return "VkSwapchainImageCreateInfoOHOS";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS:
-            return "VkPhysicalDevicePresentationPropertiesOHOS";
-#endif  // VK_USE_PLATFORM_OHOS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI:
-            return "VkPhysicalDeviceHdrVividFeaturesHUAWEI";
-        case VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI:
-            return "VkHdrVividDynamicMetadataHUAWEI";
-        case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_FLEXIBLE_DIMENSIONS_PROPERTIES_NV:
-            return "VkCooperativeMatrixFlexibleDimensionsPropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV:
-            return "VkPhysicalDeviceCooperativeMatrix2FeaturesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_PROPERTIES_NV:
-            return "VkPhysicalDeviceCooperativeMatrix2PropertiesNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_OPACITY_MICROMAP_FEATURES_ARM:
-            return "VkPhysicalDevicePipelineOpacityMicromapFeaturesARM";
-#ifdef VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_IMPORT_MEMORY_METAL_HANDLE_INFO_EXT:
-            return "VkImportMemoryMetalHandleInfoEXT";
-        case VK_STRUCTURE_TYPE_MEMORY_METAL_HANDLE_PROPERTIES_EXT:
-            return "VkMemoryMetalHandlePropertiesEXT";
-        case VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EXT:
-            return "VkMemoryGetMetalHandleInfoEXT";
-#endif  // VK_USE_PLATFORM_METAL_EXT
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM:
-            return "VkPhysicalDevicePerformanceCountersByRegionFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM:
-            return "VkPhysicalDevicePerformanceCountersByRegionPropertiesARM";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM:
-            return "VkPerformanceCounterARM";
-        case VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM:
-            return "VkPerformanceCounterDescriptionARM";
-        case VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM:
-            return "VkRenderPassPerformanceCountersByRegionBeginInfoARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT:
-            return "VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FORMAT_PACK_FEATURES_ARM:
-            return "VkPhysicalDeviceFormatPackFeaturesARM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_FEATURES_VALVE:
-            return "VkPhysicalDeviceFragmentDensityMapLayeredFeaturesVALVE";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_LAYERED_PROPERTIES_VALVE:
-            return "VkPhysicalDeviceFragmentDensityMapLayeredPropertiesVALVE";
-        case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_DENSITY_MAP_LAYERED_CREATE_INFO_VALVE:
-            return "VkPipelineFragmentDensityMapLayeredCreateInfoVALVE";
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_SET_PRESENT_CONFIG_NV:
-            return "VkSetPresentConfigNV";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV:
-            return "VkPhysicalDevicePresentMeteringFeaturesNV";
-#endif  // VK_ENABLE_BETA_EXTENSIONS
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT:
-            return "VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_INDEXING_FEATURES_EXT:
-            return "VkPhysicalDeviceShader64BitIndexingFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT:
-            return "VkPhysicalDeviceCustomResolveFeaturesEXT";
-        case VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT:
-            return "VkBeginCustomResolveInfoEXT";
-        case VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT:
-            return "VkCustomResolveCreateInfoEXT";
-        case VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM:
-            return "VkDataGraphPipelineBuiltinModelCreateInfoQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_QCOM:
-            return "VkPhysicalDeviceDataGraphModelFeaturesQCOM";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC:
-            return "VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_FEATURES_EXT:
-            return "VkPhysicalDeviceShaderUniformBufferUnsizedArrayFeaturesEXT";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR:
-            return "VkAccelerationStructureGeometryTrianglesDataKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR:
-            return "VkAccelerationStructureGeometryAabbsDataKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR:
-            return "VkAccelerationStructureGeometryInstancesDataKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR:
-            return "VkAccelerationStructureGeometryKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR:
-            return "VkAccelerationStructureBuildGeometryInfoKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR:
-            return "VkAccelerationStructureCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR:
-            return "VkWriteDescriptorSetAccelerationStructureKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR:
-            return "VkPhysicalDeviceAccelerationStructureFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR:
-            return "VkPhysicalDeviceAccelerationStructurePropertiesKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR:
-            return "VkAccelerationStructureDeviceAddressInfoKHR";
-        case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_VERSION_INFO_KHR:
-            return "VkAccelerationStructureVersionInfoKHR";
-        case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR:
-            return "VkCopyAccelerationStructureToMemoryInfoKHR";
-        case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR:
-            return "VkCopyMemoryToAccelerationStructureInfoKHR";
-        case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_INFO_KHR:
-            return "VkCopyAccelerationStructureInfoKHR";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR:
-            return "VkRayTracingShaderGroupCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR:
-            return "VkRayTracingPipelineInterfaceCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR:
-            return "VkRayTracingPipelineCreateInfoKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR:
-            return "VkPhysicalDeviceRayTracingPipelineFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR:
-            return "VkPhysicalDeviceRayTracingPipelinePropertiesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR:
-            return "VkPhysicalDeviceRayQueryFeaturesKHR";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_EXT:
-            return "VkPhysicalDeviceMeshShaderFeaturesEXT";
-        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_EXT:
-            return "VkPhysicalDeviceMeshShaderPropertiesEXT";
-        default:
-            return "Unhandled VkStructureType";
-    }
-}
diff --git a/engine/thirdparty/vulkan/vk_mem_alloc.h b/engine/thirdparty/vulkan/vk_mem_alloc.h
index c5b78fa3..c4362098 100644
--- a/engine/thirdparty/vulkan/vk_mem_alloc.h
+++ b/engine/thirdparty/vulkan/vk_mem_alloc.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
 
 /** \mainpage Vulkan Memory Allocator
 
-<b>Version 3.3.0</b>
+<b>Version 3.1.0</b>
 
-Copyright (c) 2017-2025 Advanced Micro Devices, Inc. All rights reserved. \n
+Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All rights reserved. \n
 License: MIT \n
 See also: [product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-memory-allocator/),
 [repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
@@ -37,48 +37,48 @@ See also: [product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-me
 
 <b>General documentation chapters:</b>
 
-- \subpage faq
-- \subpage quick_start
-  - [Project setup](@ref quick_start_project_setup)
-  - [Initialization](@ref quick_start_initialization)
-  - [Resource allocation](@ref quick_start_resource_allocation)
-- \subpage choosing_memory_type
-  - [Usage](@ref choosing_memory_type_usage)
-  - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)
-  - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)
-  - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)
-  - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations)
-- \subpage memory_mapping
-  - [Copy functions](@ref memory_mapping_copy_functions)
-  - [Mapping functions](@ref memory_mapping_mapping_functions)
-  - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)
-  - [Cache flush and invalidate](@ref memory_mapping_cache_control)
-- \subpage staying_within_budget
-  - [Querying for budget](@ref staying_within_budget_querying_for_budget)
-  - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage)
-- \subpage resource_aliasing
-- \subpage custom_memory_pools
-  - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)
-  - [When not to use custom pools](@ref custom_memory_pools_when_not_use)
-  - [Linear allocation algorithm](@ref linear_algorithm)
-    - [Free-at-once](@ref linear_algorithm_free_at_once)
-    - [Stack](@ref linear_algorithm_stack)
-    - [Double stack](@ref linear_algorithm_double_stack)
-    - [Ring buffer](@ref linear_algorithm_ring_buffer)
-- \subpage defragmentation
-- \subpage statistics
-  - [Numeric statistics](@ref statistics_numeric_statistics)
-  - [JSON dump](@ref statistics_json_dump)
-- \subpage allocation_annotation
-  - [Allocation user data](@ref allocation_user_data)
-  - [Allocation names](@ref allocation_names)
-- \subpage virtual_allocator
-- \subpage debugging_memory_usage
-  - [Memory initialization](@ref debugging_memory_usage_initialization)
-  - [Margins](@ref debugging_memory_usage_margins)
-  - [Corruption detection](@ref debugging_memory_usage_corruption_detection)
-  - [Leak detection features](@ref debugging_memory_usage_leak_detection)
-- \subpage other_api_interop
+- <b>User guide</b>
+  - \subpage quick_start
+    - [Project setup](@ref quick_start_project_setup)
+    - [Initialization](@ref quick_start_initialization)
+    - [Resource allocation](@ref quick_start_resource_allocation)
+  - \subpage choosing_memory_type
+    - [Usage](@ref choosing_memory_type_usage)
+    - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)
+    - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)
+    - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)
+    - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations)
+  - \subpage memory_mapping
+    - [Copy functions](@ref memory_mapping_copy_functions)
+    - [Mapping functions](@ref memory_mapping_mapping_functions)
+    - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)
+    - [Cache flush and invalidate](@ref memory_mapping_cache_control)
+  - \subpage staying_within_budget
+    - [Querying for budget](@ref staying_within_budget_querying_for_budget)
+    - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage)
+  - \subpage resource_aliasing
+  - \subpage custom_memory_pools
+    - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)
+    - [When not to use custom pools](@ref custom_memory_pools_when_not_use)
+    - [Linear allocation algorithm](@ref linear_algorithm)
+      - [Free-at-once](@ref linear_algorithm_free_at_once)
+      - [Stack](@ref linear_algorithm_stack)
+      - [Double stack](@ref linear_algorithm_double_stack)
+      - [Ring buffer](@ref linear_algorithm_ring_buffer)
+  - \subpage defragmentation
+  - \subpage statistics
+    - [Numeric statistics](@ref statistics_numeric_statistics)
+    - [JSON dump](@ref statistics_json_dump)
+  - \subpage allocation_annotation
+    - [Allocation user data](@ref allocation_user_data)
+    - [Allocation names](@ref allocation_names)
+  - \subpage virtual_allocator
+  - \subpage debugging_memory_usage
+    - [Memory initialization](@ref debugging_memory_usage_initialization)
+    - [Margins](@ref debugging_memory_usage_margins)
+    - [Corruption detection](@ref debugging_memory_usage_corruption_detection)
+    - [Leak detection features](@ref debugging_memory_usage_leak_detection)
+  - \subpage other_api_interop
 - \subpage usage_patterns
     - [GPU-only resource](@ref usage_patterns_gpu_only)
     - [Staging copy for upload](@ref usage_patterns_staging_copy_upload)
@@ -95,7 +95,6 @@ See also: [product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-me
     - \subpage enabling_buffer_device_address
     - \subpage vk_ext_memory_priority
     - \subpage vk_amd_device_coherent_memory
-    - \subpage vk_khr_external_memory_win32
 - \subpage general_considerations
   - [Thread safety](@ref general_considerations_thread_safety)
   - [Versioning and compatibility](@ref general_considerations_versioning_and_compatibility)
@@ -123,16 +122,15 @@ for user-defined purpose without allocating any real GPU memory.
 See documentation chapter: \ref statistics.
 */
 
-#include <drivers/vulkan/godot_vulkan.h>
+#include "drivers/vulkan/godot_vulkan.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 #if !defined(VMA_VULKAN_VERSION)
-    #if defined(VK_VERSION_1_4)
-        #define VMA_VULKAN_VERSION 1004000
-    #elif defined(VK_VERSION_1_3)
+    #if defined(VK_VERSION_1_3)
         #define VMA_VULKAN_VERSION 1003000
     #elif defined(VK_VERSION_1_2)
         #define VMA_VULKAN_VERSION 1002000
@@ -242,15 +240,6 @@ extern "C" {
     #endif
 #endif
 
-// Defined to 1 when VK_KHR_external_memory_win32 device extension is defined in Vulkan headers.
-#if !defined(VMA_EXTERNAL_MEMORY_WIN32)
-    #if VK_KHR_external_memory_win32
-        #define VMA_EXTERNAL_MEMORY_WIN32 1
-    #else
-        #define VMA_EXTERNAL_MEMORY_WIN32 0
-    #endif
-#endif
-
 // Define these macros to decorate all public functions with additional code,
 // before and after returned type, appropriately. This may be useful for
 // exporting the functions when compiling VMA as a separate library. Example:
@@ -470,15 +459,6 @@ typedef enum VmaAllocatorCreateFlagBits
     */
     VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT = 0x00000100,
 
-    /**
-    Enables usage of VK_KHR_external_memory_win32 extension in the library.
-
-    You should set this flag if you found available and enabled this device extension,
-    while creating Vulkan device passed as VmaAllocatorCreateInfo::device.
-    For more information, see \ref vk_khr_external_memory_win32.
-    */
-    VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT = 0x00000200,
-
     VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
 } VmaAllocatorCreateFlagBits;
 /// See #VmaAllocatorCreateFlagBits.
@@ -1053,11 +1033,6 @@ typedef struct VmaVulkanFunctions
     /// Fetch from "vkGetDeviceImageMemoryRequirements" on Vulkan >= 1.3, but you can also fetch it from "vkGetDeviceImageMemoryRequirementsKHR" if you enabled extension VK_KHR_maintenance4.
     PFN_vkGetDeviceImageMemoryRequirementsKHR VMA_NULLABLE vkGetDeviceImageMemoryRequirements;
 #endif
-#if VMA_EXTERNAL_MEMORY_WIN32
-    PFN_vkGetMemoryWin32HandleKHR VMA_NULLABLE vkGetMemoryWin32HandleKHR;
-#else
-    void* VMA_NULLABLE vkGetMemoryWin32HandleKHR;
-#endif
 } VmaVulkanFunctions;
 
 /// Description of a Allocator to be created.
@@ -1120,7 +1095,7 @@ typedef struct VmaAllocatorCreateInfo
 
     It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`.
     The patch version number specified is ignored. Only the major and minor versions are considered.
-    Only versions 1.0...1.4 are supported by the current implementation.
+    Only versions 1.0, 1.1, 1.2, 1.3 are supported by the current implementation.
     Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`.
     It must match the Vulkan version used by the application and supported on the selected physical device,
     so it must be no higher than `VkApplicationInfo::apiVersion` passed to `vkCreateInstance`
@@ -1666,62 +1641,6 @@ typedef struct VmaVirtualAllocationInfo
 @{
 */
 
-#ifdef VOLK_HEADER_VERSION
-/** \brief Fully initializes `pDstVulkanFunctions` structure with Vulkan functions needed by VMA
-using [volk library](https://github.com/zeux/volk).
-
-This function is defined in VMA header only if "volk.h" was included before it.
-
-To use this function properly:
-
--# Initialize volk and Vulkan:
-   -# Call `volkInitialize()`
-   -# Create `VkInstance` object
-   -# Call `volkLoadInstance()`
-   -# Create `VkDevice` object
-   -# Call `volkLoadDevice()`
--# Fill in structure #VmaAllocatorCreateInfo, especially members:
-   - VmaAllocatorCreateInfo::device
-   - VmaAllocatorCreateInfo::vulkanApiVersion
-   - VmaAllocatorCreateInfo::flags - set appropriate flags for the Vulkan extensions you enabled
--# Create an instance of the #VmaVulkanFunctions structure.
--# Call vmaImportVulkanFunctionsFromVolk().
-   Parameter `pAllocatorCreateInfo` is read to find out which functions should be fetched for
-   appropriate Vulkan version and extensions.
-   Parameter `pDstVulkanFunctions` is filled with those function pointers, or null if not applicable.
--# Attach the #VmaVulkanFunctions structure to VmaAllocatorCreateInfo::pVulkanFunctions.
--# Call vmaCreateAllocator() to create the #VmaAllocator object.
-
-Example:
-
-\code
-VmaAllocatorCreateInfo allocatorCreateInfo = {};
-allocatorCreateInfo.physicalDevice = myPhysicalDevice;
-allocatorCreateInfo.device = myDevice;
-allocatorCreateInfo.instance = myInstance;
-allocatorCreateInfo.vulkanApiVersion = VK_API_VERSION_1_3;
-allocatorCreateInfo.flags = VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT |
-    VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT |
-    VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT;
-
-VmaVulkanFunctions vulkanFunctions;
-VkResult res = vmaImportVulkanFunctionsFromVolk(&allocatorCreateInfo, &vulkanFunctions);
-// Check res...
-allocatorCreateInfo.pVulkanFunctions = &vulkanFunctions;
-
-VmaAllocator allocator;
-res = vmaCreateAllocator(&allocatorCreateInfo, &allocator);
-// Check res...
-\endcode
-
-Internally in this function, pointers to functions related to the entire Vulkan instance are fetched using global function definitions,
-while pointers to functions related to the Vulkan device are fetched using `volkLoadDeviceTable()` for given `pAllocatorCreateInfo->device`.
- */
-VMA_CALL_PRE VkResult VMA_CALL_POST vmaImportVulkanFunctionsFromVolk(
-    const VmaAllocatorCreateInfo* VMA_NOT_NULL pAllocatorCreateInfo,
-    VmaVulkanFunctions* VMA_NOT_NULL pDstVulkanFunctions);
-#endif
-
 /// Creates #VmaAllocator object.
 VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(
     const VmaAllocatorCreateInfo* VMA_NOT_NULL pCreateInfo,
@@ -1904,9 +1823,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(
 \param allocator Allocator object.
 \param pool Pool object.
 \param[out] pPoolStats Statistics of specified pool.
-
-Note that when using the pool from multiple threads, returned information may immediately
-become outdated.
 */
 VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(
     VmaAllocator VMA_NOT_NULL allocator,
@@ -2065,7 +1981,7 @@ Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just sk
 */
 VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(
     VmaAllocator VMA_NOT_NULL allocator,
-    VmaAllocation VMA_NULLABLE allocation);
+    const VmaAllocation VMA_NULLABLE allocation);
 
 /** \brief Frees memory and destroys multiple allocations.
 
@@ -2147,40 +2063,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties(
     VmaAllocation VMA_NOT_NULL allocation,
     VkMemoryPropertyFlags* VMA_NOT_NULL pFlags);
 
-
-#if VMA_EXTERNAL_MEMORY_WIN32
-/**
-\brief Given an allocation, returns Win32 handle that may be imported by other processes or APIs.
-
-\param hTargetProcess Must be a valid handle to target process or null. If it's null, the function returns
-    handle for the current process.
-\param[out] pHandle Output parameter that returns the handle.
-
-The function fills `pHandle` with handle that can be used in target process.
-The handle is fetched using function `vkGetMemoryWin32HandleKHR`.
-When no longer needed, you must close it using:
-
-\code
-CloseHandle(handle);
-\endcode
-
-You can close it any time, before or after destroying the allocation object.
-It is reference-counted internally by Windows.
-
-Note the handle is returned for the entire `VkDeviceMemory` block that the allocation belongs to.
-If the allocation is sub-allocated from a larger block, you may need to consider the offset of the allocation
-(VmaAllocationInfo::offset).
-
-If the function fails with `VK_ERROR_FEATURE_NOT_PRESENT` error code, please double-check
-that VmaVulkanFunctions::vkGetMemoryWin32HandleKHR function pointer is set, e.g. either by using `VMA_DYNAMIC_VULKAN_FUNCTIONS`
-or by manually passing it through VmaAllocatorCreateInfo::pVulkanFunctions.
-
-For more information, see chapter \ref vk_khr_external_memory_win32.
-*/
-VMA_CALL_PRE VkResult VMA_CALL_POST vmaGetMemoryWin32Handle(VmaAllocator VMA_NOT_NULL allocator,
-    VmaAllocation VMA_NOT_NULL allocation, HANDLE hTargetProcess, HANDLE* VMA_NOT_NULL pHandle);
-#endif // VMA_EXTERNAL_MEMORY_WIN32
-
 /** \brief Maps memory represented by given allocation and returns pointer to it.
 
 Maps memory represented by given allocation to make it accessible to CPU code.
@@ -3200,7 +3082,7 @@ static void vma_aligned_free(void* VMA_NULLABLE ptr)
     {
     VMA_CLASS_NO_COPY_NO_MOVE(VmaMutex)
     public:
-        VmaMutex() = default;
+        VmaMutex() { }
         void Lock() { m_Mutex.lock(); }
         void Unlock() { m_Mutex.unlock(); }
         bool TryLock() { return m_Mutex.try_lock(); }
@@ -3228,7 +3110,7 @@ static void vma_aligned_free(void* VMA_NULLABLE ptr)
             std::shared_mutex m_Mutex;
         };
         #define VMA_RW_MUTEX VmaRWMutex
-    #elif defined(_WIN32) && defined(WINVER) && defined(SRWLOCK_INIT) && WINVER >= 0x0600
+    #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600
         // Use SRWLOCK from WinAPI.
         // Minimum supported client = Windows Vista, server = Windows Server 2008.
         class VmaRWMutex
@@ -3342,28 +3224,17 @@ If providing your own implementation, you need to implement a subset of std::ato
     Set this to 1 to make VMA never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount
     and return error instead of leaving up to Vulkan implementation what to do in such cases.
     */
-    #define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (1)
-#endif
-
-#ifndef VMA_DEBUG_DONT_EXCEED_HEAP_SIZE_WITH_ALLOCATION_SIZE
-    /*
-    Set this to 1 to make VMA never exceed VkPhysicalDeviceMemoryProperties::memoryHeaps[i].size
-    with a single allocation size VkMemoryAllocateInfo::allocationSize
-    and return error instead of leaving up to Vulkan implementation what to do in such cases.
-    It protects agaist validation error VUID-vkAllocateMemory-pAllocateInfo-01713.
-    On the other hand, allowing exceeding this size may result in a successful allocation despite the validation error.
-    */
-    #define VMA_DEBUG_DONT_EXCEED_HEAP_SIZE_WITH_ALLOCATION_SIZE (1)
+    #define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (0)
 #endif
 
 #ifndef VMA_SMALL_HEAP_MAX_SIZE
    /// Maximum size of a memory heap in Vulkan to consider it "small".
-   #define VMA_SMALL_HEAP_MAX_SIZE (1024ULL * 1024 * 1024)
+   #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024)
 #endif
 
 #ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE
    /// Default size of a block allocated as single VkDeviceMemory from a "large" heap.
-   #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ULL * 1024 * 1024)
+   #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024)
 #endif
 
 /*
@@ -3399,7 +3270,7 @@ static const uint32_t VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY = 0x000000
 static const uint32_t VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY = 0x00020000;
 static const uint32_t VK_IMAGE_CREATE_DISJOINT_BIT_COPY = 0x00000200;
 static const int32_t VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY = 1000158000;
-static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000U;
+static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;
 static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32;
 static const uint32_t VMA_VENDOR_ID_AMD = 4098;
 
@@ -3411,7 +3282,7 @@ static const uint32_t VMA_VENDOR_ID_AMD = 4098;
 
 #if VMA_STATS_STRING_ENABLED
 // Correspond to values of enum VmaSuballocationType.
-static const char* const VMA_SUBALLOCATION_TYPE_NAMES[] =
+static const char* VMA_SUBALLOCATION_TYPE_NAMES[] =
 {
     "FREE",
     "UNKNOWN",
@@ -3422,7 +3293,7 @@ static const char* const VMA_SUBALLOCATION_TYPE_NAMES[] =
 };
 #endif
 
-static const VkAllocationCallbacks VmaEmptyAllocationCallbacks =
+static VkAllocationCallbacks VmaEmptyAllocationCallbacks =
     { VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL };
 
 
@@ -3563,7 +3434,7 @@ static inline uint8_t VmaBitScanLSB(uint64_t mask)
         return static_cast<uint8_t>(pos);
     return UINT8_MAX;
 #elif VMA_CPP20
-    if(mask != 0)
+    if(mask)
         return static_cast<uint8_t>(std::countr_zero(mask));
     return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
@@ -3589,7 +3460,7 @@ static inline uint8_t VmaBitScanLSB(uint32_t mask)
         return static_cast<uint8_t>(pos);
     return UINT8_MAX;
 #elif VMA_CPP20
-    if(mask != 0)
+    if(mask)
         return static_cast<uint8_t>(std::countr_zero(mask));
     return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
@@ -3614,10 +3485,10 @@ static inline uint8_t VmaBitScanMSB(uint64_t mask)
     if (_BitScanReverse64(&pos, mask))
         return static_cast<uint8_t>(pos);
 #elif VMA_CPP20
-    if(mask != 0)
+    if(mask)
         return 63 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
-    if (mask != 0)
+    if (mask)
         return 63 - static_cast<uint8_t>(__builtin_clzll(mask));
 #else
     uint8_t pos = 63;
@@ -3639,10 +3510,10 @@ static inline uint8_t VmaBitScanMSB(uint32_t mask)
     if (_BitScanReverse(&pos, mask))
         return static_cast<uint8_t>(pos);
 #elif VMA_CPP20
-    if(mask != 0)
+    if(mask)
         return 31 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
-    if (mask != 0)
+    if (mask)
         return 31 - static_cast<uint8_t>(__builtin_clz(mask));
 #else
     uint8_t pos = 31;
@@ -3872,8 +3743,7 @@ new element with value (key) should be inserted.
 template <typename CmpLess, typename IterT, typename KeyT>
 static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp)
 {
-    size_t down = 0;
-    size_t up = size_t(end - beg);
+    size_t down = 0, up = size_t(end - beg);
     while (down < up)
     {
         const size_t mid = down + (up - down) / 2;  // Overflow-safe midpoint calculation
@@ -3981,6 +3851,12 @@ struct VmaBufferImageUsage
 
 const VmaBufferImageUsage VmaBufferImageUsage::UNKNOWN = VmaBufferImageUsage(0);
 
+static void swap(VmaBufferImageUsage& lhs, VmaBufferImageUsage& rhs) noexcept
+{
+    using std::swap;
+    swap(lhs.Value, rhs.Value);
+}
+
 VmaBufferImageUsage::VmaBufferImageUsage(const VkBufferCreateInfo &createInfo,
     bool useKhrMaintenance5)
 {
@@ -3992,7 +3868,7 @@ VmaBufferImageUsage::VmaBufferImageUsage(const VkBufferCreateInfo &createInfo,
         // of the VK_KHR_maintenance5 extension.
         const VkBufferUsageFlags2CreateInfoKHR* const usageFlags2 =
             VmaPnextChainFind<VkBufferUsageFlags2CreateInfoKHR>(&createInfo, VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR);
-        if(usageFlags2 != VMA_NULL)
+        if(usageFlags2)
         {
             this->Value = usageFlags2->usage;
             return;
@@ -4004,10 +3880,11 @@ VmaBufferImageUsage::VmaBufferImageUsage(const VkBufferCreateInfo &createInfo,
 }
 
 VmaBufferImageUsage::VmaBufferImageUsage(const VkImageCreateInfo &createInfo)
-    : Value((BaseType)createInfo.usage)
 {
     // Maybe in the future there will be VK_KHR_maintenanceN extension with structure
     // VkImageUsageFlags2CreateInfoKHR, like the one for buffers...
+
+    this->Value = (BaseType)createInfo.usage;
 }
 
 // This is the main algorithm that guides the selection of a memory type best for an allocation -
@@ -4360,7 +4237,7 @@ struct VmaMutexLock
 {
     VMA_CLASS_NO_COPY_NO_MOVE(VmaMutexLock)
 public:
-    explicit VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) :
+    VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) :
         m_pMutex(useMutex ? &mutex : VMA_NULL)
     {
         if (m_pMutex) { m_pMutex->Lock(); }
@@ -4445,9 +4322,9 @@ struct VmaStlAllocator
     const VkAllocationCallbacks* const m_pCallbacks;
     typedef T value_type;
 
-    explicit VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {}
+    VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {}
     template<typename U>
-    explicit VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) {}
+    VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) {}
     VmaStlAllocator(const VmaStlAllocator&) = default;
     VmaStlAllocator& operator=(const VmaStlAllocator&) = delete;
 
@@ -4479,7 +4356,7 @@ public:
     typedef T* iterator;
     typedef const T* const_iterator;
 
-    explicit VmaVector(const AllocatorT& allocator);
+    VmaVector(const AllocatorT& allocator);
     VmaVector(size_t count, const AllocatorT& allocator);
     // This version of the constructor is here for compatibility with pre-C++14 std::vector.
     // value is unused.
@@ -4695,10 +4572,10 @@ public:
     typedef T value_type;
     typedef T* iterator;
 
-    explicit VmaSmallVector(const AllocatorT& allocator);
+    VmaSmallVector(const AllocatorT& allocator);
     VmaSmallVector(size_t count, const AllocatorT& allocator);
     template<typename SrcT, typename SrcAllocatorT, size_t SrcN>
-    explicit VmaSmallVector(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;
+    VmaSmallVector(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;
     template<typename SrcT, typename SrcAllocatorT, size_t SrcN>
     VmaSmallVector<T, AllocatorT, N>& operator=(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;
     ~VmaSmallVector() = default;
@@ -4925,7 +4802,7 @@ void VmaPoolAllocator<T>::Free(T* ptr)
         ItemBlock& block = m_ItemBlocks[i];
 
         // Casting to union.
-        Item* pItemPtr = VMA_NULL;
+        Item* pItemPtr;
         memcpy(&pItemPtr, &ptr, sizeof(pItemPtr));
 
         // Check if pItemPtr is in address range of this block.
@@ -4982,7 +4859,7 @@ class VmaRawList
 public:
     typedef VmaListItem<T> ItemType;
 
-    explicit VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);
+    VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);
     // Intentionally not calling Clear, because that would be unnecessary
     // computations to return all items to m_ItemAllocator as free.
     ~VmaRawList() = default;
@@ -5122,7 +4999,7 @@ void VmaRawList<T>::PopBack()
 template<typename T>
 void VmaRawList<T>::Clear()
 {
-    if (!IsEmpty())
+    if (IsEmpty() == false)
     {
         ItemType* pItem = m_pBack;
         while (pItem != VMA_NULL)
@@ -5189,7 +5066,8 @@ VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem)
         ++m_Count;
         return newItem;
     }
-    return PushBack();
+    else
+        return PushBack();
 }
 
 template<typename T>
@@ -5214,7 +5092,8 @@ VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem)
         ++m_Count;
         return newItem;
     }
-    return PushFront();
+    else
+        return PushFront();
 }
 
 template<typename T>
@@ -5251,7 +5130,7 @@ public:
         friend class VmaList<T, AllocatorT>;
     public:
         iterator() :  m_pList(VMA_NULL), m_pItem(VMA_NULL) {}
-        explicit iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
 
         T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }
         T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }
@@ -5259,8 +5138,8 @@ public:
         bool operator==(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }
         bool operator!=(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }
 
-        const iterator operator++(int) { iterator result = *this; ++*this; return result; }
-        const iterator operator--(int) { iterator result = *this; --*this; return result; }
+        iterator operator++(int) { iterator result = *this; ++*this; return result; }
+        iterator operator--(int) { iterator result = *this; --*this; return result; }
 
         iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }
         iterator& operator--();
@@ -5277,7 +5156,7 @@ public:
         friend class VmaList<T, AllocatorT>;
     public:
         reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}
-        explicit reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
 
         T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }
         T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }
@@ -5285,8 +5164,8 @@ public:
         bool operator==(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }
         bool operator!=(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }
 
-        const reverse_iterator operator++(int) { reverse_iterator result = *this; ++* this; return result; }
-        const reverse_iterator operator--(int) { reverse_iterator result = *this; --* this; return result; }
+        reverse_iterator operator++(int) { reverse_iterator result = *this; ++* this; return result; }
+        reverse_iterator operator--(int) { reverse_iterator result = *this; --* this; return result; }
 
         reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }
         reverse_iterator& operator--();
@@ -5302,8 +5181,8 @@ public:
         friend class VmaList<T, AllocatorT>;
     public:
         const_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}
-        explicit const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
-        explicit const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
 
         iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }
 
@@ -5313,8 +5192,8 @@ public:
         bool operator==(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }
         bool operator!=(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }
 
-        const const_iterator operator++(int) { const_iterator result = *this; ++* this; return result; }
-        const const_iterator operator--(int) { const_iterator result = *this; --* this; return result; }
+        const_iterator operator++(int) { const_iterator result = *this; ++* this; return result; }
+        const_iterator operator--(int) { const_iterator result = *this; --* this; return result; }
 
         const_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }
         const_iterator& operator--();
@@ -5330,8 +5209,8 @@ public:
         friend class VmaList<T, AllocatorT>;
     public:
         const_reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}
-        explicit const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
-        explicit const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
+        const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}
 
         reverse_iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }
 
@@ -5341,8 +5220,8 @@ public:
         bool operator==(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }
         bool operator!=(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }
 
-        const const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++* this; return result; }
-        const const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --* this; return result; }
+        const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++* this; return result; }
+        const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --* this; return result; }
 
         const_reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }
         const_reverse_iterator& operator--();
@@ -5354,7 +5233,7 @@ public:
         const_reverse_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}
     };
 
-    explicit VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {}
+    VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {}
 
     bool empty() const { return m_RawList.IsEmpty(); }
     size_t size() const { return m_RawList.GetCount(); }
@@ -5472,9 +5351,9 @@ public:
 
     // Movable, not copyable.
     VmaIntrusiveLinkedList() = default;
-    VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src) noexcept;
+    VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src);
     VmaIntrusiveLinkedList(const VmaIntrusiveLinkedList&) = delete;
-    VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src) noexcept;
+    VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src);
     VmaIntrusiveLinkedList& operator=(const VmaIntrusiveLinkedList&) = delete;
     ~VmaIntrusiveLinkedList() { VMA_HEAVY_ASSERT(IsEmpty()); }
 
@@ -5505,7 +5384,7 @@ private:
 
 #ifndef _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS
 template<typename ItemTypeTraits>
-VmaIntrusiveLinkedList<ItemTypeTraits>::VmaIntrusiveLinkedList(VmaIntrusiveLinkedList&& src) noexcept
+VmaIntrusiveLinkedList<ItemTypeTraits>::VmaIntrusiveLinkedList(VmaIntrusiveLinkedList&& src)
     : m_Front(src.m_Front), m_Back(src.m_Back), m_Count(src.m_Count)
 {
     src.m_Front = src.m_Back = VMA_NULL;
@@ -5513,7 +5392,7 @@ VmaIntrusiveLinkedList<ItemTypeTraits>::VmaIntrusiveLinkedList(VmaIntrusiveLinke
 }
 
 template<typename ItemTypeTraits>
-VmaIntrusiveLinkedList<ItemTypeTraits>& VmaIntrusiveLinkedList<ItemTypeTraits>::operator=(VmaIntrusiveLinkedList&& src) noexcept
+VmaIntrusiveLinkedList<ItemTypeTraits>& VmaIntrusiveLinkedList<ItemTypeTraits>::operator=(VmaIntrusiveLinkedList&& src)
 {
     if (&src != this)
     {
@@ -5702,11 +5581,10 @@ void VmaIntrusiveLinkedList<ItemTypeTraits>::RemoveAll()
 class VmaStringBuilder
 {
 public:
-    explicit VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator<char>(allocationCallbacks)) {}
+    VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator<char>(allocationCallbacks)) {}
     ~VmaStringBuilder() = default;
 
     size_t GetLength() const { return m_Data.size(); }
-    // Returned string is not null-terminated!
     const char* GetData() const { return m_Data.data(); }
     void AddNewLine() { Add('\n'); }
     void Add(char ch) { m_Data.push_back(ch); }
@@ -6208,84 +6086,6 @@ private:
 
 #endif // _VMA_MAPPING_HYSTERESIS
 
-#if VMA_EXTERNAL_MEMORY_WIN32
-class VmaWin32Handle
-{
-public:
-    VmaWin32Handle() noexcept : m_hHandle(VMA_NULL) { }
-    explicit VmaWin32Handle(HANDLE hHandle) noexcept : m_hHandle(hHandle) { }
-    ~VmaWin32Handle() noexcept { if (m_hHandle != VMA_NULL) { ::CloseHandle(m_hHandle); } }
-    VMA_CLASS_NO_COPY_NO_MOVE(VmaWin32Handle)
-
-public:
-    // Strengthened
-    VkResult GetHandle(VkDevice device, VkDeviceMemory memory, PFN_vkGetMemoryWin32HandleKHR pvkGetMemoryWin32HandleKHR, HANDLE hTargetProcess, bool useMutex, HANDLE* pHandle) noexcept
-    {
-        *pHandle = VMA_NULL;
-        // Try to get handle first.
-        if (m_hHandle != VMA_NULL)
-        {
-            *pHandle = Duplicate(hTargetProcess);
-            return VK_SUCCESS;
-        }
-
-        VkResult res = VK_SUCCESS;
-        // If failed, try to create it.
-        {
-            VmaMutexLockWrite lock(m_Mutex, useMutex);
-            if (m_hHandle == VMA_NULL)
-            {
-                res = Create(device, memory, pvkGetMemoryWin32HandleKHR, &m_hHandle);
-            }
-        }
-
-        *pHandle = Duplicate(hTargetProcess);
-        return res;
-    }
-
-    operator bool() const noexcept { return m_hHandle != VMA_NULL; }
-private:
-    // Not atomic
-    static VkResult Create(VkDevice device, VkDeviceMemory memory, PFN_vkGetMemoryWin32HandleKHR pvkGetMemoryWin32HandleKHR, HANDLE* pHandle) noexcept
-    {
-        VkResult res = VK_ERROR_FEATURE_NOT_PRESENT;
-        if (pvkGetMemoryWin32HandleKHR != VMA_NULL)
-        {
-            VkMemoryGetWin32HandleInfoKHR handleInfo{ };
-            handleInfo.sType = VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR;
-            handleInfo.memory = memory;
-            handleInfo.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR;
-            res = pvkGetMemoryWin32HandleKHR(device, &handleInfo, pHandle);
-        }
-        return res;
-    }
-    HANDLE Duplicate(HANDLE hTargetProcess = VMA_NULL) const noexcept
-    {
-        if (!m_hHandle)
-            return m_hHandle;
-
-        HANDLE hCurrentProcess = ::GetCurrentProcess();
-        HANDLE hDupHandle = VMA_NULL;
-        if (!::DuplicateHandle(hCurrentProcess, m_hHandle, hTargetProcess ? hTargetProcess : hCurrentProcess, &hDupHandle, 0, FALSE, DUPLICATE_SAME_ACCESS))
-        {
-            VMA_ASSERT(0 && "Failed to duplicate handle.");
-        }
-        return hDupHandle;
-    }
-private:
-    HANDLE m_hHandle;
-    VMA_RW_MUTEX m_Mutex; // Protects access m_Handle
-};
-#else 
-class VmaWin32Handle
-{
-    // ABI compatibility
-    void* placeholder = VMA_NULL;
-    VMA_RW_MUTEX placeholder2;
-};
-#endif // VMA_EXTERNAL_MEMORY_WIN32
-
-
 #ifndef _VMA_DEVICE_MEMORY_BLOCK
 /*
 Represents a single block of device memory (`VkDeviceMemory`) with all the
@@ -6301,7 +6101,7 @@ class VmaDeviceMemoryBlock
 public:
     VmaBlockMetadata* m_pMetadata;
 
-    explicit VmaDeviceMemoryBlock(VmaAllocator hAllocator);
+    VmaDeviceMemoryBlock(VmaAllocator hAllocator);
     ~VmaDeviceMemoryBlock();
 
     // Always call after construction.
@@ -6341,24 +6141,18 @@ public:
     VkResult ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);
 
     VkResult BindBufferMemory(
-        VmaAllocator hAllocator,
-        VmaAllocation hAllocation,
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
         VkDeviceSize allocationLocalOffset,
         VkBuffer hBuffer,
         const void* pNext);
     VkResult BindImageMemory(
-        VmaAllocator hAllocator,
-        VmaAllocation hAllocation,
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
         VkDeviceSize allocationLocalOffset,
         VkImage hImage,
         const void* pNext);
-#if VMA_EXTERNAL_MEMORY_WIN32
-    VkResult CreateWin32Handle(
-        const VmaAllocator hAllocator,
-        PFN_vkGetMemoryWin32HandleKHR pvkGetMemoryWin32HandleKHR,
-        HANDLE hTargetProcess,
-        HANDLE* pHandle)noexcept;
-#endif // VMA_EXTERNAL_MEMORY_WIN32
+
 private:
     VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool.
     uint32_t m_MemoryTypeIndex;
@@ -6374,18 +6168,10 @@ private:
     VmaMappingHysteresis m_MappingHysteresis;
     uint32_t m_MapCount;
     void* m_pMappedData;
-
-    VmaWin32Handle m_Handle;
 };
 #endif // _VMA_DEVICE_MEMORY_BLOCK
 
 #ifndef _VMA_ALLOCATION_T
-struct VmaAllocationExtraData
-{
-    void* m_pMappedData = VMA_NULL; // Not null means memory is mapped.
-    VmaWin32Handle m_Handle;
-};
-
 struct VmaAllocation_T
 {
     friend struct VmaDedicatedAllocationListItemTraits;
@@ -6405,7 +6191,7 @@ public:
     };
 
     // This struct is allocated using VmaPoolAllocator.
-    explicit VmaAllocation_T(bool mappingAllowed);
+    VmaAllocation_T(bool mappingAllowed);
     ~VmaAllocation_T();
 
     void InitBlockAllocation(
@@ -6418,14 +6204,12 @@ public:
         bool mapped);
     // pMappedData not null means allocation is created with MAPPED flag.
     void InitDedicatedAllocation(
-        VmaAllocator allocator,
         VmaPool hParentPool,
         uint32_t memoryTypeIndex,
         VkDeviceMemory hMemory,
         VmaSuballocationType suballocationType,
         void* pMappedData,
         VkDeviceSize size);
-    void Destroy(VmaAllocator allocator);
 
     ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; }
     VkDeviceSize GetAlignment() const { return m_Alignment; }
@@ -6469,10 +6253,6 @@ public:
     void PrintParameters(class VmaJsonWriter& json) const;
 #endif
 
-#if VMA_EXTERNAL_MEMORY_WIN32
-    VkResult GetWin32Handle(VmaAllocator hAllocator, HANDLE hTargetProcess, HANDLE* hHandle) noexcept;
-#endif // VMA_EXTERNAL_MEMORY_WIN32
-
 private:
     // Allocation out of VmaDeviceMemoryBlock.
     struct BlockAllocation
@@ -6485,7 +6265,7 @@ private:
     {
         VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool.
         VkDeviceMemory m_hMemory;
-        VmaAllocationExtraData* m_ExtraData;
+        void* m_pMappedData; // Not null means memory is mapped.
         VmaAllocation_T* m_Prev;
         VmaAllocation_T* m_Next;
     };
@@ -6510,8 +6290,6 @@ private:
 #if VMA_STATS_STRING_ENABLED
     VmaBufferImageUsage m_BufferImageUsage; // 0 if unknown.
 #endif
-
-    void EnsureExtraData(VmaAllocator hAllocator);
 };
 #endif // _VMA_ALLOCATION_T
 
@@ -6552,7 +6330,7 @@ class VmaDedicatedAllocationList
 {
     VMA_CLASS_NO_COPY_NO_MOVE(VmaDedicatedAllocationList)
 public:
-    VmaDedicatedAllocationList() = default;
+    VmaDedicatedAllocationList() {}
     ~VmaDedicatedAllocationList();
 
     void Init(bool useMutex) { m_UseMutex = useMutex; }
@@ -6814,10 +6592,10 @@ protected:
         size_t unusedRangeCount) const;
     void PrintDetailedMap_Allocation(class VmaJsonWriter& json,
         VkDeviceSize offset, VkDeviceSize size, void* userData) const;
-    static void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
+    void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
         VkDeviceSize offset,
-        VkDeviceSize size);
-    static void PrintDetailedMap_End(class VmaJsonWriter& json);
+        VkDeviceSize size) const;
+    void PrintDetailedMap_End(class VmaJsonWriter& json) const;
 #endif
 
 private:
@@ -6912,7 +6690,7 @@ void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json,
 }
 
 void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
-    VkDeviceSize offset, VkDeviceSize size)
+    VkDeviceSize offset, VkDeviceSize size) const
 {
     json.BeginObject(true);
 
@@ -6928,7 +6706,7 @@ void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
     json.EndObject();
 }
 
-void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json)
+void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const
 {
     json.EndArray();
 }
@@ -6947,7 +6725,7 @@ public:
         uint16_t* pageAllocs;
     };
 
-    explicit VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity);
+    VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity);
     ~VmaBlockBufferImageGranularity();
 
     bool IsEnabled() const { return m_BufferImageGranularity > MAX_LOW_BUFFER_IMAGE_GRANULARITY; }
@@ -6992,7 +6770,7 @@ private:
     uint32_t GetEndPage(VkDeviceSize offset, VkDeviceSize size) const { return OffsetToPageIndex((offset + size - 1) & ~(m_BufferImageGranularity - 1)); }
 
     uint32_t OffsetToPageIndex(VkDeviceSize offset) const;
-    static void AllocPage(RegionInfo& page, uint8_t allocType);
+    void AllocPage(RegionInfo& page, uint8_t allocType);
 };
 
 #ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS
@@ -7256,7 +7034,7 @@ class VmaBlockMetadata_Linear : public VmaBlockMetadata
 public:
     VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks,
         VkDeviceSize bufferImageGranularity, bool isVirtual);
-    ~VmaBlockMetadata_Linear() override = default;
+    virtual ~VmaBlockMetadata_Linear() = default;
 
     VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }
     bool IsEmpty() const override { return GetAllocationCount() == 0; }
@@ -8871,7 +8649,7 @@ class VmaBlockMetadata_TLSF : public VmaBlockMetadata
 public:
     VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks,
         VkDeviceSize bufferImageGranularity, bool isVirtual);
-    ~VmaBlockMetadata_TLSF() override;
+    virtual ~VmaBlockMetadata_TLSF();
 
     size_t GetAllocationCount() const override { return m_AllocCount; }
     size_t GetFreeRegionsCount() const override { return m_BlocksFreeCount + 1; }
@@ -8965,7 +8743,7 @@ private:
     Block* m_NullBlock;
     VmaBlockBufferImageGranularity m_GranularityHandler;
 
-    static uint8_t SizeToMemoryClass(VkDeviceSize size);
+    uint8_t SizeToMemoryClass(VkDeviceSize size) const;
     uint16_t SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const;
     uint32_t GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const;
     uint32_t GetListIndex(VkDeviceSize size) const;
@@ -9222,7 +9000,7 @@ bool VmaBlockMetadata_TLSF::CreateAllocationRequest(
 
     // Round up to the next block
     VkDeviceSize sizeForNextList = allocSize;
-    VkDeviceSize smallSizeStep = VkDeviceSize(SMALL_BUFFER_SIZE / (IsVirtual() ? 1U << SECOND_LEVEL_INDEX : 4U));
+    VkDeviceSize smallSizeStep = VkDeviceSize(SMALL_BUFFER_SIZE / (IsVirtual() ? 1 << SECOND_LEVEL_INDEX : 4));
     if (allocSize > SMALL_BUFFER_SIZE)
     {
         sizeForNextList += (1ULL << (VMA_BITSCAN_MSB(allocSize) - SECOND_LEVEL_INDEX));
@@ -9392,10 +9170,10 @@ void VmaBlockMetadata_TLSF::Alloc(
         RemoveFreeBlock(currentBlock);
 
     VkDeviceSize debugMargin = GetDebugMargin();
-    VkDeviceSize missingAlignment = offset - currentBlock->offset;
+    VkDeviceSize misssingAlignment = offset - currentBlock->offset;
 
     // Append missing alignment to prev block or create new one
-    if (missingAlignment)
+    if (misssingAlignment)
     {
         Block* prevBlock = currentBlock->prevPhysical;
         VMA_ASSERT(prevBlock != VMA_NULL && "There should be no missing alignment at offset 0!");
@@ -9403,17 +9181,17 @@ void VmaBlockMetadata_TLSF::Alloc(
         if (prevBlock->IsFree() && prevBlock->size != debugMargin)
         {
             uint32_t oldList = GetListIndex(prevBlock->size);
-            prevBlock->size += missingAlignment;
+            prevBlock->size += misssingAlignment;
             // Check if new size crosses list bucket
             if (oldList != GetListIndex(prevBlock->size))
             {
-                prevBlock->size -= missingAlignment;
+                prevBlock->size -= misssingAlignment;
                 RemoveFreeBlock(prevBlock);
-                prevBlock->size += missingAlignment;
+                prevBlock->size += misssingAlignment;
                 InsertFreeBlock(prevBlock);
             }
             else
-                m_BlocksFreeSize += missingAlignment;
+                m_BlocksFreeSize += misssingAlignment;
         }
         else
         {
@@ -9422,15 +9200,15 @@ void VmaBlockMetadata_TLSF::Alloc(
             prevBlock->nextPhysical = newBlock;
             newBlock->prevPhysical = prevBlock;
             newBlock->nextPhysical = currentBlock;
-            newBlock->size = missingAlignment;
+            newBlock->size = misssingAlignment;
             newBlock->offset = currentBlock->offset;
             newBlock->MarkTaken();
 
             InsertFreeBlock(newBlock);
         }
 
-        currentBlock->size -= missingAlignment;
-        currentBlock->offset += missingAlignment;
+        currentBlock->size -= misssingAlignment;
+        currentBlock->offset += misssingAlignment;
     }
 
     VkDeviceSize size = request.size + debugMargin;
@@ -9628,7 +9406,7 @@ void VmaBlockMetadata_TLSF::DebugLogAllAllocations() const
             DebugLogAllocation(block->offset, block->size, block->UserData());
 }
 
-uint8_t VmaBlockMetadata_TLSF::SizeToMemoryClass(VkDeviceSize size)
+uint8_t VmaBlockMetadata_TLSF::SizeToMemoryClass(VkDeviceSize size) const
 {
     if (size > SMALL_BUFFER_SIZE)
         return uint8_t(VMA_BITSCAN_MSB(size) - MEMORY_CLASS_SHIFT);
@@ -9641,7 +9419,8 @@ uint16_t VmaBlockMetadata_TLSF::SizeToSecondIndex(VkDeviceSize size, uint8_t mem
     {
         if (IsVirtual())
             return static_cast<uint16_t>((size - 1) / 8);
-        return static_cast<uint16_t>((size - 1) / 64);
+        else
+            return static_cast<uint16_t>((size - 1) / 64);
     }
     return static_cast<uint16_t>((size >> (memoryClass + MEMORY_CLASS_SHIFT - SECOND_LEVEL_INDEX)) ^ (1U << SECOND_LEVEL_INDEX));
 }
@@ -9654,7 +9433,8 @@ uint32_t VmaBlockMetadata_TLSF::GetListIndex(uint8_t memoryClass, uint16_t secon
     const uint32_t index = static_cast<uint32_t>(memoryClass - 1) * (1 << SECOND_LEVEL_INDEX) + secondIndex;
     if (IsVirtual())
         return index + (1 << SECOND_LEVEL_INDEX);
-    return index + 4;
+    else
+        return index + 4;
 }
 
 uint32_t VmaBlockMetadata_TLSF::GetListIndex(VkDeviceSize size) const
@@ -9851,7 +9631,7 @@ public:
         size_t allocationCount,
         VmaAllocation* pAllocations);
 
-    void Free(VmaAllocation hAllocation);
+    void Free(const VmaAllocation hAllocation);
 
 #if VMA_STATS_STRING_ENABLED
     void PrintDetailedMap(class VmaJsonWriter& json);
@@ -10001,7 +9781,7 @@ private:
     bool ComputeDefragmentation_Full(VmaBlockVector& vector);
     bool ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index);
 
-    static void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state);
+    void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state);
     bool MoveDataToFreeBlocks(VmaSuballocationType currentType,
         VmaBlockVector& vector, size_t firstFreeBlock,
         bool& texturePresent, bool& bufferPresent, bool& otherPresent);
@@ -10127,7 +9907,7 @@ class VmaAllocationObjectAllocator
 {
     VMA_CLASS_NO_COPY_NO_MOVE(VmaAllocationObjectAllocator)
 public:
-    explicit VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks)
+    VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks)
         : m_Allocator(pAllocationCallbacks, 1024) {}
 
     template<typename... Types> VmaAllocation Allocate(Types&&... args);
@@ -10160,9 +9940,10 @@ public:
     const bool m_AllocationCallbacksSpecified;
     const VkAllocationCallbacks m_AllocationCallbacks;
 
-    explicit VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo);
+    VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo);
     ~VmaVirtualBlock_T();
 
+    VkResult Init() { return VK_SUCCESS; }
     bool IsEmpty() const { return m_Metadata->IsEmpty(); }
     void Free(VmaVirtualAllocation allocation) { m_Metadata->Free((VmaAllocHandle)allocation); }
     void SetAllocationUserData(VmaVirtualAllocation allocation, void* userData) { m_Metadata->SetAllocationUserData((VmaAllocHandle)allocation, userData); }
@@ -10307,7 +10088,6 @@ public:
     bool m_UseExtMemoryPriority;
     bool m_UseKhrMaintenance4;
     bool m_UseKhrMaintenance5;
-    bool m_UseKhrExternalMemoryWin32;
     const VkDevice m_hDevice;
     const VkInstance m_hInstance;
     const bool m_AllocationCallbacksSpecified;
@@ -10328,7 +10108,7 @@ public:
     VmaCurrentBudgetData m_Budget;
     VMA_ATOMIC_UINT32 m_DeviceMemoryCount; // Total number of VkDeviceMemory objects.
 
-    explicit VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);
+    VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);
     VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo);
     ~VmaAllocator_T();
 
@@ -10422,18 +10202,18 @@ public:
     void PrintDetailedMap(class VmaJsonWriter& json);
 #endif
 
-    static void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);
-    static void GetAllocationInfo2(VmaAllocation hAllocation, VmaAllocationInfo2* pAllocationInfo);
+    void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);
+    void GetAllocationInfo2(VmaAllocation hAllocation, VmaAllocationInfo2* pAllocationInfo);
 
     VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool);
     void DestroyPool(VmaPool pool);
-    static void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats);
-    static void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats);
+    void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats);
+    void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats);
 
     void SetCurrentFrameIndex(uint32_t frameIndex);
     uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
 
-    static VkResult CheckPoolCorruption(VmaPool hPool);
+    VkResult CheckPoolCorruption(VmaPool hPool);
     VkResult CheckCorruption(uint32_t memoryTypeBits);
 
     // Call to Vulkan function vkAllocateMemory with accompanying bookkeeping.
@@ -10445,13 +10225,13 @@ public:
         VkDeviceMemory memory,
         VkDeviceSize memoryOffset,
         VkBuffer buffer,
-        const void* pNext) const;
+        const void* pNext);
     // Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR.
     VkResult BindVulkanImage(
         VkDeviceMemory memory,
         VkDeviceSize memoryOffset,
         VkImage image,
-        const void* pNext) const;
+        const void* pNext);
 
     VkResult Map(VmaAllocation hAllocation, void** ppData);
     void Unmap(VmaAllocation hAllocation);
@@ -10488,7 +10268,7 @@ public:
         void* pDstHostPointer,
         VkDeviceSize size);
 
-    void FillAllocation(VmaAllocation hAllocation, uint8_t pattern);
+    void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern);
 
     /*
     Returns bit mask of memory types that can support defragmentation on GPU as
@@ -10536,7 +10316,7 @@ private:
     void ImportVulkanFunctions_Dynamic();
 #endif
 
-    void ValidateVulkanFunctions() const;
+    void ValidateVulkanFunctions();
 
     VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);
 
@@ -10589,16 +10369,17 @@ private:
         VmaAllocation* pAllocations,
         const void* pNextChain = VMA_NULL);
 
-    void FreeDedicatedMemory(VmaAllocation allocation);
+    void FreeDedicatedMemory(const VmaAllocation allocation);
 
     VkResult CalcMemTypeParams(
         VmaAllocationCreateInfo& outCreateInfo,
         uint32_t memTypeIndex,
         VkDeviceSize size,
         size_t allocationCount);
-    static VkResult CalcAllocationParams(
+    VkResult CalcAllocationParams(
         VmaAllocationCreateInfo& outCreateInfo,
-        bool dedicatedRequired);
+        bool dedicatedRequired,
+        bool dedicatedPreferred);
 
     /*
     Calculates and returns bit mask of memory types that can support defragmentation
@@ -10666,12 +10447,11 @@ static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)
 #ifndef _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS
 VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)
     : m_pMetadata(VMA_NULL),
-    m_hParentPool(nullptr),
     m_MemoryTypeIndex(UINT32_MAX),
     m_Id(0),
     m_hMemory(VK_NULL_HANDLE),
     m_MapCount(0),
-    m_pMappedData(VMA_NULL){}
+    m_pMappedData(VMA_NULL) {}
 
 VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()
 {
@@ -10796,25 +10576,27 @@ VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void
         }
         return VK_SUCCESS;
     }
-
-    VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
-        hAllocator->m_hDevice,
-        m_hMemory,
-        0, // offset
-        VK_WHOLE_SIZE,
-        0, // flags
-        &m_pMappedData);
-    if (result == VK_SUCCESS)
+    else
     {
-        VMA_ASSERT(m_pMappedData != VMA_NULL);
-        m_MappingHysteresis.PostMap();
-        m_MapCount = count;
-        if (ppData != VMA_NULL)
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            &m_pMappedData);
+        if (result == VK_SUCCESS)
         {
-            *ppData = m_pMappedData;
+            VMA_ASSERT(m_pMappedData != VMA_NULL);
+            m_MappingHysteresis.PostMap();
+            m_MapCount = count;
+            if (ppData != VMA_NULL)
+            {
+                *ppData = m_pMappedData;
+            }
         }
+        return result;
     }
-    return result;
 }
 
 void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count)
@@ -10846,7 +10628,7 @@ VkResult VmaDeviceMemoryBlock::WriteMagicValueAfterAllocation(VmaAllocator hAllo
 {
     VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
 
-    void* pData = VMA_NULL;
+    void* pData;
     VkResult res = Map(hAllocator, 1, &pData);
     if (res != VK_SUCCESS)
     {
@@ -10863,7 +10645,7 @@ VkResult VmaDeviceMemoryBlock::ValidateMagicValueAfterAllocation(VmaAllocator hA
 {
     VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
 
-    void* pData = VMA_NULL;
+    void* pData;
     VkResult res = Map(hAllocator, 1, &pData);
     if (res != VK_SUCCESS)
     {
@@ -10880,8 +10662,8 @@ VkResult VmaDeviceMemoryBlock::ValidateMagicValueAfterAllocation(VmaAllocator hA
 }
 
 VkResult VmaDeviceMemoryBlock::BindBufferMemory(
-    VmaAllocator hAllocator,
-    VmaAllocation hAllocation,
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
     VkDeviceSize allocationLocalOffset,
     VkBuffer hBuffer,
     const void* pNext)
@@ -10897,8 +10679,8 @@ VkResult VmaDeviceMemoryBlock::BindBufferMemory(
 }
 
 VkResult VmaDeviceMemoryBlock::BindImageMemory(
-    VmaAllocator hAllocator,
-    VmaAllocation hAllocation,
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
     VkDeviceSize allocationLocalOffset,
     VkImage hImage,
     const void* pNext)
@@ -10912,14 +10694,6 @@ VkResult VmaDeviceMemoryBlock::BindImageMemory(
     VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);
     return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext);
 }
-
-#if VMA_EXTERNAL_MEMORY_WIN32
-VkResult VmaDeviceMemoryBlock::CreateWin32Handle(const VmaAllocator hAllocator, PFN_vkGetMemoryWin32HandleKHR pvkGetMemoryWin32HandleKHR, HANDLE hTargetProcess, HANDLE* pHandle) noexcept
-{
-    VMA_ASSERT(pHandle);
-    return m_Handle.GetHandle(hAllocator->m_hDevice, m_hMemory, pvkGetMemoryWin32HandleKHR, hTargetProcess, hAllocator->m_UseMutex, pHandle);
-}
-#endif // VMA_EXTERNAL_MEMORY_WIN32
 #endif // _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS
 
 #ifndef _VMA_ALLOCATION_T_FUNCTIONS
@@ -10972,7 +10746,6 @@ void VmaAllocation_T::InitBlockAllocation(
 }
 
 void VmaAllocation_T::InitDedicatedAllocation(
-    VmaAllocator allocator,
     VmaPool hParentPool,
     uint32_t memoryTypeIndex,
     VkDeviceMemory hMemory,
@@ -10987,29 +10760,16 @@ void VmaAllocation_T::InitDedicatedAllocation(
     m_Size = size;
     m_MemoryTypeIndex = memoryTypeIndex;
     m_SuballocationType = (uint8_t)suballocationType;
-    m_DedicatedAllocation.m_ExtraData = VMA_NULL;
-    m_DedicatedAllocation.m_hParentPool = hParentPool;
-    m_DedicatedAllocation.m_hMemory = hMemory;
-    m_DedicatedAllocation.m_Prev = VMA_NULL;
-    m_DedicatedAllocation.m_Next = VMA_NULL;
-
-    if (pMappedData != VMA_NULL)
+    if(pMappedData != VMA_NULL)
     {
         VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.");
         m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP;
-        EnsureExtraData(allocator);
-        m_DedicatedAllocation.m_ExtraData->m_pMappedData = pMappedData;
-    }
-}
-
-void VmaAllocation_T::Destroy(VmaAllocator allocator)
-{
-    FreeName(allocator);
-
-    if (GetType() == ALLOCATION_TYPE_DEDICATED)
-    {
-        vma_delete(allocator, m_DedicatedAllocation.m_ExtraData);
     }
+    m_DedicatedAllocation.m_hParentPool = hParentPool;
+    m_DedicatedAllocation.m_hMemory = hMemory;
+    m_DedicatedAllocation.m_pMappedData = pMappedData;
+    m_DedicatedAllocation.m_Prev = VMA_NULL;
+    m_DedicatedAllocation.m_Next = VMA_NULL;
 }
 
 void VmaAllocation_T::SetName(VmaAllocator hAllocator, const char* pName)
@@ -11114,9 +10874,8 @@ void* VmaAllocation_T::GetMappedData() const
         }
         break;
     case ALLOCATION_TYPE_DEDICATED:
-        VMA_ASSERT((m_DedicatedAllocation.m_ExtraData != VMA_NULL && m_DedicatedAllocation.m_ExtraData->m_pMappedData != VMA_NULL) ==
-            (m_MapCount != 0 || IsPersistentMap()));
-        return m_DedicatedAllocation.m_ExtraData != VMA_NULL ? m_DedicatedAllocation.m_ExtraData->m_pMappedData : VMA_NULL;
+        VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0 || IsPersistentMap()));
+        return m_DedicatedAllocation.m_pMappedData;
     default:
         VMA_ASSERT(0);
         return VMA_NULL;
@@ -11157,35 +10916,37 @@ VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppDa
     VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);
     VMA_ASSERT(IsMappingAllowed() && "Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.");
 
-    EnsureExtraData(hAllocator);
-
     if (m_MapCount != 0 || IsPersistentMap())
     {
         if (m_MapCount < 0xFF)
         {
-            VMA_ASSERT(m_DedicatedAllocation.m_ExtraData->m_pMappedData != VMA_NULL);
-            *ppData = m_DedicatedAllocation.m_ExtraData->m_pMappedData;
+            VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL);
+            *ppData = m_DedicatedAllocation.m_pMappedData;
             ++m_MapCount;
             return VK_SUCCESS;
         }
-
-        VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously.");
-        return VK_ERROR_MEMORY_MAP_FAILED;
+        else
+        {
+            VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously.");
+            return VK_ERROR_MEMORY_MAP_FAILED;
+        }
     }
-
-    VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
-        hAllocator->m_hDevice,
-        m_DedicatedAllocation.m_hMemory,
-        0, // offset
-        VK_WHOLE_SIZE,
-        0, // flags
-        ppData);
-    if (result == VK_SUCCESS)
+    else
     {
-        m_DedicatedAllocation.m_ExtraData->m_pMappedData = *ppData;
-        m_MapCount = 1;
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_DedicatedAllocation.m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            ppData);
+        if (result == VK_SUCCESS)
+        {
+            m_DedicatedAllocation.m_pMappedData = *ppData;
+            m_MapCount = 1;
+        }
+        return result;
     }
-    return result;
 }
 
 void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)
@@ -11197,8 +10958,7 @@ void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)
         --m_MapCount;
         if (m_MapCount == 0 && !IsPersistentMap())
         {
-            VMA_ASSERT(m_DedicatedAllocation.m_ExtraData != VMA_NULL);
-            m_DedicatedAllocation.m_ExtraData->m_pMappedData = VMA_NULL;
+            m_DedicatedAllocation.m_pMappedData = VMA_NULL;
             (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(
                 hAllocator->m_hDevice,
                 m_DedicatedAllocation.m_hMemory);
@@ -11234,33 +10994,8 @@ void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const
         json.WriteString(m_pName);
     }
 }
-#if VMA_EXTERNAL_MEMORY_WIN32
-VkResult VmaAllocation_T::GetWin32Handle(VmaAllocator hAllocator, HANDLE hTargetProcess, HANDLE* pHandle) noexcept
-{
-    auto pvkGetMemoryWin32HandleKHR = hAllocator->GetVulkanFunctions().vkGetMemoryWin32HandleKHR;
-    switch (m_Type)
-    {
-    case ALLOCATION_TYPE_BLOCK:
-        return m_BlockAllocation.m_Block->CreateWin32Handle(hAllocator, pvkGetMemoryWin32HandleKHR, hTargetProcess, pHandle);
-    case ALLOCATION_TYPE_DEDICATED:
-        EnsureExtraData(hAllocator);
-        return m_DedicatedAllocation.m_ExtraData->m_Handle.GetHandle(hAllocator->m_hDevice, m_DedicatedAllocation.m_hMemory, pvkGetMemoryWin32HandleKHR, hTargetProcess, hAllocator->m_UseMutex, pHandle);
-    default:
-        VMA_ASSERT(0);
-        return VK_ERROR_FEATURE_NOT_PRESENT;
-    }
-}
-#endif // VMA_EXTERNAL_MEMORY_WIN32
 #endif // VMA_STATS_STRING_ENABLED
 
-void VmaAllocation_T::EnsureExtraData(VmaAllocator hAllocator)
-{
-    if (m_DedicatedAllocation.m_ExtraData == VMA_NULL)
-    {
-        m_DedicatedAllocation.m_ExtraData = vma_new(hAllocator, VmaAllocationExtraData)();
-    }
-}
-
 void VmaAllocation_T::FreeName(VmaAllocator hAllocator)
 {
     if(m_pName)
@@ -11373,7 +11108,7 @@ VkResult VmaBlockVector::Allocate(
     size_t allocationCount,
     VmaAllocation* pAllocations)
 {
-    size_t allocIndex = 0;
+    size_t allocIndex;
     VkResult res = VK_SUCCESS;
 
     alignment = VMA_MAX(alignment, m_MinAllocationAlignment);
@@ -11386,7 +11121,7 @@ VkResult VmaBlockVector::Allocate(
 
     {
         VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
-        for (; allocIndex < allocationCount; ++allocIndex)
+        for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
         {
             res = AllocatePage(
                 size,
@@ -11421,7 +11156,7 @@ VkResult VmaBlockVector::AllocatePage(
 {
     const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;
 
-    VkDeviceSize freeMemory = 0;
+    VkDeviceSize freeMemory;
     {
         const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);
         VmaBudget heapBudget = {};
@@ -11605,16 +11340,18 @@ VkResult VmaBlockVector::AllocatePage(
                 IncrementallySortBlocks();
                 return VK_SUCCESS;
             }
-
-            // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.
-            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+            else
+            {
+                // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.
+                return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+            }
         }
     }
 
     return VK_ERROR_OUT_OF_DEVICE_MEMORY;
 }
 
-void VmaBlockVector::Free(VmaAllocation hAllocation)
+void VmaBlockVector::Free(const VmaAllocation hAllocation)
 {
     VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL;
 
@@ -11675,10 +11412,6 @@ void VmaBlockVector::Free(VmaAllocation hAllocation)
         }
 
         IncrementallySortBlocks();
-
-        m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());
-        hAllocation->Destroy(m_hAllocator);
-        m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);
     }
 
     // Destruction of a free block. Deferred until this point, outside of mutex
@@ -11689,6 +11422,9 @@ void VmaBlockVector::Free(VmaAllocation hAllocation)
         pBlockToDelete->Destroy(m_hAllocator);
         vma_delete(m_hAllocator, pBlockToDelete);
     }
+
+    m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());
+    m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);
 }
 
 VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const
@@ -11845,7 +11581,7 @@ VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIn
     VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };
     if (m_hAllocator->m_UseExtMemoryPriority)
     {
-        VMA_ASSERT(m_Priority >= 0.F && m_Priority <= 1.F);
+        VMA_ASSERT(m_Priority >= 0.f && m_Priority <= 1.f);
         priorityInfo.priority = m_Priority;
         VmaPnextChainPushFront(&allocInfo, &priorityInfo);
     }
@@ -11960,9 +11696,10 @@ VmaDefragmentationContext_T::VmaDefragmentationContext_T(
     m_BreakCallback(info.pfnBreakCallback),
     m_BreakCallbackUserData(info.pBreakCallbackUserData),
     m_MoveAllocator(hAllocator->GetAllocationCallbacks()),
-    m_Moves(m_MoveAllocator),
-    m_Algorithm(info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK)
+    m_Moves(m_MoveAllocator)
 {
+    m_Algorithm = info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK;
+
     if (info.pool != VMA_NULL)
     {
         m_BlockVectorCount = 1;
@@ -12002,8 +11739,6 @@ VmaDefragmentationContext_T::VmaDefragmentationContext_T(
             m_AlgorithmState = vma_new_array(hAllocator, StateExtensive, m_BlockVectorCount);
         }
         break;
-    default:
-        ; // Do nothing.
     }
 }
 
@@ -12096,14 +11831,14 @@ VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMo
     for (uint32_t i = 0; i < moveInfo.moveCount; ++i)
     {
         VmaDefragmentationMove& move = moveInfo.pMoves[i];
-        size_t prevCount = 0;
-        size_t currentCount = 0;
+        size_t prevCount = 0, currentCount = 0;
         VkDeviceSize freedBlockSize = 0;
 
-        uint32_t vectorIndex = 0;
-        VmaBlockVector* vector = VMA_NULL;
+        uint32_t vectorIndex;
+        VmaBlockVector* vector;
         if (m_PoolBlockVector != VMA_NULL)
         {
+            vectorIndex = 0;
             vector = m_PoolBlockVector;
         }
         else
@@ -12188,7 +11923,7 @@ VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMo
             }
             freedBlockSize *= prevCount - currentCount;
 
-            VkDeviceSize dstBlockSize = SIZE_MAX;
+            VkDeviceSize dstBlockSize;
             {
                 VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);
                 dstBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize();
@@ -12245,7 +11980,7 @@ VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMo
     m_PassStats = { 0 };
 
     // Move blocks with immovable allocations according to algorithm
-    if (!immovableBlocks.empty())
+    if (immovableBlocks.size() > 0)
     {
         do
         {
@@ -12364,10 +12099,11 @@ VmaDefragmentationContext_T::CounterStatus VmaDefragmentationContext_T::CheckCou
     {
         if (++m_IgnoredAllocs < MAX_ALLOCS_TO_IGNORE)
             return CounterStatus::Ignore;
-        return CounterStatus::End;
+        else
+            return CounterStatus::End;
     }
-
-    m_IgnoredAllocs = 0;
+    else
+        m_IgnoredAllocs = 0;
     return CounterStatus::Pass;
 }
 
@@ -12684,9 +12420,7 @@ bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVecto
 
     StateExtensive& vectorState = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[index];
 
-    bool texturePresent = false;
-    bool bufferPresent = false;
-    bool otherPresent = false;
+    bool texturePresent = false, bufferPresent = false, otherPresent = false;
     switch (vectorState.operation)
     {
     case StateExtensive::Operation::Done: // Vector defragmented
@@ -12990,7 +12724,6 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
     m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0),
     m_UseKhrMaintenance4((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT) != 0),
     m_UseKhrMaintenance5((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT) != 0),
-    m_UseKhrExternalMemoryWin32((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT) != 0),
     m_hDevice(pCreateInfo->device),
     m_hInstance(pCreateInfo->instance),
     m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),
@@ -13046,17 +12779,23 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
         VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT is set but required extension or Vulkan 1.2 is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.");
     }
 #endif
-#if VMA_VULKAN_VERSION < 1004000
-    VMA_ASSERT(m_VulkanApiVersion < VK_MAKE_VERSION(1, 4, 0) && "vulkanApiVersion >= VK_API_VERSION_1_4 but required Vulkan version is disabled by preprocessor macros.");
-#endif
 #if VMA_VULKAN_VERSION < 1003000
-    VMA_ASSERT(m_VulkanApiVersion < VK_MAKE_VERSION(1, 3, 0) && "vulkanApiVersion >= VK_API_VERSION_1_3 but required Vulkan version is disabled by preprocessor macros.");
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))
+    {
+        VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_3 but required Vulkan version is disabled by preprocessor macros.");
+    }
 #endif
 #if VMA_VULKAN_VERSION < 1002000
-    VMA_ASSERT(m_VulkanApiVersion < VK_MAKE_VERSION(1, 2, 0) && "vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros.");
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 2, 0))
+    {
+        VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros.");
+    }
 #endif
 #if VMA_VULKAN_VERSION < 1001000
-    VMA_ASSERT(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0) && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.");
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.");
+    }
 #endif
 #if !(VMA_MEMORY_PRIORITY)
     if(m_UseExtMemoryPriority)
@@ -13076,19 +12815,6 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
         VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.");
     }
 #endif
-#if !(VMA_KHR_MAINTENANCE5)
-    if(m_UseKhrMaintenance5)
-    {
-        VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE5_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.");
-    }
-#endif
-
-#if !(VMA_EXTERNAL_MEMORY_WIN32)
-    if(m_UseKhrExternalMemoryWin32)
-    {
-        VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.");
-    }
-#endif
 
     memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));
     memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));
@@ -13138,7 +12864,7 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
             const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex];
             if(limit != VK_WHOLE_SIZE)
             {
-                m_HeapSizeLimitMask |= 1U << heapIndex;
+                m_HeapSizeLimitMask |= 1u << heapIndex;
                 if(limit < m_MemProps.memoryHeaps[heapIndex].size)
                 {
                     m_MemProps.memoryHeaps[heapIndex].size = limit;
@@ -13150,7 +12876,7 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
     for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
     {
         // Create only supported types
-        if((m_GlobalMemoryTypeBits & (1U << memTypeIndex)) != 0)
+        if((m_GlobalMemoryTypeBits & (1u << memTypeIndex)) != 0)
         {
             const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex);
             m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)(
@@ -13163,7 +12889,7 @@ VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
                 GetBufferImageGranularity(),
                 false, // explicitBlockSize
                 0, // algorithm
-                0.5F, // priority (0.5 is the default per Vulkan spec)
+                0.5f, // priority (0.5 is the default per Vulkan spec)
                 GetMemoryTypeMinAlignment(memTypeIndex), // minAllocationAlignment
                 VMA_NULL); // // pMemoryAllocateNext
             // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,
@@ -13313,9 +13039,7 @@ void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVul
     VMA_COPY_IF_NOT_NULL(vkGetDeviceBufferMemoryRequirements);
     VMA_COPY_IF_NOT_NULL(vkGetDeviceImageMemoryRequirements);
 #endif
-#if VMA_EXTERNAL_MEMORY_WIN32
-    VMA_COPY_IF_NOT_NULL(vkGetMemoryWin32HandleKHR);
-#endif
+
 #undef VMA_COPY_IF_NOT_NULL
 }
 
@@ -13369,14 +13093,10 @@ void VmaAllocator_T::ImportVulkanFunctions_Dynamic()
     if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
     {
         VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2");
-        // Try to fetch the pointer from the other name, based on suspected driver bug - see issue #410.
-        VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2KHR");
     }
     else if(m_UseExtMemoryBudget)
     {
         VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2KHR");
-        // Try to fetch the pointer from the other name, based on suspected driver bug - see issue #410.
-        VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, "vkGetPhysicalDeviceMemoryProperties2");
     }
 #endif
 
@@ -13421,19 +13141,14 @@ void VmaAllocator_T::ImportVulkanFunctions_Dynamic()
         VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirementsKHR, "vkGetDeviceImageMemoryRequirementsKHR");
     }
 #endif
-#if VMA_EXTERNAL_MEMORY_WIN32
-    if (m_UseKhrExternalMemoryWin32)
-    {
-        VMA_FETCH_DEVICE_FUNC(vkGetMemoryWin32HandleKHR, PFN_vkGetMemoryWin32HandleKHR, "vkGetMemoryWin32HandleKHR");
-    }
-#endif
+
 #undef VMA_FETCH_DEVICE_FUNC
 #undef VMA_FETCH_INSTANCE_FUNC
 }
 
 #endif // VMA_DYNAMIC_VULKAN_FUNCTIONS == 1
 
-void VmaAllocator_T::ValidateVulkanFunctions() const
+void VmaAllocator_T::ValidateVulkanFunctions()
 {
     VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);
     VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL);
@@ -13475,12 +13190,6 @@ void VmaAllocator_T::ValidateVulkanFunctions() const
         VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL);
     }
 #endif
-#if VMA_EXTERNAL_MEMORY_WIN32
-    if (m_UseKhrExternalMemoryWin32)
-    {
-        VMA_ASSERT(m_VulkanFunctions.vkGetMemoryWin32HandleKHR != VMA_NULL);
-    }
-#endif
 
     // Not validating these due to suspected driver bugs with these function
     // pointers being null despite correct extension or Vulkan version is enabled.
@@ -13548,28 +13257,70 @@ VkResult VmaAllocator_T::AllocateMemoryOfType(
             pAllocations,
             blockVector.GetAllocationNextPtr());
     }
-
-    const bool canAllocateDedicated =
-        (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&
-        (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize());
-
-    if(canAllocateDedicated)
+    else
     {
-        // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.
-        if(size > blockVector.GetPreferredBlockSize() / 2)
+        const bool canAllocateDedicated =
+            (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&
+            (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize());
+
+        if(canAllocateDedicated)
         {
-            dedicatedPreferred = true;
-        }
-        // Protection against creating each allocation as dedicated when we reach or exceed heap size/budget,
-        // which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above
-        // 3/4 of the maximum allocation count.
-        if(m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount < UINT32_MAX / 4 &&
-            m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 / 4)
-        {
-            dedicatedPreferred = false;
+            // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.
+            if(size > blockVector.GetPreferredBlockSize() / 2)
+            {
+                dedicatedPreferred = true;
+            }
+            // Protection against creating each allocation as dedicated when we reach or exceed heap size/budget,
+            // which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above
+            // 3/4 of the maximum allocation count.
+            if(m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount < UINT32_MAX / 4 &&
+                m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 / 4)
+            {
+                dedicatedPreferred = false;
+            }
+
+            if(dedicatedPreferred)
+            {
+                res = AllocateDedicatedMemory(
+                    pool,
+                    size,
+                    suballocType,
+                    dedicatedAllocations,
+                    memTypeIndex,
+                    (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
+                    (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
+                    (finalCreateInfo.flags &
+                        (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,
+                    (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,
+                    finalCreateInfo.pUserData,
+                    finalCreateInfo.priority,
+                    dedicatedBuffer,
+                    dedicatedImage,
+                    dedicatedBufferImageUsage,
+                    allocationCount,
+                    pAllocations,
+                    blockVector.GetAllocationNextPtr());
+                if(res == VK_SUCCESS)
+                {
+                    // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here.
+                    VMA_DEBUG_LOG("    Allocated as DedicatedMemory");
+                    return VK_SUCCESS;
+                }
+            }
         }
 
-        if(dedicatedPreferred)
+        res = blockVector.Allocate(
+            size,
+            alignment,
+            finalCreateInfo,
+            suballocType,
+            allocationCount,
+            pAllocations);
+        if(res == VK_SUCCESS)
+            return VK_SUCCESS;
+
+        // Try dedicated memory.
+        if(canAllocateDedicated && !dedicatedPreferred)
         {
             res = AllocateDedicatedMemory(
                 pool,
@@ -13597,50 +13348,10 @@ VkResult VmaAllocator_T::AllocateMemoryOfType(
                 return VK_SUCCESS;
             }
         }
+        // Everything failed: Return error code.
+        VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
+        return res;
     }
-
-    res = blockVector.Allocate(
-        size,
-        alignment,
-        finalCreateInfo,
-        suballocType,
-        allocationCount,
-        pAllocations);
-    if(res == VK_SUCCESS)
-        return VK_SUCCESS;
-
-    // Try dedicated memory.
-    if(canAllocateDedicated && !dedicatedPreferred)
-    {
-        res = AllocateDedicatedMemory(
-            pool,
-            size,
-            suballocType,
-            dedicatedAllocations,
-            memTypeIndex,
-            (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
-            (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
-            (finalCreateInfo.flags &
-                (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,
-            (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,
-            finalCreateInfo.pUserData,
-            finalCreateInfo.priority,
-            dedicatedBuffer,
-            dedicatedImage,
-            dedicatedBufferImageUsage,
-            allocationCount,
-            pAllocations,
-            blockVector.GetAllocationNextPtr());
-        if(res == VK_SUCCESS)
-        {
-            // Succeeded: AllocateDedicatedMemory function already filled pMemory, nothing more to do here.
-            VMA_DEBUG_LOG("    Allocated as DedicatedMemory");
-            return VK_SUCCESS;
-        }
-    }
-    // Everything failed: Return error code.
-    VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
-    return res;
 }
 
 VkResult VmaAllocator_T::AllocateDedicatedMemory(
@@ -13716,7 +13427,7 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
     VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };
     if(m_UseExtMemoryPriority)
     {
-        VMA_ASSERT(priority >= 0.F && priority <= 1.F);
+        VMA_ASSERT(priority >= 0.f && priority <= 1.f);
         priorityInfo.priority = priority;
         VmaPnextChainPushFront(&allocInfo, &priorityInfo);
     }
@@ -13732,9 +13443,9 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
     }
 #endif // #if VMA_EXTERNAL_MEMORY
 
-    size_t allocIndex = 0;
+    size_t allocIndex;
     VkResult res = VK_SUCCESS;
-    for(; allocIndex < allocationCount; ++allocIndex)
+    for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
     {
         res = AllocateDedicatedMemoryPage(
             pool,
@@ -13829,7 +13540,7 @@ VkResult VmaAllocator_T::AllocateDedicatedMemoryPage(
     }
 
     *pAllocation = m_AllocationObjectAllocator.Allocate(isMappingAllowed);
-    (*pAllocation)->InitDedicatedAllocation(this, pool, memTypeIndex, hMemory, suballocType, pMappedData, size);
+    (*pAllocation)->InitDedicatedAllocation(pool, memTypeIndex, hMemory, suballocType, pMappedData, size);
     if (isUserDataString)
         (*pAllocation)->SetName(this, (const char*)pUserData);
     else
@@ -13920,9 +13631,7 @@ VkResult VmaAllocator_T::FindMemoryTypeIndex(
         memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits;
     }
 
-    VkMemoryPropertyFlags requiredFlags = 0;
-    VkMemoryPropertyFlags preferredFlags = 0;
-    VkMemoryPropertyFlags notPreferredFlags = 0;
+    VkMemoryPropertyFlags requiredFlags = 0, preferredFlags = 0, notPreferredFlags = 0;
     if(!FindMemoryPreferences(
         IsIntegratedGpu(),
         *pAllocationCreateInfo,
@@ -13994,7 +13703,8 @@ VkResult VmaAllocator_T::CalcMemTypeParams(
 
 VkResult VmaAllocator_T::CalcAllocationParams(
     VmaAllocationCreateInfo& inoutCreateInfo,
-    bool dedicatedRequired)
+    bool dedicatedRequired,
+    bool dedicatedPreferred)
 {
     VMA_ASSERT((inoutCreateInfo.flags &
         (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) !=
@@ -14082,7 +13792,7 @@ VkResult VmaAllocator_T::AllocateMemory(
     }
 
     VmaAllocationCreateInfo createInfoFinal = createInfo;
-    VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation);
+    VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation, prefersDedicatedAllocation);
     if(res != VK_SUCCESS)
         return res;
 
@@ -14105,47 +13815,48 @@ VkResult VmaAllocator_T::AllocateMemory(
             allocationCount,
             pAllocations);
     }
-
-    // Bit mask of memory Vulkan types acceptable for this allocation.
-    uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;
-    uint32_t memTypeIndex = UINT32_MAX;
-    res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);
-    // Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.
-    if(res != VK_SUCCESS)
-        return res;
-    
-    do
+    else
     {
-        VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex];
-        VMA_ASSERT(blockVector && "Trying to use unsupported memory type!");
-        res = AllocateMemoryOfType(
-            VK_NULL_HANDLE,
-            vkMemReq.size,
-            vkMemReq.alignment,
-            requiresDedicatedAllocation || prefersDedicatedAllocation,
-            dedicatedBuffer,
-            dedicatedImage,
-            dedicatedBufferImageUsage,
-            createInfoFinal,
-            memTypeIndex,
-            suballocType,
-            m_DedicatedAllocations[memTypeIndex],
-            *blockVector,
-            allocationCount,
-            pAllocations);
-        // Allocation succeeded
-        if(res == VK_SUCCESS)
-            return VK_SUCCESS;
-
-        // Remove old memTypeIndex from list of possibilities.
-        memoryTypeBits &= ~(1U << memTypeIndex);
-        // Find alternative memTypeIndex.
+        // Bit mask of memory Vulkan types acceptable for this allocation.
+        uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;
+        uint32_t memTypeIndex = UINT32_MAX;
         res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);
-    } while(res == VK_SUCCESS);
+        // Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.
+        if(res != VK_SUCCESS)
+            return res;
+        do
+        {
+            VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex];
+            VMA_ASSERT(blockVector && "Trying to use unsupported memory type!");
+            res = AllocateMemoryOfType(
+                VK_NULL_HANDLE,
+                vkMemReq.size,
+                vkMemReq.alignment,
+                requiresDedicatedAllocation || prefersDedicatedAllocation,
+                dedicatedBuffer,
+                dedicatedImage,
+                dedicatedBufferImageUsage,
+                createInfoFinal,
+                memTypeIndex,
+                suballocType,
+                m_DedicatedAllocations[memTypeIndex],
+                *blockVector,
+                allocationCount,
+                pAllocations);
+            // Allocation succeeded
+            if(res == VK_SUCCESS)
+                return VK_SUCCESS;
 
-    // No other matching memory type index could be found.
-    // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.
-    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+            // Remove old memTypeIndex from list of possibilities.
+            memoryTypeBits &= ~(1u << memTypeIndex);
+            // Find alternative memTypeIndex.
+            res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);
+        } while(res == VK_SUCCESS);
+
+        // No other matching memory type index could be found.
+        // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
 }
 
 void VmaAllocator_T::FreeMemory(
@@ -14165,6 +13876,8 @@ void VmaAllocator_T::FreeMemory(
                 FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED);
             }
 
+            allocation->FreeName(this);
+
             switch(allocation->GetType())
             {
             case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
@@ -14354,7 +14067,7 @@ VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPoo
     }
     // Memory type index out of range or forbidden.
     if(pCreateInfo->memoryTypeIndex >= GetMemoryTypeCount() ||
-        ((1U << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0)
+        ((1u << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0)
     {
         return VK_ERROR_FEATURE_NOT_PRESENT;
     }
@@ -14456,7 +14169,7 @@ VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)
         VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
         for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))
         {
-            if(((1U << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)
+            if(((1u << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)
             {
                 VkResult localRes = pool->m_BlockVector.CheckCorruption();
                 switch(localRes)
@@ -14478,15 +14191,6 @@ VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)
 
 VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory)
 {
-    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);
-
-#if VMA_DEBUG_DONT_EXCEED_HEAP_SIZE_WITH_ALLOCATION_SIZE
-    if (pAllocateInfo->allocationSize > m_MemProps.memoryHeaps[heapIndex].size)
-    {
-        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
-    }
-#endif
-
     AtomicTransactionalIncrement<VMA_ATOMIC_UINT32> deviceMemoryCountIncrement;
     const uint64_t prevDeviceMemoryCount = deviceMemoryCountIncrement.Increment(&m_DeviceMemoryCount);
 #if VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT
@@ -14496,8 +14200,10 @@ VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAlloc
     }
 #endif
 
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);
+
     // HeapSizeLimit is in effect for this heap.
-    if((m_HeapSizeLimitMask & (1U << heapIndex)) != 0)
+    if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0)
     {
         const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;
         VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex];
@@ -14568,7 +14274,7 @@ VkResult VmaAllocator_T::BindVulkanBuffer(
     VkDeviceMemory memory,
     VkDeviceSize memoryOffset,
     VkBuffer buffer,
-    const void* pNext) const
+    const void* pNext)
 {
     if(pNext != VMA_NULL)
     {
@@ -14583,9 +14289,11 @@ VkResult VmaAllocator_T::BindVulkanBuffer(
             bindBufferMemoryInfo.memoryOffset = memoryOffset;
             return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);
         }
+        else
 #endif // #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2
-
-        return VK_ERROR_EXTENSION_NOT_PRESENT;
+        {
+            return VK_ERROR_EXTENSION_NOT_PRESENT;
+        }
     }
     else
     {
@@ -14597,7 +14305,7 @@ VkResult VmaAllocator_T::BindVulkanImage(
     VkDeviceMemory memory,
     VkDeviceSize memoryOffset,
     VkImage image,
-    const void* pNext) const
+    const void* pNext)
 {
     if(pNext != VMA_NULL)
     {
@@ -14612,12 +14320,16 @@ VkResult VmaAllocator_T::BindVulkanImage(
             bindBufferMemoryInfo.memoryOffset = memoryOffset;
             return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);
         }
+        else
 #endif // #if VMA_BIND_MEMORY2
-
-        return VK_ERROR_EXTENSION_NOT_PRESENT;
+        {
+            return VK_ERROR_EXTENSION_NOT_PRESENT;
+        }
+    }
+    else
+    {
+        return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset);
     }
-
-    return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset);
 }
 
 VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)
@@ -14636,6 +14348,7 @@ VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)
             }
             return res;
         }
+        VMA_FALLTHROUGH; // Fallthrough
     case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
         return hAllocation->DedicatedAllocMap(this, ppData);
     default:
@@ -14817,7 +14530,7 @@ VkResult VmaAllocator_T::CopyAllocationToMemory(
     return res;
 }
 
-void VmaAllocator_T::FreeDedicatedMemory(VmaAllocation allocation)
+void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation)
 {
     VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);
 
@@ -14849,7 +14562,6 @@ void VmaAllocator_T::FreeDedicatedMemory(VmaAllocation allocation)
     FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);
 
     m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize());
-    allocation->Destroy(this);
     m_AllocationObjectAllocator.Free(allocation);
 
     VMA_DEBUG_LOG_FORMAT("    Freed DedicatedMemory MemoryTypeIndex=%" PRIu32, memTypeIndex);
@@ -14894,7 +14606,7 @@ uint32_t VmaAllocator_T::CalculateGlobalMemoryTypeBits() const
         {
             if((m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0)
             {
-                memoryTypeBits &= ~(1U << memTypeIndex);
+                memoryTypeBits &= ~(1u << memTypeIndex);
             }
         }
     }
@@ -15005,7 +14717,7 @@ void VmaAllocator_T::UpdateVulkanBudget()
 }
 #endif // VMA_MEMORY_BUDGET
 
-void VmaAllocator_T::FillAllocation(VmaAllocation hAllocation, uint8_t pattern)
+void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern)
 {
     if(VMA_DEBUG_INITIALIZE_ALLOCATIONS &&
         hAllocation->IsMappingAllowed() &&
@@ -15130,110 +14842,13 @@ void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)
 
 
 #ifndef _VMA_PUBLIC_INTERFACE
-
-#ifdef VOLK_HEADER_VERSION
-
-VMA_CALL_PRE VkResult VMA_CALL_POST vmaImportVulkanFunctionsFromVolk(
-    const VmaAllocatorCreateInfo* VMA_NOT_NULL pAllocatorCreateInfo,
-    VmaVulkanFunctions* VMA_NOT_NULL pDstVulkanFunctions)
-{
-    VMA_ASSERT(pAllocatorCreateInfo != VMA_NULL);
-    VMA_ASSERT(pAllocatorCreateInfo->instance != VK_NULL_HANDLE);
-    VMA_ASSERT(pAllocatorCreateInfo->device != VK_NULL_HANDLE);
-
-    memset(pDstVulkanFunctions, 0, sizeof(*pDstVulkanFunctions));
-    
-    VolkDeviceTable src = {};
-    volkLoadDeviceTable(&src, pAllocatorCreateInfo->device);
-
-#define COPY_GLOBAL_TO_VMA_FUNC(volkName, vmaName) if(!pDstVulkanFunctions->vmaName) pDstVulkanFunctions->vmaName = volkName;
-#define COPY_DEVICE_TO_VMA_FUNC(volkName, vmaName) if(!pDstVulkanFunctions->vmaName) pDstVulkanFunctions->vmaName = src.volkName;
-
-    COPY_GLOBAL_TO_VMA_FUNC(vkGetInstanceProcAddr, vkGetInstanceProcAddr)
-    COPY_GLOBAL_TO_VMA_FUNC(vkGetDeviceProcAddr, vkGetDeviceProcAddr)
-    COPY_GLOBAL_TO_VMA_FUNC(vkGetPhysicalDeviceProperties, vkGetPhysicalDeviceProperties)
-    COPY_GLOBAL_TO_VMA_FUNC(vkGetPhysicalDeviceMemoryProperties, vkGetPhysicalDeviceMemoryProperties)
-    COPY_DEVICE_TO_VMA_FUNC(vkAllocateMemory, vkAllocateMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkFreeMemory, vkFreeMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkMapMemory, vkMapMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkUnmapMemory, vkUnmapMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkFlushMappedMemoryRanges, vkFlushMappedMemoryRanges)
-    COPY_DEVICE_TO_VMA_FUNC(vkInvalidateMappedMemoryRanges, vkInvalidateMappedMemoryRanges)
-    COPY_DEVICE_TO_VMA_FUNC(vkBindBufferMemory, vkBindBufferMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkBindImageMemory, vkBindImageMemory)
-    COPY_DEVICE_TO_VMA_FUNC(vkGetBufferMemoryRequirements, vkGetBufferMemoryRequirements)
-    COPY_DEVICE_TO_VMA_FUNC(vkGetImageMemoryRequirements, vkGetImageMemoryRequirements)
-    COPY_DEVICE_TO_VMA_FUNC(vkCreateBuffer, vkCreateBuffer)
-    COPY_DEVICE_TO_VMA_FUNC(vkDestroyBuffer, vkDestroyBuffer)
-    COPY_DEVICE_TO_VMA_FUNC(vkCreateImage, vkCreateImage)
-    COPY_DEVICE_TO_VMA_FUNC(vkDestroyImage, vkDestroyImage)
-    COPY_DEVICE_TO_VMA_FUNC(vkCmdCopyBuffer, vkCmdCopyBuffer)
-#if VMA_VULKAN_VERSION >= 1001000
-    if (pAllocatorCreateInfo->vulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
-    {
-        COPY_GLOBAL_TO_VMA_FUNC(vkGetPhysicalDeviceMemoryProperties2, vkGetPhysicalDeviceMemoryProperties2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkGetBufferMemoryRequirements2, vkGetBufferMemoryRequirements2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkGetImageMemoryRequirements2, vkGetImageMemoryRequirements2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkBindBufferMemory2, vkBindBufferMemory2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkBindImageMemory2, vkBindImageMemory2KHR)
-    }
-#endif
-#if VMA_VULKAN_VERSION >= 1003000
-    if (pAllocatorCreateInfo->vulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))
-    {
-        COPY_DEVICE_TO_VMA_FUNC(vkGetDeviceBufferMemoryRequirements, vkGetDeviceBufferMemoryRequirements)
-        COPY_DEVICE_TO_VMA_FUNC(vkGetDeviceImageMemoryRequirements, vkGetDeviceImageMemoryRequirements)
-    }
-#endif
-#if VMA_KHR_MAINTENANCE4
-    if((pAllocatorCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_MAINTENANCE4_BIT) != 0)
-    {
-        COPY_DEVICE_TO_VMA_FUNC(vkGetDeviceBufferMemoryRequirementsKHR, vkGetDeviceBufferMemoryRequirements)
-        COPY_DEVICE_TO_VMA_FUNC(vkGetDeviceImageMemoryRequirementsKHR, vkGetDeviceImageMemoryRequirements)
-    }
-#endif
-#if VMA_DEDICATED_ALLOCATION
-    if ((pAllocatorCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0)
-    {
-        COPY_DEVICE_TO_VMA_FUNC(vkGetBufferMemoryRequirements2KHR, vkGetBufferMemoryRequirements2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkGetImageMemoryRequirements2KHR, vkGetImageMemoryRequirements2KHR)
-    }
-#endif
-#if VMA_BIND_MEMORY2
-    if ((pAllocatorCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0)
-    {
-        COPY_DEVICE_TO_VMA_FUNC(vkBindBufferMemory2KHR, vkBindBufferMemory2KHR)
-        COPY_DEVICE_TO_VMA_FUNC(vkBindImageMemory2KHR, vkBindImageMemory2KHR)
-    }
-#endif
-#if VMA_MEMORY_BUDGET
-    if ((pAllocatorCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0)
-    {
-        COPY_GLOBAL_TO_VMA_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, vkGetPhysicalDeviceMemoryProperties2KHR)
-    }
-#endif
-#if VMA_EXTERNAL_MEMORY_WIN32
-    if ((pAllocatorCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT) != 0)
-    {
-        COPY_DEVICE_TO_VMA_FUNC(vkGetMemoryWin32HandleKHR, vkGetMemoryWin32HandleKHR)
-    }
-#endif
-
-#undef COPY_DEVICE_TO_VMA_FUNC
-#undef COPY_GLOBAL_TO_VMA_FUNC
-
-    return VK_SUCCESS;
-}
-
-#endif // #ifdef VOLK_HEADER_VERSION
-
 VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(
     const VmaAllocatorCreateInfo* pCreateInfo,
     VmaAllocator* pAllocator)
 {
     VMA_ASSERT(pCreateInfo && pAllocator);
     VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 ||
-        (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 4));
+        (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 3));
     VMA_DEBUG_LOG("vmaCreateAllocator");
     *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo);
     VkResult result = (*pAllocator)->Init(pCreateInfo);
@@ -15570,7 +15185,7 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(
 
     const VkDevice hDev = allocator->m_hDevice;
     const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();
-    VkResult res = VK_SUCCESS;
+    VkResult res;
 
 #if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000
     if(funcs->vkGetDeviceBufferMemoryRequirements)
@@ -15622,7 +15237,7 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(
 
     const VkDevice hDev = allocator->m_hDevice;
     const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();
-    VkResult res = VK_SUCCESS;
+    VkResult res;
 
 #if VMA_KHR_MAINTENANCE4 || VMA_VULKAN_VERSION >= 1003000
     if(funcs->vkGetDeviceImageMemoryRequirements)
@@ -16565,9 +16180,6 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(
 {
     VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation);
 
-    VMA_ASSERT((pImageCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT_COPY) == 0 &&
-        "vmaCreateImage() doesn't support disjoint multi-planar images. Please allocate memory for the planes using vmaAllocateMemory() and bind them using vmaBindImageMemory2().");
-
     if(pImageCreateInfo->extent.width == 0 ||
         pImageCreateInfo->extent.height == 0 ||
         pImageCreateInfo->extent.depth == 0 ||
@@ -16590,7 +16202,7 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(
         pImageCreateInfo,
         allocator->GetAllocationCallbacks(),
         pImage);
-    if(res == VK_SUCCESS)
+    if(res >= 0)
     {
         VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ?
             VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL :
@@ -16615,14 +16227,14 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(
             1, // allocationCount
             pAllocation);
 
-        if(res == VK_SUCCESS)
+        if(res >= 0)
         {
             // 3. Bind image with memory.
             if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)
             {
                 res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL);
             }
-            if(res == VK_SUCCESS)
+            if(res >= 0)
             {
                 // All steps succeeded.
                 #if VMA_STATS_STRING_ENABLED
@@ -16739,11 +16351,6 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(
     VMA_DEBUG_LOG("vmaCreateVirtualBlock");
     VMA_DEBUG_GLOBAL_MUTEX_LOCK;
     *pVirtualBlock = vma_new(pCreateInfo->pAllocationCallbacks, VmaVirtualBlock_T)(*pCreateInfo);
-    return VK_SUCCESS;
-
-    /*
-    Code for the future if we ever need a separate Init() method that could fail:
-
     VkResult res = (*pVirtualBlock)->Init();
     if(res < 0)
     {
@@ -16751,7 +16358,6 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(
         *pVirtualBlock = VK_NULL_HANDLE;
     }
     return res;
-    */
 }
 
 VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(VmaVirtualBlock VMA_NULLABLE virtualBlock)
@@ -16861,274 +16467,11 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V
         VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString);
     }
 }
-#if VMA_EXTERNAL_MEMORY_WIN32
-VMA_CALL_PRE VkResult VMA_CALL_POST vmaGetMemoryWin32Handle(VmaAllocator VMA_NOT_NULL allocator,
-    VmaAllocation VMA_NOT_NULL allocation, HANDLE hTargetProcess, HANDLE* VMA_NOT_NULL pHandle)
-{
-    VMA_ASSERT(allocator && allocation && pHandle);
-    VMA_DEBUG_GLOBAL_MUTEX_LOCK;
-    return allocation->GetWin32Handle(allocator, hTargetProcess, pHandle);
-}
-#endif // VMA_EXTERNAL_MEMORY_WIN32 
 #endif // VMA_STATS_STRING_ENABLED
 #endif // _VMA_PUBLIC_INTERFACE
 #endif // VMA_IMPLEMENTATION
 
 /**
-\page faq Frequenty asked questions
-
-<b>What is VMA?</b>
-
-Vulkan(R) Memory Allocator (VMA) is a software library for developers who use the Vulkan graphics API in their code.
-It is written in C++.
-
-<b>What is the license of VMA?</b>
-
-VMA is licensed under MIT, which means it is open source and free software.
-
-<b>What is the purpose of VMA?</b>
-
-VMA helps with handling one aspect of Vulkan usage, which is device memory management -
-allocation of `VkDeviceMemory` objects, and creation of `VkBuffer` and `VkImage` objects.
-
-<b>Do I need to use VMA?</b>
-
-You don't need to, but it may be beneficial in many cases.
-Vulkan is a complex and low-level API, so libraries like this that abstract certain aspects of the API
-and bring them to a higher level are useful.
-When developing any non-trivial Vulkan application, you likely need to use a memory allocator.
-Using VMA can save time compared to implementing your own.
-
-<b>When should I not use VMA?</b>
-
-While VMA is useful for most applications that use the Vulkan API, there are cases
-when it may be a better choice not to use it.
-For example, if the application is very simple, e.g. serving as a sample or a learning exercise
-to help you understand or teach others the basics of Vulkan,
-and it creates only a small number of buffers and images, then including VMA may be an overkill.
-Developing your own memory allocator may also be a good learning exercise.
-
-<b>What are the benefits of using VMA?</b>
-
--# VMA helps in choosing the optimal memory type for your resource (buffer or image).
-   In Vulkan, we have a two-level hierarchy of memory heaps and types with different flags,
-   and each device can expose a different set of those.
-   Implementing logic that would select the best memory type on each platform is a non-trivial task.
-   VMA does that, expecting only a high-level description of the intended usage of your resource.
-   For more information, see \subpage choosing_memory_type.
--# VMA allocates large blocks of `VkDeviceMemory` and sub-allocates parts of them for your resources.
-   Allocating a new block of device memory may be a time-consuming operation.
-   Some platforms also have a limit on the maximum number of those blocks (`VkPhysicalDeviceLimits::maxMemoryAllocationCount`)
-   as low as 4096, so allocating a separate one for each resource is not an option.
-   Sub-allocating parts of a memory block requires implementing an allocation algorithm,
-   which is a non-trivial task.
-   VMA does that, using an advanced and efficient algorithm that works well in various use cases.
--# VMA offers a simple API that allows creating buffers and textures within one function call.
-   In Vulkan, the creation of a resource is a multi-step process.
-   You need to create a `VkBuffer` or `VkImage`, ask it for memory requirements,
-   allocate a `VkDeviceMemory` object, and finally bind the resource to the memory block.
-   VMA does that automatically under a simple API within one function call: vmaCreateBuffer(), vmaCreateImage().
-
-The library is doing much more under the hood.
-For example, it respects limits like `bufferImageGranularity`, `nonCoherentAtomSize`,
-and `VkMemoryDedicatedRequirements` automatically, so you don't need to think about it.
-
-<b>Which version should I pick?</b>
-
-You can just pick [the latest version from the "master" branch](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator).
-It is kept in a good shape most of the time, compiling and working correctly,
-with no compatibility-breaking changes and no unfinished code.
-
-If you want an even more stable version, you can pick
-[the latest official release](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/releases).
-Current code from the master branch is occasionally tagged as a release,
-with [CHANGELOG](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/blob/master/CHANGELOG.md)
-carefully curated to enumerate all important changes since the previous version.
-
-The library uses [Semantic Versioning](https://semver.org/),
-which means versions that only differ in the patch number are forward and backward compatible
-(e.g., only fixing some bugs), while versions that differ in the minor number are backward compatible
-(e.g., only adding new functions to the API, but not removing or changing existing ones).
-
-<b>How to integrate it with my code?</b>
-
-VMA is an STB-style single-header C++ library.
-
-You can pull the entire GitHub repository, e.g. using Git submodules.
-The repository contains ancillary files like the Cmake script, Doxygen config file,
-sample application, test suite, and others.
-You can compile it as a library and link with your project.
-
-However, a simpler way is taking the single file "include/vk_mem_alloc.h" and including it in your project.
-This extensive file contains all you need: a copyright notice,
-declarations of the public library interface (API), its internal implementation,
-and even the documentation in form of Doxygen-style comments.
-
-The "STB style" means not everything is implemented as inline functions in the header file.
-You need to extract the internal implementation using a special macro.
-This means that in every .cpp file where you need to use the library you should
-`#include "vk_mem_alloc.h"` to include its public interface,
-but additionally in exactly one .cpp file you should `#define VMA_IMPLEMENTATION`
-before this `#include` to enable its internal implementation.
-For more information, see [Project setup](@ref quick_start_project_setup).
-
-<b>Does the library work with C or C++?</b>
-
-The internal implementation of VMA is written in C++.
-It is distributed in the source format, so you need a compiler supporting at least C++14 to build it.
-
-However, the public interface of the library is written in C - using only enums, structs, and global functions,
-in the same style as Vulkan, so you can use the library in the C code.
-
-<b>I am not a fan of modern C++. Can I still use it?</b>
-
-Very likely yes.
-We acknowledge that many C++ developers, especially in the games industry,
-do not appreciate all the latest features that the language has to offer.
-
-- VMA doesn't throw or catch any C++ exceptions.
-  It reports errors by returning a `VkResult` value instead, just like Vulkan.
-  If you don't use exceptions in your project, your code is not exception-safe,
-  or even if you disable exception handling in the compiler options, you can still use VMA.
-- VMA doesn't use C++ run-time type information like `typeid` or `dynamic_cast`,
-  so if you disable RTTI in the compiler options, you can still use the library.
-- VMA uses only a limited subset of standard C and C++ library.
-  It doesn't use STL containers like `std::vector`, `map`, or `string`,
-  either in the public interface nor in the internal implementation.
-  It implements its own containers instead.
-- If you don't use the default heap memory allocator through `malloc/free` or `new/delete`
-  but implement your own allocator instead, you can pass it to VMA and
-  the library will use your functions for every dynamic heap allocation made internally,
-  as well as passing it further to Vulkan functions. For details, see [Custom host memory allocator](@ref custom_memory_allocator).
-
-<b>Is it available for other programming languages?</b>
-
-VMA is a C++ library with C interface in similar style as Vulkan.
-An object-oriented C++ wrapper or bindings to other programming languages are out of scope of this project,
-but they are welcome as external projects.
-Some of them are listed in [README.md, "See also" section](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator?tab=readme-ov-file#see-also),
-including binding to C++, Python, Rust, and Haskell.
-Before using any of them, please check if they are still maintained and updated to use a recent version of VMA.
-
-<b>What platforms does it support?</b>
-
-VMA relies only on Vulkan and some parts of the standard C and C++ library,
-so it supports any platform where a C++ compiler and Vulkan are available.
-It is developed mostly on Microsoft(R) Windows(R),
-but it has been successfully used in Linux(R), MacOS, Android, and even FreeBSD and Raspberry Pi.
-
-<b>Does it only work on AMD GPUs?</b>
-
-No! While VMA is published by AMD, it works on any GPU that supports Vulkan,
-whether a discrete PC graphics card, a processor integrated graphics, or a mobile SoC.
-It doesn't give AMD GPUs any advantage over any other GPUs.
-
-<b>What Vulkan versions and extensions are supported?</b>
-
-VMA is updated to support the latest versions of Vulkan.
-It currently supports Vulkan up to 1.4.
-The library also supports older versions down to the first release of Vulkan 1.0.
-Defining a higher minimum version support would help simplify the code,
-but we acknowledge that developers on some platforms like Android still use older versions,
-so the support is provided for all of them.
-
-Among many extensions available for Vulkan, only a few interact with memory management.
-VMA can automatically take advantage of them. Some of them are:
-VK_EXT_memory_budget, VK_EXT_memory_priority, VK_KHR_external_memory_win32, and VK_KHR_maintenance*
-extensions that are later promoted to the new versions of the core Vulkan API.
-
-To use them, it is your responsibility to validate if they are available on the current system and if so,
-enable them while creating the Vulkan device object.
-You also need to pass appropriate #VmaAllocatorCreateFlagBits to inform VMA that they are enabled.
-Then, the library will automatically take advantage of them.
-For more information and the full list of supported extensions, see [Enabling extensions](@ref quick_start_initialization_enabling_extensions).
-
-<b>Does it support other graphics APIs, like Microsoft DirectX(R) 12?</b>
-
-No, but we offer an equivalent library for DirectX 12:
-[D3D12 Memory Allocator](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator).
-It uses the same core allocation algorithm.
-It also shares many features with VMA, like the support for custom pools and virtual allocator.
-However, it is not identical in terms of the features supported.
-Its API also looks different, because while the interface of VMA is similar in style to Vulkan,
-the interface of D3D12MA is similar to DirectX 12.
-
-<b>Is the library lightweight?</b>
-
-It depends on how you define it.
-VMA is implemented with high-performance and real-time applications like video games in mind.
-The CPU performance overhead of using this library is low.
-It uses a high-quality allocation algorithm called Two-Level Segregated Fit (TLSF),
-which in most cases can find a free place for a new allocation in few steps.
-The library also doesn't perform too many CPU heap allocations.
-In many cases, the allocation happens with 0 new CPU heap allocations performed by the library.
-Even the creation of a #VmaAllocation object doesn't typically feature an CPU allocation,
-because these objects are returned out of a dedicated memory pool.
-
-On the other hand, however, VMA needs some extra memory and extra time
-to maintain the metadata about the occupied and free regions of the memory blocks,
-and the algorithms and data structures used must be generic enough to work well in most cases.
-If you develop your program for a very resource-constrained platform,
-a custom allocator simpler than VMA may be a better choice.
-
-<b>Does it have a documentation?</b>
-
-Yes! VMA comes with full documentation of all elements of the API (functions, structures, enums),
-as well as many generic chapters that provide an introduction,
-describe core concepts of the library, good practices, etc.
-The entire documentation is written in form of code comments inside "vk_mem_alloc.h", in Doxygen format.
-You can access it in multiple ways:
-
-- Browsable online: https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/
-- Local HTML pages available after you clone the repository and open file "docs/html/index.html".
-- You can rebuild the documentation in HTML or some other format from the source code using Doxygen.
-  Configuration file "Doxyfile" is part of the repository.
-- Finally, you can just read the comments preceding declarations of any public functions of the library.
-
-<b>Is it a mature project?</b>
-
-Yes! The library is in development since June 2017, has over 1000 commits, over 400 issue tickets
-and pull requests (most of them resolved), and over 70 contributors.
-It is distributed together with Vulkan SDK.
-It is used by many software projects, including some large and popular ones like Qt or Blender,
-as well as some AAA games.
-According to the [LunarG 2024 Ecosystem Survey](https://www.lunarg.com/2024-ecosystem-survey-progress-report-released/),
-it is used by over 50% of Vulkan developers.
-
-<b>How can I contribute to the project?</b>
-
-If you have an idea for improvement or a feature request,
-you can go to [the library repository](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
-and create an Issue ticket, describing your idea.
-You can also implement it yourself by forking the repository, making changes to the code,
-and creating a Pull request.
-
-If you want to ask a question, you can also create a ticket the same way.
-Before doing this, please make sure you read the relevant part of the Vulkan specification and VMA documentation,
-where you may find the answers to your question.
-
-If you want to report a suspected bug, you can also create a ticket the same way.
-Before doing this, please put some effort into the investigation of whether the bug is really
-in the library and not in your code or in the Vulkan implementation (the GPU driver) on your platform:
-
-- Enable Vulkan validation layer and make sure it is free from any errors.
-- Make sure `VMA_ASSERT` is defined to an implementation that can report a failure and not ignore it.
-- Try making your allocation using pure Vulkan functions rather than VMA and see if the bug persists.
-
-<b>I found some compilation warnings. How can we fix them?</b>
-
-Seeing compiler warnings may be annoying to some developers,
-but it is a design decision to not fix all of them.
-Due to the nature of the C++ language, certain preprocessor macros can make some variables unused,
-function parameters unreferenced, or conditional expressions constant in some configurations.
-The code of this library should not be bigger or more complicated just to silence these warnings.
-It is recommended to disable such warnings instead.
-For more information, see [Features not supported](@ref general_considerations_features_not_supported).
-
-However, if you observe a warning that is really dangerous, e.g.,
-about an implicit conversion from a larger to a smaller integer type, please report it and it will be fixed ASAP.
-
-
 \page quick_start Quick start
 
 \section quick_start_project_setup Project setup
@@ -17224,7 +16567,7 @@ See code sample below.
 
 \subsection quick_start_initialization_importing_vulkan_functions Importing Vulkan functions
 
-You may need to configure importing Vulkan functions. There are 4 ways to do this:
+You may need to configure importing Vulkan functions. There are 3 ways to do this:
 
 -# **If you link with Vulkan static library** (e.g. "vulkan-1.lib" on Windows):
    - You don't need to do anything.
@@ -17235,13 +16578,10 @@ You may need to configure importing Vulkan functions. There are 4 ways to do thi
    - Provide pointers to these two functions via VmaVulkanFunctions::vkGetInstanceProcAddr,
      VmaVulkanFunctions::vkGetDeviceProcAddr.
    - The library will fetch pointers to all other functions it needs internally.
--# **If you fetch pointers to all Vulkan functions in a custom way**:
+-# **If you fetch pointers to all Vulkan functions in a custom way**, e.g. using some loader like
+   [Volk](https://github.com/zeux/volk):
    - Define `VMA_STATIC_VULKAN_FUNCTIONS` and `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 0.
    - Pass these pointers via structure #VmaVulkanFunctions.
--# **If you use [volk library](https://github.com/zeux/volk)**:
-   - Define `VMA_STATIC_VULKAN_FUNCTIONS` and `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 0.
-   - Use function vmaImportVulkanFunctionsFromVolk() to fill in the structure #VmaVulkanFunctions.
-     For more information, see the description of this function.
 
 \subsection quick_start_initialization_enabling_extensions Enabling extensions
 
@@ -17260,7 +16600,6 @@ VK_EXT_memory_budget          | #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT
 VK_KHR_buffer_device_address  | #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT
 VK_EXT_memory_priority        | #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT
 VK_AMD_device_coherent_memory | #VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT
-VK_KHR_external_memory_win32  | #VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT
 
 Example with fetching pointers to Vulkan functions dynamically:
 
@@ -17489,7 +16828,7 @@ memory type 2, use following code:
 uint32_t memoryTypeIndex = 2;
 
 VmaAllocationCreateInfo allocInfo = {};
-allocInfo.memoryTypeBits = 1U << memoryTypeIndex;
+allocInfo.memoryTypeBits = 1u << memoryTypeIndex;
 
 VkBuffer buffer;
 VmaAllocation allocation;
@@ -17507,7 +16846,7 @@ by setting all bits of `memoryTypeBits` to 1 except the ones you choose.
 uint32_t excludedMemoryTypeIndex = 2;
 VmaAllocationCreateInfo allocInfo = {};
 allocInfo.usage = VMA_MEMORY_USAGE_AUTO;
-allocInfo.memoryTypeBits = ~(1U << excludedMemoryTypeIndex);
+allocInfo.memoryTypeBits = ~(1u << excludedMemoryTypeIndex);
 // ...
 \endcode
 
@@ -17747,7 +17086,7 @@ implementation whether the allocation succeeds or fails. You can change this beh
 by using #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag. With it, the allocation is
 not made if it would exceed the budget or if the budget is already exceeded.
 VMA then tries to make the allocation from the next eligible Vulkan memory type.
-If all of them fail, the call then fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+The all of them fail, the call then fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
 Example usage pattern may be to pass the #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag
 when creating resources that are not essential for the application (e.g. the texture
 of a specific object) and not to pass it when creating critically important resources
@@ -17929,7 +17268,7 @@ VkResult res = vmaFindMemoryTypeIndexForBufferInfo(allocator,
 // Create a pool that can have at most 2 blocks, 128 MiB each.
 VmaPoolCreateInfo poolCreateInfo = {};
 poolCreateInfo.memoryTypeIndex = memTypeIndex;
-poolCreateInfo.blockSize = 128ULL * 1024 * 1024;
+poolCreateInfo.blockSize = 128ull * 1024 * 1024;
 poolCreateInfo.maxBlockCount = 2;
 
 VmaPool pool;
@@ -18036,7 +17375,7 @@ Many of the common concerns can be addressed in a different way than using custo
 - If you want to choose a custom size for the default memory block, you can set it globally instead
   using VmaAllocatorCreateInfo::preferredLargeHeapBlockSize.
 - If you want to select specific memory type for your allocation,
-  you can set VmaAllocationCreateInfo::memoryTypeBits to `(1U << myMemoryTypeIndex)` instead.
+  you can set VmaAllocationCreateInfo::memoryTypeBits to `(1u << myMemoryTypeIndex)` instead.
 - If you need to create a buffer with certain minimum alignment, you can still do it
   using default pools with dedicated function vmaCreateBufferWithAlignment().
 
@@ -18887,8 +18226,7 @@ allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |
 VkBuffer buf;
 VmaAllocation alloc;
 VmaAllocationInfo allocInfo;
-VkResult result = vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
-// Check result...
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
 
 VkMemoryPropertyFlags memPropFlags;
 vmaGetAllocationMemoryProperties(allocator, alloc, &memPropFlags);
@@ -18899,24 +18237,10 @@ if(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
 
     // [Executed in runtime]:
     memcpy(allocInfo.pMappedData, myData, myDataSize);
-    result = vmaFlushAllocation(allocator, alloc, 0, VK_WHOLE_SIZE);
-    // Check result...
-
-    VkBufferMemoryBarrier bufMemBarrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER };
-    bufMemBarrier.srcAccessMask = VK_ACCESS_HOST_WRITE_BIT;
-    bufMemBarrier.dstAccessMask = VK_ACCESS_UNIFORM_READ_BIT;
-    bufMemBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier.buffer = buf;
-    bufMemBarrier.offset = 0;
-    bufMemBarrier.size = VK_WHOLE_SIZE;
-
-    vkCmdPipelineBarrier(cmdBuf, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
-        0, 0, nullptr, 1, &bufMemBarrier, 0, nullptr);
 }
 else
 {
-    // Allocation ended up in a non-mappable memory - a transfer using a staging buffer is required.
+    // Allocation ended up in a non-mappable memory - need to transfer.
     VkBufferCreateInfo stagingBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
     stagingBufCreateInfo.size = 65536;
     stagingBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
@@ -18929,46 +18253,18 @@ else
     VkBuffer stagingBuf;
     VmaAllocation stagingAlloc;
     VmaAllocationInfo stagingAllocInfo;
-    result = vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo,
-        &stagingBuf, &stagingAlloc, &stagingAllocInfo);
-    // Check result...
+    vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo,
+        &stagingBuf, &stagingAlloc, stagingAllocInfo);
 
     // [Executed in runtime]:
     memcpy(stagingAllocInfo.pMappedData, myData, myDataSize);
-    result = vmaFlushAllocation(allocator, stagingAlloc, 0, VK_WHOLE_SIZE);
-    // Check result...
-
-    VkBufferMemoryBarrier bufMemBarrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER };
-    bufMemBarrier.srcAccessMask = VK_ACCESS_HOST_WRITE_BIT;
-    bufMemBarrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
-    bufMemBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier.buffer = stagingBuf;
-    bufMemBarrier.offset = 0;
-    bufMemBarrier.size = VK_WHOLE_SIZE;
-
-    vkCmdPipelineBarrier(cmdBuf, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-        0, 0, nullptr, 1, &bufMemBarrier, 0, nullptr);
-
+    vmaFlushAllocation(allocator, stagingAlloc, 0, VK_WHOLE_SIZE);
+    //vkCmdPipelineBarrier: VK_ACCESS_HOST_WRITE_BIT --> VK_ACCESS_TRANSFER_READ_BIT
     VkBufferCopy bufCopy = {
         0, // srcOffset
         0, // dstOffset,
-        myDataSize, // size
-    };
-
+        myDataSize); // size
     vkCmdCopyBuffer(cmdBuf, stagingBuf, buf, 1, &bufCopy);
-
-    VkBufferMemoryBarrier bufMemBarrier2 = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER };
-    bufMemBarrier2.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-    bufMemBarrier2.dstAccessMask = VK_ACCESS_UNIFORM_READ_BIT; // We created a uniform buffer
-    bufMemBarrier2.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier2.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    bufMemBarrier2.buffer = buf;
-    bufMemBarrier2.offset = 0;
-    bufMemBarrier2.size = VK_WHOLE_SIZE;
-
-    vkCmdPipelineBarrier(cmdBuf, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
-        0, 0, nullptr, 1, &bufMemBarrier2, 0, nullptr);
 }
 \endcode
 
@@ -19001,22 +18297,14 @@ Please check "CONFIGURATION SECTION" in the code to find macros that you can def
 before each include of this file or change directly in this file to provide
 your own implementation of basic facilities like assert, `min()` and `max()` functions,
 mutex, atomic etc.
+The library uses its own implementation of containers by default, but you can switch to using
+STL containers instead.
 
 For example, define `VMA_ASSERT(expr)` before including the library to provide
 custom implementation of the assertion, compatible with your project.
 By default it is defined to standard C `assert(expr)` in `_DEBUG` configuration
 and empty otherwise.
 
-Similarly, you can define `VMA_LEAK_LOG_FORMAT` macro to enable printing of leaked (unfreed) allocations,
-including their names and other parameters. Example:
-
-\code
-#define VMA_LEAK_LOG_FORMAT(format, ...) do { \
-        printf((format), __VA_ARGS__); \
-        printf("\n"); \
-    } while(false)
-\endcode
-
 \section config_Vulkan_functions Pointers to Vulkan functions
 
 There are multiple ways to import pointers to Vulkan functions in the library.
@@ -19175,7 +18463,7 @@ When using this extension, you should initialize following member:
 - VmaAllocationCreateInfo::priority when creating a dedicated allocation with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
 - VmaPoolCreateInfo::priority when creating a custom pool.
 
-It should be a floating-point value between `0.0f` and `1.0f`, where recommended default is `0.5F`.
+It should be a floating-point value between `0.0f` and `1.0f`, where recommended default is `0.5f`.
 Memory allocated with higher value can be treated by the Vulkan implementation as higher priority
 and so it can have lower chances of being pushed out to system memory, experiencing degraded performance.
 
@@ -19211,7 +18499,7 @@ vmaCreateImage(allocator, &imgCreateInfo, &allocCreateInfo, &img, &alloc, nullpt
 - Allocations created in custom pools: They inherit the priority, along with all other allocation parameters
   from the parameters passed in #VmaPoolCreateInfo when the pool was created.
 - Allocations created in default pools: They inherit the priority from the parameters
-  VMA used when creating default pools, which means `priority == 0.5F`.
+  VMA used when creating default pools, which means `priority == 0.5f`.
 
 
 \page vk_amd_device_coherent_memory VK_AMD_device_coherent_memory
@@ -19261,7 +18549,7 @@ devices. There are multiple ways to do it, for example:
   or VmaAllocationCreateInfo::preferredFlags. Those flags can be freely mixed with
   other ways of \ref choosing_memory_type, like setting VmaAllocationCreateInfo::usage.
 - If you manually found memory type index to use for this purpose, force allocation
-  from this specific index by setting VmaAllocationCreateInfo::memoryTypeBits `= 1U << index`.
+  from this specific index by setting VmaAllocationCreateInfo::memoryTypeBits `= 1u << index`.
 
 \section vk_amd_device_coherent_memory_more_information More information
 
@@ -19271,145 +18559,6 @@ Example use of this extension can be found in the code of the sample and test su
 accompanying this library.
 
 
-\page vk_khr_external_memory_win32 VK_KHR_external_memory_win32
-
-On Windows, the VK_KHR_external_memory_win32 device extension allows exporting a Win32 `HANDLE`
-of a `VkDeviceMemory` block, to be able to reference the memory on other Vulkan logical devices or instances,
-in multiple processes, and/or in multiple APIs.
-VMA offers support for it.
-
-\section vk_khr_external_memory_win32_initialization Initialization
-
-1) Make sure the extension is defined in the code by including following header before including VMA:
-
-\code
-#include <vulkan/vulkan_win32.h>
-\endcode
-
-2) Check if "VK_KHR_external_memory_win32" is available among device extensions.
-Enable it when creating the `VkDevice` object.
-
-3) Enable the usage of this extension in VMA by setting flag #VMA_ALLOCATOR_CREATE_KHR_EXTERNAL_MEMORY_WIN32_BIT
-when calling vmaCreateAllocator().
-
-4) Make sure that VMA has access to the `vkGetMemoryWin32HandleKHR` function by either enabling `VMA_DYNAMIC_VULKAN_FUNCTIONS` macro
-or setting VmaVulkanFunctions::vkGetMemoryWin32HandleKHR explicitly.
-For more information, see \ref quick_start_initialization_importing_vulkan_functions.
-
-\section vk_khr_external_memory_win32_preparations Preparations
-
-You can find example usage among tests, in file "Tests.cpp", function `TestWin32Handles()`.
-
-To use the extenion, buffers need to be created with `VkExternalMemoryBufferCreateInfoKHR` attached to their `pNext` chain,
-and memory allocations need to be made with `VkExportMemoryAllocateInfoKHR` attached to their `pNext` chain.
-To make use of them, you need to use \ref custom_memory_pools. Example:
-
-\code
-// Define an example buffer and allocation parameters.
-VkExternalMemoryBufferCreateInfoKHR externalMemBufCreateInfo = {
-    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR,
-    nullptr,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
-};
-VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
-exampleBufCreateInfo.size = 0x10000; // Doesn't matter here.
-exampleBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
-exampleBufCreateInfo.pNext = &externalMemBufCreateInfo;
-
-VmaAllocationCreateInfo exampleAllocCreateInfo = {};
-exampleAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;
-
-// Find memory type index to use for the custom pool.
-uint32_t memTypeIndex;
-VkResult res = vmaFindMemoryTypeIndexForBufferInfo(g_Allocator,
-    &exampleBufCreateInfo, &exampleAllocCreateInfo, &memTypeIndex);
-// Check res...
-
-// Create a custom pool.
-constexpr static VkExportMemoryAllocateInfoKHR exportMemAllocInfo = {
-    VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR,
-    nullptr,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
-};
-VmaPoolCreateInfo poolCreateInfo = {};
-poolCreateInfo.memoryTypeIndex = memTypeIndex;
-poolCreateInfo.pMemoryAllocateNext = (void*)&exportMemAllocInfo;
-
-VmaPool pool;
-res = vmaCreatePool(g_Allocator, &poolCreateInfo, &pool);
-// Check res...
-
-// YOUR OTHER CODE COMES HERE....
-
-// At the end, don't forget to destroy it!
-vmaDestroyPool(g_Allocator, pool);
-\endcode
-
-Note that the structure passed as VmaPoolCreateInfo::pMemoryAllocateNext must remain alive and unchanged
-for the whole lifetime of the custom pool, because it will be used when the pool allocates a new device memory block.
-No copy is made internally. This is why variable `exportMemAllocInfo` is defined as `static`.
-
-\section vk_khr_external_memory_win32_memory_allocation Memory allocation
-
-Finally, you can create a buffer with an allocation out of the custom pool.
-The buffer should use same flags as the sample buffer used to find the memory type.
-It should also specify `VkExternalMemoryBufferCreateInfoKHR` in its `pNext` chain.
-
-\code
-VkExternalMemoryBufferCreateInfoKHR externalMemBufCreateInfo = {
-    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR,
-    nullptr,
-    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
-};
-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
-bufCreateInfo.size = // Your desired buffer size.
-bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
-bufCreateInfo.pNext = &externalMemBufCreateInfo;
-
-VmaAllocationCreateInfo allocCreateInfo = {};
-allocCreateInfo.pool = pool;  // It is enough to set this one member.
-
-VkBuffer buf;
-VmaAllocation alloc;
-res = vmaCreateBuffer(g_Allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, nullptr);
-// Check res...
-
-// YOUR OTHER CODE COMES HERE....
-
-// At the end, don't forget to destroy it!
-vmaDestroyBuffer(g_Allocator, buf, alloc);
-\endcode
-
-If you need each allocation to have its own device memory block and start at offset 0, you can still do 
-by using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag. It works also with custom pools.
-
-\section vk_khr_external_memory_win32_exporting_win32_handle Exporting Win32 handle
-
-After the allocation is created, you can acquire a Win32 `HANDLE` to the `VkDeviceMemory` block it belongs to.
-VMA function vmaGetMemoryWin32Handle() is a replacement of the Vulkan function `vkGetMemoryWin32HandleKHR`.
-
-\code
-HANDLE handle;
-res = vmaGetMemoryWin32Handle(g_Allocator, alloc, nullptr, &handle);
-// Check res...
-
-// YOUR OTHER CODE COMES HERE....
-
-// At the end, you must close the handle.
-CloseHandle(handle);
-\endcode
-
-Documentation of the VK_KHR_external_memory_win32 extension states that:
-
-> If handleType is defined as an NT handle, vkGetMemoryWin32HandleKHR must be called no more than once for each valid unique combination of memory and handleType.
-
-This is ensured automatically inside VMA.
-The library fetches the handle on first use, remembers it internally, and closes it when the memory block or dedicated allocation is destroyed.
-Every time you call vmaGetMemoryWin32Handle(), VMA calls `DuplicateHandle` and returns a new handle that you need to close.
-
-For further information, please check documentation of the vmaGetMemoryWin32Handle() function.
-
-
 \page enabling_buffer_device_address Enabling buffer device address
 
 Device extension VK_KHR_buffer_device_address
diff --git a/engine/thirdparty/wayland-protocols/staging/color-management/README b/engine/thirdparty/wayland-protocols/staging/color-management/README
deleted file mode 100644
index e14f2a8c..00000000
--- a/engine/thirdparty/wayland-protocols/staging/color-management/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Color management and HDR protocol
-
-Maintainers:
-Sebastian Wick <sebastian at sebastianwick.net>
-Pekka Paalanen <pekka.paalanen@collabora.com>
-
-
-Historical credits not mentioned in the first commit:
-
-- Niels Ole Salscheider, for an early protocol version
-  https://lists.freedesktop.org/archives/wayland-devel/2014-October/017755.html
diff --git a/engine/thirdparty/wayland-protocols/staging/color-management/color-management-v1.xml b/engine/thirdparty/wayland-protocols/staging/color-management/color-management-v1.xml
deleted file mode 100644
index 0aa59bda..00000000
--- a/engine/thirdparty/wayland-protocols/staging/color-management/color-management-v1.xml
+++ /dev/null
@@ -1,1724 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="color_management_v1">
-  <copyright>
-    Copyright 2019 Sebastian Wick
-    Copyright 2019 Erwin Burema
-    Copyright 2020 AMD
-    Copyright 2020-2024 Collabora, Ltd.
-    Copyright 2024 Xaver Hugl
-    Copyright 2022-2025 Red Hat, Inc.
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <description summary="color management protocol">
-    The aim of the color management extension is to allow clients to know
-    the color properties of outputs, and to tell the compositor about the color
-    properties of their content on surfaces. All surface contents must be
-    readily intended for some display, but not necessarily for the display at
-    hand. Doing this enables a compositor to perform automatic color management
-    of content for different outputs according to how content is intended to
-    look like.
-
-    For an introduction, see the section "Color management" in the Wayland
-    documentation at https://wayland.freedesktop.org/docs/html/ .
-
-    The color properties are represented as an image description object which
-    is immutable after it has been created. A wl_output always has an
-    associated image description that clients can observe. A wl_surface
-    always has an associated preferred image description as a hint chosen by
-    the compositor that clients can also observe. Clients can set an image
-    description on a wl_surface to denote the color characteristics of the
-    surface contents.
-
-    An image description essentially defines a display and (indirectly) its
-    viewing environment. An image description includes SDR and HDR colorimetry
-    and encoding, HDR metadata, and some parameters related to the viewing
-    environment. An image description does not include the properties set
-    through color-representation extension. It is expected that the
-    color-representation extension is used in conjunction with the
-    color-management extension when necessary, particularly with the YUV family
-    of pixel formats.
-
-    The normative appendix for this protocol is in the appendix.md file beside
-    this XML file.
-
-    The color-and-hdr repository
-    (https://gitlab.freedesktop.org/pq/color-and-hdr) contains
-    background information on the protocol design and legacy color management.
-    It also contains a glossary, learning resources for digital color, tools,
-    samples and more.
-
-    The terminology used in this protocol is based on common color science and
-    color encoding terminology where possible. The glossary in the color-and-hdr
-    repository shall be the authority on the definition of terms in this
-    protocol.
-
-    Warning! The protocol described in this file is currently in the testing
-    phase. Backward compatible changes may be added together with the
-    corresponding interface version bump. Backward incompatible changes can
-    only be done by creating a new major version of the extension.
-  </description>
-
-  <interface name="wp_color_manager_v1" version="2">
-    <description summary="color manager singleton">
-      A singleton global interface used for getting color management extensions
-      for wl_surface and wl_output objects, and for creating client defined
-      image description objects. The extension interfaces allow
-      getting the image description of outputs and setting the image
-      description of surfaces.
-
-      Compositors should never remove this global.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the color manager">
-        Destroy the wp_color_manager_v1 object. This does not affect any other
-        objects in any way.
-      </description>
-    </request>
-
-    <enum name="error">
-      <entry name="unsupported_feature" value="0"
-             summary="request not supported"/>
-      <entry name="surface_exists" value="1"
-             summary="color management surface exists already"/>
-    </enum>
-
-    <enum name="render_intent">
-      <description summary="rendering intents">
-        See the ICC.1:2022 specification from the International Color Consortium
-        for more details about rendering intents.
-
-        The principles of ICC defined rendering intents apply with all types of
-        image descriptions, not only those with ICC file profiles.
-
-        Compositors must support the perceptual rendering intent. Other
-        rendering intents are optional.
-      </description>
-
-      <entry name="perceptual" value="0"
-             summary="perceptual"/>
-      <entry name="relative" value="1"
-             summary="media-relative colorimetric"/>
-      <entry name="saturation" value="2"
-             summary="saturation"/>
-      <entry name="absolute" value="3"
-             summary="ICC-absolute colorimetric"/>
-      <entry name="relative_bpc" value="4"
-             summary="media-relative colorimetric + black point compensation"/>
-      <entry name="absolute_no_adaptation" value="5" since="2">
-        <description summary="ICC-absolute colorimetric without adaptation">
-          This rendering intent is a modified absolute rendering intent that
-          assumes the viewer is not adapted to the display white point, so no
-          chromatic adaptation between surface and display is done.
-          This can be useful for color proofing applications.
-        </description>
-      </entry>
-    </enum>
-
-    <enum name="feature">
-      <description summary="compositor supported features"/>
-
-      <entry name="icc_v2_v4" value="0"
-             summary="create_icc_creator request"/>
-      <entry name="parametric" value="1"
-             summary="create_parametric_creator request"/>
-      <entry name="set_primaries" value="2"
-             summary="parametric set_primaries request"/>
-      <entry name="set_tf_power" value="3"
-             summary="parametric set_tf_power request"/>
-      <entry name="set_luminances" value="4"
-             summary="parametric set_luminances request"/>
-      <entry name="set_mastering_display_primaries" value="5">
-        <description summary="parametric set_mastering_display_primaries request">
-          The compositor supports set_mastering_display_primaries request with a
-          target color volume fully contained inside the primary color volume.
-        </description>
-      </entry>
-      <entry name="extended_target_volume" value="6">
-        <description summary="parametric target exceeds primary color volume">
-          The compositor additionally supports target color volumes that
-          extend outside of the primary color volume.
-
-          This can only be advertised if feature set_mastering_display_primaries
-          is supported as well.
-        </description>
-      </entry>
-      <entry name="windows_scrgb" value="7"
-             summary="create_windows_scrgb request"/>
-    </enum>
-
-    <enum name="primaries">
-      <description summary="named color primaries">
-        Named color primaries used to encode well-known sets of primaries.
-
-        A value of 0 is invalid and will never be present in the list of enums.
-      </description>
-
-      <entry name="srgb" value="1">
-        <description summary="Color primaries for the sRGB color space as defined by the BT.709 standard">
-          Color primaries as defined by
-          - Rec. ITU-R BT.709-6
-          - Rec. ITU-R BT.1361-0 conventional colour gamut system and extended
-            colour gamut system (historical)
-          - IEC 61966-2-1 sRGB or sYCC
-          - IEC 61966-2-4
-          - Society of Motion Picture and Television Engineers (SMPTE) RP 177
-            (1993) Annex B
-        </description>
-      </entry>
-      <entry name="pal_m" value="2">
-        <description summary="Color primaries for PAL-M as defined by the BT.470 standard">
-          Color primaries as defined by
-          - Rec. ITU-R BT.470-6 System M (historical)
-          - United States National Television System Committee 1953
-            Recommendation for transmission standards for color television
-          - United States Federal Communications Commission (2003) Title 47 Code
-            of Federal Regulations 73.682 (a)(20)
-        </description>
-      </entry>
-      <entry name="pal" value="3">
-        <description summary="Color primaries for PAL as defined by the BT.601 standard">
-          Color primaries as defined by
-          - Rec. ITU-R BT.470-6 System B, G (historical)
-          - Rec. ITU-R BT.601-7 625
-          - Rec. ITU-R BT.1358-0 625 (historical)
-          - Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM
-        </description>
-      </entry>
-      <entry name="ntsc" value="4">
-        <description summary="Color primaries for NTSC as defined by the BT.601 standard">
-          Color primaries as defined by
-          - Rec. ITU-R BT.601-7 525
-          - Rec. ITU-R BT.1358-1 525 or 625 (historical)
-          - Rec. ITU-R BT.1700-0 NTSC
-          - SMPTE 170M (2004)
-          - SMPTE 240M (1999) (historical)
-        </description>
-      </entry>
-      <entry name="generic_film" value="5">
-        <description summary="Generic film with colour filters using Illuminant C">
-          Color primaries as defined by Recommendation ITU-T H.273
-          "Coding-independent code points for video signal type identification"
-          for "generic film".
-        </description>
-      </entry>
-      <entry name="bt2020" value="6">
-        <description summary="Color primaries as defined by the BT.2020 and BT.2100 standard">
-          Color primaries as defined by
-          - Rec. ITU-R BT.2020-2
-          - Rec. ITU-R BT.2100-0
-        </description>
-      </entry>
-      <entry name="cie1931_xyz" value="7">
-        <description summary="Color primaries of the full CIE 1931 XYZ color space">
-          Color primaries as defined as the maximum of the CIE 1931 XYZ color
-          space by
-          - SMPTE ST 428-1
-          - (CIE 1931 XYZ as in ISO 11664-1)
-        </description>
-      </entry>
-      <entry name="dci_p3" value="8">
-        <description summary="Color primaries of the DCI P3 color space as defined by the SMPTE RP 431 standard">
-          Color primaries as defined by Digital Cinema System and published in
-          SMPTE RP 431-2 (2011).
-        </description>
-      </entry>
-      <entry name="display_p3" value="9">
-        <description summary="Color primaries of Display P3 variant of the DCI-P3 color space as defined by the SMPTE EG 432 standard">
-          Color primaries as defined by Digital Cinema System and published in
-          SMPTE EG 432-1 (2010).
-        </description>
-      </entry>
-      <entry name="adobe_rgb" value="10">
-        <description summary="Color primaries of the Adobe RGB color space as defined by the ISO 12640 standard">
-          Color primaries as defined by Adobe as "Adobe RGB" and later published
-          by ISO 12640-4 (2011).
-        </description>
-      </entry>
-    </enum>
-
-    <enum name="transfer_function">
-      <description summary="named transfer functions">
-        Named transfer functions used to represent well-known transfer
-        characteristics of displays.
-
-        A value of 0 is invalid and will never be present in the list of enums.
-
-        See appendix.md for the formulae.
-      </description>
-
-      <entry name="bt1886" value="1">
-        <description summary="BT.1886 display transfer characteristic">
-          Rec. ITU-R BT.1886 is the display transfer characteristic assumed by
-          - Rec. ITU-R BT.601-7 525 and 625
-          - Rec. ITU-R BT.709-6
-          - Rec. ITU-R BT.2020-2
-
-          This TF implies these default luminances from Rec. ITU-R BT.2035:
-          - primary color volume minimum: 0.01 cd/m²
-          - primary color volume maximum: 100 cd/m²
-          - reference white: 100 cd/m²
-        </description>
-      </entry>
-      <entry name="gamma22" value="2">
-        <description summary="Assumed display gamma 2.2 transfer function">
-          Transfer characteristics as defined by
-          - Rec. ITU-R BT.470-6 System M (historical)
-          - United States National Television System Committee 1953
-            Recommendation for transmission standards for color television
-          - United States Federal Communications Commission (2003) Title 47 Code
-            of Federal Regulations 73.682 (a) (20)
-          - Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM
-          - IEC 61966-2-1 (reference display)
-        </description>
-      </entry>
-      <entry name="gamma28" value="3">
-        <description summary="Assumed display gamma 2.8 transfer function">
-          Transfer characteristics as defined by
-          - Rec. ITU-R BT.470-6 System B, G (historical)
-        </description>
-      </entry>
-      <entry name="st240" value="4">
-        <description summary="SMPTE ST 240 transfer function">
-          Transfer characteristics as defined by
-          - SMPTE ST 240 (1999)
-        </description>
-      </entry>
-      <entry name="ext_linear" value="5">
-        <description summary="extended linear transfer function">
-          Linear transfer function defined over all real numbers.
-          Normalised electrical values are equal the normalised optical values.
-        </description>
-      </entry>
-      <entry name="log_100" value="6">
-        <description summary="logarithmic 100:1 transfer function">
-          Logarithmic transfer characteristic (100:1 range).
-        </description>
-      </entry>
-      <entry name="log_316" value="7">
-        <description summary="logarithmic (100*Sqrt(10) : 1) transfer function">
-          Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range).
-        </description>
-      </entry>
-      <entry name="xvycc" value="8">
-        <description summary="IEC 61966-2-4 transfer function">
-          Transfer characteristics as defined by
-          - IEC 61966-2-4
-        </description>
-      </entry>
-      <entry name="srgb" value="9" deprecated-since="2">
-        <description summary="Deprecated (ambiguous sRGB transfer function)">
-          Transfer characteristics as defined by
-          - IEC 61966-2-1 sRGB
-
-          As a rule of thumb, use gamma22 for video, motion picture and
-          computer graphics, or compound_power_2_4 for ICC calibrated print
-          workflows.
-        </description>
-      </entry>
-      <entry name="ext_srgb" value="10" deprecated-since="2">
-        <description summary="Deprecated (Extended sRGB piece-wise transfer function)">
-          Transfer characteristics as defined by
-          - IEC 61966-2-1 sYCC
-        </description>
-      </entry>
-      <entry name="st2084_pq" value="11">
-        <description summary="perceptual quantizer transfer function">
-          Transfer characteristics as defined by
-          - SMPTE ST 2084 (2014) for 10-, 12-, 14- and 16-bit systems
-          - Rec. ITU-R BT.2100-2 perceptual quantization (PQ) system
-
-          This TF implies these default luminances
-          - primary color volume minimum: 0.005 cd/m²
-          - primary color volume maximum: 10000 cd/m²
-          - reference white: 203 cd/m²
-
-          The difference between the primary color volume minimum and maximum
-          must be approximately 10000 cd/m² as that is the swing of the EOTF
-          defined by ST 2084 and BT.2100. The default value for the
-          reference white is a protocol addition: it is suggested by
-          Report ITU-R BT.2408-7 and is not part of ST 2084 or BT.2100.
-        </description>
-      </entry>
-      <entry name="st428" value="12">
-        <description summary="SMPTE ST 428 transfer function">
-          Transfer characteristics as defined by
-          - SMPTE ST 428-1 (2019)
-        </description>
-      </entry>
-      <entry name="hlg" value="13">
-        <description summary="hybrid log-gamma transfer function">
-          Transfer characteristics as defined by
-          - ARIB STD-B67 (2015)
-          - Rec. ITU-R BT.2100-2 hybrid log-gamma (HLG) system
-
-          This TF implies these default luminances
-          - primary color volume minimum: 0.005 cd/m²
-          - primary color volume maximum: 1000 cd/m²
-          - reference white: 203 cd/m²
-
-          HLG is a relative display-referred signal with a specified
-          non-linear mapping to the display peak luminance (the HLG OOTF).
-          All absolute luminance values used here for HLG assume a 1000 cd/m²
-          peak display.
-
-          The default value for the reference white is a protocol addition:
-          it is suggested by Report ITU-R BT.2408-7 and is not part of
-          ARIB STD-B67 or BT.2100.
-        </description>
-      </entry>
-      <entry name="compound_power_2_4" value="14" since="2">
-        <description summary="IEC 61966-2-1 encoding function">
-          Encoding characteristics as defined by IEC 61966-2-1, for displays
-          that invert the encoding function.
-        </description>
-      </entry>
-    </enum>
-
-    <request name="get_output">
-      <description summary="create a color management interface for a wl_output">
-        This creates a new wp_color_management_output_v1 object for the
-        given wl_output.
-
-        See the wp_color_management_output_v1 interface for more details.
-      </description>
-
-      <arg name="id" type="new_id" interface="wp_color_management_output_v1"/>
-      <arg name="output" type="object" interface="wl_output"/>
-    </request>
-
-    <request name="get_surface">
-      <description summary="create a color management interface for a wl_surface">
-        If a wp_color_management_surface_v1 object already exists for the given
-        wl_surface, the protocol error surface_exists is raised.
-
-        This creates a new color wp_color_management_surface_v1 object for the
-        given wl_surface.
-
-        See the wp_color_management_surface_v1 interface for more details.
-      </description>
-
-      <arg name="id" type="new_id" interface="wp_color_management_surface_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-
-    <request name="get_surface_feedback">
-      <description summary="create a color management feedback interface">
-        This creates a new color wp_color_management_surface_feedback_v1 object
-        for the given wl_surface.
-
-        See the wp_color_management_surface_feedback_v1 interface for more
-        details.
-      </description>
-
-      <arg name="id" type="new_id"
-           interface="wp_color_management_surface_feedback_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-
-    <request name="create_icc_creator">
-      <description summary="make a new ICC-based image description creator object">
-        Makes a new ICC-based image description creator object with all
-        properties initially unset. The client can then use the object's
-        interface to define all the required properties for an image description
-        and finally create a wp_image_description_v1 object.
-
-        This request can be used when the compositor advertises
-        wp_color_manager_v1.feature.icc_v2_v4.
-        Otherwise this request raises the protocol error unsupported_feature.
-      </description>
-
-      <arg name="obj"
-           type="new_id" interface="wp_image_description_creator_icc_v1"
-           summary="the new creator object"/>
-    </request>
-
-    <request name="create_parametric_creator">
-      <description summary="make a new parametric image description creator object">
-        Makes a new parametric image description creator object with all
-        properties initially unset. The client can then use the object's
-        interface to define all the required properties for an image description
-        and finally create a wp_image_description_v1 object.
-
-        This request can be used when the compositor advertises
-        wp_color_manager_v1.feature.parametric.
-        Otherwise this request raises the protocol error unsupported_feature.
-      </description>
-
-      <arg name="obj"
-           type="new_id" interface="wp_image_description_creator_params_v1"
-           summary="the new creator object"/>
-    </request>
-
-    <request name="create_windows_scrgb">
-      <description summary="create Windows-scRGB image description object">
-        This creates a pre-defined image description for the so-called
-        Windows-scRGB stimulus encoding. This comes from the Windows 10 handling
-        of its own definition of an scRGB color space for an HDR screen
-        driven in BT.2100/PQ signalling mode.
-
-        Windows-scRGB uses sRGB (BT.709) color primaries and white point.
-        The transfer characteristic is extended linear.
-
-        The nominal color channel value range is extended, meaning it includes
-        negative and greater than 1.0 values. Negative values are used to
-        escape the sRGB color gamut boundaries. To make use of the extended
-        range, the client needs to use a pixel format that can represent those
-        values, e.g. floating-point 16 bits per channel.
-
-        Nominal color value R=G=B=0.0 corresponds to BT.2100/PQ system
-        0 cd/m², and R=G=B=1.0 corresponds to BT.2100/PQ system 80 cd/m².
-        The maximum is R=G=B=125.0 corresponding to 10k cd/m².
-
-        Windows-scRGB is displayed by Windows 10 by converting it to
-        BT.2100/PQ, maintaining the CIE 1931 chromaticity and mapping the
-        luminance as above. No adjustment is made to the signal to account
-        for the viewing conditions.
-
-        The reference white level of Windows-scRGB is unknown. If a
-        reference white level must be assumed for compositor processing, it
-        should be R=G=B=2.5375 corresponding to 203 cd/m² of Report ITU-R
-        BT.2408-7.
-
-        The target color volume of Windows-scRGB is unknown. The color gamut
-        may be anything between sRGB and BT.2100.
-
-        Note: EGL_EXT_gl_colorspace_scrgb_linear definition differs from
-        Windows-scRGB by using R=G=B=1.0 as the reference white level, while
-        Windows-scRGB reference white level is unknown or varies. However,
-        it seems probable that Windows implements both
-        EGL_EXT_gl_colorspace_scrgb_linear and Vulkan
-        VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT as Windows-scRGB.
-
-        This request can be used when the compositor advertises
-        wp_color_manager_v1.feature.windows_scrgb.
-        Otherwise this request raises the protocol error unsupported_feature.
-
-        The resulting image description object does not allow get_information
-        request. The wp_image_description_v1.ready event shall be sent.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-
-    <event name="supported_intent">
-      <description summary="supported rendering intent">
-        When this object is created, it shall immediately send this event once
-        for each rendering intent the compositor supports.
-
-        A compositor must not advertise intents that are deprecated in the
-        bound version of the interface.
-      </description>
-
-      <arg name="render_intent" type="uint" enum="render_intent"
-           summary="rendering intent"/>
-    </event>
-
-    <event name="supported_feature">
-      <description summary="supported features">
-        When this object is created, it shall immediately send this event once
-        for each compositor supported feature listed in the enumeration.
-
-        A compositor must not advertise features that are deprecated in the
-        bound version of the interface.
-      </description>
-
-      <arg name="feature" type="uint" enum="feature"
-           summary="supported feature"/>
-    </event>
-
-    <event name="supported_tf_named">
-      <description summary="supported named transfer characteristic">
-        When this object is created, it shall immediately send this event once
-        for each named transfer function the compositor supports with the
-        parametric image description creator.
-
-        A compositor must not advertise transfer functions that are deprecated
-        in the bound version of the interface.
-      </description>
-
-      <arg name="tf" type="uint" enum="transfer_function"
-           summary="Named transfer function"/>
-    </event>
-
-    <event name="supported_primaries_named">
-      <description summary="supported named primaries">
-        When this object is created, it shall immediately send this event once
-        for each named set of primaries the compositor supports with the
-        parametric image description creator.
-
-        A compositor must not advertise names that are deprecated in the
-        bound version of the interface.
-      </description>
-
-      <arg name="primaries" type="uint" enum="primaries"
-           summary="Named color primaries"/>
-    </event>
-
-    <event name="done">
-      <description summary="all features have been sent">
-        This event is sent when all supported rendering intents, features,
-        transfer functions and named primaries have been sent.
-      </description>
-    </event>
-
-    <request name="get_image_description" since="2">
-      <description summary="create an image description from a reference">
-        This request retrieves the image description backing a reference.
-
-        The get_information request can be used if and only if the request that
-        creates the reference allows it.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-      <arg name="reference"
-           type="object" interface="wp_image_description_reference_v1"/>
-    </request>
-  </interface>
-
-  <interface name="wp_color_management_output_v1" version="2">
-    <description summary="output color properties">
-      A wp_color_management_output_v1 describes the color properties of an
-      output.
-
-      The wp_color_management_output_v1 is associated with the wl_output global
-      underlying the wl_output object. Therefore the client destroying the
-      wl_output object has no impact, but the compositor removing the output
-      global makes the wp_color_management_output_v1 object inert.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the color management output">
-        Destroy the color wp_color_management_output_v1 object. This does not
-        affect any remaining protocol objects.
-      </description>
-    </request>
-
-    <event name="image_description_changed">
-      <description summary="image description changed">
-        This event is sent whenever the image description of the output changed,
-        followed by one wl_output.done event common to output events across all
-        extensions.
-
-        If the client wants to use the updated image description, it needs to do
-        get_image_description again, because image description objects are
-        immutable.
-      </description>
-    </event>
-
-    <request name="get_image_description">
-      <description summary="get the image description of the output">
-        This creates a new wp_image_description_v1 object for the current image
-        description of the output. There always is exactly one image description
-        active for an output so the client should destroy the image description
-        created by earlier invocations of this request. This request is usually
-        sent as a reaction to the image_description_changed event or when
-        creating a wp_color_management_output_v1 object.
-
-        The image description of an output represents the color encoding the
-        output expects. There might be performance and power advantages, as well
-        as improved color reproduction, if a content update matches the image
-        description of the output it is being shown on. If a content update is
-        shown on any other output than the one it matches the image description
-        of, then the color reproduction on those outputs might be considerably
-        worse.
-
-        The created wp_image_description_v1 object preserves the image
-        description of the output from the time the object was created.
-
-        The resulting image description object allows get_information request.
-
-        If this protocol object is inert, the resulting image description object
-        shall immediately deliver the wp_image_description_v1.failed event with
-        the no_output cause.
-
-        If the interface version is inadequate for the output's image
-        description, meaning that the client does not support all the events
-        needed to deliver the crucial information, the resulting image
-        description object shall immediately deliver the
-        wp_image_description_v1.failed event with the low_version cause.
-
-        Otherwise the object shall immediately deliver the ready event.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-  </interface>
-
-  <interface name="wp_color_management_surface_v1" version="2">
-    <description summary="color management extension to a surface">
-        A wp_color_management_surface_v1 allows the client to set the color
-        space and HDR properties of a surface.
-
-        If the wl_surface associated with the wp_color_management_surface_v1 is
-        destroyed, the wp_color_management_surface_v1 object becomes inert.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the color management interface for a surface">
-        Destroy the wp_color_management_surface_v1 object and do the same as
-        unset_image_description.
-      </description>
-    </request>
-
-    <enum name="error">
-      <description summary="protocol errors"/>
-      <entry name="render_intent" value="0"
-             summary="unsupported rendering intent"/>
-      <entry name="image_description" value="1"
-             summary="invalid image description"/>
-      <entry name="inert" value="2"
-             summary="forbidden request on inert object"/>
-    </enum>
-
-    <request name="set_image_description">
-      <description summary="set the surface image description">
-        If this protocol object is inert, the protocol error inert is raised.
-
-        Set the image description of the underlying surface. The image
-        description and rendering intent are double-buffered state, see
-        wl_surface.commit.
-
-        It is the client's responsibility to understand the image description
-        it sets on a surface, and to provide content that matches that image
-        description. Compositors might convert images to match their own or any
-        other image descriptions.
-
-        Image descriptions which are not ready (see wp_image_description_v1)
-        are forbidden in this request, and in such case the protocol error
-        image_description is raised.
-
-        All image descriptions which are ready (see wp_image_description_v1)
-        are allowed and must always be accepted by the compositor.
-
-        When an image description is set on a surface, it establishes an
-        explicit link between surface pixel values and surface colorimetry.
-        This link may be undefined for some pixel values, see the image
-        description creator interfaces for the conditions. Non-finite
-        floating-point values (NaN, Inf) always have an undefined colorimetry.
-
-        A rendering intent provides the client's preference on how surface
-        colorimetry should be mapped to each output. The render_intent value
-        must be one advertised by the compositor with
-        wp_color_manager_v1.render_intent event, otherwise the protocol error
-        render_intent is raised.
-
-        By default, a surface does not have an associated image description
-        nor a rendering intent. The handling of color on such surfaces is
-        compositor implementation defined. Compositors should handle such
-        surfaces as sRGB, but may handle them differently if they have specific
-        requirements.
-
-        Setting the image description has copy semantics; after this request,
-        the image description can be immediately destroyed without affecting
-        the pending state of the surface.
-      </description>
-
-      <arg name="image_description"
-           type="object" interface="wp_image_description_v1"/>
-      <arg name="render_intent"
-           type="uint" enum="wp_color_manager_v1.render_intent"
-           summary="rendering intent"/>
-    </request>
-
-    <request name="unset_image_description">
-      <description summary="remove the surface image description">
-        If this protocol object is inert, the protocol error inert is raised.
-
-        This request removes any image description from the surface. See
-        set_image_description for how a compositor handles a surface without
-        an image description. This is double-buffered state, see
-        wl_surface.commit.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="wp_color_management_surface_feedback_v1" version="2">
-    <description summary="color management extension to a surface">
-        A wp_color_management_surface_feedback_v1 allows the client to get the
-        preferred image description of a surface.
-
-        If the wl_surface associated with this object is destroyed, the
-        wp_color_management_surface_feedback_v1 object becomes inert.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the color management interface for a surface">
-        Destroy the wp_color_management_surface_feedback_v1 object.
-      </description>
-    </request>
-
-    <enum name="error">
-      <description summary="protocol errors"/>
-      <entry name="inert" value="0"
-             summary="forbidden request on inert object"/>
-      <entry name="unsupported_feature" value="1"
-             summary="attempted to use an unsupported feature"/>
-    </enum>
-
-    <event name="preferred_changed" deprecated-since="2">
-      <description summary="the preferred image description changed (32-bit)">
-        Starting from interface version 2, 'preferred_changed2' is sent instead
-        of this event. See the 'preferred_changed2' event for the definition.
-      </description>
-
-      <arg name="identity" type="uint"
-           summary="the 32-bit image description id number"/>
-    </event>
-
-    <request name="get_preferred">
-      <description summary="get the preferred image description">
-        If this protocol object is inert, the protocol error inert is raised.
-
-        The preferred image description represents the compositor's preferred
-        color encoding for this wl_surface at the current time. There might be
-        performance and power advantages, as well as improved color
-        reproduction, if the image description of a content update matches the
-        preferred image description.
-
-        This creates a new wp_image_description_v1 object for the currently
-        preferred image description for the wl_surface. The client should
-        stop using and destroy the image descriptions created by earlier
-        invocations of this request for the associated wl_surface.
-        This request is usually sent as a reaction to the preferred_changed
-        event or when creating a wp_color_management_surface_feedback_v1 object
-        if the client is capable of adapting to image descriptions.
-
-        The created wp_image_description_v1 object preserves the preferred image
-        description of the wl_surface from the time the object was created.
-
-        The resulting image description object allows get_information request.
-
-        If the image description is parametric, the client should set it on its
-        wl_surface only if the image description is an exact match with the
-        client content. Particularly if everything else matches, but the target
-        color volume is greater than what the client needs, the client should
-        create its own parameric image description with its exact parameters.
-
-        If the interface version is inadequate for the preferred image
-        description, meaning that the client does not support all the
-        events needed to deliver the crucial information, the resulting image
-        description object shall immediately deliver the
-        wp_image_description_v1.failed event with the low_version cause,
-        otherwise the object shall immediately deliver the ready event.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-
-    <request name="get_preferred_parametric">
-      <description summary="get the preferred image description">
-        The same description as for get_preferred applies, except the returned
-        image description is guaranteed to be parametric. This is meant for
-        clients that can only deal with parametric image descriptions.
-
-        If the compositor doesn't support parametric image descriptions, the
-        unsupported_feature error is emitted.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-
-    <!-- Version 2 additions -->
-
-    <event name="preferred_changed2" since="2">
-      <description summary="the preferred image description changed">
-        The preferred image description is the one which likely has the most
-        performance and/or quality benefits for the compositor if used by the
-        client for its wl_surface contents. This event is sent whenever the
-        compositor changes the wl_surface's preferred image description.
-
-        This event sends the identity of the new preferred state as the argument,
-        so clients who are aware of the image description already can reuse it.
-        Otherwise, if the client client wants to know what the preferred image
-        description is, it shall use the get_preferred request.
-
-        The preferred image description is not automatically used for anything.
-        It is only a hint, and clients may set any valid image description with
-        set_image_description, but there might be performance and color accuracy
-        improvements by providing the wl_surface contents in the preferred
-        image description. Therefore clients that can, should render according
-        to the preferred image description
-      </description>
-
-      <arg name="identity_hi" type="uint"
-           summary="high 32 bits of the 64-bit image description id number"/>
-      <arg name="identity_lo" type="uint"
-           summary="low 32 bits of the 64-bit image description id number"/>
-    </event>
-
-  </interface>
-
-  <interface name="wp_image_description_creator_icc_v1" version="2">
-    <description summary="holder of image description ICC information">
-      This type of object is used for collecting all the information required
-      to create a wp_image_description_v1 object from an ICC file. A complete
-      set of required parameters consists of these properties:
-      - ICC file
-
-      Each required property must be set exactly once if the client is to create
-      an image description. The set requests verify that a property was not
-      already set. The create request verifies that all required properties are
-      set. There may be several alternative requests for setting each property,
-      and in that case the client must choose one of them.
-
-      Once all properties have been set, the create request must be used to
-      create the image description object, destroying the creator in the
-      process.
-
-      The link between a pixel value (a device value in ICC) and its respective
-      colorimetry is defined by the details of the particular ICC profile.
-      Those details also determine when colorimetry becomes undefined.
-    </description>
-
-    <enum name="error">
-      <description summary="protocol errors"/>
-
-      <entry name="incomplete_set" value="0"
-             summary="incomplete parameter set"/>
-      <entry name="already_set" value="1"
-             summary="property already set"/>
-      <entry name="bad_fd" value="2"
-             summary="fd not seekable and readable"/>
-      <entry name="bad_size" value="3"
-             summary="no or too much data"/>
-      <entry name="out_of_file" value="4"
-             summary="offset + length exceeds file size"/>
-    </enum>
-
-    <request name="create" type="destructor">
-      <description summary="Create the image description object from ICC data">
-        Create an image description object based on the ICC information
-        previously set on this object. A compositor must parse the ICC data in
-        some undefined but finite amount of time.
-
-        The completeness of the parameter set is verified. If the set is not
-        complete, the protocol error incomplete_set is raised. For the
-        definition of a complete set, see the description of this interface.
-
-        If the particular combination of the information is not supported
-        by the compositor, the resulting image description object shall
-        immediately deliver the wp_image_description_v1.failed event with the
-        'unsupported' cause. If a valid image description was created from the
-        information, the wp_image_description_v1.ready event will eventually
-        be sent instead.
-
-        This request destroys the wp_image_description_creator_icc_v1 object.
-
-        The resulting image description object does not allow get_information
-        request.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-
-    <request name="set_icc_file">
-      <description summary="set the ICC profile file">
-        Sets the ICC profile file to be used as the basis of the image
-        description.
-
-        The data shall be found through the given fd at the given offset, having
-        the given length. The fd must be seekable and readable. Violating these
-        requirements raises the bad_fd protocol error.
-
-        If reading the data fails due to an error independent of the client, the
-        compositor shall send the wp_image_description_v1.failed event on the
-        created wp_image_description_v1 with the 'operating_system' cause.
-
-        The maximum size of the ICC profile is 32 MB. If length is greater than
-        that or zero, the protocol error bad_size is raised. If offset + length
-        exceeds the file size, the protocol error out_of_file is raised.
-
-        A compositor may read the file at any time starting from this request
-        and only until whichever happens first:
-        - If create request was issued, the wp_image_description_v1 object
-          delivers either failed or ready event; or
-        - if create request was not issued, this
-          wp_image_description_creator_icc_v1 object is destroyed.
-
-        A compositor shall not modify the contents of the file, and the fd may
-        be sealed for writes and size changes. The client must ensure to its
-        best ability that the data does not change while the compositor is
-        reading it.
-
-        The data must represent a valid ICC profile. The ICC profile version
-        must be 2 or 4, it must be a 3 channel profile and the class must be
-        Display or ColorSpace. Violating these requirements will not result in a
-        protocol error, but will eventually send the
-        wp_image_description_v1.failed event on the created
-        wp_image_description_v1 with the 'unsupported' cause.
-
-        See the International Color Consortium specification ICC.1:2022 for more
-        details about ICC profiles.
-
-        If ICC file has already been set on this object, the protocol error
-        already_set is raised.
-      </description>
-
-      <arg name="icc_profile" type="fd"
-           summary="ICC profile"/>
-      <arg name="offset" type="uint"
-           summary="byte offset in fd to start of ICC data"/>
-      <arg name="length" type="uint"
-           summary="length of ICC data in bytes"/>
-    </request>
-  </interface>
-
-  <interface name="wp_image_description_creator_params_v1" version="2">
-    <description summary="holder of image description parameters">
-      This type of object is used for collecting all the parameters required
-      to create a wp_image_description_v1 object. A complete set of required
-      parameters consists of these properties:
-      - transfer characteristic function (tf)
-      - chromaticities of primaries and white point (primary color volume)
-
-      The following properties are optional and have a well-defined default
-      if not explicitly set:
-      - primary color volume luminance range
-      - reference white luminance level
-      - mastering display primaries and white point (target color volume)
-      - mastering luminance range
-
-      The following properties are optional and will be ignored
-      if not explicitly set:
-      - maximum content light level
-      - maximum frame-average light level
-
-      Each required property must be set exactly once if the client is to create
-      an image description. The set requests verify that a property was not
-      already set. The create request verifies that all required properties are
-      set. There may be several alternative requests for setting each property,
-      and in that case the client must choose one of them.
-
-      Once all properties have been set, the create request must be used to
-      create the image description object, destroying the creator in the
-      process.
-
-      A viewer, who is viewing the display defined by the resulting image
-      description (the viewing environment included), is assumed to be fully
-      adapted to the primary color volume's white point.
-
-      Any of the following conditions will cause the colorimetry of a pixel
-      to become undefined:
-      - Values outside of the defined range of the transfer characteristic.
-      - Tristimulus that exceeds the target color volume.
-      - If extended_target_volume is not supported: tristimulus that exceeds
-      the primary color volume.
-
-      The closest correspondence to an image description created through this
-      interface is the Display class of profiles in ICC.
-    </description>
-
-    <enum name="error">
-      <description summary="protocol errors"/>
-
-      <entry name="incomplete_set" value="0"
-             summary="incomplete parameter set"/>
-      <entry name="already_set" value="1"
-             summary="property already set"/>
-      <entry name="unsupported_feature" value="2"
-             summary="request not supported"/>
-      <entry name="invalid_tf" value="3"
-             summary="invalid transfer characteristic"/>
-      <entry name="invalid_primaries_named" value="4"
-             summary="invalid primaries named"/>
-      <entry name="invalid_luminance" value="5"
-             summary="invalid luminance value or range"/>
-    </enum>
-
-    <request name="create" type="destructor">
-      <description summary="Create the image description object using params">
-        Create an image description object based on the parameters previously
-        set on this object.
-
-        The completeness of the parameter set is verified. If the set is not
-        complete, the protocol error incomplete_set is raised. For the
-        definition of a complete set, see the description of this interface.
-
-        When both max_cll and max_fall are set, max_fall must be less or equal
-        to max_cll otherwise the invalid_luminance protocol error is raised.
-
-        In version 1, these following conditions also result in the
-        invalid_luminance protocol error. Version 2 and later do not have this
-        requirement.
-        - When max_cll is set, it must be greater than min L and less or equal
-          to max L of the mastering luminance range.
-        - When max_fall is set, it must be greater than min L and less or equal
-          to max L of the mastering luminance range.
-
-        If the particular combination of the parameter set is not supported
-        by the compositor, the resulting image description object shall
-        immediately deliver the wp_image_description_v1.failed event with the
-        'unsupported' cause. If a valid image description was created from the
-        parameter set, the wp_image_description_v1.ready event will eventually
-        be sent instead.
-
-        This request destroys the wp_image_description_creator_params_v1
-        object.
-
-        The resulting image description object does not allow get_information
-        request.
-      </description>
-
-      <arg name="image_description"
-           type="new_id" interface="wp_image_description_v1"/>
-    </request>
-
-    <request name="set_tf_named">
-      <description summary="named transfer characteristic">
-        Sets the transfer characteristic using explicitly enumerated named
-        functions.
-
-        When the resulting image description is attached to an image, the
-        content should be decoded according to the industry standard
-        practices for the transfer characteristic.
-
-        Only names advertised with wp_color_manager_v1 event supported_tf_named
-        are allowed. Other values shall raise the protocol error invalid_tf.
-
-        If transfer characteristic has already been set on this object, the
-        protocol error already_set is raised.
-      </description>
-
-      <arg name="tf" type="uint" enum="wp_color_manager_v1.transfer_function"
-           summary="named transfer function"/>
-    </request>
-
-    <request name="set_tf_power">
-      <description summary="transfer characteristic as a power curve">
-        Sets the color component transfer characteristic to a power curve with
-        the given exponent. Negative values are handled by mirroring the
-        positive half of the curve through the origin. The valid domain and
-        range of the curve are all finite real numbers. This curve represents
-        the conversion from electrical to optical color channel values.
-
-        The curve exponent shall be multiplied by 10000 to get the argument eexp
-        value to carry the precision of 4 decimals.
-
-        The curve exponent must be at least 1.0 and at most 10.0. Otherwise the
-        protocol error invalid_tf is raised.
-
-        If transfer characteristic has already been set on this object, the
-        protocol error already_set is raised.
-
-        This request can be used when the compositor advertises
-        wp_color_manager_v1.feature.set_tf_power. Otherwise this request raises
-        the protocol error unsupported_feature.
-      </description>
-
-      <arg name="eexp" type="uint" summary="the exponent * 10000"/>
-    </request>
-
-    <request name="set_primaries_named">
-      <description summary="named primaries">
-        Sets the color primaries and white point using explicitly named sets.
-        This describes the primary color volume which is the basis for color
-        value encoding.
-
-        Only names advertised with wp_color_manager_v1 event
-        supported_primaries_named are allowed. Other values shall raise the
-        protocol error invalid_primaries_named.
-
-        If primaries have already been set on this object, the protocol error
-        already_set is raised.
-      </description>
-
-      <arg name="primaries" type="uint" enum="wp_color_manager_v1.primaries"
-           summary="named primaries"/>
-    </request>
-
-    <request name="set_primaries">
-      <description summary="primaries as chromaticity coordinates">
-        Sets the color primaries and white point using CIE 1931 xy chromaticity
-        coordinates. This describes the primary color volume which is the basis
-        for color value encoding.
-
-        Each coordinate value is multiplied by 1 million to get the argument
-        value to carry precision of 6 decimals.
-
-        If primaries have already been set on this object, the protocol error
-        already_set is raised.
-
-        This request can be used if the compositor advertises
-        wp_color_manager_v1.feature.set_primaries. Otherwise this request raises
-        the protocol error unsupported_feature.
-      </description>
-
-      <arg name="r_x" type="int" summary="Red x * 1M"/>
-      <arg name="r_y" type="int" summary="Red y * 1M"/>
-      <arg name="g_x" type="int" summary="Green x * 1M"/>
-      <arg name="g_y" type="int" summary="Green y * 1M"/>
-      <arg name="b_x" type="int" summary="Blue x * 1M"/>
-      <arg name="b_y" type="int" summary="Blue y * 1M"/>
-      <arg name="w_x" type="int" summary="White x * 1M"/>
-      <arg name="w_y" type="int" summary="White y * 1M"/>
-    </request>
-
-    <request name="set_luminances">
-      <description summary="primary color volume luminance range and reference white">
-        Sets the primary color volume luminance range and the reference white
-        luminance level. These values include the minimum display emission, but
-        not external flare. The minimum display emission is assumed to have
-        the chromaticity of the primary color volume white point.
-
-        The default luminances from
-        https://www.color.org/chardata/rgb/srgb.xalter are
-        - primary color volume minimum: 0.2 cd/m²
-        - primary color volume maximum: 80 cd/m²
-        - reference white: 80 cd/m²
-
-        Setting a named transfer characteristic can imply other default
-        luminances.
-
-        The default luminances get overwritten when this request is used.
-        With transfer_function.st2084_pq the given 'max_lum' value is ignored,
-        and 'max_lum' is taken as 'min_lum' + 10000 cd/m².
-
-        'min_lum' and 'max_lum' specify the minimum and maximum luminances of
-        the primary color volume as reproduced by the targeted display.
-
-        'reference_lum' specifies the luminance of the reference white as
-        reproduced by the targeted display, and reflects the targeted viewing
-        environment.
-
-        Compositors should make sure that all content is anchored, meaning that
-        an input signal level of 'reference_lum' on one image description and
-        another input signal level of 'reference_lum' on another image
-        description should produce the same output level, even though the
-        'reference_lum' on both image representations can be different.
-
-        'reference_lum' may be higher than 'max_lum'. In that case reaching
-        the reference white output level in image content requires the
-        'extended_target_volume' feature support.
-
-        If 'max_lum' or 'reference_lum' are less than or equal to 'min_lum',
-        the protocol error invalid_luminance is raised.
-
-        The minimum luminance is multiplied by 10000 to get the argument
-        'min_lum' value and carries precision of 4 decimals. The maximum
-        luminance and reference white luminance values are unscaled.
-
-        If the primary color volume luminance range and the reference white
-        luminance level have already been set on this object, the protocol error
-        already_set is raised.
-
-        This request can be used if the compositor advertises
-        wp_color_manager_v1.feature.set_luminances. Otherwise this request
-        raises the protocol error unsupported_feature.
-      </description>
-
-      <arg name="min_lum" type="uint"
-           summary="minimum luminance (cd/m²) * 10000"/>
-      <arg name="max_lum" type="uint"
-           summary="maximum luminance (cd/m²)"/>
-      <arg name="reference_lum" type="uint"
-           summary="reference white luminance (cd/m²)"/>
-    </request>
-
-    <request name="set_mastering_display_primaries">
-      <description summary="mastering display primaries as chromaticity coordinates">
-        Provides the color primaries and white point of the mastering display
-        using CIE 1931 xy chromaticity coordinates. This is compatible with the
-        SMPTE ST 2086 definition of HDR static metadata.
-
-        The mastering display primaries and mastering display luminances define
-        the target color volume.
-
-        If mastering display primaries are not explicitly set, the target color
-        volume is assumed to have the same primaries as the primary color volume.
-
-        The target color volume is defined by all tristimulus values between 0.0
-        and 1.0 (inclusive) of the color space defined by the given mastering
-        display primaries and white point. The colorimetry is identical between
-        the container color space and the mastering display color space,
-        including that no chromatic adaptation is applied even if the white
-        points differ.
-
-        The target color volume can exceed the primary color volume to allow for
-        a greater color volume with an existing color space definition (for
-        example scRGB). It can be smaller than the primary color volume to
-        minimize gamut and tone mapping distances for big color spaces (HDR
-        metadata).
-
-        To make use of the entire target color volume a suitable pixel format
-        has to be chosen (e.g. floating point to exceed the primary color
-        volume, or abusing limited quantization range as with xvYCC).
-
-        Each coordinate value is multiplied by 1 million to get the argument
-        value to carry precision of 6 decimals.
-
-        If mastering display primaries have already been set on this object, the
-        protocol error already_set is raised.
-
-        This request can be used if the compositor advertises
-        wp_color_manager_v1.feature.set_mastering_display_primaries. Otherwise
-        this request raises the protocol error unsupported_feature. The
-        advertisement implies support only for target color volumes fully
-        contained within the primary color volume.
-
-        If a compositor additionally supports target color volume exceeding the
-        primary color volume, it must advertise
-        wp_color_manager_v1.feature.extended_target_volume. If a client uses
-        target color volume exceeding the primary color volume and the
-        compositor does not support it, the result is implementation defined.
-        Compositors are recommended to detect this case and fail the image
-        description gracefully, but it may as well result in color artifacts.
-      </description>
-
-      <arg name="r_x" type="int" summary="Red x * 1M"/>
-      <arg name="r_y" type="int" summary="Red y * 1M"/>
-      <arg name="g_x" type="int" summary="Green x * 1M"/>
-      <arg name="g_y" type="int" summary="Green y * 1M"/>
-      <arg name="b_x" type="int" summary="Blue x * 1M"/>
-      <arg name="b_y" type="int" summary="Blue y * 1M"/>
-      <arg name="w_x" type="int" summary="White x * 1M"/>
-      <arg name="w_y" type="int" summary="White y * 1M"/>
-    </request>
-
-    <request name="set_mastering_luminance">
-      <description summary="display mastering luminance range">
-        Sets the luminance range that was used during the content mastering
-        process as the minimum and maximum absolute luminance L. These values
-        include the minimum display emission and ambient flare luminances,
-        assumed to be optically additive and have the chromaticity of the
-        primary color volume white point. This should be
-        compatible with the SMPTE ST 2086 definition of HDR static metadata.
-
-        The mastering display primaries and mastering display luminances define
-        the target color volume.
-
-        If mastering luminances are not explicitly set, the target color volume
-        is assumed to have the same min and max luminances as the primary color
-        volume.
-
-        If max L is less than or equal to min L, the protocol error
-        invalid_luminance is raised.
-
-        Min L value is multiplied by 10000 to get the argument min_lum value
-        and carry precision of 4 decimals. Max L value is unscaled for max_lum.
-
-        This request can be used if the compositor advertises
-        wp_color_manager_v1.feature.set_mastering_display_primaries. Otherwise
-        this request raises the protocol error unsupported_feature. The
-        advertisement implies support only for target color volumes fully
-        contained within the primary color volume.
-
-        If a compositor additionally supports target color volume exceeding the
-        primary color volume, it must advertise
-        wp_color_manager_v1.feature.extended_target_volume. If a client uses
-        target color volume exceeding the primary color volume and the
-        compositor does not support it, the result is implementation defined.
-        Compositors are recommended to detect this case and fail the image
-        description gracefully, but it may as well result in color artifacts.
-      </description>
-
-      <arg name="min_lum" type="uint" summary="min L (cd/m²) * 10000"/>
-      <arg name="max_lum" type="uint" summary="max L (cd/m²)"/>
-    </request>
-
-    <request name="set_max_cll">
-      <description summary="maximum content light level">
-        Sets the maximum content light level (max_cll) as defined by CTA-861-H.
-
-        max_cll is undefined by default.
-      </description>
-
-      <arg name="max_cll" type="uint" summary="Maximum content light level (cd/m²)"/>
-    </request>
-
-    <request name="set_max_fall">
-      <description summary="maximum frame-average light level">
-        Sets the maximum frame-average light level (max_fall) as defined by
-        CTA-861-H.
-
-        max_fall is undefined by default.
-      </description>
-
-      <arg name="max_fall" type="uint" summary="Maximum frame-average light level (cd/m²)"/>
-    </request>
-  </interface>
-
-  <interface name="wp_image_description_v1" version="2">
-    <description summary="Colorimetric image description">
-      An image description carries information about the pixel color encoding
-      and its intended display and viewing environment. The image description is
-      attached to a wl_surface via
-      wp_color_management_surface_v1.set_image_description. A compositor can use
-      this information to decode pixel values into colorimetrically meaningful
-      quantities, which allows the compositor to transform the surface contents
-      to become suitable for various displays and viewing environments.
-
-      Note, that the wp_image_description_v1 object is not ready to be used
-      immediately after creation. The object eventually delivers either the
-      'ready' or the 'failed' event, specified in all requests creating it. The
-      object is deemed "ready" after receiving the 'ready' event.
-
-      An object which is not ready is illegal to use, it can only be destroyed.
-      Any other request in this interface shall result in the 'not_ready'
-      protocol error. Attempts to use an object which is not ready through other
-      interfaces shall raise protocol errors defined there.
-
-      Once created and regardless of how it was created, a
-      wp_image_description_v1 object always refers to one fixed image
-      description. It cannot change after creation.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the image description">
-        Destroy this object. It is safe to destroy an object which is not ready.
-
-        Destroying a wp_image_description_v1 object has no side-effects, not
-        even if a wp_color_management_surface_v1.set_image_description has not
-        yet been followed by a wl_surface.commit.
-      </description>
-    </request>
-
-    <enum name="error">
-      <description summary="protocol errors"/>
-
-      <entry name="not_ready" value="0"
-             summary="attempted to use an object which is not ready"/>
-      <entry name="no_information" value="1"
-             summary="get_information not allowed"/>
-    </enum>
-
-    <enum name="cause">
-      <description summary="generic reason for failure"/>
-
-      <entry name="low_version" value="0"
-             summary="interface version too low"/>
-      <entry name="unsupported" value="1"
-             summary="unsupported image description data"/>
-      <entry name="operating_system" value="2"
-             summary="error independent of the client"/>
-      <entry name="no_output" value="3"
-             summary="the relevant output no longer exists"/>
-    </enum>
-
-    <event name="failed">
-      <description summary="graceful error on creating the image description">
-        If creating a wp_image_description_v1 object fails for a reason that is
-        not defined as a protocol error, this event is sent.
-
-        The requests that create image description objects define whether and
-        when this can occur. Only such creation requests can trigger this event.
-        This event cannot be triggered after the image description was
-        successfully formed.
-
-        Once this event has been sent, the wp_image_description_v1 object will
-        never become ready and it can only be destroyed.
-      </description>
-
-      <arg name="cause" type="uint" enum="cause"
-           summary="generic reason"/>
-      <arg name="msg" type="string"
-           summary="ad hoc human-readable explanation"/>
-    </event>
-
-    <event name="ready" deprecated-since="2">
-      <description summary="the object is ready to be used (32-bit)">
-        Starting from interface version 2, the 'ready2' event is sent instead
-        of this event.
-
-        For the definition of this event, see the 'ready2' event. The
-        difference to this event is as follows.
-
-        The id number is valid only as long as the protocol object is alive. If
-        all protocol objects referring to the same image description record are
-        destroyed, the id number may be recycled for a different image
-        description record.
-      </description>
-
-      <arg name="identity" type="uint"
-           summary="the 32-bit image description id number"/>
-    </event>
-
-    <request name="get_information">
-      <description summary="get information about the image description">
-        Creates a wp_image_description_info_v1 object which delivers the
-        information that makes up the image description.
-
-        Not all image description protocol objects allow get_information
-        request. Whether it is allowed or not is defined by the request that
-        created the object. If get_information is not allowed, the protocol
-        error no_information is raised.
-      </description>
-
-      <arg name="information"
-           type="new_id" interface="wp_image_description_info_v1"/>
-    </request>
-
-    <!-- Version 2 additions -->
-
-    <event name="ready2" since="2">
-      <description summary="the object is ready to be used">
-        Once this event has been sent, the wp_image_description_v1 object is
-        deemed "ready". Ready objects can be used to send requests and can be
-        used through other interfaces.
-
-        Every ready wp_image_description_v1 protocol object refers to an
-        underlying image description record in the compositor. Multiple protocol
-        objects may end up referring to the same record. Clients may identify
-        these "copies" by comparing their id numbers: if the numbers from two
-        protocol objects are identical, the protocol objects refer to the same
-        image description record. Two different image description records
-        cannot have the same id number simultaneously. The id number does not
-        change during the lifetime of the image description record.
-
-        Image description id number is not a protocol object id. Zero is
-        reserved as an invalid id number. It shall not be possible for a client
-        to refer to an image description by its id number in protocol. The id
-        numbers might not be portable between Wayland connections. A compositor
-        shall not send an invalid id number.
-
-        Compositors must not recycle image description id numbers.
-
-        This identity allows clients to de-duplicate image description records
-        and avoid get_information request if they already have the image
-        description information.
-      </description>
-
-      <arg name="identity_hi" type="uint"
-           summary="high 32 bits of the 64-bit image description id number"/>
-      <arg name="identity_lo" type="uint"
-           summary="low 32 bits of the 64-bit image description id number"/>
-    </event>
-  </interface>
-
-  <interface name="wp_image_description_info_v1" version="2">
-    <description summary="Colorimetric image description information">
-      Sends all matching events describing an image description object exactly
-      once and finally sends the 'done' event.
-
-      This means
-      - if the image description is parametric, it must send
-        - primaries
-        - named_primaries, if applicable
-        - at least one of tf_power and tf_named, as applicable
-        - luminances
-        - target_primaries
-        - target_luminance
-      - if the image description is parametric, it may send, if applicable,
-        - target_max_cll
-        - target_max_fall
-      - if the image description contains an ICC profile, it must send the
-        icc_file event
-
-      Once a wp_image_description_info_v1 object has delivered a 'done' event it
-      is automatically destroyed.
-
-      Every wp_image_description_info_v1 created from the same
-      wp_image_description_v1 shall always return the exact same data.
-    </description>
-
-    <event name="done" type="destructor">
-      <description summary="end of information">
-        Signals the end of information events and destroys the object.
-      </description>
-    </event>
-
-    <event name="icc_file">
-      <description summary="ICC profile matching the image description">
-        The icc argument provides a file descriptor to the client which may be
-        memory-mapped to provide the ICC profile matching the image description.
-        The fd is read-only, and if mapped then it must be mapped with
-        MAP_PRIVATE by the client.
-
-        The ICC profile version and other details are determined by the
-        compositor. There is no provision for a client to ask for a specific
-        kind of a profile.
-      </description>
-
-      <arg name="icc" type="fd" summary="ICC profile file descriptor"/>
-      <arg name="icc_size" type="uint" summary="ICC profile size, in bytes"/>
-      <!-- Offset always 0, compositor must not expose unnecessary data. -->
-    </event>
-
-    <event name="primaries">
-      <description summary="primaries as chromaticity coordinates">
-        Delivers the primary color volume primaries and white point using CIE
-        1931 xy chromaticity coordinates.
-
-        Each coordinate value is multiplied by 1 million to get the argument
-        value to carry precision of 6 decimals.
-      </description>
-
-      <arg name="r_x" type="int" summary="Red x * 1M"/>
-      <arg name="r_y" type="int" summary="Red y * 1M"/>
-      <arg name="g_x" type="int" summary="Green x * 1M"/>
-      <arg name="g_y" type="int" summary="Green y * 1M"/>
-      <arg name="b_x" type="int" summary="Blue x * 1M"/>
-      <arg name="b_y" type="int" summary="Blue y * 1M"/>
-      <arg name="w_x" type="int" summary="White x * 1M"/>
-      <arg name="w_y" type="int" summary="White y * 1M"/>
-    </event>
-
-    <event name="primaries_named">
-      <description summary="named primaries">
-        Delivers the primary color volume primaries and white point using an
-        explicitly enumerated named set.
-      </description>
-
-      <arg name="primaries" type="uint" enum="wp_color_manager_v1.primaries"
-           summary="named primaries"/>
-    </event>
-
-    <event name="tf_power">
-      <description summary="transfer characteristic as a power curve">
-        The color component transfer characteristic of this image description is
-        a pure power curve. This event provides the exponent of the power
-        function. This curve represents the conversion from electrical to
-        optical pixel or color values.
-
-        The curve exponent has been multiplied by 10000 to get the argument eexp
-        value to carry the precision of 4 decimals.
-      </description>
-
-      <arg name="eexp" type="uint" summary="the exponent * 10000"/>
-    </event>
-
-    <event name="tf_named">
-      <description summary="named transfer characteristic">
-        Delivers the transfer characteristic using an explicitly enumerated
-        named function.
-      </description>
-
-      <arg name="tf" type="uint" enum="wp_color_manager_v1.transfer_function"
-           summary="named transfer function"/>
-    </event>
-
-    <event name="luminances">
-      <description summary="primary color volume luminance range and reference white">
-        Delivers the primary color volume luminance range and the reference
-        white luminance level. These values include the minimum display emission
-        and ambient flare luminances, assumed to be optically additive and have
-        the chromaticity of the primary color volume white point.
-
-        The minimum luminance is multiplied by 10000 to get the argument
-        'min_lum' value and carries precision of 4 decimals. The maximum
-        luminance and reference white luminance values are unscaled.
-      </description>
-
-      <arg name="min_lum" type="uint"
-           summary="minimum luminance (cd/m²) * 10000"/>
-      <arg name="max_lum" type="uint"
-           summary="maximum luminance (cd/m²)"/>
-      <arg name="reference_lum" type="uint"
-           summary="reference white luminance (cd/m²)"/>
-    </event>
-
-    <event name="target_primaries">
-      <description summary="target primaries as chromaticity coordinates">
-        Provides the color primaries and white point of the target color volume
-        using CIE 1931 xy chromaticity coordinates. This is compatible with the
-        SMPTE ST 2086 definition of HDR static metadata for mastering displays.
-
-        While primary color volume is about how color is encoded, the target
-        color volume is the actually displayable color volume. If target color
-        volume is equal to the primary color volume, then this event is not
-        sent.
-
-        Each coordinate value is multiplied by 1 million to get the argument
-        value to carry precision of 6 decimals.
-      </description>
-
-      <arg name="r_x" type="int" summary="Red x * 1M"/>
-      <arg name="r_y" type="int" summary="Red y * 1M"/>
-      <arg name="g_x" type="int" summary="Green x * 1M"/>
-      <arg name="g_y" type="int" summary="Green y * 1M"/>
-      <arg name="b_x" type="int" summary="Blue x * 1M"/>
-      <arg name="b_y" type="int" summary="Blue y * 1M"/>
-      <arg name="w_x" type="int" summary="White x * 1M"/>
-      <arg name="w_y" type="int" summary="White y * 1M"/>
-    </event>
-
-    <event name="target_luminance">
-      <description summary="target luminance range">
-        Provides the luminance range that the image description is targeting as
-        the minimum and maximum absolute luminance L. These values include the
-        minimum display emission and ambient flare luminances, assumed to be
-        optically additive and have the chromaticity of the primary color
-        volume white point. This should be compatible with the SMPTE ST 2086
-        definition of HDR static metadata.
-
-        This luminance range is only theoretical and may not correspond to the
-        luminance of light emitted on an actual display.
-
-        Min L value is multiplied by 10000 to get the argument min_lum value and
-        carry precision of 4 decimals. Max L value is unscaled for max_lum.
-      </description>
-
-      <arg name="min_lum" type="uint" summary="min L (cd/m²) * 10000"/>
-      <arg name="max_lum" type="uint" summary="max L (cd/m²)"/>
-    </event>
-
-    <event name="target_max_cll">
-      <description summary="target maximum content light level">
-        Provides the targeted max_cll of the image description. max_cll is
-        defined by CTA-861-H.
-
-        This luminance is only theoretical and may not correspond to the
-        luminance of light emitted on an actual display.
-      </description>
-
-      <arg name="max_cll" type="uint"
-           summary="Maximum content light-level (cd/m²)"/>
-    </event>
-
-    <event name="target_max_fall">
-      <description summary="target maximum frame-average light level">
-        Provides the targeted max_fall of the image description. max_fall is
-        defined by CTA-861-H.
-
-        This luminance is only theoretical and may not correspond to the
-        luminance of light emitted on an actual display.
-      </description>
-
-      <arg name="max_fall" type="uint"
-           summary="Maximum frame-average light level (cd/m²)"/>
-    </event>
-  </interface>
-
-  <interface name="wp_image_description_reference_v1" version="1">
-    <description summary="Reference to an image description">
-      This object is a reference to an image description. This interface is
-      frozen at version 1 to allow other protocols to create
-      wp_image_description_v1 objects.
-
-      The wp_color_manager_v1.get_image_description request can be used to
-      retrieve the underlying image description.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the reference">
-        Destroy this object. This has no effect on the referenced image
-        description.
-      </description>
-    </request>
-  </interface>
-</protocol>
diff --git a/engine/thirdparty/wayland-protocols/staging/pointer-warp/README b/engine/thirdparty/wayland-protocols/staging/pointer-warp/README
deleted file mode 100644
index a9484754..00000000
--- a/engine/thirdparty/wayland-protocols/staging/pointer-warp/README
+++ /dev/null
@@ -1,7 +0,0 @@
-pointer-warp protocol
-
-Maintainers:
-Neal Gompa <neal@gompa.dev> (@Conan_Kudo)
-Xaver Hugl <xaver.hugl@kde.org> (@Zamundaaa)
-Matthias Klumpp <matthias@tenstral.net> (@mak)
-Vlad Zahorodnii <vlad.zahorodnii@kde.org> (@zzag)
diff --git a/engine/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml b/engine/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml
deleted file mode 100644
index 158dad83..00000000
--- a/engine/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="pointer_warp_v1">
-  <copyright>
-    Copyright © 2024 Neal Gompa
-    Copyright © 2024 Xaver Hugl
-    Copyright © 2024 Matthias Klumpp
-    Copyright © 2024 Vlad Zahorodnii
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <interface name="wp_pointer_warp_v1" version="1">
-    <description summary="reposition the pointer to a location on a surface">
-      This global interface allows applications to request the pointer to be
-      moved to a position relative to a wl_surface.
-
-      Note that if the desired behavior is to constrain the pointer to an area
-      or lock it to a position, this protocol does not provide a reliable way
-      to do that. The pointer constraint and pointer lock protocols should be
-      used for those use cases instead.
-
-      Warning! The protocol described in this file is currently in the testing
-      phase. Backward compatible changes may be added together with the
-      corresponding interface version bump. Backward incompatible changes can
-      only be done by creating a new major version of the extension.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the warp manager">
-        Destroy the pointer warp manager.
-      </description>
-    </request>
-
-    <request name="warp_pointer">
-      <description summary="reposition the pointer">
-        Request the compositor to move the pointer to a surface-local position.
-        Whether or not the compositor honors the request is implementation defined,
-        but it should
-        - honor it if the surface has pointer focus, including
-          when it has an implicit pointer grab
-        - reject it if the enter serial is incorrect
-        - reject it if the requested position is outside of the surface
-
-        Note that the enter serial is valid for any surface of the client,
-        and does not have to be from the surface the pointer is warped to.
-
-      </description>
-      <arg name="surface" type="object" interface="wl_surface"
-           summary="surface to position the pointer on"/>
-      <arg name="pointer" type="object" interface="wl_pointer"
-           summary="the pointer that should be repositioned"/>
-      <arg name="x" type="fixed"/>
-      <arg name="y" type="fixed"/>
-      <arg name="serial" type="uint" summary="serial number of the enter event"/>
-    </request>
-  </interface>
-</protocol>
diff --git a/engine/version.py b/engine/version.py
index 8cf4b011..87025f72 100644
--- a/engine/version.py
+++ b/engine/version.py
@@ -1,9 +1,9 @@
 short_name = "godot"
 name = "Godot Engine"
 major = 4
-minor = 7
-patch = 0
-status = "dev"
+minor = 6
+patch = 3
+status = "rc"
 module_config = ""
 website = "https://godotengine.org"
-docs = "latest"
+docs = "4.6"